2103 files changed, 368510 insertions, 141431 deletions

diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 0000000000..e114ffee1a
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,22 @@
+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_family: freebsd-12-2
+    memory: 2G
+  install_script:
+    pkg install -y gettext gmake perl5
+  create_user_script:
+    - pw useradd git
+    - chown -R git:git .
+  build_script:
+    - su git -c gmake
+  test_script:
+    - su git -c 'gmake test'
diff --git a/.editorconfig b/.editorconfig
index 42cdc4bbfb..f9d819623d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -4,7 +4,7 @@ insert_final_newline = true
 
 # The settings for C (*.c and *.h) files are mirrored in .clang-format.  Keep
 # them in sync.
-[*.{c,h,sh,perl,pl,pm}]
+[*.{c,h,sh,perl,pl,pm,txt}]
 indent_style = tab
 tab_width = 8
 
diff --git a/.gitattributes b/.gitattributes
index b08a1416d8..b0044cf272 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -6,6 +6,7 @@
 *.pm eol=lf diff=perl
 *.py eol=lf diff=python
 *.bat eol=crlf
+CODE_OF_CONDUCT.md -whitespace
 /Documentation/**/*.txt eol=lf
 /command-list.txt eol=lf
 /GIT-VERSION-GEN eol=lf
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index e7b4e2f3c2..c8755e38de 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -16,4 +16,7 @@ If you prefer video, then [this talk](https://www.youtube.com/watch?v=Q7i_qQW__q
 might be useful to you as the presenter walks you through the contribution
 process by example.
 
+Or, you can follow the ["My First Contribution"](https://git-scm.com/docs/MyFirstContribution)
+tutorial for another example of the contribution process.
+
 Your friendly Git community!
diff --git a/.github/workflows/check-whitespace.yml b/.github/workflows/check-whitespace.yml
new file mode 100644
index 0000000000..8c4358d805
--- /dev/null
+++ b/.github/workflows/check-whitespace.yml
@@ -0,0 +1,49 @@
+name: check-whitespace
+
+# Get the repo with the commits(+1) in the series.
+# Process `git log --check` output to extract just the check errors.
+# Add a comment to the pull request with the check errors.
+
+on:
+  pull_request:
+    types: [opened, synchronize]
+
+jobs:
+  check-whitespace:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: git log --check
+      id: check_out
+      run: |
+        log=
+        commit=
+        while read dash etc
+        do
+          case "${dash}" in
+          "---")
+            commit="${etc}"
+            ;;
+          "")
+            ;;
+          *)
+            if test -n "${commit}"
+            then
+              log="${log}\n${commit}"
+              echo ""
+              echo "--- ${commit}"
+            fi
+            commit=
+            log="${log}\n${dash} ${etc}"
+            echo "${dash} ${etc}"
+            ;;
+          esac
+        done <<< $(git log --check --pretty=format:"---% h% s" ${{github.event.pull_request.base.sha}}..)
+
+        if test -n "${log}"
+        then
+          exit 2
+        fi
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000000..68596f2592
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,317 @@
+name: CI/PR
+
+on: [push, pull_request]
+
+env:
+  DEVELOPER: 1
+
+jobs:
+  ci-config:
+    runs-on: ubuntu-latest
+    outputs:
+      enabled: ${{ steps.check-ref.outputs.enabled }}${{ steps.skip-if-redundant.outputs.enabled }}
+    steps:
+      - name: try to clone ci-config branch
+        run: |
+          git -c protocol.version=2 clone \
+            --no-tags \
+            --single-branch \
+            -b ci-config \
+            --depth 1 \
+            --no-checkout \
+            --filter=blob:none \
+            https://github.com/${{ github.repository }} \
+            config-repo &&
+          cd config-repo &&
+          git checkout HEAD -- ci/config || : ignore
+      - id: check-ref
+        name: check whether CI is enabled for ref
+        run: |
+          enabled=yes
+          if test -x config-repo/ci/config/allow-ref &&
+             ! config-repo/ci/config/allow-ref '${{ github.ref }}'
+          then
+            enabled=no
+          fi
+          echo "::set-output name=enabled::$enabled"
+      - name: skip if the commit or tree was already tested
+        id: skip-if-redundant
+        uses: actions/github-script@v3
+        if: steps.check-ref.outputs.enabled == 'yes'
+        with:
+          github-token: ${{secrets.GITHUB_TOKEN}}
+          script: |
+            try {
+              // Figure out workflow ID, commit and tree
+              const { data: run } = await github.actions.getWorkflowRun({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                run_id: context.runId,
+              });
+              const workflow_id = run.workflow_id;
+              const head_sha = run.head_sha;
+              const tree_id = run.head_commit.tree_id;
+
+              // See whether there is a successful run for that commit or tree
+              const { data: runs } = await github.actions.listWorkflowRuns({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                per_page: 500,
+                status: 'success',
+                workflow_id,
+              });
+              for (const run of runs.workflow_runs) {
+                if (head_sha === run.head_sha) {
+                  core.warning(`Successful run for the commit ${head_sha}: ${run.html_url}`);
+                  core.setOutput('enabled', ' but skip');
+                  break;
+                }
+                if (run.head_commit && tree_id === run.head_commit.tree_id) {
+                  core.warning(`Successful run for the tree ${tree_id}: ${run.html_url}`);
+                  core.setOutput('enabled', ' but skip');
+                  break;
+                }
+              }
+            } catch (e) {
+              core.warning(e);
+            }
+
+  windows-build:
+    needs: ci-config
+    if: needs.ci-config.outputs.enabled == 'yes'
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: git-for-windows/setup-git-for-windows-sdk@v1
+    - name: build
+      shell: bash
+      env:
+        HOME: ${{runner.workspace}}
+        NO_PERL: 1
+      run: 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
+      uses: actions/upload-artifact@v2
+      with:
+        name: windows-artifacts
+        path: artifacts
+  windows-test:
+    runs-on: windows-latest
+    needs: [windows-build]
+    strategy:
+      fail-fast: false
+      matrix:
+        nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+    steps:
+    - name: download tracked files and build artifacts
+      uses: actions/download-artifact@v2
+      with:
+        name: windows-artifacts
+        path: ${{github.workspace}}
+    - name: extract tracked files and build artifacts
+      shell: bash
+      run: tar xf artifacts.tar.gz && tar xf tracked.tar.gz
+    - uses: git-for-windows/setup-git-for-windows-sdk@v1
+    - name: test
+      shell: bash
+      run: ci/run-test-slice.sh ${{matrix.nr}} 10
+    - name: ci/print-test-failures.sh
+      if: failure()
+      shell: bash
+      run: ci/print-test-failures.sh
+    - name: Upload failed tests' directories
+      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+      uses: actions/upload-artifact@v2
+      with:
+        name: failed-tests-windows
+        path: ${{env.FAILED_TEST_ARTIFACTS}}
+  vs-build:
+    needs: ci-config
+    if: needs.ci-config.outputs.enabled == 'yes'
+    env:
+      NO_PERL: 1
+      GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'"
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: git-for-windows/setup-git-for-windows-sdk@v1
+    - name: initialize vcpkg
+      uses: actions/checkout@v2
+      with:
+        repository: 'microsoft/vcpkg'
+        path: 'compat/vcbuild/vcpkg'
+    - name: download vcpkg artifacts
+      shell: powershell
+      run: |
+        $urlbase = "https://dev.azure.com/git/git/_apis/build/builds"
+        $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=9&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id
+        $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[0].resource.downloadUrl
+        (New-Object Net.WebClient).DownloadFile($downloadUrl, "compat.zip")
+        Expand-Archive compat.zip -DestinationPath . -Force
+        Remove-Item compat.zip
+    - name: add msbuild to PATH
+      uses: microsoft/setup-msbuild@v1
+    - name: copy dlls to root
+      shell: cmd
+      run: compat\vcbuild\vcpkg_copy_dlls.bat release
+    - name: generate Visual Studio solution
+      shell: bash
+      run: |
+        cmake `pwd`/contrib/buildsystems/ -DCMAKE_PREFIX_PATH=`pwd`/compat/vcbuild/vcpkg/installed/x64-windows \
+        -DNO_GETTEXT=YesPlease -DPERL_TESTS=OFF -DPYTHON_TESTS=OFF -DCURL_NO_CURL_CMAKE=ON
+    - name: MSBuild
+      run: msbuild git.sln -property:Configuration=Release -property:Platform=x64 -maxCpuCount:4 -property:PlatformToolset=v142
+    - name: bundle artifact tar
+      shell: bash
+      env:
+        MSVC: 1
+        VCPKG_ROOT: ${{github.workspace}}\compat\vcbuild\vcpkg
+      run: |
+        mkdir -p artifacts &&
+        eval "$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts NO_GETTEXT=YesPlease 2>&1 | grep ^tar)"
+    - name: zip up tracked files
+      run: git archive -o artifacts/tracked.tar.gz HEAD
+    - name: upload tracked files and build artifacts
+      uses: actions/upload-artifact@v2
+      with:
+        name: vs-artifacts
+        path: artifacts
+  vs-test:
+    runs-on: windows-latest
+    needs: vs-build
+    strategy:
+      fail-fast: false
+      matrix:
+        nr: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
+    steps:
+    - uses: git-for-windows/setup-git-for-windows-sdk@v1
+    - name: download tracked files and build artifacts
+      uses: actions/download-artifact@v2
+      with:
+        name: vs-artifacts
+        path: ${{github.workspace}}
+    - name: extract tracked files and build artifacts
+      shell: bash
+      run: tar xf artifacts.tar.gz && tar xf tracked.tar.gz
+    - name: test
+      shell: bash
+      env:
+        NO_SVN_TESTS: 1
+        GIT_TEST_SKIP_REBASE_P: 1
+      run: ci/run-test-slice.sh ${{matrix.nr}} 10
+    - name: ci/print-test-failures.sh
+      if: failure()
+      shell: bash
+      run: ci/print-test-failures.sh
+    - name: Upload failed tests' directories
+      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+      uses: actions/upload-artifact@v2
+      with:
+        name: failed-tests-windows
+        path: ${{env.FAILED_TEST_ARTIFACTS}}
+  regular:
+    needs: ci-config
+    if: needs.ci-config.outputs.enabled == 'yes'
+    strategy:
+      fail-fast: false
+      matrix:
+        vector:
+          - jobname: linux-clang
+            cc: clang
+            pool: ubuntu-latest
+          - jobname: linux-gcc
+            cc: gcc
+            pool: ubuntu-latest
+          - jobname: osx-clang
+            cc: clang
+            pool: macos-latest
+          - jobname: osx-gcc
+            cc: gcc
+            pool: macos-latest
+          - jobname: linux-gcc-default
+            cc: gcc
+            pool: ubuntu-latest
+    env:
+      CC: ${{matrix.vector.cc}}
+      jobname: ${{matrix.vector.jobname}}
+    runs-on: ${{matrix.vector.pool}}
+    steps:
+    - uses: actions/checkout@v2
+    - run: ci/install-dependencies.sh
+    - run: ci/run-build-and-tests.sh
+    - run: ci/print-test-failures.sh
+      if: failure()
+    - name: Upload failed tests' directories
+      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+      uses: actions/upload-artifact@v2
+      with:
+        name: failed-tests-${{matrix.vector.jobname}}
+        path: ${{env.FAILED_TEST_ARTIFACTS}}
+  dockerized:
+    needs: ci-config
+    if: needs.ci-config.outputs.enabled == 'yes'
+    strategy:
+      fail-fast: false
+      matrix:
+        vector:
+        - jobname: linux-musl
+          image: alpine
+        - jobname: Linux32
+          image: daald/ubuntu32:xenial
+    env:
+      jobname: ${{matrix.vector.jobname}}
+    runs-on: ubuntu-latest
+    container: ${{matrix.vector.image}}
+    steps:
+    - uses: actions/checkout@v1
+    - run: ci/install-docker-dependencies.sh
+    - run: ci/run-build-and-tests.sh
+    - run: ci/print-test-failures.sh
+      if: failure()
+    - name: Upload failed tests' directories
+      if: failure() && env.FAILED_TEST_ARTIFACTS != ''
+      uses: actions/upload-artifact@v1
+      with:
+        name: failed-tests-${{matrix.vector.jobname}}
+        path: ${{env.FAILED_TEST_ARTIFACTS}}
+  static-analysis:
+    needs: ci-config
+    if: needs.ci-config.outputs.enabled == 'yes'
+    env:
+      jobname: StaticAnalysis
+    runs-on: ubuntu-18.04
+    steps:
+    - uses: actions/checkout@v2
+    - run: ci/install-dependencies.sh
+    - run: ci/run-static-analysis.sh
+  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:
+    needs: ci-config
+    if: needs.ci-config.outputs.enabled == 'yes'
+    env:
+      jobname: Documentation
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - run: ci/install-dependencies.sh
+    - run: ci/test-documentation.sh
diff --git a/.gitignore b/.gitignore
index 89b3b79c1a..311841f9be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@
 /git-bisect--helper
 /git-blame
 /git-branch
+/git-bugreport
 /git-bundle
 /git-cat-file
 /git-check-attr
@@ -32,6 +33,7 @@
 /git-check-mailmap
 /git-check-ref-format
 /git-checkout
+/git-checkout--worker
 /git-checkout-index
 /git-cherry
 /git-cherry-pick
@@ -66,6 +68,7 @@
 /git-filter-branch
 /git-fmt-merge-msg
 /git-for-each-ref
+/git-for-each-repo
 /git-format-patch
 /git-fsck
 /git-fsck-objects
@@ -83,13 +86,13 @@
 /git-init-db
 /git-interpret-trailers
 /git-instaweb
-/git-legacy-stash
 /git-log
 /git-ls-files
 /git-ls-remote
 /git-ls-tree
 /git-mailinfo
 /git-mailsplit
+/git-maintenance
 /git-merge
 /git-merge-base
 /git-merge-index
@@ -113,7 +116,6 @@
 /git-pack-redundant
 /git-pack-objects
 /git-pack-refs
-/git-parse-remote
 /git-patch-id
 /git-prune
 /git-prune-packed
@@ -133,8 +135,6 @@
 /git-remote-ftps
 /git-remote-fd
 /git-remote-ext
-/git-remote-testpy
-/git-remote-testsvn
 /git-repack
 /git-replace
 /git-request-pull
@@ -147,23 +147,23 @@
 /git-rm
 /git-send-email
 /git-send-pack
-/git-serve
 /git-sh-i18n
 /git-sh-i18n--envsubst
 /git-sh-setup
-/git-sh-i18n
 /git-shell
 /git-shortlog
 /git-show
 /git-show-branch
 /git-show-index
 /git-show-ref
+/git-sparse-checkout
 /git-stage
 /git-stash
 /git-status
 /git-stripspace
 /git-submodule
 /git-submodule--helper
+/git-subtree
 /git-svn
 /git-switch
 /git-symbolic-ref
@@ -188,6 +188,7 @@
 /gitweb/gitweb.cgi
 /gitweb/static/gitweb.js
 /gitweb/static/gitweb.min.*
+/config-list.h
 /command-list.h
 *.tar.gz
 *.dsc
@@ -195,6 +196,7 @@
 /git.spec
 *.exe
 *.[aos]
+*.o.json
 *.py[co]
 .depend/
 *.gcda
@@ -216,6 +218,7 @@
 /tags
 /TAGS
 /cscope*
+/compile_commands.json
 *.hcc
 *.obj
 *.lib
@@ -238,3 +241,4 @@ Release/
 /git.VC.VC.opendb
 /git.VC.db
 *.dSYM
+/contrib/buildsystems/out
diff --git a/.mailmap b/.mailmap
index 14fa041043..9c6a446bdf 100644
--- a/.mailmap
+++ b/.mailmap
@@ -31,6 +31,7 @@ Brandon Casey <drafnel@gmail.com> <casey@nrlssc.navy.mil>
 Brandon Williams <bwilliams.eng@gmail.com> <bmwill@google.com>
 brian m. carlson <sandals@crustytoothpaste.net>
 brian m. carlson <sandals@crustytoothpaste.net> <sandals@crustytoothpaste.ath.cx>
+brian m. carlson <sandals@crustytoothpaste.net> <bk2204@github.com>
 Bryan Larsen <bryan@larsen.st> <bryan.larsen@gmail.com>
 Bryan Larsen <bryan@larsen.st> <bryanlarsen@yahoo.com>
 Cheng Renquan <crquan@gmail.com>
@@ -59,7 +60,9 @@ 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>
 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>
 Eric Blake <eblake@redhat.com> <ebb9@byu.net>
 Eric Hanchrow <eric.hanchrow@gmail.com> <offby1@blarg.net>
@@ -108,6 +111,7 @@ Jim Meyering <jim@meyering.net> <meyering@redhat.com>
 Joachim Berdal Haga <cjhaga@fys.uio.no>
 Joachim Jablon <joachim.jablon@people-doc.com> <ewjoachim@gmail.com>
 Johannes Schindelin <Johannes.Schindelin@gmx.de> <johannes.schindelin@gmx.de>
+Johannes Schindelin <Johannes.Schindelin@gmx.de> Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>
 Johannes Sixt <j6t@kdbg.org> <J.Sixt@eudaptics.com>
 Johannes Sixt <j6t@kdbg.org> <j.sixt@viscovery.net>
 Johannes Sixt <j6t@kdbg.org> <johannes.sixt@telecom.at>
@@ -216,6 +220,7 @@ Philipp A. Hartmann <pah@qo.cx> <ph@sorgh.de>
 Philippe Bruhat <book@cpan.org>
 Ralf Thielow <ralf.thielow@gmail.com> <ralf.thielow@googlemail.com>
 Ramsay Jones <ramsay@ramsayjones.plus.com> <ramsay@ramsay1.demon.co.uk>
+Ramkumar Ramachandra <r@artagnon.com> <artagnon@gmail.com>
 Randall S. Becker <randall.becker@nexbridge.ca> <rsbecker@nexbridge.com>
 René Scharfe <l.s.r@web.de> <rene.scharfe@lsrfire.ath.cx>
 René Scharfe <l.s.r@web.de> Rene Scharfe
@@ -286,6 +291,7 @@ William Pursell <bill.pursell@gmail.com>
 YONETANI Tomokazu <y0n3t4n1@gmail.com> <qhwt+git@les.ath.cx>
 YONETANI Tomokazu <y0n3t4n1@gmail.com> <y0netan1@dragonflybsd.org>
 YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
+Yi-Jyun Pan <pan93412@gmail.com>
 # the two anonymous contributors are different persons:
 anonymous <linux@horizon.com>
 anonymous <linux@horizon.net>
diff --git a/.travis.yml b/.travis.yml
index fc5730b085..908330a0a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ compiler:
 
 matrix:
   include:
-    - env: jobname=GIT_TEST_GETTEXT_POISON
+    - env: jobname=linux-gcc-default
       os: linux
       compiler:
       addons:
@@ -32,7 +32,15 @@ matrix:
       services:
         - docker
       before_install:
-      script: ci/run-linux32-docker.sh
+      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:
diff --git a/.tsan-suppressions b/.tsan-suppressions
index 8c85014a0a..5ba86d6845 100644
--- a/.tsan-suppressions
+++ b/.tsan-suppressions
@@ -8,3 +8,9 @@
 # in practice it (hopefully!) doesn't matter.
 race:^want_color$
 race:^transfer_debug$
+
+# A boolean value, which tells whether the replace_map has been initialized or
+# not, is read racily with an update. As this variable is written to only once,
+# and it's OK if the value change right after reading it, this shouldn't be a
+# problem.
+race:^lookup_replace_object$
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index fc4645d5c0..65651beada 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -8,73 +8,64 @@ this code of conduct may be banned from the community.
 
 ## Our Pledge
 
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of age,
-body size, disability, ethnicity, sex characteristics, gender identity and
-expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
 
 ## Our Standards
 
-Examples of behavior that contributes to creating a positive environment
-include:
+Examples of behavior that contributes to a positive environment for our
+community include:
 
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
 
-Examples of unacceptable behavior by participants include:
+Examples of unacceptable behavior include:
 
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-## Our Responsibilities
+## Enforcement Responsibilities
 
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
 
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
 
 ## Scope
 
-This Code of Conduct applies within all project spaces, and it also applies
-when an individual is representing the project or its community in public
-spaces. Examples of representing a project or community include using an
-official project e-mail address, posting via an official social media account,
-or acting as an appointed representative at an online or offline event.
-Representation of a project may be further defined and clarified by project
-maintainers.
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at git@sfconservancy.org. All
-complaints will be reviewed and investigated and will result in a response
-that is deemed necessary and appropriate to the circumstances. The project
-team is obligated to maintain confidentiality with regard to the reporter of
-an incident. Further details of specific enforcement policies may be posted
-separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-The project leadership team can be contacted by email as a whole at
+reported to the community leaders responsible for enforcement at
 git@sfconservancy.org, or individually:
 
   - Ævar Arnfjörð Bjarmason <avarab@gmail.com>
@@ -82,12 +73,73 @@ git@sfconservancy.org, or individually:
   - Jeff King <peff@peff.net>
   - Junio C Hamano <gitster@pobox.com>
 
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.4, available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+version 2.0, available at
+[https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
+
+Community Impact Guidelines were inspired by 
+[Mozilla's code of conduct enforcement ladder][Mozilla CoC].
+
+For answers to common questions about this code of conduct, see the FAQ at
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
+at [https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org
+[v2.0]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[Mozilla CoC]: https://github.com/mozilla/diversity
+[FAQ]: https://www.contributor-covenant.org/faq
+[translations]: https://www.contributor-covenant.org/translations
 
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines
index f45db5b727..711cb9171e 100644
--- a/Documentation/CodingGuidelines
+++ b/Documentation/CodingGuidelines
@@ -75,7 +75,7 @@ For shell scripts specifically (not exhaustive):
 
  - If you want to find out if a command is available on the user's
    $PATH, you should use 'type <command>', instead of 'which <command>'.
-   The output of 'which' is not machine parseable and its exit code
+   The output of 'which' is not machine parsable and its exit code
    is not reliable across platforms.
 
  - We use POSIX compliant parameter substitutions and avoid bashisms;
@@ -91,16 +91,10 @@ For shell scripts specifically (not exhaustive):
 
    - No shell arrays.
 
-   - No strlen ${#parameter}.
-
    - No pattern replacement ${parameter/pattern/string}.
 
  - We use Arithmetic Expansion $(( ... )).
 
- - Inside Arithmetic Expansion, spell shell variables with $ in front
-   of them, as some shells do not grok $((x)) while accepting $(($x))
-   just fine (e.g. dash older than 0.5.4).
-
  - We do not use Process Substitution <(list) or >(list).
 
  - Do not write control structures on a single line with semicolon.
@@ -181,6 +175,11 @@ For shell scripts specifically (not exhaustive):
 
    does not have such a problem.
 
+ - Even though "local" is not part of POSIX, we make heavy use of it
+   in our test suite.  We do not use it in scripted Porcelains, and
+   hopefully nobody starts using "local" before they are reimplemented
+   in C ;-)
+
 
 For C programs:
 
@@ -203,7 +202,7 @@ For C programs:
    . since early 2012 with e1327023ea, we have been using an enum
      definition whose last element is followed by a comma.  This, like
      an array initializer that ends with a trailing comma, can be used
-     to reduce the patch noise when adding a new identifer at the end.
+     to reduce the patch noise when adding a new identifier at the end.
 
    . since mid 2017 with cbc0f81d, we have been using designated
      initializers for struct (e.g. "struct t v = { .val = 'a' };").
@@ -238,6 +237,18 @@ For C programs:
         while( condition )
 		func (bar+1);
 
+ - Do not explicitly compare an integral value with constant 0 or '\0',
+   or a pointer value with constant NULL.  For instance, to validate that
+   counted array <ptr, cnt> is initialized but has no elements, write:
+
+	if (!ptr || cnt)
+		BUG("empty array expected");
+
+   and not:
+
+	if (ptr == NULL || cnt != 0);
+		BUG("empty array expected");
+
  - We avoid using braces unnecessarily.  I.e.
 
 	if (bla) {
@@ -483,21 +494,21 @@ For Python scripts:
 
  - We follow PEP-8 (http://www.python.org/dev/peps/pep-0008/).
 
- - As a minimum, we aim to be compatible with Python 2.6 and 2.7.
+ - As a minimum, we aim to be compatible with Python 2.7.
 
  - Where required libraries do not restrict us to Python 2, we try to
    also be compatible with Python 3.1 and later.
 
- - When you must differentiate between Unicode literals and byte string
-   literals, it is OK to use the 'b' prefix.  Even though the Python
-   documentation for version 2.6 does not mention this prefix, it has
-   been supported since version 2.6.0.
-
 Error Messages
 
  - Do not end error messages with a full stop.
 
- - Do not capitalize ("unable to open %s", not "Unable to open %s")
+ - Do not capitalize the first word, only because it is the first word
+   in the message ("unable to open %s", not "Unable to open %s").  But
+   "SHA-3 not supported" is fine, because the reason the first word is
+   capitalized is not because it is at the beginning of the sentence,
+   but because the word would be spelled in capital letters even when
+   it appeared in the middle of the sentence.
 
  - Say what the error is first ("cannot open %s", not "%s: cannot open")
 
@@ -540,6 +551,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 8fe829cc1b..f5605b7767 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -2,6 +2,8 @@
 MAN1_TXT =
 MAN5_TXT =
 MAN7_TXT =
+HOWTO_TXT =
+DOC_DEP_TXT =
 TECH_DOCS =
 ARTICLES =
 SP_ARTICLES =
@@ -17,9 +19,11 @@ MAN1_TXT += git.txt
 MAN1_TXT += gitk.txt
 MAN1_TXT += gitweb.txt
 
+# man5 / man7 guides (note: new guides should also be added to command-list.txt)
 MAN5_TXT += gitattributes.txt
 MAN5_TXT += githooks.txt
 MAN5_TXT += gitignore.txt
+MAN5_TXT += gitmailmap.txt
 MAN5_TXT += gitmodules.txt
 MAN5_TXT += gitrepository-layout.txt
 MAN5_TXT += gitweb.conf.txt
@@ -30,6 +34,7 @@ MAN7_TXT += gitcredentials.txt
 MAN7_TXT += gitcvs-migration.txt
 MAN7_TXT += gitdiffcore.txt
 MAN7_TXT += giteveryday.txt
+MAN7_TXT += gitfaq.txt
 MAN7_TXT += gitglossary.txt
 MAN7_TXT += gitnamespaces.txt
 MAN7_TXT += gitremote-helpers.txt
@@ -39,6 +44,11 @@ MAN7_TXT += gittutorial-2.txt
 MAN7_TXT += gittutorial.txt
 MAN7_TXT += gitworkflows.txt
 
+HOWTO_TXT += $(wildcard howto/*.txt)
+
+DOC_DEP_TXT += $(wildcard *.txt)
+DOC_DEP_TXT += $(wildcard config/*.txt)
+
 ifdef MAN_FILTER
 MAN_TXT = $(filter $(MAN_FILTER),$(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT))
 else
@@ -73,6 +83,7 @@ SP_ARTICLES += howto/rebuild-from-update-hook
 SP_ARTICLES += howto/rebase-from-internal-branch
 SP_ARTICLES += howto/keep-canonical-history-correct
 SP_ARTICLES += howto/maintain-git
+SP_ARTICLES += howto/coordinate-embargoed-releases
 API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
 SP_ARTICLES += $(API_DOCS)
 
@@ -87,11 +98,13 @@ TECH_DOCS += technical/multi-pack-index
 TECH_DOCS += technical/pack-format
 TECH_DOCS += technical/pack-heuristics
 TECH_DOCS += technical/pack-protocol
+TECH_DOCS += technical/parallel-checkout
 TECH_DOCS += technical/partial-clone
 TECH_DOCS += technical/protocol-capabilities
 TECH_DOCS += technical/protocol-common
 TECH_DOCS += technical/protocol-v2
 TECH_DOCS += technical/racy-git
+TECH_DOCS += technical/reftable
 TECH_DOCS += technical/send-pack-pipeline
 TECH_DOCS += technical/shallow
 TECH_DOCS += technical/signature-format
@@ -126,6 +139,7 @@ ASCIIDOC_CONF = -f asciidoc.conf
 ASCIIDOC_COMMON = $(ASCIIDOC) $(ASCIIDOC_EXTRA) $(ASCIIDOC_CONF) \
 		-amanversion=$(GIT_VERSION) \
 		-amanmanual='Git Manual' -amansource='Git'
+ASCIIDOC_DEPS = asciidoc.conf GIT-ASCIIDOCFLAGS
 TXT_TO_HTML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_HTML)
 TXT_TO_XML = $(ASCIIDOC_COMMON) -b $(ASCIIDOC_DOCBOOK)
 MANPAGE_XSL = manpage-normal.xsl
@@ -149,32 +163,9 @@ endif
 -include ../config.mak.autogen
 -include ../config.mak
 
-#
-# For docbook-xsl ...
-#	-1.68.1,	no extra settings are needed?
-#	1.69.0,		set ASCIIDOC_ROFF?
-#	1.69.1-1.71.0,	set DOCBOOK_SUPPRESS_SP?
-#	1.71.1,		set ASCIIDOC_ROFF?
-#	1.72.0,		set DOCBOOK_XSL_172.
-#	1.73.0-,	no extra settings are needed
-#
-
-ifdef DOCBOOK_XSL_172
-ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
-MANPAGE_XSL = manpage-1.72.xsl
-else
-	ifndef ASCIIDOC_ROFF
-	# docbook-xsl after 1.72 needs the regular XSL, but will not
-	# pass-thru raw roff codes from asciidoc.conf, so turn them off.
-	ASCIIDOC_EXTRA += -a git-asciidoc-no-roff
-	endif
-endif
 ifndef NO_MAN_BOLD_LITERAL
 XMLTO_EXTRA += -m manpage-bold-literal.xsl
 endif
-ifdef DOCBOOK_SUPPRESS_SP
-XMLTO_EXTRA += -m manpage-suppress-sp.xsl
-endif
 
 # Newer DocBook stylesheet emits warning cruft in the output when
 # this is not set, and if set it shows an absolute link.  Older
@@ -203,6 +194,7 @@ ASCIIDOC_DOCBOOK = docbook5
 ASCIIDOC_EXTRA += -acompat-mode -atabsize=8
 ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
 ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
+ASCIIDOC_DEPS = asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
 DBLATEX_COMMON =
 XMLTO_EXTRA += --skip-validation
 XMLTO_EXTRA += -x manpage.xsl
@@ -292,7 +284,9 @@ install-html: html
 ../GIT-VERSION-FILE: FORCE
 	$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
 
+ifneq ($(MAKECMDGOALS),clean)
 -include ../GIT-VERSION-FILE
+endif
 
 #
 # Determine "include::" file references in asciidoc files.
@@ -301,12 +295,12 @@ docdep_prereqs = \
 	mergetools-list.made $(mergetools_txt) \
 	cmd-list.made $(cmds_txt)
 
-doc.dep : $(docdep_prereqs) $(wildcard *.txt) $(wildcard config/*.txt) build-docdep.perl
-	$(QUIET_GEN)$(RM) $@+ $@ && \
-	$(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \
-	mv $@+ $@
+doc.dep : $(docdep_prereqs) $(DOC_DEP_TXT) build-docdep.perl
+	$(QUIET_GEN)$(PERL_PATH) ./build-docdep.perl >$@ $(QUIET_STDERR)
 
+ifneq ($(MAKECMDGOALS),clean)
 -include doc.dep
+endif
 
 cmds_txt = cmds-ancillaryinterrogators.txt \
 	cmds-ancillarymanipulators.txt \
@@ -315,14 +309,14 @@ cmds_txt = cmds-ancillaryinterrogators.txt \
 	cmds-plumbingmanipulators.txt \
 	cmds-synchingrepositories.txt \
 	cmds-synchelpers.txt \
+	cmds-guide.txt \
 	cmds-purehelpers.txt \
 	cmds-foreignscminterface.txt
 
 $(cmds_txt): cmd-list.made
 
 cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT)
-	$(QUIET_GEN)$(RM) $@ && \
-	$(PERL_PATH) ./cmd-list.perl ../command-list.txt $(QUIET_STDERR) && \
+	$(QUIET_GEN)$(PERL_PATH) ./cmd-list.perl ../command-list.txt $(cmds_txt) $(QUIET_STDERR) && \
 	date >$@
 
 mergetools_txt = mergetools-diff.txt mergetools-merge.txt
@@ -330,7 +324,7 @@ mergetools_txt = mergetools-diff.txt mergetools-merge.txt
 $(mergetools_txt): mergetools-list.made
 
 mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
-	$(QUIET_GEN)$(RM) $@ && \
+	$(QUIET_GEN) \
 	$(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \
 		. ../git-mergetool--lib.sh && \
 		show_tool_names can_diff "* " || :' >mergetools-diff.txt && \
@@ -359,32 +353,23 @@ clean:
 	$(RM) manpage-base-url.xsl
 	$(RM) GIT-ASCIIDOCFLAGS
 
-$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
-	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-	$(TXT_TO_HTML) -d manpage -o $@+ $< && \
-	mv $@+ $@
+$(MAN_HTML): %.html : %.txt $(ASCIIDOC_DEPS)
+	$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -d manpage -o $@ $<
 
-$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
-	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-	$(TXT_TO_HTML) -o $@+ $< && \
-	mv $@+ $@
+$(OBSOLETE_HTML): %.html : %.txto $(ASCIIDOC_DEPS)
+	$(QUIET_ASCIIDOC)$(TXT_TO_HTML) -o $@ $<
 
 manpage-base-url.xsl: manpage-base-url.xsl.in
 	$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@
 
 %.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl)
-	$(QUIET_XMLTO)$(RM) $@ && \
-	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+	$(QUIET_XMLTO)$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
 
-%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
-	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-	$(TXT_TO_XML) -d manpage -o $@+ $< && \
-	mv $@+ $@
+%.xml : %.txt $(ASCIIDOC_DEPS)
+	$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d manpage -o $@ $<
 
 user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
-	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-	$(TXT_TO_XML) -d book -o $@+ $< && \
-	mv $@+ $@
+	$(QUIET_ASCIIDOC)$(TXT_TO_XML) -d book -o $@ $<
 
 technical/api-index.txt: technical/api-index-skel.txt \
 	technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS))
@@ -399,49 +384,41 @@ SubmittingPatches.txt: SubmittingPatches
 	$(QUIET_GEN) cp $< $@
 
 XSLT = docbook.xsl
-XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
+XSLTOPTS =
+XSLTOPTS += --xinclude
+XSLTOPTS += --stringparam html.stylesheet docbook-xsl.css
+XSLTOPTS += --param generate.consistent.ids 1
 
 user-manual.html: user-manual.xml $(XSLT)
-	$(QUIET_XSLTPROC)$(RM) $@+ $@ && \
-	xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
-	mv $@+ $@
+	$(QUIET_XSLTPROC)xsltproc $(XSLTOPTS) -o $@ $(XSLT) $<
 
 git.info: user-manual.texi
 	$(QUIET_MAKEINFO)$(MAKEINFO) --no-split -o $@ user-manual.texi
 
 user-manual.texi: user-manual.xml
-	$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
-	$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@++ && \
-	$(PERL_PATH) fix-texi.perl <$@++ >$@+ && \
-	rm $@++ && \
-	mv $@+ $@
+	$(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout >$@+ && \
+	$(PERL_PATH) fix-texi.perl <$@+ >$@ && \
+	$(RM) $@+
 
 user-manual.pdf: user-manual.xml
-	$(QUIET_DBLATEX)$(RM) $@+ $@ && \
-	$(DBLATEX) -o $@+ $(DBLATEX_COMMON) $< && \
-	mv $@+ $@
+	$(QUIET_DBLATEX)$(DBLATEX) -o $@ $(DBLATEX_COMMON) $<
 
 gitman.texi: $(MAN_XML) cat-texi.perl texi.xsl
-	$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
+	$(QUIET_DB2TEXI) \
 	($(foreach xml,$(sort $(MAN_XML)),xsltproc -o $(xml)+ texi.xsl $(xml) && \
 		$(DOCBOOK2X_TEXI) --encoding=UTF-8 --to-stdout $(xml)+ && \
-		rm $(xml)+ &&) true) > $@++ && \
-	$(PERL_PATH) cat-texi.perl $@ <$@++ >$@+ && \
-	rm $@++ && \
-	mv $@+ $@
+		$(RM) $(xml)+ &&) true) > $@+ && \
+	$(PERL_PATH) cat-texi.perl $@ <$@+ >$@ && \
+	$(RM) $@+
 
 gitman.info: gitman.texi
 	$(QUIET_MAKEINFO)$(MAKEINFO) --no-split --no-validate $*.texi
 
 $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
-	$(QUIET_DB2TEXI)$(RM) $@+ $@ && \
-	$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@+ && \
-	mv $@+ $@
+	$(QUIET_DB2TEXI)$(DOCBOOK2X_TEXI) --to-stdout $*.xml >$@
 
-howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
-	$(QUIET_GEN)$(RM) $@+ $@ && \
-	'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(wildcard howto/*.txt)) >$@+ && \
-	mv $@+ $@
+howto-index.txt: howto-index.sh $(HOWTO_TXT)
+	$(QUIET_GEN)'$(SHELL_PATH_SQ)' ./howto-index.sh $(sort $(HOWTO_TXT)) >$@
 
 $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
 	$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
@@ -449,11 +426,10 @@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
 WEBDOC_DEST = /pub/software/scm/git/docs
 
 howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
-$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt GIT-ASCIIDOCFLAGS
-	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
+$(patsubst %.txt,%.html,$(HOWTO_TXT)): %.html : %.txt GIT-ASCIIDOCFLAGS
+	$(QUIET_ASCIIDOC) \
 	sed -e '1,/^$$/d' $< | \
-	$(TXT_TO_HTML) - >$@+ && \
-	mv $@+ $@
+	$(TXT_TO_HTML) - >$@
 
 install-webdoc : html
 	'$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST)
@@ -481,11 +457,20 @@ print-man1:
 	@for i in $(MAN1_TXT); do echo $$i; done
 
 lint-docs::
-	$(QUIET_LINT)$(PERL_PATH) lint-gitlink.perl
+	$(QUIET_LINT)$(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);
 
 ifeq ($(wildcard po/Makefile),po/Makefile)
 doc-l10n install-l10n::
 	$(MAKE) -C po $@
 endif
 
+# Delete the target file on error
+.DELETE_ON_ERROR:
+
 .PHONY: FORCE
diff --git a/Documentation/MyFirstContribution.txt b/Documentation/MyFirstContribution.txt
index 5e9b808f5f..015cf24631 100644
--- a/Documentation/MyFirstContribution.txt
+++ b/Documentation/MyFirstContribution.txt
@@ -23,6 +23,42 @@ useful additional context:
 - `Documentation/SubmittingPatches`
 - `Documentation/howto/new-command.txt`
 
+[[getting-help]]
+=== Getting Help
+
+If you get stuck, you can seek help in the following places.
+
+==== git@vger.kernel.org
+
+This is the main Git project mailing list where code reviews, version
+announcements, design discussions, and more take place. Those interested in
+contributing are welcome to post questions here. The Git list requires
+plain-text-only emails and prefers inline and bottom-posting when replying to
+mail; you will be CC'd in all replies to you. Optionally, you can subscribe to
+the list by sending an email to majordomo@vger.kernel.org with "subscribe git"
+in the body. The https://lore.kernel.org/git[archive] of this mailing list is
+available to view in a browser.
+
+==== https://groups.google.com/forum/#!forum/git-mentoring[git-mentoring@googlegroups.com]
+
+This mailing list is targeted to new contributors and was created as a place to
+post questions and receive answers outside of the public eye of the main list.
+Veteran contributors who are especially interested in helping mentor newcomers
+are present on the list. In order to avoid search indexers, group membership is
+required to view messages; anyone can join and no approval is required.
+
+==== https://web.libera.chat/#git-devel[#git-devel] on Libera Chat
+
+This IRC channel is for conversations between Git contributors. If someone is
+currently online and knows the answer to your question, you can receive help
+in real time. Otherwise, you can read the
+https://colabti.org/irclogger/irclogger_logs/git-devel[scrollback] to see
+whether someone answered you. IRC does not allow offline private messaging, so
+if you try to private message someone and then log out of IRC, they cannot
+respond to you. It's better to ask your questions in the channel so that you
+can be answered if you disconnect and so that others can learn from the
+conversation.
+
 [[getting-started]]
 == Getting Started
 
@@ -38,6 +74,26 @@ $ git clone https://github.com/git/git git
 $ cd git
 ----
 
+[[dependencies]]
+=== Installing Dependencies
+
+To build Git from source, you need to have a handful of dependencies installed
+on your system. For a hint of what's needed, you can take a look at
+`INSTALL`, paying close attention to the section about Git's dependencies on
+external programs and libraries. That document mentions a way to "test-drive"
+our freshly built Git without installing; that's the method we'll be using in
+this tutorial.
+
+Make sure that your environment has everything you need by building your brand
+new clone of Git from the above step:
+
+----
+$ make
+----
+
+NOTE: The Git build is parallelizable. `-j#` is not included above but you can
+use it as you prefer, here and elsewhere.
+
 [[identify-problem]]
 === Identify Problem to Solve
 
@@ -138,9 +194,6 @@ NOTE: When you are developing the Git project, it's preferred that you use the
 `DEVELOPER` flag; if there's some reason it doesn't work for you, you can turn
 it off, but it's a good idea to mention the problem to the mailing list.
 
-NOTE: The Git build is parallelizable. `-j#` is not included above but you can
-use it as you prefer, here and elsewhere.
-
 Great, now your new command builds happily on its own. But nobody invokes it.
 Let's change that.
 
@@ -196,7 +249,7 @@ component you're working on, followed by a blank line (always required) and then
 the body of your commit message, which should provide the bulk of the context.
 Remember to be explicit and provide the "Why" of your change, especially if it
 couldn't easily be understood from your diff. When editing your commit message,
-don't remove the Signed-off-by line which was added by `-s` above.
+don't remove the `Signed-off-by` trailer which was added by `-s` above.
 
 ----
 psuh: add a built-in by popular demand
@@ -266,14 +319,14 @@ function body:
 ...
 
 	git_config(git_default_config, NULL);
-	if (git_config_get_string_const("user.name", &cfg_name) > 0)
+	if (git_config_get_string_tmp("user.name", &cfg_name) > 0)
 		printf(_("No name is found in config\n"));
 	else
 		printf(_("Your name: %s\n"), cfg_name);
 ----
 
 `git_config()` will grab the configuration from config files known to Git and
-apply standard precedence rules. `git_config_get_string_const()` will look up
+apply standard precedence rules. `git_config_get_string_tmp()` will look up
 a specific key ("user.name") and give you the value. There are a number of
 single-key lookup functions like this one; you can see them all (and more info
 about how to use `git_config()`) in `Documentation/technical/api-config.txt`.
@@ -454,6 +507,9 @@ documentation is consistent with other Git and UNIX manpages; this makes life
 easier for your user, who can skip to the section they know contains the
 information they need.
 
+NOTE: Before trying to build the docs, make sure you have the package `asciidoc`
+installed.
+
 Now that you've written your manpage, you'll need to build it explicitly. We
 convert your AsciiDoc to troff which is man-readable like so:
 
@@ -469,8 +525,6 @@ $ make -C Documentation/ git-psuh.1
 $ man Documentation/git-psuh.1
 ----
 
-NOTE: You may need to install the package `asciidoc` to get this to work.
-
 While this isn't as satisfying as running through `git help`, you can at least
 check that your help page looks right.
 
@@ -534,6 +588,28 @@ you want to pass as a parameter something which would usually be interpreted as
 a flag.) `parse_options()` will terminate parsing when it reaches `--` and give
 you the rest of the options afterwards, untouched.
 
+Now that you have a usage hint, you can teach Git how to show it in the general
+command list shown by `git help git` or `git help -a`, which is generated from
+`command-list.txt`. Find the line for 'git-pull' so you can add your 'git-psuh'
+line above it in alphabetical order. Now, we can add some attributes about the
+command which impacts where it shows up in the aforementioned help commands. The
+top of `command-list.txt` shares some information about what each attribute
+means; in those help pages, the commands are sorted according to these
+attributes. `git psuh` is user-facing, or porcelain - so we will mark it as
+"mainporcelain". For "mainporcelain" commands, the comments at the top of
+`command-list.txt` indicate we can also optionally add an attribute from another
+list; since `git psuh` shows some information about the user's workspace but
+doesn't modify anything, let's mark it as "info". Make sure to keep your
+attributes in the same style as the rest of `command-list.txt` using spaces to
+align and delineate them:
+
+----
+git-prune-packed                        plumbingmanipulators
+git-psuh                                mainporcelain		info
+git-pull                                mainporcelain           remote
+git-push                                mainporcelain           remote
+----
+
 Build again. Now, when you run with `-h`, you should see your usage printed and
 your command terminated before anything else interesting happens. Great!
 
@@ -588,7 +664,7 @@ mention the right animal somewhere:
 ----
 test_expect_success 'runs correctly with no args and good output' '
 	git psuh >actual &&
-	test_i18ngrep Pony actual
+	grep Pony actual
 '
 ----
 
@@ -746,6 +822,14 @@ will automatically run your PRs through the CI even without the permission given
 but you will not be able to `/submit` your changes until someone allows you to
 use the tool.
 
+NOTE: You can typically find someone who can `/allow` you on GitGitGadget by
+either examining recent pull requests where someone has been granted `/allow`
+(https://github.com/gitgitgadget/git/pulls?utf8=%E2%9C%93&q=is%3Apr+is%3Aopen+%22%2Fallow%22[Search:
+is:pr is:open "/allow"]), in which case both the author and the person who
+granted the `/allow` can now `/allow` you, or by inquiring on the
+https://web.libera.chat/#git-devel[#git-devel] IRC channel on Libera Chat
+linking your pull request and asking for someone to `/allow` you.
+
 If the CI fails, you can update your changes with `git rebase -i` and push your
 branch again:
 
@@ -970,7 +1054,7 @@ reviewers the changes you've made that may not be as visible.
 You will also need to go and find the Message-Id of your previous cover letter.
 You can either note it when you send the first series, from the output of `git
 send-email`, or you can look it up on the
-https://public-inbox.org/git[mailing list]. Find your cover letter in the
+https://lore.kernel.org/git[mailing list]. Find your cover letter in the
 archives, click on it, then click "permalink" or "raw" to reveal the Message-Id
 header. It should match:
 
@@ -1059,11 +1143,25 @@ After a few days, you will hopefully receive a reply to your patchset with some
 comments. Woohoo! Now you can get back to work.
 
 It's good manners to reply to each comment, notifying the reviewer that you have
-made the change requested, feel the original is better, or that the comment
+made the change suggested, feel the original is better, or that the comment
 inspired you to do something a new way which is superior to both the original
 and the suggested change. This way reviewers don't need to inspect your v2 to
 figure out whether you implemented their comment or not.
 
+Reviewers may ask you about what you wrote in the patchset, either in
+the proposed commit log message or in the changes themselves.  You
+should answer these questions in your response messages, but often the
+reason why reviewers asked these questions to understand what you meant
+to write is because your patchset needed clarification to be understood.
+
+Do not be satisfied by just answering their questions in your response
+and hear them say that they now understand what you wanted to say.
+Update your patches to clarify the points reviewers had trouble with,
+and prepare your v2; the words you used to explain your v1 to answer
+reviewers' questions may be useful thing to use.  Your goal is to make
+your v2 clear enough so that it becomes unnecessary for you to give the
+same explanation to the next person who reads it.
+
 If you are going to push back on a comment, be polite and explain why you feel
 your original is better; be prepared that the reviewer may still disagree with
 you, and the rest of the community may weigh in on one side or the other. As
@@ -1096,8 +1194,8 @@ look at the section below this one for some context.)
 [[after-approval]]
 === After Review Approval
 
-The Git project has four integration branches: `pu`, `next`, `master`, and
-`maint`. Your change will be placed into `pu` fairly early on by the maintainer
+The Git project has four integration branches: `seen`, `next`, `master`, and
+`maint`. Your change will be placed into `seen` fairly early on by the maintainer
 while it is still in the review process; from there, when it is ready for wider
 testing, it will be merged into `next`. Plenty of early testers use `next` and
 may report issues. Eventually, changes in `next` will make it to `master`,
diff --git a/Documentation/MyFirstObjectWalk.txt b/Documentation/MyFirstObjectWalk.txt
index 9cc9f7804b..45eb84d8b4 100644
--- a/Documentation/MyFirstObjectWalk.txt
+++ b/Documentation/MyFirstObjectWalk.txt
@@ -17,7 +17,7 @@ revision walk is used for operations like `git log`.
 
 - `Documentation/user-manual.txt` under "Hacking Git" contains some coverage of
   the revision walker in its various incarnations.
-- `Documentation/technical/api-revision-walking.txt`
+- `revision.h`
 - https://eagain.net/articles/git-for-computer-scientists/[Git for Computer Scientists]
   gives a good overview of the types of objects in Git and what your object
   walk is really describing.
@@ -119,9 +119,8 @@ parameters provided by the user over the CLI.
 
 `nr` represents the number of `rev_cmdline_entry` present in the array.
 
-`alloc` is used by the `ALLOC_GROW` macro. Check
-`Documentation/technical/api-allocation-growing.txt` - this variable is used to
-track the allocated size of the list.
+`alloc` is used by the `ALLOC_GROW` macro. Check `cache.h` - this variable is
+used to track the allocated size of the list.
 
 Per entry, we find:
 
@@ -183,30 +182,6 @@ its `init_log_defaults()` sets its own state (`decoration_style`) and asks
 `grep` and `diff` to initialize themselves by calling each of their
 initialization functions.
 
-For our first example within `git walken`, we don't intend to use any other
-components within Git, and we don't have any configuration to do.  However, we
-may want to add some later, so for now, we can add an empty placeholder. Create
-a new function in `builtin/walken.c`:
-
-----
-static void init_walken_defaults(void)
-{
-	/*
-	 * We don't actually need the same components `git log` does; leave this
-	 * empty for now.
-	 */
-}
-----
-
-Make sure to add a line invoking it inside of `cmd_walken()`.
-
-----
-int cmd_walken(int argc, const char **argv, const char *prefix)
-{
-	init_walken_defaults();
-}
-----
-
 ==== Configuring From `.gitconfig`
 
 Next, we should have a look at any relevant configuration settings (i.e.,
@@ -358,9 +333,6 @@ static void walken_commit_walk(struct rev_info *rev)
 	...
 
 	while ((commit = get_revision(rev))) {
-		if (!commit)
-			continue;
-
 		strbuf_reset(&prettybuf);
 		pp_commit_easy(CMIT_FMT_ONELINE, commit, &prettybuf);
 		puts(prettybuf.buf);
@@ -392,17 +364,9 @@ Next, let's try to filter the commits we see based on their author. This is
 equivalent to running `git log --author=<pattern>`. We can add a filter by
 modifying `rev_info.grep_filter`, which is a `struct grep_opt`.
 
-First some setup. Add `init_grep_defaults()` to `init_walken_defaults()` and add
-`grep_config()` to `git_walken_config()`:
+First some setup. Add `grep_config()` to `git_walken_config()`:
 
 ----
-static void init_walken_defaults(void)
-{
-	init_grep_defaults(the_repository);
-}
-
-...
-
 static int git_walken_config(const char *var, const char *value, void *cb)
 {
 	grep_config(var, value, cb);
diff --git a/Documentation/RelNotes/1.5.0.txt b/Documentation/RelNotes/1.5.0.txt
index daf4bdb0d7..d6d42f3183 100644
--- a/Documentation/RelNotes/1.5.0.txt
+++ b/Documentation/RelNotes/1.5.0.txt
@@ -251,7 +251,7 @@ Updates in v1.5.0 since v1.4.4 series
    the repository when that happens.
 
 
-* Crufts removal
+* Cruft removal
 
  - We used to say "old commits are retrievable using reflog and
    'master@{yesterday}' syntax as long as you haven't run
@@ -379,7 +379,7 @@ Updates in v1.5.0 since v1.4.4 series
  - The value of i18n.commitencoding in the originating
    repository is recorded in the commit object on the "encoding"
    header, if it is not UTF-8.  git-log and friends notice this,
-   and reencodes the message to the log output encoding when
+   and re-encodes the message to the log output encoding when
    displaying, if they are different.  The log output encoding
    is determined by "git log --encoding=<encoding>",
    i18n.logoutputencoding configuration, or i18n.commitencoding
diff --git a/Documentation/RelNotes/1.6.0.3.txt b/Documentation/RelNotes/1.6.0.3.txt
index ae0577836a..ad36c0f0b7 100644
--- a/Documentation/RelNotes/1.6.0.3.txt
+++ b/Documentation/RelNotes/1.6.0.3.txt
@@ -50,7 +50,7 @@ Fixes since v1.6.0.2
   if the working tree is currently dirty.
 
 * "git for-each-ref --format=%(subject)" fixed for commits with no
-  no newline in the message body.
+  newline in the message body.
 
 * "git remote" fixed to protect printf from user input.
 
diff --git a/Documentation/RelNotes/1.6.2.txt b/Documentation/RelNotes/1.6.2.txt
index ad060f4f89..980adfb315 100644
--- a/Documentation/RelNotes/1.6.2.txt
+++ b/Documentation/RelNotes/1.6.2.txt
@@ -11,7 +11,7 @@ push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
   http://git.or.cz/gitwiki/GitFaq#non-bare
-  http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+  https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the
 transition plan.
diff --git a/Documentation/RelNotes/1.6.3.txt b/Documentation/RelNotes/1.6.3.txt
index 418c685cf8..4bcff945e0 100644
--- a/Documentation/RelNotes/1.6.3.txt
+++ b/Documentation/RelNotes/1.6.3.txt
@@ -11,7 +11,7 @@ push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
   http://git.or.cz/gitwiki/GitFaq#non-bare
-  http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+  https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the
 transition plan.
diff --git a/Documentation/RelNotes/1.6.4.txt b/Documentation/RelNotes/1.6.4.txt
index 7a904419f7..a2a34b43a7 100644
--- a/Documentation/RelNotes/1.6.4.txt
+++ b/Documentation/RelNotes/1.6.4.txt
@@ -11,7 +11,7 @@ push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
   http://git.or.cz/gitwiki/GitFaq#non-bare
-  http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+  https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the
 transition plan.
diff --git a/Documentation/RelNotes/1.6.5.4.txt b/Documentation/RelNotes/1.6.5.4.txt
index d3a2a3e712..344333de66 100644
--- a/Documentation/RelNotes/1.6.5.4.txt
+++ b/Documentation/RelNotes/1.6.5.4.txt
@@ -10,7 +10,7 @@ Fixes since v1.6.5.3
 
  * "git prune-packed" gave progress output even when its standard error is
    not connected to a terminal; this caused cron jobs that run it to
-   produce crufts.
+   produce cruft.
 
  * "git pack-objects --all-progress" is an option to ask progress output
    from write-object phase _if_ progress output were to be produced, and
diff --git a/Documentation/RelNotes/1.6.5.txt b/Documentation/RelNotes/1.6.5.txt
index ee141c19ad..6c7f7da7eb 100644
--- a/Documentation/RelNotes/1.6.5.txt
+++ b/Documentation/RelNotes/1.6.5.txt
@@ -22,7 +22,7 @@ push running this release will issue a big warning when the
 configuration variable is missing.  Please refer to:
 
   http://git.or.cz/gitwiki/GitFaq#non-bare
-  http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+  https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
 for more details on the reason why this change is needed and the
 transition plan.
diff --git a/Documentation/RelNotes/1.6.6.txt b/Documentation/RelNotes/1.6.6.txt
index c50b59c495..3ed1e01433 100644
--- a/Documentation/RelNotes/1.6.6.txt
+++ b/Documentation/RelNotes/1.6.6.txt
@@ -64,7 +64,7 @@ users will fare this time.
    Please refer to:
 
    http://git.or.cz/gitwiki/GitFaq#non-bare
-   http://thread.gmane.org/gmane.comp.version-control.git/107758/focus=108007
+   https://lore.kernel.org/git/7vbptlsuyv.fsf@gitster.siamese.dyndns.org/
 
    for more details on the reason why this change is needed and the
    transition process that already took place so far.
diff --git a/Documentation/RelNotes/1.7.0.2.txt b/Documentation/RelNotes/1.7.0.2.txt
index fcb46ca6a4..73ed2b5278 100644
--- a/Documentation/RelNotes/1.7.0.2.txt
+++ b/Documentation/RelNotes/1.7.0.2.txt
@@ -34,7 +34,7 @@ Fixes since v1.7.0.1
  * "git status" in 1.7.0 lacked the optimization we used to have in 1.6.X series
    to speed up scanning of large working tree.
 
- * "gitweb" did not diagnose parsing errors properly while reading tis configuration
+ * "gitweb" did not diagnose parsing errors properly while reading its configuration
    file.
 
 And other minor fixes and documentation updates.
diff --git a/Documentation/RelNotes/1.7.10.4.txt b/Documentation/RelNotes/1.7.10.4.txt
index 326670df6e..57597f2bf3 100644
--- a/Documentation/RelNotes/1.7.10.4.txt
+++ b/Documentation/RelNotes/1.7.10.4.txt
@@ -7,7 +7,7 @@ Fixes since v1.7.10.3
  * The message file for Swedish translation has been updated a bit.
 
  * A name taken from mailmap was copied into an internal buffer
-   incorrectly and could overun the buffer if it is too long.
+   incorrectly and could overrun the buffer if it is too long.
 
  * A malformed commit object that has a header line chomped in the
    middle could kill git with a NULL pointer dereference.
diff --git a/Documentation/RelNotes/1.7.12.3.txt b/Documentation/RelNotes/1.7.12.3.txt
index ecda427a35..4b822976b8 100644
--- a/Documentation/RelNotes/1.7.12.3.txt
+++ b/Documentation/RelNotes/1.7.12.3.txt
@@ -25,7 +25,7 @@ Fixes since v1.7.12.2
    its Accept-Encoding header.
 
  * "git receive-pack" (the counterpart to "git push") did not give
-   progress output while processing objects it received to the puser
+   progress output while processing objects it received to the user
    when run over the smart-http protocol.
 
  * "git status" honored the ignore=dirty settings in .gitmodules but
diff --git a/Documentation/RelNotes/1.7.5.3.txt b/Documentation/RelNotes/1.7.5.3.txt
index 9c03353af2..1d24edcf2f 100644
--- a/Documentation/RelNotes/1.7.5.3.txt
+++ b/Documentation/RelNotes/1.7.5.3.txt
@@ -22,7 +22,7 @@ Fixes since v1.7.5.2
  * "git log --stdin path" with an input that has additional pathspec
    used to corrupt memory.
 
- * "git send-pack" (hence "git push") over smalt-HTTP protocol could
+ * "git send-pack" (hence "git push") over smart-HTTP protocol could
    deadlock when the client side pack-object died early.
 
  * Compressed tarball gitweb generates used to be made with the timestamp
diff --git a/Documentation/RelNotes/1.8.0.txt b/Documentation/RelNotes/1.8.0.txt
index 43883c14f0..63d6e4afa4 100644
--- a/Documentation/RelNotes/1.8.0.txt
+++ b/Documentation/RelNotes/1.8.0.txt
@@ -233,7 +233,7 @@ to them for details).
    together, misdetected branches.
 
  * "git receive-pack" (the counterpart to "git push") did not give
-   progress output while processing objects it received to the puser
+   progress output while processing objects it received to the user
    when run over the smart-http protocol.
 
  * When you misspell the command name you give to the "exec" action in
diff --git a/Documentation/RelNotes/1.8.4.1.txt b/Documentation/RelNotes/1.8.4.1.txt
index 96090ef599..c257beb114 100644
--- a/Documentation/RelNotes/1.8.4.1.txt
+++ b/Documentation/RelNotes/1.8.4.1.txt
@@ -15,7 +15,7 @@ Fixes since v1.8.4
    in 1.8.4-rc1).
 
  * "git rebase -i" and other scripted commands were feeding a
-   random, data dependant error message to 'echo' and expecting it
+   random, data dependent error message to 'echo' and expecting it
    to come out literally.
 
  * Setting the "submodule.<name>.path" variable to the empty
diff --git a/Documentation/RelNotes/1.8.4.txt b/Documentation/RelNotes/1.8.4.txt
index 02f681b710..2e7529928b 100644
--- a/Documentation/RelNotes/1.8.4.txt
+++ b/Documentation/RelNotes/1.8.4.txt
@@ -58,7 +58,7 @@ Foreign interfaces, subsystems and ports.
    credential helper interface from Git.pm.
 
  * Update build for Cygwin 1.[57].  Torsten Bögershausen reports that
-   this is fine with Cygwin 1.7 ($gmane/225824) so let's try moving it
+   this is fine with Cygwin 1.7 (cf. <51A606A0.5060101@web.de>) so let's try moving it
    ahead.
 
  * The credential helper to talk to keychain on OS X (in contrib/) has
@@ -365,7 +365,7 @@ details).
    (merge 2fbd4f9 mh/maint-lockfile-overflow later to maint).
 
  * Invocations of "git checkout" used internally by "git rebase" were
-   counted as "checkout", and affected later "git checkout -" to the
+   counted as "checkout", and affected later "git checkout -", which took
    the user to an unexpected place.
    (merge 3bed291 rr/rebase-checkout-reflog later to maint).
 
diff --git a/Documentation/RelNotes/2.1.3.txt b/Documentation/RelNotes/2.1.3.txt
index acc9ebb886..0dfb17c4fc 100644
--- a/Documentation/RelNotes/2.1.3.txt
+++ b/Documentation/RelNotes/2.1.3.txt
@@ -13,7 +13,7 @@ Git v2.1.3 Release Notes
    they are new enough to support the `--output` option.
 
  * "git pack-objects" forgot to disable the codepath to generate
-   object recheability bitmap when it needs to split the resulting
+   object reachability bitmap when it needs to split the resulting
    pack.
 
  * "gitweb" used deprecated CGI::startfrom, which was removed from
diff --git a/Documentation/RelNotes/2.10.0.txt b/Documentation/RelNotes/2.10.0.txt
index f4da28ab66..3792b7d03d 100644
--- a/Documentation/RelNotes/2.10.0.txt
+++ b/Documentation/RelNotes/2.10.0.txt
@@ -478,7 +478,7 @@ notes for details).
  * One part of "git am" had an oddball helper function that called
    stuff from outside "his" as opposed to calling what we have "ours",
    which was not gender-neutral and also inconsistent with the rest of
-   the system where outside stuff is usuall called "theirs" in
+   the system where outside stuff is usually called "theirs" in
    contrast to "ours".
 
  * "git blame file" allowed the lineage of lines in the uncommitted,
diff --git a/Documentation/RelNotes/2.10.2.txt b/Documentation/RelNotes/2.10.2.txt
index c4d4397023..abbd331508 100644
--- a/Documentation/RelNotes/2.10.2.txt
+++ b/Documentation/RelNotes/2.10.2.txt
@@ -86,7 +86,7 @@ Fixes since v2.10.1
    by refusing to check out a branch that is already checked out in
    another worktree.  However, this also prevented checking out a
    branch, which is designated as the primary branch of a bare
-   reopsitory, in a worktree that is connected to the bare
+   repository, in a worktree that is connected to the bare
    repository.  The check has been corrected to allow it.
 
  * "git rebase" immediately after "git clone" failed to find the fork
diff --git a/Documentation/RelNotes/2.11.1.txt b/Documentation/RelNotes/2.11.1.txt
index 9cd14c8197..7d35cf186d 100644
--- a/Documentation/RelNotes/2.11.1.txt
+++ b/Documentation/RelNotes/2.11.1.txt
@@ -104,7 +104,7 @@ Fixes since v2.11
    "git difftool --dir-diff" from a subdirectory never worked. This
    has been fixed.
 
- * "git p4" that tracks multile p4 paths imported a single changelist
+ * "git p4" that tracks multiple p4 paths imported a single changelist
    that touches files in these multiple paths as one commit, followed
    by many empty commits.  This has been fixed.
 
diff --git a/Documentation/RelNotes/2.12.0.txt b/Documentation/RelNotes/2.12.0.txt
index ef8b97da9b..d2f6a83614 100644
--- a/Documentation/RelNotes/2.12.0.txt
+++ b/Documentation/RelNotes/2.12.0.txt
@@ -315,7 +315,7 @@ notes for details).
    "git difftool --dir-diff" from a subdirectory never worked. This
    has been fixed.
 
- * "git p4" that tracks multile p4 paths imported a single changelist
+ * "git p4" that tracks multiple p4 paths imported a single changelist
    that touches files in these multiple paths as one commit, followed
    by many empty commits.  This has been fixed.
 
diff --git a/Documentation/RelNotes/2.13.0.txt b/Documentation/RelNotes/2.13.0.txt
index aa99d4b3ce..2a47b4cb0c 100644
--- a/Documentation/RelNotes/2.13.0.txt
+++ b/Documentation/RelNotes/2.13.0.txt
@@ -177,7 +177,7 @@ UI, Workflows & Features
    been changed to enable "--decorate".
 
  * The output from "git status --short" has been extended to show
-   various kinds of dirtyness in submodules differently; instead of to
+   various kinds of dirtiness in submodules differently; instead of to
    "M" for modified, 'm' and '?' can be shown to signal changes only
    to the working tree of the submodule but not the commit that is
    checked out.
diff --git a/Documentation/RelNotes/2.13.3.txt b/Documentation/RelNotes/2.13.3.txt
index 5d76ad5310..384e4de265 100644
--- a/Documentation/RelNotes/2.13.3.txt
+++ b/Documentation/RelNotes/2.13.3.txt
@@ -25,7 +25,7 @@ Fixes since v2.13.2
  * The code to pick up and execute command alias definition from the
    configuration used to switch to the top of the working tree and
    then come back when the expanded alias was executed, which was
-   unnecessarilyl complex.  Attempt to simplify the logic by using the
+   unnecessarily complex.  Attempt to simplify the logic by using the
    early-config mechanism that does not chdir around.
 
  * "git add -p" were updated in 2.12 timeframe to cope with custom
@@ -35,7 +35,7 @@ Fixes since v2.13.2
  * Fix a recent regression to "git rebase -i" and add tests that would
    have caught it and others.
 
- * An unaligned 32-bit access in pack-bitmap code ahs been corrected.
+ * An unaligned 32-bit access in pack-bitmap code has been corrected.
 
  * Tighten error checks for invalid "git apply" input.
 
diff --git a/Documentation/RelNotes/2.14.0.txt b/Documentation/RelNotes/2.14.0.txt
index 4246c68ff5..2711a2529d 100644
--- a/Documentation/RelNotes/2.14.0.txt
+++ b/Documentation/RelNotes/2.14.0.txt
@@ -141,7 +141,7 @@ Performance, Internal Implementation, Development Support etc.
  * Some platforms have ulong that is smaller than time_t, and our
    historical use of ulong for timestamp would mean they cannot
    represent some timestamp that the platform allows.  Invent a
-   separate and dedicated timestamp_t (so that we can distingiuish
+   separate and dedicated timestamp_t (so that we can distinguish
    timestamps and a vanilla ulongs, which along is already a good
    move), and then declare uintmax_t is the type to be used as the
    timestamp_t.
@@ -442,7 +442,7 @@ notes for details).
  * The code to pick up and execute command alias definition from the
    configuration used to switch to the top of the working tree and
    then come back when the expanded alias was executed, which was
-   unnecessarilyl complex.  Attempt to simplify the logic by using the
+   unnecessarily complex.  Attempt to simplify the logic by using the
    early-config mechanism that does not chdir around.
 
  * Fix configuration codepath to pay proper attention to commondir
diff --git a/Documentation/RelNotes/2.14.6.txt b/Documentation/RelNotes/2.14.6.txt
new file mode 100644
index 0000000000..72b7af6799
--- /dev/null
+++ b/Documentation/RelNotes/2.14.6.txt
@@ -0,0 +1,54 @@
+Git v2.14.6 Release Notes
+=========================
+
+This release addresses the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387.
+
+Fixes since v2.14.5
+-------------------
+
+ * CVE-2019-1348:
+   The --export-marks option of git fast-import is exposed also via
+   the in-stream command feature export-marks=... and it allows
+   overwriting arbitrary paths.
+
+ * CVE-2019-1349:
+   When submodules are cloned recursively, under certain circumstances
+   Git could be fooled into using the same Git directory twice. We now
+   require the directory to be empty.
+
+ * CVE-2019-1350:
+   Incorrect quoting of command-line arguments allowed remote code
+   execution during a recursive clone in conjunction with SSH URLs.
+
+ * CVE-2019-1351:
+   While the only permitted drive letters for physical drives on
+   Windows are letters of the US-English alphabet, this restriction
+   does not apply to virtual drives assigned via subst <letter>:
+   <path>. Git mistook such paths for relative paths, allowing writing
+   outside of the worktree while cloning.
+
+ * CVE-2019-1352:
+   Git was unaware of NTFS Alternate Data Streams, allowing files
+   inside the .git/ directory to be overwritten during a clone.
+
+ * CVE-2019-1353:
+   When running Git in the Windows Subsystem for Linux (also known as
+   "WSL") while accessing a working directory on a regular Windows
+   drive, none of the NTFS protections were active.
+
+ * CVE-2019-1354:
+   Filenames on Linux/Unix can contain backslashes. On Windows,
+   backslashes are directory separators. Git did not use to refuse to
+   write out tracked files with such filenames.
+
+ * CVE-2019-1387:
+   Recursive clones are currently affected by a vulnerability that is
+   caused by too-lax validation of submodule names, allowing very
+   targeted attacks via remote code execution in recursive clones.
+
+Credit for finding these vulnerabilities goes to Microsoft Security
+Response Center, in particular to Nicolas Joly. The `fast-import`
+fixes were provided by Jeff King, the other fixes by Johannes
+Schindelin with help from Garima Singh.
diff --git a/Documentation/RelNotes/2.15.4.txt b/Documentation/RelNotes/2.15.4.txt
new file mode 100644
index 0000000000..dc241cba34
--- /dev/null
+++ b/Documentation/RelNotes/2.15.4.txt
@@ -0,0 +1,11 @@
+Git v2.15.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6 to address
+the security issues CVE-2019-1348, CVE-2019-1349, CVE-2019-1350,
+CVE-2019-1351, CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, and
+CVE-2019-1387; see the release notes for that version for details.
+
+In conjunction with a vulnerability that was fixed in v2.20.2,
+`.gitmodules` is no longer allowed to contain entries of the form
+`submodule.<name>.update=!command`.
diff --git a/Documentation/RelNotes/2.16.0.txt b/Documentation/RelNotes/2.16.0.txt
index 0c81c5915f..b474781ed8 100644
--- a/Documentation/RelNotes/2.16.0.txt
+++ b/Documentation/RelNotes/2.16.0.txt
@@ -407,7 +407,7 @@ Fixes since v2.15
    (merge eef3df5a93 bw/pathspec-match-submodule-boundary later to maint).
 
  * Amending commits in git-gui broke the author name that is non-ascii
-   due to incorrect enconding conversion.
+   due to incorrect encoding conversion.
 
  * Recent update to the submodule configuration code broke "diff-tree"
    by accidentally stopping to read from the index upfront.
diff --git a/Documentation/RelNotes/2.16.3.txt b/Documentation/RelNotes/2.16.3.txt
index 64a0bcb0d2..f0121a8f2d 100644
--- a/Documentation/RelNotes/2.16.3.txt
+++ b/Documentation/RelNotes/2.16.3.txt
@@ -24,7 +24,7 @@ Fixes since v2.16.2
 
  * The http tracing code, often used to debug connection issues,
    learned to redact potentially sensitive information from its output
-   so that it can be more safely sharable.
+   so that it can be more safely shareable.
 
  * Crash fix for a corner case where an error codepath tried to unlock
    what it did not acquire lock on.
diff --git a/Documentation/RelNotes/2.16.6.txt b/Documentation/RelNotes/2.16.6.txt
new file mode 100644
index 0000000000..438306e60b
--- /dev/null
+++ b/Documentation/RelNotes/2.16.6.txt
@@ -0,0 +1,8 @@
+Git v2.16.6 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6 and in
+v2.15.4 addressing the security issues CVE-2019-1348, CVE-2019-1349,
+CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, CVE-2019-1353,
+CVE-2019-1354, and CVE-2019-1387; see the release notes for those
+versions for details.
diff --git a/Documentation/RelNotes/2.17.0.txt b/Documentation/RelNotes/2.17.0.txt
index c2cf891f71..8b17c26033 100644
--- a/Documentation/RelNotes/2.17.0.txt
+++ b/Documentation/RelNotes/2.17.0.txt
@@ -216,7 +216,7 @@ Fixes since v2.16
 
  * The http tracing code, often used to debug connection issues,
    learned to redact potentially sensitive information from its output
-   so that it can be more safely sharable.
+   so that it can be more safely shareable.
    (merge 8ba18e6fa4 jt/http-redact-cookies later to maint).
 
  * Crash fix for a corner case where an error codepath tried to unlock
diff --git a/Documentation/RelNotes/2.17.3.txt b/Documentation/RelNotes/2.17.3.txt
new file mode 100644
index 0000000000..5a46c94271
--- /dev/null
+++ b/Documentation/RelNotes/2.17.3.txt
@@ -0,0 +1,12 @@
+Git v2.17.3 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6 and in
+v2.15.4 addressing the security issues CVE-2019-1348, CVE-2019-1349,
+CVE-2019-1350, CVE-2019-1351, CVE-2019-1352, CVE-2019-1353,
+CVE-2019-1354, and CVE-2019-1387; see the release notes for those
+versions for details.
+
+In addition, `git fsck` was taught to identify `.gitmodules` entries
+of the form `submodule.<name>.update=!command`, which have been
+disallowed in v2.15.4.
diff --git a/Documentation/RelNotes/2.17.4.txt b/Documentation/RelNotes/2.17.4.txt
new file mode 100644
index 0000000000..7d794ca01a
--- /dev/null
+++ b/Documentation/RelNotes/2.17.4.txt
@@ -0,0 +1,16 @@
+Git v2.17.4 Release Notes
+=========================
+
+This release is to address the security issue: CVE-2020-5260
+
+Fixes since v2.17.3
+-------------------
+
+ * With a crafted URL that contains a newline in it, the credential
+   helper machinery can be fooled to give credential information for
+   a wrong host.  The attack has been made impossible by forbidding
+   a newline character in any value passed via the credential
+   protocol.
+
+Credit for finding the vulnerability goes to Felix Wilhelm of Google
+Project Zero.
diff --git a/Documentation/RelNotes/2.17.5.txt b/Documentation/RelNotes/2.17.5.txt
new file mode 100644
index 0000000000..2abb821a73
--- /dev/null
+++ b/Documentation/RelNotes/2.17.5.txt
@@ -0,0 +1,22 @@
+Git v2.17.5 Release Notes
+=========================
+
+This release is to address a security issue: CVE-2020-11008
+
+Fixes since v2.17.4
+-------------------
+
+ * With a crafted URL that contains a newline or empty host, or lacks
+   a scheme, the credential helper machinery can be fooled into
+   providing credential information that is not appropriate for the
+   protocol in use and host being contacted.
+
+   Unlike the vulnerability CVE-2020-5260 fixed in v2.17.4, the
+   credentials are not for a host of the attacker's choosing; instead,
+   they are for some unspecified host (based on how the configured
+   credential helper handles an absent "host" parameter).
+
+   The attack has been made impossible by refusing to work with
+   under-specified credential patterns.
+
+Credit for finding the vulnerability goes to Carlo Arenas.
diff --git a/Documentation/RelNotes/2.17.6.txt b/Documentation/RelNotes/2.17.6.txt
new file mode 100644
index 0000000000..2f181e8064
--- /dev/null
+++ b/Documentation/RelNotes/2.17.6.txt
@@ -0,0 +1,16 @@
+Git v2.17.6 Release Notes
+=========================
+
+This release addresses the security issues CVE-2021-21300.
+
+Fixes since v2.17.5
+-------------------
+
+ * CVE-2021-21300:
+   On case-insensitive file systems with support for symbolic links,
+   if Git is configured globally to apply delay-capable clean/smudge
+   filters (such as Git LFS), Git could be fooled into running
+   remote code during a clone.
+
+Credit for finding and fixing this vulnerability goes to Matheus
+Tavares, helped by Johannes Schindelin.
diff --git a/Documentation/RelNotes/2.18.0.txt b/Documentation/RelNotes/2.18.0.txt
index 3ea280cf68..6c8a0e97c1 100644
--- a/Documentation/RelNotes/2.18.0.txt
+++ b/Documentation/RelNotes/2.18.0.txt
@@ -179,7 +179,7 @@ Performance, Internal Implementation, Development Support etc.
    (merge 00a3da2a13 nd/remove-ignore-env-field later to maint).
 
  * Code to find the length to uniquely abbreviate object names based
-   on packfile content, which is a relatively recent addtion, has been
+   on packfile content, which is a relatively recent addition, has been
    optimized to use the same fan-out table.
 
  * The mechanism to use parse-options API to automate the command line
diff --git a/Documentation/RelNotes/2.18.2.txt b/Documentation/RelNotes/2.18.2.txt
new file mode 100644
index 0000000000..98b168aade
--- /dev/null
+++ b/Documentation/RelNotes/2.18.2.txt
@@ -0,0 +1,8 @@
+Git v2.18.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4
+and in v2.17.3, addressing the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387; see the release notes
+for those versions for details.
diff --git a/Documentation/RelNotes/2.18.3.txt b/Documentation/RelNotes/2.18.3.txt
new file mode 100644
index 0000000000..25143f0cec
--- /dev/null
+++ b/Documentation/RelNotes/2.18.3.txt
@@ -0,0 +1,5 @@
+Git v2.18.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.18.4.txt b/Documentation/RelNotes/2.18.4.txt
new file mode 100644
index 0000000000..e8ef858a00
--- /dev/null
+++ b/Documentation/RelNotes/2.18.4.txt
@@ -0,0 +1,5 @@
+Git v2.18.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.18.5.txt b/Documentation/RelNotes/2.18.5.txt
new file mode 100644
index 0000000000..dfb1de4ceb
--- /dev/null
+++ b/Documentation/RelNotes/2.18.5.txt
@@ -0,0 +1,6 @@
+Git v2.18.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6 to address
+the security issue CVE-2021-21300; see the release notes for that
+version for details.
diff --git a/Documentation/RelNotes/2.19.0.txt b/Documentation/RelNotes/2.19.0.txt
index a06ccf6e2a..891c79b9cb 100644
--- a/Documentation/RelNotes/2.19.0.txt
+++ b/Documentation/RelNotes/2.19.0.txt
@@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.
  * The conversion to pass "the_repository" and then "a_repository"
    throughout the object access API continues.
 
- * Continuing with the idea to programatically enumerate various
+ * Continuing with the idea to programmatically enumerate various
    pieces of data required for command line completion, teach the
    codebase to report the list of configuration variables
    subcommands care about to help complete them.
diff --git a/Documentation/RelNotes/2.19.3.txt b/Documentation/RelNotes/2.19.3.txt
new file mode 100644
index 0000000000..92d7f89de6
--- /dev/null
+++ b/Documentation/RelNotes/2.19.3.txt
@@ -0,0 +1,8 @@
+Git v2.19.3 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4
+and in v2.17.3, addressing the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387; see the release notes
+for those versions for details.
diff --git a/Documentation/RelNotes/2.19.4.txt b/Documentation/RelNotes/2.19.4.txt
new file mode 100644
index 0000000000..35d0ae561b
--- /dev/null
+++ b/Documentation/RelNotes/2.19.4.txt
@@ -0,0 +1,5 @@
+Git v2.19.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.19.5.txt b/Documentation/RelNotes/2.19.5.txt
new file mode 100644
index 0000000000..18a4dcbfd6
--- /dev/null
+++ b/Documentation/RelNotes/2.19.5.txt
@@ -0,0 +1,5 @@
+Git v2.19.5 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.19.6.txt b/Documentation/RelNotes/2.19.6.txt
new file mode 100644
index 0000000000..bcca6cd258
--- /dev/null
+++ b/Documentation/RelNotes/2.19.6.txt
@@ -0,0 +1,6 @@
+Git v2.19.6 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6 and
+v2.18.5 to address the security issue CVE-2021-21300; see the
+release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.20.0.txt b/Documentation/RelNotes/2.20.0.txt
index e71fe3dee1..3dd7e6e1fc 100644
--- a/Documentation/RelNotes/2.20.0.txt
+++ b/Documentation/RelNotes/2.20.0.txt
@@ -119,7 +119,7 @@ UI, Workflows & Features
    alias expansion.
 
  * The documentation of "git gc" has been updated to mention that it
-   is no longer limited to "pruning away crufts" but also updates
+   is no longer limited to "pruning away cruft" but also updates
    ancillary files like commit-graph as a part of repository
    optimization.
 
diff --git a/Documentation/RelNotes/2.20.2.txt b/Documentation/RelNotes/2.20.2.txt
new file mode 100644
index 0000000000..8e680cb9fb
--- /dev/null
+++ b/Documentation/RelNotes/2.20.2.txt
@@ -0,0 +1,18 @@
+Git v2.20.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4
+and in v2.17.3, addressing the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, and CVE-2019-1387; see the release notes
+for those versions for details.
+
+The change to disallow `submodule.<name>.update=!command` entries in
+`.gitmodules` which was introduced v2.15.4 (and for which v2.17.3
+added explicit fsck checks) fixes the vulnerability in v2.20.x where a
+recursive clone followed by a submodule update could execute code
+contained within the repository without the user explicitly having
+asked for that (CVE-2019-19604).
+
+Credit for finding this vulnerability goes to Joern Schneeweisz,
+credit for the fixes goes to Jonathan Nieder.
diff --git a/Documentation/RelNotes/2.20.3.txt b/Documentation/RelNotes/2.20.3.txt
new file mode 100644
index 0000000000..f6eccd103b
--- /dev/null
+++ b/Documentation/RelNotes/2.20.3.txt
@@ -0,0 +1,5 @@
+Git v2.20.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.20.4.txt b/Documentation/RelNotes/2.20.4.txt
new file mode 100644
index 0000000000..5a9e24e470
--- /dev/null
+++ b/Documentation/RelNotes/2.20.4.txt
@@ -0,0 +1,5 @@
+Git v2.20.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.20.5.txt b/Documentation/RelNotes/2.20.5.txt
new file mode 100644
index 0000000000..1dfb784ded
--- /dev/null
+++ b/Documentation/RelNotes/2.20.5.txt
@@ -0,0 +1,6 @@
+Git v2.20.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5
+and v2.19.6 to address the security issue CVE-2021-21300; see
+the release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.21.1.txt b/Documentation/RelNotes/2.21.1.txt
new file mode 100644
index 0000000000..b7594151e4
--- /dev/null
+++ b/Documentation/RelNotes/2.21.1.txt
@@ -0,0 +1,12 @@
+Git v2.21.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4,
+v2.17.3 and in v2.20.2, addressing the security issues CVE-2019-1348,
+CVE-2019-1349, CVE-2019-1350, CVE-2019-1351, CVE-2019-1352,
+CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and CVE-2019-19604;
+see the release notes for those versions for details.
+
+Additionally, this version also includes a couple of fixes for the
+Windows-specific quoting of command-line arguments when Git executes
+a Unix shell on Windows.
diff --git a/Documentation/RelNotes/2.21.2.txt b/Documentation/RelNotes/2.21.2.txt
new file mode 100644
index 0000000000..a0fb83bb53
--- /dev/null
+++ b/Documentation/RelNotes/2.21.2.txt
@@ -0,0 +1,5 @@
+Git v2.21.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.21.3.txt b/Documentation/RelNotes/2.21.3.txt
new file mode 100644
index 0000000000..2ca0aa5c62
--- /dev/null
+++ b/Documentation/RelNotes/2.21.3.txt
@@ -0,0 +1,5 @@
+Git v2.21.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.21.4.txt b/Documentation/RelNotes/2.21.4.txt
new file mode 100644
index 0000000000..0089dd6702
--- /dev/null
+++ b/Documentation/RelNotes/2.21.4.txt
@@ -0,0 +1,6 @@
+Git v2.21.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6 and v2.20.5 to address the security issue CVE-2021-21300;
+see the release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.22.2.txt b/Documentation/RelNotes/2.22.2.txt
new file mode 100644
index 0000000000..940a23f0d9
--- /dev/null
+++ b/Documentation/RelNotes/2.22.2.txt
@@ -0,0 +1,8 @@
+Git v2.22.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4,
+v2.17.3, v2.20.2 and in v2.21.1, addressing the security issues
+CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351,
+CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and
+CVE-2019-19604; see the release notes for those versions for details.
diff --git a/Documentation/RelNotes/2.22.3.txt b/Documentation/RelNotes/2.22.3.txt
new file mode 100644
index 0000000000..57296f6d17
--- /dev/null
+++ b/Documentation/RelNotes/2.22.3.txt
@@ -0,0 +1,5 @@
+Git v2.22.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.22.4.txt b/Documentation/RelNotes/2.22.4.txt
new file mode 100644
index 0000000000..8b5f3e3f37
--- /dev/null
+++ b/Documentation/RelNotes/2.22.4.txt
@@ -0,0 +1,5 @@
+Git v2.22.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.22.5.txt b/Documentation/RelNotes/2.22.5.txt
new file mode 100644
index 0000000000..6b280d9321
--- /dev/null
+++ b/Documentation/RelNotes/2.22.5.txt
@@ -0,0 +1,7 @@
+Git v2.22.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6,
+v2.18.5, v2.19.6, v2.20.5 and v2.21.4 to address the security
+issue CVE-2021-21300; see the release notes for these versions
+for details.
diff --git a/Documentation/RelNotes/2.23.1.txt b/Documentation/RelNotes/2.23.1.txt
new file mode 100644
index 0000000000..2083b492ce
--- /dev/null
+++ b/Documentation/RelNotes/2.23.1.txt
@@ -0,0 +1,8 @@
+Git v2.23.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4,
+v2.17.3, v2.20.2 and in v2.21.1, addressing the security issues
+CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351,
+CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and
+CVE-2019-19604; see the release notes for those versions for details.
diff --git a/Documentation/RelNotes/2.23.2.txt b/Documentation/RelNotes/2.23.2.txt
new file mode 100644
index 0000000000..b697cbe0e3
--- /dev/null
+++ b/Documentation/RelNotes/2.23.2.txt
@@ -0,0 +1,5 @@
+Git v2.23.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.23.3.txt b/Documentation/RelNotes/2.23.3.txt
new file mode 100644
index 0000000000..2e35490137
--- /dev/null
+++ b/Documentation/RelNotes/2.23.3.txt
@@ -0,0 +1,5 @@
+Git v2.23.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.23.4.txt b/Documentation/RelNotes/2.23.4.txt
new file mode 100644
index 0000000000..6e5424d0da
--- /dev/null
+++ b/Documentation/RelNotes/2.23.4.txt
@@ -0,0 +1,7 @@
+Git v2.23.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4 and v2.22.5 to address the security
+issue CVE-2021-21300; see the release notes for these versions
+for details.
diff --git a/Documentation/RelNotes/2.24.1.txt b/Documentation/RelNotes/2.24.1.txt
new file mode 100644
index 0000000000..18104850fe
--- /dev/null
+++ b/Documentation/RelNotes/2.24.1.txt
@@ -0,0 +1,8 @@
+Git v2.24.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.14.6, v2.15.4,
+v2.17.3, v2.20.2 and in v2.21.1, addressing the security issues
+CVE-2019-1348, CVE-2019-1349, CVE-2019-1350, CVE-2019-1351,
+CVE-2019-1352, CVE-2019-1353, CVE-2019-1354, CVE-2019-1387, and
+CVE-2019-19604; see the release notes for those versions for details.
diff --git a/Documentation/RelNotes/2.24.2.txt b/Documentation/RelNotes/2.24.2.txt
new file mode 100644
index 0000000000..0049f65503
--- /dev/null
+++ b/Documentation/RelNotes/2.24.2.txt
@@ -0,0 +1,5 @@
+Git v2.24.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.24.3.txt b/Documentation/RelNotes/2.24.3.txt
new file mode 100644
index 0000000000..5302e0f73b
--- /dev/null
+++ b/Documentation/RelNotes/2.24.3.txt
@@ -0,0 +1,5 @@
+Git v2.24.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.24.4.txt b/Documentation/RelNotes/2.24.4.txt
new file mode 100644
index 0000000000..4e216eec2a
--- /dev/null
+++ b/Documentation/RelNotes/2.24.4.txt
@@ -0,0 +1,7 @@
+Git v2.24.4 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5 and v2.23.4 to address the
+security issue CVE-2021-21300; see the release notes for these
+versions for details.
diff --git a/Documentation/RelNotes/2.25.0.txt b/Documentation/RelNotes/2.25.0.txt
new file mode 100644
index 0000000000..91ceb34927
--- /dev/null
+++ b/Documentation/RelNotes/2.25.0.txt
@@ -0,0 +1,370 @@
+Git 2.25 Release Notes
+======================
+
+Updates since v2.24
+-------------------
+
+Backward compatibility notes
+
+
+UI, Workflows & Features
+
+ * A tutorial on object enumeration has been added.
+
+ * The branch description ("git branch --edit-description") has been
+   used to fill the body of the cover letters by the format-patch
+   command; this has been enhanced so that the subject can also be
+   filled.
+
+ * "git rebase --preserve-merges" has been marked as deprecated; this
+   release stops advertising it in the "git rebase -h" output.
+
+ * The code to generate multi-pack index learned to show (or not to
+   show) progress indicators.
+
+ * "git apply --3way" learned to honor merge.conflictStyle
+   configuration variable, like merges would.
+
+ * The custom format for "git log --format=<format>" learned the l/L
+   placeholder that is similar to e/E that fills in the e-mail
+   address, but only the local part on the left side of '@'.
+
+ * Documentation pages for "git shortlog" now list commit limiting
+   options explicitly.
+
+ * The patterns to detect function boundary for Elixir language has
+   been added.
+
+ * The completion script (in contrib/) learned that the "--onto"
+   option of "git rebase" can take its argument as the value of the
+   option.
+
+ * The userdiff machinery has been taught that "async def" is another
+   way to begin a "function" in Python.
+
+ * "git range-diff" learned to take the "--notes=<ref>" and the
+   "--no-notes" options to control the commit notes included in the
+   log message that gets compared.
+
+ * "git rev-parse --show-toplevel" run outside of any working tree did
+   not error out, which has been corrected.
+
+ * A few commands learned to take the pathspec from the standard input
+   or a named file, instead of taking it as the command line
+   arguments, with the "--pathspec-from-file" option.
+
+ * "git submodule" learned a subcommand "set-url".
+
+ * "git log" family learned "--pretty=reference" that gives the name
+   of a commit in the format that is often used to refer to it in log
+   messages.
+
+ * The interaction between "git clone --recurse-submodules" and
+   alternate object store was ill-designed.  The documentation and
+   code have been taught to make more clear recommendations when the
+   users see failures.
+
+ * Management of sparsely checked-out working tree has gained a
+   dedicated "sparse-checkout" command.
+
+ * Miscellaneous small UX improvements on "git-p4".
+
+ * "git sparse-checkout list" subcommand learned to give its output in
+   a more concise form when the "cone" mode is in effect.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Debugging support for lazy cloning has been a bit improved.
+
+ * Move the definition of a set of bitmask constants from 0ctal
+   literal to (1U<<count) notation.
+
+ * Test updates to prepare for SHA-2 transition continues.
+
+ * Crufty code and logic accumulated over time around the object
+   parsing and low-level object access used in "git fsck" have been
+   cleaned up.
+
+ * The implementation of "git log --graph" got refactored and then its
+   output got simplified.
+
+ * Follow recent push to move API docs from Documentation/ to header
+   files and update config.h
+
+ * "git bundle" has been taught to use the parse options API.  "git
+   bundle verify" learned "--quiet" and "git bundle create" learned
+   options to control the progress output.
+
+ * Handling of commit objects that use non UTF-8 encoding during
+   "rebase -i" has been improved.
+
+ * The beginning of rewriting "git add -i" in C.
+
+ * A label used in the todo list that are generated by "git rebase
+   --rebase-merges" is used as a part of a refname; the logic to come
+   up with the label has been tightened to avoid names that cannot be
+   used as such.
+
+ * The logic to avoid duplicate label names generated by "git rebase
+   --rebase-merges" forgot that the machinery itself uses "onto" as a
+   label name, which must be avoided by auto-generated labels, which
+   has been corrected.
+
+ * We have had compatibility fallback macro definitions for "PRIuMAX",
+   "PRIu32", etc. but did not for "PRIdMAX", while the code used the
+   last one apparently without any hiccup reported recently.  The
+   fallback macro definitions for these <inttypes.h> macros that must
+   appear in C99 systems have been removed.
+
+ * Recently we have declared that GIT_TEST_* variables take the
+   usual boolean values (it used to be that some used "non-empty
+   means true" and taking GIT_TEST_VAR=YesPlease as true); make
+   sure we notice and fail when non-bool strings are given to
+   these variables.
+
+ * Users of oneway_merge() (like "reset --hard") learned to take
+   advantage of fsmonitor to avoid unnecessary lstat(2) calls.
+
+ * Performance tweak on "git push" into a repository with many refs
+   that point at objects we have never heard of.
+
+ * PerfTest fix to avoid stale result mixed up with the latest round
+   of test results.
+
+ * Hide lower-level verify_signed-buffer() API as a pure helper to
+   implement the public check_signature() function, in order to
+   encourage new callers to use the correct and more strict
+   validation.
+
+ * Unnecessary reading of state variables back from the disk during
+   sequencer operation has been reduced.
+
+ * The code has been made to avoid gmtime() and localtime() and prefer
+   their reentrant counterparts.
+
+ * In a repository with many packfiles, the cost of the procedure that
+   avoids registering the same packfile twice was unnecessarily high
+   by using an inefficient search algorithm, which has been corrected.
+
+ * Redo "git name-rev" to avoid recursive calls.
+
+ * FreeBSD CI support via Cirrus-CI has been added.
+
+
+Fixes since v2.24
+-----------------
+
+ * "rebase -i" ceased to run post-commit hook by mistake in an earlier
+   update, which has been corrected.
+
+ * "git notes copy $original" ought to copy the notes attached to the
+   original object to HEAD, but a mistaken tightening to command line
+   parameter validation made earlier disabled that feature by mistake.
+
+ * When all files from some subdirectory were renamed to the root
+   directory, the directory rename heuristics would fail to detect that
+   as a rename/merge of the subdirectory to the root directory, which has
+   been corrected.
+
+ * Code clean-up and a bugfix in the logic used to tell worktree local
+   and repository global refs apart.
+   (merge f45f88b2e4 sg/dir-trie-fixes later to maint).
+
+ * "git stash save" in a working tree that is sparsely checked out
+   mistakenly removed paths that are outside the area of interest.
+   (merge 4a58c3d7f7 js/update-index-ignore-removal-for-skip-worktree later to maint).
+
+ * "git rev-parse --git-path HEAD.lock" did not give the right path
+   when run in a secondary worktree.
+   (merge 76a53d640f js/git-path-head-dot-lock-fix later to maint).
+
+ * "git merge --no-commit" needs "--no-ff" if you do not want to move
+   HEAD, which has been corrected in the manual page for "git bisect".
+   (merge 8dd327b246 ma/bisect-doc-sample-update later to maint).
+
+ * "git worktree add" internally calls "reset --hard" that should not
+   descend into submodules, even when submodule.recurse configuration
+   is set, but it was affected.  This has been corrected.
+   (merge 4782cf2ab6 pb/no-recursive-reset-hard-in-worktree-add later to maint).
+
+ * Messages from die() etc. can be mixed up from multiple processes
+   without even line buffering on Windows, which has been worked
+   around.
+   (merge 116d1fa6c6 js/vreportf-wo-buffering later to maint).
+
+ * HTTP transport had possible allocator/deallocator mismatch, which
+   has been corrected.
+
+ * The watchman integration for fsmonitor was racy, which has been
+   corrected to be more conservative.
+   (merge dd0b61f577 kw/fsmonitor-watchman-fix later to maint).
+
+ * Fetching from multiple remotes into the same repository in parallel
+   had a bad interaction with the recent change to (optionally) update
+   the commit-graph after a fetch job finishes, as these parallel
+   fetches compete with each other.  Which has been corrected.
+
+ * Recent update to "git stash pop" made the command empty the index
+   when run with the "--quiet" option, which has been corrected.
+
+ * "git fetch" codepath had a big "do not lazily fetch missing objects
+   when I ask if something exists" switch.  This has been corrected by
+   marking the "does this thing exist?" calls with "if not please do not
+   lazily fetch it" flag.
+
+ * Test update to avoid wasted cycles.
+   (merge e0316695ec sg/skip-skipped-prereq later to maint).
+
+ * Error handling after "git push" finishes sending the packdata and
+   waits for the response to the remote side has been improved.
+   (merge ad7a403268 jk/send-pack-remote-failure later to maint).
+
+ * Some codepaths in "gitweb" that forgot to escape URLs generated
+   based on end-user input have been corrected.
+   (merge a376e37b2c jk/gitweb-anti-xss later to maint).
+
+ * CI jobs for macOS has been made less chatty when updating perforce
+   package used during testing.
+   (merge 0dbc4a0edf jc/azure-ci-osx-fix-fix later to maint).
+
+ * "git unpack-objects" used to show progress based only on the number
+   of received and unpacked objects, which stalled when it has to
+   handle an unusually large object.  It now shows the throughput as
+   well.
+   (merge bae60ba7e9 sg/unpack-progress-throughput later to maint).
+
+ * The sequencer machinery compared the HEAD and the state it is
+   attempting to commit to decide if the result would be a no-op
+   commit, even when amending a commit, which was incorrect, and
+   has been corrected.
+
+ * The code to parse GPG output used to assume incorrectly that the
+   finterprint for the primary key would always be present for a valid
+   signature, which has been corrected.
+   (merge 67a6ea6300 hi/gpg-optional-pkfp-fix later to maint).
+
+ * "git submodule status" and "git submodule status --cached" show
+   different things, but the documentation did not cover them
+   correctly, which has been corrected.
+   (merge 8d483c8408 mg/doc-submodule-status-cached later to maint).
+
+ * "git reset --patch $object" without any pathspec should allow a
+   tree object to be given, but incorrectly required a committish,
+   which has been corrected.
+
+ * "git submodule status" that is run from a subdirectory of the
+   superproject did not work well, which has been corrected.
+   (merge 1f3aea22c7 mg/submodule-status-from-a-subdirectory later to maint).
+
+ * The revision walking machinery uses resources like per-object flag
+   bits that need to be reset before a new iteration of walking
+   begins, but the resources related to topological walk were not
+   cleared correctly, which has been corrected.
+   (merge 0aa0c2b2ec mh/clear-topo-walk-upon-reset later to maint).
+
+ * TravisCI update.
+   (merge 176441bfb5 sg/osx-force-gcc-9 later to maint).
+
+ * While running "revert" or "cherry-pick --edit" for multiple
+   commits, a recent regression incorrectly detected "nothing to
+   commit, working tree clean", instead of replaying the commits,
+   which has been corrected.
+   (merge befd4f6a81 sg/assume-no-todo-update-in-cherry-pick later to maint).
+
+ * Work around a issue where a FD that is left open when spawning a
+   child process and is kept open in the child can interfere with the
+   operation in the parent process on Windows.
+
+ * One kind of progress messages were always given during commit-graph
+   generation, instead of following the "if it takes more than two
+   seconds, show progress" pattern, which has been corrected.
+
+ * "git rebase" did not work well when format.useAutoBase
+   configuration variable is set, which has been corrected.
+
+ * The "diff" machinery learned not to lose added/removed blank lines
+   in the context when --ignore-blank-lines and --function-context are
+   used at the same time.
+   (merge 0bb313a552 rs/xdiff-ignore-ws-w-func-context later to maint).
+
+ * The test on "fast-import" used to get stuck when "fast-import" died
+   in the middle.
+   (merge 0d9b0d7885 sg/t9300-robustify later to maint).
+
+ * "git format-patch" can take a set of configured format.notes values
+   to specify which notes refs to use in the log message part of the
+   output.  The behaviour of this was not consistent with multiple
+   --notes command line options, which has been corrected.
+   (merge e0f9095aaa dl/format-patch-notes-config-fixup later to maint).
+
+ * "git p4" used to ignore lfs.storage configuration variable, which
+   has been corrected.
+   (merge ea94b16fb8 rb/p4-lfs later to maint).
+
+ * Assorted fixes to the directory traversal API.
+   (merge 6836d2fe06 en/fill-directory-fixes later to maint).
+
+ * Forbid pathnames that the platform's filesystem cannot represent on
+   MinGW.
+   (merge 4dc42c6c18 js/mingw-reserved-filenames later to maint).
+
+ * "git rebase --signoff" stopped working when the command was written
+   in C, which has been corrected.
+   (merge 4fe7e43c53 en/rebase-signoff-fix later to maint).
+
+ * An earlier update to Git for Windows declared that a tree object is
+   invalid if it has a path component with backslash in it, which was
+   overly strict, which has been corrected.  The only protection the
+   Windows users need is to prevent such path (or any path that their
+   filesystem cannot check out) from entering the index.
+   (merge 224c7d70fa js/mingw-loosen-overstrict-tree-entry-checks later to maint).
+
+ * The code to write split commit-graph file(s) upon fetching computed
+   bogus value for the parameter used in splitting the resulting
+   files, which has been corrected.
+   (merge 63020f175f ds/commit-graph-set-size-mult later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge 80736d7c5e jc/am-show-current-patch-docfix later to maint).
+   (merge 8b656572ca sg/commit-graph-usage-fix later to maint).
+   (merge 6c02042139 mr/clone-dir-exists-to-path-exists later to maint).
+   (merge 44ae131e38 sg/blame-indent-heuristics-is-now-the-default later to maint).
+   (merge 0115e5d929 dl/doc-diff-no-index-implies-exit-code later to maint).
+   (merge 270de6acbe en/t6024-style later to maint).
+   (merge 14c4776d75 ns/test-desc-typofix later to maint).
+   (merge 68d40f30c4 dj/typofix-merge-strat later to maint).
+   (merge f66e0401ab jk/optim-in-pack-idx-conversion later to maint).
+   (merge 169bed7421 rs/parse-options-dup-null-fix later to maint).
+   (merge 51bd6be32d rs/use-copy-array-in-mingw-shell-command-preparation later to maint).
+   (merge b018719927 ma/t7004 later to maint).
+   (merge 932757b0cc ar/install-doc-update-cmds-needing-the-shell later to maint).
+   (merge 46efd28be1 ep/guard-kset-tar-headers later to maint).
+   (merge 9e5afdf997 ec/fetch-mark-common-refs-trace2 later to maint).
+   (merge f0e58b3fe8 pb/submodule-update-fetches later to maint).
+   (merge 2a02262078 dl/t5520-cleanup later to maint).
+   (merge a4fb016ba1 js/pkt-line-h-typofix later to maint).
+   (merge 54a7a64613 rs/simplify-prepare-cmd later to maint).
+   (merge 3eae30e464 jk/lore-is-the-archive later to maint).
+   (merge 14b7664df8 dl/lore-is-the-archive later to maint).
+   (merge 0e40a73a4c po/bundle-doc-clonable later to maint).
+   (merge e714b898c6 as/t7812-missing-redirects-fix later to maint).
+   (merge 528d9e6d01 jk/perf-wo-git-dot-pm later to maint).
+   (merge fc42f20e24 sg/test-squelch-noise-in-commit-bulk later to maint).
+   (merge c64368e3a2 bc/t9001-zsh-in-posix-emulation-mode later to maint).
+   (merge 11de8dd7ef dr/branch-usage-casefix later to maint).
+   (merge e05e8cf074 rs/archive-zip-code-cleanup later to maint).
+   (merge 147ee35558 rs/commit-export-env-simplify later to maint).
+   (merge 4507ecc771 rs/patch-id-use-oid-to-hex later to maint).
+   (merge 51a0a4ed95 mr/bisect-use-after-free later to maint).
+   (merge cc2bd5c45d pb/submodule-doc-xref later to maint).
+   (merge df5be01669 ja/doc-markup-cleanup later to maint).
+   (merge 7c5cea7242 mr/bisect-save-pointer-to-const-string later to maint).
+   (merge 20a67e8ce9 js/use-test-tool-on-path later to maint).
+   (merge 4e61b2214d ew/packfile-syscall-optim later to maint).
+   (merge ace0f86c7f pb/clarify-line-log-doc later to maint).
+   (merge 763a59e71c en/merge-recursive-oid-eq-simplify later to maint).
+   (merge 4e2c4c0d4f do/gitweb-typofix-in-comments later to maint).
+   (merge 421c0ffb02 jb/doc-multi-pack-idx-fix later to maint).
+   (merge f8740c586b pm/am-in-body-header-doc-update later to maint).
+   (merge 5814d44d9b tm/doc-submodule-absorb-fix later to maint).
diff --git a/Documentation/RelNotes/2.25.1.txt b/Documentation/RelNotes/2.25.1.txt
new file mode 100644
index 0000000000..cd869b02bb
--- /dev/null
+++ b/Documentation/RelNotes/2.25.1.txt
@@ -0,0 +1,55 @@
+Git 2.25.1 Release Notes
+========================
+
+Fixes since v2.25
+-----------------
+
+ * "git commit" gives output similar to "git status" when there is
+   nothing to commit, but without honoring the advise.statusHints
+   configuration variable, which has been corrected.
+
+ * has_object_file() said "no" given an object registered to the
+   system via pretend_object_file(), making it inconsistent with
+   read_object_file(), causing lazy fetch to attempt fetching an
+   empty tree from promisor remotes.
+
+ * The code that tries to skip over the entries for the paths in a
+   single directory using the cache-tree was not careful enough
+   against corrupt index file.
+
+ * Complete an update to tutorial that encourages "git switch" over
+   "git checkout" that was done only half-way.
+
+ * Reduce unnecessary round-trip when running "ls-remote" over the
+   stateless RPC mechanism.
+
+ * "git restore --staged" did not correctly update the cache-tree
+   structure, resulting in bogus trees to be written afterwards, which
+   has been corrected.
+
+ * The code recently added to move to the entry beyond the ones in the
+   same directory in the index in the sparse-cone mode did not count
+   the number of entries to skip over incorrectly, which has been
+   corrected.
+
+ * Work around test breakages caused by custom regex engine used in
+   libasan, when address sanitizer is used with more recent versions
+   of gcc and clang.
+
+ * "git fetch --refmap=" option has got a better documentation.
+
+ * Corner case bugs in "git clean" that stems from a (necessarily for
+   performance reasons) awkward calling convention in the directory
+   enumeration API has been corrected.
+
+ * "git grep --no-index" should not get affected by the contents of
+   the .gitmodules file but when "--recurse-submodules" is given or
+   the "submodule.recurse" variable is set, it did.  Now these
+   settings are ignored in the "--no-index" mode.
+
+ * Technical details of the bundle format has been documented.
+
+ * Unhelpful warning messages during documentation build have been
+   squelched.
+
+Also contains various documentation updates, code clean-ups and minor fixups.
diff --git a/Documentation/RelNotes/2.25.2.txt b/Documentation/RelNotes/2.25.2.txt
new file mode 100644
index 0000000000..303c53a17f
--- /dev/null
+++ b/Documentation/RelNotes/2.25.2.txt
@@ -0,0 +1,60 @@
+Git 2.25.2 Release Notes
+========================
+
+Fixes since v2.25.1
+-------------------
+
+ * Minor bugfixes to "git add -i" that has recently been rewritten in C.
+
+ * An earlier update to show the location of working tree in the error
+   message did not consider the possibility that a git command may be
+   run in a bare repository, which has been corrected.
+
+ * The "--recurse-submodules" option of various subcommands did not
+   work well when run in an alternate worktree, which has been
+   corrected.
+
+ * Running "git rm" on a submodule failed unnecessarily when
+   .gitmodules is only cache-dirty, which has been corrected.
+
+ * "git rebase -i" identifies existing commits in its todo file with
+   their abbreviated object name, which could become ambigous as it
+   goes to create new commits, and has a mechanism to avoid ambiguity
+   in the main part of its execution.  A few other cases however were
+   not covered by the protection against ambiguity, which has been
+   corrected.
+
+ * The index-pack code now diagnoses a bad input packstream that
+   records the same object twice when it is used as delta base; the
+   code used to declare a software bug when encountering such an
+   input, but it is an input error.
+
+ * The code to automatically shrink the fan-out in the notes tree had
+   an off-by-one bug, which has been killed.
+
+ * "git check-ignore" did not work when the given path is explicitly
+   marked as not ignored with a negative entry in the .gitignore file.
+
+ * The merge-recursive machinery failed to refresh the cache entry for
+   a merge result in a couple of places, resulting in an unnecessary
+   merge failure, which has been fixed.
+
+ * Fix for a bug revealed by a recent change to make the protocol v2
+   the default.
+
+ * "git merge signed-tag" while lacking the public key started to say
+   "No signature", which was utterly wrong.  This regression has been
+   reverted.
+
+ * MinGW's poll() emulation has been improved.
+
+ * "git show" and others gave an object name in raw format in its
+   error output, which has been corrected to give it in hex.
+
+ * Both "git ls-remote -h" and "git grep -h" give short usage help,
+   like any other Git subcommand, but it is not unreasonable to expect
+   that the former would behave the same as "git ls-remote --head"
+   (there is no other sensible behaviour for the latter).  The
+   documentation has been updated in an attempt to clarify this.
+
+Also contains various documentation updates, code clean-ups and minor fixups.
diff --git a/Documentation/RelNotes/2.25.3.txt b/Documentation/RelNotes/2.25.3.txt
new file mode 100644
index 0000000000..15f7f21f10
--- /dev/null
+++ b/Documentation/RelNotes/2.25.3.txt
@@ -0,0 +1,5 @@
+Git v2.25.3 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.25.4.txt b/Documentation/RelNotes/2.25.4.txt
new file mode 100644
index 0000000000..0dbb5daeec
--- /dev/null
+++ b/Documentation/RelNotes/2.25.4.txt
@@ -0,0 +1,5 @@
+Git v2.25.4 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.25.5.txt b/Documentation/RelNotes/2.25.5.txt
new file mode 100644
index 0000000000..fcb9566b15
--- /dev/null
+++ b/Documentation/RelNotes/2.25.5.txt
@@ -0,0 +1,7 @@
+Git v2.25.5 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4 and v2.24.4 to address
+the security issue CVE-2021-21300; see the release notes for
+these versions for details.
diff --git a/Documentation/RelNotes/2.26.0.txt b/Documentation/RelNotes/2.26.0.txt
new file mode 100644
index 0000000000..3a7a734c26
--- /dev/null
+++ b/Documentation/RelNotes/2.26.0.txt
@@ -0,0 +1,341 @@
+Git 2.26 Release Notes
+======================
+
+Updates since v2.25
+-------------------
+
+Backward compatibility notes
+
+ * "git rebase" uses a different backend that is based on the 'merge'
+   machinery by default.  There are a few known differences in the
+   behaviour from the traditional machinery based on patch+apply.
+
+   If your workflow is negatively affected by this change, please
+   report it to git@vger.kernel.org so that we can take a look into
+   it.  After doing so, you can set the 'rebase.backend' configuration
+   variable to 'apply', in order to use the old default behaviour in
+   the meantime.
+
+
+UI, Workflows & Features
+
+ * Sample credential helper for using .netrc has been updated to work
+   out of the box.
+
+ * gpg.minTrustLevel configuration variable has been introduced to
+   tell various signature verification codepaths the required minimum
+   trust level.
+
+ * The command line completion (in contrib/) learned to complete
+   subcommands and arguments to "git worktree".
+
+ * Disambiguation logic to tell revisions and pathspec apart has been
+   tweaked so that backslash-escaped glob special characters do not
+   count in the "wildcards are pathspec" rule.
+
+ * One effect of specifying where the GIT_DIR is (either with the
+   environment variable, or with the "git --git-dir=<where> cmd"
+   option) is to disable the repository discovery.  This has been
+   placed a bit more stress in the documentation, as new users often
+   get confused.
+
+ * Two help messages given when "git add" notices the user gave it
+   nothing to add have been updated to use advise() API.
+
+ * A new version of fsmonitor-watchman hook has been introduced, to
+   avoid races.
+
+ * "git config" learned to show in which "scope", in addition to in
+   which file, each config setting comes from.
+
+ * The basic 7 colors learned the brighter counterparts
+   (e.g. "brightred").
+
+ * "git sparse-checkout" learned a new "add" subcommand.
+
+ * A configuration element used for credential subsystem can now use
+   wildcard pattern to specify for which set of URLs the entry
+   applies.
+
+ * "git clone --recurse-submodules --single-branch" now uses the same
+   single-branch option when cloning the submodules.
+
+ * "git rm" and "git stash" learns the new "--pathspec-from-file"
+   option.
+
+ * "git am --show-current-patch" is a way to show the piece of e-mail
+   for the stopped step, which is not suitable to directly feed "git
+   apply" (it is designed to be a good "git am" input).  It learned a
+   new option to show only the patch part.
+
+ * Handling of conflicting renames in merge-recursive have further
+   been made consistent with how existing codepaths try to mimic what
+   is done to add/add conflicts.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Tell .editorconfig that in this project, *.txt files are indented
+   with tabs.
+
+ * The test-lint machinery knew to check "VAR=VAL shell_function"
+   construct, but did not check "VAR= shell_function", which has been
+   corrected.
+
+ * Replace "git config --bool" calls with "git config --type=bool" in
+   sample templates.
+
+ * The effort to move "git-add--interactive" to C continues.
+
+ * Improve error message generation for "git submodule add".
+
+ * Preparation of test scripts for the day when the object names will
+   use SHA-256 continues.
+
+ * Warn programmers about pretend_object_file() that allows the code
+   to tentatively use in-core objects.
+
+ * The way "git pack-objects" reuses objects stored in existing pack
+   to generate its result has been improved.
+
+ * The transport protocol version 2 becomes the default one.
+
+ * Traditionally, we avoided threaded grep while searching in objects
+   (as opposed to files in the working tree) as accesses to the object
+   layer is not thread-safe.  This limitation is getting lifted.
+
+ * "git rebase -i" (and friends) used to unnecessarily check out the
+   tip of the branch to be rebased, which has been corrected.
+
+ * A low-level API function get_oid(), that accepts various ways to
+   name an object, used to issue end-user facing error messages
+   without l10n, which has been updated to be translatable.
+
+ * Unneeded connectivity check is now disabled in a partial clone when
+   fetching into it.
+
+ * Some rough edges in the sparse-checkout feature, especially around
+   the cone mode, have been cleaned up.
+
+ * The diff-* plumbing family of subcommands now pay attention to the
+   diff.wsErrorHighlight configuration, which has been ignored before;
+   this allows "git add -p" to also show the whitespace problems to
+   the end user.
+
+ * Some codepaths were given a repository instance as a parameter to
+   work in the repository, but passed the_repository instance to its
+   callees, which has been cleaned up (somewhat).
+
+ * Memory footprint and performance of "git name-rev" has been
+   improved.
+
+ * The object reachability bitmap machinery and the partial cloning
+   machinery were not prepared to work well together, because some
+   object-filtering criteria that partial clones use inherently rely
+   on object traversal, but the bitmap machinery is an optimization
+   to bypass that object traversal.  There however are some cases
+   where they can work together, and they were taught about them.
+
+ * "git rebase" has learned to use the merge backend (i.e. the
+   machinery that drives "rebase -i") by default, while allowing
+   "--apply" option to use the "apply" backend (e.g. the moral
+   equivalent of "format-patch piped to am").  The rebase.backend
+   configuration variable can be set to customize.
+
+ * Underlying machinery of "git bisect--helper" is being refactored
+   into pieces that are more easily reused.
+
+
+Fixes since v2.25
+-----------------
+
+ * "git commit" gives output similar to "git status" when there is
+   nothing to commit, but without honoring the advise.statusHints
+   configuration variable, which has been corrected.
+
+ * has_object_file() said "no" given an object registered to the
+   system via pretend_object_file(), making it inconsistent with
+   read_object_file(), causing lazy fetch to attempt fetching an
+   empty tree from promisor remotes.
+
+ * Complete an update to tutorial that encourages "git switch" over
+   "git checkout" that was done only half-way.
+
+ * C pedantry ;-) fix.
+
+ * The code that tries to skip over the entries for the paths in a
+   single directory using the cache-tree was not careful enough
+   against corrupt index file.
+
+ * Reduce unnecessary round-trip when running "ls-remote" over the
+   stateless RPC mechanism.
+
+ * "git restore --staged" did not correctly update the cache-tree
+   structure, resulting in bogus trees to be written afterwards, which
+   has been corrected.
+
+ * The code recently added to move to the entry beyond the ones in the
+   same directory in the index in the sparse-cone mode did not count
+   the number of entries to skip over incorrectly, which has been
+   corrected.
+
+ * Rendering by "git log --graph" of ancestry lines leading to a merge
+   commit were made suboptimal to waste vertical space a bit with a
+   recent update, which has been corrected.
+
+ * Work around test breakages caused by custom regex engine used in
+   libasan, when address sanitizer is used with more recent versions
+   of gcc and clang.
+
+ * Minor bugfixes to "git add -i" that has recently been rewritten in C.
+
+ * "git fetch --refmap=" option has got a better documentation.
+
+ * "git checkout X" did not correctly fail when X is not a local
+   branch but could name more than one remote-tracking branches
+   (i.e. to be dwimmed as the starting point to create a corresponding
+   local branch), which has been corrected.
+   (merge fa74180d08 am/checkout-file-and-ref-ref-ambiguity later to maint).
+
+ * Corner case bugs in "git clean" that stems from a (necessarily for
+   performance reasons) awkward calling convention in the directory
+   enumeration API has been corrected.
+
+ * A fetch that is told to recursively fetch updates in submodules
+   inevitably produces reams of output, and it becomes hard to spot
+   error messages.  The command has been taught to enumerate
+   submodules that had errors at the end of the operation.
+   (merge 0222540827 es/fetch-show-failed-submodules-atend later to maint).
+
+ * The "--recurse-submodules" option of various subcommands did not
+   work well when run in an alternate worktree, which has been
+   corrected.
+
+ * Futureproofing a test not to depend on the current implementation
+   detail.
+
+ * Running "git rm" on a submodule failed unnecessarily when
+   .gitmodules is only cache-dirty, which has been corrected.
+
+ * C pedantry ;-) fix.
+
+ * "git grep --no-index" should not get affected by the contents of
+   the .gitmodules file but when "--recurse-submodules" is given or
+   the "submodule.recurse" variable is set, it did.  Now these
+   settings are ignored in the "--no-index" mode.
+
+ * Technical details of the bundle format has been documented.
+
+ * Unhelpful warning messages during documentation build have been squelched.
+
+ * "git rebase -i" identifies existing commits in its todo file with
+   their abbreviated object name, which could become ambiguous as it
+   goes to create new commits, and has a mechanism to avoid ambiguity
+   in the main part of its execution.  A few other cases however were
+   not covered by the protection against ambiguity, which has been
+   corrected.
+
+ * Allow the rebase.missingCommitsCheck configuration to kick in when
+   "rebase --edit-todo" and "rebase --continue" restarts the procedure.
+   (merge 5a5445d878 ag/edit-todo-drop-check later to maint).
+
+ * The way "git submodule status" reports an initialized but not yet
+   populated submodule has not been reimplemented correctly when a
+   part of the "git submodule" command was rewritten in C, which has
+   been corrected.
+   (merge f38c92452d pk/status-of-uncloned-submodule later to maint).
+
+ * The code to automatically shrink the fan-out in the notes tree had
+   an off-by-one bug, which has been killed.
+
+ * The index-pack code now diagnoses a bad input packstream that
+   records the same object twice when it is used as delta base; the
+   code used to declare a software bug when encountering such an
+   input, but it is an input error.
+
+
+ * The code to compute the commit-graph has been taught to use a more
+   robust way to tell if two object directories refer to the same
+   thing.
+   (merge a7df60cac8 tb/commit-graph-object-dir later to maint).
+
+ * "git remote rename X Y" needs to adjust configuration variables
+   (e.g. branch.<name>.remote) whose value used to be X to Y.
+   branch.<name>.pushRemote is now also updated.
+
+ * Update to doc-diff.
+
+ * Doc markup fix.
+
+ * "git check-ignore" did not work when the given path is explicitly
+   marked as not ignored with a negative entry in the .gitignore file.
+
+ * The merge-recursive machinery failed to refresh the cache entry for
+   a merge result in a couple of places, resulting in an unnecessary
+   merge failure, which has been fixed.
+
+ * Fix for a bug revealed by a recent change to make the protocol v2
+   the default.
+
+ * In rare cases "git worktree add <path>" could think that <path>
+   was already a registered worktree even when it wasn't and refuse
+   to add the new worktree. This has been corrected.
+   (merge bb69b3b009 es/worktree-avoid-duplication-fix later to maint).
+
+ * "git push" should stop from updating a branch that is checked out
+   when receive.denyCurrentBranch configuration is set, but it failed
+   to pay attention to checkouts in secondary worktrees.  This has
+   been corrected.
+   (merge 4d864895a2 hv/receive-denycurrent-everywhere later to maint).
+
+ * "git rebase BASE BRANCH" rebased/updated the tip of BRANCH and
+   checked it out, even when the BRANCH is checked out in a different
+   worktree.  This has been corrected.
+   (merge b5cabb4a96 es/do-not-let-rebase-switch-to-protected-branch later to maint).
+
+ * "git describe" in a repository with multiple root commits sometimes
+   gave up looking for the best tag to describe a given commit with
+   too early, which has been adjusted.
+
+ * "git merge signed-tag" while lacking the public key started to say
+   "No signature", which was utterly wrong.  This regression has been
+   reverted.
+
+ * MinGW's poll() emulation has been improved.
+
+ * "git show" and others gave an object name in raw format in its
+   error output, which has been corrected to give it in hex.
+
+ * "git fetch" over HTTP walker protocol did not show any progress
+   output.  We inherently do not know how much work remains, but still
+   we can show something not to bore users.
+   (merge 7655b4119d rs/show-progress-in-dumb-http-fetch later to maint).
+
+ * Both "git ls-remote -h" and "git grep -h" give short usage help,
+   like any other Git subcommand, but it is not unreasonable to expect
+   that the former would behave the same as "git ls-remote --head"
+   (there is no other sensible behaviour for the latter).  The
+   documentation has been updated in an attempt to clarify this.
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge d0d0a357a1 am/update-pathspec-f-f-tests later to maint).
+   (merge f94f7bd00d am/test-pathspec-f-f-error-cases later to maint).
+   (merge c513a958b6 ss/t6025-modernize later to maint).
+   (merge b441717256 dl/test-must-fail-fixes later to maint).
+   (merge d031049da3 mt/sparse-checkout-doc-update later to maint).
+   (merge 145136a95a jc/skip-prefix later to maint).
+   (merge 5290d45134 jk/alloc-cleanups later to maint).
+   (merge 7a9f8ca805 rs/parse-options-concat-dup later to maint).
+   (merge 517b60564e rs/strbuf-insertstr later to maint).
+   (merge f696a2b1c8 jk/mailinfo-cleanup later to maint).
+   (merge de26f02db1 js/test-avoid-pipe later to maint).
+   (merge a2dc43414c es/doc-mentoring later to maint).
+   (merge 02bbbe9df9 es/worktree-cleanup later to maint).
+   (merge 2ce6d075fa rs/micro-cleanups later to maint).
+   (merge 27f182b3fc rs/blame-typefix-for-fingerprint later to maint).
+   (merge 3c29e21eb0 ma/test-cleanup later to maint).
+   (merge 240fc04f81 ag/rebase-remove-redundant-code later to maint).
+   (merge d68ce906c7 rs/commit-graph-code-simplification later to maint).
+   (merge a51d9e8f07 rj/t1050-use-test-path-is-file later to maint).
+   (merge fd0bc17557 kk/complete-diff-color-moved later to maint).
+   (merge 65bf820d0e en/test-cleanup later to maint).
diff --git a/Documentation/RelNotes/2.26.1.txt b/Documentation/RelNotes/2.26.1.txt
new file mode 100644
index 0000000000..1b4ecb3fdc
--- /dev/null
+++ b/Documentation/RelNotes/2.26.1.txt
@@ -0,0 +1,5 @@
+Git v2.26.1 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.4; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.26.2.txt b/Documentation/RelNotes/2.26.2.txt
new file mode 100644
index 0000000000..d434d0c695
--- /dev/null
+++ b/Documentation/RelNotes/2.26.2.txt
@@ -0,0 +1,5 @@
+Git v2.26.2 Release Notes
+=========================
+
+This release merges the security fix that appears in v2.17.5; see
+the release notes for that version for details.
diff --git a/Documentation/RelNotes/2.26.3.txt b/Documentation/RelNotes/2.26.3.txt
new file mode 100644
index 0000000000..4111c38f0a
--- /dev/null
+++ b/Documentation/RelNotes/2.26.3.txt
@@ -0,0 +1,7 @@
+Git v2.26.3 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4, v2.24.4 and v2.25.5
+to address the security issue CVE-2021-21300; see the release
+notes for these versions for details.
diff --git a/Documentation/RelNotes/2.27.0.txt b/Documentation/RelNotes/2.27.0.txt
new file mode 100644
index 0000000000..15518d06c1
--- /dev/null
+++ b/Documentation/RelNotes/2.27.0.txt
@@ -0,0 +1,525 @@
+Git 2.27 Release Notes
+======================
+
+Updates since v2.26
+-------------------
+
+Backward compatibility notes
+
+ * When "git describe C" finds that commit C is pointed by a signed or
+   annotated tag, which records T as its tagname in the object, the
+   command gives T as its answer.  Even if the user renames or moves
+   such a tag from its natural location in the "refs/tags/" hierarchy,
+   "git describe C" would still give T as the answer, but in such a
+   case "git show T^0" would no longer work as expected.  There may be
+   nothing at "refs/tags/T" or even worse there may be a different tag
+   instead.
+
+   Starting from this version, "git describe" will always use the
+   "long" version, as if the "--long" option were given, when giving
+   its output based on such a misplaced tag to work around the problem.
+
+ * "git pull" issues a warning message until the pull.rebase
+   configuration variable is explicitly given, which some existing
+   users may find annoying---those who prefer not to rebase need to
+   set the variable to false to squelch the warning.
+
+ * The transport protocol version 2, which was promoted to the default
+   in Git 2.26 release, turned out to have some remaining rough edges,
+   so it has been demoted from the default.
+
+
+UI, Workflows & Features
+
+ * A handful of options to configure SSL when talking to proxies have
+   been added.
+
+ * Smudge/clean conversion filters are now given more information
+   (e.g. the object of the tree-ish in which the blob being converted
+   appears, in addition to its path, which has already been given).
+
+ * When "git describe C" finds an annotated tag with tagname A to be
+   the best name to explain commit C, and the tag is stored in a
+   "wrong" place in the refs/tags hierarchy, e.g. refs/tags/B, the
+   command gave a warning message but used A (not B) to describe C.
+   If C is exactly at the tag, the describe output would be "A", but
+   "git rev-parse A^0" would not be equal as "git rev-parse C^0".  The
+   behavior of the command has been changed to use the "long" form
+   i.e. A-0-gOBJECTNAME, which is correctly interpreted by rev-parse.
+
+ * "git pull" learned to warn when no pull.rebase configuration
+   exists, and neither --[no-]rebase nor --ff-only is given (which
+   would result a merge).
+
+ * "git p4" learned four new hooks and also "--no-verify" option to
+   bypass them (and the existing "p4-pre-submit" hook).
+
+ * "git pull" shares many options with underlying "git fetch", but
+   some of them were not documented and some of those that would make
+   sense to pass down were not passed down.
+
+ * "git rebase" learned the "--no-gpg-sign" option to countermand
+   commit.gpgSign the user may have.
+
+ * The output from "git format-patch" uses RFC 2047 encoding for
+   non-ASCII letters on From: and Subject: headers, so that it can
+   directly be fed to e-mail programs.  A new option has been added
+   to produce these headers in raw.
+
+ * "git log" learned "--show-pulls" that helps pathspec limited
+   history views; a merge commit that takes the whole change from a
+   side branch, which is normally omitted from the output, is shown
+   in addition to the commits that introduce real changes.
+
+ * The interactive input from various codepaths are consolidated and
+   any prompt possibly issued earlier are fflush()ed before we read.
+
+ * Allow "git rebase" to reapply all local commits, even if the may be
+   already in the upstream, without checking first.
+
+ * The 'pack.useSparse' configuration variable now defaults to 'true',
+   enabling an optimization that has been experimental since Git 2.21.
+
+ * "git rebase" happens to call some hooks meant for "checkout" and
+   "commit" by this was not a designed behaviour than historical
+   accident.  This has been documented.
+
+ * "git merge" learns the "--autostash" option.
+
+ * "sparse-checkout" UI improvements.
+
+ * "git update-ref --stdin" learned a handful of new verbs to let the
+   user control ref update transactions more explicitly, which helps
+   as an ingredient to implement two-phase commit-style atomic
+   ref-updates across multiple repositories.
+
+ * "git commit-graph write" learned different ways to write out split
+   files.
+
+ * Introduce an extension to the commit-graph to make it efficient to
+   check for the paths that were modified at each commit using Bloom
+   filters.
+
+ * The approxidate parser learns to parse seconds with fraction and
+   ignore fractional part.
+
+ * The userdiff patterns for Markdown documents have been added.
+
+ * The sparse-checkout patterns have been forbidden from excluding all
+   paths, leaving an empty working tree, for a long time.  This
+   limitation has been lifted.
+
+ * "git restore --staged --worktree" now defaults to take the contents
+   out of "HEAD", instead of erring out.
+
+ * "git p4" learned to recover from a (broken) state where a directory
+   and a file are recorded at the same path in the Perforce repository
+   the same way as their clients do.
+
+ * "git multi-pack-index repack" has been taught to honor some
+   repack.* configuration variables.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The advise API has been revamped to allow more systematic enumeration of
+   advice knobs in the future.
+
+ * SHA-256 transition continues.
+
+ * The code to interface with GnuPG has been refactored.
+
+ * "git stash" has kept an escape hatch to use the scripted version
+   for a few releases, which got stale.  It has been removed.
+
+ * Enable tests that require GnuPG on Windows.
+
+ * Minor test usability improvement.
+
+ * Trace2 enhancement to allow logging of the environment variables.
+
+ * Test clean-up continues.
+
+ * Perf-test update.
+
+ * A Windows-specific test element has been made more robust against
+   misuse from both user's environment and programmer's errors.
+
+ * Various tests have been updated to work around issues found with
+   shell utilities that come with busybox etc.
+
+ * The config API made mixed uses of int and size_t types to represent
+   length of various pieces of text it parsed, which has been updated
+   to use the correct type (i.e. size_t) throughout.
+
+ * The "--decorate-refs" and "--decorate-refs-exclude" options "git
+   log" takes have learned a companion configuration variable
+   log.excludeDecoration that sits at the lowest priority in the
+   family.
+
+ * A new CI job to build and run test suite on linux with musl libc
+   has been added.
+
+ * Update the CI configuration to use GitHub Actions, retiring the one
+   based on Azure Pipelines.
+
+ * The directory traversal code had redundant recursive calls which
+   made its performance characteristics exponential with respect to
+   the depth of the tree, which was corrected.
+
+ * "git blame" learns to take advantage of the "changed-paths" Bloom
+   filter stored in the commit-graph file.
+
+ * The "bugreport" tool has been added.
+
+ * The object walk with object filter "--filter=tree:0" can now take
+   advantage of the pack bitmap when available.
+
+ * Instead of always building all branches at GitHub via Actions,
+   users can specify which branches to build.
+
+ * Codepaths that show progress meter have been taught to also use the
+   start_progress() and the stop_progress() calls as a "region" to be
+   traced.
+
+ * Instead of downloading Windows SDK for CI jobs for windows builds
+   from an external site (wingit.blob.core.windows.net), use the one
+   created in the windows-build job, to work around quota issues at
+   the external site.
+
+
+Fixes since v2.26
+-----------------
+
+ * The real_path() convenience function can easily be misused; with a
+   bit of code refactoring in the callers' side, its use has been
+   eliminated.
+   (merge 49d3c4b481 am/real-path-fix later to maint).
+
+ * Update "git p4" to work with Python 3.
+   (merge 6bb40ed20a yz/p4-py3 later to maint).
+
+ * The mechanism to prevent "git commit" from making an empty commit
+   or amending during an interrupted cherry-pick was broken during the
+   rewrite of "git rebase" in C, which has been corrected.
+   (merge 430b75f720 pw/advise-rebase-skip later to maint).
+
+ * Fix "git checkout --recurse-submodules" of a nested submodule
+   hierarchy.
+   (merge 846f34d351 pb/recurse-submodules-fix later to maint).
+
+ * The "--fork-point" mode of "git rebase" regressed when the command
+   was rewritten in C back in 2.20 era, which has been corrected.
+   (merge f08132f889 at/rebase-fork-point-regression-fix later to maint).
+
+ * The import-tars importer (in contrib/fast-import/) used to create
+   phony files at the top-level of the repository when the archive
+   contains global PAX headers, which made its own logic to detect and
+   omit the common leading directory ineffective, which has been
+   corrected.
+   (merge c839fcff65 js/import-tars-do-not-make-phony-files-from-pax-headers later to maint).
+
+ * Simplify the commit ancestry connectedness check in a partial clone
+   repository in which "promised" objects are assumed to be obtainable
+   lazily on-demand from promisor remote repositories.
+   (merge 2b98478c6f jt/connectivity-check-optim-in-partial-clone later to maint).
+
+ * The server-end of the v2 protocol to serve "git clone" and "git
+   fetch" was not prepared to see a delim packets at unexpected
+   places, which led to a crash.
+   (merge cacae4329f jk/harden-protocol-v2-delim-handling later to maint).
+
+ * When fed a midx that records no objects, some codepaths tried to
+   loop from 0 through (num_objects-1), which, due to integer
+   arithmetic wrapping around, made it nonsense operation with out of
+   bounds array accesses.  The code has been corrected to reject such
+   an midx file.
+   (merge 796d61cdc0 dr/midx-avoid-int-underflow later to maint).
+
+ * Utitiles run via the run_command() API were not spawned correctly
+   on Cygwin, when the paths to them are given as a full path with
+   backslashes.
+   (merge 05ac8582bc ak/run-command-on-cygwin-fix later to maint).
+
+ * "git pull --rebase" tried to run a rebase even after noticing that
+   the pull results in a fast-forward and no rebase is needed nor
+   sensible, for the past few years due to a mistake nobody noticed.
+   (merge fbae70ddc6 en/pull-do-not-rebase-after-fast-forwarding later to maint).
+
+ * "git rebase" with the merge backend did not work well when the
+   rebase.abbreviateCommands configuration was set.
+   (merge de9f1d3ef4 ag/rebase-merge-allow-ff-under-abbrev-command later to maint).
+
+ * The logic to auto-follow tags by "git clone --single-branch" was
+   not careful to avoid lazy-fetching unnecessary tags, which has been
+   corrected.
+   (merge 167a575e2d jk/use-quick-lookup-in-clone-for-tag-following later to maint).
+
+ * "git rebase -i" did not leave the reflog entries correctly.
+   (merge 1f6965f994 en/sequencer-reflog-action later to maint).
+
+ * The more aggressive updates to remote-tracking branches we had for
+   the past 7 years or so were not reflected in the documentation,
+   which has been corrected.
+   (merge a44088435c pb/pull-fetch-doc later to maint).
+
+ * We've left the command line parsing of "git log :/a/b/" broken for
+   about a full year without anybody noticing, which has been
+   corrected.
+   (merge 0220461071 jc/missing-ref-store-fix later to maint).
+
+ * Misc fixes for Windows.
+   (merge 3efc128cd5 js/mingw-fixes later to maint).
+
+ * "git rebase" (again) learns to honor "--no-keep-empty", which lets
+   the user to discard commits that are empty from the beginning (as
+   opposed to the ones that become empty because of rebasing).  The
+   interactive rebase also marks commits that are empty in the todo.
+   (merge 50ed76148a en/rebase-no-keep-empty later to maint).
+
+ * Parsing the host part out of URL for the credential helper has been corrected.
+   (merge 4c5971e18a jk/credential-parsing-end-of-host-in-URL later to maint).
+
+ * Document the recommended way to abort a failing test early (e.g. by
+   exiting a loop), which is to say "return 1".
+   (merge 7cc112dc95 jc/doc-test-leaving-early later to maint).
+
+ * The code that refreshes the last access and modified time of
+   on-disk packfiles and loose object files have been updated.
+   (merge 312cd76130 lr/freshen-file-fix later to maint).
+
+ * Validation of push certificate has been made more robust against
+   timing attacks.
+   (merge 719483e547 bc/constant-memequal later to maint).
+
+ * The custom hash function used by "git fast-import" has been
+   replaced with the one from hashmap.c, which gave us a nice
+   performance boost.
+   (merge d8410a816b jk/fast-import-use-hashmap later to maint).
+
+ * The "git submodule" command did not initialize a few variables it
+   internally uses and was affected by variable settings leaked from
+   the environment.
+   (merge 65d100c4dd lx/submodule-clear-variables later to maint).
+
+ * Raise the minimum required version of docbook-xsl package to 1.74,
+   as 1.74.0 was from late 2008, which is more than 10 years old, and
+   drop compatibility cruft from our documentation suite.
+   (merge 3c255ad660 ma/doc-discard-docbook-xsl-1.73 later to maint).
+
+ * "git log" learns "--[no-]mailmap" as a synonym to "--[no-]use-mailmap"
+   (merge 88acccda38 jc/log-no-mailmap later to maint).
+
+ * "git commit-graph write --expire-time=<timestamp>" did not use the
+   given timestamp correctly, which has been corrected.
+   (merge b09b785c78 ds/commit-graph-expiry-fix later to maint).
+
+ * Tests update to use "test-chmtime" instead of "touch -t".
+   (merge e892a56845 ds/t5319-touch-fix later to maint).
+
+ * "git diff" in a partial clone learned to avoid lazy loading blob
+   objects in more casese when they are not needed.
+   (merge 95acf11a3d jt/avoid-prefetch-when-able-in-diff later to maint).
+
+ * "git push --atomic" used to show failures for refs that weren't
+   even pushed, which has been corrected.
+   (merge dfe1b7f19c jx/atomic-push later to maint).
+
+ * Code in builtin/*, i.e. those can only be called from within
+   built-in subcommands, that implements bulk of a couple of
+   subcommands have been moved to libgit.a so that they could be used
+   by others.
+   (merge 9460fd48b5 dl/libify-a-few later to maint).
+
+ * Allowing the user to split a patch hunk while "git stash -p" does
+   not work well; a band-aid has been added to make this (partially)
+   work better.
+
+ * "git diff-tree --pretty --notes" used to hit an assertion failure,
+   as it forgot to initialize the notes subsystem.
+   (merge 5778b22b3d tb/diff-tree-with-notes later to maint).
+
+ * "git range-diff" fixes.
+   (merge 8d1675eb7f vd/range-diff-with-custom-pretty-format-fix later to maint).
+
+ * "git grep" did not quote a path with unusual character like other
+   commands (like "git diff", "git status") do, but did quote when run
+   from a subdirectory, both of which has been corrected.
+   (merge 45115d8490 mt/grep-cquote-path later to maint).
+
+ * GNU/Hurd is also among the ones that need the fopen() wrapper.
+   (merge 274a1328fb jc/gnu-hurd-lets-fread-read-dirs later to maint).
+
+ * Those fetching over protocol v2 from linux-next and other kernel
+   repositories are reporting that v2 often fetches way too much than
+   needed.
+   (merge 11c7f2a30b jn/demote-proto2-from-default later to maint).
+
+ * The upload-pack protocol v2 gave up too early before finding a
+   common ancestor, resulting in a wasteful fetch from a fork of a
+   project.  This has been corrected to match the behaviour of v0
+   protocol.
+   (merge 2f0a093dd6 jt/v2-fetch-nego-fix later to maint).
+
+ * The build procedure did not use the libcurl library and its include
+   files correctly for a custom-built installation.
+   (merge 0573831950 jk/build-with-right-curl later to maint).
+
+ * Tighten "git mailinfo" to notice and error out when decoded result
+   contains NUL in it.
+   (merge 3919997447 dd/mailinfo-with-nul later to maint).
+
+ * Fix in-core inconsistency after fetching into a shallow repository
+   that broke the code to write out commit-graph.
+   (merge 37b9dcabfc tb/reset-shallow later to maint).
+
+ * The commit-graph code exhausted file descriptors easily when it
+   does not have to.
+   (merge c8828530b7 tb/commit-graph-fd-exhaustion-fix later to maint).
+
+ * The multi-pack-index left mmapped file descriptors open when it
+   does not have to.
+   (merge 6c7ff7cf7f ds/multi-pack-index later to maint).
+
+ * Recent update to Homebrew used by macOS folks breaks build by
+   moving gettext library and necessary headers.
+   (merge a0b3108618 ds/build-homebrew-gettext-fix later to maint).
+
+ * Incompatible options "--root" and "--fork-point" of "git rebase"
+   have been marked and documented as being incompatible.
+   (merge a35413c378 en/rebase-root-and-fork-point-are-incompatible later to maint).
+
+ * Error and verbose trace messages from "git push" did not redact
+   credential material embedded in URLs.
+   (merge d192fa5006 js/anonymise-push-url-in-errors later to maint).
+
+ * Update the parser used for credential.<URL>.<variable>
+   configuration, to handle <URL>s with '/' in them correctly.
+   (merge b44d0118ac bc/wildcard-credential later to maint).
+
+ * Recent updates broke parsing of "credential.<url>.<key>" where
+   <url> is not a full URL (e.g. [credential "https://"] helper = ...)
+   stopped working, which has been corrected.
+   (merge 9a121b0d22 js/partial-urlmatch-2.17 later to maint).
+   (merge cd93e6c029 js/partial-urlmatch later to maint).
+
+ * Some of the files commit-graph subsystem keeps on disk did not
+   correctly honor the core.sharedRepository settings and some were
+   left read-write.
+
+ * In error messages that "git switch" mentions its option to create a
+   new branch, "-b/-B" options were shown, where "-c/-C" options
+   should be, which has been corrected.
+   (merge 7c16ef7577 dl/switch-c-option-in-error-message later to maint).
+
+ * With the recent tightening of the code that is used to parse
+   various parts of a URL for use in the credential subsystem, a
+   hand-edited credential-store file causes the credential helper to
+   die, which is a bit too harsh to the users.  Demote the error
+   behaviour to just ignore and keep using well-formed lines instead.
+   (merge c03859a665 cb/credential-store-ignore-bogus-lines later to maint).
+
+ * The samples in the credential documentation has been updated to
+   make it clear that we depict what would appear in the .git/config
+   file, by adding appropriate quotes as needed..
+   (merge 177681a07e jk/credential-sample-update later to maint).
+
+ * "git branch" and other "for-each-ref" variants accepted multiple
+   --sort=<key> options in the increasing order of precedence, but it
+   had a few breakages around "--ignore-case" handling, and tie-breaking
+   with the refname, which have been fixed.
+   (merge 7c5045fc18 jk/for-each-ref-multi-key-sort-fix later to maint).
+
+ * The coding guideline for shell scripts instructed to refer to a
+   variable with dollar-sign inside arithmetic expansion to work
+   around a bug in old versions of dash, which is a thing of the past.
+   Now we are not forbidden from writing $((var+1)).
+   (merge 32b5fe7f0e jk/arith-expansion-coding-guidelines later to maint).
+
+ * The <stdlib.h> header on NetBSD brings in its own definition of
+   hmac() function (eek), which conflicts with our own and unrelated
+   function with the same name.  Our function has been renamed to work
+   around the issue.
+   (merge 3013118eb8 cb/avoid-colliding-with-netbsd-hmac later to maint).
+
+ * The basic test did not honor $TEST_SHELL_PATH setting, which has
+   been corrected.
+   (merge 0555e4af58 cb/t0000-use-the-configured-shell later to maint).
+
+ * Minor in-code comments and documentation updates around credential
+   API.
+   (merge 1aed817f99 cb/credential-doc-fixes later to maint).
+
+ * Teach "am", "commit", "merge" and "rebase", when they are run with
+   the "--quiet" option, to pass "--quiet" down to "gc --auto".
+   (merge 7c3e9e8cfb jc/auto-gc-quiet later to maint).
+
+ * The code to skip unmerged paths in the index when sparse checkout
+   is in use would have made out-of-bound access of the in-core index
+   when the last path was unmerged, which has been corrected.
+
+ * Serving a "git fetch" client over "git://" and "ssh://" protocols
+   using the on-wire protocol version 2 was buggy on the server end
+   when the client needs to make a follow-up request to
+   e.g. auto-follow tags.
+   (merge 08450ef791 cc/upload-pack-v2-fetch-fix later to maint).
+
+ * "git bisect replay" had trouble with input files when they used
+   CRLF line ending, which has been corrected.
+   (merge 6c722cbe5a cw/bisect-replay-with-dos later to maint).
+
+ * "rebase -i" segfaulted when rearranging a sequence that has a
+   fix-up that applies another fix-up (which may or may not be a
+   fix-up of yet another step).
+   (merge 02471e7e20 js/rebase-autosquash-double-fixup-fix later to maint).
+
+ * "git fsck" ensures that the paths recorded in tree objects are
+   sorted and without duplicates, but it failed to notice a case where
+   a blob is followed by entries that sort before a tree with the same
+   name.  This has been corrected.
+   (merge 9068cfb20f rs/fsck-duplicate-names-in-trees later to maint).
+
+ * Code clean-up by removing a compatibility implementation of a
+   function we no longer use.
+   (merge 84b0115f0d cb/no-more-gmtime later to maint).
+
+ * When a binary file gets modified and renamed on both sides of history
+   to different locations, both files would be written to the working
+   tree but both would have the contents from "ours".  This has been
+   corrected so that the path from each side gets their original content.
+
+ * Fix for a copy-and-paste error introduced during 2.20 era.
+   (merge e68a5272b1 ds/multi-pack-verify later to maint).
+
+ * Update an unconditional use of "grep -a" with a perl script in a test.
+   (merge 1eb7371236 dd/t5703-grep-a-fix later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge 564956f358 jc/maintain-doc later to maint).
+   (merge 7422b2a0a1 sg/commit-slab-clarify-peek later to maint).
+   (merge 9c688735f6 rs/doc-passthru-fetch-options later to maint).
+   (merge 757c2ba3e2 en/oidset-uninclude-hashmap later to maint).
+   (merge 8312aa7d74 jc/config-tar later to maint).
+   (merge d00a5bdd50 ss/submodule-foreach-cb later to maint).
+   (merge 64d1022e14 ar/test-style-fixes later to maint).
+   (merge 4a465443a6 ds/doc-clone-filter later to maint).
+   (merge bb2dbe301b jk/t3419-drop-expensive-tests later to maint).
+   (merge d3507cc712 js/test-junit-finalization-fix later to maint).
+   (merge 2149b6748f bc/faq later to maint).
+   (merge 12dc0879f1 jk/test-cleanup later to maint).
+   (merge 344420bf0f pb/rebase-doc-typofix later to maint).
+   (merge 7cd54d37dc dl/wrapper-fix-indentation later to maint).
+   (merge 78725ebda9 jc/allow-strlen-substitution-in-shell-scripts later to maint).
+   (merge 2ecfcdecc6 jm/gitweb-fastcgi-utf8 later to maint).
+   (merge 0740d0a5d3 jk/oid-array-cleanups later to maint).
+   (merge a1aba0c95c js/t0007-typofix later to maint).
+   (merge 76ba7fa225 ma/config-doc-fix later to maint).
+   (merge 826f0c0df2 js/subtree-doc-update-to-asciidoctor-2 later to maint).
+   (merge 88eaf361e0 eb/mboxrd-doc later to maint).
+   (merge 051cc54941 tm/zsh-complete-switch-restore later to maint).
+   (merge 39102cf4fe ms/doc-revision-illustration-fix later to maint).
+   (merge 4d9378bfad eb/gitweb-more-trailers later to maint).
+   (merge bdccbf7047 mt/doc-worktree-ref later to maint).
+   (merge ce9baf234f dl/push-recurse-submodules-fix later to maint).
+   (merge 4153274052 bc/doc-credential-helper-value later to maint).
+   (merge 5c7bb0146e jc/codingstyle-compare-with-null later to maint).
diff --git a/Documentation/RelNotes/2.27.1.txt b/Documentation/RelNotes/2.27.1.txt
new file mode 100644
index 0000000000..a1e08a9f72
--- /dev/null
+++ b/Documentation/RelNotes/2.27.1.txt
@@ -0,0 +1,7 @@
+Git v2.27.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4, v2.24.4, v2.25.5
+and v2.26.3 to address the security issue CVE-2021-21300; see
+the release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.28.0.txt b/Documentation/RelNotes/2.28.0.txt
new file mode 100644
index 0000000000..6baf781380
--- /dev/null
+++ b/Documentation/RelNotes/2.28.0.txt
@@ -0,0 +1,236 @@
+Git 2.28 Release Notes
+======================
+
+Updates since v2.27
+-------------------
+
+Backward compatibility notes
+
+ * "fetch.writeCommitGraph" is deemed to be still a bit too risky and
+   is no longer part of the "feature.experimental" set.
+
+
+UI, Workflows & Features
+
+ * The commands in the "diff" family learned to honor "diff.relative"
+   configuration variable.
+
+ * The check in "git fsck" to ensure that the tree objects are sorted
+   still had corner cases it missed unsorted entries.
+
+ * The interface to redact sensitive information in the trace output
+   has been simplified.
+
+ * The command line completion (in contrib/) learned to complete
+   options that the "git switch" command takes.
+
+ * "git diff" used to take arguments in random and nonsense range
+   notation, e.g. "git diff A..B C", "git diff A..B C...D", etc.,
+   which has been cleaned up.
+
+ * "git diff-files" has been taught to say paths that are marked as
+   intent-to-add are new files, not modified from an empty blob.
+
+ * "git status" learned to report the status of sparse checkout.
+
+ * "git difftool" has trouble dealing with paths added to the index
+   with the intent-to-add bit.
+
+ * "git fast-export --anonymize" learned to take customized mapping to
+   allow its users to tweak its output more usable for debugging.
+
+ * The command line completion support (in contrib/) used to be
+   prepared to work with "set -u" but recent changes got a bit more
+   sloppy.  This has been corrected.
+
+ * "git gui" now allows opening work trees from the start-up dialog.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Code optimization for a common case.
+   (merge 8777616e4d an/merge-single-strategy-optim later to maint).
+
+ * We've adopted a convention that any on-stack structure can be
+   initialized to have zero values in all fields with "= { 0 }",
+   even when the first field happens to be a pointer, but sparse
+   complained that a null pointer should be spelled NULL for a long
+   time.  Start using -Wno-universal-initializer option to squelch
+   it (the latest sparse has it on by default).
+
+ * "git log -L..." now takes advantage of the "which paths are touched
+   by this commit?" info stored in the commit-graph system.
+
+ * As FreeBSD is not the only platform whose regexp library reports
+   a REG_ILLSEQ error when fed invalid UTF-8, add logic to detect that
+   automatically and skip the affected tests.
+
+ * "git bugreport" learns to report what shell is in use.
+
+ * Support for GIT_CURL_VERBOSE has been rewritten in terms of
+   GIT_TRACE_CURL.
+
+ * Preliminary clean-ups around refs API, plus file format
+   specification documentation for the reftable backend.
+
+ * Workaround breakage in MSVC build, where "curl-config --cflags"
+   gives settings appropriate for GCC build.
+
+ * Code clean-up of "git clean" resulted in a fix of recent
+   performance regression.
+
+ * Code clean-up in the codepath that serves "git fetch" continues.
+
+ * "git merge-base --is-ancestor" is taught to take advantage of the
+   commit graph.
+
+ * Rewrite of parts of the scripted "git submodule" Porcelain command
+   continues; this time it is "git submodule set-branch" subcommand's
+   turn.
+
+ * The "fetch/clone" protocol has been updated to allow the server to
+   instruct the clients to grab pre-packaged packfile(s) in addition
+   to the packed object data coming over the wire.
+
+ * A misdesigned strbuf_write_fd() function has been retired.
+
+ * SHA-256 migration work continues, including CVS/SVN interface.
+
+ * A few fields in "struct commit" that do not have to always be
+   present have been moved to commit slabs.
+
+ * API cleanup for get_worktrees()
+
+ * By renumbering object flag bits, "struct object" managed to lose
+   bloated inter-field padding.
+
+ * The name of the primary branch in existing repositories, and the
+   default name used for the first branch in newly created
+   repositories, is made configurable, so that we can eventually wean
+   ourselves off of the hardcoded 'master'.
+
+ * The effort to avoid using test_must_fail on non-git command continues.
+
+ * In 2.28-rc0, we corrected a bug that some repository extensions are
+   honored by mistake even in a version 0 repositories (these
+   configuration variables in extensions.* namespace were supposed to
+   have special meaning in repositories whose version numbers are 1 or
+   higher), but this was a bit too big a change.  The behaviour in
+   recent versions of Git where certain extensions.* were honored by
+   mistake even in version 0 repositories has been restored.
+
+
+Fixes since v2.27
+-----------------
+
+ * The "--prepare-p4-only" option of "git p4" is supposed to stop
+   after replaying one changeset, but kept going (by mistake?)
+
+ * The error message from "git checkout -b foo -t bar baz" was
+   confusing.
+
+ * Some repositories in the wild have commits that record nonsense
+   committer timezone (e.g. rails.git); "git fast-import" learned an
+   option to pass these nonsense timestamps intact to allow recreating
+   existing repositories as-is.
+   (merge d42a2fb72f en/fast-import-looser-date later to maint).
+
+ * The command line completion script (in contrib/) tried to complete
+   "git stash -p" as if it were "git stash push -p", but it was too
+   aggressive and also affected "git stash show -p", which has been
+   corrected.
+   (merge fffd0cf520 vs/complete-stash-show-p-fix later to maint).
+
+ * On-the-wire protocol v2 easily falls into a deadlock between the
+   remote-curl helper and the fetch-pack process when the server side
+   prematurely throws an error and disconnects.  The communication has
+   been updated to make it more robust.
+
+ * "git checkout -p" did not handle a newly added path at all.
+   (merge 2c8bd8471a js/checkout-p-new-file later to maint).
+
+ * The code to parse "git bisect start" command line was lax in
+   validating the arguments.
+   (merge 4d9005ff5d cb/bisect-helper-parser-fix later to maint).
+
+ * Reduce memory usage during "diff --quiet" in a worktree with too
+   many stat-unmatched paths.
+   (merge d2d7fbe129 jk/diff-memuse-optim-with-stat-unmatch later to maint).
+
+ * The reflog entries for "git clone" and "git fetch" did not
+   anonymize the URL they operated on.
+   (merge 46da295a77 js/reflog-anonymize-for-clone-and-fetch later to maint).
+
+ * The behaviour of "sparse-checkout" in the state "git clone
+   --no-checkout" left was changed accidentally in 2.27, which has
+   been corrected.
+
+ * Use of negative pathspec, while collecting paths including
+   untracked ones in the working tree, was broken.
+
+ * The same worktree directory must be registered only once, but
+   "git worktree move" allowed this invariant to be violated, which
+   has been corrected.
+   (merge 810382ed37 es/worktree-duplicate-paths later to maint).
+
+ * The effect of sparse checkout settings on submodules is documented.
+   (merge e7d7c73249 en/sparse-with-submodule-doc later to maint).
+
+ * Code clean-up around "git branch" with a minor bugfix.
+   (merge dc44639904 dl/branch-cleanup later to maint).
+
+ * A branch name used in a test has been clarified to match what is
+   going on.
+   (merge 08dc26061f pb/t4014-unslave later to maint).
+
+ * An in-code comment in "git diff" has been updated.
+   (merge c592fd4c83 dl/diff-usage-comment-update later to maint).
+
+ * The documentation and some tests have been adjusted for the recent
+   renaming of "pu" branch to "seen".
+   (merge 6dca5dbf93 js/pu-to-seen later to maint).
+
+ * The code to push changes over "dumb" HTTP had a bad interaction
+   with the commit reachability code due to incorrect allocation of
+   object flag bits, which has been corrected.
+   (merge 64472d15e9 bc/http-push-flagsfix later to maint).
+
+ * "git send-email --in-reply-to=<msg>" did not use the In-Reply-To:
+   header with the value given from the command line, and let it be
+   overridden by the value on In-Reply-To: header in the messages
+   being sent out (if exists).
+   (merge f9f60d7066 ra/send-email-in-reply-to-from-command-line-wins later to maint).
+
+ * "git log -Lx,y:path --before=date" lost track of where the range
+   should be because it didn't take the changes made by the youngest
+   commits that are omitted from the output into account.
+
+ * When "fetch.writeCommitGraph" configuration is set in a shallow
+   repository and a fetch moves the shallow boundary, we wrote out
+   broken commit-graph files that do not match the reality, which has
+   been corrected.
+
+ * "git checkout" failed to catch an error from fstat() after updating
+   a path in the working tree.
+   (merge 35e6e212fd mt/entry-fstat-fallback-fix later to maint).
+
+ * When an aliased command, whose output is piped to a pager by git,
+   gets killed by a signal, the pager got into a funny state, which
+   has been corrected (again).
+   (merge c0d73a59c9 ta/wait-on-aliased-commands-upon-signal later to maint).
+
+ * The code to produce progress output from "git commit-graph --write"
+   had a few breakages, which have been fixed.
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge 2c31a7aa44 jx/pkt-line-doc-count-fix later to maint).
+   (merge d63ae31962 cb/t5608-cleanup later to maint).
+   (merge 788db145c7 dl/t-readme-spell-git-correctly later to maint).
+   (merge 45a87a83bb dl/python-2.7-is-the-floor-version later to maint).
+   (merge b75a219904 es/advertise-contribution-doc later to maint).
+   (merge 0c9a4f638a rs/pull-leakfix later to maint).
+   (merge d546fe2874 rs/commit-reach-leakfix later to maint).
+   (merge 087bf5409c mk/pb-pretty-email-without-domain-part-fix later to maint).
+   (merge 5f4ee57ad9 es/worktree-code-cleanup later to maint).
+   (merge 0172f7834a cc/cat-file-usage-update later to maint).
+   (merge 81de0c01cf ma/rebase-doc-typofix later to maint).
diff --git a/Documentation/RelNotes/2.28.1.txt b/Documentation/RelNotes/2.28.1.txt
new file mode 100644
index 0000000000..8484c8297c
--- /dev/null
+++ b/Documentation/RelNotes/2.28.1.txt
@@ -0,0 +1,7 @@
+Git v2.28.1 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4, v2.24.4, v2.25.5,
+v2.26.3 and v2.27.1 to address the security issue CVE-2021-21300;
+see the release notes for these versions for details.
diff --git a/Documentation/RelNotes/2.29.0.txt b/Documentation/RelNotes/2.29.0.txt
new file mode 100644
index 0000000000..1f41302ebb
--- /dev/null
+++ b/Documentation/RelNotes/2.29.0.txt
@@ -0,0 +1,514 @@
+Git 2.29 Release Notes
+======================
+
+Updates since v2.28
+-------------------
+
+UI, Workflows & Features
+
+ * "git help log" has been enhanced by sharing more material from the
+   documentation for the underlying "git rev-list" command.
+
+ * "git for-each-ref --format=<>" learned %(contents:size).
+
+ * "git merge" learned to selectively omit " into <branch>" at the end
+   of the title of default merge message with merge.suppressDest
+   configuration.
+
+ * The component to respond to "git fetch" request is made more
+   configurable to selectively allow or reject object filtering
+   specification used for partial cloning.
+
+ * Stop when "sendmail.*" configuration variables are defined, which
+   could be a mistaken attempt to define "sendemail.*" variables.
+
+ * The existing backends for "git mergetool" based on variants of vim
+   have been refactored and then support for "nvim" has been added.
+
+ * "git bisect" learns the "--first-parent" option to find the first
+   breakage along the first-parent chain.
+
+ * "git log --first-parent -p" showed patches only for single-parent
+   commits on the first-parent chain; the "--first-parent" option has
+   been made to imply "-m".  Use "--no-diff-merges" to restore the
+   previous behaviour to omit patches for merge commits.
+
+ * The commit labels used to explain each side of conflicted hunks
+   placed by the sequencer machinery have been made more readable by
+   humans.
+
+ * The "--batch-size" option of "git multi-pack-index repack" command
+   is now used to specify that very small packfiles are collected into
+   one until the total size roughly exceeds it.
+
+ * The recent addition of SHA-256 support is marked as experimental in
+   the documentation.
+
+ * "git fetch" learned --no-write-fetch-head option to avoid writing
+   the FETCH_HEAD file.
+
+ * Command line completion (in contrib/) usually omits redundant,
+   deprecated and/or dangerous options from its output; it learned to
+   optionally include all of them.
+
+ * The output from the "diff" family of the commands had abbreviated
+   object names of blobs involved in the patch, but its length was not
+   affected by the --abbrev option.  Now it is.
+
+ * "git worktree" gained a "repair" subcommand to help users recover
+   after moving the worktrees or repository manually without telling
+   Git.  Also, "git init --separate-git-dir" no longer corrupts
+   administrative data related to linked worktrees.
+
+ * The "--format=" option to the "for-each-ref" command and friends
+   learned a few more tricks, e.g. the ":short" suffix that applies to
+   "objectname" now also can be used for "parent", "tree", etc.
+
+ * "git worktree add" learns that the "-d" is a synonym to "--detach"
+   option to create a new worktree without being on a branch.
+
+ * "format-patch --range-diff=<prev> <origin>..HEAD" has been taught
+   not to ignore <origin> when <prev> is a single version.
+
+ * "add -p" now allows editing paths that were only added in intent.
+
+ * The 'meld' backend of the "git mergetool" learned to give the
+   underlying 'meld' the '--auto-merge' option, which would help
+   reduce the amount of text that requires manual merging.
+
+ * "git for-each-ref" and friends that list refs used to allow only
+   one --merged or --no-merged to filter them; they learned to take
+   combination of both kind of filtering.
+
+ * "git maintenance", a "git gc"'s big brother, has been introduced to
+   take care of more repository maintenance tasks, not limited to the
+   object database cleaning.
+
+ * "git receive-pack" that accepts requests by "git push" learned to
+   outsource most of the ref updates to the new "proc-receive" hook.
+
+ * "git push" that wants to be atomic and wants to send push
+   certificate learned not to prepare and sign the push certificate
+   when it fails the local check (hence due to atomicity it is known
+   that no certificate is needed).
+
+ * "git commit-graph write" learned to limit the number of bloom
+   filters that are computed from scratch with the --max-new-filters
+   option.
+
+ * The transport protocol v2 has become the default again.
+
+ * The installation procedure learned to optionally omit "git-foo"
+   executable files for each 'foo' built-in subcommand, which are only
+   required by old timers that still rely on the age old promise that
+   prepending "git --exec-path" output to PATH early in their script
+   will keep the "git-foo" calls they wrote working.
+
+ * The command line completion (in contrib/) learned that "git restore
+   -s <TAB>" is often followed by a refname.
+
+ * "git shortlog" has been taught to group commits by the contents of
+   the trailer lines, like "Reviewed-by:", "Coauthored-by:", etc.
+
+ * "git archive" learns the "--add-file" option to include untracked
+   files into a snapshot from a tree-ish.
+
+ * "git fetch" and "git push" support negative refspecs.
+
+ * "git format-patch" learns to take "whenAble" as a possible value
+   for the format.useAutoBase configuration variable to become no-op
+   when the  automatically computed base does not make sense.
+
+ * Credential helpers are now allowed to terminate lines with CRLF
+   line ending, as well as LF line ending.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * The changed-path Bloom filter is improved using ideas from an
+   independent implementation.
+
+ * Updates to the changed-paths bloom filter.
+
+ * The test framework has been updated so that most tests will run
+   with predictable (artificial) timestamps.
+
+ * Preliminary clean-up of the refs API in preparation for adding a
+   new refs backend "reftable".
+
+ * Dev support to limit the use of test_must_fail to only git commands.
+
+ * While packing many objects in a repository with a promissor remote,
+   lazily fetching missing objects from the promissor remote one by
+   one may be inefficient---the code now attempts to fetch all the
+   missing objects in batch (obviously this won't work for a lazy
+   clone that lazily fetches tree objects as you cannot even enumerate
+   what blobs are missing until you learn which trees are missing).
+
+ * The pretend-object mechanism checks if the given object already
+   exists in the object store before deciding to keep the data
+   in-core, but the check would have triggered lazy fetching of such
+   an object from a promissor remote.
+
+ * The argv_array API is useful for not just managing argv but any
+   "vector" (NULL-terminated array) of strings, and has seen adoption
+   to a certain degree.  It has been renamed to "strvec" to reduce the
+   barrier to adoption.
+
+ * The final leg of SHA-256 transition plus doc updates.  Note that
+   there is no interoperability between SHA-1 and SHA-256
+   repositories yet.
+
+ * CMake support to build with MSVC for Windows bypassing the Makefile.
+
+ * A new helper function has_object() has been introduced to make it
+   easier to mark object existence checks that do and don't want to
+   trigger lazy fetches, and a few such checks are converted using it.
+
+ * A no-op replacement function implemented as a C preprocessor macro
+   does not perform as good a job as one implemented as a "static
+   inline" function in catching errors in parameters; replace the
+   former with the latter in <git-compat-util.h> header.
+
+ * Test framework update.
+   (merge d572f52a64 es/test-cmp-typocatcher later to maint).
+
+ * Updates to "git merge" tests, in preparation for a new merge
+   strategy backend.
+
+ * midx and commit-graph files now use the byte defined in their file
+   format specification for identifying the hash function used for
+   object names.
+
+ * The FETCH_HEAD is now always read from the filesystem regardless of
+   the ref backend in use, as its format is much richer than the
+   normal refs, and written directly by "git fetch" as a plain file..
+
+ * An unused binary has been discarded, and a bunch of commands
+   have been turned into built-in.
+
+ * A handful of places in in-tree code still relied on being able to
+   execute the git subcommands, especially built-ins, in "git-foo"
+   form, which have been corrected.
+
+ * When a packfile is removed by "git repack", multi-pack-index gets
+   cleared; the code was taught to do so less aggressively by first
+   checking if the midx actually refers to a pack that no longer
+   exists.
+
+ * Internal API clean-up to handle two options "diff-index" and "log"
+   have, which happen to share the same short form, more sensibly.
+
+ * The "add -i/-p" machinery has been written in C but it is not used
+   by default yet.  It is made default to those who are participating
+   in feature.experimental experiment.
+
+ * Allow maintainers to tweak $(TAR) invocations done while making
+   distribution tarballs.
+
+ * "git index-pack" learned to resolve deltified objects with greater
+   parallelism.
+
+ * "diff-highlight" (in contrib/) had a logic to flush its output upon
+   seeing a blank line but the way it detected a blank line was broken.
+
+ * The logic to skip testing on the tagged commit and the tag itself
+   was not quite consistent which led to failure of Windows test
+   tasks.  It has been revamped to consistently skip revisions that
+   have already been tested, based on the tree object of the revision.
+
+
+Fixes since v2.28
+-----------------
+
+ * The "mediawiki" remote backend which lives in contrib/mw-to-git/
+   and is not built with git by default, had an RCE bug allowing a
+   malicious MediaWiki server operator to inject arbitrary commands
+   for execution by a cloning client. This has been fixed.
+
+   The bug was discovered and reported by Joern Schneeweisz of GitLab
+   to the git-security mailing list. Its practical impact due to the
+   obscurity of git-remote-mediawiki was deemed small enough to forgo
+   a dedicated security release.
+
+ * "git clone --separate-git-dir=$elsewhere" used to stomp on the
+   contents of the existing directory $elsewhere, which has been
+   taught to fail when $elsewhere is not an empty directory.
+   (merge dfaa209a79 bw/fail-cloning-into-non-empty later to maint).
+
+ * With the base fix to 2.27 regresion, any new extensions in a v0
+   repository would still be silently honored, which is not quite
+   right.  Instead, complain and die loudly.
+   (merge ec91ffca04 jk/reject-newer-extensions-in-v0 later to maint).
+
+ * Fetching from a lazily cloned repository resulted at the server
+   side in attempts to lazy fetch objects that the client side has,
+   many of which will not be available from the third-party anyway.
+   (merge 77aa0941ce jt/avoid-lazy-fetching-upon-have-check later to maint).
+
+ * Fix to an ancient bug caused by an over-eager attempt for
+   optimization.
+   (merge a98f7fb366 rs/add-index-entry-optim-fix later to maint).
+
+ * Pushing a ref whose name contains non-ASCII character with the
+   "--force-with-lease" option did not work over smart HTTP protocol,
+   which has been corrected.
+   (merge cd85b447bf bc/push-cas-cquoted-refname later to maint).
+
+ * "git mv src dst", when src is an unmerged path, errored out
+   correctly but with an incorrect error message to claim that src is
+   not tracked, which has been clarified.
+   (merge 9b906af657 ct/mv-unmerged-path-error later to maint).
+
+ * Fix to a regression introduced during 2.27 cycle.
+   (merge cada7308ad en/fill-directory-exponential later to maint).
+
+ * Command line completion (in contrib/) update.
+   (merge 688b87c81b mp/complete-show-color-moved later to maint).
+
+ * All "mergy" operations that internally use the merge-recursive
+   machinery should honor the merge.renormalize configuration, but
+   many of them didn't.
+
+ * Doc cleanup around "worktree".
+   (merge dc9c144be5 es/worktree-doc-cleanups later to maint).
+
+ * The "git blame --first-parent" option was not documented, but now
+   it is.
+   (merge 11bc12ae1e rp/blame-first-parent-doc later to maint).
+
+ * The logic to find the ref transaction hook script attempted to
+   cache the path to the found hook without realizing that it needed
+   to keep a copied value, as the API it used returned a transitory
+   buffer space.  This has been corrected.
+   (merge 09b2aa30c9 ps/ref-transaction-hook later to maint).
+
+ * Recent versions of "git diff-files" shows a diff between the index
+   and the working tree for "intent-to-add" paths as a "new file"
+   patch; "git apply --cached" should be able to take "git diff-files"
+   and should act as an equivalent to "git add" for the path, but the
+   command failed to do so for such a path.
+   (merge 4c025c667e rp/apply-cached-with-i-t-a later to maint).
+
+ * "git diff [<tree-ish>] $path" for a $path that is marked with i-t-a
+   bit was not showing the mode bits from the working tree.
+   (merge cb0dd22b82 rp/ita-diff-modefix later to maint).
+
+ * Ring buffer with size 4 used for bin-hex translation resulted in a
+   wrong object name in the sequencer's todo output, which has been
+   corrected.
+   (merge 5da69c0dac ak/sequencer-fix-find-uniq-abbrev later to maint).
+
+ * When given more than one target line ranges, "git blame -La,b
+   -Lc,d" was over-eager to coalesce groups of original lines and
+   showed incorrect results, which has been corrected.
+   (merge c2ebaa27d6 jk/blame-coalesce-fix later to maint).
+
+ * The regexp to identify the function boundary for FORTRAN programs
+   has been updated.
+   (merge 75c3b6b2e8 pb/userdiff-fortran-update later to maint).
+
+ * A few end-user facing messages have been updated to be
+   hash-algorithm agnostic.
+   (merge 4279000d3e jc/object-names-are-not-sha-1 later to maint).
+
+ * "unlink" emulation on MinGW has been optimized.
+   (merge 680e0b4524 jh/mingw-unlink later to maint).
+
+ * The purpose of "git init --separate-git-dir" is to initialize a
+   new project with the repository separate from the working tree,
+   or, in the case of an existing project, to move the repository
+   (the .git/ directory) out of the working tree. It does not make
+   sense to use --separate-git-dir with a bare repository for which
+   there is no working tree, so disallow its use with bare
+   repositories.
+   (merge ccf236a23a es/init-no-separate-git-dir-in-bare later to maint).
+
+ * "ls-files -o" mishandled the top-level directory of another git
+   working tree that hangs in the current git working tree.
+   (merge ab282aa548 en/dir-nonbare-embedded later to maint).
+
+ * Fix some incorrect UNLEAK() annotations.
+   (merge 3e19816dc0 jk/unleak-fixes later to maint).
+
+ * Use more buffered I/O where we used to call many small write(2)s.
+   (merge a698d67b08 rs/more-buffered-io later to maint).
+
+ * The patch-id computation did not ignore the "incomplete last line"
+   marker like whitespaces.
+   (merge 82a62015a7 rs/patch-id-with-incomplete-line later to maint).
+
+ * Updates into a lazy/partial clone with a submodule did not work
+   well with transfer.fsckobjects set.
+
+ * The parser for "git for-each-ref --format=..." was too loose when
+   parsing the "%(trailers...)" atom, and forgot that "trailers" and
+   "trailers:<modifiers>" are the only two allowed forms, which has
+   been corrected.
+   (merge 2c22e102f8 hv/ref-filter-trailers-atom-parsing-fix later to maint).
+
+ * Long ago, we decided to use 3 threads by default when running the
+   index-pack task in parallel, which has been adjusted a bit upwards.
+   (merge fbff95b67f jk/index-pack-w-more-threads later to maint).
+
+ * "git restore/checkout --no-overlay" with wildcarded pathspec
+   mistakenly removed matching paths in subdirectories, which has been
+   corrected.
+   (merge bfda204ade rs/checkout-no-overlay-pathspec-fix later to maint).
+
+ * The description of --cached/--index options in "git apply --help"
+   has been updated.
+   (merge d064702be3 rp/apply-cached-doc later to maint).
+
+ * Feeding "$ZERO_OID" to "git log --ignore-missing --stdin", and
+   running "git log --ignore-missing $ZERO_OID" fell back to start
+   digging from HEAD; it has been corrected to become a no-op, like
+   "git log --tags=no-tag-matches-this-pattern" does.
+   (merge 04a0e98515 jk/rev-input-given-fix later to maint).
+
+ * Various callers of run_command API have been modernized.
+   (merge afbdba391e jc/run-command-use-embedded-args later to maint).
+
+ * List of options offered and accepted by "git add -i/-p" were
+   inconsistent, which have been corrected.
+   (merge ce910287e7 pw/add-p-allowed-options-fix later to maint).
+
+ * "git diff --stat -w" showed 0-line changes for paths whose changes
+   were only whitespaces, which was not intuitive.  We now omit such
+   paths from the stat output.
+   (merge 1cf3d5db9b mr/diff-hide-stat-wo-textual-change later to maint).
+
+ * It was possible for xrealloc() to send a non-NULL pointer that has
+   been freed, which has been fixed.
+   (merge 6479ea4a8a jk/xrealloc-avoid-use-after-free later to maint).
+
+ * "git status" has trouble showing where it came from by interpreting
+   reflog entries that record certain events, e.g. "checkout @{u}", and
+   gives a hard/fatal error.  Even though it inherently is impossible
+   to give a correct answer because the reflog entries lose some
+   information (e.g. "@{u}" does not record what branch the user was
+   on hence which branch 'the upstream' needs to be computed, and even
+   if the record were available, the relationship between branches may
+   have changed), at least hide the error and allow "status" to show its
+   output.
+
+ * "git status --short" quoted a path with SP in it when tracked, but
+   not those that are untracked, ignored or unmerged.  They are all
+   shown quoted consistently.
+
+ * "git diff/show" on a change that involves a submodule used to read
+   the information on commits in the submodule from a wrong repository
+   and gave a wrong information when the commit-graph is involved.
+   (merge 85a1ec2c32 mf/submodule-summary-with-correct-repository later to maint).
+
+ * Unlike "git config --local", "git config --worktree" did not fail
+   early and cleanly when started outside a git repository.
+   (merge 378fe5fc3d mt/config-fail-nongit-early later to maint).
+
+ * There is a logic to estimate how many objects are in the
+   repository, which is meant to run once per process invocation, but
+   it ran every time the estimated value was requested.
+   (merge 67bb65de5d jk/dont-count-existing-objects-twice later to maint).
+
+ * "git remote set-head" that failed still said something that hints
+   the operation went through, which was misleading.
+   (merge 5a07c6c3c2 cs/don-t-pretend-a-failed-remote-set-head-succeeded later to maint).
+
+ * "git fetch --all --ipv4/--ipv6" forgot to pass the protocol options
+   to instances of the "git fetch" that talk to individual remotes,
+   which has been corrected.
+   (merge 4e735c1326 ar/fetch-ipversion-in-all later to maint).
+
+ * The "unshelve" subcommand of "git p4" incorrectly used commit^N
+   where it meant to say commit~N to name the Nth generation
+   ancestor, which has been corrected.
+   (merge 0acbf5997f ld/p4-unshelve-fix later to maint).
+
+ * "git clone" that clones from SHA-1 repository, while
+   GIT_DEFAULT_HASH set to use SHA-256 already, resulted in an
+   unusable repository that half-claims to be SHA-256 repository
+   with SHA-1 objects and refs.  This has been corrected.
+
+ * Adjust sample hooks for hash algorithm other than SHA-1.
+   (merge d8d3d632f4 dl/zero-oid-in-hooks later to maint).
+
+ * "git range-diff" showed incorrect diffstat, which has been
+   corrected.
+
+ * Earlier we taught "git pull" to warn when the user does not say the
+   histories need to be merged, rebased or accepts only fast-
+   forwarding, but the warning triggered for those who have set the
+   pull.ff configuration variable.
+   (merge 54200cef86 ah/pull later to maint).
+
+ * Compilation fix around type punning.
+   (merge 176380fd11 jk/drop-unaligned-loads later to maint).
+
+ * "git blame --ignore-rev/--ignore-revs-file" failed to validate
+   their input are valid revision, and failed to take into account
+   that the user may want to give an annotated tag instead of a
+   commit, which has been corrected.
+   (merge 610e2b9240 jc/blame-ignore-fix later to maint).
+
+ * "git bisect start X Y", when X and Y are not valid committish
+   object names, should take X and Y as pathspec, but didn't.
+   (merge 73c6de06af cc/bisect-start-fix later to maint).
+
+ * The explanation of the "scissors line" has been clarified.
+   (merge 287416dba6 eg/mailinfo-doc-scissors later to maint).
+
+ * A race that leads to an access to a free'd data was corrected in
+   the codepath that reads pack files.
+   (merge bda959c476 mt/delta-base-cache-races later to maint).
+
+ * in_merge_bases_many(), a way to see if a commit is reachable from
+   any commit in a set of commits, was totally broken when the
+   commit-graph feature was in use, which has been corrected.
+   (merge 8791bf1841 ds/in-merge-bases-many-optim-bug later to maint).
+
+ * "git submodule update --quiet" did not squelch underlying "rebase"
+   and "pull" commands.
+   (merge 3ad0401e9e td/submodule-update-quiet later to maint).
+
+ * The lazy fetching done internally to make missing objects available
+   in a partial clone incorrectly made permanent damage to the partial
+   clone filter in the repository, which has been corrected.
+
+ * "log -c --find-object=X" did not work well to find a merge that
+   involves a change to an object X from only one parent.
+   (merge 957876f17d jk/diff-cc-oidfind-fix later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge 84544f2ea3 sk/typofixes later to maint).
+   (merge b17f411ab5 ar/help-guides-doc later to maint).
+   (merge 98c6871fad rs/grep-simpler-parse-object-or-die-call later to maint).
+   (merge 861c4ce141 en/typofixes later to maint).
+   (merge 60e47f6773 sg/ci-git-path-fix-with-pyenv later to maint).
+   (merge e2bfa50ac3 jb/doc-packfile-name later to maint).
+   (merge 918d8ff780 es/worktree-cleanup later to maint).
+   (merge dc156bc31f ma/t1450-quotefix later to maint).
+   (merge 56e743426b en/merge-recursive-comment-fixes later to maint).
+   (merge 7d23ff818f rs/bisect-oid-to-hex-fix later to maint).
+   (merge de20baf2c9 ny/notes-doc-sample-update later to maint).
+   (merge f649aaaf82 so/rev-parser-errormessage-fix later to maint).
+   (merge 6103d58b7f bc/sha-256-cvs-svn-updates later to maint).
+   (merge ac900fddb7 ma/stop-progress-null-fix later to maint).
+   (merge e767963ab6 rs/upload-pack-sigchain-fix later to maint).
+   (merge a831908599 rs/preserve-merges-unused-code-removal later to maint).
+   (merge 6dfefe70a9 jb/commit-graph-doc-fix later to maint).
+   (merge 847b37271e pb/set-url-docfix later to maint).
+   (merge 748f733d54 mt/checkout-entry-dead-code-removal later to maint).
+   (merge ce820cbd58 dl/subtree-docs later to maint).
+   (merge 55fe225dde jk/leakfix later to maint).
+   (merge ee22a29215 so/pretty-abbrev-doc later to maint).
+   (merge 3100fd5588 jc/post-checkout-doc later to maint).
+   (merge 17bae89476 pb/doc-external-diff-env later to maint).
+   (merge 27ed6ccc12 jk/worktree-check-clean-leakfix later to maint).
+   (merge 1302badd16 ea/blame-use-oideq later to maint).
+   (merge e6d5a11fed al/t3200-back-on-a-branch later to maint).
+   (merge 324efcf6b6 pw/add-p-leakfix later to maint).
+   (merge 1c6ffb546b jk/add-i-fixes later to maint).
+   (merge e40e936551 cd/commit-graph-doc later to maint).
+   (merge 0512eabd91 jc/sequencer-stopped-sha-simplify later to maint).
+   (merge d01141de5a so/combine-diff-simplify later to maint).
+   (merge 3be01e5ab1 sn/fast-import-doc later to maint).
diff --git a/Documentation/RelNotes/2.29.1.txt b/Documentation/RelNotes/2.29.1.txt
new file mode 100644
index 0000000000..295ee2135f
--- /dev/null
+++ b/Documentation/RelNotes/2.29.1.txt
@@ -0,0 +1,11 @@
+Git v2.29.1 Release Notes
+=========================
+
+This is to fix the build procedure change in 2.28 where we failed to
+install a few programs that should be installed in /usr/bin (namely,
+receive-pack, upload-archive and upload-pack) when the non-default
+SKIP_DASHED_BUILT_INS installation option is in effect.
+
+A minor glitch in a non-default installation may usually not deserve
+a hotfix, but I know Git for Windows ship binaries built with this
+option, so let's make an exception.
diff --git a/Documentation/RelNotes/2.29.2.txt b/Documentation/RelNotes/2.29.2.txt
new file mode 100644
index 0000000000..632b5b580a
--- /dev/null
+++ b/Documentation/RelNotes/2.29.2.txt
@@ -0,0 +1,12 @@
+Git v2.29.2 Release Notes
+=========================
+
+This release is primarily to fix brown-paper-bag breakages in the
+2.29.0 release.
+
+Fixes since v2.29.1
+-------------------
+
+ * In 2.29, "--committer-date-is-author-date" option of "rebase" and
+   "am" subcommands lost the e-mail address by mistake, which has been
+   corrected.
diff --git a/Documentation/RelNotes/2.29.3.txt b/Documentation/RelNotes/2.29.3.txt
new file mode 100644
index 0000000000..e10eedb35a
--- /dev/null
+++ b/Documentation/RelNotes/2.29.3.txt
@@ -0,0 +1,8 @@
+Git v2.29.3 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6,
+v2.18.5, v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4, v2.24.4,
+v2.25.5, v2.26.3, v2.27.1 and v2.28.1 to address the security
+issue CVE-2021-21300; see the release notes for these versions
+for details.
diff --git a/Documentation/RelNotes/2.3.3.txt b/Documentation/RelNotes/2.3.3.txt
index 5ef12644c2..850dc68ede 100644
--- a/Documentation/RelNotes/2.3.3.txt
+++ b/Documentation/RelNotes/2.3.3.txt
@@ -12,7 +12,7 @@ Fixes since v2.3.2
  * Description given by "grep -h" for its --exclude-standard option
    was phrased poorly.
 
- * Documentaton for "git remote add" mentioned "--tags" and
+ * Documentation for "git remote add" mentioned "--tags" and
    "--no-tags" and it was not clear that fetch from the remote in
    the future will use the default behaviour when neither is given
    to override it.
diff --git a/Documentation/RelNotes/2.3.7.txt b/Documentation/RelNotes/2.3.7.txt
index fc95812cb3..5769184081 100644
--- a/Documentation/RelNotes/2.3.7.txt
+++ b/Documentation/RelNotes/2.3.7.txt
@@ -4,7 +4,7 @@ Git v2.3.7 Release Notes
 Fixes since v2.3.6
 ------------------
 
- * An earlier update to the parser that disects a URL broke an
+ * An earlier update to the parser that dissects a URL broke an
    address, followed by a colon, followed by an empty string (instead
    of the port number), e.g. ssh://example.com:/path/to/repo.
 
diff --git a/Documentation/RelNotes/2.30.0.txt b/Documentation/RelNotes/2.30.0.txt
new file mode 100644
index 0000000000..c2f1dc7b06
--- /dev/null
+++ b/Documentation/RelNotes/2.30.0.txt
@@ -0,0 +1,401 @@
+Git 2.30 Release Notes
+======================
+
+Updates since v2.29
+-------------------
+
+UI, Workflows & Features
+
+ * Userdiff for PHP update.
+
+ * Userdiff for Rust update.
+
+ * Userdiff for CSS update.
+
+ * The command line completion script (in contrib/) learned that "git
+   stash show" takes the options "git diff" takes.
+
+ * "git worktree list" now shows if each worktree is locked.  This
+   possibly may open us to show other kinds of states in the future.
+
+ * "git maintenance", an extended big brother of "git gc", continues
+   to evolve.
+
+ * "git push --force-with-lease[=<ref>]" can easily be misused to lose
+   commits unless the user takes good care of their own "git fetch".
+   A new option "--force-if-includes" attempts to ensure that what is
+   being force-pushed was created after examining the commit at the
+   tip of the remote ref that is about to be force-replaced.
+
+ * "git clone" learned clone.defaultremotename configuration variable
+   to customize what nickname to use to call the remote the repository
+   was cloned from.
+
+ * "git checkout" learned to use checkout.guess configuration variable
+   and enable/disable its "--[no-]guess" option accordingly.
+
+ * "git resurrect" script (in contrib/) learned that the object names
+   may be longer than 40-hex depending on the hash function in use.
+
+ * "git diff A...B" learned "git diff --merge-base A B", which is a
+   longer short-hand to say the same thing.
+
+ * A sample 'push-to-checkout' hook, that performs the same as
+   what the built-in default action does, has been added.
+
+ * "git diff" family of commands learned the "-I<regex>" option to
+   ignore hunks whose changed lines all match the given pattern.
+
+ * The userdiff pattern learned to identify the function definition in
+   POSIX shells and bash.
+
+ * "git checkout-index" did not consistently signal an error with its
+   exit status, but now it does.
+
+ * A commit and tag object may have CR at the end of each and
+   every line (you can create such an object with hash-object or
+   using --cleanup=verbatim to decline the default clean-up
+   action), but it would make it impossible to have a blank line
+   to separate the title from the body of the message.  We are now
+   more lenient and accept a line with lone CR on it as a blank line,
+   too.
+
+ * Exit codes from "git remote add" etc. were not usable by scripted
+   callers, but now they are.
+
+ * "git archive" now allows compression level higher than "-9"
+   when generating tar.gz output.
+
+ * Zsh autocompletion (in contrib/) update.
+
+ * The maximum length of output filenames "git format-patch" creates
+   has become configurable (used to be capped at 64).
+
+ * "git rev-parse" learned the "--end-of-options" to help scripts to
+   safely take a parameter that is supposed to be a revision, e.g.
+   "git rev-parse --verify -q --end-of-options $rev".
+
+ * The command line completion script (in contrib/) learned to expand
+   commands that are alias of alias.
+
+ * "git update-ref --stdin" learns to take multiple transactions in a
+   single session.
+
+ * Various subcommands of "git config" that take value_regex
+   learned the "--literal-value" option to take the value_regex option
+   as a literal string.
+
+ * The transport layer was taught to optionally exchange the session
+   ID assigned by the trace2 subsystem during fetch/push transactions.
+
+ * "git imap-send" used to ignore configuration variables like
+   core.askpass; this has been corrected.
+
+ * "git $cmd $args", when $cmd is not a recognised subcommand, by
+   default tries to see if $cmd is a typo of an existing subcommand
+   and optionally executes the corrected command if there is only one
+   possibility, depending on the setting of help.autocorrect; the
+   users can now disable the whole thing, including the cycles spent
+   to find a likely typo, by setting the configuration variable to
+   'never'.
+
+ * "@" sometimes worked (e.g. "git push origin @:there") as a part of
+   a refspec element, but "git push origin @" did not work, which has
+   been corrected.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Use "git archive" more to produce the release tarball.
+
+ * GitHub Actions automated test improvement to skip tests on a tree
+   identical to what has already been tested.
+
+ * Test-coverage for running commit-graph task "git maintenance" has
+   been extended.
+
+ * Our test scripts can be told to run only individual pieces while
+   skipping others with the "--run=..." option; they were taught to
+   take a substring of test title, in addition to numbers, to name the
+   test pieces to run.
+
+ * Adjust tests so that they won't scream when the default initial
+   branch name is different from 'master'.
+
+ * Rewriting "git bisect" in C continues.
+
+ * More preliminary tests have been added to document desired outcomes
+   of various "directory rename" situations.
+
+ * Micro clean-up of a couple of test scripts.
+
+ * "git diff" and other commands that share the same machinery to
+   compare with working tree files have been taught to take advantage
+   of the fsmonitor data when available.
+
+ * The code to detect premature EOF in the sideband demultiplexer has
+   been cleaned up.
+
+ * "git fetch --depth=<n>" over the stateless RPC / smart HTTP
+   transport handled EOF from the client poorly at the server end.
+
+ * A specialization of hashmap that uses a string as key has been
+   introduced.  Hopefully it will see wider use over time.
+
+ * "git bisect start/next" in a large span of history spends a lot of
+   time trying to come up with exactly the half-way point; this can be
+   optimized by stopping when we see a commit that is close enough to
+   the half-way point.
+
+ * A lazily defined test prerequisite can now be defined in terms of
+   another lazily defined test prerequisite.
+
+ * Expectation for the original contributor after responding to a
+   review comment to use the explanation in a patch update has been
+   described.
+
+ * Multiple "credential-store" backends can race to lock the same
+   file, causing everybody else but one to fail---reattempt locking
+   with some timeout to reduce the rate of the failure.
+
+ * "git-parse-remote" shell script library outlived its usefulness.
+
+ * Like die() and error(), a call to warning() will also trigger a
+   trace2 event.
+
+ * Use of non-reentrant localtime() has been removed.
+
+ * Non-reentrant time-related library functions and ctime/asctime with
+   awkward calling interfaces are banned from the codebase.
+
+
+Fixes since v2.29
+-----------------
+
+ * In 2.29, "--committer-date-is-author-date" option of "rebase" and
+   "am" subcommands lost the e-mail address by mistake, which has been
+   corrected.
+   (merge 5f35edd9d7 jk/committer-date-is-author-date-fix later to maint).
+
+ * "git checkout -p A...B [-- <path>]" did not work, even though the
+   same command without "-p" correctly used the merge-base between
+   commits A and B.
+   (merge 35166b1fb5 dl/checkout-p-merge-base later to maint).
+
+ * The side-band status report can be sent at the same time as the
+   primary payload multiplexed, but the demultiplexer on the receiving
+   end incorrectly split a single status report into two, which has
+   been corrected.
+   (merge 712b0377db js/avoid-split-sideband-message later to maint).
+
+ * "git fast-import" wasted a lot of memory when many marks were in use.
+   (merge 3f018ec716 jk/fast-import-marks-alloc-fix later to maint).
+
+ * A test helper "test_cmp A B" was taught to diagnose missing files A
+   or B as a bug in test, but some tests legitimately wanted to notice
+   a failure to even create file B as an error, in addition to leaving
+   the expected result in it, and were misdiagnosed as a bug.  This
+   has been corrected.
+   (merge 262d5ad5a5 es/test-cmp-typocatcher later to maint).
+
+ * When "git commit-graph" detects the same commit recorded more than
+   once while it is merging the layers, it used to die.  The code now
+   ignores all but one of them and continues.
+   (merge 85102ac71b ds/commit-graph-merging-fix later to maint).
+
+ * The meaning of a Signed-off-by trailer can vary from project to
+   project; this and also what it means to this project has been
+   clarified in the documentation.
+   (merge 3abd4a67d9 bk/sob-dco later to maint).
+
+ * "git credential' didn't honor the core.askPass configuration
+   variable (among other things), which has been corrected.
+   (merge 567ad2c0f9 tk/credential-config later to maint).
+
+ * Dev support to catch a tentative definition of a variable in our C
+   code as an error.
+   (merge 5539183622 jk/no-common later to maint).
+
+ * "git rebase --rebase-merges" did not correctly pass --gpg-sign
+   command line option to underlying "git merge" when replaying a merge
+   using non-default merge strategy or when replaying an octopus merge
+   (because replaying a two-head merge with the default strategy was
+   done in a separate codepath, the problem did not trigger for most
+   users), which has been corrected.
+   (merge 43ad4f2eca sc/sequencer-gpg-octopus later to maint).
+
+ * "git apply -R" did not handle patches that touch the same path
+   twice correctly, which has been corrected.  This is most relevant
+   in a patch that changes a path from a regular file to a symbolic
+   link (and vice versa).
+   (merge b0f266de11 jt/apply-reverse-twice later to maint).
+
+ * A recent oid->hash conversion missed one spot, breaking "git svn".
+   (merge 03bb366de4 bc/svn-hash-oid-fix later to maint).
+
+ * The documentation on the "--abbrev=<n>" option did not say the
+   output may be longer than "<n>" hexdigits, which has been
+   clarified.
+   (merge cda34e0d0c jc/abbrev-doc later to maint).
+
+ * "git p4" now honors init.defaultBranch configuration.
+   (merge 1b09d1917f js/p4-default-branch later to maint).
+
+ * Recently the format of an internal state file "rebase -i" uses has
+   been tightened up for consistency, which would hurt those who start
+   "rebase -i" with old git and then continue with new git.  Loosen
+   the reader side a bit (which we may want to tighten again in a year
+   or so).
+   (merge c779386182 jc/sequencer-stopped-sha-simplify later to maint).
+
+ * The code to see if "git stash drop" can safely remove refs/stash
+   has been made more careful.
+   (merge 4f44c5659b rs/empty-reflog-check-fix later to maint).
+
+ * "git log -L<range>:<path>" is documented to take no pathspec, but
+   this was not enforced by the command line option parser, which has
+   been corrected.
+   (merge 39664cb0ac jc/line-log-takes-no-pathspec later to maint).
+
+ * "git format-patch --output=there" did not work as expected and
+   instead crashed.  The option is now supported.
+   (merge dc1672dd10 jk/format-patch-output later to maint).
+
+ * Define ARM64 compiled with MSVC to be little-endian.
+   (merge 0c038fc65a dg/bswap-msvc later to maint).
+
+ * "git rebase -i" did not store ORIG_HEAD correctly.
+   (merge 8843302307 pw/rebase-i-orig-head later to maint).
+
+ * "git blame -L :funcname -- path" did not work well for a path for
+   which a userdiff driver is defined.
+
+ * "make DEVELOPER=1 sparse" used to run sparse and let it emit
+   warnings; now such warnings will cause an error.
+   (merge 521dc56270 jc/sparse-error-for-developer-build later to maint).
+
+ * "git blame --ignore-revs-file=<file>" learned to ignore a
+   non-existent object name in the input, instead of complaining.
+   (merge c714d05875 jc/blame-ignore-fix later to maint).
+
+ * Running "git diff" while allowing external diff in a state with
+   unmerged paths used to segfault, which has been corrected.
+   (merge d66851806f jk/diff-release-filespec-fix later to maint).
+
+ * Build configuration cleanup.
+   (merge b990f02fd8 ab/config-mak-uname-simplify later to maint).
+
+ * Fix regression introduced when nvimdiff support in mergetool was added.
+   (merge 12026f46e7 pd/mergetool-nvimdiff later to maint).
+
+ * The exchange between receive-pack and proc-receive hook did not
+   carefully check for errors.
+
+ * The code was not prepared to deal with pack .idx file that is
+   larger than 4GB.
+   (merge 81c4c5cf2e jk/4gb-idx later to maint).
+
+ * Since jgit does not yet work with SHA-256 repositories, mark the
+   tests that use it not to run unless we are testing with ShA-1
+   repositories.
+   (merge ea699b4adc sg/t5310-jgit-wants-sha1 later to maint).
+
+ * Config parser fix for "git notes".
+   (merge 45fef1599a na/notes-displayref-is-not-boolean later to maint).
+
+ * Move a definition of compatibility wrapper from cache.h to
+   git-compat-util.h
+   (merge a76b138daa hn/sleep-millisec-decl later to maint).
+
+ * Error message fix.
+   (merge eaf5341538 km/stash-error-message-fix later to maint).
+
+ * "git pull --rebase --recurse-submodules" checked for local changes
+   in a wrong range and failed to run correctly when it should.
+   (merge 5176f20ffe pb/pull-rebase-recurse-submodules later to maint).
+
+ * "git push" that is killed may leave a pack-objects process behind,
+   still computing to find a good compression, wasting cycles.  This
+   has been corrected.
+   (merge 8b59935114 jk/stop-pack-objects-when-push-is-killed later to maint).
+
+ * "git fetch" that is killed may leave a pack-objects process behind,
+   still computing to find a good compression, wasting cycles.  This
+   has been corrected.
+   (merge 309a4028e7 jk/stop-pack-objects-when-fetch-is-killed later to maint).
+
+ * "git add -i" failed to honor custom colors configured to show
+   patches, which has been corrected.
+   (merge 96386faa03 js/add-i-color-fix later to maint).
+
+ * Processes that access packdata while the .idx file gets removed
+   (e.g. while repacking) did not fail or fall back gracefully as they
+   could.
+   (merge 506ec2fbda tb/idx-midx-race-fix later to maint).
+
+ * "git apply" adjusted the permission bits of working-tree files and
+   directories according to core.sharedRepository setting by mistake and
+   for a long time, which has been corrected.
+   (merge eb3c027e17 mt/do-not-use-scld-in-working-tree later to maint).
+
+ * "fetch-pack" could pass NULL pointer to unlink(2) when it sees an
+   invalid filename; the error checking has been tightened to make
+   this impossible.
+   (merge 6031af387e rs/fetch-pack-invalid-lockfile later to maint).
+
+ * "git maintenance run/start/stop" needed to be run in a repository
+   to hold the lockfile they use, but didn't make sure they are
+   actually in a repository, which has been corrected.
+
+ * The glossary described a branch as an "active" line of development,
+   which is misleading---a stale and non-moving branch is still a
+   branch.
+   (merge eef1ceabd8 so/glossary-branch-is-not-necessarily-active later to maint).
+
+ * Newer versions of xsltproc can assign IDs in HTML documents it
+   generates in a consistent manner.  Use the feature to help format
+   HTML version of the user manual reproducibly.
+   (merge 3569e11d69 ae/doc-reproducible-html later to maint).
+
+ * Tighten error checking in the codepath that responds to "git fetch".
+   (merge d43a21bdbb jk/check-config-parsing-error-in-upload-pack later to maint).
+
+ * "git pack-redundant" when there is only one packfile used to crash,
+   which has been corrected.
+   (merge 0696232390 jx/pack-redundant-on-single-pack later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge 3e0a5dc9af cc/doc-filter-branch-typofix later to maint).
+   (merge 32c83afc2c cw/ci-ghwf-check-ws-errors later to maint).
+   (merge 5eb2ed691b rs/tighten-callers-of-deref-tag later to maint).
+   (merge 6db29ab213 jk/fast-import-marks-cleanup later to maint).
+   (merge e5cf6d3df4 nk/dir-c-comment-update later to maint).
+   (merge 5710dcce74 jk/report-fn-typedef later to maint).
+   (merge 9a82db1056 en/sequencer-rollback-lock-cleanup later to maint).
+   (merge 4e1bee9a99 js/t7006-cleanup later to maint).
+   (merge f5bcde6c58 es/tutorial-mention-asciidoc-early later to maint).
+   (merge 714d491af0 so/format-patch-doc-on-default-diff-format later to maint).
+   (merge 0795df4b9b rs/clear-commit-marks-in-repo later to maint).
+   (merge 9542d56379 sd/prompt-local-variable later to maint).
+   (merge 06d43fad18 rs/pack-write-hashwrite-simplify later to maint).
+   (merge b7e20b4373 mc/typofix later to maint).
+   (merge f6bcd9a8a4 js/test-whitespace-fixes later to maint).
+   (merge 53b67a801b js/test-file-size later to maint).
+   (merge 970909c2a7 rs/hashwrite-be64 later to maint).
+   (merge 5a923bb1f0 ma/list-object-filter-opt-msgfix later to maint).
+   (merge 1c3e412916 rs/archive-plug-leak-refname later to maint).
+   (merge d44e5267ea rs/plug-diff-cache-leak later to maint).
+   (merge 793c1464d3 ab/gc-keep-base-option later to maint).
+   (merge b86339b12b mt/worktree-error-message-fix later to maint).
+   (merge e01ae2a4a7 js/pull-rebase-use-advise later to maint).
+   (merge e63d774242 sn/config-doc-typofix later to maint).
+   (merge 08e9df2395 jk/multi-line-indent-style-fix later to maint).
+   (merge e66590348a da/vs-build-iconv-fix later to maint).
+   (merge 7fe07275be js/cmake-extra-built-ins-fix later to maint).
+   (merge 633eebe142 jb/midx-doc-update later to maint).
+   (merge 5885367e8f jh/index-v2-doc-on-fsmn later to maint).
+   (merge 14639a4779 jc/compat-util-setitimer-fix later to maint).
+   (merge 56f56ac50b ab/unreachable-break later to maint).
+   (merge 731d578b4f rb/nonstop-config-mak-uname-update later to maint).
+   (merge f4698738f9 es/perf-export-fix later to maint).
+   (merge 773c694142 nk/refspecs-negative-fix later to maint).
diff --git a/Documentation/RelNotes/2.30.1.txt b/Documentation/RelNotes/2.30.1.txt
new file mode 100644
index 0000000000..249ef1492f
--- /dev/null
+++ b/Documentation/RelNotes/2.30.1.txt
@@ -0,0 +1,55 @@
+Git v2.30.1 Release Notes
+=========================
+
+This release is primarily to merge fixes accumulated on the 'master'
+front to prepare for 2.31 release that are still relevant to 2.30.x
+maintenance track.
+
+Fixes since v2.30
+-----------------
+
+ * "git fetch --recurse-submodules" failed to update a submodule
+   when it has an uninitialized (hence of no interest to the user)
+   sub-submodule, which has been corrected.
+
+ * Command line error of "git rebase" are diagnosed earlier.
+
+ * "git stash" did not work well in a sparsely checked out working
+   tree.
+
+ * Some tests expect that "ls -l" output has either '-' or 'x' for
+   group executable bit, but setgid bit can be inherited from parent
+   directory and make these fields 'S' or 's' instead, causing test
+   failures.
+
+ * "git for-each-repo --config=<var> <cmd>" should not run <cmd> for
+   any repository when the configuration variable <var> is not defined
+   even once.
+
+ * "git mergetool --tool-help" was broken in 2.29 and failed to list
+   all the available tools.
+
+ * Fix for procedure to building CI test environment for mac.
+
+ * Newline characters in the host and path part of git:// URL are
+   now forbidden.
+
+ * When more than one commit with the same patch ID appears on one
+   side, "git log --cherry-pick A...B" did not exclude them all when a
+   commit with the same patch ID appears on the other side.  Now it
+   does.
+
+ * Documentation for "git fsck" lost stale bits that has become
+   incorrect.
+
+ * Doc for packfile URI feature has been clarified.
+
+ * The implementation of "git branch --sort" wrt the detached HEAD
+   display has always been hacky, which has been cleaned up.
+
+ * Our setting of GitHub CI test jobs were a bit too eager to give up
+   once there is even one failure found.  Tweak the knob to allow
+   other jobs keep running even when we see a failure, so that we can
+   find more failures in a single run.
+
+Also contains minor documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.30.2.txt b/Documentation/RelNotes/2.30.2.txt
new file mode 100644
index 0000000000..bada398501
--- /dev/null
+++ b/Documentation/RelNotes/2.30.2.txt
@@ -0,0 +1,8 @@
+Git v2.30.2 Release Notes
+=========================
+
+This release merges up the fixes that appear in v2.17.6, v2.18.5,
+v2.19.6, v2.20.5, v2.21.4, v2.22.5, v2.23.4, v2.24.4, v2.25.5,
+v2.26.3, v2.27.1, v2.28.1 and v2.29.3 to address the security
+issue CVE-2021-21300; see the release notes for these versions
+for details.
diff --git a/Documentation/RelNotes/2.31.0.txt b/Documentation/RelNotes/2.31.0.txt
new file mode 100644
index 0000000000..cf0c7d8d40
--- /dev/null
+++ b/Documentation/RelNotes/2.31.0.txt
@@ -0,0 +1,365 @@
+Git 2.31 Release Notes
+======================
+
+Updates since v2.30
+-------------------
+
+Backward incompatible and other important changes
+
+ * The "pack-redundant" command, which has been left stale with almost
+   unusable performance issues, now warns loudly when it gets used, as
+   we no longer want to recommend its use (instead just "repack -d"
+   instead).
+
+ * The development community has adopted Contributor Covenant v2.0 to
+   update from v1.4 that we have been using.
+
+ * The support for deprecated PCRE1 library has been dropped.
+
+ * Fixes for CVE-2021-21300 in Git 2.30.2 (and earlier) is included.
+
+
+UI, Workflows & Features
+
+ * The "--format=%(trailers)" mechanism gets enhanced to make it
+   easier to design output for machine consumption.
+
+ * When a user does not tell "git pull" to use rebase or merge, the
+   command gives a loud message telling a user to choose between
+   rebase or merge but creates a merge anyway, forcing users who would
+   want to rebase to redo the operation.  Fix an early part of this
+   problem by tightening the condition to give the message---there is
+   no reason to stop or force the user to choose between rebase or
+   merge if the history fast-forwards.
+
+ * The configuration variable 'core.abbrev' can be set to 'no' to
+   force no abbreviation regardless of the hash algorithm.
+
+ * "git rev-parse" can be explicitly told to give output as absolute
+   or relative path with the `--path-format=(absolute|relative)` option.
+
+ * Bash completion (in contrib/) update to make it easier for
+   end-users to add completion for their custom "git" subcommands.
+
+ * "git maintenance" learned to drive scheduled maintenance on
+   platforms whose native scheduling methods are not 'cron'.
+
+ * After expiring a reflog and making a single commit, the reflog for
+   the branch would record a single entry that knows both @{0} and
+   @{1}, but we failed to answer "what commit were we on?", i.e. @{1}
+
+ * "git bundle" learns "--stdin" option to read its refs from the
+   standard input.  Also, it now does not lose refs whey they point
+   at the same object.
+
+ * "git log" learned a new "--diff-merges=<how>" option.
+
+ * "git ls-files" can and does show multiple entries when the index is
+   unmerged, which is a source for confusion unless -s/-u option is in
+   use.  A new option --deduplicate has been introduced.
+
+ * `git worktree list` now annotates worktrees as prunable, shows
+   locked and prunable attributes in --porcelain mode, and gained
+   a --verbose option.
+
+ * "git clone" tries to locally check out the branch pointed at by
+   HEAD of the remote repository after it is done, but the protocol
+   did not convey the information necessary to do so when copying an
+   empty repository.  The protocol v2 learned how to do so.
+
+ * There are other ways than ".." for a single token to denote a
+   "commit range", namely "<rev>^!" and "<rev>^-<n>", but "git
+   range-diff" did not understand them.
+
+ * The "git range-diff" command learned "--(left|right)-only" option
+   to show only one side of the compared range.
+
+ * "git mergetool" feeds three versions (base, local and remote) of
+   a conflicted path unmodified.  The command learned to optionally
+   prepare these files with unconflicted parts already resolved.
+
+ * The .mailmap is documented to be read only from the root level of a
+   working tree, but a stray file in a bare repository also was read
+   by accident, which has been corrected.
+
+ * "git maintenance" tool learned a new "pack-refs" maintenance task.
+
+ * The error message given when a configuration variable that is
+   expected to have a boolean value has been improved.
+
+ * Signed commits and tags now allow verification of objects, whose
+   two object names (one in SHA-1, the other in SHA-256) are both
+   signed.
+
+ * "git rev-list" command learned "--disk-usage" option.
+
+ * "git {diff,log} --{skip,rotate}-to=<path>" allows the user to
+   discard diff output for early paths or move them to the end of the
+   output.
+
+ * "git difftool" learned "--skip-to=<path>" option to restart an
+   interrupted session from an arbitrary path.
+
+ * "git grep" has been tweaked to be limited to the sparse checkout
+   paths.
+
+ * "git rebase --[no-]fork-point" gained a configuration variable
+   rebase.forkPoint so that users do not have to keep specifying a
+   non-default setting.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * A 3-year old test that was not testing anything useful has been
+   corrected.
+
+ * Retire more names with "sha1" in it.
+
+ * The topological walk codepath is covered by new trace2 stats.
+
+ * Update the Code-of-conduct to version 2.0 from the upstream (we've
+   been using version 1.4).
+
+ * "git mktag" validates its input using its own rules before writing
+   a tag object---it has been updated to share the logic with "git
+   fsck".
+
+ * Two new ways to feed configuration variable-value pairs via
+   environment variables have been introduced, and the way
+   GIT_CONFIG_PARAMETERS encodes variable/value pairs has been tweaked
+   to make it more robust.
+
+ * Tests have been updated so that they do not to get affected by the
+   name of the default branch "git init" creates.
+
+ * "git fetch" learns to treat ref updates atomically in all-or-none
+   fashion, just like "git push" does, with the new "--atomic" option.
+
+ * The peel_ref() API has been replaced with peel_iterated_oid().
+
+ * The .use_shell flag in struct child_process that is passed to
+   run_command() API has been clarified with a bit more documentation.
+
+ * Document, clean-up and optimize the code around the cache-tree
+   extension in the index.
+
+ * The ls-refs protocol operation has been optimized to narrow the
+   sub-hierarchy of refs/ it walks to produce response.
+
+ * When removing many branches and tags, the code used to do so one
+   ref at a time.  There is another API it can use to delete multiple
+   refs, and it makes quite a lot of performance difference when the
+   refs are packed.
+
+ * The "pack-objects" command needs to iterate over all the tags when
+   automatic tag following is enabled, but it actually iterated over
+   all refs and then discarded everything outside "refs/tags/"
+   hierarchy, which was quite wasteful.
+
+ * A perf script was made more portable.
+
+ * Our setting of GitHub CI test jobs were a bit too eager to give up
+   once there is even one failure found.  Tweak the knob to allow
+   other jobs keep running even when we see a failure, so that we can
+   find more failures in a single run.
+
+ * We've carried compatibility codepaths for compilers without
+   variadic macros for quite some time, but the world may be ready for
+   them to be removed.  Force compilation failure on exotic platforms
+   where variadic macros are not available to find out who screams in
+   such a way that we can easily revert if it turns out that the world
+   is not yet ready.
+
+ * Code clean-up to ensure our use of hashtables using object names as
+   keys use the "struct object_id" objects, not the raw hash values.
+
+ * Lose the debugging aid that may have been useful in the past, but
+   no longer is, in the "grep" codepaths.
+
+ * Some pretty-format specifiers do not need the data in commit object
+   (e.g. "%H"), but we were over-eager to load and parse it, which has
+   been made even lazier.
+
+ * Get rid of "GETTEXT_POISON" support altogether, which may or may
+   not be controversial.
+
+ * Introduce an on-disk file to record revindex for packdata, which
+   traditionally was always created on the fly and only in-core.
+
+ * The commit-graph learned to use corrected commit dates instead of
+   the generation number to help topological revision traversal.
+
+ * Piecemeal of rewrite of "git bisect" in C continues.
+
+ * When a pager spawned by us exited, the trace log did not record its
+   exit status correctly, which has been corrected.
+
+ * Removal of GIT_TEST_GETTEXT_POISON continues.
+
+ * The code to implement "git merge-base --independent" was poorly
+   done and was kept from the very beginning of the feature.
+
+ * Preliminary changes to fsmonitor integration.
+
+ * Performance improvements for rename detection.
+
+ * The common code to deal with "chunked file format" that is shared
+   by the multi-pack-index and commit-graph files have been factored
+   out, to help codepaths for both filetypes to become more robust.
+
+ * The approach to "fsck" the incoming objects in "index-pack" is
+   attractive for performance reasons (we have them already in core,
+   inflated and ready to be inspected), but fundamentally cannot be
+   applied fully when we receive more than one pack stream, as a tree
+   object in one pack may refer to a blob object in another pack as
+   ".gitmodules", when we want to inspect blobs that are used as
+   ".gitmodules" file, for example.  Teach "index-pack" to emit
+   objects that must be inspected later and check them in the calling
+   "fetch-pack" process.
+
+ * The logic to handle "trailer" related placeholders in the
+   "--format=" mechanisms in the "log" family and "for-each-ref"
+   family is getting unified.
+
+ * Raise the buffer size used when writing the index file out from
+   (obviously too small) 8kB to (clearly sufficiently large) 128kB.
+
+ * It is reported that open() on some platforms (e.g. macOS Big Sur)
+   can return EINTR even though our timers are set up with SA_RESTART.
+   A workaround has been implemented and enabled for macOS to rerun
+   open() transparently from the caller when this happens.
+
+
+Fixes since v2.30
+-----------------
+
+ * Diagnose command line error of "git rebase" early.
+
+ * Clean up option descriptions in "git cmd --help".
+
+ * "git stash" did not work well in a sparsely checked out working
+   tree.
+
+ * Some tests expect that "ls -l" output has either '-' or 'x' for
+   group executable bit, but setgid bit can be inherited from parent
+   directory and make these fields 'S' or 's' instead, causing test
+   failures.
+
+ * "git for-each-repo --config=<var> <cmd>" should not run <cmd> for
+   any repository when the configuration variable <var> is not defined
+   even once.
+
+ * Fix 2.29 regression where "git mergetool --tool-help" fails to list
+   all the available tools.
+
+ * Fix for procedure to building CI test environment for mac.
+
+ * The implementation of "git branch --sort" wrt the detached HEAD
+   display has always been hacky, which has been cleaned up.
+
+ * Newline characters in the host and path part of git:// URL are
+   now forbidden.
+
+ * "git diff" showed a submodule working tree with untracked cruft as
+   "Submodule commit <objectname>-dirty", but a natural expectation is
+   that the "-dirty" indicator would align with "git describe --dirty",
+   which does not consider having untracked files in the working tree
+   as source of dirtiness.  The inconsistency has been fixed.
+
+ * When more than one commit with the same patch ID appears on one
+   side, "git log --cherry-pick A...B" did not exclude them all when a
+   commit with the same patch ID appears on the other side.  Now it
+   does.
+
+ * Documentation for "git fsck" lost stale bits that has become
+   incorrect.
+
+ * Doc fix for packfile URI feature.
+
+ * When "git rebase -i" processes "fixup" insn, there is no reason to
+   clean up the commit log message, but we did the usual stripspace
+   processing.  This has been corrected.
+   (merge f7d42ceec5 js/rebase-i-commit-cleanup-fix later to maint).
+
+ * Fix in passing custom args from "git clone" to "upload-pack" on the
+   other side.
+   (merge ad6b5fefbd jv/upload-pack-filter-spec-quotefix later to maint).
+
+ * The command line completion (in contrib/) completed "git branch -d"
+   with branch names, but "git branch -D" offered tagnames in addition,
+   which has been corrected.  "git branch -M" had the same problem.
+   (merge 27dc071b9a jk/complete-branch-force-delete later to maint).
+
+ * When commands are started from a subdirectory, they may have to
+   compare the path to the subdirectory (called prefix and found out
+   from $(pwd)) with the tracked paths.  On macOS, $(pwd) and
+   readdir() yield decomposed path, while the tracked paths are
+   usually normalized to the precomposed form, causing mismatch.  This
+   has been fixed by taking the same approach used to normalize the
+   command line arguments.
+   (merge 5c327502db tb/precompose-prefix-too later to maint).
+
+ * Even though invocations of "die()" were logged to the trace2
+   system, "BUG()"s were not, which has been corrected.
+   (merge 0a9dde4a04 jt/trace2-BUG later to maint).
+
+ * "git grep --untracked" is meant to be "let's ALSO find in these
+   files on the filesystem" when looking for matches in the working
+   tree files, and does not make any sense if the primary search is
+   done against the index, or the tree objects.  The "--cached" and
+   "--untracked" options have been marked as mutually incompatible.
+   (merge 0c5d83b248 mt/grep-cached-untracked later to maint).
+
+ * Fix "git fsck --name-objects" which apparently has not been used by
+   anybody who is motivated enough to report breakage.
+   (merge e89f89361c js/fsck-name-objects-fix later to maint).
+
+ * Avoid individual tests in t5411 from getting affected by each other
+   by forcing them to use separate output files during the test.
+   (merge 822ee894f6 jx/t5411-unique-filenames later to maint).
+
+ * Test to make sure "git rev-parse one-thing one-thing" gives
+   the same thing twice (when one-thing is --since=X).
+   (merge a5cdca4520 ew/rev-parse-since-test later to maint).
+
+ * When certain features (e.g. grafts) used in the repository are
+   incompatible with the use of the commit-graph, we used to silently
+   turned commit-graph off; we now tell the user what we are doing.
+   (merge c85eec7fc3 js/commit-graph-warning later to maint).
+
+ * Objects that lost references can be pruned away, even when they
+   have notes attached to it (and these notes will become dangling,
+   which in turn can be pruned with "git notes prune").  This has been
+   clarified in the documentation.
+   (merge fa9ab027ba mz/doc-notes-are-not-anchors later to maint).
+
+ * The error codepath around the "--temp/--prefix" feature of "git
+   checkout-index" has been improved.
+   (merge 3f7ba60350 mt/checkout-index-corner-cases later to maint).
+
+ * The "git maintenance register" command had trouble registering bare
+   repositories, which had been corrected.
+
+ * A handful of multi-word configuration variable names in
+   documentation that are spelled in all lowercase have been corrected
+   to use the more canonical camelCase.
+   (merge 7dd0eaa39c dl/doc-config-camelcase later to maint).
+
+ * "git push $there --delete ''" should have been diagnosed as an
+   error, but instead turned into a matching push, which has been
+   corrected.
+   (merge 20e416409f jc/push-delete-nothing later to maint).
+
+ * Test script modernization.
+   (merge 488acf15df sv/t7001-modernize later to maint).
+
+ * An under-allocation for the untracked cache data has been corrected.
+   (merge 6347d649bc jh/untracked-cache-fix later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge e3f5da7e60 sg/t7800-difftool-robustify later to maint).
+   (merge 9d336655ba js/doc-proto-v2-response-end later to maint).
+   (merge 1b5b8cf072 jc/maint-column-doc-typofix later to maint).
+   (merge 3a837b58e3 cw/pack-config-doc later to maint).
+   (merge 01168a9d89 ug/doc-commit-approxidate later to maint).
+   (merge b865734760 js/params-vs-args later to maint).
diff --git a/Documentation/RelNotes/2.31.1.txt b/Documentation/RelNotes/2.31.1.txt
new file mode 100644
index 0000000000..f9b06b8e1b
--- /dev/null
+++ b/Documentation/RelNotes/2.31.1.txt
@@ -0,0 +1,27 @@
+Git 2.31.1 Release Notes
+========================
+
+Fixes since v2.31
+-----------------
+
+ * The fsmonitor interface read from its input without making sure
+   there is something to read from.  This bug is new in 2.31
+   timeframe.
+
+ * The data structure used by fsmonitor interface was not properly
+   duplicated during an in-core merge, leading to use-after-free etc.
+
+ * "git bisect" reimplemented more in C during 2.30 timeframe did not
+   take an annotated tag as a good/bad endpoint well.  This regression
+   has been corrected.
+
+ * Fix macros that can silently inject unintended null-statements.
+
+ * CALLOC_ARRAY() macro replaces many uses of xcalloc().
+
+ * Update insn in Makefile comments to run fuzz-all target.
+
+ * Fix a corner case bug in "git mv" on case insensitive systems,
+   which was introduced in 2.29 timeframe.
+
+Also contains various documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.32.0.txt b/Documentation/RelNotes/2.32.0.txt
new file mode 100644
index 0000000000..87d56fa1aa
--- /dev/null
+++ b/Documentation/RelNotes/2.32.0.txt
@@ -0,0 +1,416 @@
+Git 2.32 Release Notes
+======================
+
+Backward compatibility notes
+----------------------------
+
+ * ".gitattributes", ".gitignore", and ".mailmap" files that are
+   symbolic links are ignored.
+
+ * "git apply --3way" used to first attempt a straight application,
+   and only fell back to the 3-way merge algorithm when the stright
+   application failed.  Starting with this version, the command will
+   first try the 3-way merge algorithm and only when it fails (either
+   resulting with conflict or the base versions of blobs are missing),
+   falls back to the usual patch application.
+
+
+Updates since v2.31
+-------------------
+
+UI, Workflows & Features
+
+ * It does not make sense to make ".gitattributes", ".gitignore" and
+   ".mailmap" symlinks, as they are supposed to be usable from the
+   object store (think: bare repositories where HEAD:.mailmap etc. are
+   used).  When these files are symbolic links, we used to read the
+   contents of the files pointed by them by mistake, which has been
+   corrected.
+
+ * "git stash show" learned to optionally show untracked part of the
+   stash.
+
+ * "git log --format='...'" learned "%(describe)" placeholder.
+
+ * "git repack" so far has been only capable of repacking everything
+   under the sun into a single pack (or split by size).  A cleverer
+   strategy to reduce the cost of repacking a repository has been
+   introduced.
+
+ * The http codepath learned to let the credential layer to cache the
+   password used to unlock a certificate that has successfully been
+   used.
+
+ * "git commit --fixup=<commit>", which was to tweak the changes made
+   to the contents while keeping the original log message intact,
+   learned "--fixup=(amend|reword):<commit>", that can be used to
+   tweak both the message and the contents, and only the message,
+   respectively.
+
+ * "git send-email" learned to honor the core.hooksPath configuration.
+
+ * "git format-patch -v<n>" learned to allow a reroll count that is
+   not an integer.
+
+ * "git commit" learned "--trailer <key>[=<value>]" option; together
+   with the interpret-trailers command, this will make it easier to
+   support custom trailers.
+
+ * "git clone --reject-shallow" option fails the clone as soon as we
+   notice that we are cloning from a shallow repository.
+
+ * A configuration variable has been added to force tips of certain
+   refs to be given a reachability bitmap.
+
+ * "gitweb" learned "e-mail privacy" feature to redact strings that
+   look like e-mail addresses on various pages.
+
+ * "git apply --3way" has always been "to fall back to 3-way merge
+   only when straight application fails". Swap the order of falling
+   back so that 3-way is always attempted first (only when the option
+   is given, of course) and then straight patch application is used as
+   a fallback when it fails.
+
+ * "git apply" now takes "--3way" and "--cached" at the same time, and
+   work and record results only in the index.
+
+ * The command line completion (in contrib/) has learned that
+   CHERRY_PICK_HEAD is a possible pseudo-ref.
+
+ * Userdiff patterns for "Scheme" has been added.
+
+ * "git log" learned "--diff-merges=<style>" option, with an
+   associated configuration variable log.diffMerges.
+
+ * "git log --format=..." placeholders learned %ah/%ch placeholders to
+   request the --date=human output.
+
+ * Replace GIT_CONFIG_NOSYSTEM mechanism to decline from reading the
+   system-wide configuration file with GIT_CONFIG_SYSTEM that lets
+   users specify from which file to read the system-wide configuration
+   (setting it to an empty file would essentially be the same as
+   setting NOSYSTEM), and introduce GIT_CONFIG_GLOBAL to override the
+   per-user configuration in $HOME/.gitconfig.
+
+ * "git add" and "git rm" learned not to touch those paths that are
+   outside of sparse checkout.
+
+ * "git rev-list" learns the "--filter=object:type=<type>" option,
+   which can be used to exclude objects of the given kind from the
+   packfile generated by pack-objects.
+
+ * The command line completion (in contrib/) for "git stash" has been
+   updated.
+
+ * "git subtree" updates.
+
+ * It is now documented that "format-patch" skips merges.
+
+ * Options to "git pack-objects" that take numeric values like
+   --window and --depth should not accept negative values; the input
+   validation has been tightened.
+
+ * The way the command line specified by the trailer.<token>.command
+   configuration variable receives the end-user supplied value was
+   both error prone and misleading.  An alternative to achieve the
+   same goal in a safer and more intuitive way has been added, as
+   the trailer.<token>.cmd configuration variable, to replace it.
+
+ * "git add -i --dry-run" does not dry-run, which was surprising.  The
+   combination of options has taught to error out.
+
+ * "git push" learns to discover common ancestor with the receiving
+   end over protocol v2.  This will hopefully make "git push" as
+   efficient as "git fetch" in avoiding objects from getting
+   transferred unnecessarily.
+
+ * "git mailinfo" (hence "git am") learned the "--quoted-cr" option to
+   control how lines ending with CRLF wrapped in base64 or qp are
+   handled.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Rename detection rework continues.
+
+ * GIT_TEST_FAIL_PREREQS is a mechanism to skip test pieces with
+   prerequisites to catch broken tests that depend on the side effects
+   of optional pieces, but did not work at all when negative
+   prerequisites were involved.
+   (merge 27d578d904 jk/fail-prereq-testfix later to maint).
+
+ * "git diff-index" codepath has been taught to trust fsmonitor status
+   to reduce number of lstat() calls.
+   (merge 7e5aa13d2c nk/diff-index-fsmonitor later to maint).
+
+ * Reorganize Makefile to allow building git.o and other essential
+   objects without extra stuff needed only for testing.
+
+ * Preparatory API changes for parallel checkout.
+
+ * A simple IPC interface gets introduced to build services like
+   fsmonitor on top.
+
+ * Fsck API clean-up.
+
+ * SECURITY.md that is facing individual contributors and end users
+   has been introduced.  Also a procedure to follow when preparing
+   embargoed releases has been spelled out.
+   (merge 09420b7648 js/security-md later to maint).
+
+ * Optimize "rev-list --use-bitmap-index --objects" corner case that
+   uses negative tags as the stopping points.
+
+ * CMake update for vsbuild.
+
+ * An on-disk reverse-index to map the in-pack location of an object
+   back to its object name across multiple packfiles is introduced.
+
+ * Generate [ec]tags under $(QUIET_GEN).
+
+ * Clean-up codepaths that implements "git send-email --validate"
+   option and improves the message from it.
+
+ * The last remnant of gettext-poison has been removed.
+
+ * The test framework has been taught to optionally turn the default
+   merge strategy to "ort" throughout the system where we use
+   three-way merges internally, like cherry-pick, rebase etc.,
+   primarily to enhance its test coverage (the strategy has been
+   available as an explicit "-s ort" choice).
+
+ * A bit of code clean-up and a lot of test clean-up around userdiff
+   area.
+
+ * Handling of "promisor packs" that allows certain objects to be
+   missing and lazily retrievable has been optimized (a bit).
+
+ * When packet_write() fails, we gave an extra error message
+   unnecessarily, which has been corrected.
+
+ * The checkout machinery has been taught to perform the actual
+   write-out of the files in parallel when able.
+
+ * Show errno in the trace output in the error codepath that calls
+   read_raw_ref method.
+
+ * Effort to make the command line completion (in contrib/) safe with
+   "set -u" continues.
+
+ * Tweak a few tests for "log --format=..." that show timestamps in
+   various formats.
+
+ * The reflog expiry machinery has been taught to emit trace events.
+
+ * Over-the-wire protocol learns a new request type to ask for object
+   sizes given a list of object names.
+
+
+Fixes since v2.31
+-----------------
+
+ * The fsmonitor interface read from its input without making sure
+   there is something to read from.  This bug is new in 2.31
+   timeframe.
+
+ * The data structure used by fsmonitor interface was not properly
+   duplicated during an in-core merge, leading to use-after-free etc.
+
+ * "git bisect" reimplemented more in C during 2.30 timeframe did not
+   take an annotated tag as a good/bad endpoint well.  This regression
+   has been corrected.
+
+ * Fix macros that can silently inject unintended null-statements.
+
+ * CALLOC_ARRAY() macro replaces many uses of xcalloc().
+
+ * Update insn in Makefile comments to run fuzz-all target.
+
+ * Fix a corner case bug in "git mv" on case insensitive systems,
+   which was introduced in 2.29 timeframe.
+
+ * We had a code to diagnose and die cleanly when a required
+   clean/smudge filter is missing, but an assert before that
+   unnecessarily fired, hiding the end-user facing die() message.
+   (merge 6fab35f748 mt/cleanly-die-upon-missing-required-filter later to maint).
+
+ * Update C code that sets a few configuration variables when a remote
+   is configured so that it spells configuration variable names in the
+   canonical camelCase.
+   (merge 0f1da600e6 ab/remote-write-config-in-camel-case later to maint).
+
+ * A new configuration variable has been introduced to allow choosing
+   which version of the generation number gets used in the
+   commit-graph file.
+   (merge 702110aac6 ds/commit-graph-generation-config later to maint).
+
+ * Perf test update to work better in secondary worktrees.
+   (merge 36e834abc1 jk/perf-in-worktrees later to maint).
+
+ * Updates to memory allocation code around the use of pcre2 library.
+   (merge c1760352e0 ab/grep-pcre2-allocfix later to maint).
+
+ * "git -c core.bare=false clone --bare ..." would have segfaulted,
+   which has been corrected.
+   (merge 75555676ad bc/clone-bare-with-conflicting-config later to maint).
+
+ * When "git checkout" removes a path that does not exist in the
+   commit it is checking out, it wasn't careful enough not to follow
+   symbolic links, which has been corrected.
+   (merge fab78a0c3d mt/checkout-remove-nofollow later to maint).
+
+ * A few option description strings started with capital letters,
+   which were corrected.
+   (merge 5ee90326dc cc/downcase-opt-help later to maint).
+
+ * Plug or annotate remaining leaks that trigger while running the
+   very basic set of tests.
+   (merge 68ffe095a2 ah/plugleaks later to maint).
+
+ * The hashwrite() API uses a buffering mechanism to avoid calling
+   write(2) too frequently. This logic has been refactored to be
+   easier to understand.
+   (merge ddaf1f62e3 ds/clarify-hashwrite later to maint).
+
+ * "git cherry-pick/revert" with or without "--[no-]edit" did not spawn
+   the editor as expected (e.g. "revert --no-edit" after a conflict
+   still asked to edit the message), which has been corrected.
+   (merge 39edfd5cbc en/sequencer-edit-upon-conflict-fix later to maint).
+
+ * "git daemon" has been tightened against systems that take backslash
+   as directory separator.
+   (merge 9a7f1ce8b7 rs/daemon-sanitize-dir-sep later to maint).
+
+ * A NULL-dereference bug has been corrected in an error codepath in
+   "git for-each-ref", "git branch --list" etc.
+   (merge c685450880 jk/ref-filter-segfault-fix later to maint).
+
+ * Streamline the codepath to fix the UTF-8 encoding issues in the
+   argv[] and the prefix on macOS.
+   (merge c7d0e61016 tb/precompose-prefix-simplify later to maint).
+
+ * The command-line completion script (in contrib/) had a couple of
+   references that would have given a warning under the "-u" (nounset)
+   option.
+   (merge c5c0548d79 vs/completion-with-set-u later to maint).
+
+ * When "git pack-objects" makes a literal copy of a part of existing
+   packfile using the reachability bitmaps, its update to the progress
+   meter was broken.
+   (merge 8e118e8490 jk/pack-objects-bitmap-progress-fix later to maint).
+
+ * The dependencies for config-list.h and command-list.h were broken
+   when the former was split out of the latter, which has been
+   corrected.
+   (merge 56550ea718 sg/bugreport-fixes later to maint).
+
+ * "git push --quiet --set-upstream" was not quiet when setting the
+   upstream branch configuration, which has been corrected.
+   (merge f3cce896a8 ow/push-quiet-set-upstream later to maint).
+
+ * The prefetch task in "git maintenance" assumed that "git fetch"
+   from any remote would fetch all its local branches, which would
+   fetch too much if the user is interested in only a subset of
+   branches there.
+   (merge 32f67888d8 ds/maintenance-prefetch-fix later to maint).
+
+ * Clarify that pathnames recorded in Git trees are most often (but
+   not necessarily) encoded in UTF-8.
+   (merge 9364bf465d ab/pathname-encoding-doc later to maint).
+
+ * "git --config-env var=val cmd" weren't accepted (only
+   --config-env=var=val was).
+   (merge c331551ccf ps/config-env-option-with-separate-value later to maint).
+
+ * When the reachability bitmap is in effect, the "do not lose
+   recently created objects and those that are reachable from them"
+   safety to protect us from races were disabled by mistake, which has
+   been corrected.
+   (merge 2ba582ba4c jk/prune-with-bitmap-fix later to maint).
+
+ * Cygwin pathname handling fix.
+   (merge bccc37fdc7 ad/cygwin-no-backslashes-in-paths later to maint).
+
+ * "git rebase --[no-]reschedule-failed-exec" did not work well with
+   its configuration variable, which has been corrected.
+   (merge e5b32bffd1 ab/rebase-no-reschedule-failed-exec later to maint).
+
+ * Portability fix for command line completion script (in contrib/).
+   (merge f2acf763e2 si/zsh-complete-comment-fix later to maint).
+
+ * "git repack -A -d" in a partial clone unnecessarily loosened
+   objects in promisor pack.
+
+ * "git bisect skip" when custom words are used for new/old did not
+   work, which has been corrected.
+
+ * A few variants of informational message "Already up-to-date" has
+   been rephrased.
+   (merge ad9322da03 js/merge-already-up-to-date-message-reword later to maint).
+
+ * "git submodule update --quiet" did not propagate the quiet option
+   down to underlying "git fetch", which has been corrected.
+   (merge 62af4bdd42 nc/submodule-update-quiet later to maint).
+
+ * Document that our test can use "local" keyword.
+   (merge a84fd3bcc6 jc/test-allows-local later to maint).
+
+ * The word-diff mode has been taught to work better with a word
+   regexp that can match an empty string.
+   (merge 0324e8fc6b pw/word-diff-zero-width-matches later to maint).
+
+ * "git p4" learned to find branch points more efficiently.
+   (merge 6b79818bfb jk/p4-locate-branch-point-optim later to maint).
+
+ * When "git update-ref -d" removes a ref that is packed, it left
+   empty directories under $GIT_DIR/refs/ for
+   (merge 5f03e5126d wc/packed-ref-removal-cleanup later to maint).
+
+ * "git clean" and "git ls-files -i" had confusion around working on
+   or showing ignored paths inside an ignored directory, which has
+   been corrected.
+   (merge b548f0f156 en/dir-traversal later to maint).
+
+ * The handling of "%(push)" formatting element of "for-each-ref" and
+   friends was broken when the same codepath started handling
+   "%(push:<what>)", which has been corrected.
+   (merge 1e1c4c5eac zh/ref-filter-push-remote-fix later to maint).
+
+ * The bash prompt script (in contrib/) did not work under "set -u".
+   (merge 5c0cbdb107 en/prompt-under-set-u later to maint).
+
+ * The "chainlint" feature in the test framework is a handy way to
+   catch common mistakes in writing new tests, but tends to get
+   expensive.  An knob to selectively disable it has been introduced
+   to help running tests that the developer has not modified.
+   (merge 2d86a96220 jk/test-chainlint-softer later to maint).
+
+ * The "rev-parse" command did not diagnose the lack of argument to
+   "--path-format" option, which was introduced in v2.31 era, which
+   has been corrected.
+   (merge 99fc555188 wm/rev-parse-path-format-wo-arg later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge f451960708 dl/cat-file-doc-cleanup later to maint).
+   (merge 12604a8d0c sv/t9801-test-path-is-file-cleanup later to maint).
+   (merge ea7e63921c jr/doc-ignore-typofix later to maint).
+   (merge 23c781f173 ps/update-ref-trans-hook-doc later to maint).
+   (merge 42efa1231a jk/filter-branch-sha256 later to maint).
+   (merge 4c8e3dca6e tb/push-simple-uses-branch-merge-config later to maint).
+   (merge 6534d436a2 bs/asciidoctor-installation-hints later to maint).
+   (merge 47957485b3 ab/read-tree later to maint).
+   (merge 2be927f3d1 ab/diff-no-index-tests later to maint).
+   (merge 76593c09bb ab/detox-gettext-tests later to maint).
+   (merge 28e29ee38b jc/doc-format-patch-clarify later to maint).
+   (merge fc12b6fdde fm/user-manual-use-preface later to maint).
+   (merge dba94e3a85 cc/test-helper-bloom-usage-fix later to maint).
+   (merge 61a7660516 hn/reftable-tables-doc-update later to maint).
+   (merge 81ed96a9b2 jt/fetch-pack-request-fix later to maint).
+   (merge 151b6c2dd7 jc/doc-do-not-capitalize-clarification later to maint).
+   (merge 9160068ac6 js/access-nul-emulation-on-windows later to maint).
+   (merge 7a14acdbe6 po/diff-patch-doc later to maint).
+   (merge f91371b948 pw/patience-diff-clean-up later to maint).
+   (merge 3a7f0908b6 mt/clean-clean later to maint).
+   (merge d4e2d15a8b ab/streaming-simplify later to maint).
+   (merge 0e59f7ad67 ah/merge-ort-i18n later to maint).
+   (merge e6f68f62e0 ls/typofix later to maint).
diff --git a/Documentation/RelNotes/2.33.0.txt b/Documentation/RelNotes/2.33.0.txt
new file mode 100644
index 0000000000..893c18bfdd
--- /dev/null
+++ b/Documentation/RelNotes/2.33.0.txt
@@ -0,0 +1,279 @@
+Git 2.33 Release Notes
+======================
+
+Updates since Git 2.32
+----------------------
+
+UI, Workflows & Features
+
+ * "git send-email" learned the "--sendmail-cmd" command line option
+   and the "sendemail.sendmailCmd" configuration variable, which is a
+   more sensible approach than the current way of repurposing the
+   "smtp-server" that is meant to name the server to instead name the
+   command to talk to the server.
+
+ * 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.
+
+ * The code to handle the "--format" option in "for-each-ref" and
+   friends made too many string comparisons on %(atom)s used in the
+   format string, which has been corrected by converting them into
+   enum when the format string is parsed.
+
+ * Use the hashfile API in the codepath that writes the index file to
+   reduce code duplication.
+
+ * Repeated rename detections in a sequence of mergy operations have
+   been optimized out for the 'ort' merge strategy.
+
+ * Preliminary clean-up of tests before the main reftable changes
+   hits the codebase.
+
+ * The backend for "diff -G/-S" has been updated to use pcre2 engine
+   when available.
+
+ * Use ".DELETE_ON_ERROR" pseudo target to simplify our Makefile.
+
+ * Code cleanup around struct_type_init() functions.
+
+ * "git send-email" optimization.
+
+ * 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
+-----------------
+
+ * We historically rejected a very short string as an author name
+   while accepting a patch e-mail, which has been loosened.
+   (merge 72ee47ceeb ef/mailinfo-short-name later to maint).
+
+ * The parallel checkout codepath did not initialize object ID field
+   used to talk to the worker processes in a futureproof way.
+
+ * Rewrite code that triggers undefined behaviour warning.
+   (merge aafa5df0df jn/size-t-casted-to-off-t-fix later to maint).
+
+ * The description of "fast-forward" in the glossary has been updated.
+   (merge e22f2daed0 ry/clarify-fast-forward-in-glossary later to maint).
+
+ * Recent "git clone" left a temporary directory behind when the
+   transport layer returned an failure.
+   (merge 6aacb7d861 jk/clone-clean-upon-transport-error later to maint).
+
+ * "git fetch" over protocol v2 left its side of the socket open after
+   it finished speaking, which unnecessarily wasted the resource on
+   the other side.
+   (merge ae1a7eefff jk/fetch-pack-v2-half-close-early later to maint).
+
+ * The command line completion (in contrib/) learned that "git diff"
+   takes the "--anchored" option.
+   (merge d1e7c2cac9 tb/complete-diff-anchored later to maint).
+
+ * "git-svn" tests assumed that "locale -a", which is used to pick an
+   available UTF-8 locale, is available everywhere.  A knob has been
+   introduced to allow testers to specify a suitable locale to use.
+   (merge 482c962de4 dd/svn-test-wo-locale-a later to maint).
+
+ * Update "git subtree" to work better on Windows.
+   (merge 77f37de39f js/subtree-on-windows-fix later to maint).
+
+ * Remove multimail from contrib/
+   (merge f74d11471f js/no-more-multimail later to maint).
+
+ * Make the codebase MSAN clean.
+   (merge 4dbc55e87d ah/uninitialized-reads-fix later to maint).
+
+ * Work around inefficient glob substitution in older versions of bash
+   by rewriting parts of a test.
+   (merge eb87c6f559 jx/t6020-with-older-bash later to maint).
+
+ * Avoid duplicated work while building reachability bitmaps.
+   (merge aa9ad6fee5 jk/bitmap-tree-optim later to maint).
+
+ * We broke "GIT_SKIP_TESTS=t?000" to skip certain tests in recent
+   update, which got fixed.
+
+ * The side-band demultiplexer that is used to display progress output
+   from the remote end did not clear the line properly when the end of
+   line hits at a packet boundary, which has been corrected.
+
+ * Some test scripts assumed that readlink(1) was universally
+   installed and available, which is not the case.
+   (merge 7c0afdf23c jk/test-without-readlink-1 later to maint).
+
+ * Recent update to completion script (in contrib/) broke those who
+   use the __git_complete helper to define completion to their custom
+   command.
+   (merge cea232194d fw/complete-cmd-idx-fix later to maint).
+
+ * Output from some of our tests were affected by the width of the
+   terminal that they were run in, which has been corrected by
+   exporting a fixed value in the COLUMNS environment.
+   (merge c49a177bec ab/fix-columns-to-80-during-tests later to maint).
+
+ * On Windows, mergetool has been taught to find kdiff3.exe just like
+   it finds winmerge.exe.
+   (merge 47eb4c6890 ms/mergetools-kdiff3-on-windows later to maint).
+
+ * When we cannot figure out how wide the terminal is, we use a
+   fallback value of 80 ourselves (which cannot be avoided), but when
+   we run the pager, we export it in COLUMNS, which forces the pager
+   to use the hardcoded value, even when the pager is perfectly
+   capable to figure it out itself.  Stop exporting COLUMNS when we
+   fall back on the hardcoded default value for our own use.
+   (merge 9b6e2c8b98 js/stop-exporting-bogus-columns later to maint).
+
+ * "git cat-file --batch-all-objects"" misbehaved when "--batch" is in
+   use and did not ask for certain object traits.
+   (merge ee02ac6164 zh/cat-file-batch-fix later to maint).
+
+ * Some code and doc clarification around "git push".
+
+ * The "union" conflict resultion variant misbehaved when used with
+   binary merge driver.
+   (merge 382b601acd jk/union-merge-binary later to maint).
+
+ * Prevent "git p4" from failing to submit changes to binary file.
+   (merge 54662d5958 dc/p4-binary-submit-fix later to maint).
+
+ * "git grep --and -e foo" ought to have been diagnosed as an error
+   but instead segfaulted, which has been corrected.
+   (merge fe7fe62d8d rs/grep-parser-fix later to maint).
+
+ * The merge code had funny interactions between content based rename
+   detection and directory rename detection.
+   (merge 3585d0ea23 en/merge-dir-rename-corner-case-fix later to maint).
+
+ * When rebuilding the multi-pack index file reusing an existing one,
+   we used to blindly trust the existing file and ended up carrying
+   corrupted data into the updated file, which has been corrected.
+   (merge f89ecf7988 tb/midx-use-checksum later to maint).
+
+ * Update the location of system-side configuration file on Windows.
+   (merge e355307692 js/gfw-system-config-loc-fix later to maint).
+
+ * Code recently added to support common ancestry negotiation during
+   "git push" did not sanity check its arguments carefully enough.
+   (merge eff40457a4 ab/fetch-negotiate-segv-fix later to maint).
+
+ * Update the documentation not to assume users are of certain gender
+   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).
+   (merge 3127ff90ea tl/fix-packfile-uri-doc later to maint).
+   (merge a84216c684 jk/doc-color-pager later to maint).
+   (merge 4e0a64a713 ab/trace2-squelch-gcc-warning later to maint).
+   (merge 225f7fa847 ps/rev-list-object-type-filter later to maint).
+   (merge 5317dfeaed dd/honor-users-tar-in-tests later to maint).
+   (merge ace6d8e3d6 tk/partial-clone-repack-doc later to maint).
+   (merge 7ba68e0cf1 js/trace2-discard-event-docfix later to maint).
+   (merge 8603c419d3 fc/doc-default-to-upstream-config later to maint).
+   (merge 1d72b604ef jk/revision-squelch-gcc-warning later to maint).
+   (merge abcb66c614 ar/typofix later to maint).
+   (merge 9853830787 ah/graph-typofix later to maint).
+   (merge aac578492d ab/config-hooks-path-testfix later to maint).
+   (merge 98c7656a18 ar/more-typofix later to maint).
+   (merge 6fb9195f6c jk/doc-max-pack-size later to maint).
+   (merge 4184cbd635 ar/mailinfo-memcmp-to-skip-prefix later to maint).
+   (merge 91d2347033 ar/doc-libera-chat-in-my-first-contrib later to maint).
+   (merge 338abb0f04 ab/cmd-foo-should-return later to maint).
+   (merge 546096a5cb ab/xdiff-bug-cleanup later to maint).
+   (merge b7b793d1e7 ab/progress-cleanup later to maint).
+   (merge d94f9b8e90 ba/object-info later to maint).
+   (merge 52ff891c03 ar/test-code-cleanup later to maint).
+   (merge a0538e5c8b dd/document-log-decorate-default later to maint).
+   (merge ce24797d38 mr/cmake later to maint).
+   (merge 9eb542f2ee ab/pre-auto-gc-hook-test later to maint).
+   (merge 9fffc38583 bk/doc-commit-typofix later to maint).
+   (merge 1cf823d8f0 ks/submodule-cleanup later to maint).
+   (merge ebbf5d2b70 js/config-mak-windows-pcre-fix later to maint).
+   (merge 617480d75b hn/refs-iterator-peel-returns-boolean later to maint).
+   (merge 6a24cc71ed ar/submodule-helper-include-cleanup later to maint).
+   (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.34.0.txt b/Documentation/RelNotes/2.34.0.txt
new file mode 100644
index 0000000000..4cb0b8f4cc
--- /dev/null
+++ b/Documentation/RelNotes/2.34.0.txt
@@ -0,0 +1,135 @@
+Git 2.34 Release Notes
+======================
+
+Updates since Git 2.33
+----------------------
+
+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)".
+
+ * Use `ort` instead of `recursive` as the default merge strategy.
+
+ * The userdiff pattern for "java" language has been updated.
+
+
+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.
+
+
+Fixes since v2.33
+-----------------
+
+ * Input validation of "git pack-objects --stdin-packs" has been
+   corrected.
+   (merge 561fa03529 ab/pack-stdin-packs-fix later to maint).
+
+ * Bugfix for common ancestor negotiation recently introduced in "git
+   push" code path.
+   (merge 82823118b9 jt/push-negotiation-fixes later to maint).
+
+ * "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.
+   (merge 6f843a3355 en/pull-conflicting-options later to maint).
+
+ * "git apply" miscounted the bytes and failed to read to the end of
+   binary hunks.
+   (merge 46d723ce57 jk/apply-binary-hunk-parsing-fix later to maint).
+
+ * "git range-diff" code clean-up.
+   (merge c4d5907324 jk/range-diff-fixes later to maint).
+
+ * "git commit --fixup" now works with "--edit" again, after it was
+   broken in v2.32.
+   (merge 8ef6aad664 jk/commit-edit-fixup-fix later to maint).
+
+ * Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
+   new version has a blocker bug for that architecture.
+   (merge 3cf9bb36bf cb/ci-use-upload-artifacts-v1 later to maint).
+
+ * 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.
+   (merge e5ee33e855 pw/rebase-skip-final-fix later to maint).
+
+ * Various bugs in "git rebase -r" have been fixed.
+   (merge f2563c9ef3 pw/rebase-r-fixes later to maint).
+
+ * 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.
+   (merge 95b4ff3931 rs/git-mmap-uses-malloc later to maint).
+
+ * "git diff --relative" segfaulted and/or produced incorrect result
+   when there are unmerged paths.
+   (merge 8174627b3d dd/diff-files-unmerged-fix later to maint).
+
+ * The delayed checkout code path in "git checkout" etc. were chatty
+   even when --quiet and/or --no-progress options were given.
+   (merge 7a132c628e mt/quiet-with-delayed-checkout later to maint).
+
+ * "git branch -D <branch>" used to refuse to remove a broken branch
+   ref that points at a missing commit, which has been corrected.
+   (merge 597a977489 rs/branch-allow-deleting-dangling later to maint).
+
+ * Build update for Apple clang.
+   (merge f32c5d3716 cb/makefile-apple-clang later to maint).
+
+ * The parser for the "--nl" option of "git column" has been
+   corrected.
+   (merge c93ca46cf5 sg/column-nl later to maint).
+
+ * Other code cleanup, docfix, build fix, etc.
+   (merge 1d9c8daef8 ab/bundle-doc later to maint).
+   (merge 81483fe613 en/merge-strategy-docs later to maint).
+   (merge 626beebdf8 js/log-protocol-version later to maint).
+   (merge 00e302da76 cb/builtin-merge-format-string-fix later to maint).
+   (merge ad51ae4dc0 cb/ci-freebsd-update later to maint).
+   (merge be6444d1ca fc/completion-updates later to maint).
+   (merge ff7b83f562 ti/tcsh-completion-regression-fix later to maint).
+   (merge 325b06deda sg/make-fix-ar-invocation later to maint).
+   (merge bd72824c60 me/t5582-cleanup later to maint).
+   (merge f6a5af0f62 ga/send-email-sendmail-cmd later to maint).
+   (merge f58c7468cd ab/ls-remote-packet-trace later to maint).
+   (merge 0160f7e725 ab/rebase-fatal-fatal-fix later to maint).
+   (merge a16eb6b1ff js/maintenance-launchctl-fix later to maint).
+   (merge c21b2511c2 jk/t5323-no-pack-test-fix later to maint).
+   (merge 5146c2f148 mh/credential-leakfix later to maint).
+   (merge 1549577338 dd/t6300-wo-gpg-fix later to maint).
+   (merge 66e905b7dd rs/xopen-reports-open-failures later to maint).
diff --git a/Documentation/RelNotes/2.4.3.txt b/Documentation/RelNotes/2.4.3.txt
index 914d2c1860..422e930aa2 100644
--- a/Documentation/RelNotes/2.4.3.txt
+++ b/Documentation/RelNotes/2.4.3.txt
@@ -66,7 +66,7 @@ Fixes since v2.4.3
  * Some time ago, "git blame" (incorrectly) lost the convert_to_git()
    call when synthesizing a fake "tip" commit that represents the
    state in the working tree, which broke folks who record the history
-   with LF line ending to make their project portabile across
+   with LF line ending to make their project portable across
    platforms while terminating lines in their working tree files with
    CRLF for their platform.
 
diff --git a/Documentation/RelNotes/2.5.0.txt b/Documentation/RelNotes/2.5.0.txt
index 87044504c5..84723f912a 100644
--- a/Documentation/RelNotes/2.5.0.txt
+++ b/Documentation/RelNotes/2.5.0.txt
@@ -172,7 +172,8 @@ Performance, Internal Implementation, Development Support etc.
    incorrect patch text to "git apply".  Add tests to demonstrate
    this.
 
-   I have a slight suspicion that this may be $gmane/87202 coming back
+   I have a slight suspicion that this may be
+   cf. <7vtzf77wjp.fsf@gitster.siamese.dyndns.org> coming back
    and biting us (I seem to have said "let's run with this and see
    what happens" back then).
 
diff --git a/Documentation/RelNotes/2.7.0.txt b/Documentation/RelNotes/2.7.0.txt
index 563dadc57e..e3cbf3a73c 100644
--- a/Documentation/RelNotes/2.7.0.txt
+++ b/Documentation/RelNotes/2.7.0.txt
@@ -40,7 +40,7 @@ UI, Workflows & Features
 
  * "git interpret-trailers" can now run outside of a Git repository.
 
- * "git p4" learned to reencode the pathname it uses to communicate
+ * "git p4" learned to re-encode the pathname it uses to communicate
    with the p4 depot with a new option.
 
  * Give progress meter to "git filter-branch".
diff --git a/Documentation/RelNotes/2.7.3.txt b/Documentation/RelNotes/2.7.3.txt
index 6adf038915..f618d71efd 100644
--- a/Documentation/RelNotes/2.7.3.txt
+++ b/Documentation/RelNotes/2.7.3.txt
@@ -20,7 +20,7 @@ Fixes since v2.7.2
    tests.
 
  * "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a
-   rev, i.e. the object named by the the pathname with wildcard
+   rev, i.e. the object named by the pathname with wildcard
    characters in a tree object.
 
  * "git rev-parse --git-common-dir" used in the worktree feature
diff --git a/Documentation/RelNotes/2.8.0.txt b/Documentation/RelNotes/2.8.0.txt
index 5fbe1b86ee..38453281b8 100644
--- a/Documentation/RelNotes/2.8.0.txt
+++ b/Documentation/RelNotes/2.8.0.txt
@@ -189,7 +189,7 @@ Performance, Internal Implementation, Development Support etc.
  * Some calls to strcpy(3) triggers a false warning from static
    analyzers that are less intelligent than humans, and reducing the
    number of these false hits helps us notice real issues.  A few
-   calls to strcpy(3) in a couple of protrams that are already safe
+   calls to strcpy(3) in a couple of programs that are already safe
    has been rewritten to avoid false warnings.
 
  * The "name_path" API was an attempt to reduce the need to construct
@@ -377,7 +377,7 @@ notes for details).
    on that order.
 
  * "git show 'HEAD:Foo[BAR]Baz'" did not interpret the argument as a
-   rev, i.e. the object named by the the pathname with wildcard
+   rev, i.e. the object named by the pathname with wildcard
    characters in a tree object.
    (merge aac4fac nd/dwim-wildcards-as-pathspecs later to maint).
 
diff --git a/Documentation/RelNotes/2.8.3.txt b/Documentation/RelNotes/2.8.3.txt
index fedd9968e5..a63825ed87 100644
--- a/Documentation/RelNotes/2.8.3.txt
+++ b/Documentation/RelNotes/2.8.3.txt
@@ -55,8 +55,8 @@ Fixes since v2.8.2
    This is necessary to use Git on Windows shared directories, and is
    already enabled for the MinGW and plain Windows builds.  It also
    has been used in Cygwin packaged versions of Git for quite a while.
-   See http://thread.gmane.org/gmane.comp.version-control.git/291853
-   and http://thread.gmane.org/gmane.comp.version-control.git/275680.
+   See https://lore.kernel.org/git/20160419091055.GF2345@dinwoodie.org/
+   and https://lore.kernel.org/git/20150811100527.GW14466@dinwoodie.org/.
 
  * "git replace -e" did not honour "core.editor" configuration.
 
diff --git a/Documentation/RelNotes/2.9.0.txt b/Documentation/RelNotes/2.9.0.txt
index b61d36712f..991640119a 100644
--- a/Documentation/RelNotes/2.9.0.txt
+++ b/Documentation/RelNotes/2.9.0.txt
@@ -368,7 +368,7 @@ notes for details).
    This is necessary to use Git on Windows shared directories, and is
    already enabled for the MinGW and plain Windows builds.  It also
    has been used in Cygwin packaged versions of Git for quite a while.
-   See http://thread.gmane.org/gmane.comp.version-control.git/291853
+   See https://lore.kernel.org/git/20160419091055.GF2345@dinwoodie.org/
 
  * "merge-octopus" strategy did not ensure that the index is clean
    when merge begins.
diff --git a/Documentation/RelNotes/2.9.3.txt b/Documentation/RelNotes/2.9.3.txt
index 695b86f612..305e08062b 100644
--- a/Documentation/RelNotes/2.9.3.txt
+++ b/Documentation/RelNotes/2.9.3.txt
@@ -36,7 +36,7 @@ Fixes since v2.9.2
  * One part of "git am" had an oddball helper function that called
    stuff from outside "his" as opposed to calling what we have "ours",
    which was not gender-neutral and also inconsistent with the rest of
-   the system where outside stuff is usuall called "theirs" in
+   the system where outside stuff is usually called "theirs" in
    contrast to "ours".
 
  * The test framework learned a new helper test_match_signal to
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 1a60cc1329..e409022d93 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -3,8 +3,9 @@ Submitting Patches
 
 == Guidelines
 
-Here are some guidelines for people who want to contribute their code
-to this software.
+Here are some guidelines for people who want to contribute their code to this
+software. There is also a link:MyFirstContribution.html[step-by-step tutorial]
+available which covers many of these same guidelines.
 
 [[base-branch]]
 === Decide what to base your work on.
@@ -18,7 +19,7 @@ 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 `pu`, but not in `master`,
+  feature depends on a topic that is in `seen`, but not in `master`,
   base your work on the tip of that topic.
 
 * Corrections and enhancements to a topic not yet in `master` should
@@ -27,7 +28,7 @@ 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 `pu` privately and send
+  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.
@@ -37,7 +38,7 @@ change is relevant to.
   these parts should be based on their trees.
 
 To find the tip of a topic branch, run `git log --first-parent
-master..pu` and look for the merge commit. The second parent of this
+master..seen` and look for the merge commit. The second parent of this
 commit is the tip of the topic branch.
 
 [[separate-commits]]
@@ -73,10 +74,9 @@ 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.
+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
@@ -116,10 +116,13 @@ If in doubt which identifier to use, run `git log --no-merges` on the
 files you are modifying to see the current conventions.
 
 [[summary-section]]
-It's customary to start the remainder of the first line after "area: "
-with a lower-case letter. E.g. "doc: clarify...", not "doc:
-Clarify...", or "githooks.txt: improve...", not "githooks.txt:
-Improve...".
+The title sentence after the "area:" prefix omits the full stop at the
+end, and its first word is not capitalized unless there is a reason to
+capitalize it other than because it is the first word in the sentence.
+E.g. "doc: clarify...", not "doc: Clarify...", or "githooks.txt:
+improve...", not "githooks.txt: Improve...".  But "refs: HEAD is also
+treated as a ref" is correct, as we spell `HEAD` in all caps even when
+it appears in the middle of a sentence.
 
 [[meaningful-message]]
 The body should provide a meaningful commit message, which:
@@ -142,21 +145,106 @@ 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 sha1 (subject, date)",
-with the subject enclosed in a pair of double-quotes, like this:
+branch, use the format "abbreviated hash (subject, date)", like this:
 
 ....
-	Commit f86a374 ("pack-bitmap.c: fix a memleak", 2015-03-30)
+	Commit f86a374 (pack-bitmap.c: fix a memleak, 2015-03-30)
 	noticed that ...
 ....
 
 The "Copy commit summary" command of gitk can be used to obtain this
-format, or this invocation of `git show`:
+format (with the subject enclosed in a pair of double-quotes), or this
+invocation of `git show`:
 
 ....
-	git show -s --date=short --pretty='format:%h ("%s", %ad)' <commit>
+	git show -s --pretty=reference <commit>
 ....
 
+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.
 
@@ -202,7 +290,7 @@ send them as replies to either an additional "cover letter" message
 (see below), the first patch, or the respective preceding patch.
 
 If your log message (including your name on the
-Signed-off-by line) is not writable in ASCII, make sure that
+`Signed-off-by` trailer) is not writable in ASCII, make sure that
 you send off a message in the correct encoding.
 
 WARNING: Be wary of your MUAs word-wrap
@@ -222,7 +310,7 @@ previously sent.
 The `git format-patch` command follows the best current practice to
 format the body of an e-mail message.  At the beginning of the
 patch should come your commit message, ending with the
-Signed-off-by: lines, and a line that consists of three dashes,
+`Signed-off-by` trailers, and a line that consists of three dashes,
 followed by the diffstat information and the patch itself.  If
 you are forwarding a patch from somebody else, optionally, at
 the beginning of the e-mail message just before the commit
@@ -283,89 +371,14 @@ identify them), to solicit comments and reviews.
 :git-ml: footnote:[The mailing list: git@vger.kernel.org]
 
 After the list reached a consensus that it is a good idea to apply the
-patch, re-send it with "To:" set to the maintainer{current-maintainer} and "cc:" the
-list{git-ml} for inclusion.
+patch, re-send it with "To:" set to the maintainer{current-maintainer}
+and "cc:" the list{git-ml} for inclusion.  This is especially relevant
+when the maintainer did not heavily participate in the discussion and
+instead left the review to trusted others.
 
 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.
-
-[[sign-off]]
-=== Certify your work by adding your "Signed-off-by: " line
-
-To improve tracking of who did what, we've borrowed the
-"sign-off" procedure from the Linux kernel project on patches
-that are being emailed around.  Although core Git is a lot
-smaller project it is a good discipline to follow it.
-
-The sign-off is a simple line at the end of the explanation for
-the patch, which certifies that you wrote it or otherwise have
-the right to pass it on as an open-source patch.  The rules are
-pretty simple: if you can 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.
-____
-
-then you just add a line saying
-
-....
-	Signed-off-by: Random J Developer <random@developer.example.org>
-....
-
-This line can be automatically added by Git if you run the git-commit
-command with the -s option.
-
-Notice that you can place your own Signed-off-by: line 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).
-
-[[real-name]]
-Also notice that a real name is used in the Signed-off-by: line. 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
-  reviewer and means that she is completely satisfied that the patch
-  is ready for application.  It is usually offered only after a
-  detailed review.
-. `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:".
+patch, and "cc:" them when sending such a final version for inclusion.
 
 == Subsystems with dedicated maintainers
 
@@ -417,7 +430,7 @@ help you find out who they are.
   and cooked further and eventually graduates to `master`.
 
 In any time between the (2)-(3) cycle, the maintainer may pick it up
-from the list and queue it to `pu`, in order to make it easier for
+from the list and queue it to `seen`, in order to make it easier for
 people play with it without having to pick up and apply the patch to
 their trees themselves.
 
@@ -428,20 +441,19 @@ their trees themselves.
   master. `git pull --rebase` will automatically skip already-applied
   patches, and will let you know. This works only if you rebase on top
   of the branch in which your patch has been merged (i.e. it will not
-  tell you if your patch is merged in pu if you rebase on top of
+  tell you if your patch is merged in `seen` if you rebase on top of
   master).
 
 * Read the Git mailing list, the maintainer regularly posts messages
   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:
 
@@ -449,31 +461,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/asciidoc.conf b/Documentation/asciidoc.conf
index 8fc4b67081..3e4c13971b 100644
--- a/Documentation/asciidoc.conf
+++ b/Documentation/asciidoc.conf
@@ -31,24 +31,6 @@ ifdef::backend-docbook[]
 endif::backend-docbook[]
 
 ifdef::backend-docbook[]
-ifndef::git-asciidoc-no-roff[]
-# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
-# v1.72 breaks with this because it replaces dots not in roff requests.
-[listingblock]
-<example><title>{title}</title>
-<literallayout class="monospaced">
-ifdef::doctype-manpage[]
-&#10;.ft C&#10;
-endif::doctype-manpage[]
-|
-ifdef::doctype-manpage[]
-&#10;.ft&#10;
-endif::doctype-manpage[]
-</literallayout>
-{title#}</example>
-endif::git-asciidoc-no-roff[]
-
-ifdef::git-asciidoc-no-roff[]
 ifdef::doctype-manpage[]
 # The following two small workarounds insert a simple paragraph after screen
 [listingblock]
@@ -67,7 +49,6 @@ ifdef::doctype-manpage[]
 {title#}</para></formalpara>
 {title%}<simpara></simpara>
 endif::doctype-manpage[]
-endif::git-asciidoc-no-roff[]
 endif::backend-docbook[]
 
 ifdef::doctype-manpage[]
diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt
index 5d122db6e9..117f4cf806 100644
--- a/Documentation/blame-options.txt
+++ b/Documentation/blame-options.txt
@@ -1,6 +1,6 @@
 -b::
 	Show blank SHA-1 for boundary commits.  This can also
-	be controlled via the `blame.blankboundary` config option.
+	be controlled via the `blame.blankBoundary` config option.
 
 --root::
 	Do not treat root commits as boundaries.  This can also be
@@ -11,11 +11,12 @@
 
 -L <start>,<end>::
 -L :<funcname>::
-	Annotate only the given line range. May be specified multiple times.
-	Overlapping ranges are allowed.
+	Annotate only the line range given by '<start>,<end>',
+	or by the function name regex '<funcname>'.
+	May be specified multiple times. Overlapping ranges are allowed.
 +
-<start> and <end> are optional. ``-L <start>'' or ``-L <start>,'' spans from
-<start> to end of file. ``-L ,<end>'' spans from start of file to <end>.
+'<start>' and '<end>' are optional. `-L <start>` or `-L <start>,` spans from
+'<start>' to end of file. `-L ,<end>` spans from start of file to '<end>'.
 +
 include::line-range-format.txt[]
 
@@ -36,6 +37,12 @@ include::line-range-format.txt[]
 	START.  `git blame --reverse START` is taken as `git blame
 	--reverse START..HEAD` for convenience.
 
+--first-parent::
+	Follow only the first parent commit upon seeing a merge
+	commit. This option can be used to determine when a line
+	was introduced to a particular integration branch, rather
+	than when it was introduced to the history overall.
+
 -p::
 --porcelain::
 	Show in a format designed for machine consumption.
diff --git a/Documentation/cmd-list.perl b/Documentation/cmd-list.perl
index 5aa73cfe45..af5da45d28 100755
--- a/Documentation/cmd-list.perl
+++ b/Documentation/cmd-list.perl
@@ -6,9 +6,14 @@ sub format_one {
 	my ($out, $nameattr) = @_;
 	my ($name, $attr) = @$nameattr;
 	my ($state, $description);
+	my $mansection;
 	$state = 0;
 	open I, '<', "$name.txt" or die "No such file $name.txt";
 	while (<I>) {
+		if (/^git[a-z0-9-]*\(([0-9])\)$/) {
+			$mansection = $1;
+			next;
+		}
 		if (/^NAME$/) {
 			$state = 1;
 			next;
@@ -27,7 +32,7 @@ sub format_one {
 		die "No description found in $name.txt";
 	}
 	if (my ($verify_name, $text) = ($description =~ /^($name) - (.*)/)) {
-		print $out "linkgit:$name\[1\]::\n\t";
+		print $out "linkgit:$name\[$mansection\]::\n\t";
 		if ($attr =~ / deprecated /) {
 			print $out "(deprecated) ";
 		}
@@ -38,12 +43,15 @@ sub format_one {
 	}
 }
 
-while (<>) {
+my ($input, @categories) = @ARGV;
+
+open IN, "<$input";
+while (<IN>) {
 	last if /^### command list/;
 }
 
 my %cmds = ();
-for (sort <>) {
+for (sort <IN>) {
 	next if /^#/;
 
 	chomp;
@@ -51,17 +59,10 @@ for (sort <>) {
 	$attr = '' unless defined $attr;
 	push @{$cmds{$cat}}, [$name, " $attr "];
 }
+close IN;
 
-for my $cat (qw(ancillaryinterrogators
-		ancillarymanipulators
-		mainporcelain
-		plumbinginterrogators
-		plumbingmanipulators
-		synchingrepositories
-		foreignscminterface
-		purehelpers
-		synchelpers)) {
-	my $out = "cmds-$cat.txt";
+for my $out (@categories) {
+	my ($cat) = $out =~ /^cmds-(.*)\.txt$/;
 	open O, '>', "$out+" or die "Cannot open output file $out+";
 	for (@{$cmds{$cat}}) {
 		format_one(\*O, $_);
diff --git a/Documentation/config.txt b/Documentation/config.txt
index f50f1b4128..0c0e6b859f 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -3,11 +3,12 @@ CONFIGURATION FILE
 
 The Git configuration file contains a number of variables that affect
 the Git commands' behavior. The files `.git/config` and optionally
-`config.worktree` (see `extensions.worktreeConfig` below) in each
-repository are used to store the configuration for that repository, and
-`$HOME/.gitconfig` is used to store a per-user configuration as
-fallback values for the `.git/config` file. The file `/etc/gitconfig`
-can be used to store a system-wide default configuration.
+`config.worktree` (see the "CONFIGURATION FILE" section of
+linkgit:git-worktree[1]) in each repository are used to store the
+configuration for that repository, and `$HOME/.gitconfig` is used to
+store a per-user configuration as fallback values for the `.git/config`
+file. The file `/etc/gitconfig` can be used to store a system-wide
+default configuration.
 
 The configuration variables are used by both the Git plumbing
 and the porcelains. The variables are divided into sections, wherein
@@ -45,7 +46,7 @@ Subsection names are case sensitive and can contain any characters except
 newline and the null byte. Doublequote `"` and backslash can be included
 by escaping them as `\"` and `\\`, respectively. Backslashes preceding
 other characters are dropped when reading; for example, `\t` is read as
-`t` and `\0` is read as `0` Section headers cannot span multiple lines.
+`t` and `\0` is read as `0`. Section headers cannot span multiple lines.
 Variables may belong directly to a section or to a given subsection. You
 can have `[section]` if you have `[section "subsection"]`, but you don't
 need to.
@@ -63,7 +64,7 @@ The variable names are case-insensitive, allow only alphanumeric characters
 and `-`, and must start with an alphabetic character.
 
 A line that defines a value can be continued to the next line by
-ending it with a `\`; the backquote and the end-of-line are
+ending it with a `\`; the backslash and the end-of-line are
 stripped.  Leading whitespaces after 'name =', the remainder of the
 line after the first comment character '#' or ';', and trailing
 whitespaces of the line are discarded unless they are enclosed in
@@ -142,7 +143,7 @@ refer to linkgit:gitignore[5] for details. For convenience:
 
 `gitdir/i`::
 	This is the same as `gitdir` except that matching is done
-	case-insensitively (e.g. on case-insensitive file sytems)
+	case-insensitively (e.g. on case-insensitive file systems)
 
 `onbranch`::
 	The data that follows the keyword `onbranch:` is taken to be a
@@ -220,12 +221,12 @@ Example
 ; affected by the condition
 [includeIf "gitdir:/path/to/group/"]
 	path = foo.inc
-----
 
-	; include only if we are in a worktree where foo-branch is
-	; currently checked out
-	[includeIf "onbranch:foo-branch"]
-		path = foo.inc
+; include only if we are in a worktree where foo-branch is
+; currently checked out
+[includeIf "onbranch:foo-branch"]
+	path = foo.inc
+----
 
 Values
 ~~~~~~
@@ -263,7 +264,9 @@ color::
 +
 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.
+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`.
 +
 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
@@ -295,6 +298,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
+subsituted 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
@@ -331,12 +343,16 @@ include::config/checkout.txt[]
 
 include::config/clean.txt[]
 
+include::config/clone.txt[]
+
 include::config/color.txt[]
 
 include::config/column.txt[]
 
 include::config/commit.txt[]
 
+include::config/commitgraph.txt[]
+
 include::config/credential.txt[]
 
 include::config/completion.txt[]
@@ -345,6 +361,8 @@ include::config/diff.txt[]
 
 include::config/difftool.txt[]
 
+include::config/extensions.txt[]
+
 include::config/fastimport.txt[]
 
 include::config/feature.txt[]
@@ -389,10 +407,14 @@ include::config/interactive.txt[]
 
 include::config/log.txt[]
 
+include::config/lsrefs.txt[]
+
 include::config/mailinfo.txt[]
 
 include::config/mailmap.txt[]
 
+include::config/maintenance.txt[]
+
 include::config/man.txt[]
 
 include::config/merge.txt[]
@@ -445,6 +467,8 @@ include::config/submodule.txt[]
 
 include::config/tag.txt[]
 
+include::config/tar.txt[]
+
 include::config/trace2.txt[]
 
 include::config/transfer.txt[]
diff --git a/Documentation/config/add.txt b/Documentation/config/add.txt
index 4d753f006e..c9f748f81c 100644
--- a/Documentation/config/add.txt
+++ b/Documentation/config/add.txt
@@ -5,3 +5,8 @@ add.ignore-errors (deprecated)::
 	option of linkgit:git-add[1].  `add.ignore-errors` is deprecated,
 	as it does not follow the usual naming convention for configuration
 	variables.
+
+add.interactive.useBuiltin::
+	[EXPERIMENTAL] Set to `true` to use the experimental built-in
+	implementation of the interactive version of linkgit:git-add[1]
+	instead of the Perl script version. Is `false` by default.
diff --git a/Documentation/config/advice.txt b/Documentation/config/advice.txt
index 6aaa360202..063eec2511 100644
--- a/Documentation/config/advice.txt
+++ b/Documentation/config/advice.txt
@@ -10,9 +10,8 @@ advice.*::
 		that the check is disabled.
 	pushUpdateRejected::
 		Set this variable to 'false' if you want to disable
-		'pushNonFFCurrent',
-		'pushNonFFMatching', 'pushAlreadyExists',
-		'pushFetchFirst', and 'pushNeedsForce'
+		'pushNonFFCurrent', 'pushNonFFMatching', 'pushAlreadyExists',
+		'pushFetchFirst', 'pushNeedsForce', and 'pushRefNeedsUpdate'
 		simultaneously.
 	pushNonFFCurrent::
 		Advice shown when linkgit:git-push[1] fails due to a
@@ -41,6 +40,13 @@ advice.*::
 		we can still suggest that the user push to either
 		refs/heads/* or refs/tags/* based on the type of the
 		source object.
+	pushRefNeedsUpdate::
+		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,
@@ -107,4 +113,17 @@ advice.*::
 		editor input from the user.
 	nestedTag::
 		Advice shown if a user attempts to recursively tag a tag object.
+	submoduleAlternateErrorStrategyDie::
+		Advice shown when a submodule.alternateErrorStrategy option
+		configured to "die" causes a fatal error.
+	addIgnoredFile::
+		Advice shown if a user attempts to add an ignored file to
+		the index.
+	addEmptyPathspec::
+		Advice shown if a user runs the add command without providing
+		the pathspec parameter.
+	updateSparsePath::
+		Advice shown when either linkgit:git-add[1] or linkgit:git-rm[1]
+		is asked to update index entries outside the current sparse
+		checkout.
 --
diff --git a/Documentation/config/blame.txt b/Documentation/config/blame.txt
index 9468e8599c..4d047c1790 100644
--- a/Documentation/config/blame.txt
+++ b/Documentation/config/blame.txt
@@ -27,7 +27,7 @@ blame.ignoreRevsFile::
 	file names will reset the list of ignored revisions.  This option will
 	be handled before the command line option `--ignore-revs-file`.
 
-blame.markUnblamables::
+blame.markUnblamableLines::
 	Mark lines that were changed by an ignored revision that we could not
 	attribute to another commit with a '*' in the output of
 	linkgit:git-blame[1].
diff --git a/Documentation/config/branch.txt b/Documentation/config/branch.txt
index a592d522a7..cc5f3249fc 100644
--- a/Documentation/config/branch.txt
+++ b/Documentation/config/branch.txt
@@ -81,15 +81,16 @@ branch.<name>.rebase::
 	"git pull" is run. See "pull.rebase" for doing this in a non
 	branch-specific manner.
 +
-When `merges`, pass the `--rebase-merges` option to 'git rebase'
+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` (deprecated in favor of `merges`), also pass
+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`, the rebase is run in interactive mode.
+When the value is `interactive` (or just 'i'), the rebase is run in interactive
+mode.
 +
 *NOTE*: this is a possibly dangerous operation; do *not* use
 it unless you understand the implications (see linkgit:git-rebase[1]
diff --git a/Documentation/config/checkout.txt b/Documentation/config/checkout.txt
index 6b646813ab..bfbca90f0e 100644
--- a/Documentation/config/checkout.txt
+++ b/Documentation/config/checkout.txt
@@ -1,18 +1,44 @@
 checkout.defaultRemote::
-	When you run 'git checkout <something>'
-	or 'git switch <something>' and only have one
+	When you run `git checkout <something>`
+	or `git switch <something>` and only have one
 	remote, it may implicitly fall back on checking out and
-	tracking e.g. 'origin/<something>'. This stops working as soon
-	as you have more than one remote with a '<something>'
+	tracking e.g. `origin/<something>`. This stops working as soon
+	as you have more than one remote with a `<something>`
 	reference. This setting allows for setting the name of a
 	preferred remote that should always win when it comes to
 	disambiguation. The typical use-case is to set this to
 	`origin`.
 +
 Currently this is used by linkgit:git-switch[1] and
-linkgit:git-checkout[1] when 'git checkout <something>'
-or 'git switch <something>'
-will checkout the '<something>' branch on another remote,
-and by linkgit:git-worktree[1] when 'git worktree add' refers to a
+linkgit:git-checkout[1] when `git checkout <something>`
+or `git switch <something>`
+will checkout the `<something>` branch on another remote,
+and by linkgit:git-worktree[1] when `git worktree add` refers to a
 remote branch. This setting might be used for other checkout-like
 commands or functionality in the future.
+
+checkout.guess::
+	Provides the default value for the `--guess` or `--no-guess`
+	option in `git checkout` and `git switch`. See
+	linkgit:git-switch[1] and linkgit:git-checkout[1].
+
+checkout.workers::
+	The number of parallel workers to use when updating the working tree.
+	The default is one, i.e. sequential execution. If set to a value less
+	than one, Git will use as many workers as the number of logical cores
+	available. This setting and `checkout.thresholdForParallelism` affect
+	all commands that perform checkout. E.g. checkout, clone, reset,
+	sparse-checkout, etc.
++
+Note: parallel checkout usually delivers better performance for repositories
+located on SSDs or over NFS. For repositories on spinning disks and/or machines
+with a small number of cores, the default sequential checkout often performs
+better. The size and compression level of a repository might also influence how
+well the parallel version performs.
+
+checkout.thresholdForParallelism::
+	When running parallel checkout with a small number of files, the cost
+	of subprocess spawning and inter-process communication might outweigh
+	the parallelization gains. This setting allows to define the minimum
+	number of files for which parallel checkout should be attempted. The
+	default is 100.
diff --git a/Documentation/config/clone.txt b/Documentation/config/clone.txt
new file mode 100644
index 0000000000..7bcfbd18a5
--- /dev/null
+++ b/Documentation/config/clone.txt
@@ -0,0 +1,8 @@
+clone.defaultRemoteName::
+	The name of the remote to create when cloning a repository.  Defaults to
+	`origin`, and can be overridden by passing the `--origin` command-line
+	option to linkgit:git-clone[1].
+
+clone.rejectShallow::
+	Reject to clone a repository if it is a shallow one, can be overridden by
+	passing option `--reject-shallow` in command line. See linkgit:git-clone[1]
diff --git a/Documentation/config/color.txt b/Documentation/config/color.txt
index d5daacb13a..e05d520a86 100644
--- a/Documentation/config/color.txt
+++ b/Documentation/config/color.txt
@@ -127,8 +127,9 @@ color.interactive.<slot>::
 	interactive commands.
 
 color.pager::
-	A boolean to enable/disable colored output when the pager is in
-	use (default is true).
+	A boolean to specify whether `auto` color modes should colorize
+	output going to the pager. Defaults to true; set this to false
+	if your pager does not understand ANSI color codes.
 
 color.push::
 	A boolean to enable/disable color in push errors. May be set to
diff --git a/Documentation/config/commitgraph.txt b/Documentation/config/commitgraph.txt
new file mode 100644
index 0000000000..30604e4a4c
--- /dev/null
+++ b/Documentation/config/commitgraph.txt
@@ -0,0 +1,14 @@
+commitGraph.generationVersion::
+	Specifies the type of generation number version to use when writing
+	or reading the commit-graph file. If version 1 is specified, then
+	the corrected commit dates will not be written or read. Defaults to
+	2.
+
+commitGraph.maxNewFilters::
+	Specifies the default value for the `--max-new-filters` option of `git
+	commit-graph write` (c.f., linkgit:git-commit-graph[1]).
+
+commitGraph.readChangedPaths::
+	If true, then git will use the changed-path Bloom filters in the
+	commit-graph file (if it exists, and they are present). Defaults to
+	true. See linkgit:git-commit-graph[1] for more information.
diff --git a/Documentation/config/core.txt b/Documentation/config/core.txt
index 852d2ba37a..c04f62a54a 100644
--- a/Documentation/config/core.txt
+++ b/Documentation/config/core.txt
@@ -68,6 +68,17 @@ core.fsmonitor::
 	avoiding unnecessary processing of files that have not changed.
 	See the "fsmonitor-watchman" section of linkgit:githooks[5].
 
+core.fsmonitorHookVersion::
+	Sets the version of hook that is to be used when calling fsmonitor.
+	There are currently versions 1 and 2. When this is not set,
+	version 2 will be tried first and if it fails then version 1
+	will be tried. Version 1 uses a timestamp as input to determine
+	which files have changes since that time but some monitors
+	like watchman have race conditions when used with a timestamp.
+	Version 2 uses an opaque string so that the monitor can return
+	something that can be used to determine what files have changed
+	without race conditions.
+
 core.trustctime::
 	If false, the ctime differences between the index and the
 	working tree are ignored; useful when the inode change time
@@ -388,7 +399,7 @@ the largest projects.  You probably do not need to adjust this value.
 Common unit suffixes of 'k', 'm', or 'g' are supported.
 
 core.deltaBaseCacheLimit::
-	Maximum number of bytes to reserve for caching base objects
+	Maximum number of bytes per thread to reserve for caching base objects
 	that may be referenced by multiple deltified objects.  By storing the
 	entire decompressed base objects in a cache Git is able
 	to avoid unpacking and decompressing frequently used base
@@ -559,6 +570,12 @@ core.unsetenvvars::
 	Defaults to `PERL5LIB` to account for the fact that Git for
 	Windows insists on using its own Perl interpreter.
 
+core.restrictinheritedhandles::
+	Windows-only: override whether spawned processes inherit only standard
+	file handles (`stdin`, `stdout` and `stderr`) or all handles. Can be
+	`auto`, `true` or `false`. Defaults to `auto`, which means `true` on
+	Windows 7 and later, and `false` on older Windows versions.
+
 core.createObject::
 	You can set this to 'link', in which case a hardlink followed by
 	a delete of the source are used to make sure that object creation
@@ -589,12 +606,18 @@ core.useReplaceRefs::
 
 core.multiPackIndex::
 	Use the multi-pack-index file to track multiple packfiles using a
-	single index. See link:technical/multi-pack-index.html[the
-	multi-pack-index design document].
+	single index. See linkgit:git-multi-pack-index[1] for more
+	information. Defaults to true.
 
 core.sparseCheckout::
-	Enable "sparse checkout" feature. See section "Sparse checkout" in
-	linkgit:git-read-tree[1] for more information.
+	Enable "sparse checkout" feature. See linkgit:git-sparse-checkout[1]
+	for more information.
+
+core.sparseCheckoutCone::
+	Enables the "cone mode" of the sparse checkout feature. When the
+	sparse-checkout file contains a limited set of patterns, then this
+	mode provides significant performance advantages. See
+	linkgit:git-sparse-checkout[1] for more information.
 
 core.abbrev::
 	Set the length object names are abbreviated to.  If
@@ -602,4 +625,6 @@ core.abbrev::
 	computed based on the approximate number of packed objects
 	in your repository, which hopefully is enough for
 	abbreviated object names to stay unique for some time.
+	If set to "no", no abbreviation is made and the object names
+	are shown in their full length.
 	The minimum length is 4.
diff --git a/Documentation/config/credential.txt b/Documentation/config/credential.txt
index 60fb3189e1..512f31876e 100644
--- a/Documentation/config/credential.txt
+++ b/Documentation/config/credential.txt
@@ -1,9 +1,13 @@
 credential.helper::
 	Specify an external helper to be called when a username or
 	password credential is needed; the helper may consult external
-	storage to avoid prompting the user for the credentials. Note
-	that multiple helpers may be defined. See linkgit:gitcredentials[7]
-	for details.
+	storage to avoid prompting the user for the credentials. This is
+	normally the name of a credential helper with possible
+	arguments, but may also be an absolute path with arguments or, if
+	preceded by `!`, shell commands.
++
+Note that multiple helpers may be defined. See linkgit:gitcredentials[7]
+for details and examples.
 
 credential.useHttpPath::
 	When acquiring credentials, consider the "path" component of an http
@@ -24,3 +28,9 @@ credential.<url>.*::
 
 credentialCache.ignoreSIGHUP::
 	Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting.
+
+credentialStore.lockTimeoutMS::
+	The length of time, in milliseconds, for git-credential-store to retry
+	when trying to lock the credentials file. Value 0 means not to retry at
+	all; -1 means to try indefinitely. Default is 1000 (i.e., retry for
+	1s).
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt
index ff09f1cf73..32f84838ac 100644
--- a/Documentation/config/diff.txt
+++ b/Documentation/config/diff.txt
@@ -85,6 +85,8 @@ diff.ignoreSubmodules::
 	and 'git status' when `status.submoduleSummary` is set unless it is
 	overridden by using the --ignore-submodules command-line option.
 	The 'git submodule' commands are not affected by this setting.
+	By default this is set to untracked so that any untracked
+	submodules are ignored.
 
 diff.mnemonicPrefix::
 	If set, 'git diff' uses a prefix pair that is different from the
@@ -105,6 +107,10 @@ diff.mnemonicPrefix::
 diff.noprefix::
 	If set, 'git diff' does not show any source or destination prefix.
 
+diff.relative::
+	If set to 'true', 'git diff' does not show changes outside of the directory
+	and show pathnames relative to the current directory.
+
 diff.orderFile::
 	File indicating how to order files within a diff.
 	See the '-O' option to linkgit:git-diff[1] for details.
@@ -112,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
new file mode 100644
index 0000000000..4e23d73cdc
--- /dev/null
+++ b/Documentation/config/extensions.txt
@@ -0,0 +1,8 @@
+extensions.objectFormat::
+	Specify the hash algorithm to use.  The acceptable values are `sha1` and
+	`sha256`.  If not specified, `sha1` is assumed.  It is an error to specify
+	this key unless `core.repositoryFormatVersion` is 1.
++
+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.
diff --git a/Documentation/config/feature.txt b/Documentation/config/feature.txt
index 875f8c8a66..cdecd04e5b 100644
--- a/Documentation/config/feature.txt
+++ b/Documentation/config/feature.txt
@@ -12,19 +12,8 @@ feature.experimental::
 	setting if you are interested in providing feedback on experimental
 	features. The new default values are:
 +
-* `pack.useSparse=true` uses a new algorithm when constructing a pack-file
-which can improve `git push` performance in repos with many files.
-+
 * `fetch.negotiationAlgorithm=skipping` may improve fetch negotiation times by
 skipping more commits at a time, reducing the number of round trips.
-+
-* `fetch.writeCommitGraph=true` writes a commit-graph after every `git fetch`
-command that downloads a pack-file from a remote. Using the `--split` option,
-most executions will create a very small commit-graph file on top of the
-existing commit-graph file(s). Occasionally, these files will merge and the
-write may take longer. Having an updated commit-graph file helps performance
-of many Git commands, including `git merge-base`, `git push -f`, and
-`git log --graph`.
 
 feature.manyFiles::
 	Enable config options that optimize for repos with many files in the
diff --git a/Documentation/config/fetch.txt b/Documentation/config/fetch.txt
index f11940280f..63748c02b7 100644
--- a/Documentation/config/fetch.txt
+++ b/Documentation/config/fetch.txt
@@ -1,11 +1,14 @@
 fetch.recurseSubmodules::
-	This option can be either set to a boolean value or to 'on-demand'.
+	This option controls whether `git fetch` (and the underlying fetch
+	in `git pull`) will recursively fetch into populated submodules.
+	This option can be set either to a boolean value or to 'on-demand'.
 	Setting it to a boolean changes the behavior of fetch and pull to
-	unconditionally recurse into submodules when set to true or to not
-	recurse at all when set to false. When set to 'on-demand' (the default
-	value), fetch and pull will only recurse into a populated submodule
-	when its superproject retrieves a commit that updates the submodule's
+	recurse unconditionally into submodules when set to true or to not
+	recurse at all when set to false. When set to 'on-demand', fetch and
+	pull will only recurse into a populated submodule when its
+	superproject retrieves a commit that updates the submodule's
 	reference.
+	Defaults to 'on-demand', or to the value of 'submodule.recurse' if set.
 
 fetch.fsckObjects::
 	If it is set to true, git-fetch-pack will check all fetched
@@ -57,13 +60,17 @@ fetch.negotiationAlgorithm::
 	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; The default is "default" which instructs Git to use the default algorithm
+	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.
 +
-See also the `--negotiation-tip` option for linkgit:git-fetch[1].
+See also the `--negotiate-only` and `--negotiation-tip` options to
+linkgit:git-fetch[1].
 
 fetch.showForcedUpdates::
 	Set to false to enable `--no-show-forced-updates` in
@@ -87,5 +94,4 @@ fetch.writeCommitGraph::
 	the existing commit-graph file(s). Occasionally, these files will
 	merge and the write may take longer. Having an updated commit-graph
 	file helps performance of many Git commands, including `git merge-base`,
-	`git push -f`, and `git log --graph`. Defaults to false, unless
-	`feature.experimental` is true.
+	`git push -f`, and `git log --graph`. Defaults to false.
diff --git a/Documentation/config/fmt-merge-msg.txt b/Documentation/config/fmt-merge-msg.txt
index c73cfa90b7..3fbf40e24f 100644
--- a/Documentation/config/fmt-merge-msg.txt
+++ b/Documentation/config/fmt-merge-msg.txt
@@ -8,3 +8,15 @@ merge.log::
 	most the specified number of one-line descriptions from the
 	actual commits that are being merged.  Defaults to false, and
 	true is a synonym for 20.
+
+merge.suppressDest::
+	By adding a glob that matches the names of integration
+	branches to this multi-valued configuration variable, the
+	default merge message computed for merges into these
+	integration branches will omit "into <branch name>" from
+	its title.
++
+An element with an empty value can be used to clear the list
+of globs accumulated from previous configuration entries.
+When there is no `merge.suppressDest` variable defined, the
+default value of `master` is used for backward compatibility.
diff --git a/Documentation/config/format.txt b/Documentation/config/format.txt
index 40cad9278f..fdbc06a4d2 100644
--- a/Documentation/config/format.txt
+++ b/Documentation/config/format.txt
@@ -36,6 +36,12 @@ format.subjectPrefix::
 	The default for format-patch is to output files with the '[PATCH]'
 	subject prefix. Use this variable to change that prefix.
 
+format.coverFromDescription::
+	The default mode for format-patch to determine which parts of
+	the cover letter will be populated using the branch's
+	description. See the `--cover-from-description` option in
+	linkgit:git-format-patch[1].
+
 format.signature::
 	The default for format-patch is to output a signature containing
 	the Git version number. Use this variable to change that default.
@@ -51,6 +57,11 @@ format.suffix::
 	`.patch`. Use this variable to change that suffix (make sure to
 	include the dot if you want it).
 
+format.encodeEmailHeaders::
+	Encode email headers that have non-ASCII characters with
+	"Q-encoding" (described in RFC 2047) for email transmission.
+	Defaults to true.
+
 format.pretty::
 	The default pretty format for log/show/whatchanged command,
 	See linkgit:git-log[1], linkgit:git-show[1],
@@ -68,7 +79,7 @@ format.thread::
 
 format.signOff::
 	A boolean value which lets you enable the `-s/--signoff` option of
-	format-patch by default. *Note:* Adding the Signed-off-by: line to a
+	format-patch by default. *Note:* Adding the `Signed-off-by` trailer to a
 	patch should be a conscious act and means that you certify you have
 	the rights to submit this work under the same open source license.
 	Please see the 'SubmittingPatches' document for further discussion.
@@ -83,9 +94,16 @@ format.outputDirectory::
 	Set a custom directory to store the resulting files instead of the
 	current working directory. All directory components will be created.
 
+format.filenameMaxLength::
+	The maximum length of the output filenames generated by the
+	`format-patch` command; defaults to 64.  Can be overridden
+	by the `--filename-max-length=<n>` command line option.
+
 format.useAutoBase::
 	A boolean value which lets you enable the `--base=auto` option of
-	format-patch by default.
+	format-patch by default. Can also be set to "whenAble" to allow
+	enabling `--base=auto` if a suitable base is available, but to skip
+	adding base info otherwise without the format dying.
 
 format.notes::
 	Provides the default value for the `--notes` option to
@@ -100,4 +118,20 @@ If one wishes to use the ref `ref/notes/true`, please use that literal
 instead.
 +
 This configuration can be specified multiple times in order to allow
-multiple notes refs to be included.
+multiple notes refs to be included. In that case, it will behave
+similarly to multiple `--[no-]notes[=]` options passed in. That is, a
+value of `true` will show the default notes, a value of `<ref>` will
+also show notes from that notes ref and a value of `false` will negate
+previous configurations and not show notes.
++
+For example,
++
+------------
+[format]
+	notes = true
+	notes = foo
+	notes = false
+	notes = bar
+------------
++
+will only show notes from `refs/notes/bar`.
diff --git a/Documentation/config/gc.txt b/Documentation/config/gc.txt
index 00ea0a678e..c834e07991 100644
--- a/Documentation/config/gc.txt
+++ b/Documentation/config/gc.txt
@@ -44,9 +44,9 @@ gc.autoDetach::
 
 gc.bigPackThreshold::
 	If non-zero, all packs larger than this limit are kept when
-	`git gc` is run. This is very similar to `--keep-base-pack`
+	`git gc` is run. This is very similar to `--keep-largest-pack`
 	except that all packs that meet the threshold are kept, not
-	just the base pack. Defaults to zero. Common unit suffixes of
+	just the largest pack. Defaults to zero. Common unit suffixes of
 	'k', 'm', or 'g' are supported.
 +
 Note that if the number of kept packs is more than gc.autoPackLimit,
@@ -57,7 +57,7 @@ gc.autoPackLimit and gc.bigPackThreshold should be respected again.
 If the amount of memory estimated for `git repack` to run smoothly is
 not available and `gc.bigPackThreshold` is not set, the largest pack
 will also be excluded (this is the equivalent of running `git gc` with
-`--keep-base-pack`).
+`--keep-largest-pack`).
 
 gc.writeCommitGraph::
 	If true, then gc will rewrite the commit-graph file when
diff --git a/Documentation/config/gpg.txt b/Documentation/config/gpg.txt
index cce2c89245..d94025cb36 100644
--- a/Documentation/config/gpg.txt
+++ b/Documentation/config/gpg.txt
@@ -18,3 +18,18 @@ gpg.<format>.program::
 	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".
+
+gpg.minTrustLevel::
+	Specifies a minimum trust level for signature verification.  If
+	this option is unset, then signature verification for merge
+	operations require a key with at least `marginal` trust.  Other
+	operations that perform signature verification require a key
+	with at least `undefined` trust.  Setting this option overrides
+	the required trust-level for all operations.  Supported values,
+	in increasing order of significance:
++
+* `undefined`
+* `never`
+* `marginal`
+* `fully`
+* `ultimate`
diff --git a/Documentation/config/help.txt b/Documentation/config/help.txt
index 224bbf5a28..783a90a0f9 100644
--- a/Documentation/config/help.txt
+++ b/Documentation/config/help.txt
@@ -8,13 +8,14 @@ help.format::
 	the default. 'web' and 'html' are the same.
 
 help.autoCorrect::
-	Automatically correct and execute mistyped commands after
-	waiting for the given number of deciseconds (0.1 sec). If more
-	than one command can be deduced from the entered text, nothing
-	will be executed.  If the value of this option is negative,
-	the corrected command will be executed immediately. If the
-	value is 0 - the command will be just shown but not executed.
-	This is the default.
+	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.
 
 help.htmlPath::
 	Specify the path where the HTML documentation resides. File system paths
diff --git a/Documentation/config/http.txt b/Documentation/config/http.txt
index 5a32f5b0a5..7003661c0d 100644
--- a/Documentation/config/http.txt
+++ b/Documentation/config/http.txt
@@ -29,6 +29,27 @@ http.proxyAuthMethod::
 * `ntlm` - NTLM authentication (compare the --ntlm option of `curl(1)`)
 --
 
+http.proxySSLCert::
+	The pathname of a file that stores a client certificate to use to authenticate
+	with an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_CERT` environment
+	variable.
+
+http.proxySSLKey::
+	The pathname of a file that stores a private key to use to authenticate with
+	an HTTPS proxy. Can be overridden by the `GIT_PROXY_SSL_KEY` environment
+	variable.
+
+http.proxySSLCertPasswordProtected::
+	Enable Git's password prompt for the proxy SSL certificate.  Otherwise OpenSSL
+	will prompt the user, possibly many times, if the certificate or private key
+	is encrypted. Can be overridden by the `GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED`
+	environment variable.
+
+http.proxySSLCAInfo::
+	Pathname to the file containing the certificate bundle that should be used to
+	verify the proxy with when using an HTTPS proxy. Can be overridden by the
+	`GIT_PROXY_SSL_CAINFO` environment variable.
+
 http.emptyAuth::
 	Attempt authentication without seeking a username or password.  This
 	can be used to attempt GSS-Negotiate authentication without specifying
@@ -71,7 +92,7 @@ http.saveCookies::
 http.version::
 	Use the specified HTTP protocol version when communicating with a server.
 	If you want to force the default. The available and default version depend
-	on libcurl. Actually the possible values of
+	on libcurl. Currently the possible values of
 	this option are:
 
 	- HTTP/2
@@ -84,7 +105,7 @@ http.sslVersion::
 	particular configuration of the crypto library in use. Internally
 	this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl
 	documentation for more details on the format of this option and
-	for the ssl version supported. Actually the possible values of
+	for the ssl version supported. Currently the possible values of
 	this option are:
 
 	- sslv2
@@ -199,6 +220,14 @@ http.postBuffer::
 	Transfer-Encoding: chunked is used to avoid creating a
 	massive pack file locally.  Default is 1 MiB, which is
 	sufficient for most requests.
++
+Note that raising this limit is only effective for disabling chunked
+transfer encoding and therefore should be used only where the remote
+server or a proxy only supports HTTP/1.0 or is noncompliant with the
+HTTP standard.  Raising this is not, in general, an effective solution
+for most push problems, but can increase memory consumption
+significantly since the entire buffer is allocated even for small
+pushes.
 
 http.lowSpeedLimit, http.lowSpeedTime::
 	If the HTTP transfer speed is less than 'http.lowSpeedLimit'
diff --git a/Documentation/config/index.txt b/Documentation/config/index.txt
index 7cb50b37e9..75f3a2d105 100644
--- a/Documentation/config/index.txt
+++ b/Documentation/config/index.txt
@@ -14,6 +14,11 @@ index.recordOffsetTable::
 	Defaults to 'true' if index.threads has been explicitly enabled,
 	'false' otherwise.
 
+index.sparse::
+	When enabled, write the index using sparse-directory entries. This
+	has no effect unless `core.sparseCheckout` and
+	`core.sparseCheckoutCone` are both enabled. Defaults to 'false'.
+
 index.threads::
 	Specifies the number of threads to spawn when loading the index.
 	This is meant to reduce index load time on multiprocessor machines.
diff --git a/Documentation/config/init.txt b/Documentation/config/init.txt
index 46fa8c6a08..79c79d6617 100644
--- a/Documentation/config/init.txt
+++ b/Documentation/config/init.txt
@@ -1,3 +1,7 @@
 init.templateDir::
 	Specify the directory from which templates will be copied.
 	(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
+
+init.defaultBranch::
+	Allows overriding the default branch name e.g. when initializing
+	a new repository.
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index e9e1e397f3..456eb07800 100644
--- a/Documentation/config/log.txt
+++ b/Documentation/config/log.txt
@@ -18,6 +18,17 @@ log.decorate::
 	names are shown. This is the same as the `--decorate` option
 	of the `git log`.
 
+log.excludeDecoration::
+	Exclude the specified patterns from the log decorations. This is
+	similar to the `--decorate-refs-exclude` command-line option, but
+	the config option can be overridden by the `--decorate-refs`
+	option.
+
+log.diffMerges::
+	Set default diff format to be used for merge commits. See
+	`--diff-merges` in linkgit:git-log[1] for details.
+	Defaults to `separate`.
+
 log.follow::
 	If `true`, `git log` will act as if the `--follow` option was used when
 	a single <path> is given.  This has the same limitations as `--follow`,
diff --git a/Documentation/config/lsrefs.txt b/Documentation/config/lsrefs.txt
new file mode 100644
index 0000000000..adeda0f24d
--- /dev/null
+++ b/Documentation/config/lsrefs.txt
@@ -0,0 +1,9 @@
+lsrefs.unborn::
+	May be "advertise" (the default), "allow", or "ignore". If "advertise",
+	the server will respond to the client sending "unborn" (as described in
+	protocol-v2.txt) and will advertise support for this feature during the
+	protocol v2 capability advertisement. "allow" is the same as
+	"advertise" except that the server will not advertise support for this
+	feature; this is useful for load-balanced servers that cannot be
+	updated atomically (for example), since the administrator could
+	configure "allow", then after a delay, configure "advertise".
diff --git a/Documentation/config/maintenance.txt b/Documentation/config/maintenance.txt
new file mode 100644
index 0000000000..18f0562131
--- /dev/null
+++ b/Documentation/config/maintenance.txt
@@ -0,0 +1,60 @@
+maintenance.auto::
+	This boolean config option controls whether some commands run
+	`git maintenance run --auto` after doing their normal work. Defaults
+	to true.
+
+maintenance.strategy::
+	This string config option provides a way to specify one of a few
+	recommended schedules for background maintenance. This only affects
+	which tasks are run during `git maintenance run --schedule=X`
+	commands, provided no `--task=<task>` arguments are provided.
+	Further, if a `maintenance.<task>.schedule` config value is set,
+	then that value is used instead of the one provided by
+	`maintenance.strategy`. The possible strategy strings are:
++
+* `none`: This default setting implies no task are run at any schedule.
+* `incremental`: This setting optimizes for performing small maintenance
+  activities that do not delete any data. This does not schedule the `gc`
+  task, but runs the `prefetch` and `commit-graph` tasks hourly, the
+  `loose-objects` and `incremental-repack` tasks daily, and the `pack-refs`
+  task weekly.
+
+maintenance.<task>.enabled::
+	This boolean config option controls whether the maintenance task
+	with name `<task>` is run when no `--task` option is specified to
+	`git maintenance run`. These config values are ignored if a
+	`--task` option exists. By default, only `maintenance.gc.enabled`
+	is true.
+
+maintenance.<task>.schedule::
+	This config option controls whether or not the given `<task>` runs
+	during a `git maintenance run --schedule=<frequency>` command. The
+	value must be one of "hourly", "daily", or "weekly".
+
+maintenance.commit-graph.auto::
+	This integer config option controls how often the `commit-graph` task
+	should be run as part of `git maintenance run --auto`. If zero, then
+	the `commit-graph` task will not run with the `--auto` option. A
+	negative value will force the task to run every time. Otherwise, a
+	positive value implies the command should run when the number of
+	reachable commits that are not in the commit-graph file is at least
+	the value of `maintenance.commit-graph.auto`. The default value is
+	100.
+
+maintenance.loose-objects.auto::
+	This integer config option controls how often the `loose-objects` task
+	should be run as part of `git maintenance run --auto`. If zero, then
+	the `loose-objects` task will not run with the `--auto` option. A
+	negative value will force the task to run every time. Otherwise, a
+	positive value implies the command should run when the number of
+	loose objects is at least the value of `maintenance.loose-objects.auto`.
+	The default value is 100.
+
+maintenance.incremental-repack.auto::
+	This integer config option controls how often the `incremental-repack`
+	task should be run as part of `git maintenance run --auto`. If zero,
+	then the `incremental-repack` task will not run with the `--auto`
+	option. A negative value will force the task to run every time.
+	Otherwise, a positive value implies the command should run when the
+	number of pack-files not in the multi-pack-index is at least the value
+	of `maintenance.incremental-repack.auto`. The default value is 10.
diff --git a/Documentation/config/merge.txt b/Documentation/config/merge.txt
index 6a313937f8..e27cc63944 100644
--- a/Documentation/config/merge.txt
+++ b/Documentation/config/merge.txt
@@ -14,7 +14,7 @@ merge.defaultToUpstream::
 	branches at the remote named by `branch.<current branch>.remote`
 	are consulted, and then they are mapped via `remote.<remote>.fetch`
 	to their corresponding remote-tracking branches, and the tips of
-	these tracking branches are merged.
+	these tracking branches are merged. Defaults to true.
 
 merge.ff::
 	By default, Git does not create an extra merge commit when merging
@@ -33,10 +33,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
@@ -70,6 +72,16 @@ merge.stat::
 	Whether to print the diffstat between ORIG_HEAD and the merge result
 	at the end of the merge.  True by default.
 
+merge.autoStash::
+	When set to true, automatically create a temporary stash entry
+	before the operation begins, and apply it after the operation
+	ends.  This means that you can run merge on a dirty worktree.
+	However, use with care: the final stash application after a
+	successful merge might result in non-trivial conflicts.
+	This option can be overridden by the `--no-autostash` and
+	`--autostash` options of linkgit:git-merge[1].
+	Defaults to false.
+
 merge.tool::
 	Controls which merge tool is used by linkgit:git-mergetool[1].
 	The list below shows the valid built-in values.
diff --git a/Documentation/config/mergetool.txt b/Documentation/config/mergetool.txt
index 09ed31dbfa..cafbbef46a 100644
--- a/Documentation/config/mergetool.txt
+++ b/Documentation/config/mergetool.txt
@@ -13,6 +13,11 @@ mergetool.<tool>.cmd::
 	merged; 'MERGED' contains the name of the file to which the merge
 	tool should write the results of a successful merge.
 
+mergetool.<tool>.hideResolved::
+	Allows the user to override the global `mergetool.hideResolved` value
+	for a specific tool. See `mergetool.hideResolved` for the full
+	description.
+
 mergetool.<tool>.trustExitCode::
 	For a custom merge command, specify whether the exit code of
 	the merge command can be used to determine whether the merge was
@@ -30,6 +35,26 @@ mergetool.meld.hasOutput::
 	to `true` tells Git to unconditionally use the `--output` option,
 	and `false` avoids using `--output`.
 
+mergetool.meld.useAutoMerge::
+	When the `--auto-merge` is given, meld will merge all non-conflicting
+	parts automatically, highlight the conflicting parts and wait for
+	user decision.  Setting `mergetool.meld.useAutoMerge` to `true` tells
+	Git to unconditionally use the `--auto-merge` option with `meld`.
+	Setting this value to `auto` makes git detect whether `--auto-merge`
+	is supported and will only use `--auto-merge` when available.  A
+	value of `false` avoids using `--auto-merge` altogether, and is the
+	default value.
+
+mergetool.hideResolved::
+	During a merge Git will automatically resolve as many conflicts as
+	possible and write the 'MERGED' file containing conflict markers around
+	any conflicts that it cannot resolve; 'LOCAL' and 'REMOTE' normally
+	represent the versions of the file from before Git's conflict
+	resolution. This flag causes 'LOCAL' and 'REMOTE' to be overwriten so
+	that only the unresolved conflicts are presented to the merge tool. Can
+	be configured per-tool via the `mergetool.<tool>.hideResolved`
+	configuration variable. Defaults to `false`.
+
 mergetool.keepBackup::
 	After performing a merge, the original file with conflict markers
 	can be saved as a file with a `.orig` extension.  If this variable
diff --git a/Documentation/config/pack.txt b/Documentation/config/pack.txt
index 1d66f0c992..763f7af7c4 100644
--- a/Documentation/config/pack.txt
+++ b/Documentation/config/pack.txt
@@ -27,6 +27,13 @@ Note that changing the compression level will not automatically recompress
 all existing objects. You can force recompression by passing the -F option
 to linkgit:git-repack[1].
 
+pack.allowPackReuse::
+	When true, and when reachability bitmaps are enabled,
+	pack-objects will try to send parts of the bitmapped packfile
+	verbatim. This can reduce memory and CPU usage to serve fetches,
+	but might result in sending a slightly larger pack. Defaults to
+	true.
+
 pack.island::
 	An extended regular expression configuring a set of delta
 	islands. See "DELTA ISLANDS" in linkgit:git-pack-objects[1]
@@ -92,12 +99,23 @@ pack.packSizeLimit::
 	packing to a file when repacking, i.e. the git:// protocol
 	is unaffected.  It can be overridden by the `--max-pack-size`
 	option of linkgit:git-repack[1].  Reaching this limit results
-	in the creation of multiple packfiles; which in turn prevents
-	bitmaps from being created.
-	The minimum size allowed is limited to 1 MiB.
-	The default is unlimited.
-	Common unit suffixes of 'k', 'm', or 'g' are
-	supported.
+	in the creation of multiple packfiles.
++
+Note that this option is rarely useful, and may result in a larger total
+on-disk size (because Git will not store deltas between packs), as well
+as worse runtime performance (object lookup within multiple packs is
+slower than a single pack, and optimizations like reachability bitmaps
+cannot cope with multiple packs).
++
+If you need to actively run Git using smaller packfiles (e.g., because your
+filesystem does not support large files), this option may help. But if
+your goal is to transmit a packfile over a medium that supports limited
+sizes (e.g., removable media that cannot store the whole repository),
+you are likely better off creating a single large packfile and splitting
+it using a generic multi-volume archive tool (e.g., Unix `split`).
++
+The minimum size allowed is limited to 1 MiB. The default is unlimited.
+Common unit suffixes of 'k', 'm', or 'g' are supported.
 
 pack.useBitmaps::
 	When true, git will use pack bitmaps (if available) when packing
@@ -112,8 +130,23 @@ pack.useSparse::
 	objects. This can have significant performance benefits when
 	computing a pack to send a small change. However, it is possible
 	that extra objects are added to the pack-file if the included
-	commits contain certain types of direct renames. Default is `false`
-	unless `feature.experimental` is enabled.
+	commits contain certain types of direct renames. Default is
+	`true`.
+
+pack.preferBitmapTips::
+	When selecting which commits will receive bitmaps, prefer a
+	commit at the tip of any reference that is a suffix of any value
+	of this configuration over any other commits in the "selection
+	window".
++
+Note that setting this configuration to `refs/foo` does not mean that
+the commits at the tips of `refs/foo/bar` and `refs/foo/baz` will
+necessarily be selected. This is because commits are selected for
+bitmaps from within a series of windows of variable length.
++
+If a commit at the tip of any reference which is a suffix of any value
+of this configuration is seen in a window, it is immediately given
+preference over any other commit in that window.
 
 pack.writeBitmaps (deprecated)::
 	This is a deprecated synonym for `repack.writeBitmaps`.
@@ -126,3 +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.
+
+pack.writeReverseIndex::
+	When true, git will write a corresponding .rev file (see:
+	link:../technical/pack-format.html[Documentation/technical/pack-format.txt])
+	for each new packfile that it writes in all places except for
+	linkgit:git-fast-import[1] and in the bulk checkin mechanism.
+	Defaults to false.
diff --git a/Documentation/config/protocol.txt b/Documentation/config/protocol.txt
index bfccc07491..756591d77b 100644
--- a/Documentation/config/protocol.txt
+++ b/Documentation/config/protocol.txt
@@ -45,11 +45,10 @@ The protocol names currently used by git are:
 --
 
 protocol.version::
-	Experimental. If set, clients will attempt to communicate with a
-	server using the specified protocol version.  If unset, no
-	attempt will be made by the client to communicate using a
-	particular protocol version, this results in protocol version 0
-	being used.
+	If set, clients will attempt to communicate with a server
+	using the specified protocol version.  If the server does
+	not support it, communication falls back to version 0.
+	If unset, the default is `2`.
 	Supported versions:
 +
 --
diff --git a/Documentation/config/pull.txt b/Documentation/config/pull.txt
index b87cab31b3..5404830609 100644
--- a/Documentation/config/pull.txt
+++ b/Documentation/config/pull.txt
@@ -14,15 +14,16 @@ pull.rebase::
 	pull" is run. See "branch.<name>.rebase" for setting this on a
 	per-branch basis.
 +
-When `merges`, pass the `--rebase-merges` option to 'git rebase'
+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` (deprecated in favor of `merges`), also pass
+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`, the rebase is run in interactive mode.
+When the value is `interactive` (or just 'i'), the rebase is run in interactive
+mode.
 +
 *NOTE*: this is a possibly dangerous operation; do *not* use
 it unless you understand the implications (see linkgit:git-rebase[1]
diff --git a/Documentation/config/push.txt b/Documentation/config/push.txt
index 0a0e000569..632033638c 100644
--- a/Documentation/config/push.txt
+++ b/Documentation/config/push.txt
@@ -1,6 +1,7 @@
 push.default::
 	Defines the action `git push` should take if no refspec is
-	explicitly given.  Different values are well-suited for
+	given (whether from the command-line, config, or elsewhere).
+	Different values are well-suited for
 	specific workflows; for instance, in a purely central workflow
 	(i.e. the fetch source is equal to the push destination),
 	`upstream` is probably what you want.  Possible values are:
@@ -8,7 +9,7 @@ push.default::
 --
 
 * `nothing` - do not push anything (error out) unless a refspec is
-  explicitly given. This is primarily meant for people who want to
+  given. This is primarily meant for people who want to
   avoid mistakes by always being explicit.
 
 * `current` - push the current branch to update a branch with the same
@@ -23,15 +24,14 @@ push.default::
 
 * `tracking` - This is a deprecated synonym for `upstream`.
 
-* `simple` - in centralized workflow, work like `upstream` with an
-  added safety to refuse to push if the upstream branch's name is
-  different from the local one.
+* `simple` - pushes the current branch with the same name on the remote.
 +
-When pushing to a remote that is different from the remote you normally
-pull from, work as `current`.  This is the safest option and is suited
-for beginners.
+If you are working on a centralized workflow (pushing to the same repository you
+pull from, which is typically `origin`), then you need to configure an upstream
+branch with the same name.
 +
-This mode has become the default in Git 2.0.
+This mode is the default since Git 2.0, and is the safest option suited for
+beginners.
 
 * `matching` - push all branches having the same name on both ends.
   This makes the repository you are pushing to remember the set of
@@ -79,7 +79,7 @@ higher priority configuration file (e.g. `.git/config` in a
 repository) to clear the values inherited from a lower priority
 configuration files (e.g. `$HOME/.gitconfig`).
 +
---
+----
 
 Example:
 
@@ -96,7 +96,7 @@ repo/.git/config
 
 This will result in only b (a and c are cleared).
 
---
+----
 
 push.recurseSubmodules::
 	Make sure all submodule commits used by the revisions to be pushed
@@ -111,3 +111,18 @@ push.recurseSubmodules::
 	is 'no' then default behavior of ignoring submodules when pushing
 	is retained. You may override this configuration at time of push by
 	specifying '--recurse-submodules=check|on-demand|no'.
+	If not set, 'no' is used by default, unless 'submodule.recurse' is
+	set (in which case a 'true' value means 'on-demand').
+
+push.useForceIfIncludes::
+	If set to "true", it is equivalent to specifying
+	`--force-if-includes` as an option to linkgit:git-push[1]
+	in the command line. Adding `--no-force-if-includes` at the
+	time of push overrides this configuration setting.
+
+push.negotiate::
+	If set to "true", attempt to reduce the size of the packfile
+	sent by rounds of negotiation in which the client and the
+	server attempt to find commits in common. If "false", Git will
+	rely solely on the server's ref advertisement to find commits
+	in common.
diff --git a/Documentation/config/rebase.txt b/Documentation/config/rebase.txt
index d98e32d812..8c979cb20f 100644
--- a/Documentation/config/rebase.txt
+++ b/Documentation/config/rebase.txt
@@ -1,9 +1,8 @@
-rebase.useBuiltin::
-	Unused configuration variable. Used in Git versions 2.20 and
-	2.21 as an escape hatch to enable the legacy shellscript
-	implementation of rebase. 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.
+rebase.backend::
+	Default backend to use for rebasing.  Possible choices are
+	'apply' or 'merge'.  In the future, if the merge backend gains
+	all remaining capabilities of the apply backend, this setting
+	may become unused.
 
 rebase.stat::
 	Whether to show a diffstat of what changed upstream since the last
@@ -62,3 +61,6 @@ rebase.rescheduleFailedExec::
 	Automatically reschedule `exec` commands that failed. This only makes
 	sense in interactive mode (or when an `--exec` option was provided).
 	This is the same as specifying the `--reschedule-failed-exec` option.
+
+rebase.forkPoint::
+	If set to false set `--no-fork-point` option by default.
diff --git a/Documentation/config/receive.txt b/Documentation/config/receive.txt
index 65f78aac37..85d5b5a3d2 100644
--- a/Documentation/config/receive.txt
+++ b/Documentation/config/receive.txt
@@ -114,6 +114,28 @@ receive.hideRefs::
 	An attempt to update or delete a hidden ref by `git push` is
 	rejected.
 
+receive.procReceiveRefs::
+	This is a multi-valued variable that defines reference prefixes
+	to match the commands in `receive-pack`.  Commands matching the
+	prefixes will be executed by an external hook "proc-receive",
+	instead of the internal `execute_commands` function.  If this
+	variable is not defined, the "proc-receive" hook will never be
+	used, and all commands will be executed by the internal
+	`execute_commands` function.
++
+For example, if this variable is set to "refs/for", pushing to reference
+such as "refs/for/master" will not create or update a reference named
+"refs/for/master", but may create or update a pull request directly by
+running the hook "proc-receive".
++
+Optional modifiers can be provided in the beginning of the value to filter
+commands for specific actions: create (a), modify (m), delete (d).
+A `!` can be included in the modifiers to negate the reference prefix entry.
+E.g.:
++
+	git config --system --add receive.procReceiveRefs ad:refs/heads
+	git config --system --add receive.procReceiveRefs !:refs/heads
+
 receive.updateServerInfo::
 	If set to true, git-receive-pack will run git-update-server-info
 	after receiving data from git-push and updating refs.
diff --git a/Documentation/config/sendemail.txt b/Documentation/config/sendemail.txt
index 0006faf800..50baa5d6bf 100644
--- a/Documentation/config/sendemail.txt
+++ b/Documentation/config/sendemail.txt
@@ -8,9 +8,6 @@ sendemail.smtpEncryption::
 	See linkgit:git-send-email[1] for description.  Note that this
 	setting is not subject to the 'identity' mechanism.
 
-sendemail.smtpssl (deprecated)::
-	Deprecated alias for 'sendemail.smtpEncryption = ssl'.
-
 sendemail.smtpsslcertpath::
 	Path to ca-certificates (either a directory or a single file).
 	Set it to an empty string to disable certificate verification.
@@ -61,3 +58,8 @@ sendemail.smtpBatchSize::
 sendemail.smtpReloginDelay::
 	Seconds wait before reconnecting to smtp server.
 	See also the `--relogin-delay` option of linkgit:git-send-email[1].
+
+sendemail.forbidSendmailVariables::
+	To avoid common misconfiguration mistakes, linkgit:git-send-email[1]
+	will abort with a warning if any configuration options for "sendmail"
+	exist. Set this variable to bypass the check.
diff --git a/Documentation/config/stash.txt b/Documentation/config/stash.txt
index abc7ef4a3a..9ed775281f 100644
--- a/Documentation/config/stash.txt
+++ b/Documentation/config/stash.txt
@@ -1,17 +1,14 @@
 stash.useBuiltin::
-       Set to `false` to use the legacy shell script implementation of
-       linkgit:git-stash[1]. Is `true` by default, which means use
-       the built-in rewrite of it in C.
-+
-The C rewrite is first included with Git version 2.22 (and Git for Windows
-version 2.19). This option serves as an escape hatch to re-enable the
-legacy version in case any bugs are found in the rewrite. This option and
-the shell script version of linkgit:git-stash[1] will be removed in some
-future release.
-+
-If you find some reason to set this option to `false`, other than
-one-off testing, you should report the behavior difference as a bug in
-Git (see https://git-scm.com/community for details).
+	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
+	description of 'show' command in linkgit:git-stash[1].
 
 stash.showPatch::
 	If this is set to true, the `git stash show` command without an
diff --git a/Documentation/config/submodule.txt b/Documentation/config/submodule.txt
index 0a1293b051..ee454f8126 100644
--- a/Documentation/config/submodule.txt
+++ b/Documentation/config/submodule.txt
@@ -58,10 +58,19 @@ 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,
-	except `clone`.
+	A boolean indicating if commands should enable the `--recurse-submodules`
+	option by default.
+	Applies to all commands that support this option
+	(`checkout`, `fetch`, `grep`, `pull`, `push`, `read-tree`, `reset`,
+	`restore` and `switch`) except `clone` and `ls-files`.
 	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.
@@ -79,4 +88,6 @@ submodule.alternateLocation::
 submodule.alternateErrorStrategy::
 	Specifies how to treat errors with the alternates for a submodule
 	as computed via `submodule.alternateLocation`. Possible values are
-	`ignore`, `info`, `die`. Default is `die`.
+	`ignore`, `info`, `die`. Default is `die`. Note that if set to `ignore`
+	or `info`, and if there is an error with the computed alternate, the
+	clone proceeds as if no alternate was specified.
diff --git a/Documentation/config/tag.txt b/Documentation/config/tag.txt
index ef5adb3f42..5062a057ff 100644
--- a/Documentation/config/tag.txt
+++ b/Documentation/config/tag.txt
@@ -13,12 +13,5 @@ tag.gpgSign::
 	Use of this option when running in an automated script can
 	result in a large number of tags being signed. It is therefore
 	convenient to use an agent to avoid typing your gpg passphrase
-	several times. Note that this option doesn't affects tag signing
+	several times. Note that this option doesn't affect tag signing
 	behavior enabled by "-u <keyid>" or "--local-user=<keyid>" options.
-
-tar.umask::
-	This variable can be used to restrict the permission bits of
-	tar archive entries.  The default is 0002, which turns off the
-	world write bit.  The special value "user" indicates that the
-	archiving user's umask will be used instead.  See umask(2) and
-	linkgit:git-archive[1].
diff --git a/Documentation/config/tar.txt b/Documentation/config/tar.txt
new file mode 100644
index 0000000000..de8ff48ea9
--- /dev/null
+++ b/Documentation/config/tar.txt
@@ -0,0 +1,6 @@
+tar.umask::
+	This variable can be used to restrict the permission bits of
+	tar archive entries.  The default is 0002, which turns off the
+	world write bit.  The special value "user" indicates that the
+	archiving user's umask will be used instead.  See umask(2) and
+	linkgit:git-archive[1].
diff --git a/Documentation/config/trace2.txt b/Documentation/config/trace2.txt
index 4ce0b9a6d1..fe1642f0d4 100644
--- a/Documentation/config/trace2.txt
+++ b/Documentation/config/trace2.txt
@@ -48,6 +48,15 @@ trace2.configParams::
 	May be overridden by the `GIT_TRACE2_CONFIG_PARAMS` environment
 	variable.  Unset by default.
 
+trace2.envVars::
+	A comma-separated list of "important" environment variables that should
+	be recorded in the trace2 output.  For example,
+	`GIT_HTTP_USER_AGENT,GIT_CONFIG` would cause the trace2 output to
+	contain events listing the overrides for HTTP user agent and the
+	location of the Git configuration file (assuming any are set).  May be
+	overridden by the `GIT_TRACE2_ENV_VARS` environment variable.  Unset by
+	default.
+
 trace2.destinationDebug::
 	Boolean.  When true Git will print error messages when a
 	trace target destination cannot be opened for writing.
diff --git a/Documentation/config/transfer.txt b/Documentation/config/transfer.txt
index f5b6245270..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
@@ -69,3 +73,7 @@ transfer.unpackLimit::
 	When `fetch.unpackLimit` or `receive.unpackLimit` are
 	not set, the value of this variable is used instead.
 	The default value is 100.
+
+transfer.advertiseSID::
+	Boolean. When true, client and server processes will advertise their
+	unique session IDs to their remote counterpart. Defaults to false.
diff --git a/Documentation/config/uploadpack.txt b/Documentation/config/uploadpack.txt
index ed1c835695..32fad5bbe8 100644
--- a/Documentation/config/uploadpack.txt
+++ b/Documentation/config/uploadpack.txt
@@ -57,6 +57,25 @@ uploadpack.allowFilter::
 	If this option is set, `upload-pack` will support partial
 	clone and partial fetch object filtering.
 
+uploadpackfilter.allow::
+	Provides a default value for unspecified object filters (see: the
+	below configuration variable). If set to `true`, this will also
+	enable all filters which get added in the future.
+	Defaults to `true`.
+
+uploadpackfilter.<filter>.allow::
+	Explicitly allow or ban the object filter corresponding to
+	`<filter>`, where `<filter>` may be one of: `blob:none`,
+	`blob:limit`, `object:type`, `tree`, `sparse:oid`, or `combine`.
+	If using combined filters, both `combine` and all of the nested
+	filter kinds must be allowed. Defaults to `uploadpackfilter.allow`.
+
+uploadpackfilter.tree.maxDepth::
+	Only allow `--filter=tree:<n>` when `<n>` is no more than the value of
+	`uploadpackfilter.tree.maxDepth`. If set, this also implies
+	`uploadpackfilter.tree.allow=true`, unless this configuration
+	variable had already been set. Has no effect if unset.
+
 uploadpack.allowRefInWant::
 	If this option is set, `upload-pack` will support the `ref-in-want`
 	feature of the protocol version 2 `fetch` command.  This feature
diff --git a/Documentation/config/user.txt b/Documentation/config/user.txt
index 0557cbbceb..59aec7c3ae 100644
--- a/Documentation/config/user.txt
+++ b/Documentation/config/user.txt
@@ -13,7 +13,12 @@ committer.email::
 	Also, all of these can be overridden by the `GIT_AUTHOR_NAME`,
 	`GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_NAME`,
 	`GIT_COMMITTER_EMAIL` and `EMAIL` environment variables.
-	See linkgit:git-commit-tree[1] for more information.
++
+Note that the `name` forms of these variables conventionally refer to
+some form of a personal name.  See linkgit:git-commit[1] and the
+environment variables section of linkgit:git[1] for more information on
+these settings and the `credential.username` option if you're looking
+for authentication credentials instead.
 
 user.useConfigOnly::
 	Instruct Git to avoid trying to guess defaults for `user.email`
diff --git a/Documentation/date-formats.txt b/Documentation/date-formats.txt
index 6926e0a4c8..99c455f51c 100644
--- a/Documentation/date-formats.txt
+++ b/Documentation/date-formats.txt
@@ -1,10 +1,7 @@
 DATE FORMATS
 ------------
 
-The `GIT_AUTHOR_DATE`, `GIT_COMMITTER_DATE` environment variables
-ifdef::git-commit[]
-and the `--date` option
-endif::git-commit[]
+The `GIT_AUTHOR_DATE` and `GIT_COMMITTER_DATE` environment variables
 support the following date formats:
 
 Git internal format::
@@ -20,7 +17,15 @@ RFC 2822::
 ISO 8601::
 	Time and date specified by the ISO 8601 standard, for example
 	`2005-04-07T22:13:13`. The parser accepts a space instead of the
-	`T` character as well.
+	`T` character as well. Fractional parts of a second will be ignored,
+	for example `2005-04-07T22:13:13.019` will be treated as
+	`2005-04-07T22:13:13`.
 +
 NOTE: In addition, the date part is accepted in the following formats:
 `YYYY.MM.DD`, `MM/DD/YYYY` and `DD.MM.YYYY`.
+
+ifdef::git-commit[]
+In addition to recognizing all date formats above, the `--date` option
+will also try to make sense of other, more human-centric date formats,
+such as relative dates like "yesterday" or "last Friday at noon".
+endif::git-commit[]
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
index 4d846d7346..fbbd410a84 100644
--- a/Documentation/diff-format.txt
+++ b/Documentation/diff-format.txt
@@ -61,7 +61,7 @@ Possible status letters are:
 - R: renaming of a file
 - T: change in the type of the file
 - U: file is unmerged (you must complete the merge before it can
-be committed)
+  be committed)
 - X: "unknown" change type (most probably a bug, please report it)
 
 Status letters C and R are always followed by a score (denoting the
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt
index e8ed6470fb..c78063d4f7 100644
--- a/Documentation/diff-generate-patch.txt
+++ b/Documentation/diff-generate-patch.txt
@@ -10,7 +10,8 @@ linkgit:git-diff-tree[1], or
 linkgit:git-diff-files[1]
 with the `-p` option produces patch text.
 You can customize the creation of patch text via the
-`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables.
+`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables
+(see linkgit:git[1]), and the `diff` attribute (see linkgit:gitattributes[5]).
 
 What the -p option produces is slightly different from the traditional
 diff format:
@@ -73,6 +74,11 @@ separate lines indicate the old and the new mode.
       rename from b
       rename to a
 
+5.  Hunk headers mention the name of the function to which the hunk
+    applies.  See "Defining a custom hunk-header" in
+    linkgit:gitattributes[5] for details of how to tailor to this to
+    specific languages.
+
 
 Combined diff format
 --------------------
@@ -80,9 +86,9 @@ Combined diff format
 Any diff-generating command can take the `-c` or `--cc` option to
 produce a 'combined diff' when showing a merge. This is the default
 format when showing merges with linkgit:git-diff[1] or
-linkgit:git-show[1]. Note also that you can give the `-m` option to any
-of these commands to force generation of diffs with individual parents
-of a merge.
+linkgit:git-show[1]. Note also that you can give suitable
+`--diff-merges` option to any of these commands to force generation of
+diffs in specific format.
 
 A "combined diff" format looks like this:
 
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 09faee3b44..c89d530d3d 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -33,12 +33,70 @@ endif::git-diff[]
 	show the patch by default, or to cancel the effect of `--patch`.
 endif::git-format-patch[]
 
+ifdef::git-log[]
+--diff-merges=(off|none|on|first-parent|1|separate|m|combined|c|dense-combined|cc)::
+--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
+	`first-parent` is the default.
++
+--diff-merges=(off|none):::
+--no-diff-merges:::
+	Disable output of diffs for merge commits. Useful to override
+	implied value.
++
+--diff-merges=on:::
+--diff-merges=m:::
+-m:::
+	This option makes diff output for merge commits to be shown in
+	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`.
++
+--diff-merges=first-parent:::
+--diff-merges=1:::
+	This option makes merge commits show the full diff with
+	respect to the first parent only.
++
+--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.
++
+--diff-merges=combined:::
+--diff-merges=c:::
+-c:::
+	With this option, diff output for a merge commit shows the
+	differences from each of the parents to the merge result
+	simultaneously instead of showing pairwise diff between a
+	parent and the result one at a time. Furthermore, it lists
+	only files which were modified from all parents. `-c` implies
+	`-p`.
++
+--diff-merges=dense-combined:::
+--diff-merges=cc:::
+--cc:::
+	With this option the output produced by
+	`--diff-merges=combined` is further compressed by omitting
+	uninteresting hunks whose contents in the parents have only
+	two variants and the merge result picks one of them without
+	modification.  `--cc` implies `-p`.
+
+--combined-all-paths::
+	This flag causes combined diffs (used for merge commits) to
+	list the name of the file from all parents.  It thus only has
+	effect when `--diff-merges=[dense-]combined` is in use, and
+	is likely only useful if filename changes are detected (i.e.
+	when either rename or copy detection have been requested).
+endif::git-log[]
+
 -U<n>::
 --unified=<n>::
 	Generate diffs with <n> lines of context instead of
-	the usual three. Implies `--patch`.
+	the usual three.
 ifndef::git-format-patch[]
-	Implies `-p`.
+	Implies `--patch`.
 endif::git-format-patch[]
 
 --output=<file>::
@@ -73,6 +131,11 @@ ifndef::git-format-patch[]
 	Synonym for `-p --raw`.
 endif::git-format-patch[]
 
+ifdef::git-log[]
+-t::
+	Show the tree objects in the diff output.
+endif::git-log[]
+
 --indent-heuristic::
 	Enable the heuristic that shifts diff hunk boundaries to make patches
 	easier to read. This is the default.
@@ -237,11 +300,14 @@ explained for the configuration variable `core.quotePath` (see
 linkgit:git-config[1]).
 
 --name-only::
-	Show only names of changed files.
+	Show only names of changed files. The file names are often encoded in UTF-8.
+	For more information see the discussion about encoding in the linkgit:git-log[1]
+	manual page.
 
 --name-status::
 	Show only names and status of changed files. See the description
 	of the `--diff-filter` option on what the status letters mean.
+	Just like `--name-only` the file names are often encoded in UTF-8.
 
 --submodule[=<format>]::
 	Specify how differences in submodules are shown.  When specifying
@@ -436,15 +502,20 @@ endif::git-format-patch[]
 
 --binary::
 	In addition to `--full-index`, output a binary diff that
-	can be applied with `git-apply`. Implies `--patch`.
+	can be applied with `git-apply`.
+ifndef::git-format-patch[]
+	Implies `--patch`.
+endif::git-format-patch[]
 
 --abbrev[=<n>]::
 	Instead of showing the full 40-byte hexadecimal object
 	name in diff-raw format output and diff-tree header
-	lines, show only a partial prefix.  This is
-	independent of the `--full-index` option above, which controls
-	the diff-patch output format.  Non default number of
-	digits can be specified with `--abbrev=<n>`.
+	lines, show the shortest prefix that is at least '<n>'
+	hexdigits long that uniquely refers the object.
+	In diff-patch output format, `--full-index` takes higher
+	precedence, i.e. if `--full-index` is specified, full blob
+	names will be shown regardless of `--abbrev`.
+	Non default number of digits can be specified with `--abbrev=<n>`.
 
 -B[<n>][/<m>]::
 --break-rewrites[=[<n>][/<m>]]::
@@ -517,11 +588,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)...[*]]::
@@ -567,13 +644,13 @@ To illustrate the difference between `-S<regex> --pickaxe-regex` and
 file:
 +
 ----
-+    return !regexec(regexp, two->ptr, 1, &regmatch, 0);
++    return frotz(nitfol, two->ptr, 1, 0);
 ...
--    hit = !regexec(regexp, mf2.ptr, 1, &regmatch, 0);
+-    hit = frotz(nitfol, mf2.ptr, 1, 0);
 ----
 +
-While `git log -G"regexec\(regexp"` will show this commit, `git log
--S"regexec\(regexp" --pickaxe-regex` will not (because the number of
+While `git log -G"frotz\(nitfol"` will show this commit, `git log
+-S"frotz\(nitfol" --pickaxe-regex` will not (because the number of
 occurrences of that string did not change).
 +
 Unless `--text` is supplied patches of binary files without a textconv
@@ -639,19 +716,30 @@ matches a pattern if removing any number of the final pathname
 components matches the pattern.  For example, the pattern "`foo*bar`"
 matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`".
 
+--skip-to=<file>::
+--rotate-to=<file>::
+	Discard the files before the named <file> from the output
+	(i.e. 'skip to'), or move them to the end of the output
+	(i.e. 'rotate to').  These were invented primarily for use
+	of the `git difftool` command, and may not be very useful
+	otherwise.
+
 ifndef::git-format-patch[]
 -R::
 	Swap two inputs; that is, show differences from index or
 	on-disk file to tree contents.
+endif::git-format-patch[]
 
 --relative[=<path>]::
+--no-relative::
 	When run from a subdirectory of the project, it can be
 	told to exclude changes outside the directory and show
 	pathnames relative to it with this option.  When you are
 	not in a subdirectory (e.g. in a bare repository), you
 	can name which subdirectory to make the output relative
 	to by giving a <path> as an argument.
-endif::git-format-patch[]
+	`--no-relative` can be used to countermand both `diff.relative` config
+	option and previous `--relative`.
 
 -a::
 --text::
@@ -678,6 +766,11 @@ endif::git-format-patch[]
 --ignore-blank-lines::
 	Ignore changes whose lines are all blank.
 
+-I<regex>::
+--ignore-matching-lines=<regex>::
+	Ignore changes whose all lines match <regex>.  This option may
+	be specified more than once.
+
 --inter-hunk-context=<lines>::
 	Show the context between diff hunks, up to the specified number
 	of lines, thereby fusing hunks that are close to each other.
@@ -686,7 +779,10 @@ endif::git-format-patch[]
 
 -W::
 --function-context::
-	Show whole surrounding functions of changes.
+	Show whole function as context lines for each change.
+	The function names are determined in the same way as
+	`git diff` works out patch hunk headers (see 'Defining a
+	custom hunk-header' in linkgit:gitattributes[5]).
 
 ifndef::git-format-patch[]
 ifndef::git-log[]
diff --git a/Documentation/doc-diff b/Documentation/doc-diff
index 88a9b20168..1694300e50 100755
--- a/Documentation/doc-diff
+++ b/Documentation/doc-diff
@@ -127,7 +127,7 @@ generate_render_makefile () {
 	while read src
 	do
 		dst=$2/${src#$1/}
-		printf 'all:: %s\n' "$dst"
+		printf 'all: %s\n' "$dst"
 		printf '%s: %s\n' "$dst" "$src"
 		printf '\t@echo >&2 "  RENDER $(notdir $@)" && \\\n'
 		printf '\tmkdir -p $(dir $@) && \\\n'
diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt
index 43b9ff3bce..e967ff1874 100644
--- a/Documentation/fetch-options.txt
+++ b/Documentation/fetch-options.txt
@@ -7,6 +7,10 @@
 	existing contents of `.git/FETCH_HEAD`.  Without this
 	option old data in `.git/FETCH_HEAD` will be overwritten.
 
+--atomic::
+	Use an atomic transaction to update local refs. Either all refs are
+	updated, or on error, no refs are updated.
+
 --depth=<depth>::
 	Limit fetching to the specified number of commits from the tip of
 	each remote branch history. If fetching to a 'shallow' repository
@@ -58,12 +62,28 @@ The argument to this option may be a glob on ref names, a ref, or the (possibly
 abbreviated) SHA-1 of a commit. Specifying a glob is equivalent to specifying
 this option multiple times, one for each matching ref name.
 +
-See also the `fetch.negotiationAlgorithm` configuration variable
-documented in linkgit:git-config[1].
+See also the `fetch.negotiationAlgorithm` and `push.negotiate`
+configuration variables documented in linkgit:git-config[1], and the
+`--negotiate-only` option below.
+
+--negotiate-only::
+	Do not fetch anything from the server, and instead print the
+	ancestors of the provided `--negotiation-tip=*` arguments,
+	which we have in common with the server.
++
+Internally this is used to implement the `push.negotiate` option, see
+linkgit:git-config[1].
 
-ifndef::git-pull[]
 --dry-run::
 	Show what would be done, without making any changes.
+
+ifndef::git-pull[]
+--[no-]write-fetch-head::
+	Write the list of remote refs fetched in the `FETCH_HEAD`
+	file directly under `$GIT_DIR`.  This is the default.
+	Passing `--no-write-fetch-head` from the command line tells
+	Git not to write the file.  Under `--dry-run` option, the
+	file is never written.
 endif::git-pull[]
 
 -f::
@@ -88,9 +108,21 @@ ifndef::git-pull[]
 	Allow several <repository> and <group> arguments to be
 	specified. No <refspec>s may be specified.
 
+--[no-]auto-maintenance::
 --[no-]auto-gc::
-	Run `git gc --auto` at the end to perform garbage collection
-	if needed. This is enabled by default.
+	Run `git maintenance run --auto` at the end to perform automatic
+	repository maintenance if needed. (`--[no-]auto-gc` is a synonym.)
+	This is enabled by default.
+
+--[no-]write-commit-graph::
+	Write a commit-graph after fetching. This overrides the config
+	setting `fetch.writeCommitGraph`.
+endif::git-pull[]
+
+--prefetch::
+	Modify the configured refspec to place all refs into the
+	`refs/prefetch/` namespace. See the `prefetch` task in
+	linkgit:git-maintenance[1].
 
 -p::
 --prune::
@@ -103,6 +135,7 @@ ifndef::git-pull[]
 	was cloned with the --mirror option), then they are also
 	subject to pruning. Supplying `--prune-tags` is a shorthand for
 	providing the tag refspec.
+ifndef::git-pull[]
 +
 See the PRUNING section below for more details.
 
@@ -129,13 +162,15 @@ endif::git-pull[]
 	behavior for a remote may be specified with the remote.<name>.tagOpt
 	setting. See linkgit:git-config[1].
 
-ifndef::git-pull[]
 --refmap=<refspec>::
 	When fetching refs listed on the command line, use the
 	specified refspec (can be given more than once) to map the
 	refs to remote-tracking branches, instead of the values of
 	`remote.*.fetch` configuration variables for the remote
-	repository.  See section on "Configured Remote-tracking
+	repository.  Providing an empty `<refspec>` to the
+	`--refmap` option causes Git to ignore the configured
+	refspecs and rely entirely on the refspecs supplied as
+	command-line arguments. See section on "Configured Remote-tracking
 	Branches" for details.
 
 -t::
@@ -147,6 +182,7 @@ ifndef::git-pull[]
 	is used (though tags may be pruned anyway if they are also the
 	destination of an explicit refspec; see `--prune`).
 
+ifndef::git-pull[]
 --recurse-submodules[=yes|on-demand|no]::
 	This option controls if and under what conditions new commits of
 	populated submodules should be fetched too. It can be used as a
@@ -156,7 +192,9 @@ ifndef::git-pull[]
 	value. Use 'on-demand' to only recurse into a populated submodule
 	when the superproject retrieves a commit that updates the submodule's
 	reference to a commit that isn't already in the local submodule
-	clone.
+	clone. By default, 'on-demand' is used, unless
+	`fetch.recurseSubmodules` is set (see linkgit:git-config[1]).
+endif::git-pull[]
 
 -j::
 --jobs=<n>::
@@ -170,17 +208,20 @@ parallel. To control them independently, use the config settings
 Typically, parallel recursive and multi-remote fetches will be faster. By
 default fetches are performed sequentially, not in parallel.
 
+ifndef::git-pull[]
 --no-recurse-submodules::
 	Disable recursive fetching of submodules (this has the same effect as
 	using the `--recurse-submodules=no` option).
+endif::git-pull[]
 
 --set-upstream::
-	If the remote is fetched successfully, pull and add upstream
+	If the remote is fetched successfully, add upstream
 	(tracking) reference, used by argument-less
 	linkgit:git-pull[1] and other commands. For more information,
 	see `branch.<name>.merge` and `branch.<name>.remote` in
 	linkgit:git-config[1].
 
+ifndef::git-pull[]
 --submodule-prefix=<path>::
 	Prepend <path> to paths printed in informative messages
 	such as "Fetching submodule foo".  This option is used
@@ -193,7 +234,6 @@ default fetches are performed sequentially, not in parallel.
 	recursion (such as settings in linkgit:gitmodules[5] and
 	linkgit:git-config[1]) override this option, as does
 	specifying --[no-]recurse-submodules directly.
-endif::git-pull[]
 
 -u::
 --update-head-ok::
@@ -203,6 +243,7 @@ endif::git-pull[]
 	to communicate with 'git fetch', and unless you are
 	implementing your own Porcelain you are not supposed to
 	use it.
+endif::git-pull[]
 
 --upload-pack <upload-pack>::
 	When given, and the repository to fetch from is handled
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index 8b0e4c7fa8..be5e3ac54b 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -11,7 +11,8 @@ SYNOPSIS
 'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
 	  [--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
 	  [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
-	  [--chmod=(+|-)x] [--] [<pathspec>...]
+	  [--chmod=(+|-)x] [--pathspec-from-file=<file> [--pathspec-file-nul]]
+	  [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
@@ -187,6 +188,19 @@ for "git add --no-all <pathspec>...", i.e. ignored removed files.
 	bit is only changed in the index, the files on disk are left
 	unchanged.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
+
 \--::
 	This option can be used to separate command-line options from
 	the list of files, (useful when filenames might be mistaken
diff --git a/Documentation/git-am.txt b/Documentation/git-am.txt
index fc3b993c33..8714dfcb76 100644
--- a/Documentation/git-am.txt
+++ b/Documentation/git-am.txt
@@ -15,8 +15,9 @@ SYNOPSIS
 	 [--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
 	 [--exclude=<path>] [--include=<path>] [--reject] [-q | --quiet]
 	 [--[no-]scissors] [-S[<keyid>]] [--patch-format=<format>]
+	 [--quoted-cr=<action>]
 	 [(<mbox> | <Maildir>)...]
-'git am' (--continue | --skip | --abort | --quit | --show-current-patch)
+'git am' (--continue | --skip | --abort | --quit | --show-current-patch[=(diff|raw)])
 
 DESCRIPTION
 -----------
@@ -33,7 +34,7 @@ OPTIONS
 
 -s::
 --signoff::
-	Add a `Signed-off-by:` line to the commit message, using
+	Add a `Signed-off-by` trailer to the commit message, using
 	the committer identity of yourself.
 	See the signoff option in linkgit:git-commit[1] for more information.
 
@@ -59,6 +60,9 @@ OPTIONS
 --no-scissors::
 	Ignore scissors lines (see linkgit:git-mailinfo[1]).
 
+--quoted-cr=<action>::
+	This flag will be passed down to 'git mailinfo' (see linkgit:git-mailinfo[1]).
+
 -m::
 --message-id::
 	Pass the `-m` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]),
@@ -79,7 +83,7 @@ OPTIONS
 	Pass `-u` flag to 'git mailinfo' (see linkgit:git-mailinfo[1]).
 	The proposed commit log message taken from the e-mail
 	is re-coded into UTF-8 encoding (configuration variable
-	`i18n.commitencoding` can be used to specify project's
+	`i18n.commitEncoding` can be used to specify project's
 	preferred encoding if it is not UTF-8).
 +
 This was optional in prior versions of git, but now it is the
@@ -148,9 +152,12 @@ default.   You can use `--no-utf8` to override this.
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
+--no-gpg-sign::
 	GPG-sign commits. The `keyid` argument is optional and
 	defaults to the committer identity; if specified, it must be
-	stuck to the option without a space.
+	stuck to the option without a space. `--no-gpg-sign` is useful to
+	countermand both `commit.gpgSign` configuration variable, and
+	earlier `--gpg-sign`.
 
 --continue::
 -r::
@@ -176,9 +183,11 @@ default.   You can use `--no-utf8` to override this.
 	Abort the patching operation but keep HEAD and the index
 	untouched.
 
---show-current-patch::
-	Show the patch being applied when "git am" is stopped because
-	of conflicts.
+--show-current-patch[=(diff|raw)]::
+	Show the message at which `git am` has stopped due to
+	conflicts.  If `raw` is specified, show the raw contents of
+	the e-mail message; if `diff`, show the diff portion only.
+	Defaults to `raw`.
 
 DISCUSSION
 ----------
@@ -190,8 +199,8 @@ the commit, after stripping common prefix "[PATCH <anything>]".
 The "Subject: " line is supposed to concisely describe what the
 commit is about in one line of text.
 
-"From: " and "Subject: " lines starting the body override the respective
-commit author name and title values taken from the headers.
+"From: ", "Date: ", and "Subject: " lines starting the body override the
+respective commit author name and title values taken from the headers.
 
 The commit message is formed by the title taken from the
 "Subject: ", a blank line and the body of the message up to
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index b9aa39000f..aa1ae56a25 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -61,18 +61,18 @@ OPTIONS
 	file and detects errors.  Turns off "apply".
 
 --index::
-	When `--check` is in effect, or when applying the patch
-	(which is the default when none of the options that
-	disables it is in effect), make sure the patch is
-	applicable to what the current index file records.  If
-	the file to be patched in the working tree is not
-	up to date, it is flagged as an error.  This flag also
-	causes the index file to be updated.
+	Apply the patch to both the index and the working tree (or
+	merely check that it would apply cleanly to both if `--check` is
+	in effect). Note that `--index` expects index entries and
+	working tree copies for relevant paths to be identical (their
+	contents and metadata such as file mode must match), and will
+	raise an error if they are not, even if the patch would apply
+	cleanly to both the index and the working tree in isolation.
 
 --cached::
-	Apply a patch without touching the working tree. Instead take the
-	cached data, apply the patch, and store the result in the index
-	without using the working tree. This implies `--index`.
+	Apply the patch to just the index, without touching the working
+	tree. If `--check` is in effect, merely check that it would
+	apply cleanly to the index entry.
 
 --intent-to-add::
 	When applying the patch only to the working tree, mark new
@@ -84,12 +84,13 @@ OPTIONS
 
 -3::
 --3way::
-	When the patch does not apply cleanly, fall back on 3-way merge if
-	the patch records the identity of blobs it is supposed to apply to,
-	and we have those blobs available locally, possibly leaving the
+	Attempt 3-way merge if the patch records the identity of blobs it is supposed
+	to apply to and we have those blobs available locally, possibly leaving the
 	conflict markers in the files in the working tree for the user to
-	resolve.  This option implies the `--index` option, and is incompatible
-	with the `--reject` and the `--cached` options.
+	resolve.  This option implies the `--index` option unless the
+	`--cached` option is used, and is incompatible with the `--reject` option.
+	When used with the `--cached` option, any conflicts are left at higher stages
+	in the cache.
 
 --build-fake-ancestor=<file>::
 	Newer 'git diff' output has embedded 'index information'
diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt
index cfa1e4ebe4..9f8172828d 100644
--- a/Documentation/git-archive.txt
+++ b/Documentation/git-archive.txt
@@ -55,6 +55,12 @@ OPTIONS
 --output=<file>::
 	Write the archive to <file> instead of stdout.
 
+--add-file=<file>::
+	Add a non-tracked file to the archive.  Can be repeated to add
+	multiple files.  The path of the file in the archive is built
+	by concatenating the value for `--prefix` (if any) and the
+	basename of <file>.
+
 --worktree-attributes::
 	Look for attributes in .gitattributes files in the working tree
 	as well (see <<ATTRIBUTES>>).
diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt
index e99925184d..f3d9566c89 100644
--- a/Documentation/git-bisect-lk2009.txt
+++ b/Documentation/git-bisect-lk2009.txt
@@ -158,7 +158,7 @@ Test suites are very nice. But when they are used alone, they are
 supposed to be used so that all the tests are checked after each
 commit. This means that they are not very efficient, because many
 tests are run for no interesting result, and they suffer from
-combinational explosion.
+combinatorial explosion.
 
 In fact the problem is that big software often has many different
 configuration options and that each test case should pass for each
@@ -473,7 +473,7 @@ Z-Z
 -------------
 
 2) starting from the "good" ends of the graph, associate to each
-commit the number of ancestors it has plus one
+   commit the number of ancestors it has plus one
 
 For example with the following graph where H is the "bad" commit and A
 and D are some parents of some "good" commits:
@@ -514,7 +514,7 @@ D---E
 -------------
 
 4) the best bisection point is the commit with the highest associated
-number
+   number
 
 So in the above example the best bisection point is commit C.
 
@@ -580,8 +580,8 @@ good or a bad commit does not give more or less information).
 
 Let's also suppose that we have a cleaned up graph like one after step
 1) in the bisection algorithm above. This means that we can measure
-the information we get in terms of number of commit we can remove from
-the graph..
+   the information we get in terms of number of commit we can remove
+   from the graph..
 
 And let's take a commit X in the graph.
 
@@ -689,18 +689,18 @@ roughly the following steps:
 6) sort the commit by decreasing associated value
 
 7) if the first commit has not been skipped, we can return it and stop
-here
+   here
 
 8) otherwise filter out all the skipped commits in the sorted list
 
 9) use a pseudo random number generator (PRNG) to generate a random
-number between 0 and 1
+   number between 0 and 1
 
 10) multiply this random number with its square root to bias it toward
-0
+    0
 
 11) multiply the result by the number of commits in the filtered list
-to get an index into this list
+    to get an index into this list
 
 12) return the commit at the computed index
 
@@ -1350,9 +1350,9 @@ References
 - [[[1]]] https://www.nist.gov/sites/default/files/documents/director/planning/report02-3.pdf['The Economic Impacts of Inadequate Infratructure for Software Testing'.  Nist Planning Report 02-3], see Executive Summary and Chapter 8.
 - [[[2]]] http://www.oracle.com/technetwork/java/codeconvtoc-136057.html['Code Conventions for the Java Programming Language'. Sun Microsystems.]
 - [[[3]]] https://en.wikipedia.org/wiki/Software_maintenance['Software maintenance'. Wikipedia.]
-- [[[4]]] https://public-inbox.org/git/7vps5xsbwp.fsf_-_@assigned-by-dhcp.cox.net/[Junio C Hamano. 'Automated bisect success story'.]
+- [[[4]]] https://lore.kernel.org/git/7vps5xsbwp.fsf_-_@assigned-by-dhcp.cox.net/[Junio C Hamano. 'Automated bisect success story'.]
 - [[[5]]] https://lwn.net/Articles/317154/[Christian Couder. 'Fully automated bisecting with "git bisect run"'. LWN.net.]
 - [[[6]]] https://lwn.net/Articles/277872/[Jonathan Corbet. 'Bisection divides users and developers'. LWN.net.]
-- [[[7]]] http://marc.info/?l=linux-kernel&m=119702753411680&w=2[Ingo Molnar. 'Re: BUG 2.6.23-rc3 can't see sd partitions on Alpha'. Linux-kernel mailing list.]
+- [[[7]]] https://lore.kernel.org/lkml/20071207113734.GA14598@elte.hu/[Ingo Molnar. 'Re: BUG 2.6.23-rc3 can't see sd partitions on Alpha'. Linux-kernel mailing list.]
 - [[[8]]] https://www.kernel.org/pub/software/scm/git/docs/git-bisect.html[Junio C Hamano and the git-list. 'git-bisect(1) Manual Page'. Linux Kernel Archives.]
 - [[[9]]] https://github.com/Ealdwulf/bbchop[Ealdwulf. 'bbchop'. GitHub.]
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 4b45d837a7..fbb39fbdf5 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -16,8 +16,8 @@ DESCRIPTION
 The command takes various subcommands, and different options depending
 on the subcommand:
 
- git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
-		  [--no-checkout] [<bad> [<good>...]] [--] [<paths>...]
+ git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]
+		  [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]
  git bisect (bad|new|<term-new>) [<rev>]
  git bisect (good|old|<term-old>) [<rev>...]
  git bisect terms [--term-good | --term-bad]
@@ -365,6 +365,17 @@ does not require a checked out tree.
 +
 If the repository is bare, `--no-checkout` is assumed.
 
+--first-parent::
++
+Follow only the first parent commit upon seeing a merge commit.
++
+In detecting regressions introduced through the merging of a branch, the merge
+commit will be identified as introduction of the bug and its ancestors will be
+ignored.
++
+This option is particularly useful in avoiding false positives when a merged
+branch contained broken or non-buildable commits, but the merge itself was OK.
+
 EXAMPLES
 --------
 
@@ -413,7 +424,7 @@ $ cat ~/test.sh
 
 # tweak the working tree by merging the hot-fix branch
 # and then attempt a build
-if	git merge --no-commit hot-fix &&
+if	git merge --no-commit --no-ff hot-fix &&
 	make
 then
 	# run project specific test and report its status
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index 7e81541996..3bf5d5d8b4 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -87,7 +87,9 @@ include::blame-options.txt[]
 
 --abbrev=<n>::
 	Instead of using the default 7+1 hexadecimal digits as the
-	abbreviated object name, use <n>+1 digits. Note that 1 column
+	abbreviated object name, use <m>+1 digits, where <m> is at
+	least <n> but ensures the commit object names are unique.
+	Note that 1 column
 	is used for a caret to mark the boundary commit.
 
 
@@ -224,7 +226,7 @@ commit commentary), a blame viewer will not care.
 MAPPING AUTHORS
 ---------------
 
-include::mailmap.txt[]
+See linkgit:gitmailmap[5].
 
 
 SEE ALSO
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 135206ff4a..5449767121 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -9,10 +9,10 @@ SYNOPSIS
 --------
 [verse]
 'git branch' [--color[=<when>] | --no-color] [--show-current]
-	[-v [--abbrev=<length> | --no-abbrev]]
+	[-v [--abbrev=<n> | --no-abbrev]]
 	[--column[=<options>] | --no-column] [--sort=<key>]
-	[(--merged | --no-merged) [<commit>]]
-	[--contains [<commit]] [--no-contains [<commit>]]
+	[--merged [<commit>]] [--no-merged [<commit>]]
+	[--contains [<commit>]] [--no-contains [<commit>]]
 	[--points-at <object>] [--format=<format>]
 	[(-r | --remotes) | (-a | --all)]
 	[--list] [<pattern>...]
@@ -78,8 +78,8 @@ renaming. If <newbranch> exists, -M must be used to force the rename
 to happen.
 
 The `-c` and `-C` options have the exact same semantics as `-m` and
-`-M`, except instead of the branch being renamed it along with its
-config and reflog will be copied to a new name.
+`-M`, except instead of the branch being renamed, it will be copied to a
+new name, along with its config and reflog.
 
 With a `-d` or `-D` option, `<branchname>` will be deleted.  You may
 specify more than one branch for deletion.  If the branch currently
@@ -118,7 +118,8 @@ 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`).
 
@@ -153,7 +154,7 @@ OPTIONS
 --column[=<options>]::
 --no-column::
 	Display branch listing in columns. See configuration variable
-	column.branch for option syntax.`--column` and `--no-column`
+	`column.branch` for option syntax. `--column` and `--no-column`
 	without options are equivalent to 'always' and 'never' respectively.
 +
 This option is only applicable in non-verbose mode.
@@ -194,8 +195,10 @@ This option is only applicable in non-verbose mode.
 	Be more quiet when creating or deleting a branch, suppressing
 	non-error messages.
 
---abbrev=<length>::
-	Alter the sha1's minimum display length in the output listing.
+--abbrev=<n>::
+	In the verbose listing that show the commit object name,
+	show the shortest prefix that is at least '<n>' hexdigits
+	long that uniquely refers the object.
 	The default value is 7 and can be overridden by the `core.abbrev`
 	config option.
 
@@ -252,13 +255,11 @@ start-point is either a local or remote-tracking branch.
 
 --merged [<commit>]::
 	Only list branches whose tips are reachable from the
-	specified commit (HEAD if not specified). Implies `--list`,
-	incompatible with `--no-merged`.
+	specified commit (HEAD if not specified). Implies `--list`.
 
 --no-merged [<commit>]::
 	Only list branches whose tips are not reachable from the
-	specified commit (HEAD if not specified). Implies `--list`,
-	incompatible with `--merged`.
+	specified commit (HEAD if not specified). Implies `--list`.
 
 <branchname>::
 	The name of the branch to create or delete.
@@ -370,6 +371,8 @@ serve four related but different purposes:
 - `--no-merged` is used to find branches which are candidates for merging
   into HEAD, since those branches are not fully contained by HEAD.
 
+include::ref-reachability-filters.txt[]
+
 SEE ALSO
 --------
 linkgit:git-check-ref-format[1],
diff --git a/Documentation/git-bugreport.txt b/Documentation/git-bugreport.txt
new file mode 100644
index 0000000000..66e88c2e31
--- /dev/null
+++ b/Documentation/git-bugreport.txt
@@ -0,0 +1,54 @@
+git-bugreport(1)
+================
+
+NAME
+----
+git-bugreport - Collect information for user to file a bug report
+
+SYNOPSIS
+--------
+[verse]
+'git bugreport' [(-o | --output-directory) <path>] [(-s | --suffix) <format>]
+
+DESCRIPTION
+-----------
+Captures information about the user's machine, Git client, and repository state,
+as well as a form requesting information about the behavior the user observed,
+into a single text file which the user can then share, for example to the Git
+mailing list, in order to report an observed bug.
+
+The following information is requested from the user:
+
+ - Reproduction steps
+ - Expected behavior
+ - Actual behavior
+
+The following information is captured automatically:
+
+ - 'git version --build-options'
+ - uname sysname, release, version, and machine strings
+ - Compiler-specific info string
+ - A list of enabled hooks
+ - $SHELL
+
+This tool is invoked via the typical Git setup process, which means that in some
+cases, it might not be able to launch - for example, if a relevant config file
+is unreadable. In this kind of scenario, it may be helpful to manually gather
+the kind of information listed above when manually asking for help.
+
+OPTIONS
+-------
+-o <path>::
+--output-directory <path>::
+	Place the resulting bug report file in `<path>` instead of the root of
+	the Git repository.
+
+-s <format>::
+--suffix <format>::
+	Specify an alternate suffix for the bugreport name, to create a file
+	named 'git-bugreport-<formatted suffix>'. This should take the form of a
+	strftime(3) format string; the current local time will be used.
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt
index 7d6c9dcd17..ac0d003835 100644
--- a/Documentation/git-bundle.txt
+++ b/Documentation/git-bundle.txt
@@ -9,33 +9,66 @@ git-bundle - Move objects and refs by archive
 SYNOPSIS
 --------
 [verse]
-'git bundle' create <file> <git-rev-list-args>
-'git bundle' verify <file>
+'git bundle' create [-q | --quiet | --progress | --all-progress] [--all-progress-implied]
+		    [--version=<version>] <file> <git-rev-list-args>
+'git bundle' verify [-q | --quiet] <file>
 'git bundle' list-heads <file> [<refname>...]
 'git bundle' unbundle <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.  This command provides support for
-'git fetch' and 'git pull' to operate by packaging objects and references
-in an archive at the originating machine, then importing those into
-another repository using 'git fetch' and 'git pull'
-after moving the archive by some means (e.g., by sneakernet).  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.
+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.
+
+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.
+
+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, 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
 -------
 
-create <file>::
+create [options] <file> <git-rev-list-args>::
 	Used to create a bundle named 'file'.  This requires the
-	'git-rev-list-args' arguments to define the bundle contents.
+	'<git-rev-list-args>' arguments to define the bundle contents.
+	'options' contains the options specific to the 'git bundle create'
+	subcommand.
 
 verify <file>::
 	Used to check that a bundle file is valid and will apply
@@ -75,23 +108,124 @@ unbundle <file>::
 	necessarily everything in the pack (in this case, 'git bundle' acts
 	like 'git fetch-pack').
 
+--progress::
+	Progress status is reported on the standard error stream
+	by default when it is attached to a terminal, unless -q
+	is specified. This flag forces progress status even if
+	the standard error stream is not directed to a terminal.
+
+--all-progress::
+	When --stdout is specified then progress report is
+	displayed during the object count and compression phases
+	but inhibited during the write-out phase. The reason is
+	that in some cases the output stream is directly linked
+	to another command which may wish to display progress
+	status of its own as it processes incoming pack data.
+	This flag is like --progress except that it forces progress
+	report for the write-out phase as well even if --stdout is
+	used.
+
+--all-progress-implied::
+	This is used to imply --all-progress whenever progress display
+	is activated.  Unlike --all-progress this flag doesn't actually
+	force any progress display by itself.
+
+--version=<version>::
+	Specify the bundle version.  Version 2 is the older format and can only be
+	used with SHA-1 repositories; the newer version 3 contains capabilities that
+	permit extensions. The default is the oldest supported format, based on the
+	hash algorithm in use.
+
+-q::
+--quiet::
+	This flag makes the command not to report its progress
+	on the standard error stream.
+
 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 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.
 
+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
 --------
 
@@ -102,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:
 
@@ -153,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:
@@ -164,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
@@ -177,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 8eca671b82..4eb0421b3f 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git cat-file' (-t [--allow-unknown-type]| -s [--allow-unknown-type]| -e | -p | <type> | --textconv | --filters ) [--path=<path>] <object>
-'git cat-file' (--batch | --batch-check) [ --textconv | --filters ] [--follow-symlinks]
+'git cat-file' (--batch[=<format>] | --batch-check[=<format>]) [ --textconv | --filters ] [--follow-symlinks]
 
 DESCRIPTION
 -----------
@@ -35,42 +35,42 @@ OPTIONS
 
 -t::
 	Instead of the content, show the object type identified by
-	<object>.
+	`<object>`.
 
 -s::
 	Instead of the content, show the object size identified by
-	<object>.
+	`<object>`.
 
 -e::
-	Exit with zero status if <object> exists and is a valid
-	object. If <object> is of an invalid format exit with non-zero and
+	Exit with zero status if `<object>` exists and is a valid
+	object. If `<object>` is of an invalid format exit with non-zero and
 	emits an error on stderr.
 
 -p::
-	Pretty-print the contents of <object> based on its type.
+	Pretty-print the contents of `<object>` based on its type.
 
 <type>::
-	Typically this matches the real type of <object> but asking
+	Typically this matches the real type of `<object>` but asking
 	for a type that can trivially be dereferenced from the given
-	<object> is also permitted.  An example is to ask for a
-	"tree" with <object> being a commit object that contains it,
-	or to ask for a "blob" with <object> being a tag object that
+	`<object>` is also permitted.  An example is to ask for a
+	"tree" with `<object>` being a commit object that contains it,
+	or to ask for a "blob" with `<object>` being a tag object that
 	points at it.
 
 --textconv::
 	Show the content as transformed by a textconv filter. In this case,
-	<object> has to be of the form <tree-ish>:<path>, or :<path> in
+	`<object>` has to be of the form `<tree-ish>:<path>`, or `:<path>` in
 	order to apply the filter to the content recorded in the index at
-	<path>.
+	`<path>`.
 
 --filters::
 	Show the content as converted by the filters configured in
-	the current working tree for the given <path> (i.e. smudge filters,
-	end-of-line conversion, etc). In this case, <object> has to be of
-	the form <tree-ish>:<path>, or :<path>.
+	the current working tree for the given `<path>` (i.e. smudge filters,
+	end-of-line conversion, etc). In this case, `<object>` has to be of
+	the form `<tree-ish>:<path>`, or `:<path>`.
 
 --path=<path>::
-	For use with --textconv or --filters, to allow specifying an object
+	For use with `--textconv` or `--filters`, to allow specifying an object
 	name and a path separately, e.g. when it is difficult to figure out
 	the revision from which the blob came.
 
@@ -115,15 +115,15 @@ OPTIONS
 	repository.
 
 --allow-unknown-type::
-	Allow -s or -t to query broken/corrupt objects of unknown type.
+	Allow `-s` or `-t` to query broken/corrupt objects of unknown type.
 
 --follow-symlinks::
-	With --batch or --batch-check, follow symlinks inside the
+	With `--batch` or `--batch-check`, follow symlinks inside the
 	repository when requesting objects with extended SHA-1
 	expressions of the form tree-ish:path-in-tree.  Instead of
 	providing output about the link itself, provide output about
 	the linked-to object.  If a symlink points outside the
-	tree-ish (e.g. a link to /foo or a root-level link to ../foo),
+	tree-ish (e.g. a link to `/foo` or a root-level link to `../foo`),
 	the portion of the link which is outside the tree will be
 	printed.
 +
@@ -175,15 +175,15 @@ respectively print:
 
 OUTPUT
 ------
-If `-t` is specified, one of the <type>.
+If `-t` is specified, one of the `<type>`.
 
-If `-s` is specified, the size of the <object> in bytes.
+If `-s` is specified, the size of the `<object>` in bytes.
 
-If `-e` is specified, no output, unless the <object> is malformed.
+If `-e` is specified, no output, unless the `<object>` is malformed.
 
-If `-p` is specified, the contents of <object> are pretty-printed.
+If `-p` is specified, the contents of `<object>` are pretty-printed.
 
-If <type> is specified, the raw (though uncompressed) contents of the <object>
+If `<type>` is specified, the raw (though uncompressed) contents of the `<object>`
 will be returned.
 
 BATCH OUTPUT
@@ -200,7 +200,7 @@ object, with placeholders of the form `%(atom)` expanded, followed by a
 newline. The available atoms are:
 
 `objectname`::
-	The 40-hex object name of the object.
+	The full hex representation of the object name.
 
 `objecttype`::
 	The type of the object (the same as `cat-file -t` reports).
@@ -215,8 +215,9 @@ newline. The available atoms are:
 
 `deltabase`::
 	If the object is stored as a delta on-disk, this expands to the
-	40-hex sha1 of the delta base object. Otherwise, expands to the
-	null sha1 (40 zeroes). See `CAVEATS` below.
+	full hex representation of the delta base object name.
+	Otherwise, expands to the null OID (all zeroes). See `CAVEATS`
+	below.
 
 `rest`::
 	If this atom is used in the output string, input lines are split
@@ -235,14 +236,14 @@ newline.
 For example, `--batch` without a custom format would produce:
 
 ------------
-<sha1> SP <type> SP <size> LF
+<oid> SP <type> SP <size> LF
 <contents> LF
 ------------
 
 Whereas `--batch-check='%(objectname) %(objecttype)'` would produce:
 
 ------------
-<sha1> SP <type> LF
+<oid> SP <type> LF
 ------------
 
 If a name is specified on stdin that cannot be resolved to an object in
@@ -258,7 +259,7 @@ If a name is specified that might refer to more than one object (an ambiguous sh
 <object> SP ambiguous LF
 ------------
 
-If --follow-symlinks is used, and a symlink in the repository points
+If `--follow-symlinks` is used, and a symlink in the repository points
 outside the repository, then `cat-file` will ignore any custom format
 and print:
 
@@ -267,11 +268,11 @@ symlink SP <size> LF
 <symlink> LF
 ------------
 
-The symlink will either be absolute (beginning with a /), or relative
-to the tree root.  For instance, if dir/link points to ../../foo, then
-<symlink> will be ../foo.  <size> is the size of the symlink in bytes.
+The symlink will either be absolute (beginning with a `/`), or relative
+to the tree root.  For instance, if dir/link points to `../../foo`, then
+`<symlink>` will be `../foo`.  `<size>` is the size of the symlink in bytes.
 
-If --follow-symlinks is used, the following error messages will be
+If `--follow-symlinks` is used, the following error messages will be
 displayed:
 
 ------------
diff --git a/Documentation/git-check-attr.txt b/Documentation/git-check-attr.txt
index 3c0578217b..84f41a8e82 100644
--- a/Documentation/git-check-attr.txt
+++ b/Documentation/git-check-attr.txt
@@ -32,7 +32,7 @@ OPTIONS
 	instead of from the command-line.
 
 -z::
-	The output format is modified to be machine-parseable.
+	The output format is modified to be machine-parsable.
 	If `--stdin` is also given, input paths are separated
 	with a NUL character instead of a linefeed character.
 
diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt
index 8b42cb3fb2..0c3924a63d 100644
--- a/Documentation/git-check-ignore.txt
+++ b/Documentation/git-check-ignore.txt
@@ -30,16 +30,22 @@ OPTIONS
 	valid with a single pathname.
 
 -v, --verbose::
-	Also output details about the matching pattern (if any)
-	for each given pathname. For precedence rules within and
-	between exclude sources, see linkgit:gitignore[5].
+	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 '!'
+	then it is a negated pattern and matching it means the path is
+	NOT excluded.)
++
+For precedence rules within and between exclude sources, see
+linkgit:gitignore[5].
 
 --stdin::
 	Read pathnames from the standard input, one per line,
 	instead of from the command-line.
 
 -z::
-	The output format is modified to be machine-parseable (see
+	The output format is modified to be machine-parsable (see
 	below).  If `--stdin` is also given, input paths are separated
 	with a NUL character instead of a linefeed character.
 
diff --git a/Documentation/git-check-mailmap.txt b/Documentation/git-check-mailmap.txt
index aa2055dbeb..02f4418323 100644
--- a/Documentation/git-check-mailmap.txt
+++ b/Documentation/git-check-mailmap.txt
@@ -36,10 +36,17 @@ name is provided or known to the 'mailmap', ``Name $$<user@host>$$'' is
 printed; otherwise only ``$$<user@host>$$'' is printed.
 
 
+CONFIGURATION
+-------------
+
+See `mailmap.file` and `mailmap.blob` in linkgit:git-config[1] for how
+to specify a custom `.mailmap` target file or object.
+
+
 MAPPING AUTHORS
 ---------------
 
-include::mailmap.txt[]
+See linkgit:gitmailmap[5].
 
 
 GIT
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index cf3cac0a2b..b1a6fe4499 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -12,14 +12,14 @@ SYNOPSIS
 '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' [-f|--ours|--theirs|-m|--conflict=<style>] [<tree-ish>] [--] <paths>...
-'git checkout' [<tree-ish>] [--] <pathspec>...
-'git checkout' (-p|--patch) [<tree-ish>] [--] [<paths>...]
+'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>...]
 
 DESCRIPTION
 -----------
 Updates files in the working tree to match the version in the index
-or the specified tree.  If no paths are given, 'git checkout' will
+or the specified tree.  If no pathspec was given, 'git checkout' will
 also update `HEAD` to set the specified branch as the current
 branch.
 
@@ -79,13 +79,14 @@ be used to detach `HEAD` at the tip of the branch (`git checkout
 +
 Omitting `<branch>` detaches `HEAD` at the tip of the current branch.
 
-'git checkout' [<tree-ish>] [--] <pathspec>...::
+'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]::
 
-	Overwrite paths in the working tree by replacing with the
-	contents in the index or in the `<tree-ish>` (most often a
-	commit).  When a `<tree-ish>` is given, the paths that
-	match the `<pathspec>` are updated both in the index and in
-	the working tree.
+	Overwrite the contents of the files that match the pathspec.
+	When the `<tree-ish>` (most often a commit) is not given,
+	overwrite working tree with the contents in the index.
+	When the `<tree-ish>` is given, overwrite both the index and
+	the working tree with the contents at the `<tree-ish>`.
 +
 The index may contain unmerged entries because of a previous failed merge.
 By default, if you try to check out such an entry from the index, the
@@ -96,12 +97,10 @@ using `--ours` or `--theirs`.  With `-m`, changes made to the working tree
 file can be discarded to re-create the original conflicted merge result.
 
 'git checkout' (-p|--patch) [<tree-ish>] [--] [<pathspec>...]::
-	This is similar to the "check out paths to the working tree
-	from either the index or from a tree-ish" mode described
-	above, but lets you use the interactive interface to show
-	the "diff" output and choose which hunks to use in the
-	result.  See below for the description of `--patch` option.
-
+	This is similar to the previous mode, but lets you use the
+	interactive interface to show the "diff" output and choose which
+	hunks to use in the result.  See below for the description of
+	`--patch` option.
 
 OPTIONS
 -------
@@ -193,12 +192,16 @@ branches from there if `<branch>` is ambiguous but exists on the
 'origin' remote. See also `checkout.defaultRemote` in
 linkgit:git-config[1].
 +
-Use `--no-guess` to disable this.
+`--guess` is the default behavior. Use `--no-guess` to disable it.
++
+The default behavior can be set via the `checkout.guess` configuration
+variable.
 
 -l::
 	Create the new branch's reflog; see linkgit:git-branch[1] for
 	details.
 
+-d::
 --detach::
 	Rather than checking out a branch to work on it, check out a
 	commit for inspection and discardable experiments.
@@ -293,11 +296,11 @@ Note that this option uses the no overlay mode by default (see also
 
 --recurse-submodules::
 --no-recurse-submodules::
-	Using `--recurse-submodules` will update the content of all initialized
+	Using `--recurse-submodules` will update the content of all active
 	submodules according to the commit recorded in the superproject. If
 	local modifications in a submodule would be overwritten the checkout
 	will fail unless `-f` is used. If nothing (or `--no-recurse-submodules`)
-	is used, the work trees of submodules will not be updated.
+	is used, submodules working trees will not be updated.
 	Just like linkgit:git-submodule[1], this will detach `HEAD` of the
 	submodule.
 
@@ -309,6 +312,19 @@ Note that this option uses the no overlay mode by default (see also
 	working tree, but not in `<tree-ish>` are removed, to make them
 	match `<tree-ish>` exactly.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
+
 <branch>::
 	Branch to checkout; if it refers to a branch (i.e., a name that,
 	when prepended with "refs/heads/", is a valid ref), then that
@@ -338,8 +354,18 @@ leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
 <tree-ish>::
 	Tree to checkout from (when paths are given). If not specified,
 	the index will be used.
++
+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`.
 
+\--::
+	Do not interpret any more arguments as options.
 
+<pathspec>...::
+	Limits the paths affected by the operation.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
 
 DETACHED HEAD
 -------------
diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt
index 83ce51aedf..5d750314b2 100644
--- a/Documentation/git-cherry-pick.txt
+++ b/Documentation/git-cherry-pick.txt
@@ -104,14 +104,17 @@ effect to your index in a row.
 
 -s::
 --signoff::
-	Add Signed-off-by line at the end of the commit message.
+	Add a `Signed-off-by` trailer at the end of the commit message.
 	See the signoff option in linkgit:git-commit[1] for more information.
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
+--no-gpg-sign::
 	GPG-sign commits. The `keyid` argument is optional and
 	defaults to the committer identity; if specified, it must be
-	stuck to the option without a space.
+	stuck to the option without a space. `--no-gpg-sign` is useful to
+	countermand both `commit.gpgSign` configuration variable, and
+	earlier `--gpg-sign`.
 
 --ff::
 	If the current HEAD is the same as the parent of the
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 34011c2940..3fe3810f1c 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -15,7 +15,8 @@ SYNOPSIS
 	  [--dissociate] [--separate-git-dir <git dir>]
 	  [--depth <depth>] [--[no-]single-branch] [--no-tags]
 	  [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
-	  [--[no-]remote-submodules] [--jobs <n>] [--] <repository>
+	  [--[no-]remote-submodules] [--jobs <n>] [--sparse] [--[no-]reject-shallow]
+	  [--filter=<filter>] [--] <repository>
 	  [<directory>]
 
 DESCRIPTION
@@ -56,6 +57,10 @@ repository is specified as a URL, then this flag is ignored (and we
 never use the local optimizations).  Specifying `--no-local` will
 override the default when `/path/to/repo` is given, using the regular
 Git transport instead.
++
+*NOTE*: this operation can race with concurrent modification to the
+source repository, similar to running `cp -r src dst` while modifying
+`src`.
 
 --no-hardlinks::
 	Force the cloning process from a repository on a local
@@ -77,9 +82,9 @@ repository using this option and then delete branches (or use any
 other Git command that makes any existing commit unreferenced) in the
 source repository, some objects may become unreferenced (or dangling).
 These objects may be removed by normal Git operations (such as `git commit`)
-which automatically call `git gc --auto`. (See linkgit:git-gc[1].)
-If these objects are removed and were referenced by the cloned repository,
-then the cloned repository will become corrupt.
+which automatically call `git maintenance run --auto`. (See
+linkgit:git-maintenance[1].) If these objects are removed and were referenced
+by the cloned repository, then the cloned repository will become corrupt.
 +
 Note that running `git repack` without the `--local` option in a repository
 cloned with `--shared` will copy objects from the source repository into a pack
@@ -144,6 +149,11 @@ objects from the source repository into a pack in the cloned repository.
 --no-checkout::
 	No checkout of HEAD is performed after the clone is complete.
 
+--[no-]reject-shallow::
+	Fail if the source repository is a shallow repository.
+	The 'clone.rejectShallow' configuration variable can be used to
+	specify the default.
+
 --bare::
 	Make a 'bare' Git repository.  That is, instead of
 	creating `<directory>` and placing the administrative
@@ -156,6 +166,22 @@ objects from the source repository into a pack in the cloned repository.
 	used, neither remote-tracking branches nor the related
 	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.
+
+--filter=<filter-spec>::
+	Use the partial clone feature and request that the server sends
+	a subset of reachable objects according to a given object filter.
+	When using `--filter`, the supplied `<filter-spec>` is used for
+	the partial clone filter. For example, `--filter=blob:none` will
+	filter out all blobs (file contents) until needed by Git. Also,
+	`--filter=blob:limit=<size>` will filter out all blobs of size
+	at least `<size>`. For more details on filter specifications, see
+	the `--filter` option in linkgit:git-rev-list[1].
+
 --mirror::
 	Set up a mirror of the source repository.  This implies `--bare`.
 	Compared to `--bare`, `--mirror` not only maps local branches of the
@@ -166,8 +192,9 @@ objects from the source repository into a pack in the cloned repository.
 
 -o <name>::
 --origin <name>::
-	Instead of using the remote name `origin` to keep track
-	of the upstream repository, use `<name>`.
+	Instead of using the remote name `origin` to keep track of the upstream
+	repository, use `<name>`.  Overrides `clone.defaultRemoteName` from the
+	config.
 
 -b <name>::
 --branch <name>::
@@ -242,7 +269,7 @@ maintain a branch with no references other than a single cloned
 branch. This is useful e.g. to maintain minimal clones of the default
 branch of some repository for search indexing.
 
---recurse-submodules[=<pathspec]::
+--recurse-submodules[=<pathspec>]::
 	After the clone is created, initialize and clone submodules
 	within based on the provided pathspec.  If no pathspec is
 	provided, all submodules are initialized and cloned.
@@ -262,9 +289,9 @@ or `--mirror` is given)
 	All submodules which are cloned will be shallow with a depth of 1.
 
 --[no-]remote-submodules::
-	All submodules which are cloned will use the status of the submodule’s
+	All submodules which are cloned will use the status of the submodule's
 	remote-tracking branch to update the submodule, rather than the
-	superproject’s recorded SHA-1. Equivalent to passing `--remote` to
+	superproject's recorded SHA-1. Equivalent to passing `--remote` to
 	`git submodule update`.
 
 --separate-git-dir=<git dir>::
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-graph.txt b/Documentation/git-commit-graph.txt
index 8c708a7a16..e1f48c95b3 100644
--- a/Documentation/git-commit-graph.txt
+++ b/Documentation/git-commit-graph.txt
@@ -9,7 +9,6 @@ git-commit-graph - Write and verify Git commit-graph files
 SYNOPSIS
 --------
 [verse]
-'git commit-graph read' [--object-dir <dir>]
 'git commit-graph verify' [--object-dir <dir>] [--shallow] [--[no-]progress]
 'git commit-graph write' <options> [--object-dir <dir>] [--[no-]progress]
 
@@ -27,7 +26,10 @@ OPTIONS
 	file. This parameter exists to specify the location of an alternate
 	that only has the objects directory, not a full `.git` directory. The
 	commit-graph file is expected to be in the `<dir>/info` directory and
-	the packfiles are expected to be in `<dir>/pack`.
+	the packfiles are expected to be in `<dir>/pack`. If the directory
+	could not be made into an absolute path, or does not match any known
+	object directory, `git commit-graph ...` will exit with non-zero
+	status.
 
 --[no-]progress::
 	Turn progress on/off explicitly. If neither is specified, progress is
@@ -37,7 +39,9 @@ COMMANDS
 --------
 'write'::
 
-Write a commit-graph file based on the commits found in packfiles.
+Write a commit-graph file based on the commits found in packfiles. If
+the config option `core.commitGraph` is disabled, then this command will
+output a warning, then return success without writing a commit-graph file.
 +
 With the `--stdin-packs` option, generate the new commit graph by
 walking objects only in the specified pack-indexes. (Cannot be combined
@@ -45,8 +49,10 @@ with `--stdin-commits` or `--reachable`.)
 +
 With the `--stdin-commits` option, generate the new commit graph by
 walking commits starting at the commits specified in stdin as a list
-of OIDs in hex, one OID per line. (Cannot be combined with
-`--stdin-packs` or `--reachable`.)
+of OIDs in hex, one OID per line. OIDs that resolve to non-commits
+(either directly, or by peeling tags) are silently ignored. OIDs that
+are malformed, or do not exist generate an error. (Cannot be combined
+with `--stdin-packs` or `--reachable`.)
 +
 With the `--reachable` option, generate the new commit graph by walking
 commits starting at all refs. (Cannot be combined with `--stdin-commits`
@@ -55,11 +61,34 @@ or `--stdin-packs`.)
 With the `--append` option, include all commits that are present in the
 existing commit-graph file.
 +
-With the `--split` option, write the commit-graph as a chain of multiple
-commit-graph files stored in `<dir>/info/commit-graphs`. The new commits
-not already in the commit-graph are added in a new "tip" file. This file
-is merged with the existing file if the following merge conditions are
-met:
+With the `--changed-paths` option, compute and write information about the
+paths changed between a commit and its first parent. This operation can
+take a while on large repositories. It provides significant performance gains
+for getting history of a directory or a file with `git log -- <path>`. If
+this option is given, future commit-graph writes will automatically assume
+that this option was intended. Use `--no-changed-paths` to stop storing this
+data.
++
+With the `--max-new-filters=<n>` option, generate at most `n` new Bloom
+filters (if `--changed-paths` is specified). If `n` is `-1`, no limit is
+enforced. Only commits present in the new layer count against this
+limit. To retroactively compute Bloom filters over earlier layers, it is
+advised to use `--split=replace`.  Overrides the `commitGraph.maxNewFilters`
+configuration.
++
+With the `--split[=<strategy>]` option, write the commit-graph as a
+chain of multiple commit-graph files stored in
+`<dir>/info/commit-graphs`. Commit-graph layers are merged based on the
+strategy and other splitting options. The new commits not already in the
+commit-graph are added in a new "tip" file. This file is merged with the
+existing file if the following merge conditions are met:
++
+* If `--split=no-merge` is specified, a merge is never performed, and
+the remaining options are ignored. `--split=replace` overwrites the
+existing chain with a new one. A bare `--split` defers to the remaining
+options. (Note that merging a chain of commit graphs replaces the
+existing chain with a length-1 chain where the first and only
+incremental holds the entire graph).
 +
 * If `--size-multiple=<X>` is not specified, let `X` equal 2. If the new
 tip file would have `N` commits and the previous tip has `M` commits and
@@ -74,11 +103,6 @@ Finally, if `--expire-time=<datetime>` is not specified, let `datetime`
 be the current time. After writing the split commit-graph, delete all
 unused commit-graph whose modified times are older than `datetime`.
 
-'read'::
-
-Read the commit-graph file and output basic details about it.
-Used for debugging purposes.
-
 'verify'::
 
 Read the commit-graph file and verify its contents against the object
@@ -118,12 +142,6 @@ $ git show-ref -s | git commit-graph write --stdin-commits
 $ git rev-parse HEAD | git commit-graph write --stdin-commits --append
 ------------------------------------------------
 
-* Read basic information from the commit-graph file.
-+
-------------------------------------------------
-$ git commit-graph read
-------------------------------------------------
-
 
 GIT
 ---
diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt
index 4b90b9c12a..2e2c581098 100644
--- a/Documentation/git-commit-tree.txt
+++ b/Documentation/git-commit-tree.txt
@@ -61,14 +61,11 @@ OPTIONS
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
+--no-gpg-sign::
 	GPG-sign commits. The `keyid` argument is optional and
 	defaults to the committer identity; if specified, it must be
-	stuck to the option without a space.
-
---no-gpg-sign::
-	Do not GPG-sign commit, to countermand a `--gpg-sign` option
-	given earlier on the command line.
-
+	stuck to the option without a space. `--no-gpg-sign` is useful to
+	countermand a `--gpg-sign` option given earlier on the command line.
 
 Commit Information
 ------------------
@@ -79,26 +76,6 @@ A commit encapsulates:
 - author name, email and date
 - committer name and email and the commit time.
 
-While parent object ids are provided on the command line, author and
-committer information is taken from the following environment variables,
-if set:
-
-	GIT_AUTHOR_NAME
-	GIT_AUTHOR_EMAIL
-	GIT_AUTHOR_DATE
-	GIT_COMMITTER_NAME
-	GIT_COMMITTER_EMAIL
-	GIT_COMMITTER_DATE
-
-(nb "<", ">" and "\n"s are stripped)
-
-In case (some of) these environment variables are not set, the information
-is taken from the configuration items user.name and user.email, or, if not
-present, the environment variable EMAIL, or, if that is not set,
-system user name and the hostname used for outgoing mail (taken
-from `/etc/mailname` and falling back to the fully qualified hostname when
-that file does not exist).
-
 A commit comment is read from stdin. If a changelog
 entry is not provided via "<" redirection, 'git commit-tree' will just wait
 for one to be entered and terminated with ^D.
@@ -117,6 +94,7 @@ FILES
 SEE ALSO
 --------
 linkgit:git-write-tree[1]
+linkgit:git-commit[1]
 
 GIT
 ---
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index afa7b75a23..95fec5f069 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -9,11 +9,13 @@ SYNOPSIS
 --------
 [verse]
 'git commit' [-a | --interactive | --patch] [-s] [-v] [-u<mode>] [--amend]
-	   [--dry-run] [(-c | -C | --fixup | --squash) <commit>]
+	   [--dry-run] [(-c | -C | --squash) <commit> | --fixup [(amend|reword):]<commit>)]
 	   [-F <file> | -m <msg>] [--reset-author] [--allow-empty]
 	   [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
 	   [--date=<date>] [--cleanup=<mode>] [--[no-]status]
-	   [-i | -o] [-S[<keyid>]] [--] [<file>...]
+	   [-i | -o] [--pathspec-from-file=<file> [--pathspec-file-nul]]
+	   [(--trailer <token>[(=|:)<value>])...] [-S[<keyid>]]
+	   [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
@@ -58,6 +60,7 @@ commit by giving the same set of parameters (options and paths).
 If you make a commit and then find a mistake immediately after
 that, you can recover from it with 'git reset'.
 
+:git-commit: 1
 
 OPTIONS
 -------
@@ -69,7 +72,7 @@ OPTIONS
 
 -p::
 --patch::
-	Use the interactive patch selection interface to chose
+	Use the interactive patch selection interface to choose
 	which changes to commit. See linkgit:git-add[1] for
 	details.
 
@@ -84,11 +87,44 @@ OPTIONS
 	Like '-C', but with `-c` the editor is invoked, so that
 	the user can further edit the commit message.
 
---fixup=<commit>::
-	Construct a commit message for use with `rebase --autosquash`.
-	The commit message will be the subject line from the specified
-	commit with a prefix of "fixup! ".  See linkgit:git-rebase[1]
-	for details.
+--fixup=[(amend|reword):]<commit>::
+	Create a new commit which "fixes up" `<commit>` when applied with
+	`git rebase --autosquash`. Plain `--fixup=<commit>` creates a
+	"fixup!" commit which changes the content of `<commit>` but leaves
+	its log message untouched. `--fixup=amend:<commit>` is similar but
+	creates an "amend!" commit which also replaces the log message of
+	`<commit>` with the log message of the "amend!" commit.
+	`--fixup=reword:<commit>` creates an "amend!" commit which
+	replaces the log message of `<commit>` with its own log message
+	but makes no changes to the content of `<commit>`.
++
+The commit created by plain `--fixup=<commit>` has a subject
+composed of "fixup!" followed by the subject line from <commit>,
+and is recognized specially by `git rebase --autosquash`. The `-m`
+option may be used to supplement the log message of the created
+commit, but the additional commentary will be thrown away once the
+"fixup!" commit is squashed into `<commit>` by
+`git rebase --autosquash`.
++
+The commit created by `--fixup=amend:<commit>` is similar but its
+subject is instead prefixed with "amend!". The log message of
+<commit> is copied into the log message of the "amend!" commit and
+opened in an editor so it can be refined. When `git rebase
+--autosquash` squashes the "amend!" commit into `<commit>`, the
+log message of `<commit>` is replaced by the refined log message
+from the "amend!" commit. It is an error for the "amend!" commit's
+log message to be empty unless `--allow-empty-message` is
+specified.
++
+`--fixup=reword:<commit>` is shorthand for `--fixup=amend:<commit>
+--only`. It creates an "amend!" commit with only a log message
+(ignoring any changes staged in the index). When squashed by `git
+rebase --autosquash`, it replaces the log message of `<commit>`
+without making any other changes.
++
+Neither "fixup!" nor "amend!" commits change authorship of
+`<commit>` when applied by `git rebase --autosquash`.
+See linkgit:git-rebase[1] for details.
 
 --squash=<commit>::
 	Construct a commit message for use with `rebase --autosquash`.
@@ -162,14 +198,18 @@ The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`.
 	message, the commit is aborted.  This has no effect when a message
 	is given by other means, e.g. with the `-m` or `-F` options.
 
--s::
---signoff::
-	Add Signed-off-by line by the committer at the end of the commit
-	log message.  The meaning of a signoff depends on the project,
-	but it typically certifies that committer has
-	the rights to submit this work under the same license and
-	agrees to a Developer Certificate of Origin
-	(see http://developercertificate.org/ for more information).
+include::signoff-option.txt[]
+
+--trailer <token>[(=|:)<value>]::
+	Specify a (<token>, <value>) pair that should be applied as a
+	trailer. (e.g. `git commit --trailer "Signed-off-by:C O Mitter \
+	<committer@example.com>" --trailer "Helped-by:C O Mitter \
+	<committer@example.com>"` will add the "Signed-off-by" trailer
+	and the "Helped-by" trailer to the commit message.)
+	The `trailer.*` configuration variables
+	(linkgit:git-interpret-trailers[1]) can be used to define if
+	a duplicated trailer is omitted, where in the run of trailers
+	each trailer would appear, and other details.
 
 -n::
 --no-verify::
@@ -278,6 +318,19 @@ FROM UPSTREAM REBASE" section in linkgit:git-rebase[1].)
 	already been staged. If used together with `--allow-empty`
 	paths are also not required, and an empty commit will be created.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
+
 -u[<mode>]::
 --untracked-files[=<mode>]::
 	Show untracked files.
@@ -334,26 +387,23 @@ changes to tracked files.
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
+--no-gpg-sign::
 	GPG-sign commits. The `keyid` argument is optional and
 	defaults to the committer identity; if specified, it must be
-	stuck to the option without a space.
-
---no-gpg-sign::
-	Countermand `commit.gpgSign` configuration variable that is
-	set to force each and every commit to be signed.
+	stuck to the option without a space. `--no-gpg-sign` is useful to
+	countermand both `commit.gpgSign` configuration variable, and
+	earlier `--gpg-sign`.
 
 \--::
 	Do not interpret any more arguments as options.
 
-<file>...::
-	When files are given on the command line, the command
-	commits the contents of the named files, without
-	recording the changes already staged.  The contents of
-	these files are also staged for the next commit on top
-	of what have been staged before.
-
-:git-commit: 1
-include::date-formats.txt[]
+<pathspec>...::
+	When pathspec is given on the command line, commit the contents of
+	the files that match the pathspec without recording the changes
+	already added to the index. The contents of these files are also
+	staged for the next commit on top of what have been staged before.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
 
 EXAMPLES
 --------
@@ -448,6 +498,43 @@ alter the order the changes are committed, because the merge
 should be recorded as a single commit.  In fact, the command
 refuses to run when given pathnames (but see `-i` option).
 
+COMMIT INFORMATION
+------------------
+
+Author and committer information is taken from the following environment
+variables, if set:
+
+	GIT_AUTHOR_NAME
+	GIT_AUTHOR_EMAIL
+	GIT_AUTHOR_DATE
+	GIT_COMMITTER_NAME
+	GIT_COMMITTER_EMAIL
+	GIT_COMMITTER_DATE
+
+(nb "<", ">" and "\n"s are stripped)
+
+The author and committer names are by convention some form of a personal name
+(that is, the name by which other humans refer to you), although Git does not
+enforce or require any particular form. Arbitrary Unicode may be used, subject
+to the constraints listed above. This name has no effect on authentication; for
+that, see the `credential.username` variable in linkgit:git-config[1].
+
+In case (some of) these environment variables are not set, the information
+is taken from the configuration items `user.name` and `user.email`, or, if not
+present, the environment variable EMAIL, or, if that is not set,
+system user name and the hostname used for outgoing mail (taken
+from `/etc/mailname` and falling back to the fully qualified hostname when
+that file does not exist).
+
+The `author.name` and `committer.name` and their corresponding email options
+override `user.name` and `user.email` if set and are overridden themselves by
+the environment variables.
+
+The typical usage is to set just the `user.name` and `user.email` variables;
+the other options are provided for more complex use cases.
+
+:git-commit: 1
+include::date-formats.txt[]
 
 DISCUSSION
 ----------
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 899e92a1c9..2dc4bae6da 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -9,18 +9,18 @@ git-config - Get and set repository or global options
 SYNOPSIS
 --------
 [verse]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] name [value [value_regex]]
+'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>] --replace-all name value [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get name [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] --get-all name [value_regex]
-'git config' [<file-option>] [--type=<type>] [--show-origin] [-z|--null] [--name-only] --get-regexp name_regex [value_regex]
+'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>] --unset name [value_regex]
-'git config' [<file-option>] --unset-all name [value_regex]
+'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] [-z|--null] [--name-only] -l | --list
+'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>] -e | --edit
@@ -33,10 +33,13 @@ escaped.
 
 Multiple lines can be added to an option by using the `--add` option.
 If you want to update or unset an option which can occur on multiple
-lines, a POSIX regexp `value_regex` needs to be given.  Only the
-existing values that match the regexp are updated or unset.  If
-you want to handle the lines that do *not* match the regex, just
-prepend a single exclamation mark in front (see also <<EXAMPLES>>).
+lines, a `value-pattern` (which is an extended regular expression,
+unless the `--fixed-value` option is given) needs to be given.  Only the
+existing values that match the pattern are updated or unset.  If
+you want to handle the lines that do *not* match the pattern, just
+prepend a single exclamation mark in front (see also <<EXAMPLES>>),
+but note that this only works when the `--fixed-value` option is not
+in use.
 
 The `--type=<type>` option instructs 'git config' to ensure that incoming and
 outgoing values are canonicalize-able under the given <type>.  If no
@@ -68,16 +71,17 @@ codes are:
 
 On success, the command returns the exit code 0.
 
+[[OPTIONS]]
 OPTIONS
 -------
 
 --replace-all::
 	Default behavior is to replace at most one line. This replaces
-	all lines matching the key (and optionally the value_regex).
+	all lines matching the key (and optionally the `value-pattern`).
 
 --add::
 	Adds a new line to the option without altering any existing
-	values.  This is the same as providing '^$' as the value_regex
+	values.  This is the same as providing '^$' as the `value-pattern`
 	in `--replace-all`.
 
 --get::
@@ -140,7 +144,13 @@ See also <<FILES>>.
 
 -f config-file::
 --file config-file::
-	Use the given config file instead of the one specified by GIT_CONFIG.
+	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::
 	Similar to `--file` but use the given blob instead of a file. E.g.
@@ -165,6 +175,12 @@ See also <<FILES>>.
 --list::
 	List all variables set in config file, along with their values.
 
+--fixed-value::
+	When used with the `value-pattern` argument, treat `value-pattern` as
+	an exact string instead of a regular expression. This will restrict
+	the name/value pairs that are matched to only those where the value
+	is exactly equal to the `value-pattern`.
+
 --type <type>::
   'git config' will ensure that any input or output is valid under the given
   type constraint(s), and will canonicalize outgoing values in `<type>`'s
@@ -222,6 +238,11 @@ Valid `<type>`'s include:
 	the actual origin (config file path, ref, or blob id if
 	applicable).
 
+--show-scope::
+	Similar to `--show-origin` in that it augments the output of
+	all queried config options with the scope of that value
+	(local, global, system, command).
+
 --get-colorbool name [stdout-is-tty]::
 
 	Find the color setting for `name` (e.g. `color.diff`) and output
@@ -311,20 +332,18 @@ 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
+	system-level configuration. See linkgit:git[1] for details.
 
 GIT_CONFIG_NOSYSTEM::
 	Whether to skip reading settings from the system-wide
@@ -332,6 +351,28 @@ GIT_CONFIG_NOSYSTEM::
 
 See also <<FILES>>.
 
+GIT_CONFIG_COUNT::
+GIT_CONFIG_KEY_<n>::
+GIT_CONFIG_VALUE_<n>::
+	If GIT_CONFIG_COUNT is set to a positive number, all environment pairs
+	GIT_CONFIG_KEY_<n> and GIT_CONFIG_VALUE_<n> up to that number will be
+	added to the process's runtime configuration. The config pairs are
+	zero-indexed. Any missing key or value is treated as an error. An empty
+	GIT_CONFIG_COUNT is treated the same as GIT_CONFIG_COUNT=0, namely no
+	pairs are processed. These environment variables will override values
+	in configuration files, but will be overridden by any explicit options
+	passed via `git -c`.
++
+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-store.txt b/Documentation/git-credential-store.txt
index 693dd9d9d7..76b0798856 100644
--- a/Documentation/git-credential-store.txt
+++ b/Documentation/git-credential-store.txt
@@ -94,6 +94,10 @@ stored on its own line as a URL like:
 https://user:pass@example.com
 ------------------------------
 
+No other kinds of lines (e.g. empty lines or comment lines) are
+allowed in the file, even though some may be silently ignored. Do
+not view or edit the file with editors.
+
 When Git needs authentication for a particular URL context,
 credential-store will consider that context a pattern to match against
 each entry in the credentials file.  If the protocol, hostname, and
diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt
index b211440373..206e3c5f40 100644
--- a/Documentation/git-credential.txt
+++ b/Documentation/git-credential.txt
@@ -19,8 +19,7 @@ from system-specific helpers, as well as prompting the user for
 usernames and passwords. The git-credential command exposes this
 interface to scripts which may want to retrieve, store, or prompt for
 credentials in the same manner as Git. The design of this scriptable
-interface models the internal C API; see
-link:technical/api-credentials.html[the Git credential API] for more
+interface models the internal C API; see credential.h for more
 background on the concepts.
 
 git-credential takes an "action" option on the command-line (one of
@@ -104,17 +103,20 @@ INPUT/OUTPUT FORMAT
 `git credential` reads and/or writes (depending on the action used)
 credential information in its standard input/output. This information
 can correspond either to keys for which `git credential` will obtain
-the login/password information (e.g. host, protocol, path), or to the
-actual credential data to be obtained (login/password).
+the login information (e.g. host, protocol, path), or to the actual
+credential data to be obtained (username/password).
 
 The credential is split into a set of named attributes, with one
-attribute per line. Each attribute is
-specified by a key-value pair, separated by an `=` (equals) sign,
-followed by a newline. The key may contain any bytes except `=`,
-newline, or NUL. The value may contain any bytes except newline or NUL.
+attribute per line. Each attribute is specified by a key-value pair,
+separated by an `=` (equals) sign, followed by a newline.
+
+The key may contain any bytes except `=`, newline, or NUL. The value may
+contain any bytes except newline or NUL.
+
 In both cases, all bytes are treated as-is (i.e., there is no quoting,
 and one cannot transmit a value with newline or NUL in it). The list of
 attributes is terminated by a blank line or end-of-file.
+
 Git understands the following attributes:
 
 `protocol`::
@@ -124,7 +126,8 @@ Git understands the following attributes:
 
 `host`::
 
-	The remote hostname for a network credential.
+	The remote hostname for a network credential.  This includes
+	the port number if one was specified (e.g., "example.com:8088").
 
 `path`::
 
@@ -135,7 +138,7 @@ Git understands the following attributes:
 `username`::
 
 	The credential's username, if we already have one (e.g., from a
-	URL, from the user, or from a previously run helper).
+	URL, the configuration, the user, or from a previously run helper).
 
 `password`::
 
@@ -147,8 +150,16 @@ Git understands the following attributes:
 	value is parsed as a URL and treated as if its constituent parts
 	were read (e.g., `url=https://example.com` would behave as if
 	`protocol=https` and `host=example.com` had been provided). This
-	can help callers avoid parsing URLs themselves.  Note that any
-	components which are missing from the URL (e.g., there is no
-	username in the example above) will be set to empty; if you want
-	to provide a URL and override some attributes, provide the URL
-	attribute first, followed by any overrides.
+	can help callers avoid parsing URLs themselves.
++
+Note that specifying a protocol is mandatory and if the URL
+doesn't specify a hostname (e.g., "cert:///path/to/file") the
+credential will contain a hostname attribute whose value is an
+empty string.
++
+Components which are missing from the URL (e.g., there is no
+username in the example above) will be left unset.
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index 79e22b1f3a..f2e4a47ebe 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -24,6 +24,18 @@ Usage:
 [verse]
 'git-cvsserver' [<options>] [pserver|server] [<directory> ...]
 
+DESCRIPTION
+-----------
+
+This application is a CVS emulation layer for Git.
+
+It is highly functional. However, not all methods are implemented,
+and for those methods that are implemented,
+not all switches are implemented.
+
+Testing has been done using both the CLI CVS client, and the Eclipse CVS
+plugin. Most functionality works fine with both of these clients.
+
 OPTIONS
 -------
 
@@ -57,18 +69,6 @@ access still needs to be enabled by the `gitcvs.enabled` config option
 unless `--export-all` was given, too.
 
 
-DESCRIPTION
------------
-
-This application is a CVS emulation layer for Git.
-
-It is highly functional. However, not all methods are implemented,
-and for those methods that are implemented,
-not all switches are implemented.
-
-Testing has been done using both the CLI CVS client, and the Eclipse CVS
-plugin. Most functionality works fine with both of these clients.
-
 LIMITATIONS
 -----------
 
@@ -294,7 +294,7 @@ In `dbDriver` and `dbUser` you can use the following variables:
 	Git directory name
 %g::
 	Git directory name, where all characters except for
-	alpha-numeric ones, `.`, and `-` are replaced with
+	alphanumeric ones, `.`, and `-` are replaced with
 	`_` (this should make it easier to use the directory
 	name in a filename if wanted)
 %m::
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index a88f6ae2c6..c6a79c2a0f 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -63,9 +63,10 @@ OPTIONS
 	Automatically implies --tags.
 
 --abbrev=<n>::
-	Instead of using the default 7 hexadecimal digits as the
-	abbreviated object name, use <n> digits, or as many digits
-	as needed to form a unique object name.  An <n> of 0
+	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 <n> digits, or
+	as many digits as needed to form a unique object name. An <n> of 0
 	will suppress long format, only showing the closest tag.
 
 --candidates=<n>::
@@ -139,8 +140,11 @@ at the end.
 
 The number of additional commits is the number
 of commits which would be displayed by "git log v1.0.4..parent".
-The hash suffix is "-g" + unambiguous abbreviation for the tip commit
-of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`).
+The hash suffix is "-g" + an unambigous abbreviation for the tip commit
+of parent (which was `2414721b194453f058079d897d13c4e377f92dc6`). The
+length of the abbreviation scales as the repository grows, using the
+approximate number of objects in the repository and a bit of math
+around the birthday paradox, and defaults to a minimum of 7.
 The "g" prefix stands for "git" and is used to allow describing the version of
 a software depending on the SCM the software is managed with. This is useful
 in an environment where people may use different SCMs.
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index f4bd8155c0..27acb31cbf 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] [<common diff options>] <tree-ish> [<path>...]
+'git diff-index' [-m] [--cached] [--merge-base] [<common diff options>] <tree-ish> [<path>...]
 
 DESCRIPTION
 -----------
@@ -27,7 +27,12 @@ include::diff-options.txt[]
 	The id of a tree object to diff against.
 
 --cached::
-	do not consider the on-disk file at all
+	Do not consider the on-disk file at all.
+
+--merge-base::
+	Instead of comparing <tree-ish> directly, use the merge base
+	between <tree-ish> and HEAD instead.  <tree-ish> must be a
+	commit.
 
 -m::
 	By default, files recorded in the index but not checked
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 5c8a2a5e97..2fc24c542f 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 --------
 [verse]
 'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty]
-	      [-t] [-r] [-c | --cc] [--combined-all-paths] [--root]
+	      [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base]
 	      [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
 
 DESCRIPTION
@@ -43,6 +43,11 @@ include::diff-options.txt[]
 	When `--root` is specified the initial commit will be shown as a big
 	creation event. This is equivalent to a diff against the NULL tree.
 
+--merge-base::
+	Instead of comparing the <tree-ish>s directly, use the merge
+	base between the two <tree-ish>s as the "before" side.  There
+	must be two <tree-ish>s given and they must both be commits.
+
 --stdin::
 	When `--stdin` is specified, the command does not take
 	<tree-ish> arguments from the command line.  Instead, it
diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt
index 72179d993c..6236c75c9b 100644
--- a/Documentation/git-diff.txt
+++ b/Documentation/git-diff.txt
@@ -10,16 +10,18 @@ SYNOPSIS
 --------
 [verse]
 'git diff' [<options>] [<commit>] [--] [<path>...]
-'git diff' [<options>] --cached [<commit>] [--] [<path>...]
-'git diff' [<options>] <commit> <commit> [--] [<path>...]
+'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]
+'git diff' [<options>] [--merge-base] <commit> [<commit>...] <commit> [--] [<path>...]
+'git diff' [<options>] <commit>...<commit> [--] [<path>...]
 'git diff' [<options>] <blob> <blob>
 'git diff' [<options>] --no-index [--] <path> <path>
 
 DESCRIPTION
 -----------
 Show changes between the working tree and the index or a tree, changes
-between the index and a tree, changes between two trees, changes between
-two blob objects, or changes between two files on disk.
+between the index and a tree, changes between two trees, changes resulting
+from a merge, changes between two blob objects, or changes between two
+files on disk.
 
 'git diff' [<options>] [--] [<path>...]::
 
@@ -36,9 +38,9 @@ two blob objects, or changes between two files on disk.
 	running the command in a working tree controlled by Git and
 	at least one of the paths points outside the working tree,
 	or when running the command outside a working tree
-	controlled by Git.
+	controlled by Git. This form implies `--exit-code`.
 
-'git diff' [<options>] --cached [<commit>] [--] [<path>...]::
+'git diff' [<options>] --cached [--merge-base] [<commit>] [--] [<path>...]::
 
 	This form is to view the changes you staged for the next
 	commit relative to the named <commit>.  Typically you
@@ -47,23 +49,45 @@ two blob objects, or changes between two files on disk.
 	If HEAD does not exist (e.g. unborn branches) and
 	<commit> is not given, it shows all staged changes.
 	--staged is a synonym of --cached.
++
+If --merge-base is given, instead of using <commit>, use the merge base
+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>] <commit> <commit> [--] [<path>...]::
+'git diff' [<options>] [--merge-base] <commit> <commit> [--] [<path>...]::
 
 	This is to view the changes between two arbitrary
 	<commit>.
++
+If --merge-base is given, use the merge base of the two commits for the
+"before" side.  `git diff --merge-base A B` is equivalent to
+`git diff $(git merge-base A B) B`.
+
+'git diff' [<options>] <commit> <commit>... <commit> [--] [<path>...]::
+
+	This form is to view the results of a merge commit.  The first
+	listed <commit> must be the merge itself; the remaining two or
+	more commits should be its parents.  A convenient way to produce
+	the desired set of revisions is to use the `^@` suffix.
+	For instance, if `master` names a merge commit, `git diff master
+	master^@` gives the same combined diff as `git show master`.
 
 'git diff' [<options>] <commit>..<commit> [--] [<path>...]::
 
-	This is synonymous to the previous form.  If <commit> on
+	This is synonymous to the earlier form (without the `..`) for
+	viewing the changes between two arbitrary <commit>.  If <commit> on
 	one side is omitted, it will have the same effect as
 	using HEAD instead.
 
@@ -71,20 +95,20 @@ two blob objects, or changes between two files on disk.
 
 	This form is to view the changes on the branch containing
 	and up to the second <commit>, starting at a common ancestor
-	of both <commit>.  "git diff A\...B" is equivalent to
-	"git diff $(git merge-base A B) B".  You can omit any one
+	of both <commit>.  `git diff A...B` is equivalent to
+	`git diff $(git merge-base A B) B`.  You can omit any one
 	of <commit>, which has the same effect as using HEAD instead.
 
 Just in case you are doing something exotic, it should be
 noted that all of the <commit> in the above description, except
-in the last two forms that use ".." notations, can be any
-<tree>.
+in the `--merge-base` case and in the last two forms that use `..`
+notations, can be any <tree>.
 
 For a more complete list of ways to spell <commit>, see
 "SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].
 However, "diff" is about comparing two _endpoints_, not ranges,
-and the range notations ("<commit>..<commit>" and
-"<commit>\...<commit>") do not mean a range as defined in the
+and the range notations (`<commit>..<commit>` and
+`<commit>...<commit>`) do not mean a range as defined in the
 "SPECIFYING RANGES" section in linkgit:gitrevisions[7].
 
 'git diff' [<options>] <blob> <blob>::
@@ -132,9 +156,9 @@ $ git diff HEAD       <3>
 +
 <1> Changes in the working tree not yet staged for the next commit.
 <2> Changes between the index and your last commit; what you
-    would be committing if you run "git commit" without "-a" option.
+    would be committing if you run `git commit` without `-a` option.
 <3> Changes in the working tree since your last commit; what you
-    would be committing if you run "git commit -a"
+    would be committing if you run `git commit -a`
 
 Comparing with arbitrary commits::
 +
@@ -196,7 +220,8 @@ linkgit:git-difftool[1],
 linkgit:git-log[1],
 linkgit:gitdiffcore[7],
 linkgit:git-format-patch[1],
-linkgit:git-apply[1]
+linkgit:git-apply[1],
+linkgit:git-show[1]
 
 GIT
 ---
diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt
index 484c485fd0..143b0c49d7 100644
--- a/Documentation/git-difftool.txt
+++ b/Documentation/git-difftool.txt
@@ -34,6 +34,14 @@ OPTIONS
 	This is the default behaviour; the option is provided to
 	override any configuration settings.
 
+--rotate-to=<file>::
+	Start showing the diff for the given path,
+	the paths before it will move to end and output.
+
+--skip-to=<file>::
+	Start showing the diff for the given path, skipping all
+	the paths before it.
+
 -t <tool>::
 --tool=<tool>::
 	Use the diff tool specified by <tool>.  Valid values include
diff --git a/Documentation/git-fast-export.txt b/Documentation/git-fast-export.txt
index 37634bffd1..1978dbdc6a 100644
--- a/Documentation/git-fast-export.txt
+++ b/Documentation/git-fast-export.txt
@@ -119,6 +119,11 @@ by keeping the marks the same across runs.
 	the shape of the history and stored tree.  See the section on
 	`ANONYMIZING` below.
 
+--anonymize-map=<from>[:<to>]::
+	Convert token `<from>` to `<to>` in the anonymized output. If
+	`<to>` is omitted, map `<from>` to itself (i.e., do not
+	anonymize it). See the section on `ANONYMIZING` below.
+
 --reference-excluded-parents::
 	By default, running a command such as `git fast-export
 	master~5..master` will not include the commit master{tilde}5
@@ -142,7 +147,7 @@ by keeping the marks the same across runs.
 	Specify how to handle `encoding` header in commit objects.  When
 	asking to 'abort' (which is the default), this program will die
 	when encountering such a commit object.  With 'yes', the commit
-	message will be reencoded into UTF-8.  With 'no', the original
+	message will be re-encoded into UTF-8.  With 'no', the original
 	encoding will be preserved.
 
 --refspec::
@@ -238,6 +243,30 @@ collapse "User 0", "User 1", etc into "User X"). This produces a much
 smaller output, and it is usually easy to quickly confirm that there is
 no private data in the stream.
 
+Reproducing some bugs may require referencing particular commits or
+paths, which becomes challenging after refnames and paths have been
+anonymized. You can ask for a particular token to be left as-is or
+mapped to a new value. For example, if you have a bug which reproduces
+with `git rev-list sensitive -- secret.c`, you can run:
+
+---------------------------------------------------
+$ git fast-export --anonymize --all \
+      --anonymize-map=sensitive:foo \
+      --anonymize-map=secret.c:bar.c \
+      >stream
+---------------------------------------------------
+
+After importing the stream, you can then run `git rev-list foo -- bar.c`
+in the anonymized repository.
+
+Note that paths and refnames are split into tokens at slash boundaries.
+The command above would anonymize `subdir/secret.c` as something like
+`path123/bar.c`; you could then search for `bar.c` in the anonymized
+repository to determine the final pathname.
+
+To make referencing the final pathname simpler, you can map each path
+component; so if you also anonymize `subdir` to `publicdir`, then the
+final pathname would be `publicdir/bar.c`.
 
 LIMITATIONS
 -----------
diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt
index a3f1e0c5e4..39cfa05b28 100644
--- a/Documentation/git-fast-import.txt
+++ b/Documentation/git-fast-import.txt
@@ -51,6 +51,21 @@ OPTIONS
 	memory used by fast-import during this run.  Showing this output
 	is currently the default, but can be disabled with --quiet.
 
+--allow-unsafe-features::
+	Many command-line options can be provided as part of the
+	fast-import stream itself by using the `feature` or `option`
+	commands. However, some of these options are unsafe (e.g.,
+	allowing fast-import to access the filesystem outside of the
+	repository). These options are disabled by default, but can be
+	allowed by providing this option on the command line.  This
+	currently impacts only the `export-marks`, `import-marks`, and
+	`import-marks-if-exists` feature commands.
++
+	Only enable this option if you trust the program generating the
+	fast-import stream! This option is enabled automatically for
+	remote-helpers that use the `import` capability, as they are
+	already trusted to run their own code.
+
 Options for Frontends
 ~~~~~~~~~~~~~~~~~~~~~
 
@@ -107,6 +122,26 @@ Locations of Marks Files
 Relative and non-relative marks may be combined by interweaving
 --(no-)-relative-marks with the --(import|export)-marks= options.
 
+Submodule Rewriting
+~~~~~~~~~~~~~~~~~~~
+
+--rewrite-submodules-from=<name>:<file>::
+--rewrite-submodules-to=<name>:<file>::
+  Rewrite the object IDs for the submodule specified by <name> from the values
+	used in the from <file> to those used in the to <file>. The from marks should
+	have been created by `git fast-export`, and the to marks should have been
+	created by `git fast-import` when importing that same submodule.
++
+<name> may be any arbitrary string not containing a colon character, but the
+same value must be used with both options when specifying corresponding marks.
+Multiple submodules may be specified with different values for <name>. It is an
+error not to use these options in corresponding pairs.
++
+These options are primarily useful when converting a repository from one hash
+algorithm to another; without them, fast-import will fail if it encounters a
+submodule because it has no way of writing the object ID into the new hash
+algorithm.
+
 Performance and Compression Tuning
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -258,7 +293,14 @@ by users who are located in the same location and time zone.  In this
 case a reasonable offset from UTC could be assumed.
 +
 Unlike the `rfc2822` format, this format is very strict.  Any
-variation in formatting will cause fast-import to reject the value.
+variation in formatting will cause fast-import to reject the value,
+and some sanity checks on the numeric values may also be performed.
+
+`raw-permissive`::
+	This is the same as `raw` except that no sanity checks on
+	the numeric epoch and local offset are performed.  This can
+	be useful when trying to filter or import an existing history
+	with e.g. bogus timezone values.
 
 `rfc2822`::
 	This is the standard email format as described by RFC 2822.
@@ -772,7 +814,7 @@ may have uses for this information
 	'original-oid' SP <object-identifier> LF
 ....
 
-where `<object-identifer>` is any string not containing LF.
+where `<object-identifier>` is any string not containing LF.
 
 `tag`
 ~~~~~
diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt
index 5b1909fdf4..550c16ca61 100644
--- a/Documentation/git-fetch.txt
+++ b/Documentation/git-fetch.txt
@@ -48,6 +48,10 @@ include::fetch-options.txt[]
 
 include::pull-fetch-param.txt[]
 
+--stdin::
+	Read refspecs, one per line, from stdin in addition to those provided
+	as arguments. The "tag <name>" format is not supported.
+
 include::urls-remotes.txt[]
 
 
@@ -129,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).
 
@@ -255,14 +259,14 @@ refspec.
 * Using refspecs explicitly:
 +
 ------------------------------------------------
-$ git fetch origin +pu:pu maint:tmp
+$ git fetch origin +seen:seen maint:tmp
 ------------------------------------------------
 +
-This updates (or creates, as necessary) branches `pu` and `tmp` in
+This updates (or creates, as necessary) branches `seen` and `tmp` in
 the local repository by fetching from the branches (respectively)
-`pu` and `maint` from the remote repository.
+`seen` and `maint` from the remote repository.
 +
-The `pu` branch will be updated even if it does not fast-forward,
+The `seen` branch will be updated even if it does not fast-forward,
 because it is prefixed with a plus sign; `tmp` will not be.
 
 * Peek at a remote's branch, without configuring the remote in your local
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 5876598852..62e482a95e 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -466,13 +466,13 @@ The performance of git-filter-branch is glacially slow; its design makes it
 impossible for a backward-compatible implementation to ever be fast:
 
 * In editing files, git-filter-branch by design checks out each and
-every commit as it existed in the original repo.  If your repo has 10\^5
-files and 10\^5 commits, but each commit only modifies 5 files, then
-git-filter-branch will make you do 10\^10 modifications, despite only
-having (at most) 5*10^5 unique blobs.
+  every commit as it existed in the original repo.  If your repo has
+  `10^5` files and `10^5` commits, but each commit only modifies five
+  files, then git-filter-branch will make you do `10^10` modifications,
+  despite only having (at most) `5*10^5` unique blobs.
 
 * If you try and cheat and try to make git-filter-branch only work on
-files modified in a commit, then two things happen
+  files modified in a commit, then two things happen
 
   ** you run into problems with deletions whenever the user is simply
      trying to rename files (because attempting to delete files that
@@ -481,39 +481,41 @@ files modified in a commit, then two things happen
      user-provided shell)
 
   ** even if you succeed at the map-deletes-for-renames chicanery, you
-     still technically violate backward compatibility because users are
-     allowed to filter files in ways that depend upon topology of
-     commits instead of filtering solely based on file contents or names
-     (though this has not been observed in the wild).
+     still technically violate backward compatibility because users
+     are allowed to filter files in ways that depend upon topology of
+     commits instead of filtering solely based on file contents or
+     names (though this has not been observed in the wild).
 
 * Even if you don't need to edit files but only want to e.g. rename or
-remove some and thus can avoid checking out each file (i.e. you can use
---index-filter), you still are passing shell snippets for your filters.
-This means that for every commit, you have to have a prepared git repo
-where those filters can be run.  That's a significant setup.
-
-* Further, several additional files are created or updated per commit by
-git-filter-branch.  Some of these are for supporting the convenience
-functions provided by git-filter-branch (such as map()), while others
-are for keeping track of internal state (but could have also been
-accessed by user filters; one of git-filter-branch's regression tests
-does so).  This essentially amounts to using the filesystem as an IPC
-mechanism between git-filter-branch and the user-provided filters.
-Disks tend to be a slow IPC mechanism, and writing these files also
-effectively represents a forced synchronization point between separate
-processes that we hit with every commit.
+  remove some and thus can avoid checking out each file (i.e. you can
+  use --index-filter), you still are passing shell snippets for your
+  filters.  This means that for every commit, you have to have a
+  prepared git repo where those filters can be run.  That's a
+  significant setup.
+
+* Further, several additional files are created or updated per commit
+  by git-filter-branch.  Some of these are for supporting the
+  convenience functions provided by git-filter-branch (such as map()),
+  while others are for keeping track of internal state (but could have
+  also been accessed by user filters; one of git-filter-branch's
+  regression tests does so).  This essentially amounts to using the
+  filesystem as an IPC mechanism between git-filter-branch and the
+  user-provided filters.  Disks tend to be a slow IPC mechanism, and
+  writing these files also effectively represents a forced
+  synchronization point between separate processes that we hit with
+  every commit.
 
 * The user-provided shell commands will likely involve a pipeline of
-commands, resulting in the creation of many processes per commit.
-Creating and running another process takes a widely varying amount of
-time between operating systems, but on any platform it is very slow
-relative to invoking a function.
+  commands, resulting in the creation of many processes per commit.
+  Creating and running another process takes a widely varying amount
+  of time between operating systems, but on any platform it is very
+  slow relative to invoking a function.
 
 * git-filter-branch itself is written in shell, which is kind of slow.
-This is the one performance issue that could be backward-compatibly
-fixed, but compared to the above problems that are intrinsic to the
-design of git-filter-branch, the language of the tool itself is a
-relatively minor issue.
+  This is the one performance issue that could be backward-compatibly
+  fixed, but compared to the above problems that are intrinsic to the
+  design of git-filter-branch, the language of the tool itself is a
+  relatively minor issue.
 
   ** Side note: Unfortunately, people tend to fixate on the
      written-in-shell aspect and periodically ask if git-filter-branch
@@ -530,11 +532,11 @@ The https://github.com/newren/git-filter-repo/[git filter-repo] tool is
 an alternative to git-filter-branch which does not suffer from these
 performance problems or the safety problems (mentioned below). For those
 with existing tooling which relies upon git-filter-branch, 'git
-repo-filter' also provides
+filter-repo' also provides
 https://github.com/newren/git-filter-repo/blob/master/contrib/filter-repo-demos/filter-lamely[filter-lamely],
 a drop-in git-filter-branch replacement (with a few caveats).  While
 filter-lamely suffers from all the same safety issues as
-git-filter-branch, it at least ameloriates the performance issues a
+git-filter-branch, it at least ameliorates the performance issues a
 little.
 
 [[SAFETY]]
@@ -546,51 +548,55 @@ easily corrupt repos or end up with a mess worse than what you started
 with:
 
 * Someone can have a set of "working and tested filters" which they
-document or provide to a coworker, who then runs them on a different OS
-where the same commands are not working/tested (some examples in the
-git-filter-branch manpage are also affected by this).  BSD vs. GNU
-userland differences can really bite.  If lucky, error messages are
-spewed.  But just as likely, the commands either don't do the filtering
-requested, or silently corrupt by making some unwanted change.  The
-unwanted change may only affect a few commits, so it's not necessarily
-obvious either.  (The fact that problems won't necessarily be obvious
-means they are likely to go unnoticed until the rewritten history is in
-use for quite a while, at which point it's really hard to justify
-another flag-day for another rewrite.)
+  document or provide to a coworker, who then runs them on a different
+  OS where the same commands are not working/tested (some examples in
+  the git-filter-branch manpage are also affected by this).
+  BSD vs. GNU userland differences can really bite.  If lucky, error
+  messages are spewed.  But just as likely, the commands either don't
+  do the filtering requested, or silently corrupt by making some
+  unwanted change.  The unwanted change may only affect a few commits,
+  so it's not necessarily obvious either.  (The fact that problems
+  won't necessarily be obvious means they are likely to go unnoticed
+  until the rewritten history is in use for quite a while, at which
+  point it's really hard to justify another flag-day for another
+  rewrite.)
 
 * Filenames with spaces are often mishandled by shell snippets since
-they cause problems for shell pipelines.  Not everyone is familiar with
-find -print0, xargs -0, git-ls-files -z, etc.  Even people who are
-familiar with these may assume such flags are not relevant because
-someone else renamed any such files in their repo back before the person
-doing the filtering joined the project.  And often, even those familiar
-with handling arguments with spaces may not do so just because they
-aren't in the mindset of thinking about everything that could possibly
-go wrong.
-
-* Non-ascii filenames can be silently removed despite being in a desired
-directory.  Keeping only wanted paths is often done using pipelines like
-`git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`.  ls-files will
-only quote filenames if needed, so folks may not notice that one of the
-files didn't match the regex (at least not until it's much too late).
-Yes, someone who knows about core.quotePath can avoid this (unless they
-have other special characters like \t, \n, or "), and people who use
-ls-files -z with something other than grep can avoid this, but that
-doesn't mean they will.
-
-* Similarly, when moving files around, one can find that filenames with
-non-ascii or special characters end up in a different directory, one
-that includes a double quote character.  (This is technically the same
-issue as above with quoting, but perhaps an interesting different way
-that it can and has manifested as a problem.)
+  they cause problems for shell pipelines.  Not everyone is familiar
+  with find -print0, xargs -0, git-ls-files -z, etc.  Even people who
+  are familiar with these may assume such flags are not relevant
+  because someone else renamed any such files in their repo back
+  before the person doing the filtering joined the project.  And
+  often, even those familiar with handling arguments with spaces may
+  not do so just because they aren't in the mindset of thinking about
+  everything that could possibly go wrong.
+
+* Non-ascii filenames can be silently removed despite being in a
+  desired directory.  Keeping only wanted paths is often done using
+  pipelines like `git ls-files | grep -v ^WANTED_DIR/ | xargs git rm`.
+  ls-files will only quote filenames if needed, so folks may not
+  notice that one of the files didn't match the regex (at least not
+  until it's much too late).  Yes, someone who knows about
+  core.quotePath can avoid this (unless they have other special
+  characters like \t, \n, or "), and people who use ls-files -z with
+  something other than grep can avoid this, but that doesn't mean they
+  will.
+
+* Similarly, when moving files around, one can find that filenames
+  with non-ascii or special characters end up in a different
+  directory, one that includes a double quote character.  (This is
+  technically the same issue as above with quoting, but perhaps an
+  interesting different way that it can and has manifested as a
+  problem.)
 
 * It's far too easy to accidentally mix up old and new history.  It's
-still possible with any tool, but git-filter-branch almost invites it.
-If lucky, the only downside is users getting frustrated that they don't
-know how to shrink their repo and remove the old stuff.  If unlucky,
-they merge old and new history and end up with multiple "copies" of each
-commit, some of which have unwanted or sensitive files and others which
-don't.  This comes about in multiple different ways:
+  still possible with any tool, but git-filter-branch almost
+  invites it.  If lucky, the only downside is users getting frustrated
+  that they don't know how to shrink their repo and remove the old
+  stuff.  If unlucky, they merge old and new history and end up with
+  multiple "copies" of each commit, some of which have unwanted or
+  sensitive files and others which don't.  This comes about in
+  multiple different ways:
 
   ** the default to only doing a partial history rewrite ('--all' is not
      the default and few examples show it)
@@ -609,8 +615,8 @@ don't.  This comes about in multiple different ways:
      "DISCUSSION" section of the git filter-repo manual page for more
      details.
 
-* Annotated tags can be accidentally converted to lightweight tags, due
-to either of two issues:
+* Annotated tags can be accidentally converted to lightweight tags,
+  due to either of two issues:
 
   ** Someone can do a history rewrite, realize they messed up, restore
      from the backups in refs/original/, and then redo their
@@ -623,71 +629,74 @@ to either of two issues:
      restored from refs/original/ in a previously botched rewrite).
 
 * Any commit messages that specify an encoding will become corrupted
-by the rewrite; git-filter-branch ignores the encoding, takes the original
-bytes, and feeds it to commit-tree without telling it the proper
-encoding.  (This happens whether or not --msg-filter is used.)
+  by the rewrite; git-filter-branch ignores the encoding, takes the
+  original bytes, and feeds it to commit-tree without telling it the
+  proper encoding.  (This happens whether or not --msg-filter is
+  used.)
 
 * Commit messages (even if they are all UTF-8) by default become
-corrupted due to not being updated -- any references to other commit
-hashes in commit messages will now refer to no-longer-extant commits.
-
-* There are no facilities for helping users find what unwanted crud they
-should delete, which means they are much more likely to have incomplete
-or partial cleanups that sometimes result in confusion and people
-wasting time trying to understand.  (For example, folks tend to just
-look for big files to delete instead of big directories or extensions,
-and once they do so, then sometime later folks using the new repository
-who are going through history will notice a build artifact directory
-that has some files but not others, or a cache of dependencies
-(node_modules or similar) which couldn't have ever been functional since
-it's missing some files.)
+  corrupted due to not being updated -- any references to other commit
+  hashes in commit messages will now refer to no-longer-extant
+  commits.
+
+* There are no facilities for helping users find what unwanted crud
+  they should delete, which means they are much more likely to have
+  incomplete or partial cleanups that sometimes result in confusion
+  and people wasting time trying to understand.  (For example, folks
+  tend to just look for big files to delete instead of big directories
+  or extensions, and once they do so, then sometime later folks using
+  the new repository who are going through history will notice a build
+  artifact directory that has some files but not others, or a cache of
+  dependencies (node_modules or similar) which couldn't have ever been
+  functional since it's missing some files.)
 
 * If --prune-empty isn't specified, then the filtering process can
-create hoards of confusing empty commits
+  create hoards of confusing empty commits
 
 * If --prune-empty is specified, then intentionally placed empty
-commits from before the filtering operation are also pruned instead of
-just pruning commits that became empty due to filtering rules.
+  commits from before the filtering operation are also pruned instead
+  of just pruning commits that became empty due to filtering rules.
 
-* If --prune empty is specified, sometimes empty commits are missed
-and left around anyway (a somewhat rare bug, but it happens...)
+* If --prune-empty is specified, sometimes empty commits are missed
+  and left around anyway (a somewhat rare bug, but it happens...)
 
 * A minor issue, but users who have a goal to update all names and
-emails in a repository may be led to --env-filter which will only update
-authors and committers, missing taggers.
+  emails in a repository may be led to --env-filter which will only
+  update authors and committers, missing taggers.
 
 * If the user provides a --tag-name-filter that maps multiple tags to
-the same name, no warning or error is provided; git-filter-branch simply
-overwrites each tag in some undocumented pre-defined order resulting in
-only one tag at the end.  (A git-filter-branch regression test requires
-this surprising behavior.)
+  the same name, no warning or error is provided; git-filter-branch
+  simply overwrites each tag in some undocumented pre-defined order
+  resulting in only one tag at the end.  (A git-filter-branch
+  regression test requires this surprising behavior.)
 
 Also, the poor performance of git-filter-branch often leads to safety
 issues:
 
-* Coming up with the correct shell snippet to do the filtering you want
-is sometimes difficult unless you're just doing a trivial modification
-such as deleting a couple files.  Unfortunately, people often learn if
-the snippet is right or wrong by trying it out, but the rightness or
-wrongness can vary depending on special circumstances (spaces in
-filenames, non-ascii filenames, funny author names or emails, invalid
-timezones, presence of grafts or replace objects, etc.), meaning they
-may have to wait a long time, hit an error, then restart.  The
-performance of git-filter-branch is so bad that this cycle is painful,
-reducing the time available to carefully re-check (to say nothing about
-what it does to the patience of the person doing the rewrite even if
-they do technically have more time available).  This problem is extra
-compounded because errors from broken filters may not be shown for a
-long time and/or get lost in a sea of output.  Even worse, broken
-filters often just result in silent incorrect rewrites.
-
-* To top it all off, even when users finally find working commands, they
-naturally want to share them.  But they may be unaware that their repo
-didn't have some special cases that someone else's does.  So, when
-someone else with a different repository runs the same commands, they
-get hit by the problems above.  Or, the user just runs commands that
-really were vetted for special cases, but they run it on a different OS
-where it doesn't work, as noted above.
+* Coming up with the correct shell snippet to do the filtering you
+  want is sometimes difficult unless you're just doing a trivial
+  modification such as deleting a couple files.  Unfortunately, people
+  often learn if the snippet is right or wrong by trying it out, but
+  the rightness or wrongness can vary depending on special
+  circumstances (spaces in filenames, non-ascii filenames, funny
+  author names or emails, invalid timezones, presence of grafts or
+  replace objects, etc.), meaning they may have to wait a long time,
+  hit an error, then restart.  The performance of git-filter-branch is
+  so bad that this cycle is painful, reducing the time available to
+  carefully re-check (to say nothing about what it does to the
+  patience of the person doing the rewrite even if they do technically
+  have more time available).  This problem is extra compounded because
+  errors from broken filters may not be shown for a long time and/or
+  get lost in a sea of output.  Even worse, broken filters often just
+  result in silent incorrect rewrites.
+
+* To top it all off, even when users finally find working commands,
+  they naturally want to share them.  But they may be unaware that
+  their repo didn't have some special cases that someone else's does.
+  So, when someone else with a different repository runs the same
+  commands, they get hit by the problems above.  Or, the user just
+  runs commands that really were vetted for special cases, but they
+  run it on a different OS where it doesn't work, as noted above.
 
 GIT
 ---
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index 6dcd39f6f6..6da899c629 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 'git for-each-ref' [--count=<count>] [--shell|--perl|--python|--tcl]
 		   [(--sort=<key>)...] [--format=<format>] [<pattern>...]
 		   [--points-at=<object>]
-		   (--merged[=<object>] | --no-merged[=<object>])
+		   [--merged[=<object>]] [--no-merged[=<object>]]
 		   [--contains[=<object>]] [--no-contains[=<object>]]
 
 DESCRIPTION
@@ -76,13 +76,11 @@ OPTIONS
 
 --merged[=<object>]::
 	Only list refs whose tips are reachable from the
-	specified commit (HEAD if not specified),
-	incompatible with `--no-merged`.
+	specified commit (HEAD if not specified).
 
 --no-merged[=<object>]::
 	Only list refs whose tips are not reachable from the
-	specified commit (HEAD if not specified),
-	incompatible with `--merged`.
+	specified commit (HEAD if not specified).
 
 --contains[=<object>]::
 	Only list refs which contain the specified commit (HEAD if not
@@ -222,6 +220,8 @@ worktreepath::
 In addition to the above, for commit and tag objects, the header
 field names (`tree`, `parent`, `object`, `type`, and `tag`) can
 be used to specify the value in the header field.
+Fields `tree` and `parent` can also be used with modifier `:short` and
+`:short=<length>` just like `objectname`.
 
 For commit and tag objects, the special `creatordate` and `creator`
 fields will correspond to the appropriate date or name-email-date tuple
@@ -230,20 +230,48 @@ These are intended for working on a mix of annotated and lightweight tags.
 
 Fields that have name-email-date tuple as its value (`author`,
 `committer`, and `tagger`) can be suffixed with `name`, `email`,
-and `date` to extract the named component.
-
-The complete message in a commit and tag object is `contents`.
-Its first line is `contents:subject`, where subject is the concatenation
-of all lines of the commit message up to the first blank line.  The next
-line is `contents:body`, where body is all of the lines after the first
-blank line.  The optional GPG signature is `contents:signature`.  The
-first `N` lines of the message is obtained using `contents:lines=N`.
+and `date` to extract the named component.  For email fields (`authoremail`,
+`committeremail` and `taggeremail`), `:trim` can be appended to get the email
+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:
+
+contents:size::
+	The size in bytes of the commit or tag message.
+
+contents:subject::
+	The first paragraph of the message, which typically is a
+	single line, is taken as the "subject" of the commit or the
+	tag message.
+	Instead of `contents:subject`, field `subject` can also be used to
+	obtain same results. `:sanitize` can be appended to `subject` for
+	subject line suitable for filename.
+
+contents:body::
+	The remainder of the commit or the tag message that follows
+	the "subject".
+
+contents:signature::
+	The optional GPG signature of the tag.
+
+contents:lines=N::
+	The first `N` lines of the message.
+
 Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1]
-are obtained as `trailers` (or by using the historical alias
-`contents:trailers`).  Non-trailer lines from the trailer block can be omitted
-with `trailers:only`. Whitespace-continuations can be removed from trailers so
-that each trailer appears on a line by itself with its full content with
-`trailers:unfold`. Both can be used together as `trailers:unfold,only`.
+are obtained as `trailers[:options]` (or by using the historical alias
+`contents:trailers[:options]`). For valid [:option] values see `trailers`
+section of linkgit:git-log[1].
 
 For sorting purposes, fields with numeric values sort in numeric order
 (`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`).
@@ -385,6 +413,11 @@ Note also that multiple copies of an object may be present in the object
 database; in this case, it is undefined which copy's size or delta base
 will be reported.
 
+NOTES
+-----
+
+include::ref-reachability-filters.txt[]
+
 SEE ALSO
 --------
 linkgit:git-show-ref[1]
diff --git a/Documentation/git-for-each-repo.txt b/Documentation/git-for-each-repo.txt
new file mode 100644
index 0000000000..94bd19da26
--- /dev/null
+++ b/Documentation/git-for-each-repo.txt
@@ -0,0 +1,59 @@
+git-for-each-repo(1)
+====================
+
+NAME
+----
+git-for-each-repo - Run a Git command on a list of repositories
+
+
+SYNOPSIS
+--------
+[verse]
+'git for-each-repo' --config=<config> [--] <arguments>
+
+
+DESCRIPTION
+-----------
+Run a Git command on a list of repositories. The arguments after the
+known options or `--` indicator are used as the arguments for the Git
+subprocess.
+
+THIS COMMAND IS EXPERIMENTAL. THE BEHAVIOR MAY CHANGE.
+
+For example, we could run maintenance on each of a list of repositories
+stored in a `maintenance.repo` config variable using
+
+-------------
+git for-each-repo --config=maintenance.repo maintenance run
+-------------
+
+This will run `git -C <repo> maintenance run` for each value `<repo>`
+in the multi-valued config variable `maintenance.repo`.
+
+
+OPTIONS
+-------
+--config=<config>::
+	Use the given config variable as a multi-valued list storing
+	absolute path names. Iterate on that list of paths to run
+	the given arguments.
++
+These config values are loaded from system, global, and local Git config,
+as available. If `git for-each-repo` is run in a directory that is not a
+Git repository, then only the system and global config is used.
+
+
+SUBPROCESS BEHAVIOR
+-------------------
+
+If any `git -C <repo> <arguments>` subprocess returns a non-zero exit code,
+then the `git for-each-repo` process returns that exit code without running
+more subprocesses.
+
+Each `git -C <repo> <arguments>` subprocess inherits the standard file
+descriptors `stdin`, `stdout`, and `stderr`.
+
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 2035d4d5d5..fe2f69d36e 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -19,13 +19,16 @@ SYNOPSIS
 		   [--start-number <n>] [--numbered-files]
 		   [--in-reply-to=<message id>] [--suffix=.<sfx>]
 		   [--ignore-if-in-upstream]
+		   [--cover-from-description=<mode>]
 		   [--rfc] [--subject-prefix=<subject prefix>]
 		   [(--reroll-count|-v) <n>]
 		   [--to=<email>] [--cc=<email>]
 		   [--[no-]cover-letter] [--quiet]
+		   [--[no-]encode-email-headers]
 		   [--no-notes | --notes[=<ref>]]
 		   [--interdiff=<previous>]
 		   [--range-diff=<previous> [--creation-factor=<percent>]]
+		   [--filename-max-length=<n>]
 		   [--progress]
 		   [<common diff options>]
 		   [ <since> | <revision range> ]
@@ -33,11 +36,28 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-Prepare each commit with its patch in
-one file per commit, formatted to resemble UNIX mailbox format.
+Prepare each non-merge commit with its "patch" in
+one "message" per commit, formatted to resemble a UNIX mailbox.
 The output of this command is convenient for e-mail submission or
 for use with 'git am'.
 
+A "message" generated by the command consists of three parts:
+
+* A brief metadata header that begins with `From <commit>`
+  with a fixed `Mon Sep 17 00:00:00 2001` datestamp to help programs
+  like "file(1)" to recognize that the file is an output from this
+  command, fields that record the author identity, the author date,
+  and the title of the change (taken from the first paragraph of the
+  commit log message).
+
+* The second and subsequent paragraphs of the commit log message.
+
+* The "patch", which is the "diff -p --stat" output (see
+  linkgit:git-diff[1]) between the commit and its parent.
+
+The log message and the patch is separated by a line with a
+three-dash line.
+
 There are two ways to specify which commits to operate on.
 
 1. A single commit, <since>, specifies that the commits leading
@@ -117,7 +137,7 @@ include::diff-options.txt[]
 
 -s::
 --signoff::
-	Add `Signed-off-by:` line to the commit message, using
+	Add a `Signed-off-by` trailer to the commit message, using
 	the committer identity of yourself.
 	See the signoff option in linkgit:git-commit[1] for more information.
 
@@ -172,12 +192,39 @@ will want to ensure that threading is disabled for `git send-email`.
 	patches being generated, and any patch that matches is
 	ignored.
 
+--cover-from-description=<mode>::
+	Controls which parts of the cover letter will be automatically
+	populated using the branch's description.
++
+If `<mode>` is `message` or `default`, the cover letter subject will be
+populated with placeholder text. The body of the cover letter will be
+populated with the branch's description. This is the default mode when
+no configuration nor command line option is specified.
++
+If `<mode>` is `subject`, the first paragraph of the branch description will
+populate the cover letter subject. The remainder of the description will
+populate the body of the cover letter.
++
+If `<mode>` is `auto`, if the first paragraph of the branch description
+is greater than 100 bytes, then the mode will be `message`, otherwise
+`subject` will be used.
++
+If `<mode>` is `none`, both the cover letter subject and body will be
+populated with placeholder text.
+
 --subject-prefix=<subject prefix>::
 	Instead of the standard '[PATCH]' prefix in the subject
 	line, instead use '[<subject prefix>]'. This
 	allows for useful naming of a patch series, and can be
 	combined with the `--numbered` option.
 
+--filename-max-length=<n>::
+	Instead of the standard 64 bytes, chomp the generated output
+	filenames at around '<n>' bytes (too short a value will be
+	silently raised to a reasonable length).  Defaults to the
+	value of the `format.filenameMaxLength` configuration
+	variable, or 64 if unconfigured.
+
 --rfc::
 	Alias for `--subject-prefix="RFC PATCH"`. RFC means "Request For
 	Comments"; use this when sending an experimental patch for
@@ -191,6 +238,11 @@ will want to ensure that threading is disabled for `git send-email`.
 	`--subject-prefix` option) has ` v<n>` appended to it.  E.g.
 	`--reroll-count=4` may produce `v4-0001-add-makefile.patch`
 	file that has "Subject: [PATCH v4 1/20] Add makefile" in it.
+	`<n>` does not have to be an integer (e.g. "--reroll-count=4.4",
+	or "--reroll-count=4rev2" are allowed), but the downside of
+	using such a reroll-count is that the range-diff/interdiff
+	with the previous version does not state exactly which
+	version the new interation is compared against.
 
 --to=<email>::
 	Add a `To:` header to the email headers. This is in addition
@@ -232,6 +284,13 @@ feeding the result to `git send-email`.
 	containing the branch description, shortlog and the overall diffstat.  You can
 	fill in a description in the file before sending it out.
 
+--encode-email-headers::
+--no-encode-email-headers::
+	Encode email headers that have non-ASCII characters with
+	"Q-encoding" (described in RFC 2047), instead of outputting the
+	headers verbatim. Defaults to the value of the
+	`format.encodeEmailHeaders` configuration variable.
+
 --interdiff=<previous>::
 	As a reviewer aid, insert an interdiff into the cover letter,
 	or as commentary of the lone patch of a 1-patch series, showing
@@ -312,11 +371,12 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.
   Output an all-zero hash in each patch's From header instead
   of the hash of the commit.
 
---base=<commit>::
+--[no-]base[=<commit>]::
 	Record the base tree information to identify the state the
 	patch series applies to.  See the BASE TREE INFORMATION section
 	below for details. If <commit> is "auto", a base commit is
-	automatically chosen.
+	automatically chosen. The `--no-base` option overrides a
+	`format.useAutoBase` configuration.
 
 --root::
 	Treat the revision argument as a <revision range>, even if it
@@ -348,6 +408,7 @@ with configuration variables.
 	signOff = true
 	outputDirectory = <directory>
 	coverLetter = auto
+	coverFromDescription = auto
 ------------
 
 
@@ -679,6 +740,14 @@ use it only when you know the recipient uses Git to apply your patch.
 $ git format-patch -3
 ------------
 
+CAVEATS
+-------
+
+Note that `format-patch` will omit merge commits from the output, even
+if they are part of the requested range. A simple "patch" does not
+include enough information for the receiving end to reproduce the same
+merge commit.
+
 SEE ALSO
 --------
 linkgit:git-am[1], linkgit:git-send-email[1]
diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt
index d72d15be5b..bd596619c0 100644
--- a/Documentation/git-fsck.txt
+++ b/Documentation/git-fsck.txt
@@ -129,14 +129,6 @@ using 'git commit-graph verify'. See linkgit:git-commit-graph[1].
 Extracted Diagnostics
 ---------------------
 
-expect dangling commits - potential heads - due to lack of head information::
-	You haven't specified any nodes as heads so it won't be
-	possible to differentiate between un-parented commits and
-	root nodes.
-
-missing sha1 directory '<dir>'::
-	The directory holding the sha1 objects is missing.
-
 unreachable <type> <object>::
 	The <type> object <object>, isn't actually referred to directly
 	or indirectly in any of the trees or commits seen. This can
diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt
index 0c114ad1ca..853967dea0 100644
--- a/Documentation/git-gc.txt
+++ b/Documentation/git-gc.txt
@@ -117,12 +117,14 @@ NOTES
 'git gc' tries very hard not to delete objects that are referenced
 anywhere in your repository. In particular, it will keep not only
 objects referenced by your current set of branches and tags, but also
-objects referenced by the index, remote-tracking branches, notes saved
-by 'git notes' under refs/notes/, reflogs (which may reference commits
-in branches that were later amended or rewound), and anything else in
-the refs/* namespace.  If you are expecting some objects to be deleted
-and they aren't, check all of those locations and decide whether it
-makes sense in your case to remove those references.
+objects referenced by the index, remote-tracking branches, reflogs
+(which may reference commits in branches that were later amended or
+rewound), and anything else in the refs/* namespace. Note that a note
+(of the kind created by 'git notes') attached to an object does not
+contribute in keeping the object alive. If you are expecting some
+objects to be deleted and they aren't, check all of those locations
+and decide whether it makes sense in your case to remove those
+references.
 
 On the other hand, when 'git gc' runs concurrently with another process,
 there is a risk of it deleting an object that the other process is using
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index c89fb569e3..3d393fbac1 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -38,38 +38,6 @@ are lists of one or more search expressions separated by newline
 characters.  An empty string as search expression matches all lines.
 
 
-CONFIGURATION
--------------
-
-grep.lineNumber::
-	If set to true, enable `-n` option by default.
-
-grep.column::
-	If set to true, enable the `--column` option by default.
-
-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.
-
-grep.extendedRegexp::
-	If set to true, enable `--extended-regexp` option by default. This
-	option is ignored when the `grep.patternType` option is set to a value
-	other than 'default'.
-
-grep.threads::
-	Number of grep worker threads to use.  If unset (or set to 0),
-	8 threads are used by default (for now).
-
-grep.fullName::
-	If set to true, enable `--full-name` option by default.
-
-grep.fallbackToNoIndex::
-	If set to true, fall back to git grep --no-index if git grep
-	is executed outside of a git repository.  Defaults to false.
-
-
 OPTIONS
 -------
 --cached::
@@ -93,10 +61,11 @@ OPTIONS
 	with `--no-index`.
 
 --recurse-submodules::
-	Recursively search in each submodule that has been initialized and
+	Recursively search in each submodule that is active and
 	checked out in the repository.  When used in combination with the
 	<tree> option the prefix of all submodule output will be the name of
-	the parent project's <tree> object.
+	the parent project's <tree> object. This option has no effect
+	if `--no-index` is given.
 
 -a::
 --text::
@@ -205,8 +174,10 @@ providing this option will cause it to die.
 
 -z::
 --null::
-	Output \0 instead of the character that normally follows a
-	file name.
+	Use \0 as the delimiter for pathnames in the output, and print
+	them verbatim. Without this option, pathnames with "unusual"
+	characters are quoted as explained for the configuration
+	variable core.quotePath (see linkgit:git-config[1]).
 
 -o::
 --only-matching::
@@ -238,7 +209,7 @@ providing this option will cause it to die.
 --show-function::
 	Show the preceding line that contains the function name of
 	the match, unless the matching line is a function name itself.
-	The name is determined in the same way as 'git diff' works out
+	The name is determined in the same way as `git diff` works out
 	patch hunk headers (see 'Defining a custom hunk-header' in
 	linkgit:gitattributes[5]).
 
@@ -263,7 +234,9 @@ providing this option will cause it to die.
 	Show the surrounding text from the previous line containing a
 	function name up to the one before the next function name,
 	effectively showing the whole function in which the match was
-	found.
+	found. The function names are determined in the same way as
+	`git diff` works out patch hunk headers (see 'Defining a
+	custom hunk-header' in linkgit:gitattributes[5]).
 
 --threads <num>::
 	Number of grep worker threads to use.
@@ -347,6 +320,49 @@ EXAMPLES
 `git grep solution -- :^Documentation`::
 	Looks for `solution`, excluding files in `Documentation`.
 
+NOTES ON THREADS
+----------------
+
+The `--threads` option (and the grep.threads configuration) will be ignored when
+`--open-files-in-pager` is used, forcing a single-threaded execution.
+
+When grepping the object store (with `--cached` or giving tree objects), running
+with multiple threads might perform slower than single threaded if `--textconv`
+is given and there're too many text conversions. So if you experience low
+performance in this case, it might be desirable to use `--threads=1`.
+
+CONFIGURATION
+-------------
+
+grep.lineNumber::
+	If set to true, enable `-n` option by default.
+
+grep.column::
+	If set to true, enable the `--column` option by default.
+
+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.
+
+grep.extendedRegexp::
+	If set to true, enable `--extended-regexp` option by default. This
+	option is ignored when the `grep.patternType` option is set to a value
+	other than 'default'.
+
+grep.threads::
+	Number of grep worker threads to use. If unset (or set to 0), Git will
+	use as many threads as the number of logical cores available.
+
+grep.fullName::
+	If set to true, enable `--full-name` option by default.
+
+grep.fallbackToNoIndex::
+	If set to true, fall back to git grep --no-index if git grep
+	is executed outside of a git repository.  Defaults to false.
+
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt
index f71db0daa2..44fe8860b3 100644
--- a/Documentation/git-help.txt
+++ b/Documentation/git-help.txt
@@ -8,7 +8,7 @@ git-help - Display help information about Git
 SYNOPSIS
 --------
 [verse]
-'git help' [-a|--all [--[no-]verbose]] [-g|--guide]
+'git help' [-a|--all [--[no-]verbose]] [-g|--guides]
 	   [-i|--info|-m|--man|-w|--web] [COMMAND|GUIDE]
 
 DESCRIPTION
@@ -21,8 +21,8 @@ on the standard output.
 If the option `--all` or `-a` is given, all available commands are
 printed on the standard output.
 
-If the option `--guide` or `-g` is given, a list of the useful
-Git guides is also printed on the standard output.
+If the option `--guides` or `-g` is given, a list of the
+Git concept guides is also printed on the standard output.
 
 If a command, or a guide, is given, a manual page for that command or
 guide is brought up. The 'man' program is used by default for this
@@ -58,7 +58,7 @@ OPTIONS
 
 -g::
 --guides::
-	Prints a list of useful guides on the standard output. This
+	Prints a list of the Git concept guides on the standard output. This
 	option overrides any given command or guide name.
 
 -i::
diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt
index 666b042679..9fa17b60e4 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] <commit> <url>
+'git http-fetch' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [--stdin | --packfile=<hash> | <commit>] <url>
 
 DESCRIPTION
 -----------
@@ -40,6 +40,19 @@ commit-id::
 
 		<commit-id>['\t'<filename-as-in--w>]
 
+--packfile=<hash>::
+	For internal use only. Instead of a commit id on the command
+	line (which is not expected in
+	this case), 'git http-fetch' fetches the packfile directly at the given
+	URL and uses index-pack to generate corresponding .idx and .keep files.
+	The hash is used to determine the name of the temporary file and is
+	arbitrary. The output of index-pack is printed to stdout. Requires
+	--index-pack-args.
+
+--index-pack-args=<args>::
+	For internal use only. The command to run on the contents of the
+	downloaded pack. Arguments are URL-encoded separated by spaces.
+
 --recover::
 	Verify that everything reachable from target is fetched.  Used after
 	an earlier fetch is interrupted.
diff --git a/Documentation/git-imap-send.txt b/Documentation/git-imap-send.txt
index 65b53fcc47..63cf498ce9 100644
--- a/Documentation/git-imap-send.txt
+++ b/Documentation/git-imap-send.txt
@@ -51,17 +51,13 @@ OPTIONS
 CONFIGURATION
 -------------
 
-To use the tool, imap.folder and either imap.tunnel or imap.host must be set
+To use the tool, `imap.folder` and either `imap.tunnel` or `imap.host` must be set
 to appropriate values.
 
-Variables
-~~~~~~~~~
-
 include::config/imap.txt[]
 
-Examples
-~~~~~~~~
-
+EXAMPLES
+--------
 Using tunnel mode:
 
 ..........................
@@ -89,14 +85,18 @@ Using direct mode with SSL:
     user = bob
     pass = p4ssw0rd
     port = 123
-    sslverify = false
+    ; sslVerify = false
 .........................
 
 
-EXAMPLES
---------
-To submit patches using GMail's IMAP interface, first, edit your ~/.gitconfig
-to specify your account settings:
+[NOTE]
+You may want to use `sslVerify=false`
+while troubleshooting, if you suspect that the reason you are
+having trouble connecting is because the certificate you use at
+the private server `example.com` you are trying to set up (or
+have set up) may not be verified correctly.
+
+Using Gmail's IMAP interface:
 
 ---------
 [imap]
@@ -104,17 +104,21 @@ to specify your account settings:
 	host = imaps://imap.gmail.com
 	user = user@gmail.com
 	port = 993
-	sslverify = false
 ---------
 
-You might need to instead use: folder = "[Google Mail]/Drafts" if you get an error
+[NOTE]
+You might need to instead use: `folder = "[Google Mail]/Drafts"` if you get an error
 that the "Folder doesn't exist".
 
+[NOTE]
+If your Gmail account is set to another language than English, the name of the "Drafts"
+folder will be localized.
+
 Once the commits are ready to be sent, run the following command:
 
   $ git format-patch --cover-letter -M --stdout origin/master | git imap-send
 
-Just make sure to disable line wrapping in the email client (GMail's web
+Just make sure to disable line wrapping in the email client (Gmail's web
 interface will wrap lines no matter what, so you need to use a real
 IMAP client).
 
diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt
index d5b7560bfe..7fa74b9e79 100644
--- a/Documentation/git-index-pack.txt
+++ b/Documentation/git-index-pack.txt
@@ -9,17 +9,18 @@ git-index-pack - Build pack index file for an existing packed archive
 SYNOPSIS
 --------
 [verse]
-'git index-pack' [-v] [-o <index-file>] <pack-file>
+'git index-pack' [-v] [-o <index-file>] [--[no-]rev-index] <pack-file>
 'git index-pack' --stdin [--fix-thin] [--keep] [-v] [-o <index-file>]
-                 [<pack-file>]
+		  [--[no-]rev-index] [<pack-file>]
 
 
 DESCRIPTION
 -----------
 Reads a packed archive (.pack) from the specified file, and
-builds a pack index file (.idx) for it.  The packed archive
-together with the pack index can then be placed in the
-objects/pack/ directory of a Git repository.
+builds a pack index file (.idx) for it. Optionally writes a
+reverse-index (.rev) for the specified pack. The packed
+archive together with the pack index can then be placed in
+the objects/pack/ directory of a Git repository.
 
 
 OPTIONS
@@ -35,6 +36,13 @@ OPTIONS
 	fails if the name of packed archive does not end
 	with .pack).
 
+--[no-]rev-index::
+	When this flag is provided, generate a reverse index
+	(a `.rev` file) corresponding to the given pack. If
+	`--verify` is given, ensure that the existing
+	reverse index is correct. Takes precedence over
+	`pack.writeReverseIndex`.
+
 --stdin::
 	When this flag is provided, the pack is read from stdin
 	instead and a copy is then written to <pack-file>. If
@@ -78,7 +86,12 @@ OPTIONS
 	Die if the pack contains broken links. For internal use only.
 
 --fsck-objects::
-	Die if the pack contains broken objects. For internal use only.
+	For internal use only.
++
+Die if the pack contains broken objects. If the pack contains a tree
+pointing to a .gitmodules blob that does not exist, prints the hash of
+that blob (for the caller to check) after the hash that goes into the
+name of the pack/idx file (see "Notes").
 
 --threads=<n>::
 	Specifies the number of threads to spawn when resolving
@@ -93,11 +106,21 @@ OPTIONS
 --max-input-size=<size>::
 	Die, if the pack is larger than <size>.
 
+--object-format=<hash-algorithm>::
+	Specify the given object format (hash algorithm) for the pack.  The valid
+	values are 'sha1' and (if enabled) 'sha256'.  The default is the algorithm for
+	the current repository (set by `extensions.objectFormat`), or 'sha1' if no
+	value is set or outside a repository.
++
+This option cannot be used with --stdin.
++
+include::object-format-disclaimer.txt[]
+
 NOTES
 -----
 
-Once the index has been created, the list of object names is sorted
-and the SHA-1 hash of that list is printed to stdout. If --stdin was
+Once the index has been created, the hash that goes into the name of
+the pack/idx file is printed to stdout. If --stdin was
 also used then this is prefixed by either "pack\t", or "keep\t" if a
 new .keep file was successfully created. This is useful to remove a
 .keep file used as a lock to prevent the race with 'git repack'
diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt
index 32880aafb0..b611d80697 100644
--- a/Documentation/git-init.txt
+++ b/Documentation/git-init.txt
@@ -10,7 +10,8 @@ SYNOPSIS
 --------
 [verse]
 'git init' [-q | --quiet] [--bare] [--template=<template_directory>]
-	  [--separate-git-dir <git dir>]
+	  [--separate-git-dir <git dir>] [--object-format=<format>]
+	  [-b <branch-name> | --initial-branch=<branch-name>]
 	  [--shared[=<permissions>]] [directory]
 
 
@@ -19,8 +20,9 @@ DESCRIPTION
 
 This command creates an empty Git repository - basically a `.git`
 directory with subdirectories for `objects`, `refs/heads`,
-`refs/tags`, and template files.  An initial `HEAD` file that
-references the HEAD of the master branch is also created.
+`refs/tags`, and template files.  An initial branch without any
+commits will be created (see the `--initial-branch` option below
+for its name).
 
 If the `$GIT_DIR` environment variable is set then it specifies a path
 to use instead of `./.git` for the base of the repository.
@@ -48,6 +50,13 @@ Only print error and warning messages; all other output will be suppressed.
 Create a bare repository. If `GIT_DIR` environment is not set, it is set to the
 current working directory.
 
+--object-format=<format>::
+
+Specify the given object format (hash algorithm) for the repository.  The valid
+values are 'sha1' and (if enabled) 'sha256'.  'sha1' is the default.
++
+include::object-format-disclaimer.txt[]
+
 --template=<template_directory>::
 
 Specify the directory from which templates will be used.  (See the "TEMPLATE
@@ -62,6 +71,14 @@ repository.
 +
 If this is reinitialization, the repository will be moved to the specified path.
 
+-b <branch-name>::
+--initial-branch=<branch-name>::
+
+Use the specified name for the initial branch in the newly created
+repository.  If not specified, fall back to the default name (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)]::
 
 Specify that the Git repository is to be shared amongst several users.  This
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 96ec6499f0..956a01d184 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -232,25 +232,38 @@ trailer.<token>.ifmissing::
 	that option for trailers with the specified <token>.
 
 trailer.<token>.command::
-	This option can be used to specify a shell command that will
-	be called to automatically add or modify a trailer with the
-	specified <token>.
+	This option behaves in the same way as 'trailer.<token>.cmd', except
+	that it doesn't pass anything as argument to the specified command.
+	Instead the first occurrence of substring $ARG is replaced by the
+	value that would be passed as argument.
 +
-When this option is specified, the behavior is as if a special
-'<token>=<value>' argument were added at the beginning of the command
-line, where <value> is taken to be the standard output of the
-specified command with any leading and trailing whitespace trimmed
-off.
+The 'trailer.<token>.command' option has been deprecated in favor of
+'trailer.<token>.cmd' due to the fact that $ARG in the user's command is
+only replaced once and that the original way of replacing $ARG is not safe.
 +
-If the command contains the `$ARG` string, this string will be
-replaced with the <value> part of an existing trailer with the same
-<token>, if any, before the command is launched.
+When both 'trailer.<token>.cmd' and 'trailer.<token>.command' are given
+for the same <token>, 'trailer.<token>.cmd' is used and
+'trailer.<token>.command' is ignored.
+
+trailer.<token>.cmd::
+	This option can be used to specify a shell command that will be called:
+	once to automatically add a trailer with the specified <token>, and then
+	each time a '--trailer <token>=<value>' argument to modify the <value> of
+	the trailer that this option would produce.
 +
-If some '<token>=<value>' arguments are also passed on the command
-line, when a 'trailer.<token>.command' is configured, the command will
-also be executed for each of these arguments. And the <value> part of
-these arguments, if any, will be used to replace the `$ARG` string in
-the command.
+When the specified command is first called to add a trailer
+with the specified <token>, the behavior is as if a special
+'--trailer <token>=<value>' argument was added at the beginning
+of the "git interpret-trailers" command, where <value>
+is taken to be the standard output of the command with any
+leading and trailing whitespace trimmed off.
++
+If some '--trailer <token>=<value>' arguments are also passed
+on the command line, the command is called again once for each
+of these arguments with the same <token>. And the <value> part
+of these arguments, if any, will be passed to the command as its
+first argument. This way the command can produce a <value> computed
+from the <value> passed in the '--trailer <token>=<value>' argument.
 
 EXAMPLES
 --------
@@ -333,6 +346,55 @@ subject
 Fix #42
 ------------
 
+* Configure a 'help' trailer with a cmd use a script `glog-find-author`
+  which search specified author identity from git log in git repository
+  and show how it works:
++
+------------
+$ cat ~/bin/glog-find-author
+#!/bin/sh
+test -n "$1" && git log --author="$1" --pretty="%an <%ae>" -1 || true
+$ git config trailer.help.key "Helped-by: "
+$ git config trailer.help.ifExists "addIfDifferentNeighbor"
+$ git config trailer.help.cmd "~/bin/glog-find-author"
+$ git interpret-trailers --trailer="help:Junio" --trailer="help:Couder" <<EOF
+> subject
+>
+> message
+>
+> EOF
+subject
+
+message
+
+Helped-by: Junio C Hamano <gitster@pobox.com>
+Helped-by: Christian Couder <christian.couder@gmail.com>
+------------
+
+* Configure a 'ref' trailer with a cmd use a script `glog-grep`
+  to grep last relevant commit from git log in the git repository
+  and show how it works:
++
+------------
+$ cat ~/bin/glog-grep
+#!/bin/sh
+test -n "$1" && git log --grep "$1" --pretty=reference -1 || true
+$ git config trailer.ref.key "Reference-to: "
+$ git config trailer.ref.ifExists "replace"
+$ git config trailer.ref.cmd "~/bin/glog-grep"
+$ git interpret-trailers --trailer="ref:Add copyright notices." <<EOF
+> subject
+>
+> message
+>
+> EOF
+subject
+
+message
+
+Reference-to: 8bc9a0c769 (Add copyright notices., 2005-04-07)
+------------
+
 * Configure a 'see' trailer with a command to show the subject of a
   commit that is related, and show how it works:
 +
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index b406bc4c48..0498e7bacb 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -15,9 +15,12 @@ DESCRIPTION
 -----------
 Shows the commit logs.
 
-The command takes options applicable to the `git rev-list`
+:git-log: 1
+include::rev-list-description.txt[]
+
+The command takes options applicable to the linkgit:git-rev-list[1]
 command to control what is shown and how, and options applicable to
-the `git diff-*` commands to control how the changes
+the linkgit:git-diff[1] command to control how the changes
 each commit introduces are shown.
 
 
@@ -36,19 +39,25 @@ OPTIONS
 	full ref name (including prefix) will be printed. If 'auto' is
 	specified, then if the output is going to a terminal, the ref names
 	are shown as if 'short' were given, otherwise no ref names are
-	shown. The default option is 'short'.
+	shown. The option `--decorate` is short-hand for `--decorate=short`.
+	Default to configuration value of `log.decorate` if configured,
+	otherwise, `auto`.
 
 --decorate-refs=<pattern>::
 --decorate-refs-exclude=<pattern>::
 	If no `--decorate-refs` is given, pretend as if all refs were
 	included.  For each candidate, do not use it for decoration if it
 	matches any patterns given to `--decorate-refs-exclude` or if it
-	doesn't match any of the patterns given to `--decorate-refs`.
+	doesn't match any of the patterns given to `--decorate-refs`. The
+	`log.excludeDecoration` config option allows excluding refs from
+	the decorations, but an explicit `--decorate-refs` pattern will
+	override a match in `log.excludeDecoration`.
 
 --source::
 	Print out the ref name given on the command line by which each
 	commit was reached.
 
+--[no-]mailmap::
 --[no-]use-mailmap::
 	Use mailmap file to map author and committer names and email
 	addresses to canonical real names and email addresses. See
@@ -70,16 +79,7 @@ produced by `--stat`, etc.
 	Intended to speed up tools that read log messages from `git log`
 	output by allowing them to allocate space in advance.
 
--L <start>,<end>:<file>::
--L :<funcname>:<file>::
-	Trace the evolution of the line range given by "<start>,<end>"
-	(or the function name regex <funcname>) within the <file>.  You may
-	not give any pathspec limiters.  This is currently limited to
-	a walk starting from a single revision, i.e., you may only
-	give zero or one positive revision arguments.
-	You can specify this option more than once.
-+
-include::line-range-format.txt[]
+include::line-range-options.txt[]
 
 <revision range>::
 	Show only commits in the specified revision range.  When no
@@ -103,10 +103,21 @@ include::rev-list-options.txt[]
 
 include::pretty-formats.txt[]
 
-COMMON DIFF OPTIONS
--------------------
+DIFF FORMATTING
+---------------
+
+By default, `git log` does not generate any diff output. The options
+below can be used to show the changes made by each commit.
+
+Note that unless one of `--diff-merges` variants (including short
+`-m`, `-c`, and `--cc` options) is explicitly given, merge commits
+will not show a diff, even if a diff format like `--patch` is
+selected, nor will they match search options like `-S`. The exception
+is when `--first-parent` is in use, in which case `first-parent` is
+the default format.
 
 :git-log: 1
+:diff-merges-default: `off`
 include::diff-options.txt[]
 
 include::diff-generate-patch.txt[]
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index 8461c0e83e..6d11ab506b 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -13,19 +13,19 @@ SYNOPSIS
 		(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*
 		(-[c|d|o|i|s|u|k|m])*
 		[--eol]
+		[--deduplicate]
 		[-x <pattern>|--exclude=<pattern>]
 		[-X <file>|--exclude-from=<file>]
 		[--exclude-per-directory=<file>]
 		[--exclude-standard]
 		[--error-unmatch] [--with-tree=<tree-ish>]
 		[--full-name] [--recurse-submodules]
-		[--abbrev] [--] [<file>...]
+		[--abbrev[=<n>]] [--] [<file>...]
 
 DESCRIPTION
 -----------
-This merges the file listing in the directory cache index with the
-actual working directory list, and shows different combinations of the
-two.
+This merges the file listing in the index with the actual working
+directory list, and shows different combinations of the two.
 
 One or more of the options below may be used to determine the files
 shown:
@@ -81,6 +81,13 @@ OPTIONS
 	\0 line termination on output and do not quote filenames.
 	See OUTPUT below for more information.
 
+--deduplicate::
+	When only filenames are shown, suppress duplicates that may
+	come from having multiple stages during a merge, or giving
+	`--deleted` and `--modified` option at the same time.
+	When any of the `-t`, `--unmerged`, or `--stage` option is
+	in use, this option has no effect.
+
 -x <pattern>::
 --exclude=<pattern>::
 	Skip untracked files matching pattern.
@@ -148,12 +155,13 @@ a space) at the start of each line:
 	top directory.
 
 --recurse-submodules::
-	Recursively calls ls-files on each submodule in the repository.
+	Recursively calls ls-files on each active submodule in the repository.
 	Currently there is only support for the --cached mode.
 
 --abbrev[=<n>]::
 	Instead of showing the full 40-byte hexadecimal object
-	lines, show only a partial prefix.
+	lines, show the shortest prefix that is at least '<n>'
+	hexdigits long that uniquely refers the object.
 	Non default number of digits can be specified with --abbrev=<n>.
 
 --debug::
diff --git a/Documentation/git-ls-remote.txt b/Documentation/git-ls-remote.txt
index a2ea1fd687..492e573856 100644
--- a/Documentation/git-ls-remote.txt
+++ b/Documentation/git-ls-remote.txt
@@ -28,7 +28,9 @@ OPTIONS
 	Limit to only refs/heads and refs/tags, respectively.
 	These options are _not_ mutually exclusive; when given
 	both, references stored in refs/heads and refs/tags are
-	displayed.
+	displayed.  Note that `git ls-remote -h` used without
+	anything else on the command line gives help, consistent
+	with other git subcommands.
 
 --refs::
 	Do not show peeled tags or pseudorefs like `HEAD` in the output.
@@ -99,9 +101,9 @@ f25a265a342aed6041ab0cc484224d9ca54b6f41	refs/tags/v0.99.1
 7ceca275d047c90c0c7d5afb13ab97efdf51bd6e	refs/tags/v0.99.3
 c5db5456ae3b0873fc659c19fafdde22313cc441	refs/tags/v0.99.2
 0918385dbd9656cab0d1d81ba7453d49bbc16250	refs/tags/junio-gpg-pub
-$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master pu rc
+$ git ls-remote http://www.kernel.org/pub/scm/git/git.git master seen rc
 5fe978a5381f1fbad26a80e682ddd2a401966740	refs/heads/master
-c781a84b5204fb294c9ccc79f8b3baceeb32c061	refs/heads/pu
+c781a84b5204fb294c9ccc79f8b3baceeb32c061	refs/heads/seen
 $ git remote add korg http://www.kernel.org/pub/scm/git/git.git
 $ git ls-remote --tags korg v\*
 d6602ec5194c87b0fc87103ca4d67251c76f233a	refs/tags/v0.99
diff --git a/Documentation/git-ls-tree.txt b/Documentation/git-ls-tree.txt
index a7515714da..db02d6d79a 100644
--- a/Documentation/git-ls-tree.txt
+++ b/Documentation/git-ls-tree.txt
@@ -62,7 +62,8 @@ OPTIONS
 
 --abbrev[=<n>]::
 	Instead of showing the full 40-byte hexadecimal object
-	lines, show only a partial prefix.
+	lines, show the shortest prefix that is at least '<n>'
+	hexdigits long that uniquely refers the object.
 	Non default number of digits can be specified with --abbrev=<n>.
 
 --full-name::
diff --git a/Documentation/git-mailinfo.txt b/Documentation/git-mailinfo.txt
index 3bbc731f67..3fcfd965fd 100644
--- a/Documentation/git-mailinfo.txt
+++ b/Documentation/git-mailinfo.txt
@@ -9,7 +9,9 @@ git-mailinfo - Extracts patch and authorship from a single e-mail message
 SYNOPSIS
 --------
 [verse]
-'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n] [--[no-]scissors] <msg> <patch>
+'git mailinfo' [-k|-b] [-u | --encoding=<encoding> | -n]
+	       [--[no-]scissors] [--quoted-cr=<action>]
+	       <msg> <patch>
 
 
 DESCRIPTION
@@ -53,7 +55,7 @@ character.
 	The commit log message, author name and author email are
 	taken from the e-mail, and after minimally decoding MIME
 	transfer encoding, re-coded in the charset specified by
-	i18n.commitencoding (defaulting to UTF-8) by transliterating
+	`i18n.commitEncoding` (defaulting to UTF-8) by transliterating
 	them.  This used to be optional but now it is the default.
 +
 Note that the patch is always used as-is without charset
@@ -61,7 +63,7 @@ conversion, even with this flag.
 
 --encoding=<encoding>::
 	Similar to -u.  But when re-coding, the charset specified here is
-	used instead of the one specified by i18n.commitencoding or UTF-8.
+	used instead of the one specified by `i18n.commitEncoding` or UTF-8.
 
 -n::
 	Disable all charset re-coding of the metadata.
@@ -72,10 +74,9 @@ conversion, even with this flag.
 	is useful in order to associate commits with mailing list discussions.
 
 --scissors::
-	Remove everything in body before a scissors line.  A line that
-	mainly consists of scissors (either ">8" or "8<") and perforation
-	(dash "-") marks is called a scissors line, and is used to request
-	the reader to cut the message at that line.  If such a line
+	Remove everything in body before a scissors line (e.g. "-- >8 --").
+	The line represents scissors and perforation marks, and is used to
+	request the reader to cut the message at that line.  If that line
 	appears in the body of the message before the patch, everything
 	before it (including the scissors line itself) is ignored when
 	this option is used.
@@ -90,6 +91,23 @@ This can be enabled by default with the configuration option mailinfo.scissors.
 --no-scissors::
 	Ignore scissors lines. Useful for overriding mailinfo.scissors settings.
 
+--quoted-cr=<action>::
+	Action when processes email messages sent with base64 or
+	quoted-printable encoding, and the decoded lines end with a CRLF
+	instead of a simple LF.
++
+The valid actions are:
++
+--
+*	`nowarn`: Git will do nothing when such a CRLF is found.
+*	`warn`: Git will issue a warning for each message if such a CRLF is
+	found.
+*	`strip`: Git will convert those CRLF to LF.
+--
++
+The default action could be set by configuration option `mailinfo.quotedCR`.
+If no such configuration option has been set, `warn` will be used.
+
 <msg>::
 	The commit log message extracted from e-mail, usually
 	except the title line which comes from e-mail Subject.
diff --git a/Documentation/git-maintenance.txt b/Documentation/git-maintenance.txt
new file mode 100644
index 0000000000..1e738ad398
--- /dev/null
+++ b/Documentation/git-maintenance.txt
@@ -0,0 +1,344 @@
+git-maintenance(1)
+==================
+
+NAME
+----
+git-maintenance - Run tasks to optimize Git repository data
+
+
+SYNOPSIS
+--------
+[verse]
+'git maintenance' run [<options>]
+
+
+DESCRIPTION
+-----------
+Run tasks to optimize Git repository data, speeding up other Git commands
+and reducing storage requirements for the repository.
+
+Git commands that add repository data, such as `git add` or `git fetch`,
+are optimized for a responsive user experience. These commands do not take
+time to optimize the Git data, since such optimizations scale with the full
+size of the repository while these user commands each perform a relatively
+small action.
+
+The `git maintenance` command provides flexibility for how to optimize the
+Git repository.
+
+SUBCOMMANDS
+-----------
+
+register::
+	Initialize Git config values so any scheduled maintenance will
+	start running on this repository. This adds the repository to the
+	`maintenance.repo` config variable in the current user's global
+	config and enables some recommended configuration values for
+	`maintenance.<task>.schedule`. The tasks that are enabled are safe
+	for running in the background without disrupting foreground
+	processes.
++
+The `register` subcommand will also set the `maintenance.strategy` config
+value to `incremental`, if this value is not previously set. The
+`incremental` strategy uses the following schedule for each maintenance
+task:
++
+--
+* `gc`: disabled.
+* `commit-graph`: hourly.
+* `prefetch`: hourly.
+* `loose-objects`: daily.
+* `incremental-repack`: daily.
+--
++
+`git maintenance register` will also disable foreground maintenance by
+setting `maintenance.auto = false` in the current repository. This config
+setting will remain after a `git maintenance unregister` command.
+
+run::
+	Run one or more maintenance tasks. If one or more `--task` options
+	are specified, then those tasks are run in that order. Otherwise,
+	the tasks are determined by which `maintenance.<task>.enabled`
+	config options are true. By default, only `maintenance.gc.enabled`
+	is true.
+
+start::
+	Start running maintenance on the current repository. This performs
+	the same config updates as the `register` subcommand, then updates
+	the background scheduler to run `git maintenance run --scheduled`
+	on an hourly basis.
+
+stop::
+	Halt the background maintenance schedule. The current repository
+	is not removed from the list of maintained repositories, in case
+	the background maintenance is restarted later.
+
+unregister::
+	Remove the current repository from background maintenance. This
+	only removes the repository from the configured list. It does not
+	stop the background maintenance processes from running.
+
+TASKS
+-----
+
+commit-graph::
+	The `commit-graph` job updates the `commit-graph` files incrementally,
+	then verifies that the written data is correct. The incremental
+	write is safe to run alongside concurrent Git processes since it
+	will not expire `.graph` files that were in the previous
+	`commit-graph-chain` file. They will be deleted by a later run based
+	on the expiration delay.
+
+prefetch::
+	The `prefetch` task updates the object directory with the latest
+	objects from all registered remotes. For each remote, a `git fetch`
+	command is run. The configured refspec is modified to place all
+	requested refs within `refs/prefetch/`. Also, tags are not updated.
++
+This is done to avoid disrupting the remote-tracking branches. The end users
+expect these refs to stay unmoved unless they initiate a fetch.  With prefetch
+task, however, the objects necessary to complete a later real fetch would
+already be obtained, so the real fetch would go faster.  In the ideal case,
+it will just become an update to a bunch of remote-tracking branches without
+any object transfer.
+
+gc::
+	Clean up unnecessary files and optimize the local repository. "GC"
+	stands for "garbage collection," but this task performs many
+	smaller tasks. This task can be expensive for large repositories,
+	as it repacks all Git objects into a single pack-file. It can also
+	be disruptive in some situations, as it deletes stale data. See
+	linkgit:git-gc[1] for more details on garbage collection in Git.
+
+loose-objects::
+	The `loose-objects` job cleans up loose objects and places them into
+	pack-files. In order to prevent race conditions with concurrent Git
+	commands, it follows a two-step process. First, it deletes any loose
+	objects that already exist in a pack-file; concurrent Git processes
+	will examine the pack-file for the object data instead of the loose
+	object. Second, it creates a new pack-file (starting with "loose-")
+	containing a batch of loose objects. The batch size is limited to 50
+	thousand objects to prevent the job from taking too long on a
+	repository with many loose objects. The `gc` task writes unreachable
+	objects as loose objects to be cleaned up by a later step only if
+	they are not re-added to a pack-file; for this reason it is not
+	advisable to enable both the `loose-objects` and `gc` tasks at the
+	same time.
+
+incremental-repack::
+	The `incremental-repack` job repacks the object directory
+	using the `multi-pack-index` feature. In order to prevent race
+	conditions with concurrent Git commands, it follows a two-step
+	process. First, it calls `git multi-pack-index expire` to delete
+	pack-files unreferenced by the `multi-pack-index` file. Second, it
+	calls `git multi-pack-index repack` to select several small
+	pack-files and repack them into a bigger one, and then update the
+	`multi-pack-index` entries that refer to the small pack-files to
+	refer to the new pack-file. This prepares those small pack-files
+	for deletion upon the next run of `git multi-pack-index expire`.
+	The selection of the small pack-files is such that the expected
+	size of the big pack-file is at least the batch size; see the
+	`--batch-size` option for the `repack` subcommand in
+	linkgit:git-multi-pack-index[1]. The default batch-size is zero,
+	which is a special case that attempts to repack all pack-files
+	into a single pack-file.
+
+pack-refs::
+	The `pack-refs` task collects the loose reference files and
+	collects them into a single file. This speeds up operations that
+	need to iterate across many references. See linkgit:git-pack-refs[1]
+	for more information.
+
+OPTIONS
+-------
+--auto::
+	When combined with the `run` subcommand, run maintenance tasks
+	only if certain thresholds are met. For example, the `gc` task
+	runs when the number of loose objects exceeds the number stored
+	in the `gc.auto` config setting, or when the number of pack-files
+	exceeds the `gc.autoPackLimit` config setting. Not compatible with
+	the `--schedule` option.
+
+--schedule::
+	When combined with the `run` subcommand, run maintenance tasks
+	only if certain time conditions are met, as specified by the
+	`maintenance.<task>.schedule` config value for each `<task>`.
+	This config value specifies a number of seconds since the last
+	time that task ran, according to the `maintenance.<task>.lastRun`
+	config value. The tasks that are tested are those provided by
+	the `--task=<task>` option(s) or those with
+	`maintenance.<task>.enabled` set to true.
+
+--quiet::
+	Do not report progress or other information over `stderr`.
+
+--task=<task>::
+	If this option is specified one or more times, then only run the
+	specified tasks in the specified order. If no `--task=<task>`
+	arguments are specified, then only the tasks with
+	`maintenance.<task>.enabled` configured as `true` are considered.
+	See the 'TASKS' section for the list of accepted `<task>` values.
+
+
+TROUBLESHOOTING
+---------------
+The `git maintenance` command is designed to simplify the repository
+maintenance patterns while minimizing user wait time during Git commands.
+A variety of configuration options are available to allow customizing this
+process. The default maintenance options focus on operations that complete
+quickly, even on large repositories.
+
+Users may find some cases where scheduled maintenance tasks do not run as
+frequently as intended. Each `git maintenance run` command takes a lock on
+the repository's object database, and this prevents other concurrent
+`git maintenance run` commands from running on the same repository. Without
+this safeguard, competing processes could leave the repository in an
+unpredictable state.
+
+The background maintenance schedule runs `git maintenance run` processes
+on an hourly basis. Each run executes the "hourly" tasks. At midnight,
+that process also executes the "daily" tasks. At midnight on the first day
+of the week, that process also executes the "weekly" tasks. A single
+process iterates over each registered repository, performing the scheduled
+tasks for that frequency. Depending on the number of registered
+repositories and their sizes, this process may take longer than an hour.
+In this case, multiple `git maintenance run` commands may run on the same
+repository at the same time, colliding on the object database lock. This
+results in one of the two tasks not running.
+
+If you find that some maintenance windows are taking longer than one hour
+to complete, then consider reducing the complexity of your maintenance
+tasks. For example, the `gc` task is much slower than the
+`incremental-repack` task. However, this comes at a cost of a slightly
+larger object database. Consider moving more expensive tasks to be run
+less frequently.
+
+Expert users may consider scheduling their own maintenance tasks using a
+different schedule than is available through `git maintenance start` and
+Git configuration options. These users should be aware of the object
+database lock and how concurrent `git maintenance run` commands behave.
+Further, the `git gc` command should not be combined with
+`git maintenance run` commands. `git gc` modifies the object database
+but does not take the lock in the same way as `git maintenance run`. If
+possible, use `git maintenance run --task=gc` instead of `git gc`.
+
+The following sections describe the mechanisms put in place to run
+background maintenance by `git maintenance start` and how to customize
+them.
+
+BACKGROUND MAINTENANCE ON POSIX SYSTEMS
+---------------------------------------
+
+The standard mechanism for scheduling background tasks on POSIX systems
+is cron(8). This tool executes commands based on a given schedule. The
+current list of user-scheduled tasks can be found by running `crontab -l`.
+The schedule written by `git maintenance start` is similar to this:
+
+-----------------------------------------------------------------------
+# BEGIN GIT MAINTENANCE SCHEDULE
+# The following schedule was created by Git
+# Any edits made in this region might be
+# replaced in the future by a Git command.
+
+0 1-23 * * * "/<path>/git" --exec-path="/<path>" for-each-repo --config=maintenance.repo maintenance run --schedule=hourly
+0 0 * * 1-6 "/<path>/git" --exec-path="/<path>" for-each-repo --config=maintenance.repo maintenance run --schedule=daily
+0 0 * * 0 "/<path>/git" --exec-path="/<path>" for-each-repo --config=maintenance.repo maintenance run --schedule=weekly
+
+# END GIT MAINTENANCE SCHEDULE
+-----------------------------------------------------------------------
+
+The comments are used as a region to mark the schedule as written by Git.
+Any modifications within this region will be completely deleted by
+`git maintenance stop` or overwritten by `git maintenance start`.
+
+The `crontab` entry specifies the full path of the `git` executable to
+ensure that the executed `git` command is the same one with which
+`git maintenance start` was issued independent of `PATH`. If the same user
+runs `git maintenance start` with multiple Git executables, then only the
+latest executable is used.
+
+These commands use `git for-each-repo --config=maintenance.repo` to run
+`git maintenance run --schedule=<frequency>` on each repository listed in
+the multi-valued `maintenance.repo` config option. These are typically
+loaded from the user-specific global config. The `git maintenance` process
+then determines which maintenance tasks are configured to run on each
+repository with each `<frequency>` using the `maintenance.<task>.schedule`
+config options. These values are loaded from the global or repository
+config values.
+
+If the config values are insufficient to achieve your desired background
+maintenance schedule, then you can create your own schedule. If you run
+`crontab -e`, then an editor will load with your user-specific `cron`
+schedule. In that editor, you can add your own schedule lines. You could
+start by adapting the default schedule listed earlier, or you could read
+the crontab(5) documentation for advanced scheduling techniques. Please
+do use the full path and `--exec-path` techniques from the default
+schedule to ensure you are executing the correct binaries in your
+schedule.
+
+
+BACKGROUND MAINTENANCE ON MACOS SYSTEMS
+---------------------------------------
+
+While macOS technically supports `cron`, using `crontab -e` requires
+elevated privileges and the executed process does not have a full user
+context. Without a full user context, Git and its credential helpers
+cannot access stored credentials, so some maintenance tasks are not
+functional.
+
+Instead, `git maintenance start` interacts with the `launchctl` tool,
+which is the recommended way to schedule timed jobs in macOS. Scheduling
+maintenance through `git maintenance (start|stop)` requires some
+`launchctl` features available only in macOS 10.11 or later.
+
+Your user-specific scheduled tasks are stored as XML-formatted `.plist`
+files in `~/Library/LaunchAgents/`. You can see the currently-registered
+tasks using the following command:
+
+-----------------------------------------------------------------------
+$ ls ~/Library/LaunchAgents/org.git-scm.git*
+org.git-scm.git.daily.plist
+org.git-scm.git.hourly.plist
+org.git-scm.git.weekly.plist
+-----------------------------------------------------------------------
+
+One task is registered for each `--schedule=<frequency>` option. To
+inspect how the XML format describes each schedule, open one of these
+`.plist` files in an editor and inspect the `<array>` element following
+the `<key>StartCalendarInterval</key>` element.
+
+`git maintenance start` will overwrite these files and register the
+tasks again with `launchctl`, so any customizations should be done by
+creating your own `.plist` files with distinct names. Similarly, the
+`git maintenance stop` command will unregister the tasks with `launchctl`
+and delete the `.plist` files.
+
+To create more advanced customizations to your background tasks, see
+launchctl.plist(5) for more information.
+
+
+BACKGROUND MAINTENANCE ON WINDOWS SYSTEMS
+-----------------------------------------
+
+Windows does not support `cron` and instead has its own system for
+scheduling background tasks. The `git maintenance start` command uses
+the `schtasks` command to submit tasks to this system. You can inspect
+all background tasks using the Task Scheduler application. The tasks
+added by Git have names of the form `Git Maintenance (<frequency>)`.
+The Task Scheduler GUI has ways to inspect these tasks, but you can also
+export the tasks to XML files and view the details there.
+
+Note that since Git is a console application, these background tasks
+create a console window visible to the current user. This can be changed
+manually by selecting the "Run whether user is logged in or not" option
+in Task Scheduler. This change requires a password input, which is why
+`git maintenance start` does not select it by default.
+
+If you want to customize the background tasks, please rename the tasks
+so future calls to `git maintenance (start|stop)` do not overwrite your
+custom tasks.
+
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 092529c619..e4f3352eb5 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -61,6 +61,8 @@ merge has resulted in conflicts.
 
 OPTIONS
 -------
+:git-merge: 1
+
 include::merge-options.txt[]
 
 -m <msg>::
@@ -94,7 +96,8 @@ will be appended to the specified message.
 
 --abort::
 	Abort the current conflict resolution process, and
-	try to reconstruct the pre-merge state.
+	try to reconstruct the pre-merge state. If an autostash entry is
+	present, apply it to the worktree.
 +
 If there were uncommitted worktree changes present when the merge
 started, 'git merge --abort' will in some cases be unable to
@@ -102,11 +105,15 @@ reconstruct these changes. It is therefore recommended to always
 commit or stash your changes before running 'git merge'.
 +
 'git merge --abort' is equivalent to 'git reset --merge' when
-`MERGE_HEAD` is present.
+`MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in
+which case 'git merge --abort' applies the stash entry to the worktree
+whereas 'git reset --merge' will save the stashed changes in the stash
+list.
 
 --quit::
 	Forget about the current merge in progress. Leave the index
-	and the working tree as-is.
+	and the working tree as-is. If `MERGE_AUTOSTASH` is present, the
+	stash entry will be saved to the stash list.
 
 --continue::
 	After a 'git merge' stops due to conflicts you can conclude the
diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt
index 4da9d24096..3e8f59ac0e 100644
--- a/Documentation/git-mergetool--lib.txt
+++ b/Documentation/git-mergetool--lib.txt
@@ -38,6 +38,10 @@ get_merge_tool_cmd::
 get_merge_tool_path::
 	returns the custom path for a merge tool.
 
+initialize_merge_tool::
+	bring merge tool specific functions into scope so they can be used or
+	overridden.
+
 run_merge_tool::
 	launches a merge tool given the tool name and a true/false
 	flag to indicate whether a merge base is present.
diff --git a/Documentation/git-mergetool.txt b/Documentation/git-mergetool.txt
index 6b14702e78..e587c7763a 100644
--- a/Documentation/git-mergetool.txt
+++ b/Documentation/git-mergetool.txt
@@ -99,6 +99,10 @@ success of the resolution after the custom tool has exited.
 	(see linkgit:git-config[1]).  To cancel `diff.orderFile`,
 	use `-O/dev/null`.
 
+CONFIGURATION
+-------------
+include::config/mergetool.txt[]
+
 TEMPORARY FILES
 ---------------
 `git mergetool` creates `*.orig` backup files while resolving merges.
diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt
index fa6a756123..466a697519 100644
--- a/Documentation/git-mktag.txt
+++ b/Documentation/git-mktag.txt
@@ -3,7 +3,7 @@ git-mktag(1)
 
 NAME
 ----
-git-mktag - Creates a tag object
+git-mktag - Creates a tag object with extra validation
 
 
 SYNOPSIS
@@ -13,23 +13,50 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Reads a tag contents on standard input and creates a tag object
-that can also be used to sign other objects.
 
-The output is the new tag's <object> identifier.
+Reads a tag contents on standard input and creates a tag object. The
+output is the new tag's <object> identifier.
+
+This command is mostly equivalent to linkgit:git-hash-object[1]
+invoked with `-t tag -w --stdin`. I.e. both of these will create and
+write a tag found in `my-tag`:
+
+    git mktag <my-tag
+    git hash-object -t tag -w --stdin <my-tag
+
+The difference is that mktag will die before writing the tag if the
+tag doesn't pass a linkgit:git-fsck[1] check.
+
+The "fsck" check done mktag is stricter than what linkgit:git-fsck[1]
+would run by default in that all `fsck.<msg-id>` messages are promoted
+from warnings to errors (so e.g. a missing "tagger" line is an error).
+
+Extra headers in the object are also an error under mktag, but ignored
+by linkgit:git-fsck[1]. This extra check can be turned off by setting
+the appropriate `fsck.<msg-id>` varible:
+
+    git -c fsck.extraHeaderEntry=ignore mktag <my-tag-with-headers
+
+OPTIONS
+-------
+
+--strict::
+	By default mktag turns on the equivalent of
+	linkgit:git-fsck[1] `--strict` mode. Use `--no-strict` to
+	disable it.
 
 Tag Format
 ----------
 A tag signature file, to be fed to this command's standard input,
 has a very simple fixed format: four lines of
 
-  object <sha1>
+  object <hash>
   type <typename>
   tag <tagname>
   tagger <tagger>
 
 followed by some 'optional' free-form message (some tags created
-by older Git may not have `tagger` line).  The message, when
+by older Git may not have `tagger` line).  The message, when it
 exists, is separated by a blank line from the header.  The
 message part may contain a signature that Git itself doesn't
 care about, but that can be verified with gpg.
diff --git a/Documentation/git-multi-pack-index.txt b/Documentation/git-multi-pack-index.txt
index 233b2b7862..ffd601bc17 100644
--- a/Documentation/git-multi-pack-index.txt
+++ b/Documentation/git-multi-pack-index.txt
@@ -9,7 +9,8 @@ git-multi-pack-index - Write and verify multi-pack-indexes
 SYNOPSIS
 --------
 [verse]
-'git multi-pack-index' [--object-dir=<dir>] <subcommand>
+'git multi-pack-index' [--object-dir=<dir>] [--[no-]progress]
+	[--preferred-pack=<pack>] <subcommand>
 
 DESCRIPTION
 -----------
@@ -23,10 +24,23 @@ OPTIONS
 	`<dir>/packs/multi-pack-index` for the current MIDX file, and
 	`<dir>/packs` for the pack-files to index.
 
+--[no-]progress::
+	Turn progress on/off explicitly. If neither is specified, progress is
+	shown if standard error is connected to a terminal.
+
 The following subcommands are available:
 
 write::
-	Write a new MIDX file.
+	Write a new MIDX file. The following options are available for
+	the `write` sub-command:
++
+--
+	--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.
+--
 
 verify::
 	Verify the contents of the MIDX file.
@@ -47,11 +61,15 @@ repack::
 	multi-pack-index, then divide by the total number of objects in
 	the pack and multiply by the pack size. We select packs with
 	expected size below the batch size until the set of packs have
-	total expected size at least the batch size. If the total size
-	does not reach the batch size, then do nothing. If a new pack-
-	file is created, rewrite the multi-pack-index to reference the
-	new pack-file. A later run of 'git multi-pack-index expire' will
-	delete the pack-files that were part of this batch.
+	total expected size at least the batch size, or all pack-files
+	are considered. If only one pack-file is selected, then do
+	nothing. If a new pack-file is created, rewrite the
+	multi-pack-index to reference the new pack-file. A later run of
+	'git multi-pack-index expire' will delete the pack-files that
+	were part of this batch.
++
+If `repack.packKeptObjects` is `false`, then any pack-files with an
+associated `.keep` file will not be selected for the batch to repack.
 
 
 EXAMPLES
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index f56a5a9197..0a4200674c 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 [verse]
 'git notes' [list [<object>]]
 'git notes' add [-f] [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
-'git notes' copy [-f] ( --stdin | <from-object> <to-object> )
+'git notes' copy [-f] ( --stdin | <from-object> [<to-object>] )
 'git notes' append [--allow-empty] [-F <file> | -m <msg> | (-c | -C) <object>] [<object>]
 'git notes' edit [--allow-empty] [<object>]
 'git notes' show [<object>]
@@ -68,8 +68,8 @@ add::
 	subcommand).
 
 copy::
-	Copy the notes for the first object onto the second object.
-	Abort if the second object already has notes, or if the first
+	Copy the notes for the first object onto the second object (defaults to
+	HEAD). Abort if the second object already has notes, or if the first
 	object has none (use -f to overwrite existing notes to the
 	second object). This subcommand is equivalent to:
 	`git notes add [-f] -C $(git notes list <from-object>) <to-object>`
@@ -223,7 +223,7 @@ are taken from notes refs.  A notes ref is usually a branch which
 contains "files" whose paths are the object names for the objects
 they describe, with some directory separators included for performance
 reasons footnote:[Permitted pathnames have the form
-'ab'`/`'cd'`/`'ef'`/`'...'`/`'abcdef...': a sequence of directory
+'bf'`/`'fe'`/`'30'`/`'...'`/`'680d5a...': a sequence of directory
 names of two hexadecimal digits each followed by a filename with the
 rest of the object ID.].
 
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 3494a1db3e..38e5257b2a 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -374,14 +374,55 @@ These options can be used to modify 'git p4 submit' behavior.
     been submitted. Implies --disable-rebase. Can also be set with
     git-p4.disableP4Sync. Sync with origin/master still goes ahead if possible.
 
-Hook for submit
-~~~~~~~~~~~~~~~
+Hooks for submit
+----------------
+
+p4-pre-submit
+~~~~~~~~~~~~~
+
 The `p4-pre-submit` hook is executed if it exists and is executable.
 The hook takes no parameters and nothing from standard input. Exiting with
 non-zero status from this script prevents `git-p4 submit` from launching.
+It can be bypassed with the `--no-verify` command line option.
 
 One usage scenario is to run unit tests in the hook.
 
+p4-prepare-changelist
+~~~~~~~~~~~~~~~~~~~~~
+
+The `p4-prepare-changelist` hook is executed right after preparing
+the default changelist message and before the editor is started.
+It takes one parameter, the name of the file that contains the
+changelist text. Exiting with a non-zero status from the script
+will abort the process.
+
+The purpose of the hook is to edit the message file in place,
+and it is not suppressed by the `--no-verify` option. This hook
+is called even if `--prepare-p4-only` is set.
+
+p4-changelist
+~~~~~~~~~~~~~
+
+The `p4-changelist` hook is executed after the changelist
+message has been edited by the user. It can be bypassed with the
+`--no-verify` option. It takes a single parameter, the name
+of the file that holds the proposed changelist text. Exiting
+with a non-zero status causes the command to abort.
+
+The hook is allowed to edit the changelist file and can be used
+to normalize the text into some project standard format. It can
+also be used to refuse the Submit after inspect the message file.
+
+p4-post-changelist
+~~~~~~~~~~~~~~~~~~
+
+The `p4-post-changelist` hook is invoked after the submit has
+successfully occurred in P4. It takes no parameters and is meant
+primarily for notification and cannot affect the outcome of the
+git p4 submit action.
+
+
+
 Rebase options
 ~~~~~~~~~~~~~~
 These options can be used to modify 'git p4 rebase' behavior.
@@ -721,3 +762,7 @@ IMPLEMENTATION DETAILS
   message indicating the p4 depot location and change number.  This
   line is used by later 'git p4 sync' operations to know which p4
   changes are new.
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index fecdf2600c..dbfd1f9017 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -14,7 +14,7 @@ SYNOPSIS
 	[--local] [--incremental] [--window=<n>] [--depth=<n>]
 	[--revs [--unpacked | --all]] [--keep-pack=<pack-name>]
 	[--stdout [--filter=<filter-spec>] | base-name]
-	[--shallow] [--keep-true-parents] [--sparse] < object-list
+	[--shallow] [--keep-true-parents] [--[no-]sparse] < object-list
 
 
 DESCRIPTION
@@ -85,6 +85,16 @@ base-name::
 	reference was included in the resulting packfile.  This
 	can be useful to send new tags to native Git clients.
 
+--stdin-packs::
+	Read the basenames of packfiles (e.g., `pack-1234abcd.pack`)
+	from the standard input, instead of object names or revision
+	arguments. The resulting pack contains all objects listed in the
+	included packs (those not beginning with `^`), excluding any
+	objects listed in the excluded packs (beginning with `^`).
++
+Incompatible with `--revs`, or options that imply `--revs` (such as
+`--all`), with the exception of `--unpacked`, which is compatible.
+
 --window=<n>::
 --depth=<n>::
 	These two options affect how the objects contained in
@@ -118,10 +128,10 @@ depth is 4095.
 	into multiple independent packfiles, each not larger than the
 	given size. The size can be suffixed with
 	"k", "m", or "g". The minimum size allowed is limited to 1 MiB.
-	This option
-	prevents the creation of a bitmap index.
 	The default is unlimited, unless the config variable
-	`pack.packSizeLimit` is set.
+	`pack.packSizeLimit` is set. Note that this option may result in
+	a larger and slower repository; see the discussion in
+	`pack.packSizeLimit`.
 
 --honor-pack-keep::
 	This flag causes an object already in a local pack that
@@ -196,14 +206,16 @@ depth is 4095.
 	Add --no-reuse-object if you want to force a uniform compression
 	level on all data no matter the source.
 
---sparse::
-	Use the "sparse" algorithm to determine which objects to include in
+--[no-]sparse::
+	Toggle the "sparse" algorithm to determine which objects to include in
 	the pack, when combined with the "--revs" option. This algorithm
 	only walks trees that appear in paths that introduce new objects.
 	This can have significant performance benefits when computing
 	a pack to send a small change. However, it is possible that extra
 	objects are added to the pack-file if the included commits contain
-	certain types of direct renames.
+	certain types of direct renames. If this option is not included,
+	it defaults to the value of `pack.useSparse`, which is true unless
+	otherwise specified.
 
 --thin::
 	Create a "thin" pack by omitting the common objects between a
@@ -268,15 +280,18 @@ So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle.
 	This option specifies how missing objects are handled.
 +
 The form '--missing=error' requests that pack-objects stop with an error if
-a missing object is encountered.  This is the default action.
+a missing object is encountered.  If the repository is a partial clone, an
+attempt to fetch missing objects will be made before declaring them missing.
+This is the default action.
 +
 The form '--missing=allow-any' will allow object traversal to continue
-if a missing object is encountered.  Missing objects will silently be
-omitted from the results.
+if a missing object is encountered.  No fetch of a missing object will occur.
+Missing objects will silently be omitted from the results.
 +
 The form '--missing=allow-promisor' is like 'allow-any', but will only
 allow object traversal to continue for EXPECTED promisor missing objects.
-Unexpected missing object will raise an error.
+No fetch of a missing object will occur.  An unexpected missing object will
+raise an error.
 
 --exclude-promisor-objects::
 	Omit objects that are known to be in the promisor remote.  (This
@@ -395,6 +410,17 @@ Note that we pick a single island for each regex to go into, using "last
 one wins" ordering (which allows repo-specific config to take precedence
 over user-wide config, and so forth).
 
+
+CONFIGURATION
+-------------
+
+Various configuration variables affect packing, see
+linkgit:git-config[1] (search for "pack" and "delta").
+
+Notably, delta compression is not used on objects larger than the
+`core.bigFileThreshold` configuration variable and on files with the
+attribute `delta` set to false.
+
 SEE ALSO
 --------
 linkgit:git-rev-list[1]
diff --git a/Documentation/git-parse-remote.txt b/Documentation/git-parse-remote.txt
deleted file mode 100644
index a45ea1ece8..0000000000
--- a/Documentation/git-parse-remote.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-git-parse-remote(1)
-===================
-
-NAME
-----
-git-parse-remote - Routines to help parsing remote repository access parameters
-
-
-SYNOPSIS
---------
-[verse]
-'. "$(git --exec-path)/git-parse-remote"'
-
-DESCRIPTION
------------
-This script is included in various scripts to supply
-routines to parse files under $GIT_DIR/remotes/ and
-$GIT_DIR/branches/ and configuration variables that are related
-to fetching, pulling and pushing.
-
-GIT
----
-Part of the linkgit:git[1] suite
diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index dfb901f8b8..aef757ec89 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
@@ -85,8 +88,9 @@ OPTIONS
 	Pass --verbose to git-fetch and git-merge.
 
 --[no-]recurse-submodules[=yes|on-demand|no]::
-	This option controls if new commits of all populated submodules should
-	be fetched and updated, too (see linkgit:git-config[1] and
+	This option controls if new commits of populated submodules should
+	be fetched, and if the working trees of active submodules should be
+	updated, too (see linkgit:git-fetch[1], linkgit:git-config[1] and
 	linkgit:gitmodules[5]).
 +
 If the checkout is done via rebase, local submodule commits are rebased as well.
@@ -116,7 +120,7 @@ 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.
 +
@@ -131,16 +135,7 @@ published that history already.  Do *not* use this option
 unless you have read linkgit:git-rebase[1] carefully.
 
 --no-rebase::
-	Override earlier --rebase.
-
---autostash::
---no-autostash::
-	Before starting rebase, stash local modifications away (see
-	linkgit:git-stash[1]) if needed, and apply the stash entry when
-	done. `--no-autostash` is useful to override the `rebase.autoStash`
-	configuration variable (see linkgit:git-config[1]).
-+
-This option is only valid when "--rebase" is used.
+	This is shorthand for --rebase=false.
 
 Options related to fetching
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -229,9 +224,9 @@ branch.<name>.merge options; see linkgit:git-config[1] for details.
 $ git pull origin next
 ------------------------------------------------
 +
-This leaves a copy of `next` temporarily in FETCH_HEAD, but
-does not update any remote-tracking branches. Using remote-tracking
-branches, the same can be done by invoking fetch and merge:
+This leaves a copy of `next` temporarily in FETCH_HEAD, and
+updates the remote-tracking branch `origin/next`.
+The same can be done by invoking fetch and merge:
 +
 ------------------------------------------------
 $ git fetch origin
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 3b8053447e..2f25aa3a29 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -13,7 +13,7 @@ SYNOPSIS
 	   [--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
 	   [-u | --set-upstream] [-o <string> | --push-option=<string>]
 	   [--[no-]signed|--signed=(true|false|if-asked)]
-	   [--force-with-lease[=<refname>[:<expect>]]]
+	   [--force-with-lease[=<refname>[:<expect>]] [--force-if-includes]]
 	   [--no-verify] [<repository> [<refspec>...]]
 
 DESCRIPTION
@@ -244,8 +244,8 @@ Imagine that you have to rebase what you have already published.
 You will have to bypass the "must fast-forward" rule in order to
 replace the history you originally published with the rebased history.
 If somebody else built on top of your original history while you are
-rebasing, the tip of the branch at the remote may advance with her
-commit, and blindly pushing with `--force` will lose her work.
+rebasing, the tip of the branch at the remote may advance with their
+commit, and blindly pushing with `--force` will lose their work.
 +
 This option allows you to say that you expect the history you are
 updating is what you rebased and want to replace. If the remote ref
@@ -320,6 +320,14 @@ seen and are willing to overwrite, then rewrite history, and finally
 force push changes to `master` if the remote version is still at
 `base`, regardless of what your local `remotes/origin/master` has been
 updated to in the background.
++
+Alternatively, specifying `--force-if-includes` as an ancillary option
+along with `--force-with-lease[=<refname>]` (i.e., without saying what
+exact commit the ref on the remote side must be pointing at, or which
+refs on the remote side are being protected) at the time of "push" will
+verify if updates from the remote-tracking refs that may have been
+implicitly updated in the background are integrated locally before
+allowing a forced update.
 
 -f::
 --force::
@@ -341,6 +349,22 @@ one branch, use a `+` in front of the refspec to push (e.g `git push
 origin +master` to force a push to the `master` branch). See the
 `<refspec>...` section above for details.
 
+--[no-]force-if-includes::
+	Force an update only if the tip of the remote-tracking ref
+	has been integrated locally.
++
+This option enables a check that verifies if the tip of the
+remote-tracking ref is reachable from one of the "reflog" entries of
+the local branch based in it for a rewrite. The check ensures that any
+updates from the remote have been incorporated locally by rejecting the
+forced update if that is not the case.
++
+If the option is passed without specifying `--force-with-lease`, or
+specified along with `--force-with-lease=<refname>:<expect>`, it is
+a "no-op".
++
+Specifying `--no-force-if-includes` disables this behavior.
+
 --repo=<repository>::
 	This option is equivalent to the <repository> argument. If both
 	are specified, the command-line argument takes precedence.
@@ -576,7 +600,7 @@ EXAMPLES
 
 `git push origin`::
 	Without additional configuration, pushes the current branch to
-	the configured upstream (`remote.origin.merge` configuration
+	the configured upstream (`branch.<name>.merge` configuration
 	variable) if it has the same name as the current branch, and
 	errors out without pushing otherwise.
 +
diff --git a/Documentation/git-range-diff.txt b/Documentation/git-range-diff.txt
index 8a6ea2c6c5..fe350d7f40 100644
--- a/Documentation/git-range-diff.txt
+++ b/Documentation/git-range-diff.txt
@@ -10,6 +10,7 @@ SYNOPSIS
 [verse]
 'git range-diff' [--color=[<when>]] [--no-color] [<diff-options>]
 	[--no-dual-color] [--creation-factor=<factor>]
+	[--left-only | --right-only]
 	( <range1> <range2> | <rev1>...<rev2> | <base> <rev1> <rev2> )
 
 DESCRIPTION
@@ -28,6 +29,17 @@ Finally, the list of matching commits is shown in the order of the
 second commit range, with unmatched commits being inserted just after
 all of their ancestors have been shown.
 
+There are three ways to specify the commit ranges:
+
+- `<range1> <range2>`: Either commit range can be of the form
+  `<base>..<rev>`, `<rev>^!` or `<rev>^-<n>`. See `SPECIFYING RANGES`
+  in linkgit:gitrevisions[7] for more details.
+
+- `<rev1>...<rev2>`. This is equivalent to
+  `<rev2>..<rev1> <rev1>..<rev2>`.
+
+- `<base> <rev1> <rev2>`: This is equivalent to `<base>..<rev1>
+  <base>..<rev2>`.
 
 OPTIONS
 -------
@@ -57,6 +69,18 @@ to revert to color all lines according to the outer diff markers
 	See the ``Algorithm`` section below for an explanation why this is
 	needed.
 
+--left-only::
+	Suppress commits that are missing from the first specified range
+	(or the "left range" when using the `<rev1>...<rev2>` format).
+
+--right-only::
+	Suppress commits that are missing from the second specified range
+	(or the "right range" when using the `<rev1>...<rev2>` format).
+
+--[no-]notes[=<ref>]::
+	This flag is passed to the `git log` program
+	(see linkgit:git-log[1]) that generates the patches.
+
 <range1> <range2>::
 	Compare the commits specified by the two ranges, where
 	`<range1>` is considered an older version of `<range2>`.
@@ -75,7 +99,7 @@ to revert to color all lines according to the outer diff markers
 linkgit:git-diff[1]), most notably the `--color=[<when>]` and
 `--no-color` options. These options are used when generating the "diff
 between patches", i.e. to compare the author, commit message and diff of
-corresponding old/new commits. There is currently no means to tweak the
+corresponding old/new commits. There is currently no means to tweak most of the
 diff options passed to `git log` when generating those patches.
 
 OUTPUT STABILITY
@@ -242,7 +266,7 @@ corresponding.
 
 The overall time needed to compute this algorithm is the time needed to
 compute n+m commit diffs and then n*m diffs of patches, plus the time
-needed to compute the least-cost assigment between n and m diffs. Git
+needed to compute the least-cost assignment between n and m diffs. Git
 uses an implementation of the Jonker-Volgenant algorithm to solve the
 assignment problem, which has cubic runtime complexity. The matching
 found in this case will look like this:
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index d271842608..5fa8bab64c 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -116,9 +116,9 @@ OPTIONS
 	located in.
 
 --[no-]recurse-submodules::
-	Using --recurse-submodules will update the content of all initialized
+	Using --recurse-submodules will update the content of all active
 	submodules according to the commit recorded in the superproject by
-	calling read-tree recursively, also setting the submodules HEAD to be
+	calling read-tree recursively, also setting the submodules' HEAD to be
 	detached at that commit.
 
 --no-sparse-checkout::
@@ -436,7 +436,7 @@ support.
 SEE ALSO
 --------
 linkgit:git-write-tree[1]; linkgit:git-ls-files[1];
-linkgit:gitignore[5]
+linkgit:gitignore[5]; linkgit:git-sparse-checkout[1];
 
 GIT
 ---
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 639a4179d1..506345cb0e 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
@@ -200,11 +201,6 @@ Alternatively, you can undo the 'git rebase' with
 
     git rebase --abort
 
-CONFIGURATION
--------------
-
-include::config/rebase.txt[]
-
 OPTIONS
 -------
 --onto <newbase>::
@@ -256,18 +252,82 @@ See also INCOMPATIBLE OPTIONS below.
 --quit::
 	Abort the rebase operation but HEAD is not reset back to the
 	original branch. The index and working tree are also left
-	unchanged as a result.
+	unchanged as a result. If a temporary stash entry was created
+	using --autostash, it will be saved to the stash list.
 
+--apply::
+	Use applying strategies to rebase (calling `git-am`
+	internally).  This option may become a no-op in the future
+	once the merge backend handles everything the apply one does.
++
+See also INCOMPATIBLE OPTIONS below.
+
+--empty={drop,keep,ask}::
+	How to handle commits that are not empty to start and are not
+	clean cherry-picks of any upstream commit, but which become
+	empty after rebasing (because they contain a subset of already
+	upstream changes).  With drop (the default), commits that
+	become empty are dropped.  With keep, such commits are kept.
+	With ask (implied by --interactive), the rebase will halt when
+	an empty commit is applied allowing you to choose whether to
+	drop it, edit files more, or just commit the empty changes.
+	Other options, like --exec, will use the default of drop unless
+	-i/--interactive is explicitly specified.
++
+Note that commits which start empty are kept (unless --no-keep-empty
+is specified), and commits which are clean cherry-picks (as determined
+by `git log --cherry-mark ...`) are detected and dropped as a
+preliminary step (unless --reapply-cherry-picks is passed).
++
+See also INCOMPATIBLE OPTIONS below.
+
+--no-keep-empty::
 --keep-empty::
-	Keep the commits that do not change anything from its
-	parents in the result.
+	Do not keep commits that start empty before the rebase
+	(i.e. that do not change anything from its parent) in the
+	result.  The default is to keep commits which start empty,
+	since creating such commits requires passing the --allow-empty
+	override flag to `git commit`, signifying that a user is very
+	intentionally creating such a commit and thus wants to keep
+	it.
++
+Usage of this flag will probably be rare, since you can get rid of
+commits that start empty by just firing up an interactive rebase and
+removing the lines corresponding to the commits you don't want.  This
+flag exists as a convenient shortcut, such as for cases where external
+tools generate many empty commits and you want them all removed.
++
+For commits which do not start empty but become empty after rebasing,
+see the --empty flag.
++
+See also INCOMPATIBLE OPTIONS below.
+
+--reapply-cherry-picks::
+--no-reapply-cherry-picks::
+	Reapply all clean cherry-picks of any upstream commit instead
+	of preemptively dropping them. (If these commits then become
+	empty after rebasing, because they contain a subset of already
+	upstream changes, the behavior towards them is controlled by
+	the `--empty` flag.)
++
+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.  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.
 +
 See also INCOMPATIBLE OPTIONS below.
 
 --allow-empty-message::
-	By default, rebasing commits with an empty message will fail.
-	This option overrides that behavior, allowing commits with empty
-	messages to be rebased.
+	No-op.  Rebasing commits with an empty message used to fail
+	and this option would override that behavior, allowing commits
+	with empty messages to be rebased.  Now commits with an empty
+	message do not cause rebasing to halt.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -284,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.
+	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
@@ -298,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
@@ -313,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.
@@ -325,9 +382,12 @@ See also INCOMPATIBLE OPTIONS below.
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
+--no-gpg-sign::
 	GPG-sign commits. The `keyid` argument is optional and
 	defaults to the committer identity; if specified, it must be
-	stuck to the option without a space.
+	stuck to the option without a space. `--no-gpg-sign` is useful to
+	countermand both `commit.gpgSign` configuration variable, and
+	earlier `--gpg-sign`.
 
 -q::
 --quiet::
@@ -356,7 +416,7 @@ See also INCOMPATIBLE OPTIONS below.
 	Ensure at least <n> lines of surrounding context match before
 	and after each change.  When fewer lines of surrounding
 	context exist they all must match.  By default no context is
-	ever ignored.
+	ever ignored.  Implies --apply.
 +
 See also INCOMPATIBLE OPTIONS below.
 
@@ -385,29 +445,53 @@ When --fork-point is active, 'fork_point' will be used instead of
 <branch>` command (see linkgit:git-merge-base[1]).  If 'fork_point'
 ends up being empty, the <upstream> will be used as a fallback.
 +
-If either <upstream> or --root is given on the command line, then the
-default is `--no-fork-point`, otherwise the default is `--fork-point`.
+If <upstream> is given on the command line, then the default is
+`--no-fork-point`, otherwise the default is `--fork-point`.
 +
 If your branch was based on <upstream> but <upstream> was rewound and
 your branch contains commits which were dropped, this option can be used
 with `--keep-base` in order to drop those commits from your branch.
++
+See also INCOMPATIBLE OPTIONS below.
 
 --ignore-whitespace::
+	Ignore whitespace differences when trying to reconcile
+differences. Currently, each backend implements an approximation of
+this behavior:
++
+apply backend: When applying a patch, ignore changes in whitespace in
+context lines. Unfortunately, this means that if the "old" lines being
+replaced by the patch differ only in whitespace from the existing
+file, you will get a merge conflict instead of a successful patch
+application.
++
+merge backend: Treat lines with only whitespace changes as unchanged
+when merging. Unfortunately, this means that any patch hunks that were
+intended to modify whitespace and nothing else will be dropped, even
+if the other side had no changes that conflicted.
+
 --whitespace=<option>::
-	These flag are passed to the 'git apply' program
+	This flag is passed to the 'git apply' program
 	(see linkgit:git-apply[1]) that applies the patch.
+	Implies --apply.
 +
 See also INCOMPATIBLE OPTIONS below.
 
 --committer-date-is-author-date::
+	Instead of using the current time as the committer date, use
+	the author date of the commit being rebased as the committer
+	date. This option implies `--force-rebase`.
+
 --ignore-date::
-	These flags are passed to 'git am' to easily change the dates
-	of the rebased commits (see linkgit:git-am[1]).
+--reset-author-date::
+	Instead of using the author date of the original commit, use
+	the current time as the	author date of the rebased commit.  This
+	option implies `--force-rebase`.
 +
 See also INCOMPATIBLE OPTIONS below.
 
 --signoff::
-	Add a Signed-off-by: trailer to all the rebased commits. Note
+	Add a `Signed-off-by` trailer to all the rebased commits. Note
 	that if `--interactive` is given then only commits marked to be
 	picked, edited or reworded will have the trailer added.
 +
@@ -443,11 +527,11 @@ 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 in contrast to that option works well in interactive
-rebases: commits can be reordered, inserted and dropped at will.
+`--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.
@@ -504,16 +588,17 @@ See also INCOMPATIBLE OPTIONS below.
 
 --autosquash::
 --no-autosquash::
-	When the commit log message begins with "squash! ..." (or
-	"fixup! ..."), and there is already a commit in the todo list that
-	matches the same `...`, automatically modify the todo list of rebase
-	-i so that the commit marked for squashing comes right after the
-	commit to be modified, and change the action of the moved commit
-	from `pick` to `squash` (or `fixup`).  A commit matches the `...` if
-	the commit subject matches, or if the `...` refers to the commit's
-	hash. As a fall-back, partial matches of the commit subject work,
-	too.  The recommended way to create fixup/squash commits is by using
-	the `--fixup`/`--squash` options of linkgit:git-commit[1].
+	When the commit log message begins with "squash! ..." or "fixup! ..."
+	or "amend! ...", and there is already a commit in the todo list that
+	matches the same `...`, automatically modify the todo list of
+	`rebase -i`, so that the commit marked for squashing comes right after
+	the commit to be modified, and change the action of the moved commit
+	from `pick` to `squash` or `fixup` or `fixup -C` respectively. A commit
+	matches the `...` if the commit subject matches, or if the `...` refers
+	to the commit's hash. As a fall-back, partial matches of the commit
+	subject work, too. The recommended way to create fixup/amend/squash
+	commits is by using the `--fixup`, `--fixup=amend:` or `--fixup=reword:`
+	and `--squash` options respectively of linkgit:git-commit[1].
 +
 If the `--autosquash` option is enabled by default using the
 configuration variable `rebase.autoSquash`, this option can be
@@ -533,16 +618,22 @@ See also INCOMPATIBLE OPTIONS below.
 --no-reschedule-failed-exec::
 	Automatically reschedule `exec` commands that failed. This only makes
 	sense in interactive mode (or when an `--exec` option was provided).
++
+Even though this option applies once a rebase is started, it's set for
+the whole rebase at the start based on either the
+`rebase.rescheduleFailedExec` configuration (see linkgit:git-config[1]
+or "CONFIGURATION" below) or whether this option is
+provided. Otherwise an explicit `--no-reschedule-failed-exec` at the
+start would be overridden by the presence of
+`rebase.rescheduleFailedExec=true` configuration.
 
 INCOMPATIBLE OPTIONS
 --------------------
 
 The following options:
 
- * --committer-date-is-author-date
- * --ignore-date
+ * --apply
  * --whitespace
- * --ignore-whitespace
  * -C
 
 are incompatible with the following options:
@@ -556,7 +647,9 @@ are incompatible with the following options:
  * --preserve-merges
  * --interactive
  * --exec
- * --keep-empty
+ * --no-keep-empty
+ * --empty=
+ * --reapply-cherry-picks
  * --edit-todo
  * --root when used in combination with --onto
 
@@ -565,33 +658,152 @@ 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
 
 BEHAVIORAL DIFFERENCES
 -----------------------
 
-There are some subtle differences how the backends behave.
+git rebase has two primary backends: apply and merge.  (The apply
+backend used to be known as the 'am' backend, but the name led to
+confusion as it looks like a verb instead of a noun.  Also, the merge
+backend used to be known as the interactive backend, but it is now
+used for non-interactive cases as well.  Both were renamed based on
+lower-level functionality that underpinned each.) There are some
+subtle differences in how these two backends behave:
 
 Empty commits
 ~~~~~~~~~~~~~
 
-The am backend drops any "empty" commits, regardless of whether the
-commit started empty (had no changes relative to its parent to
-start with) or ended empty (all changes were already applied
-upstream in other commits).
+The apply backend unfortunately drops intentionally empty commits, i.e.
+commits that started empty, though these are rare in practice.  It
+also drops commits that become empty and has no option for controlling
+this behavior.
+
+The merge backend keeps intentionally empty commits by default (though
+with -i they are marked as empty in the todo list editor, or they can
+be dropped automatically with --no-keep-empty).
 
-The interactive backend drops commits by default that
-started empty and halts if it hits a commit that ended up empty.
-The `--keep-empty` option exists for the interactive backend to allow
-it to keep commits that started empty.
+Similar to the apply backend, by default the merge backend drops
+commits that become empty unless -i/--interactive is specified (in
+which case it stops and asks the user what to do).  The merge backend
+also has an --empty={drop,keep,ask} option for changing the behavior
+of handling commits that become empty.
 
 Directory rename detection
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-Directory rename heuristics are enabled in the merge and interactive
-backends.  Due to the lack of accurate tree information, directory
-rename detection is disabled in the am backend.
+Due to the lack of accurate tree information (arising from
+constructing fake ancestors with the limited information available in
+patches), directory rename detection is disabled in the apply backend.
+Disabled directory rename detection means that if one side of history
+renames a directory and the other adds new files to the old directory,
+then the new files will be left behind in the old directory without
+any warning at the time of rebasing that you may want to move these
+files into the new directory.
+
+Directory rename detection works with the merge backend to provide you
+warnings in such cases.
+
+Context
+~~~~~~~
+
+The apply backend works by creating a sequence of patches (by calling
+`format-patch` internally), and then applying the patches in sequence
+(calling `am` internally).  Patches are composed of multiple hunks,
+each with line numbers, a context region, and the actual changes.  The
+line numbers have to be taken with some fuzz, since the other side
+will likely have inserted or deleted lines earlier in the file.  The
+context region is meant to help find how to adjust the line numbers in
+order to apply the changes to the right lines.  However, if multiple
+areas of the code have the same surrounding lines of context, the
+wrong one can be picked.  There are real-world cases where this has
+caused commits to be reapplied incorrectly with no conflicts reported.
+Setting diff.context to a larger value may prevent such types of
+problems, but increases the chance of spurious conflicts (since it
+will require more lines of matching context to apply).
+
+The merge backend works with a full copy of each relevant file,
+insulating it from these types of problems.
+
+Labelling of conflicts markers
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+When there are content conflicts, the merge machinery tries to
+annotate each side's conflict markers with the commits where the
+content came from.  Since the apply backend drops the original
+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.
+
+The merge backend works with the full commits on both sides of history
+and thus has no such limitations.
+
+Hooks
+~~~~~
+
+The apply backend has not traditionally called the post-commit hook,
+while the merge backend has.  Both have called the post-checkout hook,
+though the merge backend has squelched its output.  Further, both
+backends only call the post-checkout hook with the starting point
+commit of the rebase, not the intermediate commits nor the final
+commit.  In each case, the calling of these hooks was by accident of
+implementation rather than by design (both backends were originally
+implemented as shell scripts and happened to invoke other commands
+like 'git checkout' or 'git commit' that would call the hooks).  Both
+backends should have the same behavior, though it is not entirely
+clear which, if any, is correct.  We will likely make rebase stop
+calling either of these hooks in the future.
+
+Interruptability
+~~~~~~~~~~~~~~~~
+
+The apply backend has safety problems with an ill-timed interrupt; if
+the user presses Ctrl-C at the wrong time to try to abort the rebase,
+the rebase can enter a state where it cannot be aborted with a
+subsequent `git rebase --abort`.  The merge backend does not appear to
+suffer from the same shortcoming.  (See
+https://lore.kernel.org/git/20200207132152.GC2868@szeder.dev/ for
+details.)
+
+Commit Rewording
+~~~~~~~~~~~~~~~~
+
+When a conflict occurs while rebasing, rebase stops and asks the user
+to resolve.  Since the user may need to make notable changes while
+resolving conflicts, after conflicts are resolved and the user has run
+`git rebase --continue`, the rebase should open an editor and ask the
+user to update the commit message.  The merge backend does this, while
+the apply backend blindly applies the original commit message.
+
+Miscellaneous differences
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+There are a few more behavioral differences that most folks would
+probably consider inconsequential but which are mentioned for
+completeness:
+
+* Reflog: The two backends will use different wording when describing
+  the changes made in the reflog, though both will make use of the
+  word "rebase".
+
+* Progress, informational, and error messages: The two backends
+  provide slightly different progress and informational messages.
+  Also, the apply backend writes error messages (such as "Your files
+  would be overwritten...") to stdout, while the merge backend writes
+  them to stderr.
+
+* State directories: The two backends keep their state in different
+  directories under .git/
 
 include::merge-strategies.txt[]
 
@@ -679,9 +891,17 @@ If you want to fold two or more commits into one, replace the command
 "pick" for the second and subsequent commits with "squash" or "fixup".
 If the commits had different authors, the folded commit will be
 attributed to the author of the first commit.  The suggested commit
-message for the folded commit is the concatenation of the commit
-messages of the first commit and of those with the "squash" command,
-but omits the commit messages of commits with the "fixup" command.
+message for the folded commit is the concatenation of the first
+commit's message with those identified by "squash" commands, omitting the
+messages of commits identified by "fixup" commands, unless "fixup -c"
+is used.  In that case the suggested commit message is only the message
+of the "fixup -c" commit, and an editor is opened allowing you to edit
+the message.  The contents (patch) of the "fixup -c" commit are still
+incorporated into the folded commit. If there is more than one "fixup -c"
+commit, the message from the final one is used.  You can also use
+"fixup -C" to get the same behavior as "fixup -c" except without opening
+an editor.
+
 
 'git rebase' will stop when "pick" has been replaced with "edit" or
 when a command fails due to merge errors. When you are done editing
@@ -866,7 +1086,8 @@ Only works if the changes (patch IDs based on the diff contents) on
 'subsystem' did.
 
 In that case, the fix is easy because 'git rebase' knows to skip
-changes that are already present in the new upstream.  So if you say
+changes that are already present in the new upstream (unless
+`--reapply-cherry-picks` is given). So if you say
 (assuming you're on 'topic')
 ------------
     $ git rebase subsystem
@@ -999,12 +1220,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
@@ -1048,6 +1273,12 @@ merge tlsv1.3
 merge cmake
 ------------
 
+CONFIGURATION
+-------------
+
+include::config/rebase.txt[]
+include::config/sequencer.txt[]
+
 BUGS
 ----
 The todo list presented by the deprecated `--preserve-merges --interactive`
diff --git a/Documentation/git-remote.txt b/Documentation/git-remote.txt
index 9659abbf8e..31c29c9b31 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>)
@@ -35,7 +35,7 @@ OPTIONS
 -v::
 --verbose::
 	Be a little more verbose and show remote url after name.
-	NOTE: This must be placed between `remote` and `subcommand`.
+	NOTE: This must be placed between `remote` and subcommand.
 
 
 COMMANDS
@@ -46,7 +46,7 @@ subcommands are available to perform operations on the remotes.
 
 'add'::
 
-Adds a remote named <name> for the repository at
+Add a remote named <name> for the repository at
 <url>.  The command `git fetch <name>` can then be used to create and
 update remote-tracking branches <name>/<branch>.
 +
@@ -109,13 +109,13 @@ With `-d` or `--delete`, the symbolic ref `refs/remotes/<name>/HEAD` is deleted.
 +
 With `-a` or `--auto`, the remote is queried to determine its `HEAD`, then the
 symbolic-ref `refs/remotes/<name>/HEAD` is set to the same branch. e.g., if the remote
-`HEAD` is pointed at `next`, "`git remote set-head origin -a`" will set
+`HEAD` is pointed at `next`, `git remote set-head origin -a` will set
 the symbolic-ref `refs/remotes/origin/HEAD` to `refs/remotes/origin/next`. This will
 only work if `refs/remotes/origin/next` already exists; if not it must be
 fetched first.
 +
-Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., "git
-remote set-head origin master" will set the symbolic-ref `refs/remotes/origin/HEAD` to
+Use `<branch>` to set the symbolic-ref `refs/remotes/<name>/HEAD` explicitly. e.g., `git
+remote set-head origin master` will set the symbolic-ref `refs/remotes/origin/HEAD` to
 `refs/remotes/origin/master`. This will only work if
 `refs/remotes/origin/master` already exists; if not it must be fetched first.
 +
@@ -127,7 +127,7 @@ This can be used to track a subset of the available remote branches
 after the initial setup for a remote.
 +
 The named branches will be interpreted as if specified with the
-`-t` option on the 'git remote add' command line.
+`-t` option on the `git remote add` command line.
 +
 With `--add`, instead of replacing the list of currently tracked
 branches, adds to that list.
@@ -181,16 +181,16 @@ fetch --prune <name>`, except that no new references will be fetched.
 See the PRUNING section of linkgit:git-fetch[1] for what it'll prune
 depending on various configuration.
 +
-With `--dry-run` option, report what branches will be pruned, but do not
+With `--dry-run` option, report what branches would be pruned, but do not
 actually prune them.
 
 'update'::
 
 Fetch updates for remotes or remote groups in the repository as defined by
-remotes.<group>.  If neither group nor remote is specified on the command line,
+`remotes.<group>`. If neither group nor remote is specified on the command line,
 the configuration parameter remotes.default will be used; if
 remotes.default is not defined, all remotes which do not have the
-configuration parameter remote.<name>.skipDefaultUpdate set to true will
+configuration parameter `remote.<name>.skipDefaultUpdate` set to true will
 be updated.  (See linkgit:git-config[1]).
 +
 With `--prune` option, run pruning against all the remotes that are updated.
@@ -203,6 +203,17 @@ The remote configuration is achieved using the `remote.origin.url` and
 `remote.origin.fetch` configuration variables.  (See
 linkgit:git-config[1]).
 
+EXIT STATUS
+-----------
+
+On success, the exit status is `0`.
+
+When subcommands such as 'add', 'rename', and 'remove' can't find the
+remote in question, the exit status is `2`. When the remote already
+exists, the exit status is `3`.
+
+On any other error, the exit status may be any other non-zero value.
+
 EXAMPLES
 --------
 
diff --git a/Documentation/git-repack.txt b/Documentation/git-repack.txt
index 92f146d27d..24c00c9384 100644
--- a/Documentation/git-repack.txt
+++ b/Documentation/git-repack.txt
@@ -121,7 +121,9 @@ depth is 4095.
 	If specified, multiple packfiles may be created, which also
 	prevents the creation of a bitmap index.
 	The default is unlimited, unless the config variable
-	`pack.packSizeLimit` is set.
+	`pack.packSizeLimit` is set. Note that this option may result in
+	a larger and slower repository; see the discussion in
+	`pack.packSizeLimit`.
 
 -b::
 --write-bitmap-index::
@@ -165,9 +167,35 @@ depth is 4095.
 	Pass the `--delta-islands` option to `git-pack-objects`, see
 	linkgit:git-pack-objects[1].
 
-Configuration
+-g=<factor>::
+--geometric=<factor>::
+	Arrange resulting pack structure so that each successive pack
+	contains at least `<factor>` times the number of objects as the
+	next-largest pack.
++
+`git repack` ensures this by determining a "cut" of packfiles that need
+to be repacked into one in order to ensure a geometric progression. It
+picks the smallest set of packfiles such that as many of the larger
+packfiles (by count of objects contained in that pack) may be left
+intact.
++
+Unlike other repack modes, the set of objects to pack is determined
+uniquely by the set of packs being "rolled-up"; in other words, the
+packs determined to need to be combined in order to restore a geometric
+progression.
++
+When `--unpacked` is specified, loose objects are implicitly included in
+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`.
+
+CONFIGURATION
 -------------
 
+Various configuration variables affect packing, see
+linkgit:git-config[1] (search for "pack" and "delta").
+
 By default, the command passes `--delta-base-offset` option to
 'git pack-objects'; this typically results in slightly smaller packs,
 but the generated packs are incompatible with versions of Git older than
@@ -178,6 +206,10 @@ need to set the configuration variable `repack.UseDeltaBaseOffset` to
 is unaffected by this option as the conversion is performed on the fly
 as needed in that case.
 
+Delta compression is not used on objects larger than the
+`core.bigFileThreshold` configuration variable and on files with the
+attribute `delta` set to false.
+
 SEE ALSO
 --------
 linkgit:git-pack-objects[1]
diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt
index 97e0544d9e..252e2d4e47 100644
--- a/Documentation/git-reset.txt
+++ b/Documentation/git-reset.txt
@@ -8,34 +8,36 @@ git-reset - Reset current HEAD to the specified state
 SYNOPSIS
 --------
 [verse]
-'git reset' [-q] [<tree-ish>] [--] <paths>...
-'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]
+'git reset' [-q] [<tree-ish>] [--] <pathspec>...
+'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]
+'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]
 'git reset' [--soft | --mixed [-N] | --hard | --merge | --keep] [-q] [<commit>]
 
 DESCRIPTION
 -----------
-In the first and second form, copy entries from `<tree-ish>` to the index.
-In the third form, set the current branch head (`HEAD`) to `<commit>`,
+In the first three forms, copy entries from `<tree-ish>` to the index.
+In the last form, set the current branch head (`HEAD`) to `<commit>`,
 optionally modifying index and working tree to match.
 The `<tree-ish>`/`<commit>` defaults to `HEAD` in all forms.
 
-'git reset' [-q] [<tree-ish>] [--] <paths>...::
-	This form resets the index entries for all `<paths>` to their
-	state at `<tree-ish>`.  (It does not affect the working tree or
-	the current branch.)
+'git reset' [-q] [<tree-ish>] [--] <pathspec>...::
+'git reset' [-q] [--pathspec-from-file=<file> [--pathspec-file-nul]] [<tree-ish>]::
+	These forms reset the index entries for all paths that match the
+	`<pathspec>` to their state at `<tree-ish>`.  (It does not affect
+	the working tree or the current branch.)
 +
-This means that `git reset <paths>` is the opposite of `git add
-<paths>`. This command is equivalent to
-`git restore [--source=<tree-ish>] --staged <paths>...`.
+This means that `git reset <pathspec>` is the opposite of `git add
+<pathspec>`. This command is equivalent to
+`git restore [--source=<tree-ish>] --staged <pathspec>...`.
 +
-After running `git reset <paths>` to update the index entry, you can
+After running `git reset <pathspec>` to update the index entry, you can
 use linkgit:git-restore[1] to check the contents out of the index to
 the working tree. Alternatively, using linkgit:git-restore[1]
 and specifying a commit with `--source`, you
 can copy the contents of a path out of a commit to the index and to the
 working tree in one go.
 
-'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]::
+'git reset' (--patch | -p) [<tree-ish>] [--] [<pathspec>...]::
 	Interactively select hunks in the difference between the index
 	and `<tree-ish>` (defaults to `HEAD`).  The chosen hunks are applied
 	in reverse to the index.
@@ -85,6 +87,12 @@ but carries forward unmerged index entries.
 	different between `<commit>` and `HEAD`.
 	If a file that is different between `<commit>` and `HEAD` has local
 	changes, reset is aborted.
+
+--[no-]recurse-submodules::
+	When the working tree is updated, using --recurse-submodules will
+	also recursively reset the working tree of all active submodules
+	according to the commit recorded in the superproject, also setting
+	the submodules' HEAD to be detached at that commit.
 --
 
 See "Reset, restore and revert" in linkgit:git[1] for the differences
@@ -101,6 +109,26 @@ OPTIONS
 	`reset.quiet` config option. `--quiet` and `--no-quiet` will
 	override the default behavior.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
+
+\--::
+	Do not interpret any more arguments as options.
+
+<pathspec>...::
+	Limits the paths affected by the operation.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
 
 EXAMPLES
 --------
diff --git a/Documentation/git-restore.txt b/Documentation/git-restore.txt
index 1ab2e40ea9..55bde91ef9 100644
--- a/Documentation/git-restore.txt
+++ b/Documentation/git-restore.txt
@@ -8,8 +8,9 @@ git-restore - Restore working tree files
 SYNOPSIS
 --------
 [verse]
-'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] <pathspec>...
-'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [<pathspec>...]
+'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] [--] <pathspec>...
+'git restore' [<options>] [--source=<tree>] [--staged] [--worktree] --pathspec-from-file=<file> [--pathspec-file-nul]
+'git restore' (-p|--patch) [<options>] [--source=<tree>] [--staged] [--worktree] [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
@@ -21,9 +22,8 @@ The command can also be used to restore the content in the index with
 `--staged`, or restore both the working tree and the index with
 `--staged --worktree`.
 
-By default, the restore sources for working tree and the index are the
-index and `HEAD` respectively. `--source` could be used to specify a
-commit as the restore source.
+By default, if `--staged` is given, the contents are restored from `HEAD`,
+otherwise from the index. Use `--source` to restore from a different commit.
 
 See "Reset, restore and revert" in linkgit:git[1] for the differences
 between the three commands.
@@ -38,10 +38,12 @@ OPTIONS
 	tree. It is common to specify the source tree by naming a
 	commit, branch or tag associated with it.
 +
-If not specified, the default restore source for the working tree is
-the index, and the default restore source for the index is
-`HEAD`. When both `--staged` and `--worktree` are specified,
-`--source` must also be specified.
+If not specified, the contents are restored from `HEAD` if `--staged` is
+given, otherwise from the index.
++
+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`.
 
 -p::
 --patch::
@@ -106,6 +108,17 @@ in linkgit:git-checkout[1] for details.
 	patterns and unconditionally restores any files in
 	`<pathspec>`.
 
+--recurse-submodules::
+--no-recurse-submodules::
+	If `<pathspec>` names an active submodule and the restore location
+	includes the working tree, the submodule will only be updated if
+	this option is given, in which case its working tree will be
+	restored to the commit recorded in the superproject, and any local
+	modifications overwritten. If nothing (or
+	`--no-recurse-submodules`) is used, submodules working trees will
+	not be updated. Just like linkgit:git-checkout[1], this will detach
+	`HEAD` of the submodule.
+
 --overlay::
 --no-overlay::
 	In overlay mode, the command never removes files when
@@ -113,6 +126,27 @@ in linkgit:git-checkout[1] for details.
 	appear in the `--source` tree are removed, to make them match
 	`<tree>` exactly. The default is no-overlay mode.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
+
+\--::
+	Do not interpret any more arguments as options.
+
+<pathspec>...::
+	Limits the paths affected by the operation.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
+
 EXAMPLES
 --------
 
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 025c911436..20bb8e8217 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -14,44 +14,8 @@ SYNOPSIS
 DESCRIPTION
 -----------
 
-List commits that are reachable by following the `parent` links from the
-given commit(s), but exclude commits that are reachable from the one(s)
-given with a '{caret}' in front of them.  The output is given in reverse
-chronological order by default.
-
-You can think of this as a set operation.  Commits given on the command
-line form a set of commits that are reachable from any of them, and then
-commits reachable from any of the ones given with '{caret}' in front are
-subtracted from that set.  The remaining commits are what comes out in the
-command's output.  Various other options and paths parameters can be used
-to further limit the result.
-
-Thus, the following command:
-
------------------------------------------------------------------------
-	$ git rev-list foo bar ^baz
------------------------------------------------------------------------
-
-means "list all the commits which are reachable from 'foo' or 'bar', but
-not from 'baz'".
-
-A special notation "'<commit1>'..'<commit2>'" can be used as a
-short-hand for "{caret}'<commit1>' '<commit2>'". For example, either of
-the following may be used interchangeably:
-
------------------------------------------------------------------------
-	$ git rev-list origin..HEAD
-	$ git rev-list HEAD ^origin
------------------------------------------------------------------------
-
-Another special notation is "'<commit1>'...'<commit2>'" which is useful
-for merges.  The resulting set of commits is the symmetric difference
-between the two operands.  The following two commands are equivalent:
-
------------------------------------------------------------------------
-	$ git rev-list A B --not $(git merge-base --all A B)
-	$ git rev-list A...B
------------------------------------------------------------------------
+:git-rev-list: 1
+include::rev-list-description.txt[]
 
 'rev-list' is a very essential Git command, since it
 provides the ability to build and traverse commit ancestry graphs. For
@@ -67,6 +31,99 @@ include::rev-list-options.txt[]
 
 include::pretty-formats.txt[]
 
+EXAMPLES
+--------
+
+* Print the list of commits reachable from the current branch.
++
+----------
+git rev-list HEAD
+----------
+
+* Print the list of commits on this branch, but not present in the
+  upstream branch.
++
+----------
+git rev-list @{upstream}..HEAD
+----------
+
+* Format commits with their author and commit message (see also the
+  porcelain linkgit:git-log[1]).
++
+----------
+git rev-list --format=medium HEAD
+----------
+
+* Format commits along with their diffs (see also the porcelain
+  linkgit:git-log[1], which can do this in a single process).
++
+----------
+git rev-list HEAD |
+git diff-tree --stdin --format=medium -p
+----------
+
+* Print the list of commits on the current branch that touched any
+  file in the `Documentation` directory.
++
+----------
+git rev-list HEAD -- Documentation/
+----------
+
+* Print the list of commits authored by you in the past year, on
+  any branch, tag, or other ref.
++
+----------
+git rev-list --author=you@example.com --since=1.year.ago --all
+----------
+
+* Print the list of objects reachable from the current branch (i.e., all
+  commits and the blobs and trees they contain).
++
+----------
+git rev-list --objects HEAD
+----------
+
+* Compare the disk size of all reachable objects, versus those
+  reachable from reflogs, versus the total packed size. This can tell
+  you whether running `git repack -ad` might reduce the repository size
+  (by dropping unreachable objects), and whether expiring reflogs might
+  help.
++
+----------
+# reachable objects
+git rev-list --disk-usage --objects --all
+# plus reflogs
+git rev-list --disk-usage --objects --all --reflog
+# total disk size used
+du -c .git/objects/pack/*.pack .git/objects/??/*
+# alternative to du: add up "size" and "size-pack" fields
+git count-objects -v
+----------
+
+* Report the disk size of each branch, not including objects used by the
+  current branch. This can find outliers that are contributing to a
+  bloated repository size (e.g., because somebody accidentally committed
+  large build artifacts).
++
+----------
+git for-each-ref --format='%(refname)' |
+while read branch
+do
+	size=$(git rev-list --disk-usage --objects HEAD..$branch)
+	echo "$size $branch"
+done |
+sort -n
+----------
+
+* Compare the on-disk size of branches in one group of refs, excluding
+  another. If you co-mingle objects from multiple remotes in a single
+  repository, this can show which remotes are contributing to the
+  repository size (taking the size of `origin` as a baseline).
++
+----------
+git rev-list --disk-usage --objects --remotes=$suspect --not --remotes=origin
+----------
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index e72d332b83..6b8ca085aa 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -109,6 +109,10 @@ names an existing object that is a commit-ish (i.e. a commit, or an
 annotated tag that points at a commit).  To make sure that `$VAR`
 names an existing object of any type, `git rev-parse "$VAR^{object}"`
 can be used.
++
+Note that if you are verifying a name from an untrusted source, it is
+wise to use `--end-of-options` so that the name argument is not mistaken
+for another option.
 
 -q::
 --quiet::
@@ -208,6 +212,18 @@ Options for Files
 	Only the names of the variables are listed, not their value,
 	even if they are set.
 
+--path-format=(absolute|relative)::
+	Controls the behavior of certain other options. If specified as absolute, the
+	paths printed by those options will be absolute and canonical. If specified as
+	relative, the paths will be relative to the current working directory if that
+	is possible.  The default is option specific.
++
+This option may be specified multiple times and affects only the arguments that
+follow it on the command line, either to the end of the command line or the next
+instance of this option.
+
+The following options are modified by `--path-format`:
+
 --git-dir::
 	Show `$GIT_DIR` if defined. Otherwise show the path to
 	the .git directory. The path shown, when relative, is
@@ -217,13 +233,42 @@ If `$GIT_DIR` is not defined and the current directory
 is not detected to lie in a Git repository or work tree
 print a message to stderr and exit with nonzero status.
 
+--git-common-dir::
+	Show `$GIT_COMMON_DIR` if defined, else `$GIT_DIR`.
+
+--resolve-git-dir <path>::
+	Check if <path> is a valid repository or a gitfile that
+	points at a valid repository, and print the location of the
+	repository.  If <path> is a gitfile then the resolved path
+	to the real repository is printed.
+
+--git-path <path>::
+	Resolve "$GIT_DIR/<path>" and takes other path relocation
+	variables such as $GIT_OBJECT_DIRECTORY,
+	$GIT_INDEX_FILE... into account. For example, if
+	$GIT_OBJECT_DIRECTORY is set to /foo/bar then "git rev-parse
+	--git-path objects/abc" returns /foo/bar/abc.
+
+--show-toplevel::
+	Show the (by default, absolute) path of the top-level directory
+	of the working tree. If there is no working tree, report an error.
+
+--show-superproject-working-tree::
+	Show the absolute path of the root of the superproject's
+	working tree (if exists) that uses the current repository as
+	its submodule.  Outputs nothing if the current repository is
+	not used as a submodule by any project.
+
+--shared-index-path::
+	Show the path to the shared index file in split index mode, or
+	empty if not in split-index mode.
+
+The following options are unaffected by `--path-format`:
+
 --absolute-git-dir::
 	Like `--git-dir`, but its output is always the canonicalized
 	absolute path.
 
---git-common-dir::
-	Show `$GIT_COMMON_DIR` if defined, else `$GIT_DIR`.
-
 --is-inside-git-dir::
 	When the current working directory is below the repository
 	directory print "true", otherwise "false".
@@ -238,19 +283,6 @@ print a message to stderr and exit with nonzero status.
 --is-shallow-repository::
 	When the repository is shallow print "true", otherwise "false".
 
---resolve-git-dir <path>::
-	Check if <path> is a valid repository or a gitfile that
-	points at a valid repository, and print the location of the
-	repository.  If <path> is a gitfile then the resolved path
-	to the real repository is printed.
-
---git-path <path>::
-	Resolve "$GIT_DIR/<path>" and takes other path relocation
-	variables such as $GIT_OBJECT_DIRECTORY,
-	$GIT_INDEX_FILE... into account. For example, if
-	$GIT_OBJECT_DIRECTORY is set to /foo/bar then "git rev-parse
-	--git-path objects/abc" returns /foo/bar/abc.
-
 --show-cdup::
 	When the command is invoked from a subdirectory, show the
 	path of the top-level directory relative to the current
@@ -261,18 +293,12 @@ print a message to stderr and exit with nonzero status.
 	path of the current directory relative to the top-level
 	directory.
 
---show-toplevel::
-	Show the absolute path of the top-level directory.
-
---show-superproject-working-tree::
-	Show the absolute path of the root of the superproject's
-	working tree (if exists) that uses the current repository as
-	its submodule.  Outputs nothing if the current repository is
-	not used as a submodule by any project.
+--show-object-format[=(storage|input|output)]::
+	Show the object format (hash algorithm) used for the repository
+	for storage inside the `.git` directory, input, or output. For
+	input, multiple algorithms may be printed, space-separated.
+	If not specified, the default is "storage".
 
---shared-index-path::
-	Show the path to the shared index file in split index mode, or
-	empty if not in split-index mode.
 
 Other Options
 ~~~~~~~~~~~~~
@@ -438,7 +464,7 @@ $ git rev-parse --verify HEAD
 * Print the commit object name from the revision in the $REV shell variable:
 +
 ------------
-$ git rev-parse --verify $REV^{commit}
+$ git rev-parse --verify --end-of-options $REV^{commit}
 ------------
 +
 This will error out if $REV is empty or not a valid revision.
@@ -446,7 +472,7 @@ This will error out if $REV is empty or not a valid revision.
 * Similar to above:
 +
 ------------
-$ git rev-parse --default master --verify $REV
+$ git rev-parse --default master --verify --end-of-options $REV
 ------------
 +
 but if $REV is empty, the commit object name from master will be printed.
diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 9d22270757..bb92a4a451 100644
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -90,13 +90,16 @@ effect to your index in a row.
 
 -S[<keyid>]::
 --gpg-sign[=<keyid>]::
+--no-gpg-sign::
 	GPG-sign commits. The `keyid` argument is optional and
 	defaults to the committer identity; if specified, it must be
-	stuck to the option without a space.
+	stuck to the option without a space. `--no-gpg-sign` is useful to
+	countermand both `commit.gpgSign` configuration variable, and
+	earlier `--gpg-sign`.
 
 -s::
 --signoff::
-	Add Signed-off-by line at the end of the commit message.
+	Add a `Signed-off-by` trailer at the end of the commit message.
 	See the signoff option in linkgit:git-commit[1] for more information.
 
 --strategy=<strategy>::
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index b5c46223c4..26e9b28470 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -8,33 +8,42 @@ git-rm - Remove files from the working tree and from the index
 SYNOPSIS
 --------
 [verse]
-'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch] [--quiet] [--] <file>...
+'git rm' [-f | --force] [-n] [-r] [--cached] [--ignore-unmatch]
+	  [--quiet] [--pathspec-from-file=<file> [--pathspec-file-nul]]
+	  [--] [<pathspec>...]
 
 DESCRIPTION
 -----------
-Remove files from the index, or from the working tree and the index.
-`git rm` will not remove a file from just your working directory.
-(There is no option to remove a file only from the working tree
-and yet keep it in the index; use `/bin/rm` if you want to do that.)
-The files being removed have to be identical to the tip of the branch,
-and no updates to their contents can be staged in the index,
+Remove files matching pathspec from the index, or from the working tree
+and the index. `git rm` will not remove a file from just your working
+directory. (There is no option to remove a file only from the working
+tree and yet keep it in the index; use `/bin/rm` if you want to do
+that.) The files being removed have to be identical to the tip of the
+branch, and no updates to their contents can be staged in the index,
 though that default behavior can be overridden with the `-f` option.
 When `--cached` is given, the staged content has to
 match either the tip of the branch or the file on disk,
-allowing the file to be removed from just the index.
+allowing the file to be removed from just the index. When
+sparse-checkouts are in use (see linkgit:git-sparse-checkout[1]),
+`git rm` will only remove paths within the sparse-checkout patterns.
 
 
 OPTIONS
 -------
-<file>...::
-	Files to remove.  Fileglobs (e.g. `*.c`) can be given to
-	remove all matching files.  If you want Git to expand
-	file glob characters, you may need to shell-escape them.
-	A leading directory name
-	(e.g. `dir` to remove `dir/file1` and `dir/file2`) can be
-	given to remove all files in the directory, and recursively
-	all sub-directories,
-	but this requires the `-r` option to be explicitly given.
+<pathspec>...::
+	Files to remove.  A leading directory name (e.g. `dir` to remove
+	`dir/file1` and `dir/file2`) can be given to remove all files in
+	the directory, and recursively all sub-directories, but this
+	requires the `-r` option to be explicitly given.
++
+The command removes only the paths that are known to Git.
++
+File globbing matches across directory boundaries.  Thus, given two
+directories `d` and `d2`, there is a difference between using
+`git rm 'd*'` and `git rm 'd/*'`, as the former will also remove all
+of directory `d2`.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
 
 -f::
 --force::
@@ -68,19 +77,19 @@ OPTIONS
 	`git rm` normally outputs one line (in the form of an `rm` command)
 	for each file removed. This option suppresses that output.
 
+--pathspec-from-file=<file>::
+	Pathspec is passed in `<file>` instead of commandline args. If
+	`<file>` is exactly `-` then standard input is used. Pathspec
+	elements are separated by LF or CR/LF. Pathspec elements can be
+	quoted as explained for the configuration variable `core.quotePath`
+	(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+	global `--literal-pathspecs`.
 
-DISCUSSION
-----------
-
-The <file> list given to the command can be exact pathnames,
-file glob patterns, or leading directory names.  The command
-removes only the paths that are known to Git.  Giving the name of
-a file that you have not told Git about does not remove that file.
+--pathspec-file-nul::
+	Only meaningful with `--pathspec-from-file`. Pathspec elements are
+	separated with NUL character and all other characters are taken
+	literally (including newlines and quotes).
 
-File globbing matches across directory boundaries.  Thus, given
-two directories `d` and `d2`, there is a difference between
-using `git rm 'd*'` and `git rm 'd/*'`, as the former will
-also remove all of directory `d2`.
 
 REMOVING FILES THAT HAVE DISAPPEARED FROM THE FILESYSTEM
 --------------------------------------------------------
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index 0a69810147..3db4eab4ba 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -167,6 +167,14 @@ Sending
 	`sendemail.envelopeSender` configuration variable; if that is
 	unspecified, choosing the envelope sender is left to your MTA.
 
+--sendmail-cmd=<command>::
+	Specify a command to run to send the email. The command should
+	be sendmail-like; specifically, it must support the `-i` option.
+	The command will be executed in the shell if necessary.  Default
+	is the value of `sendemail.sendmailcmd`.  If unspecified, and if
+	--smtp-server is also unspecified, git-send-email will search
+	for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH.
+
 --smtp-encryption=<encryption>::
 	Specify the encryption to use, either 'ssl' or 'tls'.  Any other
 	value reverts to plain SMTP.  Default is the value of
@@ -211,13 +219,16 @@ a password is obtained using 'git-credential'.
 
 --smtp-server=<host>::
 	If set, specifies the outgoing SMTP server to use (e.g.
-	`smtp.example.com` or a raw IP address).  Alternatively it can
-	specify a full pathname of a sendmail-like program instead;
-	the program must support the `-i` option.  Default value can
-	be specified by the `sendemail.smtpServer` configuration
-	option; the built-in default is to search for `sendmail` in
-	`/usr/sbin`, `/usr/lib` and $PATH if such program is
-	available, falling back to `localhost` otherwise.
+	`smtp.example.com` or a raw IP address).  If unspecified, and if
+	`--sendmail-cmd` is also unspecified, the default is to search
+	for `sendmail` in `/usr/sbin`, `/usr/lib` and $PATH if such a
+	program is available, falling back to `localhost` otherwise.
++
+For backward compatibility, this option can also specify a full pathname
+of a sendmail-like program instead; the program must support the `-i`
+option.  This method does not support passing arguments or using plain
+command names.  For those use cases, consider using `--sendmail-cmd`
+instead.
 
 --smtp-server-port=<port>::
 	Specifies a port different from the default port (SMTP
@@ -313,7 +324,7 @@ Automating
 	the value of `sendemail.identity`.
 
 --[no-]signed-off-by-cc::
-	If this is set, add emails found in Signed-off-by: or Cc: lines to the
+	If this is set, add emails found in the `Signed-off-by` trailer or Cc: lines to the
 	cc list. Default is the value of `sendemail.signedoffbycc` configuration
 	value; if that is unspecified, default to --signed-off-by-cc.
 
@@ -340,7 +351,7 @@ Automating
   except for self (use 'self' for that).
 - 'bodycc' will avoid including anyone mentioned in Cc lines in the
   patch body (commit message) except for self (use 'self' for that).
-- 'sob' will avoid including anyone mentioned in Signed-off-by lines except
+- 'sob' will avoid including anyone mentioned in the Signed-off-by trailers except
   for self (use 'self' for that).
 - 'misc-by' will avoid including anyone mentioned in Acked-by,
   Reviewed-by, Tested-by and other "-by" lines in the patch body,
@@ -494,10 +505,14 @@ edit ~/.gitconfig to specify your account settings:
 	smtpServerPort = 587
 ----
 
-If you have multifactor authentication setup on your gmail account, you will
+If you have multi-factor authentication set up on your Gmail account, you will
 need to generate an app-specific password for use with 'git send-email'. Visit
 https://security.google.com/settings/security/apppasswords to create it.
 
+If you do not have multi-factor authentication set up on your Gmail account,
+you will need to allow less secure app access. Visit
+https://myaccount.google.com/lesssecureapps to enable it.
+
 Once your commits are ready to be sent to the mailing list, run the
 following commands:
 
diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt
index bc80905a8a..c9c7f3065c 100644
--- a/Documentation/git-shortlog.txt
+++ b/Documentation/git-shortlog.txt
@@ -47,9 +47,38 @@ OPTIONS
 
 	Each pretty-printed commit will be rewrapped before it is shown.
 
+--group=<type>::
+	Group commits based on `<type>`. If no `--group` option is
+	specified, the default is `author`. `<type>` is one of:
++
+--
+ - `author`, commits are grouped by author
+ - `committer`, commits are grouped by committer (the same as `-c`)
+ - `trailer:<field>`, the `<field>` is interpreted as a case-insensitive
+   commit message trailer (see linkgit:git-interpret-trailers[1]). For
+   example, if your project uses `Reviewed-by` trailers, you might want
+   to see who has been reviewing with
+   `git shortlog -ns --group=trailer:reviewed-by`.
++
+Note that commits that do not include the trailer will not be counted.
+Likewise, commits with multiple trailers (e.g., multiple signoffs) may
+be counted more than once (but only once per unique trailer value in
+that commit).
++
+Shortlog will attempt to parse each trailer value as a `name <email>`
+identity. If successful, the mailmap is applied and the email is omitted
+unless the `--email` option is specified. If the value cannot be parsed
+as an identity, it will be taken literally and completely.
+--
++
+If `--group` is specified multiple times, commits are counted under each
+value (but again, only once per unique value in that commit). For
+example, `git shortlog --group=author --group=trailer:co-authored-by`
+counts both authors and co-authors.
+
 -c::
 --committer::
-	Collect and show committer identities instead of authors.
+	This is an alias for `--group=committer`.
 
 -w[<width>[,<indent1>[,<indent2>]]]::
 	Linewrap the output by wrapping each line at `width`.  The first
@@ -76,14 +105,17 @@ them.
 Paths may need to be prefixed with `--` to separate them from
 options or the revision range, when confusion arises.
 
+:git-shortlog: 1
+include::rev-list-options.txt[]
+
 MAPPING AUTHORS
 ---------------
 
-The `.mailmap` feature is used to coalesce together commits by the same
-person in the shortlog, where their name and/or email address was
-spelled differently.
+See linkgit:gitmailmap[5].
 
-include::mailmap.txt[]
+Note that if `git shortlog` is run outside of a repository (to process
+log contents on standard input), it will look for a `.mailmap` file in
+the current directory.
 
 GIT
 ---
diff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.txt
index 424e4ba84c..e49318a5a0 100644
--- a/Documentation/git-show-index.txt
+++ b/Documentation/git-show-index.txt
@@ -9,7 +9,7 @@ git-show-index - Show packed archive index
 SYNOPSIS
 --------
 [verse]
-'git show-index'
+'git show-index' [--object-format=<hash-algorithm>]
 
 
 DESCRIPTION
@@ -36,6 +36,17 @@ Note that you can get more information on a packfile by calling
 linkgit:git-verify-pack[1]. However, as this command considers only the
 index file itself, it's both faster and more flexible.
 
+OPTIONS
+-------
+
+--object-format=<hash-algorithm>::
+	Specify the given object format (hash algorithm) for the index file.  The
+	valid values are 'sha1' and (if enabled) 'sha256'.  The default is the
+	algorithm for the current repository (set by `extensions.objectFormat`), or
+	'sha1' if no value is set or outside a repository..
++
+include::object-format-disclaimer.txt[]
+
 GIT
 ---
 Part of the linkgit:git[1] suite
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index fcf528c1b3..2b1bc7288d 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -45,10 +45,13 @@ include::pretty-options.txt[]
 include::pretty-formats.txt[]
 
 
-COMMON DIFF OPTIONS
--------------------
+DIFF FORMATTING
+---------------
+The options below can be used to change the way `git show` generates
+diff output.
 
 :git-log: 1
+:diff-merges-default: `dense-combined`
 include::diff-options.txt[]
 
 include::diff-generate-patch.txt[]
diff --git a/Documentation/git-sparse-checkout.txt b/Documentation/git-sparse-checkout.txt
new file mode 100644
index 0000000000..fdcf43f87c
--- /dev/null
+++ b/Documentation/git-sparse-checkout.txt
@@ -0,0 +1,253 @@
+git-sparse-checkout(1)
+======================
+
+NAME
+----
+git-sparse-checkout - Initialize and modify the sparse-checkout
+configuration, which reduces the checkout to a set of paths
+given by a list of patterns.
+
+
+SYNOPSIS
+--------
+[verse]
+'git sparse-checkout <subcommand> [options]'
+
+
+DESCRIPTION
+-----------
+
+Initialize and modify the sparse-checkout configuration, which reduces
+the checkout to a set of paths given by a list of patterns.
+
+THIS COMMAND IS EXPERIMENTAL. ITS BEHAVIOR, AND THE BEHAVIOR OF OTHER
+COMMANDS IN THE PRESENCE OF SPARSE-CHECKOUTS, WILL LIKELY CHANGE IN
+THE FUTURE.
+
+
+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.
++
+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 `--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).
++
+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.
++
+**WARNING:** Using a sparse index requires modifying the index in a way
+that is not completely understood by external tools. If you have trouble
+with this compatibility, then run `git sparse-checkout init --no-sparse-index`
+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,
+	but they can be read from stdin using the `--stdin` option. When
+	`core.sparseCheckoutCone` is enabled, the given patterns are interpreted
+	as directory names as in the 'set' subcommand.
+
+'reapply'::
+	Reapply the sparsity pattern rules to paths in the working tree.
+	Commands like merge or rebase can materialize paths to do their
+	work (e.g. in order to show you a conflict), and other
+	sparse-checkout commands might fail to sparsify an individual file
+	(e.g. because it has unstaged changes or conflicts).  In such
+	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.).
+
+'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.
+
+SPARSE CHECKOUT
+---------------
+
+"Sparse checkout" allows populating the working directory sparsely.
+It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell
+Git whether a file in the working directory is worth looking at. 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
+makes a sparse checkout helpful when working in a repository with many
+files, but only a few are important to the current user.
+
+The `$GIT_DIR/info/sparse-checkout` file is used to define the
+skip-worktree reference bitmap. When Git updates the working
+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 repopulate the working directory with all files, use the
+`git sparse-checkout disable` command.
+
+
+FULL PATTERN SET
+----------------
+
+By default, the sparse-checkout file uses the same syntax as `.gitignore`
+files.
+
+While `$GIT_DIR/info/sparse-checkout` is usually used to specify what
+files are included, you can also specify what files are _not_ included,
+using negative patterns. For example, to remove the file `unwanted`:
+
+----------------
+/*
+!unwanted
+----------------
+
+
+CONE PATTERN SET
+----------------
+
+The full pattern set allows for arbitrary pattern matches and complicated
+inclusion/exclusion rules. These can result in O(N*M) pattern matches when
+updating the index, where N is the number of patterns and M is the number
+of paths in the index. To combat this performance issue, a more restricted
+pattern set is allowed when `core.sparseCheckoutCone` is enabled.
+
+The accepted patterns in the cone pattern set are:
+
+1. *Recursive:* All paths inside a directory are included.
+
+2. *Parent:* All files immediately inside a directory are included.
+
+In addition to the above two patterns, we also expect that all files in the
+root directory are included. If a recursive pattern is added, then all
+leading directories are added as parent patterns.
+
+By default, when running `git sparse-checkout init`, the root directory is
+added as a parent pattern. At this point, the sparse-checkout file contains
+the following patterns:
+
+----------------
+/*
+!/*/
+----------------
+
+This says "include everything in root, but nothing two levels below root."
+
+When in cone mode, the `git sparse-checkout set` subcommand takes a list of
+directories instead of a list of sparse-checkout patterns. In this mode,
+the command `git sparse-checkout set A/B/C` sets the directory `A/B/C` as
+a recursive pattern, the directories `A` and `A/B` are added as parent
+patterns. The resulting sparse-checkout file is now
+
+----------------
+/*
+!/*/
+/A/
+!/A/*/
+/A/B/
+!/A/B/*/
+/A/B/C/
+----------------
+
+Here, order matters, so the negative patterns are overridden by the positive
+patterns that appear lower in the file.
+
+If `core.sparseCheckoutCone=true`, then Git will parse the sparse-checkout file
+expecting patterns of these types. Git will warn if the patterns do not match.
+If the patterns do match the expected format, then Git will use faster hash-
+based algorithms to compute inclusion in the sparse-checkout.
+
+In the cone mode case, the `git sparse-checkout list` subcommand will list the
+directories that define the recursive patterns. For the example sparse-checkout
+file above, the output is as follows:
+
+--------------------------
+$ git sparse-checkout list
+A/B/C
+--------------------------
+
+If `core.ignoreCase=true`, then the pattern-matching algorithm will use a
+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.
+
+
+SUBMODULES
+----------
+
+If your repository contains one or more submodules, then submodules
+are populated based on interactions with the `git submodule` command.
+Specifically, `git submodule init -- <path>` will ensure the submodule
+at `<path>` is present, while `git submodule deinit [-f] -- <path>`
+will remove the files for the submodule at `<path>` (including any
+untracked files, uncommitted changes, and unpushed history).  Similar
+to how sparse-checkout removes files from the working tree but still
+leaves entries in the index, deinitialized submodules are removed from
+the working directory but still have an entry in the index.
+
+Since submodules may have unpushed changes or untracked files,
+removing them could result in data loss.  Thus, changing sparse
+inclusion/exclusion rules will not cause an already checked out
+submodule to be removed from the working copy.  Said another way, just
+as `checkout` will not cause submodules to be automatically removed or
+initialized even when switching between branches that remove or add
+submodules, using `sparse-checkout` to reduce or expand the scope of
+"interesting" files will not cause submodules to be automatically
+deinitialized or initialized either.
+
+Further, the above facts mean that there are multiple reasons that
+"tracked" files might not be present in the working copy: sparsity
+pattern application from sparse-checkout, and submodule initialization
+state.  Thus, commands like `git grep` that work on tracked files in
+the working copy may return results that are limited by either or both
+of these restrictions.
+
+
+SEE ALSO
+--------
+
+linkgit:git-read-tree[1]
+linkgit:gitignore[5]
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 53e1a1205d..be6084ccef 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -8,13 +8,14 @@ git-stash - Stash the changes in a dirty working directory away
 SYNOPSIS
 --------
 [verse]
-'git stash' list [<options>]
-'git stash' show [<options>] [<stash>]
+'git stash' list [<log-options>]
+'git stash' show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]
 '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]
 	     [-u|--include-untracked] [-a|--all] [-m|--message <message>]
+	     [--pathspec-from-file=<file> [--pathspec-file-nul]]
 	     [--] [<pathspec>...]]
 'git stash' clear
 'git stash' create [<message>]
@@ -43,10 +44,10 @@ created stash, `stash@{1}` is the one before it, `stash@{2.hours.ago}`
 is also possible). Stashes may also be referenced by specifying just the
 stash index (e.g. the integer `n` is equivalent to `stash@{n}`).
 
-OPTIONS
--------
+COMMANDS
+--------
 
-push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]::
+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>...]::
 
 	Save your local modifications to a new 'stash entry' and roll them
 	back to HEAD (in the working tree and in the index).
@@ -56,42 +57,17 @@ push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q
 For quickly making a snapshot, you can omit "push".  In this mode,
 non-option arguments are not allowed to prevent a misspelled
 subcommand from making an unwanted stash entry.  The two exceptions to this
-are `stash -p` which acts as alias for `stash push -p` and pathspecs,
+are `stash -p` which acts as alias for `stash push -p` and pathspec elements,
 which are allowed after a double hyphen `--` for disambiguation.
-+
-When pathspec is given to 'git stash push', the new stash entry records the
-modified states only for the files that match the pathspec.  The index
-entries and working tree files are then rolled back to the state in
-HEAD only for these files, too, leaving files that do not match the
-pathspec intact.
-+
-If the `--keep-index` option is used, all changes already added to the
-index are left intact.
-+
-If the `--include-untracked` option is used, all untracked files are also
-stashed and then cleaned up with `git clean`, leaving the working directory
-in a very clean state. If the `--all` option is used instead then the
-ignored files are stashed and cleaned in addition to the untracked files.
-+
-With `--patch`, you can interactively select hunks from the diff
-between HEAD and the working tree to be stashed.  The stash entry is
-constructed such that its index state is the same as the index state
-of your repository, and its worktree contains only the changes you
-selected interactively.  The selected changes are then rolled back
-from your worktree. See the ``Interactive Mode'' section of
-linkgit:git-add[1] to learn how to operate the `--patch` mode.
-+
-The `--patch` option implies `--keep-index`.  You can use
-`--no-keep-index` to override this.
 
 save [-p|--patch] [-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 pathspecs.
+	differs from "stash push" in that it cannot take pathspec.
 	Instead, all non-option arguments are concatenated to form the stash
 	message.
 
-list [<options>]::
+list [<log-options>]::
 
 	List the stash entries that you currently have.  Each 'stash entry' is
 	listed with its name (e.g. `stash@{0}` is the latest entry, `stash@{1}` is
@@ -107,16 +83,18 @@ stash@{1}: On master: 9cc0589... Add git-stash
 The command takes options applicable to the 'git log'
 command to control what is shown and how. See linkgit:git-log[1].
 
-show [<options>] [<stash>]::
+show [-u|--include-untracked|--only-untracked] [<diff-options>] [<stash>]::
 
 	Show the changes recorded in the stash entry as a diff between the
 	stashed contents and the commit back when the stash entry was first
-	created. When no `<stash>` is given, it shows the latest one.
+	created.
 	By default, the command shows the diffstat, but it will accept any
 	format known to 'git diff' (e.g., `git stash show -p stash@{1}`
 	to view the second most recent entry in patch form).
-	You can use stash.showStat and/or stash.showPatch config variables
-	to change the default behavior.
+	If no `<diff-option>` is provided, the default behavior will be given
+	by the `stash.showStat`, and `stash.showPatch` config variables. You
+	can also use `stash.showIncludeUntracked` to set whether
+	`--include-untracked` is enabled by default.
 
 pop [--index] [-q|--quiet] [<stash>]::
 
@@ -128,14 +106,6 @@ pop [--index] [-q|--quiet] [<stash>]::
 Applying the state can fail with conflicts; in this case, it is not
 removed from the stash list. You need to resolve the conflicts by hand
 and call `git stash drop` manually afterwards.
-+
-If the `--index` option is used, then tries to reinstate not only the working
-tree's changes, but also the index's ones. However, this can fail, when you
-have conflicts (which are stored in the index, where you therefore can no
-longer apply the changes as they were originally).
-+
-When no `<stash>` is given, `stash@{0}` is assumed, otherwise `<stash>` must
-be a reference of the form `stash@{<revision>}`.
 
 apply [--index] [-q|--quiet] [<stash>]::
 
@@ -149,8 +119,7 @@ branch <branchname> [<stash>]::
 	the commit at which the `<stash>` was originally created, applies the
 	changes recorded in `<stash>` to the new working tree and index.
 	If that succeeds, and `<stash>` is a reference of the form
-	`stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>`
-	is given, applies the latest one.
+	`stash@{<revision>}`, it then drops the `<stash>`.
 +
 This is useful if the branch on which you ran `git stash push` has
 changed enough that `git stash apply` fails due to conflicts. Since
@@ -166,9 +135,6 @@ clear::
 drop [-q|--quiet] [<stash>]::
 
 	Remove a single stash entry from the list of stash entries.
-	When no `<stash>` is given, it removes the latest one.
-	i.e. `stash@{0}`, otherwise `<stash>` must be a valid stash
-	log reference of the form `stash@{<revision>}`.
 
 create::
 
@@ -185,6 +151,106 @@ store::
 	reflog.  This is intended to be useful for scripts.  It is
 	probably not the command you want to use; see "push" above.
 
+OPTIONS
+-------
+-a::
+--all::
+	This option is only valid for `push` and `save` commands.
++
+All ignored and untracked files are also stashed and then cleaned
+up with `git clean`.
+
+-u::
+--include-untracked::
+--no-include-untracked::
+	When used with the `push` and `save` commands,
+	all untracked files are also stashed and then cleaned up with
+	`git clean`.
++
+When used with the `show` command, show the untracked files in the stash
+entry as part of the diff.
+
+--only-untracked::
+	This option is only valid for the `show` command.
++
+Show only the untracked files in the stash entry as part of the diff.
+
+--index::
+	This option is only valid for `pop` and `apply` commands.
++
+Tries to reinstate not only the working tree's changes, but also
+the index's ones. However, this can fail, when you have conflicts
+(which are stored in the index, where you therefore can no longer
+apply the changes as they were originally).
+
+-k::
+--keep-index::
+--no-keep-index::
+	This option is only valid for `push` and `save` commands.
++
+All changes already added to the index are left intact.
+
+-p::
+--patch::
+	This option is only valid for `push` and `save` commands.
++
+Interactively select hunks from the diff between HEAD and the
+working tree to be stashed.  The stash entry is constructed such
+that its index state is the same as the index state of your
+repository, and its worktree contains only the changes you selected
+interactively.  The selected changes are then rolled back from your
+worktree. See the ``Interactive Mode'' section of linkgit:git-add[1]
+to learn how to operate the `--patch` mode.
++
+The `--patch` option implies `--keep-index`.  You can use
+`--no-keep-index` to override this.
+
+--pathspec-from-file=<file>::
+	This option is only valid for `push` command.
++
+Pathspec is passed in `<file>` instead of commandline args. If
+`<file>` is exactly `-` then standard input is used. Pathspec
+elements are separated by LF or CR/LF. Pathspec elements can be
+quoted as explained for the configuration variable `core.quotePath`
+(see linkgit:git-config[1]). See also `--pathspec-file-nul` and
+global `--literal-pathspecs`.
+
+--pathspec-file-nul::
+	This option is only valid for `push` command.
++
+Only meaningful with `--pathspec-from-file`. Pathspec elements are
+separated with NUL character and all other characters are taken
+literally (including newlines and quotes).
+
+-q::
+--quiet::
+	This option is only valid for `apply`, `drop`, `pop`, `push`,
+	`save`, `store` commands.
++
+Quiet, suppress feedback messages.
+
+\--::
+	This option is only valid for `push` command.
++
+Separates pathspec from options for disambiguation purposes.
+
+<pathspec>...::
+	This option is only valid for `push` command.
++
+The new stash entry records the modified states only for the files
+that match the pathspec.  The index entries and working tree files
+are then rolled back to the state in HEAD only for these files,
+too, leaving files that do not match the pathspec intact.
++
+For more details, see the 'pathspec' entry in linkgit:gitglossary[7].
+
+<stash>::
+	This option is only valid for `apply`, `branch`, `drop`, `pop`,
+	`show` commands.
++
+A reference of the form `stash@{<revision>}`. When no `<stash>` is
+given, the latest stash is assumed (that is, `stash@{0}`).
+
 DISCUSSION
 ----------
 
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 7731b45f07..83f38e3198 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -130,7 +130,7 @@ ignored, then the directory is not shown, but all contents are shown.
 --column[=<options>]::
 --no-column::
 	Display untracked files in columns. See configuration variable
-	column.status for option syntax.`--column` and `--no-column`
+	`column.status` for option syntax. `--column` and `--no-column`
 	without options are equivalent to 'always' and 'never'
 	respectively.
 
@@ -184,11 +184,26 @@ characters, that field will be quoted in the manner of a C string
 literal: surrounded by ASCII double quote (34) characters, and with
 interior special characters backslash-escaped.
 
-For paths with merge conflicts, `X` and `Y` show the modification
-states of each side of the merge. For paths that do not have merge
-conflicts, `X` shows the status of the index, and `Y` shows the status
-of the work tree.  For untracked paths, `XY` are `??`.  Other status
-codes can be interpreted as follows:
+There are three different types of states that are shown using this format, and
+each one uses the `XY` syntax differently:
+
+* When a merge is occurring and the merge was successful, or outside of a merge
+	situation, `X` shows the status of the index and `Y` shows the status of the
+	working tree.
+* When a merge conflict has occurred and has not yet been resolved, `X` and `Y`
+	show the state introduced by each head of the merge, relative to the common
+	ancestor. These paths are said to be _unmerged_.
+* When a path is untracked, `X` and `Y` are always the same, since they are
+	unknown to the index. `??` is used for untracked paths. Ignored files are
+	not listed unless `--ignored` is used; if it is, ignored files are indicated
+	by `!!`.
+
+Note that the term _merge_ here also includes rebases using the default
+`--merge` strategy, cherry-picks, and anything else using the merge machinery.
+
+In the following table, these three classes are shown in separate sections, and
+these characters are used for `X` and `Y` fields for the first two sections that
+show tracked paths:
 
 * ' ' = unmodified
 * 'M' = modified
@@ -198,9 +213,6 @@ codes can be interpreted as follows:
 * 'C' = copied
 * 'U' = updated but unmerged
 
-Ignored files are not listed, unless `--ignored` option is in effect,
-in which case `XY` are `!!`.
-
 ....
 X          Y     Meaning
 -------------------------------------------------
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index 1f46380af2..7e5f995f77 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -16,6 +16,7 @@ SYNOPSIS
 'git submodule' [--quiet] deinit [-f|--force] (--all|[--] <path>...)
 'git submodule' [--quiet] update [<options>] [--] [<path>...]
 'git submodule' [--quiet] set-branch [<options>] [--] <path>
+'git submodule' [--quiet] set-url [--] <path> <newurl>
 'git submodule' [--quiet] summary [<options>] [--] [<path>...]
 'git submodule' [--quiet] foreach [--recursive] <command>
 'git submodule' [--quiet] sync [--recursive] [--] [<path>...]
@@ -80,6 +81,9 @@ status [--cached] [--recursive] [--] [<path>...]::
 	does not match the SHA-1 found in the index of the containing
 	repository and `U` if the submodule has merge conflicts.
 +
+If `--cached` is specified, this command will instead print the SHA-1
+recorded in the superproject for each submodule.
++
 If `--recursive` is specified, this command will recurse into nested
 submodules, and show their status as well.
 +
@@ -129,11 +133,12 @@ If you really want to remove a submodule from the repository and commit
 that use linkgit:git-rm[1] instead. See linkgit:gitsubmodules[7] for removal
 options.
 
-update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--] [<path>...]::
+update [--init] [--remote] [-N|--no-fetch] [--[no-]recommend-shallow] [-f|--force] [--checkout|--rebase|--merge] [--reference <repository>] [--depth <depth>] [--recursive] [--jobs <n>] [--[no-]single-branch] [--] [<path>...]::
 +
 --
 Update the registered submodules to match what the superproject
-expects by cloning missing submodules and updating the working tree of
+expects by cloning missing submodules, fetching missing commits
+in submodules and updating the working tree of
 the submodules. The "updating" can be done in several ways depending
 on command line options and the value of `submodule.<name>.update`
 configuration variable. The command line option takes precedence over
@@ -178,7 +183,12 @@ set-branch (-d|--default) [--] <path>::
 	Sets the default remote tracking branch for the submodule. The
 	`--branch` option allows the remote branch to be specified. The
 	`--default` option removes the submodule.<name>.branch configuration
-	key, which causes the tracking branch to default to 'master'.
+	key, which causes the tracking branch to default to the remote 'HEAD'.
+
+set-url [--] <path> <newurl>::
+	Sets the URL of the specified submodule to <newurl>. Then, it will
+	automatically synchronize the submodule's new remote URL
+	configuration.
 
 summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...]::
 	Show commit summary between the given commit (defaults to HEAD) and
@@ -219,7 +229,7 @@ As an example, the command below will show the path and currently
 checked out commit for each submodule:
 +
 --------------
-git submodule foreach 'echo $path `git rev-parse HEAD`'
+git submodule foreach 'echo $sm_path `git rev-parse HEAD`'
 --------------
 
 sync [--recursive] [--] [<path>...]::
@@ -238,7 +248,7 @@ registered submodules, and sync any nested submodules within.
 
 absorbgitdirs::
 	If a git directory of a submodule is inside the submodule,
-	move the git directory of the submodule into its superprojects
+	move the git directory of the submodule into its superproject's
 	`$GIT_DIR/modules` path and then connect the git directory and
 	its working directory by setting the `core.worktree` and adding
 	a .git file pointing to the git directory embedded in the
@@ -274,7 +284,7 @@ OPTIONS
 	`.gitmodules` for `update --remote`.  A special value of `.` is used to
 	indicate that the name of the branch in the submodule should be the
 	same name as the current branch in the current repository.  If the
-	option is not specified, it defaults to 'master'.
+	option is not specified, it defaults to the remote 'HEAD'.
 
 -f::
 --force::
@@ -312,10 +322,10 @@ OPTIONS
 	the superproject's recorded SHA-1 to update the submodule, use the
 	status of the submodule's remote-tracking branch.  The remote used
 	is branch's remote (`branch.<name>.remote`), defaulting to `origin`.
-	The remote branch used defaults to `master`, but the branch name may
-	be overridden by setting the `submodule.<name>.branch` option in
-	either `.gitmodules` or `.git/config` (with `.git/config` taking
-	precedence).
+	The remote branch used defaults to the remote `HEAD`, but the branch
+	name may be overridden by setting the `submodule.<name>.branch`
+	option in either `.gitmodules` or `.git/config` (with `.git/config`
+	taking precedence).
 +
 This works for any of the supported update procedures (`--checkout`,
 `--rebase`, etc.).  The only change is the source of the target SHA-1.
@@ -420,6 +430,10 @@ options carefully.
 	Clone new submodules in parallel with as many jobs.
 	Defaults to the `submodule.fetchJobs` option.
 
+--[no-]single-branch::
+	This option is only valid for the update command.
+	Clone only one branch during update: HEAD or one specified by --branch.
+
 <path>...::
 	Paths to submodule(s). When specified this will restrict the command
 	to only operate on the submodules found at the specified paths.
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 53774f5b64..d5776ffcfd 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -677,7 +677,8 @@ config key: svn.authorsProg
 -s<strategy>::
 --strategy=<strategy>::
 -p::
---preserve-merges::
+--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
@@ -700,7 +701,7 @@ creating the branch or tag.
 
 --use-log-author::
 	When retrieving svn commits into Git (as part of 'fetch', 'rebase', or
-	'dcommit' operations), look for the first `From:` or `Signed-off-by:` line
+	'dcommit' operations), look for the first `From:` line or `Signed-off-by` trailer
 	in the log message and use that as the author string.
 +
 [verse]
@@ -709,7 +710,7 @@ config key: svn.useLogAuthor
 --add-author-from::
 	When committing to svn from Git (as part of 'set-tree' or 'dcommit'
 	operations), if the existing log message doesn't already have a
-	`From:` or `Signed-off-by:` line, append a `From:` line based on the
+	`From:` or `Signed-off-by` trailer, append a `From:` line based on the
 	Git commit's author string.  If you use this, then `--use-log-author`
 	will retrieve a valid author string for all commits.
 +
@@ -1060,25 +1061,6 @@ with different name spaces.  For example:
 	branches = stable/*:refs/remotes/svn/stable/*
 	branches = debug/*:refs/remotes/svn/debug/*
 
-BUGS
-----
-
-We ignore all SVN properties except svn:executable.  Any unhandled
-properties are logged to $GIT_DIR/svn/<refname>/unhandled.log
-
-Renamed and copied directories are not detected by Git and hence not
-tracked when committing to SVN.  I do not plan on adding support for
-this as it's quite difficult and time-consuming to get working for all
-the possible corner cases (Git doesn't do it, either).  Committing
-renamed and copied files is fully supported if they're similar enough
-for Git to detect them.
-
-In SVN, it is possible (though discouraged) to commit changes to a tag
-(because a tag is just a directory copy, thus technically the same as a
-branch). When cloning an SVN repository, 'git svn' cannot know if such a
-commit to a tag will happen in the future. Thus it acts conservatively
-and imports all SVN tags as branches, prefixing the tag name with 'tags/'.
-
 CONFIGURATION
 -------------
 
@@ -1165,6 +1147,25 @@ $GIT_DIR/svn/\**/.rev_map.*::
 if it is missing or not up to date.  'git svn reset' automatically
 rewinds it.
 
+BUGS
+----
+
+We ignore all SVN properties except svn:executable.  Any unhandled
+properties are logged to $GIT_DIR/svn/<refname>/unhandled.log
+
+Renamed and copied directories are not detected by Git and hence not
+tracked when committing to SVN.  I do not plan on adding support for
+this as it's quite difficult and time-consuming to get working for all
+the possible corner cases (Git doesn't do it, either).  Committing
+renamed and copied files is fully supported if they're similar enough
+for Git to detect them.
+
+In SVN, it is possible (though discouraged) to commit changes to a tag
+(because a tag is just a directory copy, thus technically the same as a
+branch). When cloning an SVN repository, 'git svn' cannot know if such a
+commit to a tag will happen in the future. Thus it acts conservatively
+and imports all SVN tags as branches, prefixing the tag name with 'tags/'.
+
 SEE ALSO
 --------
 linkgit:git-rebase[1]
diff --git a/Documentation/git-switch.txt b/Documentation/git-switch.txt
index 197900363b..5c438cd505 100644
--- a/Documentation/git-switch.txt
+++ b/Documentation/git-switch.txt
@@ -103,6 +103,9 @@ ambiguous but exists on the 'origin' remote. See also
 `checkout.defaultRemote` in linkgit:git-config[1].
 +
 `--guess` is the default behavior. Use `--no-guess` to disable it.
++
+The default behavior can be set via the `checkout.guess` configuration
+variable.
 
 -f::
 --force::
@@ -181,9 +184,9 @@ name, the guessing is aborted.  You can explicitly give a name with
 --recurse-submodules::
 --no-recurse-submodules::
 	Using `--recurse-submodules` will update the content of all
-	initialized submodules according to the commit recorded in the
+	active submodules according to the commit recorded in the
 	superproject. If nothing (or `--no-recurse-submodules`) is
-	used, the work trees of submodules will not be updated. Just
+	used, submodules working trees will not be updated. Just
 	like linkgit:git-submodule[1], this will detach `HEAD` of the
 	submodules.
 
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 2e5599a67f..31a97a1b6c 100644
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -15,7 +15,7 @@ SYNOPSIS
 'git tag' [-n[<num>]] -l [--contains <commit>] [--no-contains <commit>]
 	[--points-at <object>] [--column[=<options>] | --no-column]
 	[--create-reflog] [--sort=<key>] [--format=<format>]
-	[--[no-]merged [<commit>]] [<pattern>...]
+	[--merged <commit>] [--no-merged <commit>] [<pattern>...]
 'git tag' -v [--format=<format>] <tagname>...
 
 DESCRIPTION
@@ -65,7 +65,7 @@ OPTIONS
 --sign::
 	Make a GPG-signed tag, using the default e-mail address's key.
 	The default behavior of tag GPG-signing is controlled by `tag.gpgSign`
-	configuration variable if it exists, or disabled oder otherwise.
+	configuration variable if it exists, or disabled otherwise.
 	See linkgit:git-config[1].
 
 --no-sign::
@@ -134,7 +134,7 @@ options for details.
 --column[=<options>]::
 --no-column::
 	Display tag listing in columns. See configuration variable
-	column.tag for option syntax.`--column` and `--no-column`
+	`column.tag` for option syntax. `--column` and `--no-column`
 	without options are equivalent to 'always' and 'never' respectively.
 +
 This option is only applicable when listing tags without annotation lines.
@@ -149,11 +149,11 @@ This option is only applicable when listing tags without annotation lines.
 
 --merged [<commit>]::
 	Only list tags whose commits are reachable from the specified
-	commit (`HEAD` if not specified), incompatible with `--no-merged`.
+	commit (`HEAD` if not specified).
 
 --no-merged [<commit>]::
 	Only list tags whose commits are not reachable from the specified
-	commit (`HEAD` if not specified), incompatible with `--merged`.
+	commit (`HEAD` if not specified).
 
 --points-at <object>::
 	Only list tags of the given object (HEAD if not
@@ -377,6 +377,11 @@ $ GIT_COMMITTER_DATE="2006-10-02 10:31" git tag -s v1.0.1
 
 include::date-formats.txt[]
 
+NOTES
+-----
+
+include::ref-reachability-filters.txt[]
+
 SEE ALSO
 --------
 linkgit:git-check-ref-format[1].
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index 1c4d146a41..2853f168d9 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -16,6 +16,7 @@ SYNOPSIS
 	     [--chmod=(+|-)x]
 	     [--[no-]assume-unchanged]
 	     [--[no-]skip-worktree]
+	     [--[no-]ignore-skip-worktree-entries]
 	     [--[no-]fsmonitor-valid]
 	     [--ignore-submodules]
 	     [--[no-]split-index]
@@ -29,9 +30,8 @@ SYNOPSIS
 
 DESCRIPTION
 -----------
-Modifies the index or directory cache. Each file mentioned is updated
-into the index and any 'unmerged' or 'needs updating' state is
-cleared.
+Modifies the index. Each file mentioned is updated into the index and
+any 'unmerged' or 'needs updating' state is cleared.
 
 See also linkgit:git-add[1] for a more user-friendly way to do some of
 the most common operations on the index.
@@ -113,6 +113,11 @@ you will need to handle the situation manually.
 	set and unset the "skip-worktree" bit for the paths. See
 	section "Skip-worktree bit" below for more information.
 
+
+--[no-]ignore-skip-worktree-entries::
+	Do not remove skip-worktree (AKA "index-only") entries even when
+	the `--remove` option was specified.
+
 --[no-]fsmonitor-valid::
 	When one of these flags is specified, the object name recorded
 	for the paths are not updated. Instead, these options
@@ -426,7 +431,7 @@ specified by the splitIndex.sharedIndexExpire config variable (see
 linkgit:git-config[1]).
 
 To avoid deleting a shared index file that is still used, its
-modification time is updated to the current time everytime a new split
+modification time is updated to the current time every time a new split
 index based on the shared index file is either created or read from.
 
 UNTRACKED CACHE
@@ -543,6 +548,22 @@ The untracked cache extension can be enabled by the
 `core.untrackedCache` configuration variable (see
 linkgit:git-config[1]).
 
+NOTES
+-----
+
+Users often try to use the assume-unchanged and skip-worktree bits
+to tell Git to ignore changes to files that are tracked.  This does not
+work as expected, since Git may still check working tree files against
+the index when performing certain operations.  In general, Git does not
+provide a way to ignore changes to tracked files, so alternate solutions
+are recommended.
+
+For example, if the file you want to change is some sort of config file,
+the repository can include a sample config file that can then be copied
+into the ignored name and modified.  The repository can even include a
+script to treat the sample file as a template, modifying and copying it
+automatically.
+
 SEE ALSO
 --------
 linkgit:git-config[1],
diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt
index 9671423117..48b6683071 100644
--- a/Documentation/git-update-ref.txt
+++ b/Documentation/git-update-ref.txt
@@ -66,6 +66,10 @@ performs all modifications together.  Specify commands of the form:
 	delete SP <ref> [SP <oldvalue>] LF
 	verify SP <ref> [SP <oldvalue>] LF
 	option SP <opt> LF
+	start LF
+	prepare LF
+	commit LF
+	abort LF
 
 With `--create-reflog`, update-ref will create a reflog for each ref
 even if one would not ordinarily be created.
@@ -83,6 +87,10 @@ quoting:
 	delete SP <ref> NUL [<oldvalue>] NUL
 	verify SP <ref> NUL [<oldvalue>] NUL
 	option SP <opt> NUL
+	start NUL
+	prepare NUL
+	commit NUL
+	abort NUL
 
 In this format, use 40 "0" to specify a zero value, and use the empty
 string to specify a missing value.
@@ -107,13 +115,32 @@ delete::
 
 verify::
 	Verify <ref> against <oldvalue> but do not change it.  If
-	<oldvalue> zero or missing, the ref must not exist.
+	<oldvalue> is zero or missing, the ref must not exist.
 
 option::
 	Modify behavior of the next command naming a <ref>.
 	The only valid option is `no-deref` to avoid dereferencing
 	a symbolic ref.
 
+start::
+	Start a transaction. In contrast to a non-transactional session, a
+	transaction will automatically abort if the session ends without an
+	explicit commit. This command may create a new empty transaction when
+	the current one has been committed or aborted already.
+
+prepare::
+	Prepare to commit the transaction. This will create lock files for all
+	queued reference updates. If one reference could not be locked, the
+	transaction will be aborted.
+
+commit::
+	Commit all reference updates queued for the transaction, ending the
+	transaction.
+
+abort::
+	Abort the transaction, releasing all locks if the transaction is in
+	prepared state.
+
 If all <ref>s can be locked with matching <oldvalue>s
 simultaneously, all modifications are performed.  Otherwise, no
 modifications are performed.  Note that while each individual
@@ -122,12 +149,13 @@ still see a subset of the modifications.
 
 LOGGING UPDATES
 ---------------
-If config parameter "core.logAllRefUpdates" is true and the ref is one under
-"refs/heads/", "refs/remotes/", "refs/notes/", or the symbolic ref HEAD; or
-the file "$GIT_DIR/logs/<ref>" exists then `git update-ref` will append
-a line to the log file "$GIT_DIR/logs/<ref>" (dereferencing all
-symbolic refs before creating the log name) describing the change
-in ref value.  Log lines are formatted as:
+If config parameter "core.logAllRefUpdates" is true and the ref is one
+under "refs/heads/", "refs/remotes/", "refs/notes/", or a pseudoref
+like HEAD or ORIG_HEAD; or the file "$GIT_DIR/logs/<ref>" exists then
+`git update-ref` will append a line to the log file
+"$GIT_DIR/logs/<ref>" (dereferencing all symbolic refs before creating
+the log name) describing the change in ref value.  Log lines are
+formatted as:
 
     oldsha1 SP newsha1 SP committer LF
 
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index 85d92c9761..8a7cbdd19c 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -9,12 +9,13 @@ git-worktree - Manage multiple working trees
 SYNOPSIS
 --------
 [verse]
-'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]
+'git worktree add' [-f] [--detach] [--checkout] [--lock [--reason <string>]] [-b <new-branch>] <path> [<commit-ish>]
 'git worktree list' [--porcelain]
 'git worktree lock' [--reason <string>] <worktree>
 'git worktree move' <worktree> <new-path>
 'git worktree prune' [-n] [-v] [--expire <expire>]
 'git worktree remove' [-f] <worktree>
+'git worktree repair' [<path>...]
 'git worktree unlock' <worktree>
 
 DESCRIPTION
@@ -25,11 +26,24 @@ Manage multiple working trees attached to the same repository.
 A git repository can support multiple working trees, allowing you to check
 out more than one branch at a time.  With `git worktree add` a new working
 tree is associated with the repository.  This new working tree is called a
-"linked working tree" as opposed to the "main working tree" prepared by "git
-init" or "git clone".  A repository has one main working tree (if it's not a
+"linked working tree" as opposed to the "main working tree" prepared by
+linkgit:git-init[1] or linkgit:git-clone[1].
+A repository has one main working tree (if it's not a
 bare repository) and zero or more linked working trees. When you are done
 with a linked working tree, remove it with `git worktree remove`.
 
+In its simplest form, `git worktree add <path>` automatically creates a
+new branch whose name is the final component of `<path>`, which is
+convenient if you plan to work on a new topic. For instance, `git
+worktree add ../hotfix` creates new branch `hotfix` and checks it out at
+path `../hotfix`. To instead work on an existing branch in a new working
+tree, use `git worktree add <path> <branch>`. On the other hand, if you
+just plan to make some experimental changes or do testing without
+disturbing existing development, it is often convenient to create a
+'throwaway' working tree not associated with any branch. For instance,
+`git worktree add -d <path>` creates a new working tree with a detached
+`HEAD` at the same commit as the current branch.
+
 If a working tree is deleted without using `git worktree remove`, then
 its associated administrative files, which reside in the repository
 (see "DETAILS" below), will eventually be removed automatically (see
@@ -48,10 +62,10 @@ add <path> [<commit-ish>]::
 
 Create `<path>` and checkout `<commit-ish>` into it. The new working directory
 is linked to the current repository, sharing everything except working
-directory specific files such as HEAD, index, etc. `-` may also be
-specified as `<commit-ish>`; it is synonymous with `@{-1}`.
+directory specific files such as `HEAD`, `index`, etc. As a convenience,
+`<commit-ish>` may be a bare "`-`", which is synonymous with `@{-1}`.
 +
-If <commit-ish> is a branch name (call it `<branch>`) and is not found,
+If `<commit-ish>` is a branch name (call it `<branch>`) and is not found,
 and neither `-b` nor `-B` nor `--detach` are used, but there does
 exist a tracking branch in exactly one remote (call it `<remote>`)
 with a matching name, treat as equivalent to:
@@ -66,24 +80,26 @@ one for the purposes of disambiguation, even if the `<branch>` isn't
 unique across all remotes. Set it to
 e.g. `checkout.defaultRemote=origin` to always checkout remote
 branches from there if `<branch>` is ambiguous but exists on the
-'origin' remote. See also `checkout.defaultRemote` in
+`origin` remote. See also `checkout.defaultRemote` in
 linkgit:git-config[1].
 +
 If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used,
-then, as a convenience, the new worktree is associated with a branch
+then, as a convenience, the new working tree is associated with a branch
 (call it `<branch>`) named after `$(basename <path>)`.  If `<branch>`
-doesn't exist, a new branch based on HEAD is automatically created as
+doesn't exist, a new branch based on `HEAD` is automatically created as
 if `-b <branch>` was given.  If `<branch>` does exist, it will be
-checked out in the new worktree, if it's not checked out anywhere
-else, otherwise the command will refuse to create the worktree (unless
+checked out in the new working tree, if it's not checked out anywhere
+else, otherwise the command will refuse to create the working tree (unless
 `--force` is used).
 
 list::
 
-List details of each worktree.  The main worktree is listed first, followed by
-each of the linked worktrees.  The output details include if the worktree is
-bare, the revision currently checked out, and the branch currently checked out
-(or 'detached HEAD' if none).
+List details of each working tree.  The main working tree is listed first,
+followed by each of the linked working trees.  The output details include
+whether the working tree is bare, the revision currently checked out, the
+branch currently checked out (or "detached HEAD" if none), "locked" if
+the worktree is locked, "prunable" if the worktree can be pruned by `prune`
+command.
 
 lock::
 
@@ -96,11 +112,14 @@ with `--reason`.
 move::
 
 Move a working tree to a new location. Note that the main working tree
-or linked working trees containing submodules cannot be moved.
+or linked working trees containing submodules cannot be moved with this
+command. (The `git worktree repair` command, however, can reestablish
+the connection with linked working trees if you move the main working
+tree manually.)
 
 prune::
 
-Prune working tree information in $GIT_DIR/worktrees.
+Prune working tree information in `$GIT_DIR/worktrees`.
 
 remove::
 
@@ -109,6 +128,28 @@ and no modification in tracked files) can be removed. Unclean working
 trees or ones with submodules can be removed with `--force`. The main
 working tree cannot be removed.
 
+repair [<path>...]::
+
+Repair working tree administrative files, if possible, if they have
+become corrupted or outdated due to external factors.
++
+For instance, if the main working tree (or bare repository) is moved,
+linked working trees will be unable to locate it. Running `repair` in
+the main working tree will reestablish the connection from linked
+working trees back to the main working tree.
++
+Similarly, if a linked working tree is moved without using `git worktree
+move`, the main working tree (or bare repository) will be unable to
+locate it. Running `repair` within the recently-moved working tree will
+reestablish the connection. If multiple linked working trees are moved,
+running `repair` from any working tree with each tree's new `<path>` as
+an argument, will reestablish the connection to all the specified paths.
++
+If both the main working tree and linked working trees have been moved
+manually, then running `repair` in the main working tree and specifying the
+new `<path>` of each linked working tree will reestablish all connections
+in both directions.
+
 unlock::
 
 Unlock a working tree, allowing it to be pruned, moved or deleted.
@@ -126,7 +167,9 @@ OPTIONS
 	locked working tree path, specify `--force` twice.
 +
 `move` refuses to move a locked working tree unless `--force` is specified
-twice.
+twice. If the destination is already assigned to some other working tree but is
+missing (for instance, if `<new-path>` was deleted manually), then `--force`
+allows the move to proceed; use `--force` twice if the destination is locked.
 +
 `remove` refuses to remove an unclean working tree unless `--force` is used.
 To remove a locked working tree, specify `--force` twice.
@@ -135,13 +178,14 @@ To remove a locked working tree, specify `--force` twice.
 -B <new-branch>::
 	With `add`, create a new branch named `<new-branch>` starting at
 	`<commit-ish>`, and check out `<new-branch>` into the new working tree.
-	If `<commit-ish>` is omitted, it defaults to HEAD.
+	If `<commit-ish>` is omitted, it defaults to `HEAD`.
 	By default, `-b` refuses to create a new branch if it already
 	exists. `-B` overrides this safeguard, resetting `<new-branch>` to
 	`<commit-ish>`.
 
+-d::
 --detach::
-	With `add`, detach HEAD in the new working tree. See "DETACHED HEAD"
+	With `add`, detach `HEAD` in the new working tree. See "DETACHED HEAD"
 	in linkgit:git-checkout[1].
 
 --[no-]checkout::
@@ -152,7 +196,7 @@ To remove a locked working tree, specify `--force` twice.
 
 --[no-]guess-remote::
 	With `worktree add <path>`, without `<commit-ish>`, instead
-	of creating a new branch from HEAD, if there exists a tracking
+	of creating a new branch from `HEAD`, if there exists a tracking
 	branch in exactly one remote matching the basename of `<path>`,
 	base the new branch on the remote-tracking branch, and mark
 	the remote-tracking branch as "upstream" from the new branch.
@@ -164,12 +208,12 @@ This can also be set up as the default behaviour by using the
 	When creating a new branch, if `<commit-ish>` is a branch,
 	mark it as "upstream" from the new branch.  This is the
 	default if `<commit-ish>` is a remote-tracking branch.  See
-	"--track" in linkgit:git-branch[1] for details.
+	`--track` in linkgit:git-branch[1] for details.
 
 --lock::
 	Keep the working tree locked after creation. This is the
 	equivalent of `git worktree lock` after `git worktree add`,
-	but without race condition.
+	but without a race condition.
 
 -n::
 --dry-run::
@@ -183,65 +227,70 @@ This can also be set up as the default behaviour by using the
 
 -q::
 --quiet::
-	With 'add', suppress feedback messages.
+	With `add`, suppress feedback messages.
 
 -v::
 --verbose::
 	With `prune`, report all removals.
++
+With `list`, output additional information about worktrees (see below).
 
 --expire <time>::
-	With `prune`, only expire unused working trees older than <time>.
+	With `prune`, only expire unused working trees older than `<time>`.
++
+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
 	absolute.
 +
 If the last path components in the working tree's path is unique among
-working trees, it can be used to identify worktrees. For example if
-you only have two working trees, at "/abc/def/ghi" and "/abc/def/ggg",
-then "ghi" or "def/ghi" is enough to point to the former working tree.
+working trees, it can be used to identify a working tree. For example if
+you only have two working trees, at `/abc/def/ghi` and `/abc/def/ggg`,
+then `ghi` or `def/ghi` is enough to point to the former working tree.
 
 REFS
 ----
 In multiple working trees, some refs may be shared between all working
-trees, some refs are local. One example is HEAD is different for all
-working trees. This section is about the sharing rules and how to access
+trees and some refs are local. One example is `HEAD` which is different for each
+working tree. This section is about the sharing rules and how to access
 refs of one working tree from another.
 
 In general, all pseudo refs are per working tree and all refs starting
-with "refs/" are shared. Pseudo refs are ones like HEAD which are
-directly under GIT_DIR instead of inside GIT_DIR/refs. There is one
-exception to this: refs inside refs/bisect and refs/worktree is not
+with `refs/` are shared. Pseudo refs are ones like `HEAD` which are
+directly under `$GIT_DIR` instead of inside `$GIT_DIR/refs`. There are
+exceptions, however: refs inside `refs/bisect` and `refs/worktree` are not
 shared.
 
 Refs that are per working tree can still be accessed from another
-working tree via two special paths, main-worktree and worktrees. The
-former gives access to per-worktree refs of the main working tree,
+working tree via two special paths, `main-worktree` and `worktrees`. The
+former gives access to per-working tree refs of the main working tree,
 while the latter to all linked working trees.
 
-For example, main-worktree/HEAD or main-worktree/refs/bisect/good
-resolve to the same value as the main working tree's HEAD and
-refs/bisect/good respectively. Similarly, worktrees/foo/HEAD or
-worktrees/bar/refs/bisect/bad are the same as
-GIT_COMMON_DIR/worktrees/foo/HEAD and
-GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad.
+For example, `main-worktree/HEAD` or `main-worktree/refs/bisect/good`
+resolve to the same value as the main working tree's `HEAD` and
+`refs/bisect/good` respectively. Similarly, `worktrees/foo/HEAD` or
+`worktrees/bar/refs/bisect/bad` are the same as
+`$GIT_COMMON_DIR/worktrees/foo/HEAD` and
+`$GIT_COMMON_DIR/worktrees/bar/refs/bisect/bad`.
 
-To access refs, it's best not to look inside GIT_DIR directly. Instead
+To access refs, it's best not to look inside `$GIT_DIR` directly. Instead
 use commands such as linkgit:git-rev-parse[1] or linkgit:git-update-ref[1]
 which will handle refs correctly.
 
 CONFIGURATION FILE
 ------------------
-By default, the repository "config" file is shared across all working
+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.
 
 In order to have configuration specific to working trees, you can turn
-on "worktreeConfig" extension, e.g.:
+on the `worktreeConfig` extension, e.g.:
 
 ------------
 $ git config extensions.worktreeConfig true
@@ -253,7 +302,7 @@ configuration in this file with `git config --worktree`. Older Git
 versions will refuse to access repositories with this extension.
 
 Note that in this file, the exception for `core.bare` and `core.worktree`
-is gone. If you have them in $GIT_DIR/config before, you must move
+is gone. If they exist in `$GIT_DIR/config`, you must move
 them to the `config.worktree` of the main working tree. You may also
 take this opportunity to review and move other configuration that you
 do not want to share to all working trees:
@@ -266,7 +315,7 @@ do not want to share to all working trees:
 DETAILS
 -------
 Each linked working tree has a private sub-directory in the repository's
-$GIT_DIR/worktrees directory.  The private sub-directory's name is usually
+`$GIT_DIR/worktrees` directory.  The private sub-directory's name is usually
 the base name of the linked working tree's path, possibly appended with a
 number to make it unique.  For example, when `$GIT_DIR=/path/main/.git` the
 command `git worktree add /path/other/test-next next` creates the linked
@@ -274,51 +323,52 @@ working tree in `/path/other/test-next` and also creates a
 `$GIT_DIR/worktrees/test-next` directory (or `$GIT_DIR/worktrees/test-next1`
 if `test-next` is already taken).
 
-Within a linked working tree, $GIT_DIR is set to point to this private
+Within a linked working tree, `$GIT_DIR` is set to point to this private
 directory (e.g. `/path/main/.git/worktrees/test-next` in the example) and
-$GIT_COMMON_DIR is set to point back to the main working tree's $GIT_DIR
+`$GIT_COMMON_DIR` is set to point back to the main working tree's `$GIT_DIR`
 (e.g. `/path/main/.git`). These settings are made in a `.git` file located at
 the top directory of the linked working tree.
 
 Path resolution via `git rev-parse --git-path` uses either
-$GIT_DIR or $GIT_COMMON_DIR depending on the path. For example, in the
+`$GIT_DIR` or `$GIT_COMMON_DIR` depending on the path. For example, in the
 linked working tree `git rev-parse --git-path HEAD` returns
 `/path/main/.git/worktrees/test-next/HEAD` (not
 `/path/other/test-next/.git/HEAD` or `/path/main/.git/HEAD`) while `git
 rev-parse --git-path refs/heads/master` uses
-$GIT_COMMON_DIR and returns `/path/main/.git/refs/heads/master`,
-since refs are shared across all working trees, except refs/bisect and
-refs/worktree.
+`$GIT_COMMON_DIR` and returns `/path/main/.git/refs/heads/master`,
+since refs are shared across all working trees, except `refs/bisect` and
+`refs/worktree`.
 
 See linkgit:gitrepository-layout[5] for more information. The rule of
 thumb is do not make any assumption about whether a path belongs to
-$GIT_DIR or $GIT_COMMON_DIR when you need to directly access something
-inside $GIT_DIR. Use `git rev-parse --git-path` to get the final path.
+`$GIT_DIR` or `$GIT_COMMON_DIR` when you need to directly access something
+inside `$GIT_DIR`. Use `git rev-parse --git-path` to get the final path.
 
-If you manually move a linked working tree, you need to update the 'gitdir' file
+If you manually move a linked working tree, you need to update the `gitdir` file
 in the entry's directory. For example, if a linked working tree is moved
 to `/newpath/test-next` and its `.git` file points to
 `/path/main/.git/worktrees/test-next`, then update
 `/path/main/.git/worktrees/test-next/gitdir` to reference `/newpath/test-next`
-instead.
+instead. Better yet, run `git worktree repair` to reestablish the connection
+automatically.
 
-To prevent a $GIT_DIR/worktrees entry from being pruned (which
+To prevent a `$GIT_DIR/worktrees` entry from being pruned (which
 can be useful in some situations, such as when the
 entry's working tree is stored on a portable device), use the
 `git worktree lock` command, which adds a file named
-'locked' to the entry's directory. The file contains the reason in
+`locked` to the entry's directory. The file contains the reason in
 plain text. For example, if a linked working tree's `.git` file points
 to `/path/main/.git/worktrees/test-next` then a file named
 `/path/main/.git/worktrees/test-next/locked` will prevent the
 `test-next` entry from being pruned.  See
 linkgit:gitrepository-layout[5] for details.
 
-When extensions.worktreeConfig is enabled, the config file
+When `extensions.worktreeConfig` is enabled, the config file
 `.git/worktrees/<id>/config.worktree` is read after `.git/config` is.
 
 LIST OUTPUT FORMAT
 ------------------
-The worktree list command has two output formats.  The default format shows the
+The `worktree list` command has two output formats. The default format shows the
 details on a single line with columns.  For example:
 
 ------------
@@ -328,13 +378,46 @@ $ git worktree list
 /path/to/other-linked-worktree  1234abc  (detached HEAD)
 ------------
 
+The command also shows annotations for each working tree, according to its state.
+These annotations are:
+
+ * `locked`, if the working tree is locked.
+ * `prunable`, if the working tree can be pruned via `git worktree prune`.
+
+------------
+$ git worktree list
+/path/to/linked-worktree    abcd1234 [master]
+/path/to/locked-worktree    acbd5678 (brancha) locked
+/path/to/prunable-worktree  5678abc  (detached HEAD) prunable
+------------
+
+For these annotations, a reason might also be available and this can be
+seen using the verbose mode. The annotation is then moved to the next line
+indented followed by the additional information.
+
+------------
+$ git worktree list --verbose
+/path/to/linked-worktree              abcd1234 [master]
+/path/to/locked-worktree-no-reason    abcd5678 (detached HEAD) locked
+/path/to/locked-worktree-with-reason  1234abcd (brancha)
+	locked: working tree path is mounted on a portable device
+/path/to/prunable-worktree            5678abc1 (detached HEAD)
+	prunable: gitdir file points to non-existent location
+------------
+
+Note that the annotation is moved to the next line if the additional
+information is available, otherwise it stays on the same line as the
+working tree itself.
+
 Porcelain Format
 ~~~~~~~~~~~~~~~~
 The porcelain format has a line per attribute.  Attributes are listed with a
-label and value separated by a single space.  Boolean attributes (like 'bare'
-and 'detached') are listed as a label only, and are only present if and only
-if the value is true.  The first attribute of a worktree is always `worktree`,
-an empty line indicates the end of the record.  For example:
+label and value separated by a single space.  Boolean attributes (like `bare`
+and `detached`) are listed as a label only, and are present only
+if the value is true.  Some attributes (like `locked`) can be listed as a label
+only or with a value depending upon whether a reason is available.  The first
+attribute of a working tree is always `worktree`, an empty line indicates the
+end of the record.  For example:
 
 ------------
 $ git worktree list --porcelain
@@ -349,6 +432,33 @@ worktree /path/to/other-linked-worktree
 HEAD 1234abc1234abc1234abc1234abc1234abc1234a
 detached
 
+worktree /path/to/linked-worktree-locked-no-reason
+HEAD 5678abc5678abc5678abc5678abc5678abc5678c
+branch refs/heads/locked-no-reason
+locked
+
+worktree /path/to/linked-worktree-locked-with-reason
+HEAD 3456def3456def3456def3456def3456def3456b
+branch refs/heads/locked-with-reason
+locked reason why is locked
+
+worktree /path/to/linked-worktree-prunable
+HEAD 1233def1234def1234def1234def1234def1234b
+detached
+prunable gitdir file points to non-existent location
+
+------------
+
+If the lock reason contains "unusual" characters such as newline, they
+are escaped and the entire reason is quoted as explained for the
+configuration variable `core.quotePath` (see linkgit:git-config[1]).
+For Example:
+
+------------
+$ git worktree list --porcelain
+...
+locked "reason\nwhy is locked"
+...
 ------------
 
 EXAMPLES
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 9b82564d1a..6dd241ef83 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -13,7 +13,7 @@ SYNOPSIS
     [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]
     [-p|--paginate|-P|--no-pager] [--no-replace-objects] [--bare]
     [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]
-    [--super-prefix=<path>]
+    [--super-prefix=<path>] [--config-env=<name>=<envvar>]
     <command> [<args>]
 
 DESCRIPTION
@@ -80,6 +80,28 @@ config file). Including the equals but with an empty value (like `git -c
 foo.bar= ...`) sets `foo.bar` to the empty string which `git config
 --type=bool` will convert to `false`.
 
+--config-env=<name>=<envvar>::
+	Like `-c <name>=<value>`, give configuration variable
+	'<name>' a value, where <envvar> is the name of an
+	environment variable from which to retrieve the value. Unlike
+	`-c` there is no shortcut for directly setting the value to an
+	empty string, instead the environment variable itself must be
+	set to the empty string.  It is an error if the `<envvar>` does not exist
+	in the environment. `<envvar>` may not contain an equals sign
+	to avoid ambiguity with `<name>` containing one.
++
+This is useful for cases where you want to pass transitory
+configuration options to git, but are doing so on OS's where
+other processes might be able to read your cmdline
+(e.g. `/proc/self/cmdline`), but not your environ
+(e.g. `/proc/self/environ`). That behavior is the default on
+Linux, but may not be on your system.
++
+Note that this might add security for variables such as
+`http.extraHeader` where the sensitive information is part of
+the value, but not e.g. `url.<base>.insteadOf` where the
+sensitive information can be part of the key.
+
 --exec-path[=<path>]::
 	Path to wherever your core Git programs are installed.
 	This can also be controlled by setting the GIT_EXEC_PATH
@@ -110,9 +132,23 @@ foo.bar= ...`) sets `foo.bar` to the empty string which `git config
 	Do not pipe Git output into a pager.
 
 --git-dir=<path>::
-	Set the path to the repository. This can also be controlled by
-	setting the `GIT_DIR` environment variable. It can be an absolute
-	path or relative path to current working directory.
+	Set the path to the repository (".git" directory). This can also be
+	controlled by setting the `GIT_DIR` environment variable. It can be
+	an absolute path or relative path to current working directory.
++
+Specifying the location of the ".git" directory using this
+option (or `GIT_DIR` environment variable) turns off the
+repository discovery that tries to find a directory with
+".git" subdirectory (which is how the repository and the
+top-level of the working tree are discovered), and tells Git
+that you are at the top level of the working tree.  If you
+are not at the top-level directory of the working tree, you
+should tell Git where the top-level of the working tree is,
+with the `--work-tree=<path>` option (or `GIT_WORK_TREE`
+environment variable)
++
+If you just want to run git as if it was started in `<path>` then use
+`git -C <path>`.
 
 --work-tree=<path>::
 	Set the path to the working tree. It can be an absolute path
@@ -271,8 +307,8 @@ In general, the interrogate commands do not touch the files in
 the working tree.
 
 
-Synching repositories
-~~~~~~~~~~~~~~~~~~~~~
+Syncing repositories
+~~~~~~~~~~~~~~~~~~~~
 
 include::cmds-synchingrepositories.txt[]
 
@@ -290,6 +326,13 @@ users typically do not use them directly.
 
 include::cmds-purehelpers.txt[]
 
+Guides
+------
+
+The following documentation pages are guides about Git concepts.
+
+include::cmds-guide.txt[]
+
 
 Configuration Mechanism
 -----------------------
@@ -479,16 +522,46 @@ double-quotes and respecting backslash escapes. E.g., the value
 	details. This variable has lower precedence than other path
 	variables such as GIT_INDEX_FILE, GIT_OBJECT_DIRECTORY...
 
+`GIT_DEFAULT_HASH`::
+	If this variable is set, the default hash algorithm for new
+	repositories will be set to this value. This value is currently
+	ignored when cloning; the setting of the remote repository
+	is used instead. The default is "sha1". THIS VARIABLE IS
+	EXPERIMENTAL! See `--object-format` in linkgit:git-init[1].
+
 Git Commits
 ~~~~~~~~~~~
 `GIT_AUTHOR_NAME`::
+	The human-readable name used in the author identity when creating commit or
+	tag objects, or when writing reflogs. Overrides the `user.name` and
+	`author.name` configuration settings.
+
 `GIT_AUTHOR_EMAIL`::
+	The email address used in the author identity when creating commit or
+	tag objects, or when writing reflogs. Overrides the `user.email` and
+	`author.email` configuration settings.
+
 `GIT_AUTHOR_DATE`::
+	The date used for the author identity when creating commit or tag objects, or
+	when writing reflogs. See linkgit:git-commit[1] for valid formats.
+
 `GIT_COMMITTER_NAME`::
+	The human-readable name used in the committer identity when creating commit or
+	tag objects, or when writing reflogs. Overrides the `user.name` and
+	`committer.name` configuration settings.
+
 `GIT_COMMITTER_EMAIL`::
+	The email address used in the author identity when creating commit or
+	tag objects, or when writing reflogs. Overrides the `user.email` and
+	`committer.email` configuration settings.
+
 `GIT_COMMITTER_DATE`::
-'EMAIL'::
-	see linkgit:git-commit-tree[1]
+	The date used for the committer identity when creating commit or tag objects, or
+	when writing reflogs. See linkgit:git-commit[1] for valid formats.
+
+`EMAIL`::
+	The email address used in the author and committer identities if no other
+	relevant environment variable or configuration setting has been set.
 
 Git Diffs
 ~~~~~~~~~
@@ -500,8 +573,9 @@ Git Diffs
 
 `GIT_EXTERNAL_DIFF`::
 	When the environment variable `GIT_EXTERNAL_DIFF` is set, the
-	program named by it is called, instead of the diff invocation
-	described above.  For a path that is added, removed, or modified,
+	program named by it is called to generate diffs, and Git
+	does not use its builtin diff machinery.
+	For a path that is added, removed, or modified,
 	`GIT_EXTERNAL_DIFF` is called with 7 parameters:
 
 	path old-file old-hex old-mode new-file new-hex new-mode
@@ -544,12 +618,22 @@ other
 	a pager.  See also the `core.pager` option in
 	linkgit:git-config[1].
 
+`GIT_PROGRESS_DELAY`::
+	A number controlling how many seconds to delay before showing
+	optional progress indicators. Defaults to 2.
+
 `GIT_EDITOR`::
 	This environment variable overrides `$EDITOR` and `$VISUAL`.
 	It is used by several Git commands when, on interactive mode,
 	an editor is to be launched. See also linkgit:git-var[1]
 	and the `core.editor` option in linkgit:git-config[1].
 
+`GIT_SEQUENCE_EDITOR`::
+	This environment variable overrides the configured Git editor
+	when editing the todo list of an interactive rebase. See also
+	linkgit:git-rebase[1] and the `sequence.editor` option in
+	linkgit:git-config[1].
+
 `GIT_SSH`::
 `GIT_SSH_COMMAND`::
 	If either of these environment variables is set then 'git fetch'
@@ -586,6 +670,16 @@ for further details.
 	If this environment variable is set to `0`, git will not prompt
 	on the terminal (e.g., when asking for HTTP authentication).
 
+`GIT_CONFIG_GLOBAL`::
+`GIT_CONFIG_SYSTEM`::
+	Take the configuration from the given files instead from global or
+	system-level configuration files. If `GIT_CONFIG_SYSTEM` is set, the
+	system config file defined at build time (usually `/etc/gitconfig`)
+	will not be read. Likewise, if `GIT_CONFIG_GLOBAL` is set, neither
+	`$HOME/.gitconfig` nor `$XDG_CONFIG_HOME/git/config` will be read. Can
+	be set to `/dev/null` to skip reading configuration files of the
+	respective level.
+
 `GIT_CONFIG_NOSYSTEM`::
 	Whether to skip reading settings from the system-wide
 	`$(prefix)/etc/gitconfig` file.  This environment variable can
@@ -660,6 +754,10 @@ of clones and fetches.
 	time of each Git command.
 	See `GIT_TRACE` for available trace output options.
 
+`GIT_TRACE_REFS`::
+	Enables trace messages for operations on the ref database.
+	See `GIT_TRACE` for available trace output options.
+
 `GIT_TRACE_SETUP`::
 	Enables trace messages printing the .git, working tree and current
 	working directory after Git has completed its setup phase.
@@ -674,8 +772,6 @@ of clones and fetches.
 	Enables a curl full trace dump of all incoming and outgoing data,
 	including descriptive information, of the git transport protocol.
 	This is similar to doing curl `--trace-ascii` on the command line.
-	This option overrides setting the `GIT_CURL_VERBOSE` environment
-	variable.
 	See `GIT_TRACE` for available trace output options.
 
 `GIT_TRACE_CURL_NO_DATA`::
@@ -730,11 +826,10 @@ for full details.
 	See `GIT_TRACE2` for available trace output options and
 	link:technical/api-trace2.html[Trace2 documentation] for full details.
 
-`GIT_REDACT_COOKIES`::
-	This can be set to a comma-separated list of strings. When a curl trace
-	is enabled (see `GIT_TRACE_CURL` above), whenever a "Cookies:" header
-	sent by the client is dumped, values of cookies whose key is in that
-	list (case-sensitive) are redacted.
+`GIT_TRACE_REDACT`::
+	By default, when tracing is activated, Git redacts the values of
+	cookies, the "Authorization:" header, and the "Proxy-Authorization:"
+	header. Set this variable to `0` to prevent this redaction.
 
 `GIT_LITERAL_PATHSPECS`::
 	Setting this variable to `1` will cause Git to treat all
@@ -928,7 +1023,7 @@ Reporting Bugs
 Report bugs to the Git mailing list <git@vger.kernel.org> where the
 development and maintenance is primarily done.  You do not have to be
 subscribed to the list to send a message there.  See the list archive
-at https://public-inbox.org/git for previous bug reports and other
+at https://lore.kernel.org/git for previous bug reports and other
 discussions.
 
 Issues which are security relevant should be disclosed privately to
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index c5a528c667..83fd4e19a4 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -293,10 +293,10 @@ web front ends do not visualize the contents of these files by default.
 
 In these cases you can tell Git the encoding of a file in the working
 directory with the `working-tree-encoding` attribute. If a file with this
-attribute is added to Git, then Git reencodes the content from the
+attribute is added to Git, then Git re-encodes the content from the
 specified encoding to UTF-8. Finally, Git stores the UTF-8 encoded
 content in its internal data structure (called "the index"). On checkout
-the content is reencoded back to the specified encoding.
+the content is re-encoded back to the specified encoding.
 
 Please note that using the `working-tree-encoding` attribute may have a
 number of pitfalls:
@@ -498,7 +498,7 @@ command. This is achieved by using the long-running process protocol
 When Git encounters the first file that needs to be cleaned or smudged,
 it starts the filter and performs the handshake. In the handshake, the
 welcome message sent by Git is "git-filter-client", only version 2 is
-suppported, and the supported capabilities are "clean", "smudge", and
+supported, and the supported capabilities are "clean", "smudge", and
 "delay".
 
 Afterwards Git sends a list of "key=value" pairs terminated with
@@ -802,6 +802,9 @@ patterns are available:
 
 - `ada` suitable for source code in the Ada language.
 
+- `bash` suitable for source code in the Bourne-Again SHell language.
+  Covers a superset of POSIX shell function definitions.
+
 - `bibtex` suitable for files with BibTeX coded references.
 
 - `cpp` suitable for source code in the C and C++ languages.
@@ -812,6 +815,8 @@ patterns are available:
 
 - `dts` suitable for devicetree (DTS) files.
 
+- `elixir` suitable for source code in the Elixir language.
+
 - `fortran` suitable for source code in the Fortran language.
 
 - `fountain` suitable for Fountain documents.
@@ -822,6 +827,8 @@ patterns are available:
 
 - `java` suitable for source code in the Java language.
 
+- `markdown` suitable for Markdown documents.
+
 - `matlab` suitable for source code in the MATLAB and Octave languages.
 
 - `objc` suitable for source code in the Objective-C language.
@@ -838,6 +845,8 @@ patterns are available:
 
 - `rust` suitable for source code in the Rust language.
 
+- `scheme` suitable for source code in the Scheme language.
+
 - `tex` suitable for source code for LaTeX documents.
 
 
@@ -1167,7 +1176,8 @@ tag then no replacement will be done.  The placeholders are the same
 as those for the option `--pretty=format:` of linkgit:git-log[1],
 except that they need to be wrapped like this: `$Format:PLACEHOLDERS$`
 in the file.  E.g. the string `$Format:%H$` will be replaced by the
-commit hash.
+commit hash.  However, only one `%(describe)` placeholder is expanded
+per archive to avoid denial-of-service attacks.
 
 
 Packing objects
@@ -1237,6 +1247,12 @@ to:
 [attr]binary -diff -merge -text
 ------------
 
+NOTES
+-----
+
+Git does not follow symbolic links when accessing a `.gitattributes`
+file in the working tree. This keeps behavior consistent when the file
+is accessed from the index or a tree versus from the filesystem.
 
 EXAMPLES
 --------
diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt
index 4b32876b6e..92e4ba6a2f 100644
--- a/Documentation/gitcli.txt
+++ b/Documentation/gitcli.txt
@@ -126,6 +126,11 @@ usage: git describe [<options>] <commit-ish>*
     --long                always use long format
     --abbrev[=<n>]        use <n> digits to display SHA-1s
 ---------------------------------------------
++
+Note that some subcommand (e.g. `git grep`) may behave differently
+when there are things on the command line other than `-h`, but `git
+subcmd -h` without anything else on the command line is meant to
+consistently give the usage.
 
 --help-all::
 	Some Git commands take options that are only used for plumbing or that
@@ -211,8 +216,8 @@ only affects the files in the working tree, but with
 entries, and with `--cached`, it modifies only the index
 entries.
 
-See also http://marc.info/?l=git&m=116563135620359 and
-http://marc.info/?l=git&m=119150393620273 for further
+See also https://lore.kernel.org/git/7v64clg5u9.fsf@assigned-by-dhcp.cox.net/ and
+https://lore.kernel.org/git/7vy7ej9g38.fsf@gitster.siamese.dyndns.org/ for further
 information.
 
 Some other commands that also work on files in the working tree and/or
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index f880d21dfb..c0b95256cc 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -751,7 +751,7 @@ to it.
 ================================================
 If you make the decision to start your new branch at some
 other point in the history than the current `HEAD`, you can do so by
-just telling 'git checkout' what the base of the checkout would be.
+just telling 'git switch' what the base of the checkout would be.
 In other words, if you have an earlier tag or branch, you'd just do
 
 ------------
diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt
index adc759612d..758bf39ba3 100644
--- a/Documentation/gitcredentials.txt
+++ b/Documentation/gitcredentials.txt
@@ -3,7 +3,7 @@ gitcredentials(7)
 
 NAME
 ----
-gitcredentials - providing usernames and passwords to Git
+gitcredentials - Providing usernames and passwords to Git
 
 SYNOPSIS
 --------
@@ -131,7 +131,9 @@ context would not match:
 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.
+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>.*`
+options.
 
 If the "pattern" URL does include a path component, then this too must match
 exactly: the context `https://example.com/bar/baz.git` will match a config
@@ -186,8 +188,110 @@ CUSTOM HELPERS
 --------------
 
 You can write your own custom helpers to interface with any system in
-which you keep credentials. See the documentation for Git's
-link:technical/api-credentials.html[credentials API] for details.
+which you keep credentials.
+
+Credential helpers are programs executed by Git to fetch or save
+credentials from and to long-term storage (where "long-term" is simply
+longer than a single Git process; e.g., credentials may be stored
+in-memory for a few minutes, or indefinitely on disk).
+
+Each helper is specified by a single string in the configuration
+variable `credential.helper` (and others, see linkgit:git-config[1]).
+The string is transformed by Git into a command to be executed using
+these rules:
+
+  1. If the helper string begins with "!", it is considered a shell
+     snippet, and everything after the "!" becomes the command.
+
+  2. Otherwise, if the helper string begins with an absolute path, the
+     verbatim helper string becomes the command.
+
+  3. Otherwise, the string "git credential-" is prepended to the helper
+     string, and the result becomes the command.
+
+The resulting command then has an "operation" argument appended to it
+(see below for details), and the result is executed by the shell.
+
+Here are some example specifications:
+
+----------------------------------------------------
+# run "git credential-foo"
+[credential]
+	helper = foo
+
+# same as above, but pass an argument to the helper
+[credential]
+	helper = "foo --bar=baz"
+
+# the arguments are parsed by the shell, so use shell
+# quoting if necessary
+[credential]
+	helper = "foo --bar='whitespace arg'"
+
+# you can also use an absolute path, which will not use the git wrapper
+[credential]
+	helper = "/path/to/my/helper --with-arguments"
+
+# or you can specify your own shell snippet
+[credential "https://example.com"]
+	username = your_user
+	helper = "!f() { test \"$1\" = get && echo \"password=$(cat $HOME/.secret)\"; }; f"
+----------------------------------------------------
+
+Generally speaking, rule (3) above is the simplest for users to specify.
+Authors of credential helpers should make an effort to assist their
+users by naming their program "git-credential-$NAME", and putting it in
+the `$PATH` or `$GIT_EXEC_PATH` during installation, which will allow a
+user to enable it with `git config credential.helper $NAME`.
+
+When a helper is executed, it will have one "operation" argument
+appended to its command line, which is one of:
+
+`get`::
+
+	Return a matching credential, if any exists.
+
+`store`::
+
+	Store the credential, if applicable to the helper.
+
+`erase`::
+
+	Remove a matching credential, if any, from the helper's storage.
+
+The details of the credential will be provided on the helper's stdin
+stream. The exact format is the same as the input/output format of the
+`git credential` plumbing command (see the section `INPUT/OUTPUT
+FORMAT` in linkgit:git-credential[1] for a detailed specification).
+
+For a `get` operation, the helper should produce a list of attributes on
+stdout in the same format (see linkgit:git-credential[1] for common
+attributes). A helper is free to produce a subset, or even no values at
+all if it has nothing useful to provide. Any provided attributes will
+overwrite those already known about by Git's credential subsystem.
+
+While it is possible to override all attributes, well behaving helpers
+should refrain from doing so for any attribute other than username and
+password.
+
+If a helper outputs a `quit` attribute with a value of `true` or `1`,
+no further helpers will be consulted, nor will the user be prompted
+(if no credential has been provided, the operation will then fail).
+
+Similarly, no more helpers will be consulted once both username and
+password had been provided.
+
+For a `store` or `erase` operation, the helper's output is ignored.
+
+If a helper fails to perform the requested operation or needs to notify
+the user of a potential issue, it may write to stderr.
+
+If it does not support the requested operation (e.g., a read-only store),
+it should silently ignore the request.
+
+If a helper receives any other operation, it should silently ignore the
+request. This leaves room for future operations to be added (older
+helpers will just ignore the new requests).
 
 GIT
 ---
diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt
index c970d9fe43..0d57f86abc 100644
--- a/Documentation/gitdiffcore.txt
+++ b/Documentation/gitdiffcore.txt
@@ -74,6 +74,7 @@ into another list.  There are currently 5 such transformations:
 - diffcore-merge-broken
 - diffcore-pickaxe
 - diffcore-order
+- diffcore-rotate
 
 These are applied in sequence.  The set of filepairs 'git diff-{asterisk}'
 commands find are used as the input to diffcore-break, and
@@ -168,6 +169,26 @@ a similarity score different from the default of 50% by giving a
 number after the "-M" or "-C" option (e.g. "-M8" to tell it to use
 8/10 = 80%).
 
+Note that when rename detection is on but both copy and break
+detection are off, rename detection adds a preliminary step that first
+checks if files are moved across directories while keeping their
+filename the same.  If there is a file added to a directory whose
+contents is sufficiently similar to a file with the same name that got
+deleted from a different directory, it will mark them as renames and
+exclude them from the later quadratic step (the one that pairwise
+compares all unmatched files to find the "best" matches, determined by
+the highest content similarity).  So, for example, if a deleted
+docs/ext.txt and an added docs/config/ext.txt are similar enough, they
+will be marked as a rename and prevent an added docs/ext.md that may
+be even more similar to the deleted docs/ext.txt from being considered
+as the rename destination in the later step.  For this reason, the
+preliminary "match same filename" step uses a bit higher threshold to
+mark a file pair as a rename and stop considering other candidates for
+better matches.  At most, one comparison is done per file in this
+preliminary pass; so if there are several remaining ext.txt files
+throughout the directory hierarchy after exact rename detection, this
+preliminary step may be skipped for those files.
+
 Note.  When the "-C" option is used with `--find-copies-harder`
 option, 'git diff-{asterisk}' commands feed unmodified filepairs to
 diffcore mechanism as well as modified ones.  This lets the copy
@@ -276,6 +297,26 @@ Documentation
 t
 ------------------------------------------------
 
+diffcore-rotate: For Changing At Which Path Output Starts
+---------------------------------------------------------
+
+This transformation takes one pathname, and rotates the set of
+filepairs so that the filepair for the given pathname comes first,
+optionally discarding the paths that come before it.  This is used
+to implement the `--skip-to` and the `--rotate-to` options.  It is
+an error when the specified pathname is not in the set of filepairs,
+but it is not useful to error out when used with "git log" family of
+commands, because it is unreasonable to expect that a given path
+would be modified by each and every commit shown by the "git log"
+command.  For this reason, when used with "git log", the filepair
+that sorts the same as, or the first one that sorts after, the given
+pathname is where the output starts.
+
+Use of this transformation combined with diffcore-order will produce
+unexpected results, as the input to this transformation is likely
+not sorted when diffcore-order is in effect.
+
+
 SEE ALSO
 --------
 linkgit:git-diff[1],
diff --git a/Documentation/giteveryday.txt b/Documentation/giteveryday.txt
index 1bd919f92b..faba2ef088 100644
--- a/Documentation/giteveryday.txt
+++ b/Documentation/giteveryday.txt
@@ -278,13 +278,13 @@ $ git am -3 -i -s ./+to-apply <4>
 $ compile/test
 $ git switch -c hold/linus && git am -3 -i -s ./+hold-linus <5>
 $ git switch topic/one && git rebase master <6>
-$ git switch -C pu next <7>
+$ git switch -C seen next <7>
 $ git merge topic/one topic/two && git merge hold/linus <8>
 $ git switch maint
 $ git cherry-pick master~4 <9>
 $ compile/test
 $ git tag -s -m "GIT 0.99.9x" v0.99.9x <10>
-$ git fetch ko && for branch in master maint next pu <11>
+$ git fetch ko && for branch in master maint next seen <11>
     do
 	git show-branch ko/$branch $branch <12>
     done
@@ -294,14 +294,14 @@ $ git push --follow-tags ko <13>
 <1> see what you were in the middle of doing, if anything.
 <2> see which branches haven't been merged into `master` yet.
 Likewise for any other integration branches e.g. `maint`, `next`
-and `pu` (potential updates).
+and `seen`.
 <3> read mails, save ones that are applicable, and save others
 that are not quite ready (other mail readers are available).
 <4> apply them, interactively, with your sign-offs.
 <5> create topic branch as needed and apply, again with sign-offs.
 <6> rebase internal topic branch that has not been merged to the
 master or exposed as a part of a stable branch.
-<7> restart `pu` every time from the next.
+<7> restart `seen` every time from the next.
 <8> and bundle topic branches still cooking.
 <9> backport a critical fix.
 <10> create a signed tag.
@@ -323,7 +323,7 @@ repository at kernel.org, and looks like this:
 	fetch = refs/heads/*:refs/remotes/ko/*
 	push = refs/heads/master
 	push = refs/heads/next
-	push = +refs/heads/pu
+	push = +refs/heads/seen
 	push = refs/heads/maint
 ------------
 
diff --git a/Documentation/gitfaq.txt b/Documentation/gitfaq.txt
new file mode 100644
index 0000000000..8c1f2d5675
--- /dev/null
+++ b/Documentation/gitfaq.txt
@@ -0,0 +1,441 @@
+gitfaq(7)
+=========
+
+NAME
+----
+gitfaq - Frequently asked questions about using Git
+
+SYNOPSIS
+--------
+gitfaq
+
+DESCRIPTION
+-----------
+
+The examples in this FAQ assume a standard POSIX shell, like `bash` or `dash`,
+and a user, A U Thor, who has the account `author` on the hosting provider
+`git.example.org`.
+
+Configuration
+-------------
+
+[[user-name]]
+What should I put in `user.name`?::
+	You should put your personal name, generally a form using a given name
+	and family name.  For example, the current maintainer of Git uses "Junio
+	C Hamano".  This will be the name portion that is stored in every commit
+	you make.
++
+This configuration doesn't have any effect on authenticating to remote services;
+for that, see `credential.username` in linkgit:git-config[1].
+
+[[http-postbuffer]]
+What does `http.postBuffer` really do?::
+	This option changes the size of the buffer that Git uses when pushing
+	data to a remote over HTTP or HTTPS.  If the data is larger than this
+	size, libcurl, which handles the HTTP support for Git, will use chunked
+	transfer encoding since it isn't known ahead of time what the size of
+	the pushed data will be.
++
+Leaving this value at the default size is fine unless you know that either the
+remote server or a proxy in the middle doesn't support HTTP/1.1 (which
+introduced the chunked transfer encoding) or is known to be broken with chunked
+data.  This is often (erroneously) suggested as a solution for generic push
+problems, but since almost every server and proxy supports at least HTTP/1.1,
+raising this value usually doesn't solve most push problems.  A server or proxy
+that didn't correctly support HTTP/1.1 and chunked transfer encoding wouldn't be
+that useful on the Internet today, since it would break lots of traffic.
++
+Note that increasing this value will increase the memory used on every relevant
+push that Git does over HTTP or HTTPS, since the entire buffer is allocated
+regardless of whether or not it is all used.  Thus, it's best to leave it at the
+default unless you are sure you need a different value.
+
+[[configure-editor]]
+How do I configure a different editor?::
+	If you haven't specified an editor specifically for Git, it will by default
+	use the editor you've configured using the `VISUAL` or `EDITOR` environment
+	variables, or if neither is specified, the system default (which is usually
+	`vi`).  Since some people find `vi` difficult to use or prefer a different
+	editor, it may be desirable to change the editor used.
++
+If you want to configure a general editor for most programs which need one, you
+can edit your shell configuration (e.g., `~/.bashrc` or `~/.zshenv`) to contain
+a line setting the `EDITOR` or `VISUAL` environment variable to an appropriate
+value.  For example, if you prefer the editor `nano`, then you could write the
+following:
++
+----
+export VISUAL=nano
+----
++
+If you want to configure an editor specifically for Git, you can either set the
+`core.editor` configuration value or the `GIT_EDITOR` environment variable.  You
+can see linkgit:git-var[1] for details on the order in which these options are
+consulted.
++
+Note that in all cases, the editor value will be passed to the shell, so any
+arguments containing spaces should be appropriately quoted.  Additionally, if
+your editor normally detaches from the terminal when invoked, you should specify
+it with an argument that makes it not do that, or else Git will not see any
+changes.  An example of a configuration addressing both of these issues on
+Windows would be the configuration `"C:\Program Files\Vim\gvim.exe" --nofork`,
+which quotes the filename with spaces and specifies the `--nofork` option to
+avoid backgrounding the process.
+
+Credentials
+-----------
+
+[[http-credentials]]
+How do I specify my credentials when pushing over HTTP?::
+	The easiest way to do this is to use a credential helper via the
+	`credential.helper` configuration.  Most systems provide a standard
+	choice to integrate with the system credential manager.  For example,
+	Git for Windows provides the `wincred` credential manager, macOS has the
+	`osxkeychain` credential manager, and Unix systems with a standard
+	desktop environment can use the `libsecret` credential manager.  All of
+	these store credentials in an encrypted store to keep your passwords or
+	tokens secure.
++
+In addition, you can use the `store` credential manager which stores in a file
+in your home directory, or the `cache` credential manager, which does not
+permanently store your credentials, but does prevent you from being prompted for
+them for a certain period of time.
++
+You can also just enter your password when prompted.  While it is possible to
+place the password (which must be percent-encoded) in the URL, this is not
+particularly secure and can lead to accidental exposure of credentials, so it is
+not recommended.
+
+[[http-credentials-environment]]
+How do I read a password or token from an environment variable?::
+	The `credential.helper` configuration option can also take an arbitrary
+	shell command that produces the credential protocol on standard output.
+	This is useful when passing credentials into a container, for example.
++
+Such a shell command can be specified by starting the option value with an
+exclamation point.  If your password or token were stored in the `GIT_TOKEN`,
+you could run the following command to set your credential helper:
++
+----
+$ git config credential.helper \
+	'!f() { echo username=author; echo "password=$GIT_TOKEN"; };f'
+----
+
+[[http-reset-credentials]]
+How do I change the password or token I've saved in my credential manager?::
+	Usually, if the password or token is invalid, Git will erase it and
+	prompt for a new one.  However, there are times when this doesn't always
+	happen.  To change the password or token, you can erase the existing
+	credentials and then Git will prompt for new ones.  To erase
+	credentials, use a syntax like the following (substituting your username
+	and the hostname):
++
+----
+$ echo url=https://author@git.example.org | git credential reject
+----
+
+[[multiple-accounts-http]]
+How do I use multiple accounts with the same hosting provider using HTTP?::
+	Usually the easiest way to distinguish between these accounts is to use
+	the username in the URL.  For example, if you have the accounts `author`
+	and `committer` on `git.example.org`, you can use the URLs
+	https://author@git.example.org/org1/project1.git and
+	https://committer@git.example.org/org2/project2.git.  This way, when you
+	use a credential helper, it will automatically try to look up the
+	correct credentials for your account.  If you already have a remote set
+	up, you can change the URL with something like `git remote set-url
+	origin https://author@git.example.org/org1/project1.git` (see
+	linkgit:git-remote[1] for details).
+
+[[multiple-accounts-ssh]]
+How do I use multiple accounts with the same hosting provider using SSH?::
+	With most hosting providers that support SSH, a single key pair uniquely
+	identifies a user.  Therefore, to use multiple accounts, it's necessary
+	to create a key pair for each account.  If you're using a reasonably
+	modern OpenSSH version, you can create a new key pair with something
+	like `ssh-keygen -t ed25519 -f ~/.ssh/id_committer`.  You can then
+	register the public key (in this case, `~/.ssh/id_committer.pub`; note
+	the `.pub`) with the hosting provider.
++
+Most hosting providers use a single SSH account for pushing; that is, all users
+push to the `git` account (e.g., `git@git.example.org`).  If that's the case for
+your provider, you can set up multiple aliases in SSH to make it clear which key
+pair to use.  For example, you could write something like the following in
+`~/.ssh/config`, substituting the proper private key file:
++
+----
+# This is the account for author on git.example.org.
+Host example_author
+	HostName git.example.org
+	User git
+	# This is the key pair registered for author with git.example.org.
+	IdentityFile ~/.ssh/id_author
+	IdentitiesOnly yes
+# This is the account for committer on git.example.org.
+Host example_committer
+	HostName git.example.org
+	User git
+	# This is the key pair registered for committer with git.example.org.
+	IdentityFile ~/.ssh/id_committer
+	IdentitiesOnly yes
+----
++
+Then, you can adjust your push URL to use `git@example_author` or
+`git@example_committer` instead of `git@example.org` (e.g., `git remote set-url
+git@example_author:org1/project1.git`).
+
+Common Issues
+-------------
+
+[[last-commit-amend]]
+I've made a mistake in the last commit.  How do I change it?::
+	You can make the appropriate change to your working tree, run `git add
+	<file>` or `git rm <file>`, as appropriate, to stage it, and then `git
+	commit --amend`.  Your change will be included in the commit, and you'll
+	be prompted to edit the commit message again; if you wish to use the
+	original message verbatim, you can use the `--no-edit` option to `git
+	commit` in addition, or just save and quit when your editor opens.
+
+[[undo-previous-change]]
+I've made a change with a bug and it's been included in the main branch.  How should I undo it?::
+	The usual way to deal with this is to use `git revert`.  This preserves
+	the history that the original change was made and was a valuable
+	contribution, but also introduces a new commit that undoes those changes
+	because the original had a problem.  The commit message of the revert
+	indicates the commit which was reverted and is usually edited to include
+	an explanation as to why the revert was made.
+
+[[ignore-tracked-files]]
+How do I ignore changes to a tracked file?::
+	Git doesn't provide a way to do this.  The reason is that if Git needs
+	to overwrite this file, such as during a checkout, it doesn't know
+	whether the changes to the file are precious and should be kept, or
+	whether they are irrelevant and can safely be destroyed.  Therefore, it
+	has to take the safe route and always preserve them.
++
+It's tempting to try to use certain features of `git update-index`, namely the
+assume-unchanged and skip-worktree bits, but these don't work properly for this
+purpose and shouldn't be used this way.
++
+If your goal is to modify a configuration file, it can often be helpful to have
+a file checked into the repository which is a template or set of defaults which
+can then be copied alongside and modified as appropriate.  This second, modified
+file is usually ignored to prevent accidentally committing it.
+
+[[files-in-gitignore-are-tracked]]
+I asked Git to ignore various files, yet they are still tracked::
+	A `gitignore` file ensures that certain file(s) which are not
+	tracked by Git remain untracked.  However, sometimes particular
+	file(s) may have been tracked before adding them into the
+	`.gitignore`, hence they still remain tracked.  To untrack and
+	ignore files/patterns, use `git rm --cached <file/pattern>`
+	and add a pattern to `.gitignore` that matches the <file>.
+	See linkgit:gitignore[5] for details.
+
+[[fetching-and-pulling]]
+How do I know if I want to do a fetch or a pull?::
+	A fetch stores a copy of the latest changes from the remote
+	repository, without modifying the working tree or current branch.
+	You can then at your leisure inspect, merge, rebase on top of, or
+	ignore the upstream changes.  A pull consists of a fetch followed
+	immediately by either a merge or rebase.  See linkgit:git-pull[1].
+
+Merging and Rebasing
+--------------------
+
+[[long-running-squash-merge]]
+What kinds of problems can occur when merging long-lived branches with squash merges?::
+	In general, there are a variety of problems that can occur when using squash
+	merges to merge two branches multiple times.  These can include seeing extra
+	commits in `git log` output, with a GUI, or when using the `...` notation to
+	express a range, as well as the possibility of needing to re-resolve conflicts
+	again and again.
++
+When Git does a normal merge between two branches, it considers exactly three
+points: the two branches and a third commit, called the _merge base_, which is
+usually the common ancestor of the commits.  The result of the merge is the sum
+of the changes between the merge base and each head.  When you merge two
+branches with a regular merge commit, this results in a new commit which will
+end up as a merge base when they're merged again, because there is now a new
+common ancestor.  Git doesn't have to consider changes that occurred before the
+merge base, so you don't have to re-resolve any conflicts you resolved before.
++
+When you perform a squash merge, a merge commit isn't created; instead, the
+changes from one side are applied as a regular commit to the other side.  This
+means that the merge base for these branches won't have changed, and so when Git
+goes to perform its next merge, it considers all of the changes that it
+considered the last time plus the new changes.  That means any conflicts may
+need to be re-resolved.  Similarly, anything using the `...` notation in `git
+diff`, `git log`, or a GUI will result in showing all of the changes since the
+original merge base.
++
+As a consequence, if you want to merge two long-lived branches repeatedly, it's
+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 `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
+	those commits.  Git does not consider the history or the individual commits
+	that have happened on those branches at all.
++
+As a result, if both sides have a change and one side has reverted that change,
+the result is to include the change.  This is because the code has changed on
+one side and there is no net change on the other, and in this scenario, Git
+adopts the change.
++
+If this is a problem for you, you can do a rebase instead, rebasing the branch
+with the revert onto the other branch.  A rebase in this scenario will revert
+the change, because a rebase applies each individual commit, including the
+revert.  Note that rebases rewrite history, so you should avoid rebasing
+published branches unless you're sure you're comfortable with that.  See the
+NOTES section in linkgit:git-rebase[1] for more details.
+
+Hooks
+-----
+
+[[restrict-with-hooks]]
+How do I use hooks to prevent users from making certain changes?::
+	The only safe place to make these changes is on the remote repository
+	(i.e., the Git server), usually in the `pre-receive` hook or in a
+	continuous integration (CI) system.  These are the locations in which
+	policy can be enforced effectively.
++
+It's common to try to use `pre-commit` hooks (or, for commit messages,
+`commit-msg` hooks) to check these things, which is great if you're working as a
+solo developer and want the tooling to help you.  However, using hooks on a
+developer machine is not effective as a policy control because a user can bypass
+these hooks with `--no-verify` without being noticed (among various other ways).
+Git assumes that the user is in control of their local repositories and doesn't
+try to prevent this or tattle on the user.
++
+In addition, some advanced users find `pre-commit` hooks to be an impediment to
+workflows that use temporary commits to stage work in progress or that create
+fixup commits, so it's better to push these kinds of checks to the server
+anyway.
+
+Cross-Platform Issues
+---------------------
+
+[[windows-text-binary]]
+I'm on Windows and my text files are detected as binary.::
+	Git works best when you store text files as UTF-8.  Many programs on
+	Windows support UTF-8, but some do not and only use the little-endian
+	UTF-16 format, which Git detects as binary.  If you can't use UTF-8 with
+	your programs, you can specify a working tree encoding that indicates
+	which encoding your files should be checked out with, while still
+	storing these files as UTF-8 in the repository.  This allows tools like
+	linkgit:git-diff[1] to work as expected, while still allowing your tools
+	to work.
++
+To do so, you can specify a linkgit:gitattributes[5] pattern with the
+`working-tree-encoding` attribute.  For example, the following pattern sets all
+C files to use UTF-16LE-BOM, which is a common encoding on Windows:
++
+----
+*.c	working-tree-encoding=UTF-16LE-BOM
+----
++
+You will need to run `git add --renormalize` to have this take effect.  Note
+that if you are making these changes on a project that is used across platforms,
+you'll probably want to make it in a per-user configuration file or in the one
+in `$GIT_DIR/info/attributes`, since making it in a `.gitattributes` file in the
+repository will apply to all users of the repository.
++
+See the following entry for information about normalizing line endings as well,
+and see linkgit:gitattributes[5] for more information about attribute files.
+
+[[windows-diff-control-m]]
+I'm on Windows and git diff shows my files as having a `^M` at the end.::
+	By default, Git expects files to be stored with Unix line endings.  As such,
+	the carriage return (`^M`) that is part of a Windows line ending is shown
+	because it is considered to be trailing whitespace.  Git defaults to showing
+	trailing whitespace only on new lines, not existing ones.
++
+You can store the files in the repository with Unix line endings and convert
+them automatically to your platform's line endings.  To do that, set the
+configuration option `core.eol` to `native` and see the following entry for
+information about how to configure files as text or binary.
++
+You can also control this behavior with the `core.whitespace` setting if you
+don't wish to remove the carriage returns from your line endings.
+
+[[always-modified-files-case]]
+Why do I have a file that's always modified?::
+	Internally, Git always stores file names as sequences of bytes and doesn't
+	perform any encoding or case folding.  However, Windows and macOS by default
+	both perform case folding on file names.  As a result, it's possible to end up
+	with multiple files or directories whose names differ only in case.  Git can
+	handle this just fine, but the file system can store only one of these files,
+	so when Git reads the other file to see its contents, it looks modified.
++
+It's best to remove one of the files such that you only have one file.  You can
+do this with commands like the following (assuming two files `AFile.txt` and
+`afile.txt`) on an otherwise clean working tree:
++
+----
+$ git rm --cached AFile.txt
+$ git commit -m 'Remove files conflicting in case'
+$ git checkout .
+----
++
+This avoids touching the disk, but removes the additional file.  Your project
+may prefer to adopt a naming convention, such as all-lowercase names, to avoid
+this problem from occurring again; such a convention can be checked using a
+`pre-receive` hook or as part of a continuous integration (CI) system.
++
+It is also possible for perpetually modified files to occur on any platform if a
+smudge or clean filter is in use on your system but a file was previously
+committed without running the smudge or clean filter.  To fix this, run the
+following on an otherwise clean working tree:
++
+----
+$ git add --renormalize .
+----
+
+[[recommended-storage-settings]]
+What's the recommended way to store files in Git?::
+	While Git can store and handle any file of any type, there are some
+	settings that work better than others.  In general, we recommend that
+	text files be stored in UTF-8 without a byte-order mark (BOM) with LF
+	(Unix-style) endings.  We also recommend the use of UTF-8 (again,
+	without BOM) in commit messages.  These are the settings that work best
+	across platforms and with tools such as `git diff` and `git merge`.
++
+Additionally, if you have a choice between storage formats that are text based
+or non-text based, we recommend storing files in the text format and, if
+necessary, transforming them into the other format.  For example, a text-based
+SQL dump with one record per line will work much better for diffing and merging
+than an actual database file.  Similarly, text-based formats such as Markdown
+and AsciiDoc will work better than binary formats such as Microsoft Word and
+PDF.
++
+Similarly, storing binary dependencies (e.g., shared libraries or JAR files) or
+build products in the repository is generally not recommended.  Dependencies and
+build products are best stored on an artifact or package server with only
+references, URLs, and hashes stored in the repository.
++
+We also recommend setting a linkgit:gitattributes[5] file to explicitly mark
+which files are text and which are binary.  If you want Git to guess, you can
+set the attribute `text=auto`.  For example, the following might be appropriate
+in some projects:
++
+----
+# By default, guess.
+*	text=auto
+# Mark all C files as text.
+*.c	text
+# Mark all JPEG files as binary.
+*.jpg	binary
+----
++
+These settings help tools pick the right format for output such as patches and
+result in files being checked out in the appropriate line ending for the
+platform.
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index 50365f2914..b51959ff94 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -138,7 +138,7 @@ given); `template` (if a `-t` option was given or the
 configuration option `commit.template` is set); `merge` (if the
 commit is a merge or a `.git/MERGE_MSG` file exists); `squash`
 (if a `.git/SQUASH_MSG` file exists); or `commit`, followed by
-a commit SHA-1 (if a `-c`, `-C` or `--amend` option was given).
+a commit object name (if a `-c`, `-C` or `--amend` option was given).
 
 If the exit status is non-zero, `git commit` will abort.
 
@@ -164,7 +164,7 @@ can also be used to refuse the commit after inspecting the message
 file.
 
 The default 'commit-msg' hook, when enabled, detects duplicate
-"Signed-off-by" lines, and aborts the commit if one is found.
+`Signed-off-by` trailers, and aborts the commit if one is found.
 
 post-commit
 ~~~~~~~~~~~
@@ -193,7 +193,9 @@ worktree.  The hook is given three parameters: the ref of the previous HEAD,
 the ref of the new HEAD (which may or may not have changed), and a flag
 indicating whether the checkout was a branch checkout (changing branches,
 flag=1) or a file checkout (retrieving a file from the index, flag=0).
-This hook cannot affect the outcome of `git switch` or `git checkout`.
+This hook cannot affect the outcome of `git switch` or `git checkout`,
+other than that the hook's exit status becomes the exit status of
+these two commands.
 
 It is also run after linkgit:git-clone[1], unless the `--no-checkout` (`-n`) option is
 used. The first parameter given to the hook is the null-ref, the second the
@@ -229,19 +231,19 @@ named remote is not being used both values will be the same.
 Information about what is to be pushed is provided on the hook's standard
 input with lines of the form:
 
-  <local ref> SP <local sha1> SP <remote ref> SP <remote sha1> LF
+  <local ref> SP <local object name> SP <remote ref> SP <remote object name> LF
 
 For instance, if the command +git push origin master:foreign+ were run the
 hook would receive a line like the following:
 
   refs/heads/master 67890 refs/heads/foreign 12345
 
-although the full, 40-character SHA-1s would be supplied.  If the foreign ref
-does not yet exist the `<remote SHA-1>` will be 40 `0`.  If a ref is to be
-deleted, the `<local ref>` will be supplied as `(delete)` and the `<local
-SHA-1>` will be 40 `0`.  If the local commit was specified by something other
-than a name which could be expanded (such as `HEAD~`, or a SHA-1) it will be
-supplied as it was originally given.
+although the full object name would be supplied.  If the foreign ref does not
+yet exist the `<remote object name>` will be the all-zeroes object name.  If a
+ref is to be deleted, the `<local ref>` will be supplied as `(delete)` and the
+`<local object name>` will be the all-zeroes object name.  If the local commit
+was specified by something other than a name which could be expanded (such as
+`HEAD~`, or an object name) it will be supplied as it was originally given.
 
 If this hook exits with a non-zero status, `git push` will abort without
 pushing anything.  Information about why the push is rejected may be sent
@@ -266,7 +268,7 @@ input a line of the format:
 where `<old-value>` is the old object name stored in the ref,
 `<new-value>` is the new object name to be stored in the ref and
 `<ref-name>` is the full name of the ref.
-When creating a new ref, `<old-value>` is 40 `0`.
+When creating a new ref, `<old-value>` is the all-zeroes object name.
 
 If the hook exits with non-zero status, none of the refs will be
 updated. If the hook exits with zero, updating of individual refs can
@@ -333,6 +335,68 @@ The default 'update' hook, when enabled--and with
 `hooks.allowunannotated` config option unset or set to false--prevents
 unannotated tags to be pushed.
 
+[[proc-receive]]
+proc-receive
+~~~~~~~~~~~~
+
+This hook is invoked by linkgit:git-receive-pack[1].  If the server has
+set the multi-valued config variable `receive.procReceiveRefs`, and the
+commands sent to 'receive-pack' have matching reference names, these
+commands will be executed by this hook, instead of by the internal
+`execute_commands()` function.  This hook is responsible for updating
+the relevant references and reporting the results back to 'receive-pack'.
+
+This hook executes once for the receive operation.  It takes no
+arguments, but uses a pkt-line format protocol to communicate with
+'receive-pack' to read commands, push-options and send results.  In the
+following example for the protocol, the letter 'S' stands for
+'receive-pack' and the letter 'H' stands for this hook.
+
+    # Version and features negotiation.
+    S: PKT-LINE(version=1\0push-options atomic...)
+    S: flush-pkt
+    H: PKT-LINE(version=1\0push-options...)
+    H: flush-pkt
+
+    # Send commands from server to the hook.
+    S: PKT-LINE(<old-oid> <new-oid> <ref>)
+    S: ... ...
+    S: flush-pkt
+    # Send push-options only if the 'push-options' feature is enabled.
+    S: PKT-LINE(push-option)
+    S: ... ...
+    S: flush-pkt
+
+    # Receive result from the hook.
+    # OK, run this command successfully.
+    H: PKT-LINE(ok <ref>)
+    # NO, I reject it.
+    H: PKT-LINE(ng <ref> <reason>)
+    # Fall through, let 'receive-pack' to execute it.
+    H: PKT-LINE(ok <ref>)
+    H: PKT-LINE(option fall-through)
+    # OK, but has an alternate reference.  The alternate reference name
+    # and other status can be given in option directives.
+    H: PKT-LINE(ok <ref>)
+    H: PKT-LINE(option refname <refname>)
+    H: PKT-LINE(option old-oid <old-oid>)
+    H: PKT-LINE(option new-oid <new-oid>)
+    H: PKT-LINE(option forced-update)
+    H: ... ...
+    H: flush-pkt
+
+Each command for the 'proc-receive' hook may point to a pseudo-reference
+and always has a zero-old as its old-oid, while the 'proc-receive' hook
+may update an alternate reference and the alternate reference may exist
+already with a non-zero old-oid.  For this case, this hook will use
+"option" directives to report extended attributes for the reference given
+by the leading "ok" directive.
+
+The report of the commands of this hook should have the same order as
+the input.  The exit status of the 'proc-receive' hook only determines
+the success or failure of the group of commands sent to it, unless
+atomic push is in use.
+
 [[post-receive]]
 post-receive
 ~~~~~~~~~~~~
@@ -404,6 +468,44 @@ Both standard output and standard error output are forwarded to
 `git send-pack` on the other end, so you can simply `echo` messages
 for the user.
 
+reference-transaction
+~~~~~~~~~~~~~~~~~~~~~
+
+This hook is invoked by any Git command that performs reference
+updates. It executes whenever a reference transaction is prepared,
+committed or aborted and may thus get called multiple times. The hook
+does not cover symbolic references (but that may change in the future).
+
+The hook takes exactly one argument, which is the current state the
+given reference transaction is in:
+
+    - "prepared": All reference updates have been queued to the
+      transaction and references were locked on disk.
+
+    - "committed": The reference transaction was committed and all
+      references now have their respective new value.
+
+    - "aborted": The reference transaction was aborted, no changes
+      were performed and the locks have been released.
+
+For each reference update that was added to the transaction, the hook
+receives on standard input a line of the format:
+
+  <old-value> SP <new-value> SP <ref-name> LF
+
+where `<old-value>` is the old object name passed into the reference
+transaction, `<new-value>` is the new object name to be stored in the
+ref and `<ref-name>` is the full name of the ref. When force updating
+the reference regardless of its current value or when the reference is
+to be created anew, `<old-value>` is the all-zeroes object name. To
+distinguish these cases, you can inspect the current value of
+`<ref-name>` via `git rev-parse`.
+
+The exit status of the hook is ignored for any state except for the
+"prepared" state. In the "prepared" state, a non-zero exit status will
+cause the transaction to be aborted. The hook will not be called with
+"aborted" state in that case.
+
 push-to-checkout
 ~~~~~~~~~~~~~~~~
 
@@ -457,7 +559,7 @@ command-dependent arguments may be passed in the future.
 The hook receives a list of the rewritten commits on stdin, in the
 format
 
-  <old-sha1> SP <new-sha1> [ SP <extra-info> ] LF
+  <old-object-name> SP <new-object-name> [ SP <extra-info> ] LF
 
 The 'extra-info' is again command-dependent.  If it is empty, the
 preceding SP is also omitted.  Currently, no commands pass any
@@ -473,7 +575,7 @@ rebase::
 	For the 'squash' and 'fixup' operation, all commits that were
 	squashed are listed as being rewritten to the squashed commit.
 	This means that there will be several lines sharing the same
-	'new-sha1'.
+	'new-object-name'.
 +
 The commits are guaranteed to be listed in the order that they were
 processed by rebase.
@@ -490,9 +592,16 @@ fsmonitor-watchman
 ~~~~~~~~~~~~~~~~~~
 
 This hook is invoked when the configuration option `core.fsmonitor` is
-set to `.git/hooks/fsmonitor-watchman`.  It takes two arguments, a version
-(currently 1) and the time in elapsed nanoseconds since midnight,
-January 1, 1970.
+set to `.git/hooks/fsmonitor-watchman` or `.git/hooks/fsmonitor-watchmanv2`
+depending on the version of the hook to use.
+
+Version 1 takes two arguments, a version (1) and the time in elapsed
+nanoseconds since midnight, January 1, 1970.
+
+Version 2 takes two arguments, a version (2) and a token that is used
+for identifying changes since the token. For watchman this would be
+a clock id. This version must output to stdout the new token followed
+by a NUL before the list of files.
 
 The hook should output to stdout the list of all files in the working
 directory that may have changed since the requested time.  The logic
@@ -515,12 +624,61 @@ The exit status determines whether git will use the data from the
 hook to limit its search.  On error, it will fall back to verifying
 all files and folders.
 
+p4-changelist
+~~~~~~~~~~~~~
+
+This hook is invoked by `git-p4 submit`.
+
+The `p4-changelist` hook is executed after the changelist
+message has been edited by the user. It can be bypassed with the
+`--no-verify` option. It takes a single parameter, the name
+of the file that holds the proposed changelist text. Exiting
+with a non-zero status causes the command to abort.
+
+The hook is allowed to edit the changelist file and can be used
+to normalize the text into some project standard format. It can
+also be used to refuse the Submit after inspect the message file.
+
+Run `git-p4 submit --help` for details.
+
+p4-prepare-changelist
+~~~~~~~~~~~~~~~~~~~~~
+
+This hook is invoked by `git-p4 submit`.
+
+The `p4-prepare-changelist` hook is executed right after preparing
+the default changelist message and before the editor is started.
+It takes one parameter, the name of the file that contains the
+changelist text. Exiting with a non-zero status from the script
+will abort the process.
+
+The purpose of the hook is to edit the message file in place,
+and it is not suppressed by the `--no-verify` option. This hook
+is called even if `--prepare-p4-only` is set.
+
+Run `git-p4 submit --help` for details.
+
+p4-post-changelist
+~~~~~~~~~~~~~~~~~~
+
+This hook is invoked by `git-p4 submit`.
+
+The `p4-post-changelist` hook is invoked after the submit has
+successfully occurred in P4. It takes no parameters and is meant
+primarily for notification and cannot affect the outcome of the
+git p4 submit action.
+
+Run `git-p4 submit --help` for details.
+
 p4-pre-submit
 ~~~~~~~~~~~~~
 
 This hook is invoked by `git-p4 submit`. It takes no parameters and nothing
 from standard input. Exiting with non-zero status from this script prevent
-`git-p4 submit` from launching. Run `git-p4 submit --help` for details.
+`git-p4 submit` from launching. It can be bypassed with the `--no-verify`
+command line option. Run `git-p4 submit --help` for details.
+
+
 
 post-index-change
 ~~~~~~~~~~~~~~~~~
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index d47b1ae296..f8a1fc2014 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -27,12 +27,11 @@ precedence, the last matching pattern decides the outcome):
    them.
 
  * Patterns read from a `.gitignore` file in the same directory
-   as the path, or in any parent directory, with patterns in the
-   higher level files (up to the toplevel of the work tree) being overridden
-   by those in lower level files down to the directory containing the file.
-   These patterns match relative to the location of the
-   `.gitignore` file.  A project normally includes such
-   `.gitignore` files in its repository, containing patterns for
+   as the path, or in any parent directory (up to the top-level of the working
+   tree), with patterns in the higher level files being overridden by those in
+   lower level files down to the directory containing the file. These patterns
+   match relative to the location of the `.gitignore` file.  A project normally
+   includes such `.gitignore` files in its repository, containing patterns for
    files generated as part of the project build.
 
  * Patterns read from `$GIT_DIR/info/exclude`.
@@ -149,11 +148,15 @@ not tracked by Git remain untracked.
 To stop tracking a file that is currently tracked, use
 'git rm --cached'.
 
+Git does not follow symbolic links when accessing a `.gitignore` file in
+the working tree. This keeps behavior consistent when the file is
+accessed from the index or a tree versus from the filesystem.
+
 EXAMPLES
 --------
 
  - The pattern `hello.*` matches any file or folder
-   whose name begins with `hello`. If one wants to restrict
+   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.*`;
    the pattern now matches `hello.txt`, `hello.c` but not
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 1eabb0aaf3..d50e9ed10e 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -98,21 +98,7 @@ linkgit:git-rev-list[1] for a complete list.
 	(See "History simplification" in linkgit:git-log[1] for a more
 	detailed explanation.)
 
--L<start>,<end>:<file>::
--L:<funcname>:<file>::
-
-	Trace the evolution of the line range given by "<start>,<end>"
-	(or the function name regex <funcname>) within the <file>.  You may
-	not give any pathspec limiters.  This is currently limited to
-	a walk starting from a single revision, i.e., you may only
-	give zero or one positive revision arguments.
-	You can specify this option more than once.
-+
-*Note:* gitk (unlike linkgit:git-log[1]) currently only understands
-this option if you specify it "glued together" with its argument.  Do
-*not* put a space after `-L`.
-+
-include::line-range-format.txt[]
+include::line-range-options.txt[]
 
 <revision range>::
 
diff --git a/Documentation/gitmailmap.txt b/Documentation/gitmailmap.txt
new file mode 100644
index 0000000000..06f4af93fe
--- /dev/null
+++ b/Documentation/gitmailmap.txt
@@ -0,0 +1,130 @@
+gitmailmap(5)
+=============
+
+NAME
+----
+gitmailmap - Map author/committer names and/or E-Mail addresses
+
+SYNOPSIS
+--------
+$GIT_WORK_TREE/.mailmap
+
+
+DESCRIPTION
+-----------
+
+If the file `.mailmap` exists at the toplevel of the repository, or at
+the location pointed to by the `mailmap.file` or `mailmap.blob`
+configuration options (see linkgit:git-config[1]), it
+is used to map author and committer names and email addresses to
+canonical real names and email addresses.
+
+
+SYNTAX
+------
+
+The '#' character begins a comment to the end of line, blank lines
+are ignored.
+
+In the simple form, each line in the file consists of the canonical
+real name of an author, whitespace, and an email address used in the
+commit (enclosed by '<' and '>') to map to the name. For example:
+--
+	Proper Name <commit@email.xx>
+--
+
+The more complex forms are:
+--
+	<proper@email.xx> <commit@email.xx>
+--
+which allows mailmap to replace only the email part of a commit, and:
+--
+	Proper Name <proper@email.xx> <commit@email.xx>
+--
+which allows mailmap to replace both the name and the email of a
+commit matching the specified commit email address, and:
+--
+	Proper Name <proper@email.xx> Commit Name <commit@email.xx>
+--
+which allows mailmap to replace both the name and the email of a
+commit matching both the specified commit name and email address.
+
+Both E-Mails and names are matched case-insensitively. For example
+this would also match the 'Commit Name <commit&#64;email.xx>' above:
+--
+	Proper Name <proper@email.xx> CoMmIt NaMe <CoMmIt@EmAiL.xX>
+--
+
+NOTES
+-----
+
+Git does not follow symbolic links when accessing a `.mailmap` file in
+the working tree. This keeps behavior consistent when the file is
+accessed from the index or a tree versus from the filesystem.
+
+EXAMPLES
+--------
+
+Your history contains commits by two authors, Jane
+and Joe, whose names appear in the repository under several forms:
+
+------------
+Joe Developer <joe@example.com>
+Joe R. Developer <joe@example.com>
+Jane Doe <jane@example.com>
+Jane Doe <jane@laptop.(none)>
+Jane D. <jane@desktop.(none)>
+------------
+
+Now suppose that Joe wants his middle name initial used, and Jane
+prefers her family name fully spelled out. A `.mailmap` file to
+correct the names would look like:
+
+------------
+Joe R. Developer <joe@example.com>
+Jane Doe <jane@example.com>
+Jane Doe <jane@desktop.(none)>
+------------
+
+Note that there's no need to map the name for '<jane&#64;laptop.(none)>' to
+only correct the names. However, leaving the obviously broken
+'<jane&#64;laptop.(none)>' and '<jane&#64;desktop.(none)>' E-Mails as-is is
+usually not what you want. A `.mailmap` file which also corrects those
+is:
+
+------------
+Joe R. Developer <joe@example.com>
+Jane Doe <jane@example.com> <jane@laptop.(none)>
+Jane Doe <jane@example.com> <jane@desktop.(none)>
+------------
+
+Finally, let's say that Joe and Jane shared an E-Mail address, but not
+a name, e.g. by having these two commits in the history generated by a
+bug reporting system. I.e. names appearing in history as:
+
+------------
+Joe <bugs@example.com>
+Jane <bugs@example.com>
+------------
+
+A full `.mailmap` file which also handles those cases (an addition of
+two lines to the above example) would be:
+
+------------
+Joe R. Developer <joe@example.com>
+Jane Doe <jane@example.com> <jane@laptop.(none)>
+Jane Doe <jane@example.com> <jane@desktop.(none)>
+Joe R. Developer <joe@example.com> Joe <bugs@example.com>
+Jane Doe <jane@example.com> Jane <bugs@example.com>
+------------
+
+
+
+SEE ALSO
+--------
+linkgit:git-check-mailmap[1]
+
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt
index f2a65ba0ca..dcee09b500 100644
--- a/Documentation/gitmodules.txt
+++ b/Documentation/gitmodules.txt
@@ -7,7 +7,7 @@ gitmodules - Defining submodule properties
 
 SYNOPSIS
 --------
-$GIT_WORK_DIR/.gitmodules
+$GIT_WORK_TREE/.gitmodules
 
 
 DESCRIPTION
@@ -27,45 +27,44 @@ submodule.<name>.path::
 	Defines the path, relative to the top-level directory of the Git
 	working tree, where the submodule is expected to be checked out.
 	The path name must not end with a `/`. All submodule paths must
-	be unique within the .gitmodules file.
+	be unique within the `.gitmodules` file.
 
 submodule.<name>.url::
 	Defines a URL from which the submodule repository can be cloned.
 	This may be either an absolute URL ready to be passed to
-	linkgit:git-clone[1] or (if it begins with ./ or ../) a location
+	linkgit:git-clone[1] or (if it begins with `./` or `../`) a location
 	relative to the superproject's origin repository.
 
 In addition, there are a number of optional keys:
 
 submodule.<name>.update::
 	Defines the default update procedure for the named submodule,
-	i.e. how the submodule is updated by "git submodule update"
+	i.e. how the submodule is updated by the `git submodule update`
 	command in the superproject. This is only used by `git
 	submodule init` to initialize the configuration variable of
 	the same name. Allowed values here are 'checkout', 'rebase',
 	'merge' or 'none'. See description of 'update' command in
-	linkgit:git-submodule[1] for their meaning. Note that the
-	'!command' form is intentionally ignored here for security
-	reasons.
+	linkgit:git-submodule[1] for their meaning. For security
+	reasons, the '!command' form is not accepted here.
 
 submodule.<name>.branch::
 	A remote branch name for tracking updates in the upstream submodule.
-	If the option is not specified, it defaults to 'master'.  A special
-	value of `.` is used to indicate that the name of the branch in the
-	submodule should be the same name as the current branch in the
+	If the option is not specified, it defaults to the remote `HEAD`.
+	A special value of `.` is used to indicate that the name of the branch
+	in the submodule should be the same name as the current branch in the
 	current repository.  See the `--remote` documentation in
 	linkgit:git-submodule[1] for details.
 
 submodule.<name>.fetchRecurseSubmodules::
 	This option can be used to control recursive fetching of this
-	submodule. If this option is also present in the submodules entry in
-	.git/config of the superproject, the setting there will override the
-	one found in .gitmodules.
+	submodule. If this option is also present in the submodule's entry in
+	`.git/config` of the superproject, the setting there will override the
+	one found in `.gitmodules`.
 	Both settings can be overridden on the command line by using the
-	"--[no-]recurse-submodules" option to "git fetch" and "git pull".
+	`--[no-]recurse-submodules` option to `git fetch` and `git pull`.
 
 submodule.<name>.ignore::
-	Defines under what circumstances "git status" and the diff family show
+	Defines under what circumstances `git status` and the diff family show
 	a submodule as modified. The following values are supported:
 +
 --
@@ -74,23 +73,23 @@ submodule.<name>.ignore::
 	    been staged).
 
 	dirty;; All changes to the submodule's work tree will be ignored, only
-	    committed differences between the HEAD of the submodule and its
+	    committed differences between the `HEAD` of the submodule and its
 	    recorded state in the superproject are taken into account.
 
 	untracked;; Only untracked files in submodules will be ignored.
 	    Committed differences and modifications to tracked files will show
 	    up.
 
-	none;; No modifiations to submodules are ignored, all of committed
+	none;; No modifications to submodules are ignored, all of committed
 	    differences, and modifications to tracked and untracked files are
 	    shown. This is the default option.
 
-If this option is also present in the submodules entry in .git/config
+If this option is also present in the submodule's entry in `.git/config`
 of the superproject, the setting there will override the one found in
-.gitmodules.
+`.gitmodules`.
 
 Both settings can be overridden on the command line by using the
-"--ignore-submodules" option. The 'git submodule' commands are not
+`--ignore-submodules` option. The `git submodule` commands are not
 affected by this setting.
 --
 
@@ -99,11 +98,19 @@ submodule.<name>.shallow::
 	shallow clone (with a history depth of 1) unless the user explicitly
 	asks for a non-shallow clone.
 
+NOTES
+-----
+
+Git does not allow the `.gitmodules` file within a working tree to be a
+symbolic link, and will refuse to check out such a tree entry. This
+keeps behavior consistent when the file is accessed from the index or a
+tree versus from the filesystem, and helps Git reliably enforce security
+checks of the file contents.
 
 EXAMPLES
 --------
 
-Consider the following .gitmodules file:
+Consider the following `.gitmodules` file:
 
 ----
 [submodule "libfoo"]
@@ -121,7 +128,7 @@ submodules a URL is specified which can be used for cloning the submodules.
 
 SEE ALSO
 --------
-linkgit:git-submodule[1] linkgit:git-config[1]
+linkgit:git-submodule[1], linkgit:gitsubmodules[7], linkgit:git-config[1]
 
 GIT
 ---
diff --git a/Documentation/gitnamespaces.txt b/Documentation/gitnamespaces.txt
index b614969ad2..1c8d2ecc35 100644
--- a/Documentation/gitnamespaces.txt
+++ b/Documentation/gitnamespaces.txt
@@ -62,3 +62,7 @@ git clone ext::'git --namespace=foo %s /tmp/prefixed.git'
 ----------
 
 include::transfer-data-leaks.txt[]
+
+GIT
+---
+Part of the linkgit:git[1] suite
diff --git a/Documentation/gitremote-helpers.txt b/Documentation/gitremote-helpers.txt
index f48a031dc3..6f1e269ae4 100644
--- a/Documentation/gitremote-helpers.txt
+++ b/Documentation/gitremote-helpers.txt
@@ -238,6 +238,9 @@ the remote repository.
 	`--signed-tags=verbatim` to linkgit:git-fast-export[1].  In the
 	absence of this capability, Git will use `--signed-tags=warn-strip`.
 
+'object-format'::
+	This indicates that the helper is able to interact with the remote
+	side using an explicit hash algorithm extension.
 
 
 COMMANDS
@@ -257,12 +260,14 @@ Support for this command is mandatory.
 'list'::
 	Lists the refs, one per line, in the format "<value> <name>
 	[<attr> ...]". The value may be a hex sha1 hash, "@<dest>" for
-	a symref, or "?" to indicate that the helper could not get the
-	value of the ref. A space-separated list of attributes follows
-	the name; unrecognized attributes are ignored. The list ends
-	with a blank line.
+	a symref, ":<keyword> <value>" for a key-value pair, or
+	"?" to indicate that the helper could not get the value of the
+	ref. A space-separated list of attributes follows the name;
+	unrecognized attributes are ignored. The list ends with a
+	blank line.
 +
 See REF LIST ATTRIBUTES for a list of currently defined attributes.
+See REF LIST KEYWORDS for a list of currently defined keywords.
 +
 Supported if the helper has the "fetch" or "import" capability.
 
@@ -405,7 +410,9 @@ Supported if the helper has the "connect" capability.
 	trying to fall back).  After line feed terminating the positive
 	(empty) response, the output of the service starts.  Messages
 	(both request and response) must consist of zero or more
-	PKT-LINEs, terminating in a flush packet. The client must not
+	PKT-LINEs, terminating in a flush packet. Response messages will
+	then have a response end packet after the flush packet to
+	indicate the end of a response.  The client must not
 	expect the server to store any state in between request-response
 	pairs.  After the connection ends, the remote helper exits.
 +
@@ -430,6 +437,18 @@ attributes are defined.
 	This ref is unchanged since the last import or fetch, although
 	the helper cannot necessarily determine what value that produced.
 
+REF LIST KEYWORDS
+-----------------
+
+The 'list' command may produce a list of key-value pairs.
+The following keys are defined.
+
+'object-format'::
+	The refs are using the given hash algorithm.  This keyword is only
+	used if the server and client both support the object-format
+	extension.
+
+
 OPTIONS
 -------
 
@@ -514,6 +533,14 @@ set by Git if the remote helper has the 'option' capability.
 	transaction.  If successful, all refs will be updated, or none will.  If the
 	remote side does not support this capability, the push will fail.
 
+'option object-format' {'true'|algorithm}::
+	If 'true', indicate that the caller wants hash algorithm information
+	to be passed back from the remote.  This mode is used when fetching
+	refs.
++
+If set to an algorithm, indicate that the caller wants to interact with
+the remote side using that algorithm.
+
 SEE ALSO
 --------
 linkgit:git-remote[1]
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index d6388f10bb..1a2ef4c150 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -96,9 +96,9 @@ refs::
 	directory.  The 'git prune' command knows to preserve
 	objects reachable from refs found in this directory and
 	its subdirectories.
-	This directory is ignored (except refs/bisect and
-	refs/worktree) if $GIT_COMMON_DIR is set and
-	"$GIT_COMMON_DIR/refs" will be used instead.
+	This directory is ignored (except refs/bisect,
+	refs/rewritten and refs/worktree) if $GIT_COMMON_DIR is
+	set and "$GIT_COMMON_DIR/refs" will be used instead.
 
 refs/heads/`name`::
 	records tip-of-the-tree commit objects of branch `name`
@@ -240,8 +240,8 @@ remotes::
 logs::
 	Records of changes made to refs are stored in this directory.
 	See linkgit:git-update-ref[1] for more information. This
-	directory is ignored if $GIT_COMMON_DIR is set and
-	"$GIT_COMMON_DIR/logs" will be used instead.
+	directory is ignored (except logs/HEAD) if $GIT_COMMON_DIR is
+	set and "$GIT_COMMON_DIR/logs" will be used instead.
 
 logs/refs/heads/`name`::
 	Records all changes made to the branch tip named `name`.
diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt
index 0a890205b8..891c8da4fd 100644
--- a/Documentation/gitsubmodules.txt
+++ b/Documentation/gitsubmodules.txt
@@ -3,7 +3,7 @@ gitsubmodules(7)
 
 NAME
 ----
-gitsubmodules - mounting one repository inside another
+gitsubmodules - Mounting one repository inside another
 
 SYNOPSIS
 --------
@@ -225,10 +225,10 @@ presence of the .url field.
 Workflow for a third party library
 ----------------------------------
 
-  # add a submodule
+  # Add a submodule
   git submodule add <url> <path>
 
-  # occasionally update the submodule to a new version:
+  # Occasionally update the submodule to a new version:
   git -C <path> checkout <new version>
   git add <path>
   git commit -m "update submodule to new version"
@@ -246,20 +246,23 @@ Workflow for an artificially split repo
   # regular commands recurse into submodules by default
   git config --global submodule.recurse true
 
-  # Unlike the other commands below clone still needs
+  # Unlike most other commands below, clone still needs
   # its own recurse flag:
   git clone --recurse <URL> <directory>
   cd <directory>
 
   # Get to know the code:
   git grep foo
-  git ls-files
+  git ls-files --recurse-submodules
+
+[NOTE]
+`git ls-files` also requires its own `--recurse-submodules` flag.
 
   # Get new code
   git fetch
   git pull --rebase
 
-  # change worktree
+  # Change worktree
   git checkout
   git reset
 
@@ -267,11 +270,12 @@ Implementation details
 ----------------------
 
 When cloning or pulling a repository containing submodules the submodules
-will not be checked out by default; You can instruct 'clone' to recurse
-into submodules. The 'init' and 'update' subcommands of 'git submodule'
+will not be checked out by default; you can instruct `clone` to recurse
+into submodules. The `init` and `update` subcommands of `git submodule`
 will maintain submodules checked out and at an appropriate revision in
-your working tree. Alternatively you can set 'submodule.recurse' to have
-'checkout' recursing into submodules.
+your working tree. Alternatively you can set `submodule.recurse` to have
+`checkout` recursing into submodules (note that `submodule.recurse` also
+affects other Git commands, see linkgit:git-config[1] for a complete list).
 
 
 SEE ALSO
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.conf.txt b/Documentation/gitweb.conf.txt
index 7963a79ba9..34b1d6e224 100644
--- a/Documentation/gitweb.conf.txt
+++ b/Documentation/gitweb.conf.txt
@@ -751,6 +751,17 @@ default font sizes or lineheights are changed (e.g. via adding extra
 CSS stylesheet in `@stylesheets`), it may be appropriate to change
 these values.
 
+email-privacy::
+	Redact e-mail addresses from the generated HTML, etc. content.
+	This obscures e-mail addresses retrieved from the author/committer
+	and comment sections of the Git log.
+	It is meant to hinder web crawlers that harvest and abuse addresses.
+	Such crawlers may not respect robots.txt.
+	Note that users and user tools also see the addresses as redacted.
+	If Gitweb is not the final step in a workflow then subsequent steps
+	may misbehave because of the redacted information they receive.
+	Disabled by default.
+
 highlight::
 	Server-side syntax highlight support in "blob" view.  It requires
 	`$highlight_bin` program to be available (see the description of
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index abc0dc6bc7..47cf97f9be 100644
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@ -85,15 +85,15 @@ As a given feature goes from experimental to stable, it also
 
 There is a fourth official branch that is used slightly differently:
 
-* 'pu' (proposed updates) is an integration branch for things that are
-  not quite ready for inclusion yet (see "Integration Branches"
-  below).
+* 'seen' (patches seen by the maintainer) is an integration branch for
+  things that are not quite ready for inclusion yet (see "Integration
+  Branches" below).
 
 Each of the four branches is usually a direct descendant of the one
 above it.
 
 Conceptually, the feature enters at an unstable branch (usually 'next'
-or 'pu'), and "graduates" to 'master' for the next release once it is
+or 'seen'), and "graduates" to 'master' for the next release once it is
 considered stable enough.
 
 
@@ -207,7 +207,7 @@ If you make it (very) clear that this branch is going to be deleted
 right after the testing, you can even publish this branch, for example
 to give the testers a chance to work with it, or other developers a
 chance to see if their in-progress work will be compatible.  `git.git`
-has such an official throw-away integration branch called 'pu'.
+has such an official throw-away integration branch called 'seen'.
 
 
 Branch management for a release
@@ -291,8 +291,8 @@ This will not happen if the content of the branches was verified as
 described in the previous section.
 
 
-Branch management for next and pu after a feature release
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Branch management for next and seen after a feature release
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 After a feature release, the integration branch 'next' may optionally be
 rewound and rebuilt from the tip of 'master' using the surviving
@@ -319,8 +319,8 @@ so.
 If you do this, then you should make a public announcement indicating
 that 'next' was rewound and rebuilt.
 
-The same rewind and rebuild process may be followed for 'pu'. A public
-announcement is not necessary since 'pu' is a throw-away branch, as
+The same rewind and rebuild process may be followed for 'seen'. A public
+announcement is not necessary since 'seen' is a throw-away branch, as
 described above.
 
 
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 090c888335..c077971335 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -18,7 +18,7 @@
 	Untyped <<def_object,object>>, e.g. the contents of a file.
 
 [[def_branch]]branch::
-	A "branch" is an active line of development.  The most recent
+	A "branch" is a line of development.  The most recent
 	<<def_commit,commit>> on a branch is referred to as the tip of
 	that branch.  The tip of the branch is referenced by a branch
 	<<def_head,head>>, which moves forward as additional development
@@ -146,8 +146,8 @@ current branch integrates with) obviously do not work, as there is no
 	<<def_revision,revision>> and you are "merging" another
 	<<def_branch,branch>>'s changes that happen to be a descendant of what
 	you have. In such a case, you do not make a new <<def_merge,merge>>
-	<<def_commit,commit>> but instead just update to his
-	revision. This will happen frequently on a
+	<<def_commit,commit>> but instead just update your branch to point at the same
+	revision as the branch you are merging. This will happen frequently on a
 	<<def_remote_tracking_branch,remote-tracking branch>> of a remote
 	<<def_repository,repository>>.
 
diff --git a/Documentation/howto/coordinate-embargoed-releases.txt b/Documentation/howto/coordinate-embargoed-releases.txt
new file mode 100644
index 0000000000..601aae88e9
--- /dev/null
+++ b/Documentation/howto/coordinate-embargoed-releases.txt
@@ -0,0 +1,131 @@
+Content-type: text/asciidoc
+Abstract: When a critical vulnerability is discovered and fixed, we follow this
+ script to coordinate a public release.
+
+How we coordinate embargoed releases
+====================================
+
+To protect Git users from critical vulnerabilities, we do not just release
+fixed versions like regular maintenance releases. Instead, we coordinate
+releases with packagers, keeping the fixes under an embargo until the release
+date. That way, users will have a chance to upgrade on that date, no matter
+what Operating System or distribution they run.
+
+Open a Security Advisory draft
+------------------------------
+
+The first step is to https://github.com/git/git/security/advisories/new[open an
+advisory]. Technically, it is not necessary, but it is convenient and saves a
+bit of hassle. This advisory can also be used to obtain the CVE number and it
+will give us a private fork associated with it that can be used to collaborate
+on a fix.
+
+Release date of the embargoed version
+-------------------------------------
+
+If the vulnerability affects Windows users, we want to have our friends over at
+Visual Studio on board. This means we need to target a "Patch Tuesday" (i.e. a
+second Tuesday of the month), at the minimum three weeks from heads-up to
+coordinated release.
+
+If the vulnerability affects the server side, or can benefit from scans on the
+server side (i.e. if `git fsck` can detect an attack), it is important to give
+all involved Git repository hosting sites enough time to scan all of those
+repositories.
+
+Notifying the Linux distributions
+---------------------------------
+
+At most two weeks before release date, we need to send a notification to
+distros@vs.openwall.org, preferably less than 7 days before the release date.
+This will reach most (all?) Linux distributions. See an example below, and the
+guidelines for this mailing list at
+https://oss-security.openwall.org/wiki/mailing-lists/distros#how-to-use-the-lists[here].
+
+Once the version has been published, we send a note about that to oss-security.
+As an example, see https://www.openwall.com/lists/oss-security/2019/12/13/1[the
+v2.24.1 mail];
+https://oss-security.openwall.org/wiki/mailing-lists/oss-security[Here] are
+their guidelines.
+
+The mail to oss-security should also describe the exploit, and give credit to
+the reporter(s): security researchers still receive too little respect for the
+invaluable service they provide, and public credit goes a long way to keep them
+paid by their respective organizations.
+
+Technically, describing any exploit can be delayed up to 7 days, but we usually
+refrain from doing that, including it right away.
+
+As a courtesy we typically attach a Git bundle (as `.tar.xz` because the list
+will drop `.bundle` attachments) in the mail to distros@ so that the involved
+parties can take care of integrating/backporting them. This bundle is typically
+created using a command like this:
+
+	git bundle create cve-xxx.bundle ^origin/master vA.B.C vD.E.F
+	tar cJvf cve-xxx.bundle.tar.xz cve-xxx.bundle
+
+Example mail to distros@vs.openwall.org
+---------------------------------------
+
+....
+To: distros@vs.openwall.org
+Cc: git-security@googlegroups.com, <other people involved in the report/fix>
+Subject: [vs] Upcoming Git security fix release
+
+Team,
+
+The Git project will release new versions on <date> at 10am Pacific Time or
+soon thereafter. I have attached a Git bundle (embedded in a `.tar.xz` to avoid
+it being dropped) which you can fetch into a clone of
+https://github.com/git/git via `git fetch --tags /path/to/cve-xxx.bundle`,
+containing the tags for versions <versions>.
+
+You can verify with `git tag -v <tag>` that the versions were signed by
+the Git maintainer, using the same GPG key as e.g. v2.24.0.
+
+Please use these tags to prepare `git` packages for your various
+distributions, using the appropriate tagged versions. The added test cases
+help verify the correctness.
+
+The addressed issues are:
+
+<list of CVEs with a short description, typically copy/pasted from Git's
+release notes, usually demo exploit(s), too>
+
+Credit for finding the vulnerability goes to <reporter>, credit for fixing
+it goes to <developer>.
+
+Thanks,
+<name>
+
+....
+
+Example mail to oss-security@lists.openwall.com
+-----------------------------------------------
+
+....
+To: oss-security@lists.openwall.com
+Cc: git-security@googlegroups.com, <other people involved in the report/fix>
+Subject: git: <copy from security advisory>
+
+Team,
+
+The Git project released new versions on <date>, addressing <CVE>.
+
+All supported platforms are affected in one way or another, and all Git
+versions all the way back to <version> are affected. The fixed versions are:
+<versions>.
+
+Link to the announcement: <link to lore.kernel.org/git>
+
+We highly recommend to upgrade.
+
+The addressed issues are:
+* <list of CVEs and their explanations, along with demo exploits>
+
+Credit for finding the vulnerability goes to <reporter>, credit for fixing
+it goes to <developer>.
+
+Thanks,
+<name>
+....
diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt
index ca4378740c..a67130debb 100644
--- a/Documentation/howto/maintain-git.txt
+++ b/Documentation/howto/maintain-git.txt
@@ -66,7 +66,7 @@ this mailing list after each feature release is made.
    demonstrated to be regression free.  New changes are tested
    in 'next' before merged to 'master'.
 
- - 'pu' branch is used to publish other proposed changes that do
+ - 'seen' branch is used to publish other proposed changes that do
    not yet pass the criteria set for 'next'.
 
  - The tips of 'master' and 'maint' branches will not be rewound to
@@ -76,7 +76,7 @@ this mailing list after each feature release is made.
    of the cycle.
 
  - Usually 'master' contains all of 'maint' and 'next' contains all
-   of 'master'.  'pu' contains all the topics merged to 'next', but
+   of 'master'.  'seen' contains all the topics merged to 'next', but
    is rebuilt directly on 'master'.
 
  - The tip of 'master' is meant to be more stable than any
@@ -154,15 +154,17 @@ by doing the following:
    - Anything unobvious that is applicable to 'master' (in other
      words, does not depend on anything that is still in 'next'
      and not in 'master') is applied to a new topic branch that
-     is forked from the tip of 'master'.  This includes both
+     is forked from the tip of 'master' (or the last feature release,
+     which is a bit older than 'master').  This includes both
      enhancements and unobvious fixes to 'master'.  A topic
      branch is named as ai/topic where "ai" is two-letter string
      named after author's initial and "topic" is a descriptive name
      of the topic (in other words, "what's the series is about").
 
    - An unobvious fix meant for 'maint' is applied to a new
-     topic branch that is forked from the tip of 'maint'.  The
-     topic is named as ai/maint-topic.
+     topic branch that is forked from the tip of 'maint' (or the
+     oldest and still relevant maintenance branch).  The
+     topic may be named as ai/maint-topic.
 
    - Changes that pertain to an existing topic are applied to
      the branch, but:
@@ -174,24 +176,40 @@ by doing the following:
    - Replacement patches to an existing topic are accepted only
      for commits not in 'next'.
 
-   The above except the "replacement" are all done with:
+   The initial round is done with:
 
      $ git checkout ai/topic ;# or "git checkout -b ai/topic master"
      $ git am -sc3 mailbox
 
-   while patch replacement is often done by:
+   and replacing an existing topic with subsequent round is done with:
 
-     $ git format-patch ai/topic~$n..ai/topic ;# export existing
+     $ git checkout master...ai/topic ;# try to reapply to the same base
+     $ git am -sc3 mailbox
+
+   to prepare the new round on a detached HEAD, and then
+
+     $ git range-diff @{-1}...
+     $ git diff @{-1}
 
-   then replace some parts with the new patch, and reapplying:
+   to double check what changed since the last round, and finally
 
-     $ git checkout ai/topic
-     $ git reset --hard ai/topic~$n
-     $ git am -sc3 -s 000*.txt
+     $ git checkout -B @{-1}
+
+   to conclude (the last step is why a topic already in 'next' is
+   not replaced but updated incrementally).
+
+   Whether it is the initial round or a subsequent round, the topic
+   may not build even in isolation, or may break the build when
+   merged to integration branches due to bugs.  There may already
+   be obvious and trivial improvements suggested on the list.  The
+   maintainer often adds an extra commit, with "SQUASH???" in its
+   title, to fix things up, before publishing the integration
+   branches to make it usable by other developers for testing.
+   These changes are what the maintainer is not 100% committed to
+   (trivial typofixes etc. are often squashed directly into the
+   patches that need fixing, without being applied as a separate
+   "SQUASH???" commit), so that they can be removed easily as needed.
 
-   The full test suite is always run for 'maint' and 'master'
-   after patch application; for topic branches the tests are run
-   as time permits.
 
  - Merge maint to master as needed:
 
@@ -211,12 +229,12 @@ by doing the following:
    series?)
 
  - Prepare 'jch' branch, which is used to represent somewhere
-   between 'master' and 'pu' and often is slightly ahead of 'next'.
+   between 'master' and 'seen' and often is slightly ahead of 'next'.
 
-     $ Meta/Reintegrate master..pu >Meta/redo-jch.sh
+     $ Meta/Reintegrate master..seen >Meta/redo-jch.sh
 
    The result is a script that lists topics to be merged in order to
-   rebuild 'pu' as the input to Meta/Reintegrate script.  Remove
+   rebuild 'seen' as the input to Meta/Reintegrate script.  Remove
    later topics that should not be in 'jch' yet.  Add a line that
    consists of '### match next' before the name of the first topic
    in the output that should be in 'jch' but not in 'next' yet.
@@ -273,29 +291,29 @@ by doing the following:
    merged to 'master'.  This may lose '### match next' marker;
    add it again to the appropriate place when it happens.
 
- - Rebuild 'pu'.
+ - Rebuild 'seen'.
 
-     $ Meta/Reintegrate master..pu >Meta/redo-pu.sh
+     $ Meta/Reintegrate master..seen >Meta/redo-seen.sh
 
-   Edit the result by adding new topics that are not still in 'pu'
+   Edit the result by adding new topics that are not still in 'seen'
    in the script.  Then
 
-     $ git checkout -B pu jch
-     $ sh Meta/redo-pu.sh
+     $ git checkout -B seen jch
+     $ sh Meta/redo-seen.sh
 
-   When all is well, clean up the redo-pu.sh script with
+   When all is well, clean up the redo-seen.sh script with
 
-     $ sh Meta/redo-pu.sh -u
+     $ sh Meta/redo-seen.sh -u
 
    Double check by running
 
-     $ git branch --no-merged pu
+     $ git branch --no-merged seen
 
    to see there is no unexpected leftover topics.
 
    At this point, build-test the result for semantic conflicts, and
    if there are, prepare an appropriate merge-fix first (see
-   appendix), and rebuild the 'pu' branch from scratch, starting at
+   appendix), and rebuild the 'seen' branch from scratch, starting at
    the tip of 'jch'.
 
  - Update "What's cooking" message to review the updates to
@@ -305,14 +323,14 @@ by doing the following:
 
      $ Meta/cook
 
-   This script inspects the history between master..pu, finds tips
+   This script inspects the history between master..seen, finds tips
    of topic branches, compares what it found with the current
    contents in Meta/whats-cooking.txt, and updates that file.
-   Topics not listed in the file but are found in master..pu are
+   Topics not listed in the file but are found in master..seen are
    added to the "New topics" section, topics listed in the file that
-   are no longer found in master..pu are moved to the "Graduated to
+   are no longer found in master..seen are moved to the "Graduated to
    master" section, and topics whose commits changed their states
-   (e.g. used to be only in 'pu', now merged to 'next') are updated
+   (e.g. used to be only in 'seen', now merged to 'next') are updated
    with change markers "<<" and ">>".
 
    Look for lines enclosed in "<<" and ">>"; they hold contents from
@@ -342,7 +360,7 @@ Observations
 Some observations to be made.
 
  * Each topic is tested individually, and also together with other
-   topics cooking first in 'pu', then in 'jch' and then in 'next'.
+   topics cooking first in 'seen', then in 'jch' and then in 'next'.
    Until it matures, no part of it is merged to 'master'.
 
  * A topic already in 'next' can get fixes while still in
@@ -371,6 +389,14 @@ Some observations to be made.
    be included in the next feature release.  Being in the
    'master' branch typically is.
 
+ * Due to the nature of "SQUASH???" fix-ups, if the original author
+   agrees with the suggested changes, it is OK to squash them to
+   appropriate patches in the next round (when the suggested change
+   is small enough, the author should not even bother with
+   "Helped-by").  It is also OK to drop them from the next round
+   when the original author does not agree with the suggestion, but
+   the author is expected to say why somewhere in the discussion.
+
 
 Appendix
 --------
@@ -385,7 +411,7 @@ new use of the variable under its old name. When these two topics
 are merged together, the reference to the variable newly added by
 the latter topic will still use the old name in the result.
 
-The Meta/Reintegrate script that is used by redo-jch and redo-pu
+The Meta/Reintegrate script that is used by redo-jch and redo-seen
 scripts implements a crude but usable way to work this issue around.
 When the script merges branch $X, it checks if "refs/merge-fix/$X"
 exists, and if so, the effect of it is squashed into the result of
@@ -405,14 +431,14 @@ commit that can be squashed into a result of mechanical merge to
 correct semantic conflicts.
 
 After finding that the result of merging branch "ai/topic" to an
-integration branch had such a semantic conflict, say pu~4, check the
+integration branch had such a semantic conflict, say seen~4, check the
 problematic merge out on a detached HEAD, edit the working tree to
 fix the semantic conflict, and make a separate commit to record the
 fix-up:
 
-     $ git checkout pu~4
+     $ git checkout seen~4
      $ git show -s --pretty=%s ;# double check
-     Merge branch 'ai/topic' to pu
+     Merge branch 'ai/topic' to seen
      $ edit
      $ git commit -m 'merge-fix/ai/topic' -a
 
@@ -424,9 +450,9 @@ result:
 Then double check the result by asking Meta/Reintegrate to redo the
 merge:
 
-     $ git checkout pu~5 ;# the parent of the problem merge
+     $ git checkout seen~5 ;# the parent of the problem merge
      $ echo ai/topic | Meta/Reintegrate
-     $ git diff pu~4
+     $ git diff seen~4
 
 This time, because you prepared refs/merge-fix/ai/topic, the
 resulting merge should have been tweaked to include the fix for the
@@ -438,7 +464,7 @@ branch needs this merge-fix is because another branch merged earlier
 to the integration branch changed the underlying assumption ai/topic
 branch made (e.g. ai/topic branch added a site to refer to a
 variable, while the other branch renamed that variable and adjusted
-existing use sites), and if you changed redo-jch (or redo-pu) script
+existing use sites), and if you changed redo-jch (or redo-seen) script
 to merge ai/topic branch before the other branch, then the above
 merge-fix should not be applied while merging ai/topic, but should
 instead be applied while merging the other branch.  You would need
diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt
index 02cb5f758d..f2e10a7ec8 100644
--- a/Documentation/howto/rebase-from-internal-branch.txt
+++ b/Documentation/howto/rebase-from-internal-branch.txt
@@ -4,7 +4,7 @@ Cc:	Petr Baudis <pasky@suse.cz>, Linus Torvalds <torvalds@osdl.org>
 Subject: Re: sending changesets from the middle of a git tree
 Date:	Sun, 14 Aug 2005 18:37:39 -0700
 Abstract: In this article, JC talks about how he rebases the
- public "pu" branch using the core Git tools when he updates
+ public "seen" branch using the core Git tools when he updates
  the "master" branch, and how "rebase" works.  Also discussed
  is how this applies to individual developers who sends patches
  upstream.
@@ -20,8 +20,8 @@ Petr Baudis <pasky@suse.cz> writes:
 > where Junio C Hamano <junkio@cox.net> told me that...
 >> Linus Torvalds <torvalds@osdl.org> writes:
 >>
->> > Junio, maybe you want to talk about how you move patches from your "pu"
->> > branch to the real branches.
+>> > Junio, maybe you want to talk about how you move patches from your
+>> > "seen" branch to the real branches.
 >>
 > Actually, wouldn't this be also precisely for what StGIT is intended to?
 --------------------------------------
@@ -33,12 +33,12 @@ the kind of task StGIT is designed to do.
 I just have done a simpler one, this time using only the core
 Git tools.
 
-I had a handful of commits that were ahead of master in pu, and I
+I had a handful of commits that were ahead of master in 'seen', and I
 wanted to add some documentation bypassing my usual habit of
-placing new things in pu first.  At the beginning, the commit
+placing new things in 'seen' first.  At the beginning, the commit
 ancestry graph looked like this:
 
-                             *"pu" head
+			     *"seen" head
     master --> #1 --> #2 --> #3
 
 So I started from master, made a bunch of edits, and committed:
@@ -50,7 +50,7 @@ So I started from master, made a bunch of edits, and committed:
 
 After the commit, the ancestry graph would look like this:
 
-                              *"pu" head
+			      *"seen" head
     master^ --> #1 --> #2 --> #3
           \
             \---> master
@@ -58,31 +58,31 @@ After the commit, the ancestry graph would look like this:
 The old master is now master^ (the first parent of the master).
 The new master commit holds my documentation updates.
 
-Now I have to deal with "pu" branch.
+Now I have to deal with "seen" branch.
 
 This is the kind of situation I used to have all the time when
 Linus was the maintainer and I was a contributor, when you look
-at "master" branch being the "maintainer" branch, and "pu"
+at "master" branch being the "maintainer" branch, and "seen"
 branch being the "contributor" branch.  Your work started at the
 tip of the "maintainer" branch some time ago, you made a lot of
 progress in the meantime, and now the maintainer branch has some
 other commits you do not have yet.  And "git rebase" was written
 with the explicit purpose of helping to maintain branches like
-"pu".  You _could_ merge master to pu and keep going, but if you
+"seen".  You _could_ merge master to 'seen' and keep going, but if you
 eventually want to cherrypick and merge some but not necessarily
 all changes back to the master branch, it often makes later
 operations for _you_ easier if you rebase (i.e. carry forward
-your changes) "pu" rather than merge.  So I ran "git rebase":
+your changes) "seen" rather than merge.  So I ran "git rebase":
 
-    $ git checkout pu
-    $ git rebase master pu
+    $ git checkout seen
+    $ git rebase master seen
 
 What this does is to pick all the commits since the current
-branch (note that I now am on "pu" branch) forked from the
+branch (note that I now am on "seen" branch) forked from the
 master branch, and forward port these changes.
 
     master^ --> #1 --> #2 --> #3
-          \                                  *"pu" head
+	  \                                  *"seen" head
             \---> master --> #1' --> #2' --> #3'
 
 The diff between master^ and #1 is applied to master and
@@ -92,7 +92,7 @@ commits are made similarly out of #2 and #3 commits.
 
 Old #3 is not recorded in any of the .git/refs/heads/ file
 anymore, so after doing this you will have dangling commit if
-you ran fsck-cache, which is normal.  After testing "pu", you
+you ran fsck-cache, which is normal.  After testing "seen", you
 can run "git prune" to get rid of those original three commits.
 
 While I am talking about "git rebase", I should talk about how
diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
index 149508e13b..a3e5595a56 100644
--- a/Documentation/howto/revert-branch-rebase.txt
+++ b/Documentation/howto/revert-branch-rebase.txt
@@ -15,7 +15,7 @@ One of the changes I pulled into the 'master' branch turns out to
 break building Git with GCC 2.95.  While they were well-intentioned
 portability fixes, keeping things working with gcc-2.95 was also
 important.  Here is what I did to revert the change in the 'master'
-branch and to adjust the 'pu' branch, using core Git tools and
+branch and to adjust the 'seen' branch, using core Git tools and
 barebone Porcelain.
 
 First, prepare a throw-away branch in case I screw things up.
@@ -104,11 +104,11 @@ $ git diff master..revert-c99
 
 says nothing.
 
-Then we rebase the 'pu' branch as usual.
+Then we rebase the 'seen' branch as usual.
 
 ------------------------------------------------
-$ git checkout pu
-$ git tag pu-anchor pu
+$ git checkout seen
+$ git tag seen-anchor seen
 $ git rebase master
 * Applying: Redo "revert" using three-way merge machinery.
 First trying simple merge strategy to cherry-pick.
@@ -127,11 +127,11 @@ First trying simple merge strategy to cherry-pick.
 First trying simple merge strategy to cherry-pick.
 ------------------------------------------------
 
-The temporary tag 'pu-anchor' is me just being careful, in case 'git
+The temporary tag 'seen-anchor' is me just being careful, in case 'git
 rebase' screws up.  After this, I can do these for sanity check:
 
 ------------------------------------------------
-$ git diff pu-anchor..pu ;# make sure we got the master fix.
+$ git diff seen-anchor..seen ;# make sure we got the master fix.
 $ make CC=gcc-2.95 clean test ;# make sure it fixed the breakage.
 $ make clean test ;# make sure it did not cause other breakage.
 ------------------------------------------------
@@ -140,7 +140,7 @@ Everything is in the good order.  I do not need the temporary branch
 or tag anymore, so remove them:
 
 ------------------------------------------------
-$ rm -f .git/refs/tags/pu-anchor
+$ rm -f .git/refs/tags/seen-anchor
 $ git branch -d revert-c99
 ------------------------------------------------
 
@@ -168,18 +168,18 @@ Committed merge 7fb9b7262a1d1e0a47bbfdcbbcf50ce0635d3f8f
 And the final repository status looks like this:
 
 ------------------------------------------------
-$ git show-branch --more=1 master pu rc
+$ git show-branch --more=1 master seen rc
 ! [master] Revert "Replace zero-length array decls with []."
- ! [pu] git-repack: Add option to repack all objects.
+ ! [seen] git-repack: Add option to repack all objects.
   * [rc] Merge refs/heads/master from .
 ---
- +  [pu] git-repack: Add option to repack all objects.
- +  [pu~1] More documentation updates.
- +  [pu~2] Show commits in topo order and name all commits.
- +  [pu~3] mailinfo and applymbox updates
- +  [pu~4] Document "git cherry-pick" and "git revert"
- +  [pu~5] Remove git-apply-patch-script.
- +  [pu~6] Redo "revert" using three-way merge machinery.
+ +  [seen] git-repack: Add option to repack all objects.
+ +  [seen~1] More documentation updates.
+ +  [seen~2] Show commits in topo order and name all commits.
+ +  [seen~3] mailinfo and applymbox updates
+ +  [seen~4] Document "git cherry-pick" and "git revert"
+ +  [seen~5] Remove git-apply-patch-script.
+ +  [seen~6] Redo "revert" using three-way merge machinery.
   - [rc] Merge refs/heads/master from .
 ++* [master] Revert "Replace zero-length array decls with []."
   - [rc~1] Merge refs/heads/master from .
diff --git a/Documentation/howto/separating-topic-branches.txt b/Documentation/howto/separating-topic-branches.txt
index bd1027433b..81be0d6115 100644
--- a/Documentation/howto/separating-topic-branches.txt
+++ b/Documentation/howto/separating-topic-branches.txt
@@ -81,7 +81,7 @@ After I am done, I'd try a pretend-merge between "topicA" and
               o---o---o---o---o---o
 
 The last diff better not to show anything other than cleanups
-for crufts.  Then I can finally clean things up:
+for cruft.  Then I can finally clean things up:
 
         $ git branch -D topic
         $ git reset --hard HEAD^ ;# nuke pretend merge
diff --git a/Documentation/howto/update-hook-example.txt b/Documentation/howto/update-hook-example.txt
index 89821ec74f..151ee84ceb 100644
--- a/Documentation/howto/update-hook-example.txt
+++ b/Documentation/howto/update-hook-example.txt
@@ -179,7 +179,7 @@ allowed-groups, to describe which heads can be pushed into by
 whom.  The format of each file would look like this:
 
     refs/heads/master   junio
-    +refs/heads/pu      junio
+    +refs/heads/seen    junio
     refs/heads/cogito$  pasky
     refs/heads/bw/.*    linus
     refs/heads/tmp/.*   .*
@@ -187,6 +187,6 @@ whom.  The format of each file would look like this:
 
 With this, Linus can push or create "bw/penguin" or "bw/zebra"
 or "bw/panda" branches, Pasky can do only "cogito", and JC can
-do master and pu branches and make versioned tags.  And anybody
-can do tmp/blah branches. The '+' sign at the pu record means
+do master and "seen" branches and make versioned tags.  And anybody
+can do tmp/blah branches. The '+' sign at the "seen" record means
 that JC can make non-fast-forward pushes on it.
diff --git a/Documentation/i18n.txt b/Documentation/i18n.txt
index 7e36e5b55b..6c6baeeeb7 100644
--- a/Documentation/i18n.txt
+++ b/Documentation/i18n.txt
@@ -38,7 +38,7 @@ mind.
   a warning if the commit log message given to it does not look
   like a valid UTF-8 string, unless you explicitly say your
   project uses a legacy encoding.  The way to say this is to
-  have i18n.commitencoding in `.git/config` file, like this:
+  have `i18n.commitEncoding` in `.git/config` file, like this:
 +
 ------------
 [i18n]
diff --git a/Documentation/line-range-format.txt b/Documentation/line-range-format.txt
index 829676ff98..9b51e9fb66 100644
--- a/Documentation/line-range-format.txt
+++ b/Documentation/line-range-format.txt
@@ -1,30 +1,32 @@
-<start> and <end> can take one of these forms:
+'<start>' and '<end>' can take one of these forms:
 
 - number
 +
-If <start> or <end> is a number, it specifies an
+If '<start>' or '<end>' is a number, it specifies an
 absolute line number (lines count from 1).
 +
 
-- /regex/
+- `/regex/`
 +
 This form will use the first line matching the given
-POSIX regex. If <start> is a regex, it will search from the end of
+POSIX regex. If '<start>' is a regex, it will search from the end of
 the previous `-L` range, if any, otherwise from the start of file.
-If <start> is ``^/regex/'', it will search from the start of file.
-If <end> is a regex, it will search
-starting at the line given by <start>.
+If '<start>' is `^/regex/`, it will search from the start of file.
+If '<end>' is a regex, it will search
+starting at the line given by '<start>'.
 +
 
 - +offset or -offset
 +
-This is only valid for <end> and will specify a number
-of lines before or after the line given by <start>.
+This is only valid for '<end>' and will specify a number
+of lines before or after the line given by '<start>'.
 
 +
-If ``:<funcname>'' is given in place of <start> and <end>, it is a
+If `:<funcname>` is given in place of '<start>' and '<end>', it is a
 regular expression that denotes the range from the first funcname line
-that matches <funcname>, up to the next funcname line. ``:<funcname>''
+that matches '<funcname>', up to the next funcname line. `:<funcname>`
 searches from the end of the previous `-L` range, if any, otherwise
-from the start of file. ``^:<funcname>'' searches from the start of
-file.
+from the start of file. `^:<funcname>` searches from the start of
+file. The function names are determined in the same way as `git diff`
+works out patch hunk headers (see 'Defining a custom hunk-header'
+in linkgit:gitattributes[5]).
diff --git a/Documentation/line-range-options.txt b/Documentation/line-range-options.txt
new file mode 100644
index 0000000000..8e295a62b8
--- /dev/null
+++ b/Documentation/line-range-options.txt
@@ -0,0 +1,15 @@
+-L<start>,<end>:<file>::
+-L:<funcname>:<file>::
+
+	Trace the evolution of the line range given by '<start>,<end>',
+	or by the function name regex '<funcname>', within the '<file>'. You may
+	not give any pathspec limiters.  This is currently limited to
+	a walk starting from a single revision, i.e., you may only
+	give zero or one positive revision arguments, and
+	'<start>' and '<end>' (or '<funcname>') must exist in the starting revision.
+	You can specify this option more than once. Implies `--patch`.
+	Patch output can be suppressed using `--no-patch`, but other diff formats
+	(namely `--raw`, `--numstat`, `--shortstat`, `--dirstat`, `--summary`,
+	`--name-only`, `--name-status`, `--check`) are not currently implemented.
++
+include::line-range-format.txt[]
diff --git a/Documentation/lint-gitlink.perl b/Documentation/lint-gitlink.perl
index 476cc30b83..b22a367844 100755
--- a/Documentation/lint-gitlink.perl
+++ b/Documentation/lint-gitlink.perl
@@ -1,71 +1,67 @@
 #!/usr/bin/perl
 
-use File::Find;
-use Getopt::Long;
+use strict;
+use warnings;
 
-my $basedir = ".";
-GetOptions("basedir=s" => \$basedir)
-	or die("Cannot parse command line arguments\n");
+# 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 [...]
+my %TXT;
+my %SECTION;
+my $section;
+my $lint_these = 0;
+for my $arg (@ARGV) {
+	if (my ($sec) = $arg =~ /^--section=(\d+)$/s) {
+		$section = $sec;
+		next;
+	}
 
-my $found_errors = 0;
+	my ($name) = $arg =~ /^(.*?)\.txt$/s;
+	unless (defined $section) {
+		$TXT{$name} = $arg;
+		next;
+	}
 
-sub report {
-	my ($where, $what, $error) = @_;
-	print "$where: $error: $what\n";
-	$found_errors = 1;
+	$SECTION{$name} = $section;
 }
 
-sub grab_section {
-	my ($page) = @_;
-	open my $fh, "<", "$basedir/$page.txt";
-	my $firstline = <$fh>;
-	chomp $firstline;
-	close $fh;
-	my ($section) = ($firstline =~ /.*\((\d)\)$/);
-	return $section;
+my $exit_code = 0;
+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";
+	$exit_code = 1;
 }
 
-sub lint {
-	my ($file) = @_;
-	open my $fh, "<", $file
-		or return;
-	while (<$fh>) {
-		my $where = "$file:$.";
-		while (s/linkgit:((.*?)\[(\d)\])//) {
-			my ($target, $page, $section) = ($1, $2, $3);
+@ARGV = sort values %TXT;
+die "BUG: Nothing to process!" unless @ARGV;
+while (<>) {
+	my $line = $_;
+	while ($line =~ m/linkgit:((.*?)\[(\d)\])/g) {
+		my $pos = pos $line;
+		my ($target, $page, $section) = ($1, $2, $3);
 
-			# De-AsciiDoc
-			$page =~ s/{litdd}/--/g;
+		# De-AsciiDoc
+		$page =~ s/{litdd}/--/g;
 
-			if ($page !~ /^git/) {
-				report($where, $target, "nongit link");
-				next;
-			}
-			if (! -f "$basedir/$page.txt") {
-				report($where, $target, "no such source");
-				next;
-			}
-			$real_section = grab_section($page);
-			if ($real_section != $section) {
-				report($where, $target,
-					"wrong section (should be $real_section)");
-				next;
-			}
+		if (!exists $TXT{$page}) {
+			report($pos, $line, $target, "link outside of our own docs");
+			next;
+		}
+		if (!exists $SECTION{$page}) {
+			report($pos, $line, $target, "link outside of our sectioned docs");
+			next;
+		}
+		my $real_section = $SECTION{$page};
+		if ($section != $SECTION{$page}) {
+			report($pos, $line, $target, "wrong section (should be $real_section)");
+			next;
 		}
 	}
-	close $fh;
-}
-
-sub lint_it {
-	lint($File::Find::name) if -f && /\.txt$/;
-}
-
-if (!@ARGV) {
-	find({ wanted => \&lint_it, no_chdir => 1 }, $basedir);
-} else {
-	for (@ARGV) {
-		lint($_);
-	}
+	# this resets our $. for each file
+	close ARGV if eof;
 }
 
-exit $found_errors;
+exit $exit_code;
diff --git a/Documentation/lint-man-end-blurb.perl b/Documentation/lint-man-end-blurb.perl
new file mode 100755
index 0000000000..d69312e5db
--- /dev/null
+++ b/Documentation/lint-man-end-blurb.perl
@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+my $exit_code = 0;
+sub report {
+	my ($target, $msg) = @_;
+	print "error: $target: $msg\n";
+	$exit_code = 1;
+}
+
+local $/;
+while (my $slurp = <>) {
+	report($ARGV, "has no 'Part of the linkgit:git[1] suite' end blurb")
+		unless $slurp =~ m[
+		^GIT\n
+		 ---\n
+		\QPart of the linkgit:git[1] suite\E \n
+		\z
+	]mx;
+}
+
+exit $exit_code;
diff --git a/Documentation/lint-man-section-order.perl b/Documentation/lint-man-section-order.perl
new file mode 100755
index 0000000000..b05f9156dd
--- /dev/null
+++ b/Documentation/lint-man-section-order.perl
@@ -0,0 +1,105 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+
+my %SECTIONS;
+{
+	my $order = 0;
+	%SECTIONS = (
+		'NAME' => {
+			required => 1,
+			order => $order++,
+		},
+		'SYNOPSIS' => {
+			required => 1,
+			order => $order++,
+		},
+		'DESCRIPTION' => {
+			required => 1,
+			order => $order++,
+		},
+		'OPTIONS' => {
+			order => $order++,
+			required => 0,
+		},
+		'CONFIGURATION' => {
+			order => $order++,
+		},
+		'BUGS' => {
+			order => $order++,
+		},
+		'SEE ALSO' => {
+			order => $order++,
+		},
+		'GIT' => {
+			required => 1,
+			order => $order++,
+		},
+	);
+}
+my $SECTION_RX = do {
+	my ($names) = join "|", keys %SECTIONS;
+	qr/^($names)$/s;
+};
+
+my $exit_code = 0;
+sub report {
+	my ($msg) = @_;
+	print "$ARGV:$.: $msg\n";
+	$exit_code = 1;
+}
+
+my $last_was_section;
+my @actual_order;
+while (my $line = <>) {
+	chomp $line;
+	if ($line =~ $SECTION_RX) {
+		push @actual_order => $line;
+		$last_was_section = 1;
+		# Have no "last" section yet, processing NAME
+		next if @actual_order == 1;
+
+		my @expected_order = sort {
+			$SECTIONS{$a}->{order} <=> $SECTIONS{$b}->{order}
+		} @actual_order;
+
+		my $expected_last = $expected_order[-2];
+		my $actual_last = $actual_order[-2];
+		if ($actual_last ne $expected_last) {
+			report("section '$line' incorrectly ordered, comes after '$actual_last'");
+		}
+		next;
+	}
+	if ($last_was_section) {
+		my $last_section = $actual_order[-1];
+		if (length $last_section ne length $line) {
+			report("dashes under '$last_section' should match its length!");
+		}
+		if ($line !~ /^-+$/) {
+			report("dashes under '$last_section' should be '-' dashes!");
+		}
+		$last_was_section = 0;
+	}
+
+	if (eof) {
+		# We have both a hash and an array to consider, for
+		# convenience
+		my %actual_sections;
+		@actual_sections{@actual_order} = ();
+
+		for my $section (sort keys %SECTIONS) {
+			next if !$SECTIONS{$section}->{required} or exists $actual_sections{$section};
+			report("has no required '$section' section!");
+		}
+
+		# Reset per-file state
+		{
+			@actual_order = ();
+			# this resets our $. for each file
+			close ARGV;
+		}
+	}
+}
+
+exit $exit_code;
diff --git a/Documentation/mailmap.txt b/Documentation/mailmap.txt
deleted file mode 100644
index 4a8c276529..0000000000
--- a/Documentation/mailmap.txt
+++ /dev/null
@@ -1,75 +0,0 @@
-If the file `.mailmap` exists at the toplevel of the repository, or at
-the location pointed to by the mailmap.file or mailmap.blob
-configuration options, it
-is used to map author and committer names and email addresses to
-canonical real names and email addresses.
-
-In the simple form, each line in the file consists of the canonical
-real name of an author, whitespace, and an email address used in the
-commit (enclosed by '<' and '>') to map to the name. For example:
---
-	Proper Name <commit@email.xx>
---
-
-The more complex forms are:
---
-	<proper@email.xx> <commit@email.xx>
---
-which allows mailmap to replace only the email part of a commit, and:
---
-	Proper Name <proper@email.xx> <commit@email.xx>
---
-which allows mailmap to replace both the name and the email of a
-commit matching the specified commit email address, and:
---
-	Proper Name <proper@email.xx> Commit Name <commit@email.xx>
---
-which allows mailmap to replace both the name and the email of a
-commit matching both the specified commit name and email address.
-
-Example 1: Your history contains commits by two authors, Jane
-and Joe, whose names appear in the repository under several forms:
-
-------------
-Joe Developer <joe@example.com>
-Joe R. Developer <joe@example.com>
-Jane Doe <jane@example.com>
-Jane Doe <jane@laptop.(none)>
-Jane D. <jane@desktop.(none)>
-------------
-
-Now suppose that Joe wants his middle name initial used, and Jane
-prefers her family name fully spelled out. A proper `.mailmap` file
-would look like:
-
-------------
-Jane Doe         <jane@desktop.(none)>
-Joe R. Developer <joe@example.com>
-------------
-
-Note how there is no need for an entry for `<jane@laptop.(none)>`, because the
-real name of that author is already correct.
-
-Example 2: Your repository contains commits from the following
-authors:
-
-------------
-nick1 <bugs@company.xx>
-nick2 <bugs@company.xx>
-nick2 <nick2@company.xx>
-santa <me@company.xx>
-claus <me@company.xx>
-CTO <cto@coompany.xx>
-------------
-
-Then you might want a `.mailmap` file that looks like:
-------------
-<cto@company.xx>                       <cto@coompany.xx>
-Some Dude <some@dude.xx>         nick1 <bugs@company.xx>
-Other Author <other@author.xx>   nick2 <bugs@company.xx>
-Other Author <other@author.xx>         <nick2@company.xx>
-Santa Claus <santa.claus@northpole.xx> <me@company.xx>
-------------
-
-Use hash '#' for comments that are either on their own line, or after
-the email address.
diff --git a/Documentation/manpage-1.72.xsl b/Documentation/manpage-1.72.xsl
deleted file mode 100644
index b4d315cb8c..0000000000
--- a/Documentation/manpage-1.72.xsl
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- manpage-1.72.xsl:
-     special settings for manpages rendered from asciidoc+docbook
-     handles peculiarities in docbook-xsl 1.72.0 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version="1.0">
-
-<xsl:import href="manpage-base.xsl"/>
-
-<!-- these are the special values for the roff control characters
-     needed for docbook-xsl 1.72.0 -->
-<xsl:param name="git.docbook.backslash">&#x2593;</xsl:param>
-<xsl:param name="git.docbook.dot"      >&#x2302;</xsl:param>
-
-</xsl:stylesheet>
diff --git a/Documentation/manpage-base.xsl b/Documentation/manpage-base.xsl
deleted file mode 100644
index a264fa6160..0000000000
--- a/Documentation/manpage-base.xsl
+++ /dev/null
@@ -1,35 +0,0 @@
-<!-- manpage-base.xsl:
-     special formatting for manpages rendered from asciidoc+docbook -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version="1.0">
-
-<!-- these params silence some output from xmlto -->
-<xsl:param name="man.output.quietly" select="1"/>
-<xsl:param name="refentry.meta.get.quietly" select="1"/>
-
-<!-- convert asciidoc callouts to man page format;
-     git.docbook.backslash and git.docbook.dot params
-     must be supplied by another XSL file or other means -->
-<xsl:template match="co">
-	<xsl:value-of select="concat(
-			      $git.docbook.backslash,'fB(',
-			      substring-after(@id,'-'),')',
-			      $git.docbook.backslash,'fR')"/>
-</xsl:template>
-<xsl:template match="calloutlist">
-	<xsl:value-of select="$git.docbook.dot"/>
-	<xsl:text>sp&#10;</xsl:text>
-	<xsl:apply-templates/>
-	<xsl:text>&#10;</xsl:text>
-</xsl:template>
-<xsl:template match="callout">
-	<xsl:value-of select="concat(
-			      $git.docbook.backslash,'fB',
-			      substring-after(@arearefs,'-'),
-			      '. ',$git.docbook.backslash,'fR')"/>
-	<xsl:apply-templates/>
-	<xsl:value-of select="$git.docbook.dot"/>
-	<xsl:text>br&#10;</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/Documentation/manpage-bold-literal.xsl b/Documentation/manpage-bold-literal.xsl
index 94d6c1b545..e13db85693 100644
--- a/Documentation/manpage-bold-literal.xsl
+++ b/Documentation/manpage-bold-literal.xsl
@@ -8,11 +8,9 @@
      this makes literal text easier to distinguish in manpages
      viewed on a tty -->
 <xsl:template match="literal|d:literal">
-	<xsl:value-of select="$git.docbook.backslash"/>
-	<xsl:text>fB</xsl:text>
+	<xsl:text>\fB</xsl:text>
 	<xsl:apply-templates/>
-	<xsl:value-of select="$git.docbook.backslash"/>
-	<xsl:text>fR</xsl:text>
+	<xsl:text>\fR</xsl:text>
 </xsl:template>
 
 </xsl:stylesheet>
diff --git a/Documentation/manpage-normal.xsl b/Documentation/manpage-normal.xsl
index a48f5b11f3..a9c7ec69f4 100644
--- a/Documentation/manpage-normal.xsl
+++ b/Documentation/manpage-normal.xsl
@@ -1,13 +1,26 @@
 <!-- manpage-normal.xsl:
-     special settings for manpages rendered from asciidoc+docbook
-     handles anything we want to keep away from docbook-xsl 1.72.0 -->
+     special settings for manpages rendered from asciidoc+docbook -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
 		version="1.0">
 
-<xsl:import href="manpage-base.xsl"/>
 
-<!-- these are the normal values for the roff control characters -->
-<xsl:param name="git.docbook.backslash">\</xsl:param>
-<xsl:param name="git.docbook.dot"	>.</xsl:param>
+<!-- these params silence some output from xmlto -->
+<xsl:param name="man.output.quietly" select="1"/>
+<xsl:param name="refentry.meta.get.quietly" select="1"/>
+
+<!-- convert asciidoc callouts to man page format -->
+<xsl:template match="co">
+	<xsl:value-of select="concat('\fB(',substring-after(@id,'-'),')\fR')"/>
+</xsl:template>
+<xsl:template match="calloutlist">
+	<xsl:text>.sp&#10;</xsl:text>
+	<xsl:apply-templates/>
+	<xsl:text>&#10;</xsl:text>
+</xsl:template>
+<xsl:template match="callout">
+	<xsl:value-of select="concat('\fB',substring-after(@arearefs,'-'),'. \fR')"/>
+	<xsl:apply-templates/>
+	<xsl:text>.br&#10;</xsl:text>
+</xsl:template>
 
 </xsl:stylesheet>
diff --git a/Documentation/manpage-suppress-sp.xsl b/Documentation/manpage-suppress-sp.xsl
deleted file mode 100644
index a63c7632a8..0000000000
--- a/Documentation/manpage-suppress-sp.xsl
+++ /dev/null
@@ -1,21 +0,0 @@
-<!-- manpage-suppress-sp.xsl:
-     special settings for manpages rendered from asciidoc+docbook
-     handles erroneous, inline .sp in manpage output of some
-     versions of docbook-xsl -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-		version="1.0">
-
-<!-- attempt to work around spurious .sp at the tail of the line
-     that some versions of docbook stylesheets seem to add -->
-<xsl:template match="simpara">
-  <xsl:variable name="content">
-    <xsl:apply-templates/>
-  </xsl:variable>
-  <xsl:value-of select="normalize-space($content)"/>
-  <xsl:if test="not(ancestor::authorblurb) and
-                not(ancestor::personblurb)">
-    <xsl:text>&#10;&#10;</xsl:text>
-  </xsl:if>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 59b8ff1e51..61ec157c2f 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
@@ -34,11 +37,12 @@ set to `no` at the beginning of them.
 
 --cleanup=<mode>::
 	This option determines how the merge message will be cleaned up before
-	commiting. See linkgit:git-commit[1] for more details. In addition, if
+	committing. See linkgit:git-commit[1] for more details. In addition, if
 	the '<mode>' is given a value of `scissors`, scissors will be appended
 	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,35 +75,34 @@ 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>]::
+--no-gpg-sign::
 	GPG-sign the resulting merge commit. The `keyid` argument is
 	optional and defaults to the committer identity; if specified,
-	it must be stuck to the option without a space.
+	it must be stuck to the option without a space. `--no-gpg-sign`
+	is useful to countermand both `commit.gpgSign` configuration variable,
+	and earlier `--gpg-sign`.
 
 --log[=<n>]::
 --no-log::
 	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.
 
---signoff::
---no-signoff::
-	Add Signed-off-by line by the committer at the end of the commit
-	log message.  The meaning of a signoff depends on the project,
-	but it typically certifies that committer has
-	the rights to submit this work under the same license and
-	agrees to a Developer Certificate of Origin
-	(see http://developercertificate.org/ for more information).
-+
-With --no-signoff do not add a Signed-off-by line.
+include::signoff-option.txt[]
 
 --stat::
 -n::
@@ -108,18 +127,25 @@ 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.
 	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>::
@@ -133,6 +159,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::
@@ -157,6 +187,15 @@ ifndef::git-pull[]
 
 endif::git-pull[]
 
+--autostash::
+--no-autostash::
+	Automatically create a temporary stash entry before the operation
+	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.
+
 --allow-unrelated-histories::
 	By default, `git merge` command refuses to merge histories
 	that do not share a common ancestor.  This option can be
@@ -164,3 +203,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 aa66cbe41e..5fc54ec060 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -6,33 +6,28 @@ 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
 	favoring 'our' version.  Changes from the other tree that do not
-	conflict with our side are reflected to the merge result.
+	conflict with our side are reflected in the merge result.
 	For a binary file, the entire contents are taken from our side.
 +
 This should not be confused with the 'ours' merge strategy, which does not
@@ -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/object-format-disclaimer.txt b/Documentation/object-format-disclaimer.txt
new file mode 100644
index 0000000000..4cb106f0d1
--- /dev/null
+++ b/Documentation/object-format-disclaimer.txt
@@ -0,0 +1,6 @@
+THIS OPTION IS EXPERIMENTAL! SHA-256 support is experimental and still
+in an early stage.  A SHA-256 repository will in general not be able to
+share work with "regular" SHA-1 repositories.  It should be assumed
+that, e.g., Git internal file formats in relation to SHA-256
+repositories may change in backwards-incompatible ways.  Only use
+`--object-format=sha256` for testing purposes.
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index b87e2e83e6..ef6bd420ae 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -4,7 +4,7 @@ PRETTY FORMATS
 If the commit is a merge, and if the pretty-format
 is not 'oneline', 'email' or 'raw', an additional line is
 inserted before the 'Author:' line.  This line begins with
-"Merge: " and the sha1s of ancestral commits are printed,
+"Merge: " and the hashes of ancestral commits are printed,
 separated by spaces.  Note that the listed commits may not
 necessarily be the list of the *direct* parent commits if you
 have limited your view of history: for example, if you are
@@ -20,20 +20,20 @@ built-in formats:
 
 * 'oneline'
 
-	  <sha1> <title line>
+	  <hash> <title line>
 +
 This is designed to be as compact as possible.
 
 * 'short'
 
-	  commit <sha1>
+	  commit <hash>
 	  Author: <author>
 
 	      <title line>
 
 * 'medium'
 
-	  commit <sha1>
+	  commit <hash>
 	  Author: <author>
 	  Date:   <author date>
 
@@ -43,7 +43,7 @@ This is designed to be as compact as possible.
 
 * 'full'
 
-	  commit <sha1>
+	  commit <hash>
 	  Author: <author>
 	  Commit: <committer>
 
@@ -53,7 +53,7 @@ This is designed to be as compact as possible.
 
 * 'fuller'
 
-	  commit <sha1>
+	  commit <hash>
 	  Author:     <author>
 	  AuthorDate: <author date>
 	  Commit:     <committer>
@@ -63,19 +63,36 @@ This is designed to be as compact as possible.
 
 	       <full commit message>
 
+* 'reference'
+
+	  <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,
+the date is formatted with `--date=short` unless another `--date` option
+is explicitly specified.  As with any `format:` with format
+placeholders, its output is not affected by other options like
+`--decorate` and `--walk-reflogs`.
+
 * 'email'
 
-	  From <sha1> <date>
+	  From <hash> <date>
 	  From: <author>
 	  Date: <author date>
 	  Subject: [PATCH] <title line>
 
 	  <full commit message>
 
+* 'mboxrd'
++
+Like 'email', but lines in the commit message starting with "From "
+(preceded by zero or more ">") are quoted with ">" so they aren't
+confused as starting a new commit.
+
 * 'raw'
 +
 The 'raw' format shows the entire commit exactly as
-stored in the commit object.  Notably, the SHA-1s are
+stored in the commit object.  Notably, the hashes are
 displayed in full, regardless of whether --abbrev or
 --no-abbrev are used, and 'parents' information show the
 true parent commits, without taking grafts or history
@@ -163,26 +180,51 @@ The placeholders are:
 '%ae':: author email
 '%aE':: author email (respecting .mailmap, see linkgit:git-shortlog[1]
 	or linkgit:git-blame[1])
+'%al':: author email local-part (the part before the '@' sign)
+'%aL':: author local-part (see '%al') respecting .mailmap, see
+	linkgit:git-shortlog[1] or linkgit:git-blame[1])
 '%ad':: author date (format respects --date= option)
 '%aD':: author date, RFC2822 style
 '%ar':: author date, relative
 '%at':: author date, UNIX timestamp
 '%ai':: author date, ISO 8601-like format
 '%aI':: author date, strict ISO 8601 format
+'%as':: author date, short format (`YYYY-MM-DD`)
+'%ah':: author date, human style (like the `--date=human` option of
+	linkgit:git-rev-list[1])
 '%cn':: committer name
 '%cN':: committer name (respecting .mailmap, see
 	linkgit:git-shortlog[1] or linkgit:git-blame[1])
 '%ce':: committer email
 '%cE':: committer email (respecting .mailmap, see
 	linkgit:git-shortlog[1] or linkgit:git-blame[1])
+'%cl':: committer email local-part (the part before the '@' sign)
+'%cL':: committer local-part (see '%cl') respecting .mailmap, see
+	linkgit:git-shortlog[1] or linkgit:git-blame[1])
 '%cd':: committer date (format respects --date= option)
 '%cD':: committer date, RFC2822 style
 '%cr':: committer date, relative
 '%ct':: committer date, UNIX timestamp
 '%ci':: committer date, ISO 8601-like format
 '%cI':: committer date, strict ISO 8601 format
+'%cs':: committer date, short format (`YYYY-MM-DD`)
+'%ch':: committer date, human style (like the `--date=human` option of
+	linkgit:git-rev-list[1])
 '%d':: ref names, like the --decorate option of linkgit:git-log[1]
 '%D':: ref names without the " (", ")" wrapping.
+'%(describe[:options])':: human-readable name, like
+			  linkgit:git-describe[1]; empty string for
+			  undescribable commits.  The `describe` string
+			  may be followed by a colon and zero or more
+			  comma-separated options.  Descriptions can be
+			  inconsistent when tags are added or removed at
+			  the same time.
++
+** '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
+   `glob(7)` pattern, excluding the "refs/tags/" prefix.
+
 '%S':: ref name given on the command line by which the commit was reached
        (like `git log --source`), only works with `git log`
 '%e':: encoding
@@ -207,6 +249,7 @@ endif::git-rev-list[]
 '%GF':: show the fingerprint of the key used to sign a signed commit
 '%GP':: show the fingerprint of the primary key whose subkey was used
 	to sign a signed commit
+'%GT':: show the trust level for the key used to sign a signed commit
 '%gD':: reflog selector, e.g., `refs/stash@{1}` or `refs/stash@{2
 	minutes ago}`; the format follows the rules described for the
 	`-g` option. The portion before the `@` is the refname as
@@ -226,7 +269,15 @@ endif::git-rev-list[]
 			  interpreted by
 			  linkgit:git-interpret-trailers[1]. The
 			  `trailers` string may be followed by a colon
-			  and zero or more comma-separated options:
+			  and zero or more comma-separated options.
+			  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
    case-insensitively and trailing colon is optional. If option is
    given multiple times trailer lines matching any of the keys are
@@ -235,27 +286,25 @@ endif::git-rev-list[]
    desired it can be disabled with `only=false`.  E.g.,
    `%(trailers:key=Reviewed-by)` shows trailer lines with key
    `Reviewed-by`.
-** 'only[=val]': select whether non-trailer lines from the trailer
-   block should be included. The `only` keyword may optionally be
-   followed by an equal sign and one of `true`, `on`, `yes` to omit or
-   `false`, `off`, `no` to show the non-trailer lines. If option is
-   given without value it is enabled. If given multiple times the last
-   value is used.
+** 'only[=<BOOL>]': select whether non-trailer lines from the trailer
+   block should be included.
 ** 'separator=<SEP>': specify a separator inserted between trailer
    lines. When this option is not given each trailer line is
    terminated with a line feed character. The string SEP may contain
    the literal formatting codes described above. To use comma as
    separator one must use `%x2C` as it would otherwise be parsed as
-   next option. If separator option is given multiple times only the
-   last one is used. E.g., `%(trailers:key=Ticket,separator=%x2C )`
+   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[=val]': make it behave as if interpret-trailer's `--unfold`
-   option was given. In same way as to for `only` it can be followed
-   by an equal sign and explicit value. E.g.,
+** '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.
-** 'valueonly[=val]': skip over the key part of the trailer line and only
-   show the value part. Also this optionally allows explicit value.
+** '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.
 
 NOTE: Some placeholders may depend on other options given to the
 revision traversal engine. For example, the `%g*` reflog options will
diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt
index e44fc8f738..27ddaf84a1 100644
--- a/Documentation/pretty-options.txt
+++ b/Documentation/pretty-options.txt
@@ -3,7 +3,7 @@
 
 	Pretty-print the contents of the commit logs in a given format,
 	where '<format>' can be one of 'oneline', 'short', 'medium',
-	'full', 'fuller', 'email', 'raw', 'format:<string>'
+	'full', 'fuller', 'reference', 'email', 'raw', 'format:<string>'
 	and 'tformat:<string>'.  When '<format>' is none of the above,
 	and has '%placeholder' in it, it acts as if
 	'--pretty=tformat:<format>' were given.
@@ -16,17 +16,17 @@ configuration (see linkgit:git-config[1]).
 
 --abbrev-commit::
 	Instead of showing the full 40-byte hexadecimal commit object
-	name, show only a partial prefix.  Non default number of
-	digits can be specified with "--abbrev=<n>" (which also modifies
-	diff output, if it is displayed).
+	name, show a prefix that names the object uniquely.
+	"--abbrev=<n>" (which also modifies diff output, if it is displayed)
+	option can be used to specify the minimum length of the prefix.
 +
 This should make "--pretty=oneline" a whole lot more readable for
 people using 80-column terminals.
 
 --no-abbrev-commit::
 	Show the full 40-byte hexadecimal commit object name. This negates
-	`--abbrev-commit` and those options which imply it such as
-	"--oneline". It also overrides the `log.abbrevCommit` variable.
+	`--abbrev-commit`, either explicit or implied by other options such
+	as "--oneline". It also overrides the `log.abbrevCommit` variable.
 
 --oneline::
 	This is a shorthand for "--pretty=oneline --abbrev-commit"
@@ -57,7 +57,7 @@ message by 4 spaces (i.e.  'medium', which is the default, 'full',
 and 'fuller').
 
 ifndef::git-rev-list[]
---notes[=<treeish>]::
+--notes[=<ref>]::
 	Show the notes (see linkgit:git-notes[1]) that annotate the
 	commit, when showing the commit log message.  This is the default
 	for `git log`, `git show` and `git whatchanged` commands when
@@ -68,8 +68,8 @@ By default, the notes shown are from the notes refs listed in the
 `core.notesRef` and `notes.displayRef` variables (or corresponding
 environment overrides). See linkgit:git-config[1] for more details.
 +
-With an optional '<treeish>' argument, use the treeish to find the notes
-to display.  The treeish can specify the full refname when it begins
+With an optional '<ref>' argument, use the ref to find the notes
+to display.  The ref can specify the full refname when it begins
 with `refs/notes/`; when it begins with `notes/`, `refs/` and otherwise
 `refs/notes/` is prefixed to form a full name of the ref.
 +
@@ -85,7 +85,7 @@ being displayed. Examples: "--notes=foo" will show only notes from
 	"--notes --notes=foo --no-notes --notes=bar" will only show notes
 	from "refs/notes/bar".
 
---show-notes[=<treeish>]::
+--show-notes[=<ref>]::
 --[no-]standard-notes::
 	These options are deprecated. Use the above --notes/--no-notes
 	options instead.
diff --git a/Documentation/pull-fetch-param.txt b/Documentation/pull-fetch-param.txt
index 7d3a60f5b9..95a7390b2c 100644
--- a/Documentation/pull-fetch-param.txt
+++ b/Documentation/pull-fetch-param.txt
@@ -19,7 +19,8 @@ ifndef::git-pull[]
 	(see <<CRTB,CONFIGURED REMOTE-TRACKING BRANCHES>> below).
 endif::git-pull[]
 ifdef::git-pull[]
-	(see linkgit:git-fetch[1]).
+	(see the section "CONFIGURED REMOTE-TRACKING BRANCHES"
+	in linkgit:git-fetch[1]).
 endif::git-pull[]
 +
 The format of a <refspec> parameter is an optional plus
@@ -29,6 +30,22 @@ The colon can be omitted when <dst> is empty.  <src> is
 typically a ref, but it can also be a fully spelled hex object
 name.
 +
+A <refspec> may contain a `*` in its <src> to indicate a simple pattern
+match. Such a refspec functions like a glob that matches any ref with the
+same prefix. A pattern <refspec> must have a `*` in both the <src> and
+<dst>. It will map refs to the destination by replacing the `*` with the
+contents matched from the source.
++
+If a refspec is prefixed by `^`, it will be interpreted as a negative
+refspec. Rather than specifying which refs to fetch or which local refs to
+update, such a refspec will instead specify refs to exclude. A ref will be
+considered to match if it matches at least one positive refspec, and does
+not match any negative refspec. Negative refspecs can be useful to restrict
+the scope of a pattern refspec so that it will not include specific refs.
+Negative refspecs can themselves be pattern refspecs. However, they may only
+contain a <src> and do not specify a <dst>. Fully spelled out hex object
+names are also not supported.
++
 `tag <tag>` means the same as `refs/tags/<tag>:refs/tags/<tag>`;
 it requests fetching everything up to the given tag.
 +
diff --git a/Documentation/ref-reachability-filters.txt b/Documentation/ref-reachability-filters.txt
new file mode 100644
index 0000000000..9bae46d84c
--- /dev/null
+++ b/Documentation/ref-reachability-filters.txt
@@ -0,0 +1,7 @@
+When combining multiple `--contains` and `--no-contains` filters, only
+references that contain at least one of the `--contains` commits and
+contain none of the `--no-contains` commits are shown.
+
+When combining multiple `--merged` and `--no-merged` filters, only
+references that are reachable from at least one of the `--merged`
+commits and from none of the `--no-merged` commits are shown.
diff --git a/Documentation/rev-list-description.txt b/Documentation/rev-list-description.txt
new file mode 100644
index 0000000000..a9efa7fa27
--- /dev/null
+++ b/Documentation/rev-list-description.txt
@@ -0,0 +1,61 @@
+List commits that are reachable by following the `parent` links from the
+given commit(s), but exclude commits that are reachable from the one(s)
+given with a '{caret}' in front of them.  The output is given in reverse
+chronological order by default.
+
+You can think of this as a set operation. Commits reachable from any of
+the commits given on the command line form a set, and then commits reachable
+from any of the ones given with '{caret}' in front are subtracted from that
+set.  The remaining commits are what comes out in the command's output.
+Various other options and paths parameters can be used to further limit the
+result.
+
+Thus, the following command:
+
+ifdef::git-rev-list[]
+-----------------------------------------------------------------------
+$ git rev-list foo bar ^baz
+-----------------------------------------------------------------------
+endif::git-rev-list[]
+ifdef::git-log[]
+-----------------------------------------------------------------------
+$ git log foo bar ^baz
+-----------------------------------------------------------------------
+endif::git-log[]
+
+means "list all the commits which are reachable from 'foo' or 'bar', but
+not from 'baz'".
+
+A special notation "'<commit1>'..'<commit2>'" can be used as a
+short-hand for "^'<commit1>' '<commit2>'". For example, either of
+the following may be used interchangeably:
+
+ifdef::git-rev-list[]
+-----------------------------------------------------------------------
+$ git rev-list origin..HEAD
+$ git rev-list HEAD ^origin
+-----------------------------------------------------------------------
+endif::git-rev-list[]
+ifdef::git-log[]
+-----------------------------------------------------------------------
+$ git log origin..HEAD
+$ git log HEAD ^origin
+-----------------------------------------------------------------------
+endif::git-log[]
+
+Another special notation is "'<commit1>'...'<commit2>'" which is useful
+for merges.  The resulting set of commits is the symmetric difference
+between the two operands.  The following two commands are equivalent:
+
+ifdef::git-rev-list[]
+-----------------------------------------------------------------------
+$ git rev-list A B --not $(git merge-base --all A B)
+$ git rev-list A...B
+-----------------------------------------------------------------------
+endif::git-rev-list[]
+ifdef::git-log[]
+-----------------------------------------------------------------------
+$ git log A B --not $(git merge-base --all A B)
+$ git log A...B
+-----------------------------------------------------------------------
+endif::git-log[]
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index 90ff9e2bea..b7bd27e171 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -58,7 +58,7 @@ endif::git-rev-list[]
 	`--all-match`).
 ifndef::git-rev-list[]
 +
-When `--show-notes` is in effect, the message from the notes is
+When `--notes` is in effect, the message from the notes is
 matched as if it were part of the log message.
 endif::git-rev-list[]
 
@@ -128,8 +128,12 @@ parents) and `--max-parents=-1` (negative numbers denote no upper limit).
 	because merges into a topic branch tend to be only about
 	adjusting to updated upstream from time to time, and
 	this option allows you to ignore the individual commits
-	brought in to your history by such a merge. Cannot be
-	combined with --bisect.
+	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[]
 
 --not::
 	Reverses the meaning of the '{caret}' prefix (or lack thereof)
@@ -207,7 +211,7 @@ ifndef::git-rev-list[]
 	Pretend as if the bad bisection ref `refs/bisect/bad`
 	was listed and as if it was followed by `--not` and the good
 	bisection refs `refs/bisect/good-*` on the command
-	line. Cannot be combined with --first-parent.
+	line.
 endif::git-rev-list[]
 
 --stdin::
@@ -223,6 +227,15 @@ ifdef::git-rev-list[]
 	test the exit status to see if a range of objects is fully
 	connected (or not).  It is faster than redirecting stdout
 	to `/dev/null` as the output does not have to be formatted.
+
+--disk-usage::
+	Suppress normal output; instead, print the sum of the bytes used
+	for on-disk storage by the selected commits or objects. This is
+	equivalent to piping the output into `git cat-file
+	--batch-check='%(objectsize:disk)'`, except that it runs much
+	faster (especially with `--use-bitmap-index`). See the `CAVEATS`
+	section in linkgit:git-cat-file[1] for the limitations of what
+	"on-disk storage" means.
 endif::git-rev-list[]
 
 --cherry-mark::
@@ -269,7 +282,7 @@ list.
 	exclude (that is, '{caret}commit', 'commit1..commit2',
 	and 'commit1\...commit2' notations cannot be used).
 +
-With `--pretty` format other than `oneline` (for obvious reasons),
+With `--pretty` format other than `oneline` and `reference` (for obvious reasons),
 this causes the output to have two extra lines of information
 taken from the reflog.  The reflog designator in the output may be shown
 as `ref@{Nth}` (where `Nth` is the reverse-chronological index in the
@@ -293,6 +306,8 @@ Under `--pretty=oneline`, the commit message is
 prefixed with this information on the same line.
 This option cannot be combined with `--reverse`.
 See also linkgit:git-reflog[1].
++
+Under `--pretty=reference`, this information will not be shown at all.
 
 --merge::
 	After a failed merge, show refs that touch files having a
@@ -340,6 +355,12 @@ Default mode::
 	branches if the end result is the same (i.e. merging branches
 	with the same content)
 
+--show-pulls::
+	Include all commits from the default mode, but also any merge
+	commits that are not TREESAME to the first parent but are
+	TREESAME to a later parent. This mode is helpful for showing
+	the merge commits that "first introduced" a change to a branch.
+
 --full-history::
 	Same as the default mode, but does not prune some history.
 
@@ -532,7 +553,7 @@ Note the major differences in `N`, `P`, and `Q` over `--full-history`:
   parent and is TREESAME.
 --
 
-Finally, there is a fifth simplification mode available:
+There is another simplification mode available:
 
 --ancestry-path::
 	Limit the displayed commits to those directly on the ancestry
@@ -571,6 +592,135 @@ option does. Applied to the 'D..M' range, it results in:
 				L--M
 -----------------------------------------------------------------------
 
+Before discussing another option, `--show-pulls`, we need to
+create a new example history.
+
+A common problem users face when looking at simplified history is that a
+commit they know changed a file somehow does not appear in the file's
+simplified history. Let's demonstrate a new example and show how options
+such as `--full-history` and `--simplify-merges` works in that case:
+
+-----------------------------------------------------------------------
+	  .-A---M-----C--N---O---P
+	 /     / \  \  \/   /   /
+	I     B   \  R-'`-Z'   /
+	 \   /     \/         /
+	  \ /      /\        /
+	   `---X--'  `---Y--'
+-----------------------------------------------------------------------
+
+For this example, suppose `I` created `file.txt` which was modified by
+`A`, `B`, and `X` in different ways. The single-parent commits `C`, `Z`,
+and `Y` do not change `file.txt`. The merge commit `M` was created by
+resolving the merge conflict to include both changes from `A` and `B`
+and hence is not TREESAME to either. The merge commit `R`, however, was
+created by ignoring the contents of `file.txt` at `M` and taking only
+the contents of `file.txt` at `X`. Hence, `R` is TREESAME to `X` but not
+`M`. Finally, the natural merge resolution to create `N` is to take the
+contents of `file.txt` at `R`, so `N` is TREESAME to `R` but not `C`.
+The merge commits `O` and `P` are TREESAME to their first parents, but
+not to their second parents, `Z` and `Y` respectively.
+
+When using the default mode, `N` and `R` both have a TREESAME parent, so
+those edges are walked and the others are ignored. The resulting history
+graph is:
+
+-----------------------------------------------------------------------
+	I---X
+-----------------------------------------------------------------------
+
+When using `--full-history`, Git walks every edge. This will discover
+the commits `A` and `B` and the merge `M`, but also will reveal the
+merge commits `O` and `P`. With parent rewriting, the resulting graph is:
+
+-----------------------------------------------------------------------
+	  .-A---M--------N---O---P
+	 /     / \  \  \/   /   /
+	I     B   \  R-'`--'   /
+	 \   /     \/         /
+	  \ /      /\        /
+	   `---X--'  `------'
+-----------------------------------------------------------------------
+
+Here, the merge commits `O` and `P` contribute extra noise, as they did
+not actually contribute a change to `file.txt`. They only merged a topic
+that was based on an older version of `file.txt`. This is a common
+issue in repositories using a workflow where many contributors work in
+parallel and merge their topic branches along a single trunk: manu
+unrelated merges appear in the `--full-history` results.
+
+When using the `--simplify-merges` option, the commits `O` and `P`
+disappear from the results. This is because the rewritten second parents
+of `O` and `P` are reachable from their first parents. Those edges are
+removed and then the commits look like single-parent commits that are
+TREESAME to their parent. This also happens to the commit `N`, resulting
+in a history view as follows:
+
+-----------------------------------------------------------------------
+	  .-A---M--.
+	 /     /    \
+	I     B      R
+	 \   /      /
+	  \ /      /
+	   `---X--'
+-----------------------------------------------------------------------
+
+In this view, we see all of the important single-parent changes from
+`A`, `B`, and `X`. We also see the carefully-resolved merge `M` and the
+not-so-carefully-resolved merge `R`. This is usually enough information
+to determine why the commits `A` and `B` "disappeared" from history in
+the default view. However, there are a few issues with this approach.
+
+The first issue is performance. Unlike any previous option, the
+`--simplify-merges` option requires walking the entire commit history
+before returning a single result. This can make the option difficult to
+use for very large repositories.
+
+The second issue is one of auditing. When many contributors are working
+on the same repository, it is important which merge commits introduced
+a change into an important branch. The problematic merge `R` above is
+not likely to be the merge commit that was used to merge into an
+important branch. Instead, the merge `N` was used to merge `R` and `X`
+into the important branch. This commit may have information about why
+the change `X` came to override the changes from `A` and `B` in its
+commit message.
+
+--show-pulls::
+	In addition to the commits shown in the default history, show
+	each merge commit that is not TREESAME to its first parent but
+	is TREESAME to a later parent.
++
+When a merge commit is included by `--show-pulls`, the merge is
+treated as if it "pulled" the change from another branch. When using
+`--show-pulls` on this example (and no other options) the resulting
+graph is:
++
+-----------------------------------------------------------------------
+	I---X---R---N
+-----------------------------------------------------------------------
++
+Here, the merge commits `R` and `N` are included because they pulled
+the commits `X` and `R` into the base branch, respectively. These
+merges are the reason the commits `A` and `B` do not appear in the
+default history.
++
+When `--show-pulls` is paired with `--simplify-merges`, the
+graph includes all of the necessary information:
++
+-----------------------------------------------------------------------
+	  .-A---M--.   N
+	 /     /    \ /
+	I     B      R
+	 \   /      /
+	  \ /      /
+	   `---X--'
+-----------------------------------------------------------------------
++
+Notice that since `M` is reachable from `R`, the edge from `N` to `M`
+was simplified away. However, `N` still appears in the history as an
+important commit because it "pulled" the change `R` into the main
+branch.
+
 The `--simplify-by-decoration` option allows you to view only the
 big picture of the topology of the history, by omitting commits
 that are not referenced by tags.  Commits are marked as !TREESAME
@@ -579,6 +729,7 @@ above) if (1) they are referenced by tags, or (2) they change the
 contents of the paths given on the command line.  All other
 commits are marked as TREESAME (subject to be simplified away).
 
+ifndef::git-shortlog[]
 ifdef::git-rev-list[]
 Bisection Helpers
 ~~~~~~~~~~~~~~~~~
@@ -605,7 +756,7 @@ outputs 'midpoint', the output of the two commands
 would be of roughly the same length.  Finding the change which
 introduces a regression is thus reduced to a binary search: repeatedly
 generate and test new 'midpoint's until the commit chain is of length
-one. Cannot be combined with --first-parent.
+one.
 
 --bisect-vars::
 	This calculates the same as `--bisect`, except that refs in
@@ -634,8 +785,9 @@ This option can be used along with `--bisect-vars`, in this case,
 after all the sorted commit objects, there will be the same text as if
 `--bisect-vars` had been used alone.
 endif::git-rev-list[]
+endif::git-shortlog[]
 
-
+ifndef::git-shortlog[]
 Commit Ordering
 ~~~~~~~~~~~~~~~
 
@@ -677,7 +829,9 @@ together.
 	Output the commits chosen to be shown (see Commit Limiting
 	section above) in reverse order. Cannot be combined with
 	`--walk-reflogs`.
+endif::git-shortlog[]
 
+ifndef::git-shortlog[]
 Object Traversal
 ~~~~~~~~~~~~~~~~
 
@@ -738,9 +892,12 @@ or units.  n may be zero.  The suffixes k, m, and g can be used to name
 units in KiB, MiB, or GiB.  For example, 'blob:limit=1k' is the same
 as 'blob:limit=1024'.
 +
+The form '--filter=object:type=(tag|commit|tree|blob)' omits all objects
+which are not of the requested type.
++
 The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout
 specification contained in the blob (or blob-expression) '<blob-ish>'
-to omit blobs that would not be not required for a sparse checkout on
+to omit blobs that would not be required for a sparse checkout on
 the requested refs.
 +
 The form '--filter=tree:<depth>' omits all blobs and trees whose depth
@@ -776,6 +933,11 @@ equivalent.
 --no-filter::
 	Turn off any previous `--filter=` argument.
 
+--filter-provided-objects::
+	Filter the list of explicitly provided objects, which would otherwise
+	always be printed even if they did not match any of the filters. Only
+	useful with `--filter=`.
+
 --filter-print-omitted::
 	Only useful with `--filter=`; prints a list of the objects omitted
 	by the filter.  Object IDs are prefixed with a ``~'' character.
@@ -806,6 +968,11 @@ list of the missing objects.  Object IDs are prefixed with a ``?'' character.
 	objects.
 endif::git-rev-list[]
 
+--unsorted-input::
+	Show commits in the order they were given on the command line instead
+	of sorting them in reverse chronological order by commit time. Cannot
+	be combined with `--no-walk` or `--no-walk=sorted`.
+
 --no-walk[=(sorted|unsorted)]::
 	Only show the given commits, but do not traverse their ancestors.
 	This has no effect if a range is specified. If the argument
@@ -813,11 +980,14 @@ endif::git-rev-list[]
 	given on the command line. Otherwise (if `sorted` or no argument
 	was given), the commits are shown in reverse chronological order
 	by commit time.
-	Cannot be combined with `--graph`.
+	Cannot be combined with `--graph`. Cannot be combined with
+	`--unsorted-input` if `sorted` or no argument was given.
 
 --do-walk::
 	Overrides a previous `--no-walk`.
+endif::git-shortlog[]
 
+ifndef::git-shortlog[]
 Commit Formatting
 ~~~~~~~~~~~~~~~~~
 
@@ -900,6 +1070,14 @@ ifdef::git-rev-list[]
 --header::
 	Print the contents of the commit in raw-format; each record is
 	separated with a NUL character.
+
+--no-commit-header::
+	Suppress the header line containing "commit" and the object ID printed before
+	the specified format.  This has no effect on the built-in formats; only custom
+	formats are affected.
+
+--commit-header::
+	Overrides a previous `--no-commit-header`.
 endif::git-rev-list[]
 
 --parents::
@@ -973,46 +1151,4 @@ ifdef::git-rev-list[]
 	counts and print the count for equivalent commits separated
 	by a tab.
 endif::git-rev-list[]
-
-ifndef::git-rev-list[]
-Diff Formatting
-~~~~~~~~~~~~~~~
-
-Listed below are options that control the formatting of diff output.
-Some of them are specific to linkgit:git-rev-list[1], however other diff
-options may be given. See linkgit:git-diff-files[1] for more options.
-
--c::
-	With this option, diff output for a merge commit
-	shows the differences from each of the parents to the merge result
-	simultaneously instead of showing pairwise diff between a parent
-	and the result one at a time. Furthermore, it lists only files
-	which were modified from all parents.
-
---cc::
-	This flag implies the `-c` option and further compresses the
-	patch output by omitting uninteresting hunks whose contents in
-	the parents have only two variants and the merge result picks
-	one of them without modification.
-
---combined-all-paths::
-	This flag causes combined diffs (used for merge commits) to
-	list the name of the file from all parents.  It thus only has
-	effect when -c or --cc are specified, and is likely only
-	useful if filename changes are detected (i.e. when either
-	rename or copy detection have been requested).
-
--m::
-	This flag makes the merge commits show the full diff like
-	regular commits; for each merge parent, a separate log entry
-	and diff is generated. An exception is that only diff against
-	the first parent is shown when `--first-parent` option is given;
-	in that case, the output represents the changes the merge
-	brought _into_ the then-current branch.
-
--r::
-	Show recursive diffs.
-
--t::
-	Show the tree objects in the diff output. This implies `-r`.
-endif::git-rev-list[]
+endif::git-shortlog[]
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 97f995e5a9..f5f17b65a1 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -233,7 +233,7 @@ G   H   I   J
 
     A =      = A^0
     B = A^   = A^1     = A~1
-    C = A^2  = A^2
+    C =      = A^2
     D = A^^  = A^1^1   = A~2
     E = B^2  = A^^2
     F = B^3  = A^^3
@@ -254,9 +254,15 @@ specifying a single revision, using the notation described in the
 previous section, means the set of commits `reachable` from the given
 commit.
 
+Specifying several revisions means the set of commits reachable from
+any of the given commits.
+
 A commit's reachable set is the commit itself and the commits in
 its ancestry chain.
 
+There are several notations to specify a set of connected commits
+(called a "revision range"), illustrated below.
+
 
 Commit Exclusions
 ~~~~~~~~~~~~~~~~~
@@ -291,6 +297,26 @@ is a shorthand for 'HEAD..origin' and asks "What did the origin do since
 I forked from them?"  Note that '..' would mean 'HEAD..HEAD' which is an
 empty range that is both reachable and unreachable from HEAD.
 
+Commands that are specifically designed to take two distinct ranges
+(e.g. "git range-diff R1 R2" to compare two ranges) do exist, but
+they are exceptions.  Unless otherwise noted, all "git" commands
+that operate on a set of commits work on a single revision range.
+In other words, writing two "two-dot range notation" next to each
+other, e.g.
+
+    $ git log A..B C..D
+
+does *not* specify two revision ranges for most commands.  Instead
+it will name a single connected set of commits, i.e. those that are
+reachable from either B or D but are reachable from neither A or C.
+In a linear history like this:
+
+    ---A---B---o---o---C---D
+
+because A and B are reachable from C, the revision range specified
+by these two dotted ranges is a single commit D.
+
+
 Other <rev>{caret} Parent Shorthand Notations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Three other shorthands exist, particularly useful for merge commits,
diff --git a/Documentation/signoff-option.txt b/Documentation/signoff-option.txt
new file mode 100644
index 0000000000..12aa2333e4
--- /dev/null
+++ b/Documentation/signoff-option.txt
@@ -0,0 +1,18 @@
+ifdef::git-commit[]
+-s::
+endif::git-commit[]
+--signoff::
+--no-signoff::
+	Add a `Signed-off-by` trailer by the committer at the end of the commit
+	log message.  The meaning of a signoff depends on the project
+	to which you're committing.  For example, it may certify that
+	the committer has the rights to submit the work under the
+	project's license or agrees to some contributor representation,
+	such as a Developer Certificate of Origin.
+	(See http://developercertificate.org for the one used by the
+	Linux kernel and Git projects.)  Consult the documentation or
+	leadership of the project to which you're contributing to
+	understand how the signoffs are used in that project.
++
+The --no-signoff option can be used to countermand an earlier --signoff
+option on the command line.
diff --git a/Documentation/technical/api-allocation-growing.txt b/Documentation/technical/api-allocation-growing.txt
deleted file mode 100644
index 5a59b54844..0000000000
--- a/Documentation/technical/api-allocation-growing.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-allocation growing API
-======================
-
-Dynamically growing an array using realloc() is error prone and boring.
-
-Define your array with:
-
-* a pointer (`item`) that points at the array, initialized to `NULL`
-  (although please name the variable based on its contents, not on its
-  type);
-
-* an integer variable (`alloc`) that keeps track of how big the current
-  allocation is, initialized to `0`;
-
-* another integer variable (`nr`) to keep track of how many elements the
-  array currently has, initialized to `0`.
-
-Then before adding `n`th element to the item, call `ALLOC_GROW(item, n,
-alloc)`.  This ensures that the array can hold at least `n` elements by
-calling `realloc(3)` and adjusting `alloc` variable.
-
-------------
-sometype *item;
-size_t nr;
-size_t alloc
-
-for (i = 0; i < nr; i++)
-	if (we like item[i] already)
-		return;
-
-/* we did not like any existing one, so add one */
-ALLOC_GROW(item, nr + 1, alloc);
-item[nr++] = value you like;
-------------
-
-You are responsible for updating the `nr` variable.
-
-If you need to specify the number of elements to allocate explicitly
-then use the macro `REALLOC_ARRAY(item, alloc)` instead of `ALLOC_GROW`.
diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt
deleted file mode 100644
index 870c8edbfb..0000000000
--- a/Documentation/technical/api-argv-array.txt
+++ /dev/null
@@ -1,65 +0,0 @@
-argv-array API
-==============
-
-The argv-array API allows one to dynamically build and store
-NULL-terminated lists.  An argv-array maintains the invariant that the
-`argv` member always points to a non-NULL array, and that the array is
-always NULL-terminated at the element pointed to by `argv[argc]`. This
-makes the result suitable for passing to functions expecting to receive
-argv from main(), or the link:api-run-command.html[run-command API].
-
-The string-list API (documented in string-list.h) is similar, but cannot be
-used for these purposes; instead of storing a straight string pointer,
-it contains an item structure with a `util` field that is not compatible
-with the traditional argv interface.
-
-Each `argv_array` manages its own memory. Any strings pushed into the
-array are duplicated, and all memory is freed by argv_array_clear().
-
-Data Structures
----------------
-
-`struct argv_array`::
-
-	A single array. This should be initialized by assignment from
-	`ARGV_ARRAY_INIT`, or by calling `argv_array_init`. The `argv`
-	member contains the actual array; the `argc` member contains the
-	number of elements in the array, not including the terminating
-	NULL.
-
-Functions
----------
-
-`argv_array_init`::
-	Initialize an array. This is no different than assigning from
-	`ARGV_ARRAY_INIT`.
-
-`argv_array_push`::
-	Push a copy of a string onto the end of the array.
-
-`argv_array_pushl`::
-	Push a list of strings onto the end of the array. The arguments
-	should be a list of `const char *` strings, terminated by a NULL
-	argument.
-
-`argv_array_pushf`::
-	Format a string and push it onto the end of the array. This is a
-	convenience wrapper combining `strbuf_addf` and `argv_array_push`.
-
-`argv_array_pushv`::
-	Push a null-terminated array of strings onto the end of the array.
-
-`argv_array_pop`::
-	Remove the final element from the array. If there are no
-	elements in the array, do nothing.
-
-`argv_array_clear`::
-	Free all memory associated with the array and return it to the
-	initial, empty state.
-
-`argv_array_detach`::
-	Disconnect the `argv` member from the `argv_array` struct and
-	return it. The caller is responsible for freeing the memory used
-	by the array, and by the strings it references. After detaching,
-	the `argv_array` is in a reinitialized state and can be pushed
-	into again.
diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
deleted file mode 100644
index 7d20716c32..0000000000
--- a/Documentation/technical/api-config.txt
+++ /dev/null
@@ -1,319 +0,0 @@
-config API
-==========
-
-The config API gives callers a way to access Git configuration files
-(and files which have the same syntax). See linkgit:git-config[1] for a
-discussion of the config file syntax.
-
-General Usage
--------------
-
-Config files are parsed linearly, and each variable found is passed to a
-caller-provided callback function. The callback function is responsible
-for any actions to be taken on the config option, and is free to ignore
-some options. It is not uncommon for the configuration to be parsed
-several times during the run of a Git program, with different callbacks
-picking out different variables useful to themselves.
-
-A config callback function takes three parameters:
-
-- the name of the parsed variable. This is in canonical "flat" form: the
-  section, subsection, and variable segments will be separated by dots,
-  and the section and variable segments will be all lowercase. E.g.,
-  `core.ignorecase`, `diff.SomeType.textconv`.
-
-- the value of the found variable, as a string. If the variable had no
-  value specified, the value will be NULL (typically this means it
-  should be interpreted as boolean true).
-
-- a void pointer passed in by the caller of the config API; this can
-  contain callback-specific data
-
-A config callback should return 0 for success, or -1 if the variable
-could not be parsed properly.
-
-Basic Config Querying
----------------------
-
-Most programs will simply want to look up variables in all config files
-that Git knows about, using the normal precedence rules. To do this,
-call `git_config` with a callback function and void data pointer.
-
-`git_config` will read all config sources in order of increasing
-priority. Thus a callback should typically overwrite previously-seen
-entries with new ones (e.g., if both the user-wide `~/.gitconfig` and
-repo-specific `.git/config` contain `color.ui`, the config machinery
-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).
-
-The `config_with_options` function lets the caller examine config
-while adjusting some of the default behavior of `git_config`. It should
-almost never be used by "regular" Git code that is looking up
-configuration variables. It is intended for advanced callers like
-`git-config`, which are intentionally tweaking the normal config-lookup
-process. It takes two extra parameters:
-
-`config_source`::
-If this parameter is non-NULL, it specifies the source to parse for
-configuration, rather than looking in the usual files. See `struct
-git_config_source` in `config.h` for details. Regular `git_config` defaults
-to `NULL`.
-
-`opts`::
-Specify options to adjust the behavior of parsing config files. See `struct
-config_options` in `config.h` for details. As an example: regular `git_config`
-sets `opts.respect_includes` to `1` by default.
-
-Reading Specific Files
-----------------------
-
-To read a specific file in git-config format, use
-`git_config_from_file`. This takes the same callback and data parameters
-as `git_config`.
-
-Querying For Specific Variables
--------------------------------
-
-For programs wanting to query for specific variables in a non-callback
-manner, the config API provides two functions `git_config_get_value`
-and `git_config_get_value_multi`. They both read values from an internal
-cache generated previously from reading the config files.
-
-`int git_config_get_value(const char *key, const char **value)`::
-
-	Finds the highest-priority value for the configuration variable `key`,
-	stores the pointer to it in `value` and returns 0. When the
-	configuration variable `key` is not found, returns 1 without touching
-	`value`. The caller should not free or modify `value`, as it is owned
-	by the cache.
-
-`const struct string_list *git_config_get_value_multi(const char *key)`::
-
-	Finds and returns the value list, sorted in order of increasing priority
-	for the configuration variable `key`. When the configuration variable
-	`key` is not found, returns NULL. The caller should not free or modify
-	the returned pointer, as it is owned by the cache.
-
-`void git_config_clear(void)`::
-
-	Resets and invalidates the config cache.
-
-The config API also provides type specific API functions which do conversion
-as well as retrieval for the queried variable, including:
-
-`int git_config_get_int(const char *key, int *dest)`::
-
-	Finds and parses the value to an integer for the configuration variable
-	`key`. Dies on error; otherwise, stores the value of the parsed integer in
-	`dest` and returns 0. When the configuration variable `key` is not found,
-	returns 1 without touching `dest`.
-
-`int git_config_get_ulong(const char *key, unsigned long *dest)`::
-
-	Similar to `git_config_get_int` but for unsigned longs.
-
-`int git_config_get_bool(const char *key, int *dest)`::
-
-	Finds and parses the value into a boolean value, for the configuration
-	variable `key` respecting keywords like "true" and "false". Integer
-	values are converted into true/false values (when they are non-zero or
-	zero, respectively). Other values cause a die(). If parsing is successful,
-	stores the value of the parsed result in `dest` and returns 0. When the
-	configuration variable `key` is not found, returns 1 without touching
-	`dest`.
-
-`int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest)`::
-
-	Similar to `git_config_get_bool`, except that integers are copied as-is,
-	and `is_bool` flag is unset.
-
-`int git_config_get_maybe_bool(const char *key, int *dest)`::
-
-	Similar to `git_config_get_bool`, except that it returns -1 on error
-	rather than dying.
-
-`int git_config_get_string_const(const char *key, const char **dest)`::
-
-	Allocates and copies the retrieved string into the `dest` parameter for
-	the configuration variable `key`; if NULL string is given, prints an
-	error message and returns -1. When the configuration variable `key` is
-	not found, returns 1 without touching `dest`.
-
-`int git_config_get_string(const char *key, char **dest)`::
-
-	Similar to `git_config_get_string_const`, except that retrieved value
-	copied into the `dest` parameter is a mutable string.
-
-`int git_config_get_pathname(const char *key, const char **dest)`::
-
-	Similar to `git_config_get_string`, but expands `~` or `~user` into
-	the user's home directory when found at the beginning of the path.
-
-`git_die_config(const char *key, const char *err, ...)`::
-
-	First prints the error message specified by the caller in `err` and then
-	dies printing the line number and the file name of the highest priority
-	value for the configuration variable `key`.
-
-`void git_die_config_linenr(const char *key, const char *filename, int linenr)`::
-
-	Helper function which formats the die error message according to the
-	parameters entered. Used by `git_die_config()`. It can be used by callers
-	handling `git_config_get_value_multi()` to print the correct error message
-	for the desired value.
-
-See test-config.c for usage examples.
-
-Value Parsing Helpers
----------------------
-
-To aid in parsing string values, the config API provides callbacks with
-a number of helper functions, including:
-
-`git_config_int`::
-Parse the string to an integer, including unit factors. Dies on error;
-otherwise, returns the parsed result.
-
-`git_config_ulong`::
-Identical to `git_config_int`, but for unsigned longs.
-
-`git_config_bool`::
-Parse a string into a boolean value, respecting keywords like "true" and
-"false". Integer values are converted into true/false values (when they
-are non-zero or zero, respectively). Other values cause a die(). If
-parsing is successful, the return value is the result.
-
-`git_config_bool_or_int`::
-Same as `git_config_bool`, except that integers are returned as-is, and
-an `is_bool` flag is unset.
-
-`git_parse_maybe_bool`::
-Same as `git_config_bool`, except that it returns -1 on error rather
-than dying.
-
-`git_config_string`::
-Allocates and copies the value string into the `dest` parameter; if no
-string is given, prints an error message and returns -1.
-
-`git_config_pathname`::
-Similar to `git_config_string`, but expands `~` or `~user` into the
-user's home directory when found at the beginning of the path.
-
-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.
-
-Custom Configsets
------------------
-
-A `config_set` can be used to construct an in-memory cache for
-config-like files that the caller specifies (i.e., files like `.gitmodules`,
-`~/.gitconfig` etc.). For example,
-
-----------------------------------------
-struct config_set gm_config;
-git_configset_init(&gm_config);
-int b;
-/* we add config files to the config_set */
-git_configset_add_file(&gm_config, ".gitmodules");
-git_configset_add_file(&gm_config, ".gitmodules_alt");
-
-if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
-	/* hack hack hack */
-}
-
-/* when we are done with the configset */
-git_configset_clear(&gm_config);
-----------------------------------------
-
-Configset API provides functions for the above mentioned work flow, including:
-
-`void git_configset_init(struct config_set *cs)`::
-
-	Initializes the config_set `cs`.
-
-`int git_configset_add_file(struct config_set *cs, const char *filename)`::
-
-	Parses the file and adds the variable-value pairs to the `config_set`,
-	dies if there is an error in parsing the file. Returns 0 on success, or
-	-1 if the file does not exist or is inaccessible. The user has to decide
-	if he wants to free the incomplete configset or continue using it when
-	the function returns -1.
-
-`int git_configset_get_value(struct config_set *cs, const char *key, const char **value)`::
-
-	Finds the highest-priority value for the configuration variable `key`
-	and config set `cs`, stores the pointer to it in `value` and returns 0.
-	When the configuration variable `key` is not found, returns 1 without
-	touching `value`. The caller should not free or modify `value`, as it
-	is owned by the cache.
-
-`const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key)`::
-
-	Finds and returns the value list, sorted in order of increasing priority
-	for the configuration variable `key` and config set `cs`. When the
-	configuration variable `key` is not found, returns NULL. The caller
-	should not free or modify the returned pointer, as it is owned by the cache.
-
-`void git_configset_clear(struct config_set *cs)`::
-
-	Clears `config_set` structure, removes all saved variable-value pairs.
-
-In addition to above functions, the `config_set` API provides type specific
-functions in the vein of `git_config_get_int` and family but with an extra
-parameter, pointer to struct `config_set`.
-They all behave similarly to the `git_config_get*()` family described in
-"Querying For Specific Variables" above.
-
-Writing Config Files
---------------------
-
-Git gives multiple entry points in the Config API to write config values to
-files namely `git_config_set_in_file` and `git_config_set`, which write to
-a specific config file or to `.git/config` respectively. They both take a
-key/value pair as parameter.
-In the end they both call `git_config_set_multivar_in_file` which takes four
-parameters:
-
-- the name of the file, as a string, to which key/value pairs will be written.
-
-- the name of key, as a string. This is in canonical "flat" form: the section,
-  subsection, and variable segments will be separated by dots, and the section
-  and variable segments will be all lowercase.
-  E.g., `core.ignorecase`, `diff.SomeType.textconv`.
-
-- the value of the variable, as a string. If value is equal to NULL, it will
-  remove the matching key from the config file.
-
-- the value regex, as a string. It will disregard key/value pairs where value
-  does not match.
-
-- a multi_replace value, as an int. If value is equal to zero, nothing or only
-  one matching key/value is replaced, else all matching key/values (regardless
-  how many) are removed, before the new pair is written.
-
-It returns 0 on success.
-
-Also, there are functions `git_config_rename_section` and
-`git_config_rename_section_in_file` with parameters `old_name` and `new_name`
-for renaming or removing sections in the config files. If NULL is passed
-through `new_name` parameter, the section will be removed from the config file.
diff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt
deleted file mode 100644
index 75368f26ca..0000000000
--- a/Documentation/technical/api-credentials.txt
+++ /dev/null
@@ -1,271 +0,0 @@
-credentials API
-===============
-
-The credentials API provides an abstracted way of gathering username and
-password credentials from the user (even though credentials in the wider
-world can take many forms, in this document the word "credential" always
-refers to a username and password pair).
-
-This document describes two interfaces: the C API that the credential
-subsystem provides to the rest of Git, and the protocol that Git uses to
-communicate with system-specific "credential helpers". If you are
-writing Git code that wants to look up or prompt for credentials, see
-the section "C API" below. If you want to write your own helper, see
-the section on "Credential Helpers" below.
-
-Typical setup
--------------
-
-------------
-+-----------------------+
-| Git code (C)          |--- to server requiring --->
-|                       |        authentication
-|.......................|
-| C credential API      |--- prompt ---> User
-+-----------------------+
-	^      |
-	| pipe |
-	|      v
-+-----------------------+
-| Git credential helper |
-+-----------------------+
-------------
-
-The Git code (typically a remote-helper) will call the C API to obtain
-credential data like a login/password pair (credential_fill). The
-API will itself call a remote helper (e.g. "git credential-cache" or
-"git credential-store") that may retrieve credential data from a
-store. If the credential helper cannot find the information, the C API
-will prompt the user. Then, the caller of the API takes care of
-contacting the server, and does the actual authentication.
-
-C API
------
-
-The credential C API is meant to be called by Git code which needs to
-acquire or store a credential. It is centered around an object
-representing a single credential and provides three basic operations:
-fill (acquire credentials by calling helpers and/or prompting the user),
-approve (mark a credential as successfully used so that it can be stored
-for later use), and reject (mark a credential as unsuccessful so that it
-can be erased from any persistent storage).
-
-Data Structures
-~~~~~~~~~~~~~~~
-
-`struct credential`::
-
-	This struct represents a single username/password combination
-	along with any associated context. All string fields should be
-	heap-allocated (or NULL if they are not known or not applicable).
-	The meaning of the individual context fields is the same as
-	their counterparts in the helper protocol; see the section below
-	for a description of each field.
-+
-The `helpers` member of the struct is a `string_list` of helpers.  Each
-string specifies an external helper which will be run, in order, to
-either acquire or store credentials. See the section on credential
-helpers below. This list is filled-in by the API functions
-according to the corresponding configuration variables before
-consulting helpers, so there usually is no need for a caller to
-modify the helpers field at all.
-+
-This struct should always be initialized with `CREDENTIAL_INIT` or
-`credential_init`.
-
-
-Functions
-~~~~~~~~~
-
-`credential_init`::
-
-	Initialize a credential structure, setting all fields to empty.
-
-`credential_clear`::
-
-	Free any resources associated with the credential structure,
-	returning it to a pristine initialized state.
-
-`credential_fill`::
-
-	Instruct the credential subsystem to fill the username and
-	password fields of the passed credential struct by first
-	consulting helpers, then asking the user. After this function
-	returns, the username and password fields of the credential are
-	guaranteed to be non-NULL. If an error occurs, the function will
-	die().
-
-`credential_reject`::
-
-	Inform the credential subsystem that the provided credentials
-	have been rejected. This will cause the credential subsystem to
-	notify any helpers of the rejection (which allows them, for
-	example, to purge the invalid credentials from storage).  It
-	will also free() the username and password fields of the
-	credential and set them to NULL (readying the credential for
-	another call to `credential_fill`). Any errors from helpers are
-	ignored.
-
-`credential_approve`::
-
-	Inform the credential subsystem that the provided credentials
-	were successfully used for authentication.  This will cause the
-	credential subsystem to notify any helpers of the approval, so
-	that they may store the result to be used again.  Any errors
-	from helpers are ignored.
-
-`credential_from_url`::
-
-	Parse a URL into broken-down credential fields.
-
-Example
-~~~~~~~
-
-The example below shows how the functions of the credential API could be
-used to login to a fictitious "foo" service on a remote host:
-
------------------------------------------------------------------------
-int foo_login(struct foo_connection *f)
-{
-	int status;
-	/*
-	 * Create a credential with some context; we don't yet know the
-	 * username or password.
-	 */
-
-	struct credential c = CREDENTIAL_INIT;
-	c.protocol = xstrdup("foo");
-	c.host = xstrdup(f->hostname);
-
-	/*
-	 * Fill in the username and password fields by contacting
-	 * helpers and/or asking the user. The function will die if it
-	 * fails.
-	 */
-	credential_fill(&c);
-
-	/*
-	 * Otherwise, we have a username and password. Try to use it.
-	 */
-	status = send_foo_login(f, c.username, c.password);
-	switch (status) {
-	case FOO_OK:
-		/* It worked. Store the credential for later use. */
-		credential_accept(&c);
-		break;
-	case FOO_BAD_LOGIN:
-		/* Erase the credential from storage so we don't try it
-		 * again. */
-		credential_reject(&c);
-		break;
-	default:
-		/*
-		 * Some other error occurred. We don't know if the
-		 * credential is good or bad, so report nothing to the
-		 * credential subsystem.
-		 */
-	}
-
-	/* Free any associated resources. */
-	credential_clear(&c);
-
-	return status;
-}
------------------------------------------------------------------------
-
-
-Credential Helpers
-------------------
-
-Credential helpers are programs executed by Git to fetch or save
-credentials from and to long-term storage (where "long-term" is simply
-longer than a single Git process; e.g., credentials may be stored
-in-memory for a few minutes, or indefinitely on disk).
-
-Each helper is specified by a single string in the configuration
-variable `credential.helper` (and others, see linkgit:git-config[1]).
-The string is transformed by Git into a command to be executed using
-these rules:
-
-  1. If the helper string begins with "!", it is considered a shell
-     snippet, and everything after the "!" becomes the command.
-
-  2. Otherwise, if the helper string begins with an absolute path, the
-     verbatim helper string becomes the command.
-
-  3. Otherwise, the string "git credential-" is prepended to the helper
-     string, and the result becomes the command.
-
-The resulting command then has an "operation" argument appended to it
-(see below for details), and the result is executed by the shell.
-
-Here are some example specifications:
-
-----------------------------------------------------
-# run "git credential-foo"
-foo
-
-# same as above, but pass an argument to the helper
-foo --bar=baz
-
-# the arguments are parsed by the shell, so use shell
-# quoting if necessary
-foo --bar="whitespace arg"
-
-# you can also use an absolute path, which will not use the git wrapper
-/path/to/my/helper --with-arguments
-
-# or you can specify your own shell snippet
-!f() { echo "password=`cat $HOME/.secret`"; }; f
-----------------------------------------------------
-
-Generally speaking, rule (3) above is the simplest for users to specify.
-Authors of credential helpers should make an effort to assist their
-users by naming their program "git-credential-$NAME", and putting it in
-the $PATH or $GIT_EXEC_PATH during installation, which will allow a user
-to enable it with `git config credential.helper $NAME`.
-
-When a helper is executed, it will have one "operation" argument
-appended to its command line, which is one of:
-
-`get`::
-
-	Return a matching credential, if any exists.
-
-`store`::
-
-	Store the credential, if applicable to the helper.
-
-`erase`::
-
-	Remove a matching credential, if any, from the helper's storage.
-
-The details of the credential will be provided on the helper's stdin
-stream. The exact format is the same as the input/output format of the
-`git credential` plumbing command (see the section `INPUT/OUTPUT
-FORMAT` in linkgit:git-credential[1] for a detailed specification).
-
-For a `get` operation, the helper should produce a list of attributes
-on stdout in the same format. A helper is free to produce a subset, or
-even no values at all if it has nothing useful to provide. Any provided
-attributes will overwrite those already known about by Git.  If a helper
-outputs a `quit` attribute with a value of `true` or `1`, no further
-helpers will be consulted, nor will the user be prompted (if no
-credential has been provided, the operation will then fail).
-
-For a `store` or `erase` operation, the helper's output is ignored.
-If it fails to perform the requested operation, it may complain to
-stderr to inform the user. If it does not support the requested
-operation (e.g., a read-only store), it should silently ignore the
-request.
-
-If a helper receives any other operation, it should silently ignore the
-request. This leaves room for future operations to be added (older
-helpers will just ignore the new requests).
-
-See also
---------
-
-linkgit:gitcredentials[7]
-
-linkgit:git-config[1] (See configuration variables `credential.*`)
diff --git a/Documentation/technical/api-diff.txt b/Documentation/technical/api-diff.txt
deleted file mode 100644
index 30fc0e9c93..0000000000
--- a/Documentation/technical/api-diff.txt
+++ /dev/null
@@ -1,174 +0,0 @@
-diff API
-========
-
-The diff API is for programs that compare two sets of files (e.g. two
-trees, one tree and the index) and present the found difference in
-various ways.  The calling program is responsible for feeding the API
-pairs of files, one from the "old" set and the corresponding one from
-"new" set, that are different.  The library called through this API is
-called diffcore, and is responsible for two things.
-
-* finding total rewrites (`-B`), renames (`-M`) and copies (`-C`), and
-  changes that touch a string (`-S`), as specified by the caller.
-
-* outputting the differences in various formats, as specified by the
-  caller.
-
-Calling sequence
-----------------
-
-* Prepare `struct diff_options` to record the set of diff options, and
-  then call `repo_diff_setup()` to initialize this structure.  This
-  sets up the vanilla default.
-
-* Fill in the options structure to specify desired output format, rename
-  detection, etc.  `diff_opt_parse()` can be used to parse options given
-  from the command line in a way consistent with existing git-diff
-  family of programs.
-
-* Call `diff_setup_done()`; this inspects the options set up so far for
-  internal consistency and make necessary tweaking to it (e.g. if
-  textual patch output was asked, recursive behaviour is turned on);
-  the callback set_default in diff_options can be used to tweak this more.
-
-* As you find different pairs of files, call `diff_change()` to feed
-  modified files, `diff_addremove()` to feed created or deleted files,
-  or `diff_unmerge()` to feed a file whose state is 'unmerged' to the
-  API.  These are thin wrappers to a lower-level `diff_queue()` function
-  that is flexible enough to record any of these kinds of changes.
-
-* Once you finish feeding the pairs of files, call `diffcore_std()`.
-  This will tell the diffcore library to go ahead and do its work.
-
-* Calling `diff_flush()` will produce the output.
-
-
-Data structures
----------------
-
-* `struct diff_filespec`
-
-This is the internal representation for a single file (blob).  It
-records the blob object name (if known -- for a work tree file it
-typically is a NUL SHA-1), filemode and pathname.  This is what the
-`diff_addremove()`, `diff_change()` and `diff_unmerge()` synthesize and
-feed `diff_queue()` function with.
-
-* `struct diff_filepair`
-
-This records a pair of `struct diff_filespec`; the filespec for a file
-in the "old" set (i.e. preimage) is called `one`, and the filespec for a
-file in the "new" set (i.e. postimage) is called `two`.  A change that
-represents file creation has NULL in `one`, and file deletion has NULL
-in `two`.
-
-A `filepair` starts pointing at `one` and `two` that are from the same
-filename, but `diffcore_std()` can break pairs and match component
-filespecs with other filespecs from a different filepair to form new
-filepair.  This is called 'rename detection'.
-
-* `struct diff_queue`
-
-This is a collection of filepairs.  Notable members are:
-
-`queue`::
-
-	An array of pointers to `struct diff_filepair`.  This
-	dynamically grows as you add filepairs;
-
-`alloc`::
-
-	The allocated size of the `queue` array;
-
-`nr`::
-
-	The number of elements in the `queue` array.
-
-
-* `struct diff_options`
-
-This describes the set of options the calling program wants to affect
-the operation of diffcore library with.
-
-Notable members are:
-
-`output_format`::
-	The output format used when `diff_flush()` is run.
-
-`context`::
-	Number of context lines to generate in patch output.
-
-`break_opt`, `detect_rename`, `rename-score`, `rename_limit`::
-	Affects the way detection logic for complete rewrites, renames
-	and copies.
-
-`abbrev`::
-	Number of hexdigits to abbreviate raw format output to.
-
-`pickaxe`::
-	A constant string (can and typically does contain newlines to
-	look for a block of text, not just a single line) to filter out
-	the filepairs that do not change the number of strings contained
-	in its preimage and postimage of the diff_queue.
-
-`flags`::
-	This is mostly a collection of boolean options that affects the
-	operation, but some do not have anything to do with the diffcore
-	library.
-
-`touched_flags`::
-	Records whether a flag has been changed due to user request
-	(rather than just set/unset by default).
-
-`set_default`::
-	Callback which allows tweaking the options in diff_setup_done().
-
-BINARY, TEXT;;
-	Affects the way how a file that is seemingly binary is treated.
-
-FULL_INDEX;;
-	Tells the patch output format not to use abbreviated object
-	names on the "index" lines.
-
-FIND_COPIES_HARDER;;
-	Tells the diffcore library that the caller is feeding unchanged
-	filepairs to allow copies from unmodified files be detected.
-
-COLOR_DIFF;;
-	Output should be colored.
-
-COLOR_DIFF_WORDS;;
-	Output is a colored word-diff.
-
-NO_INDEX;;
-	Tells diff-files that the input is not tracked files but files
-	in random locations on the filesystem.
-
-ALLOW_EXTERNAL;;
-	Tells output routine that it is Ok to call user specified patch
-	output routine.  Plumbing disables this to ensure stable output.
-
-QUIET;;
-	Do not show any output.
-
-REVERSE_DIFF;;
-	Tells the library that the calling program is feeding the
-	filepairs reversed; `one` is two, and `two` is one.
-
-EXIT_WITH_STATUS;;
-	For communication between the calling program and the options
-	parser; tell the calling program to signal the presence of
-	difference using program exit code.
-
-HAS_CHANGES;;
-	Internal; used for optimization to see if there is any change.
-
-SILENT_ON_REMOVE;;
-	Affects if diff-files shows removed files.
-
-RECURSIVE, TREE_IN_RECURSIVE;;
-	Tells if tree traversal done by tree-diff should recursively
-	descend into a tree object pair that are different in preimage
-	and postimage set.
-
-(JC)
diff --git a/Documentation/technical/api-directory-listing.txt b/Documentation/technical/api-directory-listing.txt
deleted file mode 100644
index 76b6e4f71b..0000000000
--- a/Documentation/technical/api-directory-listing.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-directory listing API
-=====================
-
-The directory listing API is used to enumerate paths in the work tree,
-optionally taking `.git/info/exclude` and `.gitignore` files per
-directory into account.
-
-Data structure
---------------
-
-`struct dir_struct` structure is used to pass directory traversal
-options to the library and to record the paths discovered.  A single
-`struct dir_struct` is used regardless of whether or not the traversal
-recursively descends into subdirectories.
-
-The notable options are:
-
-`exclude_per_dir`::
-
-	The name of the file to be read in each directory for excluded
-	files (typically `.gitignore`).
-
-`flags`::
-
-	A bit-field of options:
-
-`DIR_SHOW_IGNORED`:::
-
-	Return just ignored files in `entries[]`, not untracked
-	files. This flag is mutually exclusive with
-	`DIR_SHOW_IGNORED_TOO`.
-
-`DIR_SHOW_IGNORED_TOO`:::
-
-	Similar to `DIR_SHOW_IGNORED`, but return ignored files in
-	`ignored[]` in addition to untracked files in
-	`entries[]`. This flag is mutually exclusive with
-	`DIR_SHOW_IGNORED`.
-
-`DIR_KEEP_UNTRACKED_CONTENTS`:::
-
-	Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if this is set, the
-	untracked contents of untracked directories are also returned in
-	`entries[]`.
-
-`DIR_SHOW_IGNORED_TOO_MODE_MATCHING`:::
-
-	Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if
-	this is set, returns ignored files and directories that match
-	an exclude pattern. If a directory matches an exclude pattern,
-	then the directory is returned and the contained paths are
-	not. A directory that does not match an exclude pattern will
-	not be returned even if all of its contents are ignored. In
-	this case, the contents are returned as individual entries.
-+
-If this is set, files and directories that explicitly match an ignore
-pattern are reported. Implicitly ignored directories (directories that
-do not match an ignore pattern, but whose contents are all ignored)
-are not reported, instead all of the contents are reported.
-
-`DIR_COLLECT_IGNORED`:::
-
-	Special mode for git-add. Return ignored files in `ignored[]` and
-	untracked files in `entries[]`. Only returns ignored files that match
-	pathspec exactly (no wildcards). Does not recurse into ignored
-	directories.
-
-`DIR_SHOW_OTHER_DIRECTORIES`:::
-
-	Include a directory that is not tracked.
-
-`DIR_HIDE_EMPTY_DIRECTORIES`:::
-
-	Do not include a directory that is not tracked and is empty.
-
-`DIR_NO_GITLINKS`:::
-
-	If set, recurse into a directory that looks like a Git
-	directory.  Otherwise it is shown as a directory.
-
-The result of the enumeration is left in these fields:
-
-`entries[]`::
-
-	An array of `struct dir_entry`, each element of which describes
-	a path.
-
-`nr`::
-
-	The number of members in `entries[]` array.
-
-`alloc`::
-
-	Internal use; keeps track of allocation of `entries[]` array.
-
-`ignored[]`::
-
-	An array of `struct dir_entry`, used for ignored paths with the
-	`DIR_SHOW_IGNORED_TOO` and `DIR_COLLECT_IGNORED` flags.
-
-`ignored_nr`::
-
-	The number of members in `ignored[]` array.
-
-Calling sequence
-----------------
-
-Note: index may be looked at for .gitignore files that are CE_SKIP_WORKTREE
-marked. If you to exclude files, make sure you have loaded index first.
-
-* Prepare `struct dir_struct dir` and clear it with `memset(&dir, 0,
-  sizeof(dir))`.
-
-* To add single exclude pattern, call `add_pattern_list()` and then
-  `add_pattern()`.
-
-* To add patterns from a file (e.g. `.git/info/exclude`), call
-  `add_patterns_from_file()` , and/or set `dir.exclude_per_dir`.  A
-  short-hand function `setup_standard_excludes()` can be used to set
-  up the standard set of exclude settings.
-
-* Set options described in the Data Structure section above.
-
-* Call `read_directory()`.
-
-* Use `dir.entries[]`.
-
-* Call `clear_directory()` when none of the contained elements are no longer in use.
-
-(JC)
diff --git a/Documentation/technical/api-error-handling.txt b/Documentation/technical/api-error-handling.txt
index ceeedd485c..8be4f4d0d6 100644
--- a/Documentation/technical/api-error-handling.txt
+++ b/Documentation/technical/api-error-handling.txt
@@ -1,8 +1,11 @@
 Error reporting in git
 ======================
 
-`die`, `usage`, `error`, and `warning` report errors of various
-kinds.
+`BUG`, `die`, `usage`, `error`, and `warning` report errors of
+various kinds.
+
+- `BUG` is for failed internal assertions that should never happen,
+  i.e. a bug in git itself.
 
 - `die` is for fatal application errors.  It prints a message to
   the user and exits with status 128.
@@ -20,6 +23,9 @@ kinds.
   without running into too many problems.  Like `error`, it
   returns -1 after reporting the situation to the caller.
 
+These reports will be logged via the trace2 facility. See the "error"
+event in link:api-trace2.txt[trace2 API].
+
 Customizable error handlers
 ---------------------------
 
diff --git a/Documentation/technical/api-gitattributes.txt b/Documentation/technical/api-gitattributes.txt
deleted file mode 100644
index 45f0df600f..0000000000
--- a/Documentation/technical/api-gitattributes.txt
+++ /dev/null
@@ -1,154 +0,0 @@
-gitattributes API
-=================
-
-gitattributes mechanism gives a uniform way to associate various
-attributes to set of paths.
-
-
-Data Structure
---------------
-
-`struct git_attr`::
-
-	An attribute is an opaque object that is identified by its name.
-	Pass the name to `git_attr()` function to obtain the object of
-	this type.  The internal representation of this structure is
-	of no interest to the calling programs.  The name of the
-	attribute can be retrieved by calling `git_attr_name()`.
-
-`struct attr_check_item`::
-
-	This structure represents one attribute and its value.
-
-`struct attr_check`::
-
-	This structure represents a collection of `attr_check_item`.
-	It is passed to `git_check_attr()` function, specifying the
-	attributes to check, and receives their values.
-
-
-Attribute Values
-----------------
-
-An attribute for a path can be in one of four states: Set, Unset,
-Unspecified or set to a string, and `.value` member of `struct
-attr_check_item` records it.  There are three macros to check these:
-
-`ATTR_TRUE()`::
-
-	Returns true if the attribute is Set for the path.
-
-`ATTR_FALSE()`::
-
-	Returns true if the attribute is Unset for the path.
-
-`ATTR_UNSET()`::
-
-	Returns true if the attribute is Unspecified for the path.
-
-If none of the above returns true, `.value` member points at a string
-value of the attribute for the path.
-
-
-Querying Specific Attributes
-----------------------------
-
-* Prepare `struct attr_check` using attr_check_initl()
-  function, enumerating the names of attributes whose values you are
-  interested in, terminated with a NULL pointer.  Alternatively, an
-  empty `struct attr_check` can be prepared by calling
-  `attr_check_alloc()` function and then attributes you want to
-  ask about can be added to it with `attr_check_append()`
-  function.
-
-* Call `git_check_attr()` to check the attributes for the path.
-
-* Inspect `attr_check` structure to see how each of the
-  attribute in the array is defined for the path.
-
-
-Example
--------
-
-To see how attributes "crlf" and "ident" are set for different paths.
-
-. Prepare a `struct attr_check` with two elements (because
-  we are checking two attributes):
-
-------------
-static struct attr_check *check;
-static void setup_check(void)
-{
-	if (check)
-		return; /* already done */
-	check = attr_check_initl("crlf", "ident", NULL);
-}
-------------
-
-. Call `git_check_attr()` with the prepared `struct attr_check`:
-
-------------
-	const char *path;
-
-	setup_check();
-	git_check_attr(path, check);
-------------
-
-. Act on `.value` member of the result, left in `check->items[]`:
-
-------------
-	const char *value = check->items[0].value;
-
-	if (ATTR_TRUE(value)) {
-		The attribute is Set, by listing only the name of the
-		attribute in the gitattributes file for the path.
-	} else if (ATTR_FALSE(value)) {
-		The attribute is Unset, by listing the name of the
-		attribute prefixed with a dash - for the path.
-	} else if (ATTR_UNSET(value)) {
-		The attribute is neither set nor unset for the path.
-	} else if (!strcmp(value, "input")) {
-		If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is
-		true, the value is a string set in the gitattributes
-		file for the path by saying "attr=value".
-	} else if (... other check using value as string ...) {
-		...
-	}
-------------
-
-To see how attributes in argv[] are set for different paths, only
-the first step in the above would be different.
-
-------------
-static struct attr_check *check;
-static void setup_check(const char **argv)
-{
-	check = attr_check_alloc();
-	while (*argv) {
-		struct git_attr *attr = git_attr(*argv);
-		attr_check_append(check, attr);
-		argv++;
-	}
-}
-------------
-
-
-Querying All Attributes
------------------------
-
-To get the values of all attributes associated with a file:
-
-* Prepare an empty `attr_check` structure by calling
-  `attr_check_alloc()`.
-
-* Call `git_all_attrs()`, which populates the `attr_check`
-  with the attributes attached to the path.
-
-* Iterate over the `attr_check.items[]` array to examine
-  the attribute names and values.  The name of the attribute
-  described by an `attr_check.items[]` object can be retrieved via
-  `git_attr_name(check->items[i].attr)`.  (Please note that no items
-  will be returned for unset attributes, so `ATTR_UNSET()` will return
-  false for all returned `attr_check.items[]` objects.)
-
-* Free the `attr_check` struct by calling `attr_check_free()`.
diff --git a/Documentation/technical/api-grep.txt b/Documentation/technical/api-grep.txt
deleted file mode 100644
index a69cc8964d..0000000000
--- a/Documentation/technical/api-grep.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-grep API
-========
-
-Talk about <grep.h>, things like:
-
-* grep_buffer()
-
-(JC)
diff --git a/Documentation/technical/api-history-graph.txt b/Documentation/technical/api-history-graph.txt
deleted file mode 100644
index d0d1707c8c..0000000000
--- a/Documentation/technical/api-history-graph.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-history graph API
-=================
-
-The graph API is used to draw a text-based representation of the commit
-history.  The API generates the graph in a line-by-line fashion.
-
-Functions
----------
-
-Core functions:
-
-* `graph_init()` creates a new `struct git_graph`
-
-* `graph_update()` moves the graph to a new commit.
-
-* `graph_next_line()` outputs the next line of the graph into a strbuf.  It
-  does not add a terminating newline.
-
-* `graph_padding_line()` outputs a line of vertical padding in the graph.  It
-  is similar to `graph_next_line()`, but is guaranteed to never print the line
-  containing the current commit.  Where `graph_next_line()` would print the
-  commit line next, `graph_padding_line()` prints a line that simply extends
-  all branch lines downwards one row, leaving their positions unchanged.
-
-* `graph_is_commit_finished()` determines if the graph has output all lines
-  necessary for the current commit.  If `graph_update()` is called before all
-  lines for the current commit have been printed, the next call to
-  `graph_next_line()` will output an ellipsis, to indicate that a portion of
-  the graph was omitted.
-
-The following utility functions are wrappers around `graph_next_line()` and
-`graph_is_commit_finished()`.  They always print the output to stdout.
-They can all be called with a NULL graph argument, in which case no graph
-output will be printed.
-
-* `graph_show_commit()` calls `graph_next_line()` and
-  `graph_is_commit_finished()` until one of them return non-zero.  This prints
-  all graph lines up to, and including, the line containing this commit.
-  Output is printed to stdout.  The last line printed does not contain a
-  terminating newline.
-
-* `graph_show_oneline()` calls `graph_next_line()` and prints the result to
-  stdout.  The line printed does not contain a terminating newline.
-
-* `graph_show_padding()` calls `graph_padding_line()` and prints the result to
-  stdout.  The line printed does not contain a terminating newline.
-
-* `graph_show_remainder()` calls `graph_next_line()` until
-  `graph_is_commit_finished()` returns non-zero.  Output is printed to stdout.
-  The last line printed does not contain a terminating newline.  Returns 1 if
-  output was printed, and 0 if no output was necessary.
-
-* `graph_show_strbuf()` prints the specified strbuf to stdout, prefixing all
-  lines but the first with a graph line.  The caller is responsible for
-  ensuring graph output for the first line has already been printed to stdout.
-  (This can be done with `graph_show_commit()` or `graph_show_oneline()`.)  If
-  a NULL graph is supplied, the strbuf is printed as-is.
-
-* `graph_show_commit_msg()` is similar to `graph_show_strbuf()`, but it also
-  prints the remainder of the graph, if more lines are needed after the strbuf
-  ends.  It is better than directly calling `graph_show_strbuf()` followed by
-  `graph_show_remainder()` since it properly handles buffers that do not end in
-  a terminating newline.  The output printed by `graph_show_commit_msg()` will
-  end in a newline if and only if the strbuf ends in a newline.
-
-Data structure
---------------
-`struct git_graph` is an opaque data type used to store the current graph
-state.
-
-Calling sequence
-----------------
-
-* Create a `struct git_graph` by calling `graph_init()`.  When using the
-  revision walking API, this is done automatically by `setup_revisions()` if
-  the '--graph' option is supplied.
-
-* Use the revision walking API to walk through a group of contiguous commits.
-  The `get_revision()` function automatically calls `graph_update()` each time
-  it is invoked.
-
-* For each commit, call `graph_next_line()` repeatedly, until
-  `graph_is_commit_finished()` returns non-zero.  Each call to
-  `graph_next_line()` will output a single line of the graph.  The resulting
-  lines will not contain any newlines.  `graph_next_line()` returns 1 if the
-  resulting line contains the current commit, or 0 if this is merely a line
-  needed to adjust the graph before or after the current commit.  This return
-  value can be used to determine where to print the commit summary information
-  alongside the graph output.
-
-Limitations
------------
-
-* `graph_update()` must be called with commits in topological order.  It should
-  not be called on a commit if it has already been invoked with an ancestor of
-  that commit, or the graph output will be incorrect.
-
-* `graph_update()` must be called on a contiguous group of commits.  If
-  `graph_update()` is called on a particular commit, it should later be called
-  on all parents of that commit.  Parents must not be skipped, or the graph
-  output will appear incorrect.
-+
-`graph_update()` may be used on a pruned set of commits only if the parent list
-has been rewritten so as to include only ancestors from the pruned set.
-
-* The graph API does not currently support reverse commit ordering.  In
-  order to implement reverse ordering, the graphing API needs an
-  (efficient) mechanism to find the children of a commit.
-
-Sample usage
-------------
-
-------------
-struct commit *commit;
-struct git_graph *graph = graph_init(opts);
-
-while ((commit = get_revision(opts)) != NULL) {
-	while (!graph_is_commit_finished(graph))
-	{
-		struct strbuf sb;
-		int is_commit_line;
-
-		strbuf_init(&sb, 0);
-		is_commit_line = graph_next_line(graph, &sb);
-		fputs(sb.buf, stdout);
-
-		if (is_commit_line)
-			log_tree_commit(opts, commit);
-		else
-			putchar(opts->diffopt.line_termination);
-	}
-}
-------------
-
-Sample output
--------------
-
-The following is an example of the output from the graph API.  This output does
-not include any commit summary information--callers are responsible for
-outputting that information, if desired.
-
-------------
-*
-*
-*
-|\
-* |
-| | *
-| \ \
-|  \ \
-*-. \ \
-|\ \ \ \
-| | * | |
-| | | | | *
-| | | | | *
-| | | | | *
-| | | | | |\
-| | | | | | *
-| * | | | | |
-| | | | | *  \
-| | | | | |\  |
-| | | | * | | |
-| | | | * | | |
-* | | | | | | |
-| |/ / / / / /
-|/| / / / / /
-* | | | | | |
-|/ / / / / /
-* | | | | |
-| | | | | *
-| | | | |/
-| | | | *
-------------
diff --git a/Documentation/technical/api-merge.txt b/Documentation/technical/api-merge.txt
index 9dc1bed768..487d4d83ff 100644
--- a/Documentation/technical/api-merge.txt
+++ b/Documentation/technical/api-merge.txt
@@ -28,77 +28,9 @@ and `diff.c` for examples.
 
 * `struct ll_merge_options`
 
-This describes the set of options the calling program wants to affect
-the operation of a low-level (single file) merge.  Some options:
-
-`virtual_ancestor`::
-	Behave as though this were part of a merge between common
-	ancestors in a recursive merge.
-	If a helper program is specified by the
-	`[merge "<driver>"] recursive` configuration, it will
-	be used (see linkgit:gitattributes[5]).
-
-`variant`::
-	Resolve local conflicts automatically in favor
-	of one side or the other (as in 'git merge-file'
-	`--ours`/`--theirs`/`--union`).  Can be `0`,
-	`XDL_MERGE_FAVOR_OURS`, `XDL_MERGE_FAVOR_THEIRS`, or
-	`XDL_MERGE_FAVOR_UNION`.
-
-`renormalize`::
-	Resmudge and clean the "base", "theirs" and "ours" files
-	before merging.  Use this when the merge is likely to have
-	overlapped with a change in smudge/clean or end-of-line
-	normalization rules.
+Check ll-merge.h for details.
 
 Low-level (single file) merge
 -----------------------------
 
-`ll_merge`::
-
-	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.
-
-Calling sequence:
-
-* Prepare a `struct ll_merge_options` to record options.
-  If you have no special requests, skip this and pass `NULL`
-  as the `opts` parameter to use the default options.
-
-* Allocate an mmbuffer_t variable for the result.
-
-* Allocate and fill variables with the file's original content
-  and two modified versions (using `read_mmfile`, for example).
-
-* Call `ll_merge()`.
-
-* Read the merged content from `result_buf.ptr` and `result_buf.size`.
-
-* Release buffers when finished.  A simple
-  `free(ancestor.ptr); free(ours.ptr); free(theirs.ptr);
-  free(result_buf.ptr);` will do.
-
-If the modifications do not merge cleanly, `ll_merge` will return a
-nonzero value and `result_buf` will generally include a description of
-the conflict bracketed by markers such as the traditional `<<<<<<<`
-and `>>>>>>>`.
-
-The `ancestor_label`, `our_label`, and `their_label` parameters are
-used to label the different sides of a conflict if the merge driver
-supports this.
-
-Everything else
----------------
-
-Talk about <merge-recursive.h> and merge_file():
-
- - merge_trees() to merge with rename detection
- - merge_recursive() for ancestor consolidation
- - try_merge_command() for other strategies
- - conflict format
- - merge options
-
-(Daniel, Miklos, Stephan, JC)
+Check ll-merge.h for details.
diff --git a/Documentation/technical/api-object-access.txt b/Documentation/technical/api-object-access.txt
deleted file mode 100644
index 5b29622d00..0000000000
--- a/Documentation/technical/api-object-access.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-object access API
-=================
-
-Talk about <sha1-file.c> and <object.h> family, things like
-
-* read_sha1_file()
-* read_object_with_reference()
-* has_sha1_file()
-* write_sha1_file()
-* pretend_object_file()
-* lookup_{object,commit,tag,blob,tree}
-* parse_{object,commit,tag,blob,tree}
-* Use of object flags
-
-(JC, Shawn, Daniel, Dscho, Linus)
diff --git a/Documentation/technical/api-oid-array.txt b/Documentation/technical/api-oid-array.txt
deleted file mode 100644
index c97428c2c3..0000000000
--- a/Documentation/technical/api-oid-array.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-oid-array API
-==============
-
-The oid-array API provides storage and manipulation of sets of object
-identifiers. The emphasis is on storage and processing efficiency,
-making them suitable for large lists. Note that the ordering of items is
-not preserved over some operations.
-
-Data Structures
----------------
-
-`struct oid_array`::
-
-	A single array of object IDs. This should be initialized by
-	assignment from `OID_ARRAY_INIT`.  The `oid` member contains
-	the actual data. The `nr` member contains the number of items in
-	the set.  The `alloc` and `sorted` members are used internally,
-	and should not be needed by API callers.
-
-Functions
----------
-
-`oid_array_append`::
-	Add an item to the set. The object ID will be placed at the end of
-	the array (but note that some operations below may lose this
-	ordering).
-
-`oid_array_lookup`::
-	Perform a binary search of the array for a specific object ID.
-	If found, returns the offset (in number of elements) of the
-	object ID. If not found, returns a negative integer. If the array
-	is not sorted, this function has the side effect of sorting it.
-
-`oid_array_clear`::
-	Free all memory associated with the array and return it to the
-	initial, empty state.
-
-`oid_array_for_each`::
-	Iterate over each element of the list, executing the callback
-	function for each one. Does not sort the list, so any custom
-	hash order is retained. If the callback returns a non-zero
-	value, the iteration ends immediately and the callback's
-	return is propagated; otherwise, 0 is returned.
-
-`oid_array_for_each_unique`::
-	Iterate over each unique element of the list in sorted order,
-	but otherwise behave like `oid_array_for_each`. If the array
-	is not sorted, this function has the side effect of sorting
-	it.
-
-`oid_array_filter`::
-	Apply the callback function `want` to each entry in the array,
-	retaining only the entries for which the function returns true.
-	Preserve the order of the entries that are retained.
-
-Examples
---------
-
------------------------------------------
-int print_callback(const struct object_id *oid,
-		    void *data)
-{
-	printf("%s\n", oid_to_hex(oid));
-	return 0; /* always continue */
-}
-
-void some_func(void)
-{
-	struct sha1_array hashes = OID_ARRAY_INIT;
-	struct object_id oid;
-
-	/* Read objects into our set */
-	while (read_object_from_stdin(oid.hash))
-		oid_array_append(&hashes, &oid);
-
-	/* Check if some objects are in our set */
-	while (read_object_from_stdin(oid.hash)) {
-		if (oid_array_lookup(&hashes, &oid) >= 0)
-			printf("it's in there!\n");
-
-	/*
-	 * Print the unique set of objects. We could also have
-	 * avoided adding duplicate objects in the first place,
-	 * but we would end up re-sorting the array repeatedly.
-	 * Instead, this will sort once and then skip duplicates
-	 * in linear time.
-	 */
-	oid_array_for_each_unique(&hashes, print_callback, NULL);
-}
------------------------------------------
diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt
index 2e2e7c10c6..5a60bbfa7f 100644
--- a/Documentation/technical/api-parse-options.txt
+++ b/Documentation/technical/api-parse-options.txt
@@ -232,9 +232,9 @@ There are some macros to easily define options:
 	will be overwritten, so this should only be used for options where
 	the last one specified on the command line wins.
 
-`OPT_PASSTHRU_ARGV(short, long, &argv_array_var, arg_str, description, flags)`::
+`OPT_PASSTHRU_ARGV(short, long, &strvec_var, arg_str, description, flags)`::
 	Introduce an option where all instances of it on the command-line will
-	be reconstructed into an argv_array. This is useful when you need to
+	be reconstructed into a strvec. This is useful when you need to
 	pass the command-line option, which can be specified multiple times,
 	to another command.
 
diff --git a/Documentation/technical/api-quote.txt b/Documentation/technical/api-quote.txt
deleted file mode 100644
index e8a1bce94e..0000000000
--- a/Documentation/technical/api-quote.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-quote API
-=========
-
-Talk about <quote.h>, things like
-
-* sq_quote and unquote
-* c_style quote and unquote
-* quoting for foreign languages
-
-(JC)
diff --git a/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt
deleted file mode 100644
index ad9d019ff9..0000000000
--- a/Documentation/technical/api-ref-iteration.txt
+++ /dev/null
@@ -1,78 +0,0 @@
-ref iteration API
-=================
-
-
-Iteration of refs is done by using an iterate function which will call a
-callback function for every ref. The callback function has this
-signature:
-
-	int handle_one_ref(const char *refname, const struct object_id *oid,
-			   int flags, void *cb_data);
-
-There are different kinds of iterate functions which all take a
-callback of this type. The callback is then called for each found ref
-until the callback returns nonzero. The returned value is then also
-returned by the iterate function.
-
-Iteration functions
--------------------
-
-* `head_ref()` just iterates the head ref.
-
-* `for_each_ref()` iterates all refs.
-
-* `for_each_ref_in()` iterates all refs which have a defined prefix and
-  strips that prefix from the passed variable refname.
-
-* `for_each_tag_ref()`, `for_each_branch_ref()`, `for_each_remote_ref()`,
-  `for_each_replace_ref()` iterate refs from the respective area.
-
-* `for_each_glob_ref()` iterates all refs that match the specified glob
-  pattern.
-
-* `for_each_glob_ref_in()` the previous and `for_each_ref_in()` combined.
-
-* Use `refs_` API for accessing submodules. The submodule ref store could
-  be obtained with `get_submodule_ref_store()`.
-
-* `for_each_rawref()` can be used to learn about broken ref and symref.
-
-* `for_each_reflog()` iterates each reflog file.
-
-Submodules
-----------
-
-If you want to iterate the refs of a submodule you first need to add the
-submodules object database. You can do this by a code-snippet like
-this:
-
-	const char *path = "path/to/submodule"
-	if (add_submodule_odb(path))
-		die("Error submodule '%s' not populated.", path);
-
-`add_submodule_odb()` will return zero on success. If you
-do not do this you will get an error for each ref that it does not point
-to a valid object.
-
-Note: As a side-effect of this you cannot safely assume that all
-objects you lookup are available in superproject. All submodule objects
-will be available the same way as the superprojects objects.
-
-Example:
---------
-
-----
-static int handle_remote_ref(const char *refname,
-		const unsigned char *sha1, int flags, void *cb_data)
-{
-	struct strbuf *output = cb_data;
-	strbuf_addf(output, "%s\n", refname);
-	return 0;
-}
-
-...
-
-	struct strbuf output = STRBUF_INIT;
-	for_each_remote_ref(handle_remote_ref, &output);
-	printf("%s", output.buf);
-----
diff --git a/Documentation/technical/api-remote.txt b/Documentation/technical/api-remote.txt
deleted file mode 100644
index f10941b2e8..0000000000
--- a/Documentation/technical/api-remote.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-Remotes configuration API
-=========================
-
-The API in remote.h gives access to the configuration related to
-remotes. It handles all three configuration mechanisms historically
-and currently used by Git, and presents the information in a uniform
-fashion. Note that the code also handles plain URLs without any
-configuration, giving them just the default information.
-
-struct remote
--------------
-
-`name`::
-
-	The user's nickname for the remote
-
-`url`::
-
-	An array of all of the url_nr URLs configured for the remote
-
-`pushurl`::
-
-	An array of all of the pushurl_nr push URLs configured for the remote
-
-`push`::
-
-	 An array of refspecs configured for pushing, with
-	 push_refspec being the literal strings, and push_refspec_nr
-	 being the quantity.
-
-`fetch`::
-
-	An array of refspecs configured for fetching, with
-	fetch_refspec being the literal strings, and fetch_refspec_nr
-	being the quantity.
-
-`fetch_tags`::
-
-	The setting for whether to fetch tags (as a separate rule from
-	the configured refspecs); -1 means never to fetch tags, 0
-	means to auto-follow tags based on the default heuristic, 1
-	means to always auto-follow tags, and 2 means to fetch all
-	tags.
-
-`receivepack`, `uploadpack`::
-
-	The configured helper programs to run on the remote side, for
-	Git-native protocols.
-
-`http_proxy`::
-
-	The proxy to use for curl (http, https, ftp, etc.) URLs.
-
-`http_proxy_authmethod`::
-
-	The method used for authenticating against `http_proxy`.
-
-struct remotes can be found by name with remote_get(), and iterated
-through with for_each_remote(). remote_get(NULL) will return the
-default remote, given the current branch and configuration.
-
-struct refspec
---------------
-
-A struct refspec holds the parsed interpretation of a refspec.  If it
-will force updates (starts with a '+'), force is true.  If it is a
-pattern (sides end with '*') pattern is true.  src and dest are the
-two sides (including '*' characters if present); if there is only one
-side, it is src, and dst is NULL; if sides exist but are empty (i.e.,
-the refspec either starts or ends with ':'), the corresponding side is
-"".
-
-An array of strings can be parsed into an array of struct refspecs
-using parse_fetch_refspec() or parse_push_refspec().
-
-remote_find_tracking(), given a remote and a struct refspec with
-either src or dst filled out, will fill out the other such that the
-result is in the "fetch" specification for the remote (note that this
-evaluates patterns and returns a single result).
-
-struct branch
--------------
-
-Note that this may end up moving to branch.h
-
-struct branch holds the configuration for a branch. It can be looked
-up with branch_get(name) for "refs/heads/{name}", or with
-branch_get(NULL) for HEAD.
-
-It contains:
-
-`name`::
-
-	The short name of the branch.
-
-`refname`::
-
-	The full path for the branch ref.
-
-`remote_name`::
-
-	The name of the remote listed in the configuration.
-
-`merge_name`::
-
-	An array of the "merge" lines in the configuration.
-
-`merge`::
-
-	An array of the struct refspecs used for the merge lines. That
-	is, merge[i]->dst is a local tracking ref which should be
-	merged into this branch by default.
-
-`merge_nr`::
-
-	The number of merge configurations
-
-branch_has_merge_config() returns true if the given branch has merge
-configuration given.
-
-Other stuff
------------
-
-There is other stuff in remote.h that is related, in general, to the
-process of interacting with remotes.
-
-(Daniel Barkalow)
diff --git a/Documentation/technical/api-revision-walking.txt b/Documentation/technical/api-revision-walking.txt
deleted file mode 100644
index 03f9ea6ac4..0000000000
--- a/Documentation/technical/api-revision-walking.txt
+++ /dev/null
@@ -1,72 +0,0 @@
-revision walking API
-====================
-
-The revision walking API offers functions to build a list of revisions
-and then iterate over that list.
-
-Calling sequence
-----------------
-
-The walking API has a given calling sequence: first you need to
-initialize a rev_info structure, then add revisions to control what kind
-of revision list do you want to get, finally you can iterate over the
-revision list.
-
-Functions
----------
-
-`repo_init_revisions`::
-
-	Initialize a rev_info structure with default values. The third
-	parameter may be NULL or can be prefix path, and then the `.prefix`
-	variable will be set to it. This is typically the first function you
-	want to call when you want to deal with a revision list. After calling
-	this function, you are free to customize options, like set
-	`.ignore_merges` to 0 if you don't want to ignore merges, and so on. See
-	`revision.h` for a complete list of available options.
-
-`add_pending_object`::
-
-	This function can be used if you want to add commit objects as revision
-	information. You can use the `UNINTERESTING` object flag to indicate if
-	you want to include or exclude the given commit (and commits reachable
-	from the given commit) from the revision list.
-+
-NOTE: If you have the commits as a string list then you probably want to
-use setup_revisions(), instead of parsing each string and using this
-function.
-
-`setup_revisions`::
-
-	Parse revision information, filling in the `rev_info` structure, and
-	removing the used arguments from the argument list. Returns the number
-	of arguments left that weren't recognized, which are also moved to the
-	head of the argument list. The last parameter is used in case no
-	parameter given by the first two arguments.
-
-`prepare_revision_walk`::
-
-	Prepares the rev_info structure for a walk. You should check if it
-	returns any error (non-zero return code) and if it does not, you can
-	start using get_revision() to do the iteration.
-
-`get_revision`::
-
-	Takes a pointer to a `rev_info` structure and iterates over it,
-	returning a `struct commit *` each time you call it. The end of the
-	revision list is indicated by returning a NULL pointer.
-
-`reset_revision_walk`::
-
-	Reset the flags used by the revision walking api. You can use
-	this to do multiple sequential revision walks.
-
-Data structures
----------------
-
-Talk about <revision.h>, things like:
-
-* two diff_options, one for path limiting, another for output;
-* remaining functions;
-
-(Linus, JC, Dscho)
diff --git a/Documentation/technical/api-run-command.txt b/Documentation/technical/api-run-command.txt
deleted file mode 100644
index 8bf3e37f53..0000000000
--- a/Documentation/technical/api-run-command.txt
+++ /dev/null
@@ -1,264 +0,0 @@
-run-command API
-===============
-
-The run-command API offers a versatile tool to run sub-processes with
-redirected input and output as well as with a modified environment
-and an alternate current directory.
-
-A similar API offers the capability to run a function asynchronously,
-which is primarily used to capture the output that the function
-produces in the caller in order to process it.
-
-
-Functions
----------
-
-`child_process_init`::
-
-	Initialize a struct child_process variable.
-
-`start_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.
-
-`finish_command`::
-
-	Wait for the completion of a sub-process that was started with
-	start_command().
-
-`run_command`::
-
-	A convenience function that encapsulates a sequence of
-	start_command() followed by finish_command(). Takes a pointer
-	to a `struct child_process` that specifies the details.
-
-`run_command_v_opt`, `run_command_v_opt_cd_env`::
-
-	Convenience functions that encapsulate a sequence of
-	start_command() followed by finish_command(). The argument argv
-	specifies the program and its arguments. The argument opt is zero
-	or more of the flags `RUN_COMMAND_NO_STDIN`, `RUN_GIT_CMD`,
-	`RUN_COMMAND_STDOUT_TO_STDERR`, or `RUN_SILENT_EXEC_FAILURE`
-	that correspond to the members .no_stdin, .git_cmd,
-	.stdout_to_stderr, .silent_exec_failure of `struct child_process`.
-	The argument dir corresponds the member .dir. The argument env
-	corresponds to the member .env.
-
-`child_process_clear`::
-
-	Release the memory associated with the struct child_process.
-	Most users of the run-command API don't need to call this
-	function explicitly because `start_command` invokes it on
-	failure and `finish_command` calls it automatically already.
-
-The functions above do the following:
-
-. If a system call failed, errno is set and -1 is returned. A diagnostic
-  is printed.
-
-. If the program was not found, then -1 is returned and errno is set to
-  ENOENT; a diagnostic is printed only if .silent_exec_failure is 0.
-
-. Otherwise, the program is run. If it terminates regularly, its exit
-  code is returned. No diagnostic is printed, even if the exit code is
-  non-zero.
-
-. If the program terminated due to a signal, then the return value is the
-  signal number + 128, ie. the same value that a POSIX shell's $? would
-  report.  A diagnostic is printed.
-
-
-`start_async`::
-
-	Run a function asynchronously. Takes a pointer to a `struct
-	async` that specifies the details and returns a set of pipe FDs
-	for communication with the function. See below for details.
-
-`finish_async`::
-
-	Wait for the completion of an asynchronous function that was
-	started with start_async().
-
-`run_hook`::
-
-	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.
-	(See below.)
-
-
-Data structures
----------------
-
-* `struct child_process`
-
-This describes the arguments, redirections, and environment of a
-command to run in a sub-process.
-
-The caller:
-
-1. allocates and clears (using child_process_init() or
-   CHILD_PROCESS_INIT) a struct child_process variable;
-2. initializes the members;
-3. calls start_command();
-4. processes the data;
-5. closes file descriptors (if necessary; see below);
-6. calls finish_command().
-
-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.
-
-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
-`argv_array` (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).
-
-The members .in, .out, .err are used to redirect stdin, stdout,
-stderr as follows:
-
-. Specify 0 to request no special redirection. No new file descriptor
-  is allocated. The child process simply inherits the channel from the
-  parent.
-
-. Specify -1 to have a pipe allocated; start_command() replaces -1
-  by the pipe FD in the following way:
-
-	.in: Returns the writable pipe end into which the caller writes;
-		the readable end of the pipe becomes the child's stdin.
-
-	.out, .err: Returns the readable pipe end from which the caller
-		reads; the writable end of the pipe end becomes child's
-		stdout/stderr.
-
-  The caller of start_command() must close the so returned FDs
-  after it has completed reading from/writing to it!
-
-. Specify a file descriptor > 0 to be used by the child:
-
-	.in: The FD must be readable; it becomes child's stdin.
-	.out: The FD must be writable; it becomes child's stdout.
-	.err: The FD must be writable; it becomes child's stderr.
-
-  The specified FD is closed by start_command(), even if it fails to
-  run the sub-process!
-
-. Special forms of redirection are available by setting these members
-  to 1:
-
-	.no_stdin, .no_stdout, .no_stderr: The respective channel is
-		redirected to /dev/null.
-
-	.stdout_to_stderr: stdout of the child is redirected to its
-		stderr. This happens after stderr is itself redirected.
-		So stdout will follow stderr to wherever it is
-		redirected.
-
-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 `argv_array` (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).
-
-To specify a new initial working directory for the sub-process,
-specify it in the .dir member.
-
-If the program cannot be found, the functions return -1 and set
-errno to ENOENT. Normally, an error message is printed, but if
-.silent_exec_failure is set to 1, no message is printed for this
-special error condition.
-
-
-* `struct async`
-
-This describes a function to run asynchronously, whose purpose is
-to produce output that the caller reads.
-
-The caller:
-
-1. allocates and clears (memset(&asy, 0, sizeof(asy));) a
-   struct async variable;
-2. initializes .proc and .data;
-3. calls start_async();
-4. processes communicates with proc through .in and .out;
-5. closes .in and .out;
-6. calls finish_async().
-
-The members .in, .out are used to provide a set of fd's for
-communication between the caller and the callee as follows:
-
-. Specify 0 to have no file descriptor passed.  The callee will
-  receive -1 in the corresponding argument.
-
-. Specify < 0 to have a pipe allocated; start_async() replaces
-  with the pipe FD in the following way:
-
-	.in: Returns the writable pipe end into which the caller
-	writes; the readable end of the pipe becomes the function's
-	in argument.
-
-	.out: Returns the readable pipe end from which the caller
-	reads; the writable end of the pipe becomes the function's
-	out argument.
-
-  The caller of start_async() must close the returned FDs after it
-  has completed reading from/writing from them.
-
-. Specify a file descriptor > 0 to be used by the function:
-
-	.in: The FD must be readable; it becomes the function's in.
-	.out: The FD must be writable; it becomes the function's out.
-
-  The specified FD is closed by start_async(), even if it fails to
-  run the function.
-
-The function pointer in .proc has the following signature:
-
-	int proc(int in, int out, void *data);
-
-. in, out specifies a set of file descriptors to which the function
-  must read/write the data that it needs/produces.  The function
-  *must* close these descriptors before it returns.  A descriptor
-  may be -1 if the caller did not configure a descriptor for that
-  direction.
-
-. data is the value that the caller has specified in the .data member
-  of struct async.
-
-. The return value of the function is 0 on success and non-zero
-  on failure. If the function indicates failure, finish_async() will
-  report failure as well.
-
-
-There are serious restrictions on what the asynchronous function can do
-because this facility is implemented by a thread in the same address
-space on most platforms (when pthreads is available), but by a pipe to
-a forked process otherwise:
-
-. It cannot change the program's state (global variables, environment,
-  etc.) in a way that the caller notices; in other words, .in and .out
-  are the only communication channels to the caller.
-
-. It must not change the program's state that the caller of the
-  facility also uses.
diff --git a/Documentation/technical/api-setup.txt b/Documentation/technical/api-setup.txt
deleted file mode 100644
index eb1fa9853e..0000000000
--- a/Documentation/technical/api-setup.txt
+++ /dev/null
@@ -1,47 +0,0 @@
-setup API
-=========
-
-Talk about
-
-* setup_git_directory()
-* setup_git_directory_gently()
-* is_inside_git_dir()
-* is_inside_work_tree()
-* setup_work_tree()
-
-(Dscho)
-
-Pathspec
---------
-
-See glossary-context.txt for the syntax of pathspec. In memory, a
-pathspec set is represented by "struct pathspec" and is prepared by
-parse_pathspec(). This function takes several arguments:
-
-- magic_mask specifies what features that are NOT supported by the
-  following code. If a user attempts to use such a feature,
-  parse_pathspec() can reject it early.
-
-- flags specifies other things that the caller wants parse_pathspec to
-  perform.
-
-- prefix and args come from cmd_* functions
-
-parse_pathspec() helps catch unsupported features and reject them
-politely. At a lower level, different pathspec-related functions may
-not support the same set of features. Such pathspec-sensitive
-functions are guarded with GUARD_PATHSPEC(), which will die in an
-unfriendly way when an unsupported feature is requested.
-
-The command designers are supposed to make sure that GUARD_PATHSPEC()
-never dies. They have to make sure all unsupported features are caught
-by parse_pathspec(), not by GUARD_PATHSPEC. grepping GUARD_PATHSPEC()
-should give the designers all pathspec-sensitive codepaths and what
-features they support.
-
-A similar process is applied when a new pathspec magic is added. The
-designer lifts the GUARD_PATHSPEC restriction in the functions that
-support the new magic. At the same time (s)he has to make sure this
-new feature will be caught at parse_pathspec() in commands that cannot
-handle the new magic in some cases. grepping parse_pathspec() should
-help.
diff --git a/Documentation/technical/api-sigchain.txt b/Documentation/technical/api-sigchain.txt
deleted file mode 100644
index 9e1189ef01..0000000000
--- a/Documentation/technical/api-sigchain.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-sigchain API
-============
-
-Code often wants to set a signal handler to clean up temporary files or
-other work-in-progress when we die unexpectedly. For multiple pieces of
-code to do this without conflicting, each piece of code must remember
-the old value of the handler and restore it either when:
-
-  1. The work-in-progress is finished, and the handler is no longer
-     necessary. The handler should revert to the original behavior
-     (either another handler, SIG_DFL, or SIG_IGN).
-
-  2. The signal is received. We should then do our cleanup, then chain
-     to the next handler (or die if it is SIG_DFL).
-
-Sigchain is a tiny library for keeping a stack of handlers. Your handler
-and installation code should look something like:
-
-------------------------------------------
-  void clean_foo_on_signal(int sig)
-  {
-	  clean_foo();
-	  sigchain_pop(sig);
-	  raise(sig);
-  }
-
-  void other_func()
-  {
-	  sigchain_push_common(clean_foo_on_signal);
-	  mess_up_foo();
-	  clean_foo();
-  }
-------------------------------------------
-
-Handlers are given the typedef of sigchain_fun. This is the same type
-that is given to signal() or sigaction(). It is perfectly reasonable to
-push SIG_DFL or SIG_IGN onto the stack.
-
-You can sigchain_push and sigchain_pop individual signals. For
-convenience, sigchain_push_common will push the handler onto the stack
-for many common signals.
diff --git a/Documentation/technical/api-simple-ipc.txt b/Documentation/technical/api-simple-ipc.txt
new file mode 100644
index 0000000000..d79ad323e6
--- /dev/null
+++ b/Documentation/technical/api-simple-ipc.txt
@@ -0,0 +1,105 @@
+Simple-IPC API
+==============
+
+The Simple-IPC API is a collection of `ipc_` prefixed library routines
+and a basic communication protocol that allow an IPC-client process to
+send an application-specific IPC-request message to an IPC-server
+process and receive an application-specific IPC-response message.
+
+Communication occurs over a named pipe on Windows and a Unix domain
+socket on other platforms.  IPC-clients and IPC-servers rendezvous at
+a previously agreed-to application-specific pathname (which is outside
+the scope of this design) that is local to the computer system.
+
+The IPC-server routines within the server application process create a
+thread pool to listen for connections and receive request messages
+from multiple concurrent IPC-clients.  When received, these messages
+are dispatched up to the server application callbacks for handling.
+IPC-server routines then incrementally relay responses back to the
+IPC-client.
+
+The IPC-client routines within a client application process connect
+to the IPC-server and send a request message and wait for a response.
+When received, the response is returned back the caller.
+
+For example, the `fsmonitor--daemon` feature will be built as a server
+application on top of the IPC-server library routines.  It will have
+threads watching for file system events and a thread pool waiting for
+client connections.  Clients, such as `git status` will request a list
+of file system events since a point in time and the server will
+respond with a list of changed files and directories.  The formats of
+the request and response are application-specific; the IPC-client and
+IPC-server routines treat them as opaque byte streams.
+
+
+Comparison with sub-process model
+---------------------------------
+
+The Simple-IPC mechanism differs from the existing `sub-process.c`
+model (Documentation/technical/long-running-process-protocol.txt) and
+used by applications like Git-LFS.  In the LFS-style sub-process model
+the helper is started by the foreground process, communication happens
+via a pair of file descriptors bound to the stdin/stdout of the
+sub-process, the sub-process only serves the current foreground
+process, and the sub-process exits when the foreground process
+terminates.
+
+In the Simple-IPC model the server is a very long-running service.  It
+can service many clients at the same time and has a private socket or
+named pipe connection to each active client.  It might be started
+(on-demand) by the current client process or it might have been
+started by a previous client or by the OS at boot time.  The server
+process is not associated with a terminal and it persists after
+clients terminate.  Clients do not have access to the stdin/stdout of
+the server process and therefore must communicate over sockets or
+named pipes.
+
+
+Server startup and shutdown
+---------------------------
+
+How an application server based upon IPC-server is started is also
+outside the scope of the Simple-IPC design and is a property of the
+application using it.  For example, the server might be started or
+restarted during routine maintenance operations, or it might be
+started as a system service during the system boot-up sequence, or it
+might be started on-demand by a foreground Git command when needed.
+
+Similarly, server shutdown is a property of the application using
+the simple-ipc routines.  For example, the server might decide to
+shutdown when idle or only upon explicit request.
+
+
+Simple-IPC protocol
+-------------------
+
+The Simple-IPC protocol consists of a single request message from the
+client and an optional response message from the server.  Both the
+client and server messages are unlimited in length and are terminated
+with a flush packet.
+
+The pkt-line routines (Documentation/technical/protocol-common.txt)
+are used to simplify buffer management during message generation,
+transmission, and reception.  A flush packet is used to mark the end
+of the message.  This allows the sender to incrementally generate and
+transmit the message.  It allows the receiver to incrementally receive
+the message in chunks and to know when they have received the entire
+message.
+
+The actual byte format of the client request and server response
+messages are application specific.  The IPC layer transmits and
+receives them as opaque byte buffers without any concern for the
+content within.  It is the job of the calling application layer to
+understand the contents of the request and response messages.
+
+
+Summary
+-------
+
+Conceptually, the Simple-IPC protocol is similar to an HTTP REST
+request.  Clients connect, make an application-specific and
+stateless request, receive an application-specific
+response, and disconnect.  It is a one round trip facility for
+querying the server.  The Simple-IPC routines hide the socket,
+named pipe, and thread pool details and allow the application
+layer to focus on the application at hand.
diff --git a/Documentation/technical/api-submodule-config.txt b/Documentation/technical/api-submodule-config.txt
deleted file mode 100644
index fb06089393..0000000000
--- a/Documentation/technical/api-submodule-config.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-submodule config cache API
-==========================
-
-The submodule config cache API allows to read submodule
-configurations/information from specified revisions. Internally
-information is lazily read into a cache that is used to avoid
-unnecessary parsing of the same .gitmodules files. Lookups can be done by
-submodule path or name.
-
-Usage
------
-
-To initialize the cache with configurations from the worktree the caller
-typically first calls `gitmodules_config()` to read values from the
-worktree .gitmodules and then to overlay the local git config values
-`parse_submodule_config_option()` from the config parsing
-infrastructure.
-
-The caller can look up information about submodules by using the
-`submodule_from_path()` or `submodule_from_name()` functions. They return
-a `struct submodule` which contains the values. The API automatically
-initializes and allocates the needed infrastructure on-demand. If the
-caller does only want to lookup values from revisions the initialization
-can be skipped.
-
-If the internal cache might grow too big or when the caller is done with
-the API, all internally cached values can be freed with submodule_free().
-
-Data Structures
----------------
-
-`struct submodule`::
-
-	This structure is used to return the information about one
-	submodule for a certain revision. It is returned by the lookup
-	functions.
-
-Functions
----------
-
-`void submodule_free(struct repository *r)`::
-
-	Use these to free the internally cached values.
-
-`int parse_submodule_config_option(const char *var, const char *value)`::
-
-	Can be passed to the config parsing infrastructure to parse
-	local (worktree) submodule configurations.
-
-`const struct submodule *submodule_from_path(const unsigned char *treeish_name, const char *path)`::
-
-	Given a tree-ish in the superproject and a path, return the
-	submodule that is bound at the path in the named tree.
-
-`const struct submodule *submodule_from_name(const unsigned char *treeish_name, const char *name)`::
-
-	The same as above but lookup by name.
-
-Whenever a submodule configuration is parsed in `parse_submodule_config_option`
-via e.g. `gitmodules_config()`, it will overwrite the null_sha1 entry.
-So in the normal case, when HEAD:.gitmodules is parsed first and then overlayed
-with the repository configuration, the null_sha1 entry contains the local
-configuration of a submodule (e.g. consolidated values from local git
-configuration and the .gitmodules file in the worktree).
-
-For an example usage see test-submodule-config.c.
diff --git a/Documentation/technical/api-trace.txt b/Documentation/technical/api-trace.txt
deleted file mode 100644
index fadb5979c4..0000000000
--- a/Documentation/technical/api-trace.txt
+++ /dev/null
@@ -1,140 +0,0 @@
-trace API
-=========
-
-The trace API can be used to print debug messages to stderr or a file. Trace
-code is inactive unless explicitly enabled by setting `GIT_TRACE*` environment
-variables.
-
-The trace implementation automatically adds `timestamp file:line ... \n` to
-all trace messages. E.g.:
-
-------------
-23:59:59.123456 git.c:312               trace: built-in: git 'foo'
-00:00:00.000001 builtin/foo.c:99        foo: some message
-------------
-
-Data Structures
----------------
-
-`struct trace_key`::
-
-	Defines a trace key (or category). The default (for API functions that
-	don't take a key) is `GIT_TRACE`.
-+
-E.g. to define a trace key controlled by environment variable `GIT_TRACE_FOO`:
-+
-------------
-static struct trace_key trace_foo = TRACE_KEY_INIT(FOO);
-
-static void trace_print_foo(const char *message)
-{
-	trace_printf_key(&trace_foo, "%s", message);
-}
-------------
-+
-Note: don't use `const` as the trace implementation stores internal state in
-the `trace_key` structure.
-
-Functions
----------
-
-`int trace_want(struct trace_key *key)`::
-
-	Checks whether the trace key is enabled. Used to prevent expensive
-	string formatting before calling one of the printing APIs.
-
-`void trace_disable(struct trace_key *key)`::
-
-	Disables tracing for the specified key, even if the environment
-	variable was set.
-
-`void trace_printf(const char *format, ...)`::
-`void trace_printf_key(struct trace_key *key, const char *format, ...)`::
-
-	Prints a formatted message, similar to printf.
-
-`void trace_argv_printf(const char **argv, const char *format, ...)``::
-
-	Prints a formatted message, followed by a quoted list of arguments.
-
-`void trace_strbuf(struct trace_key *key, const struct strbuf *data)`::
-
-	Prints the strbuf, without additional formatting (i.e. doesn't
-	choke on `%` or even `\0`).
-
-`uint64_t getnanotime(void)`::
-
-	Returns nanoseconds since the epoch (01/01/1970), typically used
-	for performance measurements.
-+
-Currently there are high precision timer implementations for Linux (using
-`clock_gettime(CLOCK_MONOTONIC)`) and Windows (`QueryPerformanceCounter`).
-Other platforms use `gettimeofday` as time source.
-
-`void trace_performance(uint64_t nanos, const char *format, ...)`::
-`void trace_performance_since(uint64_t start, const char *format, ...)`::
-
-	Prints the elapsed time (in nanoseconds), or elapsed time since
-	`start`, followed by a formatted message. Enabled via environment
-	variable `GIT_TRACE_PERFORMANCE`. Used for manual profiling, e.g.:
-+
-------------
-uint64_t start = getnanotime();
-/* code section to measure */
-trace_performance_since(start, "foobar");
-------------
-+
-------------
-uint64_t t = 0;
-for (;;) {
-	/* ignore */
-	t -= getnanotime();
-	/* code section to measure */
-	t += getnanotime();
-	/* ignore */
-}
-trace_performance(t, "frotz");
-------------
-
-Bugs & Caveats
---------------
-
-GIT_TRACE_* environment variables can be used to tell Git to show
-trace output to its standard error stream. Git can often spawn a pager
-internally to run its subcommand and send its standard output and
-standard error to it.
-
-Because GIT_TRACE_PERFORMANCE trace is generated only at the very end
-of the program with atexit(), which happens after the pager exits, it
-would not work well if you send its log to the standard error output
-and let Git spawn the pager at the same time.
-
-As a work around, you can for example use '--no-pager', or set
-GIT_TRACE_PERFORMANCE to another file descriptor which is redirected
-to stderr, or set GIT_TRACE_PERFORMANCE to a file specified by its
-absolute path.
-
-For example instead of the following command which by default may not
-print any performance information:
-
-------------
-GIT_TRACE_PERFORMANCE=2 git log -1
-------------
-
-you may want to use:
-
-------------
-GIT_TRACE_PERFORMANCE=2 git --no-pager log -1
-------------
-
-or:
-
-------------
-GIT_TRACE_PERFORMANCE=3 3>&2 git log -1
-------------
-
-or:
-
-------------
-GIT_TRACE_PERFORMANCE=/path/to/log/file git log -1
-------------
diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt
index a045dbe422..b9f3198fbe 100644
--- a/Documentation/technical/api-trace2.txt
+++ b/Documentation/technical/api-trace2.txt
@@ -178,7 +178,7 @@ describe the simplified forms.
 
 == Public API
 
-All Trace2 API functions send a messsage to all of the active
+All Trace2 API functions send a message to all of the active
 Trace2 Targets.  This section describes the set of available
 messages.
 
@@ -188,261 +188,36 @@ purposes.
 === Basic Command Messages
 
 These are concerned with the lifetime of the overall git process.
-
-`void trace2_initialize_clock()`::
-
-	Initialize the Trace2 start clock and nothing else.  This should
-	be called at the very top of main() to capture the process start
-	time and reduce startup order dependencies.
-
-`void trace2_initialize()`::
-
-	Determines if any Trace2 Targets should be enabled and
-	initializes the Trace2 facility.  This includes setting up the
-	Trace2 thread local storage (TLS).
-+
-This function emits a "version" message containing the version of git
-and the Trace2 protocol.
-+
-This function should be called from `main()` as early as possible in
-the life of the process after essential process initialization.
-
-`int trace2_is_enabled()`::
-
-	Returns 1 if Trace2 is enabled (at least one target is
-	active).
-
-`void trace2_cmd_start(int argc, const char **argv)`::
-
-	Emits a "start" message containing the process command line
-	arguments.
-
-`int trace2_cmd_exit(int exit_code)`::
-
-	Emits an "exit" message containing the process exit-code and
-	elapsed time.
-+
-Returns the exit-code.
-
-`void trace2_cmd_error(const char *fmt, va_list ap)`::
-
-	Emits an "error" message containing a formatted error message.
-
-`void trace2_cmd_path(const char *pathname)`::
-
-	Emits a "cmd_path" message with the full pathname of the
-	current process.
+e.g: `void trace2_initialize_clock()`, `void trace2_initialize()`,
+`int trace2_is_enabled()`, `void trace2_cmd_start(int argc, const char **argv)`.
 
 === Command Detail Messages
 
 These are concerned with describing the specific Git command
 after the command line, config, and environment are inspected.
-
-`void trace2_cmd_name(const char *name)`::
-
-	Emits a "cmd_name" message with the canonical name of the
-	command, for example "status" or "checkout".
-
-`void trace2_cmd_mode(const char *mode)`::
-
-	Emits a "cmd_mode" message with a qualifier name to further
-	describe the current git command.
-+
-This message is intended to be used with git commands having multiple
-major modes.  For example, a "checkout" command can checkout a new
-branch or it can checkout a single file, so the checkout code could
-emit a cmd_mode message of "branch" or "file".
-
-`void trace2_cmd_alias(const char *alias, const char **argv_expansion)`::
-
-	Emits an "alias" message containing the alias used and the
-	argument expansion.
-
-`void trace2_def_param(const char *parameter, const char *value)`::
-
-	Emits a "def_param" message containing a key/value pair.
-+
-This message is intended to report some global aspect of the current
-command, such as a configuration setting or command line switch that
-significantly affects program performance or behavior, such as
-`core.abbrev`, `status.showUntrackedFiles`, or `--no-ahead-behind`.
-
-`void trace2_cmd_list_config()`::
-
-	Emits a "def_param" messages for "important" configuration
-	settings.
-+
-The environment variable `GIT_TRACE2_CONFIG_PARAMS` or the `trace2.configParams`
-config value can be set to a
-list of patterns of important configuration settings, for example:
-`core.*,remote.*.url`.  This function will iterate over all config
-settings and emit a "def_param" message for each match.
-
-`void trace2_cmd_set_config(const char *key, const char *value)`::
-
-	Emits a "def_param" message for a new or updated key/value
-	pair IF `key` is considered important.
-+
-This is used to hook into `git_config_set()` and catch any
-configuration changes and update a value previously reported by
-`trace2_cmd_list_config()`.
-
-`void trace2_def_repo(struct repository *repo)`::
-
-	Registers a repository with the Trace2 layer.  Assigns a
-	unique "repo-id" to `repo->trace2_repo_id`.
-+
-Emits a "worktree" messages containing the repo-id and the worktree
-pathname.
-+
-Region and data messages (described later) may refer to this repo-id.
-+
-The main/top-level repository will have repo-id value 1 (aka "r1").
-+
-The repo-id field is in anticipation of future in-proc submodule
-repositories.
+e.g: `void trace2_cmd_name(const char *name)`,
+`void trace2_cmd_mode(const char *mode)`.
 
 === Child Process Messages
 
 These are concerned with the various spawned child processes,
 including shell scripts, git commands, editors, pagers, and hooks.
 
-`void trace2_child_start(struct child_process *cmd)`::
-
-	Emits a "child_start" message containing the "child-id",
-	"child-argv", and "child-classification".
-+
-Before calling this, set `cmd->trace2_child_class` to a name
-describing the type of child process, for example "editor".
-+
-This function assigns a unique "child-id" to `cmd->trace2_child_id`.
-This field is used later during the "child_exit" message to associate
-it with the "child_start" message.
-+
-This function should be called before spawning the child process.
-
-`void trace2_child_exit(struct child_proess *cmd, int child_exit_code)`::
-
-	Emits a "child_exit" message containing the "child-id",
-	the child's elapsed time and exit-code.
-+
-The reported elapsed time includes the process creation overhead and
-time spend waiting for it to exit, so it may be slightly longer than
-the time reported by the child itself.
-+
-This function should be called after reaping the child process.
-
-`int trace2_exec(const char *exe, const char **argv)`::
-
-	Emits a "exec" message containing the "exec-id" and the
-	argv of the new process.
-+
-This function should be called before calling one of the `exec()`
-variants, such as `execvp()`.
-+
-This function returns a unique "exec-id".  This value is used later
-if the exec() fails and a "exec-result" message is necessary.
-
-`void trace2_exec_result(int exec_id, int error_code)`::
-
-	Emits a "exec_result" message containing the "exec-id"
-	and the error code.
-+
-On Unix-based systems, `exec()` does not return if successful.
-This message is used to indicate that the `exec()` failed and
-that the current program is continuing.
+e.g: `void trace2_child_start(struct child_process *cmd)`.
 
 === Git Thread Messages
 
 These messages are concerned with Git thread usage.
 
-`void trace2_thread_start(const char *thread_name)`::
-
-	Emits a "thread_start" message.
-+
-The `thread_name` field should be a descriptive name, such as the
-unique name of the thread-proc.  A unique "thread-id" will be added
-to the name to uniquely identify thread instances.
-+
-Region and data messages (described later) may refer to this thread
-name.
-+
-This function must be called by the thread-proc of the new thread
-(so that TLS data is properly initialized) and not by the caller
-of `pthread_create()`.
-
-`void trace2_thread_exit()`::
-
-	Emits a "thread_exit" message containing the thread name
-	and the thread elapsed time.
-+
-This function must be called by the thread-proc before it returns
-(so that the coorect TLS data is used and cleaned up.  It should
-not be called by the caller of `pthread_join()`.
+e.g: `void trace2_thread_start(const char *thread_name)`.
 
 === Region and Data Messages
 
 These are concerned with recording performance data
-over regions or spans of code.
-
-`void trace2_region_enter(const char *category, const char *label, const struct repository *repo)`::
-
-`void trace2_region_enter_printf(const char *category, const char *label, const struct repository *repo, const char *fmt, ...)`::
-
-`void trace2_region_enter_printf_va(const char *category, const char *label, const struct repository *repo, const char *fmt, va_list ap)`::
-
-	Emits a thread-relative "region_enter" message with optional
-	printf string.
-+
-This function pushes a new region nesting stack level on the current
-thread and starts a clock for the new stack frame.
-+
-The `category` field is an arbitrary category name used to classify
-regions by feature area, such as "status" or "index".  At this time
-it is only just printed along with the rest of the message.  It may
-be used in the future to filter messages.
-+
-The `label` field is an arbitrary label used to describe the activity
-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.
-
-`void trace2_region_leave(const char *category, const char *label, const struct repository *repo)`::
-
-`void trace2_region_leave_printf(const char *category, const char *label, const struct repository *repo, const char *fmt, ...)`::
-
-`void trace2_region_leave_printf_va(const char *category, const char *label, const struct repository *repo, const char *fmt, va_list ap)`::
-
-	Emits a thread-relative "region_leave" message with optional
-	printf string.
-+
-This function pops the region nesting stack on the current thread
-and reports the elapsed time of the stack frame.
-+
-The `category`, `label`, and `repo` fields are the same as above.
-The `category` and `label` do not need to match the correpsonding
-"region_enter" message, but it makes the data stream easier to
-understand.
-
-`void trace2_data_string(const char *category, const struct repository *repo, const char *key, const char * value)`::
-
-`void trace2_data_intmax(const char *category, const struct repository *repo, const char *key, intmax value)`::
-
-`void trace2_data_json(const char *category, const struct repository *repo, const char *key, const struct json_writer *jw)`::
+over regions or spans of code. e.g:
+`void trace2_region_enter(const char *category, const char *label, const struct repository *repo)`.
 
-	Emits a region- and thread-relative "data" or "data_json" message.
-+
-This is a key/value pair message containing information about the
-current thread, region stack, and repository.  This could be used
-to print the number of files in a directory during a multi-threaded
-recursive tree walk.
-
-`void trace2_printf(const char *fmt, ...)`::
-
-`void trace2_printf_va(const char *fmt, va_list ap)`::
-
-	Emits a region- and thread-relative "printf" message.
+Refer to trace2.h for details about all trace2 functions.
 
 == Trace2 Target Formats
 
@@ -621,14 +396,14 @@ only present on the "start" and "atexit" events.
 }
 ------------
 
-`"discard"`::
+`"too_many_files"`::
 	This event is written to the git-trace2-discard sentinel file if there
 	are too many files in the target trace directory (see the
 	trace2.maxFiles config option).
 +
 ------------
 {
-	"event":"discard",
+	"event":"too_many_files",
 	...
 }
 ------------
@@ -690,8 +465,8 @@ completed.)
 ------------
 
 `"error"`::
-	This event is emitted when one of the `error()`, `die()`,
-	or `usage()` functions are called.
+	This event is emitted when one of the `BUG()`, `error()`, `die()`,
+	`warning()`, or `usage()` functions are called.
 +
 ------------
 {
@@ -718,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.
@@ -816,7 +605,7 @@ with "?".
 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
-proces may be a shell script which doesn't have a session-id.)
+process may be a shell script which doesn't have a session-id.)
 +
 Note that the `t_rel` field contains the observed run time in seconds
 for the child process (starting before the fork/exec/spawn and
@@ -881,7 +670,8 @@ The "exec_id" field is a command-unique id and is only useful if the
 ------------
 
 `"def_param"`::
-	This event is generated to log a global parameter.
+	This event is generated to log a global parameter, such as a config
+	setting, command-line flag, or environment variable.
 +
 ------------
 {
@@ -1176,7 +966,7 @@ d0 | main                     | atexit       |     |  0.028809 |           |
 +
 Regions may be nested.  This causes messages to be indented in the
 PERF target, for example.
-Elapsed times are relative to the start of the correpsonding nesting
+Elapsed times are relative to the start of the corresponding nesting
 level as expected.  For example, if we add region message to:
 +
 ----------------
@@ -1371,7 +1161,7 @@ d0 | main                     | atexit       |     |  0.030027 |           |
 In this example, the preload region took 0.009122 seconds.  The 7 threads
 took between 0.006069 and 0.008947 seconds to work on their portion of
 the index.  Thread "th01" worked on 508 items at offset 0.  Thread "th02"
-worked on 508 items at offset 2032.  Thread "th04" worked on 508 itemts
+worked on 508 items at offset 2032.  Thread "th04" worked on 508 items
 at offset 508.
 +
 This example also shows that thread names are assigned in a racy manner
diff --git a/Documentation/technical/api-tree-walking.txt b/Documentation/technical/api-tree-walking.txt
deleted file mode 100644
index 7962e32854..0000000000
--- a/Documentation/technical/api-tree-walking.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-tree walking API
-================
-
-The tree walking API is used to traverse and inspect trees.
-
-Data Structures
----------------
-
-`struct name_entry`::
-
-	An entry in a tree. Each entry has a sha1 identifier, pathname, and
-	mode.
-
-`struct tree_desc`::
-
-	A semi-opaque data structure used to maintain the current state of the
-	walk.
-+
-* `buffer` is a pointer into the memory representation of the tree. It always
-points at the current entry being visited.
-
-* `size` counts the number of bytes left in the `buffer`.
-
-* `entry` points to the current entry being visited.
-
-`struct traverse_info`::
-
-	A structure used to maintain the state of a traversal.
-+
-* `prev` points to the traverse_info which was used to descend into the
-current tree. If this is the top-level tree `prev` will point to
-a dummy traverse_info.
-
-* `name` is the entry for the current tree (if the tree is a subtree).
-
-* `pathlen` is the length of the full path for the current tree.
-
-* `conflicts` can be used by callbacks to maintain directory-file conflicts.
-
-* `fn` is a callback called for each entry in the tree. See Traversing for more
-information.
-
-* `data` can be anything the `fn` callback would want to use.
-
-* `show_all_errors` tells whether to stop at the first error or not.
-
-Initializing
-------------
-
-`init_tree_desc`::
-
-	Initialize a `tree_desc` and decode its first entry. The buffer and
-	size parameters are assumed to be the same as the buffer and size
-	members of `struct tree`.
-
-`fill_tree_descriptor`::
-
-	Initialize a `tree_desc` and decode its first entry given the
-	object ID of a tree. Returns the `buffer` member if the latter
-	is a valid tree identifier and NULL otherwise.
-
-`setup_traverse_info`::
-
-	Initialize a `traverse_info` given the pathname of the tree to start
-	traversing from.
-
-Walking
--------
-
-`tree_entry`::
-
-	Visit the next entry in a tree. Returns 1 when there are more entries
-	left to visit and 0 when all entries have been visited. This is
-	commonly used in the test of a while loop.
-
-`tree_entry_len`::
-
-	Calculate the length of a tree entry's pathname. This utilizes the
-	memory structure of a tree entry to avoid the overhead of using a
-	generic strlen().
-
-`update_tree_entry`::
-
-	Walk to the next entry in a tree. This is commonly used in conjunction
-	with `tree_entry_extract` to inspect the current entry.
-
-`tree_entry_extract`::
-
-	Decode the entry currently being visited (the one pointed to by
-	`tree_desc's` `entry` member) and return the sha1 of the entry. The
-	`pathp` and `modep` arguments are set to the entry's pathname and mode
-	respectively.
-
-`get_tree_entry`::
-
-	Find an entry in a tree given a pathname and the sha1 of a tree to
-	search. Returns 0 if the entry is found and -1 otherwise. The third
-	and fourth parameters are set to the entry's sha1 and mode
-	respectively.
-
-Traversing
-----------
-
-`traverse_trees`::
-
-	Traverse `n` number of trees in parallel. The `fn` callback member of
-	`traverse_info` is called once for each tree entry.
-
-`traverse_callback_t`::
-	The arguments passed to the traverse callback are as follows:
-+
-* `n` counts the number of trees being traversed.
-
-* `mask` has its nth bit set if something exists in the nth entry.
-
-* `dirmask` has its nth bit set if the nth tree's entry is a directory.
-
-* `entry` is an array of size `n` where the nth entry is from the nth tree.
-
-* `info` maintains the state of the traversal.
-
-+
-Returning a negative value will terminate the traversal. Otherwise the
-return value is treated as an update mask. If the nth bit is set the nth tree
-will be updated and if the bit is not set the nth tree entry will be the
-same in the next callback invocation.
-
-`make_traverse_path`::
-
-	Generate the full pathname of a tree entry based from the root of the
-	traversal. For example, if the traversal has recursed into another
-	tree named "bar" the pathname of an entry "baz" in the "bar"
-	tree would be "bar/baz".
-
-`traverse_path_len`::
-
-	Calculate the length of a pathname returned by `make_traverse_path`.
-	This utilizes the memory structure of a tree entry to avoid the
-	overhead of using a generic strlen().
-
-`strbuf_make_traverse_path`::
-
-	Convenience wrapper to `make_traverse_path` into a strbuf.
-
-Authors
--------
-
-Written by Junio C Hamano <gitster@pobox.com> and Linus Torvalds
-<torvalds@linux-foundation.org>
diff --git a/Documentation/technical/api-xdiff-interface.txt b/Documentation/technical/api-xdiff-interface.txt
deleted file mode 100644
index 6296ecad1d..0000000000
--- a/Documentation/technical/api-xdiff-interface.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-xdiff interface API
-===================
-
-Talk about our calling convention to xdiff library, including
-xdiff_emit_consume_fn.
-
-(Dscho, JC)
diff --git a/Documentation/technical/bundle-format.txt b/Documentation/technical/bundle-format.txt
new file mode 100644
index 0000000000..bac558d049
--- /dev/null
+++ b/Documentation/technical/bundle-format.txt
@@ -0,0 +1,76 @@
+= Git bundle v2 format
+
+The Git bundle format is a format that represents both refs and Git objects.
+
+== Format
+
+We will use ABNF notation to define the Git bundle format. See
+protocol-common.txt for the details.
+
+A v2 bundle looks like this:
+
+----
+bundle    = signature *prerequisite *reference LF pack
+signature = "# v2 git bundle" LF
+
+prerequisite = "-" obj-id SP comment LF
+comment      = *CHAR
+reference    = obj-id SP refname LF
+
+pack         = ... ; packfile
+----
+
+A v3 bundle looks like this:
+
+----
+bundle    = signature *capability *prerequisite *reference LF pack
+signature = "# v3 git bundle" LF
+
+capability   = "@" key ["=" value] LF
+prerequisite = "-" obj-id SP comment LF
+comment      = *CHAR
+reference    = obj-id SP refname LF
+key          = 1*(ALPHA / DIGIT / "-")
+value        = *(%01-09 / %0b-FF)
+
+pack         = ... ; packfile
+----
+
+== Semantics
+
+A Git bundle consists of several parts.
+
+* "Capabilities", which are only in the v3 format, indicate functionality that
+	the bundle requires to be read properly.
+
+* "Prerequisites" lists the objects that are NOT included in the bundle and the
+  reader of the bundle MUST already have, in order to use the data in the
+  bundle. The objects stored in the bundle may refer to prerequisite objects and
+  anything reachable from them (e.g. a tree object in the bundle can reference
+  a blob that is reachable from a prerequisite) and/or expressed as a delta
+  against prerequisite objects.
+
+* "References" record the tips of the history graph, iow, what the reader of the
+  bundle CAN "git fetch" from it.
+
+* "Pack" is the pack data stream "git fetch" would send, if you fetch from a
+  repository that has the references recorded in the "References" above into a
+  repository that has references pointing at the objects listed in
+  "Prerequisites" above.
+
+In the bundle format, there can be a comment following a prerequisite obj-id.
+This is a comment and it has no specific meaning. The writer of the bundle MAY
+put any string here. The reader of the bundle MUST ignore the comment.
+
+=== Note on the shallow clone and a Git bundle
+
+Note that the prerequisites does not represent a shallow-clone boundary. The
+semantics of the prerequisites and the shallow-clone boundaries are different,
+and the Git bundle v2 format cannot represent a shallow clone repository.
+
+== Capabilities
+
+Because there is no opportunity for negotiation, unknown capabilities cause 'git
+bundle' to abort.  The only known capability is `object-format`, which specifies
+the hash algorithm in use, and can take the same values as the
+`extensions.objectFormat` configuration value.
diff --git a/Documentation/technical/chunk-format.txt b/Documentation/technical/chunk-format.txt
new file mode 100644
index 0000000000..593614fced
--- /dev/null
+++ b/Documentation/technical/chunk-format.txt
@@ -0,0 +1,116 @@
+Chunk-based file formats
+========================
+
+Some file formats in Git use a common concept of "chunks" to describe
+sections of the file. This allows structured access to a large file by
+scanning a small "table of contents" for the remaining data. This common
+format is used by the `commit-graph` and `multi-pack-index` files. See
+link:technical/pack-format.html[the `multi-pack-index` format] and
+link:technical/commit-graph-format.html[the `commit-graph` format] for
+how they use the chunks to describe structured data.
+
+A chunk-based file format begins with some header information custom to
+that format. That header should include enough information to identify
+the file type, format version, and number of chunks in the file. From this
+information, that file can determine the start of the chunk-based region.
+
+The chunk-based region starts with a table of contents describing where
+each chunk starts and ends. This consists of (C+1) rows of 12 bytes each,
+where C is the number of chunks. Consider the following table:
+
+  | Chunk ID (4 bytes) | Chunk Offset (8 bytes) |
+  |--------------------|------------------------|
+  | ID[0]              | OFFSET[0]              |
+  | ...                | ...                    |
+  | ID[C]              | OFFSET[C]              |
+  | 0x0000             | OFFSET[C+1]            |
+
+Each row consists of a 4-byte chunk identifier (ID) and an 8-byte offset.
+Each integer is stored in network-byte order.
+
+The chunk identifier `ID[i]` is a label for the data stored within this
+fill from `OFFSET[i]` (inclusive) to `OFFSET[i+1]` (exclusive). Thus, the
+size of the `i`th chunk is equal to the difference between `OFFSET[i+1]`
+and `OFFSET[i]`. This requires that the chunk data appears contiguously
+in the same order as the table of contents.
+
+The final entry in the table of contents must be four zero bytes. This
+confirms that the table of contents is ending and provides the offset for
+the end of the chunk-based data.
+
+Note: The chunk-based format expects that the file contains _at least_ a
+trailing hash after `OFFSET[C+1]`.
+
+Functions for working with chunk-based file formats are declared in
+`chunk-format.h`. Using these methods provide extra checks that assist
+developers when creating new file formats.
+
+Writing chunk-based file formats
+--------------------------------
+
+To write a chunk-based file format, create a `struct chunkfile` by
+calling `init_chunkfile()` and pass a `struct hashfile` pointer. The
+caller is responsible for opening the `hashfile` and writing header
+information so the file format is identifiable before the chunk-based
+format begins.
+
+Then, call `add_chunk()` for each chunk that is intended for write. This
+populates the `chunkfile` with information about the order and size of
+each chunk to write. Provide a `chunk_write_fn` function pointer to
+perform the write of the chunk data upon request.
+
+Call `write_chunkfile()` to write the table of contents to the `hashfile`
+followed by each of the chunks. This will verify that each chunk wrote
+the expected amount of data so the table of contents is correct.
+
+Finally, call `free_chunkfile()` to clear the `struct chunkfile` data. The
+caller is responsible for finalizing the `hashfile` by writing the trailing
+hash and closing the file.
+
+Reading chunk-based file formats
+--------------------------------
+
+To read a chunk-based file format, the file must be opened as a
+memory-mapped region. The chunk-format API expects that the entire file
+is mapped as a contiguous memory region.
+
+Initialize a `struct chunkfile` pointer with `init_chunkfile(NULL)`.
+
+After reading the header information from the beginning of the file,
+including the chunk count, call `read_table_of_contents()` to populate
+the `struct chunkfile` with the list of chunks, their offsets, and their
+sizes.
+
+Extract the data information for each chunk using `pair_chunk()` or
+`read_chunk()`:
+
+* `pair_chunk()` assigns a given pointer with the location inside the
+  memory-mapped file corresponding to that chunk's offset. If the chunk
+  does not exist, then the pointer is not modified.
+
+* `read_chunk()` takes a `chunk_read_fn` function pointer and calls it
+  with the appropriate initial pointer and size information. The function
+  is not called if the chunk does not exist. Use this method to read chunks
+  if you need to perform immediate parsing or if you need to execute logic
+  based on the size of the chunk.
+
+After calling these methods, call `free_chunkfile()` to clear the
+`struct chunkfile` data. This will not close the memory-mapped region.
+Callers are expected to own that data for the timeframe the pointers into
+the region are needed.
+
+Examples
+--------
+
+These file formats use the chunk-format API, and can be used as examples
+for future formats:
+
+* *commit-graph:* see `write_commit_graph_file()` and `parse_commit_graph()`
+  in `commit-graph.c` for how the chunk-format API is used to write and
+  parse the commit-graph file format documented in
+  link:technical/commit-graph-format.html[the commit-graph file format].
+
+* *multi-pack-index:* see `write_midx_internal()` and `load_multi_pack_index()`
+  in `midx.c` for how the chunk-format API is used to write and
+  parse the multi-pack-index file format documented in
+  link:technical/pack-format.html[the multi-pack-index file format].
diff --git a/Documentation/technical/commit-graph-format.txt b/Documentation/technical/commit-graph-format.txt
index a4f17441ae..87971c27dd 100644
--- a/Documentation/technical/commit-graph-format.txt
+++ b/Documentation/technical/commit-graph-format.txt
@@ -4,11 +4,7 @@ Git commit graph format
 The Git commit graph stores a list of commit OIDs and some associated
 metadata, including:
 
-- The generation number of the commit. Commits with no parents have
-  generation number 1; commits with parents have generation number
-  one more than the maximum generation number of its parents. We
-  reserve zero as special, and can be used to mark a generation
-  number invalid or as "not computed".
+- The generation number of the commit.
 
 - The root tree OID.
 
@@ -17,6 +13,9 @@ metadata, including:
 - The parents of the commit, stored using positional references within
   the graph file.
 
+- The Bloom filter of the commit carrying the paths that were changed between
+  the commit and its first parent, if requested.
+
 These positional references are stored as unsigned 32-bit integers
 corresponding to the array position within the list of commit OIDs. Due
 to some special constants we use to track parents, we can store at most
@@ -29,7 +28,7 @@ the body into "chunks" and provide a binary lookup table at the beginning
 of the body. The header includes certain values, such as number of chunks
 and hash type.
 
-All 4-byte numbers are in network order.
+All multi-byte numbers are in network byte order.
 
 HEADER:
 
@@ -39,8 +38,13 @@ HEADER:
   1-byte version number:
       Currently, the only valid version is 1.
 
-  1-byte Hash Version (1 = SHA-1)
-      We infer the hash length (H) from this value.
+  1-byte Hash Version
+      We infer the hash length (H) from this value:
+	1 => SHA-1
+	2 => SHA-256
+      If the hash type does not match the repository's hash algorithm, the
+      commit-graph file should be ignored with a warning presented to the
+      user.
 
   1-byte number (C) of "chunks"
 
@@ -57,6 +61,9 @@ CHUNK LOOKUP:
       the length using the next chunk position if necessary.) Each chunk
       ID appears at most once.
 
+  The CHUNK LOOKUP matches the table of contents from
+  link:technical/chunk-format.html[the chunk-based file format].
+
   The remaining data in the body is described one chunk at a time, and
   these chunks may be given in any order. Chunks are required unless
   otherwise specified.
@@ -74,17 +81,37 @@ CHUNK DATA:
   Commit Data (ID: {'C', 'D', 'A', 'T' }) (N * (H + 16) bytes)
     * The first H bytes are for the OID of the root tree.
     * The next 8 bytes are for the positions of the first two parents
-      of the ith commit. Stores value 0x7000000 if no parent in that
+      of the ith commit. Stores value 0x70000000 if no parent in that
       position. If there are more than two parents, the second value
       has its most-significant bit on and the other bits store an array
       position into the Extra Edge List chunk.
-    * The next 8 bytes store the generation number of the commit and
+    * The next 8 bytes store the topological level (generation number v1)
+      of the commit and
       the commit time in seconds since EPOCH. The generation number
       uses the higher 30 bits of the first 4 bytes, while the commit
       time uses the 32 bits of the second 4 bytes, along with the lowest
       2 bits of the lowest byte, storing the 33rd and 34th bit of the
       commit time.
 
+  Generation Data (ID: {'G', 'D', 'A', 'T' }) (N * 4 bytes) [Optional]
+    * This list of 4-byte values store corrected commit date offsets for the
+      commits, arranged in the same order as commit data chunk.
+    * If the corrected commit date offset cannot be stored within 31 bits,
+      the value has its most-significant bit on and the other bits store
+      the position of corrected commit date into the Generation Data Overflow
+      chunk.
+    * Generation Data chunk is present only when commit-graph file is written
+      by compatible versions of Git and in case of split commit-graph chains,
+      the topmost layer also has Generation Data chunk.
+
+  Generation Data Overflow (ID: {'G', 'D', 'O', 'V' }) [Optional]
+    * This list of 8-byte values stores the corrected commit date offsets
+      for commits with corrected commit date offsets that cannot be
+      stored within 31 bits.
+    * Generation Data Overflow chunk is present only when Generation Data
+      chunk is present and atleast one corrected commit date offset cannot
+      be stored within 31 bits.
+
   Extra Edge List (ID: {'E', 'D', 'G', 'E'}) [Optional]
       This list of 4-byte values store the second through nth parents for
       all octopus merges. The second parent value in the commit data stores
@@ -93,6 +120,33 @@ CHUNK DATA:
       positions for the parents until reaching a value with the most-significant
       bit on. The other bits correspond to the position of the last parent.
 
+  Bloom Filter Index (ID: {'B', 'I', 'D', 'X'}) (N * 4 bytes) [Optional]
+    * The ith entry, BIDX[i], stores the number of bytes in all Bloom filters
+      from commit 0 to commit i (inclusive) in lexicographic order. The Bloom
+      filter for the i-th commit spans from BIDX[i-1] to BIDX[i] (plus header
+      length), where BIDX[-1] is 0.
+    * The BIDX chunk is ignored if the BDAT chunk is not present.
+
+  Bloom Filter Data (ID: {'B', 'D', 'A', 'T'}) [Optional]
+    * It starts with header consisting of three unsigned 32-bit integers:
+      - Version of the hash algorithm being used. We currently only support
+	value 1 which corresponds to the 32-bit version of the murmur3 hash
+	implemented exactly as described in
+	https://en.wikipedia.org/wiki/MurmurHash#Algorithm and the double
+	hashing technique using seed values 0x293ae76f and 0x7e646e2 as
+	described in https://doi.org/10.1007/978-3-540-30494-4_26 "Bloom Filters
+	in Probabilistic Verification"
+      - The number of times a path is hashed and hence the number of bit positions
+	      that cumulatively determine whether a file is present in the commit.
+      - The minimum number of bits 'b' per entry in the Bloom filter. If the filter
+	      contains 'n' entries, then the filter size is the minimum number of 64-bit
+	      words that contain n*b bits.
+    * The rest of the chunk is the concatenation of all the computed Bloom
+      filters for the commits in lexicographic order.
+    * Note: Commits with no changes or more than 512 changes have Bloom filters
+      of length one, with either all bits set to zero or one respectively.
+    * The BDAT chunk is present if and only if BIDX is present.
+
   Base Graphs List (ID: {'B', 'A', 'S', 'E'}) [Optional]
       This list of H-byte hashes describe a set of B commit-graph files that
       form a commit-graph chain. The graph position for the ith commit in this
diff --git a/Documentation/technical/commit-graph.txt b/Documentation/technical/commit-graph.txt
index 729fbcb32f..f05e7bda1a 100644
--- a/Documentation/technical/commit-graph.txt
+++ b/Documentation/technical/commit-graph.txt
@@ -22,11 +22,11 @@ as "commit-graph" either in the .git/objects/info directory or in the info
 directory of an alternate.
 
 The commit-graph file stores the commit graph structure along with some
-extra metadata to speed up graph walks. By listing commit OIDs in lexi-
-cographic order, we can identify an integer position for each commit and
-refer to the parents of a commit using those integer positions. We use
-binary search to find initial commits and then use the integer positions
-for fast lookups during the walk.
+extra metadata to speed up graph walks. By listing commit OIDs in
+lexicographic order, we can identify an integer position for each commit
+and refer to the parents of a commit using those integer positions. We
+use binary search to find initial commits and then use the integer
+positions for fast lookups during the walk.
 
 A consumer may load the following info for a commit from the graph:
 
@@ -38,14 +38,31 @@ A consumer may load the following info for a commit from the graph:
 
 Values 1-4 satisfy the requirements of parse_commit_gently().
 
-Define the "generation number" of a commit recursively as follows:
+There are two definitions of generation number:
+1. Corrected committer dates (generation number v2)
+2. Topological levels (generation nummber v1)
 
- * A commit with no parents (a root commit) has generation number one.
+Define "corrected committer date" of a commit recursively as follows:
 
- * A commit with at least one parent has generation number one more than
-   the largest generation number among its parents.
+ * A commit with no parents (a root commit) has corrected committer date
+    equal to its committer date.
 
-Equivalently, the generation number of a commit A is one more than the
+ * A commit with at least one parent has corrected committer date equal to
+    the maximum of its commiter date and one more than the largest corrected
+    committer date among its parents.
+
+ * As a special case, a root commit with timestamp zero has corrected commit
+    date of 1, to be able to distinguish it from GENERATION_NUMBER_ZERO
+    (that is, an uncomputed corrected commit date).
+
+Define the "topological level" of a commit recursively as follows:
+
+ * A commit with no parents (a root commit) has topological level of one.
+
+ * A commit with at least one parent has topological level one more than
+   the largest topological level among its parents.
+
+Equivalently, the topological level of a commit A is one more than the
 length of a longest path from A to a root commit. The recursive definition
 is easier to use for computation and observing the following property:
 
@@ -60,6 +77,9 @@ is easier to use for computation and observing the following property:
     generation numbers, then we always expand the boundary commit with highest
     generation number and can easily detect the stopping condition.
 
+The property applies to both versions of generation number, that is both
+corrected committer dates and topological levels.
+
 This property can be used to significantly reduce the time it takes to
 walk commits and determine topological relationships. Without generation
 numbers, the general heuristic is the following:
@@ -67,7 +87,9 @@ numbers, the general heuristic is the following:
     If A and B are commits with commit time X and Y, respectively, and
     X < Y, then A _probably_ cannot reach B.
 
-This heuristic is currently used whenever the computation is allowed to
+In absence of corrected commit dates (for example, old versions of Git or
+mixed generation graph chains),
+this heuristic is currently used whenever the computation is allowed to
 violate topological relationships due to clock skew (such as "git log"
 with default order), but is not used when the topological order is
 required (such as merge base calculations, "git log --graph").
@@ -77,7 +99,7 @@ in the commit graph. We can treat these commits as having "infinite"
 generation number and walk until reaching commits with known generation
 number.
 
-We use the macro GENERATION_NUMBER_INFINITY = 0xFFFFFFFF to mark commits not
+We use the macro GENERATION_NUMBER_INFINITY to mark commits not
 in the commit-graph file. If a commit-graph file was written by a version
 of Git that did not compute generation numbers, then those commits will
 have generation number represented by the macro GENERATION_NUMBER_ZERO = 0.
@@ -85,7 +107,7 @@ have generation number represented by the macro GENERATION_NUMBER_ZERO = 0.
 Since the commit-graph file is closed under reachability, we can guarantee
 the following weaker condition on all commits:
 
-    If A and B are commits with generation numbers N amd M, respectively,
+    If A and B are commits with generation numbers N and M, respectively,
     and N < M, then A cannot reach B.
 
 Note how the strict inequality differs from the inequality when we have
@@ -93,12 +115,12 @@ fully-computed generation numbers. Using strict inequality may result in
 walking a few extra commits, but the simplicity in dealing with commits
 with generation number *_INFINITY or *_ZERO is valuable.
 
-We use the macro GENERATION_NUMBER_MAX = 0x3FFFFFFF to for commits whose
-generation numbers are computed to be at least this value. We limit at
-this value since it is the largest value that can be stored in the
-commit-graph file using the 30 bits available to generation numbers. This
-presents another case where a commit can have generation number equal to
-that of a parent.
+We use the macro GENERATION_NUMBER_V1_MAX = 0x3FFFFFFF for commits whose
+topological levels (generation number v1) are computed to be at least
+this value. We limit at this value since it is the largest value that
+can be stored in the commit-graph file using the 30 bits available
+to topological levels. This presents another case where a commit can
+have generation number equal to that of a parent.
 
 Design Details
 --------------
@@ -210,12 +232,12 @@ file.
 			    +---------------------+
 			    |                     |
  +-----------------------+  +---------------------+
- |  graph-{hash2} |->|                     |
+ |  graph-{hash2}        |->|                     |
  +-----------------------+  +---------------------+
 	  |                 |                     |
  +-----------------------+  +---------------------+
  |                       |  |                     |
- |  graph-{hash1} |->|                     |
+ |  graph-{hash1}        |->|                     |
  |                       |  |                     |
  +-----------------------+  +---------------------+
 	  |                  tmp_graphXXX
@@ -223,7 +245,7 @@ file.
  |                       |
  |                       |
  |                       |
- |  graph-{hash0} |
+ |  graph-{hash0}        |
  |                       |
  |                       |
  |                       |
@@ -267,6 +289,35 @@ The merge strategy values (2 for the size multiple, 64,000 for the maximum
 number of commits) could be extracted into config settings for full
 flexibility.
 
+## Handling Mixed Generation Number Chains
+
+With the introduction of generation number v2 and generation data chunk, the
+following scenario is possible:
+
+1. "New" Git writes a commit-graph with the corrected commit dates.
+2. "Old" Git writes a split commit-graph on top without corrected commit dates.
+
+A naive approach of using the newest available generation number from
+each layer would lead to violated expectations: the lower layer would
+use corrected commit dates which are much larger than the topological
+levels of the higher layer. For this reason, Git inspects the topmost
+layer to see if the layer is missing corrected commit dates. In such a case
+Git only uses topological level for generation numbers.
+
+When writing a new layer in split commit-graph, we write corrected commit
+dates if the topmost layer has corrected commit dates written. This
+guarantees that if a layer has corrected commit dates, all lower layers
+must have corrected commit dates as well.
+
+When merging layers, we do not consider whether the merged layers had corrected
+commit dates. Instead, the new layer will have corrected commit dates if the
+layer below the new layer has corrected commit dates.
+
+While writing or merging layers, if the new layer is the only layer, it will
+have corrected commit dates when written by compatible versions of Git. Thus,
+rewriting split commit-graph as a single file (`--split=replace`) creates a
+single layer with corrected commit dates.
+
 ## Deleting graph-{hash} files
 
 After a new tip file is written, some `graph-{hash}` files may no longer
@@ -323,14 +374,14 @@ Related Links
 [0] https://bugs.chromium.org/p/git/issues/detail?id=8
     Chromium work item for: Serialized Commit Graph
 
-[1] https://public-inbox.org/git/20110713070517.GC18566@sigill.intra.peff.net/
+[1] https://lore.kernel.org/git/20110713070517.GC18566@sigill.intra.peff.net/
     An abandoned patch that introduced generation numbers.
 
-[2] https://public-inbox.org/git/20170908033403.q7e6dj7benasrjes@sigill.intra.peff.net/
+[2] https://lore.kernel.org/git/20170908033403.q7e6dj7benasrjes@sigill.intra.peff.net/
     Discussion about generation numbers on commits and how they interact
     with fsck.
 
-[3] https://public-inbox.org/git/20170908034739.4op3w4f2ma5s65ku@sigill.intra.peff.net/
+[3] https://lore.kernel.org/git/20170908034739.4op3w4f2ma5s65ku@sigill.intra.peff.net/
     More discussion about generation numbers and not storing them inside
     commit objects. A valuable quote:
 
@@ -342,9 +393,9 @@ Related Links
      commit objects (i.e., packv4 or something like the "metapacks" I
      proposed a few years ago)."
 
-[4] https://public-inbox.org/git/20180108154822.54829-1-git@jeffhostetler.com/T/#u
+[4] https://lore.kernel.org/git/20180108154822.54829-1-git@jeffhostetler.com/T/#u
     A patch to remove the ahead-behind calculation from 'status'.
 
-[5] https://public-inbox.org/git/f27db281-abad-5043-6d71-cbb083b1c877@gmail.com/
+[5] https://lore.kernel.org/git/f27db281-abad-5043-6d71-cbb083b1c877@gmail.com/
     A discussion of a "two-dimensional graph position" that can allow reading
     multiple commit-graph chains at the same time.
diff --git a/Documentation/technical/directory-rename-detection.txt b/Documentation/technical/directory-rename-detection.txt
index 844629c8c4..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
 ------------------
@@ -18,7 +18,8 @@ It is perhaps easiest to start with an example:
 More interesting possibilities exist, though, such as:
 
   * one side of history renames x -> z, and the other renames some file to
-    x/e, causing the need for the merge to do a transitive rename.
+    x/e, causing the need for the merge to do a transitive rename so that
+    the rename ends up at z/e.
 
   * one side of history renames x -> z, but also renames all files within x.
     For example, x/a -> z/alpha, x/b -> z/bravo, etc.
@@ -35,7 +36,7 @@ More interesting possibilities exist, though, such as:
     directory itself contained inner directories that were renamed to yet
     other locations).
 
-  * combinations of the above; see t/t6043-merge-rename-directories.sh for
+  * combinations of the above; see t/t6423-merge-rename-directories.sh for
     various interesting cases.
 
 Limitations -- applicability of directory renames
@@ -62,19 +63,19 @@ directory rename detection applies:
 Limitations -- detailed rules and testcases
 -------------------------------------------
 
-t/t6043-merge-rename-directories.sh contains extensive tests and commentary
+t/t6423-merge-rename-directories.sh contains extensive tests and commentary
 which generate and explore the rules listed above.  It also lists a few
 additional rules:
 
   a) If renames split a directory into two or more others, the directory
      with the most renames, "wins".
 
-  b) Avoid directory-rename-detection for a path, if that path is the
-     source of a rename on either side of a merge.
-
-  c) Only apply implicit directory renames to directories if the other side
+  b) Only apply implicit directory renames to directories if the other side
      of history is the one doing the renaming.
 
+  c) Do not perform directory rename detection for directories which had no
+     new paths added to them.
+
 Limitations -- support in different commands
 --------------------------------------------
 
@@ -87,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/hash-function-transition.txt b/Documentation/technical/hash-function-transition.txt
index 2ae8fa470a..260224b033 100644
--- a/Documentation/technical/hash-function-transition.txt
+++ b/Documentation/technical/hash-function-transition.txt
@@ -33,16 +33,9 @@ researchers. On 23 February 2017 the SHAttered attack
 
 Git v2.13.0 and later subsequently moved to a hardened SHA-1
 implementation by default, which isn't vulnerable to the SHAttered
-attack.
+attack, but SHA-1 is still weak.
 
-Thus Git has in effect already migrated to a new hash that isn't SHA-1
-and doesn't share its vulnerabilities, its new hash function just
-happens to produce exactly the same output for all known inputs,
-except two PDFs published by the SHAttered researchers, and the new
-implementation (written by those researchers) claims to detect future
-cryptanalytic collision attacks.
-
-Regardless, it's considered prudent to move past any variant of SHA-1
+Thus it's considered prudent to move past any variant of SHA-1
 to a new hash. There's no guarantee that future attacks on SHA-1 won't
 be published in the future, and those attacks may not have viable
 mitigations.
@@ -57,6 +50,38 @@ SHA-1 still possesses the other properties such as fast object lookup
 and safe error checking, but other hash functions are equally suitable
 that are believed to be cryptographically secure.
 
+Choice of Hash
+--------------
+The hash to replace the hardened SHA-1 should be stronger than SHA-1
+was: we would like it to be trustworthy and useful in practice for at
+least 10 years.
+
+Some other relevant properties:
+
+1. A 256-bit hash (long enough to match common security practice; not
+   excessively long to hurt performance and disk usage).
+
+2. High quality implementations should be widely available (e.g., in
+   OpenSSL and Apple CommonCrypto).
+
+3. The hash function's properties should match Git's needs (e.g. Git
+   requires collision and 2nd preimage resistance and does not require
+   length extension resistance).
+
+4. As a tiebreaker, the hash should be fast to compute (fortunately
+   many contenders are faster than SHA-1).
+
+There were several contenders for a successor hash to SHA-1, including
+SHA-256, SHA-512/256, SHA-256x16, K12, and BLAKE2bp-256.
+
+In late 2018 the project picked SHA-256 as its successor hash.
+
+See 0ed8d8da374 (doc hash-function-transition: pick SHA-256 as
+NewHash, 2018-08-04) and numerous mailing list threads at the time,
+particularly the one starting at
+https://lore.kernel.org/git/20180609224913.GC38834@genre.crustytoothpaste.net/
+for more information.
+
 Goals
 -----
 1. The transition to SHA-256 can be done one local repository at a time.
@@ -94,7 +119,7 @@ Overview
 --------
 We introduce a new repository format extension. Repositories with this
 extension enabled use SHA-256 instead of SHA-1 to name their objects.
-This affects both object names and object content --- both the names
+This affects both object names and object content -- both the names
 of objects and all references to other objects within an object are
 switched to the new hash function.
 
@@ -107,7 +132,7 @@ mapping to allow naming objects using either their SHA-1 and SHA-256 names
 interchangeably.
 
 "git cat-file" and "git hash-object" gain options to display an object
-in its sha1 form and write an object given its sha1 form. This
+in its SHA-1 form and write an object given its SHA-1 form. This
 requires all objects referenced by that object to be present in the
 object database so that they can be named using the appropriate name
 (using the bidirectional hash mapping).
@@ -115,7 +140,7 @@ object database so that they can be named using the appropriate name
 Fetches from a SHA-1 based server convert the fetched objects into
 SHA-256 form and record the mapping in the bidirectional mapping table
 (see below for details). Pushes to a SHA-1 based server convert the
-objects being pushed into sha1 form so the server does not have to be
+objects being pushed into SHA-1 form so the server does not have to be
 aware of the hash function the client is using.
 
 Detailed Design
@@ -151,38 +176,38 @@ repository extensions.
 
 Object names
 ~~~~~~~~~~~~
-Objects can be named by their 40 hexadecimal digit sha1-name or 64
-hexadecimal digit sha256-name, plus names derived from those (see
+Objects can be named by their 40 hexadecimal digit SHA-1 name or 64
+hexadecimal digit SHA-256 name, plus names derived from those (see
 gitrevisions(7)).
 
-The sha1-name of an object is the SHA-1 of the concatenation of its
-type, length, a nul byte, and the object's sha1-content. This is the
+The SHA-1 name of an object is the SHA-1 of the concatenation of its
+type, length, a nul byte, and the object's SHA-1 content. This is the
 traditional <sha1> used in Git to name objects.
 
-The sha256-name of an object is the SHA-256 of the concatenation of its
-type, length, a nul byte, and the object's sha256-content.
+The SHA-256 name of an object is the SHA-256 of the concatenation of its
+type, length, a nul byte, and the object's SHA-256 content.
 
 Object format
 ~~~~~~~~~~~~~
 The content as a byte sequence of a tag, commit, or tree object named
-by sha1 and sha256 differ because an object named by sha256-name refers to
-other objects by their sha256-names and an object named by sha1-name
-refers to other objects by their sha1-names.
+by SHA-1 and SHA-256 differ because an object named by SHA-256 name refers to
+other objects by their SHA-256 names and an object named by SHA-1 name
+refers to other objects by their SHA-1 names.
 
-The sha256-content of an object is the same as its sha1-content, except
-that objects referenced by the object are named using their sha256-names
-instead of sha1-names. Because a blob object does not refer to any
-other object, its sha1-content and sha256-content are the same.
+The SHA-256 content of an object is the same as its SHA-1 content, except
+that objects referenced by the object are named using their SHA-256 names
+instead of SHA-1 names. Because a blob object does not refer to any
+other object, its SHA-1 content and SHA-256 content are the same.
 
-The format allows round-trip conversion between sha256-content and
-sha1-content.
+The format allows round-trip conversion between SHA-256 content and
+SHA-1 content.
 
 Object storage
 ~~~~~~~~~~~~~~
 Loose objects use zlib compression and packed objects use the packed
 format described in Documentation/technical/pack-format.txt, just like
-today. The content that is compressed and stored uses sha256-content
-instead of sha1-content.
+today. The content that is compressed and stored uses SHA-256 content
+instead of SHA-1 content.
 
 Pack index
 ~~~~~~~~~~
@@ -191,21 +216,21 @@ hash functions. They have the following format (all integers are in
 network byte order):
 
 - A header appears at the beginning and consists of the following:
-  - The 4-byte pack index signature: '\377t0c'
-  - 4-byte version number: 3
-  - 4-byte length of the header section, including the signature and
+  * The 4-byte pack index signature: '\377t0c'
+  * 4-byte version number: 3
+  * 4-byte length of the header section, including the signature and
     version number
-  - 4-byte number of objects contained in the pack
-  - 4-byte number of object formats in this pack index: 2
-  - For each object format:
-    - 4-byte format identifier (e.g., 'sha1' for SHA-1)
-    - 4-byte length in bytes of shortened object names. This is the
+  * 4-byte number of objects contained in the pack
+  * 4-byte number of object formats in this pack index: 2
+  * For each object format:
+    ** 4-byte format identifier (e.g., 'sha1' for SHA-1)
+    ** 4-byte length in bytes of shortened object names. This is the
       shortest possible length needed to make names in the shortened
       object name table unambiguous.
-    - 4-byte integer, recording where tables relating to this format
+    ** 4-byte integer, recording where tables relating to this format
       are stored in this index file, as an offset from the beginning.
-  - 4-byte offset to the trailer from the beginning of this file.
-  - Zero or more additional key/value pairs (4-byte key, 4-byte
+  * 4-byte offset to the trailer from the beginning of this file.
+  * Zero or more additional key/value pairs (4-byte key, 4-byte
     value). Only one key is supported: 'PSRC'. See the "Loose objects
     and unreachable objects" section for supported values and how this
     is used.  All other keys are reserved. Readers must ignore
@@ -213,37 +238,36 @@ network byte order):
 - Zero or more NUL bytes. This can optionally be used to improve the
   alignment of the full object name table below.
 - Tables for the first object format:
-  - A sorted table of shortened object names.  These are prefixes of
+  * A sorted table of shortened object names.  These are prefixes of
     the names of all objects in this pack file, packed together
     without offset values to reduce the cache footprint of the binary
     search for a specific object name.
 
-  - A table of full object names in pack order. This allows resolving
+  * A table of full object names in pack order. This allows resolving
     a reference to "the nth object in the pack file" (from a
     reachability bitmap or from the next table of another object
     format) to its object name.
 
-  - A table of 4-byte values mapping object name order to pack order.
+  * A table of 4-byte values mapping object name order to pack order.
     For an object in the table of sorted shortened object names, the
     value at the corresponding index in this table is the index in the
     previous table for that same object.
-
     This can be used to look up the object in reachability bitmaps or
     to look up its name in another object format.
 
-  - A table of 4-byte CRC32 values of the packed object data, in the
+  * A table of 4-byte CRC32 values of the packed object data, in the
     order that the objects appear in the pack file. This is to allow
     compressed data to be copied directly from pack to pack during
     repacking without undetected data corruption.
 
-  - A table of 4-byte offset values. For an object in the table of
+  * A table of 4-byte offset values. For an object in the table of
     sorted shortened object names, the value at the corresponding
     index in this table indicates where that object can be found in
     the pack file. These are usually 31-bit pack file offsets, but
     large offsets are encoded as an index into the next table with the
     most significant bit set.
 
-  - A table of 8-byte offset entries (empty for pack files less than
+  * A table of 8-byte offset entries (empty for pack files less than
     2 GiB). Pack files are organized with heavily used objects toward
     the front, so most object references should not need to refer to
     this table.
@@ -252,10 +276,10 @@ network byte order):
   up to and not including the table of CRC32 values.
 - Zero or more NUL bytes.
 - The trailer consists of the following:
-  - A copy of the 20-byte SHA-256 checksum at the end of the
+  * A copy of the 20-byte SHA-256 checksum at the end of the
     corresponding packfile.
 
-  - 20-byte SHA-256 checksum of all of the above.
+  * 20-byte SHA-256 checksum of all of the above.
 
 Loose object index
 ~~~~~~~~~~~~~~~~~~
@@ -288,18 +312,18 @@ To remove entries (e.g. in "git pack-refs" or "git-prune"):
 
 Translation table
 ~~~~~~~~~~~~~~~~~
-The index files support a bidirectional mapping between sha1-names
-and sha256-names. The lookup proceeds similarly to ordinary object
-lookups. For example, to convert a sha1-name to a sha256-name:
+The index files support a bidirectional mapping between SHA-1 names
+and SHA-256 names. The lookup proceeds similarly to ordinary object
+lookups. For example, to convert a SHA-1 name to a SHA-256 name:
 
  1. Look for the object in idx files. If a match is present in the
-    idx's sorted list of truncated sha1-names, then:
-    a. Read the corresponding entry in the sha1-name order to pack
+    idx's sorted list of truncated SHA-1 names, then:
+    a. Read the corresponding entry in the SHA-1 name order to pack
        name order mapping.
-    b. Read the corresponding entry in the full sha1-name table to
+    b. Read the corresponding entry in the full SHA-1 name table to
        verify we found the right object. If it is, then
-    c. Read the corresponding entry in the full sha256-name table.
-       That is the object's sha256-name.
+    c. Read the corresponding entry in the full SHA-256 name table.
+       That is the object's SHA-256 name.
  2. Check for a loose object. Read lines from loose-object-idx until
     we find a match.
 
@@ -313,10 +337,10 @@ Since all operations that make new objects (e.g., "git commit") add
 the new objects to the corresponding index, this mapping is possible
 for all objects in the object store.
 
-Reading an object's sha1-content
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The sha1-content of an object can be read by converting all sha256-names
-its sha256-content references to sha1-names using the translation table.
+Reading an object's SHA-1 content
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The SHA-1 content of an object can be read by converting all SHA-256 names
+of its SHA-256 content references to SHA-1 names using the translation table.
 
 Fetch
 ~~~~~
@@ -339,7 +363,7 @@ the following steps:
 1. index-pack: inflate each object in the packfile and compute its
    SHA-1. Objects can contain deltas in OBJ_REF_DELTA format against
    objects the client has locally. These objects can be looked up
-   using the translation table and their sha1-content read as
+   using the translation table and their SHA-1 content read as
    described above to resolve the deltas.
 2. topological sort: starting at the "want"s from the negotiation
    phase, walk through objects in the pack and emit a list of them,
@@ -348,12 +372,12 @@ the following steps:
    (This list only contains objects reachable from the "wants". If the
    pack from the server contained additional extraneous objects, then
    they will be discarded.)
-3. convert to sha256: open a new (sha256) packfile. Read the topologically
+3. convert to SHA-256: open a new SHA-256 packfile. Read the topologically
    sorted list just generated. For each object, inflate its
-   sha1-content, convert to sha256-content, and write it to the sha256
-   pack. Record the new sha1<->sha256 mapping entry for use in the idx.
+   SHA-1 content, convert to SHA-256 content, and write it to the SHA-256
+   pack. Record the new SHA-1<-->SHA-256 mapping entry for use in the idx.
 4. sort: reorder entries in the new pack to match the order of objects
-   in the pack the server generated and include blobs. Write a sha256 idx
+   in the pack the server generated and include blobs. Write a SHA-256 idx
    file
 5. clean up: remove the SHA-1 based pack file, index, and
    topologically sorted list obtained from the server in steps 1
@@ -378,19 +402,20 @@ experimenting to get this to perform well.
 Push
 ~~~~
 Push is simpler than fetch because the objects referenced by the
-pushed objects are already in the translation table. The sha1-content
+pushed objects are already in the translation table. The SHA-1 content
 of each object being pushed can be read as described in the "Reading
-an object's sha1-content" section to generate the pack written by git
+an object's SHA-1 content" section to generate the pack written by git
 send-pack.
 
 Signed Commits
 ~~~~~~~~~~~~~~
 We add a new field "gpgsig-sha256" to the commit object format to allow
 signing commits without relying on SHA-1. It is similar to the
-existing "gpgsig" field. Its signed payload is the sha256-content of the
+existing "gpgsig" field. Its signed payload is the SHA-256 content of the
 commit object with any "gpgsig" and "gpgsig-sha256" fields removed.
 
 This means commits can be signed
+
 1. using SHA-1 only, as in existing signed commit objects
 2. using both SHA-1 and SHA-256, by using both gpgsig-sha256 and gpgsig
    fields.
@@ -404,10 +429,11 @@ Signed Tags
 ~~~~~~~~~~~
 We add a new field "gpgsig-sha256" to the tag object format to allow
 signing tags without relying on SHA-1. Its signed payload is the
-sha256-content of the tag with its gpgsig-sha256 field and "-----BEGIN PGP
+SHA-256 content of the tag with its gpgsig-sha256 field and "-----BEGIN PGP
 SIGNATURE-----" delimited in-body signature removed.
 
 This means tags can be signed
+
 1. using SHA-1 only, as in existing signed tag objects
 2. using both SHA-1 and SHA-256, by using gpgsig-sha256 and an in-body
    signature.
@@ -415,11 +441,11 @@ This means tags can be signed
 
 Mergetag embedding
 ~~~~~~~~~~~~~~~~~~
-The mergetag field in the sha1-content of a commit contains the
-sha1-content of a tag that was merged by that commit.
+The mergetag field in the SHA-1 content of a commit contains the
+SHA-1 content of a tag that was merged by that commit.
 
-The mergetag field in the sha256-content of the same commit contains the
-sha256-content of the same tag.
+The mergetag field in the SHA-256 content of the same commit contains the
+SHA-256 content of the same tag.
 
 Submodules
 ~~~~~~~~~~
@@ -494,7 +520,7 @@ Caveats
 -------
 Invalid objects
 ~~~~~~~~~~~~~~~
-The conversion from sha1-content to sha256-content retains any
+The conversion from SHA-1 content to SHA-256 content retains any
 brokenness in the original object (e.g., tree entry modes encoded with
 leading 0, tree objects whose paths are not sorted correctly, and
 commit objects without an author or committer). This is a deliberate
@@ -513,15 +539,15 @@ allow lifting this restriction.
 
 Alternates
 ~~~~~~~~~~
-For the same reason, a sha256 repository cannot borrow objects from a
-sha1 repository using objects/info/alternates or
+For the same reason, a SHA-256 repository cannot borrow objects from a
+SHA-1 repository using objects/info/alternates or
 $GIT_ALTERNATE_OBJECT_REPOSITORIES.
 
 git notes
 ~~~~~~~~~
-The "git notes" tool annotates objects using their sha1-name as key.
+The "git notes" tool annotates objects using their SHA-1 name as key.
 This design does not describe a way to migrate notes trees to use
-sha256-names. That migration is expected to happen separately (for
+SHA-256 names. That migration is expected to happen separately (for
 example using a file at the root of the notes tree to describe which
 hash it uses).
 
@@ -531,7 +557,7 @@ Until Git protocol gains SHA-256 support, using SHA-256 based storage
 on public-facing Git servers is strongly discouraged. Once Git
 protocol gains SHA-256 support, SHA-256 based servers are likely not
 to support SHA-1 compatibility, to avoid what may be a very expensive
-hash reencode during clone and to encourage peers to modernize.
+hash re-encode during clone and to encourage peers to modernize.
 
 The design described here allows fetches by SHA-1 clients of a
 personal SHA-256 repository because it's not much more difficult than
@@ -555,7 +581,7 @@ unclear:
 
 	Git 2.12
 
-Does this mean Git v2.12.0 is the commit with sha1-name
+Does this mean Git v2.12.0 is the commit with SHA-1 name
 e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7 or the commit with
 new-40-digit-hash-name e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7?
 
@@ -573,7 +599,7 @@ supports four different modes of operation:
     convert any object names written to output to SHA-1, but store
     objects using SHA-256.  This allows users to test the code with no
     visible behavior change except for performance.  This allows
-    allows running even tests that assume the SHA-1 hash function, to
+    running even tests that assume the SHA-1 hash function, to
     sanity-check the behavior of the new mode.
 
  2. ("early transition") Allow both SHA-1 and SHA-256 object names in
@@ -598,44 +624,12 @@ The user can also explicitly specify which format to use for a
 particular revision specifier and for output, overriding the mode. For
 example:
 
-git --output-format=sha1 log abac87a^{sha1}..f787cac^{sha256}
-
-Choice of Hash
---------------
-In early 2005, around the time that Git was written,  Xiaoyun Wang,
-Yiqun Lisa Yin, and Hongbo Yu announced an attack finding SHA-1
-collisions in 2^69 operations. In August they published details.
-Luckily, no practical demonstrations of a collision in full SHA-1 were
-published until 10 years later, in 2017.
-
-Git v2.13.0 and later subsequently moved to a hardened SHA-1
-implementation by default that mitigates the SHAttered attack, but
-SHA-1 is still believed to be weak.
-
-The hash to replace this hardened SHA-1 should be stronger than SHA-1
-was: we would like it to be trustworthy and useful in practice for at
-least 10 years.
-
-Some other relevant properties:
-
-1. A 256-bit hash (long enough to match common security practice; not
-   excessively long to hurt performance and disk usage).
-
-2. High quality implementations should be widely available (e.g., in
-   OpenSSL and Apple CommonCrypto).
-
-3. The hash function's properties should match Git's needs (e.g. Git
-   requires collision and 2nd preimage resistance and does not require
-   length extension resistance).
-
-4. As a tiebreaker, the hash should be fast to compute (fortunately
-   many contenders are faster than SHA-1).
-
-We choose SHA-256.
+    git --output-format=sha1 log abac87a^{sha1}..f787cac^{sha256}
 
 Transition plan
 ---------------
 Some initial steps can be implemented independently of one another:
+
 - adding a hash function API (vtable)
 - teaching fsck to tolerate the gpgsig-sha256 field
 - excluding gpgsig-* from the fields copied by "git commit --amend"
@@ -647,10 +641,9 @@ Some initial steps can be implemented independently of one another:
 - introducing index v3
 - adding support for the PSRC field and safer object pruning
 
-
 The first user-visible change is the introduction of the objectFormat
 extension (without compatObjectFormat). This requires:
-- implementing the loose-object-idx
+
 - teaching fsck about this mode of operation
 - using the hash function API (vtable) when computing object names
 - signing objects and verifying signatures
@@ -658,6 +651,8 @@ extension (without compatObjectFormat). This requires:
   repository
 
 Next comes introduction of compatObjectFormat:
+
+- implementing the loose-object-idx
 - translating object names between object formats
 - translating object content between object formats
 - generating and verifying signatures in the compat format
@@ -669,10 +664,11 @@ Next comes introduction of compatObjectFormat:
   "Object names on the command line" above)
 
 The next step is supporting fetches and pushes to SHA-1 repositories:
+
 - allow pushes to a repository using the compat format
 - generate a topologically sorted list of the SHA-1 names of fetched
   objects
-- convert the fetched packfile to sha256 format and generate an idx
+- convert the fetched packfile to SHA-256 format and generate an idx
   file
 - re-sort to match the order of objects in the fetched packfile
 
@@ -730,10 +726,11 @@ adoption.
 
 Using hash functions in parallel
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-(e.g. https://public-inbox.org/git/22708.8913.864049.452252@chiark.greenend.org.uk/ )
+(e.g. https://lore.kernel.org/git/22708.8913.864049.452252@chiark.greenend.org.uk/ )
 Objects newly created would be addressed by the new hash, but inside
 such an object (e.g. commit) it is still possible to address objects
 using the old hash function.
+
 * You cannot trust its history (needed for bisectability) in the
   future without further work
 * Maintenance burden as the number of supported hash functions grows
@@ -743,36 +740,38 @@ using the old hash function.
 Signed objects with multiple hashes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Instead of introducing the gpgsig-sha256 field in commit and tag objects
-for sha256-content based signatures, an earlier version of this design
-added "hash sha256 <sha256-name>" fields to strengthen the existing
-sha1-content based signatures.
+for SHA-256 content based signatures, an earlier version of this design
+added "hash sha256 <SHA-256 name>" fields to strengthen the existing
+SHA-1 content based signatures.
 
 In other words, a single signature was used to attest to the object
 content using both hash functions. This had some advantages:
+
 * Using one signature instead of two speeds up the signing process.
 * Having one signed payload with both hashes allows the signer to
-  attest to the sha1-name and sha256-name referring to the same object.
+  attest to the SHA-1 name and SHA-256 name referring to the same object.
 * All users consume the same signature. Broken signatures are likely
   to be detected quickly using current versions of git.
 
 However, it also came with disadvantages:
-* Verifying a signed object requires access to the sha1-names of all
+
+* Verifying a signed object requires access to the SHA-1 names of all
   objects it references, even after the transition is complete and
   translation table is no longer needed for anything else. To support
-  this, the design added fields such as "hash sha1 tree <sha1-name>"
-  and "hash sha1 parent <sha1-name>" to the sha256-content of a signed
+  this, the design added fields such as "hash sha1 tree <SHA-1 name>"
+  and "hash sha1 parent <SHA-1 name>" to the SHA-256 content of a signed
   commit, complicating the conversion process.
-* Allowing signed objects without a sha1 (for after the transition is
+* Allowing signed objects without a SHA-1 (for after the transition is
   complete) complicated the design further, requiring a "nohash sha1"
-  field to suppress including "hash sha1" fields in the sha256-content
+  field to suppress including "hash sha1" fields in the SHA-256 content
   and signed payload.
 
 Lazily populated translation table
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Some of the work of building the translation table could be deferred to
 push time, but that would significantly complicate and slow down pushes.
-Calculating the sha1-name at object creation time at the same time it is
-being streamed to disk and having its sha256-name calculated should be
+Calculating the SHA-1 name at object creation time at the same time it is
+being streamed to disk and having its SHA-256 name calculated should be
 an acceptable cost.
 
 Document History
@@ -782,18 +781,19 @@ Document History
 bmwill@google.com, jonathantanmy@google.com, jrnieder@gmail.com,
 sbeller@google.com
 
-Initial version sent to
-http://public-inbox.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com
+* Initial version sent to https://lore.kernel.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com
 
 2017-03-03 jrnieder@gmail.com
 Incorporated suggestions from jonathantanmy and sbeller:
-* describe purpose of signed objects with each hash type
-* redefine signed object verification using object content under the
+
+* Describe purpose of signed objects with each hash type
+* Redefine signed object verification using object content under the
   first hash function
 
 2017-03-06 jrnieder@gmail.com
+
 * Use SHA3-256 instead of SHA2 (thanks, Linus and brian m. carlson).[1][2]
-* Make sha3-based signatures a separate field, avoiding the need for
+* Make SHA3-based signatures a separate field, avoiding the need for
   "hash" and "nohash" fields (thanks to peff[3]).
 * Add a sorting phase to fetch (thanks to Junio for noticing the need
   for this).
@@ -805,23 +805,26 @@ Incorporated suggestions from jonathantanmy and sbeller:
   especially Junio).
 
 2017-09-27 jrnieder@gmail.com, sbeller@google.com
-* use placeholder NewHash instead of SHA3-256
-* describe criteria for picking a hash function.
-* include a transition plan (thanks especially to Brandon Williams
+
+* Use placeholder NewHash instead of SHA3-256
+* Describe criteria for picking a hash function.
+* Include a transition plan (thanks especially to Brandon Williams
   for fleshing these ideas out)
-* define the translation table (thanks, Shawn Pearce[5], Jonathan
+* Define the translation table (thanks, Shawn Pearce[5], Jonathan
   Tan, and Masaya Suzuki)
-* avoid loose object overhead by packing more aggressively in
+* Avoid loose object overhead by packing more aggressively in
   "git gc --auto"
 
 Later history:
 
- See the history of this file in git.git for the history of subsequent
- edits. This document history is no longer being maintained as it
- would now be superfluous to the commit log
+* See the history of this file in git.git for the history of subsequent
+  edits. This document history is no longer being maintained as it
+  would now be superfluous to the commit log
+
+References:
 
-[1] http://public-inbox.org/git/CA+55aFzJtejiCjV0e43+9oR3QuJK2PiFiLQemytoLpyJWe6P9w@mail.gmail.com/
-[2] http://public-inbox.org/git/CA+55aFz+gkAsDZ24zmePQuEs1XPS9BP_s8O7Q4wQ7LV7X5-oDA@mail.gmail.com/
-[3] http://public-inbox.org/git/20170306084353.nrns455dvkdsfgo5@sigill.intra.peff.net/
-[4] http://public-inbox.org/git/20170304224936.rqqtkdvfjgyezsht@genre.crustytoothpaste.net
-[5] https://public-inbox.org/git/CAJo=hJtoX9=AyLHHpUJS7fueV9ciZ_MNpnEPHUz8Whui6g9F0A@mail.gmail.com/
+ [1] https://lore.kernel.org/git/CA+55aFzJtejiCjV0e43+9oR3QuJK2PiFiLQemytoLpyJWe6P9w@mail.gmail.com/
+ [2] https://lore.kernel.org/git/CA+55aFz+gkAsDZ24zmePQuEs1XPS9BP_s8O7Q4wQ7LV7X5-oDA@mail.gmail.com/
+ [3] https://lore.kernel.org/git/20170306084353.nrns455dvkdsfgo5@sigill.intra.peff.net/
+ [4] https://lore.kernel.org/git/20170304224936.rqqtkdvfjgyezsht@genre.crustytoothpaste.net
+ [5] https://lore.kernel.org/git/CAJo=hJtoX9=AyLHHpUJS7fueV9ciZ_MNpnEPHUz8Whui6g9F0A@mail.gmail.com/
diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt
index 9c5b6f0fac..96d89ea9b2 100644
--- a/Documentation/technical/http-protocol.txt
+++ b/Documentation/technical/http-protocol.txt
@@ -216,7 +216,7 @@ smart server reply:
    S: 001e# service=git-upload-pack\n
    S: 0000
    S: 004895dcfa3633004da0049d3d0fa03f80589cbcaf31 refs/heads/maint\0multi_ack\n
-   S: 0042d049f6c27a2244e12041955e262a404c7faba355 refs/heads/master\n
+   S: 003fd049f6c27a2244e12041955e262a404c7faba355 refs/heads/master\n
    S: 003c2cb58b79488a98d2721cea644875a8dd0026b115 refs/tags/v1.0\n
    S: 003fa3c2e2402b99163d1d59756e5f207ae21cccba4c refs/tags/v1.0^{}\n
    S: 0000
@@ -401,8 +401,9 @@ at all in the request stream:
 The stream is terminated by a pkt-line flush (`0000`).
 
 A single "want" or "have" command MUST have one hex formatted
-SHA-1 as its value.  Multiple SHA-1s MUST be sent by sending
-multiple commands.
+object name as its value.  Multiple object names MUST be sent by sending
+multiple commands. Object names MUST be given using the object format
+negotiated through the `object-format` capability (default SHA-1).
 
 The `have` list is created by popping the first 32 commits
 from `c_pending`.  Less can be supplied if `c_pending` empties.
diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index 7c4d67aa6a..65da0daaa5 100644
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -3,8 +3,11 @@ Git index format
 
 == The Git index file has the following format
 
-  All binary numbers are in network byte order. Version 2 is described
-  here unless stated otherwise.
+  All binary numbers are in network byte order.
+  In a repository using the traditional SHA-1, checksums and object IDs
+  (object names) mentioned below are all computed using SHA-1.  Similarly,
+  in SHA-256 repositories, these values are computed using SHA-256.
+  Version 2 is described here unless stated otherwise.
 
    - A 12-byte header consisting of
 
@@ -23,7 +26,7 @@ Git index format
      Extensions are identified by signature. Optional extensions can
      be ignored if Git does not understand them.
 
-     Git currently supports cached tree and resolve undo extensions.
+     Git currently supports cache tree and resolve undo extensions.
 
      4-byte extension signature. If the first byte is 'A'..'Z' the
      extension is optional and can be ignored.
@@ -32,8 +35,7 @@ Git index format
 
      Extension data
 
-   - 160-bit SHA-1 over the content of the index file before this
-     checksum.
+   - Hash checksum over the content of the index file before this checksum.
 
 == Index entry
 
@@ -42,6 +44,13 @@ Git index format
   localization, no special casing of directory separator '/'). Entries
   with the same name are sorted by their stage field.
 
+  An index entry typically represents a file. However, if sparse-checkout
+  is enabled in cone mode (`core.sparseCheckoutCone` is enabled) and the
+  `extensions.sparseIndex` extension is enabled, then the index may
+  contain entries for directories outside of the sparse-checkout definition.
+  These entries have mode `040000`, include the `SKIP_WORKTREE` bit, and
+  the path ends in a directory separator.
+
   32-bit ctime seconds, the last time a file's metadata changed
     this is stat(2) data
 
@@ -80,7 +89,7 @@ Git index format
   32-bit file size
     This is the on-disk size from stat(2), truncated to 32-bit.
 
-  160-bit SHA-1 for the represented object
+  Object name for the represented object
 
   A 16-bit 'flags' field split into (high to low bits)
 
@@ -134,14 +143,35 @@ Git index format
 
 == Extensions
 
-=== Cached tree
-
-  Cached tree extension contains pre-computed hashes for trees that can
-  be derived from the index. It helps speed up tree object generation
-  from index for a new commit.
-
-  When a path is updated in index, the path must be invalidated and
-  removed from tree cache.
+=== Cache tree
+
+  Since the index does not record entries for directories, the cache
+  entries cannot describe tree objects that already exist in the object
+  database for regions of the index that are unchanged from an existing
+  commit. The cache tree extension stores a recursive tree structure that
+  describes the trees that already exist and completely match sections of
+  the cache entries. This speeds up tree object generation from the index
+  for a new commit by only computing the trees that are "new" to that
+  commit. It also assists when comparing the index to another tree, such
+  as `HEAD^{tree}`, since sections of the index can be skipped when a tree
+  comparison demonstrates equality.
+
+  The recursive tree structure uses nodes that store a number of cache
+  entries, a list of subnodes, and an object ID (OID). The OID references
+  the existing tree for that node, if it is known to exist. The subnodes
+  correspond to subdirectories that themselves have cache tree nodes. The
+  number of cache entries corresponds to the number of cache entries in
+  the index that describe paths within that tree's directory.
+
+  The extension tracks the full directory structure in the cache tree
+  extension, but this is generally smaller than the full cache entry list.
+
+  When a path is updated in index, Git invalidates all nodes of the
+  recursive cache tree corresponding to the parent directories of that
+  path. We store these tree nodes as being "invalid" by using "-1" as the
+  number of cache entries. Invalid nodes still store a span of index
+  entries, allowing Git to focus its efforts when reconstructing a full
+  cache tree.
 
   The signature for this extension is { 'T', 'R', 'E', 'E' }.
 
@@ -160,8 +190,8 @@ Git index format
 
   - A newline (ASCII 10); and
 
-  - 160-bit object name for the object that would result from writing
-    this span of index as a tree.
+  - Object name for the object that would result from writing this span
+    of index as a tree.
 
   An entry can be in an invalidated state and is represented by having
   a negative number in the entry_count field. In this case, there is no
@@ -172,7 +202,8 @@ Git index format
   first entry represents the root level of the repository, followed by the
   first subtree--let's call this A--of the root level (with its name
   relative to the root level), followed by the first subtree of A (with
-  its name relative to A), ...
+  its name relative to A), and so on. The specified number of subtrees
+  indicates when the current level of the recursive stack is complete.
 
 === Resolve undo
 
@@ -198,7 +229,7 @@ Git index format
     stage 1 to 3 (a missing stage is represented by "0" in this field);
     and
 
-  - At most three 160-bit object names of the entry in stages from 1 to 3
+  - At most three object names of the entry in stages from 1 to 3
     (nothing is written for a missing stage).
 
 === Split index
@@ -211,8 +242,8 @@ Git index format
 
   The extension consists of:
 
-  - 160-bit SHA-1 of the shared index file. The shared index file path
-    is $GIT_DIR/sharedindex.<SHA-1>. If all 160 bits are zero, the
+  - Hash of the shared index file. The shared index file path
+    is $GIT_DIR/sharedindex.<hash>. If all bits are zero, the
     index does not require a shared index file.
 
   - An ewah-encoded delete bitmap, each bit represents an entry in the
@@ -249,14 +280,14 @@ Git index format
   - Stat data of $GIT_DIR/info/exclude. See "Index entry" section from
     ctime field until "file size".
 
-  - Stat data of core.excludesfile
+  - Stat data of core.excludesFile
 
   - 32-bit dir_flags (see struct dir_struct)
 
-  - 160-bit SHA-1 of $GIT_DIR/info/exclude. Null SHA-1 means the file
+  - Hash of $GIT_DIR/info/exclude. A null hash means the file
     does not exist.
 
-  - 160-bit SHA-1 of core.excludesfile. Null SHA-1 means the file does
+  - Hash of core.excludesFile. A null hash means the file does
     not exist.
 
   - NUL-terminated string of per-dir exclude file name. This usually
@@ -285,13 +316,13 @@ The remaining data of each directory block is grouped by type:
   - An ewah bitmap, the n-th bit records "check-only" bit of
     read_directory_recursive() for the n-th directory.
 
-  - An ewah bitmap, the n-th bit indicates whether SHA-1 and stat data
+  - An ewah bitmap, the n-th bit indicates whether hash and stat data
     is valid for the n-th directory and exists in the next data.
 
   - An array of stat data. The n-th data corresponds with the n-th
     "one" bit in the previous ewah bitmap.
 
-  - An array of SHA-1. The n-th SHA-1 corresponds with the n-th "one" bit
+  - An array of hashes. The n-th hash corresponds with the n-th "one" bit
     in the previous ewah bitmap.
 
   - One NUL.
@@ -304,12 +335,18 @@ The remaining data of each directory block is grouped by type:
 
   The extension starts with
 
-  - 32-bit version number: the current supported version is 1.
+  - 32-bit version number: the current supported versions are 1 and 2.
 
-  - 64-bit time: the extension data reflects all changes through the given
+  - (Version 1)
+    64-bit time: the extension data reflects all changes through the given
 	time which is stored as the nanoseconds elapsed since midnight,
 	January 1, 1970.
 
+  - (Version 2)
+    A null terminated string: an opaque token defined by the file system
+    monitor application.  The extension data reflects all changes relative
+    to that token.
+
   - 32-bit bitmap size: the size of the CE_FSMONITOR_VALID bitmap.
 
   - An ewah bitmap, the n-th bit indicates whether the n-th index entry
@@ -318,7 +355,7 @@ The remaining data of each directory block is grouped by type:
 == End of Index Entry
 
   The End of Index Entry (EOIE) is used to locate the end of the variable
-  length index entries and the begining of the extensions. Code can take
+  length index entries and the beginning of the extensions. Code can take
   advantage of this to quickly locate the index extensions without having
   to parse through all of the index entries.
 
@@ -330,12 +367,12 @@ The remaining data of each directory block is grouped by type:
 
   - 32-bit offset to the end of the index entries
 
-  - 160-bit SHA-1 over the extension types and their sizes (but not
+  - Hash over the extension types and their sizes (but not
 	their contents).  E.g. if we have "TREE" extension that is N-bytes
 	long, "REUC" extension that is M-bytes long, followed by "EOIE",
 	then the hash would be:
 
-	SHA-1("TREE" + <binary representation of N> +
+	Hash("TREE" + <binary representation of N> +
 		"REUC" + <binary representation of M>)
 
 == Index Entry Offset Table
@@ -351,7 +388,19 @@ The remaining data of each directory block is grouped by type:
 
   - A number of index offset entries each consisting of:
 
-    - 32-bit offset from the begining of the file to the first cache entry
+    - 32-bit offset from the beginning of the file to the first cache entry
 	in this block of entries.
 
     - 32-bit count of cache entries in this block
+
+== Sparse Directory Entries
+
+  When using sparse-checkout in cone mode, some entire directories within
+  the index can be summarized by pointing to a tree object instead of the
+  entire expanded list of paths within that tree. An index containing such
+  entries is a "sparse index". Index format versions 4 and less were not
+  implemented with such entries in mind. Thus, for these versions, an
+  index containing sparse directory entries will include this extension
+  with signature { 's', 'd', 'i', 'r' }. Like the split-index extension,
+  tools should avoid interacting with a sparse index unless they understand
+  this extension.
diff --git a/Documentation/technical/multi-pack-index.txt b/Documentation/technical/multi-pack-index.txt
index d7e57639f7..fb688976c4 100644
--- a/Documentation/technical/multi-pack-index.txt
+++ b/Documentation/technical/multi-pack-index.txt
@@ -36,15 +36,16 @@ Design Details
   directory of an alternate. It refers only to packfiles in that
   same directory.
 
-- The pack.multiIndex config setting must be on to consume MIDX files.
+- The core.multiPackIndex config setting must be on to consume MIDX files.
 
 - The file format includes parameters for the object ID hash
   function, so a future change of hash algorithm does not require
   a change in format.
 
 - The MIDX keeps only one record per object ID. If an object appears
-  in multiple packfiles, then the MIDX selects the copy in the most-
-  recently modified packfile.
+  in multiple packfiles, then the MIDX selects the copy in the
+  preferred packfile, otherwise selecting from the most-recently
+  modified packfile.
 
 - If there exist packfiles in the pack directory not registered in
   the MIDX, then those packfiles are loaded into the `packed_git`
@@ -60,10 +61,6 @@ Design Details
 Future Work
 -----------
 
-- Add a 'verify' subcommand to the 'git midx' builtin to verify the
-  contents of the multi-pack-index file match the offsets listed in
-  the corresponding pack-indexes.
-
 - The multi-pack-index allows many packfiles, especially in a context
   where repacking is expensive (such as a very large repo), or
   unexpected maintenance time is unacceptable (such as a high-demand
@@ -102,8 +99,8 @@ Related Links
 [0] https://bugs.chromium.org/p/git/issues/detail?id=6
     Chromium work item for: Multi-Pack Index (MIDX)
 
-[1] https://public-inbox.org/git/20180107181459.222909-1-dstolee@microsoft.com/
+[1] https://lore.kernel.org/git/20180107181459.222909-1-dstolee@microsoft.com/
     An earlier RFC for the multi-pack-index feature
 
-[2] https://public-inbox.org/git/alpine.DEB.2.20.1803091557510.23109@alexmv-linux/
+[2] https://lore.kernel.org/git/alpine.DEB.2.20.1803091557510.23109@alexmv-linux/
     Git Merge 2018 Contributor's summit notes (includes discussion of MIDX)
diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt
index cab5bdd2ff..8d2f42f29e 100644
--- a/Documentation/technical/pack-format.txt
+++ b/Documentation/technical/pack-format.txt
@@ -1,6 +1,12 @@
 Git pack format
 ===============
 
+== Checksums and object IDs
+
+In a repository using the traditional SHA-1, pack checksums, index checksums,
+and object IDs (object names) mentioned below are all computed using SHA-1.
+Similarly, in SHA-256 repositories, these values are computed using SHA-256.
+
 == pack-*.pack files have the following format:
 
    - A header appears at the beginning and consists of the following:
@@ -26,7 +32,7 @@ Git pack format
 
      (deltified representation)
      n-byte type and length (3-bit type, (n-1)*7+4-bit length)
-     20-byte base object name if OBJ_REF_DELTA or a negative relative
+     base object name if OBJ_REF_DELTA or a negative relative
 	 offset from the delta object's position in the pack if this
 	 is an OBJ_OFS_DELTA object
      compressed delta data
@@ -34,7 +40,7 @@ Git pack format
      Observation: length of each object is encoded in a variable
      length format and is not constrained to 32-bit or anything.
 
-  - The trailer records 20-byte SHA-1 checksum of all of the above.
+  - The trailer records a pack checksum of all of the above.
 
 === Object types
 
@@ -49,6 +55,18 @@ Valid object types are:
 
 Type 5 is reserved for future expansion. Type 0 is invalid.
 
+=== Size encoding
+
+This document uses the following "size encoding" of non-negative
+integers: From each byte, the seven least significant bits are
+used to form the resulting integer. As long as the most significant
+bit is 1, this process continues; the byte with MSB 0 provides the
+last seven bits.  The seven-bit chunks are concatenated. Later
+values are more significant.
+
+This size encoding should not be confused with the "offset encoding",
+which is also used in this document.
+
 === Deltified representation
 
 Conceptually there are only four object types: commit, tree, tag and
@@ -58,8 +76,8 @@ ofs-delta and ref-delta, which is only valid in a pack file.
 
 Both ofs-delta and ref-delta store the "delta" to be applied to
 another object (called 'base object') to reconstruct the object. The
-difference between them is, ref-delta directly encodes 20-byte base
-object name. If the base object is in the same pack, ofs-delta encodes
+difference between them is, ref-delta directly encodes base object
+name. If the base object is in the same pack, ofs-delta encodes
 the offset of the base object in the pack instead.
 
 The base object could also be deltified if it's in the same pack.
@@ -67,7 +85,10 @@ Ref-delta can also refer to an object outside the pack (i.e. the
 so-called "thin pack"). When stored on disk however, the pack should
 be self contained to avoid cyclic dependency.
 
-The delta data is a sequence of instructions to reconstruct an object
+The delta data starts with the size of the base object and the
+size of the object to be reconstructed. These sizes are
+encoded using the size encoding from above.  The remainder of
+the delta data is a sequence of instructions to reconstruct the object
 from the base object. If the base object is deltified, it must be
 converted to canonical form first. Each instruction appends more and
 more data to the target object until it's complete. There are two
@@ -143,14 +164,14 @@ This is the instruction reserved for future expansion.
     object is stored in the packfile as the offset from the
     beginning.
 
-    20-byte object name.
+    one object name of the appropriate size.
 
   - The file is concluded with a trailer:
 
-    A copy of the 20-byte SHA-1 checksum at the end of
-    corresponding packfile.
+    A copy of the pack checksum at the end of the corresponding
+    packfile.
 
-    20-byte SHA-1-checksum of all of the above.
+    Index checksum of all of the above.
 
 Pack Idx file:
 
@@ -198,7 +219,7 @@ Pack file entry: <+
         If it is not DELTA, then deflated bytes (the size above
 		is the size before compression).
 	If it is REF_DELTA, then
-	  20-byte base object name SHA-1 (the size above is the
+	  base object name (the size above is the
 		size of the delta data that follows).
           delta data, deflated.
 	If it is OFS_DELTA, then
@@ -227,9 +248,9 @@ Pack file entry: <+
 
   - A 256-entry fan-out table just like v1.
 
-  - A table of sorted 20-byte SHA-1 object names.  These are
-    packed together without offset values to reduce the cache
-    footprint of the binary search for a specific object name.
+  - A table of sorted object names.  These are packed together
+    without offset values to reduce the cache footprint of the
+    binary search for a specific object name.
 
   - A table of 4-byte CRC32 values of the packed object data.
     This is new in v2 so compressed data can be copied directly
@@ -248,10 +269,30 @@ Pack file entry: <+
 
   - The same trailer as a v1 pack file:
 
-    A copy of the 20-byte SHA-1 checksum at the end of
+    A copy of the pack checksum at the end of
     corresponding packfile.
 
-    20-byte SHA-1-checksum of all of the above.
+    Index checksum of all of the above.
+
+== pack-*.rev files have the format:
+
+  - A 4-byte magic number '0x52494458' ('RIDX').
+
+  - A 4-byte version identifier (= 1).
+
+  - A 4-byte hash function identifier (= 1 for SHA-1, 2 for SHA-256).
+
+  - A table of index positions (one per packed object, num_objects in
+    total, each a 4-byte unsigned integer in network order), sorted by
+    their corresponding offsets in the packfile.
+
+  - A trailer, containing a:
+
+    checksum of the corresponding packfile, and
+
+    a checksum of all of the above.
+
+All 4-byte numbers are in network order.
 
 == multi-pack-index (MIDX) files have the following format:
 
@@ -273,7 +314,12 @@ HEADER:
 	    Git only writes or recognizes version 1.
 
 	1-byte Object Id Version
-	    Git only writes or recognizes version 1 (SHA1).
+	    We infer the length of object IDs (OIDs) from this value:
+		1 => SHA-1
+		2 => SHA-256
+	    If the hash type does not match the repository's hash algorithm,
+	    the multi-pack-index file should be ignored with a warning
+	    presented to the user.
 
 	1-byte number of "chunks"
 
@@ -290,6 +336,9 @@ CHUNK LOOKUP:
 	    (Chunks are provided in file-order, so you can infer the length
 	    using the next chunk position if necessary.)
 
+	The CHUNK LOOKUP matches the table of contents from
+	link:technical/chunk-format.html[the chunk-based file format].
+
 	The remaining data in the body is described one chunk at a time, and
 	these chunks may be given in any order. Chunks are required unless
 	otherwise specified.
@@ -315,10 +364,11 @@ CHUNK DATA:
 	    Stores two 4-byte values for every object.
 	    1: The pack-int-id for the pack storing this object.
 	    2: The offset within the pack.
-		If all offsets are less than 2^31, then the large offset chunk
+		If all offsets are less than 2^32, then the large offset chunk
 		will not exist and offsets are stored as in IDX v1.
 		If there is at least one offset value larger than 2^32-1, then
-		the large offset chunk must exist. If the large offset chunk
+		the large offset chunk must exist, and offsets larger than
+		2^31-1 must be stored in it instead. If the large offset chunk
 		exists and the 31st bit is on, then removing that bit reveals
 		the row in the large offsets containing the 8-byte offset of
 		this object.
@@ -328,4 +378,87 @@ CHUNK DATA:
 
 TRAILER:
 
-	20-byte SHA1-checksum of the above contents.
+	Index checksum of the above contents.
+
+== multi-pack-index reverse indexes
+
+Similar to the pack-based reverse index, the multi-pack index can also
+be used to generate a reverse index.
+
+Instead of mapping between offset, pack-, and index position, this
+reverse index maps between an object's position within the MIDX, and
+that object's position within a pseudo-pack that the MIDX describes
+(i.e., the ith entry of the multi-pack reverse index holds the MIDX
+position of ith object in pseudo-pack order).
+
+To clarify the difference between these orderings, consider a multi-pack
+reachability bitmap (which does not yet exist, but is what we are
+building towards here). Each bit needs to correspond to an object in the
+MIDX, and so we need an efficient mapping from bit position to MIDX
+position.
+
+One solution is to let bits occupy the same position in the oid-sorted
+index stored by the MIDX. But because oids are effectively random, their
+resulting reachability bitmaps would have no locality, and thus compress
+poorly. (This is the reason that single-pack bitmaps use the pack
+ordering, and not the .idx ordering, for the same purpose.)
+
+So we'd like to define an ordering for the whole MIDX based around
+pack ordering, which has far better locality (and thus compresses more
+efficiently). We can think of a pseudo-pack created by the concatenation
+of all of the packs in the MIDX. E.g., if we had a MIDX with three packs
+(a, b, c), with 10, 15, and 20 objects respectively, we can imagine an
+ordering of the objects like:
+
+    |a,0|a,1|...|a,9|b,0|b,1|...|b,14|c,0|c,1|...|c,19|
+
+where the ordering of the packs is defined by the MIDX's pack list,
+and then the ordering of objects within each pack is the same as the
+order in the actual packfile.
+
+Given the list of packs and their counts of objects, you can
+naïvely reconstruct that pseudo-pack ordering (e.g., the object at
+position 27 must be (c,1) because packs "a" and "b" consumed 25 of the
+slots). But there's a catch. Objects may be duplicated between packs, in
+which case the MIDX only stores one pointer to the object (and thus we'd
+want only one slot in the bitmap).
+
+Callers could handle duplicates themselves by reading objects in order
+of their bit-position, but that's linear in the number of objects, and
+much too expensive for ordinary bitmap lookups. Building a reverse index
+solves this, since it is the logical inverse of the index, and that
+index has already removed duplicates. But, building a reverse index on
+the fly can be expensive. Since we already have an on-disk format for
+pack-based reverse indexes, let's reuse it for the MIDX's pseudo-pack,
+too.
+
+Objects from the MIDX are ordered as follows to string together the
+pseudo-pack. Let `pack(o)` return the pack from which `o` was selected
+by the MIDX, and define an ordering of packs based on their numeric ID
+(as stored by the MIDX). Let `offset(o)` return the object offset of `o`
+within `pack(o)`. Then, compare `o1` and `o2` as follows:
+
+  - If one of `pack(o1)` and `pack(o2)` is preferred and the other
+    is not, then the preferred one sorts first.
++
+(This is a detail that allows the MIDX bitmap to determine which
+pack should be used by the pack-reuse mechanism, since it can ask
+the MIDX for the pack containing the object at bit position 0).
+
+  - If `pack(o1) ≠ pack(o2)`, then sort the two objects in descending
+    order based on the pack ID.
+
+  - Otherwise, `pack(o1) = pack(o2)`, and the objects are sorted in
+    pack-order (i.e., `o1` sorts ahead of `o2` exactly when `offset(o1)
+    < offset(o2)`).
+
+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`).
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index c73e72de0e..e13a2c064d 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -96,7 +96,7 @@ Basically what the Git client is doing to connect to an 'upload-pack'
 process on the server side over the Git protocol is this:
 
    $ echo -e -n \
-     "0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" |
+     "003agit-upload-pack /schacon/gitbook.git\0host=example.com\0" |
      nc -v example.com 9418
 
 
@@ -171,9 +171,9 @@ with a version number (if "version=1" is sent as an Extra Parameter),
 and a listing of each reference it has (all branches and tags) along
 with the object name that each reference currently points to.
 
-   $ echo -e -n "0044git-upload-pack /schacon/gitbook.git\0host=example.com\0\0version=1\0" |
+   $ echo -e -n "0045git-upload-pack /schacon/gitbook.git\0host=example.com\0\0version=1\0" |
       nc -v example.com 9418
-   000aversion 1
+   000eversion 1
    00887217a7c7e582c46cec22a130adf4b9d7d950fba0 HEAD\0multi_ack thin-pack
 		side-band side-band-64k ofs-delta shallow no-progress include-tag
    00441d3fcd5ced445d1abc402225c0b8a1299641f497 refs/heads/integration
@@ -503,8 +503,8 @@ The reference discovery phase is done nearly the same way as it is in the
 fetching protocol. Each reference obj-id and name on the server is sent
 in packet-line format to the client, followed by a flush-pkt.  The only
 real difference is that the capability listing is different - the only
-possible values are 'report-status', 'delete-refs', 'ofs-delta' and
-'push-options'.
+possible values are 'report-status', 'report-status-v2', 'delete-refs',
+'ofs-delta', 'atomic' and 'push-options'.
 
 Reference Update Request and Packfile Transfer
 ----------------------------------------------
@@ -625,7 +625,7 @@ Report Status
 -------------
 
 After receiving the pack data from the sender, the receiver sends a
-report if 'report-status' capability is in effect.
+report if 'report-status' or 'report-status-v2' capability is in effect.
 It is a short listing of what happened in that update.  It will first
 list the status of the packfile unpacking as either 'unpack ok' or
 'unpack [error]'.  Then it will list the status for each of the references
@@ -644,7 +644,42 @@ update was successful, or 'ng [refname] [error]' if the update was not.
   command-ok        = PKT-LINE("ok" SP refname)
   command-fail      = PKT-LINE("ng" SP refname SP error-msg)
 
-  error-msg         = 1*(OCTECT) ; where not "ok"
+  error-msg         = 1*(OCTET) ; where not "ok"
+----
+
+The 'report-status-v2' capability extends the protocol by adding new option
+lines in order to support reporting of reference rewritten by the
+'proc-receive' hook.  The 'proc-receive' hook may handle a command for a
+pseudo-reference which may create or update one or more references, and each
+reference may have different name, different new-oid, and different old-oid.
+
+----
+  report-status-v2  = unpack-status
+		      1*(command-status-v2)
+		      flush-pkt
+
+  unpack-status     = PKT-LINE("unpack" SP unpack-result)
+  unpack-result     = "ok" / error-msg
+
+  command-status-v2 = command-ok-v2 / command-fail
+  command-ok-v2     = command-ok
+		      *option-line
+
+  command-ok        = PKT-LINE("ok" SP refname)
+  command-fail      = PKT-LINE("ng" SP refname SP error-msg)
+
+  error-msg         = 1*(OCTET) ; where not "ok"
+
+  option-line       = *1(option-refname)
+		      *1(option-old-oid)
+		      *1(option-new-oid)
+		      *1(option-forced-update)
+
+  option-refname    = PKT-LINE("option" SP "refname" SP refname)
+  option-old-oid    = PKT-LINE("option" SP "old-oid" SP obj-id)
+  option-new-oid    = PKT-LINE("option" SP "new-oid" SP obj-id)
+  option-force      = PKT-LINE("option" SP "forced-update")
+
 ----
 
 Updates can be unsuccessful for a number of reasons.  The reference can have
diff --git a/Documentation/technical/packfile-uri.txt b/Documentation/technical/packfile-uri.txt
new file mode 100644
index 0000000000..1eb525fe76
--- /dev/null
+++ b/Documentation/technical/packfile-uri.txt
@@ -0,0 +1,82 @@
+Packfile URIs
+=============
+
+This feature allows servers to serve part of their packfile response as URIs.
+This allows server designs that improve scalability in bandwidth and CPU usage
+(for example, by serving some data through a CDN), and (in the future) provides
+some measure of resumability to clients.
+
+This feature is available only in protocol version 2.
+
+Protocol
+--------
+
+The server advertises the `packfile-uris` capability.
+
+If the client then communicates which protocols (HTTPS, etc.) it supports with
+a `packfile-uris` argument, the server MAY send a `packfile-uris` section
+directly before the `packfile` section (right after `wanted-refs` if it is
+sent) containing URIs of any of the given protocols. The URIs point to
+packfiles that use only features that the client has declared that it supports
+(e.g. ofs-delta and thin-pack). See protocol-v2.txt for the documentation of
+this section.
+
+Clients should then download and index all the given URIs (in addition to
+downloading and indexing the packfile given in the `packfile` section of the
+response) before performing the connectivity check.
+
+Server design
+-------------
+
+The server can be trivially made compatible with the proposed protocol by
+having it advertise `packfile-uris`, tolerating the client sending
+`packfile-uris`, and never sending any `packfile-uris` section. But we should
+include some sort of non-trivial implementation in the Minimum Viable Product,
+at least so that we can test the client.
+
+This is the implementation: a feature, marked experimental, that allows the
+server to be configured by one or more `uploadpack.blobPackfileUri=
+<object-hash> <pack-hash> <uri>` entries. Whenever the list of objects to be
+sent is assembled, all such blobs are excluded, replaced with URIs. As noted
+in "Future work" below, the server can evolve in the future to support
+excluding other objects (or other implementations of servers could be made
+that support excluding other objects) without needing a protocol change, so
+clients should not expect that packfiles downloaded in this way only contain
+single blobs.
+
+Client design
+-------------
+
+The client has a config variable `fetch.uriprotocols` that determines which
+protocols the end user is willing to use. By default, this is empty.
+
+When the client downloads the given URIs, it should store them with "keep"
+files, just like it does with the packfile in the `packfile` section. These
+additional "keep" files can only be removed after the refs have been updated -
+just like the "keep" file for the packfile in the `packfile` section.
+
+The division of work (initial fetch + additional URIs) introduces convenient
+points for resumption of an interrupted clone - such resumption can be done
+after the Minimum Viable Product (see "Future work").
+
+Future work
+-----------
+
+The protocol design allows some evolution of the server and client without any
+need for protocol changes, so only a small-scoped design is included here to
+form the MVP. For example, the following can be done:
+
+ * On the server, more sophisticated means of excluding objects (e.g. by
+   specifying a commit to represent that commit and all objects that it
+   references).
+ * On the client, resumption of clone. If a clone is interrupted, information
+   could be recorded in the repository's config and a "clone-resume" command
+   can resume the clone in progress. (Resumption of subsequent fetches is more
+   difficult because that must deal with the user wanting to use the repository
+   even after the fetch was interrupted.)
+
+There are some possible features that will require a change in protocol:
+
+ * Additional HTTP headers (e.g. authentication)
+ * Byte range support
+ * Different file formats referenced by URIs (e.g. raw object)
diff --git a/Documentation/technical/parallel-checkout.txt b/Documentation/technical/parallel-checkout.txt
new file mode 100644
index 0000000000..e790258a1a
--- /dev/null
+++ b/Documentation/technical/parallel-checkout.txt
@@ -0,0 +1,270 @@
+Parallel Checkout Design Notes
+==============================
+
+The "Parallel Checkout" feature attempts to use multiple processes to
+parallelize the work of uncompressing the blobs, applying in-core
+filters, and writing the resulting contents to the working tree during a
+checkout operation. It can be used by all checkout-related commands,
+such as `clone`, `checkout`, `reset`, `sparse-checkout`, and others.
+
+These commands share the following basic structure:
+
+* Step 1: Read the current index file into memory.
+
+* Step 2: Modify the in-memory index based upon the command, and
+  temporarily mark all cache entries that need to be updated.
+
+* Step 3: Populate the working tree to match the new candidate index.
+  This includes iterating over all of the to-be-updated cache entries
+  and delete, create, or overwrite the associated files in the working
+  tree.
+
+* Step 4: Write the new index to disk.
+
+Step 3 is the focus of the "parallel checkout" effort described here.
+
+Sequential Implementation
+-------------------------
+
+For the purposes of discussion here, the current sequential
+implementation of Step 3 is divided in 3 parts, each one implemented in
+its own function:
+
+* Step 3a: `unpack-trees.c:check_updates()` contains a series of
+  sequential loops iterating over the `cache_entry`'s array. The main
+  loop in this function calls the Step 3b function for each of the
+  to-be-updated entries.
+
+* Step 3b: `entry.c:checkout_entry()` examines the existing working tree
+  for file conflicts, collisions, and unsaved changes. It removes files
+  and creates leading directories as necessary. It calls the Step 3c
+  function for each entry to be written.
+
+* Step 3c: `entry.c:write_entry()` loads the blob into memory, smudges
+  it if necessary, creates the file in the working tree, writes the
+  smudged contents, calls `fstat()` or `lstat()`, and updates the
+  associated `cache_entry` struct with the stat information gathered.
+
+It wouldn't be safe to perform Step 3b in parallel, as there could be
+race conditions between file creations and removals. Instead, the
+parallel checkout framework lets the sequential code handle Step 3b,
+and uses parallel workers to replace the sequential
+`entry.c:write_entry()` calls from Step 3c.
+
+Rejected Multi-Threaded Solution
+--------------------------------
+
+The most "straightforward" implementation would be to spread the set of
+to-be-updated cache entries across multiple threads. But due to the
+thread-unsafe functions in the ODB code, we would have to use locks to
+coordinate the parallel operation. An early prototype of this solution
+showed that the multi-threaded checkout would bring performance
+improvements over the sequential code, but there was still too much lock
+contention. A `perf` profiling indicated that around 20% of the runtime
+during a local Linux clone (on an SSD) was spent in locking functions.
+For this reason this approach was rejected in favor of using multiple
+child processes, which led to a better performance.
+
+Multi-Process Solution
+----------------------
+
+Parallel checkout alters the aforementioned Step 3 to use multiple
+`checkout--worker` background processes to distribute the work. The
+long-running worker processes are controlled by the foreground Git
+command using the existing run-command API.
+
+Overview
+~~~~~~~~
+
+Step 3b is only slightly altered; for each entry to be checked out, the
+main process performs the following steps:
+
+* M1: Check whether there is any untracked or unclean file in the
+  working tree which would be overwritten by this entry, and decide
+  whether to proceed (removing the file(s)) or not.
+
+* M2: Create the leading directories.
+
+* M3: Load the conversion attributes for the entry's path.
+
+* M4: Check, based on the entry's type and conversion attributes,
+  whether the entry is eligible for parallel checkout (more on this
+  later). If it is eligible, enqueue the entry and the loaded
+  attributes to later write the entry in parallel. If not, write the
+  entry right away, using the default sequential code.
+
+Note: we save the conversion attributes associated with each entry
+because the workers don't have access to the main process' index state,
+so they can't load the attributes by themselves (and the attributes are
+needed to properly smudge the entry). Additionally, this has a positive
+impact on performance as (1) we don't need to load the attributes twice
+and (2) the attributes machinery is optimized to handle paths in
+sequential order.
+
+After all entries have passed through the above steps, the main process
+checks if the number of enqueued entries is sufficient to spread among
+the workers. If not, it just writes them sequentially. Otherwise, it
+spawns the workers and distributes the queued entries uniformly in
+continuous chunks. This aims to minimize the chances of two workers
+writing to the same directory simultaneously, which could increase lock
+contention in the kernel.
+
+Then, for each assigned item, each worker:
+
+* W1: Checks if there is any non-directory file in the leading part of
+  the entry's path or if there already exists a file at the entry' path.
+  If so, mark the entry with `PC_ITEM_COLLIDED` and skip it (more on
+  this later).
+
+* W2: Creates the file (with O_CREAT and O_EXCL).
+
+* W3: Loads the blob into memory (inflating and delta reconstructing
+  it).
+
+* W4: Applies any required in-process filter, like end-of-line
+  conversion and re-encoding.
+
+* W5: Writes the result to the file descriptor opened at W2.
+
+* W6: Calls `fstat()` or lstat()` on the just-written path, and sends
+  the result back to the main process, together with the end status of
+  the operation and the item's identification number.
+
+Note that, when possible, steps W3 to W5 are delegated to the streaming
+machinery, removing the need to keep the entire blob in memory.
+
+If the worker fails to read the blob or to write it to the working tree,
+it removes the created file to avoid leaving empty files behind. This is
+the *only* time a worker is allowed to remove a file.
+
+As mentioned earlier, it is the responsibility of the main process to
+remove any file that blocks the checkout operation (or abort if the
+removal(s) would cause data loss and the user didn't ask to `--force`).
+This is crucial to avoid race conditions and also to properly detect
+path collisions at Step W1.
+
+After the workers finish writing the items and sending back the required
+information, the main process handles the results in two steps:
+
+- First, it updates the in-memory index with the `lstat()` information
+  sent by the workers. (This must be done first as this information
+  might me required in the following step.)
+
+- Then it writes the items which collided on disk (i.e. items marked
+  with `PC_ITEM_COLLIDED`). More on this below.
+
+Path Collisions
+---------------
+
+Path collisions happen when two different paths correspond to the same
+entry in the file system. E.g. the paths 'a' and 'A' would collide in a
+case-insensitive file system.
+
+The sequential checkout deals with collisions in the same way that it
+deals with files that were already present in the working tree before
+checkout. Basically, it checks if the path that it wants to write
+already exists on disk, makes sure the existing file doesn't have
+unsaved data, and then overwrites it. (To be more pedantic: it deletes
+the existing file and creates the new one.) So, if there are multiple
+colliding files to be checked out, the sequential code will write each
+one of them but only the last will actually survive on disk.
+
+Parallel checkout aims to reproduce the same behavior. However, we
+cannot let the workers racily write to the same file on disk. Instead,
+the workers detect when the entry that they want to check out would
+collide with an existing file, and mark it with `PC_ITEM_COLLIDED`.
+Later, the main process can sequentially feed these entries back to
+`checkout_entry()` without the risk of race conditions. On clone, this
+also has the effect of marking the colliding entries to later emit a
+warning for the user, like the classic sequential checkout does.
+
+The workers are able to detect both collisions among the entries being
+concurrently written and collisions between a parallel-eligible entry
+and an ineligible entry. The general idea for collision detection is
+quite straightforward: for each parallel-eligible entry, the main
+process must remove all files that prevent this entry from being written
+(before enqueueing it). This includes any non-directory file in the
+leading path of the entry. Later, when a worker gets assigned the entry,
+it looks again for the non-directories files and for an already existing
+file at the entry's path. If any of these checks finds something, the
+worker knows that there was a path collision.
+
+Because parallel checkout can distinguish path collisions from the case
+where the file was already present in the working tree before checkout,
+we could alternatively choose to skip the checkout of colliding entries.
+However, each entry that doesn't get written would have NULL `lstat()`
+fields on the index. This could cause performance penalties for
+subsequent commands that need to refresh the index, as they would have
+to go to the file system to see if the entry is dirty. Thus, if we have
+N entries in a colliding group and we decide to write and `lstat()` only
+one of them, every subsequent `git-status` will have to read, convert,
+and hash the written file N - 1 times. By checking out all colliding
+entries (like the sequential code does), we only pay the overhead once,
+during checkout.
+
+Eligible Entries for Parallel Checkout
+--------------------------------------
+
+As previously mentioned, not all entries passed to `checkout_entry()`
+will be considered eligible for parallel checkout. More specifically, we
+exclude:
+
+- Symbolic links; to avoid race conditions that, in combination with
+  path collisions, could cause workers to write files at the wrong
+  place. For example, if we were to concurrently check out a symlink
+  'a' -> 'b' and a regular file 'A/f' in a case-insensitive file system,
+  we could potentially end up writing the file 'A/f' at 'a/f', due to a
+  race condition.
+
+- Regular files that require external filters (either "one shot" filters
+  or long-running process filters). These filters are black-boxes to Git
+  and may have their own internal locking or non-concurrent assumptions.
+  So it might not be safe to run multiple instances in parallel.
++
+Besides, long-running filters may use the delayed checkout feature to
+postpone the return of some filtered blobs. The delayed checkout queue
+and the parallel checkout queue are not compatible and should remain
+separate.
++
+Note: regular files that only require internal filters, like end-of-line
+conversion and re-encoding, are eligible for parallel checkout.
+
+Ineligible entries are checked out by the classic sequential codepath
+*before* spawning workers.
+
+Note: submodules's files are also eligible for parallel checkout (as
+long as they don't fall into any of the excluding categories mentioned
+above). But since each submodule is checked out in its own child
+process, we don't mix the superproject's and the submodules' files in
+the same parallel checkout process or queue.
+
+The API
+-------
+
+The parallel checkout API was designed with the goal of minimizing
+changes to the current users of the checkout machinery. This means that
+they don't have to call a different function for sequential or parallel
+checkout. As already mentioned, `checkout_entry()` will automatically
+insert the given entry in the parallel checkout queue when this feature
+is enabled and the entry is eligible; otherwise, it will just write the
+entry right away, using the sequential code. In general, callers of the
+parallel checkout API should look similar to this:
+
+----------------------------------------------
+int pc_workers, pc_threshold, err = 0;
+struct checkout state;
+
+get_parallel_checkout_configs(&pc_workers, &pc_threshold);
+
+/*
+ * This check is not strictly required, but it
+ * should save some time in sequential mode.
+ */
+if (pc_workers > 1)
+	init_parallel_checkout();
+
+for (each cache_entry ce to-be-updated)
+	err |= checkout_entry(ce, &state, NULL, NULL);
+
+err |= run_parallel_checkout(&state, pc_workers, pc_threshold, NULL, NULL);
+----------------------------------------------
diff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt
index 210373e258..a0dd7c66f2 100644
--- a/Documentation/technical/partial-clone.txt
+++ b/Documentation/technical/partial-clone.txt
@@ -32,7 +32,7 @@ if/when needed.
 
 A remote that can later provide the missing objects is called a
 promisor remote, as it promises to send the objects when
-requested. Initialy Git supported only one promisor remote, the origin
+requested. Initially Git supported only one promisor remote, the origin
 remote from which the user cloned and that was configured in the
 "extensions.partialClone" config option. Later support for more than
 one promisor remote has been implemented.
@@ -171,20 +171,13 @@ additional flag.
 Fetching Missing Objects
 ------------------------
 
-- Fetching of objects is done using the existing transport mechanism using
-  transport_fetch_refs(), setting a new transport option
-  TRANS_OPT_NO_DEPENDENTS to indicate that only the objects themselves are
-  desired, not any object that they refer to.
-+
-Because some transports invoke fetch_pack() in the same process, fetch_pack()
-has been updated to not use any object flags when the corresponding argument
-(no_dependents) is set.
+- Fetching of objects is done by invoking a "git fetch" subprocess.
 
 - The local repository sends a request with the hashes of all requested
-  objects as "want" lines, and does not perform any packfile negotiation.
+  objects, and does not perform any packfile negotiation.
   It then receives a packfile.
 
-- Because we are reusing the existing fetch-pack mechanism, fetching
+- Because we are reusing the existing fetch mechanism, fetching
   currently fetches all objects referred to by the requested objects, even
   though they are not necessary.
 
@@ -249,8 +242,7 @@ remote in a specific order.
   repository and can satisfy all such requests.
 
 - Repack essentially treats promisor and non-promisor packfiles as 2
-  distinct partitions and does not mix them.  Repack currently only works
-  on non-promisor packfiles and loose objects.
+  distinct partitions and does not mix them.
 
 - Dynamic object fetching invokes fetch-pack once *for each item*
   because most algorithms stumble upon a missing object and need to have
@@ -280,9 +272,6 @@ to use those promisor remotes in that order."
 The user might want to work in a triangular work flow with multiple
 promisor remotes that each have an incomplete view of the repository.
 
-- Allow repack to work on promisor packfiles (while keeping them distinct
-  from non-promisor packfiles).
-
 - Allow non-pathname-based filters to make use of packfile bitmaps (when
   present).  This was just an omission during the initial implementation.
 
@@ -350,26 +339,26 @@ Related Links
 [0] https://crbug.com/git/2
     Bug#2: Partial Clone
 
-[1] https://public-inbox.org/git/20170113155253.1644-1-benpeart@microsoft.com/ +
+[1] https://lore.kernel.org/git/20170113155253.1644-1-benpeart@microsoft.com/ +
     Subject: [RFC] Add support for downloading blobs on demand +
     Date: Fri, 13 Jan 2017 10:52:53 -0500
 
-[2] https://public-inbox.org/git/cover.1506714999.git.jonathantanmy@google.com/ +
+[2] https://lore.kernel.org/git/cover.1506714999.git.jonathantanmy@google.com/ +
     Subject: [PATCH 00/18] Partial clone (from clone to lazy fetch in 18 patches) +
     Date: Fri, 29 Sep 2017 13:11:36 -0700
 
-[3] https://public-inbox.org/git/20170426221346.25337-1-jonathantanmy@google.com/ +
+[3] https://lore.kernel.org/git/20170426221346.25337-1-jonathantanmy@google.com/ +
     Subject: Proposal for missing blob support in Git repos +
     Date: Wed, 26 Apr 2017 15:13:46 -0700
 
-[4] https://public-inbox.org/git/1488999039-37631-1-git-send-email-git@jeffhostetler.com/ +
+[4] https://lore.kernel.org/git/1488999039-37631-1-git-send-email-git@jeffhostetler.com/ +
     Subject: [PATCH 00/10] RFC Partial Clone and Fetch +
     Date: Wed,  8 Mar 2017 18:50:29 +0000
 
-[5] https://public-inbox.org/git/20170505152802.6724-1-benpeart@microsoft.com/ +
+[5] https://lore.kernel.org/git/20170505152802.6724-1-benpeart@microsoft.com/ +
     Subject: [PATCH v7 00/10] refactor the filter process code into a reusable module +
     Date: Fri,  5 May 2017 11:27:52 -0400
 
-[6] https://public-inbox.org/git/20170714132651.170708-1-benpeart@microsoft.com/ +
+[6] https://lore.kernel.org/git/20170714132651.170708-1-benpeart@microsoft.com/ +
     Subject: [RFC/PATCH v2 0/1] Add support for downloading blobs on demand +
     Date: Fri, 14 Jul 2017 09:26:50 -0400
diff --git a/Documentation/technical/protocol-capabilities.txt b/Documentation/technical/protocol-capabilities.txt
index 2b267c0da6..9dfade930d 100644
--- a/Documentation/technical/protocol-capabilities.txt
+++ b/Documentation/technical/protocol-capabilities.txt
@@ -22,13 +22,13 @@ was sent.  Server MUST NOT ignore capabilities that client requested
 and server advertised.  As a consequence of these rules, server MUST
 NOT advertise capabilities it does not understand.
 
-The 'atomic', 'report-status', 'delete-refs', 'quiet', and 'push-cert'
-capabilities are sent and recognized by the receive-pack (push to server)
-process.
+The 'atomic', 'report-status', 'report-status-v2', 'delete-refs', 'quiet',
+and 'push-cert' capabilities are sent and recognized by the receive-pack
+(push to server) process.
 
 The 'ofs-delta' and 'side-band-64k' capabilities are sent and recognized
-by both upload-pack and receive-pack protocols.  The 'agent' capability
-may optionally be sent in both protocols.
+by both upload-pack and receive-pack protocols.  The 'agent' and 'session-id'
+capabilities may optionally be sent in both protocols.
 
 All other capabilities are only recognized by the upload-pack (fetch
 from server) process.
@@ -176,6 +176,21 @@ agent strings are purely informative for statistics and debugging
 purposes, and MUST NOT be used to programmatically assume the presence
 or absence of particular features.
 
+object-format
+-------------
+
+This capability, which takes a hash algorithm as an argument, indicates
+that the server supports the given hash algorithms.  It may be sent
+multiple times; if so, the first one given is the one used in the ref
+advertisement.
+
+When provided by the client, this indicates that it intends to use the
+given hash algorithm to communicate.  The algorithm provided must be one
+that the server supports.
+
+If this capability is not provided, it is assumed that the only
+supported algorithm is SHA-1.
+
 symref
 ------
 
@@ -269,6 +284,17 @@ each reference was updated successfully.  If any of those were not
 successful, it will send back an error message.  See pack-protocol.txt
 for example messages.
 
+report-status-v2
+----------------
+
+Capability 'report-status-v2' extends capability 'report-status' by
+adding new "option" directives in order to support reference rewritten by
+the "proc-receive" hook.  The "proc-receive" hook may handle a command
+for a pseudo-reference which may create or update a reference with
+different name, new-oid, and old-oid.  While the capability
+'report-status' cannot report for such case.  See pack-protocol.txt
+for details.
+
 delete-refs
 -----------
 
@@ -309,15 +335,19 @@ allow-tip-sha1-in-want
 ----------------------
 
 If the upload-pack server advertises this capability, fetch-pack may
-send "want" lines with SHA-1s that exist at the server but are not
-advertised by upload-pack.
+send "want" lines with object names that exist at the server but are not
+advertised by upload-pack. For historical reasons, the name of this
+capability contains "sha1". Object names are always given using the
+object format negotiated through the 'object-format' capability.
 
 allow-reachable-sha1-in-want
 ----------------------------
 
 If the upload-pack server advertises this capability, fetch-pack may
-send "want" lines with SHA-1s that exist at the server but are not
-advertised by upload-pack.
+send "want" lines with object names that exist at the server but are not
+advertised by upload-pack. For historical reasons, the name of this
+capability contains "sha1". Object names are always given using the
+object format negotiated through the 'object-format' capability.
 
 push-cert=<nonce>
 -----------------
@@ -335,3 +365,16 @@ If the upload-pack server advertises the 'filter' capability,
 fetch-pack may send "filter" commands to request a partial clone
 or partial fetch and request that the server omit various objects
 from the packfile.
+
+session-id=<session id>
+-----------------------
+
+The server may advertise a session ID that can be used to identify this process
+across multiple requests. The client may advertise its own session ID back to
+the server as well.
+
+Session IDs should be unique to a given process. They must fit within a
+packet-line, and must not contain non-printable or whitespace characters. The
+current implementation uses trace2 session IDs (see
+link:api-trace2.html[api-trace2] for details), but this may change and users of
+the session ID should not rely on this fact.
diff --git a/Documentation/technical/protocol-v2.txt b/Documentation/technical/protocol-v2.txt
index 40f91f6b1e..1040d85319 100644
--- a/Documentation/technical/protocol-v2.txt
+++ b/Documentation/technical/protocol-v2.txt
@@ -33,6 +33,8 @@ In protocol v2 these special packets will have the following semantics:
 
   * '0000' Flush Packet (flush-pkt) - indicates the end of a message
   * '0001' Delimiter Packet (delim-pkt) - separates sections of a message
+  * '0002' Response End Packet (response-end-pkt) - indicates the end of a
+    response for stateless connections
 
 Initial Client Request
 ----------------------
@@ -190,11 +192,20 @@ ls-refs takes in the following arguments:
 	When specified, only references having a prefix matching one of
 	the provided prefixes are displayed.
 
+If the 'unborn' feature is advertised the following argument can be
+included in the client's request.
+
+    unborn
+	The server will send information about HEAD even if it is a symref
+	pointing to an unborn branch in the form "unborn HEAD
+	symref-target:<target>".
+
 The output of ls-refs is as follows:
 
     output = *ref
 	     flush-pkt
-    ref = PKT-LINE(obj-id SP refname *(SP ref-attribute) LF)
+    obj-id-or-unborn = (obj-id | "unborn")
+    ref = PKT-LINE(obj-id-or-unborn SP refname *(SP ref-attribute) LF)
     ref-attribute = (symref | peeled)
     symref = "symref-target:" symref-target
     peeled = "peeled:" obj-id
@@ -252,7 +263,7 @@ A `fetch` request can take the following arguments:
     ofs-delta
 	Indicate that the client understands PACKv2 with delta referring
 	to its base by position in pack rather than by an oid.  That is,
-	they can read OBJ_OFS_DELTA (ake type 6) in a packfile.
+	they can read OBJ_OFS_DELTA (aka type 6) in a packfile.
 
 If the 'shallow' feature is advertised the following arguments can be
 included in the clients request as well as the potential addition of the
@@ -323,13 +334,34 @@ included in the client's request:
 	indicating its sideband (1, 2, or 3), and the server may send "0005\2"
 	(a PKT-LINE of sideband 2 with no payload) as a keepalive packet.
 
+If the 'packfile-uris' feature is advertised, the following argument
+can be included in the client's request as well as the potential
+addition of the 'packfile-uris' section in the server's response as
+explained below.
+
+    packfile-uris <comma-separated list of protocols>
+	Indicates to the server that the client is willing to receive
+	URIs of any of the given protocols in place of objects in the
+	sent packfile. Before performing the connectivity check, the
+	client should download from all given URIs. Currently, the
+	protocols supported are "http" and "https".
+
+If the 'wait-for-done' feature is advertised, the following argument
+can be included in the client's request.
+
+    wait-for-done
+	Indicates to the server that it should never send "ready", but
+	should wait for the client to say "done" before sending the
+	packfile.
+
 The response of `fetch` is broken into a number of sections separated by
 delimiter packets (0001), with each section beginning with its section
-header.
+header. Most sections are sent only when the packfile is sent.
 
-    output = *section
-    section = (acknowledgments | shallow-info | wanted-refs | packfile)
-	      (flush-pkt | delim-pkt)
+    output = acknowledgements flush-pkt |
+	     [acknowledgments delim-pkt] [shallow-info delim-pkt]
+	     [wanted-refs delim-pkt] [packfile-uris delim-pkt]
+	     packfile flush-pkt
 
     acknowledgments = PKT-LINE("acknowledgments" LF)
 		      (nak | *ack)
@@ -347,13 +379,17 @@ header.
 		  *PKT-LINE(wanted-ref LF)
     wanted-ref = obj-id SP refname
 
+    packfile-uris = PKT-LINE("packfile-uris" LF) *packfile-uri
+    packfile-uri = PKT-LINE(40*(HEXDIGIT) SP *%x20-ff LF)
+
     packfile = PKT-LINE("packfile" LF)
 	       *PKT-LINE(%x01-03 *%x00-ff)
 
     acknowledgments section
-	* If the client determines that it is finished with negotiations
-	  by sending a "done" line, the acknowledgments sections MUST be
-	  omitted from the server's response.
+	* If the client determines that it is finished with negotiations by
+	  sending a "done" line (thus requiring the server to send a packfile),
+	  the acknowledgments sections MUST be omitted from the server's
+	  response.
 
 	* Always begins with the section header "acknowledgments"
 
@@ -404,9 +440,6 @@ header.
 	  which the client has not indicated was shallow as a part of
 	  its request.
 
-	* This section is only included if a packfile section is also
-	  included in the response.
-
     wanted-refs section
 	* This section is only included if the client has requested a
 	  ref using a 'want-ref' line and if a packfile section is also
@@ -420,6 +453,20 @@ header.
 	* The server MUST NOT send any refs which were not requested
 	  using 'want-ref' lines.
 
+    packfile-uris section
+	* This section is only included if the client sent
+	  'packfile-uris' and the server has at least one such URI to
+	  send.
+
+	* Always begins with the section header "packfile-uris".
+
+	* For each URI the server sends, it sends a hash of the pack's
+	  contents (as output by git index-pack) followed by the URI.
+
+	* The hashes are 40 hex characters long. When Git upgrades to a new
+	  hash algorithm, this might need to be updated. (It should match
+	  whatever index-pack outputs after "pack\t" or "keep\t".
+
     packfile section
 	* This section is only included if the client has sent 'want'
 	  lines in its request and either requested that no more
@@ -453,3 +500,56 @@ included in a request.  This is done by sending each option as a
 a request.
 
 The provided options must not contain a NUL or LF character.
+
+ object-format
+~~~~~~~~~~~~~~~
+
+The server can advertise the `object-format` capability with a value `X` (in the
+form `object-format=X`) to notify the client that the server is able to deal
+with objects using hash algorithm X.  If not specified, the server is assumed to
+only handle SHA-1.  If the client would like to use a hash algorithm other than
+SHA-1, it should specify its object-format string.
+
+session-id=<session id>
+~~~~~~~~~~~~~~~~~~~~~~~
+
+The server may advertise a session ID that can be used to identify this process
+across multiple requests. The client may advertise its own session ID back to
+the server as well.
+
+Session IDs should be unique to a given process. They must fit within a
+packet-line, and must not contain non-printable or whitespace characters. The
+current implementation uses trace2 session IDs (see
+link:api-trace2.html[api-trace2] for details), but this may change and users of
+the session ID should not rely on this fact.
+
+object-info
+~~~~~~~~~~~
+
+`object-info` is the command to retrieve information about one or more objects.
+Its main purpose is to allow a client to make decisions based on this
+information without having to fully fetch objects. Object size is the only
+information that is currently supported.
+
+An `object-info` request takes the following arguments:
+
+	size
+	Requests size information to be returned for each listed object id.
+
+	oid <oid>
+	Indicates to the server an object which the client wants to obtain
+	information for.
+
+The response of `object-info` is a list of the requested object ids
+and associated requested information, each separated by a single space.
+
+	output = info flush-pkt
+
+	info = PKT-LINE(attrs) LF)
+		*PKT-LINE(obj-info LF)
+
+	attrs = attr | attrs SP attrs
+
+	attr = "size"
+
+	obj-info = obj-id SP obj-size
diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt
index 4a8be4d144..ceda4bbfda 100644
--- a/Documentation/technical/racy-git.txt
+++ b/Documentation/technical/racy-git.txt
@@ -51,7 +51,7 @@ of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git
 only fixes the issue for file systems with exactly 1 ns or 1 s
 resolution. Other file systems are still broken in current Linux
 kernels (e.g. CEPH, CIFS, NTFS, UDF), see
-https://lkml.org/lkml/2015/6/9/714
+https://lore.kernel.org/lkml/5577240D.7020309@gmail.com/
 
 Racy Git
 --------
diff --git a/Documentation/technical/reftable.txt b/Documentation/technical/reftable.txt
new file mode 100644
index 0000000000..d7c3b645cf
--- /dev/null
+++ b/Documentation/technical/reftable.txt
@@ -0,0 +1,1098 @@
+reftable
+--------
+
+Overview
+~~~~~~~~
+
+Problem statement
+^^^^^^^^^^^^^^^^^
+
+Some repositories contain a lot of references (e.g. android at 866k,
+rails at 31k). The existing packed-refs format takes up a lot of space
+(e.g. 62M), and does not scale with additional references. Lookup of a
+single reference requires linearly scanning the file.
+
+Atomic pushes modifying multiple references require copying the entire
+packed-refs file, which can be a considerable amount of data moved
+(e.g. 62M in, 62M out) for even small transactions (2 refs modified).
+
+Repositories with many loose references occupy a large number of disk
+blocks from the local file system, as each reference is its own file
+storing 41 bytes (and another file for the corresponding reflog). This
+negatively affects the number of inodes available when a large number of
+repositories are stored on the same filesystem. Readers can be penalized
+due to the larger number of syscalls required to traverse and read the
+`$GIT_DIR/refs` directory.
+
+
+Objectives
+^^^^^^^^^^
+
+* Near constant time lookup for any single reference, even when the
+repository is cold and not in process or kernel cache.
+* Near constant time verification if an object name is referred to by at least
+one reference (for allow-tip-sha1-in-want).
+* Efficient enumeration of an entire namespace, such as `refs/tags/`.
+* Support atomic push with `O(size_of_update)` operations.
+* Combine reflog storage with ref storage for small transactions.
+* Separate reflog storage for base refs and historical logs.
+
+Description
+^^^^^^^^^^^
+
+A reftable file is a portable binary file format customized for
+reference storage. References are sorted, enabling linear scans, binary
+search lookup, and range scans.
+
+Storage in the file is organized into variable sized blocks. Prefix
+compression is used within a single block to reduce disk space. Block
+size and alignment is tunable by the writer.
+
+Performance
+^^^^^^^^^^^
+
+Space used, packed-refs vs. reftable:
+
+[cols=",>,>,>,>,>",options="header",]
+|===============================================================
+|repository |packed-refs |reftable |% original |avg ref |avg obj
+|android |62.2 M |36.1 M |58.0% |33 bytes |5 bytes
+|rails |1.8 M |1.1 M |57.7% |29 bytes |4 bytes
+|git |78.7 K |48.1 K |61.0% |50 bytes |4 bytes
+|git (heads) |332 b |269 b |81.0% |33 bytes |0 bytes
+|===============================================================
+
+Scan (read 866k refs), by reference name lookup (single ref from 866k
+refs), and by SHA-1 lookup (refs with that SHA-1, from 866k refs):
+
+[cols=",>,>,>,>",options="header",]
+|=========================================================
+|format |cache |scan |by name |by SHA-1
+|packed-refs |cold |402 ms |409,660.1 usec |412,535.8 usec
+|packed-refs |hot | |6,844.6 usec |20,110.1 usec
+|reftable |cold |112 ms |33.9 usec |323.2 usec
+|reftable |hot | |20.2 usec |320.8 usec
+|=========================================================
+
+Space used for 149,932 log entries for 43,061 refs, reflog vs. reftable:
+
+[cols=",>,>",options="header",]
+|================================
+|format |size |avg entry
+|$GIT_DIR/logs |173 M |1209 bytes
+|reftable |5 M |37 bytes
+|================================
+
+Details
+~~~~~~~
+
+Peeling
+^^^^^^^
+
+References stored in a reftable are peeled, a record for an annotated
+(or signed) tag records both the tag object, and the object it refers
+to. This is analogous to storage in the packed-refs format.
+
+Reference name encoding
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Reference names are an uninterpreted sequence of bytes that must pass
+linkgit:git-check-ref-format[1] as a valid reference name.
+
+Key unicity
+^^^^^^^^^^^
+
+Each entry must have a unique key; repeated keys are disallowed.
+
+Network byte order
+^^^^^^^^^^^^^^^^^^
+
+All multi-byte, fixed width fields are in network byte order.
+
+Varint encoding
+^^^^^^^^^^^^^^^
+
+Varint encoding is identical to the ofs-delta encoding method used
+within pack files.
+
+Decoder works such as:
+
+....
+val = buf[ptr] & 0x7f
+while (buf[ptr] & 0x80) {
+  ptr++
+  val = ((val + 1) << 7) | (buf[ptr] & 0x7f)
+}
+....
+
+Ordering
+^^^^^^^^
+
+Blocks are lexicographically ordered by their first reference.
+
+Directory/file conflicts
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+The reftable format accepts both `refs/heads/foo` and
+`refs/heads/foo/bar` as distinct references.
+
+This property is useful for retaining log records in reftable, but may
+confuse versions of Git using `$GIT_DIR/refs` directory tree to maintain
+references. Users of reftable may choose to continue to reject `foo` and
+`foo/bar` type conflicts to prevent problems for peers.
+
+File format
+~~~~~~~~~~~
+
+Structure
+^^^^^^^^^
+
+A reftable file has the following high-level structure:
+
+....
+first_block {
+  header
+  first_ref_block
+}
+ref_block*
+ref_index*
+obj_block*
+obj_index*
+log_block*
+log_index*
+footer
+....
+
+A log-only file omits the `ref_block`, `ref_index`, `obj_block` and
+`obj_index` sections, containing only the file header and log block:
+
+....
+first_block {
+  header
+}
+log_block*
+log_index*
+footer
+....
+
+in a log-only file the first log block immediately follows the file
+header, without padding to block alignment.
+
+Block size
+^^^^^^^^^^
+
+The file's block size is arbitrarily determined by the writer, and does
+not have to be a power of 2. The block size must be larger than the
+longest reference name or log entry used in the repository, as
+references cannot span blocks.
+
+Powers of two that are friendly to the virtual memory system or
+filesystem (such as 4k or 8k) are recommended. Larger sizes (64k) can
+yield better compression, with a possible increased cost incurred by
+readers during access.
+
+The largest block size is `16777215` bytes (15.99 MiB).
+
+Block alignment
+^^^^^^^^^^^^^^^
+
+Writers may choose to align blocks at multiples of the block size by
+including `padding` filled with NUL bytes at the end of a block to round
+out to the chosen alignment. When alignment is used, writers must
+specify the alignment with the file header's `block_size` field.
+
+Block alignment is not required by the file format. Unaligned files must
+set `block_size = 0` in the file header, and omit `padding`. Unaligned
+files with more than one ref block must include the link:#Ref-index[ref
+index] to support fast lookup. Readers must be able to read both aligned
+and non-aligned files.
+
+Very small files (e.g. a single ref block) may omit `padding` and the ref
+index to reduce total file size.
+
+Header (version 1)
+^^^^^^^^^^^^^^^^^^
+
+A 24-byte header appears at the beginning of the file:
+
+....
+'REFT'
+uint8( version_number = 1 )
+uint24( block_size )
+uint64( min_update_index )
+uint64( max_update_index )
+....
+
+Aligned files must specify `block_size` to configure readers with the
+expected block alignment. Unaligned files must set `block_size = 0`.
+
+The `min_update_index` and `max_update_index` describe bounds for the
+`update_index` field of all log records in this file. When reftables are
+used in a stack for link:#Update-transactions[transactions], these
+fields can order the files such that the prior file's
+`max_update_index + 1` is the next file's `min_update_index`.
+
+Header (version 2)
+^^^^^^^^^^^^^^^^^^
+
+A 28-byte header appears at the beginning of the file:
+
+....
+'REFT'
+uint8( version_number = 2 )
+uint24( block_size )
+uint64( min_update_index )
+uint64( max_update_index )
+uint32( hash_id )
+....
+
+The header is identical to `version_number=1`, with the 4-byte hash ID
+("sha1" for SHA1 and "s256" for SHA-256) append to the header.
+
+For maximum backward compatibility, it is recommended to use version 1 when
+writing SHA1 reftables.
+
+First ref block
+^^^^^^^^^^^^^^^
+
+The first ref block shares the same block as the file header, and is 24
+bytes smaller than all other blocks in the file. The first block
+immediately begins after the file header, at position 24.
+
+If the first block is a log block (a log-only file), its block header
+begins immediately at position 24.
+
+Ref block format
+^^^^^^^^^^^^^^^^
+
+A ref block is written as:
+
+....
+'r'
+uint24( block_len )
+ref_record+
+uint24( restart_offset )+
+uint16( restart_count )
+
+padding?
+....
+
+Blocks begin with `block_type = 'r'` and a 3-byte `block_len` which
+encodes the number of bytes in the block up to, but not including the
+optional `padding`. This is always less than or equal to the file's
+block size. In the first ref block, `block_len` includes 24 bytes for
+the file header.
+
+The 2-byte `restart_count` stores the number of entries in the
+`restart_offset` list, which must not be empty. Readers can use
+`restart_count` to binary search between restarts before starting a
+linear scan.
+
+Exactly `restart_count` 3-byte `restart_offset` values precedes the
+`restart_count`. Offsets are relative to the start of the block and
+refer to the first byte of any `ref_record` whose name has not been
+prefix compressed. Entries in the `restart_offset` list must be sorted,
+ascending. Readers can start linear scans from any of these records.
+
+A variable number of `ref_record` fill the middle of the block,
+describing reference names and values. The format is described below.
+
+As the first ref block shares the first file block with the file header,
+all `restart_offset` in the first block are relative to the start of the
+file (position 0), and include the file header. This forces the first
+`restart_offset` to be `28`.
+
+ref record
+++++++++++
+
+A `ref_record` describes a single reference, storing both the name and
+its value(s). Records are formatted as:
+
+....
+varint( prefix_length )
+varint( (suffix_length << 3) | value_type )
+suffix
+varint( update_index_delta )
+value?
+....
+
+The `prefix_length` field specifies how many leading bytes of the prior
+reference record's name should be copied to obtain this reference's
+name. This must be 0 for the first reference in any block, and also must
+be 0 for any `ref_record` whose offset is listed in the `restart_offset`
+table at the end of the block.
+
+Recovering a reference name from any `ref_record` is a simple concat:
+
+....
+this_name = prior_name[0..prefix_length] + suffix
+....
+
+The `suffix_length` value provides the number of bytes available in
+`suffix` to copy from `suffix` to complete the reference name.
+
+The `update_index` that last modified the reference can be obtained by
+adding `update_index_delta` to the `min_update_index` from the file
+header: `min_update_index + update_index_delta`.
+
+The `value` follows. Its format is determined by `value_type`, one of
+the following:
+
+* `0x0`: deletion; no value data (see transactions, below)
+* `0x1`: one object name; value of the ref
+* `0x2`: two object names; value of the ref, peeled target
+* `0x3`: symbolic reference: `varint( target_len ) target`
+
+Symbolic references use `0x3`, followed by the complete name of the
+reference target. No compression is applied to the target name.
+
+Types `0x4..0x7` are reserved for future use.
+
+Ref index
+^^^^^^^^^
+
+The ref index stores the name of the last reference from every ref block
+in the file, enabling reduced disk seeks for lookups. Any reference can
+be found by searching the index, identifying the containing block, and
+searching within that block.
+
+The index may be organized into a multi-level index, where the 1st level
+index block points to additional ref index blocks (2nd level), which may
+in turn point to either additional index blocks (e.g. 3rd level) or ref
+blocks (leaf level). Disk reads required to access a ref go up with
+higher index levels. Multi-level indexes may be required to ensure no
+single index block exceeds the file format's max block size of
+`16777215` bytes (15.99 MiB). To achieve constant O(1) disk seeks for
+lookups the index must be a single level, which is permitted to exceed
+the file's configured block size, but not the format's max block size of
+15.99 MiB.
+
+If present, the ref index block(s) appears after the last ref block.
+
+If there are at least 4 ref blocks, a ref index block should be written
+to improve lookup times. Cold reads using the index require 2 disk reads
+(read index, read block), and binary searching < 4 blocks also requires
+<= 2 reads. Omitting the index block from smaller files saves space.
+
+If the file is unaligned and contains more than one ref block, the ref
+index must be written.
+
+Index block format:
+
+....
+'i'
+uint24( block_len )
+index_record+
+uint24( restart_offset )+
+uint16( restart_count )
+
+padding?
+....
+
+The index blocks begin with `block_type = 'i'` and a 3-byte `block_len`
+which encodes the number of bytes in the block, up to but not including
+the optional `padding`.
+
+The `restart_offset` and `restart_count` fields are identical in format,
+meaning and usage as in ref blocks.
+
+To reduce the number of reads required for random access in very large
+files the index block may be larger than other blocks. However, readers
+must hold the entire index in memory to benefit from this, so it's a
+time-space tradeoff in both file size and reader memory.
+
+Increasing the file's block size decreases the index size. Alternatively
+a multi-level index may be used, keeping index blocks within the file's
+block size, but increasing the number of blocks that need to be
+accessed.
+
+index record
+++++++++++++
+
+An index record describes the last entry in another block. Index records
+are written as:
+
+....
+varint( prefix_length )
+varint( (suffix_length << 3) | 0 )
+suffix
+varint( block_position )
+....
+
+Index records use prefix compression exactly like `ref_record`.
+
+Index records store `block_position` after the suffix, specifying the
+absolute position in bytes (from the start of the file) of the block
+that ends with this reference. Readers can seek to `block_position` to
+begin reading the block header.
+
+Readers must examine the block header at `block_position` to determine
+if the next block is another level index block, or the leaf-level ref
+block.
+
+Reading the index
++++++++++++++++++
+
+Readers loading the ref index must first read the footer (below) to
+obtain `ref_index_position`. If not present, the position will be 0. The
+`ref_index_position` is for the 1st level root of the ref index.
+
+Obj block format
+^^^^^^^^^^^^^^^^
+
+Object blocks are optional. Writers may choose to omit object blocks,
+especially if readers will not use the object name to ref mapping.
+
+Object blocks use unique, abbreviated 2-32 object name keys, mapping to
+ref blocks containing references pointing to that object directly, or as
+the peeled value of an annotated tag. Like ref blocks, object blocks use
+the file's standard block size. The abbreviation length is available in
+the footer as `obj_id_len`.
+
+To save space in small files, object blocks may be omitted if the ref
+index is not present, as brute force search will only need to read a few
+ref blocks. When missing, readers should brute force a linear search of
+all references to lookup by object name.
+
+An object block is written as:
+
+....
+'o'
+uint24( block_len )
+obj_record+
+uint24( restart_offset )+
+uint16( restart_count )
+
+padding?
+....
+
+Fields are identical to ref block. Binary search using the restart table
+works the same as in reference blocks.
+
+Because object names are abbreviated by writers to the shortest unique
+abbreviation within the reftable, obj key lengths have a variable length. Their
+length must be at least 2 bytes. Readers must compare only for common prefix
+match within an obj block or obj index.
+
+obj record
+++++++++++
+
+An `obj_record` describes a single object abbreviation, and the blocks
+containing references using that unique abbreviation:
+
+....
+varint( prefix_length )
+varint( (suffix_length << 3) | cnt_3 )
+suffix
+varint( cnt_large )?
+varint( position_delta )*
+....
+
+Like in reference blocks, abbreviations are prefix compressed within an
+obj block. On large reftables with many unique objects, higher block
+sizes (64k), and higher restart interval (128), a `prefix_length` of 2
+or 3 and `suffix_length` of 3 may be common in obj records (unique
+abbreviation of 5-6 raw bytes, 10-12 hex digits).
+
+Each record contains `position_count` number of positions for matching
+ref blocks. For 1-7 positions the count is stored in `cnt_3`. When
+`cnt_3 = 0` the actual count follows in a varint, `cnt_large`.
+
+The use of `cnt_3` bets most objects are pointed to by only a single
+reference, some may be pointed to by a couple of references, and very
+few (if any) are pointed to by more than 7 references.
+
+A special case exists when `cnt_3 = 0` and `cnt_large = 0`: there are no
+`position_delta`, but at least one reference starts with this
+abbreviation. A reader that needs exact reference names must scan all
+references to find which specific references have the desired object.
+Writers should use this format when the `position_delta` list would have
+overflowed the file's block size due to a high number of references
+pointing to the same object.
+
+The first `position_delta` is the position from the start of the file.
+Additional `position_delta` entries are sorted ascending and relative to
+the prior entry, e.g. a reader would perform:
+
+....
+pos = position_delta[0]
+prior = pos
+for (j = 1; j < position_count; j++) {
+  pos = prior + position_delta[j]
+  prior = pos
+}
+....
+
+With a position in hand, a reader must linearly scan the ref block,
+starting from the first `ref_record`, testing each reference's object names
+(for `value_type = 0x1` or `0x2`) for full equality. Faster searching by
+object name within a single ref block is not supported by the reftable format.
+Smaller block sizes reduce the number of candidates this step must
+consider.
+
+Obj index
+^^^^^^^^^
+
+The obj index stores the abbreviation from the last entry for every obj
+block in the file, enabling reduced disk seeks for all lookups. It is
+formatted exactly the same as the ref index, but refers to obj blocks.
+
+The obj index should be present if obj blocks are present, as obj blocks
+should only be written in larger files.
+
+Readers loading the obj index must first read the footer (below) to
+obtain `obj_index_position`. If not present, the position will be 0.
+
+Log block format
+^^^^^^^^^^^^^^^^
+
+Unlike ref and obj blocks, log blocks are always unaligned.
+
+Log blocks are variable in size, and do not match the `block_size`
+specified in the file header or footer. Writers should choose an
+appropriate buffer size to prepare a log block for deflation, such as
+`2 * block_size`.
+
+A log block is written as:
+
+....
+'g'
+uint24( block_len )
+zlib_deflate {
+  log_record+
+  uint24( restart_offset )+
+  uint16( restart_count )
+}
+....
+
+Log blocks look similar to ref blocks, except `block_type = 'g'`.
+
+The 4-byte block header is followed by the deflated block contents using
+zlib deflate. The `block_len` in the header is the inflated size
+(including 4-byte block header), and should be used by readers to
+preallocate the inflation output buffer. A log block's `block_len` may
+exceed the file's block size.
+
+Offsets within the log block (e.g. `restart_offset`) still include the
+4-byte header. Readers may prefer prefixing the inflation output buffer
+with the 4-byte header.
+
+Within the deflate container, a variable number of `log_record` describe
+reference changes. The log record format is described below. See ref
+block format (above) for a description of `restart_offset` and
+`restart_count`.
+
+Because log blocks have no alignment or padding between blocks, readers
+must keep track of the bytes consumed by the inflater to know where the
+next log block begins.
+
+log record
+++++++++++
+
+Log record keys are structured as:
+
+....
+ref_name '\0' reverse_int64( update_index )
+....
+
+where `update_index` is the unique transaction identifier. The
+`update_index` field must be unique within the scope of a `ref_name`.
+See the update transactions section below for further details.
+
+The `reverse_int64` function inverses the value so lexicographical
+ordering the network byte order encoding sorts the more recent records
+with higher `update_index` values first:
+
+....
+reverse_int64(int64 t) {
+  return 0xffffffffffffffff - t;
+}
+....
+
+Log records have a similar starting structure to ref and index records,
+utilizing the same prefix compression scheme applied to the log record
+key described above.
+
+....
+    varint( prefix_length )
+    varint( (suffix_length << 3) | log_type )
+    suffix
+    log_data {
+      old_id
+      new_id
+      varint( name_length    )  name
+      varint( email_length   )  email
+      varint( time_seconds )
+      sint16( tz_offset )
+      varint( message_length )  message
+    }?
+....
+
+Log record entries use `log_type` to indicate what follows:
+
+* `0x0`: deletion; no log data.
+* `0x1`: standard git reflog data using `log_data` above.
+
+The `log_type = 0x0` is mostly useful for `git stash drop`, removing an
+entry from the reflog of `refs/stash` in a transaction file (below),
+without needing to rewrite larger files. Readers reading a stack of
+reflogs must treat this as a deletion.
+
+For `log_type = 0x1`, the `log_data` section follows
+linkgit:git-update-ref[1] logging and includes:
+
+* two object names (old id, new id)
+* varint string of committer's name
+* varint string of committer's email
+* varint time in seconds since epoch (Jan 1, 1970)
+* 2-byte timezone offset in minutes (signed)
+* varint string of message
+
+`tz_offset` is the absolute number of minutes from GMT the committer was
+at the time of the update. For example `GMT-0800` is encoded in reftable
+as `sint16(-480)` and `GMT+0230` is `sint16(150)`.
+
+The committer email does not contain `<` or `>`, it's the value normally
+found between the `<>` in a git commit object header.
+
+The `message_length` may be 0, in which case there was no message
+supplied for the update.
+
+Contrary to traditional reflog (which is a file), renames are encoded as
+a combination of ref deletion and ref creation.  A deletion is a log
+record with a zero new_id, and a creation is a log record with a zero old_id.
+
+Reading the log
++++++++++++++++
+
+Readers accessing the log must first read the footer (below) to
+determine the `log_position`. The first block of the log begins at
+`log_position` bytes since the start of the file. The `log_position` is
+not block aligned.
+
+Importing logs
+++++++++++++++
+
+When importing from `$GIT_DIR/logs` writers should globally order all
+log records roughly by timestamp while preserving file order, and assign
+unique, increasing `update_index` values for each log line. Newer log
+records get higher `update_index` values.
+
+Although an import may write only a single reftable file, the reftable
+file must span many unique `update_index`, as each log line requires its
+own `update_index` to preserve semantics.
+
+Log index
+^^^^^^^^^
+
+The log index stores the log key
+(`refname \0 reverse_int64(update_index)`) for the last log record of
+every log block in the file, supporting bounded-time lookup.
+
+A log index block must be written if 2 or more log blocks are written to
+the file. If present, the log index appears after the last log block.
+There is no padding used to align the log index to block alignment.
+
+Log index format is identical to ref index, except the keys are 9 bytes
+longer to include `'\0'` and the 8-byte `reverse_int64(update_index)`.
+Records use `block_position` to refer to the start of a log block.
+
+Reading the index
++++++++++++++++++
+
+Readers loading the log index must first read the footer (below) to
+obtain `log_index_position`. If not present, the position will be 0.
+
+Footer
+^^^^^^
+
+After the last block of the file, a file footer is written. It begins
+like the file header, but is extended with additional data.
+
+....
+    HEADER
+
+    uint64( ref_index_position )
+    uint64( (obj_position << 5) | obj_id_len )
+    uint64( obj_index_position )
+
+    uint64( log_position )
+    uint64( log_index_position )
+
+    uint32( CRC-32 of above )
+....
+
+If a section is missing (e.g. ref index) the corresponding position
+field (e.g. `ref_index_position`) will be 0.
+
+* `obj_position`: byte position for the first obj block.
+* `obj_id_len`: number of bytes used to abbreviate object names in
+obj blocks.
+* `log_position`: byte position for the first log block.
+* `ref_index_position`: byte position for the start of the ref index.
+* `obj_index_position`: byte position for the start of the obj index.
+* `log_index_position`: byte position for the start of the log index.
+
+The size of the footer is 68 bytes for version 1, and 72 bytes for
+version 2.
+
+Reading the footer
+++++++++++++++++++
+
+Readers must first read the file start to determine the version
+number. Then they seek to `file_length - FOOTER_LENGTH` to access the
+footer. A trusted external source (such as `stat(2)`) is necessary to
+obtain `file_length`. When reading the footer, readers must verify:
+
+* 4-byte magic is correct
+* 1-byte version number is recognized
+* 4-byte CRC-32 matches the other 64 bytes (including magic, and
+version)
+
+Once verified, the other fields of the footer can be accessed.
+
+Empty tables
+++++++++++++
+
+A reftable may be empty. In this case, the file starts with a header
+and is immediately followed by a footer.
+
+Binary search
+^^^^^^^^^^^^^
+
+Binary search within a block is supported by the `restart_offset` fields
+at the end of the block. Readers can binary search through the restart
+table to locate between which two restart points the sought reference or
+key should appear.
+
+Each record identified by a `restart_offset` stores the complete key in
+the `suffix` field of the record, making the compare operation during
+binary search straightforward.
+
+Once a restart point lexicographically before the sought reference has
+been identified, readers can linearly scan through the following record
+entries to locate the sought record, terminating if the current record
+sorts after (and therefore the sought key is not present).
+
+Restart point selection
++++++++++++++++++++++++
+
+Writers determine the restart points at file creation. The process is
+arbitrary, but every 16 or 64 records is recommended. Every 16 may be
+more suitable for smaller block sizes (4k or 8k), every 64 for larger
+block sizes (64k).
+
+More frequent restart points reduces prefix compression and increases
+space consumed by the restart table, both of which increase file size.
+
+Less frequent restart points makes prefix compression more effective,
+decreasing overall file size, with increased penalties for readers
+walking through more records after the binary search step.
+
+A maximum of `65535` restart points per block is supported.
+
+Considerations
+~~~~~~~~~~~~~~
+
+Lightweight refs dominate
+^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The reftable format assumes the vast majority of references are single
+object names valued with common prefixes, such as Gerrit Code Review's
+`refs/changes/` namespace, GitHub's `refs/pulls/` namespace, or many
+lightweight tags in the `refs/tags/` namespace.
+
+Annotated tags storing the peeled object cost an additional object name per
+reference.
+
+Low overhead
+^^^^^^^^^^^^
+
+A reftable with very few references (e.g. git.git with 5 heads) is 269
+bytes for reftable, vs. 332 bytes for packed-refs. This supports
+reftable scaling down for transaction logs (below).
+
+Block size
+^^^^^^^^^^
+
+For a Gerrit Code Review type repository with many change refs, larger
+block sizes (64 KiB) and less frequent restart points (every 64) yield
+better compression due to more references within the block compressing
+against the prior reference.
+
+Larger block sizes reduce the index size, as the reftable will require
+fewer blocks to store the same number of references.
+
+Minimal disk seeks
+^^^^^^^^^^^^^^^^^^
+
+Assuming the index block has been loaded into memory, binary searching
+for any single reference requires exactly 1 disk seek to load the
+containing block.
+
+Scans and lookups dominate
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Scanning all references and lookup by name (or namespace such as
+`refs/heads/`) are the most common activities performed on repositories.
+Object names are stored directly with references to optimize this use case.
+
+Logs are infrequently read
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Logs are infrequently accessed, but can be large. Deflating log blocks
+saves disk space, with some increased penalty at read time.
+
+Logs are stored in an isolated section from refs, reducing the burden on
+reference readers that want to ignore logs. Further, historical logs can
+be isolated into log-only files.
+
+Logs are read backwards
+^^^^^^^^^^^^^^^^^^^^^^^
+
+Logs are frequently accessed backwards (most recent N records for master
+to answer `master@{4}`), so log records are grouped by reference, and
+sorted descending by update index.
+
+Repository format
+~~~~~~~~~~~~~~~~~
+
+Version 1
+^^^^^^^^^
+
+A repository must set its `$GIT_DIR/config` to configure reftable:
+
+....
+[core]
+    repositoryformatversion = 1
+[extensions]
+    refStorage = reftable
+....
+
+Layout
+^^^^^^
+
+A collection of reftable files are stored in the `$GIT_DIR/reftable/` directory.
+Their names should have a random element, such that each filename is globally
+unique; this helps avoid spurious failures on Windows, where open files cannot
+be removed or overwritten. It suggested to use
+`${min_update_index}-${max_update_index}-${random}.ref` as a naming convention.
+
+Log-only files use the `.log` extension, while ref-only and mixed ref
+and log files use `.ref`. extension.
+
+The stack ordering file is `$GIT_DIR/reftable/tables.list` and lists the
+current files, one per line, in order, from oldest (base) to newest
+(most recent):
+
+....
+$ cat .git/reftable/tables.list
+00000001-00000001-RANDOM1.log
+00000002-00000002-RANDOM2.ref
+00000003-00000003-RANDOM3.ref
+....
+
+Readers must read `$GIT_DIR/reftable/tables.list` to determine which
+files are relevant right now, and search through the stack in reverse
+order (last reftable is examined first).
+
+Reftable files not listed in `tables.list` may be new (and about to be
+added to the stack by the active writer), or ancient and ready to be
+pruned.
+
+Backward compatibility
+^^^^^^^^^^^^^^^^^^^^^^
+
+Older clients should continue to recognize the directory as a git
+repository so they don't look for an enclosing repository in parent
+directories. To this end, a reftable-enabled repository must contain the
+following dummy files
+
+* `.git/HEAD`, a regular file containing `ref: refs/heads/.invalid`.
+* `.git/refs/`, a directory
+* `.git/refs/heads`, a regular file
+
+Readers
+^^^^^^^
+
+Readers can obtain a consistent snapshot of the reference space by
+following:
+
+1.  Open and read the `tables.list` file.
+2.  Open each of the reftable files that it mentions.
+3.  If any of the files is missing, goto 1.
+4.  Read from the now-open files as long as necessary.
+
+Update transactions
+^^^^^^^^^^^^^^^^^^^
+
+Although reftables are immutable, mutations are supported by writing a
+new reftable and atomically appending it to the stack:
+
+1.  Acquire `tables.list.lock`.
+2.  Read `tables.list` to determine current reftables.
+3.  Select `update_index` to be most recent file's
+`max_update_index + 1`.
+4.  Prepare temp reftable `tmp_XXXXXX`, including log entries.
+5.  Rename `tmp_XXXXXX` to `${update_index}-${update_index}-${random}.ref`.
+6.  Copy `tables.list` to `tables.list.lock`, appending file from (5).
+7.  Rename `tables.list.lock` to `tables.list`.
+
+During step 4 the new file's `min_update_index` and `max_update_index`
+are both set to the `update_index` selected by step 3. All log records
+for the transaction use the same `update_index` in their keys. This
+enables later correlation of which references were updated by the same
+transaction.
+
+Because a single `tables.list.lock` file is used to manage locking, the
+repository is single-threaded for writers. Writers may have to busy-spin
+(with backoff) around creating `tables.list.lock`, for up to an
+acceptable wait period, aborting if the repository is too busy to
+mutate. Application servers wrapped around repositories (e.g. Gerrit
+Code Review) can layer their own lock/wait queue to improve fairness to
+writers.
+
+Reference deletions
+^^^^^^^^^^^^^^^^^^^
+
+Deletion of any reference can be explicitly stored by setting the `type`
+to `0x0` and omitting the `value` field of the `ref_record`. This serves
+as a tombstone, overriding any assertions about the existence of the
+reference from earlier files in the stack.
+
+Compaction
+^^^^^^^^^^
+
+A partial stack of reftables can be compacted by merging references
+using a straightforward merge join across reftables, selecting the most
+recent value for output, and omitting deleted references that do not
+appear in remaining, lower reftables.
+
+A compacted reftable should set its `min_update_index` to the smallest
+of the input files' `min_update_index`, and its `max_update_index`
+likewise to the largest input `max_update_index`.
+
+For sake of illustration, assume the stack currently consists of
+reftable files (from oldest to newest): A, B, C, and D. The compactor is
+going to compact B and C, leaving A and D alone.
+
+1.  Obtain lock `tables.list.lock` and read the `tables.list` file.
+2.  Obtain locks `B.lock` and `C.lock`. Ownership of these locks
+prevents other processes from trying to compact these files.
+3.  Release `tables.list.lock`.
+4.  Compact `B` and `C` into a temp file
+`${min_update_index}-${max_update_index}_XXXXXX`.
+5.  Reacquire lock `tables.list.lock`.
+6.  Verify that `B` and `C` are still in the stack, in that order. This
+should always be the case, assuming that other processes are adhering to
+the locking protocol.
+7.  Rename `${min_update_index}-${max_update_index}_XXXXXX` to
+`${min_update_index}-${max_update_index}-${random}.ref`.
+8.  Write the new stack to `tables.list.lock`, replacing `B` and `C`
+with the file from (4).
+9.  Rename `tables.list.lock` to `tables.list`.
+10. Delete `B` and `C`, perhaps after a short sleep to avoid forcing
+readers to backtrack.
+
+This strategy permits compactions to proceed independently of updates.
+
+Each reftable (compacted or not) is uniquely identified by its name, so
+open reftables can be cached by their name.
+
+Windows
+^^^^^^^
+
+On windows, and other systems that do not allow deleting or renaming to open
+files, compaction may succeed, but other readers may prevent obsolete tables
+from being deleted.
+
+On these platforms, the following strategy can be followed: on closing a
+reftable stack, reload `tables.list`, and delete any tables no longer mentioned
+in `tables.list`.
+
+Irregular program exit may still leave about unused files. In this case, a
+cleanup operation should proceed as follows:
+
+* take a lock `tables.list.lock` to prevent concurrent modifications
+* refresh the reftable stack, by reading `tables.list`
+* for each `*.ref` file, remove it if
+** it is not mentioned in `tables.list`, and
+** its max update_index is not beyond the max update_index of the stack
+
+
+Alternatives considered
+~~~~~~~~~~~~~~~~~~~~~~~
+
+bzip packed-refs
+^^^^^^^^^^^^^^^^
+
+`bzip2` can significantly shrink a large packed-refs file (e.g. 62 MiB
+compresses to 23 MiB, 37%). However the bzip format does not support
+random access to a single reference. Readers must inflate and discard
+while performing a linear scan.
+
+Breaking packed-refs into chunks (individually compressing each chunk)
+would reduce the amount of data a reader must inflate, but still leaves
+the problem of indexing chunks to support readers efficiently locating
+the correct chunk.
+
+Given the compression achieved by reftable's encoding, it does not seem
+necessary to add the complexity of bzip/gzip/zlib.
+
+Michael Haggerty's alternate format
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+Michael Haggerty proposed
+link:https://lore.kernel.org/git/CAMy9T_HCnyc1g8XWOOWhe7nN0aEFyyBskV2aOMb_fe%2BwGvEJ7A%40mail.gmail.com/[an
+alternate] format to reftable on the Git mailing list. This format uses
+smaller chunks, without the restart table, and avoids block alignment
+with padding. Reflog entries immediately follow each ref, and are thus
+interleaved between refs.
+
+Performance testing indicates reftable is faster for lookups (51%
+faster, 11.2 usec vs. 5.4 usec), although reftable produces a slightly
+larger file (+ ~3.2%, 28.3M vs 29.2M):
+
+[cols=">,>,>,>",options="header",]
+|=====================================
+|format |size |seek cold |seek hot
+|mh-alt |28.3 M |23.4 usec |11.2 usec
+|reftable |29.2 M |19.9 usec |5.4 usec
+|=====================================
+
+JGit Ketch RefTree
+^^^^^^^^^^^^^^^^^^
+
+https://dev.eclipse.org/mhonarc/lists/jgit-dev/msg03073.html[JGit Ketch]
+proposed
+link:https://lore.kernel.org/git/CAJo%3DhJvnAPNAdDcAAwAvU9C4RVeQdoS3Ev9WTguHx4fD0V_nOg%40mail.gmail.com/[RefTree],
+an encoding of references inside Git tree objects stored as part of the
+repository's object database.
+
+The RefTree format adds additional load on the object database storage
+layer (more loose objects, more objects in packs), and relies heavily on
+the packer's delta compression to save space. Namespaces which are flat
+(e.g. thousands of tags in refs/tags) initially create very large loose
+objects, and so RefTree does not address the problem of copying many
+references to modify a handful.
+
+Flat namespaces are not efficiently searchable in RefTree, as tree
+objects in canonical formatting cannot be binary searched. This fails
+the need to handle a large number of references in a single namespace,
+such as GitHub's `refs/pulls`, or a project with many tags.
+
+LMDB
+^^^^
+
+David Turner proposed
+https://lore.kernel.org/git/1455772670-21142-26-git-send-email-dturner@twopensource.com/[using
+LMDB], as LMDB is lightweight (64k of runtime code) and GPL-compatible
+license.
+
+A downside of LMDB is its reliance on a single C implementation. This
+makes embedding inside JGit (a popular reimplementation of Git)
+difficult, and hoisting onto virtual storage (for JGit DFS) virtually
+impossible.
+
+A common format that can be supported by all major Git implementations
+(git-core, JGit, libgit2) is strongly preferred.
diff --git a/Documentation/technical/remembering-renames.txt b/Documentation/technical/remembering-renames.txt
new file mode 100644
index 0000000000..2fd5cc88e0
--- /dev/null
+++ b/Documentation/technical/remembering-renames.txt
@@ -0,0 +1,671 @@
+Rebases and cherry-picks involve a sequence of merges whose results are
+recorded as new single-parent commits.  The first parent side of those
+merges represent the "upstream" side, and often include a far larger set of
+changes than the second parent side.  Traditionally, the renames on the
+first-parent side of that sequence of merges were repeatedly re-detected
+for every merge.  This file explains why it is safe and effective during
+rebases and cherry-picks to remember renames on the upstream side of
+history as an optimization, assuming all merges are automatic and clean
+(i.e. no conflicts and not interrupted for user input or editing).
+
+Outline:
+
+  0. Assumptions
+
+  1. How rebasing and cherry-picking work
+
+  2. Why the renames on MERGE_SIDE1 in any given pick are *always* a
+     superset of the renames on MERGE_SIDE1 for the next pick.
+
+  3. Why any rename on MERGE_SIDE1 in any given pick is _almost_ always also
+     a rename on MERGE_SIDE1 for the next pick
+
+  4. A detailed description of the the counter-examples to #3.
+
+  5. Why the special cases in #4 are still fully reasonable to use to pair
+     up files for three-way content merging in the merge machinery, and why
+     they do not affect the correctness of the merge.
+
+  6. Interaction with skipping of "irrelevant" renames
+
+  7. Additional items that need to be cached
+
+  8. How directory rename detection interacts with the above and why this
+     optimization is still safe even if merge.directoryRenames is set to
+     "true".
+
+
+=== 0. Assumptions ===
+
+There are two assumptions that will hold throughout this document:
+
+  * The upstream side where commits are transplanted to is treated as the
+    first parent side when rebase/cherry-pick call the merge machinery
+
+  * All merges are fully automatic
+
+and a third that will hold in sections 2-5 for simplicity, that I'll later
+address in section 8:
+
+  * No directory renames occur
+
+
+Let me explain more about each assumption and why I include it:
+
+
+The first assumption is merely for the purposes of making this document
+clearer; the optimization implementation does not actually depend upon it.
+However, the assumption does hold in all cases because it reflects the way
+that both rebase and cherry-pick were implemented; and the implementation
+of cherry-pick and rebase are not readily changeable for backwards
+compatibility reasons (see for example the discussion of the --ours and
+--theirs flag in the documentation of `git checkout`, particularly the
+comments about how they behave with rebase).  The optimization avoids
+checking first-parent-ness, though.  It checks the conditions that make the
+optimization valid instead, so it would still continue working if someone
+changed the parent ordering that cherry-pick and rebase use.  But making
+this assumption does make this document much clearer and prevents me from
+having to repeat every example twice.
+
+If the second assumption is violated, then the optimization simply is
+turned off and thus isn't relevant to consider.  The second assumption can
+also be stated as "there is no interruption for a user to resolve conflicts
+or to just further edit or tweak files".  While real rebases and
+cherry-picks are often interrupted (either because it's an interactive
+rebase where the user requested to stop and edit, or because there were
+conflicts that the user needs to resolve), the cache of renames is not
+stored on disk, and thus is thrown away as soon as the rebase or cherry
+pick stops for the user to resolve the operation.
+
+The third assumption makes sections 2-5 simpler, and allows people to
+understand the basics of why this optimization is safe and effective, and
+then I can go back and address the specifics in section 8.  It is probably
+also worth noting that if directory renames do occur, then the default of
+merge.directoryRenames being set to "conflict" means that the operation
+will stop for users to resolve the conflicts and the cache will be thrown
+away, and thus that there won't be an optimization to apply.  So, the only
+reason we need to address directory renames specifically, is that some
+users will have set merge.directoryRenames to "true" to allow the merges to
+continue to proceed automatically.  The optimization is still safe with
+this config setting, but we have to discuss a few more cases to show why;
+this discussion is deferred until section 8.
+
+
+=== 1. How rebasing and cherry-picking work ===
+
+Consider the following setup (from the git-rebase manpage):
+
+		     A---B---C topic
+		    /
+	       D---E---F---G main
+
+After rebasing or cherry-picking topic onto main, this will appear as:
+
+			     A'--B'--C' topic
+			    /
+	       D---E---F---G main
+
+The way the commits A', B', and C' are created is through a series of
+merges, where rebase or cherry-pick sequentially uses each of the three
+A-B-C commits in a special merge operation.  Let's label the three commits
+in the merge operation as MERGE_BASE, MERGE_SIDE1, and MERGE_SIDE2.  For
+this picture, the three commits for each of the three merges would be:
+
+To create A':
+   MERGE_BASE:   E
+   MERGE_SIDE1:  G
+   MERGE_SIDE2:  A
+
+To create B':
+   MERGE_BASE:   A
+   MERGE_SIDE1:  A'
+   MERGE_SIDE2:  B
+
+To create C':
+   MERGE_BASE:   B
+   MERGE_SIDE1:  B'
+   MERGE_SIDE2:  C
+
+Sometimes, folks are surprised that these three-way merges are done.  It
+can be useful in understanding these three-way merges to view them in a
+slightly different light.  For example, in creating C', you can view it as
+either:
+
+  * Apply the changes between B & C to B'
+  * Apply the changes between B & B' to C
+
+Conceptually the two statements above are the same as a three-way merge of
+B, B', and C, at least the parts before you decide to record a commit.
+
+
+=== 2. Why the renames on MERGE_SIDE1 in any given pick are always a ===
+===    superset of the renames on MERGE_SIDE1 for the next pick.     ===
+
+The merge machinery uses the filenames it is fed from MERGE_BASE,
+MERGE_SIDE1, and MERGE_SIDE2.  It will only move content to a different
+filename under one of three conditions:
+
+  * To make both pieces of a conflict available to a user during conflict
+    resolution (examples: directory/file conflict, add/add type conflict
+    such as symlink vs. regular file)
+
+  * When MERGE_SIDE1 renames the file.
+
+  * When MERGE_SIDE2 renames the file.
+
+First, let's remember what commits are involved in the first and second
+picks of the cherry-pick or rebase sequence:
+
+To create A':
+   MERGE_BASE:   E
+   MERGE_SIDE1:  G
+   MERGE_SIDE2:  A
+
+To create B':
+   MERGE_BASE:   A
+   MERGE_SIDE1:  A'
+   MERGE_SIDE2:  B
+
+So, in particular, we need to show that the renames between E and G are a
+superset of those between A and A'.
+
+A' is created by the first merge.  A' will only have renames for one of the
+three reasons listed above.  The first case, a conflict, results in a
+situation where the cache is dropped and thus this optimization doesn't
+take effect, so we need not consider that case.  The third case, a rename
+on MERGE_SIDE2 (i.e. from G to A), will show up in A' but it also shows up
+in A -- therefore when diffing A and A' that path does not show up as a
+rename.  The only remaining way for renames to show up in A' is for the
+rename to come from MERGE_SIDE1.  Therefore, all renames between A and A'
+are a subset of those between E and G.  Equivalently, all renames between E
+and G are a superset of those between A and A'.
+
+
+=== 3. Why any rename on MERGE_SIDE1 in any given pick is _almost_   ===
+===    always also a rename on MERGE_SIDE1 for the next pick.        ===
+
+Let's again look at the first two picks:
+
+To create A':
+   MERGE_BASE:   E
+   MERGE_SIDE1:  G
+   MERGE_SIDE2:  A
+
+To create B':
+   MERGE_BASE:   A
+   MERGE_SIDE1:  A'
+   MERGE_SIDE2:  B
+
+Now let's look at any given rename from MERGE_SIDE1 of the first pick, i.e.
+any given rename from E to G.  Let's use the filenames 'oldfile' and
+'newfile' for demonstration purposes.  That first pick will function as
+follows; when the rename is detected, the merge machinery will do a
+three-way content merge of the following:
+    E:oldfile
+    G:newfile
+    A:oldfile
+and produce a new result:
+    A':newfile
+
+Note above that I've assumed that E->A did not rename oldfile.  If that
+side did rename, then we most likely have a rename/rename(1to2) conflict
+that will cause the rebase or cherry-pick operation to halt and drop the
+in-memory cache of renames and thus doesn't need to be considered further.
+In the special case that E->A does rename the file but also renames it to
+newfile, then there is no conflict from the renaming and the merge can
+succeed.  In this special case, the rename is not valid to cache because
+the second merge will find A:newfile in the MERGE_BASE (see also the new
+testcases in t6429 with "rename same file identically" in their
+description).  So a rename/rename(1to1) needs to be specially handled by
+pruning renames from the cache and decrementing the dir_rename_counts in
+the current and leading directories associated with those renames.  Or,
+since these are really rare, one could just take the easy way out and
+disable the remembering renames optimization when a rename/rename(1to1)
+happens.
+
+The previous paragraph handled the cases for E->A renaming oldfile, let's
+continue assuming that oldfile is not renamed in A.
+
+As per the diagram for creating B', MERGE_SIDE1 involves the changes from A
+to A'.  So, we are curious whether A:oldfile and A':newfile will be viewed
+as renames.  Note that:
+
+  * There will be no A':oldfile (because there could not have been a
+    G:oldfile as we do not do break detection in the merge machinery and
+    G:newfile was detected as a rename, and by the construction of the
+    rename above that merged cleanly, the merge machinery will ensure there
+    is no 'oldfile' in the result).
+
+  * There will be no A:newfile (if there had been, we would have had a
+    rename/add conflict).
+
+  * Clearly A:oldfile and A':newfile are "related" (A':newfile came from a
+    clean three-way content merge involving A:oldfile).
+
+We can also expound on the third point above, by noting that three-way
+content merges can also be viewed as applying the differences between the
+base and one side to the other side.  Thus we can view A':newfile as
+having been created by taking the changes between E:oldfile and G:newfile
+(which were detected as being related, i.e. <50% changed) to A:oldfile.
+
+Thus A:oldfile and A':newfile are just as related as E:oldfile and
+G:newfile are -- they have exactly identical differences.  Since the latter
+were detected as renames, A:oldfile and A':newfile should also be
+detectable as renames almost always.
+
+
+=== 4. A detailed description of the counter-examples to #3.         ===
+
+We already noted in section 3 that rename/rename(1to1) (i.e. both sides
+renaming a file the same way) was one counter-example.  The more
+interesting bit, though, is why did we need to use the "almost" qualifier
+when stating that A:oldfile and A':newfile are "almost" always detectable
+as renames?
+
+Let's repeat an earlier point that section 3 made:
+
+  A':newfile was created by applying the changes between E:oldfile and
+  G:newfile to A:oldfile.  The changes between E:oldfile and G:newfile were
+  <50% of the size of E:oldfile.
+
+If those changes that were <50% of the size of E:oldfile are also <50% of
+the size of A:oldfile, then A:oldfile and A':newfile will be detectable as
+renames.  However, if there is a dramatic size reduction between E:oldfile
+and A:oldfile (but the changes between E:oldfile, G:newfile, and A:oldfile
+still somehow merge cleanly), then traditional rename detection would not
+detect A:oldfile and A':newfile as renames.
+
+Here's an example where that can happen:
+  * E:oldfile had 20 lines
+  * G:newfile added 10 new lines at the beginning of the file
+  * A:oldfile kept the first 3 lines of the file, and deleted all the rest
+then
+  => A':newfile would have 13 lines, 3 of which matches those in A:oldfile.
+E:oldfile -> G:newfile would be detected as a rename, but A:oldfile and
+A':newfile would not be.
+
+
+=== 5. Why the special cases in #4 are still fully reasonable to use to    ===
+===    pair up files for three-way content merging in the merge machinery, ===
+===    and why they do not affect the correctness of the merge.            ===
+
+In the rename/rename(1to1) case, A:newfile and A':newfile are not renames
+since they use the *same* filename.  However, files with the same filename
+are obviously fine to pair up for three-way content merging (the merge
+machinery has never employed break detection).  The interesting
+counter-example case is thus not the rename/rename(1to1) case, but the case
+where A did not rename oldfile.  That was the case that we spent most of
+the time discussing in sections 3 and 4.  The remainder of this section
+will be devoted to that case as well.
+
+So, even if A:oldfile and A':newfile aren't detectable as renames, why is
+it still reasonable to pair them up for three-way content merging in the
+merge machinery?  There are multiple reasons:
+
+  * As noted in sections 3 and 4, the diff between A:oldfile and A':newfile
+    is *exactly* the same as the diff between E:oldfile and G:newfile.  The
+    latter pair were detected as renames, so it seems unlikely to surprise
+    users for us to treat A:oldfile and A':newfile as renames.
+
+  * In fact, "oldfile" and "newfile" were at one point detected as renames
+    due to how they were constructed in the E..G chain.  And we used that
+    information once already in this rebase/cherry-pick.  I think users
+    would be unlikely to be surprised at us continuing to treat the files
+    as renames and would quickly understand why we had done so.
+
+  * Marking or declaring files as renames is *not* the end goal for merges.
+    Merges use renames to determine which files make sense to be paired up
+    for three-way content merges.
+
+  * A:oldfile and A':newfile were _already_ paired up in a three-way
+    content merge; that is how A':newfile was created.  In fact, that
+    three-way content merge was clean.  So using them again in a later
+    three-way content merge seems very reasonable.
+
+However, the above is focusing on the common scenarios.  Let's try to look
+at all possible unusual scenarios and compare without the optimization to
+with the optimization.  Consider the following theoretical cases; we will
+then dive into each to determine which of them are possible,
+and if so, what they mean:
+
+  1. Without the optimization, the second merge results in a conflict.
+     With the optimization, the second merge also results in a conflict.
+     Questions: Are the conflicts confusingly different?  Better in one case?
+
+  2. Without the optimization, the second merge results in NO conflict.
+     With the optimization, the second merge also results in NO conflict.
+     Questions: Are the merges the same?
+
+  3. Without the optimization, the second merge results in a conflict.
+     With the optimization, the second merge results in NO conflict.
+     Questions: Possible?  Bug, bugfix, or something else?
+
+  4. Without the optimization, the second merge results in NO conflict.
+     With the optimization, the second merge results in a conflict.
+     Questions: Possible?  Bug, bugfix, or something else?
+
+I'll consider all four cases, but out of order.
+
+The fourth case is impossible.  For the code without the remembering
+renames optimization to not get a conflict, B:oldfile would need to exactly
+match A:oldfile -- if it doesn't, there would be a modify/delete conflict.
+If A:oldfile matches B:oldfile exactly, then a three-way content merge
+between A:oldfile, A':newfile, and B:oldfile would have no conflict and
+just give us the version of newfile from A' as the result.
+
+From the same logic as the above paragraph, the second case would indeed
+result in identical merges.  When A:oldfile exactly matches B:oldfile, an
+undetected rename would say, "Oh, I see one side didn't modify 'oldfile'
+and the other side deleted it.  I'll delete it.  And I see you have this
+brand new file named 'newfile' in A', so I'll keep it."  That gives the
+same results as three-way content merging A:oldfile, A':newfile, and
+B:oldfile -- a removal of oldfile with the version of newfile from A'
+showing up in the result.
+
+The third case is interesting.  It means that A:oldfile and A':newfile were
+not just similar enough, but that the changes between them did not conflict
+with the changes between A:oldfile and B:oldfile.  This would validate our
+hunch that the files were similar enough to be used in a three-way content
+merge, and thus seems entirely correct for us to have used them that way.
+(Sidenote: One particular example here may be enlightening.  Let's say that
+B was an immediate revert of A.  B clearly would have been a clean revert
+of A, since A was B's immediate parent.  One would assume that if you can
+pick a commit, you should also be able to cherry-pick its immediate revert.
+However, this is one of those funny corner cases; without this
+optimization, we just successfully picked a commit cleanly, but we are
+unable to cherry-pick its immediate revert due to the size differences
+between E:oldfile and A:oldfile.)
+
+That leaves only the first case to consider -- when we get conflicts both
+with or without the optimization.  Without the optimization, we'll have a
+modify/delete conflict, where both A':newfile and B:oldfile are left in the
+tree for the user to deal with and no hints about the potential similarity
+between the two.  With the optimization, we'll have a three-way content
+merged A:oldfile, A':newfile, and B:oldfile with conflict markers
+suggesting we thought the files were related but giving the user the chance
+to resolve.  As noted above, I don't think users will find us treating
+'oldfile' and 'newfile' as related as a surprise since they were between E
+and G.  In any event, though, this case shouldn't be concerning since we
+hit a conflict in both cases, told the user what we know, and asked them to
+resolve it.
+
+So, in summary, case 4 is impossible, case 2 yields the same behavior, and
+cases 1 and 3 seem to provide as good or better behavior with the
+optimization than without.
+
+
+=== 6. Interaction with skipping of "irrelevant" renames ===
+
+Previous optimizations involved skipping rename detection for paths
+considered to be "irrelevant".  See for example the following commits:
+
+  * 32a56dfb99 ("merge-ort: precompute subset of sources for which we
+		need rename detection", 2021-03-11)
+  * 2fd9eda462 ("merge-ort: precompute whether directory rename
+		detection is needed", 2021-03-11)
+  * 9bd342137e ("diffcore-rename: determine which relevant_sources are
+		no longer relevant", 2021-03-13)
+
+Relevance is always determined by what the _other_ side of history has
+done, in terms of modifing a file that our side renamed, or adding a
+file to a directory which our side renamed.  This means that a path
+that is "irrelevant" when picking the first commit of a series in a
+rebase or cherry-pick, may suddenly become "relevant" when picking the
+next commit.
+
+The upshot of this is that we can only cache rename detection results
+for relevant paths, and need to re-check relevance in subsequent
+commits.  If those subsequent commits have additional paths that are
+relevant for rename detection, then we will need to redo rename
+detection -- though we can limit it to the paths for which we have not
+already detected renames.
+
+
+=== 7. Additional items that need to be cached ===
+
+It turns out we have to cache more than just renames; we also cache:
+
+  A) non-renames (i.e. unpaired deletes)
+  B) counts of renames within directories
+  C) sources that were marked as RELEVANT_LOCATION, but which were
+     downgraded to RELEVANT_NO_MORE
+  D) the toplevel trees involved in the merge
+
+These are all stored in struct rename_info, and respectively appear in
+  * cached_pairs (along side actual renames, just with a value of NULL)
+  * dir_rename_counts
+  * cached_irrelevant
+  * merge_trees
+
+The reason for (A) comes from the irrelevant renames skipping
+optimization discussed in section 6.  The fact that irrelevant renames
+are skipped means we only get a subset of the potential renames
+detected and subsequent commits may need to run rename detection on
+the upstream side on a subset of the remaining renames (to get the
+renames that are relevant for that later commit).  Since unpaired
+deletes are involved in rename detection too, we don't want to
+repeatedly check that those paths remain unpaired on the upstream side
+with every commit we are transplanting.
+
+The reason for (B) is that diffcore_rename_extended() is what
+generates the counts of renames by directory which is needed in
+directory rename detection, and if we don't run
+diffcore_rename_extended() again then we need to have the output from
+it, including dir_rename_counts, from the previous run.
+
+The reason for (C) is that merge-ort's tree traversal will again think
+those paths are relevant (marking them as RELEVANT_LOCATION), but the
+fact that they were downgraded to RELEVANT_NO_MORE means that
+dir_rename_counts already has the information we need for directory
+rename detection.  (A path which becomes RELEVANT_CONTENT in a
+subsequent commit will be removed from cached_irrelevant.)
+
+The reason for (D) is that is how we determine whether the remember
+renames optimization can be used.  In particular, remembering that our
+sequence of merges looks like:
+
+   Merge 1:
+   MERGE_BASE:   E
+   MERGE_SIDE1:  G
+   MERGE_SIDE2:  A
+   => Creates    A'
+
+   Merge 2:
+   MERGE_BASE:   A
+   MERGE_SIDE1:  A'
+   MERGE_SIDE2:  B
+   => Creates    B'
+
+It is the fact that the trees A and A' appear both in Merge 1 and in
+Merge 2, with A as a parent of A' that allows this optimization.  So
+we store the trees to compare with what we are asked to merge next
+time.
+
+
+=== 8. How directory rename detection interacts with the above and   ===
+===    why this optimization is still safe even if                   ===
+===    merge.directoryRenames is set to "true".                      ===
+
+As noted in the assumptions section:
+
+    """
+    ...if directory renames do occur, then the default of
+    merge.directoryRenames being set to "conflict" means that the operation
+    will stop for users to resolve the conflicts and the cache will be
+    thrown away, and thus that there won't be an optimization to apply.
+    So, the only reason we need to address directory renames specifically,
+    is that some users will have set merge.directoryRenames to "true" to
+    allow the merges to continue to proceed automatically.
+    """
+
+Let's remember that we need to look at how any given pick affects the next
+one.  So let's again use the first two picks from the diagram in section
+one:
+
+  First pick does this three-way merge:
+    MERGE_BASE:   E
+    MERGE_SIDE1:  G
+    MERGE_SIDE2:  A
+    => creates A'
+
+  Second pick does this three-way merge:
+    MERGE_BASE:   A
+    MERGE_SIDE1:  A'
+    MERGE_SIDE2:  B
+    => creates B'
+
+Now, directory rename detection exists so that if one side of history
+renames a directory, and the other side adds a new file to the old
+directory, then the merge (with merge.directoryRenames=true) can move the
+file into the new directory.  There are two qualitatively different ways to
+add a new file to an old directory: create a new file, or rename a file
+into that directory.  Also, directory renames can be done on either side of
+history, so there are four cases to consider:
+
+  * MERGE_SIDE1 renames old dir, MERGE_SIDE2 adds new file to   old dir
+  * MERGE_SIDE1 renames old dir, MERGE_SIDE2 renames  file into old dir
+  * MERGE_SIDE1 adds new file to   old dir, MERGE_SIDE2 renames old dir
+  * MERGE_SIDE1 renames  file into old dir, MERGE_SIDE2 renames old dir
+
+One last note before we consider these four cases: There are some
+important properties about how we implement this optimization with
+respect to directory rename detection that we need to bear in mind
+while considering all of these cases:
+
+  * rename caching occurs *after* applying directory renames
+
+  * a rename created by directory rename detection is recorded for the side
+    of history that did the directory rename.
+
+  * dir_rename_counts, the nested map of
+	{oldname => {newname => count}},
+    is cached between runs as well.  This basically means that directory
+    rename detection is also cached, though only on the side of history
+    that we cache renames for (MERGE_SIDE1 as far as this document is
+    concerned; see the assumptions section).  Two interesting sub-notes
+    about these counts:
+
+    * If we need to perform rename-detection again on the given side (e.g.
+      some paths are relevant for rename detection that weren't before),
+      then we clear dir_rename_counts and recompute it, making use of
+      cached_pairs.  The reason it is important to do this is optimizations
+      around RELEVANT_LOCATION exist to prevent us from computing
+      unnecessary renames for directory rename detection and from computing
+      dir_rename_counts for irrelevant directories; but those same renames
+      or directories may become necessary for subsequent merges.  The
+      easiest way to "fix up" dir_rename_counts in such cases is to just
+      recompute it.
+
+    * If we prune rename/rename(1to1) entries from the cache, then we also
+      need to update dir_rename_counts to decrement the counts for the
+      involved directory and any relevant parent directories (to undo what
+      update_dir_rename_counts() in diffcore-rename.c incremented when the
+      rename was initially found).  If we instead just disable the
+      remembering renames optimization when the exceedingly rare
+      rename/rename(1to1) cases occur, then dir_rename_counts will get
+      re-computed the next time rename detection occurs, as noted above.
+
+  * the side with multiple commits to pick, is the side of history that we
+    do NOT cache renames for.  Thus, there are no additional commits to
+    change the number of renames in a directory, except for those done by
+    directory rename detection (which always pad the majority).
+
+  * the "renames" we cache are modified slightly by any directory rename,
+    as noted below.
+
+Now, with those notes out of the way, let's go through the four cases
+in order:
+
+Case 1: MERGE_SIDE1 renames old dir, MERGE_SIDE2 adds new file to old dir
+
+  This case looks like this:
+
+    MERGE_BASE:   E,   Has olddir/
+    MERGE_SIDE1:  G,   Renames olddir/ -> newdir/
+    MERGE_SIDE2:  A,   Adds olddir/newfile
+    => creates    A',  With newdir/newfile
+
+    MERGE_BASE:   A,   Has olddir/newfile
+    MERGE_SIDE1:  A',  Has newdir/newfile
+    MERGE_SIDE2:  B,   Modifies olddir/newfile
+    => expected   B',  with threeway-merged newdir/newfile from above
+
+  In this case, with the optimization, note that after the first commit:
+    * MERGE_SIDE1 remembers olddir/ -> newdir/
+    * MERGE_SIDE1 has cached olddir/newfile -> newdir/newfile
+  Given the cached rename noted above, the second merge can proceed as
+  expected without needing to perform rename detection from A -> A'.
+
+Case 2: MERGE_SIDE1 renames old dir, MERGE_SIDE2 renames  file into old dir
+
+  This case looks like this:
+    MERGE_BASE:   E    oldfile, olddir/
+    MERGE_SIDE1:  G    oldfile, olddir/ -> newdir/
+    MERGE_SIDE2:  A    oldfile -> olddir/newfile
+    => creates    A',  With newdir/newfile representing original oldfile
+
+    MERGE_BASE:   A    olddir/newfile
+    MERGE_SIDE1:  A'   newdir/newfile
+    MERGE_SIDE2:  B    modify olddir/newfile
+    => expected   B',  with threeway-merged newdir/newfile from above
+
+  In this case, with the optimization, note that after the first commit:
+    * MERGE_SIDE1 remembers olddir/ -> newdir/
+    * MERGE_SIDE1 has cached olddir/newfile -> newdir/newfile
+		  (NOT oldfile -> newdir/newfile; compare to case with
+		   (p->status == 'R' && new_path) in possibly_cache_new_pair())
+
+  Given the cached rename noted above, the second merge can proceed as
+  expected without needing to perform rename detection from A -> A'.
+
+Case 3: MERGE_SIDE1 adds new file to   old dir, MERGE_SIDE2 renames old dir
+
+  This case looks like this:
+
+    MERGE_BASE:   E,   Has olddir/
+    MERGE_SIDE1:  G,   Adds olddir/newfile
+    MERGE_SIDE2:  A,   Renames olddir/ -> newdir/
+    => creates    A',  With newdir/newfile
+
+    MERGE_BASE:   A,   Has newdir/, but no notion of newdir/newfile
+    MERGE_SIDE1:  A',  Has newdir/newfile
+    MERGE_SIDE2:  B,   Has newdir/, but no notion of newdir/newfile
+    => expected   B',  with newdir/newfile from A'
+
+  In this case, with the optimization, note that after the first commit there
+  were no renames on MERGE_SIDE1, and any renames on MERGE_SIDE2 are tossed.
+  But the second merge didn't need any renames so this is fine.
+
+Case 4: MERGE_SIDE1 renames  file into old dir, MERGE_SIDE2 renames old dir
+
+  This case looks like this:
+
+    MERGE_BASE:   E,   Has olddir/
+    MERGE_SIDE1:  G,   Renames oldfile -> olddir/newfile
+    MERGE_SIDE2:  A,   Renames olddir/ -> newdir/
+    => creates    A',  With newdir/newfile representing original oldfile
+
+    MERGE_BASE:   A,   Has oldfile
+    MERGE_SIDE1:  A',  Has newdir/newfile
+    MERGE_SIDE2:  B,   Modifies oldfile
+    => expected   B',  with threeway-merged newdir/newfile from above
+
+  In this case, with the optimization, note that after the first commit:
+    * MERGE_SIDE1 remembers oldfile -> newdir/newfile
+		  (NOT oldfile -> olddir/newfile; compare to case of second
+		   block under p->status == 'R' in possibly_cache_new_pair())
+    * MERGE_SIDE2 renames are tossed because only MERGE_SIDE1 is remembered
+
+  Given the cached rename noted above, the second merge can proceed as
+  expected without needing to perform rename detection from A -> A'.
+
+Finally, I'll just note here that interactions with the
+skip-irrelevant-renames optimization means we sometimes don't detect
+renames for any files within a directory that was renamed, in which
+case we will not have been able to detect any rename for the directory
+itself.  In such a case, we do not know whether the directory was
+renamed; we want to be careful to avoid cacheing some kind of "this
+directory was not renamed" statement.  If we did, then a subsequent
+commit being rebased could add a file to the old directory, and the
+user would expect it to end up in the correct directory -- something
+our erroneous "this directory was not renamed" cache would preclude.
diff --git a/Documentation/technical/rerere.txt b/Documentation/technical/rerere.txt
index aa22d7ace8..af5f9fc24f 100644
--- a/Documentation/technical/rerere.txt
+++ b/Documentation/technical/rerere.txt
@@ -117,7 +117,7 @@ early A became C or B, a late X became Y or Z".  We can see there are
 4 combinations of ("B or C", "C or B") x ("X or Y", "Y or X").
 
 By sorting, the conflict is given its canonical name, namely, "an
-early part became B or C, a late part becames X or Y", and whenever
+early part became B or C, a late part became X or Y", and whenever
 any of these four patterns appear, and we can get to the same conflict
 and resolution that we saw earlier.
 
diff --git a/Documentation/technical/shallow.txt b/Documentation/technical/shallow.txt
index 01dedfe9ff..f3738baa0f 100644
--- a/Documentation/technical/shallow.txt
+++ b/Documentation/technical/shallow.txt
@@ -13,7 +13,7 @@ pretend as if they are root commits (e.g. "git log" traversal
 stops after showing them; "git fsck" does not complain saying
 the commits listed on their "parent" lines do not exist).
 
-Each line contains exactly one SHA-1. When read, a commit_graft
+Each line contains exactly one object name. When read, a commit_graft
 will be constructed, which has nr_parent < 0 to make it easier
 to discern from user provided grafts.
 
diff --git a/Documentation/technical/sparse-index.txt b/Documentation/technical/sparse-index.txt
new file mode 100644
index 0000000000..3b24c1a219
--- /dev/null
+++ b/Documentation/technical/sparse-index.txt
@@ -0,0 +1,208 @@
+Git Sparse-Index Design Document
+================================
+
+The sparse-checkout feature allows users to focus a working directory on
+a subset of the files at HEAD. The cone mode patterns, enabled by
+`core.sparseCheckoutCone`, allow for very fast pattern matching to
+discover which files at HEAD belong in the sparse-checkout cone.
+
+Three important scale dimensions for a Git working directory are:
+
+* `HEAD`: How many files are present at `HEAD`?
+
+* Populated: How many files are within the sparse-checkout cone.
+
+* Modified: How many files has the user modified in the working directory?
+
+We will use big-O notation -- O(X) -- to denote how expensive certain
+operations are in terms of these dimensions.
+
+These dimensions are ordered by their magnitude: users (typically) modify
+fewer files than are populated, and we can only populate files at `HEAD`.
+
+Problems occur if there is an extreme imbalance in these dimensions. For
+example, if `HEAD` contains millions of paths but the populated set has
+only tens of thousands, then commands like `git status` and `git add` can
+be dominated by operations that require O(`HEAD`) operations instead of
+O(Populated). Primarily, the cost is in parsing and rewriting the index,
+which is filled primarily with files at `HEAD` that are marked with the
+`SKIP_WORKTREE` bit.
+
+The sparse-index intends to take these commands that read and modify the
+index from O(`HEAD`) to O(Populated). To do this, we need to modify the
+index format in a significant way: add "sparse directory" entries.
+
+With cone mode patterns, it is possible to detect when an entire
+directory will have its contents outside of the sparse-checkout definition.
+Instead of listing all of the files it contains as individual entries, a
+sparse-index contains an entry with the directory name, referencing the
+object ID of the tree at `HEAD` and marked with the `SKIP_WORKTREE` bit.
+If we need to discover the details for paths within that directory, we
+can parse trees to find that list.
+
+At time of writing, sparse-directory entries violate expectations about the
+index format and its in-memory data structure. There are many consumers in
+the codebase that expect to iterate through all of the index entries and
+see only files. In fact, these loops expect to see a reference to every
+staged file. One way to handle this is to parse trees to replace a
+sparse-directory entry with all of the files within that tree as the index
+is loaded. However, parsing trees is slower than parsing the index format,
+so that is a slower operation than if we left the index alone. The plan is
+to make all of these integrations "sparse aware" so this expansion through
+tree parsing is unnecessary and they use fewer resources than when using a
+full index.
+
+The implementation plan below follows four phases to slowly integrate with
+the sparse-index. The intention is to incrementally update Git commands to
+interact safely with the sparse-index without significant slowdowns. This
+may not always be possible, but the hope is that the primary commands that
+users need in their daily work are dramatically improved.
+
+Phase I: Format and initial speedups
+------------------------------------
+
+During this phase, Git learns to enable the sparse-index and safely parse
+one. Protections are put in place so that every consumer of the in-memory
+data structure can operate with its current assumption of every file at
+`HEAD`.
+
+At first, every index parse will call a helper method,
+`ensure_full_index()`, which scans the index for sparse-directory entries
+(pointing to trees) and replaces them with the full list of paths (with
+blob contents) by parsing tree objects. This will be slower in all cases.
+The only noticeable change in behavior will be that the serialized index
+file contains sparse-directory entries.
+
+To start, we use a new required index extension, `sdir`, to allow
+inserting sparse-directory entries into indexes with file format
+versions 2, 3, and 4. This prevents Git versions that do not understand
+the sparse-index from operating on one, while allowing tools that do not
+understand the sparse-index to operate on repositories as long as they do
+not interact with the index. A new format, index v5, will be introduced
+that includes sparse-directory entries by default. It might also
+introduce other features that have been considered for improving the
+index, as well.
+
+Next, consumers of the index will be guarded against operating on a
+sparse-index by inserting calls to `ensure_full_index()` or
+`expand_index_to_path()`. If a specific path is requested, then those will
+be protected from within the `index_file_exists()` and `index_name_pos()`
+API calls: they will call `ensure_full_index()` if necessary. The
+intention here is to preserve existing behavior when interacting with a
+sparse-checkout. We don't want a change to happen by accident, without
+tests. Many of these locations may not need any change before removing the
+guards, but we should not do so without tests to ensure the expected
+behavior happens.
+
+It may be desirable to _change_ the behavior of some commands in the
+presence of a sparse index or more generally in any sparse-checkout
+scenario. In such cases, these should be carefully communicated and
+tested. No such behavior changes are intended during this phase.
+
+During a scan of the codebase, not every iteration of the cache entries
+needs an `ensure_full_index()` check. The basic reasons include:
+
+1. The loop is scanning for entries with non-zero stage. These entries
+   are not collapsed into a sparse-directory entry.
+
+2. The loop is scanning for submodules. These entries are not collapsed
+   into a sparse-directory entry.
+
+3. The loop is part of the index API, especially around reading or
+   writing the format.
+
+4. The loop is checking for correct order of cache entries and that is
+   correct if and only if the sparse-directory entries are in the correct
+   location.
+
+5. The loop ignores entries with the `SKIP_WORKTREE` bit set, or is
+   otherwise already aware of sparse directory entries.
+
+6. The sparse-index is disabled at this point when using the split-index
+   feature, so no effort is made to protect the split-index API.
+
+Even after inserting these guards, we will keep expanding sparse-indexes
+for most Git commands using the `command_requires_full_index` repository
+setting. This setting will be on by default and disabled one builtin at a
+time until we have sufficient confidence that all of the index operations
+are properly guarded.
+
+To complete this phase, the commands `git status` and `git add` will be
+integrated with the sparse-index so that they operate with O(Populated)
+performance. They will be carefully tested for operations within and
+outside the sparse-checkout definition.
+
+Phase II: Careful integrations
+------------------------------
+
+This phase focuses on ensuring that all index extensions and APIs work
+well with a sparse-index. This requires significant increases to our test
+coverage, especially for operations that interact with the working
+directory outside of the sparse-checkout definition. Some of these
+behaviors may not be the desirable ones, such as some tests already
+marked for failure in `t1092-sparse-checkout-compatibility.sh`.
+
+The index extensions that may require special integrations are:
+
+* FS Monitor
+* Untracked cache
+
+While integrating with these features, we should look for patterns that
+might lead to better APIs for interacting with the index. Coalescing
+common usage patterns into an API call can reduce the number of places
+where sparse-directories need to be handled carefully.
+
+Phase III: Important command speedups
+-------------------------------------
+
+At this point, the patterns for testing and implementing sparse-directory
+logic should be relatively stable. This phase focuses on updating some of
+the most common builtins that use the index to operate as O(Populated).
+Here is a potential list of commands that could be valuable to integrate
+at this point:
+
+* `git commit`
+* `git checkout`
+* `git merge`
+* `git rebase`
+
+Hopefully, commands such as `git merge` and `git rebase` can benefit
+instead from merge algorithms that do not use the index as a data
+structure, such as the merge-ORT strategy. As these topics mature, we
+may enable the ORT strategy by default for repositories using the
+sparse-index feature.
+
+Along with `git status` and `git add`, these commands cover the majority
+of users' interactions with the working directory. In addition, we can
+integrate with these commands:
+
+* `git grep`
+* `git rm`
+
+These have been proposed as some whose behavior could change when in a
+repo with a sparse-checkout definition. It would be good to include this
+behavior automatically when using a sparse-index. Some clarity is needed
+to make the behavior switch clear to the user.
+
+This phase is the first where parallel work might be possible without too
+much conflicts between topics.
+
+Phase IV: The long tail
+-----------------------
+
+This last phase is less a "phase" and more "the new normal" after all of
+the previous work.
+
+To start, the `command_requires_full_index` option could be removed in
+favor of expanding only when hitting an API guard.
+
+There are many Git commands that could use special attention to operate as
+O(Populated), while some might be so rare that it is acceptable to leave
+them with additional overhead when a sparse-index is present.
+
+Here are some commands that might be useful to update:
+
+* `git sparse-checkout set`
+* `git am`
+* `git clean`
+* `git stash`
diff --git a/Documentation/urls.txt b/Documentation/urls.txt
index bc354fe2dc..1c229d7581 100644
--- a/Documentation/urls.txt
+++ b/Documentation/urls.txt
@@ -53,6 +53,9 @@ These two syntaxes are mostly equivalent, except the former implies
 --local option.
 endif::git-clone[]
 
+'git clone', 'git fetch' and 'git pull', but not 'git push', will also
+accept a suitable bundle file. See linkgit:git-bundle[1].
+
 When Git doesn't know how to handle a certain transport protocol, it
 attempts to use the 'remote-<transport>' remote helper, if one
 exists. To explicitly request a remote helper, the following syntax
diff --git a/Documentation/user-manual.conf b/Documentation/user-manual.conf
index d87294de2f..0148f126dc 100644
--- a/Documentation/user-manual.conf
+++ b/Documentation/user-manual.conf
@@ -9,13 +9,3 @@ tilde=&#126;
 
 [linkgit-inlinemacro]
 <ulink url="{target}.html">{target}{0?({0})}</ulink>
-
-ifdef::backend-docbook[]
-# "unbreak" docbook-xsl v1.68 for manpages. v1.69 works with or without this.
-[listingblock]
-<example><title>{title}</title>
-<literallayout class="monospaced">
-|
-</literallayout>
-{title#}</example>
-endif::backend-docbook[]
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 06bd8994ee..865074bed4 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1,5 +1,8 @@
 = Git User Manual
 
+[preface]
+== Introduction
+
 Git is a fast distributed revision control system.
 
 This manual is designed to be readable by someone with basic UNIX
@@ -347,7 +350,7 @@ $ git branch -r
   origin/man
   origin/master
   origin/next
-  origin/pu
+  origin/seen
   origin/todo
 ------------------------------------------------
 
@@ -2789,7 +2792,7 @@ A fast-forward looks something like this:
 
 In some cases it is possible that the new head will *not* actually be
 a descendant of the old head.  For example, the developer may have
-realized she made a serious mistake, and decided to backtrack,
+realized a serious mistake was made and decided to backtrack,
 resulting in a situation like:
 
 ................................................
@@ -3187,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
@@ -4574,5 +4577,5 @@ Write a chapter on using plumbing and writing scripts.
 Alternates, clone -reference, etc.
 
 More on recovery from repository corruption.  See:
-	http://marc.info/?l=git&m=117263864820799&w=2
-	http://marc.info/?l=git&m=117147855503798&w=2
+	https://lore.kernel.org/git/Pine.LNX.4.64.0702272039540.12485@woody.linux-foundation.org/
+	https://lore.kernel.org/git/Pine.LNX.4.64.0702141033400.3604@woody.linux-foundation.org/
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 5048d9bff6..b48559d654 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v2.24.0
+DEF_VER=v2.33.GIT
 
 LF='
 '
diff --git a/INSTALL b/INSTALL
index c39006e8e7..66389ce059 100644
--- a/INSTALL
+++ b/INSTALL
@@ -109,15 +109,15 @@ Issues of note:
 
  - Git is reasonably self-sufficient, but does depend on a few external
    programs and libraries.  Git can be used without most of them by adding
-   the approriate "NO_<LIBRARY>=YesPlease" to the make command line or
+   the appropriate "NO_<LIBRARY>=YesPlease" to the make command line or
    config.mak file.
 
 	- "zlib", the compression library. Git won't build without it.
 
 	- "ssh" is used to push and pull over the net.
 
-	- A POSIX-compliant shell is required to run many scripts needed
-	  for everyday use (e.g. "bisect", "pull").
+	- A POSIX-compliant shell is required to run some scripts needed
+	  for everyday use (e.g. "bisect", "request-pull").
 
 	- "Perl" version 5.8 or later is needed to use some of the
 	  features (e.g. preparing a partial commit using "git add -i/-p",
@@ -165,8 +165,7 @@ Issues of note:
 	  use English. Under autoconf the configure script will do this
 	  automatically if it can't find libintl on the system.
 
-	- Python version 2.4 or later (but not 3.x, which is not
-	  supported by Perforce) is needed to use the git-p4 interface
+	- Python version 2.7 or later is needed to use the git-p4 interface
 	  to Perforce.
 
  - Some platform specific issues are dealt with Makefile rules,
@@ -198,7 +197,9 @@ Issues of note:
    Building and installing the pdf file additionally requires
    dblatex.  Version >= 0.2.7 is known to work.
 
-   All formats require at least asciidoc 8.4.1.
+   All formats require at least asciidoc 8.4.1. Alternatively, you can
+   use Asciidoctor (requires Ruby) by passing USE_ASCIIDOCTOR=YesPlease
+   to make. You need at least Asciidoctor version 1.5.
 
    There are also "make quick-install-doc", "make quick-install-man"
    and "make quick-install-html" which install preformatted man pages
@@ -206,9 +207,7 @@ Issues of note:
    clone two separate git-htmldocs and git-manpages repositories next
    to the clone of git itself.
 
-   It has been reported that docbook-xsl version 1.72 and 1.73 are
-   buggy; 1.72 misformats manual pages for callouts, and 1.73 needs
-   the patch in contrib/patches/docbook-xsl-manpages-charmap.patch
+   The minimum supported version of docbook-xsl is 1.74.
 
    Users attempting to build the documentation on Cygwin may need to ensure
    that the /etc/xml/catalog file looks something like this:
diff --git a/Makefile b/Makefile
index 58b92af54b..429c276058 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,9 @@ all::
 # when attempting to read from an fopen'ed directory (or even to fopen
 # it at all).
 #
+# Define OPEN_RETURNS_EINTR if your open() system call may return EINTR
+# when a signal is received (as opposed to restarting).
+#
 # Define NO_OPENSSL environment variable if you do not have OpenSSL.
 #
 # Define USE_LIBPCRE if you have and want to use libpcre. Various
@@ -29,18 +32,11 @@ all::
 # Perl-compatible regular expressions instead of standard or extended
 # POSIX regular expressions.
 #
-# USE_LIBPCRE is a synonym for USE_LIBPCRE2, define USE_LIBPCRE1
-# instead if you'd like to use the legacy version 1 of the PCRE
-# library. Support for version 1 will likely be removed in some future
-# release of Git, as upstream has all but abandoned it.
-#
-# When using USE_LIBPCRE1, define NO_LIBPCRE1_JIT if you want to
-# disable JIT even if supported by your library.
+# Only libpcre version 2 is supported. USE_LIBPCRE2 is a synonym for
+# USE_LIBPCRE, support for the old USE_LIBPCRE1 has been removed.
 #
 # Define LIBPCREDIR=/foo/bar if your PCRE header and library files are
-# in /foo/bar/include and /foo/bar/lib directories. Which version of
-# PCRE this points to determined by the USE_LIBPCRE1 and USE_LIBPCRE2
-# variables.
+# in /foo/bar/include and /foo/bar/lib directories.
 #
 # Define HAVE_ALLOCA_H if you have working alloca(3) defined in that header.
 #
@@ -282,12 +278,6 @@ all::
 # Define NO_ST_BLOCKS_IN_STRUCT_STAT if your platform does not have st_blocks
 # field that counts the on-disk footprint in 512-byte blocks.
 #
-# Define DOCBOOK_XSL_172 if you want to format man pages with DocBook XSL v1.72
-# (not v1.73 or v1.71).
-#
-# Define ASCIIDOC_ROFF if your DocBook XSL does not escape raw roff directives
-# (versions 1.68.1 through v1.72).
-#
 # Define GNU_ROFF if your target system uses GNU groff.  This forces
 # apostrophes to be ASCII so that cut&pasting examples to the shell
 # will work.
@@ -309,7 +299,7 @@ all::
 # modules, instead of the fallbacks shipped with Git.
 #
 # Define PYTHON_PATH to the path of your Python binary (often /usr/bin/python
-# but /usr/bin/python2.7 on some platforms).
+# but /usr/bin/python2.7 or /usr/bin/python3 on some platforms).
 #
 # Define NO_PYTHON if you do not want Python scripts or libraries at all.
 #
@@ -354,6 +344,9 @@ all::
 # Define NO_INSTALL_HARDLINKS if you prefer to use either symbolic links or
 # copies to install built-in git commands e.g. git-cat-file.
 #
+# Define SKIP_DASHED_BUILT_INS if you do not need the dashed versions of the
+# built-ins to be linked/copied at all.
+#
 # Define USE_NED_ALLOCATOR if you want to replace the platforms default
 # memory allocators with the nedmalloc allocator written by Niall Douglas.
 #
@@ -405,8 +398,9 @@ all::
 # with a different indexfile format version.  If it isn't set the index
 # file format used is index-v[23].
 #
-# Define GMTIME_UNRELIABLE_ERRORS if your gmtime() function does not
-# return NULL when it receives a bogus time_t.
+# Define GIT_TEST_UTF8_LOCALE to preferred utf-8 locale for testing.
+# If it isn't set, fallback to $LC_ALL, $LANG or use the first utf-8
+# locale returned by "locale -a".
 #
 # Define HAVE_CLOCK_GETTIME if your platform has clock_gettime.
 #
@@ -471,6 +465,12 @@ all::
 # the global variable _wpgmptr containing the absolute path of the current
 # executable (this is the case on Windows).
 #
+# 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/`
+# directory, and the JSON compilation database 'compile_commands.json' will be
+# created at the root of the repository.
+#
 # Define DEVELOPER to enable more compiler warnings. Compiler version
 # and family are auto detected, but could be overridden by defining
 # COMPILER_FEATURES (see config.mak.dev). You can still set
@@ -481,7 +481,7 @@ all::
 #
 # When DEVELOPER is set, DEVOPTS can be used to control compiler
 # options.  This variable contains keywords separated by
-# whitespace. The following keywords are are recognized:
+# whitespace. The following keywords are recognized:
 #
 #    no-error:
 #
@@ -578,12 +578,13 @@ BUILT_INS =
 COMPAT_CFLAGS =
 COMPAT_OBJS =
 XDIFF_OBJS =
-VCSSVN_OBJS =
 GENERATED_H =
 EXTRA_CPPFLAGS =
 FUZZ_OBJS =
 FUZZ_PROGRAMS =
+GIT_OBJS =
 LIB_OBJS =
+OBJECTS =
 PROGRAM_OBJS =
 PROGRAMS =
 EXCLUDED_PROGRAMS =
@@ -592,6 +593,7 @@ SCRIPT_PYTHON =
 SCRIPT_SH =
 SCRIPT_LIB =
 TEST_BUILTINS_OBJS =
+TEST_OBJS =
 TEST_PROGRAMS_NEED_X =
 THIRD_PARTY_SOURCES =
 
@@ -609,16 +611,14 @@ SCRIPT_SH += git-merge-one-file.sh
 SCRIPT_SH += git-merge-resolve.sh
 SCRIPT_SH += git-mergetool.sh
 SCRIPT_SH += git-quiltimport.sh
-SCRIPT_SH += git-legacy-stash.sh
 SCRIPT_SH += git-request-pull.sh
 SCRIPT_SH += git-submodule.sh
 SCRIPT_SH += git-web--browse.sh
 
 SCRIPT_LIB += git-mergetool--lib
-SCRIPT_LIB += git-parse-remote
 SCRIPT_LIB += git-rebase--preserve-merges
-SCRIPT_LIB += git-sh-setup
 SCRIPT_LIB += git-sh-i18n
+SCRIPT_LIB += git-sh-setup
 
 SCRIPT_PERL += git-add--interactive.perl
 SCRIPT_PERL += git-archimport.perl
@@ -669,6 +669,8 @@ ETAGS_TARGET = TAGS
 FUZZ_OBJS += fuzz-commit-graph.o
 FUZZ_OBJS += fuzz-pack-headers.o
 FUZZ_OBJS += fuzz-pack-idx.o
+.PHONY: fuzz-objs
+fuzz-objs: $(FUZZ_OBJS)
 
 # Always build fuzz objects even if not testing, to prevent bit-rot.
 all:: $(FUZZ_OBJS)
@@ -681,22 +683,25 @@ EXTRA_PROGRAMS =
 # ... and all the rest that could be moved out of bindir to gitexecdir
 PROGRAMS += $(EXTRA_PROGRAMS)
 
-PROGRAM_OBJS += credential-store.o
 PROGRAM_OBJS += daemon.o
-PROGRAM_OBJS += fast-import.o
 PROGRAM_OBJS += http-backend.o
 PROGRAM_OBJS += imap-send.o
 PROGRAM_OBJS += sh-i18n--envsubst.o
 PROGRAM_OBJS += shell.o
-PROGRAM_OBJS += remote-testsvn.o
+.PHONY: program-objs
+program-objs: $(PROGRAM_OBJS)
 
 # Binary suffix, set to .exe for Windows builds
 X =
 
 PROGRAMS += $(patsubst %.o,git-%$X,$(PROGRAM_OBJS))
 
+TEST_BUILTINS_OBJS += test-advise.o
+TEST_BUILTINS_OBJS += test-bitmap.o
+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-ctype.o
 TEST_BUILTINS_OBJS += test-date.o
 TEST_BUILTINS_OBJS += test-delta.o
@@ -707,26 +712,35 @@ TEST_BUILTINS_OBJS += test-dump-fsmonitor.o
 TEST_BUILTINS_OBJS += test-dump-split-index.o
 TEST_BUILTINS_OBJS += test-dump-untracked-cache.o
 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
-TEST_BUILTINS_OBJS += test-hash-speed.o
 TEST_BUILTINS_OBJS += test-index-version.o
 TEST_BUILTINS_OBJS += test-json-writer.o
 TEST_BUILTINS_OBJS += test-lazy-init-name-hash.o
 TEST_BUILTINS_OBJS += test-match-trees.o
 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
+TEST_BUILTINS_OBJS += test-partial-clone.o
 TEST_BUILTINS_OBJS += test-path-utils.o
+TEST_BUILTINS_OBJS += test-pcre2-config.o
 TEST_BUILTINS_OBJS += test-pkt-line.o
 TEST_BUILTINS_OBJS += test-prio-queue.o
+TEST_BUILTINS_OBJS += test-proc-receive.o
 TEST_BUILTINS_OBJS += test-progress.o
 TEST_BUILTINS_OBJS += test-reach.o
 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-regex.o
@@ -736,9 +750,9 @@ TEST_BUILTINS_OBJS += test-run-command.o
 TEST_BUILTINS_OBJS += test-scrap-cache-tree.o
 TEST_BUILTINS_OBJS += test-serve-v2.o
 TEST_BUILTINS_OBJS += test-sha1.o
-TEST_BUILTINS_OBJS += test-sha1-array.o
 TEST_BUILTINS_OBJS += test-sha256.o
 TEST_BUILTINS_OBJS += test-sigchain.o
+TEST_BUILTINS_OBJS += test-simple-ipc.o
 TEST_BUILTINS_OBJS += test-strcmp-offset.o
 TEST_BUILTINS_OBJS += test-string-list.o
 TEST_BUILTINS_OBJS += test-submodule-config.o
@@ -746,16 +760,15 @@ TEST_BUILTINS_OBJS += test-submodule-nested-repo-config.o
 TEST_BUILTINS_OBJS += test-subprocess.o
 TEST_BUILTINS_OBJS += test-trace2.o
 TEST_BUILTINS_OBJS += test-urlmatch-normalization.o
-TEST_BUILTINS_OBJS += test-xml-encode.o
+TEST_BUILTINS_OBJS += test-userdiff.o
 TEST_BUILTINS_OBJS += test-wildmatch.o
 TEST_BUILTINS_OBJS += test-windows-named-pipe.o
 TEST_BUILTINS_OBJS += test-write-cache.o
+TEST_BUILTINS_OBJS += test-xml-encode.o
 
 # Do not add more tests here unless they have extra dependencies. Add
 # them in TEST_BUILTINS_OBJS above.
 TEST_PROGRAMS_NEED_X += test-fake-ssh
-TEST_PROGRAMS_NEED_X += test-line-buffer
-TEST_PROGRAMS_NEED_X += test-svn-fe
 TEST_PROGRAMS_NEED_X += test-tool
 
 TEST_PROGRAMS = $(patsubst %,t/helper/%$X,$(TEST_PROGRAMS_NEED_X))
@@ -769,6 +782,7 @@ BUILT_INS += git-cherry-pick$X
 BUILT_INS += git-format-patch$X
 BUILT_INS += git-fsck-objects$X
 BUILT_INS += git-init$X
+BUILT_INS += git-maintenance$X
 BUILT_INS += git-merge-subtree$X
 BUILT_INS += git-restore$X
 BUILT_INS += git-show$X
@@ -777,19 +791,15 @@ BUILT_INS += git-status$X
 BUILT_INS += git-switch$X
 BUILT_INS += git-whatchanged$X
 
-# what 'all' will build and 'install' will install in gitexecdir,
-# excluding programs for built-in commands
-ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
-
 # what 'all' will build but not install in gitexecdir
 OTHER_PROGRAMS = git$X
 
 # what test wrappers are needed and 'install' will install, in bindir
 BINDIR_PROGRAMS_NEED_X += git
-BINDIR_PROGRAMS_NEED_X += git-upload-pack
 BINDIR_PROGRAMS_NEED_X += git-receive-pack
-BINDIR_PROGRAMS_NEED_X += git-upload-archive
 BINDIR_PROGRAMS_NEED_X += git-shell
+BINDIR_PROGRAMS_NEED_X += git-upload-archive
+BINDIR_PROGRAMS_NEED_X += git-upload-pack
 
 BINDIR_PROGRAMS_NO_X += git-cvsserver
 
@@ -811,9 +821,9 @@ TEST_SHELL_PATH = $(SHELL_PATH)
 
 LIB_FILE = libgit.a
 XDIFF_LIB = xdiff/lib.a
-VCSSVN_LIB = vcs-svn/lib.a
 
 GENERATED_H += command-list.h
+GENERATED_H += config-list.h
 
 LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentation/' 2>/dev/null || \
 	$(FIND) . \
@@ -823,31 +833,35 @@ LIB_H := $(sort $(patsubst ./%,%,$(shell git ls-files '*.h' ':!t/' ':!Documentat
 	-name '*.h' -print)))
 
 LIB_OBJS += abspath.o
+LIB_OBJS += add-interactive.o
+LIB_OBJS += add-patch.o
 LIB_OBJS += advice.o
 LIB_OBJS += alias.o
 LIB_OBJS += alloc.o
 LIB_OBJS += apply.o
-LIB_OBJS += archive.o
 LIB_OBJS += archive-tar.o
 LIB_OBJS += archive-zip.o
-LIB_OBJS += argv-array.o
+LIB_OBJS += archive.o
 LIB_OBJS += attr.o
 LIB_OBJS += base85.o
 LIB_OBJS += bisect.o
 LIB_OBJS += blame.o
 LIB_OBJS += blob.o
+LIB_OBJS += bloom.o
 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
 LIB_OBJS += color.o
 LIB_OBJS += column.o
 LIB_OBJS += combine-diff.o
-LIB_OBJS += commit.o
 LIB_OBJS += commit-graph.o
 LIB_OBJS += commit-reach.o
+LIB_OBJS += commit.o
 LIB_OBJS += compat/obstack.o
 LIB_OBJS += compat/terminal.o
 LIB_OBJS += config.o
@@ -861,17 +875,19 @@ LIB_OBJS += ctype.o
 LIB_OBJS += date.o
 LIB_OBJS += decorate.o
 LIB_OBJS += delta-islands.o
+LIB_OBJS += diff-delta.o
+LIB_OBJS += diff-merges.o
+LIB_OBJS += diff-lib.o
+LIB_OBJS += diff-no-index.o
+LIB_OBJS += diff.o
 LIB_OBJS += diffcore-break.o
 LIB_OBJS += diffcore-delta.o
 LIB_OBJS += diffcore-order.o
 LIB_OBJS += diffcore-pickaxe.o
 LIB_OBJS += diffcore-rename.o
-LIB_OBJS += diff-delta.o
-LIB_OBJS += diff-lib.o
-LIB_OBJS += diff-no-index.o
-LIB_OBJS += diff.o
-LIB_OBJS += dir.o
+LIB_OBJS += diffcore-rotate.o
 LIB_OBJS += dir-iterator.o
+LIB_OBJS += dir.o
 LIB_OBJS += editor.o
 LIB_OBJS += entry.o
 LIB_OBJS += environment.o
@@ -882,26 +898,27 @@ LIB_OBJS += ewah/ewah_rlw.o
 LIB_OBJS += exec-cmd.o
 LIB_OBJS += fetch-negotiator.o
 LIB_OBJS += fetch-pack.o
+LIB_OBJS += fmt-merge-msg.o
 LIB_OBJS += fsck.o
 LIB_OBJS += fsmonitor.o
 LIB_OBJS += gettext.o
 LIB_OBJS += gpg-interface.o
 LIB_OBJS += graph.o
 LIB_OBJS += grep.o
+LIB_OBJS += hash-lookup.o
 LIB_OBJS += hashmap.o
-LIB_OBJS += linear-assignment.o
 LIB_OBJS += help.o
 LIB_OBJS += hex.o
 LIB_OBJS += ident.o
-LIB_OBJS += interdiff.o
 LIB_OBJS += json-writer.o
 LIB_OBJS += kwset.o
 LIB_OBJS += levenshtein.o
 LIB_OBJS += line-log.o
 LIB_OBJS += line-range.o
-LIB_OBJS += list-objects.o
-LIB_OBJS += list-objects-filter.o
+LIB_OBJS += linear-assignment.o
 LIB_OBJS += list-objects-filter-options.o
+LIB_OBJS += list-objects-filter.o
+LIB_OBJS += list-objects.o
 LIB_OBJS += ll-merge.o
 LIB_OBJS += lockfile.o
 LIB_OBJS += log-tree.o
@@ -910,31 +927,39 @@ LIB_OBJS += mailinfo.o
 LIB_OBJS += mailmap.o
 LIB_OBJS += match-trees.o
 LIB_OBJS += mem-pool.o
-LIB_OBJS += merge.o
 LIB_OBJS += merge-blobs.o
+LIB_OBJS += merge-ort.o
+LIB_OBJS += merge-ort-wrappers.o
 LIB_OBJS += merge-recursive.o
+LIB_OBJS += merge.o
 LIB_OBJS += mergesort.o
 LIB_OBJS += midx.o
 LIB_OBJS += name-hash.o
 LIB_OBJS += negotiator/default.o
+LIB_OBJS += negotiator/noop.o
 LIB_OBJS += negotiator/skipping.o
-LIB_OBJS += notes.o
 LIB_OBJS += notes-cache.o
 LIB_OBJS += notes-merge.o
 LIB_OBJS += notes-utils.o
+LIB_OBJS += notes.o
+LIB_OBJS += object-file.o
+LIB_OBJS += object-name.o
 LIB_OBJS += object.o
+LIB_OBJS += oid-array.o
 LIB_OBJS += oidmap.o
 LIB_OBJS += oidset.o
-LIB_OBJS += packfile.o
-LIB_OBJS += pack-bitmap.o
+LIB_OBJS += oidtree.o
 LIB_OBJS += pack-bitmap-write.o
+LIB_OBJS += pack-bitmap.o
 LIB_OBJS += pack-check.o
 LIB_OBJS += pack-objects.o
 LIB_OBJS += pack-revindex.o
 LIB_OBJS += pack-write.o
+LIB_OBJS += packfile.o
 LIB_OBJS += pager.o
-LIB_OBJS += parse-options.o
+LIB_OBJS += parallel-checkout.o
 LIB_OBJS += parse-options-cb.o
+LIB_OBJS += parse-options.o
 LIB_OBJS += patch-delta.o
 LIB_OBJS += patch-ids.o
 LIB_OBJS += path.o
@@ -947,24 +972,29 @@ LIB_OBJS += progress.o
 LIB_OBJS += promisor-remote.o
 LIB_OBJS += prompt.o
 LIB_OBJS += protocol.o
+LIB_OBJS += protocol-caps.o
+LIB_OBJS += prune-packed.o
 LIB_OBJS += quote.o
 LIB_OBJS += range-diff.o
 LIB_OBJS += reachable.o
 LIB_OBJS += read-cache.o
 LIB_OBJS += rebase-interactive.o
+LIB_OBJS += rebase.o
+LIB_OBJS += ref-filter.o
 LIB_OBJS += reflog-walk.o
 LIB_OBJS += refs.o
+LIB_OBJS += refs/debug.o
 LIB_OBJS += refs/files-backend.o
 LIB_OBJS += refs/iterator.o
 LIB_OBJS += refs/packed-backend.o
 LIB_OBJS += refs/ref-cache.o
 LIB_OBJS += refspec.o
-LIB_OBJS += ref-filter.o
 LIB_OBJS += remote.o
 LIB_OBJS += replace-object.o
 LIB_OBJS += repo-settings.o
 LIB_OBJS += repository.o
 LIB_OBJS += rerere.o
+LIB_OBJS += reset.o
 LIB_OBJS += resolve-undo.o
 LIB_OBJS += revision.o
 LIB_OBJS += run-command.o
@@ -973,21 +1003,20 @@ LIB_OBJS += sequencer.o
 LIB_OBJS += serve.o
 LIB_OBJS += server-info.o
 LIB_OBJS += setup.o
-LIB_OBJS += sha1-array.o
-LIB_OBJS += sha1-lookup.o
-LIB_OBJS += sha1-file.o
-LIB_OBJS += sha1-name.o
 LIB_OBJS += shallow.o
 LIB_OBJS += sideband.o
 LIB_OBJS += sigchain.o
+LIB_OBJS += sparse-index.o
 LIB_OBJS += split-index.o
 LIB_OBJS += stable-qsort.o
 LIB_OBJS += strbuf.o
 LIB_OBJS += streaming.o
 LIB_OBJS += string-list.o
-LIB_OBJS += submodule.o
-LIB_OBJS += submodule-config.o
+LIB_OBJS += strmap.o
+LIB_OBJS += strvec.o
 LIB_OBJS += sub-process.o
+LIB_OBJS += submodule-config.o
+LIB_OBJS += submodule.o
 LIB_OBJS += symlinks.o
 LIB_OBJS += tag.o
 LIB_OBJS += tempfile.o
@@ -1006,11 +1035,11 @@ LIB_OBJS += trace2/tr2_tgt_normal.o
 LIB_OBJS += trace2/tr2_tgt_perf.o
 LIB_OBJS += trace2/tr2_tls.o
 LIB_OBJS += trailer.o
-LIB_OBJS += transport.o
 LIB_OBJS += transport-helper.o
+LIB_OBJS += transport.o
 LIB_OBJS += tree-diff.o
-LIB_OBJS += tree.o
 LIB_OBJS += tree-walk.o
+LIB_OBJS += tree.o
 LIB_OBJS += unpack-trees.o
 LIB_OBJS += upload-pack.o
 LIB_OBJS += url.o
@@ -1039,22 +1068,27 @@ BUILTIN_OBJS += builtin/archive.o
 BUILTIN_OBJS += builtin/bisect--helper.o
 BUILTIN_OBJS += builtin/blame.o
 BUILTIN_OBJS += builtin/branch.o
+BUILTIN_OBJS += builtin/bugreport.o
 BUILTIN_OBJS += builtin/bundle.o
 BUILTIN_OBJS += builtin/cat-file.o
 BUILTIN_OBJS += builtin/check-attr.o
 BUILTIN_OBJS += builtin/check-ignore.o
 BUILTIN_OBJS += builtin/check-mailmap.o
 BUILTIN_OBJS += builtin/check-ref-format.o
+BUILTIN_OBJS += builtin/checkout--worker.o
 BUILTIN_OBJS += builtin/checkout-index.o
 BUILTIN_OBJS += builtin/checkout.o
 BUILTIN_OBJS += builtin/clean.o
 BUILTIN_OBJS += builtin/clone.o
 BUILTIN_OBJS += builtin/column.o
+BUILTIN_OBJS += builtin/commit-graph.o
 BUILTIN_OBJS += builtin/commit-tree.o
 BUILTIN_OBJS += builtin/commit.o
-BUILTIN_OBJS += builtin/commit-graph.o
 BUILTIN_OBJS += builtin/config.o
 BUILTIN_OBJS += builtin/count-objects.o
+BUILTIN_OBJS += builtin/credential-cache--daemon.o
+BUILTIN_OBJS += builtin/credential-cache.o
+BUILTIN_OBJS += builtin/credential-store.o
 BUILTIN_OBJS += builtin/credential.o
 BUILTIN_OBJS += builtin/describe.o
 BUILTIN_OBJS += builtin/diff-files.o
@@ -1064,10 +1098,12 @@ BUILTIN_OBJS += builtin/diff.o
 BUILTIN_OBJS += builtin/difftool.o
 BUILTIN_OBJS += builtin/env--helper.o
 BUILTIN_OBJS += builtin/fast-export.o
+BUILTIN_OBJS += builtin/fast-import.o
 BUILTIN_OBJS += builtin/fetch-pack.o
 BUILTIN_OBJS += builtin/fetch.o
 BUILTIN_OBJS += builtin/fmt-merge-msg.o
 BUILTIN_OBJS += builtin/for-each-ref.o
+BUILTIN_OBJS += builtin/for-each-repo.o
 BUILTIN_OBJS += builtin/fsck.o
 BUILTIN_OBJS += builtin/gc.o
 BUILTIN_OBJS += builtin/get-tar-commit-id.o
@@ -1083,13 +1119,13 @@ BUILTIN_OBJS += builtin/ls-remote.o
 BUILTIN_OBJS += builtin/ls-tree.o
 BUILTIN_OBJS += builtin/mailinfo.o
 BUILTIN_OBJS += builtin/mailsplit.o
-BUILTIN_OBJS += builtin/merge.o
 BUILTIN_OBJS += builtin/merge-base.o
 BUILTIN_OBJS += builtin/merge-file.o
 BUILTIN_OBJS += builtin/merge-index.o
 BUILTIN_OBJS += builtin/merge-ours.o
 BUILTIN_OBJS += builtin/merge-recursive.o
 BUILTIN_OBJS += builtin/merge-tree.o
+BUILTIN_OBJS += builtin/merge.o
 BUILTIN_OBJS += builtin/mktag.o
 BUILTIN_OBJS += builtin/mktree.o
 BUILTIN_OBJS += builtin/multi-pack-index.o
@@ -1109,9 +1145,9 @@ BUILTIN_OBJS += builtin/read-tree.o
 BUILTIN_OBJS += builtin/rebase.o
 BUILTIN_OBJS += builtin/receive-pack.o
 BUILTIN_OBJS += builtin/reflog.o
-BUILTIN_OBJS += builtin/remote.o
 BUILTIN_OBJS += builtin/remote-ext.o
 BUILTIN_OBJS += builtin/remote-fd.o
+BUILTIN_OBJS += builtin/remote.o
 BUILTIN_OBJS += builtin/repack.o
 BUILTIN_OBJS += builtin/replace.o
 BUILTIN_OBJS += builtin/rerere.o
@@ -1125,6 +1161,7 @@ BUILTIN_OBJS += builtin/shortlog.o
 BUILTIN_OBJS += builtin/show-branch.o
 BUILTIN_OBJS += builtin/show-index.o
 BUILTIN_OBJS += builtin/show-ref.o
+BUILTIN_OBJS += builtin/sparse-checkout.o
 BUILTIN_OBJS += builtin/stash.o
 BUILTIN_OBJS += builtin/stripspace.o
 BUILTIN_OBJS += builtin/submodule--helper.o
@@ -1182,7 +1219,7 @@ PTHREAD_CFLAGS =
 
 # For the 'sparse' target
 SPARSE_FLAGS ?=
-SP_EXTRA_FLAGS =
+SP_EXTRA_FLAGS = -Wno-universal-initializer
 
 # For the 'coccicheck' target; setting SPATCH_BATCH_SIZE higher will
 # usually result in less CPU usage at the cost of higher peak memory.
@@ -1198,6 +1235,20 @@ ifdef DEVELOPER
 include config.mak.dev
 endif
 
+# what 'all' will build and 'install' will install in gitexecdir,
+# excluding programs for built-in commands
+ALL_PROGRAMS = $(PROGRAMS) $(SCRIPTS)
+ALL_COMMANDS_TO_INSTALL = $(ALL_PROGRAMS)
+ifeq (,$(SKIP_DASHED_BUILT_INS))
+ALL_COMMANDS_TO_INSTALL += $(BUILT_INS)
+else
+# git-upload-pack, git-receive-pack and git-upload-archive are special: they
+# are _expected_ to be present in the `bin/` directory in their dashed form.
+ALL_COMMANDS_TO_INSTALL += git-receive-pack$(X)
+ALL_COMMANDS_TO_INSTALL += git-upload-archive$(X)
+ALL_COMMANDS_TO_INSTALL += git-upload-pack$(X)
+endif
+
 ALL_CFLAGS = $(DEVELOPER_CFLAGS) $(CPPFLAGS) $(CFLAGS)
 ALL_LDFLAGS = $(LDFLAGS)
 
@@ -1210,12 +1261,14 @@ SANITIZERS := $(foreach flag,$(subst $(comma),$(space),$(SANITIZE)),$(flag))
 BASIC_CFLAGS += -fsanitize=$(SANITIZE) -fno-sanitize-recover=$(SANITIZE)
 BASIC_CFLAGS += -fno-omit-frame-pointer
 ifneq ($(filter undefined,$(SANITIZERS)),)
-BASIC_CFLAGS += -DNO_UNALIGNED_LOADS
 BASIC_CFLAGS += -DSHA1DC_FORCE_ALIGNED_ACCESS
 endif
 ifneq ($(filter leak,$(SANITIZERS)),)
 BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
 endif
+ifneq ($(filter address,$(SANITIZERS)),)
+NO_REGEX = NeededForASAN
+endif
 endif
 
 ifndef sysconfdir
@@ -1251,6 +1304,27 @@ $(error please set COMPUTE_HEADER_DEPENDENCIES to yes, no, or auto \
 endif
 endif
 
+ifndef GENERATE_COMPILATION_DATABASE
+GENERATE_COMPILATION_DATABASE = no
+endif
+
+ifeq ($(GENERATE_COMPILATION_DATABASE),yes)
+compdb_check = $(shell $(CC) $(ALL_CFLAGS) \
+	-c -MJ /dev/null \
+	-x c /dev/null -o /dev/null 2>&1; \
+	echo $$?)
+ifneq ($(compdb_check),0)
+override GENERATE_COMPILATION_DATABASE = no
+$(warning GENERATE_COMPILATION_DATABASE is set to "yes", but your compiler does not \
+support generating compilation database entries)
+endif
+else
+ifneq ($(GENERATE_COMPILATION_DATABASE),no)
+$(error please set GENERATE_COMPILATION_DATABASE to "yes" or "no" \
+(not "$(GENERATE_COMPILATION_DATABASE)"))
+endif
+endif
+
 ifdef SANE_TOOL_PATH
 SANE_TOOL_PATH_SQ = $(subst ','\'',$(SANE_TOOL_PATH))
 BROKEN_PATH_FIX = 's|^\# @@BROKEN_PATH_FIX@@$$|git_broken_path_fix "$(SANE_TOOL_PATH_SQ)"|'
@@ -1308,26 +1382,17 @@ ifdef NO_LIBGEN_H
 	COMPAT_OBJS += compat/basename.o
 endif
 
+ifdef USE_LIBPCRE1
+$(error The USE_LIBPCRE1 build option has been removed, use version 2 with USE_LIBPCRE)
+endif
+
 USE_LIBPCRE2 ?= $(USE_LIBPCRE)
 
 ifneq (,$(USE_LIBPCRE2))
-	ifdef USE_LIBPCRE1
-$(error Only set USE_LIBPCRE2 (or its alias USE_LIBPCRE) or USE_LIBPCRE1, not both!)
-	endif
-
 	BASIC_CFLAGS += -DUSE_LIBPCRE2
 	EXTLIBS += -lpcre2-8
 endif
 
-ifdef USE_LIBPCRE1
-	BASIC_CFLAGS += -DUSE_LIBPCRE1
-	EXTLIBS += -lpcre
-
-ifdef NO_LIBPCRE1_JIT
-	BASIC_CFLAGS += -DNO_LIBPCRE1_JIT
-endif
-endif
-
 ifdef LIBPCREDIR
 	BASIC_CFLAGS += -I$(LIBPCREDIR)/include
 	EXTLIBS += -L$(LIBPCREDIR)/$(lib) $(CC_LD_DYNPATH)$(LIBPCREDIR)/$(lib)
@@ -1349,17 +1414,22 @@ ifdef NO_CURL
 else
 	ifdef CURLDIR
 		# Try "-Wl,-rpath=$(CURLDIR)/$(lib)" in such a case.
-		BASIC_CFLAGS += -I$(CURLDIR)/include
+		CURL_CFLAGS = -I$(CURLDIR)/include
 		CURL_LIBCURL = -L$(CURLDIR)/$(lib) $(CC_LD_DYNPATH)$(CURLDIR)/$(lib)
 	else
+		CURL_CFLAGS =
 		CURL_LIBCURL =
 	endif
 
-ifdef CURL_LDFLAGS
+	ifndef CURL_LDFLAGS
+		CURL_LDFLAGS = $(eval CURL_LDFLAGS := $$(shell $$(CURL_CONFIG) --libs))$(CURL_LDFLAGS)
+	endif
 	CURL_LIBCURL += $(CURL_LDFLAGS)
-else
-	CURL_LIBCURL += $(shell $(CURL_CONFIG) --libs)
-endif
+
+	ifndef CURL_CFLAGS
+		CURL_CFLAGS = $(eval CURL_CFLAGS := $$(shell $$(CURL_CONFIG) --cflags))$(CURL_CFLAGS)
+	endif
+	BASIC_CFLAGS += $(CURL_CFLAGS)
 
 	REMOTE_CURL_PRIMARY = git-remote-http$X
 	REMOTE_CURL_ALIASES = git-remote-https$X git-remote-ftp$X git-remote-ftps$X
@@ -1495,12 +1565,13 @@ ifdef FREAD_READS_DIRECTORIES
 	COMPAT_CFLAGS += -DFREAD_READS_DIRECTORIES
 	COMPAT_OBJS += compat/fopen.o
 endif
+ifdef OPEN_RETURNS_EINTR
+	COMPAT_CFLAGS += -DOPEN_RETURNS_EINTR
+	COMPAT_OBJS += compat/open.o
+endif
 ifdef NO_SYMLINK_HEAD
 	BASIC_CFLAGS += -DNO_SYMLINK_HEAD
 endif
-ifdef GETTEXT_POISON
-$(warning The GETTEXT_POISON option has been removed in favor of runtime GIT_TEST_GETTEXT_POISON. See t/README!)
-endif
 ifdef NO_GETTEXT
 	BASIC_CFLAGS += -DNO_GETTEXT
 	USE_GETTEXT_SCHEME ?= fallthrough
@@ -1622,11 +1693,34 @@ ifdef NO_INET_PTON
 endif
 ifdef NO_UNIX_SOCKETS
 	BASIC_CFLAGS += -DNO_UNIX_SOCKETS
-	EXCLUDED_PROGRAMS += git-credential-cache git-credential-cache--daemon
 else
 	LIB_OBJS += unix-socket.o
-	PROGRAM_OBJS += credential-cache.o
-	PROGRAM_OBJS += credential-cache--daemon.o
+	LIB_OBJS += unix-stream-server.o
+endif
+
+# Simple IPC requires threads and platform-specific IPC support.
+# Only platforms that have both should include these source files
+# in the build.
+#
+# On Windows-based systems, Simple IPC requires threads and Windows
+# Named Pipes.  These are always available, so Simple IPC support
+# is optional.
+#
+# On Unix-based systems, Simple IPC requires pthreads and Unix
+# domain sockets.  So support is only enabled when both are present.
+#
+ifdef USE_WIN32_IPC
+	BASIC_CFLAGS += -DSUPPORTS_SIMPLE_IPC
+	LIB_OBJS += compat/simple-ipc/ipc-shared.o
+	LIB_OBJS += compat/simple-ipc/ipc-win32.o
+else
+ifndef NO_PTHREADS
+ifndef NO_UNIX_SOCKETS
+	BASIC_CFLAGS += -DSUPPORTS_SIMPLE_IPC
+	LIB_OBJS += compat/simple-ipc/ipc-shared.o
+	LIB_OBJS += compat/simple-ipc/ipc-unix-socket.o
+endif
+endif
 endif
 
 ifdef NO_ICONV
@@ -1794,11 +1888,6 @@ ifndef NO_MSGFMT_EXTENDED_OPTIONS
 	MSGFMT += --check --statistics
 endif
 
-ifdef GMTIME_UNRELIABLE_ERRORS
-	COMPAT_OBJS += compat/gmtime.o
-	BASIC_CFLAGS += -DGMTIME_UNRELIABLE_ERRORS
-endif
-
 ifdef HAVE_CLOCK_GETTIME
 	BASIC_CFLAGS += -DHAVE_CLOCK_GETTIME
 endif
@@ -1828,6 +1917,10 @@ ifneq ($(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
@@ -1925,6 +2018,7 @@ ETC_GITCONFIG_SQ = $(subst ','\'',$(ETC_GITCONFIG))
 ETC_GITATTRIBUTES_SQ = $(subst ','\'',$(ETC_GITATTRIBUTES))
 
 DESTDIR_SQ = $(subst ','\'',$(DESTDIR))
+NO_GETTEXT_SQ = $(subst ','\'',$(NO_GETTEXT))
 bindir_SQ = $(subst ','\'',$(bindir))
 bindir_relative_SQ = $(subst ','\'',$(bindir_relative))
 mandir_SQ = $(subst ','\'',$(mandir))
@@ -2059,9 +2153,9 @@ profile-fast: profile-clean
 	$(MAKE) PROFILE=USE all
 
 
-all:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS
+all:: $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS
 ifneq (,$X)
-	$(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';)
+	$(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_COMMANDS_TO_INSTALL) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';)
 endif
 
 all::
@@ -2079,6 +2173,16 @@ shell_compatibility_test: please_set_SHELL_PATH_to_a_more_modern_shell
 strip: $(PROGRAMS) git$X
 	$(STRIP) $(STRIP_OPTS) $^
 
+### Flags affecting all rules
+
+# A GNU make extension since gmake 3.72 (released in late 1994) to
+# remove the target of rules if commands in those rules fail. The
+# default is to only do that if make itself receives a signal. Affects
+# all targets, see:
+#
+#    info make --index-search=.DELETE_ON_ERROR
+.DELETE_ON_ERROR:
+
 ### Target-specific flags and dependencies
 
 # The generic compilation pattern rule and automatically
@@ -2124,7 +2228,7 @@ git$X: git.o GIT-LDFLAGS $(BUILTIN_OBJS) $(GITLIBS)
 
 help.sp help.s help.o: command-list.h
 
-builtin/help.sp builtin/help.s builtin/help.o: command-list.h GIT-PREFIX
+builtin/help.sp builtin/help.s builtin/help.o: config-list.h GIT-PREFIX
 builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \
 	'-DGIT_HTML_PATH="$(htmldir_relative_SQ)"' \
 	'-DGIT_MAN_PATH="$(mandir_relative_SQ)"' \
@@ -2144,9 +2248,15 @@ $(BUILT_INS): git$X
 	ln -s $< $@ 2>/dev/null || \
 	cp $< $@
 
+config-list.h: generate-configlist.sh
+
+config-list.h: Documentation/*config.txt Documentation/config/*.txt
+	$(QUIET_GEN)$(SHELL_PATH) ./generate-configlist.sh \
+		>$@+ && mv $@+ $@
+
 command-list.h: generate-cmdlist.sh command-list.txt
 
-command-list.h: $(wildcard Documentation/git*.txt) Documentation/*config.txt Documentation/config/*.txt
+command-list.h: $(wildcard Documentation/git*.txt)
 	$(QUIET_GEN)$(SHELL_PATH) ./generate-cmdlist.sh \
 		$(patsubst %,--exclude-program %,$(EXCLUDED_PROGRAMS)) \
 		command-list.txt >$@+ && mv $@+ $@
@@ -2156,7 +2266,6 @@ SCRIPT_DEFINES = $(SHELL_PATH_SQ):$(DIFF_SQ):$(GIT_VERSION):\
 	$(gitwebdir_SQ):$(PERL_PATH_SQ):$(SANE_TEXT_GREP):$(PAGER_ENV):\
 	$(perllibdir_SQ)
 define cmd_munge_script
-$(RM) $@ $@+ && \
 sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
     -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \
     -e 's|@@DIFF@@|$(DIFF_SQ)|' \
@@ -2203,10 +2312,13 @@ perl_localedir_SQ = $(localedir_SQ)
 
 ifndef NO_PERL
 PERL_HEADER_TEMPLATE = perl/header_templates/fixed_prefix.template.pl
-PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ):$(perllibdir_SQ)
-
-PERL_DEFINES := $(PERL_PATH_SQ) $(PERLLIB_EXTRA_SQ) $(perllibdir_SQ)
+PERL_DEFINES =
+PERL_DEFINES += $(PERL_PATH_SQ)
+PERL_DEFINES += $(PERLLIB_EXTRA_SQ)
+PERL_DEFINES += $(perllibdir_SQ)
 PERL_DEFINES += $(RUNTIME_PREFIX)
+PERL_DEFINES += $(NO_PERL_CPAN_FALLBACKS)
+PERL_DEFINES += $(NO_GETTEXT)
 
 # Support Perl runtime prefix. In this mode, a different header is installed
 # into Perl scripts.
@@ -2223,7 +2335,7 @@ endif
 PERL_DEFINES += $(gitexecdir) $(perllibdir) $(localedir)
 
 $(SCRIPT_PERL_GEN): % : %.perl GIT-PERL-DEFINES GIT-PERL-HEADER GIT-VERSION-FILE
-	$(QUIET_GEN)$(RM) $@ $@+ && \
+	$(QUIET_GEN) \
 	sed -e '1{' \
 	    -e '	s|#!.*perl|#!$(PERL_PATH_SQ)|' \
 	    -e '	r GIT-PERL-HEADER' \
@@ -2243,7 +2355,7 @@ GIT-PERL-DEFINES: FORCE
 	    fi
 
 GIT-PERL-HEADER: $(PERL_HEADER_TEMPLATE) GIT-PERL-DEFINES Makefile
-	$(QUIET_GEN)$(RM) $@ && \
+	$(QUIET_GEN) \
 	INSTLIBDIR='$(perllibdir_SQ)' && \
 	INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
 	INSTLIBDIR="$$INSTLIBDIR$${INSTLIBDIR_EXTRA:+:$$INSTLIBDIR_EXTRA}" && \
@@ -2269,7 +2381,7 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
 	mv $@+ $@
 else # NO_PERL
 $(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
-	$(QUIET_GEN)$(RM) $@ $@+ && \
+	$(QUIET_GEN) \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 	    -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
 	    unimplemented.sh >$@+ && \
@@ -2283,14 +2395,14 @@ $(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
 ifndef NO_PYTHON
 $(SCRIPT_PYTHON_GEN): GIT-CFLAGS GIT-PREFIX GIT-PYTHON-VARS
 $(SCRIPT_PYTHON_GEN): % : %.py
-	$(QUIET_GEN)$(RM) $@ $@+ && \
+	$(QUIET_GEN) \
 	sed -e '1s|#!.*python|#!$(PYTHON_PATH_SQ)|' \
 	    $< >$@+ && \
 	chmod +x $@+ && \
 	mv $@+ $@
 else # NO_PYTHON
 $(SCRIPT_PYTHON_GEN): % : unimplemented.sh
-	$(QUIET_GEN)$(RM) $@ $@+ && \
+	$(QUIET_GEN) \
 	sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
 	    -e 's|@@REASON@@|NO_PYTHON=$(NO_PYTHON)|g' \
 	    unimplemented.sh >$@+ && \
@@ -2298,8 +2410,7 @@ $(SCRIPT_PYTHON_GEN): % : unimplemented.sh
 	mv $@+ $@
 endif # NO_PYTHON
 
-CONFIGURE_RECIPE = $(RM) configure configure.ac+ && \
-		   sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+CONFIGURE_RECIPE = sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
 			configure.ac >configure.ac+ && \
 		   autoconf -o configure configure.ac+ && \
 		   $(RM) configure.ac+
@@ -2326,29 +2437,36 @@ reconfigure config.mak.autogen: config.status
 endif
 
 XDIFF_OBJS += xdiff/xdiffi.o
-XDIFF_OBJS += xdiff/xprepare.o
-XDIFF_OBJS += xdiff/xutils.o
 XDIFF_OBJS += xdiff/xemit.o
+XDIFF_OBJS += xdiff/xhistogram.o
 XDIFF_OBJS += xdiff/xmerge.o
 XDIFF_OBJS += xdiff/xpatience.o
-XDIFF_OBJS += xdiff/xhistogram.o
-
-VCSSVN_OBJS += vcs-svn/line_buffer.o
-VCSSVN_OBJS += vcs-svn/sliding_window.o
-VCSSVN_OBJS += vcs-svn/fast_export.o
-VCSSVN_OBJS += vcs-svn/svndiff.o
-VCSSVN_OBJS += vcs-svn/svndump.o
+XDIFF_OBJS += xdiff/xprepare.o
+XDIFF_OBJS += xdiff/xutils.o
+.PHONY: xdiff-objs
+xdiff-objs: $(XDIFF_OBJS)
 
 TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS)) $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
-OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
-	$(XDIFF_OBJS) \
-	$(VCSSVN_OBJS) \
-	$(FUZZ_OBJS) \
-	common-main.o \
-	git.o
+.PHONY: test-objs
+test-objs: $(TEST_OBJS)
+
+GIT_OBJS += $(LIB_OBJS)
+GIT_OBJS += $(BUILTIN_OBJS)
+GIT_OBJS += common-main.o
+GIT_OBJS += git.o
+.PHONY: git-objs
+git-objs: $(GIT_OBJS)
+
+OBJECTS += $(GIT_OBJS)
+OBJECTS += $(PROGRAM_OBJS)
+OBJECTS += $(TEST_OBJS)
+OBJECTS += $(XDIFF_OBJS)
+OBJECTS += $(FUZZ_OBJS)
 ifndef NO_CURL
 	OBJECTS += http.o http-walker.o remote-curl.o
 endif
+.PHONY: objects
+objects: $(OBJECTS)
 
 dep_files := $(foreach f,$(OBJECTS),$(dir $f).depend/$(notdir $f).d)
 dep_dirs := $(addsuffix .depend,$(sort $(dir $(OBJECTS))))
@@ -2368,16 +2486,30 @@ missing_dep_dirs =
 dep_args =
 endif
 
+compdb_dir = compile_commands
+
+ifeq ($(GENERATE_COMPILATION_DATABASE),yes)
+missing_compdb_dir = $(compdb_dir)
+$(missing_compdb_dir):
+	@mkdir -p $@
+
+compdb_file = $(compdb_dir)/$(subst /,-,$@.json)
+compdb_args = -MJ $(compdb_file)
+else
+missing_compdb_dir =
+compdb_args =
+endif
+
 ASM_SRC := $(wildcard $(OBJECTS:o=S))
 ASM_OBJ := $(ASM_SRC:S=o)
 C_OBJ := $(filter-out $(ASM_OBJ),$(OBJECTS))
 
 .SUFFIXES:
 
-$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs)
-	$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
-$(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs)
-	$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+$(C_OBJ): %.o: %.c GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir)
+	$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
+$(ASM_OBJ): %.o: %.S GIT-CFLAGS $(missing_dep_dirs) $(missing_compdb_dir)
+	$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
 
 %.s: %.c GIT-CFLAGS FORCE
 	$(QUIET_CC)$(CC) -o $@ -S $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $<
@@ -2400,6 +2532,13 @@ else
 $(OBJECTS): $(LIB_H) $(GENERATED_H)
 endif
 
+ifeq ($(GENERATE_COMPILATION_DATABASE),yes)
+all:: compile_commands.json
+compile_commands.json:
+	$(QUIET_GEN)sed -e '1s/^/[/' -e '$$s/,$$/]/' $(compdb_dir)/*.o.json > $@+
+	@if test -s $@+; then mv $@+ $@; else $(RM) $@+; fi
+endif
+
 exec-cmd.sp exec-cmd.s exec-cmd.o: GIT-PREFIX
 exec-cmd.sp exec-cmd.s exec-cmd.o: EXTRA_CPPFLAGS = \
 	'-DGIT_EXEC_PATH="$(gitexecdir_SQ)"' \
@@ -2457,10 +2596,6 @@ git-http-push$X: http.o http-push.o GIT-LDFLAGS $(GITLIBS)
 	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) \
 		$(CURL_LIBCURL) $(EXPAT_LIBEXPAT) $(LIBS)
 
-git-remote-testsvn$X: remote-testsvn.o GIT-LDFLAGS $(GITLIBS) $(VCSSVN_LIB)
-	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) \
-	$(VCSSVN_LIB)
-
 $(REMOTE_CURL_ALIASES): $(REMOTE_CURL_PRIMARY)
 	$(QUIET_LNCP)$(RM) $@ && \
 	ln $< $@ 2>/dev/null || \
@@ -2477,9 +2612,6 @@ $(LIB_FILE): $(LIB_OBJS)
 $(XDIFF_LIB): $(XDIFF_OBJS)
 	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
 
-$(VCSSVN_LIB): $(VCSSVN_OBJS)
-	$(QUIET_AR)$(RM) $@ && $(AR) $(ARFLAGS) $@ $^
-
 export DEFAULT_EDITOR DEFAULT_PAGER
 
 Documentation/GIT-EXCLUDED-PROGRAMS: FORCE
@@ -2521,7 +2653,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-parse-remote.sh
 LOCALIZED_SH += git-rebase--preserve-merges.sh
 LOCALIZED_SH += git-sh-setup.sh
 LOCALIZED_PERL = $(SCRIPT_PERL)
@@ -2564,10 +2695,13 @@ po/git.pot: $(GENERATED_H) FORCE
 .PHONY: pot
 pot: po/git.pot
 
+ifdef NO_GETTEXT
+POFILES :=
+MOFILES :=
+else
 POFILES := $(wildcard po/*.po)
 MOFILES := $(patsubst po/%.po,po/build/locale/%/LC_MESSAGES/git.mo,$(POFILES))
 
-ifndef NO_GETTEXT
 all:: $(MOFILES)
 endif
 
@@ -2587,9 +2721,10 @@ endif
 NO_PERL_CPAN_FALLBACKS_SQ = $(subst ','\'',$(NO_PERL_CPAN_FALLBACKS))
 endif
 
-perl/build/lib/%.pm: perl/%.pm
+perl/build/lib/%.pm: perl/%.pm GIT-PERL-DEFINES
 	$(QUIET_GEN)mkdir -p $(dir $@) && \
 	sed -e 's|@@LOCALEDIR@@|$(perl_localedir_SQ)|g' \
+	    -e 's|@@NO_GETTEXT@@|$(NO_GETTEXT_SQ)|g' \
 	    -e 's|@@NO_PERL_CPAN_FALLBACKS@@|$(NO_PERL_CPAN_FALLBACKS_SQ)|g' \
 	< $< > $@
 
@@ -2616,12 +2751,14 @@ FIND_SOURCE_FILES = ( \
 	)
 
 $(ETAGS_TARGET): FORCE
-	$(RM) $(ETAGS_TARGET)
-	$(FIND_SOURCE_FILES) | xargs etags -a -o $(ETAGS_TARGET)
+	$(QUIET_GEN)$(RM) "$(ETAGS_TARGET)+" && \
+	$(FIND_SOURCE_FILES) | xargs etags -a -o "$(ETAGS_TARGET)+" && \
+	mv "$(ETAGS_TARGET)+" "$(ETAGS_TARGET)"
 
 tags: FORCE
-	$(RM) tags
-	$(FIND_SOURCE_FILES) | xargs ctags -a
+	$(QUIET_GEN)$(RM) tags+ && \
+	$(FIND_SOURCE_FILES) | xargs ctags -a -o tags+ && \
+	mv tags+ tags
 
 cscope:
 	$(RM) cscope*
@@ -2668,9 +2805,7 @@ GIT-BUILD-OPTIONS: FORCE
 	@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@+
 	@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@+
 	@echo NO_EXPAT=\''$(subst ','\'',$(subst ','\'',$(NO_EXPAT)))'\' >>$@+
-	@echo USE_LIBPCRE1=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE1)))'\' >>$@+
 	@echo USE_LIBPCRE2=\''$(subst ','\'',$(subst ','\'',$(USE_LIBPCRE2)))'\' >>$@+
-	@echo NO_LIBPCRE1_JIT=\''$(subst ','\'',$(subst ','\'',$(NO_LIBPCRE1_JIT)))'\' >>$@+
 	@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@+
 	@echo NO_PTHREADS=\''$(subst ','\'',$(subst ','\'',$(NO_PTHREADS)))'\' >>$@+
 	@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@+
@@ -2690,6 +2825,9 @@ endif
 ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
 	@echo GIT_TEST_CMP_USE_COPIED_CONTEXT=YesPlease >>$@+
 endif
+ifdef GIT_TEST_UTF8_LOCALE
+	@echo GIT_TEST_UTF8_LOCALE=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_UTF8_LOCALE)))'\' >>$@+
+endif
 	@echo NO_GETTEXT=\''$(subst ','\'',$(subst ','\'',$(NO_GETTEXT)))'\' >>$@+
 ifdef GIT_PERF_REPEAT_COUNT
 	@echo GIT_PERF_REPEAT_COUNT=\''$(subst ','\'',$(subst ','\'',$(GIT_PERF_REPEAT_COUNT)))'\' >>$@+
@@ -2712,6 +2850,14 @@ endif
 ifdef GIT_TEST_INDEX_VERSION
 	@echo GIT_TEST_INDEX_VERSION=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_INDEX_VERSION)))'\' >>$@+
 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
@@ -2754,10 +2900,6 @@ perf: all
 
 .PHONY: test perf
 
-t/helper/test-line-buffer$X: $(VCSSVN_LIB)
-
-t/helper/test-svn-fe$X: $(VCSSVN_LIB)
-
 .PRECIOUS: $(TEST_OBJS)
 
 t/helper/test-tool$X: $(patsubst %,t/helper/%,$(TEST_BUILTINS_OBJS))
@@ -2777,8 +2919,7 @@ $(SP_OBJ): %.sp: %.c GIT-CFLAGS FORCE
 .PHONY: sparse $(SP_OBJ)
 sparse: $(SP_OBJ)
 
-GEN_HDRS := command-list.h unicode-width.h
-EXCEPT_HDRS := $(GEN_HDRS) compat/% xdiff/%
+EXCEPT_HDRS := command-list.h config-list.h unicode-width.h compat/% xdiff/%
 ifndef GCRYPT_SHA256
 	EXCEPT_HDRS += sha256/gcrypt.h
 endif
@@ -2800,7 +2941,7 @@ hdr-check: $(HCO)
 style:
 	git clang-format --style file --diff --extensions c,h
 
-check: command-list.h
+check: config-list.h command-list.h
 	@if sparse; \
 	then \
 		echo >&2 "Use 'make sparse' instead"; \
@@ -2883,20 +3024,8 @@ ifdef MSVC
 	# have already been rolled up into the exe's pdb file.
 	# We DO NOT have pdb files for the builtin commands (like git-status.exe)
 	# because it is just a copy/hardlink of git.exe, rather than a unique binary.
-	$(INSTALL) git.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
-	$(INSTALL) git-shell.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
-	$(INSTALL) git-upload-pack.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
-	$(INSTALL) git-credential-store.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git-daemon.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git-fast-import.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git-http-backend.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git-http-fetch.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git-http-push.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git-imap-send.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git-remote-http.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git-remote-testsvn.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git-sh-i18n--envsubst.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-	$(INSTALL) git-show-index.pdb '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+	$(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS),$(patsubst %,%$X,$(BINDIR_PROGRAMS_NEED_X)))) '$(DESTDIR_SQ)$(bindir_SQ)'
+	$(INSTALL) $(patsubst %.exe,%.pdb,$(filter-out $(BUILT_INS) $(REMOTE_CURL_ALIASES),$(PROGRAMS))) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
 ifndef DEBUG
 	$(INSTALL) $(vcpkg_rel_bin)/*.dll '$(DESTDIR_SQ)$(bindir_SQ)'
 	$(INSTALL) $(vcpkg_rel_bin)/*.pdb '$(DESTDIR_SQ)$(bindir_SQ)'
@@ -2924,7 +3053,7 @@ ifndef NO_TCLTK
 	$(MAKE) -C git-gui gitexecdir='$(gitexec_instdir_SQ)' install
 endif
 ifneq (,$X)
-	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' -ef '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p$X' || $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)
+	$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_COMMANDS_TO_INSTALL) git$X)), test '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p' -ef '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p$X' || $(RM) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)/$p';)
 endif
 
 	bindir=$$(cd '$(DESTDIR_SQ)$(bindir_SQ)' && pwd) && \
@@ -2947,16 +3076,19 @@ endif
 		{ test -z "$(NO_INSTALL_HARDLINKS)" && \
 		  ln "$$bindir/git$X" "$$bindir/$$p" 2>/dev/null || \
 		  ln -s "git$X" "$$bindir/$$p" 2>/dev/null || \
-		  cp "$$bindir/git$X" "$$bindir/$$p" || exit; } \
+		  cp "$$bindir/git$X" "$$bindir/$$p" || exit; }; \
 	done && \
 	for p in $(BUILT_INS); do \
 		$(RM) "$$execdir/$$p" && \
-		test -n "$(INSTALL_SYMLINKS)" && \
-		ln -s "$$destdir_from_execdir_SQ/$(bindir_relative_SQ)/git$X" "$$execdir/$$p" || \
-		{ test -z "$(NO_INSTALL_HARDLINKS)" && \
-		  ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
-		  ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
-		  cp "$$execdir/git$X" "$$execdir/$$p" || exit; } \
+		if test -z "$(SKIP_DASHED_BUILT_INS)"; \
+		then \
+			test -n "$(INSTALL_SYMLINKS)" && \
+			ln -s "$$destdir_from_execdir_SQ/$(bindir_relative_SQ)/git$X" "$$execdir/$$p" || \
+			{ test -z "$(NO_INSTALL_HARDLINKS)" && \
+			  ln "$$execdir/git$X" "$$execdir/$$p" 2>/dev/null || \
+			  ln -s "git$X" "$$execdir/$$p" 2>/dev/null || \
+			  cp "$$execdir/git$X" "$$execdir/$$p" || exit; }; \
+		fi \
 	done && \
 	remote_curl_aliases="$(REMOTE_CURL_ALIASES)" && \
 	for p in $$remote_curl_aliases; do \
@@ -3009,33 +3141,31 @@ quick-install-html:
 ### Maintainer's dist rules
 
 GIT_TARNAME = git-$(GIT_VERSION)
+GIT_ARCHIVE_EXTRA_FILES = \
+	--prefix=$(GIT_TARNAME)/ \
+	--add-file=configure \
+	--add-file=.dist-tmp-dir/version \
+	--prefix=$(GIT_TARNAME)/git-gui/ \
+	--add-file=.dist-tmp-dir/git-gui/version
+ifdef DC_SHA1_SUBMODULE
+GIT_ARCHIVE_EXTRA_FILES += \
+	--prefix=$(GIT_TARNAME)/sha1collisiondetection/ \
+	--add-file=sha1collisiondetection/LICENSE.txt \
+	--prefix=$(GIT_TARNAME)/sha1collisiondetection/lib/ \
+	--add-file=sha1collisiondetection/lib/sha1.c \
+	--add-file=sha1collisiondetection/lib/sha1.h \
+	--add-file=sha1collisiondetection/lib/ubc_check.c \
+	--add-file=sha1collisiondetection/lib/ubc_check.h
+endif
 dist: git-archive$(X) configure
+	@$(RM) -r .dist-tmp-dir
+	@mkdir .dist-tmp-dir
+	@echo $(GIT_VERSION) > .dist-tmp-dir/version
+	@$(MAKE) -C git-gui TARDIR=../.dist-tmp-dir/git-gui dist-version
 	./git-archive --format=tar \
+		$(GIT_ARCHIVE_EXTRA_FILES) \
 		--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
-	@mkdir -p $(GIT_TARNAME)
-	@cp configure $(GIT_TARNAME)
-	@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
-	@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
-	$(TAR) rf $(GIT_TARNAME).tar \
-		$(GIT_TARNAME)/configure \
-		$(GIT_TARNAME)/version \
-		$(GIT_TARNAME)/git-gui/version
-ifdef DC_SHA1_SUBMODULE
-	@mkdir -p $(GIT_TARNAME)/sha1collisiondetection/lib
-	@cp sha1collisiondetection/LICENSE.txt \
-		$(GIT_TARNAME)/sha1collisiondetection/
-	@cp sha1collisiondetection/LICENSE.txt \
-		$(GIT_TARNAME)/sha1collisiondetection/
-	@cp sha1collisiondetection/lib/sha1.[ch] \
-		$(GIT_TARNAME)/sha1collisiondetection/lib/
-	@cp sha1collisiondetection/lib/ubc_check.[ch] \
-		$(GIT_TARNAME)/sha1collisiondetection/lib/
-	$(TAR) rf $(GIT_TARNAME).tar \
-		$(GIT_TARNAME)/sha1collisiondetection/LICENSE.txt \
-		$(GIT_TARNAME)/sha1collisiondetection/lib/sha1.[ch] \
-		$(GIT_TARNAME)/sha1collisiondetection/lib/ubc_check.[ch]
-endif
-	@$(RM) -r $(GIT_TARNAME)
+	@$(RM) -r .dist-tmp-dir
 	gzip -f -9 $(GIT_TARNAME).tar
 
 rpm::
@@ -3047,7 +3177,7 @@ ifneq ($(INCLUDE_DLLS_IN_ARTIFACTS),)
 OTHER_PROGRAMS += $(shell echo *.dll t/helper/*.dll)
 endif
 
-artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \
+artifacts-tar:: $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB) $(OTHER_PROGRAMS) \
 		GIT-BUILD-OPTIONS $(TEST_PROGRAMS) $(test_bindir_programs) \
 		$(MOFILES)
 	$(QUIET_SUBDIR0)templates $(QUIET_SUBDIR1) \
@@ -3060,11 +3190,15 @@ artifacts-tar:: $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) $(OTHER_PROGRAMS) \
 htmldocs = git-htmldocs-$(GIT_VERSION)
 manpages = git-manpages-$(GIT_VERSION)
 .PHONY: dist-doc distclean
-dist-doc:
+dist-doc: git$X
 	$(RM) -r .doc-tmp-dir
 	mkdir .doc-tmp-dir
 	$(MAKE) -C Documentation WEBDOC_DEST=../.doc-tmp-dir install-webdoc
-	cd .doc-tmp-dir && $(TAR) cf ../$(htmldocs).tar .
+	./git -C .doc-tmp-dir init
+	./git -C .doc-tmp-dir add .
+	./git -C .doc-tmp-dir commit -m htmldocs
+	./git -C .doc-tmp-dir archive --format=tar --prefix=./ HEAD^{tree} \
+		> $(htmldocs).tar
 	gzip -n -9 -f $(htmldocs).tar
 	:
 	$(RM) -r .doc-tmp-dir
@@ -3074,7 +3208,11 @@ dist-doc:
 		man5dir=../.doc-tmp-dir/man5 \
 		man7dir=../.doc-tmp-dir/man7 \
 		install
-	cd .doc-tmp-dir && $(TAR) cf ../$(manpages).tar .
+	./git -C .doc-tmp-dir init
+	./git -C .doc-tmp-dir add .
+	./git -C .doc-tmp-dir commit -m manpages
+	./git -C .doc-tmp-dir archive --format=tar --prefix=./ HEAD^{tree} \
+		> $(manpages).tar
 	gzip -n -9 -f $(manpages).tar
 	$(RM) -r .doc-tmp-dir
 
@@ -3096,16 +3234,16 @@ cocciclean:
 clean: profile-clean coverage-clean cocciclean
 	$(RM) *.res
 	$(RM) $(OBJECTS)
-	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
+	$(RM) $(LIB_FILE) $(XDIFF_LIB)
 	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
 	$(RM) $(TEST_PROGRAMS)
 	$(RM) $(FUZZ_PROGRAMS)
 	$(RM) $(HCC)
-	$(RM) -r bin-wrappers $(dep_dirs)
+	$(RM) -r bin-wrappers $(dep_dirs) $(compdb_dir) compile_commands.json
 	$(RM) -r po/build/
-	$(RM) *.pyc *.pyo */*.pyc */*.pyo command-list.h $(ETAGS_TARGET) tags cscope*
-	$(RM) -r $(GIT_TARNAME) .doc-tmp-dir
-	$(RM) $(GIT_TARNAME).tar.gz git-core_$(GIT_VERSION)-*.tar.gz
+	$(RM) *.pyc *.pyo */*.pyc */*.pyo $(GENERATED_H) $(ETAGS_TARGET) tags cscope*
+	$(RM) -r .dist-tmp-dir .doc-tmp-dir
+	$(RM) $(GIT_TARNAME).tar.gz
 	$(RM) $(htmldocs).tar.gz $(manpages).tar.gz
 	$(MAKE) -C Documentation/ clean
 	$(RM) Documentation/GIT-EXCLUDED-PROGRAMS
@@ -3142,11 +3280,12 @@ endif
 
 ### Check documentation
 #
-ALL_COMMANDS = $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS)
+ALL_COMMANDS = $(ALL_COMMANDS_TO_INSTALL) $(SCRIPT_LIB)
 ALL_COMMANDS += git
+ALL_COMMANDS += git-citool
+ALL_COMMANDS += git-gui
 ALL_COMMANDS += gitk
 ALL_COMMANDS += gitweb
-ALL_COMMANDS += git-gui git-citool
 
 .PHONY: check-docs
 check-docs::
@@ -3181,7 +3320,7 @@ check-docs::
 		    -e 's/\.txt//'; \
 	) | while read how cmd; \
 	do \
-		case " $(patsubst %$X,%,$(ALL_COMMANDS) $(EXCLUDED_PROGRAMS)) " in \
+		case " $(patsubst %$X,%,$(ALL_COMMANDS) $(BUILT_INS) $(EXCLUDED_PROGRAMS)) " in \
 		*" $$cmd "*)	;; \
 		*) echo "removed but $$how: $$cmd" ;; \
 		esac; \
@@ -3252,11 +3391,11 @@ cover_db_html: cover_db
 # are not necessarily appropriate for general builds, and that vary greatly
 # depending on the compiler version used.
 #
-# An example command to build against libFuzzer from LLVM 4.0.0:
+# An example command to build against libFuzzer from LLVM 11.0.0:
 #
 # make CC=clang CXX=clang++ \
-#      CFLAGS="-fsanitize-coverage=trace-pc-guard -fsanitize=address" \
-#      LIB_FUZZING_ENGINE=/usr/lib/llvm-4.0/lib/libFuzzer.a \
+#      CFLAGS="-fsanitize=fuzzer-no-link,address" \
+#      LIB_FUZZING_ENGINE="-fsanitize=fuzzer" \
 #      fuzz-all
 #
 FUZZ_CXXFLAGS ?= $(CFLAGS)
diff --git a/README.md b/README.md
index e1d2b82209..eb8115e6b0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-[![Build Status](https://dev.azure.com/git/git/_apis/build/status/git.git)](https://dev.azure.com/git/git/_build/latest?definitionId=11)
+[![Build status](https://github.com/git/git/workflows/CI/PR/badge.svg)](https://github.com/git/git/actions?query=branch%3Amaster+event%3Apush)
 
 Git - fast, scalable, distributed revision control system
 =========================================================
@@ -35,7 +35,7 @@ requests, comments and patches to git@vger.kernel.org (read
 [Documentation/SubmittingPatches][] for instructions on patch submission).
 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://public-inbox.org/git/>,
+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
diff --git a/RelNotes b/RelNotes
index fc657e7d2f..6c94469548 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.24.0.txt
\ No newline at end of file
+Documentation/RelNotes/2.34.0.txt
\ No newline at end of file
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000000..c720c2ae7f
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,51 @@
+# Security Policy
+
+## Reporting a vulnerability
+
+Please send a detailed mail to git-security@googlegroups.com to
+report vulnerabilities in Git.
+
+Even when unsure whether the bug in question is an exploitable
+vulnerability, it is recommended to send the report to
+git-security@googlegroups.com (and obviously not to discuss the
+issue anywhere else).
+
+Vulnerabilities are expected to be discussed _only_ on that
+list, and not in public, until the official announcement on the
+Git mailing list on the release date.
+
+Examples for details to include:
+
+- Ideally a short description (or a script) to demonstrate an
+  exploit.
+- The affected platforms and scenarios (the vulnerability might
+  only affect setups with case-sensitive file systems, for
+  example).
+- The name and affiliation of the security researchers who are
+  involved in the discovery, if any.
+- Whether the vulnerability has already been disclosed.
+- How long an embargo would be required to be safe.
+
+## Supported Versions
+
+There are no official "Long Term Support" versions in Git.
+Instead, the maintenance track (i.e. the versions based on the
+most recently published feature release, also known as ".0"
+version) sees occasional updates with bug fixes.
+
+Fixes to vulnerabilities are made for the maintenance track for
+the latest feature release and merged up to the in-development
+branches. The Git project makes no formal guarantee for any
+older maintenance tracks to receive updates. In practice,
+though, critical vulnerability fixes are applied not only to the
+most recent track, but to at least a couple more maintenance
+tracks.
+
+This is typically done by making the fix on the oldest and still
+relevant maintenance track, and merging it upwards to newer and
+newer maintenance tracks.
+
+For example, v2.24.1 was released to address a couple of
+[CVEs](https://cve.mitre.org/), and at the same time v2.14.6,
+v2.15.4, v2.16.6, v2.17.3, v2.18.2, v2.19.3, v2.20.2, v2.21.1,
+v2.22.2 and v2.23.1 were released.
diff --git a/abspath.c b/abspath.c
index 9857985329..39e06b5848 100644
--- a/abspath.c
+++ b/abspath.c
@@ -67,19 +67,15 @@ static void get_root_part(struct strbuf *resolved, struct strbuf *remaining)
 #endif
 
 /*
- * Return the real path (i.e., absolute path, with symlinks resolved
- * and extra slashes removed) equivalent to the specified path.  (If
- * you want an absolute path but don't mind links, use
- * absolute_path().)  Places the resolved realpath in the provided strbuf.
- *
- * The directory part of path (i.e., everything up to the last
- * dir_sep) must denote a valid, existing directory, but the last
- * component need not exist.  If die_on_error is set, then die with an
- * informative error message if there is a problem.  Otherwise, return
- * NULL on errors (without generating any output).
+ * If set, any number of trailing components may be missing; otherwise, only one
+ * may be.
  */
-char *strbuf_realpath(struct strbuf *resolved, const char *path,
-		      int die_on_error)
+#define REALPATH_MANY_MISSING (1 << 0)
+/* Should we die if there's an error? */
+#define REALPATH_DIE_ON_ERROR (1 << 1)
+
+static char *strbuf_realpath_1(struct strbuf *resolved, const char *path,
+			       int flags)
 {
 	struct strbuf remaining = STRBUF_INIT;
 	struct strbuf next = STRBUF_INIT;
@@ -89,7 +85,7 @@ char *strbuf_realpath(struct strbuf *resolved, const char *path,
 	struct stat st;
 
 	if (!*path) {
-		if (die_on_error)
+		if (flags & REALPATH_DIE_ON_ERROR)
 			die("The empty string is not a valid path");
 		else
 			goto error_out;
@@ -101,7 +97,7 @@ char *strbuf_realpath(struct strbuf *resolved, const char *path,
 	if (!resolved->len) {
 		/* relative path; can use CWD as the initial resolved path */
 		if (strbuf_getcwd(resolved)) {
-			if (die_on_error)
+			if (flags & REALPATH_DIE_ON_ERROR)
 				die_errno("unable to get current working directory");
 			else
 				goto error_out;
@@ -129,8 +125,9 @@ char *strbuf_realpath(struct strbuf *resolved, const char *path,
 
 		if (lstat(resolved->buf, &st)) {
 			/* error out unless this was the last component */
-			if (errno != ENOENT || remaining.len) {
-				if (die_on_error)
+			if (errno != ENOENT ||
+			   (!(flags & REALPATH_MANY_MISSING) && remaining.len)) {
+				if (flags & REALPATH_DIE_ON_ERROR)
 					die_errno("Invalid path '%s'",
 						  resolved->buf);
 				else
@@ -143,7 +140,7 @@ char *strbuf_realpath(struct strbuf *resolved, const char *path,
 			if (num_symlinks++ > MAXSYMLINKS) {
 				errno = ELOOP;
 
-				if (die_on_error)
+				if (flags & REALPATH_DIE_ON_ERROR)
 					die("More than %d nested symlinks "
 					    "on path '%s'", MAXSYMLINKS, path);
 				else
@@ -153,7 +150,7 @@ char *strbuf_realpath(struct strbuf *resolved, const char *path,
 			len = strbuf_readlink(&symlink, resolved->buf,
 					      st.st_size);
 			if (len < 0) {
-				if (die_on_error)
+				if (flags & REALPATH_DIE_ON_ERROR)
 					die_errno("Invalid symlink '%s'",
 						  resolved->buf);
 				else
@@ -203,19 +200,34 @@ error_out:
 }
 
 /*
- * Resolve `path` into an absolute, cleaned-up path. The return value
- * comes from a shared buffer.
+ * Return the real path (i.e., absolute path, with symlinks resolved
+ * and extra slashes removed) equivalent to the specified path.  (If
+ * you want an absolute path but don't mind links, use
+ * absolute_path().)  Places the resolved realpath in the provided strbuf.
+ *
+ * The directory part of path (i.e., everything up to the last
+ * dir_sep) must denote a valid, existing directory, but the last
+ * component need not exist.  If die_on_error is set, then die with an
+ * informative error message if there is a problem.  Otherwise, return
+ * NULL on errors (without generating any output).
  */
-const char *real_path(const char *path)
+char *strbuf_realpath(struct strbuf *resolved, const char *path,
+		      int die_on_error)
 {
-	static struct strbuf realpath = STRBUF_INIT;
-	return strbuf_realpath(&realpath, path, 1);
+	return strbuf_realpath_1(resolved, path,
+				 die_on_error ? REALPATH_DIE_ON_ERROR : 0);
 }
 
-const char *real_path_if_valid(const char *path)
+/*
+ * Just like strbuf_realpath, but allows an arbitrary number of path
+ * components to be missing.
+ */
+char *strbuf_realpath_forgiving(struct strbuf *resolved, const char *path,
+				int die_on_error)
 {
-	static struct strbuf realpath = STRBUF_INIT;
-	return strbuf_realpath(&realpath, path, 0);
+	return strbuf_realpath_1(resolved, path,
+				 ((die_on_error ? REALPATH_DIE_ON_ERROR : 0) |
+				  REALPATH_MANY_MISSING));
 }
 
 char *real_pathdup(const char *path, int die_on_error)
@@ -233,7 +245,7 @@ char *real_pathdup(const char *path, int die_on_error)
 
 /*
  * Use this to get an absolute path from a relative one. If you want
- * to resolve links, you should use real_path.
+ * to resolve links, you should use strbuf_realpath.
  */
 const char *absolute_path(const char *path)
 {
diff --git a/add-interactive.c b/add-interactive.c
new file mode 100644
index 0000000000..36ebdbdf7e
--- /dev/null
+++ b/add-interactive.c
@@ -0,0 +1,1184 @@
+#include "cache.h"
+#include "add-interactive.h"
+#include "color.h"
+#include "config.h"
+#include "diffcore.h"
+#include "revision.h"
+#include "refs.h"
+#include "string-list.h"
+#include "lockfile.h"
+#include "dir.h"
+#include "run-command.h"
+#include "prompt.h"
+
+static void init_color(struct repository *r, struct add_i_state *s,
+		       const char *section_and_slot, char *dst,
+		       const char *default_color)
+{
+	char *key = xstrfmt("color.%s", section_and_slot);
+	const char *value;
+
+	if (!s->use_color)
+		dst[0] = '\0';
+	else if (repo_config_get_value(r, key, &value) ||
+		 color_parse(value, dst))
+		strlcpy(dst, default_color, COLOR_MAXLEN);
+
+	free(key);
+}
+
+void init_add_i_state(struct add_i_state *s, struct repository *r)
+{
+	const char *value;
+
+	s->r = r;
+
+	if (repo_config_get_value(r, "color.interactive", &value))
+		s->use_color = -1;
+	else
+		s->use_color =
+			git_config_colorbool("color.interactive", value);
+	s->use_color = want_color(s->use_color);
+
+	init_color(r, s, "interactive.header", s->header_color, GIT_COLOR_BOLD);
+	init_color(r, s, "interactive.help", s->help_color, GIT_COLOR_BOLD_RED);
+	init_color(r, s, "interactive.prompt", s->prompt_color,
+		   GIT_COLOR_BOLD_BLUE);
+	init_color(r, s, "interactive.error", s->error_color,
+		   GIT_COLOR_BOLD_RED);
+
+	init_color(r, s, "diff.frag", s->fraginfo_color,
+		   diff_get_color(s->use_color, DIFF_FRAGINFO));
+	init_color(r, s, "diff.context", s->context_color, "fall back");
+	if (!strcmp(s->context_color, "fall back"))
+		init_color(r, s, "diff.plain", s->context_color,
+			   diff_get_color(s->use_color, DIFF_CONTEXT));
+	init_color(r, s, "diff.old", s->file_old_color,
+		diff_get_color(s->use_color, DIFF_FILE_OLD));
+	init_color(r, s, "diff.new", s->file_new_color,
+		diff_get_color(s->use_color, DIFF_FILE_NEW));
+
+	strlcpy(s->reset_color,
+		s->use_color ? GIT_COLOR_RESET : "", COLOR_MAXLEN);
+
+	FREE_AND_NULL(s->interactive_diff_filter);
+	git_config_get_string("interactive.difffilter",
+			      &s->interactive_diff_filter);
+
+	FREE_AND_NULL(s->interactive_diff_algorithm);
+	git_config_get_string("diff.algorithm",
+			      &s->interactive_diff_algorithm);
+
+	git_config_get_bool("interactive.singlekey", &s->use_single_key);
+}
+
+void clear_add_i_state(struct add_i_state *s)
+{
+	FREE_AND_NULL(s->interactive_diff_filter);
+	FREE_AND_NULL(s->interactive_diff_algorithm);
+	memset(s, 0, sizeof(*s));
+	s->use_color = -1;
+}
+
+/*
+ * A "prefix item list" is a list of items that are identified by a string, and
+ * a unique prefix (if any) is determined for each item.
+ *
+ * It is implemented in the form of a pair of `string_list`s, the first one
+ * duplicating the strings, with the `util` field pointing at a structure whose
+ * first field must be `size_t prefix_length`.
+ *
+ * That `prefix_length` field will be computed by `find_unique_prefixes()`; It
+ * will be set to zero if no valid, unique prefix could be found.
+ *
+ * The second `string_list` is called `sorted` and does _not_ duplicate the
+ * strings but simply reuses the first one's, with the `util` field pointing at
+ * the `string_item_list` of the first `string_list`. It  will be populated and
+ * sorted by `find_unique_prefixes()`.
+ */
+struct prefix_item_list {
+	struct string_list items;
+	struct string_list sorted;
+	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 }
+
+static void prefix_item_list_clear(struct prefix_item_list *list)
+{
+	string_list_clear(&list->items, 1);
+	string_list_clear(&list->sorted, 0);
+	FREE_AND_NULL(list->selected);
+}
+
+static void extend_prefix_length(struct string_list_item *p,
+				 const char *other_string, size_t max_length)
+{
+	size_t *len = p->util;
+
+	if (!*len || memcmp(p->string, other_string, *len))
+		return;
+
+	for (;;) {
+		char c = p->string[*len];
+
+		/*
+		 * Is `p` a strict prefix of `other`? Or have we exhausted the
+		 * maximal length of the prefix? Or is the current character a
+		 * multi-byte UTF-8 one? If so, there is no valid, unique
+		 * prefix.
+		 */
+		if (!c || ++*len > max_length || !isascii(c)) {
+			*len = 0;
+			break;
+		}
+
+		if (c != other_string[*len - 1])
+			break;
+	}
+}
+
+static void find_unique_prefixes(struct prefix_item_list *list)
+{
+	size_t i;
+
+	if (list->sorted.nr == list->items.nr)
+		return;
+
+	string_list_clear(&list->sorted, 0);
+	/* Avoid reallocating incrementally */
+	list->sorted.items = xmalloc(st_mult(sizeof(*list->sorted.items),
+					     list->items.nr));
+	list->sorted.nr = list->sorted.alloc = list->items.nr;
+
+	for (i = 0; i < list->items.nr; i++) {
+		list->sorted.items[i].string = list->items.items[i].string;
+		list->sorted.items[i].util = list->items.items + i;
+	}
+
+	string_list_sort(&list->sorted);
+
+	for (i = 0; i < list->sorted.nr; i++) {
+		struct string_list_item *sorted_item = list->sorted.items + i;
+		struct string_list_item *item = sorted_item->util;
+		size_t *len = item->util;
+
+		*len = 0;
+		while (*len < list->min_length) {
+			char c = item->string[(*len)++];
+
+			if (!c || !isascii(c)) {
+				*len = 0;
+				break;
+			}
+		}
+
+		if (i > 0)
+			extend_prefix_length(item, sorted_item[-1].string,
+					     list->max_length);
+		if (i + 1 < list->sorted.nr)
+			extend_prefix_length(item, sorted_item[1].string,
+					     list->max_length);
+	}
+}
+
+static ssize_t find_unique(const char *string, struct prefix_item_list *list)
+{
+	int index = string_list_find_insert_index(&list->sorted, string, 1);
+	struct string_list_item *item;
+
+	if (list->items.nr != list->sorted.nr)
+		BUG("prefix_item_list in inconsistent state (%"PRIuMAX
+		    " vs %"PRIuMAX")",
+		    (uintmax_t)list->items.nr, (uintmax_t)list->sorted.nr);
+
+	if (index < 0)
+		item = list->sorted.items[-1 - index].util;
+	else if (index > 0 &&
+		 starts_with(list->sorted.items[index - 1].string, string))
+		return -1;
+	else if (index + 1 < list->sorted.nr &&
+		 starts_with(list->sorted.items[index + 1].string, string))
+		return -1;
+	else if (index < list->sorted.nr &&
+		 starts_with(list->sorted.items[index].string, string))
+		item = list->sorted.items[index].util;
+	else
+		return -1;
+	return item - list->items.items;
+}
+
+struct list_options {
+	int columns;
+	const char *header;
+	void (*print_item)(int i, int selected, struct string_list_item *item,
+			   void *print_item_data);
+	void *print_item_data;
+};
+
+static void list(struct add_i_state *s, struct string_list *list, int *selected,
+		 struct list_options *opts)
+{
+	int i, last_lf = 0;
+
+	if (!list->nr)
+		return;
+
+	if (opts->header)
+		color_fprintf_ln(stdout, s->header_color,
+				 "%s", opts->header);
+
+	for (i = 0; i < list->nr; i++) {
+		opts->print_item(i, selected ? selected[i] : 0, list->items + i,
+				 opts->print_item_data);
+
+		if ((opts->columns) && ((i + 1) % (opts->columns))) {
+			putchar('\t');
+			last_lf = 0;
+		}
+		else {
+			putchar('\n');
+			last_lf = 1;
+		}
+	}
+
+	if (!last_lf)
+		putchar('\n');
+}
+struct list_and_choose_options {
+	struct list_options list_opts;
+
+	const char *prompt;
+	enum {
+		SINGLETON = (1<<0),
+		IMMEDIATE = (1<<1),
+	} flags;
+	void (*print_help)(struct add_i_state *s);
+};
+
+#define LIST_AND_CHOOSE_ERROR (-1)
+#define LIST_AND_CHOOSE_QUIT  (-2)
+
+/*
+ * Returns the selected index in singleton mode, the number of selected items
+ * otherwise.
+ *
+ * If an error occurred, returns `LIST_AND_CHOOSE_ERROR`. Upon EOF,
+ * `LIST_AND_CHOOSE_QUIT` is returned.
+ */
+static ssize_t list_and_choose(struct add_i_state *s,
+			       struct prefix_item_list *items,
+			       struct list_and_choose_options *opts)
+{
+	int singleton = opts->flags & SINGLETON;
+	int immediate = opts->flags & IMMEDIATE;
+
+	struct strbuf input = STRBUF_INIT;
+	ssize_t res = singleton ? LIST_AND_CHOOSE_ERROR : 0;
+
+	if (!singleton) {
+		free(items->selected);
+		CALLOC_ARRAY(items->selected, items->items.nr);
+	}
+
+	if (singleton && !immediate)
+		BUG("singleton requires immediate");
+
+	find_unique_prefixes(items);
+
+	for (;;) {
+		char *p;
+
+		strbuf_reset(&input);
+
+		list(s, &items->items, items->selected, &opts->list_opts);
+
+		color_fprintf(stdout, s->prompt_color, "%s", opts->prompt);
+		fputs(singleton ? "> " : ">> ", stdout);
+		fflush(stdout);
+
+		if (git_read_line_interactively(&input) == EOF) {
+			putchar('\n');
+			if (immediate)
+				res = LIST_AND_CHOOSE_QUIT;
+			break;
+		}
+
+		if (!input.len)
+			break;
+
+		if (!strcmp(input.buf, "?")) {
+			opts->print_help(s);
+			continue;
+		}
+
+		p = input.buf;
+		for (;;) {
+			size_t sep = strcspn(p, " \t\r\n,");
+			int choose = 1;
+			/* `from` is inclusive, `to` is exclusive */
+			ssize_t from = -1, to = -1;
+
+			if (!sep) {
+				if (!*p)
+					break;
+				p++;
+				continue;
+			}
+
+			/* Input that begins with '-'; de-select */
+			if (*p == '-') {
+				choose = 0;
+				p++;
+				sep--;
+			}
+
+			if (sep == 1 && *p == '*') {
+				from = 0;
+				to = items->items.nr;
+			} else if (isdigit(*p)) {
+				char *endp;
+				/*
+				 * A range can be specified like 5-7 or 5-.
+				 *
+				 * Note: `from` is 0-based while the user input
+				 * is 1-based, hence we have to decrement by
+				 * one. We do not have to decrement `to` even
+				 * if it is 0-based because it is an exclusive
+				 * boundary.
+				 */
+				from = strtoul(p, &endp, 10) - 1;
+				if (endp == p + sep)
+					to = from + 1;
+				else if (*endp == '-') {
+					if (isdigit(*(++endp)))
+						to = strtoul(endp, &endp, 10);
+					else
+						to = items->items.nr;
+					/* extra characters after the range? */
+					if (endp != p + sep)
+						from = -1;
+				}
+			}
+
+			if (p[sep])
+				p[sep++] = '\0';
+			if (from < 0) {
+				from = find_unique(p, items);
+				if (from >= 0)
+					to = from + 1;
+			}
+
+			if (from < 0 || from >= items->items.nr ||
+			    (singleton && from + 1 != to)) {
+				color_fprintf_ln(stderr, s->error_color,
+						 _("Huh (%s)?"), p);
+				break;
+			} else if (singleton) {
+				res = from;
+				break;
+			}
+
+			if (to > items->items.nr)
+				to = items->items.nr;
+
+			for (; from < to; from++)
+				if (items->selected[from] != choose) {
+					items->selected[from] = choose;
+					res += choose ? +1 : -1;
+				}
+
+			p += sep;
+		}
+
+		if ((immediate && res != LIST_AND_CHOOSE_ERROR) ||
+		    !strcmp(input.buf, "*"))
+			break;
+	}
+
+	strbuf_release(&input);
+	return res;
+}
+
+struct adddel {
+	uintmax_t add, del;
+	unsigned seen:1, unmerged:1, binary:1;
+};
+
+struct file_item {
+	size_t prefix_length;
+	struct adddel index, worktree;
+};
+
+static void add_file_item(struct string_list *files, const char *name)
+{
+	struct file_item *item = xcalloc(1, sizeof(*item));
+
+	string_list_append(files, name)->util = item;
+}
+
+struct pathname_entry {
+	struct hashmap_entry ent;
+	const char *name;
+	struct file_item *item;
+};
+
+static int pathname_entry_cmp(const void *unused_cmp_data,
+			      const struct hashmap_entry *he1,
+			      const struct hashmap_entry *he2,
+			      const void *name)
+{
+	const struct pathname_entry *e1 =
+		container_of(he1, const struct pathname_entry, ent);
+	const struct pathname_entry *e2 =
+		container_of(he2, const struct pathname_entry, ent);
+
+	return strcmp(e1->name, name ? (const char *)name : e2->name);
+}
+
+struct collection_status {
+	enum { FROM_WORKTREE = 0, FROM_INDEX = 1 } mode;
+
+	const char *reference;
+
+	unsigned skip_unseen:1;
+	size_t unmerged_count, binary_count;
+	struct string_list *files;
+	struct hashmap file_map;
+};
+
+static void collect_changes_cb(struct diff_queue_struct *q,
+			       struct diff_options *options,
+			       void *data)
+{
+	struct collection_status *s = data;
+	struct diffstat_t stat = { 0 };
+	int i;
+
+	if (!q->nr)
+		return;
+
+	compute_diffstat(options, &stat, q);
+
+	for (i = 0; i < stat.nr; i++) {
+		const char *name = stat.files[i]->name;
+		int hash = strhash(name);
+		struct pathname_entry *entry;
+		struct file_item *file_item;
+		struct adddel *adddel, *other_adddel;
+
+		entry = hashmap_get_entry_from_hash(&s->file_map, hash, name,
+						    struct pathname_entry, ent);
+		if (!entry) {
+			if (s->skip_unseen)
+				continue;
+
+			add_file_item(s->files, name);
+
+			CALLOC_ARRAY(entry, 1);
+			hashmap_entry_init(&entry->ent, hash);
+			entry->name = s->files->items[s->files->nr - 1].string;
+			entry->item = s->files->items[s->files->nr - 1].util;
+			hashmap_add(&s->file_map, &entry->ent);
+		}
+
+		file_item = entry->item;
+		adddel = s->mode == FROM_INDEX ?
+			&file_item->index : &file_item->worktree;
+		other_adddel = s->mode == FROM_INDEX ?
+			&file_item->worktree : &file_item->index;
+		adddel->seen = 1;
+		adddel->add = stat.files[i]->added;
+		adddel->del = stat.files[i]->deleted;
+		if (stat.files[i]->is_binary) {
+			if (!other_adddel->binary)
+				s->binary_count++;
+			adddel->binary = 1;
+		}
+		if (stat.files[i]->is_unmerged) {
+			if (!other_adddel->unmerged)
+				s->unmerged_count++;
+			adddel->unmerged = 1;
+		}
+	}
+	free_diffstat_info(&stat);
+}
+
+enum modified_files_filter {
+	NO_FILTER = 0,
+	WORKTREE_ONLY = 1,
+	INDEX_ONLY = 2,
+};
+
+static int get_modified_files(struct repository *r,
+			      enum modified_files_filter filter,
+			      struct prefix_item_list *files,
+			      const struct pathspec *ps,
+			      size_t *unmerged_count,
+			      size_t *binary_count)
+{
+	struct object_id head_oid;
+	int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
+					     &head_oid, NULL);
+	struct collection_status s = { 0 };
+	int i;
+
+	if (discard_index(r->index) < 0 ||
+	    repo_read_index_preload(r, ps, 0) < 0)
+		return error(_("could not read index"));
+
+	prefix_item_list_clear(files);
+	s.files = &files->items;
+	hashmap_init(&s.file_map, pathname_entry_cmp, NULL, 0);
+
+	for (i = 0; i < 2; i++) {
+		struct rev_info rev;
+		struct setup_revision_opt opt = { 0 };
+
+		if (filter == INDEX_ONLY)
+			s.mode = (i == 0) ? FROM_INDEX : FROM_WORKTREE;
+		else
+			s.mode = (i == 0) ? FROM_WORKTREE : FROM_INDEX;
+		s.skip_unseen = filter && i;
+
+		opt.def = is_initial ?
+			empty_tree_oid_hex() : oid_to_hex(&head_oid);
+
+		init_revisions(&rev, NULL);
+		setup_revisions(0, NULL, &rev, &opt);
+
+		rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
+		rev.diffopt.format_callback = collect_changes_cb;
+		rev.diffopt.format_callback_data = &s;
+
+		if (ps)
+			copy_pathspec(&rev.prune_data, ps);
+
+		if (s.mode == FROM_INDEX)
+			run_diff_index(&rev, 1);
+		else {
+			rev.diffopt.flags.ignore_dirty_submodules = 1;
+			run_diff_files(&rev, 0);
+		}
+
+		if (ps)
+			clear_pathspec(&rev.prune_data);
+	}
+	hashmap_clear_and_free(&s.file_map, struct pathname_entry, ent);
+	if (unmerged_count)
+		*unmerged_count = s.unmerged_count;
+	if (binary_count)
+		*binary_count = s.binary_count;
+
+	/* While the diffs are ordered already, we ran *two* diffs... */
+	string_list_sort(&files->items);
+
+	return 0;
+}
+
+static void render_adddel(struct strbuf *buf,
+				struct adddel *ad, const char *no_changes)
+{
+	if (ad->binary)
+		strbuf_addstr(buf, _("binary"));
+	else if (ad->seen)
+		strbuf_addf(buf, "+%"PRIuMAX"/-%"PRIuMAX,
+			    (uintmax_t)ad->add, (uintmax_t)ad->del);
+	else
+		strbuf_addstr(buf, no_changes);
+}
+
+/* filters out prefixes which have special meaning to list_and_choose() */
+static int is_valid_prefix(const char *prefix, size_t prefix_len)
+{
+	return prefix_len && prefix &&
+		/*
+		 * We expect `prefix` to be NUL terminated, therefore this
+		 * `strcspn()` call is okay, even if it might do much more
+		 * work than strictly necessary.
+		 */
+		strcspn(prefix, " \t\r\n,") >= prefix_len &&	/* separators */
+		*prefix != '-' &&				/* deselection */
+		!isdigit(*prefix) &&				/* selection */
+		(prefix_len != 1 ||
+		 (*prefix != '*' &&				/* "all" wildcard */
+		  *prefix != '?'));				/* prompt help */
+}
+
+struct print_file_item_data {
+	const char *modified_fmt, *color, *reset;
+	struct strbuf buf, name, index, worktree;
+	unsigned only_names:1;
+};
+
+static void print_file_item(int i, int selected, struct string_list_item *item,
+			    void *print_file_item_data)
+{
+	struct file_item *c = item->util;
+	struct print_file_item_data *d = print_file_item_data;
+	const char *highlighted = NULL;
+
+	strbuf_reset(&d->index);
+	strbuf_reset(&d->worktree);
+	strbuf_reset(&d->buf);
+
+	/* Format the item with the prefix highlighted. */
+	if (c->prefix_length > 0 &&
+	    is_valid_prefix(item->string, c->prefix_length)) {
+		strbuf_reset(&d->name);
+		strbuf_addf(&d->name, "%s%.*s%s%s", d->color,
+			    (int)c->prefix_length, item->string, d->reset,
+			    item->string + c->prefix_length);
+		highlighted = d->name.buf;
+	}
+
+	if (d->only_names) {
+		printf("%c%2d: %s", selected ? '*' : ' ', i + 1,
+		       highlighted ? highlighted : item->string);
+		return;
+	}
+
+	render_adddel(&d->worktree, &c->worktree, _("nothing"));
+	render_adddel(&d->index, &c->index, _("unchanged"));
+
+	strbuf_addf(&d->buf, d->modified_fmt, d->index.buf, d->worktree.buf,
+		    highlighted ? highlighted : item->string);
+
+	printf("%c%2d: %s", selected ? '*' : ' ', i + 1, d->buf.buf);
+}
+
+static int run_status(struct add_i_state *s, const struct pathspec *ps,
+		      struct prefix_item_list *files,
+		      struct list_and_choose_options *opts)
+{
+	if (get_modified_files(s->r, NO_FILTER, files, ps, NULL, NULL) < 0)
+		return -1;
+
+	list(s, &files->items, NULL, &opts->list_opts);
+	putchar('\n');
+
+	return 0;
+}
+
+static int run_update(struct add_i_state *s, const struct pathspec *ps,
+		      struct prefix_item_list *files,
+		      struct list_and_choose_options *opts)
+{
+	int res = 0, fd;
+	size_t count, i;
+	struct lock_file index_lock;
+
+	if (get_modified_files(s->r, WORKTREE_ONLY, files, ps, NULL, NULL) < 0)
+		return -1;
+
+	if (!files->items.nr) {
+		putchar('\n');
+		return 0;
+	}
+
+	opts->prompt = N_("Update");
+	count = list_and_choose(s, files, opts);
+	if (count <= 0) {
+		putchar('\n');
+		return 0;
+	}
+
+	fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
+	if (fd < 0) {
+		putchar('\n');
+		return -1;
+	}
+
+	for (i = 0; i < files->items.nr; i++) {
+		const char *name = files->items.items[i].string;
+		if (files->selected[i] &&
+		    add_file_to_index(s->r->index, name, 0) < 0) {
+			res = error(_("could not stage '%s'"), name);
+			break;
+		}
+	}
+
+	if (!res && write_locked_index(s->r->index, &index_lock, COMMIT_LOCK) < 0)
+		res = error(_("could not write index"));
+
+	if (!res)
+		printf(Q_("updated %d path\n",
+			  "updated %d paths\n", count), (int)count);
+
+	putchar('\n');
+	return res;
+}
+
+static void revert_from_diff(struct diff_queue_struct *q,
+			     struct diff_options *opt, void *data)
+{
+	int i, add_flags = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE;
+
+	for (i = 0; i < q->nr; i++) {
+		struct diff_filespec *one = q->queue[i]->one;
+		struct cache_entry *ce;
+
+		if (!(one->mode && !is_null_oid(&one->oid))) {
+			remove_file_from_index(opt->repo->index, one->path);
+			printf(_("note: %s is untracked now.\n"), one->path);
+		} else {
+			ce = make_cache_entry(opt->repo->index, one->mode,
+					      &one->oid, one->path, 0, 0);
+			if (!ce)
+				die(_("make_cache_entry failed for path '%s'"),
+				    one->path);
+			add_index_entry(opt->repo->index, ce, add_flags);
+		}
+	}
+}
+
+static int run_revert(struct add_i_state *s, const struct pathspec *ps,
+		      struct prefix_item_list *files,
+		      struct list_and_choose_options *opts)
+{
+	int res = 0, fd;
+	size_t count, i, j;
+
+	struct object_id oid;
+	int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid,
+					     NULL);
+	struct lock_file index_lock;
+	const char **paths;
+	struct tree *tree;
+	struct diff_options diffopt = { NULL };
+
+	if (get_modified_files(s->r, INDEX_ONLY, files, ps, NULL, NULL) < 0)
+		return -1;
+
+	if (!files->items.nr) {
+		putchar('\n');
+		return 0;
+	}
+
+	opts->prompt = N_("Revert");
+	count = list_and_choose(s, files, opts);
+	if (count <= 0)
+		goto finish_revert;
+
+	fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
+	if (fd < 0) {
+		res = -1;
+		goto finish_revert;
+	}
+
+	if (is_initial)
+		oidcpy(&oid, s->r->hash_algo->empty_tree);
+	else {
+		tree = parse_tree_indirect(&oid);
+		if (!tree) {
+			res = error(_("Could not parse HEAD^{tree}"));
+			goto finish_revert;
+		}
+		oidcpy(&oid, &tree->object.oid);
+	}
+
+	ALLOC_ARRAY(paths, count + 1);
+	for (i = j = 0; i < files->items.nr; i++)
+		if (files->selected[i])
+			paths[j++] = files->items.items[i].string;
+	paths[j] = NULL;
+
+	parse_pathspec(&diffopt.pathspec, 0,
+		       PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH,
+		       NULL, paths);
+
+	diffopt.output_format = DIFF_FORMAT_CALLBACK;
+	diffopt.format_callback = revert_from_diff;
+	diffopt.flags.override_submodule_config = 1;
+	diffopt.repo = s->r;
+
+	if (do_diff_cache(&oid, &diffopt))
+		res = -1;
+	else {
+		diffcore_std(&diffopt);
+		diff_flush(&diffopt);
+	}
+	free(paths);
+	clear_pathspec(&diffopt.pathspec);
+
+	if (!res && write_locked_index(s->r->index, &index_lock,
+				       COMMIT_LOCK) < 0)
+		res = -1;
+	else
+		res = repo_refresh_and_write_index(s->r, REFRESH_QUIET, 0, 1,
+						   NULL, NULL, NULL);
+
+	if (!res)
+		printf(Q_("reverted %d path\n",
+			  "reverted %d paths\n", count), (int)count);
+
+finish_revert:
+	putchar('\n');
+	return res;
+}
+
+static int get_untracked_files(struct repository *r,
+			       struct prefix_item_list *files,
+			       const struct pathspec *ps)
+{
+	struct dir_struct dir = { 0 };
+	size_t i;
+	struct strbuf buf = STRBUF_INIT;
+
+	if (repo_read_index(r) < 0)
+		return error(_("could not read index"));
+
+	prefix_item_list_clear(files);
+	setup_standard_excludes(&dir);
+	add_pattern_list(&dir, EXC_CMDL, "--exclude option");
+	fill_directory(&dir, r->index, ps);
+
+	for (i = 0; i < dir.nr; i++) {
+		struct dir_entry *ent = dir.entries[i];
+
+		if (index_name_is_other(r->index, ent->name, ent->len)) {
+			strbuf_reset(&buf);
+			strbuf_add(&buf, ent->name, ent->len);
+			add_file_item(&files->items, buf.buf);
+		}
+	}
+
+	strbuf_release(&buf);
+	return 0;
+}
+
+static int run_add_untracked(struct add_i_state *s, const struct pathspec *ps,
+		      struct prefix_item_list *files,
+		      struct list_and_choose_options *opts)
+{
+	struct print_file_item_data *d = opts->list_opts.print_item_data;
+	int res = 0, fd;
+	size_t count, i;
+	struct lock_file index_lock;
+
+	if (get_untracked_files(s->r, files, ps) < 0)
+		return -1;
+
+	if (!files->items.nr) {
+		printf(_("No untracked files.\n"));
+		goto finish_add_untracked;
+	}
+
+	opts->prompt = N_("Add untracked");
+	d->only_names = 1;
+	count = list_and_choose(s, files, opts);
+	d->only_names = 0;
+	if (count <= 0)
+		goto finish_add_untracked;
+
+	fd = repo_hold_locked_index(s->r, &index_lock, LOCK_REPORT_ON_ERROR);
+	if (fd < 0) {
+		res = -1;
+		goto finish_add_untracked;
+	}
+
+	for (i = 0; i < files->items.nr; i++) {
+		const char *name = files->items.items[i].string;
+		if (files->selected[i] &&
+		    add_file_to_index(s->r->index, name, 0) < 0) {
+			res = error(_("could not stage '%s'"), name);
+			break;
+		}
+	}
+
+	if (!res &&
+	    write_locked_index(s->r->index, &index_lock, COMMIT_LOCK) < 0)
+		res = error(_("could not write index"));
+
+	if (!res)
+		printf(Q_("added %d path\n",
+			  "added %d paths\n", count), (int)count);
+
+finish_add_untracked:
+	putchar('\n');
+	return res;
+}
+
+static int run_patch(struct add_i_state *s, const struct pathspec *ps,
+		     struct prefix_item_list *files,
+		     struct list_and_choose_options *opts)
+{
+	int res = 0;
+	ssize_t count, i, j;
+	size_t unmerged_count = 0, binary_count = 0;
+
+	if (get_modified_files(s->r, WORKTREE_ONLY, files, ps,
+			       &unmerged_count, &binary_count) < 0)
+		return -1;
+
+	if (unmerged_count || binary_count) {
+		for (i = j = 0; i < files->items.nr; i++) {
+			struct file_item *item = files->items.items[i].util;
+
+			if (item->index.binary || item->worktree.binary) {
+				free(item);
+				free(files->items.items[i].string);
+			} else if (item->index.unmerged ||
+				 item->worktree.unmerged) {
+				color_fprintf_ln(stderr, s->error_color,
+						 _("ignoring unmerged: %s"),
+						 files->items.items[i].string);
+				free(item);
+				free(files->items.items[i].string);
+			} else
+				files->items.items[j++] = files->items.items[i];
+		}
+		files->items.nr = j;
+	}
+
+	if (!files->items.nr) {
+		if (binary_count)
+			fprintf(stderr, _("Only binary files changed.\n"));
+		else
+			fprintf(stderr, _("No changes.\n"));
+		return 0;
+	}
+
+	opts->prompt = N_("Patch update");
+	count = list_and_choose(s, files, opts);
+	if (count > 0) {
+		struct strvec args = STRVEC_INIT;
+		struct pathspec ps_selected = { 0 };
+
+		for (i = 0; i < files->items.nr; i++)
+			if (files->selected[i])
+				strvec_push(&args,
+					    files->items.items[i].string);
+		parse_pathspec(&ps_selected,
+			       PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
+			       PATHSPEC_LITERAL_PATH, "", args.v);
+		res = run_add_p(s->r, ADD_P_ADD, NULL, &ps_selected);
+		strvec_clear(&args);
+		clear_pathspec(&ps_selected);
+	}
+
+	return res;
+}
+
+static int run_diff(struct add_i_state *s, const struct pathspec *ps,
+		    struct prefix_item_list *files,
+		    struct list_and_choose_options *opts)
+{
+	int res = 0;
+	ssize_t count, i;
+
+	struct object_id oid;
+	int is_initial = !resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &oid,
+					     NULL);
+	if (get_modified_files(s->r, INDEX_ONLY, files, ps, NULL, NULL) < 0)
+		return -1;
+
+	if (!files->items.nr) {
+		putchar('\n');
+		return 0;
+	}
+
+	opts->prompt = N_("Review diff");
+	opts->flags = IMMEDIATE;
+	count = list_and_choose(s, files, opts);
+	opts->flags = 0;
+	if (count > 0) {
+		struct strvec args = STRVEC_INIT;
+
+		strvec_pushl(&args, "git", "diff", "-p", "--cached",
+			     oid_to_hex(!is_initial ? &oid :
+					s->r->hash_algo->empty_tree),
+			     "--", NULL);
+		for (i = 0; i < files->items.nr; i++)
+			if (files->selected[i])
+				strvec_push(&args,
+					    files->items.items[i].string);
+		res = run_command_v_opt(args.v, 0);
+		strvec_clear(&args);
+	}
+
+	putchar('\n');
+	return res;
+}
+
+static int run_help(struct add_i_state *s, const struct pathspec *unused_ps,
+		    struct prefix_item_list *unused_files,
+		    struct list_and_choose_options *unused_opts)
+{
+	color_fprintf_ln(stdout, s->help_color, "status        - %s",
+			 _("show paths with changes"));
+	color_fprintf_ln(stdout, s->help_color, "update        - %s",
+			 _("add working tree state to the staged set of changes"));
+	color_fprintf_ln(stdout, s->help_color, "revert        - %s",
+			 _("revert staged set of changes back to the HEAD version"));
+	color_fprintf_ln(stdout, s->help_color, "patch         - %s",
+			 _("pick hunks and update selectively"));
+	color_fprintf_ln(stdout, s->help_color, "diff          - %s",
+			 _("view diff between HEAD and index"));
+	color_fprintf_ln(stdout, s->help_color, "add untracked - %s",
+			 _("add contents of untracked files to the staged set of changes"));
+
+	return 0;
+}
+
+static void choose_prompt_help(struct add_i_state *s)
+{
+	color_fprintf_ln(stdout, s->help_color, "%s",
+			 _("Prompt help:"));
+	color_fprintf_ln(stdout, s->help_color, "1          - %s",
+			 _("select a single item"));
+	color_fprintf_ln(stdout, s->help_color, "3-5        - %s",
+			 _("select a range of items"));
+	color_fprintf_ln(stdout, s->help_color, "2-3,6-9    - %s",
+			 _("select multiple ranges"));
+	color_fprintf_ln(stdout, s->help_color, "foo        - %s",
+			 _("select item based on unique prefix"));
+	color_fprintf_ln(stdout, s->help_color, "-...       - %s",
+			 _("unselect specified items"));
+	color_fprintf_ln(stdout, s->help_color, "*          - %s",
+			 _("choose all items"));
+	color_fprintf_ln(stdout, s->help_color, "           - %s",
+			 _("(empty) finish selecting"));
+}
+
+typedef int (*command_t)(struct add_i_state *s, const struct pathspec *ps,
+			 struct prefix_item_list *files,
+			 struct list_and_choose_options *opts);
+
+struct command_item {
+	size_t prefix_length;
+	command_t command;
+};
+
+struct print_command_item_data {
+	const char *color, *reset;
+};
+
+static void print_command_item(int i, int selected,
+			       struct string_list_item *item,
+			       void *print_command_item_data)
+{
+	struct print_command_item_data *d = print_command_item_data;
+	struct command_item *util = item->util;
+
+	if (!util->prefix_length ||
+	    !is_valid_prefix(item->string, util->prefix_length))
+		printf(" %2d: %s", i + 1, item->string);
+	else
+		printf(" %2d: %s%.*s%s%s", i + 1,
+		       d->color, (int)util->prefix_length, item->string,
+		       d->reset, item->string + util->prefix_length);
+}
+
+static void command_prompt_help(struct add_i_state *s)
+{
+	const char *help_color = s->help_color;
+	color_fprintf_ln(stdout, help_color, "%s", _("Prompt help:"));
+	color_fprintf_ln(stdout, help_color, "1          - %s",
+			 _("select a numbered item"));
+	color_fprintf_ln(stdout, help_color, "foo        - %s",
+			 _("select item based on unique prefix"));
+	color_fprintf_ln(stdout, help_color, "           - %s",
+			 _("(empty) select nothing"));
+}
+
+int run_add_i(struct repository *r, const struct pathspec *ps)
+{
+	struct add_i_state s = { NULL };
+	struct print_command_item_data data = { "[", "]" };
+	struct list_and_choose_options main_loop_opts = {
+		{ 4, N_("*** Commands ***"), print_command_item, &data },
+		N_("What now"), SINGLETON | IMMEDIATE, command_prompt_help
+	};
+	struct {
+		const char *string;
+		command_t command;
+	} command_list[] = {
+		{ "status", run_status },
+		{ "update", run_update },
+		{ "revert", run_revert },
+		{ "add untracked", run_add_untracked },
+		{ "patch", run_patch },
+		{ "diff", run_diff },
+		{ "quit", NULL },
+		{ "help", run_help },
+	};
+	struct prefix_item_list commands = PREFIX_ITEM_LIST_INIT;
+
+	struct print_file_item_data print_file_item_data = {
+		"%12s %12s %s", NULL, NULL,
+		STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
+	};
+	struct list_and_choose_options opts = {
+		{ 0, NULL, print_file_item, &print_file_item_data },
+		NULL, 0, choose_prompt_help
+	};
+	struct strbuf header = STRBUF_INIT;
+	struct prefix_item_list files = PREFIX_ITEM_LIST_INIT;
+	ssize_t i;
+	int res = 0;
+
+	for (i = 0; i < ARRAY_SIZE(command_list); i++) {
+		struct command_item *util = xcalloc(1, sizeof(*util));
+		util->command = command_list[i].command;
+		string_list_append(&commands.items, command_list[i].string)
+			->util = util;
+	}
+
+	init_add_i_state(&s, r);
+
+	/*
+	 * When color was asked for, use the prompt color for
+	 * highlighting, otherwise use square brackets.
+	 */
+	if (s.use_color) {
+		data.color = s.prompt_color;
+		data.reset = s.reset_color;
+	}
+	print_file_item_data.color = data.color;
+	print_file_item_data.reset = data.reset;
+
+	strbuf_addstr(&header, "     ");
+	strbuf_addf(&header, print_file_item_data.modified_fmt,
+		    _("staged"), _("unstaged"), _("path"));
+	opts.list_opts.header = header.buf;
+
+	if (discard_index(r->index) < 0 ||
+	    repo_read_index(r) < 0 ||
+	    repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
+					 NULL, NULL, NULL) < 0)
+		warning(_("could not refresh index"));
+
+	res = run_status(&s, ps, &files, &opts);
+
+	for (;;) {
+		struct command_item *util;
+
+		i = list_and_choose(&s, &commands, &main_loop_opts);
+		if (i < 0 || i >= commands.items.nr)
+			util = NULL;
+		else
+			util = commands.items.items[i].util;
+
+		if (i == LIST_AND_CHOOSE_QUIT || (util && !util->command)) {
+			printf(_("Bye.\n"));
+			res = 0;
+			break;
+		}
+
+		if (util)
+			res = util->command(&s, ps, &files, &opts);
+	}
+
+	prefix_item_list_clear(&files);
+	strbuf_release(&print_file_item_data.buf);
+	strbuf_release(&print_file_item_data.name);
+	strbuf_release(&print_file_item_data.index);
+	strbuf_release(&print_file_item_data.worktree);
+	strbuf_release(&header);
+	prefix_item_list_clear(&commands);
+	clear_add_i_state(&s);
+
+	return res;
+}
diff --git a/add-interactive.h b/add-interactive.h
new file mode 100644
index 0000000000..693f125e8e
--- /dev/null
+++ b/add-interactive.h
@@ -0,0 +1,41 @@
+#ifndef ADD_INTERACTIVE_H
+#define ADD_INTERACTIVE_H
+
+#include "color.h"
+
+struct add_i_state {
+	struct repository *r;
+	int use_color;
+	char header_color[COLOR_MAXLEN];
+	char help_color[COLOR_MAXLEN];
+	char prompt_color[COLOR_MAXLEN];
+	char error_color[COLOR_MAXLEN];
+	char reset_color[COLOR_MAXLEN];
+	char fraginfo_color[COLOR_MAXLEN];
+	char context_color[COLOR_MAXLEN];
+	char file_old_color[COLOR_MAXLEN];
+	char file_new_color[COLOR_MAXLEN];
+
+	int use_single_key;
+	char *interactive_diff_filter, *interactive_diff_algorithm;
+};
+
+void init_add_i_state(struct add_i_state *s, struct repository *r);
+void clear_add_i_state(struct add_i_state *s);
+
+struct repository;
+struct pathspec;
+int run_add_i(struct repository *r, const struct pathspec *ps);
+
+enum add_p_mode {
+	ADD_P_ADD,
+	ADD_P_STASH,
+	ADD_P_RESET,
+	ADD_P_CHECKOUT,
+	ADD_P_WORKTREE,
+};
+
+int run_add_p(struct repository *r, enum add_p_mode mode,
+	      const char *revision, const struct pathspec *ps);
+
+#endif
diff --git a/add-patch.c b/add-patch.c
new file mode 100644
index 0000000000..8c41cdfe39
--- /dev/null
+++ b/add-patch.c
@@ -0,0 +1,1756 @@
+#include "cache.h"
+#include "add-interactive.h"
+#include "strbuf.h"
+#include "run-command.h"
+#include "strvec.h"
+#include "pathspec.h"
+#include "color.h"
+#include "diff.h"
+#include "compat/terminal.h"
+#include "prompt.h"
+
+enum prompt_mode_type {
+	PROMPT_MODE_CHANGE = 0, PROMPT_DELETION, PROMPT_ADDITION, PROMPT_HUNK,
+	PROMPT_MODE_MAX, /* must be last */
+};
+
+struct patch_mode {
+	/*
+	 * The magic constant 4 is chosen such that all patch modes
+	 * provide enough space for three command-line arguments followed by a
+	 * trailing `NULL`.
+	 */
+	const char *diff_cmd[4], *apply_args[4], *apply_check_args[4];
+	unsigned is_reverse:1, index_only:1, apply_for_checkout:1;
+	const char *prompt_mode[PROMPT_MODE_MAX];
+	const char *edit_hunk_hint, *help_patch_text;
+};
+
+static struct patch_mode patch_mode_add = {
+	.diff_cmd = { "diff-files", NULL },
+	.apply_args = { "--cached", NULL },
+	.apply_check_args = { "--cached", NULL },
+	.prompt_mode = {
+		N_("Stage mode change [y,n,q,a,d%s,?]? "),
+		N_("Stage deletion [y,n,q,a,d%s,?]? "),
+		N_("Stage addition [y,n,q,a,d%s,?]? "),
+		N_("Stage this hunk [y,n,q,a,d%s,?]? ")
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for staging."),
+	.help_patch_text =
+		N_("y - stage this hunk\n"
+		   "n - do not stage this hunk\n"
+		   "q - quit; do not stage this hunk or any of the remaining "
+			"ones\n"
+		   "a - stage this hunk and all later hunks in the file\n"
+		   "d - do not stage this hunk or any of the later hunks in "
+			"the file\n")
+};
+
+static struct patch_mode patch_mode_stash = {
+	.diff_cmd = { "diff-index", "HEAD", NULL },
+	.apply_args = { "--cached", NULL },
+	.apply_check_args = { "--cached", NULL },
+	.prompt_mode = {
+		N_("Stash mode change [y,n,q,a,d%s,?]? "),
+		N_("Stash deletion [y,n,q,a,d%s,?]? "),
+		N_("Stash addition [y,n,q,a,d%s,?]? "),
+		N_("Stash this hunk [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for stashing."),
+	.help_patch_text =
+		N_("y - stash this hunk\n"
+		   "n - do not stash this hunk\n"
+		   "q - quit; do not stash this hunk or any of the remaining "
+			"ones\n"
+		   "a - stash this hunk and all later hunks in the file\n"
+		   "d - do not stash this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_reset_head = {
+	.diff_cmd = { "diff-index", "--cached", NULL },
+	.apply_args = { "-R", "--cached", NULL },
+	.apply_check_args = { "-R", "--cached", NULL },
+	.is_reverse = 1,
+	.index_only = 1,
+	.prompt_mode = {
+		N_("Unstage mode change [y,n,q,a,d%s,?]? "),
+		N_("Unstage deletion [y,n,q,a,d%s,?]? "),
+		N_("Unstage addition [y,n,q,a,d%s,?]? "),
+		N_("Unstage this hunk [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for unstaging."),
+	.help_patch_text =
+		N_("y - unstage this hunk\n"
+		   "n - do not unstage this hunk\n"
+		   "q - quit; do not unstage this hunk or any of the remaining "
+			"ones\n"
+		   "a - unstage this hunk and all later hunks in the file\n"
+		   "d - do not unstage this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_reset_nothead = {
+	.diff_cmd = { "diff-index", "-R", "--cached", NULL },
+	.apply_args = { "--cached", NULL },
+	.apply_check_args = { "--cached", NULL },
+	.index_only = 1,
+	.prompt_mode = {
+		N_("Apply mode change to index [y,n,q,a,d%s,?]? "),
+		N_("Apply deletion to index [y,n,q,a,d%s,?]? "),
+		N_("Apply addition to index [y,n,q,a,d%s,?]? "),
+		N_("Apply this hunk to index [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for applying."),
+	.help_patch_text =
+		N_("y - apply this hunk to index\n"
+		   "n - do not apply this hunk to index\n"
+		   "q - quit; do not apply this hunk or any of the remaining "
+			"ones\n"
+		   "a - apply this hunk and all later hunks in the file\n"
+		   "d - do not apply this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_checkout_index = {
+	.diff_cmd = { "diff-files", NULL },
+	.apply_args = { "-R", NULL },
+	.apply_check_args = { "-R", NULL },
+	.is_reverse = 1,
+	.prompt_mode = {
+		N_("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard addition from worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for discarding."),
+	.help_patch_text =
+		N_("y - discard this hunk from worktree\n"
+		   "n - do not discard this hunk from worktree\n"
+		   "q - quit; do not discard this hunk or any of the remaining "
+			"ones\n"
+		   "a - discard this hunk and all later hunks in the file\n"
+		   "d - do not discard this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_checkout_head = {
+	.diff_cmd = { "diff-index", NULL },
+	.apply_for_checkout = 1,
+	.apply_check_args = { "-R", NULL },
+	.is_reverse = 1,
+	.prompt_mode = {
+		N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard addition from index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for discarding."),
+	.help_patch_text =
+		N_("y - discard this hunk from index and worktree\n"
+		   "n - do not discard this hunk from index and worktree\n"
+		   "q - quit; do not discard this hunk or any of the remaining "
+			"ones\n"
+		   "a - discard this hunk and all later hunks in the file\n"
+		   "d - do not discard this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_checkout_nothead = {
+	.diff_cmd = { "diff-index", "-R", NULL },
+	.apply_for_checkout = 1,
+	.apply_check_args = { NULL },
+	.prompt_mode = {
+		N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Apply addition to index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for applying."),
+	.help_patch_text =
+		N_("y - apply this hunk to index and worktree\n"
+		   "n - do not apply this hunk to index and worktree\n"
+		   "q - quit; do not apply this hunk or any of the remaining "
+			"ones\n"
+		   "a - apply this hunk and all later hunks in the file\n"
+		   "d - do not apply this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_worktree_head = {
+	.diff_cmd = { "diff-index", NULL },
+	.apply_args = { "-R", NULL },
+	.apply_check_args = { "-R", NULL },
+	.is_reverse = 1,
+	.prompt_mode = {
+		N_("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard addition from index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for discarding."),
+	.help_patch_text =
+		N_("y - discard this hunk from worktree\n"
+		   "n - do not discard this hunk from worktree\n"
+		   "q - quit; do not discard this hunk or any of the remaining "
+			"ones\n"
+		   "a - discard this hunk and all later hunks in the file\n"
+		   "d - do not discard this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+static struct patch_mode patch_mode_worktree_nothead = {
+	.diff_cmd = { "diff-index", "-R", NULL },
+	.apply_args = { NULL },
+	.apply_check_args = { NULL },
+	.prompt_mode = {
+		N_("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Apply addition to index and worktree [y,n,q,a,d%s,?]? "),
+		N_("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
+	},
+	.edit_hunk_hint = N_("If the patch applies cleanly, the edited hunk "
+			     "will immediately be marked for applying."),
+	.help_patch_text =
+		N_("y - apply this hunk to worktree\n"
+		   "n - do not apply this hunk to worktree\n"
+		   "q - quit; do not apply this hunk or any of the remaining "
+			"ones\n"
+		   "a - apply this hunk and all later hunks in the file\n"
+		   "d - do not apply this hunk or any of the later hunks in "
+			"the file\n"),
+};
+
+struct hunk_header {
+	unsigned long old_offset, old_count, new_offset, new_count;
+	/*
+	 * Start/end offsets to the extra text after the second `@@` in the
+	 * hunk header, e.g. the function signature. This is expected to
+	 * include the newline.
+	 */
+	size_t extra_start, extra_end, colored_extra_start, colored_extra_end;
+};
+
+struct hunk {
+	size_t start, end, colored_start, colored_end, splittable_into;
+	ssize_t delta;
+	enum { UNDECIDED_HUNK = 0, SKIP_HUNK, USE_HUNK } use;
+	struct hunk_header header;
+};
+
+struct add_p_state {
+	struct add_i_state s;
+	struct strbuf answer, buf;
+
+	/* parsed diff */
+	struct strbuf plain, colored;
+	struct file_diff {
+		struct hunk head;
+		struct hunk *hunk;
+		size_t hunk_nr, hunk_alloc;
+		unsigned deleted:1, added:1, mode_change:1,binary:1;
+	} *file_diff;
+	size_t file_diff_nr;
+
+	/* patch mode */
+	struct patch_mode *mode;
+	const char *revision;
+};
+
+static void add_p_state_clear(struct add_p_state *s)
+{
+	size_t i;
+
+	strbuf_release(&s->answer);
+	strbuf_release(&s->buf);
+	strbuf_release(&s->plain);
+	strbuf_release(&s->colored);
+	for (i = 0; i < s->file_diff_nr; i++)
+		free(s->file_diff[i].hunk);
+	free(s->file_diff);
+	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;
+
+	va_start(args, fmt);
+	fputs(s->s.error_color, stderr);
+	vfprintf(stderr, fmt, args);
+	fputs(s->s.reset_color, stderr);
+	fputc('\n', stderr);
+	va_end(args);
+}
+
+static void setup_child_process(struct add_p_state *s,
+				struct child_process *cp, ...)
+{
+	va_list ap;
+	const char *arg;
+
+	va_start(ap, cp);
+	while ((arg = va_arg(ap, const char *)))
+		strvec_push(&cp->args, arg);
+	va_end(ap);
+
+	cp->git_cmd = 1;
+	strvec_pushf(&cp->env_array,
+		     INDEX_ENVIRONMENT "=%s", s->s.r->index_file);
+}
+
+static int parse_range(const char **p,
+		       unsigned long *offset, unsigned long *count)
+{
+	char *pend;
+
+	*offset = strtoul(*p, &pend, 10);
+	if (pend == *p)
+		return -1;
+	if (*pend != ',') {
+		*count = 1;
+		*p = pend;
+		return 0;
+	}
+	*count = strtoul(pend + 1, (char **)p, 10);
+	return *p == pend + 1 ? -1 : 0;
+}
+
+static int parse_hunk_header(struct add_p_state *s, struct hunk *hunk)
+{
+	struct hunk_header *header = &hunk->header;
+	const char *line = s->plain.buf + hunk->start, *p = line;
+	char *eol = memchr(p, '\n', s->plain.len - hunk->start);
+
+	if (!eol)
+		eol = s->plain.buf + s->plain.len;
+
+	if (!skip_prefix(p, "@@ -", &p) ||
+	    parse_range(&p, &header->old_offset, &header->old_count) < 0 ||
+	    !skip_prefix(p, " +", &p) ||
+	    parse_range(&p, &header->new_offset, &header->new_count) < 0 ||
+	    !skip_prefix(p, " @@", &p))
+		return error(_("could not parse hunk header '%.*s'"),
+			     (int)(eol - line), line);
+
+	hunk->start = eol - s->plain.buf + (*eol == '\n');
+	header->extra_start = p - s->plain.buf;
+	header->extra_end = hunk->start;
+
+	if (!s->colored.len) {
+		header->colored_extra_start = header->colored_extra_end = 0;
+		return 0;
+	}
+
+	/* Now find the extra text in the colored diff */
+	line = s->colored.buf + hunk->colored_start;
+	eol = memchr(line, '\n', s->colored.len - hunk->colored_start);
+	if (!eol)
+		eol = s->colored.buf + s->colored.len;
+	p = memmem(line, eol - line, "@@ -", 4);
+	if (!p)
+		return error(_("could not parse colored hunk header '%.*s'"),
+			     (int)(eol - line), line);
+	p = memmem(p + 4, eol - p - 4, " @@", 3);
+	if (!p)
+		return error(_("could not parse colored hunk header '%.*s'"),
+			     (int)(eol - line), line);
+	hunk->colored_start = eol - s->colored.buf + (*eol == '\n');
+	header->colored_extra_start = p + 3 - s->colored.buf;
+	header->colored_extra_end = hunk->colored_start;
+
+	return 0;
+}
+
+static int is_octal(const char *p, size_t len)
+{
+	if (!len)
+		return 0;
+
+	while (len--)
+		if (*p < '0' || *(p++) > '7')
+			return 0;
+	return 1;
+}
+
+static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
+{
+	struct strvec args = STRVEC_INIT;
+	const char *diff_algorithm = s->s.interactive_diff_algorithm;
+	struct strbuf *plain = &s->plain, *colored = NULL;
+	struct child_process cp = CHILD_PROCESS_INIT;
+	char *p, *pend, *colored_p = NULL, *colored_pend = NULL, marker = '\0';
+	size_t file_diff_alloc = 0, i, color_arg_index;
+	struct file_diff *file_diff = NULL;
+	struct hunk *hunk = NULL;
+	int res;
+
+	strvec_pushv(&args, s->mode->diff_cmd);
+	if (diff_algorithm)
+		strvec_pushf(&args, "--diff-algorithm=%s", diff_algorithm);
+	if (s->revision) {
+		struct object_id oid;
+		strvec_push(&args,
+			    /* could be on an unborn branch */
+			    !strcmp("HEAD", s->revision) &&
+			    get_oid("HEAD", &oid) ?
+			    empty_tree_oid_hex() : s->revision);
+	}
+	color_arg_index = args.nr;
+	/* Use `--no-color` explicitly, just in case `diff.color = always`. */
+	strvec_pushl(&args, "--no-color", "-p", "--", NULL);
+	for (i = 0; i < ps->nr; i++)
+		strvec_push(&args, ps->items[i].original);
+
+	setup_child_process(s, &cp, NULL);
+	cp.argv = args.v;
+	res = capture_command(&cp, plain, 0);
+	if (res) {
+		strvec_clear(&args);
+		return error(_("could not parse diff"));
+	}
+	if (!plain->len) {
+		strvec_clear(&args);
+		return 0;
+	}
+	strbuf_complete_line(plain);
+
+	if (want_color_fd(1, -1)) {
+		struct child_process colored_cp = CHILD_PROCESS_INIT;
+		const char *diff_filter = s->s.interactive_diff_filter;
+
+		setup_child_process(s, &colored_cp, NULL);
+		xsnprintf((char *)args.v[color_arg_index], 8, "--color");
+		colored_cp.argv = args.v;
+		colored = &s->colored;
+		res = capture_command(&colored_cp, colored, 0);
+		strvec_clear(&args);
+		if (res)
+			return error(_("could not parse colored diff"));
+
+		if (diff_filter) {
+			struct child_process filter_cp = CHILD_PROCESS_INIT;
+
+			setup_child_process(s, &filter_cp,
+					    diff_filter, NULL);
+			filter_cp.git_cmd = 0;
+			filter_cp.use_shell = 1;
+			strbuf_reset(&s->buf);
+			if (pipe_command(&filter_cp,
+					 colored->buf, colored->len,
+					 &s->buf, colored->len,
+					 NULL, 0) < 0)
+				return error(_("failed to run '%s'"),
+					     diff_filter);
+			strbuf_swap(colored, &s->buf);
+		}
+
+		strbuf_complete_line(colored);
+		colored_p = colored->buf;
+		colored_pend = colored_p + colored->len;
+	}
+	strvec_clear(&args);
+
+	/* parse files and hunks */
+	p = plain->buf;
+	pend = p + plain->len;
+	while (p != pend) {
+		char *eol = memchr(p, '\n', pend - p);
+		const char *deleted = NULL, *mode_change = NULL;
+
+		if (!eol)
+			eol = pend;
+
+		if (starts_with(p, "diff ")) {
+			ALLOC_GROW_BY(s->file_diff, s->file_diff_nr, 1,
+				   file_diff_alloc);
+			file_diff = s->file_diff + s->file_diff_nr - 1;
+			hunk = &file_diff->head;
+			hunk->start = p - plain->buf;
+			if (colored_p)
+				hunk->colored_start = colored_p - colored->buf;
+			marker = '\0';
+		} else if (p == plain->buf)
+			BUG("diff starts with unexpected line:\n"
+			    "%.*s\n", (int)(eol - p), p);
+		else if (file_diff->deleted)
+			; /* keep the rest of the file in a single "hunk" */
+		else if (starts_with(p, "@@ ") ||
+			 (hunk == &file_diff->head &&
+			  (skip_prefix(p, "deleted file", &deleted)))) {
+			if (marker == '-' || marker == '+')
+				/*
+				 * Should not happen; previous hunk did not end
+				 * in a context line? Handle it anyway.
+				 */
+				hunk->splittable_into++;
+
+			ALLOC_GROW_BY(file_diff->hunk, file_diff->hunk_nr, 1,
+				   file_diff->hunk_alloc);
+			hunk = file_diff->hunk + file_diff->hunk_nr - 1;
+
+			hunk->start = p - plain->buf;
+			if (colored)
+				hunk->colored_start = colored_p - colored->buf;
+
+			if (deleted)
+				file_diff->deleted = 1;
+			else if (parse_hunk_header(s, hunk) < 0)
+				return -1;
+
+			/*
+			 * Start counting into how many hunks this one can be
+			 * split
+			 */
+			marker = *p;
+		} else if (hunk == &file_diff->head &&
+			   starts_with(p, "new file")) {
+			file_diff->added = 1;
+		} else if (hunk == &file_diff->head &&
+			   skip_prefix(p, "old mode ", &mode_change) &&
+			   is_octal(mode_change, eol - mode_change)) {
+			if (file_diff->mode_change)
+				BUG("double mode change?\n\n%.*s",
+				    (int)(eol - plain->buf), plain->buf);
+			if (file_diff->hunk_nr)
+				BUG("mode change in the middle?\n\n%.*s",
+				    (int)(eol - plain->buf), plain->buf);
+
+			/*
+			 * Do *not* change `hunk`: the mode change pseudo-hunk
+			 * is _part of_ the header "hunk".
+			 */
+			file_diff->mode_change = 1;
+			ALLOC_GROW_BY(file_diff->hunk, file_diff->hunk_nr, 1,
+				   file_diff->hunk_alloc);
+			file_diff->hunk->start = p - plain->buf;
+			if (colored_p)
+				file_diff->hunk->colored_start =
+					colored_p - colored->buf;
+		} else if (hunk == &file_diff->head &&
+			   skip_prefix(p, "new mode ", &mode_change) &&
+			   is_octal(mode_change, eol - mode_change)) {
+
+			/*
+			 * Extend the "mode change" pseudo-hunk to include also
+			 * the "new mode" line.
+			 */
+			if (!file_diff->mode_change)
+				BUG("'new mode' without 'old mode'?\n\n%.*s",
+				    (int)(eol - plain->buf), plain->buf);
+			if (file_diff->hunk_nr != 1)
+				BUG("mode change in the middle?\n\n%.*s",
+				    (int)(eol - plain->buf), plain->buf);
+			if (p - plain->buf != file_diff->hunk->end)
+				BUG("'new mode' does not immediately follow "
+				    "'old mode'?\n\n%.*s",
+				    (int)(eol - plain->buf), plain->buf);
+		} else if (hunk == &file_diff->head &&
+			   starts_with(p, "Binary files "))
+			file_diff->binary = 1;
+
+		if (!!file_diff->deleted + !!file_diff->added +
+		    !!file_diff->mode_change > 1)
+			BUG("diff can only contain delete *or* add *or* a "
+			    "mode change?!?\n%.*s",
+			    (int)(eol - (plain->buf + file_diff->head.start)),
+			    plain->buf + file_diff->head.start);
+
+		if ((marker == '-' || marker == '+') && *p == ' ')
+			hunk->splittable_into++;
+		if (marker && *p != '\\')
+			marker = *p;
+
+		p = eol == pend ? pend : eol + 1;
+		hunk->end = p - plain->buf;
+
+		if (colored) {
+			char *colored_eol = memchr(colored_p, '\n',
+						   colored_pend - colored_p);
+			if (colored_eol)
+				colored_p = colored_eol + 1;
+			else if (p != pend)
+				/* colored shorter than non-colored? */
+				goto mismatched_output;
+			else
+				colored_p = colored_pend;
+
+			hunk->colored_end = colored_p - colored->buf;
+		}
+
+		if (mode_change) {
+			if (file_diff->hunk_nr != 1)
+				BUG("mode change in hunk #%d???",
+				    (int)file_diff->hunk_nr);
+			/* Adjust the end of the "mode change" pseudo-hunk */
+			file_diff->hunk->end = hunk->end;
+			if (colored)
+				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++;
+
+	/* non-colored shorter than colored? */
+	if (colored_p != colored_pend) {
+mismatched_output:
+		error(_("mismatched output from interactive.diffFilter"));
+		advise(_("Your filter must maintain a one-to-one correspondence\n"
+			 "between its input and output lines."));
+		return -1;
+	}
+
+	return 0;
+}
+
+static size_t find_next_line(struct strbuf *sb, size_t offset)
+{
+	char *eol;
+
+	if (offset >= sb->len)
+		BUG("looking for next line beyond buffer (%d >= %d)\n%s",
+		    (int)offset, (int)sb->len, sb->buf);
+
+	eol = memchr(sb->buf + offset, '\n', sb->len - offset);
+	if (!eol)
+		return sb->len;
+	return eol - sb->buf + 1;
+}
+
+static void render_hunk(struct add_p_state *s, struct hunk *hunk,
+			ssize_t delta, int colored, struct strbuf *out)
+{
+	struct hunk_header *header = &hunk->header;
+
+	if (hunk->header.old_offset != 0 || hunk->header.new_offset != 0) {
+		/*
+		 * Generate the hunk header dynamically, except for special
+		 * hunks (such as the diff header).
+		 */
+		const char *p;
+		size_t len;
+		unsigned long old_offset = header->old_offset;
+		unsigned long new_offset = header->new_offset;
+
+		if (!colored) {
+			p = s->plain.buf + header->extra_start;
+			len = header->extra_end - header->extra_start;
+		} else {
+			strbuf_addstr(out, s->s.fraginfo_color);
+			p = s->colored.buf + header->colored_extra_start;
+			len = header->colored_extra_end
+				- header->colored_extra_start;
+		}
+
+		if (s->mode->is_reverse)
+			old_offset -= delta;
+		else
+			new_offset += delta;
+
+		strbuf_addf(out, "@@ -%lu", old_offset);
+		if (header->old_count != 1)
+			strbuf_addf(out, ",%lu", header->old_count);
+		strbuf_addf(out, " +%lu", new_offset);
+		if (header->new_count != 1)
+			strbuf_addf(out, ",%lu", header->new_count);
+		strbuf_addstr(out, " @@");
+
+		if (len)
+			strbuf_add(out, p, len);
+		else if (colored)
+			strbuf_addf(out, "%s\n", s->s.reset_color);
+		else
+			strbuf_addch(out, '\n');
+	}
+
+	if (colored)
+		strbuf_add(out, s->colored.buf + hunk->colored_start,
+			   hunk->colored_end - hunk->colored_start);
+	else
+		strbuf_add(out, s->plain.buf + hunk->start,
+			   hunk->end - hunk->start);
+}
+
+static void render_diff_header(struct add_p_state *s,
+			       struct file_diff *file_diff, int colored,
+			       struct strbuf *out)
+{
+	/*
+	 * If there was a mode change, the first hunk is a pseudo hunk that
+	 * corresponds to the mode line in the header. If the user did not want
+	 * to stage that "hunk", we actually have to cut it out from the header.
+	 */
+	int skip_mode_change =
+		file_diff->mode_change && file_diff->hunk->use != USE_HUNK;
+	struct hunk *head = &file_diff->head, *first = file_diff->hunk;
+
+	if (!skip_mode_change) {
+		render_hunk(s, head, 0, colored, out);
+		return;
+	}
+
+	if (colored) {
+		const char *p = s->colored.buf;
+
+		strbuf_add(out, p + head->colored_start,
+			    first->colored_start - head->colored_start);
+		strbuf_add(out, p + first->colored_end,
+			    head->colored_end - first->colored_end);
+	} else {
+		const char *p = s->plain.buf;
+
+		strbuf_add(out, p + head->start, first->start - head->start);
+		strbuf_add(out, p + first->end, head->end - first->end);
+	}
+}
+
+/* Coalesce hunks again that were split */
+static int merge_hunks(struct add_p_state *s, struct file_diff *file_diff,
+		       size_t *hunk_index, int use_all, struct hunk *merged)
+{
+	size_t i = *hunk_index, delta;
+	struct hunk *hunk = file_diff->hunk + i;
+	/* `header` corresponds to the merged hunk */
+	struct hunk_header *header = &merged->header, *next;
+
+	if (!use_all && hunk->use != USE_HUNK)
+		return 0;
+
+	*merged = *hunk;
+	/* We simply skip the colored part (if any) when merging hunks */
+	merged->colored_start = merged->colored_end = 0;
+
+	for (; i + 1 < file_diff->hunk_nr; i++) {
+		hunk++;
+		next = &hunk->header;
+
+		/*
+		 * Stop merging hunks when:
+		 *
+		 * - the hunk is not selected for use, or
+		 * - the hunk does not overlap with the already-merged hunk(s)
+		 */
+		if ((!use_all && hunk->use != USE_HUNK) ||
+		    header->new_offset >= next->new_offset + merged->delta ||
+		    header->new_offset + header->new_count
+		    < next->new_offset + merged->delta)
+			break;
+
+		/*
+		 * If the hunks were not edited, and overlap, we can simply
+		 * extend the line range.
+		 */
+		if (merged->start < hunk->start && merged->end > hunk->start) {
+			merged->end = hunk->end;
+			merged->colored_end = hunk->colored_end;
+			delta = 0;
+		} else {
+			const char *plain = s->plain.buf;
+			size_t  overlapping_line_count = header->new_offset
+				+ header->new_count - merged->delta
+				- next->new_offset;
+			size_t overlap_end = hunk->start;
+			size_t overlap_start = overlap_end;
+			size_t overlap_next, len, j;
+
+			/*
+			 * One of the hunks was edited: the modified hunk was
+			 * appended to the strbuf `s->plain`.
+			 *
+			 * Let's ensure that at least the last context line of
+			 * the first hunk overlaps with the corresponding line
+			 * of the second hunk, and then merge.
+			 */
+			for (j = 0; j < overlapping_line_count; j++) {
+				overlap_next = find_next_line(&s->plain,
+							      overlap_end);
+
+				if (overlap_next > hunk->end)
+					BUG("failed to find %d context lines "
+					    "in:\n%.*s",
+					    (int)overlapping_line_count,
+					    (int)(hunk->end - hunk->start),
+					    plain + hunk->start);
+
+				if (plain[overlap_end] != ' ')
+					return error(_("expected context line "
+						       "#%d in\n%.*s"),
+						     (int)(j + 1),
+						     (int)(hunk->end
+							   - hunk->start),
+						     plain + hunk->start);
+
+				overlap_start = overlap_end;
+				overlap_end = overlap_next;
+			}
+			len = overlap_end - overlap_start;
+
+			if (len > merged->end - merged->start ||
+			    memcmp(plain + merged->end - len,
+				   plain + overlap_start, len))
+				return error(_("hunks do not overlap:\n%.*s\n"
+					       "\tdoes not end with:\n%.*s"),
+					     (int)(merged->end - merged->start),
+					     plain + merged->start,
+					     (int)len, plain + overlap_start);
+
+			/*
+			 * Since the start-end ranges are not adjacent, we
+			 * cannot simply take the union of the ranges. To
+			 * address that, we temporarily append the union of the
+			 * lines to the `plain` strbuf.
+			 */
+			if (merged->end != s->plain.len) {
+				size_t start = s->plain.len;
+
+				strbuf_add(&s->plain, plain + merged->start,
+					   merged->end - merged->start);
+				plain = s->plain.buf;
+				merged->start = start;
+				merged->end = s->plain.len;
+			}
+
+			strbuf_add(&s->plain,
+				   plain + overlap_end,
+				   hunk->end - overlap_end);
+			merged->end = s->plain.len;
+			merged->splittable_into += hunk->splittable_into;
+			delta = merged->delta;
+			merged->delta += hunk->delta;
+		}
+
+		header->old_count = next->old_offset + next->old_count
+			- header->old_offset;
+		header->new_count = next->new_offset + delta
+			+ next->new_count - header->new_offset;
+	}
+
+	if (i == *hunk_index)
+		return 0;
+
+	*hunk_index = i;
+	return 1;
+}
+
+static void reassemble_patch(struct add_p_state *s,
+			     struct file_diff *file_diff, int use_all,
+			     struct strbuf *out)
+{
+	struct hunk *hunk;
+	size_t save_len = s->plain.len, i;
+	ssize_t delta = 0;
+
+	render_diff_header(s, file_diff, 0, out);
+
+	for (i = file_diff->mode_change; i < file_diff->hunk_nr; i++) {
+		struct hunk merged = { 0 };
+
+		hunk = file_diff->hunk + i;
+		if (!use_all && hunk->use != USE_HUNK)
+			delta += hunk->header.old_count
+				- hunk->header.new_count;
+		else {
+			/* merge overlapping hunks into a temporary hunk */
+			if (merge_hunks(s, file_diff, &i, use_all, &merged))
+				hunk = &merged;
+
+			render_hunk(s, hunk, delta, 0, out);
+
+			/*
+			 * In case `merge_hunks()` used `plain` as a scratch
+			 * pad (this happens when an edited hunk had to be
+			 * coalesced with another hunk).
+			 */
+			strbuf_setlen(&s->plain, save_len);
+
+			delta += hunk->delta;
+		}
+	}
+}
+
+static int split_hunk(struct add_p_state *s, struct file_diff *file_diff,
+		       size_t hunk_index)
+{
+	int colored = !!s->colored.len, first = 1;
+	struct hunk *hunk = file_diff->hunk + hunk_index;
+	size_t splittable_into;
+	size_t end, colored_end, current, colored_current = 0, context_line_count;
+	struct hunk_header remaining, *header;
+	char marker, ch;
+
+	if (hunk_index >= file_diff->hunk_nr)
+		BUG("invalid hunk index: %d (must be >= 0 and < %d)",
+		    (int)hunk_index, (int)file_diff->hunk_nr);
+
+	if (hunk->splittable_into < 2)
+		return 0;
+	splittable_into = hunk->splittable_into;
+
+	end = hunk->end;
+	colored_end = hunk->colored_end;
+
+	remaining = hunk->header;
+
+	file_diff->hunk_nr += splittable_into - 1;
+	ALLOC_GROW(file_diff->hunk, file_diff->hunk_nr, file_diff->hunk_alloc);
+	if (hunk_index + splittable_into < file_diff->hunk_nr)
+		memmove(file_diff->hunk + hunk_index + splittable_into,
+			file_diff->hunk + hunk_index + 1,
+			(file_diff->hunk_nr - hunk_index - splittable_into)
+			* sizeof(*hunk));
+	hunk = file_diff->hunk + hunk_index;
+	hunk->splittable_into = 1;
+	memset(hunk + 1, 0, (splittable_into - 1) * sizeof(*hunk));
+
+	header = &hunk->header;
+	header->old_count = header->new_count = 0;
+
+	current = hunk->start;
+	if (colored)
+		colored_current = hunk->colored_start;
+	marker = '\0';
+	context_line_count = 0;
+
+	while (splittable_into > 1) {
+		ch = s->plain.buf[current];
+
+		if (!ch)
+			BUG("buffer overrun while splitting hunks");
+
+		/*
+		 * Is this the first context line after a chain of +/- lines?
+		 * Then record the start of the next split hunk.
+		 */
+		if ((marker == '-' || marker == '+') && ch == ' ') {
+			first = 0;
+			hunk[1].start = current;
+			if (colored)
+				hunk[1].colored_start = colored_current;
+			context_line_count = 0;
+		}
+
+		/*
+		 * Was the previous line a +/- one? Alternatively, is this the
+		 * first line (and not a +/- one)?
+		 *
+		 * Then just increment the appropriate counter and continue
+		 * with the next line.
+		 */
+		if (marker != ' ' || (ch != '-' && ch != '+')) {
+next_hunk_line:
+			/* Comment lines are attached to the previous line */
+			if (ch == '\\')
+				ch = marker ? marker : ' ';
+
+			/* current hunk not done yet */
+			if (ch == ' ')
+				context_line_count++;
+			else if (ch == '-')
+				header->old_count++;
+			else if (ch == '+')
+				header->new_count++;
+			else
+				BUG("unhandled diff marker: '%c'", ch);
+			marker = ch;
+			current = find_next_line(&s->plain, current);
+			if (colored)
+				colored_current =
+					find_next_line(&s->colored,
+						       colored_current);
+			continue;
+		}
+
+		/*
+		 * We got us the start of a new hunk!
+		 *
+		 * This is a context line, so it is shared with the previous
+		 * hunk, if any.
+		 */
+
+		if (first) {
+			if (header->old_count || header->new_count)
+				BUG("counts are off: %d/%d",
+				    (int)header->old_count,
+				    (int)header->new_count);
+
+			header->old_count = context_line_count;
+			header->new_count = context_line_count;
+			context_line_count = 0;
+			first = 0;
+			goto next_hunk_line;
+		}
+
+		remaining.old_offset += header->old_count;
+		remaining.old_count -= header->old_count;
+		remaining.new_offset += header->new_count;
+		remaining.new_count -= header->new_count;
+
+		/* initialize next hunk header's offsets */
+		hunk[1].header.old_offset =
+			header->old_offset + header->old_count;
+		hunk[1].header.new_offset =
+			header->new_offset + header->new_count;
+
+		/* add one split hunk */
+		header->old_count += context_line_count;
+		header->new_count += context_line_count;
+
+		hunk->end = current;
+		if (colored)
+			hunk->colored_end = colored_current;
+
+		hunk++;
+		hunk->splittable_into = 1;
+		hunk->use = hunk[-1].use;
+		header = &hunk->header;
+
+		header->old_count = header->new_count = context_line_count;
+		context_line_count = 0;
+
+		splittable_into--;
+		marker = ch;
+	}
+
+	/* last hunk simply gets the rest */
+	if (header->old_offset != remaining.old_offset)
+		BUG("miscounted old_offset: %lu != %lu",
+		    header->old_offset, remaining.old_offset);
+	if (header->new_offset != remaining.new_offset)
+		BUG("miscounted new_offset: %lu != %lu",
+		    header->new_offset, remaining.new_offset);
+	header->old_count = remaining.old_count;
+	header->new_count = remaining.new_count;
+	hunk->end = end;
+	if (colored)
+		hunk->colored_end = colored_end;
+
+	return 0;
+}
+
+static void recolor_hunk(struct add_p_state *s, struct hunk *hunk)
+{
+	const char *plain = s->plain.buf;
+	size_t current, eol, next;
+
+	if (!s->colored.len)
+		return;
+
+	hunk->colored_start = s->colored.len;
+	for (current = hunk->start; current < hunk->end; ) {
+		for (eol = current; eol < hunk->end; eol++)
+			if (plain[eol] == '\n')
+				break;
+		next = eol + (eol < hunk->end);
+		if (eol > current && plain[eol - 1] == '\r')
+			eol--;
+
+		strbuf_addstr(&s->colored,
+			      plain[current] == '-' ?
+			      s->s.file_old_color :
+			      plain[current] == '+' ?
+			      s->s.file_new_color :
+			      s->s.context_color);
+		strbuf_add(&s->colored, plain + current, eol - current);
+		strbuf_addstr(&s->colored, s->s.reset_color);
+		if (next > eol)
+			strbuf_add(&s->colored, plain + eol, next - eol);
+		current = next;
+	}
+	hunk->colored_end = s->colored.len;
+}
+
+static int edit_hunk_manually(struct add_p_state *s, struct hunk *hunk)
+{
+	size_t i;
+
+	strbuf_reset(&s->buf);
+	strbuf_commented_addf(&s->buf, _("Manual hunk edit mode -- see bottom for "
+				      "a quick guide.\n"));
+	render_hunk(s, hunk, 0, 0, &s->buf);
+	strbuf_commented_addf(&s->buf,
+			      _("---\n"
+				"To remove '%c' lines, make them ' ' lines "
+				"(context).\n"
+				"To remove '%c' lines, delete them.\n"
+				"Lines starting with %c will be removed.\n"),
+			      s->mode->is_reverse ? '+' : '-',
+			      s->mode->is_reverse ? '-' : '+',
+			      comment_line_char);
+	strbuf_commented_addf(&s->buf, "%s", _(s->mode->edit_hunk_hint));
+	/*
+	 * TRANSLATORS: 'it' refers to the patch mentioned in the previous
+	 * messages.
+	 */
+	strbuf_commented_addf(&s->buf,
+			      _("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"));
+
+	if (strbuf_edit_interactively(&s->buf, "addp-hunk-edit.diff", NULL) < 0)
+		return -1;
+
+	/* strip out commented lines */
+	hunk->start = s->plain.len;
+	for (i = 0; i < s->buf.len; ) {
+		size_t next = find_next_line(&s->buf, i);
+
+		if (s->buf.buf[i] != comment_line_char)
+			strbuf_add(&s->plain, s->buf.buf + i, next - i);
+		i = next;
+	}
+
+	hunk->end = s->plain.len;
+	if (hunk->end == hunk->start)
+		/* The user aborted editing by deleting everything */
+		return 0;
+
+	recolor_hunk(s, hunk);
+
+	/*
+	 * If the hunk header is intact, parse it, otherwise simply use the
+	 * hunk header prior to editing (which will adjust `hunk->start` to
+	 * skip the hunk header).
+	 */
+	if (s->plain.buf[hunk->start] == '@' &&
+	    parse_hunk_header(s, hunk) < 0)
+		return error(_("could not parse hunk header"));
+
+	return 1;
+}
+
+static ssize_t recount_edited_hunk(struct add_p_state *s, struct hunk *hunk,
+				   size_t orig_old_count, size_t orig_new_count)
+{
+	struct hunk_header *header = &hunk->header;
+	size_t i;
+
+	header->old_count = header->new_count = 0;
+	for (i = hunk->start; i < hunk->end; ) {
+		switch (s->plain.buf[i]) {
+		case '-':
+			header->old_count++;
+			break;
+		case '+':
+			header->new_count++;
+			break;
+		case ' ': case '\r': case '\n':
+			header->old_count++;
+			header->new_count++;
+			break;
+		}
+
+		i = find_next_line(&s->plain, i);
+	}
+
+	return orig_old_count - orig_new_count
+		- header->old_count + header->new_count;
+}
+
+static int run_apply_check(struct add_p_state *s,
+			   struct file_diff *file_diff)
+{
+	struct child_process cp = CHILD_PROCESS_INIT;
+
+	strbuf_reset(&s->buf);
+	reassemble_patch(s, file_diff, 1, &s->buf);
+
+	setup_child_process(s, &cp,
+			    "apply", "--check", NULL);
+	strvec_pushv(&cp.args, s->mode->apply_check_args);
+	if (pipe_command(&cp, s->buf.buf, s->buf.len, NULL, 0, NULL, 0))
+		return error(_("'git apply --cached' failed"));
+
+	return 0;
+}
+
+static int read_single_character(struct add_p_state *s)
+{
+	if (s->s.use_single_key) {
+		int res = read_key_without_echo(&s->answer);
+		printf("%s\n", res == EOF ? "" : s->answer.buf);
+		return res;
+	}
+
+	if (git_read_line_interactively(&s->answer) == EOF)
+		return EOF;
+	return 0;
+}
+
+static int prompt_yesno(struct add_p_state *s, const char *prompt)
+{
+	for (;;) {
+		color_fprintf(stdout, s->s.prompt_color, "%s", _(prompt));
+		fflush(stdout);
+		if (read_single_character(s) == EOF)
+			return -1;
+		switch (tolower(s->answer.buf[0])) {
+		case 'n': return 0;
+		case 'y': return 1;
+		}
+	}
+}
+
+static int edit_hunk_loop(struct add_p_state *s,
+			  struct file_diff *file_diff, struct hunk *hunk)
+{
+	size_t plain_len = s->plain.len, colored_len = s->colored.len;
+	struct hunk backup;
+
+	backup = *hunk;
+
+	for (;;) {
+		int res = edit_hunk_manually(s, hunk);
+		if (res == 0) {
+			/* abandoned */
+			*hunk = backup;
+			return -1;
+		}
+
+		if (res > 0) {
+			hunk->delta +=
+				recount_edited_hunk(s, hunk,
+						    backup.header.old_count,
+						    backup.header.new_count);
+			if (!run_apply_check(s, file_diff))
+				return 0;
+		}
+
+		/* Drop edits (they were appended to s->plain) */
+		strbuf_setlen(&s->plain, plain_len);
+		strbuf_setlen(&s->colored, colored_len);
+		*hunk = backup;
+
+		/*
+		 * 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.
+		 */
+		res = prompt_yesno(s, _("Your edited hunk does not apply. "
+					"Edit again (saying \"no\" discards!) "
+					"[y/n]? "));
+		if (res < 1)
+			return -1;
+	}
+}
+
+static int apply_for_checkout(struct add_p_state *s, struct strbuf *diff,
+			      int is_reverse)
+{
+	const char *reverse = is_reverse ? "-R" : NULL;
+	struct child_process check_index = CHILD_PROCESS_INIT;
+	struct child_process check_worktree = CHILD_PROCESS_INIT;
+	struct child_process apply_index = CHILD_PROCESS_INIT;
+	struct child_process apply_worktree = CHILD_PROCESS_INIT;
+	int applies_index, applies_worktree;
+
+	setup_child_process(s, &check_index,
+			    "apply", "--cached", "--check", reverse, NULL);
+	applies_index = !pipe_command(&check_index, diff->buf, diff->len,
+				      NULL, 0, NULL, 0);
+
+	setup_child_process(s, &check_worktree,
+			    "apply", "--check", reverse, NULL);
+	applies_worktree = !pipe_command(&check_worktree, diff->buf, diff->len,
+					 NULL, 0, NULL, 0);
+
+	if (applies_worktree && applies_index) {
+		setup_child_process(s, &apply_index,
+				    "apply", "--cached", reverse, NULL);
+		pipe_command(&apply_index, diff->buf, diff->len,
+			     NULL, 0, NULL, 0);
+
+		setup_child_process(s, &apply_worktree,
+				    "apply", reverse, NULL);
+		pipe_command(&apply_worktree, diff->buf, diff->len,
+			     NULL, 0, NULL, 0);
+
+		return 1;
+	}
+
+	if (!applies_index) {
+		err(s, _("The selected hunks do not apply to the index!"));
+		if (prompt_yesno(s, _("Apply them to the worktree "
+					  "anyway? ")) > 0) {
+			setup_child_process(s, &apply_worktree,
+					    "apply", reverse, NULL);
+			return pipe_command(&apply_worktree, diff->buf,
+					    diff->len, NULL, 0, NULL, 0);
+		}
+		err(s, _("Nothing was applied.\n"));
+	} else
+		/* As a last resort, show the diff to the user */
+		fwrite(diff->buf, diff->len, 1, stderr);
+
+	return 0;
+}
+
+#define SUMMARY_HEADER_WIDTH 20
+#define SUMMARY_LINE_WIDTH 80
+static void summarize_hunk(struct add_p_state *s, struct hunk *hunk,
+			   struct strbuf *out)
+{
+	struct hunk_header *header = &hunk->header;
+	struct strbuf *plain = &s->plain;
+	size_t len = out->len, i;
+
+	strbuf_addf(out, " -%lu,%lu +%lu,%lu ",
+		    header->old_offset, header->old_count,
+		    header->new_offset, header->new_count);
+	if (out->len - len < SUMMARY_HEADER_WIDTH)
+		strbuf_addchars(out, ' ',
+				SUMMARY_HEADER_WIDTH + len - out->len);
+	for (i = hunk->start; i < hunk->end; i = find_next_line(plain, i))
+		if (plain->buf[i] != ' ')
+			break;
+	if (i < hunk->end)
+		strbuf_add(out, plain->buf + i, find_next_line(plain, i) - i);
+	if (out->len - len > SUMMARY_LINE_WIDTH)
+		strbuf_setlen(out, len + SUMMARY_LINE_WIDTH);
+	strbuf_complete_line(out);
+}
+
+#define DISPLAY_HUNKS_LINES 20
+static size_t display_hunks(struct add_p_state *s,
+			    struct file_diff *file_diff, size_t start_index)
+{
+	size_t end_index = start_index + DISPLAY_HUNKS_LINES;
+
+	if (end_index > file_diff->hunk_nr)
+		end_index = file_diff->hunk_nr;
+
+	while (start_index < end_index) {
+		struct hunk *hunk = file_diff->hunk + start_index++;
+
+		strbuf_reset(&s->buf);
+		strbuf_addf(&s->buf, "%c%2d: ", hunk->use == USE_HUNK ? '+'
+			    : hunk->use == SKIP_HUNK ? '-' : ' ',
+			    (int)start_index);
+		summarize_hunk(s, hunk, &s->buf);
+		fputs(s->buf.buf, stdout);
+	}
+
+	return end_index;
+}
+
+static const char help_patch_remainder[] =
+N_("j - leave this hunk undecided, see next undecided hunk\n"
+   "J - leave this hunk undecided, see next hunk\n"
+   "k - leave this hunk undecided, see previous undecided hunk\n"
+   "K - leave this hunk undecided, see previous hunk\n"
+   "g - select a hunk to go to\n"
+   "/ - search for a hunk matching the given regex\n"
+   "s - split the current hunk into smaller hunks\n"
+   "e - manually edit the current hunk\n"
+   "? - print help\n");
+
+static int patch_update_file(struct add_p_state *s,
+			     struct file_diff *file_diff)
+{
+	size_t hunk_index = 0;
+	ssize_t i, undecided_previous, undecided_next;
+	struct hunk *hunk;
+	char ch;
+	struct child_process cp = CHILD_PROCESS_INIT;
+	int colored = !!s->colored.len, quit = 0;
+	enum prompt_mode_type prompt_mode_type;
+	enum {
+		ALLOW_GOTO_PREVIOUS_HUNK = 1 << 0,
+		ALLOW_GOTO_PREVIOUS_UNDECIDED_HUNK = 1 << 1,
+		ALLOW_GOTO_NEXT_HUNK = 1 << 2,
+		ALLOW_GOTO_NEXT_UNDECIDED_HUNK = 1 << 3,
+		ALLOW_SEARCH_AND_GOTO = 1 << 4,
+		ALLOW_SPLIT = 1 << 5,
+		ALLOW_EDIT = 1 << 6
+	} permitted = 0;
+
+	/* Empty added files have no hunks */
+	if (!file_diff->hunk_nr && !file_diff->added)
+		return 0;
+
+	strbuf_reset(&s->buf);
+	render_diff_header(s, file_diff, colored, &s->buf);
+	fputs(s->buf.buf, stdout);
+	for (;;) {
+		if (hunk_index >= file_diff->hunk_nr)
+			hunk_index = 0;
+		hunk = file_diff->hunk_nr
+				? file_diff->hunk + hunk_index
+				: &file_diff->head;
+		undecided_previous = -1;
+		undecided_next = -1;
+
+		if (file_diff->hunk_nr) {
+			for (i = hunk_index - 1; i >= 0; i--)
+				if (file_diff->hunk[i].use == UNDECIDED_HUNK) {
+					undecided_previous = i;
+					break;
+				}
+
+			for (i = hunk_index + 1; i < file_diff->hunk_nr; i++)
+				if (file_diff->hunk[i].use == UNDECIDED_HUNK) {
+					undecided_next = i;
+					break;
+				}
+		}
+
+		/* Everything decided? */
+		if (undecided_previous < 0 && undecided_next < 0 &&
+		    hunk->use != UNDECIDED_HUNK)
+			break;
+
+		strbuf_reset(&s->buf);
+		if (file_diff->hunk_nr) {
+			render_hunk(s, hunk, 0, colored, &s->buf);
+			fputs(s->buf.buf, stdout);
+
+			strbuf_reset(&s->buf);
+			if (undecided_previous >= 0) {
+				permitted |= ALLOW_GOTO_PREVIOUS_UNDECIDED_HUNK;
+				strbuf_addstr(&s->buf, ",k");
+			}
+			if (hunk_index) {
+				permitted |= ALLOW_GOTO_PREVIOUS_HUNK;
+				strbuf_addstr(&s->buf, ",K");
+			}
+			if (undecided_next >= 0) {
+				permitted |= ALLOW_GOTO_NEXT_UNDECIDED_HUNK;
+				strbuf_addstr(&s->buf, ",j");
+			}
+			if (hunk_index + 1 < file_diff->hunk_nr) {
+				permitted |= ALLOW_GOTO_NEXT_HUNK;
+				strbuf_addstr(&s->buf, ",J");
+			}
+			if (file_diff->hunk_nr > 1) {
+				permitted |= ALLOW_SEARCH_AND_GOTO;
+				strbuf_addstr(&s->buf, ",g,/");
+			}
+			if (hunk->splittable_into > 1) {
+				permitted |= ALLOW_SPLIT;
+				strbuf_addstr(&s->buf, ",s");
+			}
+			if (hunk_index + 1 > file_diff->mode_change &&
+			    !file_diff->deleted) {
+				permitted |= ALLOW_EDIT;
+				strbuf_addstr(&s->buf, ",e");
+			}
+		}
+		if (file_diff->deleted)
+			prompt_mode_type = PROMPT_DELETION;
+		else if (file_diff->added)
+			prompt_mode_type = PROMPT_ADDITION;
+		else if (file_diff->mode_change && !hunk_index)
+			prompt_mode_type = PROMPT_MODE_CHANGE;
+		else
+			prompt_mode_type = PROMPT_HUNK;
+
+		printf("%s(%"PRIuMAX"/%"PRIuMAX") ", s->s.prompt_color,
+			      (uintmax_t)hunk_index + 1,
+			      (uintmax_t)(file_diff->hunk_nr
+						? file_diff->hunk_nr
+						: 1));
+		printf(_(s->mode->prompt_mode[prompt_mode_type]),
+		       s->buf.buf);
+		if (*s->s.reset_color)
+			fputs(s->s.reset_color, stdout);
+		fflush(stdout);
+		if (read_single_character(s) == EOF)
+			break;
+
+		if (!s->answer.len)
+			continue;
+		ch = tolower(s->answer.buf[0]);
+		if (ch == 'y') {
+			hunk->use = USE_HUNK;
+soft_increment:
+			hunk_index = undecided_next < 0 ?
+				file_diff->hunk_nr : undecided_next;
+		} else if (ch == 'n') {
+			hunk->use = SKIP_HUNK;
+			goto soft_increment;
+		} else if (ch == 'a') {
+			if (file_diff->hunk_nr) {
+				for (; hunk_index < file_diff->hunk_nr; hunk_index++) {
+					hunk = file_diff->hunk + hunk_index;
+					if (hunk->use == UNDECIDED_HUNK)
+						hunk->use = USE_HUNK;
+				}
+			} else if (hunk->use == UNDECIDED_HUNK) {
+				hunk->use = USE_HUNK;
+			}
+		} else if (ch == 'd' || ch == 'q') {
+			if (file_diff->hunk_nr) {
+				for (; hunk_index < file_diff->hunk_nr; hunk_index++) {
+					hunk = file_diff->hunk + hunk_index;
+					if (hunk->use == UNDECIDED_HUNK)
+						hunk->use = SKIP_HUNK;
+				}
+			} else if (hunk->use == UNDECIDED_HUNK) {
+				hunk->use = SKIP_HUNK;
+			}
+			if (ch == 'q') {
+				quit = 1;
+				break;
+			}
+		} else if (s->answer.buf[0] == 'K') {
+			if (permitted & ALLOW_GOTO_PREVIOUS_HUNK)
+				hunk_index--;
+			else
+				err(s, _("No previous hunk"));
+		} else if (s->answer.buf[0] == 'J') {
+			if (permitted & ALLOW_GOTO_NEXT_HUNK)
+				hunk_index++;
+			else
+				err(s, _("No next hunk"));
+		} else if (s->answer.buf[0] == 'k') {
+			if (permitted & ALLOW_GOTO_PREVIOUS_UNDECIDED_HUNK)
+				hunk_index = undecided_previous;
+			else
+				err(s, _("No previous hunk"));
+		} else if (s->answer.buf[0] == 'j') {
+			if (permitted & ALLOW_GOTO_NEXT_UNDECIDED_HUNK)
+				hunk_index = undecided_next;
+			else
+				err(s, _("No next hunk"));
+		} else if (s->answer.buf[0] == 'g') {
+			char *pend;
+			unsigned long response;
+
+			if (!(permitted & ALLOW_SEARCH_AND_GOTO)) {
+				err(s, _("No other hunks to goto"));
+				continue;
+			}
+			strbuf_remove(&s->answer, 0, 1);
+			strbuf_trim(&s->answer);
+			i = hunk_index - DISPLAY_HUNKS_LINES / 2;
+			if (i < file_diff->mode_change)
+				i = file_diff->mode_change;
+			while (s->answer.len == 0) {
+				i = display_hunks(s, file_diff, i);
+				printf("%s", i < file_diff->hunk_nr ?
+				       _("go to which hunk (<ret> to see "
+					 "more)? ") : _("go to which hunk? "));
+				fflush(stdout);
+				if (strbuf_getline(&s->answer,
+						   stdin) == EOF)
+					break;
+				strbuf_trim_trailing_newline(&s->answer);
+			}
+
+			strbuf_trim(&s->answer);
+			response = strtoul(s->answer.buf, &pend, 10);
+			if (*pend || pend == s->answer.buf)
+				err(s, _("Invalid number: '%s'"),
+				    s->answer.buf);
+			else if (0 < response && response <= file_diff->hunk_nr)
+				hunk_index = response - 1;
+			else
+				err(s, Q_("Sorry, only %d hunk available.",
+					  "Sorry, only %d hunks available.",
+					  file_diff->hunk_nr),
+				    (int)file_diff->hunk_nr);
+		} else if (s->answer.buf[0] == '/') {
+			regex_t regex;
+			int ret;
+
+			if (!(permitted & ALLOW_SEARCH_AND_GOTO)) {
+				err(s, _("No other hunks to search"));
+				continue;
+			}
+			strbuf_remove(&s->answer, 0, 1);
+			strbuf_trim_trailing_newline(&s->answer);
+			if (s->answer.len == 0) {
+				printf("%s", _("search for regex? "));
+				fflush(stdout);
+				if (strbuf_getline(&s->answer,
+						   stdin) == EOF)
+					break;
+				strbuf_trim_trailing_newline(&s->answer);
+				if (s->answer.len == 0)
+					continue;
+			}
+			ret = regcomp(&regex, s->answer.buf,
+				      REG_EXTENDED | REG_NOSUB | REG_NEWLINE);
+			if (ret) {
+				char errbuf[1024];
+
+				regerror(ret, &regex, errbuf, sizeof(errbuf));
+				err(s, _("Malformed search regexp %s: %s"),
+				    s->answer.buf, errbuf);
+				continue;
+			}
+			i = hunk_index;
+			for (;;) {
+				/* render the hunk into a scratch buffer */
+				render_hunk(s, file_diff->hunk + i, 0, 0,
+					    &s->buf);
+				if (regexec(&regex, s->buf.buf, 0, NULL, 0)
+				    != REG_NOMATCH)
+					break;
+				i++;
+				if (i == file_diff->hunk_nr)
+					i = 0;
+				if (i != hunk_index)
+					continue;
+				err(s, _("No hunk matches the given pattern"));
+				break;
+			}
+			hunk_index = i;
+		} else if (s->answer.buf[0] == 's') {
+			size_t splittable_into = hunk->splittable_into;
+			if (!(permitted & ALLOW_SPLIT))
+				err(s, _("Sorry, cannot split this hunk"));
+			else if (!split_hunk(s, file_diff,
+					     hunk - file_diff->hunk))
+				color_fprintf_ln(stdout, s->s.header_color,
+						 _("Split into %d hunks."),
+						 (int)splittable_into);
+		} else if (s->answer.buf[0] == 'e') {
+			if (!(permitted & ALLOW_EDIT))
+				err(s, _("Sorry, cannot edit this hunk"));
+			else if (edit_hunk_loop(s, file_diff, hunk) >= 0) {
+				hunk->use = USE_HUNK;
+				goto soft_increment;
+			}
+		} else {
+			const char *p = _(help_patch_remainder), *eol = p;
+
+			color_fprintf(stdout, s->s.help_color, "%s",
+				      _(s->mode->help_patch_text));
+
+			/*
+			 * Show only those lines of the remainder that are
+			 * actually applicable with the current hunk.
+			 */
+			for (; *p; p = eol + (*eol == '\n')) {
+				eol = strchrnul(p, '\n');
+
+				/*
+				 * `s->buf` still contains the part of the
+				 * commands shown in the prompt that are not
+				 * always available.
+				 */
+				if (*p != '?' && !strchr(s->buf.buf, *p))
+					continue;
+
+				color_fprintf_ln(stdout, s->s.help_color,
+						 "%.*s", (int)(eol - p), p);
+			}
+		}
+	}
+
+	/* Any hunk to be used? */
+	for (i = 0; i < file_diff->hunk_nr; i++)
+		if (file_diff->hunk[i].use == USE_HUNK)
+			break;
+
+	if (i < file_diff->hunk_nr ||
+	    (!file_diff->hunk_nr && file_diff->head.use == USE_HUNK)) {
+		/* At least one hunk selected: apply */
+		strbuf_reset(&s->buf);
+		reassemble_patch(s, file_diff, 0, &s->buf);
+
+		discard_index(s->s.r->index);
+		if (s->mode->apply_for_checkout)
+			apply_for_checkout(s, &s->buf,
+					   s->mode->is_reverse);
+		else {
+			setup_child_process(s, &cp, "apply", NULL);
+			strvec_pushv(&cp.args, s->mode->apply_args);
+			if (pipe_command(&cp, s->buf.buf, s->buf.len,
+					 NULL, 0, NULL, 0))
+				error(_("'git apply' failed"));
+		}
+		if (repo_read_index(s->s.r) >= 0)
+			repo_refresh_and_write_index(s->s.r, REFRESH_QUIET, 0,
+						     1, NULL, NULL, NULL);
+	}
+
+	putchar('\n');
+	return quit;
+}
+
+int run_add_p(struct repository *r, enum add_p_mode mode,
+	      const char *revision, const struct pathspec *ps)
+{
+	struct add_p_state s = {
+		{ r }, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
+	};
+	size_t i, binary_count = 0;
+
+	init_add_i_state(&s.s, r);
+
+	if (mode == ADD_P_STASH)
+		s.mode = &patch_mode_stash;
+	else if (mode == ADD_P_RESET) {
+		/*
+		 * NEEDSWORK: Instead of comparing to the literal "HEAD",
+		 * compare the commit objects instead so that other ways of
+		 * saying the same thing (such as "@") are also handled
+		 * appropriately.
+		 *
+		 * This applies to the cases below too.
+		 */
+		if (!revision || !strcmp(revision, "HEAD"))
+			s.mode = &patch_mode_reset_head;
+		else
+			s.mode = &patch_mode_reset_nothead;
+	} else if (mode == ADD_P_CHECKOUT) {
+		if (!revision)
+			s.mode = &patch_mode_checkout_index;
+		else if (!strcmp(revision, "HEAD"))
+			s.mode = &patch_mode_checkout_head;
+		else
+			s.mode = &patch_mode_checkout_nothead;
+	} else if (mode == ADD_P_WORKTREE) {
+		if (!revision)
+			s.mode = &patch_mode_checkout_index;
+		else if (!strcmp(revision, "HEAD"))
+			s.mode = &patch_mode_worktree_head;
+		else
+			s.mode = &patch_mode_worktree_nothead;
+	} else
+		s.mode = &patch_mode_add;
+	s.revision = revision;
+
+	if (discard_index(r->index) < 0 || repo_read_index(r) < 0 ||
+	    (!s.mode->index_only &&
+	     repo_refresh_and_write_index(r, REFRESH_QUIET, 0, 1,
+					  NULL, NULL, NULL) < 0) ||
+	    parse_diff(&s, ps) < 0) {
+		add_p_state_clear(&s);
+		return -1;
+	}
+
+	for (i = 0; i < s.file_diff_nr; i++)
+		if (s.file_diff[i].binary && !s.file_diff[i].hunk_nr)
+			binary_count++;
+		else if (patch_update_file(&s, s.file_diff + i))
+			break;
+
+	if (s.file_diff_nr == 0)
+		fprintf(stderr, _("No changes.\n"));
+	else if (binary_count == s.file_diff_nr)
+		fprintf(stderr, _("Only binary files changed.\n"));
+
+	add_p_state_clear(&s);
+	return 0;
+}
diff --git a/advice.c b/advice.c
index 3ee0ee2d8f..bc28f73a77 100644
--- a/advice.c
+++ b/advice.c
@@ -2,6 +2,7 @@
 #include "config.h"
 #include "color.h"
 #include "help.h"
+#include "string-list.h"
 
 int advice_fetch_show_forced_updates = 1;
 int advice_push_update_rejected = 1;
@@ -11,6 +12,7 @@ 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;
@@ -29,7 +31,10 @@ 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_nested_tag = 1;
+int advice_submodule_alternate_error_strategy_die = 1;
+int advice_add_ignored_file = 1;
+int advice_add_empty_pathspec = 1;
+int advice_skipped_cherry_picks = 1;
 
 static int advice_use_color = -1;
 static char advice_colors[][COLOR_MAXLEN] = {
@@ -70,6 +75,7 @@ static struct {
 	{ "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 },
@@ -79,7 +85,7 @@ static struct {
 	{ "sequencerInUse", &advice_sequencer_in_use },
 	{ "implicitIdentity", &advice_implicit_identity },
 	{ "detachedHead", &advice_detached_head },
-	{ "setupStreamFailure", &advice_set_upstream_failure },
+	{ "setUpstreamFailure", &advice_set_upstream_failure },
 	{ "objectNameWarning", &advice_object_name_warning },
 	{ "amWorkDir", &advice_amworkdir },
 	{ "rmHints", &advice_rm_hints },
@@ -88,21 +94,70 @@ static struct {
 	{ "waitingForEditor", &advice_waiting_for_editor },
 	{ "graftFileDeprecated", &advice_graft_file_deprecated },
 	{ "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name },
-	{ "nestedTag", &advice_nested_tag },
+	{ "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die },
+	{ "addIgnoredFile", &advice_add_ignored_file },
+	{ "addEmptyPathspec", &advice_add_empty_pathspec },
+	{ "skippedCherryPicks", &advice_skipped_cherry_picks },
 
 	/* make this an alias for backward compatibility */
 	{ "pushNonFastForward", &advice_push_update_rejected }
 };
 
-void advise(const char *advice, ...)
+static struct {
+	const char *key;
+	int enabled;
+} advice_setting[] = {
+	[ADVICE_ADD_EMBEDDED_REPO]			= { "addEmbeddedRepo", 1 },
+	[ADVICE_AM_WORK_DIR] 				= { "amWorkDir", 1 },
+	[ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME] 	= { "checkoutAmbiguousRemoteBranchName", 1 },
+	[ADVICE_COMMIT_BEFORE_MERGE]			= { "commitBeforeMerge", 1 },
+	[ADVICE_DETACHED_HEAD]				= { "detachedHead", 1 },
+	[ADVICE_FETCH_SHOW_FORCED_UPDATES]		= { "fetchShowForcedUpdates", 1 },
+	[ADVICE_GRAFT_FILE_DEPRECATED]			= { "graftFileDeprecated", 1 },
+	[ADVICE_IGNORED_HOOK]				= { "ignoredHook", 1 },
+	[ADVICE_IMPLICIT_IDENTITY]			= { "implicitIdentity", 1 },
+	[ADVICE_NESTED_TAG]				= { "nestedTag", 1 },
+	[ADVICE_OBJECT_NAME_WARNING]			= { "objectNameWarning", 1 },
+	[ADVICE_PUSH_ALREADY_EXISTS]			= { "pushAlreadyExists", 1 },
+	[ADVICE_PUSH_FETCH_FIRST]			= { "pushFetchFirst", 1 },
+	[ADVICE_PUSH_NEEDS_FORCE]			= { "pushNeedsForce", 1 },
+	[ADVICE_PUSH_REF_NEEDS_UPDATE]			= { "pushRefNeedsUpdate", 1 },
+
+	/* make this an alias for backward compatibility */
+	[ADVICE_PUSH_UPDATE_REJECTED_ALIAS]		= { "pushNonFastForward", 1 },
+
+	[ADVICE_PUSH_NON_FF_CURRENT]			= { "pushNonFFCurrent", 1 },
+	[ADVICE_PUSH_NON_FF_MATCHING]			= { "pushNonFFMatching", 1 },
+	[ADVICE_PUSH_UNQUALIFIED_REF_NAME]		= { "pushUnqualifiedRefName", 1 },
+	[ADVICE_PUSH_UPDATE_REJECTED]			= { "pushUpdateRejected", 1 },
+	[ADVICE_RESET_QUIET_WARNING]			= { "resetQuiet", 1 },
+	[ADVICE_RESOLVE_CONFLICT]			= { "resolveConflict", 1 },
+	[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_UPDATE_SPARSE_PATH]			= { "updateSparsePath", 1 },
+	[ADVICE_WAITING_FOR_EDITOR]			= { "waitingForEditor", 1 },
+};
+
+static const char turn_off_instructions[] =
+N_("\n"
+   "Disable this message with \"git config advice.%s false\"");
+
+static void vadvise(const char *advice, int display_instructions,
+		    const char *key, va_list params)
 {
 	struct strbuf buf = STRBUF_INIT;
-	va_list params;
 	const char *cp, *np;
 
-	va_start(params, advice);
 	strbuf_vaddf(&buf, advice, params);
-	va_end(params);
+
+	if (display_instructions)
+		strbuf_addf(&buf, turn_off_instructions, key);
 
 	for (cp = buf.buf; *cp; cp = np) {
 		np = strchrnul(cp, '\n');
@@ -116,6 +171,37 @@ void advise(const char *advice, ...)
 	strbuf_release(&buf);
 }
 
+void advise(const char *advice, ...)
+{
+	va_list params;
+	va_start(params, advice);
+	vadvise(advice, 0, "", params);
+	va_end(params);
+}
+
+int advice_enabled(enum advice_type type)
+{
+	switch(type) {
+	case ADVICE_PUSH_UPDATE_REJECTED:
+		return advice_setting[ADVICE_PUSH_UPDATE_REJECTED].enabled &&
+		       advice_setting[ADVICE_PUSH_UPDATE_REJECTED_ALIAS].enabled;
+	default:
+		return advice_setting[type].enabled;
+	}
+}
+
+void advise_if_enabled(enum advice_type type, const char *advice, ...)
+{
+	va_list params;
+
+	if (!advice_enabled(type))
+		return;
+
+	va_start(params, advice);
+	vadvise(advice, 1, advice_setting[type].key, params);
+	va_end(params);
+}
+
 int git_default_advice_config(const char *var, const char *value)
 {
 	const char *k, *slot_name;
@@ -142,6 +228,13 @@ int git_default_advice_config(const char *var, const char *value)
 		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;
+		advice_setting[i].enabled = git_config_bool(var, value);
 		return 0;
 	}
 
@@ -152,8 +245,8 @@ void list_config_advices(struct string_list *list, const char *prefix)
 {
 	int i;
 
-	for (i = 0; i < ARRAY_SIZE(advice_config); i++)
-		list_config_item(list, prefix, advice_config[i].name);
+	for (i = 0; i < ARRAY_SIZE(advice_setting); i++)
+		list_config_item(list, prefix, advice_setting[i].key);
 }
 
 int error_resolve_conflict(const char *me)
@@ -196,6 +289,29 @@ void NORETURN die_conclude_merge(void)
 	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;
+
+	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"));
+	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."));
+}
+
 void detach_advice(const char *new_name)
 {
 	const char *fmt =
diff --git a/advice.h b/advice.h
index d015404843..3c282197f3 100644
--- a/advice.h
+++ b/advice.h
@@ -3,6 +3,8 @@
 
 #include "git-compat-util.h"
 
+struct string_list;
+
 extern int advice_fetch_show_forced_updates;
 extern int advice_push_update_rejected;
 extern int advice_push_non_ff_current;
@@ -11,6 +13,7 @@ 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;
@@ -29,14 +32,74 @@ 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_nested_tag;
+extern int advice_submodule_alternate_error_strategy_die;
+extern int advice_add_ignored_file;
+extern int advice_add_empty_pathspec;
+extern int advice_skipped_cherry_picks;
+
+/*
+ * To add a new advice, you need to:
+ * Define a new advice_type.
+ * Add a new entry to advice_setting array.
+ * Add the new config variable to Documentation/config/advice.txt.
+ * Call advise_if_enabled to print your advice.
+ */
+ enum advice_type {
+	ADVICE_ADD_EMBEDDED_REPO,
+	ADVICE_AM_WORK_DIR,
+	ADVICE_CHECKOUT_AMBIGUOUS_REMOTE_BRANCH_NAME,
+	ADVICE_COMMIT_BEFORE_MERGE,
+	ADVICE_DETACHED_HEAD,
+	ADVICE_FETCH_SHOW_FORCED_UPDATES,
+	ADVICE_GRAFT_FILE_DEPRECATED,
+	ADVICE_IGNORED_HOOK,
+	ADVICE_IMPLICIT_IDENTITY,
+	ADVICE_NESTED_TAG,
+	ADVICE_OBJECT_NAME_WARNING,
+	ADVICE_PUSH_ALREADY_EXISTS,
+	ADVICE_PUSH_FETCH_FIRST,
+	ADVICE_PUSH_NEEDS_FORCE,
+	ADVICE_PUSH_NON_FF_CURRENT,
+	ADVICE_PUSH_NON_FF_MATCHING,
+	ADVICE_PUSH_UNQUALIFIED_REF_NAME,
+	ADVICE_PUSH_UPDATE_REJECTED_ALIAS,
+	ADVICE_PUSH_UPDATE_REJECTED,
+	ADVICE_PUSH_REF_NEEDS_UPDATE,
+	ADVICE_RESET_QUIET_WARNING,
+	ADVICE_RESOLVE_CONFLICT,
+	ADVICE_RM_HINTS,
+	ADVICE_SEQUENCER_IN_USE,
+	ADVICE_SET_UPSTREAM_FAILURE,
+	ADVICE_STATUS_AHEAD_BEHIND_WARNING,
+	ADVICE_STATUS_HINTS,
+	ADVICE_STATUS_U_OPTION,
+	ADVICE_SUBMODULE_ALTERNATE_ERROR_STRATEGY_DIE,
+	ADVICE_UPDATE_SPARSE_PATH,
+	ADVICE_WAITING_FOR_EDITOR,
+	ADVICE_SKIPPED_CHERRY_PICKS,
+};
 
 int git_default_advice_config(const char *var, const char *value);
 __attribute__((format (printf, 1, 2)))
 void advise(const char *advice, ...);
+
+/**
+ * Checks if advice type is enabled (can be printed to the user).
+ * Should be called before advise().
+ */
+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);
 
 #endif /* ADVICE_H */
diff --git a/alloc.c b/alloc.c
index 1c64c4dd16..957a0af362 100644
--- a/alloc.c
+++ b/alloc.c
@@ -99,23 +99,27 @@ void *alloc_object_node(struct repository *r)
 	return obj;
 }
 
-static unsigned int alloc_commit_index(struct repository *r)
+/*
+ * The returned count is to be used as an index into commit slabs,
+ * that are *NOT* maintained per repository, and that is why a single
+ * global counter is used.
+ */
+static unsigned int alloc_commit_index(void)
 {
-	return r->parsed_objects->commit_count++;
+	static unsigned int parsed_commits_count;
+	return parsed_commits_count++;
 }
 
-void init_commit_node(struct repository *r, struct commit *c)
+void init_commit_node(struct commit *c)
 {
 	c->object.type = OBJ_COMMIT;
-	c->index = alloc_commit_index(r);
-	c->graph_pos = COMMIT_NOT_FROM_GRAPH;
-	c->generation = GENERATION_NUMBER_INFINITY;
+	c->index = alloc_commit_index();
 }
 
 void *alloc_commit_node(struct repository *r)
 {
 	struct commit *c = alloc_node(r->parsed_objects->commit_state, sizeof(struct commit));
-	init_commit_node(r, c);
+	init_commit_node(c);
 	return c;
 }
 
diff --git a/alloc.h b/alloc.h
index ed1071c11e..371d388b55 100644
--- a/alloc.h
+++ b/alloc.h
@@ -9,7 +9,7 @@ struct repository;
 
 void *alloc_blob_node(struct repository *r);
 void *alloc_tree_node(struct repository *r);
-void init_commit_node(struct repository *r, struct commit *c);
+void init_commit_node(struct commit *c);
 void *alloc_commit_node(struct repository *r);
 void *alloc_tag_node(struct repository *r);
 void *alloc_object_node(struct repository *r);
diff --git a/apply.c b/apply.c
index f8a046a6a5..4ed4b27169 100644
--- a/apply.c
+++ b/apply.c
@@ -21,6 +21,7 @@
 #include "quote.h"
 #include "rerere.h"
 #include "apply.h"
+#include "entry.h"
 
 struct gitdiff_data {
 	struct strbuf *root;
@@ -30,9 +31,9 @@ struct gitdiff_data {
 
 static void git_apply_config(void)
 {
-	git_config_get_string_const("apply.whitespace", &apply_default_whitespace);
-	git_config_get_string_const("apply.ignorewhitespace", &apply_default_ignorewhitespace);
-	git_config(git_default_config, NULL);
+	git_config_get_string("apply.whitespace", &apply_default_whitespace);
+	git_config_get_string("apply.ignorewhitespace", &apply_default_ignorewhitespace);
+	git_config(git_xmerge_config, NULL);
 }
 
 static int parse_whitespace_option(struct apply_state *state, const char *option)
@@ -100,9 +101,9 @@ int init_apply_state(struct apply_state *state,
 	state->ws_error_action = warn_on_ws_error;
 	state->ws_ignore_action = ignore_ws_none;
 	state->linenr = 1;
-	string_list_init(&state->fn_table, 0);
-	string_list_init(&state->limit_by_name, 0);
-	string_list_init(&state->symlink_changes, 0);
+	string_list_init_nodup(&state->fn_table);
+	string_list_init_nodup(&state->limit_by_name);
+	string_list_init_nodup(&state->symlink_changes);
 	strbuf_init(&state->root, 0);
 
 	git_apply_config();
@@ -133,8 +134,6 @@ int check_apply_state(struct apply_state *state, int force_apply)
 
 	if (state->apply_with_reject && state->threeway)
 		return error(_("--reject and --3way cannot be used together."));
-	if (state->cached && state->threeway)
-		return error(_("--cached and --3way cannot be used together."));
 	if (state->threeway) {
 		if (is_not_gitdir)
 			return error(_("--3way outside a repository"));
@@ -450,7 +449,7 @@ static char *find_name_gnu(struct strbuf *root,
 
 	/*
 	 * Proposed "new-style" GNU patch/diff format; see
-	 * https://public-inbox.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/
+	 * https://lore.kernel.org/git/7vll0wvb2a.fsf@assigned-by-dhcp.cox.net/
 	 */
 	if (unquote_c_style(&name, line, NULL)) {
 		strbuf_release(&name);
@@ -1781,7 +1780,7 @@ static int parse_single_patch(struct apply_state *state,
 		struct fragment *fragment;
 		int len;
 
-		fragment = xcalloc(1, sizeof(*fragment));
+		CALLOC_ARRAY(fragment, 1);
 		fragment->linenr = state->linenr;
 		len = parse_fragment(state, line, size, patch, fragment);
 		if (len <= 0) {
@@ -1918,6 +1917,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);
@@ -1959,7 +1959,7 @@ static struct fragment *parse_binary_hunk(struct apply_state *state,
 		size -= llen;
 	}
 
-	frag = xcalloc(1, sizeof(*frag));
+	CALLOC_ARRAY(frag, 1);
 	frag->patch = inflate_it(data, hunk_size, origlen);
 	frag->free_patch = 1;
 	if (!frag->patch)
@@ -2662,6 +2662,16 @@ static int find_pos(struct apply_state *state,
 	int backwards_lno, forwards_lno, current_lno;
 
 	/*
+	 * When running with --allow-overlap, it is possible that a hunk is
+	 * seen that pretends to start at the beginning (but no longer does),
+	 * and that *still* needs to match the end. So trust `match_end` more
+	 * than `match_beginning`.
+	 */
+	if (state->allow_overlap && match_beginning && match_end &&
+	    img->nr - preimage->nr != 0)
+		match_beginning = 0;
+
+	/*
 	 * If match_beginning or match_end is specified, there is no
 	 * point starting from a wrong line that will never match and
 	 * wander around and wait for a match at the specified end.
@@ -3147,7 +3157,8 @@ static int apply_binary(struct apply_state *state,
 		 * See if the old one matches what the patch
 		 * applies to.
 		 */
-		hash_object_file(img->buf, img->len, blob_type, &oid);
+		hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
+				 &oid);
 		if (strcmp(oid_to_hex(&oid), patch->old_oid_prefix))
 			return error(_("the patch applies to '%s' (%s), "
 				       "which does not match the "
@@ -3167,7 +3178,7 @@ static int apply_binary(struct apply_state *state,
 		return 0; /* deletion patch */
 	}
 
-	if (has_object_file(&oid)) {
+	if (has_object(the_repository, &oid, 0)) {
 		/* We already have the postimage */
 		enum object_type type;
 		unsigned long size;
@@ -3192,7 +3203,8 @@ static int apply_binary(struct apply_state *state,
 				     name);
 
 		/* verify that the result matches */
-		hash_object_file(img->buf, img->len, blob_type, &oid);
+		hash_object_file(the_hash_algo, img->buf, img->len, blob_type,
+				 &oid);
 		if (strcmp(oid_to_hex(&oid), patch->new_oid_prefix))
 			return error(_("binary patch to '%s' creates incorrect result (expecting %s, got %s)"),
 				name, patch->new_oid_prefix, oid_to_hex(&oid));
@@ -3557,10 +3569,10 @@ static int try_threeway(struct apply_state *state,
 		write_object_file("", 0, blob_type, &pre_oid);
 	else if (get_oid(patch->old_oid_prefix, &pre_oid) ||
 		 read_blob_object(&buf, &pre_oid, patch->old_mode))
-		return error(_("repository lacks the necessary blob to fall back on 3-way merge."));
+		return error(_("repository lacks the necessary blob to perform 3-way merge."));
 
-	if (state->apply_verbosity > verbosity_silent)
-		fprintf(stderr, _("Falling back to three-way merge...\n"));
+	if (state->apply_verbosity > verbosity_silent && patch->direct_to_threeway)
+		fprintf(stderr, _("Performing three-way merge...\n"));
 
 	img = strbuf_detach(&buf, &len);
 	prepare_image(&tmp_image, img, len, 1);
@@ -3592,7 +3604,7 @@ static int try_threeway(struct apply_state *state,
 	if (status < 0) {
 		if (state->apply_verbosity > verbosity_silent)
 			fprintf(stderr,
-				_("Failed to fall back on three-way merge...\n"));
+				_("Failed to perform three-way merge...\n"));
 		return status;
 	}
 
@@ -3625,10 +3637,13 @@ static int apply_data(struct apply_state *state, struct patch *patch,
 	if (load_preimage(state, &image, patch, st, ce) < 0)
 		return -1;
 
-	if (patch->direct_to_threeway ||
-	    apply_fragments(state, &image, patch) < 0) {
+	if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0) {
+		if (state->apply_verbosity > verbosity_silent &&
+		    state->threeway && !patch->direct_to_threeway)
+			fprintf(stderr, _("Falling back to direct application...\n"));
+
 		/* Note: with --reject, apply_fragments() returns 0 */
-		if (!state->threeway || try_threeway(state, &image, patch, st, ce) < 0)
+		if (patch->direct_to_threeway || apply_fragments(state, &image, patch) < 0)
 			return -1;
 	}
 	patch->result = image.buf;
@@ -3728,6 +3743,7 @@ static int check_preimage(struct apply_state *state,
 
 #define EXISTS_IN_INDEX 1
 #define EXISTS_IN_WORKTREE 2
+#define EXISTS_IN_INDEX_AS_ITA 3
 
 static int check_to_create(struct apply_state *state,
 			   const char *new_name,
@@ -3735,10 +3751,23 @@ static int check_to_create(struct apply_state *state,
 {
 	struct stat nst;
 
-	if (state->check_index &&
-	    index_name_pos(state->repo->index, new_name, strlen(new_name)) >= 0 &&
-	    !ok_if_exists)
-		return EXISTS_IN_INDEX;
+	if (state->check_index && (!ok_if_exists || !state->cached)) {
+		int pos;
+
+		pos = index_name_pos(state->repo->index, new_name, strlen(new_name));
+		if (pos >= 0) {
+			struct cache_entry *ce = state->repo->index->cache[pos];
+
+			/* allow ITA, as they do not yet exist in the index */
+			if (!ok_if_exists && !(ce->ce_flags & CE_INTENT_TO_ADD))
+				return EXISTS_IN_INDEX;
+
+			/* ITA entries can never match working tree files */
+			if (!state->cached && (ce->ce_flags & CE_INTENT_TO_ADD))
+				return EXISTS_IN_INDEX_AS_ITA;
+		}
+	}
+
 	if (state->cached)
 		return 0;
 
@@ -3922,7 +3951,8 @@ static int check_patch(struct apply_state *state, struct patch *patch)
 			break; /* happy */
 		case EXISTS_IN_INDEX:
 			return error(_("%s: already exists in index"), new_name);
-			break;
+		case EXISTS_IN_INDEX_AS_ITA:
+			return error(_("%s: does not match index"), new_name);
 		case EXISTS_IN_WORKTREE:
 			return error(_("%s: already exists in working directory"),
 				     new_name);
@@ -4183,8 +4213,8 @@ static void show_rename_copy(struct patch *p)
 		old_name = slash_old + 1;
 		new_name = slash_new + 1;
 	}
-	/* p->old_name thru old_name is the common prefix, and old_name and new_name
-	 * through the end of names are renames
+	/* p->old_name through old_name is the common prefix, and old_name and
+	 * new_name through the end of names are renames
 	 */
 	if (old_name != p->old_name)
 		printf(" %s %.*s{%s => %s} (%d%%)\n", renamecopy,
@@ -4337,7 +4367,7 @@ static int try_create_file(struct apply_state *state, const char *path,
 	if (fd < 0)
 		return 1;
 
-	if (convert_to_working_tree(state->repo->index, path, buf, size, &nbuf)) {
+	if (convert_to_working_tree(state->repo->index, path, buf, size, &nbuf, NULL)) {
 		size = nbuf.len;
 		buf  = nbuf.buf;
 	}
@@ -4380,7 +4410,7 @@ static int create_one_file(struct apply_state *state,
 		return 0;
 
 	if (errno == ENOENT) {
-		if (safe_create_leading_directories(path))
+		if (safe_create_leading_directories_no_share(path))
 			return 0;
 		res = try_create_file(state, path, mode, buf, size);
 		if (res < 0)
@@ -4619,7 +4649,12 @@ static int write_out_results(struct apply_state *state, struct patch *list)
 		}
 		string_list_clear(&cpath, 0);
 
-		repo_rerere(state->repo, 0);
+		/*
+		 * rerere relies on the partially merged result being in the working
+		 * tree with conflict markers, but that isn't written with --cached.
+		 */
+		if (!state->cached)
+			repo_rerere(state->repo, 0);
 	}
 
 	return errs;
@@ -4654,7 +4689,7 @@ static int apply_patch(struct apply_state *state,
 		struct patch *patch;
 		int nr;
 
-		patch = xcalloc(1, sizeof(*patch));
+		CALLOC_ARRAY(patch, 1);
 		patch->inaccurate_eof = !!(options & APPLY_OPT_INACCURATE_EOF);
 		patch->recount =  !!(options & APPLY_OPT_RECOUNT);
 		nr = parse_chunk(state, buf.buf + offset, buf.len - offset, patch);
@@ -4670,8 +4705,13 @@ static int apply_patch(struct apply_state *state,
 			reverse_patches(patch);
 		if (use_patch(state, patch)) {
 			patch_stats(state, patch);
-			*listp = patch;
-			listp = &patch->next;
+			if (!list || !state->apply_in_reverse) {
+				*listp = patch;
+				listp = &patch->next;
+			} else {
+				patch->next = list;
+				list = patch;
+			}
 
 			if ((patch->new_name &&
 			     ends_with_path_components(patch->new_name,
@@ -4952,15 +4992,15 @@ int apply_parse_options(int argc, const char **argv,
 			const char * const *apply_usage)
 {
 	struct option builtin_apply_options[] = {
-		{ OPTION_CALLBACK, 0, "exclude", state, N_("path"),
+		OPT_CALLBACK_F(0, "exclude", state, N_("path"),
 			N_("don't apply changes matching the given path"),
-			PARSE_OPT_NONEG, apply_option_parse_exclude },
-		{ OPTION_CALLBACK, 0, "include", state, N_("path"),
+			PARSE_OPT_NONEG, apply_option_parse_exclude),
+		OPT_CALLBACK_F(0, "include", state, N_("path"),
 			N_("apply changes matching the given path"),
-			PARSE_OPT_NONEG, apply_option_parse_include },
-		{ OPTION_CALLBACK, 'p', NULL, state, N_("num"),
+			PARSE_OPT_NONEG, apply_option_parse_include),
+		OPT_CALLBACK('p', NULL, state, N_("num"),
 			N_("remove <num> leading slashes from traditional diff paths"),
-			0, apply_option_parse_p },
+			apply_option_parse_p),
 		OPT_BOOL(0, "no-add", &state->no_add,
 			N_("ignore additions made by the patch")),
 		OPT_BOOL(0, "stat", &state->diffstat,
@@ -4985,7 +5025,7 @@ int apply_parse_options(int argc, const char **argv,
 		OPT_BOOL(0, "apply", force_apply,
 			N_("also apply the patch (use with --stat/--summary/--check)")),
 		OPT_BOOL('3', "3way", &state->threeway,
-			 N_( "attempt three-way merge if a patch does not apply")),
+			 N_( "attempt three-way merge, fall back on normal patch if that fails")),
 		OPT_FILENAME(0, "build-fake-ancestor", &state->fake_ancestor,
 			N_("build a temporary index based on embedded index information")),
 		/* Think twice before adding "--nul" synonym to this */
@@ -4993,15 +5033,15 @@ int apply_parse_options(int argc, const char **argv,
 			N_("paths are separated with NUL character"), '\0'),
 		OPT_INTEGER('C', NULL, &state->p_context,
 				N_("ensure at least <n> lines of context match")),
-		{ OPTION_CALLBACK, 0, "whitespace", state, N_("action"),
+		OPT_CALLBACK(0, "whitespace", state, N_("action"),
 			N_("detect new or modified lines that have whitespace errors"),
-			0, apply_option_parse_whitespace },
-		{ OPTION_CALLBACK, 0, "ignore-space-change", state, NULL,
+			apply_option_parse_whitespace),
+		OPT_CALLBACK_F(0, "ignore-space-change", state, NULL,
 			N_("ignore changes in whitespace when finding context"),
-			PARSE_OPT_NOARG, apply_option_parse_space_change },
-		{ OPTION_CALLBACK, 0, "ignore-whitespace", state, NULL,
+			PARSE_OPT_NOARG, apply_option_parse_space_change),
+		OPT_CALLBACK_F(0, "ignore-whitespace", state, NULL,
 			N_("ignore changes in whitespace when finding context"),
-			PARSE_OPT_NOARG, apply_option_parse_space_change },
+			PARSE_OPT_NOARG, apply_option_parse_space_change),
 		OPT_BOOL('R', "reverse", &state->apply_in_reverse,
 			N_("apply the patch in reverse")),
 		OPT_BOOL(0, "unidiff-zero", &state->unidiff_zero,
@@ -5017,9 +5057,9 @@ int apply_parse_options(int argc, const char **argv,
 		OPT_BIT(0, "recount", options,
 			N_("do not trust the line counts in the hunk headers"),
 			APPLY_OPT_RECOUNT),
-		{ OPTION_CALLBACK, 0, "directory", state, N_("root"),
+		OPT_CALLBACK(0, "directory", state, N_("root"),
 			N_("prepend <root> to all filenames"),
-			0, apply_option_parse_directory },
+			apply_option_parse_directory),
 		OPT_END()
 	};
 
diff --git a/archive-tar.c b/archive-tar.c
index e16d3f756d..05d2455870 100644
--- a/archive-tar.c
+++ b/archive-tar.c
@@ -112,7 +112,7 @@ static void write_trailer(void)
  * queues up writes, so that all our write(2) calls write exactly one
  * full block; pads writes to RECORDSIZE
  */
-static int stream_blocked(const struct object_id *oid)
+static int stream_blocked(struct repository *r, const struct object_id *oid)
 {
 	struct git_istream *st;
 	enum object_type type;
@@ -120,7 +120,7 @@ static int stream_blocked(const struct object_id *oid)
 	char buf[BLOCKSIZE];
 	ssize_t readlen;
 
-	st = open_istream(oid, &type, &sz, NULL);
+	st = open_istream(r, oid, &type, &sz, NULL);
 	if (!st)
 		return error(_("cannot stream blob %s"), oid_to_hex(oid));
 	for (;;) {
@@ -242,13 +242,12 @@ static void write_extended_header(struct archiver_args *args,
 static int write_tar_entry(struct archiver_args *args,
 			   const struct object_id *oid,
 			   const char *path, size_t pathlen,
-			   unsigned int mode)
+			   unsigned int mode,
+			   void *buffer, unsigned long size)
 {
 	struct ustar_header header;
 	struct strbuf ext_header = STRBUF_INIT;
-	unsigned int old_mode = mode;
-	unsigned long size, size_in_header;
-	void *buffer;
+	unsigned long size_in_header;
 	int err = 0;
 
 	memset(&header, 0, sizeof(header));
@@ -282,20 +281,6 @@ static int write_tar_entry(struct archiver_args *args,
 	} else
 		memcpy(header.name, path, pathlen);
 
-	if (S_ISREG(mode) && !args->convert &&
-	    oid_object_info(args->repo, oid, &size) == OBJ_BLOB &&
-	    size > big_file_threshold)
-		buffer = NULL;
-	else if (S_ISLNK(mode) || S_ISREG(mode)) {
-		enum object_type type;
-		buffer = object_file_to_archive(args, path, oid, old_mode, &type, &size);
-		if (!buffer)
-			return error(_("cannot read %s"), oid_to_hex(oid));
-	} else {
-		buffer = NULL;
-		size = 0;
-	}
-
 	if (S_ISLNK(mode)) {
 		if (size > sizeof(header.linkname)) {
 			xsnprintf(header.linkname, sizeof(header.linkname),
@@ -324,9 +309,8 @@ static int write_tar_entry(struct archiver_args *args,
 		if (buffer)
 			write_blocked(buffer, size);
 		else
-			err = stream_blocked(oid);
+			err = stream_blocked(args->repo, oid);
 	}
-	free(buffer);
 	return err;
 }
 
@@ -364,7 +348,7 @@ static struct archiver **tar_filters;
 static int nr_tar_filters;
 static int alloc_tar_filters;
 
-static struct archiver *find_tar_filter(const char *name, int len)
+static struct archiver *find_tar_filter(const char *name, size_t len)
 {
 	int i;
 	for (i = 0; i < nr_tar_filters; i++) {
@@ -380,17 +364,18 @@ static int tar_filter_config(const char *var, const char *value, void *data)
 	struct archiver *ar;
 	const char *name;
 	const char *type;
-	int namelen;
+	size_t namelen;
 
 	if (parse_config_key(var, "tar", &name, &namelen, &type) < 0 || !name)
 		return 0;
 
 	ar = find_tar_filter(name, namelen);
 	if (!ar) {
-		ar = xcalloc(1, sizeof(*ar));
+		CALLOC_ARRAY(ar, 1);
 		ar->name = xmemdupz(name, namelen);
 		ar->write_archive = write_tar_filter_archive;
-		ar->flags = ARCHIVER_WANT_COMPRESSION_LEVELS;
+		ar->flags = ARCHIVER_WANT_COMPRESSION_LEVELS |
+			    ARCHIVER_HIGH_COMPRESSION_LEVELS;
 		ALLOC_GROW(tar_filters, nr_tar_filters + 1, alloc_tar_filters);
 		tar_filters[nr_tar_filters++] = ar;
 	}
diff --git a/archive-zip.c b/archive-zip.c
index 4d66b5be6e..2961e01c75 100644
--- a/archive-zip.c
+++ b/archive-zip.c
@@ -24,6 +24,11 @@ static unsigned int max_creator_version;
 #define ZIP_STREAM	(1 <<  3)
 #define ZIP_UTF8	(1 << 11)
 
+enum zip_method {
+	ZIP_METHOD_STORE = 0,
+	ZIP_METHOD_DEFLATE = 8
+};
+
 struct zip_local_header {
 	unsigned char magic[4];
 	unsigned char version[2];
@@ -280,7 +285,8 @@ static int entry_is_binary(struct index_state *istate, const char *path,
 static int write_zip_entry(struct archiver_args *args,
 			   const struct object_id *oid,
 			   const char *path, size_t pathlen,
-			   unsigned int mode)
+			   unsigned int mode,
+			   void *buffer, unsigned long size)
 {
 	struct zip_local_header header;
 	uintmax_t offset = zip_offset;
@@ -291,13 +297,11 @@ static int write_zip_entry(struct archiver_args *args,
 	unsigned long attr2;
 	unsigned long compressed_size;
 	unsigned long crc;
-	int method;
+	enum zip_method method;
 	unsigned char *out;
 	void *deflated = NULL;
-	void *buffer;
 	struct git_istream *stream = NULL;
 	unsigned long flags = 0;
-	unsigned long size;
 	int is_binary = -1;
 	const char *path_without_prefix = path + args->baselen;
 	unsigned int creator_version = 0;
@@ -320,45 +324,36 @@ static int write_zip_entry(struct archiver_args *args,
 	}
 
 	if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
-		method = 0;
+		method = ZIP_METHOD_STORE;
 		attr2 = 16;
 		out = NULL;
-		size = 0;
 		compressed_size = 0;
-		buffer = NULL;
 	} else if (S_ISREG(mode) || S_ISLNK(mode)) {
-		enum object_type type = oid_object_info(args->repo, oid,
-							&size);
-
-		method = 0;
+		method = ZIP_METHOD_STORE;
 		attr2 = S_ISLNK(mode) ? ((mode | 0777) << 16) :
 			(mode & 0111) ? ((mode) << 16) : 0;
 		if (S_ISLNK(mode) || (mode & 0111))
 			creator_version = 0x0317;
 		if (S_ISREG(mode) && args->compression_level != 0 && size > 0)
-			method = 8;
+			method = ZIP_METHOD_DEFLATE;
 
-		if (S_ISREG(mode) && type == OBJ_BLOB && !args->convert &&
-		    size > big_file_threshold) {
-			stream = open_istream(oid, &type, &size, NULL);
+		if (!buffer) {
+			enum object_type type;
+			stream = open_istream(args->repo, oid, &type, &size,
+					      NULL);
 			if (!stream)
 				return error(_("cannot stream blob %s"),
 					     oid_to_hex(oid));
 			flags |= ZIP_STREAM;
-			out = buffer = NULL;
+			out = NULL;
 		} else {
-			buffer = object_file_to_archive(args, path, oid, mode,
-							&type, &size);
-			if (!buffer)
-				return error(_("cannot read %s"),
-					     oid_to_hex(oid));
 			crc = crc32(crc, buffer, size);
 			is_binary = entry_is_binary(args->repo->index,
 						    path_without_prefix,
 						    buffer, size);
 			out = buffer;
 		}
-		compressed_size = (method == 0) ? size : 0;
+		compressed_size = (method == ZIP_METHOD_STORE) ? size : 0;
 	} else {
 		return error(_("unsupported file mode: 0%o (SHA1: %s)"), mode,
 				oid_to_hex(oid));
@@ -367,13 +362,13 @@ static int write_zip_entry(struct archiver_args *args,
 	if (creator_version > max_creator_version)
 		max_creator_version = creator_version;
 
-	if (buffer && method == 8) {
+	if (buffer && method == ZIP_METHOD_DEFLATE) {
 		out = deflated = zlib_deflate_raw(buffer, size,
 						  args->compression_level,
 						  &compressed_size);
 		if (!out || compressed_size >= size) {
 			out = buffer;
-			method = 0;
+			method = ZIP_METHOD_STORE;
 			compressed_size = size;
 		}
 	}
@@ -420,7 +415,7 @@ static int write_zip_entry(struct archiver_args *args,
 		zip_offset += ZIP64_EXTRA_SIZE;
 	}
 
-	if (stream && method == 0) {
+	if (stream && method == ZIP_METHOD_STORE) {
 		unsigned char buf[STREAM_BUFFER_SIZE];
 		ssize_t readlen;
 
@@ -443,7 +438,7 @@ static int write_zip_entry(struct archiver_args *args,
 		zip_offset += compressed_size;
 
 		write_zip_data_desc(size, compressed_size, crc);
-	} else if (stream && method == 8) {
+	} else if (stream && method == ZIP_METHOD_DEFLATE) {
 		unsigned char buf[STREAM_BUFFER_SIZE];
 		ssize_t readlen;
 		git_zstream zstream;
@@ -505,7 +500,6 @@ static int write_zip_entry(struct archiver_args *args,
 	}
 
 	free(deflated);
-	free(buffer);
 
 	if (compressed_size > 0xffffffff || size > 0xffffffff ||
 	    offset > 0xffffffff) {
@@ -603,18 +597,18 @@ static void write_zip_trailer(const struct object_id *oid)
 static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time)
 {
 	time_t time;
-	struct tm *t;
+	struct tm tm;
 
 	if (date_overflows(*timestamp))
 		die(_("timestamp too large for this system: %"PRItime),
 		    *timestamp);
 	time = (time_t)*timestamp;
-	t = localtime(&time);
+	localtime_r(&time, &tm);
 	*timestamp = time;
 
-	*dos_date = t->tm_mday + (t->tm_mon + 1) * 32 +
-	            (t->tm_year + 1900 - 1980) * 512;
-	*dos_time = t->tm_sec / 2 + t->tm_min * 32 + t->tm_hour * 2048;
+	*dos_date = tm.tm_mday + (tm.tm_mon + 1) * 32 +
+		    (tm.tm_year + 1900 - 1980) * 512;
+	*dos_time = tm.tm_sec / 2 + tm.tm_min * 32 + tm.tm_hour * 2048;
 }
 
 static int archive_zip_config(const char *var, const char *value, void *data)
diff --git a/archive.c b/archive.c
index a8da0fcc4f..3c266d1d7b 100644
--- a/archive.c
+++ b/archive.c
@@ -37,13 +37,10 @@ void init_archivers(void)
 
 static void format_subst(const struct commit *commit,
 			 const char *src, size_t len,
-			 struct strbuf *buf)
+			 struct strbuf *buf, struct pretty_print_context *ctx)
 {
 	char *to_free = NULL;
 	struct strbuf fmt = STRBUF_INIT;
-	struct pretty_print_context ctx = {0};
-	ctx.date_mode.type = DATE_NORMAL;
-	ctx.abbrev = DEFAULT_ABBREV;
 
 	if (src == buf->buf)
 		to_free = strbuf_detach(buf, NULL);
@@ -61,7 +58,7 @@ static void format_subst(const struct commit *commit,
 		strbuf_add(&fmt, b + 8, c - b - 8);
 
 		strbuf_add(buf, src, b - src);
-		format_commit_message(commit, fmt.buf, buf, &ctx);
+		format_commit_message(commit, fmt.buf, buf, ctx);
 		len -= c + 1 - src;
 		src  = c + 1;
 	}
@@ -70,13 +67,20 @@ static void format_subst(const struct commit *commit,
 	free(to_free);
 }
 
-void *object_file_to_archive(const struct archiver_args *args,
-			     const char *path, const struct object_id *oid,
-			     unsigned int mode, enum object_type *type,
-			     unsigned long *sizep)
+static void *object_file_to_archive(const struct archiver_args *args,
+				    const char *path,
+				    const struct object_id *oid,
+				    unsigned int mode,
+				    enum object_type *type,
+				    unsigned long *sizep)
 {
 	void *buffer;
 	const struct commit *commit = args->convert ? args->commit : NULL;
+	struct checkout_metadata meta;
+
+	init_checkout_metadata(&meta, args->refname,
+			       args->commit_oid ? args->commit_oid :
+			       (args->tree ? &args->tree->object.oid : NULL), oid);
 
 	path += args->baselen;
 	buffer = read_object_file(oid, type, sizep);
@@ -85,9 +89,9 @@ void *object_file_to_archive(const struct archiver_args *args,
 		size_t size = 0;
 
 		strbuf_attach(&buf, buffer, *sizep, *sizep + 1);
-		convert_to_working_tree(args->repo->index, path, buf.buf, buf.len, &buf);
+		convert_to_working_tree(args->repo->index, path, buf.buf, buf.len, &buf, &meta);
 		if (commit)
-			format_subst(commit, buf.buf, buf.len, &buf);
+			format_subst(commit, buf.buf, buf.len, &buf, args->pretty_ctx);
 		buffer = strbuf_detach(&buf, &size);
 		*sizep = size;
 	}
@@ -100,7 +104,6 @@ struct directory {
 	struct object_id oid;
 	int baselen, len;
 	unsigned mode;
-	int stage;
 	char path[FLEX_ARRAY];
 };
 
@@ -131,7 +134,7 @@ static int check_attr_export_subst(const struct attr_check *check)
 }
 
 static int write_archive_entry(const struct object_id *oid, const char *base,
-		int baselen, const char *filename, unsigned mode, int stage,
+		int baselen, const char *filename, unsigned mode,
 		void *context)
 {
 	static struct strbuf path = STRBUF_INIT;
@@ -140,6 +143,9 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
 	write_archive_entry_fn_t write_entry = c->write_entry;
 	int err;
 	const char *path_without_prefix;
+	unsigned long size;
+	void *buffer;
+	enum object_type type;
 
 	args->convert = 0;
 	strbuf_reset(&path);
@@ -162,7 +168,7 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
 	if (S_ISDIR(mode) || S_ISGITLINK(mode)) {
 		if (args->verbose)
 			fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
-		err = write_entry(args, oid, path.buf, path.len, mode);
+		err = write_entry(args, oid, path.buf, path.len, mode, NULL, 0);
 		if (err)
 			return err;
 		return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
@@ -170,12 +176,24 @@ static int write_archive_entry(const struct object_id *oid, const char *base,
 
 	if (args->verbose)
 		fprintf(stderr, "%.*s\n", (int)path.len, path.buf);
-	return write_entry(args, oid, path.buf, path.len, mode);
+
+	/* Stream it? */
+	if (S_ISREG(mode) && !args->convert &&
+	    oid_object_info(args->repo, oid, &size) == OBJ_BLOB &&
+	    size > big_file_threshold)
+		return write_entry(args, oid, path.buf, path.len, mode, NULL, size);
+
+	buffer = object_file_to_archive(args, path.buf, oid, mode, &type, &size);
+	if (!buffer)
+		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,
 		struct strbuf *base, const char *filename,
-		unsigned mode, int stage, struct archiver_context *c)
+		unsigned mode, struct archiver_context *c)
 {
 	struct directory *d;
 	size_t len = st_add4(base->len, 1, strlen(filename), 1);
@@ -183,10 +201,9 @@ static void queue_directory(const unsigned char *sha1,
 	d->up	   = c->bottom;
 	d->baselen = base->len;
 	d->mode	   = mode;
-	d->stage   = stage;
 	c->bottom  = d;
 	d->len = xsnprintf(d->path, len, "%.*s%s/", (int)base->len, base->buf, filename);
-	hashcpy(d->oid.hash, sha1);
+	oidread(&d->oid, sha1);
 }
 
 static int write_directory(struct archiver_context *c)
@@ -202,14 +219,14 @@ static int write_directory(struct archiver_context *c)
 		write_directory(c) ||
 		write_archive_entry(&d->oid, d->path, d->baselen,
 				    d->path + d->baselen, d->mode,
-				    d->stage, c) != READ_TREE_RECURSIVE;
+				    c) != READ_TREE_RECURSIVE;
 	free(d);
 	return ret ? -1 : 0;
 }
 
 static int queue_or_write_archive_entry(const struct object_id *oid,
 		struct strbuf *base, const char *filename,
-		unsigned mode, int stage, void *context)
+		unsigned mode, void *context)
 {
 	struct archiver_context *c = context;
 
@@ -234,16 +251,21 @@ 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, stage, c);
+				mode, c);
 		return READ_TREE_RECURSIVE;
 	}
 
 	if (write_directory(c))
 		return -1;
 	return write_archive_entry(oid, base->buf, base->len, filename, mode,
-				   stage, context);
+				   context);
 }
 
+struct extra_file_info {
+	char *base;
+	struct stat stat;
+};
+
 int write_archive_entries(struct archiver_args *args,
 		write_archive_entry_fn_t write_entry)
 {
@@ -251,6 +273,12 @@ int write_archive_entries(struct archiver_args *args,
 	struct unpack_trees_options opts;
 	struct tree_desc t;
 	int err;
+	struct strbuf path_in_archive = STRBUF_INIT;
+	struct strbuf content = STRBUF_INIT;
+	struct object_id fake_oid;
+	int i;
+
+	oidcpy(&fake_oid, null_oid());
 
 	if (args->baselen > 0 && args->base[args->baselen - 1] == '/') {
 		size_t len = args->baselen;
@@ -260,7 +288,7 @@ int write_archive_entries(struct archiver_args *args,
 		if (args->verbose)
 			fprintf(stderr, "%.*s\n", (int)len, args->base);
 		err = write_entry(args, &args->tree->object.oid, args->base,
-				  len, 040777);
+				  len, 040777, NULL, 0);
 		if (err)
 			return err;
 	}
@@ -285,10 +313,10 @@ int write_archive_entries(struct archiver_args *args,
 		git_attr_set_direction(GIT_ATTR_INDEX);
 	}
 
-	err = read_tree_recursive(args->repo, args->tree, "",
-				  0, 0, &args->pathspec,
-				  queue_or_write_archive_entry,
-				  &context);
+	err = read_tree(args->repo, args->tree,
+			&args->pathspec,
+			queue_or_write_archive_entry,
+			&context);
 	if (err == READ_TREE_RECURSIVE)
 		err = 0;
 	while (context.bottom) {
@@ -296,6 +324,33 @@ int write_archive_entries(struct archiver_args *args,
 		free(context.bottom);
 		context.bottom = next;
 	}
+
+	for (i = 0; i < args->extra_files.nr; i++) {
+		struct string_list_item *item = args->extra_files.items + i;
+		char *path = item->string;
+		struct extra_file_info *info = item->util;
+
+		put_be64(fake_oid.hash, i + 1);
+
+		strbuf_reset(&path_in_archive);
+		if (info->base)
+			strbuf_addstr(&path_in_archive, info->base);
+		strbuf_addstr(&path_in_archive, basename(path));
+
+		strbuf_reset(&content);
+		if (strbuf_read_file(&content, path, info->stat.st_size) < 0)
+			err = error_errno(_("could not read '%s'"), path);
+		else
+			err = write_entry(args, &fake_oid, path_in_archive.buf,
+					  path_in_archive.len,
+					  info->stat.st_mode,
+					  content.buf, content.len);
+		if (err)
+			break;
+	}
+	strbuf_release(&path_in_archive);
+	strbuf_release(&content);
+
 	return err;
 }
 
@@ -320,7 +375,7 @@ struct path_exists_context {
 
 static int reject_entry(const struct object_id *oid, struct strbuf *base,
 			const char *filename, unsigned mode,
-			int stage, void *context)
+			void *context)
 {
 	int ret = -1;
 	struct path_exists_context *ctx = context;
@@ -347,9 +402,9 @@ static int path_exists(struct archiver_args *args, const char *path)
 	ctx.args = args;
 	parse_pathspec(&ctx.pathspec, 0, 0, "", paths);
 	ctx.pathspec.recursive = 1;
-	ret = read_tree_recursive(args->repo, args->tree, "",
-				  0, 0, &ctx.pathspec,
-				  reject_entry, &ctx);
+	ret = read_tree(args->repo, args->tree,
+			&ctx.pathspec,
+			reject_entry, &ctx);
 	clear_pathspec(&ctx.pathspec);
 	return ret != 0;
 }
@@ -385,16 +440,17 @@ static void parse_treeish_arg(const char **argv,
 	struct tree *tree;
 	const struct commit *commit;
 	struct object_id oid;
+	char *ref = NULL;
 
 	/* Remotes are only allowed to fetch actual refs */
 	if (remote && !remote_allow_unreachable) {
-		char *ref = NULL;
 		const char *colon = strchrnul(name, ':');
 		int refnamelen = colon - name;
 
-		if (!dwim_ref(name, refnamelen, &oid, &ref))
+		if (!dwim_ref(name, refnamelen, &oid, &ref, 0))
 			die(_("no such ref: %.*s"), refnamelen, name);
-		free(ref);
+	} else {
+		dwim_ref(name, strlen(name), &oid, &ref, 0);
 	}
 
 	if (get_oid(name, &oid))
@@ -427,16 +483,55 @@ static void parse_treeish_arg(const char **argv,
 
 		tree = parse_tree_indirect(&tree_oid);
 	}
+	ar_args->refname = ref;
 	ar_args->tree = tree;
 	ar_args->commit_oid = commit_oid;
 	ar_args->commit = commit;
 	ar_args->time = archive_time;
 }
 
-#define OPT__COMPR(s, v, h, p) \
-	OPT_SET_INT_F(s, NULL, v, h, p, PARSE_OPT_NONEG)
-#define OPT__COMPR_HIDDEN(s, v, p) \
-	OPT_SET_INT_F(s, NULL, v, "", p, PARSE_OPT_NONEG | PARSE_OPT_HIDDEN)
+static void extra_file_info_clear(void *util, const char *str)
+{
+	struct extra_file_info *info = util;
+	free(info->base);
+	free(info);
+}
+
+static int add_file_cb(const struct option *opt, const char *arg, int unset)
+{
+	struct archiver_args *args = opt->value;
+	const char **basep = (const char **)opt->defval;
+	const char *base = *basep;
+	char *path;
+	struct string_list_item *item;
+	struct extra_file_info *info;
+
+	if (unset) {
+		string_list_clear_func(&args->extra_files,
+				       extra_file_info_clear);
+		return 0;
+	}
+
+	if (!arg)
+		return -1;
+
+	path = prefix_filename(args->prefix, arg);
+	item = string_list_append_nodup(&args->extra_files, path);
+	item->util = info = xmalloc(sizeof(*info));
+	info->base = xstrdup_or_null(base);
+	if (stat(path, &info->stat))
+		die(_("File not found: %s"), path);
+	if (!S_ISREG(info->stat.st_mode))
+		die(_("Not a regular file: %s"), path);
+	return 0;
+}
+
+static int number_callback(const struct option *opt, const char *arg, int unset)
+{
+	BUG_ON_OPT_NEG(unset);
+	*(int *)opt->value = strtol(arg, NULL, 10);
+	return 0;
+}
 
 static int parse_archive_args(int argc, const char **argv,
 		const struct archiver **ar, struct archiver_args *args,
@@ -457,21 +552,16 @@ static int parse_archive_args(int argc, const char **argv,
 		OPT_STRING(0, "format", &format, N_("fmt"), N_("archive format")),
 		OPT_STRING(0, "prefix", &base, N_("prefix"),
 			N_("prepend prefix to each pathname in the archive")),
+		{ OPTION_CALLBACK, 0, "add-file", args, N_("file"),
+		  N_("add untracked file to archive"), 0, add_file_cb,
+		  (intptr_t)&base },
 		OPT_STRING('o', "output", &output, N_("file"),
 			N_("write the archive to this file")),
 		OPT_BOOL(0, "worktree-attributes", &worktree_attributes,
 			N_("read .gitattributes in working directory")),
 		OPT__VERBOSE(&verbose, N_("report archived files on stderr")),
-		OPT__COMPR('0', &compression_level, N_("store only"), 0),
-		OPT__COMPR('1', &compression_level, N_("compress faster"), 1),
-		OPT__COMPR_HIDDEN('2', &compression_level, 2),
-		OPT__COMPR_HIDDEN('3', &compression_level, 3),
-		OPT__COMPR_HIDDEN('4', &compression_level, 4),
-		OPT__COMPR_HIDDEN('5', &compression_level, 5),
-		OPT__COMPR_HIDDEN('6', &compression_level, 6),
-		OPT__COMPR_HIDDEN('7', &compression_level, 7),
-		OPT__COMPR_HIDDEN('8', &compression_level, 8),
-		OPT__COMPR('9', &compression_level, N_("compress better"), 9),
+		OPT_NUMBER_CALLBACK(&compression_level,
+			N_("set compression level"), number_callback),
 		OPT_GROUP(""),
 		OPT_BOOL('l', "list", &list,
 			N_("list supported archive formats")),
@@ -491,6 +581,8 @@ static int parse_archive_args(int argc, const char **argv,
 		die(_("Option --exec can only be used together with --remote"));
 	if (output)
 		die(_("Unexpected option --output"));
+	if (is_remote && args->extra_files.nr)
+		die(_("Options --add-file and --remote cannot be used together"));
 
 	if (!base)
 		base = "";
@@ -516,7 +608,9 @@ static int parse_archive_args(int argc, const char **argv,
 
 	args->compression_level = Z_DEFAULT_COMPRESSION;
 	if (compression_level != -1) {
-		if ((*ar)->flags & ARCHIVER_WANT_COMPRESSION_LEVELS)
+		int levels_ok = (*ar)->flags & ARCHIVER_WANT_COMPRESSION_LEVELS;
+		int high_ok = (*ar)->flags & ARCHIVER_HIGH_COMPRESSION_LEVELS;
+		if (levels_ok && (compression_level <= 9 || high_ok))
 			args->compression_level = compression_level;
 		else {
 			die(_("Argument not supported for format '%s': -%d"),
@@ -536,12 +630,22 @@ int write_archive(int argc, const char **argv, const char *prefix,
 		  const char *name_hint, int remote)
 {
 	const struct archiver *ar = NULL;
+	struct pretty_print_describe_status describe_status = {0};
+	struct pretty_print_context ctx = {0};
 	struct archiver_args args;
+	int rc;
 
 	git_config_get_bool("uploadarchive.allowunreachable", &remote_allow_unreachable);
 	git_config(git_default_config, NULL);
 
+	describe_status.max_invocations = 1;
+	ctx.date_mode.type = DATE_NORMAL;
+	ctx.abbrev = DEFAULT_ABBREV;
+	ctx.describe_status = &describe_status;
+	args.pretty_ctx = &ctx;
 	args.repo = repo;
+	args.prefix = prefix;
+	string_list_init_dup(&args.extra_files);
 	argc = parse_archive_args(argc, argv, &ar, &args, name_hint, remote);
 	if (!startup_info->have_repository) {
 		/*
@@ -555,7 +659,12 @@ int write_archive(int argc, const char **argv, const char *prefix,
 	parse_treeish_arg(argv, &args, prefix, remote);
 	parse_pathspec_arg(argv + 1, &args);
 
-	return ar->write_archive(ar, &args);
+	rc = ar->write_archive(ar, &args);
+
+	string_list_clear_func(&args.extra_files, extra_file_info_clear);
+	free(args.refname);
+
+	return rc;
 }
 
 static int match_extension(const char *filename, const char *ext)
diff --git a/archive.h b/archive.h
index e60e3dd31c..49fab71aaf 100644
--- a/archive.h
+++ b/archive.h
@@ -5,9 +5,12 @@
 #include "pathspec.h"
 
 struct repository;
+struct pretty_print_context;
 
 struct archiver_args {
 	struct repository *repo;
+	char *refname;
+	const char *prefix;
 	const char *base;
 	size_t baselen;
 	struct tree *tree;
@@ -19,6 +22,8 @@ struct archiver_args {
 	unsigned int worktree_attributes : 1;
 	unsigned int convert : 1;
 	int compression_level;
+	struct string_list extra_files;
+	struct pretty_print_context *pretty_ctx;
 };
 
 /* main api */
@@ -33,6 +38,7 @@ const char *archive_format_from_filename(const char *filename);
 
 #define ARCHIVER_WANT_COMPRESSION_LEVELS 1
 #define ARCHIVER_REMOTE 2
+#define ARCHIVER_HIGH_COMPRESSION_LEVELS 4
 struct archiver {
 	const char *name;
 	int (*write_archive)(const struct archiver *, struct archiver_args *);
@@ -48,12 +54,9 @@ void init_archivers(void);
 typedef int (*write_archive_entry_fn_t)(struct archiver_args *args,
 					const struct object_id *oid,
 					const char *path, size_t pathlen,
-					unsigned int mode);
+					unsigned int mode,
+					void *buffer, unsigned long size);
 
 int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
-void *object_file_to_archive(const struct archiver_args *args,
-			     const char *path, const struct object_id *oid,
-			     unsigned int mode, enum object_type *type,
-			     unsigned long *sizep);
 
 #endif	/* ARCHIVE_H */
diff --git a/argv-array.c b/argv-array.c
deleted file mode 100644
index f352ea9357..0000000000
--- a/argv-array.c
+++ /dev/null
@@ -1,109 +0,0 @@
-#include "cache.h"
-#include "argv-array.h"
-#include "strbuf.h"
-
-const char *empty_argv[] = { NULL };
-
-void argv_array_init(struct argv_array *array)
-{
-	array->argv = empty_argv;
-	array->argc = 0;
-	array->alloc = 0;
-}
-
-static void argv_array_push_nodup(struct argv_array *array, const char *value)
-{
-	if (array->argv == empty_argv)
-		array->argv = NULL;
-
-	ALLOC_GROW(array->argv, array->argc + 2, array->alloc);
-	array->argv[array->argc++] = value;
-	array->argv[array->argc] = NULL;
-}
-
-const char *argv_array_push(struct argv_array *array, const char *value)
-{
-	argv_array_push_nodup(array, xstrdup(value));
-	return array->argv[array->argc - 1];
-}
-
-const char *argv_array_pushf(struct argv_array *array, const char *fmt, ...)
-{
-	va_list ap;
-	struct strbuf v = STRBUF_INIT;
-
-	va_start(ap, fmt);
-	strbuf_vaddf(&v, fmt, ap);
-	va_end(ap);
-
-	argv_array_push_nodup(array, strbuf_detach(&v, NULL));
-	return array->argv[array->argc - 1];
-}
-
-void argv_array_pushl(struct argv_array *array, ...)
-{
-	va_list ap;
-	const char *arg;
-
-	va_start(ap, array);
-	while((arg = va_arg(ap, const char *)))
-		argv_array_push(array, arg);
-	va_end(ap);
-}
-
-void argv_array_pushv(struct argv_array *array, const char **argv)
-{
-	for (; *argv; argv++)
-		argv_array_push(array, *argv);
-}
-
-void argv_array_pop(struct argv_array *array)
-{
-	if (!array->argc)
-		return;
-	free((char *)array->argv[array->argc - 1]);
-	array->argv[array->argc - 1] = NULL;
-	array->argc--;
-}
-
-void argv_array_split(struct argv_array *array, const char *to_split)
-{
-	while (isspace(*to_split))
-		to_split++;
-	for (;;) {
-		const char *p = to_split;
-
-		if (!*p)
-			break;
-
-		while (*p && !isspace(*p))
-			p++;
-		argv_array_push_nodup(array, xstrndup(to_split, p - to_split));
-
-		while (isspace(*p))
-			p++;
-		to_split = p;
-	}
-}
-
-void argv_array_clear(struct argv_array *array)
-{
-	if (array->argv != empty_argv) {
-		int i;
-		for (i = 0; i < array->argc; i++)
-			free((char *)array->argv[i]);
-		free(array->argv);
-	}
-	argv_array_init(array);
-}
-
-const char **argv_array_detach(struct argv_array *array)
-{
-	if (array->argv == empty_argv)
-		return xcalloc(1, sizeof(const char *));
-	else {
-		const char **ret = array->argv;
-		argv_array_init(array);
-		return ret;
-	}
-}
diff --git a/argv-array.h b/argv-array.h
deleted file mode 100644
index a39ba43f57..0000000000
--- a/argv-array.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef ARGV_ARRAY_H
-#define ARGV_ARRAY_H
-
-extern const char *empty_argv[];
-
-struct argv_array {
-	const char **argv;
-	int argc;
-	int alloc;
-};
-
-#define ARGV_ARRAY_INIT { empty_argv, 0, 0 }
-
-void argv_array_init(struct argv_array *);
-const char *argv_array_push(struct argv_array *, const char *);
-__attribute__((format (printf,2,3)))
-const char *argv_array_pushf(struct argv_array *, const char *fmt, ...);
-LAST_ARG_MUST_BE_NULL
-void argv_array_pushl(struct argv_array *, ...);
-void argv_array_pushv(struct argv_array *, const char **);
-void argv_array_pop(struct argv_array *);
-/* Splits by whitespace; does not handle quoted arguments! */
-void argv_array_split(struct argv_array *, const char *);
-void argv_array_clear(struct argv_array *);
-const char **argv_array_detach(struct argv_array *);
-
-#endif /* ARGV_ARRAY_H */
diff --git a/attr.c b/attr.c
index 11f19b541c..d029e681f2 100644
--- a/attr.c
+++ b/attr.c
@@ -1,7 +1,6 @@
 /*
  * Handle git attributes.  See gitattributes(5) for a description of
- * the file syntax, and Documentation/technical/api-gitattributes.txt
- * for a description of the API.
+ * the file syntax, and attr.h for a description of the API.
  *
  * One basic design decision here is that we are not going to support
  * an insanely large number of attributes.
@@ -53,13 +52,6 @@ static inline void hashmap_unlock(struct attr_hashmap *map)
 	pthread_mutex_unlock(&map->mutex);
 }
 
-/*
- * The global dictionary of all interned attributes.  This
- * is a singleton object which is shared between threads.
- * Access to this dictionary must be surrounded with a mutex.
- */
-static struct attr_hashmap g_attr_hashmap;
-
 /* The container for objects stored in "struct attr_hashmap" */
 struct attr_hash_entry {
 	struct hashmap_entry ent;
@@ -81,11 +73,14 @@ static int attr_hash_entry_cmp(const void *unused_cmp_data,
 	return (a->keylen != b->keylen) || strncmp(a->key, b->key, a->keylen);
 }
 
-/* Initialize an 'attr_hashmap' object */
-static void attr_hashmap_init(struct attr_hashmap *map)
-{
-	hashmap_init(&map->map, attr_hash_entry_cmp, NULL, 0);
-}
+/*
+ * The global dictionary of all interned attributes.  This
+ * is a singleton object which is shared between threads.
+ * Access to this dictionary must be surrounded with a mutex.
+ */
+static struct attr_hashmap g_attr_hashmap = {
+	HASHMAP_INIT(attr_hash_entry_cmp, NULL)
+};
 
 /*
  * Retrieve the 'value' stored in a hashmap given the provided 'key'.
@@ -97,9 +92,6 @@ static void *attr_hashmap_get(struct attr_hashmap *map,
 	struct attr_hash_entry k;
 	struct attr_hash_entry *e;
 
-	if (!map->map.tablesize)
-		attr_hashmap_init(map);
-
 	hashmap_entry_init(&k.ent, memhash(key, keylen));
 	k.key = key;
 	k.keylen = keylen;
@@ -115,9 +107,6 @@ static void attr_hashmap_add(struct attr_hashmap *map,
 {
 	struct attr_hash_entry *e;
 
-	if (!map->map.tablesize)
-		attr_hashmap_init(map);
-
 	e = xmalloc(sizeof(struct attr_hash_entry));
 	hashmap_entry_init(&e->ent, memhash(key, keylen));
 	e->key = key;
@@ -289,6 +278,10 @@ struct match_attr {
 
 static const char blank[] = " \t\r\n";
 
+/* Flags usable in read_attr() and parse_attr_line() family of functions. */
+#define READ_ATTR_MACRO_OK (1<<0)
+#define READ_ATTR_NOFOLLOW (1<<1)
+
 /*
  * Parse a whitespace-delimited attribute state (i.e., "attr",
  * "-attr", "!attr", or "attr=value") from the string starting at src.
@@ -342,7 +335,7 @@ static const char *parse_attr(const char *src, int lineno, const char *cp,
 }
 
 static struct match_attr *parse_attr_line(const char *line, const char *src,
-					  int lineno, int macro_ok)
+					  int lineno, unsigned flags)
 {
 	int namelen;
 	int num_attr, i;
@@ -366,7 +359,7 @@ static struct match_attr *parse_attr_line(const char *line, const char *src,
 
 	if (strlen(ATTRIBUTE_MACRO_PREFIX) < namelen &&
 	    starts_with(name, ATTRIBUTE_MACRO_PREFIX)) {
-		if (!macro_ok) {
+		if (!(flags & READ_ATTR_MACRO_OK)) {
 			fprintf_ln(stderr, _("%s not allowed: %s:%d"),
 				   name, src, lineno);
 			goto fail_return;
@@ -580,7 +573,7 @@ struct attr_check *attr_check_initl(const char *one, ...)
 	check = attr_check_alloc();
 	check->nr = cnt;
 	check->alloc = cnt;
-	check->items = xcalloc(cnt, sizeof(struct attr_check_item));
+	CALLOC_ARRAY(check->items, cnt);
 
 	check->items[0].attr = git_attr(one);
 	va_start(params, one);
@@ -664,11 +657,11 @@ static void handle_attr_line(struct attr_stack *res,
 			     const char *line,
 			     const char *src,
 			     int lineno,
-			     int macro_ok)
+			     unsigned flags)
 {
 	struct match_attr *a;
 
-	a = parse_attr_line(line, src, lineno, macro_ok);
+	a = parse_attr_line(line, src, lineno, flags);
 	if (!a)
 		return;
 	ALLOC_GROW(res->attrs, res->num_matches + 1, res->alloc);
@@ -681,9 +674,10 @@ static struct attr_stack *read_attr_from_array(const char **list)
 	const char *line;
 	int lineno = 0;
 
-	res = xcalloc(1, sizeof(*res));
+	CALLOC_ARRAY(res, 1);
 	while ((line = *(list++)) != NULL)
-		handle_attr_line(res, line, "[builtin]", ++lineno, 1);
+		handle_attr_line(res, line, "[builtin]", ++lineno,
+				 READ_ATTR_MACRO_OK);
 	return res;
 }
 
@@ -691,7 +685,7 @@ static struct attr_stack *read_attr_from_array(const char **list)
  * Callers into the attribute system assume there is a single, system-wide
  * global state where attributes are read from and when the state is flipped by
  * calling git_attr_set_direction(), the stack frames that have been
- * constructed need to be discarded so so that subsequent calls into the
+ * constructed need to be discarded so that subsequent calls into the
  * attribute system will lazily read from the right place.  Since changing
  * direction causes a global paradigm shift, it should not ever be called while
  * another thread could potentially be calling into the attribute system.
@@ -709,29 +703,39 @@ void git_attr_set_direction(enum git_attr_direction new_direction)
 	direction = new_direction;
 }
 
-static struct attr_stack *read_attr_from_file(const char *path, int macro_ok)
+static struct attr_stack *read_attr_from_file(const char *path, unsigned flags)
 {
-	FILE *fp = fopen_or_warn(path, "r");
+	int fd;
+	FILE *fp;
 	struct attr_stack *res;
 	char buf[2048];
 	int lineno = 0;
 
-	if (!fp)
+	if (flags & READ_ATTR_NOFOLLOW)
+		fd = open_nofollow(path, O_RDONLY);
+	else
+		fd = open(path, O_RDONLY);
+
+	if (fd < 0) {
+		warn_on_fopen_errors(path);
 		return NULL;
-	res = xcalloc(1, sizeof(*res));
+	}
+	fp = xfdopen(fd, "r");
+
+	CALLOC_ARRAY(res, 1);
 	while (fgets(buf, sizeof(buf), fp)) {
 		char *bufp = buf;
 		if (!lineno)
 			skip_utf8_bom(&bufp, strlen(bufp));
-		handle_attr_line(res, bufp, path, ++lineno, macro_ok);
+		handle_attr_line(res, bufp, path, ++lineno, flags);
 	}
 	fclose(fp);
 	return res;
 }
 
-static struct attr_stack *read_attr_from_index(const struct index_state *istate,
+static struct attr_stack *read_attr_from_index(struct index_state *istate,
 					       const char *path,
-					       int macro_ok)
+					       unsigned flags)
 {
 	struct attr_stack *res;
 	char *buf, *sp;
@@ -744,7 +748,7 @@ static struct attr_stack *read_attr_from_index(const struct index_state *istate,
 	if (!buf)
 		return NULL;
 
-	res = xcalloc(1, sizeof(*res));
+	CALLOC_ARRAY(res, 1);
 	for (sp = buf; *sp; ) {
 		char *ep;
 		int more;
@@ -752,27 +756,27 @@ static struct attr_stack *read_attr_from_index(const struct index_state *istate,
 		ep = strchrnul(sp, '\n');
 		more = (*ep == '\n');
 		*ep = '\0';
-		handle_attr_line(res, sp, path, ++lineno, macro_ok);
+		handle_attr_line(res, sp, path, ++lineno, flags);
 		sp = ep + more;
 	}
 	free(buf);
 	return res;
 }
 
-static struct attr_stack *read_attr(const struct index_state *istate,
-				    const char *path, int macro_ok)
+static struct attr_stack *read_attr(struct index_state *istate,
+				    const char *path, unsigned flags)
 {
 	struct attr_stack *res = NULL;
 
 	if (direction == GIT_ATTR_INDEX) {
-		res = read_attr_from_index(istate, path, macro_ok);
+		res = read_attr_from_index(istate, path, flags);
 	} else if (!is_bare_repository()) {
 		if (direction == GIT_ATTR_CHECKOUT) {
-			res = read_attr_from_index(istate, path, macro_ok);
+			res = read_attr_from_index(istate, path, flags);
 			if (!res)
-				res = read_attr_from_file(path, macro_ok);
+				res = read_attr_from_file(path, flags);
 		} else if (direction == GIT_ATTR_CHECKIN) {
-			res = read_attr_from_file(path, macro_ok);
+			res = read_attr_from_file(path, flags);
 			if (!res)
 				/*
 				 * There is no checked out .gitattributes file
@@ -780,12 +784,12 @@ static struct attr_stack *read_attr(const struct index_state *istate,
 				 * We allow operation in a sparsely checked out
 				 * work tree, so read from it.
 				 */
-				res = read_attr_from_index(istate, path, macro_ok);
+				res = read_attr_from_index(istate, path, flags);
 		}
 	}
 
 	if (!res)
-		res = xcalloc(1, sizeof(*res));
+		CALLOC_ARRAY(res, 1);
 	return res;
 }
 
@@ -851,10 +855,11 @@ static void push_stack(struct attr_stack **attr_stack_p,
 	}
 }
 
-static void bootstrap_attr_stack(const struct index_state *istate,
+static void bootstrap_attr_stack(struct index_state *istate,
 				 struct attr_stack **stack)
 {
 	struct attr_stack *e;
+	unsigned flags = READ_ATTR_MACRO_OK;
 
 	if (*stack)
 		return;
@@ -865,31 +870,31 @@ static void bootstrap_attr_stack(const struct index_state *istate,
 
 	/* system-wide frame */
 	if (git_attr_system()) {
-		e = read_attr_from_file(git_etc_gitattributes(), 1);
+		e = read_attr_from_file(git_etc_gitattributes(), flags);
 		push_stack(stack, e, NULL, 0);
 	}
 
 	/* home directory */
 	if (get_home_gitattributes()) {
-		e = read_attr_from_file(get_home_gitattributes(), 1);
+		e = read_attr_from_file(get_home_gitattributes(), flags);
 		push_stack(stack, e, NULL, 0);
 	}
 
 	/* root directory */
-	e = read_attr(istate, GITATTRIBUTES_FILE, 1);
+	e = read_attr(istate, GITATTRIBUTES_FILE, flags | READ_ATTR_NOFOLLOW);
 	push_stack(stack, e, xstrdup(""), 0);
 
 	/* info frame */
 	if (startup_info->have_repository)
-		e = read_attr_from_file(git_path_info_attributes(), 1);
+		e = read_attr_from_file(git_path_info_attributes(), flags);
 	else
 		e = NULL;
 	if (!e)
-		e = xcalloc(1, sizeof(struct attr_stack));
+		CALLOC_ARRAY(e, 1);
 	push_stack(stack, e, NULL, 0);
 }
 
-static void prepare_attr_stack(const struct index_state *istate,
+static void prepare_attr_stack(struct index_state *istate,
 			       const char *path, int dirlen,
 			       struct attr_stack **stack)
 {
@@ -967,7 +972,7 @@ static void prepare_attr_stack(const struct index_state *istate,
 		strbuf_add(&pathbuf, path + pathbuf.len, (len - pathbuf.len));
 		strbuf_addf(&pathbuf, "/%s", GITATTRIBUTES_FILE);
 
-		next = read_attr(istate, pathbuf.buf, 0);
+		next = read_attr(istate, pathbuf.buf, READ_ATTR_NOFOLLOW);
 
 		/* reset the pathbuf to not include "/.gitattributes" */
 		strbuf_setlen(&pathbuf, len);
@@ -1089,7 +1094,7 @@ static void determine_macros(struct all_attrs_item *all_attrs,
  * If check->check_nr is non-zero, only attributes in check[] are collected.
  * Otherwise all attributes are collected.
  */
-static void collect_some_attrs(const struct index_state *istate,
+static void collect_some_attrs(struct index_state *istate,
 			       const char *path,
 			       struct attr_check *check)
 {
@@ -1118,7 +1123,7 @@ static void collect_some_attrs(const struct index_state *istate,
 	fill(path, pathlen, basename_offset, check->stack, check->all_attrs, rem);
 }
 
-void git_check_attr(const struct index_state *istate,
+void git_check_attr(struct index_state *istate,
 		    const char *path,
 		    struct attr_check *check)
 {
@@ -1135,7 +1140,7 @@ void git_check_attr(const struct index_state *istate,
 	}
 }
 
-void git_all_attrs(const struct index_state *istate,
+void git_all_attrs(struct index_state *istate,
 		   const char *path, struct attr_check *check)
 {
 	int i;
diff --git a/attr.h b/attr.h
index b0378bfe5f..3732505eda 100644
--- a/attr.h
+++ b/attr.h
@@ -1,9 +1,121 @@
 #ifndef ATTR_H
 #define ATTR_H
 
+/**
+ * gitattributes mechanism gives a uniform way to associate various attributes
+ * to set of paths.
+ *
+ *
+ * Querying Specific Attributes
+ * ----------------------------
+ *
+ * - Prepare `struct attr_check` using attr_check_initl() function, enumerating
+ *   the names of attributes whose values you are interested in, terminated with
+ *   a NULL pointer.  Alternatively, an empty `struct attr_check` can be
+ *   prepared by calling `attr_check_alloc()` function and then attributes you
+ *   want to ask about can be added to it with `attr_check_append()` function.
+ *
+ * - Call `git_check_attr()` to check the attributes for the path.
+ *
+ * - Inspect `attr_check` structure to see how each of the attribute in the
+ *   array is defined for the path.
+ *
+ *
+ * Example
+ * -------
+ *
+ * To see how attributes "crlf" and "ident" are set for different paths.
+ *
+ * - Prepare a `struct attr_check` with two elements (because we are checking
+ *   two attributes):
+ *
+ * ------------
+ * static struct attr_check *check;
+ * static void setup_check(void)
+ * {
+ * 	if (check)
+ * 		return; // already done
+ * check = attr_check_initl("crlf", "ident", NULL);
+ * }
+ * ------------
+ *
+ * - Call `git_check_attr()` with the prepared `struct attr_check`:
+ *
+ * ------------
+ * const char *path;
+ *
+ * setup_check();
+ * git_check_attr(path, check);
+ * ------------
+ *
+ * - Act on `.value` member of the result, left in `check->items[]`:
+ *
+ * ------------
+ * const char *value = check->items[0].value;
+ *
+ * if (ATTR_TRUE(value)) {
+ * The attribute is Set, by listing only the name of the
+ * attribute in the gitattributes file for the path.
+ * } else if (ATTR_FALSE(value)) {
+ * The attribute is Unset, by listing the name of the
+ *         attribute prefixed with a dash - for the path.
+ * } else if (ATTR_UNSET(value)) {
+ * The attribute is neither set nor unset for the path.
+ * } else if (!strcmp(value, "input")) {
+ * If none of ATTR_TRUE(), ATTR_FALSE(), or ATTR_UNSET() is
+ *         true, the value is a string set in the gitattributes
+ * file for the path by saying "attr=value".
+ * } else if (... other check using value as string ...) {
+ * ...
+ * }
+ * ------------
+ *
+ * To see how attributes in argv[] are set for different paths, only
+ * the first step in the above would be different.
+ *
+ * ------------
+ * static struct attr_check *check;
+ * static void setup_check(const char **argv)
+ * {
+ *     check = attr_check_alloc();
+ *     while (*argv) {
+ *         struct git_attr *attr = git_attr(*argv);
+ *         attr_check_append(check, attr);
+ *         argv++;
+ *     }
+ * }
+ * ------------
+ *
+ *
+ * Querying All Attributes
+ * -----------------------
+ *
+ * To get the values of all attributes associated with a file:
+ *
+ * - Prepare an empty `attr_check` structure by calling `attr_check_alloc()`.
+ *
+ * - Call `git_all_attrs()`, which populates the `attr_check` with the
+ * attributes attached to the path.
+ *
+ * - Iterate over the `attr_check.items[]` array to examine the attribute
+ * names and values. The name of the attribute described by an
+ * `attr_check.items[]` object can be retrieved via
+ * `git_attr_name(check->items[i].attr)`. (Please note that no items will be
+ * returned for unset attributes, so `ATTR_UNSET()` will return false for all
+ * returned `attr_check.items[]` objects.)
+ *
+ * - Free the `attr_check` struct by calling `attr_check_free()`.
+ */
+
 struct index_state;
 
-/* An attribute is a pointer to this opaque structure */
+/**
+ * An attribute is an opaque object that is identified by its name. Pass the
+ * name to `git_attr()` function to obtain the object of this type.
+ * The internal representation of this structure is of no interest to the
+ * calling programs. The name of the attribute can be retrieved by calling
+ * `git_attr_name()`.
+ */
 struct git_attr;
 
 /* opaque structures used internally for attribute collection */
@@ -21,21 +133,36 @@ const struct git_attr *git_attr(const char *);
 extern const char git_attr__true[];
 extern const char git_attr__false[];
 
-/* For public to check git_attr_check results */
+/**
+ * Attribute Values
+ * ----------------
+ *
+ * An attribute for a path can be in one of four states: Set, Unset, Unspecified
+ * or set to a string, and `.value` member of `struct attr_check_item` records
+ * it. The three macros check these, if none of them returns true, `.value`
+ * member points at a string value of the attribute for the path.
+ */
+
+/* Returns true if the attribute is Set for the path. */
 #define ATTR_TRUE(v) ((v) == git_attr__true)
+
+/* Returns true if the attribute is Unset for the path. */
 #define ATTR_FALSE(v) ((v) == git_attr__false)
+
+/* Returns true if the attribute is Unspecified for the path. */
 #define ATTR_UNSET(v) ((v) == NULL)
 
-/*
- * Send one or more git_attr_check to git_check_attrs(), and
- * each 'value' member tells what its value is.
- * Unset one is returned as NULL.
- */
+/* This structure represents one attribute and its value. */
 struct attr_check_item {
 	const struct git_attr *attr;
 	const char *value;
 };
 
+/**
+ * This structure represents a collection of `attr_check_item`. It is passed to
+ * `git_check_attr()` function, specifying the attributes to check, and
+ * receives their values.
+ */
 struct attr_check {
 	int nr;
 	int alloc;
@@ -63,14 +190,14 @@ void attr_check_free(struct attr_check *check);
  */
 const char *git_attr_name(const struct git_attr *);
 
-void git_check_attr(const struct index_state *istate,
+void git_check_attr(struct index_state *istate,
 		    const char *path, struct attr_check *check);
 
 /*
  * Retrieve all attributes that apply to the specified path.
  * check holds the attributes and their values.
  */
-void git_all_attrs(const struct index_state *istate,
+void git_all_attrs(struct index_state *istate,
 		   const char *path, struct attr_check *check);
 
 enum git_attr_direction {
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
deleted file mode 100644
index af2a5ea484..0000000000
--- a/azure-pipelines.yml
+++ /dev/null
@@ -1,545 +0,0 @@
-variables:
-  Agent.Source.Git.ShallowFetchDepth: 1
-
-jobs:
-- job: windows_build
-  displayName: Windows Build
-  condition: succeeded()
-  pool: Hosted
-  timeoutInMinutes: 240
-  steps:
-  - powershell: |
-      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
-        net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
-        cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
-      }
-    displayName: 'Mount test-cache'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - powershell: |
-      $urlbase = "https://dev.azure.com/git-for-windows/git/_apis/build/builds"
-      $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=22&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id
-      $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[1].resource.downloadUrl
-      (New-Object Net.WebClient).DownloadFile($downloadUrl,"git-sdk-64-minimal.zip")
-      Expand-Archive git-sdk-64-minimal.zip -DestinationPath . -Force
-      Remove-Item git-sdk-64-minimal.zip
-
-      # Let Git ignore the SDK and the test-cache
-      "/git-sdk-64-minimal/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude"
-    displayName: 'Download git-sdk-64-minimal'
-  - powershell: |
-      & git-sdk-64-minimal\usr\bin\bash.exe -lc @"
-        ci/make-test-artifacts.sh artifacts
-      "@
-      if (!$?) { exit(1) }
-    displayName: Build
-    env:
-      HOME: $(Build.SourcesDirectory)
-      MSYSTEM: MINGW64
-      DEVELOPER: 1
-      NO_PERL: 1
-  - task: PublishPipelineArtifact@0
-    displayName: 'Publish Pipeline Artifact: test artifacts'
-    inputs:
-      artifactName: 'windows-artifacts'
-      targetPath: '$(Build.SourcesDirectory)\artifacts'
-  - task: PublishPipelineArtifact@0
-    displayName: 'Publish Pipeline Artifact: git-sdk-64-minimal'
-    inputs:
-      artifactName: 'git-sdk-64-minimal'
-      targetPath: '$(Build.SourcesDirectory)\git-sdk-64-minimal'
-  - powershell: |
-      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
-        cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
-      }
-    displayName: 'Unmount test-cache'
-    condition: true
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-
-- job: windows_test
-  displayName: Windows Test
-  dependsOn: windows_build
-  condition: succeeded()
-  pool: Hosted
-  timeoutInMinutes: 240
-  strategy:
-    parallel: 10
-  steps:
-  - powershell: |
-      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
-        net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
-        cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
-      }
-    displayName: 'Mount test-cache'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - task: DownloadPipelineArtifact@0
-    displayName: 'Download Pipeline Artifact: test artifacts'
-    inputs:
-      artifactName: 'windows-artifacts'
-      targetPath: '$(Build.SourcesDirectory)'
-  - task: DownloadPipelineArtifact@0
-    displayName: 'Download Pipeline Artifact: git-sdk-64-minimal'
-    inputs:
-      artifactName: 'git-sdk-64-minimal'
-      targetPath: '$(Build.SourcesDirectory)\git-sdk-64-minimal'
-  - powershell: |
-      & git-sdk-64-minimal\usr\bin\bash.exe -lc @"
-        test -f artifacts.tar.gz || {
-          echo No test artifacts found\; skipping >&2
-          exit 0
-        }
-        tar xf artifacts.tar.gz || exit 1
-
-        # Let Git ignore the SDK and the test-cache
-        printf '%s\n' /git-sdk-64-minimal/ /test-cache/ >>.git/info/exclude
-
-        ci/run-test-slice.sh `$SYSTEM_JOBPOSITIONINPHASE `$SYSTEM_TOTALJOBSINPHASE || {
-          ci/print-test-failures.sh
-          exit 1
-        }
-      "@
-      if (!$?) { exit(1) }
-    displayName: 'Test (parallel)'
-    env:
-      HOME: $(Build.SourcesDirectory)
-      MSYSTEM: MINGW64
-      NO_SVN_TESTS: 1
-      GIT_TEST_SKIP_REBASE_P: 1
-  - powershell: |
-      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
-        cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
-      }
-    displayName: 'Unmount test-cache'
-    condition: true
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **/TEST-*.xml'
-    inputs:
-      mergeTestResults: true
-      testRunTitle: 'windows'
-      platform: Windows
-      publishRunAttachments: false
-    condition: succeededOrFailed()
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish trash directories of failed tests'
-    condition: failed()
-    inputs:
-      PathtoPublish: t/failed-test-artifacts
-      ArtifactName: failed-test-artifacts
-
-- job: vs_build
-  displayName: Visual Studio Build
-  condition: succeeded()
-  pool: Hosted VS2017
-  timeoutInMinutes: 240
-  steps:
-  - powershell: |
-      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
-        net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
-        cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
-      }
-    displayName: 'Mount test-cache'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - powershell: |
-      $urlbase = "https://dev.azure.com/git-for-windows/git/_apis/build/builds"
-      $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=22&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id
-      $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[1].resource.downloadUrl
-      (New-Object Net.WebClient).DownloadFile($downloadUrl,"git-sdk-64-minimal.zip")
-      Expand-Archive git-sdk-64-minimal.zip -DestinationPath . -Force
-      Remove-Item git-sdk-64-minimal.zip
-
-      # Let Git ignore the SDK and the test-cache
-      "/git-sdk-64-minimal/`n/test-cache/`n" | Out-File -NoNewLine -Encoding ascii -Append "$(Build.SourcesDirectory)\.git\info\exclude"
-    displayName: 'Download git-sdk-64-minimal'
-  - powershell: |
-      & git-sdk-64-minimal\usr\bin\bash.exe -lc @"
-        make NDEBUG=1 DEVELOPER=1 vcxproj
-      "@
-      if (!$?) { exit(1) }
-    displayName: Generate Visual Studio Solution
-    env:
-      HOME: $(Build.SourcesDirectory)
-      MSYSTEM: MINGW64
-      DEVELOPER: 1
-      NO_PERL: 1
-      GIT_CONFIG_PARAMETERS: "'user.name=CI' 'user.email=ci@git'"
-  - powershell: |
-      $urlbase = "https://dev.azure.com/git/git/_apis/build/builds"
-      $id = ((Invoke-WebRequest -UseBasicParsing "${urlbase}?definitions=9&statusFilter=completed&resultFilter=succeeded&`$top=1").content | ConvertFrom-JSON).value[0].id
-      $downloadUrl = ((Invoke-WebRequest -UseBasicParsing "${urlbase}/$id/artifacts").content | ConvertFrom-JSON).value[0].resource.downloadUrl
-      (New-Object Net.WebClient).DownloadFile($downloadUrl, "compat.zip")
-      Expand-Archive compat.zip -DestinationPath . -Force
-      Remove-Item compat.zip
-    displayName: 'Download vcpkg artifacts'
-  - task: MSBuild@1
-    inputs:
-      solution: git.sln
-      platform: x64
-      configuration: Release
-      maximumCpuCount: 4
-  - powershell: |
-      & compat\vcbuild\vcpkg_copy_dlls.bat release
-      if (!$?) { exit(1) }
-      & git-sdk-64-minimal\usr\bin\bash.exe -lc @"
-        mkdir -p artifacts &&
-        eval \"`$(make -n artifacts-tar INCLUDE_DLLS_IN_ARTIFACTS=YesPlease ARTIFACTS_DIRECTORY=artifacts | grep ^tar)\"
-      "@
-      if (!$?) { exit(1) }
-    displayName: Bundle artifact tar
-    env:
-      HOME: $(Build.SourcesDirectory)
-      MSYSTEM: MINGW64
-      DEVELOPER: 1
-      NO_PERL: 1
-      MSVC: 1
-      VCPKG_ROOT: $(Build.SourcesDirectory)\compat\vcbuild\vcpkg
-  - powershell: |
-      $tag = (Invoke-WebRequest -UseBasicParsing "https://gitforwindows.org/latest-tag.txt").content
-      $version = (Invoke-WebRequest -UseBasicParsing "https://gitforwindows.org/latest-version.txt").content
-      $url = "https://github.com/git-for-windows/git/releases/download/${tag}/PortableGit-${version}-64-bit.7z.exe"
-      (New-Object Net.WebClient).DownloadFile($url,"PortableGit.exe")
-      & .\PortableGit.exe -y -oartifacts\PortableGit
-      # Wait until it is unpacked
-      while (-not @(Remove-Item -ErrorAction SilentlyContinue PortableGit.exe; $?)) { sleep 1 }
-    displayName: Download & extract portable Git
-  - task: PublishPipelineArtifact@0
-    displayName: 'Publish Pipeline Artifact: MSVC test artifacts'
-    inputs:
-      artifactName: 'vs-artifacts'
-      targetPath: '$(Build.SourcesDirectory)\artifacts'
-  - powershell: |
-      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
-        cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
-      }
-    displayName: 'Unmount test-cache'
-    condition: true
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-
-- job: vs_test
-  displayName: Visual Studio Test
-  dependsOn: vs_build
-  condition: succeeded()
-  pool: Hosted
-  timeoutInMinutes: 240
-  strategy:
-    parallel: 10
-  steps:
-  - powershell: |
-      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
-        net use s: \\gitfileshare.file.core.windows.net\test-cache "$GITFILESHAREPWD" /user:AZURE\gitfileshare /persistent:no
-        cmd /c mklink /d "$(Build.SourcesDirectory)\test-cache" S:\
-      }
-    displayName: 'Mount test-cache'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - task: DownloadPipelineArtifact@0
-    displayName: 'Download Pipeline Artifact: VS test artifacts'
-    inputs:
-      artifactName: 'vs-artifacts'
-      targetPath: '$(Build.SourcesDirectory)'
-  - powershell: |
-      & PortableGit\git-cmd.exe --command=usr\bin\bash.exe -lc @"
-        test -f artifacts.tar.gz || {
-          echo No test artifacts found\; skipping >&2
-          exit 0
-        }
-        tar xf artifacts.tar.gz || exit 1
-
-        # Let Git ignore the SDK and the test-cache
-        printf '%s\n' /PortableGit/ /test-cache/ >>.git/info/exclude
-
-        cd t &&
-        PATH=\"`$PWD/helper:`$PATH\" &&
-        test-tool.exe run-command testsuite --jobs=10 -V -x --write-junit-xml \
-                `$(test-tool.exe path-utils slice-tests \
-                        `$SYSTEM_JOBPOSITIONINPHASE `$SYSTEM_TOTALJOBSINPHASE t[0-9]*.sh)
-      "@
-      if (!$?) { exit(1) }
-    displayName: 'Test (parallel)'
-    env:
-      HOME: $(Build.SourcesDirectory)
-      MSYSTEM: MINGW64
-      NO_SVN_TESTS: 1
-      GIT_TEST_SKIP_REBASE_P: 1
-  - powershell: |
-      if ("$GITFILESHAREPWD" -ne "" -and "$GITFILESHAREPWD" -ne "`$`(gitfileshare.pwd)") {
-        cmd /c rmdir "$(Build.SourcesDirectory)\test-cache"
-      }
-    displayName: 'Unmount test-cache'
-    condition: true
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **/TEST-*.xml'
-    inputs:
-      mergeTestResults: true
-      testRunTitle: 'vs'
-      platform: Windows
-      publishRunAttachments: false
-    condition: succeededOrFailed()
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish trash directories of failed tests'
-    condition: failed()
-    inputs:
-      PathtoPublish: t/failed-test-artifacts
-      ArtifactName: failed-vs-test-artifacts
-
-- job: linux_clang
-  displayName: linux-clang
-  condition: succeeded()
-  pool: Hosted Ubuntu 1604
-  steps:
-  - bash: |
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
-
-       sudo apt-get update &&
-       sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev apache2-bin &&
-
-       export CC=clang || exit 1
-
-       ci/install-dependencies.sh || exit 1
-       ci/run-build-and-tests.sh || {
-           ci/print-test-failures.sh
-           exit 1
-       }
-
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1
-    displayName: 'ci/run-build-and-tests.sh'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **/TEST-*.xml'
-    inputs:
-      mergeTestResults: true
-      testRunTitle: 'linux-clang'
-      platform: Linux
-      publishRunAttachments: false
-    condition: succeededOrFailed()
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish trash directories of failed tests'
-    condition: failed()
-    inputs:
-      PathtoPublish: t/failed-test-artifacts
-      ArtifactName: failed-test-artifacts
-
-- job: linux_gcc
-  displayName: linux-gcc
-  condition: succeeded()
-  pool: Hosted Ubuntu 1604
-  steps:
-  - bash: |
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
-
-       sudo add-apt-repository ppa:ubuntu-toolchain-r/test &&
-       sudo apt-get update &&
-       sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev apache2 language-pack-is git-svn gcc-8 || exit 1
-
-       ci/install-dependencies.sh || exit 1
-       ci/run-build-and-tests.sh || {
-           ci/print-test-failures.sh
-           exit 1
-       }
-
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1
-    displayName: 'ci/run-build-and-tests.sh'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **/TEST-*.xml'
-    inputs:
-      mergeTestResults: true
-      testRunTitle: 'linux-gcc'
-      platform: Linux
-      publishRunAttachments: false
-    condition: succeededOrFailed()
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish trash directories of failed tests'
-    condition: failed()
-    inputs:
-      PathtoPublish: t/failed-test-artifacts
-      ArtifactName: failed-test-artifacts
-
-- job: osx_clang
-  displayName: osx-clang
-  condition: succeeded()
-  pool: Hosted macOS
-  steps:
-  - bash: |
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
-
-       export CC=clang
-
-       ci/install-dependencies.sh || exit 1
-       ci/run-build-and-tests.sh || {
-           ci/print-test-failures.sh
-           exit 1
-       }
-
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || umount "$HOME/test-cache" || exit 1
-    displayName: 'ci/run-build-and-tests.sh'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **/TEST-*.xml'
-    inputs:
-      mergeTestResults: true
-      testRunTitle: 'osx-clang'
-      platform: macOS
-      publishRunAttachments: false
-    condition: succeededOrFailed()
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish trash directories of failed tests'
-    condition: failed()
-    inputs:
-      PathtoPublish: t/failed-test-artifacts
-      ArtifactName: failed-test-artifacts
-
-- job: osx_gcc
-  displayName: osx-gcc
-  condition: succeeded()
-  pool: Hosted macOS
-  steps:
-  - bash: |
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
-
-       ci/install-dependencies.sh || exit 1
-       ci/run-build-and-tests.sh || {
-           ci/print-test-failures.sh
-           exit 1
-       }
-
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || umount "$HOME/test-cache" || exit 1
-    displayName: 'ci/run-build-and-tests.sh'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **/TEST-*.xml'
-    inputs:
-      mergeTestResults: true
-      testRunTitle: 'osx-gcc'
-      platform: macOS
-      publishRunAttachments: false
-    condition: succeededOrFailed()
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish trash directories of failed tests'
-    condition: failed()
-    inputs:
-      PathtoPublish: t/failed-test-artifacts
-      ArtifactName: failed-test-artifacts
-
-- job: gettext_poison
-  displayName: GETTEXT_POISON
-  condition: succeeded()
-  pool: Hosted Ubuntu 1604
-  steps:
-  - bash: |
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
-
-       sudo apt-get update &&
-       sudo apt-get -y install git gcc make libssl-dev libcurl4-openssl-dev libexpat-dev tcl tk gettext git-email zlib1g-dev &&
-
-       export jobname=GETTEXT_POISON || exit 1
-
-       ci/run-build-and-tests.sh || {
-           ci/print-test-failures.sh
-           exit 1
-       }
-
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1
-    displayName: 'ci/run-build-and-tests.sh'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **/TEST-*.xml'
-    inputs:
-      mergeTestResults: true
-      testRunTitle: 'gettext-poison'
-      platform: Linux
-      publishRunAttachments: false
-    condition: succeededOrFailed()
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish trash directories of failed tests'
-    condition: failed()
-    inputs:
-      PathtoPublish: t/failed-test-artifacts
-      ArtifactName: failed-test-artifacts
-
-- job: linux32
-  displayName: Linux32
-  condition: succeeded()
-  pool: Hosted Ubuntu 1604
-  steps:
-  - bash: |
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
-
-       res=0
-       sudo AGENT_OS="$AGENT_OS" BUILD_BUILDNUMBER="$BUILD_BUILDNUMBER" BUILD_REPOSITORY_URI="$BUILD_REPOSITORY_URI" BUILD_SOURCEBRANCH="$BUILD_SOURCEBRANCH" BUILD_SOURCEVERSION="$BUILD_SOURCEVERSION" SYSTEM_PHASENAME="$SYSTEM_PHASENAME" SYSTEM_TASKDEFINITIONSURI="$SYSTEM_TASKDEFINITIONSURI" SYSTEM_TEAMPROJECT="$SYSTEM_TEAMPROJECT" CC=$CC MAKEFLAGS="$MAKEFLAGS" bash -lxc ci/run-linux32-docker.sh || res=1
-
-       sudo chmod a+r t/out/TEST-*.xml
-       test ! -d t/failed-test-artifacts || sudo chmod a+r t/failed-test-artifacts
-
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || res=1
-       exit $res
-    displayName: 'ci/run-linux32-docker.sh'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-  - task: PublishTestResults@2
-    displayName: 'Publish Test Results **/TEST-*.xml'
-    inputs:
-      mergeTestResults: true
-      testRunTitle: 'linux32'
-      platform: Linux
-      publishRunAttachments: false
-    condition: succeededOrFailed()
-  - task: PublishBuildArtifacts@1
-    displayName: 'Publish trash directories of failed tests'
-    condition: failed()
-    inputs:
-      PathtoPublish: t/failed-test-artifacts
-      ArtifactName: failed-test-artifacts
-
-- job: static_analysis
-  displayName: StaticAnalysis
-  condition: succeeded()
-  pool: Hosted Ubuntu 1604
-  steps:
-  - bash: |
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
-
-       sudo apt-get update &&
-       sudo apt-get install -y coccinelle libcurl4-openssl-dev libssl-dev libexpat-dev gettext &&
-
-       export jobname=StaticAnalysis &&
-
-       ci/run-static-analysis.sh || exit 1
-
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1
-    displayName: 'ci/run-static-analysis.sh'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
-
-- job: documentation
-  displayName: Documentation
-  condition: succeeded()
-  pool: Hosted Ubuntu 1604
-  steps:
-  - bash: |
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || ci/mount-fileshare.sh //gitfileshare.file.core.windows.net/test-cache gitfileshare "$GITFILESHAREPWD" "$HOME/test-cache" || exit 1
-
-       sudo apt-get update &&
-       sudo apt-get install -y asciidoc xmlto asciidoctor docbook-xsl-ns &&
-
-       export ALREADY_HAVE_ASCIIDOCTOR=yes. &&
-       export jobname=Documentation &&
-
-       ci/test-documentation.sh || exit 1
-
-       test "$GITFILESHAREPWD" = '$(gitfileshare.pwd)' || sudo umount "$HOME/test-cache" || exit 1
-    displayName: 'ci/test-documentation.sh'
-    env:
-      GITFILESHAREPWD: $(gitfileshare.pwd)
diff --git a/banned.h b/banned.h
index 60a18d4403..7ab4f2e492 100644
--- a/banned.h
+++ b/banned.h
@@ -29,4 +29,17 @@
 #define vsprintf(buf,fmt,arg) BANNED(vsprintf)
 #endif
 
+#undef gmtime
+#define gmtime(t) BANNED(gmtime)
+#undef localtime
+#define localtime(t) BANNED(localtime)
+#undef ctime
+#define ctime(t) BANNED(ctime)
+#undef ctime_r
+#define ctime_r(t, buf) BANNED(ctime_r)
+#undef asctime
+#define asctime(t) BANNED(asctime)
+#undef asctime_r
+#define asctime_r(t, buf) BANNED(asctime_r)
+
 #endif /* BANNED_H */
diff --git a/bisect.c b/bisect.c
index e81c91d02c..888949fba6 100644
--- a/bisect.c
+++ b/bisect.c
@@ -6,15 +6,16 @@
 #include "refs.h"
 #include "list-objects.h"
 #include "quote.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 #include "run-command.h"
 #include "log-tree.h"
 #include "bisect.h"
-#include "sha1-array.h"
-#include "argv-array.h"
+#include "oid-array.h"
+#include "strvec.h"
 #include "commit-slab.h"
 #include "commit-reach.h"
 #include "object-store.h"
+#include "dir.h"
 
 static struct oid_array good_revs;
 static struct oid_array skipped_revs;
@@ -22,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;
@@ -88,21 +88,24 @@ static inline void weight_set(struct commit_list *elem, int weight)
 	**commit_weight_at(&commit_weight, elem->item) = weight;
 }
 
-static int count_interesting_parents(struct commit *commit)
+static int count_interesting_parents(struct commit *commit, unsigned bisect_flags)
 {
 	struct commit_list *p;
 	int count;
 
 	for (count = 0, p = commit->parents; p; p = p->next) {
-		if (p->item->object.flags & UNINTERESTING)
-			continue;
-		count++;
+		if (!(p->item->object.flags & UNINTERESTING))
+			count++;
+		if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY)
+			break;
 	}
 	return count;
 }
 
-static inline int halfway(struct commit_list *p, int nr)
+static inline int approx_halfway(struct commit_list *p, int nr)
 {
+	int diff;
+
 	/*
 	 * Don't short-cut something we are not going to return!
 	 */
@@ -111,13 +114,22 @@ static inline int halfway(struct commit_list *p, int nr)
 	if (DEBUG_BISECT)
 		return 0;
 	/*
-	 * 2 and 3 are halfway of 5.
+	 * For small number of commits 2 and 3 are halfway of 5, and
 	 * 3 is halfway of 6 but 2 and 4 are not.
 	 */
-	switch (2 * weight(p) - nr) {
+	diff = 2 * weight(p) - nr;
+	switch (diff) {
 	case -1: case 0: case 1:
 		return 1;
 	default:
+		/*
+		 * For large number of commits we are not so strict, it's
+		 * good enough if it's within ~0.1% of the halfway point,
+		 * e.g. 5000 is exactly halfway of 10000, but we consider
+		 * the values [4996, 5004] as halfway as well.
+		 */
+		if (abs(diff) < nr / 1024)
+			return 1;
 		return 0;
 	}
 }
@@ -135,7 +147,7 @@ static void show_list(const char *debug, int counted, int nr,
 	for (p = list; p; p = p->next) {
 		struct commit_list *pp;
 		struct commit *commit = p->item;
-		unsigned flags = commit->object.flags;
+		unsigned commit_flags = commit->object.flags;
 		enum object_type type;
 		unsigned long size;
 		char *buf = read_object_file(&commit->object.oid, &type,
@@ -144,9 +156,9 @@ static void show_list(const char *debug, int counted, int nr,
 		int subject_len;
 
 		fprintf(stderr, "%c%c%c ",
-			(flags & TREESAME) ? ' ' : 'T',
-			(flags & UNINTERESTING) ? 'U' : ' ',
-			(flags & COUNTED) ? 'C' : ' ');
+			(commit_flags & TREESAME) ? ' ' : 'T',
+			(commit_flags & UNINTERESTING) ? 'U' : ' ',
+			(commit_flags & COUNTED) ? 'C' : ' ');
 		if (*commit_weight_at(&commit_weight, p->item))
 			fprintf(stderr, "%3d", weight(p));
 		else
@@ -171,9 +183,9 @@ static struct commit_list *best_bisection(struct commit_list *list, int nr)
 	best = list;
 	for (p = list; p; p = p->next) {
 		int distance;
-		unsigned flags = p->item->object.flags;
+		unsigned commit_flags = p->item->object.flags;
 
-		if (flags & TREESAME)
+		if (commit_flags & TREESAME)
 			continue;
 		distance = weight(p);
 		if (nr - distance < distance)
@@ -212,9 +224,9 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list, int n
 
 	for (p = list, cnt = 0; p; p = p->next) {
 		int distance;
-		unsigned flags = p->item->object.flags;
+		unsigned commit_flags = p->item->object.flags;
 
-		if (flags & TREESAME)
+		if (commit_flags & TREESAME)
 			continue;
 		distance = weight(p);
 		if (nr - distance < distance)
@@ -259,7 +271,7 @@ static struct commit_list *best_bisection_sorted(struct commit_list *list, int n
  */
 static struct commit_list *do_find_bisection(struct commit_list *list,
 					     int nr, int *weights,
-					     int find_all)
+					     unsigned bisect_flags)
 {
 	int n, counted;
 	struct commit_list *p;
@@ -268,12 +280,12 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
 
 	for (n = 0, p = list; p; p = p->next) {
 		struct commit *commit = p->item;
-		unsigned flags = commit->object.flags;
+		unsigned commit_flags = commit->object.flags;
 
 		*commit_weight_at(&commit_weight, p->item) = &weights[n++];
-		switch (count_interesting_parents(commit)) {
+		switch (count_interesting_parents(commit, bisect_flags)) {
 		case 0:
-			if (!(flags & TREESAME)) {
+			if (!(commit_flags & TREESAME)) {
 				weight_set(p, 1);
 				counted++;
 				show_list("bisection 2 count one",
@@ -314,11 +326,14 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
 			continue;
 		if (weight(p) != -2)
 			continue;
+		if (bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY)
+			BUG("shouldn't be calling count-distance in fp mode");
 		weight_set(p, count_distance(p));
 		clear_distance(list);
 
-		/* Does it happen to be at exactly half-way? */
-		if (!find_all && halfway(p, nr))
+		/* Does it happen to be at half-way? */
+		if (!(bisect_flags & FIND_BISECTION_ALL) &&
+		      approx_halfway(p, nr))
 			return p;
 		counted++;
 	}
@@ -328,11 +343,14 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
 	while (counted < nr) {
 		for (p = list; p; p = p->next) {
 			struct commit_list *q;
-			unsigned flags = p->item->object.flags;
+			unsigned commit_flags = p->item->object.flags;
 
 			if (0 <= weight(p))
 				continue;
-			for (q = p->item->parents; q; q = q->next) {
+
+			for (q = p->item->parents;
+			     q;
+			     q = bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY ? NULL : q->next) {
 				if (q->item->object.flags & UNINTERESTING)
 					continue;
 				if (0 <= weight(q))
@@ -346,7 +364,7 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
 			 * add one for p itself if p is to be counted,
 			 * otherwise inherit it from q directly.
 			 */
-			if (!(flags & TREESAME)) {
+			if (!(commit_flags & TREESAME)) {
 				weight_set(p, weight(q)+1);
 				counted++;
 				show_list("bisection 2 count one",
@@ -355,22 +373,23 @@ static struct commit_list *do_find_bisection(struct commit_list *list,
 			else
 				weight_set(p, weight(q));
 
-			/* Does it happen to be at exactly half-way? */
-			if (!find_all && halfway(p, nr))
+			/* Does it happen to be at half-way? */
+			if (!(bisect_flags & FIND_BISECTION_ALL) &&
+			      approx_halfway(p, nr))
 				return p;
 		}
 	}
 
 	show_list("bisection 2 counted all", counted, nr, list);
 
-	if (!find_all)
+	if (!(bisect_flags & FIND_BISECTION_ALL))
 		return best_bisection(list, nr);
 	else
 		return best_bisection_sorted(list, nr);
 }
 
 void find_bisection(struct commit_list **commit_list, int *reaches,
-		    int *all, int find_all)
+		    int *all, unsigned bisect_flags)
 {
 	int nr, on_list;
 	struct commit_list *list, *p, *best, *next, *last;
@@ -386,16 +405,16 @@ void find_bisection(struct commit_list **commit_list, int *reaches,
 	for (nr = on_list = 0, last = NULL, p = *commit_list;
 	     p;
 	     p = next) {
-		unsigned flags = p->item->object.flags;
+		unsigned commit_flags = p->item->object.flags;
 
 		next = p->next;
-		if (flags & UNINTERESTING) {
+		if (commit_flags & UNINTERESTING) {
 			free(p);
 			continue;
 		}
 		p->next = last;
 		last = p;
-		if (!(flags & TREESAME))
+		if (!(commit_flags & TREESAME))
 			nr++;
 		on_list++;
 	}
@@ -403,12 +422,12 @@ void find_bisection(struct commit_list **commit_list, int *reaches,
 	show_list("bisection 2 sorted", 0, nr, list);
 
 	*all = nr;
-	weights = xcalloc(on_list, sizeof(*weights));
+	CALLOC_ARRAY(weights, on_list);
 
 	/* Do the real work of finding bisection commit. */
-	best = do_find_bisection(list, nr, weights, find_all);
+	best = do_find_bisection(list, nr, weights, bisect_flags);
 	if (best) {
-		if (!find_all) {
+		if (!(bisect_flags & FIND_BISECTION_ALL)) {
 			list->item = best->item;
 			free_commit_list(list->next);
 			best = list;
@@ -454,9 +473,10 @@ static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
 static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
 static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
 static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
+static GIT_PATH_FUNC(git_path_bisect_first_parent, "BISECT_FIRST_PARENT")
 static GIT_PATH_FUNC(git_path_head_name, "head-name")
 
-static void read_bisect_paths(struct argv_array *array)
+static void read_bisect_paths(struct strvec *array)
 {
 	struct strbuf str = STRBUF_INIT;
 	const char *filename = git_path_bisect_names();
@@ -464,7 +484,7 @@ static void read_bisect_paths(struct argv_array *array)
 
 	while (strbuf_getline_lf(&str, fp) != EOF) {
 		strbuf_trim(&str);
-		if (sq_dequote_to_argv_array(str.buf, array))
+		if (sq_dequote_to_strvec(str.buf, array))
 			die(_("Badly quoted content in file '%s': %s"),
 			    filename, str.buf);
 	}
@@ -473,7 +493,7 @@ static void read_bisect_paths(struct argv_array *array)
 	fclose(fp);
 }
 
-static char *join_sha1_array_hex(struct oid_array *array, char delim)
+static char *join_oid_array_hex(struct oid_array *array, char delim)
 {
 	struct strbuf joined_hexs = STRBUF_INIT;
 	int i;
@@ -572,7 +592,7 @@ static int sqrti(int val)
 {
 	float d, x = val;
 
-	if (val == 0)
+	if (!val)
 		return 0;
 
 	do {
@@ -632,7 +652,7 @@ static void bisect_rev_setup(struct repository *r, struct rev_info *revs,
 			     const char *bad_format, const char *good_format,
 			     int read_paths)
 {
-	struct argv_array rev_argv = ARGV_ARRAY_INIT;
+	struct strvec rev_argv = STRVEC_INIT;
 	int i;
 
 	repo_init_revisions(r, revs, prefix);
@@ -640,16 +660,16 @@ static void bisect_rev_setup(struct repository *r, struct rev_info *revs,
 	revs->commit_format = CMIT_FMT_UNSPECIFIED;
 
 	/* rev_argv.argv[0] will be ignored by setup_revisions */
-	argv_array_push(&rev_argv, "bisect_rev_setup");
-	argv_array_pushf(&rev_argv, bad_format, oid_to_hex(current_bad_oid));
+	strvec_push(&rev_argv, "bisect_rev_setup");
+	strvec_pushf(&rev_argv, bad_format, oid_to_hex(current_bad_oid));
 	for (i = 0; i < good_revs.nr; i++)
-		argv_array_pushf(&rev_argv, good_format,
-				 oid_to_hex(good_revs.oid + i));
-	argv_array_push(&rev_argv, "--");
+		strvec_pushf(&rev_argv, good_format,
+			     oid_to_hex(good_revs.oid + i));
+	strvec_push(&rev_argv, "--");
 	if (read_paths)
 		read_bisect_paths(&rev_argv);
 
-	setup_revisions(rev_argv.argc, rev_argv.argv, revs, NULL);
+	setup_revisions(rev_argv.nr, rev_argv.v, revs, NULL);
 	/* XXX leak rev_argv, as "revs" may still be pointing to it */
 }
 
@@ -661,11 +681,11 @@ static void bisect_common(struct rev_info *revs)
 		mark_edges_uninteresting(revs, NULL, 0);
 }
 
-static void exit_if_skipped_commits(struct commit_list *tried,
+static enum bisect_error error_if_skipped_commits(struct commit_list *tried,
 				    const struct object_id *bad)
 {
 	if (!tried)
-		return;
+		return BISECT_OK;
 
 	printf("There are only 'skip'ped commits left to test.\n"
 	       "The first %s commit could be any of:\n", term_bad);
@@ -676,7 +696,8 @@ static void exit_if_skipped_commits(struct commit_list *tried,
 	if (bad)
 		printf("%s\n", oid_to_hex(bad));
 	printf(_("We cannot bisect more!\n"));
-	exit(2);
+
+	return BISECT_ONLY_SKIPPED_LEFT;
 }
 
 static int is_expected_rev(const struct object_id *oid)
@@ -703,11 +724,14 @@ static int is_expected_rev(const struct object_id *oid)
 	return res;
 }
 
-static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
+static enum bisect_error bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
 {
 	char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
+	struct commit *commit;
+	struct pretty_print_context pp = {0};
+	struct strbuf commit_msg = STRBUF_INIT;
 
-	memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), the_hash_algo->hexsz + 1);
+	oid_to_hex_r(bisect_rev_hex, bisect_rev);
 	update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
 
 	argv_checkout[2] = bisect_rev_hex;
@@ -715,14 +739,21 @@ static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
 		update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
 			   UPDATE_REFS_DIE_ON_ERR);
 	} else {
-		int res;
-		res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
-		if (res)
-			exit(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_FAILED (-1).
+			 */
+			return BISECT_FAILED;
 	}
 
-	argv_show_branch[1] = bisect_rev_hex;
-	return run_command_v_opt(argv_show_branch, RUN_GIT_CMD);
+	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,
@@ -749,11 +780,11 @@ static struct commit **get_bad_and_good_commits(struct repository *r,
 	return rev;
 }
 
-static void handle_bad_merge_base(void)
+static enum bisect_error handle_bad_merge_base(void)
 {
 	if (is_expected_rev(current_bad_oid)) {
 		char *bad_hex = oid_to_hex(current_bad_oid);
-		char *good_hex = join_sha1_array_hex(&good_revs, ' ');
+		char *good_hex = join_oid_array_hex(&good_revs, ' ');
 		if (!strcmp(term_bad, "bad") && !strcmp(term_good, "good")) {
 			fprintf(stderr, _("The merge base %s is bad.\n"
 				"This means the bug has been fixed "
@@ -770,21 +801,21 @@ static void handle_bad_merge_base(void)
 				"between %s and [%s].\n"),
 				bad_hex, term_bad, term_good, bad_hex, good_hex);
 		}
-		exit(3);
+		return BISECT_MERGE_BASE_CHECK;
 	}
 
 	fprintf(stderr, _("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"),
 		term_good, term_bad, term_good, term_bad);
-	exit(1);
+	return BISECT_FAILED;
 }
 
 static void handle_skipped_merge_base(const struct object_id *mb)
 {
 	char *mb_hex = oid_to_hex(mb);
 	char *bad_hex = oid_to_hex(current_bad_oid);
-	char *good_hex = join_sha1_array_hex(&good_revs, ' ');
+	char *good_hex = join_oid_array_hex(&good_revs, ' ');
 
 	warning(_("the merge base between %s and [%s] "
 		"must be skipped.\n"
@@ -799,13 +830,18 @@ static void handle_skipped_merge_base(const struct object_id *mb)
  * "check_merge_bases" checks that merge bases are not "bad" (or "new").
  *
  * - If one is "bad" (or "new"), it means the user assumed something wrong
- * and we must exit with a non 0 error code.
+ * and we must return error with a non 0 error code.
  * - If one is "good" (or "old"), that's good, we have nothing to do.
  * - If one is "skipped", we can't know but we should warn.
  * - If we don't know, we should check it out and ask the user to test.
+ * - If a merge base must be tested, on success return
+ * BISECT_INTERNAL_SUCCESS_MERGE_BASE (-11) a special condition
+ * for early success, this will be converted back to 0 in
+ * check_good_are_ancestors_of_bad().
  */
-static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
+static enum bisect_error check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
 {
+	enum bisect_error res = BISECT_OK;
 	struct commit_list *result;
 
 	result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
@@ -813,18 +849,24 @@ static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
 	for (; result; result = result->next) {
 		const struct object_id *mb = &result->item->object.oid;
 		if (oideq(mb, current_bad_oid)) {
-			handle_bad_merge_base();
+			res = handle_bad_merge_base();
+			break;
 		} else if (0 <= oid_array_lookup(&good_revs, mb)) {
 			continue;
 		} else if (0 <= oid_array_lookup(&skipped_revs, mb)) {
 			handle_skipped_merge_base(mb);
 		} else {
 			printf(_("Bisecting: a merge base must be tested\n"));
-			exit(bisect_checkout(mb, no_checkout));
+			res = bisect_checkout(mb, no_checkout);
+			if (!res)
+				/* indicate early success */
+				res = BISECT_INTERNAL_SUCCESS_MERGE_BASE;
+			break;
 		}
 	}
 
 	free_commit_list(result);
+	return res;
 }
 
 static int check_ancestors(struct repository *r, int rev_nr,
@@ -850,43 +892,58 @@ static int check_ancestors(struct repository *r, int rev_nr,
  *
  * If that's not the case, we need to check the merge bases.
  * If a merge base must be tested by the user, its source code will be
- * checked out to be tested by the user and we will exit.
+ * checked out to be tested by the user and we will return.
  */
-static void check_good_are_ancestors_of_bad(struct repository *r,
+
+static enum bisect_error check_good_are_ancestors_of_bad(struct repository *r,
 					    const char *prefix,
 					    int no_checkout)
 {
-	char *filename = git_pathdup("BISECT_ANCESTORS_OK");
+	char *filename;
 	struct stat st;
 	int fd, rev_nr;
+	enum bisect_error res = BISECT_OK;
 	struct commit **rev;
 
 	if (!current_bad_oid)
-		die(_("a %s revision is needed"), term_bad);
+		return error(_("a %s revision is needed"), term_bad);
+
+	filename = git_pathdup("BISECT_ANCESTORS_OK");
 
 	/* Check if file BISECT_ANCESTORS_OK exists. */
 	if (!stat(filename, &st) && S_ISREG(st.st_mode))
 		goto done;
 
 	/* Bisecting with no good rev is ok. */
-	if (good_revs.nr == 0)
+	if (!good_revs.nr)
 		goto done;
 
 	/* Check if all good revs are ancestor of the bad rev. */
+
 	rev = get_bad_and_good_commits(r, &rev_nr);
 	if (check_ancestors(r, rev_nr, rev, prefix))
-		check_merge_bases(rev_nr, rev, no_checkout);
+		res = check_merge_bases(rev_nr, rev, no_checkout);
 	free(rev);
 
-	/* Create file BISECT_ANCESTORS_OK. */
-	fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
-	if (fd < 0)
-		warning_errno(_("could not create file '%s'"),
-			      filename);
-	else
-		close(fd);
+	if (!res) {
+		/* Create file BISECT_ANCESTORS_OK. */
+		fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
+		if (fd < 0)
+			/*
+			 * BISECT_ANCESTORS_OK file is not absolutely necessary,
+			 * the bisection process will continue at the next
+			 * bisection step.
+			 * So, just signal with a warning that something
+			 * might be wrong.
+			 */
+			warning_errno(_("could not create file '%s'"),
+				filename);
+		else
+			close(fd);
+	}
  done:
 	free(filename);
+	return res;
 }
 
 /*
@@ -938,64 +995,96 @@ void read_bisect_terms(const char **read_bad, const char **read_good)
 }
 
 /*
- * We use the convention that exiting with an exit code 10 means that
+ * We use the convention that return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10) means
  * the bisection process finished successfully.
- * In this case the calling shell script should exit 0.
+ * In this case the calling function or command should not turn a
+ * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND return code into an error or a non zero exit code.
  *
- * If no_checkout is non-zero, the bisection process does not
- * checkout the trial commit but instead simply updates BISECT_HEAD.
+ * Checking BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND
+ * in bisect_helper::bisect_next() and only transforming it to 0 at
+ * the end of bisect_helper::cmd_bisect__helper() helps bypassing
+ * all the code related to finding a commit to test.
  */
-int bisect_next_all(struct repository *r, const char *prefix, int no_checkout)
+enum bisect_error bisect_next_all(struct repository *r, const char *prefix)
 {
 	struct rev_info revs;
 	struct commit_list *tried;
 	int reaches = 0, all = 0, nr, steps;
+	enum bisect_error res = BISECT_OK;
 	struct object_id *bisect_rev;
 	char *steps_msg;
+	/*
+	 * If no_checkout is non-zero, the bisection process does not
+	 * checkout the trial commit but instead simply updates BISECT_HEAD.
+	 */
+	int no_checkout = ref_exists("BISECT_HEAD");
+	unsigned bisect_flags = 0;
 
 	read_bisect_terms(&term_bad, &term_good);
 	if (read_bisect_refs())
 		die(_("reading bisect refs failed"));
 
-	check_good_are_ancestors_of_bad(r, prefix, no_checkout);
+	if (file_exists(git_path_bisect_first_parent()))
+		bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY;
+
+	if (skipped_revs.nr)
+		bisect_flags |= FIND_BISECTION_ALL;
+
+	res = check_good_are_ancestors_of_bad(r, prefix, no_checkout);
+	if (res)
+		return res;
 
 	bisect_rev_setup(r, &revs, prefix, "%s", "^%s", 1);
+
+	revs.first_parent_only = !!(bisect_flags & FIND_BISECTION_FIRST_PARENT_ONLY);
 	revs.limited = 1;
 
 	bisect_common(&revs);
 
-	find_bisection(&revs.commits, &reaches, &all, !!skipped_revs.nr);
+	find_bisection(&revs.commits, &reaches, &all, bisect_flags);
 	revs.commits = managed_skipped(revs.commits, &tried);
 
 	if (!revs.commits) {
 		/*
-		 * We should exit here only if the "bad"
+		 * We should return error here only if the "bad"
 		 * commit is also a "skip" commit.
 		 */
-		exit_if_skipped_commits(tried, NULL);
-
+		res = error_if_skipped_commits(tried, NULL);
+		if (res < 0)
+			return res;
 		printf(_("%s was both %s and %s\n"),
 		       oid_to_hex(current_bad_oid),
 		       term_good,
 		       term_bad);
-		exit(1);
+
+		return BISECT_FAILED;
 	}
 
 	if (!all) {
 		fprintf(stderr, _("No testable commit found.\n"
-			"Maybe you started with bad path parameters?\n"));
-		exit(4);
+			"Maybe you started with bad path arguments?\n"));
+
+		return BISECT_NO_TESTABLE_COMMIT;
 	}
 
 	bisect_rev = &revs.commits->item->object.oid;
 
 	if (oideq(bisect_rev, current_bad_oid)) {
-		exit_if_skipped_commits(tried, current_bad_oid);
+		res = error_if_skipped_commits(tried, current_bad_oid);
+		if (res)
+			return res;
 		printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
 			term_bad);
+
 		show_diff_tree(r, prefix, revs.commits->item);
-		/* This means the bisection process succeeded. */
-		exit(10);
+		/*
+		 * This means the bisection process succeeded.
+		 * Using BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND (-10)
+		 * so that the call chain can simply check
+		 * for negative return values for early returns up
+		 * until the cmd_bisect__helper() caller.
+		 */
+		return BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
 	}
 
 	nr = all - reaches - 1;
@@ -1011,6 +1100,8 @@ int bisect_next_all(struct repository *r, const char *prefix, int no_checkout)
 		  "Bisecting: %d revisions left to test after this %s\n",
 		  nr), nr, steps_msg);
 	free(steps_msg);
+	/* Clean up objects used, as they will be reused. */
+	repo_clear_commit_marks(r, ALL_REV_FLAGS);
 
 	return bisect_checkout(bisect_rev, no_checkout);
 }
@@ -1080,6 +1171,7 @@ int bisect_clean_state(void)
 	unlink_or_warn(git_path_bisect_names());
 	unlink_or_warn(git_path_bisect_run());
 	unlink_or_warn(git_path_bisect_terms());
+	unlink_or_warn(git_path_bisect_first_parent());
 	/* Cleanup head-name if it got left by an old version of git-bisect */
 	unlink_or_warn(git_path_head_name());
 	/*
diff --git a/bisect.h b/bisect.h
index 4e69a11ea8..ec24ac2d7e 100644
--- a/bisect.h
+++ b/bisect.h
@@ -12,7 +12,7 @@ struct repository;
  * best commit, as chosen by `find_all`.
  */
 void find_bisection(struct commit_list **list, int *reaches, int *all,
-		    int find_all);
+		    unsigned bisect_flags);
 
 struct commit_list *filter_skipped(struct commit_list *list,
 				   struct commit_list **tried,
@@ -23,6 +23,9 @@ struct commit_list *filter_skipped(struct commit_list *list,
 #define BISECT_SHOW_ALL		(1<<0)
 #define REV_LIST_QUIET		(1<<1)
 
+#define FIND_BISECTION_ALL			(1u<<0)
+#define FIND_BISECTION_FIRST_PARENT_ONLY	(1u<<1)
+
 struct rev_list_info {
 	struct rev_info *revs;
 	int flags;
@@ -31,9 +34,34 @@ struct rev_list_info {
 	const char *header_prefix;
 };
 
-int bisect_next_all(struct repository *r,
-		    const char *prefix,
-		    int no_checkout);
+/*
+ * enum bisect_error represents the following return codes:
+ * BISECT_OK: success code. Internally, it means that next
+ * commit has been found (and possibly checked out) and it
+ * should be tested.
+ * BISECT_FAILED error code: default error code.
+ * BISECT_ONLY_SKIPPED_LEFT error code: only skipped
+ * commits left to be tested.
+ * BISECT_MERGE_BASE_CHECK error code: merge base check failed.
+ * BISECT_NO_TESTABLE_COMMIT error code: no testable commit found.
+ * BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND early success code:
+ * first term_bad commit found.
+ * BISECT_INTERNAL_SUCCESS_MERGE_BASE early success
+ * code: found merge base that should be tested.
+ * Early success codes BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND and
+ * BISECT_INTERNAL_SUCCESS_MERGE_BASE should be only internal codes.
+ */
+enum bisect_error {
+	BISECT_OK = 0,
+	BISECT_FAILED = -1,
+	BISECT_ONLY_SKIPPED_LEFT = -2,
+	BISECT_MERGE_BASE_CHECK = -3,
+	BISECT_NO_TESTABLE_COMMIT = -4,
+	BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND = -10,
+	BISECT_INTERNAL_SUCCESS_MERGE_BASE = -11
+};
+
+enum bisect_error bisect_next_all(struct repository *r, const char *prefix);
 
 int estimate_bisect_steps(int all);
 
diff --git a/blame.c b/blame.c
index 29770e5c81..206c295660 100644
--- a/blame.c
+++ b/blame.c
@@ -9,6 +9,8 @@
 #include "blame.h"
 #include "alloc.h"
 #include "commit-slab.h"
+#include "bloom.h"
+#include "commit-graph.h"
 
 define_commit_slab(blame_suspects, struct blame_origin *);
 static struct blame_suspects blame_suspects;
@@ -240,7 +242,7 @@ static struct commit *fake_working_tree_commit(struct repository *r,
 		switch (st.st_mode & S_IFMT) {
 		case S_IFREG:
 			if (opt->flags.allow_textconv &&
-			    textconv_object(r, read_from, mode, &null_oid, 0, &buf_ptr, &buf_len))
+			    textconv_object(r, read_from, mode, null_oid(), 0, &buf_ptr, &buf_len))
 				strbuf_attach(&buf, buf_ptr, buf_len, buf_len + 1);
 			else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
 				die_errno("cannot open or read '%s'", read_from);
@@ -433,7 +435,7 @@ static void get_fingerprint(struct fingerprint *result,
 
 static void free_fingerprint(struct fingerprint *f)
 {
-	hashmap_free(&f->map);
+	hashmap_clear(&f->map);
 	free(f->entries);
 }
 
@@ -949,13 +951,13 @@ static int *fuzzy_find_matching_lines(struct blame_origin *parent,
 	max_search_distance_b = ((2 * max_search_distance_a + 1) * length_b
 				 - 1) / length_a;
 
-	result = xcalloc(sizeof(int), length_b);
-	second_best_result = xcalloc(sizeof(int), length_b);
-	certainties = xcalloc(sizeof(int), length_b);
+	CALLOC_ARRAY(result, length_b);
+	CALLOC_ARRAY(second_best_result, length_b);
+	CALLOC_ARRAY(certainties, length_b);
 
 	/* See get_similarity() for details of similarities. */
 	similarity_count = length_b * (max_search_distance_a * 2 + 1);
-	similarities = xcalloc(sizeof(int), similarity_count);
+	CALLOC_ARRAY(similarities, similarity_count);
 
 	for (i = 0; i < length_b; ++i) {
 		result[i] = -1;
@@ -993,7 +995,7 @@ static void fill_origin_fingerprints(struct blame_origin *o)
 		return;
 	o->num_lines = find_line_starts(&line_starts, o->file.ptr,
 					o->file.size);
-	o->fingerprints = xcalloc(sizeof(struct fingerprint), o->num_lines);
+	CALLOC_ARRAY(o->fingerprints, o->num_lines);
 	get_line_fingerprints(o->fingerprints, o->file.ptr, line_starts,
 			      0, o->num_lines);
 	free(line_starts);
@@ -1182,6 +1184,7 @@ void blame_coalesce(struct blame_scoreboard *sb)
 	for (ent = sb->ent; ent && (next = ent->next); ent = next) {
 		if (ent->suspect == next->suspect &&
 		    ent->s_lno + ent->num_lines == next->s_lno &&
+		    ent->lno + ent->num_lines == next->lno &&
 		    ent->ignored == next->ignored &&
 		    ent->unblamable == next->unblamable) {
 			ent->num_lines += next->num_lines;
@@ -1246,13 +1249,74 @@ static int fill_blob_sha1_and_mode(struct repository *r,
 	return -1;
 }
 
+struct blame_bloom_data {
+	/*
+	 * Changed-path Bloom filter keys. These can help prevent
+	 * computing diffs against first parents, but we need to
+	 * expand the list as code is moved or files are renamed.
+	 */
+	struct bloom_filter_settings *settings;
+	struct bloom_key **keys;
+	int nr;
+	int alloc;
+};
+
+static int bloom_count_queries = 0;
+static int bloom_count_no = 0;
+static int maybe_changed_path(struct repository *r,
+			      struct blame_origin *origin,
+			      struct blame_bloom_data *bd)
+{
+	int i;
+	struct bloom_filter *filter;
+
+	if (!bd)
+		return 1;
+
+	if (commit_graph_generation(origin->commit) == GENERATION_NUMBER_INFINITY)
+		return 1;
+
+	filter = get_bloom_filter(r, origin->commit);
+
+	if (!filter)
+		return 1;
+
+	bloom_count_queries++;
+	for (i = 0; i < bd->nr; i++) {
+		if (bloom_filter_contains(filter,
+					  bd->keys[i],
+					  bd->settings))
+			return 1;
+	}
+
+	bloom_count_no++;
+	return 0;
+}
+
+static void add_bloom_key(struct blame_bloom_data *bd,
+			  const char *path)
+{
+	if (!bd)
+		return;
+
+	if (bd->nr >= bd->alloc) {
+		bd->alloc *= 2;
+		REALLOC_ARRAY(bd->keys, bd->alloc);
+	}
+
+	bd->keys[bd->nr] = xmalloc(sizeof(struct bloom_key));
+	fill_bloom_key(path, strlen(path), bd->keys[bd->nr], bd->settings);
+	bd->nr++;
+}
+
 /*
  * We have an origin -- check if the same path exists in the
  * parent and return an origin structure to represent it.
  */
 static struct blame_origin *find_origin(struct repository *r,
 					struct commit *parent,
-					struct blame_origin *origin)
+					struct blame_origin *origin,
+					struct blame_bloom_data *bd)
 {
 	struct blame_origin *porigin;
 	struct diff_options diff_opts;
@@ -1286,10 +1350,18 @@ static struct blame_origin *find_origin(struct repository *r,
 
 	if (is_null_oid(&origin->commit->object.oid))
 		do_diff_cache(get_commit_tree_oid(parent), &diff_opts);
-	else
-		diff_tree_oid(get_commit_tree_oid(parent),
-			      get_commit_tree_oid(origin->commit),
-			      "", &diff_opts);
+	else {
+		int compute_diff = 1;
+		if (origin->commit->parents &&
+		    oideq(&parent->object.oid,
+			  &origin->commit->parents->item->object.oid))
+			compute_diff = maybe_changed_path(r, origin, bd);
+
+		if (compute_diff)
+			diff_tree_oid(get_commit_tree_oid(parent),
+				      get_commit_tree_oid(origin->commit),
+				      "", &diff_opts);
+	}
 	diffcore_std(&diff_opts);
 
 	if (!diff_queued_diff.nr) {
@@ -1341,7 +1413,8 @@ static struct blame_origin *find_origin(struct repository *r,
  */
 static struct blame_origin *find_rename(struct repository *r,
 					struct commit *parent,
-					struct blame_origin *origin)
+					struct blame_origin *origin,
+					struct blame_bloom_data *bd)
 {
 	struct blame_origin *porigin = NULL;
 	struct diff_options diff_opts;
@@ -1366,6 +1439,7 @@ static struct blame_origin *find_rename(struct repository *r,
 		struct diff_filepair *p = diff_queued_diff.queue[i];
 		if ((p->status == 'R' || p->status == 'C') &&
 		    !strcmp(p->two->path, origin->path)) {
+			add_bloom_key(bd, p->one->path);
 			porigin = get_origin(parent, p->one->path);
 			oidcpy(&porigin->blob_oid, &p->one->oid);
 			porigin->mode = p->one->mode;
@@ -1779,8 +1853,7 @@ static void blame_chunk(struct blame_entry ***dstq, struct blame_entry ***srcq,
 	diffp = NULL;
 
 	if (ignore_diffs && same - tlno > 0) {
-		line_blames = xcalloc(sizeof(struct blame_line_tracker),
-				      same - tlno);
+		CALLOC_ARRAY(line_blames, same - tlno);
 		guess_line_blames(parent, target, tlno, offset, same,
 				  parent_len, line_blames);
 	}
@@ -2142,7 +2215,7 @@ static struct blame_list *setup_blame_list(struct blame_entry *unblamed,
 	for (e = unblamed, num_ents = 0; e; e = e->next)
 		num_ents++;
 	if (num_ents) {
-		blame_list = xcalloc(num_ents, sizeof(struct blame_list));
+		CALLOC_ARRAY(blame_list, num_ents);
 		for (e = unblamed, i = 0; e; e = e->next)
 			blame_list[i++].ent = e;
 	}
@@ -2332,6 +2405,11 @@ static void distribute_blame(struct blame_scoreboard *sb, struct blame_entry *bl
 
 #define MAXSG 16
 
+typedef struct blame_origin *(*blame_find_alg)(struct repository *,
+					       struct commit *,
+					       struct blame_origin *,
+					       struct blame_bloom_data *);
+
 static void pass_blame(struct blame_scoreboard *sb, struct blame_origin *origin, int opt)
 {
 	struct rev_info *revs = sb->revs;
@@ -2349,15 +2427,14 @@ static void pass_blame(struct blame_scoreboard *sb, struct blame_origin *origin,
 	else if (num_sg < ARRAY_SIZE(sg_buf))
 		memset(sg_buf, 0, sizeof(sg_buf));
 	else
-		sg_origin = xcalloc(num_sg, sizeof(*sg_origin));
+		CALLOC_ARRAY(sg_origin, num_sg);
 
 	/*
 	 * The first pass looks for unrenamed path to optimize for
 	 * common cases, then we look for renames in the second pass.
 	 */
 	for (pass = 0; pass < 2 - sb->no_whole_file_rename; pass++) {
-		struct blame_origin *(*find)(struct repository *, struct commit *, struct blame_origin *);
-		find = pass ? find_rename : find_origin;
+		blame_find_alg find = pass ? find_rename : find_origin;
 
 		for (i = 0, sg = first_scapegoat(revs, commit, sb->reverse);
 		     i < num_sg && sg;
@@ -2369,7 +2446,7 @@ static void pass_blame(struct blame_scoreboard *sb, struct blame_origin *origin,
 				continue;
 			if (parse_commit(p))
 				continue;
-			porigin = find(sb->repo, p, origin);
+			porigin = find(sb->repo, p, origin, sb->bloom_data);
 			if (!porigin)
 				continue;
 			if (oideq(&porigin->blob_oid, &origin->blob_oid)) {
@@ -2592,7 +2669,7 @@ static struct commit *find_single_final(struct rev_info *revs,
 		if (obj->flags & UNINTERESTING)
 			continue;
 		obj = deref_tag(revs->repo, obj, NULL, 0);
-		if (obj->type != OBJ_COMMIT)
+		if (!obj || obj->type != OBJ_COMMIT)
 			die("Non commit %s?", revs->pending.objects[i].name);
 		if (found)
 			die("More than one commit to dig from %s and %s?",
@@ -2623,7 +2700,7 @@ static struct commit *dwim_reverse_initial(struct rev_info *revs,
 	/* Is that sole rev a committish? */
 	obj = revs->pending.objects[0].item;
 	obj = deref_tag(revs->repo, obj, NULL, 0);
-	if (obj->type != OBJ_COMMIT)
+	if (!obj || obj->type != OBJ_COMMIT)
 		return NULL;
 
 	/* Do we have HEAD? */
@@ -2659,7 +2736,7 @@ static struct commit *find_single_initial(struct rev_info *revs,
 		if (!(obj->flags & UNINTERESTING))
 			continue;
 		obj = deref_tag(revs->repo, obj, NULL, 0);
-		if (obj->type != OBJ_COMMIT)
+		if (!obj || obj->type != OBJ_COMMIT)
 			die("Non commit %s?", revs->pending.objects[i].name);
 		if (found)
 			die("More than one commit to dig up from, %s and %s?",
@@ -2686,7 +2763,6 @@ void init_scoreboard(struct blame_scoreboard *sb)
 }
 
 void setup_scoreboard(struct blame_scoreboard *sb,
-		      const char *path,
 		      struct blame_origin **orig)
 {
 	const char *final_commit_name = NULL;
@@ -2725,7 +2801,7 @@ void setup_scoreboard(struct blame_scoreboard *sb,
 		setup_work_tree();
 		sb->final = fake_working_tree_commit(sb->repo,
 						     &sb->revs->diffopt,
-						     path, sb->contents_from);
+						     sb->path, sb->contents_from);
 		add_pending_object(sb->revs, &(sb->final->object), ":");
 	}
 
@@ -2768,12 +2844,12 @@ void setup_scoreboard(struct blame_scoreboard *sb,
 		sb->final_buf_size = o->file.size;
 	}
 	else {
-		o = get_origin(sb->final, path);
+		o = get_origin(sb->final, sb->path);
 		if (fill_blob_sha1_and_mode(sb->repo, o))
-			die(_("no such path %s in %s"), path, final_commit_name);
+			die(_("no such path %s in %s"), sb->path, final_commit_name);
 
 		if (sb->revs->diffopt.flags.allow_textconv &&
-		    textconv_object(sb->repo, path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
+		    textconv_object(sb->repo, sb->path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
 				    &sb->final_buf_size))
 			;
 		else
@@ -2783,7 +2859,7 @@ void setup_scoreboard(struct blame_scoreboard *sb,
 		if (!sb->final_buf)
 			die(_("cannot read blob %s for path %s"),
 			    oid_to_hex(&o->blob_oid),
-			    path);
+			    sb->path);
 	}
 	sb->num_read_blob++;
 	prepare_lines(sb);
@@ -2809,3 +2885,46 @@ struct blame_entry *blame_entry_prepend(struct blame_entry *head,
 	blame_origin_incref(o);
 	return new_head;
 }
+
+void setup_blame_bloom_data(struct blame_scoreboard *sb)
+{
+	struct blame_bloom_data *bd;
+	struct bloom_filter_settings *bs;
+
+	if (!sb->repo->objects->commit_graph)
+		return;
+
+	bs = get_bloom_filter_settings(sb->repo);
+	if (!bs)
+		return;
+
+	bd = xmalloc(sizeof(struct blame_bloom_data));
+
+	bd->settings = bs;
+
+	bd->alloc = 4;
+	bd->nr = 0;
+	ALLOC_ARRAY(bd->keys, bd->alloc);
+
+	add_bloom_key(bd, sb->path);
+
+	sb->bloom_data = bd;
+}
+
+void cleanup_scoreboard(struct blame_scoreboard *sb)
+{
+	if (sb->bloom_data) {
+		int i;
+		for (i = 0; i < sb->bloom_data->nr; i++) {
+			free(sb->bloom_data->keys[i]->hashes);
+			free(sb->bloom_data->keys[i]);
+		}
+		free(sb->bloom_data->keys);
+		FREE_AND_NULL(sb->bloom_data);
+
+		trace2_data_intmax("blame", sb->repo,
+				   "bloom/queries", bloom_count_queries);
+		trace2_data_intmax("blame", sb->repo,
+				   "bloom/response-no", bloom_count_no);
+	}
+}
diff --git a/blame.h b/blame.h
index 4a9e1270b0..38bde535b3 100644
--- a/blame.h
+++ b/blame.h
@@ -16,6 +16,8 @@
 #define BLAME_DEFAULT_MOVE_SCORE	20
 #define BLAME_DEFAULT_COPY_SCORE	40
 
+struct fingerprint;
+
 /*
  * One blob in a commit that is being suspected
  */
@@ -52,7 +54,7 @@ struct blame_origin {
 	struct blame_entry *suspects;
 	mmfile_t file;
 	int num_lines;
-	void *fingerprints;
+	struct fingerprint *fingerprints;
 	struct object_id blob_oid;
 	unsigned short mode;
 	/* guilty gets set when shipping any suspects to the final
@@ -98,6 +100,8 @@ struct blame_entry {
 	int unblamable;
 };
 
+struct blame_bloom_data;
+
 /*
  * The current state of the blame assignment.
  */
@@ -154,6 +158,7 @@ struct blame_scoreboard {
 	void(*found_guilty_entry)(struct blame_entry *, void *);
 
 	void *found_guilty_entry_data;
+	struct blame_bloom_data *bloom_data;
 };
 
 /*
@@ -176,8 +181,9 @@ const char *blame_nth_line(struct blame_scoreboard *sb, long lno);
 
 void init_scoreboard(struct blame_scoreboard *sb);
 void setup_scoreboard(struct blame_scoreboard *sb,
-		      const char *path,
 		      struct blame_origin **orig);
+void setup_blame_bloom_data(struct blame_scoreboard *sb);
+void cleanup_scoreboard(struct blame_scoreboard *sb);
 
 struct blame_entry *blame_entry_prepend(struct blame_entry *head,
 					long start, long end,
diff --git a/blob.c b/blob.c
index 36f9abda19..182718aba9 100644
--- a/blob.c
+++ b/blob.c
@@ -10,7 +10,7 @@ struct blob *lookup_blob(struct repository *r, const struct object_id *oid)
 	struct object *obj = lookup_object(r, oid);
 	if (!obj)
 		return create_object(r, oid, alloc_blob_node(r));
-	return object_as_type(r, obj, OBJ_BLOB, 0);
+	return object_as_type(obj, OBJ_BLOB, 0);
 }
 
 int parse_blob_buffer(struct blob *item, void *buffer, unsigned long size)
diff --git a/block-sha1/sha1.c b/block-sha1/sha1.c
index 22b125cf8c..1bb6e7c069 100644
--- a/block-sha1/sha1.c
+++ b/block-sha1/sha1.c
@@ -70,7 +70,7 @@
  * the input data, the next mix it from the 512-bit array.
  */
 #define SHA_SRC(t) get_be32((unsigned char *) block + (t)*4)
-#define SHA_MIX(t) SHA_ROL(W((t)+13) ^ W((t)+8) ^ W((t)+2) ^ W(t), 1);
+#define SHA_MIX(t) SHA_ROL(W((t)+13) ^ W((t)+8) ^ W((t)+2) ^ W(t), 1)
 
 #define SHA_ROUND(t, input, fn, constant, A, B, C, D, E) do { \
 	unsigned int TEMP = input(t); setW(t, TEMP); \
@@ -203,7 +203,7 @@ void blk_SHA1_Init(blk_SHA_CTX *ctx)
 	ctx->H[4] = 0xc3d2e1f0;
 }
 
-void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, unsigned long len)
+void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *data, size_t len)
 {
 	unsigned int lenW = ctx->size & 63;
 
diff --git a/block-sha1/sha1.h b/block-sha1/sha1.h
index 4df6747752..9fb0441b98 100644
--- a/block-sha1/sha1.h
+++ b/block-sha1/sha1.h
@@ -13,7 +13,7 @@ typedef struct {
 } blk_SHA_CTX;
 
 void blk_SHA1_Init(blk_SHA_CTX *ctx);
-void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *dataIn, unsigned long len);
+void blk_SHA1_Update(blk_SHA_CTX *ctx, const void *dataIn, size_t len);
 void blk_SHA1_Final(unsigned char hashout[20], blk_SHA_CTX *ctx);
 
 #define platform_SHA_CTX	blk_SHA_CTX
diff --git a/bloom.c b/bloom.c
new file mode 100644
index 0000000000..5e297038bb
--- /dev/null
+++ b/bloom.c
@@ -0,0 +1,327 @@
+#include "git-compat-util.h"
+#include "bloom.h"
+#include "diff.h"
+#include "diffcore.h"
+#include "revision.h"
+#include "hashmap.h"
+#include "commit-graph.h"
+#include "commit.h"
+
+define_commit_slab(bloom_filter_slab, struct bloom_filter);
+
+static struct bloom_filter_slab bloom_filters;
+
+struct pathmap_hash_entry {
+    struct hashmap_entry entry;
+    const char path[FLEX_ARRAY];
+};
+
+static uint32_t rotate_left(uint32_t value, int32_t count)
+{
+	uint32_t mask = 8 * sizeof(uint32_t) - 1;
+	count &= mask;
+	return ((value << count) | (value >> ((-count) & mask)));
+}
+
+static inline unsigned char get_bitmask(uint32_t pos)
+{
+	return ((unsigned char)1) << (pos & (BITS_PER_WORD - 1));
+}
+
+static int load_bloom_filter_from_graph(struct commit_graph *g,
+					struct bloom_filter *filter,
+					struct commit *c)
+{
+	uint32_t lex_pos, start_index, end_index;
+	uint32_t graph_pos = commit_graph_position(c);
+
+	while (graph_pos < g->num_commits_in_base)
+		g = g->base_graph;
+
+	/* The commit graph commit 'c' lives in doesn't carry Bloom filters. */
+	if (!g->chunk_bloom_indexes)
+		return 0;
+
+	lex_pos = graph_pos - g->num_commits_in_base;
+
+	end_index = get_be32(g->chunk_bloom_indexes + 4 * lex_pos);
+
+	if (lex_pos > 0)
+		start_index = get_be32(g->chunk_bloom_indexes + 4 * (lex_pos - 1));
+	else
+		start_index = 0;
+
+	filter->len = end_index - start_index;
+	filter->data = (unsigned char *)(g->chunk_bloom_data +
+					sizeof(unsigned char) * start_index +
+					BLOOMDATA_CHUNK_HEADER_SIZE);
+
+	return 1;
+}
+
+/*
+ * Calculate the murmur3 32-bit hash value for the given data
+ * using the given seed.
+ * Produces a uniformly distributed hash value.
+ * Not considered to be cryptographically secure.
+ * Implemented as described in https://en.wikipedia.org/wiki/MurmurHash#Algorithm
+ */
+uint32_t murmur3_seeded(uint32_t seed, const char *data, size_t len)
+{
+	const uint32_t c1 = 0xcc9e2d51;
+	const uint32_t c2 = 0x1b873593;
+	const uint32_t r1 = 15;
+	const uint32_t r2 = 13;
+	const uint32_t m = 5;
+	const uint32_t n = 0xe6546b64;
+	int i;
+	uint32_t k1 = 0;
+	const char *tail;
+
+	int len4 = len / sizeof(uint32_t);
+
+	uint32_t k;
+	for (i = 0; i < len4; i++) {
+		uint32_t byte1 = (uint32_t)data[4*i];
+		uint32_t byte2 = ((uint32_t)data[4*i + 1]) << 8;
+		uint32_t byte3 = ((uint32_t)data[4*i + 2]) << 16;
+		uint32_t byte4 = ((uint32_t)data[4*i + 3]) << 24;
+		k = byte1 | byte2 | byte3 | byte4;
+		k *= c1;
+		k = rotate_left(k, r1);
+		k *= c2;
+
+		seed ^= k;
+		seed = rotate_left(seed, r2) * m + n;
+	}
+
+	tail = (data + len4 * sizeof(uint32_t));
+
+	switch (len & (sizeof(uint32_t) - 1)) {
+	case 3:
+		k1 ^= ((uint32_t)tail[2]) << 16;
+		/*-fallthrough*/
+	case 2:
+		k1 ^= ((uint32_t)tail[1]) << 8;
+		/*-fallthrough*/
+	case 1:
+		k1 ^= ((uint32_t)tail[0]) << 0;
+		k1 *= c1;
+		k1 = rotate_left(k1, r1);
+		k1 *= c2;
+		seed ^= k1;
+		break;
+	}
+
+	seed ^= (uint32_t)len;
+	seed ^= (seed >> 16);
+	seed *= 0x85ebca6b;
+	seed ^= (seed >> 13);
+	seed *= 0xc2b2ae35;
+	seed ^= (seed >> 16);
+
+	return seed;
+}
+
+void fill_bloom_key(const char *data,
+		    size_t len,
+		    struct bloom_key *key,
+		    const struct bloom_filter_settings *settings)
+{
+	int i;
+	const uint32_t seed0 = 0x293ae76f;
+	const uint32_t seed1 = 0x7e646e2c;
+	const uint32_t hash0 = murmur3_seeded(seed0, data, len);
+	const uint32_t hash1 = murmur3_seeded(seed1, data, len);
+
+	key->hashes = (uint32_t *)xcalloc(settings->num_hashes, sizeof(uint32_t));
+	for (i = 0; i < settings->num_hashes; i++)
+		key->hashes[i] = hash0 + i * hash1;
+}
+
+void clear_bloom_key(struct bloom_key *key)
+{
+	FREE_AND_NULL(key->hashes);
+}
+
+void add_key_to_filter(const struct bloom_key *key,
+		       struct bloom_filter *filter,
+		       const struct bloom_filter_settings *settings)
+{
+	int i;
+	uint64_t mod = filter->len * BITS_PER_WORD;
+
+	for (i = 0; i < settings->num_hashes; i++) {
+		uint64_t hash_mod = key->hashes[i] % mod;
+		uint64_t block_pos = hash_mod / BITS_PER_WORD;
+
+		filter->data[block_pos] |= get_bitmask(hash_mod);
+	}
+}
+
+void init_bloom_filters(void)
+{
+	init_bloom_filter_slab(&bloom_filters);
+}
+
+static int pathmap_cmp(const void *hashmap_cmp_fn_data,
+		       const struct hashmap_entry *eptr,
+		       const struct hashmap_entry *entry_or_key,
+		       const void *keydata)
+{
+	const struct pathmap_hash_entry *e1, *e2;
+
+	e1 = container_of(eptr, const struct pathmap_hash_entry, entry);
+	e2 = container_of(entry_or_key, const struct pathmap_hash_entry, entry);
+
+	return strcmp(e1->path, e2->path);
+}
+
+static void init_truncated_large_filter(struct bloom_filter *filter)
+{
+	filter->data = xmalloc(1);
+	filter->data[0] = 0xFF;
+	filter->len = 1;
+}
+
+struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
+						 struct commit *c,
+						 int compute_if_not_present,
+						 const struct bloom_filter_settings *settings,
+						 enum bloom_filter_computed *computed)
+{
+	struct bloom_filter *filter;
+	int i;
+	struct diff_options diffopt;
+
+	if (computed)
+		*computed = BLOOM_NOT_COMPUTED;
+
+	if (!bloom_filters.slab_size)
+		return NULL;
+
+	filter = bloom_filter_slab_at(&bloom_filters, c);
+
+	if (!filter->data) {
+		load_commit_graph_info(r, c);
+		if (commit_graph_position(c) != COMMIT_NOT_FROM_GRAPH)
+			load_bloom_filter_from_graph(r->objects->commit_graph, filter, c);
+	}
+
+	if (filter->data && filter->len)
+		return filter;
+	if (!compute_if_not_present)
+		return NULL;
+
+	repo_diff_setup(r, &diffopt);
+	diffopt.flags.recursive = 1;
+	diffopt.detect_rename = 0;
+	diffopt.max_changes = settings->max_changed_paths;
+	diff_setup_done(&diffopt);
+
+	/* ensure commit is parsed so we have parent information */
+	repo_parse_commit(r, c);
+
+	if (c->parents)
+		diff_tree_oid(&c->parents->item->object.oid, &c->object.oid, "", &diffopt);
+	else
+		diff_tree_oid(NULL, &c->object.oid, "", &diffopt);
+	diffcore_std(&diffopt);
+
+	if (diff_queued_diff.nr <= settings->max_changed_paths) {
+		struct hashmap pathmap = HASHMAP_INIT(pathmap_cmp, NULL);
+		struct pathmap_hash_entry *e;
+		struct hashmap_iter iter;
+
+		for (i = 0; i < diff_queued_diff.nr; i++) {
+			const char *path = diff_queued_diff.queue[i]->two->path;
+
+			/*
+			 * Add each leading directory of the changed file, i.e. for
+			 * 'dir/subdir/file' add 'dir' and 'dir/subdir' as well, so
+			 * the Bloom filter could be used to speed up commands like
+			 * 'git log dir/subdir', too.
+			 *
+			 * Note that directories are added without the trailing '/'.
+			 */
+			do {
+				char *last_slash = strrchr(path, '/');
+
+				FLEX_ALLOC_STR(e, path, path);
+				hashmap_entry_init(&e->entry, strhash(path));
+
+				if (!hashmap_get(&pathmap, &e->entry, NULL))
+					hashmap_add(&pathmap, &e->entry);
+				else
+					free(e);
+
+				if (!last_slash)
+					last_slash = (char*)path;
+				*last_slash = '\0';
+
+			} while (*path);
+
+			diff_free_filepair(diff_queued_diff.queue[i]);
+		}
+
+		if (hashmap_get_size(&pathmap) > settings->max_changed_paths) {
+			init_truncated_large_filter(filter);
+			if (computed)
+				*computed |= BLOOM_TRUNC_LARGE;
+			goto cleanup;
+		}
+
+		filter->len = (hashmap_get_size(&pathmap) * settings->bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD;
+		if (!filter->len) {
+			if (computed)
+				*computed |= BLOOM_TRUNC_EMPTY;
+			filter->len = 1;
+		}
+		CALLOC_ARRAY(filter->data, filter->len);
+
+		hashmap_for_each_entry(&pathmap, &iter, e, entry) {
+			struct bloom_key key;
+			fill_bloom_key(e->path, strlen(e->path), &key, settings);
+			add_key_to_filter(&key, filter, settings);
+			clear_bloom_key(&key);
+		}
+
+	cleanup:
+		hashmap_clear_and_free(&pathmap, struct pathmap_hash_entry, entry);
+	} else {
+		for (i = 0; i < diff_queued_diff.nr; i++)
+			diff_free_filepair(diff_queued_diff.queue[i]);
+		init_truncated_large_filter(filter);
+
+		if (computed)
+			*computed |= BLOOM_TRUNC_LARGE;
+	}
+
+	if (computed)
+		*computed |= BLOOM_COMPUTED;
+
+	free(diff_queued_diff.queue);
+	DIFF_QUEUE_CLEAR(&diff_queued_diff);
+
+	return filter;
+}
+
+int bloom_filter_contains(const struct bloom_filter *filter,
+			  const struct bloom_key *key,
+			  const struct bloom_filter_settings *settings)
+{
+	int i;
+	uint64_t mod = filter->len * BITS_PER_WORD;
+
+	if (!mod)
+		return -1;
+
+	for (i = 0; i < settings->num_hashes; i++) {
+		uint64_t hash_mod = key->hashes[i] % mod;
+		uint64_t block_pos = hash_mod / BITS_PER_WORD;
+		if (!(filter->data[block_pos] & get_bitmask(hash_mod)))
+			return 0;
+	}
+
+	return 1;
+}
diff --git a/bloom.h b/bloom.h
new file mode 100644
index 0000000000..adde6dfe21
--- /dev/null
+++ b/bloom.h
@@ -0,0 +1,112 @@
+#ifndef BLOOM_H
+#define BLOOM_H
+
+struct commit;
+struct repository;
+
+struct bloom_filter_settings {
+	/*
+	 * The version of the hashing technique being used.
+	 * We currently only support version = 1 which is
+	 * the seeded murmur3 hashing technique implemented
+	 * in bloom.c.
+	 */
+	uint32_t hash_version;
+
+	/*
+	 * The number of times a path is hashed, i.e. the
+	 * number of bit positions tht cumulatively
+	 * determine whether a path is present in the
+	 * Bloom filter.
+	 */
+	uint32_t num_hashes;
+
+	/*
+	 * The minimum number of bits per entry in the Bloom
+	 * filter. If the filter contains 'n' entries, then
+	 * filter size is the minimum number of 8-bit words
+	 * that contain n*b bits.
+	 */
+	uint32_t bits_per_entry;
+
+	/*
+	 * The maximum number of changed paths per commit
+	 * before declaring a Bloom filter to be too-large.
+	 *
+	 * Not written to the commit-graph file.
+	 */
+	uint32_t max_changed_paths;
+};
+
+#define DEFAULT_BLOOM_MAX_CHANGES 512
+#define DEFAULT_BLOOM_FILTER_SETTINGS { 1, 7, 10, DEFAULT_BLOOM_MAX_CHANGES }
+#define BITS_PER_WORD 8
+#define BLOOMDATA_CHUNK_HEADER_SIZE 3 * sizeof(uint32_t)
+
+/*
+ * A bloom_filter struct represents a data segment to
+ * use when testing hash values. The 'len' member
+ * dictates how many entries are stored in
+ * 'data'.
+ */
+struct bloom_filter {
+	unsigned char *data;
+	size_t len;
+};
+
+/*
+ * A bloom_key represents the k hash values for a
+ * given string. These can be precomputed and
+ * stored in a bloom_key for re-use when testing
+ * against a bloom_filter. The number of hashes is
+ * given by the Bloom filter settings and is the same
+ * for all Bloom filters and keys interacting with
+ * the loaded version of the commit graph file and
+ * the Bloom data chunks.
+ */
+struct bloom_key {
+	uint32_t *hashes;
+};
+
+/*
+ * Calculate the murmur3 32-bit hash value for the given data
+ * using the given seed.
+ * Produces a uniformly distributed hash value.
+ * Not considered to be cryptographically secure.
+ * Implemented as described in https://en.wikipedia.org/wiki/MurmurHash#Algorithm
+ */
+uint32_t murmur3_seeded(uint32_t seed, const char *data, size_t len);
+
+void fill_bloom_key(const char *data,
+		    size_t len,
+		    struct bloom_key *key,
+		    const struct bloom_filter_settings *settings);
+void clear_bloom_key(struct bloom_key *key);
+
+void add_key_to_filter(const struct bloom_key *key,
+		       struct bloom_filter *filter,
+		       const struct bloom_filter_settings *settings);
+
+void init_bloom_filters(void);
+
+enum bloom_filter_computed {
+	BLOOM_NOT_COMPUTED = (1 << 0),
+	BLOOM_COMPUTED     = (1 << 1),
+	BLOOM_TRUNC_LARGE  = (1 << 2),
+	BLOOM_TRUNC_EMPTY  = (1 << 3),
+};
+
+struct bloom_filter *get_or_compute_bloom_filter(struct repository *r,
+						 struct commit *c,
+						 int compute_if_not_present,
+						 const struct bloom_filter_settings *settings,
+						 enum bloom_filter_computed *computed);
+
+#define get_bloom_filter(r, c) get_or_compute_bloom_filter( \
+	(r), (c), 0, NULL, NULL)
+
+int bloom_filter_contains(const struct bloom_filter *filter,
+			  const struct bloom_key *key,
+			  const struct bloom_filter_settings *settings);
+
+#endif
diff --git a/branch.c b/branch.c
index 579494738a..7a88a4861e 100644
--- a/branch.c
+++ b/branch.c
@@ -281,7 +281,7 @@ void create_branch(struct repository *r,
 		die(_("Not a valid object name: '%s'."), start_name);
 	}
 
-	switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref)) {
+	switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref, 0)) {
 	case 0:
 		/* Not branching from any existing branch */
 		if (explicit_tracking)
@@ -294,7 +294,7 @@ void create_branch(struct repository *r,
 			if (explicit_tracking)
 				die(_(upstream_not_branch), start_name);
 			else
-				real_ref = NULL;
+				FREE_AND_NULL(real_ref);
 		}
 		break;
 	default:
@@ -322,7 +322,7 @@ void create_branch(struct repository *r,
 		transaction = ref_transaction_begin(&err);
 		if (!transaction ||
 		    ref_transaction_update(transaction, ref.buf,
-					   &oid, forcing ? NULL : &null_oid,
+					   &oid, forcing ? NULL : null_oid(),
 					   0, msg, &err) ||
 		    ref_transaction_commit(transaction, &err))
 			die("%s", err.buf);
@@ -344,6 +344,8 @@ void remove_merge_branch_state(struct repository *r)
 	unlink(git_path_merge_rr(r));
 	unlink(git_path_merge_msg(r));
 	unlink(git_path_merge_mode(r));
+	unlink(git_path_auto_merge(r));
+	save_autostash(git_path_merge_autostash(r));
 }
 
 void remove_branch_state(struct repository *r, int verbose)
@@ -369,7 +371,7 @@ int replace_each_worktree_head_symref(const char *oldref, const char *newref,
 				      const char *logmsg)
 {
 	int ret = 0;
-	struct worktree **worktrees = get_worktrees(0);
+	struct worktree **worktrees = get_worktrees();
 	int i;
 
 	for (i = 0; worktrees[i]; i++) {
diff --git a/builtin.h b/builtin.h
index 5cf5df69f7..16ecd5586f 100644
--- a/builtin.h
+++ b/builtin.h
@@ -94,25 +94,9 @@
  * command.
  */
 
-#define DEFAULT_MERGE_LOG_LEN 20
-
 extern const char git_usage_string[];
 extern const char git_more_info_string[];
 
-#define PRUNE_PACKED_DRY_RUN 01
-#define PRUNE_PACKED_VERBOSE 02
-
-void prune_packed_objects(int);
-
-struct fmt_merge_msg_opts {
-	unsigned add_title:1,
-		credit_people:1;
-	int shortlog_len;
-};
-
-int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
-		  struct fmt_merge_msg_opts *);
-
 /**
  * If a built-in has DELAY_PAGER_CONFIG set, the built-in should call this early
  * when it wishes to respect the `pager.foo`-config. The `cmd` is the name of
@@ -135,9 +119,11 @@ int cmd_archive(int argc, const char **argv, const char *prefix);
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix);
 int cmd_blame(int argc, const char **argv, const char *prefix);
 int cmd_branch(int argc, const char **argv, const char *prefix);
+int cmd_bugreport(int argc, const char **argv, const char *prefix);
 int cmd_bundle(int argc, const char **argv, const char *prefix);
 int cmd_cat_file(int argc, const char **argv, const char *prefix);
 int cmd_checkout(int argc, const char **argv, const char *prefix);
+int cmd_checkout__worker(int argc, const char **argv, const char *prefix);
 int cmd_checkout_index(int argc, const char **argv, const char *prefix);
 int cmd_check_attr(int argc, const char **argv, const char *prefix);
 int cmd_check_ignore(int argc, const char **argv, const char *prefix);
@@ -154,6 +140,9 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix);
 int cmd_config(int argc, const char **argv, const char *prefix);
 int cmd_count_objects(int argc, const char **argv, const char *prefix);
 int cmd_credential(int argc, const char **argv, const char *prefix);
+int cmd_credential_cache(int argc, const char **argv, const char *prefix);
+int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix);
+int cmd_credential_store(int argc, const char **argv, const char *prefix);
 int cmd_describe(int argc, const char **argv, const char *prefix);
 int cmd_diff_files(int argc, const char **argv, const char *prefix);
 int cmd_diff_index(int argc, const char **argv, const char *prefix);
@@ -162,10 +151,12 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix);
 int cmd_difftool(int argc, const char **argv, const char *prefix);
 int cmd_env__helper(int argc, const char **argv, const char *prefix);
 int cmd_fast_export(int argc, const char **argv, const char *prefix);
+int cmd_fast_import(int argc, const char **argv, const char *prefix);
 int cmd_fetch(int argc, const char **argv, const char *prefix);
 int cmd_fetch_pack(int argc, const char **argv, const char *prefix);
 int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix);
 int cmd_for_each_ref(int argc, const char **argv, const char *prefix);
+int cmd_for_each_repo(int argc, const char **argv, const char *prefix);
 int cmd_format_patch(int argc, const char **argv, const char *prefix);
 int cmd_fsck(int argc, const char **argv, const char *prefix);
 int cmd_gc(int argc, const char **argv, const char *prefix);
@@ -183,6 +174,7 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix);
 int cmd_ls_remote(int argc, const char **argv, const char *prefix);
 int cmd_mailinfo(int argc, const char **argv, const char *prefix);
 int cmd_mailsplit(int argc, const char **argv, const char *prefix);
+int cmd_maintenance(int argc, const char **argv, const char *prefix);
 int cmd_merge(int argc, const char **argv, const char *prefix);
 int cmd_merge_base(int argc, const char **argv, const char *prefix);
 int cmd_merge_index(int argc, const char **argv, const char *prefix);
@@ -225,6 +217,7 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix);
 int cmd_show(int argc, const char **argv, const char *prefix);
 int cmd_show_branch(int argc, const char **argv, const char *prefix);
 int cmd_show_index(int argc, const char **argv, const char *prefix);
+int cmd_sparse_checkout(int argc, const char **argv, const char *prefix);
 int cmd_status(int argc, const char **argv, const char *prefix);
 int cmd_stash(int argc, const char **argv, const char *prefix);
 int cmd_stripspace(int argc, const char **argv, const char *prefix);
diff --git a/builtin/add.c b/builtin/add.c
index dd18e5c9b6..8ec5ad9f26 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -18,8 +18,9 @@
 #include "diffcore.h"
 #include "revision.h"
 #include "bulk-checkin.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "submodule.h"
+#include "add-interactive.h"
 
 static const char * const builtin_add_usage[] = {
 	N_("git add [<options>] [--] <pathspec>..."),
@@ -28,25 +29,39 @@ static const char * const builtin_add_usage[] = {
 static int patch_interactive, add_interactive, edit_interactive;
 static int take_worktree_changes;
 static int add_renormalize;
+static int pathspec_file_nul;
+static const char *pathspec_from_file;
+static int legacy_stash_p; /* support for the scripted `git stash` */
 
 struct update_callback_data {
 	int flags;
 	int add_errors;
 };
 
-static void chmod_pathspec(struct pathspec *pathspec, char flip)
+static int chmod_pathspec(struct pathspec *pathspec, char flip, int show_only)
 {
-	int i;
+	int i, ret = 0;
 
 	for (i = 0; i < active_nr; i++) {
 		struct cache_entry *ce = active_cache[i];
+		int err;
+
+		if (ce_skip_worktree(ce))
+			continue;
 
 		if (pathspec && !ce_path_match(&the_index, ce, pathspec, NULL))
 			continue;
 
-		if (chmod_cache_entry(ce, flip) < 0)
-			fprintf(stderr, "cannot chmod %cx '%s'\n", flip, ce->name);
+		if (!show_only)
+			err = chmod_cache_entry(ce, flip);
+		else
+			err = S_ISREG(ce->ce_mode) ? 0 : -1;
+
+		if (err < 0)
+			ret = error(_("cannot chmod %cx '%s'"), flip, ce->name);
 	}
+
+	return ret;
 }
 
 static int fix_unmerged_status(struct diff_filepair *p,
@@ -132,6 +147,8 @@ static int renormalize_tracked_files(const struct pathspec *pathspec, int flags)
 	for (i = 0; i < active_nr; i++) {
 		struct cache_entry *ce = active_cache[i];
 
+		if (ce_skip_worktree(ce))
+			continue;
 		if (ce_stage(ce))
 			continue; /* do not touch unmerged paths */
 		if (!S_ISREG(ce->ce_mode) && !S_ISLNK(ce->ce_mode))
@@ -160,48 +177,110 @@ static char *prune_directory(struct dir_struct *dir, struct pathspec *pathspec,
 			*dst++ = entry;
 	}
 	dir->nr = dst - dir->entries;
-	add_pathspec_matches_against_index(pathspec, &the_index, seen);
+	add_pathspec_matches_against_index(pathspec, &the_index, seen,
+					   PS_IGNORE_SKIP_WORKTREE);
 	return seen;
 }
 
-static void refresh(int verbose, const struct pathspec *pathspec)
+static int refresh(int verbose, const struct pathspec *pathspec)
 {
 	char *seen;
-	int i;
+	int i, ret = 0;
+	char *skip_worktree_seen = NULL;
+	struct string_list only_match_skip_worktree = STRING_LIST_INIT_NODUP;
+	int flags = REFRESH_IGNORE_SKIP_WORKTREE |
+		    (verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET);
+	struct pattern_list pl = { 0 };
+	int sparse_checkout_enabled = !get_sparse_checkout_patterns(&pl);
 
 	seen = xcalloc(pathspec->nr, 1);
-	refresh_index(&the_index, verbose ? REFRESH_IN_PORCELAIN : REFRESH_QUIET,
-		      pathspec, seen, _("Unstaged changes after refreshing the index:"));
+	refresh_index(&the_index, flags, pathspec, seen,
+		      _("Unstaged changes after refreshing the index:"));
 	for (i = 0; i < pathspec->nr; i++) {
-		if (!seen[i])
-			die(_("pathspec '%s' did not match any files"),
-			    pathspec->items[i].match);
+		if (!seen[i]) {
+			const char *path = pathspec->items[i].original;
+			int dtype = DT_REG;
+
+			if (matches_skip_worktree(pathspec, i, &skip_worktree_seen) ||
+			    (sparse_checkout_enabled &&
+			     !path_matches_pattern_list(path, strlen(path), NULL,
+							&dtype, &pl, &the_index))) {
+				string_list_append(&only_match_skip_worktree,
+						   pathspec->items[i].original);
+			} else {
+				die(_("pathspec '%s' did not match any files"),
+				    pathspec->items[i].original);
+			}
+		}
 	}
+
+	if (only_match_skip_worktree.nr) {
+		advise_on_updating_sparse_paths(&only_match_skip_worktree);
+		ret = 1;
+	}
+
 	free(seen);
+	free(skip_worktree_seen);
+	string_list_clear(&only_match_skip_worktree, 0);
+	return ret;
 }
 
 int run_add_interactive(const char *revision, const char *patch_mode,
 			const struct pathspec *pathspec)
 {
 	int status, i;
-	struct argv_array argv = ARGV_ARRAY_INIT;
+	struct strvec argv = STRVEC_INIT;
+	int use_builtin_add_i =
+		git_env_bool("GIT_TEST_ADD_I_USE_BUILTIN", -1);
+
+	if (use_builtin_add_i < 0) {
+		int experimental;
+		if (!git_config_get_bool("add.interactive.usebuiltin",
+					 &use_builtin_add_i))
+			; /* ok */
+		else if (!git_config_get_bool("feature.experimental", &experimental) &&
+			 experimental)
+			use_builtin_add_i = 1;
+	}
 
-	argv_array_push(&argv, "add--interactive");
+	if (use_builtin_add_i == 1) {
+		enum add_p_mode mode;
+
+		if (!patch_mode)
+			return !!run_add_i(the_repository, pathspec);
+
+		if (!strcmp(patch_mode, "--patch"))
+			mode = ADD_P_ADD;
+		else if (!strcmp(patch_mode, "--patch=stash"))
+			mode = ADD_P_STASH;
+		else if (!strcmp(patch_mode, "--patch=reset"))
+			mode = ADD_P_RESET;
+		else if (!strcmp(patch_mode, "--patch=checkout"))
+			mode = ADD_P_CHECKOUT;
+		else if (!strcmp(patch_mode, "--patch=worktree"))
+			mode = ADD_P_WORKTREE;
+		else
+			die("'%s' not supported", patch_mode);
+
+		return !!run_add_p(the_repository, mode, revision, pathspec);
+	}
+
+	strvec_push(&argv, "add--interactive");
 	if (patch_mode)
-		argv_array_push(&argv, patch_mode);
+		strvec_push(&argv, patch_mode);
 	if (revision)
-		argv_array_push(&argv, revision);
-	argv_array_push(&argv, "--");
+		strvec_push(&argv, revision);
+	strvec_push(&argv, "--");
 	for (i = 0; i < pathspec->nr; i++)
 		/* pass original pathspec, to be re-parsed */
-		argv_array_push(&argv, pathspec->items[i].original);
+		strvec_push(&argv, pathspec->items[i].original);
 
-	status = run_command_v_opt(argv.argv, RUN_GIT_CMD);
-	argv_array_clear(&argv);
+	status = run_command_v_opt(argv.v, RUN_GIT_CMD);
+	strvec_clear(&argv);
 	return status;
 }
 
-int interactive_add(int argc, const char **argv, const char *prefix, int patch)
+int interactive_add(const char **argv, const char *prefix, int patch)
 {
 	struct pathspec pathspec;
 
@@ -240,9 +319,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))
@@ -298,10 +375,10 @@ static struct option builtin_add_options[] = {
 	OPT_BOOL(0, "renormalize", &add_renormalize, N_("renormalize EOL of tracked files (implies -u)")),
 	OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")),
 	OPT_BOOL('A', "all", &addremove_explicit, N_("add changes from all tracked and untracked files")),
-	{ OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit,
+	OPT_CALLBACK_F(0, "ignore-removal", &addremove_explicit,
 	  NULL /* takes no arguments */,
 	  N_("ignore paths removed in the working tree (same as --no-all)"),
-	  PARSE_OPT_NOARG, ignore_removal_cb },
+	  PARSE_OPT_NOARG, ignore_removal_cb),
 	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")),
@@ -309,6 +386,10 @@ static struct option builtin_add_options[] = {
 		   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(),
 };
 
@@ -319,6 +400,7 @@ static int add_config(const char *var, const char *value, void *cb)
 		ignore_add_errors = git_config_bool(var, value);
 		return 0;
 	}
+
 	return git_default_config(var, value, cb);
 }
 
@@ -369,7 +451,10 @@ static int add_files(struct dir_struct *dir, int flags)
 		fprintf(stderr, _(ignore_error));
 		for (i = 0; i < dir->ignored_nr; i++)
 			fprintf(stderr, "%s\n", dir->ignored[i]->name);
-		fprintf(stderr, _("Use -f if you really want to add them.\n"));
+		if (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\""));
 		exit_status = 1;
 	}
 
@@ -389,7 +474,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 {
 	int exit_status = 0;
 	struct pathspec pathspec;
-	struct dir_struct dir;
+	struct dir_struct dir = DIR_INIT;
 	int flags;
 	int add_new_files;
 	int require_pathspec;
@@ -402,11 +487,30 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 			  builtin_add_usage, PARSE_OPT_KEEP_ARGV0);
 	if (patch_interactive)
 		add_interactive = 1;
-	if (add_interactive)
-		exit(interactive_add(argc - 1, argv + 1, prefix, patch_interactive));
+	if (add_interactive) {
+		if (show_only)
+			die(_("--dry-run is incompatible with --interactive/--patch"));
+		if (pathspec_from_file)
+			die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
+		exit(interactive_add(argv + 1, prefix, patch_interactive));
+	}
+	if (legacy_stash_p) {
+		struct pathspec pathspec;
 
-	if (edit_interactive)
+		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"));
 		return(edit_patch(argc, argv, prefix));
+	}
 	argc--;
 	argv++;
 
@@ -418,10 +522,6 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 	if (addremove && take_worktree_changes)
 		die(_("-A and -u are mutually incompatible"));
 
-	if (!take_worktree_changes && addremove_explicit < 0 && argc)
-		/* Turn "git add pathspec..." to "git add -A pathspec..." */
-		addremove = 1;
-
 	if (!show_only && ignore_missing)
 		die(_("Option --ignore-missing can only be used together with --dry-run"));
 
@@ -432,20 +532,10 @@ 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));
 
-	hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
-
-	flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
-		 (show_only ? ADD_CACHE_PRETEND : 0) |
-		 (intent_to_add ? ADD_CACHE_INTENT : 0) |
-		 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
-		 (!(addremove || take_worktree_changes)
-		  ? ADD_CACHE_IGNORE_REMOVAL : 0));
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
 
-	if (require_pathspec && argc == 0) {
-		fprintf(stderr, _("Nothing specified, nothing added.\n"));
-		fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n"));
-		return 0;
-	}
+	hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
 
 	/*
 	 * Check the "pathspec '%s' did not match any files" block
@@ -456,6 +546,38 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		       PATHSPEC_SYMLINK_LEADING_PATH,
 		       prefix, argv);
 
+	if (pathspec_from_file) {
+		if (pathspec.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		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"));
+	}
+
+	if (require_pathspec && pathspec.nr == 0) {
+		fprintf(stderr, _("Nothing specified, nothing added.\n"));
+		if (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\""));
+		return 0;
+	}
+
+	if (!take_worktree_changes && addremove_explicit < 0 && pathspec.nr)
+		/* Turn "git add pathspec..." to "git add -A pathspec..." */
+		addremove = 1;
+
+	flags = ((verbose ? ADD_CACHE_VERBOSE : 0) |
+		 (show_only ? ADD_CACHE_PRETEND : 0) |
+		 (intent_to_add ? ADD_CACHE_INTENT : 0) |
+		 (ignore_add_errors ? ADD_CACHE_IGNORE_ERRORS : 0) |
+		 (!(addremove || take_worktree_changes)
+		  ? ADD_CACHE_IGNORE_REMOVAL : 0));
+
 	if (read_cache_preload(&pathspec) < 0)
 		die(_("index file corrupt"));
 
@@ -466,7 +588,6 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		int baselen;
 
 		/* Set up the default git porcelain excludes */
-		memset(&dir, 0, sizeof(dir));
 		if (!ignored_too) {
 			dir.flags |= DIR_COLLECT_IGNORED;
 			setup_standard_excludes(&dir);
@@ -479,15 +600,18 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 	}
 
 	if (refresh_only) {
-		refresh(verbose, &pathspec);
+		exit_status |= refresh(verbose, &pathspec);
 		goto finish;
 	}
 
 	if (pathspec.nr) {
 		int i;
+		char *skip_worktree_seen = NULL;
+		struct string_list only_match_skip_worktree = STRING_LIST_INIT_NODUP;
 
 		if (!seen)
-			seen = find_pathspecs_matching_against_index(&pathspec, &the_index);
+			seen = find_pathspecs_matching_against_index(&pathspec,
+					&the_index, PS_IGNORE_SKIP_WORKTREE);
 
 		/*
 		 * file_exists() assumes exact match
@@ -501,12 +625,24 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 
 		for (i = 0; i < pathspec.nr; i++) {
 			const char *path = pathspec.items[i].match;
+
 			if (pathspec.items[i].magic & PATHSPEC_EXCLUDE)
 				continue;
-			if (!seen[i] && path[0] &&
-			    ((pathspec.items[i].magic &
-			      (PATHSPEC_GLOB | PATHSPEC_ICASE)) ||
-			     !file_exists(path))) {
+			if (seen[i])
+				continue;
+
+			if (matches_skip_worktree(&pathspec, i, &skip_worktree_seen)) {
+				string_list_append(&only_match_skip_worktree,
+						   pathspec.items[i].original);
+				continue;
+			}
+
+			/* Don't complain at 'git add .' on empty repo */
+			if (!path[0])
+				continue;
+
+			if ((pathspec.items[i].magic & (PATHSPEC_GLOB | PATHSPEC_ICASE)) ||
+			    !file_exists(path)) {
 				if (ignore_missing) {
 					int dtype = DT_UNKNOWN;
 					if (is_excluded(&dir, &the_index, path, &dtype))
@@ -517,7 +653,16 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 					    pathspec.items[i].original);
 			}
 		}
+
+
+		if (only_match_skip_worktree.nr) {
+			advise_on_updating_sparse_paths(&only_match_skip_worktree);
+			exit_status = 1;
+		}
+
 		free(seen);
+		free(skip_worktree_seen);
+		string_list_clear(&only_match_skip_worktree, 0);
 	}
 
 	plug_bulk_checkin();
@@ -531,7 +676,7 @@ int cmd_add(int argc, const char **argv, const char *prefix)
 		exit_status |= add_files(&dir, flags);
 
 	if (chmod_arg && pathspec.nr)
-		chmod_pathspec(&pathspec, chmod_arg[0]);
+		exit_status |= chmod_pathspec(&pathspec, chmod_arg[0], show_only);
 	unplug_bulk_checkin();
 
 finish:
@@ -539,7 +684,7 @@ finish:
 			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		die(_("Unable to write new index file"));
 
+	dir_clear(&dir);
 	UNLEAK(pathspec);
-	UNLEAK(dir);
 	return exit_status;
 }
diff --git a/builtin/am.c b/builtin/am.c
index 8181c2aef3..0c2ad96b70 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -81,6 +81,11 @@ enum signoff_type {
 	SIGNOFF_EXPLICIT /* --signoff was set on the command-line */
 };
 
+enum show_patch_type {
+	SHOW_PATCH_RAW = 0,
+	SHOW_PATCH_DIFF = 1,
+};
+
 struct am_state {
 	/* state directory path */
 	char *dir;
@@ -111,7 +116,8 @@ struct am_state {
 	int keep; /* enum keep_type */
 	int message_id;
 	int scissors; /* enum scissors_type */
-	struct argv_array git_apply_opts;
+	int quoted_cr; /* enum quoted_cr_action */
+	struct strvec git_apply_opts;
 	const char *resolvemsg;
 	int committer_date_is_author_date;
 	int ignore_date;
@@ -140,8 +146,9 @@ static void am_state_init(struct am_state *state)
 	git_config_get_bool("am.messageid", &state->message_id);
 
 	state->scissors = SCISSORS_UNSET;
+	state->quoted_cr = quoted_cr_unset;
 
-	argv_array_init(&state->git_apply_opts);
+	strvec_init(&state->git_apply_opts);
 
 	if (!git_config_get_bool("commit.gpgsign", &gpgsign))
 		state->sign_commit = gpgsign ? "" : NULL;
@@ -157,7 +164,17 @@ static void am_state_release(struct am_state *state)
 	free(state->author_email);
 	free(state->author_date);
 	free(state->msg);
-	argv_array_clear(&state->git_apply_opts);
+	strvec_clear(&state->git_apply_opts);
+}
+
+static int am_option_parse_quoted_cr(const struct option *opt,
+				     const char *arg, int unset)
+{
+	BUG_ON_OPT_NEG(unset);
+
+	if (mailinfo_parse_quoted_cr_action(arg, opt->value) != 0)
+		return error(_("bad action '%s' for '%s'"), arg, "--quoted-cr");
+	return 0;
 }
 
 /**
@@ -193,6 +210,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;
@@ -392,9 +410,15 @@ static void am_load(struct am_state *state)
 	else
 		state->scissors = SCISSORS_UNSET;
 
+	read_state_file(&sb, state, "quoted-cr", 1);
+	if (!*sb.buf)
+		state->quoted_cr = quoted_cr_unset;
+	else if (mailinfo_parse_quoted_cr_action(sb.buf, &state->quoted_cr) != 0)
+		die(_("could not parse %s"), am_path(state, "quoted-cr"));
+
 	read_state_file(&sb, state, "apply-opt", 1);
-	argv_array_clear(&state->git_apply_opts);
-	if (sq_dequote_to_argv_array(sb.buf, &state->git_apply_opts) < 0)
+	strvec_clear(&state->git_apply_opts);
+	if (sq_dequote_to_strvec(sb.buf, &state->git_apply_opts) < 0)
 		die(_("could not parse %s"), am_path(state, "apply-opt"));
 
 	state->rebasing = !!file_exists(am_path(state, "rebasing"));
@@ -447,8 +471,8 @@ static int run_post_rewrite_hook(const struct am_state *state)
 	if (!hook)
 		return 0;
 
-	argv_array_push(&cp.args, hook);
-	argv_array_push(&cp.args, "rebase");
+	strvec_push(&cp.args, hook);
+	strvec_push(&cp.args, "rebase");
 
 	cp.in = xopen(am_path(state, "rewritten"), O_RDONLY);
 	cp.stdout_to_stderr = 1;
@@ -646,16 +670,16 @@ static int split_mail_mbox(struct am_state *state, const char **paths,
 	int ret;
 
 	cp.git_cmd = 1;
-	argv_array_push(&cp.args, "mailsplit");
-	argv_array_pushf(&cp.args, "-d%d", state->prec);
-	argv_array_pushf(&cp.args, "-o%s", state->dir);
-	argv_array_push(&cp.args, "-b");
+	strvec_push(&cp.args, "mailsplit");
+	strvec_pushf(&cp.args, "-d%d", state->prec);
+	strvec_pushf(&cp.args, "-o%s", state->dir);
+	strvec_push(&cp.args, "-b");
 	if (keep_cr)
-		argv_array_push(&cp.args, "--keep-cr");
+		strvec_push(&cp.args, "--keep-cr");
 	if (mboxrd)
-		argv_array_push(&cp.args, "--mboxrd");
-	argv_array_push(&cp.args, "--");
-	argv_array_pushv(&cp.args, paths);
+		strvec_push(&cp.args, "--mboxrd");
+	strvec_push(&cp.args, "--");
+	strvec_pushv(&cp.args, paths);
 
 	ret = capture_command(&cp, &last, 8);
 	if (ret)
@@ -782,7 +806,7 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
 	const char *series_dir;
 	char *series_dir_buf;
 	FILE *fp;
-	struct argv_array patches = ARGV_ARRAY_INIT;
+	struct strvec patches = STRVEC_INIT;
 	struct strbuf sb = STRBUF_INIT;
 	int ret;
 
@@ -800,16 +824,16 @@ static int split_mail_stgit_series(struct am_state *state, const char **paths,
 		if (*sb.buf == '#')
 			continue; /* skip comment lines */
 
-		argv_array_push(&patches, mkpath("%s/%s", series_dir, sb.buf));
+		strvec_push(&patches, mkpath("%s/%s", series_dir, sb.buf));
 	}
 
 	fclose(fp);
 	strbuf_release(&sb);
 	free(series_dir_buf);
 
-	ret = split_mail_conv(stgit_patch_to_mail, state, patches.argv, keep_cr);
+	ret = split_mail_conv(stgit_patch_to_mail, state, patches.v, keep_cr);
 
-	argv_array_clear(&patches);
+	strvec_clear(&patches);
 	return ret;
 }
 
@@ -997,7 +1021,25 @@ static void am_setup(struct am_state *state, enum patch_format patch_format,
 	}
 	write_state_text(state, "scissors", str);
 
-	sq_quote_argv(&sb, state->git_apply_opts.argv);
+	switch (state->quoted_cr) {
+	case quoted_cr_unset:
+		str = "";
+		break;
+	case quoted_cr_nowarn:
+		str = "nowarn";
+		break;
+	case quoted_cr_warn:
+		str = "warn";
+		break;
+	case quoted_cr_strip:
+		str = "strip";
+		break;
+	default:
+		BUG("invalid value for state->quoted_cr");
+	}
+	write_state_text(state, "quoted-cr", str);
+
+	sq_quote_argv(&sb, state->git_apply_opts.v);
 	write_state_text(state, "apply-opt", sb.buf);
 
 	if (state->rebasing)
@@ -1157,6 +1199,18 @@ static int parse_mail(struct am_state *state, const char *mail)
 		BUG("invalid value for state->scissors");
 	}
 
+	switch (state->quoted_cr) {
+	case quoted_cr_unset:
+		break;
+	case quoted_cr_nowarn:
+	case quoted_cr_warn:
+	case quoted_cr_strip:
+		mi.quoted_cr = state->quoted_cr;
+		break;
+	default:
+		BUG("invalid value for state->quoted_cr");
+	}
+
 	mi.input = xfopen(mail, "r");
 	mi.output = xfopen(am_path(state, "info"), "w");
 	if (mailinfo(&mi, am_path(state, "msg"), am_path(state, "patch")))
@@ -1385,8 +1439,8 @@ static int parse_mail_rebase(struct am_state *state, const char *mail)
  */
 static int run_apply(const struct am_state *state, const char *index_file)
 {
-	struct argv_array apply_paths = ARGV_ARRAY_INIT;
-	struct argv_array apply_opts = ARGV_ARRAY_INIT;
+	struct strvec apply_paths = STRVEC_INIT;
+	struct strvec apply_opts = STRVEC_INIT;
 	struct apply_state apply_state;
 	int res, opts_left;
 	int force_apply = 0;
@@ -1395,10 +1449,10 @@ static int run_apply(const struct am_state *state, const char *index_file)
 	if (init_apply_state(&apply_state, the_repository, NULL))
 		BUG("init_apply_state() failed");
 
-	argv_array_push(&apply_opts, "apply");
-	argv_array_pushv(&apply_opts, state->git_apply_opts.argv);
+	strvec_push(&apply_opts, "apply");
+	strvec_pushv(&apply_opts, state->git_apply_opts.v);
 
-	opts_left = apply_parse_options(apply_opts.argc, apply_opts.argv,
+	opts_left = apply_parse_options(apply_opts.nr, apply_opts.v,
 					&apply_state, &force_apply, &options,
 					NULL);
 
@@ -1421,12 +1475,12 @@ static int run_apply(const struct am_state *state, const char *index_file)
 	if (check_apply_state(&apply_state, force_apply))
 		BUG("check_apply_state() failed");
 
-	argv_array_push(&apply_paths, am_path(state, "patch"));
+	strvec_push(&apply_paths, am_path(state, "patch"));
 
-	res = apply_all_patches(&apply_state, apply_paths.argc, apply_paths.argv, options);
+	res = apply_all_patches(&apply_state, apply_paths.nr, apply_paths.v, options);
 
-	argv_array_clear(&apply_paths);
-	argv_array_clear(&apply_opts);
+	strvec_clear(&apply_paths);
+	strvec_clear(&apply_opts);
 	clear_apply_state(&apply_state);
 
 	if (res)
@@ -1449,10 +1503,10 @@ static int build_fake_ancestor(const struct am_state *state, const char *index_f
 	struct child_process cp = CHILD_PROCESS_INIT;
 
 	cp.git_cmd = 1;
-	argv_array_push(&cp.args, "apply");
-	argv_array_pushv(&cp.args, state->git_apply_opts.argv);
-	argv_array_pushf(&cp.args, "--build-fake-ancestor=%s", index_file);
-	argv_array_push(&cp.args, am_path(state, "patch"));
+	strvec_push(&cp.args, "apply");
+	strvec_pushv(&cp.args, state->git_apply_opts.v);
+	strvec_pushf(&cp.args, "--build-fake-ancestor=%s", index_file);
+	strvec_push(&cp.args, am_path(state, "patch"));
 
 	if (run_command(&cp))
 		return -1;
@@ -1551,7 +1605,7 @@ static void do_commit(const struct am_state *state)
 	struct object_id tree, parent, commit;
 	const struct object_id *old_oid;
 	struct commit_list *parents = NULL;
-	const char *reflog_msg, *author;
+	const char *reflog_msg, *author, *committer = NULL;
 	struct strbuf sb = STRBUF_INIT;
 
 	if (run_hook_le(NULL, "pre-applypatch", NULL))
@@ -1575,11 +1629,16 @@ static void do_commit(const struct am_state *state)
 			IDENT_STRICT);
 
 	if (state->committer_date_is_author_date)
-		setenv("GIT_COMMITTER_DATE",
-			state->ignore_date ? "" : state->author_date, 1);
-
-	if (commit_tree(state->msg, state->msg_len, &tree, parents, &commit,
-			author, state->sign_commit))
+		committer = fmt_ident(getenv("GIT_COMMITTER_NAME"),
+				      getenv("GIT_COMMITTER_EMAIL"),
+				      WANT_COMMITTER_IDENT,
+				      state->ignore_date ? NULL
+							 : state->author_date,
+				      IDENT_STRICT);
+
+	if (commit_tree_extended(state->msg, state->msg_len, &tree, parents,
+				 &commit, author, committer, state->sign_commit,
+				 NULL))
 		die(_("failed to write commit object"));
 
 	reflog_msg = getenv("GIT_REFLOG_ACTION");
@@ -1671,7 +1730,7 @@ static int do_interactive(struct am_state *state)
 			if (!pager)
 				pager = "cat";
 			prepare_pager_args(&cp, pager);
-			argv_array_push(&cp.args, am_path(state, "patch"));
+			strvec_push(&cp.args, am_path(state, "patch"));
 			run_command(&cp);
 		}
 	}
@@ -1686,7 +1745,6 @@ static int do_interactive(struct am_state *state)
  */
 static void am_run(struct am_state *state, int resume)
 {
-	const char *argv_gc_auto[] = {"gc", "--auto", NULL};
 	struct strbuf sb = STRBUF_INIT;
 
 	unlink(am_path(state, "dirtyindex"));
@@ -1763,7 +1821,7 @@ static void am_run(struct am_state *state, int resume)
 				linelen(state->msg), state->msg);
 
 			if (advice_amworkdir)
-				advise(_("Use 'git am --show-current-patch' to see the failed patch"));
+				advise(_("Use 'git am --show-current-patch=diff' to see the failed patch"));
 
 			die_user_resolve(state);
 		}
@@ -1791,7 +1849,7 @@ next:
 	if (!state->rebasing) {
 		am_destroy(state);
 		close_object_store(the_repository->objects);
-		run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
+		run_auto_maintenance(state->quiet);
 	}
 }
 
@@ -2061,7 +2119,7 @@ static void am_abort(struct am_state *state)
 	am_destroy(state);
 }
 
-static int show_patch(struct am_state *state)
+static int show_patch(struct am_state *state, enum show_patch_type sub_mode)
 {
 	struct strbuf sb = STRBUF_INIT;
 	const char *patch_path;
@@ -2078,7 +2136,17 @@ static int show_patch(struct am_state *state)
 		return ret;
 	}
 
-	patch_path = am_path(state, msgnum(state));
+	switch (sub_mode) {
+	case SHOW_PATCH_RAW:
+		patch_path = am_path(state, msgnum(state));
+		break;
+	case SHOW_PATCH_DIFF:
+		patch_path = am_path(state, "patch");
+		break;
+	default:
+		BUG("invalid mode for --show-current-patch");
+	}
+
 	len = strbuf_read_file(&sb, patch_path, 0);
 	if (len < 0)
 		die_errno(_("failed to read '%s'"), patch_path);
@@ -2118,7 +2186,7 @@ static int parse_opt_patchformat(const struct option *opt, const char *arg, int
 	return 0;
 }
 
-enum resume_mode {
+enum resume_type {
 	RESUME_FALSE = 0,
 	RESUME_APPLY,
 	RESUME_RESOLVED,
@@ -2128,6 +2196,47 @@ enum resume_mode {
 	RESUME_SHOW_PATCH
 };
 
+struct resume_mode {
+	enum resume_type mode;
+	enum show_patch_type sub_mode;
+};
+
+static int parse_opt_show_current_patch(const struct option *opt, const char *arg, int unset)
+{
+	int *opt_value = opt->value;
+	struct resume_mode *resume = container_of(opt_value, struct resume_mode, mode);
+
+	/*
+	 * Please update $__git_showcurrentpatch in git-completion.bash
+	 * when you add new options
+	 */
+	const char *valid_modes[] = {
+		[SHOW_PATCH_DIFF] = "diff",
+		[SHOW_PATCH_RAW] = "raw"
+	};
+	int new_value = SHOW_PATCH_RAW;
+
+	BUG_ON_OPT_NEG(unset);
+
+	if (arg) {
+		for (new_value = 0; new_value < ARRAY_SIZE(valid_modes); new_value++) {
+			if (!strcmp(arg, valid_modes[new_value]))
+				break;
+		}
+		if (new_value >= ARRAY_SIZE(valid_modes))
+			return error(_("Invalid value for --show-current-patch: %s"), arg);
+	}
+
+	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]);
+
+	resume->mode = RESUME_SHOW_PATCH;
+	resume->sub_mode = new_value;
+	return 0;
+}
+
 static int git_am_config(const char *k, const char *v, void *cb)
 {
 	int status;
@@ -2145,7 +2254,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 	int binary = -1;
 	int keep_cr = -1;
 	int patch_format = PATCH_FORMAT_UNKNOWN;
-	enum resume_mode resume = RESUME_FALSE;
+	struct resume_mode resume = { .mode = RESUME_FALSE };
 	int in_progress;
 	int ret = 0;
 
@@ -2164,7 +2273,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 			N_("allow fall back on 3way merging if needed")),
 		OPT__QUIET(&state.quiet, N_("be quiet")),
 		OPT_SET_INT('s', "signoff", &state.signoff,
-			N_("add a Signed-off-by line to the commit message"),
+			N_("add a Signed-off-by trailer to the commit message"),
 			SIGNOFF_EXPLICIT),
 		OPT_BOOL('u', "utf8", &state.utf8,
 			N_("recode into utf8 (default)")),
@@ -2182,6 +2291,9 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 			0, PARSE_OPT_NONEG),
 		OPT_BOOL('c', "scissors", &state.scissors,
 			N_("strip everything before a scissors line")),
+		OPT_CALLBACK_F(0, "quoted-cr", &state.quoted_cr, N_("action"),
+			       N_("pass it through git-mailinfo"),
+			       PARSE_OPT_NONEG, am_option_parse_quoted_cr),
 		OPT_PASSTHRU_ARGV(0, "whitespace", &state.git_apply_opts, N_("action"),
 			N_("pass it through git-apply"),
 			0),
@@ -2214,24 +2326,26 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 			PARSE_OPT_NOARG),
 		OPT_STRING(0, "resolvemsg", &state.resolvemsg, NULL,
 			N_("override error message when patch failure occurs")),
-		OPT_CMDMODE(0, "continue", &resume,
+		OPT_CMDMODE(0, "continue", &resume.mode,
 			N_("continue applying patches after resolving a conflict"),
 			RESUME_RESOLVED),
-		OPT_CMDMODE('r', "resolved", &resume,
+		OPT_CMDMODE('r', "resolved", &resume.mode,
 			N_("synonyms for --continue"),
 			RESUME_RESOLVED),
-		OPT_CMDMODE(0, "skip", &resume,
+		OPT_CMDMODE(0, "skip", &resume.mode,
 			N_("skip the current patch"),
 			RESUME_SKIP),
-		OPT_CMDMODE(0, "abort", &resume,
-			N_("restore the original branch and abort the patching operation."),
+		OPT_CMDMODE(0, "abort", &resume.mode,
+			N_("restore the original branch and abort the patching operation"),
 			RESUME_ABORT),
-		OPT_CMDMODE(0, "quit", &resume,
-			N_("abort the patching operation but keep HEAD where it is."),
+		OPT_CMDMODE(0, "quit", &resume.mode,
+			N_("abort the patching operation but keep HEAD where it is"),
 			RESUME_QUIT),
-		OPT_CMDMODE(0, "show-current-patch", &resume,
-			N_("show the patch being applied."),
-			RESUME_SHOW_PATCH),
+		{ OPTION_CALLBACK, 0, "show-current-patch", &resume.mode,
+		  "(diff|raw)",
+		  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_BOOL(0, "committer-date-is-author-date",
 			&state.committer_date_is_author_date,
 			N_("lie about committer date")),
@@ -2281,17 +2395,17 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		 *    intend to feed us a patch but wanted to continue
 		 *    unattended.
 		 */
-		if (argc || (resume == RESUME_FALSE && !isatty(0)))
+		if (argc || (resume.mode == RESUME_FALSE && !isatty(0)))
 			die(_("previous rebase directory %s still exists but mbox given."),
 				state.dir);
 
-		if (resume == RESUME_FALSE)
-			resume = RESUME_APPLY;
+		if (resume.mode == RESUME_FALSE)
+			resume.mode = RESUME_APPLY;
 
 		if (state.signoff == SIGNOFF_EXPLICIT)
 			am_append_signoff(&state);
 	} else {
-		struct argv_array paths = ARGV_ARRAY_INIT;
+		struct strvec paths = STRVEC_INIT;
 		int i;
 
 		/*
@@ -2300,7 +2414,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		 * stray directories.
 		 */
 		if (file_exists(state.dir) && !state.rebasing) {
-			if (resume == RESUME_ABORT || resume == RESUME_QUIT) {
+			if (resume.mode == RESUME_ABORT || resume.mode == RESUME_QUIT) {
 				am_destroy(&state);
 				am_state_release(&state);
 				return 0;
@@ -2311,25 +2425,25 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 				state.dir);
 		}
 
-		if (resume)
+		if (resume.mode)
 			die(_("Resolve operation not in progress, we are not resuming."));
 
 		for (i = 0; i < argc; i++) {
 			if (is_absolute_path(argv[i]) || !prefix)
-				argv_array_push(&paths, argv[i]);
+				strvec_push(&paths, argv[i]);
 			else
-				argv_array_push(&paths, mkpath("%s/%s", prefix, argv[i]));
+				strvec_push(&paths, mkpath("%s/%s", prefix, argv[i]));
 		}
 
-		if (state.interactive && !paths.argc)
+		if (state.interactive && !paths.nr)
 			die(_("interactive mode requires patches on the command line"));
 
-		am_setup(&state, patch_format, paths.argv, keep_cr);
+		am_setup(&state, patch_format, paths.v, keep_cr);
 
-		argv_array_clear(&paths);
+		strvec_clear(&paths);
 	}
 
-	switch (resume) {
+	switch (resume.mode) {
 	case RESUME_FALSE:
 		am_run(&state, 0);
 		break;
@@ -2350,7 +2464,7 @@ int cmd_am(int argc, const char **argv, const char *prefix)
 		am_destroy(&state);
 		break;
 	case RESUME_SHOW_PATCH:
-		ret = show_patch(&state);
+		ret = show_patch(&state, resume.sub_mode);
 		break;
 	default:
 		BUG("invalid resume value");
diff --git a/builtin/annotate.c b/builtin/annotate.c
index da413ae0d1..58ff977a23 100644
--- a/builtin/annotate.c
+++ b/builtin/annotate.c
@@ -5,18 +5,18 @@
  */
 #include "git-compat-util.h"
 #include "builtin.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 int cmd_annotate(int argc, const char **argv, const char *prefix)
 {
-	struct argv_array args = ARGV_ARRAY_INIT;
+	struct strvec args = STRVEC_INIT;
 	int i;
 
-	argv_array_pushl(&args, "annotate", "-c", NULL);
+	strvec_pushl(&args, "annotate", "-c", NULL);
 
 	for (i = 1; i < argc; i++) {
-		argv_array_push(&args, argv[i]);
+		strvec_push(&args, argv[i]);
 	}
 
-	return cmd_blame(args.argc, args.argv, prefix);
+	return cmd_blame(args.nr, args.v, prefix);
 }
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 1fbe156e67..f184eaeac6 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -4,34 +4,40 @@
 #include "bisect.h"
 #include "refs.h"
 #include "dir.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "run-command.h"
 #include "prompt.h"
 #include "quote.h"
+#include "revision.h"
 
 static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
 static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
 static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
 static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
-static GIT_PATH_FUNC(git_path_bisect_head, "BISECT_HEAD")
 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 const char * const git_bisect_helper_usage[] = {
-	N_("git bisect--helper --next-all [--no-checkout]"),
-	N_("git bisect--helper --write-terms <bad_term> <good_term>"),
-	N_("git bisect--helper --bisect-clean-state"),
 	N_("git bisect--helper --bisect-reset [<commit>]"),
-	N_("git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> <bad_term>"),
-	N_("git bisect--helper --bisect-check-and-set-terms <command> <good_term> <bad_term>"),
 	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-{old,good}=<term> --term-{new,bad}=<term>]"
-					     "[--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"),
+	N_("git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}=<term>]"
+					    " [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<paths>...]"),
+	N_("git bisect--helper --bisect-next"),
+	N_("git bisect--helper --bisect-state (bad|new) [<rev>]"),
+	N_("git bisect--helper --bisect-state (good|old) [<rev>...]"),
+	N_("git bisect--helper --bisect-replay <filename>"),
+	N_("git bisect--helper --bisect-skip [(<rev>|<range>)...]"),
 	NULL
 };
 
+struct add_bisect_ref_data {
+	struct rev_info *revs;
+	unsigned int object_flags;
+};
+
 struct bisect_terms {
 	char *term_good;
 	char *term_bad;
@@ -52,8 +58,10 @@ static void set_terms(struct bisect_terms *terms, const char *bad,
 	terms->term_bad = xstrdup(bad);
 }
 
-static const char *vocab_bad = "bad|new";
-static const char *vocab_good = "good|old";
+static const char vocab_bad[] = "bad|new";
+static const char vocab_good[] = "good|old";
+
+static int bisect_autostart(struct bisect_terms *terms);
 
 /*
  * Check whether the string `term` belongs to the set of strings
@@ -74,6 +82,67 @@ static int one_of(const char *term, ...)
 	return res;
 }
 
+/*
+ * return code BISECT_INTERNAL_SUCCESS_MERGE_BASE
+ * and BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND are codes
+ * that indicate special success.
+ */
+
+static int is_bisect_success(enum bisect_error res)
+{
+	return !res ||
+		res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND ||
+		res == BISECT_INTERNAL_SUCCESS_MERGE_BASE;
+}
+
+static int write_in_file(const char *path, const char *mode, const char *format, va_list args)
+{
+	FILE *fp = NULL;
+	int res = 0;
+
+	if (strcmp(mode, "w") && strcmp(mode, "a"))
+		BUG("write-in-file does not support '%s' mode", mode);
+	fp = fopen(path, mode);
+	if (!fp)
+		return error_errno(_("cannot open file '%s' in mode '%s'"), path, mode);
+	res = vfprintf(fp, format, args);
+
+	if (res < 0) {
+		int saved_errno = errno;
+		fclose(fp);
+		errno = saved_errno;
+		return error_errno(_("could not write to file '%s'"), path);
+	}
+
+	return fclose(fp);
+}
+
+__attribute__((format (printf, 2, 3)))
+static int write_to_file(const char *path, const char *format, ...)
+{
+	int res;
+	va_list args;
+
+	va_start(args, format);
+	res = write_in_file(path, "w", format, args);
+	va_end(args);
+
+	return res;
+}
+
+__attribute__((format (printf, 2, 3)))
+static int append_to_file(const char *path, const char *format, ...)
+{
+	int res;
+	va_list args;
+
+	va_start(args, format);
+	res = write_in_file(path, "a", format, args);
+	va_end(args);
+
+	return res;
+}
+
 static int check_term_format(const char *term, const char *orig_term)
 {
 	int res;
@@ -104,7 +173,6 @@ static int check_term_format(const char *term, const char *orig_term)
 
 static int write_terms(const char *bad, const char *good)
 {
-	FILE *fp = NULL;
 	int res;
 
 	if (!strcmp(bad, good))
@@ -113,39 +181,11 @@ static int write_terms(const char *bad, const char *good)
 	if (check_term_format(bad, "bad") || check_term_format(good, "good"))
 		return -1;
 
-	fp = fopen(git_path_bisect_terms(), "w");
-	if (!fp)
-		return error_errno(_("could not open the file BISECT_TERMS"));
+	res = write_to_file(git_path_bisect_terms(), "%s\n%s\n", bad, good);
 
-	res = fprintf(fp, "%s\n%s\n", bad, good);
-	res |= fclose(fp);
-	return (res < 0) ? -1 : 0;
-}
-
-static int is_expected_rev(const char *expected_hex)
-{
-	struct strbuf actual_hex = STRBUF_INIT;
-	int res = 0;
-	if (strbuf_read_file(&actual_hex, git_path_bisect_expected_rev(), 0) >= 40) {
-		strbuf_trim(&actual_hex);
-		res = !strcmp(actual_hex.buf, expected_hex);
-	}
-	strbuf_release(&actual_hex);
 	return res;
 }
 
-static void check_expected_revs(const char **revs, int rev_nr)
-{
-	int i;
-
-	for (i = 0; i < rev_nr; i++) {
-		if (!is_expected_rev(revs[i])) {
-			unlink_or_warn(git_path_bisect_ancestors_ok());
-			unlink_or_warn(git_path_bisect_expected_rev());
-		}
-	}
-}
-
 static int bisect_reset(const char *commit)
 {
 	struct strbuf branch = STRBUF_INIT;
@@ -164,18 +204,19 @@ static int bisect_reset(const char *commit)
 		strbuf_addstr(&branch, commit);
 	}
 
-	if (!file_exists(git_path_bisect_head())) {
-		struct argv_array argv = ARGV_ARRAY_INIT;
+	if (!ref_exists("BISECT_HEAD")) {
+		struct strvec argv = STRVEC_INIT;
 
-		argv_array_pushl(&argv, "checkout", branch.buf, "--", NULL);
-		if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+		strvec_pushl(&argv, "checkout", branch.buf, "--", NULL);
+		if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
+			error(_("could not check out original"
+				" HEAD '%s'. Try 'git bisect"
+				" reset <commit>'."), branch.buf);
 			strbuf_release(&branch);
-			argv_array_clear(&argv);
-			return error(_("could not check out original"
-				       " HEAD '%s'. Try 'git bisect"
-				       " reset <commit>'."), branch.buf);
+			strvec_clear(&argv);
+			return -1;
 		}
-		argv_array_clear(&argv);
+		strvec_clear(&argv);
 	}
 
 	strbuf_release(&branch);
@@ -205,31 +246,31 @@ static int bisect_write(const char *state, const char *rev,
 	struct object_id oid;
 	struct commit *commit;
 	FILE *fp = NULL;
-	int retval = 0;
+	int res = 0;
 
 	if (!strcmp(state, terms->term_bad)) {
 		strbuf_addf(&tag, "refs/bisect/%s", state);
 	} else if (one_of(state, terms->term_good, "skip", NULL)) {
 		strbuf_addf(&tag, "refs/bisect/%s-%s", state, rev);
 	} else {
-		retval = error(_("Bad bisect_write argument: %s"), state);
+		res = error(_("Bad bisect_write argument: %s"), state);
 		goto finish;
 	}
 
 	if (get_oid(rev, &oid)) {
-		retval = error(_("couldn't get the oid of the rev '%s'"), rev);
+		res = error(_("couldn't get the oid of the rev '%s'"), rev);
 		goto finish;
 	}
 
 	if (update_ref(NULL, tag.buf, &oid, NULL, 0,
 		       UPDATE_REFS_MSG_ON_ERR)) {
-		retval = -1;
+		res = -1;
 		goto finish;
 	}
 
 	fp = fopen(git_path_bisect_log(), "a");
 	if (!fp) {
-		retval = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log());
+		res = error_errno(_("couldn't open the file '%s'"), git_path_bisect_log());
 		goto finish;
 	}
 
@@ -243,7 +284,7 @@ finish:
 	if (fp)
 		fclose(fp);
 	strbuf_release(&tag);
-	return retval;
+	return res;
 }
 
 static int check_and_set_terms(struct bisect_terms *terms, const char *cmd)
@@ -281,35 +322,23 @@ static int mark_good(const char *refname, const struct object_id *oid,
 	return 1;
 }
 
-static const char *need_bad_and_good_revision_warning =
+static const char need_bad_and_good_revision_warning[] =
 	N_("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.");
 
-static const char *need_bisect_start_warning =
+static const char need_bisect_start_warning[] =
 	N_("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.");
 
-static int bisect_next_check(const struct bisect_terms *terms,
-			     const char *current_term)
+static int decide_next(const struct bisect_terms *terms,
+		       const char *current_term, int missing_good,
+		       int missing_bad)
 {
-	int missing_good = 1, missing_bad = 1, retval = 0;
-	const char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
-	const char *good_glob = xstrfmt("%s-*", terms->term_good);
-
-	if (ref_exists(bad_ref))
-		missing_bad = 0;
-
-	for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/",
-			     (void *) &missing_good);
-
 	if (!missing_good && !missing_bad)
-		goto finish;
-
-	if (!current_term) {
-		retval = -1;
-		goto finish;
-	}
+		return 0;
+	if (!current_term)
+		return -1;
 
 	if (missing_good && !missing_bad &&
 	    !strcmp(current_term, terms->term_good)) {
@@ -320,7 +349,7 @@ static int bisect_next_check(const struct bisect_terms *terms,
 		 */
 		warning(_("bisecting only with a %s commit"), terms->term_bad);
 		if (!isatty(0))
-			goto finish;
+			return 0;
 		/*
 		 * TRANSLATORS: Make sure to include [Y] and [n] in your
 		 * translation. The program will only accept English input
@@ -328,21 +357,35 @@ static int bisect_next_check(const struct bisect_terms *terms,
 		 */
 		yesno = git_prompt(_("Are you sure [Y/n]? "), PROMPT_ECHO);
 		if (starts_with(yesno, "N") || starts_with(yesno, "n"))
-			retval = -1;
-		goto finish;
-	}
-	if (!is_empty_or_missing_file(git_path_bisect_start())) {
-		retval = error(_(need_bad_and_good_revision_warning),
-			       vocab_bad, vocab_good, vocab_bad, vocab_good);
-	} else {
-		retval = error(_(need_bisect_start_warning),
-			       vocab_good, vocab_bad, vocab_good, vocab_bad);
+			return -1;
+		return 0;
 	}
 
-finish:
-	free((void *) good_glob);
-	free((void *) bad_ref);
-	return retval;
+	if (!is_empty_or_missing_file(git_path_bisect_start()))
+		return error(_(need_bad_and_good_revision_warning),
+			     vocab_bad, vocab_good, vocab_bad, vocab_good);
+	else
+		return error(_(need_bisect_start_warning),
+			     vocab_good, vocab_bad, vocab_good, vocab_bad);
+}
+
+static int bisect_next_check(const struct bisect_terms *terms,
+			     const char *current_term)
+{
+	int missing_good = 1, missing_bad = 1;
+	char *bad_ref = xstrfmt("refs/bisect/%s", terms->term_bad);
+	char *good_glob = xstrfmt("%s-*", terms->term_good);
+
+	if (ref_exists(bad_ref))
+		missing_bad = 0;
+
+	for_each_glob_ref_in(mark_good, good_glob, "refs/bisect/",
+			     (void *) &missing_good);
+
+	free(good_glob);
+	free(bad_ref);
+
+	return decide_next(terms, current_term, missing_good, missing_bad);
 }
 
 static int get_terms(struct bisect_terms *terms)
@@ -396,7 +439,7 @@ static int bisect_terms(struct bisect_terms *terms, const char *option)
 
 static int bisect_append_log_quoted(const char **argv)
 {
-	int retval = 0;
+	int res = 0;
 	FILE *fp = fopen(git_path_bisect_log(), "a");
 	struct strbuf orig_args = STRBUF_INIT;
 
@@ -404,25 +447,163 @@ static int bisect_append_log_quoted(const char **argv)
 		return -1;
 
 	if (fprintf(fp, "git bisect start") < 1) {
-		retval = -1;
+		res = -1;
 		goto finish;
 	}
 
 	sq_quote_argv(&orig_args, argv);
 	if (fprintf(fp, "%s\n", orig_args.buf) < 1)
-		retval = -1;
+		res = -1;
 
 finish:
 	fclose(fp);
 	strbuf_release(&orig_args);
-	return retval;
+	return res;
+}
+
+static int add_bisect_ref(const char *refname, const struct object_id *oid,
+			  int flags, void *cb)
+{
+	struct add_bisect_ref_data *data = cb;
+
+	add_pending_oid(data->revs, refname, oid, data->object_flags);
+
+	return 0;
+}
+
+static int prepare_revs(struct bisect_terms *terms, struct rev_info *revs)
+{
+	int res = 0;
+	struct add_bisect_ref_data cb = { revs };
+	char *good = xstrfmt("%s-*", terms->term_good);
+
+	/*
+	 * We cannot use terms->term_bad directly in
+	 * for_each_glob_ref_in() and we have to append a '*' to it,
+	 * otherwise for_each_glob_ref_in() will append '/' and '*'.
+	 */
+	char *bad = xstrfmt("%s*", terms->term_bad);
+
+	/*
+	 * It is important to reset the flags used by revision walks
+	 * as the previous call to bisect_next_all() in turn
+	 * sets up a revision walk.
+	 */
+	reset_revision_walk();
+	init_revisions(revs, NULL);
+	setup_revisions(0, NULL, revs, NULL);
+	for_each_glob_ref_in(add_bisect_ref, bad, "refs/bisect/", &cb);
+	cb.object_flags = UNINTERESTING;
+	for_each_glob_ref_in(add_bisect_ref, good, "refs/bisect/", &cb);
+	if (prepare_revision_walk(revs))
+		res = error(_("revision walk setup failed\n"));
+
+	free(good);
+	free(bad);
+	return res;
+}
+
+static int bisect_skipped_commits(struct bisect_terms *terms)
+{
+	int res;
+	FILE *fp = NULL;
+	struct rev_info revs;
+	struct commit *commit;
+	struct pretty_print_context pp = {0};
+	struct strbuf commit_name = STRBUF_INIT;
+
+	res = prepare_revs(terms, &revs);
+	if (res)
+		return res;
+
+	fp = fopen(git_path_bisect_log(), "a");
+	if (!fp)
+		return error_errno(_("could not open '%s' for appending"),
+				  git_path_bisect_log());
+
+	if (fprintf(fp, "# only skipped commits left to test\n") < 0)
+		return error_errno(_("failed to write to '%s'"), git_path_bisect_log());
+
+	while ((commit = get_revision(&revs)) != NULL) {
+		strbuf_reset(&commit_name);
+		format_commit_message(commit, "%s",
+				      &commit_name, &pp);
+		fprintf(fp, "# possible first %s commit: [%s] %s\n",
+			terms->term_bad, oid_to_hex(&commit->object.oid),
+			commit_name.buf);
+	}
+
+	/*
+	 * Reset the flags used by revision walks in case
+	 * there is another revision walk after this one.
+	 */
+	reset_revision_walk();
+
+	strbuf_release(&commit_name);
+	fclose(fp);
+	return 0;
 }
 
-static int bisect_start(struct bisect_terms *terms, int no_checkout,
-			const char **argv, int argc)
+static int bisect_successful(struct bisect_terms *terms)
 {
+	struct object_id oid;
+	struct commit *commit;
+	struct pretty_print_context pp = {0};
+	struct strbuf commit_name = STRBUF_INIT;
+	char *bad_ref = xstrfmt("refs/bisect/%s",terms->term_bad);
+	int res;
+
+	read_ref(bad_ref, &oid);
+	commit = lookup_commit_reference_by_name(bad_ref);
+	format_commit_message(commit, "%s", &commit_name, &pp);
+
+	res = append_to_file(git_path_bisect_log(), "# first %s commit: [%s] %s\n",
+			    terms->term_bad, oid_to_hex(&commit->object.oid),
+			    commit_name.buf);
+
+	strbuf_release(&commit_name);
+	free(bad_ref);
+	return res;
+}
+
+static enum bisect_error bisect_next(struct bisect_terms *terms, const char *prefix)
+{
+	enum bisect_error res;
+
+	if (bisect_autostart(terms))
+		return BISECT_FAILED;
+
+	if (bisect_next_check(terms, terms->term_good))
+		return BISECT_FAILED;
+
+	/* Perform all bisection computation */
+	res = bisect_next_all(the_repository, prefix);
+
+	if (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND) {
+		res = bisect_successful(terms);
+		return res ? res : BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND;
+	} else if (res == BISECT_ONLY_SKIPPED_LEFT) {
+		res = bisect_skipped_commits(terms);
+		return res ? res : BISECT_ONLY_SKIPPED_LEFT;
+	}
+	return res;
+}
+
+static enum bisect_error bisect_auto_next(struct bisect_terms *terms, const char *prefix)
+{
+	if (bisect_next_check(terms, NULL))
+		return BISECT_OK;
+
+	return bisect_next(terms, prefix);
+}
+
+static enum bisect_error bisect_start(struct bisect_terms *terms, const char **argv, int argc)
+{
+	int no_checkout = 0;
+	int first_parent_only = 0;
 	int i, has_double_dash = 0, must_write_terms = 0, bad_seen = 0;
-	int flags, pathspec_pos, retval = 0;
+	int flags, pathspec_pos;
+	enum bisect_error res = BISECT_OK;
 	struct string_list revs = STRING_LIST_INIT_DUP;
 	struct string_list states = STRING_LIST_INIT_DUP;
 	struct strbuf start_head = STRBUF_INIT;
@@ -450,11 +631,16 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 			break;
 		} else if (!strcmp(arg, "--no-checkout")) {
 			no_checkout = 1;
+		} else if (!strcmp(arg, "--first-parent")) {
+			first_parent_only = 1;
 		} else if (!strcmp(arg, "--term-good") ||
 			 !strcmp(arg, "--term-old")) {
+			i++;
+			if (argc <= i)
+				return error(_("'' is not a valid term"));
 			must_write_terms = 1;
 			free((void *) terms->term_good);
-			terms->term_good = xstrdup(argv[++i]);
+			terms->term_good = xstrdup(argv[i]);
 		} else if (skip_prefix(arg, "--term-good=", &arg) ||
 			   skip_prefix(arg, "--term-old=", &arg)) {
 			must_write_terms = 1;
@@ -462,25 +648,26 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 			terms->term_good = xstrdup(arg);
 		} else if (!strcmp(arg, "--term-bad") ||
 			 !strcmp(arg, "--term-new")) {
+			i++;
+			if (argc <= i)
+				return error(_("'' is not a valid term"));
 			must_write_terms = 1;
 			free((void *) terms->term_bad);
-			terms->term_bad = xstrdup(argv[++i]);
+			terms->term_bad = xstrdup(argv[i]);
 		} else if (skip_prefix(arg, "--term-bad=", &arg) ||
 			   skip_prefix(arg, "--term-new=", &arg)) {
 			must_write_terms = 1;
 			free((void *) terms->term_bad);
 			terms->term_bad = xstrdup(arg);
-		} else if (starts_with(arg, "--") &&
-			 !one_of(arg, "--term-good", "--term-bad", NULL)) {
+		} else if (starts_with(arg, "--")) {
 			return error(_("unrecognized option: '%s'"), arg);
-		} else {
-			char *commit_id = xstrfmt("%s^{commit}", arg);
-			if (get_oid(commit_id, &oid) && has_double_dash)
-				die(_("'%s' does not appear to be a valid "
-				      "revision"), arg);
-
+		} else if (!get_oidf(&oid, "%s^{commit}", arg)) {
 			string_list_append(&revs, oid_to_hex(&oid));
-			free(commit_id);
+		} else if (has_double_dash) {
+			die(_("'%s' does not appear to be a valid "
+			      "revision"), arg);
+		} else {
+			break;
 		}
 	}
 	pathspec_pos = i;
@@ -518,12 +705,12 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 		strbuf_read_file(&start_head, git_path_bisect_start(), 0);
 		strbuf_trim(&start_head);
 		if (!no_checkout) {
-			struct argv_array argv = ARGV_ARRAY_INIT;
+			struct strvec argv = STRVEC_INIT;
 
-			argv_array_pushl(&argv, "checkout", start_head.buf,
-					 "--", NULL);
-			if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
-				retval = error(_("checking out '%s' failed."
+			strvec_pushl(&argv, "checkout", start_head.buf,
+				     "--", NULL);
+			if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
+				res = error(_("checking out '%s' failed."
 						 " Try 'git bisect start "
 						 "<valid-branch>'."),
 					       start_head.buf);
@@ -555,28 +742,24 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 	 * Get rid of any old bisect state.
 	 */
 	if (bisect_clean_state())
-		return -1;
-
-	/*
-	 * In case of mistaken revs or checkout error, or signals received,
-	 * "bisect_auto_next" below may exit or misbehave.
-	 * We have to trap this to be able to clean up using
-	 * "bisect_clean_state".
-	 */
+		return BISECT_FAILED;
 
 	/*
 	 * Write new start state
 	 */
 	write_file(git_path_bisect_start(), "%s\n", start_head.buf);
 
+	if (first_parent_only)
+		write_file(git_path_bisect_first_parent(), "\n");
+
 	if (no_checkout) {
 		if (get_oid(start_head.buf, &oid) < 0) {
-			retval = error(_("invalid ref: '%s'"), start_head.buf);
+			res = error(_("invalid ref: '%s'"), start_head.buf);
 			goto finish;
 		}
 		if (update_ref(NULL, "BISECT_HEAD", &oid, NULL, 0,
 			       UPDATE_REFS_MSG_ON_ERR)) {
-			retval = -1;
+			res = BISECT_FAILED;
 			goto finish;
 		}
 	}
@@ -588,66 +771,305 @@ static int bisect_start(struct bisect_terms *terms, int no_checkout,
 	for (i = 0; i < states.nr; i++)
 		if (bisect_write(states.items[i].string,
 				 revs.items[i].string, terms, 1)) {
-			retval = -1;
+			res = BISECT_FAILED;
 			goto finish;
 		}
 
 	if (must_write_terms && write_terms(terms->term_bad,
 					    terms->term_good)) {
-		retval = -1;
+		res = BISECT_FAILED;
 		goto finish;
 	}
 
-	retval = bisect_append_log_quoted(argv);
-	if (retval)
-		retval = -1;
+	res = bisect_append_log_quoted(argv);
+	if (res)
+		res = BISECT_FAILED;
 
 finish:
 	string_list_clear(&revs, 0);
 	string_list_clear(&states, 0);
 	strbuf_release(&start_head);
 	strbuf_release(&bisect_names);
-	return retval;
+	if (res)
+		return res;
+
+	res = bisect_auto_next(terms, NULL);
+	if (!is_bisect_success(res))
+		bisect_clean_state();
+	return res;
+}
+
+static inline int file_is_not_empty(const char *path)
+{
+	return !is_empty_or_missing_file(path);
+}
+
+static int bisect_autostart(struct bisect_terms *terms)
+{
+	int res;
+	const char *yesno;
+
+	if (file_is_not_empty(git_path_bisect_start()))
+		return 0;
+
+	fprintf_ln(stderr, _("You need to start by \"git bisect "
+			  "start\"\n"));
+
+	if (!isatty(STDIN_FILENO))
+		return -1;
+
+	/*
+	 * TRANSLATORS: Make sure to include [Y] and [n] in your
+	 * translation. The program will only accept English input
+	 * at this point.
+	 */
+	yesno = git_prompt(_("Do you want me to do it for you "
+			     "[Y/n]? "), PROMPT_ECHO);
+	res = tolower(*yesno) == 'n' ?
+		-1 : bisect_start(terms, empty_strvec, 0);
+
+	return res;
+}
+
+static enum bisect_error bisect_state(struct bisect_terms *terms, const char **argv,
+				      int argc)
+{
+	const char *state;
+	int i, verify_expected = 1;
+	struct object_id oid, expected;
+	struct strbuf buf = STRBUF_INIT;
+	struct oid_array revs = OID_ARRAY_INIT;
+
+	if (!argc)
+		return error(_("Please call `--bisect-state` with at least one argument"));
+
+	if (bisect_autostart(terms))
+		return BISECT_FAILED;
+
+	state = argv[0];
+	if (check_and_set_terms(terms, state) ||
+	    !one_of(state, terms->term_good, terms->term_bad, "skip", NULL))
+		return BISECT_FAILED;
+
+	argv++;
+	argc--;
+	if (argc > 1 && !strcmp(state, terms->term_bad))
+		return error(_("'git bisect %s' can take only one argument."), terms->term_bad);
+
+	if (argc == 0) {
+		const char *head = "BISECT_HEAD";
+		enum get_oid_result res_head = get_oid(head, &oid);
+
+		if (res_head == MISSING_OBJECT) {
+			head = "HEAD";
+			res_head = get_oid(head, &oid);
+		}
+
+		if (res_head)
+			error(_("Bad rev input: %s"), head);
+		oid_array_append(&revs, &oid);
+	}
+
+	/*
+	 * All input revs must be checked before executing bisect_write()
+	 * to discard junk revs.
+	 */
+
+	for (; argc; argc--, argv++) {
+		struct commit *commit;
+
+		if (get_oid(*argv, &oid)){
+			error(_("Bad rev input: %s"), *argv);
+			oid_array_clear(&revs);
+			return BISECT_FAILED;
+		}
+
+		commit = lookup_commit_reference(the_repository, &oid);
+		if (!commit)
+			die(_("Bad rev input (not a commit): %s"), *argv);
+
+		oid_array_append(&revs, &commit->object.oid);
+	}
+
+	if (strbuf_read_file(&buf, git_path_bisect_expected_rev(), 0) < the_hash_algo->hexsz ||
+	    get_oid_hex(buf.buf, &expected) < 0)
+		verify_expected = 0; /* Ignore invalid file contents */
+	strbuf_release(&buf);
+
+	for (i = 0; i < revs.nr; i++) {
+		if (bisect_write(state, oid_to_hex(&revs.oid[i]), terms, 0)) {
+			oid_array_clear(&revs);
+			return BISECT_FAILED;
+		}
+		if (verify_expected && !oideq(&revs.oid[i], &expected)) {
+			unlink_or_warn(git_path_bisect_ancestors_ok());
+			unlink_or_warn(git_path_bisect_expected_rev());
+			verify_expected = 0;
+		}
+	}
+
+	oid_array_clear(&revs);
+	return bisect_auto_next(terms, NULL);
+}
+
+static enum bisect_error bisect_log(void)
+{
+	int fd, status;
+	const char* filename = git_path_bisect_log();
+
+	if (is_empty_or_missing_file(filename))
+		return error(_("We are not bisecting."));
+
+	fd = open(filename, O_RDONLY);
+	if (fd < 0)
+		return BISECT_FAILED;
+
+	status = copy_fd(fd, STDOUT_FILENO);
+	close(fd);
+	return status ? BISECT_FAILED : BISECT_OK;
+}
+
+static int process_replay_line(struct bisect_terms *terms, struct strbuf *line)
+{
+	const char *p = line->buf + strspn(line->buf, " \t");
+	char *word_end, *rev;
+
+	if ((!skip_prefix(p, "git bisect", &p) &&
+	!skip_prefix(p, "git-bisect", &p)) || !isspace(*p))
+		return 0;
+	p += strspn(p, " \t");
+
+	word_end = (char *)p + strcspn(p, " \t");
+	rev = word_end + strspn(word_end, " \t");
+	*word_end = '\0'; /* NUL-terminate the word */
+
+	get_terms(terms);
+	if (check_and_set_terms(terms, p))
+		return -1;
+
+	if (!strcmp(p, "start")) {
+		struct strvec argv = STRVEC_INIT;
+		int res;
+		sq_dequote_to_strvec(rev, &argv);
+		res = bisect_start(terms, argv.v, argv.nr);
+		strvec_clear(&argv);
+		return res;
+	}
+
+	if (one_of(p, terms->term_good,
+	   terms->term_bad, "skip", NULL))
+		return bisect_write(p, rev, terms, 0);
+
+	if (!strcmp(p, "terms")) {
+		struct strvec argv = STRVEC_INIT;
+		int res;
+		sq_dequote_to_strvec(rev, &argv);
+		res = bisect_terms(terms, argv.nr == 1 ? argv.v[0] : NULL);
+		strvec_clear(&argv);
+		return res;
+	}
+	error(_("'%s'?? what are you talking about?"), p);
+
+	return -1;
+}
+
+static enum bisect_error bisect_replay(struct bisect_terms *terms, const char *filename)
+{
+	FILE *fp = NULL;
+	enum bisect_error res = BISECT_OK;
+	struct strbuf line = STRBUF_INIT;
+
+	if (is_empty_or_missing_file(filename))
+		return error(_("cannot read file '%s' for replaying"), filename);
+
+	if (bisect_reset(NULL))
+		return BISECT_FAILED;
+
+	fp = fopen(filename, "r");
+	if (!fp)
+		return BISECT_FAILED;
+
+	while ((strbuf_getline(&line, fp) != EOF) && !res)
+		res = process_replay_line(terms, &line);
+
+	strbuf_release(&line);
+	fclose(fp);
+
+	if (res)
+		return BISECT_FAILED;
+
+	return bisect_auto_next(terms, NULL);
+}
+
+static enum bisect_error bisect_skip(struct bisect_terms *terms, const char **argv, int argc)
+{
+	int i;
+	enum bisect_error res;
+	struct strvec argv_state = STRVEC_INIT;
+
+	strvec_push(&argv_state, "skip");
+
+	for (i = 0; i < argc; i++) {
+		const char *dotdot = strstr(argv[i], "..");
+
+		if (dotdot) {
+			struct rev_info revs;
+			struct commit *commit;
+
+			init_revisions(&revs, NULL);
+			setup_revisions(2, argv + i - 1, &revs, NULL);
+
+			if (prepare_revision_walk(&revs))
+				die(_("revision walk setup failed\n"));
+			while ((commit = get_revision(&revs)) != NULL)
+				strvec_push(&argv_state,
+						oid_to_hex(&commit->object.oid));
+
+			reset_revision_walk();
+		} else {
+			strvec_push(&argv_state, argv[i]);
+		}
+	}
+	res = bisect_state(terms, argv_state.v, argv_state.nr);
+
+	strvec_clear(&argv_state);
+	return res;
 }
 
 int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 {
 	enum {
-		NEXT_ALL = 1,
-		WRITE_TERMS,
-		BISECT_CLEAN_STATE,
-		CHECK_EXPECTED_REVS,
-		BISECT_RESET,
-		BISECT_WRITE,
-		CHECK_AND_SET_TERMS,
+		BISECT_RESET = 1,
 		BISECT_NEXT_CHECK,
 		BISECT_TERMS,
-		BISECT_START
+		BISECT_START,
+		BISECT_AUTOSTART,
+		BISECT_NEXT,
+		BISECT_STATE,
+		BISECT_LOG,
+		BISECT_REPLAY,
+		BISECT_SKIP
 	} cmdmode = 0;
-	int no_checkout = 0, res = 0, nolog = 0;
+	int res = 0, nolog = 0;
 	struct option options[] = {
-		OPT_CMDMODE(0, "next-all", &cmdmode,
-			 N_("perform 'git bisect next'"), NEXT_ALL),
-		OPT_CMDMODE(0, "write-terms", &cmdmode,
-			 N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),
-		OPT_CMDMODE(0, "bisect-clean-state", &cmdmode,
-			 N_("cleanup the bisection state"), BISECT_CLEAN_STATE),
-		OPT_CMDMODE(0, "check-expected-revs", &cmdmode,
-			 N_("check for expected revs"), CHECK_EXPECTED_REVS),
 		OPT_CMDMODE(0, "bisect-reset", &cmdmode,
 			 N_("reset the bisection state"), BISECT_RESET),
-		OPT_CMDMODE(0, "bisect-write", &cmdmode,
-			 N_("write out the bisection state in BISECT_LOG"), BISECT_WRITE),
-		OPT_CMDMODE(0, "check-and-set-terms", &cmdmode,
-			 N_("check and set terms in a bisection state"), CHECK_AND_SET_TERMS),
 		OPT_CMDMODE(0, "bisect-next-check", &cmdmode,
 			 N_("check whether bad or good terms exist"), BISECT_NEXT_CHECK),
 		OPT_CMDMODE(0, "bisect-terms", &cmdmode,
 			 N_("print out the bisect terms"), BISECT_TERMS),
 		OPT_CMDMODE(0, "bisect-start", &cmdmode,
 			 N_("start the bisect session"), BISECT_START),
-		OPT_BOOL(0, "no-checkout", &no_checkout,
-			 N_("update BISECT_HEAD instead of checking out the current commit")),
+		OPT_CMDMODE(0, "bisect-next", &cmdmode,
+			 N_("find the next bisection commit"), BISECT_NEXT),
+		OPT_CMDMODE(0, "bisect-state", &cmdmode,
+			 N_("mark the state of ref (or refs)"), BISECT_STATE),
+		OPT_CMDMODE(0, "bisect-log", &cmdmode,
+			 N_("list the bisection steps so far"), BISECT_LOG),
+		OPT_CMDMODE(0, "bisect-replay", &cmdmode,
+			 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_BOOL(0, "no-log", &nolog,
 			 N_("no log for BISECT_WRITE")),
 		OPT_END()
@@ -662,34 +1084,10 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 		usage_with_options(git_bisect_helper_usage, options);
 
 	switch (cmdmode) {
-	case NEXT_ALL:
-		return bisect_next_all(the_repository, prefix, no_checkout);
-	case WRITE_TERMS:
-		if (argc != 2)
-			return error(_("--write-terms requires two arguments"));
-		return write_terms(argv[0], argv[1]);
-	case BISECT_CLEAN_STATE:
-		if (argc != 0)
-			return error(_("--bisect-clean-state requires no arguments"));
-		return bisect_clean_state();
-	case CHECK_EXPECTED_REVS:
-		check_expected_revs(argv, argc);
-		return 0;
 	case BISECT_RESET:
 		if (argc > 1)
 			return error(_("--bisect-reset requires either no argument or a commit"));
-		return !!bisect_reset(argc ? argv[0] : NULL);
-	case BISECT_WRITE:
-		if (argc != 4 && argc != 5)
-			return error(_("--bisect-write requires either 4 or 5 arguments"));
-		set_terms(&terms, argv[3], argv[2]);
-		res = bisect_write(argv[0], argv[1], &terms, nolog);
-		break;
-	case CHECK_AND_SET_TERMS:
-		if (argc != 3)
-			return error(_("--check-and-set-terms requires 3 arguments"));
-		set_terms(&terms, argv[2], argv[1]);
-		res = check_and_set_terms(&terms, argv[0]);
+		res = bisect_reset(argc ? argv[0] : NULL);
 		break;
 	case BISECT_NEXT_CHECK:
 		if (argc != 2 && argc != 3)
@@ -704,11 +1102,46 @@ int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
 		break;
 	case BISECT_START:
 		set_terms(&terms, "bad", "good");
-		res = bisect_start(&terms, no_checkout, argv, argc);
+		res = bisect_start(&terms, argv, argc);
+		break;
+	case BISECT_NEXT:
+		if (argc)
+			return error(_("--bisect-next requires 0 arguments"));
+		get_terms(&terms);
+		res = bisect_next(&terms, prefix);
+		break;
+	case BISECT_STATE:
+		set_terms(&terms, "bad", "good");
+		get_terms(&terms);
+		res = bisect_state(&terms, argv, argc);
+		break;
+	case BISECT_LOG:
+		if (argc)
+			return error(_("--bisect-log requires 0 arguments"));
+		res = bisect_log();
+		break;
+	case BISECT_REPLAY:
+		if (argc != 1)
+			return error(_("no logfile given"));
+		set_terms(&terms, "bad", "good");
+		res = bisect_replay(&terms, argv[0]);
+		break;
+	case BISECT_SKIP:
+		set_terms(&terms, "bad", "good");
+		get_terms(&terms);
+		res = bisect_skip(&terms, argv, argc);
 		break;
 	default:
-		return error("BUG: unknown subcommand '%d'", cmdmode);
+		BUG("unknown subcommand %d", cmdmode);
 	}
 	free_terms(&terms);
-	return !!res;
+
+	/*
+	 * Handle early success
+	 * From check_merge_bases > check_good_are_ancestors_of_bad > bisect_next_all
+	 */
+	if ((res == BISECT_INTERNAL_SUCCESS_MERGE_BASE) || (res == BISECT_INTERNAL_SUCCESS_1ST_BAD_FOUND))
+		res = BISECT_OK;
+
+	return -res;
 }
diff --git a/builtin/blame.c b/builtin/blame.c
index e946ba6cd9..641523ff9a 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -27,6 +27,7 @@
 #include "object-store.h"
 #include "blame.h"
 #include "refs.h"
+#include "tag.h"
 
 static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
 
@@ -319,18 +320,18 @@ static const char *format_time(timestamp_t time, const char *tz_str,
 	return time_buf.buf;
 }
 
-#define OUTPUT_ANNOTATE_COMPAT	001
-#define OUTPUT_LONG_OBJECT_NAME	002
-#define OUTPUT_RAW_TIMESTAMP	004
-#define OUTPUT_PORCELAIN	010
-#define OUTPUT_SHOW_NAME	020
-#define OUTPUT_SHOW_NUMBER	040
-#define OUTPUT_SHOW_SCORE	0100
-#define OUTPUT_NO_AUTHOR	0200
-#define OUTPUT_SHOW_EMAIL	0400
-#define OUTPUT_LINE_PORCELAIN	01000
-#define OUTPUT_COLOR_LINE	02000
-#define OUTPUT_SHOW_AGE_WITH_COLOR	04000
+#define OUTPUT_ANNOTATE_COMPAT      (1U<<0)
+#define OUTPUT_LONG_OBJECT_NAME     (1U<<1)
+#define OUTPUT_RAW_TIMESTAMP        (1U<<2)
+#define OUTPUT_PORCELAIN            (1U<<3)
+#define OUTPUT_SHOW_NAME            (1U<<4)
+#define OUTPUT_SHOW_NUMBER          (1U<<5)
+#define OUTPUT_SHOW_SCORE           (1U<<6)
+#define OUTPUT_NO_AUTHOR            (1U<<7)
+#define OUTPUT_SHOW_EMAIL           (1U<<8)
+#define OUTPUT_LINE_PORCELAIN       (1U<<9)
+#define OUTPUT_COLOR_LINE           (1U<<10)
+#define OUTPUT_SHOW_AGE_WITH_COLOR  (1U<<11)
 
 static void emit_porcelain_details(struct blame_origin *suspect, int repeat)
 {
@@ -424,13 +425,11 @@ static void setup_default_color_by_age(void)
 	parse_color_fields("blue,12 month ago,white,1 month ago,red");
 }
 
-static void determine_line_heat(struct blame_entry *ent, const char **dest_color)
+static void determine_line_heat(struct commit_info *ci, const char **dest_color)
 {
 	int i = 0;
-	struct commit_info ci;
-	get_commit_info(ent->suspect->commit, &ci, 1);
 
-	while (i < colorfield_nr && ci.author_time > colorfield[i].hop)
+	while (i < colorfield_nr && ci->author_time > colorfield[i].hop)
 		i++;
 
 	*dest_color = colorfield[i].col;
@@ -452,7 +451,7 @@ static void emit_other(struct blame_scoreboard *sb, struct blame_entry *ent, int
 	cp = blame_nth_line(sb, ent->lno);
 
 	if (opt & OUTPUT_SHOW_AGE_WITH_COLOR) {
-		determine_line_heat(ent, &default_color);
+		determine_line_heat(&ci, &default_color);
 		color = default_color;
 		reset = GIT_COLOR_RESET;
 	}
@@ -803,6 +802,28 @@ static int is_a_rev(const char *name)
 	return OBJ_NONE < oid_object_info(the_repository, &oid, NULL);
 }
 
+static int peel_to_commit_oid(struct object_id *oid_ret, void *cbdata)
+{
+	struct repository *r = ((struct blame_scoreboard *)cbdata)->repo;
+	struct object_id oid;
+
+	oidcpy(&oid, oid_ret);
+	while (1) {
+		struct object *obj;
+		int kind = oid_object_info(r, &oid, NULL);
+		if (kind == OBJ_COMMIT) {
+			oidcpy(oid_ret, &oid);
+			return 0;
+		}
+		if (kind != OBJ_TAG)
+			return -1;
+		obj = deref_tag(r, parse_object(r, &oid), NULL, 0);
+		if (!obj)
+			return -1;
+		oidcpy(&oid, &obj->oid);
+	}
+}
+
 static void build_ignorelist(struct blame_scoreboard *sb,
 			     struct string_list *ignore_revs_file_list,
 			     struct string_list *ignore_rev_list)
@@ -815,10 +836,12 @@ static void build_ignorelist(struct blame_scoreboard *sb,
 		if (!strcmp(i->string, ""))
 			oidset_clear(&sb->ignore_list);
 		else
-			oidset_parse_file(&sb->ignore_list, i->string);
+			oidset_parse_file_carefully(&sb->ignore_list, i->string,
+						    peel_to_commit_oid, sb);
 	}
 	for_each_string_list_item(i, ignore_rev_list) {
-		if (get_oid_committish(i->string, &oid))
+		if (get_oid_committish(i->string, &oid) ||
+		    peel_to_commit_oid(&oid, sb))
 			die(_("cannot find revision %s to ignore"), i->string);
 		oidset_insert(&sb->ignore_list, &oid);
 	}
@@ -841,40 +864,33 @@ int cmd_blame(int argc, const char **argv, const char *prefix)
 	const char *revs_file = NULL;
 	const char *contents_from = NULL;
 	const struct option options[] = {
-		OPT_BOOL(0, "incremental", &incremental, N_("Show blame entries as we find them, incrementally")),
-		OPT_BOOL('b', NULL, &blank_boundary, N_("Show blank SHA-1 for boundary commits (Default: off)")),
-		OPT_BOOL(0, "root", &show_root, N_("Do not treat root commits as boundaries (Default: off)")),
-		OPT_BOOL(0, "show-stats", &show_stats, N_("Show work cost statistics")),
-		OPT_BOOL(0, "progress", &show_progress, N_("Force progress reporting")),
-		OPT_BIT(0, "score-debug", &output_option, N_("Show output score for blame entries"), OUTPUT_SHOW_SCORE),
-		OPT_BIT('f', "show-name", &output_option, N_("Show original filename (Default: auto)"), OUTPUT_SHOW_NAME),
-		OPT_BIT('n', "show-number", &output_option, N_("Show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER),
-		OPT_BIT('p', "porcelain", &output_option, N_("Show in a format designed for machine consumption"), OUTPUT_PORCELAIN),
-		OPT_BIT(0, "line-porcelain", &output_option, N_("Show porcelain format with per-line commit information"), OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
-		OPT_BIT('c', NULL, &output_option, N_("Use the same output mode as git-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT),
-		OPT_BIT('t', NULL, &output_option, N_("Show raw timestamp (Default: off)"), OUTPUT_RAW_TIMESTAMP),
-		OPT_BIT('l', NULL, &output_option, N_("Show long commit SHA1 (Default: off)"), OUTPUT_LONG_OBJECT_NAME),
-		OPT_BIT('s', NULL, &output_option, N_("Suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
-		OPT_BIT('e', "show-email", &output_option, N_("Show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
-		OPT_BIT('w', NULL, &xdl_opts, N_("Ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
-		OPT_STRING_LIST(0, "ignore-rev", &ignore_rev_list, N_("rev"), N_("Ignore <rev> when blaming")),
-		OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list, N_("file"), N_("Ignore revisions from <file>")),
+		OPT_BOOL(0, "incremental", &incremental, N_("show blame entries as we find them, incrementally")),
+		OPT_BOOL('b', NULL, &blank_boundary, N_("do not show object names of boundary commits (Default: off)")),
+		OPT_BOOL(0, "root", &show_root, N_("do not treat root commits as boundaries (Default: off)")),
+		OPT_BOOL(0, "show-stats", &show_stats, N_("show work cost statistics")),
+		OPT_BOOL(0, "progress", &show_progress, N_("force progress reporting")),
+		OPT_BIT(0, "score-debug", &output_option, N_("show output score for blame entries"), OUTPUT_SHOW_SCORE),
+		OPT_BIT('f', "show-name", &output_option, N_("show original filename (Default: auto)"), OUTPUT_SHOW_NAME),
+		OPT_BIT('n', "show-number", &output_option, N_("show original linenumber (Default: off)"), OUTPUT_SHOW_NUMBER),
+		OPT_BIT('p', "porcelain", &output_option, N_("show in a format designed for machine consumption"), OUTPUT_PORCELAIN),
+		OPT_BIT(0, "line-porcelain", &output_option, N_("show porcelain format with per-line commit information"), OUTPUT_PORCELAIN|OUTPUT_LINE_PORCELAIN),
+		OPT_BIT('c', NULL, &output_option, N_("use the same output mode as git-annotate (Default: off)"), OUTPUT_ANNOTATE_COMPAT),
+		OPT_BIT('t', NULL, &output_option, N_("show raw timestamp (Default: off)"), OUTPUT_RAW_TIMESTAMP),
+		OPT_BIT('l', NULL, &output_option, N_("show long commit SHA1 (Default: off)"), OUTPUT_LONG_OBJECT_NAME),
+		OPT_BIT('s', NULL, &output_option, N_("suppress author name and timestamp (Default: off)"), OUTPUT_NO_AUTHOR),
+		OPT_BIT('e', "show-email", &output_option, N_("show author email instead of name (Default: off)"), OUTPUT_SHOW_EMAIL),
+		OPT_BIT('w', NULL, &xdl_opts, N_("ignore whitespace differences"), XDF_IGNORE_WHITESPACE),
+		OPT_STRING_LIST(0, "ignore-rev", &ignore_rev_list, N_("rev"), N_("ignore <rev> when blaming")),
+		OPT_STRING_LIST(0, "ignore-revs-file", &ignore_revs_file_list, N_("file"), N_("ignore revisions from <file>")),
 		OPT_BIT(0, "color-lines", &output_option, N_("color redundant metadata from previous line differently"), OUTPUT_COLOR_LINE),
 		OPT_BIT(0, "color-by-age", &output_option, N_("color lines by age"), OUTPUT_SHOW_AGE_WITH_COLOR),
-
-		/*
-		 * The following two options are parsed by parse_revision_opt()
-		 * and are only included here to get included in the "-h"
-		 * output:
-		 */
-		{ OPTION_LOWLEVEL_CALLBACK, 0, "indent-heuristic", NULL, NULL, N_("Use an experimental heuristic to improve diffs"), PARSE_OPT_NOARG, NULL, 0, parse_opt_unknown_cb },
-
-		OPT_BIT(0, "minimal", &xdl_opts, N_("Spend extra cycles to find better match"), XDF_NEED_MINIMAL),
-		OPT_STRING('S', NULL, &revs_file, N_("file"), N_("Use revisions from <file> instead of calling git-rev-list")),
-		OPT_STRING(0, "contents", &contents_from, N_("file"), N_("Use <file>'s contents as the final image")),
-		{ OPTION_CALLBACK, 'C', NULL, &opt, N_("score"), N_("Find line copies within and across files"), PARSE_OPT_OPTARG, blame_copy_callback },
-		{ OPTION_CALLBACK, 'M', NULL, &opt, N_("score"), N_("Find line movements within and across files"), PARSE_OPT_OPTARG, blame_move_callback },
-		OPT_STRING_LIST('L', NULL, &range_list, N_("n,m"), N_("Process only line range n,m, counting from 1")),
+		OPT_BIT(0, "minimal", &xdl_opts, N_("spend extra cycles to find better match"), XDF_NEED_MINIMAL),
+		OPT_STRING('S', NULL, &revs_file, N_("file"), N_("use revisions from <file> instead of calling git-rev-list")),
+		OPT_STRING(0, "contents", &contents_from, N_("file"), N_("use <file>'s contents as the final image")),
+		OPT_CALLBACK_F('C', NULL, &opt, N_("score"), N_("find line copies within and across files"), PARSE_OPT_OPTARG, blame_copy_callback),
+		OPT_CALLBACK_F('M', NULL, &opt, N_("score"), N_("find line movements within and across files"), PARSE_OPT_OPTARG, blame_move_callback),
+		OPT_STRING_LIST('L', NULL, &range_list, N_("range"),
+				N_("process only line range <start>,<end> or function :<funcname>")),
 		OPT__ABBREV(&abbrev),
 		OPT_END()
 	};
@@ -1065,10 +1081,19 @@ parse_done:
 	sb.contents_from = contents_from;
 	sb.reverse = reverse;
 	sb.repo = the_repository;
+	sb.path = path;
 	build_ignorelist(&sb, &ignore_revs_file_list, &ignore_rev_list);
 	string_list_clear(&ignore_revs_file_list, 0);
 	string_list_clear(&ignore_rev_list, 0);
-	setup_scoreboard(&sb, path, &o);
+	setup_scoreboard(&sb, &o);
+
+	/*
+	 * Changed-path Bloom filters are disabled when looking
+	 * for copies.
+	 */
+	if (!(opt & PICKAXE_BLAME_COPY))
+		setup_blame_bloom_data(&sb);
+
 	lno = sb.num_lines;
 
 	if (lno && !range_list.nr)
@@ -1086,7 +1111,7 @@ parse_done:
 		if ((!lno && (top || bottom)) || lno < bottom)
 			die(Q_("file %s has only %lu line",
 			       "file %s has only %lu lines",
-			       lno), path, lno);
+			       lno), sb.path, lno);
 		if (bottom < 1)
 			bottom = 1;
 		if (top < 1 || lno < top)
@@ -1111,7 +1136,6 @@ parse_done:
 	string_list_clear(&range_list, 0);
 
 	sb.ent = NULL;
-	sb.path = path;
 
 	if (blame_move_score)
 		sb.move_score = blame_move_score;
@@ -1125,7 +1149,7 @@ parse_done:
 	sb.xdl_opts = xdl_opts;
 	sb.no_whole_file_rename = no_whole_file_rename;
 
-	read_mailmap(&mailmap, NULL);
+	read_mailmap(&mailmap);
 
 	sb.found_guilty_entry = &found_guilty_entry;
 	sb.found_guilty_entry_data = &pi;
@@ -1172,5 +1196,7 @@ parse_done:
 		printf("num get patch: %d\n", sb.num_get_patch);
 		printf("num commits: %d\n", sb.num_commits);
 	}
+
+	cleanup_scoreboard(&sb);
 	return 0;
 }
diff --git a/builtin/branch.c b/builtin/branch.c
index 2ef214632f..03c7b7253a 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -26,7 +26,7 @@
 #include "commit-reach.h"
 
 static const char * const builtin_branch_usage[] = {
-	N_("git branch [<options>] [-r | -a] [--merged | --no-merged]"),
+	N_("git branch [<options>] [-r | -a] [--merged] [--no-merged]"),
 	N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
 	N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
 	N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
@@ -168,7 +168,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;
 	}
@@ -202,6 +202,9 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 	int remote_branch = 0;
 	struct strbuf bname = STRBUF_INIT;
 	unsigned allowed_interpret;
+	struct string_list refs_to_delete = STRING_LIST_INIT_DUP;
+	struct string_list_item *item;
+	int branch_name_pos;
 
 	switch (kinds) {
 	case FILTER_REFS_REMOTES:
@@ -219,6 +222,7 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 	default:
 		die(_("cannot use -a with -d"));
 	}
+	branch_name_pos = strcspn(fmt, "%");
 
 	if (!force) {
 		head_rev = lookup_commit_reference(the_repository, &head_oid);
@@ -265,30 +269,35 @@ static int delete_branches(int argc, const char **argv, int force, int kinds,
 			goto next;
 		}
 
-		if (delete_ref(NULL, name, is_null_oid(&oid) ? NULL : &oid,
-			       REF_NO_DEREF)) {
-			error(remote_branch
-			      ? _("Error deleting remote-tracking branch '%s'")
-			      : _("Error deleting branch '%s'"),
-			      bname.buf);
-			ret = 1;
-			goto next;
-		}
-		if (!quiet) {
-			printf(remote_branch
-			       ? _("Deleted remote-tracking branch %s (was %s).\n")
-			       : _("Deleted branch %s (was %s).\n"),
-			       bname.buf,
-			       (flags & REF_ISBROKEN) ? "broken"
-			       : (flags & REF_ISSYMREF) ? target
-			       : find_unique_abbrev(&oid, DEFAULT_ABBREV));
-		}
-		delete_branch_config(bname.buf);
+		item = string_list_append(&refs_to_delete, name);
+		item->util = xstrdup((flags & REF_ISBROKEN) ? "broken"
+				    : (flags & REF_ISSYMREF) ? target
+				    : find_unique_abbrev(&oid, DEFAULT_ABBREV));
 
 	next:
 		free(target);
 	}
 
+	if (delete_refs(NULL, &refs_to_delete, REF_NO_DEREF))
+		ret = 1;
+
+	for_each_string_list_item(item, &refs_to_delete) {
+		char *describe_ref = item->util;
+		char *name = item->string;
+		if (!ref_exists(name)) {
+			char *refname = name + branch_name_pos;
+			if (!quiet)
+				printf(remote_branch
+					? _("Deleted remote-tracking branch %s (was %s).\n")
+					: _("Deleted branch %s (was %s).\n"),
+					name + branch_name_pos, describe_ref);
+
+			delete_branch_config(refname);
+		}
+		free(describe_ref);
+	}
+	string_list_clear(&refs_to_delete, 0);
+
 	free(name);
 	strbuf_release(&bname);
 
@@ -402,6 +411,8 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
 {
 	int i;
 	struct ref_array array;
+	struct strbuf out = STRBUF_INIT;
+	struct strbuf err = STRBUF_INIT;
 	int maxwidth = 0;
 	const char *remote_prefix = "";
 	char *to_free = NULL;
@@ -431,8 +442,8 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
 	ref_array_sort(sorting, &array);
 
 	for (i = 0; i < array.nr; i++) {
-		struct strbuf out = STRBUF_INIT;
-		struct strbuf err = STRBUF_INIT;
+		strbuf_reset(&err);
+		strbuf_reset(&out);
 		if (format_ref_array_item(array.items[i], format, &out, &err))
 			die("%s", err.buf);
 		if (column_active(colopts)) {
@@ -443,10 +454,10 @@ static void print_ref_list(struct ref_filter *filter, struct ref_sorting *sortin
 			fwrite(out.buf, 1, out.len, stdout);
 			putchar('\n');
 		}
-		strbuf_release(&err);
-		strbuf_release(&out);
 	}
 
+	strbuf_release(&err);
+	strbuf_release(&out);
 	ref_array_clear(&array);
 	free(to_free);
 }
@@ -468,7 +479,7 @@ static void print_current_branch_name(void)
 
 static void reject_rebase_or_bisect_branch(const char *target)
 {
-	struct worktree **worktrees = get_worktrees(0);
+	struct worktree **worktrees = get_worktrees();
 	int i;
 
 	for (i = 0; worktrees[i]; i++) {
@@ -538,7 +549,9 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
 		strbuf_addf(&logmsg, "Branch: renamed %s to %s",
 			    oldref.buf, newref.buf);
 
-	if (!copy && rename_ref(oldref.buf, newref.buf, logmsg.buf))
+	if (!copy &&
+	    (!head || strcmp(oldname, head) || !is_null_oid(&head_oid)) &&
+	    rename_ref(oldref.buf, newref.buf, logmsg.buf))
 		die(_("Branch rename failed"));
 	if (copy && copy_existing_ref(oldref.buf, newref.buf, logmsg.buf))
 		die(_("Branch copy failed"));
@@ -624,7 +637,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		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")),
-		OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("Unset the upstream info")),
+		OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("unset the upstream info")),
 		OPT__COLOR(&branch_use_color, N_("use colored output")),
 		OPT_SET_INT('r', "remotes",     &filter.kind, N_("act on remote-tracking branches"),
 			FILTER_REFS_REMOTES),
@@ -653,10 +666,8 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		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),
-		{
-			OPTION_CALLBACK, 0, "points-at", &filter.points_at, N_("object"),
-			N_("print only branches of the object"), 0, parse_opt_object_name
-		},
+		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_STRING(  0 , "format", &format.format, N_("format"), N_("format to use for the output")),
 		OPT_END(),
@@ -690,12 +701,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 	    !show_current && !unset_upstream && argc == 0)
 		list = 1;
 
-	if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr ||
-	    filter.no_commit)
+	if (filter.with_commit || filter.no_commit ||
+	    filter.reachable_from || filter.unreachable_from || filter.points_at.nr)
 		list = 1;
 
 	if (!!delete + !!rename + !!copy + !!new_upstream + !!show_current +
-	    list + unset_upstream > 1)
+	    list + edit_description + unset_upstream > 1)
 		usage_with_options(builtin_branch_usage, options);
 
 	if (filter.abbrev == -1)
@@ -726,7 +737,7 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		print_current_branch_name();
 		return 0;
 	} else if (list) {
-		/*  git branch --local also shows HEAD when it is detached */
+		/*  git branch --list also shows HEAD when it is detached */
 		if ((filter.kind & FILTER_REFS_BRANCHES) && filter.detached)
 			filter.kind |= FILTER_REFS_DETACHED_HEAD;
 		filter.name_patterns = argv;
@@ -739,7 +750,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 		 */
 		if (!sorting)
 			sorting = ref_default_sorting();
-		sorting->ignore_case = icase;
+		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_columns(&output, colopts, NULL);
 		string_list_clear(&output, 0);
@@ -831,10 +844,10 @@ int cmd_branch(int argc, const char **argv, const char *prefix)
 			die(_("Branch '%s' has no upstream information"), branch->name);
 
 		strbuf_addf(&buf, "branch.%s.remote", branch->name);
-		git_config_set_multivar(buf.buf, NULL, NULL, 1);
+		git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
 		strbuf_reset(&buf);
 		strbuf_addf(&buf, "branch.%s.merge", branch->name);
-		git_config_set_multivar(buf.buf, NULL, NULL, 1);
+		git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
 		strbuf_release(&buf);
 	} else if (argc > 0 && argc <= 2) {
 		if (filter.kind != FILTER_REFS_BRANCHES)
diff --git a/builtin/bugreport.c b/builtin/bugreport.c
new file mode 100644
index 0000000000..06ed10dc92
--- /dev/null
+++ b/builtin/bugreport.c
@@ -0,0 +1,194 @@
+#include "builtin.h"
+#include "parse-options.h"
+#include "strbuf.h"
+#include "help.h"
+#include "compat/compiler.h"
+#include "run-command.h"
+
+
+static void get_system_info(struct strbuf *sys_info)
+{
+	struct utsname uname_info;
+	char *shell = NULL;
+
+	/* get git version from native cmd */
+	strbuf_addstr(sys_info, _("git version:\n"));
+	get_version_info(sys_info, 1);
+
+	/* system call for other version info */
+	strbuf_addstr(sys_info, "uname: ");
+	if (uname(&uname_info))
+		strbuf_addf(sys_info, _("uname() failed with error '%s' (%d)\n"),
+			    strerror(errno),
+			    errno);
+	else
+		strbuf_addf(sys_info, "%s %s %s %s\n",
+			    uname_info.sysname,
+			    uname_info.release,
+			    uname_info.version,
+			    uname_info.machine);
+
+	strbuf_addstr(sys_info, _("compiler info: "));
+	get_compiler_info(sys_info);
+
+	strbuf_addstr(sys_info, _("libc info: "));
+	get_libc_info(sys_info);
+
+	shell = getenv("SHELL");
+	strbuf_addf(sys_info, "$SHELL (typically, interactive shell): %s\n",
+		    shell ? shell : "<unset>");
+}
+
+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;
+
+	if (nongit) {
+		strbuf_addstr(hook_info,
+			_("not run from a git repository - no hooks to show\n"));
+		return;
+	}
+
+	for (i = 0; i < ARRAY_SIZE(hook); i++)
+		if (find_hook(hook[i]))
+			strbuf_addf(hook_info, "%s\n", hook[i]);
+}
+
+static const char * const bugreport_usage[] = {
+	N_("git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"),
+	NULL
+};
+
+static int get_bug_template(struct strbuf *template)
+{
+	const char template_text[] = N_(
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n");
+
+	strbuf_addstr(template, _(template_text));
+	return 0;
+}
+
+static void get_header(struct strbuf *buf, const char *title)
+{
+	strbuf_addf(buf, "\n\n[%s]\n", title);
+}
+
+int cmd_bugreport(int argc, const char **argv, const char *prefix)
+{
+	struct strbuf buffer = STRBUF_INIT;
+	struct strbuf report_path = STRBUF_INIT;
+	int report = -1;
+	time_t now = time(NULL);
+	struct tm tm;
+	char *option_output = NULL;
+	char *option_suffix = "%Y-%m-%d-%H%M";
+	const char *user_relative_path = NULL;
+	char *prefixed_filename;
+
+	const struct option bugreport_options[] = {
+		OPT_STRING('o', "output-directory", &option_output, N_("path"),
+			   N_("specify a destination for the bugreport file")),
+		OPT_STRING('s', "suffix", &option_suffix, N_("format"),
+			   N_("specify a strftime format suffix for the filename")),
+		OPT_END()
+	};
+
+	argc = parse_options(argc, argv, prefix, bugreport_options,
+			     bugreport_usage, 0);
+
+	/* Prepare the path to put the result */
+	prefixed_filename = prefix_filename(prefix,
+					    option_output ? option_output : "");
+	strbuf_addstr(&report_path, prefixed_filename);
+	strbuf_complete(&report_path, '/');
+
+	strbuf_addstr(&report_path, "git-bugreport-");
+	strbuf_addftime(&report_path, option_suffix, localtime_r(&now, &tm), 0, 0);
+	strbuf_addstr(&report_path, ".txt");
+
+	switch (safe_create_leading_directories(report_path.buf)) {
+	case SCLD_OK:
+	case SCLD_EXISTS:
+		break;
+	default:
+		die(_("could not create leading directories for '%s'"),
+		    report_path.buf);
+	}
+
+	/* Prepare the report contents */
+	get_bug_template(&buffer);
+
+	get_header(&buffer, _("System Info"));
+	get_system_info(&buffer);
+
+	get_header(&buffer, _("Enabled Hooks"));
+	get_populated_hooks(&buffer, !startup_info->have_repository);
+
+	/* fopen doesn't offer us an O_EXCL alternative, except with glibc. */
+	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);
+
+	close(report);
+
+	/*
+	 * We want to print the path relative to the user, but we still need the
+	 * path relative to us to give to the editor.
+	 */
+	if (!(prefix && skip_prefix(report_path.buf, prefix, &user_relative_path)))
+		user_relative_path = report_path.buf;
+	fprintf(stderr, _("Created new report at '%s'.\n"),
+		user_relative_path);
+
+	free(prefixed_filename);
+	UNLEAK(buffer);
+	UNLEAK(report_path);
+	return !!launch_editor(report_path.buf, NULL, NULL);
+}
diff --git a/builtin/bundle.c b/builtin/bundle.c
index 1ea4bfdfc1..053a51bea1 100644
--- a/builtin/bundle.c
+++ b/builtin/bundle.c
@@ -1,4 +1,6 @@
 #include "builtin.h"
+#include "strvec.h"
+#include "parse-options.h"
 #include "cache.h"
 #include "bundle.h"
 
@@ -9,59 +11,207 @@
  * bundle supporting "fetch", "pull", and "ls-remote".
  */
 
-static const char builtin_bundle_usage[] =
-  "git bundle create <file> <git-rev-list args>\n"
-  "   or: git bundle verify <file>\n"
-  "   or: git bundle list-heads <file> [<refname>...]\n"
-  "   or: git bundle unbundle <file> [<refname>...]";
+static const char * const builtin_bundle_usage[] = {
+  N_("git bundle create [<options>] <file> <git-rev-list args>"),
+  N_("git bundle verify [<options>] <file>"),
+  N_("git bundle list-heads <file> [<refname>...]"),
+  N_("git bundle unbundle <file> [<refname>...]"),
+  NULL
+};
 
-int cmd_bundle(int argc, const char **argv, const char *prefix)
-{
-	struct bundle_header header;
-	const char *cmd, *bundle_file;
+static const char * const builtin_bundle_create_usage[] = {
+  N_("git bundle create [<options>] <file> <git-rev-list args>"),
+  NULL
+};
+
+static const char * const builtin_bundle_verify_usage[] = {
+  N_("git bundle verify [<options>] <file>"),
+  NULL
+};
+
+static const char * const builtin_bundle_list_heads_usage[] = {
+  N_("git bundle list-heads <file> [<refname>...]"),
+  NULL
+};
+
+static const char * const builtin_bundle_unbundle_usage[] = {
+  N_("git bundle unbundle <file> [<refname>...]"),
+  NULL
+};
+
+static int verbose;
+
+static int parse_options_cmd_bundle(int argc,
+		const char **argv,
+		const char* prefix,
+		const char * const usagestr[],
+		const struct option options[],
+		char **bundle_file) {
+	int newargc;
+	newargc = parse_options(argc, argv, NULL, options, usagestr,
+			     PARSE_OPT_STOP_AT_NON_OPTION);
+	if (argc < 1)
+		usage_with_options(usagestr, options);
+	*bundle_file = prefix_filename(prefix, argv[0]);
+	return newargc;
+}
+
+static int cmd_bundle_create(int argc, const char **argv, const char *prefix) {
+	int all_progress_implied = 0;
+	int progress = isatty(STDERR_FILENO);
+	struct strvec pack_opts;
+	int version = -1;
+	int ret;
+	struct option options[] = {
+		OPT_SET_INT('q', "quiet", &progress,
+			    N_("do not show progress meter"), 0),
+		OPT_SET_INT(0, "progress", &progress,
+			    N_("show progress meter"), 1),
+		OPT_SET_INT(0, "all-progress", &progress,
+			    N_("show progress meter during object writing phase"), 2),
+		OPT_BOOL(0, "all-progress-implied",
+			 &all_progress_implied,
+			 N_("similar to --all-progress when progress meter is shown")),
+		OPT_INTEGER(0, "version", &version,
+			    N_("specify bundle format version")),
+		OPT_END()
+	};
+	char *bundle_file;
+
+	argc = parse_options_cmd_bundle(argc, argv, prefix,
+			builtin_bundle_create_usage, options, &bundle_file);
+	/* bundle internals use argv[1] as further parameters */
+
+	strvec_init(&pack_opts);
+	if (progress == 0)
+		strvec_push(&pack_opts, "--quiet");
+	else if (progress == 1)
+		strvec_push(&pack_opts, "--progress");
+	else if (progress == 2)
+		strvec_push(&pack_opts, "--all-progress");
+	if (progress && all_progress_implied)
+		strvec_push(&pack_opts, "--all-progress-implied");
+
+	if (!startup_info->have_repository)
+		die(_("Need a repository to create a bundle."));
+	ret = !!create_bundle(the_repository, bundle_file, argc, argv, &pack_opts, version);
+	free(bundle_file);
+	return ret;
+}
+
+static int cmd_bundle_verify(int argc, const char **argv, const char *prefix) {
+	struct bundle_header header = BUNDLE_HEADER_INIT;
 	int bundle_fd = -1;
+	int quiet = 0;
+	int ret;
+	struct option options[] = {
+		OPT_BOOL('q', "quiet", &quiet,
+			    N_("do not show bundle details")),
+		OPT_END()
+	};
+	char *bundle_file;
+
+	argc = parse_options_cmd_bundle(argc, argv, prefix,
+			builtin_bundle_verify_usage, options, &bundle_file);
+	/* bundle internals use argv[1] as further parameters */
 
-	if (argc < 3)
-		usage(builtin_bundle_usage);
-
-	cmd = argv[1];
-	bundle_file = prefix_filename(prefix, argv[2]);
-	argc -= 2;
-	argv += 2;
-
-	memset(&header, 0, sizeof(header));
-	if (strcmp(cmd, "create") && (bundle_fd =
-				read_bundle_header(bundle_file, &header)) < 0)
-		return 1;
-
-	if (!strcmp(cmd, "verify")) {
-		close(bundle_fd);
-		if (argc != 1) {
-			usage(builtin_bundle_usage);
-			return 1;
-		}
-		if (verify_bundle(the_repository, &header, 1))
-			return 1;
-		fprintf(stderr, _("%s is okay\n"), bundle_file);
-		return 0;
+	if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0) {
+		ret = 1;
+		goto cleanup;
 	}
-	if (!strcmp(cmd, "list-heads")) {
-		close(bundle_fd);
-		return !!list_bundle_refs(&header, argc, argv);
+	close(bundle_fd);
+	if (verify_bundle(the_repository, &header, !quiet)) {
+		ret = 1;
+		goto cleanup;
+	}
+
+	fprintf(stderr, _("%s is okay\n"), bundle_file);
+	ret = 0;
+cleanup:
+	free(bundle_file);
+	bundle_header_release(&header);
+	return ret;
+}
+
+static int cmd_bundle_list_heads(int argc, const char **argv, const char *prefix) {
+	struct bundle_header header = BUNDLE_HEADER_INIT;
+	int bundle_fd = -1;
+	int ret;
+	struct option options[] = {
+		OPT_END()
+	};
+	char *bundle_file;
+
+	argc = parse_options_cmd_bundle(argc, argv, prefix,
+			builtin_bundle_list_heads_usage, options, &bundle_file);
+	/* bundle internals use argv[1] as further parameters */
+
+	if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0) {
+		ret = 1;
+		goto cleanup;
+	}
+	close(bundle_fd);
+	ret = !!list_bundle_refs(&header, argc, argv);
+cleanup:
+	free(bundle_file);
+	bundle_header_release(&header);
+	return ret;
+}
+
+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;
+	struct option options[] = {
+		OPT_END()
+	};
+	char *bundle_file;
+
+	argc = parse_options_cmd_bundle(argc, argv, prefix,
+			builtin_bundle_unbundle_usage, options, &bundle_file);
+	/* bundle internals use argv[1] as further parameters */
+
+	if ((bundle_fd = read_bundle_header(bundle_file, &header)) < 0) {
+		ret = 1;
+		goto cleanup;
+	}
+	if (!startup_info->have_repository)
+		die(_("Need a repository to unbundle."));
+	ret = !!unbundle(the_repository, &header, bundle_fd, 0) ||
+		list_bundle_refs(&header, argc, argv);
+	bundle_header_release(&header);
+cleanup:
+	free(bundle_file);
+	return ret;
+}
+
+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;
+
+	argc = parse_options(argc, argv, prefix, options, builtin_bundle_usage,
+		PARSE_OPT_STOP_AT_NON_OPTION);
+
+	packet_trace_identity("bundle");
+
+	if (argc < 2)
+		usage_with_options(builtin_bundle_usage, options);
+
+	else if (!strcmp(argv[0], "create"))
+		result = cmd_bundle_create(argc, argv, prefix);
+	else if (!strcmp(argv[0], "verify"))
+		result = cmd_bundle_verify(argc, argv, prefix);
+	else if (!strcmp(argv[0], "list-heads"))
+		result = cmd_bundle_list_heads(argc, argv, prefix);
+	else if (!strcmp(argv[0], "unbundle"))
+		result = cmd_bundle_unbundle(argc, argv, prefix);
+	else {
+		error(_("Unknown subcommand: %s"), argv[0]);
+		usage_with_options(builtin_bundle_usage, options);
 	}
-	if (!strcmp(cmd, "create")) {
-		if (argc < 2) {
-			usage(builtin_bundle_usage);
-			return 1;
-		}
-		if (!startup_info->have_repository)
-			die(_("Need a repository to create a bundle."));
-		return !!create_bundle(the_repository, bundle_file, argc, argv);
-	} else if (!strcmp(cmd, "unbundle")) {
-		if (!startup_info->have_repository)
-			die(_("Need a repository to unbundle."));
-		return !!unbundle(the_repository, &header, bundle_fd, 0) ||
-			list_bundle_refs(&header, argc, argv);
-	} else
-		usage(builtin_bundle_usage);
+	return result ? 1 : 0;
 }
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index d6a1aa74cd..243fe6844b 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -12,7 +12,7 @@
 #include "userdiff.h"
 #include "streaming.h"
 #include "tree-walk.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "packfile.h"
 #include "object-store.h"
 #include "promisor-remote.h"
@@ -42,7 +42,10 @@ static int filter_object(const char *path, unsigned mode,
 			     oid_to_hex(oid), path);
 	if ((type == OBJ_BLOB) && S_ISREG(mode)) {
 		struct strbuf strbuf = STRBUF_INIT;
-		if (convert_to_working_tree(&the_index, path, *buf, *size, &strbuf)) {
+		struct checkout_metadata meta;
+
+		init_checkout_metadata(&meta, NULL, NULL, oid);
+		if (convert_to_working_tree(&the_index, path, *buf, *size, &strbuf, &meta)) {
 			free(*buf);
 			*size = strbuf.len;
 			*buf = strbuf_detach(&strbuf, NULL);
@@ -262,7 +265,7 @@ static void expand_atom(struct strbuf *sb, const char *atom, int len,
 			strbuf_addstr(sb, data->rest);
 	} else if (is_atom("deltabase", atom, len)) {
 		if (data->mark_query)
-			data->info.delta_base_sha1 = data->delta_base_oid.hash;
+			data->info.delta_base_oid = &data->delta_base_oid;
 		else
 			strbuf_addstr(sb,
 				      oid_to_hex(&data->delta_base_oid));
@@ -509,12 +512,6 @@ static int batch_objects(struct batch_options *opt)
 	if (opt->cmdmode)
 		data.split_on_whitespace = 1;
 
-	if (opt->all_objects) {
-		struct object_info empty = OBJECT_INFO_INIT;
-		if (!memcmp(&data.info, &empty, sizeof(empty)))
-			data.skip_object_info = 1;
-	}
-
 	/*
 	 * If we are printing out the object, then always fill in the type,
 	 * since we will want to decide whether or not to stream.
@@ -524,6 +521,10 @@ static int batch_objects(struct batch_options *opt)
 
 	if (opt->all_objects) {
 		struct object_cb_data cb;
+		struct object_info empty = OBJECT_INFO_INIT;
+
+		if (!memcmp(&data.info, &empty, sizeof(empty)))
+			data.skip_object_info = 1;
 
 		if (has_promisor_remote())
 			warning("This repository uses promisor remotes. Some objects may not be loaded.");
@@ -593,7 +594,7 @@ static int batch_objects(struct batch_options *opt)
 
 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 | --batch-check) [--follow-symlinks] [--textconv | --filters]"),
+	N_("git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-symlinks] [--textconv | --filters]"),
 	NULL
 };
 
@@ -647,14 +648,14 @@ int cmd_cat_file(int argc, const char **argv, const char *prefix)
 		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")),
-		{ OPTION_CALLBACK, 0, "batch", &batch, "format",
+		OPT_CALLBACK_F(0, "batch", &batch, "format",
 			N_("show info and content of objects fed from the standard input"),
 			PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
-			batch_option_callback },
-		{ OPTION_CALLBACK, 0, "batch-check", &batch, "format",
+			batch_option_callback),
+		OPT_CALLBACK_F(0, "batch-check", &batch, "format",
 			N_("show info about objects fed from the standard input"),
 			PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
-			batch_option_callback },
+			batch_option_callback),
 		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,
diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c
index 5a4f92395f..2191256965 100644
--- a/builtin/check-ignore.c
+++ b/builtin/check-ignore.c
@@ -100,7 +100,8 @@ static int check_ignore(struct dir_struct *dir,
 	 * should not be ignored, in order to be consistent with
 	 * 'git status', 'git add' etc.
 	 */
-	seen = find_pathspecs_matching_against_index(&pathspec, &the_index);
+	seen = find_pathspecs_matching_against_index(&pathspec, &the_index,
+						     PS_HEED_SKIP_WORKTREE);
 	for (i = 0; i < pathspec.nr; i++) {
 		full_path = pathspec.items[i].match;
 		pattern = NULL;
@@ -108,6 +109,9 @@ static int check_ignore(struct dir_struct *dir,
 			int dtype = DT_UNKNOWN;
 			pattern = last_matching_pattern(dir, &the_index,
 							full_path, &dtype);
+			if (!verbose && pattern &&
+			    pattern->flags & PATTERN_FLAG_NEGATIVE)
+				pattern = NULL;
 		}
 		if (!quiet && (pattern || show_non_matching))
 			output_pattern(pathspec.items[i].original, pattern);
@@ -115,6 +119,7 @@ static int check_ignore(struct dir_struct *dir,
 			num_ignored++;
 	}
 	free(seen);
+	clear_pathspec(&pathspec);
 
 	return num_ignored;
 }
@@ -148,7 +153,7 @@ static int check_ignore_stdin_paths(struct dir_struct *dir, const char *prefix)
 int cmd_check_ignore(int argc, const char **argv, const char *prefix)
 {
 	int num_ignored;
-	struct dir_struct dir;
+	struct dir_struct dir = DIR_INIT;
 
 	git_config(git_default_config, NULL);
 
@@ -177,7 +182,6 @@ int cmd_check_ignore(int argc, const char **argv, const char *prefix)
 	if (!no_index && read_cache() < 0)
 		die(_("index file corrupt"));
 
-	memset(&dir, 0, sizeof(dir));
 	setup_standard_excludes(&dir);
 
 	if (stdin_paths) {
@@ -187,7 +191,7 @@ int cmd_check_ignore(int argc, const char **argv, const char *prefix)
 		maybe_flush_or_die(stdout, "ignore to stdout");
 	}
 
-	clear_directory(&dir);
+	dir_clear(&dir);
 
 	return !num_ignored;
 }
diff --git a/builtin/check-mailmap.c b/builtin/check-mailmap.c
index cdce144f3b..7dc47e4793 100644
--- a/builtin/check-mailmap.c
+++ b/builtin/check-mailmap.c
@@ -47,7 +47,7 @@ int cmd_check_mailmap(int argc, const char **argv, const char *prefix)
 	if (argc == 0 && !use_stdin)
 		die(_("no contacts specified"));
 
-	read_mailmap(&mailmap, NULL);
+	read_mailmap(&mailmap);
 
 	for (i = 0; i < argc; ++i)
 		check_mailmap(&mailmap, argv[i]);
diff --git a/builtin/checkout--worker.c b/builtin/checkout--worker.c
new file mode 100644
index 0000000000..fb9fd13b73
--- /dev/null
+++ b/builtin/checkout--worker.c
@@ -0,0 +1,145 @@
+#include "builtin.h"
+#include "config.h"
+#include "entry.h"
+#include "parallel-checkout.h"
+#include "parse-options.h"
+#include "pkt-line.h"
+
+static void packet_to_pc_item(const char *buffer, int len,
+			      struct parallel_checkout_item *pc_item)
+{
+	const struct pc_item_fixed_portion *fixed_portion;
+	const char *variant;
+	char *encoding;
+
+	if (len < sizeof(struct pc_item_fixed_portion))
+		BUG("checkout worker received too short item (got %dB, exp %dB)",
+		    len, (int)sizeof(struct pc_item_fixed_portion));
+
+	fixed_portion = (struct pc_item_fixed_portion *)buffer;
+
+	if (len - sizeof(struct pc_item_fixed_portion) !=
+		fixed_portion->name_len + fixed_portion->working_tree_encoding_len)
+		BUG("checkout worker received corrupted item");
+
+	variant = buffer + sizeof(struct pc_item_fixed_portion);
+
+	/*
+	 * Note: the main process uses zero length to communicate that the
+	 * encoding is NULL. There is no use case that requires sending an
+	 * actual empty string, since convert_attrs() never sets
+	 * ca.working_tree_enconding to "".
+	 */
+	if (fixed_portion->working_tree_encoding_len) {
+		encoding = xmemdupz(variant,
+				    fixed_portion->working_tree_encoding_len);
+		variant += fixed_portion->working_tree_encoding_len;
+	} else {
+		encoding = NULL;
+	}
+
+	memset(pc_item, 0, sizeof(*pc_item));
+	pc_item->ce = make_empty_transient_cache_entry(fixed_portion->name_len, NULL);
+	pc_item->ce->ce_namelen = fixed_portion->name_len;
+	pc_item->ce->ce_mode = fixed_portion->ce_mode;
+	memcpy(pc_item->ce->name, variant, pc_item->ce->ce_namelen);
+	oidcpy(&pc_item->ce->oid, &fixed_portion->oid);
+
+	pc_item->id = fixed_portion->id;
+	pc_item->ca.crlf_action = fixed_portion->crlf_action;
+	pc_item->ca.ident = fixed_portion->ident;
+	pc_item->ca.working_tree_encoding = encoding;
+}
+
+static void report_result(struct parallel_checkout_item *pc_item)
+{
+	struct pc_item_result res = { 0 };
+	size_t size;
+
+	res.id = pc_item->id;
+	res.status = pc_item->status;
+
+	if (pc_item->status == PC_ITEM_WRITTEN) {
+		res.st = pc_item->st;
+		size = sizeof(res);
+	} else {
+		size = PC_ITEM_RESULT_BASE_SIZE;
+	}
+
+	packet_write(1, (const char *)&res, size);
+}
+
+/* Free the worker-side malloced data, but not pc_item itself. */
+static void release_pc_item_data(struct parallel_checkout_item *pc_item)
+{
+	free((char *)pc_item->ca.working_tree_encoding);
+	discard_cache_entry(pc_item->ce);
+}
+
+static void worker_loop(struct checkout *state)
+{
+	struct parallel_checkout_item *items = NULL;
+	size_t i, nr = 0, alloc = 0;
+
+	while (1) {
+		int len = packet_read(0, NULL, NULL, packet_buffer,
+				      sizeof(packet_buffer), 0);
+
+		if (len < 0)
+			BUG("packet_read() returned negative value");
+		else if (!len)
+			break;
+
+		ALLOC_GROW(items, nr + 1, alloc);
+		packet_to_pc_item(packet_buffer, len, &items[nr++]);
+	}
+
+	for (i = 0; i < nr; i++) {
+		struct parallel_checkout_item *pc_item = &items[i];
+		write_pc_item(pc_item, state);
+		report_result(pc_item);
+		release_pc_item_data(pc_item);
+	}
+
+	packet_flush(1);
+
+	free(items);
+}
+
+static const char * const checkout_worker_usage[] = {
+	N_("git checkout--worker [<options>]"),
+	NULL
+};
+
+int cmd_checkout__worker(int argc, const char **argv, const char *prefix)
+{
+	struct checkout state = CHECKOUT_INIT;
+	struct option checkout_worker_options[] = {
+		OPT_STRING(0, "prefix", &state.base_dir, N_("string"),
+			N_("when creating files, prepend <string>")),
+		OPT_END()
+	};
+
+	if (argc == 2 && !strcmp(argv[1], "-h"))
+		usage_with_options(checkout_worker_usage,
+				   checkout_worker_options);
+
+	git_config(git_default_config, NULL);
+	argc = parse_options(argc, argv, prefix, checkout_worker_options,
+			     checkout_worker_usage, 0);
+	if (argc > 0)
+		usage_with_options(checkout_worker_usage, checkout_worker_options);
+
+	if (state.base_dir)
+		state.base_dir_len = strlen(state.base_dir);
+
+	/*
+	 * Setting this on a worker won't actually update the index. We just
+	 * need to tell the checkout machinery to lstat() the written entries,
+	 * so that we can send this data back to the main process.
+	 */
+	state.refresh_cache = 1;
+
+	worker_loop(&state);
+	return 0;
+}
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 1ac1cc290e..e21620d964 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -11,6 +11,8 @@
 #include "quote.h"
 #include "cache-tree.h"
 #include "parse-options.h"
+#include "entry.h"
+#include "parallel-checkout.h"
 
 #define CHECKOUT_ALL 4
 static int nul_term_line;
@@ -23,22 +25,35 @@ static struct checkout state = CHECKOUT_INIT;
 static void write_tempfile_record(const char *name, const char *prefix)
 {
 	int i;
+	int have_tempname = 0;
 
 	if (CHECKOUT_ALL == checkout_stage) {
-		for (i = 1; i < 4; i++) {
-			if (i > 1)
-				putchar(' ');
-			if (topath[i][0])
-				fputs(topath[i], stdout);
-			else
-				putchar('.');
+		for (i = 1; i < 4; i++)
+			if (topath[i][0]) {
+				have_tempname = 1;
+				break;
+			}
+
+		if (have_tempname) {
+			for (i = 1; i < 4; i++) {
+				if (i > 1)
+					putchar(' ');
+				if (topath[i][0])
+					fputs(topath[i], stdout);
+				else
+					putchar('.');
+			}
 		}
-	} else
+	} else if (topath[checkout_stage][0]) {
+		have_tempname = 1;
 		fputs(topath[checkout_stage], stdout);
+	}
 
-	putchar('\t');
-	write_name_quoted_relative(name, prefix, stdout,
-				   nul_term_line ? '\0' : '\n');
+	if (have_tempname) {
+		putchar('\t');
+		write_name_quoted_relative(name, prefix, stdout,
+					   nul_term_line ? '\0' : '\n');
+	}
 
 	for (i = 0; i < 4; i++) {
 		topath[i][0] = 0;
@@ -79,6 +94,14 @@ static int checkout_file(const char *name, const char *prefix)
 		return errs > 0 ? -1 : 0;
 	}
 
+	/*
+	 * At this point we know we didn't try to check anything out. If it was
+	 * because we did find an entry but it was stage 0, that's not an
+	 * error.
+	 */
+	if (has_same_name && checkout_stage == CHECKOUT_ALL)
+		return 0;
+
 	if (!state.quiet) {
 		fprintf(stderr, "git checkout-index: %s ", name);
 		if (!has_same_name)
@@ -93,11 +116,13 @@ static int checkout_file(const char *name, const char *prefix)
 	return -1;
 }
 
-static void checkout_all(const char *prefix, int prefix_length)
+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 (ce_stage(ce) != checkout_stage
@@ -120,11 +145,7 @@ static void checkout_all(const char *prefix, int prefix_length)
 	}
 	if (last_ce && to_tempfile)
 		write_tempfile_record(last_ce->name, prefix);
-	if (errs)
-		/* we have already done our error reporting.
-		 * exit with the same code as die().
-		 */
-		exit(128);
+	return !!errs;
 }
 
 static const char * const builtin_checkout_index_usage[] = {
@@ -159,6 +180,8 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 	int prefix_length;
 	int force = 0, quiet = 0, not_new = 0;
 	int index_opt = 0;
+	int err = 0;
+	int pc_workers, pc_threshold;
 	struct option builtin_checkout_index_options[] = {
 		OPT_BOOL('a', "all", &all,
 			N_("check out all files in the index")),
@@ -177,9 +200,9 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 			N_("write the content to temporary files")),
 		OPT_STRING(0, "prefix", &state.base_dir, N_("string"),
 			N_("when creating files, prepend <string>")),
-		{ OPTION_CALLBACK, 0, "stage", NULL, "(1|2|3|all)",
+		OPT_CALLBACK_F(0, "stage", NULL, "(1|2|3|all)",
 			N_("copy out the files from named stage"),
-			PARSE_OPT_NONEG, option_parse_stage },
+			PARSE_OPT_NONEG, option_parse_stage),
 		OPT_END()
 	};
 
@@ -213,6 +236,10 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 		hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
 	}
 
+	get_parallel_checkout_configs(&pc_workers, &pc_threshold);
+	if (pc_workers > 1)
+		init_parallel_checkout();
+
 	/* Check out named files first */
 	for (i = 0; i < argc; i++) {
 		const char *arg = argv[i];
@@ -223,7 +250,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 		if (read_from_stdin)
 			die("git checkout-index: don't mix '--stdin' and explicit filenames");
 		p = prefix_path(prefix, prefix_length, arg);
-		checkout_file(p, prefix);
+		err |= checkout_file(p, prefix);
 		free(p);
 	}
 
@@ -245,7 +272,7 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 				strbuf_swap(&buf, &unquoted);
 			}
 			p = prefix_path(prefix, prefix_length, buf.buf);
-			checkout_file(p, prefix);
+			err |= checkout_file(p, prefix);
 			free(p);
 		}
 		strbuf_release(&unquoted);
@@ -253,7 +280,14 @@ int cmd_checkout_index(int argc, const char **argv, const char *prefix)
 	}
 
 	if (all)
-		checkout_all(prefix, prefix_length);
+		err |= checkout_all(prefix, prefix_length);
+
+	if (pc_workers > 1)
+		err |= run_parallel_checkout(&state, pc_workers, pc_threshold,
+					     NULL, NULL);
+
+	if (err)
+		return 1;
 
 	if (is_lock_file_locked(&lock_file) &&
 	    write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 3634a3dac1..b23bc149d1 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -26,6 +26,8 @@
 #include "unpack-trees.h"
 #include "wt-status.h"
 #include "xdiff-interface.h"
+#include "entry.h"
+#include "parallel-checkout.h"
 
 static const char * const checkout_usage[] = {
 	N_("git checkout [<options>] <branch>"),
@@ -70,6 +72,8 @@ struct checkout_opts {
 	int checkout_worktree;
 	const char *ignore_unmerged_opt;
 	int ignore_unmerged;
+	int pathspec_file_nul;
+	const char *pathspec_from_file;
 
 	const char *new_branch;
 	const char *new_branch_force;
@@ -86,12 +90,25 @@ struct checkout_opts {
 	struct tree *source_tree;
 };
 
+struct branch_info {
+	const char *name; /* The short name used */
+	const 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. */
+	/*
+	 * if not null the branch is detached because it's already
+	 * checked out in this checkout
+	 */
+	char *checkout;
+};
+
 static int post_checkout_hook(struct commit *old_commit, struct commit *new_commit,
 			      int changed)
 {
 	return run_hook_le(NULL, "post-checkout",
-			   oid_to_hex(old_commit ? &old_commit->object.oid : &null_oid),
-			   oid_to_hex(new_commit ? &new_commit->object.oid : &null_oid),
+			   oid_to_hex(old_commit ? &old_commit->object.oid : null_oid()),
+			   oid_to_hex(new_commit ? &new_commit->object.oid : null_oid()),
 			   changed ? "1" : "0", NULL);
 	/* "new_commit" can be NULL when checking out from the index before
 	   a commit exists. */
@@ -99,7 +116,7 @@ static int post_checkout_hook(struct commit *old_commit, struct commit *new_comm
 }
 
 static int update_some(const struct object_id *oid, struct strbuf *base,
-		const char *pathname, unsigned mode, int stage, void *context)
+		const char *pathname, unsigned mode, void *context)
 {
 	int len;
 	struct cache_entry *ce;
@@ -140,8 +157,8 @@ static int update_some(const struct object_id *oid, struct strbuf *base,
 
 static int read_tree_some(struct tree *tree, const struct pathspec *pathspec)
 {
-	read_tree_recursive(the_repository, tree, "", 0, 0,
-			    pathspec, update_some, NULL);
+	read_tree(the_repository, tree,
+		  pathspec, update_some, NULL);
 
 	/* update the index with the given tree's info
 	 * for all args, expanding wildcards, and exit
@@ -214,7 +231,8 @@ static int checkout_stage(int stage, const struct cache_entry *ce, int pos,
 		return error(_("path '%s' does not have their version"), ce->name);
 }
 
-static int checkout_merged(int pos, const struct checkout *state, int *nr_checkouts)
+static int checkout_merged(int pos, const struct checkout *state,
+			   int *nr_checkouts, struct mem_pool *ce_mem_pool)
 {
 	struct cache_entry *ce = active_cache[pos];
 	const char *path = ce->name;
@@ -224,6 +242,8 @@ static int checkout_merged(int pos, const struct checkout *state, int *nr_checko
 	mmbuffer_t result_buf;
 	struct object_id threeway[3];
 	unsigned mode = 0;
+	struct ll_merge_options ll_opts;
+	int renormalize = 0;
 
 	memset(threeway, 0, sizeof(threeway));
 	while (pos < active_nr) {
@@ -244,13 +264,12 @@ static int checkout_merged(int pos, const struct checkout *state, int *nr_checko
 	read_mmblob(&ours, &threeway[1]);
 	read_mmblob(&theirs, &threeway[2]);
 
-	/*
-	 * NEEDSWORK: re-create conflicts from merges with
-	 * merge.renormalize set, too
-	 */
+	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, NULL);
+			  state->istate, &ll_opts);
 	free(ancestor.ptr);
 	free(ours.ptr);
 	free(theirs.ptr);
@@ -274,11 +293,10 @@ static int checkout_merged(int pos, const struct checkout *state, int *nr_checko
 	if (write_object_file(result_buf.ptr, result_buf.size, blob_type, &oid))
 		die(_("Unable to add merge result for '%s'"), path);
 	free(result_buf.ptr);
-	ce = make_transient_cache_entry(mode, &oid, path, 2);
+	ce = make_transient_cache_entry(mode, &oid, path, 2, ce_mem_pool);
 	if (!ce)
 		die(_("make_cache_entry failed for path '%s'"), path);
 	status = checkout_entry(ce, state, NULL, nr_checkouts);
-	discard_cache_entry(ce);
 	return status;
 }
 
@@ -306,7 +324,7 @@ static void mark_ce_for_checkout_overlay(struct cache_entry *ce,
 	 * If it comes from the tree-ish, we already know it
 	 * matches the pathspec and could just stamp
 	 * CE_MATCHED to it from update_some(). But we still
-	 * need ps_matched and read_tree_recursive (and
+	 * need ps_matched and read_tree (and
 	 * eventually tree_entry_interesting) cannot fill
 	 * ps_matched yet. Once it can, we can avoid calling
 	 * match_pathspec() for _all_ entries when
@@ -335,18 +353,31 @@ static void mark_ce_for_checkout_no_overlay(struct cache_entry *ce,
 	}
 }
 
-static int checkout_worktree(const struct checkout_opts *opts)
+static int checkout_worktree(const struct checkout_opts *opts,
+			     const struct branch_info *info)
 {
 	struct checkout state = CHECKOUT_INIT;
 	int nr_checkouts = 0, nr_unmerged = 0;
 	int errs = 0;
 	int pos;
+	int pc_workers, pc_threshold;
+	struct mem_pool ce_mem_pool;
 
 	state.force = 1;
 	state.refresh_cache = 1;
 	state.istate = &the_index;
 
+	mem_pool_init(&ce_mem_pool, 0);
+	get_parallel_checkout_configs(&pc_workers, &pc_threshold);
+	init_checkout_metadata(&state.meta, info->refname,
+			       info->commit ? &info->commit->object.oid : &info->oid,
+			       NULL);
+
 	enable_delayed_checkout(&state);
+
+	if (pc_workers > 1)
+		init_parallel_checkout();
+
 	for (pos = 0; pos < active_nr; pos++) {
 		struct cache_entry *ce = active_cache[pos];
 		if (ce->ce_flags & CE_MATCHED) {
@@ -362,13 +393,18 @@ static int checkout_worktree(const struct checkout_opts *opts)
 						       &nr_checkouts, opts->overlay_mode);
 			else if (opts->merge)
 				errs |= checkout_merged(pos, &state,
-							&nr_unmerged);
+							&nr_unmerged,
+							&ce_mem_pool);
 			pos = skip_same_name(ce, pos) - 1;
 		}
 	}
+	if (pc_workers > 1)
+		errs |= run_parallel_checkout(&state, pc_workers, pc_threshold,
+					      NULL, NULL);
+	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)
@@ -394,7 +430,7 @@ static int checkout_worktree(const struct checkout_opts *opts)
 }
 
 static int checkout_paths(const struct checkout_opts *opts,
-			  const char *revision)
+			  const struct branch_info *new_branch_info)
 {
 	int pos;
 	static char *ps_matched;
@@ -450,6 +486,21 @@ static int checkout_paths(const struct checkout_opts *opts,
 
 	if (opts->patch_mode) {
 		const char *patch_mode;
+		const char *rev = new_branch_info->name;
+		char rev_oid[GIT_MAX_HEXSZ + 1];
+
+		/*
+		 * Since rev can be in the form of `<a>...<b>` (which is not
+		 * recognized by diff-index), we will always replace the name
+		 * with the hex of the commit (whether it's in `...` form or
+		 * not) for the run_add_interactive() machinery to work
+		 * properly. However, there is special logic for the HEAD case
+		 * so we mustn't replace that.  Also, when we were given a
+		 * tree-object, new_branch_info->commit would be NULL, but we
+		 * do not have to do any replacement, either.
+		 */
+		if (rev && new_branch_info->commit && strcmp(rev, "HEAD"))
+			rev = oid_to_hex_r(rev_oid, &new_branch_info->commit->object.oid);
 
 		if (opts->checkout_index && opts->checkout_worktree)
 			patch_mode = "--patch=checkout";
@@ -460,7 +511,7 @@ static int checkout_paths(const struct checkout_opts *opts,
 		else
 			BUG("either flag must have been set, worktree=%d, index=%d",
 			    opts->checkout_worktree, opts->checkout_index);
-		return run_add_interactive(revision, patch_mode, &opts->pathspec);
+		return run_add_interactive(rev, patch_mode, &opts->pathspec);
 	}
 
 	repo_hold_locked_index(the_repository, &lock_file, LOCK_DIE_ON_ERROR);
@@ -521,7 +572,9 @@ static int checkout_paths(const struct checkout_opts *opts,
 
 	/* Now we are committed to check them out */
 	if (opts->checkout_worktree)
-		errs |= checkout_worktree(opts);
+		errs |= checkout_worktree(opts, new_branch_info);
+	else
+		remove_marked_cache_entries(&the_index, 1);
 
 	/*
 	 * Allow updating the index when checking out from the index.
@@ -563,6 +616,7 @@ static void show_local_changes(struct object *head,
 	diff_setup_done(&rev.diffopt);
 	add_pending_object(&rev, head, NULL);
 	run_diff_index(&rev, 0);
+	object_array_clear(&rev.pending);
 }
 
 static void describe_detached_head(const char *msg, struct commit *commit)
@@ -582,7 +636,8 @@ static void describe_detached_head(const char *msg, struct commit *commit)
 }
 
 static int reset_tree(struct tree *tree, const struct checkout_opts *o,
-		      int worktree, int *writeout_error)
+		      int worktree, int *writeout_error,
+		      struct branch_info *info)
 {
 	struct unpack_trees_options opts;
 	struct tree_desc tree_desc;
@@ -597,6 +652,9 @@ static int reset_tree(struct tree *tree, const struct checkout_opts *o,
 	opts.verbose_update = o->show_progress;
 	opts.src_index = &the_index;
 	opts.dst_index = &the_index;
+	init_checkout_metadata(&opts.meta, info->refname,
+			       info->commit ? &info->commit->object.oid : null_oid(),
+			       NULL);
 	parse_tree(tree);
 	init_tree_desc(&tree_desc, tree->buffer, tree->size);
 	switch (unpack_trees(1, &tree_desc, &opts)) {
@@ -616,21 +674,17 @@ static int reset_tree(struct tree *tree, const struct checkout_opts *o,
 	}
 }
 
-struct branch_info {
-	const char *name; /* The short name used */
-	const char *path; /* The full name of a real branch */
-	struct commit *commit; /* The named commit */
-	/*
-	 * if not null the branch is detached because it's already
-	 * checked out in this checkout
-	 */
-	char *checkout;
-};
-
 static void setup_branch_path(struct branch_info *branch)
 {
 	struct strbuf buf = STRBUF_INIT;
 
+	/*
+	 * If this is a ref, resolve it; otherwise, look up the OID for our
+	 * expression.  Failure here is okay.
+	 */
+	if (!dwim_ref(branch->name, strlen(branch->name), &branch->oid, &branch->refname, 0))
+		repo_get_oid_committish(the_repository, branch->name, &branch->oid);
+
 	strbuf_branchname(&buf, branch->name, INTERPRET_BRANCH_LOCAL);
 	if (strcmp(buf.buf, branch->name))
 		branch->name = xstrdup(buf.buf);
@@ -659,7 +713,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
 	} else
 		new_tree = get_commit_tree(new_branch_info->commit);
 	if (opts->discard_changes) {
-		ret = reset_tree(new_tree, opts, 1, writeout_error);
+		ret = reset_tree(new_tree, opts, 1, writeout_error, new_branch_info);
 		if (ret)
 			return ret;
 	} else {
@@ -688,6 +742,10 @@ static int merge_working_tree(const struct checkout_opts *opts,
 		topts.quiet = opts->merge && old_branch_info->commit;
 		topts.verbose_update = opts->show_progress;
 		topts.fn = twoway_merge;
+		init_checkout_metadata(&topts.meta, new_branch_info->refname,
+				       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;
@@ -745,20 +803,13 @@ static int merge_working_tree(const struct checkout_opts *opts,
 			 */
 
 			add_files_to_cache(NULL, NULL, 0);
-			/*
-			 * NEEDSWORK: carrying over local changes
-			 * when branches have different end-of-line
-			 * normalization (or clean+smudge rules) is
-			 * a pain; plumb in an option to set
-			 * o.renormalize?
-			 */
 			init_merge_options(&o, the_repository);
 			o.verbosity = 0;
 			work = write_in_core_index_as_tree(the_repository);
 
 			ret = reset_tree(new_tree,
 					 opts, 1,
-					 writeout_error);
+					 writeout_error, new_branch_info);
 			if (ret)
 				return ret;
 			o.ancestor = old_branch_info->name;
@@ -778,7 +829,7 @@ static int merge_working_tree(const struct checkout_opts *opts,
 				exit(128);
 			ret = reset_tree(new_tree,
 					 opts, 0,
-					 writeout_error);
+					 writeout_error, new_branch_info);
 			strbuf_release(&o.obuf);
 			strbuf_release(&old_commit_shortname);
 			if (ret)
@@ -786,9 +837,6 @@ static int merge_working_tree(const struct checkout_opts *opts,
 		}
 	}
 
-	if (!active_cache_tree)
-		active_cache_tree = cache_tree();
-
 	if (!cache_tree_fully_valid(active_cache_tree))
 		cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
 
@@ -861,7 +909,7 @@ static void update_refs_for_switch(const struct checkout_opts *opts,
 		strbuf_addf(&msg, "checkout: moving from %s to %s",
 			old_desc ? old_desc : "(invalid)", new_branch_info->name);
 	else
-		strbuf_insert(&msg, 0, reflog_msg, strlen(reflog_msg));
+		strbuf_insertstr(&msg, 0, reflog_msg);
 
 	if (!strcmp(new_branch_info->name, "HEAD") && !new_branch_info->path && !opts->force_detach) {
 		/* Nothing to do. */
@@ -1009,7 +1057,7 @@ static void orphaned_commit_warning(struct commit *old_commit, struct commit *ne
 		describe_detached_head(_("Previous HEAD position was"), old_commit);
 
 	/* Clean up objects used, as they will be reused. */
-	clear_commit_marks_all(ALL_REV_FLAGS);
+	repo_clear_commit_marks(the_repository, ALL_REV_FLAGS);
 }
 
 static int switch_branches(const struct checkout_opts *opts,
@@ -1073,11 +1121,16 @@ static int switch_branches(const struct checkout_opts *opts,
 
 static int git_checkout_config(const char *var, const char *value, void *cb)
 {
+	struct checkout_opts *opts = cb;
+
 	if (!strcmp(var, "diff.ignoresubmodules")) {
-		struct checkout_opts *opts = cb;
 		handle_ignore_submodules_arg(&opts->diff_options, value);
 		return 0;
 	}
+	if (!strcmp(var, "checkout.guess")) {
+		opts->dwim_new_local_branch = git_config_bool(var, value);
+		return 0;
+	}
 
 	if (starts_with(var, "submodule."))
 		return git_default_submodule_config(var, value, NULL);
@@ -1100,8 +1153,10 @@ static void setup_new_branch_info_and_source_tree(
 	if (!check_refname_format(new_branch_info->path, 0) &&
 	    !read_ref(new_branch_info->path, &branch_rev))
 		oidcpy(rev, &branch_rev);
-	else
+	else {
+		free((char *)new_branch_info->path);
 		new_branch_info->path = NULL; /* not an existing branch */
+	}
 
 	new_branch_info->commit = lookup_commit_reference_gently(the_repository, rev, 1);
 	if (!new_branch_info->commit) {
@@ -1113,12 +1168,43 @@ static void setup_new_branch_info_and_source_tree(
 	}
 }
 
+static const char *parse_remote_branch(const char *arg,
+				       struct object_id *rev,
+				       int could_be_checkout_paths)
+{
+	int num_matches = 0;
+	const char *remote = unique_tracking_name(arg, rev, &num_matches);
+
+	if (remote && could_be_checkout_paths) {
+		die(_("'%s' could be both a local file and a tracking branch.\n"
+			"Please use -- (and optionally --no-guess) to disambiguate"),
+		    arg);
+	}
+
+	if (!remote && num_matches > 1) {
+	    if (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"
+			     "    git checkout --track origin/<name>\n"
+			     "\n"
+			     "If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+			     "one remote, e.g. the 'origin' remote, consider setting\n"
+			     "checkout.defaultRemote=origin in your config."));
+	    }
+
+	    die(_("'%s' matched multiple (%d) remote tracking branches"),
+		arg, num_matches);
+	}
+
+	return remote;
+}
+
 static int parse_branchname_arg(int argc, const char **argv,
 				int dwim_new_local_branch_ok,
 				struct branch_info *new_branch_info,
 				struct checkout_opts *opts,
-				struct object_id *rev,
-				int *dwim_remotes_matched)
+				struct object_id *rev)
 {
 	const char **new_branch = &opts->new_branch;
 	int argcount = 0;
@@ -1223,13 +1309,9 @@ static int parse_branchname_arg(int argc, const char **argv,
 			recover_with_dwim = 0;
 
 		if (recover_with_dwim) {
-			const char *remote = unique_tracking_name(arg, rev,
-								  dwim_remotes_matched);
+			const char *remote = parse_remote_branch(arg, rev,
+								 could_be_checkout_paths);
 			if (remote) {
-				if (could_be_checkout_paths)
-					die(_("'%s' could be both a local file and a tracking branch.\n"
-					      "Please use -- (and optionally --no-guess) to disambiguate"),
-					    arg);
 				*new_branch = arg;
 				arg = remote;
 				/* DWIMmed to create local branch, case (3).(b) */
@@ -1296,7 +1378,7 @@ static void die_expecting_a_branch(const struct branch_info *branch_info)
 	struct object_id oid;
 	char *to_free;
 
-	if (dwim_ref(branch_info->name, strlen(branch_info->name), &oid, &to_free) == 1) {
+	if (dwim_ref(branch_info->name, strlen(branch_info->name), &oid, &to_free, 0) == 1) {
 		const char *ref = to_free;
 
 		if (skip_prefix(ref, "refs/tags/", &ref))
@@ -1431,9 +1513,9 @@ static struct option *add_common_options(struct checkout_opts *opts,
 {
 	struct option options[] = {
 		OPT__QUIET(&opts->quiet, N_("suppress progress reporting")),
-		{ OPTION_CALLBACK, 0, "recurse-submodules", NULL,
+		OPT_CALLBACK_F(0, "recurse-submodules", NULL,
 			    "checkout", "control recursive updating of submodules",
-			    PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },
+			    PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater),
 		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"),
@@ -1480,6 +1562,8 @@ static struct option *add_checkout_path_options(struct checkout_opts *opts,
 		OPT_BOOL('p', "patch", &opts->patch_mode, N_("select hunks interactively")),
 		OPT_BOOL(0, "ignore-skip-worktree-bits", &opts->ignore_skipworktree,
 			 N_("do not limit pathspecs to sparse entries only")),
+		OPT_PATHSPEC_FROM_FILE(&opts->pathspec_from_file),
+		OPT_PATHSPEC_FILE_NUL(&opts->pathspec_file_nul),
 		OPT_END()
 	};
 	struct option *newopts = parse_options_concat(prevopts, options);
@@ -1487,12 +1571,14 @@ static struct option *add_checkout_path_options(struct checkout_opts *opts,
 	return newopts;
 }
 
+/* create-branch option (either b or c) */
+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[])
 {
 	struct branch_info new_branch_info;
-	int dwim_remotes_matched = 0;
 	int parseopt_flags = 0;
 
 	memset(&new_branch_info, 0, sizeof(new_branch_info));
@@ -1502,6 +1588,9 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 
 	git_config(git_checkout_config, opts);
 
+	prepare_repo_settings(the_repository);
+	the_repository->settings.command_requires_full_index = 0;
+
 	opts->track = BRANCH_TRACK_UNSPECIFIED;
 
 	if (!opts->accept_pathspec && !opts->accept_ref)
@@ -1530,7 +1619,8 @@ 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(_("-b, -B and --orphan are mutually exclusive"));
+		die(_("-%c, -%c and --orphan are mutually exclusive"),
+				cb_option, toupper(cb_option));
 
 	if (opts->overlay_mode == 1 && opts->patch_mode)
 		die(_("-p and --overlay are mutually exclusive"));
@@ -1549,16 +1639,16 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 	if (opts->checkout_index < 0 || opts->checkout_worktree < 0)
 		BUG("these flags should be non-negative by now");
 	/*
-	 * convenient shortcut: "git restore --staged" equals
-	 * "git restore --staged --source HEAD"
+	 * convenient shortcut: "git restore --staged [--worktree]" equals
+	 * "git restore --staged [--worktree] --source HEAD"
 	 */
-	if (!opts->from_treeish && opts->checkout_index && !opts->checkout_worktree)
+	if (!opts->from_treeish && opts->checkout_index)
 		opts->from_treeish = "HEAD";
 
 	/*
 	 * From here on, new_branch will contain the branch to be checked out,
 	 * and new_branch_force and new_orphan_branch will tell us which one of
-	 * -b/-B/--orphan is being used.
+	 * -b/-B/-c/-C/--orphan is being used.
 	 */
 	if (opts->new_branch_force)
 		opts->new_branch = opts->new_branch_force;
@@ -1566,7 +1656,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 	if (opts->new_orphan_branch)
 		opts->new_branch = opts->new_orphan_branch;
 
-	/* --track without -b/-B/--orphan should DWIM */
+	/* --track without -c/-C/-b/-B/--orphan should DWIM */
 	if (opts->track != BRANCH_TRACK_UNSPECIFIED && !opts->new_branch) {
 		const char *argv0 = argv[0];
 		if (!argc || !strcmp(argv0, "--"))
@@ -1575,7 +1665,7 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 		skip_prefix(argv0, "remotes/", &argv0);
 		argv0 = strchr(argv0, '/');
 		if (!argv0 || !argv0[1])
-			die(_("missing branch name; try -b"));
+			die(_("missing branch name; try -%c"), cb_option);
 		opts->new_branch = argv0 + 1;
 	}
 
@@ -1600,8 +1690,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,
-					     &dwim_remotes_matched);
+					     &new_branch_info, opts, &rev);
 		argv += n;
 		argc -= n;
 	} else if (!opts->accept_ref && opts->from_treeish) {
@@ -1618,10 +1707,6 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 			die(_("reference is not a tree: %s"), opts->from_treeish);
 	}
 
-	if (opts->accept_pathspec && !opts->empty_pathspec_ok && !argc &&
-	    !opts->patch_mode)	/* patch mode is special */
-		die(_("you must specify path(s) to restore"));
-
 	if (argc) {
 		parse_pathspec(&opts->pathspec, 0,
 			       opts->patch_mode ? PATHSPEC_PREFIX_ORIGIN : 0,
@@ -1634,17 +1719,42 @@ 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)
+		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);
 
 		if (opts->force_detach)
 			die(_("git checkout: --detach does not take a path argument '%s'"),
 			    argv[0]);
+	}
+
+	if (opts->pathspec_from_file) {
+		if (opts->pathspec.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		if (opts->force_detach)
+			die(_("--pathspec-from-file is incompatible with --detach"));
+
+		if (opts->patch_mode)
+			die(_("--pathspec-from-file is incompatible with --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"));
+	}
+
+	opts->pathspec.recursive = 1;
+
+	if (opts->pathspec.nr) {
 		if (1 < !!opts->writeout_stage + !!opts->force + !!opts->merge)
 			die(_("git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 			      "checking out of the index."));
+	} else {
+		if (opts->accept_pathspec && !opts->empty_pathspec_ok &&
+		    !opts->patch_mode)	/* patch mode is special */
+			die(_("you must specify path(s) to restore"));
 	}
 
 	if (opts->new_branch) {
@@ -1659,28 +1769,10 @@ static int checkout_main(int argc, const char **argv, const char *prefix,
 	}
 
 	UNLEAK(opts);
-	if (opts->patch_mode || opts->pathspec.nr) {
-		int ret = checkout_paths(opts, new_branch_info.name);
-		if (ret && dwim_remotes_matched > 1 &&
-		    advice_checkout_ambiguous_remote_branch_name)
-			advise(_("'%s' matched more than one remote tracking branch.\n"
-				 "We found %d remotes with a reference that matched. So we fell back\n"
-				 "on trying to resolve the argument as a path, but failed there too!\n"
-				 "\n"
-				 "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"
-				 "    git checkout --track origin/<name>\n"
-				 "\n"
-				 "If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-				 "one remote, e.g. the 'origin' remote, consider setting\n"
-				 "checkout.defaultRemote=origin in your config."),
-			       argv[0],
-			       dwim_remotes_matched);
-		return ret;
-	} else {
+	if (opts->patch_mode || opts->pathspec.nr)
+		return checkout_paths(opts, &new_branch_info);
+	else
 		return checkout_branch(opts, &new_branch_info);
-	}
 }
 
 int cmd_checkout(int argc, const char **argv, const char *prefix)
@@ -1766,6 +1858,8 @@ int cmd_switch(int argc, const char **argv, const char *prefix)
 	options = add_common_options(&opts, options);
 	options = add_common_switch_branch_options(&opts, options);
 
+	cb_option = 'c';
+
 	ret = checkout_main(argc, argv, prefix, &opts,
 			    options, switch_branch_usage);
 	FREE_AND_NULL(options);
diff --git a/builtin/clean.c b/builtin/clean.c
index 5abf087e7c..98a2860409 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -18,6 +18,7 @@
 #include "color.h"
 #include "pathspec.h"
 #include "help.h"
+#include "prompt.h"
 
 static int force = -1; /* unset */
 static int interactive;
@@ -161,7 +162,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 	if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
 	    is_nonbare_repository_dir(path)) {
 		if (!quiet) {
-			quote_path_relative(path->buf, prefix, &quoted);
+			quote_path(path->buf, prefix, &quoted, 0);
 			printf(dry_run ?  _(msg_would_skip_git_dir) : _(msg_skip_git_dir),
 					quoted.buf);
 		}
@@ -176,7 +177,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 		res = dry_run ? 0 : rmdir(path->buf);
 		if (res) {
 			int saved_errno = errno;
-			quote_path_relative(path->buf, prefix, &quoted);
+			quote_path(path->buf, prefix, &quoted, 0);
 			errno = saved_errno;
 			warning_errno(_(msg_warn_remove_failed), quoted.buf);
 			*dir_gone = 0;
@@ -188,10 +189,8 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 	strbuf_complete(path, '/');
 
 	len = path->len;
-	while ((e = readdir(dir)) != NULL) {
+	while ((e = readdir_skip_dot_and_dotdot(dir)) != NULL) {
 		struct stat st;
-		if (is_dot_or_dotdot(e->d_name))
-			continue;
 
 		strbuf_setlen(path, len);
 		strbuf_addstr(path, e->d_name);
@@ -201,7 +200,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 			if (remove_dirs(path, prefix, force_flag, dry_run, quiet, &gone))
 				ret = 1;
 			if (gone) {
-				quote_path_relative(path->buf, prefix, &quoted);
+				quote_path(path->buf, prefix, &quoted, 0);
 				string_list_append(&dels, quoted.buf);
 			} else
 				*dir_gone = 0;
@@ -209,11 +208,11 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 		} else {
 			res = dry_run ? 0 : unlink(path->buf);
 			if (!res) {
-				quote_path_relative(path->buf, prefix, &quoted);
+				quote_path(path->buf, prefix, &quoted, 0);
 				string_list_append(&dels, quoted.buf);
 			} else {
 				int saved_errno = errno;
-				quote_path_relative(path->buf, prefix, &quoted);
+				quote_path(path->buf, prefix, &quoted, 0);
 				errno = saved_errno;
 				warning_errno(_(msg_warn_remove_failed), quoted.buf);
 				*dir_gone = 0;
@@ -237,7 +236,7 @@ static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag,
 			*dir_gone = 1;
 		else {
 			int saved_errno = errno;
-			quote_path_relative(path->buf, prefix, &quoted);
+			quote_path(path->buf, prefix, &quoted, 0);
 			errno = saved_errno;
 			warning_errno(_(msg_warn_remove_failed), quoted.buf);
 			*dir_gone = 0;
@@ -265,7 +264,7 @@ static void pretty_print_dels(void)
 	struct column_options copts;
 
 	for_each_string_list_item(item, &del_list) {
-		qname = quote_path_relative(item->string, NULL, &buf);
+		qname = quote_path(item->string, NULL, &buf, 0);
 		string_list_append(&list, qname);
 	}
 
@@ -420,7 +419,6 @@ static int find_unique(const char *choice, struct menu_stuff *menu_stuff)
 	return found;
 }
 
-
 /*
  * Parse user input, and return choice(s) for menu (menu_stuff).
  *
@@ -580,9 +578,7 @@ static int *list_and_choose(struct menu_opts *opts, struct menu_stuff *stuff)
 			       clean_get_color(CLEAN_COLOR_RESET));
 		}
 
-		if (strbuf_getline_lf(&choice, stdin) != EOF) {
-			strbuf_trim(&choice);
-		} else {
+		if (git_read_line_interactively(&choice) == EOF) {
 			eof = 1;
 			break;
 		}
@@ -625,7 +621,7 @@ static int *list_and_choose(struct menu_opts *opts, struct menu_stuff *stuff)
 				nr += chosen[i];
 		}
 
-		result = xcalloc(st_add(nr, 1), sizeof(int));
+		CALLOC_ARRAY(result, st_add(nr, 1));
 		for (i = 0; i < stuff->nr && j < nr; i++) {
 			if (chosen[i])
 				result[j++] = i;
@@ -645,7 +641,7 @@ static int clean_cmd(void)
 
 static int filter_by_patterns_cmd(void)
 {
-	struct dir_struct dir;
+	struct dir_struct dir = DIR_INIT;
 	struct strbuf confirm = STRBUF_INIT;
 	struct strbuf **ignore_list;
 	struct string_list_item *item;
@@ -662,16 +658,13 @@ static int filter_by_patterns_cmd(void)
 		clean_print_color(CLEAN_COLOR_PROMPT);
 		printf(_("Input ignore patterns>> "));
 		clean_print_color(CLEAN_COLOR_RESET);
-		if (strbuf_getline_lf(&confirm, stdin) != EOF)
-			strbuf_trim(&confirm);
-		else
+		if (git_read_line_interactively(&confirm) == EOF)
 			putchar('\n');
 
 		/* quit filter_by_pattern mode if press ENTER or Ctrl-D */
 		if (!confirm.len)
 			break;
 
-		memset(&dir, 0, sizeof(dir));
 		pl = add_pattern_list(&dir, EXC_CMDL, "manual exclude");
 		ignore_list = strbuf_split_max(&confirm, ' ', 0);
 
@@ -702,7 +695,7 @@ static int filter_by_patterns_cmd(void)
 		}
 
 		strbuf_list_free(ignore_list);
-		clear_directory(&dir);
+		dir_clear(&dir);
 	}
 
 	strbuf_release(&confirm);
@@ -757,12 +750,10 @@ static int ask_each_cmd(void)
 	for_each_string_list_item(item, &del_list) {
 		/* Ctrl-D should stop removing files */
 		if (!eof) {
-			qname = quote_path_relative(item->string, NULL, &buf);
+			qname = quote_path(item->string, NULL, &buf, 0);
 			/* TRANSLATORS: Make sure to keep [y/N] as is */
 			printf(_("Remove %s [y/N]? "), qname);
-			if (strbuf_getline_lf(&confirm, stdin) != EOF) {
-				strbuf_trim(&confirm);
-			} else {
+			if (git_read_line_interactively(&confirm) == EOF) {
 				putchar('\n');
 				eof = 1;
 			}
@@ -898,7 +889,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 	int ignored_only = 0, config_set = 0, errors = 0, gone = 1;
 	int rm_flags = REMOVE_DIR_KEEP_NESTED_GIT;
 	struct strbuf abs_path = STRBUF_INIT;
-	struct dir_struct dir;
+	struct dir_struct dir = DIR_INIT;
 	struct pathspec pathspec;
 	struct strbuf buf = STRBUF_INIT;
 	struct string_list exclude_list = STRING_LIST_INIT_NODUP;
@@ -912,8 +903,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 		OPT_BOOL('i', "interactive", &interactive, N_("interactive cleaning")),
 		OPT_BOOL('d', NULL, &remove_directories,
 				N_("remove whole directories")),
-		{ OPTION_CALLBACK, 'e', "exclude", &exclude_list, N_("pattern"),
-		  N_("add <pattern> to ignore rules"), PARSE_OPT_NONEG, exclude_cb },
+		OPT_CALLBACK_F('e', "exclude", &exclude_list, N_("pattern"),
+		  N_("add <pattern> to ignore rules"), PARSE_OPT_NONEG, exclude_cb),
 		OPT_BOOL('x', NULL, &ignored, N_("remove ignored files, too")),
 		OPT_BOOL('X', NULL, &ignored_only,
 				N_("remove only ignored files")),
@@ -929,13 +920,6 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 	argc = parse_options(argc, argv, prefix, options, builtin_clean_usage,
 			     0);
 
-	memset(&dir, 0, sizeof(dir));
-	if (ignored_only)
-		dir.flags |= DIR_SHOW_IGNORED;
-
-	if (ignored && ignored_only)
-		die(_("-x and -X cannot be used together"));
-
 	if (!interactive && !dry_run && !force) {
 		if (config_set)
 			die(_("clean.requireForce set to true and neither -i, -n, nor -f given; "
@@ -952,6 +936,13 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 
 	dir.flags |= DIR_SHOW_OTHER_DIRECTORIES;
 
+	if (ignored && ignored_only)
+		die(_("-x and -X cannot be used together"));
+	if (!ignored)
+		setup_standard_excludes(&dir);
+	if (ignored_only)
+		dir.flags |= DIR_SHOW_IGNORED;
+
 	if (argc) {
 		/*
 		 * Remaining args implies pathspecs specified, and we should
@@ -960,15 +951,41 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 		remove_directories = 1;
 	}
 
-	if (remove_directories)
-		dir.flags |= DIR_SHOW_IGNORED_TOO | DIR_KEEP_UNTRACKED_CONTENTS;
+	if (remove_directories && !ignored_only) {
+		/*
+		 * We need to know about ignored files too:
+		 *
+		 * If (ignored), then we will delete ignored files as well.
+		 *
+		 * If (!ignored), then even though we not are doing
+		 * anything with ignored files, we need to know about them
+		 * so that we can avoid deleting a directory of untracked
+		 * files that also contains an ignored file within it.
+		 *
+		 * For the (!ignored) case, since we only need to avoid
+		 * deleting ignored files, we can set
+		 * DIR_SHOW_IGNORED_TOO_MODE_MATCHING in order to avoid
+		 * recursing into a directory which is itself ignored.
+		 */
+		dir.flags |= DIR_SHOW_IGNORED_TOO;
+		if (!ignored)
+			dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
+
+		/*
+		 * Let the fill_directory() machinery know that we aren't
+		 * just recursing to collect the ignored files; we want all
+		 * the untracked ones so that we can delete them.  (Note:
+		 * we could also set DIR_KEEP_UNTRACKED_CONTENTS when
+		 * ignored_only is true, since DIR_KEEP_UNTRACKED_CONTENTS
+		 * only has effect in combination with DIR_SHOW_IGNORED_TOO.  It makes
+		 * the code clearer to exclude it, though.
+		 */
+		dir.flags |= DIR_KEEP_UNTRACKED_CONTENTS;
+	}
 
 	if (read_cache() < 0)
 		die(_("index file corrupt"));
 
-	if (!ignored)
-		setup_standard_excludes(&dir);
-
 	pl = add_pattern_list(&dir, EXC_CMDL, "--exclude option");
 	for (i = 0; i < exclude_list.nr; i++)
 		add_pattern(exclude_list.items[i].string, "", 0, pl, -(i+1));
@@ -982,35 +999,23 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 
 	for (i = 0; i < dir.nr; i++) {
 		struct dir_entry *ent = dir.entries[i];
-		int matches = 0;
 		struct stat st;
 		const char *rel;
 
 		if (!cache_name_is_other(ent->name, ent->len))
 			continue;
 
-		if (pathspec.nr)
-			matches = dir_path_match(&the_index, ent, &pathspec, 0, NULL);
-
-		if (pathspec.nr && !matches)
-			continue;
-
 		if (lstat(ent->name, &st))
 			die_errno("Cannot lstat '%s'", ent->name);
 
-		if (S_ISDIR(st.st_mode) && !remove_directories &&
-		    matches != MATCHED_EXACTLY)
+		if (S_ISDIR(st.st_mode) && !remove_directories)
 			continue;
 
 		rel = relative_path(ent->name, prefix, &buf);
 		string_list_append(&del_list, rel);
 	}
 
-	for (i = 0; i < dir.nr; i++)
-		free(dir.entries[i]);
-
-	for (i = 0; i < dir.ignored_nr; i++)
-		free(dir.ignored[i]);
+	dir_clear(&dir);
 
 	if (interactive && del_list.nr > 0)
 		interactive_main_loop();
@@ -1036,19 +1041,19 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 			if (remove_dirs(&abs_path, prefix, rm_flags, dry_run, quiet, &gone))
 				errors++;
 			if (gone && !quiet) {
-				qname = quote_path_relative(item->string, NULL, &buf);
+				qname = quote_path(item->string, NULL, &buf, 0);
 				printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname);
 			}
 		} else {
 			res = dry_run ? 0 : unlink(abs_path.buf);
 			if (res) {
 				int saved_errno = errno;
-				qname = quote_path_relative(item->string, NULL, &buf);
+				qname = quote_path(item->string, NULL, &buf, 0);
 				errno = saved_errno;
 				warning_errno(_(msg_warn_remove_failed), qname);
 				errors++;
 			} else if (!quiet) {
-				qname = quote_path_relative(item->string, NULL, &buf);
+				qname = quote_path(item->string, NULL, &buf, 0);
 				printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname);
 			}
 		}
diff --git a/builtin/clone.c b/builtin/clone.c
index c46ee29f0a..66fe66679c 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -50,15 +50,19 @@ static int option_no_checkout, option_bare, option_mirror, option_single_branch
 static int option_local = -1, option_no_hardlinks, option_shared;
 static int option_no_tags;
 static int option_shallow_submodules;
+static int option_reject_shallow = -1;    /* unspecified */
+static int config_reject_shallow = -1;    /* unspecified */
 static int deepen;
 static char *option_template, *option_depth, *option_since;
 static char *option_origin = NULL;
+static char *remote_name = NULL;
 static char *option_branch = NULL;
 static struct string_list option_not = STRING_LIST_INIT_NODUP;
 static const char *real_git_dir;
 static char *option_upload_pack = "git-upload-pack";
 static int option_verbosity;
 static int option_progress = -1;
+static int option_sparse_checkout;
 static enum transport_family family;
 static struct string_list option_config = STRING_LIST_INIT_NODUP;
 static struct string_list option_required_reference = STRING_LIST_INIT_NODUP;
@@ -88,6 +92,8 @@ static struct option builtin_clone_options[] = {
 	OPT__VERBOSITY(&option_verbosity),
 	OPT_BOOL(0, "progress", &option_progress,
 		 N_("force progress reporting")),
+	OPT_BOOL(0, "reject-shallow", &option_reject_shallow,
+		 N_("don't clone shallow repository")),
 	OPT_BOOL('n', "no-checkout", &option_no_checkout,
 		 N_("don't create a checkout")),
 	OPT_BOOL(0, "bare", &option_bare, N_("create a bare repository")),
@@ -101,10 +107,10 @@ static struct option builtin_clone_options[] = {
 		    N_("don't use local hardlinks, always copy")),
 	OPT_BOOL('s', "shared", &option_shared,
 		    N_("setup as shared repository")),
-	OPT_ALIAS(0, "recursive", "recurse-submodules"),
 	{ OPTION_CALLBACK, 0, "recurse-submodules", &option_recurse_submodules,
 	  N_("pathspec"), N_("initialize submodules in the clone"),
 	  PARSE_OPT_OPTARG, recurse_submodules_cb, (intptr_t)"." },
+	OPT_ALIAS(0, "recursive", "recurse-submodules"),
 	OPT_INTEGER('j', "jobs", &max_jobs,
 		    N_("number of submodules cloned in parallel")),
 	OPT_STRING(0, "template", &option_template, N_("template-directory"),
@@ -146,6 +152,8 @@ static struct option builtin_clone_options[] = {
 	OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
 	OPT_BOOL(0, "remote-submodules", &option_remote_submodules,
 		    N_("any cloned submodules will use their remote-tracking branch")),
+	OPT_BOOL(0, "sparse", &option_sparse_checkout,
+		    N_("initialize sparse-checkout file to include only files at root")),
 	OPT_END()
 };
 
@@ -417,6 +425,7 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest,
 	struct dir_iterator *iter;
 	int iter_status;
 	unsigned int flags;
+	struct strbuf realpath = STRBUF_INIT;
 
 	mkdir_if_missing(dest->buf, 0777);
 
@@ -451,7 +460,8 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest,
 		if (unlink(dest->buf) && errno != ENOENT)
 			die_errno(_("failed to unlink '%s'"), dest->buf);
 		if (!option_no_hardlinks) {
-			if (!link(real_path(src->buf), dest->buf))
+			strbuf_realpath(&realpath, src->buf, 1);
+			if (!link(realpath.buf, dest->buf))
 				continue;
 			if (option_local > 0)
 				die_errno(_("failed to create link '%s'"), dest->buf);
@@ -465,6 +475,8 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest,
 		strbuf_setlen(src, src_len);
 		die(_("failed to iterate over '%s'"), src->buf);
 	}
+
+	strbuf_release(&realpath);
 }
 
 static void clone_local(const char *src_repo, const char *dest_repo)
@@ -636,7 +648,9 @@ static void write_followtags(const struct ref *refs, const char *msg)
 			continue;
 		if (ends_with(ref->name, "^{}"))
 			continue;
-		if (!has_object_file(&ref->old_oid))
+		if (!has_object_file_with_flags(&ref->old_oid,
+						OBJECT_INFO_QUICK |
+						OBJECT_INFO_SKIP_FETCH_OBJECT))
 			continue;
 		update_ref(msg, ref->name, &ref->old_oid, NULL, 0,
 			   UPDATE_REFS_DIE_ON_ERR);
@@ -669,8 +683,7 @@ static void update_remote_refs(const struct ref *refs,
 			       const char *branch_top,
 			       const char *msg,
 			       struct transport *transport,
-			       int check_connectivity,
-			       int check_refs_only)
+			       int check_connectivity)
 {
 	const struct ref *rm = mapped_refs;
 
@@ -679,7 +692,6 @@ static void update_remote_refs(const struct ref *refs,
 
 		opt.transport = transport;
 		opt.progress = transport->progress;
-		opt.check_refs_only = !!check_refs_only;
 
 		if (check_connected(iterate_ref_map, &rm, &opt))
 			die(_("remote did not send all necessary objects"));
@@ -714,7 +726,7 @@ static void update_head(const struct ref *our, const struct ref *remote,
 		if (!option_bare) {
 			update_ref(msg, "HEAD", &our->old_oid, NULL, 0,
 				   UPDATE_REFS_DIE_ON_ERR);
-			install_branch_config(0, head, option_origin, our->name);
+			install_branch_config(0, head, remote_name, our->name);
 		}
 	} else if (our) {
 		struct commit *c = lookup_commit_reference(the_repository,
@@ -733,6 +745,27 @@ static void update_head(const struct ref *our, const struct ref *remote,
 	}
 }
 
+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);
+
+	/*
+	 * We must apply the setting in the current process
+	 * for the later checkout to use the sparse-checkout file.
+	 */
+	core_apply_sparse_checkout = 1;
+
+	if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
+		error(_("failed to initialize sparse-checkout"));
+		result = 1;
+	}
+
+	strvec_clear(&argv);
+	return result;
+}
+
 static int checkout(int submodule_progress)
 {
 	struct object_id oid;
@@ -755,11 +788,11 @@ static int checkout(int submodule_progress)
 	if (!strcmp(head, "HEAD")) {
 		if (advice_detached_head)
 			detach_advice(oid_to_hex(&oid));
+		FREE_AND_NULL(head);
 	} else {
 		if (!starts_with(head, "refs/heads/"))
 			die(_("HEAD not found below refs/heads!"));
 	}
-	free(head);
 
 	/* We need to be in the new work tree for the checkout */
 	setup_work_tree();
@@ -774,6 +807,7 @@ static int checkout(int submodule_progress)
 	opts.verbose_update = (option_verbosity >= 0);
 	opts.src_index = &the_index;
 	opts.dst_index = &the_index;
+	init_checkout_metadata(&opts.meta, head, &oid, NULL);
 
 	tree = parse_tree_indirect(&oid);
 	parse_tree(tree);
@@ -781,42 +815,70 @@ static int checkout(int submodule_progress)
 	if (unpack_trees(1, &t, &opts) < 0)
 		die(_("unable to checkout working tree"));
 
+	free(head);
+
 	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_hook_le(NULL, "post-checkout", oid_to_hex(null_oid()),
 			   oid_to_hex(&oid), "1", NULL);
 
 	if (!err && (option_recurse_submodules.nr > 0)) {
-		struct argv_array args = ARGV_ARRAY_INIT;
-		argv_array_pushl(&args, "submodule", "update", "--init", "--recursive", NULL);
+		struct strvec args = STRVEC_INIT;
+		strvec_pushl(&args, "submodule", "update", "--require-init", "--recursive", NULL);
 
 		if (option_shallow_submodules == 1)
-			argv_array_push(&args, "--depth=1");
+			strvec_push(&args, "--depth=1");
 
 		if (max_jobs != -1)
-			argv_array_pushf(&args, "--jobs=%d", max_jobs);
+			strvec_pushf(&args, "--jobs=%d", max_jobs);
 
 		if (submodule_progress)
-			argv_array_push(&args, "--progress");
+			strvec_push(&args, "--progress");
 
 		if (option_verbosity < 0)
-			argv_array_push(&args, "--quiet");
+			strvec_push(&args, "--quiet");
 
 		if (option_remote_submodules) {
-			argv_array_push(&args, "--remote");
-			argv_array_push(&args, "--no-fetch");
+			strvec_push(&args, "--remote");
+			strvec_push(&args, "--no-fetch");
 		}
 
-		err = run_command_v_opt(args.argv, RUN_GIT_CMD);
-		argv_array_clear(&args);
+		if (option_single_branch >= 0)
+			strvec_push(&args, option_single_branch ?
+					       "--single-branch" :
+					       "--no-single-branch");
+
+		err = run_command_v_opt(args.v, RUN_GIT_CMD);
+		strvec_clear(&args);
 	}
 
 	return err;
 }
 
+static int git_clone_config(const char *k, const char *v, void *cb)
+{
+	if (!strcmp(k, "clone.defaultremotename")) {
+		free(remote_name);
+		remote_name = xstrdup(v);
+	}
+	if (!strcmp(k, "clone.rejectshallow"))
+		config_reject_shallow = git_config_bool(k, v);
+
+	return git_default_config(k, v, cb);
+}
+
 static int write_one_config(const char *key, const char *value, void *data)
 {
+	/*
+	 * give git_clone_config a chance to write config values back to the
+	 * environment, since git_config_set_multivar_gently only deals with
+	 * config-file writes
+	 */
+	int apply_failed = git_clone_config(key, value, data);
+	if (apply_failed)
+		return apply_failed;
+
 	return git_config_set_multivar_gently(key,
 					      value ? value : "true",
 					      CONFIG_REGEX_NONE, 0);
@@ -869,12 +931,12 @@ static void write_refspec_config(const char *src_ref_prefix,
 		}
 		/* Configure the remote */
 		if (value.len) {
-			strbuf_addf(&key, "remote.%s.fetch", option_origin);
+			strbuf_addf(&key, "remote.%s.fetch", remote_name);
 			git_config_set_multivar(key.buf, value.buf, "^$", 0);
 			strbuf_reset(&key);
 
 			if (option_mirror) {
-				strbuf_addf(&key, "remote.%s.mirror", option_origin);
+				strbuf_addf(&key, "remote.%s.mirror", remote_name);
 				git_config_set(key.buf, "true");
 				strbuf_reset(&key);
 			}
@@ -899,7 +961,7 @@ static void dissociate_from_references(void)
 	free(alternates);
 }
 
-static int dir_exists(const char *path)
+static int path_exists(const char *path)
 {
 	struct stat sb;
 	return !stat(path, &sb);
@@ -908,16 +970,16 @@ static int dir_exists(const char *path)
 int cmd_clone(int argc, const char **argv, const char *prefix)
 {
 	int is_bundle = 0, is_local;
+	int reject_shallow = 0;
 	const char *repo_name, *repo, *work_tree, *git_dir;
-	char *path, *dir;
-	int dest_exists;
+	char *path = NULL, *dir, *display_repo = NULL;
+	int dest_exists, real_dest_exists = 0;
 	const struct ref *refs, *remote_head;
-	const struct ref *remote_head_points_at;
+	struct ref *remote_head_points_at = NULL;
 	const struct ref *our_head_points_at;
 	struct ref *mapped_refs;
 	const struct ref *ref;
 	struct strbuf key = STRBUF_INIT;
-	struct strbuf default_refspec = STRBUF_INIT;
 	struct strbuf branch_top = STRBUF_INIT, reflog_msg = STRBUF_INIT;
 	struct transport *transport = NULL;
 	const char *src_ref_prefix = "refs/heads/";
@@ -925,11 +987,13 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	int err = 0, complete_refs_before_fetch = 1;
 	int submodule_progress;
 
-	struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
-
-	fetch_if_missing = 0;
+	struct transport_ls_refs_options transport_ls_refs_options =
+		TRANSPORT_LS_REFS_OPTIONS_INIT;
 
 	packet_trace_identity("clone");
+
+	git_config(git_clone_config, NULL);
+
 	argc = parse_options(argc, argv, prefix, builtin_clone_options,
 			     builtin_clone_usage, 0);
 
@@ -958,18 +1022,17 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		option_no_checkout = 1;
 	}
 
-	if (!option_origin)
-		option_origin = "origin";
-
 	repo_name = argv[0];
 
 	path = get_repo_path(repo_name, &is_bundle);
-	if (path)
+	if (path) {
+		FREE_AND_NULL(path);
 		repo = absolute_pathdup(repo_name);
-	else if (!strchr(repo_name, ':'))
-		die(_("repository '%s' does not exist"), repo_name);
-	else
+	} else if (strchr(repo_name, ':')) {
 		repo = repo_name;
+		display_repo = transport_anonymize_url(repo);
+	} else
+		die(_("repository '%s' does not exist"), repo_name);
 
 	/* no need to be strict, transport_set_option() will validate it again */
 	if (option_depth && atoi(option_depth) < 1)
@@ -981,18 +1044,28 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		dir = guess_dir_name(repo_name, is_bundle, option_bare);
 	strip_trailing_slashes(dir);
 
-	dest_exists = dir_exists(dir);
+	dest_exists = path_exists(dir);
 	if (dest_exists && !is_empty_dir(dir))
 		die(_("destination path '%s' already exists and is not "
 			"an empty directory."), dir);
 
-	strbuf_addf(&reflog_msg, "clone: from %s", repo);
+	if (real_git_dir) {
+		real_dest_exists = path_exists(real_git_dir);
+		if (real_dest_exists && !is_empty_dir(real_git_dir))
+			die(_("repository path '%s' already exists and is not "
+				"an empty directory."), real_git_dir);
+	}
+
+
+	strbuf_addf(&reflog_msg, "clone: from %s",
+		    display_repo ? display_repo : repo);
+	free(display_repo);
 
 	if (option_bare)
 		work_tree = NULL;
 	else {
 		work_tree = getenv("GIT_WORK_TREE");
-		if (work_tree && dir_exists(work_tree))
+		if (work_tree && path_exists(work_tree))
 			die(_("working tree '%s' already exists."), work_tree);
 	}
 
@@ -1020,7 +1093,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	}
 
 	if (real_git_dir) {
-		if (dir_exists(real_git_dir))
+		if (real_dest_exists)
 			junk_git_dir_flags |= REMOVE_DIR_KEEP_TOPLEVEL;
 		junk_git_dir = real_git_dir;
 	} else {
@@ -1074,14 +1147,45 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		}
 	}
 
-	init_db(git_dir, real_git_dir, option_template, INIT_DB_QUIET);
+	init_db(git_dir, real_git_dir, option_template, GIT_HASH_UNKNOWN, NULL,
+		INIT_DB_QUIET);
 
 	if (real_git_dir)
 		git_dir = real_git_dir;
 
+	/*
+	 * additional config can be injected with -c, make sure it's included
+	 * after init_db, which clears the entire config environment.
+	 */
 	write_config(&option_config);
 
-	git_config(git_default_config, NULL);
+	/*
+	 * re-read config after init_db and write_config to pick up any config
+	 * injected by --template and --config, respectively.
+	 */
+	git_config(git_clone_config, NULL);
+
+	/*
+	 * If option_reject_shallow is specified from CLI option,
+	 * ignore config_reject_shallow from git_clone_config.
+	 */
+	if (config_reject_shallow != -1)
+		reject_shallow = config_reject_shallow;
+	if (option_reject_shallow != -1)
+		reject_shallow = option_reject_shallow;
+
+	/*
+	 * apply the remote name provided by --origin only after this second
+	 * call to git_config, to ensure it overrides all config-based values.
+	 */
+	if (option_origin != NULL)
+		remote_name = xstrdup(option_origin);
+
+	if (remote_name == NULL)
+		remote_name = xstrdup("origin");
+
+	if (!valid_remote_name(remote_name))
+		die(_("'%s' is not a valid remote name"), remote_name);
 
 	if (option_bare) {
 		if (option_mirror)
@@ -1090,15 +1194,15 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
 		git_config_set("core.bare", "true");
 	} else {
-		strbuf_addf(&branch_top, "refs/remotes/%s/", option_origin);
+		strbuf_addf(&branch_top, "refs/remotes/%s/", remote_name);
 	}
 
-	strbuf_addf(&key, "remote.%s.url", option_origin);
+	strbuf_addf(&key, "remote.%s.url", remote_name);
 	git_config_set(key.buf, repo);
 	strbuf_reset(&key);
 
 	if (option_no_tags) {
-		strbuf_addf(&key, "remote.%s.tagOpt", option_origin);
+		strbuf_addf(&key, "remote.%s.tagOpt", remote_name);
 		git_config_set(key.buf, "--no-tags");
 		strbuf_reset(&key);
 	}
@@ -1106,11 +1210,13 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	if (option_required_reference.nr || option_optional_reference.nr)
 		setup_reference();
 
-	remote = remote_get(option_origin);
+	if (option_sparse_checkout && git_sparse_checkout_init(dir))
+		return 1;
+
+	remote = remote_get(remote_name);
 
-	strbuf_addf(&default_refspec, "+%s*:%s*", src_ref_prefix,
-		    branch_top.buf);
-	refspec_append(&remote->fetch, default_refspec.buf);
+	refspec_appendf(&remote->fetch, "+%s*:%s*", src_ref_prefix,
+			branch_top.buf);
 
 	transport = transport_get(remote, remote->url[0]);
 	transport_set_verbosity(transport, option_verbosity, option_progress);
@@ -1128,6 +1234,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		if (filter_options.choice)
 			warning(_("--filter is ignored in local clones; use file:// instead."));
 		if (!access(mkpath("%s/shallow", path), F_OK)) {
+			if (reject_shallow)
+				die(_("source repository is shallow, reject to clone."));
 			if (option_local > 0)
 				warning(_("source repository is shallow, ignoring --local"));
 			is_local = 0;
@@ -1139,6 +1247,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
 	transport_set_option(transport, TRANS_OPT_KEEP, "yes");
 
+	if (reject_shallow)
+		transport_set_option(transport, TRANS_OPT_REJECT_SHALLOW, "1");
 	if (option_depth)
 		transport_set_option(transport, TRANS_OPT_DEPTH,
 				     option_depth);
@@ -1170,16 +1280,28 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		transport->smart_options->check_self_contained_and_connected = 1;
 
 
-	argv_array_push(&ref_prefixes, "HEAD");
-	refspec_ref_prefixes(&remote->fetch, &ref_prefixes);
+	strvec_push(&transport_ls_refs_options.ref_prefixes, "HEAD");
+	refspec_ref_prefixes(&remote->fetch,
+			     &transport_ls_refs_options.ref_prefixes);
 	if (option_branch)
-		expand_ref_prefix(&ref_prefixes, option_branch);
+		expand_ref_prefix(&transport_ls_refs_options.ref_prefixes,
+				  option_branch);
 	if (!option_no_tags)
-		argv_array_push(&ref_prefixes, "refs/tags/");
+		strvec_push(&transport_ls_refs_options.ref_prefixes,
+			    "refs/tags/");
 
-	refs = transport_get_remote_refs(transport, &ref_prefixes);
+	refs = transport_get_remote_refs(transport, &transport_ls_refs_options);
 
 	if (refs) {
+		int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
+
+		/*
+		 * Now that we know what algorithm the remote side is using,
+		 * let's set ours to the same thing.
+		 */
+		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
@@ -1197,8 +1319,10 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 				break;
 			}
 
-		if (!is_local && !complete_refs_before_fetch)
-			transport_fetch_refs(transport, mapped_refs);
+		if (!is_local && !complete_refs_before_fetch) {
+			if (transport_fetch_refs(transport, mapped_refs))
+				die(_("remote transport reported error"));
+		}
 
 		remote_head = find_ref_by_name(refs, "HEAD");
 		remote_head_points_at =
@@ -1210,7 +1334,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 
 			if (!our_head_points_at)
 				die(_("Remote branch %s not found in upstream %s"),
-				    option_branch, option_origin);
+				    option_branch, remote_name);
 		}
 		else
 			our_head_points_at = remote_head_points_at;
@@ -1218,7 +1342,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	else {
 		if (option_branch)
 			die(_("Remote branch %s not found in upstream %s"),
-					option_branch, option_origin);
+					option_branch, remote_name);
 
 		warning(_("You appear to have cloned an empty repository."));
 		mapped_refs = NULL;
@@ -1226,25 +1350,42 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 		remote_head_points_at = NULL;
 		remote_head = NULL;
 		option_no_checkout = 1;
-		if (!option_bare)
-			install_branch_config(0, "master", option_origin,
-					      "refs/heads/master");
+		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);
+		}
 	}
 
 	write_refspec_config(src_ref_prefix, our_head_points_at,
 			remote_head_points_at, &branch_top);
 
 	if (filter_options.choice)
-		partial_clone_register(option_origin, &filter_options);
+		partial_clone_register(remote_name, &filter_options);
 
 	if (is_local)
 		clone_local(path, git_dir);
-	else if (refs && complete_refs_before_fetch)
-		transport_fetch_refs(transport, mapped_refs);
+	else if (refs && complete_refs_before_fetch) {
+		if (transport_fetch_refs(transport, mapped_refs))
+			die(_("remote transport reported error"));
+	}
 
 	update_remote_refs(refs, mapped_refs, remote_head_points_at,
 			   branch_top.buf, reflog_msg.buf, transport,
-			   !is_local, filter_options.choice);
+			   !is_local);
 
 	update_head(our_head_points_at, remote_head, reflog_msg.buf);
 
@@ -1265,15 +1406,20 @@ int cmd_clone(int argc, const char **argv, const char *prefix)
 	}
 
 	junk_mode = JUNK_LEAVE_REPO;
-	fetch_if_missing = 1;
 	err = checkout(submodule_progress);
 
+	free(remote_name);
 	strbuf_release(&reflog_msg);
 	strbuf_release(&branch_top);
 	strbuf_release(&key);
-	strbuf_release(&default_refspec);
+	free_refs(mapped_refs);
+	free_refs(remote_head_points_at);
+	free(dir);
+	free(path);
+	UNLEAK(repo);
 	junk_mode = JUNK_LEAVE_ALL;
 
-	argv_array_clear(&ref_prefixes);
+	strvec_clear(&transport_ls_refs_options.ref_prefixes);
+	free(transport_ls_refs_options.unborn_head_target);
 	return err;
 }
diff --git a/builtin/column.c b/builtin/column.c
index e815e148aa..158fdf53d9 100644
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -27,10 +27,10 @@ int cmd_column(int argc, const char **argv, const char *prefix)
 		OPT_STRING(0, "command", &real_command, N_("name"), N_("lookup config vars")),
 		OPT_COLUMN(0, "mode", &colopts, N_("layout to use")),
 		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_INTEGER(0, "padding", &copts.padding, N_("Padding space between columns")),
+		OPT_INTEGER(0, "width", &copts.width, N_("maximum width")),
+		OPT_STRING(0, "indent", &copts.indent, N_("string"), N_("padding space on left 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 addc8d4cc0..cd86315221 100644
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -6,12 +6,15 @@
 #include "repository.h"
 #include "commit-graph.h"
 #include "object-store.h"
+#include "progress.h"
+#include "tag.h"
 
 static char const * const builtin_commit_graph_usage[] = {
-	N_("git commit-graph [--object-dir <objdir>]"),
-	N_("git commit-graph read [--object-dir <objdir>]"),
 	N_("git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"),
-	N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"),
+	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
 };
 
@@ -20,13 +23,11 @@ static const char * const builtin_commit_graph_verify_usage[] = {
 	NULL
 };
 
-static const char * const builtin_commit_graph_read_usage[] = {
-	N_("git commit-graph read [--object-dir <objdir>]"),
-	NULL
-};
-
 static const char * const builtin_commit_graph_write_usage[] = {
-	N_("git commit-graph write [--object-dir <objdir>] [--append|--split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"),
+	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
 };
 
@@ -39,11 +40,35 @@ static struct opts_commit_graph {
 	int split;
 	int shallow;
 	int progress;
+	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);
+
+	if (!odb)
+		die(_("could not find object directory matching %s"), obj_dir);
+	return odb;
+}
+
 static int graph_verify(int argc, const char **argv)
 {
 	struct commit_graph *graph = NULL;
+	struct object_directory *odb = NULL;
 	char *graph_name;
 	int open_ok;
 	int fd;
@@ -53,7 +78,7 @@ static int graph_verify(int argc, const char **argv)
 	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")),
+			   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")),
@@ -74,7 +99,8 @@ static int graph_verify(int argc, const char **argv)
 	if (opts.progress)
 		flags |= COMMIT_GRAPH_WRITE_PROGRESS;
 
-	graph_name = get_commit_graph_filename(opts.obj_dir);
+	odb = find_odb(the_repository, opts.obj_dir);
+	graph_name = get_commit_graph_filename(odb);
 	open_ok = open_commit_graph(graph_name, &fd, &st);
 	if (!open_ok && errno != ENOENT)
 		die_errno(_("Could not open commit-graph '%s'"), graph_name);
@@ -82,9 +108,9 @@ static int graph_verify(int argc, const char **argv)
 	FREE_AND_NULL(graph_name);
 
 	if (open_ok)
-		graph = load_commit_graph_one_fd_st(fd, &st);
-	 else
-		graph = read_commit_graph_one(the_repository, opts.obj_dir);
+		graph = load_commit_graph_one_fd_st(the_repository, fd, &st, odb);
+	else
+		graph = read_commit_graph_one(the_repository, odb);
 
 	/* Return failure if open_ok predicted success */
 	if (!graph)
@@ -94,81 +120,95 @@ static int graph_verify(int argc, const char **argv)
 	return verify_commit_graph(the_repository, graph, flags);
 }
 
-static int graph_read(int argc, const char **argv)
+extern int read_replace_refs;
+static struct commit_graph_opts write_opts;
+
+static int write_option_parse_split(const struct option *opt, const char *arg,
+				    int unset)
 {
-	struct commit_graph *graph = NULL;
-	char *graph_name;
-	int open_ok;
-	int fd;
-	struct stat st;
+	enum commit_graph_split_flags *flags = opt->value;
 
-	static struct option builtin_commit_graph_read_options[] = {
-		OPT_STRING(0, "object-dir", &opts.obj_dir,
-			N_("dir"),
-			N_("The object directory to store the graph")),
-		OPT_END(),
-	};
+	BUG_ON_OPT_NEG(unset);
 
-	trace2_cmd_mode("read");
+	opts.split = 1;
+	if (!arg)
+		return 0;
 
-	argc = parse_options(argc, argv, NULL,
-			     builtin_commit_graph_read_options,
-			     builtin_commit_graph_read_usage, 0);
+	if (!strcmp(arg, "no-merge"))
+		*flags = COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED;
+	else if (!strcmp(arg, "replace"))
+		*flags = COMMIT_GRAPH_SPLIT_REPLACE;
+	else
+		die(_("unrecognized --split argument, %s"), arg);
 
-	if (!opts.obj_dir)
-		opts.obj_dir = get_object_directory();
-
-	graph_name = get_commit_graph_filename(opts.obj_dir);
+	return 0;
+}
 
-	open_ok = open_commit_graph(graph_name, &fd, &st);
-	if (!open_ok)
-		die_errno(_("Could not open commit-graph '%s'"), graph_name);
+static int read_one_commit(struct oidset *commits, struct progress *progress,
+			   const char *hash)
+{
+	struct object *result;
+	struct object_id oid;
+	const char *end;
 
-	graph = load_commit_graph_one_fd_st(fd, &st);
-	if (!graph)
-		return 1;
+	if (parse_oid_hex(hash, &oid, &end))
+		return error(_("unexpected non-hex object ID: %s"), hash);
 
-	FREE_AND_NULL(graph_name);
+	result = deref_tag(the_repository, parse_object(the_repository, &oid),
+			   NULL, 0);
+	if (!result)
+		return error(_("invalid object: %s"), hash);
+	else if (object_as_type(result, OBJ_COMMIT, 1))
+		oidset_insert(commits, &result->oid);
 
-	printf("header: %08x %d %d %d %d\n",
-		ntohl(*(uint32_t*)graph->data),
-		*(unsigned char*)(graph->data + 4),
-		*(unsigned char*)(graph->data + 5),
-		*(unsigned char*)(graph->data + 6),
-		*(unsigned char*)(graph->data + 7));
-	printf("num_commits: %u\n", graph->num_commits);
-	printf("chunks:");
-
-	if (graph->chunk_oid_fanout)
-		printf(" oid_fanout");
-	if (graph->chunk_oid_lookup)
-		printf(" oid_lookup");
-	if (graph->chunk_commit_data)
-		printf(" commit_metadata");
-	if (graph->chunk_extra_edges)
-		printf(" extra_edges");
-	printf("\n");
+	display_progress(progress, oidset_size(commits));
 
-	UNLEAK(graph);
+	return 0;
+}
 
+static int write_option_max_new_filters(const struct option *opt,
+					const char *arg,
+					int unset)
+{
+	int *to = opt->value;
+	if (unset)
+		*to = -1;
+	else {
+		const char *s;
+		*to = strtol(arg, (char **)&s, 10);
+		if (*s)
+			return error(_("%s expects a numerical value"),
+				     optname(opt, opt->flags));
+	}
 	return 0;
 }
 
-extern int read_replace_refs;
-static struct split_commit_graph_opts split_opts;
+static int git_commit_graph_write_config(const char *var, const char *value,
+					 void *cb)
+{
+	if (!strcmp(var, "commitgraph.maxnewfilters"))
+		write_opts.max_new_filters = git_config_int(var, value);
+	/*
+	 * No need to fall-back to 'git_default_config', since this was already
+	 * called in 'cmd_commit_graph()'.
+	 */
+	return 0;
+}
 
 static int graph_write(int argc, const char **argv)
 {
-	struct string_list *pack_indexes = NULL;
-	struct string_list *commit_hex = NULL;
-	struct string_list lines;
+	struct string_list pack_indexes = STRING_LIST_INIT_NODUP;
+	struct strbuf buf = STRBUF_INIT;
+	struct oidset commits = OIDSET_INIT;
+	struct object_directory *odb = NULL;
 	int result = 0;
 	enum commit_graph_write_flags flags = 0;
+	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")),
+			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,
@@ -177,25 +217,36 @@ static int graph_write(int argc, const char **argv)
 			N_("start walk at commits listed by stdin")),
 		OPT_BOOL(0, "append", &opts.append,
 			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_BOOL(0, "split", &opts.split,
-			N_("allow writing an incremental commit-graph file")),
-		OPT_INTEGER(0, "max-commits", &split_opts.max_commits,
+		OPT_CALLBACK_F(0, "split", &write_opts.split_flags, NULL,
+			N_("allow writing an incremental commit-graph file"),
+			PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
+			write_option_parse_split),
+		OPT_INTEGER(0, "max-commits", &write_opts.max_commits,
 			N_("maximum number of commits in a non-base split commit-graph")),
-		OPT_INTEGER(0, "size-multiple", &split_opts.size_multiple,
+		OPT_INTEGER(0, "size-multiple", &write_opts.size_multiple,
 			N_("maximum ratio between two levels of a split commit-graph")),
-		OPT_EXPIRY_DATE(0, "expire-time", &split_opts.expire_time,
-			N_("maximum number of commits in a non-base split commit-graph")),
+		OPT_EXPIRY_DATE(0, "expire-time", &write_opts.expire_time,
+			N_("only expire files older than a given date-time")),
+		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_END(),
 	};
 
 	opts.progress = isatty(2);
-	split_opts.size_multiple = 2;
-	split_opts.max_commits = 0;
-	split_opts.expire_time = 0;
+	opts.enable_changed_paths = -1;
+	write_opts.size_multiple = 2;
+	write_opts.max_commits = 0;
+	write_opts.expire_time = 0;
+	write_opts.max_new_filters = -1;
 
 	trace2_cmd_mode("write");
 
+	git_config(git_commit_graph_write_config, &opts);
+
 	argc = parse_options(argc, argv, NULL,
 			     builtin_commit_graph_write_options,
 			     builtin_commit_graph_write_usage, 0);
@@ -210,40 +261,51 @@ static int graph_write(int argc, const char **argv)
 		flags |= COMMIT_GRAPH_WRITE_SPLIT;
 	if (opts.progress)
 		flags |= COMMIT_GRAPH_WRITE_PROGRESS;
+	if (!opts.enable_changed_paths)
+		flags |= COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS;
+	if (opts.enable_changed_paths == 1 ||
+	    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) {
-		if (write_commit_graph_reachable(opts.obj_dir, flags, &split_opts))
+		if (write_commit_graph_reachable(odb, flags, &write_opts))
 			return 1;
 		return 0;
 	}
 
-	string_list_init(&lines, 0);
-	if (opts.stdin_packs || opts.stdin_commits) {
-		struct strbuf buf = STRBUF_INIT;
-
+	if (opts.stdin_packs) {
 		while (strbuf_getline(&buf, stdin) != EOF)
-			string_list_append(&lines, strbuf_detach(&buf, NULL));
-
-		if (opts.stdin_packs)
-			pack_indexes = &lines;
-		if (opts.stdin_commits) {
-			commit_hex = &lines;
-			flags |= COMMIT_GRAPH_WRITE_CHECK_OIDS;
+			string_list_append(&pack_indexes,
+					   strbuf_detach(&buf, NULL));
+	} else if (opts.stdin_commits) {
+		oidset_init(&commits, 0);
+		if (opts.progress)
+			progress = start_delayed_progress(
+				_("Collecting commits from input"), 0);
+
+		while (strbuf_getline(&buf, stdin) != EOF) {
+			if (read_one_commit(&commits, progress, buf.buf)) {
+				result = 1;
+				goto cleanup;
+			}
 		}
 
-		UNLEAK(buf);
+		stop_progress(&progress);
 	}
 
-	if (write_commit_graph(opts.obj_dir,
-			       pack_indexes,
-			       commit_hex,
+	if (write_commit_graph(odb,
+			       opts.stdin_packs ? &pack_indexes : NULL,
+			       opts.stdin_commits ? &commits : NULL,
 			       flags,
-			       &split_opts))
+			       &write_opts))
 		result = 1;
 
-	UNLEAK(lines);
+cleanup:
+	string_list_clear(&pack_indexes, 0);
+	strbuf_release(&buf);
 	return result;
 }
 
@@ -252,7 +314,7 @@ 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")),
+			N_("the object directory to store the graph")),
 		OPT_END(),
 	};
 
@@ -269,8 +331,6 @@ int cmd_commit_graph(int argc, const char **argv, const char *prefix)
 	save_commit_buffer = 0;
 
 	if (argc > 0) {
-		if (!strcmp(argv[0], "read"))
-			return graph_read(argc, argv);
 		if (!strcmp(argv[0], "verify"))
 			return graph_verify(argc, argv);
 		if (!strcmp(argv[0], "write"))
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index b866d83951..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);
@@ -108,15 +106,15 @@ int cmd_commit_tree(int argc, const char **argv, const char *prefix)
 	struct object_id commit_oid;
 
 	struct option options[] = {
-		{ OPTION_CALLBACK, 'p', NULL, &parents, N_("parent"),
+		OPT_CALLBACK_F('p', NULL, &parents, N_("parent"),
 			N_("id of a parent commit object"), PARSE_OPT_NONEG,
-			parse_parent_arg_callback },
-		{ OPTION_CALLBACK, 'm', NULL, &buffer, N_("message"),
+			parse_parent_arg_callback),
+		OPT_CALLBACK_F('m', NULL, &buffer, N_("message"),
 			N_("commit message"), PARSE_OPT_NONEG,
-			parse_message_arg_callback },
-		{ OPTION_CALLBACK, 'F', NULL, &buffer, N_("file"),
+			parse_message_arg_callback),
+		OPT_CALLBACK_F('F', NULL, &buffer, N_("file"),
 			N_("read commit log message from file"), PARSE_OPT_NONEG,
-			parse_file_arg_callback },
+			parse_file_arg_callback),
 		{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
 			N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
 		OPT_END()
diff --git a/builtin/commit.c b/builtin/commit.c
index e588bc6ad3..7c9b1e7be3 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -59,6 +59,9 @@ N_("The previous cherry-pick is now empty, possibly due to conflict resolution.\
 "    git commit --allow-empty\n"
 "\n");
 
+static const char empty_rebase_pick_advice[] =
+N_("Otherwise, please use 'git rebase --skip'\n");
+
 static const char empty_cherry_pick_advice_single[] =
 N_("Otherwise, please use 'git cherry-pick --skip'\n");
 
@@ -102,14 +105,16 @@ static const char *template_file;
  */
 static const char *author_message, *author_message_buffer;
 static char *edit_message, *use_message;
-static char *fixup_message, *squash_message;
+static char *fixup_message, *fixup_commit, *squash_message;
+static const char *fixup_prefix;
 static int all, also, interactive, patch_interactive, only, amend, signoff;
 static int edit_flag = -1; /* unspecified */
 static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
 static int config_commit_verbose = -1; /* unspecified */
-static int no_post_rewrite, allow_empty_message;
+static int no_post_rewrite, allow_empty_message, pathspec_file_nul;
 static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg;
-static char *sign_commit;
+static char *sign_commit, *pathspec_from_file;
+static struct strvec trailer_args = STRVEC_INIT;
 
 /*
  * The default commit message cleanup mode will remove the lines
@@ -122,13 +127,20 @@ static enum commit_msg_cleanup_mode cleanup_mode;
 static const char *cleanup_arg;
 
 static enum commit_whence whence;
-static int sequencer_in_use;
 static int use_editor = 1, include_status = 1;
 static int have_option_m;
 static struct strbuf message = STRBUF_INIT;
 
 static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;
 
+static int opt_pass_trailer(const struct option *opt, const char *arg, int unset)
+{
+	BUG_ON_OPT_NEG(unset);
+
+	strvec_pushl(&trailer_args, "--trailer", arg, NULL);
+	return 0;
+}
+
 static int opt_parse_porcelain(const struct option *opt, const char *arg, int unset)
 {
 	enum wt_status_format *value = (enum wt_status_format *)opt->value;
@@ -179,12 +191,7 @@ static void determine_whence(struct wt_status *s)
 {
 	if (file_exists(git_path_merge_head(the_repository)))
 		whence = FROM_MERGE;
-	else if (file_exists(git_path_cherry_pick_head(the_repository))) {
-		whence = FROM_CHERRY_PICK;
-		if (file_exists(git_path_seq_dir()))
-			sequencer_in_use = 1;
-	}
-	else
+	else if (!sequencer_determine_whence(the_repository, &whence))
 		whence = FROM_COMMIT;
 	if (s)
 		s->whence = whence;
@@ -254,6 +261,8 @@ static int list_paths(struct string_list *list, const char *with_tree,
 		free(max_prefix);
 	}
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(&the_index);
 	for (i = 0; i < active_nr; i++) {
 		const struct cache_entry *ce = active_cache[i];
 		struct string_list_item *item;
@@ -329,7 +338,7 @@ static void refresh_cache_or_die(int refresh_flags)
 		die_resolve_conflict("commit");
 }
 
-static const char *prepare_index(int argc, const char **argv, const char *prefix,
+static const char *prepare_index(const char **argv, const char *prefix,
 				 const struct commit *current_head, int is_status)
 {
 	struct string_list partial = STRING_LIST_INIT_DUP;
@@ -343,11 +352,32 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 		       PATHSPEC_PREFER_FULL,
 		       prefix, argv);
 
+	if (pathspec_from_file) {
+		if (interactive)
+			die(_("--pathspec-from-file is incompatible with --interactive/--patch"));
+
+		if (all)
+			die(_("--pathspec-from-file with -a does not make sense"));
+
+		if (pathspec.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		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"));
+	}
+
+	if (!pathspec.nr && (also || (only && !allow_empty &&
+	    (!amend || (fixup_message && strcmp(fixup_prefix, "amend"))))))
+		die(_("No paths with --include/--only does not make sense."));
+
 	if (read_cache_preload(&pathspec) < 0)
 		die(_("index file corrupt"));
 
 	if (interactive) {
-		char *old_index_env = NULL;
+		char *old_index_env = NULL, *old_repo_index_file;
 		hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
 
 		refresh_cache_or_die(refresh_flags);
@@ -355,12 +385,16 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 		if (write_locked_index(&the_index, &index_lock, 0))
 			die(_("unable to create temporary index"));
 
+		old_repo_index_file = the_repository->index_file;
+		the_repository->index_file =
+			(char *)get_lock_file_path(&index_lock);
 		old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
-		setenv(INDEX_ENVIRONMENT, get_lock_file_path(&index_lock), 1);
+		setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
 
-		if (interactive_add(argc, argv, prefix, patch_interactive) != 0)
+		if (interactive_add(argv, prefix, patch_interactive) != 0)
 			die(_("interactive add failed"));
 
+		the_repository->index_file = old_repo_index_file;
 		if (old_index_env && *old_index_env)
 			setenv(INDEX_ENVIRONMENT, old_index_env, 1);
 		else
@@ -453,8 +487,10 @@ static const char *prepare_index(int argc, const char **argv, const char *prefix
 	if (whence != FROM_COMMIT) {
 		if (whence == FROM_MERGE)
 			die(_("cannot do a partial commit during a merge."));
-		else if (whence == FROM_CHERRY_PICK)
+		else if (is_from_cherry_pick(whence))
 			die(_("cannot do a partial commit during a cherry-pick."));
+		else if (is_from_rebase(whence))
+			die(_("cannot do a partial commit during a rebase."));
 	}
 
 	if (list_paths(&partial, !current_head ? NULL : "HEAD", &pathspec))
@@ -537,7 +573,7 @@ static void export_one(const char *var, const char *s, const char *e, int hack)
 	struct strbuf buf = STRBUF_INIT;
 	if (hack)
 		strbuf_addch(&buf, hack);
-	strbuf_addf(&buf, "%.*s", (int)(e - s), s);
+	strbuf_add(&buf, s, e - s);
 	setenv(var, buf.buf, 1);
 	strbuf_release(&buf);
 }
@@ -658,6 +694,22 @@ static void adjust_comment_line_char(const struct strbuf *sb)
 	comment_line_char = *p;
 }
 
+static void prepare_amend_commit(struct commit *commit, struct strbuf *sb,
+				struct pretty_print_context *ctx)
+{
+	const char *buffer, *subject, *fmt;
+
+	buffer = get_commit_buffer(commit, NULL);
+	find_commit_subject(buffer, &subject);
+	/*
+	 * If we amend the 'amend!' commit then we don't want to
+	 * duplicate the subject line.
+	 */
+	fmt = starts_with(subject, "amend!") ? "%b" : "%B";
+	format_commit_message(commit, fmt, sb, ctx);
+	unuse_commit_buffer(commit, buffer);
+}
+
 static int prepare_to_commit(const char *index_file, const char *prefix,
 			     struct commit *current_head,
 			     struct wt_status *s,
@@ -722,15 +774,33 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 	} else if (fixup_message) {
 		struct pretty_print_context ctx = {0};
 		struct commit *commit;
-		commit = lookup_commit_reference_by_name(fixup_message);
+		char *fmt;
+		commit = lookup_commit_reference_by_name(fixup_commit);
 		if (!commit)
-			die(_("could not lookup commit %s"), fixup_message);
+			die(_("could not lookup commit %s"), fixup_commit);
 		ctx.output_encoding = get_commit_output_encoding();
-		format_commit_message(commit, "fixup! %s\n\n",
-				      &sb, &ctx);
-		if (have_option_m)
-			strbuf_addbuf(&sb, &message);
+		fmt = xstrfmt("%s! %%s\n\n", fixup_prefix);
+		format_commit_message(commit, fmt, &sb, &ctx);
+		free(fmt);
 		hook_arg1 = "message";
+
+		/*
+		 * Only `-m` commit message option is checked here, as
+		 * it supports `--fixup` to append the commit message.
+		 *
+		 * The other commit message options `-c`/`-C`/`-F` are
+		 * incompatible with all the forms of `--fixup` and
+		 * have already errored out while parsing the `git commit`
+		 * options.
+		 */
+		if (have_option_m && !strcmp(fixup_prefix, "fixup"))
+			strbuf_addbuf(&sb, &message);
+
+		if (!strcmp(fixup_prefix, "amend")) {
+			if (have_option_m)
+				die(_("cannot combine -m with --fixup:%s"), fixup_message);
+			prepare_amend_commit(commit, &sb, &ctx);
+		}
 	} else if (!stat(git_path_merge_msg(the_repository), &statbuf)) {
 		size_t merge_msg_start;
 
@@ -771,7 +841,7 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 	 */
 	else if (whence == FROM_MERGE)
 		hook_arg1 = "merge";
-	else if (whence == FROM_CHERRY_PICK) {
+	else if (is_from_cherry_pick(whence) || whence == FROM_REBASE_PICK) {
 		hook_arg1 = "commit";
 		hook_arg2 = "CHERRY_PICK_HEAD";
 	}
@@ -819,44 +889,49 @@ 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)
 				wt_status_add_cut_line(s->fp);
-			status_printf_ln(s, GIT_COLOR_NORMAL,
-			    whence == FROM_MERGE
-				? _("\n"
-					"It looks like you may be committing a merge.\n"
-					"If this is not correct, please remove the file\n"
-					"	%s\n"
-					"and try again.\n")
-				: _("\n"
-					"It looks like you may be committing a cherry-pick.\n"
-					"If this is not correct, please remove the file\n"
-					"	%s\n"
-					"and try again.\n"),
+			status_printf_ln(
+				s, GIT_COLOR_NORMAL,
 				whence == FROM_MERGE ?
-					git_path_merge_head(the_repository) :
-					git_path_cherry_pick_head(the_repository));
+					      _("\n"
+					  "It looks like you may be committing a merge.\n"
+					  "If this is not correct, please run\n"
+					  "	git update-ref -d MERGE_HEAD\n"
+					  "and try again.\n") :
+					      _("\n"
+					  "It looks like you may be committing a cherry-pick.\n"
+					  "If this is not correct, please run\n"
+					  "	git update-ref -d CHERRY_PICK_HEAD\n"
+					  "and try again.\n"));
 		}
 
 		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
@@ -910,6 +985,8 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		if (get_oid(parent, &oid)) {
 			int i, ita_nr = 0;
 
+			/* TODO: audit for interaction with sparse-index. */
+			ensure_full_index(&the_index);
 			for (i = 0; i < active_nr; i++)
 				if (ce_intent_to_add(active_cache[i]))
 					ita_nr++;
@@ -937,6 +1014,18 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 
 	fclose(s->fp);
 
+	if (trailer_args.nr) {
+		struct child_process run_trailer = CHILD_PROCESS_INIT;
+
+		strvec_pushl(&run_trailer.args, "interpret-trailers",
+			     "--in-place", git_path_commit_editmsg(), NULL);
+		strvec_pushv(&run_trailer.args, trailer_args.v);
+		run_trailer.git_cmd = 1;
+		if (run_command(&run_trailer))
+			die(_("unable to pass trailers to --trailers"));
+		strvec_clear(&trailer_args);
+	}
+
 	/*
 	 * Reject an attempt to record a non-merge empty commit without
 	 * explicit --allow-empty. In the cherry-pick case, it may be
@@ -944,16 +1033,20 @@ 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->display_comment_prefix = old_display_comment_prefix;
 		run_status(stdout, index_file, prefix, 0, s);
 		if (amend)
 			fputs(_(empty_amend_advice), stderr);
-		else if (whence == FROM_CHERRY_PICK) {
+		else if (is_from_cherry_pick(whence) ||
+			 whence == FROM_REBASE_PICK) {
 			fputs(_(empty_cherry_pick_advice), stderr);
-			if (!sequencer_in_use)
+			if (whence == FROM_CHERRY_PICK_SINGLE)
 				fputs(_(empty_cherry_pick_advice_single), stderr);
-			else
+			else if (whence == FROM_CHERRY_PICK_MULTI)
 				fputs(_(empty_cherry_pick_advice_multi), stderr);
+			else
+				fputs(_(empty_rebase_pick_advice), stderr);
 		}
 		return 0;
 	}
@@ -978,15 +1071,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix,
 		return 0;
 
 	if (use_editor) {
-		struct argv_array env = ARGV_ARRAY_INIT;
+		struct strvec env = STRVEC_INIT;
 
-		argv_array_pushf(&env, "GIT_INDEX_FILE=%s", index_file);
-		if (launch_editor(git_path_commit_editmsg(), NULL, env.argv)) {
+		strvec_pushf(&env, "GIT_INDEX_FILE=%s", index_file);
+		if (launch_editor(git_path_commit_editmsg(), NULL, env.v)) {
 			fprintf(stderr,
 			_("Please supply the message using either -m or -F option.\n"));
 			exit(1);
 		}
-		argv_array_clear(&env);
+		strvec_clear(&env);
 	}
 
 	if (!no_verify &&
@@ -1014,7 +1107,7 @@ static const char *find_author_by_nickname(const char *name)
 	av[++ac] = NULL;
 	setup_revisions(ac, av, &revs, NULL);
 	revs.mailmap = &mailmap;
-	read_mailmap(revs.mailmap, NULL);
+	read_mailmap(revs.mailmap);
 
 	if (prepare_revision_walk(&revs))
 		die(_("revision walk setup failed"));
@@ -1127,6 +1220,19 @@ static void finalize_deferred_config(struct wt_status *s)
 		s->ahead_behind_flags = AHEAD_BEHIND_FULL;
 }
 
+static void check_fixup_reword_options(int argc, const char *argv[]) {
+	if (whence != FROM_COMMIT) {
+		if (whence == FROM_MERGE)
+			die(_("You are in the middle of a merge -- cannot reword."));
+		else if (is_from_cherry_pick(whence))
+			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);
+	if (patch_interactive || interactive || all || also || only)
+		die(_("reword option of --fixup is mutually exclusive with --patch/--interactive/--all/--include/--only"));
+}
+
 static int parse_and_validate_options(int argc, const char *argv[],
 				      const struct option *options,
 				      const char * const usage[],
@@ -1145,10 +1251,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
 	if (force_author && renew_authorship)
 		die(_("Using both --reset-author and --author does not make sense"));
 
-	if (logfile || have_option_m || use_message || fixup_message)
+	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)
@@ -1156,8 +1260,10 @@ static int parse_and_validate_options(int argc, const char *argv[],
 	if (amend && whence != FROM_COMMIT) {
 		if (whence == FROM_MERGE)
 			die(_("You are in the middle of a merge -- cannot amend."));
-		else if (whence == FROM_CHERRY_PICK)
+		else if (is_from_cherry_pick(whence))
 			die(_("You are in the middle of a cherry-pick -- cannot amend."));
+		else if (whence == FROM_REBASE_PICK)
+			die(_("You are in the middle of a rebase -- cannot amend."));
 	}
 	if (fixup_message && squash_message)
 		die(_("Options --squash and --fixup cannot be used together"));
@@ -1179,7 +1285,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
 		use_message = edit_message;
 	if (amend && !use_message && !fixup_message)
 		use_message = "HEAD";
-	if (!use_message && whence != FROM_CHERRY_PICK && renew_authorship)
+	if (!use_message && !is_from_cherry_pick(whence) &&
+	    !is_from_rebase(whence) && renew_authorship)
 		die(_("--reset-author can be used only with -C, -c or --amend."));
 	if (use_message) {
 		use_message_buffer = read_commit_message(use_message);
@@ -1188,7 +1295,8 @@ static int parse_and_validate_options(int argc, const char *argv[],
 			author_message_buffer = use_message_buffer;
 		}
 	}
-	if (whence == FROM_CHERRY_PICK && !renew_authorship) {
+	if ((is_from_cherry_pick(whence) || whence == FROM_REBASE_PICK) &&
+	    !renew_authorship) {
 		author_message = "CHERRY_PICK_HEAD";
 		author_message_buffer = read_commit_message(author_message);
 	}
@@ -1198,8 +1306,45 @@ static int parse_and_validate_options(int argc, const char *argv[],
 
 	if (also + only + all + interactive > 1)
 		die(_("Only one of --include/--only/--all/--interactive/--patch can be used."));
-	if (argc == 0 && (also || (only && !amend && !allow_empty)))
-		die(_("No paths with --include/--only does not make sense."));
+
+	if (fixup_message) {
+		/*
+		 * We limit --fixup's suboptions to only alpha characters.
+		 * If the first character after a run of alpha is colon,
+		 * then the part before the colon may be a known suboption
+		 * name like `amend` or `reword`, or a misspelt suboption
+		 * name. In either case, we treat it as
+		 * --fixup=<suboption>:<arg>.
+		 *
+		 * Otherwise, we are dealing with --fixup=<commit>.
+		 */
+		char *p = fixup_message;
+		while (isalpha(*p))
+			p++;
+		if (p > fixup_message && *p == ':') {
+			*p = '\0';
+			fixup_commit = p + 1;
+			if (!strcmp("amend", fixup_message) ||
+			    !strcmp("reword", fixup_message)) {
+				fixup_prefix = "amend";
+				allow_empty = 1;
+				if (*fixup_message == 'r') {
+					check_fixup_reword_options(argc, argv);
+					only = 1;
+				}
+			} else {
+				die(_("unknown option: --fixup=%s:%s"), fixup_message, fixup_commit);
+			}
+		} else {
+			fixup_commit = fixup_message;
+			fixup_prefix = "fixup";
+			use_editor = 0;
+		}
+	}
+
+	if (0 <= edit_flag)
+		use_editor = edit_flag;
+
 	cleanup_mode = get_cleanup_mode(cleanup_arg, use_editor);
 
 	handle_untracked_files_arg(s);
@@ -1214,13 +1359,13 @@ static int parse_and_validate_options(int argc, const char *argv[],
 	return argc;
 }
 
-static int dry_run_commit(int argc, const char **argv, const char *prefix,
+static int dry_run_commit(const char **argv, const char *prefix,
 			  const struct commit *current_head, struct wt_status *s)
 {
 	int committable;
 	const char *index_file;
 
-	index_file = prepare_index(argc, argv, prefix, current_head, 1);
+	index_file = prepare_index(argv, prefix, current_head, 1);
 	committable = run_status(stdout, index_file, prefix, 0, s);
 	rollback_index_files();
 
@@ -1343,9 +1488,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 			 N_("show stash information")),
 		OPT_BOOL(0, "ahead-behind", &s.ahead_behind_flags,
 			 N_("compute full ahead/behind values")),
-		{ OPTION_CALLBACK, 0, "porcelain", &status_format,
+		OPT_CALLBACK_F(0, "porcelain", &status_format,
 		  N_("version"), N_("machine-readable output"),
-		  PARSE_OPT_OPTARG, opt_parse_porcelain },
+		  PARSE_OPT_OPTARG, opt_parse_porcelain),
 		OPT_SET_INT(0, "long", &status_format,
 			    N_("show status in long format (default)"),
 			    STATUS_FORMAT_LONG),
@@ -1364,15 +1509,18 @@ int cmd_status(int argc, const char **argv, const char *prefix)
 		  PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
 		OPT_COLUMN(0, "column", &s.colopts, N_("list untracked files in columns")),
 		OPT_BOOL(0, "no-renames", &no_renames, N_("do not detect renames")),
-		{ OPTION_CALLBACK, 'M', "find-renames", &rename_score_arg,
+		OPT_CALLBACK_F('M', "find-renames", &rename_score_arg,
 		  N_("n"), N_("detect renames, optionally set similarity index"),
-		  PARSE_OPT_OPTARG | PARSE_OPT_NONEG, opt_parse_rename_score },
+		  PARSE_OPT_OPTARG | PARSE_OPT_NONEG, opt_parse_rename_score),
 		OPT_END(),
 	};
 
 	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,
@@ -1463,31 +1611,8 @@ static int git_commit_config(const char *k, const char *v, void *cb)
 	return git_status_config(k, v, s);
 }
 
-int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...)
-{
-	struct argv_array hook_env = ARGV_ARRAY_INIT;
-	va_list args;
-	int ret;
-
-	argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file);
-
-	/*
-	 * Let the hook know that no editor will be launched.
-	 */
-	if (!editor_is_used)
-		argv_array_push(&hook_env, "GIT_EDITOR=:");
-
-	va_start(args, name);
-	ret = run_hook_ve(hook_env.argv,name, args);
-	va_end(args);
-	argv_array_clear(&hook_env);
-
-	return ret;
-}
-
 int cmd_commit(int argc, const char **argv, const char *prefix)
 {
-	const char *argv_gc_auto[] = {"gc", "--auto", NULL};
 	static struct wt_status s;
 	static struct option builtin_commit_options[] = {
 		OPT__QUIET(&quiet, N_("suppress summary after successful commit")),
@@ -1500,10 +1625,15 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		OPT_CALLBACK('m', "message", &message, N_("message"), N_("commit message"), opt_parse_m),
 		OPT_STRING('c', "reedit-message", &edit_message, N_("commit"), N_("reuse and edit message from specified commit")),
 		OPT_STRING('C', "reuse-message", &use_message, N_("commit"), N_("reuse message from specified commit")),
-		OPT_STRING(0, "fixup", &fixup_message, N_("commit"), N_("use autosquash formatted message to fixup specified commit")),
+		/*
+		 * TRANSLATORS: Leave "[(amend|reword):]" as-is,
+		 * and only translate <commit>.
+		 */
+		OPT_STRING(0, "fixup", &fixup_message, N_("[(amend|reword):]commit"), N_("use autosquash formatted message to fixup or amend/reword specified commit")),
 		OPT_STRING(0, "squash", &squash_message, N_("commit"), N_("use autosquash formatted message to squash specified commit")),
 		OPT_BOOL(0, "reset-author", &renew_authorship, N_("the commit is authored by me now (used with -C/-c/--amend)")),
-		OPT_BOOL('s', "signoff", &signoff, N_("add Signed-off-by:")),
+		OPT_CALLBACK_F(0, "trailer", NULL, N_("trailer"), N_("add custom trailer(s)"), PARSE_OPT_NONEG, opt_pass_trailer),
+		OPT_BOOL('s', "signoff", &signoff, N_("add a Signed-off-by trailer")),
 		OPT_FILENAME('t', "template", &template_file, N_("use specified template file")),
 		OPT_BOOL('e', "edit", &edit_flag, N_("force edit of commit")),
 		OPT_CLEANUP(&cleanup_arg),
@@ -1535,6 +1665,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		OPT_BOOL(0, "amend", &amend, N_("amend previous commit")),
 		OPT_BOOL(0, "no-post-rewrite", &no_post_rewrite, N_("bypass post-rewrite hook")),
 		{ OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, N_("mode"), N_("show untracked files, optional modes: all, normal, no. (Default: all)"), PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
+		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+		OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 		/* end commit contents options */
 
 		OPT_HIDDEN_BOOL(0, "allow-empty", &allow_empty,
@@ -1558,6 +1690,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 */
@@ -1578,8 +1713,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		verbose = (config_commit_verbose < 0) ? 0 : config_commit_verbose;
 
 	if (dry_run)
-		return dry_run_commit(argc, argv, prefix, current_head, &s);
-	index_file = prepare_index(argc, argv, prefix, current_head, 0);
+		return dry_run_commit(argv, prefix, current_head, &s);
+	index_file = prepare_index(argv, prefix, current_head, 0);
 
 	/* Set up everything for writing the commit object.  This includes
 	   running hooks, writing the trees, and interacting with the user.  */
@@ -1628,8 +1763,10 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 			reduce_heads_replace(&parents);
 	} else {
 		if (!reflog_msg)
-			reflog_msg = (whence == FROM_CHERRY_PICK)
+			reflog_msg = is_from_cherry_pick(whence)
 					? "commit (cherry-pick)"
+					: is_from_rebase(whence)
+					? "commit (rebase)"
 					: "commit";
 		commit_list_insert(current_head, &parents);
 	}
@@ -1655,8 +1792,21 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		exit(1);
 	}
 
+	if (fixup_message && starts_with(sb.buf, "amend! ") &&
+	    !allow_empty_message) {
+		struct strbuf body = STRBUF_INIT;
+		size_t len = commit_subject_length(sb.buf);
+		strbuf_addstr(&body, sb.buf + len);
+		if (message_is_empty(&body, cleanup_mode)) {
+			rollback_index_files();
+			fprintf(stderr, _("Aborting commit due to empty commit message body.\n"));
+			exit(1);
+		}
+		strbuf_release(&body);
+	}
+
 	if (amend) {
-		const char *exclude_gpgsig[2] = { "gpgsig", NULL };
+		const char *exclude_gpgsig[3] = { "gpgsig", "gpgsig-sha256", NULL };
 		extra = read_commit_extra_headers(current_head, exclude_gpgsig);
 	} else {
 		struct commit_extra_header **tail = &extra;
@@ -1664,8 +1814,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 	}
 
 	if (commit_tree_extended(sb.buf, sb.len, &active_cache_tree->oid,
-				 parents, &oid, author_ident.buf, sign_commit,
-				 extra)) {
+				 parents, &oid, author_ident.buf, NULL,
+				 sign_commit, extra)) {
 		rollback_index_files();
 		die(_("failed to write commit object"));
 	}
@@ -1689,12 +1839,10 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 		      "new_index file. Check that disk is not full and quota is\n"
 		      "not exceeded, and then \"git restore --staged :/\" to recover."));
 
-	if (git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
-	    write_commit_graph_reachable(get_object_directory(), 0, NULL))
-		return 1;
+	git_test_write_commit_graph_or_die();
 
 	repo_rerere(the_repository, 0);
-	run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
+	run_auto_maintenance(quiet);
 	run_commit_hook(use_editor, get_index_file(), "post-commit", NULL);
 	if (amend && !no_post_rewrite) {
 		commit_post_rewrite(the_repository, current_head, &oid);
@@ -1710,6 +1858,8 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
 				     &oid, flags);
 	}
 
+	apply_autostash(git_path_merge_autostash(the_repository));
+
 	UNLEAK(err);
 	UNLEAK(sb);
 	return 0;
diff --git a/builtin/config.c b/builtin/config.c
index 98d65bc0ad..865fddd6ce 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -14,6 +14,7 @@ static const char *const builtin_config_usage[] = {
 
 static char *key;
 static regex_t *key_regexp;
+static const char *value_pattern;
 static regex_t *regexp;
 static int show_keys;
 static int omit_values;
@@ -29,10 +30,12 @@ static int use_worktree_config;
 static struct git_config_source given_config_source;
 static int actions, type;
 static char *default_value;
-static int end_null;
+static int end_nul;
 static int respect_includes_opt = -1;
 static struct config_options config_options;
 static int show_origin;
+static int show_scope;
+static int fixed_value;
 
 #define ACTION_GET (1<<0)
 #define ACTION_GET_ALL (1<<1)
@@ -64,6 +67,7 @@ static int show_origin;
 #define TYPE_PATH		4
 #define TYPE_EXPIRY_DATE	5
 #define TYPE_COLOR		6
+#define TYPE_BOOL_OR_STR	7
 
 #define OPT_CALLBACK_VALUE(s, l, v, h, i) \
 	{ OPTION_CALLBACK, (s), (l), (v), NULL, (h), PARSE_OPT_NOARG | \
@@ -93,6 +97,8 @@ static int option_parse_type(const struct option *opt, const char *arg,
 			new_type = TYPE_INT;
 		else if (!strcmp(arg, "bool-or-int"))
 			new_type = TYPE_BOOL_OR_INT;
+		else if (!strcmp(arg, "bool-or-str"))
+			new_type = TYPE_BOOL_OR_STR;
 		else if (!strcmp(arg, "path"))
 			new_type = TYPE_PATH;
 		else if (!strcmp(arg, "expiry-date"))
@@ -129,17 +135,18 @@ static struct option builtin_config_options[] = {
 	OPT_STRING('f', "file", &given_config_source.file, N_("file"), N_("use given config file")),
 	OPT_STRING(0, "blob", &given_config_source.blob, N_("blob-id"), N_("read config from given blob object")),
 	OPT_GROUP(N_("Action")),
-	OPT_BIT(0, "get", &actions, N_("get value: name [value-regex]"), ACTION_GET),
-	OPT_BIT(0, "get-all", &actions, N_("get all values: key [value-regex]"), ACTION_GET_ALL),
-	OPT_BIT(0, "get-regexp", &actions, N_("get values for regexp: name-regex [value-regex]"), ACTION_GET_REGEXP),
+	OPT_BIT(0, "get", &actions, N_("get value: name [value-pattern]"), ACTION_GET),
+	OPT_BIT(0, "get-all", &actions, N_("get all values: key [value-pattern]"), ACTION_GET_ALL),
+	OPT_BIT(0, "get-regexp", &actions, N_("get values for regexp: name-regex [value-pattern]"), ACTION_GET_REGEXP),
 	OPT_BIT(0, "get-urlmatch", &actions, N_("get value specific for the URL: section[.var] URL"), ACTION_GET_URLMATCH),
-	OPT_BIT(0, "replace-all", &actions, N_("replace all matching variables: name value [value_regex]"), ACTION_REPLACE_ALL),
+	OPT_BIT(0, "replace-all", &actions, N_("replace all matching variables: name value [value-pattern]"), ACTION_REPLACE_ALL),
 	OPT_BIT(0, "add", &actions, N_("add a new variable: name value"), ACTION_ADD),
-	OPT_BIT(0, "unset", &actions, N_("remove a variable: name [value-regex]"), ACTION_UNSET),
-	OPT_BIT(0, "unset-all", &actions, N_("remove all matches: name [value-regex]"), ACTION_UNSET_ALL),
+	OPT_BIT(0, "unset", &actions, N_("remove a variable: name [value-pattern]"), ACTION_UNSET),
+	OPT_BIT(0, "unset-all", &actions, N_("remove all matches: name [value-pattern]"), ACTION_UNSET_ALL),
 	OPT_BIT(0, "rename-section", &actions, N_("rename section: old-name new-name"), ACTION_RENAME_SECTION),
 	OPT_BIT(0, "remove-section", &actions, N_("remove a section: name"), ACTION_REMOVE_SECTION),
 	OPT_BIT('l', "list", &actions, N_("list all"), ACTION_LIST),
+	OPT_BOOL(0, "fixed-value", &fixed_value, N_("use string equality when comparing values to 'value-pattern'")),
 	OPT_BIT('e', "edit", &actions, N_("open an editor"), ACTION_EDIT),
 	OPT_BIT(0, "get-color", &actions, N_("find the color configured: slot [default]"), ACTION_GET_COLOR),
 	OPT_BIT(0, "get-colorbool", &actions, N_("find the color setting: slot [stdout-is-tty]"), ACTION_GET_COLORBOOL),
@@ -148,13 +155,15 @@ static struct option builtin_config_options[] = {
 	OPT_CALLBACK_VALUE(0, "bool", &type, N_("value is \"true\" or \"false\""), TYPE_BOOL),
 	OPT_CALLBACK_VALUE(0, "int", &type, N_("value is decimal number"), TYPE_INT),
 	OPT_CALLBACK_VALUE(0, "bool-or-int", &type, N_("value is --bool or --int"), TYPE_BOOL_OR_INT),
+	OPT_CALLBACK_VALUE(0, "bool-or-str", &type, N_("value is --bool or string"), TYPE_BOOL_OR_STR),
 	OPT_CALLBACK_VALUE(0, "path", &type, N_("value is a path (file or directory name)"), TYPE_PATH),
 	OPT_CALLBACK_VALUE(0, "expiry-date", &type, N_("value is an expiry date"), TYPE_EXPIRY_DATE),
 	OPT_GROUP(N_("Other")),
-	OPT_BOOL('z', "null", &end_null, N_("terminate values with NUL byte")),
+	OPT_BOOL('z', "null", &end_nul, N_("terminate values with NUL byte")),
 	OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")),
 	OPT_BOOL(0, "includes", &respect_includes_opt, N_("respect include directives on lookup")),
 	OPT_BOOL(0, "show-origin", &show_origin, N_("show origin of config (file, standard input, blob, command line)")),
+	OPT_BOOL(0, "show-scope", &show_scope, N_("show scope of config (worktree, local, global, system, command)")),
 	OPT_STRING(0, "default", &default_value, N_("value"), N_("with --get, use default value when missing entry")),
 	OPT_END(),
 };
@@ -178,22 +187,34 @@ static void check_argc(int argc, int min, int max)
 
 static void show_config_origin(struct strbuf *buf)
 {
-	const char term = end_null ? '\0' : '\t';
+	const char term = end_nul ? '\0' : '\t';
 
 	strbuf_addstr(buf, current_config_origin_type());
 	strbuf_addch(buf, ':');
-	if (end_null)
+	if (end_nul)
 		strbuf_addstr(buf, current_config_name());
 	else
 		quote_c_style(current_config_name(), buf, NULL, 0);
 	strbuf_addch(buf, term);
 }
 
+static void show_config_scope(struct strbuf *buf)
+{
+	const char term = end_nul ? '\0' : '\t';
+	const char *scope = config_scope_name(current_config_scope());
+
+	strbuf_addstr(buf, N_(scope));
+	strbuf_addch(buf, term);
+}
+
 static int show_all_config(const char *key_, const char *value_, void *cb)
 {
-	if (show_origin) {
+	if (show_origin || show_scope) {
 		struct strbuf buf = STRBUF_INIT;
-		show_config_origin(&buf);
+		if (show_scope)
+			show_config_scope(&buf);
+		if (show_origin)
+			show_config_origin(&buf);
 		/* Use fwrite as "buf" can contain \0's if "end_null" is set. */
 		fwrite(buf.buf, 1, buf.len, stdout);
 		strbuf_release(&buf);
@@ -213,6 +234,8 @@ struct strbuf_list {
 
 static int format_config(struct strbuf *buf, const char *key_, const char *value_)
 {
+	if (show_scope)
+		show_config_scope(buf);
 	if (show_origin)
 		show_config_origin(buf);
 	if (show_keys)
@@ -234,6 +257,12 @@ static int format_config(struct strbuf *buf, const char *key_, const char *value
 				strbuf_addstr(buf, v ? "true" : "false");
 			else
 				strbuf_addf(buf, "%d", v);
+		} else if (type == TYPE_BOOL_OR_STR) {
+			int v = git_parse_maybe_bool(value_);
+			if (v < 0)
+				strbuf_addstr(buf, value_);
+			else
+				strbuf_addstr(buf, v ? "true" : "false");
 		} else if (type == TYPE_PATH) {
 			const char *v;
 			if (git_config_pathname(&v, key_, value_) < 0)
@@ -270,6 +299,8 @@ static int collect_config(const char *key_, const char *value_, void *cb)
 		return 0;
 	if (use_key_regexp && regexec(key_regexp, key_, 0, NULL, 0))
 		return 0;
+	if (fixed_value && strcmp(value_pattern, (value_?value_:"")))
+		return 0;
 	if (regexp != NULL &&
 	    (do_not_match ^ !!regexec(regexp, (value_?value_:""), 0, NULL, 0)))
 		return 0;
@@ -280,7 +311,7 @@ static int collect_config(const char *key_, const char *value_, void *cb)
 	return format_config(&values->items[values->nr++], key_, value_);
 }
 
-static int get_value(const char *key_, const char *regex_)
+static int get_value(const char *key_, const char *regex_, unsigned flags)
 {
 	int ret = CONFIG_GENERIC_ERROR;
 	struct strbuf_list values = {NULL};
@@ -317,7 +348,9 @@ static int get_value(const char *key_, const char *regex_)
 		}
 	}
 
-	if (regex_) {
+	if (regex_ && (flags & CONFIG_FLAGS_FIXED_VALUE))
+		value_pattern = regex_;
+	else if (regex_) {
 		if (regex_[0] == '!') {
 			do_not_match = 1;
 			regex_++;
@@ -395,6 +428,13 @@ static char *normalize_value(const char *key, const char *value)
 		else
 			return xstrdup(v ? "true" : "false");
 	}
+	if (type == TYPE_BOOL_OR_STR) {
+		int v = git_parse_maybe_bool(value);
+		if (v < 0)
+			return xstrdup(value);
+		else
+			return xstrdup(v ? "true" : "false");
+	}
 	if (type == TYPE_COLOR) {
 		char v[COLOR_MAXLEN];
 		if (git_config_color(v, key, value))
@@ -598,6 +638,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 {
 	int nongit = !startup_info->have_repository;
 	char *value;
+	int flags = 0;
 
 	given_config_source.file = xstrdup_or_null(getenv(CONFIG_ENVIRONMENT));
 
@@ -612,22 +653,27 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		usage_builtin_config();
 	}
 
-	if (use_local_config && nongit)
-		die(_("--local can only be used inside a git repository"));
+	if (nongit) {
+		if (use_local_config)
+			die(_("--local can only be used inside a git repository"));
+		if (given_config_source.blob)
+			die(_("--blob can only be used inside a git repository"));
+		if (use_worktree_config)
+			die(_("--worktree can only be used inside a git repository"));
 
-	if (given_config_source.blob && nongit)
-		die(_("--blob can only be used inside a git repository"));
+	}
 
 	if (given_config_source.file &&
 			!strcmp(given_config_source.file, "-")) {
 		given_config_source.file = NULL;
 		given_config_source.use_stdin = 1;
+		given_config_source.scope = CONFIG_SCOPE_COMMAND;
 	}
 
 	if (use_global_config) {
-		char *user_config = expand_user_path("~/.gitconfig", 0);
-		char *xdg_config = xdg_config_home("config");
+		char *user_config, *xdg_config;
 
+		git_global_config(&user_config, &xdg_config);
 		if (!user_config)
 			/*
 			 * It is unknown if HOME/.gitconfig exists, so
@@ -637,6 +683,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 			 */
 			die(_("$HOME not set"));
 
+		given_config_source.scope = CONFIG_SCOPE_GLOBAL;
+
 		if (access_or_warn(user_config, R_OK, 0) &&
 		    xdg_config && !access_or_warn(xdg_config, R_OK, 0)) {
 			given_config_source.file = xdg_config;
@@ -646,12 +694,14 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 			free(xdg_config);
 		}
 	}
-	else if (use_system_config)
-		given_config_source.file = git_etc_gitconfig();
-	else if (use_local_config)
+	else if (use_system_config) {
+		given_config_source.file = git_system_config();
+		given_config_source.scope = CONFIG_SCOPE_SYSTEM;
+	} else if (use_local_config) {
 		given_config_source.file = git_pathdup("config");
-	else if (use_worktree_config) {
-		struct worktree **worktrees = get_worktrees(0);
+		given_config_source.scope = CONFIG_SCOPE_LOCAL;
+	} else if (use_worktree_config) {
+		struct worktree **worktrees = get_worktrees();
 		if (repository_format_worktree_config)
 			given_config_source.file = git_pathdup("config.worktree");
 		else if (worktrees[0] && worktrees[1])
@@ -662,13 +712,18 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 			      "section in \"git help worktree\" for details"));
 		else
 			given_config_source.file = git_pathdup("config");
+		given_config_source.scope = CONFIG_SCOPE_LOCAL;
 		free_worktrees(worktrees);
 	} else if (given_config_source.file) {
 		if (!is_absolute_path(given_config_source.file) && prefix)
 			given_config_source.file =
 				prefix_filename(prefix, given_config_source.file);
+		given_config_source.scope = CONFIG_SCOPE_COMMAND;
+	} else if (given_config_source.blob) {
+		given_config_source.scope = CONFIG_SCOPE_COMMAND;
 	}
 
+
 	if (respect_includes_opt == -1)
 		config_options.respect_includes = !given_config_source.file;
 	else
@@ -678,7 +733,7 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		config_options.git_dir = get_git_dir();
 	}
 
-	if (end_null) {
+	if (end_nul) {
 		term = '\0';
 		delim = '\n';
 		key_delim = '\n';
@@ -719,6 +774,42 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		usage_builtin_config();
 	}
 
+	/* check usage of --fixed-value */
+	if (fixed_value) {
+		int allowed_usage = 0;
+
+		switch (actions) {
+		/* git config --get <name> <value-pattern> */
+		case ACTION_GET:
+		/* git config --get-all <name> <value-pattern> */
+		case ACTION_GET_ALL:
+		/* git config --get-regexp <name-pattern> <value-pattern> */
+		case ACTION_GET_REGEXP:
+		/* git config --unset <name> <value-pattern> */
+		case ACTION_UNSET:
+		/* git config --unset-all <name> <value-pattern> */
+		case ACTION_UNSET_ALL:
+			allowed_usage = argc > 1 && !!argv[1];
+			break;
+
+		/* git config <name> <value> <value-pattern> */
+		case ACTION_SET_ALL:
+		/* git config --replace-all <name> <value> <value-pattern> */
+		case ACTION_REPLACE_ALL:
+			allowed_usage = argc > 2 && !!argv[2];
+			break;
+
+		/* other options don't allow --fixed-value */
+		}
+
+		if (!allowed_usage) {
+			error(_("--fixed-value only applies with 'value-pattern'"));
+			usage_builtin_config();
+		}
+
+		flags |= CONFIG_FLAGS_FIXED_VALUE;
+	}
+
 	if (actions & PAGING_ACTIONS)
 		setup_auto_pager("config", 1);
 
@@ -780,7 +871,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		value = normalize_value(argv[0], argv[1]);
 		UNLEAK(value);
 		return git_config_set_multivar_in_file_gently(given_config_source.file,
-							      argv[0], value, argv[2], 0);
+							      argv[0], value, argv[2],
+							      flags);
 	}
 	else if (actions == ACTION_ADD) {
 		check_write();
@@ -789,7 +881,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		UNLEAK(value);
 		return git_config_set_multivar_in_file_gently(given_config_source.file,
 							      argv[0], value,
-							      CONFIG_REGEX_NONE, 0);
+							      CONFIG_REGEX_NONE,
+							      flags);
 	}
 	else if (actions == ACTION_REPLACE_ALL) {
 		check_write();
@@ -797,23 +890,24 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		value = normalize_value(argv[0], argv[1]);
 		UNLEAK(value);
 		return git_config_set_multivar_in_file_gently(given_config_source.file,
-							      argv[0], value, argv[2], 1);
+							      argv[0], value, argv[2],
+							      flags | CONFIG_FLAGS_MULTI_REPLACE);
 	}
 	else if (actions == ACTION_GET) {
 		check_argc(argc, 1, 2);
-		return get_value(argv[0], argv[1]);
+		return get_value(argv[0], argv[1], flags);
 	}
 	else if (actions == ACTION_GET_ALL) {
 		do_all = 1;
 		check_argc(argc, 1, 2);
-		return get_value(argv[0], argv[1]);
+		return get_value(argv[0], argv[1], flags);
 	}
 	else if (actions == ACTION_GET_REGEXP) {
 		show_keys = 1;
 		use_key_regexp = 1;
 		do_all = 1;
 		check_argc(argc, 1, 2);
-		return get_value(argv[0], argv[1]);
+		return get_value(argv[0], argv[1], flags);
 	}
 	else if (actions == ACTION_GET_URLMATCH) {
 		check_argc(argc, 2, 2);
@@ -824,7 +918,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		check_argc(argc, 1, 2);
 		if (argc == 2)
 			return git_config_set_multivar_in_file_gently(given_config_source.file,
-								      argv[0], NULL, argv[1], 0);
+								      argv[0], NULL, argv[1],
+								      flags);
 		else
 			return git_config_set_in_file_gently(given_config_source.file,
 							     argv[0], NULL);
@@ -833,7 +928,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 		check_write();
 		check_argc(argc, 1, 2);
 		return git_config_set_multivar_in_file_gently(given_config_source.file,
-							      argv[0], NULL, argv[1], 1);
+							      argv[0], NULL, argv[1],
+							      flags | CONFIG_FLAGS_MULTI_REPLACE);
 	}
 	else if (actions == ACTION_RENAME_SECTION) {
 		int ret;
diff --git a/credential-cache--daemon.c b/builtin/credential-cache--daemon.c
index ec1271f89c..4c6c89ab0d 100644
--- a/credential-cache--daemon.c
+++ b/builtin/credential-cache--daemon.c
@@ -1,9 +1,12 @@
-#include "cache.h"
+#include "builtin.h"
+#include "parse-options.h"
+
+#ifndef NO_UNIX_SOCKETS
+
 #include "config.h"
 #include "tempfile.h"
 #include "credential.h"
 #include "unix-socket.h"
-#include "parse-options.h"
 
 struct credential_cache_entry {
 	struct credential item;
@@ -200,9 +203,10 @@ static int serve_cache_loop(int fd)
 
 static void serve_cache(const char *socket_path, int debug)
 {
+	struct unix_stream_listen_opts opts = UNIX_STREAM_LISTEN_OPTS_INIT;
 	int fd;
 
-	fd = unix_stream_listen(socket_path);
+	fd = unix_stream_listen(socket_path, &opts);
 	if (fd < 0)
 		die_errno("unable to bind to '%s'", socket_path);
 
@@ -257,7 +261,7 @@ static void init_socket_directory(const char *path)
 	free(path_copy);
 }
 
-int cmd_main(int argc, const char **argv)
+int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix)
 {
 	struct tempfile *socket_file;
 	const char *socket_path;
@@ -275,7 +279,7 @@ int cmd_main(int argc, const char **argv)
 
 	git_config_get_bool("credentialcache.ignoresighup", &ignore_sighup);
 
-	argc = parse_options(argc, argv, NULL, options, usage, 0);
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
 	socket_path = argv[0];
 
 	if (!socket_path)
@@ -295,3 +299,21 @@ int cmd_main(int argc, const char **argv)
 
 	return 0;
 }
+
+#else
+
+int cmd_credential_cache_daemon(int argc, const char **argv, const char *prefix)
+{
+	const char * const usage[] = {
+		"git credential-cache--daemon [options] <action>",
+		"",
+		"credential-cache--daemon is disabled in this build of Git",
+		NULL
+	};
+	struct option options[] = { OPT_END() };
+
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
+	die(_("credential-cache--daemon unavailable; no unix socket support"));
+}
+
+#endif /* NO_UNIX_SOCKET */
diff --git a/credential-cache.c b/builtin/credential-cache.c
index 1cccc3a0b9..e8a7415747 100644
--- a/credential-cache.c
+++ b/builtin/credential-cache.c
@@ -1,7 +1,10 @@
-#include "cache.h"
+#include "builtin.h"
+#include "parse-options.h"
+
+#ifndef NO_UNIX_SOCKETS
+
 #include "credential.h"
 #include "string-list.h"
-#include "parse-options.h"
 #include "unix-socket.h"
 #include "run-command.h"
 
@@ -11,7 +14,7 @@
 static int send_request(const char *socket, const struct strbuf *out)
 {
 	int got_data = 0;
-	int fd = unix_stream_connect(socket);
+	int fd = unix_stream_connect(socket, 0);
 
 	if (fd < 0)
 		return -1;
@@ -39,13 +42,13 @@ static int send_request(const char *socket, const struct strbuf *out)
 static void spawn_daemon(const char *socket)
 {
 	struct child_process daemon = CHILD_PROCESS_INIT;
-	const char *argv[] = { NULL, NULL, NULL };
 	char buf[128];
 	int r;
 
-	argv[0] = "git-credential-cache--daemon";
-	argv[1] = socket;
-	daemon.argv = argv;
+	strvec_pushl(&daemon.args,
+		     "credential-cache--daemon", socket,
+		     NULL);
+	daemon.git_cmd = 1;
 	daemon.no_stdin = 1;
 	daemon.out = -1;
 
@@ -87,7 +90,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
@@ -96,7 +99,7 @@ static char *get_socket_path(void)
 	return socket;
 }
 
-int cmd_main(int argc, const char **argv)
+int cmd_credential_cache(int argc, const char **argv, const char *prefix)
 {
 	char *socket_path = NULL;
 	int timeout = 900;
@@ -113,7 +116,7 @@ int cmd_main(int argc, const char **argv)
 		OPT_END()
 	};
 
-	argc = parse_options(argc, argv, NULL, options, usage, 0);
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
 	if (!argc)
 		usage_with_options(usage, options);
 	op = argv[0];
@@ -134,3 +137,21 @@ int cmd_main(int argc, const char **argv)
 
 	return 0;
 }
+
+#else
+
+int cmd_credential_cache(int argc, const char **argv, const char *prefix)
+{
+	const char * const usage[] = {
+		"git credential-cache [options] <action>",
+		"",
+		"credential-cache is disabled in this build of Git",
+		NULL
+	};
+	struct option options[] = { OPT_END() };
+
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
+	die(_("credential-cache unavailable; no unix socket support"));
+}
+
+#endif /* NO_UNIX_SOCKETS */
diff --git a/credential-store.c b/builtin/credential-store.c
index c010497cb2..62a4f3c265 100644
--- a/credential-store.c
+++ b/builtin/credential-store.c
@@ -1,4 +1,5 @@
-#include "cache.h"
+#include "builtin.h"
+#include "config.h"
 #include "lockfile.h"
 #include "credential.h"
 #include "string-list.h"
@@ -24,8 +25,8 @@ static int parse_credential_file(const char *fn,
 	}
 
 	while (strbuf_getline_lf(&line, fh) != EOF) {
-		credential_from_url(&entry, line.buf);
-		if (entry.username && entry.password &&
+		if (!credential_from_url_gently(&entry, line.buf, 1) &&
+		    entry.username && entry.password &&
 		    credential_match(c, &entry)) {
 			found_credential = 1;
 			if (match_cb) {
@@ -58,8 +59,11 @@ static void print_line(struct strbuf *buf)
 static void rewrite_credential_file(const char *fn, struct credential *c,
 				    struct strbuf *extra)
 {
-	if (hold_lock_file_for_update(&credential_lock, fn, 0) < 0)
-		die_errno("unable to get credential storage lock");
+	int timeout_ms = 1000;
+
+	git_config_get_int("credentialstore.locktimeoutms", &timeout_ms);
+	if (hold_lock_file_for_update_timeout(&credential_lock, fn, 0, timeout_ms) < 0)
+		die_errno(_("unable to get credential storage lock in %d ms"), timeout_ms);
 	if (extra)
 		print_line(extra);
 	parse_credential_file(fn, c, NULL, print_line);
@@ -143,7 +147,7 @@ static void lookup_credential(const struct string_list *fns, struct credential *
 			return; /* Found credential */
 }
 
-int cmd_main(int argc, const char **argv)
+int cmd_credential_store(int argc, const char **argv, const char *prefix)
 {
 	const char * const usage[] = {
 		"git credential-store [<options>] <action>",
@@ -161,7 +165,7 @@ int cmd_main(int argc, const char **argv)
 
 	umask(077);
 
-	argc = parse_options(argc, (const char **)argv, NULL, options, usage, 0);
+	argc = parse_options(argc, (const char **)argv, prefix, options, usage, 0);
 	if (argc != 1)
 		usage_with_options(usage, options);
 	op = argv[0];
@@ -169,7 +173,7 @@ int cmd_main(int argc, const char **argv)
 	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 879acfbcda..d75dcdc64a 100644
--- a/builtin/credential.c
+++ b/builtin/credential.c
@@ -1,6 +1,7 @@
 #include "git-compat-util.h"
 #include "credential.h"
 #include "builtin.h"
+#include "config.h"
 
 static const char usage_msg[] =
 	"git credential [fill|approve|reject]";
@@ -10,6 +11,8 @@ int cmd_credential(int argc, const char **argv, const char *prefix)
 	const char *op;
 	struct credential c = CREDENTIAL_INIT;
 
+	git_config(git_default_config, NULL);
+
 	if (argc != 2 || !strcmp(argv[1], "-h"))
 		usage(usage_msg);
 	op = argv[1];
diff --git a/builtin/describe.c b/builtin/describe.c
index b6df81d8d0..e912ba50d7 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -12,7 +12,7 @@
 #include "revision.h"
 #include "diff.h"
 #include "hashmap.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "run-command.h"
 #include "object-store.h"
 #include "list-objects.h"
@@ -54,6 +54,7 @@ struct commit_name {
 	struct tag *tag;
 	unsigned prio:2; /* annotated tag = 2, tag = 1, head = 0 */
 	unsigned name_checked:1;
+	unsigned misnamed:1;
 	struct object_id oid;
 	char *path;
 };
@@ -132,6 +133,7 @@ static void add_to_known_names(const char *path,
 		e->tag = tag;
 		e->prio = prio;
 		e->name_checked = 0;
+		e->misnamed = 0;
 		oidcpy(&e->oid, oid);
 		free(e->path);
 		e->path = xstrdup(path);
@@ -192,7 +194,7 @@ static int get_name(const char *path, const struct object_id *oid, int flag, voi
 	}
 
 	/* Is it annotated? */
-	if (!peel_ref(path, &peeled)) {
+	if (!peel_iterated_oid(oid, &peeled)) {
 		is_annotated = !oideq(oid, &peeled);
 	} else {
 		oidcpy(&peeled, oid);
@@ -275,10 +277,11 @@ static void append_name(struct commit_name *n, struct strbuf *dst)
 			die(_("annotated tag %s not available"), n->path);
 	}
 	if (n->tag && !n->name_checked) {
-		if (!n->tag->tag)
-			die(_("annotated tag %s has no embedded name"), n->path);
-		if (strcmp(n->tag->tag, all ? n->path + 5 : n->path))
-			warning(_("tag '%s' is really '%s' here"), n->tag->tag, n->path);
+		if (strcmp(n->tag->tag, all ? n->path + 5 : n->path)) {
+			warning(_("tag '%s' is externally known as '%s'"),
+				n->path, n->tag->tag);
+			n->misnamed = 1;
+		}
 		n->name_checked = 1;
 	}
 
@@ -314,7 +317,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
 		 * Exact match to an existing ref.
 		 */
 		append_name(n, dst);
-		if (longformat)
+		if (n->misnamed || longformat)
 			append_suffix(0, n->tag ? get_tagged_oid(n->tag) : oid, dst);
 		if (suffix)
 			strbuf_addstr(dst, suffix);
@@ -376,11 +379,25 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
 			if (!(c->object.flags & t->flag_within))
 				t->depth++;
 		}
+		/* Stop if last remaining path already covered by best candidate(s) */
 		if (annotated_cnt && !list) {
-			if (debug)
-				fprintf(stderr, _("finished search at %s\n"),
-					oid_to_hex(&c->object.oid));
-			break;
+			int best_depth = INT_MAX;
+			unsigned best_within = 0;
+			for (cur_match = 0; cur_match < match_cnt; cur_match++) {
+				struct possible_tag *t = &all_matches[cur_match];
+				if (t->depth < best_depth) {
+					best_depth = t->depth;
+					best_within = t->flag_within;
+				} else if (t->depth == best_depth) {
+					best_within |= t->flag_within;
+				}
+			}
+			if ((c->object.flags & best_within) == best_within) {
+				if (debug)
+					fprintf(stderr, _("finished search at %s\n"),
+						oid_to_hex(&c->object.oid));
+				break;
+			}
 		}
 		while (parents) {
 			struct commit *p = parents->item;
@@ -449,7 +466,7 @@ static void describe_commit(struct object_id *oid, struct strbuf *dst)
 	}
 
 	append_name(all_matches[0].name, dst);
-	if (abbrev)
+	if (all_matches[0].name->misnamed || abbrev)
 		append_suffix(all_matches[0].depth, &cmit->object.oid, dst);
 	if (suffix)
 		strbuf_addstr(dst, suffix);
@@ -484,15 +501,15 @@ static void process_object(struct object *obj, const char *path, void *data)
 static void describe_blob(struct object_id oid, struct strbuf *dst)
 {
 	struct rev_info revs;
-	struct argv_array args = ARGV_ARRAY_INIT;
-	struct process_commit_data pcd = { null_oid, oid, dst, &revs};
+	struct strvec args = STRVEC_INIT;
+	struct process_commit_data pcd = { *null_oid(), oid, dst, &revs};
 
-	argv_array_pushl(&args, "internal: The first arg is not parsed",
-		"--objects", "--in-commit-order", "--reverse", "HEAD",
-		NULL);
+	strvec_pushl(&args, "internal: The first arg is not parsed",
+		     "--objects", "--in-commit-order", "--reverse", "HEAD",
+		     NULL);
 
 	repo_init_revisions(the_repository, &revs, NULL);
-	if (setup_revisions(args.argc, args.argv, &revs, NULL) > 1)
+	if (setup_revisions(args.nr, args.v, &revs, NULL) > 1)
 		BUG("setup_revisions could not handle all args?");
 
 	if (prepare_revision_walk(&revs))
@@ -577,26 +594,26 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 
 	if (contains) {
 		struct string_list_item *item;
-		struct argv_array args;
+		struct strvec args;
 
-		argv_array_init(&args);
-		argv_array_pushl(&args, "name-rev",
-				 "--peel-tag", "--name-only", "--no-undefined",
-				 NULL);
+		strvec_init(&args);
+		strvec_pushl(&args, "name-rev",
+			     "--peel-tag", "--name-only", "--no-undefined",
+			     NULL);
 		if (always)
-			argv_array_push(&args, "--always");
+			strvec_push(&args, "--always");
 		if (!all) {
-			argv_array_push(&args, "--tags");
+			strvec_push(&args, "--tags");
 			for_each_string_list_item(item, &patterns)
-				argv_array_pushf(&args, "--refs=refs/tags/%s", item->string);
+				strvec_pushf(&args, "--refs=refs/tags/%s", item->string);
 			for_each_string_list_item(item, &exclude_patterns)
-				argv_array_pushf(&args, "--exclude=refs/tags/%s", item->string);
+				strvec_pushf(&args, "--exclude=refs/tags/%s", item->string);
 		}
 		if (argc)
-			argv_array_pushv(&args, argv);
+			strvec_pushv(&args, argv);
 		else
-			argv_array_push(&args, "HEAD");
-		return cmd_name_rev(args.argc, args.argv, prefix);
+			strvec_push(&args, "HEAD");
+		return cmd_name_rev(args.nr, args.v, prefix);
 	}
 
 	hashmap_init(&names, commit_name_neq, NULL, 0);
@@ -607,7 +624,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 	if (argc == 0) {
 		if (broken) {
 			struct child_process cp = CHILD_PROCESS_INIT;
-			argv_array_pushv(&cp.args, diff_index_args);
+			strvec_pushv(&cp.args, diff_index_args);
 			cp.git_cmd = 1;
 			cp.no_stdin = 1;
 			cp.no_stdout = 1;
@@ -629,7 +646,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 		} else if (dirty) {
 			struct lock_file index_lock = LOCK_INIT;
 			struct rev_info revs;
-			struct argv_array args = ARGV_ARRAY_INIT;
+			struct strvec args = STRVEC_INIT;
 			int fd, result;
 
 			setup_work_tree();
@@ -641,8 +658,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
 				repo_update_index_if_able(the_repository, &index_lock);
 
 			repo_init_revisions(the_repository, &revs, prefix);
-			argv_array_pushv(&args, diff_index_args);
-			if (setup_revisions(args.argc, args.argv, &revs, NULL) != 1)
+			strvec_pushv(&args, diff_index_args);
+			if (setup_revisions(args.nr, args.v, &revs, NULL) != 1)
 				BUG("malformed internal diff-index command line");
 			result = run_diff_index(&revs, 0);
 
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 86ae474fbf..70103c4095 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -7,6 +7,7 @@
 #include "cache.h"
 #include "config.h"
 #include "diff.h"
+#include "diff-merges.h"
 #include "commit.h"
 #include "revision.h"
 #include "builtin.h"
@@ -28,7 +29,14 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
 	git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 	repo_init_revisions(the_repository, &rev, prefix);
 	rev.abbrev = 0;
-	precompose_argv(argc, argv);
+
+	/*
+	 * Consider "intent-to-add" files as new by default, unless
+	 * explicitly specified in the command line or anywhere else.
+	 */
+	rev.diffopt.ita_invisible_in_index = 1;
+
+	prefix = precompose_argv_prefix(argc, argv, prefix);
 
 	argc = setup_revisions(argc, argv, &rev, NULL);
 	while (1 < argc && argv[1][0] == '-') {
@@ -46,6 +54,7 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
 	}
 	if (!rev.diffopt.output_format)
 		rev.diffopt.output_format = DIFF_FORMAT_RAW;
+	rev.diffopt.rotate_to_strict = 1;
 
 	/*
 	 * Make sure there are NO revision (i.e. pending object) parameter,
@@ -62,9 +71,9 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix)
 	 * was not asked to.  "diff-files -c -p" should not densify
 	 * (the user should ask with "diff-files --cc" explicitly).
 	 */
-	if (rev.max_count == -1 && !rev.combine_merges &&
+	if (rev.max_count == -1 &&
 	    (rev.diffopt.output_format & DIFF_FORMAT_PATCH))
-		rev.combine_merges = rev.dense_combined_merges = 1;
+		diff_merges_set_dense_combined_if_unset(&rev);
 
 	if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
 		perror("read_cache_preload");
diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 93ec642423..cf09559e42 100644
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -2,6 +2,7 @@
 #include "cache.h"
 #include "config.h"
 #include "diff.h"
+#include "diff-merges.h"
 #include "commit.h"
 #include "revision.h"
 #include "builtin.h"
@@ -15,7 +16,7 @@ COMMON_DIFF_OPTIONS_HELP;
 int cmd_diff_index(int argc, const char **argv, const char *prefix)
 {
 	struct rev_info rev;
-	int cached = 0;
+	unsigned int option = 0;
 	int i;
 	int result;
 
@@ -25,20 +26,32 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
 	git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
 	repo_init_revisions(the_repository, &rev, prefix);
 	rev.abbrev = 0;
-	precompose_argv(argc, argv);
+	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".
+	 */
+	diff_merges_suppress_options_parsing();
 
 	argc = setup_revisions(argc, argv, &rev, NULL);
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
 
 		if (!strcmp(arg, "--cached"))
-			cached = 1;
+			option |= DIFF_INDEX_CACHED;
+		else if (!strcmp(arg, "--merge-base"))
+			option |= DIFF_INDEX_MERGE_BASE;
+		else if (!strcmp(arg, "-m"))
+			rev.match_missing = 1;
 		else
 			usage(diff_cache_usage);
 	}
 	if (!rev.diffopt.output_format)
 		rev.diffopt.output_format = DIFF_FORMAT_RAW;
 
+	rev.diffopt.rotate_to_strict = 1;
+
 	/*
 	 * Make sure there is one revision (i.e. pending object),
 	 * and there is no revision filtering parameters.
@@ -46,7 +59,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
 	if (rev.pending.nr != 1 ||
 	    rev.max_count != -1 || rev.min_age != -1 || rev.max_age != -1)
 		usage(diff_cache_usage);
-	if (!cached) {
+	if (!(option & DIFF_INDEX_CACHED)) {
 		setup_work_tree();
 		if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
 			perror("read_cache_preload");
@@ -56,7 +69,7 @@ int cmd_diff_index(int argc, const char **argv, const char *prefix)
 		perror("read_cache");
 		return -1;
 	}
-	result = run_diff_index(&rev, cached);
+	result = run_diff_index(&rev, option);
 	UNLEAK(rev);
 	return diff_result_code(&rev.diffopt, result);
 }
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index cb9ea79367..f33d30d57b 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -109,7 +109,9 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 	struct object *tree1, *tree2;
 	static struct rev_info *opt = &log_tree_opt;
 	struct setup_revision_opt s_r_opt;
+	struct userformat_want w;
 	int read_stdin = 0;
+	int merge_base = 0;
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage(diff_tree_usage);
@@ -124,9 +126,17 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 	memset(&s_r_opt, 0, sizeof(s_r_opt));
 	s_r_opt.tweak = diff_tree_tweak_rev;
 
-	precompose_argv(argc, argv);
+	prefix = precompose_argv_prefix(argc, argv, prefix);
 	argc = setup_revisions(argc, argv, opt, &s_r_opt);
 
+	memset(&w, 0, sizeof(w));
+	userformat_find_requirements(NULL, &w);
+
+	if (!opt->show_notes_given && w.notes)
+		opt->show_notes = 1;
+	if (opt->show_notes)
+		load_display_notes(&opt->notes_opt);
+
 	while (--argc > 0) {
 		const char *arg = *++argv;
 
@@ -134,9 +144,20 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 			read_stdin = 1;
 			continue;
 		}
+		if (!strcmp(arg, "--merge-base")) {
+			merge_base = 1;
+			continue;
+		}
 		usage(diff_tree_usage);
 	}
 
+	if (read_stdin && merge_base)
+		die(_("--stdin and --merge-base are mutually exclusive"));
+	if (merge_base && opt->pending.nr != 2)
+		die(_("--merge-base only works with two commits"));
+
+	opt->diffopt.rotate_to_strict = 1;
+
 	/*
 	 * NOTE!  We expect "a..b" to expand to "^a b" but it is
 	 * perfectly valid for revision range parser to yield "b ^a",
@@ -156,7 +177,12 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 	case 2:
 		tree1 = opt->pending.objects[0].item;
 		tree2 = opt->pending.objects[1].item;
-		if (tree2->flags & UNINTERESTING) {
+		if (merge_base) {
+			struct object_id oid;
+
+			diff_get_merge_base(opt, &oid);
+			tree1 = lookup_object(the_repository, &oid);
+		} else if (tree2->flags & UNINTERESTING) {
 			SWAP(tree2, tree1);
 		}
 		diff_tree_oid(&tree1->oid, &tree2->oid, "", &opt->diffopt);
@@ -168,6 +194,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
 		int saved_nrl = 0;
 		int saved_dcctc = 0;
 
+		opt->diffopt.rotate_to_strict = 0;
 		if (opt->diffopt.detect_rename) {
 			if (!the_index.cache)
 				repo_read_index(the_repository);
diff --git a/builtin/diff.c b/builtin/diff.c
index 42ac803091..dd8ce688ba 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -6,24 +6,32 @@
 #define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
 #include "config.h"
+#include "ewah/ewok.h"
 #include "lockfile.h"
 #include "color.h"
 #include "commit.h"
 #include "blob.h"
 #include "tag.h"
 #include "diff.h"
+#include "diff-merges.h"
 #include "diffcore.h"
 #include "revision.h"
 #include "log-tree.h"
 #include "builtin.h"
 #include "submodule.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 
 #define DIFF_NO_INDEX_EXPLICIT 1
 #define DIFF_NO_INDEX_IMPLICIT 2
 
 static const char builtin_diff_usage[] =
-"git diff [<options>] [<commit> [<commit>]] [--] [<path>...]";
+"git diff [<options>] [<commit>] [--] [<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)
 {
@@ -90,7 +98,7 @@ static int builtin_diff_b_f(struct rev_info *revs,
 
 	stuff_change(&revs->diffopt,
 		     blob[0]->mode, canon_mode(st.st_mode),
-		     &blob[0]->item->oid, &null_oid,
+		     &blob[0]->item->oid, null_oid(),
 		     1, 0,
 		     blob[0]->path ? blob[0]->path : path,
 		     path);
@@ -127,11 +135,13 @@ static int builtin_diff_blobs(struct rev_info *revs,
 static int builtin_diff_index(struct rev_info *revs,
 			      int argc, const char **argv)
 {
-	int cached = 0;
+	unsigned int option = 0;
 	while (1 < argc) {
 		const char *arg = argv[1];
 		if (!strcmp(arg, "--cached") || !strcmp(arg, "--staged"))
-			cached = 1;
+			option |= DIFF_INDEX_CACHED;
+		else if (!strcmp(arg, "--merge-base"))
+			option |= DIFF_INDEX_MERGE_BASE;
 		else
 			usage(builtin_diff_usage);
 		argv++; argc--;
@@ -144,7 +154,7 @@ static int builtin_diff_index(struct rev_info *revs,
 	    revs->max_count != -1 || revs->min_age != -1 ||
 	    revs->max_age != -1)
 		usage(builtin_diff_usage);
-	if (!cached) {
+	if (!(option & DIFF_INDEX_CACHED)) {
 		setup_work_tree();
 		if (read_cache_preload(&revs->diffopt.pathspec) < 0) {
 			perror("read_cache_preload");
@@ -154,7 +164,7 @@ static int builtin_diff_index(struct rev_info *revs,
 		perror("read_cache");
 		return -1;
 	}
-	return run_diff_index(revs, cached);
+	return run_diff_index(revs, option);
 }
 
 static int builtin_diff_tree(struct rev_info *revs,
@@ -163,19 +173,34 @@ static int builtin_diff_tree(struct rev_info *revs,
 			     struct object_array_entry *ent1)
 {
 	const struct object_id *(oid[2]);
-	int swap = 0;
+	struct object_id mb_oid;
+	int merge_base = 0;
 
-	if (argc > 1)
-		usage(builtin_diff_usage);
+	while (1 < argc) {
+		const char *arg = argv[1];
+		if (!strcmp(arg, "--merge-base"))
+			merge_base = 1;
+		else
+			usage(builtin_diff_usage);
+		argv++; argc--;
+	}
 
-	/*
-	 * We saw two trees, ent0 and ent1.  If ent1 is uninteresting,
-	 * swap them.
-	 */
-	if (ent1->item->flags & UNINTERESTING)
-		swap = 1;
-	oid[swap] = &ent0->item->oid;
-	oid[1 - swap] = &ent1->item->oid;
+	if (merge_base) {
+		diff_get_merge_base(revs, &mb_oid);
+		oid[0] = &mb_oid;
+		oid[1] = &revs->pending.objects[1].item->oid;
+	} else {
+		int swap = 0;
+
+		/*
+		 * We saw two trees, ent0 and ent1.  If ent1 is uninteresting,
+		 * swap them.
+		 */
+		if (ent1->item->flags & UNINTERESTING)
+			swap = 1;
+		oid[swap] = &ent0->item->oid;
+		oid[1 - swap] = &ent1->item->oid;
+	}
 	diff_tree_oid(oid[0], oid[1], "", &revs->diffopt);
 	log_tree_diff_flush(revs);
 	return 0;
@@ -192,12 +217,11 @@ static int builtin_diff_combined(struct rev_info *revs,
 	if (argc > 1)
 		usage(builtin_diff_usage);
 
-	if (!revs->dense_combined_merges && !revs->combine_merges)
-		revs->dense_combined_merges = revs->combine_merges = 1;
+	diff_merges_set_dense_combined_if_unset(revs);
+
 	for (i = 1; i < ents; i++)
 		oid_array_append(&parents, &ent[i].item->oid);
-	diff_tree_combined(&ent[0].item->oid, &parents,
-			   revs->dense_combined_merges, revs);
+	diff_tree_combined(&ent[0].item->oid, &parents, revs);
 	oid_array_clear(&parents);
 	return 0;
 }
@@ -242,9 +266,9 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv
 	 * dense one, --cc can be explicitly asked for, or just rely
 	 * on the default).
 	 */
-	if (revs->max_count == -1 && !revs->combine_merges &&
+	if (revs->max_count == -1 &&
 	    (revs->diffopt.output_format & DIFF_FORMAT_PATCH))
-		revs->combine_merges = revs->dense_combined_merges = 1;
+		diff_merges_set_dense_combined_if_unset(revs);
 
 	setup_work_tree();
 	if (read_cache_preload(&revs->diffopt.pathspec) < 0) {
@@ -254,6 +278,108 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv
 	return run_diff_files(revs, options);
 }
 
+struct symdiff {
+	struct bitmap *skip;
+	int warn;
+	const char *base, *left, *right;
+};
+
+/*
+ * Check for symmetric-difference arguments, and if present, arrange
+ * everything we need to know to handle them correctly.  As a bonus,
+ * weed out all bogus range-based revision specifications, e.g.,
+ * "git diff A..B C..D" or "git diff A..B C" get rejected.
+ *
+ * For an actual symmetric diff, *symdiff is set this way:
+ *
+ *  - its skip is non-NULL and marks *all* rev->pending.objects[i]
+ *    indices that the caller should ignore (extra merge bases, of
+ *    which there might be many, and A in A...B).  Note that the
+ *    chosen merge base and right side are NOT marked.
+ *  - warn is set if there are multiple merge bases.
+ *  - base, left, and right point to the names to use in a
+ *    warning about multiple merge bases.
+ *
+ * If there is no symmetric diff argument, sym->skip is NULL and
+ * sym->warn is cleared.  The remaining fields are not set.
+ */
+static void symdiff_prepare(struct rev_info *rev, struct symdiff *sym)
+{
+	int i, is_symdiff = 0, basecount = 0, othercount = 0;
+	int lpos = -1, rpos = -1, basepos = -1;
+	struct bitmap *map = NULL;
+
+	/*
+	 * Use the whence fields to find merge bases and left and
+	 * right parts of symmetric difference, so that we do not
+	 * depend on the order that revisions are parsed.  If there
+	 * are any revs that aren't from these sources, we have a
+	 * "git diff C A...B" or "git diff A...B C" case.  Or we
+	 * could even get "git diff A...B C...E", for instance.
+	 *
+	 * If we don't have just one merge base, we pick one
+	 * at random.
+	 *
+	 * NB: REV_CMD_LEFT, REV_CMD_RIGHT are also used for A..B,
+	 * so we must check for SYMMETRIC_LEFT too.  The two arrays
+	 * rev->pending.objects and rev->cmdline.rev are parallel.
+	 */
+	for (i = 0; i < rev->cmdline.nr; i++) {
+		struct object *obj = rev->pending.objects[i].item;
+		switch (rev->cmdline.rev[i].whence) {
+		case REV_CMD_MERGE_BASE:
+			if (basepos < 0)
+				basepos = i;
+			basecount++;
+			break;		/* do mark all bases */
+		case REV_CMD_LEFT:
+			if (lpos >= 0)
+				usage(builtin_diff_usage);
+			lpos = i;
+			if (obj->flags & SYMMETRIC_LEFT) {
+				is_symdiff = 1;
+				break;	/* do mark A */
+			}
+			continue;
+		case REV_CMD_RIGHT:
+			if (rpos >= 0)
+				usage(builtin_diff_usage);
+			rpos = i;
+			continue;	/* don't mark B */
+		case REV_CMD_PARENTS_ONLY:
+		case REV_CMD_REF:
+		case REV_CMD_REV:
+			othercount++;
+			continue;
+		}
+		if (map == NULL)
+			map = bitmap_new();
+		bitmap_set(map, i);
+	}
+
+	/*
+	 * Forbid any additional revs for both A...B and A..B.
+	 */
+	if (lpos >= 0 && othercount > 0)
+		usage(builtin_diff_usage);
+
+	if (!is_symdiff) {
+		bitmap_free(map);
+		sym->warn = 0;
+		sym->skip = NULL;
+		return;
+	}
+
+	sym->left = rev->pending.objects[lpos].name;
+	sym->right = rev->pending.objects[rpos].name;
+	if (basecount == 0)
+		die(_("%s...%s: no merge base"), sym->left, sym->right);
+	sym->base = rev->pending.objects[basepos].name;
+	bitmap_unset(map, basepos);	/* unmark the base we want */
+	sym->warn = basecount > 1;
+	sym->skip = map;
+}
+
 int cmd_diff(int argc, const char **argv, const char *prefix)
 {
 	int i;
@@ -263,19 +389,29 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 	struct object_array_entry *blob[2];
 	int nongit = 0, no_index = 0;
 	int result = 0;
+	struct symdiff sdiff;
 
 	/*
 	 * We could get N tree-ish in the rev.pending_objects list.
-	 * Also there could be M blobs there, and P pathspecs.
+	 * Also there could be M blobs there, and P pathspecs. --cached may
+	 * also be present.
 	 *
 	 * N=0, M=0:
-	 *	cache vs files (diff-files)
+	 *      cache vs files (diff-files)
+	 *
+	 * N=0, M=0, --cached:
+	 *      HEAD vs cache (diff-index --cached)
+	 *
 	 * N=0, M=2:
 	 *      compare two random blobs.  P must be zero.
+	 *
 	 * N=0, M=1, P=1:
-	 *	compare a blob with a working tree file.
+	 *      compare a blob with a working tree file.
 	 *
 	 * N=1, M=0:
+	 *      tree vs files (diff-index)
+	 *
+	 * N=1, M=0, --cached:
 	 *      tree vs cache (diff-index --cached)
 	 *
 	 * N=2, M=0:
@@ -317,7 +453,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 
 	init_diff_ui_defaults();
 	git_config(git_diff_ui_config, NULL);
-	precompose_argv(argc, argv);
+	prefix = precompose_argv_prefix(argc, argv, prefix);
 
 	repo_init_revisions(the_repository, &rev, prefix);
 
@@ -355,6 +491,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 	}
 
 	rev.diffopt.flags.recursive = 1;
+	rev.diffopt.rotate_to_strict = 1;
 
 	setup_diff_pager(&rev.diffopt);
 
@@ -382,6 +519,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 		}
 	}
 
+	symdiff_prepare(&rev, &sdiff);
 	for (i = 0; i < rev.pending.nr; i++) {
 		struct object_array_entry *entry = &rev.pending.objects[i];
 		struct object *obj = entry->item;
@@ -396,6 +534,8 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 			obj = &get_commit_tree(((struct commit *)obj))->object;
 
 		if (obj->type == OBJ_TREE) {
+			if (sdiff.skip && bitmap_get(sdiff.skip, i))
+				continue;
 			obj->flags |= flags;
 			add_object_array(obj, name, &ent);
 		} else if (obj->type == OBJ_BLOB) {
@@ -437,21 +577,12 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
 		usage(builtin_diff_usage);
 	else if (ent.nr == 1)
 		result = builtin_diff_index(&rev, argc, argv);
-	else if (ent.nr == 2)
+	else if (ent.nr == 2) {
+		if (sdiff.warn)
+			warning(_("%s...%s: multiple merge bases, using %s"),
+				sdiff.left, sdiff.right, sdiff.base);
 		result = builtin_diff_tree(&rev, argc, argv,
 					   &ent.objects[0], &ent.objects[1]);
-	else if (ent.objects[0].item->flags & UNINTERESTING) {
-		/*
-		 * diff A...B where there is at least one merge base
-		 * between A and B.  We have ent.objects[0] ==
-		 * merge-base, ent.objects[ents-2] == A, and
-		 * ent.objects[ents-1] == B.  Show diff between the
-		 * base and B.  Note that we pick one merge base at
-		 * random if there are more than one.
-		 */
-		result = builtin_diff_tree(&rev, argc, argv,
-					   &ent.objects[0],
-					   &ent.objects[ent.nr-1]);
 	} else
 		result = builtin_diff_combined(&rev, argc, argv,
 					       ent.objects, ent.nr);
diff --git a/builtin/difftool.c b/builtin/difftool.c
index c280e682b2..6a9242a803 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -18,11 +18,12 @@
 #include "run-command.h"
 #include "exec-cmd.h"
 #include "parse-options.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "strbuf.h"
 #include "lockfile.h"
 #include "object-store.h"
 #include "dir.h"
+#include "entry.h"
 
 static int trust_exit_code;
 
@@ -210,10 +211,10 @@ static void changed_files(struct hashmap *result, const char *index_path,
 	strbuf_addf(&index_env, "GIT_INDEX_FILE=%s", index_path);
 	env[0] = index_env.buf;
 
-	argv_array_pushl(&update_index.args,
-			 "--git-dir", git_dir, "--work-tree", workdir,
-			 "update-index", "--really-refresh", "-q",
-			 "--unmerged", NULL);
+	strvec_pushl(&update_index.args,
+		     "--git-dir", git_dir, "--work-tree", workdir,
+		     "update-index", "--really-refresh", "-q",
+		     "--unmerged", NULL);
 	update_index.no_stdin = 1;
 	update_index.no_stdout = 1;
 	update_index.no_stderr = 1;
@@ -225,9 +226,9 @@ static void changed_files(struct hashmap *result, const char *index_path,
 	/* Ignore any errors of update-index */
 	run_command(&update_index);
 
-	argv_array_pushl(&diff_files.args,
-			 "--git-dir", git_dir, "--work-tree", workdir,
-			 "diff-files", "--name-only", "-z", NULL);
+	strvec_pushl(&diff_files.args,
+		     "--git-dir", git_dir, "--work-tree", workdir,
+		     "diff-files", "--name-only", "-z", NULL);
 	diff_files.no_stdin = 1;
 	diff_files.git_cmd = 1;
 	diff_files.use_shell = 0;
@@ -322,7 +323,7 @@ static int checkout_path(unsigned mode, struct object_id *oid,
 	struct cache_entry *ce;
 	int ret;
 
-	ce = make_transient_cache_entry(mode, oid, path, 0);
+	ce = make_transient_cache_entry(mode, oid, path, 0, NULL);
 	ret = checkout_entry(ce, state, NULL, NULL);
 
 	discard_cache_entry(ce);
@@ -342,7 +343,10 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 	const char *workdir, *tmp;
 	int ret = 0, i;
 	FILE *fp;
-	struct hashmap working_tree_dups, submodules, symlinks2;
+	struct hashmap working_tree_dups = HASHMAP_INIT(working_tree_entry_cmp,
+							NULL);
+	struct hashmap submodules = HASHMAP_INIT(pair_cmp, NULL);
+	struct hashmap symlinks2 = HASHMAP_INIT(pair_cmp, NULL);
 	struct hashmap_iter iter;
 	struct pair_entry *entry;
 	struct index_state wtindex;
@@ -383,20 +387,16 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 	rdir_len = rdir.len;
 	wtdir_len = wtdir.len;
 
-	hashmap_init(&working_tree_dups, working_tree_entry_cmp, NULL, 0);
-	hashmap_init(&submodules, pair_cmp, NULL, 0);
-	hashmap_init(&symlinks2, pair_cmp, NULL, 0);
-
 	child.no_stdin = 1;
 	child.git_cmd = 1;
 	child.use_shell = 0;
 	child.clean_on_exit = 1;
 	child.dir = prefix;
 	child.out = -1;
-	argv_array_pushl(&child.args, "diff", "--raw", "--no-abbrev", "-z",
-			 NULL);
+	strvec_pushl(&child.args, "diff", "--raw", "--no-abbrev", "-z",
+		     NULL);
 	for (i = 0; i < argc; i++)
-		argv_array_push(&child.args, argv[i]);
+		strvec_push(&child.args, argv[i]);
 	if (start_command(&child))
 		die("could not obtain raw diff");
 	fp = xfdopen(child.out, "r");
@@ -585,6 +585,9 @@ static int run_dir_diff(const char *extcmd, int symlinks, const char *prefix,
 		setenv("GIT_DIFFTOOL_DIRDIFF", "true", 1);
 	rc = run_command_v_opt(helper_argv, flags);
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(&wtindex);
+
 	/*
 	 * If the diff includes working copy files and those
 	 * files were modified during the diff, then the changes
@@ -667,12 +670,12 @@ finish:
 static int run_file_diff(int prompt, const char *prefix,
 			 int argc, const char **argv)
 {
-	struct argv_array args = ARGV_ARRAY_INIT;
+	struct strvec args = STRVEC_INIT;
 	const char *env[] = {
 		"GIT_PAGER=", "GIT_EXTERNAL_DIFF=git-difftool--helper", NULL,
 		NULL
 	};
-	int ret = 0, i;
+	int i;
 
 	if (prompt > 0)
 		env[2] = "GIT_DIFFTOOL_PROMPT=true";
@@ -680,11 +683,10 @@ static int run_file_diff(int prompt, const char *prefix,
 		env[2] = "GIT_DIFFTOOL_NO_PROMPT=true";
 
 
-	argv_array_push(&args, "diff");
+	strvec_push(&args, "diff");
 	for (i = 0; i < argc; i++)
-		argv_array_push(&args, argv[i]);
-	ret = run_command_v_opt_cd_env(args.argv, RUN_GIT_CMD, prefix, env);
-	exit(ret);
+		strvec_push(&args, argv[i]);
+	return run_command_v_opt_cd_env(args.v, RUN_GIT_CMD, prefix, env);
 }
 
 int cmd_difftool(int argc, const char **argv, const char *prefix)
diff --git a/builtin/env--helper.c b/builtin/env--helper.c
index 23c214fff6..27349098b0 100644
--- a/builtin/env--helper.c
+++ b/builtin/env--helper.c
@@ -7,18 +7,22 @@ static char const * const env__helper_usage[] = {
 	NULL
 };
 
-static enum {
+enum cmdmode {
 	ENV_HELPER_TYPE_BOOL = 1,
 	ENV_HELPER_TYPE_ULONG
-} cmdmode = 0;
+};
 
 static int option_parse_type(const struct option *opt, const char *arg,
 			     int unset)
 {
+	enum cmdmode *cmdmode = opt->value;
+
+	BUG_ON_OPT_NEG(unset);
+
 	if (!strcmp(arg, "bool"))
-		cmdmode = ENV_HELPER_TYPE_BOOL;
+		*cmdmode = ENV_HELPER_TYPE_BOOL;
 	else if (!strcmp(arg, "ulong"))
-		cmdmode = ENV_HELPER_TYPE_ULONG;
+		*cmdmode = ENV_HELPER_TYPE_ULONG;
 	else
 		die(_("unrecognized --type argument, %s"), arg);
 
@@ -33,6 +37,7 @@ int cmd_env__helper(int argc, const char **argv, const char *prefix)
 	int ret;
 	int ret_int, default_int;
 	unsigned long ret_ulong, default_ulong;
+	enum cmdmode cmdmode = 0;
 	struct option opts[] = {
 		OPT_CALLBACK_F(0, "type", &cmdmode, N_("type"),
 			       N_("value is given this type"), PARSE_OPT_NONEG,
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index dbec4df92b..3c20f164f0 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -45,6 +45,7 @@ static struct string_list extra_refs = STRING_LIST_INIT_NODUP;
 static struct string_list tag_refs = STRING_LIST_INIT_NODUP;
 static struct refspec refspecs = REFSPEC_INIT_FETCH;
 static int anonymize;
+static struct hashmap anonymized_seeds;
 static struct revision_sources revision_sources;
 
 static int parse_opt_signed_tag_mode(const struct option *opt,
@@ -120,24 +121,33 @@ static int has_unshown_parent(struct commit *commit)
 
 struct anonymized_entry {
 	struct hashmap_entry hash;
+	const char *anon;
+	const char orig[FLEX_ARRAY];
+};
+
+struct anonymized_entry_key {
+	struct hashmap_entry hash;
 	const char *orig;
 	size_t orig_len;
-	const char *anon;
-	size_t anon_len;
 };
 
 static int anonymized_entry_cmp(const void *unused_cmp_data,
 				const struct hashmap_entry *eptr,
 				const struct hashmap_entry *entry_or_key,
-				const void *unused_keydata)
+				const void *keydata)
 {
 	const struct anonymized_entry *a, *b;
 
 	a = container_of(eptr, const struct anonymized_entry, hash);
-	b = container_of(entry_or_key, const struct anonymized_entry, hash);
+	if (keydata) {
+		const struct anonymized_entry_key *key = keydata;
+		int equal = !strncmp(a->orig, key->orig, key->orig_len) &&
+			    !a->orig[key->orig_len];
+		return !equal;
+	}
 
-	return a->orig_len != b->orig_len ||
-		memcmp(a->orig, b->orig, a->orig_len);
+	b = container_of(entry_or_key, const struct anonymized_entry, hash);
+	return strcmp(a->orig, b->orig);
 }
 
 /*
@@ -145,31 +155,39 @@ static int anonymized_entry_cmp(const void *unused_cmp_data,
  * the same anonymized string with another. The actual generation
  * is farmed out to the generate function.
  */
-static const void *anonymize_mem(struct hashmap *map,
-				 void *(*generate)(const void *, size_t *),
-				 const void *orig, size_t *len)
+static const char *anonymize_str(struct hashmap *map,
+				 char *(*generate)(void *),
+				 const char *orig, size_t len,
+				 void *data)
 {
-	struct anonymized_entry key, *ret;
+	struct anonymized_entry_key key;
+	struct anonymized_entry *ret;
 
 	if (!map->cmpfn)
 		hashmap_init(map, anonymized_entry_cmp, NULL, 0);
 
-	hashmap_entry_init(&key.hash, memhash(orig, *len));
+	hashmap_entry_init(&key.hash, memhash(orig, len));
 	key.orig = orig;
-	key.orig_len = *len;
-	ret = hashmap_get_entry(map, &key, hash, NULL);
+	key.orig_len = len;
+
+	/* First check if it's a token the user configured manually... */
+	if (anonymized_seeds.cmpfn)
+		ret = hashmap_get_entry(&anonymized_seeds, &key, hash, &key);
+	else
+		ret = NULL;
+
+	/* ...otherwise check if we've already seen it in this context... */
+	if (!ret)
+		ret = hashmap_get_entry(map, &key, hash, &key);
 
+	/* ...and finally generate a new mapping if necessary */
 	if (!ret) {
-		ret = xmalloc(sizeof(*ret));
+		FLEX_ALLOC_MEM(ret, orig, orig, len);
 		hashmap_entry_init(&ret->hash, key.hash.hash);
-		ret->orig = xstrdup(orig);
-		ret->orig_len = *len;
-		ret->anon = generate(orig, len);
-		ret->anon_len = *len;
+		ret->anon = generate(data);
 		hashmap_put(map, &ret->hash);
 	}
 
-	*len = ret->anon_len;
 	return ret->anon;
 }
 
@@ -181,13 +199,13 @@ static const void *anonymize_mem(struct hashmap *map,
  */
 static void anonymize_path(struct strbuf *out, const char *path,
 			   struct hashmap *map,
-			   void *(*generate)(const void *, size_t *))
+			   char *(*generate)(void *))
 {
 	while (*path) {
 		const char *end_of_component = strchrnul(path, '/');
 		size_t len = end_of_component - path;
-		const char *c = anonymize_mem(map, generate, path, &len);
-		strbuf_add(out, c, len);
+		const char *c = anonymize_str(map, generate, path, len, NULL);
+		strbuf_addstr(out, c);
 		path = end_of_component;
 		if (*path)
 			strbuf_addch(out, *path++);
@@ -293,7 +311,8 @@ static void export_blob(const struct object_id *oid)
 		buf = read_object_file(oid, &type, &size);
 		if (!buf)
 			die("could not read blob %s", oid_to_hex(oid));
-		if (check_object_signature(oid, buf, size, type_name(type)) < 0)
+		if (check_object_signature(the_repository, oid, buf, size,
+					   type_name(type)) < 0)
 			die("oid mismatch in blob %s", oid_to_hex(oid));
 		object = parse_object_buffer(the_repository, oid, type,
 					     size, buf, &eaten);
@@ -360,12 +379,12 @@ static void print_path_1(const char *path)
 		printf("%s", path);
 }
 
-static void *anonymize_path_component(const void *path, size_t *len)
+static char *anonymize_path_component(void *data)
 {
 	static int counter;
 	struct strbuf out = STRBUF_INIT;
 	strbuf_addf(&out, "path%d", counter++);
-	return strbuf_detach(&out, len);
+	return strbuf_detach(&out, NULL);
 }
 
 static void print_path(const char *path)
@@ -382,20 +401,23 @@ static void print_path(const char *path)
 	}
 }
 
-static void *generate_fake_oid(const void *old, size_t *len)
+static char *generate_fake_oid(void *data)
 {
 	static uint32_t counter = 1; /* avoid null oid */
 	const unsigned hashsz = the_hash_algo->rawsz;
-	unsigned char *out = xcalloc(hashsz, 1);
-	put_be32(out + hashsz - 4, counter++);
-	return out;
+	struct object_id oid;
+	char *hex = xmallocz(GIT_MAX_HEXSZ);
+
+	oidclr(&oid);
+	put_be32(oid.hash + hashsz - 4, counter++);
+	return oid_to_hex_r(hex, &oid);
 }
 
-static const struct object_id *anonymize_oid(const struct object_id *oid)
+static const char *anonymize_oid(const char *oid_hex)
 {
 	static struct hashmap objs;
-	size_t len = the_hash_algo->rawsz;
-	return anonymize_mem(&objs, generate_fake_oid, oid, &len);
+	size_t len = strlen(oid_hex);
+	return anonymize_str(&objs, generate_fake_oid, oid_hex, len, NULL);
 }
 
 static void show_filemodify(struct diff_queue_struct *q,
@@ -454,9 +476,9 @@ static void show_filemodify(struct diff_queue_struct *q,
 			 */
 			if (no_data || S_ISGITLINK(spec->mode))
 				printf("M %06o %s ", spec->mode,
-				       oid_to_hex(anonymize ?
-						  anonymize_oid(&spec->oid) :
-						  &spec->oid));
+				       anonymize ?
+				       anonymize_oid(oid_to_hex(&spec->oid)) :
+				       oid_to_hex(&spec->oid));
 			else {
 				struct object *object = lookup_object(the_repository,
 								      &spec->oid);
@@ -492,12 +514,12 @@ static const char *find_encoding(const char *begin, const char *end)
 	return bol;
 }
 
-static void *anonymize_ref_component(const void *old, size_t *len)
+static char *anonymize_ref_component(void *data)
 {
 	static int counter;
 	struct strbuf out = STRBUF_INIT;
 	strbuf_addf(&out, "ref%d", counter++);
-	return strbuf_detach(&out, len);
+	return strbuf_detach(&out, NULL);
 }
 
 static const char *anonymize_refname(const char *refname)
@@ -516,13 +538,6 @@ static const char *anonymize_refname(const char *refname)
 	static struct strbuf anon = STRBUF_INIT;
 	int i;
 
-	/*
-	 * We also leave "master" as a special case, since it does not reveal
-	 * anything interesting.
-	 */
-	if (!strcmp(refname, "refs/heads/master"))
-		return refname;
-
 	strbuf_reset(&anon);
 	for (i = 0; i < ARRAY_SIZE(prefixes); i++) {
 		if (skip_prefix(refname, prefixes[i], &refname)) {
@@ -545,14 +560,13 @@ static char *anonymize_commit_message(const char *old)
 	return xstrfmt("subject %d\n\nbody\n", counter++);
 }
 
-static struct hashmap idents;
-static void *anonymize_ident(const void *old, size_t *len)
+static char *anonymize_ident(void *data)
 {
 	static int counter;
 	struct strbuf out = STRBUF_INIT;
 	strbuf_addf(&out, "User %d <user%d@example.com>", counter, counter);
 	counter++;
-	return strbuf_detach(&out, len);
+	return strbuf_detach(&out, NULL);
 }
 
 /*
@@ -562,6 +576,7 @@ static void *anonymize_ident(const void *old, size_t *len)
  */
 static void anonymize_ident_line(const char **beg, const char **end)
 {
+	static struct hashmap idents;
 	static struct strbuf buffers[] = { STRBUF_INIT, STRBUF_INIT };
 	static unsigned which_buffer;
 
@@ -587,9 +602,9 @@ static void anonymize_ident_line(const char **beg, const char **end)
 		size_t len;
 
 		len = split.mail_end - split.name_begin;
-		ident = anonymize_mem(&idents, anonymize_ident,
-				      split.name_begin, &len);
-		strbuf_add(out, ident, len);
+		ident = anonymize_str(&idents, anonymize_ident,
+				      split.name_begin, len, NULL);
+		strbuf_addstr(out, ident);
 		strbuf_addch(out, ' ');
 		strbuf_add(out, split.date_begin, split.tz_end - split.date_begin);
 	} else {
@@ -711,9 +726,10 @@ static void handle_commit(struct commit *commit, struct rev_info *rev,
 		if (mark)
 			printf(":%d\n", mark);
 		else
-			printf("%s\n", oid_to_hex(anonymize ?
-						  anonymize_oid(&obj->oid) :
-						  &obj->oid));
+			printf("%s\n",
+			       anonymize ?
+			       anonymize_oid(oid_to_hex(&obj->oid)) :
+			       oid_to_hex(&obj->oid));
 		i++;
 	}
 
@@ -728,12 +744,12 @@ static void handle_commit(struct commit *commit, struct rev_info *rev,
 	show_progress();
 }
 
-static void *anonymize_tag(const void *old, size_t *len)
+static char *anonymize_tag(void *data)
 {
 	static int counter;
 	struct strbuf out = STRBUF_INIT;
 	strbuf_addf(&out, "tag message %d", counter++);
-	return strbuf_detach(&out, len);
+	return strbuf_detach(&out, NULL);
 }
 
 static void handle_tail(struct object_array *commits, struct rev_info *revs,
@@ -803,8 +819,8 @@ static void handle_tag(const char *name, struct tag *tag)
 		name = anonymize_refname(name);
 		if (message) {
 			static struct hashmap tags;
-			message = anonymize_mem(&tags, anonymize_tag,
-						message, &message_size);
+			message = anonymize_str(&tags, anonymize_tag,
+						message, message_size, NULL);
 		}
 	}
 
@@ -854,7 +870,7 @@ static void handle_tag(const char *name, struct tag *tag)
 				p = rewrite_commit((struct commit *)tagged);
 				if (!p) {
 					printf("reset %s\nfrom %s\n\n",
-					       name, oid_to_hex(&null_oid));
+					       name, oid_to_hex(null_oid()));
 					free(buf);
 					return;
 				}
@@ -868,10 +884,9 @@ static void handle_tag(const char *name, struct tag *tag)
 
 	if (tagged->type == OBJ_TAG) {
 		printf("reset %s\nfrom %s\n\n",
-		       name, oid_to_hex(&null_oid));
+		       name, oid_to_hex(null_oid()));
 	}
-	if (starts_with(name, "refs/tags/"))
-		name += 10;
+	skip_prefix(name, "refs/tags/", &name);
 	printf("tag %s\n", name);
 	if (mark_tags) {
 		mark_next_object(&tag->object);
@@ -908,7 +923,6 @@ static struct commit *get_commit(struct rev_cmdline_entry *e, char *full_name)
 		if (!tag)
 			die("Tag %s points nowhere?", e->name);
 		return (struct commit *)tag;
-		break;
 	}
 	default:
 		return NULL;
@@ -928,7 +942,7 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info)
 		if (e->flags & UNINTERESTING)
 			continue;
 
-		if (dwim_ref(e->name, strlen(e->name), &oid, &full_name) != 1)
+		if (dwim_ref(e->name, strlen(e->name), &oid, &full_name, 0) != 1)
 			continue;
 
 		if (refspecs.nr) {
@@ -1002,7 +1016,7 @@ static void handle_tags_and_duplicates(struct string_list *extras)
 				 * it.
 				 */
 				printf("reset %s\nfrom %s\n\n",
-				       name, oid_to_hex(&null_oid));
+				       name, oid_to_hex(null_oid()));
 				continue;
 			}
 
@@ -1011,7 +1025,7 @@ static void handle_tags_and_duplicates(struct string_list *extras)
 				/*
 				 * Getting here means we have a commit which
 				 * was excluded by a negative refspec (e.g.
-				 * fast-export ^master master).  If we are
+				 * fast-export ^HEAD HEAD).  If we are
 				 * referencing excluded commits, set the ref
 				 * to the exact commit.  Otherwise, the user
 				 * wants the branch exported but every commit
@@ -1021,7 +1035,7 @@ static void handle_tags_and_duplicates(struct string_list *extras)
 				if (!reference_excluded_commits) {
 					/* delete the ref */
 					printf("reset %s\nfrom %s\n\n",
-					       name, oid_to_hex(&null_oid));
+					       name, oid_to_hex(null_oid()));
 					continue;
 				}
 				/* set ref to commit using oid, not mark */
@@ -1132,8 +1146,39 @@ static void handle_deletes(void)
 			continue;
 
 		printf("reset %s\nfrom %s\n\n",
-				refspec->dst, oid_to_hex(&null_oid));
+				refspec->dst, oid_to_hex(null_oid()));
+	}
+}
+
+static char *anonymize_seed(void *data)
+{
+	return xstrdup(data);
+}
+
+static int parse_opt_anonymize_map(const struct option *opt,
+				   const char *arg, int unset)
+{
+	struct hashmap *map = opt->value;
+	const char *delim, *value;
+	size_t keylen;
+
+	BUG_ON_OPT_NEG(unset);
+
+	delim = strchr(arg, ':');
+	if (delim) {
+		keylen = delim - arg;
+		value = delim + 1;
+	} else {
+		keylen = strlen(arg);
+		value = arg;
 	}
+
+	if (!keylen || !*value)
+		return error(_("--anonymize-map token cannot be empty"));
+
+	anonymize_str(map, anonymize_seed, arg, keylen, (void *)value);
+
+	return 0;
 }
 
 int cmd_fast_export(int argc, const char **argv, const char *prefix)
@@ -1160,29 +1205,32 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 			     N_("select handling of commit messages in an alternate encoding"),
 			     parse_opt_reencode_mode),
 		OPT_STRING(0, "export-marks", &export_filename, N_("file"),
-			     N_("Dump marks to this file")),
+			     N_("dump marks to this file")),
 		OPT_STRING(0, "import-marks", &import_filename, N_("file"),
-			     N_("Import marks from this file")),
+			     N_("import marks from this file")),
 		OPT_STRING(0, "import-marks-if-exists",
 			     &import_filename_if_exists,
 			     N_("file"),
-			     N_("Import marks from this file if it exists")),
+			     N_("import marks from this file if it exists")),
 		OPT_BOOL(0, "fake-missing-tagger", &fake_missing_tagger,
-			 N_("Fake a tagger when tags lack one")),
+			 N_("fake a tagger when tags lack one")),
 		OPT_BOOL(0, "full-tree", &full_tree,
-			 N_("Output full tree for each commit")),
+			 N_("output full tree for each commit")),
 		OPT_BOOL(0, "use-done-feature", &use_done_feature,
-			     N_("Use the done feature to terminate the stream")),
-		OPT_BOOL(0, "no-data", &no_data, N_("Skip output of blob data")),
+			     N_("use the done feature to terminate the stream")),
+		OPT_BOOL(0, "no-data", &no_data, N_("skip output of blob data")),
 		OPT_STRING_LIST(0, "refspec", &refspecs_list, N_("refspec"),
-			     N_("Apply refspec to exported refs")),
+			     N_("apply refspec to exported refs")),
 		OPT_BOOL(0, "anonymize", &anonymize, N_("anonymize output")),
+		OPT_CALLBACK_F(0, "anonymize-map", &anonymized_seeds, N_("from:to"),
+			       N_("convert <from> to <to> in anonymized output"),
+			       PARSE_OPT_NONEG, parse_opt_anonymize_map),
 		OPT_BOOL(0, "reference-excluded-parents",
-			 &reference_excluded_commits, N_("Reference parents which are not in fast-export stream by object id")),
+			 &reference_excluded_commits, N_("reference parents which are not in fast-export stream by object id")),
 		OPT_BOOL(0, "show-original-ids", &show_original_ids,
-			    N_("Show original object ids of blobs/commits")),
+			    N_("show original object ids of blobs/commits")),
 		OPT_BOOL(0, "mark-tags", &mark_tags,
-			    N_("Label tags with mark ids")),
+			    N_("label tags with mark ids")),
 
 		OPT_END()
 	};
@@ -1204,6 +1252,9 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
 	if (argc > 1)
 		usage_with_options (fast_export_usage, options);
 
+	if (anonymized_seeds.cmpfn && !anonymize)
+		die(_("--anonymize-map without --anonymize does not make sense"));
+
 	if (refspecs_list.nr) {
 		int i;
 
diff --git a/fast-import.c b/builtin/fast-import.c
index 9503d087b2..20406f6775 100644
--- a/fast-import.c
+++ b/builtin/fast-import.c
@@ -18,6 +18,7 @@
 #include "object-store.h"
 #include "mem-pool.h"
 #include "commit-reach.h"
+#include "khash.h"
 
 #define PACK_ID_BITS 16
 #define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
@@ -38,12 +39,28 @@
 
 struct object_entry {
 	struct pack_idx_entry idx;
-	struct object_entry *next;
+	struct hashmap_entry ent;
 	uint32_t type : TYPE_BITS,
 		pack_id : PACK_ID_BITS,
 		depth : DEPTH_BITS;
 };
 
+static int object_entry_hashcmp(const void *map_data,
+				const struct hashmap_entry *eptr,
+				const struct hashmap_entry *entry_or_key,
+				const void *keydata)
+{
+	const struct object_id *oid = keydata;
+	const struct object_entry *e1, *e2;
+
+	e1 = container_of(eptr, const struct object_entry, ent);
+	if (oid)
+		return oidcmp(&e1->idx.oid, oid);
+
+	e2 = container_of(entry_or_key, const struct object_entry, ent);
+	return oidcmp(&e1->idx.oid, &e2->idx.oid);
+}
+
 struct object_entry_pool {
 	struct object_entry_pool *next_pool;
 	struct object_entry *next_free;
@@ -53,6 +70,7 @@ struct object_entry_pool {
 
 struct mark_set {
 	union {
+		struct object_id *oids[1024];
 		struct object_entry *marked[1024];
 		struct mark_set *sets[1024];
 	} data;
@@ -121,6 +139,7 @@ struct hash_list {
 
 typedef enum {
 	WHENSPEC_RAW = 1,
+	WHENSPEC_RAW_PERMISSIVE,
 	WHENSPEC_RFC2822,
 	WHENSPEC_NOW
 } whenspec_type;
@@ -131,6 +150,9 @@ struct recent_command {
 	char *buf;
 };
 
+typedef void (*mark_set_inserter_t)(struct mark_set **s, struct object_id *oid, uintmax_t mark);
+typedef void (*each_mark_fn_t)(uintmax_t mark, void *obj, void *cbp);
+
 /* Configured limits on output */
 static unsigned long max_depth = 50;
 static off_t max_packsize;
@@ -173,7 +195,7 @@ static off_t pack_size;
 /* Table of objects we've written. */
 static unsigned int object_entry_alloc = 5000;
 static struct object_entry_pool *blocks;
-static struct object_entry *object_table[1 << 16];
+static struct hashmap object_table;
 static struct mark_set *marks;
 static const char *export_marks_file;
 static const char *import_marks_file;
@@ -217,10 +239,16 @@ static uintmax_t next_mark;
 static struct strbuf new_data = STRBUF_INIT;
 static int seen_data_command;
 static int require_explicit_termination;
+static int allow_unsafe_features;
 
 /* Signal handling */
 static volatile sig_atomic_t checkpoint_requested;
 
+/* Submodule marks */
+static struct string_list sub_marks_from = STRING_LIST_INIT_DUP;
+static struct string_list sub_marks_to = STRING_LIST_INIT_DUP;
+static kh_oid_map_t *sub_oid_map;
+
 /* Where to write output of cat-blob commands */
 static int cat_blob_fd = STDOUT_FILENO;
 
@@ -229,6 +257,29 @@ static void parse_get_mark(const char *p);
 static void parse_cat_blob(const char *p);
 static void parse_ls(const char *p, struct branch *b);
 
+static void for_each_mark(struct mark_set *m, uintmax_t base, each_mark_fn_t callback, void *p)
+{
+	uintmax_t k;
+	if (m->shift) {
+		for (k = 0; k < 1024; k++) {
+			if (m->data.sets[k])
+				for_each_mark(m->data.sets[k], base + (k << m->shift), callback, p);
+		}
+	} else {
+		for (k = 0; k < 1024; k++) {
+			if (m->data.marked[k])
+				callback(base + k, m->data.marked[k], p);
+		}
+	}
+}
+
+static void dump_marks_fn(uintmax_t mark, void *object, void *cbp) {
+	struct object_entry *e = object;
+	FILE *f = cbp;
+
+	fprintf(f, ":%" PRIuMAX " %s\n", mark, oid_to_hex(&e->idx.oid));
+}
+
 static void write_branch_report(FILE *rpt, struct branch *b)
 {
 	fprintf(rpt, "%s:\n", b->name);
@@ -257,8 +308,6 @@ static void write_branch_report(FILE *rpt, struct branch *b)
 	fputc('\n', rpt);
 }
 
-static void dump_marks_helper(FILE *, uintmax_t, struct mark_set *);
-
 static void write_crash_report(const char *err)
 {
 	char *loc = git_pathdup("fast_import_crash_%"PRIuMAX, (uintmax_t) getpid());
@@ -337,7 +386,7 @@ static void write_crash_report(const char *err)
 	if (export_marks_file)
 		fprintf(rpt, "  exported to %s\n", export_marks_file);
 	else
-		dump_marks_helper(rpt, 0, marks);
+		for_each_mark(marks, 0, dump_marks_fn, rpt);
 
 	fputc('\n', rpt);
 	fputs("-------------------\n", rpt);
@@ -423,44 +472,37 @@ static struct object_entry *new_object(struct object_id *oid)
 
 static struct object_entry *find_object(struct object_id *oid)
 {
-	unsigned int h = oid->hash[0] << 8 | oid->hash[1];
-	struct object_entry *e;
-	for (e = object_table[h]; e; e = e->next)
-		if (oideq(oid, &e->idx.oid))
-			return e;
-	return NULL;
+	return hashmap_get_entry_from_hash(&object_table, oidhash(oid), oid,
+					   struct object_entry, ent);
 }
 
 static struct object_entry *insert_object(struct object_id *oid)
 {
-	unsigned int h = oid->hash[0] << 8 | oid->hash[1];
-	struct object_entry *e = object_table[h];
+	struct object_entry *e;
+	unsigned int hash = oidhash(oid);
 
-	while (e) {
-		if (oideq(oid, &e->idx.oid))
-			return e;
-		e = e->next;
+	e = hashmap_get_entry_from_hash(&object_table, hash, oid,
+					struct object_entry, ent);
+	if (!e) {
+		e = new_object(oid);
+		e->idx.offset = 0;
+		hashmap_entry_init(&e->ent, hash);
+		hashmap_add(&object_table, &e->ent);
 	}
 
-	e = new_object(oid);
-	e->next = object_table[h];
-	e->idx.offset = 0;
-	object_table[h] = e;
 	return e;
 }
 
 static void invalidate_pack_id(unsigned int id)
 {
-	unsigned int h;
 	unsigned long lu;
 	struct tag *t;
+	struct hashmap_iter iter;
+	struct object_entry *e;
 
-	for (h = 0; h < ARRAY_SIZE(object_table); h++) {
-		struct object_entry *e;
-
-		for (e = object_table[h]; e; e = e->next)
-			if (e->pack_id == id)
-				e->pack_id = MAX_PACK_ID;
+	hashmap_for_each_entry(&object_table, &iter, e, ent) {
+		if (e->pack_id == id)
+			e->pack_id = MAX_PACK_ID;
 	}
 
 	for (lu = 0; lu < branch_table_sz; lu++) {
@@ -484,22 +526,15 @@ static unsigned int hc_str(const char *s, size_t len)
 	return r;
 }
 
-static char *pool_strdup(const char *s)
+static void insert_mark(struct mark_set **top, uintmax_t idnum, struct object_entry *oe)
 {
-	size_t len = strlen(s) + 1;
-	char *r = mem_pool_alloc(&fi_mem_pool, len);
-	memcpy(r, s, len);
-	return r;
-}
+	struct mark_set *s = *top;
 
-static void insert_mark(uintmax_t idnum, struct object_entry *oe)
-{
-	struct mark_set *s = marks;
 	while ((idnum >> s->shift) >= 1024) {
 		s = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set));
-		s->shift = marks->shift + 10;
-		s->data.sets[0] = marks;
-		marks = s;
+		s->shift = (*top)->shift + 10;
+		s->data.sets[0] = *top;
+		*top = s;
 	}
 	while (s->shift) {
 		uintmax_t i = idnum >> s->shift;
@@ -515,10 +550,9 @@ static void insert_mark(uintmax_t idnum, struct object_entry *oe)
 	s->data.marked[idnum] = oe;
 }
 
-static struct object_entry *find_mark(uintmax_t idnum)
+static void *find_mark(struct mark_set *s, uintmax_t idnum)
 {
 	uintmax_t orig_idnum = idnum;
-	struct mark_set *s = marks;
 	struct object_entry *oe = NULL;
 	if ((idnum >> s->shift) < 1024) {
 		while (s && s->shift) {
@@ -575,7 +609,7 @@ static struct branch *new_branch(const char *name)
 		die("Branch name doesn't conform to GIT standards: %s", name);
 
 	b = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct branch));
-	b->name = pool_strdup(name);
+	b->name = mem_pool_strdup(&fi_mem_pool, name);
 	b->table_next_branch = branch_table[hc];
 	b->branch_tree.versions[0].mode = S_IFDIR;
 	b->branch_tree.versions[1].mode = S_IFDIR;
@@ -707,7 +741,6 @@ static void start_packfile(void)
 {
 	struct strbuf tmp_file = STRBUF_INIT;
 	struct packed_git *p;
-	struct pack_header hdr;
 	int pack_fd;
 
 	pack_fd = odb_mkstemp(&tmp_file, "pack/tmp_pack_XXXXXX");
@@ -718,13 +751,8 @@ static void start_packfile(void)
 	p->do_not_close = 1;
 	pack_file = hashfd(pack_fd, p->pack_name);
 
-	hdr.hdr_signature = htonl(PACK_SIGNATURE);
-	hdr.hdr_version = htonl(2);
-	hdr.hdr_entries = 0;
-	hashwrite(pack_file, &hdr, sizeof(hdr));
-
 	pack_data = p;
-	pack_size = sizeof(hdr);
+	pack_size = write_pack_header(pack_file, 0);
 	object_count = 0;
 
 	REALLOC_ARRAY(all_packs, pack_id + 1);
@@ -803,9 +831,9 @@ static int loosen_small_pack(const struct packed_git *p)
 	unpack.in = p->pack_fd;
 	unpack.git_cmd = 1;
 	unpack.stdout_to_stderr = 1;
-	argv_array_push(&unpack.args, "unpack-objects");
+	strvec_push(&unpack.args, "unpack-objects");
 	if (!show_stats)
-		argv_array_push(&unpack.args, "-q");
+		strvec_push(&unpack.args, "-q");
 
 	return run_command(&unpack);
 }
@@ -912,13 +940,13 @@ static int store_object(
 	the_hash_algo->init_fn(&c);
 	the_hash_algo->update_fn(&c, hdr, hdrlen);
 	the_hash_algo->update_fn(&c, dat->buf, dat->len);
-	the_hash_algo->final_fn(oid.hash, &c);
+	the_hash_algo->final_oid_fn(&oid, &c);
 	if (oidout)
 		oidcpy(oidout, &oid);
 
 	e = insert_object(&oid);
 	if (mark)
-		insert_mark(mark, e);
+		insert_mark(&marks, mark, e);
 	if (e->idx.offset) {
 		duplicate_count_by_type[type]++;
 		return 1;
@@ -1108,7 +1136,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
 		}
 	}
 	git_deflate_end(&s);
-	the_hash_algo->final_fn(oid.hash, &c);
+	the_hash_algo->final_oid_fn(&oid, &c);
 
 	if (oidout)
 		oidcpy(oidout, &oid);
@@ -1116,7 +1144,7 @@ static void stream_blob(uintmax_t len, struct object_id *oidout, uintmax_t mark)
 	e = insert_object(&oid);
 
 	if (mark)
-		insert_mark(mark, e);
+		insert_mark(&marks, mark, e);
 
 	if (e->idx.offset) {
 		duplicate_count_by_type[OBJ_BLOB]++;
@@ -1248,8 +1276,8 @@ static void load_tree(struct tree_entry *root)
 		e->versions[0].mode = e->versions[1].mode;
 		e->name = to_atom(c, strlen(c));
 		c += e->name->str_len + 1;
-		hashcpy(e->versions[0].oid.hash, (unsigned char *)c);
-		hashcpy(e->versions[1].oid.hash, (unsigned char *)c);
+		oidread(&e->versions[0].oid, (unsigned char *)c);
+		oidread(&e->versions[1].oid, (unsigned char *)c);
 		c += the_hash_algo->rawsz;
 	}
 	free(buf);
@@ -1654,26 +1682,6 @@ static void dump_tags(void)
 	strbuf_release(&err);
 }
 
-static void dump_marks_helper(FILE *f,
-	uintmax_t base,
-	struct mark_set *m)
-{
-	uintmax_t k;
-	if (m->shift) {
-		for (k = 0; k < 1024; k++) {
-			if (m->data.sets[k])
-				dump_marks_helper(f, base + (k << m->shift),
-					m->data.sets[k]);
-		}
-	} else {
-		for (k = 0; k < 1024; k++) {
-			if (m->data.marked[k])
-				fprintf(f, ":%" PRIuMAX " %s\n", base + k,
-					oid_to_hex(&m->data.marked[k]->idx.oid));
-		}
-	}
-}
-
 static void dump_marks(void)
 {
 	struct lock_file mark_lock = LOCK_INIT;
@@ -1682,6 +1690,12 @@ static void dump_marks(void)
 	if (!export_marks_file || (import_marks_file && !import_marks_file_done))
 		return;
 
+	if (safe_create_leading_directories_const(export_marks_file)) {
+		failure |= error_errno("unable to create leading directories of %s",
+				       export_marks_file);
+		return;
+	}
+
 	if (hold_lock_file_for_update(&mark_lock, export_marks_file, 0) < 0) {
 		failure |= error_errno("Unable to write marks file %s",
 				       export_marks_file);
@@ -1697,7 +1711,7 @@ static void dump_marks(void)
 		return;
 	}
 
-	dump_marks_helper(f, 0, marks);
+	for_each_mark(marks, 0, dump_marks_fn, f);
 	if (commit_lock_file(&mark_lock)) {
 		failure |= error_errno("Unable to write file %s",
 				       export_marks_file);
@@ -1705,21 +1719,38 @@ static void dump_marks(void)
 	}
 }
 
-static void read_marks(void)
+static void insert_object_entry(struct mark_set **s, struct object_id *oid, uintmax_t mark)
+{
+	struct object_entry *e;
+	e = find_object(oid);
+	if (!e) {
+		enum object_type type = oid_object_info(the_repository,
+							oid, NULL);
+		if (type < 0)
+			die("object not found: %s", oid_to_hex(oid));
+		e = insert_object(oid);
+		e->type = type;
+		e->pack_id = MAX_PACK_ID;
+		e->idx.offset = 1; /* just not zero! */
+	}
+	insert_mark(s, mark, e);
+}
+
+static void insert_oid_entry(struct mark_set **s, struct object_id *oid, uintmax_t mark)
+{
+	insert_mark(s, mark, xmemdupz(oid, sizeof(*oid)));
+}
+
+static void read_mark_file(struct mark_set **s, FILE *f, mark_set_inserter_t inserter)
 {
 	char line[512];
-	FILE *f = fopen(import_marks_file, "r");
-	if (f)
-		;
-	else if (import_marks_file_ignore_missing && errno == ENOENT)
-		goto done; /* Marks file does not exist */
-	else
-		die_errno("cannot read '%s'", import_marks_file);
 	while (fgets(line, sizeof(line), f)) {
 		uintmax_t mark;
 		char *end;
 		struct object_id oid;
-		struct object_entry *e;
+
+		/* Ensure SHA-1 objects are padded with zeros. */
+		memset(oid.hash, 0, sizeof(oid.hash));
 
 		end = strchr(line, '\n');
 		if (line[0] != ':' || !end)
@@ -1727,21 +1758,23 @@ static void read_marks(void)
 		*end = 0;
 		mark = strtoumax(line + 1, &end, 10);
 		if (!mark || end == line + 1
-			|| *end != ' ' || get_oid_hex(end + 1, &oid))
+			|| *end != ' '
+			|| get_oid_hex_any(end + 1, &oid) == GIT_HASH_UNKNOWN)
 			die("corrupt mark line: %s", line);
-		e = find_object(&oid);
-		if (!e) {
-			enum object_type type = oid_object_info(the_repository,
-								&oid, NULL);
-			if (type < 0)
-				die("object not found: %s", oid_to_hex(&oid));
-			e = insert_object(&oid);
-			e->type = type;
-			e->pack_id = MAX_PACK_ID;
-			e->idx.offset = 1; /* just not zero! */
-		}
-		insert_mark(mark, e);
+		inserter(s, &oid, mark);
 	}
+}
+
+static void read_marks(void)
+{
+	FILE *f = fopen(import_marks_file, "r");
+	if (f)
+		;
+	else if (import_marks_file_ignore_missing && errno == ENOENT)
+		goto done; /* Marks file does not exist */
+	else
+		die_errno("cannot read '%s'", import_marks_file);
+	read_mark_file(&marks, f, insert_object_entry);
 	fclose(f);
 done:
 	import_marks_file_done = 1;
@@ -1867,7 +1900,7 @@ static int parse_data(struct strbuf *sb, uintmax_t limit, uintmax_t *len_res)
 	return 1;
 }
 
-static int validate_raw_date(const char *src, struct strbuf *result)
+static int validate_raw_date(const char *src, struct strbuf *result, int strict)
 {
 	const char *orig_src = src;
 	char *endp;
@@ -1876,7 +1909,11 @@ static int validate_raw_date(const char *src, struct strbuf *result)
 	errno = 0;
 
 	num = strtoul(src, &endp, 10);
-	/* NEEDSWORK: perhaps check for reasonable values? */
+	/*
+	 * NEEDSWORK: perhaps check for reasonable values? For example, we
+	 *            could error on values representing times more than a
+	 *            day in the future.
+	 */
 	if (errno || endp == src || *endp != ' ')
 		return -1;
 
@@ -1885,7 +1922,13 @@ static int validate_raw_date(const char *src, struct strbuf *result)
 		return -1;
 
 	num = strtoul(src + 1, &endp, 10);
-	if (errno || endp == src + 1 || *endp || 1400 < num)
+	/*
+	 * NEEDSWORK: check for brokenness other than num > 1400, such as
+	 *            (num % 100) >= 60, or ((num % 100) % 15) != 0 ?
+	 */
+	if (errno || endp == src + 1 || *endp || /* did not parse */
+	    (strict && (1400 < num))             /* parsed a broken timezone */
+	   )
 		return -1;
 
 	strbuf_addstr(result, orig_src);
@@ -1919,7 +1962,11 @@ static char *parse_ident(const char *buf)
 
 	switch (whenspec) {
 	case WHENSPEC_RAW:
-		if (validate_raw_date(ltgt, &ident) < 0)
+		if (validate_raw_date(ltgt, &ident, 1) < 0)
+			die("Invalid raw date \"%s\" in ident: %s", ltgt, buf);
+		break;
+	case WHENSPEC_RAW_PERMISSIVE:
+		if (validate_raw_date(ltgt, &ident, 0) < 0)
 			die("Invalid raw date \"%s\" in ident: %s", ltgt, buf);
 		break;
 	case WHENSPEC_RFC2822:
@@ -2127,6 +2174,30 @@ static uintmax_t change_note_fanout(struct tree_entry *root,
 	return do_change_note_fanout(root, root, hex_oid, 0, path, 0, fanout);
 }
 
+static int parse_mapped_oid_hex(const char *hex, struct object_id *oid, const char **end)
+{
+	int algo;
+	khiter_t it;
+
+	/* Make SHA-1 object IDs have all-zero padding. */
+	memset(oid->hash, 0, sizeof(oid->hash));
+
+	algo = parse_oid_hex_any(hex, oid, end);
+	if (algo == GIT_HASH_UNKNOWN)
+		return -1;
+
+	it = kh_get_oid_map(sub_oid_map, *oid);
+	/* No such object? */
+	if (it == kh_end(sub_oid_map)) {
+		/* If we're using the same algorithm, pass it through. */
+		if (hash_algos[algo].format_id == the_hash_algo->format_id)
+			return 0;
+		return -1;
+	}
+	oidcpy(oid, kh_value(sub_oid_map, it));
+	return 0;
+}
+
 /*
  * Given a pointer into a string, parse a mark reference:
  *
@@ -2207,13 +2278,13 @@ static void file_change_m(const char *p, struct branch *b)
 	}
 
 	if (*p == ':') {
-		oe = find_mark(parse_mark_ref_space(&p));
+		oe = find_mark(marks, parse_mark_ref_space(&p));
 		oidcpy(&oid, &oe->idx.oid);
 	} else if (skip_prefix(p, "inline ", &p)) {
 		inline_data = 1;
 		oe = NULL; /* not used with inline_data, but makes gcc happy */
 	} else {
-		if (parse_oid_hex(p, &oid, &p))
+		if (parse_mapped_oid_hex(p, &oid, &p))
 			die("Invalid dataref: %s", command_buf.buf);
 		oe = find_object(&oid);
 		if (*p++ != ' ')
@@ -2381,13 +2452,13 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
 	/* Now parse the notemodify command. */
 	/* <dataref> or 'inline' */
 	if (*p == ':') {
-		oe = find_mark(parse_mark_ref_space(&p));
+		oe = find_mark(marks, parse_mark_ref_space(&p));
 		oidcpy(&oid, &oe->idx.oid);
 	} else if (skip_prefix(p, "inline ", &p)) {
 		inline_data = 1;
 		oe = NULL; /* not used with inline_data, but makes gcc happy */
 	} else {
-		if (parse_oid_hex(p, &oid, &p))
+		if (parse_mapped_oid_hex(p, &oid, &p))
 			die("Invalid dataref: %s", command_buf.buf);
 		oe = find_object(&oid);
 		if (*p++ != ' ')
@@ -2402,7 +2473,7 @@ static void note_change_n(const char *p, struct branch *b, unsigned char *old_fa
 		oidcpy(&commit_oid, &s->oid);
 	} else if (*p == ':') {
 		uintmax_t commit_mark = parse_mark_ref_eol(p);
-		struct object_entry *commit_oe = find_mark(commit_mark);
+		struct object_entry *commit_oe = find_mark(marks, commit_mark);
 		if (commit_oe->type != OBJ_COMMIT)
 			die("Mark :%" PRIuMAX " not a commit", commit_mark);
 		oidcpy(&commit_oid, &commit_oe->idx.oid);
@@ -2506,7 +2577,7 @@ static int parse_objectish(struct branch *b, const char *objectish)
 		oidcpy(&b->branch_tree.versions[1].oid, t);
 	} else if (*objectish == ':') {
 		uintmax_t idnum = parse_mark_ref_eol(objectish);
-		struct object_entry *oe = find_mark(idnum);
+		struct object_entry *oe = find_mark(marks, idnum);
 		if (oe->type != OBJ_COMMIT)
 			die("Mark :%" PRIuMAX " not a commit", idnum);
 		if (!oideq(&b->oid, &oe->idx.oid)) {
@@ -2570,7 +2641,7 @@ static struct hash_list *parse_merge(unsigned int *count)
 			oidcpy(&n->oid, &s->oid);
 		else if (*from == ':') {
 			uintmax_t idnum = parse_mark_ref_eol(from);
-			struct object_entry *oe = find_mark(idnum);
+			struct object_entry *oe = find_mark(marks, idnum);
 			if (oe->type != OBJ_COMMIT)
 				die("Mark :%" PRIuMAX " not a commit", idnum);
 			oidcpy(&n->oid, &oe->idx.oid);
@@ -2723,7 +2794,7 @@ static void parse_new_tag(const char *arg)
 
 	t = mem_pool_alloc(&fi_mem_pool, sizeof(struct tag));
 	memset(t, 0, sizeof(struct tag));
-	t->name = pool_strdup(arg);
+	t->name = mem_pool_strdup(&fi_mem_pool, arg);
 	if (last_tag)
 		last_tag->next_tag = t;
 	else
@@ -2744,7 +2815,7 @@ static void parse_new_tag(const char *arg)
 	} else if (*from == ':') {
 		struct object_entry *oe;
 		from_mark = parse_mark_ref_eol(from);
-		oe = find_mark(from_mark);
+		oe = find_mark(marks, from_mark);
 		type = oe->type;
 		oidcpy(&oid, &oe->idx.oid);
 	} else if (!get_oid(from, &oid)) {
@@ -2902,7 +2973,7 @@ static void parse_get_mark(const char *p)
 	if (*p != ':')
 		die("Not a mark: %s", p);
 
-	oe = find_mark(parse_mark_ref_eol(p));
+	oe = find_mark(marks, parse_mark_ref_eol(p));
 	if (!oe)
 		die("Unknown mark: %s", command_buf.buf);
 
@@ -2917,12 +2988,12 @@ static void parse_cat_blob(const char *p)
 
 	/* cat-blob SP <object> LF */
 	if (*p == ':') {
-		oe = find_mark(parse_mark_ref_eol(p));
+		oe = find_mark(marks, parse_mark_ref_eol(p));
 		if (!oe)
 			die("Unknown mark: %s", command_buf.buf);
 		oidcpy(&oid, &oe->idx.oid);
 	} else {
-		if (parse_oid_hex(p, &oid, &p))
+		if (parse_mapped_oid_hex(p, &oid, &p))
 			die("Invalid dataref: %s", command_buf.buf);
 		if (*p)
 			die("Garbage after SHA1: %s", command_buf.buf);
@@ -2986,18 +3057,54 @@ static struct object_entry *dereference(struct object_entry *oe,
 	return find_object(oid);
 }
 
+static void insert_mapped_mark(uintmax_t mark, void *object, void *cbp)
+{
+	struct object_id *fromoid = object;
+	struct object_id *tooid = find_mark(cbp, mark);
+	int ret;
+	khiter_t it;
+
+	it = kh_put_oid_map(sub_oid_map, *fromoid, &ret);
+	/* We've already seen this object. */
+	if (ret == 0)
+		return;
+	kh_value(sub_oid_map, it) = tooid;
+}
+
+static void build_mark_map_one(struct mark_set *from, struct mark_set *to)
+{
+	for_each_mark(from, 0, insert_mapped_mark, to);
+}
+
+static void build_mark_map(struct string_list *from, struct string_list *to)
+{
+	struct string_list_item *fromp, *top;
+
+	sub_oid_map = kh_init_oid_map();
+
+	for_each_string_list_item(fromp, from) {
+		top = string_list_lookup(to, fromp->string);
+		if (!fromp->util) {
+			die(_("Missing from marks for submodule '%s'"), fromp->string);
+		} else if (!top || !top->util) {
+			die(_("Missing to marks for submodule '%s'"), fromp->string);
+		}
+		build_mark_map_one(fromp->util, top->util);
+	}
+}
+
 static struct object_entry *parse_treeish_dataref(const char **p)
 {
 	struct object_id oid;
 	struct object_entry *e;
 
 	if (**p == ':') {	/* <mark> */
-		e = find_mark(parse_mark_ref_space(p));
+		e = find_mark(marks, parse_mark_ref_space(p));
 		if (!e)
 			die("Unknown mark: %s", command_buf.buf);
 		oidcpy(&oid, &e->idx.oid);
 	} else {	/* <sha1> */
-		if (parse_oid_hex(*p, &oid, p))
+		if (parse_mapped_oid_hex(*p, &oid, p))
 			die("Invalid dataref: %s", command_buf.buf);
 		e = find_object(&oid);
 		if (*(*p)++ != ' ')
@@ -3123,7 +3230,7 @@ static void parse_alias(void)
 		die(_("Expected 'to' command, got %s"), command_buf.buf);
 	e = find_object(&b.oid);
 	assert(e);
-	insert_mark(next_mark, e);
+	insert_mark(&marks, next_mark, e);
 }
 
 static char* make_fast_import_path(const char *path)
@@ -3146,7 +3253,6 @@ static void option_import_marks(const char *marks,
 	}
 
 	import_marks_file = make_fast_import_path(marks);
-	safe_create_leading_directories_const(import_marks_file);
 	import_marks_file_from_stream = from_stream;
 	import_marks_file_ignore_missing = ignore_missing;
 }
@@ -3155,6 +3261,8 @@ static void option_date_format(const char *fmt)
 {
 	if (!strcmp(fmt, "raw"))
 		whenspec = WHENSPEC_RAW;
+	else if (!strcmp(fmt, "raw-permissive"))
+		whenspec = WHENSPEC_RAW_PERMISSIVE;
 	else if (!strcmp(fmt, "rfc2822"))
 		whenspec = WHENSPEC_RFC2822;
 	else if (!strcmp(fmt, "now"))
@@ -3187,7 +3295,6 @@ static void option_active_branches(const char *branches)
 static void option_export_marks(const char *marks)
 {
 	export_marks_file = make_fast_import_path(marks);
-	safe_create_leading_directories_const(export_marks_file);
 }
 
 static void option_cat_blob_fd(const char *fd)
@@ -3205,6 +3312,27 @@ static void option_export_pack_edges(const char *edges)
 	pack_edges = xfopen(edges, "a");
 }
 
+static void option_rewrite_submodules(const char *arg, struct string_list *list)
+{
+	struct mark_set *ms;
+	FILE *fp;
+	char *s = xstrdup(arg);
+	char *f = strchr(s, ':');
+	if (!f)
+		die(_("Expected format name:filename for submodule rewrite option"));
+	*f = '\0';
+	f++;
+	CALLOC_ARRAY(ms, 1);
+
+	fp = fopen(f, "r");
+	if (!fp)
+		die_errno("cannot read '%s'", f);
+	read_mark_file(&ms, fp, insert_oid_entry);
+	fclose(fp);
+
+	string_list_insert(list, s)->util = ms;
+}
+
 static int parse_one_option(const char *option)
 {
 	if (skip_prefix(option, "max-pack-size=", &option)) {
@@ -3230,10 +3358,12 @@ static int parse_one_option(const char *option)
 		option_active_branches(option);
 	} else if (skip_prefix(option, "export-pack-edges=", &option)) {
 		option_export_pack_edges(option);
-	} else if (starts_with(option, "quiet")) {
+	} else if (!strcmp(option, "quiet")) {
 		show_stats = 0;
-	} else if (starts_with(option, "stats")) {
+	} else if (!strcmp(option, "stats")) {
 		show_stats = 1;
+	} else if (!strcmp(option, "allow-unsafe-features")) {
+		; /* already handled during early option parsing */
 	} else {
 		return 0;
 	}
@@ -3241,6 +3371,13 @@ static int parse_one_option(const char *option)
 	return 1;
 }
 
+static void check_unsafe_feature(const char *feature, int from_stream)
+{
+	if (from_stream && !allow_unsafe_features)
+		die(_("feature '%s' forbidden in input without --allow-unsafe-features"),
+		    feature);
+}
+
 static int parse_one_feature(const char *feature, int from_stream)
 {
 	const char *arg;
@@ -3248,13 +3385,20 @@ static int parse_one_feature(const char *feature, int from_stream)
 	if (skip_prefix(feature, "date-format=", &arg)) {
 		option_date_format(arg);
 	} else if (skip_prefix(feature, "import-marks=", &arg)) {
+		check_unsafe_feature("import-marks", from_stream);
 		option_import_marks(arg, from_stream, 0);
 	} else if (skip_prefix(feature, "import-marks-if-exists=", &arg)) {
+		check_unsafe_feature("import-marks-if-exists", from_stream);
 		option_import_marks(arg, from_stream, 1);
 	} else if (skip_prefix(feature, "export-marks=", &arg)) {
+		check_unsafe_feature(feature, from_stream);
 		option_export_marks(arg);
 	} else if (!strcmp(feature, "alias")) {
 		; /* Don't die - this feature is supported */
+	} else if (skip_prefix(feature, "rewrite-submodules-to=", &arg)) {
+		option_rewrite_submodules(arg, &sub_marks_to);
+	} else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) {
+		option_rewrite_submodules(arg, &sub_marks_from);
 	} else if (!strcmp(feature, "get-mark")) {
 		; /* Don't die - this feature is supported */
 	} else if (!strcmp(feature, "cat-blob")) {
@@ -3360,26 +3504,42 @@ static void parse_argv(void)
 	seen_data_command = 1;
 	if (import_marks_file)
 		read_marks();
+	build_mark_map(&sub_marks_from, &sub_marks_to);
 }
 
-int cmd_main(int argc, const char **argv)
+int cmd_fast_import(int argc, const char **argv, const char *prefix)
 {
 	unsigned int i;
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage(fast_import_usage);
 
-	setup_git_directory();
 	reset_pack_idx_option(&pack_idx_opts);
 	git_pack_config();
 
 	alloc_objects(object_entry_alloc);
 	strbuf_init(&command_buf, 0);
-	atom_table = xcalloc(atom_table_sz, sizeof(struct atom_str*));
-	branch_table = xcalloc(branch_table_sz, sizeof(struct branch*));
-	avail_tree_table = xcalloc(avail_tree_table_sz, sizeof(struct avail_tree_content*));
+	CALLOC_ARRAY(atom_table, atom_table_sz);
+	CALLOC_ARRAY(branch_table, branch_table_sz);
+	CALLOC_ARRAY(avail_tree_table, avail_tree_table_sz);
 	marks = mem_pool_calloc(&fi_mem_pool, 1, sizeof(struct mark_set));
 
+	hashmap_init(&object_table, object_entry_hashcmp, NULL, 0);
+
+	/*
+	 * We don't parse most options until after we've seen the set of
+	 * "feature" lines at the start of the stream (which allows the command
+	 * line to override stream data). But we must do an early parse of any
+	 * command-line options that impact how we interpret the feature lines.
+	 */
+	for (i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+		if (*arg != '-' || !strcmp(arg, "--"))
+			break;
+		if (!strcmp(arg, "--allow-unsafe-features"))
+			allow_unsafe_features = 1;
+	}
+
 	global_argc = argc;
 	global_argv = argv;
 
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index dc1485c8aa..c2d96f4c89 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -3,7 +3,7 @@
 #include "fetch-pack.h"
 #include "remote.h"
 #include "connect.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "protocol.h"
 
 static const char fetch_pack_usage[] =
@@ -48,8 +48,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
 	struct ref **sought = NULL;
 	int nr_sought = 0, alloc_sought = 0;
 	int fd[2];
-	char *pack_lockfile = NULL;
-	char **pack_lockfile_ptr = NULL;
+	struct string_list pack_lockfiles = STRING_LIST_INIT_DUP;
+	struct string_list *pack_lockfiles_ptr = NULL;
 	struct child_process *conn;
 	struct fetch_pack_args args;
 	struct oid_array shallow = OID_ARRAY_INIT;
@@ -134,7 +134,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
 		}
 		if (!strcmp("--lock-pack", arg)) {
 			args.lock_pack = 1;
-			pack_lockfile_ptr = &pack_lockfile;
+			pack_lockfiles_ptr = &pack_lockfiles;
 			continue;
 		}
 		if (!strcmp("--check-self-contained-and-connected", arg)) {
@@ -153,10 +153,6 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
 			args.from_promisor = 1;
 			continue;
 		}
-		if (!strcmp("--no-dependents", arg)) {
-			args.no_dependents = 1;
-			continue;
-		}
 		if (skip_prefix(arg, ("--" CL_ARG__FILTER "="), &arg)) {
 			parse_list_objects_filter(&args.filter_options, arg);
 			continue;
@@ -224,7 +220,8 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
 	version = discover_version(&reader);
 	switch (version) {
 	case protocol_v2:
-		get_remote_refs(fd[1], &reader, &ref, 0, NULL, NULL);
+		get_remote_refs(fd[1], &reader, &ref, 0, NULL, NULL,
+				args.stateless_rpc);
 		break;
 	case protocol_v1:
 	case protocol_v0:
@@ -235,10 +232,15 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
 	}
 
 	ref = fetch_pack(&args, fd, ref, sought, nr_sought,
-			 &shallow, pack_lockfile_ptr, version);
-	if (pack_lockfile) {
-		printf("lock %s\n", pack_lockfile);
+			 &shallow, pack_lockfiles_ptr, version);
+	if (pack_lockfiles.nr) {
+		int i;
+
+		printf("lock %s\n", pack_lockfiles.items[0].string);
 		fflush(stdout);
+		for (i = 1; i < pack_lockfiles.nr; i++)
+			warning(_("Lockfile created but not reported: %s"),
+				pack_lockfiles.items[i].string);
 	}
 	if (args.check_self_contained_and_connected &&
 	    args.self_contained_and_connected) {
diff --git a/builtin/fetch.c b/builtin/fetch.c
index 863c858fde..fc7b6bb84e 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -19,7 +19,7 @@
 #include "submodule-config.h"
 #include "submodule.h"
 #include "connected.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "utf8.h"
 #include "packfile.h"
 #include "list-objects-filter-options.h"
@@ -27,6 +27,7 @@
 #include "branch.h"
 #include "promisor-remote.h"
 #include "commit-graph.h"
+#include "shallow.h"
 
 #define FORCED_UPDATES_DELAY_WARNING_IN_MS (10 * 1000)
 
@@ -47,6 +48,7 @@ enum {
 static int fetch_prune_config = -1; /* unspecified */
 static int fetch_show_forced_updates = 1;
 static uint64_t forced_updates_ms = 0;
+static int prefetch = 0;
 static int prune = -1; /* unspecified */
 #define PRUNE_BY_DEFAULT 0 /* do we prune by default? */
 
@@ -55,12 +57,14 @@ static int prune_tags = -1; /* unspecified */
 #define PRUNE_TAGS_BY_DEFAULT 0 /* do we prune tags by default? */
 
 static int all, append, dry_run, force, keep, multiple, update_head_ok;
+static int write_fetch_head = 1;
 static int verbosity, deepen_relative, set_upstream;
 static int progress = -1;
 static int enable_auto_gc = 1;
 static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
 static int max_jobs = -1, submodule_fetch_jobs_config = -1;
 static int fetch_parallel_config = 1;
+static int atomic_fetch;
 static enum transport_family family;
 static const char *depth;
 static const char *deepen_since;
@@ -77,6 +81,9 @@ static struct refspec refmap = REFSPEC_INIT_FETCH;
 static struct list_objects_filter_options filter_options;
 static struct string_list server_options = STRING_LIST_INIT_DUP;
 static struct string_list negotiation_tip = STRING_LIST_INIT_NODUP;
+static int fetch_write_commit_graph = -1;
+static int stdin_refspecs = 0;
+static int negotiate_only;
 
 static int git_fetch_config(const char *k, const char *v, void *cb)
 {
@@ -140,6 +147,8 @@ static struct option builtin_fetch_options[] = {
 		 N_("set upstream for git pull/fetch")),
 	OPT_BOOL('a', "append", &append,
 		 N_("append to .git/FETCH_HEAD instead of overwriting")),
+	OPT_BOOL(0, "atomic", &atomic_fetch,
+		 N_("use atomic transaction to update references")),
 	OPT_STRING(0, "upload-pack", &upload_pack, N_("path"),
 		   N_("path to upload pack on remote end")),
 	OPT__FORCE(&force, N_("force overwrite of local reference"), 0),
@@ -151,15 +160,19 @@ static struct option builtin_fetch_options[] = {
 		    N_("do not fetch all tags (--no-tags)"), TAGS_UNSET),
 	OPT_INTEGER('j', "jobs", &max_jobs,
 		    N_("number of submodules fetched in parallel")),
+	OPT_BOOL(0, "prefetch", &prefetch,
+		 N_("modify the refspec to place all refs within refs/prefetch/")),
 	OPT_BOOL('p', "prune", &prune,
 		 N_("prune remote-tracking branches no longer on remote")),
 	OPT_BOOL('P', "prune-tags", &prune_tags,
 		 N_("prune local tags no longer on remote and clobber changed tags")),
-	{ OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
+	OPT_CALLBACK_F(0, "recurse-submodules", &recurse_submodules, N_("on-demand"),
 		    N_("control recursive fetching of submodules"),
-		    PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
+		    PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules),
 	OPT_BOOL(0, "dry-run", &dry_run,
 		 N_("dry run")),
+	OPT_BOOL(0, "write-fetch-head", &write_fetch_head,
+		 N_("write fetched references to the FETCH_HEAD file")),
 	OPT_BOOL('k', "keep", &keep, N_("keep downloaded pack")),
 	OPT_BOOL('u', "update-head-ok", &update_head_ok,
 		    N_("allow updating of HEAD ref")),
@@ -177,15 +190,15 @@ static struct option builtin_fetch_options[] = {
 		      1, PARSE_OPT_NONEG),
 	{ OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"),
 		   N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN },
-	{ OPTION_CALLBACK, 0, "recurse-submodules-default",
+	OPT_CALLBACK_F(0, "recurse-submodules-default",
 		   &recurse_submodules_default, N_("on-demand"),
 		   N_("default for recursive fetching of submodules "
 		      "(lower priority than config files)"),
-		   PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules },
+		   PARSE_OPT_HIDDEN, option_fetch_parse_recurse_submodules),
 	OPT_BOOL(0, "update-shallow", &update_shallow,
 		 N_("accept refs that update .git/shallow")),
-	{ OPTION_CALLBACK, 0, "refmap", NULL, N_("refmap"),
-	  N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg },
+	OPT_CALLBACK_F(0, "refmap", NULL, N_("refmap"),
+		       N_("specify fetch refmap"), PARSE_OPT_NONEG, parse_refmap_arg),
 	OPT_STRING_LIST('o', "server-option", &server_options, N_("server-specific"), N_("option to transmit")),
 	OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
 			TRANSPORT_FAMILY_IPV4),
@@ -193,11 +206,19 @@ static struct option builtin_fetch_options[] = {
 			TRANSPORT_FAMILY_IPV6),
 	OPT_STRING_LIST(0, "negotiation-tip", &negotiation_tip, N_("revision"),
 			N_("report that we have only objects reachable from this object")),
+	OPT_BOOL(0, "negotiate-only", &negotiate_only,
+		 N_("do not fetch a packfile; instead, print ancestors of negotiation tips")),
 	OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
+	OPT_BOOL(0, "auto-maintenance", &enable_auto_gc,
+		 N_("run 'maintenance --auto' after fetching")),
 	OPT_BOOL(0, "auto-gc", &enable_auto_gc,
-		 N_("run 'gc --auto' after fetching")),
+		 N_("run 'maintenance --auto' after fetching")),
 	OPT_BOOL(0, "show-forced-updates", &fetch_show_forced_updates,
 		 N_("check for forced-updates on all updated branches")),
+	OPT_BOOL(0, "write-commit-graph", &fetch_write_commit_graph,
+		 N_("write the commit-graph after fetching")),
+	OPT_BOOL(0, "stdin", &stdin_refspecs,
+		 N_("accept refspecs from stdin")),
 	OPT_END()
 };
 
@@ -332,6 +353,7 @@ static void find_non_local_tags(const struct ref *refs,
 	struct string_list_item *remote_ref_item;
 	const struct ref *ref;
 	struct refname_hash_entry *item = NULL;
+	const int quick_flags = OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT;
 
 	refname_hash_init(&existing_refs);
 	refname_hash_init(&remote_refs);
@@ -350,10 +372,9 @@ static void find_non_local_tags(const struct ref *refs,
 		 */
 		if (ends_with(ref->name, "^{}")) {
 			if (item &&
-			    !has_object_file_with_flags(&ref->old_oid,
-							OBJECT_INFO_QUICK) &&
+			    !has_object_file_with_flags(&ref->old_oid, quick_flags) &&
 			    !oidset_contains(&fetch_oids, &ref->old_oid) &&
-			    !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
+			    !has_object_file_with_flags(&item->oid, quick_flags) &&
 			    !oidset_contains(&fetch_oids, &item->oid))
 				clear_item(item);
 			item = NULL;
@@ -367,7 +388,7 @@ static void find_non_local_tags(const struct ref *refs,
 		 * fetch.
 		 */
 		if (item &&
-		    !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
+		    !has_object_file_with_flags(&item->oid, quick_flags) &&
 		    !oidset_contains(&fetch_oids, &item->oid))
 			clear_item(item);
 
@@ -381,14 +402,14 @@ static void find_non_local_tags(const struct ref *refs,
 		item = refname_hash_add(&remote_refs, ref->name, &ref->old_oid);
 		string_list_insert(&remote_refs_list, ref->name);
 	}
-	hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent);
+	hashmap_clear_and_free(&existing_refs, struct refname_hash_entry, ent);
 
 	/*
 	 * We may have a final lightweight tag that needs to be
 	 * checked to see if it needs fetching.
 	 */
 	if (item &&
-	    !has_object_file_with_flags(&item->oid, OBJECT_INFO_QUICK) &&
+	    !has_object_file_with_flags(&item->oid, quick_flags) &&
 	    !oidset_contains(&fetch_oids, &item->oid))
 		clear_item(item);
 
@@ -416,11 +437,61 @@ static void find_non_local_tags(const struct ref *refs,
 		**tail = rm;
 		*tail = &rm->next;
 	}
-	hashmap_free_entries(&remote_refs, struct refname_hash_entry, ent);
+	hashmap_clear_and_free(&remote_refs, struct refname_hash_entry, ent);
 	string_list_clear(&remote_refs_list, 0);
 	oidset_clear(&fetch_oids);
 }
 
+static void filter_prefetch_refspec(struct refspec *rs)
+{
+	int i;
+
+	if (!prefetch)
+		return;
+
+	for (i = 0; i < rs->nr; i++) {
+		struct strbuf new_dst = STRBUF_INIT;
+		char *old_dst;
+		const char *sub = NULL;
+
+		if (rs->items[i].negative)
+			continue;
+		if (!rs->items[i].dst ||
+		    (rs->items[i].src &&
+		     !strncmp(rs->items[i].src, "refs/tags/", 10))) {
+			int j;
+
+			free(rs->items[i].src);
+			free(rs->items[i].dst);
+
+			for (j = i + 1; j < rs->nr; j++) {
+				rs->items[j - 1] = rs->items[j];
+				rs->raw[j - 1] = rs->raw[j];
+			}
+			rs->nr--;
+			i--;
+			continue;
+		}
+
+		old_dst = rs->items[i].dst;
+		strbuf_addstr(&new_dst, "refs/prefetch/");
+
+		/*
+		 * If old_dst starts with "refs/", then place
+		 * sub after that prefix. Otherwise, start at
+		 * the beginning of the string.
+		 */
+		if (!skip_prefix(old_dst, "refs/", &sub))
+			sub = old_dst;
+		strbuf_addstr(&new_dst, sub);
+
+		rs->items[i].dst = strbuf_detach(&new_dst, NULL);
+		rs->items[i].force = 1;
+
+		free(old_dst);
+	}
+}
+
 static struct ref *get_ref_map(struct remote *remote,
 			       const struct ref *remote_refs,
 			       struct refspec *rs,
@@ -435,6 +506,11 @@ static struct ref *get_ref_map(struct remote *remote,
 	struct ref *orefs = NULL, **oref_tail = &orefs;
 
 	struct hashmap existing_refs;
+	int existing_refs_populated = 0;
+
+	filter_prefetch_refspec(rs);
+	if (remote)
+		filter_prefetch_refspec(&remote->fetch);
 
 	if (rs->nr) {
 		struct refspec *fetch_refspec;
@@ -504,7 +580,7 @@ static struct ref *get_ref_map(struct remote *remote,
 			if (has_merge &&
 			    !strcmp(branch->remote_name, remote->name))
 				add_merge_config(&ref_map, remote_refs, branch, &tail);
-		} else {
+		} else if (!prefetch) {
 			ref_map = get_remote_ref(remote_refs, "HEAD");
 			if (!ref_map)
 				die(_("Couldn't find remote ref HEAD"));
@@ -526,10 +602,17 @@ static struct ref *get_ref_map(struct remote *remote,
 		tail = &rm->next;
 	}
 
-	ref_map = ref_remove_duplicates(ref_map);
+	/*
+	 * apply negative refspecs first, before we remove duplicates. This is
+	 * necessary as negative refspecs might remove an otherwise conflicting
+	 * duplicate.
+	 */
+	if (rs->nr)
+		ref_map = apply_negative_refspecs(ref_map, rs);
+	else
+		ref_map = apply_negative_refspecs(ref_map, &remote->fetch);
 
-	refname_hash_init(&existing_refs);
-	for_each_ref(add_one_refname, &existing_refs);
+	ref_map = ref_remove_duplicates(ref_map);
 
 	for (rm = ref_map; rm; rm = rm->next) {
 		if (rm->peer_ref) {
@@ -537,6 +620,12 @@ static struct ref *get_ref_map(struct remote *remote,
 			struct refname_hash_entry *peer_item;
 			unsigned int hash = strhash(refname);
 
+			if (!existing_refs_populated) {
+				refname_hash_init(&existing_refs);
+				for_each_ref(add_one_refname, &existing_refs);
+				existing_refs_populated = 1;
+			}
+
 			peer_item = hashmap_get_entry_from_hash(&existing_refs,
 						hash, refname,
 						struct refname_hash_entry, ent);
@@ -546,7 +635,8 @@ static struct ref *get_ref_map(struct remote *remote,
 			}
 		}
 	}
-	hashmap_free_entries(&existing_refs, struct refname_hash_entry, ent);
+	if (existing_refs_populated)
+		hashmap_clear_and_free(&existing_refs, struct refname_hash_entry, ent);
 
 	return ref_map;
 }
@@ -556,13 +646,14 @@ static struct ref *get_ref_map(struct remote *remote,
 
 static int s_update_ref(const char *action,
 			struct ref *ref,
+			struct ref_transaction *transaction,
 			int check_old)
 {
 	char *msg;
 	char *rla = getenv("GIT_REFLOG_ACTION");
-	struct ref_transaction *transaction;
+	struct ref_transaction *our_transaction = NULL;
 	struct strbuf err = STRBUF_INIT;
-	int ret, df_conflict = 0;
+	int ret;
 
 	if (dry_run)
 		return 0;
@@ -570,31 +661,47 @@ static int s_update_ref(const char *action,
 		rla = default_rla.buf;
 	msg = xstrfmt("%s: %s", rla, action);
 
-	transaction = ref_transaction_begin(&err);
-	if (!transaction ||
-	    ref_transaction_update(transaction, ref->name,
-				   &ref->new_oid,
-				   check_old ? &ref->old_oid : NULL,
-				   0, msg, &err))
-		goto fail;
+	/*
+	 * If no transaction was passed to us, we manage the transaction
+	 * ourselves. Otherwise, we trust the caller to handle the transaction
+	 * lifecycle.
+	 */
+	if (!transaction) {
+		transaction = our_transaction = ref_transaction_begin(&err);
+		if (!transaction) {
+			ret = STORE_REF_ERROR_OTHER;
+			goto out;
+		}
+	}
 
-	ret = ref_transaction_commit(transaction, &err);
+	ret = ref_transaction_update(transaction, ref->name, &ref->new_oid,
+				     check_old ? &ref->old_oid : NULL,
+				     0, msg, &err);
 	if (ret) {
-		df_conflict = (ret == TRANSACTION_NAME_CONFLICT);
-		goto fail;
+		ret = STORE_REF_ERROR_OTHER;
+		goto out;
 	}
 
-	ref_transaction_free(transaction);
-	strbuf_release(&err);
-	free(msg);
-	return 0;
-fail:
-	ref_transaction_free(transaction);
-	error("%s", err.buf);
+	if (our_transaction) {
+		switch (ref_transaction_commit(our_transaction, &err)) {
+		case 0:
+			break;
+		case TRANSACTION_NAME_CONFLICT:
+			ret = STORE_REF_ERROR_DF_CONFLICT;
+			goto out;
+		default:
+			ret = STORE_REF_ERROR_OTHER;
+			goto out;
+		}
+	}
+
+out:
+	ref_transaction_free(our_transaction);
+	if (ret)
+		error("%s", err.buf);
 	strbuf_release(&err);
 	free(msg);
-	return df_conflict ? STORE_REF_ERROR_DF_CONFLICT
-			   : STORE_REF_ERROR_OTHER;
+	return ret;
 }
 
 static int refcol_width = 10;
@@ -605,7 +712,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();
@@ -641,7 +748,10 @@ static void prepare_format_display(struct ref *ref_map)
 	struct ref *rm;
 	const char *format = "full";
 
-	git_config_get_string_const("fetch.output", &format);
+	if (verbosity < 0)
+		return;
+
+	git_config_get_string_tmp("fetch.output", &format);
 	if (!strcasecmp(format, "full"))
 		compact_format = 0;
 	else if (!strcasecmp(format, "compact"))
@@ -720,7 +830,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)
@@ -732,6 +847,7 @@ 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,
@@ -772,7 +888,7 @@ static int update_local_ref(struct ref *ref,
 	    starts_with(ref->name, "refs/tags/")) {
 		if (force || ref->force) {
 			int r;
-			r = s_update_ref("updating tag", ref, 0);
+			r = s_update_ref("updating tag", ref, transaction, 0);
 			format_display(display, r ? '!' : 't', _("[tag update]"),
 				       r ? _("unable to update local ref") : NULL,
 				       remote, pretty_ref, summary_width);
@@ -809,7 +925,7 @@ static int update_local_ref(struct ref *ref,
 			what = _("[new ref]");
 		}
 
-		r = s_update_ref(msg, ref, 0);
+		r = s_update_ref(msg, ref, transaction, 0);
 		format_display(display, r ? '!' : '*', what,
 			       r ? _("unable to update local ref") : NULL,
 			       remote, pretty_ref, summary_width);
@@ -831,7 +947,7 @@ static int update_local_ref(struct ref *ref,
 		strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
 		strbuf_addstr(&quickref, "..");
 		strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
-		r = s_update_ref("fast-forward", ref, 1);
+		r = s_update_ref("fast-forward", ref, transaction, 1);
 		format_display(display, r ? '!' : ' ', quickref.buf,
 			       r ? _("unable to update local ref") : NULL,
 			       remote, pretty_ref, summary_width);
@@ -843,7 +959,7 @@ static int update_local_ref(struct ref *ref,
 		strbuf_add_unique_abbrev(&quickref, &current->object.oid, DEFAULT_ABBREV);
 		strbuf_addstr(&quickref, "...");
 		strbuf_add_unique_abbrev(&quickref, &ref->new_oid, DEFAULT_ABBREV);
-		r = s_update_ref("forced-update", ref, 1);
+		r = s_update_ref("forced-update", ref, transaction, 1);
 		format_display(display, r ? '!' : '+', quickref.buf,
 			       r ? _("unable to update local ref") : _("forced update"),
 			       remote, pretty_ref, summary_width);
@@ -870,6 +986,89 @@ static int iterate_ref_map(void *cb_data, struct object_id *oid)
 	return 0;
 }
 
+struct fetch_head {
+	FILE *fp;
+	struct strbuf buf;
+};
+
+static int open_fetch_head(struct fetch_head *fetch_head)
+{
+	const char *filename = git_path_fetch_head(the_repository);
+
+	if (write_fetch_head) {
+		fetch_head->fp = fopen(filename, "a");
+		if (!fetch_head->fp)
+			return error_errno(_("cannot open %s"), filename);
+		strbuf_init(&fetch_head->buf, 0);
+	} else {
+		fetch_head->fp = NULL;
+	}
+
+	return 0;
+}
+
+static void append_fetch_head(struct fetch_head *fetch_head,
+			      const struct object_id *old_oid,
+			      enum fetch_head_status fetch_head_status,
+			      const char *note,
+			      const char *url, size_t url_len)
+{
+	char old_oid_hex[GIT_MAX_HEXSZ + 1];
+	const char *merge_status_marker;
+	size_t i;
+
+	if (!fetch_head->fp)
+		return;
+
+	switch (fetch_head_status) {
+	case FETCH_HEAD_NOT_FOR_MERGE:
+		merge_status_marker = "not-for-merge";
+		break;
+	case FETCH_HEAD_MERGE:
+		merge_status_marker = "";
+		break;
+	default:
+		/* do not write anything to FETCH_HEAD */
+		return;
+	}
+
+	strbuf_addf(&fetch_head->buf, "%s\t%s\t%s",
+		    oid_to_hex_r(old_oid_hex, old_oid), merge_status_marker, note);
+	for (i = 0; i < url_len; ++i)
+		if ('\n' == url[i])
+			strbuf_addstr(&fetch_head->buf, "\\n");
+		else
+			strbuf_addch(&fetch_head->buf, url[i]);
+	strbuf_addch(&fetch_head->buf, '\n');
+
+	/*
+	 * When using an atomic fetch, we do not want to update FETCH_HEAD if
+	 * any of the reference updates fails. We thus have to write all
+	 * updates to a buffer first and only commit it as soon as all
+	 * references have been successfully updated.
+	 */
+	if (!atomic_fetch) {
+		strbuf_write(&fetch_head->buf, fetch_head->fp);
+		strbuf_reset(&fetch_head->buf);
+	}
+}
+
+static void commit_fetch_head(struct fetch_head *fetch_head)
+{
+	if (!fetch_head->fp || !atomic_fetch)
+		return;
+	strbuf_write(&fetch_head->buf, fetch_head->fp);
+}
+
+static void close_fetch_head(struct fetch_head *fetch_head)
+{
+	if (!fetch_head->fp)
+		return;
+
+	fclose(fetch_head->fp);
+	strbuf_release(&fetch_head->buf);
+}
+
 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"
@@ -882,20 +1081,20 @@ N_("It took %.2f seconds to check forced updates. You can use\n"
 static int store_updated_refs(const char *raw_url, const char *remote_name,
 			      int connectivity_checked, struct ref *ref_map)
 {
-	FILE *fp;
+	struct fetch_head fetch_head;
 	struct commit *commit;
 	int url_len, i, rc = 0;
-	struct strbuf note = STRBUF_INIT;
+	struct strbuf note = STRBUF_INIT, err = STRBUF_INIT;
+	struct ref_transaction *transaction = NULL;
 	const char *what, *kind;
 	struct ref *rm;
 	char *url;
-	const char *filename = dry_run ? "/dev/null" : git_path_fetch_head(the_repository);
 	int want_status;
 	int summary_width = transport_summary_width(ref_map);
 
-	fp = fopen(filename, "a");
-	if (!fp)
-		return error_errno(_("cannot open %s"), filename);
+	rc = open_fetch_head(&fetch_head);
+	if (rc)
+		return -1;
 
 	if (raw_url)
 		url = transport_anonymize_url(raw_url);
@@ -903,13 +1102,23 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 		url = xstrdup("foreign");
 
 	if (!connectivity_checked) {
+		struct check_connected_options opt = CHECK_CONNECTED_INIT;
+
 		rm = ref_map;
-		if (check_connected(iterate_ref_map, &rm, NULL)) {
+		if (check_connected(iterate_ref_map, &rm, &opt)) {
 			rc = error(_("%s did not send all necessary objects\n"), url);
 			goto abort;
 		}
 	}
 
+	if (atomic_fetch) {
+		transaction = ref_transaction_begin(&err);
+		if (!transaction) {
+			error("%s", err.buf);
+			goto abort;
+		}
+	}
+
 	prepare_format_display(ref_map);
 
 	/*
@@ -922,11 +1131,10 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 	     want_status++) {
 		for (rm = ref_map; rm; rm = rm->next) {
 			struct ref *ref = NULL;
-			const char *merge_status_marker = "";
 
 			if (rm->status == REF_STATUS_REJECT_SHALLOW) {
 				if (want_status == FETCH_HEAD_MERGE)
-					warning(_("reject %s because shallow roots are not allowed to be updated"),
+					warning(_("rejected %s because shallow roots are not allowed to be updated"),
 						rm->peer_ref ? rm->peer_ref->name : rm->name);
 				continue;
 			}
@@ -947,25 +1155,21 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 				ref->force = rm->peer_ref->force;
 			}
 
-			if (recurse_submodules != RECURSE_SUBMODULES_OFF)
+			if (recurse_submodules != RECURSE_SUBMODULES_OFF &&
+			    (!rm->peer_ref || !oideq(&ref->old_oid, &ref->new_oid))) {
 				check_for_new_submodule_commits(&rm->old_oid);
+			}
 
 			if (!strcmp(rm->name, "HEAD")) {
 				kind = "";
 				what = "";
 			}
-			else if (starts_with(rm->name, "refs/heads/")) {
+			else if (skip_prefix(rm->name, "refs/heads/", &what))
 				kind = "branch";
-				what = rm->name + 11;
-			}
-			else if (starts_with(rm->name, "refs/tags/")) {
+			else if (skip_prefix(rm->name, "refs/tags/", &what))
 				kind = "tag";
-				what = rm->name + 10;
-			}
-			else if (starts_with(rm->name, "refs/remotes/")) {
+			else if (skip_prefix(rm->name, "refs/remotes/", &what))
 				kind = "remote-tracking branch";
-				what = rm->name + 13;
-			}
 			else {
 				kind = "";
 				what = rm->name;
@@ -984,49 +1188,49 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 					strbuf_addf(&note, "%s ", kind);
 				strbuf_addf(&note, "'%s' of ", what);
 			}
-			switch (rm->fetch_head_status) {
-			case FETCH_HEAD_NOT_FOR_MERGE:
-				merge_status_marker = "not-for-merge";
-				/* fall-through */
-			case FETCH_HEAD_MERGE:
-				fprintf(fp, "%s\t%s\t%s",
-					oid_to_hex(&rm->old_oid),
-					merge_status_marker,
-					note.buf);
-				for (i = 0; i < url_len; ++i)
-					if ('\n' == url[i])
-						fputs("\\n", fp);
-					else
-						fputc(url[i], fp);
-				fputc('\n', fp);
-				break;
-			default:
-				/* do not write anything to FETCH_HEAD */
-				break;
-			}
+
+			append_fetch_head(&fetch_head, &rm->old_oid,
+					  rm->fetch_head_status,
+					  note.buf, url, url_len);
 
 			strbuf_reset(&note);
 			if (ref) {
-				rc |= update_local_ref(ref, what, rm, &note,
-						       summary_width);
+				rc |= update_local_ref(ref, transaction, what,
+						       rm, &note, summary_width);
 				free(ref);
-			} else
+			} else if (write_fetch_head || dry_run) {
+				/*
+				 * Display fetches written to FETCH_HEAD (or
+				 * would be written to FETCH_HEAD, if --dry-run
+				 * is set).
+				 */
 				format_display(&note, '*',
 					       *kind ? kind : "branch", NULL,
 					       *what ? what : "HEAD",
 					       "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);
 			}
 		}
 	}
 
+	if (!rc && transaction) {
+		rc = ref_transaction_commit(transaction, &err);
+		if (rc) {
+			error("%s", err.buf);
+			goto abort;
+		}
+	}
+
+	if (!rc)
+		commit_fetch_head(&fetch_head);
+
 	if (rc & STORE_REF_ERROR_DF_CONFLICT)
 		error(_("some local refs could not be updated; try running\n"
 		      " 'git remote prune %s' to remove any old, conflicting "
@@ -1043,8 +1247,10 @@ static int store_updated_refs(const char *raw_url, const char *remote_name,
 
  abort:
 	strbuf_release(&note);
+	strbuf_release(&err);
+	ref_transaction_free(transaction);
 	free(url);
-	fclose(fp);
+	close_fetch_head(&fetch_head);
 	return rc;
 }
 
@@ -1074,7 +1280,8 @@ static int check_exist_and_connected(struct ref *ref_map)
 	 * we need all direct targets to exist.
 	 */
 	for (r = rm; r; r = r->next) {
-		if (!has_object_file(&r->old_oid))
+		if (!has_object_file_with_flags(&r->old_oid,
+						OBJECT_INFO_SKIP_FETCH_OBJECT))
 			return -1;
 	}
 
@@ -1228,7 +1435,9 @@ 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;
 		}
@@ -1315,7 +1524,8 @@ static int do_fetch(struct transport *transport,
 	int autotags = (transport->remote->fetch_tags == 1);
 	int retcode = 0;
 	const struct ref *remote_refs;
-	struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
+	struct transport_ls_refs_options transport_ls_refs_options =
+		TRANSPORT_LS_REFS_OPTIONS_INIT;
 	int must_list_refs = 1;
 
 	if (tags == TAGS_DEFAULT) {
@@ -1326,7 +1536,7 @@ static int do_fetch(struct transport *transport,
 	}
 
 	/* if not appending, truncate FETCH_HEAD */
-	if (!append && !dry_run) {
+	if (!append && write_fetch_head) {
 		retcode = truncate_fetch_head();
 		if (retcode)
 			goto cleanup;
@@ -1335,7 +1545,7 @@ static int do_fetch(struct transport *transport,
 	if (rs->nr) {
 		int i;
 
-		refspec_ref_prefixes(rs, &ref_prefixes);
+		refspec_ref_prefixes(rs, &transport_ls_refs_options.ref_prefixes);
 
 		/*
 		 * We can avoid listing refs if all of them are exact
@@ -1349,22 +1559,25 @@ static int do_fetch(struct transport *transport,
 			}
 		}
 	} else if (transport->remote && transport->remote->fetch.nr)
-		refspec_ref_prefixes(&transport->remote->fetch, &ref_prefixes);
+		refspec_ref_prefixes(&transport->remote->fetch,
+				     &transport_ls_refs_options.ref_prefixes);
 
 	if (tags == TAGS_SET || tags == TAGS_DEFAULT) {
 		must_list_refs = 1;
-		if (ref_prefixes.argc)
-			argv_array_push(&ref_prefixes, "refs/tags/");
+		if (transport_ls_refs_options.ref_prefixes.nr)
+			strvec_push(&transport_ls_refs_options.ref_prefixes,
+				    "refs/tags/");
 	}
 
 	if (must_list_refs) {
 		trace2_region_enter("fetch", "remote_refs", the_repository);
-		remote_refs = transport_get_remote_refs(transport, &ref_prefixes);
+		remote_refs = transport_get_remote_refs(transport,
+							&transport_ls_refs_options);
 		trace2_region_leave("fetch", "remote_refs", the_repository);
 	} else
 		remote_refs = NULL;
 
-	argv_array_clear(&ref_prefixes);
+	strvec_clear(&transport_ls_refs_options.ref_prefixes);
 
 	ref_map = get_ref_map(transport->remote, remote_refs, rs,
 			      tags, &autotags);
@@ -1400,7 +1613,7 @@ static int do_fetch(struct transport *transport,
 
 		/*
 		 * We're setting the upstream configuration for the
-		 * current branch. The relevent upstream is the
+		 * current branch. The relevant upstream is the
 		 * fetched branch that is meant to be merged with the
 		 * current one, i.e. the one fetched to FETCH_HEAD.
 		 *
@@ -1411,7 +1624,7 @@ static int do_fetch(struct transport *transport,
 		for (rm = ref_map; rm; rm = rm->next) {
 			if (!rm->peer_ref) {
 				if (source_ref) {
-					warning(_("multiple branch detected, incompatible with --set-upstream"));
+					warning(_("multiple branches detected, incompatible with --set-upstream"));
 					goto skip;
 				} else {
 					source_ref = rm;
@@ -1502,35 +1715,38 @@ static int add_remote_or_group(const char *name, struct string_list *list)
 	return 1;
 }
 
-static void add_options_to_argv(struct argv_array *argv)
+static void add_options_to_argv(struct strvec *argv)
 {
 	if (dry_run)
-		argv_array_push(argv, "--dry-run");
+		strvec_push(argv, "--dry-run");
 	if (prune != -1)
-		argv_array_push(argv, prune ? "--prune" : "--no-prune");
+		strvec_push(argv, prune ? "--prune" : "--no-prune");
 	if (prune_tags != -1)
-		argv_array_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
+		strvec_push(argv, prune_tags ? "--prune-tags" : "--no-prune-tags");
 	if (update_head_ok)
-		argv_array_push(argv, "--update-head-ok");
+		strvec_push(argv, "--update-head-ok");
 	if (force)
-		argv_array_push(argv, "--force");
+		strvec_push(argv, "--force");
 	if (keep)
-		argv_array_push(argv, "--keep");
+		strvec_push(argv, "--keep");
 	if (recurse_submodules == RECURSE_SUBMODULES_ON)
-		argv_array_push(argv, "--recurse-submodules");
+		strvec_push(argv, "--recurse-submodules");
 	else if (recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND)
-		argv_array_push(argv, "--recurse-submodules=on-demand");
+		strvec_push(argv, "--recurse-submodules=on-demand");
 	if (tags == TAGS_SET)
-		argv_array_push(argv, "--tags");
+		strvec_push(argv, "--tags");
 	else if (tags == TAGS_UNSET)
-		argv_array_push(argv, "--no-tags");
+		strvec_push(argv, "--no-tags");
 	if (verbosity >= 2)
-		argv_array_push(argv, "-v");
+		strvec_push(argv, "-v");
 	if (verbosity >= 1)
-		argv_array_push(argv, "-v");
+		strvec_push(argv, "-v");
 	else if (verbosity < 0)
-		argv_array_push(argv, "-q");
-
+		strvec_push(argv, "-q");
+	if (family == TRANSPORT_FAMILY_IPV4)
+		strvec_push(argv, "--ipv4");
+	else if (family == TRANSPORT_FAMILY_IPV6)
+		strvec_push(argv, "--ipv6");
 }
 
 /* Fetch multiple remotes in parallel */
@@ -1553,8 +1769,8 @@ static int fetch_next_remote(struct child_process *cp, struct strbuf *out,
 	remote = state->remotes->items[state->next++].string;
 	*task_cb = remote;
 
-	argv_array_pushv(&cp->args, state->argv);
-	argv_array_push(&cp->args, remote);
+	strvec_pushv(&cp->args, state->argv);
+	strvec_push(&cp->args, remote);
 	cp->git_cmd = 1;
 
 	if (verbosity >= 0)
@@ -1591,21 +1807,22 @@ static int fetch_finished(int result, struct strbuf *out,
 static int fetch_multiple(struct string_list *list, int max_children)
 {
 	int i, result = 0;
-	struct argv_array argv = ARGV_ARRAY_INIT;
+	struct strvec argv = STRVEC_INIT;
 
-	if (!append && !dry_run) {
+	if (!append && write_fetch_head) {
 		int errcode = truncate_fetch_head();
 		if (errcode)
 			return errcode;
 	}
 
-	argv_array_pushl(&argv, "fetch", "--append", "--no-auto-gc", NULL);
+	strvec_pushl(&argv, "fetch", "--append", "--no-auto-gc",
+		     "--no-write-commit-graph", NULL);
 	add_options_to_argv(&argv);
 
 	if (max_children != 1 && list->nr != 1) {
-		struct parallel_fetch_state state = { argv.argv, list, 0, 0 };
+		struct parallel_fetch_state state = { argv.v, list, 0, 0 };
 
-		argv_array_push(&argv, "--end-of-options");
+		strvec_push(&argv, "--end-of-options");
 		result = run_processes_parallel_tr2(max_children,
 						    &fetch_next_remote,
 						    &fetch_failed_to_start,
@@ -1618,17 +1835,17 @@ static int fetch_multiple(struct string_list *list, int max_children)
 	} else
 		for (i = 0; i < list->nr; i++) {
 			const char *name = list->items[i].string;
-			argv_array_push(&argv, name);
+			strvec_push(&argv, name);
 			if (verbosity >= 0)
 				printf(_("Fetching %s\n"), name);
-			if (run_command_v_opt(argv.argv, RUN_GIT_CMD)) {
+			if (run_command_v_opt(argv.v, RUN_GIT_CMD)) {
 				error(_("Could not fetch %s"), name);
 				result = 1;
 			}
-			argv_array_pop(&argv);
+			strvec_pop(&argv);
 		}
 
-	argv_array_clear(&argv);
+	strvec_clear(&argv);
 	return !!result;
 }
 
@@ -1656,7 +1873,7 @@ static inline void fetch_one_setup_partial(struct remote *remote)
 	 * If this is a partial-fetch request, we enable partial on
 	 * this repo if not already enabled and remember the given
 	 * filter-spec as the default for subsequent fetches to this
-	 * remote.
+	 * remote if there is currently no default filter-spec.
 	 */
 	if (filter_options.choice) {
 		partial_clone_register(remote->name, &filter_options);
@@ -1673,7 +1890,8 @@ static inline void fetch_one_setup_partial(struct remote *remote)
 	return;
 }
 
-static int fetch_one(struct remote *remote, int argc, const char **argv, int prune_tags_ok)
+static int fetch_one(struct remote *remote, int argc, const char **argv,
+		     int prune_tags_ok, int use_stdin_refspecs)
 {
 	struct refspec rs = REFSPEC_INIT_FETCH;
 	int i;
@@ -1716,20 +1934,24 @@ static int fetch_one(struct remote *remote, int argc, const char **argv, int pru
 
 	for (i = 0; i < argc; i++) {
 		if (!strcmp(argv[i], "tag")) {
-			char *tag;
 			i++;
 			if (i >= argc)
 				die(_("You need to specify a tag name."));
 
-			tag = xstrfmt("refs/tags/%s:refs/tags/%s",
-				      argv[i], argv[i]);
-			refspec_append(&rs, tag);
-			free(tag);
+			refspec_appendf(&rs, "refs/tags/%s:refs/tags/%s",
+					argv[i], argv[i]);
 		} else {
 			refspec_append(&rs, argv[i]);
 		}
 	}
 
+	if (use_stdin_refspecs) {
+		struct strbuf line = STRBUF_INIT;
+		while (strbuf_getline_lf(&line, stdin) != EOF)
+			refspec_append(&rs, line.buf);
+		strbuf_release(&line);
+	}
+
 	if (server_options.nr)
 		gtransport->server_options = &server_options;
 
@@ -1751,21 +1973,34 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	struct remote *remote = NULL;
 	int result = 0;
 	int prune_tags_ok = 1;
-	struct argv_array argv_gc_auto = ARGV_ARRAY_INIT;
 
 	packet_trace_identity("fetch");
 
 	/* Record the command line for the reflog */
 	strbuf_addstr(&default_rla, "fetch");
-	for (i = 1; i < argc; i++)
-		strbuf_addf(&default_rla, " %s", argv[i]);
+	for (i = 1; i < argc; i++) {
+		/* This handles non-URLs gracefully */
+		char *anon = transport_anonymize_url(argv[i]);
+
+		strbuf_addf(&default_rla, " %s", anon);
+		free(anon);
+	}
 
-	fetch_config_from_gitmodules(&submodule_fetch_jobs_config,
-				     &recurse_submodules);
 	git_config(git_fetch_config, NULL);
 
 	argc = parse_options(argc, argv, prefix,
 			     builtin_fetch_options, builtin_fetch_usage, 0);
+	if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
+		int *sfjc = submodule_fetch_jobs_config == -1
+			    ? &submodule_fetch_jobs_config : NULL;
+		int *rs = recurse_submodules == RECURSE_SUBMODULES_DEFAULT
+			  ? &recurse_submodules : NULL;
+
+		fetch_config_from_gitmodules(sfjc, rs);
+	}
+
+	if (negotiate_only && !negotiation_tip.nr)
+		die(_("--negotiate-only needs one or more --negotiate-tip=*"));
 
 	if (deepen_relative) {
 		if (deepen_relative < 0)
@@ -1789,8 +2024,9 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	if (depth || deepen_since || deepen_not.nr)
 		deepen = 1;
 
-	if (filter_options.choice && !has_promisor_remote())
-		die("--filter can only be used when extensions.partialClone is set");
+	/* FETCH_HEAD never gets updated in --dry-run mode */
+	if (dry_run)
+		write_fetch_head = 0;
 
 	if (all) {
 		if (argc == 1)
@@ -1822,12 +2058,32 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 		}
 	}
 
-	fetch_if_missing = 0;
+	if (negotiate_only) {
+		struct oidset acked_commits = OIDSET_INIT;
+		struct oidset_iter iter;
+		const struct object_id *oid;
 
-	if (remote) {
+		if (!remote)
+			die(_("must supply remote when using --negotiate-only"));
+		gtransport = prepare_transport(remote, 1);
+		if (gtransport->smart_options) {
+			gtransport->smart_options->acked_commits = &acked_commits;
+		} else {
+			warning(_("Protocol does not support --negotiate-only, exiting."));
+			return 1;
+		}
+		if (server_options.nr)
+			gtransport->server_options = &server_options;
+		result = transport_fetch_refs(gtransport, NULL);
+
+		oidset_iter_init(&acked_commits, &iter);
+		while ((oid = oidset_iter_next(&iter)))
+			printf("%s\n", oid_to_hex(oid));
+		oidset_clear(&acked_commits);
+	} else if (remote) {
 		if (filter_options.choice || has_promisor_remote())
 			fetch_one_setup_partial(remote);
-		result = fetch_one(remote, argc, argv, prune_tags_ok);
+		result = fetch_one(remote, argc, argv, prune_tags_ok, stdin_refspecs);
 	} else {
 		int max_children = max_jobs;
 
@@ -1835,6 +2091,14 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 			die(_("--filter can only be used with the remote "
 			      "configured in extensions.partialclone"));
 
+		if (atomic_fetch)
+			die(_("--atomic can only be used when fetching "
+			      "from one remote"));
+
+		if (stdin_refspecs)
+			die(_("--stdin can only be used when fetching "
+			      "from one remote"));
+
 		if (max_children < 0)
 			max_children = fetch_parallel_config;
 
@@ -1843,7 +2107,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 	}
 
 	if (!result && (recurse_submodules != RECURSE_SUBMODULES_OFF)) {
-		struct argv_array options = ARGV_ARRAY_INIT;
+		struct strvec options = STRVEC_INIT;
 		int max_children = max_jobs;
 
 		if (max_children < 0)
@@ -1859,34 +2123,29 @@ int cmd_fetch(int argc, const char **argv, const char *prefix)
 						    recurse_submodules_default,
 						    verbosity < 0,
 						    max_children);
-		argv_array_clear(&options);
+		strvec_clear(&options);
 	}
 
 	string_list_clear(&list, 0);
 
 	prepare_repo_settings(the_repository);
-	if (the_repository->settings.fetch_write_commit_graph) {
+	if (fetch_write_commit_graph > 0 ||
+	    (fetch_write_commit_graph < 0 &&
+	     the_repository->settings.fetch_write_commit_graph)) {
 		int commit_graph_flags = COMMIT_GRAPH_WRITE_SPLIT;
-		struct split_commit_graph_opts split_opts;
-		memset(&split_opts, 0, sizeof(struct split_commit_graph_opts));
 
 		if (progress)
 			commit_graph_flags |= COMMIT_GRAPH_WRITE_PROGRESS;
 
-		write_commit_graph_reachable(get_object_directory(),
+		write_commit_graph_reachable(the_repository->objects->odb,
 					     commit_graph_flags,
-					     &split_opts);
+					     NULL);
 	}
 
 	close_object_store(the_repository->objects);
 
-	if (enable_auto_gc) {
-		argv_array_pushl(&argv_gc_auto, "gc", "--auto", NULL);
-		if (verbosity < 0)
-			argv_array_push(&argv_gc_auto, "--quiet");
-		run_command_v_opt(argv_gc_auto.argv, RUN_GIT_CMD);
-		argv_array_clear(&argv_gc_auto);
-	}
+	if (enable_auto_gc)
+		run_auto_maintenance(verbosity < 0);
 
 	return result;
 }
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index a4615587fd..48a8699de7 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -1,667 +1,13 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
-#include "refs.h"
-#include "object-store.h"
-#include "commit.h"
-#include "diff.h"
-#include "revision.h"
-#include "tag.h"
-#include "string-list.h"
-#include "branch.h"
 #include "fmt-merge-msg.h"
-#include "gpg-interface.h"
-#include "repository.h"
-#include "commit-reach.h"
+#include "parse-options.h"
 
 static const char * const fmt_merge_msg_usage[] = {
 	N_("git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"),
 	NULL
 };
 
-static int use_branch_desc;
-
-int fmt_merge_msg_config(const char *key, const char *value, void *cb)
-{
-	if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
-		int is_bool;
-		merge_log_config = git_config_bool_or_int(key, value, &is_bool);
-		if (!is_bool && merge_log_config < 0)
-			return error("%s: negative length %s", key, value);
-		if (is_bool && merge_log_config)
-			merge_log_config = DEFAULT_MERGE_LOG_LEN;
-	} else if (!strcmp(key, "merge.branchdesc")) {
-		use_branch_desc = git_config_bool(key, value);
-	} else {
-		return git_default_config(key, value, cb);
-	}
-	return 0;
-}
-
-/* merge data per repository where the merged tips came from */
-struct src_data {
-	struct string_list branch, tag, r_branch, generic;
-	int head_status;
-};
-
-struct origin_data {
-	struct object_id oid;
-	unsigned is_local_branch:1;
-};
-
-static void init_src_data(struct src_data *data)
-{
-	data->branch.strdup_strings = 1;
-	data->tag.strdup_strings = 1;
-	data->r_branch.strdup_strings = 1;
-	data->generic.strdup_strings = 1;
-}
-
-static struct string_list srcs = STRING_LIST_INIT_DUP;
-static struct string_list origins = STRING_LIST_INIT_DUP;
-
-struct merge_parents {
-	int alloc, nr;
-	struct merge_parent {
-		struct object_id given;
-		struct object_id commit;
-		unsigned char used;
-	} *item;
-};
-
-/*
- * I know, I know, this is inefficient, but you won't be pulling and merging
- * hundreds of heads at a time anyway.
- */
-static struct merge_parent *find_merge_parent(struct merge_parents *table,
-					      struct object_id *given,
-					      struct object_id *commit)
-{
-	int i;
-	for (i = 0; i < table->nr; i++) {
-		if (given && !oideq(&table->item[i].given, given))
-			continue;
-		if (commit && !oideq(&table->item[i].commit, commit))
-			continue;
-		return &table->item[i];
-	}
-	return NULL;
-}
-
-static void add_merge_parent(struct merge_parents *table,
-			     struct object_id *given,
-			     struct object_id *commit)
-{
-	if (table->nr && find_merge_parent(table, given, commit))
-		return;
-	ALLOC_GROW(table->item, table->nr + 1, table->alloc);
-	oidcpy(&table->item[table->nr].given, given);
-	oidcpy(&table->item[table->nr].commit, commit);
-	table->item[table->nr].used = 0;
-	table->nr++;
-}
-
-static int handle_line(char *line, struct merge_parents *merge_parents)
-{
-	int i, len = strlen(line);
-	struct origin_data *origin_data;
-	char *src;
-	const char *origin;
-	struct src_data *src_data;
-	struct string_list_item *item;
-	int pulling_head = 0;
-	struct object_id oid;
-	const unsigned hexsz = the_hash_algo->hexsz;
-
-	if (len < hexsz + 3 || line[hexsz] != '\t')
-		return 1;
-
-	if (starts_with(line + hexsz + 1, "not-for-merge"))
-		return 0;
-
-	if (line[hexsz + 1] != '\t')
-		return 2;
-
-	i = get_oid_hex(line, &oid);
-	if (i)
-		return 3;
-
-	if (!find_merge_parent(merge_parents, &oid, NULL))
-		return 0; /* subsumed by other parents */
-
-	origin_data = xcalloc(1, sizeof(struct origin_data));
-	oidcpy(&origin_data->oid, &oid);
-
-	if (line[len - 1] == '\n')
-		line[len - 1] = 0;
-	line += hexsz + 2;
-
-	/*
-	 * At this point, line points at the beginning of comment e.g.
-	 * "branch 'frotz' of git://that/repository.git".
-	 * Find the repository name and point it with src.
-	 */
-	src = strstr(line, " of ");
-	if (src) {
-		*src = 0;
-		src += 4;
-		pulling_head = 0;
-	} else {
-		src = line;
-		pulling_head = 1;
-	}
-
-	item = unsorted_string_list_lookup(&srcs, src);
-	if (!item) {
-		item = string_list_append(&srcs, src);
-		item->util = xcalloc(1, sizeof(struct src_data));
-		init_src_data(item->util);
-	}
-	src_data = item->util;
-
-	if (pulling_head) {
-		origin = src;
-		src_data->head_status |= 1;
-	} else if (starts_with(line, "branch ")) {
-		origin_data->is_local_branch = 1;
-		origin = line + 7;
-		string_list_append(&src_data->branch, origin);
-		src_data->head_status |= 2;
-	} else if (starts_with(line, "tag ")) {
-		origin = line;
-		string_list_append(&src_data->tag, origin + 4);
-		src_data->head_status |= 2;
-	} else if (skip_prefix(line, "remote-tracking branch ", &origin)) {
-		string_list_append(&src_data->r_branch, origin);
-		src_data->head_status |= 2;
-	} else {
-		origin = src;
-		string_list_append(&src_data->generic, line);
-		src_data->head_status |= 2;
-	}
-
-	if (!strcmp(".", src) || !strcmp(src, origin)) {
-		int len = strlen(origin);
-		if (origin[0] == '\'' && origin[len - 1] == '\'')
-			origin = xmemdupz(origin + 1, len - 2);
-	} else
-		origin = xstrfmt("%s of %s", origin, src);
-	if (strcmp(".", src))
-		origin_data->is_local_branch = 0;
-	string_list_append(&origins, origin)->util = origin_data;
-	return 0;
-}
-
-static void print_joined(const char *singular, const char *plural,
-		struct string_list *list, struct strbuf *out)
-{
-	if (list->nr == 0)
-		return;
-	if (list->nr == 1) {
-		strbuf_addf(out, "%s%s", singular, list->items[0].string);
-	} else {
-		int i;
-		strbuf_addstr(out, plural);
-		for (i = 0; i < list->nr - 1; i++)
-			strbuf_addf(out, "%s%s", i > 0 ? ", " : "",
-				    list->items[i].string);
-		strbuf_addf(out, " and %s", list->items[list->nr - 1].string);
-	}
-}
-
-static void add_branch_desc(struct strbuf *out, const char *name)
-{
-	struct strbuf desc = STRBUF_INIT;
-
-	if (!read_branch_desc(&desc, name)) {
-		const char *bp = desc.buf;
-		while (*bp) {
-			const char *ep = strchrnul(bp, '\n');
-			if (*ep)
-				ep++;
-			strbuf_addf(out, "  : %.*s", (int)(ep - bp), bp);
-			bp = ep;
-		}
-		strbuf_complete_line(out);
-	}
-	strbuf_release(&desc);
-}
-
-#define util_as_integral(elem) ((intptr_t)((elem)->util))
-
-static void record_person_from_buf(int which, struct string_list *people,
-				   const char *buffer)
-{
-	char *name_buf, *name, *name_end;
-	struct string_list_item *elem;
-	const char *field;
-
-	field = (which == 'a') ? "\nauthor " : "\ncommitter ";
-	name = strstr(buffer, field);
-	if (!name)
-		return;
-	name += strlen(field);
-	name_end = strchrnul(name, '<');
-	if (*name_end)
-		name_end--;
-	while (isspace(*name_end) && name <= name_end)
-		name_end--;
-	if (name_end < name)
-		return;
-	name_buf = xmemdupz(name, name_end - name + 1);
-
-	elem = string_list_lookup(people, name_buf);
-	if (!elem) {
-		elem = string_list_insert(people, name_buf);
-		elem->util = (void *)0;
-	}
-	elem->util = (void*)(util_as_integral(elem) + 1);
-	free(name_buf);
-}
-
-
-static void record_person(int which, struct string_list *people,
-			  struct commit *commit)
-{
-	const char *buffer = get_commit_buffer(commit, NULL);
-	record_person_from_buf(which, people, buffer);
-	unuse_commit_buffer(commit, buffer);
-}
-
-static int cmp_string_list_util_as_integral(const void *a_, const void *b_)
-{
-	const struct string_list_item *a = a_, *b = b_;
-	return util_as_integral(b) - util_as_integral(a);
-}
-
-static void add_people_count(struct strbuf *out, struct string_list *people)
-{
-	if (people->nr == 1)
-		strbuf_addstr(out, people->items[0].string);
-	else if (people->nr == 2)
-		strbuf_addf(out, "%s (%d) and %s (%d)",
-			    people->items[0].string,
-			    (int)util_as_integral(&people->items[0]),
-			    people->items[1].string,
-			    (int)util_as_integral(&people->items[1]));
-	else if (people->nr)
-		strbuf_addf(out, "%s (%d) and others",
-			    people->items[0].string,
-			    (int)util_as_integral(&people->items[0]));
-}
-
-static void credit_people(struct strbuf *out,
-			  struct string_list *them,
-			  int kind)
-{
-	const char *label;
-	const char *me;
-
-	if (kind == 'a') {
-		label = "By";
-		me = git_author_info(IDENT_NO_DATE);
-	} else {
-		label = "Via";
-		me = git_committer_info(IDENT_NO_DATE);
-	}
-
-	if (!them->nr ||
-	    (them->nr == 1 &&
-	     me &&
-	     skip_prefix(me, them->items->string, &me) &&
-	     starts_with(me, " <")))
-		return;
-	strbuf_addf(out, "\n%c %s ", comment_line_char, label);
-	add_people_count(out, them);
-}
-
-static void add_people_info(struct strbuf *out,
-			    struct string_list *authors,
-			    struct string_list *committers)
-{
-	QSORT(authors->items, authors->nr,
-	      cmp_string_list_util_as_integral);
-	QSORT(committers->items, committers->nr,
-	      cmp_string_list_util_as_integral);
-
-	credit_people(out, authors, 'a');
-	credit_people(out, committers, 'c');
-}
-
-static void shortlog(const char *name,
-		     struct origin_data *origin_data,
-		     struct commit *head,
-		     struct rev_info *rev,
-		     struct fmt_merge_msg_opts *opts,
-		     struct strbuf *out)
-{
-	int i, count = 0;
-	struct commit *commit;
-	struct object *branch;
-	struct string_list subjects = STRING_LIST_INIT_DUP;
-	struct string_list authors = STRING_LIST_INIT_DUP;
-	struct string_list committers = STRING_LIST_INIT_DUP;
-	int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED;
-	struct strbuf sb = STRBUF_INIT;
-	const struct object_id *oid = &origin_data->oid;
-	int limit = opts->shortlog_len;
-
-	branch = deref_tag(the_repository, parse_object(the_repository, oid),
-			   oid_to_hex(oid),
-			   the_hash_algo->hexsz);
-	if (!branch || branch->type != OBJ_COMMIT)
-		return;
-
-	setup_revisions(0, NULL, rev, NULL);
-	add_pending_object(rev, branch, name);
-	add_pending_object(rev, &head->object, "^HEAD");
-	head->object.flags |= UNINTERESTING;
-	if (prepare_revision_walk(rev))
-		die("revision walk setup failed");
-	while ((commit = get_revision(rev)) != NULL) {
-		struct pretty_print_context ctx = {0};
-
-		if (commit->parents && commit->parents->next) {
-			/* do not list a merge but count committer */
-			if (opts->credit_people)
-				record_person('c', &committers, commit);
-			continue;
-		}
-		if (!count && opts->credit_people)
-			/* the 'tip' committer */
-			record_person('c', &committers, commit);
-		if (opts->credit_people)
-			record_person('a', &authors, commit);
-		count++;
-		if (subjects.nr > limit)
-			continue;
-
-		format_commit_message(commit, "%s", &sb, &ctx);
-		strbuf_ltrim(&sb);
-
-		if (!sb.len)
-			string_list_append(&subjects,
-					   oid_to_hex(&commit->object.oid));
-		else
-			string_list_append_nodup(&subjects,
-						 strbuf_detach(&sb, NULL));
-	}
-
-	if (opts->credit_people)
-		add_people_info(out, &authors, &committers);
-	if (count > limit)
-		strbuf_addf(out, "\n* %s: (%d commits)\n", name, count);
-	else
-		strbuf_addf(out, "\n* %s:\n", name);
-
-	if (origin_data->is_local_branch && use_branch_desc)
-		add_branch_desc(out, name);
-
-	for (i = 0; i < subjects.nr; i++)
-		if (i >= limit)
-			strbuf_addstr(out, "  ...\n");
-		else
-			strbuf_addf(out, "  %s\n", subjects.items[i].string);
-
-	clear_commit_marks((struct commit *)branch, flags);
-	clear_commit_marks(head, flags);
-	free_commit_list(rev->commits);
-	rev->commits = NULL;
-	rev->pending.nr = 0;
-
-	string_list_clear(&authors, 0);
-	string_list_clear(&committers, 0);
-	string_list_clear(&subjects, 0);
-}
-
-static void fmt_merge_msg_title(struct strbuf *out,
-				const char *current_branch)
-{
-	int i = 0;
-	char *sep = "";
-
-	strbuf_addstr(out, "Merge ");
-	for (i = 0; i < srcs.nr; i++) {
-		struct src_data *src_data = srcs.items[i].util;
-		const char *subsep = "";
-
-		strbuf_addstr(out, sep);
-		sep = "; ";
-
-		if (src_data->head_status == 1) {
-			strbuf_addstr(out, srcs.items[i].string);
-			continue;
-		}
-		if (src_data->head_status == 3) {
-			subsep = ", ";
-			strbuf_addstr(out, "HEAD");
-		}
-		if (src_data->branch.nr) {
-			strbuf_addstr(out, subsep);
-			subsep = ", ";
-			print_joined("branch ", "branches ", &src_data->branch,
-					out);
-		}
-		if (src_data->r_branch.nr) {
-			strbuf_addstr(out, subsep);
-			subsep = ", ";
-			print_joined("remote-tracking branch ", "remote-tracking branches ",
-					&src_data->r_branch, out);
-		}
-		if (src_data->tag.nr) {
-			strbuf_addstr(out, subsep);
-			subsep = ", ";
-			print_joined("tag ", "tags ", &src_data->tag, out);
-		}
-		if (src_data->generic.nr) {
-			strbuf_addstr(out, subsep);
-			print_joined("commit ", "commits ", &src_data->generic,
-					out);
-		}
-		if (strcmp(".", srcs.items[i].string))
-			strbuf_addf(out, " of %s", srcs.items[i].string);
-	}
-
-	if (!strcmp("master", current_branch))
-		strbuf_addch(out, '\n');
-	else
-		strbuf_addf(out, " into %s\n", current_branch);
-}
-
-static void fmt_tag_signature(struct strbuf *tagbuf,
-			      struct strbuf *sig,
-			      const char *buf,
-			      unsigned long len)
-{
-	const char *tag_body = strstr(buf, "\n\n");
-	if (tag_body) {
-		tag_body += 2;
-		strbuf_add(tagbuf, tag_body, buf + len - tag_body);
-	}
-	strbuf_complete_line(tagbuf);
-	if (sig->len) {
-		strbuf_addch(tagbuf, '\n');
-		strbuf_add_commented_lines(tagbuf, sig->buf, sig->len);
-	}
-}
-
-static void fmt_merge_msg_sigs(struct strbuf *out)
-{
-	int i, tag_number = 0, first_tag = 0;
-	struct strbuf tagbuf = STRBUF_INIT;
-
-	for (i = 0; i < origins.nr; i++) {
-		struct object_id *oid = origins.items[i].util;
-		enum object_type type;
-		unsigned long size, len;
-		char *buf = read_object_file(oid, &type, &size);
-		struct strbuf sig = STRBUF_INIT;
-
-		if (!buf || type != OBJ_TAG)
-			goto next;
-		len = parse_signature(buf, size);
-
-		if (size == len)
-			; /* merely annotated */
-		else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig, NULL)) {
-			if (!sig.len)
-				strbuf_addstr(&sig, "gpg verification failed.\n");
-		}
-
-		if (!tag_number++) {
-			fmt_tag_signature(&tagbuf, &sig, buf, len);
-			first_tag = i;
-		} else {
-			if (tag_number == 2) {
-				struct strbuf tagline = STRBUF_INIT;
-				strbuf_addch(&tagline, '\n');
-				strbuf_add_commented_lines(&tagline,
-						origins.items[first_tag].string,
-						strlen(origins.items[first_tag].string));
-				strbuf_insert(&tagbuf, 0, tagline.buf,
-					      tagline.len);
-				strbuf_release(&tagline);
-			}
-			strbuf_addch(&tagbuf, '\n');
-			strbuf_add_commented_lines(&tagbuf,
-					origins.items[i].string,
-					strlen(origins.items[i].string));
-			fmt_tag_signature(&tagbuf, &sig, buf, len);
-		}
-		strbuf_release(&sig);
-	next:
-		free(buf);
-	}
-	if (tagbuf.len) {
-		strbuf_addch(out, '\n');
-		strbuf_addbuf(out, &tagbuf);
-	}
-	strbuf_release(&tagbuf);
-}
-
-static void find_merge_parents(struct merge_parents *result,
-			       struct strbuf *in, struct object_id *head)
-{
-	struct commit_list *parents;
-	struct commit *head_commit;
-	int pos = 0, i, j;
-
-	parents = NULL;
-	while (pos < in->len) {
-		int len;
-		char *p = in->buf + pos;
-		char *newline = strchr(p, '\n');
-		const char *q;
-		struct object_id oid;
-		struct commit *parent;
-		struct object *obj;
-
-		len = newline ? newline - p : strlen(p);
-		pos += len + !!newline;
-
-		if (parse_oid_hex(p, &oid, &q) ||
-		    q[0] != '\t' ||
-		    q[1] != '\t')
-			continue; /* skip not-for-merge */
-		/*
-		 * Do not use get_merge_parent() here; we do not have
-		 * "name" here and we do not want to contaminate its
-		 * util field yet.
-		 */
-		obj = parse_object(the_repository, &oid);
-		parent = (struct commit *)peel_to_type(NULL, 0, obj, OBJ_COMMIT);
-		if (!parent)
-			continue;
-		commit_list_insert(parent, &parents);
-		add_merge_parent(result, &obj->oid, &parent->object.oid);
-	}
-	head_commit = lookup_commit(the_repository, head);
-	if (head_commit)
-		commit_list_insert(head_commit, &parents);
-	reduce_heads_replace(&parents);
-
-	while (parents) {
-		struct commit *cmit = pop_commit(&parents);
-		for (i = 0; i < result->nr; i++)
-			if (oideq(&result->item[i].commit, &cmit->object.oid))
-				result->item[i].used = 1;
-	}
-
-	for (i = j = 0; i < result->nr; i++) {
-		if (result->item[i].used) {
-			if (i != j)
-				result->item[j] = result->item[i];
-			j++;
-		}
-	}
-	result->nr = j;
-}
-
-int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
-		  struct fmt_merge_msg_opts *opts)
-{
-	int i = 0, pos = 0;
-	struct object_id head_oid;
-	const char *current_branch;
-	void *current_branch_to_free;
-	struct merge_parents merge_parents;
-
-	memset(&merge_parents, 0, sizeof(merge_parents));
-
-	/* get current branch */
-	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/"))
-		current_branch += 11;
-
-	find_merge_parents(&merge_parents, in, &head_oid);
-
-	/* get a line */
-	while (pos < in->len) {
-		int len;
-		char *newline, *p = in->buf + pos;
-
-		newline = strchr(p, '\n');
-		len = newline ? newline - p : strlen(p);
-		pos += len + !!newline;
-		i++;
-		p[len] = 0;
-		if (handle_line(p, &merge_parents))
-			die("error in line %d: %.*s", i, len, p);
-	}
-
-	if (opts->add_title && srcs.nr)
-		fmt_merge_msg_title(out, current_branch);
-
-	if (origins.nr)
-		fmt_merge_msg_sigs(out);
-
-	if (opts->shortlog_len) {
-		struct commit *head;
-		struct rev_info rev;
-
-		head = lookup_commit_or_die(&head_oid, "HEAD");
-		repo_init_revisions(the_repository, &rev, NULL);
-		rev.commit_format = CMIT_FMT_ONELINE;
-		rev.ignore_merges = 1;
-		rev.limited = 1;
-
-		strbuf_complete_line(out);
-
-		for (i = 0; i < origins.nr; i++)
-			shortlog(origins.items[i].string,
-				 origins.items[i].util,
-				 head, &rev, opts, out);
-	}
-
-	strbuf_complete_line(out);
-	free(current_branch_to_free);
-	free(merge_parents.item);
-	return 0;
-}
-
 int cmd_fmt_merge_msg(int argc, const char **argv, const char *prefix)
 {
 	const char *inpath = NULL;
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c
index 465153e853..89cb6307d4 100644
--- a/builtin/for-each-ref.c
+++ b/builtin/for-each-ref.c
@@ -9,7 +9,7 @@
 static char const * const for_each_ref_usage[] = {
 	N_("git for-each-ref [<options>] [<pattern>]"),
 	N_("git for-each-ref [--points-at <object>]"),
-	N_("git for-each-ref [(--merged | --no-merged) [<commit>]]"),
+	N_("git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"),
 	N_("git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"),
 	NULL
 };
@@ -22,6 +22,8 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
 	struct ref_array array;
 	struct ref_filter filter;
 	struct ref_format format = REF_FORMAT_INIT;
+	struct strbuf output = STRBUF_INIT;
+	struct strbuf err = STRBUF_INIT;
 
 	struct option opts[] = {
 		OPT_BIT('s', "shell", &format.quote_style,
@@ -70,7 +72,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
 
 	if (!sorting)
 		sorting = ref_default_sorting();
-	sorting->ignore_case = icase;
+	ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
 	filter.ignore_case = icase;
 
 	filter.name_patterns = argv;
@@ -80,8 +82,20 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix)
 
 	if (!maxcount || array.nr < maxcount)
 		maxcount = array.nr;
-	for (i = 0; i < maxcount; i++)
-		show_ref_array_item(array.items[i], &format);
+	for (i = 0; i < maxcount; i++) {
+		strbuf_reset(&err);
+		strbuf_reset(&output);
+		if (format_ref_array_item(array.items[i], &format, &output, &err))
+			die("%s", err.buf);
+		fwrite(output.buf, 1, output.len, stdout);
+		putchar('\n');
+	}
+
+	strbuf_release(&err);
+	strbuf_release(&output);
 	ref_array_clear(&array);
+	free_commit_list(filter.with_commit);
+	free_commit_list(filter.no_commit);
+	UNLEAK(sorting);
 	return 0;
 }
diff --git a/builtin/for-each-repo.c b/builtin/for-each-repo.c
new file mode 100644
index 0000000000..fd86e5a861
--- /dev/null
+++ b/builtin/for-each-repo.c
@@ -0,0 +1,59 @@
+#include "cache.h"
+#include "config.h"
+#include "builtin.h"
+#include "parse-options.h"
+#include "run-command.h"
+#include "string-list.h"
+
+static const char * const for_each_repo_usage[] = {
+	N_("git for-each-repo --config=<config> <command-args>"),
+	NULL
+};
+
+static int run_command_on_repo(const char *path, int argc, const char ** argv)
+{
+	int i;
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	child.git_cmd = 1;
+	strvec_pushl(&child.args, "-C", path, NULL);
+
+	for (i = 0; i < argc; i++)
+		strvec_push(&child.args, argv[i]);
+
+	return run_command(&child);
+}
+
+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;
+
+	const struct option options[] = {
+		OPT_STRING(0, "config", &config_key, N_("config"),
+			   N_("config key storing a list of repository paths")),
+		OPT_END()
+	};
+
+	argc = parse_options(argc, argv, prefix, options, for_each_repo_usage,
+			     PARSE_OPT_STOP_AT_NON_OPTION);
+
+	if (!config_key)
+		die(_("missing --config=<config>"));
+
+	values = repo_config_get_value_multi(the_repository,
+					     config_key);
+
+	/*
+	 * Do nothing on an empty list, which is equivalent to the case
+	 * where the config variable does not exist at all.
+	 */
+	if (!values)
+		return 0;
+
+	for (i = 0; !result && i < values->nr; i++)
+		result = run_command_on_repo(values->items[i].string, argc, argv);
+
+	return result;
+}
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 18403a94fa..b42b6fe21f 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -49,101 +49,68 @@ static int name_objects;
 #define ERROR_PACK 04
 #define ERROR_REFS 010
 #define ERROR_COMMIT_GRAPH 020
+#define ERROR_MULTI_PACK_INDEX 040
 
-static const char *describe_object(struct object *obj)
+static const char *describe_object(const struct object_id *oid)
 {
-	static struct strbuf bufs[] = {
-		STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
-	};
-	static int b = 0;
-	struct strbuf *buf;
-	char *name = NULL;
-
-	if (name_objects)
-		name = lookup_decoration(fsck_walk_options.object_names, obj);
-
-	buf = bufs + b;
-	b = (b + 1) % ARRAY_SIZE(bufs);
-	strbuf_reset(buf);
-	strbuf_addstr(buf, oid_to_hex(&obj->oid));
-	if (name)
-		strbuf_addf(buf, " (%s)", name);
-
-	return buf->buf;
+	return fsck_describe_object(&fsck_walk_options, oid);
 }
 
-static const char *printable_type(struct object *obj)
+static const char *printable_type(const struct object_id *oid,
+				  enum object_type type)
 {
 	const char *ret;
 
-	if (obj->type == OBJ_NONE) {
-		enum object_type type = oid_object_info(the_repository,
-							&obj->oid, NULL);
-		if (type > 0)
-			object_as_type(the_repository, obj, type, 0);
-	}
+	if (type == OBJ_NONE)
+		type = oid_object_info(the_repository, oid, NULL);
 
-	ret = type_name(obj->type);
+	ret = type_name(type);
 	if (!ret)
 		ret = _("unknown");
 
 	return ret;
 }
 
-static int fsck_config(const char *var, const char *value, void *cb)
-{
-	if (strcmp(var, "fsck.skiplist") == 0) {
-		const char *path;
-		struct strbuf sb = STRBUF_INIT;
-
-		if (git_config_pathname(&path, var, value))
-			return 1;
-		strbuf_addf(&sb, "skiplist=%s", path);
-		free((char *)path);
-		fsck_set_msg_types(&fsck_obj_options, sb.buf);
-		strbuf_release(&sb);
-		return 0;
-	}
-
-	if (skip_prefix(var, "fsck.", &var)) {
-		fsck_set_msg_type(&fsck_obj_options, var, value);
-		return 0;
-	}
-
-	return git_default_config(var, value, cb);
-}
-
 static int objerror(struct object *obj, const char *err)
 {
 	errors_found |= ERROR_OBJECT;
 	/* TRANSLATORS: e.g. error in tree 01bfda: <more explanation> */
 	fprintf_ln(stderr, _("error in %s %s: %s"),
-		   printable_type(obj), describe_object(obj), err);
+		   printable_type(&obj->oid, obj->type),
+		   describe_object(&obj->oid), err);
 	return -1;
 }
 
 static int fsck_error_func(struct fsck_options *o,
-	struct object *obj, int type, const char *message)
+			   const struct object_id *oid,
+			   enum object_type object_type,
+			   enum fsck_msg_type msg_type,
+			   enum fsck_msg_id msg_id,
+			   const char *message)
 {
-	switch (type) {
+	switch (msg_type) {
 	case FSCK_WARN:
 		/* TRANSLATORS: e.g. warning in tree 01bfda: <more explanation> */
 		fprintf_ln(stderr, _("warning in %s %s: %s"),
-			   printable_type(obj), describe_object(obj), message);
+			   printable_type(oid, object_type),
+			   describe_object(oid), message);
 		return 0;
 	case FSCK_ERROR:
 		/* TRANSLATORS: e.g. error in tree 01bfda: <more explanation> */
 		fprintf_ln(stderr, _("error in %s %s: %s"),
-			   printable_type(obj), describe_object(obj), message);
+			   printable_type(oid, object_type),
+			   describe_object(oid), message);
 		return 1;
 	default:
-		BUG("%d (FSCK_IGNORE?) should never trigger this callback", type);
+		BUG("%d (FSCK_IGNORE?) should never trigger this callback",
+		    msg_type);
 	}
 }
 
 static struct object_array pending;
 
-static int mark_object(struct object *obj, int type, void *data, struct fsck_options *options)
+static int mark_object(struct object *obj, enum object_type type,
+		       void *data, struct fsck_options *options)
 {
 	struct object *parent = data;
 
@@ -155,7 +122,8 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
 	if (!obj) {
 		/* ... these references to parent->fld are safe here */
 		printf_ln(_("broken link from %7s %s"),
-			  printable_type(parent), describe_object(parent));
+			  printable_type(&parent->oid, parent->type),
+			  describe_object(&parent->oid));
 		printf_ln(_("broken link from %7s %s"),
 			  (type == OBJ_ANY ? _("unknown") : type_name(type)),
 			  _("unknown"));
@@ -180,13 +148,13 @@ static int mark_object(struct object *obj, int type, void *data, struct fsck_opt
 		return 0;
 
 	if (!(obj->flags & HAS_OBJ)) {
-		if (parent && !has_object_file(&obj->oid)) {
+		if (parent && !has_object(the_repository, &obj->oid, 1)) {
 			printf_ln(_("broken link from %7s %s\n"
 				    "              to %7s %s"),
-				  printable_type(parent),
-				  describe_object(parent),
-				  printable_type(obj),
-				  describe_object(obj));
+				  printable_type(&parent->oid, parent->type),
+				  describe_object(&parent->oid),
+				  printable_type(&obj->oid, obj->type),
+				  describe_object(&obj->oid));
 			errors_found |= ERROR_REACHABLE;
 		}
 		return 1;
@@ -227,7 +195,8 @@ static int traverse_reachable(void)
 	return !!result;
 }
 
-static int mark_used(struct object *obj, int type, void *data, struct fsck_options *options)
+static int mark_used(struct object *obj, enum object_type object_type,
+		     void *data, struct fsck_options *options)
 {
 	if (!obj)
 		return 1;
@@ -253,7 +222,7 @@ static void mark_unreachable_referents(const struct object_id *oid)
 		enum object_type type = oid_object_info(the_repository,
 							&obj->oid, NULL);
 		if (type > 0)
-			object_as_type(the_repository, obj, type, 0);
+			object_as_type(obj, type, 0);
 	}
 
 	options.walk = mark_used;
@@ -292,8 +261,9 @@ static void check_reachable_object(struct object *obj)
 			return;
 		if (has_object_pack(&obj->oid))
 			return; /* it is in pack - forget about it */
-		printf_ln(_("missing %s %s"), printable_type(obj),
-			  describe_object(obj));
+		printf_ln(_("missing %s %s"),
+			  printable_type(&obj->oid, obj->type),
+			  describe_object(&obj->oid));
 		errors_found |= ERROR_REACHABLE;
 		return;
 	}
@@ -318,8 +288,9 @@ static void check_unreachable_object(struct object *obj)
 	 * since this is something that is prunable.
 	 */
 	if (show_unreachable) {
-		printf_ln(_("unreachable %s %s"), printable_type(obj),
-			  describe_object(obj));
+		printf_ln(_("unreachable %s %s"),
+			  printable_type(&obj->oid, obj->type),
+			  describe_object(&obj->oid));
 		return;
 	}
 
@@ -337,12 +308,13 @@ static void check_unreachable_object(struct object *obj)
 	 */
 	if (!(obj->flags & USED)) {
 		if (show_dangling)
-			printf_ln(_("dangling %s %s"), printable_type(obj),
-				  describe_object(obj));
+			printf_ln(_("dangling %s %s"),
+				  printable_type(&obj->oid, obj->type),
+				  describe_object(&obj->oid));
 		if (write_lost_and_found) {
 			char *filename = git_pathdup("lost-found/%s/%s",
 				obj->type == OBJ_COMMIT ? "commit" : "other",
-				describe_object(obj));
+				describe_object(&obj->oid));
 			FILE *f;
 
 			if (safe_create_leading_directories_const(filename)) {
@@ -355,7 +327,7 @@ static void check_unreachable_object(struct object *obj)
 				if (stream_blob_to_fd(fileno(f), &obj->oid, NULL, 1))
 					die_errno(_("could not write '%s'"), filename);
 			} else
-				fprintf(f, "%s\n", describe_object(obj));
+				fprintf(f, "%s\n", describe_object(&obj->oid));
 			if (fclose(f))
 				die_errno(_("could not finish '%s'"),
 					  filename);
@@ -374,7 +346,7 @@ static void check_unreachable_object(struct object *obj)
 static void check_object(struct object *obj)
 {
 	if (verbose)
-		fprintf_ln(stderr, _("Checking %s"), describe_object(obj));
+		fprintf_ln(stderr, _("Checking %s"), describe_object(&obj->oid));
 
 	if (obj->flags & REACHABLE)
 		check_reachable_object(obj);
@@ -432,7 +404,8 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
 
 	if (verbose)
 		fprintf_ln(stderr, _("Checking %s %s"),
-			   printable_type(obj), describe_object(obj));
+			   printable_type(&obj->oid, obj->type),
+			   describe_object(&obj->oid));
 
 	if (fsck_walk(obj, NULL, &fsck_obj_options))
 		objerror(obj, _("broken links"));
@@ -445,7 +418,7 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
 
 		if (!commit->parents && show_root)
 			printf_ln(_("root %s"),
-				  describe_object(&commit->object));
+				  describe_object(&commit->object.oid));
 	}
 
 	if (obj->type == OBJ_TAG) {
@@ -453,10 +426,10 @@ static int fsck_obj(struct object *obj, void *buffer, unsigned long size)
 
 		if (show_tags && tag->tagged) {
 			printf_ln(_("tagged %s %s (%s) in %s"),
-				  printable_type(tag->tagged),
-				  describe_object(tag->tagged),
+				  printable_type(&tag->tagged->oid, tag->tagged->type),
+				  describe_object(&tag->tagged->oid),
 				  tag->tag,
-				  describe_object(&tag->object));
+				  describe_object(&tag->object.oid));
 		}
 	}
 
@@ -499,10 +472,10 @@ static void fsck_handle_reflog_oid(const char *refname, struct object_id *oid,
 	if (!is_null_oid(oid)) {
 		obj = lookup_object(the_repository, oid);
 		if (obj && (obj->flags & HAS_OBJ)) {
-			if (timestamp && name_objects)
-				add_decoration(fsck_walk_options.object_names,
-					obj,
-					xstrfmt("%s@{%"PRItime"}", refname, timestamp));
+			if (timestamp)
+				fsck_put_object_name(&fsck_walk_options, oid,
+						     "%s@{%"PRItime"}",
+						     refname, timestamp);
 			obj->flags |= USED;
 			mark_object_reachable(obj);
 		} else if (!is_promisor_object(oid)) {
@@ -566,9 +539,8 @@ static int fsck_handle_ref(const char *refname, const struct object_id *oid,
 	}
 	default_refs++;
 	obj->flags |= USED;
-	if (name_objects)
-		add_decoration(fsck_walk_options.object_names,
-			obj, xstrdup(refname));
+	fsck_put_object_name(&fsck_walk_options,
+			     oid, "%s", refname);
 	mark_object_reachable(obj);
 
 	return 0;
@@ -586,7 +558,7 @@ static void get_default_heads(void)
 
 	for_each_rawref(fsck_handle_ref, NULL);
 
-	worktrees = get_worktrees(0);
+	worktrees = get_worktrees();
 	for (p = worktrees; *p; p++) {
 		struct worktree *wt = *p;
 		struct strbuf ref = STRBUF_INIT;
@@ -742,9 +714,7 @@ static int fsck_cache_tree(struct cache_tree *it)
 			return 1;
 		}
 		obj->flags |= USED;
-		if (name_objects)
-			add_decoration(fsck_walk_options.object_names,
-				obj, xstrdup(":"));
+		fsck_put_object_name(&fsck_walk_options, &it->oid, ":");
 		mark_object_reachable(obj);
 		if (obj->type != OBJ_TREE)
 			err |= objerror(obj, _("non-tree in cache-tree"));
@@ -756,7 +726,7 @@ static int fsck_cache_tree(struct cache_tree *it)
 
 static void mark_object_for_connectivity(const struct object_id *oid)
 {
-	struct object *obj = lookup_unknown_object(oid);
+	struct object *obj = lookup_unknown_object(the_repository, oid);
 	obj->flags |= HAS_OBJ;
 }
 
@@ -830,10 +800,9 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 	}
 
 	if (name_objects)
-		fsck_walk_options.object_names =
-			xcalloc(1, sizeof(struct decoration));
+		fsck_enable_object_names(&fsck_walk_options);
 
-	git_config(fsck_config, NULL);
+	git_config(git_fsck_config, &fsck_obj_options);
 
 	if (connectivity_only) {
 		for_each_loose_object(mark_loose_for_connectivity, NULL, 0);
@@ -890,9 +859,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 			}
 
 			obj->flags |= USED;
-			if (name_objects)
-				add_decoration(fsck_walk_options.object_names,
-					obj, xstrdup(arg));
+			fsck_put_object_name(&fsck_walk_options, &oid,
+					     "%s", arg);
 			mark_object_reachable(obj);
 			continue;
 		}
@@ -914,6 +882,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 		verify_index_checksum = 1;
 		verify_ce_order = 1;
 		read_cache();
+		/* TODO: audit for interaction with sparse-index. */
+		ensure_full_index(&the_index);
 		for (i = 0; i < active_nr; i++) {
 			unsigned int mode;
 			struct blob *blob;
@@ -928,10 +898,8 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 				continue;
 			obj = &blob->object;
 			obj->flags |= USED;
-			if (name_objects)
-				add_decoration(fsck_walk_options.object_names,
-					obj,
-					xstrfmt(":%s", active_cache[i]->name));
+			fsck_put_object_name(&fsck_walk_options, &obj->oid,
+					     ":%s", active_cache[i]->name);
 			mark_object_reachable(obj);
 		}
 		if (active_cache_tree)
@@ -968,7 +936,7 @@ int cmd_fsck(int argc, const char **argv, const char *prefix)
 			midx_argv[2] = "--object-dir";
 			midx_argv[3] = odb->path;
 			if (run_command(&midx_verify))
-				errors_found |= ERROR_COMMIT_GRAPH;
+				errors_found |= ERROR_MULTI_PACK_INDEX;
 		}
 	}
 
diff --git a/builtin/gc.c b/builtin/gc.c
index fadb45489f..9a48eb535f 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -18,7 +18,7 @@
 #include "parse-options.h"
 #include "run-command.h"
 #include "sigchain.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "commit.h"
 #include "commit-graph.h"
 #include "packfile.h"
@@ -28,6 +28,10 @@
 #include "blob.h"
 #include "tree.h"
 #include "promisor-remote.h"
+#include "refs.h"
+#include "remote.h"
+#include "object-store.h"
+#include "exec-cmd.h"
 
 #define FAILED_RUN "failed to run %s"
 
@@ -50,12 +54,11 @@ static const char *prune_worktrees_expire = "3.months.ago";
 static unsigned long big_pack_threshold;
 static unsigned long max_delta_cache_size = DEFAULT_DELTA_CACHE_SIZE;
 
-static struct argv_array pack_refs_cmd = ARGV_ARRAY_INIT;
-static struct argv_array reflog = ARGV_ARRAY_INIT;
-static struct argv_array repack = ARGV_ARRAY_INIT;
-static struct argv_array prune = ARGV_ARRAY_INIT;
-static struct argv_array prune_worktrees = ARGV_ARRAY_INIT;
-static struct argv_array rerere = ARGV_ARRAY_INIT;
+static struct strvec reflog = STRVEC_INIT;
+static struct strvec repack = STRVEC_INIT;
+static struct strvec prune = STRVEC_INIT;
+static struct strvec prune_worktrees = STRVEC_INIT;
+static struct strvec rerere = STRVEC_INIT;
 
 static struct tempfile *pidfile;
 static struct lock_file log_lock;
@@ -88,7 +91,7 @@ static void process_log_file(void)
 		 */
 		int saved_errno = errno;
 		fprintf(stderr, _("Failed to fstat %s: %s"),
-			get_tempfile_path(log_lock.tempfile),
+			get_lock_file_path(&log_lock),
 			strerror(saved_errno));
 		fflush(stderr);
 		commit_lock_file(&log_lock);
@@ -159,6 +162,15 @@ static void gc_config(void)
 	git_config(git_default_config, NULL);
 }
 
+struct maintenance_run_opts;
+static int maintenance_task_pack_refs(MAYBE_UNUSED struct maintenance_run_opts *opts)
+{
+	struct strvec pack_refs_cmd = STRVEC_INIT;
+	strvec_pushl(&pack_refs_cmd, "pack-refs", "--all", "--prune", NULL);
+
+	return run_command_v_opt(pack_refs_cmd.v, RUN_GIT_CMD);
+}
+
 static int too_many_loose_objects(void)
 {
 	/*
@@ -297,7 +309,7 @@ static uint64_t estimate_repack_memory(struct packed_git *pack)
 	/* and then obj_hash[], underestimated in fact */
 	heap += sizeof(struct object *) * nr_objects;
 	/* revindex is used also */
-	heap += sizeof(struct revindex_entry) * nr_objects;
+	heap += (sizeof(off_t) + sizeof(uint32_t)) * nr_objects;
 	/*
 	 * read_sha1_file() (either at delta calculation phase, or
 	 * writing phase) also fills up the delta base cache
@@ -311,18 +323,18 @@ static uint64_t estimate_repack_memory(struct packed_git *pack)
 
 static int keep_one_pack(struct string_list_item *item, void *data)
 {
-	argv_array_pushf(&repack, "--keep-pack=%s", basename(item->string));
+	strvec_pushf(&repack, "--keep-pack=%s", basename(item->string));
 	return 0;
 }
 
 static void add_repack_all_option(struct string_list *keep_pack)
 {
 	if (prune_expire && !strcmp(prune_expire, "now"))
-		argv_array_push(&repack, "-a");
+		strvec_push(&repack, "-a");
 	else {
-		argv_array_push(&repack, "-A");
+		strvec_push(&repack, "-A");
 		if (prune_expire)
-			argv_array_pushf(&repack, "--unpack-unreachable=%s", prune_expire);
+			strvec_pushf(&repack, "--unpack-unreachable=%s", prune_expire);
 	}
 
 	if (keep_pack)
@@ -331,7 +343,7 @@ static void add_repack_all_option(struct string_list *keep_pack)
 
 static void add_repack_incremental_option(void)
 {
-	argv_array_push(&repack, "--no-write-bitmap-index");
+	strvec_push(&repack, "--no-write-bitmap-index");
 }
 
 static int need_to_gc(void)
@@ -458,7 +470,7 @@ 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 occured while reading gc.log
+ * message and returns -1 if an error occurred while reading gc.log
  */
 static int report_last_gc_error(void)
 {
@@ -514,11 +526,11 @@ static void gc_before_repack(void)
 	if (done++)
 		return;
 
-	if (pack_refs && run_command_v_opt(pack_refs_cmd.argv, RUN_GIT_CMD))
-		die(FAILED_RUN, pack_refs_cmd.argv[0]);
+	if (pack_refs && maintenance_task_pack_refs(NULL))
+		die(FAILED_RUN, "pack-refs");
 
-	if (prune_reflogs && run_command_v_opt(reflog.argv, RUN_GIT_CMD))
-		die(FAILED_RUN, reflog.argv[0]);
+	if (prune_reflogs && run_command_v_opt(reflog.v, RUN_GIT_CMD))
+		die(FAILED_RUN, reflog.v[0]);
 }
 
 int cmd_gc(int argc, const char **argv, const char *prefix)
@@ -530,7 +542,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 	const char *name;
 	pid_t pid;
 	int daemonized = 0;
-	int keep_base_pack = -1;
+	int keep_largest_pack = -1;
 	timestamp_t dummy;
 
 	struct option builtin_gc_options[] = {
@@ -544,7 +556,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 		OPT_BOOL_F(0, "force", &force,
 			   N_("force running gc even if there may be another gc running"),
 			   PARSE_OPT_NOCOMPLETE),
-		OPT_BOOL(0, "keep-largest-pack", &keep_base_pack,
+		OPT_BOOL(0, "keep-largest-pack", &keep_largest_pack,
 			 N_("repack all other packs except the largest pack")),
 		OPT_END()
 	};
@@ -552,12 +564,11 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage_with_options(builtin_gc_usage, builtin_gc_options);
 
-	argv_array_pushl(&pack_refs_cmd, "pack-refs", "--all", "--prune", NULL);
-	argv_array_pushl(&reflog, "reflog", "expire", "--all", NULL);
-	argv_array_pushl(&repack, "repack", "-d", "-l", NULL);
-	argv_array_pushl(&prune, "prune", "--expire", NULL);
-	argv_array_pushl(&prune_worktrees, "worktree", "prune", "--expire", NULL);
-	argv_array_pushl(&rerere, "rerere", "gc", NULL);
+	strvec_pushl(&reflog, "reflog", "expire", "--all", NULL);
+	strvec_pushl(&repack, "repack", "-d", "-l", NULL);
+	strvec_pushl(&prune, "prune", "--expire", NULL);
+	strvec_pushl(&prune_worktrees, "worktree", "prune", "--expire", NULL);
+	strvec_pushl(&rerere, "rerere", "gc", NULL);
 
 	/* default expiry time, overwritten in gc_config */
 	gc_config();
@@ -576,14 +587,14 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 		die(_("failed to parse prune expiry value %s"), prune_expire);
 
 	if (aggressive) {
-		argv_array_push(&repack, "-f");
+		strvec_push(&repack, "-f");
 		if (aggressive_depth > 0)
-			argv_array_pushf(&repack, "--depth=%d", aggressive_depth);
+			strvec_pushf(&repack, "--depth=%d", aggressive_depth);
 		if (aggressive_window > 0)
-			argv_array_pushf(&repack, "--window=%d", aggressive_window);
+			strvec_pushf(&repack, "--window=%d", aggressive_window);
 	}
 	if (quiet)
-		argv_array_push(&repack, "-q");
+		strvec_push(&repack, "-q");
 
 	if (auto_gc) {
 		/*
@@ -601,7 +612,7 @@ 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 occured, already reported */
+				/* an I/O error occurred, already reported */
 				exit(128);
 			if (ret == 1)
 				/* Last gc --auto failed. Skip this one. */
@@ -621,8 +632,8 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 	} else {
 		struct string_list keep_pack = STRING_LIST_INIT_NODUP;
 
-		if (keep_base_pack != -1) {
-			if (keep_base_pack)
+		if (keep_largest_pack != -1) {
+			if (keep_largest_pack)
 				find_base_packs(&keep_pack, 0);
 		} else if (big_pack_threshold) {
 			find_base_packs(&keep_pack, big_pack_threshold);
@@ -653,29 +664,29 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 
 	if (!repository_format_precious_objects) {
 		close_object_store(the_repository->objects);
-		if (run_command_v_opt(repack.argv, RUN_GIT_CMD))
-			die(FAILED_RUN, repack.argv[0]);
+		if (run_command_v_opt(repack.v, RUN_GIT_CMD))
+			die(FAILED_RUN, repack.v[0]);
 
 		if (prune_expire) {
-			argv_array_push(&prune, prune_expire);
+			strvec_push(&prune, prune_expire);
 			if (quiet)
-				argv_array_push(&prune, "--no-progress");
+				strvec_push(&prune, "--no-progress");
 			if (has_promisor_remote())
-				argv_array_push(&prune,
-						"--exclude-promisor-objects");
-			if (run_command_v_opt(prune.argv, RUN_GIT_CMD))
-				die(FAILED_RUN, prune.argv[0]);
+				strvec_push(&prune,
+					    "--exclude-promisor-objects");
+			if (run_command_v_opt(prune.v, RUN_GIT_CMD))
+				die(FAILED_RUN, prune.v[0]);
 		}
 	}
 
 	if (prune_worktrees_expire) {
-		argv_array_push(&prune_worktrees, prune_worktrees_expire);
-		if (run_command_v_opt(prune_worktrees.argv, RUN_GIT_CMD))
-			die(FAILED_RUN, prune_worktrees.argv[0]);
+		strvec_push(&prune_worktrees, prune_worktrees_expire);
+		if (run_command_v_opt(prune_worktrees.v, RUN_GIT_CMD))
+			die(FAILED_RUN, prune_worktrees.v[0]);
 	}
 
-	if (run_command_v_opt(rerere.argv, RUN_GIT_CMD))
-		die(FAILED_RUN, rerere.argv[0]);
+	if (run_command_v_opt(rerere.v, RUN_GIT_CMD))
+		die(FAILED_RUN, rerere.v[0]);
 
 	report_garbage = report_pack_garbage;
 	reprepare_packed_git(the_repository);
@@ -686,7 +697,7 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 
 	prepare_repo_settings(the_repository);
 	if (the_repository->settings.gc_write_commit_graph == 1)
-		write_commit_graph_reachable(get_object_directory(),
+		write_commit_graph_reachable(the_repository->objects->odb,
 					     !quiet && !daemonized ? COMMIT_GRAPH_WRITE_PROGRESS : 0,
 					     NULL);
 
@@ -699,3 +710,1370 @@ int cmd_gc(int argc, const char **argv, const char *prefix)
 
 	return 0;
 }
+
+static const char *const builtin_maintenance_run_usage[] = {
+	N_("git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"),
+	NULL
+};
+
+enum schedule_priority {
+	SCHEDULE_NONE = 0,
+	SCHEDULE_WEEKLY = 1,
+	SCHEDULE_DAILY = 2,
+	SCHEDULE_HOURLY = 3,
+};
+
+static enum schedule_priority parse_schedule(const char *value)
+{
+	if (!value)
+		return SCHEDULE_NONE;
+	if (!strcasecmp(value, "hourly"))
+		return SCHEDULE_HOURLY;
+	if (!strcasecmp(value, "daily"))
+		return SCHEDULE_DAILY;
+	if (!strcasecmp(value, "weekly"))
+		return SCHEDULE_WEEKLY;
+	return SCHEDULE_NONE;
+}
+
+static int maintenance_opt_schedule(const struct option *opt, const char *arg,
+				    int unset)
+{
+	enum schedule_priority *priority = opt->value;
+
+	if (unset)
+		die(_("--no-schedule is not allowed"));
+
+	*priority = parse_schedule(arg);
+
+	if (!*priority)
+		die(_("unrecognized --schedule argument '%s'"), arg);
+
+	return 0;
+}
+
+struct maintenance_run_opts {
+	int auto_flag;
+	int quiet;
+	enum schedule_priority schedule;
+};
+
+/* Remember to update object flag allocation in object.h */
+#define SEEN		(1u<<0)
+
+struct cg_auto_data {
+	int num_not_in_graph;
+	int limit;
+};
+
+static int dfs_on_ref(const char *refname,
+		      const struct object_id *oid, int flags,
+		      void *cb_data)
+{
+	struct cg_auto_data *data = (struct cg_auto_data *)cb_data;
+	int result = 0;
+	struct object_id peeled;
+	struct commit_list *stack = NULL;
+	struct commit *commit;
+
+	if (!peel_iterated_oid(oid, &peeled))
+		oid = &peeled;
+	if (oid_object_info(the_repository, oid, NULL) != OBJ_COMMIT)
+		return 0;
+
+	commit = lookup_commit(the_repository, oid);
+	if (!commit)
+		return 0;
+	if (parse_commit(commit) ||
+	    commit_graph_position(commit) != COMMIT_NOT_FROM_GRAPH)
+		return 0;
+
+	data->num_not_in_graph++;
+
+	if (data->num_not_in_graph >= data->limit)
+		return 1;
+
+	commit_list_append(commit, &stack);
+
+	while (!result && stack) {
+		struct commit_list *parent;
+
+		commit = pop_commit(&stack);
+
+		for (parent = commit->parents; parent; parent = parent->next) {
+			if (parse_commit(parent->item) ||
+			    commit_graph_position(parent->item) != COMMIT_NOT_FROM_GRAPH ||
+			    parent->item->object.flags & SEEN)
+				continue;
+
+			parent->item->object.flags |= SEEN;
+			data->num_not_in_graph++;
+
+			if (data->num_not_in_graph >= data->limit) {
+				result = 1;
+				break;
+			}
+
+			commit_list_append(parent->item, &stack);
+		}
+	}
+
+	free_commit_list(stack);
+	return result;
+}
+
+static int should_write_commit_graph(void)
+{
+	int result;
+	struct cg_auto_data data;
+
+	data.num_not_in_graph = 0;
+	data.limit = 100;
+	git_config_get_int("maintenance.commit-graph.auto",
+			   &data.limit);
+
+	if (!data.limit)
+		return 0;
+	if (data.limit < 0)
+		return 1;
+
+	result = for_each_ref(dfs_on_ref, &data);
+
+	repo_clear_commit_marks(the_repository, SEEN);
+
+	return result;
+}
+
+static int run_write_commit_graph(struct maintenance_run_opts *opts)
+{
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	child.git_cmd = 1;
+	strvec_pushl(&child.args, "commit-graph", "write",
+		     "--split", "--reachable", NULL);
+
+	if (opts->quiet)
+		strvec_push(&child.args, "--no-progress");
+
+	return !!run_command(&child);
+}
+
+static int maintenance_task_commit_graph(struct maintenance_run_opts *opts)
+{
+	prepare_repo_settings(the_repository);
+	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;
+	}
+
+	return 0;
+}
+
+static int fetch_remote(struct remote *remote, void *cbdata)
+{
+	struct maintenance_run_opts *opts = cbdata;
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	if (remote->skip_default_update)
+		return 0;
+
+	child.git_cmd = 1;
+	strvec_pushl(&child.args, "fetch", remote->name,
+		     "--prefetch", "--prune", "--no-tags",
+		     "--no-write-fetch-head", "--recurse-submodules=no",
+		     NULL);
+
+	if (opts->quiet)
+		strvec_push(&child.args, "--quiet");
+
+	return !!run_command(&child);
+}
+
+static int maintenance_task_prefetch(struct maintenance_run_opts *opts)
+{
+	git_config_set_multivar_gently("log.excludedecoration",
+					"refs/prefetch/",
+					"refs/prefetch/",
+					CONFIG_FLAGS_FIXED_VALUE |
+					CONFIG_FLAGS_MULTI_REPLACE);
+
+	if (for_each_remote(fetch_remote, opts)) {
+		error(_("failed to prefetch remotes"));
+		return 1;
+	}
+
+	return 0;
+}
+
+static int maintenance_task_gc(struct maintenance_run_opts *opts)
+{
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	child.git_cmd = 1;
+	strvec_push(&child.args, "gc");
+
+	if (opts->auto_flag)
+		strvec_push(&child.args, "--auto");
+	if (opts->quiet)
+		strvec_push(&child.args, "--quiet");
+	else
+		strvec_push(&child.args, "--no-quiet");
+
+	close_object_store(the_repository->objects);
+	return run_command(&child);
+}
+
+static int prune_packed(struct maintenance_run_opts *opts)
+{
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	child.git_cmd = 1;
+	strvec_push(&child.args, "prune-packed");
+
+	if (opts->quiet)
+		strvec_push(&child.args, "--quiet");
+
+	return !!run_command(&child);
+}
+
+struct write_loose_object_data {
+	FILE *in;
+	int count;
+	int batch_size;
+};
+
+static int loose_object_auto_limit = 100;
+
+static int loose_object_count(const struct object_id *oid,
+			       const char *path,
+			       void *data)
+{
+	int *count = (int*)data;
+	if (++(*count) >= loose_object_auto_limit)
+		return 1;
+	return 0;
+}
+
+static int loose_object_auto_condition(void)
+{
+	int count = 0;
+
+	git_config_get_int("maintenance.loose-objects.auto",
+			   &loose_object_auto_limit);
+
+	if (!loose_object_auto_limit)
+		return 0;
+	if (loose_object_auto_limit < 0)
+		return 1;
+
+	return for_each_loose_file_in_objdir(the_repository->objects->odb->path,
+					     loose_object_count,
+					     NULL, NULL, &count);
+}
+
+static int bail_on_loose(const struct object_id *oid,
+			 const char *path,
+			 void *data)
+{
+	return 1;
+}
+
+static int write_loose_object_to_stdin(const struct object_id *oid,
+				       const char *path,
+				       void *data)
+{
+	struct write_loose_object_data *d = (struct write_loose_object_data *)data;
+
+	fprintf(d->in, "%s\n", oid_to_hex(oid));
+
+	return ++(d->count) > d->batch_size;
+}
+
+static int pack_loose(struct maintenance_run_opts *opts)
+{
+	struct repository *r = the_repository;
+	int result = 0;
+	struct write_loose_object_data data;
+	struct child_process pack_proc = CHILD_PROCESS_INIT;
+
+	/*
+	 * Do not start pack-objects process
+	 * if there are no loose objects.
+	 */
+	if (!for_each_loose_file_in_objdir(r->objects->odb->path,
+					   bail_on_loose,
+					   NULL, NULL, NULL))
+		return 0;
+
+	pack_proc.git_cmd = 1;
+
+	strvec_push(&pack_proc.args, "pack-objects");
+	if (opts->quiet)
+		strvec_push(&pack_proc.args, "--quiet");
+	strvec_pushf(&pack_proc.args, "%s/pack/loose", r->objects->odb->path);
+
+	pack_proc.in = -1;
+
+	if (start_command(&pack_proc)) {
+		error(_("failed to start 'git pack-objects' process"));
+		return 1;
+	}
+
+	data.in = xfdopen(pack_proc.in, "w");
+	data.count = 0;
+	data.batch_size = 50000;
+
+	for_each_loose_file_in_objdir(r->objects->odb->path,
+				      write_loose_object_to_stdin,
+				      NULL,
+				      NULL,
+				      &data);
+
+	fclose(data.in);
+
+	if (finish_command(&pack_proc)) {
+		error(_("failed to finish 'git pack-objects' process"));
+		result = 1;
+	}
+
+	return result;
+}
+
+static int maintenance_task_loose_objects(struct maintenance_run_opts *opts)
+{
+	return prune_packed(opts) || pack_loose(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)
+		return 0;
+
+	git_config_get_int("maintenance.incremental-repack.auto",
+			   &incremental_repack_auto_limit);
+
+	if (!incremental_repack_auto_limit)
+		return 0;
+	if (incremental_repack_auto_limit < 0)
+		return 1;
+
+	for (p = get_packed_git(the_repository);
+	     count < incremental_repack_auto_limit && p;
+	     p = p->next) {
+		if (!p->multi_pack_index)
+			count++;
+	}
+
+	return count >= incremental_repack_auto_limit;
+}
+
+static int multi_pack_index_write(struct maintenance_run_opts *opts)
+{
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	child.git_cmd = 1;
+	strvec_pushl(&child.args, "multi-pack-index", "write", NULL);
+
+	if (opts->quiet)
+		strvec_push(&child.args, "--no-progress");
+
+	if (run_command(&child))
+		return error(_("failed to write multi-pack-index"));
+
+	return 0;
+}
+
+static int multi_pack_index_expire(struct maintenance_run_opts *opts)
+{
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	child.git_cmd = 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"));
+
+	return 0;
+}
+
+#define TWO_GIGABYTES (INT32_MAX)
+
+static off_t get_auto_pack_size(void)
+{
+	/*
+	 * The "auto" value is special: we optimize for
+	 * one large pack-file (i.e. from a clone) and
+	 * expect the rest to be small and they can be
+	 * repacked quickly.
+	 *
+	 * The strategy we select here is to select a
+	 * size that is one more than the second largest
+	 * pack-file. This ensures that we will repack
+	 * at least two packs if there are three or more
+	 * packs.
+	 */
+	off_t max_size = 0;
+	off_t second_largest_size = 0;
+	off_t result_size;
+	struct packed_git *p;
+	struct repository *r = the_repository;
+
+	reprepare_packed_git(r);
+	for (p = get_all_packs(r); p; p = p->next) {
+		if (p->pack_size > max_size) {
+			second_largest_size = max_size;
+			max_size = p->pack_size;
+		} else if (p->pack_size > second_largest_size)
+			second_largest_size = p->pack_size;
+	}
+
+	result_size = second_largest_size + 1;
+
+	/* But limit ourselves to a batch size of 2g */
+	if (result_size > TWO_GIGABYTES)
+		result_size = TWO_GIGABYTES;
+
+	return result_size;
+}
+
+static int multi_pack_index_repack(struct maintenance_run_opts *opts)
+{
+	struct child_process child = CHILD_PROCESS_INIT;
+
+	child.git_cmd = 1;
+	strvec_pushl(&child.args, "multi-pack-index", "repack", NULL);
+
+	if (opts->quiet)
+		strvec_push(&child.args, "--no-progress");
+
+	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"));
+
+	return 0;
+}
+
+static int maintenance_task_incremental_repack(struct maintenance_run_opts *opts)
+{
+	prepare_repo_settings(the_repository);
+	if (!the_repository->settings.core_multi_pack_index) {
+		warning(_("skipping incremental-repack task because core.multiPackIndex is disabled"));
+		return 0;
+	}
+
+	if (multi_pack_index_write(opts))
+		return 1;
+	if (multi_pack_index_expire(opts))
+		return 1;
+	if (multi_pack_index_repack(opts))
+		return 1;
+	return 0;
+}
+
+typedef int maintenance_task_fn(struct maintenance_run_opts *opts);
+
+/*
+ * An auto condition function returns 1 if the task should run
+ * and 0 if the task should NOT run. See needs_to_gc() for an
+ * example.
+ */
+typedef int maintenance_auto_fn(void);
+
+struct maintenance_task {
+	const char *name;
+	maintenance_task_fn *fn;
+	maintenance_auto_fn *auto_condition;
+	unsigned enabled:1;
+
+	enum schedule_priority schedule;
+
+	/* -1 if not selected. */
+	int selected_order;
+};
+
+enum maintenance_task_label {
+	TASK_PREFETCH,
+	TASK_LOOSE_OBJECTS,
+	TASK_INCREMENTAL_REPACK,
+	TASK_GC,
+	TASK_COMMIT_GRAPH,
+	TASK_PACK_REFS,
+
+	/* Leave as final value */
+	TASK__COUNT
+};
+
+static struct maintenance_task tasks[] = {
+	[TASK_PREFETCH] = {
+		"prefetch",
+		maintenance_task_prefetch,
+	},
+	[TASK_LOOSE_OBJECTS] = {
+		"loose-objects",
+		maintenance_task_loose_objects,
+		loose_object_auto_condition,
+	},
+	[TASK_INCREMENTAL_REPACK] = {
+		"incremental-repack",
+		maintenance_task_incremental_repack,
+		incremental_repack_auto_condition,
+	},
+	[TASK_GC] = {
+		"gc",
+		maintenance_task_gc,
+		need_to_gc,
+		1,
+	},
+	[TASK_COMMIT_GRAPH] = {
+		"commit-graph",
+		maintenance_task_commit_graph,
+		should_write_commit_graph,
+	},
+	[TASK_PACK_REFS] = {
+		"pack-refs",
+		maintenance_task_pack_refs,
+		NULL,
+	},
+};
+
+static int compare_tasks_by_selection(const void *a_, const void *b_)
+{
+	const struct maintenance_task *a = a_;
+	const struct maintenance_task *b = b_;
+
+	return b->selected_order - a->selected_order;
+}
+
+static int maintenance_run_tasks(struct maintenance_run_opts *opts)
+{
+	int i, found_selected = 0;
+	int result = 0;
+	struct lock_file lk;
+	struct repository *r = the_repository;
+	char *lock_path = xstrfmt("%s/maintenance", r->objects->odb->path);
+
+	if (hold_lock_file_for_update(&lk, lock_path, LOCK_NO_DEREF) < 0) {
+		/*
+		 * Another maintenance command is running.
+		 *
+		 * If --auto was provided, then it is likely due to a
+		 * recursive process stack. Do not report an error in
+		 * that case.
+		 */
+		if (!opts->auto_flag && !opts->quiet)
+			warning(_("lock file '%s' exists, skipping maintenance"),
+				lock_path);
+		free(lock_path);
+		return 0;
+	}
+	free(lock_path);
+
+	for (i = 0; !found_selected && i < TASK__COUNT; i++)
+		found_selected = tasks[i].selected_order >= 0;
+
+	if (found_selected)
+		QSORT(tasks, TASK__COUNT, compare_tasks_by_selection);
+
+	for (i = 0; i < TASK__COUNT; i++) {
+		if (found_selected && tasks[i].selected_order < 0)
+			continue;
+
+		if (!found_selected && !tasks[i].enabled)
+			continue;
+
+		if (opts->auto_flag &&
+		    (!tasks[i].auto_condition ||
+		     !tasks[i].auto_condition()))
+			continue;
+
+		if (opts->schedule && tasks[i].schedule < opts->schedule)
+			continue;
+
+		trace2_region_enter("maintenance", tasks[i].name, r);
+		if (tasks[i].fn(opts)) {
+			error(_("task '%s' failed"), tasks[i].name);
+			result = 1;
+		}
+		trace2_region_leave("maintenance", tasks[i].name, r);
+	}
+
+	rollback_lock_file(&lk);
+	return result;
+}
+
+static void initialize_maintenance_strategy(void)
+{
+	char *config_str;
+
+	if (git_config_get_string("maintenance.strategy", &config_str))
+		return;
+
+	if (!strcasecmp(config_str, "incremental")) {
+		tasks[TASK_GC].schedule = SCHEDULE_NONE;
+		tasks[TASK_COMMIT_GRAPH].enabled = 1;
+		tasks[TASK_COMMIT_GRAPH].schedule = SCHEDULE_HOURLY;
+		tasks[TASK_PREFETCH].enabled = 1;
+		tasks[TASK_PREFETCH].schedule = SCHEDULE_HOURLY;
+		tasks[TASK_INCREMENTAL_REPACK].enabled = 1;
+		tasks[TASK_INCREMENTAL_REPACK].schedule = SCHEDULE_DAILY;
+		tasks[TASK_LOOSE_OBJECTS].enabled = 1;
+		tasks[TASK_LOOSE_OBJECTS].schedule = SCHEDULE_DAILY;
+		tasks[TASK_PACK_REFS].enabled = 1;
+		tasks[TASK_PACK_REFS].schedule = SCHEDULE_WEEKLY;
+	}
+}
+
+static void initialize_task_config(int schedule)
+{
+	int i;
+	struct strbuf config_name = STRBUF_INIT;
+	gc_config();
+
+	if (schedule)
+		initialize_maintenance_strategy();
+
+	for (i = 0; i < TASK__COUNT; i++) {
+		int config_value;
+		char *config_str;
+
+		strbuf_reset(&config_name);
+		strbuf_addf(&config_name, "maintenance.%s.enabled",
+			    tasks[i].name);
+
+		if (!git_config_get_bool(config_name.buf, &config_value))
+			tasks[i].enabled = config_value;
+
+		strbuf_reset(&config_name);
+		strbuf_addf(&config_name, "maintenance.%s.schedule",
+			    tasks[i].name);
+
+		if (!git_config_get_string(config_name.buf, &config_str)) {
+			tasks[i].schedule = parse_schedule(config_str);
+			free(config_str);
+		}
+	}
+
+	strbuf_release(&config_name);
+}
+
+static int task_option_parse(const struct option *opt,
+			     const char *arg, int unset)
+{
+	int i, num_selected = 0;
+	struct maintenance_task *task = NULL;
+
+	BUG_ON_OPT_NEG(unset);
+
+	for (i = 0; i < TASK__COUNT; i++) {
+		if (tasks[i].selected_order >= 0)
+			num_selected++;
+		if (!strcasecmp(tasks[i].name, arg)) {
+			task = &tasks[i];
+		}
+	}
+
+	if (!task) {
+		error(_("'%s' is not a valid task"), arg);
+		return 1;
+	}
+
+	if (task->selected_order >= 0) {
+		error(_("task '%s' cannot be selected multiple times"), arg);
+		return 1;
+	}
+
+	task->selected_order = num_selected + 1;
+
+	return 0;
+}
+
+static int maintenance_run(int argc, const char **argv, const char *prefix)
+{
+	int i;
+	struct maintenance_run_opts opts;
+	struct option builtin_maintenance_run_options[] = {
+		OPT_BOOL(0, "auto", &opts.auto_flag,
+			 N_("run tasks based on the state of the repository")),
+		OPT_CALLBACK(0, "schedule", &opts.schedule, N_("frequency"),
+			     N_("run tasks based on frequency"),
+			     maintenance_opt_schedule),
+		OPT_BOOL(0, "quiet", &opts.quiet,
+			 N_("do not report progress or other information over stderr")),
+		OPT_CALLBACK_F(0, "task", NULL, N_("task"),
+			N_("run a specific task"),
+			PARSE_OPT_NONEG, task_option_parse),
+		OPT_END()
+	};
+	memset(&opts, 0, sizeof(opts));
+
+	opts.quiet = !isatty(2);
+
+	for (i = 0; i < TASK__COUNT; i++)
+		tasks[i].selected_order = -1;
+
+	argc = parse_options(argc, argv, prefix,
+			     builtin_maintenance_run_options,
+			     builtin_maintenance_run_usage,
+			     PARSE_OPT_STOP_AT_NON_OPTION);
+
+	if (opts.auto_flag && opts.schedule)
+		die(_("use at most one of --auto and --schedule=<frequency>"));
+
+	initialize_task_config(opts.schedule);
+
+	if (argc != 0)
+		usage_with_options(builtin_maintenance_run_usage,
+				   builtin_maintenance_run_options);
+	return maintenance_run_tasks(&opts);
+}
+
+static char *get_maintpath(void)
+{
+	struct strbuf sb = STRBUF_INIT;
+	const char *p = the_repository->worktree ?
+		the_repository->worktree : the_repository->gitdir;
+
+	strbuf_realpath(&sb, p, 1);
+	return strbuf_detach(&sb, NULL);
+}
+
+static int maintenance_register(void)
+{
+	int rc;
+	char *config_value;
+	struct child_process config_set = CHILD_PROCESS_INIT;
+	struct child_process config_get = CHILD_PROCESS_INIT;
+	char *maintpath = get_maintpath();
+
+	/* Disable foreground maintenance */
+	git_config_set("maintenance.auto", "false");
+
+	/* Set maintenance strategy, if unset */
+	if (!git_config_get_string("maintenance.strategy", &config_value))
+		free(config_value);
+	else
+		git_config_set("maintenance.strategy", "incremental");
+
+	config_get.git_cmd = 1;
+	strvec_pushl(&config_get.args, "config", "--global", "--get",
+		     "--fixed-value", "maintenance.repo", maintpath, NULL);
+	config_get.out = -1;
+
+	if (start_command(&config_get)) {
+		rc = error(_("failed to run 'git config'"));
+		goto done;
+	}
+
+	/* We already have this value in our config! */
+	if (!finish_command(&config_get)) {
+		rc = 0;
+		goto done;
+	}
+
+	config_set.git_cmd = 1;
+	strvec_pushl(&config_set.args, "config", "--add", "--global", "maintenance.repo",
+		     maintpath, NULL);
+
+	rc = run_command(&config_set);
+
+done:
+	free(maintpath);
+	return rc;
+}
+
+static int maintenance_unregister(void)
+{
+	int rc;
+	struct child_process config_unset = CHILD_PROCESS_INIT;
+	char *maintpath = get_maintpath();
+
+	config_unset.git_cmd = 1;
+	strvec_pushl(&config_unset.args, "config", "--global", "--unset",
+		     "--fixed-value", "maintenance.repo", maintpath, NULL);
+
+	rc = run_command(&config_unset);
+	free(maintpath);
+	return rc;
+}
+
+static const char *get_frequency(enum schedule_priority schedule)
+{
+	switch (schedule) {
+	case SCHEDULE_HOURLY:
+		return "hourly";
+	case SCHEDULE_DAILY:
+		return "daily";
+	case SCHEDULE_WEEKLY:
+		return "weekly";
+	default:
+		BUG("invalid schedule %d", schedule);
+	}
+}
+
+static char *launchctl_service_name(const char *frequency)
+{
+	struct strbuf label = STRBUF_INIT;
+	strbuf_addf(&label, "org.git-scm.git.%s", frequency);
+	return strbuf_detach(&label, NULL);
+}
+
+static char *launchctl_service_filename(const char *name)
+{
+	char *expanded;
+	struct strbuf filename = STRBUF_INIT;
+	strbuf_addf(&filename, "~/Library/LaunchAgents/%s.plist", name);
+
+	expanded = interpolate_path(filename.buf, 1);
+	if (!expanded)
+		die(_("failed to expand path '%s'"), filename.buf);
+
+	strbuf_release(&filename);
+	return expanded;
+}
+
+static char *launchctl_get_uid(void)
+{
+	return xstrfmt("gui/%d", getuid());
+}
+
+static int launchctl_boot_plist(int enable, const char *filename, const char *cmd)
+{
+	int result;
+	struct child_process child = CHILD_PROCESS_INIT;
+	char *uid = launchctl_get_uid();
+
+	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);
+
+	child.no_stderr = 1;
+	child.no_stdout = 1;
+
+	if (start_command(&child))
+		die(_("failed to start launchctl"));
+
+	result = finish_command(&child);
+
+	free(uid);
+	return result;
+}
+
+static int launchctl_remove_plist(enum schedule_priority schedule, const char *cmd)
+{
+	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);
+	unlink(filename);
+	free(filename);
+	free(name);
+	return result;
+}
+
+static int launchctl_remove_plists(const char *cmd)
+{
+	return launchctl_remove_plist(SCHEDULE_HOURLY, cmd) ||
+		launchctl_remove_plist(SCHEDULE_DAILY, cmd) ||
+		launchctl_remove_plist(SCHEDULE_WEEKLY, cmd);
+}
+
+static int launchctl_list_contains_plist(const char *name, const char *cmd)
+{
+	int result;
+	struct child_process child = CHILD_PROCESS_INIT;
+	char *uid = launchctl_get_uid();
+
+	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"));
+
+	result = finish_command(&child);
+
+	free(uid);
+
+	/* Returns failure if 'name' doesn't exist. */
+	return !result;
+}
+
+static int launchctl_schedule_plist(const char *exec_path, enum schedule_priority schedule, const char *cmd)
+{
+	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;
+
+	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\">"
+		   "<dict>\n"
+		   "<key>Label</key><string>%s</string>\n"
+		   "<key>ProgramArguments</key>\n"
+		   "<array>\n"
+		   "<string>%s/git</string>\n"
+		   "<string>--exec-path=%s</string>\n"
+		   "<string>for-each-repo</string>\n"
+		   "<string>--config=maintenance.repo</string>\n"
+		   "<string>maintenance</string>\n"
+		   "<string>run</string>\n"
+		   "<string>--schedule=%s</string>\n"
+		   "</array>\n"
+		   "<key>StartCalendarInterval</key>\n"
+		   "<array>\n";
+	strbuf_addf(&plist, preamble, name, exec_path, exec_path, frequency);
+
+	switch (schedule) {
+	case SCHEDULE_HOURLY:
+		repeat = "<dict>\n"
+			 "<key>Hour</key><integer>%d</integer>\n"
+			 "<key>Minute</key><integer>0</integer>\n"
+			 "</dict>\n";
+		for (i = 1; i <= 23; i++)
+			strbuf_addf(&plist, repeat, i);
+		break;
+
+	case SCHEDULE_DAILY:
+		repeat = "<dict>\n"
+			 "<key>Day</key><integer>%d</integer>\n"
+			 "<key>Hour</key><integer>0</integer>\n"
+			 "<key>Minute</key><integer>0</integer>\n"
+			 "</dict>\n";
+		for (i = 1; i <= 6; i++)
+			strbuf_addf(&plist, repeat, i);
+		break;
+
+	case SCHEDULE_WEEKLY:
+		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;
+	}
+	strbuf_addstr(&plist, "</array>\n</dict>\n</plist>\n");
+
+	if (safe_create_leading_directories(filename))
+		die(_("failed to create directories for '%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, cmd);
+		if (launchctl_boot_plist(1, filename, cmd))
+			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)
+{
+	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);
+}
+
+static int launchctl_update_schedule(int run_maintenance, int fd, const char *cmd)
+{
+	if (run_maintenance)
+		return launchctl_add_plists(cmd);
+	else
+		return launchctl_remove_plists(cmd);
+}
+
+static char *schtasks_task_name(const char *frequency)
+{
+	struct strbuf label = STRBUF_INIT;
+	strbuf_addf(&label, "Git Maintenance (%s)", frequency);
+	return strbuf_detach(&label, NULL);
+}
+
+static int schtasks_remove_task(enum schedule_priority schedule, const char *cmd)
+{
+	int result;
+	struct strvec args = STRVEC_INIT;
+	const char *frequency = get_frequency(schedule);
+	char *name = schtasks_task_name(frequency);
+
+	strvec_split(&args, cmd);
+	strvec_pushl(&args, "/delete", "/tn", name, "/f", NULL);
+
+	result = run_command_v_opt(args.v, 0);
+
+	strvec_clear(&args);
+	free(name);
+	return result;
+}
+
+static int schtasks_remove_tasks(const char *cmd)
+{
+	return schtasks_remove_task(SCHEDULE_HOURLY, cmd) ||
+		schtasks_remove_task(SCHEDULE_DAILY, cmd) ||
+		schtasks_remove_task(SCHEDULE_WEEKLY, cmd);
+}
+
+static int schtasks_schedule_task(const char *exec_path, enum schedule_priority schedule, const char *cmd)
+{
+	int result;
+	struct child_process child = CHILD_PROCESS_INIT;
+	const char *xml;
+	struct tempfile *tfile;
+	const char *frequency = get_frequency(schedule);
+	char *name = schtasks_task_name(frequency);
+	struct strbuf tfilename = STRBUF_INIT;
+
+	strbuf_addf(&tfilename, "%s/schedule_%s_XXXXXX",
+		    get_git_common_dir(), frequency);
+	tfile = xmks_tempfile(tfilename.buf);
+	strbuf_release(&tfilename);
+
+	if (!fdopen_tempfile(tfile, "w"))
+		die(_("failed to create temp xml file"));
+
+	xml = "<?xml version=\"1.0\" ?>\n"
+	      "<Task version=\"1.4\" xmlns=\"http://schemas.microsoft.com/windows/2004/02/mit/task\">\n"
+	      "<Triggers>\n"
+	      "<CalendarTrigger>\n";
+	fputs(xml, tfile->fp);
+
+	switch (schedule) {
+	case SCHEDULE_HOURLY:
+		fprintf(tfile->fp,
+			"<StartBoundary>2020-01-01T01:00:00</StartBoundary>\n"
+			"<Enabled>true</Enabled>\n"
+			"<ScheduleByDay>\n"
+			"<DaysInterval>1</DaysInterval>\n"
+			"</ScheduleByDay>\n"
+			"<Repetition>\n"
+			"<Interval>PT1H</Interval>\n"
+			"<Duration>PT23H</Duration>\n"
+			"<StopAtDurationEnd>false</StopAtDurationEnd>\n"
+			"</Repetition>\n");
+		break;
+
+	case SCHEDULE_DAILY:
+		fprintf(tfile->fp,
+			"<StartBoundary>2020-01-01T00:00:00</StartBoundary>\n"
+			"<Enabled>true</Enabled>\n"
+			"<ScheduleByWeek>\n"
+			"<DaysOfWeek>\n"
+			"<Monday />\n"
+			"<Tuesday />\n"
+			"<Wednesday />\n"
+			"<Thursday />\n"
+			"<Friday />\n"
+			"<Saturday />\n"
+			"</DaysOfWeek>\n"
+			"<WeeksInterval>1</WeeksInterval>\n"
+			"</ScheduleByWeek>\n");
+		break;
+
+	case SCHEDULE_WEEKLY:
+		fprintf(tfile->fp,
+			"<StartBoundary>2020-01-01T00:00:00</StartBoundary>\n"
+			"<Enabled>true</Enabled>\n"
+			"<ScheduleByWeek>\n"
+			"<DaysOfWeek>\n"
+			"<Sunday />\n"
+			"</DaysOfWeek>\n"
+			"<WeeksInterval>1</WeeksInterval>\n"
+			"</ScheduleByWeek>\n");
+		break;
+
+	default:
+		break;
+	}
+
+	xml = "</CalendarTrigger>\n"
+	      "</Triggers>\n"
+	      "<Principals>\n"
+	      "<Principal id=\"Author\">\n"
+	      "<LogonType>InteractiveToken</LogonType>\n"
+	      "<RunLevel>LeastPrivilege</RunLevel>\n"
+	      "</Principal>\n"
+	      "</Principals>\n"
+	      "<Settings>\n"
+	      "<MultipleInstancesPolicy>IgnoreNew</MultipleInstancesPolicy>\n"
+	      "<Enabled>true</Enabled>\n"
+	      "<Hidden>true</Hidden>\n"
+	      "<UseUnifiedSchedulingEngine>true</UseUnifiedSchedulingEngine>\n"
+	      "<WakeToRun>false</WakeToRun>\n"
+	      "<ExecutionTimeLimit>PT72H</ExecutionTimeLimit>\n"
+	      "<Priority>7</Priority>\n"
+	      "</Settings>\n"
+	      "<Actions Context=\"Author\">\n"
+	      "<Exec>\n"
+	      "<Command>\"%s\\git.exe\"</Command>\n"
+	      "<Arguments>--exec-path=\"%s\" for-each-repo --config=maintenance.repo maintenance run --schedule=%s</Arguments>\n"
+	      "</Exec>\n"
+	      "</Actions>\n"
+	      "</Task>\n";
+	fprintf(tfile->fp, xml, exec_path, exec_path, frequency);
+	strvec_split(&child.args, cmd);
+	strvec_pushl(&child.args, "/create", "/tn", name, "/f", "/xml",
+				  get_tempfile_path(tfile), NULL);
+	close_tempfile_gently(tfile);
+
+	child.no_stdout = 1;
+	child.no_stderr = 1;
+
+	if (start_command(&child))
+		die(_("failed to start schtasks"));
+	result = finish_command(&child);
+
+	delete_tempfile(&tfile);
+	free(name);
+	return result;
+}
+
+static int schtasks_schedule_tasks(const char *cmd)
+{
+	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);
+}
+
+static int schtasks_update_schedule(int run_maintenance, int fd, const char *cmd)
+{
+	if (run_maintenance)
+		return schtasks_schedule_tasks(cmd);
+	else
+		return schtasks_remove_tasks(cmd);
+}
+
+#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)
+{
+	int result = 0;
+	int in_old_region = 0;
+	struct child_process crontab_list = CHILD_PROCESS_INIT;
+	struct child_process crontab_edit = CHILD_PROCESS_INIT;
+	FILE *cron_list, *cron_in;
+	struct strbuf line = STRBUF_INIT;
+
+	strvec_split(&crontab_list.args, cmd);
+	strvec_push(&crontab_list.args, "-l");
+	crontab_list.in = -1;
+	crontab_list.out = dup(fd);
+	crontab_list.git_cmd = 0;
+
+	if (start_command(&crontab_list))
+		return error(_("failed to run 'crontab -l'; your system might not support 'cron'"));
+
+	/* Ignore exit code, as an empty crontab will return error. */
+	finish_command(&crontab_list);
+
+	/*
+	 * Read from the .lock file, filtering out the old
+	 * schedule while appending the new schedule.
+	 */
+	cron_list = fdopen(fd, "r");
+	rewind(cron_list);
+
+	strvec_split(&crontab_edit.args, cmd);
+	crontab_edit.in = -1;
+	crontab_edit.git_cmd = 0;
+
+	if (start_command(&crontab_edit))
+		return error(_("failed to run 'crontab'; your system might not support 'cron'"));
+
+	cron_in = fdopen(crontab_edit.in, "w");
+	if (!cron_in) {
+		result = error(_("failed to open stdin of 'crontab'"));
+		goto done_editing;
+	}
+
+	while (!strbuf_getline_lf(&line, cron_list)) {
+		if (!in_old_region && !strcmp(line.buf, BEGIN_LINE))
+			in_old_region = 1;
+		else if (in_old_region && !strcmp(line.buf, END_LINE))
+			in_old_region = 0;
+		else if (!in_old_region)
+			fprintf(cron_in, "%s\n", line.buf);
+	}
+	strbuf_release(&line);
+
+	if (run_maintenance) {
+		struct strbuf line_format = STRBUF_INIT;
+		const char *exec_path = git_exec_path();
+
+		fprintf(cron_in, "%s\n", BEGIN_LINE);
+		fprintf(cron_in,
+			"# The following schedule was created by Git\n");
+		fprintf(cron_in, "# Any edits made in this region might be\n");
+		fprintf(cron_in,
+			"# replaced in the future by a Git command.\n\n");
+
+		strbuf_addf(&line_format,
+			    "%%s %%s * * %%s \"%s/git\" --exec-path=\"%s\" for-each-repo --config=maintenance.repo maintenance run --schedule=%%s\n",
+			    exec_path, exec_path);
+		fprintf(cron_in, line_format.buf, "0", "1-23", "*", "hourly");
+		fprintf(cron_in, line_format.buf, "0", "0", "1-6", "daily");
+		fprintf(cron_in, line_format.buf, "0", "0", "0", "weekly");
+		strbuf_release(&line_format);
+
+		fprintf(cron_in, "\n%s\n", END_LINE);
+	}
+
+	fflush(cron_in);
+	fclose(cron_in);
+	close(crontab_edit.in);
+
+done_editing:
+	if (finish_command(&crontab_edit))
+		result = error(_("'crontab' died"));
+	else
+		fclose(cron_list);
+	return result;
+}
+
+#if defined(__APPLE__)
+static const char platform_scheduler[] = "launchctl";
+#elif defined(GIT_WINDOWS_NATIVE)
+static const char platform_scheduler[] = "schtasks";
+#else
+static const char platform_scheduler[] = "crontab";
+#endif
+
+static int update_background_schedule(int enable)
+{
+	int result;
+	const char *scheduler = platform_scheduler;
+	const char *cmd = scheduler;
+	char *testing;
+	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) {
+		result = error(_("another process is scheduling background maintenance"));
+		goto cleanup;
+	}
+
+	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);
+
+	rollback_lock_file(&lk);
+
+cleanup:
+	free(lock_path);
+	free(testing);
+	return result;
+}
+
+static int maintenance_start(void)
+{
+	if (maintenance_register())
+		warning(_("failed to add repo to global config"));
+
+	return update_background_schedule(1);
+}
+
+static int maintenance_stop(void)
+{
+	return update_background_schedule(0);
+}
+
+static const char builtin_maintenance_usage[] =	N_("git maintenance <subcommand> [<options>]");
+
+int cmd_maintenance(int argc, const char **argv, const char *prefix)
+{
+	if (argc < 2 ||
+	    (argc == 2 && !strcmp(argv[1], "-h")))
+		usage(builtin_maintenance_usage);
+
+	if (!strcmp(argv[1], "run"))
+		return maintenance_run(argc - 1, argv + 1, prefix);
+	if (!strcmp(argv[1], "start"))
+		return maintenance_start();
+	if (!strcmp(argv[1], "stop"))
+		return maintenance_stop();
+	if (!strcmp(argv[1], "register"))
+		return maintenance_register();
+	if (!strcmp(argv[1], "unregister"))
+		return maintenance_unregister();
+
+	die(_("invalid subcommand: %s"), argv[1]);
+}
diff --git a/builtin/grep.c b/builtin/grep.c
index 50ce8d9461..7d2f8e5adb 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -24,6 +24,7 @@
 #include "submodule.h"
 #include "submodule-config.h"
 #include "object-store.h"
+#include "packfile.h"
 
 static char const * const grep_usage[] = {
 	N_("git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"),
@@ -32,7 +33,6 @@ static char const * const grep_usage[] = {
 
 static int recurse_submodules;
 
-#define GREP_NUM_THREADS_DEFAULT 8
 static int num_threads;
 
 static pthread_t *threads;
@@ -91,8 +91,11 @@ static pthread_cond_t cond_result;
 
 static int skip_first_line;
 
-static void add_work(struct grep_opt *opt, const struct grep_source *gs)
+static void add_work(struct grep_opt *opt, struct grep_source *gs)
 {
+	if (opt->binary != GREP_BINARY_TEXT)
+		grep_source_load_driver(gs, opt->repo->index);
+
 	grep_lock();
 
 	while ((todo_end+1) % ARRAY_SIZE(todo) == todo_done) {
@@ -100,9 +103,6 @@ static void add_work(struct grep_opt *opt, const struct grep_source *gs)
 	}
 
 	todo[todo_end].source = *gs;
-	if (opt->binary != GREP_BINARY_TEXT)
-		grep_source_load_driver(&todo[todo_end].source,
-					opt->repo->index);
 	todo[todo_end].done = 0;
 	strbuf_reset(&todo[todo_end].out);
 	todo_end = (todo_end + 1) % ARRAY_SIZE(todo);
@@ -200,24 +200,22 @@ static void start_threads(struct grep_opt *opt)
 	int i;
 
 	pthread_mutex_init(&grep_mutex, NULL);
-	pthread_mutex_init(&grep_read_mutex, NULL);
 	pthread_mutex_init(&grep_attr_mutex, NULL);
 	pthread_cond_init(&cond_add, NULL);
 	pthread_cond_init(&cond_write, NULL);
 	pthread_cond_init(&cond_result, NULL);
 	grep_use_locks = 1;
+	enable_obj_read_lock();
 
 	for (i = 0; i < ARRAY_SIZE(todo); i++) {
 		strbuf_init(&todo[i].out, 0);
 	}
 
-	threads = xcalloc(num_threads, sizeof(*threads));
+	CALLOC_ARRAY(threads, num_threads);
 	for (i = 0; i < num_threads; i++) {
 		int err;
 		struct grep_opt *o = grep_opt_dup(opt);
 		o->output = strbuf_out;
-		if (i)
-			o->debug = 0;
 		compile_grep_patterns(o);
 		err = pthread_create(&threads[i], NULL, run, o);
 
@@ -257,12 +255,12 @@ static int wait_all(void)
 	free(threads);
 
 	pthread_mutex_destroy(&grep_mutex);
-	pthread_mutex_destroy(&grep_read_mutex);
 	pthread_mutex_destroy(&grep_attr_mutex);
 	pthread_cond_destroy(&cond_add);
 	pthread_cond_destroy(&cond_write);
 	pthread_cond_destroy(&cond_result);
 	grep_use_locks = 0;
+	disable_obj_read_lock();
 
 	return hit;
 }
@@ -295,14 +293,36 @@ static int grep_cmd_config(const char *var, const char *value, void *cb)
 	return st;
 }
 
-static void *lock_and_read_oid_file(const struct object_id *oid, enum object_type *type, unsigned long *size)
+static void grep_source_name(struct grep_opt *opt, const char *filename,
+			     int tree_name_len, struct strbuf *out)
 {
-	void *data;
+	strbuf_reset(out);
+
+	if (opt->null_following_name) {
+		if (opt->relative && opt->prefix_length) {
+			struct strbuf rel_buf = STRBUF_INIT;
+			const char *rel_name =
+				relative_path(filename + tree_name_len,
+					      opt->prefix, &rel_buf);
+
+			if (tree_name_len)
+				strbuf_add(out, filename, tree_name_len);
+
+			strbuf_addstr(out, rel_name);
+			strbuf_release(&rel_buf);
+		} else {
+			strbuf_addstr(out, filename);
+		}
+		return;
+	}
+
+	if (opt->relative && opt->prefix_length)
+		quote_path(filename + tree_name_len, opt->prefix, out, 0);
+	else
+		quote_c_style(filename + tree_name_len, out, NULL, 0);
 
-	grep_read_lock();
-	data = read_object_file(oid, type, size);
-	grep_read_unlock();
-	return data;
+	if (tree_name_len)
+		strbuf_insert(out, 0, filename, tree_name_len);
 }
 
 static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
@@ -312,13 +332,7 @@ static int grep_oid(struct grep_opt *opt, const struct object_id *oid,
 	struct strbuf pathbuf = STRBUF_INIT;
 	struct grep_source gs;
 
-	if (opt->relative && opt->prefix_length) {
-		quote_path_relative(filename + tree_name_len, opt->prefix, &pathbuf);
-		strbuf_insert(&pathbuf, 0, filename, tree_name_len);
-	} else {
-		strbuf_addstr(&pathbuf, filename);
-	}
-
+	grep_source_name(opt, filename, tree_name_len, &pathbuf);
 	grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid);
 	strbuf_release(&pathbuf);
 
@@ -344,11 +358,7 @@ static int grep_file(struct grep_opt *opt, const char *filename)
 	struct strbuf buf = STRBUF_INIT;
 	struct grep_source gs;
 
-	if (opt->relative && opt->prefix_length)
-		quote_path_relative(filename, opt->prefix, &buf);
-	else
-		strbuf_addstr(&buf, filename);
-
+	grep_source_name(opt, filename, 0, &buf);
 	grep_source_init(&gs, GREP_SOURCE_FILE, buf.buf, filename, filename);
 	strbuf_release(&buf);
 
@@ -385,7 +395,7 @@ static void run_pager(struct grep_opt *opt, const char *prefix)
 	int i, status;
 
 	for (i = 0; i < path_list->nr; i++)
-		argv_array_push(&child.args, path_list->items[i].string);
+		strvec_push(&child.args, path_list->items[i].string);
 	child.dir = prefix;
 	child.use_shell = 1;
 
@@ -407,30 +417,28 @@ static int grep_submodule(struct grep_opt *opt,
 {
 	struct repository subrepo;
 	struct repository *superproject = opt->repo;
-	const struct submodule *sub = submodule_from_path(superproject,
-							  &null_oid, path);
+	const struct submodule *sub;
 	struct grep_opt subopt;
 	int hit;
 
-	/*
-	 * NEEDSWORK: submodules functions need to be protected because they
-	 * access the object store via config_from_gitmodules(): the latter
-	 * uses get_oid() which, for now, relies on the global the_repository
-	 * object.
-	 */
-	grep_read_lock();
+	sub = submodule_from_path(superproject, null_oid(), path);
 
-	if (!is_submodule_active(superproject, path)) {
-		grep_read_unlock();
+	if (!is_submodule_active(superproject, path))
 		return 0;
-	}
 
-	if (repo_submodule_init(&subrepo, superproject, sub)) {
-		grep_read_unlock();
+	if (repo_submodule_init(&subrepo, superproject, sub))
 		return 0;
-	}
 
-	repo_read_gitmodules(&subrepo);
+	/*
+	 * NEEDSWORK: repo_read_gitmodules() might call
+	 * add_to_alternates_memory() via config_from_gitmodules(). This
+	 * operation causes a race condition with concurrent object readings
+	 * performed by the worker threads. That's why we need obj_read_lock()
+	 * here. It should be removed once it's no longer necessary to add the
+	 * subrepo's odbs to the in-memory alternates list.
+	 */
+	obj_read_lock();
+	repo_read_gitmodules(&subrepo, 0);
 
 	/*
 	 * NEEDSWORK: This adds the submodule's object directory to the list of
@@ -443,7 +451,7 @@ static int grep_submodule(struct grep_opt *opt,
 	 * object.
 	 */
 	add_to_alternates_memory(subrepo.objects->odb->path);
-	grep_read_unlock();
+	obj_read_unlock();
 
 	memcpy(&subopt, opt, sizeof(subopt));
 	subopt.repo = &subrepo;
@@ -455,14 +463,12 @@ static int grep_submodule(struct grep_opt *opt,
 		unsigned long size;
 		struct strbuf base = STRBUF_INIT;
 
-		object = parse_object_or_die(oid, oid_to_hex(oid));
-
-		grep_read_lock();
+		obj_read_lock();
+		object = parse_object_or_die(oid, NULL);
+		obj_read_unlock();
 		data = read_object_with_reference(&subrepo,
 						  &object->oid, tree_type,
 						  &size, NULL);
-		grep_read_unlock();
-
 		if (!data)
 			die(_("unable to read tree (%s)"), oid_to_hex(&object->oid));
 
@@ -498,8 +504,14 @@ static int grep_cache(struct grep_opt *opt,
 	if (repo_read_index(repo) < 0)
 		die(_("index file corrupt"));
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(repo->index);
 	for (nr = 0; nr < repo->index->cache_nr; nr++) {
 		const struct cache_entry *ce = repo->index->cache[nr];
+
+		if (!cached && ce_skip_worktree(ce))
+			continue;
+
 		strbuf_setlen(&name, name_base_len);
 		strbuf_addstr(&name, ce->name);
 
@@ -512,8 +524,7 @@ static int grep_cache(struct grep_opt *opt,
 			 * cache entry are identical, even if worktree file has
 			 * been modified, so use cache version instead
 			 */
-			if (cached || (ce->ce_flags & CE_VALID) ||
-			    ce_skip_worktree(ce)) {
+			if (cached || (ce->ce_flags & CE_VALID)) {
 				if (ce_stage(ce) || ce_intent_to_add(ce))
 					continue;
 				hit |= grep_oid(opt, &ce->oid, name.buf,
@@ -587,7 +598,7 @@ static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
 			void *data;
 			unsigned long size;
 
-			data = lock_and_read_oid_file(&entry.oid, &type, &size);
+			data = read_object_file(&entry.oid, &type, &size);
 			if (!data)
 				die(_("unable to read tree (%s)"),
 				    oid_to_hex(&entry.oid));
@@ -625,12 +636,9 @@ static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
 		struct strbuf base;
 		int hit, len;
 
-		grep_read_lock();
 		data = read_object_with_reference(opt->repo,
 						  &obj->oid, tree_type,
 						  &size, NULL);
-		grep_read_unlock();
-
 		if (!data)
 			die(_("unable to read tree (%s)"), oid_to_hex(&obj->oid));
 
@@ -659,13 +667,29 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
 
 	for (i = 0; i < nr; i++) {
 		struct object *real_obj;
+
+		obj_read_lock();
 		real_obj = deref_tag(opt->repo, list->objects[i].item,
 				     NULL, 0);
+		obj_read_unlock();
+
+		if (!real_obj) {
+			char hex[GIT_MAX_HEXSZ + 1];
+			const char *name = list->objects[i].name;
+
+			if (!name) {
+				oid_to_hex_r(hex, &list->objects[i].item->oid);
+				name = hex;
+			}
+			die(_("invalid object '%s' given."), name);
+		}
 
 		/* load the gitmodules file for this rev */
 		if (recurse_submodules) {
 			submodule_free(opt->repo);
+			obj_read_lock();
 			gitmodules_config_oid(&real_obj->oid);
+			obj_read_unlock();
 		}
 		if (grep_object(opt, pathspec, real_obj, list->objects[i].name,
 				list->objects[i].path)) {
@@ -680,10 +704,9 @@ static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
 static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec,
 			  int exc_std, int use_index)
 {
-	struct dir_struct dir;
+	struct dir_struct dir = DIR_INIT;
 	int i, hit = 0;
 
-	memset(&dir, 0, sizeof(dir));
 	if (!use_index)
 		dir.flags |= DIR_NO_GITLINKS;
 	if (exc_std)
@@ -691,12 +714,11 @@ static int grep_directory(struct grep_opt *opt, const struct pathspec *pathspec,
 
 	fill_directory(&dir, opt->repo->index, pathspec);
 	for (i = 0; i < dir.nr; i++) {
-		if (!dir_path_match(opt->repo->index, dir.entries[i], pathspec, 0, NULL))
-			continue;
 		hit |= grep_file(opt, dir.entries[i]->name);
 		if (hit && opt->status_only)
 			break;
 	}
+	dir_clear(&dir);
 	return hit;
 }
 
@@ -898,27 +920,24 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		OPT_GROUP(""),
 		OPT_CALLBACK('f', NULL, &opt, N_("file"),
 			N_("read patterns from file"), file_callback),
-		{ OPTION_CALLBACK, 'e', NULL, &opt, N_("pattern"),
-			N_("match <pattern>"), PARSE_OPT_NONEG, pattern_callback },
-		{ OPTION_CALLBACK, 0, "and", &opt, NULL,
-		  N_("combine patterns specified with -e"),
-		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, and_callback },
+		OPT_CALLBACK_F('e', NULL, &opt, N_("pattern"),
+			N_("match <pattern>"), PARSE_OPT_NONEG, pattern_callback),
+		OPT_CALLBACK_F(0, "and", &opt, NULL,
+			N_("combine patterns specified with -e"),
+			PARSE_OPT_NOARG | PARSE_OPT_NONEG, and_callback),
 		OPT_BOOL(0, "or", &dummy, ""),
-		{ OPTION_CALLBACK, 0, "not", &opt, NULL, "",
-		  PARSE_OPT_NOARG | PARSE_OPT_NONEG, not_callback },
-		{ OPTION_CALLBACK, '(', NULL, &opt, NULL, "",
-		  PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH,
-		  open_callback },
-		{ OPTION_CALLBACK, ')', NULL, &opt, NULL, "",
-		  PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH,
-		  close_callback },
+		OPT_CALLBACK_F(0, "not", &opt, NULL, "",
+			PARSE_OPT_NOARG | PARSE_OPT_NONEG, not_callback),
+		OPT_CALLBACK_F('(', NULL, &opt, NULL, "",
+			PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH,
+			open_callback),
+		OPT_CALLBACK_F(')', NULL, &opt, NULL, "",
+			PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH,
+			close_callback),
 		OPT__QUIET(&opt.status_only,
 			   N_("indicate hit with exit status without output")),
 		OPT_BOOL(0, "all-match", &opt.all_match,
 			N_("show only matches from files that match all patterns")),
-		OPT_SET_INT_F(0, "debug", &opt.debug,
-			      N_("show parse tree for grep expression"),
-			      1, PARSE_OPT_HIDDEN),
 		OPT_GROUP(""),
 		{ OPTION_STRING, 'O', "open-files-in-pager", &show_in_pager,
 			N_("pager"), N_("show matching files in the pager"),
@@ -930,7 +949,6 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		OPT_END()
 	};
 
-	init_grep_defaults(the_repository);
 	git_config(grep_cmd_config, NULL);
 	grep_init(&opt, the_repository, prefix);
 
@@ -958,6 +976,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 			/* die the same way as if we did it at the beginning */
 			setup_git_directory();
 	}
+	/* Ignore --recurse-submodules if --no-index is given or implied */
+	if (!use_index)
+		recurse_submodules = 0;
 
 	/*
 	 * skip a -- separator; we know it cannot be
@@ -1062,7 +1083,10 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	pathspec.recursive = 1;
 	pathspec.recurse_submodules = !!recurse_submodules;
 
-	if (list.nr || cached || show_in_pager) {
+	if (recurse_submodules && untracked)
+		die(_("--untracked not supported with --recurse-submodules"));
+
+	if (show_in_pager) {
 		if (num_threads > 1)
 			warning(_("invalid option combination, ignoring --threads"));
 		num_threads = 1;
@@ -1072,7 +1096,7 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 	} else if (num_threads < 0)
 		die(_("invalid number of threads specified (%d)"), num_threads);
 	else if (num_threads == 0)
-		num_threads = HAVE_THREADS ? GREP_NUM_THREADS_DEFAULT : 1;
+		num_threads = HAVE_THREADS ? online_cpus() : 1;
 
 	if (num_threads > 1) {
 		if (!HAVE_THREADS)
@@ -1081,6 +1105,17 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		    && (opt.pre_context || opt.post_context ||
 			opt.file_break || opt.funcbody))
 			skip_first_line = 1;
+
+		/*
+		 * Pre-read gitmodules (if not read already) and force eager
+		 * initialization of packed_git to prevent racy lazy
+		 * reading/initialization once worker threads are started.
+		 */
+		if (recurse_submodules)
+			repo_read_gitmodules(the_repository, 1);
+		if (startup_info->have_repository)
+			(void)get_packed_git(the_repository);
+
 		start_threads(&opt);
 	} else {
 		/*
@@ -1115,15 +1150,15 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		}
 	}
 
-	if (recurse_submodules && (!use_index || untracked))
-		die(_("option not supported with --recurse-submodules"));
-
 	if (!show_in_pager && !opt.status_only)
 		setup_pager();
 
 	if (!use_index && (untracked || cached))
 		die(_("--cached or --untracked cannot be used with --no-index"));
 
+	if (untracked && cached)
+		die(_("--untracked cannot be used with --cached"));
+
 	if (!use_index || untracked) {
 		int use_exclude = (opt_exclude < 0) ? use_index : !!opt_exclude;
 		hit = grep_directory(&opt, &pathspec, use_exclude, use_index);
@@ -1147,6 +1182,5 @@ int cmd_grep(int argc, const char **argv, const char *prefix)
 		run_pager(&opt, prefix);
 	clear_pathspec(&pathspec);
 	free_grep_patterns(&opt);
-	grep_destroy();
 	return !hit;
 }
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 640ef4ded5..2e6e2ddd0c 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);
 }
 
diff --git a/builtin/help.c b/builtin/help.c
index e5590d7787..b7eec06c3d 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -8,6 +8,7 @@
 #include "parse-options.h"
 #include "run-command.h"
 #include "column.h"
+#include "config-list.h"
 #include "help.h"
 #include "alias.h"
 
@@ -62,6 +63,91 @@ static const char * const builtin_help_usage[] = {
 	NULL
 };
 
+struct slot_expansion {
+	const char *prefix;
+	const char *placeholder;
+	void (*fn)(struct string_list *list, const char *prefix);
+	int found;
+};
+
+static void list_config_help(int for_human)
+{
+	struct slot_expansion slot_expansions[] = {
+		{ "advice", "*", list_config_advices },
+		{ "color.branch", "<slot>", list_config_color_branch_slots },
+		{ "color.decorate", "<slot>", list_config_color_decorate_slots },
+		{ "color.diff", "<slot>", list_config_color_diff_slots },
+		{ "color.grep", "<slot>", list_config_color_grep_slots },
+		{ "color.interactive", "<slot>", list_config_color_interactive_slots },
+		{ "color.remote", "<slot>", list_config_color_sideband_slots },
+		{ "color.status", "<slot>", list_config_color_status_slots },
+		{ "fsck", "<msg-id>", list_config_fsck_msg_ids },
+		{ "receive.fsck", "<msg-id>", list_config_fsck_msg_ids },
+		{ NULL, NULL, NULL }
+	};
+	const char **p;
+	struct slot_expansion *e;
+	struct string_list keys = STRING_LIST_INIT_DUP;
+	int i;
+
+	for (p = config_name_list; *p; p++) {
+		const char *var = *p;
+		struct strbuf sb = STRBUF_INIT;
+
+		for (e = slot_expansions; e->prefix; e++) {
+
+			strbuf_reset(&sb);
+			strbuf_addf(&sb, "%s.%s", e->prefix, e->placeholder);
+			if (!strcasecmp(var, sb.buf)) {
+				e->fn(&keys, e->prefix);
+				e->found++;
+				break;
+			}
+		}
+		strbuf_release(&sb);
+		if (!e->prefix)
+			string_list_append(&keys, var);
+	}
+
+	for (e = slot_expansions; e->prefix; e++)
+		if (!e->found)
+			BUG("slot_expansion %s.%s is not used",
+			    e->prefix, e->placeholder);
+
+	string_list_sort(&keys);
+	for (i = 0; i < keys.nr; i++) {
+		const char *var = keys.items[i].string;
+		const char *wildcard, *tag, *cut;
+
+		if (for_human) {
+			puts(var);
+			continue;
+		}
+
+		wildcard = strchr(var, '*');
+		tag = strchr(var, '<');
+
+		if (!wildcard && !tag) {
+			puts(var);
+			continue;
+		}
+
+		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);
+	}
+	string_list_clear(&keys, 0);
+}
+
 static enum help_format parse_help_format(const char *format)
 {
 	if (!strcmp(format, "man"))
@@ -242,7 +328,7 @@ static int add_man_viewer_cmd(const char *name,
 static int add_man_viewer_info(const char *var, const char *value)
 {
 	const char *name, *subkey;
-	int namelen;
+	size_t namelen;
 
 	if (parse_config_key(var, "man", &name, &namelen, &subkey) < 0 || !name)
 		return 0;
@@ -350,10 +436,9 @@ static void exec_viewer(const char *name, const char *page)
 		warning(_("'%s': unknown man viewer."), name);
 }
 
-static void show_man_page(const char *git_cmd)
+static void show_man_page(const char *page)
 {
 	struct man_viewer_list *viewer;
-	const char *page = cmd_to_page(git_cmd);
 	const char *fallback = getenv("GIT_MAN_VIEWER");
 
 	setup_man_path();
@@ -367,9 +452,8 @@ static void show_man_page(const char *git_cmd)
 	die(_("no man viewer handled the request"));
 }
 
-static void show_info_page(const char *git_cmd)
+static void show_info_page(const char *page)
 {
-	const char *page = cmd_to_page(git_cmd);
 	setenv("INFOPATH", system_path(GIT_INFO_PATH), 1);
 	execlp("info", "info", "gitman", page, (char *)NULL);
 	die(_("no info viewer handled the request"));
@@ -400,9 +484,8 @@ static void open_html(const char *path)
 	execl_git_cmd("web--browse", "-c", "help.browser", path, (char *)NULL);
 }
 
-static void show_html_page(const char *git_cmd)
+static void show_html_page(const char *page)
 {
-	const char *page = cmd_to_page(git_cmd);
 	struct strbuf page_path; /* it leaks but we exec bellow */
 
 	get_html_page_path(&page_path, page);
@@ -462,6 +545,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
 {
 	int nongit;
 	enum help_format parsed_help_format;
+	const char *page;
 
 	argc = parse_options(argc, argv, prefix, builtin_help_options,
 			builtin_help_usage, 0);
@@ -493,7 +577,7 @@ int cmd_help(int argc, const char **argv, const char *prefix)
 	}
 
 	if (show_guides)
-		list_common_guides_help();
+		list_guides_help();
 
 	if (show_all || show_guides) {
 		printf("%s\n", _(git_more_info_string));
@@ -520,16 +604,17 @@ int cmd_help(int argc, const char **argv, const char *prefix)
 
 	argv[0] = check_git_cmd(argv[0]);
 
+	page = cmd_to_page(argv[0]);
 	switch (help_format) {
 	case HELP_FORMAT_NONE:
 	case HELP_FORMAT_MAN:
-		show_man_page(argv[0]);
+		show_man_page(page);
 		break;
 	case HELP_FORMAT_INFO:
-		show_info_page(argv[0]);
+		show_info_page(page);
 		break;
 	case HELP_FORMAT_WEB:
-		show_html_page(argv[0]);
+		show_html_page(page);
 		break;
 	}
 
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 60a5591039..6cc4890217 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -17,7 +17,7 @@
 #include "promisor-remote.h"
 
 static const char index_pack_usage[] =
-"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
+"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--[no-]rev-index] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
 
 struct object_entry {
 	struct pack_idx_entry idx;
@@ -33,19 +33,61 @@ struct object_stat {
 };
 
 struct base_data {
+	/* Initialized by make_base(). */
 	struct base_data *base;
-	struct base_data *child;
 	struct object_entry *obj;
-	void *data;
-	unsigned long size;
 	int ref_first, ref_last;
 	int ofs_first, ofs_last;
+	/*
+	 * Threads should increment retain_data if they are about to call
+	 * patch_delta() using this struct's data as a base, and decrement this
+	 * when they are done. While retain_data is nonzero, this struct's data
+	 * will not be freed even if the delta base cache limit is exceeded.
+	 */
+	int retain_data;
+	/*
+	 * The number of direct children that have not been fully processed
+	 * (entered work_head, entered done_head, left done_head). When this
+	 * number reaches zero, this struct base_data can be freed.
+	 */
+	int children_remaining;
+
+	/* Not initialized by make_base(). */
+	struct list_head list;
+	void *data;
+	unsigned long size;
 };
 
+/*
+ * Stack of struct base_data that have unprocessed children.
+ * threaded_second_pass() uses this as a source of work (the other being the
+ * objects array).
+ *
+ * Guarded by work_mutex.
+ */
+static LIST_HEAD(work_head);
+
+/*
+ * Stack of struct base_data that have children, all of whom have been
+ * processed or are being processed, and at least one child is being processed.
+ * These struct base_data must be kept around until the last child is
+ * processed.
+ *
+ * Guarded by work_mutex.
+ */
+static LIST_HEAD(done_head);
+
+/*
+ * All threads share one delta base cache.
+ *
+ * base_cache_used is guarded by work_mutex, and base_cache_limit is read-only
+ * in a thread.
+ */
+static size_t base_cache_used;
+static size_t base_cache_limit;
+
 struct thread_local {
 	pthread_t thread;
-	struct base_data *base_cache;
-	size_t base_cache_used;
 	int pack_fd;
 };
 
@@ -78,7 +120,7 @@ static int nr_threads;
 static int from_stdin;
 static int strict;
 static int do_fsck_object;
-static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
+static struct fsck_options fsck_options = FSCK_OPTIONS_MISSING_GITMODULES;
 static int verbose;
 static int show_resolving_progress;
 static int show_stat;
@@ -117,10 +159,6 @@ static pthread_mutex_t deepest_delta_mutex;
 #define deepest_delta_lock()	lock_mutex(&deepest_delta_mutex)
 #define deepest_delta_unlock()	unlock_mutex(&deepest_delta_mutex)
 
-static pthread_mutex_t type_cas_mutex;
-#define type_cas_lock()		lock_mutex(&type_cas_mutex)
-#define type_cas_unlock()	unlock_mutex(&type_cas_mutex)
-
 static pthread_key_t key;
 
 static inline void lock_mutex(pthread_mutex_t *mutex)
@@ -144,11 +182,10 @@ static void init_thread(void)
 	init_recursive_mutex(&read_mutex);
 	pthread_mutex_init(&counter_mutex, NULL);
 	pthread_mutex_init(&work_mutex, NULL);
-	pthread_mutex_init(&type_cas_mutex, NULL);
 	if (show_stat)
 		pthread_mutex_init(&deepest_delta_mutex, NULL);
 	pthread_key_create(&key, NULL);
-	thread_data = xcalloc(nr_threads, sizeof(*thread_data));
+	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)
@@ -167,7 +204,6 @@ static void cleanup_thread(void)
 	pthread_mutex_destroy(&read_mutex);
 	pthread_mutex_destroy(&counter_mutex);
 	pthread_mutex_destroy(&work_mutex);
-	pthread_mutex_destroy(&type_cas_mutex);
 	if (show_stat)
 		pthread_mutex_destroy(&deepest_delta_mutex);
 	for (i = 0; i < nr_threads; i++)
@@ -176,7 +212,8 @@ static void cleanup_thread(void)
 	free(thread_data);
 }
 
-static int mark_link(struct object *obj, int type, void *data, struct fsck_options *options)
+static int mark_link(struct object *obj, enum object_type type,
+		     void *data, struct fsck_options *options)
 {
 	if (!obj)
 		return -1;
@@ -301,15 +338,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;
 	}
@@ -332,9 +365,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;
@@ -364,56 +395,42 @@ static void set_thread_data(struct thread_local *data)
 		pthread_setspecific(key, data);
 }
 
-static struct base_data *alloc_base_data(void)
-{
-	struct base_data *base = xcalloc(1, sizeof(struct base_data));
-	base->ref_last = -1;
-	base->ofs_last = -1;
-	return base;
-}
-
 static void free_base_data(struct base_data *c)
 {
 	if (c->data) {
 		FREE_AND_NULL(c->data);
-		get_thread_data()->base_cache_used -= c->size;
+		base_cache_used -= c->size;
 	}
 }
 
 static void prune_base_data(struct base_data *retain)
 {
-	struct base_data *b;
-	struct thread_local *data = get_thread_data();
-	for (b = data->base_cache;
-	     data->base_cache_used > delta_base_cache_limit && b;
-	     b = b->child) {
-		if (b->data && b != retain)
-			free_base_data(b);
-	}
-}
+	struct list_head *pos;
 
-static void link_base_data(struct base_data *base, struct base_data *c)
-{
-	if (base)
-		base->child = c;
-	else
-		get_thread_data()->base_cache = c;
+	if (base_cache_used <= base_cache_limit)
+		return;
 
-	c->base = base;
-	c->child = NULL;
-	if (c->data)
-		get_thread_data()->base_cache_used += c->size;
-	prune_base_data(c);
-}
+	list_for_each_prev(pos, &done_head) {
+		struct base_data *b = list_entry(pos, struct base_data, list);
+		if (b->retain_data || b == retain)
+			continue;
+		if (b->data) {
+			free_base_data(b);
+			if (base_cache_used <= base_cache_limit)
+				return;
+		}
+	}
 
-static void unlink_base_data(struct base_data *c)
-{
-	struct base_data *base = c->base;
-	if (base)
-		base->child = NULL;
-	else
-		get_thread_data()->base_cache = NULL;
-	free_base_data(c);
+	list_for_each_prev(pos, &work_head) {
+		struct base_data *b = list_entry(pos, struct base_data, list);
+		if (b->retain_data || b == retain)
+			continue;
+		if (b->data) {
+			free_base_data(b);
+			if (base_cache_used <= base_cache_limit)
+				return;
+		}
+	}
 }
 
 static int is_delta_type(enum object_type type)
@@ -466,7 +483,7 @@ static void *unpack_entry_data(off_t offset, unsigned long size,
 		bad_object(offset, _("inflate returned %d"), status);
 	git_inflate_end(&stream);
 	if (oid)
-		the_hash_algo->final_fn(oid->hash, &c);
+		the_hash_algo->final_oid_fn(oid, &c);
 	return buf == fixed_buf ? NULL : buf;
 }
 
@@ -501,7 +518,7 @@ static void *unpack_raw_entry(struct object_entry *obj,
 
 	switch (obj->type) {
 	case OBJ_REF_DELTA:
-		hashcpy(ref_oid->hash, fill(the_hash_algo->rawsz));
+		oidread(ref_oid, fill(the_hash_algo->rawsz));
 		use(the_hash_algo->rawsz);
 		break;
 	case OBJ_OFS_DELTA:
@@ -614,7 +631,7 @@ static int compare_ofs_delta_bases(off_t offset1, off_t offset2,
 	       0;
 }
 
-static int find_ofs_delta(const off_t offset, enum object_type type)
+static int find_ofs_delta(const off_t offset)
 {
 	int first = 0, last = nr_ofs_deltas;
 
@@ -624,7 +641,8 @@ static int find_ofs_delta(const off_t offset, enum object_type type)
 		int cmp;
 
 		cmp = compare_ofs_delta_bases(offset, delta->offset,
-					      type, objects[delta->obj_no].type);
+					      OBJ_OFS_DELTA,
+					      objects[delta->obj_no].type);
 		if (!cmp)
 			return next;
 		if (cmp < 0) {
@@ -637,10 +655,9 @@ static int find_ofs_delta(const off_t offset, enum object_type type)
 }
 
 static void find_ofs_delta_children(off_t offset,
-				    int *first_index, int *last_index,
-				    enum object_type type)
+				    int *first_index, int *last_index)
 {
-	int first = find_ofs_delta(offset, type);
+	int first = find_ofs_delta(offset);
 	int last = first;
 	int end = nr_ofs_deltas - 1;
 
@@ -668,7 +685,7 @@ static int compare_ref_delta_bases(const struct object_id *oid1,
 	return oidcmp(oid1, oid2);
 }
 
-static int find_ref_delta(const struct object_id *oid, enum object_type type)
+static int find_ref_delta(const struct object_id *oid)
 {
 	int first = 0, last = nr_ref_deltas;
 
@@ -678,7 +695,8 @@ static int find_ref_delta(const struct object_id *oid, enum object_type type)
 		int cmp;
 
 		cmp = compare_ref_delta_bases(oid, &delta->oid,
-					      type, objects[delta->obj_no].type);
+					      OBJ_REF_DELTA,
+					      objects[delta->obj_no].type);
 		if (!cmp)
 			return next;
 		if (cmp < 0) {
@@ -691,10 +709,9 @@ static int find_ref_delta(const struct object_id *oid, enum object_type type)
 }
 
 static void find_ref_delta_children(const struct object_id *oid,
-				    int *first_index, int *last_index,
-				    enum object_type type)
+				    int *first_index, int *last_index)
 {
-	int first = find_ref_delta(oid, type);
+	int first = find_ref_delta(oid);
 	int last = first;
 	int end = nr_ref_deltas - 1;
 
@@ -757,7 +774,8 @@ static int check_collison(struct object_entry *entry)
 
 	memset(&data, 0, sizeof(data));
 	data.entry = entry;
-	data.st = open_istream(&entry->idx.oid, &type, &size, NULL);
+	data.st = open_istream(the_repository, &entry->idx.oid, &type, &size,
+			       NULL);
 	if (!data.st)
 		return -1;
 	if (size != entry->size || type != entry->type)
@@ -865,26 +883,15 @@ static void sha1_object(const void *data, struct object_entry *obj_entry,
 }
 
 /*
- * This function is part of find_unresolved_deltas(). There are two
- * walkers going in the opposite ways.
+ * Ensure that this node has been reconstructed and return its contents.
  *
- * The first one in find_unresolved_deltas() traverses down from
- * parent node to children, deflating nodes along the way. However,
- * memory for deflated nodes is limited by delta_base_cache_limit, so
- * at some point parent node's deflated content may be freed.
- *
- * The second walker is this function, which goes from current node up
- * to top parent if necessary to deflate the node. In normal
- * situation, its parent node would be already deflated, so it just
- * needs to apply delta.
- *
- * In the worst case scenario, parent node is no longer deflated because
- * we're running out of delta_base_cache_limit; we need to re-deflate
- * parents, possibly up to the top base.
- *
- * All deflated objects here are subject to be freed if we exceed
- * delta_base_cache_limit, just like in find_unresolved_deltas(), we
- * just need to make sure the last node is not freed.
+ * In the typical and best case, this node would already be reconstructed
+ * (through the invocation to resolve_delta() in threaded_second_pass()) and it
+ * would not be pruned. However, if pruning of this node was necessary due to
+ * reaching delta_base_cache_limit, this function will find the closest
+ * ancestor with reconstructed data that has not been pruned (or if there is
+ * none, the ultimate base object), and reconstruct each node in the delta
+ * chain in order to generate the reconstructed data for this node.
  */
 static void *get_base_data(struct base_data *c)
 {
@@ -901,7 +908,7 @@ static void *get_base_data(struct base_data *c)
 		if (!delta_nr) {
 			c->data = get_data_from_pack(obj);
 			c->size = obj->size;
-			get_thread_data()->base_cache_used += c->size;
+			base_cache_used += c->size;
 			prune_base_data(c);
 		}
 		for (; delta_nr > 0; delta_nr--) {
@@ -917,7 +924,7 @@ static void *get_base_data(struct base_data *c)
 			free(raw);
 			if (!c->data)
 				bad_object(obj->idx.offset, _("failed to apply delta"));
-			get_thread_data()->base_cache_used += c->size;
+			base_cache_used += c->size;
 			prune_base_data(c);
 		}
 		free(delta);
@@ -925,10 +932,27 @@ static void *get_base_data(struct base_data *c)
 	return c->data;
 }
 
-static void resolve_delta(struct object_entry *delta_obj,
-			  struct base_data *base, struct base_data *result)
+static struct base_data *make_base(struct object_entry *obj,
+				   struct base_data *parent)
 {
-	void *base_data, *delta_data;
+	struct base_data *base = xcalloc(1, sizeof(struct base_data));
+	base->base = parent;
+	base->obj = obj;
+	find_ref_delta_children(&obj->idx.oid,
+				&base->ref_first, &base->ref_last);
+	find_ofs_delta_children(obj->idx.offset,
+				&base->ofs_first, &base->ofs_last);
+	base->children_remaining = base->ref_last - base->ref_first +
+		base->ofs_last - base->ofs_first + 2;
+	return base;
+}
+
+static struct base_data *resolve_delta(struct object_entry *delta_obj,
+				       struct base_data *base)
+{
+	void *delta_data, *result_data;
+	struct base_data *result;
+	unsigned long result_size;
 
 	if (show_stat) {
 		int i = delta_obj - objects;
@@ -941,113 +965,26 @@ static void resolve_delta(struct object_entry *delta_obj,
 		obj_stat[i].base_object_no = j;
 	}
 	delta_data = get_data_from_pack(delta_obj);
-	base_data = get_base_data(base);
-	result->obj = delta_obj;
-	result->data = patch_delta(base_data, base->size,
-				   delta_data, delta_obj->size, &result->size);
+	assert(base->data);
+	result_data = patch_delta(base->data, base->size,
+				  delta_data, delta_obj->size, &result_size);
 	free(delta_data);
-	if (!result->data)
+	if (!result_data)
 		bad_object(delta_obj->idx.offset, _("failed to apply delta"));
-	hash_object_file(result->data, result->size,
+	hash_object_file(the_hash_algo, result_data, result_size,
 			 type_name(delta_obj->real_type), &delta_obj->idx.oid);
-	sha1_object(result->data, NULL, result->size, delta_obj->real_type,
+	sha1_object(result_data, NULL, result_size, delta_obj->real_type,
 		    &delta_obj->idx.oid);
+
+	result = make_base(delta_obj, base);
+	result->data = result_data;
+	result->size = result_size;
+
 	counter_lock();
 	nr_resolved_deltas++;
 	counter_unlock();
-}
 
-/*
- * Standard boolean compare-and-swap: atomically check whether "*type" is
- * "want"; if so, swap in "set" and return true. Otherwise, leave it untouched
- * and return false.
- */
-static int compare_and_swap_type(signed char *type,
-				 enum object_type want,
-				 enum object_type set)
-{
-	enum object_type old;
-
-	type_cas_lock();
-	old = *type;
-	if (old == want)
-		*type = set;
-	type_cas_unlock();
-
-	return old == want;
-}
-
-static struct base_data *find_unresolved_deltas_1(struct base_data *base,
-						  struct base_data *prev_base)
-{
-	if (base->ref_last == -1 && base->ofs_last == -1) {
-		find_ref_delta_children(&base->obj->idx.oid,
-					&base->ref_first, &base->ref_last,
-					OBJ_REF_DELTA);
-
-		find_ofs_delta_children(base->obj->idx.offset,
-					&base->ofs_first, &base->ofs_last,
-					OBJ_OFS_DELTA);
-
-		if (base->ref_last == -1 && base->ofs_last == -1) {
-			free(base->data);
-			return NULL;
-		}
-
-		link_base_data(prev_base, base);
-	}
-
-	if (base->ref_first <= base->ref_last) {
-		struct object_entry *child = objects + ref_deltas[base->ref_first].obj_no;
-		struct base_data *result = alloc_base_data();
-
-		if (!compare_and_swap_type(&child->real_type, OBJ_REF_DELTA,
-					   base->obj->real_type))
-			BUG("child->real_type != OBJ_REF_DELTA");
-
-		resolve_delta(child, base, result);
-		if (base->ref_first == base->ref_last && base->ofs_last == -1)
-			free_base_data(base);
-
-		base->ref_first++;
-		return result;
-	}
-
-	if (base->ofs_first <= base->ofs_last) {
-		struct object_entry *child = objects + ofs_deltas[base->ofs_first].obj_no;
-		struct base_data *result = alloc_base_data();
-
-		assert(child->real_type == OBJ_OFS_DELTA);
-		child->real_type = base->obj->real_type;
-		resolve_delta(child, base, result);
-		if (base->ofs_first == base->ofs_last)
-			free_base_data(base);
-
-		base->ofs_first++;
-		return result;
-	}
-
-	unlink_base_data(base);
-	return NULL;
-}
-
-static void find_unresolved_deltas(struct base_data *base)
-{
-	struct base_data *new_base, *prev_base = NULL;
-	for (;;) {
-		new_base = find_unresolved_deltas_1(base, prev_base);
-
-		if (new_base) {
-			prev_base = base;
-			base = new_base;
-		} else {
-			free(base);
-			base = prev_base;
-			if (!base)
-				return;
-			prev_base = base->base;
-		}
-	}
+	return result;
 }
 
 static int compare_ofs_delta_entry(const void *a, const void *b)
@@ -1068,34 +1005,135 @@ static int compare_ref_delta_entry(const void *a, const void *b)
 	return oidcmp(&delta_a->oid, &delta_b->oid);
 }
 
-static void resolve_base(struct object_entry *obj)
-{
-	struct base_data *base_obj = alloc_base_data();
-	base_obj->obj = obj;
-	base_obj->data = NULL;
-	find_unresolved_deltas(base_obj);
-}
-
 static void *threaded_second_pass(void *data)
 {
-	set_thread_data(data);
+	if (data)
+		set_thread_data(data);
 	for (;;) {
-		int i;
+		struct base_data *parent = NULL;
+		struct object_entry *child_obj;
+		struct base_data *child;
+
 		counter_lock();
 		display_progress(progress, nr_resolved_deltas);
 		counter_unlock();
+
 		work_lock();
-		while (nr_dispatched < nr_objects &&
-		       is_delta_type(objects[nr_dispatched].type))
-			nr_dispatched++;
-		if (nr_dispatched >= nr_objects) {
-			work_unlock();
-			break;
+		if (list_empty(&work_head)) {
+			/*
+			 * Take an object from the object array.
+			 */
+			while (nr_dispatched < nr_objects &&
+			       is_delta_type(objects[nr_dispatched].type))
+				nr_dispatched++;
+			if (nr_dispatched >= nr_objects) {
+				work_unlock();
+				break;
+			}
+			child_obj = &objects[nr_dispatched++];
+		} else {
+			/*
+			 * Peek at the top of the stack, and take a child from
+			 * it.
+			 */
+			parent = list_first_entry(&work_head, struct base_data,
+						  list);
+
+			if (parent->ref_first <= parent->ref_last) {
+				int offset = ref_deltas[parent->ref_first++].obj_no;
+				child_obj = objects + offset;
+				if (child_obj->real_type != OBJ_REF_DELTA)
+					die("REF_DELTA at offset %"PRIuMAX" already resolved (duplicate base %s?)",
+					    (uintmax_t) child_obj->idx.offset,
+					    oid_to_hex(&parent->obj->idx.oid));
+				child_obj->real_type = parent->obj->real_type;
+			} else {
+				child_obj = objects +
+					ofs_deltas[parent->ofs_first++].obj_no;
+				assert(child_obj->real_type == OBJ_OFS_DELTA);
+				child_obj->real_type = parent->obj->real_type;
+			}
+
+			if (parent->ref_first > parent->ref_last &&
+			    parent->ofs_first > parent->ofs_last) {
+				/*
+				 * This parent has run out of children, so move
+				 * it to done_head.
+				 */
+				list_del(&parent->list);
+				list_add(&parent->list, &done_head);
+			}
+
+			/*
+			 * Ensure that the parent has data, since we will need
+			 * it later.
+			 *
+			 * NEEDSWORK: If parent data needs to be reloaded, this
+			 * prolongs the time that the current thread spends in
+			 * the mutex. A mitigating factor is that parent data
+			 * needs to be reloaded only if the delta base cache
+			 * limit is exceeded, so in the typical case, this does
+			 * not happen.
+			 */
+			get_base_data(parent);
+			parent->retain_data++;
 		}
-		i = nr_dispatched++;
 		work_unlock();
 
-		resolve_base(&objects[i]);
+		if (parent) {
+			child = resolve_delta(child_obj, parent);
+			if (!child->children_remaining)
+				FREE_AND_NULL(child->data);
+		} else {
+			child = make_base(child_obj, NULL);
+			if (child->children_remaining) {
+				/*
+				 * Since this child has its own delta children,
+				 * we will need this data in the future.
+				 * Inflate now so that future iterations will
+				 * have access to this object's data while
+				 * outside the work mutex.
+				 */
+				child->data = get_data_from_pack(child_obj);
+				child->size = child_obj->size;
+			}
+		}
+
+		work_lock();
+		if (parent)
+			parent->retain_data--;
+		if (child->data) {
+			/*
+			 * This child has its own children, so add it to
+			 * work_head.
+			 */
+			list_add(&child->list, &work_head);
+			base_cache_used += child->size;
+			prune_base_data(NULL);
+		} else {
+			/*
+			 * This child does not have its own children. It may be
+			 * the last descendant of its ancestors; free those
+			 * that we can.
+			 */
+			struct base_data *p = parent;
+
+			while (p) {
+				struct base_data *next_p;
+
+				p->children_remaining--;
+				if (p->children_remaining)
+					break;
+
+				next_p = p->base;
+				free_base_data(p);
+				list_del(&p->list);
+				free(p);
+
+				p = next_p;
+			}
+		}
+		work_unlock();
 	}
 	return NULL;
 }
@@ -1196,6 +1234,7 @@ static void resolve_deltas(void)
 					  nr_ref_deltas + nr_ofs_deltas);
 
 	nr_dispatched = 0;
+	base_cache_limit = delta_base_cache_limit * nr_threads;
 	if (nr_threads > 1 || getenv("GIT_FORCE_THREADS")) {
 		init_thread();
 		for (i = 0; i < nr_threads; i++) {
@@ -1210,15 +1249,7 @@ static void resolve_deltas(void)
 		cleanup_thread();
 		return;
 	}
-
-	for (i = 0; i < nr_objects; i++) {
-		struct object_entry *obj = &objects[i];
-
-		if (is_delta_type(obj->type))
-			continue;
-		resolve_base(obj);
-		display_progress(progress, nr_resolved_deltas);
-	}
+	threaded_second_pass(&nothread_data);
 }
 
 /*
@@ -1321,7 +1352,7 @@ static struct object_entry *append_obj_to_pack(struct hashfile *f,
 	obj[1].idx.offset += write_compressed(f, buf, size);
 	obj[0].idx.crc32 = crc32_end(f);
 	hashflush(f);
-	hashcpy(obj->idx.oid.hash, sha1);
+	oidread(&obj->idx.oid, sha1);
 	return obj;
 }
 
@@ -1365,44 +1396,50 @@ static void fix_unresolved_deltas(struct hashfile *f)
 				continue;
 			oid_array_append(&to_fetch, &d->oid);
 		}
-		if (to_fetch.nr)
-			promisor_remote_get_direct(the_repository,
-						   to_fetch.oid, to_fetch.nr);
+		promisor_remote_get_direct(the_repository,
+					   to_fetch.oid, to_fetch.nr);
 		oid_array_clear(&to_fetch);
 	}
 
 	for (i = 0; i < nr_ref_deltas; i++) {
 		struct ref_delta_entry *d = sorted_by_pos[i];
 		enum object_type type;
-		struct base_data *base_obj = alloc_base_data();
+		void *data;
+		unsigned long size;
 
 		if (objects[d->obj_no].real_type != OBJ_REF_DELTA)
 			continue;
-		base_obj->data = read_object_file(&d->oid, &type,
-						  &base_obj->size);
-		if (!base_obj->data)
+		data = read_object_file(&d->oid, &type, &size);
+		if (!data)
 			continue;
 
-		if (check_object_signature(&d->oid, base_obj->data,
-				base_obj->size, type_name(type)))
+		if (check_object_signature(the_repository, &d->oid,
+					   data, size,
+					   type_name(type)))
 			die(_("local object %s is corrupt"), oid_to_hex(&d->oid));
-		base_obj->obj = append_obj_to_pack(f, d->oid.hash,
-					base_obj->data, base_obj->size, type);
-		find_unresolved_deltas(base_obj);
+
+		/*
+		 * Add this as an object to the objects array and call
+		 * threaded_second_pass() (which will pick up the added
+		 * object).
+		 */
+		append_obj_to_pack(f, d->oid.hash, data, size, type);
+		threaded_second_pass(NULL);
+
 		display_progress(progress, nr_resolved_deltas);
 	}
 	free(sorted_by_pos);
 }
 
-static const char *derive_filename(const char *pack_name, const char *suffix,
-				   struct strbuf *buf)
+static const char *derive_filename(const char *pack_name, const char *strip,
+				   const char *suffix, struct strbuf *buf)
 {
 	size_t len;
-	if (!strip_suffix(pack_name, ".pack", &len))
-		die(_("packfile name '%s' does not end with '.pack'"),
-		    pack_name);
+	if (!strip_suffix(pack_name, strip, &len) || !len ||
+	    pack_name[len - 1] != '.')
+		die(_("packfile name '%s' does not end with '.%s'"),
+		    pack_name, strip);
 	strbuf_add(buf, pack_name, len);
-	strbuf_addch(buf, '.');
 	strbuf_addstr(buf, suffix);
 	return buf->buf;
 }
@@ -1417,7 +1454,7 @@ static void write_special_file(const char *suffix, const char *msg,
 	int msg_len = strlen(msg);
 
 	if (pack_name)
-		filename = derive_filename(pack_name, suffix, &name_buf);
+		filename = derive_filename(pack_name, "pack", suffix, &name_buf);
 	else
 		filename = odb_pack_name(&name_buf, hash, suffix);
 
@@ -1442,12 +1479,14 @@ static void write_special_file(const char *suffix, const char *msg,
 
 static void final(const char *final_pack_name, const char *curr_pack_name,
 		  const char *final_index_name, const char *curr_index_name,
+		  const char *final_rev_index_name, const char *curr_rev_index_name,
 		  const char *keep_msg, const char *promisor_msg,
 		  unsigned char *hash)
 {
 	const char *report = "pack";
 	struct strbuf pack_name = STRBUF_INIT;
 	struct strbuf index_name = STRBUF_INIT;
+	struct strbuf rev_index_name = STRBUF_INIT;
 	int err;
 
 	if (!from_stdin) {
@@ -1482,6 +1521,16 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
 	} 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);
+	}
+
 	if (do_fsck_object) {
 		struct packed_git *p;
 		p = add_packed_git(final_index_name, strlen(final_index_name), 0);
@@ -1511,6 +1560,7 @@ static void final(const char *final_pack_name, const char *curr_pack_name,
 		}
 	}
 
+	strbuf_release(&rev_index_name);
 	strbuf_release(&index_name);
 	strbuf_release(&pack_name);
 }
@@ -1536,6 +1586,12 @@ static int git_index_pack_config(const char *k, const char *v, void *cb)
 		}
 		return 0;
 	}
+	if (!strcmp(k, "pack.writereverseindex")) {
+		if (git_config_bool(k, v))
+			opts->flags |= WRITE_REV;
+		else
+			opts->flags &= ~WRITE_REV;
+	}
 	return git_default_config(k, v, cb);
 }
 
@@ -1552,14 +1608,10 @@ static void read_v2_anomalous_offsets(struct packed_git *p,
 {
 	const uint32_t *idx1, *idx2;
 	uint32_t i;
-	const uint32_t hashwords = the_hash_algo->rawsz / sizeof(uint32_t);
 
 	/* The address of the 4-byte offset table */
-	idx1 = (((const uint32_t *)p->index_data)
-		+ 2 /* 8-byte header */
-		+ 256 /* fan out */
-		+ hashwords * p->num_objects /* object ID table */
-		+ p->num_objects /* CRC32 table */
+	idx1 = (((const uint32_t *)((const uint8_t *)p->index_data + p->crc_offset))
+		+ (size_t)p->num_objects /* CRC32 table */
 		);
 
 	/* The address of the 8-byte offset table */
@@ -1603,7 +1655,7 @@ static void read_idx_option(struct pack_idx_option *opts, const char *pack_name)
 	/*
 	 * Get rid of the idx file as we do not need it anymore.
 	 * NEEDSWORK: extract this bit from free_pack_by_name() in
-	 * sha1-file.c, perhaps?  It shouldn't matter very much as we
+	 * object-file.c, perhaps?  It shouldn't matter very much as we
 	 * know we haven't installed this pack (hence we never have
 	 * read anything from it).
 	 */
@@ -1617,7 +1669,7 @@ static void show_pack_info(int stat_only)
 	unsigned long *chain_histogram = NULL;
 
 	if (deepest_delta)
-		chain_histogram = xcalloc(deepest_delta, sizeof(unsigned long));
+		CALLOC_ARRAY(chain_histogram, deepest_delta);
 
 	for (i = 0; i < nr_objects; i++) {
 		struct object_entry *obj = &objects[i];
@@ -1657,17 +1709,20 @@ static void show_pack_info(int stat_only)
 
 int cmd_index_pack(int argc, const char **argv, const char *prefix)
 {
-	int i, fix_thin_pack = 0, verify = 0, stat_only = 0;
+	int i, fix_thin_pack = 0, verify = 0, stat_only = 0, rev_index;
 	const char *curr_index;
-	const char *index_name = NULL, *pack_name = NULL;
+	const char *curr_rev_index = NULL;
+	const char *index_name = NULL, *pack_name = NULL, *rev_index_name = NULL;
 	const char *keep_msg = NULL;
 	const char *promisor_msg = NULL;
 	struct strbuf index_name_buf = STRBUF_INIT;
+	struct strbuf rev_index_name_buf = STRBUF_INIT;
 	struct pack_idx_entry **idx_objects;
 	struct pack_idx_option opts;
 	unsigned char pack_hash[GIT_MAX_RAWSZ];
 	unsigned foreign_nr = 1;	/* zero is a "good" value, assume bad */
 	int report_end_of_input = 0;
+	int hash_algo = 0;
 
 	/*
 	 * index-pack never needs to fetch missing objects except when
@@ -1688,6 +1743,11 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 	if (prefix && chdir(prefix))
 		die(_("Cannot come back to cwd"));
 
+	if (git_env_bool(GIT_TEST_WRITE_REV_INDEX, 0))
+		rev_index = 1;
+	else
+		rev_index = !!(opts.flags & (WRITE_REV_VERIFY | WRITE_REV));
+
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
 
@@ -1761,6 +1821,15 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 					die(_("bad %s"), arg);
 			} else if (skip_prefix(arg, "--max-input-size=", &arg)) {
 				max_input_size = strtoumax(arg, NULL, 10);
+			} else if (skip_prefix(arg, "--object-format=", &arg)) {
+				hash_algo = hash_algo_by_name(arg);
+				if (hash_algo == GIT_HASH_UNKNOWN)
+					die(_("unknown hash algorithm '%s'"), arg);
+				repo_set_hash_algo(the_repository, hash_algo);
+			} else if (!strcmp(arg, "--rev-index")) {
+				rev_index = 1;
+			} else if (!strcmp(arg, "--no-rev-index")) {
+				rev_index = 0;
 			} else
 				usage(index_pack_usage);
 			continue;
@@ -1777,8 +1846,19 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 		die(_("--fix-thin cannot be used without --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"));
 	if (!index_name && pack_name)
-		index_name = derive_filename(pack_name, "idx", &index_name_buf);
+		index_name = derive_filename(pack_name, "pack", "idx", &index_name_buf);
+
+	opts.flags &= ~(WRITE_REV | WRITE_REV_VERIFY);
+	if (rev_index) {
+		opts.flags |= verify ? WRITE_REV_VERIFY : WRITE_REV;
+		if (index_name)
+			rev_index_name = derive_filename(index_name,
+							 "idx", "rev",
+							 &rev_index_name_buf);
+	}
 
 	if (verify) {
 		if (!index_name)
@@ -1791,17 +1871,30 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 
 	if (HAVE_THREADS && !nr_threads) {
 		nr_threads = online_cpus();
-		/* An experiment showed that more threads does not mean faster */
-		if (nr_threads > 3)
-			nr_threads = 3;
+		/*
+		 * Experiments show that going above 20 threads doesn't help,
+		 * no matter how many cores you have. Below that, we tend to
+		 * max at half the number of online_cpus(), presumably because
+		 * half of those are hyperthreads rather than full cores. We'll
+		 * never reduce the level below "3", though, to match a
+		 * historical value that nobody complained about.
+		 */
+		if (nr_threads < 4)
+			; /* too few cores to consider capping */
+		else if (nr_threads < 6)
+			nr_threads = 3; /* historic cap */
+		else if (nr_threads < 40)
+			nr_threads /= 2;
+		else
+			nr_threads = 20; /* hard cap */
 	}
 
 	curr_pack = open_pack_file(pack_name);
 	parse_pack_header();
-	objects = xcalloc(st_add(nr_objects, 1), sizeof(struct object_entry));
+	CALLOC_ARRAY(objects, st_add(nr_objects, 1));
 	if (show_stat)
-		obj_stat = xcalloc(st_add(nr_objects, 1), sizeof(struct object_stat));
-	ofs_deltas = xcalloc(nr_objects, sizeof(struct ofs_delta_entry));
+		CALLOC_ARRAY(obj_stat, st_add(nr_objects, 1));
+	CALLOC_ARRAY(ofs_deltas, nr_objects);
 	parse_pack_objects(pack_hash);
 	if (report_end_of_input)
 		write_in_full(2, "\0", 1);
@@ -1819,11 +1912,16 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 	for (i = 0; i < nr_objects; i++)
 		idx_objects[i] = &objects[i].idx;
 	curr_index = write_idx_file(index_name, idx_objects, nr_objects, &opts, pack_hash);
+	if (rev_index)
+		curr_rev_index = write_rev_file(rev_index_name, idx_objects,
+						nr_objects, pack_hash,
+						opts.flags);
 	free(idx_objects);
 
 	if (!verify)
 		final(pack_name, curr_pack,
 		      index_name, curr_index,
+		      rev_index_name, curr_rev_index,
 		      keep_msg, promisor_msg,
 		      pack_hash);
 	else
@@ -1834,10 +1932,13 @@ int cmd_index_pack(int argc, const char **argv, const char *prefix)
 
 	free(objects);
 	strbuf_release(&index_name_buf);
+	strbuf_release(&rev_index_name_buf);
 	if (pack_name == NULL)
 		free((void *) curr_pack);
 	if (index_name == NULL)
 		free((void *) curr_index);
+	if (rev_index_name == NULL)
+		free((void *) curr_rev_index);
 
 	/*
 	 * Let the caller know this pack is not self contained
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 944ec77fe1..2167796ff2 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -9,6 +9,7 @@
 #include "builtin.h"
 #include "exec-cmd.h"
 #include "parse-options.h"
+#include "worktree.h"
 
 #ifndef DEFAULT_GIT_TEMPLATE_DIR
 #define DEFAULT_GIT_TEMPLATE_DIR "/usr/share/git-core/templates"
@@ -20,9 +21,10 @@
 #define TEST_FILEMODE 1
 #endif
 
+#define GIT_DEFAULT_HASH_ENVIRONMENT "GIT_DEFAULT_HASH"
+
 static int init_is_bare_repository = 0;
 static int init_shared_repository = -1;
-static const char *init_db_template_dir;
 
 static void copy_templates_1(struct strbuf *path, struct strbuf *template_path,
 			     DIR *dir)
@@ -91,7 +93,7 @@ static void copy_templates_1(struct strbuf *path, struct strbuf *template_path,
 	}
 }
 
-static void copy_templates(const char *template_dir)
+static void copy_templates(const char *template_dir, const char *init_template_dir)
 {
 	struct strbuf path = STRBUF_INIT;
 	struct strbuf template_path = STRBUF_INIT;
@@ -104,7 +106,7 @@ static void copy_templates(const char *template_dir)
 	if (!template_dir)
 		template_dir = getenv(TEMPLATE_DIR_ENVIRONMENT);
 	if (!template_dir)
-		template_dir = init_db_template_dir;
+		template_dir = init_template_dir;
 	if (!template_dir)
 		template_dir = to_free = system_path(DEFAULT_GIT_TEMPLATE_DIR);
 	if (!template_dir[0]) {
@@ -151,17 +153,6 @@ free_return:
 	clear_repository_format(&template_format);
 }
 
-static int git_init_db_config(const char *k, const char *v, void *cb)
-{
-	if (!strcmp(k, "init.templatedir"))
-		return git_config_pathname(&init_db_template_dir, k, v);
-
-	if (starts_with(k, "core."))
-		return platform_core_config(k, v, cb);
-
-	return 0;
-}
-
 /*
  * If the git_dir is not directly inside the working tree, then git will not
  * find it by default, and we need to set the worktree explicitly.
@@ -176,21 +167,41 @@ static int needs_work_tree_config(const char *git_dir, const char *work_tree)
 	return 1;
 }
 
+void initialize_repository_version(int hash_algo, int reinit)
+{
+	char repo_version_string[10];
+	int repo_version = GIT_REPO_VERSION;
+
+	if (hash_algo != GIT_HASH_SHA1)
+		repo_version = GIT_REPO_VERSION_READ;
+
+	/* This forces creation of new config file */
+	xsnprintf(repo_version_string, sizeof(repo_version_string),
+		  "%d", repo_version);
+	git_config_set("core.repositoryformatversion", repo_version_string);
+
+	if (hash_algo != GIT_HASH_SHA1)
+		git_config_set("extensions.objectformat",
+			       hash_algos[hash_algo].name);
+	else if (reinit)
+		git_config_set_gently("extensions.objectformat", NULL);
+}
+
 static int create_default_files(const char *template_path,
-				const char *original_git_dir)
+				const char *original_git_dir,
+				const char *initial_branch,
+				const struct repository_format *fmt,
+				int quiet)
 {
 	struct stat st1;
 	struct strbuf buf = STRBUF_INIT;
 	char *path;
-	char repo_version_string[10];
 	char junk[2];
 	int reinit;
 	int filemode;
 	struct strbuf err = STRBUF_INIT;
-
-	/* Just look for `init.templatedir` */
-	init_db_template_dir = NULL; /* re-set in case it was set before */
-	git_config(git_init_db_config, NULL);
+	const char *init_template_dir = NULL;
+	const char *work_tree = get_git_work_tree();
 
 	/*
 	 * First copy the templates -- we might have the default
@@ -201,7 +212,9 @@ static int create_default_files(const char *template_path,
 	 * values (since we've just potentially changed what's available on
 	 * disk).
 	 */
-	copy_templates(template_path);
+	git_config_get_pathname("init.templatedir", &init_template_dir);
+	copy_templates(template_path, init_template_dir);
+	free((char *)init_template_dir);
 	git_config_clear();
 	reset_shared_repository();
 	git_config(git_default_config, NULL);
@@ -210,7 +223,7 @@ static int create_default_files(const char *template_path,
 	 * We must make sure command-line options continue to override any
 	 * values we might have just re-read from the config.
 	 */
-	is_bare_repository_cfg = init_is_bare_repository;
+	is_bare_repository_cfg = init_is_bare_repository || !work_tree;
 	if (init_shared_repository != -1)
 		set_shared_repository(init_shared_repository);
 
@@ -233,21 +246,29 @@ static int create_default_files(const char *template_path,
 		die("failed to set up refs db: %s", err.buf);
 
 	/*
-	 * Create the default symlink from ".git/HEAD" to the "master"
-	 * branch, if it does not exist yet.
+	 * Point the HEAD symref to the initial branch with if HEAD does
+	 * not yet exist.
 	 */
 	path = git_path_buf(&buf, "HEAD");
 	reinit = (!access(path, R_OK)
 		  || readlink(path, junk, sizeof(junk)-1) != -1);
 	if (!reinit) {
-		if (create_symref("HEAD", "refs/heads/master", NULL) < 0)
+		char *ref;
+
+		if (!initial_branch)
+			initial_branch = git_default_branch_name(quiet);
+
+		ref = xstrfmt("refs/heads/%s", initial_branch);
+		if (check_refname_format(ref, 0) < 0)
+			die(_("invalid initial branch name: '%s'"),
+			    initial_branch);
+
+		if (create_symref("HEAD", ref, NULL) < 0)
 			exit(1);
+		free(ref);
 	}
 
-	/* This forces creation of new config file */
-	xsnprintf(repo_version_string, sizeof(repo_version_string),
-		  "%d", GIT_REPO_VERSION);
-	git_config_set("core.repositoryformatversion", repo_version_string);
+	initialize_repository_version(fmt->hash_algo, 0);
 
 	/* Check filemode trustability */
 	path = git_path_buf(&buf, "config");
@@ -266,7 +287,6 @@ static int create_default_files(const char *template_path,
 	if (is_bare_repository())
 		git_config_set("core.bare", "true");
 	else {
-		const char *work_tree = get_git_work_tree();
 		git_config_set("core.bare", "false");
 		/* allow template config file to override the default */
 		if (log_all_ref_updates == LOG_REFS_UNSET)
@@ -335,17 +355,40 @@ static void separate_git_dir(const char *git_dir, const char *git_link)
 
 		if (rename(src, git_dir))
 			die_errno(_("unable to move %s to %s"), src, git_dir);
+		repair_worktrees(NULL, NULL);
 	}
 
 	write_file(git_link, "gitdir: %s", git_dir);
 }
 
+static void validate_hash_algorithm(struct repository_format *repo_fmt, int hash)
+{
+	const char *env = getenv(GIT_DEFAULT_HASH_ENVIRONMENT);
+	/*
+	 * If we already have an initialized repo, don't allow the user to
+	 * specify a different algorithm, as that could cause corruption.
+	 * Otherwise, if the user has specified one on the command line, use it.
+	 */
+	if (repo_fmt->version >= 0 && hash != GIT_HASH_UNKNOWN && hash != repo_fmt->hash_algo)
+		die(_("attempt to reinitialize repository with different hash"));
+	else if (hash != GIT_HASH_UNKNOWN)
+		repo_fmt->hash_algo = hash;
+	else if (env) {
+		int env_algo = hash_algo_by_name(env);
+		if (env_algo == GIT_HASH_UNKNOWN)
+			die(_("unknown hash algorithm '%s'"), env);
+		repo_fmt->hash_algo = env_algo;
+	}
+}
+
 int init_db(const char *git_dir, const char *real_git_dir,
-	    const char *template_dir, unsigned int flags)
+	    const char *template_dir, int hash, const char *initial_branch,
+	    unsigned int flags)
 {
 	int reinit;
 	int exist_ok = flags & INIT_DB_EXIST_OK;
 	char *original_git_dir = real_pathdup(git_dir, 1);
+	struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
 
 	if (real_git_dir) {
 		struct stat st;
@@ -356,18 +399,18 @@ int init_db(const char *git_dir, const char *real_git_dir,
 		if (!exist_ok && !stat(real_git_dir, &st))
 			die(_("%s already exists"), real_git_dir);
 
-		set_git_dir(real_path(real_git_dir));
+		set_git_dir(real_git_dir, 1);
 		git_dir = get_git_dir();
 		separate_git_dir(git_dir, original_git_dir);
 	}
 	else {
-		set_git_dir(real_path(git_dir));
+		set_git_dir(git_dir, 1);
 		git_dir = get_git_dir();
 	}
 	startup_info->have_repository = 1;
 
-	/* Just look for `core.hidedotfiles` */
-	git_config(git_init_db_config, NULL);
+	/* Ensure `core.hidedotfiles` is processed */
+	git_config(platform_core_config, NULL);
 
 	safe_create_dir(git_dir, 0);
 
@@ -378,9 +421,16 @@ int init_db(const char *git_dir, const char *real_git_dir,
 	 * config file, so this will not fail.  What we are catching
 	 * is an attempt to reinitialize new repository with an old tool.
 	 */
-	check_repository_format();
+	check_repository_format(&repo_fmt);
+
+	validate_hash_algorithm(&repo_fmt, hash);
 
-	reinit = create_default_files(template_dir, original_git_dir);
+	reinit = create_default_files(template_dir, original_git_dir,
+				      initial_branch, &repo_fmt,
+				      flags & INIT_DB_QUIET);
+	if (reinit && initial_branch)
+		warning(_("re-init: ignored --initial-branch=%s"),
+			initial_branch);
 
 	create_object_directory();
 
@@ -482,6 +532,9 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
 	const char *work_tree;
 	const char *template_dir = NULL;
 	unsigned int flags = 0;
+	const char *object_format = NULL;
+	const char *initial_branch = NULL;
+	int hash_algo = GIT_HASH_UNKNOWN;
 	const struct option init_db_options[] = {
 		OPT_STRING(0, "template", &template_dir, N_("template-directory"),
 				N_("directory from which templates will be used")),
@@ -494,16 +547,25 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
 		OPT_BIT('q', "quiet", &flags, N_("be quiet"), INIT_DB_QUIET),
 		OPT_STRING(0, "separate-git-dir", &real_git_dir, N_("gitdir"),
 			   N_("separate git dir from working tree")),
+		OPT_STRING('b', "initial-branch", &initial_branch, N_("name"),
+			   N_("override the name of the initial branch")),
+		OPT_STRING(0, "object-format", &object_format, N_("hash"),
+			   N_("specify the hash algorithm to use")),
 		OPT_END()
 	};
 
 	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"));
+
 	if (real_git_dir && !is_absolute_path(real_git_dir))
 		real_git_dir = real_pathdup(real_git_dir, 1);
 
-	if (template_dir && *template_dir && !is_absolute_path(template_dir))
+	if (template_dir && *template_dir && !is_absolute_path(template_dir)) {
 		template_dir = absolute_pathdup(template_dir);
+		UNLEAK(template_dir);
+	}
 
 	if (argc == 1) {
 		int mkdir_tried = 0;
@@ -546,6 +608,12 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
 		free(cwd);
 	}
 
+	if (object_format) {
+		hash_algo = hash_algo_by_name(object_format);
+		if (hash_algo == GIT_HASH_UNKNOWN)
+			die(_("unknown hash algorithm '%s'"), object_format);
+	}
+
 	if (init_shared_repository != -1)
 		set_shared_repository(init_shared_repository);
 
@@ -567,6 +635,30 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
 	if (!git_dir)
 		git_dir = DEFAULT_GIT_DIR_ENVIRONMENT;
 
+	/*
+	 * When --separate-git-dir is used inside a linked worktree, take
+	 * care to ensure that the common .git/ directory is relocated, not
+	 * the worktree-specific .git/worktrees/<id>/ directory.
+	 */
+	if (real_git_dir) {
+		int err;
+		const char *p;
+		struct strbuf sb = STRBUF_INIT;
+
+		p = read_gitfile_gently(git_dir, &err);
+		if (p && get_common_dir(&sb, p)) {
+			struct strbuf mainwt = STRBUF_INIT;
+
+			strbuf_addbuf(&mainwt, &sb);
+			strbuf_strip_suffix(&mainwt, "/.git");
+			if (chdir(mainwt.buf) < 0)
+				die_errno(_("cannot chdir to %s"), mainwt.buf);
+			strbuf_release(&mainwt);
+			git_dir = strbuf_detach(&sb, NULL);
+		}
+		strbuf_release(&sb);
+	}
+
 	if (is_bare_repository_cfg < 0)
 		is_bare_repository_cfg = guess_repository_type(git_dir);
 
@@ -588,6 +680,8 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
 				   get_git_work_tree());
 	}
 	else {
+		if (real_git_dir)
+			die(_("--separate-git-dir incompatible with bare repository"));
 		if (work_tree)
 			set_git_work_tree(work_tree);
 	}
@@ -597,5 +691,6 @@ int cmd_init_db(int argc, const char **argv, const char *prefix)
 	UNLEAK(work_tree);
 
 	flags |= INIT_DB_EXIST_OK;
-	return init_db(git_dir, real_git_dir, template_dir, flags);
+	return init_db(git_dir, real_git_dir, template_dir, hash_algo,
+		       initial_branch, flags);
 }
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index f101d092b8..84748eafc0 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -105,8 +105,8 @@ int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
 		OPT_BOOL(0, "only-trailers", &opts.only_trailers, N_("output only the trailers")),
 		OPT_BOOL(0, "only-input", &opts.only_input, N_("do not apply config rules")),
 		OPT_BOOL(0, "unfold", &opts.unfold, N_("join whitespace-continued values")),
-		{ OPTION_CALLBACK, 0, "parse", &opts, NULL, N_("set parsing options"),
-			PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse },
+		OPT_CALLBACK_F(0, "parse", &opts, NULL, N_("set parsing options"),
+			PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse),
 		OPT_BOOL(0, "no-divider", &opts.no_divider, N_("do not treat --- specially")),
 		OPT_CALLBACK(0, "trailer", &trailers, N_("trailer"),
 				N_("trailer(s) to add"), option_parse_trailer),
diff --git a/builtin/log.c b/builtin/log.c
index 89873d2dc2..f75d87e8d7 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -12,6 +12,7 @@
 #include "color.h"
 #include "commit.h"
 #include "diff.h"
+#include "diff-merges.h"
 #include "revision.h"
 #include "log-tree.h"
 #include "builtin.h"
@@ -33,10 +34,11 @@
 #include "commit-slab.h"
 #include "repository.h"
 #include "commit-reach.h"
-#include "interdiff.h"
 #include "range-diff.h"
 
 #define MAIL_DEFAULT_WRAP 72
+#define COVER_FROM_AUTO_MAX_SUBJECT_LEN 100
+#define FORMAT_PATCH_NAME_MAX_DEFAULT 64
 
 /* Set a default date-time format for git log ("log.date" config variable) */
 static const char *default_date_mode = NULL;
@@ -45,10 +47,12 @@ static int default_abbrev_commit;
 static int default_show_root = 1;
 static int default_follow;
 static int default_show_signature;
+static int default_encode_email_headers = 1;
 static int decoration_style;
 static int decoration_given;
 static int use_mailmap_config = 1;
 static const char *fmt_patch_subject_prefix = "PATCH";
+static int fmt_patch_name_max = FORMAT_PATCH_NAME_MAX_DEFAULT;
 static const char *fmt_pretty;
 
 static const char * const builtin_log_usage[] = {
@@ -130,7 +134,6 @@ static int log_line_range_callback(const struct option *option, const char *arg,
 
 static void init_log_defaults(void)
 {
-	init_grep_defaults(the_repository);
 	init_diff_ui_defaults();
 
 	decoration_style = auto_decoration_style();
@@ -149,7 +152,9 @@ static void cmd_log_init_defaults(struct rev_info *rev)
 	rev->abbrev_commit = default_abbrev_commit;
 	rev->show_root_diff = default_show_root;
 	rev->subject_prefix = fmt_patch_subject_prefix;
+	rev->patch_name_max = fmt_patch_name_max;
 	rev->show_signature = default_show_signature;
+	rev->encode_email_headers = default_encode_email_headers;
 	rev->diffopt.flags.allow_textconv = 1;
 
 	if (default_date_mode)
@@ -163,23 +168,26 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 	int quiet = 0, source = 0, mailmap;
 	static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};
 	static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
+	static struct string_list decorate_refs_exclude_config = STRING_LIST_INIT_NODUP;
 	static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
 	struct decoration_filter decoration_filter = {&decorate_refs_include,
-						      &decorate_refs_exclude};
+						      &decorate_refs_exclude,
+						      &decorate_refs_exclude_config};
 	static struct revision_sources revision_sources;
 
 	const struct option builtin_log_options[] = {
 		OPT__QUIET(&quiet, N_("suppress diff output")),
 		OPT_BOOL(0, "source", &source, N_("show source")),
-		OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")),
+		OPT_BOOL(0, "use-mailmap", &mailmap, N_("use mail map file")),
+		OPT_ALIAS(0, "mailmap", "use-mailmap"),
 		OPT_STRING_LIST(0, "decorate-refs", &decorate_refs_include,
 				N_("pattern"), N_("only decorate refs that match <pattern>")),
 		OPT_STRING_LIST(0, "decorate-refs-exclude", &decorate_refs_exclude,
 				N_("pattern"), N_("do not decorate refs that match <pattern>")),
-		{ OPTION_CALLBACK, 0, "decorate", NULL, NULL, N_("decorate options"),
-		  PARSE_OPT_OPTARG, decorate_callback},
-		OPT_CALLBACK('L', NULL, &line_cb, "n,m:file",
-			     N_("Process line range n,m in file, counting from 1"),
+		OPT_CALLBACK_F(0, "decorate", NULL, NULL, N_("decorate options"),
+			       PARSE_OPT_OPTARG, decorate_callback),
+		OPT_CALLBACK('L', NULL, &line_cb, "range:file",
+			     N_("trace the evolution of line range <start>,<end> or function :<funcname> in <file>"),
 			     log_line_range_callback),
 		OPT_END()
 	};
@@ -201,13 +209,16 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 	if (argc > 1)
 		die(_("unrecognized argument: %s"), argv[1]);
 
+	if (rev->line_level_traverse && rev->prune_data.nr)
+		die(_("-L<range>:<file> cannot be used with pathspec"));
+
 	memset(&w, 0, sizeof(w));
 	userformat_find_requirements(NULL, &w);
 
 	if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
 		rev->show_notes = 1;
 	if (rev->show_notes)
-		init_display_notes(&rev->notes_opt);
+		load_display_notes(&rev->notes_opt);
 
 	if ((rev->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
 	    rev->diffopt.filter || rev->diffopt.flags.follow_renames)
@@ -220,7 +231,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 
 	if (mailmap) {
 		rev->mailmap = xcalloc(1, sizeof(struct string_list));
-		read_mailmap(rev->mailmap, NULL);
+		read_mailmap(rev->mailmap);
 	}
 
 	if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) {
@@ -234,8 +245,23 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 			rev->abbrev_commit = 0;
 	}
 
+	if (rev->commit_format == CMIT_FMT_USERFORMAT && !w.decorate)
+		decoration_style = 0;
+
 	if (decoration_style) {
+		const struct string_list *config_exclude =
+			repo_config_get_value_multi(the_repository,
+						    "log.excludeDecoration");
+
+		if (config_exclude) {
+			struct string_list_item *item;
+			for_each_string_list_item(item, config_exclude)
+				string_list_append(&decorate_refs_exclude_config,
+						   item->string);
+		}
+
 		rev->show_decorations = 1;
+
 		load_ref_decorations(&decoration_filter, decoration_style);
 	}
 
@@ -284,10 +310,11 @@ static struct itimerval early_output_timer;
 
 static void log_show_early(struct rev_info *revs, struct commit_list *list)
 {
-	int i = revs->early_output, close_file = revs->diffopt.close_file;
+	int i = revs->early_output;
 	int show_header = 1;
+	int no_free = revs->diffopt.no_free;
 
-	revs->diffopt.close_file = 0;
+	revs->diffopt.no_free = 0;
 	sort_in_topological_order(&list, revs->sort_order);
 	while (list && i) {
 		struct commit *commit = list->item;
@@ -304,8 +331,8 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
 		case commit_ignore:
 			break;
 		case commit_error:
-			if (close_file)
-				fclose(revs->diffopt.file);
+			revs->diffopt.no_free = no_free;
+			diff_free(&revs->diffopt);
 			return;
 		}
 		list = list->next;
@@ -313,8 +340,8 @@ static void log_show_early(struct rev_info *revs, struct commit_list *list)
 
 	/* Did we already get enough commits for the early output? */
 	if (!i) {
-		if (close_file)
-			fclose(revs->diffopt.file);
+		revs->diffopt.no_free = 0;
+		diff_free(&revs->diffopt);
 		return;
 	}
 
@@ -378,7 +405,7 @@ static int cmd_log_walk(struct rev_info *rev)
 {
 	struct commit *commit;
 	int saved_nrl = 0;
-	int saved_dcctc = 0, close_file = rev->diffopt.close_file;
+	int saved_dcctc = 0;
 
 	if (rev->early_output)
 		setup_early_output();
@@ -394,7 +421,7 @@ static int cmd_log_walk(struct rev_info *rev)
 	 * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
 	 * retain that state information if replacing rev->diffopt in this loop
 	 */
-	rev->diffopt.close_file = 0;
+	rev->diffopt.no_free = 1;
 	while ((commit = get_revision(rev)) != NULL) {
 		if (!log_tree_commit(rev, commit) && rev->max_count >= 0)
 			/*
@@ -419,8 +446,8 @@ static int cmd_log_walk(struct rev_info *rev)
 	}
 	rev->diffopt.degraded_cc_to_c = saved_dcctc;
 	rev->diffopt.needed_rename_limit = saved_nrl;
-	if (close_file)
-		fclose(rev->diffopt.file);
+	rev->diffopt.no_free = 0;
+	diff_free(&rev->diffopt);
 
 	if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
 	    rev->diffopt.flags.check_failed) {
@@ -437,6 +464,14 @@ static int git_log_config(const char *var, const char *value, void *cb)
 		return git_config_string(&fmt_pretty, var, value);
 	if (!strcmp(var, "format.subjectprefix"))
 		return git_config_string(&fmt_patch_subject_prefix, var, value);
+	if (!strcmp(var, "format.filenamemaxlength")) {
+		fmt_patch_name_max = git_config_int(var, value);
+		return 0;
+	}
+	if (!strcmp(var, "format.encodeemailheaders")) {
+		default_encode_email_headers = git_config_bool(var, value);
+		return 0;
+	}
 	if (!strcmp(var, "log.abbrevcommit")) {
 		default_abbrev_commit = git_config_bool(var, value);
 		return 0;
@@ -449,6 +484,8 @@ static int git_log_config(const char *var, const char *value, void *cb)
 			decoration_style = 0; /* maybe warn? */
 		return 0;
 	}
+	if (!strcmp(var, "log.diffmerges"))
+		return diff_merges_config(value);
 	if (!strcmp(var, "log.showroot")) {
 		default_show_root = git_config_bool(var, value);
 		return 0;
@@ -567,7 +604,7 @@ static int show_tag_object(const struct object_id *oid, struct rev_info *rev)
 
 static int show_tree_object(const struct object_id *oid,
 		struct strbuf *base,
-		const char *pathname, unsigned mode, int stage, void *context)
+		const char *pathname, unsigned mode, void *context)
 {
 	FILE *file = context;
 	fprintf(file, "%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
@@ -577,15 +614,10 @@ static int show_tree_object(const struct object_id *oid,
 static void show_setup_revisions_tweak(struct rev_info *rev,
 				       struct setup_revision_opt *opt)
 {
-	if (rev->ignore_merges) {
-		/* There was no "-m" on the command line */
-		rev->ignore_merges = 0;
-		if (!rev->first_parent_only && !rev->combine_merges) {
-			/* No "--first-parent", "-c", or "--cc" */
-			rev->combine_merges = 1;
-			rev->dense_combined_merges = 1;
-		}
-	}
+	if (rev->first_parent_only)
+		diff_merges_default_to_first_parent(rev);
+	else
+		diff_merges_default_to_dense_combined(rev);
 	if (!rev->diffopt.output_format)
 		rev->diffopt.output_format = DIFF_FORMAT_PATCH;
 }
@@ -605,7 +637,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));
@@ -654,9 +686,9 @@ int cmd_show(int argc, const char **argv, const char *prefix)
 					diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
 					name,
 					diff_get_color_opt(&rev.diffopt, DIFF_RESET));
-			read_tree_recursive(the_repository, (struct tree *)o, "",
-					    0, 0, &match_all, show_tree_object,
-					    rev.diffopt.file);
+			read_tree(the_repository, (struct tree *)o,
+				  &match_all, show_tree_object,
+				  rev.diffopt.file);
 			rev.shown_one = 1;
 			break;
 		case OBJ_COMMIT:
@@ -706,13 +738,8 @@ static void log_setup_revisions_tweak(struct rev_info *rev,
 	    rev->prune_data.nr == 1)
 		rev->diffopt.flags.follow_renames = 1;
 
-	/* Turn --cc/-c into -p --cc/-c when -p was not given */
-	if (!rev->diffopt.output_format && rev->combine_merges)
-		rev->diffopt.output_format = DIFF_FORMAT_PATCH;
-
-	/* Turn -m on when --cc/-c was given */
-	if (rev->combine_merges)
-		rev->ignore_merges = 0;
+	if (rev->first_parent_only)
+		diff_merges_default_to_first_parent(rev);
 }
 
 int cmd_log(int argc, const char **argv, const char *prefix)
@@ -765,28 +792,62 @@ static void add_header(const char *value)
 	item->string[len] = '\0';
 }
 
-#define THREAD_SHALLOW 1
-#define THREAD_DEEP 2
-static int thread;
+enum cover_setting {
+	COVER_UNSET,
+	COVER_OFF,
+	COVER_ON,
+	COVER_AUTO
+};
+
+enum thread_level {
+	THREAD_UNSET,
+	THREAD_SHALLOW,
+	THREAD_DEEP
+};
+
+enum cover_from_description {
+	COVER_FROM_NONE,
+	COVER_FROM_MESSAGE,
+	COVER_FROM_SUBJECT,
+	COVER_FROM_AUTO
+};
+
+enum auto_base_setting {
+	AUTO_BASE_NEVER,
+	AUTO_BASE_ALWAYS,
+	AUTO_BASE_WHEN_ABLE
+};
+
+static enum thread_level thread;
 static int do_signoff;
-static int base_auto;
+static enum auto_base_setting auto_base;
 static char *from;
 static const char *signature = git_version_string;
 static const char *signature_file;
-static int config_cover_letter;
+static enum cover_setting config_cover_letter;
 static const char *config_output_directory;
+static enum cover_from_description cover_from_description_mode = COVER_FROM_MESSAGE;
+static int show_notes;
+static struct display_notes_opt notes_opt;
 
-enum {
-	COVER_UNSET,
-	COVER_OFF,
-	COVER_ON,
-	COVER_AUTO
-};
+static enum cover_from_description parse_cover_from_description(const char *arg)
+{
+	if (!arg || !strcmp(arg, "default"))
+		return COVER_FROM_MESSAGE;
+	else if (!strcmp(arg, "none"))
+		return COVER_FROM_NONE;
+	else if (!strcmp(arg, "message"))
+		return COVER_FROM_MESSAGE;
+	else if (!strcmp(arg, "subject"))
+		return COVER_FROM_SUBJECT;
+	else if (!strcmp(arg, "auto"))
+		return COVER_FROM_AUTO;
+	else
+		die(_("%s: invalid cover from description mode"), arg);
+}
 
 static int git_format_config(const char *var, const char *value, void *cb)
 {
-	struct rev_info *rev = cb;
-
 	if (!strcmp(var, "format.headers")) {
 		if (!value)
 			die(_("format.headers without value"));
@@ -836,7 +897,7 @@ static int git_format_config(const char *var, const char *value, void *cb)
 			thread = THREAD_SHALLOW;
 			return 0;
 		}
-		thread = git_config_bool(var, value) && THREAD_SHALLOW;
+		thread = git_config_bool(var, value) ? THREAD_SHALLOW : THREAD_UNSET;
 		return 0;
 	}
 	if (!strcmp(var, "format.signoff")) {
@@ -858,7 +919,11 @@ static int git_format_config(const char *var, const char *value, void *cb)
 	if (!strcmp(var, "format.outputdirectory"))
 		return git_config_string(&config_output_directory, var, value);
 	if (!strcmp(var, "format.useautobase")) {
-		base_auto = git_config_bool(var, value);
+		if (value && !strcasecmp(value, "whenAble")) {
+			auto_base = AUTO_BASE_WHEN_ABLE;
+			return 0;
+		}
+		auto_base = git_config_bool(var, value) ? AUTO_BASE_ALWAYS : AUTO_BASE_NEVER;
 		return 0;
 	}
 	if (!strcmp(var, "format.from")) {
@@ -873,19 +938,17 @@ static int git_format_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 	if (!strcmp(var, "format.notes")) {
-		struct strbuf buf = STRBUF_INIT;
 		int b = git_parse_maybe_bool(value);
-		if (!b)
-			return 0;
-		rev->show_notes = 1;
-		if (b < 0) {
-			strbuf_addstr(&buf, value);
-			expand_notes_ref(&buf);
-			string_list_append(&rev->notes_opt.extra_notes_refs,
-					strbuf_detach(&buf, NULL));
-		} else {
-			rev->notes_opt.use_default_notes = 1;
-		}
+		if (b < 0)
+			enable_ref_display_notes(&notes_opt, &show_notes, value);
+		else if (b)
+			enable_default_display_notes(&notes_opt, &show_notes);
+		else
+			disable_display_notes(&notes_opt, &show_notes);
+		return 0;
+	}
+	if (!strcmp(var, "format.coverfromdescription")) {
+		cover_from_description_mode = parse_cover_from_description(value);
 		return 0;
 	}
 
@@ -899,15 +962,9 @@ static int open_next_file(struct commit *commit, const char *subject,
 			 struct rev_info *rev, int quiet)
 {
 	struct strbuf filename = STRBUF_INIT;
-	int suffix_len = strlen(rev->patch_suffix) + 1;
 
 	if (output_directory) {
 		strbuf_addstr(&filename, output_directory);
-		if (filename.len >=
-		    PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len) {
-			strbuf_release(&filename);
-			return error(_("name of output directory is too long"));
-		}
 		strbuf_complete(&filename, '/');
 	}
 
@@ -994,20 +1051,6 @@ static void print_signature(FILE *file)
 	putc('\n', file);
 }
 
-static void add_branch_description(struct strbuf *buf, const char *branch_name)
-{
-	struct strbuf desc = STRBUF_INIT;
-	if (!branch_name || !*branch_name)
-		return;
-	read_branch_desc(&desc, branch_name);
-	if (desc.len) {
-		strbuf_addch(buf, '\n');
-		strbuf_addbuf(buf, &desc);
-		strbuf_addch(buf, '\n');
-	}
-	strbuf_release(&desc);
-}
-
 static char *find_branch_name(struct rev_info *rev)
 {
 	int i, positive = -1;
@@ -1028,7 +1071,7 @@ static char *find_branch_name(struct rev_info *rev)
 		return NULL;
 	ref = rev->cmdline.rev[positive].name;
 	tip_oid = &rev->cmdline.rev[positive].item->oid;
-	if (dwim_ref(ref, strlen(ref), &branch_oid, &full_ref) &&
+	if (dwim_ref(ref, strlen(ref), &branch_oid, &full_ref, 0) &&
 	    skip_prefix(full_ref, "refs/heads/", &v) &&
 	    oideq(tip_oid, &branch_oid))
 		branch = xstrdup(v);
@@ -1054,15 +1097,70 @@ static void show_diffstat(struct rev_info *rev,
 	fprintf(rev->diffopt.file, "\n");
 }
 
-static void make_cover_letter(struct rev_info *rev, int use_stdout,
+static void prepare_cover_text(struct pretty_print_context *pp,
+			       const char *branch_name,
+			       struct strbuf *sb,
+			       const char *encoding,
+			       int need_8bit_cte)
+{
+	const char *subject = "*** SUBJECT HERE ***";
+	const char *body = "*** BLURB HERE ***";
+	struct strbuf description_sb = STRBUF_INIT;
+	struct strbuf subject_sb = STRBUF_INIT;
+
+	if (cover_from_description_mode == COVER_FROM_NONE)
+		goto do_pp;
+
+	if (branch_name && *branch_name)
+		read_branch_desc(&description_sb, branch_name);
+	if (!description_sb.len)
+		goto do_pp;
+
+	if (cover_from_description_mode == COVER_FROM_SUBJECT ||
+			cover_from_description_mode == COVER_FROM_AUTO)
+		body = format_subject(&subject_sb, description_sb.buf, " ");
+
+	if (cover_from_description_mode == COVER_FROM_MESSAGE ||
+			(cover_from_description_mode == COVER_FROM_AUTO &&
+			 subject_sb.len > COVER_FROM_AUTO_MAX_SUBJECT_LEN))
+		body = description_sb.buf;
+	else
+		subject = subject_sb.buf;
+
+do_pp:
+	pp_title_line(pp, &subject, sb, encoding, need_8bit_cte);
+	pp_remainder(pp, &body, sb, 0);
+
+	strbuf_release(&description_sb);
+	strbuf_release(&subject_sb);
+}
+
+static int get_notes_refs(struct string_list_item *item, void *arg)
+{
+	strvec_pushf(arg, "--notes=%s", item->string);
+	return 0;
+}
+
+static void get_notes_args(struct strvec *arg, struct rev_info *rev)
+{
+	if (!rev->show_notes) {
+		strvec_push(arg, "--no-notes");
+	} else if (rev->notes_opt.use_default_notes > 0 ||
+		   (rev->notes_opt.use_default_notes == -1 &&
+		    !rev->notes_opt.extra_notes_refs.nr)) {
+		strvec_push(arg, "--notes");
+	} else {
+		for_each_string_list(&rev->notes_opt.extra_notes_refs, get_notes_refs, arg);
+	}
+}
+
+static void make_cover_letter(struct rev_info *rev, int use_separate_file,
 			      struct commit *origin,
 			      int nr, struct commit **list,
 			      const char *branch_name,
 			      int quiet)
 {
 	const char *committer;
-	const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
-	const char *msg;
 	struct shortlog log;
 	struct strbuf sb = STRBUF_INIT;
 	int i;
@@ -1076,7 +1174,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 
 	committer = git_committer_info(0);
 
-	if (!use_stdout &&
+	if (use_separate_file &&
 	    open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
 		die(_("failed to create cover-letter file"));
 
@@ -1092,15 +1190,12 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 	if (!branch_name)
 		branch_name = find_branch_name(rev);
 
-	msg = body;
 	pp.fmt = CMIT_FMT_EMAIL;
 	pp.date_mode.type = DATE_RFC2822;
 	pp.rev = rev;
 	pp.print_email_subject = 1;
 	pp_user_info(&pp, NULL, &sb, committer, encoding);
-	pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte);
-	pp_remainder(&pp, &msg, &sb, 0);
-	add_branch_description(&sb, branch_name);
+	prepare_cover_text(&pp, branch_name, &sb, encoding, need_8bit_cte);
 	fprintf(rev->diffopt.file, "%s\n", sb.buf);
 
 	strbuf_release(&sb);
@@ -1111,6 +1206,7 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 	log.in1 = 2;
 	log.in2 = 4;
 	log.file = rev->diffopt.file;
+	log.groups = SHORTLOG_GROUP_AUTHOR;
 	for (i = 0; i < nr; i++)
 		shortlog_add_commit(&log, list[i]);
 
@@ -1122,7 +1218,8 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 
 	if (rev->idiff_oid1) {
 		fprintf_ln(rev->diffopt.file, "%s", rev->idiff_title);
-		show_interdiff(rev, 0);
+		show_interdiff(rev->idiff_oid1, rev->idiff_oid2, 0,
+			       &rev->diffopt);
 	}
 
 	if (rev->rdiff1) {
@@ -1131,13 +1228,22 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout,
 		 * can be added later if deemed desirable.
 		 */
 		struct diff_options opts;
+		struct strvec other_arg = STRVEC_INIT;
+		struct range_diff_options range_diff_opts = {
+			.creation_factor = rev->creation_factor,
+			.dual_color = 1,
+			.diffopt = &opts,
+			.other_arg = &other_arg
+		};
+
 		diff_setup(&opts);
 		opts.file = rev->diffopt.file;
 		opts.use_color = rev->diffopt.use_color;
 		diff_setup_done(&opts);
 		fprintf_ln(rev->diffopt.file, "%s", rev->rdiff_title);
-		show_range_diff(rev->rdiff1, rev->rdiff2,
-				rev->creation_factor, 1, &opts);
+		get_notes_args(&other_arg, rev);
+		show_range_diff(rev->rdiff1, rev->rdiff2, &range_diff_opts);
+		strvec_clear(&other_arg);
 	}
 }
 
@@ -1249,9 +1355,9 @@ static int output_directory_callback(const struct option *opt, const char *arg,
 
 static int thread_callback(const struct option *opt, const char *arg, int unset)
 {
-	int *thread = (int *)opt->value;
+	enum thread_level *thread = (enum thread_level *)opt->value;
 	if (unset)
-		*thread = 0;
+		*thread = THREAD_UNSET;
 	else if (!arg || !strcmp(arg, "shallow"))
 		*thread = THREAD_SHALLOW;
 	else if (!strcmp(arg, "deep"))
@@ -1298,7 +1404,7 @@ static int header_callback(const struct option *opt, const char *arg, int unset)
 		string_list_clear(&extra_to, 0);
 		string_list_clear(&extra_cc, 0);
 	} else {
-	    add_header(arg);
+		add_header(arg);
 	}
 	return 0;
 }
@@ -1336,6 +1442,23 @@ static int from_callback(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
+static int base_callback(const struct option *opt, const char *arg, int unset)
+{
+	const char **base_commit = opt->value;
+
+	if (unset) {
+		auto_base = AUTO_BASE_NEVER;
+		*base_commit = NULL;
+	} else if (!strcmp(arg, "auto")) {
+		auto_base = AUTO_BASE_ALWAYS;
+		*base_commit = NULL;
+	} else {
+		auto_base = AUTO_BASE_NEVER;
+		*base_commit = arg;
+	}
+	return 0;
+}
+
 struct base_tree_info {
 	struct object_id base_commit;
 	int nr_patch_id, alloc_patch_id;
@@ -1348,13 +1471,36 @@ static struct commit *get_base_commit(const char *base_commit,
 {
 	struct commit *base = NULL;
 	struct commit **rev;
-	int i = 0, rev_nr = 0;
+	int i = 0, rev_nr = 0, auto_select, die_on_failure;
 
-	if (base_commit && strcmp(base_commit, "auto")) {
+	switch (auto_base) {
+	case AUTO_BASE_NEVER:
+		if (base_commit) {
+			auto_select = 0;
+			die_on_failure = 1;
+		} else {
+			/* no base information is requested */
+			return NULL;
+		}
+		break;
+	case AUTO_BASE_ALWAYS:
+	case AUTO_BASE_WHEN_ABLE:
+		if (base_commit) {
+			BUG("requested automatic base selection but a commit was provided");
+		} else {
+			auto_select = 1;
+			die_on_failure = auto_base == AUTO_BASE_ALWAYS;
+		}
+		break;
+	default:
+		BUG("unexpected automatic base selection method");
+	}
+
+	if (!auto_select) {
 		base = lookup_commit_reference_by_name(base_commit);
 		if (!base)
 			die(_("unknown commit %s"), base_commit);
-	} else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) {
+	} else {
 		struct branch *curr_branch = branch_get(NULL);
 		const char *upstream = branch_get_upstream(curr_branch, NULL);
 		if (upstream) {
@@ -1362,19 +1508,32 @@ static struct commit *get_base_commit(const char *base_commit,
 			struct commit *commit;
 			struct object_id oid;
 
-			if (get_oid(upstream, &oid))
-				die(_("failed to resolve '%s' as a valid ref"), upstream);
+			if (get_oid(upstream, &oid)) {
+				if (die_on_failure)
+					die(_("failed to resolve '%s' as a valid ref"), upstream);
+				else
+					return NULL;
+			}
 			commit = lookup_commit_or_die(&oid, "upstream base");
 			base_list = get_merge_bases_many(commit, total, list);
 			/* There should be one and only one merge base. */
-			if (!base_list || base_list->next)
-				die(_("could not find exact merge base"));
+			if (!base_list || base_list->next) {
+				if (die_on_failure) {
+					die(_("could not find exact merge base"));
+				} else {
+					free_commit_list(base_list);
+					return NULL;
+				}
+			}
 			base = base_list->item;
 			free_commit_list(base_list);
 		} else {
-			die(_("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"));
+			if (die_on_failure)
+				die(_("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"));
+			else
+				return NULL;
 		}
 	}
 
@@ -1391,8 +1550,14 @@ static struct commit *get_base_commit(const char *base_commit,
 		for (i = 0; i < rev_nr / 2; i++) {
 			struct commit_list *merge_base;
 			merge_base = get_merge_bases(rev[2 * i], rev[2 * i + 1]);
-			if (!merge_base || merge_base->next)
-				die(_("failed to find exact merge base"));
+			if (!merge_base || merge_base->next) {
+				if (die_on_failure) {
+					die(_("failed to find exact merge base"));
+				} else {
+					free(rev);
+					return NULL;
+				}
+			}
 
 			rev[i] = merge_base->item;
 		}
@@ -1402,12 +1567,24 @@ static struct commit *get_base_commit(const char *base_commit,
 		rev_nr = DIV_ROUND_UP(rev_nr, 2);
 	}
 
-	if (!in_merge_bases(base, rev[0]))
-		die(_("base commit should be the ancestor of revision list"));
+	if (!in_merge_bases(base, rev[0])) {
+		if (die_on_failure) {
+			die(_("base commit should be the ancestor of revision list"));
+		} else {
+			free(rev);
+			return NULL;
+		}
+	}
 
 	for (i = 0; i < total; i++) {
-		if (base == list[i])
-			die(_("base commit shouldn't be in revision list"));
+		if (base == list[i]) {
+			if (die_on_failure) {
+				die(_("base commit shouldn't be in revision list"));
+			} else {
+				free(rev);
+				return NULL;
+			}
+		}
 	}
 
 	free(rev);
@@ -1490,13 +1667,19 @@ static void print_bases(struct base_tree_info *bases, FILE *file)
 	oidclr(&bases->base_commit);
 }
 
-static const char *diff_title(struct strbuf *sb, int reroll_count,
-		       const char *generic, const char *rerolled)
+static const char *diff_title(struct strbuf *sb,
+			      const char *reroll_count,
+			      const char *generic,
+			      const char *rerolled)
 {
-	if (reroll_count <= 0)
+	int v;
+
+	/* RFC may be v0, so allow -v1 to diff against v0 */
+	if (reroll_count && !strtol_i(reroll_count, 10, &v) &&
+	    v >= 1)
+		strbuf_addf(sb, rerolled, v - 1);
+	else
 		strbuf_addstr(sb, generic);
-	else /* RFC may be v0, so allow -v1 to diff against v0 */
-		strbuf_addf(sb, rerolled, reroll_count - 1);
 	return sb->buf;
 }
 
@@ -1507,16 +1690,20 @@ static void infer_range_diff_ranges(struct strbuf *r1,
 				    struct commit *head)
 {
 	const char *head_oid = oid_to_hex(&head->object.oid);
+	int prev_is_range = is_range_diff_range(prev);
 
-	if (!strstr(prev, "..")) {
+	if (prev_is_range)
+		strbuf_addstr(r1, prev);
+	else
 		strbuf_addf(r1, "%s..%s", head_oid, prev);
+
+	if (origin)
+		strbuf_addf(r2, "%s..%s", oid_to_hex(&origin->object.oid), head_oid);
+	else if (prev_is_range)
+		die(_("failed to infer range-diff origin of current series"));
+	else {
+		warning(_("using '%s' as range-diff origin of current series"), prev);
 		strbuf_addf(r2, "%s..%s", prev, head_oid);
-	} else if (!origin) {
-		die(_("failed to infer range-diff ranges"));
-	} else {
-		strbuf_addstr(r1, prev);
-		strbuf_addf(r2, "%s..%s",
-			    oid_to_hex(&origin->object.oid), head_oid);
 	}
 }
 
@@ -1541,10 +1728,12 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	struct strbuf buf = STRBUF_INIT;
 	int use_patch_format = 0;
 	int quiet = 0;
-	int reroll_count = -1;
+	const char *reroll_count = NULL;
+	char *cover_from_description_arg = NULL;
 	char *branch_name = NULL;
 	char *base_commit = NULL;
 	struct base_tree_info bases;
+	struct commit *base;
 	int show_progress = 0;
 	struct progress *progress = NULL;
 	struct oid_array idiff_prev = OID_ARRAY_INIT;
@@ -1556,13 +1745,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	int creation_factor = -1;
 
 	const struct option builtin_format_patch_options[] = {
-		{ OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
+		OPT_CALLBACK_F('n', "numbered", &numbered, NULL,
 			    N_("use [PATCH n/m] even with a single patch"),
-			    PARSE_OPT_NOARG, numbered_callback },
-		{ OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL,
+			    PARSE_OPT_NOARG, numbered_callback),
+		OPT_CALLBACK_F('N', "no-numbered", &numbered, NULL,
 			    N_("use [PATCH] even with multiple patches"),
-			    PARSE_OPT_NOARG | PARSE_OPT_NONEG, no_numbered_callback },
-		OPT_BOOL('s', "signoff", &do_signoff, N_("add Signed-off-by:")),
+			    PARSE_OPT_NOARG | PARSE_OPT_NONEG, no_numbered_callback),
+		OPT_BOOL('s', "signoff", &do_signoff, N_("add a Signed-off-by trailer")),
 		OPT_BOOL(0, "stdout", &use_stdout,
 			    N_("print patches to standard out")),
 		OPT_BOOL(0, "cover-letter", &cover_letter,
@@ -1573,20 +1762,25 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			    N_("use <sfx> instead of '.patch'")),
 		OPT_INTEGER(0, "start-number", &start_number,
 			    N_("start numbering patches at <n> instead of 1")),
-		OPT_INTEGER('v', "reroll-count", &reroll_count,
+		OPT_STRING('v', "reroll-count", &reroll_count, N_("reroll-count"),
 			    N_("mark the series as Nth re-roll")),
-		{ OPTION_CALLBACK, 0, "rfc", &rev, NULL,
-			    N_("Use [RFC PATCH] instead of [PATCH]"),
-			    PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback },
-		{ OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"),
-			    N_("Use [<prefix>] instead of [PATCH]"),
-			    PARSE_OPT_NONEG, subject_prefix_callback },
-		{ OPTION_CALLBACK, 'o', "output-directory", &output_directory,
+		OPT_INTEGER(0, "filename-max-length", &fmt_patch_name_max,
+			    N_("max length of output filename")),
+		OPT_CALLBACK_F(0, "rfc", &rev, NULL,
+			    N_("use [RFC PATCH] instead of [PATCH]"),
+			    PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback),
+		OPT_STRING(0, "cover-from-description", &cover_from_description_arg,
+			    N_("cover-from-description-mode"),
+			    N_("generate parts of a cover letter based on a branch's description")),
+		OPT_CALLBACK_F(0, "subject-prefix", &rev, N_("prefix"),
+			    N_("use [<prefix>] instead of [PATCH]"),
+			    PARSE_OPT_NONEG, subject_prefix_callback),
+		OPT_CALLBACK_F('o', "output-directory", &output_directory,
 			    N_("dir"), N_("store resulting files in <dir>"),
-			    PARSE_OPT_NONEG, output_directory_callback },
-		{ OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL,
+			    PARSE_OPT_NONEG, output_directory_callback),
+		OPT_CALLBACK_F('k', "keep-subject", &rev, NULL,
 			    N_("don't strip/add [PATCH]"),
-			    PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback },
+			    PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback),
 		OPT_BOOL(0, "no-binary", &no_binary_diff,
 			 N_("don't output binary diffs")),
 		OPT_BOOL(0, "zero-commit", &zero_commit,
@@ -1597,31 +1791,30 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			      N_("show patch format instead of default (patch + stat)"),
 			      1, PARSE_OPT_NONEG),
 		OPT_GROUP(N_("Messaging")),
-		{ OPTION_CALLBACK, 0, "add-header", NULL, N_("header"),
-			    N_("add email header"), 0, header_callback },
-		{ OPTION_CALLBACK, 0, "to", NULL, N_("email"), N_("add To: header"),
-			    0, to_callback },
-		{ OPTION_CALLBACK, 0, "cc", NULL, N_("email"), N_("add Cc: header"),
-			    0, cc_callback },
-		{ OPTION_CALLBACK, 0, "from", &from, N_("ident"),
+		OPT_CALLBACK(0, "add-header", NULL, N_("header"),
+			    N_("add email header"), header_callback),
+		OPT_CALLBACK(0, "to", NULL, N_("email"), N_("add To: header"), to_callback),
+		OPT_CALLBACK(0, "cc", NULL, N_("email"), N_("add Cc: header"), cc_callback),
+		OPT_CALLBACK_F(0, "from", &from, N_("ident"),
 			    N_("set From address to <ident> (or committer ident if absent)"),
-			    PARSE_OPT_OPTARG, from_callback },
+			    PARSE_OPT_OPTARG, from_callback),
 		OPT_STRING(0, "in-reply-to", &in_reply_to, N_("message-id"),
 			    N_("make first mail a reply to <message-id>")),
-		{ OPTION_CALLBACK, 0, "attach", &rev, N_("boundary"),
+		OPT_CALLBACK_F(0, "attach", &rev, N_("boundary"),
 			    N_("attach the patch"), PARSE_OPT_OPTARG,
-			    attach_callback },
-		{ OPTION_CALLBACK, 0, "inline", &rev, N_("boundary"),
+			    attach_callback),
+		OPT_CALLBACK_F(0, "inline", &rev, N_("boundary"),
 			    N_("inline the patch"),
 			    PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
-			    inline_callback },
-		{ OPTION_CALLBACK, 0, "thread", &thread, N_("style"),
+			    inline_callback),
+		OPT_CALLBACK_F(0, "thread", &thread, N_("style"),
 			    N_("enable message threading, styles: shallow, deep"),
-			    PARSE_OPT_OPTARG, thread_callback },
+			    PARSE_OPT_OPTARG, thread_callback),
 		OPT_STRING(0, "signature", &signature, N_("signature"),
 			    N_("add a signature")),
-		OPT_STRING(0, "base", &base_commit, N_("base-commit"),
-			   N_("add prerequisite tree info to the patch series")),
+		OPT_CALLBACK_F(0, "base", &base_commit, N_("base-commit"),
+			       N_("add prerequisite tree info to the patch series"),
+			       0, base_callback),
 		OPT_FILENAME(0, "signature-file", &signature_file,
 				N_("add a signature from a file")),
 		OPT__QUIET(&quiet, N_("don't print the patch filenames")),
@@ -1641,9 +1834,13 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	extra_to.strdup_strings = 1;
 	extra_cc.strdup_strings = 1;
 	init_log_defaults();
+	init_display_notes(&notes_opt);
+	git_config(git_format_config, NULL);
 	repo_init_revisions(the_repository, &rev, prefix);
-	git_config(git_format_config, &rev);
+	rev.show_notes = show_notes;
+	memcpy(&rev.notes_opt, &notes_opt, sizeof(notes_opt));
 	rev.commit_format = CMIT_FMT_EMAIL;
+	rev.encode_email_headers = default_encode_email_headers;
 	rev.expand_tabs_in_log_default = 0;
 	rev.verbose_header = 1;
 	rev.diff = 1;
@@ -1669,9 +1866,17 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			     PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
 			     PARSE_OPT_KEEP_DASHDASH);
 
-	if (0 < reroll_count) {
+	/* Make sure "0000-$sub.patch" gives non-negative length for $sub */
+	if (fmt_patch_name_max <= strlen("0000-") + strlen(fmt_patch_suffix))
+		fmt_patch_name_max = strlen("0000-") + strlen(fmt_patch_suffix);
+
+	if (cover_from_description_arg)
+		cover_from_description_mode = parse_cover_from_description(cover_from_description_arg);
+
+	if (reroll_count) {
 		struct strbuf sprefix = STRBUF_INIT;
-		strbuf_addf(&sprefix, "%s v%d",
+
+		strbuf_addf(&sprefix, "%s v%s",
 			    rev.subject_prefix, reroll_count);
 		rev.reroll_count = reroll_count;
 		rev.subject_prefix = strbuf_detach(&sprefix, NULL);
@@ -1750,27 +1955,34 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
 
 	rev.zero_commit = zero_commit;
+	rev.patch_name_max = fmt_patch_name_max;
 
 	if (!rev.diffopt.flags.text && !no_binary_diff)
 		rev.diffopt.flags.binary = 1;
 
 	if (rev.show_notes)
-		init_display_notes(&rev.notes_opt);
+		load_display_notes(&rev.notes_opt);
 
-	if (!output_directory && !use_stdout)
-		output_directory = config_output_directory;
+	if (use_stdout + rev.diffopt.close_file + !!output_directory > 1)
+		die(_("--stdout, --output, and --output-directory are mutually exclusive"));
 
-	if (!use_stdout)
-		output_directory = set_outdir(prefix, output_directory);
-	else
+	if (use_stdout) {
 		setup_pager();
-
-	if (output_directory) {
+	} else if (rev.diffopt.close_file) {
+		/*
+		 * The diff code parsed --output; it has already opened the
+		 * file, but we must instruct it not to close after each diff.
+		 */
+		rev.diffopt.no_free = 1;
+	} else {
 		int saved;
+
+		if (!output_directory)
+			output_directory = config_output_directory;
+		output_directory = set_outdir(prefix, output_directory);
+
 		if (rev.diffopt.use_color != GIT_COLOR_ALWAYS)
 			rev.diffopt.use_color = GIT_COLOR_NEVER;
-		if (use_stdout)
-			die(_("standard output, or directory, which one?"));
 		/*
 		 * We consider <outdir> as 'outside of gitdir', therefore avoid
 		 * applying adjust_shared_perm in s-c-l-d.
@@ -1914,8 +2126,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	}
 
 	memset(&bases, 0, sizeof(bases));
-	if (base_commit || base_auto) {
-		struct commit *base = get_base_commit(base_commit, list, nr);
+	base = get_base_commit(base_commit, list, nr);
+	if (base) {
 		reset_revision_walk();
 		clear_object_flags(UNINTERESTING);
 		prepare_bases(&bases, base, list, nr);
@@ -1932,7 +2144,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 	if (cover_letter) {
 		if (thread)
 			gen_message_id(&rev, "cover");
-		make_cover_letter(&rev, use_stdout,
+		make_cover_letter(&rev, !!output_directory,
 				  origin, nr, list, branch_name, quiet);
 		print_bases(&bases, rev.diffopt.file);
 		print_signature(rev.diffopt.file);
@@ -1987,7 +2199,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			gen_message_id(&rev, oid_to_hex(&commit->object.oid));
 		}
 
-		if (!use_stdout &&
+		if (output_directory &&
 		    open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
 			die(_("failed to create output files"));
 		shown = log_tree_commit(&rev, commit);
@@ -2000,7 +2212,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 		 * the log; when using one file per patch, we do
 		 * not want the extra blank line.
 		 */
-		if (!use_stdout)
+		if (output_directory)
 			rev.shown_one = 0;
 		if (shown) {
 			print_bases(&bases, rev.diffopt.file);
@@ -2011,7 +2223,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
 			else
 				print_signature(rev.diffopt.file);
 		}
-		if (!use_stdout)
+		if (output_directory)
 			fclose(rev.diffopt.file);
 	}
 	stop_progress(&progress);
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index f069a028ce..29a26ad8ae 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -12,6 +12,7 @@
 #include "dir.h"
 #include "builtin.h"
 #include "tree.h"
+#include "cache-tree.h"
 #include "parse-options.h"
 #include "resolve-undo.h"
 #include "string-list.h"
@@ -35,6 +36,7 @@ static int line_terminator = '\n';
 static int debug_mode;
 static int show_eol;
 static int recurse_submodules;
+static int skipping_duplicates;
 
 static const char *prefix;
 static int max_prefix_len;
@@ -55,7 +57,7 @@ static const char *tag_modified = "";
 static const char *tag_skip_worktree = "";
 static const char *tag_resolve_undo = "";
 
-static void write_eolinfo(const struct index_state *istate,
+static void write_eolinfo(struct index_state *istate,
 			  const struct cache_entry *ce, const char *path)
 {
 	if (show_eol) {
@@ -120,7 +122,7 @@ static void print_debug(const struct cache_entry *ce)
 	}
 }
 
-static void show_dir_entry(const struct index_state *istate,
+static void show_dir_entry(struct index_state *istate,
 			   const char *tag, struct dir_entry *ent)
 {
 	int len = max_prefix_len;
@@ -128,15 +130,16 @@ static void show_dir_entry(const struct index_state *istate,
 	if (len > ent->len)
 		die("git ls-files: internal error - directory entry not superset of prefix");
 
-	if (!dir_path_match(istate, ent, &pathspec, len, ps_matched))
-		return;
+	/* If ps_matches is non-NULL, figure out which pathspec(s) match. */
+	if (ps_matched)
+		dir_path_match(istate, ent, &pathspec, len, ps_matched);
 
 	fputs(tag, stdout);
 	write_eolinfo(istate, NULL, ent->name);
 	write_name(ent->name);
 }
 
-static void show_other_files(const struct index_state *istate,
+static void show_other_files(struct index_state *istate,
 			     const struct dir_struct *dir)
 {
 	int i;
@@ -149,7 +152,7 @@ static void show_other_files(const struct index_state *istate,
 	}
 }
 
-static void show_killed_files(const struct index_state *istate,
+static void show_killed_files(struct index_state *istate,
 			      const struct dir_struct *dir)
 {
 	int i;
@@ -207,7 +210,7 @@ static void show_submodule(struct repository *superproject,
 {
 	struct repository subrepo;
 	const struct submodule *sub = submodule_from_path(superproject,
-							  &null_oid, path);
+							  null_oid(), path);
 
 	if (repo_submodule_init(&subrepo, superproject, sub))
 		return;
@@ -251,7 +254,7 @@ static void show_ce(struct repository *repo, struct dir_struct *dir,
 	}
 }
 
-static void show_ru_info(const struct index_state *istate)
+static void show_ru_info(struct index_state *istate)
 {
 	struct string_list_item *item;
 
@@ -311,45 +314,61 @@ static void show_files(struct repository *repo, struct dir_struct *dir)
 		if (show_killed)
 			show_killed_files(repo->index, dir);
 	}
-	if (show_cached || show_stage) {
-		for (i = 0; i < repo->index->cache_nr; i++) {
-			const struct cache_entry *ce = repo->index->cache[i];
 
-			construct_fullname(&fullname, repo, ce);
+	if (!(show_cached || show_stage || show_deleted || show_modified))
+		return;
+	/* TODO: audit for interaction with sparse-index. */
+	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;
+		int stat_err;
 
-			if ((dir->flags & DIR_SHOW_IGNORED) &&
-			    !ce_excluded(dir, repo->index, fullname.buf, ce))
-				continue;
-			if (show_unmerged && !ce_stage(ce))
-				continue;
-			if (ce->ce_flags & CE_UPDATE)
-				continue;
+		construct_fullname(&fullname, repo, ce);
+
+		if ((dir->flags & DIR_SHOW_IGNORED) &&
+			!ce_excluded(dir, repo->index, fullname.buf, ce))
+			continue;
+		if (ce->ce_flags & CE_UPDATE)
+			continue;
+		if ((show_cached || show_stage) &&
+		    (!show_unmerged || ce_stage(ce))) {
 			show_ce(repo, dir, ce, fullname.buf,
 				ce_stage(ce) ? tag_unmerged :
 				(ce_skip_worktree(ce) ? tag_skip_worktree :
 				 tag_cached));
+			if (skipping_duplicates)
+				goto skip_to_next_name;
 		}
-	}
-	if (show_deleted || show_modified) {
-		for (i = 0; i < repo->index->cache_nr; i++) {
-			const struct cache_entry *ce = repo->index->cache[i];
-			struct stat st;
-			int err;
 
-			construct_fullname(&fullname, repo, ce);
-
-			if ((dir->flags & DIR_SHOW_IGNORED) &&
-			    !ce_excluded(dir, repo->index, fullname.buf, ce))
-				continue;
-			if (ce->ce_flags & CE_UPDATE)
-				continue;
-			if (ce_skip_worktree(ce))
-				continue;
-			err = lstat(fullname.buf, &st);
-			if (show_deleted && err)
-				show_ce(repo, dir, ce, fullname.buf, tag_removed);
-			if (show_modified && ie_modified(repo->index, ce, &st, 0))
-				show_ce(repo, dir, ce, fullname.buf, tag_modified);
+		if (!(show_deleted || show_modified))
+			continue;
+		if (ce_skip_worktree(ce))
+			continue;
+		stat_err = lstat(fullname.buf, &st);
+		if (stat_err && (errno != ENOENT && errno != ENOTDIR))
+			error_errno("cannot lstat '%s'", fullname.buf);
+		if (stat_err && show_deleted) {
+			show_ce(repo, dir, ce, fullname.buf, tag_removed);
+			if (skipping_duplicates)
+				goto skip_to_next_name;
+		}
+		if (show_modified &&
+		    (stat_err || ie_modified(repo->index, ce, &st, 0))) {
+			show_ce(repo, dir, ce, fullname.buf, tag_modified);
+			if (skipping_duplicates)
+				goto skip_to_next_name;
+		}
+		continue;
+
+skip_to_next_name:
+		{
+			int j;
+			struct cache_entry **cache = repo->index->cache;
+			for (j = i + 1; j < repo->index->cache_nr; j++)
+				if (strcmp(ce->name, cache[j]->name))
+					break;
+			i = j - 1; /* compensate for the for loop */
 		}
 	}
 
@@ -404,6 +423,53 @@ static int get_common_prefix_len(const char *common_prefix)
 	return common_prefix_len;
 }
 
+static int read_one_entry_opt(struct index_state *istate,
+			      const struct object_id *oid,
+			      struct strbuf *base,
+			      const char *pathname,
+			      unsigned mode, int opt)
+{
+	int len;
+	struct cache_entry *ce;
+
+	if (S_ISDIR(mode))
+		return READ_TREE_RECURSIVE;
+
+	len = strlen(pathname);
+	ce = make_empty_cache_entry(istate, base->len + len);
+
+	ce->ce_mode = create_ce_mode(mode);
+	ce->ce_flags = create_ce_flags(1);
+	ce->ce_namelen = base->len + len;
+	memcpy(ce->name, base->buf, base->len);
+	memcpy(ce->name + base->len, pathname, len+1);
+	oidcpy(&ce->oid, oid);
+	return add_index_entry(istate, ce, opt);
+}
+
+static int read_one_entry(const struct object_id *oid, struct strbuf *base,
+			  const char *pathname, unsigned mode,
+			  void *context)
+{
+	struct index_state *istate = context;
+	return read_one_entry_opt(istate, oid, base, pathname,
+				  mode,
+				  ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
+}
+
+/*
+ * This is used when the caller knows there is no existing entries at
+ * the stage that will conflict with the entry being added.
+ */
+static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base,
+				const char *pathname, unsigned mode,
+				void *context)
+{
+	struct index_state *istate = context;
+	return read_one_entry_opt(istate, oid, base, pathname,
+				  mode, ADD_CACHE_JUST_APPEND);
+}
+
 /*
  * Read the tree specified with --with-tree option
  * (typically, HEAD) into stage #1 and then
@@ -420,6 +486,8 @@ void overlay_tree_on_index(struct index_state *istate,
 	struct pathspec pathspec;
 	struct cache_entry *last_stage0 = NULL;
 	int i;
+	read_tree_fn_t fn = NULL;
+	int err;
 
 	if (get_oid(tree_name, &oid))
 		die("tree-ish %s not found.", tree_name);
@@ -428,6 +496,8 @@ void overlay_tree_on_index(struct index_state *istate,
 		die("bad tree-ish %s", tree_name);
 
 	/* Hoist the unmerged entries up to stage #3 to make room */
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(istate);
 	for (i = 0; i < istate->cache_nr; i++) {
 		struct cache_entry *ce = istate->cache[i];
 		if (!ce_stage(ce))
@@ -442,9 +512,32 @@ void overlay_tree_on_index(struct index_state *istate,
 			       PATHSPEC_PREFER_CWD, prefix, matchbuf);
 	} else
 		memset(&pathspec, 0, sizeof(pathspec));
-	if (read_tree(the_repository, tree, 1, &pathspec, istate))
+
+	/*
+	 * See if we have cache entry at the stage.  If so,
+	 * do it the original slow way, otherwise, append and then
+	 * sort at the end.
+	 */
+	for (i = 0; !fn && i < istate->cache_nr; i++) {
+		const struct cache_entry *ce = istate->cache[i];
+		if (ce_stage(ce) == 1)
+			fn = read_one_entry;
+	}
+
+	if (!fn)
+		fn = read_one_entry_quick;
+	err = read_tree(the_repository, tree, &pathspec, fn, istate);
+	if (err)
 		die("unable to read tree entries %s", tree_name);
 
+	/*
+	 * Sort the cache entry -- we need to nuke the cache tree, though.
+	 */
+	if (fn == read_one_entry_quick) {
+		cache_tree_free(&istate->cache_tree);
+		QSORT(istate->cache, istate->cache_nr, cmp_cache_name_compare);
+	}
+
 	for (i = 0; i < istate->cache_nr; i++) {
 		struct cache_entry *ce = istate->cache[i];
 		switch (ce_stage(ce)) {
@@ -514,8 +607,8 @@ static int option_parse_exclude_standard(const struct option *opt,
 int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 {
 	int require_work_tree = 0, show_tag = 0, i;
-	const char *max_prefix;
-	struct dir_struct dir;
+	char *max_prefix;
+	struct dir_struct dir = DIR_INIT;
 	struct pattern_list *pl;
 	struct string_list exclude_list = STRING_LIST_INIT_NODUP;
 	struct option builtin_ls_files_options[] = {
@@ -554,18 +647,18 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 			N_("show unmerged files in the output")),
 		OPT_BOOL(0, "resolve-undo", &show_resolve_undo,
 			    N_("show resolve-undo information")),
-		{ OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"),
+		OPT_CALLBACK_F('x', "exclude", &exclude_list, N_("pattern"),
 			N_("skip files matching pattern"),
-			PARSE_OPT_NONEG, option_parse_exclude },
-		{ OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"),
+			PARSE_OPT_NONEG, option_parse_exclude),
+		OPT_CALLBACK_F('X', "exclude-from", &dir, N_("file"),
 			N_("exclude patterns are read from <file>"),
-			PARSE_OPT_NONEG, option_parse_exclude_from },
+			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>")),
-		{ OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL,
+		OPT_CALLBACK_F(0, "exclude-standard", &dir, NULL,
 			N_("add the standard git exclusions"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
-			option_parse_exclude_standard },
+			option_parse_exclude_standard),
 		OPT_SET_INT_F(0, "full-name", &prefix_len,
 			      N_("make the output relative to the project top directory"),
 			      0, PARSE_OPT_NONEG),
@@ -577,13 +670,14 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 			N_("pretend that paths removed since <tree-ish> are still present")),
 		OPT__ABBREV(&abbrev),
 		OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
+		OPT_BOOL(0, "deduplicate", &skipping_duplicates,
+			 N_("suppress duplicate entries")),
 		OPT_END()
 	};
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
 		usage_with_options(ls_files_usage, builtin_ls_files_options);
 
-	memset(&dir, 0, sizeof(dir));
 	prefix = cmd_prefix;
 	if (prefix)
 		prefix_len = strlen(prefix);
@@ -616,6 +710,8 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 		 * you also show the stage information.
 		 */
 		show_stage = 1;
+	if (show_tag || show_stage)
+		skipping_duplicates = 0;
 	if (dir.exclude_per_dir)
 		exc_given = 1;
 
@@ -655,6 +751,9 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 	if (pathspec.nr && error_unmatch)
 		ps_matched = xcalloc(pathspec.nr, 1);
 
+	if ((dir.flags & DIR_SHOW_IGNORED) && !show_others && !show_cached)
+		die("ls-files -i must be used with either -o or -c");
+
 	if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given)
 		die("ls-files --ignored needs some exclude pattern");
 
@@ -687,6 +786,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 		return bad ? 1 : 0;
 	}
 
-	UNLEAK(dir);
+	dir_clear(&dir);
+	free(max_prefix);
 	return 0;
 }
diff --git a/builtin/ls-remote.c b/builtin/ls-remote.c
index 6ef519514b..f4fd823af8 100644
--- a/builtin/ls-remote.c
+++ b/builtin/ls-remote.c
@@ -45,7 +45,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 	int show_symref_target = 0;
 	const char *uploadpack = NULL;
 	const char **pattern = NULL;
-	struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
+	struct transport_ls_refs_options transport_options =
+		TRANSPORT_LS_REFS_OPTIONS_INIT;
 	int i;
 	struct string_list server_options = STRING_LIST_INIT_DUP;
 
@@ -83,18 +84,22 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 			     PARSE_OPT_STOP_AT_NON_OPTION);
 	dest = argv[0];
 
+	packet_trace_identity("ls-remote");
+
+	UNLEAK(sorting);
+
 	if (argc > 1) {
 		int i;
-		pattern = xcalloc(argc, sizeof(const char *));
+		CALLOC_ARRAY(pattern, argc);
 		for (i = 1; i < argc; i++) {
 			pattern[i - 1] = xstrfmt("*/%s", argv[i]);
 		}
 	}
 
 	if (flags & REF_TAGS)
-		argv_array_push(&ref_prefixes, "refs/tags/");
+		strvec_push(&transport_options.ref_prefixes, "refs/tags/");
 	if (flags & REF_HEADS)
-		argv_array_push(&ref_prefixes, "refs/heads/");
+		strvec_push(&transport_options.ref_prefixes, "refs/heads/");
 
 	remote = remote_get(dest);
 	if (!remote) {
@@ -107,7 +112,6 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 
 	if (get_url) {
 		printf("%s\n", *remote->url);
-		UNLEAK(sorting);
 		return 0;
 	}
 
@@ -117,10 +121,10 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 	if (server_options.nr)
 		transport->server_options = &server_options;
 
-	ref = transport_get_remote_refs(transport, &ref_prefixes);
-	if (transport_disconnect(transport)) {
-		UNLEAK(sorting);
-		return 1;
+	ref = transport_get_remote_refs(transport, &transport_options);
+	if (ref) {
+		int hash_algo = hash_algo_by_ptr(transport_get_hash_algo(transport));
+		repo_set_hash_algo(the_repository, hash_algo);
 	}
 
 	if (!dest && !quiet)
@@ -146,7 +150,8 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 		status = 0; /* we found something */
 	}
 
-	UNLEAK(sorting);
 	ref_array_clear(&ref_array);
+	if (transport_disconnect(transport))
+		return 1;
 	return status;
 }
diff --git a/builtin/ls-tree.c b/builtin/ls-tree.c
index 7cad3f24eb..3a442631c7 100644
--- a/builtin/ls-tree.c
+++ b/builtin/ls-tree.c
@@ -62,7 +62,7 @@ static int show_recursive(const char *base, int baselen, const char *pathname)
 }
 
 static int show_tree(const struct object_id *oid, struct strbuf *base,
-		const char *pathname, unsigned mode, int stage, void *context)
+		const char *pathname, unsigned mode, void *context)
 {
 	int retval = 0;
 	int baselen;
@@ -185,6 +185,6 @@ int cmd_ls_tree(int argc, const char **argv, const char *prefix)
 	tree = parse_tree_indirect(&oid);
 	if (!tree)
 		die("not a tree object");
-	return !!read_tree_recursive(the_repository, tree, "", 0, 0,
-				     &pathspec, show_tree, NULL);
+	return !!read_tree(the_repository, tree,
+			   &pathspec, show_tree, NULL);
 }
diff --git a/builtin/mailinfo.c b/builtin/mailinfo.c
index cfb667a594..01d16ef9e5 100644
--- a/builtin/mailinfo.c
+++ b/builtin/mailinfo.c
@@ -7,54 +7,103 @@
 #include "utf8.h"
 #include "strbuf.h"
 #include "mailinfo.h"
+#include "parse-options.h"
 
-static const char mailinfo_usage[] =
-	"git mailinfo [-k | -b] [-m | --message-id] [-u | --encoding=<encoding> | -n] [--scissors | --no-scissors] <msg> <patch> < mail >info";
+static const char * const mailinfo_usage[] = {
+	/* TRANSLATORS: keep <> in "<" mail ">" info. */
+	N_("git mailinfo [<options>] <msg> <patch> < mail >info"),
+	NULL,
+};
+
+struct metainfo_charset
+{
+	enum {
+		CHARSET_DEFAULT,
+		CHARSET_NO_REENCODE,
+		CHARSET_EXPLICIT,
+	} policy;
+	const char *charset;
+};
+
+static int parse_opt_explicit_encoding(const struct option *opt,
+				       const char *arg, int unset)
+{
+	struct metainfo_charset *meta_charset = opt->value;
+
+	BUG_ON_OPT_NEG(unset);
+
+	meta_charset->policy = CHARSET_EXPLICIT;
+	meta_charset->charset = arg;
+
+	return 0;
+}
+
+static int parse_opt_quoted_cr(const struct option *opt, const char *arg, int unset)
+{
+	BUG_ON_OPT_NEG(unset);
+
+	if (mailinfo_parse_quoted_cr_action(arg, opt->value) != 0)
+		return error(_("bad action '%s' for '%s'"), arg, "--quoted-cr");
+	return 0;
+}
 
 int cmd_mailinfo(int argc, const char **argv, const char *prefix)
 {
-	const char *def_charset;
+	struct metainfo_charset meta_charset;
 	struct mailinfo mi;
 	int status;
 	char *msgfile, *patchfile;
 
+	struct option options[] = {
+		OPT_BOOL('k', NULL, &mi.keep_subject, N_("keep subject")),
+		OPT_BOOL('b', NULL, &mi.keep_non_patch_brackets_in_subject,
+			 N_("keep non patch brackets in subject")),
+		OPT_BOOL('m', "message-id", &mi.add_message_id,
+			 N_("copy Message-ID to the end of commit message")),
+		OPT_SET_INT_F('u', NULL, &meta_charset.policy,
+			      N_("re-code metadata to i18n.commitEncoding"),
+			      CHARSET_DEFAULT, PARSE_OPT_NONEG),
+		OPT_SET_INT_F('n', NULL, &meta_charset.policy,
+			      N_("disable charset re-coding of metadata"),
+			      CHARSET_NO_REENCODE, PARSE_OPT_NONEG),
+		OPT_CALLBACK_F(0, "encoding", &meta_charset, N_("encoding"),
+			       N_("re-code metadata to this encoding"),
+			       PARSE_OPT_NONEG, parse_opt_explicit_encoding),
+		OPT_BOOL(0, "scissors", &mi.use_scissors, N_("use scissors")),
+		OPT_CALLBACK_F(0, "quoted-cr", &mi.quoted_cr, N_("<action>"),
+			       N_("action when quoted CR is found"),
+			       PARSE_OPT_NONEG, parse_opt_quoted_cr),
+		OPT_HIDDEN_BOOL(0, "inbody-headers", &mi.use_inbody_headers,
+			 N_("use headers in message's body")),
+		OPT_END()
+	};
+
 	setup_mailinfo(&mi);
+	meta_charset.policy = CHARSET_DEFAULT;
 
-	def_charset = get_commit_output_encoding();
-	mi.metainfo_charset = def_charset;
-
-	while (1 < argc && argv[1][0] == '-') {
-		if (!strcmp(argv[1], "-k"))
-			mi.keep_subject = 1;
-		else if (!strcmp(argv[1], "-b"))
-			mi.keep_non_patch_brackets_in_subject = 1;
-		else if (!strcmp(argv[1], "-m") || !strcmp(argv[1], "--message-id"))
-			mi.add_message_id = 1;
-		else if (!strcmp(argv[1], "-u"))
-			mi.metainfo_charset = def_charset;
-		else if (!strcmp(argv[1], "-n"))
-			mi.metainfo_charset = NULL;
-		else if (starts_with(argv[1], "--encoding="))
-			mi.metainfo_charset = argv[1] + 11;
-		else if (!strcmp(argv[1], "--scissors"))
-			mi.use_scissors = 1;
-		else if (!strcmp(argv[1], "--no-scissors"))
-			mi.use_scissors = 0;
-		else if (!strcmp(argv[1], "--no-inbody-headers"))
-			mi.use_inbody_headers = 0;
-		else
-			usage(mailinfo_usage);
-		argc--; argv++;
-	}
+	argc = parse_options(argc, argv, prefix, options, mailinfo_usage, 0);
 
-	if (argc != 3)
-		usage(mailinfo_usage);
+	if (argc != 2)
+		usage_with_options(mailinfo_usage, options);
+
+	switch (meta_charset.policy) {
+	case CHARSET_DEFAULT:
+		mi.metainfo_charset = get_commit_output_encoding();
+		break;
+	case CHARSET_NO_REENCODE:
+		mi.metainfo_charset = NULL;
+		break;
+	case CHARSET_EXPLICIT:
+		break;
+	default:
+		BUG("invalid meta_charset.policy");
+	}
 
 	mi.input = stdin;
 	mi.output = stdout;
 
-	msgfile = prefix_filename(prefix, argv[1]);
-	patchfile = prefix_filename(prefix, argv[2]);
+	msgfile = prefix_filename(prefix, argv[0]);
+	patchfile = prefix_filename(prefix, argv[1]);
 
 	status = !!mailinfo(&mi, msgfile, patchfile);
 	clear_mailinfo(&mi);
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-base.c b/builtin/merge-base.c
index e3f8da13b6..6719ac198d 100644
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -114,26 +114,16 @@ static int handle_is_ancestor(int argc, const char **argv)
 static int handle_fork_point(int argc, const char **argv)
 {
 	struct object_id oid;
-	char *refname;
 	struct commit *derived, *fork_point;
 	const char *commitname;
 
-	switch (dwim_ref(argv[0], strlen(argv[0]), &oid, &refname)) {
-	case 0:
-		die("No such ref: '%s'", argv[0]);
-	case 1:
-		break; /* good */
-	default:
-		die("Ambiguous refname: '%s'", argv[0]);
-	}
-
 	commitname = (argc == 2) ? argv[1] : "HEAD";
 	if (get_oid(commitname, &oid))
 		die("Not a valid object name: '%s'", commitname);
 
 	derived = lookup_commit_reference(the_repository, &oid);
 
-	fork_point = get_fork_point(refname, derived);
+	fork_point = get_fork_point(argv[0], derived);
 
 	if (!fork_point)
 		return 1;
diff --git a/builtin/merge-index.c b/builtin/merge-index.c
index 38ea6ad6ca..c0383fe9df 100644
--- a/builtin/merge-index.c
+++ b/builtin/merge-index.c
@@ -58,6 +58,8 @@ static void merge_one_path(const char *path)
 static void merge_all(void)
 {
 	int i;
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(&the_index);
 	for (i = 0; i < active_nr; i++) {
 		const struct cache_entry *ce = active_cache[i];
 		if (!ce_stage(ce))
@@ -80,6 +82,9 @@ int cmd_merge_index(int argc, const char **argv, const char *prefix)
 
 	read_cache();
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(&the_index);
+
 	i = 1;
 	if (!strcmp(argv[i], "-o")) {
 		one_shot = 1;
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
index 4594507420..3583cff71c 100644
--- a/builtin/merge-ours.c
+++ b/builtin/merge-ours.c
@@ -28,6 +28,6 @@ int cmd_merge_ours(int argc, const char **argv, const char *prefix)
 	if (read_cache() < 0)
 		die_errno("read_cache failed");
 	if (index_differs_from(the_repository, "HEAD", NULL, 0))
-		exit(2);
-	exit(0);
+		return 2;
+	return 0;
 }
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index e72714a5a8..5dc94d6f88 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -107,14 +107,12 @@ static void show_diff(struct merge_list *entry)
 	mmfile_t src, dst;
 	xpparam_t xpp;
 	xdemitconf_t xecfg;
-	xdemitcb_t ecb;
+	xdemitcb_t ecb = { .out_line = show_outf };
 
+	memset(&xpp, 0, sizeof(xpp));
 	xpp.flags = 0;
 	memset(&xecfg, 0, sizeof(xecfg));
 	xecfg.ctxlen = 3;
-	ecb.out_hunk = NULL;
-	ecb.out_line = show_outf;
-	ecb.priv = NULL;
 
 	src.ptr = origin(entry, &size);
 	if (!src.ptr)
diff --git a/builtin/merge.c b/builtin/merge.c
index 062e911441..42a1989d4a 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -14,6 +14,7 @@
 #include "lockfile.h"
 #include "run-command.h"
 #include "diff.h"
+#include "diff-merges.h"
 #include "refs.h"
 #include "refspec.h"
 #include "commit.h"
@@ -28,6 +29,7 @@
 #include "rerere.h"
 #include "help.h"
 #include "merge-recursive.h"
+#include "merge-ort-wrappers.h"
 #include "resolve-undo.h"
 #include "remote.h"
 #include "fmt-merge-msg.h"
@@ -40,6 +42,7 @@
 #include "branch.h"
 #include "commit-reach.h"
 #include "wt-status.h"
+#include "commit-graph.h"
 
 #define DEFAULT_TWOHEAD (1<<0)
 #define DEFAULT_OCTOPUS (1<<1)
@@ -53,8 +56,8 @@ struct strategy {
 
 static const char * const builtin_merge_usage[] = {
 	N_("git merge [<options>] [<commit>...]"),
-	N_("git merge --abort"),
-	N_("git merge --continue"),
+	"git merge --abort",
+	"git merge --continue",
 	NULL
 };
 
@@ -62,6 +65,7 @@ static int show_diffstat = 1, shortlog_len = -1, squash;
 static int option_commit = -1;
 static int option_edit = -1;
 static int allow_trivial = 1, have_message, verify_signatures;
+static int check_trust_level = 1;
 static int overwrite_ignore = 1;
 static struct strbuf merge_msg = STRBUF_INIT;
 static struct strategy **use_strategies;
@@ -70,7 +74,6 @@ static const char **xopts;
 static size_t xopts_nr, xopts_alloc;
 static const char *branch;
 static char *branch_mergeoptions;
-static int option_renormalize;
 static int verbosity;
 static int allow_rerere_auto;
 static int abort_current_merge;
@@ -81,11 +84,13 @@ static int show_progress = -1;
 static int default_to_upstream = 1;
 static int signoff;
 static const char *sign_commit;
+static int autostash;
 static int no_verify;
 
 static struct strategy all_strategy[] = {
-	{ "recursive",  DEFAULT_TWOHEAD | NO_TRIVIAL },
+	{ "recursive",  NO_TRIVIAL },
 	{ "octopus",    DEFAULT_OCTOPUS },
+	{ "ort",        DEFAULT_TWOHEAD | NO_TRIVIAL },
 	{ "resolve",    0 },
 	{ "ours",       NO_FAST_FORWARD | NO_TRIVIAL },
 	{ "subtree",    NO_FAST_FORWARD | NO_TRIVIAL },
@@ -157,10 +162,17 @@ static struct strategy *get_strategy(const char *name)
 	struct strategy *ret;
 	static struct cmdnames main_cmds, other_cmds;
 	static int loaded;
+	char *default_strategy = getenv("GIT_TEST_MERGE_ALGORITHM");
 
 	if (!name)
 		return NULL;
 
+	if (default_strategy &&
+	    !strcmp(default_strategy, "ort") &&
+	    !strcmp(name, "recursive")) {
+		name = "ort";
+	}
+
 	for (i = 0; i < ARRAY_SIZE(all_strategy); i++)
 		if (!strcmp(name, all_strategy[i].name))
 			return &all_strategy[i];
@@ -198,7 +210,7 @@ static struct strategy *get_strategy(const char *name)
 		exit(1);
 	}
 
-	ret = xcalloc(1, sizeof(struct strategy));
+	CALLOC_ARRAY(ret, 1);
 	ret->name = xstrdup(name);
 	ret->attr = NO_TRIVIAL;
 	return ret;
@@ -240,9 +252,9 @@ static int option_parse_n(const struct option *opt,
 }
 
 static struct option builtin_merge_options[] = {
-	{ OPTION_CALLBACK, 'n', NULL, NULL, NULL,
+	OPT_CALLBACK_F('n', NULL, NULL, NULL,
 		N_("do not show a diffstat at the end of the merge"),
-		PARSE_OPT_NOARG, option_parse_n },
+		PARSE_OPT_NOARG, option_parse_n),
 	OPT_BOOL(0, "stat", &show_diffstat,
 		N_("show a diffstat at the end of the merge")),
 	OPT_BOOL(0, "summary", &show_diffstat, N_("(synonym to --stat)")),
@@ -285,8 +297,9 @@ static struct option builtin_merge_options[] = {
 	OPT_SET_INT(0, "progress", &show_progress, N_("force progress reporting"), 1),
 	{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
 	  N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
+	OPT_AUTOSTASH(&autostash),
 	OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
-	OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
+	OPT_BOOL(0, "signoff", &signoff, N_("add a Signed-off-by trailer")),
 	OPT_BOOL(0, "no-verify", &no_verify, N_("bypass pre-merge-commit and commit-msg hooks")),
 	OPT_END()
 };
@@ -380,10 +393,14 @@ static void restore_state(const struct object_id *head,
 }
 
 /* This is called when no merge was necessary. */
-static void finish_up_to_date(const char *msg)
+static void finish_up_to_date(void)
 {
-	if (verbosity >= 0)
-		printf("%s%s\n", squash ? _(" (nothing to squash)") : "", msg);
+	if (verbosity >= 0) {
+		if (squash)
+			puts(_("Already up to date. (nothing to squash)"));
+		else
+			puts(_("Already up to date."));
+	}
 	remove_merge_branch_state(the_repository);
 }
 
@@ -397,7 +414,7 @@ static void squash_message(struct commit *commit, struct commit_list *remotehead
 	printf(_("Squash commit -- not updating HEAD\n"));
 
 	repo_init_revisions(the_repository, &rev, NULL);
-	rev.ignore_merges = 1;
+	diff_merges_suppress(&rev);
 	rev.commit_format = CMIT_FMT_MEDIUM;
 
 	commit->object.flags |= UNINTERESTING;
@@ -446,7 +463,6 @@ static void finish(struct commit *head_commit,
 		if (verbosity >= 0 && !merge_msg.len)
 			printf(_("No merge message -- not updating HEAD\n"));
 		else {
-			const char *argv_gc_auto[] = { "gc", "--auto", NULL };
 			update_ref(reflog_message.buf, "HEAD", new_head, head,
 				   0, UPDATE_REFS_DIE_ON_ERR);
 			/*
@@ -454,7 +470,7 @@ static void finish(struct commit *head_commit,
 			 * user should see them.
 			 */
 			close_object_store(the_repository->objects);
-			run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
+			run_auto_maintenance(verbosity < 0);
 		}
 	}
 	if (new_head && show_diffstat) {
@@ -474,6 +490,7 @@ static void finish(struct commit *head_commit,
 	/* Run a post-merge hook */
 	run_hook_le(NULL, "post-merge", squash ? "1" : "0", NULL);
 
+	apply_autostash(git_path_merge_autostash(the_repository));
 	strbuf_release(&reflog_message);
 }
 
@@ -486,7 +503,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);
@@ -497,7 +514,7 @@ static void merge_name(const char *remote, struct strbuf *msg)
 	if (!remote_head)
 		die(_("'%s' does not point to a commit"), remote);
 
-	if (dwim_ref(remote, strlen(remote), &branch_head, &found_ref) > 0) {
+	if (dwim_ref(remote, strlen(remote), &branch_head, &found_ref, 0) > 0) {
 		if (starts_with(found_ref, "refs/heads/")) {
 			strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
 				    oid_to_hex(&branch_head), remote);
@@ -569,6 +586,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);
 }
@@ -596,10 +614,12 @@ static void parse_branch_merge_options(char *bmo)
 static int git_merge_config(const char *k, const char *v, void *cb)
 {
 	int status;
+	const char *str;
 
-	if (branch && starts_with(k, "branch.") &&
-		starts_with(k + 7, branch) &&
-		!strcmp(k + 7 + strlen(branch), ".mergeoptions")) {
+	if (branch &&
+	    skip_prefix(k, "branch.", &str) &&
+	    skip_prefix(str, branch, &str) &&
+	    !strcmp(str, ".mergeoptions")) {
 		free(branch_mergeoptions);
 		branch_mergeoptions = xstrdup(v);
 		return 0;
@@ -615,8 +635,6 @@ static int git_merge_config(const char *k, const char *v, void *cb)
 		return git_config_string(&pull_octopus, k, v);
 	else if (!strcmp(k, "commit.cleanup"))
 		return git_config_string(&cleanup_arg, k, v);
-	else if (!strcmp(k, "merge.renormalize"))
-		option_renormalize = git_config_bool(k, v);
 	else if (!strcmp(k, "merge.ff")) {
 		int boolval = git_parse_maybe_bool(v);
 		if (0 <= boolval) {
@@ -631,6 +649,11 @@ static int git_merge_config(const char *k, const char *v, void *cb)
 	} else if (!strcmp(k, "commit.gpgsign")) {
 		sign_commit = git_config_bool(k, v) ? "" : NULL;
 		return 0;
+	} else if (!strcmp(k, "gpg.mintrustlevel")) {
+		check_trust_level = 0;
+	} else if (!strcmp(k, "merge.autostash")) {
+		autostash = git_config_bool(k, v);
+		return 0;
 	}
 
 	status = fmt_merge_msg_config(k, v, cb);
@@ -693,7 +716,8 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
 	if (refresh_and_write_cache(REFRESH_QUIET, SKIP_IF_UNCHANGED, 0) < 0)
 		return error(_("Unable to write index."));
 
-	if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree")) {
+	if (!strcmp(strategy, "recursive") || !strcmp(strategy, "subtree") ||
+	    !strcmp(strategy, "ort")) {
 		struct lock_file lock = LOCK_INIT;
 		int clean, x;
 		struct commit *result;
@@ -710,13 +734,12 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
 		if (!strcmp(strategy, "subtree"))
 			o.subtree_shift = "";
 
-		o.renormalize = option_renormalize;
 		o.show_rename_progress =
 			show_progress == -1 ? isatty(2) : show_progress;
 
 		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;
@@ -725,8 +748,12 @@ static int try_merge_strategy(const char *strategy, struct commit_list *common,
 			commit_list_insert(j->item, &reversed);
 
 		hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
-		clean = merge_recursive(&o, head,
-				remoteheads->item, reversed, &result);
+		if (!strcmp(strategy, "ort"))
+			clean = merge_ort_recursive(&o, head, remoteheads->item,
+						    reversed, &result);
+		else
+			clean = merge_recursive(&o, head, remoteheads->item,
+						reversed, &result);
 		if (clean < 0)
 			exit(128);
 		if (write_locked_index(&the_index, &lock,
@@ -835,9 +862,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);
@@ -1109,9 +1138,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);
@@ -1257,6 +1284,12 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	if (branch)
 		skip_prefix(branch, "refs/heads/", &branch);
 
+	if (!pull_twohead) {
+		char *default_strategy = getenv("GIT_TEST_MERGE_ALGORITHM");
+		if (default_strategy && !strcmp(default_strategy, "ort"))
+			pull_twohead = "ort";
+	}
+
 	init_diff_ui_defaults();
 	git_config(git_merge_config, NULL);
 
@@ -1278,6 +1311,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	if (abort_current_merge) {
 		int nargc = 2;
 		const char *nargv[] = {"reset", "--merge", NULL};
+		struct strbuf stash_oid = STRBUF_INIT;
 
 		if (orig_argc != 2)
 			usage_msg_opt(_("--abort expects no arguments"),
@@ -1286,8 +1320,17 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		if (!file_exists(git_path_merge_head(the_repository)))
 			die(_("There is no merge to abort (MERGE_HEAD missing)."));
 
+		if (read_oneliner(&stash_oid, git_path_merge_autostash(the_repository),
+		    READ_ONELINER_SKIP_IF_EMPTY))
+			unlink(git_path_merge_autostash(the_repository));
+
 		/* Invoke 'git reset --merge' */
 		ret = cmd_reset(nargc, nargv, prefix);
+
+		if (stash_oid.len)
+			apply_autostash_oid(stash_oid.buf);
+
+		strbuf_release(&stash_oid);
 		goto done;
 	}
 
@@ -1331,7 +1374,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		else
 			die(_("You have not concluded your merge (MERGE_HEAD exists)."));
 	}
-	if (file_exists(git_path_cherry_pick_head(the_repository))) {
+	if (ref_exists("CHERRY_PICK_HEAD")) {
 		if (advice_resolve_conflict)
 			die(_("You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 			    "Please, commit your changes before you merge."));
@@ -1397,7 +1440,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 			die(_("Can merge only exactly one commit into empty head"));
 
 		if (verify_signatures)
-			verify_merge_signature(remoteheads->item, verbosity);
+			verify_merge_signature(remoteheads->item, verbosity,
+					       check_trust_level);
 
 		remote_head_oid = &remoteheads->item->object.oid;
 		read_empty(remote_head_oid, 0);
@@ -1420,7 +1464,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 
 	if (verify_signatures) {
 		for (p = remoteheads; p; p = p->next) {
-			verify_merge_signature(p->item, verbosity);
+			verify_merge_signature(p->item, verbosity,
+					       check_trust_level);
 		}
 	}
 
@@ -1440,6 +1485,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 */
@@ -1482,7 +1533,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 		 * If head can reach all the merge then we are up to date.
 		 * but first the most common case of merging one remote.
 		 */
-		finish_up_to_date(_("Already up to date."));
+		finish_up_to_date();
 		goto done;
 	} else if (fast_forward != FF_NO && !remoteheads->next &&
 			!common->next &&
@@ -1508,10 +1559,15 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 			goto done;
 		}
 
+		if (autostash)
+			create_autostash(the_repository,
+					 git_path_merge_autostash(the_repository),
+					 "merge");
 		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;
 		}
@@ -1566,13 +1622,18 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 			}
 		}
 		if (up_to_date) {
-			finish_up_to_date(_("Already up to date. Yeeah!"));
+			finish_up_to_date();
 			goto done;
 		}
 	}
 
 	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");
 
 	/* We are going to make a new commit. */
 	git_committer_info(IDENT_STRICT);
@@ -1624,7 +1685,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 				}
 				merge_was_ok = 1;
 			}
-			cnt = evaluate_result();
+			cnt = (use_strategies_nr > 1) ? evaluate_result() : 0;
 			if (best_cnt <= 0 || cnt <= best_cnt) {
 				best_strategy = use_strategies[i]->name;
 				best_cnt = cnt;
@@ -1655,6 +1716,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)
@@ -1662,15 +1724,17 @@ 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);
 	}
 
-	if (squash)
+	if (squash) {
 		finish(head_commit, remoteheads, NULL, NULL);
-	else
+
+		git_test_write_commit_graph_or_die();
+	} else
 		write_merge_state(remoteheads);
 
 	if (merge_was_ok)
diff --git a/builtin/mktag.c b/builtin/mktag.c
index 6fb7dc8578..dddcccdd36 100644
--- a/builtin/mktag.c
+++ b/builtin/mktag.c
@@ -1,176 +1,108 @@
 #include "builtin.h"
+#include "parse-options.h"
 #include "tag.h"
 #include "replace-object.h"
 #include "object-store.h"
-
-/*
- * A signature file has a very simple fixed format: four lines
- * of "object <sha1>" + "type <typename>" + "tag <tagname>" +
- * "tagger <committer>", followed by a blank line, a free-form tag
- * message and a signature block that git itself doesn't care about,
- * but that can be verified with gpg or similar.
- *
- * The first four lines are guaranteed to be at least 83 bytes:
- * "object <sha1>\n" is 48 bytes, "type tag\n" at 9 bytes is the
- * shortest possible type-line, "tag .\n" at 6 bytes is the shortest
- * single-character-tag line, and "tagger . <> 0 +0000\n" at 20 bytes is
- * the shortest possible tagger-line.
- */
-
-/*
- * We refuse to tag something we can't verify. Just because.
- */
-static int verify_object(const struct object_id *oid, const char *expected_type)
+#include "fsck.h"
+#include "config.h"
+
+static char const * const builtin_mktag_usage[] = {
+	N_("git mktag"),
+	NULL
+};
+static int option_strict = 1;
+
+static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
+
+static int mktag_fsck_error_func(struct fsck_options *o,
+				 const struct object_id *oid,
+				 enum object_type object_type,
+				 enum fsck_msg_type msg_type,
+				 enum fsck_msg_id msg_id,
+				 const char *message)
 {
-	int ret = -1;
-	enum object_type type;
-	unsigned long size;
-	void *buffer = read_object_file(oid, &type, &size);
-	const struct object_id *repl = lookup_replace_object(the_repository, oid);
-
-	if (buffer) {
-		if (type == type_from_string(expected_type))
-			ret = check_object_signature(repl, buffer, size, expected_type);
-		free(buffer);
+	switch (msg_type) {
+	case FSCK_WARN:
+		if (!option_strict) {
+			fprintf_ln(stderr, _("warning: tag input does not pass fsck: %s"), message);
+			return 0;
+
+		}
+		/* fallthrough */
+	case FSCK_ERROR:
+		/*
+		 * We treat both warnings and errors as errors, things
+		 * like missing "tagger" lines are "only" warnings
+		 * under fsck, we've always considered them an error.
+		 */
+		fprintf_ln(stderr, _("error: tag input does not pass fsck: %s"), message);
+		return 1;
+	default:
+		BUG(_("%d (FSCK_IGNORE?) should never trigger this callback"),
+		    msg_type);
 	}
-	return ret;
 }
 
-static int verify_tag(char *buffer, unsigned long size)
+static int verify_object_in_tag(struct object_id *tagged_oid, int *tagged_type)
 {
-	int typelen;
-	char type[20];
-	struct object_id oid;
-	const char *object, *type_line, *tag_line, *tagger_line, *lb, *rb, *p;
-	size_t len;
-
-	if (size < 84)
-		return error("wanna fool me ? you obviously got the size wrong !");
-
-	buffer[size] = 0;
-
-	/* Verify object line */
-	object = buffer;
-	if (memcmp(object, "object ", 7))
-		return error("char%d: does not start with \"object \"", 0);
-
-	if (parse_oid_hex(object + 7, &oid, &p))
-		return error("char%d: could not get SHA1 hash", 7);
-
-	/* Verify type line */
-	type_line = p + 1;
-	if (memcmp(type_line - 1, "\ntype ", 6))
-		return error("char%d: could not find \"\\ntype \"", 47);
-
-	/* Verify tag-line */
-	tag_line = strchr(type_line, '\n');
-	if (!tag_line)
-		return error("char%"PRIuMAX": could not find next \"\\n\"",
-				(uintmax_t) (type_line - buffer));
-	tag_line++;
-	if (memcmp(tag_line, "tag ", 4) || tag_line[4] == '\n')
-		return error("char%"PRIuMAX": no \"tag \" found",
-				(uintmax_t) (tag_line - buffer));
-
-	/* Get the actual type */
-	typelen = tag_line - type_line - strlen("type \n");
-	if (typelen >= sizeof(type))
-		return error("char%"PRIuMAX": type too long",
-				(uintmax_t) (type_line+5 - buffer));
-
-	memcpy(type, type_line+5, typelen);
-	type[typelen] = 0;
-
-	/* Verify that the object matches */
-	if (verify_object(&oid, type))
-		return error("char%d: could not verify object %s", 7, oid_to_hex(&oid));
-
-	/* Verify the tag-name: we don't allow control characters or spaces in it */
-	tag_line += 4;
-	for (;;) {
-		unsigned char c = *tag_line++;
-		if (c == '\n')
-			break;
-		if (c > ' ')
-			continue;
-		return error("char%"PRIuMAX": could not verify tag name",
-				(uintmax_t) (tag_line - buffer));
-	}
-
-	/* Verify the tagger line */
-	tagger_line = tag_line;
-
-	if (memcmp(tagger_line, "tagger ", 7))
-		return error("char%"PRIuMAX": could not find \"tagger \"",
-			(uintmax_t) (tagger_line - buffer));
-
-	/*
-	 * Check for correct form for name and email
-	 * i.e. " <" followed by "> " on _this_ line
-	 * No angle brackets within the name or email address fields.
-	 * No spaces within the email address field.
-	 */
-	tagger_line += 7;
-	if (!(lb = strstr(tagger_line, " <")) || !(rb = strstr(lb+2, "> ")) ||
-		strpbrk(tagger_line, "<>\n") != lb+1 ||
-		strpbrk(lb+2, "><\n ") != rb)
-		return error("char%"PRIuMAX": malformed tagger field",
-			(uintmax_t) (tagger_line - buffer));
-
-	/* Check for author name, at least one character, space is acceptable */
-	if (lb == tagger_line)
-		return error("char%"PRIuMAX": missing tagger name",
-			(uintmax_t) (tagger_line - buffer));
-
-	/* timestamp, 1 or more digits followed by space */
-	tagger_line = rb + 2;
-	if (!(len = strspn(tagger_line, "0123456789")))
-		return error("char%"PRIuMAX": missing tag timestamp",
-			(uintmax_t) (tagger_line - buffer));
-	tagger_line += len;
-	if (*tagger_line != ' ')
-		return error("char%"PRIuMAX": malformed tag timestamp",
-			(uintmax_t) (tagger_line - buffer));
-	tagger_line++;
-
-	/* timezone, 5 digits [+-]hhmm, max. 1400 */
-	if (!((tagger_line[0] == '+' || tagger_line[0] == '-') &&
-	      strspn(tagger_line+1, "0123456789") == 4 &&
-	      tagger_line[5] == '\n' && atoi(tagger_line+1) <= 1400))
-		return error("char%"PRIuMAX": malformed tag timezone",
-			(uintmax_t) (tagger_line - buffer));
-	tagger_line += 6;
-
-	/* Verify the blank line separating the header from the body */
-	if (*tagger_line != '\n')
-		return error("char%"PRIuMAX": trailing garbage in tag header",
-			(uintmax_t) (tagger_line - buffer));
+	int ret;
+	enum object_type type;
+	unsigned long size;
+	void *buffer;
+	const struct object_id *repl;
+
+	buffer = read_object_file(tagged_oid, &type, &size);
+	if (!buffer)
+		die(_("could not read tagged object '%s'"),
+		    oid_to_hex(tagged_oid));
+	if (type != *tagged_type)
+		die(_("object '%s' tagged as '%s', but is a '%s' type"),
+		    oid_to_hex(tagged_oid),
+		    type_name(*tagged_type), type_name(type));
+
+	repl = lookup_replace_object(the_repository, tagged_oid);
+	ret = check_object_signature(the_repository, repl,
+				     buffer, size, type_name(*tagged_type));
+	free(buffer);
 
-	/* The actual stuff afterwards we don't care about.. */
-	return 0;
+	return ret;
 }
 
 int cmd_mktag(int argc, const char **argv, const char *prefix)
 {
+	static struct option builtin_mktag_options[] = {
+		OPT_BOOL(0, "strict", &option_strict,
+			 N_("enable more strict checking")),
+		OPT_END(),
+	};
 	struct strbuf buf = STRBUF_INIT;
+	struct object_id tagged_oid;
+	int tagged_type;
 	struct object_id result;
 
-	if (argc != 1)
-		usage("git mktag");
+	argc = parse_options(argc, argv, NULL,
+			     builtin_mktag_options,
+			     builtin_mktag_usage, 0);
 
-	if (strbuf_read(&buf, 0, 4096) < 0) {
-		die_errno("could not read from stdin");
-	}
+	if (strbuf_read(&buf, 0, 0) < 0)
+		die_errno(_("could not read from stdin"));
+
+	fsck_options.error_func = mktag_fsck_error_func;
+	fsck_set_msg_type_from_ids(&fsck_options, FSCK_MSG_EXTRA_HEADER_ENTRY,
+				   FSCK_WARN);
+	/* config might set fsck.extraHeaderEntry=* again */
+	git_config(git_fsck_config, &fsck_options);
+	if (fsck_tag_standalone(NULL, buf.buf, buf.len, &fsck_options,
+				&tagged_oid, &tagged_type))
+		die(_("tag on stdin did not pass our strict fsck check"));
 
-	/* Verify it for some basic sanity: it needs to start with
-	   "object <sha1>\ntype\ntagger " */
-	if (verify_tag(buf.buf, buf.len) < 0)
-		die("invalid tag signature file");
+	if (verify_object_in_tag(&tagged_oid, &tagged_type))
+		die(_("tag on stdin did not refer to a valid object"));
 
 	if (write_object_file(buf.buf, buf.len, tag_type, &result) < 0)
-		die("unable to write tag file");
+		die(_("unable to write tag file"));
 
 	strbuf_release(&buf);
-	printf("%s\n", oid_to_hex(&result));
+	puts(oid_to_hex(&result));
 	return 0;
 }
diff --git a/builtin/mktree.c b/builtin/mktree.c
index 891991b00d..ae78ca1c02 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -189,5 +189,5 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
 		used=0; /* reset tree entry buffer for re-use in batch mode */
 	}
 	strbuf_release(&sb);
-	exit(0);
+	return 0;
 }
diff --git a/builtin/multi-pack-index.c b/builtin/multi-pack-index.c
index b1ea1a6aa1..8ff0dee2ec 100644
--- a/builtin/multi-pack-index.c
+++ b/builtin/multi-pack-index.c
@@ -4,59 +4,181 @@
 #include "parse-options.h"
 #include "midx.h"
 #include "trace2.h"
+#include "object-store.h"
 
+#define BUILTIN_MIDX_WRITE_USAGE \
+	N_("git multi-pack-index [<options>] write [--preferred-pack=<pack>]")
+
+#define BUILTIN_MIDX_VERIFY_USAGE \
+	N_("git multi-pack-index [<options>] verify")
+
+#define BUILTIN_MIDX_EXPIRE_USAGE \
+	N_("git multi-pack-index [<options>] expire")
+
+#define BUILTIN_MIDX_REPACK_USAGE \
+	N_("git multi-pack-index [<options>] repack [--batch-size=<size>]")
+
+static char const * const builtin_multi_pack_index_write_usage[] = {
+	BUILTIN_MIDX_WRITE_USAGE,
+	NULL
+};
+static char const * const builtin_multi_pack_index_verify_usage[] = {
+	BUILTIN_MIDX_VERIFY_USAGE,
+	NULL
+};
+static char const * const builtin_multi_pack_index_expire_usage[] = {
+	BUILTIN_MIDX_EXPIRE_USAGE,
+	NULL
+};
+static char const * const builtin_multi_pack_index_repack_usage[] = {
+	BUILTIN_MIDX_REPACK_USAGE,
+	NULL
+};
 static char const * const builtin_multi_pack_index_usage[] = {
-	N_("git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --batch-size=<size>)"),
+	BUILTIN_MIDX_WRITE_USAGE,
+	BUILTIN_MIDX_VERIFY_USAGE,
+	BUILTIN_MIDX_EXPIRE_USAGE,
+	BUILTIN_MIDX_REPACK_USAGE,
 	NULL
 };
 
 static struct opts_multi_pack_index {
 	const char *object_dir;
+	const char *preferred_pack;
 	unsigned long batch_size;
+	unsigned flags;
 } opts;
 
-int cmd_multi_pack_index(int argc, const char **argv,
-			 const char *prefix)
+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(),
+};
+
+static struct option *add_common_options(struct option *prev)
+{
+	return parse_options_concat(common_opts, prev);
+}
+
+static int cmd_multi_pack_index_write(int argc, const char **argv)
+{
+	struct option *options;
+	static struct option builtin_multi_pack_index_write_options[] = {
+		OPT_STRING(0, "preferred-pack", &opts.preferred_pack,
+			   N_("preferred-pack"),
+			   N_("pack for reuse when computing a multi-pack bitmap")),
+		OPT_END(),
+	};
+
+	options = add_common_options(builtin_multi_pack_index_write_options);
+
+	trace2_cmd_mode(argv[0]);
+
+	argc = parse_options(argc, argv, NULL,
+			     options, builtin_multi_pack_index_write_usage,
+			     PARSE_OPT_KEEP_UNKNOWN);
+	if (argc)
+		usage_with_options(builtin_multi_pack_index_write_usage,
+				   options);
+
+	FREE_AND_NULL(options);
+
+	return write_midx_file(opts.object_dir, opts.preferred_pack,
+			       opts.flags);
+}
+
+static int cmd_multi_pack_index_verify(int argc, const char **argv)
+{
+	struct option *options = common_opts;
+
+	trace2_cmd_mode(argv[0]);
+
+	argc = parse_options(argc, argv, NULL,
+			     options, builtin_multi_pack_index_verify_usage,
+			     PARSE_OPT_KEEP_UNKNOWN);
+	if (argc)
+		usage_with_options(builtin_multi_pack_index_verify_usage,
+				   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;
+
+	trace2_cmd_mode(argv[0]);
+
+	argc = parse_options(argc, argv, NULL,
+			     options, builtin_multi_pack_index_expire_usage,
+			     PARSE_OPT_KEEP_UNKNOWN);
+	if (argc)
+		usage_with_options(builtin_multi_pack_index_expire_usage,
+				   options);
+
+	return expire_midx_packs(the_repository, opts.object_dir, opts.flags);
+}
+
+static int cmd_multi_pack_index_repack(int argc, const char **argv)
 {
-	static struct option builtin_multi_pack_index_options[] = {
-		OPT_FILENAME(0, "object-dir", &opts.object_dir,
-		  N_("object directory containing set of packfile and pack-index pairs")),
+	struct option *options;
+	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_END(),
 	};
 
+	options = add_common_options(builtin_multi_pack_index_repack_options);
+
+	trace2_cmd_mode(argv[0]);
+
+	argc = parse_options(argc, argv, NULL,
+			     options,
+			     builtin_multi_pack_index_repack_usage,
+			     PARSE_OPT_KEEP_UNKNOWN);
+	if (argc)
+		usage_with_options(builtin_multi_pack_index_repack_usage,
+				   options);
+
+	FREE_AND_NULL(options);
+
+	return midx_repack(the_repository, opts.object_dir,
+			   (size_t)opts.batch_size, opts.flags);
+}
+
+int cmd_multi_pack_index(int argc, const char **argv,
+			 const char *prefix)
+{
+	struct option *builtin_multi_pack_index_options = common_opts;
+
 	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, 0);
+			     builtin_multi_pack_index_usage,
+			     PARSE_OPT_STOP_AT_NON_OPTION);
 
 	if (!opts.object_dir)
 		opts.object_dir = get_object_directory();
 
 	if (argc == 0)
+		goto usage;
+
+	if (!strcmp(argv[0], "repack"))
+		return cmd_multi_pack_index_repack(argc, argv);
+	else if (!strcmp(argv[0], "write"))
+		return cmd_multi_pack_index_write(argc, argv);
+	else if (!strcmp(argv[0], "verify"))
+		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:
 		usage_with_options(builtin_multi_pack_index_usage,
 				   builtin_multi_pack_index_options);
-
-	if (argc > 1) {
-		die(_("too many arguments"));
-		return 1;
 	}
-
-	trace2_cmd_mode(argv[0]);
-
-	if (!strcmp(argv[0], "repack"))
-		return midx_repack(the_repository, opts.object_dir, (size_t)opts.batch_size);
-	if (opts.batch_size)
-		die(_("--batch-size option is only for 'repack' subcommand"));
-
-	if (!strcmp(argv[0], "write"))
-		return write_midx_file(opts.object_dir);
-	if (!strcmp(argv[0], "verify"))
-		return verify_midx_file(the_repository, opts.object_dir);
-	if (!strcmp(argv[0], "expire"))
-		return expire_midx_packs(the_repository, opts.object_dir);
-
-	die(_("unrecognized subcommand: %s"), argv[0]);
 }
diff --git a/builtin/mv.c b/builtin/mv.c
index be15ba7044..c2f96c8e89 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -132,6 +132,7 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 	struct stat st;
 	struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
 	struct lock_file lock_file = LOCK_INIT;
+	struct cache_entry *ce;
 
 	git_config(git_default_config, NULL);
 
@@ -220,9 +221,11 @@ int cmd_mv(int argc, const char **argv, const char *prefix)
 				}
 				argc += last - first;
 			}
-		} else if (cache_name_pos(src, length) < 0)
+		} else if (!(ce = cache_file_exists(src, length, 0))) {
 			bad = _("not under version control");
-		else if (lstat(dst, &st) == 0 &&
+		} else if (ce_stage(ce)) {
+			bad = _("conflicted");
+		} else if (lstat(dst, &st) == 0 &&
 			 (!ignore_case || strcasecmp(src, dst))) {
 			bad = _("destination exists");
 			if (force) {
@@ -300,5 +303,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 b0f0776947..b221d30014 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -6,7 +6,8 @@
 #include "tag.h"
 #include "refs.h"
 #include "parse-options.h"
-#include "sha1-lookup.h"
+#include "prio-queue.h"
+#include "hash-lookup.h"
 #include "commit-slab.h"
 
 /*
@@ -15,15 +16,15 @@
  */
 #define CUTOFF_DATE_SLOP 86400
 
-typedef struct rev_name {
-	const char *tip_name;
+struct rev_name {
+	char *tip_name;
 	timestamp_t taggerdate;
 	int generation;
 	int distance;
 	int from_tag;
-} rev_name;
+};
 
-define_commit_slab(commit_rev_name, struct rev_name *);
+define_commit_slab(commit_rev_name, struct rev_name);
 
 static timestamp_t cutoff = TIME_MAX;
 static struct commit_rev_name rev_names;
@@ -31,16 +32,16 @@ static struct commit_rev_name rev_names;
 /* How many generations are maximally preferred over _one_ merge traversal? */
 #define MERGE_TRAVERSAL_WEIGHT 65535
 
-static struct rev_name *get_commit_rev_name(struct commit *commit)
+static int is_valid_rev_name(const struct rev_name *name)
 {
-	struct rev_name **slot = commit_rev_name_peek(&rev_names, commit);
-
-	return slot ? *slot : NULL;
+	return name && (name->generation || name->tip_name);
 }
 
-static void set_commit_rev_name(struct commit *commit, struct rev_name *name)
+static struct rev_name *get_commit_rev_name(const struct commit *commit)
 {
-	*commit_rev_name_at(&rev_names, commit) = name;
+	struct rev_name *name = commit_rev_name_peek(&rev_names, commit);
+
+	return is_valid_rev_name(name) ? name : NULL;
 }
 
 static int is_better_name(struct rev_name *name,
@@ -79,68 +80,135 @@ static int is_better_name(struct rev_name *name,
 	return 0;
 }
 
-static void name_rev(struct commit *commit,
-		const char *tip_name, timestamp_t taggerdate,
-		int generation, int distance, int from_tag,
-		int deref)
+static struct rev_name *create_or_update_name(struct commit *commit,
+					      timestamp_t taggerdate,
+					      int generation, int distance,
+					      int from_tag)
 {
-	struct rev_name *name = get_commit_rev_name(commit);
-	struct commit_list *parents;
-	int parent_number = 1;
-	char *to_free = NULL;
-
-	parse_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))
+			return NULL;
+
+		/*
+		 * This string might still be shared with ancestors
+		 * (generation > 0).  We can release it here regardless,
+		 * because the new name that has just won will be better
+		 * for them as well, so name_rev() will replace these
+		 * stale pointers when it processes the parents.
+		 */
+		if (!name->generation)
+			free(name->tip_name);
+	}
 
-	if (commit->date < cutoff)
-		return;
+	name->taggerdate = taggerdate;
+	name->generation = generation;
+	name->distance = distance;
+	name->from_tag = from_tag;
 
-	if (deref) {
-		tip_name = to_free = xstrfmt("%s^0", tip_name);
+	return name;
+}
 
-		if (generation)
-			die("generation: %d, but deref?", generation);
+static char *get_parent_name(const struct rev_name *name, int parent_number)
+{
+	struct strbuf sb = STRBUF_INIT;
+	size_t len;
+
+	strip_suffix(name->tip_name, "^0", &len);
+	if (name->generation > 0) {
+		strbuf_grow(&sb, len +
+			    1 + decimal_width(name->generation) +
+			    1 + decimal_width(parent_number));
+		strbuf_addf(&sb, "%.*s~%d^%d", (int)len, name->tip_name,
+			    name->generation, parent_number);
+	} else {
+		strbuf_grow(&sb, len +
+			    1 + decimal_width(parent_number));
+		strbuf_addf(&sb, "%.*s^%d", (int)len, name->tip_name,
+			    parent_number);
 	}
+	return strbuf_detach(&sb, NULL);
+}
 
-	if (name == NULL) {
-		name = xmalloc(sizeof(rev_name));
-		set_commit_rev_name(commit, name);
-		goto copy_data;
-	} else if (is_better_name(name, taggerdate, distance, from_tag)) {
-copy_data:
-		name->tip_name = tip_name;
-		name->taggerdate = taggerdate;
-		name->generation = generation;
-		name->distance = distance;
-		name->from_tag = from_tag;
-	} else {
-		free(to_free);
+static void name_rev(struct commit *start_commit,
+		const char *tip_name, timestamp_t taggerdate,
+		int from_tag, int deref)
+{
+	struct prio_queue queue;
+	struct commit *commit;
+	struct commit **parents_to_queue = NULL;
+	size_t parents_to_queue_nr, parents_to_queue_alloc = 0;
+	struct rev_name *start_name;
+
+	parse_commit(start_commit);
+	if (start_commit->date < cutoff)
 		return;
-	}
 
-	for (parents = commit->parents;
-			parents;
-			parents = parents->next, parent_number++) {
-		if (parent_number > 1) {
-			size_t len;
-			char *new_name;
-
-			strip_suffix(tip_name, "^0", &len);
-			if (generation > 0)
-				new_name = xstrfmt("%.*s~%d^%d", (int)len, tip_name,
-						   generation, parent_number);
-			else
-				new_name = xstrfmt("%.*s^%d", (int)len, tip_name,
-						   parent_number);
-
-			name_rev(parents->item, new_name, taggerdate, 0,
-				 distance + MERGE_TRAVERSAL_WEIGHT,
-				 from_tag, 0);
-		} else {
-			name_rev(parents->item, tip_name, taggerdate,
-				 generation + 1, distance + 1,
-				 from_tag, 0);
+	start_name = create_or_update_name(start_commit, taggerdate, 0, 0,
+					   from_tag);
+	if (!start_name)
+		return;
+	if (deref)
+		start_name->tip_name = xstrfmt("%s^0", tip_name);
+	else
+		start_name->tip_name = xstrdup(tip_name);
+
+	memset(&queue, 0, sizeof(queue)); /* Use the prio_queue as LIFO */
+	prio_queue_put(&queue, start_commit);
+
+	while ((commit = prio_queue_get(&queue))) {
+		struct rev_name *name = get_commit_rev_name(commit);
+		struct commit_list *parents;
+		int parent_number = 1;
+
+		parents_to_queue_nr = 0;
+
+		for (parents = commit->parents;
+				parents;
+				parents = parents->next, parent_number++) {
+			struct commit *parent = parents->item;
+			struct rev_name *parent_name;
+			int generation, distance;
+
+			parse_commit(parent);
+			if (parent->date < cutoff)
+				continue;
+
+			if (parent_number > 1) {
+				generation = 0;
+				distance = name->distance + MERGE_TRAVERSAL_WEIGHT;
+			} else {
+				generation = name->generation + 1;
+				distance = name->distance + 1;
+			}
+
+			parent_name = create_or_update_name(parent, taggerdate,
+							    generation,
+							    distance, from_tag);
+			if (parent_name) {
+				if (parent_number > 1)
+					parent_name->tip_name =
+						get_parent_name(name,
+								parent_number);
+				else
+					parent_name->tip_name = name->tip_name;
+				ALLOC_GROW(parents_to_queue,
+					   parents_to_queue_nr + 1,
+					   parents_to_queue_alloc);
+				parents_to_queue[parents_to_queue_nr] = parent;
+				parents_to_queue_nr++;
+			}
 		}
+
+		/* The first parent must come out first from the prio_queue */
+		while (parents_to_queue_nr)
+			prio_queue_put(&queue,
+				       parents_to_queue[--parents_to_queue_nr]);
 	}
+
+	clear_prio_queue(&queue);
+	free(parents_to_queue);
 }
 
 static int subpath_matches(const char *path, const char *filter)
@@ -161,10 +229,10 @@ static const char *name_ref_abbrev(const char *refname, int shorten_unambiguous)
 {
 	if (shorten_unambiguous)
 		refname = shorten_unambiguous_ref(refname, 0);
-	else if (starts_with(refname, "refs/heads/"))
-		refname = refname + 11;
-	else if (starts_with(refname, "refs/"))
-		refname = refname + 5;
+	else if (skip_prefix(refname, "refs/heads/", &refname))
+		; /* refname already advanced */
+	else
+		skip_prefix(refname, "refs/", &refname);
 	return refname;
 }
 
@@ -179,6 +247,10 @@ static struct tip_table {
 	struct tip_table_entry {
 		struct object_id oid;
 		const char *refname;
+		struct commit *commit;
+		timestamp_t taggerdate;
+		unsigned int from_tag:1;
+		unsigned int deref:1;
 	} *table;
 	int nr;
 	int alloc;
@@ -186,13 +258,18 @@ static struct tip_table {
 } tip_table;
 
 static void add_to_tip_table(const struct object_id *oid, const char *refname,
-			     int shorten_unambiguous)
+			     int shorten_unambiguous, struct commit *commit,
+			     timestamp_t taggerdate, int from_tag, int deref)
 {
 	refname = name_ref_abbrev(refname, shorten_unambiguous);
 
 	ALLOC_GROW(tip_table.table, tip_table.nr + 1, tip_table.alloc);
 	oidcpy(&tip_table.table[tip_table.nr].oid, oid);
 	tip_table.table[tip_table.nr].refname = xstrdup(refname);
+	tip_table.table[tip_table.nr].commit = commit;
+	tip_table.table[tip_table.nr].taggerdate = taggerdate;
+	tip_table.table[tip_table.nr].from_tag = from_tag;
+	tip_table.table[tip_table.nr].deref = deref;
 	tip_table.nr++;
 	tip_table.sorted = 0;
 }
@@ -203,12 +280,30 @@ static int tipcmp(const void *a_, const void *b_)
 	return oidcmp(&a->oid, &b->oid);
 }
 
+static int cmp_by_tag_and_age(const void *a_, const void *b_)
+{
+	const struct tip_table_entry *a = a_, *b = b_;
+	int cmp;
+
+	/* Prefer tags. */
+	cmp = b->from_tag - a->from_tag;
+	if (cmp)
+		return cmp;
+
+	/* Older is better. */
+	if (a->taggerdate < b->taggerdate)
+		return -1;
+	return a->taggerdate != b->taggerdate;
+}
+
 static int name_ref(const char *path, const struct object_id *oid, int flags, void *cb_data)
 {
 	struct object *o = parse_object(the_repository, oid);
 	struct name_ref_data *data = cb_data;
 	int can_abbreviate_output = data->tags_only && data->name_only;
 	int deref = 0;
+	int from_tag = 0;
+	struct commit *commit = NULL;
 	timestamp_t taggerdate = TIME_MAX;
 
 	if (data->tags_only && !starts_with(path, "refs/tags/"))
@@ -257,8 +352,6 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo
 			return 0;
 	}
 
-	add_to_tip_table(oid, path, can_abbreviate_output);
-
 	while (o && o->type == OBJ_TAG) {
 		struct tag *t = (struct tag *) o;
 		if (!t->tagged)
@@ -268,22 +361,39 @@ static int name_ref(const char *path, const struct object_id *oid, int flags, vo
 		taggerdate = t->date;
 	}
 	if (o && o->type == OBJ_COMMIT) {
-		struct commit *commit = (struct commit *)o;
-		int from_tag = starts_with(path, "refs/tags/");
-
+		commit = (struct commit *)o;
+		from_tag = starts_with(path, "refs/tags/");
 		if (taggerdate == TIME_MAX)
-			taggerdate = ((struct commit *)o)->date;
-		path = name_ref_abbrev(path, can_abbreviate_output);
-		name_rev(commit, xstrdup(path), taggerdate, 0, 0,
-			 from_tag, deref);
+			taggerdate = commit->date;
 	}
+
+	add_to_tip_table(oid, path, can_abbreviate_output, commit, taggerdate,
+			 from_tag, deref);
 	return 0;
 }
 
-static const unsigned char *nth_tip_table_ent(size_t ix, void *table_)
+static void name_tips(void)
+{
+	int i;
+
+	/*
+	 * Try to set better names first, so that worse ones spread
+	 * less.
+	 */
+	QSORT(tip_table.table, tip_table.nr, cmp_by_tag_and_age);
+	for (i = 0; i < tip_table.nr; i++) {
+		struct tip_table_entry *e = &tip_table.table[i];
+		if (e->commit) {
+			name_rev(e->commit, e->refname, e->taggerdate,
+				 e->from_tag, e->deref);
+		}
+	}
+}
+
+static const struct object_id *nth_tip_table_ent(size_t ix, const void *table_)
 {
-	struct tip_table_entry *table = table_;
-	return table[ix].oid.hash;
+	const struct tip_table_entry *table = table_;
+	return &table[ix].oid;
 }
 
 static const char *get_exact_ref_match(const struct object *o)
@@ -298,8 +408,8 @@ static const char *get_exact_ref_match(const struct object *o)
 		tip_table.sorted = 1;
 	}
 
-	found = sha1_pos(o->oid.hash, tip_table.table, tip_table.nr,
-			 nth_tip_table_ent);
+	found = oid_pos(&o->oid, tip_table.table, tip_table.nr,
+			nth_tip_table_ent);
 	if (0 <= found)
 		return tip_table.table[found].refname;
 	return NULL;
@@ -309,11 +419,11 @@ static const char *get_exact_ref_match(const struct object *o)
 static const char *get_rev_name(const struct object *o, struct strbuf *buf)
 {
 	struct rev_name *n;
-	struct commit *c;
+	const struct commit *c;
 
 	if (o->type != OBJ_COMMIT)
 		return get_exact_ref_match(o);
-	c = (struct commit *) o;
+	c = (const struct commit *) o;
 	n = get_commit_rev_name(c);
 	if (!n)
 		return NULL;
@@ -321,11 +431,10 @@ static const char *get_rev_name(const struct object *o, struct strbuf *buf)
 	if (!n->generation)
 		return n->tip_name;
 	else {
-		int len = strlen(n->tip_name);
-		if (len > 2 && !strcmp(n->tip_name + len - 2, "^0"))
-			len -= 2;
 		strbuf_reset(buf);
-		strbuf_addf(buf, "%.*s~%d", len, n->tip_name, n->generation);
+		strbuf_addstr(buf, n->tip_name);
+		strbuf_strip_suffix(buf, "^0");
+		strbuf_addf(buf, "~%d", n->generation);
 		return buf->buf;
 	}
 }
@@ -412,7 +521,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
 	int all = 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 names (no SHA-1)")),
+		OPT_BOOL(0, "name-only", &data.name_only, N_("print only ref-based names (no object names)")),
 		OPT_BOOL(0, "tags", &data.tags_only, N_("only use tags to name the commits")),
 		OPT_STRING_LIST(0, "refs", &data.ref_filters, N_("pattern"),
 				   N_("only use refs matching <pattern>")),
@@ -493,6 +602,7 @@ int cmd_name_rev(int argc, const char **argv, const char *prefix)
 			cutoff = TIME_MIN;
 	}
 	for_each_ref(name_ref, &data);
+	name_tips();
 
 	if (transform_stdin) {
 		char buffer[2048];
diff --git a/builtin/notes.c b/builtin/notes.c
index 02e97f55c5..71c59583a1 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -172,9 +172,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);
@@ -373,7 +371,7 @@ static int list(int argc, const char **argv, const char *prefix)
 				     git_notes_list_usage, 0);
 
 	if (1 < argc) {
-		error(_("too many parameters"));
+		error(_("too many arguments"));
 		usage_with_options(git_notes_list_usage, options);
 	}
 
@@ -406,18 +404,18 @@ static int add(int argc, const char **argv, const char *prefix)
 	const struct object_id *note;
 	struct note_data d = { 0, 0, NULL, STRBUF_INIT };
 	struct option options[] = {
-		{ OPTION_CALLBACK, 'm', "message", &d, N_("message"),
+		OPT_CALLBACK_F('m', "message", &d, N_("message"),
 			N_("note contents as a string"), PARSE_OPT_NONEG,
-			parse_msg_arg},
-		{ OPTION_CALLBACK, 'F', "file", &d, N_("file"),
+			parse_msg_arg),
+		OPT_CALLBACK_F('F', "file", &d, N_("file"),
 			N_("note contents in a file"), PARSE_OPT_NONEG,
-			parse_file_arg},
-		{ OPTION_CALLBACK, 'c', "reedit-message", &d, N_("object"),
+			parse_file_arg),
+		OPT_CALLBACK_F('c', "reedit-message", &d, N_("object"),
 			N_("reuse and edit specified note object"), PARSE_OPT_NONEG,
-			parse_reedit_arg},
-		{ OPTION_CALLBACK, 'C', "reuse-message", &d, N_("object"),
+			parse_reedit_arg),
+		OPT_CALLBACK_F('C', "reuse-message", &d, N_("object"),
 			N_("reuse specified note object"), PARSE_OPT_NONEG,
-			parse_reuse_arg},
+			parse_reuse_arg),
 		OPT_BOOL(0, "allow-empty", &allow_empty,
 			N_("allow storing empty note")),
 		OPT__FORCE(&force, N_("replace existing notes"), PARSE_OPT_NOCOMPLETE),
@@ -428,7 +426,7 @@ static int add(int argc, const char **argv, const char *prefix)
 			     PARSE_OPT_KEEP_ARGV0);
 
 	if (2 < argc) {
-		error(_("too many parameters"));
+		error(_("too many arguments"));
 		usage_with_options(git_notes_add_usage, options);
 	}
 
@@ -506,19 +504,19 @@ static int copy(int argc, const char **argv, const char *prefix)
 
 	if (from_stdin || rewrite_cmd) {
 		if (argc) {
-			error(_("too many parameters"));
+			error(_("too many arguments"));
 			usage_with_options(git_notes_copy_usage, options);
 		} else {
 			return notes_copy_from_stdin(force, rewrite_cmd);
 		}
 	}
 
-	if (argc < 2) {
-		error(_("too few parameters"));
+	if (argc < 1) {
+		error(_("too few arguments"));
 		usage_with_options(git_notes_copy_usage, options);
 	}
 	if (2 < argc) {
-		error(_("too many parameters"));
+		error(_("too many arguments"));
 		usage_with_options(git_notes_copy_usage, options);
 	}
 
@@ -572,18 +570,18 @@ static int append_edit(int argc, const char **argv, const char *prefix)
 	const char * const *usage;
 	struct note_data d = { 0, 0, NULL, STRBUF_INIT };
 	struct option options[] = {
-		{ OPTION_CALLBACK, 'm', "message", &d, N_("message"),
+		OPT_CALLBACK_F('m', "message", &d, N_("message"),
 			N_("note contents as a string"), PARSE_OPT_NONEG,
-			parse_msg_arg},
-		{ OPTION_CALLBACK, 'F', "file", &d, N_("file"),
+			parse_msg_arg),
+		OPT_CALLBACK_F('F', "file", &d, N_("file"),
 			N_("note contents in a file"), PARSE_OPT_NONEG,
-			parse_file_arg},
-		{ OPTION_CALLBACK, 'c', "reedit-message", &d, N_("object"),
+			parse_file_arg),
+		OPT_CALLBACK_F('c', "reedit-message", &d, N_("object"),
 			N_("reuse and edit specified note object"), PARSE_OPT_NONEG,
-			parse_reedit_arg},
-		{ OPTION_CALLBACK, 'C', "reuse-message", &d, N_("object"),
+			parse_reedit_arg),
+		OPT_CALLBACK_F('C', "reuse-message", &d, N_("object"),
 			N_("reuse specified note object"), PARSE_OPT_NONEG,
-			parse_reuse_arg},
+			parse_reuse_arg),
 		OPT_BOOL(0, "allow-empty", &allow_empty,
 			N_("allow storing empty note")),
 		OPT_END()
@@ -595,7 +593,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
 			     PARSE_OPT_KEEP_ARGV0);
 
 	if (2 < argc) {
-		error(_("too many parameters"));
+		error(_("too many arguments"));
 		usage_with_options(usage, options);
 	}
 
@@ -622,7 +620,7 @@ static int append_edit(int argc, const char **argv, const char *prefix)
 
 		strbuf_grow(&d.buf, size + 1);
 		if (d.buf.len && prev_buf && size)
-			strbuf_insert(&d.buf, 0, "\n", 1);
+			strbuf_insertstr(&d.buf, 0, "\n");
 		if (prev_buf && size)
 			strbuf_insert(&d.buf, 0, prev_buf, size);
 		free(prev_buf);
@@ -662,7 +660,7 @@ static int show(int argc, const char **argv, const char *prefix)
 			     0);
 
 	if (1 < argc) {
-		error(_("too many parameters"));
+		error(_("too many arguments"));
 		usage_with_options(git_notes_show_usage, options);
 	}
 
@@ -730,7 +728,7 @@ static int merge_commit(struct notes_merge_options *o)
 	else
 		oidclr(&parent_oid);
 
-	t = xcalloc(1, sizeof(struct notes_tree));
+	CALLOC_ARRAY(t, 1);
 	init_notes(t, "NOTES_MERGE_PARTIAL", combine_notes_overwrite, 0);
 
 	o->local_ref = local_ref_to_free =
@@ -745,7 +743,7 @@ static int merge_commit(struct notes_merge_options *o)
 	memset(&pretty_ctx, 0, sizeof(pretty_ctx));
 	format_commit_message(partial, "%s", &msg, &pretty_ctx);
 	strbuf_trim(&msg);
-	strbuf_insert(&msg, 0, "notes: ", 7);
+	strbuf_insertstr(&msg, 0, "notes: ");
 	update_ref(msg.buf, o->local_ref, &oid,
 		   is_null_oid(&parent_oid) ? NULL : &parent_oid,
 		   0, UPDATE_REFS_DIE_ON_ERR);
@@ -812,7 +810,7 @@ static int merge(int argc, const char **argv, const char *prefix)
 		error(_("must specify a notes ref to merge"));
 		usage_with_options(git_notes_merge_usage, options);
 	} else if (!do_merge && argc) {
-		error(_("too many parameters"));
+		error(_("too many arguments"));
 		usage_with_options(git_notes_merge_usage, options);
 	}
 
@@ -960,7 +958,7 @@ static int prune(int argc, const char **argv, const char *prefix)
 			     0);
 
 	if (argc) {
-		error(_("too many parameters"));
+		error(_("too many arguments"));
 		usage_with_options(git_notes_prune_usage, options);
 	}
 
@@ -982,7 +980,7 @@ static int get_ref(int argc, const char **argv, const char *prefix)
 			     git_notes_get_ref_usage, 0);
 
 	if (argc) {
-		error(_("too many parameters"));
+		error(_("too many arguments"));
 		usage_with_options(git_notes_get_ref_usage, options);
 	}
 
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 5876583220..ec8503563a 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -26,14 +26,144 @@
 #include "pack-bitmap.h"
 #include "delta-islands.h"
 #include "reachable.h"
-#include "sha1-array.h"
-#include "argv-array.h"
+#include "oid-array.h"
+#include "strvec.h"
 #include "list.h"
 #include "packfile.h"
 #include "object-store.h"
 #include "dir.h"
 #include "midx.h"
 #include "trace2.h"
+#include "shallow.h"
+#include "promisor-remote.h"
+
+/*
+ * Objects we are going to pack are collected in the `to_pack` structure.
+ * It contains an array (dynamically expanded) of the object data, and a map
+ * that can resolve SHA1s to their position in the array.
+ */
+static struct packing_data to_pack;
+
+static inline struct object_entry *oe_delta(
+		const struct packing_data *pack,
+		const struct object_entry *e)
+{
+	if (!e->delta_idx)
+		return NULL;
+	if (e->ext_base)
+		return &pack->ext_bases[e->delta_idx - 1];
+	else
+		return &pack->objects[e->delta_idx - 1];
+}
+
+static inline unsigned long oe_delta_size(struct packing_data *pack,
+					  const struct object_entry *e)
+{
+	if (e->delta_size_valid)
+		return e->delta_size_;
+
+	/*
+	 * pack->delta_size[] can't be NULL because oe_set_delta_size()
+	 * must have been called when a new delta is saved with
+	 * oe_set_delta().
+	 * If oe_delta() returns NULL (i.e. default state, which means
+	 * delta_size_valid is also false), then the caller must never
+	 * call oe_delta_size().
+	 */
+	return pack->delta_size[e - pack->objects];
+}
+
+unsigned long oe_get_size_slow(struct packing_data *pack,
+			       const struct object_entry *e);
+
+static inline unsigned long oe_size(struct packing_data *pack,
+				    const struct object_entry *e)
+{
+	if (e->size_valid)
+		return e->size_;
+
+	return oe_get_size_slow(pack, e);
+}
+
+static inline void oe_set_delta(struct packing_data *pack,
+				struct object_entry *e,
+				struct object_entry *delta)
+{
+	if (delta)
+		e->delta_idx = (delta - pack->objects) + 1;
+	else
+		e->delta_idx = 0;
+}
+
+static inline struct object_entry *oe_delta_sibling(
+		const struct packing_data *pack,
+		const struct object_entry *e)
+{
+	if (e->delta_sibling_idx)
+		return &pack->objects[e->delta_sibling_idx - 1];
+	return NULL;
+}
+
+static inline struct object_entry *oe_delta_child(
+		const struct packing_data *pack,
+		const struct object_entry *e)
+{
+	if (e->delta_child_idx)
+		return &pack->objects[e->delta_child_idx - 1];
+	return NULL;
+}
+
+static inline void oe_set_delta_child(struct packing_data *pack,
+				      struct object_entry *e,
+				      struct object_entry *delta)
+{
+	if (delta)
+		e->delta_child_idx = (delta - pack->objects) + 1;
+	else
+		e->delta_child_idx = 0;
+}
+
+static inline void oe_set_delta_sibling(struct packing_data *pack,
+					struct object_entry *e,
+					struct object_entry *delta)
+{
+	if (delta)
+		e->delta_sibling_idx = (delta - pack->objects) + 1;
+	else
+		e->delta_sibling_idx = 0;
+}
+
+static inline void oe_set_size(struct packing_data *pack,
+			       struct object_entry *e,
+			       unsigned long size)
+{
+	if (size < pack->oe_size_limit) {
+		e->size_ = size;
+		e->size_valid = 1;
+	} else {
+		e->size_valid = 0;
+		if (oe_get_size_slow(pack, e) != size)
+			BUG("'size' is supposed to be the object size!");
+	}
+}
+
+static inline void oe_set_delta_size(struct packing_data *pack,
+				     struct object_entry *e,
+				     unsigned long size)
+{
+	if (size < pack->oe_delta_size_limit) {
+		e->delta_size_ = size;
+		e->delta_size_valid = 1;
+	} else {
+		packing_data_lock(pack);
+		if (!pack->delta_size)
+			ALLOC_ARRAY(pack->delta_size, pack->nr_alloc);
+		packing_data_unlock(pack);
+
+		pack->delta_size[e - pack->objects] = size;
+		e->delta_size_valid = 0;
+	}
+}
 
 #define IN_PACK(obj) oe_in_pack(&to_pack, obj)
 #define SIZE(obj) oe_size(&to_pack, obj)
@@ -54,13 +184,6 @@ static const char *pack_usage[] = {
 	NULL
 };
 
-/*
- * Objects we are going to pack are collected in the `to_pack` structure.
- * It contains an array (dynamically expanded) of the object data, and a map
- * that can resolve SHA1s to their position in the array.
- */
-static struct packing_data to_pack;
-
 static struct pack_idx_entry **written_list;
 static uint32_t nr_result, nr_written, nr_seen;
 static struct bitmap_index *bitmap_git;
@@ -92,10 +215,11 @@ static struct progress *progress_state;
 
 static struct packed_git *reuse_packfile;
 static uint32_t reuse_packfile_objects;
-static off_t reuse_packfile_offset;
+static struct bitmap *reuse_packfile_bitmap;
 
 static int use_bitmap_index_default = 1;
 static int use_bitmap_index = -1;
+static int allow_pack_reuse = 1;
 static enum {
 	WRITE_BITMAP_FALSE = 0,
 	WRITE_BITMAP_QUIET,
@@ -115,6 +239,8 @@ static unsigned long window_memory_limit = 0;
 
 static struct list_objects_filter_options filter_options;
 
+static struct string_list uri_protocols = STRING_LIST_INIT_NODUP;
+
 enum missing_action {
 	MA_ERROR = 0,      /* fail if any missing objects are encountered */
 	MA_ALLOW_ANY,      /* silently allow ALL missing objects */
@@ -123,6 +249,15 @@ enum missing_action {
 static enum missing_action arg_missing_action;
 static show_object_fn fn_show_object;
 
+struct configured_exclusion {
+	struct oidmap_entry e;
+	char *pack_hash_hex;
+	char *uri;
+};
+static struct oidmap configured_exclusions;
+
+static struct oidset excluded_by_config;
+
 /*
  * stats
  */
@@ -163,7 +298,7 @@ static void *get_delta(struct object_entry *entry)
 	delta_buf = diff_delta(base_buf, base_size,
 			       buf, size, &delta_size, 0);
 	/*
-	 * We succesfully computed this delta once but dropped it for
+	 * We successfully computed this delta once but dropped it for
 	 * memory reasons. Something is very wrong if this time we
 	 * recompute and create a different delta.
 	 */
@@ -287,6 +422,17 @@ static void copy_pack_data(struct hashfile *f,
 	}
 }
 
+static inline int oe_size_greater_than(struct packing_data *pack,
+				       const struct object_entry *lhs,
+				       unsigned long rhs)
+{
+	if (lhs->size_valid)
+		return lhs->size_ > rhs;
+	if (rhs < pack->oe_size_limit) /* rhs < 2^x <= lhs ? */
+		return 1;
+	return oe_get_size_slow(pack, lhs) > rhs;
+}
+
 /* Return 0 if we will bust the pack-size limit */
 static unsigned long write_no_reuse_object(struct hashfile *f, struct object_entry *entry,
 					   unsigned long limit, int usable_delta)
@@ -303,7 +449,8 @@ static unsigned long write_no_reuse_object(struct hashfile *f, struct object_ent
 	if (!usable_delta) {
 		if (oe_type(entry) == OBJ_BLOB &&
 		    oe_size_greater_than(&to_pack, entry, big_file_threshold) &&
-		    (st = open_istream(&entry->idx.oid, &type, &size, NULL)) != NULL)
+		    (st = open_istream(the_repository, &entry->idx.oid, &type,
+				       &size, NULL)) != NULL)
 			buf = NULL;
 		else {
 			buf = read_object_file(&entry->idx.oid, &type, &size);
@@ -404,7 +551,7 @@ static off_t write_reuse_object(struct hashfile *f, struct object_entry *entry,
 {
 	struct packed_git *p = IN_PACK(entry);
 	struct pack_window *w_curs = NULL;
-	struct revindex_entry *revidx;
+	uint32_t pos;
 	off_t offset;
 	enum object_type type = oe_type(entry);
 	off_t datalen;
@@ -421,10 +568,15 @@ static off_t write_reuse_object(struct hashfile *f, struct object_entry *entry,
 					      type, entry_size);
 
 	offset = entry->in_pack_offset;
-	revidx = find_pack_revindex(p, offset);
-	datalen = revidx[1].offset - offset;
+	if (offset_to_pack_pos(p, offset, &pos) < 0)
+		die(_("write_reuse_object: could not locate %s, expected at "
+		      "offset %"PRIuMAX" in pack %s"),
+		    oid_to_hex(&entry->idx.oid), (uintmax_t)offset,
+		    p->pack_name);
+	datalen = pack_pos_to_offset(p, pos + 1) - offset;
 	if (!pack_to_stdout && p->index_version > 1 &&
-	    check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) {
+	    check_pack_crc(p, &w_curs, offset, datalen,
+			   pack_pos_to_index(p, pos))) {
 		error(_("bad packed object CRC for %s"),
 		      oid_to_hex(&entry->idx.oid));
 		unuse_pack(&w_curs);
@@ -614,7 +766,7 @@ static int mark_tagged(const char *path, const struct object_id *oid, int flag,
 
 	if (entry)
 		entry->tagged = 1;
-	if (!peel_ref(path, &peeled)) {
+	if (!peel_iterated_oid(oid, &peeled)) {
 		entry = packlist_find(&to_pack, &peeled);
 		if (entry)
 			entry->tagged = 1;
@@ -622,6 +774,14 @@ static int mark_tagged(const char *path, const struct object_id *oid, int flag,
 	return 0;
 }
 
+static inline unsigned char oe_layer(struct packing_data *pack,
+				     struct object_entry *e)
+{
+	if (!pack->layer)
+		return 0;
+	return pack->layer[e - pack->objects];
+}
+
 static inline void add_to_write_order(struct object_entry **wo,
 			       unsigned int *endp,
 			       struct object_entry *e)
@@ -784,57 +944,211 @@ static struct object_entry **compute_write_order(void)
 	return wo;
 }
 
-static off_t write_reused_pack(struct hashfile *f)
+
+/*
+ * A reused set of objects. All objects in a chunk have the same
+ * relative position in the original packfile and the generated
+ * packfile.
+ */
+
+static struct reused_chunk {
+	/* The offset of the first object of this chunk in the original
+	 * packfile. */
+	off_t original;
+	/* The difference for "original" minus the offset of the first object of
+	 * this chunk in the generated packfile. */
+	off_t difference;
+} *reused_chunks;
+static int reused_chunks_nr;
+static int reused_chunks_alloc;
+
+static void record_reused_object(off_t where, off_t offset)
 {
-	unsigned char buffer[8192];
-	off_t to_write, total;
-	int fd;
+	if (reused_chunks_nr && reused_chunks[reused_chunks_nr-1].difference == offset)
+		return;
 
-	if (!is_pack_valid(reuse_packfile))
-		die(_("packfile is invalid: %s"), reuse_packfile->pack_name);
+	ALLOC_GROW(reused_chunks, reused_chunks_nr + 1,
+		   reused_chunks_alloc);
+	reused_chunks[reused_chunks_nr].original = where;
+	reused_chunks[reused_chunks_nr].difference = offset;
+	reused_chunks_nr++;
+}
 
-	fd = git_open(reuse_packfile->pack_name);
-	if (fd < 0)
-		die_errno(_("unable to open packfile for reuse: %s"),
-			  reuse_packfile->pack_name);
+/*
+ * Binary search to find the chunk that "where" is in. Note
+ * that we're not looking for an exact match, just the first
+ * chunk that contains it (which implicitly ends at the start
+ * of the next chunk.
+ */
+static off_t find_reused_offset(off_t where)
+{
+	int lo = 0, hi = reused_chunks_nr;
+	while (lo < hi) {
+		int mi = lo + ((hi - lo) / 2);
+		if (where == reused_chunks[mi].original)
+			return reused_chunks[mi].difference;
+		if (where < reused_chunks[mi].original)
+			hi = mi;
+		else
+			lo = mi + 1;
+	}
 
-	if (lseek(fd, sizeof(struct pack_header), SEEK_SET) == -1)
-		die_errno(_("unable to seek in reused packfile"));
+	/*
+	 * The first chunk starts at zero, so we can't have gone below
+	 * there.
+	 */
+	assert(lo);
+	return reused_chunks[lo-1].difference;
+}
 
-	if (reuse_packfile_offset < 0)
-		reuse_packfile_offset = reuse_packfile->pack_size - the_hash_algo->rawsz;
+static void write_reused_pack_one(size_t pos, struct hashfile *out,
+				  struct pack_window **w_curs)
+{
+	off_t offset, next, cur;
+	enum object_type type;
+	unsigned long size;
 
-	total = to_write = reuse_packfile_offset - sizeof(struct pack_header);
+	offset = pack_pos_to_offset(reuse_packfile, pos);
+	next = pack_pos_to_offset(reuse_packfile, pos + 1);
 
-	while (to_write) {
-		int read_pack = xread(fd, buffer, sizeof(buffer));
+	record_reused_object(offset, offset - hashfile_total(out));
 
-		if (read_pack <= 0)
-			die_errno(_("unable to read from reused packfile"));
+	cur = offset;
+	type = unpack_object_header(reuse_packfile, w_curs, &cur, &size);
+	assert(type >= 0);
 
-		if (read_pack > to_write)
-			read_pack = to_write;
+	if (type == OBJ_OFS_DELTA) {
+		off_t base_offset;
+		off_t fixup;
+
+		unsigned char header[MAX_PACK_OBJECT_HEADER];
+		unsigned len;
+
+		base_offset = get_delta_base(reuse_packfile, w_curs, &cur, type, offset);
+		assert(base_offset != 0);
+
+		/* Convert to REF_DELTA if we must... */
+		if (!allow_ofs_delta) {
+			uint32_t base_pos;
+			struct object_id base_oid;
+
+			if (offset_to_pack_pos(reuse_packfile, base_offset, &base_pos) < 0)
+				die(_("expected object at offset %"PRIuMAX" "
+				      "in pack %s"),
+				    (uintmax_t)base_offset,
+				    reuse_packfile->pack_name);
+
+			nth_packed_object_id(&base_oid, reuse_packfile,
+					     pack_pos_to_index(reuse_packfile, base_pos));
+
+			len = encode_in_pack_object_header(header, sizeof(header),
+							   OBJ_REF_DELTA, size);
+			hashwrite(out, header, len);
+			hashwrite(out, base_oid.hash, the_hash_algo->rawsz);
+			copy_pack_data(out, reuse_packfile, w_curs, cur, next - cur);
+			return;
+		}
 
-		hashwrite(f, buffer, read_pack);
-		to_write -= read_pack;
+		/* Otherwise see if we need to rewrite the offset... */
+		fixup = find_reused_offset(offset) -
+			find_reused_offset(base_offset);
+		if (fixup) {
+			unsigned char ofs_header[10];
+			unsigned i, ofs_len;
+			off_t ofs = offset - base_offset - fixup;
+
+			len = encode_in_pack_object_header(header, sizeof(header),
+							   OBJ_OFS_DELTA, size);
+
+			i = sizeof(ofs_header) - 1;
+			ofs_header[i] = ofs & 127;
+			while (ofs >>= 7)
+				ofs_header[--i] = 128 | (--ofs & 127);
+
+			ofs_len = sizeof(ofs_header) - i;
+
+			hashwrite(out, header, len);
+			hashwrite(out, ofs_header + sizeof(ofs_header) - ofs_len, ofs_len);
+			copy_pack_data(out, reuse_packfile, w_curs, cur, next - cur);
+			return;
+		}
+
+		/* ...otherwise we have no fixup, and can write it verbatim */
+	}
+
+	copy_pack_data(out, reuse_packfile, w_curs, offset, next - offset);
+}
+
+static size_t write_reused_pack_verbatim(struct hashfile *out,
+					 struct pack_window **w_curs)
+{
+	size_t pos = 0;
+
+	while (pos < reuse_packfile_bitmap->word_alloc &&
+			reuse_packfile_bitmap->words[pos] == (eword_t)~0)
+		pos++;
+
+	if (pos) {
+		off_t to_write;
+
+		written = (pos * BITS_IN_EWORD);
+		to_write = pack_pos_to_offset(reuse_packfile, written)
+			- sizeof(struct pack_header);
+
+		/* We're recording one chunk, not one object. */
+		record_reused_object(sizeof(struct pack_header), 0);
+		hashflush(out);
+		copy_pack_data(out, reuse_packfile, w_curs,
+			sizeof(struct pack_header), to_write);
 
-		/*
-		 * We don't know the actual number of objects written,
-		 * only how many bytes written, how many bytes total, and
-		 * how many objects total. So we can fake it by pretending all
-		 * objects we are writing are the same size. This gives us a
-		 * smooth progress meter, and at the end it matches the true
-		 * answer.
-		 */
-		written = reuse_packfile_objects *
-				(((double)(total - to_write)) / total);
 		display_progress(progress_state, written);
 	}
+	return pos;
+}
+
+static void write_reused_pack(struct hashfile *f)
+{
+	size_t i = 0;
+	uint32_t offset;
+	struct pack_window *w_curs = NULL;
+
+	if (allow_ofs_delta)
+		i = write_reused_pack_verbatim(f, &w_curs);
+
+	for (; i < reuse_packfile_bitmap->word_alloc; ++i) {
+		eword_t word = reuse_packfile_bitmap->words[i];
+		size_t pos = (i * BITS_IN_EWORD);
+
+		for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
+			if ((word >> offset) == 0)
+				break;
+
+			offset += ewah_bit_ctz64(word >> offset);
+			write_reused_pack_one(pos + offset, f, &w_curs);
+			display_progress(progress_state, ++written);
+		}
+	}
 
-	close(fd);
-	written = reuse_packfile_objects;
-	display_progress(progress_state, written);
-	return reuse_packfile_offset - sizeof(struct pack_header);
+	unuse_pack(&w_curs);
+}
+
+static void write_excluded_by_configs(void)
+{
+	struct oidset_iter iter;
+	const struct object_id *oid;
+
+	oidset_iter_init(&excluded_by_config, &iter);
+	while ((oid = oidset_iter_next(&iter))) {
+		struct configured_exclusion *ex =
+			oidmap_get(&configured_exclusions, oid);
+
+		if (!ex)
+			BUG("configured exclusion wasn't configured");
+		write_in_full(1, ex->pack_hash_hex, strlen(ex->pack_hash_hex));
+		write_in_full(1, " ", 1);
+		write_in_full(1, ex->uri, strlen(ex->uri));
+		write_in_full(1, "\n", 1);
+	}
 }
 
 static const char no_split_warning[] = N_(
@@ -856,7 +1170,7 @@ static void write_pack_file(void)
 	write_order = compute_write_order();
 
 	do {
-		struct object_id oid;
+		unsigned char hash[GIT_MAX_RAWSZ];
 		char *pack_tmp_name = NULL;
 
 		if (pack_to_stdout)
@@ -867,11 +1181,9 @@ static void write_pack_file(void)
 		offset = write_pack_header(f, nr_remaining);
 
 		if (reuse_packfile) {
-			off_t packfile_size;
 			assert(pack_to_stdout);
-
-			packfile_size = write_reused_pack(f);
-			offset += packfile_size;
+			write_reused_pack(f);
+			offset = hashfile_total(f);
 		}
 
 		nr_written = 0;
@@ -887,13 +1199,13 @@ static void write_pack_file(void)
 		 * If so, rewrite it like in fast-import
 		 */
 		if (pack_to_stdout) {
-			finalize_hashfile(f, oid.hash, CSUM_HASH_IN_STREAM | CSUM_CLOSE);
+			finalize_hashfile(f, hash, CSUM_HASH_IN_STREAM | CSUM_CLOSE);
 		} else if (nr_written == nr_remaining) {
-			finalize_hashfile(f, oid.hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
+			finalize_hashfile(f, hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC | CSUM_CLOSE);
 		} else {
-			int fd = finalize_hashfile(f, oid.hash, 0);
-			fixup_pack_header_footer(fd, oid.hash, pack_tmp_name,
-						 nr_written, oid.hash, offset);
+			int fd = finalize_hashfile(f, hash, 0);
+			fixup_pack_header_footer(fd, hash, pack_tmp_name,
+						 nr_written, hash, offset);
 			close(fd);
 			if (write_bitmap_index) {
 				if (write_bitmap_index != WRITE_BITMAP_QUIET)
@@ -928,22 +1240,21 @@ static void write_pack_file(void)
 			strbuf_addf(&tmpname, "%s-", base_name);
 
 			if (write_bitmap_index) {
-				bitmap_writer_set_checksum(oid.hash);
+				bitmap_writer_set_checksum(hash);
 				bitmap_writer_build_type_index(
 					&to_pack, written_list, nr_written);
 			}
 
 			finish_tmp_packfile(&tmpname, pack_tmp_name,
 					    written_list, nr_written,
-					    &pack_idx_opts, oid.hash);
+					    &pack_idx_opts, hash);
 
 			if (write_bitmap_index) {
-				strbuf_addf(&tmpname, "%s.bitmap", oid_to_hex(&oid));
+				strbuf_addf(&tmpname, "%s.bitmap", hash_to_hex(hash));
 
 				stop_progress(&progress_state);
 
 				bitmap_writer_show_progress(progress);
-				bitmap_writer_reuse_bitmaps(&to_pack);
 				bitmap_writer_select_commits(indexed_commits, indexed_commits_nr, -1);
 				bitmap_writer_build(&to_pack);
 				bitmap_writer_finish(written_list, nr_written,
@@ -953,7 +1264,7 @@ static void write_pack_file(void)
 
 			strbuf_release(&tmpname);
 			free(pack_tmp_name);
-			puts(oid_to_hex(&oid));
+			puts(hash_to_hex(hash));
 		}
 
 		/* mark written objects as written to previous pack */
@@ -1000,6 +1311,10 @@ static int have_duplicate_entry(const struct object_id *oid,
 {
 	struct object_entry *entry;
 
+	if (reuse_packfile_bitmap &&
+	    bitmap_walk_contains(bitmap_git, reuse_packfile_bitmap, oid))
+		return 1;
+
 	entry = packlist_find(&to_pack, oid);
 	if (!entry)
 		return 0;
@@ -1013,7 +1328,8 @@ static int have_duplicate_entry(const struct object_id *oid,
 	return 1;
 }
 
-static int want_found_object(int exclude, struct packed_git *p)
+static int want_found_object(const struct object_id *oid, int exclude,
+			     struct packed_git *p)
 {
 	if (exclude)
 		return 1;
@@ -1029,27 +1345,82 @@ static int want_found_object(int exclude, struct packed_git *p)
 	 * make sure no copy of this object appears in _any_ pack that makes us
 	 * to omit the object, so we need to check all the packs.
 	 *
-	 * We can however first check whether these options can possible matter;
+	 * We can however first check whether these options can possibly matter;
 	 * if they do not matter we know we want the object in generated pack.
 	 * Otherwise, we signal "-1" at the end to tell the caller that we do
 	 * not know either way, and it needs to check more packs.
 	 */
-	if (!ignore_packed_keep_on_disk &&
-	    !ignore_packed_keep_in_core &&
-	    (!local || !have_non_local_packs))
-		return 1;
 
+	/*
+	 * Objects in packs borrowed from elsewhere are discarded regardless of
+	 * if they appear in other packs that weren't borrowed.
+	 */
 	if (local && !p->pack_local)
 		return 0;
-	if (p->pack_local &&
-	    ((ignore_packed_keep_on_disk && p->pack_keep) ||
-	     (ignore_packed_keep_in_core && p->pack_keep_in_core)))
-		return 0;
+
+	/*
+	 * Then handle .keep first, as we have a fast(er) path there.
+	 */
+	if (ignore_packed_keep_on_disk || ignore_packed_keep_in_core) {
+		/*
+		 * Set the flags for the kept-pack cache to be the ones we want
+		 * to ignore.
+		 *
+		 * That is, if we are ignoring objects in on-disk keep packs,
+		 * then we want to search through the on-disk keep and ignore
+		 * the in-core ones.
+		 */
+		unsigned flags = 0;
+		if (ignore_packed_keep_on_disk)
+			flags |= ON_DISK_KEEP_PACKS;
+		if (ignore_packed_keep_in_core)
+			flags |= IN_CORE_KEEP_PACKS;
+
+		if (ignore_packed_keep_on_disk && p->pack_keep)
+			return 0;
+		if (ignore_packed_keep_in_core && p->pack_keep_in_core)
+			return 0;
+		if (has_object_kept_pack(oid, flags))
+			return 0;
+	}
+
+	/*
+	 * At this point we know definitively that either we don't care about
+	 * keep-packs, or the object is not in one. Keep checking other
+	 * conditions...
+	 */
+	if (!local || !have_non_local_packs)
+		return 1;
 
 	/* we don't know yet; keep looking for more packs */
 	return -1;
 }
 
+static int want_object_in_pack_one(struct packed_git *p,
+				   const struct object_id *oid,
+				   int exclude,
+				   struct packed_git **found_pack,
+				   off_t *found_offset)
+{
+	off_t offset;
+
+	if (p == *found_pack)
+		offset = *found_offset;
+	else
+		offset = find_pack_entry_one(oid->hash, p);
+
+	if (offset) {
+		if (!*found_pack) {
+			if (!is_pack_valid(p))
+				return -1;
+			*found_offset = offset;
+			*found_pack = p;
+		}
+		return want_found_object(oid, exclude, p);
+	}
+	return -1;
+}
+
 /*
  * Check whether we want the object in the pack (e.g., we do not want
  * objects found in non-local stores if the "--local" option was used).
@@ -1077,7 +1448,7 @@ static int want_object_in_pack(const struct object_id *oid,
 	 * are present we will determine the answer right now.
 	 */
 	if (*found_pack) {
-		want = want_found_object(exclude, *found_pack);
+		want = want_found_object(oid, exclude, *found_pack);
 		if (want != -1)
 			return want;
 	}
@@ -1085,50 +1456,38 @@ static int want_object_in_pack(const struct object_id *oid,
 	for (m = get_multi_pack_index(the_repository); m; m = m->next) {
 		struct pack_entry e;
 		if (fill_midx_entry(the_repository, oid, &e, m)) {
-			struct packed_git *p = e.p;
-			off_t offset;
-
-			if (p == *found_pack)
-				offset = *found_offset;
-			else
-				offset = find_pack_entry_one(oid->hash, p);
-
-			if (offset) {
-				if (!*found_pack) {
-					if (!is_pack_valid(p))
-						continue;
-					*found_offset = offset;
-					*found_pack = p;
-				}
-				want = want_found_object(exclude, p);
-				if (want != -1)
-					return want;
-			}
+			want = want_object_in_pack_one(e.p, oid, exclude, found_pack, found_offset);
+			if (want != -1)
+				return want;
 		}
 	}
 
 	list_for_each(pos, get_packed_git_mru(the_repository)) {
 		struct packed_git *p = list_entry(pos, struct packed_git, mru);
-		off_t offset;
+		want = want_object_in_pack_one(p, oid, exclude, found_pack, found_offset);
+		if (!exclude && want > 0)
+			list_move(&p->mru,
+				  get_packed_git_mru(the_repository));
+		if (want != -1)
+			return want;
+	}
 
-		if (p == *found_pack)
-			offset = *found_offset;
-		else
-			offset = find_pack_entry_one(oid->hash, p);
-
-		if (offset) {
-			if (!*found_pack) {
-				if (!is_pack_valid(p))
-					continue;
-				*found_offset = offset;
-				*found_pack = p;
+	if (uri_protocols.nr) {
+		struct configured_exclusion *ex =
+			oidmap_get(&configured_exclusions, oid);
+		int i;
+		const char *p;
+
+		if (ex) {
+			for (i = 0; i < uri_protocols.nr; i++) {
+				if (skip_prefix(ex->uri,
+						uri_protocols.items[i].string,
+						&p) &&
+				    *p == ':') {
+					oidset_insert(&excluded_by_config, oid);
+					return 0;
+				}
 			}
-			want = want_found_object(exclude, p);
-			if (!exclude && want > 0)
-				list_move(&p->mru,
-					  get_packed_git_mru(the_repository));
-			if (want != -1)
-				return want;
 		}
 	}
 
@@ -1441,7 +1800,7 @@ static void add_preferred_base(struct object_id *oid)
 		}
 	}
 
-	it = xcalloc(1, sizeof(*it));
+	CALLOC_ARRAY(it, 1);
 	it->next = pbase_tree;
 	pbase_tree = it;
 
@@ -1486,23 +1845,17 @@ static void cleanup_preferred_base(void)
  * deltify other objects against, in order to avoid
  * circular deltas.
  */
-static int can_reuse_delta(const unsigned char *base_sha1,
+static int can_reuse_delta(const struct object_id *base_oid,
 			   struct object_entry *delta,
 			   struct object_entry **base_out)
 {
 	struct object_entry *base;
-	struct object_id base_oid;
-
-	if (!base_sha1)
-		return 0;
-
-	oidread(&base_oid, base_sha1);
 
 	/*
 	 * First see if we're already sending the base (or it's explicitly in
 	 * our "excluded" list).
 	 */
-	base = packlist_find(&to_pack, &base_oid);
+	base = packlist_find(&to_pack, base_oid);
 	if (base) {
 		if (!in_same_island(&delta->idx.oid, &base->idx.oid))
 			return 0;
@@ -1515,9 +1868,9 @@ static int can_reuse_delta(const unsigned char *base_sha1,
 	 * even if it was buried too deep in history to make it into the
 	 * packing list.
 	 */
-	if (thin && bitmap_has_oid_in_uninteresting(bitmap_git, &base_oid)) {
+	if (thin && bitmap_has_oid_in_uninteresting(bitmap_git, base_oid)) {
 		if (use_delta_islands) {
-			if (!in_same_island(&delta->idx.oid, &base_oid))
+			if (!in_same_island(&delta->idx.oid, base_oid))
 				return 0;
 		}
 		*base_out = NULL;
@@ -1527,14 +1880,36 @@ static int can_reuse_delta(const unsigned char *base_sha1,
 	return 0;
 }
 
-static void check_object(struct object_entry *entry)
+static void prefetch_to_pack(uint32_t object_index_start) {
+	struct oid_array to_fetch = OID_ARRAY_INIT;
+	uint32_t i;
+
+	for (i = object_index_start; i < to_pack.nr_objects; i++) {
+		struct object_entry *entry = to_pack.objects + i;
+
+		if (!oid_object_info_extended(the_repository,
+					      &entry->idx.oid,
+					      NULL,
+					      OBJECT_INFO_FOR_PREFETCH))
+			continue;
+		oid_array_append(&to_fetch, &entry->idx.oid);
+	}
+	promisor_remote_get_direct(the_repository,
+				   to_fetch.oid, to_fetch.nr);
+	oid_array_clear(&to_fetch);
+}
+
+static void check_object(struct object_entry *entry, uint32_t object_index)
 {
 	unsigned long canonical_size;
+	enum object_type type;
+	struct object_info oi = {.typep = &type, .sizep = &canonical_size};
 
 	if (IN_PACK(entry)) {
 		struct packed_git *p = IN_PACK(entry);
 		struct pack_window *w_curs = NULL;
-		const unsigned char *base_ref = NULL;
+		int have_base = 0;
+		struct object_id base_ref;
 		struct object_entry *base_entry;
 		unsigned long used, used_0;
 		unsigned long avail;
@@ -1575,9 +1950,13 @@ static void check_object(struct object_entry *entry)
 			unuse_pack(&w_curs);
 			return;
 		case OBJ_REF_DELTA:
-			if (reuse_delta && !entry->preferred_base)
-				base_ref = use_pack(p, &w_curs,
-						entry->in_pack_offset + used, NULL);
+			if (reuse_delta && !entry->preferred_base) {
+				oidread(&base_ref,
+					use_pack(p, &w_curs,
+						 entry->in_pack_offset + used,
+						 NULL));
+				have_base = 1;
+			}
 			entry->in_pack_header_size = used + the_hash_algo->rawsz;
 			break;
 		case OBJ_OFS_DELTA:
@@ -1603,17 +1982,19 @@ static void check_object(struct object_entry *entry)
 				goto give_up;
 			}
 			if (reuse_delta && !entry->preferred_base) {
-				struct revindex_entry *revidx;
-				revidx = find_pack_revindex(p, ofs);
-				if (!revidx)
+				uint32_t pos;
+				if (offset_to_pack_pos(p, ofs, &pos) < 0)
 					goto give_up;
-				base_ref = nth_packed_object_sha1(p, revidx->nr);
+				if (!nth_packed_object_id(&base_ref, p,
+							  pack_pos_to_index(p, pos)))
+					have_base = 1;
 			}
 			entry->in_pack_header_size = used + used_0;
 			break;
 		}
 
-		if (can_reuse_delta(base_ref, entry, &base_entry)) {
+		if (have_base &&
+		    can_reuse_delta(&base_ref, entry, &base_entry)) {
 			oe_set_type(entry, entry->in_pack_type);
 			SET_SIZE(entry, in_pack_size); /* delta size */
 			SET_DELTA_SIZE(entry, in_pack_size);
@@ -1623,7 +2004,7 @@ static void check_object(struct object_entry *entry)
 				entry->delta_sibling_idx = base_entry->delta_child_idx;
 				SET_DELTA_CHILD(base_entry, entry);
 			} else {
-				SET_DELTA_EXT(entry, base_ref);
+				SET_DELTA_EXT(entry, &base_ref);
 			}
 
 			unuse_pack(&w_curs);
@@ -1656,8 +2037,18 @@ static void check_object(struct object_entry *entry)
 		unuse_pack(&w_curs);
 	}
 
-	oe_set_type(entry,
-		    oid_object_info(the_repository, &entry->idx.oid, &canonical_size));
+	if (oid_object_info_extended(the_repository, &entry->idx.oid, &oi,
+				     OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_LOOKUP_REPLACE) < 0) {
+		if (has_promisor_remote()) {
+			prefetch_to_pack(object_index);
+			if (oid_object_info_extended(the_repository, &entry->idx.oid, &oi,
+						     OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_LOOKUP_REPLACE) < 0)
+				type = -1;
+		} else {
+			type = -1;
+		}
+	}
+	oe_set_type(entry, type);
 	if (entry->type_valid) {
 		SET_SIZE(entry, canonical_size);
 	} else {
@@ -1870,14 +2261,14 @@ static void get_object_details(void)
 		progress_state = start_progress(_("Counting objects"),
 						to_pack.nr_objects);
 
-	sorted_by_offset = xcalloc(to_pack.nr_objects, sizeof(struct object_entry *));
+	CALLOC_ARRAY(sorted_by_offset, to_pack.nr_objects);
 	for (i = 0; i < to_pack.nr_objects; i++)
 		sorted_by_offset[i] = to_pack.objects + i;
 	QSORT(sorted_by_offset, to_pack.nr_objects, pack_offset_sort);
 
 	for (i = 0; i < to_pack.nr_objects; i++) {
 		struct object_entry *entry = sorted_by_offset[i];
-		check_object(entry);
+		check_object(entry, i);
 		if (entry->type_valid &&
 		    oe_size_greater_than(&to_pack, entry, big_file_threshold))
 			entry->no_try_delta = 1;
@@ -1980,6 +2371,26 @@ static pthread_mutex_t progress_mutex;
  * progress_mutex for protection.
  */
 
+static inline int oe_size_less_than(struct packing_data *pack,
+				    const struct object_entry *lhs,
+				    unsigned long rhs)
+{
+	if (lhs->size_valid)
+		return lhs->size_ < rhs;
+	if (rhs < pack->oe_size_limit) /* rhs < 2^x <= lhs ? */
+		return 0;
+	return oe_get_size_slow(pack, lhs) < rhs;
+}
+
+static inline void oe_set_tree_depth(struct packing_data *pack,
+				     struct object_entry *e,
+				     unsigned int tree_depth)
+{
+	if (!pack->tree_depth)
+		CALLOC_ARRAY(pack->tree_depth, pack->nr_alloc);
+	pack->tree_depth[e - pack->objects] = tree_depth;
+}
+
 /*
  * Return the size of the object without doing any delta
  * reconstruction (so non-deltas are true object sizes, but deltas
@@ -2202,7 +2613,7 @@ static void find_deltas(struct object_entry **list, unsigned *list_size,
 	struct unpacked *array;
 	unsigned long mem_usage = 0;
 
-	array = xcalloc(window, sizeof(struct unpacked));
+	CALLOC_ARRAY(array, window);
 
 	for (;;) {
 		struct object_entry *entry;
@@ -2439,7 +2850,7 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size,
 	if (progress > pack_to_stdout)
 		fprintf_ln(stderr, _("Delta compression using up to %d threads"),
 			   delta_search_threads);
-	p = xcalloc(delta_search_threads, sizeof(*p));
+	CALLOC_ARRAY(p, delta_search_threads);
 
 	/* Partition the work amongst work threads. */
 	for (i = 0; i < delta_search_threads; i++) {
@@ -2552,6 +2963,13 @@ static void ll_find_deltas(struct object_entry **list, unsigned list_size,
 	free(p);
 }
 
+static int obj_is_packed(const struct object_id *oid)
+{
+	return packlist_find(&to_pack, oid) ||
+		(reuse_packfile_bitmap &&
+		 bitmap_walk_contains(bitmap_git, reuse_packfile_bitmap, oid));
+}
+
 static void add_tag_chain(const struct object_id *oid)
 {
 	struct tag *tag;
@@ -2563,7 +2981,7 @@ static void add_tag_chain(const struct object_id *oid)
 	 * it was included via bitmaps, we would not have parsed it
 	 * previously).
 	 */
-	if (packlist_find(&to_pack, oid))
+	if (obj_is_packed(oid))
 		return;
 
 	tag = lookup_tag(the_repository, oid);
@@ -2581,13 +2999,11 @@ static void add_tag_chain(const struct object_id *oid)
 	}
 }
 
-static int add_ref_tag(const char *path, const struct object_id *oid, int flag, void *cb_data)
+static int add_ref_tag(const char *tag, const struct object_id *oid, int flag, void *cb_data)
 {
 	struct object_id peeled;
 
-	if (starts_with(path, "refs/tags/") && /* is a tag? */
-	    !peel_ref(path, &peeled)    && /* peelable? */
-	    packlist_find(&to_pack, &peeled))      /* object packed? */
+	if (!peel_iterated_oid(oid, &peeled) && obj_is_packed(&peeled))
 		add_tag_chain(oid);
 	return 0;
 }
@@ -2655,6 +3071,7 @@ static void prepare_pack(int window, int depth)
 
 	if (nr_deltas && n > 1) {
 		unsigned nr_done = 0;
+
 		if (progress)
 			progress_state = start_progress(_("Compressing objects"),
 							nr_deltas);
@@ -2699,6 +3116,10 @@ static int git_pack_config(const char *k, const char *v, void *cb)
 		use_bitmap_index_default = git_config_bool(k, v);
 		return 0;
 	}
+	if (!strcmp(k, "pack.allowpackreuse")) {
+		allow_pack_reuse = git_config_bool(k, v);
+		return 0;
+	}
 	if (!strcmp(k, "pack.threads")) {
 		delta_search_threads = git_config_int(k, v);
 		if (delta_search_threads < 0)
@@ -2717,9 +3138,241 @@ static int git_pack_config(const char *k, const char *v, void *cb)
 			    pack_idx_opts.version);
 		return 0;
 	}
+	if (!strcmp(k, "pack.writereverseindex")) {
+		if (git_config_bool(k, v))
+			pack_idx_opts.flags |= WRITE_REV;
+		else
+			pack_idx_opts.flags &= ~WRITE_REV;
+		return 0;
+	}
+	if (!strcmp(k, "uploadpack.blobpackfileuri")) {
+		struct configured_exclusion *ex = xmalloc(sizeof(*ex));
+		const char *oid_end, *pack_end;
+		/*
+		 * Stores the pack hash. This is not a true object ID, but is
+		 * of the same form.
+		 */
+		struct object_id pack_hash;
+
+		if (parse_oid_hex(v, &ex->e.oid, &oid_end) ||
+		    *oid_end != ' ' ||
+		    parse_oid_hex(oid_end + 1, &pack_hash, &pack_end) ||
+		    *pack_end != ' ')
+			die(_("value of uploadpack.blobpackfileuri must be "
+			      "of the form '<object-hash> <pack-hash> <uri>' (got '%s')"), v);
+		if (oidmap_get(&configured_exclusions, &ex->e.oid))
+			die(_("object already configured in another "
+			      "uploadpack.blobpackfileuri (got '%s')"), v);
+		ex->pack_hash_hex = xcalloc(1, pack_end - oid_end);
+		memcpy(ex->pack_hash_hex, oid_end + 1, pack_end - oid_end - 1);
+		ex->uri = xstrdup(pack_end + 1);
+		oidmap_put(&configured_exclusions, ex);
+	}
 	return git_default_config(k, v, cb);
 }
 
+/* Counters for trace2 output when in --stdin-packs mode. */
+static int stdin_packs_found_nr;
+static int stdin_packs_hints_nr;
+
+static int add_object_entry_from_pack(const struct object_id *oid,
+				      struct packed_git *p,
+				      uint32_t pos,
+				      void *_data)
+{
+	struct rev_info *revs = _data;
+	struct object_info oi = OBJECT_INFO_INIT;
+	off_t ofs;
+	enum object_type type;
+
+	display_progress(progress_state, ++nr_seen);
+
+	if (have_duplicate_entry(oid, 0))
+		return 0;
+
+	ofs = nth_packed_object_offset(p, pos);
+	if (!want_object_in_pack(oid, 0, &p, &ofs))
+		return 0;
+
+	oi.typep = &type;
+	if (packed_object_info(the_repository, p, ofs, &oi) < 0)
+		die(_("could not get type of object %s in pack %s"),
+		    oid_to_hex(oid), p->pack_name);
+	else if (type == OBJ_COMMIT) {
+		/*
+		 * commits in included packs are used as starting points for the
+		 * subsequent revision walk
+		 */
+		add_pending_oid(revs, NULL, oid, 0);
+	}
+
+	stdin_packs_found_nr++;
+
+	create_object_entry(oid, type, 0, 0, 0, p, ofs);
+
+	return 0;
+}
+
+static void show_commit_pack_hint(struct commit *commit, void *_data)
+{
+	/* nothing to do; commits don't have a namehash */
+}
+
+static void show_object_pack_hint(struct object *object, const char *name,
+				  void *_data)
+{
+	struct object_entry *oe = packlist_find(&to_pack, &object->oid);
+	if (!oe)
+		return;
+
+	/*
+	 * Our 'to_pack' list was constructed by iterating all objects packed in
+	 * included packs, and so doesn't have a non-zero hash field that you
+	 * would typically pick up during a reachability traversal.
+	 *
+	 * Make a best-effort attempt to fill in the ->hash and ->no_try_delta
+	 * here using a now in order to perhaps improve the delta selection
+	 * process.
+	 */
+	oe->hash = pack_name_hash(name);
+	oe->no_try_delta = name && no_try_delta(name);
+
+	stdin_packs_hints_nr++;
+}
+
+static int pack_mtime_cmp(const void *_a, const void *_b)
+{
+	struct packed_git *a = ((const struct string_list_item*)_a)->util;
+	struct packed_git *b = ((const struct string_list_item*)_b)->util;
+
+	/*
+	 * order packs by descending mtime so that objects are laid out
+	 * roughly as newest-to-oldest
+	 */
+	if (a->mtime < b->mtime)
+		return 1;
+	else if (b->mtime < a->mtime)
+		return -1;
+	else
+		return 0;
+}
+
+static void read_packs_list_from_stdin(void)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct string_list include_packs = STRING_LIST_INIT_DUP;
+	struct string_list exclude_packs = STRING_LIST_INIT_DUP;
+	struct string_list_item *item = NULL;
+
+	struct packed_git *p;
+	struct rev_info revs;
+
+	repo_init_revisions(the_repository, &revs, NULL);
+	/*
+	 * Use a revision walk to fill in the namehash of objects in the include
+	 * packs. To save time, we'll avoid traversing through objects that are
+	 * in excluded packs.
+	 *
+	 * That may cause us to avoid populating all of the namehash fields of
+	 * all included objects, but our goal is best-effort, since this is only
+	 * an optimization during delta selection.
+	 */
+	revs.no_kept_objects = 1;
+	revs.keep_pack_cache_flags |= IN_CORE_KEEP_PACKS;
+	revs.blob_objects = 1;
+	revs.tree_objects = 1;
+	revs.tag_objects = 1;
+	revs.ignore_missing_links = 1;
+
+	while (strbuf_getline(&buf, stdin) != EOF) {
+		if (!buf.len)
+			continue;
+
+		if (*buf.buf == '^')
+			string_list_append(&exclude_packs, buf.buf + 1);
+		else
+			string_list_append(&include_packs, buf.buf);
+
+		strbuf_reset(&buf);
+	}
+
+	string_list_sort(&include_packs);
+	string_list_sort(&exclude_packs);
+
+	for (p = get_all_packs(the_repository); p; p = p->next) {
+		const char *pack_name = pack_basename(p);
+
+		item = string_list_lookup(&include_packs, pack_name);
+		if (!item)
+			item = string_list_lookup(&exclude_packs, pack_name);
+
+		if (item)
+			item->util = p;
+	}
+
+	/*
+	 * 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;
+		if (!p)
+			die(_("could not find pack '%s'"), item->string);
+		p->pack_keep_in_core = 1;
+	}
+
+	/*
+	 * Order packs by ascending mtime; use QSORT directly to access the
+	 * string_list_item's ->util pointer, which string_list_sort() does not
+	 * provide.
+	 */
+	QSORT(include_packs.items, include_packs.nr, pack_mtime_cmp);
+
+	for_each_string_list_item(item, &include_packs) {
+		struct packed_git *p = item->util;
+		if (!p)
+			die(_("could not find pack '%s'"), item->string);
+		for_each_object_in_pack(p,
+					add_object_entry_from_pack,
+					&revs,
+					FOR_EACH_OBJECT_PACK_ORDER);
+	}
+
+	if (prepare_revision_walk(&revs))
+		die(_("revision walk setup failed"));
+	traverse_commit_list(&revs,
+			     show_commit_pack_hint,
+			     show_object_pack_hint,
+			     NULL);
+
+	trace2_data_intmax("pack-objects", the_repository, "stdin_packs_found",
+			   stdin_packs_found_nr);
+	trace2_data_intmax("pack-objects", the_repository, "stdin_packs_hints",
+			   stdin_packs_hints_nr);
+
+	strbuf_release(&buf);
+	string_list_clear(&include_packs, 0);
+	string_list_clear(&exclude_packs, 0);
+}
+
 static void read_object_list_from_stdin(void)
 {
 	char line[GIT_MAX_HEXSZ + 1 + PATH_MAX + 2];
@@ -2752,13 +3405,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);
@@ -2771,7 +3420,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;
@@ -2797,7 +3445,7 @@ static void show_object__ma_allow_any(struct object *obj, const char *name, void
 	 * Quietly ignore ALL missing objects.  This avoids problems with
 	 * staging them now and getting an odd error later.
 	 */
-	if (!has_object_file(&obj->oid))
+	if (!has_object(the_repository, &obj->oid, 0))
 		return;
 
 	show_object(obj, name, data);
@@ -2811,7 +3459,7 @@ static void show_object__ma_allow_promisor(struct object *obj, const char *name,
 	 * Quietly ignore EXPECTED missing objects.  This avoids problems with
 	 * staging them now and getting an odd error later.
 	 */
-	if (!has_object_file(&obj->oid) && is_promisor_object(&obj->oid))
+	if (!has_object(the_repository, &obj->oid, 0) && is_promisor_object(&obj->oid))
 		return;
 
 	show_object(obj, name, data);
@@ -2852,79 +3500,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)
-{
-	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_)
+static int add_object_in_unpacked_pack(const struct object_id *oid,
+				       struct packed_git *pack,
+				       uint32_t pos,
+				       void *_data)
 {
-	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_oid(&oid, p, i);
-			o = lookup_unknown_object(&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,
@@ -3003,6 +3595,7 @@ static void loosen_unused_packed_objects(void)
 {
 	struct packed_git *p;
 	uint32_t i;
+	uint32_t loosened_objects_nr = 0;
 	struct object_id oid;
 
 	for (p = get_all_packs(the_repository); p; p = p->next) {
@@ -3013,14 +3606,19 @@ static void loosen_unused_packed_objects(void)
 			die(_("cannot open pack index"));
 
 		for (i = 0; i < p->num_objects; i++) {
-			nth_packed_object_oid(&oid, p, i);
+			nth_packed_object_id(&oid, p, i);
 			if (!packlist_find(&to_pack, &oid) &&
 			    !has_sha1_pack_kept_or_nonlocal(&oid) &&
-			    !loosened_object_can_be_discarded(&oid, p->mtime))
+			    !loosened_object_can_be_discarded(&oid, p->mtime)) {
 				if (force_object_loose(&oid, p->mtime))
 					die(_("unable to force loose object"));
+				loosened_objects_nr++;
+			}
 		}
 	}
+
+	trace2_data_intmax("pack-objects", the_repository,
+			   "loosen_unused_packed_objects/loosened", loosened_objects_nr);
 }
 
 /*
@@ -3030,8 +3628,8 @@ static void loosen_unused_packed_objects(void)
  */
 static int pack_options_allow_reuse(void)
 {
-	return pack_to_stdout &&
-	       allow_ofs_delta &&
+	return allow_pack_reuse &&
+	       pack_to_stdout &&
 	       !ignore_packed_keep_on_disk &&
 	       !ignore_packed_keep_in_core &&
 	       (!local || !have_non_local_packs) &&
@@ -3040,7 +3638,7 @@ static int pack_options_allow_reuse(void)
 
 static int get_object_list_from_bitmap(struct rev_info *revs)
 {
-	if (!(bitmap_git = prepare_bitmap_walk(revs)))
+	if (!(bitmap_git = prepare_bitmap_walk(revs, &filter_options, 0)))
 		return -1;
 
 	if (pack_options_allow_reuse() &&
@@ -3048,13 +3646,15 @@ static int get_object_list_from_bitmap(struct rev_info *revs)
 			bitmap_git,
 			&reuse_packfile,
 			&reuse_packfile_objects,
-			&reuse_packfile_offset)) {
+			&reuse_packfile_bitmap)) {
 		assert(reuse_packfile_objects);
 		nr_result += reuse_packfile_objects;
-		display_progress(progress_state, nr_result);
+		nr_seen += reuse_packfile_objects;
+		display_progress(progress_state, nr_seen);
 	}
 
-	traverse_bitmap_commit_list(bitmap_git, &add_object_entry_from_bitmap);
+	traverse_bitmap_commit_list(bitmap_git, revs,
+				    &add_object_entry_from_bitmap);
 	return 0;
 }
 
@@ -3070,6 +3670,37 @@ static void record_recent_commit(struct commit *commit, void *data)
 	oid_array_append(&recent_objects, &commit->object.oid);
 }
 
+static int mark_bitmap_preferred_tip(const char *refname,
+				     const struct object_id *oid, int flags,
+				     void *_data)
+{
+	struct object_id peeled;
+	struct object *object;
+
+	if (!peel_iterated_oid(oid, &peeled))
+		oid = &peeled;
+
+	object = parse_object_or_die(oid, refname);
+	if (object->type == OBJ_COMMIT)
+		object->flags |= NEEDS_BITMAP;
+
+	return 0;
+}
+
+static void mark_bitmap_preferred_tips(void)
+{
+	struct string_list_item *item;
+	const struct string_list *preferred_tips;
+
+	preferred_tips = bitmap_preferred_tips(the_repository);
+	if (!preferred_tips)
+		return;
+
+	for_each_string_list_item(item, preferred_tips) {
+		for_each_ref_in(item->string, mark_bitmap_preferred_tip, NULL);
+	}
+}
+
 static void get_object_list(int ac, const char **av)
 {
 	struct rev_info revs;
@@ -3105,7 +3736,7 @@ static void get_object_list(int ac, const char **av)
 			if (starts_with(line, "--shallow ")) {
 				struct object_id oid;
 				if (get_oid_hex(line + 10, &oid))
-					die("not an SHA-1 '%s'", line + 10);
+					die("not an object name '%s'", line + 10);
 				register_shallow(the_repository, &oid);
 				use_bitmap_index = 0;
 				continue;
@@ -3124,6 +3755,9 @@ static void get_object_list(int ac, const char **av)
 	if (use_delta_islands)
 		load_delta_islands(the_repository, progress);
 
+	if (write_bitmap_index)
+		mark_bitmap_preferred_tips();
+
 	if (prepare_revision_walk(&revs))
 		die(_("revision walk setup failed"));
 	mark_edges_uninteresting(&revs, show_edge, sparse);
@@ -3219,9 +3853,10 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 	int use_internal_rev_list = 0;
 	int shallow = 0;
 	int all_progress_implied = 0;
-	struct argv_array rp = ARGV_ARRAY_INIT;
+	struct strvec rp = STRVEC_INIT;
 	int rev_list_unpacked = 0, rev_list_all = 0, rev_list_reflog = 0;
 	int rev_list_index = 0;
+	int stdin_packs = 0;
 	struct string_list keep_pack_list = STRING_LIST_INIT_NODUP;
 	struct option pack_objects_options[] = {
 		OPT_SET_INT('q', "quiet", &progress,
@@ -3233,9 +3868,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		OPT_BOOL(0, "all-progress-implied",
 			 &all_progress_implied,
 			 N_("similar to --all-progress when progress meter is shown")),
-		{ OPTION_CALLBACK, 0, "index-version", NULL, N_("<version>[,<offset>]"),
+		OPT_CALLBACK_F(0, "index-version", NULL, N_("<version>[,<offset>]"),
 		  N_("write the pack index file in the specified idx format version"),
-		  PARSE_OPT_NONEG, option_parse_index_version },
+		  PARSE_OPT_NONEG, option_parse_index_version),
 		OPT_MAGNITUDE(0, "max-pack-size", &pack_size_limit,
 			      N_("maximum size of each output pack file")),
 		OPT_BOOL(0, "local", &local,
@@ -3272,6 +3907,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		OPT_SET_INT_F(0, "indexed-objects", &rev_list_index,
 			      N_("include objects referred to by the index"),
 			      1, PARSE_OPT_NONEG),
+		OPT_BOOL(0, "stdin-packs", &stdin_packs,
+			 N_("read packs from stdin")),
 		OPT_BOOL(0, "stdout", &pack_to_stdout,
 			 N_("output pack to stdout")),
 		OPT_BOOL(0, "include-tag", &include_tag,
@@ -3280,9 +3917,9 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 			 N_("keep unreachable objects")),
 		OPT_BOOL(0, "pack-loose-unreachable", &pack_loose_unreachable,
 			 N_("pack loose unreachable objects")),
-		{ OPTION_CALLBACK, 0, "unpack-unreachable", NULL, N_("time"),
+		OPT_CALLBACK_F(0, "unpack-unreachable", NULL, N_("time"),
 		  N_("unpack unreachable objects newer than <time>"),
-		  PARSE_OPT_OPTARG, option_parse_unpack_unreachable },
+		  PARSE_OPT_OPTARG, option_parse_unpack_unreachable),
 		OPT_BOOL(0, "sparse", &sparse,
 			 N_("use the sparse reachability algorithm")),
 		OPT_BOOL(0, "thin", &thin,
@@ -3307,13 +3944,16 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 			      N_("write a bitmap index if possible"),
 			      WRITE_BITMAP_QUIET, PARSE_OPT_HIDDEN),
 		OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
-		{ OPTION_CALLBACK, 0, "missing", NULL, N_("action"),
+		OPT_CALLBACK_F(0, "missing", NULL, N_("action"),
 		  N_("handling for missing objects"), PARSE_OPT_NONEG,
-		  option_parse_missing_action },
+		  option_parse_missing_action),
 		OPT_BOOL(0, "exclude-promisor-objects", &exclude_promisor_objects,
 			 N_("do not pack objects in promisor packfiles")),
 		OPT_BOOL(0, "delta-islands", &use_delta_islands,
 			 N_("respect islands during delta compression")),
+		OPT_STRING_LIST(0, "uri-protocol", &uri_protocols,
+				N_("protocol"),
+				N_("exclude any configured uploadpack.blobpackfileuri with this protocol")),
 		OPT_END(),
 	};
 
@@ -3322,13 +3962,15 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 
 	read_replace_refs = 0;
 
-	sparse = git_env_bool("GIT_TEST_PACK_SPARSE", 0);
+	sparse = git_env_bool("GIT_TEST_PACK_SPARSE", -1);
 	prepare_repo_settings(the_repository);
-	if (!sparse && the_repository->settings.pack_use_sparse != -1)
+	if (sparse < 0)
 		sparse = the_repository->settings.pack_use_sparse;
 
 	reset_pack_idx_option(&pack_idx_opts);
 	git_config(git_pack_config, NULL);
+	if (git_env_bool(GIT_TEST_WRITE_REV_INDEX, 0))
+		pack_idx_opts.flags |= WRITE_REV;
 
 	progress = isatty(2);
 	argc = parse_options(argc, argv, prefix, pack_objects_options,
@@ -3341,6 +3983,8 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 	if (pack_to_stdout != !base_name || argc)
 		usage_with_options(pack_usage, pack_objects_options);
 
+	if (depth < 0)
+		depth = 0;
 	if (depth >= (1 << OE_DEPTH_BITS)) {
 		warning(_("delta chain depth %d is too deep, forcing %d"),
 			depth, (1 << OE_DEPTH_BITS) - 1);
@@ -3351,37 +3995,39 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 			(1U << OE_Z_DELTA_BITS) - 1);
 		cache_max_small_delta_size = (1U << OE_Z_DELTA_BITS) - 1;
 	}
+	if (window < 0)
+		window = 0;
 
-	argv_array_push(&rp, "pack-objects");
+	strvec_push(&rp, "pack-objects");
 	if (thin) {
 		use_internal_rev_list = 1;
-		argv_array_push(&rp, shallow
+		strvec_push(&rp, shallow
 				? "--objects-edge-aggressive"
 				: "--objects-edge");
 	} else
-		argv_array_push(&rp, "--objects");
+		strvec_push(&rp, "--objects");
 
 	if (rev_list_all) {
 		use_internal_rev_list = 1;
-		argv_array_push(&rp, "--all");
+		strvec_push(&rp, "--all");
 	}
 	if (rev_list_reflog) {
 		use_internal_rev_list = 1;
-		argv_array_push(&rp, "--reflog");
+		strvec_push(&rp, "--reflog");
 	}
 	if (rev_list_index) {
 		use_internal_rev_list = 1;
-		argv_array_push(&rp, "--indexed-objects");
+		strvec_push(&rp, "--indexed-objects");
 	}
-	if (rev_list_unpacked) {
+	if (rev_list_unpacked && !stdin_packs) {
 		use_internal_rev_list = 1;
-		argv_array_push(&rp, "--unpacked");
+		strvec_push(&rp, "--unpacked");
 	}
 
 	if (exclude_promisor_objects) {
 		use_internal_rev_list = 1;
 		fetch_if_missing = 0;
-		argv_array_push(&rp, "--exclude-promisor-objects");
+		strvec_push(&rp, "--exclude-promisor-objects");
 	}
 	if (unpack_unreachable || keep_unreachable || pack_loose_unreachable)
 		use_internal_rev_list = 1;
@@ -3418,9 +4064,13 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 	if (filter_options.choice) {
 		if (!pack_to_stdout)
 			die(_("cannot use --filter without --stdout"));
-		use_bitmap_index = 0;
+		if (stdin_packs)
+			die(_("cannot use --filter with --stdin-packs"));
 	}
 
+	if (stdin_packs && use_internal_rev_list)
+		die(_("cannot use internal rev list with --stdin-packs"));
+
 	/*
 	 * "soft" reasons not to use bitmaps - for on-disk repack by default we want
 	 *
@@ -3444,7 +4094,7 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 		write_bitmap_index = 0;
 
 	if (use_delta_islands)
-		argv_array_push(&rp, "--topo-order");
+		strvec_push(&rp, "--topo-order");
 
 	if (progress && all_progress_implied)
 		progress = 2;
@@ -3479,15 +4129,21 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 
 	if (progress)
 		progress_state = start_progress(_("Enumerating objects"), 0);
-	if (!use_internal_rev_list)
+	if (stdin_packs) {
+		/* avoids adding objects in excluded packs */
+		ignore_packed_keep_in_core = 1;
+		read_packs_list_from_stdin();
+		if (rev_list_unpacked)
+			add_unreachable_loose_objects();
+	} else if (!use_internal_rev_list)
 		read_object_list_from_stdin();
 	else {
-		get_object_list(rp.argc, rp.argv);
-		argv_array_clear(&rp);
+		get_object_list(rp.nr, rp.v);
+		strvec_clear(&rp);
 	}
 	cleanup_preferred_base();
 	if (include_tag && nr_result)
-		for_each_ref(add_ref_tag, NULL);
+		for_each_tag_ref(add_ref_tag, NULL);
 	stop_progress(&progress_state);
 	trace2_region_leave("pack-objects", "enumerate-objects",
 			    the_repository);
@@ -3503,13 +4159,16 @@ int cmd_pack_objects(int argc, const char **argv, const char *prefix)
 	}
 
 	trace2_region_enter("pack-objects", "write-pack-file", the_repository);
+	write_excluded_by_configs();
 	write_pack_file();
 	trace2_region_leave("pack-objects", "write-pack-file", the_repository);
 
 	if (progress)
 		fprintf_ln(stderr,
 			   _("Total %"PRIu32" (delta %"PRIu32"),"
-			     " reused %"PRIu32" (delta %"PRIu32")"),
-			   written, written_delta, reused, reused_delta);
+			     " reused %"PRIu32" (delta %"PRIu32"),"
+			     " pack-reused %"PRIu32),
+			   written, written_delta, reused, reused_delta,
+			   reuse_packfile_objects);
 	return 0;
 }
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index 178e3409b7..8bf5c0acad 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -20,7 +20,7 @@ static int load_all_packs, verbose, alt_odb;
 
 struct llist_item {
 	struct llist_item *next;
-	const struct object_id *oid;
+	struct object_id oid;
 };
 static struct llist {
 	struct llist_item *front;
@@ -95,10 +95,10 @@ static struct llist * llist_copy(struct llist *list)
 
 static inline struct llist_item *llist_insert(struct llist *list,
 					      struct llist_item *after,
-					      const struct object_id *oid)
+					      const unsigned char *oid)
 {
 	struct llist_item *new_item = llist_item_get();
-	new_item->oid = oid;
+	oidread(&new_item->oid, oid);
 	new_item->next = NULL;
 
 	if (after != NULL) {
@@ -118,7 +118,7 @@ static inline struct llist_item *llist_insert(struct llist *list,
 }
 
 static inline struct llist_item *llist_insert_back(struct llist *list,
-						   const struct object_id *oid)
+						   const unsigned char *oid)
 {
 	return llist_insert(list, list->back, oid);
 }
@@ -130,9 +130,9 @@ static inline struct llist_item *llist_insert_sorted_unique(struct llist *list,
 
 	l = (hint == NULL) ? list->front : hint;
 	while (l) {
-		int cmp = oidcmp(l->oid, oid);
+		int cmp = oidcmp(&l->oid, oid);
 		if (cmp > 0) { /* we insert before this entry */
-			return llist_insert(list, prev, oid);
+			return llist_insert(list, prev, oid->hash);
 		}
 		if (!cmp) { /* already exists */
 			return l;
@@ -141,11 +141,11 @@ static inline struct llist_item *llist_insert_sorted_unique(struct llist *list,
 		l = l->next;
 	}
 	/* insert at the end */
-	return llist_insert_back(list, oid);
+	return llist_insert_back(list, oid->hash);
 }
 
 /* returns a pointer to an item in front of sha1 */
-static inline struct llist_item * llist_sorted_remove(struct llist *list, const struct object_id *oid, struct llist_item *hint)
+static inline struct llist_item * llist_sorted_remove(struct llist *list, const unsigned char *oid, struct llist_item *hint)
 {
 	struct llist_item *prev, *l;
 
@@ -153,7 +153,7 @@ redo_from_start:
 	l = (hint == NULL) ? list->front : hint;
 	prev = NULL;
 	while (l) {
-		const int cmp = oidcmp(l->oid, oid);
+		const int cmp = hashcmp(l->oid.hash, oid);
 		if (cmp > 0) /* not in list, since sorted */
 			return prev;
 		if (!cmp) { /* found */
@@ -188,7 +188,7 @@ static void llist_sorted_difference_inplace(struct llist *A,
 	b = B->front;
 
 	while (b) {
-		hint = llist_sorted_remove(A, b->oid, hint);
+		hint = llist_sorted_remove(A, b->oid.hash, hint);
 		b = b->next;
 	}
 }
@@ -236,7 +236,7 @@ static struct pack_list * pack_list_difference(const struct pack_list *A,
 
 static void cmp_two_packs(struct pack_list *p1, struct pack_list *p2)
 {
-	unsigned long p1_off = 0, p2_off = 0, p1_step, p2_step;
+	size_t p1_off = 0, p2_off = 0, p1_step, p2_step;
 	const unsigned char *p1_base, *p2_base;
 	struct llist_item *p1_hint = NULL, *p2_hint = NULL;
 	const unsigned int hashsz = the_hash_algo->rawsz;
@@ -260,10 +260,10 @@ static void cmp_two_packs(struct pack_list *p1, struct pack_list *p2)
 		/* cmp ~ p1 - p2 */
 		if (cmp == 0) {
 			p1_hint = llist_sorted_remove(p1->unique_objects,
-					(const struct object_id *)(p1_base + p1_off),
+					p1_base + p1_off,
 					p1_hint);
 			p2_hint = llist_sorted_remove(p2->unique_objects,
-					(const struct object_id *)(p1_base + p1_off),
+					p1_base + p1_off,
 					p2_hint);
 			p1_off += p1_step;
 			p2_off += p2_step;
@@ -280,7 +280,7 @@ static void cmp_two_packs(struct pack_list *p1, struct pack_list *p2)
 static size_t sizeof_union(struct packed_git *p1, struct packed_git *p2)
 {
 	size_t ret = 0;
-	unsigned long p1_off = 0, p2_off = 0, p1_step, p2_step;
+	size_t p1_off = 0, p2_off = 0, p1_step, p2_step;
 	const unsigned char *p1_base, *p2_base;
 	const unsigned int hashsz = the_hash_algo->rawsz;
 
@@ -373,7 +373,7 @@ static void sort_pack_list(struct pack_list **pl)
 		return;
 
 	/* prepare an array of packed_list for easier sorting */
-	ary = xcalloc(n, sizeof(struct pack_list *));
+	CALLOC_ARRAY(ary, n);
 	for (n = 0, p = *pl; p; p = p->next)
 		ary[n++] = p;
 
@@ -455,7 +455,7 @@ static void load_all_objects(void)
 		l = pl->remaining_objects->front;
 		while (l) {
 			hint = llist_insert_sorted_unique(all_objects,
-							  l->oid, hint);
+							  &l->oid, hint);
 			l = l->next;
 		}
 		pl = pl->next;
@@ -473,6 +473,12 @@ static void cmp_local_packs(void)
 {
 	struct pack_list *subset, *pl = local_packs;
 
+	/* only one packfile */
+	if (!pl->next) {
+		llist_init(&pl->unique_objects);
+		return;
+	}
+
 	while ((subset = pl)) {
 		while ((subset = subset->next))
 			cmp_two_packs(pl, subset);
@@ -499,7 +505,7 @@ static void scan_alt_odb_packs(void)
 static struct pack_list * add_pack(struct packed_git *p)
 {
 	struct pack_list l;
-	unsigned long off = 0, step;
+	size_t off = 0, step;
 	const unsigned char *base;
 
 	if (!p->pack_local && !(alt_odb || verbose))
@@ -515,7 +521,7 @@ static struct pack_list * add_pack(struct packed_git *p)
 	base += 256 * 4 + ((p->index_version < 2) ? 4 : 8);
 	step = the_hash_algo->rawsz + ((p->index_version < 2) ? 4 : 0);
 	while (off < p->num_objects * step) {
-		llist_insert_back(l.remaining_objects, (const struct object_id *)(base + off));
+		llist_insert_back(l.remaining_objects, base + off);
 		off += step;
 	}
 	l.all_objects_size = l.remaining_objects->size;
@@ -554,6 +560,7 @@ static void load_all(void)
 int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
 {
 	int i;
+	int i_still_use_this = 0;
 	struct pack_list *min = NULL, *red, *pl;
 	struct llist *ignore;
 	struct object_id *oid;
@@ -580,12 +587,24 @@ int cmd_pack_redundant(int argc, const char **argv, const char *prefix)
 			alt_odb = 1;
 			continue;
 		}
+		if (!strcmp(arg, "--i-still-use-this")) {
+			i_still_use_this = 1;
+			continue;
+		}
 		if (*arg == '-')
 			usage(pack_redundant_usage);
 		else
 			break;
 	}
 
+	if (!i_still_use_this) {
+		fputs(_("'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"), stderr);
+	}
+
 	if (load_all_packs)
 		load_all();
 	else
diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index 3059e525b8..822ffff51f 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -5,13 +5,8 @@
 
 static void flush_current_id(int patchlen, struct object_id *id, struct object_id *result)
 {
-	char name[GIT_MAX_HEXSZ + 1];
-
-	if (!patchlen)
-		return;
-
-	memcpy(name, oid_to_hex(id), the_hash_algo->hexsz + 1);
-	printf("%s %s\n", oid_to_hex(result), name);
+	if (patchlen)
+		printf("%s %s\n", oid_to_hex(result), oid_to_hex(id));
 }
 
 static int remove_space(char *line)
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index 48c5e78e33..b7b9281a8c 100644
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -1,54 +1,12 @@
 #include "builtin.h"
-#include "cache.h"
-#include "progress.h"
 #include "parse-options.h"
-#include "packfile.h"
-#include "object-store.h"
+#include "prune-packed.h"
 
 static const char * const prune_packed_usage[] = {
 	N_("git prune-packed [-n | --dry-run] [-q | --quiet]"),
 	NULL
 };
 
-static struct progress *progress;
-
-static int prune_subdir(unsigned int nr, const char *path, void *data)
-{
-	int *opts = data;
-	display_progress(progress, nr + 1);
-	if (!(*opts & PRUNE_PACKED_DRY_RUN))
-		rmdir(path);
-	return 0;
-}
-
-static int prune_object(const struct object_id *oid, const char *path,
-			 void *data)
-{
-	int *opts = data;
-
-	if (!has_object_pack(oid))
-		return 0;
-
-	if (*opts & PRUNE_PACKED_DRY_RUN)
-		printf("rm -f %s\n", path);
-	else
-		unlink_or_warn(path);
-	return 0;
-}
-
-void prune_packed_objects(int opts)
-{
-	if (opts & PRUNE_PACKED_VERBOSE)
-		progress = start_delayed_progress(_("Removing duplicate objects"), 256);
-
-	for_each_loose_file_in_objdir(get_object_directory(),
-				      prune_object, NULL, prune_subdir, &opts);
-
-	/* Ensure we show 100% before finishing progress */
-	display_progress(progress, 256);
-	stop_progress(&progress);
-}
-
 int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 {
 	int opts = isatty(2) ? PRUNE_PACKED_VERBOSE : 0;
diff --git a/builtin/prune.c b/builtin/prune.c
index 2b76872ad2..02c6ab7cba 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -6,7 +6,9 @@
 #include "reachable.h"
 #include "parse-options.h"
 #include "progress.h"
+#include "prune-packed.h"
 #include "object-store.h"
+#include "shallow.h"
 
 static const char * const prune_usage[] = {
 	N_("git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"),
diff --git a/builtin/pull.c b/builtin/pull.c
index d25ff13a60..b311ea6b9d 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -12,9 +12,10 @@
 #include "parse-options.h"
 #include "exec-cmd.h"
 #include "run-command.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "remote.h"
 #include "dir.h"
+#include "rebase.h"
 #include "refs.h"
 #include "refspec.h"
 #include "revision.h"
@@ -26,15 +27,6 @@
 #include "commit-reach.h"
 #include "sequencer.h"
 
-enum rebase_type {
-	REBASE_INVALID = -1,
-	REBASE_FALSE = 0,
-	REBASE_TRUE,
-	REBASE_PRESERVE,
-	REBASE_MERGES,
-	REBASE_INTERACTIVE
-};
-
 /**
  * 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
@@ -45,22 +37,9 @@ enum rebase_type {
 static enum rebase_type parse_config_rebase(const char *key, const char *value,
 		int fatal)
 {
-	int v = git_parse_maybe_bool(value);
-
-	if (!v)
-		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;
-	/*
-	 * Please update _git_config() in git-completion.bash when you
-	 * add new rebase modes.
-	 */
+	enum rebase_type v = rebase_parse_value(value);
+	if (v != REBASE_INVALID)
+		return v;
 
 	if (fatal)
 		die(_("Invalid value for %s: %s"), key, value);
@@ -107,8 +86,9 @@ static char *opt_ff;
 static char *opt_verify_signatures;
 static int opt_autostash = -1;
 static int config_autostash;
-static struct argv_array opt_strategies = ARGV_ARRAY_INIT;
-static struct argv_array opt_strategy_opts = ARGV_ARRAY_INIT;
+static int check_trust_level = 1;
+static struct strvec opt_strategies = STRVEC_INIT;
+static struct strvec opt_strategy_opts = STRVEC_INIT;
 static char *opt_gpg_sign;
 static int opt_allow_unrelated_histories;
 
@@ -130,6 +110,7 @@ static char *opt_ipv4;
 static char *opt_ipv6;
 static int opt_show_forced_updates = -1;
 static char *set_upstream;
+static struct strvec opt_fetch = STRVEC_INIT;
 
 static struct option pull_options[] = {
 	/* Shared options */
@@ -137,17 +118,17 @@ static struct option pull_options[] = {
 	OPT_PASSTHRU(0, "progress", &opt_progress, NULL,
 		N_("force progress reporting"),
 		PARSE_OPT_NOARG),
-	{ OPTION_CALLBACK, 0, "recurse-submodules",
+	OPT_CALLBACK_F(0, "recurse-submodules",
 		   &recurse_submodules, N_("on-demand"),
 		   N_("control for recursive fetching of submodules"),
-		   PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules },
+		   PARSE_OPT_OPTARG, option_fetch_parse_recurse_submodules),
 
 	/* Options passed to git-merge or git-rebase */
 	OPT_GROUP(N_("Options related to merging")),
-	{ OPTION_CALLBACK, 'r', "rebase", &opt_rebase,
-	  "(false|true|merges|preserve|interactive)",
-	  N_("incorporate changes by rebasing rather than merging"),
-	  PARSE_OPT_OPTARG, parse_opt_rebase },
+	OPT_CALLBACK_F('r', "rebase", &opt_rebase,
+		"(false|true|merges|preserve|interactive)",
+		N_("incorporate changes by rebasing rather than merging"),
+		PARSE_OPT_OPTARG, parse_opt_rebase),
 	OPT_PASSTHRU('n', NULL, &opt_diffstat, NULL,
 		N_("do not show a diffstat at the end of the merge"),
 		PARSE_OPT_NOARG | PARSE_OPT_NONEG),
@@ -161,7 +142,7 @@ static struct option pull_options[] = {
 		N_("add (at most <n>) entries from shortlog to merge commit message"),
 		PARSE_OPT_OPTARG),
 	OPT_PASSTHRU(0, "signoff", &opt_signoff, NULL,
-		N_("add Signed-off-by:"),
+		N_("add a Signed-off-by trailer"),
 		PARSE_OPT_OPTARG),
 	OPT_PASSTHRU(0, "squash", &opt_squash, NULL,
 		N_("create a single commit instead of doing a merge"),
@@ -183,7 +164,7 @@ static struct option pull_options[] = {
 		N_("verify that the named commit has a valid GPG signature"),
 		PARSE_OPT_NOARG),
 	OPT_BOOL(0, "autostash", &opt_autostash,
-		N_("automatically stash/stash pop before and after rebase")),
+		N_("automatically stash/stash pop before and after")),
 	OPT_PASSTHRU_ARGV('s', "strategy", &opt_strategies, N_("strategy"),
 		N_("merge strategy to use"),
 		0),
@@ -227,6 +208,15 @@ static struct option pull_options[] = {
 	OPT_PASSTHRU(0, "depth", &opt_depth, N_("depth"),
 		N_("deepen history of shallow clone"),
 		0),
+	OPT_PASSTHRU_ARGV(0, "shallow-since", &opt_fetch, N_("time"),
+		N_("deepen history of shallow repository based on time"),
+		0),
+	OPT_PASSTHRU_ARGV(0, "shallow-exclude", &opt_fetch, N_("revision"),
+		N_("deepen history of shallow clone, excluding rev"),
+		0),
+	OPT_PASSTHRU_ARGV(0, "deepen", &opt_fetch, N_("n"),
+		N_("deepen history of shallow clone"),
+		0),
 	OPT_PASSTHRU(0, "unshallow", &opt_unshallow, NULL,
 		N_("convert to a complete repository"),
 		PARSE_OPT_NONEG | PARSE_OPT_NOARG),
@@ -236,12 +226,19 @@ static struct option pull_options[] = {
 	OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"),
 		N_("specify fetch refmap"),
 		PARSE_OPT_NONEG),
+	OPT_PASSTHRU_ARGV('o', "server-option", &opt_fetch,
+		N_("server-specific"),
+		N_("option to transmit"),
+		0),
 	OPT_PASSTHRU('4',  "ipv4", &opt_ipv4, NULL,
 		N_("use IPv4 addresses only"),
 		PARSE_OPT_NOARG),
 	OPT_PASSTHRU('6',  "ipv6", &opt_ipv6, NULL,
 		N_("use IPv6 addresses only"),
 		PARSE_OPT_NOARG),
+	OPT_PASSTHRU_ARGV(0, "negotiation-tip", &opt_fetch, N_("revision"),
+		N_("report that we have only objects reachable from this object"),
+		0),
 	OPT_BOOL(0, "show-forced-updates", &opt_show_forced_updates,
 		 N_("check for forced-updates on all updated branches")),
 	OPT_PASSTHRU(0, "set-upstream", &set_upstream, NULL,
@@ -254,25 +251,25 @@ static struct option pull_options[] = {
 /**
  * Pushes "-q" or "-v" switches into arr to match the opt_verbosity level.
  */
-static void argv_push_verbosity(struct argv_array *arr)
+static void argv_push_verbosity(struct strvec *arr)
 {
 	int verbosity;
 
 	for (verbosity = opt_verbosity; verbosity > 0; verbosity--)
-		argv_array_push(arr, "-v");
+		strvec_push(arr, "-v");
 
 	for (verbosity = opt_verbosity; verbosity < 0; verbosity++)
-		argv_array_push(arr, "-q");
+		strvec_push(arr, "-q");
 }
 
 /**
  * Pushes "-f" switches into arr to match the opt_force level.
  */
-static void argv_push_force(struct argv_array *arr)
+static void argv_push_force(struct strvec *arr)
 {
 	int force = opt_force;
 	while (force-- > 0)
-		argv_array_push(arr, "-f");
+		strvec_push(arr, "-f");
 }
 
 /**
@@ -327,7 +324,7 @@ static const char *config_get_ff(void)
  * looks for the value of "pull.rebase". If both configuration keys do not
  * exist, returns REBASE_FALSE.
  */
-static enum rebase_type config_get_rebase(void)
+static enum rebase_type config_get_rebase(int *rebase_unspecified)
 {
 	struct branch *curr_branch = branch_get("HEAD");
 	const char *value;
@@ -347,6 +344,8 @@ static enum rebase_type config_get_rebase(void)
 	if (!git_config_get_value("pull.rebase", &value))
 		return parse_config_rebase("pull.rebase", value, 1);
 
+	*rebase_unspecified = 1;
+
 	return REBASE_FALSE;
 }
 
@@ -355,6 +354,8 @@ static enum rebase_type config_get_rebase(void)
  */
 static int git_pull_config(const char *var, const char *value, void *cb)
 {
+	int status;
+
 	if (!strcmp(var, "rebase.autostash")) {
 		config_autostash = git_config_bool(var, value);
 		return 0;
@@ -362,7 +363,14 @@ static int git_pull_config(const char *var, const char *value, void *cb)
 		recurse_submodules = git_config_bool(var, value) ?
 			RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
 		return 0;
+	} else if (!strcmp(var, "gpg.mintrustlevel")) {
+		check_trust_level = 0;
 	}
+
+	status = git_gpg_config(var, value, cb);
+	if (status)
+		return status;
+
 	return git_default_config(var, value, cb);
 }
 
@@ -502,74 +510,75 @@ static void parse_repo_refspecs(int argc, const char **argv, const char **repo,
  */
 static int run_fetch(const char *repo, const char **refspecs)
 {
-	struct argv_array args = ARGV_ARRAY_INIT;
+	struct strvec args = STRVEC_INIT;
 	int ret;
 
-	argv_array_pushl(&args, "fetch", "--update-head-ok", NULL);
+	strvec_pushl(&args, "fetch", "--update-head-ok", NULL);
 
 	/* Shared options */
 	argv_push_verbosity(&args);
 	if (opt_progress)
-		argv_array_push(&args, opt_progress);
+		strvec_push(&args, opt_progress);
 
 	/* Options passed to git-fetch */
 	if (opt_all)
-		argv_array_push(&args, opt_all);
+		strvec_push(&args, opt_all);
 	if (opt_append)
-		argv_array_push(&args, opt_append);
+		strvec_push(&args, opt_append);
 	if (opt_upload_pack)
-		argv_array_push(&args, opt_upload_pack);
+		strvec_push(&args, opt_upload_pack);
 	argv_push_force(&args);
 	if (opt_tags)
-		argv_array_push(&args, opt_tags);
+		strvec_push(&args, opt_tags);
 	if (opt_prune)
-		argv_array_push(&args, opt_prune);
+		strvec_push(&args, opt_prune);
 	if (recurse_submodules != RECURSE_SUBMODULES_DEFAULT)
 		switch (recurse_submodules) {
 		case RECURSE_SUBMODULES_ON:
-			argv_array_push(&args, "--recurse-submodules=on");
+			strvec_push(&args, "--recurse-submodules=on");
 			break;
 		case RECURSE_SUBMODULES_OFF:
-			argv_array_push(&args, "--recurse-submodules=no");
+			strvec_push(&args, "--recurse-submodules=no");
 			break;
 		case RECURSE_SUBMODULES_ON_DEMAND:
-			argv_array_push(&args, "--recurse-submodules=on-demand");
+			strvec_push(&args, "--recurse-submodules=on-demand");
 			break;
 		default:
 			BUG("submodule recursion option not understood");
 		}
 	if (max_children)
-		argv_array_push(&args, max_children);
+		strvec_push(&args, max_children);
 	if (opt_dry_run)
-		argv_array_push(&args, "--dry-run");
+		strvec_push(&args, "--dry-run");
 	if (opt_keep)
-		argv_array_push(&args, opt_keep);
+		strvec_push(&args, opt_keep);
 	if (opt_depth)
-		argv_array_push(&args, opt_depth);
+		strvec_push(&args, opt_depth);
 	if (opt_unshallow)
-		argv_array_push(&args, opt_unshallow);
+		strvec_push(&args, opt_unshallow);
 	if (opt_update_shallow)
-		argv_array_push(&args, opt_update_shallow);
+		strvec_push(&args, opt_update_shallow);
 	if (opt_refmap)
-		argv_array_push(&args, opt_refmap);
+		strvec_push(&args, opt_refmap);
 	if (opt_ipv4)
-		argv_array_push(&args, opt_ipv4);
+		strvec_push(&args, opt_ipv4);
 	if (opt_ipv6)
-		argv_array_push(&args, opt_ipv6);
+		strvec_push(&args, opt_ipv6);
 	if (opt_show_forced_updates > 0)
-		argv_array_push(&args, "--show-forced-updates");
+		strvec_push(&args, "--show-forced-updates");
 	else if (opt_show_forced_updates == 0)
-		argv_array_push(&args, "--no-show-forced-updates");
+		strvec_push(&args, "--no-show-forced-updates");
 	if (set_upstream)
-		argv_array_push(&args, set_upstream);
+		strvec_push(&args, set_upstream);
+	strvec_pushv(&args, opt_fetch.v);
 
 	if (repo) {
-		argv_array_push(&args, repo);
-		argv_array_pushv(&args, refspecs);
+		strvec_push(&args, repo);
+		strvec_pushv(&args, refspecs);
 	} else if (*refspecs)
 		BUG("refspecs without repo?");
-	ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
-	argv_array_clear(&args);
+	ret = run_command_v_opt(args.v, RUN_GIT_CMD);
+	strvec_clear(&args);
 	return ret;
 }
 
@@ -587,7 +596,8 @@ static int pull_into_void(const struct object_id *merge_head,
 			die(_("unable to access commit %s"),
 			    oid_to_hex(merge_head));
 
-		verify_merge_signature(commit, opt_verbosity);
+		verify_merge_signature(commit, opt_verbosity,
+				       check_trust_level);
 	}
 
 	/*
@@ -613,8 +623,8 @@ static int rebase_submodules(void)
 
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
-	argv_array_pushl(&cp.args, "submodule", "update",
-				   "--recursive", "--rebase", NULL);
+	strvec_pushl(&cp.args, "submodule", "update",
+		     "--recursive", "--rebase", NULL);
 	argv_push_verbosity(&cp.args);
 
 	return run_command(&cp);
@@ -626,8 +636,8 @@ static int update_submodules(void)
 
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
-	argv_array_pushl(&cp.args, "submodule", "update",
-				   "--recursive", "--checkout", NULL);
+	strvec_pushl(&cp.args, "submodule", "update",
+		     "--recursive", "--checkout", NULL);
 	argv_push_verbosity(&cp.args);
 
 	return run_command(&cp);
@@ -639,44 +649,48 @@ static int update_submodules(void)
 static int run_merge(void)
 {
 	int ret;
-	struct argv_array args = ARGV_ARRAY_INIT;
+	struct strvec args = STRVEC_INIT;
 
-	argv_array_pushl(&args, "merge", NULL);
+	strvec_pushl(&args, "merge", NULL);
 
 	/* Shared options */
 	argv_push_verbosity(&args);
 	if (opt_progress)
-		argv_array_push(&args, opt_progress);
+		strvec_push(&args, opt_progress);
 
 	/* Options passed to git-merge */
 	if (opt_diffstat)
-		argv_array_push(&args, opt_diffstat);
+		strvec_push(&args, opt_diffstat);
 	if (opt_log)
-		argv_array_push(&args, opt_log);
+		strvec_push(&args, opt_log);
 	if (opt_signoff)
-		argv_array_push(&args, opt_signoff);
+		strvec_push(&args, opt_signoff);
 	if (opt_squash)
-		argv_array_push(&args, opt_squash);
+		strvec_push(&args, opt_squash);
 	if (opt_commit)
-		argv_array_push(&args, opt_commit);
+		strvec_push(&args, opt_commit);
 	if (opt_edit)
-		argv_array_push(&args, opt_edit);
+		strvec_push(&args, opt_edit);
 	if (cleanup_arg)
-		argv_array_pushf(&args, "--cleanup=%s", cleanup_arg);
+		strvec_pushf(&args, "--cleanup=%s", cleanup_arg);
 	if (opt_ff)
-		argv_array_push(&args, opt_ff);
+		strvec_push(&args, opt_ff);
 	if (opt_verify_signatures)
-		argv_array_push(&args, opt_verify_signatures);
-	argv_array_pushv(&args, opt_strategies.argv);
-	argv_array_pushv(&args, opt_strategy_opts.argv);
+		strvec_push(&args, opt_verify_signatures);
+	strvec_pushv(&args, opt_strategies.v);
+	strvec_pushv(&args, opt_strategy_opts.v);
 	if (opt_gpg_sign)
-		argv_array_push(&args, opt_gpg_sign);
+		strvec_push(&args, opt_gpg_sign);
+	if (opt_autostash == 0)
+		strvec_push(&args, "--no-autostash");
+	else if (opt_autostash == 1)
+		strvec_push(&args, "--autostash");
 	if (opt_allow_unrelated_histories > 0)
-		argv_array_push(&args, "--allow-unrelated-histories");
+		strvec_push(&args, "--allow-unrelated-histories");
 
-	argv_array_push(&args, "FETCH_HEAD");
-	ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
-	argv_array_clear(&args);
+	strvec_push(&args, "FETCH_HEAD");
+	ret = run_command_v_opt(args.v, RUN_GIT_CMD);
+	strvec_clear(&args);
 	return ret;
 }
 
@@ -773,8 +787,8 @@ static int get_rebase_fork_point(struct object_id *fork_point, const char *repo,
 	if (!remote_branch)
 		return -1;
 
-	argv_array_pushl(&cp.args, "merge-base", "--fork-point",
-			remote_branch, curr_branch->name, NULL);
+	strvec_pushl(&cp.args, "merge-base", "--fork-point",
+		     remote_branch, curr_branch->name, NULL);
 	cp.no_stdin = 1;
 	cp.no_stderr = 1;
 	cp.git_cmd = 1;
@@ -825,67 +839,124 @@ static int get_octopus_merge_base(struct object_id *merge_base,
 
 /**
  * Given the current HEAD oid, the merge head returned from git-fetch and the
- * fork point calculated by get_rebase_fork_point(), runs git-rebase with the
- * appropriate arguments and returns its exit status.
+ * fork point calculated by get_rebase_fork_point(), compute the <newbase> and
+ * <upstream> arguments to use for the upcoming git-rebase invocation.
  */
-static int run_rebase(const struct object_id *curr_head,
+static int get_rebase_newbase_and_upstream(struct object_id *newbase,
+		struct object_id *upstream,
+		const struct object_id *curr_head,
 		const struct object_id *merge_head,
 		const struct object_id *fork_point)
 {
-	int ret;
 	struct object_id oct_merge_base;
-	struct argv_array args = ARGV_ARRAY_INIT;
 
 	if (!get_octopus_merge_base(&oct_merge_base, curr_head, merge_head, fork_point))
 		if (!is_null_oid(fork_point) && oideq(&oct_merge_base, fork_point))
 			fork_point = NULL;
 
-	argv_array_push(&args, "rebase");
+	if (fork_point && !is_null_oid(fork_point))
+		oidcpy(upstream, fork_point);
+	else
+		oidcpy(upstream, merge_head);
+
+	oidcpy(newbase, merge_head);
+
+	return 0;
+}
+
+/**
+ * Given the <newbase> and <upstream> calculated by
+ * get_rebase_newbase_and_upstream(), runs git-rebase with the
+ * appropriate arguments and returns its exit status.
+ */
+static int run_rebase(const struct object_id *newbase,
+		const struct object_id *upstream)
+{
+	int ret;
+	struct strvec args = STRVEC_INIT;
+
+	strvec_push(&args, "rebase");
 
 	/* Shared options */
 	argv_push_verbosity(&args);
 
 	/* Options passed to git-rebase */
 	if (opt_rebase == REBASE_MERGES)
-		argv_array_push(&args, "--rebase-merges");
+		strvec_push(&args, "--rebase-merges");
 	else if (opt_rebase == REBASE_PRESERVE)
-		argv_array_push(&args, "--preserve-merges");
+		strvec_push(&args, "--preserve-merges");
 	else if (opt_rebase == REBASE_INTERACTIVE)
-		argv_array_push(&args, "--interactive");
+		strvec_push(&args, "--interactive");
 	if (opt_diffstat)
-		argv_array_push(&args, opt_diffstat);
-	argv_array_pushv(&args, opt_strategies.argv);
-	argv_array_pushv(&args, opt_strategy_opts.argv);
+		strvec_push(&args, opt_diffstat);
+	strvec_pushv(&args, opt_strategies.v);
+	strvec_pushv(&args, opt_strategy_opts.v);
 	if (opt_gpg_sign)
-		argv_array_push(&args, opt_gpg_sign);
+		strvec_push(&args, opt_gpg_sign);
+	if (opt_signoff)
+		strvec_push(&args, opt_signoff);
 	if (opt_autostash == 0)
-		argv_array_push(&args, "--no-autostash");
+		strvec_push(&args, "--no-autostash");
 	else if (opt_autostash == 1)
-		argv_array_push(&args, "--autostash");
+		strvec_push(&args, "--autostash");
 	if (opt_verify_signatures &&
 	    !strcmp(opt_verify_signatures, "--verify-signatures"))
 		warning(_("ignoring --verify-signatures for rebase"));
 
-	argv_array_push(&args, "--onto");
-	argv_array_push(&args, oid_to_hex(merge_head));
+	strvec_push(&args, "--onto");
+	strvec_push(&args, oid_to_hex(newbase));
 
-	if (fork_point && !is_null_oid(fork_point))
-		argv_array_push(&args, oid_to_hex(fork_point));
-	else
-		argv_array_push(&args, oid_to_hex(merge_head));
+	strvec_push(&args, oid_to_hex(upstream));
 
-	ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
-	argv_array_clear(&args);
+	ret = run_command_v_opt(args.v, RUN_GIT_CMD);
+	strvec_clear(&args);
 	return ret;
 }
 
+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);
+	ret = repo_is_descendant_of(the_repository, merge_head, list);
+	free_commit_list(list);
+	return ret;
+}
+
+static void show_advice_pull_non_ff(void)
+{
+	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 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"));
+}
+
 int cmd_pull(int argc, const char **argv, const char *prefix)
 {
 	const char *repo, **refspecs;
 	struct oid_array merge_heads = OID_ARRAY_INIT;
 	struct object_id orig_head, curr_head;
 	struct object_id rebase_fork_point;
-	int autostash;
+	int rebase_unspecified = 0;
+	int can_ff;
 
 	if (!getenv("GIT_REFLOG_ACTION"))
 		set_reflog_message(argc, argv);
@@ -903,11 +974,25 @@ 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();
+		opt_rebase = config_get_rebase(&rebase_unspecified);
 
 	if (read_cache_unmerged())
 		die_resolve_conflict("pull");
@@ -918,11 +1003,8 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
 	if (get_oid("HEAD", &orig_head))
 		oidclr(&orig_head);
 
-	if (!opt_rebase && opt_autostash != -1)
-		die(_("--[no-]autostash option is only valid with --rebase."));
-
-	autostash = config_autostash;
 	if (opt_rebase) {
+		int autostash = config_autostash;
 		if (opt_autostash != -1)
 			autostash = opt_autostash;
 
@@ -981,31 +1063,47 @@ 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);
+
+	/* ff-only takes precedence over rebase */
+	if (opt_ff && !strcmp(opt_ff, "--ff-only")) {
+		if (!can_ff)
+			die_ff_impossible();
+		opt_rebase = REBASE_FALSE;
+	}
+	/* If no action specified and we can't fast forward, then warn. */
+	if (!opt_ff && rebase_unspecified && !can_ff) {
+		show_advice_pull_non_ff();
+		die(_("Need to specify how to reconcile divergent branches."));
+	}
 
 	if (opt_rebase) {
 		int ret = 0;
+
+		struct object_id newbase;
+		struct object_id upstream;
+		get_rebase_newbase_and_upstream(&newbase, &upstream, &curr_head,
+						merge_heads.oid, &rebase_fork_point);
+
 		if ((recurse_submodules == RECURSE_SUBMODULES_ON ||
 		     recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) &&
-		    submodule_touches_in_range(the_repository, &rebase_fork_point, &curr_head))
+		    submodule_touches_in_range(the_repository, &upstream, &curr_head))
 			die(_("cannot rebase with locally recorded submodule modifications"));
-		if (!autostash) {
-			struct commit_list *list = NULL;
-			struct commit *merge_head, *head;
-
-			head = lookup_commit_reference(the_repository,
-						       &orig_head);
-			commit_list_insert(head, &list);
-			merge_head = lookup_commit_reference(the_repository,
-							     &merge_heads.oid[0]);
-			if (is_descendant_of(merge_head, list)) {
-				/* we can fast-forward this without invoking rebase */
-				opt_ff = "--ff-only";
-				ret = run_merge();
-			}
+
+		if (can_ff) {
+			/* we can fast-forward this without invoking rebase */
+			opt_ff = "--ff-only";
+			ret = run_merge();
+		} else {
+			ret = run_rebase(&newbase, &upstream);
 		}
-		ret = run_rebase(&curr_head, merge_heads.oid, &rebase_fork_point);
 
 		if (!ret && (recurse_submodules == RECURSE_SUBMODULES_ON ||
 			     recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND))
diff --git a/builtin/push.c b/builtin/push.c
index 843f5b22a2..e8b10a9b7e 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -61,40 +61,41 @@ static struct refspec rs = REFSPEC_INIT_PUSH;
 
 static struct string_list push_options_config = STRING_LIST_INIT_DUP;
 
-static const char *map_refspec(const char *ref,
-			       struct remote *remote, struct ref *local_refs)
+static void refspec_append_mapped(struct refspec *refspec, const char *ref,
+				  struct remote *remote, struct ref *local_refs)
 {
+	const char *branch_name;
 	struct ref *matched = NULL;
 
 	/* Does "ref" uniquely name our ref? */
-	if (count_refspec_match(ref, local_refs, &matched) != 1)
-		return ref;
+	if (count_refspec_match(ref, local_refs, &matched) != 1) {
+		refspec_append(refspec, ref);
+		return;
+	}
 
 	if (remote->push.nr) {
 		struct refspec_item query;
 		memset(&query, 0, sizeof(struct refspec_item));
 		query.src = matched->name;
 		if (!query_refspecs(&remote->push, &query) && query.dst) {
-			struct strbuf buf = STRBUF_INIT;
-			strbuf_addf(&buf, "%s%s:%s",
-				    query.force ? "+" : "",
-				    query.src, query.dst);
-			return strbuf_detach(&buf, NULL);
+			refspec_appendf(refspec, "%s%s:%s",
+					query.force ? "+" : "",
+					query.src, query.dst);
+			return;
 		}
 	}
 
 	if (push_default == PUSH_DEFAULT_UPSTREAM &&
-	    starts_with(matched->name, "refs/heads/")) {
-		struct branch *branch = branch_get(matched->name + 11);
+	    skip_prefix(matched->name, "refs/heads/", &branch_name)) {
+		struct branch *branch = branch_get(branch_name);
 		if (branch->merge_nr == 1 && branch->merge[0]->src) {
-			struct strbuf buf = STRBUF_INIT;
-			strbuf_addf(&buf, "%s:%s",
-				    ref, branch->merge[0]->src);
-			return strbuf_detach(&buf, NULL);
+			refspec_appendf(refspec, "%s:%s",
+					ref, branch->merge[0]->src);
+			return;
 		}
 	}
 
-	return ref;
+	refspec_append(refspec, ref);
 }
 
 static void set_refspecs(const char **refs, int nr, const char *repo)
@@ -106,30 +107,26 @@ static void set_refspecs(const char **refs, int nr, const char *repo)
 	for (i = 0; i < nr; i++) {
 		const char *ref = refs[i];
 		if (!strcmp("tag", ref)) {
-			struct strbuf tagref = STRBUF_INIT;
 			if (nr <= ++i)
 				die(_("tag shorthand without <tag>"));
 			ref = refs[i];
 			if (deleterefs)
-				strbuf_addf(&tagref, ":refs/tags/%s", ref);
+				refspec_appendf(&rs, ":refs/tags/%s", ref);
 			else
-				strbuf_addf(&tagref, "refs/tags/%s", ref);
-			ref = strbuf_detach(&tagref, NULL);
+				refspec_appendf(&rs, "refs/tags/%s", ref);
 		} else if (deleterefs) {
-			struct strbuf delref = STRBUF_INIT;
-			if (strchr(ref, ':'))
+			if (strchr(ref, ':') || !*ref)
 				die(_("--delete only accepts plain target ref names"));
-			strbuf_addf(&delref, ":%s", ref);
-			ref = strbuf_detach(&delref, NULL);
+			refspec_appendf(&rs, ":%s", ref);
 		} else if (!strchr(ref, ':')) {
 			if (!remote) {
 				/* lazily grab remote and local_refs */
 				remote = remote_get(repo);
 				local_refs = get_local_heads();
 			}
-			ref = map_refspec(ref, remote, local_refs);
-		}
-		refspec_append(&rs, ref);
+			refspec_append_mapped(&rs, ref, remote, local_refs);
+		} else
+			refspec_append(&rs, ref);
 	}
 }
 
@@ -188,88 +185,73 @@ static const char message_detached_head_die[] =
 	   "\n"
 	   "    git push %s HEAD:<name-of-remote-branch>\n");
 
-static void setup_push_upstream(struct remote *remote, struct branch *branch,
-				int triangular, int simple)
+static const char *get_upstream_ref(struct branch *branch, const char *remote_name)
 {
-	struct strbuf refspec = STRBUF_INIT;
-
-	if (!branch)
-		die(_(message_detached_head_die), remote->name);
 	if (!branch->merge_nr || !branch->merge || !branch->remote_name)
 		die(_("The current branch %s has no upstream branch.\n"
 		    "To push the current branch and set the remote as upstream, use\n"
 		    "\n"
 		    "    git push --set-upstream %s %s\n"),
 		    branch->name,
-		    remote->name,
+		    remote_name,
 		    branch->name);
 	if (branch->merge_nr != 1)
 		die(_("The current branch %s has multiple upstream branches, "
 		    "refusing to push."), branch->name);
-	if (triangular)
-		die(_("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."),
-		    remote->name, branch->name);
-
-	if (simple) {
-		/* Additional safety */
-		if (strcmp(branch->refname, branch->merge[0]->src))
-			die_push_simple(branch, remote);
-	}
-
-	strbuf_addf(&refspec, "%s:%s", branch->refname, branch->merge[0]->src);
-	refspec_append(&rs, refspec.buf);
-}
-
-static void setup_push_current(struct remote *remote, struct branch *branch)
-{
-	struct strbuf refspec = STRBUF_INIT;
-
-	if (!branch)
-		die(_(message_detached_head_die), remote->name);
-	strbuf_addf(&refspec, "%s:%s", branch->refname, branch->refname);
-	refspec_append(&rs, refspec.buf);
-}
 
-static int is_workflow_triangular(struct remote *remote)
-{
-	struct remote *fetch_remote = remote_get(NULL);
-	return (fetch_remote && fetch_remote != remote);
+	return branch->merge[0]->src;
 }
 
 static void setup_default_push_refspecs(struct remote *remote)
 {
-	struct branch *branch = branch_get(NULL);
-	int triangular = is_workflow_triangular(remote);
+	struct branch *branch;
+	const char *dst;
+	int same_remote;
 
 	switch (push_default) {
-	default:
 	case PUSH_DEFAULT_MATCHING:
 		refspec_append(&rs, ":");
+		return;
+
+	case PUSH_DEFAULT_NOTHING:
+		die(_("You didn't specify any refspecs to push, and "
+		    "push.default is \"nothing\"."));
+		return;
+	default:
 		break;
+	}
 
+	branch = branch_get(NULL);
+	if (!branch)
+		die(_(message_detached_head_die), remote->name);
+
+	dst = branch->refname;
+	same_remote = !strcmp(remote->name, remote_for_branch(branch, NULL));
+
+	switch (push_default) {
+	default:
 	case PUSH_DEFAULT_UNSPECIFIED:
 	case PUSH_DEFAULT_SIMPLE:
-		if (triangular)
-			setup_push_current(remote, branch);
-		else
-			setup_push_upstream(remote, branch, triangular, 1);
+		if (!same_remote)
+			break;
+		if (strcmp(branch->refname, get_upstream_ref(branch, remote->name)))
+			die_push_simple(branch, remote);
 		break;
 
 	case PUSH_DEFAULT_UPSTREAM:
-		setup_push_upstream(remote, branch, triangular, 0);
+		if (!same_remote)
+			die(_("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."),
+			    remote->name, branch->name);
+		dst = get_upstream_ref(branch, remote->name);
 		break;
 
 	case PUSH_DEFAULT_CURRENT:
-		setup_push_current(remote, branch);
-		break;
-
-	case PUSH_DEFAULT_NOTHING:
-		die(_("You didn't specify any refspecs to push, and "
-		    "push.default is \"nothing\"."));
 		break;
 	}
+
+	refspec_appendf(&rs, "%s:%s", branch->refname, dst);
 }
 
 static const char message_advice_pull_before_push[] =
@@ -299,6 +281,12 @@ static const char message_advice_ref_needs_force[] =
 	   "or update a remote ref to make it point at a non-commit object,\n"
 	   "without using the '--force' option.\n");
 
+static const char message_advice_ref_needs_update[] =
+	N_("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");
+
 static void advise_pull_before_push(void)
 {
 	if (!advice_push_non_ff_current || !advice_push_update_rejected)
@@ -334,11 +322,19 @@ static void advise_ref_needs_force(void)
 	advise(_(message_advice_ref_needs_force));
 }
 
+static void advise_ref_needs_update(void)
+{
+	if (!advice_push_ref_needs_update || !advice_push_update_rejected)
+		return;
+	advise(_(message_advice_ref_needs_update));
+}
+
 static int push_with_options(struct transport *transport, struct refspec *rs,
 			     int flags)
 {
 	int err;
 	unsigned int reject_reasons;
+	char *anon_url = transport_anonymize_url(transport->url);
 
 	transport_set_verbosity(transport, verbosity, progress);
 	transport->family = family;
@@ -356,18 +352,19 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
 	}
 
 	if (verbosity > 0)
-		fprintf(stderr, _("Pushing to %s\n"), transport->url);
+		fprintf(stderr, _("Pushing to %s\n"), anon_url);
 	trace2_region_enter("push", "transport_push", the_repository);
 	err = transport_push(the_repository, transport,
 			     rs, flags, &reject_reasons);
 	trace2_region_leave("push", "transport_push", the_repository);
 	if (err != 0) {
 		fprintf(stderr, "%s", push_get_color(PUSH_COLOR_ERROR));
-		error(_("failed to push some refs to '%s'"), transport->url);
+		error(_("failed to push some refs to '%s'"), anon_url);
 		fprintf(stderr, "%s", push_get_color(PUSH_COLOR_RESET));
 	}
 
 	err |= transport_disconnect(transport);
+	free(anon_url);
 	if (!err)
 		return 0;
 
@@ -381,12 +378,14 @@ static int push_with_options(struct transport *transport, struct refspec *rs,
 		advise_ref_fetch_first();
 	} else if (reject_reasons & REJECT_NEEDS_FORCE) {
 		advise_ref_needs_force();
+	} else if (reject_reasons & REJECT_REF_NEEDS_UPDATE) {
+		advise_ref_needs_update();
 	}
 
 	return 1;
 }
 
-static int do_push(const char *repo, int flags,
+static int do_push(int flags,
 		   const struct string_list *push_options,
 		   struct remote *remote)
 {
@@ -433,10 +432,8 @@ static int option_parse_recurse_submodules(const struct option *opt,
 
 	if (unset)
 		*recurse_submodules = RECURSE_SUBMODULES_OFF;
-	else if (arg)
-		*recurse_submodules = parse_push_recurse_submodules_arg(opt->long_name, arg);
 	else
-		die("%s missing parameter", opt->long_name);
+		*recurse_submodules = parse_push_recurse_submodules_arg(opt->long_name, arg);
 
 	return 0;
 }
@@ -519,6 +516,12 @@ static int git_push_config(const char *k, const char *v, void *cb)
 		if (!v)
 			return config_error_nonbool(k);
 		return color_parse(v, push_colors[slot]);
+	} else if (!strcmp(k, "push.useforceifincludes")) {
+		if (git_config_bool(k, v))
+			*flags |= TRANSPORT_PUSH_FORCE_IF_INCLUDES;
+		else
+			*flags &= ~TRANSPORT_PUSH_FORCE_IF_INCLUDES;
+		return 0;
 	}
 
 	return git_default_config(k, v, NULL);
@@ -547,13 +550,14 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 		OPT_BIT('n' , "dry-run", &flags, N_("dry run"), TRANSPORT_PUSH_DRY_RUN),
 		OPT_BIT( 0,  "porcelain", &flags, N_("machine-readable output"), TRANSPORT_PUSH_PORCELAIN),
 		OPT_BIT('f', "force", &flags, N_("force updates"), TRANSPORT_PUSH_FORCE),
-		{ OPTION_CALLBACK,
-		  0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
-		  N_("require old value of ref to be at this value"),
-		  PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option },
-		{ OPTION_CALLBACK, 0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)",
-			N_("control recursive pushing of submodules"),
-			PARSE_OPT_OPTARG, option_parse_recurse_submodules },
+		OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
+			       N_("require old value of ref to be at this value"),
+			       PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP, parseopt_push_cas_option),
+		OPT_BIT(0, TRANS_OPT_FORCE_IF_INCLUDES, &flags,
+			N_("require remote updates to be integrated locally"),
+			TRANSPORT_PUSH_FORCE_IF_INCLUDES),
+		OPT_CALLBACK(0, "recurse-submodules", &recurse_submodules, "(check|on-demand|no)",
+			     N_("control recursive pushing of submodules"), option_parse_recurse_submodules),
 		OPT_BOOL_F( 0 , "thin", &thin, N_("use thin pack"), PARSE_OPT_NOCOMPLETE),
 		OPT_STRING( 0 , "receive-pack", &receivepack, "receive-pack", N_("receive pack program")),
 		OPT_STRING( 0 , "exec", &receivepack, "receive-pack", N_("receive pack program")),
@@ -565,9 +569,8 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 		OPT_BIT(0, "no-verify", &flags, N_("bypass pre-push hook"), TRANSPORT_PUSH_NO_HOOK),
 		OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"),
 			TRANSPORT_PUSH_FOLLOW_TAGS),
-		{ OPTION_CALLBACK,
-		  0, "signed", &push_cert, "(yes|no|if-asked)", N_("GPG sign the push"),
-		  PARSE_OPT_OPTARG, option_parse_push_signed },
+		OPT_CALLBACK_F(0, "signed", &push_cert, "(yes|no|if-asked)", N_("GPG sign the push"),
+				PARSE_OPT_OPTARG, option_parse_push_signed),
 		OPT_BIT(0, "atomic", &flags, N_("request atomic transaction on remote side"), TRANSPORT_PUSH_ATOMIC),
 		OPT_STRING_LIST('o', "push-option", &push_options_cmdline, N_("server-specific"), N_("option to transmit")),
 		OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
@@ -637,11 +640,14 @@ int cmd_push(int argc, const char **argv, const char *prefix)
 	if ((flags & TRANSPORT_PUSH_ALL) && (flags & TRANSPORT_PUSH_MIRROR))
 		die(_("--all and --mirror are incompatible"));
 
+	if (!is_empty_cas(&cas) && (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES))
+		cas.use_force_if_includes = 1;
+
 	for_each_string_list_item(item, push_options)
 		if (strchr(item->string, '\n'))
 			die(_("push options must not have new line characters"));
 
-	rc = do_push(repo, flags, push_options, remote);
+	rc = do_push(flags, push_options, remote);
 	string_list_clear(&push_options_cmdline, 0);
 	string_list_clear(&push_options_config, 0);
 	if (rc == -1)
diff --git a/builtin/range-diff.c b/builtin/range-diff.c
index 9202e75544..50318849d6 100644
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@ -3,6 +3,7 @@
 #include "parse-options.h"
 #include "range-diff.h"
 #include "config.h"
+#include "revision.h"
 
 static const char * const builtin_range_diff_usage[] = {
 N_("git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"),
@@ -13,14 +14,27 @@ NULL
 
 int cmd_range_diff(int argc, const char **argv, const char *prefix)
 {
-	int creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
 	struct diff_options diffopt = { NULL };
-	int simple_color = -1;
+	struct strvec other_arg = STRVEC_INIT;
+	struct range_diff_options range_diff_opts = {
+		.creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT,
+		.diffopt = &diffopt,
+		.other_arg = &other_arg
+	};
+	int simple_color = -1, left_only = 0, right_only = 0;
 	struct option range_diff_options[] = {
-		OPT_INTEGER(0, "creation-factor", &creation_factor,
-			    N_("Percentage by which creation is weighted")),
+		OPT_INTEGER(0, "creation-factor",
+			    &range_diff_opts.creation_factor,
+			    N_("percentage by which creation is weighted")),
 		OPT_BOOL(0, "no-dual-color", &simple_color,
 			    N_("use simple diff colors")),
+		OPT_PASSTHRU_ARGV(0, "notes", &other_arg,
+				  N_("notes"), N_("passed to 'git log'"),
+				  PARSE_OPT_OPTARG),
+		OPT_BOOL(0, "left-only", &left_only,
+			 N_("only emit output related to the first range")),
+		OPT_BOOL(0, "right-only", &right_only,
+			 N_("only emit output related to the second range")),
 		OPT_END()
 	};
 	struct option *options;
@@ -42,12 +56,12 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
 		diffopt.use_color = 1;
 
 	if (argc == 2) {
-		if (!strstr(argv[0], ".."))
-			die(_("no .. in range: '%s'"), argv[0]);
+		if (!is_range_diff_range(argv[0]))
+			die(_("not a commit range: '%s'"), argv[0]);
 		strbuf_addstr(&range1, argv[0]);
 
-		if (!strstr(argv[1], ".."))
-			die(_("no .. in range: '%s'"), argv[1]);
+		if (!is_range_diff_range(argv[1]))
+			die(_("not a commit range: '%s'"), argv[1]);
 		strbuf_addstr(&range2, argv[1]);
 	} else if (argc == 3) {
 		strbuf_addf(&range1, "%s..%s", argv[0], argv[1]);
@@ -77,9 +91,12 @@ int cmd_range_diff(int argc, const char **argv, const char *prefix)
 	}
 	FREE_AND_NULL(options);
 
-	res = show_range_diff(range1.buf, range2.buf, creation_factor,
-			      simple_color < 1, &diffopt);
+	range_diff_opts.dual_color = simple_color < 1;
+	range_diff_opts.left_only = left_only;
+	range_diff_opts.right_only = right_only;
+	res = show_range_diff(range1.buf, range2.buf, &range_diff_opts);
 
+	strvec_clear(&other_arg);
 	strbuf_release(&range1);
 	strbuf_release(&range2);
 
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index ca5e655d2f..485e7b0479 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -120,9 +120,9 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
 	int prefix_set = 0;
 	struct lock_file lock_file = LOCK_INIT;
 	const struct option read_tree_options[] = {
-		{ OPTION_CALLBACK, 0, "index-output", NULL, N_("file"),
+		OPT_CALLBACK_F(0, "index-output", NULL, N_("file"),
 		  N_("write resulting index to <file>"),
-		  PARSE_OPT_NONEG, index_output_cb },
+		  PARSE_OPT_NONEG, index_output_cb),
 		OPT_BOOL(0, "empty", &read_empty,
 			    N_("only empty the index")),
 		OPT__VERBOSE(&opts.verbose_update, N_("be verbose")),
@@ -140,10 +140,10 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
 		  PARSE_OPT_NONEG },
 		OPT_BOOL('u', NULL, &opts.update,
 			 N_("update working tree with merge result")),
-		{ OPTION_CALLBACK, 0, "exclude-per-directory", &opts,
+		OPT_CALLBACK_F(0, "exclude-per-directory", &opts,
 		  N_("gitignore"),
 		  N_("allow explicitly ignored files to be overwritten"),
-		  PARSE_OPT_NONEG, exclude_per_directory_cb },
+		  PARSE_OPT_NONEG, exclude_per_directory_cb),
 		OPT_BOOL('i', NULL, &opts.index_only,
 			 N_("don't check the working tree after merging")),
 		OPT__DRY_RUN(&opts.dry_run, N_("don't update the index or the work tree")),
@@ -151,9 +151,9 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
 			 N_("skip applying sparse checkout filter")),
 		OPT_BOOL(0, "debug-unpack", &opts.debug_unpack,
 			 N_("debug unpack-trees")),
-		{ OPTION_CALLBACK, 0, "recurse-submodules", NULL,
+		OPT_CALLBACK_F(0, "recurse-submodules", NULL,
 			    "checkout", "control recursive updating of submodules",
-			    PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },
+			    PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater),
 		OPT__QUIET(&opts.quiet, N_("suppress feedback messages")),
 		OPT_END()
 	};
@@ -185,7 +185,7 @@ int cmd_read_tree(int argc, const char **argv, const char *cmd_prefix)
 
 	if (opts.reset || opts.merge || opts.prefix) {
 		if (read_cache_unmerged() && (opts.prefix || opts.merge))
-			die("You need to resolve your current index first");
+			die(_("You need to resolve your current index first"));
 		stage = opts.merge = 1;
 	}
 	resolve_undo_clear();
diff --git a/builtin/rebase.c b/builtin/rebase.c
index 4a20582e72..eb01f4d790 100644
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -8,7 +8,7 @@
 #include "builtin.h"
 #include "run-command.h"
 #include "exec-cmd.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "dir.h"
 #include "packfile.h"
 #include "refs.h"
@@ -27,6 +27,9 @@
 #include "branch.h"
 #include "sequencer.h"
 #include "rebase-interactive.h"
+#include "reset.h"
+
+#define DEFAULT_REFLOG_ACTION "rebase"
 
 static char const * const builtin_rebase_usage[] = {
 	N_("git rebase [-i] [options] [--exec <cmd>] "
@@ -44,14 +47,22 @@ static GIT_PATH_FUNC(merge_dir, "rebase-merge")
 
 enum rebase_type {
 	REBASE_UNSPECIFIED = -1,
-	REBASE_AM,
+	REBASE_APPLY,
 	REBASE_MERGE,
-	REBASE_INTERACTIVE,
 	REBASE_PRESERVE_MERGES
 };
 
+enum empty_type {
+	EMPTY_UNSPECIFIED = -1,
+	EMPTY_DROP,
+	EMPTY_KEEP,
+	EMPTY_ASK
+};
+
 struct rebase_options {
 	enum rebase_type type;
+	enum empty_type empty;
+	const char *default_backend;
 	const char *state_dir;
 	struct commit *upstream;
 	const char *upstream_name;
@@ -73,7 +84,7 @@ struct rebase_options {
 		REBASE_FORCE = 1<<3,
 		REBASE_INTERACTIVE_EXPLICIT = 1<<4,
 	} flags;
-	struct argv_array git_am_opts;
+	struct strvec git_am_opts;
 	const char *action;
 	int signoff;
 	int allow_rerere_autoupdate;
@@ -81,20 +92,27 @@ struct rebase_options {
 	int autosquash;
 	char *gpg_sign_opt;
 	int autostash;
+	int committer_date_is_author_date;
+	int ignore_date;
 	char *cmd;
 	int allow_empty_message;
 	int rebase_merges, rebase_cousins;
 	char *strategy, *strategy_opts;
 	struct strbuf git_format_patch_opt;
 	int reschedule_failed_exec;
-	int use_legacy_rebase;
+	int reapply_cherry_picks;
+	int fork_point;
 };
 
 #define REBASE_OPTIONS_INIT {			  	\
 		.type = REBASE_UNSPECIFIED,	  	\
+		.empty = EMPTY_UNSPECIFIED,	  	\
+		.keep_empty = 1,			\
+		.default_backend = "merge",	  	\
 		.flags = REBASE_NO_QUIET, 		\
-		.git_am_opts = ARGV_ARRAY_INIT,		\
-		.git_format_patch_opt = STRBUF_INIT	\
+		.git_am_opts = STRVEC_INIT,		\
+		.git_format_patch_opt = STRBUF_INIT,	\
+		.fork_point = -1,			\
 	}
 
 static struct replay_opts get_replay_opts(const struct rebase_options *opts)
@@ -102,6 +120,7 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
 	struct replay_opts replay = REPLAY_OPTS_INIT;
 
 	replay.action = REPLAY_INTERACTIVE_REBASE;
+	replay.strategy = NULL;
 	sequencer_init_config(&replay);
 
 	replay.signoff = opts->signoff;
@@ -110,13 +129,30 @@ static struct replay_opts get_replay_opts(const struct rebase_options *opts)
 		replay.allow_rerere_auto = opts->allow_rerere_autoupdate;
 	replay.allow_empty = 1;
 	replay.allow_empty_message = opts->allow_empty_message;
+	replay.drop_redundant_commits = (opts->empty == EMPTY_DROP);
+	replay.keep_redundant_commits = (opts->empty == EMPTY_KEEP);
+	replay.quiet = !(opts->flags & REBASE_NO_QUIET);
 	replay.verbose = opts->flags & REBASE_VERBOSE;
 	replay.reschedule_failed_exec = opts->reschedule_failed_exec;
+	replay.committer_date_is_author_date =
+					opts->committer_date_is_author_date;
+	replay.ignore_date = opts->ignore_date;
 	replay.gpg_sign = xstrdup_or_null(opts->gpg_sign_opt);
-	replay.strategy = opts->strategy;
+	if (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;
+	}
+
 	if (opts->strategy_opts)
 		parse_strategy_opts(&replay, opts->strategy_opts);
 
+	if (opts->squash_onto) {
+		oidcpy(&replay.squash_onto, opts->squash_onto);
+		replay.have_squash_onto = 1;
+	}
+
 	return replay;
 }
 
@@ -241,21 +277,16 @@ static int edit_todo_file(unsigned flags)
 }
 
 static int get_revision_ranges(struct commit *upstream, struct commit *onto,
-			       const char **head_hash,
-			       char **revisions, char **shortrevisions)
+			       struct object_id *orig_head, char **revisions,
+			       char **shortrevisions)
 {
 	struct commit *base_rev = upstream ? upstream : onto;
 	const char *shorthead;
-	struct object_id orig_head;
 
-	if (get_oid("HEAD", &orig_head))
-		return error(_("no HEAD?"));
-
-	*head_hash = find_unique_abbrev(&orig_head, GIT_MAX_HEXSZ);
 	*revisions = xstrfmt("%s...%s", oid_to_hex(&base_rev->object.oid),
-						   *head_hash);
+			     oid_to_hex(orig_head));
 
-	shorthead = find_unique_abbrev(&orig_head, DEFAULT_ABBREV);
+	shorthead = find_unique_abbrev(orig_head, DEFAULT_ABBREV);
 
 	if (upstream) {
 		const char *shortrev;
@@ -271,7 +302,8 @@ static int get_revision_ranges(struct commit *upstream, struct commit *onto,
 }
 
 static int init_basic_state(struct replay_opts *opts, const char *head_name,
-			    struct commit *onto, const char *orig_head)
+			    struct commit *onto,
+			    const struct object_id *orig_head)
 {
 	FILE *interactive;
 
@@ -302,24 +334,19 @@ static void split_exec_commands(const char *cmd, struct string_list *commands)
 static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
 {
 	int ret;
-	const char *head_hash = NULL;
 	char *revisions = NULL, *shortrevisions = NULL;
-	struct argv_array make_script_args = ARGV_ARRAY_INIT;
+	struct strvec make_script_args = STRVEC_INIT;
 	struct todo_list todo_list = TODO_LIST_INIT;
 	struct replay_opts replay = get_replay_opts(opts);
 	struct string_list commands = STRING_LIST_INIT_DUP;
 
-	if (prepare_branch_to_be_rebased(the_repository, &replay,
-					 opts->switch_to))
-		return -1;
-
-	if (get_revision_ranges(opts->upstream, opts->onto, &head_hash,
+	if (get_revision_ranges(opts->upstream, opts->onto, &opts->orig_head,
 				&revisions, &shortrevisions))
 		return -1;
 
 	if (init_basic_state(&replay,
 			     opts->head_name ? opts->head_name : "detached HEAD",
-			     opts->onto, head_hash)) {
+			     opts->onto, &opts->orig_head)) {
 		free(revisions);
 		free(shortrevisions);
 
@@ -330,13 +357,13 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
 		write_file(path_squash_onto(), "%s\n",
 			   oid_to_hex(opts->squash_onto));
 
-	argv_array_pushl(&make_script_args, "", revisions, NULL);
+	strvec_pushl(&make_script_args, "", revisions, NULL);
 	if (opts->restrict_revision)
-		argv_array_push(&make_script_args,
-				oid_to_hex(&opts->restrict_revision->object.oid));
+		strvec_pushf(&make_script_args, "^%s",
+			     oid_to_hex(&opts->restrict_revision->object.oid));
 
 	ret = sequencer_make_script(the_repository, &todo_list.buf,
-				    make_script_args.argc, make_script_args.argv,
+				    make_script_args.nr, make_script_args.v,
 				    flags);
 
 	if (ret)
@@ -349,20 +376,21 @@ static int do_interactive_rebase(struct rebase_options *opts, unsigned flags)
 
 		split_exec_commands(opts->cmd, &commands);
 		ret = complete_action(the_repository, &replay, flags,
-			shortrevisions, opts->onto_name, opts->onto, head_hash,
-			&commands, opts->autosquash, &todo_list);
+			shortrevisions, opts->onto_name, opts->onto,
+			&opts->orig_head, &commands, opts->autosquash,
+			&todo_list);
 	}
 
 	string_list_clear(&commands, 0);
 	free(revisions);
 	free(shortrevisions);
 	todo_list_release(&todo_list);
-	argv_array_clear(&make_script_args);
+	strvec_clear(&make_script_args);
 
 	return ret;
 }
 
-static int run_rebase_interactive(struct rebase_options *opts,
+static int run_sequencer_rebase(struct rebase_options *opts,
 				  enum action command)
 {
 	unsigned flags = 0;
@@ -376,6 +404,8 @@ static int run_rebase_interactive(struct rebase_options *opts,
 	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: {
@@ -404,7 +434,7 @@ static int run_rebase_interactive(struct rebase_options *opts,
 		struct child_process cmd = CHILD_PROCESS_INIT;
 
 		cmd.git_cmd = 1;
-		argv_array_pushl(&cmd.args, "show", "REBASE_HEAD", "--", NULL);
+		strvec_pushl(&cmd.args, "show", "REBASE_HEAD", "--", NULL);
 		ret = run_command(&cmd);
 
 		break;
@@ -434,6 +464,20 @@ static int run_rebase_interactive(struct rebase_options *opts,
 	return ret;
 }
 
+static void imply_merge(struct rebase_options *opts, const char *option);
+static int parse_opt_keep_empty(const struct option *opt, const char *arg,
+				int unset)
+{
+	struct rebase_options *opts = opt->value;
+
+	BUG_ON_OPT_ARG(arg);
+
+	imply_merge(opts, unset ? "--no-keep-empty" : "--keep-empty");
+	opts->keep_empty = !unset;
+	opts->type = REBASE_MERGE;
+	return 0;
+}
+
 static const char * const builtin_rebase_interactive_usage[] = {
 	N_("git rebase--interactive [<options>]"),
 	NULL
@@ -442,14 +486,18 @@ static const char * const builtin_rebase_interactive_usage[] = {
 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;
+	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_BOOL(0, "keep-empty", &opts.keep_empty, N_("keep empty commits")),
-		OPT_BOOL(0, "allow-empty-message", &opts.allow_empty_message,
-			 N_("allow commits with empty messages")),
+		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")),
@@ -519,28 +567,26 @@ int cmd_rebase__interactive(int argc, const char **argv, const char *prefix)
 		warning(_("--[no-]rebase-cousins has no effect without "
 			  "--rebase-merges"));
 
-	return !!run_rebase_interactive(&opts, command);
+	return !!run_sequencer_rebase(&opts, command);
 }
 
-static int is_interactive(struct rebase_options *opts)
+static int is_merge(struct rebase_options *opts)
 {
-	return opts->type == REBASE_INTERACTIVE ||
+	return opts->type == REBASE_MERGE ||
 		opts->type == REBASE_PRESERVE_MERGES;
 }
 
-static void imply_interactive(struct rebase_options *opts, const char *option)
+static void imply_merge(struct rebase_options *opts, const char *option)
 {
 	switch (opts->type) {
-	case REBASE_AM:
-		die(_("%s requires an interactive rebase"), option);
+	case REBASE_APPLY:
+		die(_("%s requires the merge backend"), option);
 		break;
-	case REBASE_INTERACTIVE:
+	case REBASE_MERGE:
 	case REBASE_PRESERVE_MERGES:
 		break;
-	case REBASE_MERGE:
-		/* we now implement --merge via --interactive */
 	default:
-		opts->type = REBASE_INTERACTIVE; /* implied */
+		opts->type = REBASE_MERGE; /* implied */
 		break;
 	}
 }
@@ -561,15 +607,6 @@ static const char *state_dir_path(const char *filename, struct rebase_options *o
 	return path.buf;
 }
 
-/* Read one file, then strip line endings */
-static int read_one(const char *path, struct strbuf *buf)
-{
-	if (strbuf_read_file(buf, path, 0) < 0)
-		return error_errno(_("could not read '%s'"), path);
-	strbuf_trim_trailing_newline(buf);
-	return 0;
-}
-
 /* Initialize the rebase options from the state directory. */
 static int read_basic_state(struct rebase_options *opts)
 {
@@ -577,8 +614,10 @@ static int read_basic_state(struct rebase_options *opts)
 	struct strbuf buf = STRBUF_INIT;
 	struct object_id oid;
 
-	if (read_one(state_dir_path("head-name", opts), &head_name) ||
-	    read_one(state_dir_path("onto", opts), &buf))
+	if (!read_oneliner(&head_name, state_dir_path("head-name", opts),
+			   READ_ONELINER_WARN_MISSING) ||
+	    !read_oneliner(&buf, state_dir_path("onto", opts),
+			   READ_ONELINER_WARN_MISSING))
 		return -1;
 	opts->head_name = starts_with(head_name.buf, "refs/") ?
 		xstrdup(head_name.buf) : NULL;
@@ -594,9 +633,11 @@ static int read_basic_state(struct rebase_options *opts)
 	 */
 	strbuf_reset(&buf);
 	if (file_exists(state_dir_path("orig-head", opts))) {
-		if (read_one(state_dir_path("orig-head", opts), &buf))
+		if (!read_oneliner(&buf, state_dir_path("orig-head", opts),
+				   READ_ONELINER_WARN_MISSING))
 			return -1;
-	} else if (read_one(state_dir_path("head", opts), &buf))
+	} else if (!read_oneliner(&buf, state_dir_path("head", opts),
+				  READ_ONELINER_WARN_MISSING))
 		return -1;
 	if (get_oid(buf.buf, &opts->orig_head))
 		return error(_("invalid orig-head: '%s'"), buf.buf);
@@ -616,8 +657,8 @@ static int read_basic_state(struct rebase_options *opts)
 
 	if (file_exists(state_dir_path("allow_rerere_autoupdate", opts))) {
 		strbuf_reset(&buf);
-		if (read_one(state_dir_path("allow_rerere_autoupdate", opts),
-			    &buf))
+		if (!read_oneliner(&buf, state_dir_path("allow_rerere_autoupdate", opts),
+				   READ_ONELINER_WARN_MISSING))
 			return -1;
 		if (!strcmp(buf.buf, "--rerere-autoupdate"))
 			opts->allow_rerere_autoupdate = RERERE_AUTOUPDATE;
@@ -630,8 +671,8 @@ static int read_basic_state(struct rebase_options *opts)
 
 	if (file_exists(state_dir_path("gpg_sign_opt", opts))) {
 		strbuf_reset(&buf);
-		if (read_one(state_dir_path("gpg_sign_opt", opts),
-			    &buf))
+		if (!read_oneliner(&buf, state_dir_path("gpg_sign_opt", opts),
+				   READ_ONELINER_WARN_MISSING))
 			return -1;
 		free(opts->gpg_sign_opt);
 		opts->gpg_sign_opt = xstrdup(buf.buf);
@@ -639,7 +680,8 @@ static int read_basic_state(struct rebase_options *opts)
 
 	if (file_exists(state_dir_path("strategy", opts))) {
 		strbuf_reset(&buf);
-		if (read_one(state_dir_path("strategy", opts), &buf))
+		if (!read_oneliner(&buf, state_dir_path("strategy", opts),
+				   READ_ONELINER_WARN_MISSING))
 			return -1;
 		free(opts->strategy);
 		opts->strategy = xstrdup(buf.buf);
@@ -647,7 +689,8 @@ static int read_basic_state(struct rebase_options *opts)
 
 	if (file_exists(state_dir_path("strategy_opts", opts))) {
 		strbuf_reset(&buf);
-		if (read_one(state_dir_path("strategy_opts", opts), &buf))
+		if (!read_oneliner(&buf, state_dir_path("strategy_opts", opts),
+				   READ_ONELINER_WARN_MISSING))
 			return -1;
 		free(opts->strategy_opts);
 		opts->strategy_opts = xstrdup(buf.buf);
@@ -666,8 +709,8 @@ static int rebase_write_basic_state(struct rebase_options *opts)
 		   opts->onto ? oid_to_hex(&opts->onto->object.oid) : "");
 	write_file(state_dir_path("orig-head", opts), "%s",
 		   oid_to_hex(&opts->orig_head));
-	write_file(state_dir_path("quiet", opts), "%s",
-		   opts->flags & REBASE_NO_QUIET ? "" : "t");
+	if (!(opts->flags & REBASE_NO_QUIET))
+		write_file(state_dir_path("quiet", opts), "%s", "");
 	if (opts->flags & REBASE_VERBOSE)
 		write_file(state_dir_path("verbose", opts), "%s", "");
 	if (opts->strategy)
@@ -685,71 +728,26 @@ static int rebase_write_basic_state(struct rebase_options *opts)
 		write_file(state_dir_path("gpg_sign_opt", opts), "%s",
 			   opts->gpg_sign_opt);
 	if (opts->signoff)
-		write_file(state_dir_path("strategy", opts), "--signoff");
+		write_file(state_dir_path("signoff", opts), "--signoff");
 
 	return 0;
 }
 
-static int apply_autostash(struct rebase_options *opts)
-{
-	const char *path = state_dir_path("autostash", opts);
-	struct strbuf autostash = STRBUF_INIT;
-	struct child_process stash_apply = CHILD_PROCESS_INIT;
-
-	if (!file_exists(path))
-		return 0;
-
-	if (read_one(path, &autostash))
-		return error(_("Could not read '%s'"), path);
-	/* Ensure that the hash is not mistaken for a number */
-	strbuf_addstr(&autostash, "^0");
-	argv_array_pushl(&stash_apply.args,
-			 "stash", "apply", autostash.buf, NULL);
-	stash_apply.git_cmd = 1;
-	stash_apply.no_stderr = stash_apply.no_stdout =
-		stash_apply.no_stdin = 1;
-	if (!run_command(&stash_apply))
-		printf(_("Applied autostash.\n"));
-	else {
-		struct argv_array args = ARGV_ARRAY_INIT;
-		int res = 0;
-
-		argv_array_pushl(&args,
-				 "stash", "store", "-m", "autostash", "-q",
-				 autostash.buf, NULL);
-		if (run_command_v_opt(args.argv, RUN_GIT_CMD))
-			res = error(_("Cannot store %s"), autostash.buf);
-		argv_array_clear(&args);
-		strbuf_release(&autostash);
-		if (res)
-			return res;
-
-		fprintf(stderr,
-			_("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"));
-	}
-
-	strbuf_release(&autostash);
-	return 0;
-}
-
 static int finish_rebase(struct rebase_options *opts)
 {
 	struct strbuf dir = STRBUF_INIT;
-	const char *argv_gc_auto[] = { "gc", "--auto", NULL };
 	int ret = 0;
 
 	delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
-	apply_autostash(opts);
+	unlink(git_path_auto_merge(the_repository));
+	apply_autostash(state_dir_path("autostash", opts));
 	close_object_store(the_repository->objects);
 	/*
-	 * We ignore errors in 'gc --auto', since the
+	 * We ignore errors in 'git maintenance run --auto', since the
 	 * user should see them.
 	 */
-	run_command_v_opt(argv_gc_auto, RUN_GIT_CMD);
-	if (opts->type == REBASE_INTERACTIVE) {
+	run_auto_maintenance(!(opts->flags & (REBASE_NO_QUIET|REBASE_VERBOSE)));
+	if (opts->type == REBASE_MERGE) {
 		struct replay_opts replay = REPLAY_OPTS_INIT;
 
 		replay.action = REPLAY_INTERACTIVE_REBASE;
@@ -787,143 +785,6 @@ static void add_var(struct strbuf *buf, const char *name, const char *value)
 	}
 }
 
-#define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
-
-#define RESET_HEAD_DETACH (1<<0)
-#define RESET_HEAD_HARD (1<<1)
-#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
-#define RESET_HEAD_REFS_ONLY (1<<3)
-#define RESET_ORIG_HEAD (1<<4)
-
-static int reset_head(struct object_id *oid, const char *action,
-		      const char *switch_to_branch, unsigned flags,
-		      const char *reflog_orig_head, const char *reflog_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;
-	struct tree_desc desc[2] = { { NULL }, { NULL } };
-	struct lock_file lock = LOCK_INIT;
-	struct unpack_trees_options unpack_tree_opts;
-	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;
-	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 (!refs_only && hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) {
-		ret = -1;
-		goto leave_reset_head;
-	}
-
-	if ((!oid || !reset_hard) && get_oid("HEAD", &head_oid)) {
-		ret = error(_("could not determine HEAD revision"));
-		goto leave_reset_head;
-	}
-
-	if (!oid)
-		oid = &head_oid;
-
-	if (refs_only)
-		goto reset_head_refs;
-
-	memset(&unpack_tree_opts, 0, sizeof(unpack_tree_opts));
-	setup_unpack_trees_porcelain(&unpack_tree_opts, action);
-	unpack_tree_opts.head_idx = 1;
-	unpack_tree_opts.src_index = the_repository->index;
-	unpack_tree_opts.dst_index = the_repository->index;
-	unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
-	unpack_tree_opts.update = 1;
-	unpack_tree_opts.merge = 1;
-	if (!detach_head)
-		unpack_tree_opts.reset = 1;
-
-	if (repo_read_index_unmerged(the_repository) < 0) {
-		ret = error(_("could not read index"));
-		goto leave_reset_head;
-	}
-
-	if (!reset_hard && !fill_tree_descriptor(the_repository, &desc[nr++], &head_oid)) {
-		ret = error(_("failed to find tree of %s"),
-			    oid_to_hex(&head_oid));
-		goto leave_reset_head;
-	}
-
-	if (!fill_tree_descriptor(the_repository, &desc[nr++], oid)) {
-		ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
-		goto leave_reset_head;
-	}
-
-	if (unpack_trees(nr, desc, &unpack_tree_opts)) {
-		ret = -1;
-		goto leave_reset_head;
-	}
-
-	tree = parse_tree_indirect(oid);
-	prime_cache_tree(the_repository, the_repository->index, tree);
-
-	if (write_locked_index(the_repository->index, &lock, COMMIT_LOCK) < 0) {
-		ret = error(_("could not write index"));
-		goto leave_reset_head;
-	}
-
-reset_head_refs:
-	reflog_action = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
-	strbuf_addf(&msg, "%s: ", reflog_action ? reflog_action : "rebase");
-	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);
-
-leave_reset_head:
-	strbuf_release(&msg);
-	rollback_lock_file(&lock);
-	while (nr)
-		free((void *)desc[--nr].buffer);
-	return ret;
-}
-
 static int move_to_original_branch(struct rebase_options *opts)
 {
 	struct strbuf orig_head_reflog = STRBUF_INIT, head_reflog = STRBUF_INIT;
@@ -939,8 +800,10 @@ static int move_to_original_branch(struct rebase_options *opts)
 		    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(NULL, "", opts->head_name, RESET_HEAD_REFS_ONLY,
-			 orig_head_reflog.buf, head_reflog.buf);
+	ret = reset_head(the_repository, NULL, "", opts->head_name,
+			 RESET_HEAD_REFS_ONLY,
+			 orig_head_reflog.buf, head_reflog.buf,
+			 DEFAULT_REFLOG_ACTION);
 
 	strbuf_release(&orig_head_reflog);
 	strbuf_release(&head_reflog);
@@ -963,13 +826,13 @@ static int run_am(struct rebase_options *opts)
 	char *rebased_patches;
 
 	am.git_cmd = 1;
-	argv_array_push(&am.args, "am");
+	strvec_push(&am.args, "am");
 
 	if (opts->action && !strcmp("continue", opts->action)) {
-		argv_array_push(&am.args, "--resolved");
-		argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
+		strvec_push(&am.args, "--resolved");
+		strvec_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
 		if (opts->gpg_sign_opt)
-			argv_array_push(&am.args, opts->gpg_sign_opt);
+			strvec_push(&am.args, opts->gpg_sign_opt);
 		status = run_command(&am);
 		if (status)
 			return status;
@@ -977,8 +840,8 @@ static int run_am(struct rebase_options *opts)
 		return move_to_original_branch(opts);
 	}
 	if (opts->action && !strcmp("skip", opts->action)) {
-		argv_array_push(&am.args, "--skip");
-		argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
+		strvec_push(&am.args, "--skip");
+		strvec_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
 		status = run_command(&am);
 		if (status)
 			return status;
@@ -986,7 +849,7 @@ static int run_am(struct rebase_options *opts)
 		return move_to_original_branch(opts);
 	}
 	if (opts->action && !strcmp("show-current-patch", opts->action)) {
-		argv_array_push(&am.args, "--show-current-patch");
+		strvec_push(&am.args, "--show-current-patch");
 		return run_command(&am);
 	}
 
@@ -1004,31 +867,33 @@ static int run_am(struct rebase_options *opts)
 		status = error_errno(_("could not open '%s' for writing"),
 				     rebased_patches);
 		free(rebased_patches);
-		argv_array_clear(&am.args);
+		strvec_clear(&am.args);
 		return status;
 	}
 
 	format_patch.git_cmd = 1;
-	argv_array_pushl(&format_patch.args, "format-patch", "-k", "--stdout",
-			 "--full-index", "--cherry-pick", "--right-only",
-			 "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
-			 "--no-cover-letter", "--pretty=mboxrd", "--topo-order", NULL);
+	strvec_pushl(&format_patch.args, "format-patch", "-k", "--stdout",
+		     "--full-index", "--cherry-pick", "--right-only",
+		     "--src-prefix=a/", "--dst-prefix=b/", "--no-renames",
+		     "--no-cover-letter", "--pretty=mboxrd", "--topo-order",
+		     "--no-base", NULL);
 	if (opts->git_format_patch_opt.len)
-		argv_array_split(&format_patch.args,
-				 opts->git_format_patch_opt.buf);
-	argv_array_push(&format_patch.args, revisions.buf);
+		strvec_split(&format_patch.args,
+			     opts->git_format_patch_opt.buf);
+	strvec_push(&format_patch.args, revisions.buf);
 	if (opts->restrict_revision)
-		argv_array_pushf(&format_patch.args, "^%s",
-				 oid_to_hex(&opts->restrict_revision->object.oid));
+		strvec_pushf(&format_patch.args, "^%s",
+			     oid_to_hex(&opts->restrict_revision->object.oid));
 
 	status = run_command(&format_patch);
 	if (status) {
 		unlink(rebased_patches);
 		free(rebased_patches);
-		argv_array_clear(&am.args);
+		strvec_clear(&am.args);
 
-		reset_head(&opts->orig_head, "checkout", opts->head_name, 0,
-			   "HEAD", NULL);
+		reset_head(the_repository, &opts->orig_head, "checkout",
+			   opts->head_name, 0,
+			   "HEAD", NULL, DEFAULT_REFLOG_ACTION);
 		error(_("\ngit encountered an error while preparing the "
 			"patches to replay\n"
 			"these revisions:\n"
@@ -1046,20 +911,20 @@ static int run_am(struct rebase_options *opts)
 		status = error_errno(_("could not open '%s' for reading"),
 				     rebased_patches);
 		free(rebased_patches);
-		argv_array_clear(&am.args);
+		strvec_clear(&am.args);
 		return status;
 	}
 
-	argv_array_pushv(&am.args, opts->git_am_opts.argv);
-	argv_array_push(&am.args, "--rebasing");
-	argv_array_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
-	argv_array_push(&am.args, "--patch-format=mboxrd");
+	strvec_pushv(&am.args, opts->git_am_opts.v);
+	strvec_push(&am.args, "--rebasing");
+	strvec_pushf(&am.args, "--resolvemsg=%s", resolvemsg);
+	strvec_push(&am.args, "--patch-format=mboxrd");
 	if (opts->allow_rerere_autoupdate == RERERE_AUTOUPDATE)
-		argv_array_push(&am.args, "--rerere-autoupdate");
+		strvec_push(&am.args, "--rerere-autoupdate");
 	else if (opts->allow_rerere_autoupdate == RERERE_NOAUTOUPDATE)
-		argv_array_push(&am.args, "--no-rerere-autoupdate");
+		strvec_push(&am.args, "--no-rerere-autoupdate");
 	if (opts->gpg_sign_opt)
-		argv_array_push(&am.args, opts->gpg_sign_opt);
+		strvec_push(&am.args, opts->gpg_sign_opt);
 	status = run_command(&am);
 	unlink(rebased_patches);
 	free(rebased_patches);
@@ -1081,8 +946,8 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 	int status;
 	const char *backend, *backend_func;
 
-	if (opts->type == REBASE_INTERACTIVE) {
-		/* Run builtin interactive rebase */
+	if (opts->type == REBASE_MERGE) {
+		/* Run sequencer-based rebase */
 		setenv("GIT_CHERRY_PICK_HELP", resolvemsg, 1);
 		if (!(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
 			setenv("GIT_SEQUENCE_EDITOR", ":", 1);
@@ -1095,11 +960,11 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 			opts->gpg_sign_opt = tmp;
 		}
 
-		status = run_rebase_interactive(opts, action);
+		status = run_sequencer_rebase(opts, action);
 		goto finished_rebase;
 	}
 
-	if (opts->type == REBASE_AM) {
+	if (opts->type == REBASE_APPLY) {
 		status = run_am(opts);
 		goto finished_rebase;
 	}
@@ -1119,9 +984,7 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 	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);
-	add_var(&script_snippet, "GIT_QUIET",
-		opts->flags & REBASE_NO_QUIET ? "" : "t");
-	sq_quote_argv_pretty(&buf, opts->git_am_opts.argv);
+	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",
@@ -1156,7 +1019,7 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 	add_var(&script_snippet, "git_format_patch_opt",
 		opts->git_format_patch_opt.buf);
 
-	if (is_interactive(opts) &&
+	if (is_merge(opts) &&
 	    !(opts->flags & REBASE_INTERACTIVE_EXPLICIT)) {
 		strbuf_addstr(&script_snippet,
 			      "GIT_SEQUENCE_EDITOR=:; export GIT_SEQUENCE_EDITOR; ");
@@ -1181,15 +1044,15 @@ static int run_specific_rebase(struct rebase_options *opts, enum action action)
 finished_rebase:
 	if (opts->dont_finish_rebase)
 		; /* do nothing */
-	else if (opts->type == REBASE_INTERACTIVE)
-		; /* interactive rebase cleans up after itself */
+	else if (opts->type == REBASE_MERGE)
+		; /* merge backend cleans up after itself */
 	else if (status == 0) {
 		if (!file_exists(state_dir_path("stopped-sha", opts)))
 			finish_rebase(opts);
 	} else if (status == 2) {
 		struct strbuf dir = STRBUF_INIT;
 
-		apply_autostash(opts);
+		apply_autostash(state_dir_path("autostash", opts));
 		strbuf_addstr(&dir, opts->state_dir);
 		remove_dir_recursively(&dir, 0);
 		strbuf_release(&dir);
@@ -1235,11 +1098,15 @@ static int rebase_config(const char *var, const char *value, void *data)
 		return 0;
 	}
 
-	if (!strcmp(var, "rebase.usebuiltin")) {
-		opts->use_legacy_rebase = !git_config_bool(var, value);
+	if (!strcmp(var, "rebase.forkpoint")) {
+		opts->fork_point = git_config_bool(var, value) ? -1 : 0;
 		return 0;
 	}
 
+	if (!strcmp(var, "rebase.backend")) {
+		return git_config_string(&opts->default_backend, var, value);
+	}
+
 	return git_default_config(var, value, data);
 }
 
@@ -1274,7 +1141,7 @@ static int can_fast_forward(struct commit *onto, struct commit *upstream,
 
 	merge_bases = get_merge_bases(onto, head);
 	if (!merge_bases || merge_bases->next) {
-		oidcpy(merge_base, &null_oid);
+		oidcpy(merge_base, null_oid());
 		goto done;
 	}
 
@@ -1303,6 +1170,18 @@ done:
 	return res && is_linear_history(onto, head);
 }
 
+static int parse_opt_am(const struct option *opt, const char *arg, int unset)
+{
+	struct rebase_options *opts = opt->value;
+
+	BUG_ON_OPT_NEG(unset);
+	BUG_ON_OPT_ARG(arg);
+
+	opts->type = REBASE_APPLY;
+
+	return 0;
+}
+
 /* -i followed by -m is still -i */
 static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
 {
@@ -1311,7 +1190,7 @@ static int parse_opt_merge(const struct option *opt, const char *arg, int unset)
 	BUG_ON_OPT_NEG(unset);
 	BUG_ON_OPT_ARG(arg);
 
-	if (!is_interactive(opts))
+	if (!is_merge(opts))
 		opts->type = REBASE_MERGE;
 
 	return 0;
@@ -1326,12 +1205,35 @@ static int parse_opt_interactive(const struct option *opt, const char *arg,
 	BUG_ON_OPT_NEG(unset);
 	BUG_ON_OPT_ARG(arg);
 
-	opts->type = REBASE_INTERACTIVE;
+	opts->type = REBASE_MERGE;
 	opts->flags |= REBASE_INTERACTIVE_EXPLICIT;
 
 	return 0;
 }
 
+static enum empty_type parse_empty_value(const char *value)
+{
+	if (!strcasecmp(value, "drop"))
+		return EMPTY_DROP;
+	else if (!strcasecmp(value, "keep"))
+		return EMPTY_KEEP;
+	else if (!strcasecmp(value, "ask"))
+		return EMPTY_ASK;
+
+	die(_("unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."), value);
+}
+
+static int parse_opt_empty(const struct option *opt, const char *arg, int unset)
+{
+	struct rebase_options *options = opt->value;
+	enum empty_type value = parse_empty_value(arg);
+
+	BUG_ON_OPT_NEG(unset);
+
+	options->empty = value;
+	return 0;
+}
+
 static void NORETURN error_on_missing_default_upstream(void)
 {
 	struct branch *current_branch = branch_get(NULL);
@@ -1367,14 +1269,14 @@ static void set_reflog_action(struct rebase_options *options)
 	const char *env;
 	struct strbuf buf = STRBUF_INIT;
 
-	if (!is_interactive(options))
+	if (!is_merge(options))
 		return;
 
 	env = getenv(GIT_REFLOG_ACTION_ENVIRONMENT);
 	if (env && strcmp("rebase", env))
 		return; /* only override it if it is "rebase" */
 
-	strbuf_addf(&buf, "rebase -i (%s)", options->action);
+	strbuf_addf(&buf, "rebase (%s)", options->action);
 	setenv(GIT_REFLOG_ACTION_ENVIRONMENT, buf.buf, 1);
 	strbuf_release(&buf);
 }
@@ -1391,7 +1293,6 @@ static int check_exec_cmd(const char *cmd)
 	return 0;
 }
 
-
 int cmd_rebase(int argc, const char **argv, const char *prefix)
 {
 	struct rebase_options options = REBASE_OPTIONS_INIT;
@@ -1403,15 +1304,16 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	struct strbuf revisions = STRBUF_INIT;
 	struct strbuf buf = STRBUF_INIT;
 	struct object_id merge_base;
+	int ignore_whitespace = 0;
 	enum action action = ACTION_NONE;
 	const char *gpg_sign = NULL;
 	struct string_list exec = STRING_LIST_INIT_NODUP;
 	const char *rebase_merges = NULL;
-	int fork_point = -1;
 	struct string_list strategy_options = STRING_LIST_INIT_NODUP;
 	struct object_id squash_onto;
 	char *squash_onto_name = NULL;
 	int reschedule_failed_exec = -1;
+	int allow_preemptive_ff = 1;
 	struct option builtin_rebase_options[] = {
 		OPT_STRING(0, "onto", &options.onto_name,
 			   N_("revision"),
@@ -1422,7 +1324,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			 N_("allow pre-rebase hook to run")),
 		OPT_NEGBIT('q', "quiet", &options.flags,
 			   N_("be quiet. implies --no-stat"),
-			   REBASE_NO_QUIET| REBASE_VERBOSE | REBASE_DIFFSTAT),
+			   REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
 		OPT_BIT('v', "verbose", &options.flags,
 			N_("display a diffstat of what changed upstream"),
 			REBASE_NO_QUIET | REBASE_VERBOSE | REBASE_DIFFSTAT),
@@ -1430,17 +1332,18 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			N_("do not show diffstat of what changed upstream"),
 			PARSE_OPT_NOARG, NULL, REBASE_DIFFSTAT },
 		OPT_BOOL(0, "signoff", &options.signoff,
-			 N_("add a Signed-off-by: line to each commit")),
-		OPT_PASSTHRU_ARGV(0, "ignore-whitespace", &options.git_am_opts,
-				  NULL, N_("passed to 'git am'"),
-				  PARSE_OPT_NOARG),
-		OPT_PASSTHRU_ARGV(0, "committer-date-is-author-date",
-				  &options.git_am_opts, NULL,
-				  N_("passed to 'git am'"), PARSE_OPT_NOARG),
-		OPT_PASSTHRU_ARGV(0, "ignore-date", &options.git_am_opts, NULL,
-				  N_("passed to 'git am'"), PARSE_OPT_NOARG),
+			 N_("add a Signed-off-by trailer to each commit")),
+		OPT_BOOL(0, "committer-date-is-author-date",
+			 &options.committer_date_is_author_date,
+			 N_("make committer date match author date")),
+		OPT_BOOL(0, "reset-author-date", &options.ignore_date,
+			 N_("ignore author date and use current date")),
+		OPT_HIDDEN_BOOL(0, "ignore-date", &options.ignore_date,
+				N_("synonym of --reset-author-date")),
 		OPT_PASSTHRU_ARGV('C', NULL, &options.git_am_opts, N_("n"),
 				  N_("passed to 'git apply'"), 0),
+		OPT_BOOL(0, "ignore-whitespace", &ignore_whitespace,
+			 N_("ignore changes in whitespace")),
 		OPT_PASSTHRU_ARGV(0, "whitespace", &options.git_am_opts,
 				  N_("action"), N_("passed to 'git apply'"), 0),
 		OPT_BIT('f', "force-rebase", &options.flags,
@@ -1463,39 +1366,49 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		OPT_CMDMODE(0, "show-current-patch", &action,
 			    N_("show the patch file being applied or merged"),
 			    ACTION_SHOW_CURRENT_PATCH),
-		{ OPTION_CALLBACK, 'm', "merge", &options, NULL,
+		OPT_CALLBACK_F(0, "apply", &options, NULL,
+			N_("use apply strategies to rebase"),
+			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
+			parse_opt_am),
+		OPT_CALLBACK_F('m', "merge", &options, NULL,
 			N_("use merging strategies to rebase"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
-			parse_opt_merge },
-		{ OPTION_CALLBACK, 'i', "interactive", &options, NULL,
+			parse_opt_merge),
+		OPT_CALLBACK_F('i', "interactive", &options, NULL,
 			N_("let the user edit the list of commits to rebase"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
-			parse_opt_interactive },
-		OPT_SET_INT('p', "preserve-merges", &options.type,
-			    N_("(DEPRECATED) try to recreate merges instead of "
-			       "ignoring them"), REBASE_PRESERVE_MERGES),
+			parse_opt_interactive),
+		OPT_SET_INT_F('p', "preserve-merges", &options.type,
+			      N_("(DEPRECATED) try to recreate merges instead of "
+				 "ignoring them"),
+			      REBASE_PRESERVE_MERGES, PARSE_OPT_HIDDEN),
 		OPT_RERERE_AUTOUPDATE(&options.allow_rerere_autoupdate),
-		OPT_BOOL('k', "keep-empty", &options.keep_empty,
-			 N_("preserve empty commits during rebase")),
+		OPT_CALLBACK_F(0, "empty", &options, "{drop,keep,ask}",
+			       N_("how to handle commits that become empty"),
+			       PARSE_OPT_NONEG, parse_opt_empty),
+		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(0, "autosquash", &options.autosquash,
 			 N_("move commits that begin with "
 			    "squash!/fixup! under -i")),
 		{ OPTION_STRING, 'S', "gpg-sign", &gpg_sign, N_("key-id"),
 			N_("GPG-sign commits"),
 			PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
-		OPT_BOOL(0, "autostash", &options.autostash,
-			 N_("automatically stash/stash pop before and after")),
+		OPT_AUTOSTASH(&options.autostash),
 		OPT_STRING_LIST('x', "exec", &exec, N_("exec"),
 				N_("add exec lines after each commit of the "
 				   "editable list")),
-		OPT_BOOL(0, "allow-empty-message",
-			 &options.allow_empty_message,
-			 N_("allow rebasing commits with empty messages")),
+		OPT_BOOL_F(0, "allow-empty-message",
+			   &options.allow_empty_message,
+			   N_("allow rebasing commits with empty messages"),
+			   PARSE_OPT_HIDDEN),
 		{OPTION_STRING, 'r', "rebase-merges", &rebase_merges,
 			N_("mode"),
 			N_("try to rebase merges instead of skipping them"),
 			PARSE_OPT_OPTARG, NULL, (intptr_t)""},
-		OPT_BOOL(0, "fork-point", &fork_point,
+		OPT_BOOL(0, "fork-point", &options.fork_point,
 			 N_("use 'merge-base --fork-point' to refine upstream")),
 		OPT_STRING('s', "strategy", &options.strategy,
 			   N_("strategy"), N_("use the given merge strategy")),
@@ -1508,6 +1421,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		OPT_BOOL(0, "reschedule-failed-exec",
 			 &reschedule_failed_exec,
 			 N_("automatically re-schedule any `exec` that fails")),
+		OPT_BOOL(0, "reapply-cherry-picks", &options.reapply_cherry_picks,
+			 N_("apply all changes, even those already present upstream")),
 		OPT_END(),
 	};
 	int i;
@@ -1518,11 +1433,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
 	options.allow_empty_message = 1;
 	git_config(rebase_config, &options);
-
-	if (options.use_legacy_rebase ||
-	    !git_env_bool("GIT_TEST_REBASE_USE_BUILTIN", -1))
-		warning(_("the rebase.useBuiltin support has been removed!\n"
-			  "See its entry in 'git help config' for details."));
+	/* options.gpg_sign_opt will be either "-S" or NULL */
+	gpg_sign = options.gpg_sign_opt ? "" : NULL;
+	FREE_AND_NULL(options.gpg_sign_opt);
 
 	strbuf_reset(&buf);
 	strbuf_addf(&buf, "%s/applying", apply_dir());
@@ -1530,7 +1443,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		die(_("It looks like 'git am' is in progress. Cannot rebase."));
 
 	if (is_directory(apply_dir())) {
-		options.type = REBASE_AM;
+		options.type = REBASE_APPLY;
 		options.state_dir = apply_dir();
 	} else if (is_directory(merge_dir())) {
 		strbuf_reset(&buf);
@@ -1542,7 +1455,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			strbuf_reset(&buf);
 			strbuf_addf(&buf, "%s/interactive", merge_dir());
 			if(file_exists(buf.buf)) {
-				options.type = REBASE_INTERACTIVE;
+				options.type = REBASE_MERGE;
 				options.flags |= REBASE_INTERACTIVE_EXPLICIT;
 			} else
 				options.type = REBASE_MERGE;
@@ -1578,16 +1491,19 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			die(_("cannot combine '--keep-base' with '--root'"));
 	}
 
+	if (options.root && options.fork_point > 0)
+		die(_("cannot combine '--root' with '--fork-point'"));
+
 	if (action != ACTION_NONE && !in_progress)
 		die(_("No rebase in progress?"));
 	setenv(GIT_REFLOG_ACTION_ENVIRONMENT, "rebase", 0);
 
-	if (action == ACTION_EDIT_TODO && !is_interactive(&options))
+	if (action == ACTION_EDIT_TODO && !is_merge(&options))
 		die(_("The --edit-todo action can only be used during "
 		      "interactive rebase."));
 
 	if (trace2_is_enabled()) {
-		if (is_interactive(&options))
+		if (is_merge(&options))
 			trace2_cmd_mode("interactive");
 		else if (exec.nr)
 			trace2_cmd_mode("interactive-exec");
@@ -1635,8 +1551,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(NULL, "reset", NULL, RESET_HEAD_HARD,
-			       NULL, NULL) < 0)
+		if (reset_head(the_repository, NULL, "reset", NULL, RESET_HEAD_HARD,
+			       NULL, NULL, DEFAULT_REFLOG_ACTION) < 0)
 			die(_("could not discard worktree changes"));
 		remove_branch_state(the_repository, 0);
 		if (read_basic_state(&options))
@@ -1653,9 +1569,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 
 		if (read_basic_state(&options))
 			exit(1);
-		if (reset_head(&options.orig_head, "reset",
+		if (reset_head(the_repository, &options.orig_head, "reset",
 			       options.head_name, RESET_HEAD_HARD,
-			       NULL, NULL) < 0)
+			       NULL, NULL, DEFAULT_REFLOG_ACTION) < 0)
 			die(_("could not move back to %s"),
 			    oid_to_hex(&options.orig_head));
 		remove_branch_state(the_repository, 0);
@@ -1663,7 +1579,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		goto cleanup;
 	}
 	case ACTION_QUIT: {
-		if (options.type == REBASE_INTERACTIVE) {
+		save_autostash(state_dir_path("autostash", &options));
+		if (options.type == REBASE_MERGE) {
 			struct replay_opts replay = REPLAY_OPTS_INIT;
 
 			replay.action = REPLAY_INTERACTIVE_REBASE;
@@ -1712,13 +1629,20 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		    state_dir_base, cmd_live_rebase, buf.buf);
 	}
 
-	for (i = 0; i < options.git_am_opts.argc; i++) {
-		const char *option = options.git_am_opts.argv[i], *p;
-		if (!strcmp(option, "--committer-date-is-author-date") ||
-		    !strcmp(option, "--ignore-date") ||
-		    !strcmp(option, "--whitespace=fix") ||
+	if ((options.flags & REBASE_INTERACTIVE_EXPLICIT) ||
+	    (action != ACTION_NONE) ||
+	    (exec.nr > 0) ||
+	    options.autosquash) {
+		allow_preemptive_ff = 0;
+	}
+	if (options.committer_date_is_author_date || options.ignore_date)
+		options.flags |= REBASE_FORCE;
+
+	for (i = 0; i < options.git_am_opts.nr; i++) {
+		const char *option = options.git_am_opts.v[i], *p;
+		if (!strcmp(option, "--whitespace=fix") ||
 		    !strcmp(option, "--whitespace=strip"))
-			options.flags |= REBASE_FORCE;
+			allow_preemptive_ff = 0;
 		else if (skip_prefix(option, "-C", &p)) {
 			while (*p)
 				if (!isdigit(*(p++)))
@@ -1736,20 +1660,21 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 			exit(1);
 
 	if (!(options.flags & REBASE_NO_QUIET))
-		argv_array_push(&options.git_am_opts, "-q");
+		strvec_push(&options.git_am_opts, "-q");
 
-	if (options.keep_empty)
-		imply_interactive(&options, "--keep-empty");
+	if (options.empty != EMPTY_UNSPECIFIED)
+		imply_merge(&options, "--empty");
 
-	if (gpg_sign) {
-		free(options.gpg_sign_opt);
+	if (options.reapply_cherry_picks)
+		imply_merge(&options, "--reapply-cherry-picks");
+
+	if (gpg_sign)
 		options.gpg_sign_opt = xstrfmt("-S%s", gpg_sign);
-	}
 
 	if (exec.nr) {
 		int i;
 
-		imply_interactive(&options, "--exec");
+		imply_merge(&options, "--exec");
 
 		strbuf_reset(&buf);
 		for (i = 0; i < exec.nr; i++)
@@ -1765,14 +1690,31 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		else if (strcmp("no-rebase-cousins", rebase_merges))
 			die(_("Unknown mode: %s"), rebase_merges);
 		options.rebase_merges = 1;
-		imply_interactive(&options, "--rebase-merges");
+		imply_merge(&options, "--rebase-merges");
+	}
+
+	if (options.type == REBASE_APPLY) {
+		if (ignore_whitespace)
+			strvec_push(&options.git_am_opts,
+				    "--ignore-whitespace");
+		if (options.committer_date_is_author_date)
+			strvec_push(&options.git_am_opts,
+				    "--committer-date-is-author-date");
+		if (options.ignore_date)
+			strvec_push(&options.git_am_opts, "--ignore-date");
+	} else {
+		/* REBASE_MERGE and PRESERVE_MERGES */
+		if (ignore_whitespace) {
+			string_list_append(&strategy_options,
+					   "ignore-space-change");
+		}
 	}
 
 	if (strategy_options.nr) {
 		int i;
 
 		if (!options.strategy)
-			options.strategy = "recursive";
+			options.strategy = "ort";
 
 		strbuf_reset(&buf);
 		for (i = 0; i < strategy_options.nr; i++)
@@ -1784,10 +1726,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	if (options.strategy) {
 		options.strategy = xstrdup(options.strategy);
 		switch (options.type) {
-		case REBASE_AM:
+		case REBASE_APPLY:
 			die(_("--strategy requires --merge or --interactive"));
 		case REBASE_MERGE:
-		case REBASE_INTERACTIVE:
 		case REBASE_PRESERVE_MERGES:
 			/* compatible */
 			break;
@@ -1800,52 +1741,75 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	}
 
 	if (options.type == REBASE_MERGE)
-		imply_interactive(&options, "--merge");
+		imply_merge(&options, "--merge");
 
 	if (options.root && !options.onto_name)
-		imply_interactive(&options, "--root without --onto");
+		imply_merge(&options, "--root without --onto");
 
 	if (isatty(2) && options.flags & REBASE_NO_QUIET)
 		strbuf_addstr(&options.git_format_patch_opt, " --progress");
 
+	if (options.git_am_opts.nr || options.type == REBASE_APPLY) {
+		/* all am options except -q are compatible only with --apply */
+		for (i = options.git_am_opts.nr - 1; i >= 0; i--)
+			if (strcmp(options.git_am_opts.v[i], "-q"))
+				break;
+
+		if (i >= 0) {
+			if (is_merge(&options))
+				die(_("cannot combine apply options with "
+				      "merge options"));
+			else
+				options.type = REBASE_APPLY;
+		}
+	}
+
+	if (options.type == REBASE_UNSPECIFIED) {
+		if (!strcmp(options.default_backend, "merge"))
+			imply_merge(&options, "--merge");
+		else if (!strcmp(options.default_backend, "apply"))
+			options.type = REBASE_APPLY;
+		else
+			die(_("Unknown rebase backend: %s"),
+			    options.default_backend);
+	}
+
+	if (options.type == REBASE_MERGE &&
+	    !options.strategy &&
+	    getenv("GIT_TEST_MERGE_ALGORITHM"))
+		options.strategy = xstrdup(getenv("GIT_TEST_MERGE_ALGORITHM"));
+
 	switch (options.type) {
 	case REBASE_MERGE:
-	case REBASE_INTERACTIVE:
 	case REBASE_PRESERVE_MERGES:
 		options.state_dir = merge_dir();
 		break;
-	case REBASE_AM:
+	case REBASE_APPLY:
 		options.state_dir = apply_dir();
 		break;
 	default:
-		/* the default rebase backend is `--am` */
-		options.type = REBASE_AM;
-		options.state_dir = apply_dir();
-		break;
+		BUG("options.type was just set above; should be unreachable.");
 	}
 
-	if (reschedule_failed_exec > 0 && !is_interactive(&options))
+	if (options.empty == EMPTY_UNSPECIFIED) {
+		if (options.flags & REBASE_INTERACTIVE_EXPLICIT)
+			options.empty = EMPTY_ASK;
+		else if (exec.nr > 0)
+			options.empty = EMPTY_KEEP;
+		else
+			options.empty = EMPTY_DROP;
+	}
+	if (reschedule_failed_exec > 0 && !is_merge(&options))
 		die(_("--reschedule-failed-exec requires "
 		      "--exec or --interactive"));
 	if (reschedule_failed_exec >= 0)
 		options.reschedule_failed_exec = reschedule_failed_exec;
 
-	if (options.git_am_opts.argc) {
-		/* all am options except -q are compatible only with --am */
-		for (i = options.git_am_opts.argc - 1; i >= 0; i--)
-			if (strcmp(options.git_am_opts.argv[i], "-q"))
-				break;
-
-		if (is_interactive(&options) && i >= 0)
-			die(_("cannot combine am options with either "
-			      "interactive or merge options"));
-	}
-
 	if (options.signoff) {
 		if (options.type == REBASE_PRESERVE_MERGES)
 			die("cannot combine '--signoff' with "
 			    "'--preserve-merges'");
-		argv_array_push(&options.git_am_opts, "--signoff");
+		strvec_push(&options.git_am_opts, "--signoff");
 		options.flags |= REBASE_FORCE;
 	}
 
@@ -1873,8 +1837,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 								    NULL);
 			if (!options.upstream_name)
 				error_on_missing_default_upstream();
-			if (fork_point < 0)
-				fork_point = 1;
+			if (options.fork_point < 0)
+				options.fork_point = 1;
 		} else {
 			options.upstream_name = argv[0];
 			argc--;
@@ -1946,13 +1910,16 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		/* Is it a local branch? */
 		strbuf_reset(&buf);
 		strbuf_addf(&buf, "refs/heads/%s", branch_name);
-		if (!read_ref(buf.buf, &options.orig_head))
+		if (!read_ref(buf.buf, &options.orig_head)) {
+			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))
+		} else if (!get_oid(branch_name, &options.orig_head) &&
+			   lookup_commit_reference(the_repository,
+						   &options.orig_head))
 			options.head_name = NULL;
 		else
-			die(_("fatal: no such branch/commit '%s'"),
+			die(_("no such branch/commit '%s'"),
 			    branch_name);
 	} else if (argc == 0) {
 		/* Do not need to switch branches, we are already on it. */
@@ -1975,7 +1942,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	} else
 		BUG("unexpected number of arguments left to parse");
 
-	if (fork_point > 0) {
+	if (options.fork_point > 0) {
 		struct commit *head =
 			lookup_commit_reference(the_repository,
 						&options.orig_head);
@@ -1987,49 +1954,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		die(_("could not read index"));
 
 	if (options.autostash) {
-		struct lock_file lock_file = LOCK_INIT;
-		int fd;
-
-		fd = hold_locked_index(&lock_file, 0);
-		refresh_cache(REFRESH_QUIET);
-		if (0 <= fd)
-			repo_update_index_if_able(the_repository, &lock_file);
-		rollback_lock_file(&lock_file);
-
-		if (has_unstaged_changes(the_repository, 1) ||
-		    has_uncommitted_changes(the_repository, 1)) {
-			const char *autostash =
-				state_dir_path("autostash", &options);
-			struct child_process stash = CHILD_PROCESS_INIT;
-			struct object_id oid;
-
-			argv_array_pushl(&stash.args,
-					 "stash", "create", "autostash", NULL);
-			stash.git_cmd = 1;
-			stash.no_stdin = 1;
-			strbuf_reset(&buf);
-			if (capture_command(&stash, &buf, GIT_MAX_HEXSZ))
-				die(_("Cannot autostash"));
-			strbuf_trim_trailing_newline(&buf);
-			if (get_oid(buf.buf, &oid))
-				die(_("Unexpected stash response: '%s'"),
-				    buf.buf);
-			strbuf_reset(&buf);
-			strbuf_add_unique_abbrev(&buf, &oid, DEFAULT_ABBREV);
-
-			if (safe_create_leading_directories_const(autostash))
-				die(_("Could not create directory for '%s'"),
-				    options.state_dir);
-			write_file(autostash, "%s", oid_to_hex(&oid));
-			printf(_("Created autostash: %s\n"), buf.buf);
-			if (reset_head(NULL, "reset --hard",
-				       NULL, RESET_HEAD_HARD, NULL, NULL) < 0)
-				die(_("could not reset --hard"));
-
-			if (discard_index(the_repository->index) < 0 ||
-				repo_read_index(the_repository) < 0)
-				die(_("could not read index"));
-		}
+		create_autostash(the_repository, state_dir_path("autostash", &options),
+				 DEFAULT_REFLOG_ACTION);
 	}
 
 	if (require_clean_work_tree(the_repository, "rebase",
@@ -2046,33 +1972,29 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 	/*
 	 * Check if we are already based on onto with linear history,
 	 * in which case we could fast-forward without replacing the commits
-	 * with new commits recreated by replaying their changes. This
-	 * optimization must not be done if this is an interactive rebase.
+	 * with new commits recreated by replaying their changes.
+	 *
+	 * Note that can_fast_forward() initializes merge_base, so we have to
+	 * call it before checking allow_preemptive_ff.
 	 */
 	if (can_fast_forward(options.onto, options.upstream, options.restrict_revision,
 		    &options.orig_head, &merge_base) &&
-	    !is_interactive(&options)) {
+	    allow_preemptive_ff) {
 		int flag;
 
 		if (!(options.flags & REBASE_FORCE)) {
 			/* Lazily switch to the target branch if needed... */
 			if (options.switch_to) {
-				struct object_id oid;
-
-				if (get_oid(options.switch_to, &oid) < 0) {
-					ret = !!error(_("could not parse '%s'"),
-						      options.switch_to);
-					goto cleanup;
-				}
-
 				strbuf_reset(&buf);
 				strbuf_addf(&buf, "%s: checkout %s",
 					    getenv(GIT_REFLOG_ACTION_ENVIRONMENT),
 					    options.switch_to);
-				if (reset_head(&oid, "checkout",
+				if (reset_head(the_repository,
+					       &options.orig_head, "checkout",
 					       options.head_name,
 					       RESET_HEAD_RUN_POST_CHECKOUT_HOOK,
-					       NULL, buf.buf) < 0) {
+					       NULL, buf.buf,
+					       DEFAULT_REFLOG_ACTION) < 0) {
 					ret = !!error(_("could not switch to "
 							"%s"),
 						      options.switch_to);
@@ -2134,7 +2056,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
 		diff_flush(&opts);
 	}
 
-	if (is_interactive(&options))
+	if (is_merge(&options))
 		goto run_rebase;
 
 	/* Detach HEAD and reset the tree */
@@ -2144,10 +2066,10 @@ 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(&options.onto->object.oid, "checkout", NULL,
+	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))
+		       NULL, msg.buf, DEFAULT_REFLOG_ACTION))
 		die(_("Could not detach HEAD"));
 	strbuf_release(&msg);
 
@@ -2162,8 +2084,9 @@ 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(NULL, "Fast-forwarded", options.head_name,
-			   RESET_HEAD_REFS_ONLY, "HEAD", msg.buf);
+		reset_head(the_repository, NULL, "Fast-forwarded", options.head_name,
+			   RESET_HEAD_REFS_ONLY, "HEAD", msg.buf,
+			   DEFAULT_REFLOG_ACTION);
 		strbuf_release(&msg);
 		ret = !!finish_rebase(&options);
 		goto cleanup;
@@ -2187,6 +2110,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;
 }
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 411e0b4d99..2d1f97e1ca 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -13,9 +13,9 @@
 #include "remote.h"
 #include "connect.h"
 #include "string-list.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "connected.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "version.h"
 #include "tag.h"
 #include "gpg-interface.h"
@@ -27,6 +27,8 @@
 #include "object-store.h"
 #include "protocol.h"
 #include "commit-reach.h"
+#include "worktree.h"
+#include "shallow.h"
 
 static const char * const receive_pack_usage[] = {
 	N_("git receive-pack <git-dir>"),
@@ -52,9 +54,11 @@ static int receive_unpack_limit = -1;
 static int transfer_unpack_limit = -1;
 static int advertise_atomic_push = 1;
 static int advertise_push_options;
+static int advertise_sid;
 static int unpack_limit = 100;
 static off_t max_input_size;
 static int report_status;
+static int report_status_v2;
 static int use_sideband;
 static int use_atomic;
 static int use_push_options;
@@ -95,6 +99,17 @@ static int keepalive_in_sec = 5;
 
 static struct tmp_objdir *tmp_objdir;
 
+static struct proc_receive_ref {
+	unsigned int want_add:1,
+		     want_delete:1,
+		     want_modify:1,
+		     negative_ref:1;
+	char *ref_prefix;
+	struct proc_receive_ref *next;
+} *proc_receive_ref;
+
+static void proc_receive_ref_append(const char *prefix);
+
 static enum deny_action parse_deny_action(const char *var, const char *value)
 {
 	if (value) {
@@ -227,6 +242,18 @@ static int receive_pack_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (strcmp(var, "receive.procreceiverefs") == 0) {
+		if (!value)
+			return config_error_nonbool(var);
+		proc_receive_ref_append(value);
+		return 0;
+	}
+
+	if (strcmp(var, "transfer.advertisesid") == 0) {
+		advertise_sid = git_config_bool(var, value);
+		return 0;
+	}
+
 	return git_default_config(var, value, cb);
 }
 
@@ -238,7 +265,7 @@ static void show_ref(const char *path, const struct object_id *oid)
 		struct strbuf cap = STRBUF_INIT;
 
 		strbuf_addstr(&cap,
-			      "report-status delete-refs side-band-64k quiet");
+			      "report-status report-status-v2 delete-refs side-band-64k quiet");
 		if (advertise_atomic_push)
 			strbuf_addstr(&cap, " atomic");
 		if (prefer_ofs_delta)
@@ -247,6 +274,9 @@ static void show_ref(const char *path, const struct object_id *oid)
 			strbuf_addf(&cap, " push-cert=%s", push_cert_nonce);
 		if (advertise_push_options)
 			strbuf_addstr(&cap, " push-options");
+		if (advertise_sid)
+			strbuf_addf(&cap, " session-id=%s", trace2_session_id());
+		strbuf_addf(&cap, " object-format=%s", the_hash_algo->name);
 		strbuf_addf(&cap, " agent=%s", git_user_agent_sanitized());
 		packet_write_fmt(1, "%s %s%c%s\n",
 			     oid_to_hex(oid), path, 0, cap.buf);
@@ -299,7 +329,7 @@ static void write_head_info(void)
 	for_each_alternate_ref(show_one_alternate_ref, &seen);
 	oidset_clear(&seen);
 	if (!sent_capabilities)
-		show_ref("capabilities^{}", &null_oid);
+		show_ref("capabilities^{}", null_oid());
 
 	advertise_shallow_grafts(1);
 
@@ -307,19 +337,93 @@ static void write_head_info(void)
 	packet_flush(1);
 }
 
+#define RUN_PROC_RECEIVE_SCHEDULED	1
+#define RUN_PROC_RECEIVE_RETURNED	2
 struct command {
 	struct command *next;
 	const char *error_string;
+	struct ref_push_report *report;
 	unsigned int skip_update:1,
-		     did_not_exist:1;
+		     did_not_exist:1,
+		     run_proc_receive:2;
 	int index;
 	struct object_id old_oid;
 	struct object_id new_oid;
 	char ref_name[FLEX_ARRAY]; /* more */
 };
 
-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 proc_receive_ref_append(const char *prefix)
+{
+	struct proc_receive_ref *ref_pattern;
+	char *p;
+	int len;
+
+	CALLOC_ARRAY(ref_pattern, 1);
+	p = strchr(prefix, ':');
+	if (p) {
+		while (prefix < p) {
+			if (*prefix == 'a')
+				ref_pattern->want_add = 1;
+			else if (*prefix == 'd')
+				ref_pattern->want_delete = 1;
+			else if (*prefix == 'm')
+				ref_pattern->want_modify = 1;
+			else if (*prefix == '!')
+				ref_pattern->negative_ref = 1;
+			prefix++;
+		}
+		prefix++;
+	} else {
+		ref_pattern->want_add = 1;
+		ref_pattern->want_delete = 1;
+		ref_pattern->want_modify = 1;
+	}
+	len = strlen(prefix);
+	while (len && prefix[len - 1] == '/')
+		len--;
+	ref_pattern->ref_prefix = xmemdupz(prefix, len);
+	if (!proc_receive_ref) {
+		proc_receive_ref = ref_pattern;
+	} else {
+		struct proc_receive_ref *end;
+
+		end = proc_receive_ref;
+		while (end->next)
+			end = end->next;
+		end->next = ref_pattern;
+	}
+}
+
+static int proc_receive_ref_matches(struct command *cmd)
+{
+	struct proc_receive_ref *p;
+
+	if (!proc_receive_ref)
+		return 0;
+
+	for (p = proc_receive_ref; p; p = p->next) {
+		const char *match = p->ref_prefix;
+		const char *remains;
+
+		if (!p->want_add && is_null_oid(&cmd->old_oid))
+			continue;
+		else if (!p->want_delete && is_null_oid(&cmd->new_oid))
+			continue;
+		else if (!p->want_modify &&
+			 !is_null_oid(&cmd->old_oid) &&
+			 !is_null_oid(&cmd->new_oid))
+			continue;
+
+		if (skip_prefix(cmd->ref_name, match, &remains) &&
+		    (!*remains || *remains == '/')) {
+			if (!p->negative_ref)
+				return 1;
+		} else if (p->negative_ref) {
+			return 1;
+		}
+	}
+	return 0;
+}
 
 static void report_message(const char *prefix, const char *err, va_list params)
 {
@@ -338,6 +442,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;
@@ -346,6 +451,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;
@@ -417,7 +523,7 @@ static int copy_to_sideband(int in, int out, void *arg)
 	return 0;
 }
 
-static void hmac(unsigned char *out,
+static void hmac_hash(unsigned char *out,
 		      const char *key_in, size_t key_len,
 		      const char *text, size_t text_len)
 {
@@ -462,10 +568,10 @@ static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp)
 	unsigned char hash[GIT_MAX_RAWSZ];
 
 	strbuf_addf(&buf, "%s:%"PRItime, path, stamp);
-	hmac(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));
+	hmac_hash(hash, buf.buf, buf.len, cert_nonce_seed, strlen(cert_nonce_seed));
 	strbuf_release(&buf);
 
-	/* RFC 2104 5. HMAC-SHA1-80 */
+	/* RFC 2104 5. HMAC-SHA1 or HMAC-SHA256 */
 	strbuf_addf(&buf, "%"PRItime"-%.*s", stamp, (int)the_hash_algo->hexsz, hash_to_hex(hash));
 	return strbuf_detach(&buf, NULL);
 }
@@ -498,12 +604,27 @@ static char *find_header(const char *msg, size_t len, const char *key,
 	return NULL;
 }
 
+/*
+ * Return zero if a and b are equal up to n bytes and nonzero if they are not.
+ * This operation is guaranteed to run in constant time to avoid leaking data.
+ */
+static int constant_memequal(const char *a, const char *b, size_t n)
+{
+	int res = 0;
+	size_t i;
+
+	for (i = 0; i < n; i++)
+		res |= a[i] ^ b[i];
+	return res;
+}
+
 static const char *check_nonce(const char *buf, size_t len)
 {
 	char *nonce = find_header(buf, len, "nonce", NULL);
 	timestamp_t stamp, ostamp;
 	char *bohmac, *expect = NULL;
 	const char *retval = NONCE_BAD;
+	size_t noncelen;
 
 	if (!nonce) {
 		retval = NONCE_MISSING;
@@ -545,8 +666,14 @@ static const char *check_nonce(const char *buf, size_t len)
 		goto leave;
 	}
 
+	noncelen = strlen(nonce);
 	expect = prepare_push_cert_nonce(service_dir, stamp);
-	if (strcmp(expect, nonce)) {
+	if (noncelen != strlen(expect)) {
+		/* This is not even the right size. */
+		retval = NONCE_BAD;
+		goto leave;
+	}
+	if (constant_memequal(expect, nonce, noncelen)) {
 		/* Not what we would have signed earlier */
 		retval = NONCE_BAD;
 		goto leave;
@@ -636,38 +763,39 @@ static void prepare_push_cert_sha1(struct child_process *proc)
 
 		memset(&sigcheck, '\0', sizeof(sigcheck));
 
-		bogs = parse_signature(push_cert.buf, push_cert.len);
+		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);
 
 		nonce_status = check_nonce(push_cert.buf, bogs);
 	}
 	if (!is_null_oid(&push_cert_oid)) {
-		argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT=%s",
-				 oid_to_hex(&push_cert_oid));
-		argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_SIGNER=%s",
-				 sigcheck.signer ? sigcheck.signer : "");
-		argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_KEY=%s",
-				 sigcheck.key ? sigcheck.key : "");
-		argv_array_pushf(&proc->env_array, "GIT_PUSH_CERT_STATUS=%c",
-				 sigcheck.result);
+		strvec_pushf(&proc->env_array, "GIT_PUSH_CERT=%s",
+			     oid_to_hex(&push_cert_oid));
+		strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_SIGNER=%s",
+			     sigcheck.signer ? sigcheck.signer : "");
+		strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_KEY=%s",
+			     sigcheck.key ? sigcheck.key : "");
+		strvec_pushf(&proc->env_array, "GIT_PUSH_CERT_STATUS=%c",
+			     sigcheck.result);
 		if (push_cert_nonce) {
-			argv_array_pushf(&proc->env_array,
-					 "GIT_PUSH_CERT_NONCE=%s",
-					 push_cert_nonce);
-			argv_array_pushf(&proc->env_array,
-					 "GIT_PUSH_CERT_NONCE_STATUS=%s",
-					 nonce_status);
+			strvec_pushf(&proc->env_array,
+				     "GIT_PUSH_CERT_NONCE=%s",
+				     push_cert_nonce);
+			strvec_pushf(&proc->env_array,
+				     "GIT_PUSH_CERT_NONCE_STATUS=%s",
+				     nonce_status);
 			if (nonce_status == NONCE_SLOP)
-				argv_array_pushf(&proc->env_array,
-						 "GIT_PUSH_CERT_NONCE_SLOP=%ld",
-						 nonce_stamp_slop);
+				strvec_pushf(&proc->env_array,
+					     "GIT_PUSH_CERT_NONCE_SLOP=%ld",
+					     nonce_stamp_slop);
 		}
 	}
 }
 
 struct receive_hook_feed_state {
 	struct command *cmd;
+	struct ref_push_report *report;
 	int skip_broken;
 	struct strbuf buf;
 	const struct string_list *push_options;
@@ -696,16 +824,16 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed,
 	if (feed_state->push_options) {
 		int i;
 		for (i = 0; i < feed_state->push_options->nr; i++)
-			argv_array_pushf(&proc.env_array,
-				"GIT_PUSH_OPTION_%d=%s", i,
-				feed_state->push_options->items[i].string);
-		argv_array_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%d",
-				 feed_state->push_options->nr);
+			strvec_pushf(&proc.env_array,
+				     "GIT_PUSH_OPTION_%d=%s", i,
+				     feed_state->push_options->items[i].string);
+		strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT=%d",
+			     feed_state->push_options->nr);
 	} else
-		argv_array_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT");
+		strvec_pushf(&proc.env_array, "GIT_PUSH_OPTION_COUNT");
 
 	if (tmp_objdir)
-		argv_array_pushv(&proc.env_array, tmp_objdir_env(tmp_objdir));
+		strvec_pushv(&proc.env_array, tmp_objdir_env(tmp_objdir));
 
 	if (use_sideband) {
 		memset(&muxer, 0, sizeof(muxer));
@@ -755,11 +883,31 @@ static int feed_receive_hook(void *state_, const char **bufp, size_t *sizep)
 		cmd = cmd->next;
 	if (!cmd)
 		return -1; /* EOF */
+	if (!bufp)
+		return 0; /* OK, can feed something. */
 	strbuf_reset(&state->buf);
-	strbuf_addf(&state->buf, "%s %s %s\n",
-		    oid_to_hex(&cmd->old_oid), oid_to_hex(&cmd->new_oid),
-		    cmd->ref_name);
-	state->cmd = cmd->next;
+	if (!state->report)
+		state->report = cmd->report;
+	if (state->report) {
+		struct object_id *old_oid;
+		struct object_id *new_oid;
+		const char *ref_name;
+
+		old_oid = state->report->old_oid ? state->report->old_oid : &cmd->old_oid;
+		new_oid = state->report->new_oid ? state->report->new_oid : &cmd->new_oid;
+		ref_name = state->report->ref_name ? state->report->ref_name : cmd->ref_name;
+		strbuf_addf(&state->buf, "%s %s %s\n",
+			    oid_to_hex(old_oid), oid_to_hex(new_oid),
+			    ref_name);
+		state->report = state->report->next;
+		if (!state->report)
+			state->cmd = cmd->next;
+	} else {
+		strbuf_addf(&state->buf, "%s %s %s\n",
+			    oid_to_hex(&cmd->old_oid), oid_to_hex(&cmd->new_oid),
+			    cmd->ref_name);
+		state->cmd = cmd->next;
+	}
 	if (bufp) {
 		*bufp = state->buf.buf;
 		*sizep = state->buf.len;
@@ -778,6 +926,7 @@ static int run_receive_hook(struct command *commands,
 	strbuf_init(&state.buf, 0);
 	state.cmd = commands;
 	state.skip_broken = skip_broken;
+	state.report = NULL;
 	if (feed_receive_hook(&state, NULL, NULL))
 		return 0;
 	state.cmd = commands;
@@ -816,14 +965,310 @@ static int run_update_hook(struct command *cmd)
 	return finish_command(&proc);
 }
 
-static int is_ref_checked_out(const char *ref)
+static struct command *find_command_by_refname(struct command *list,
+					       const char *refname)
 {
-	if (is_bare_repository())
-		return 0;
+	for (; list; list = list->next)
+		if (!strcmp(list->ref_name, refname))
+			return list;
+	return NULL;
+}
 
-	if (!head_name)
-		return 0;
-	return !strcmp(head_name, ref);
+static int read_proc_receive_report(struct packet_reader *reader,
+				    struct command *commands,
+				    struct strbuf *errmsg)
+{
+	struct command *cmd;
+	struct command *hint = NULL;
+	struct ref_push_report *report = NULL;
+	int new_report = 0;
+	int code = 0;
+	int once = 0;
+	int response = 0;
+
+	for (;;) {
+		struct object_id old_oid, new_oid;
+		const char *head;
+		const char *refname;
+		char *p;
+		enum packet_read_status status;
+
+		status = packet_reader_read(reader);
+		if (status != PACKET_READ_NORMAL) {
+			/* Check whether proc-receive exited abnormally */
+			if (status == PACKET_READ_EOF && !response) {
+				strbuf_addstr(errmsg, "proc-receive exited abnormally");
+				return -1;
+			}
+			break;
+		}
+		response++;
+
+		head = reader->line;
+		p = strchr(head, ' ');
+		if (!p) {
+			strbuf_addf(errmsg, "proc-receive reported incomplete status line: '%s'\n", head);
+			code = -1;
+			continue;
+		}
+		*p++ = '\0';
+		if (!strcmp(head, "option")) {
+			const char *key, *val;
+
+			if (!hint || !(report || new_report)) {
+				if (!once++)
+					strbuf_addstr(errmsg, "proc-receive reported 'option' without a matching 'ok/ng' directive\n");
+				code = -1;
+				continue;
+			}
+			if (new_report) {
+				if (!hint->report) {
+					CALLOC_ARRAY(hint->report, 1);
+					report = hint->report;
+				} else {
+					report = hint->report;
+					while (report->next)
+						report = report->next;
+					report->next = xcalloc(1, sizeof(struct ref_push_report));
+					report = report->next;
+				}
+				new_report = 0;
+			}
+			key = p;
+			p = strchr(key, ' ');
+			if (p)
+				*p++ = '\0';
+			val = p;
+			if (!strcmp(key, "refname"))
+				report->ref_name = xstrdup_or_null(val);
+			else if (!strcmp(key, "old-oid") && val &&
+				 !parse_oid_hex(val, &old_oid, &val))
+				report->old_oid = oiddup(&old_oid);
+			else if (!strcmp(key, "new-oid") && val &&
+				 !parse_oid_hex(val, &new_oid, &val))
+				report->new_oid = oiddup(&new_oid);
+			else if (!strcmp(key, "forced-update"))
+				report->forced_update = 1;
+			else if (!strcmp(key, "fall-through"))
+				/* Fall through, let 'receive-pack' to execute it. */
+				hint->run_proc_receive = 0;
+			continue;
+		}
+
+		report = NULL;
+		new_report = 0;
+		refname = p;
+		p = strchr(refname, ' ');
+		if (p)
+			*p++ = '\0';
+		if (strcmp(head, "ok") && strcmp(head, "ng")) {
+			strbuf_addf(errmsg, "proc-receive reported bad status '%s' on ref '%s'\n",
+				    head, refname);
+			code = -1;
+			continue;
+		}
+
+		/* first try searching at our hint, falling back to all refs */
+		if (hint)
+			hint = find_command_by_refname(hint, refname);
+		if (!hint)
+			hint = find_command_by_refname(commands, refname);
+		if (!hint) {
+			strbuf_addf(errmsg, "proc-receive reported status on unknown ref: %s\n",
+				    refname);
+			code = -1;
+			continue;
+		}
+		if (!hint->run_proc_receive) {
+			strbuf_addf(errmsg, "proc-receive reported status on unexpected ref: %s\n",
+				    refname);
+			code = -1;
+			continue;
+		}
+		hint->run_proc_receive |= RUN_PROC_RECEIVE_RETURNED;
+		if (!strcmp(head, "ng")) {
+			if (p)
+				hint->error_string = xstrdup(p);
+			else
+				hint->error_string = "failed";
+			code = -1;
+			continue;
+		}
+		new_report = 1;
+	}
+
+	for (cmd = commands; cmd; cmd = cmd->next)
+		if (cmd->run_proc_receive && !cmd->error_string &&
+		    !(cmd->run_proc_receive & RUN_PROC_RECEIVE_RETURNED)) {
+		    cmd->error_string = "proc-receive failed to report status";
+		    code = -1;
+		}
+	return code;
+}
+
+static int run_proc_receive_hook(struct command *commands,
+				 const struct string_list *push_options)
+{
+	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;
+
+	argv[0] = find_hook("proc-receive");
+	if (!argv[0]) {
+		rp_error("cannot find hook 'proc-receive'");
+		return -1;
+	}
+	argv[1] = NULL;
+
+	proc.argv = argv;
+	proc.in = -1;
+	proc.out = -1;
+	proc.trace2_hook_name = "proc-receive";
+
+	if (use_sideband) {
+		memset(&muxer, 0, sizeof(muxer));
+		muxer.proc = copy_to_sideband;
+		muxer.in = -1;
+		code = start_async(&muxer);
+		if (code)
+			return code;
+		proc.err = muxer.in;
+	} else {
+		proc.err = 0;
+	}
+
+	code = start_command(&proc);
+	if (code) {
+		if (use_sideband)
+			finish_async(&muxer);
+		return code;
+	}
+
+	sigchain_push(SIGPIPE, SIG_IGN);
+
+	/* Version negotiaton */
+	packet_reader_init(&reader, proc.out, NULL, 0,
+			   PACKET_READ_CHOMP_NEWLINE |
+			   PACKET_READ_GENTLE_ON_EOF);
+	if (use_atomic)
+		strbuf_addstr(&cap, " atomic");
+	if (use_push_options)
+		strbuf_addstr(&cap, " push-options");
+	if (cap.len) {
+		code = packet_write_fmt_gently(proc.in, "version=1%c%s\n", '\0', cap.buf + 1);
+		strbuf_release(&cap);
+	} else {
+		code = packet_write_fmt_gently(proc.in, "version=1\n");
+	}
+	if (!code)
+		code = packet_flush_gently(proc.in);
+
+	if (!code)
+		for (;;) {
+			int linelen;
+			enum packet_read_status status;
+
+			status = packet_reader_read(&reader);
+			if (status != PACKET_READ_NORMAL) {
+				/* Check whether proc-receive exited abnormally */
+				if (status == PACKET_READ_EOF)
+					code = -1;
+				break;
+			}
+
+			if (reader.pktlen > 8 && starts_with(reader.line, "version=")) {
+				version = atoi(reader.line + 8);
+				linelen = strlen(reader.line);
+				if (linelen < reader.pktlen) {
+					const char *feature_list = reader.line + linelen + 1;
+					if (parse_feature_request(feature_list, "push-options"))
+						hook_use_push_options = 1;
+				}
+			}
+		}
+
+	if (code) {
+		strbuf_addstr(&errmsg, "fail to negotiate version with proc-receive hook");
+		goto cleanup;
+	}
+
+	switch (version) {
+	case 0:
+		/* fallthrough */
+	case 1:
+		break;
+	default:
+		strbuf_addf(&errmsg, "proc-receive version '%d' is not supported",
+			    version);
+		code = -1;
+		goto cleanup;
+	}
+
+	/* Send commands */
+	for (cmd = commands; cmd; cmd = cmd->next) {
+		if (!cmd->run_proc_receive || cmd->skip_update || cmd->error_string)
+			continue;
+		code = packet_write_fmt_gently(proc.in, "%s %s %s",
+					       oid_to_hex(&cmd->old_oid),
+					       oid_to_hex(&cmd->new_oid),
+					       cmd->ref_name);
+		if (code)
+			break;
+	}
+	if (!code)
+		code = packet_flush_gently(proc.in);
+	if (code) {
+		strbuf_addstr(&errmsg, "fail to write commands to proc-receive hook");
+		goto cleanup;
+	}
+
+	/* Send push options */
+	if (hook_use_push_options) {
+		struct string_list_item *item;
+
+		for_each_string_list_item(item, push_options) {
+			code = packet_write_fmt_gently(proc.in, "%s", item->string);
+			if (code)
+				break;
+		}
+		if (!code)
+			code = packet_flush_gently(proc.in);
+		if (code) {
+			strbuf_addstr(&errmsg,
+				      "fail to write push-options to proc-receive hook");
+			goto cleanup;
+		}
+	}
+
+	/* Read result from proc-receive */
+	code = read_proc_receive_report(&reader, commands, &errmsg);
+
+cleanup:
+	close(proc.in);
+	close(proc.out);
+	if (use_sideband)
+		finish_async(&muxer);
+	if (finish_command(&proc))
+		code = -1;
+	if (errmsg.len >0) {
+		char *p = errmsg.buf;
+
+		p += errmsg.len - 1;
+		if (*p == '\n')
+			*p = '\0';
+		rp_error("%s", errmsg.buf);
+		strbuf_release(&errmsg);
+	}
+	sigchain_pop(SIGPIPE);
+
+	return code;
 }
 
 static char *refuse_unconfigured_deny_msg =
@@ -864,7 +1309,7 @@ static void refuse_unconfigured_deny_delete_current(void)
 static int command_singleton_iterator(void *cb_data, struct object_id *oid);
 static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
 {
-	struct lock_file shallow_lock = LOCK_INIT;
+	struct shallow_lock shallow_lock = SHALLOW_LOCK_INIT;
 	struct oid_array extra = OID_ARRAY_INIT;
 	struct check_connected_options opt = CHECK_CONNECTED_INIT;
 	uint32_t mask = 1 << (cmd->index % 32);
@@ -881,12 +1326,12 @@ static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
 	opt.env = tmp_objdir_env(tmp_objdir);
 	setup_alternate_shallow(&shallow_lock, &opt.shallow_file, &extra);
 	if (check_connected(command_singleton_iterator, cmd, &opt)) {
-		rollback_lock_file(&shallow_lock);
+		rollback_shallow_file(the_repository, &shallow_lock);
 		oid_array_clear(&extra);
 		return -1;
 	}
 
-	commit_lock_file(&shallow_lock);
+	commit_shallow_file(the_repository, &shallow_lock);
 
 	/*
 	 * Make sure setup_alternate_shallow() for the next ref does
@@ -917,7 +1362,7 @@ static int head_has_history(void)
 }
 
 static const char *push_to_deploy(unsigned char *sha1,
-				  struct argv_array *env,
+				  struct strvec *env,
 				  const char *work_tree)
 {
 	const char *update_refresh[] = {
@@ -936,7 +1381,7 @@ static const char *push_to_deploy(unsigned char *sha1,
 	struct child_process child = CHILD_PROCESS_INIT;
 
 	child.argv = update_refresh;
-	child.env = env->argv;
+	child.env = env->v;
 	child.dir = work_tree;
 	child.no_stdin = 1;
 	child.stdout_to_stderr = 1;
@@ -947,7 +1392,7 @@ 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->argv;
+	child.env = env->v;
 	child.dir = work_tree;
 	child.no_stdin = 1;
 	child.stdout_to_stderr = 1;
@@ -960,7 +1405,7 @@ static const char *push_to_deploy(unsigned char *sha1,
 
 	child_process_init(&child);
 	child.argv = diff_index;
-	child.env = env->argv;
+	child.env = env->v;
 	child.no_stdin = 1;
 	child.no_stdout = 1;
 	child.stdout_to_stderr = 0;
@@ -971,7 +1416,7 @@ static const char *push_to_deploy(unsigned char *sha1,
 	read_tree[3] = hash_to_hex(sha1);
 	child_process_init(&child);
 	child.argv = read_tree;
-	child.env = env->argv;
+	child.env = env->v;
 	child.dir = work_tree;
 	child.no_stdin = 1;
 	child.no_stdout = 1;
@@ -986,34 +1431,44 @@ static const char *push_to_deploy(unsigned char *sha1,
 static const char *push_to_checkout_hook = "push-to-checkout";
 
 static const char *push_to_checkout(unsigned char *hash,
-				    struct argv_array *env,
+				    struct strvec *env,
 				    const char *work_tree)
 {
-	argv_array_pushf(env, "GIT_WORK_TREE=%s", absolute_path(work_tree));
-	if (run_hook_le(env->argv, push_to_checkout_hook,
+	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))
 		return "push-to-checkout hook declined";
 	else
 		return NULL;
 }
 
-static const char *update_worktree(unsigned char *sha1)
+static const char *update_worktree(unsigned char *sha1, const struct worktree *worktree)
 {
-	const char *retval;
-	const char *work_tree = git_work_tree_cfg ? git_work_tree_cfg : "..";
-	struct argv_array env = ARGV_ARRAY_INIT;
+	const char *retval, *work_tree, *git_dir = NULL;
+	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 (is_bare_repository())
 		return "denyCurrentBranch = updateInstead needs a worktree";
+	if (worktree)
+		git_dir = get_worktree_git_dir(worktree);
+	if (!git_dir)
+		git_dir = get_git_dir();
 
-	argv_array_pushf(&env, "GIT_DIR=%s", absolute_path(get_git_dir()));
+	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);
 	else
 		retval = push_to_checkout(sha1, &env, work_tree);
 
-	argv_array_clear(&env);
+	strvec_clear(&env);
 	return retval;
 }
 
@@ -1026,6 +1481,7 @@ 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);
 
 	/* only refs/... are allowed */
 	if (!starts_with(name, "refs/") || check_refname_format(name + 5, 0)) {
@@ -1037,7 +1493,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 	free(namespaced_name);
 	namespaced_name = strbuf_detach(&namespaced_name_buf, NULL);
 
-	if (is_ref_checked_out(namespaced_name)) {
+	if (worktree) {
 		switch (deny_current_branch) {
 		case DENY_IGNORE:
 			break;
@@ -1069,7 +1525,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 			return "deletion prohibited";
 		}
 
-		if (head_name && !strcmp(namespaced_name, head_name)) {
+		if (worktree || (head_name && !strcmp(namespaced_name, head_name))) {
 			switch (deny_delete_current) {
 			case DENY_IGNORE:
 				break;
@@ -1118,7 +1574,7 @@ static const char *update(struct command *cmd, struct shallow_info *si)
 	}
 
 	if (do_update_worktree) {
-		ret = update_worktree(new_oid->hash);
+		ret = update_worktree(new_oid->hash, find_shared_symref("HEAD", name));
 		if (ret)
 			return ret;
 	}
@@ -1180,11 +1636,11 @@ static void run_update_post_hook(struct command *commands)
 	for (cmd = commands; cmd; cmd = cmd->next) {
 		if (cmd->error_string || cmd->did_not_exist)
 			continue;
-		if (!proc.args.argc)
-			argv_array_push(&proc.args, hook);
-		argv_array_push(&proc.args, cmd->ref_name);
+		if (!proc.args.nr)
+			strvec_push(&proc.args, hook);
+		strvec_push(&proc.args, cmd->ref_name);
 	}
-	if (!proc.args.argc)
+	if (!proc.args.nr)
 		return;
 
 	proc.no_stdin = 1;
@@ -1390,7 +1846,7 @@ static void execute_commands_non_atomic(struct command *commands,
 	struct strbuf err = STRBUF_INIT;
 
 	for (cmd = commands; cmd; cmd = cmd->next) {
-		if (!should_process_cmd(cmd))
+		if (!should_process_cmd(cmd) || cmd->run_proc_receive)
 			continue;
 
 		transaction = ref_transaction_begin(&err);
@@ -1430,7 +1886,7 @@ static void execute_commands_atomic(struct command *commands,
 	}
 
 	for (cmd = commands; cmd; cmd = cmd->next) {
-		if (!should_process_cmd(cmd))
+		if (!should_process_cmd(cmd) || cmd->run_proc_receive)
 			continue;
 
 		cmd->error_string = update(cmd, si);
@@ -1466,6 +1922,7 @@ static void execute_commands(struct command *commands,
 	struct iterate_data data;
 	struct async muxer;
 	int err_fd = 0;
+	int run_proc_receive = 0;
 
 	if (unpacker_error) {
 		for (cmd = commands; cmd; cmd = cmd->next)
@@ -1495,6 +1952,22 @@ static void execute_commands(struct command *commands,
 
 	reject_updates_to_hidden(commands);
 
+	/*
+	 * Try to find commands that have special prefix in their reference names,
+	 * and mark them to run an external "proc-receive" hook later.
+	 */
+	if (proc_receive_ref) {
+		for (cmd = commands; cmd; cmd = cmd->next) {
+			if (!should_process_cmd(cmd))
+				continue;
+
+			if (proc_receive_ref_matches(cmd)) {
+				cmd->run_proc_receive = RUN_PROC_RECEIVE_SCHEDULED;
+				run_proc_receive = 1;
+			}
+		}
+	}
+
 	if (run_receive_hook(commands, "pre-receive", 0, push_options)) {
 		for (cmd = commands; cmd; cmd = cmd->next) {
 			if (!cmd->error_string)
@@ -1521,6 +1994,14 @@ static void execute_commands(struct command *commands,
 	free(head_name_to_free);
 	head_name = head_name_to_free = resolve_refdup("HEAD", 0, NULL, NULL);
 
+	if (run_proc_receive &&
+	    run_proc_receive_hook(commands, push_options))
+		for (cmd = commands; cmd; cmd = cmd->next)
+			if (!cmd->error_string &&
+			    !(cmd->run_proc_receive & RUN_PROC_RECEIVE_RETURNED) &&
+			    (cmd->run_proc_receive || use_atomic))
+				cmd->error_string = "fail to run proc-receive hook";
+
 	if (use_atomic)
 		execute_commands_atomic(commands, si);
 	else
@@ -1568,7 +2049,7 @@ static void queue_commands_from_cert(struct command **tail,
 		die("malformed push certificate %.*s", 100, push_cert->buf);
 	else
 		boc += 2;
-	eoc = push_cert->buf + parse_signature(push_cert->buf, push_cert->len);
+	eoc = push_cert->buf + parse_signed_buffer(push_cert->buf, push_cert->len);
 
 	while (boc < eoc) {
 		const char *eol = memchr(boc, '\n', eoc - boc);
@@ -1600,8 +2081,13 @@ static struct command *read_head_info(struct packet_reader *reader,
 		linelen = strlen(reader->line);
 		if (linelen < reader->pktlen) {
 			const char *feature_list = reader->line + linelen + 1;
+			const char *hash = NULL;
+			const char *client_sid;
+			int len = 0;
 			if (parse_feature_request(feature_list, "report-status"))
 				report_status = 1;
+			if (parse_feature_request(feature_list, "report-status-v2"))
+				report_status_v2 = 1;
 			if (parse_feature_request(feature_list, "side-band-64k"))
 				use_sideband = LARGE_PACKET_MAX;
 			if (parse_feature_request(feature_list, "quiet"))
@@ -1612,6 +2098,19 @@ static struct command *read_head_info(struct packet_reader *reader,
 			if (advertise_push_options
 			    && parse_feature_request(feature_list, "push-options"))
 				use_push_options = 1;
+			hash = parse_feature_value(feature_list, "object-format", &len, NULL);
+			if (!hash) {
+				hash = hash_algos[GIT_HASH_SHA1].name;
+				len = strlen(hash);
+			}
+			if (xstrncmpz(the_hash_algo->name, hash, len))
+				die("error: unsupported object format '%s'", hash);
+			client_sid = parse_feature_value(feature_list, "session-id", &len, NULL);
+			if (client_sid) {
+				char *sid = xstrndup(client_sid, len);
+				trace2_data_string("transfer", NULL, "client-sid", client_sid);
+				free(sid);
+			}
 		}
 
 		if (!strcmp(reader->line, "push-cert")) {
@@ -1681,10 +2180,10 @@ static const char *parse_pack_header(struct pack_header *hdr)
 
 static const char *pack_lockfile;
 
-static void push_header_arg(struct argv_array *args, struct pack_header *hdr)
+static void push_header_arg(struct strvec *args, struct pack_header *hdr)
 {
-	argv_array_pushf(args, "--pack_header=%"PRIu32",%"PRIu32,
-			ntohl(hdr->hdr_version), ntohl(hdr->hdr_entries));
+	strvec_pushf(args, "--pack_header=%"PRIu32",%"PRIu32,
+		     ntohl(hdr->hdr_version), ntohl(hdr->hdr_entries));
 }
 
 static const char *unpack(int err_fd, struct shallow_info *si)
@@ -1708,8 +2207,8 @@ static const char *unpack(int err_fd, struct shallow_info *si)
 
 	if (si->nr_ours || si->nr_theirs) {
 		alt_shallow_file = setup_temporary_shallow(si->shallow);
-		argv_array_push(&child.args, "--shallow-file");
-		argv_array_push(&child.args, alt_shallow_file);
+		strvec_push(&child.args, "--shallow-file");
+		strvec_push(&child.args, alt_shallow_file);
 	}
 
 	tmp_objdir = tmp_objdir_create();
@@ -1728,16 +2227,16 @@ static const char *unpack(int err_fd, struct shallow_info *si)
 	tmp_objdir_add_as_alternate(tmp_objdir);
 
 	if (ntohl(hdr.hdr_entries) < unpack_limit) {
-		argv_array_push(&child.args, "unpack-objects");
+		strvec_push(&child.args, "unpack-objects");
 		push_header_arg(&child.args, &hdr);
 		if (quiet)
-			argv_array_push(&child.args, "-q");
+			strvec_push(&child.args, "-q");
 		if (fsck_objects)
-			argv_array_pushf(&child.args, "--strict%s",
-				fsck_msg_types.buf);
+			strvec_pushf(&child.args, "--strict%s",
+				     fsck_msg_types.buf);
 		if (max_input_size)
-			argv_array_pushf(&child.args, "--max-input-size=%"PRIuMAX,
-				(uintmax_t)max_input_size);
+			strvec_pushf(&child.args, "--max-input-size=%"PRIuMAX,
+				     (uintmax_t)max_input_size);
 		child.no_stdout = 1;
 		child.err = err_fd;
 		child.git_cmd = 1;
@@ -1747,35 +2246,35 @@ static const char *unpack(int err_fd, struct shallow_info *si)
 	} else {
 		char hostname[HOST_NAME_MAX + 1];
 
-		argv_array_pushl(&child.args, "index-pack", "--stdin", NULL);
+		strvec_pushl(&child.args, "index-pack", "--stdin", NULL);
 		push_header_arg(&child.args, &hdr);
 
 		if (xgethostname(hostname, sizeof(hostname)))
 			xsnprintf(hostname, sizeof(hostname), "localhost");
-		argv_array_pushf(&child.args,
-				 "--keep=receive-pack %"PRIuMAX" on %s",
-				 (uintmax_t)getpid(),
-				 hostname);
+		strvec_pushf(&child.args,
+			     "--keep=receive-pack %"PRIuMAX" on %s",
+			     (uintmax_t)getpid(),
+			     hostname);
 
 		if (!quiet && err_fd)
-			argv_array_push(&child.args, "--show-resolving-progress");
+			strvec_push(&child.args, "--show-resolving-progress");
 		if (use_sideband)
-			argv_array_push(&child.args, "--report-end-of-input");
+			strvec_push(&child.args, "--report-end-of-input");
 		if (fsck_objects)
-			argv_array_pushf(&child.args, "--strict%s",
-				fsck_msg_types.buf);
+			strvec_pushf(&child.args, "--strict%s",
+				     fsck_msg_types.buf);
 		if (!reject_thin)
-			argv_array_push(&child.args, "--fix-thin");
+			strvec_push(&child.args, "--fix-thin");
 		if (max_input_size)
-			argv_array_pushf(&child.args, "--max-input-size=%"PRIuMAX,
-				(uintmax_t)max_input_size);
+			strvec_pushf(&child.args, "--max-input-size=%"PRIuMAX,
+				     (uintmax_t)max_input_size);
 		child.out = -1;
 		child.err = err_fd;
 		child.git_cmd = 1;
 		status = start_command(&child);
 		if (status)
 			return "index-pack fork failed";
-		pack_lockfile = index_pack_lockfile(child.out);
+		pack_lockfile = index_pack_lockfile(child.out, NULL);
 		close(child.out);
 		status = finish_command(&child);
 		if (status)
@@ -1813,11 +2312,9 @@ static void prepare_shallow_update(struct shallow_info *si)
 	ALLOC_ARRAY(si->used_shallow, si->shallow->nr);
 	assign_shallow_commits_to_refs(si, si->used_shallow, NULL);
 
-	si->need_reachability_test =
-		xcalloc(si->shallow->nr, sizeof(*si->need_reachability_test));
-	si->reachable =
-		xcalloc(si->shallow->nr, sizeof(*si->reachable));
-	si->shallow_ref = xcalloc(si->ref->nr, sizeof(*si->shallow_ref));
+	CALLOC_ARRAY(si->need_reachability_test, si->shallow->nr);
+	CALLOC_ARRAY(si->reachable, si->shallow->nr);
+	CALLOC_ARRAY(si->shallow_ref, si->ref->nr);
 
 	for (i = 0; i < si->nr_ours; i++)
 		si->need_reachability_test[si->ours[i]] = 1;
@@ -1913,6 +2410,51 @@ static void report(struct command *commands, const char *unpack_status)
 	strbuf_release(&buf);
 }
 
+static void report_v2(struct command *commands, const char *unpack_status)
+{
+	struct command *cmd;
+	struct strbuf buf = STRBUF_INIT;
+	struct ref_push_report *report;
+
+	packet_buf_write(&buf, "unpack %s\n",
+			 unpack_status ? unpack_status : "ok");
+	for (cmd = commands; cmd; cmd = cmd->next) {
+		int count = 0;
+
+		if (cmd->error_string) {
+			packet_buf_write(&buf, "ng %s %s\n",
+					 cmd->ref_name,
+					 cmd->error_string);
+			continue;
+		}
+		packet_buf_write(&buf, "ok %s\n",
+				 cmd->ref_name);
+		for (report = cmd->report; report; report = report->next) {
+			if (count++ > 0)
+				packet_buf_write(&buf, "ok %s\n",
+						 cmd->ref_name);
+			if (report->ref_name)
+				packet_buf_write(&buf, "option refname %s\n",
+						 report->ref_name);
+			if (report->old_oid)
+				packet_buf_write(&buf, "option old-oid %s\n",
+						 oid_to_hex(report->old_oid));
+			if (report->new_oid)
+				packet_buf_write(&buf, "option new-oid %s\n",
+						 oid_to_hex(report->new_oid));
+			if (report->forced_update)
+				packet_buf_write(&buf, "option forced-update\n");
+		}
+	}
+	packet_buf_flush(&buf);
+
+	if (use_sideband)
+		send_sideband(1, 1, buf.buf, buf.len, use_sideband);
+	else
+		write_or_die(1, buf.buf, buf.len);
+	strbuf_release(&buf);
+}
+
 static int delete_only(struct command *commands)
 {
 	struct command *cmd;
@@ -2021,7 +2563,9 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix)
 				 &push_options);
 		if (pack_lockfile)
 			unlink_or_warn(pack_lockfile);
-		if (report_status)
+		if (report_status_v2)
+			report_v2(commands, unpack_status);
+		else if (report_status)
 			report(commands, unpack_status);
 		run_receive_hook(commands, "post-receive", 1,
 				 &push_options);
diff --git a/builtin/reflog.c b/builtin/reflog.c
index 4d3430900d..09541d1c80 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -459,7 +459,7 @@ static struct reflog_expire_cfg *find_cfg_ent(const char *pattern, size_t len)
 static int reflog_expire_config(const char *var, const char *value, void *cb)
 {
 	const char *pattern, *key;
-	int pattern_len;
+	size_t pattern_len;
 	timestamp_t expire;
 	int slot;
 	struct reflog_expire_cfg *ent;
@@ -560,15 +560,16 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 
 	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 (starts_with(arg, "--expire=")) {
-			if (parse_expiry_date(arg + 9, &cb.cmd.expire_total))
+		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 (starts_with(arg, "--expire-unreachable=")) {
-			if (parse_expiry_date(arg + 21, &cb.cmd.expire_unreachable))
+		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;
 		}
@@ -601,6 +602,9 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 	 */
 	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)
 			printf(_("Marking reachable objects..."));
 		mark_reachable_objects(&cb.cmd.revs, 0, 0, NULL);
@@ -614,7 +618,7 @@ static int cmd_reflog_expire(int argc, const char **argv, const char *prefix)
 		int i;
 
 		memset(&collected, 0, sizeof(collected));
-		worktrees = get_worktrees(0);
+		worktrees = get_worktrees();
 		for (p = worktrees; *p; p++) {
 			if (!all_worktrees && !(*p)->is_current)
 				continue;
diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index 6a9127a33c..fd3538d4f0 100644
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -117,12 +117,12 @@ static char *strip_escapes(const char *str, const char *service,
 	}
 }
 
-static void parse_argv(struct argv_array *out, const char *arg, const char *service)
+static void parse_argv(struct strvec *out, const char *arg, const char *service)
 {
 	while (*arg) {
 		char *expanded = strip_escapes(arg, service, &arg);
 		if (expanded)
-			argv_array_push(out, expanded);
+			strvec_push(out, expanded);
 		free(expanded);
 	}
 }
diff --git a/builtin/remote.c b/builtin/remote.c
index 5591cef775..7f88e6ce9d 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -6,10 +6,11 @@
 #include "string-list.h"
 #include "strbuf.h"
 #include "run-command.h"
+#include "rebase.h"
 #include "refs.h"
 #include "refspec.h"
 #include "object-store.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "commit-reach.h"
 
 static const char * const builtin_remote_usage[] = {
@@ -169,9 +170,9 @@ static int add(int argc, const char **argv)
 		OPT_STRING_LIST('t', "track", &track, N_("branch"),
 				N_("branch(es) to track")),
 		OPT_STRING('m', "master", &master, N_("branch"), N_("master branch")),
-		{ OPTION_CALLBACK, 0, "mirror", &mirror, "(push|fetch)",
+		OPT_CALLBACK_F(0, "mirror", &mirror, "(push|fetch)",
 			N_("set up remote as a mirror to push to or fetch from"),
-			PARSE_OPT_OPTARG | PARSE_OPT_COMP_ARG, parse_mirror_opt },
+			PARSE_OPT_OPTARG | PARSE_OPT_COMP_ARG, parse_mirror_opt),
 		OPT_END()
 	};
 
@@ -190,11 +191,12 @@ static int add(int argc, const char **argv)
 	url = argv[1];
 
 	remote = remote_get(name);
-	if (remote_is_configured(remote, 1))
-		die(_("remote %s already exists."), name);
+	if (remote_is_configured(remote, 1)) {
+		error(_("remote %s already exists."), name);
+		exit(3);
+	}
 
-	strbuf_addf(&buf2, "refs/heads/test:refs/remotes/%s/test", name);
-	if (!valid_fetch_refspec(buf2.buf))
+	if (!valid_remote_name(name))
 		die(_("'%s' is not a valid remote name"), name);
 
 	strbuf_addf(&buf, "remote.%s.url", name);
@@ -219,7 +221,7 @@ static int add(int argc, const char **argv)
 
 	if (fetch_tags != TAGS_DEFAULT) {
 		strbuf_reset(&buf);
-		strbuf_addf(&buf, "remote.%s.tagopt", name);
+		strbuf_addf(&buf, "remote.%s.tagOpt", name);
 		git_config_set(buf.buf,
 			       fetch_tags == TAGS_SET ? "--tags" : "--no-tags");
 	}
@@ -248,9 +250,8 @@ static int add(int argc, const char **argv)
 struct branch_info {
 	char *remote_name;
 	struct string_list merge;
-	enum {
-		NO_REBASE, NORMAL_REBASE, INTERACTIVE_REBASE, REBASE_MERGES
-	} rebase;
+	enum rebase_type rebase;
+	char *push_remote_name;
 };
 
 static struct string_list branch_list = STRING_LIST_INIT_NODUP;
@@ -264,59 +265,69 @@ static const char *abbrev_ref(const char *name, const char *prefix)
 
 static int config_read_branches(const char *key, const char *value, void *cb)
 {
-	if (starts_with(key, "branch.")) {
-		const char *orig_key = key;
-		char *name;
-		struct string_list_item *item;
-		struct branch_info *info;
-		enum { REMOTE, MERGE, REBASE } type;
-		size_t key_len;
-
-		key += 7;
-		if (strip_suffix(key, ".remote", &key_len)) {
-			name = xmemdupz(key, key_len);
-			type = REMOTE;
-		} else if (strip_suffix(key, ".merge", &key_len)) {
-			name = xmemdupz(key, key_len);
-			type = MERGE;
-		} else if (strip_suffix(key, ".rebase", &key_len)) {
-			name = xmemdupz(key, key_len);
-			type = REBASE;
-		} else
-			return 0;
+	const char *orig_key = key;
+	char *name;
+	struct string_list_item *item;
+	struct branch_info *info;
+	enum { REMOTE, MERGE, REBASE, PUSH_REMOTE } type;
+	size_t key_len;
 
-		item = string_list_insert(&branch_list, name);
+	if (!starts_with(key, "branch."))
+		return 0;
 
-		if (!item->util)
-			item->util = xcalloc(1, sizeof(struct branch_info));
-		info = item->util;
-		if (type == REMOTE) {
-			if (info->remote_name)
-				warning(_("more than one %s"), orig_key);
-			info->remote_name = xstrdup(value);
-		} else if (type == MERGE) {
-			char *space = strchr(value, ' ');
-			value = abbrev_branch(value);
-			while (space) {
-				char *merge;
-				merge = xstrndup(value, space - value);
-				string_list_append(&info->merge, merge);
-				value = abbrev_branch(space + 1);
-				space = strchr(value, ' ');
-			}
-			string_list_append(&info->merge, xstrdup(value));
-		} else {
-			int v = git_parse_maybe_bool(value);
-			if (v >= 0)
-				info->rebase = v;
-			else if (!strcmp(value, "preserve"))
-				info->rebase = NORMAL_REBASE;
-			else if (!strcmp(value, "merges"))
-				info->rebase = REBASE_MERGES;
-			else if (!strcmp(value, "interactive"))
-				info->rebase = INTERACTIVE_REBASE;
+	key += strlen("branch.");
+	if (strip_suffix(key, ".remote", &key_len))
+		type = REMOTE;
+	else if (strip_suffix(key, ".merge", &key_len))
+		type = MERGE;
+	else if (strip_suffix(key, ".rebase", &key_len))
+		type = REBASE;
+	else if (strip_suffix(key, ".pushremote", &key_len))
+		type = PUSH_REMOTE;
+	else
+		return 0;
+	name = xmemdupz(key, key_len);
+
+	item = string_list_insert(&branch_list, name);
+
+	if (!item->util)
+		item->util = xcalloc(1, sizeof(struct branch_info));
+	info = item->util;
+	switch (type) {
+	case REMOTE:
+		if (info->remote_name)
+			warning(_("more than one %s"), orig_key);
+		info->remote_name = xstrdup(value);
+		break;
+	case MERGE: {
+		char *space = strchr(value, ' ');
+		value = abbrev_branch(value);
+		while (space) {
+			char *merge;
+			merge = xstrndup(value, space - value);
+			string_list_append(&info->merge, merge);
+			value = abbrev_branch(space + 1);
+			space = strchr(value, ' ');
 		}
+		string_list_append(&info->merge, xstrdup(value));
+		break;
+	}
+	case REBASE:
+		/*
+		 * Consider invalid values as false and check the
+		 * truth value with >= REBASE_TRUE.
+		 */
+		info->rebase = rebase_parse_value(value);
+		break;
+	case PUSH_REMOTE:
+		if (info->push_remote_name)
+			warning(_("more than one %s"), orig_key);
+		info->push_remote_name = xstrdup(value);
+		break;
+	default:
+		BUG("unexpected type=%d", type);
 	}
+
 	return 0;
 }
 
@@ -468,6 +479,7 @@ static int get_head_names(const struct ref *remote_refs, struct ref_states *stat
 	struct ref *fetch_map = NULL, **fetch_map_tail = &fetch_map;
 	struct refspec_item refspec;
 
+	memset(&refspec, 0, sizeof(refspec));
 	refspec.force = 0;
 	refspec.pattern = 1;
 	refspec.src = refspec.dst = "refs/heads/*";
@@ -605,6 +617,56 @@ static int migrate_file(struct remote *remote)
 	return 0;
 }
 
+struct push_default_info
+{
+	const char *old_name;
+	enum config_scope scope;
+	struct strbuf origin;
+	int linenr;
+};
+
+static int config_read_push_default(const char *key, const char *value,
+	void *cb)
+{
+	struct push_default_info* info = cb;
+	if (strcmp(key, "remote.pushdefault") ||
+	    !value || strcmp(value, info->old_name))
+		return 0;
+
+	info->scope = current_config_scope();
+	strbuf_reset(&info->origin);
+	strbuf_addstr(&info->origin, current_config_name());
+	info->linenr = current_config_line();
+
+	return 0;
+}
+
+static void handle_push_default(const char* old_name, const char* new_name)
+{
+	struct push_default_info push_default = {
+		old_name, CONFIG_SCOPE_UNKNOWN, STRBUF_INIT, -1 };
+	git_config(config_read_push_default, &push_default);
+	if (push_default.scope >= CONFIG_SCOPE_COMMAND)
+		; /* pass */
+	else if (push_default.scope >= CONFIG_SCOPE_LOCAL) {
+		int result = git_config_set_gently("remote.pushDefault",
+						   new_name);
+		if (new_name && result && result != CONFIG_NOTHING_SET)
+			die(_("could not set '%s'"), "remote.pushDefault");
+		else if (!new_name && result && result != CONFIG_NOTHING_SET)
+			die(_("could not unset '%s'"), "remote.pushDefault");
+	} else if (push_default.scope >= CONFIG_SCOPE_SYSTEM) {
+		/* warn */
+		warning(_("The %s configuration remote.pushDefault in:\n"
+			  "\t%s:%d\n"
+			  "now names the non-existent remote '%s'"),
+			config_scope_name(push_default.scope),
+			push_default.origin.buf, push_default.linenr,
+			old_name);
+	}
+}
+
+
 static int mv(int argc, const char **argv)
 {
 	struct option options[] = {
@@ -625,21 +687,23 @@ static int mv(int argc, const char **argv)
 	rename.remote_branches = &remote_branches;
 
 	oldremote = remote_get(rename.old_name);
-	if (!remote_is_configured(oldremote, 1))
-		die(_("No such remote: '%s'"), rename.old_name);
+	if (!remote_is_configured(oldremote, 1)) {
+		error(_("No such remote: '%s'"), rename.old_name);
+		exit(2);
+	}
 
 	if (!strcmp(rename.old_name, rename.new_name) && oldremote->origin != REMOTE_CONFIG)
 		return migrate_file(oldremote);
 
 	newremote = remote_get(rename.new_name);
-	if (remote_is_configured(newremote, 1))
-		die(_("remote %s already exists."), rename.new_name);
+	if (remote_is_configured(newremote, 1)) {
+		error(_("remote %s already exists."), rename.new_name);
+		exit(3);
+	}
 
-	strbuf_addf(&buf, "refs/heads/test:refs/remotes/%s/test", rename.new_name);
-	if (!valid_fetch_refspec(buf.buf))
+	if (!valid_remote_name(rename.new_name))
 		die(_("'%s' is not a valid remote name"), rename.new_name);
 
-	strbuf_reset(&buf);
 	strbuf_addf(&buf, "remote.%s", rename.old_name);
 	strbuf_addf(&buf2, "remote.%s", rename.new_name);
 	if (git_config_rename_section(buf.buf, buf2.buf) < 1)
@@ -648,7 +712,7 @@ static int mv(int argc, const char **argv)
 
 	strbuf_reset(&buf);
 	strbuf_addf(&buf, "remote.%s.fetch", rename.new_name);
-	git_config_set_multivar(buf.buf, NULL, NULL, 1);
+	git_config_set_multivar(buf.buf, NULL, NULL, CONFIG_FLAGS_MULTI_REPLACE);
 	strbuf_addf(&old_remote_context, ":refs/remotes/%s/", rename.old_name);
 	for (i = 0; i < oldremote->fetch.raw_nr; i++) {
 		char *ptr;
@@ -680,6 +744,11 @@ static int mv(int argc, const char **argv)
 			strbuf_addf(&buf, "branch.%s.remote", item->string);
 			git_config_set(buf.buf, rename.new_name);
 		}
+		if (info->push_remote_name && !strcmp(info->push_remote_name, rename.old_name)) {
+			strbuf_reset(&buf);
+			strbuf_addf(&buf, "branch.%s.pushRemote", item->string);
+			git_config_set(buf.buf, rename.new_name);
+		}
 	}
 
 	if (!refspec_updated)
@@ -693,9 +762,8 @@ static int mv(int argc, const char **argv)
 	for (i = 0; i < remote_branches.nr; i++) {
 		struct string_list_item *item = remote_branches.items + i;
 		int flag = 0;
-		struct object_id oid;
 
-		read_ref_full(item->string, RESOLVE_REF_READING, &oid, &flag);
+		read_ref_full(item->string, RESOLVE_REF_READING, NULL, &flag);
 		if (!(flag & REF_ISSYMREF))
 			continue;
 		if (delete_ref(NULL, item->string, NULL, REF_NO_DEREF))
@@ -736,6 +804,9 @@ static int mv(int argc, const char **argv)
 			die(_("creating '%s' failed"), buf.buf);
 	}
 	string_list_clear(&remote_branches, 1);
+
+	handle_push_default(rename.old_name, rename.new_name);
+
 	return 0;
 }
 
@@ -761,8 +832,10 @@ static int rm(int argc, const char **argv)
 		usage_with_options(builtin_remote_rm_usage, options);
 
 	remote = remote_get(argv[1]);
-	if (!remote_is_configured(remote, 1))
-		die(_("No such remote: '%s'"), argv[1]);
+	if (!remote_is_configured(remote, 1)) {
+		error(_("No such remote: '%s'"), argv[1]);
+		exit(2);
+	}
 
 	known_remotes.to_delete = remote;
 	for_each_remote(add_known_remote, &known_remotes);
@@ -782,6 +855,13 @@ static int rm(int argc, const char **argv)
 					die(_("could not unset '%s'"), buf.buf);
 			}
 		}
+		if (info->push_remote_name && !strcmp(info->push_remote_name, remote->name)) {
+			strbuf_reset(&buf);
+			strbuf_addf(&buf, "branch.%s.pushremote", item->string);
+			result = git_config_set_gently(buf.buf, NULL);
+			if (result && result != CONFIG_NOTHING_SET)
+				die(_("could not unset '%s'"), buf.buf);
+		}
 	}
 
 	/*
@@ -814,6 +894,8 @@ static int rm(int argc, const char **argv)
 		strbuf_addf(&buf, "remote.%s", remote->name);
 		if (git_config_rename_section(buf.buf, NULL) < 1)
 			return error(_("Could not remove config section '%s'"), buf.buf);
+
+		handle_push_default(remote->name, NULL);
 	}
 
 	return result;
@@ -856,9 +938,6 @@ static int get_remote_ref_states(const char *name,
 				 struct ref_states *states,
 				 int query)
 {
-	struct transport *transport;
-	const struct ref *remote_refs;
-
 	states->remote = remote_get(name);
 	if (!states->remote)
 		return error(_("No such remote: '%s'"), name);
@@ -866,10 +945,12 @@ static int get_remote_ref_states(const char *name,
 	read_branches();
 
 	if (query) {
+		struct transport *transport;
+		const struct ref *remote_refs;
+
 		transport = transport_get(states->remote, states->remote->url_nr > 0 ?
 			states->remote->url[0] : NULL);
 		remote_refs = transport_get_remote_refs(transport, NULL);
-		transport_disconnect(transport);
 
 		states->queried = 1;
 		if (query & GET_REF_STATES)
@@ -878,6 +959,7 @@ static int get_remote_ref_states(const char *name,
 			get_head_names(remote_refs, states);
 		if (query & GET_PUSH_REF_STATES)
 			get_push_ref_states(remote_refs, states);
+		transport_disconnect(transport);
 	} else {
 		for_each_ref(append_ref_to_tracked_list, states);
 		string_list_sort(&states->tracked);
@@ -944,7 +1026,7 @@ static int add_local_to_show_info(struct string_list_item *branch_item, void *cb
 		return 0;
 	if ((n = strlen(branch_item->string)) > show_info->width)
 		show_info->width = n;
-	if (branch_info->rebase)
+	if (branch_info->rebase >= REBASE_TRUE)
 		show_info->any_rebase = 1;
 
 	item = string_list_insert(show_info->list, branch_item->string);
@@ -961,16 +1043,16 @@ static int show_local_info_item(struct string_list_item *item, void *cb_data)
 	int width = show_info->width + 4;
 	int i;
 
-	if (branch_info->rebase && branch_info->merge.nr > 1) {
+	if (branch_info->rebase >= REBASE_TRUE && branch_info->merge.nr > 1) {
 		error(_("invalid branch.%s.merge; cannot rebase onto > 1 branch"),
 			item->string);
 		return 0;
 	}
 
 	printf("    %-*s ", show_info->width, item->string);
-	if (branch_info->rebase) {
+	if (branch_info->rebase >= REBASE_TRUE) {
 		const char *msg;
-		if (branch_info->rebase == INTERACTIVE_REBASE)
+		if (branch_info->rebase == REBASE_INTERACTIVE)
 			msg = _("rebases interactively onto remote %s");
 		else if (branch_info->rebase == REBASE_MERGES)
 			msg = _("rebases interactively (with merges) onto "
@@ -1279,7 +1361,7 @@ static int set_head(int argc, const char **argv)
 			result |= error(_("Not a valid ref: %s"), buf2.buf);
 		else if (create_symref(buf.buf, buf2.buf, "remote set-head"))
 			result |= error(_("Could not setup %s"), buf.buf);
-		if (opt_a)
+		else if (opt_a)
 			printf("%s/HEAD set to %s\n", argv[0], head_name);
 		free(head_name);
 	}
@@ -1375,41 +1457,42 @@ static int update(int argc, const char **argv)
 			 N_("prune remotes after fetching")),
 		OPT_END()
 	};
-	struct argv_array fetch_argv = ARGV_ARRAY_INIT;
+	struct strvec fetch_argv = STRVEC_INIT;
 	int default_defined = 0;
 	int retval;
 
 	argc = parse_options(argc, argv, NULL, options, builtin_remote_update_usage,
 			     PARSE_OPT_KEEP_ARGV0);
 
-	argv_array_push(&fetch_argv, "fetch");
+	strvec_push(&fetch_argv, "fetch");
 
 	if (prune != -1)
-		argv_array_push(&fetch_argv, prune ? "--prune" : "--no-prune");
+		strvec_push(&fetch_argv, prune ? "--prune" : "--no-prune");
 	if (verbose)
-		argv_array_push(&fetch_argv, "-v");
-	argv_array_push(&fetch_argv, "--multiple");
+		strvec_push(&fetch_argv, "-v");
+	strvec_push(&fetch_argv, "--multiple");
 	if (argc < 2)
-		argv_array_push(&fetch_argv, "default");
+		strvec_push(&fetch_argv, "default");
 	for (i = 1; i < argc; i++)
-		argv_array_push(&fetch_argv, argv[i]);
+		strvec_push(&fetch_argv, argv[i]);
 
-	if (strcmp(fetch_argv.argv[fetch_argv.argc-1], "default") == 0) {
+	if (strcmp(fetch_argv.v[fetch_argv.nr-1], "default") == 0) {
 		git_config(get_remote_default, &default_defined);
 		if (!default_defined) {
-			argv_array_pop(&fetch_argv);
-			argv_array_push(&fetch_argv, "--all");
+			strvec_pop(&fetch_argv);
+			strvec_push(&fetch_argv, "--all");
 		}
 	}
 
-	retval = run_command_v_opt(fetch_argv.argv, RUN_GIT_CMD);
-	argv_array_clear(&fetch_argv);
+	retval = run_command_v_opt(fetch_argv.v, RUN_GIT_CMD);
+	strvec_clear(&fetch_argv);
 	return retval;
 }
 
 static int remove_all_fetch_refspecs(const char *key)
 {
-	return git_config_set_multivar_gently(key, NULL, NULL, 1);
+	return git_config_set_multivar_gently(key, NULL, NULL,
+					      CONFIG_FLAGS_MULTI_REPLACE);
 }
 
 static void add_branches(struct remote *remote, const char **branches,
@@ -1434,8 +1517,10 @@ static int set_remote_branches(const char *remotename, const char **branches,
 	strbuf_addf(&key, "remote.%s.fetch", remotename);
 
 	remote = remote_get(remotename);
-	if (!remote_is_configured(remote, 1))
-		die(_("No such remote '%s'"), remotename);
+	if (!remote_is_configured(remote, 1)) {
+		error(_("No such remote '%s'"), remotename);
+		exit(2);
+	}
 
 	if (!add_mode && remove_all_fetch_refspecs(key.buf)) {
 		strbuf_release(&key);
@@ -1488,8 +1573,10 @@ static int get_url(int argc, const char **argv)
 	remotename = argv[0];
 
 	remote = remote_get(remotename);
-	if (!remote_is_configured(remote, 1))
-		die(_("No such remote '%s'"), remotename);
+	if (!remote_is_configured(remote, 1)) {
+		error(_("No such remote '%s'"), remotename);
+		exit(2);
+	}
 
 	url_nr = 0;
 	if (push_mode) {
@@ -1556,8 +1643,10 @@ static int set_url(int argc, const char **argv)
 		oldurl = newurl;
 
 	remote = remote_get(remotename);
-	if (!remote_is_configured(remote, 1))
-		die(_("No such remote '%s'"), remotename);
+	if (!remote_is_configured(remote, 1)) {
+		error(_("No such remote '%s'"), remotename);
+		exit(2);
+	}
 
 	if (push_mode) {
 		strbuf_addf(&name_buf, "remote.%s.pushurl", remotename);
@@ -1598,7 +1687,8 @@ static int set_url(int argc, const char **argv)
 	if (!delete_mode)
 		git_config_set_multivar(name_buf.buf, newurl, oldurl, 0);
 	else
-		git_config_set_multivar(name_buf.buf, NULL, oldurl, 1);
+		git_config_set_multivar(name_buf.buf, NULL, oldurl,
+					CONFIG_FLAGS_MULTI_REPLACE);
 out:
 	strbuf_release(&name_buf);
 	return 0;
diff --git a/builtin/repack.c b/builtin/repack.c
index 78b23d7a9a..5f9bc74adc 100644
--- a/builtin/repack.c
+++ b/builtin/repack.c
@@ -7,17 +7,20 @@
 #include "sigchain.h"
 #include "strbuf.h"
 #include "string-list.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "midx.h"
 #include "packfile.h"
+#include "prune-packed.h"
 #include "object-store.h"
 #include "promisor-remote.h"
+#include "shallow.h"
+#include "pack.h"
 
 static int delta_base_offset = 1;
 static int pack_kept_objects = -1;
 static int write_bitmaps = -1;
 static int use_delta_islands;
-static char *packdir, *packtmp;
+static char *packdir, *packtmp_name, *packtmp;
 
 static const char *const git_repack_usage[] = {
 	N_("git repack [<options>]"),
@@ -131,7 +134,11 @@ static void get_non_kept_pack_filenames(struct string_list *fname_list,
 static void remove_redundant_pack(const char *dir_name, const char *base_name)
 {
 	struct strbuf buf = STRBUF_INIT;
-	strbuf_addf(&buf, "%s/%s.pack", dir_name, base_name);
+	struct multi_pack_index *m = get_local_multi_pack_index(the_repository);
+	strbuf_addf(&buf, "%s.pack", base_name);
+	if (m && midx_contains_pack(m, buf.buf))
+		clear_midx_file(the_repository);
+	strbuf_insertf(&buf, 0, "%s/", dir_name);
 	unlink_pack_path(buf.buf, 1);
 	strbuf_release(&buf);
 }
@@ -151,28 +158,28 @@ struct pack_objects_args {
 static void prepare_pack_objects(struct child_process *cmd,
 				 const struct pack_objects_args *args)
 {
-	argv_array_push(&cmd->args, "pack-objects");
+	strvec_push(&cmd->args, "pack-objects");
 	if (args->window)
-		argv_array_pushf(&cmd->args, "--window=%s", args->window);
+		strvec_pushf(&cmd->args, "--window=%s", args->window);
 	if (args->window_memory)
-		argv_array_pushf(&cmd->args, "--window-memory=%s", args->window_memory);
+		strvec_pushf(&cmd->args, "--window-memory=%s", args->window_memory);
 	if (args->depth)
-		argv_array_pushf(&cmd->args, "--depth=%s", args->depth);
+		strvec_pushf(&cmd->args, "--depth=%s", args->depth);
 	if (args->threads)
-		argv_array_pushf(&cmd->args, "--threads=%s", args->threads);
+		strvec_pushf(&cmd->args, "--threads=%s", args->threads);
 	if (args->max_pack_size)
-		argv_array_pushf(&cmd->args, "--max-pack-size=%s", args->max_pack_size);
+		strvec_pushf(&cmd->args, "--max-pack-size=%s", args->max_pack_size);
 	if (args->no_reuse_delta)
-		argv_array_pushf(&cmd->args, "--no-reuse-delta");
+		strvec_pushf(&cmd->args, "--no-reuse-delta");
 	if (args->no_reuse_object)
-		argv_array_pushf(&cmd->args, "--no-reuse-object");
+		strvec_pushf(&cmd->args, "--no-reuse-object");
 	if (args->local)
-		argv_array_push(&cmd->args,  "--local");
+		strvec_push(&cmd->args,  "--local");
 	if (args->quiet)
-		argv_array_push(&cmd->args,  "--quiet");
+		strvec_push(&cmd->args,  "--quiet");
 	if (delta_base_offset)
-		argv_array_push(&cmd->args,  "--delta-base-offset");
-	argv_array_push(&cmd->args, packtmp);
+		strvec_push(&cmd->args,  "--delta-base-offset");
+	strvec_push(&cmd->args, packtmp);
 	cmd->git_cmd = 1;
 	cmd->out = -1;
 }
@@ -196,6 +203,38 @@ static int write_oid(const struct object_id *oid, struct packed_git *pack,
 	return 0;
 }
 
+static struct {
+	const char *name;
+	unsigned optional:1;
+} exts[] = {
+	{".pack"},
+	{".idx"},
+	{".rev", 1},
+	{".bitmap", 1},
+	{".promisor", 1},
+};
+
+static unsigned populate_pack_exts(char *name)
+{
+	struct stat statbuf;
+	struct strbuf path = STRBUF_INIT;
+	unsigned ret = 0;
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(exts); i++) {
+		strbuf_reset(&path);
+		strbuf_addf(&path, "%s-%s%s", packtmp, name, exts[i].name);
+
+		if (stat(path.buf, &statbuf))
+			continue;
+
+		ret |= (1 << i);
+	}
+
+	strbuf_release(&path);
+	return ret;
+}
+
 static void repack_promisor_objects(const struct pack_objects_args *args,
 				    struct string_list *names)
 {
@@ -224,11 +263,12 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
 
 	out = xfdopen(cmd.out, "r");
 	while (strbuf_getline_lf(&line, out) != EOF) {
+		struct string_list_item *item;
 		char *promisor_name;
-		int fd;
+
 		if (line.len != the_hash_algo->hexsz)
 			die(_("repack: Expecting full hex object ID lines only from pack-objects."));
-		string_list_append(names, line.buf);
+		item = string_list_append(names, line.buf);
 
 		/*
 		 * pack-objects creates the .pack and .idx files, but not the
@@ -243,10 +283,10 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
 		 */
 		promisor_name = mkpathdup("%s-%s.promisor", packtmp,
 					  line.buf);
-		fd = open(promisor_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
-		if (fd < 0)
-			die_errno(_("unable to create '%s'"), promisor_name);
-		close(fd);
+		write_promisor_file(promisor_name, NULL, 0);
+
+		item->util = (void *)(uintptr_t)populate_pack_exts(item->string);
+
 		free(promisor_name);
 	}
 	fclose(out);
@@ -257,24 +297,152 @@ static void repack_promisor_objects(const struct pack_objects_args *args,
 #define ALL_INTO_ONE 1
 #define LOOSEN_UNREACHABLE 2
 
+struct pack_geometry {
+	struct packed_git **pack;
+	uint32_t pack_nr, pack_alloc;
+	uint32_t split;
+};
+
+static uint32_t geometry_pack_weight(struct packed_git *p)
+{
+	if (open_pack_index(p))
+		die(_("cannot open index for %s"), p->pack_name);
+	return p->num_objects;
+}
+
+static int geometry_cmp(const void *va, const void *vb)
+{
+	uint32_t aw = geometry_pack_weight(*(struct packed_git **)va),
+		 bw = geometry_pack_weight(*(struct packed_git **)vb);
+
+	if (aw < bw)
+		return -1;
+	if (aw > bw)
+		return 1;
+	return 0;
+}
+
+static void init_pack_geometry(struct pack_geometry **geometry_p)
+{
+	struct packed_git *p;
+	struct pack_geometry *geometry;
+
+	*geometry_p = xcalloc(1, sizeof(struct pack_geometry));
+	geometry = *geometry_p;
+
+	for (p = get_all_packs(the_repository); p; p = p->next) {
+		if (!pack_kept_objects && p->pack_keep)
+			continue;
+
+		ALLOC_GROW(geometry->pack,
+			   geometry->pack_nr + 1,
+			   geometry->pack_alloc);
+
+		geometry->pack[geometry->pack_nr] = p;
+		geometry->pack_nr++;
+	}
+
+	QSORT(geometry->pack, geometry->pack_nr, geometry_cmp);
+}
+
+static void split_pack_geometry(struct pack_geometry *geometry, int factor)
+{
+	uint32_t i;
+	uint32_t split;
+	off_t total_size = 0;
+
+	if (!geometry->pack_nr) {
+		geometry->split = geometry->pack_nr;
+		return;
+	}
+
+	/*
+	 * First, count the number of packs (in descending order of size) which
+	 * already form a geometric progression.
+	 */
+	for (i = geometry->pack_nr - 1; i > 0; i--) {
+		struct packed_git *ours = geometry->pack[i];
+		struct packed_git *prev = geometry->pack[i - 1];
+
+		if (unsigned_mult_overflows(factor, geometry_pack_weight(prev)))
+			die(_("pack %s too large to consider in geometric "
+			      "progression"),
+			    prev->pack_name);
+
+		if (geometry_pack_weight(ours) < factor * geometry_pack_weight(prev))
+			break;
+	}
+
+	split = i;
+
+	if (split) {
+		/*
+		 * Move the split one to the right, since the top element in the
+		 * last-compared pair can't be in the progression. Only do this
+		 * when we split in the middle of the array (otherwise if we got
+		 * to the end, then the split is in the right place).
+		 */
+		split++;
+	}
+
+	/*
+	 * Then, anything to the left of 'split' must be in a new pack. But,
+	 * creating that new pack may cause packs in the heavy half to no longer
+	 * form a geometric progression.
+	 *
+	 * Compute an expected size of the new pack, and then determine how many
+	 * packs in the heavy half need to be joined into it (if any) to restore
+	 * the geometric progression.
+	 */
+	for (i = 0; i < split; i++) {
+		struct packed_git *p = geometry->pack[i];
+
+		if (unsigned_add_overflows(total_size, geometry_pack_weight(p)))
+			die(_("pack %s too large to roll up"), p->pack_name);
+		total_size += geometry_pack_weight(p);
+	}
+	for (i = split; i < geometry->pack_nr; i++) {
+		struct packed_git *ours = geometry->pack[i];
+
+		if (unsigned_mult_overflows(factor, total_size))
+			die(_("pack %s too large to roll up"), ours->pack_name);
+
+		if (geometry_pack_weight(ours) < factor * total_size) {
+			if (unsigned_add_overflows(total_size,
+						   geometry_pack_weight(ours)))
+				die(_("pack %s too large to roll up"),
+				    ours->pack_name);
+
+			split++;
+			total_size += geometry_pack_weight(ours);
+		} else
+			break;
+	}
+
+	geometry->split = split;
+}
+
+static void clear_pack_geometry(struct pack_geometry *geometry)
+{
+	if (!geometry)
+		return;
+
+	free(geometry->pack);
+	geometry->pack_nr = 0;
+	geometry->pack_alloc = 0;
+	geometry->split = 0;
+}
+
 int cmd_repack(int argc, const char **argv, const char *prefix)
 {
-	struct {
-		const char *name;
-		unsigned optional:1;
-	} exts[] = {
-		{".pack"},
-		{".idx"},
-		{".bitmap", 1},
-		{".promisor", 1},
-	};
 	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 pack_geometry *geometry = NULL;
 	struct strbuf line = STRBUF_INIT;
-	int i, ext, ret, failed;
+	int i, ext, ret;
 	FILE *out;
 
 	/* variables to be filled by option parsing */
@@ -284,8 +452,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	int keep_unreachable = 0;
 	struct string_list keep_pack_list = STRING_LIST_INIT_NODUP;
 	int no_update_server_info = 0;
-	int midx_cleared = 0;
 	struct pack_objects_args po_args = {NULL};
+	int geometric_factor = 0;
 
 	struct option builtin_repack_options[] = {
 		OPT_BIT('a', NULL, &pack_everything,
@@ -326,6 +494,8 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 				N_("repack objects in packs marked with .keep")),
 		OPT_STRING_LIST(0, "keep-pack", &keep_pack_list, N_("name"),
 				N_("do not repack this pack")),
+		OPT_INTEGER('g', "geometric", &geometric_factor,
+			    N_("find a geometric progression with factor <N>")),
 		OPT_END()
 	};
 
@@ -352,31 +522,51 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	if (write_bitmaps && !(pack_everything & ALL_INTO_ONE))
 		die(_(incremental_bitmap_conflict_error));
 
+	if (geometric_factor) {
+		if (pack_everything)
+			die(_("--geometric is incompatible with -A, -a"));
+		init_pack_geometry(&geometry);
+		split_pack_geometry(geometry, geometric_factor);
+	}
+
 	packdir = mkpathdup("%s/pack", get_object_directory());
-	packtmp = mkpathdup("%s/.tmp-%d-pack", packdir, (int)getpid());
+	packtmp_name = xstrfmt(".tmp-%d-pack", (int)getpid());
+	packtmp = mkpathdup("%s/%s", packdir, packtmp_name);
 
 	sigchain_push_common(remove_pack_on_signal);
 
 	prepare_pack_objects(&cmd, &po_args);
 
-	argv_array_push(&cmd.args, "--keep-true-parents");
+	strvec_push(&cmd.args, "--keep-true-parents");
 	if (!pack_kept_objects)
-		argv_array_push(&cmd.args, "--honor-pack-keep");
+		strvec_push(&cmd.args, "--honor-pack-keep");
 	for (i = 0; i < keep_pack_list.nr; i++)
-		argv_array_pushf(&cmd.args, "--keep-pack=%s",
-				 keep_pack_list.items[i].string);
-	argv_array_push(&cmd.args, "--non-empty");
-	argv_array_push(&cmd.args, "--all");
-	argv_array_push(&cmd.args, "--reflog");
-	argv_array_push(&cmd.args, "--indexed-objects");
+		strvec_pushf(&cmd.args, "--keep-pack=%s",
+			     keep_pack_list.items[i].string);
+	strvec_push(&cmd.args, "--non-empty");
+	if (!geometry) {
+		/*
+		 * We need to grab all reachable objects, including those that
+		 * are reachable from reflogs and the index.
+		 *
+		 * When repacking into a geometric progression of packs,
+		 * however, we ask 'git pack-objects --stdin-packs', and it is
+		 * not about packing objects based on reachability but about
+		 * repacking all the objects in specified packs and loose ones
+		 * (indeed, --stdin-packs is incompatible with these options).
+		 */
+		strvec_push(&cmd.args, "--all");
+		strvec_push(&cmd.args, "--reflog");
+		strvec_push(&cmd.args, "--indexed-objects");
+	}
 	if (has_promisor_remote())
-		argv_array_push(&cmd.args, "--exclude-promisor-objects");
+		strvec_push(&cmd.args, "--exclude-promisor-objects");
 	if (write_bitmaps > 0)
-		argv_array_push(&cmd.args, "--write-bitmap-index");
+		strvec_push(&cmd.args, "--write-bitmap-index");
 	else if (write_bitmaps < 0)
-		argv_array_push(&cmd.args, "--write-bitmap-index-quiet");
+		strvec_push(&cmd.args, "--write-bitmap-index-quiet");
 	if (use_delta_islands)
-		argv_array_push(&cmd.args, "--delta-islands");
+		strvec_push(&cmd.args, "--delta-islands");
 
 	if (pack_everything & ALL_INTO_ONE) {
 		get_non_kept_pack_filenames(&existing_packs, &keep_pack_list);
@@ -384,32 +574,56 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 		repack_promisor_objects(&po_args, &names);
 
 		if (existing_packs.nr && delete_redundant) {
+			for_each_string_list_item(item, &names) {
+				strvec_pushf(&cmd.args, "--keep-pack=%s-%s.pack",
+					     packtmp_name, item->string);
+			}
 			if (unpack_unreachable) {
-				argv_array_pushf(&cmd.args,
-						"--unpack-unreachable=%s",
-						unpack_unreachable);
-				argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
+				strvec_pushf(&cmd.args,
+					     "--unpack-unreachable=%s",
+					     unpack_unreachable);
+				strvec_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
 			} else if (pack_everything & LOOSEN_UNREACHABLE) {
-				argv_array_push(&cmd.args,
-						"--unpack-unreachable");
+				strvec_push(&cmd.args,
+					    "--unpack-unreachable");
 			} else if (keep_unreachable) {
-				argv_array_push(&cmd.args, "--keep-unreachable");
-				argv_array_push(&cmd.args, "--pack-loose-unreachable");
+				strvec_push(&cmd.args, "--keep-unreachable");
+				strvec_push(&cmd.args, "--pack-loose-unreachable");
 			} else {
-				argv_array_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
+				strvec_push(&cmd.env_array, "GIT_REF_PARANOIA=1");
 			}
 		}
+	} else if (geometry) {
+		strvec_push(&cmd.args, "--stdin-packs");
+		strvec_push(&cmd.args, "--unpacked");
 	} else {
-		argv_array_push(&cmd.args, "--unpacked");
-		argv_array_push(&cmd.args, "--incremental");
+		strvec_push(&cmd.args, "--unpacked");
+		strvec_push(&cmd.args, "--incremental");
 	}
 
-	cmd.no_stdin = 1;
+	if (geometry)
+		cmd.in = -1;
+	else
+		cmd.no_stdin = 1;
 
 	ret = start_command(&cmd);
 	if (ret)
 		return ret;
 
+	if (geometry) {
+		FILE *in = xfdopen(cmd.in, "w");
+		/*
+		 * The resulting pack should contain all objects in packs that
+		 * are going to be rolled up, but exclude objects in packs which
+		 * are being left alone.
+		 */
+		for (i = 0; i < geometry->split; i++)
+			fprintf(in, "%s\n", pack_basename(geometry->pack[i]));
+		for (i = geometry->split; i < geometry->pack_nr; i++)
+			fprintf(in, "^%s\n", pack_basename(geometry->pack[i]));
+		fclose(in);
+	}
+
 	out = xfdopen(cmd.out, "r");
 	while (strbuf_getline_lf(&line, out) != EOF) {
 		if (line.len != the_hash_algo->hexsz)
@@ -424,118 +638,42 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	if (!names.nr && !po_args.quiet)
 		printf_ln(_("Nothing new to pack."));
 
+	for_each_string_list_item(item, &names) {
+		item->util = (void *)(uintptr_t)populate_pack_exts(item->string);
+	}
+
 	close_object_store(the_repository->objects);
 
 	/*
 	 * Ok we have prepared all new packfiles.
-	 * First see if there are packs of the same name and if so
-	 * if we can move them out of the way (this can happen if we
-	 * repacked immediately after packing fully.
 	 */
-	failed = 0;
 	for_each_string_list_item(item, &names) {
 		for (ext = 0; ext < ARRAY_SIZE(exts); ext++) {
 			char *fname, *fname_old;
 
-			if (!midx_cleared) {
-				clear_midx_file(the_repository);
-				midx_cleared = 1;
-			}
-
-			fname = mkpathdup("%s/pack-%s%s", packdir,
-						item->string, exts[ext].name);
-			if (!file_exists(fname)) {
-				free(fname);
-				continue;
-			}
-
-			fname_old = mkpathdup("%s/old-%s%s", packdir,
-						item->string, exts[ext].name);
-			if (file_exists(fname_old))
-				if (unlink(fname_old))
-					failed = 1;
-
-			if (!failed && rename(fname, fname_old)) {
-				free(fname);
-				free(fname_old);
-				failed = 1;
-				break;
-			} else {
-				string_list_append(&rollback, fname);
-				free(fname_old);
-			}
-		}
-		if (failed)
-			break;
-	}
-	if (failed) {
-		struct string_list rollback_failure = STRING_LIST_INIT_DUP;
-		for_each_string_list_item(item, &rollback) {
-			char *fname, *fname_old;
-			fname = mkpathdup("%s/%s", packdir, item->string);
-			fname_old = mkpathdup("%s/old-%s", packdir, item->string);
-			if (rename(fname_old, fname))
-				string_list_append(&rollback_failure, fname);
-			free(fname);
-			free(fname_old);
-		}
-
-		if (rollback_failure.nr) {
-			int i;
-			fprintf(stderr,
-				_("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"), packdir);
-			for (i = 0; i < rollback_failure.nr; i++)
-				fprintf(stderr, "WARNING:   old-%s -> %s\n",
-					rollback_failure.items[i].string,
-					rollback_failure.items[i].string);
-		}
-		exit(1);
-	}
-
-	/* Now the ones with the same name are out of the way... */
-	for_each_string_list_item(item, &names) {
-		for (ext = 0; ext < ARRAY_SIZE(exts); ext++) {
-			char *fname, *fname_old;
-			struct stat statbuffer;
-			int exists = 0;
 			fname = mkpathdup("%s/pack-%s%s",
 					packdir, item->string, exts[ext].name);
 			fname_old = mkpathdup("%s-%s%s",
 					packtmp, item->string, exts[ext].name);
-			if (!stat(fname_old, &statbuffer)) {
-				statbuffer.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
-				chmod(fname_old, statbuffer.st_mode);
-				exists = 1;
-			}
-			if (exists || !exts[ext].optional) {
+
+			if (((uintptr_t)item->util) & (1 << ext)) {
+				struct stat statbuffer;
+				if (!stat(fname_old, &statbuffer)) {
+					statbuffer.st_mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH);
+					chmod(fname_old, statbuffer.st_mode);
+				}
+
 				if (rename(fname_old, fname))
 					die_errno(_("renaming '%s' failed"), fname_old);
-			}
-			free(fname);
-			free(fname_old);
-		}
-	}
+			} else if (!exts[ext].optional)
+				die(_("missing required file: %s"), fname_old);
+			else if (unlink(fname) < 0 && errno != ENOENT)
+				die_errno(_("could not unlink: %s"), fname);
 
-	/* Remove the "old-" files */
-	for_each_string_list_item(item, &names) {
-		for (ext = 0; ext < ARRAY_SIZE(exts); ext++) {
-			char *fname;
-			fname = mkpathdup("%s/old-%s%s",
-					  packdir,
-					  item->string,
-					  exts[ext].name);
-			if (remove_path(fname))
-				warning(_("failed to remove '%s'"), fname);
 			free(fname);
+			free(fname_old);
 		}
 	}
-
 	/* End of pack replacement. */
 
 	reprepare_packed_git(the_repository);
@@ -553,6 +691,25 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 			if (!string_list_has_string(&names, sha1))
 				remove_redundant_pack(packdir, item->string);
 		}
+
+		if (geometry) {
+			struct strbuf buf = STRBUF_INIT;
+
+			uint32_t i;
+			for (i = 0; i < geometry->split; i++) {
+				struct packed_git *p = geometry->pack[i];
+				if (string_list_has_string(&names,
+							   hash_to_hex(p->hash)))
+					continue;
+
+				strbuf_reset(&buf);
+				strbuf_addstr(&buf, pack_basename(p));
+				strbuf_strip_suffix(&buf, ".pack");
+
+				remove_redundant_pack(packdir, buf.buf);
+			}
+			strbuf_release(&buf);
+		}
 		if (!po_args.quiet && isatty(2))
 			opts |= PRUNE_PACKED_VERBOSE;
 		prune_packed_objects(opts);
@@ -569,11 +726,12 @@ int cmd_repack(int argc, const char **argv, const char *prefix)
 	remove_temporary_files();
 
 	if (git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0))
-		write_midx_file(get_object_directory());
+		write_midx_file(get_object_directory(), NULL, 0);
 
 	string_list_clear(&names, 0);
 	string_list_clear(&rollback, 0);
 	string_list_clear(&existing_packs, 0);
+	clear_pack_geometry(geometry);
 	strbuf_release(&line);
 
 	return 0;
diff --git a/builtin/replace.c b/builtin/replace.c
index bd92dc63b9..cd48765911 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -228,13 +228,13 @@ static int export_object(const struct object_id *oid, enum object_type type,
 	if (fd < 0)
 		return error_errno(_("unable to open %s for writing"), filename);
 
-	argv_array_push(&cmd.args, "--no-replace-objects");
-	argv_array_push(&cmd.args, "cat-file");
+	strvec_push(&cmd.args, "--no-replace-objects");
+	strvec_push(&cmd.args, "cat-file");
 	if (raw)
-		argv_array_push(&cmd.args, type_name(type));
+		strvec_push(&cmd.args, type_name(type));
 	else
-		argv_array_push(&cmd.args, "-p");
-	argv_array_push(&cmd.args, oid_to_hex(oid));
+		strvec_push(&cmd.args, "-p");
+	strvec_push(&cmd.args, oid_to_hex(oid));
 	cmd.git_cmd = 1;
 	cmd.out = fd;
 
@@ -409,7 +409,8 @@ static int check_one_mergetag(struct commit *commit,
 	struct tag *tag;
 	int i;
 
-	hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &tag_oid);
+	hash_object_file(the_hash_algo, extra->value, extra->len,
+			 type_name(OBJ_TAG), &tag_oid);
 	tag = lookup_tag(the_repository, &tag_oid);
 	if (!tag)
 		return error(_("bad mergetag in commit '%s'"), ref);
@@ -501,7 +502,7 @@ static int convert_graft_file(int force)
 	const char *graft_file = get_graft_file(the_repository);
 	FILE *fp = fopen_or_warn(graft_file, "r");
 	struct strbuf buf = STRBUF_INIT, err = STRBUF_INIT;
-	struct argv_array args = ARGV_ARRAY_INIT;
+	struct strvec args = STRVEC_INIT;
 
 	if (!fp)
 		return -1;
@@ -511,10 +512,10 @@ static int convert_graft_file(int force)
 		if (*buf.buf == '#')
 			continue;
 
-		argv_array_split(&args, buf.buf);
-		if (args.argc && create_graft(args.argc, args.argv, force, 1))
+		strvec_split(&args, buf.buf);
+		if (args.nr && create_graft(args.nr, args.v, force, 1))
 			strbuf_addf(&err, "\n\t%s", buf.buf);
-		argv_array_clear(&args);
+		strvec_clear(&args);
 	}
 	fclose(fp);
 
diff --git a/builtin/rerere.c b/builtin/rerere.c
index fd3be17b97..83d7a778e3 100644
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -28,7 +28,7 @@ static int diff_two(const char *file1, const char *label1,
 {
 	xpparam_t xpp;
 	xdemitconf_t xecfg;
-	xdemitcb_t ecb;
+	xdemitcb_t ecb = { .out_line = outf };
 	mmfile_t minus, plus;
 	int ret;
 
@@ -41,8 +41,6 @@ static int diff_two(const char *file1, const char *label1,
 	xpp.flags = 0;
 	memset(&xecfg, 0, sizeof(xecfg));
 	xecfg.ctxlen = 3;
-	ecb.out_hunk = NULL;
-	ecb.out_line = outf;
 	ret = xdi_diff(&minus, &plus, &xpp, &xecfg, &ecb);
 
 	free(minus.ptr);
diff --git a/builtin/reset.c b/builtin/reset.c
index fdd572168b..43e855cb88 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -30,8 +30,9 @@
 
 static const char * const git_reset_usage[] = {
 	N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"),
-	N_("git reset [-q] [<tree-ish>] [--] <paths>..."),
-	N_("git reset --patch [<tree-ish>] [--] [<paths>...]"),
+	N_("git reset [-q] [<tree-ish>] [--] <pathspec>..."),
+	N_("git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"),
+	N_("git reset --patch [<tree-ish>] [--] [<pathspec>...]"),
 	NULL
 };
 
@@ -45,7 +46,7 @@ static inline int is_merge(void)
 	return !access(git_path_merge_head(the_repository), F_OK);
 }
 
-static int reset_index(const struct object_id *oid, int reset_type, int quiet)
+static int reset_index(const char *ref, const struct object_id *oid, int reset_type, int quiet)
 {
 	int i, nr = 0;
 	struct tree_desc desc[2];
@@ -59,6 +60,7 @@ static int reset_index(const struct object_id *oid, int reset_type, int quiet)
 	opts.dst_index = &the_index;
 	opts.fn = oneway_merge;
 	opts.merge = 1;
+	init_checkout_metadata(&opts.meta, ref, oid, NULL);
 	if (!quiet)
 		opts.verbose_update = 1;
 	switch (reset_type) {
@@ -284,8 +286,8 @@ static int git_reset_config(const char *var, const char *value, void *cb)
 int cmd_reset(int argc, const char **argv, const char *prefix)
 {
 	int reset_type = NONE, update_ref_status = 0, quiet = 0;
-	int patch_mode = 0, unborn;
-	const char *rev;
+	int patch_mode = 0, pathspec_file_nul = 0, unborn;
+	const char *rev, *pathspec_from_file = NULL;
 	struct object_id oid;
 	struct pathspec pathspec;
 	int intent_to_add = 0;
@@ -300,12 +302,14 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 				N_("reset HEAD, index and working tree"), MERGE),
 		OPT_SET_INT(0, "keep", &reset_type,
 				N_("reset HEAD but keep local changes"), KEEP),
-		{ OPTION_CALLBACK, 0, "recurse-submodules", NULL,
+		OPT_CALLBACK_F(0, "recurse-submodules", NULL,
 			    "reset", "control recursive updating of submodules",
-			    PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater },
+			    PARSE_OPT_OPTARG, option_parse_recurse_submodules_worktree_updater),
 		OPT_BOOL('p', "patch", &patch_mode, N_("select hunks interactively")),
 		OPT_BOOL('N', "intent-to-add", &intent_to_add,
 				N_("record only the fact that removed paths will be added later")),
+		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+		OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 		OPT_END()
 	};
 
@@ -316,11 +320,25 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 						PARSE_OPT_KEEP_DASHDASH);
 	parse_args(&pathspec, argv, prefix, patch_mode, &rev);
 
+	if (pathspec_from_file) {
+		if (patch_mode)
+			die(_("--pathspec-from-file is incompatible with --patch"));
+
+		if (pathspec.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		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"));
+	}
+
 	unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid);
 	if (unborn) {
 		/* reset on unborn branch: treat as reset to empty tree */
 		oidcpy(&oid, the_hash_algo->empty_tree);
-	} else if (!pathspec.nr) {
+	} else if (!pathspec.nr && !patch_mode) {
 		struct commit *commit;
 		if (get_oid_committish(rev, &oid))
 			die(_("Failed to resolve '%s' as a valid revision."), rev);
@@ -401,11 +419,20 @@ int cmd_reset(int argc, const char **argv, const char *prefix)
 				}
 			}
 		} else {
-			int err = reset_index(&oid, reset_type, quiet);
+			struct object_id dummy;
+			char *ref = NULL;
+			int err;
+
+			dwim_ref(rev, strlen(rev), &dummy, &ref, 0);
+			if (ref && !starts_with(ref, "refs/"))
+				FREE_AND_NULL(ref);
+
+			err = reset_index(ref, &oid, reset_type, quiet);
 			if (reset_type == KEEP && !err)
-				err = reset_index(&oid, MIXED, quiet);
+				err = reset_index(ref, &oid, MIXED, quiet);
 			if (err)
 				die(_("Could not reset index file to revision '%s'."), rev);
+			free(ref);
 		}
 
 		if (write_locked_index(&the_index, &lock, COMMIT_LOCK))
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index e28d62ec64..36cb909eba 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -80,6 +80,19 @@ static int arg_show_object_names = 1;
 
 #define DEFAULT_OIDSET_SIZE     (16*1024)
 
+static int show_disk_usage;
+static off_t total_disk_usage;
+
+static off_t get_object_disk_usage(struct object *obj)
+{
+	off_t size;
+	struct object_info oi = OBJECT_INFO_INIT;
+	oi.disk_sizep = &size;
+	if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)
+		die(_("unable to get disk usage of %s"), oid_to_hex(&obj->oid));
+	return size;
+}
+
 static void finish_commit(struct commit *commit);
 static void show_commit(struct commit *commit, void *data)
 {
@@ -88,6 +101,9 @@ static void show_commit(struct commit *commit, void *data)
 
 	display_progress(progress, ++progress_counter);
 
+	if (show_disk_usage)
+		total_disk_usage += get_object_disk_usage(&commit->object);
+
 	if (info->flags & REV_LIST_QUIET) {
 		finish_commit(commit);
 		return;
@@ -111,13 +127,15 @@ static void show_commit(struct commit *commit, void *data)
 	if (info->header_prefix)
 		fputs(info->header_prefix, stdout);
 
-	if (!revs->graph)
-		fputs(get_revision_mark(revs, commit), stdout);
-	if (revs->abbrev_commit && revs->abbrev)
-		fputs(find_unique_abbrev(&commit->object.oid, revs->abbrev),
-		      stdout);
-	else
-		fputs(oid_to_hex(&commit->object.oid), stdout);
+	if (revs->include_header) {
+		if (!revs->graph)
+			fputs(get_revision_mark(revs, commit), stdout);
+		if (revs->abbrev_commit && revs->abbrev)
+			fputs(find_unique_abbrev(&commit->object.oid, revs->abbrev),
+			      stdout);
+		else
+			fputs(oid_to_hex(&commit->object.oid), stdout);
+	}
 	if (revs->print_parents) {
 		struct commit_list *parents = commit->parents;
 		while (parents) {
@@ -137,7 +155,7 @@ static void show_commit(struct commit *commit, void *data)
 	show_decorations(revs, commit);
 	if (revs->commit_format == CMIT_FMT_ONELINE)
 		putchar(' ');
-	else
+	else if (revs->include_header)
 		putchar('\n');
 
 	if (revs->verbose_header) {
@@ -253,11 +271,28 @@ static int finish_object(struct object *obj, const char *name, void *cb_data)
 static void show_object(struct object *obj, const char *name, void *cb_data)
 {
 	struct rev_list_info *info = cb_data;
+	struct rev_info *revs = info->revs;
+
 	if (finish_object(obj, name, cb_data))
 		return;
 	display_progress(progress, ++progress_counter);
+	if (show_disk_usage)
+		total_disk_usage += get_object_disk_usage(obj);
 	if (info->flags & REV_LIST_QUIET)
 		return;
+
+	if (revs->count) {
+		/*
+		 * The object count is always accumulated in the .count_right
+		 * field for traversal that is not a left-right traversal,
+		 * and cmd_rev_list() made sure that a .count request that
+		 * wants to count non-commit objects, which is handled by
+		 * the show_object() callback, does not ask for .left_right.
+		 */
+		revs->count_right++;
+		return;
+	}
+
 	if (arg_show_object_names)
 		show_object_with_name(stdout, obj, name);
 	else
@@ -364,6 +399,99 @@ static inline int parse_missing_action_value(const char *value)
 	return 0;
 }
 
+static int try_bitmap_count(struct rev_info *revs,
+			    struct list_objects_filter_options *filter,
+			    int filter_provided_objects)
+{
+	uint32_t commit_count = 0,
+		 tag_count = 0,
+		 tree_count = 0,
+		 blob_count = 0;
+	int max_count;
+	struct bitmap_index *bitmap_git;
+
+	/* This function only handles counting, not general traversal. */
+	if (!revs->count)
+		return -1;
+
+	/*
+	 * A bitmap result can't know left/right, etc, because we don't
+	 * actually traverse.
+	 */
+	if (revs->left_right || revs->cherry_mark)
+		return -1;
+
+	/*
+	 * If we're counting reachable objects, we can't handle a max count of
+	 * commits to traverse, since we don't know which objects go with which
+	 * commit.
+	 */
+	if (revs->max_count >= 0 &&
+	    (revs->tag_objects || revs->tree_objects || revs->blob_objects))
+		return -1;
+
+	/*
+	 * This must be saved before doing any walking, since the revision
+	 * machinery will count it down to zero while traversing.
+	 */
+	max_count = revs->max_count;
+
+	bitmap_git = prepare_bitmap_walk(revs, filter, filter_provided_objects);
+	if (!bitmap_git)
+		return -1;
+
+	count_bitmap_commit_list(bitmap_git, &commit_count,
+				 revs->tree_objects ? &tree_count : NULL,
+				 revs->blob_objects ? &blob_count : NULL,
+				 revs->tag_objects ? &tag_count : NULL);
+	if (max_count >= 0 && max_count < commit_count)
+		commit_count = max_count;
+
+	printf("%d\n", commit_count + tree_count + blob_count + tag_count);
+	free_bitmap_index(bitmap_git);
+	return 0;
+}
+
+static int try_bitmap_traversal(struct rev_info *revs,
+				struct list_objects_filter_options *filter,
+				int filter_provided_objects)
+{
+	struct bitmap_index *bitmap_git;
+
+	/*
+	 * We can't use a bitmap result with a traversal limit, since the set
+	 * of commits we'd get would be essentially random.
+	 */
+	if (revs->max_count >= 0)
+		return -1;
+
+	bitmap_git = prepare_bitmap_walk(revs, filter, filter_provided_objects);
+	if (!bitmap_git)
+		return -1;
+
+	traverse_bitmap_commit_list(bitmap_git, revs, &show_object_fast);
+	free_bitmap_index(bitmap_git);
+	return 0;
+}
+
+static int try_bitmap_disk_usage(struct rev_info *revs,
+				 struct list_objects_filter_options *filter,
+				 int filter_provided_objects)
+{
+	struct bitmap_index *bitmap_git;
+
+	if (!show_disk_usage)
+		return -1;
+
+	bitmap_git = prepare_bitmap_walk(revs, filter, filter_provided_objects);
+	if (!bitmap_git)
+		return -1;
+
+	printf("%"PRIuMAX"\n",
+	       (uintmax_t)get_disk_usage_from_bitmap(bitmap_git, revs));
+	return 0;
+}
+
 int cmd_rev_list(int argc, const char **argv, const char *prefix)
 {
 	struct rev_info revs;
@@ -376,6 +504,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	int bisect_show_vars = 0;
 	int bisect_find_all = 0;
 	int use_bitmap_index = 0;
+	int filter_provided_objects = 0;
 	const char *show_progress = NULL;
 
 	if (argc == 2 && !strcmp(argv[1], "-h"))
@@ -385,6 +514,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	repo_init_revisions(the_repository, &revs, prefix);
 	revs.abbrev = DEFAULT_ABBREV;
 	revs.commit_format = CMIT_FMT_UNSPECIFIED;
+	revs.include_header = 1;
 
 	/*
 	 * Scan the argument list before invoking setup_revisions(), so that we
@@ -476,6 +606,10 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 			list_objects_filter_set_no_filter(&filter_options);
 			continue;
 		}
+		if (!strcmp(arg, "--filter-provided-objects")) {
+			filter_provided_objects = 1;
+			continue;
+		}
 		if (!strcmp(arg, "--filter-print-omitted")) {
 			arg_print_omitted = 1;
 			continue;
@@ -496,13 +630,31 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 			continue;
 		}
 
+		if (!strcmp(arg, ("--commit-header"))) {
+			revs.include_header = 1;
+			continue;
+		}
+
+		if (!strcmp(arg, ("--no-commit-header"))) {
+			revs.include_header = 0;
+			continue;
+		}
+
+		if (!strcmp(arg, "--disk-usage")) {
+			show_disk_usage = 1;
+			info.flags |= REV_LIST_QUIET;
+			continue;
+		}
+
 		usage(rev_list_usage);
 
 	}
+	if (revs.commit_format != CMIT_FMT_USERFORMAT)
+		revs.include_header = 1;
 	if (revs.commit_format != CMIT_FMT_UNSPECIFIED) {
 		/* The command line has a --pretty  */
 		info.hdr_termination = '\n';
-		if (revs.commit_format == CMIT_FMT_ONELINE)
+		if (revs.commit_format == CMIT_FMT_ONELINE || !revs.include_header)
 			info.header_prefix = "";
 		else
 			info.header_prefix = "commit ";
@@ -521,8 +673,10 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	if (revs.show_notes)
 		die(_("rev-list does not support display of notes"));
 
-	if (filter_options.choice && use_bitmap_index)
-		die(_("cannot combine --use-bitmap-index with object filtering"));
+	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"));
 
 	save_commit_buffer = (revs.verbose_header ||
 			      revs.grep_filter.pattern_list ||
@@ -533,28 +687,13 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 	if (show_progress)
 		progress = start_delayed_progress(show_progress, 0);
 
-	if (use_bitmap_index && !revs.prune) {
-		if (revs.count && !revs.left_right && !revs.cherry_mark) {
-			uint32_t commit_count;
-			int max_count = revs.max_count;
-			struct bitmap_index *bitmap_git;
-			if ((bitmap_git = prepare_bitmap_walk(&revs))) {
-				count_bitmap_commit_list(bitmap_git, &commit_count, NULL, NULL, NULL);
-				if (max_count >= 0 && max_count < commit_count)
-					commit_count = max_count;
-				printf("%d\n", commit_count);
-				free_bitmap_index(bitmap_git);
-				return 0;
-			}
-		} else if (revs.max_count < 0 &&
-			   revs.tag_objects && revs.tree_objects && revs.blob_objects) {
-			struct bitmap_index *bitmap_git;
-			if ((bitmap_git = prepare_bitmap_walk(&revs))) {
-				traverse_bitmap_commit_list(bitmap_git, &show_object_fast);
-				free_bitmap_index(bitmap_git);
-				return 0;
-			}
-		}
+	if (use_bitmap_index) {
+		if (!try_bitmap_count(&revs, &filter_options, filter_provided_objects))
+			return 0;
+		if (!try_bitmap_disk_usage(&revs, &filter_options, filter_provided_objects))
+			return 0;
+		if (!try_bitmap_traversal(&revs, &filter_options, filter_provided_objects))
+			return 0;
 	}
 
 	if (prepare_revision_walk(&revs))
@@ -564,13 +703,30 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 
 	if (bisect_list) {
 		int reaches, all;
+		unsigned bisect_flags = 0;
+
+		if (bisect_find_all)
+			bisect_flags |= FIND_BISECTION_ALL;
+
+		if (revs.first_parent_only)
+			bisect_flags |= FIND_BISECTION_FIRST_PARENT_ONLY;
 
-		find_bisection(&revs.commits, &reaches, &all, bisect_find_all);
+		find_bisection(&revs.commits, &reaches, &all, bisect_flags);
 
 		if (bisect_show_vars)
 			return show_bisect_vars(&info, reaches, all);
 	}
 
+	if (filter_provided_objects) {
+		struct commit_list *c;
+		for (i = 0; i < revs.pending.nr; i++) {
+			struct object_array_entry *pending = revs.pending.objects + i;
+			pending->item->flags |= NOT_USER_GIVEN;
+		}
+		for (c = revs.commits; c; c = c->next)
+			c->item->object.flags |= NOT_USER_GIVEN;
+	}
+
 	if (arg_print_omitted)
 		oidset_init(&omitted_objects, DEFAULT_OIDSET_SIZE);
 	if (arg_missing_action == MA_PRINT)
@@ -610,5 +766,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
 			printf("%d\n", revs.count_left + revs.count_right);
 	}
 
+	if (show_disk_usage)
+		printf("%"PRIuMAX"\n", (uintmax_t)total_disk_usage);
+
 	return 0;
 }
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 308c67e4fc..22c4e1a4ff 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -16,6 +16,7 @@
 #include "split-index.h"
 #include "submodule.h"
 #include "commit-reach.h"
+#include "shallow.h"
 
 #define DO_REVS		1
 #define DO_NOREV	2
@@ -135,7 +136,7 @@ static void show_rev(int type, const struct object_id *oid, const char *name)
 			struct object_id discard;
 			char *full;
 
-			switch (dwim_ref(name, strlen(name), &discard, &full)) {
+			switch (dwim_ref(name, strlen(name), &discard, &full, 0)) {
 			case 0:
 				/*
 				 * Not found -- not a ref.  We could
@@ -434,11 +435,11 @@ static int cmd_parseopt(int argc, const char **argv, const char *prefix)
 	/* get the usage up to the first line with a -- on it */
 	for (;;) {
 		if (strbuf_getline(&sb, stdin) == EOF)
-			die("premature end of input");
+			die(_("premature end of input"));
 		ALLOC_GROW(usage, unb + 1, usz);
 		if (!strcmp("--", sb.buf)) {
 			if (unb < 1)
-				die("no usage string given before the `--' separator");
+				die(_("no usage string given before the `--' separator"));
 			usage[unb] = NULL;
 			break;
 		}
@@ -544,7 +545,7 @@ static void die_no_single_rev(int quiet)
 	if (quiet)
 		exit(1);
 	else
-		die("Needed a single revision");
+		die(_("Needed a single revision"));
 }
 
 static const char builtin_rev_parse_usage[] =
@@ -582,6 +583,75 @@ static void handle_ref_opt(const char *pattern, const char *prefix)
 	clear_ref_exclusion(&ref_excludes);
 }
 
+enum format_type {
+	/* We would like a relative path. */
+	FORMAT_RELATIVE,
+	/* We would like a canonical absolute path. */
+	FORMAT_CANONICAL,
+	/* We would like the default behavior. */
+	FORMAT_DEFAULT,
+};
+
+enum default_type {
+	/* Our default is a relative path. */
+	DEFAULT_RELATIVE,
+	/* Our default is a relative path if there's a shared root. */
+	DEFAULT_RELATIVE_IF_SHARED,
+	/* Our default is a canonical absolute path. */
+	DEFAULT_CANONICAL,
+	/* Our default is not to modify the item. */
+	DEFAULT_UNMODIFIED,
+};
+
+static void print_path(const char *path, const char *prefix, enum format_type format, enum default_type def)
+{
+	char *cwd = NULL;
+	/*
+	 * We don't ever produce a relative path if prefix is NULL, so set the
+	 * prefix to the current directory so that we can produce a relative
+	 * path whenever possible.  If we're using RELATIVE_IF_SHARED mode, then
+	 * we want an absolute path unless the two share a common prefix, so don't
+	 * set it in that case, since doing so causes a relative path to always
+	 * be produced if possible.
+	 */
+	if (!prefix && (format != FORMAT_DEFAULT || def != DEFAULT_RELATIVE_IF_SHARED))
+		prefix = cwd = xgetcwd();
+	if (format == FORMAT_DEFAULT && def == DEFAULT_UNMODIFIED) {
+		puts(path);
+	} else if (format == FORMAT_RELATIVE ||
+		  (format == FORMAT_DEFAULT && def == DEFAULT_RELATIVE)) {
+		/*
+		 * In order for relative_path to work as expected, we need to
+		 * make sure that both paths are absolute paths.  If we don't,
+		 * we can end up with an unexpected absolute path that the user
+		 * didn't want.
+		 */
+		struct strbuf buf = STRBUF_INIT, realbuf = STRBUF_INIT, prefixbuf = STRBUF_INIT;
+		if (!is_absolute_path(path)) {
+			strbuf_realpath_forgiving(&realbuf, path,  1);
+			path = realbuf.buf;
+		}
+		if (!is_absolute_path(prefix)) {
+			strbuf_realpath_forgiving(&prefixbuf, prefix, 1);
+			prefix = prefixbuf.buf;
+		}
+		puts(relative_path(path, prefix, &buf));
+		strbuf_release(&buf);
+		strbuf_release(&realbuf);
+		strbuf_release(&prefixbuf);
+	} else if (format == FORMAT_DEFAULT && def == DEFAULT_RELATIVE_IF_SHARED) {
+		struct strbuf buf = STRBUF_INIT;
+		puts(relative_path(path, prefix, &buf));
+		strbuf_release(&buf);
+	} else {
+		struct strbuf buf = STRBUF_INIT;
+		strbuf_realpath_forgiving(&buf, path, 1);
+		puts(buf.buf);
+		strbuf_release(&buf);
+	}
+	free(cwd);
+}
+
 int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 {
 	int i, as_is = 0, verify = 0, quiet = 0, revs_count = 0, type = 0;
@@ -594,6 +664,8 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 	struct object_context unused;
 	struct strbuf buf = STRBUF_INIT;
 	const int hexsz = the_hash_algo->hexsz;
+	int seen_end_of_options = 0;
+	enum format_type format = FORMAT_DEFAULT;
 
 	if (argc > 1 && !strcmp("--parseopt", argv[1]))
 		return cmd_parseopt(argc - 1, argv + 1, prefix);
@@ -621,21 +693,29 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
 
-		if (!strcmp(arg, "--local-env-vars")) {
-			int i;
-			for (i = 0; local_repo_env[i]; i++)
-				printf("%s\n", local_repo_env[i]);
+		if (as_is) {
+			if (show_file(arg, output_prefix) && as_is < 2)
+				verify_filename(prefix, arg, 0);
 			continue;
 		}
-		if (!strcmp(arg, "--resolve-git-dir")) {
-			const char *gitdir = argv[++i];
-			if (!gitdir)
-				die("--resolve-git-dir requires an argument");
-			gitdir = resolve_gitdir(gitdir);
-			if (!gitdir)
-				die("not a gitdir '%s'", argv[i]);
-			puts(gitdir);
-			continue;
+
+		if (!seen_end_of_options) {
+			if (!strcmp(arg, "--local-env-vars")) {
+				int i;
+				for (i = 0; local_repo_env[i]; i++)
+					printf("%s\n", local_repo_env[i]);
+				continue;
+			}
+			if (!strcmp(arg, "--resolve-git-dir")) {
+				const char *gitdir = argv[++i];
+				if (!gitdir)
+					die(_("--resolve-git-dir requires an argument"));
+				gitdir = resolve_gitdir(gitdir);
+				if (!gitdir)
+					die(_("not a gitdir '%s'"), argv[i]);
+				puts(gitdir);
+				continue;
+			}
 		}
 
 		/* The rest of the options require a git repository. */
@@ -645,53 +725,61 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 			did_repo_setup = 1;
 		}
 
-		if (!strcmp(arg, "--git-path")) {
-			if (!argv[i + 1])
-				die("--git-path requires an argument");
-			strbuf_reset(&buf);
-			puts(relative_path(git_path("%s", argv[i + 1]),
-					   prefix, &buf));
-			i++;
-			continue;
-		}
-		if (as_is) {
-			if (show_file(arg, output_prefix) && as_is < 2)
-				verify_filename(prefix, arg, 0);
-			continue;
-		}
-		if (!strcmp(arg,"-n")) {
-			if (++i >= argc)
-				die("-n requires an argument");
-			if ((filter & DO_FLAGS) && (filter & DO_REVS)) {
-				show(arg);
-				show(argv[i]);
-			}
-			continue;
-		}
-		if (starts_with(arg, "-n")) {
-			if ((filter & DO_FLAGS) && (filter & DO_REVS))
-				show(arg);
+		if (!strcmp(arg, "--")) {
+			as_is = 2;
+			/* Pass on the "--" if we show anything but files.. */
+			if (filter & (DO_FLAGS | DO_REVS))
+				show_file(arg, 0);
 			continue;
 		}
 
-		if (*arg == '-') {
-			if (!strcmp(arg, "--")) {
-				as_is = 2;
-				/* Pass on the "--" if we show anything but files.. */
-				if (filter & (DO_FLAGS | DO_REVS))
-					show_file(arg, 0);
+		if (!seen_end_of_options && *arg == '-') {
+			if (!strcmp(arg, "--git-path")) {
+				if (!argv[i + 1])
+					die(_("--git-path requires an argument"));
+				strbuf_reset(&buf);
+				print_path(git_path("%s", argv[i + 1]), prefix,
+						format,
+						DEFAULT_RELATIVE_IF_SHARED);
+				i++;
+				continue;
+			}
+			if (!strcmp(arg,"-n")) {
+				if (++i >= argc)
+					die(_("-n requires an argument"));
+				if ((filter & DO_FLAGS) && (filter & DO_REVS)) {
+					show(arg);
+					show(argv[i]);
+				}
+				continue;
+			}
+			if (starts_with(arg, "-n")) {
+				if ((filter & DO_FLAGS) && (filter & DO_REVS))
+					show(arg);
+				continue;
+			}
+			if (opt_with_value(arg, "--path-format", &arg)) {
+				if (!arg)
+					die(_("--path-format requires an argument"));
+				if (!strcmp(arg, "absolute")) {
+					format = FORMAT_CANONICAL;
+				} else if (!strcmp(arg, "relative")) {
+					format = FORMAT_RELATIVE;
+				} else {
+					die(_("unknown argument to --path-format: %s"), arg);
+				}
 				continue;
 			}
 			if (!strcmp(arg, "--default")) {
 				def = argv[++i];
 				if (!def)
-					die("--default requires an argument");
+					die(_("--default requires an argument"));
 				continue;
 			}
 			if (!strcmp(arg, "--prefix")) {
 				prefix = argv[++i];
 				if (!prefix)
-					die("--prefix requires an argument");
+					die(_("--prefix requires an argument"));
 				startup_info->prefix = prefix;
 				output_prefix = 1;
 				continue;
@@ -760,7 +848,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 					else if (!strcmp(arg, "loose"))
 						abbrev_ref_strict = 0;
 					else
-						die("unknown mode for --abbrev-ref: %s",
+						die(_("unknown mode for --abbrev-ref: %s"),
 						    arg);
 				}
 				continue;
@@ -802,13 +890,16 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 			if (!strcmp(arg, "--show-toplevel")) {
 				const char *work_tree = get_git_work_tree();
 				if (work_tree)
-					puts(work_tree);
+					print_path(work_tree, prefix, format, DEFAULT_UNMODIFIED);
+				else
+					die(_("this operation must be run in a work tree"));
 				continue;
 			}
 			if (!strcmp(arg, "--show-superproject-working-tree")) {
-				const char *superproject = get_superproject_working_tree();
-				if (superproject)
-					puts(superproject);
+				struct strbuf superproject = STRBUF_INIT;
+				if (get_superproject_working_tree(&superproject))
+					print_path(superproject.buf, prefix, format, DEFAULT_UNMODIFIED);
+				strbuf_release(&superproject);
 				continue;
 			}
 			if (!strcmp(arg, "--show-prefix")) {
@@ -842,33 +933,38 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 				const char *gitdir = getenv(GIT_DIR_ENVIRONMENT);
 				char *cwd;
 				int len;
+				enum format_type wanted = format;
 				if (arg[2] == 'g') {	/* --git-dir */
 					if (gitdir) {
-						puts(gitdir);
+						print_path(gitdir, prefix, format, DEFAULT_UNMODIFIED);
 						continue;
 					}
 					if (!prefix) {
-						puts(".git");
+						print_path(".git", prefix, format, DEFAULT_UNMODIFIED);
 						continue;
 					}
 				} else {		/* --absolute-git-dir */
+					wanted = FORMAT_CANONICAL;
 					if (!gitdir && !prefix)
 						gitdir = ".git";
 					if (gitdir) {
-						puts(real_path(gitdir));
+						struct strbuf realpath = STRBUF_INIT;
+						strbuf_realpath(&realpath, gitdir, 1);
+						puts(realpath.buf);
+						strbuf_release(&realpath);
 						continue;
 					}
 				}
 				cwd = xgetcwd();
 				len = strlen(cwd);
-				printf("%s%s.git\n", cwd, len && cwd[len-1] != '/' ? "/" : "");
+				strbuf_reset(&buf);
+				strbuf_addf(&buf, "%s%s.git", cwd, len && cwd[len-1] != '/' ? "/" : "");
 				free(cwd);
+				print_path(buf.buf, prefix, wanted, DEFAULT_CANONICAL);
 				continue;
 			}
 			if (!strcmp(arg, "--git-common-dir")) {
-				strbuf_reset(&buf);
-				puts(relative_path(get_git_common_dir(),
-						   prefix, &buf));
+				print_path(get_git_common_dir(), prefix, format, DEFAULT_RELATIVE_IF_SHARED);
 				continue;
 			}
 			if (!strcmp(arg, "--is-inside-git-dir")) {
@@ -898,8 +994,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 				if (the_index.split_index) {
 					const struct object_id *oid = &the_index.split_index->base_oid;
 					const char *path = git_path("sharedindex.%s", oid_to_hex(oid));
-					strbuf_reset(&buf);
-					puts(relative_path(path, prefix, &buf));
+					print_path(path, prefix, format, DEFAULT_RELATIVE);
 				}
 				continue;
 			}
@@ -919,6 +1014,23 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 				show_datestring("--min-age=", arg);
 				continue;
 			}
+			if (opt_with_value(arg, "--show-object-format", &arg)) {
+				const char *val = arg ? arg : "storage";
+
+				if (strcmp(val, "storage") &&
+				    strcmp(val, "input") &&
+				    strcmp(val, "output"))
+					die(_("unknown mode for --show-object-format: %s"),
+					    arg);
+				puts(the_hash_algo->name);
+				continue;
+			}
+			if (!strcmp(arg, "--end-of-options")) {
+				seen_end_of_options = 1;
+				if (filter & (DO_FLAGS | DO_REVS))
+					show_file(arg, 0);
+				continue;
+			}
 			if (show_flag(arg) && verify)
 				die_no_single_rev(quiet);
 			continue;
@@ -946,7 +1058,7 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
 		if (verify)
 			die_no_single_rev(quiet);
 		if (has_dashdash)
-			die("bad revision '%s'", arg);
+			die(_("bad revision '%s'"), arg);
 		as_is = 1;
 		if (!show_file(arg, output_prefix))
 			continue;
diff --git a/builtin/revert.c b/builtin/revert.c
index f61cc5d82c..2e13660e4b 100644
--- a/builtin/revert.c
+++ b/builtin/revert.c
@@ -107,7 +107,7 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
 		OPT_BOOL('n', "no-commit", &opts->no_commit, N_("don't automatically commit")),
 		OPT_BOOL('e', "edit", &opts->edit, N_("edit the commit message")),
 		OPT_NOOP_NOARG('r', NULL),
-		OPT_BOOL('s', "signoff", &opts->signoff, N_("add Signed-off-by:")),
+		OPT_BOOL('s', "signoff", &opts->signoff, N_("add a Signed-off-by trailer")),
 		OPT_CALLBACK('m', "mainline", opts, N_("parent-number"),
 			     N_("select mainline parent"), option_parse_m),
 		OPT_RERERE_AUTOUPDATE(&opts->allow_rerere_auto),
@@ -172,12 +172,17 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
 				NULL);
 	}
 
+	if (!opts->strategy && opts->default_strategy) {
+		opts->strategy = opts->default_strategy;
+		opts->default_strategy = NULL;
+	}
+
 	if (opts->allow_ff)
 		verify_opt_compatible(me, "--ff",
 				"--signoff", opts->signoff,
 				"--no-commit", opts->no_commit,
 				"-x", opts->record_origin,
-				"--edit", opts->edit,
+				"--edit", opts->edit > 0,
 				NULL);
 
 	if (cmd) {
@@ -186,7 +191,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], "-"))
@@ -202,6 +208,8 @@ static int run_sequencer(int argc, const char **argv, struct replay_opts *opts)
 	/* These option values will be free()d */
 	opts->gpg_sign = xstrdup_or_null(opts->gpg_sign);
 	opts->strategy = xstrdup_or_null(opts->strategy);
+	if (!opts->strategy && getenv("GIT_TEST_MERGE_ALGORITHM"))
+		opts->strategy = xstrdup(getenv("GIT_TEST_MERGE_ALGORITHM"));
 
 	if (cmd == 'q') {
 		int ret = sequencer_remove_state(opts);
@@ -223,8 +231,6 @@ int cmd_revert(int argc, const char **argv, const char *prefix)
 	struct replay_opts opts = REPLAY_OPTS_INIT;
 	int res;
 
-	if (isatty(0))
-		opts.edit = 1;
 	opts.action = REPLAY_REVERT;
 	sequencer_init_config(&opts);
 	res = run_sequencer(argc, argv, &opts);
diff --git a/builtin/rm.c b/builtin/rm.c
index 19ce95a901..8a24c715e0 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -5,6 +5,7 @@
  */
 #define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "builtin.h"
+#include "advice.h"
 #include "config.h"
 #include "lockfile.h"
 #include "dir.h"
@@ -235,7 +236,8 @@ 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;
+static int ignore_unmatch = 0, pathspec_file_nul;
+static char *pathspec_from_file;
 
 static struct option builtin_rm_options[] = {
 	OPT__DRY_RUN(&show_only, N_("dry run")),
@@ -245,13 +247,15 @@ 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_PATHSPEC_FROM_FILE(&pathspec_from_file),
+	OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 	OPT_END(),
 };
 
 int cmd_rm(int argc, const char **argv, const char *prefix)
 {
 	struct lock_file lock_file = LOCK_INIT;
-	int i;
+	int i, ret = 0;
 	struct pathspec pathspec;
 	char *seen;
 
@@ -259,8 +263,24 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 
 	argc = parse_options(argc, argv, prefix, builtin_rm_options,
 			     builtin_rm_usage, 0);
-	if (!argc)
-		usage_with_options(builtin_rm_usage, builtin_rm_options);
+
+	parse_pathspec(&pathspec, 0,
+		       PATHSPEC_PREFER_CWD,
+		       prefix, argv);
+
+	if (pathspec_from_file) {
+		if (pathspec.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		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"));
+	}
+
+	if (!pathspec.nr)
+		die(_("No pathspec was given. Which files should I remove?"));
 
 	if (!index_only)
 		setup_work_tree();
@@ -270,15 +290,16 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 	if (read_cache() < 0)
 		die(_("index file corrupt"));
 
-	parse_pathspec(&pathspec, 0,
-		       PATHSPEC_PREFER_CWD,
-		       prefix, argv);
 	refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &pathspec, NULL, NULL);
 
 	seen = xcalloc(pathspec.nr, 1);
 
+	/* TODO: audit for interaction with sparse-index. */
+	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))
+			continue;
 		if (!ce_path_match(&the_index, ce, &pathspec, seen))
 			continue;
 		ALLOC_GROW(list.entry, list.nr + 1, list.alloc);
@@ -292,25 +313,37 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 	if (pathspec.nr) {
 		const char *original;
 		int seen_any = 0;
+		char *skip_worktree_seen = NULL;
+		struct string_list only_match_skip_worktree = STRING_LIST_INIT_NODUP;
+
 		for (i = 0; i < pathspec.nr; i++) {
 			original = pathspec.items[i].original;
-			if (!seen[i]) {
-				if (!ignore_unmatch) {
-					die(_("pathspec '%s' did not match any files"),
-					    original);
-				}
-			}
-			else {
+			if (seen[i])
 				seen_any = 1;
-			}
+			else if (ignore_unmatch)
+				continue;
+			else if (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);
+
 			if (!recursive && seen[i] == MATCHED_RECURSIVELY)
 				die(_("not removing '%s' recursively without -r"),
 				    *original ? original : ".");
 		}
 
+		if (only_match_skip_worktree.nr) {
+			advise_on_updating_sparse_paths(&only_match_skip_worktree);
+			ret = 1;
+		}
+		free(skip_worktree_seen);
+		string_list_clear(&only_match_skip_worktree, 0);
+
 		if (!seen_any)
-			exit(0);
+			exit(ret);
 	}
+	clear_pathspec(&pathspec);
+	free(seen);
 
 	if (!index_only)
 		submodules_absorb_gitdir_if_needed();
@@ -389,5 +422,5 @@ int cmd_rm(int argc, const char **argv, const char *prefix)
 			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		die(_("Unable to write new index file"));
 
-	return 0;
+	return ret;
 }
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 098ebf22d0..729dea1d25 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -11,7 +11,7 @@
 #include "quote.h"
 #include "transport.h"
 #include "version.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "gpg-interface.h"
 #include "gettext.h"
 #include "protocol.h"
@@ -29,10 +29,12 @@ static struct send_pack_args args;
 static void print_helper_status(struct ref *ref)
 {
 	struct strbuf buf = STRBUF_INIT;
+	struct ref_push_report *report;
 
 	for (; ref; ref = ref->next) {
 		const char *msg = NULL;
 		const char *res;
+		int count = 0;
 
 		switch(ref->status) {
 		case REF_STATUS_NONE:
@@ -69,6 +71,11 @@ static void print_helper_status(struct ref *ref)
 			msg = "stale info";
 			break;
 
+		case REF_STATUS_REJECT_REMOTE_UPDATED:
+			res = "error";
+			msg = "remote ref updated since checkout";
+			break;
+
 		case REF_STATUS_REJECT_ALREADY_EXISTS:
 			res = "error";
 			msg = "already exists";
@@ -94,6 +101,23 @@ static void print_helper_status(struct ref *ref)
 		}
 		strbuf_addch(&buf, '\n');
 
+		if (ref->status == REF_STATUS_OK) {
+			for (report = ref->report; report; report = report->next) {
+				if (count++ > 0)
+					strbuf_addf(&buf, "ok %s\n", ref->name);
+				if (report->ref_name)
+					strbuf_addf(&buf, "option refname %s\n",
+						report->ref_name);
+				if (report->old_oid)
+					strbuf_addf(&buf, "option old-oid %s\n",
+						oid_to_hex(report->old_oid));
+				if (report->new_oid)
+					strbuf_addf(&buf, "option new-oid %s\n",
+						oid_to_hex(report->new_oid));
+				if (report->forced_update)
+					strbuf_addstr(&buf, "option forced-update\n");
+			}
+		}
 		write_or_die(1, buf.buf, buf.len);
 	}
 	strbuf_release(&buf);
@@ -154,6 +178,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
 	int progress = -1;
 	int from_stdin = 0;
 	struct push_cas_option cas = {0};
+	int force_if_includes = 0;
 	struct packet_reader reader;
 
 	struct option options[] = {
@@ -165,9 +190,8 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
 		OPT_BOOL('n' , "dry-run", &dry_run, N_("dry run")),
 		OPT_BOOL(0, "mirror", &send_mirror, N_("mirror all refs")),
 		OPT_BOOL('f', "force", &force_update, N_("force updates")),
-		{ OPTION_CALLBACK,
-		  0, "signed", &push_cert, "(yes|no|if-asked)", N_("GPG sign the push"),
-		  PARSE_OPT_OPTARG, option_parse_push_signed },
+		OPT_CALLBACK_F(0, "signed", &push_cert, "(yes|no|if-asked)", N_("GPG sign the push"),
+		  PARSE_OPT_OPTARG, option_parse_push_signed),
 		OPT_STRING_LIST(0, "push-option", &push_options,
 				N_("server-specific"),
 				N_("option to transmit")),
@@ -177,10 +201,11 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
 		OPT_BOOL(0, "stateless-rpc", &stateless_rpc, N_("use stateless RPC protocol")),
 		OPT_BOOL(0, "stdin", &from_stdin, N_("read refs from stdin")),
 		OPT_BOOL(0, "helper-status", &helper_status, N_("print status from remote helper")),
-		{ OPTION_CALLBACK,
-		  0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
+		OPT_CALLBACK_F(0, CAS_OPT_NAME, &cas, N_("<refname>:<expect>"),
 		  N_("require old value of ref to be at this value"),
-		  PARSE_OPT_OPTARG, parseopt_push_cas_option },
+		  PARSE_OPT_OPTARG, parseopt_push_cas_option),
+		OPT_BOOL(0, TRANS_OPT_FORCE_IF_INCLUDES, &force_if_includes,
+			 N_("require remote updates to be integrated locally")),
 		OPT_END()
 	};
 
@@ -205,6 +230,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) {
@@ -282,6 +308,9 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
 	if (!is_empty_cas(&cas))
 		apply_push_cas(&cas, remote, remote_refs);
 
+	if (!is_empty_cas(&cas) && force_if_includes)
+		cas.use_force_if_includes = 1;
+
 	set_ref_status_for_push(remote_refs, args.send_mirror,
 		args.force_update);
 
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 65cd41392c..3e7ab1ca82 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -9,6 +9,8 @@
 #include "mailmap.h"
 #include "shortlog.h"
 #include "parse-options.h"
+#include "trailer.h"
+#include "strmap.h"
 
 static char const * const shortlog_usage[] = {
 	N_("git shortlog [<options>] [<revision-range>] [[--] <path>...]"),
@@ -49,18 +51,17 @@ static int compare_by_list(const void *a1, const void *a2)
 }
 
 static void insert_one_record(struct shortlog *log,
-			      const char *author,
+			      const char *ident,
 			      const char *oneline)
 {
 	struct string_list_item *item;
 
-	item = string_list_insert(&log->list, author);
+	item = string_list_insert(&log->list, ident);
 
 	if (log->summary)
 		item->util = (void *)(UTIL_TO_INT(item) + 1);
 	else {
-		const char *dot3 = log->common_repo_prefix;
-		char *buffer, *p;
+		char *buffer;
 		struct strbuf subject = STRBUF_INIT;
 		const char *eol;
 
@@ -80,25 +81,14 @@ static void insert_one_record(struct shortlog *log,
 		format_subject(&subject, oneline, " ");
 		buffer = strbuf_detach(&subject, NULL);
 
-		if (dot3) {
-			int dot3len = strlen(dot3);
-			if (dot3len > 5) {
-				while ((p = strstr(buffer, dot3)) != NULL) {
-					int taillen = strlen(p) - dot3len;
-					memcpy(p, "/.../", 5);
-					memmove(p + 5, p + dot3len, taillen + 1);
-				}
-			}
-		}
-
 		if (item->util == NULL)
 			item->util = xcalloc(1, sizeof(struct string_list));
 		string_list_append(item->util, buffer);
 	}
 }
 
-static int parse_stdin_author(struct shortlog *log,
-			       struct strbuf *out, const char *in)
+static int parse_ident(struct shortlog *log,
+		       struct strbuf *out, const char *in)
 {
 	const char *mailbuf, *namebuf;
 	size_t namelen, maillen;
@@ -122,18 +112,33 @@ static int parse_stdin_author(struct shortlog *log,
 
 static void read_from_stdin(struct shortlog *log)
 {
-	struct strbuf author = STRBUF_INIT;
-	struct strbuf mapped_author = STRBUF_INIT;
+	struct strbuf ident = STRBUF_INIT;
+	struct strbuf mapped_ident = STRBUF_INIT;
 	struct strbuf oneline = STRBUF_INIT;
 	static const char *author_match[2] = { "Author: ", "author " };
 	static const char *committer_match[2] = { "Commit: ", "committer " };
 	const char **match;
 
-	match = log->committer ? committer_match : author_match;
-	while (strbuf_getline_lf(&author, stdin) != EOF) {
+	if (HAS_MULTI_BITS(log->groups))
+		die(_("using multiple --group options with stdin is not supported"));
+
+	switch (log->groups) {
+	case SHORTLOG_GROUP_AUTHOR:
+		match = author_match;
+		break;
+	case SHORTLOG_GROUP_COMMITTER:
+		match = committer_match;
+		break;
+	case SHORTLOG_GROUP_TRAILER:
+		die(_("using --group=trailer with stdin is not supported"));
+	default:
+		BUG("unhandled shortlog group");
+	}
+
+	while (strbuf_getline_lf(&ident, stdin) != EOF) {
 		const char *v;
-		if (!skip_prefix(author.buf, match[0], &v) &&
-		    !skip_prefix(author.buf, match[1], &v))
+		if (!skip_prefix(ident.buf, match[0], &v) &&
+		    !skip_prefix(ident.buf, match[1], &v))
 			continue;
 		while (strbuf_getline_lf(&oneline, stdin) != EOF &&
 		       oneline.len)
@@ -142,23 +147,64 @@ static void read_from_stdin(struct shortlog *log)
 		       !oneline.len)
 			; /* discard blanks */
 
-		strbuf_reset(&mapped_author);
-		if (parse_stdin_author(log, &mapped_author, v) < 0)
+		strbuf_reset(&mapped_ident);
+		if (parse_ident(log, &mapped_ident, v) < 0)
 			continue;
 
-		insert_one_record(log, mapped_author.buf, oneline.buf);
+		insert_one_record(log, mapped_ident.buf, oneline.buf);
 	}
-	strbuf_release(&author);
-	strbuf_release(&mapped_author);
+	strbuf_release(&ident);
+	strbuf_release(&mapped_ident);
 	strbuf_release(&oneline);
 }
 
+static void insert_records_from_trailers(struct shortlog *log,
+					 struct strset *dups,
+					 struct commit *commit,
+					 struct pretty_print_context *ctx,
+					 const char *oneline)
+{
+	struct trailer_iterator iter;
+	const char *commit_buffer, *body;
+	struct strbuf ident = STRBUF_INIT;
+
+	/*
+	 * Using format_commit_message("%B") would be simpler here, but
+	 * this saves us copying the message.
+	 */
+	commit_buffer = logmsg_reencode(commit, NULL, ctx->output_encoding);
+	body = strstr(commit_buffer, "\n\n");
+	if (!body)
+		return;
+
+	trailer_iterator_init(&iter, body);
+	while (trailer_iterator_advance(&iter)) {
+		const char *value = iter.val.buf;
+
+		if (!string_list_has_string(&log->trailers, iter.key.buf))
+			continue;
+
+		strbuf_reset(&ident);
+		if (!parse_ident(log, &ident, value))
+			value = ident.buf;
+
+		if (!strset_add(dups, value))
+			continue;
+		insert_one_record(log, value, oneline);
+	}
+	trailer_iterator_release(&iter);
+
+	strbuf_release(&ident);
+	unuse_commit_buffer(commit, commit_buffer);
+}
+
 void shortlog_add_commit(struct shortlog *log, struct commit *commit)
 {
-	struct strbuf author = STRBUF_INIT;
+	struct strbuf ident = STRBUF_INIT;
 	struct strbuf oneline = STRBUF_INIT;
+	struct strset dups = STRSET_INIT;
 	struct pretty_print_context ctx = {0};
-	const char *fmt;
+	const char *oneline_str;
 
 	ctx.fmt = CMIT_FMT_USERFORMAT;
 	ctx.abbrev = log->abbrev;
@@ -166,21 +212,38 @@ void shortlog_add_commit(struct shortlog *log, struct commit *commit)
 	ctx.date_mode.type = DATE_NORMAL;
 	ctx.output_encoding = get_log_output_encoding();
 
-	fmt = log->committer ?
-		(log->email ? "%cN <%cE>" : "%cN") :
-		(log->email ? "%aN <%aE>" : "%aN");
-
-	format_commit_message(commit, fmt, &author, &ctx);
 	if (!log->summary) {
 		if (log->user_format)
 			pretty_print_commit(&ctx, commit, &oneline);
 		else
 			format_commit_message(commit, "%s", &oneline, &ctx);
 	}
+	oneline_str = oneline.len ? oneline.buf : "<none>";
+
+	if (log->groups & SHORTLOG_GROUP_AUTHOR) {
+		strbuf_reset(&ident);
+		format_commit_message(commit,
+				      log->email ? "%aN <%aE>" : "%aN",
+				      &ident, &ctx);
+		if (!HAS_MULTI_BITS(log->groups) ||
+		    strset_add(&dups, ident.buf))
+			insert_one_record(log, ident.buf, oneline_str);
+	}
+	if (log->groups & SHORTLOG_GROUP_COMMITTER) {
+		strbuf_reset(&ident);
+		format_commit_message(commit,
+				      log->email ? "%cN <%cE>" : "%cN",
+				      &ident, &ctx);
+		if (!HAS_MULTI_BITS(log->groups) ||
+		    strset_add(&dups, ident.buf))
+			insert_one_record(log, ident.buf, oneline_str);
+	}
+	if (log->groups & SHORTLOG_GROUP_TRAILER) {
+		insert_records_from_trailers(log, &dups, commit, &ctx, oneline_str);
+	}
 
-	insert_one_record(log, author.buf, oneline.len ? oneline.buf : "<none>");
-
-	strbuf_release(&author);
+	strset_clear(&dups);
+	strbuf_release(&ident);
 	strbuf_release(&oneline);
 }
 
@@ -241,16 +304,40 @@ static int parse_wrap_args(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
+static int parse_group_option(const struct option *opt, const char *arg, int unset)
+{
+	struct shortlog *log = opt->value;
+	const char *field;
+
+	if (unset) {
+		log->groups = 0;
+		string_list_clear(&log->trailers, 0);
+	} else if (!strcasecmp(arg, "author"))
+		log->groups |= SHORTLOG_GROUP_AUTHOR;
+	else if (!strcasecmp(arg, "committer"))
+		log->groups |= SHORTLOG_GROUP_COMMITTER;
+	else if (skip_prefix(arg, "trailer:", &field)) {
+		log->groups |= SHORTLOG_GROUP_TRAILER;
+		string_list_append(&log->trailers, field);
+	} else
+		return error(_("unknown group type: %s"), arg);
+
+	return 0;
+}
+
+
 void shortlog_init(struct shortlog *log)
 {
 	memset(log, 0, sizeof(*log));
 
-	read_mailmap(&log->mailmap, &log->common_repo_prefix);
+	read_mailmap(&log->mailmap);
 
 	log->list.strdup_strings = 1;
 	log->wrap = DEFAULT_WRAPLEN;
 	log->in1 = DEFAULT_INDENT1;
 	log->in2 = DEFAULT_INDENT2;
+	log->trailers.strdup_strings = 1;
+	log->trailers.cmp = strcasecmp;
 }
 
 int cmd_shortlog(int argc, const char **argv, const char *prefix)
@@ -260,17 +347,20 @@ int cmd_shortlog(int argc, const char **argv, const char *prefix)
 	int nongit = !startup_info->have_repository;
 
 	const struct option options[] = {
-		OPT_BOOL('c', "committer", &log.committer,
-			 N_("Group by committer rather than author")),
+		OPT_BIT('c', "committer", &log.groups,
+			N_("group by committer rather than author"),
+			SHORTLOG_GROUP_COMMITTER),
 		OPT_BOOL('n', "numbered", &log.sort_by_number,
 			 N_("sort output according to the number of commits per author")),
 		OPT_BOOL('s', "summary", &log.summary,
-			 N_("Suppress commit descriptions, only provides commit count")),
+			 N_("suppress commit descriptions, only provides commit count")),
 		OPT_BOOL('e', "email", &log.email,
-			 N_("Show the email address of each author")),
-		{ OPTION_CALLBACK, 'w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"),
-			N_("Linewrap output"), PARSE_OPT_OPTARG,
-			&parse_wrap_args },
+			 N_("show the email address of each author")),
+		OPT_CALLBACK_F('w', NULL, &log, N_("<w>[,<i1>[,<i2>]]"),
+			N_("linewrap output"), PARSE_OPT_OPTARG,
+			&parse_wrap_args),
+		OPT_CALLBACK(0, "group", &log, N_("field"),
+			N_("group by field"), parse_group_option),
 		OPT_END(),
 	};
 
@@ -311,6 +401,10 @@ parse_done:
 	log.abbrev = rev.abbrev;
 	log.file = rev.diffopt.file;
 
+	if (!log.groups)
+		log.groups = SHORTLOG_GROUP_AUTHOR;
+	string_list_sort(&log.trailers);
+
 	/* assume HEAD if from a tty */
 	if (!nongit && !rev.pending.nr && isatty(0))
 		add_head_to_pending(&rev);
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 35d7f51c23..d77ce7aeb3 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -4,7 +4,7 @@
 #include "refs.h"
 #include "builtin.h"
 #include "color.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "parse-options.h"
 #include "dir.h"
 #include "commit-slab.h"
@@ -20,7 +20,7 @@ static const char* show_branch_usage[] = {
 
 static int showbranch_use_color = -1;
 
-static struct argv_array default_args = ARGV_ARRAY_INIT;
+static struct strvec default_args = STRVEC_INIT;
 
 /*
  * TODO: convert this use of commit->object.flags to commit-slab
@@ -536,7 +536,7 @@ static void append_one_rev(const char *av)
 		append_ref(av, &revkey, 0);
 		return;
 	}
-	if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
+	if (strpbrk(av, "*?[")) {
 		/* glob style match */
 		int saved_matches = ref_name_cnt;
 
@@ -561,9 +561,9 @@ static int git_show_branch_config(const char *var, const char *value, void *cb)
 		 * default_arg is now passed to parse_options(), so we need to
 		 * mimic the real argv a bit better.
 		 */
-		if (!default_args.argc)
-			argv_array_push(&default_args, "show-branch");
-		argv_array_push(&default_args, value);
+		if (!default_args.nr)
+			strvec_push(&default_args, "show-branch");
+		strvec_push(&default_args, value);
 		return 0;
 	}
 
@@ -671,11 +671,11 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 			    N_("topologically sort, maintaining date order "
 			       "where possible"),
 			    REV_SORT_BY_COMMIT_DATE),
-		{ OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"),
+		OPT_CALLBACK_F('g', "reflog", &reflog_base, N_("<n>[,<base>]"),
 			    N_("show <n> most recent ref-log entries starting at "
 			       "base"),
 			    PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
-			    parse_reflog_param },
+			    parse_reflog_param),
 		OPT_END()
 	};
 
@@ -684,9 +684,9 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 	git_config(git_show_branch_config, NULL);
 
 	/* If nothing is specified, try the default first */
-	if (ac == 1 && default_args.argc) {
-		ac = default_args.argc;
-		av = default_args.argv;
+	if (ac == 1 && default_args.nr) {
+		ac = default_args.nr;
+		av = default_args.v;
 	}
 
 	ac = parse_options(ac, av, prefix, builtin_show_branch_options,
@@ -741,7 +741,7 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 			die(Q_("only %d entry can be shown at one time.",
 			       "only %d entries can be shown at one time.",
 			       MAX_REVS), MAX_REVS);
-		if (!dwim_ref(*av, strlen(*av), &oid, &ref))
+		if (!dwim_ref(*av, strlen(*av), &oid, &ref, 0))
 			die(_("no such ref %s"), *av);
 
 		/* Has the base been specified? */
@@ -939,9 +939,12 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
 					mark = '*';
 				else
 					mark = '+';
-				printf("%s%c%s",
-				       get_color_code(i),
-				       mark, get_color_reset_code());
+				if (mark == ' ')
+					putchar(mark);
+				else
+					printf("%s%c%s",
+					       get_color_code(i),
+					       mark, get_color_reset_code());
 			}
 			putchar(' ');
 		}
diff --git a/builtin/show-index.c b/builtin/show-index.c
index 0826f6a5a2..0e0b9fb95b 100644
--- a/builtin/show-index.c
+++ b/builtin/show-index.c
@@ -1,9 +1,12 @@
 #include "builtin.h"
 #include "cache.h"
 #include "pack.h"
+#include "parse-options.h"
 
-static const char show_index_usage[] =
-"git show-index";
+static const char *const show_index_usage[] = {
+	"git show-index [--object-format=<hash-algorithm>]",
+	NULL
+};
 
 int cmd_show_index(int argc, const char **argv, const char *prefix)
 {
@@ -11,10 +14,26 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
 	unsigned nr;
 	unsigned int version;
 	static unsigned int top_index[256];
-	const unsigned hashsz = the_hash_algo->rawsz;
+	unsigned hashsz;
+	const char *hash_name = NULL;
+	int hash_algo;
+	const struct option show_index_options[] = {
+		OPT_STRING(0, "object-format", &hash_name, N_("hash-algorithm"),
+			   N_("specify the hash algorithm to use")),
+		OPT_END()
+	};
+
+	argc = parse_options(argc, argv, prefix, show_index_options, show_index_usage, 0);
+
+	if (hash_name) {
+		hash_algo = hash_algo_by_name(hash_name);
+		if (hash_algo == GIT_HASH_UNKNOWN)
+			die(_("Unknown hash algorithm"));
+		repo_set_hash_algo(the_repository, hash_algo);
+	}
+
+	hashsz = the_hash_algo->rawsz;
 
-	if (argc != 1)
-		usage(show_index_usage);
 	if (fread(top_index, 2 * 4, 1, stdin) != 1)
 		die("unable to read header");
 	if (top_index[0] == htonl(PACK_IDX_SIGNATURE)) {
@@ -52,9 +71,11 @@ int cmd_show_index(int argc, const char **argv, const char *prefix)
 			uint32_t off;
 		} *entries;
 		ALLOC_ARRAY(entries, nr);
-		for (i = 0; i < nr; i++)
+		for (i = 0; i < nr; i++) {
 			if (fread(entries[i].oid.hash, hashsz, 1, stdin) != 1)
 				die("unable to read sha1 %u/%u", i, nr);
+			entries[i].oid.algo = hash_algo_by_ptr(the_hash_algo);
+		}
 		for (i = 0; i < nr; i++)
 			if (fread(&entries[i].crc, 4, 1, stdin) != 1)
 				die("unable to read crc %u/%u", i, nr);
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 6456da70cc..7f8a5332f8 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -40,7 +40,7 @@ static void show_one(const char *refname, const struct object_id *oid)
 	if (!deref_tags)
 		return;
 
-	if (!peel_ref(refname, &peeled)) {
+	if (!peel_iterated_oid(oid, &peeled)) {
 		hex = find_unique_abbrev(&peeled, abbrev);
 		printf("%s %s^{}\n", hex, refname);
 	}
@@ -169,15 +169,15 @@ static const struct option show_ref_options[] = {
 	  N_("show the HEAD reference, even if it would be filtered out")),
 	OPT_BOOL('d', "dereference", &deref_tags,
 		    N_("dereference tags into object IDs")),
-	{ OPTION_CALLBACK, 's', "hash", &abbrev, N_("n"),
-	  N_("only show SHA1 hash using <n> digits"),
-	  PARSE_OPT_OPTARG, &hash_callback },
+	OPT_CALLBACK_F('s', "hash", &abbrev, N_("n"),
+		       N_("only show SHA1 hash using <n> digits"),
+		       PARSE_OPT_OPTARG, &hash_callback),
 	OPT__ABBREV(&abbrev),
 	OPT__QUIET(&quiet,
 		   N_("do not print results to stdout (useful with --verify)")),
-	{ OPTION_CALLBACK, 0, "exclude-existing", &exclude_existing_arg,
-	  N_("pattern"), N_("show refs from stdin that aren't in local repository"),
-	  PARSE_OPT_OPTARG | PARSE_OPT_NONEG, exclude_existing_callback },
+	OPT_CALLBACK_F(0, "exclude-existing", &exclude_existing_arg,
+		       N_("pattern"), N_("show refs from stdin that aren't in local repository"),
+		       PARSE_OPT_OPTARG | PARSE_OPT_NONEG, exclude_existing_callback),
 	OPT_END()
 };
 
diff --git a/builtin/sparse-checkout.c b/builtin/sparse-checkout.c
new file mode 100644
index 0000000000..8ba9f13787
--- /dev/null
+++ b/builtin/sparse-checkout.c
@@ -0,0 +1,678 @@
+#include "builtin.h"
+#include "config.h"
+#include "dir.h"
+#include "parse-options.h"
+#include "pathspec.h"
+#include "repository.h"
+#include "run-command.h"
+#include "strbuf.h"
+#include "string-list.h"
+#include "cache.h"
+#include "cache-tree.h"
+#include "lockfile.h"
+#include "resolve-undo.h"
+#include "unpack-trees.h"
+#include "wt-status.h"
+#include "quote.h"
+#include "sparse-index.h"
+
+static const char *empty_base = "";
+
+static char const * const builtin_sparse_checkout_usage[] = {
+	N_("git sparse-checkout (init|list|set|add|reapply|disable) <options>"),
+	NULL
+};
+
+static void write_patterns_to_file(FILE *fp, struct pattern_list *pl)
+{
+	int i;
+
+	for (i = 0; i < pl->nr; i++) {
+		struct path_pattern *p = pl->patterns[i];
+
+		if (p->flags & PATTERN_FLAG_NEGATIVE)
+			fprintf(fp, "!");
+
+		fprintf(fp, "%s", p->pattern);
+
+		if (p->flags & PATTERN_FLAG_MUSTBEDIR)
+			fprintf(fp, "/");
+
+		fprintf(fp, "\n");
+	}
+}
+
+static char const * const builtin_sparse_checkout_list_usage[] = {
+	N_("git sparse-checkout list"),
+	NULL
+};
+
+static int sparse_checkout_list(int argc, const char **argv)
+{
+	static struct option builtin_sparse_checkout_list_options[] = {
+		OPT_END(),
+	};
+	struct pattern_list pl;
+	char *sparse_filename;
+	int res;
+
+	argc = parse_options(argc, argv, NULL,
+			     builtin_sparse_checkout_list_options,
+			     builtin_sparse_checkout_list_usage, 0);
+
+	memset(&pl, 0, sizeof(pl));
+
+	pl.use_cone_patterns = core_sparse_checkout_cone;
+
+	sparse_filename = get_sparse_checkout_filename();
+	res = add_patterns_from_file_to_list(sparse_filename, "", 0, &pl, NULL, 0);
+	free(sparse_filename);
+
+	if (res < 0) {
+		warning(_("this worktree is not sparse (sparse-checkout file may not exist)"));
+		return 0;
+	}
+
+	if (pl.use_cone_patterns) {
+		int i;
+		struct pattern_entry *pe;
+		struct hashmap_iter iter;
+		struct string_list sl = STRING_LIST_INIT_DUP;
+
+		hashmap_for_each_entry(&pl.recursive_hashmap, &iter, pe, ent) {
+			/* pe->pattern starts with "/", skip it */
+			string_list_insert(&sl, pe->pattern + 1);
+		}
+
+		string_list_sort(&sl);
+
+		for (i = 0; i < sl.nr; i++) {
+			quote_c_style(sl.items[i].string, NULL, stdout, 0);
+			printf("\n");
+		}
+
+		return 0;
+	}
+
+	write_patterns_to_file(stdout, &pl);
+	clear_pattern_list(&pl);
+
+	return 0;
+}
+
+static int update_working_directory(struct pattern_list *pl)
+{
+	enum update_sparsity_result result;
+	struct unpack_trees_options o;
+	struct lock_file lock_file = LOCK_INIT;
+	struct repository *r = the_repository;
+
+	/* If no branch has been checked out, there are no updates to make. */
+	if (is_index_unborn(r->index))
+		return UPDATE_SPARSITY_SUCCESS;
+
+	r->index->sparse_checkout_patterns = pl;
+
+	memset(&o, 0, sizeof(o));
+	o.verbose_update = isatty(2);
+	o.update = 1;
+	o.head_idx = -1;
+	o.src_index = r->index;
+	o.dst_index = r->index;
+	o.skip_sparse_checkout = 0;
+	o.pl = pl;
+
+	setup_work_tree();
+
+	repo_hold_locked_index(r, &lock_file, LOCK_DIE_ON_ERROR);
+
+	setup_unpack_trees_porcelain(&o, "sparse-checkout");
+	result = update_sparsity(&o);
+	clear_unpack_trees_porcelain(&o);
+
+	if (result == UPDATE_SPARSITY_WARNINGS)
+		/*
+		 * We don't do any special handling of warnings from untracked
+		 * files in the way or dirty entries that can't be removed.
+		 */
+		result = UPDATE_SPARSITY_SUCCESS;
+	if (result == UPDATE_SPARSITY_SUCCESS)
+		write_locked_index(r->index, &lock_file, COMMIT_LOCK);
+	else
+		rollback_lock_file(&lock_file);
+
+	r->index->sparse_checkout_patterns = NULL;
+	return result;
+}
+
+static char *escaped_pattern(char *pattern)
+{
+	char *p = pattern;
+	struct strbuf final = STRBUF_INIT;
+
+	while (*p) {
+		if (is_glob_special(*p))
+			strbuf_addch(&final, '\\');
+
+		strbuf_addch(&final, *p);
+		p++;
+	}
+
+	return strbuf_detach(&final, NULL);
+}
+
+static void write_cone_to_file(FILE *fp, struct pattern_list *pl)
+{
+	int i;
+	struct pattern_entry *pe;
+	struct hashmap_iter iter;
+	struct string_list sl = STRING_LIST_INIT_DUP;
+	struct strbuf parent_pattern = STRBUF_INIT;
+
+	hashmap_for_each_entry(&pl->parent_hashmap, &iter, pe, ent) {
+		if (hashmap_get_entry(&pl->recursive_hashmap, pe, ent, NULL))
+			continue;
+
+		if (!hashmap_contains_parent(&pl->recursive_hashmap,
+					     pe->pattern,
+					     &parent_pattern))
+			string_list_insert(&sl, pe->pattern);
+	}
+
+	string_list_sort(&sl);
+	string_list_remove_duplicates(&sl, 0);
+
+	fprintf(fp, "/*\n!/*/\n");
+
+	for (i = 0; i < sl.nr; i++) {
+		char *pattern = escaped_pattern(sl.items[i].string);
+
+		if (strlen(pattern))
+			fprintf(fp, "%s/\n!%s/*/\n", pattern, pattern);
+		free(pattern);
+	}
+
+	string_list_clear(&sl, 0);
+
+	hashmap_for_each_entry(&pl->recursive_hashmap, &iter, pe, ent) {
+		if (!hashmap_contains_parent(&pl->recursive_hashmap,
+					     pe->pattern,
+					     &parent_pattern))
+			string_list_insert(&sl, pe->pattern);
+	}
+
+	strbuf_release(&parent_pattern);
+
+	string_list_sort(&sl);
+	string_list_remove_duplicates(&sl, 0);
+
+	for (i = 0; i < sl.nr; i++) {
+		char *pattern = escaped_pattern(sl.items[i].string);
+		fprintf(fp, "%s/\n", pattern);
+		free(pattern);
+	}
+}
+
+static int write_patterns_and_update(struct pattern_list *pl)
+{
+	char *sparse_filename;
+	FILE *fp;
+	int fd;
+	struct lock_file lk = LOCK_INIT;
+	int result;
+
+	sparse_filename = get_sparse_checkout_filename();
+
+	if (safe_create_leading_directories(sparse_filename))
+		die(_("failed to create directory for sparse-checkout file"));
+
+	fd = hold_lock_file_for_update(&lk, sparse_filename,
+				      LOCK_DIE_ON_ERROR);
+
+	result = update_working_directory(pl);
+	if (result) {
+		rollback_lock_file(&lk);
+		free(sparse_filename);
+		clear_pattern_list(pl);
+		update_working_directory(NULL);
+		return result;
+	}
+
+	fp = xfdopen(fd, "w");
+
+	if (core_sparse_checkout_cone)
+		write_cone_to_file(fp, pl);
+	else
+		write_patterns_to_file(fp, pl);
+
+	fflush(fp);
+	commit_lock_file(&lk);
+
+	free(sparse_filename);
+	clear_pattern_list(pl);
+
+	return 0;
+}
+
+enum sparse_checkout_mode {
+	MODE_NO_PATTERNS = 0,
+	MODE_ALL_PATTERNS = 1,
+	MODE_CONE_PATTERNS = 2,
+};
+
+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"));
+		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 (mode == MODE_NO_PATTERNS)
+		set_sparse_index_config(the_repository, 0);
+
+	return 0;
+}
+
+static char const * const builtin_sparse_checkout_init_usage[] = {
+	N_("git sparse-checkout init [--cone] [--[no-]sparse-index]"),
+	NULL
+};
+
+static struct sparse_checkout_init_opts {
+	int cone_mode;
+	int sparse_index;
+} init_opts;
+
+static int sparse_checkout_init(int argc, const char **argv)
+{
+	struct pattern_list pl;
+	char *sparse_filename;
+	int res;
+	struct object_id oid;
+	int mode;
+	struct strbuf pattern = STRBUF_INIT;
+
+	static struct option builtin_sparse_checkout_init_options[] = {
+		OPT_BOOL(0, "cone", &init_opts.cone_mode,
+			 N_("initialize the sparse-checkout in cone mode")),
+		OPT_BOOL(0, "sparse-index", &init_opts.sparse_index,
+			 N_("toggle the use of a sparse index")),
+		OPT_END(),
+	};
+
+	repo_read_index(the_repository);
+
+	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))
+		return 1;
+
+	memset(&pl, 0, sizeof(pl));
+
+	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);
+		return update_working_directory(NULL);
+	}
+
+	if (get_oid("HEAD", &oid)) {
+		FILE *fp;
+
+		/* assume we are in a fresh repo, but update the sparse-checkout file */
+		fp = xfopen(sparse_filename, "w");
+		if (!fp)
+			die(_("failed to open '%s'"), sparse_filename);
+
+		free(sparse_filename);
+		fprintf(fp, "/*\n!/*/\n");
+		fclose(fp);
+		return 0;
+	}
+
+	strbuf_addstr(&pattern, "/*");
+	add_pattern(strbuf_detach(&pattern, NULL), empty_base, 0, &pl, 0);
+	strbuf_addstr(&pattern, "!/*/");
+	add_pattern(strbuf_detach(&pattern, NULL), empty_base, 0, &pl, 0);
+	pl.use_cone_patterns = init_opts.cone_mode;
+
+	return write_patterns_and_update(&pl);
+}
+
+static void insert_recursive_pattern(struct pattern_list *pl, struct strbuf *path)
+{
+	struct pattern_entry *e = xmalloc(sizeof(*e));
+	e->patternlen = path->len;
+	e->pattern = strbuf_detach(path, NULL);
+	hashmap_entry_init(&e->ent, fspathhash(e->pattern));
+
+	hashmap_add(&pl->recursive_hashmap, &e->ent);
+
+	while (e->patternlen) {
+		char *slash = strrchr(e->pattern, '/');
+		char *oldpattern = e->pattern;
+		size_t newlen;
+
+		if (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, fspathhash(e->pattern));
+
+		if (!hashmap_get_entry(&pl->parent_hashmap, e, ent, NULL))
+			hashmap_add(&pl->parent_hashmap, &e->ent);
+	}
+}
+
+static void strbuf_to_cone_pattern(struct strbuf *line, struct pattern_list *pl)
+{
+	strbuf_trim(line);
+
+	strbuf_trim_trailing_dir_sep(line);
+
+	if (strbuf_normalize_path(line))
+		die(_("could not normalize path %s"), line->buf);
+
+	if (!line->len)
+		return;
+
+	if (line->buf[0] != '/')
+		strbuf_insertstr(line, 0, "/");
+
+	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 i;
+	if (core_sparse_checkout_cone) {
+		struct strbuf line = STRBUF_INIT;
+
+		hashmap_init(&pl->recursive_hashmap, pl_hashmap_cmp, NULL, 0);
+		hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0);
+		pl->use_cone_patterns = 1;
+
+		if (set_opts.use_stdin) {
+			struct strbuf unquoted = STRBUF_INIT;
+			while (!strbuf_getline(&line, stdin)) {
+				if (line.buf[0] == '"') {
+					strbuf_reset(&unquoted);
+					if (unquote_c_style(&unquoted, line.buf, NULL))
+						die(_("unable to unquote C-style string '%s'"),
+						line.buf);
+
+					strbuf_swap(&unquoted, &line);
+				}
+
+				strbuf_to_cone_pattern(&line, pl);
+			}
+
+			strbuf_release(&unquoted);
+		} else {
+			for (i = 0; i < argc; i++) {
+				strbuf_setlen(&line, 0);
+				strbuf_addstr(&line, argv[i]);
+				strbuf_to_cone_pattern(&line, pl);
+			}
+		}
+	} else {
+		if (set_opts.use_stdin) {
+			struct strbuf line = STRBUF_INIT;
+
+			while (!strbuf_getline(&line, stdin)) {
+				size_t len;
+				char *buf = strbuf_detach(&line, &len);
+				add_pattern(buf, empty_base, 0, pl, 0);
+			}
+		} else {
+			for (i = 0; i < argc; i++)
+				add_pattern(argv[i], empty_base, 0, pl, 0);
+		}
+	}
+}
+
+enum modify_type {
+	REPLACE,
+	ADD,
+};
+
+static void add_patterns_cone_mode(int argc, const char **argv,
+				   struct pattern_list *pl)
+{
+	struct strbuf buffer = STRBUF_INIT;
+	struct pattern_entry *pe;
+	struct hashmap_iter iter;
+	struct pattern_list existing;
+	char *sparse_filename = get_sparse_checkout_filename();
+
+	add_patterns_from_input(pl, argc, argv);
+
+	memset(&existing, 0, sizeof(existing));
+	existing.use_cone_patterns = core_sparse_checkout_cone;
+
+	if (add_patterns_from_file_to_list(sparse_filename, "", 0,
+					   &existing, NULL, 0))
+		die(_("unable to load existing sparse-checkout patterns"));
+	free(sparse_filename);
+
+	hashmap_for_each_entry(&existing.recursive_hashmap, &iter, pe, ent) {
+		if (!hashmap_contains_parent(&pl->recursive_hashmap,
+					pe->pattern, &buffer) ||
+		    !hashmap_contains_parent(&pl->parent_hashmap,
+					pe->pattern, &buffer)) {
+			strbuf_reset(&buffer);
+			strbuf_addstr(&buffer, pe->pattern);
+			insert_recursive_pattern(pl, &buffer);
+		}
+	}
+
+	clear_pattern_list(&existing);
+	strbuf_release(&buffer);
+}
+
+static void add_patterns_literal(int argc, const char **argv,
+				 struct pattern_list *pl)
+{
+	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);
+}
+
+static int modify_pattern_list(int argc, const char **argv, enum modify_type m)
+{
+	int result;
+	int changed_config = 0;
+	struct pattern_list *pl = xcalloc(1, sizeof(*pl));
+
+	switch (m) {
+	case ADD:
+		if (core_sparse_checkout_cone)
+			add_patterns_cone_mode(argc, argv, pl);
+		else
+			add_patterns_literal(argc, argv, pl);
+		break;
+
+	case REPLACE:
+		add_patterns_from_input(pl, argc, argv);
+		break;
+	}
+
+	if (!core_apply_sparse_checkout) {
+		set_config(MODE_ALL_PATTERNS);
+		core_apply_sparse_checkout = 1;
+		changed_config = 1;
+	}
+
+	result = write_patterns_and_update(pl);
+
+	if (result && changed_config)
+		set_config(MODE_NO_PATTERNS);
+
+	clear_pattern_list(pl);
+	free(pl);
+	return result;
+}
+
+static int sparse_checkout_set(int argc, const char **argv, const char *prefix,
+			       enum modify_type m)
+{
+	static struct option builtin_sparse_checkout_set_options[] = {
+		OPT_BOOL(0, "stdin", &set_opts.use_stdin,
+			 N_("read patterns from standard in")),
+		OPT_END(),
+	};
+
+	repo_read_index(the_repository);
+
+	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);
+}
+
+static char const * const builtin_sparse_checkout_reapply_usage[] = {
+	N_("git sparse-checkout reapply"),
+	NULL
+};
+
+static int sparse_checkout_reapply(int argc, const char **argv)
+{
+	static struct option builtin_sparse_checkout_reapply_options[] = {
+		OPT_END(),
+	};
+
+	argc = parse_options(argc, argv, NULL,
+			     builtin_sparse_checkout_reapply_options,
+			     builtin_sparse_checkout_reapply_usage, 0);
+
+	repo_read_index(the_repository);
+	return update_working_directory(NULL);
+}
+
+static char const * const builtin_sparse_checkout_disable_usage[] = {
+	N_("git sparse-checkout disable"),
+	NULL
+};
+
+static int sparse_checkout_disable(int argc, const char **argv)
+{
+	static struct option builtin_sparse_checkout_disable_options[] = {
+		OPT_END(),
+	};
+	struct pattern_list pl;
+	struct strbuf match_all = STRBUF_INIT;
+
+	argc = parse_options(argc, argv, NULL,
+			     builtin_sparse_checkout_disable_options,
+			     builtin_sparse_checkout_disable_usage, 0);
+
+	repo_read_index(the_repository);
+
+	memset(&pl, 0, sizeof(pl));
+	hashmap_init(&pl.recursive_hashmap, pl_hashmap_cmp, NULL, 0);
+	hashmap_init(&pl.parent_hashmap, pl_hashmap_cmp, NULL, 0);
+	pl.use_cone_patterns = 0;
+	core_apply_sparse_checkout = 1;
+
+	strbuf_addstr(&match_all, "/*");
+	add_pattern(strbuf_detach(&match_all, NULL), empty_base, 0, &pl, 0);
+
+	prepare_repo_settings(the_repository);
+	the_repository->settings.sparse_index = 0;
+
+	if (update_working_directory(&pl))
+		die(_("error while refreshing working directory"));
+
+	clear_pattern_list(&pl);
+	return set_config(MODE_NO_PATTERNS);
+}
+
+int cmd_sparse_checkout(int argc, const char **argv, const char *prefix)
+{
+	static struct option builtin_sparse_checkout_options[] = {
+		OPT_END(),
+	};
+
+	if (argc == 2 && !strcmp(argv[1], "-h"))
+		usage_with_options(builtin_sparse_checkout_usage,
+				   builtin_sparse_checkout_options);
+
+	argc = parse_options(argc, argv, prefix,
+			     builtin_sparse_checkout_options,
+			     builtin_sparse_checkout_usage,
+			     PARSE_OPT_STOP_AT_NON_OPTION);
+
+	git_config(git_default_config, NULL);
+
+	if (argc > 0) {
+		if (!strcmp(argv[0], "list"))
+			return sparse_checkout_list(argc, argv);
+		if (!strcmp(argv[0], "init"))
+			return sparse_checkout_init(argc, argv);
+		if (!strcmp(argv[0], "set"))
+			return sparse_checkout_set(argc, argv, prefix, REPLACE);
+		if (!strcmp(argv[0], "add"))
+			return sparse_checkout_set(argc, argv, prefix, ADD);
+		if (!strcmp(argv[0], "reapply"))
+			return sparse_checkout_reapply(argc, argv);
+		if (!strcmp(argv[0], "disable"))
+			return sparse_checkout_disable(argc, argv);
+	}
+
+	usage_with_options(builtin_sparse_checkout_usage,
+			   builtin_sparse_checkout_options);
+}
diff --git a/builtin/stash.c b/builtin/stash.c
index 4e806176b0..8f42360ca9 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -7,14 +7,16 @@
 #include "cache-tree.h"
 #include "unpack-trees.h"
 #include "merge-recursive.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "run-command.h"
 #include "dir.h"
+#include "entry.h"
 #include "rerere.h"
 #include "revision.h"
 #include "log-tree.h"
 #include "diffcore.h"
 #include "exec-cmd.h"
+#include "entry.h"
 
 #define INCLUDE_ALL_FILES 2
 
@@ -24,9 +26,10 @@ static const char * const git_stash_usage[] = {
 	N_("git stash drop [-q|--quiet] [<stash>]"),
 	N_("git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"),
 	N_("git stash branch <branchname> [<stash>]"),
-	N_("git stash clear"),
+	"git stash clear",
 	N_("git stash [push [-p|--patch] [-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"
 	   "          [-u|--include-untracked] [-a|--all] [<message>]"),
@@ -64,7 +67,7 @@ static const char * const git_stash_branch_usage[] = {
 };
 
 static const char * const git_stash_clear_usage[] = {
-	N_("git stash clear"),
+	"git stash clear",
 	NULL
 };
 
@@ -86,7 +89,7 @@ static const char * const git_stash_save_usage[] = {
 	NULL
 };
 
-static const char *ref_stash = "refs/stash";
+static const char ref_stash[] = "refs/stash";
 static struct strbuf stash_index_path = STRBUF_INIT;
 
 /*
@@ -184,7 +187,7 @@ static int get_stash_info(struct stash_info *info, int argc, const char **argv)
 	end_of_rev = strchrnul(revision, '@');
 	strbuf_add(&symbolic, revision, end_of_rev - revision);
 
-	ret = dwim_ref(symbolic.buf, symbolic.len, &dummy, &expanded_ref);
+	ret = dwim_ref(symbolic.buf, symbolic.len, &dummy, &expanded_ref, 0);
 	strbuf_release(&symbolic);
 	switch (ret) {
 	case 0: /* Not found, but valid ref */
@@ -221,7 +224,7 @@ static int clear_stash(int argc, const char **argv, const char *prefix)
 			     PARSE_OPT_STOP_AT_NON_OPTION);
 
 	if (argc)
-		return error(_("git stash clear with parameters is "
+		return error(_("git stash clear with arguments is "
 			       "unimplemented"));
 
 	return do_clear_stash();
@@ -276,8 +279,8 @@ static int diff_tree_binary(struct strbuf *out, struct object_id *w_commit)
 	 * however it should be done together with apply_cached.
 	 */
 	cp.git_cmd = 1;
-	argv_array_pushl(&cp.args, "diff-tree", "--binary", NULL);
-	argv_array_pushf(&cp.args, "%s^2^..%s^2", w_commit_hex, w_commit_hex);
+	strvec_pushl(&cp.args, "diff-tree", "--binary", NULL);
+	strvec_pushf(&cp.args, "%s^2^..%s^2", w_commit_hex, w_commit_hex);
 
 	return pipe_command(&cp, NULL, 0, out, 0, NULL, 0);
 }
@@ -292,7 +295,7 @@ static int apply_cached(struct strbuf *out)
 	 * buffer.
 	 */
 	cp.git_cmd = 1;
-	argv_array_pushl(&cp.args, "apply", "--cached", NULL);
+	strvec_pushl(&cp.args, "apply", "--cached", NULL);
 	return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0);
 }
 
@@ -305,7 +308,7 @@ static int reset_head(void)
 	 * API for resetting.
 	 */
 	cp.git_cmd = 1;
-	argv_array_push(&cp.args, "reset");
+	strvec_push(&cp.args, "reset");
 
 	return run_command(&cp);
 }
@@ -324,35 +327,6 @@ static void add_diff_to_buf(struct diff_queue_struct *q,
 	}
 }
 
-static int get_newly_staged(struct strbuf *out, struct object_id *c_tree)
-{
-	struct child_process cp = CHILD_PROCESS_INIT;
-	const char *c_tree_hex = oid_to_hex(c_tree);
-
-	/*
-	 * diff-index is very similar to diff-tree above, and should be
-	 * converted together with update_index.
-	 */
-	cp.git_cmd = 1;
-	argv_array_pushl(&cp.args, "diff-index", "--cached", "--name-only",
-			 "--diff-filter=A", NULL);
-	argv_array_push(&cp.args, c_tree_hex);
-	return pipe_command(&cp, NULL, 0, out, 0, NULL, 0);
-}
-
-static int update_index(struct strbuf *out)
-{
-	struct child_process cp = CHILD_PROCESS_INIT;
-
-	/*
-	 * Update-index is very complicated and may need to have a public
-	 * function exposed in order to remove this forking.
-	 */
-	cp.git_cmd = 1;
-	argv_array_pushl(&cp.args, "update-index", "--add", "--stdin", NULL);
-	return pipe_command(&cp, out->buf, out->len, NULL, 0, NULL, 0);
-}
-
 static int restore_untracked(struct object_id *u_tree)
 {
 	int res;
@@ -364,10 +338,10 @@ static int restore_untracked(struct object_id *u_tree)
 	 * run_command to fork processes that will not interfere.
 	 */
 	cp.git_cmd = 1;
-	argv_array_push(&cp.args, "read-tree");
-	argv_array_push(&cp.args, oid_to_hex(u_tree));
-	argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
-			 stash_index_path.buf);
+	strvec_push(&cp.args, "read-tree");
+	strvec_push(&cp.args, oid_to_hex(u_tree));
+	strvec_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
+		     stash_index_path.buf);
 	if (run_command(&cp)) {
 		remove_path(stash_index_path.buf);
 		return -1;
@@ -375,15 +349,130 @@ static int restore_untracked(struct object_id *u_tree)
 
 	child_process_init(&cp);
 	cp.git_cmd = 1;
-	argv_array_pushl(&cp.args, "checkout-index", "--all", NULL);
-	argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
-			 stash_index_path.buf);
+	strvec_pushl(&cp.args, "checkout-index", "--all", NULL);
+	strvec_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
+		     stash_index_path.buf);
 
 	res = run_command(&cp);
 	remove_path(stash_index_path.buf);
 	return res;
 }
 
+static void unstage_changes_unless_new(struct object_id *orig_tree)
+{
+	/*
+	 * When we enter this function, there has been a clean merge of
+	 * relevant trees, and the merge logic always stages whatever merges
+	 * cleanly.  We want to unstage those changes, unless it corresponds
+	 * to a file that didn't exist as of orig_tree.
+	 *
+	 * However, if any SKIP_WORKTREE path is modified relative to
+	 * orig_tree, then we want to clear the SKIP_WORKTREE bit and write
+	 * it to the worktree before unstaging.
+	 */
+
+	struct checkout state = CHECKOUT_INIT;
+	struct diff_options diff_opts;
+	struct lock_file lock = LOCK_INIT;
+	int i;
+
+	/* If any entries have skip_worktree set, we'll have to check 'em out */
+	state.force = 1;
+	state.quiet = 1;
+	state.refresh_cache = 1;
+	state.istate = &the_index;
+
+	/*
+	 * Step 1: get a difference between orig_tree (which corresponding
+	 * to the index before a merge was run) and the current index
+	 * (reflecting the changes brought in by the merge).
+	 */
+	diff_setup(&diff_opts);
+	diff_opts.flags.recursive = 1;
+	diff_opts.detect_rename = 0;
+	diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
+	diff_setup_done(&diff_opts);
+
+	do_diff_cache(orig_tree, &diff_opts);
+	diffcore_std(&diff_opts);
+
+	/* Iterate over the paths that changed due to the merge... */
+	for (i = 0; i < diff_queued_diff.nr; i++) {
+		struct diff_filepair *p;
+		struct cache_entry *ce;
+		int pos;
+
+		/* Look up the path's position in the current index. */
+		p = diff_queued_diff.queue[i];
+		pos = index_name_pos(&the_index, p->two->path,
+				     strlen(p->two->path));
+
+		/*
+		 * Step 2: Place changes in the working tree
+		 *
+		 * Stash is about restoring changes *to the working tree*.
+		 * So if the merge successfully got a new version of some
+		 * path, but left it out of the working tree, then clear the
+		 * SKIP_WORKTREE bit and write it to the working tree.
+		 */
+		if (pos >= 0 && ce_skip_worktree(active_cache[pos])) {
+			struct stat st;
+
+			ce = active_cache[pos];
+			if (!lstat(ce->name, &st)) {
+				/* Conflicting path present; relocate it */
+				struct strbuf new_path = STRBUF_INIT;
+				int fd;
+
+				strbuf_addf(&new_path,
+					    "%s.stash.XXXXXX", ce->name);
+				fd = xmkstemp(new_path.buf);
+				close(fd);
+				printf(_("WARNING: Untracked file in way of "
+					 "tracked file!  Renaming\n "
+					 "           %s -> %s\n"
+					 "         to make room.\n"),
+				       ce->name, new_path.buf);
+				if (rename(ce->name, new_path.buf))
+					die("Failed to move %s to %s\n",
+					    ce->name, new_path.buf);
+				strbuf_release(&new_path);
+			}
+			checkout_entry(ce, &state, NULL, NULL);
+			ce->ce_flags &= ~CE_SKIP_WORKTREE;
+		}
+
+		/*
+		 * Step 3: "unstage" changes, as long as they are still tracked
+		 */
+		if (p->one->oid_valid) {
+			/*
+			 * Path existed in orig_tree; restore index entry
+			 * from that tree in order to "unstage" the changes.
+			 */
+			int option = ADD_CACHE_OK_TO_REPLACE;
+			if (pos < 0)
+				option = ADD_CACHE_OK_TO_ADD;
+
+			ce = make_cache_entry(&the_index,
+					      p->one->mode,
+					      &p->one->oid,
+					      p->one->path,
+					      0, 0);
+			add_index_entry(&the_index, ce, option);
+		}
+	}
+	diff_flush(&diff_opts);
+
+	/*
+	 * Step 4: write the new index to disk
+	 */
+	repo_hold_locked_index(the_repository, &lock, LOCK_DIE_ON_ERROR);
+	if (write_locked_index(&the_index, &lock,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
+		die(_("Unable to write index."));
+}
+
 static int do_apply_stash(const char *prefix, struct stash_info *info,
 			  int index, int quiet)
 {
@@ -418,7 +507,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 			ret = apply_cached(&out);
 			strbuf_release(&out);
 			if (ret)
-				return error(_("conflicts in index."
+				return error(_("conflicts in index. "
 					       "Try without --index."));
 
 			discard_cache();
@@ -466,30 +555,10 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 		if (reset_tree(&index_tree, 0, 0))
 			return -1;
 	} else {
-		struct strbuf out = STRBUF_INIT;
-
-		if (get_newly_staged(&out, &c_tree)) {
-			strbuf_release(&out);
-			return -1;
-		}
-
-		if (reset_tree(&c_tree, 0, 1)) {
-			strbuf_release(&out);
-			return -1;
-		}
-
-		ret = update_index(&out);
-		strbuf_release(&out);
-		if (ret)
-			return -1;
-
-		discard_cache();
+		unstage_changes_unless_new(&c_tree);
 	}
 
-	if (quiet) {
-		if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
-			warning("could not refresh index");
-	} else {
+	if (!quiet) {
 		struct child_process cp = CHILD_PROCESS_INIT;
 
 		/*
@@ -499,11 +568,11 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
 		 */
 		cp.git_cmd = 1;
 		cp.dir = prefix;
-		argv_array_pushf(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT"=%s",
-				 absolute_path(get_git_work_tree()));
-		argv_array_pushf(&cp.env_array, GIT_DIR_ENVIRONMENT"=%s",
-				 absolute_path(get_git_dir()));
-		argv_array_push(&cp.args, "status");
+		strvec_pushf(&cp.env_array, GIT_WORK_TREE_ENVIRONMENT"=%s",
+			     absolute_path(get_git_work_tree()));
+		strvec_pushf(&cp.env_array, GIT_DIR_ENVIRONMENT"=%s",
+			     absolute_path(get_git_dir()));
+		strvec_push(&cp.args, "status");
 		run_command(&cp);
 	}
 
@@ -534,11 +603,22 @@ static int apply_stash(int argc, const char **argv, const char *prefix)
 	return ret;
 }
 
+static int reject_reflog_ent(struct object_id *ooid, struct object_id *noid,
+			     const char *email, timestamp_t timestamp, int tz,
+			     const char *message, void *cb_data)
+{
+	return 1;
+}
+
+static int reflog_is_empty(const char *refname)
+{
+	return !for_each_reflog_ent(refname, reject_reflog_ent, NULL);
+}
+
 static int do_drop_stash(struct stash_info *info, int quiet)
 {
 	int ret;
 	struct child_process cp_reflog = CHILD_PROCESS_INIT;
-	struct child_process cp = CHILD_PROCESS_INIT;
 
 	/*
 	 * reflog does not provide a simple function for deleting refs. One will
@@ -546,9 +626,9 @@ static int do_drop_stash(struct stash_info *info, int quiet)
 	 */
 
 	cp_reflog.git_cmd = 1;
-	argv_array_pushl(&cp_reflog.args, "reflog", "delete", "--updateref",
-			 "--rewrite", NULL);
-	argv_array_push(&cp_reflog.args, info->revision.buf);
+	strvec_pushl(&cp_reflog.args, "reflog", "delete", "--updateref",
+		     "--rewrite", NULL);
+	strvec_push(&cp_reflog.args, info->revision.buf);
 	ret = run_command(&cp_reflog);
 	if (!ret) {
 		if (!quiet)
@@ -559,19 +639,7 @@ static int do_drop_stash(struct stash_info *info, int quiet)
 			     info->revision.buf);
 	}
 
-	/*
-	 * This could easily be replaced by get_oid, but currently it will throw
-	 * a fatal error when a reflog is empty, which we can not recover from.
-	 */
-	cp.git_cmd = 1;
-	/* Even though --quiet is specified, rev-parse still outputs the hash */
-	cp.no_stdout = 1;
-	argv_array_pushl(&cp.args, "rev-parse", "--verify", "--quiet", NULL);
-	argv_array_pushf(&cp.args, "%s@{0}", ref_stash);
-	ret = run_command(&cp);
-
-	/* do_clear_stash if we just dropped the last stash entry */
-	if (ret)
+	if (reflog_is_empty(ref_stash))
 		do_clear_stash();
 
 	return 0;
@@ -663,9 +731,9 @@ static int branch_stash(int argc, const char **argv, const char *prefix)
 		return -1;
 
 	cp.git_cmd = 1;
-	argv_array_pushl(&cp.args, "checkout", "-b", NULL);
-	argv_array_push(&cp.args, branch);
-	argv_array_push(&cp.args, oid_to_hex(&info.b_commit));
+	strvec_pushl(&cp.args, "checkout", "-b", NULL);
+	strvec_push(&cp.args, branch);
+	strvec_push(&cp.args, oid_to_hex(&info.b_commit));
 	ret = run_command(&cp);
 	if (!ret)
 		ret = do_apply_stash(prefix, &info, 1, 0);
@@ -692,16 +760,18 @@ static int list_stash(int argc, const char **argv, const char *prefix)
 		return 0;
 
 	cp.git_cmd = 1;
-	argv_array_pushl(&cp.args, "log", "--format=%gd: %gs", "-g",
-			 "--first-parent", "-m", NULL);
-	argv_array_pushv(&cp.args, argv);
-	argv_array_push(&cp.args, ref_stash);
-	argv_array_push(&cp.args, "--");
+	strvec_pushl(&cp.args, "log", "--format=%gd: %gs", "-g",
+		     "--first-parent", NULL);
+	strvec_pushv(&cp.args, argv);
+	strvec_push(&cp.args, ref_stash);
+	strvec_push(&cp.args, "--");
 	return run_command(&cp);
 }
 
 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)
 {
@@ -713,7 +783,42 @@ static int git_stash_config(const char *var, const char *value, void *cb)
 		show_patch = git_config_bool(var, value);
 		return 0;
 	}
-	return git_default_config(var, value, cb);
+	if (!strcmp(var, "stash.showincludeuntracked")) {
+		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);
+}
+
+static void diff_include_untracked(const struct stash_info *info, struct diff_options *diff_opt)
+{
+	const struct object_id *oid[] = { &info->w_commit, &info->u_tree };
+	struct tree *tree[ARRAY_SIZE(oid)];
+	struct tree_desc tree_desc[ARRAY_SIZE(oid)];
+	struct unpack_trees_options unpack_tree_opt = { 0 };
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(oid); i++) {
+		tree[i] = parse_tree_indirect(oid[i]);
+		if (parse_tree(tree[i]) < 0)
+			die(_("failed to parse tree"));
+		init_tree_desc(&tree_desc[i], tree[i]->buffer, tree[i]->size);
+	}
+
+	unpack_tree_opt.head_idx = -1;
+	unpack_tree_opt.src_index = &the_index;
+	unpack_tree_opt.dst_index = &the_index;
+	unpack_tree_opt.merge = 1;
+	unpack_tree_opt.fn = stash_worktree_untracked_merge;
+
+	if (unpack_trees(ARRAY_SIZE(tree_desc), tree_desc, &unpack_tree_opt))
+		die(_("failed to unpack trees"));
+
+	do_diff_cache(&info->b_commit, diff_opt);
 }
 
 static int show_stash(int argc, const char **argv, const char *prefix)
@@ -722,9 +827,20 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 	int ret = 0;
 	struct stash_info info;
 	struct rev_info rev;
-	struct argv_array stash_args = ARGV_ARRAY_INIT;
-	struct argv_array revision_args = ARGV_ARRAY_INIT;
+	struct strvec stash_args = STRVEC_INIT;
+	struct strvec revision_args = STRVEC_INIT;
+	enum {
+		UNTRACKED_NONE,
+		UNTRACKED_INCLUDE,
+		UNTRACKED_ONLY
+	} show_untracked = show_include_untracked ? UNTRACKED_INCLUDE : UNTRACKED_NONE;
 	struct option options[] = {
+		OPT_SET_INT('u', "include-untracked", &show_untracked,
+			    N_("include untracked files in the stash"),
+			    UNTRACKED_INCLUDE),
+		OPT_SET_INT_F(0, "only-untracked", &show_untracked,
+			      N_("only show untracked files in the stash"),
+			      UNTRACKED_ONLY, PARSE_OPT_NONEG),
 		OPT_END()
 	};
 
@@ -732,16 +848,20 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 	git_config(git_diff_ui_config, NULL);
 	init_revisions(&rev, prefix);
 
-	argv_array_push(&revision_args, argv[0]);
+	argc = parse_options(argc, argv, prefix, options, git_stash_show_usage,
+			     PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
+			     PARSE_OPT_KEEP_DASHDASH);
+
+	strvec_push(&revision_args, argv[0]);
 	for (i = 1; i < argc; i++) {
 		if (argv[i][0] != '-')
-			argv_array_push(&stash_args, argv[i]);
+			strvec_push(&stash_args, argv[i]);
 		else
-			argv_array_push(&revision_args, argv[i]);
+			strvec_push(&revision_args, argv[i]);
 	}
 
-	ret = get_stash_info(&info, stash_args.argc, stash_args.argv);
-	argv_array_clear(&stash_args);
+	ret = get_stash_info(&info, stash_args.nr, stash_args.v);
+	strvec_clear(&stash_args);
 	if (ret)
 		return -1;
 
@@ -749,8 +869,7 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 	 * The config settings are applied only if there are not passed
 	 * any options.
 	 */
-	if (revision_args.argc == 1) {
-		git_config(git_stash_config, NULL);
+	if (revision_args.nr == 1) {
 		if (show_stat)
 			rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT;
 
@@ -763,7 +882,7 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 		}
 	}
 
-	argc = setup_revisions(revision_args.argc, revision_args.argv, &rev, NULL);
+	argc = setup_revisions(revision_args.nr, revision_args.v, &rev, NULL);
 	if (argc > 1) {
 		free_stash_info(&info);
 		usage_with_options(git_stash_show_usage, options);
@@ -775,7 +894,21 @@ static int show_stash(int argc, const char **argv, const char *prefix)
 
 	rev.diffopt.flags.recursive = 1;
 	setup_diff_pager(&rev.diffopt);
-	diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
+	switch (show_untracked) {
+	case UNTRACKED_NONE:
+		diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
+		break;
+	case UNTRACKED_ONLY:
+		if (info.has_u)
+			diff_root_tree_oid(&info.u_tree, "", &rev.diffopt);
+		break;
+	case UNTRACKED_INCLUDE:
+		if (info.has_u)
+			diff_include_untracked(&info, &rev.diffopt);
+		else
+			diff_tree_oid(&info.b_commit, &info.w_commit, "", &rev.diffopt);
+		break;
+	}
 	log_tree_diff_flush(&rev);
 
 	free_stash_info(&info);
@@ -838,12 +971,12 @@ static int store_stash(int argc, const char **argv, const char *prefix)
 	return do_store_stash(&obj, stash_msg, quiet);
 }
 
-static void add_pathspecs(struct argv_array *args,
+static void add_pathspecs(struct strvec *args,
 			  const struct pathspec *ps) {
 	int i;
 
 	for (i = 0; i < ps->nr; i++)
-		argv_array_push(args, ps->items[i].original);
+		strvec_push(args, ps->items[i].original);
 }
 
 /*
@@ -857,33 +990,22 @@ static int get_untracked_files(const struct pathspec *ps, int include_untracked,
 			       struct strbuf *untracked_files)
 {
 	int i;
-	int max_len;
 	int found = 0;
-	char *seen;
-	struct dir_struct dir;
+	struct dir_struct dir = DIR_INIT;
 
-	memset(&dir, 0, sizeof(dir));
 	if (include_untracked != INCLUDE_ALL_FILES)
 		setup_standard_excludes(&dir);
 
-	seen = xcalloc(ps->nr, 1);
-
-	max_len = fill_directory(&dir, the_repository->index, ps);
+	fill_directory(&dir, the_repository->index, ps);
 	for (i = 0; i < dir.nr; i++) {
 		struct dir_entry *ent = dir.entries[i];
-		if (dir_path_match(&the_index, ent, ps, max_len, seen)) {
-			found++;
-			strbuf_addstr(untracked_files, ent->name);
-			/* NUL-terminate: will be fed to update-index -z */
-			strbuf_addch(untracked_files, '\0');
-		}
-		free(ent);
+		found++;
+		strbuf_addstr(untracked_files, ent->name);
+		/* NUL-terminate: will be fed to update-index -z */
+		strbuf_addch(untracked_files, '\0');
 	}
 
-	free(seen);
-	free(dir.entries);
-	free(dir.ignored);
-	clear_directory(&dir);
+	dir_clear(&dir);
 	return found;
 }
 
@@ -963,9 +1085,9 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
 	struct index_state istate = { NULL };
 
 	cp_upd_index.git_cmd = 1;
-	argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
-			 "--remove", "--stdin", NULL);
-	argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
+	strvec_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
+		     "--remove", "--stdin", NULL);
+	strvec_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
 			 stash_index_path.buf);
 
 	strbuf_addf(&untracked_msg, "untracked files on %s\n", msg->buf);
@@ -999,32 +1121,35 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps,
 {
 	int ret = 0;
 	struct child_process cp_read_tree = CHILD_PROCESS_INIT;
-	struct child_process cp_add_i = CHILD_PROCESS_INIT;
 	struct child_process cp_diff_tree = CHILD_PROCESS_INIT;
 	struct index_state istate = { NULL };
+	char *old_index_env = NULL, *old_repo_index_file;
 
 	remove_path(stash_index_path.buf);
 
 	cp_read_tree.git_cmd = 1;
-	argv_array_pushl(&cp_read_tree.args, "read-tree", "HEAD", NULL);
-	argv_array_pushf(&cp_read_tree.env_array, "GIT_INDEX_FILE=%s",
-			 stash_index_path.buf);
+	strvec_pushl(&cp_read_tree.args, "read-tree", "HEAD", NULL);
+	strvec_pushf(&cp_read_tree.env_array, "GIT_INDEX_FILE=%s",
+		     stash_index_path.buf);
 	if (run_command(&cp_read_tree)) {
 		ret = -1;
 		goto done;
 	}
 
 	/* Find out what the user wants. */
-	cp_add_i.git_cmd = 1;
-	argv_array_pushl(&cp_add_i.args, "add--interactive", "--patch=stash",
-			 "--", NULL);
-	add_pathspecs(&cp_add_i.args, ps);
-	argv_array_pushf(&cp_add_i.env_array, "GIT_INDEX_FILE=%s",
-			 stash_index_path.buf);
-	if (run_command(&cp_add_i)) {
-		ret = -1;
-		goto done;
-	}
+	old_repo_index_file = the_repository->index_file;
+	the_repository->index_file = stash_index_path.buf;
+	old_index_env = xstrdup_or_null(getenv(INDEX_ENVIRONMENT));
+	setenv(INDEX_ENVIRONMENT, the_repository->index_file, 1);
+
+	ret = run_add_interactive(NULL, "--patch=stash", ps);
+
+	the_repository->index_file = old_repo_index_file;
+	if (old_index_env && *old_index_env)
+		setenv(INDEX_ENVIRONMENT, old_index_env, 1);
+	else
+		unsetenv(INDEX_ENVIRONMENT);
+	FREE_AND_NULL(old_index_env);
 
 	/* State of the working tree. */
 	if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,
@@ -1034,8 +1159,8 @@ static int stash_patch(struct stash_info *info, const struct pathspec *ps,
 	}
 
 	cp_diff_tree.git_cmd = 1;
-	argv_array_pushl(&cp_diff_tree.args, "diff-tree", "-p", "HEAD",
-			 oid_to_hex(&info->w_tree), "--", NULL);
+	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;
@@ -1088,10 +1213,11 @@ static int stash_working_tree(struct stash_info *info, const struct pathspec *ps
 	}
 
 	cp_upd_index.git_cmd = 1;
-	argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
-			 "--remove", "--stdin", NULL);
-	argv_array_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
-			 stash_index_path.buf);
+	strvec_pushl(&cp_upd_index.args, "update-index",
+		     "--ignore-skip-worktree-entries",
+		     "-z", "--add", "--remove", "--stdin", NULL);
+	strvec_pushf(&cp_upd_index.env_array, "GIT_INDEX_FILE=%s",
+		     stash_index_path.buf);
 
 	if (pipe_command(&cp_upd_index, diff_output.buf, diff_output.len,
 			 NULL, 0, NULL, 0)) {
@@ -1286,6 +1412,8 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 		int i;
 		char *ps_matched = xcalloc(ps->nr, 1);
 
+		/* TODO: audit for interaction with sparse-index. */
+		ensure_full_index(&the_index);
 		for (i = 0; i < active_nr; i++)
 			ce_path_match(&the_index, active_cache[i], ps,
 				      ps_matched);
@@ -1341,10 +1469,10 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 			struct child_process cp = CHILD_PROCESS_INIT;
 
 			cp.git_cmd = 1;
-			argv_array_pushl(&cp.args, "clean", "--force",
-					 "--quiet", "-d", NULL);
+			strvec_pushl(&cp.args, "clean", "--force",
+				     "--quiet", "-d", NULL);
 			if (include_untracked == INCLUDE_ALL_FILES)
-				argv_array_push(&cp.args, "-x");
+				strvec_push(&cp.args, "-x");
 			if (run_command(&cp)) {
 				ret = -1;
 				goto done;
@@ -1358,12 +1486,12 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 			struct strbuf out = STRBUF_INIT;
 
 			cp_add.git_cmd = 1;
-			argv_array_push(&cp_add.args, "add");
+			strvec_push(&cp_add.args, "add");
 			if (!include_untracked)
-				argv_array_push(&cp_add.args, "-u");
+				strvec_push(&cp_add.args, "-u");
 			if (include_untracked == INCLUDE_ALL_FILES)
-				argv_array_push(&cp_add.args, "--force");
-			argv_array_push(&cp_add.args, "--");
+				strvec_push(&cp_add.args, "--force");
+			strvec_push(&cp_add.args, "--");
 			add_pathspecs(&cp_add.args, ps);
 			if (run_command(&cp_add)) {
 				ret = -1;
@@ -1371,9 +1499,9 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 			}
 
 			cp_diff.git_cmd = 1;
-			argv_array_pushl(&cp_diff.args, "diff-index", "-p",
-					 "--cached", "--binary", "HEAD", "--",
-					 NULL);
+			strvec_pushl(&cp_diff.args, "diff-index", "-p",
+				     "--cached", "--binary", "HEAD", "--",
+				     NULL);
 			add_pathspecs(&cp_diff.args, ps);
 			if (pipe_command(&cp_diff, NULL, 0, &out, 0, NULL, 0)) {
 				ret = -1;
@@ -1381,8 +1509,8 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 			}
 
 			cp_apply.git_cmd = 1;
-			argv_array_pushl(&cp_apply.args, "apply", "--index",
-					 "-R", NULL);
+			strvec_pushl(&cp_apply.args, "apply", "--index",
+				     "-R", NULL);
 			if (pipe_command(&cp_apply, out.buf, out.len, NULL, 0,
 					 NULL, 0)) {
 				ret = -1;
@@ -1391,8 +1519,8 @@ 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;
-			argv_array_pushl(&cp.args, "reset", "--hard", "-q",
-					 "--no-recurse-submodules", NULL);
+			strvec_pushl(&cp.args, "reset", "--hard", "-q",
+				     "--no-recurse-submodules", NULL);
 			if (run_command(&cp)) {
 				ret = -1;
 				goto done;
@@ -1403,10 +1531,10 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 			struct child_process cp = CHILD_PROCESS_INIT;
 
 			cp.git_cmd = 1;
-			argv_array_pushl(&cp.args, "checkout", "--no-overlay",
-					 oid_to_hex(&info.i_tree), "--", NULL);
+			strvec_pushl(&cp.args, "checkout", "--no-overlay",
+				     oid_to_hex(&info.i_tree), "--", NULL);
 			if (!ps->nr)
-				argv_array_push(&cp.args, ":/");
+				strvec_push(&cp.args, ":/");
 			else
 				add_pathspecs(&cp.args, ps);
 			if (run_command(&cp)) {
@@ -1419,7 +1547,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 		struct child_process cp = CHILD_PROCESS_INIT;
 
 		cp.git_cmd = 1;
-		argv_array_pushl(&cp.args, "apply", "-R", NULL);
+		strvec_pushl(&cp.args, "apply", "-R", NULL);
 
 		if (pipe_command(&cp, patch.buf, patch.len, NULL, 0, NULL, 0)) {
 			if (!quiet)
@@ -1433,7 +1561,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
 			struct child_process cp = CHILD_PROCESS_INIT;
 
 			cp.git_cmd = 1;
-			argv_array_pushl(&cp.args, "reset", "-q", "--", NULL);
+			strvec_pushl(&cp.args, "reset", "-q", "--", NULL);
 			add_pathspecs(&cp.args, ps);
 			if (run_command(&cp)) {
 				ret = -1;
@@ -1448,13 +1576,17 @@ done:
 	return ret;
 }
 
-static int push_stash(int argc, const char **argv, const char *prefix)
+static int push_stash(int argc, const char **argv, const char *prefix,
+		      int push_assumed)
 {
+	int force_assume = 0;
 	int keep_index = -1;
 	int patch_mode = 0;
 	int include_untracked = 0;
 	int quiet = 0;
+	int pathspec_file_nul = 0;
 	const char *stash_msg = NULL;
+	const char *pathspec_from_file = NULL;
 	struct pathspec ps;
 	struct option options[] = {
 		OPT_BOOL('k', "keep-index", &keep_index,
@@ -1468,16 +1600,45 @@ static int push_stash(int argc, const char **argv, const char *prefix)
 			    N_("include ignore files"), 2),
 		OPT_STRING('m', "message", &stash_msg, N_("message"),
 			   N_("stash message")),
+		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+		OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
 		OPT_END()
 	};
 
-	if (argc)
+	if (argc) {
+		force_assume = !strcmp(argv[0], "-p");
 		argc = parse_options(argc, argv, prefix, options,
 				     git_stash_push_usage,
-				     0);
+				     PARSE_OPT_KEEP_DASHDASH);
+	}
+
+	if (argc) {
+		if (!strcmp(argv[0], "--")) {
+			argc--;
+			argv++;
+		} else if (push_assumed && !force_assume) {
+			die("subcommand wasn't specified; 'push' can't be assumed due to unexpected token '%s'",
+			    argv[0]);
+		}
+	}
 
 	parse_pathspec(&ps, 0, PATHSPEC_PREFER_FULL | PATHSPEC_PREFIX_ORIGIN,
 		       prefix, argv);
+
+	if (pathspec_from_file) {
+		if (patch_mode)
+			die(_("--pathspec-from-file is incompatible with --patch"));
+
+		if (ps.nr)
+			die(_("--pathspec-from-file is incompatible with pathspec arguments"));
+
+		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"));
+	}
+
 	return do_push_stash(&ps, stash_msg, quiet, keep_index, patch_mode,
 			     include_untracked);
 }
@@ -1522,55 +1683,22 @@ static int save_stash(int argc, const char **argv, const char *prefix)
 	return ret;
 }
 
-static int use_builtin_stash(void)
-{
-	struct child_process cp = CHILD_PROCESS_INIT;
-	struct strbuf out = STRBUF_INIT;
-	int ret, env = git_env_bool("GIT_TEST_STASH_USE_BUILTIN", -1);
-
-	if (env != -1)
-		return env;
-
-	argv_array_pushl(&cp.args,
-			 "config", "--bool", "stash.usebuiltin", NULL);
-	cp.git_cmd = 1;
-	if (capture_command(&cp, &out, 6)) {
-		strbuf_release(&out);
-		return 1;
-	}
-
-	strbuf_trim(&out);
-	ret = !strcmp("true", out.buf);
-	strbuf_release(&out);
-	return ret;
-}
-
 int cmd_stash(int argc, const char **argv, const char *prefix)
 {
-	int i = -1;
 	pid_t pid = getpid();
 	const char *index_file;
-	struct argv_array args = ARGV_ARRAY_INIT;
+	struct strvec args = STRVEC_INIT;
 
 	struct option options[] = {
 		OPT_END()
 	};
 
-	if (!use_builtin_stash()) {
-		const char *path = mkpath("%s/git-legacy-stash",
-					  git_exec_path());
+	git_config(git_stash_config, NULL);
 
-		if (sane_execvp(path, (char **)argv) < 0)
-			die_errno(_("could not exec %s"), path);
-		else
-			BUG("sane_execvp() returned???");
-	}
-
-	prefix = setup_git_directory();
-	trace_repo_setup(prefix);
-	setup_work_tree();
-
-	git_config(git_diff_basic_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);
@@ -1580,7 +1708,7 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
 		    (uintmax_t)pid);
 
 	if (!argc)
-		return !!push_stash(0, NULL, prefix);
+		return !!push_stash(0, NULL, prefix, 0);
 	else if (!strcmp(argv[0], "apply"))
 		return !!apply_stash(argc, argv, prefix);
 	else if (!strcmp(argv[0], "clear"))
@@ -1600,45 +1728,15 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
 	else if (!strcmp(argv[0], "create"))
 		return !!create_stash(argc, argv, prefix);
 	else if (!strcmp(argv[0], "push"))
-		return !!push_stash(argc, argv, prefix);
+		return !!push_stash(argc, argv, prefix, 0);
 	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);
 
-	if (strcmp(argv[0], "-p")) {
-		while (++i < argc && strcmp(argv[i], "--")) {
-			/*
-			 * `akpqu` is a string which contains all short options,
-			 * except `-m` which is verified separately.
-			 */
-			if ((strlen(argv[i]) == 2) && *argv[i] == '-' &&
-			    strchr("akpqu", argv[i][1]))
-				continue;
-
-			if (!strcmp(argv[i], "--all") ||
-			    !strcmp(argv[i], "--keep-index") ||
-			    !strcmp(argv[i], "--no-keep-index") ||
-			    !strcmp(argv[i], "--patch") ||
-			    !strcmp(argv[i], "--quiet") ||
-			    !strcmp(argv[i], "--include-untracked"))
-				continue;
-
-			/*
-			 * `-m` and `--message=` are verified separately because
-			 * they need to be immediately followed by a string
-			 * (i.e.`-m"foobar"` or `--message="foobar"`).
-			 */
-			if (starts_with(argv[i], "-m") ||
-			    starts_with(argv[i], "--message="))
-				continue;
-
-			usage_with_options(git_stash_usage, options);
-		}
-	}
-
-	argv_array_push(&args, "push");
-	argv_array_pushv(&args, argv);
-	return !!push_stash(args.argc, args.argv, prefix);
+	/* Assume 'stash push' */
+	strvec_push(&args, "push");
+	strvec_pushv(&args, argv);
+	return !!push_stash(args.nr, args.v, prefix, 1);
 }
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 2c2395a620..ef2776a9e4 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -19,6 +19,7 @@
 #include "diffcore.h"
 #include "diff.h"
 #include "object-store.h"
+#include "advice.h"
 
 #define OPT_QUIET (1 << 0)
 #define OPT_CACHED (1 << 1)
@@ -186,11 +187,13 @@ 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);
@@ -292,9 +295,9 @@ static char *compute_rev_name(const char *sub_path, const char* object_id)
 		cp.git_cmd = 1;
 		cp.no_stderr = 1;
 
-		argv_array_push(&cp.args, "describe");
-		argv_array_pushv(&cp.args, *d);
-		argv_array_push(&cp.args, object_id);
+		strvec_push(&cp.args, "describe");
+		strvec_pushv(&cp.args, *d);
+		strvec_push(&cp.args, object_id);
 
 		if (!capture_command(&cp, &sb, 0)) {
 			strbuf_strip_suffix(&sb, "\n");
@@ -424,7 +427,8 @@ static int module_list(int argc, const char **argv, const char *prefix)
 		const struct cache_entry *ce = list.entries[i];
 
 		if (ce_stage(ce))
-			printf("%06o %s U\t", ce->ce_mode, oid_to_hex(&null_oid));
+			printf("%06o %s U\t", ce->ce_mode,
+			       oid_to_hex(null_oid()));
 		else
 			printf("%06o %s %d\t", ce->ce_mode,
 			       oid_to_hex(&ce->oid), ce_stage(ce));
@@ -442,19 +446,19 @@ static void for_each_listed_submodule(const struct module_list *list,
 		fn(list->entries[i], cb_data);
 }
 
-struct cb_foreach {
+struct foreach_cb {
 	int argc;
 	const char **argv;
 	const char *prefix;
 	int quiet;
 	int recursive;
 };
-#define CB_FOREACH_INIT { 0 }
+#define FOREACH_CB_INIT { 0 }
 
 static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
 				       void *cb_data)
 {
-	struct cb_foreach *info = cb_data;
+	struct foreach_cb *info = cb_data;
 	const char *path = list_item->name;
 	const struct object_id *ce_oid = &list_item->oid;
 
@@ -464,7 +468,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
 
 	displaypath = get_submodule_displaypath(path, info->prefix);
 
-	sub = submodule_from_path(the_repository, &null_oid, path);
+	sub = submodule_from_path(the_repository, null_oid(), path);
 
 	if (!sub)
 		die(_("No url found for submodule path '%s' in .gitmodules"),
@@ -493,12 +497,12 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
 		char *toplevel = xgetcwd();
 		struct strbuf sb = STRBUF_INIT;
 
-		argv_array_pushf(&cp.env_array, "name=%s", sub->name);
-		argv_array_pushf(&cp.env_array, "sm_path=%s", path);
-		argv_array_pushf(&cp.env_array, "displaypath=%s", displaypath);
-		argv_array_pushf(&cp.env_array, "sha1=%s",
-				oid_to_hex(ce_oid));
-		argv_array_pushf(&cp.env_array, "toplevel=%s", toplevel);
+		strvec_pushf(&cp.env_array, "name=%s", sub->name);
+		strvec_pushf(&cp.env_array, "sm_path=%s", path);
+		strvec_pushf(&cp.env_array, "displaypath=%s", displaypath);
+		strvec_pushf(&cp.env_array, "sha1=%s",
+			     oid_to_hex(ce_oid));
+		strvec_pushf(&cp.env_array, "toplevel=%s", toplevel);
 
 		/*
 		 * Since the path variable was accessible from the script
@@ -507,15 +511,15 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
 		 * on windows. And since environment variables are
 		 * case-insensitive in windows, it interferes with the
 		 * existing PATH variable. Hence, to avoid that, we expose
-		 * path via the args argv_array and not via env_array.
+		 * path via the args strvec and not via env_array.
 		 */
 		sq_quote_buf(&sb, path);
-		argv_array_pushf(&cp.args, "path=%s; %s",
-				 sb.buf, info->argv[0]);
+		strvec_pushf(&cp.args, "path=%s; %s",
+			     sb.buf, info->argv[0]);
 		strbuf_release(&sb);
 		free(toplevel);
 	} else {
-		argv_array_pushv(&cp.args, info->argv);
+		strvec_pushv(&cp.args, info->argv);
 	}
 
 	if (!info->quiet)
@@ -532,16 +536,16 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
 		cpr.dir = path;
 		prepare_submodule_repo_env(&cpr.env_array);
 
-		argv_array_pushl(&cpr.args, "--super-prefix", NULL);
-		argv_array_pushf(&cpr.args, "%s/", displaypath);
-		argv_array_pushl(&cpr.args, "submodule--helper", "foreach", "--recursive",
-				NULL);
+		strvec_pushl(&cpr.args, "--super-prefix", NULL);
+		strvec_pushf(&cpr.args, "%s/", displaypath);
+		strvec_pushl(&cpr.args, "submodule--helper", "foreach", "--recursive",
+			     NULL);
 
 		if (info->quiet)
-			argv_array_push(&cpr.args, "--quiet");
+			strvec_push(&cpr.args, "--quiet");
 
-		argv_array_push(&cpr.args, "--");
-		argv_array_pushv(&cpr.args, info->argv);
+		strvec_push(&cpr.args, "--");
+		strvec_pushv(&cpr.args, info->argv);
 
 		if (run_command(&cpr))
 			die(_("run_command returned non-zero status while "
@@ -555,14 +559,14 @@ cleanup:
 
 static int module_foreach(int argc, const char **argv, const char *prefix)
 {
-	struct cb_foreach info = CB_FOREACH_INIT;
+	struct foreach_cb info = FOREACH_CB_INIT;
 	struct pathspec pathspec;
 	struct module_list list = MODULE_LIST_INIT;
 
 	struct option module_foreach_options[] = {
-		OPT__QUIET(&info.quiet, N_("Suppress output of entering each submodule command")),
+		OPT__QUIET(&info.quiet, N_("suppress output of entering each submodule command")),
 		OPT_BOOL(0, "recursive", &info.recursive,
-			 N_("Recurse into nested submodules")),
+			 N_("recurse into nested submodules")),
 		OPT_END()
 	};
 
@@ -610,7 +614,6 @@ struct init_cb {
 	const char *prefix;
 	unsigned int flags;
 };
-
 #define INIT_CB_INIT { NULL, 0 }
 
 static void init_submodule(const char *path, const char *prefix,
@@ -622,7 +625,7 @@ static void init_submodule(const char *path, const char *prefix,
 
 	displaypath = get_submodule_displaypath(path, prefix);
 
-	sub = submodule_from_path(the_repository, &null_oid, path);
+	sub = submodule_from_path(the_repository, null_oid(), path);
 
 	if (!sub)
 		die(_("No url found for submodule path '%s' in .gitmodules"),
@@ -705,7 +708,7 @@ static int module_init(int argc, const char **argv, const char *prefix)
 	int quiet = 0;
 
 	struct option module_init_options[] = {
-		OPT__QUIET(&quiet, N_("Suppress output for initializing a submodule")),
+		OPT__QUIET(&quiet, N_("suppress output for initializing a submodule")),
 		OPT_END()
 	};
 
@@ -740,7 +743,6 @@ struct status_cb {
 	const char *prefix;
 	unsigned int flags;
 };
-
 #define STATUS_CB_INIT { NULL, 0 }
 
 static void print_status(unsigned int flags, char state, const char *path,
@@ -777,36 +779,47 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
 			     unsigned int flags)
 {
 	char *displaypath;
-	struct argv_array diff_files_args = ARGV_ARRAY_INIT;
+	struct strvec diff_files_args = STRVEC_INIT;
 	struct rev_info rev;
 	int diff_files_result;
+	struct strbuf buf = STRBUF_INIT;
+	const char *git_dir;
 
-	if (!submodule_from_path(the_repository, &null_oid, path))
+	if (!submodule_from_path(the_repository, null_oid(), path))
 		die(_("no submodule mapping found in .gitmodules for path '%s'"),
 		      path);
 
 	displaypath = get_submodule_displaypath(path, prefix);
 
 	if ((CE_STAGEMASK & ce_flags) >> CE_STAGESHIFT) {
-		print_status(flags, 'U', path, &null_oid, displaypath);
+		print_status(flags, 'U', path, null_oid(), displaypath);
 		goto cleanup;
 	}
 
-	if (!is_submodule_active(the_repository, path)) {
+	strbuf_addf(&buf, "%s/.git", path);
+	git_dir = read_gitfile(buf.buf);
+	if (!git_dir)
+		git_dir = buf.buf;
+
+	if (!is_submodule_active(the_repository, path) ||
+	    !is_git_directory(git_dir)) {
 		print_status(flags, '-', path, ce_oid, displaypath);
+		strbuf_release(&buf);
 		goto cleanup;
 	}
+	strbuf_release(&buf);
 
-	argv_array_pushl(&diff_files_args, "diff-files",
-			 "--ignore-submodules=dirty", "--quiet", "--",
-			 path, NULL);
+	strvec_pushl(&diff_files_args, "diff-files",
+		     "--ignore-submodules=dirty", "--quiet", "--",
+		     path, NULL);
 
 	git_config(git_diff_basic_config, NULL);
-	repo_init_revisions(the_repository, &rev, prefix);
+
+	repo_init_revisions(the_repository, &rev, NULL);
 	rev.abbrev = 0;
-	diff_files_args.argc = setup_revisions(diff_files_args.argc,
-					       diff_files_args.argv,
-					       &rev, NULL);
+	diff_files_args.nr = setup_revisions(diff_files_args.nr,
+					     diff_files_args.v,
+					     &rev, NULL);
 	diff_files_result = run_diff_files(&rev, 0);
 
 	if (!diff_result_code(&rev.diffopt, diff_files_result)) {
@@ -836,23 +849,23 @@ static void status_submodule(const char *path, const struct object_id *ce_oid,
 		cpr.dir = path;
 		prepare_submodule_repo_env(&cpr.env_array);
 
-		argv_array_push(&cpr.args, "--super-prefix");
-		argv_array_pushf(&cpr.args, "%s/", displaypath);
-		argv_array_pushl(&cpr.args, "submodule--helper", "status",
-				 "--recursive", NULL);
+		strvec_push(&cpr.args, "--super-prefix");
+		strvec_pushf(&cpr.args, "%s/", displaypath);
+		strvec_pushl(&cpr.args, "submodule--helper", "status",
+			     "--recursive", NULL);
 
 		if (flags & OPT_CACHED)
-			argv_array_push(&cpr.args, "--cached");
+			strvec_push(&cpr.args, "--cached");
 
 		if (flags & OPT_QUIET)
-			argv_array_push(&cpr.args, "--quiet");
+			strvec_push(&cpr.args, "--quiet");
 
 		if (run_command(&cpr))
 			die(_("failed to recurse into submodule '%s'"), path);
 	}
 
 cleanup:
-	argv_array_clear(&diff_files_args);
+	strvec_clear(&diff_files_args);
 	free(displaypath);
 }
 
@@ -872,8 +885,8 @@ static int module_status(int argc, const char **argv, const char *prefix)
 	int quiet = 0;
 
 	struct option module_status_options[] = {
-		OPT__QUIET(&quiet, N_("Suppress submodule status output")),
-		OPT_BIT(0, "cached", &info.flags, N_("Use commit stored in the index instead of the one stored in the submodule HEAD"), OPT_CACHED),
+		OPT__QUIET(&quiet, N_("suppress submodule status output")),
+		OPT_BIT(0, "cached", &info.flags, N_("use commit stored in the index instead of the one stored in the submodule HEAD"), OPT_CACHED),
 		OPT_BIT(0, "recursive", &info.flags, N_("recurse into nested submodules"), OPT_RECURSIVE),
 		OPT_END()
 	};
@@ -905,7 +918,7 @@ static int module_name(int argc, const char **argv, const char *prefix)
 	if (argc != 2)
 		usage(_("git submodule--helper name <path>"));
 
-	sub = submodule_from_path(the_repository, &null_oid, argv[1]);
+	sub = submodule_from_path(the_repository, null_oid(), argv[1]);
 
 	if (!sub)
 		die(_("no submodule mapping found in .gitmodules for path '%s'"),
@@ -916,11 +929,437 @@ static int module_name(int argc, const char **argv, const char *prefix)
 	return 0;
 }
 
+struct module_cb {
+	unsigned int mod_src;
+	unsigned int mod_dst;
+	struct object_id oid_src;
+	struct object_id oid_dst;
+	char status;
+	const char *sm_path;
+};
+#define MODULE_CB_INIT { 0, 0, NULL, NULL, '\0', NULL }
+
+struct module_cb_list {
+	struct module_cb **entries;
+	int alloc, nr;
+};
+#define MODULE_CB_LIST_INIT { NULL, 0, 0 }
+
+struct summary_cb {
+	int argc;
+	const char **argv;
+	const char *prefix;
+	unsigned int cached: 1;
+	unsigned int for_status: 1;
+	unsigned int files: 1;
+	int summary_limit;
+};
+#define SUMMARY_CB_INIT { 0, NULL, NULL, 0, 0, 0, 0 }
+
+enum diff_cmd {
+	DIFF_INDEX,
+	DIFF_FILES
+};
+
+static char *verify_submodule_committish(const char *sm_path,
+					 const char *committish)
+{
+	struct child_process cp_rev_parse = CHILD_PROCESS_INIT;
+	struct strbuf result = STRBUF_INIT;
+
+	cp_rev_parse.git_cmd = 1;
+	cp_rev_parse.dir = sm_path;
+	prepare_submodule_repo_env(&cp_rev_parse.env_array);
+	strvec_pushl(&cp_rev_parse.args, "rev-parse", "-q", "--short", NULL);
+	strvec_pushf(&cp_rev_parse.args, "%s^0", committish);
+	strvec_push(&cp_rev_parse.args, "--");
+
+	if (capture_command(&cp_rev_parse, &result, 0))
+		return NULL;
+
+	strbuf_trim_trailing_newline(&result);
+	return strbuf_detach(&result, NULL);
+}
+
+static void print_submodule_summary(struct summary_cb *info, char *errmsg,
+				    int total_commits, const char *displaypath,
+				    const char *src_abbrev, const char *dst_abbrev,
+				    struct module_cb *p)
+{
+	if (p->status == 'T') {
+		if (S_ISGITLINK(p->mod_dst))
+			printf(_("* %s %s(blob)->%s(submodule)"),
+				 displaypath, src_abbrev, dst_abbrev);
+		else
+			printf(_("* %s %s(submodule)->%s(blob)"),
+				 displaypath, src_abbrev, dst_abbrev);
+	} else {
+		printf("* %s %s...%s",
+			displaypath, src_abbrev, dst_abbrev);
+	}
+
+	if (total_commits < 0)
+		printf(":\n");
+	else
+		printf(" (%d):\n", total_commits);
+
+	if (errmsg) {
+		printf(_("%s"), errmsg);
+	} else if (total_commits > 0) {
+		struct child_process cp_log = CHILD_PROCESS_INIT;
+
+		cp_log.git_cmd = 1;
+		cp_log.dir = p->sm_path;
+		prepare_submodule_repo_env(&cp_log.env_array);
+		strvec_pushl(&cp_log.args, "log", NULL);
+
+		if (S_ISGITLINK(p->mod_src) && S_ISGITLINK(p->mod_dst)) {
+			if (info->summary_limit > 0)
+				strvec_pushf(&cp_log.args, "-%d",
+					     info->summary_limit);
+
+			strvec_pushl(&cp_log.args, "--pretty=  %m %s",
+				     "--first-parent", NULL);
+			strvec_pushf(&cp_log.args, "%s...%s",
+				     src_abbrev, dst_abbrev);
+		} else if (S_ISGITLINK(p->mod_dst)) {
+			strvec_pushl(&cp_log.args, "--pretty=  > %s",
+				     "-1", dst_abbrev, NULL);
+		} else {
+			strvec_pushl(&cp_log.args, "--pretty=  < %s",
+				     "-1", src_abbrev, NULL);
+		}
+		run_command(&cp_log);
+	}
+	printf("\n");
+}
+
+static void generate_submodule_summary(struct summary_cb *info,
+				       struct module_cb *p)
+{
+	char *displaypath, *src_abbrev = NULL, *dst_abbrev;
+	int missing_src = 0, missing_dst = 0;
+	char *errmsg = NULL;
+	int total_commits = -1;
+
+	if (!info->cached && oideq(&p->oid_dst, null_oid())) {
+		if (S_ISGITLINK(p->mod_dst)) {
+			struct ref_store *refs = get_submodule_ref_store(p->sm_path);
+			if (refs)
+				refs_head_ref(refs, handle_submodule_head_ref, &p->oid_dst);
+		} else if (S_ISLNK(p->mod_dst) || S_ISREG(p->mod_dst)) {
+			struct stat st;
+			int fd = open(p->sm_path, O_RDONLY);
+
+			if (fd < 0 || fstat(fd, &st) < 0 ||
+			    index_fd(&the_index, &p->oid_dst, fd, &st, OBJ_BLOB,
+				     p->sm_path, 0))
+				error(_("couldn't hash object from '%s'"), p->sm_path);
+		} else {
+			/* for a submodule removal (mode:0000000), don't warn */
+			if (p->mod_dst)
+				warning(_("unexpected mode %o\n"), p->mod_dst);
+		}
+	}
+
+	if (S_ISGITLINK(p->mod_src)) {
+		if (p->status != 'D')
+			src_abbrev = verify_submodule_committish(p->sm_path,
+								 oid_to_hex(&p->oid_src));
+		if (!src_abbrev) {
+			missing_src = 1;
+			/*
+			 * As `rev-parse` failed, we fallback to getting
+			 * the abbreviated hash using oid_src. We do
+			 * this as we might still need the abbreviated
+			 * hash in cases like a submodule type change, etc.
+			 */
+			src_abbrev = xstrndup(oid_to_hex(&p->oid_src), 7);
+		}
+	} else {
+		/*
+		 * The source does not point to a submodule.
+		 * So, we fallback to getting the abbreviation using
+		 * oid_src as we might still need the abbreviated
+		 * hash in cases like submodule add, etc.
+		 */
+		src_abbrev = xstrndup(oid_to_hex(&p->oid_src), 7);
+	}
+
+	if (S_ISGITLINK(p->mod_dst)) {
+		dst_abbrev = verify_submodule_committish(p->sm_path,
+							 oid_to_hex(&p->oid_dst));
+		if (!dst_abbrev) {
+			missing_dst = 1;
+			/*
+			 * As `rev-parse` failed, we fallback to getting
+			 * the abbreviated hash using oid_dst. We do
+			 * this as we might still need the abbreviated
+			 * hash in cases like a submodule type change, etc.
+			 */
+			dst_abbrev = xstrndup(oid_to_hex(&p->oid_dst), 7);
+		}
+	} else {
+		/*
+		 * The destination does not point to a submodule.
+		 * So, we fallback to getting the abbreviation using
+		 * oid_dst as we might still need the abbreviated
+		 * hash in cases like a submodule removal, etc.
+		 */
+		dst_abbrev = xstrndup(oid_to_hex(&p->oid_dst), 7);
+	}
+
+	displaypath = get_submodule_displaypath(p->sm_path, info->prefix);
+
+	if (!missing_src && !missing_dst) {
+		struct child_process cp_rev_list = CHILD_PROCESS_INIT;
+		struct strbuf sb_rev_list = STRBUF_INIT;
+
+		strvec_pushl(&cp_rev_list.args, "rev-list",
+			     "--first-parent", "--count", NULL);
+		if (S_ISGITLINK(p->mod_src) && S_ISGITLINK(p->mod_dst))
+			strvec_pushf(&cp_rev_list.args, "%s...%s",
+				     src_abbrev, dst_abbrev);
+		else
+			strvec_push(&cp_rev_list.args, S_ISGITLINK(p->mod_src) ?
+				    src_abbrev : dst_abbrev);
+		strvec_push(&cp_rev_list.args, "--");
+
+		cp_rev_list.git_cmd = 1;
+		cp_rev_list.dir = p->sm_path;
+		prepare_submodule_repo_env(&cp_rev_list.env_array);
+
+		if (!capture_command(&cp_rev_list, &sb_rev_list, 0))
+			total_commits = atoi(sb_rev_list.buf);
+
+		strbuf_release(&sb_rev_list);
+	} else {
+		/*
+		 * Don't give error msg for modification whose dst is not
+		 * submodule, i.e., deleted or changed to blob
+		 */
+		if (S_ISGITLINK(p->mod_dst)) {
+			struct strbuf errmsg_str = STRBUF_INIT;
+			if (missing_src && missing_dst) {
+				strbuf_addf(&errmsg_str, "  Warn: %s doesn't contain commits %s and %s\n",
+					    displaypath, oid_to_hex(&p->oid_src),
+					    oid_to_hex(&p->oid_dst));
+			} else {
+				strbuf_addf(&errmsg_str, "  Warn: %s doesn't contain commit %s\n",
+					    displaypath, missing_src ?
+					    oid_to_hex(&p->oid_src) :
+					    oid_to_hex(&p->oid_dst));
+			}
+			errmsg = strbuf_detach(&errmsg_str, NULL);
+		}
+	}
+
+	print_submodule_summary(info, errmsg, total_commits,
+				displaypath, src_abbrev,
+				dst_abbrev, p);
+
+	free(displaypath);
+	free(src_abbrev);
+	free(dst_abbrev);
+}
+
+static void prepare_submodule_summary(struct summary_cb *info,
+				      struct module_cb_list *list)
+{
+	int i;
+	for (i = 0; i < list->nr; i++) {
+		const struct submodule *sub;
+		struct module_cb *p = list->entries[i];
+		struct strbuf sm_gitdir = STRBUF_INIT;
+
+		if (p->status == 'D' || p->status == 'T') {
+			generate_submodule_summary(info, p);
+			continue;
+		}
+
+		if (info->for_status && p->status != 'A' &&
+		    (sub = submodule_from_path(the_repository,
+					       null_oid(), p->sm_path))) {
+			char *config_key = NULL;
+			const char *value;
+			int ignore_all = 0;
+
+			config_key = xstrfmt("submodule.%s.ignore",
+					     sub->name);
+			if (!git_config_get_string_tmp(config_key, &value))
+				ignore_all = !strcmp(value, "all");
+			else if (sub->ignore)
+				ignore_all = !strcmp(sub->ignore, "all");
+
+			free(config_key);
+			if (ignore_all)
+				continue;
+		}
+
+		/* Also show added or modified modules which are checked out */
+		strbuf_addstr(&sm_gitdir, p->sm_path);
+		if (is_nonbare_repository_dir(&sm_gitdir))
+			generate_submodule_summary(info, p);
+		strbuf_release(&sm_gitdir);
+	}
+}
+
+static void submodule_summary_callback(struct diff_queue_struct *q,
+				       struct diff_options *options,
+				       void *data)
+{
+	int i;
+	struct module_cb_list *list = data;
+	for (i = 0; i < q->nr; i++) {
+		struct diff_filepair *p = q->queue[i];
+		struct module_cb *temp;
+
+		if (!S_ISGITLINK(p->one->mode) && !S_ISGITLINK(p->two->mode))
+			continue;
+		temp = (struct module_cb*)malloc(sizeof(struct module_cb));
+		temp->mod_src = p->one->mode;
+		temp->mod_dst = p->two->mode;
+		temp->oid_src = p->one->oid;
+		temp->oid_dst = p->two->oid;
+		temp->status = p->status;
+		temp->sm_path = xstrdup(p->one->path);
+
+		ALLOC_GROW(list->entries, list->nr + 1, list->alloc);
+		list->entries[list->nr++] = temp;
+	}
+}
+
+static const char *get_diff_cmd(enum diff_cmd diff_cmd)
+{
+	switch (diff_cmd) {
+	case DIFF_INDEX: return "diff-index";
+	case DIFF_FILES: return "diff-files";
+	default: BUG("bad diff_cmd value %d", diff_cmd);
+	}
+}
+
+static int compute_summary_module_list(struct object_id *head_oid,
+				       struct summary_cb *info,
+				       enum diff_cmd diff_cmd)
+{
+	struct strvec diff_args = STRVEC_INIT;
+	struct rev_info rev;
+	struct module_cb_list list = MODULE_CB_LIST_INIT;
+
+	strvec_push(&diff_args, get_diff_cmd(diff_cmd));
+	if (info->cached)
+		strvec_push(&diff_args, "--cached");
+	strvec_pushl(&diff_args, "--ignore-submodules=dirty", "--raw", NULL);
+	if (head_oid)
+		strvec_push(&diff_args, oid_to_hex(head_oid));
+	strvec_push(&diff_args, "--");
+	if (info->argc)
+		strvec_pushv(&diff_args, info->argv);
+
+	git_config(git_diff_basic_config, NULL);
+	init_revisions(&rev, info->prefix);
+	rev.abbrev = 0;
+	precompose_argv_prefix(diff_args.nr, diff_args.v, NULL);
+	setup_revisions(diff_args.nr, diff_args.v, &rev, NULL);
+	rev.diffopt.output_format = DIFF_FORMAT_NO_OUTPUT | DIFF_FORMAT_CALLBACK;
+	rev.diffopt.format_callback = submodule_summary_callback;
+	rev.diffopt.format_callback_data = &list;
+
+	if (!info->cached) {
+		if (diff_cmd == DIFF_INDEX)
+			setup_work_tree();
+		if (read_cache_preload(&rev.diffopt.pathspec) < 0) {
+			perror("read_cache_preload");
+			return -1;
+		}
+	} else if (read_cache() < 0) {
+		perror("read_cache");
+		return -1;
+	}
+
+	if (diff_cmd == DIFF_INDEX)
+		run_diff_index(&rev, info->cached);
+	else
+		run_diff_files(&rev, 0);
+	prepare_submodule_summary(info, &list);
+	strvec_clear(&diff_args);
+	return 0;
+}
+
+static int module_summary(int argc, const char **argv, const char *prefix)
+{
+	struct summary_cb info = SUMMARY_CB_INIT;
+	int cached = 0;
+	int for_status = 0;
+	int files = 0;
+	int summary_limit = -1;
+	enum diff_cmd diff_cmd = DIFF_INDEX;
+	struct object_id head_oid;
+	int ret;
+
+	struct option module_summary_options[] = {
+		OPT_BOOL(0, "cached", &cached,
+			 N_("use the commit stored in the index instead of the submodule HEAD")),
+		OPT_BOOL(0, "files", &files,
+			 N_("compare the commit in the index with that in the submodule HEAD")),
+		OPT_BOOL(0, "for-status", &for_status,
+			 N_("skip submodules with 'ignore_config' value set to 'all'")),
+		OPT_INTEGER('n', "summary-limit", &summary_limit,
+			     N_("limit the summary size")),
+		OPT_END()
+	};
+
+	const char *const git_submodule_helper_usage[] = {
+		N_("git submodule--helper summary [<options>] [<commit>] [--] [<path>]"),
+		NULL
+	};
+
+	argc = parse_options(argc, argv, prefix, module_summary_options,
+			     git_submodule_helper_usage, 0);
+
+	if (!summary_limit)
+		return 0;
+
+	if (!get_oid(argc ? argv[0] : "HEAD", &head_oid)) {
+		if (argc) {
+			argv++;
+			argc--;
+		}
+	} else if (!argc || !strcmp(argv[0], "HEAD")) {
+		/* before the first commit: compare with an empty tree */
+		oidcpy(&head_oid, the_hash_algo->empty_tree);
+		if (argc) {
+			argv++;
+			argc--;
+		}
+	} else {
+		if (get_oid("HEAD", &head_oid))
+			die(_("could not fetch a revision for HEAD"));
+	}
+
+	if (files) {
+		if (cached)
+			die(_("--cached and --files are mutually exclusive"));
+		diff_cmd = DIFF_FILES;
+	}
+
+	info.argc = argc;
+	info.argv = argv;
+	info.prefix = prefix;
+	info.cached = !!cached;
+	info.files = !!files;
+	info.for_status = !!for_status;
+	info.summary_limit = summary_limit;
+
+	ret = compute_summary_module_list((diff_cmd == DIFF_INDEX) ? &head_oid : NULL,
+					  &info, diff_cmd);
+	return ret;
+}
+
 struct sync_cb {
 	const char *prefix;
 	unsigned int flags;
 };
-
 #define SYNC_CB_INIT { NULL, 0 }
 
 static void sync_submodule(const char *path, const char *prefix,
@@ -936,7 +1375,7 @@ static void sync_submodule(const char *path, const char *prefix,
 	if (!is_submodule_active(the_repository, path))
 		return;
 
-	sub = submodule_from_path(the_repository, &null_oid, path);
+	sub = submodule_from_path(the_repository, null_oid(), path);
 
 	if (sub && sub->url) {
 		if (starts_with_dot_dot_slash(sub->url) ||
@@ -982,8 +1421,8 @@ static void sync_submodule(const char *path, const char *prefix,
 	prepare_submodule_repo_env(&cp.env_array);
 	cp.git_cmd = 1;
 	cp.dir = path;
-	argv_array_pushl(&cp.args, "submodule--helper",
-			 "print-default-remote", NULL);
+	strvec_pushl(&cp.args, "submodule--helper",
+		     "print-default-remote", NULL);
 
 	strbuf_reset(&sb);
 	if (capture_command(&cp, &sb, 0))
@@ -1008,13 +1447,13 @@ static void sync_submodule(const char *path, const char *prefix,
 		cpr.dir = path;
 		prepare_submodule_repo_env(&cpr.env_array);
 
-		argv_array_push(&cpr.args, "--super-prefix");
-		argv_array_pushf(&cpr.args, "%s/", displaypath);
-		argv_array_pushl(&cpr.args, "submodule--helper", "sync",
-				 "--recursive", NULL);
+		strvec_push(&cpr.args, "--super-prefix");
+		strvec_pushf(&cpr.args, "%s/", displaypath);
+		strvec_pushl(&cpr.args, "submodule--helper", "sync",
+			     "--recursive", NULL);
 
 		if (flags & OPT_QUIET)
-			argv_array_push(&cpr.args, "--quiet");
+			strvec_push(&cpr.args, "--quiet");
 
 		if (run_command(&cpr))
 			die(_("failed to recurse into submodule '%s'"),
@@ -1045,9 +1484,9 @@ static int module_sync(int argc, const char **argv, const char *prefix)
 	int recursive = 0;
 
 	struct option module_sync_options[] = {
-		OPT__QUIET(&quiet, N_("Suppress output of synchronizing submodule url")),
+		OPT__QUIET(&quiet, N_("suppress output of synchronizing submodule url")),
 		OPT_BOOL(0, "recursive", &recursive,
-			N_("Recurse into nested submodules")),
+			N_("recurse into nested submodules")),
 		OPT_END()
 	};
 
@@ -1088,7 +1527,7 @@ static void deinit_submodule(const char *path, const char *prefix,
 	struct strbuf sb_config = STRBUF_INIT;
 	char *sub_git_dir = xstrfmt("%s/.git", path);
 
-	sub = submodule_from_path(the_repository, &null_oid, path);
+	sub = submodule_from_path(the_repository, null_oid(), path);
 
 	if (!sub || !sub->name)
 		goto cleanup;
@@ -1114,8 +1553,8 @@ static void deinit_submodule(const char *path, const char *prefix,
 		if (!(flags & OPT_FORCE)) {
 			struct child_process cp_rm = CHILD_PROCESS_INIT;
 			cp_rm.git_cmd = 1;
-			argv_array_pushl(&cp_rm.args, "rm", "-qn",
-					 path, NULL);
+			strvec_pushl(&cp_rm.args, "rm", "-qn",
+				     path, NULL);
 
 			if (run_command(&cp_rm))
 				die(_("Submodule work tree '%s' contains local "
@@ -1143,8 +1582,8 @@ static void deinit_submodule(const char *path, const char *prefix,
 		      displaypath);
 
 	cp_config.git_cmd = 1;
-	argv_array_pushl(&cp_config.args, "config", "--get-regexp", NULL);
-	argv_array_pushf(&cp_config.args, "submodule.%s\\.", sub->name);
+	strvec_pushl(&cp_config.args, "config", "--get-regexp", NULL);
+	strvec_pushf(&cp_config.args, "submodule.%s\\.", sub->name);
 
 	/* remove the .git/config entries (unless the user already did it) */
 	if (!capture_command(&cp_config, &sb_config, 0) && sb_config.len) {
@@ -1183,9 +1622,9 @@ static int module_deinit(int argc, const char **argv, const char *prefix)
 	int all = 0;
 
 	struct option module_deinit_options[] = {
-		OPT__QUIET(&quiet, N_("Suppress submodule status output")),
-		OPT__FORCE(&force, N_("Remove submodule working trees even if they contain local changes"), 0),
-		OPT_BOOL(0, "all", &all, N_("Unregister all submodules")),
+		OPT__QUIET(&quiet, N_("suppress submodule status output")),
+		OPT__FORCE(&force, N_("remove submodule working trees even if they contain local changes"), 0),
+		OPT_BOOL(0, "all", &all, N_("unregister all submodules")),
 		OPT_END()
 	};
 
@@ -1220,41 +1659,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)
-{
-	struct child_process cp = CHILD_PROCESS_INIT;
-
-	argv_array_push(&cp.args, "clone");
-	argv_array_push(&cp.args, "--no-checkout");
-	if (quiet)
-		argv_array_push(&cp.args, "--quiet");
-	if (progress)
-		argv_array_push(&cp.args, "--progress");
-	if (depth && *depth)
-		argv_array_pushl(&cp.args, "--depth", depth, NULL);
-	if (reference->nr) {
-		struct string_list_item *item;
-		for_each_string_list_item(item, reference)
-			argv_array_pushl(&cp.args, "--reference",
-					 item->string, NULL);
-	}
-	if (dissociate)
-		argv_array_push(&cp.args, "--dissociate");
-	if (gitdir && *gitdir)
-		argv_array_pushl(&cp.args, "--separate-git-dir", gitdir, NULL);
-
-	argv_array_push(&cp.args, "--");
-	argv_array_push(&cp.args, url);
-	argv_array_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;
@@ -1268,6 +1686,13 @@ struct submodule_alternate_setup {
 #define SUBMODULE_ALTERNATE_SETUP_INIT { NULL, \
 	SUBMODULE_ALTERNATE_ERROR_IGNORE, NULL }
 
+static const char alternate_error_advice[] = N_(
+"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'."
+);
+
 static int add_possible_reference_from_superproject(
 		struct object_directory *odb, void *sas_cb)
 {
@@ -1299,6 +1724,8 @@ static int add_possible_reference_from_superproject(
 		} else {
 			switch (sas->error_mode) {
 			case SUBMODULE_ALTERNATE_ERROR_DIE:
+				if (advice_submodule_alternate_error_strategy_die)
+					advise(_(alternate_error_advice));
 				die(_("submodule '%s' cannot add alternate: %s"),
 				    sas->submodule_name, err.buf);
 			case SUBMODULE_ALTERNATE_ERROR_INFO:
@@ -1351,47 +1778,144 @@ 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;
+	char *p, *sm_gitdir;
 	char *sm_alternate = NULL, *error_strategy = NULL;
+	struct strbuf sb = STRBUF_INIT;
+	struct child_process cp = CHILD_PROCESS_INIT;
+
+	strbuf_addf(&sb, "%s/modules/%s", get_git_dir(), 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"),
 		OPT_BOOL(0, "progress", &progress,
 			   N_("force cloning progress")),
+		OPT_BOOL(0, "require-init", &require_init,
+			   N_("disallow cloning into non-empty directory")),
+		OPT_BOOL(0, "single-branch", &clone_data.single_branch,
+			 N_("clone only one branch, HEAD or --branch")),
 		OPT_END()
 	};
 
 	const char *const git_submodule_helper_usage[] = {
 		N_("git submodule--helper clone [--prefix=<path>] [--quiet] "
 		   "[--reference <repository>] [--name <name>] [--depth <depth>] "
+		   "[--single-branch] "
 		   "--url <url> --path <path>"),
 		NULL
 	};
@@ -1399,61 +1923,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 (!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))
-			die(_("clone of '%s' into submodule path '%s' failed"),
-			    url, path);
-	} else {
-		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;
 }
 
@@ -1463,7 +1942,7 @@ static void determine_submodule_update_strategy(struct repository *r,
 						const char *update,
 						struct submodule_update_strategy *out)
 {
-	const struct submodule *sub = submodule_from_path(r, &null_oid, path);
+	const struct submodule *sub = submodule_from_path(r, null_oid(), path);
 	char *key;
 	const char *val;
 
@@ -1473,11 +1952,13 @@ static void determine_submodule_update_strategy(struct repository *r,
 		if (parse_submodule_update_strategy(update, out) < 0)
 			die(_("Invalid update mode '%s' for submodule path '%s'"),
 				update, path);
-	} else if (!repo_config_get_string_const(r, key, &val)) {
+	} else if (!repo_config_get_string_tmp(r, key, &val)) {
 		if (parse_submodule_update_strategy(val, out) < 0)
 			die(_("Invalid update mode '%s' configured for submodule path '%s'"),
 				val, path);
 	} else if (sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
+		if (sub->update_strategy.type == SM_UPDATE_COMMAND)
+			BUG("how did we read update = !command from .gitmodules?");
 		out->type = sub->update_strategy.type;
 		out->command = sub->update_strategy.command;
 	} else
@@ -1536,9 +2017,11 @@ struct submodule_update_clone {
 	int recommend_shallow;
 	struct string_list references;
 	int dissociate;
+	unsigned require_init;
 	const char *depth;
 	const char *recursive_prefix;
 	const char *prefix;
+	int single_branch;
 
 	/* to be consumed by git-submodule.sh */
 	struct update_clone_data *update_clone;
@@ -1553,10 +2036,14 @@ struct submodule_update_clone {
 
 	int max_jobs;
 };
-#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
-	SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, \
-	NULL, NULL, NULL, \
-	NULL, 0, 0, 0, NULL, 0, 0, 1}
+#define SUBMODULE_UPDATE_CLONE_INIT { \
+	.list = MODULE_LIST_INIT, \
+	.update = SUBMODULE_UPDATE_STRATEGY_INIT, \
+	.recommend_shallow = -1, \
+	.references = STRING_LIST_INIT_DUP, \
+	.single_branch = -1, \
+	.max_jobs = 1, \
+}
 
 
 static void next_submodule_warn_missing(struct submodule_update_clone *suc,
@@ -1607,7 +2094,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 		goto cleanup;
 	}
 
-	sub = submodule_from_path(the_repository, &null_oid, ce->name);
+	sub = submodule_from_path(the_repository, null_oid(), ce->name);
 
 	if (suc->recursive_prefix)
 		displaypath = relative_path(suc->recursive_prefix,
@@ -1621,7 +2108,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 	}
 
 	key = xstrfmt("submodule.%s.update", sub->name);
-	if (!repo_config_get_string_const(the_repository, key, &update_string)) {
+	if (!repo_config_get_string_tmp(the_repository, key, &update_string)) {
 		update_type = parse_submodule_update_type(update_string);
 	} else {
 		update_type = sub->update_strategy.type;
@@ -1644,7 +2131,7 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 
 	strbuf_reset(&sb);
 	strbuf_addf(&sb, "submodule.%s.url", sub->name);
-	if (repo_config_get_string_const(the_repository, sb.buf, &url)) {
+	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);
@@ -1671,32 +2158,38 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
 	child->no_stdin = 1;
 	child->stdout_to_stderr = 1;
 	child->err = -1;
-	argv_array_push(&child->args, "submodule--helper");
-	argv_array_push(&child->args, "clone");
+	strvec_push(&child->args, "submodule--helper");
+	strvec_push(&child->args, "clone");
 	if (suc->progress)
-		argv_array_push(&child->args, "--progress");
+		strvec_push(&child->args, "--progress");
 	if (suc->quiet)
-		argv_array_push(&child->args, "--quiet");
+		strvec_push(&child->args, "--quiet");
 	if (suc->prefix)
-		argv_array_pushl(&child->args, "--prefix", suc->prefix, NULL);
+		strvec_pushl(&child->args, "--prefix", suc->prefix, NULL);
 	if (suc->recommend_shallow && sub->recommend_shallow == 1)
-		argv_array_push(&child->args, "--depth=1");
-	argv_array_pushl(&child->args, "--path", sub->path, NULL);
-	argv_array_pushl(&child->args, "--name", sub->name, NULL);
-	argv_array_pushl(&child->args, "--url", url, NULL);
+		strvec_push(&child->args, "--depth=1");
+	if (suc->require_init)
+		strvec_push(&child->args, "--require-init");
+	strvec_pushl(&child->args, "--path", sub->path, NULL);
+	strvec_pushl(&child->args, "--name", sub->name, NULL);
+	strvec_pushl(&child->args, "--url", url, NULL);
 	if (suc->references.nr) {
 		struct string_list_item *item;
 		for_each_string_list_item(item, &suc->references)
-			argv_array_pushl(&child->args, "--reference", item->string, NULL);
+			strvec_pushl(&child->args, "--reference", item->string, NULL);
 	}
 	if (suc->dissociate)
-		argv_array_push(&child->args, "--dissociate");
+		strvec_push(&child->args, "--dissociate");
 	if (suc->depth)
-		argv_array_push(&child->args, suc->depth);
+		strvec_push(&child->args, suc->depth);
+	if (suc->single_branch >= 0)
+		strvec_push(&child->args, suc->single_branch ?
+					      "--single-branch" :
+					      "--no-single-branch");
 
 cleanup:
-	strbuf_reset(&displaypath_sb);
-	strbuf_reset(&sb);
+	strbuf_release(&displaypath_sb);
+	strbuf_release(&sb);
 	if (need_free_url)
 		free((void*)url);
 
@@ -1861,7 +2354,7 @@ static int update_clone(int argc, const char **argv, const char *prefix)
 		OPT_BOOL(0, "dissociate", &suc.dissociate,
 			   N_("use --reference only while cloning")),
 		OPT_STRING(0, "depth", &suc.depth, "<depth>",
-			   N_("Create a shallow clone truncated to the "
+			   N_("create a shallow clone truncated to the "
 			      "specified number of revisions")),
 		OPT_INTEGER('j', "jobs", &suc.max_jobs,
 			    N_("parallel jobs")),
@@ -1870,6 +2363,10 @@ static int update_clone(int argc, const char **argv, const char *prefix)
 		OPT__QUIET(&suc.quiet, N_("don't print cloning progress")),
 		OPT_BOOL(0, "progress", &suc.progress,
 			    N_("force cloning progress")),
+		OPT_BOOL(0, "require-init", &suc.require_init,
+			   N_("disallow cloning into non-empty directory")),
+		OPT_BOOL(0, "single-branch", &suc.single_branch,
+			 N_("clone only one branch, HEAD or --branch")),
 		OPT_END()
 	};
 
@@ -1915,17 +2412,17 @@ static const char *remote_submodule_branch(const char *path)
 	const char *branch = NULL;
 	char *key;
 
-	sub = submodule_from_path(the_repository, &null_oid, path);
+	sub = submodule_from_path(the_repository, null_oid(), path);
 	if (!sub)
 		return NULL;
 
 	key = xstrfmt("submodule.%s.branch", sub->name);
-	if (repo_config_get_string_const(the_repository, key, &branch))
+	if (repo_config_get_string_tmp(the_repository, key, &branch))
 		branch = sub->branch;
 	free(key);
 
 	if (!branch)
-		return "master";
+		return "HEAD";
 
 	if (!strcmp(branch, ".")) {
 		const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
@@ -2045,7 +2542,7 @@ static int ensure_core_worktree(int argc, const char **argv, const char *prefix)
 {
 	const struct submodule *sub;
 	const char *path;
-	char *cw;
+	const char *cw;
 	struct repository subrepo;
 
 	if (argc != 2)
@@ -2053,14 +2550,14 @@ 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);
+	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))
 		die(_("could not get a repository handle for submodule '%s'"), path);
 
-	if (!repo_config_get_string(&subrepo, "core.worktree", &cw)) {
+	if (!repo_config_get_string_tmp(&subrepo, "core.worktree", &cw)) {
 		char *cfg_file, *abs_path;
 		const char *rel_path;
 		struct strbuf sb = STRBUF_INIT;
@@ -2190,6 +2687,255 @@ static int module_config(int argc, const char **argv, const char *prefix)
 	usage_with_options(git_submodule_helper_usage, module_config_options);
 }
 
+static int module_set_url(int argc, const char **argv, const char *prefix)
+{
+	int quiet = 0;
+	const char *newurl;
+	const char *path;
+	char *config_name;
+
+	struct option options[] = {
+		OPT__QUIET(&quiet, N_("suppress output for setting url of a submodule")),
+		OPT_END()
+	};
+	const char *const usage[] = {
+		N_("git submodule--helper set-url [--quiet] <path> <newurl>"),
+		NULL
+	};
+
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
+
+	if (argc != 2 || !(path = argv[0]) || !(newurl = argv[1]))
+		usage_with_options(usage, options);
+
+	config_name = xstrfmt("submodule.%s.url", path);
+
+	config_set_in_gitmodules_file_gently(config_name, newurl);
+	sync_submodule(path, prefix, quiet ? OPT_QUIET : 0);
+
+	free(config_name);
+
+	return 0;
+}
+
+static int module_set_branch(int argc, const char **argv, const char *prefix)
+{
+	int opt_default = 0, ret;
+	const char *opt_branch = NULL;
+	const char *path;
+	char *config_name;
+
+	/*
+	 * We accept the `quiet` option for uniformity across subcommands,
+	 * though there is nothing to make less verbose in this subcommand.
+	 */
+	struct option options[] = {
+		OPT_NOOP_NOARG('q', "quiet"),
+		OPT_BOOL('d', "default", &opt_default,
+			N_("set the default tracking branch to master")),
+		OPT_STRING('b', "branch", &opt_branch, N_("branch"),
+			N_("set the default tracking branch")),
+		OPT_END()
+	};
+	const char *const usage[] = {
+		N_("git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"),
+		N_("git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"),
+		NULL
+	};
+
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
+
+	if (!opt_branch && !opt_default)
+		die(_("--branch or --default required"));
+
+	if (opt_branch && opt_default)
+		die(_("--branch and --default are mutually exclusive"));
+
+	if (argc != 1 || !(path = argv[0]))
+		usage_with_options(usage, options);
+
+	config_name = xstrfmt("submodule.%s.branch", path);
+	ret = config_set_in_gitmodules_file_gently(config_name, opt_branch);
+
+	free(config_name);
+	return !!ret;
+}
+
+struct add_data {
+	const char *prefix;
+	const char *branch;
+	const char *reference_path;
+	const 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 show_fetch_remotes(FILE *output, 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)"))
+				fprintf(output, "  %.*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) {
+				fprintf(stderr, _("A git directory for '%s' is found "
+						  "locally with remote(s):"),
+					add_data->sm_name);
+				show_fetch_remotes(stderr, submod_gitdir_path);
+				free(submod_gitdir_path);
+				die(_("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"),
+				    add_data->realrepo);
+			} 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;
+		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 add_clone(int argc, const char **argv, const char *prefix)
+{
+	int force = 0, quiet = 0, dissociate = 0, progress = 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 checkout on cloning")),
+		OPT_STRING(0, "prefix", &prefix,
+			   N_("path"),
+			   N_("alternative anchor for relative paths")),
+		OPT_STRING(0, "path", &add_data.sm_path,
+			   N_("path"),
+			   N_("where the new submodule will be cloned to")),
+		OPT_STRING(0, "name", &add_data.sm_name,
+			   N_("string"),
+			   N_("name of the new submodule")),
+		OPT_STRING(0, "url", &add_data.realrepo,
+			   N_("string"),
+			   N_("url where to clone the submodule from")),
+		OPT_STRING(0, "reference", &add_data.reference_path,
+			   N_("repo"),
+			   N_("reference repository")),
+		OPT_BOOL(0, "dissociate", &dissociate,
+			 N_("use --reference only while cloning")),
+		OPT_INTEGER(0, "depth", &add_data.depth,
+			    N_("depth for shallow clones")),
+		OPT_BOOL(0, "progress", &progress,
+			 N_("force cloning progress")),
+		OPT__FORCE(&force, N_("allow adding an otherwise ignored submodule path"),
+			   PARSE_OPT_NOCOMPLETE),
+		OPT__QUIET(&quiet, "suppress output for cloning a submodule"),
+		OPT_END()
+	};
+
+	const char *const usage[] = {
+		N_("git submodule--helper add-clone [<options>...] "
+		   "--url <url> --path <path> --name <name>"),
+		NULL
+	};
+
+	argc = parse_options(argc, argv, prefix, options, usage, 0);
+
+	if (argc != 0)
+		usage_with_options(usage, options);
+
+	add_data.prefix = prefix;
+	add_data.progress = !!progress;
+	add_data.dissociate = !!dissociate;
+	add_data.force = !!force;
+	add_data.quiet = !!quiet;
+
+	if (add_submodule(&add_data))
+		return 1;
+
+	return 0;
+}
+
 #define SUPPORT_SUPER_PREFIX (1<<0)
 
 struct cmd_struct {
@@ -2202,6 +2948,7 @@ static struct cmd_struct commands[] = {
 	{"list", module_list, 0},
 	{"name", module_name, 0},
 	{"clone", module_clone, 0},
+	{"add-clone", add_clone, 0},
 	{"update-module-mode", module_update_module_mode, 0},
 	{"update-clone", update_clone, 0},
 	{"ensure-core-worktree", ensure_core_worktree, 0},
@@ -2214,12 +2961,15 @@ static struct cmd_struct commands[] = {
 	{"print-default-remote", print_default_remote, 0},
 	{"sync", module_sync, SUPPORT_SUPER_PREFIX},
 	{"deinit", module_deinit, 0},
+	{"summary", module_summary, SUPPORT_SUPER_PREFIX},
 	{"remote-branch", resolve_remote_submodule_branch, 0},
 	{"push-check", push_check, 0},
 	{"absorb-git-dirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX},
 	{"is-active", is_active, 0},
 	{"check-name", check_name, 0},
 	{"config", module_config, 0},
+	{"set-url", module_set_url, 0},
+	{"set-branch", module_set_branch, 0},
 };
 
 int cmd_submodule__helper(int argc, const char **argv, const char *prefix)
diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index 80237f0df1..e547a08d6c 100644
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -24,9 +24,11 @@ static int check_symref(const char *HEAD, int quiet, int shorten, int print)
 			return 1;
 	}
 	if (print) {
+		char *to_free = NULL;
 		if (shorten)
-			refname = shorten_unambiguous_ref(refname, 0);
+			refname = to_free = shorten_unambiguous_ref(refname, 0);
 		puts(refname);
+		free(to_free);
 	}
 	return 0;
 }
diff --git a/builtin/tag.c b/builtin/tag.c
index e0a4c25382..065b6bf093 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -17,7 +17,7 @@
 #include "diff.h"
 #include "revision.h"
 #include "gpg-interface.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "column.h"
 #include "ref-filter.h"
 
@@ -26,7 +26,7 @@ static const char * const git_tag_usage[] = {
 		"\t\t<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>] [--[no-]merged [<commit>]] [<pattern>...]"),
+		"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"),
 	N_("git tag -v [--format=<format>] <tagname>..."),
 	NULL
 };
@@ -39,6 +39,8 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting,
 		     struct ref_format *format)
 {
 	struct ref_array array;
+	struct strbuf output = STRBUF_INIT;
+	struct strbuf err = STRBUF_INIT;
 	char *to_free = NULL;
 	int i;
 
@@ -63,8 +65,17 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting,
 	filter_refs(&array, filter, FILTER_REFS_TAGS);
 	ref_array_sort(sorting, &array);
 
-	for (i = 0; i < array.nr; i++)
-		show_ref_array_item(array.items[i], format);
+	for (i = 0; i < array.nr; i++) {
+		strbuf_reset(&output);
+		strbuf_reset(&err);
+		if (format_ref_array_item(array.items[i], format, &output, &err))
+			die("%s", err.buf);
+		fwrite(output.buf, 1, output.len, stdout);
+		putchar('\n');
+	}
+
+	strbuf_release(&err);
+	strbuf_release(&output);
 	ref_array_clear(&array);
 	free(to_free);
 
@@ -72,10 +83,10 @@ static int list_tags(struct ref_filter *filter, struct ref_sorting *sorting,
 }
 
 typedef int (*each_tag_name_fn)(const char *name, const char *ref,
-				const struct object_id *oid, const void *cb_data);
+				const struct object_id *oid, void *cb_data);
 
 static int for_each_tag_name(const char **argv, each_tag_name_fn fn,
-			     const void *cb_data)
+			     void *cb_data)
 {
 	const char **p;
 	struct strbuf ref = STRBUF_INIT;
@@ -97,21 +108,45 @@ static int for_each_tag_name(const char **argv, each_tag_name_fn fn,
 	return had_error;
 }
 
-static int delete_tag(const char *name, const char *ref,
-		      const struct object_id *oid, const void *cb_data)
+static int collect_tags(const char *name, const char *ref,
+			const struct object_id *oid, void *cb_data)
 {
-	if (delete_ref(NULL, ref, oid, 0))
-		return 1;
-	printf(_("Deleted tag '%s' (was %s)\n"), name,
-	       find_unique_abbrev(oid, DEFAULT_ABBREV));
+	struct string_list *ref_list = cb_data;
+
+	string_list_append(ref_list, ref);
+	ref_list->items[ref_list->nr - 1].util = oiddup(oid);
 	return 0;
 }
 
+static int delete_tags(const char **argv)
+{
+	int result;
+	struct string_list refs_to_delete = STRING_LIST_INIT_DUP;
+	struct string_list_item *item;
+
+	result = for_each_tag_name(argv, collect_tags, (void *)&refs_to_delete);
+	if (delete_refs(NULL, &refs_to_delete, REF_NO_DEREF))
+		result = 1;
+
+	for_each_string_list_item(item, &refs_to_delete) {
+		const char *name = item->string;
+		struct object_id *oid = item->util;
+		if (!ref_exists(name))
+			printf(_("Deleted tag '%s' (was %s)\n"),
+				item->string + 10,
+				find_unique_abbrev(oid, DEFAULT_ABBREV));
+
+		free(oid);
+	}
+	string_list_clear(&refs_to_delete, 0);
+	return result;
+}
+
 static int verify_tag(const char *name, const char *ref,
-		      const struct object_id *oid, const void *cb_data)
+		      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)
@@ -174,11 +209,17 @@ static void write_tag_body(int fd, const struct object_id *oid)
 {
 	unsigned long size;
 	enum object_type type;
-	char *buf, *sp;
+	char *buf, *sp, *orig;
+	struct strbuf payload = STRBUF_INIT;
+	struct strbuf signature = STRBUF_INIT;
 
-	buf = read_object_file(oid, &type, &size);
+	orig = buf = read_object_file(oid, &type, &size);
 	if (!buf)
 		return;
+	if (parse_signature(buf, size, &payload, &signature)) {
+		buf = payload.buf;
+		size = payload.len;
+	}
 	/* skip header */
 	sp = strstr(buf, "\n\n");
 
@@ -187,9 +228,11 @@ static void write_tag_body(int fd, const struct object_id *oid)
 		return;
 	}
 	sp += 2; /* skip the 2 LFs */
-	write_or_die(fd, sp, parse_signature(sp, buf + size - sp));
+	write_or_die(fd, sp, buf + size - sp);
 
-	free(buf);
+	free(orig);
+	strbuf_release(&payload);
+	strbuf_release(&signature);
 }
 
 static int build_tag_object(struct strbuf *buf, int sign, struct object_id *result)
@@ -231,8 +274,9 @@ static void create_tag(const struct object_id *object, const char *object_ref,
 	if (type <= OBJ_NONE)
 		die(_("bad object type."));
 
-	if (type == OBJ_TAG && advice_nested_tag)
-		advise(_(message_advice_nested_tag), tag, object_ref);
+	if (type == OBJ_TAG)
+		advise_if_enabled(ADVICE_NESTED_TAG, _(message_advice_nested_tag),
+				  tag, object_ref);
 
 	strbuf_addf(&header,
 		    "object %s\n"
@@ -249,9 +293,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);
@@ -409,8 +451,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		OPT_GROUP(N_("Tag creation options")),
 		OPT_BOOL('a', "annotate", &annotate,
 					N_("annotated tag, needs a message")),
-		{ OPTION_CALLBACK, 'm', "message", &msg, N_("message"),
-		  N_("tag message"), PARSE_OPT_NONEG, parse_msg_arg },
+		OPT_CALLBACK_F('m', "message", &msg, N_("message"),
+			       N_("tag message"), PARSE_OPT_NONEG, parse_msg_arg),
 		OPT_FILENAME('F', "file", &msgfile, N_("read message from file")),
 		OPT_BOOL('e', "edit", &edit_flag, N_("force edit of tag message")),
 		OPT_BOOL('s', "sign", &opt.sign, N_("annotated and GPG-signed tag")),
@@ -456,8 +498,8 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		if (argc == 0)
 			cmdmode = 'l';
 		else if (filter.with_commit || filter.no_commit ||
-			 filter.points_at.nr || filter.merge_commit ||
-			 filter.lines != -1)
+			 filter.reachable_from || filter.unreachable_from ||
+			 filter.points_at.nr || filter.lines != -1)
 			cmdmode = 'l';
 	}
 
@@ -484,7 +526,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 	}
 	if (!sorting)
 		sorting = ref_default_sorting();
-	sorting->ignore_case = icase;
+	ref_sorting_set_sort_flags_all(sorting, REF_SORTING_ICASE, icase);
 	filter.ignore_case = icase;
 	if (cmdmode == 'l') {
 		int ret;
@@ -508,10 +550,10 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 		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.merge_commit)
+	if (filter.reachable_from || filter.unreachable_from)
 		die(_("--merged and --no-merged options are only allowed in list mode"));
 	if (cmdmode == 'd')
-		return for_each_tag_name(argv, delete_tag, NULL);
+		return delete_tags(argv);
 	if (cmdmode == 'v') {
 		if (format.format && verify_ref_format(&format))
 			usage_with_options(git_tag_usage, options);
@@ -539,7 +581,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
 
 	object_ref = argc == 2 ? argv[1] : "HEAD";
 	if (argc > 2)
-		die(_("too many params"));
+		die(_("too many arguments"));
 
 	if (get_oid(object_ref, &object))
 		die(_("Failed to resolve '%s' as a valid ref."), object_ref);
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index a87a4bfd2c..4a9466295b 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -24,6 +24,7 @@ static off_t consumed_bytes;
 static off_t max_input_size;
 static git_hash_ctx ctx;
 static struct fsck_options fsck_options = FSCK_OPTIONS_STRICT;
+static struct progress *progress;
 
 /*
  * When running under --strict mode, objects whose reachability are
@@ -45,7 +46,7 @@ static struct obj_buffer *lookup_object_buffer(struct object *base)
 static void add_object_buffer(struct object *object, char *buffer, unsigned long size)
 {
 	struct obj_buffer *obj;
-	obj = xcalloc(1, sizeof(struct obj_buffer));
+	CALLOC_ARRAY(obj, 1);
 	obj->buffer = buffer;
 	obj->size = size;
 	if (add_decoration(&obj_decorate, object, obj))
@@ -92,6 +93,7 @@ static void use(int bytes)
 	consumed_bytes += bytes;
 	if (max_input_size && consumed_bytes > max_input_size)
 		die(_("pack exceeds maximum allowed size"));
+	display_throughput(progress, consumed_bytes);
 }
 
 static void *get_data(unsigned long size)
@@ -185,7 +187,8 @@ static void write_cached_object(struct object *obj, struct obj_buffer *obj_buf)
  * that have reachability requirements and calls this function.
  * Verify its reachability and validity recursively and write it out.
  */
-static int check_object(struct object *obj, int type, void *data, struct fsck_options *options)
+static int check_object(struct object *obj, enum object_type type,
+			void *data, struct fsck_options *options)
 {
 	struct obj_buffer *obj_buf;
 
@@ -263,7 +266,8 @@ static void write_object(unsigned nr, enum object_type type,
 	} else {
 		struct object *obj;
 		int eaten;
-		hash_object_file(buf, size, type_name(type), &obj_list[nr].oid);
+		hash_object_file(the_hash_algo, buf, size, type_name(type),
+				 &obj_list[nr].oid);
 		added_object(nr, type, buf, size);
 		obj = parse_object_buffer(the_repository, &obj_list[nr].oid,
 					  type, size, buf,
@@ -351,7 +355,7 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
 	struct object_id base_oid;
 
 	if (type == OBJ_REF_DELTA) {
-		hashcpy(base_oid.hash, fill(the_hash_algo->rawsz));
+		oidread(&base_oid, fill(the_hash_algo->rawsz));
 		use(the_hash_algo->rawsz);
 		delta_data = get_data(delta_size);
 		if (dry_run || !delta_data) {
@@ -417,7 +421,8 @@ static void unpack_delta_entry(enum object_type type, unsigned long delta_size,
 			 * has not been resolved yet.
 			 */
 			oidclr(&obj_list[nr].oid);
-			add_delta_to_list(nr, &null_oid, base_offset, delta_data, delta_size);
+			add_delta_to_list(nr, null_oid(), base_offset,
+					  delta_data, delta_size);
 			return;
 		}
 	}
@@ -484,7 +489,6 @@ static void unpack_one(unsigned nr)
 static void unpack_all(void)
 {
 	int i;
-	struct progress *progress = NULL;
 	struct pack_header *hdr = fill(sizeof(struct pack_header));
 
 	nr_objects = ntohl(hdr->hdr_entries);
@@ -498,7 +502,7 @@ static void unpack_all(void)
 
 	if (!quiet)
 		progress = start_progress(_("Unpacking objects"), nr_objects);
-	obj_list = xcalloc(nr_objects, sizeof(*obj_list));
+	CALLOC_ARRAY(obj_list, nr_objects);
 	for (i = 0; i < nr_objects; i++) {
 		unpack_one(i);
 		display_progress(progress, i + 1);
@@ -573,7 +577,7 @@ int cmd_unpack_objects(int argc, const char **argv, const char *prefix)
 	the_hash_algo->init_fn(&ctx);
 	unpack_all();
 	the_hash_algo->update_fn(&ctx, buffer, offset);
-	the_hash_algo->final_fn(oid.hash, &ctx);
+	the_hash_algo->final_oid_fn(&oid, &ctx);
 	if (strict) {
 		write_rest();
 		if (fsck_finish(&fsck_options))
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 49302d98c5..187203e8bb 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -35,6 +35,7 @@ static int verbose;
 static int mark_valid_only;
 static int mark_skip_worktree_only;
 static int mark_fsmonitor_only;
+static int ignore_skip_worktree_entries;
 #define MARK_FLAG 1
 #define UNMARK_FLAG 2
 static struct strbuf mtime_dir = STRBUF_INIT;
@@ -94,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;
 }
 
@@ -381,7 +380,8 @@ static int process_path(const char *path, struct stat *st, int stat_errno)
 		 * so updating it does not make sense.
 		 * On the other hand, removing it from index should work
 		 */
-		if (allow_remove && remove_file_from_cache(path))
+		if (!ignore_skip_worktree_entries && allow_remove &&
+		    remove_file_from_cache(path))
 			return error("%s: cannot remove from the index", path);
 		return 0;
 	}
@@ -743,6 +743,8 @@ 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;
@@ -983,14 +985,14 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 		OPT_BIT(0, "unmerged", &refresh_args.flags,
 			N_("refresh even if index contains unmerged entries"),
 			REFRESH_UNMERGED),
-		{OPTION_CALLBACK, 0, "refresh", &refresh_args, NULL,
+		OPT_CALLBACK_F(0, "refresh", &refresh_args, NULL,
 			N_("refresh stat information"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
-			refresh_callback},
-		{OPTION_CALLBACK, 0, "really-refresh", &refresh_args, NULL,
+			refresh_callback),
+		OPT_CALLBACK_F(0, "really-refresh", &refresh_args, NULL,
 			N_("like --refresh, but ignore assume-unchanged setting"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
-			really_refresh_callback},
+			really_refresh_callback),
 		{OPTION_LOWLEVEL_CALLBACK, 0, "cacheinfo", NULL,
 			N_("<mode>,<object>,<path>"),
 			N_("add the specified entry to the index"),
@@ -998,10 +1000,10 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 			PARSE_OPT_NONEG | PARSE_OPT_LITERAL_ARGHELP,
 			NULL, 0,
 			cacheinfo_callback},
-		{OPTION_CALLBACK, 0, "chmod", &set_executable_bit, "(+|-)x",
+		OPT_CALLBACK_F(0, "chmod", &set_executable_bit, "(+|-)x",
 			N_("override the executable bit of the listed files"),
 			PARSE_OPT_NONEG,
-			chmod_callback},
+			chmod_callback),
 		{OPTION_SET_INT, 0, "assume-unchanged", &mark_valid_only, NULL,
 			N_("mark files as \"not changing\""),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
@@ -1014,6 +1016,8 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 		{OPTION_SET_INT, 0, "no-skip-worktree", &mark_skip_worktree_only, NULL,
 			N_("clear skip-worktree bit"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
+		OPT_BOOL(0, "ignore-skip-worktree-entries", &ignore_skip_worktree_entries,
+			 N_("do not touch index-only entries")),
 		OPT_SET_INT(0, "info-only", &info_only,
 			N_("add to index only; do not add content to object database"), 1),
 		OPT_SET_INT(0, "force-remove", &force_remove,
@@ -1041,10 +1045,10 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
 			REFRESH_IGNORE_MISSING),
 		OPT_SET_INT(0, "verbose", &verbose,
 			N_("report actions to standard output"), 1),
-		{OPTION_CALLBACK, 0, "clear-resolve-undo", NULL, NULL,
+		OPT_CALLBACK_F(0, "clear-resolve-undo", NULL, NULL,
 			N_("(for porcelains) forget saved unresolved conflicts"),
 			PARSE_OPT_NOARG | PARSE_OPT_NONEG,
-			resolve_undo_clear_callback},
+			resolve_undo_clear_callback),
 		OPT_INTEGER(0, "index-version", &preferred_index_format,
 			N_("write index in this format")),
 		OPT_BOOL(0, "split-index", &split_index,
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 2d8f7f0578..6029a80544 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -4,7 +4,7 @@
 #include "builtin.h"
 #include "parse-options.h"
 #include "quote.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 static const char * const git_update_ref_usage[] = {
 	N_("git update-ref [<options>] -d <refname> [<old-val>]"),
@@ -50,7 +50,7 @@ static const char *parse_arg(const char *next, struct strbuf *arg)
  * the argument.  Die if C-quoting is malformed or the reference name
  * is invalid.
  */
-static char *parse_refname(struct strbuf *input, const char **next)
+static char *parse_refname(const char **next)
 {
 	struct strbuf ref = STRBUF_INIT;
 
@@ -95,7 +95,7 @@ static char *parse_refname(struct strbuf *input, const char **next)
  * provided but cannot be converted to a SHA-1, die.  flags can
  * include PARSE_SHA1_OLD and/or PARSE_SHA1_ALLOW_EMPTY.
  */
-static int parse_next_oid(struct strbuf *input, const char **next,
+static int parse_next_oid(const char **next, const char *end,
 			  struct object_id *oid,
 			  const char *command, const char *refname,
 			  int flags)
@@ -103,7 +103,7 @@ static int parse_next_oid(struct strbuf *input, const char **next,
 	struct strbuf arg = STRBUF_INIT;
 	int ret = 0;
 
-	if (*next == input->buf + input->len)
+	if (*next == end)
 		goto eof;
 
 	if (line_termination) {
@@ -128,7 +128,7 @@ static int parse_next_oid(struct strbuf *input, const char **next,
 			die("%s %s: expected NUL but got: %s",
 			    command, refname, *next);
 		(*next)++;
-		if (*next == input->buf + input->len)
+		if (*next == end)
 			goto eof;
 		strbuf_addstr(&arg, *next);
 		*next += arg.len;
@@ -178,23 +178,23 @@ static int parse_next_oid(struct strbuf *input, const char **next,
  * depending on how line_termination is set.
  */
 
-static const char *parse_cmd_update(struct ref_transaction *transaction,
-				    struct strbuf *input, const char *next)
+static void parse_cmd_update(struct ref_transaction *transaction,
+			     const char *next, const char *end)
 {
 	struct strbuf err = STRBUF_INIT;
 	char *refname;
 	struct object_id new_oid, old_oid;
 	int have_old;
 
-	refname = parse_refname(input, &next);
+	refname = parse_refname(&next);
 	if (!refname)
 		die("update: missing <ref>");
 
-	if (parse_next_oid(input, &next, &new_oid, "update", refname,
+	if (parse_next_oid(&next, end, &new_oid, "update", refname,
 			   PARSE_SHA1_ALLOW_EMPTY))
 		die("update %s: missing <newvalue>", refname);
 
-	have_old = !parse_next_oid(input, &next, &old_oid, "update", refname,
+	have_old = !parse_next_oid(&next, end, &old_oid, "update", refname,
 				   PARSE_SHA1_OLD);
 
 	if (*next != line_termination)
@@ -209,22 +209,20 @@ static const char *parse_cmd_update(struct ref_transaction *transaction,
 	update_flags = default_flags;
 	free(refname);
 	strbuf_release(&err);
-
-	return next;
 }
 
-static const char *parse_cmd_create(struct ref_transaction *transaction,
-				    struct strbuf *input, const char *next)
+static void parse_cmd_create(struct ref_transaction *transaction,
+			     const char *next, const char *end)
 {
 	struct strbuf err = STRBUF_INIT;
 	char *refname;
 	struct object_id new_oid;
 
-	refname = parse_refname(input, &next);
+	refname = parse_refname(&next);
 	if (!refname)
 		die("create: missing <ref>");
 
-	if (parse_next_oid(input, &next, &new_oid, "create", refname, 0))
+	if (parse_next_oid(&next, end, &new_oid, "create", refname, 0))
 		die("create %s: missing <newvalue>", refname);
 
 	if (is_null_oid(&new_oid))
@@ -241,23 +239,21 @@ static const char *parse_cmd_create(struct ref_transaction *transaction,
 	update_flags = default_flags;
 	free(refname);
 	strbuf_release(&err);
-
-	return next;
 }
 
-static const char *parse_cmd_delete(struct ref_transaction *transaction,
-				    struct strbuf *input, const char *next)
+static void parse_cmd_delete(struct ref_transaction *transaction,
+			     const char *next, const char *end)
 {
 	struct strbuf err = STRBUF_INIT;
 	char *refname;
 	struct object_id old_oid;
 	int have_old;
 
-	refname = parse_refname(input, &next);
+	refname = parse_refname(&next);
 	if (!refname)
 		die("delete: missing <ref>");
 
-	if (parse_next_oid(input, &next, &old_oid, "delete", refname,
+	if (parse_next_oid(&next, end, &old_oid, "delete", refname,
 			   PARSE_SHA1_OLD)) {
 		have_old = 0;
 	} else {
@@ -277,22 +273,20 @@ static const char *parse_cmd_delete(struct ref_transaction *transaction,
 	update_flags = default_flags;
 	free(refname);
 	strbuf_release(&err);
-
-	return next;
 }
 
-static const char *parse_cmd_verify(struct ref_transaction *transaction,
-				    struct strbuf *input, const char *next)
+static void parse_cmd_verify(struct ref_transaction *transaction,
+			     const char *next, const char *end)
 {
 	struct strbuf err = STRBUF_INIT;
 	char *refname;
 	struct object_id old_oid;
 
-	refname = parse_refname(input, &next);
+	refname = parse_refname(&next);
 	if (!refname)
 		die("verify: missing <ref>");
 
-	if (parse_next_oid(input, &next, &old_oid, "verify", refname,
+	if (parse_next_oid(&next, end, &old_oid, "verify", refname,
 			   PARSE_SHA1_OLD))
 		oidclr(&old_oid);
 
@@ -306,50 +300,192 @@ static const char *parse_cmd_verify(struct ref_transaction *transaction,
 	update_flags = default_flags;
 	free(refname);
 	strbuf_release(&err);
-
-	return next;
 }
 
-static const char *parse_cmd_option(struct strbuf *input, const char *next)
+static void parse_cmd_option(struct ref_transaction *transaction,
+			     const char *next, const char *end)
 {
 	const char *rest;
 	if (skip_prefix(next, "no-deref", &rest) && *rest == line_termination)
 		update_flags |= REF_NO_DEREF;
 	else
 		die("option unknown: %s", next);
-	return rest;
 }
 
-static void update_refs_stdin(struct ref_transaction *transaction)
+static void parse_cmd_start(struct ref_transaction *transaction,
+			    const char *next, const char *end)
+{
+	if (*next != line_termination)
+		die("start: extra input: %s", next);
+	puts("start: ok");
+}
+
+static void parse_cmd_prepare(struct ref_transaction *transaction,
+			      const char *next, const char *end)
+{
+	struct strbuf error = STRBUF_INIT;
+	if (*next != line_termination)
+		die("prepare: extra input: %s", next);
+	if (ref_transaction_prepare(transaction, &error))
+		die("prepare: %s", error.buf);
+	puts("prepare: ok");
+}
+
+static void parse_cmd_abort(struct ref_transaction *transaction,
+			    const char *next, const char *end)
+{
+	struct strbuf error = STRBUF_INIT;
+	if (*next != line_termination)
+		die("abort: extra input: %s", next);
+	if (ref_transaction_abort(transaction, &error))
+		die("abort: %s", error.buf);
+	puts("abort: ok");
+}
+
+static void parse_cmd_commit(struct ref_transaction *transaction,
+			     const char *next, const char *end)
 {
-	struct strbuf input = STRBUF_INIT;
-	const char *next;
+	struct strbuf error = STRBUF_INIT;
+	if (*next != line_termination)
+		die("commit: extra input: %s", next);
+	if (ref_transaction_commit(transaction, &error))
+		die("commit: %s", error.buf);
+	puts("commit: ok");
+	ref_transaction_free(transaction);
+}
+
+enum update_refs_state {
+	/* Non-transactional state open for updates. */
+	UPDATE_REFS_OPEN,
+	/* A transaction has been started. */
+	UPDATE_REFS_STARTED,
+	/* References are locked and ready for commit */
+	UPDATE_REFS_PREPARED,
+	/* Transaction has been committed or closed. */
+	UPDATE_REFS_CLOSED,
+};
+
+static const struct parse_cmd {
+	const char *prefix;
+	void (*fn)(struct ref_transaction *, const char *, const char *);
+	unsigned args;
+	enum update_refs_state state;
+} command[] = {
+	{ "update",  parse_cmd_update,  3, UPDATE_REFS_OPEN },
+	{ "create",  parse_cmd_create,  2, UPDATE_REFS_OPEN },
+	{ "delete",  parse_cmd_delete,  2, UPDATE_REFS_OPEN },
+	{ "verify",  parse_cmd_verify,  2, UPDATE_REFS_OPEN },
+	{ "option",  parse_cmd_option,  1, UPDATE_REFS_OPEN },
+	{ "start",   parse_cmd_start,   0, UPDATE_REFS_STARTED },
+	{ "prepare", parse_cmd_prepare, 0, UPDATE_REFS_PREPARED },
+	{ "abort",   parse_cmd_abort,   0, UPDATE_REFS_CLOSED },
+	{ "commit",  parse_cmd_commit,  0, UPDATE_REFS_CLOSED },
+};
+
+static void update_refs_stdin(void)
+{
+	struct strbuf input = STRBUF_INIT, err = STRBUF_INIT;
+	enum update_refs_state state = UPDATE_REFS_OPEN;
+	struct ref_transaction *transaction;
+	int i, j;
+
+	transaction = ref_transaction_begin(&err);
+	if (!transaction)
+		die("%s", err.buf);
 
-	if (strbuf_read(&input, 0, 1000) < 0)
-		die_errno("could not read from stdin");
-	next = input.buf;
 	/* Read each line dispatch its command */
-	while (next < input.buf + input.len) {
-		if (*next == line_termination)
+	while (!strbuf_getwholeline(&input, stdin, line_termination)) {
+		const struct parse_cmd *cmd = NULL;
+
+		if (*input.buf == line_termination)
 			die("empty command in input");
-		else if (isspace(*next))
-			die("whitespace before command: %s", next);
-		else if (skip_prefix(next, "update ", &next))
-			next = parse_cmd_update(transaction, &input, next);
-		else if (skip_prefix(next, "create ", &next))
-			next = parse_cmd_create(transaction, &input, next);
-		else if (skip_prefix(next, "delete ", &next))
-			next = parse_cmd_delete(transaction, &input, next);
-		else if (skip_prefix(next, "verify ", &next))
-			next = parse_cmd_verify(transaction, &input, next);
-		else if (skip_prefix(next, "option ", &next))
-			next = parse_cmd_option(&input, next);
-		else
-			die("unknown command: %s", next);
-
-		next++;
+		else if (isspace(*input.buf))
+			die("whitespace before command: %s", input.buf);
+
+		for (i = 0; i < ARRAY_SIZE(command); i++) {
+			const char *prefix = command[i].prefix;
+			char c;
+
+			if (!starts_with(input.buf, prefix))
+				continue;
+
+			/*
+			 * If the command has arguments, verify that it's
+			 * followed by a space. Otherwise, it shall be followed
+			 * by a line terminator.
+			 */
+			c = command[i].args ? ' ' : line_termination;
+			if (input.buf[strlen(prefix)] != c)
+				continue;
+
+			cmd = &command[i];
+			break;
+		}
+		if (!cmd)
+			die("unknown command: %s", input.buf);
+
+		/*
+		 * Read additional arguments if NUL-terminated. Do not raise an
+		 * error in case there is an early EOF to let the command
+		 * handle missing arguments with a proper error message.
+		 */
+		for (j = 1; line_termination == '\0' && j < cmd->args; j++)
+			if (strbuf_appendwholeline(&input, stdin, line_termination))
+				break;
+
+		switch (state) {
+		case UPDATE_REFS_OPEN:
+		case UPDATE_REFS_STARTED:
+			if (state == UPDATE_REFS_STARTED && cmd->state == UPDATE_REFS_STARTED)
+				die("cannot restart ongoing transaction");
+			/* Do not downgrade a transaction to a non-transaction. */
+			if (cmd->state >= state)
+				state = cmd->state;
+			break;
+		case UPDATE_REFS_PREPARED:
+			if (cmd->state != UPDATE_REFS_CLOSED)
+				die("prepared transactions can only be closed");
+			state = cmd->state;
+			break;
+		case UPDATE_REFS_CLOSED:
+			if (cmd->state != UPDATE_REFS_STARTED)
+				die("transaction is closed");
+
+			/*
+			 * Open a new transaction if we're currently closed and
+			 * get a "start".
+			 */
+			state = cmd->state;
+			transaction = ref_transaction_begin(&err);
+			if (!transaction)
+				die("%s", err.buf);
+
+			break;
+		}
+
+		cmd->fn(transaction, input.buf + strlen(cmd->prefix) + !!cmd->args,
+			input.buf + input.len);
+	}
+
+	switch (state) {
+	case UPDATE_REFS_OPEN:
+		/* Commit by default if no transaction was requested. */
+		if (ref_transaction_commit(transaction, &err))
+			die("%s", err.buf);
+		ref_transaction_free(transaction);
+		break;
+	case UPDATE_REFS_STARTED:
+	case UPDATE_REFS_PREPARED:
+		/* If using a transaction, we want to abort it. */
+		if (ref_transaction_abort(transaction, &err))
+			die("%s", err.buf);
+		break;
+	case UPDATE_REFS_CLOSED:
+		/* Otherwise no need to do anything, the transaction was closed already. */
+		break;
 	}
 
+	strbuf_release(&err);
 	strbuf_release(&input);
 }
 
@@ -384,21 +520,11 @@ int cmd_update_ref(int argc, const char **argv, const char *prefix)
 	}
 
 	if (read_stdin) {
-		struct strbuf err = STRBUF_INIT;
-		struct ref_transaction *transaction;
-
-		transaction = ref_transaction_begin(&err);
-		if (!transaction)
-			die("%s", err.buf);
 		if (delete || argc > 0)
 			usage_with_options(git_update_ref_usage, options);
 		if (end_null)
 			line_termination = '\0';
-		update_refs_stdin(transaction);
-		if (ref_transaction_commit(transaction, &err))
-			die("%s", err.buf);
-		ref_transaction_free(transaction);
-		strbuf_release(&err);
+		update_refs_stdin();
 		return 0;
 	}
 
diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c
index 018879737a..24654b4c9b 100644
--- a/builtin/upload-archive.c
+++ b/builtin/upload-archive.c
@@ -7,7 +7,7 @@
 #include "pkt-line.h"
 #include "sideband.h"
 #include "run-command.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 static const char upload_archive_usage[] =
 	"git upload-archive <repo>";
@@ -19,7 +19,7 @@ static const char deadchild[] =
 
 int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
 {
-	struct argv_array sent_argv = ARGV_ARRAY_INIT;
+	struct strvec sent_argv = STRVEC_INIT;
 	const char *arg_cmd = "argument ";
 
 	if (argc != 2 || !strcmp(argv[1], "-h"))
@@ -31,21 +31,21 @@ int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
 	init_archivers();
 
 	/* put received options in sent_argv[] */
-	argv_array_push(&sent_argv, "git-upload-archive");
+	strvec_push(&sent_argv, "git-upload-archive");
 	for (;;) {
 		char *buf = packet_read_line(0, NULL);
 		if (!buf)
 			break;	/* got a flush */
-		if (sent_argv.argc > MAX_ARGS)
+		if (sent_argv.nr > MAX_ARGS)
 			die("Too many options (>%d)", MAX_ARGS - 1);
 
 		if (!starts_with(buf, arg_cmd))
 			die("'argument' token or flush expected");
-		argv_array_push(&sent_argv, buf + strlen(arg_cmd));
+		strvec_push(&sent_argv, buf + strlen(arg_cmd));
 	}
 
 	/* parse all options sent by the client */
-	return write_archive(sent_argv.argc, sent_argv.argv, prefix,
+	return write_archive(sent_argv.nr, sent_argv.v, prefix,
 			     the_repository, NULL, 1);
 }
 
diff --git a/builtin/verify-pack.c b/builtin/verify-pack.c
index c2a1a5c504..05c5213594 100644
--- a/builtin/verify-pack.c
+++ b/builtin/verify-pack.c
@@ -7,21 +7,26 @@
 #define VERIFY_PACK_VERBOSE 01
 #define VERIFY_PACK_STAT_ONLY 02
 
-static int verify_one_pack(const char *path, unsigned int flags)
+static int verify_one_pack(const char *path, unsigned int flags, const char *hash_algo)
 {
 	struct child_process index_pack = CHILD_PROCESS_INIT;
-	const char *argv[] = {"index-pack", NULL, NULL, NULL };
+	struct strvec *argv = &index_pack.args;
 	struct strbuf arg = STRBUF_INIT;
 	int verbose = flags & VERIFY_PACK_VERBOSE;
 	int stat_only = flags & VERIFY_PACK_STAT_ONLY;
 	int err;
 
+	strvec_push(argv, "index-pack");
+
 	if (stat_only)
-		argv[1] = "--verify-stat-only";
+		strvec_push(argv, "--verify-stat-only");
 	else if (verbose)
-		argv[1] = "--verify-stat";
+		strvec_push(argv, "--verify-stat");
 	else
-		argv[1] = "--verify";
+		strvec_push(argv, "--verify");
+
+	if (hash_algo)
+		strvec_pushf(argv, "--object-format=%s", hash_algo);
 
 	/*
 	 * In addition to "foo.pack" we accept "foo.idx" and "foo";
@@ -31,9 +36,8 @@ static int verify_one_pack(const char *path, unsigned int flags)
 	if (strbuf_strip_suffix(&arg, ".idx") ||
 	    !ends_with(arg.buf, ".pack"))
 		strbuf_addstr(&arg, ".pack");
-	argv[2] = arg.buf;
+	strvec_push(argv, arg.buf);
 
-	index_pack.argv = argv;
 	index_pack.git_cmd = 1;
 
 	err = run_command(&index_pack);
@@ -60,12 +64,15 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)
 {
 	int err = 0;
 	unsigned int flags = 0;
+	const char *object_format = NULL;
 	int i;
 	const struct option verify_pack_options[] = {
 		OPT_BIT('v', "verbose", &flags, N_("verbose"),
 			VERIFY_PACK_VERBOSE),
 		OPT_BIT('s', "stat-only", &flags, N_("show statistics only"),
 			VERIFY_PACK_STAT_ONLY),
+		OPT_STRING(0, "object-format", &object_format, N_("hash"),
+			   N_("specify the hash algorithm to use")),
 		OPT_END()
 	};
 
@@ -75,7 +82,7 @@ int cmd_verify_pack(int argc, const char **argv, const char *prefix)
 	if (argc < 1)
 		usage_with_options(verify_pack_usage, verify_pack_options);
 	for (i = 0; i < argc; i++) {
-		if (verify_one_pack(argv[i], flags))
+		if (verify_one_pack(argv[i], flags, object_format))
 			err = 1;
 	}
 
diff --git a/builtin/worktree.c b/builtin/worktree.c
index 4de44f579a..0d0a80da61 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -4,7 +4,7 @@
 #include "builtin.h"
 #include "dir.h"
 #include "parse-options.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "branch.h"
 #include "refs.h"
 #include "run-command.h"
@@ -12,6 +12,7 @@
 #include "submodule.h"
 #include "utf8.h"
 #include "worktree.h"
+#include "quote.h"
 
 static const char * const worktree_usage[] = {
 	N_("git worktree add [<options>] <path> [<commit-ish>]"),
@@ -29,7 +30,7 @@ struct add_opts {
 	int detach;
 	int quiet;
 	int checkout;
-	int keep_locked;
+	const char *keep_locked;
 };
 
 static int show_only;
@@ -67,92 +68,73 @@ static void delete_worktrees_dir_if_empty(void)
 	rmdir(git_path("worktrees")); /* ignore failed removal */
 }
 
-static int prune_worktree(const char *id, struct strbuf *reason)
+static void prune_worktree(const char *id, const char *reason)
 {
-	struct stat st;
-	char *path;
-	int fd;
-	size_t len;
-	ssize_t read_result;
+	if (show_only || verbose)
+		printf_ln(_("Removing %s/%s: %s"), "worktrees", id, reason);
+	if (!show_only)
+		delete_git_dir(id);
+}
 
-	if (!is_directory(git_path("worktrees/%s", id))) {
-		strbuf_addf(reason, _("Removing worktrees/%s: not a valid directory"), id);
-		return 1;
-	}
-	if (file_exists(git_path("worktrees/%s/locked", id)))
-		return 0;
-	if (stat(git_path("worktrees/%s/gitdir", id), &st)) {
-		strbuf_addf(reason, _("Removing worktrees/%s: gitdir file does not exist"), id);
-		return 1;
-	}
-	fd = open(git_path("worktrees/%s/gitdir", id), O_RDONLY);
-	if (fd < 0) {
-		strbuf_addf(reason, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
-			    id, strerror(errno));
-		return 1;
-	}
-	len = xsize_t(st.st_size);
-	path = xmallocz(len);
-
-	read_result = read_in_full(fd, path, len);
-	if (read_result < 0) {
-		strbuf_addf(reason, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
-			    id, strerror(errno));
-		close(fd);
-		free(path);
-		return 1;
-	}
-	close(fd);
+static int prune_cmp(const void *a, const void *b)
+{
+	const struct string_list_item *x = a;
+	const struct string_list_item *y = b;
+	int c;
 
-	if (read_result != len) {
-		strbuf_addf(reason,
-			    _("Removing worktrees/%s: short read (expected %"PRIuMAX" bytes, read %"PRIuMAX")"),
-			    id, (uintmax_t)len, (uintmax_t)read_result);
-		free(path);
-		return 1;
-	}
-	while (len && (path[len - 1] == '\n' || path[len - 1] == '\r'))
-		len--;
-	if (!len) {
-		strbuf_addf(reason, _("Removing worktrees/%s: invalid gitdir file"), id);
-		free(path);
+	if ((c = fspathcmp(x->string, y->string)))
+	    return c;
+	/*
+	 * paths same; prune_dupes() removes all but the first worktree entry
+	 * having the same path, so sort main worktree ('util' is NULL) above
+	 * linked worktrees ('util' not NULL) since main worktree can't be
+	 * removed
+	 */
+	if (!x->util)
+		return -1;
+	if (!y->util)
 		return 1;
+	/* paths same; sort by .git/worktrees/<id> */
+	return strcmp(x->util, y->util);
+}
+
+static void prune_dups(struct string_list *l)
+{
+	int i;
+
+	QSORT(l->items, l->nr, prune_cmp);
+	for (i = 1; i < l->nr; i++) {
+		if (!fspathcmp(l->items[i].string, l->items[i - 1].string))
+			prune_worktree(l->items[i].util, "duplicate entry");
 	}
-	path[len] = '\0';
-	if (!file_exists(path)) {
-		free(path);
-		if (stat(git_path("worktrees/%s/index", id), &st) ||
-		    st.st_mtime <= expire) {
-			strbuf_addf(reason, _("Removing worktrees/%s: gitdir file points to non-existent location"), id);
-			return 1;
-		} else {
-			return 0;
-		}
-	}
-	free(path);
-	return 0;
 }
 
 static void prune_worktrees(void)
 {
 	struct strbuf reason = STRBUF_INIT;
+	struct strbuf main_path = STRBUF_INIT;
+	struct string_list kept = STRING_LIST_INIT_NODUP;
 	DIR *dir = opendir(git_path("worktrees"));
 	struct dirent *d;
 	if (!dir)
 		return;
-	while ((d = readdir(dir)) != NULL) {
-		if (is_dot_or_dotdot(d->d_name))
-			continue;
+	while ((d = readdir_skip_dot_and_dotdot(dir)) != NULL) {
+		char *path;
 		strbuf_reset(&reason);
-		if (!prune_worktree(d->d_name, &reason))
-			continue;
-		if (show_only || verbose)
-			printf("%s\n", reason.buf);
-		if (show_only)
-			continue;
-		delete_git_dir(d->d_name);
+		if (should_prune_worktree(d->d_name, &reason, &path, expire))
+			prune_worktree(d->d_name, reason.buf);
+		else if (path)
+			string_list_append(&kept, path)->util = xstrdup(d->d_name);
 	}
 	closedir(dir);
+
+	strbuf_add_absolute_path(&main_path, get_git_common_dir());
+	/* massage main worktree absolute path to match 'gitdir' content */
+	strbuf_strip_suffix(&main_path, "/.");
+	string_list_append(&kept, strbuf_detach(&main_path, NULL));
+	prune_dups(&kept);
+	string_list_clear(&kept, 1);
+
 	if (!show_only)
 		delete_worktrees_dir_if_empty();
 	strbuf_release(&reason);
@@ -224,59 +206,55 @@ static const char *worktree_basename(const char *path, int *olen)
 	return name;
 }
 
-static void validate_worktree_add(const char *path, const struct add_opts *opts)
+/* check that path is viable location for worktree */
+static void check_candidate_path(const char *path,
+				 int force,
+				 struct worktree **worktrees,
+				 const char *cmd)
 {
-	struct worktree **worktrees;
 	struct worktree *wt;
 	int locked;
 
 	if (file_exists(path) && !is_empty_dir(path))
 		die(_("'%s' already exists"), path);
 
-	worktrees = get_worktrees(0);
-	/*
-	 * find_worktree()'s suffix matching may undesirably find the main
-	 * rather than a linked worktree (for instance, when the basenames
-	 * of the main worktree and the one being created are the same).
-	 * We're only interested in linked worktrees, so skip the main
-	 * worktree with +1.
-	 */
-	wt = find_worktree(worktrees + 1, NULL, path);
+	wt = find_worktree_by_path(worktrees, path);
 	if (!wt)
-		goto done;
+		return;
 
 	locked = !!worktree_lock_reason(wt);
-	if ((!locked && opts->force) || (locked && opts->force > 1)) {
+	if ((!locked && force) || (locked && force > 1)) {
 		if (delete_git_dir(wt->id))
-		    die(_("unable to re-add worktree '%s'"), path);
-		goto done;
+		    die(_("unusable worktree destination '%s'"), path);
+		return;
 	}
 
 	if (locked)
-		die(_("'%s' is a missing but locked worktree;\nuse 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path);
+		die(_("'%s' is a missing but locked worktree;\nuse '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"), path, cmd);
 	else
-		die(_("'%s' is a missing but already registered worktree;\nuse 'add -f' to override, or 'prune' or 'remove' to clear"), path);
-
-done:
-	free_worktrees(worktrees);
+		die(_("'%s' is a missing but already registered worktree;\nuse '%s -f' to override, or 'prune' or 'remove' to clear"), path, cmd);
 }
 
 static int add_worktree(const char *path, const char *refname,
 			const struct add_opts *opts)
 {
 	struct strbuf sb_git = STRBUF_INIT, sb_repo = STRBUF_INIT;
-	struct strbuf sb = STRBUF_INIT;
+	struct strbuf sb = STRBUF_INIT, realpath = STRBUF_INIT;
 	const char *name;
 	struct child_process cp = CHILD_PROCESS_INIT;
-	struct argv_array child_env = ARGV_ARRAY_INIT;
+	struct strvec child_env = STRVEC_INIT;
 	unsigned int counter = 0;
 	int len, ret;
 	struct strbuf symref = STRBUF_INIT;
 	struct commit *commit = NULL;
 	int is_branch = 0;
 	struct strbuf sb_name = STRBUF_INIT;
+	struct worktree **worktrees;
 
-	validate_worktree_add(path, opts);
+	worktrees = get_worktrees();
+	check_candidate_path(path, opts->force, worktrees, "add");
+	free_worktrees(worktrees);
+	worktrees = NULL;
 
 	/* is 'refname' a branch or commit? */
 	if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
@@ -324,10 +302,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))
@@ -337,9 +315,11 @@ static int add_worktree(const char *path, const char *refname,
 
 	strbuf_reset(&sb);
 	strbuf_addf(&sb, "%s/gitdir", sb_repo.buf);
-	write_file(sb.buf, "%s", real_path(sb_git.buf));
+	strbuf_realpath(&realpath, sb_git.buf, 1);
+	write_file(sb.buf, "%s", realpath.buf);
+	strbuf_realpath(&realpath, get_git_common_dir(), 1);
 	write_file(sb_git.buf, "gitdir: %s/worktrees/%s",
-		   real_path(get_git_common_dir()), name);
+		   realpath.buf, name);
 	/*
 	 * This is to keep resolve_ref() happy. We need a valid HEAD
 	 * or is_git_directory() will reject the directory. Any value which
@@ -349,37 +329,37 @@ static int add_worktree(const char *path, const char *refname,
 	 */
 	strbuf_reset(&sb);
 	strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
-	write_file(sb.buf, "%s", oid_to_hex(&null_oid));
+	write_file(sb.buf, "%s", oid_to_hex(null_oid()));
 	strbuf_reset(&sb);
 	strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
 	write_file(sb.buf, "../..");
 
-	argv_array_pushf(&child_env, "%s=%s", GIT_DIR_ENVIRONMENT, sb_git.buf);
-	argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
+	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;
 
 	if (!is_branch)
-		argv_array_pushl(&cp.args, "update-ref", "HEAD",
-				 oid_to_hex(&commit->object.oid), NULL);
+		strvec_pushl(&cp.args, "update-ref", "HEAD",
+			     oid_to_hex(&commit->object.oid), NULL);
 	else {
-		argv_array_pushl(&cp.args, "symbolic-ref", "HEAD",
-				 symref.buf, NULL);
+		strvec_pushl(&cp.args, "symbolic-ref", "HEAD",
+			     symref.buf, NULL);
 		if (opts->quiet)
-			argv_array_push(&cp.args, "--quiet");
+			strvec_push(&cp.args, "--quiet");
 	}
 
-	cp.env = child_env.argv;
+	cp.env = child_env.v;
 	ret = run_command(&cp);
 	if (ret)
 		goto done;
 
 	if (opts->checkout) {
 		cp.argv = NULL;
-		argv_array_clear(&cp.args);
-		argv_array_pushl(&cp.args, "reset", "--hard", NULL);
+		strvec_clear(&cp.args);
+		strvec_pushl(&cp.args, "reset", "--hard", "--no-recurse-submodules", NULL);
 		if (opts->quiet)
-			argv_array_push(&cp.args, "--quiet");
-		cp.env = child_env.argv;
+			strvec_push(&cp.args, "--quiet");
+		cp.env = child_env.v;
 		ret = run_command(&cp);
 		if (ret)
 			goto done;
@@ -411,20 +391,21 @@ done:
 			cp.env = env;
 			cp.argv = NULL;
 			cp.trace2_hook_name = "post-checkout";
-			argv_array_pushl(&cp.args, absolute_path(hook),
-					 oid_to_hex(&null_oid),
-					 oid_to_hex(&commit->object.oid),
-					 "1", NULL);
+			strvec_pushl(&cp.args, absolute_path(hook),
+				     oid_to_hex(null_oid()),
+				     oid_to_hex(&commit->object.oid),
+				     "1", NULL);
 			ret = run_command(&cp);
 		}
 	}
 
-	argv_array_clear(&child_env);
+	strvec_clear(&child_env);
 	strbuf_release(&sb);
 	strbuf_release(&symref);
 	strbuf_release(&sb_repo);
 	strbuf_release(&sb_git);
 	strbuf_release(&sb_name);
+	strbuf_release(&realpath);
 	return ret;
 }
 
@@ -463,16 +444,18 @@ static void print_preparing_worktree_line(int detach,
 static const char *dwim_branch(const char *path, const char **new_branch)
 {
 	int n;
+	int branch_exists;
 	const char *s = worktree_basename(path, &n);
 	const char *branchname = xstrndup(s, n);
 	struct strbuf ref = STRBUF_INIT;
 
 	UNLEAK(branchname);
-	if (!strbuf_check_branch_ref(&ref, branchname) &&
-	    ref_exists(ref.buf)) {
-		strbuf_release(&ref);
+
+	branch_exists = !strbuf_check_branch_ref(&ref, branchname) &&
+			ref_exists(ref.buf);
+	strbuf_release(&ref);
+	if (branch_exists)
 		return branchname;
-	}
 
 	*new_branch = branchname;
 	if (guess_remote) {
@@ -492,6 +475,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"),
@@ -500,9 +485,11 @@ static int add(int ac, const char **av, const char *prefix)
 			   N_("create a new branch")),
 		OPT_STRING('B', NULL, &new_branch_force, N_("branch"),
 			   N_("create or reset a branch")),
-		OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")),
+		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))"),
@@ -517,6 +504,13 @@ static int add(int ac, const char **av, const char *prefix)
 	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"));
+	if (lock_reason && !keep_locked)
+		die(_("--reason requires --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);
 
@@ -564,15 +558,15 @@ static int add(int ac, const char **av, const char *prefix)
 	if (new_branch) {
 		struct child_process cp = CHILD_PROCESS_INIT;
 		cp.git_cmd = 1;
-		argv_array_push(&cp.args, "branch");
+		strvec_push(&cp.args, "branch");
 		if (new_branch_force)
-			argv_array_push(&cp.args, "--force");
+			strvec_push(&cp.args, "--force");
 		if (opts.quiet)
-			argv_array_push(&cp.args, "--quiet");
-		argv_array_push(&cp.args, new_branch);
-		argv_array_push(&cp.args, branch);
+			strvec_push(&cp.args, "--quiet");
+		strvec_push(&cp.args, new_branch);
+		strvec_push(&cp.args, branch);
 		if (opt_track)
-			argv_array_push(&cp.args, opt_track);
+			strvec_push(&cp.args, opt_track);
 		if (run_command(&cp))
 			return -1;
 		branch = new_branch;
@@ -587,6 +581,8 @@ static int add(int ac, const char **av, const char *prefix)
 
 static void show_worktree_porcelain(struct worktree *wt)
 {
+	const char *reason;
+
 	printf("worktree %s\n", wt->path);
 	if (wt->is_bare)
 		printf("bare\n");
@@ -597,6 +593,20 @@ static void show_worktree_porcelain(struct worktree *wt)
 		else if (wt->head_ref)
 			printf("branch %s\n", wt->head_ref);
 	}
+
+	reason = worktree_lock_reason(wt);
+	if (reason && *reason) {
+		struct strbuf sb = STRBUF_INIT;
+		quote_c_style(reason, &sb, NULL, 0);
+		printf("locked %s\n", sb.buf);
+		strbuf_release(&sb);
+	} else if (reason)
+		printf("locked\n");
+
+	reason = worktree_prune_reason(wt, expire);
+	if (reason)
+		printf("prunable %s\n", reason);
+
 	printf("\n");
 }
 
@@ -605,6 +615,7 @@ static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
 	struct strbuf sb = STRBUF_INIT;
 	int cur_path_len = strlen(wt->path);
 	int path_adj = cur_path_len - utf8_strwidth(wt->path);
+	const char *reason;
 
 	strbuf_addf(&sb, "%-*s ", 1 + path_maxlen + path_adj, wt->path);
 	if (wt->is_bare)
@@ -621,8 +632,20 @@ static void show_worktree(struct worktree *wt, int path_maxlen, int abbrev_len)
 		} else
 			strbuf_addstr(&sb, "(error)");
 	}
-	printf("%s\n", sb.buf);
 
+	reason = worktree_lock_reason(wt);
+	if (verbose && reason && *reason)
+		strbuf_addf(&sb, "\n\tlocked: %s", reason);
+	else if (reason)
+		strbuf_addstr(&sb, " locked");
+
+	reason = worktree_prune_reason(wt, expire);
+	if (verbose && reason)
+		strbuf_addf(&sb, "\n\tprunable: %s", reason);
+	else if (reason)
+		strbuf_addstr(&sb, " prunable");
+
+	printf("%s\n", sb.buf);
 	strbuf_release(&sb);
 }
 
@@ -642,22 +665,48 @@ static void measure_widths(struct worktree **wt, int *abbrev, int *maxlen)
 	}
 }
 
+static int pathcmp(const void *a_, const void *b_)
+{
+	const struct worktree *const *a = a_;
+	const struct worktree *const *b = b_;
+	return fspathcmp((*a)->path, (*b)->path);
+}
+
+static void pathsort(struct worktree **wt)
+{
+	int n = 0;
+	struct worktree **p = wt;
+
+	while (*p++)
+		n++;
+	QSORT(wt, n, pathcmp);
+}
+
 static int list(int ac, const char **av, const char *prefix)
 {
 	int porcelain = 0;
 
 	struct option options[] = {
 		OPT_BOOL(0, "porcelain", &porcelain, N_("machine-readable output")),
+		OPT__VERBOSE(&verbose, N_("show extended annotations and reasons, if available")),
+		OPT_EXPIRY_DATE(0, "expire", &expire,
+				N_("add 'prunable' annotation to worktrees older than <time>")),
 		OPT_END()
 	};
 
+	expire = TIME_MAX;
 	ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
 	if (ac)
 		usage_with_options(worktree_usage, options);
+	else if (verbose && porcelain)
+		die(_("--verbose and --porcelain are mutually exclusive"));
 	else {
-		struct worktree **worktrees = get_worktrees(GWT_SORT_LINKED);
+		struct worktree **worktrees = get_worktrees();
 		int path_maxlen = 0, abbrev = DEFAULT_ABBREV, i;
 
+		/* sort worktrees by path but keep main worktree at top */
+		pathsort(worktrees + 1);
+
 		if (!porcelain)
 			measure_widths(worktrees, &abbrev, &path_maxlen);
 
@@ -686,7 +735,7 @@ static int lock_worktree(int ac, const char **av, const char *prefix)
 	if (ac != 1)
 		usage_with_options(worktree_usage, options);
 
-	worktrees = get_worktrees(0);
+	worktrees = get_worktrees();
 	wt = find_worktree(worktrees, prefix, av[0]);
 	if (!wt)
 		die(_("'%s' is not a working tree"), av[0]);
@@ -719,7 +768,7 @@ static int unlock_worktree(int ac, const char **av, const char *prefix)
 	if (ac != 1)
 		usage_with_options(worktree_usage, options);
 
-	worktrees = get_worktrees(0);
+	worktrees = get_worktrees();
 	wt = find_worktree(worktrees, prefix, av[0]);
 	if (!wt)
 		die(_("'%s' is not a working tree"), av[0]);
@@ -793,7 +842,7 @@ static int move_worktree(int ac, const char **av, const char *prefix)
 	strbuf_addstr(&dst, path);
 	free(path);
 
-	worktrees = get_worktrees(0);
+	worktrees = get_worktrees();
 	wt = find_worktree(worktrees, prefix, av[0]);
 	if (!wt)
 		die(_("'%s' is not a working tree"), av[0]);
@@ -808,8 +857,7 @@ static int move_worktree(int ac, const char **av, const char *prefix)
 		strbuf_trim_trailing_dir_sep(&dst);
 		strbuf_addstr(&dst, sep);
 	}
-	if (file_exists(dst.buf))
-		die(_("target '%s' already exists"), dst.buf);
+	check_candidate_path(dst.buf, force, worktrees, "move");
 
 	validate_no_submodules(wt);
 
@@ -850,7 +898,6 @@ static int move_worktree(int ac, const char **av, const char *prefix)
 static void check_clean_worktree(struct worktree *wt,
 				 const char *original_path)
 {
-	struct argv_array child_env = ARGV_ARRAY_INIT;
 	struct child_process cp;
 	char buf[1];
 	int ret;
@@ -861,15 +908,14 @@ static void check_clean_worktree(struct worktree *wt,
 	 */
 	validate_no_submodules(wt);
 
-	argv_array_pushf(&child_env, "%s=%s/.git",
-			 GIT_DIR_ENVIRONMENT, wt->path);
-	argv_array_pushf(&child_env, "%s=%s",
-			 GIT_WORK_TREE_ENVIRONMENT, wt->path);
-	memset(&cp, 0, sizeof(cp));
-	argv_array_pushl(&cp.args, "status",
-			 "--porcelain", "--ignore-submodules=none",
-			 NULL);
-	cp.env = child_env.argv;
+	child_process_init(&cp);
+	strvec_pushf(&cp.env_array, "%s=%s/.git",
+		     GIT_DIR_ENVIRONMENT, wt->path);
+	strvec_pushf(&cp.env_array, "%s=%s",
+		     GIT_WORK_TREE_ENVIRONMENT, wt->path);
+	strvec_pushl(&cp.args, "status",
+		     "--porcelain", "--ignore-submodules=none",
+		     NULL);
 	cp.git_cmd = 1;
 	cp.dir = wt->path;
 	cp.out = -1;
@@ -920,7 +966,7 @@ static int remove_worktree(int ac, const char **av, const char *prefix)
 	if (ac != 1)
 		usage_with_options(worktree_usage, options);
 
-	worktrees = get_worktrees(0);
+	worktrees = get_worktrees();
 	wt = find_worktree(worktrees, prefix, av[0]);
 	if (!wt)
 		die(_("'%s' is not a working tree"), av[0]);
@@ -956,6 +1002,34 @@ static int remove_worktree(int ac, const char **av, const char *prefix)
 	return ret;
 }
 
+static void report_repair(int iserr, const char *path, const char *msg, void *cb_data)
+{
+	if (!iserr) {
+		printf_ln(_("repair: %s: %s"), msg, path);
+	} else {
+		int *exit_status = (int *)cb_data;
+		fprintf_ln(stderr, _("error: %s: %s"), msg, path);
+		*exit_status = 1;
+	}
+}
+
+static int repair(int ac, const char **av, const char *prefix)
+{
+	const char **p;
+	const char *self[] = { ".", NULL };
+	struct option options[] = {
+		OPT_END()
+	};
+	int rc = 0;
+
+	ac = parse_options(ac, av, prefix, options, worktree_usage, 0);
+	p = ac > 0 ? av : self;
+	for (; *p; p++)
+		repair_worktree_at_path(*p, report_repair, &rc);
+	repair_worktrees(report_repair, &rc);
+	return rc;
+}
+
 int cmd_worktree(int ac, const char **av, const char *prefix)
 {
 	struct option options[] = {
@@ -982,5 +1056,7 @@ int cmd_worktree(int ac, const char **av, const char *prefix)
 		return move_worktree(ac - 1, av + 1, prefix);
 	if (!strcmp(av[1], "remove"))
 		return remove_worktree(ac - 1, av + 1, prefix);
+	if (!strcmp(av[1], "repair"))
+		return repair(ac - 1, av + 1, prefix);
 	usage_with_options(worktree_usage, options);
 }
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 583aacb9e3..b023d9959a 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -100,6 +100,7 @@ static int stream_to_pack(struct bulk_checkin_state *state,
 			  const char *path, unsigned flags)
 {
 	git_zstream s;
+	unsigned char ibuf[16384];
 	unsigned char obuf[16384];
 	unsigned hdrlen;
 	int status = Z_OK;
@@ -113,8 +114,6 @@ static int stream_to_pack(struct bulk_checkin_state *state,
 	s.avail_out = sizeof(obuf) - hdrlen;
 
 	while (status != Z_STREAM_END) {
-		unsigned char ibuf[16384];
-
 		if (size && !s.avail_in) {
 			ssize_t rsize = size < sizeof(ibuf) ? size : sizeof(ibuf);
 			ssize_t read_result = read_in_full(fd, ibuf, rsize);
@@ -211,7 +210,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
 
 	/* Note: idx is non-NULL when we are writing */
 	if ((flags & HASH_WRITE_OBJECT) != 0)
-		idx = xcalloc(1, sizeof(*idx));
+		CALLOC_ARRAY(idx, 1);
 
 	already_hashed_to = 0;
 
@@ -238,7 +237,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
 		if (lseek(fd, seekback, SEEK_SET) == (off_t) -1)
 			return error("cannot seek back");
 	}
-	the_hash_algo->final_fn(result_oid->hash, &ctx);
+	the_hash_algo->final_oid_fn(result_oid, &ctx);
 	if (!idx)
 		return 0;
 
diff --git a/bundle.c b/bundle.c
index a85ed3f7bc..ab63f40226 100644
--- a/bundle.c
+++ b/bundle.c
@@ -10,17 +10,55 @@
 #include "list-objects.h"
 #include "run-command.h"
 #include "refs.h"
-#include "argv-array.h"
+#include "strvec.h"
 
-static const char bundle_signature[] = "# v2 git bundle\n";
 
-static void add_to_ref_list(const struct object_id *oid, const char *name,
-		struct ref_list *list)
+static const char v2_bundle_signature[] = "# v2 git bundle\n";
+static const char v3_bundle_signature[] = "# v3 git bundle\n";
+static struct {
+	int version;
+	const char *signature;
+} bundle_sigs[] = {
+	{ 2, v2_bundle_signature },
+	{ 3, v3_bundle_signature },
+};
+
+void bundle_header_init(struct bundle_header *header)
+{
+	struct bundle_header blank = BUNDLE_HEADER_INIT;
+	memcpy(header, &blank, sizeof(*header));
+}
+
+void bundle_header_release(struct bundle_header *header)
 {
-	ALLOC_GROW(list->list, list->nr + 1, list->alloc);
-	oidcpy(&list->list[list->nr].oid, oid);
-	list->list[list->nr].name = xstrdup(name);
-	list->nr++;
+	string_list_clear(&header->prerequisites, 1);
+	string_list_clear(&header->references, 1);
+}
+
+static int parse_capability(struct bundle_header *header, const char *capability)
+{
+	const char *arg;
+	if (skip_prefix(capability, "object-format=", &arg)) {
+		int algo = hash_algo_by_name(arg);
+		if (algo == GIT_HASH_UNKNOWN)
+			return error(_("unrecognized bundle hash algorithm: %s"), arg);
+		header->hash_algo = &hash_algos[algo];
+		return 0;
+	}
+	return error(_("unknown capability '%s'"), capability);
+}
+
+static int parse_bundle_signature(struct bundle_header *header, const char *line)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE(bundle_sigs); i++) {
+		if (!strcmp(line, bundle_sigs[i].signature)) {
+			header->version = bundle_sigs[i].version;
+			return 0;
+		}
+	}
+	return -1;
 }
 
 static int parse_bundle_header(int fd, struct bundle_header *header,
@@ -31,14 +69,16 @@ static int parse_bundle_header(int fd, struct bundle_header *header,
 
 	/* The bundle header begins with the signature */
 	if (strbuf_getwholeline_fd(&buf, fd, '\n') ||
-	    strcmp(buf.buf, bundle_signature)) {
+	    parse_bundle_signature(header, buf.buf)) {
 		if (report_path)
-			error(_("'%s' does not look like a v2 bundle file"),
+			error(_("'%s' does not look like a v2 or v3 bundle file"),
 			      report_path);
 		status = -1;
 		goto abort;
 	}
 
+	header->hash_algo = the_hash_algo;
+
 	/* The bundle header ends with an empty line */
 	while (!strbuf_getwholeline_fd(&buf, fd, '\n') &&
 	       buf.len && buf.buf[0] != '\n') {
@@ -46,18 +86,27 @@ static int parse_bundle_header(int fd, struct bundle_header *header,
 		int is_prereq = 0;
 		const char *p;
 
+		strbuf_rtrim(&buf);
+
+		if (header->version == 3 && *buf.buf == '@') {
+			if (parse_capability(header, buf.buf + 1)) {
+				status = -1;
+				break;
+			}
+			continue;
+		}
+
 		if (*buf.buf == '-') {
 			is_prereq = 1;
 			strbuf_remove(&buf, 0, 1);
 		}
-		strbuf_rtrim(&buf);
 
 		/*
 		 * Tip lines have object name, SP, and refname.
 		 * Prerequisites have object name that is optionally
 		 * followed by SP and subject line.
 		 */
-		if (parse_oid_hex(buf.buf, &oid, &p) ||
+		if (parse_oid_hex_algop(buf.buf, &oid, &p, header->hash_algo) ||
 		    (*p && !isspace(*p)) ||
 		    (!is_prereq && !*p)) {
 			if (report_path)
@@ -66,10 +115,11 @@ static int parse_bundle_header(int fd, struct bundle_header *header,
 			status = -1;
 			break;
 		} else {
+			struct object_id *dup = oiddup(&oid);
 			if (is_prereq)
-				add_to_ref_list(&oid, "", &header->prerequisites);
+				string_list_append(&header->prerequisites, "")->util = dup;
 			else
-				add_to_ref_list(&oid, p + 1, &header->references);
+				string_list_append(&header->references, p + 1)->util = dup;
 		}
 	}
 
@@ -93,33 +143,38 @@ int read_bundle_header(const char *path, struct bundle_header *header)
 
 int is_bundle(const char *path, int quiet)
 {
-	struct bundle_header header;
+	struct bundle_header header = BUNDLE_HEADER_INIT;
 	int fd = open(path, O_RDONLY);
 
 	if (fd < 0)
 		return 0;
-	memset(&header, 0, sizeof(header));
 	fd = parse_bundle_header(fd, &header, quiet ? NULL : path);
 	if (fd >= 0)
 		close(fd);
+	bundle_header_release(&header);
 	return (fd >= 0);
 }
 
-static int list_refs(struct ref_list *r, int argc, const char **argv)
+static int list_refs(struct string_list *r, int argc, const char **argv)
 {
 	int i;
 
 	for (i = 0; i < r->nr; i++) {
+		struct object_id *oid;
+		const char *name;
+
 		if (argc > 1) {
 			int j;
 			for (j = 1; j < argc; j++)
-				if (!strcmp(r->list[i].name, argv[j]))
+				if (!strcmp(r->items[i].string, argv[j]))
 					break;
 			if (j == argc)
 				continue;
 		}
-		printf("%s %s\n", oid_to_hex(&r->list[i].oid),
-				r->list[i].name);
+
+		oid = r->items[i].util;
+		name = r->items[i].string;
+		printf("%s %s\n", oid_to_hex(oid), name);
 	}
 	return 0;
 }
@@ -135,7 +190,7 @@ int verify_bundle(struct repository *r,
 	 * Do fast check, then if any prereqs are missing then go line by line
 	 * to be verbose about the errors
 	 */
-	struct ref_list *p = &header->prerequisites;
+	struct string_list *p = &header->prerequisites;
 	struct rev_info revs;
 	const char *argv[] = {NULL, "--all", NULL};
 	struct commit *commit;
@@ -147,16 +202,18 @@ int verify_bundle(struct repository *r,
 
 	repo_init_revisions(r, &revs, NULL);
 	for (i = 0; i < p->nr; i++) {
-		struct ref_list_entry *e = p->list + i;
-		struct object *o = parse_object(r, &e->oid);
+		struct string_list_item *e = p->items + i;
+		const char *name = e->string;
+		struct object_id *oid = e->util;
+		struct object *o = parse_object(r, oid);
 		if (o) {
 			o->flags |= PREREQ_MARK;
-			add_pending_object(&revs, o, e->name);
+			add_pending_object(&revs, o, name);
 			continue;
 		}
 		if (++ret == 1)
 			error("%s", message);
-		error("%s %s", oid_to_hex(&e->oid), e->name);
+		error("%s %s", oid_to_hex(oid), name);
 	}
 	if (revs.pending.nr != p->nr)
 		return ret;
@@ -172,26 +229,29 @@ int verify_bundle(struct repository *r,
 			i--;
 
 	for (i = 0; i < p->nr; i++) {
-		struct ref_list_entry *e = p->list + i;
-		struct object *o = parse_object(r, &e->oid);
+		struct string_list_item *e = p->items + i;
+		const char *name = e->string;
+		const struct object_id *oid = e->util;
+		struct object *o = parse_object(r, oid);
 		assert(o); /* otherwise we'd have returned early */
 		if (o->flags & SHOWN)
 			continue;
 		if (++ret == 1)
 			error("%s", message);
-		error("%s %s", oid_to_hex(&e->oid), e->name);
+		error("%s %s", oid_to_hex(oid), name);
 	}
 
 	/* Clean up objects used, as they will be reused. */
 	for (i = 0; i < p->nr; i++) {
-		struct ref_list_entry *e = p->list + i;
-		commit = lookup_commit_reference_gently(r, &e->oid, 1);
+		struct string_list_item *e = p->items + i;
+		struct object_id *oid = e->util;
+		commit = lookup_commit_reference_gently(r, oid, 1);
 		if (commit)
 			clear_commit_marks(commit, ALL_REV_FLAGS);
 	}
 
 	if (verbose) {
-		struct ref_list *r;
+		struct string_list *r;
 
 		r = &header->references;
 		printf_ln(Q_("The bundle contains this ref:",
@@ -249,15 +309,16 @@ out:
 
 
 /* Write the pack data to bundle_fd */
-static int write_pack_data(int bundle_fd, struct rev_info *revs)
+static int write_pack_data(int bundle_fd, struct rev_info *revs, struct strvec *pack_options)
 {
 	struct child_process pack_objects = CHILD_PROCESS_INIT;
 	int i;
 
-	argv_array_pushl(&pack_objects.args,
-			 "pack-objects", "--all-progress-implied",
-			 "--stdout", "--thin", "--delta-base-offset",
-			 NULL);
+	strvec_pushl(&pack_objects.args,
+		     "pack-objects",
+		     "--stdout", "--thin", "--delta-base-offset",
+		     NULL);
+	strvec_pushv(&pack_objects.args, pack_options->v);
 	pack_objects.in = -1;
 	pack_objects.out = bundle_fd;
 	pack_objects.git_cmd = 1;
@@ -291,48 +352,6 @@ static int write_pack_data(int bundle_fd, struct rev_info *revs)
 	return 0;
 }
 
-static int compute_and_write_prerequisites(int bundle_fd,
-					   struct rev_info *revs,
-					   int argc, const char **argv)
-{
-	struct child_process rls = CHILD_PROCESS_INIT;
-	struct strbuf buf = STRBUF_INIT;
-	FILE *rls_fout;
-	int i;
-
-	argv_array_pushl(&rls.args,
-			 "rev-list", "--boundary", "--pretty=oneline",
-			 NULL);
-	for (i = 1; i < argc; i++)
-		argv_array_push(&rls.args, argv[i]);
-	rls.out = -1;
-	rls.git_cmd = 1;
-	if (start_command(&rls))
-		return -1;
-	rls_fout = xfdopen(rls.out, "r");
-	while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) {
-		struct object_id oid;
-		if (buf.len > 0 && buf.buf[0] == '-') {
-			write_or_die(bundle_fd, buf.buf, buf.len);
-			if (!get_oid_hex(buf.buf + 1, &oid)) {
-				struct object *object = parse_object_or_die(&oid,
-									    buf.buf);
-				object->flags |= UNINTERESTING;
-				add_pending_object(revs, object, buf.buf);
-			}
-		} else if (!get_oid_hex(buf.buf, &oid)) {
-			struct object *object = parse_object_or_die(&oid,
-								    buf.buf);
-			object->flags |= SHOWN;
-		}
-	}
-	strbuf_release(&buf);
-	fclose(rls_fout);
-	if (finish_command(&rls))
-		return error(_("rev-list died"));
-	return 0;
-}
-
 /*
  * Write out bundle refs based on the tips already
  * parsed into revs.pending. As a side effect, may
@@ -356,7 +375,7 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
 
 		if (e->item->flags & UNINTERESTING)
 			continue;
-		if (dwim_ref(e->name, strlen(e->name), &oid, &ref) != 1)
+		if (dwim_ref(e->name, strlen(e->name), &oid, &ref, 0) != 1)
 			goto skip_write_ref;
 		if (read_ref_full(e->name, RESOLVE_REF_READING, &oid, &flag))
 			flag = 0;
@@ -427,14 +446,49 @@ static int write_bundle_refs(int bundle_fd, struct rev_info *revs)
 	return ref_count;
 }
 
+struct bundle_prerequisites_info {
+	struct object_array *pending;
+	int fd;
+};
+
+static void write_bundle_prerequisites(struct commit *commit, void *data)
+{
+	struct bundle_prerequisites_info *bpi = data;
+	struct object *object;
+	struct pretty_print_context ctx = { 0 };
+	struct strbuf buf = STRBUF_INIT;
+
+	if (!(commit->object.flags & BOUNDARY))
+		return;
+	strbuf_addf(&buf, "-%s ", oid_to_hex(&commit->object.oid));
+	write_or_die(bpi->fd, buf.buf, buf.len);
+
+	ctx.fmt = CMIT_FMT_ONELINE;
+	ctx.output_encoding = get_log_output_encoding();
+	strbuf_reset(&buf);
+	pretty_print_commit(&ctx, commit, &buf);
+	strbuf_trim(&buf);
+
+	object = (struct object *)commit;
+	object->flags |= UNINTERESTING;
+	add_object_array_with_path(object, buf.buf, bpi->pending, S_IFINVALID,
+				   NULL);
+	strbuf_addch(&buf, '\n');
+	write_or_die(bpi->fd, buf.buf, buf.len);
+	strbuf_release(&buf);
+}
+
 int create_bundle(struct repository *r, const char *path,
-		  int argc, const char **argv)
+		  int argc, const char **argv, struct strvec *pack_options, int version)
 {
 	struct lock_file lock = LOCK_INIT;
 	int bundle_fd = -1;
 	int bundle_to_stdout;
 	int ref_count = 0;
-	struct rev_info revs;
+	struct rev_info revs, revs_copy;
+	int min_version = the_hash_algo == &hash_algos[GIT_HASH_SHA1] ? 2 : 3;
+	struct bundle_prerequisites_info bpi;
+	int i;
 
 	bundle_to_stdout = !strcmp(path, "-");
 	if (bundle_to_stdout)
@@ -443,17 +497,27 @@ int create_bundle(struct repository *r, const char *path,
 		bundle_fd = hold_lock_file_for_update(&lock, path,
 						      LOCK_DIE_ON_ERROR);
 
-	/* write signature */
-	write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
+	if (version == -1)
+		version = min_version;
+
+	if (version < 2 || version > 3) {
+		die(_("unsupported bundle version %d"), version);
+	} else if (version < min_version) {
+		die(_("cannot write bundle version %d with algorithm %s"), version, the_hash_algo->name);
+	} else if (version == 2) {
+		write_or_die(bundle_fd, v2_bundle_signature, strlen(v2_bundle_signature));
+	} else {
+		const char *capability = "@object-format=";
+		write_or_die(bundle_fd, v3_bundle_signature, strlen(v3_bundle_signature));
+		write_or_die(bundle_fd, capability, strlen(capability));
+		write_or_die(bundle_fd, the_hash_algo->name, strlen(the_hash_algo->name));
+		write_or_die(bundle_fd, "\n", 1);
+	}
 
 	/* init revs to list objects for pack-objects later */
 	save_commit_buffer = 0;
 	repo_init_revisions(r, &revs, NULL);
 
-	/* write prerequisites */
-	if (compute_and_write_prerequisites(bundle_fd, &revs, argc, argv))
-		goto err;
-
 	argc = setup_revisions(argc, argv, &revs, NULL);
 
 	if (argc > 1) {
@@ -461,16 +525,37 @@ int create_bundle(struct repository *r, const char *path,
 		goto err;
 	}
 
-	object_array_remove_duplicates(&revs.pending);
+	/* save revs.pending in revs_copy for later use */
+	memcpy(&revs_copy, &revs, sizeof(revs));
+	revs_copy.pending.nr = 0;
+	revs_copy.pending.alloc = 0;
+	revs_copy.pending.objects = NULL;
+	for (i = 0; i < revs.pending.nr; i++) {
+		struct object_array_entry *e = revs.pending.objects + i;
+		if (e)
+			add_object_array_with_path(e->item, e->name,
+						   &revs_copy.pending,
+						   e->mode, e->path);
+	}
 
-	ref_count = write_bundle_refs(bundle_fd, &revs);
+	/* write prerequisites */
+	revs.boundary = 1;
+	if (prepare_revision_walk(&revs))
+		die("revision walk setup failed");
+	bpi.fd = bundle_fd;
+	bpi.pending = &revs_copy.pending;
+	traverse_commit_list(&revs, write_bundle_prerequisites, NULL, &bpi);
+	object_array_remove_duplicates(&revs_copy.pending);
+
+	/* write bundle refs */
+	ref_count = write_bundle_refs(bundle_fd, &revs_copy);
 	if (!ref_count)
 		die(_("Refusing to create empty bundle."));
 	else if (ref_count < 0)
 		goto err;
 
 	/* write pack */
-	if (write_pack_data(bundle_fd, &revs))
+	if (write_pack_data(bundle_fd, &revs_copy, pack_options))
 		goto err;
 
 	if (!bundle_to_stdout) {
diff --git a/bundle.h b/bundle.h
index 37c37d7f65..1927d8cd6a 100644
--- a/bundle.h
+++ b/bundle.h
@@ -1,25 +1,30 @@
 #ifndef BUNDLE_H
 #define BUNDLE_H
 
+#include "strvec.h"
 #include "cache.h"
-
-struct ref_list {
-	unsigned int nr, alloc;
-	struct ref_list_entry {
-		struct object_id oid;
-		char *name;
-	} *list;
-};
+#include "string-list.h"
 
 struct bundle_header {
-	struct ref_list prerequisites;
-	struct ref_list references;
+	unsigned version;
+	struct string_list prerequisites;
+	struct string_list references;
+	const struct git_hash_algo *hash_algo;
 };
 
+#define BUNDLE_HEADER_INIT \
+{ \
+	.prerequisites = STRING_LIST_INIT_DUP, \
+	.references = STRING_LIST_INIT_DUP, \
+}
+void bundle_header_init(struct bundle_header *header);
+void bundle_header_release(struct bundle_header *header);
+
 int is_bundle(const char *path, int quiet);
 int read_bundle_header(const char *path, struct bundle_header *header);
 int create_bundle(struct repository *r, const char *path,
-		  int argc, const char **argv);
+		  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
 int unbundle(struct repository *r, struct bundle_header *header,
diff --git a/cache-tree.c b/cache-tree.c
index 1bd1b23d38..90919f9e34 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -6,6 +6,7 @@
 #include "object-store.h"
 #include "replace-object.h"
 #include "promisor-remote.h"
+#include "sparse-index.h"
 
 #ifndef DEBUG_CACHE_TREE
 #define DEBUG_CACHE_TREE 0
@@ -45,7 +46,7 @@ static int subtree_name_cmp(const char *one, int onelen,
 	return memcmp(one, two, onelen);
 }
 
-static int subtree_pos(struct cache_tree *it, const char *path, int pathlen)
+int cache_tree_subtree_pos(struct cache_tree *it, const char *path, int pathlen)
 {
 	struct cache_tree_sub **down = it->down;
 	int lo, hi;
@@ -72,7 +73,7 @@ static struct cache_tree_sub *find_subtree(struct cache_tree *it,
 					   int create)
 {
 	struct cache_tree_sub *down;
-	int pos = subtree_pos(it, path, pathlen);
+	int pos = cache_tree_subtree_pos(it, path, pathlen);
 	if (0 <= pos)
 		return it->down[pos];
 	if (!create)
@@ -123,7 +124,7 @@ static int do_invalidate_path(struct cache_tree *it, const char *path)
 	it->entry_count = -1;
 	if (!*slash) {
 		int pos;
-		pos = subtree_pos(it, path, namelen);
+		pos = cache_tree_subtree_pos(it, path, namelen);
 		if (0 <= pos) {
 			cache_tree_free(&it->down[pos]->cache_tree);
 			free(it->down[pos]);
@@ -151,16 +152,15 @@ void cache_tree_invalidate_path(struct index_state *istate, const char *path)
 		istate->cache_changed |= CACHE_TREE_CHANGED;
 }
 
-static int verify_cache(struct cache_entry **cache,
-			int entries, int flags)
+static int verify_cache(struct index_state *istate, int flags)
 {
-	int i, funny;
+	unsigned i, funny;
 	int silent = flags & WRITE_TREE_SILENT;
 
 	/* Verify that the tree is merged */
 	funny = 0;
-	for (i = 0; i < entries; i++) {
-		const struct cache_entry *ce = cache[i];
+	for (i = 0; i < istate->cache_nr; i++) {
+		const struct cache_entry *ce = istate->cache[i];
 		if (ce_stage(ce)) {
 			if (silent)
 				return -1;
@@ -180,17 +180,19 @@ static int verify_cache(struct cache_entry **cache,
 	 * stage 0 entries.
 	 */
 	funny = 0;
-	for (i = 0; i < entries - 1; i++) {
+	for (i = 0; i + 1 < istate->cache_nr; i++) {
 		/* path/file always comes after path because of the way
 		 * the cache is sorted.  Also path can appear only once,
 		 * which means conflicting one would immediately follow.
 		 */
-		const char *this_name = cache[i]->name;
-		const char *next_name = cache[i+1]->name;
-		int this_len = strlen(this_name);
-		if (this_len < strlen(next_name) &&
-		    strncmp(this_name, next_name, this_len) == 0 &&
-		    next_name[this_len] == '/') {
+		const struct cache_entry *this_ce = istate->cache[i];
+		const struct cache_entry *next_ce = istate->cache[i + 1];
+		const char *this_name = this_ce->name;
+		const char *next_name = next_ce->name;
+		int this_len = ce_namelen(this_ce);
+		if (this_len < ce_namelen(next_ce) &&
+		    next_name[this_len] == '/' &&
+		    strncmp(this_name, next_name, this_len) == 0) {
 			if (10 < ++funny) {
 				fprintf(stderr, "...\n");
 				break;
@@ -235,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,
@@ -254,6 +261,24 @@ static int update_one(struct cache_tree *it,
 
 	*skip_count = 0;
 
+	/*
+	 * If the first entry of this region is a sparse directory
+	 * entry corresponding exactly to 'base', then this cache_tree
+	 * struct is a "leaf" in the data structure, pointing to the
+	 * tree OID specified in the entry.
+	 */
+	if (entries > 0) {
+		const struct cache_entry *ce = cache[0];
+
+		if (S_ISSPARSEDIR(ce->ce_mode) &&
+		    ce->ce_namelen == baselen &&
+		    !strncmp(ce->name, base, baselen)) {
+			it->entry_count = 1;
+			oidcpy(&it->oid, &ce->oid);
+			return 1;
+		}
+	}
+
 	if (0 <= it->entry_count && has_object_file(&it->oid))
 		return it->entry_count;
 
@@ -358,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);
@@ -407,13 +431,15 @@ static int update_one(struct cache_tree *it,
 
 	if (repair) {
 		struct object_id oid;
-		hash_object_file(buffer.buf, buffer.len, tree_type, &oid);
+		hash_object_file(the_hash_algo, buffer.buf, buffer.len,
+				 tree_type, &oid);
 		if (has_object_file_with_flags(&oid, OBJECT_INFO_SKIP_FETCH_OBJECT))
 			oidcpy(&it->oid, &oid);
 		else
 			to_invalidate = 1;
 	} else if (dryrun) {
-		hash_object_file(buffer.buf, buffer.len, tree_type, &it->oid);
+		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)) {
 		strbuf_release(&buffer);
@@ -432,15 +458,24 @@ static int update_one(struct cache_tree *it,
 
 int cache_tree_update(struct index_state *istate, int flags)
 {
-	struct cache_tree *it = istate->cache_tree;
-	struct cache_entry **cache = istate->cache;
-	int entries = istate->cache_nr;
-	int skip, i = verify_cache(cache, entries, flags);
+	int skip, i;
+
+	i = verify_cache(istate, flags);
 
 	if (i)
 		return i;
+
+	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();
-	i = update_one(it, cache, entries, "", 0, &skip, flags);
+	trace2_region_enter("cache_tree", "update", the_repository);
+	i = update_one(istate->cache_tree, istate->cache, istate->cache_nr,
+		       "", 0, &skip, flags);
+	trace2_region_leave("cache_tree", "update", the_repository);
 	trace_performance_leave("cache_tree_update");
 	if (i < 0)
 		return i;
@@ -490,7 +525,9 @@ static void write_one(struct strbuf *buffer, struct cache_tree *it,
 
 void cache_tree_write(struct strbuf *sb, struct cache_tree *root)
 {
+	trace2_region_enter("cache_tree", "write", the_repository);
 	write_one(sb, root, "", 0);
+	trace2_region_leave("cache_tree", "write", the_repository);
 }
 
 static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
@@ -553,7 +590,7 @@ static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
 	 * hence +2.
 	 */
 	it->subtree_alloc = subtree_nr + 2;
-	it->down = xcalloc(it->subtree_alloc, sizeof(struct cache_tree_sub *));
+	CALLOC_ARRAY(it->down, it->subtree_alloc);
 	for (i = 0; i < subtree_nr; i++) {
 		/* read each subtree */
 		struct cache_tree *sub;
@@ -579,9 +616,16 @@ static struct cache_tree *read_one(const char **buffer, unsigned long *size_p)
 
 struct cache_tree *cache_tree_read(const char *buffer, unsigned long size)
 {
+	struct cache_tree *result;
+
 	if (buffer[0])
 		return NULL; /* not the whole tree */
-	return read_one(&buffer, &size);
+
+	trace2_region_enter("cache_tree", "read", the_repository);
+	result = read_one(&buffer, &size);
+	trace2_region_leave("cache_tree", "read", the_repository);
+
+	return result;
 }
 
 static struct cache_tree *cache_tree_find(struct cache_tree *it, const char *path)
@@ -620,9 +664,6 @@ static int write_index_as_tree_internal(struct object_id *oid,
 		cache_tree_valid = 0;
 	}
 
-	if (!index_state->cache_tree)
-		index_state->cache_tree = cache_tree();
-
 	if (!cache_tree_valid && cache_tree_update(index_state, flags) < 0)
 		return WRITE_TREE_UNMERGED_INDEX;
 
@@ -731,10 +772,13 @@ void prime_cache_tree(struct repository *r,
 		      struct index_state *istate,
 		      struct tree *tree)
 {
+	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);
 	istate->cache_changed |= CACHE_TREE_CHANGED;
+	trace2_region_leave("cache-tree", "prime_cache_tree", the_repository);
 }
 
 /*
@@ -769,6 +813,19 @@ int cache_tree_matches_traversal(struct cache_tree *root,
 	return 0;
 }
 
+static void verify_one_sparse(struct repository *r,
+			      struct index_state *istate,
+			      struct cache_tree *it,
+			      struct strbuf *path,
+			      int pos)
+{
+	struct cache_entry *ce = istate->cache[pos];
+
+	if (!S_ISSPARSEDIR(ce->ce_mode))
+		BUG("directory '%s' is present in index, but not sparse",
+		    path->buf);
+}
+
 static void verify_one(struct repository *r,
 		       struct index_state *istate,
 		       struct cache_tree *it,
@@ -791,6 +848,12 @@ static void verify_one(struct repository *r,
 
 	if (path->len) {
 		pos = index_name_pos(istate, path->buf, path->len);
+
+		if (pos >= 0) {
+			verify_one_sparse(r, istate, it, path, pos);
+			return;
+		}
+
 		pos = -pos - 1;
 	} else {
 		pos = 0;
@@ -826,9 +889,10 @@ static void verify_one(struct repository *r,
 			i++;
 		}
 		strbuf_addf(&tree_buf, "%o %.*s%c", mode, entlen, name, '\0');
-		strbuf_add(&tree_buf, oid->hash, the_hash_algo->rawsz);
+		strbuf_add(&tree_buf, oid->hash, r->hash_algo->rawsz);
 	}
-	hash_object_file(tree_buf.buf, tree_buf.len, tree_type, &new_oid);
+	hash_object_file(r->hash_algo, tree_buf.buf, tree_buf.len, tree_type,
+			 &new_oid);
 	if (!oideq(&new_oid, &it->oid))
 		BUG("cache-tree for path %.*s does not match. "
 		    "Expected %s got %s", len, path->buf,
diff --git a/cache-tree.h b/cache-tree.h
index 639bfa5340..8efeccebfc 100644
--- a/cache-tree.h
+++ b/cache-tree.h
@@ -27,6 +27,8 @@ void cache_tree_free(struct cache_tree **);
 void cache_tree_invalidate_path(struct index_state *, const char *);
 struct cache_tree_sub *cache_tree_sub(struct cache_tree *, const char *);
 
+int cache_tree_subtree_pos(struct cache_tree *it, const char *path, int pathlen);
+
 void cache_tree_write(struct strbuf *, struct cache_tree *root);
 struct cache_tree *cache_tree_read(const char *buffer, unsigned long size);
 
diff --git a/cache.h b/cache.h
index 04cabaac11..d23de69368 100644
--- a/cache.h
+++ b/cache.h
@@ -14,7 +14,7 @@
 #include "pack-revindex.h"
 #include "hash.h"
 #include "path.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "repository.h"
 #include "mem-pool.h"
 
@@ -204,6 +204,8 @@ struct cache_entry {
 #error "CE_EXTENDED_FLAGS out of range"
 #endif
 
+#define S_ISSPARSEDIR(m) ((m) == S_IFDIR)
+
 /* Forward structure decls */
 struct pathspec;
 struct child_process;
@@ -249,6 +251,8 @@ static inline unsigned int create_ce_mode(unsigned int mode)
 {
 	if (S_ISLNK(mode))
 		return S_IFLNK;
+	if (S_ISSPARSEDIR(mode))
+		return S_IFDIR;
 	if (S_ISDIR(mode) || S_ISGITLINK(mode))
 		return S_IFGITLINK;
 	return S_IFREG | ce_permissions(mode);
@@ -304,6 +308,8 @@ static inline unsigned int canon_mode(unsigned int mode)
 
 struct split_index;
 struct untracked_cache;
+struct progress;
+struct pattern_list;
 
 struct index_state {
 	struct cache_entry **cache;
@@ -318,14 +324,24 @@ struct index_state {
 		 drop_cache_tree : 1,
 		 updated_workdir : 1,
 		 updated_skipworktree : 1,
-		 fsmonitor_has_run_once : 1;
+		 fsmonitor_has_run_once : 1,
+
+		 /*
+		  * sparse_index == 1 when sparse-directory
+		  * entries exist. Requires sparse-checkout
+		  * in cone mode.
+		  */
+		 sparse_index : 1;
 	struct hashmap name_hash;
 	struct hashmap dir_hash;
 	struct object_id oid;
 	struct untracked_cache *untracked;
-	uint64_t fsmonitor_last_update;
+	char *fsmonitor_last_update;
 	struct ewah_bitmap *fsmonitor_dirty;
 	struct mem_pool *ce_mem_pool;
+	struct progress *progress;
+	struct repository *repo;
+	struct pattern_list *sparse_checkout_patterns;
 };
 
 /* Name hashing */
@@ -334,6 +350,7 @@ 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 */
 
@@ -353,16 +370,20 @@ struct cache_entry *make_empty_cache_entry(struct index_state *istate,
 					   size_t name_len);
 
 /*
- * Create a cache_entry that is not intended to be added to an index.
- * Caller is responsible for discarding the cache_entry
- * with `discard_cache_entry`.
+ * Create a cache_entry that is not intended to be added to an index. If
+ * `ce_mem_pool` is not NULL, the entry is allocated within the given memory
+ * pool. Caller is responsible for discarding "loose" entries with
+ * `discard_cache_entry()` and the memory pool with
+ * `mem_pool_discard(ce_mem_pool, should_validate_cache_entries())`.
  */
 struct cache_entry *make_transient_cache_entry(unsigned int mode,
 					       const struct object_id *oid,
 					       const char *path,
-					       int stage);
+					       int stage,
+					       struct mem_pool *ce_mem_pool);
 
-struct cache_entry *make_empty_transient_cache_entry(size_t name_len);
+struct cache_entry *make_empty_transient_cache_entry(size_t len,
+						     struct mem_pool *ce_mem_pool);
 
 /*
  * Discard cache entry.
@@ -389,6 +410,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;
 
@@ -470,6 +500,7 @@ static inline enum object_type object_type(unsigned int mode)
 #define TEMPLATE_DIR_ENVIRONMENT "GIT_TEMPLATE_DIR"
 #define CONFIG_ENVIRONMENT "GIT_CONFIG"
 #define CONFIG_DATA_ENVIRONMENT "GIT_CONFIG_PARAMETERS"
+#define CONFIG_COUNT_ENVIRONMENT "GIT_CONFIG_COUNT"
 #define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
 #define CEILING_DIRECTORIES_ENVIRONMENT "GIT_CEILING_DIRECTORIES"
 #define NO_REPLACE_OBJECTS_ENVIRONMENT "GIT_NO_REPLACE_OBJECTS"
@@ -541,7 +572,7 @@ const char *get_git_common_dir(void);
 char *get_object_directory(void);
 char *get_index_file(void);
 char *get_graft_file(struct repository *r);
-void set_git_dir(const char *path);
+void set_git_dir(const char *path, int make_realpath);
 int get_common_dir_noenv(struct strbuf *sb, const char *gitdir);
 int get_common_dir(struct strbuf *sb, const char *gitdir);
 const char *get_git_namespace(void);
@@ -625,17 +656,52 @@ int path_inside_repo(const char *prefix, const char *path);
 #define INIT_DB_EXIST_OK 0x0002
 
 int init_db(const char *git_dir, const char *real_git_dir,
-	    const char *template_dir, unsigned int flags);
+	    const char *template_dir, int hash_algo,
+	    const char *initial_branch, unsigned int flags);
+void initialize_repository_version(int hash_algo, int reinit);
 
 void sanitize_stdfds(void);
 int daemonize(void);
 
 #define alloc_nr(x) (((x)+16)*3/2)
 
-/*
- * Realloc the buffer pointed at by variable 'x' so that it can hold
- * at least 'nr' entries; the number of entries currently allocated
- * is 'alloc', using the standard growing factor alloc_nr() macro.
+/**
+ * Dynamically growing an array using realloc() is error prone and boring.
+ *
+ * Define your array with:
+ *
+ * - a pointer (`item`) that points at the array, initialized to `NULL`
+ *   (although please name the variable based on its contents, not on its
+ *   type);
+ *
+ * - an integer variable (`alloc`) that keeps track of how big the current
+ *   allocation is, initialized to `0`;
+ *
+ * - another integer variable (`nr`) to keep track of how many elements the
+ *   array currently has, initialized to `0`.
+ *
+ * Then before adding `n`th element to the item, call `ALLOC_GROW(item, n,
+ * alloc)`.  This ensures that the array can hold at least `n` elements by
+ * calling `realloc(3)` and adjusting `alloc` variable.
+ *
+ * ------------
+ * sometype *item;
+ * size_t nr;
+ * size_t alloc
+ *
+ * for (i = 0; i < nr; i++)
+ * 	if (we like item[i] already)
+ * 		return;
+ *
+ * // we did not like any existing one, so add one
+ * ALLOC_GROW(item, nr + 1, alloc);
+ * item[nr++] = value you like;
+ * ------------
+ *
+ * You are responsible for updating the `nr` variable.
+ *
+ * If you need to specify the number of elements to allocate explicitly
+ * then use the macro `REALLOC_ARRAY(item, alloc)` instead of `ALLOC_GROW`.
  *
  * Consider using ALLOC_GROW_BY instead of ALLOC_GROW as it has some
  * added niceties.
@@ -683,6 +749,8 @@ int read_index_from(struct index_state *, const char *path,
 		    const char *gitdir);
 int is_index_unborn(struct index_state *);
 
+void ensure_full_index(struct index_state *istate);
+
 /* For use with `write_locked_index()`. */
 #define COMMIT_LOCK		(1 << 0)
 #define SKIP_IF_UNCHANGED	(1 << 1)
@@ -746,7 +814,7 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na
  * index_name_pos(&index, "f", 1) -> -3
  * index_name_pos(&index, "g", 1) -> -5
  */
-int index_name_pos(const struct index_state *, const char *name, int namelen);
+int index_name_pos(struct index_state *, const char *name, int namelen);
 
 /*
  * Some functions return the negative complement of an insert position when a
@@ -764,7 +832,7 @@ static inline int index_pos_to_insert_pos(uintmax_t pos)
 #define ADD_CACHE_OK_TO_ADD 1		/* Ok to add */
 #define ADD_CACHE_OK_TO_REPLACE 2	/* Ok to replace file/directory */
 #define ADD_CACHE_SKIP_DFCHECK 4	/* Ok to skip DF conflict checks */
-#define ADD_CACHE_JUST_APPEND 8		/* Append only; tree.c::read_tree() */
+#define ADD_CACHE_JUST_APPEND 8		/* Append only */
 #define ADD_CACHE_NEW_ONLY 16		/* Do not replace existing ones */
 #define ADD_CACHE_KEEP_CACHE_TREE 32	/* Do not invalidate cache-tree */
 #define ADD_CACHE_RENORMALIZE 64        /* Pass along HASH_RENORMALIZE */
@@ -796,8 +864,8 @@ int add_file_to_index(struct index_state *, const char *path, int flags);
 int chmod_index_entry(struct index_state *, struct cache_entry *ce, char flip);
 int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
 void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);
-int index_name_is_other(const struct index_state *, const char *, int);
-void *read_blob_data_from_index(const struct index_state *, const char *, unsigned long *);
+int index_name_is_other(struct index_state *, const char *, int);
+void *read_blob_data_from_index(struct index_state *, const char *, unsigned long *);
 
 /* do stat comparison even if CE_VALID is true */
 #define CE_MATCH_IGNORE_VALID		01
@@ -840,13 +908,14 @@ int match_stat_data_racy(const struct index_state *istate,
 
 void fill_stat_cache_info(struct index_state *istate, struct cache_entry *ce, struct stat *st);
 
-#define REFRESH_REALLY		0x0001	/* ignore_valid */
-#define REFRESH_UNMERGED	0x0002	/* allow unmerged */
-#define REFRESH_QUIET		0x0004	/* be quiet about it */
-#define REFRESH_IGNORE_MISSING	0x0008	/* ignore non-existent */
-#define REFRESH_IGNORE_SUBMODULES	0x0010	/* ignore submodules */
-#define REFRESH_IN_PORCELAIN	0x0020	/* user friendly output, not "needs update" */
-#define REFRESH_PROGRESS	0x0040  /* show progress bar if stderr is tty */
+#define REFRESH_REALLY                   (1 << 0) /* ignore_valid */
+#define REFRESH_UNMERGED                 (1 << 1) /* allow unmerged */
+#define REFRESH_QUIET                    (1 << 2) /* be quiet about it */
+#define REFRESH_IGNORE_MISSING           (1 << 3) /* ignore non-existent */
+#define REFRESH_IGNORE_SUBMODULES        (1 << 4) /* ignore submodules */
+#define REFRESH_IN_PORCELAIN             (1 << 5) /* user friendly output, not "needs update" */
+#define REFRESH_PROGRESS                 (1 << 6) /* show progress bar if stderr is tty */
+#define REFRESH_IGNORE_SKIP_WORKTREE     (1 << 7) /* ignore skip_worktree entries */
 int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg);
 /*
  * Refresh the index and write it to disk.
@@ -884,8 +953,8 @@ extern int assume_unchanged;
 extern int prefer_symlink_refs;
 extern int warn_ambiguous_refs;
 extern int warn_on_object_refname_ambiguity;
-extern const char *apply_default_whitespace;
-extern const char *apply_default_ignorewhitespace;
+extern char *apply_default_whitespace;
+extern char *apply_default_ignorewhitespace;
 extern const char *git_attributes_file;
 extern const char *git_hooks_path;
 extern int zlib_compression_level;
@@ -918,12 +987,14 @@ extern char *git_replace_ref_base;
 
 extern int fsync_object_files;
 extern int core_preload_index;
-extern int core_apply_sparse_checkout;
 extern int precomposed_unicode;
 extern int protect_hfs;
 extern int protect_ntfs;
 extern const char *core_fsmonitor;
 
+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
@@ -1003,8 +1074,10 @@ struct repository_format {
 	int worktree_config;
 	int is_bare;
 	int hash_algo;
+	int sparse_index;
 	char *work_tree;
 	struct string_list unknown_extensions;
+	struct string_list v1_only_extensions;
 };
 
 /*
@@ -1018,6 +1091,7 @@ struct repository_format {
 	.is_bare = -1, \
 	.hash_algo = GIT_HASH_SHA1, \
 	.unknown_extensions = STRING_LIST_INIT_DUP, \
+	.v1_only_extensions = STRING_LIST_INIT_DUP, \
 }
 
 /*
@@ -1049,8 +1123,10 @@ int verify_repository_format(const struct repository_format *format,
  * and die if it is a version we don't understand. Generally one would
  * set_git_dir() before calling this, and use it only for "are we in a valid
  * repo?".
+ *
+ * If successful and fmt is not NULL, fill fmt with data.
  */
-void check_repository_format(void);
+void check_repository_format(struct repository_format *fmt);
 
 #define MTIME_CHANGED	0x0001
 #define CTIME_CHANGED	0x0002
@@ -1080,100 +1156,6 @@ const char *repo_find_unique_abbrev(struct repository *r, const struct object_id
 int repo_find_unique_abbrev_r(struct repository *r, char *hex, const struct object_id *oid, int len);
 #define find_unique_abbrev_r(hex, oid, len) repo_find_unique_abbrev_r(the_repository, hex, oid, len)
 
-extern const struct object_id null_oid;
-
-static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
-{
-	/*
-	 * Teach the compiler that there are only two possibilities of hash size
-	 * here, so that it can optimize for this case as much as possible.
-	 */
-	if (the_hash_algo->rawsz == GIT_MAX_RAWSZ)
-		return memcmp(sha1, sha2, GIT_MAX_RAWSZ);
-	return memcmp(sha1, sha2, GIT_SHA1_RAWSZ);
-}
-
-static inline int oidcmp(const struct object_id *oid1, const struct object_id *oid2)
-{
-	return hashcmp(oid1->hash, oid2->hash);
-}
-
-static inline int hasheq(const unsigned char *sha1, const unsigned char *sha2)
-{
-	/*
-	 * We write this here instead of deferring to hashcmp so that the
-	 * compiler can properly inline it and avoid calling memcmp.
-	 */
-	if (the_hash_algo->rawsz == GIT_MAX_RAWSZ)
-		return !memcmp(sha1, sha2, GIT_MAX_RAWSZ);
-	return !memcmp(sha1, sha2, GIT_SHA1_RAWSZ);
-}
-
-static inline int oideq(const struct object_id *oid1, const struct object_id *oid2)
-{
-	return hasheq(oid1->hash, oid2->hash);
-}
-
-static inline int is_null_oid(const struct object_id *oid)
-{
-	return oideq(oid, &null_oid);
-}
-
-static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
-{
-	memcpy(sha_dst, sha_src, the_hash_algo->rawsz);
-}
-
-static inline void oidcpy(struct object_id *dst, const struct object_id *src)
-{
-	memcpy(dst->hash, src->hash, GIT_MAX_RAWSZ);
-}
-
-static inline struct object_id *oiddup(const struct object_id *src)
-{
-	struct object_id *dst = xmalloc(sizeof(struct object_id));
-	oidcpy(dst, src);
-	return dst;
-}
-
-static inline void hashclr(unsigned char *hash)
-{
-	memset(hash, 0, the_hash_algo->rawsz);
-}
-
-static inline void oidclr(struct object_id *oid)
-{
-	memset(oid->hash, 0, GIT_MAX_RAWSZ);
-}
-
-static inline void oidread(struct object_id *oid, const unsigned char *hash)
-{
-	memcpy(oid->hash, hash, the_hash_algo->rawsz);
-}
-
-static inline int is_empty_blob_sha1(const unsigned char *sha1)
-{
-	return hasheq(sha1, the_hash_algo->empty_blob->hash);
-}
-
-static inline int is_empty_blob_oid(const struct object_id *oid)
-{
-	return oideq(oid, the_hash_algo->empty_blob);
-}
-
-static inline int is_empty_tree_sha1(const unsigned char *sha1)
-{
-	return hasheq(sha1, the_hash_algo->empty_tree->hash);
-}
-
-static inline int is_empty_tree_oid(const struct object_id *oid)
-{
-	return oideq(oid, the_hash_algo->empty_tree);
-}
-
-const char *empty_tree_oid_hex(void);
-const char *empty_blob_oid_hex(void);
-
 /* set default permissions by passing mode arguments to open(2) */
 int git_mkstemps_mode(char *pattern, int suffix_len, int mode);
 int git_mkstemp_mode(char *pattern, int mode);
@@ -1212,7 +1194,11 @@ int adjust_shared_perm(const char *path);
  * safe_create_leading_directories() temporarily changes path while it
  * is working but restores it before returning.
  * safe_create_leading_directories_const() doesn't modify path, even
- * temporarily.
+ * temporarily. Both these variants adjust the permissions of the
+ * created directories to honor core.sharedRepository, so they are best
+ * suited for files inside the git dir. For working tree files, use
+ * safe_create_leading_directories_no_share() instead, as it ignores
+ * the core.sharedRepository setting.
  */
 enum scld_error {
 	SCLD_OK = 0,
@@ -1223,6 +1209,7 @@ enum scld_error {
 };
 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
@@ -1268,7 +1255,9 @@ typedef int create_file_fn(const char *path, void *cb);
 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)
 {
@@ -1277,8 +1266,8 @@ static inline int is_absolute_path(const char *path)
 int is_directory(const char *);
 char *strbuf_realpath(struct strbuf *resolved, const char *path,
 		      int die_on_error);
-const char *real_path(const char *path);
-const char *real_path_if_valid(const char *path);
+char *strbuf_realpath_forgiving(struct strbuf *resolved, const char *path,
+				int die_on_error);
 char *real_pathdup(const char *path, int die_on_error);
 const char *absolute_path(const char *path);
 char *absolute_pathdup(const char *path);
@@ -1298,6 +1287,7 @@ int is_ntfs_dotgit(const char *name);
 int is_ntfs_dotgitmodules(const char *name);
 int is_ntfs_dotgitignore(const char *name);
 int is_ntfs_dotgitattributes(const char *name);
+int is_ntfs_dotmailmap(const char *name);
 
 /*
  * Returns true iff "str" could be confused as a command-line option when
@@ -1326,7 +1316,8 @@ int git_open_cloexec(const char *name, int flags);
 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);
 
-int check_object_signature(const struct object_id *oid, void *buf, unsigned long size, const char *type);
+int check_object_signature(struct repository *r, const struct object_id *oid,
+			   void *buf, unsigned long size, const char *type);
 
 int finalize_object_file(const char *tmpfile, const char *filename);
 
@@ -1405,6 +1396,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);
@@ -1443,6 +1435,9 @@ int set_disambiguate_hint_config(const char *var, const char *value);
 int get_sha1_hex(const char *hex, unsigned char *sha1);
 int get_oid_hex(const char *hex, struct object_id *sha1);
 
+/* Like get_oid_hex, but for an arbitrary hash algorithm. */
+int get_oid_hex_algop(const char *hex, struct object_id *oid, const struct git_hash_algo *algop);
+
 /*
  * Read `len` pairs of hexadecimal digits from `hex` and write the
  * values to `binary` as `len` bytes. Return 0 on success, or -1 if
@@ -1451,7 +1446,8 @@ int get_oid_hex(const char *hex, struct object_id *sha1);
 int hex_to_bytes(unsigned char *binary, const char *hex, size_t len);
 
 /*
- * Convert a binary hash to its hex equivalent. The `_r` variant is reentrant,
+ * Convert a binary hash in "unsigned char []" or an object name in
+ * "struct object_id *" to its hex equivalent. The `_r` variant is reentrant,
  * and writes the NUL-terminated output to the buffer `out`, which must be at
  * least `GIT_MAX_HEXSZ + 1` bytes, and returns a pointer to out for
  * convenience.
@@ -1459,13 +1455,12 @@ int hex_to_bytes(unsigned char *binary, const char *hex, size_t len);
  * The non-`_r` variant returns a static buffer, but uses a ring of 4
  * buffers, making it safe to make multiple calls for a single statement, like:
  *
- *   printf("%s -> %s", sha1_to_hex(one), sha1_to_hex(two));
+ *   printf("%s -> %s", hash_to_hex(one), hash_to_hex(two));
+ *   printf("%s -> %s", oid_to_hex(one), oid_to_hex(two));
  */
 char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash, const struct git_hash_algo *);
-char *sha1_to_hex_r(char *out, const unsigned char *sha1);
 char *oid_to_hex_r(char *out, const struct object_id *oid);
 char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *);	/* static buffer result! */
-char *sha1_to_hex(const unsigned char *sha1);						/* same static buffer */
 char *hash_to_hex(const unsigned char *hash);						/* same static buffer */
 char *oid_to_hex(const struct object_id *oid);						/* same static buffer */
 
@@ -1478,6 +1473,20 @@ char *oid_to_hex(const struct object_id *oid);						/* same static buffer */
  */
 int parse_oid_hex(const char *hex, struct object_id *oid, const char **end);
 
+/* Like parse_oid_hex, but for an arbitrary hash algorithm. */
+int parse_oid_hex_algop(const char *hex, struct object_id *oid, const char **end,
+			const struct git_hash_algo *algo);
+
+
+/*
+ * These functions work like get_oid_hex and parse_oid_hex, but they will parse
+ * a hex value for any algorithm. The algorithm is detected based on the length
+ * and the algorithm in use is returned. If this is not a hex object ID in any
+ * algorithm, returns GIT_HASH_UNKNOWN.
+ */
+int get_oid_hex_any(const char *hex, struct object_id *oid);
+int parse_oid_hex_any(const char *hex, struct object_id *oid, const char **end);
+
 /*
  * This reads short-hand syntax that not only evaluates to a commit
  * object name, but also can act as if the end user spelled the name
@@ -1498,21 +1507,32 @@ int parse_oid_hex(const char *hex, struct object_id *oid, const char **end);
  *
  * If the input was ok but there are not N branch switches in the
  * reflog, it returns 0.
- *
- * If "allowed" is non-zero, it is a treated as a bitfield of allowable
- * expansions: local branches ("refs/heads/"), remote branches
- * ("refs/remotes/"), or "HEAD". If no "allowed" bits are set, any expansion is
- * allowed, even ones to refs outside of those namespaces.
  */
 #define INTERPRET_BRANCH_LOCAL (1<<0)
 #define INTERPRET_BRANCH_REMOTE (1<<1)
 #define INTERPRET_BRANCH_HEAD (1<<2)
+struct interpret_branch_name_options {
+	/*
+	 * If "allowed" is non-zero, it is a treated as a bitfield of allowable
+	 * expansions: local branches ("refs/heads/"), remote branches
+	 * ("refs/remotes/"), or "HEAD". If no "allowed" bits are set, any expansion is
+	 * allowed, even ones to refs outside of those namespaces.
+	 */
+	unsigned allowed;
+
+	/*
+	 * If ^{upstream} or ^{push} (or equivalent) is requested, and the
+	 * branch in question does not have such a reference, return -1 instead
+	 * of die()-ing.
+	 */
+	unsigned nonfatal_dangling_mark : 1;
+};
 int repo_interpret_branch_name(struct repository *r,
 			       const char *str, int len,
 			       struct strbuf *buf,
-			       unsigned allowed);
-#define interpret_branch_name(str, len, buf, allowed) \
-	repo_interpret_branch_name(the_repository, str, len, buf, allowed)
+			       const struct interpret_branch_name_options *options);
+#define interpret_branch_name(str, len, buf, options) \
+	repo_interpret_branch_name(the_repository, str, len, buf, options)
 
 int validate_headref(const char *ref);
 
@@ -1636,29 +1656,6 @@ const char *show_ident_date(const struct ident_split *id,
  */
 int ident_cmp(const struct ident_split *, const struct ident_split *);
 
-struct checkout {
-	struct index_state *istate;
-	const char *base_dir;
-	int base_dir_len;
-	struct delayed_checkout *delayed_checkout;
-	unsigned force:1,
-		 quiet:1,
-		 not_new:1,
-		 clone:1,
-		 refresh_cache:1;
-};
-#define CHECKOUT_INIT { NULL, "" }
-
-#define TEMPORARY_FILENAME_LENGTH 25
-int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath, int *nr_checkouts);
-void enable_delayed_checkout(struct checkout *state);
-int finish_delayed_checkout(struct checkout *state, int *nr_checkouts);
-/*
- * Unlink the last component and schedule the leading directories for
- * removal, such that empty directories get removed.
- */
-void unlink_entry(const struct cache_entry *ce);
-
 struct cache_def {
 	struct strbuf path;
 	int flags;
@@ -1673,8 +1670,9 @@ static inline void cache_def_clear(struct cache_def *cache)
 
 int has_symlink_leading_path(const char *name, int len);
 int threaded_has_symlink_leading_path(struct cache_def *, const char *, int);
-int check_leading_path(const char *name, int len);
+int check_leading_path(const char *name, int len, int warn_on_lstat_err);
 int has_dirs_only_path(const char *name, int len, int prefix_len);
+void invalidate_lstat_cache(void);
 void schedule_dir_for_removal(const char *name, int len);
 void remove_scheduled_dirs(void);
 
@@ -1889,7 +1887,6 @@ int stat_validity_check(struct stat_validity *sv, const char *path);
 void stat_validity_update(struct stat_validity *sv, int fd);
 
 int versioncmp(const char *s1, const char *s2);
-void sleep_millisec(int millisec);
 
 /*
  * Create a directory and (if share is nonzero) adjust its permissions
diff --git a/cbtree.c b/cbtree.c
new file mode 100644
index 0000000000..b0c65d810f
--- /dev/null
+++ b/cbtree.c
@@ -0,0 +1,167 @@
+/*
+ * 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;
+}
+
+struct cb_node *cb_unlink(struct cb_tree *t, const uint8_t *k, size_t klen)
+{
+	struct cb_node **wherep = &t->root;
+	struct cb_node **whereq = NULL;
+	struct cb_node *q = NULL;
+	size_t direction = 0;
+	uint8_t c;
+	struct cb_node *p = t->root;
+
+	if (!p) return NULL;	/* empty tree, nothing to delete */
+
+	/* traverse to find best match, keeping link to parent */
+	while (1 & (uintptr_t)p) {
+		whereq = wherep;
+		q = cb_node_of(p);
+		c = q->byte < klen ? k[q->byte] : 0;
+		direction = (1 + (q->otherbits | c)) >> 8;
+		wherep = q->child + direction;
+		p = *wherep;
+	}
+
+	if (memcmp(p->k, k, klen))
+		return NULL;		/* no match, nothing unlinked */
+
+	/* found an exact match */
+	if (whereq)	/* update parent */
+		*whereq = q->child[1 - direction];
+	else
+		t->root = NULL;
+	return p;
+}
+
+static enum cb_next cb_descend(struct cb_node *p, cb_iter fn, void *arg)
+{
+	if (1 & (uintptr_t)p) {
+		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..a04a312c3f
--- /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 { .root = NULL }
+
+static inline void cb_init(struct cb_tree *t)
+{
+	t->root = NULL;
+}
+
+struct cb_node *cb_lookup(struct cb_tree *, const uint8_t *k, size_t klen);
+struct cb_node *cb_insert(struct cb_tree *, struct cb_node *, size_t klen);
+struct cb_node *cb_unlink(struct cb_tree *t, const uint8_t *k, size_t klen);
+
+typedef enum cb_next (*cb_iter)(struct cb_node *, void *arg);
+
+void cb_each(struct cb_tree *, const uint8_t *kpfx, size_t klen,
+		cb_iter, void *arg);
+
+#endif /* CBTREE_H */
diff --git a/checkout.c b/checkout.c
index c72e9f9773..6586e30ca5 100644
--- a/checkout.c
+++ b/checkout.c
@@ -47,7 +47,7 @@ const char *unique_tracking_name(const char *name, struct object_id *oid,
 {
 	struct tracking_name_data cb_data = TRACKING_NAME_DATA_INIT;
 	const char *default_remote = NULL;
-	if (!git_config_get_string_const("checkout.defaultremote", &default_remote))
+	if (!git_config_get_string_tmp("checkout.defaultremote", &default_remote))
 		cb_data.default_remote = default_remote;
 	cb_data.src_ref = xstrfmt("refs/heads/%s", name);
 	cb_data.dst_oid = oid;
@@ -55,7 +55,6 @@ const char *unique_tracking_name(const char *name, struct object_id *oid,
 	if (dwim_remotes_matched)
 		*dwim_remotes_matched = cb_data.num_matches;
 	free(cb_data.src_ref);
-	free((char *)default_remote);
 	if (cb_data.num_matches == 1) {
 		free(cb_data.default_dst_ref);
 		free(cb_data.default_dst_oid);
diff --git a/chunk-format.c b/chunk-format.c
new file mode 100644
index 0000000000..1c3dca62e2
--- /dev/null
+++ b/chunk-format.c
@@ -0,0 +1,183 @@
+#include "cache.h"
+#include "chunk-format.h"
+#include "csum-file.h"
+
+/*
+ * When writing a chunk-based file format, collect the chunks in
+ * an array of chunk_info structs. The size stores the _expected_
+ * amount of data that will be written by write_fn.
+ */
+struct chunk_info {
+	uint32_t id;
+	uint64_t size;
+	chunk_write_fn write_fn;
+
+	const void *start;
+};
+
+struct chunkfile {
+	struct hashfile *f;
+
+	struct chunk_info *chunks;
+	size_t chunks_nr;
+	size_t chunks_alloc;
+};
+
+struct chunkfile *init_chunkfile(struct hashfile *f)
+{
+	struct chunkfile *cf = xcalloc(1, sizeof(*cf));
+	cf->f = f;
+	return cf;
+}
+
+void free_chunkfile(struct chunkfile *cf)
+{
+	if (!cf)
+		return;
+	free(cf->chunks);
+	free(cf);
+}
+
+int get_num_chunks(struct chunkfile *cf)
+{
+	return cf->chunks_nr;
+}
+
+void add_chunk(struct chunkfile *cf,
+	       uint32_t id,
+	       size_t size,
+	       chunk_write_fn fn)
+{
+	ALLOC_GROW(cf->chunks, cf->chunks_nr + 1, cf->chunks_alloc);
+
+	cf->chunks[cf->chunks_nr].id = id;
+	cf->chunks[cf->chunks_nr].write_fn = fn;
+	cf->chunks[cf->chunks_nr].size = size;
+	cf->chunks_nr++;
+}
+
+int write_chunkfile(struct chunkfile *cf, void *data)
+{
+	int i, result = 0;
+	uint64_t cur_offset = hashfile_total(cf->f);
+
+	trace2_region_enter("chunkfile", "write", the_repository);
+
+	/* Add the table of contents to the current offset */
+	cur_offset += (cf->chunks_nr + 1) * CHUNK_TOC_ENTRY_SIZE;
+
+	for (i = 0; i < cf->chunks_nr; i++) {
+		hashwrite_be32(cf->f, cf->chunks[i].id);
+		hashwrite_be64(cf->f, cur_offset);
+
+		cur_offset += cf->chunks[i].size;
+	}
+
+	/* Trailing entry marks the end of the chunks */
+	hashwrite_be32(cf->f, 0);
+	hashwrite_be64(cf->f, cur_offset);
+
+	for (i = 0; i < cf->chunks_nr; i++) {
+		off_t start_offset = hashfile_total(cf->f);
+		result = cf->chunks[i].write_fn(cf->f, data);
+
+		if (result)
+			goto cleanup;
+
+		if (hashfile_total(cf->f) - start_offset != cf->chunks[i].size)
+			BUG("expected to write %"PRId64" bytes to chunk %"PRIx32", but wrote %"PRId64" instead",
+			    cf->chunks[i].size, cf->chunks[i].id,
+			    hashfile_total(cf->f) - start_offset);
+	}
+
+cleanup:
+	trace2_region_leave("chunkfile", "write", the_repository);
+	return result;
+}
+
+int read_table_of_contents(struct chunkfile *cf,
+			   const unsigned char *mfile,
+			   size_t mfile_size,
+			   uint64_t toc_offset,
+			   int toc_length)
+{
+	int i;
+	uint32_t chunk_id;
+	const unsigned char *table_of_contents = mfile + toc_offset;
+
+	ALLOC_GROW(cf->chunks, toc_length, cf->chunks_alloc);
+
+	while (toc_length--) {
+		uint64_t chunk_offset, next_chunk_offset;
+
+		chunk_id = get_be32(table_of_contents);
+		chunk_offset = get_be64(table_of_contents + 4);
+
+		if (!chunk_id) {
+			error(_("terminating chunk id appears earlier than expected"));
+			return 1;
+		}
+
+		table_of_contents += CHUNK_TOC_ENTRY_SIZE;
+		next_chunk_offset = get_be64(table_of_contents + 4);
+
+		if (next_chunk_offset < chunk_offset ||
+		    next_chunk_offset > mfile_size - the_hash_algo->rawsz) {
+			error(_("improper chunk offset(s) %"PRIx64" and %"PRIx64""),
+			      chunk_offset, next_chunk_offset);
+			return -1;
+		}
+
+		for (i = 0; i < cf->chunks_nr; i++) {
+			if (cf->chunks[i].id == chunk_id) {
+				error(_("duplicate chunk ID %"PRIx32" found"),
+					chunk_id);
+				return -1;
+			}
+		}
+
+		cf->chunks[cf->chunks_nr].id = chunk_id;
+		cf->chunks[cf->chunks_nr].start = mfile + chunk_offset;
+		cf->chunks[cf->chunks_nr].size = next_chunk_offset - chunk_offset;
+		cf->chunks_nr++;
+	}
+
+	chunk_id = get_be32(table_of_contents);
+	if (chunk_id) {
+		error(_("final chunk has non-zero id %"PRIx32""), chunk_id);
+		return -1;
+	}
+
+	return 0;
+}
+
+static int pair_chunk_fn(const unsigned char *chunk_start,
+			 size_t chunk_size,
+			 void *data)
+{
+	const unsigned char **p = data;
+	*p = chunk_start;
+	return 0;
+}
+
+int pair_chunk(struct chunkfile *cf,
+	       uint32_t chunk_id,
+	       const unsigned char **p)
+{
+	return read_chunk(cf, chunk_id, pair_chunk_fn, p);
+}
+
+int read_chunk(struct chunkfile *cf,
+	       uint32_t chunk_id,
+	       chunk_read_fn fn,
+	       void *data)
+{
+	int i;
+
+	for (i = 0; i < cf->chunks_nr; i++) {
+		if (cf->chunks[i].id == chunk_id)
+			return fn(cf->chunks[i].start, cf->chunks[i].size, data);
+	}
+
+	return CHUNK_NOT_FOUND;
+}
diff --git a/chunk-format.h b/chunk-format.h
new file mode 100644
index 0000000000..9ccbe00377
--- /dev/null
+++ b/chunk-format.h
@@ -0,0 +1,68 @@
+#ifndef CHUNK_FORMAT_H
+#define CHUNK_FORMAT_H
+
+#include "git-compat-util.h"
+
+struct hashfile;
+struct chunkfile;
+
+#define CHUNK_TOC_ENTRY_SIZE (sizeof(uint32_t) + sizeof(uint64_t))
+
+/*
+ * Initialize a 'struct chunkfile' for writing _or_ reading a file
+ * with the chunk format.
+ *
+ * If writing a file, supply a non-NULL 'struct hashfile *' that will
+ * be used to write.
+ *
+ * If reading a file, use a NULL 'struct hashfile *' and then call
+ * read_table_of_contents(). Supply the memory-mapped data to the
+ * pair_chunk() or read_chunk() methods, as appropriate.
+ *
+ * DO NOT MIX THESE MODES. Use different 'struct chunkfile' instances
+ * for reading and writing.
+ */
+struct chunkfile *init_chunkfile(struct hashfile *f);
+void free_chunkfile(struct chunkfile *cf);
+int get_num_chunks(struct chunkfile *cf);
+typedef int (*chunk_write_fn)(struct hashfile *f, void *data);
+void add_chunk(struct chunkfile *cf,
+	       uint32_t id,
+	       size_t size,
+	       chunk_write_fn fn);
+int write_chunkfile(struct chunkfile *cf, void *data);
+
+int read_table_of_contents(struct chunkfile *cf,
+			   const unsigned char *mfile,
+			   size_t mfile_size,
+			   uint64_t toc_offset,
+			   int toc_length);
+
+#define CHUNK_NOT_FOUND (-2)
+
+/*
+ * Find 'chunk_id' in the given chunkfile and assign the
+ * given pointer to the position in the mmap'd file where
+ * that chunk begins.
+ *
+ * Returns CHUNK_NOT_FOUND if the chunk does not exist.
+ */
+int pair_chunk(struct chunkfile *cf,
+	       uint32_t chunk_id,
+	       const unsigned char **p);
+
+typedef int (*chunk_read_fn)(const unsigned char *chunk_start,
+			     size_t chunk_size, void *data);
+/*
+ * Find 'chunk_id' in the given chunkfile and call the
+ * given chunk_read_fn method with the information for
+ * that chunk.
+ *
+ * Returns CHUNK_NOT_FOUND if the chunk does not exist.
+ */
+int read_chunk(struct chunkfile *cf,
+	       uint32_t chunk_id,
+	       chunk_read_fn fn,
+	       void *data);
+
+#endif
diff --git a/ci/config/allow-ref.sample b/ci/config/allow-ref.sample
new file mode 100755
index 0000000000..af0e076f8a
--- /dev/null
+++ b/ci/config/allow-ref.sample
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# Sample script for enabling/disabling GitHub Actions CI runs on
+# particular refs. By default, CI is run for all branches pushed to
+# GitHub. You can override this by dropping the ".sample" from the script,
+# editing it, committing, and pushing the result to the "ci-config" branch of
+# your repository:
+#
+#   git checkout -b ci-config
+#   cp allow-ref.sample allow-ref
+#   $EDITOR allow-ref
+#   git add allow-ref
+#   git commit -am "implement my ci preferences"
+#   git push
+#
+# This script will then be run when any refs are pushed to that repository. It
+# gets the fully qualified refname as the first argument, and should exit with
+# success only for refs for which you want to run CI.
+
+case "$1" in
+# allow one-off tests by pushing to "for-ci" or "for-ci/mybranch"
+refs/heads/for-ci*) true ;;
+# always build your integration branch
+refs/heads/my-integration-branch) true ;;
+# don't build any other branches or tags
+*) false ;;
+esac
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index 4e64a19112..5772081b6e 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -7,12 +7,16 @@
 
 P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
 LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
+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"
 	sudo apt-get -q update
-	sudo apt-get -q -y install language-pack-is libsvn-perl apache2
+	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
@@ -40,30 +44,42 @@ osx-clang|osx-gcc)
 	test -z "$BREW_INSTALL_PACKAGES" ||
 	brew install $BREW_INSTALL_PACKAGES
 	brew link --force gettext
-	brew cask install perforce || {
+	brew install --cask --no-quarantine perforce || {
 		# Update the definitions and try again
-		git -C "$(brew --repository)"/Library/Taps/homebrew/homebrew-cask pull &&
-		brew cask install perforce
+		cask_repo="$(brew --repository)"/Library/Taps/homebrew/homebrew-cask &&
+		git -C "$cask_repo" pull --no-stat --ff-only &&
+		brew install --cask --no-quarantine perforce
 	} ||
-	brew install caskroom/cask/perforce
+	brew install homebrew/cask/perforce
 	case "$jobname" in
 	osx-gcc)
-		brew link gcc ||
-		brew link gcc@8
+		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
 	;;
 StaticAnalysis)
 	sudo apt-get -q update
 	sudo apt-get -q -y install coccinelle libcurl4-openssl-dev libssl-dev \
-		libexpat-dev gettext
+		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
+	sudo apt-get -q -y install asciidoc xmlto docbook-xsl-ns make
 
 	test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
-	gem install --version 1.5.8 asciidoctor
+	sudo gem install --version 1.5.8 asciidoctor
+	;;
+linux-gcc-default|linux-gcc-4.8)
+	sudo apt-get -q update
+	sudo apt-get -q -y install $UBUNTU_COMMON_PKGS
 	;;
 esac
 
diff --git a/ci/install-docker-dependencies.sh b/ci/install-docker-dependencies.sh
new file mode 100755
index 0000000000..26a6689766
--- /dev/null
+++ b/ci/install-docker-dependencies.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+#
+# Install dependencies required to build and test Git inside container
+#
+
+case "$jobname" in
+Linux32)
+	linux32 --32bit i386 sh -c '
+		apt update >/dev/null &&
+		apt install -y build-essential libcurl4-openssl-dev \
+			libssl-dev libexpat-dev gettext python >/dev/null
+	'
+	;;
+linux-musl)
+	apk add --update build-base curl-dev openssl-dev expat-dev gettext \
+		pcre2-dev python3 musl-libintl perl-utils ncurses >/dev/null
+	;;
+esac
diff --git a/ci/lib.sh b/ci/lib.sh
index c8c2c38155..476c3f369f 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
+	if test "$TRAVIS_DEBUG_MODE" = true || test true = "$GITHUB_ACTIONS"
 	then
 		return
 	fi
@@ -79,6 +79,9 @@ check_unignored_build_artifacts ()
 	}
 }
 
+# GitHub Action doesn't set TERM, which is required by tput
+export TERM=${TERM:-dumb}
+
 # Clear MAKEFLAGS that may come from the outside world.
 export MAKEFLAGS=
 
@@ -131,14 +134,33 @@ then
 		echo "$SYSTEM_TASKDEFINITIONSURI$SYSTEM_TEAMPROJECT/_build/results?buildId=$1"
 	}
 
-	BREW_INSTALL_PACKAGES=gcc@8
 	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"
 	test windows_nt != "$CI_OS_NAME" ||
 	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
+elif test true = "$GITHUB_ACTIONS"
+then
+	CI_TYPE=github-actions
+	CI_BRANCH="$GITHUB_REF"
+	CI_COMMIT="$GITHUB_SHA"
+	CI_OS_NAME="$(echo "$RUNNER_OS" | tr A-Z a-z)"
+	test macos != "$CI_OS_NAME" || CI_OS_NAME=osx
+	CI_REPO_SLUG="$GITHUB_REPOSITORY"
+	CI_JOB_ID="$GITHUB_RUN_ID"
+	CC="${CC:-gcc}"
+	DONT_SKIP_TAGS=t
+
+	cache_dir="$HOME/none"
+
+	export GIT_PROVE_OPTS="--timer --jobs 10"
+	export GIT_TEST_OPTS="--verbose-log -x"
+	MAKEFLAGS="$MAKEFLAGS --jobs=10"
+	test windows != "$CI_OS_NAME" ||
+	GIT_TEST_OPTS="--no-chain-lint --no-bin-wrappers $GIT_TEST_OPTS"
 else
 	echo "Could not identify CI type" >&2
+	env >&2
 	exit 1
 fi
 
@@ -146,6 +168,7 @@ good_trees_file="$cache_dir/good-trees"
 
 mkdir -p "$cache_dir"
 
+test -n "${DONT_SKIP_TAGS-}" ||
 skip_branch_tip_with_tag
 skip_good_tree
 
@@ -156,13 +179,17 @@ fi
 
 export DEVELOPER=1
 export DEFAULT_TEST_TARGET=prove
-export GIT_TEST_CLONE_2GB=YesPlease
+export GIT_TEST_CLONE_2GB=true
+export SKIP_DASHED_BUILT_INS=YesPlease
 
 case "$jobname" in
 linux-clang|linux-gcc)
 	if [ "$jobname" = linux-gcc ]
 	then
 		export CC=gcc-8
+		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3"
+	else
+		MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python2"
 	fi
 
 	export GIT_TEST_HTTPD=true
@@ -182,7 +209,10 @@ linux-clang|linux-gcc)
 osx-clang|osx-gcc)
 	if [ "$jobname" = osx-gcc ]
 	then
-		export CC=gcc-8
+		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
@@ -190,8 +220,16 @@ osx-clang|osx-gcc)
 	# Travis CI OS X
 	export GIT_SKIP_TESTS="t9810 t9816"
 	;;
-GIT_TEST_GETTEXT_POISON)
-	export GIT_TEST_GETTEXT_POISON=true
+linux-gcc-default)
+	;;
+Linux32)
+	CC=gcc
+	;;
+linux-musl)
+	CC=gcc
+	MAKEFLAGS="$MAKEFLAGS PYTHON_PATH=/usr/bin/python3 USE_LIBPCRE2=Yes"
+	MAKEFLAGS="$MAKEFLAGS NO_REGEX=Yes ICONV_OMITS_BOM=Yes"
+	MAKEFLAGS="$MAKEFLAGS GIT_TEST_UTF8_LOCALE=C.UTF-8"
 	;;
 esac
 
diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh
index e688a26f0d..c70d6cdbf2 100755
--- a/ci/print-test-failures.sh
+++ b/ci/print-test-failures.sh
@@ -46,6 +46,13 @@ do
 			mv "$trash_dir" failed-test-artifacts
 			continue
 			;;
+		github-actions)
+			mkdir -p failed-test-artifacts
+			echo "FAILED_TEST_ARTIFACTS=t/failed-test-artifacts" >>$GITHUB_ENV
+			cp "${TEST_EXIT%.exit}.out" failed-test-artifacts/
+			tar czf failed-test-artifacts/"$test_name".trash.tar.gz "$trash_dir"
+			continue
+			;;
 		*)
 			echo "Unhandled CI type: $CI_TYPE" >&2
 			exit 1
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
index ff0ef7f08e..3ce81ffee9 100755
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@ -13,13 +13,26 @@ esac
 make
 case "$jobname" in
 linux-gcc)
+	export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
 	make test
 	export GIT_TEST_SPLIT_INDEX=yes
+	export GIT_TEST_MERGE_ALGORITHM=recursive
 	export GIT_TEST_FULL_IN_PACK_ARRAY=true
 	export GIT_TEST_OE_SIZE=10
 	export GIT_TEST_OE_DELTA_SIZE=5
 	export GIT_TEST_COMMIT_GRAPH=1
+	export GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=1
 	export GIT_TEST_MULTI_PACK_INDEX=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
+	export GIT_TEST_DEFAULT_HASH=sha256
 	make test
 	;;
 linux-gcc-4.8)
diff --git a/ci/run-linux32-build.sh b/ci/run-docker-build.sh
index e3a193adbc..8d47a5fda3 100755
--- a/ci/run-linux32-build.sh
+++ b/ci/run-docker-build.sh
@@ -1,25 +1,33 @@
 #!/bin/sh
 #
-# Build and test Git in a 32-bit environment
+# Build and test Git inside container
 #
 # Usage:
-#   run-linux32-build.sh <host-user-id>
+#   run-docker-build.sh <host-user-id>
 #
 
 set -ex
 
 if test $# -ne 1 || test -z "$1"
 then
-	echo >&2 "usage: run-linux32-build.sh <host-user-id>"
+	echo >&2 "usage: run-docker-build.sh <host-user-id>"
 	exit 1
 fi
 
-# Update packages to the latest available versions
-linux32 --32bit i386 sh -c '
-    apt update >/dev/null &&
-    apt install -y build-essential libcurl4-openssl-dev libssl-dev \
-	libexpat-dev gettext python >/dev/null
-'
+case "$jobname" in
+Linux32)
+	switch_cmd="linux32 --32bit i386"
+	;;
+linux-musl)
+	switch_cmd=
+	useradd () { adduser -D "$@"; }
+	;;
+*)
+	exit 1
+	;;
+esac
+
+"${0%/*}/install-docker-dependencies.sh"
 
 # If this script runs inside a docker container, then all commands are
 # usually executed as root. Consequently, the host user might not be
@@ -51,10 +59,17 @@ else
 fi
 
 # Build and test
-linux32 --32bit i386 su -m -l $CI_USER -c '
+command $switch_cmd su -m -l $CI_USER -c "
 	set -ex
+	export DEVELOPER='$DEVELOPER'
+	export DEFAULT_TEST_TARGET='$DEFAULT_TEST_TARGET'
+	export GIT_PROVE_OPTS='$GIT_PROVE_OPTS'
+	export GIT_TEST_OPTS='$GIT_TEST_OPTS'
+	export GIT_TEST_CLONE_2GB='$GIT_TEST_CLONE_2GB'
+	export MAKEFLAGS='$MAKEFLAGS'
+	export cache_dir='$cache_dir'
 	cd /usr/src/git
-	test -n "$cache_dir" && ln -s "$cache_dir/.prove" t/.prove
+	test -n '$cache_dir' && ln -s '$cache_dir/.prove' t/.prove
 	make
 	make test
-'
+"
diff --git a/ci/run-docker.sh b/ci/run-docker.sh
new file mode 100755
index 0000000000..37fa372052
--- /dev/null
+++ b/ci/run-docker.sh
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# Download and run Docker image to build and test Git
+#
+
+. ${0%/*}/lib.sh
+
+case "$jobname" in
+Linux32)
+	CI_CONTAINER="daald/ubuntu32:xenial"
+	;;
+linux-musl)
+	CI_CONTAINER=alpine
+	;;
+*)
+	exit 1
+	;;
+esac
+
+docker pull "$CI_CONTAINER"
+
+# Use the following command to debug the docker build locally:
+# <host-user-id> must be 0 if podman is used as drop-in replacement for docker
+# $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/sh "$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
+
+docker run \
+	--interactive \
+	--env DEVELOPER \
+	--env DEFAULT_TEST_TARGET \
+	--env GIT_PROVE_OPTS \
+	--env GIT_TEST_OPTS \
+	--env GIT_TEST_CLONE_2GB \
+	--env MAKEFLAGS \
+	--env jobname \
+	--env cache_dir="$container_cache_dir" \
+	--volume "${PWD}:/usr/src/git" \
+	--volume "$cache_dir:$container_cache_dir" \
+	"$CI_CONTAINER" \
+	/usr/src/git/ci/run-docker-build.sh $(id -u $USER)
+
+check_unignored_build_artifacts
+
+save_good_tree
diff --git a/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh
deleted file mode 100755
index 751acfcf8a..0000000000
--- a/ci/run-linux32-docker.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-#
-# Download and run Docker image to build and test 32-bit Git
-#
-
-. ${0%/*}/lib.sh
-
-docker pull daald/ubuntu32:xenial
-
-# Use the following command to debug the docker build locally:
-# $ docker run -itv "${PWD}:/usr/src/git" --entrypoint /bin/bash daald/ubuntu32:xenial
-# root@container:/# /usr/src/git/ci/run-linux32-build.sh <host-user-id>
-
-container_cache_dir=/tmp/travis-cache
-
-docker run \
-	--interactive \
-	--env DEVELOPER \
-	--env DEFAULT_TEST_TARGET \
-	--env GIT_PROVE_OPTS \
-	--env GIT_TEST_OPTS \
-	--env GIT_TEST_CLONE_2GB \
-	--env cache_dir="$container_cache_dir" \
-	--volume "${PWD}:/usr/src/git" \
-	--volume "$cache_dir:$container_cache_dir" \
-	daald/ubuntu32:xenial \
-	/usr/src/git/ci/run-linux32-build.sh $(id -u $USER)
-
-check_unignored_build_artifacts
-
-save_good_tree
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh
index b3e76ef863..de41888430 100755
--- a/ci/test-documentation.sh
+++ b/ci/test-documentation.sh
@@ -7,6 +7,7 @@
 
 filter_log () {
 	sed -e '/^GIT_VERSION = /d' \
+	    -e "/constant Gem::ConfigMap is deprecated/d" \
 	    -e '/^    \* new asciidoc flags$/d' \
 	    -e '/stripped namespace before processing/d' \
 	    -e '/Attributed.*IDs for element/d' \
diff --git a/color.c b/color.c
index ebb222ec33..64f52a4f93 100644
--- a/color.c
+++ b/color.c
@@ -24,6 +24,14 @@ const char *column_colors_ansi[] = {
 	GIT_COLOR_RESET,
 };
 
+enum {
+	COLOR_BACKGROUND_OFFSET = 10,
+	COLOR_FOREGROUND_ANSI = 30,
+	COLOR_FOREGROUND_RGB = 38,
+	COLOR_FOREGROUND_256 = 38,
+	COLOR_FOREGROUND_BRIGHT_ANSI = 90,
+};
+
 /* Ignore the RESET at the end when giving the size */
 const int column_colors_ansi_max = ARRAY_SIZE(column_colors_ansi) - 1;
 
@@ -61,15 +69,38 @@ static int get_hex_color(const char *in, unsigned char *out)
 	return 0;
 }
 
-static int parse_color(struct color *out, const char *name, int len)
+/*
+ * If an ANSI color is recognized in "name", fill "out" and return 0.
+ * Otherwise, leave out unchanged and return -1.
+ */
+static int parse_ansi_color(struct color *out, const char *name, int len)
 {
 	/* Positions in array must match ANSI color codes */
 	static const char * const color_names[] = {
 		"black", "red", "green", "yellow",
 		"blue", "magenta", "cyan", "white"
 	};
-	char *end;
 	int i;
+	int color_offset = COLOR_FOREGROUND_ANSI;
+
+	if (strncasecmp(name, "bright", 6) == 0) {
+		color_offset = COLOR_FOREGROUND_BRIGHT_ANSI;
+		name += 6;
+		len -= 6;
+	}
+	for (i = 0; i < ARRAY_SIZE(color_names); i++) {
+		if (match_word(name, len, color_names[i])) {
+			out->type = COLOR_ANSI;
+			out->value = i + color_offset;
+			return 0;
+		}
+	}
+	return -1;
+}
+
+static int parse_color(struct color *out, const char *name, int len)
+{
+	char *end;
 	long val;
 
 	/* First try the special word "normal"... */
@@ -89,12 +120,8 @@ static int parse_color(struct color *out, const char *name, int len)
 	}
 
 	/* Then pick from our human-readable color names... */
-	for (i = 0; i < ARRAY_SIZE(color_names); i++) {
-		if (match_word(name, len, color_names[i])) {
-			out->type = COLOR_ANSI;
-			out->value = i;
-			return 0;
-		}
+	if (parse_ansi_color(out, name, len) == 0) {
+		return 0;
 	}
 
 	/* And finally try a literal 256-color-mode number */
@@ -109,10 +136,15 @@ static int parse_color(struct color *out, const char *name, int len)
 		else if (val < 0) {
 			out->type = COLOR_NORMAL;
 			return 0;
-		/* Rewrite low numbers as more-portable standard colors. */
+		/* Rewrite 0-7 as more-portable standard colors. */
 		} else if (val < 8) {
 			out->type = COLOR_ANSI;
-			out->value = val;
+			out->value = val + COLOR_FOREGROUND_ANSI;
+			return 0;
+		/* Rewrite 8-15 as more-portable aixterm colors. */
+		} else if (val < 16) {
+			out->type = COLOR_ANSI;
+			out->value = val - 8 + COLOR_FOREGROUND_BRIGHT_ANSI;
 			return 0;
 		} else if (val < 256) {
 			out->type = COLOR_256;
@@ -166,23 +198,26 @@ int color_parse(const char *value, char *dst)
  * already have the ANSI escape code in it. "out" should have enough
  * space in it to fit any color.
  */
-static char *color_output(char *out, int len, const struct color *c, char type)
+static char *color_output(char *out, int len, const struct color *c, int background)
 {
+	int offset = 0;
+
+	if (background)
+		offset = COLOR_BACKGROUND_OFFSET;
 	switch (c->type) {
 	case COLOR_UNSPECIFIED:
 	case COLOR_NORMAL:
 		break;
 	case COLOR_ANSI:
-		if (len < 2)
-			BUG("color parsing ran out of space");
-		*out++ = type;
-		*out++ = '0' + c->value;
+		out += xsnprintf(out, len, "%d", c->value + offset);
 		break;
 	case COLOR_256:
-		out += xsnprintf(out, len, "%c8;5;%d", type, c->value);
+		out += xsnprintf(out, len, "%d;5;%d", COLOR_FOREGROUND_256 + offset,
+				 c->value);
 		break;
 	case COLOR_RGB:
-		out += xsnprintf(out, len, "%c8;2;%d;%d;%d", type,
+		out += xsnprintf(out, len, "%d;2;%d;%d;%d",
+				 COLOR_FOREGROUND_RGB + offset,
 				 c->red, c->green, c->blue);
 		break;
 	}
@@ -279,14 +314,12 @@ int color_parse_mem(const char *value, int value_len, char *dst)
 		if (!color_empty(&fg)) {
 			if (sep++)
 				OUT(';');
-			/* foreground colors are all in the 3x range */
-			dst = color_output(dst, end - dst, &fg, '3');
+			dst = color_output(dst, end - dst, &fg, 0);
 		}
 		if (!color_empty(&bg)) {
 			if (sep++)
 				OUT(';');
-			/* background colors are all in the 4x range */
-			dst = color_output(dst, end - dst, &bg, '4');
+			dst = color_output(dst, end - dst, &bg, 1);
 		}
 		OUT('m');
 	}
diff --git a/column.c b/column.c
index 4a38eed322..1261e18a72 100644
--- a/column.c
+++ b/column.c
@@ -107,7 +107,7 @@ static void display_plain(const struct string_list *list,
 		printf("%s%s%s", indent, list->items[i].string, nl);
 }
 
-/* Print a cell to stdout with all necessary leading/traling space */
+/* Print a cell to stdout with all necessary leading/trailing space */
 static int display_cell(struct column_data *data, int initial_width,
 			const char *empty_cell, int x, int y)
 {
@@ -358,7 +358,7 @@ static struct child_process column_process = CHILD_PROCESS_INIT;
 
 int run_column_filter(int colopts, const struct column_options *opts)
 {
-	struct argv_array *argv;
+	struct strvec *argv;
 
 	if (fd_out != -1)
 		return -1;
@@ -366,14 +366,14 @@ int run_column_filter(int colopts, const struct column_options *opts)
 	child_process_init(&column_process);
 	argv = &column_process.args;
 
-	argv_array_push(argv, "column");
-	argv_array_pushf(argv, "--raw-mode=%d", colopts);
+	strvec_push(argv, "column");
+	strvec_pushf(argv, "--raw-mode=%d", colopts);
 	if (opts && opts->width)
-		argv_array_pushf(argv, "--width=%d", opts->width);
+		strvec_pushf(argv, "--width=%d", opts->width);
 	if (opts && opts->indent)
-		argv_array_pushf(argv, "--indent=%s", opts->indent);
+		strvec_pushf(argv, "--indent=%s", opts->indent);
 	if (opts && opts->padding)
-		argv_array_pushf(argv, "--padding=%d", opts->padding);
+		strvec_pushf(argv, "--padding=%d", opts->padding);
 
 	fflush(stdout);
 	column_process.in = -1;
diff --git a/combine-diff.c b/combine-diff.c
index d5c4d839dc..d93782daeb 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -10,7 +10,7 @@
 #include "log-tree.h"
 #include "refs.h"
 #include "userdiff.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "revision.h"
 
 static int compare_paths(const struct combine_diff_path *one,
@@ -214,11 +214,11 @@ static struct lline *coalesce_lines(struct lline *base, int *lenbase,
 	 *   - Else if we have NEW, insert newend lline into base and
 	 *   consume newend
 	 */
-	lcs = xcalloc(st_add(origbaselen, 1), sizeof(int*));
-	directions = xcalloc(st_add(origbaselen, 1), sizeof(enum coalesce_direction*));
+	CALLOC_ARRAY(lcs, st_add(origbaselen, 1));
+	CALLOC_ARRAY(directions, st_add(origbaselen, 1));
 	for (i = 0; i < origbaselen + 1; i++) {
-		lcs[i] = xcalloc(st_add(lennew, 1), sizeof(int));
-		directions[i] = xcalloc(st_add(lennew, 1), sizeof(enum coalesce_direction));
+		CALLOC_ARRAY(lcs[i], st_add(lennew, 1));
+		CALLOC_ARRAY(directions[i], st_add(lennew, 1));
 		directions[i][0] = BASE;
 	}
 	for (j = 1; j < lennew + 1; j++)
@@ -398,16 +398,16 @@ static void consume_hunk(void *state_,
 		state->lost_bucket = &state->sline[state->nb-1];
 	}
 	if (!state->sline[state->nb-1].p_lno)
-		state->sline[state->nb-1].p_lno =
-			xcalloc(state->num_parent, sizeof(unsigned long));
+		CALLOC_ARRAY(state->sline[state->nb - 1].p_lno,
+			     state->num_parent);
 	state->sline[state->nb-1].p_lno[state->n] = state->ob;
 }
 
-static void consume_line(void *state_, char *line, unsigned long len)
+static int consume_line(void *state_, char *line, unsigned long len)
 {
 	struct combine_diff_state *state = state_;
 	if (!state->lost_bucket)
-		return; /* not in any hunk yet */
+		return 0; /* not in any hunk yet */
 	switch (line[0]) {
 	case '-':
 		append_lost(state->lost_bucket, state->n, line+1, len-1);
@@ -417,6 +417,7 @@ static void consume_line(void *state_, char *line, unsigned long len)
 		state->lno++;
 		break;
 	}
+	return 0;
 }
 
 static void combine_diff(struct repository *r,
@@ -923,7 +924,6 @@ static void dump_quoted_path(const char *head,
 
 static void show_combined_header(struct combine_diff_path *elem,
 				 int num_parent,
-				 int dense,
 				 struct rev_info *rev,
 				 const char *line_prefix,
 				 int mode_differs,
@@ -939,6 +939,7 @@ static void show_combined_header(struct combine_diff_path *elem,
 	int added = 0;
 	int deleted = 0;
 	int i;
+	int dense = rev->dense_combined_merges;
 
 	if (rev->loginfo && !rev->no_commit_id)
 		show_log(rev);
@@ -1012,7 +1013,7 @@ static void show_combined_header(struct combine_diff_path *elem,
 }
 
 static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
-			    int dense, int working_tree_file,
+			    int working_tree_file,
 			    struct rev_info *rev)
 {
 	struct diff_options *opt = &rev->diffopt;
@@ -1068,7 +1069,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 						   &result_size, NULL, NULL);
 		} else if (textconv) {
 			struct diff_filespec *df = alloc_filespec(elem->path);
-			fill_filespec(df, &null_oid, 0, st.st_mode);
+			fill_filespec(df, null_oid(), 0, st.st_mode);
 			result_size = fill_textconv(opt->repo, textconv, df, &result);
 			free_filespec(df);
 		} else if (0 <= (fd = open(elem->path, O_RDONLY))) {
@@ -1145,7 +1146,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 		}
 	}
 	if (is_binary) {
-		show_combined_header(elem, num_parent, dense, rev,
+		show_combined_header(elem, num_parent, rev,
 				     line_prefix, mode_differs, 0);
 		printf("Binary files differ\n");
 		free(result);
@@ -1159,7 +1160,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 	if (result_size && result[result_size-1] != '\n')
 		cnt++; /* incomplete line */
 
-	sline = xcalloc(st_add(cnt, 2), sizeof(*sline));
+	CALLOC_ARRAY(sline, st_add(cnt, 2));
 	sline[0].bol = result;
 	for (lno = 0, cp = result; cp < result + result_size; cp++) {
 		if (*cp == '\n') {
@@ -1178,7 +1179,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 	/* Even p_lno[cnt+1] is valid -- that is for the end line number
 	 * for deletion hunk at the end.
 	 */
-	sline[0].p_lno = xcalloc(st_mult(st_add(cnt, 2), num_parent), sizeof(unsigned long));
+	CALLOC_ARRAY(sline[0].p_lno, st_mult(st_add(cnt, 2), num_parent));
 	for (lno = 0; lno <= cnt; lno++)
 		sline[lno+1].p_lno = sline[lno].p_lno + num_parent;
 
@@ -1200,10 +1201,10 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 				     textconv, elem->path, opt->xdl_opts);
 	}
 
-	show_hunks = make_hunks(sline, cnt, num_parent, dense);
+	show_hunks = make_hunks(sline, cnt, num_parent, rev->dense_combined_merges);
 
 	if (show_hunks || mode_differs || working_tree_file) {
-		show_combined_header(elem, num_parent, dense, rev,
+		show_combined_header(elem, num_parent, rev,
 				     line_prefix, mode_differs, 1);
 		dump_sline(sline, line_prefix, cnt, num_parent,
 			   opt->use_color, result_deleted);
@@ -1284,7 +1285,6 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re
  */
 void show_combined_diff(struct combine_diff_path *p,
 		       int num_parent,
-		       int dense,
 		       struct rev_info *rev)
 {
 	struct diff_options *opt = &rev->diffopt;
@@ -1294,7 +1294,7 @@ void show_combined_diff(struct combine_diff_path *p,
 				  DIFF_FORMAT_NAME_STATUS))
 		show_raw_diff(p, num_parent, rev);
 	else if (opt->output_format & DIFF_FORMAT_PATCH)
-		show_patch_diff(p, num_parent, dense, 1, rev);
+		show_patch_diff(p, num_parent, 1, rev);
 }
 
 static void free_combined_pair(struct diff_filepair *pair)
@@ -1320,7 +1320,7 @@ static struct diff_filepair *combined_pair(struct combine_diff_path *p,
 	struct diff_filespec *pool;
 
 	pair = xmalloc(sizeof(*pair));
-	pool = xcalloc(st_add(num_parent, 1), sizeof(struct diff_filespec));
+	CALLOC_ARRAY(pool, st_add(num_parent, 1));
 	pair->one = pool + 1;
 	pair->two = pool;
 
@@ -1349,7 +1349,7 @@ static void handle_combined_callback(struct diff_options *opt,
 	struct diff_queue_struct q;
 	int i;
 
-	q.queue = xcalloc(num_paths, sizeof(struct diff_filepair *));
+	CALLOC_ARRAY(q.queue, num_paths);
 	q.alloc = num_paths;
 	q.nr = num_paths;
 	for (i = 0, p = paths; p; p = p->next)
@@ -1451,10 +1451,45 @@ static struct combine_diff_path *find_paths_multitree(
 	return paths_head.next;
 }
 
+static int match_objfind(struct combine_diff_path *path,
+			 int num_parent,
+			 const struct oidset *set)
+{
+	int i;
+	if (oidset_contains(set, &path->oid))
+		return 1;
+	for (i = 0; i < num_parent; i++) {
+		if (oidset_contains(set, &path->parent[i].oid))
+			return 1;
+	}
+	return 0;
+}
+
+static struct combine_diff_path *combined_objfind(struct diff_options *opt,
+						  struct combine_diff_path *paths,
+						  int num_parent)
+{
+	struct combine_diff_path *ret = NULL, **tail = &ret;
+	struct combine_diff_path *p = paths;
+
+	while (p) {
+		struct combine_diff_path *next = p->next;
+
+		if (match_objfind(p, num_parent, opt->objfind)) {
+			p->next = NULL;
+			*tail = p;
+			tail = &p->next;
+		} else {
+			free(p);
+		}
+		p = next;
+	}
+
+	return ret;
+}
 
 void diff_tree_combined(const struct object_id *oid,
 			const struct oid_array *parents,
-			int dense,
 			struct rev_info *rev)
 {
 	struct diff_options *opt = &rev->diffopt;
@@ -1506,10 +1541,10 @@ void diff_tree_combined(const struct object_id *oid,
 			opt->flags.follow_renames	||
 			opt->break_opt != -1	||
 			opt->detect_rename	||
-			(opt->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK)	||
+			(opt->pickaxe_opts &
+			 (DIFF_PICKAXE_KINDS_MASK & ~DIFF_PICKAXE_KIND_OBJFIND)) ||
 			opt->filter;
 
-
 	if (need_generic_pathscan) {
 		/*
 		 * NOTE generic case also handles --stat, as it computes
@@ -1523,6 +1558,9 @@ void diff_tree_combined(const struct object_id *oid,
 		int stat_opt;
 		paths = find_paths_multitree(oid, parents, &diffopts);
 
+		if (opt->pickaxe_opts & DIFF_PICKAXE_KIND_OBJFIND)
+			paths = combined_objfind(opt, paths, num_parent);
+
 		/*
 		 * show stat against the first parent even
 		 * when doing combined diff.
@@ -1581,8 +1619,7 @@ void diff_tree_combined(const struct object_id *oid,
 				printf("%s%c", diff_line_prefix(opt),
 				       opt->line_termination);
 			for (p = paths; p; p = p->next)
-				show_patch_diff(p, num_parent, dense,
-						0, rev);
+				show_patch_diff(p, num_parent, 0, rev);
 		}
 	}
 
@@ -1600,7 +1637,7 @@ void diff_tree_combined(const struct object_id *oid,
 	clear_pathspec(&diffopts.pathspec);
 }
 
-void diff_tree_combined_merge(const struct commit *commit, int dense,
+void diff_tree_combined_merge(const struct commit *commit,
 			      struct rev_info *rev)
 {
 	struct commit_list *parent = get_saved_parents(rev, commit);
@@ -1610,6 +1647,6 @@ void diff_tree_combined_merge(const struct commit *commit, int dense,
 		oid_array_append(&parents, &parent->item->object.oid);
 		parent = parent->next;
 	}
-	diff_tree_combined(&commit->object.oid, &parents, dense, rev);
+	diff_tree_combined(&commit->object.oid, &parents, rev);
 	oid_array_clear(&parents);
 }
diff --git a/command-list.txt b/command-list.txt
index a9ac72bef4..a289f09ed6 100644
--- a/command-list.txt
+++ b/command-list.txt
@@ -54,6 +54,7 @@ git-archive                             mainporcelain
 git-bisect                              mainporcelain           info
 git-blame                               ancillaryinterrogators          complete
 git-branch                              mainporcelain           history
+git-bugreport                           ancillaryinterrogators
 git-bundle                              mainporcelain
 git-cat-file                            plumbinginterrogators
 git-check-attr                          purehelpers
@@ -93,6 +94,7 @@ git-fetch-pack                          synchingrepositories
 git-filter-branch                       ancillarymanipulators
 git-fmt-merge-msg                       purehelpers
 git-for-each-ref                        plumbinginterrogators
+git-for-each-repo                       plumbinginterrogators
 git-format-patch                        mainporcelain
 git-fsck                                ancillaryinterrogators          complete
 git-gc                                  mainporcelain
@@ -116,6 +118,7 @@ git-ls-remote                           plumbinginterrogators
 git-ls-tree                             plumbinginterrogators
 git-mailinfo                            purehelpers
 git-mailsplit                           purehelpers
+git-maintenance                         mainporcelain
 git-merge                               mainporcelain           history
 git-merge-base                          plumbinginterrogators
 git-merge-file                          plumbingmanipulators
@@ -133,9 +136,8 @@ git-p4                                  foreignscminterface
 git-pack-objects                        plumbingmanipulators
 git-pack-redundant                      plumbinginterrogators
 git-pack-refs                           ancillarymanipulators
-git-parse-remote                        synchelpers
 git-patch-id                            purehelpers
-git-prune                               ancillarymanipulators
+git-prune                               ancillarymanipulators   complete
 git-prune-packed                        plumbingmanipulators
 git-pull                                mainporcelain           remote
 git-push                                mainporcelain           remote
@@ -166,6 +168,7 @@ 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-stage                                                               complete
 git-status                              mainporcelain           info
@@ -193,16 +196,21 @@ git-write-tree                          plumbingmanipulators
 gitattributes                           guide
 gitcli                                  guide
 gitcore-tutorial                        guide
+gitcredentials                          guide
 gitcvs-migration                        guide
 gitdiffcore                             guide
 giteveryday                             guide
+gitfaq                                  guide
 gitglossary                             guide
 githooks                                guide
 gitignore                               guide
+gitmailmap                              guide
 gitmodules                              guide
 gitnamespaces                           guide
+gitremote-helpers                       guide
 gitrepository-layout                    guide
 gitrevisions                            guide
+gitsubmodules                           guide
 gittutorial-2                           guide
 gittutorial                             guide
 gitworkflows                            guide
diff --git a/commit-graph.c b/commit-graph.c
index 0aea7b2ae5..00614acd65 100644
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -1,7 +1,5 @@
-#include "cache.h"
-#include "config.h"
-#include "dir.h"
 #include "git-compat-util.h"
+#include "config.h"
 #include "lockfile.h"
 #include "pack.h"
 #include "packfile.h"
@@ -9,19 +7,43 @@
 #include "object.h"
 #include "refs.h"
 #include "revision.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 #include "commit-graph.h"
 #include "object-store.h"
 #include "alloc.h"
 #include "hashmap.h"
 #include "replace-object.h"
 #include "progress.h"
+#include "bloom.h"
+#include "commit-slab.h"
+#include "shallow.h"
+#include "json-writer.h"
+#include "trace2.h"
+#include "chunk-format.h"
+
+void git_test_write_commit_graph_or_die(void)
+{
+	int flags = 0;
+	if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0))
+		return;
+
+	if (git_env_bool(GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS, 0))
+		flags = COMMIT_GRAPH_WRITE_BLOOM_FILTERS;
+
+	if (write_commit_graph_reachable(the_repository->objects->odb,
+					 flags, NULL))
+		die("failed to write commit-graph under GIT_TEST_COMMIT_GRAPH");
+}
 
 #define GRAPH_SIGNATURE 0x43475048 /* "CGPH" */
 #define GRAPH_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */
 #define GRAPH_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
 #define GRAPH_CHUNKID_DATA 0x43444154 /* "CDAT" */
+#define GRAPH_CHUNKID_GENERATION_DATA 0x47444154 /* "GDAT" */
+#define GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW 0x47444f56 /* "GDOV" */
 #define GRAPH_CHUNKID_EXTRAEDGES 0x45444745 /* "EDGE" */
+#define GRAPH_CHUNKID_BLOOMINDEXES 0x42494458 /* "BIDX" */
+#define GRAPH_CHUNKID_BLOOMDATA 0x42444154 /* "BDAT" */
 #define GRAPH_CHUNKID_BASE 0x42415345 /* "BASE" */
 
 #define GRAPH_DATA_WIDTH (the_hash_algo->rawsz + 16)
@@ -37,48 +59,155 @@
 
 #define GRAPH_HEADER_SIZE 8
 #define GRAPH_FANOUT_SIZE (4 * 256)
-#define GRAPH_CHUNKLOOKUP_WIDTH 12
-#define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * GRAPH_CHUNKLOOKUP_WIDTH \
+#define GRAPH_MIN_SIZE (GRAPH_HEADER_SIZE + 4 * CHUNK_TOC_ENTRY_SIZE \
 			+ GRAPH_FANOUT_SIZE + the_hash_algo->rawsz)
 
+#define CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW (1ULL << 31)
+
 /* Remember to update object flag allocation in object.h */
 #define REACHABLE       (1u<<15)
 
-char *get_commit_graph_filename(const char *obj_dir)
+define_commit_slab(topo_level_slab, uint32_t);
+
+/* Keep track of the order in which commits are added to our list. */
+define_commit_slab(commit_pos, int);
+static struct commit_pos commit_pos = COMMIT_SLAB_INIT(1, commit_pos);
+
+static void set_commit_pos(struct repository *r, const struct object_id *oid)
+{
+	static int32_t max_pos;
+	struct commit *commit = lookup_commit(r, oid);
+
+	if (!commit)
+		return; /* should never happen, but be lenient */
+
+	*commit_pos_at(&commit_pos, commit) = max_pos++;
+}
+
+static int commit_pos_cmp(const void *va, const void *vb)
+{
+	const struct commit *a = *(const struct commit **)va;
+	const struct commit *b = *(const struct commit **)vb;
+	return commit_pos_at(&commit_pos, a) -
+	       commit_pos_at(&commit_pos, b);
+}
+
+define_commit_slab(commit_graph_data_slab, struct commit_graph_data);
+static struct commit_graph_data_slab commit_graph_data_slab =
+	COMMIT_SLAB_INIT(1, commit_graph_data_slab);
+
+static int get_configured_generation_version(struct repository *r)
+{
+	int version = 2;
+	repo_config_get_int(r, "commitgraph.generationversion", &version);
+	return version;
+}
+
+uint32_t commit_graph_position(const struct commit *c)
+{
+	struct commit_graph_data *data =
+		commit_graph_data_slab_peek(&commit_graph_data_slab, c);
+
+	return data ? data->graph_pos : COMMIT_NOT_FROM_GRAPH;
+}
+
+timestamp_t commit_graph_generation(const struct commit *c)
+{
+	struct commit_graph_data *data =
+		commit_graph_data_slab_peek(&commit_graph_data_slab, c);
+
+	if (!data)
+		return GENERATION_NUMBER_INFINITY;
+	else if (data->graph_pos == COMMIT_NOT_FROM_GRAPH)
+		return GENERATION_NUMBER_INFINITY;
+
+	return data->generation;
+}
+
+static struct commit_graph_data *commit_graph_data_at(const struct commit *c)
+{
+	unsigned int i, nth_slab;
+	struct commit_graph_data *data =
+		commit_graph_data_slab_peek(&commit_graph_data_slab, c);
+
+	if (data)
+		return data;
+
+	nth_slab = c->index / commit_graph_data_slab.slab_size;
+	data = commit_graph_data_slab_at(&commit_graph_data_slab, c);
+
+	/*
+	 * commit-slab initializes elements with zero, overwrite this with
+	 * COMMIT_NOT_FROM_GRAPH for graph_pos.
+	 *
+	 * We avoid initializing generation with checking if graph position
+	 * is not COMMIT_NOT_FROM_GRAPH.
+	 */
+	for (i = 0; i < commit_graph_data_slab.slab_size; i++) {
+		commit_graph_data_slab.slab[nth_slab][i].graph_pos =
+			COMMIT_NOT_FROM_GRAPH;
+	}
+
+	return data;
+}
+
+/*
+ * Should be used only while writing commit-graph as it compares
+ * generation value of commits by directly accessing commit-slab.
+ */
+static int commit_gen_cmp(const void *va, const void *vb)
+{
+	const struct commit *a = *(const struct commit **)va;
+	const struct commit *b = *(const struct commit **)vb;
+
+	const timestamp_t generation_a = commit_graph_data_at(a)->generation;
+	const timestamp_t generation_b = commit_graph_data_at(b)->generation;
+	/* lower generation commits first */
+	if (generation_a < generation_b)
+		return -1;
+	else if (generation_a > generation_b)
+		return 1;
+
+	/* use date as a heuristic when generations are equal */
+	if (a->date < b->date)
+		return -1;
+	else if (a->date > b->date)
+		return 1;
+	return 0;
+}
+
+char *get_commit_graph_filename(struct object_directory *obj_dir)
 {
-	char *filename = xstrfmt("%s/info/commit-graph", obj_dir);
-	char *normalized = xmalloc(strlen(filename) + 1);
-	normalize_path_copy(normalized, filename);
-	free(filename);
-	return normalized;
+	return xstrfmt("%s/info/commit-graph", obj_dir->path);
 }
 
-static char *get_split_graph_filename(const char *obj_dir,
+static char *get_split_graph_filename(struct object_directory *odb,
 				      const char *oid_hex)
 {
-	char *filename = xstrfmt("%s/info/commit-graphs/graph-%s.graph",
-				 obj_dir,
-				 oid_hex);
-	char *normalized = xmalloc(strlen(filename) + 1);
-	normalize_path_copy(normalized, filename);
-	free(filename);
-	return normalized;
+	return xstrfmt("%s/info/commit-graphs/graph-%s.graph", odb->path,
+		       oid_hex);
 }
 
-static char *get_chain_filename(const char *obj_dir)
+char *get_commit_graph_chain_filename(struct object_directory *odb)
 {
-	return xstrfmt("%s/info/commit-graphs/commit-graph-chain", obj_dir);
+	return xstrfmt("%s/info/commit-graphs/commit-graph-chain", odb->path);
 }
 
 static uint8_t oid_version(void)
 {
-	return 1;
+	switch (hash_algo_by_ptr(the_hash_algo)) {
+	case GIT_HASH_SHA1:
+		return 1;
+	case GIT_HASH_SHA256:
+		return 2;
+	default:
+		die(_("invalid hash version"));
+	}
 }
 
 static struct commit_graph *alloc_commit_graph(void)
 {
 	struct commit_graph *g = xcalloc(1, sizeof(*g));
-	g->graph_fd = -1;
 
 	return g;
 }
@@ -97,7 +226,8 @@ static int commit_graph_compatible(struct repository *r)
 	}
 
 	prepare_commit_graft(r);
-	if (r->parsed_objects && r->parsed_objects->grafts_nr)
+	if (r->parsed_objects &&
+	    (r->parsed_objects->grafts_nr || r->parsed_objects->substituted_parent))
 		return 0;
 	if (is_repository_shallow(r))
 		return 0;
@@ -117,7 +247,9 @@ int open_commit_graph(const char *graph_file, int *fd, struct stat *st)
 	return 1;
 }
 
-struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st)
+struct commit_graph *load_commit_graph_one_fd_st(struct repository *r,
+						 int fd, struct stat *st,
+						 struct object_directory *odb)
 {
 	void *graph_map;
 	size_t graph_size;
@@ -131,12 +263,13 @@ struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st)
 		return NULL;
 	}
 	graph_map = xmmap(NULL, graph_size, PROT_READ, MAP_PRIVATE, fd, 0);
-	ret = parse_commit_graph(graph_map, fd, graph_size);
+	close(fd);
+	ret = parse_commit_graph(r, graph_map, graph_size);
 
-	if (!ret) {
+	if (ret)
+		ret->odb = odb;
+	else
 		munmap(graph_map, graph_size);
-		close(fd);
-	}
 
 	return ret;
 }
@@ -171,16 +304,43 @@ static int verify_commit_graph_lite(struct commit_graph *g)
 	return 0;
 }
 
-struct commit_graph *parse_commit_graph(void *graph_map, int fd,
-					size_t graph_size)
+static int graph_read_oid_lookup(const unsigned char *chunk_start,
+				 size_t chunk_size, void *data)
 {
-	const unsigned char *data, *chunk_lookup;
-	uint32_t i;
+	struct commit_graph *g = data;
+	g->chunk_oid_lookup = chunk_start;
+	g->num_commits = chunk_size / g->hash_len;
+	return 0;
+}
+
+static int graph_read_bloom_data(const unsigned char *chunk_start,
+				  size_t chunk_size, void *data)
+{
+	struct commit_graph *g = data;
+	uint32_t hash_version;
+	g->chunk_bloom_data = chunk_start;
+	hash_version = get_be32(chunk_start);
+
+	if (hash_version != 1)
+		return 0;
+
+	g->bloom_filter_settings = xmalloc(sizeof(struct bloom_filter_settings));
+	g->bloom_filter_settings->hash_version = hash_version;
+	g->bloom_filter_settings->num_hashes = get_be32(chunk_start + 4);
+	g->bloom_filter_settings->bits_per_entry = get_be32(chunk_start + 8);
+	g->bloom_filter_settings->max_changed_paths = DEFAULT_BLOOM_MAX_CHANGES;
+
+	return 0;
+}
+
+struct commit_graph *parse_commit_graph(struct repository *r,
+					void *graph_map, size_t graph_size)
+{
+	const unsigned char *data;
 	struct commit_graph *graph;
-	uint64_t last_chunk_offset;
-	uint32_t last_chunk_id;
 	uint32_t graph_signature;
 	unsigned char graph_version, hash_version;
+	struct chunkfile *cf = NULL;
 
 	if (!graph_map)
 		return NULL;
@@ -211,104 +371,78 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd,
 		return NULL;
 	}
 
+	prepare_repo_settings(r);
+
 	graph = alloc_commit_graph();
 
 	graph->hash_len = the_hash_algo->rawsz;
 	graph->num_chunks = *(unsigned char*)(data + 6);
-	graph->graph_fd = fd;
 	graph->data = graph_map;
 	graph->data_len = graph_size;
 
-	last_chunk_id = 0;
-	last_chunk_offset = 8;
-	chunk_lookup = data + 8;
-	for (i = 0; i < graph->num_chunks; i++) {
-		uint32_t chunk_id;
-		uint64_t chunk_offset;
-		int chunk_repeated = 0;
-
-		if (data + graph_size - chunk_lookup <
-		    GRAPH_CHUNKLOOKUP_WIDTH) {
-			error(_("commit-graph chunk lookup table entry missing; file may be incomplete"));
-			free(graph);
-			return NULL;
-		}
-
-		chunk_id = get_be32(chunk_lookup + 0);
-		chunk_offset = get_be64(chunk_lookup + 4);
-
-		chunk_lookup += GRAPH_CHUNKLOOKUP_WIDTH;
-
-		if (chunk_offset > graph_size - the_hash_algo->rawsz) {
-			error(_("commit-graph improper chunk offset %08x%08x"), (uint32_t)(chunk_offset >> 32),
-			      (uint32_t)chunk_offset);
-			free(graph);
-			return NULL;
-		}
-
-		switch (chunk_id) {
-		case GRAPH_CHUNKID_OIDFANOUT:
-			if (graph->chunk_oid_fanout)
-				chunk_repeated = 1;
-			else
-				graph->chunk_oid_fanout = (uint32_t*)(data + chunk_offset);
-			break;
-
-		case GRAPH_CHUNKID_OIDLOOKUP:
-			if (graph->chunk_oid_lookup)
-				chunk_repeated = 1;
-			else
-				graph->chunk_oid_lookup = data + chunk_offset;
-			break;
+	if (graph_size < GRAPH_HEADER_SIZE +
+			 (graph->num_chunks + 1) * CHUNK_TOC_ENTRY_SIZE +
+			 GRAPH_FANOUT_SIZE + the_hash_algo->rawsz) {
+		error(_("commit-graph file is too small to hold %u chunks"),
+		      graph->num_chunks);
+		free(graph);
+		return NULL;
+	}
 
-		case GRAPH_CHUNKID_DATA:
-			if (graph->chunk_commit_data)
-				chunk_repeated = 1;
-			else
-				graph->chunk_commit_data = data + chunk_offset;
-			break;
+	cf = init_chunkfile(NULL);
 
-		case GRAPH_CHUNKID_EXTRAEDGES:
-			if (graph->chunk_extra_edges)
-				chunk_repeated = 1;
-			else
-				graph->chunk_extra_edges = data + chunk_offset;
-			break;
+	if (read_table_of_contents(cf, graph->data, graph_size,
+				   GRAPH_HEADER_SIZE, graph->num_chunks))
+		goto free_and_return;
 
-		case GRAPH_CHUNKID_BASE:
-			if (graph->chunk_base_graphs)
-				chunk_repeated = 1;
-			else
-				graph->chunk_base_graphs = data + chunk_offset;
-		}
+	pair_chunk(cf, GRAPH_CHUNKID_OIDFANOUT,
+		   (const unsigned char **)&graph->chunk_oid_fanout);
+	read_chunk(cf, GRAPH_CHUNKID_OIDLOOKUP, graph_read_oid_lookup, graph);
+	pair_chunk(cf, GRAPH_CHUNKID_DATA, &graph->chunk_commit_data);
+	pair_chunk(cf, GRAPH_CHUNKID_EXTRAEDGES, &graph->chunk_extra_edges);
+	pair_chunk(cf, GRAPH_CHUNKID_BASE, &graph->chunk_base_graphs);
 
-		if (chunk_repeated) {
-			error(_("commit-graph chunk id %08x appears multiple times"), chunk_id);
-			free(graph);
-			return NULL;
-		}
+	if (get_configured_generation_version(r) >= 2) {
+		pair_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA,
+			&graph->chunk_generation_data);
+		pair_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW,
+			&graph->chunk_generation_data_overflow);
+	}
 
-		if (last_chunk_id == GRAPH_CHUNKID_OIDLOOKUP)
-		{
-			graph->num_commits = (chunk_offset - last_chunk_offset)
-					     / graph->hash_len;
-		}
+	if (r->settings.commit_graph_read_changed_paths) {
+		pair_chunk(cf, GRAPH_CHUNKID_BLOOMINDEXES,
+			   &graph->chunk_bloom_indexes);
+		read_chunk(cf, GRAPH_CHUNKID_BLOOMDATA,
+			   graph_read_bloom_data, graph);
+	}
 
-		last_chunk_id = chunk_id;
-		last_chunk_offset = chunk_offset;
+	if (graph->chunk_bloom_indexes && graph->chunk_bloom_data) {
+		init_bloom_filters();
+	} else {
+		/* We need both the bloom chunks to exist together. Else ignore the data */
+		graph->chunk_bloom_indexes = NULL;
+		graph->chunk_bloom_data = NULL;
+		FREE_AND_NULL(graph->bloom_filter_settings);
 	}
 
-	hashcpy(graph->oid.hash, graph->data + graph->data_len - graph->hash_len);
+	oidread(&graph->oid, graph->data + graph->data_len - graph->hash_len);
 
-	if (verify_commit_graph_lite(graph)) {
-		free(graph);
-		return NULL;
-	}
+	if (verify_commit_graph_lite(graph))
+		goto free_and_return;
 
+	free_chunkfile(cf);
 	return graph;
+
+free_and_return:
+	free_chunkfile(cf);
+	free(graph->bloom_filter_settings);
+	free(graph);
+	return NULL;
 }
 
-static struct commit_graph *load_commit_graph_one(const char *graph_file)
+static struct commit_graph *load_commit_graph_one(struct repository *r,
+						  const char *graph_file,
+						  struct object_directory *odb)
 {
 
 	struct stat st;
@@ -319,7 +453,7 @@ static struct commit_graph *load_commit_graph_one(const char *graph_file)
 	if (!open_ok)
 		return NULL;
 
-	g = load_commit_graph_one_fd_st(fd, &st);
+	g = load_commit_graph_one_fd_st(r, fd, &st, odb);
 
 	if (g)
 		g->filename = xstrdup(graph_file);
@@ -327,15 +461,13 @@ static struct commit_graph *load_commit_graph_one(const char *graph_file)
 	return g;
 }
 
-static struct commit_graph *load_commit_graph_v1(struct repository *r, const char *obj_dir)
+static struct commit_graph *load_commit_graph_v1(struct repository *r,
+						 struct object_directory *odb)
 {
-	char *graph_name = get_commit_graph_filename(obj_dir);
-	struct commit_graph *g = load_commit_graph_one(graph_name);
+	char *graph_name = get_commit_graph_filename(odb);
+	struct commit_graph *g = load_commit_graph_one(r, graph_name, odb);
 	free(graph_name);
 
-	if (g)
-		g->obj_dir = obj_dir;
-
 	return g;
 }
 
@@ -372,14 +504,15 @@ static int add_graph_to_chain(struct commit_graph *g,
 	return 1;
 }
 
-static struct commit_graph *load_commit_graph_chain(struct repository *r, const char *obj_dir)
+static struct commit_graph *load_commit_graph_chain(struct repository *r,
+						    struct object_directory *odb)
 {
 	struct commit_graph *graph_chain = NULL;
 	struct strbuf line = STRBUF_INIT;
 	struct stat st;
 	struct object_id *oids;
 	int i = 0, valid = 1, count;
-	char *chain_name = get_chain_filename(obj_dir);
+	char *chain_name = get_commit_graph_chain_filename(odb);
 	FILE *fp;
 	int stat_res;
 
@@ -393,7 +526,7 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r, const
 		return NULL;
 
 	count = st.st_size / (the_hash_algo->hexsz + 1);
-	oids = xcalloc(count, sizeof(struct object_id));
+	CALLOC_ARRAY(oids, count);
 
 	prepare_alt_odb(r);
 
@@ -412,14 +545,12 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r, const
 
 		valid = 0;
 		for (odb = r->objects->odb; odb; odb = odb->next) {
-			char *graph_name = get_split_graph_filename(odb->path, line.buf);
-			struct commit_graph *g = load_commit_graph_one(graph_name);
+			char *graph_name = get_split_graph_filename(odb, line.buf);
+			struct commit_graph *g = load_commit_graph_one(r, graph_name, odb);
 
 			free(graph_name);
 
 			if (g) {
-				g->obj_dir = odb->path;
-
 				if (add_graph_to_chain(g, graph_chain, oids, i)) {
 					graph_chain = g;
 					valid = 1;
@@ -442,29 +573,58 @@ static struct commit_graph *load_commit_graph_chain(struct repository *r, const
 	return graph_chain;
 }
 
-struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir)
+/*
+ * returns 1 if and only if all graphs in the chain have
+ * corrected commit dates stored in the generation_data chunk.
+ */
+static int validate_mixed_generation_chain(struct commit_graph *g)
 {
-	struct commit_graph *g = load_commit_graph_v1(r, obj_dir);
+	int read_generation_data = 1;
+	struct commit_graph *p = g;
+
+	while (read_generation_data && p) {
+		read_generation_data = p->read_generation_data;
+		p = p->base_graph;
+	}
+
+	if (read_generation_data)
+		return 1;
+
+	while (g) {
+		g->read_generation_data = 0;
+		g = g->base_graph;
+	}
+
+	return 0;
+}
+
+struct commit_graph *read_commit_graph_one(struct repository *r,
+					   struct object_directory *odb)
+{
+	struct commit_graph *g = load_commit_graph_v1(r, odb);
 
 	if (!g)
-		g = load_commit_graph_chain(r, obj_dir);
+		g = load_commit_graph_chain(r, odb);
+
+	validate_mixed_generation_chain(g);
 
 	return g;
 }
 
-static void prepare_commit_graph_one(struct repository *r, const char *obj_dir)
+static void prepare_commit_graph_one(struct repository *r,
+				     struct object_directory *odb)
 {
 
 	if (r->objects->commit_graph)
 		return;
 
-	r->objects->commit_graph = read_commit_graph_one(r, obj_dir);
+	r->objects->commit_graph = read_commit_graph_one(r, odb);
 }
 
 /*
  * Return 1 if commit_graph is non-NULL, and 0 otherwise.
  *
- * On the first invocation, this function attemps to load the commit
+ * On the first invocation, this function attempts to load the commit
  * graph if the_repository is configured to have one.
  */
 static int prepare_commit_graph(struct repository *r)
@@ -482,10 +642,6 @@ static int prepare_commit_graph(struct repository *r)
 		return !!r->objects->commit_graph;
 	r->objects->commit_graph_attempted = 1;
 
-	if (git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD, 0))
-		die("dying as requested by the '%s' variable on commit-graph load!",
-		    GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD);
-
 	prepare_repo_settings(r);
 
 	if (!git_env_bool(GIT_TEST_COMMIT_GRAPH, 0) &&
@@ -505,7 +661,7 @@ static int prepare_commit_graph(struct repository *r)
 	for (odb = r->objects->odb;
 	     !r->objects->commit_graph && odb;
 	     odb = odb->next)
-		prepare_commit_graph_one(r, odb->path);
+		prepare_commit_graph_one(r, odb);
 	return !!r->objects->commit_graph;
 }
 
@@ -527,6 +683,31 @@ int generation_numbers_enabled(struct repository *r)
 	return !!first_generation;
 }
 
+int corrected_commit_dates_enabled(struct repository *r)
+{
+	struct commit_graph *g;
+	if (!prepare_commit_graph(r))
+		return 0;
+
+	g = r->objects->commit_graph;
+
+	if (!g->num_commits)
+		return 0;
+
+	return g->read_generation_data;
+}
+
+struct bloom_filter_settings *get_bloom_filter_settings(struct repository *r)
+{
+	struct commit_graph *g = r->objects->commit_graph;
+	while (g) {
+		if (g->bloom_filter_settings)
+			return g->bloom_filter_settings;
+		g = g->base_graph;
+	}
+	return NULL;
+}
+
 static void close_commit_graph_one(struct commit_graph *g)
 {
 	if (!g)
@@ -542,7 +723,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);
@@ -565,7 +746,7 @@ static void load_oid_from_graph(struct commit_graph *g,
 
 	lex_index = pos - g->num_commits_in_base;
 
-	hashcpy(oid->hash, g->chunk_oid_lookup + g->hash_len * lex_index);
+	oidread(oid, g->chunk_oid_lookup + g->hash_len * lex_index);
 }
 
 static struct commit_list **insert_parent_or_die(struct repository *r,
@@ -583,22 +764,49 @@ static struct commit_list **insert_parent_or_die(struct repository *r,
 	c = lookup_commit(r, &oid);
 	if (!c)
 		die(_("could not find commit %s"), oid_to_hex(&oid));
-	c->graph_pos = pos;
+	commit_graph_data_at(c)->graph_pos = pos;
 	return &commit_list_insert(c, pptr)->next;
 }
 
 static void fill_commit_graph_info(struct commit *item, struct commit_graph *g, uint32_t pos)
 {
 	const unsigned char *commit_data;
-	uint32_t lex_index;
+	struct commit_graph_data *graph_data;
+	uint32_t lex_index, offset_pos;
+	uint64_t date_high, date_low, offset;
 
 	while (pos < g->num_commits_in_base)
 		g = g->base_graph;
 
+	if (pos >= g->num_commits + g->num_commits_in_base)
+		die(_("invalid commit position. commit-graph is likely corrupt"));
+
 	lex_index = pos - g->num_commits_in_base;
 	commit_data = g->chunk_commit_data + GRAPH_DATA_WIDTH * lex_index;
-	item->graph_pos = pos;
-	item->generation = get_be32(commit_data + g->hash_len + 8) >> 2;
+
+	graph_data = commit_graph_data_at(item);
+	graph_data->graph_pos = pos;
+
+	date_high = get_be32(commit_data + g->hash_len + 8) & 0x3;
+	date_low = get_be32(commit_data + g->hash_len + 12);
+	item->date = (timestamp_t)((date_high << 32) | date_low);
+
+	if (g->read_generation_data) {
+		offset = (timestamp_t)get_be32(g->chunk_generation_data + sizeof(uint32_t) * lex_index);
+
+		if (offset & CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW) {
+			if (!g->chunk_generation_data_overflow)
+				die(_("commit-graph requires overflow generation data but has none"));
+
+			offset_pos = offset ^ CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW;
+			graph_data->generation = get_be64(g->chunk_generation_data_overflow + 8 * offset_pos);
+		} else
+			graph_data->generation = item->date + offset;
+	} else
+		graph_data->generation = get_be32(commit_data + g->hash_len + 8) >> 2;
+
+	if (g->topo_levels)
+		*topo_level_slab_at(g->topo_levels, item) = get_be32(commit_data + g->hash_len + 8) >> 2;
 }
 
 static inline void set_commit_tree(struct commit *c, struct tree *t)
@@ -612,7 +820,6 @@ static int fill_commit_in_graph(struct repository *r,
 {
 	uint32_t edge_value;
 	uint32_t *parent_data_ptr;
-	uint64_t date_low, date_high;
 	struct commit_list **pptr;
 	const unsigned char *commit_data;
 	uint32_t lex_index;
@@ -620,28 +827,15 @@ static int fill_commit_in_graph(struct repository *r,
 	while (pos < g->num_commits_in_base)
 		g = g->base_graph;
 
-	if (pos >= g->num_commits + g->num_commits_in_base)
-		die(_("invalid commit position. commit-graph is likely corrupt"));
+	fill_commit_graph_info(item, g, pos);
 
-	/*
-	 * Store the "full" position, but then use the
-	 * "local" position for the rest of the calculation.
-	 */
-	item->graph_pos = pos;
 	lex_index = pos - g->num_commits_in_base;
-
 	commit_data = g->chunk_commit_data + (g->hash_len + 16) * lex_index;
 
 	item->object.parsed = 1;
 
 	set_commit_tree(item, NULL);
 
-	date_high = get_be32(commit_data + g->hash_len + 8) & 0x3;
-	date_low = get_be32(commit_data + g->hash_len + 12);
-	item->date = (timestamp_t)((date_high << 32) | date_low);
-
-	item->generation = get_be32(commit_data + g->hash_len + 8) >> 2;
-
 	pptr = &item->parents;
 
 	edge_value = get_be32(commit_data + g->hash_len);
@@ -670,25 +864,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)
 {
-	if (item->graph_pos != COMMIT_NOT_FROM_GRAPH) {
-		*pos = item->graph_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,
@@ -700,7 +924,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;
@@ -708,6 +932,14 @@ static int parse_commit_in_graph_one(struct repository *r,
 
 int parse_commit_in_graph(struct repository *r, struct commit *item)
 {
+	static int checked_env = 0;
+
+	if (!checked_env &&
+	    git_env_bool(GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE, 0))
+		die("dying as requested by the '%s' variable on commit-graph parse!",
+		    GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE);
+	checked_env = 1;
+
 	if (!prepare_commit_graph(r))
 		return 0;
 	return parse_commit_in_graph_one(r, r->objects->commit_graph, item);
@@ -718,7 +950,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);
 }
 
@@ -728,14 +960,15 @@ static struct tree *load_tree_for_commit(struct repository *r,
 {
 	struct object_id oid;
 	const unsigned char *commit_data;
+	uint32_t graph_pos = commit_graph_position(c);
 
-	while (c->graph_pos < g->num_commits_in_base)
+	while (graph_pos < g->num_commits_in_base)
 		g = g->base_graph;
 
 	commit_data = g->chunk_commit_data +
-			GRAPH_DATA_WIDTH * (c->graph_pos - g->num_commits_in_base);
+			GRAPH_DATA_WIDTH * (graph_pos - g->num_commits_in_base);
 
-	hashcpy(oid.hash, commit_data);
+	oidread(&oid, commit_data);
 	set_commit_tree(c, lookup_tree(r, &oid));
 
 	return c->maybe_tree;
@@ -747,7 +980,7 @@ static struct tree *get_commit_tree_in_graph_one(struct repository *r,
 {
 	if (c->maybe_tree)
 		return c->maybe_tree;
-	if (c->graph_pos == COMMIT_NOT_FROM_GRAPH)
+	if (commit_graph_position(c) == COMMIT_NOT_FROM_GRAPH)
 		BUG("get_commit_tree_in_graph_one called from non-commit-graph commit");
 
 	return load_tree_for_commit(r, g, (struct commit *)c);
@@ -760,23 +993,18 @@ struct tree *get_commit_tree_in_graph(struct repository *r, const struct commit
 
 struct packed_commit_list {
 	struct commit **list;
-	int nr;
-	int alloc;
-};
-
-struct packed_oid_list {
-	struct object_id *list;
-	int nr;
-	int alloc;
+	size_t nr;
+	size_t alloc;
 };
 
 struct write_commit_graph_context {
 	struct repository *r;
-	char *obj_dir;
+	struct object_directory *odb;
 	char *graph_name;
-	struct packed_oid_list oids;
+	struct oid_array oids;
 	struct packed_commit_list commits;
 	int num_extra_edges;
+	int num_generation_data_overflows;
 	unsigned long approx_nr_objects;
 	struct progress *progress;
 	int progress_done;
@@ -794,14 +1022,26 @@ struct write_commit_graph_context {
 	unsigned append:1,
 		 report_progress:1,
 		 split:1,
-		 check_oids:1;
-
-	const struct split_commit_graph_opts *split_opts;
+		 changed_paths:1,
+		 order_by_pack:1,
+		 write_generation_data:1,
+		 trust_generation_numbers:1;
+
+	struct topo_level_slab *topo_levels;
+	const struct commit_graph_opts *opts;
+	size_t total_bloom_filter_data_size;
+	const struct bloom_filter_settings *bloom_settings;
+
+	int count_bloom_filter_computed;
+	int count_bloom_filter_not_computed;
+	int count_bloom_filter_trunc_empty;
+	int count_bloom_filter_trunc_large;
 };
 
-static void write_graph_chunk_fanout(struct hashfile *f,
-				     struct write_commit_graph_context *ctx)
+static int write_graph_chunk_fanout(struct hashfile *f,
+				    void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	int i, count = 0;
 	struct commit **list = ctx->commits.list;
 
@@ -821,28 +1061,34 @@ static void write_graph_chunk_fanout(struct hashfile *f,
 
 		hashwrite_be32(f, count);
 	}
+
+	return 0;
 }
 
-static void write_graph_chunk_oids(struct hashfile *f, int hash_len,
-				   struct write_commit_graph_context *ctx)
+static int write_graph_chunk_oids(struct hashfile *f,
+				  void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	struct commit **list = ctx->commits.list;
 	int count;
 	for (count = 0; count < ctx->commits.nr; count++, list++) {
 		display_progress(ctx->progress, ++ctx->progress_cnt);
-		hashwrite(f, (*list)->object.oid.hash, (int)hash_len);
+		hashwrite(f, (*list)->object.oid.hash, the_hash_algo->rawsz);
 	}
+
+	return 0;
 }
 
-static const unsigned char *commit_to_sha1(size_t index, void *table)
+static const struct object_id *commit_to_oid(size_t index, const void *table)
 {
-	struct commit **commits = table;
-	return commits[index]->object.oid.hash;
+	const struct commit * const *commits = table;
+	return &commits[index]->object.oid;
 }
 
-static void write_graph_chunk_data(struct hashfile *f, int hash_len,
-				   struct write_commit_graph_context *ctx)
+static int write_graph_chunk_data(struct hashfile *f,
+				  void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	struct commit **list = ctx->commits.list;
 	struct commit **last = ctx->commits.list + ctx->commits.nr;
 	uint32_t num_extra_edges = 0;
@@ -854,32 +1100,29 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len,
 		uint32_t packedDate[2];
 		display_progress(ctx->progress, ++ctx->progress_cnt);
 
-		if (parse_commit_no_graph(*list))
+		if (repo_parse_commit_no_graph(ctx->r, *list))
 			die(_("unable to parse commit %s"),
 				oid_to_hex(&(*list)->object.oid));
 		tree = get_commit_tree_oid(*list);
-		if (!tree)
-			die(_("unable to get tree for %s"),
-				oid_to_hex(&(*list)->object.oid));
-		hashwrite(f, tree->hash, hash_len);
+		hashwrite(f, tree->hash, the_hash_algo->rawsz);
 
 		parent = (*list)->parents;
 
 		if (!parent)
 			edge_value = GRAPH_PARENT_NONE;
 		else {
-			edge_value = sha1_pos(parent->item->object.oid.hash,
-					      ctx->commits.list,
-					      ctx->commits.nr,
-					      commit_to_sha1);
+			edge_value = oid_pos(&parent->item->object.oid,
+					     ctx->commits.list,
+					     ctx->commits.nr,
+					     commit_to_oid);
 
 			if (edge_value >= 0)
 				edge_value += ctx->new_num_commits_in_base;
-			else {
+			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;
 			}
 
@@ -899,18 +1142,18 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len,
 		else if (parent->next)
 			edge_value = GRAPH_EXTRA_EDGES_NEEDED | num_extra_edges;
 		else {
-			edge_value = sha1_pos(parent->item->object.oid.hash,
-					      ctx->commits.list,
-					      ctx->commits.nr,
-					      commit_to_sha1);
+			edge_value = oid_pos(&parent->item->object.oid,
+					     ctx->commits.list,
+					     ctx->commits.nr,
+					     commit_to_oid);
 
 			if (edge_value >= 0)
 				edge_value += ctx->new_num_commits_in_base;
-			else {
+			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;
 			}
 
@@ -934,18 +1177,64 @@ static void write_graph_chunk_data(struct hashfile *f, int hash_len,
 		else
 			packedDate[0] = 0;
 
-		packedDate[0] |= htonl((*list)->generation << 2);
+		packedDate[0] |= htonl(*topo_level_slab_at(ctx->topo_levels, *list) << 2);
 
 		packedDate[1] = htonl((*list)->date);
 		hashwrite(f, packedDate, 8);
 
 		list++;
 	}
+
+	return 0;
+}
+
+static int write_graph_chunk_generation_data(struct hashfile *f,
+					     void *data)
+{
+	struct write_commit_graph_context *ctx = data;
+	int i, num_generation_data_overflows = 0;
+
+	for (i = 0; i < ctx->commits.nr; i++) {
+		struct commit *c = ctx->commits.list[i];
+		timestamp_t offset;
+		repo_parse_commit(ctx->r, c);
+		offset = commit_graph_data_at(c)->generation - c->date;
+		display_progress(ctx->progress, ++ctx->progress_cnt);
+
+		if (offset > GENERATION_NUMBER_V2_OFFSET_MAX) {
+			offset = CORRECTED_COMMIT_DATE_OFFSET_OVERFLOW | num_generation_data_overflows;
+			num_generation_data_overflows++;
+		}
+
+		hashwrite_be32(f, offset);
+	}
+
+	return 0;
+}
+
+static int write_graph_chunk_generation_data_overflow(struct hashfile *f,
+						      void *data)
+{
+	struct write_commit_graph_context *ctx = data;
+	int i;
+	for (i = 0; i < ctx->commits.nr; i++) {
+		struct commit *c = ctx->commits.list[i];
+		timestamp_t offset = commit_graph_data_at(c)->generation - c->date;
+		display_progress(ctx->progress, ++ctx->progress_cnt);
+
+		if (offset > GENERATION_NUMBER_V2_OFFSET_MAX) {
+			hashwrite_be32(f, offset >> 32);
+			hashwrite_be32(f, (uint32_t) offset);
+		}
+	}
+
+	return 0;
 }
 
-static void write_graph_chunk_extra_edges(struct hashfile *f,
-					  struct write_commit_graph_context *ctx)
+static int write_graph_chunk_extra_edges(struct hashfile *f,
+					 void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	struct commit **list = ctx->commits.list;
 	struct commit **last = ctx->commits.list + ctx->commits.nr;
 	struct commit_list *parent;
@@ -966,18 +1255,18 @@ static void write_graph_chunk_extra_edges(struct hashfile *f,
 
 		/* Since num_parents > 2, this initializer is safe. */
 		for (parent = (*list)->parents->next; parent; parent = parent->next) {
-			int edge_value = sha1_pos(parent->item->object.oid.hash,
-						  ctx->commits.list,
-						  ctx->commits.nr,
-						  commit_to_sha1);
+			int edge_value = oid_pos(&parent->item->object.oid,
+						 ctx->commits.list,
+						 ctx->commits.nr,
+						 commit_to_oid);
 
 			if (edge_value >= 0)
 				edge_value += ctx->new_num_commits_in_base;
-			else {
+			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;
 			}
 
@@ -993,13 +1282,70 @@ static void write_graph_chunk_extra_edges(struct hashfile *f,
 
 		list++;
 	}
+
+	return 0;
+}
+
+static int write_graph_chunk_bloom_indexes(struct hashfile *f,
+					   void *data)
+{
+	struct write_commit_graph_context *ctx = data;
+	struct commit **list = ctx->commits.list;
+	struct commit **last = ctx->commits.list + ctx->commits.nr;
+	uint32_t cur_pos = 0;
+
+	while (list < last) {
+		struct bloom_filter *filter = get_bloom_filter(ctx->r, *list);
+		size_t len = filter ? filter->len : 0;
+		cur_pos += len;
+		display_progress(ctx->progress, ++ctx->progress_cnt);
+		hashwrite_be32(f, cur_pos);
+		list++;
+	}
+
+	return 0;
+}
+
+static void trace2_bloom_filter_settings(struct write_commit_graph_context *ctx)
+{
+	struct json_writer jw = JSON_WRITER_INIT;
+
+	jw_object_begin(&jw, 0);
+	jw_object_intmax(&jw, "hash_version", ctx->bloom_settings->hash_version);
+	jw_object_intmax(&jw, "num_hashes", ctx->bloom_settings->num_hashes);
+	jw_object_intmax(&jw, "bits_per_entry", ctx->bloom_settings->bits_per_entry);
+	jw_object_intmax(&jw, "max_changed_paths", ctx->bloom_settings->max_changed_paths);
+	jw_end(&jw);
+
+	trace2_data_json("bloom", ctx->r, "settings", &jw);
+
+	jw_release(&jw);
 }
 
-static int oid_compare(const void *_a, const void *_b)
+static int write_graph_chunk_bloom_data(struct hashfile *f,
+					void *data)
 {
-	const struct object_id *a = (const struct object_id *)_a;
-	const struct object_id *b = (const struct object_id *)_b;
-	return oidcmp(a, b);
+	struct write_commit_graph_context *ctx = data;
+	struct commit **list = ctx->commits.list;
+	struct commit **last = ctx->commits.list + ctx->commits.nr;
+
+	trace2_bloom_filter_settings(ctx);
+
+	hashwrite_be32(f, ctx->bloom_settings->hash_version);
+	hashwrite_be32(f, ctx->bloom_settings->num_hashes);
+	hashwrite_be32(f, ctx->bloom_settings->bits_per_entry);
+
+	while (list < last) {
+		struct bloom_filter *filter = get_bloom_filter(ctx->r, *list);
+		size_t len = filter ? filter->len : 0;
+
+		display_progress(ctx->progress, ++ctx->progress_cnt);
+		if (len)
+			hashwrite(f, filter->data, len * sizeof(unsigned char));
+		list++;
+	}
+
+	return 0;
 }
 
 static int add_packed_commits(const struct object_id *oid,
@@ -1022,9 +1368,8 @@ static int add_packed_commits(const struct object_id *oid,
 	if (type != OBJ_COMMIT)
 		return 0;
 
-	ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
-	oidcpy(&(ctx->oids.list[ctx->oids.nr]), oid);
-	ctx->oids.nr++;
+	oid_array_append(&ctx->oids, oid);
+	set_commit_pos(ctx->r, oid);
 
 	return 0;
 }
@@ -1034,9 +1379,7 @@ static void add_missing_parents(struct write_commit_graph_context *ctx, struct c
 	struct commit_list *parent;
 	for (parent = commit->parents; parent; parent = parent->next) {
 		if (!(parent->item->object.flags & REACHABLE)) {
-			ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
-			oidcpy(&ctx->oids.list[ctx->oids.nr], &(parent->item->object.oid));
-			ctx->oids.nr++;
+			oid_array_append(&ctx->oids, &parent->item->object.oid);
 			parent->item->object.flags |= REACHABLE;
 		}
 	}
@@ -1046,6 +1389,8 @@ static void close_reachable(struct write_commit_graph_context *ctx)
 {
 	int i;
 	struct commit *commit;
+	enum commit_graph_split_flags flags = ctx->opts ?
+		ctx->opts->split_flags : COMMIT_GRAPH_SPLIT_UNSPECIFIED;
 
 	if (ctx->report_progress)
 		ctx->progress = start_delayed_progress(
@@ -1053,7 +1398,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
 					ctx->oids.nr);
 	for (i = 0; i < ctx->oids.nr; i++) {
 		display_progress(ctx->progress, i + 1);
-		commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
+		commit = lookup_commit(ctx->r, &ctx->oids.oid[i]);
 		if (commit)
 			commit->object.flags |= REACHABLE;
 	}
@@ -1070,15 +1415,16 @@ static void close_reachable(struct write_commit_graph_context *ctx)
 					0);
 	for (i = 0; i < ctx->oids.nr; i++) {
 		display_progress(ctx->progress, i + 1);
-		commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
+		commit = lookup_commit(ctx->r, &ctx->oids.oid[i]);
 
 		if (!commit)
 			continue;
 		if (ctx->split) {
-			if (!parse_commit(commit) &&
-			    commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
+			if ((!repo_parse_commit(ctx->r, commit) &&
+			     commit_graph_position(commit) == COMMIT_NOT_FROM_GRAPH) ||
+			    flags == COMMIT_GRAPH_SPLIT_REPLACE)
 				add_missing_parents(ctx, commit);
-		} else if (!parse_commit_no_graph(commit))
+		} else if (!repo_parse_commit_no_graph(ctx->r, commit))
 			add_missing_parents(ctx, commit);
 	}
 	stop_progress(&ctx->progress);
@@ -1089,7 +1435,7 @@ static void close_reachable(struct write_commit_graph_context *ctx)
 					ctx->oids.nr);
 	for (i = 0; i < ctx->oids.nr; i++) {
 		display_progress(ctx->progress, i + 1);
-		commit = lookup_commit(ctx->r, &ctx->oids.list[i]);
+		commit = lookup_commit(ctx->r, &ctx->oids.oid[i]);
 
 		if (commit)
 			commit->object.flags &= ~REACHABLE;
@@ -1097,73 +1443,234 @@ static void close_reachable(struct write_commit_graph_context *ctx)
 	stop_progress(&ctx->progress);
 }
 
+static void compute_topological_levels(struct write_commit_graph_context *ctx)
+{
+	int i;
+	struct commit_list *list = NULL;
+
+	if (ctx->report_progress)
+		ctx->progress = start_delayed_progress(
+					_("Computing commit graph topological levels"),
+					ctx->commits.nr);
+	for (i = 0; i < ctx->commits.nr; i++) {
+		struct commit *c = ctx->commits.list[i];
+		uint32_t level;
+
+		repo_parse_commit(ctx->r, c);
+		level = *topo_level_slab_at(ctx->topo_levels, c);
+
+		display_progress(ctx->progress, i + 1);
+		if (level != GENERATION_NUMBER_ZERO)
+			continue;
+
+		commit_list_insert(c, &list);
+		while (list) {
+			struct commit *current = list->item;
+			struct commit_list *parent;
+			int all_parents_computed = 1;
+			uint32_t max_level = 0;
+
+			for (parent = current->parents; parent; parent = parent->next) {
+				repo_parse_commit(ctx->r, parent->item);
+				level = *topo_level_slab_at(ctx->topo_levels, parent->item);
+
+				if (level == GENERATION_NUMBER_ZERO) {
+					all_parents_computed = 0;
+					commit_list_insert(parent->item, &list);
+					break;
+				}
+
+				if (level > max_level)
+					max_level = level;
+			}
+
+			if (all_parents_computed) {
+				pop_commit(&list);
+
+				if (max_level > GENERATION_NUMBER_V1_MAX - 1)
+					max_level = GENERATION_NUMBER_V1_MAX - 1;
+				*topo_level_slab_at(ctx->topo_levels, current) = max_level + 1;
+			}
+		}
+	}
+	stop_progress(&ctx->progress);
+}
+
 static void compute_generation_numbers(struct write_commit_graph_context *ctx)
 {
 	int i;
 	struct commit_list *list = NULL;
 
 	if (ctx->report_progress)
-		ctx->progress = start_progress(
+		ctx->progress = start_delayed_progress(
 					_("Computing commit graph generation numbers"),
 					ctx->commits.nr);
+
+	if (!ctx->trust_generation_numbers) {
+		for (i = 0; i < ctx->commits.nr; i++) {
+			struct commit *c = ctx->commits.list[i];
+			repo_parse_commit(ctx->r, c);
+			commit_graph_data_at(c)->generation = GENERATION_NUMBER_ZERO;
+		}
+	}
+
 	for (i = 0; i < ctx->commits.nr; i++) {
+		struct commit *c = ctx->commits.list[i];
+		timestamp_t corrected_commit_date;
+
+		repo_parse_commit(ctx->r, c);
+		corrected_commit_date = commit_graph_data_at(c)->generation;
+
 		display_progress(ctx->progress, i + 1);
-		if (ctx->commits.list[i]->generation != GENERATION_NUMBER_INFINITY &&
-		    ctx->commits.list[i]->generation != GENERATION_NUMBER_ZERO)
+		if (corrected_commit_date != GENERATION_NUMBER_ZERO)
 			continue;
 
-		commit_list_insert(ctx->commits.list[i], &list);
+		commit_list_insert(c, &list);
 		while (list) {
 			struct commit *current = list->item;
 			struct commit_list *parent;
 			int all_parents_computed = 1;
-			uint32_t max_generation = 0;
+			timestamp_t max_corrected_commit_date = 0;
 
 			for (parent = current->parents; parent; parent = parent->next) {
-				if (parent->item->generation == GENERATION_NUMBER_INFINITY ||
-				    parent->item->generation == GENERATION_NUMBER_ZERO) {
+				repo_parse_commit(ctx->r, parent->item);
+				corrected_commit_date = commit_graph_data_at(parent->item)->generation;
+
+				if (corrected_commit_date == GENERATION_NUMBER_ZERO) {
 					all_parents_computed = 0;
 					commit_list_insert(parent->item, &list);
 					break;
-				} else if (parent->item->generation > max_generation) {
-					max_generation = parent->item->generation;
 				}
+
+				if (corrected_commit_date > max_corrected_commit_date)
+					max_corrected_commit_date = corrected_commit_date;
 			}
 
 			if (all_parents_computed) {
-				current->generation = max_generation + 1;
 				pop_commit(&list);
 
-				if (current->generation > GENERATION_NUMBER_MAX)
-					current->generation = GENERATION_NUMBER_MAX;
+				if (current->date && current->date > max_corrected_commit_date)
+					max_corrected_commit_date = current->date - 1;
+				commit_graph_data_at(current)->generation = max_corrected_commit_date + 1;
+
+				if (commit_graph_data_at(current)->generation - current->date > GENERATION_NUMBER_V2_OFFSET_MAX)
+					ctx->num_generation_data_overflows++;
 			}
 		}
 	}
 	stop_progress(&ctx->progress);
 }
 
-static int add_ref_to_list(const char *refname,
-			   const struct object_id *oid,
-			   int flags, void *cb_data)
+static void trace2_bloom_filter_write_statistics(struct write_commit_graph_context *ctx)
 {
-	struct string_list *list = (struct string_list *)cb_data;
+	trace2_data_intmax("commit-graph", ctx->r, "filter-computed",
+			   ctx->count_bloom_filter_computed);
+	trace2_data_intmax("commit-graph", ctx->r, "filter-not-computed",
+			   ctx->count_bloom_filter_not_computed);
+	trace2_data_intmax("commit-graph", ctx->r, "filter-trunc-empty",
+			   ctx->count_bloom_filter_trunc_empty);
+	trace2_data_intmax("commit-graph", ctx->r, "filter-trunc-large",
+			   ctx->count_bloom_filter_trunc_large);
+}
+
+static void compute_bloom_filters(struct write_commit_graph_context *ctx)
+{
+	int i;
+	struct progress *progress = NULL;
+	struct commit **sorted_commits;
+	int max_new_filters;
+
+	init_bloom_filters();
+
+	if (ctx->report_progress)
+		progress = start_delayed_progress(
+			_("Computing commit changed paths Bloom filters"),
+			ctx->commits.nr);
+
+	ALLOC_ARRAY(sorted_commits, ctx->commits.nr);
+	COPY_ARRAY(sorted_commits, ctx->commits.list, ctx->commits.nr);
+
+	if (ctx->order_by_pack)
+		QSORT(sorted_commits, ctx->commits.nr, commit_pos_cmp);
+	else
+		QSORT(sorted_commits, ctx->commits.nr, commit_gen_cmp);
+
+	max_new_filters = ctx->opts && ctx->opts->max_new_filters >= 0 ?
+		ctx->opts->max_new_filters : ctx->commits.nr;
+
+	for (i = 0; i < ctx->commits.nr; i++) {
+		enum bloom_filter_computed computed = 0;
+		struct commit *c = sorted_commits[i];
+		struct bloom_filter *filter = get_or_compute_bloom_filter(
+			ctx->r,
+			c,
+			ctx->count_bloom_filter_computed < max_new_filters,
+			ctx->bloom_settings,
+			&computed);
+		if (computed & BLOOM_COMPUTED) {
+			ctx->count_bloom_filter_computed++;
+			if (computed & BLOOM_TRUNC_EMPTY)
+				ctx->count_bloom_filter_trunc_empty++;
+			if (computed & BLOOM_TRUNC_LARGE)
+				ctx->count_bloom_filter_trunc_large++;
+		} else if (computed & BLOOM_NOT_COMPUTED)
+			ctx->count_bloom_filter_not_computed++;
+		ctx->total_bloom_filter_data_size += filter
+			? sizeof(unsigned char) * filter->len : 0;
+		display_progress(progress, i + 1);
+	}
+
+	if (trace2_is_enabled())
+		trace2_bloom_filter_write_statistics(ctx);
+
+	free(sorted_commits);
+	stop_progress(&progress);
+}
+
+struct refs_cb_data {
+	struct oidset *commits;
+	struct progress *progress;
+};
+
+static int add_ref_to_set(const char *refname,
+			  const struct object_id *oid,
+			  int flags, void *cb_data)
+{
+	struct object_id peeled;
+	struct refs_cb_data *data = (struct refs_cb_data *)cb_data;
+
+	if (!peel_iterated_oid(oid, &peeled))
+		oid = &peeled;
+	if (oid_object_info(the_repository, oid, NULL) == OBJ_COMMIT)
+		oidset_insert(data->commits, oid);
+
+	display_progress(data->progress, oidset_size(data->commits));
 
-	string_list_append(list, oid_to_hex(oid));
 	return 0;
 }
 
-int write_commit_graph_reachable(const char *obj_dir,
+int write_commit_graph_reachable(struct object_directory *odb,
 				 enum commit_graph_write_flags flags,
-				 const struct split_commit_graph_opts *split_opts)
+				 const struct commit_graph_opts *opts)
 {
-	struct string_list list = STRING_LIST_INIT_DUP;
+	struct oidset commits = OIDSET_INIT;
+	struct refs_cb_data data;
 	int result;
 
-	for_each_ref(add_ref_to_list, &list);
-	result = write_commit_graph(obj_dir, NULL, &list,
-				    flags, split_opts);
+	memset(&data, 0, sizeof(data));
+	data.commits = &commits;
+	if (flags & COMMIT_GRAPH_WRITE_PROGRESS)
+		data.progress = start_delayed_progress(
+			_("Collecting referenced commits"), 0);
+
+	for_each_ref(add_ref_to_set, &data);
 
-	string_list_clear(&list, 0);
+	stop_progress(&data.progress);
+
+	result = write_commit_graph(odb, NULL, &commits,
+				    flags, opts);
+
+	oidset_clear(&commits);
 	return result;
 }
 
@@ -1175,7 +1682,7 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
 	struct strbuf packname = STRBUF_INIT;
 	int dirlen;
 
-	strbuf_addf(&packname, "%s/pack/", ctx->obj_dir);
+	strbuf_addf(&packname, "%s/pack/", ctx->odb->path);
 	dirlen = packname.len;
 	if (ctx->report_progress) {
 		strbuf_addf(&progress_title,
@@ -1212,41 +1719,19 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
 	return 0;
 }
 
-static int fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
-				     struct string_list *commit_hex)
+static int fill_oids_from_commits(struct write_commit_graph_context *ctx,
+				  struct oidset *commits)
 {
-	uint32_t i;
-	struct strbuf progress_title = STRBUF_INIT;
+	struct oidset_iter iter;
+	struct object_id *oid;
 
-	if (ctx->report_progress) {
-		strbuf_addf(&progress_title,
-			    Q_("Finding commits for commit graph from %d ref",
-			       "Finding commits for commit graph from %d refs",
-			       commit_hex->nr),
-			    commit_hex->nr);
-		ctx->progress = start_delayed_progress(
-					progress_title.buf,
-					commit_hex->nr);
-	}
-	for (i = 0; i < commit_hex->nr; i++) {
-		const char *end;
-		struct object_id oid;
-		struct commit *result;
+	if (!oidset_size(commits))
+		return 0;
 
-		display_progress(ctx->progress, i + 1);
-		if (!parse_oid_hex(commit_hex->items[i].string, &oid, &end) &&
-		    (result = lookup_commit_reference_gently(ctx->r, &oid, 1))) {
-			ALLOC_GROW(ctx->oids.list, ctx->oids.nr + 1, ctx->oids.alloc);
-			oidcpy(&ctx->oids.list[ctx->oids.nr], &(result->object.oid));
-			ctx->oids.nr++;
-		} else if (ctx->check_oids) {
-			error(_("invalid commit object id: %s"),
-			    commit_hex->items[i].string);
-			return -1;
-		}
+	oidset_iter_init(commits, &iter);
+	while ((oid = oidset_iter_next(&iter))) {
+		oid_array_append(&ctx->oids, oid);
 	}
-	stop_progress(&ctx->progress);
-	strbuf_release(&progress_title);
 
 	return 0;
 }
@@ -1264,59 +1749,34 @@ static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx)
 	stop_progress(&ctx->progress);
 }
 
-static uint32_t count_distinct_commits(struct write_commit_graph_context *ctx)
-{
-	uint32_t i, count_distinct = 1;
-
-	if (ctx->report_progress)
-		ctx->progress = start_delayed_progress(
-			_("Counting distinct commits in commit graph"),
-			ctx->oids.nr);
-	display_progress(ctx->progress, 0); /* TODO: Measure QSORT() progress */
-	QSORT(ctx->oids.list, ctx->oids.nr, oid_compare);
-
-	for (i = 1; i < ctx->oids.nr; i++) {
-		display_progress(ctx->progress, i + 1);
-		if (!oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i])) {
-			if (ctx->split) {
-				struct commit *c = lookup_commit(ctx->r, &ctx->oids.list[i]);
-
-				if (!c || c->graph_pos != COMMIT_NOT_FROM_GRAPH)
-					continue;
-			}
-
-			count_distinct++;
-		}
-	}
-	stop_progress(&ctx->progress);
-
-	return count_distinct;
-}
-
 static void copy_oids_to_commits(struct write_commit_graph_context *ctx)
 {
 	uint32_t i;
+	enum commit_graph_split_flags flags = ctx->opts ?
+		ctx->opts->split_flags : COMMIT_GRAPH_SPLIT_UNSPECIFIED;
 
 	ctx->num_extra_edges = 0;
 	if (ctx->report_progress)
 		ctx->progress = start_delayed_progress(
 			_("Finding extra edges in commit graph"),
 			ctx->oids.nr);
-	for (i = 0; i < ctx->oids.nr; i++) {
+	oid_array_sort(&ctx->oids);
+	for (i = 0; i < ctx->oids.nr; i = oid_array_next_unique(&ctx->oids, i)) {
 		unsigned int num_parents;
 
 		display_progress(ctx->progress, i + 1);
-		if (i > 0 && oideq(&ctx->oids.list[i - 1], &ctx->oids.list[i]))
-			continue;
 
 		ALLOC_GROW(ctx->commits.list, ctx->commits.nr + 1, ctx->commits.alloc);
-		ctx->commits.list[ctx->commits.nr] = lookup_commit(ctx->r, &ctx->oids.list[i]);
+		ctx->commits.list[ctx->commits.nr] = lookup_commit(ctx->r, &ctx->oids.oid[i]);
 
-		if (ctx->split &&
-		    ctx->commits.list[ctx->commits.nr]->graph_pos != COMMIT_NOT_FROM_GRAPH)
+		if (ctx->split && flags != COMMIT_GRAPH_SPLIT_REPLACE &&
+		    commit_graph_position(ctx->commits.list[ctx->commits.nr]) != COMMIT_NOT_FROM_GRAPH)
 			continue;
 
-		parse_commit_no_graph(ctx->commits.list[ctx->commits.nr]);
+		if (ctx->split && flags == COMMIT_GRAPH_SPLIT_REPLACE)
+			repo_parse_commit(ctx->r, ctx->commits.list[ctx->commits.nr]);
+		else
+			repo_parse_commit_no_graph(ctx->r, ctx->commits.list[ctx->commits.nr]);
 
 		num_parents = commit_list_count(ctx->commits.list[ctx->commits.nr]->parents);
 		if (num_parents > 2)
@@ -1341,8 +1801,9 @@ static int write_graph_chunk_base_1(struct hashfile *f,
 }
 
 static int write_graph_chunk_base(struct hashfile *f,
-				  struct write_commit_graph_context *ctx)
+				    void *data)
 {
+	struct write_commit_graph_context *ctx = data;
 	int num = write_graph_chunk_base_1(f, ctx->new_base_graph);
 
 	if (num != ctx->num_commit_graphs_after - 1) {
@@ -1359,22 +1820,20 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 	int fd;
 	struct hashfile *f;
 	struct lock_file lk = LOCK_INIT;
-	uint32_t chunk_ids[6];
-	uint64_t chunk_offsets[6];
 	const unsigned hashsz = the_hash_algo->rawsz;
 	struct strbuf progress_title = STRBUF_INIT;
-	int num_chunks = 3;
-	struct object_id file_hash;
+	struct chunkfile *cf;
+	unsigned char file_hash[GIT_MAX_RAWSZ];
 
 	if (ctx->split) {
 		struct strbuf tmp_file = STRBUF_INIT;
 
 		strbuf_addf(&tmp_file,
 			    "%s/info/commit-graphs/tmp_graph_XXXXXX",
-			    ctx->obj_dir);
+			    ctx->odb->path);
 		ctx->graph_name = strbuf_detach(&tmp_file, NULL);
 	} else {
-		ctx->graph_name = get_commit_graph_filename(ctx->obj_dir);
+		ctx->graph_name = get_commit_graph_filename(ctx->odb);
 	}
 
 	if (safe_create_leading_directories(ctx->graph_name)) {
@@ -1385,95 +1844,92 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 	}
 
 	if (ctx->split) {
-		char *lock_name = get_chain_filename(ctx->obj_dir);
+		char *lock_name = get_commit_graph_chain_filename(ctx->odb);
 
-		hold_lock_file_for_update(&lk, lock_name, LOCK_DIE_ON_ERROR);
+		hold_lock_file_for_update_mode(&lk, lock_name,
+					       LOCK_DIE_ON_ERROR, 0444);
 
 		fd = git_mkstemp_mode(ctx->graph_name, 0444);
 		if (fd < 0) {
-			error(_("unable to create '%s'"), ctx->graph_name);
+			error(_("unable to create temporary graph layer"));
+			return -1;
+		}
+
+		if (adjust_shared_perm(ctx->graph_name)) {
+			error(_("unable to adjust shared permissions for '%s'"),
+			      ctx->graph_name);
 			return -1;
 		}
 
 		f = hashfd(fd, ctx->graph_name);
 	} else {
-		hold_lock_file_for_update(&lk, ctx->graph_name, LOCK_DIE_ON_ERROR);
-		fd = lk.tempfile->fd;
-		f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
-	}
-
-	chunk_ids[0] = GRAPH_CHUNKID_OIDFANOUT;
-	chunk_ids[1] = GRAPH_CHUNKID_OIDLOOKUP;
-	chunk_ids[2] = GRAPH_CHUNKID_DATA;
-	if (ctx->num_extra_edges) {
-		chunk_ids[num_chunks] = GRAPH_CHUNKID_EXTRAEDGES;
-		num_chunks++;
-	}
-	if (ctx->num_commit_graphs_after > 1) {
-		chunk_ids[num_chunks] = GRAPH_CHUNKID_BASE;
-		num_chunks++;
-	}
-
-	chunk_ids[num_chunks] = 0;
-
-	chunk_offsets[0] = 8 + (num_chunks + 1) * GRAPH_CHUNKLOOKUP_WIDTH;
-	chunk_offsets[1] = chunk_offsets[0] + GRAPH_FANOUT_SIZE;
-	chunk_offsets[2] = chunk_offsets[1] + hashsz * ctx->commits.nr;
-	chunk_offsets[3] = chunk_offsets[2] + (hashsz + 16) * ctx->commits.nr;
-
-	num_chunks = 3;
-	if (ctx->num_extra_edges) {
-		chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
-						4 * ctx->num_extra_edges;
-		num_chunks++;
-	}
-	if (ctx->num_commit_graphs_after > 1) {
-		chunk_offsets[num_chunks + 1] = chunk_offsets[num_chunks] +
-						hashsz * (ctx->num_commit_graphs_after - 1);
-		num_chunks++;
-	}
+		hold_lock_file_for_update_mode(&lk, ctx->graph_name,
+					       LOCK_DIE_ON_ERROR, 0444);
+		fd = get_lock_file_fd(&lk);
+		f = hashfd(fd, get_lock_file_path(&lk));
+	}
+
+	cf = init_chunkfile(f);
+
+	add_chunk(cf, GRAPH_CHUNKID_OIDFANOUT, GRAPH_FANOUT_SIZE,
+		  write_graph_chunk_fanout);
+	add_chunk(cf, GRAPH_CHUNKID_OIDLOOKUP, hashsz * ctx->commits.nr,
+		  write_graph_chunk_oids);
+	add_chunk(cf, GRAPH_CHUNKID_DATA, (hashsz + 16) * ctx->commits.nr,
+		  write_graph_chunk_data);
+
+	if (ctx->write_generation_data)
+		add_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA,
+			  sizeof(uint32_t) * ctx->commits.nr,
+			  write_graph_chunk_generation_data);
+	if (ctx->num_generation_data_overflows)
+		add_chunk(cf, GRAPH_CHUNKID_GENERATION_DATA_OVERFLOW,
+			  sizeof(timestamp_t) * ctx->num_generation_data_overflows,
+			  write_graph_chunk_generation_data_overflow);
+	if (ctx->num_extra_edges)
+		add_chunk(cf, GRAPH_CHUNKID_EXTRAEDGES,
+			  4 * ctx->num_extra_edges,
+			  write_graph_chunk_extra_edges);
+	if (ctx->changed_paths) {
+		add_chunk(cf, GRAPH_CHUNKID_BLOOMINDEXES,
+			  sizeof(uint32_t) * ctx->commits.nr,
+			  write_graph_chunk_bloom_indexes);
+		add_chunk(cf, GRAPH_CHUNKID_BLOOMDATA,
+			  sizeof(uint32_t) * 3
+				+ ctx->total_bloom_filter_data_size,
+			  write_graph_chunk_bloom_data);
+	}
+	if (ctx->num_commit_graphs_after > 1)
+		add_chunk(cf, GRAPH_CHUNKID_BASE,
+			  hashsz * (ctx->num_commit_graphs_after - 1),
+			  write_graph_chunk_base);
 
 	hashwrite_be32(f, GRAPH_SIGNATURE);
 
 	hashwrite_u8(f, GRAPH_VERSION);
 	hashwrite_u8(f, oid_version());
-	hashwrite_u8(f, num_chunks);
+	hashwrite_u8(f, get_num_chunks(cf));
 	hashwrite_u8(f, ctx->num_commit_graphs_after - 1);
 
-	for (i = 0; i <= num_chunks; i++) {
-		uint32_t chunk_write[3];
-
-		chunk_write[0] = htonl(chunk_ids[i]);
-		chunk_write[1] = htonl(chunk_offsets[i] >> 32);
-		chunk_write[2] = htonl(chunk_offsets[i] & 0xffffffff);
-		hashwrite(f, chunk_write, 12);
-	}
-
 	if (ctx->report_progress) {
 		strbuf_addf(&progress_title,
 			    Q_("Writing out commit graph in %d pass",
 			       "Writing out commit graph in %d passes",
-			       num_chunks),
-			    num_chunks);
+			       get_num_chunks(cf)),
+			    get_num_chunks(cf));
 		ctx->progress = start_delayed_progress(
 			progress_title.buf,
-			num_chunks * ctx->commits.nr);
-	}
-	write_graph_chunk_fanout(f, ctx);
-	write_graph_chunk_oids(f, hashsz, ctx);
-	write_graph_chunk_data(f, hashsz, ctx);
-	if (ctx->num_extra_edges)
-		write_graph_chunk_extra_edges(f, ctx);
-	if (ctx->num_commit_graphs_after > 1 &&
-	    write_graph_chunk_base(f, ctx)) {
-		return -1;
+			get_num_chunks(cf) * ctx->commits.nr);
 	}
+
+	write_chunkfile(cf, ctx);
+
 	stop_progress(&ctx->progress);
 	strbuf_release(&progress_title);
 
 	if (ctx->split && ctx->base_graph_name && ctx->num_commit_graphs_after > 1) {
 		char *new_base_hash = xstrdup(oid_to_hex(&ctx->new_base_graph->oid));
-		char *new_base_name = get_split_graph_filename(ctx->new_base_graph->obj_dir, new_base_hash);
+		char *new_base_name = get_split_graph_filename(ctx->new_base_graph->odb, new_base_hash);
 
 		free(ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 2]);
 		free(ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 2]);
@@ -1482,7 +1938,8 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 	}
 
 	close_commit_graph(ctx->r->objects);
-	finalize_hashfile(f, file_hash.hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC);
+	finalize_hashfile(f, file_hash, CSUM_HASH_IN_STREAM | CSUM_FSYNC);
+	free_chunkfile(cf);
 
 	if (ctx->split) {
 		FILE *chainf = fdopen_lock_file(&lk, "w");
@@ -1497,8 +1954,12 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 		}
 
 		if (ctx->base_graph_name) {
-			const char *dest = ctx->commit_graph_filenames_after[
-						ctx->num_commit_graphs_after - 2];
+			const char *dest;
+			int idx = ctx->num_commit_graphs_after - 1;
+			if (ctx->num_commit_graphs_after > 1)
+				idx--;
+
+			dest = ctx->commit_graph_filenames_after[idx];
 
 			if (strcmp(ctx->base_graph_name, dest)) {
 				result = rename(ctx->base_graph_name, dest);
@@ -1509,19 +1970,19 @@ static int write_commit_graph_file(struct write_commit_graph_context *ctx)
 				}
 			}
 		} else {
-			char *graph_name = get_commit_graph_filename(ctx->obj_dir);
+			char *graph_name = get_commit_graph_filename(ctx->odb);
 			unlink(graph_name);
 		}
 
-		ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1] = xstrdup(oid_to_hex(&file_hash));
-		final_graph_name = get_split_graph_filename(ctx->obj_dir,
+		ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1] = xstrdup(hash_to_hex(file_hash));
+		final_graph_name = get_split_graph_filename(ctx->odb,
 					ctx->commit_graph_hash_after[ctx->num_commit_graphs_after - 1]);
 		ctx->commit_graph_filenames_after[ctx->num_commit_graphs_after - 1] = final_graph_name;
 
 		result = rename(ctx->graph_name, final_graph_name);
 
 		for (i = 0; i < ctx->num_commit_graphs_after; i++)
-			fprintf(lk.tempfile->fp, "%s\n", ctx->commit_graph_hash_after[i]);
+			fprintf(get_lock_file_fp(&lk), "%s\n", ctx->commit_graph_hash_after[i]);
 
 		if (result) {
 			error(_("failed to rename temporary commit-graph file"));
@@ -1538,38 +1999,53 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
 {
 	struct commit_graph *g;
 	uint32_t num_commits;
+	enum commit_graph_split_flags flags = COMMIT_GRAPH_SPLIT_UNSPECIFIED;
 	uint32_t i;
 
 	int max_commits = 0;
 	int size_mult = 2;
 
-	if (ctx->split_opts) {
-		max_commits = ctx->split_opts->max_commits;
-		size_mult = ctx->split_opts->size_multiple;
+	if (ctx->opts) {
+		max_commits = ctx->opts->max_commits;
+
+		if (ctx->opts->size_multiple)
+			size_mult = ctx->opts->size_multiple;
+
+		flags = ctx->opts->split_flags;
 	}
 
 	g = ctx->r->objects->commit_graph;
 	num_commits = ctx->commits.nr;
-	ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1;
-
-	while (g && (g->num_commits <= size_mult * num_commits ||
-		    (max_commits && num_commits > max_commits))) {
-		if (strcmp(g->obj_dir, ctx->obj_dir))
-			break;
+	if (flags == COMMIT_GRAPH_SPLIT_REPLACE)
+		ctx->num_commit_graphs_after = 1;
+	else
+		ctx->num_commit_graphs_after = ctx->num_commit_graphs_before + 1;
+
+	if (flags != COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED &&
+	    flags != COMMIT_GRAPH_SPLIT_REPLACE) {
+		while (g && (g->num_commits <= size_mult * num_commits ||
+			    (max_commits && num_commits > max_commits))) {
+			if (g->odb != ctx->odb)
+				break;
 
-		num_commits += g->num_commits;
-		g = g->base_graph;
+			num_commits += g->num_commits;
+			g = g->base_graph;
 
-		ctx->num_commit_graphs_after--;
+			ctx->num_commit_graphs_after--;
+		}
 	}
 
-	ctx->new_base_graph = g;
+	if (flags != COMMIT_GRAPH_SPLIT_REPLACE)
+		ctx->new_base_graph = g;
+	else if (ctx->num_commit_graphs_after != 1)
+		BUG("split_graph_merge_strategy: num_commit_graphs_after "
+		    "should be 1 with --split=replace");
 
 	if (ctx->num_commit_graphs_after == 2) {
-		char *old_graph_name = get_commit_graph_filename(g->obj_dir);
+		char *old_graph_name = get_commit_graph_filename(g->odb);
 
 		if (!strcmp(g->filename, old_graph_name) &&
-		    strcmp(g->obj_dir, ctx->obj_dir)) {
+		    g->odb != ctx->odb) {
 			ctx->num_commit_graphs_after = 1;
 			ctx->new_base_graph = NULL;
 		}
@@ -1577,8 +2053,8 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
 		free(old_graph_name);
 	}
 
-	ALLOC_ARRAY(ctx->commit_graph_filenames_after, ctx->num_commit_graphs_after);
-	ALLOC_ARRAY(ctx->commit_graph_hash_after, ctx->num_commit_graphs_after);
+	CALLOC_ARRAY(ctx->commit_graph_filenames_after, ctx->num_commit_graphs_after);
+	CALLOC_ARRAY(ctx->commit_graph_hash_after, ctx->num_commit_graphs_after);
 
 	for (i = 0; i < ctx->num_commit_graphs_after &&
 		    i < ctx->num_commit_graphs_before; i++)
@@ -1591,6 +2067,13 @@ static void split_graph_merge_strategy(struct write_commit_graph_context *ctx)
 		if (i < ctx->num_commit_graphs_after)
 			ctx->commit_graph_hash_after[i] = xstrdup(oid_to_hex(&g->oid));
 
+		/*
+		 * If the topmost remaining layer has generation data chunk, the
+		 * resultant layer also has generation data chunk.
+		 */
+		if (i == ctx->num_commit_graphs_after - 2)
+			ctx->write_generation_data = !!g->chunk_generation_data;
+
 		i--;
 		g = g->base_graph;
 	}
@@ -1631,7 +2114,7 @@ static int commit_compare(const void *_a, const void *_b)
 
 static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx)
 {
-	uint32_t i;
+	uint32_t i, dedup_i = 0;
 
 	if (ctx->report_progress)
 		ctx->progress = start_delayed_progress(
@@ -1646,17 +2129,27 @@ static void sort_and_scan_merged_commits(struct write_commit_graph_context *ctx)
 
 		if (i && oideq(&ctx->commits.list[i - 1]->object.oid,
 			  &ctx->commits.list[i]->object.oid)) {
-			die(_("unexpected duplicate commit id %s"),
-			    oid_to_hex(&ctx->commits.list[i]->object.oid));
+			/*
+			 * Silently ignore duplicates. These were likely
+			 * created due to a commit appearing in multiple
+			 * layers of the chain, which is unexpected but
+			 * not invalid. We should make sure there is a
+			 * unique copy in the new layer.
+			 */
 		} else {
 			unsigned int num_parents;
 
+			ctx->commits.list[dedup_i] = ctx->commits.list[i];
+			dedup_i++;
+
 			num_parents = commit_list_count(ctx->commits.list[i]->parents);
 			if (num_parents > 2)
 				ctx->num_extra_edges += num_parents - 1;
 		}
 	}
 
+	ctx->commits.nr = dedup_i;
+
 	stop_progress(&ctx->progress);
 }
 
@@ -1664,19 +2157,15 @@ static void merge_commit_graphs(struct write_commit_graph_context *ctx)
 {
 	struct commit_graph *g = ctx->r->objects->commit_graph;
 	uint32_t current_graph_number = ctx->num_commit_graphs_before;
-	struct strbuf progress_title = STRBUF_INIT;
 
 	while (g && current_graph_number >= ctx->num_commit_graphs_after) {
 		current_graph_number--;
 
-		if (ctx->report_progress) {
-			strbuf_addstr(&progress_title, _("Merging commit-graph"));
-			ctx->progress = start_delayed_progress(progress_title.buf, 0);
-		}
+		if (ctx->report_progress)
+			ctx->progress = start_delayed_progress(_("Merging commit-graph"), 0);
 
 		merge_commit_graph(ctx, g);
 		stop_progress(&ctx->progress);
-		strbuf_release(&progress_title);
 
 		g = g->base_graph;
 	}
@@ -1717,16 +2206,16 @@ static void expire_commit_graphs(struct write_commit_graph_context *ctx)
 	size_t dirnamelen;
 	timestamp_t expire_time = time(NULL);
 
-	if (ctx->split_opts && ctx->split_opts->expire_time)
-		expire_time -= ctx->split_opts->expire_time;
+	if (ctx->opts && ctx->opts->expire_time)
+		expire_time = ctx->opts->expire_time;
 	if (!ctx->split) {
-		char *chain_file_name = get_chain_filename(ctx->obj_dir);
+		char *chain_file_name = get_commit_graph_chain_filename(ctx->odb);
 		unlink(chain_file_name);
 		free(chain_file_name);
 		ctx->num_commit_graphs_after = 0;
 	}
 
-	strbuf_addstr(&path, ctx->obj_dir);
+	strbuf_addstr(&path, ctx->odb->path);
 	strbuf_addstr(&path, "/info/commit-graphs");
 	dir = opendir(path.buf);
 
@@ -1765,42 +2254,77 @@ out:
 	strbuf_release(&path);
 }
 
-int write_commit_graph(const char *obj_dir,
+int write_commit_graph(struct object_directory *odb,
 		       struct string_list *pack_indexes,
-		       struct string_list *commit_hex,
+		       struct oidset *commits,
 		       enum commit_graph_write_flags flags,
-		       const struct split_commit_graph_opts *split_opts)
+		       const struct commit_graph_opts *opts)
 {
+	struct repository *r = the_repository;
 	struct write_commit_graph_context *ctx;
-	uint32_t i, count_distinct = 0;
-	size_t len;
+	uint32_t i;
 	int res = 0;
+	int replace = 0;
+	struct bloom_filter_settings bloom_settings = DEFAULT_BLOOM_FILTER_SETTINGS;
+	struct topo_level_slab topo_levels;
 
-	if (!commit_graph_compatible(the_repository))
+	prepare_repo_settings(r);
+	if (!r->settings.core_commit_graph) {
+		warning(_("attempting to write a commit-graph, but 'core.commitGraph' is disabled"));
+		return 0;
+	}
+	if (!commit_graph_compatible(r))
 		return 0;
 
-	ctx = xcalloc(1, sizeof(struct write_commit_graph_context));
-	ctx->r = the_repository;
-
-	/* normalize object dir with no trailing slash */
-	ctx->obj_dir = xmallocz(strlen(obj_dir) + 1);
-	normalize_path_copy(ctx->obj_dir, obj_dir);
-	len = strlen(ctx->obj_dir);
-	if (len && ctx->obj_dir[len - 1] == '/')
-		ctx->obj_dir[len - 1] = 0;
-
+	CALLOC_ARRAY(ctx, 1);
+	ctx->r = r;
+	ctx->odb = odb;
 	ctx->append = flags & COMMIT_GRAPH_WRITE_APPEND ? 1 : 0;
 	ctx->report_progress = flags & COMMIT_GRAPH_WRITE_PROGRESS ? 1 : 0;
 	ctx->split = flags & COMMIT_GRAPH_WRITE_SPLIT ? 1 : 0;
-	ctx->check_oids = flags & COMMIT_GRAPH_WRITE_CHECK_OIDS ? 1 : 0;
-	ctx->split_opts = split_opts;
+	ctx->opts = opts;
+	ctx->total_bloom_filter_data_size = 0;
+	ctx->write_generation_data = (get_configured_generation_version(r) == 2);
+	ctx->num_generation_data_overflows = 0;
+
+	bloom_settings.bits_per_entry = git_env_ulong("GIT_TEST_BLOOM_SETTINGS_BITS_PER_ENTRY",
+						      bloom_settings.bits_per_entry);
+	bloom_settings.num_hashes = git_env_ulong("GIT_TEST_BLOOM_SETTINGS_NUM_HASHES",
+						  bloom_settings.num_hashes);
+	bloom_settings.max_changed_paths = git_env_ulong("GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS",
+							 bloom_settings.max_changed_paths);
+	ctx->bloom_settings = &bloom_settings;
+
+	init_topo_level_slab(&topo_levels);
+	ctx->topo_levels = &topo_levels;
+
+	prepare_commit_graph(ctx->r);
+	if (ctx->r->objects->commit_graph) {
+		struct commit_graph *g = ctx->r->objects->commit_graph;
 
-	if (ctx->split) {
+		while (g) {
+			g->topo_levels = &topo_levels;
+			g = g->base_graph;
+		}
+	}
+
+	if (flags & COMMIT_GRAPH_WRITE_BLOOM_FILTERS)
+		ctx->changed_paths = 1;
+	if (!(flags & COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS)) {
 		struct commit_graph *g;
-		prepare_commit_graph(ctx->r);
 
 		g = ctx->r->objects->commit_graph;
 
+		/* We have changed-paths already. Keep them in the next graph */
+		if (g && g->chunk_bloom_data) {
+			ctx->changed_paths = 1;
+			ctx->bloom_settings = g->bloom_filter_settings;
+		}
+	}
+
+	if (ctx->split) {
+		struct commit_graph *g = ctx->r->objects->commit_graph;
+
 		while (g) {
 			ctx->num_commit_graphs_before++;
 			g = g->base_graph;
@@ -1816,57 +2340,39 @@ int write_commit_graph(const char *obj_dir,
 				g = g->base_graph;
 			}
 		}
-	}
 
-	ctx->approx_nr_objects = approximate_object_count();
-	ctx->oids.alloc = ctx->approx_nr_objects / 32;
-
-	if (ctx->split && split_opts && ctx->oids.alloc > split_opts->max_commits)
-		ctx->oids.alloc = split_opts->max_commits;
-
-	if (ctx->append) {
-		prepare_commit_graph_one(ctx->r, ctx->obj_dir);
-		if (ctx->r->objects->commit_graph)
-			ctx->oids.alloc += ctx->r->objects->commit_graph->num_commits;
+		if (ctx->opts)
+			replace = ctx->opts->split_flags & COMMIT_GRAPH_SPLIT_REPLACE;
 	}
 
-	if (ctx->oids.alloc < 1024)
-		ctx->oids.alloc = 1024;
-	ALLOC_ARRAY(ctx->oids.list, ctx->oids.alloc);
+	ctx->approx_nr_objects = approximate_object_count();
 
 	if (ctx->append && ctx->r->objects->commit_graph) {
 		struct commit_graph *g = ctx->r->objects->commit_graph;
 		for (i = 0; i < g->num_commits; i++) {
-			const unsigned char *hash = g->chunk_oid_lookup + g->hash_len * i;
-			hashcpy(ctx->oids.list[ctx->oids.nr++].hash, hash);
+			struct object_id oid;
+			oidread(&oid, g->chunk_oid_lookup + g->hash_len * i);
+			oid_array_append(&ctx->oids, &oid);
 		}
 	}
 
 	if (pack_indexes) {
+		ctx->order_by_pack = 1;
 		if ((res = fill_oids_from_packs(ctx, pack_indexes)))
 			goto cleanup;
 	}
 
-	if (commit_hex) {
-		if ((res = fill_oids_from_commit_hex(ctx, commit_hex)))
+	if (commits) {
+		if ((res = fill_oids_from_commits(ctx, commits)))
 			goto cleanup;
 	}
 
-	if (!pack_indexes && !commit_hex)
+	if (!pack_indexes && !commits) {
+		ctx->order_by_pack = 1;
 		fill_oids_from_all_packs(ctx);
-
-	close_reachable(ctx);
-
-	count_distinct = count_distinct_commits(ctx);
-
-	if (count_distinct >= GRAPH_EDGE_LAST_MASK) {
-		error(_("the commit graph format cannot write %d commits"), count_distinct);
-		res = -1;
-		goto cleanup;
 	}
 
-	ctx->commits.alloc = count_distinct;
-	ALLOC_ARRAY(ctx->commits.list, ctx->commits.alloc);
+	close_reachable(ctx);
 
 	copy_oids_to_commits(ctx);
 
@@ -1876,17 +2382,25 @@ int write_commit_graph(const char *obj_dir,
 		goto cleanup;
 	}
 
-	if (!ctx->commits.nr)
+	if (!ctx->commits.nr && !replace)
 		goto cleanup;
 
 	if (ctx->split) {
 		split_graph_merge_strategy(ctx);
 
-		merge_commit_graphs(ctx);
+		if (!replace)
+			merge_commit_graphs(ctx);
 	} else
 		ctx->num_commit_graphs_after = 1;
 
-	compute_generation_numbers(ctx);
+	ctx->trust_generation_numbers = validate_mixed_generation_chain(ctx->r->objects->commit_graph);
+
+	compute_topological_levels(ctx);
+	if (ctx->write_generation_data)
+		compute_generation_numbers(ctx);
+
+	if (ctx->changed_paths)
+		compute_bloom_filters(ctx);
 
 	res = write_commit_graph_file(ctx);
 
@@ -1898,8 +2412,8 @@ int write_commit_graph(const char *obj_dir,
 cleanup:
 	free(ctx->graph_name);
 	free(ctx->commits.list);
-	free(ctx->oids.list);
-	free(ctx->obj_dir);
+	oid_array_clear(&ctx->oids);
+	clear_topo_level_slab(&topo_levels);
 
 	if (ctx->commit_graph_filenames_after) {
 		for (i = 0; i < ctx->num_commit_graphs_after; i++) {
@@ -1923,6 +2437,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;
@@ -1937,13 +2452,16 @@ static void graph_report(const char *fmt, ...)
 #define GENERATION_ZERO_EXISTS 1
 #define GENERATION_NUMBER_EXISTS 2
 
+static int commit_graph_checksum_valid(struct commit_graph *g)
+{
+	return hashfile_checksum_valid(g->data, g->data_len);
+}
+
 int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 {
 	uint32_t i, cur_fanout_pos = 0;
-	struct object_id prev_oid, cur_oid, checksum;
+	struct object_id prev_oid, cur_oid;
 	int generation_zero = 0;
-	struct hashfile *f;
-	int devnull;
 	struct progress *progress = NULL;
 	int local_error = 0;
 
@@ -1956,11 +2474,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 	if (verify_commit_graph_error)
 		return verify_commit_graph_error;
 
-	devnull = open("/dev/null", O_WRONLY);
-	f = hashfd(devnull, NULL);
-	hashwrite(f, g->data, g->data_len - g->hash_len);
-	finalize_hashfile(f, checksum.hash, CSUM_CLOSE);
-	if (!hasheq(checksum.hash, g->data + g->data_len - g->hash_len)) {
+	if (!commit_graph_checksum_valid(g)) {
 		graph_report(_("the commit-graph file has incorrect checksum and is likely corrupt"));
 		verify_commit_graph_error = VERIFY_COMMIT_GRAPH_ERROR_HASH;
 	}
@@ -1968,7 +2482,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 	for (i = 0; i < g->num_commits; i++) {
 		struct commit *graph_commit;
 
-		hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
+		oidread(&cur_oid, g->chunk_oid_lookup + g->hash_len * i);
 
 		if (i && oidcmp(&prev_oid, &cur_oid) >= 0)
 			graph_report(_("commit-graph has incorrect OID order: %s then %s"),
@@ -2012,10 +2526,11 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 	for (i = 0; i < g->num_commits; i++) {
 		struct commit *graph_commit, *odb_commit;
 		struct commit_list *graph_parents, *odb_parents;
-		uint32_t max_generation = 0;
+		timestamp_t max_generation = 0;
+		timestamp_t generation;
 
 		display_progress(progress, i + 1);
-		hashcpy(cur_oid.hash, g->chunk_oid_lookup + g->hash_len * i);
+		oidread(&cur_oid, g->chunk_oid_lookup + g->hash_len * i);
 
 		graph_commit = lookup_commit(r, &cur_oid);
 		odb_commit = (struct commit *)create_object(r, &cur_oid, alloc_commit_node(r));
@@ -2051,8 +2566,9 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 					     oid_to_hex(&graph_parents->item->object.oid),
 					     oid_to_hex(&odb_parents->item->object.oid));
 
-			if (graph_parents->item->generation > max_generation)
-				max_generation = graph_parents->item->generation;
+			generation = commit_graph_generation(graph_parents->item);
+			if (generation > max_generation)
+				max_generation = generation;
 
 			graph_parents = graph_parents->next;
 			odb_parents = odb_parents->next;
@@ -2062,7 +2578,7 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 			graph_report(_("commit-graph parent list for commit %s terminates early"),
 				     oid_to_hex(&cur_oid));
 
-		if (!graph_commit->generation) {
+		if (!commit_graph_generation(graph_commit)) {
 			if (generation_zero == GENERATION_NUMBER_EXISTS)
 				graph_report(_("commit-graph has generation number zero for commit %s, but non-zero elsewhere"),
 					     oid_to_hex(&cur_oid));
@@ -2075,17 +2591,19 @@ int verify_commit_graph(struct repository *r, struct commit_graph *g, int flags)
 			continue;
 
 		/*
-		 * If one of our parents has generation GENERATION_NUMBER_MAX, then
-		 * our generation is also GENERATION_NUMBER_MAX. Decrement to avoid
-		 * extra logic in the following condition.
+		 * If we are using topological level and one of our parents has
+		 * generation GENERATION_NUMBER_V1_MAX, then our generation is
+		 * also GENERATION_NUMBER_V1_MAX. Decrement to avoid extra logic
+		 * in the following condition.
 		 */
-		if (max_generation == GENERATION_NUMBER_MAX)
+		if (!g->read_generation_data && max_generation == GENERATION_NUMBER_V1_MAX)
 			max_generation--;
 
-		if (graph_commit->generation != max_generation + 1)
-			graph_report(_("commit-graph generation for commit %s is %u != %u"),
+		generation = commit_graph_generation(graph_commit);
+		if (generation < max_generation + 1)
+			graph_report(_("commit-graph generation for commit %s is %"PRItime" < %"PRItime),
 				     oid_to_hex(&cur_oid),
-				     graph_commit->generation,
+				     generation,
 				     max_generation + 1);
 
 		if (graph_commit->date != odb_commit->date)
@@ -2108,12 +2626,12 @@ void free_commit_graph(struct commit_graph *g)
 {
 	if (!g)
 		return;
-	if (g->graph_fd >= 0) {
+	if (g->data) {
 		munmap((void *)g->data, g->data_len);
 		g->data = NULL;
-		close(g->graph_fd);
 	}
 	free(g->filename);
+	free(g->bloom_filter_settings);
 	free(g);
 }
 
diff --git a/commit-graph.h b/commit-graph.h
index 7f5c933fa2..04a94e1830 100644
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -2,16 +2,30 @@
 #define COMMIT_GRAPH_H
 
 #include "git-compat-util.h"
-#include "repository.h"
-#include "string-list.h"
-#include "cache.h"
+#include "object-store.h"
+#include "oidset.h"
 
 #define GIT_TEST_COMMIT_GRAPH "GIT_TEST_COMMIT_GRAPH"
-#define GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD "GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD"
+#define GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE "GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE"
+#define GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS "GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS"
+
+/*
+ * This method is only used to enhance coverage of the commit-graph
+ * feature in the test suite with the GIT_TEST_COMMIT_GRAPH and
+ * GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS environment variables. Do not
+ * call this method oustide of a builtin, and only if you know what
+ * you are doing!
+ */
+void git_test_write_commit_graph_or_die(void);
 
 struct commit;
+struct bloom_filter_settings;
+struct repository;
+struct raw_object_store;
+struct string_list;
 
-char *get_commit_graph_filename(const char *obj_dir);
+char *get_commit_graph_filename(struct object_directory *odb);
+char *get_commit_graph_chain_filename(struct object_directory *odb);
 int open_commit_graph(const char *graph_file, int *fd, struct stat *st);
 
 /*
@@ -27,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
@@ -38,8 +60,6 @@ struct tree *get_commit_tree_in_graph(struct repository *r,
 				      const struct commit *c);
 
 struct commit_graph {
-	int graph_fd;
-
 	const unsigned char *data;
 	size_t data_len;
 
@@ -48,22 +68,33 @@ struct commit_graph {
 	uint32_t num_commits;
 	struct object_id oid;
 	char *filename;
-	const char *obj_dir;
+	struct object_directory *odb;
 
 	uint32_t num_commits_in_base;
+	unsigned int read_generation_data;
 	struct commit_graph *base_graph;
 
 	const uint32_t *chunk_oid_fanout;
 	const unsigned char *chunk_oid_lookup;
 	const unsigned char *chunk_commit_data;
+	const unsigned char *chunk_generation_data;
+	const unsigned char *chunk_generation_data_overflow;
 	const unsigned char *chunk_extra_edges;
 	const unsigned char *chunk_base_graphs;
+	const unsigned char *chunk_bloom_indexes;
+	const unsigned char *chunk_bloom_data;
+
+	struct topo_level_slab *topo_levels;
+	struct bloom_filter_settings *bloom_filter_settings;
 };
 
-struct commit_graph *load_commit_graph_one_fd_st(int fd, struct stat *st);
-struct commit_graph *read_commit_graph_one(struct repository *r, const char *obj_dir);
-struct commit_graph *parse_commit_graph(void *graph_map, int fd,
-					size_t graph_size);
+struct commit_graph *load_commit_graph_one_fd_st(struct repository *r,
+						 int fd, struct stat *st,
+						 struct object_directory *odb);
+struct commit_graph *read_commit_graph_one(struct repository *r,
+					   struct object_directory *odb);
+struct commit_graph *parse_commit_graph(struct repository *r,
+					void *graph_map, size_t graph_size);
 
 /*
  * Return 1 if and only if the repository has a commit-graph
@@ -71,18 +102,34 @@ struct commit_graph *parse_commit_graph(void *graph_map, int fd,
  */
 int generation_numbers_enabled(struct repository *r);
 
+/*
+ * Return 1 if and only if the repository has a commit-graph
+ * file and generation data chunk has been written for the file.
+ */
+int corrected_commit_dates_enabled(struct repository *r);
+
+struct bloom_filter_settings *get_bloom_filter_settings(struct repository *r);
+
 enum commit_graph_write_flags {
 	COMMIT_GRAPH_WRITE_APPEND     = (1 << 0),
 	COMMIT_GRAPH_WRITE_PROGRESS   = (1 << 1),
 	COMMIT_GRAPH_WRITE_SPLIT      = (1 << 2),
-	/* Make sure that each OID in the input is a valid commit OID. */
-	COMMIT_GRAPH_WRITE_CHECK_OIDS = (1 << 3)
+	COMMIT_GRAPH_WRITE_BLOOM_FILTERS = (1 << 3),
+	COMMIT_GRAPH_NO_WRITE_BLOOM_FILTERS = (1 << 4),
+};
+
+enum commit_graph_split_flags {
+	COMMIT_GRAPH_SPLIT_UNSPECIFIED      = 0,
+	COMMIT_GRAPH_SPLIT_MERGE_PROHIBITED = 1,
+	COMMIT_GRAPH_SPLIT_REPLACE          = 2
 };
 
-struct split_commit_graph_opts {
+struct commit_graph_opts {
 	int size_multiple;
 	int max_commits;
 	timestamp_t expire_time;
+	enum commit_graph_split_flags split_flags;
+	int max_new_filters;
 };
 
 /*
@@ -91,14 +138,14 @@ struct split_commit_graph_opts {
  * is not compatible with the commit-graph feature, then the
  * methods will return 0 without writing a commit-graph.
  */
-int write_commit_graph_reachable(const char *obj_dir,
+int write_commit_graph_reachable(struct object_directory *odb,
 				 enum commit_graph_write_flags flags,
-				 const struct split_commit_graph_opts *split_opts);
-int write_commit_graph(const char *obj_dir,
+				 const struct commit_graph_opts *opts);
+int write_commit_graph(struct object_directory *odb,
 		       struct string_list *pack_indexes,
-		       struct string_list *commit_hex,
+		       struct oidset *commits,
 		       enum commit_graph_write_flags flags,
-		       const struct split_commit_graph_opts *split_opts);
+		       const struct commit_graph_opts *opts);
 
 #define COMMIT_GRAPH_VERIFY_SHALLOW	(1 << 0)
 
@@ -113,4 +160,14 @@ void free_commit_graph(struct commit_graph *);
  */
 void disable_commit_graph(struct repository *r);
 
+struct commit_graph_data {
+	uint32_t graph_pos;
+	timestamp_t generation;
+};
+
+/*
+ * Commits should be parsed before accessing generation, graph positions.
+ */
+timestamp_t commit_graph_generation(const struct commit *);
+uint32_t commit_graph_position(const struct commit *);
 #endif
diff --git a/commit-reach.c b/commit-reach.c
index 4ca7e706a1..c226ee3da4 100644
--- a/commit-reach.c
+++ b/commit-reach.c
@@ -17,6 +17,25 @@
 
 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
 
+static int compare_commits_by_gen(const void *_a, const void *_b)
+{
+	const struct commit *a = *(const struct commit * const *)_a;
+	const struct commit *b = *(const struct commit * const *)_b;
+
+	timestamp_t generation_a = commit_graph_generation(a);
+	timestamp_t generation_b = commit_graph_generation(b);
+
+	if (generation_a < generation_b)
+		return -1;
+	if (generation_a > generation_b)
+		return 1;
+	if (a->date < b->date)
+		return -1;
+	if (a->date > b->date)
+		return 1;
+	return 0;
+}
+
 static int queue_has_nonstale(struct prio_queue *queue)
 {
 	int i;
@@ -32,14 +51,14 @@ static int queue_has_nonstale(struct prio_queue *queue)
 static struct commit_list *paint_down_to_common(struct repository *r,
 						struct commit *one, int n,
 						struct commit **twos,
-						int min_generation)
+						timestamp_t min_generation)
 {
 	struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
 	struct commit_list *result = NULL;
 	int i;
-	uint32_t last_gen = GENERATION_NUMBER_INFINITY;
+	timestamp_t last_gen = GENERATION_NUMBER_INFINITY;
 
-	if (!min_generation)
+	if (!min_generation && !corrected_commit_dates_enabled(r))
 		queue.compare = compare_commits_by_commit_date;
 
 	one->object.flags |= PARENT1;
@@ -58,14 +77,15 @@ static struct commit_list *paint_down_to_common(struct repository *r,
 		struct commit *commit = prio_queue_get(&queue);
 		struct commit_list *parents;
 		int flags;
+		timestamp_t generation = commit_graph_generation(commit);
 
-		if (min_generation && commit->generation > last_gen)
-			BUG("bad generation skip %8x > %8x at %s",
-			    commit->generation, last_gen,
+		if (min_generation && generation > last_gen)
+			BUG("bad generation skip %"PRItime" > %"PRItime" at %s",
+			    generation, last_gen,
 			    oid_to_hex(&commit->object.oid));
-		last_gen = commit->generation;
+		last_gen = generation;
 
-		if (commit->generation < min_generation)
+		if (generation < min_generation)
 			break;
 
 		flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
@@ -155,20 +175,15 @@ struct commit_list *get_octopus_merge_bases(struct commit_list *in)
 	return ret;
 }
 
-static int remove_redundant(struct repository *r, struct commit **array, int cnt)
+static int remove_redundant_no_gen(struct repository *r,
+				   struct commit **array, int cnt)
 {
-	/*
-	 * Some commit in the array may be an ancestor of
-	 * another commit.  Move such commit to the end of
-	 * the array, and return the number of commits that
-	 * are independent from each other.
-	 */
 	struct commit **work;
 	unsigned char *redundant;
 	int *filled_index;
 	int i, j, filled;
 
-	work = xcalloc(cnt, sizeof(*work));
+	CALLOC_ARRAY(work, cnt);
 	redundant = xcalloc(cnt, 1);
 	ALLOC_ARRAY(filled_index, cnt - 1);
 
@@ -176,18 +191,20 @@ static int remove_redundant(struct repository *r, struct commit **array, int cnt
 		repo_parse_commit(r, array[i]);
 	for (i = 0; i < cnt; i++) {
 		struct commit_list *common;
-		uint32_t min_generation = array[i]->generation;
+		timestamp_t min_generation = commit_graph_generation(array[i]);
 
 		if (redundant[i])
 			continue;
 		for (j = filled = 0; j < cnt; j++) {
+			timestamp_t curr_generation;
 			if (i == j || redundant[j])
 				continue;
 			filled_index[filled] = j;
 			work[filled++] = array[j];
 
-			if (array[j]->generation < min_generation)
-				min_generation = array[j]->generation;
+			curr_generation = commit_graph_generation(array[j]);
+			if (curr_generation < min_generation)
+				min_generation = curr_generation;
 		}
 		common = paint_down_to_common(r, array[i], filled,
 					      work, min_generation);
@@ -206,15 +223,156 @@ static int remove_redundant(struct repository *r, struct commit **array, int cnt
 	for (i = filled = 0; i < cnt; i++)
 		if (!redundant[i])
 			array[filled++] = work[i];
-	for (j = filled, i = 0; i < cnt; i++)
-		if (redundant[i])
-			array[j++] = work[i];
 	free(work);
 	free(redundant);
 	free(filled_index);
 	return filled;
 }
 
+static int remove_redundant_with_gen(struct repository *r,
+				     struct commit **array, int cnt)
+{
+	int i, count_non_stale = 0, count_still_independent = cnt;
+	timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
+	struct commit **walk_start, **sorted;
+	size_t walk_start_nr = 0, walk_start_alloc = cnt;
+	int min_gen_pos = 0;
+
+	/*
+	 * Sort the input by generation number, ascending. This allows
+	 * us to increase the "min_generation" limit when we discover
+	 * the commit with lowest generation is STALE. The index
+	 * min_gen_pos points to the current position within 'array'
+	 * that is not yet known to be STALE.
+	 */
+	ALLOC_ARRAY(sorted, cnt);
+	COPY_ARRAY(sorted, array, cnt);
+	QSORT(sorted, cnt, compare_commits_by_gen);
+	min_generation = commit_graph_generation(sorted[0]);
+
+	ALLOC_ARRAY(walk_start, walk_start_alloc);
+
+	/* Mark all parents of the input as STALE */
+	for (i = 0; i < cnt; i++) {
+		struct commit_list *parents;
+
+		repo_parse_commit(r, array[i]);
+		array[i]->object.flags |= RESULT;
+		parents = array[i]->parents;
+
+		while (parents) {
+			repo_parse_commit(r, parents->item);
+			if (!(parents->item->object.flags & STALE)) {
+				parents->item->object.flags |= STALE;
+				ALLOC_GROW(walk_start, walk_start_nr + 1, walk_start_alloc);
+				walk_start[walk_start_nr++] = parents->item;
+			}
+			parents = parents->next;
+		}
+	}
+
+	QSORT(walk_start, walk_start_nr, compare_commits_by_gen);
+
+	/* remove STALE bit for now to allow walking through parents */
+	for (i = 0; i < walk_start_nr; i++)
+		walk_start[i]->object.flags &= ~STALE;
+
+	/*
+	 * Start walking from the highest generation. Hopefully, it will
+	 * find all other items during the first-parent walk, and we can
+	 * terminate early. Otherwise, we will do the same amount of work
+	 * as before.
+	 */
+	for (i = walk_start_nr - 1; i >= 0 && count_still_independent > 1; i--) {
+		/* push the STALE bits up to min generation */
+		struct commit_list *stack = NULL;
+
+		commit_list_insert(walk_start[i], &stack);
+		walk_start[i]->object.flags |= STALE;
+
+		while (stack) {
+			struct commit_list *parents;
+			struct commit *c = stack->item;
+
+			repo_parse_commit(r, c);
+
+			if (c->object.flags & RESULT) {
+				c->object.flags &= ~RESULT;
+				if (--count_still_independent <= 1)
+					break;
+				if (oideq(&c->object.oid, &sorted[min_gen_pos]->object.oid)) {
+					while (min_gen_pos < cnt - 1 &&
+					       (sorted[min_gen_pos]->object.flags & STALE))
+						min_gen_pos++;
+					min_generation = commit_graph_generation(sorted[min_gen_pos]);
+				}
+			}
+
+			if (commit_graph_generation(c) < min_generation) {
+				pop_commit(&stack);
+				continue;
+			}
+
+			parents = c->parents;
+			while (parents) {
+				if (!(parents->item->object.flags & STALE)) {
+					parents->item->object.flags |= STALE;
+					commit_list_insert(parents->item, &stack);
+					break;
+				}
+				parents = parents->next;
+			}
+
+			/* pop if all parents have been visited already */
+			if (!parents)
+				pop_commit(&stack);
+		}
+		free_commit_list(stack);
+	}
+	free(sorted);
+
+	/* clear result */
+	for (i = 0; i < cnt; i++)
+		array[i]->object.flags &= ~RESULT;
+
+	/* rearrange array */
+	for (i = count_non_stale = 0; i < cnt; i++) {
+		if (!(array[i]->object.flags & STALE))
+			array[count_non_stale++] = array[i];
+	}
+
+	/* clear marks */
+	clear_commit_marks_many(walk_start_nr, walk_start, STALE);
+	free(walk_start);
+
+	return count_non_stale;
+}
+
+static int remove_redundant(struct repository *r, struct commit **array, int cnt)
+{
+	/*
+	 * Some commit in the array may be an ancestor of
+	 * another commit.  Move the independent commits to the
+	 * beginning of 'array' and return their number. Callers
+	 * should not rely upon the contents of 'array' after
+	 * that number.
+	 */
+	if (generation_numbers_enabled(r)) {
+		int i;
+
+		/*
+		 * If we have a single commit with finite generation
+		 * number, then the _with_gen algorithm is preferred.
+		 */
+		for (i = 0; i < cnt; i++) {
+			if (commit_graph_generation(array[i]) < GENERATION_NUMBER_INFINITY)
+				return remove_redundant_with_gen(r, array, cnt);
+		}
+	}
+
+	return remove_redundant_no_gen(r, array, cnt);
+}
+
 static struct commit_list *get_merge_bases_many_0(struct repository *r,
 						  struct commit *one,
 						  int n,
@@ -241,7 +399,7 @@ static struct commit_list *get_merge_bases_many_0(struct repository *r,
 
 	/* There are more than one */
 	cnt = commit_list_count(result);
-	rslt = xcalloc(cnt, sizeof(*rslt));
+	CALLOC_ARRAY(rslt, cnt);
 	for (list = result, i = 0; list; list = list->next)
 		rslt[i++] = list->item;
 	free_commit_list(result);
@@ -283,7 +441,9 @@ struct commit_list *repo_get_merge_bases(struct repository *r,
 /*
  * Is "commit" a descendant of one of the elements on the "with_commit" list?
  */
-int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
+int repo_is_descendant_of(struct repository *r,
+			  struct commit *commit,
+			  struct commit_list *with_commit)
 {
 	if (!with_commit)
 		return 1;
@@ -301,7 +461,7 @@ int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
 
 			other = with_commit->item;
 			with_commit = with_commit->next;
-			if (in_merge_bases(other, commit))
+			if (repo_in_merge_bases_many(r, other, 1, &commit))
 				return 1;
 		}
 		return 0;
@@ -316,23 +476,26 @@ int repo_in_merge_bases_many(struct repository *r, struct commit *commit,
 {
 	struct commit_list *bases;
 	int ret = 0, i;
-	uint32_t min_generation = GENERATION_NUMBER_INFINITY;
+	timestamp_t generation, max_generation = GENERATION_NUMBER_ZERO;
 
 	if (repo_parse_commit(r, commit))
 		return ret;
 	for (i = 0; i < nr_reference; i++) {
 		if (repo_parse_commit(r, reference[i]))
 			return ret;
-		if (reference[i]->generation < min_generation)
-			min_generation = reference[i]->generation;
+
+		generation = commit_graph_generation(reference[i]);
+		if (generation > max_generation)
+			max_generation = generation;
 	}
 
-	if (commit->generation > min_generation)
+	generation = commit_graph_generation(commit);
+	if (generation > max_generation)
 		return ret;
 
 	bases = paint_down_to_common(r, commit,
 				     nr_reference, reference,
-				     commit->generation);
+				     generation);
 	if (commit->object.flags & PARENT2)
 		ret = 1;
 	clear_commit_marks(commit, all_flags);
@@ -348,7 +511,15 @@ int repo_in_merge_bases(struct repository *r,
 			struct commit *commit,
 			struct commit *reference)
 {
-	return repo_in_merge_bases_many(r, commit, 1, &reference);
+	int res;
+	struct commit_list *list = NULL;
+	struct commit_list **next = &list;
+
+	next = commit_list_append(commit, next);
+	res = repo_is_descendant_of(r, reference, list);
+	free_commit_list(list);
+
+	return res;
 }
 
 struct commit_list *reduce_heads(struct commit_list *heads)
@@ -370,7 +541,7 @@ struct commit_list *reduce_heads(struct commit_list *heads)
 		p->item->object.flags |= STALE;
 		num_head++;
 	}
-	array = xcalloc(num_head, sizeof(*array));
+	CALLOC_ARRAY(array, num_head);
 	for (p = heads, i = 0; p; p = p->next) {
 		if (p->item->object.flags & STALE) {
 			array[i++] = p->item;
@@ -396,6 +567,7 @@ int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
 	struct object *o;
 	struct commit *old_commit, *new_commit;
 	struct commit_list *old_commit_list = NULL;
+	int ret;
 
 	/*
 	 * Both new_commit and old_commit must be commit-ish and new_commit is descendant of
@@ -417,7 +589,10 @@ int ref_newer(const struct object_id *new_oid, const struct object_id *old_oid)
 		return 0;
 
 	commit_list_insert(old_commit, &old_commit_list);
-	return is_descendant_of(new_commit, old_commit_list);
+	ret = repo_is_descendant_of(the_repository,
+				    new_commit, old_commit_list);
+	free_commit_list(old_commit_list);
+	return ret;
 }
 
 /*
@@ -450,7 +625,7 @@ static int in_commit_list(const struct commit_list *want, struct commit *c)
 static enum contains_result contains_test(struct commit *candidate,
 					  const struct commit_list *want,
 					  struct contains_cache *cache,
-					  uint32_t cutoff)
+					  timestamp_t cutoff)
 {
 	enum contains_result *cached = contains_cache_at(cache, candidate);
 
@@ -467,7 +642,7 @@ static enum contains_result contains_test(struct commit *candidate,
 	/* Otherwise, we don't know; prepare to recurse */
 	parse_commit_or_die(candidate);
 
-	if (candidate->generation < cutoff)
+	if (commit_graph_generation(candidate) < cutoff)
 		return CONTAINS_NO;
 
 	return CONTAINS_UNKNOWN;
@@ -486,14 +661,16 @@ static enum contains_result contains_tag_algo(struct commit *candidate,
 {
 	struct contains_stack contains_stack = { 0, 0, NULL };
 	enum contains_result result;
-	uint32_t cutoff = GENERATION_NUMBER_INFINITY;
+	timestamp_t cutoff = GENERATION_NUMBER_INFINITY;
 	const struct commit_list *p;
 
 	for (p = want; p; p = p->next) {
+		timestamp_t generation;
 		struct commit *c = p->item;
 		load_commit_graph_info(the_repository, c);
-		if (c->generation < cutoff)
-			cutoff = c->generation;
+		generation = commit_graph_generation(c);
+		if (generation < cutoff)
+			cutoff = generation;
 	}
 
 	result = contains_test(candidate, want, cache, cutoff);
@@ -536,26 +713,14 @@ int commit_contains(struct ref_filter *filter, struct commit *commit,
 {
 	if (filter->with_commit_tag_algo)
 		return contains_tag_algo(commit, list, cache) == CONTAINS_YES;
-	return is_descendant_of(commit, list);
-}
-
-static int compare_commits_by_gen(const void *_a, const void *_b)
-{
-	const struct commit *a = *(const struct commit * const *)_a;
-	const struct commit *b = *(const struct commit * const *)_b;
-
-	if (a->generation < b->generation)
-		return -1;
-	if (a->generation > b->generation)
-		return 1;
-	return 0;
+	return repo_is_descendant_of(the_repository, commit, list);
 }
 
 int can_all_from_reach_with_flag(struct object_array *from,
 				 unsigned int with_flag,
 				 unsigned int assign_flag,
 				 time_t min_commit_date,
-				 uint32_t min_generation)
+				 timestamp_t min_generation)
 {
 	struct commit **list = NULL;
 	int i;
@@ -585,7 +750,7 @@ int can_all_from_reach_with_flag(struct object_array *from,
 
 		list[nr_commits] = (struct commit *)from_one;
 		if (parse_commit(list[nr_commits]) ||
-		    list[nr_commits]->generation < min_generation) {
+		    commit_graph_generation(list[nr_commits]) < min_generation) {
 			result = 0;
 			goto cleanup;
 		}
@@ -621,7 +786,7 @@ int can_all_from_reach_with_flag(struct object_array *from,
 
 					if (parse_commit(parent->item) ||
 					    parent->item->date < min_commit_date ||
-					    parent->item->generation < min_generation)
+					    commit_graph_generation(parent->item) < min_generation)
 						continue;
 
 					commit_list_insert(parent->item, &stack);
@@ -656,17 +821,19 @@ int can_all_from_reach(struct commit_list *from, struct commit_list *to,
 	time_t min_commit_date = cutoff_by_min_date ? from->item->date : 0;
 	struct commit_list *from_iter = from, *to_iter = to;
 	int result;
-	uint32_t min_generation = GENERATION_NUMBER_INFINITY;
+	timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
 
 	while (from_iter) {
 		add_object_array(&from_iter->item->object, NULL, &from_objs);
 
 		if (!parse_commit(from_iter->item)) {
+			timestamp_t generation;
 			if (from_iter->item->date < min_commit_date)
 				min_commit_date = from_iter->item->date;
 
-			if (from_iter->item->generation < min_generation)
-				min_generation = from_iter->item->generation;
+			generation = commit_graph_generation(from_iter->item);
+			if (generation < min_generation)
+				min_generation = generation;
 		}
 
 		from_iter = from_iter->next;
@@ -674,11 +841,13 @@ int can_all_from_reach(struct commit_list *from, struct commit_list *to,
 
 	while (to_iter) {
 		if (!parse_commit(to_iter->item)) {
+			timestamp_t generation;
 			if (to_iter->item->date < min_commit_date)
 				min_commit_date = to_iter->item->date;
 
-			if (to_iter->item->generation < min_generation)
-				min_generation = to_iter->item->generation;
+			generation = commit_graph_generation(to_iter->item);
+			if (generation < min_generation)
+				min_generation = generation;
 		}
 
 		to_iter->item->object.flags |= PARENT2;
@@ -712,17 +881,19 @@ struct commit_list *get_reachable_subset(struct commit **from, int nr_from,
 	struct commit_list *found_commits = NULL;
 	struct commit **to_last = to + nr_to;
 	struct commit **from_last = from + nr_from;
-	uint32_t min_generation = GENERATION_NUMBER_INFINITY;
+	timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
 	int num_to_find = 0;
 
 	struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
 
 	for (item = to; item < to_last; item++) {
+		timestamp_t generation;
 		struct commit *c = *item;
 
 		parse_commit(c);
-		if (c->generation < min_generation)
-			min_generation = c->generation;
+		generation = commit_graph_generation(c);
+		if (generation < min_generation)
+			min_generation = generation;
 
 		if (!(c->object.flags & PARENT1)) {
 			c->object.flags |= PARENT1;
@@ -755,7 +926,7 @@ struct commit_list *get_reachable_subset(struct commit **from, int nr_from,
 
 			parse_commit(p);
 
-			if (p->generation < min_generation)
+			if (commit_graph_generation(p) < min_generation)
 				continue;
 
 			if (p->object.flags & PARENT2)
diff --git a/commit-reach.h b/commit-reach.h
index 99a43e8b64..148b56fea5 100644
--- a/commit-reach.h
+++ b/commit-reach.h
@@ -27,7 +27,9 @@ struct commit_list *repo_get_merge_bases_many_dirty(struct repository *r,
 
 struct commit_list *get_octopus_merge_bases(struct commit_list *in);
 
-int is_descendant_of(struct commit *commit, struct commit_list *with_commit);
+int repo_is_descendant_of(struct repository *r,
+			  struct commit *commit,
+			  struct commit_list *with_commit);
 int repo_in_merge_bases(struct repository *r,
 			struct commit *commit,
 			struct commit *reference);
@@ -85,7 +87,7 @@ int can_all_from_reach_with_flag(struct object_array *from,
 				 unsigned int with_flag,
 				 unsigned int assign_flag,
 				 time_t min_commit_date,
-				 uint32_t min_generation);
+				 timestamp_t min_generation);
 int can_all_from_reach(struct commit_list *from, struct commit_list *to,
 		       int commit_date_cutoff);
 
diff --git a/commit-slab-decl.h b/commit-slab-decl.h
index adc7b46c83..98de2c970c 100644
--- a/commit-slab-decl.h
+++ b/commit-slab-decl.h
@@ -1,5 +1,5 @@
-#ifndef COMMIT_SLAB_HDR_H
-#define COMMIT_SLAB_HDR_H
+#ifndef COMMIT_SLAB_DECL_H
+#define COMMIT_SLAB_DECL_H
 
 /* allocate ~512kB at once, allowing for malloc overhead */
 #ifndef COMMIT_SLAB_SIZE
@@ -32,6 +32,7 @@ struct slabname {							\
 void init_ ##slabname## _with_stride(struct slabname *s, unsigned stride); \
 void init_ ##slabname(struct slabname *s);				\
 void clear_ ##slabname(struct slabname *s);				\
+void deep_clear_ ##slabname(struct slabname *s, void (*free_fn)(elemtype *ptr)); \
 elemtype *slabname## _at_peek(struct slabname *s, const struct commit *c, int add_if_missing); \
 elemtype *slabname## _at(struct slabname *s, const struct commit *c);	\
 elemtype *slabname## _peek(struct slabname *s, const struct commit *c)
@@ -40,4 +41,4 @@ elemtype *slabname## _peek(struct slabname *s, const struct commit *c)
 	declare_commit_slab(slabname, elemtype); \
 	declare_commit_slab_prototypes(slabname, elemtype)
 
-#endif /* COMMIT_SLAB_HDR_H */
+#endif /* COMMIT_SLAB_DECL_H */
diff --git a/commit-slab-impl.h b/commit-slab-impl.h
index 5c0eb91a5d..557738df27 100644
--- a/commit-slab-impl.h
+++ b/commit-slab-impl.h
@@ -38,6 +38,19 @@ scope void clear_ ##slabname(struct slabname *s)			\
 	FREE_AND_NULL(s->slab);						\
 }									\
 									\
+scope void deep_clear_ ##slabname(struct slabname *s, void (*free_fn)(elemtype *)) \
+{									\
+	unsigned int i;							\
+	for (i = 0; i < s->slab_count; i++) {				\
+		unsigned int j;						\
+		if (!s->slab[i])					\
+			continue;					\
+		for (j = 0; j < s->slab_size; j++)			\
+			free_fn(&s->slab[i][j * s->stride]);		\
+	}								\
+	clear_ ##slabname(s);						\
+}									\
+									\
 scope elemtype *slabname## _at_peek(struct slabname *s,			\
 						  const struct commit *c, \
 						  int add_if_missing)   \
diff --git a/commit-slab.h b/commit-slab.h
index 69bf0c807c..8e72a30536 100644
--- a/commit-slab.h
+++ b/commit-slab.h
@@ -24,7 +24,12 @@
  * - int *indegree_peek(struct indegree *, struct commit *);
  *
  *   This function is similar to indegree_at(), but it will return NULL
- *   until a call to indegree_at() was made for the commit.
+ *   if the location to store the data associated with the given commit
+ *   has not been allocated yet.
+ *   Note that the location to store the data might have already been
+ *   allocated even if no indegree_at() call has been made for that commit
+ *   yet; in this case this function returns a pointer to a
+ *   zero-initialized location.
  *
  * - void init_indegree(struct indegree *);
  *   void init_indegree_with_stride(struct indegree *, int);
@@ -42,6 +47,16 @@
  *
  *   Call this function before the slab falls out of scope to avoid
  *   leaking memory.
+ *
+ * - void deep_clear_indegree(struct indegree *, void (*free_fn)(int*))
+ *
+ *   Empties the slab, similar to clear_indegree(), but in addition it
+ *   calls the given 'free_fn' for each slab entry to release any
+ *   additional memory that might be owned by the entry (but not the
+ *   entry itself!).
+ *   Note that 'free_fn' might be called even for entries for which no
+ *   indegree_at() call has been made; in this case 'free_fn' is invoked
+ *   with a pointer to a zero-initialized location.
  */
 
 #define define_commit_slab(slabname, elemtype) \
diff --git a/commit.c b/commit.c
index 40890ae7ce..143f472c0f 100644
--- a/commit.c
+++ b/commit.c
@@ -14,11 +14,13 @@
 #include "mergesort.h"
 #include "commit-slab.h"
 #include "prio-queue.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 #include "wt-status.h"
 #include "advice.h"
 #include "refs.h"
 #include "commit-reach.h"
+#include "run-command.h"
+#include "shallow.h"
 
 static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
 
@@ -35,7 +37,7 @@ struct commit *lookup_commit_reference_gently(struct repository *r,
 
 	if (!obj)
 		return NULL;
-	return object_as_type(r, obj, OBJ_COMMIT, quiet);
+	return object_as_type(obj, OBJ_COMMIT, quiet);
 }
 
 struct commit *lookup_commit_reference(struct repository *r, const struct object_id *oid)
@@ -60,7 +62,7 @@ struct commit *lookup_commit(struct repository *r, const struct object_id *oid)
 	struct object *obj = lookup_object(r, oid);
 	if (!obj)
 		return create_object(r, oid, alloc_commit_node(r));
-	return object_as_type(r, obj, OBJ_COMMIT, 0);
+	return object_as_type(obj, OBJ_COMMIT, 0);
 }
 
 struct commit *lookup_commit_reference_by_name(const char *name)
@@ -103,23 +105,23 @@ static timestamp_t parse_commit_date(const char *buf, const char *tail)
 	return parse_timestamp(dateptr, NULL, 10);
 }
 
-static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
+static const struct object_id *commit_graft_oid_access(size_t index, const void *table)
 {
-	struct commit_graft **commit_graft_table = table;
-	return commit_graft_table[index]->oid.hash;
+	const struct commit_graft * const *commit_graft_table = table;
+	return &commit_graft_table[index]->oid;
 }
 
-static int commit_graft_pos(struct repository *r, const unsigned char *sha1)
+int commit_graft_pos(struct repository *r, const struct object_id *oid)
 {
-	return sha1_pos(sha1, r->parsed_objects->grafts,
-			r->parsed_objects->grafts_nr,
-			commit_graft_sha1_access);
+	return oid_pos(oid, r->parsed_objects->grafts,
+		       r->parsed_objects->grafts_nr,
+		       commit_graft_oid_access);
 }
 
 int register_commit_graft(struct repository *r, struct commit_graft *graft,
 			  int ignore_dups)
 {
-	int pos = commit_graft_pos(r, graft->oid.hash);
+	int pos = commit_graft_pos(r, &graft->oid);
 
 	if (0 <= pos) {
 		if (ignore_dups)
@@ -230,7 +232,7 @@ struct commit_graft *lookup_commit_graft(struct repository *r, const struct obje
 {
 	int pos;
 	prepare_commit_graft(r);
-	pos = commit_graft_pos(r, oid->hash);
+	pos = commit_graft_pos(r, oid);
 	if (pos < 0)
 		return NULL;
 	return r->parsed_objects->grafts[pos];
@@ -244,19 +246,6 @@ int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
 	return ret;
 }
 
-int unregister_shallow(const struct object_id *oid)
-{
-	int pos = commit_graft_pos(the_repository, oid->hash);
-	if (pos < 0)
-		return -1;
-	if (pos + 1 < the_repository->parsed_objects->grafts_nr)
-		MOVE_ARRAY(the_repository->parsed_objects->grafts + pos,
-			   the_repository->parsed_objects->grafts + pos + 1,
-			   the_repository->parsed_objects->grafts_nr - pos - 1);
-	the_repository->parsed_objects->grafts_nr--;
-	return 0;
-}
-
 struct commit_buffer {
 	void *buffer;
 	unsigned long size;
@@ -350,7 +339,7 @@ struct tree *repo_get_commit_tree(struct repository *r,
 	if (commit->maybe_tree || !commit->object.parsed)
 		return commit->maybe_tree;
 
-	if (commit->graph_pos != COMMIT_NOT_FROM_GRAPH)
+	if (commit_graph_position(commit) != COMMIT_NOT_FROM_GRAPH)
 		return get_commit_tree_in_graph(r, commit);
 
 	return NULL;
@@ -401,10 +390,22 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 	struct commit_graft *graft;
 	const int tree_entry_len = the_hash_algo->hexsz + 5;
 	const int parent_entry_len = the_hash_algo->hexsz + 7;
+	struct tree *tree;
 
 	if (item->object.parsed)
 		return 0;
-	item->object.parsed = 1;
+
+	if (item->parents) {
+		/*
+		 * Presumably this is leftover from an earlier failed parse;
+		 * clear it out in preparation for us re-parsing (we'll hit the
+		 * same error, but that's good, since it lets our caller know
+		 * the result cannot be trusted.
+		 */
+		free_commit_list(item->parents);
+		item->parents = NULL;
+	}
+
 	tail += size;
 	if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
 			bufptr[tree_entry_len] != '\n')
@@ -412,11 +413,18 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 	if (get_oid_hex(bufptr + 5, &parent) < 0)
 		return error("bad tree pointer in commit %s",
 			     oid_to_hex(&item->object.oid));
-	set_commit_tree(item, lookup_tree(r, &parent));
+	tree = lookup_tree(r, &parent);
+	if (!tree)
+		return error("bad tree pointer %s in commit %s",
+			     oid_to_hex(&parent),
+			     oid_to_hex(&item->object.oid));
+	set_commit_tree(item, tree);
 	bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
 	pptr = &item->parents;
 
 	graft = lookup_commit_graft(r, &item->object.oid);
+	if (graft)
+		r->parsed_objects->substituted_parent = 1;
 	while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
 		struct commit *new_parent;
 
@@ -432,8 +440,11 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 		if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
 			continue;
 		new_parent = lookup_commit(r, &parent);
-		if (new_parent)
-			pptr = &commit_list_insert(new_parent, pptr)->next;
+		if (!new_parent)
+			return error("bad parent %s in commit %s",
+				     oid_to_hex(&parent),
+				     oid_to_hex(&item->object.oid));
+		pptr = &commit_list_insert(new_parent, pptr)->next;
 	}
 	if (graft) {
 		int i;
@@ -442,7 +453,9 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 			new_parent = lookup_commit(r,
 						   &graft->parent[i]);
 			if (!new_parent)
-				continue;
+				return error("bad graft parent %s in commit %s",
+					     oid_to_hex(&graft->parent[i]),
+					     oid_to_hex(&item->object.oid));
 			pptr = &commit_list_insert(new_parent, pptr)->next;
 		}
 	}
@@ -451,6 +464,7 @@ int parse_commit_buffer(struct repository *r, struct commit *item, const void *b
 	if (check_graph)
 		load_commit_graph_info(r, item);
 
+	item->object.parsed = 1;
 	return 0;
 }
 
@@ -521,6 +535,20 @@ int find_commit_subject(const char *commit_buffer, const char **subject)
 	return eol - p;
 }
 
+size_t commit_subject_length(const char *body)
+{
+	const char *p = body;
+	while (*p) {
+		const char *next = skip_blank_lines(p);
+		if (next != p)
+			break;
+		p = strchrnul(p, '\n');
+		if (*p)
+			p++;
+	}
+	return p - body;
+}
+
 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
 {
 	struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
@@ -530,6 +558,17 @@ struct commit_list *commit_list_insert(struct commit *item, struct commit_list *
 	return new_list;
 }
 
+int commit_list_contains(struct commit *item, struct commit_list *list)
+{
+	while (list) {
+		if (list->item == item)
+			return 1;
+		list = list->next;
+	}
+
+	return 0;
+}
+
 unsigned commit_list_count(const struct commit_list *l)
 {
 	unsigned c = 0;
@@ -549,6 +588,17 @@ struct commit_list *copy_commit_list(struct commit_list *list)
 	return head;
 }
 
+struct commit_list *reverse_commit_list(struct commit_list *list)
+{
+	struct commit_list *next = NULL, *current, *backup;
+	for (current = list; current; current = backup) {
+		backup = current->next;
+		current->next = next;
+		next = current;
+	}
+	return next;
+}
+
 void free_commit_list(struct commit_list *list)
 {
 	while (list)
@@ -717,11 +767,13 @@ int compare_commits_by_author_date(const void *a_, const void *b_,
 int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused)
 {
 	const struct commit *a = a_, *b = b_;
+	const timestamp_t generation_a = commit_graph_generation(a),
+			  generation_b = commit_graph_generation(b);
 
 	/* newer commits first */
-	if (a->generation < b->generation)
+	if (generation_a < generation_b)
 		return 1;
-	else if (a->generation > b->generation)
+	else if (generation_a > generation_b)
 		return -1;
 
 	/* use date as a heuristic when generations are equal */
@@ -903,12 +955,22 @@ struct commit *get_fork_point(const char *refname, struct commit *commit)
 	struct commit_list *bases;
 	int i;
 	struct commit *ret = NULL;
+	char *full_refname;
+
+	switch (dwim_ref(refname, strlen(refname), &oid, &full_refname, 0)) {
+	case 0:
+		die("No such ref: '%s'", refname);
+	case 1:
+		break; /* good */
+	default:
+		die("Ambiguous refname: '%s'", refname);
+	}
 
 	memset(&revs, 0, sizeof(revs));
 	revs.initial = 1;
-	for_each_reflog_ent(refname, collect_one_reflog_ent, &revs);
+	for_each_reflog_ent(full_refname, collect_one_reflog_ent, &revs);
 
-	if (!revs.nr && !get_oid(refname, &oid))
+	if (!revs.nr)
 		add_one_commit(&oid, &revs);
 
 	for (i = 0; i < revs.nr; i++)
@@ -934,17 +996,26 @@ struct commit *get_fork_point(const char *refname, struct commit *commit)
 
 cleanup_return:
 	free_commit_list(bases);
+	free(full_refname);
 	return ret;
 }
 
-static const char gpg_sig_header[] = "gpgsig";
-static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
+/*
+ * Indexed by hash algorithm identifier.
+ */
+static const char *gpg_sig_headers[] = {
+	NULL,
+	"gpgsig",
+	"gpgsig-sha256",
+};
 
-static int do_sign_commit(struct strbuf *buf, const char *keyid)
+int sign_with_header(struct strbuf *buf, const char *keyid)
 {
 	struct strbuf sig = STRBUF_INIT;
 	int inspos, copypos;
 	const char *eoh;
+	const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(the_hash_algo)];
+	int gpg_sig_header_len = strlen(gpg_sig_header);
 
 	/* find the end of the header */
 	eoh = strstr(buf->buf, "\n\n");
@@ -969,7 +1040,7 @@ static int do_sign_commit(struct strbuf *buf, const char *keyid)
 			strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
 			inspos += gpg_sig_header_len;
 		}
-		strbuf_insert(buf, inspos++, " ", 1);
+		strbuf_insertstr(buf, inspos++, " ");
 		strbuf_insert(buf, inspos, bol, len);
 		inspos += len;
 		copypos += len;
@@ -978,19 +1049,32 @@ static int do_sign_commit(struct strbuf *buf, const char *keyid)
 	return 0;
 }
 
+
+
 int parse_signed_commit(const struct commit *commit,
-			struct strbuf *payload, struct strbuf *signature)
+			struct strbuf *payload, struct strbuf *signature,
+			const struct git_hash_algo *algop)
 {
-
 	unsigned long size;
 	const char *buffer = get_commit_buffer(commit, &size);
-	int in_signature, saw_signature = -1;
-	const char *line, *tail;
+	int ret = parse_buffer_signed_by_header(buffer, size, payload, signature, algop);
+
+	unuse_commit_buffer(commit, buffer);
+	return ret;
+}
+
+int parse_buffer_signed_by_header(const char *buffer,
+				  unsigned long size,
+				  struct strbuf *payload,
+				  struct strbuf *signature,
+				  const struct git_hash_algo *algop)
+{
+	int in_signature = 0, saw_signature = 0, other_signature = 0;
+	const char *line, *tail, *p;
+	const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(algop)];
 
 	line = buffer;
 	tail = buffer + size;
-	in_signature = 0;
-	saw_signature = 0;
 	while (line < tail) {
 		const char *sig = NULL;
 		const char *next = memchr(line, '\n', tail - line);
@@ -998,9 +1082,15 @@ int parse_signed_commit(const struct commit *commit,
 		next = next ? next + 1 : tail;
 		if (in_signature && line[0] == ' ')
 			sig = line + 1;
-		else if (starts_with(line, gpg_sig_header) &&
-			 line[gpg_sig_header_len] == ' ')
-			sig = line + gpg_sig_header_len + 1;
+		else if (skip_prefix(line, gpg_sig_header, &p) &&
+			 *p == ' ') {
+			sig = line + strlen(gpg_sig_header) + 1;
+			other_signature = 0;
+		}
+		else if (starts_with(line, "gpgsig"))
+			other_signature = 1;
+		else if (other_signature && line[0] != ' ')
+			other_signature = 0;
 		if (sig) {
 			strbuf_add(signature, sig, next - sig);
 			saw_signature = 1;
@@ -1009,12 +1099,12 @@ int parse_signed_commit(const struct commit *commit,
 			if (*line == '\n')
 				/* dump the whole remainder of the buffer */
 				next = tail;
-			strbuf_add(payload, line, next - line);
+			if (!other_signature)
+				strbuf_add(payload, line, next - line);
 			in_signature = 0;
 		}
 		line = next;
 	}
-	unuse_commit_buffer(commit, buffer);
 	return saw_signature;
 }
 
@@ -1023,33 +1113,48 @@ int remove_signature(struct strbuf *buf)
 	const char *line = buf->buf;
 	const char *tail = buf->buf + buf->len;
 	int in_signature = 0;
-	const char *sig_start = NULL;
-	const char *sig_end = NULL;
+	struct sigbuf {
+		const char *start;
+		const char *end;
+	} sigs[2], *sigp = &sigs[0];
+	int i;
+	const char *orig_buf = buf->buf;
+
+	memset(sigs, 0, sizeof(sigs));
 
 	while (line < tail) {
 		const char *next = memchr(line, '\n', tail - line);
 		next = next ? next + 1 : tail;
 
 		if (in_signature && line[0] == ' ')
-			sig_end = next;
-		else if (starts_with(line, gpg_sig_header) &&
-			 line[gpg_sig_header_len] == ' ') {
-			sig_start = line;
-			sig_end = next;
-			in_signature = 1;
+			sigp->end = next;
+		else if (starts_with(line, "gpgsig")) {
+			int i;
+			for (i = 1; i < GIT_HASH_NALGOS; i++) {
+				const char *p;
+				if (skip_prefix(line, gpg_sig_headers[i], &p) &&
+				    *p == ' ') {
+					sigp->start = line;
+					sigp->end = next;
+					in_signature = 1;
+				}
+			}
 		} else {
 			if (*line == '\n')
 				/* dump the whole remainder of the buffer */
 				next = tail;
+			if (in_signature && sigp - sigs != ARRAY_SIZE(sigs))
+				sigp++;
 			in_signature = 0;
 		}
 		line = next;
 	}
 
-	if (sig_start)
-		strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start);
+	for (i = ARRAY_SIZE(sigs) - 1; i >= 0; i--)
+		if (sigs[i].start)
+			strbuf_remove(buf, sigs[i].start - orig_buf, sigs[i].end - sigs[i].start);
 
-	return sig_start != NULL;
+	return sigs[0].start != NULL;
 }
 
 static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
@@ -1057,8 +1162,10 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header
 	struct merge_remote_desc *desc;
 	struct commit_extra_header *mergetag;
 	char *buf;
-	unsigned long size, len;
+	unsigned long size;
 	enum object_type type;
+	struct strbuf payload = STRBUF_INIT;
+	struct strbuf signature = STRBUF_INIT;
 
 	desc = merge_remote_util(parent);
 	if (!desc || !desc->obj)
@@ -1066,26 +1173,27 @@ static void handle_signed_tag(struct commit *parent, struct commit_extra_header
 	buf = read_object_file(&desc->obj->oid, &type, &size);
 	if (!buf || type != OBJ_TAG)
 		goto free_return;
-	len = parse_signature(buf, size);
-	if (size == len)
+	if (!parse_signature(buf, size, &payload, &signature))
 		goto free_return;
 	/*
 	 * We could verify this signature and either omit the tag when
 	 * it does not validate, but the integrator may not have the
-	 * public key of the signer of the tag he is merging, while a
+	 * public key of the signer of the tag being merged, while a
 	 * later auditor may have it while auditing, so let's not run
 	 * verify-signed-buffer here for now...
 	 *
 	 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
 	 *	warn("warning: signed tag unverified.");
 	 */
-	mergetag = xcalloc(1, sizeof(*mergetag));
+	CALLOC_ARRAY(mergetag, 1);
 	mergetag->key = xstrdup("mergetag");
 	mergetag->value = buf;
 	mergetag->len = size;
 
 	**tail = mergetag;
 	*tail = &mergetag->next;
+	strbuf_release(&payload);
+	strbuf_release(&signature);
 	return;
 
 free_return:
@@ -1100,7 +1208,7 @@ int check_commit_signature(const struct commit *commit, struct signature_check *
 
 	sigc->result = 'N';
 
-	if (parse_signed_commit(commit, &payload, &signature) <= 0)
+	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);
@@ -1112,21 +1220,23 @@ int check_commit_signature(const struct commit *commit, struct signature_check *
 	return ret;
 }
 
-void verify_merge_signature(struct commit *commit, int verbosity)
+void verify_merge_signature(struct commit *commit, int verbosity,
+			    int check_trust)
 {
 	char hex[GIT_MAX_HEXSZ + 1];
 	struct signature_check signature_check;
+	int ret;
 	memset(&signature_check, 0, sizeof(signature_check));
 
-	check_commit_signature(commit, &signature_check);
+	ret = check_commit_signature(commit, &signature_check);
 
 	find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV);
 	switch (signature_check.result) {
 	case 'G':
+		if (ret || (check_trust && signature_check.trust_level < TRUST_MARGINAL))
+			die(_("Commit %s has an untrusted GPG signature, "
+			      "allegedly by %s."), hex, signature_check.signer);
 		break;
-	case 'U':
-		die(_("Commit %s has an untrusted GPG signature, "
-		      "allegedly by %s."), hex, signature_check.signer);
 	case 'B':
 		die(_("Commit %s has a bad GPG signature "
 		      "allegedly by %s."), hex, signature_check.signer);
@@ -1240,7 +1350,7 @@ static struct commit_extra_header *read_commit_extra_header_lines(
 			 excluded_header_field(line, eof - line, exclude))
 			continue;
 
-		it = xcalloc(1, sizeof(*it));
+		CALLOC_ARRAY(it, 1);
 		it->key = xmemdupz(line, eof-line);
 		*tail = it;
 		tail = &it->next;
@@ -1271,8 +1381,8 @@ int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree,
 	int result;
 
 	append_merge_tag_headers(parents, &tail);
-	result = commit_tree_extended(msg, msg_len, tree, parents, ret,
-				      author, sign_commit, extra);
+	result = commit_tree_extended(msg, msg_len, tree, parents, ret, author,
+				      NULL, sign_commit, extra);
 	free_commit_extra_headers(extra);
 	return result;
 }
@@ -1395,7 +1505,8 @@ N_("Warning: commit message did not conform to UTF-8.\n"
 int commit_tree_extended(const char *msg, size_t msg_len,
 			 const struct object_id *tree,
 			 struct commit_list *parents, struct object_id *ret,
-			 const char *author, const char *sign_commit,
+			 const char *author, const char *committer,
+			 const char *sign_commit,
 			 struct commit_extra_header *extra)
 {
 	int result;
@@ -1428,7 +1539,9 @@ int commit_tree_extended(const char *msg, size_t msg_len,
 	if (!author)
 		author = git_author_info(IDENT_STRICT);
 	strbuf_addf(&buffer, "author %s\n", author);
-	strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
+	if (!committer)
+		committer = git_committer_info(IDENT_STRICT);
+	strbuf_addf(&buffer, "committer %s\n", committer);
 	if (!encoding_is_utf8)
 		strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
 
@@ -1445,7 +1558,7 @@ int commit_tree_extended(const char *msg, size_t msg_len,
 	if (encoding_is_utf8 && !verify_utf8(&buffer))
 		fprintf(stderr, _(commit_utf8_warn));
 
-	if (sign_commit && do_sign_commit(&buffer, sign_commit)) {
+	if (sign_commit && sign_with_header(&buffer, sign_commit)) {
 		result = -1;
 		goto out;
 	}
@@ -1538,7 +1651,7 @@ const char *find_commit_header(const char *msg, const char *key, size_t *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: line.  Ignored are
+ * order to find where to put a new Signed-off-by trailer.  Ignored are
  * trailing comment lines and blank lines.  To support "git commit -s
  * --amend" on an existing commit, we also ignore "Conflicts:".  To
  * support "git commit -v", we truncate at cut lines.
@@ -1581,3 +1694,26 @@ size_t ignore_non_trailer(const char *buf, size_t len)
 	}
 	return boc ? len - boc : len - cutoff;
 }
+
+int run_commit_hook(int editor_is_used, const char *index_file,
+		    const char *name, ...)
+{
+	struct strvec hook_env = STRVEC_INIT;
+	va_list args;
+	int ret;
+
+	strvec_pushf(&hook_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=:");
+
+	va_start(args, name);
+	ret = run_hook_ve(hook_env.v, name, args);
+	va_end(args);
+	strvec_clear(&hook_env);
+
+	return ret;
+}
diff --git a/commit.h b/commit.h
index f5295ca7f3..df42eb434f 100644
--- a/commit.h
+++ b/commit.h
@@ -11,9 +11,10 @@
 #include "commit-slab.h"
 
 #define COMMIT_NOT_FROM_GRAPH 0xFFFFFFFF
-#define GENERATION_NUMBER_INFINITY 0xFFFFFFFF
-#define GENERATION_NUMBER_MAX 0x3FFFFFFF
+#define GENERATION_NUMBER_INFINITY ((1ULL << 63) - 1)
+#define GENERATION_NUMBER_V1_MAX 0x3FFFFFFF
 #define GENERATION_NUMBER_ZERO 0
+#define GENERATION_NUMBER_V2_OFFSET_MAX ((1ULL << 31) - 1)
 
 struct commit_list {
 	struct commit *item;
@@ -36,8 +37,6 @@ struct commit {
 	 * or get_commit_tree_oid().
 	 */
 	struct tree *maybe_tree;
-	uint32_t graph_pos;
-	uint32_t generation;
 	unsigned int index;
 };
 
@@ -90,14 +89,14 @@ static inline int repo_parse_commit(struct repository *r, struct commit *item)
 	return repo_parse_commit_gently(r, item, 0);
 }
 
-static inline int parse_commit_no_graph(struct commit *commit)
+static inline int repo_parse_commit_no_graph(struct repository *r,
+					     struct commit *commit)
 {
-	return repo_parse_commit_internal(the_repository, commit, 0, 0);
+	return repo_parse_commit_internal(r, commit, 0, 0);
 }
 
 #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
 #define parse_commit_internal(item, quiet, use) repo_parse_commit_internal(the_repository, item, quiet, use)
-#define parse_commit_gently(item, quiet) repo_parse_commit_gently(the_repository, item, quiet)
 #define parse_commit(item) repo_parse_commit(the_repository, item)
 #endif
 
@@ -132,7 +131,7 @@ const void *repo_get_commit_buffer(struct repository *r,
 #endif
 
 /*
- * Tell the commit subsytem that we are done with a particular commit buffer.
+ * Tell the commit subsystem that we are done with a particular commit buffer.
  * The commit and buffer should be the input and return value, respectively,
  * from an earlier call to get_commit_buffer.  The buffer may or may not be
  * freed by this call; callers should not access the memory afterwards.
@@ -168,8 +167,13 @@ const void *detach_commit_buffer(struct commit *, unsigned long *sizep);
 /* Find beginning and length of commit subject. */
 int find_commit_subject(const char *commit_buffer, const char **subject);
 
+/* Return length of the commit subject from commit log message. */
+size_t commit_subject_length(const char *body);
+
 struct commit_list *commit_list_insert(struct commit *item,
 					struct commit_list **list);
+int commit_list_contains(struct commit *item,
+			 struct commit_list *list);
 struct commit_list **commit_list_append(struct commit *commit,
 					struct commit_list **next);
 unsigned commit_list_count(const struct commit_list *l);
@@ -180,6 +184,9 @@ void commit_list_sort_by_date(struct commit_list **list);
 /* Shallow copy of the input list */
 struct commit_list *copy_commit_list(struct commit_list *list);
 
+/* Modify list in-place to reverse it, returning new head; list will be tail */
+struct commit_list *reverse_commit_list(struct commit_list *list);
+
 void free_commit_list(struct commit_list *list);
 
 struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
@@ -236,6 +243,8 @@ struct commit_graft {
 typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
 
 struct commit_graft *read_graft_line(struct strbuf *line);
+/* commit_graft_pos returns an index into r->parsed_objects->grafts. */
+int commit_graft_pos(struct repository *r, const struct object_id *oid);
 int register_commit_graft(struct repository *r, struct commit_graft *, int);
 void prepare_commit_graft(struct repository *r);
 struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid);
@@ -247,55 +256,9 @@ struct commit *get_fork_point(const char *refname, struct commit *commit);
 
 struct oid_array;
 struct ref;
-int register_shallow(struct repository *r, const struct object_id *oid);
-int unregister_shallow(const struct object_id *oid);
 int for_each_commit_graft(each_commit_graft_fn, void *);
-int is_repository_shallow(struct repository *r);
-struct commit_list *get_shallow_commits(struct object_array *heads,
-					int depth, int shallow_flag, int not_shallow_flag);
-struct commit_list *get_shallow_commits_by_rev_list(
-		int ac, const char **av, int shallow_flag, int not_shallow_flag);
-void set_alternate_shallow_file(struct repository *r, const char *path, int override);
-int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
-			  const struct oid_array *extra);
-void setup_alternate_shallow(struct lock_file *shallow_lock,
-			     const char **alternate_shallow_file,
-			     const struct oid_array *extra);
-const char *setup_temporary_shallow(const struct oid_array *extra);
-void advertise_shallow_grafts(int);
 
-/*
- * Initialize with prepare_shallow_info() or zero-initialize (equivalent to
- * prepare_shallow_info with a NULL oid_array).
- */
-struct shallow_info {
-	struct oid_array *shallow;
-	int *ours, nr_ours;
-	int *theirs, nr_theirs;
-	struct oid_array *ref;
-
-	/* for receive-pack */
-	uint32_t **used_shallow;
-	int *need_reachability_test;
-	int *reachable;
-	int *shallow_ref;
-	struct commit **commits;
-	int nr_commits;
-};
-
-void prepare_shallow_info(struct shallow_info *, struct oid_array *);
-void clear_shallow_info(struct shallow_info *);
-void remove_nonexistent_theirs_shallow(struct shallow_info *);
-void assign_shallow_commits_to_refs(struct shallow_info *info,
-				    uint32_t **used,
-				    int *ref_status);
-int delayed_reachability_test(struct shallow_info *si, int c);
-#define PRUNE_SHOW_ONLY 1
-#define PRUNE_QUICK 2
-void prune_shallow(unsigned options);
-extern struct trace_key trace_shallow;
-
-int interactive_add(int argc, const char **argv, const char *prefix, int patch);
+int interactive_add(const char **argv, const char *prefix, int patch);
 int run_add_interactive(const char *revision, const char *patch_mode,
 			const struct pathspec *pathspec);
 
@@ -316,10 +279,9 @@ int commit_tree(const char *msg, size_t msg_len,
 
 int commit_tree_extended(const char *msg, size_t msg_len,
 			 const struct object_id *tree,
-			 struct commit_list *parents,
-			 struct object_id *ret, const char *author,
-			 const char *sign_commit,
-			 struct commit_extra_header *);
+			 struct commit_list *parents, struct object_id *ret,
+			 const char *author, const char *committer,
+			 const char *sign_commit, struct commit_extra_header *);
 
 struct commit_extra_header *read_commit_extra_headers(struct commit *, const char **);
 
@@ -360,7 +322,8 @@ void set_merge_remote_desc(struct commit *commit,
 struct commit *get_merge_parent(const char *name);
 
 int parse_signed_commit(const struct commit *commit,
-			struct strbuf *message, struct strbuf *signature);
+			struct strbuf *message, struct strbuf *signature,
+			const struct git_hash_algo *algop);
 int remove_signature(struct strbuf *buf);
 
 /*
@@ -383,8 +346,18 @@ int compare_commits_by_author_date(const void *a_, const void *b_, void *unused)
  * Verify a single commit with check_commit_signature() and die() if it is not
  * a good signature. This isn't really suitable for general use, but is a
  * helper to implement consistent logic for pull/merge --verify-signatures.
+ *
+ * The check_trust parameter is meant for backward-compatibility.  The GPG
+ * interface verifies key trust with a default trust level that is below the
+ * default trust level for merge operations.  Its value should be non-zero if
+ * the user hasn't set a minimum trust level explicitly in their configuration.
+ *
+ * If the user has set a minimum trust level, then that value should be obeyed
+ * and check_trust should be zero, even if the configured trust level is below
+ * the default trust level for merges.
  */
-void verify_merge_signature(struct commit *commit, int verbose);
+void verify_merge_signature(struct commit *commit, int verbose,
+			    int check_trust);
 
 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
 int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
@@ -392,4 +365,13 @@ int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void
 LAST_ARG_MUST_BE_NULL
 int run_commit_hook(int editor_is_used, const char *index_file, const char *name, ...);
 
+/* Sign a commit or tag buffer, storing the result in a header. */
+int sign_with_header(struct strbuf *buf, const char *keyid);
+/* Parse the signature out of a header. */
+int parse_buffer_signed_by_header(const char *buffer,
+				  unsigned long size,
+				  struct strbuf *payload,
+				  struct strbuf *signature,
+				  const struct git_hash_algo *algop);
+
 #endif /* COMMIT_H */
diff --git a/compat/bswap.h b/compat/bswap.h
index e4e25735ce..512f6f4b99 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -74,7 +74,7 @@ static inline uint64_t git_bswap64(uint64_t x)
 }
 #endif
 
-#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
+#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64) || defined(_M_ARM64))
 
 #include <stdlib.h>
 
@@ -145,28 +145,6 @@ static inline uint64_t git_bswap64(uint64_t x)
 
 #endif
 
-/*
- * Performance might be improved if the CPU architecture is OK with
- * unaligned 32-bit loads and a fast ntohl() is available.
- * Otherwise fall back to byte loads and shifts which is portable,
- * and is faster on architectures with memory alignment issues.
- */
-
-#if !defined(NO_UNALIGNED_LOADS) && ( \
-    defined(__i386__) || defined(__x86_64__) || \
-    defined(_M_IX86) || defined(_M_X64) || \
-    defined(__ppc__) || defined(__ppc64__) || \
-    defined(__powerpc__) || defined(__powerpc64__) || \
-    defined(__s390__) || defined(__s390x__))
-
-#define get_be16(p)	ntohs(*(unsigned short *)(p))
-#define get_be32(p)	ntohl(*(unsigned int *)(p))
-#define get_be64(p)	ntohll(*(uint64_t *)(p))
-#define put_be32(p, v)	do { *(unsigned int *)(p) = htonl(v); } while (0)
-#define put_be64(p, v)	do { *(uint64_t *)(p) = htonll(v); } while (0)
-
-#else
-
 static inline uint16_t get_be16(const void *ptr)
 {
 	const unsigned char *p = ptr;
@@ -212,6 +190,4 @@ static inline void put_be64(void *ptr, uint64_t value)
 	p[7] = value >>  0;
 }
 
-#endif
-
 #endif /* COMPAT_BSWAP_H */
diff --git a/compat/compiler.h b/compat/compiler.h
new file mode 100644
index 0000000000..10dbb65937
--- /dev/null
+++ b/compat/compiler.h
@@ -0,0 +1,41 @@
+#ifndef COMPILER_H
+#define COMPILER_H
+
+#include "git-compat-util.h"
+#include "strbuf.h"
+
+#ifdef __GLIBC__
+#include <gnu/libc-version.h>
+#endif
+
+static inline void get_compiler_info(struct strbuf *info)
+{
+	int len = info->len;
+#ifdef __clang__
+	strbuf_addf(info, "clang: %s\n", __clang_version__);
+#elif defined(__GNUC__)
+	strbuf_addf(info, "gnuc: %d.%d\n", __GNUC__, __GNUC_MINOR__);
+#endif
+
+#ifdef _MSC_VER
+	strbuf_addf(info, "MSVC version: %02d.%02d.%05d\n",
+		    _MSC_VER / 100, _MSC_VER % 100, _MSC_FULL_VER % 100000);
+#endif
+
+	if (len == info->len)
+		strbuf_addstr(info, _("no compiler information available\n"));
+}
+
+static inline void get_libc_info(struct strbuf *info)
+{
+	int len = info->len;
+
+#ifdef __GLIBC__
+	strbuf_addf(info, "glibc: %s\n", gnu_get_libc_version());
+#endif
+
+	if (len == info->len)
+		strbuf_addstr(info, _("no libc information available\n"));
+}
+
+#endif /* COMPILER_H */
diff --git a/compat/gmtime.c b/compat/gmtime.c
deleted file mode 100644
index e8362dd2b9..0000000000
--- a/compat/gmtime.c
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "../git-compat-util.h"
-#undef gmtime
-#undef gmtime_r
-
-struct tm *git_gmtime(const time_t *timep)
-{
-	static struct tm result;
-	return git_gmtime_r(timep, &result);
-}
-
-struct tm *git_gmtime_r(const time_t *timep, struct tm *result)
-{
-	struct tm *ret;
-
-	memset(result, 0, sizeof(*result));
-	ret = gmtime_r(timep, result);
-
-	/*
-	 * Rather than NULL, FreeBSD gmtime simply leaves the "struct tm"
-	 * untouched when it encounters overflow. Since "mday" cannot otherwise
-	 * be zero, we can test this very quickly.
-	 */
-	if (ret && !ret->tm_mday) {
-		ret = NULL;
-		errno = EOVERFLOW;
-	}
-
-	return ret;
-}
diff --git a/compat/linux/procinfo.c b/compat/linux/procinfo.c
new file mode 100644
index 0000000000..578fed4cd3
--- /dev/null
+++ b/compat/linux/procinfo.c
@@ -0,0 +1,55 @@
+#include "cache.h"
+
+#include "strbuf.h"
+#include "strvec.h"
+#include "trace2.h"
+
+static void get_ancestry_names(struct strvec *names)
+{
+	/*
+	 * NEEDSWORK: We could gather the entire pstree into an array to match
+	 * functionality with compat/win32/trace2_win32_process_info.c.
+	 * To do so, we may want to examine /proc/<pid>/stat. For now, just
+	 * gather the immediate parent name which is readily accessible from
+	 * /proc/$(getppid())/comm.
+	 */
+	struct strbuf procfs_path = STRBUF_INIT;
+	struct strbuf name = STRBUF_INIT;
+
+	/* try to use procfs if it's present. */
+	strbuf_addf(&procfs_path, "/proc/%d/comm", getppid());
+	if (strbuf_read_file(&name, procfs_path.buf, 0)) {
+		strbuf_release(&procfs_path);
+		strbuf_trim_trailing_newline(&name);
+		strvec_push(names, strbuf_detach(&name, NULL));
+	}
+
+	return;
+	/* NEEDSWORK: add non-procfs-linux implementations here */
+}
+
+void trace2_collect_process_info(enum trace2_process_info_reason reason)
+{
+	if (!trace2_is_enabled())
+		return;
+
+	/* someday we may want to write something extra here, but not today */
+	if (reason == TRACE2_PROCESS_INFO_EXIT)
+		return;
+
+	if (reason == TRACE2_PROCESS_INFO_STARTUP) {
+		/*
+		 * NEEDSWORK: we could do the entire ptree in an array instead,
+		 * see compat/win32/trace2_win32_process_info.c.
+		 */
+		struct strvec names = STRVEC_INIT;
+
+		get_ancestry_names(&names);
+
+		if (names.nr)
+			trace2_cmd_ancestry(names.v);
+		strvec_clear(&names);
+	}
+
+	return;
+}
diff --git a/compat/mingw.c b/compat/mingw.c
index fe609239dd..9e0cd1e097 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -13,6 +13,19 @@
 
 static const int delay[] = { 0, 1, 10, 20, 40 };
 
+void open_in_gdb(void)
+{
+	static struct child_process cp = CHILD_PROCESS_INIT;
+	extern char *_pgmptr;
+
+	strvec_pushl(&cp.args, "mintty", "gdb", NULL);
+	strvec_pushf(&cp.args, "--pid=%d", getpid());
+	cp.clean_on_exit = 1;
+	if (start_command(&cp) < 0)
+		die_errno("Could not start gdb");
+	sleep(1);
+}
+
 int err_win_to_posix(DWORD winerr)
 {
 	int error = ENOSYS;
@@ -114,6 +127,7 @@ int err_win_to_posix(DWORD winerr)
 	case ERROR_SHARING_BUFFER_EXCEEDED: error = ENFILE; break;
 	case ERROR_SHARING_VIOLATION: error = EACCES; break;
 	case ERROR_STACK_OVERFLOW: error = ENOMEM; break;
+	case ERROR_SUCCESS: BUG("err_win_to_posix() called without an error!");
 	case ERROR_SWAPERROR: error = ENOENT; break;
 	case ERROR_TOO_MANY_MODULES: error = EMFILE; break;
 	case ERROR_TOO_MANY_OPEN_FILES: error = EMFILE; break;
@@ -212,6 +226,7 @@ enum hide_dotfiles_type {
 	HIDE_DOTFILES_DOTGITONLY
 };
 
+static int core_restrict_inherited_handles = -1;
 static enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
 static char *unset_environment_variables;
 
@@ -231,6 +246,15 @@ int mingw_core_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "core.restrictinheritedhandles")) {
+		if (value && !strcasecmp(value, "auto"))
+			core_restrict_inherited_handles = -1;
+		else
+			core_restrict_inherited_handles =
+				git_config_bool(var, value);
+		return 0;
+	}
+
 	return 0;
 }
 
@@ -266,6 +290,9 @@ int mingw_unlink(const char *pathname)
 	if (xutftowcs_path(wpathname, pathname) < 0)
 		return -1;
 
+	if (DeleteFileW(wpathname))
+		return 0;
+
 	/* read-only files cannot be removed */
 	_wchmod(wpathname, 0666);
 	while ((ret = _wunlink(wpathname)) == -1 && tries < ARRAY_SIZE(delay)) {
@@ -314,6 +341,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;
 
@@ -340,6 +388,8 @@ int mingw_rmdir(const char *pathname)
 	       ask_yes_no_if_possible("Deletion of directory '%s' failed. "
 			"Should I try again?", pathname))
 	       ret = _wrmdir(wpathname);
+	if (!ret)
+		invalidate_lstat_cache();
 	return ret;
 }
 
@@ -392,6 +442,12 @@ int mingw_mkdir(const char *path, int mode)
 {
 	int ret;
 	wchar_t wpath[MAX_PATH];
+
+	if (!is_valid_win32_path(path, 0)) {
+		errno = EINVAL;
+		return -1;
+	}
+
 	if (xutftowcs_path(wpath, path) < 0)
 		return -1;
 	ret = _wmkdir(wpath);
@@ -430,8 +486,21 @@ static int mingw_open_append(wchar_t const *wfilename, int oflags, ...)
 	handle = CreateFileW(wfilename, FILE_APPEND_DATA,
 			FILE_SHARE_WRITE | FILE_SHARE_READ,
 			NULL, create, FILE_ATTRIBUTE_NORMAL, NULL);
-	if (handle == INVALID_HANDLE_VALUE)
-		return errno = err_win_to_posix(GetLastError()), -1;
+	if (handle == INVALID_HANDLE_VALUE) {
+		DWORD err = GetLastError();
+
+		/*
+		 * Some network storage solutions (e.g. Isilon) might return
+		 * ERROR_INVALID_PARAMETER instead of expected error
+		 * ERROR_PATH_NOT_FOUND, which results in an unknown error. If
+		 * so, let's turn the error to ERROR_PATH_NOT_FOUND instead.
+		 */
+		if (err == ERROR_INVALID_PARAMETER)
+			err = ERROR_PATH_NOT_FOUND;
+
+		errno = err_win_to_posix(err);
+		return -1;
+	}
 
 	/*
 	 * No O_APPEND here, because the CRT uses it only to reset the
@@ -465,7 +534,7 @@ int mingw_open (const char *filename, int oflags, ...)
 	typedef int (*open_fn_t)(wchar_t const *wfilename, int oflags, ...);
 	va_list args;
 	unsigned mode;
-	int fd;
+	int fd, create = (oflags & (O_CREAT | O_EXCL)) == (O_CREAT | O_EXCL);
 	wchar_t wfilename[MAX_PATH];
 	open_fn_t open_fn;
 
@@ -473,16 +542,21 @@ int mingw_open (const char *filename, int oflags, ...)
 	mode = va_arg(args, int);
 	va_end(args);
 
-	if (filename && !strcmp(filename, "/dev/null"))
-		filename = "nul";
+	if (!is_valid_win32_path(filename, !create)) {
+		errno = create ? EINVAL : ENOENT;
+		return -1;
+	}
 
 	if ((oflags & O_APPEND) && !is_local_named_pipe_path(filename))
 		open_fn = mingw_open_append;
 	else
 		open_fn = _wopen;
 
-	if (xutftowcs_path(wfilename, filename) < 0)
+	if (filename && !strcmp(filename, "/dev/null"))
+		wcscpy(wfilename, L"nul");
+	else if (xutftowcs_path(wfilename, filename) < 0)
 		return -1;
+
 	fd = open_fn(wfilename, oflags, mode);
 
 	if (fd < 0 && (oflags & O_ACCMODE) != O_RDONLY && errno == EACCES) {
@@ -540,10 +614,17 @@ FILE *mingw_fopen (const char *filename, const char *otype)
 	FILE *file;
 	wchar_t wfilename[MAX_PATH], wotype[4];
 	if (filename && !strcmp(filename, "/dev/null"))
-		filename = "nul";
-	if (xutftowcs_path(wfilename, filename) < 0 ||
-		xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0)
+		wcscpy(wfilename, L"nul");
+	else if (!is_valid_win32_path(filename, 1)) {
+		int create = otype && strchr(otype, 'w');
+		errno = create ? EINVAL : ENOENT;
 		return NULL;
+	} else if (xutftowcs_path(wfilename, filename) < 0)
+		return NULL;
+
+	if (xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0)
+		return NULL;
+
 	if (hide && !access(filename, F_OK) && set_hidden_flag(wfilename, 0)) {
 		error("could not unhide %s", filename);
 		return NULL;
@@ -562,10 +643,17 @@ FILE *mingw_freopen (const char *filename, const char *otype, FILE *stream)
 	FILE *file;
 	wchar_t wfilename[MAX_PATH], wotype[4];
 	if (filename && !strcmp(filename, "/dev/null"))
-		filename = "nul";
-	if (xutftowcs_path(wfilename, filename) < 0 ||
-		xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0)
+		wcscpy(wfilename, L"nul");
+	else if (!is_valid_win32_path(filename, 1)) {
+		int create = otype && strchr(otype, 'w');
+		errno = create ? EINVAL : ENOENT;
 		return NULL;
+	} else if (xutftowcs_path(wfilename, filename) < 0)
+		return NULL;
+
+	if (xutftowcs(wotype, otype, ARRAY_SIZE(wotype)) < 0)
+		return NULL;
+
 	if (hide && !access(filename, F_OK) && set_hidden_flag(wfilename, 0)) {
 		error("could not unhide %s", filename);
 		return NULL;
@@ -618,6 +706,8 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
 int mingw_access(const char *filename, int mode)
 {
 	wchar_t wfilename[MAX_PATH];
+	if (!strcmp("nul", filename) || !strcmp("/dev/null", filename))
+		return 0;
 	if (xutftowcs_path(wfilename, filename) < 0)
 		return -1;
 	/* X_OK is not supported by the MSVCRT version */
@@ -915,7 +1005,16 @@ revert_attrs:
 size_t mingw_strftime(char *s, size_t max,
 		      const char *format, const struct tm *tm)
 {
-	size_t ret = strftime(s, max, format, tm);
+	/* 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,
+		const char *, const struct tm *);
+
+	if (INIT_PROC_ADDR(strftime))
+		ret = strftime(s, max, format, tm);
+	else
+		ret = fallback(s, max, format, tm);
 
 	if (!ret && errno == EINVAL)
 		die("invalid strftime format: '%s'", format);
@@ -986,16 +1085,16 @@ int pipe(int filedes[2])
 
 struct tm *gmtime_r(const time_t *timep, struct tm *result)
 {
-	/* gmtime() in MSVCRT.DLL is thread-safe, but not reentrant */
-	memcpy(result, gmtime(timep), sizeof(struct tm));
-	return result;
+	if (gmtime_s(result, timep) == 0)
+		return result;
+	return NULL;
 }
 
 struct tm *localtime_r(const time_t *timep, struct tm *result)
 {
-	/* localtime() in MSVCRT.DLL is thread-safe, but not reentrant */
-	memcpy(result, localtime(timep), sizeof(struct tm));
-	return result;
+	if (localtime_s(result, timep) == 0)
+		return result;
+	return NULL;
 }
 
 char *mingw_getcwd(char *pointer, int len)
@@ -1054,7 +1153,7 @@ static const char *quote_arg_msvc(const char *arg)
 				p++;
 				len++;
 			}
-			if (*p == '"')
+			if (*p == '"' || !*p)
 				n += count*2 + 1;
 			continue;
 		}
@@ -1076,16 +1175,19 @@ static const char *quote_arg_msvc(const char *arg)
 				count++;
 				*d++ = *arg++;
 			}
-			if (*arg == '"') {
+			if (*arg == '"' || !*arg) {
 				while (count-- > 0)
 					*d++ = '\\';
+				/* don't escape the surrounding end quote */
+				if (!*arg)
+					break;
 				*d++ = '\\';
 			}
 		}
 		*d++ = *arg++;
 	}
 	*d++ = '"';
-	*d++ = 0;
+	*d++ = '\0';
 	return q;
 }
 
@@ -1098,13 +1200,14 @@ static const char *quote_arg_msys2(const char *arg)
 
 	for (p = arg; *p; p++) {
 		int ws = isspace(*p);
-		if (!ws && *p != '\\' && *p != '"' && *p != '{')
+		if (!ws && *p != '\\' && *p != '"' && *p != '{' && *p != '\'' &&
+		    *p != '?' && *p != '*' && *p != '~')
 			continue;
 		if (!buf.len)
 			strbuf_addch(&buf, '"');
 		if (p != p2)
 			strbuf_add(&buf, p2, p - p2);
-		if (!ws && *p != '{')
+		if (*p == '\\' || *p == '"')
 			strbuf_addch(&buf, '\\');
 		p2 = p;
 	}
@@ -1114,7 +1217,7 @@ static const char *quote_arg_msys2(const char *arg)
 	else if (!buf.len)
 		return arg;
 	else
-		strbuf_add(&buf, p2, p - p2),
+		strbuf_add(&buf, p2, p - p2);
 
 	strbuf_addch(&buf, '"');
 	return strbuf_detach(&buf, 0);
@@ -1192,7 +1295,7 @@ static char *path_lookup(const char *cmd, int exe_only)
 	int len = strlen(cmd);
 	int isexe = len >= 4 && !strcasecmp(cmd+len-4, ".exe");
 
-	if (strchr(cmd, '/') || strchr(cmd, '\\'))
+	if (strpbrk(cmd, "/\\"))
 		return xstrdup(cmd);
 
 	path = mingw_getenv("PATH");
@@ -1371,7 +1474,10 @@ static inline int match_last_path_component(const char *path, size_t *len,
 
 static int is_msys2_sh(const char *cmd)
 {
-	if (cmd && !strcmp(cmd, "sh")) {
+	if (!cmd)
+		return 0;
+
+	if (!strcmp(cmd, "sh")) {
 		static int ret = -1;
 		char *p;
 
@@ -1391,6 +1497,16 @@ static int is_msys2_sh(const char *cmd)
 		}
 		return ret;
 	}
+
+	if (ends_with(cmd, "\\sh.exe")) {
+		static char *sh;
+
+		if (!sh)
+			sh = path_lookup("sh", 0);
+
+		return !fspathcmp(cmd, sh);
+	}
+
 	return 0;
 }
 
@@ -1398,15 +1514,35 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
 			      const char *dir,
 			      int prepend_cmd, int fhin, int fhout, int fherr)
 {
-	STARTUPINFOW si;
+	static int restrict_handle_inheritance = -1;
+	STARTUPINFOEXW si;
 	PROCESS_INFORMATION pi;
+	LPPROC_THREAD_ATTRIBUTE_LIST attr_list = NULL;
+	HANDLE stdhandles[3];
+	DWORD stdhandles_count = 0;
+	SIZE_T size;
 	struct strbuf args;
 	wchar_t wcmd[MAX_PATH], wdir[MAX_PATH], *wargs, *wenvblk = NULL;
 	unsigned flags = CREATE_UNICODE_ENVIRONMENT;
 	BOOL ret;
 	HANDLE cons;
 	const char *(*quote_arg)(const char *arg) =
-		is_msys2_sh(*argv) ? quote_arg_msys2 : quote_arg_msvc;
+		is_msys2_sh(cmd ? cmd : *argv) ?
+		quote_arg_msys2 : quote_arg_msvc;
+	const char *strace_env;
+
+	/* Make sure to override previous errors, if any */
+	errno = 0;
+
+	if (restrict_handle_inheritance < 0)
+		restrict_handle_inheritance = core_restrict_inherited_handles;
+	/*
+	 * The following code to restrict which handles are inherited seems
+	 * to work properly only on Windows 7 and later, so let's disable it
+	 * on Windows Vista and 2008.
+	 */
+	if (restrict_handle_inheritance < 0)
+		restrict_handle_inheritance = GetVersion() >> 16 >= 7601;
 
 	do_unset_environment_variables();
 
@@ -1435,11 +1571,23 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
 		CloseHandle(cons);
 	}
 	memset(&si, 0, sizeof(si));
-	si.cb = sizeof(si);
-	si.dwFlags = STARTF_USESTDHANDLES;
-	si.hStdInput = winansi_get_osfhandle(fhin);
-	si.hStdOutput = winansi_get_osfhandle(fhout);
-	si.hStdError = winansi_get_osfhandle(fherr);
+	si.StartupInfo.cb = sizeof(si);
+	si.StartupInfo.hStdInput = winansi_get_osfhandle(fhin);
+	si.StartupInfo.hStdOutput = winansi_get_osfhandle(fhout);
+	si.StartupInfo.hStdError = winansi_get_osfhandle(fherr);
+
+	/* The list of handles cannot contain duplicates */
+	if (si.StartupInfo.hStdInput != INVALID_HANDLE_VALUE)
+		stdhandles[stdhandles_count++] = si.StartupInfo.hStdInput;
+	if (si.StartupInfo.hStdOutput != INVALID_HANDLE_VALUE &&
+	    si.StartupInfo.hStdOutput != si.StartupInfo.hStdInput)
+		stdhandles[stdhandles_count++] = si.StartupInfo.hStdOutput;
+	if (si.StartupInfo.hStdError != INVALID_HANDLE_VALUE &&
+	    si.StartupInfo.hStdError != si.StartupInfo.hStdInput &&
+	    si.StartupInfo.hStdError != si.StartupInfo.hStdOutput)
+		stdhandles[stdhandles_count++] = si.StartupInfo.hStdError;
+	if (stdhandles_count)
+		si.StartupInfo.dwFlags |= STARTF_USESTDHANDLES;
 
 	if (*argv && !strcmp(cmd, *argv))
 		wcmd[0] = L'\0';
@@ -1465,6 +1613,31 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
 			free(quoted);
 	}
 
+	strace_env = getenv("GIT_STRACE_COMMANDS");
+	if (strace_env) {
+		char *p = path_lookup("strace.exe", 1);
+		if (!p)
+			return error("strace not found!");
+		if (xutftowcs_path(wcmd, p) < 0) {
+			free(p);
+			return -1;
+		}
+		free(p);
+		if (!strcmp("1", strace_env) ||
+		    !strcasecmp("yes", strace_env) ||
+		    !strcasecmp("true", strace_env))
+			strbuf_insert(&args, 0, "strace ", 7);
+		else {
+			const char *quoted = quote_arg(strace_env);
+			struct strbuf buf = STRBUF_INIT;
+			strbuf_addf(&buf, "strace -o %s ", quoted);
+			if (quoted != strace_env)
+				free((char *)quoted);
+			strbuf_insert(&args, 0, buf.buf, buf.len);
+			strbuf_release(&buf);
+		}
+	}
+
 	ALLOC_ARRAY(wargs, st_add(st_mult(2, args.len), 1));
 	xutftowcs(wargs, args.buf, 2 * args.len + 1);
 	strbuf_release(&args);
@@ -1472,16 +1645,98 @@ static pid_t mingw_spawnve_fd(const char *cmd, const char **argv, char **deltaen
 	wenvblk = make_environment_block(deltaenv);
 
 	memset(&pi, 0, sizeof(pi));
-	ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL, TRUE,
-		flags, wenvblk, dir ? wdir : NULL, &si, &pi);
+	if (restrict_handle_inheritance && stdhandles_count &&
+	    (InitializeProcThreadAttributeList(NULL, 1, 0, &size) ||
+	     GetLastError() == ERROR_INSUFFICIENT_BUFFER) &&
+	    (attr_list = (LPPROC_THREAD_ATTRIBUTE_LIST)
+			(HeapAlloc(GetProcessHeap(), 0, size))) &&
+	    InitializeProcThreadAttributeList(attr_list, 1, 0, &size) &&
+	    UpdateProcThreadAttribute(attr_list, 0,
+				      PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
+				      stdhandles,
+				      stdhandles_count * sizeof(HANDLE),
+				      NULL, NULL)) {
+		si.lpAttributeList = attr_list;
+		flags |= EXTENDED_STARTUPINFO_PRESENT;
+	}
+
+	ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL,
+			     stdhandles_count ? TRUE : FALSE,
+			     flags, wenvblk, dir ? wdir : NULL,
+			     &si.StartupInfo, &pi);
+
+	/*
+	 * On Windows 2008 R2, it seems that specifying certain types of handles
+	 * (such as FILE_TYPE_CHAR or FILE_TYPE_PIPE) will always produce an
+	 * error. Rather than playing finicky and fragile games, let's just try
+	 * to detect this situation and simply try again without restricting any
+	 * handle inheritance. This is still better than failing to create
+	 * processes.
+	 */
+	if (!ret && restrict_handle_inheritance && stdhandles_count) {
+		DWORD err = GetLastError();
+		struct strbuf buf = STRBUF_INIT;
+
+		if (err != ERROR_NO_SYSTEM_RESOURCES &&
+		    /*
+		     * On Windows 7 and earlier, handles on pipes and character
+		     * devices are inherited automatically, and cannot be
+		     * specified in the thread handle list. Rather than trying
+		     * to catch each and every corner case (and running the
+		     * chance of *still* forgetting a few), let's just fall
+		     * back to creating the process without trying to limit the
+		     * handle inheritance.
+		     */
+		    !(err == ERROR_INVALID_PARAMETER &&
+		      GetVersion() >> 16 < 9200) &&
+		    !getenv("SUPPRESS_HANDLE_INHERITANCE_WARNING")) {
+			DWORD fl = 0;
+			int i;
+
+			setenv("SUPPRESS_HANDLE_INHERITANCE_WARNING", "1", 1);
+
+			for (i = 0; i < stdhandles_count; i++) {
+				HANDLE h = stdhandles[i];
+				strbuf_addf(&buf, "handle #%d: %p (type %lx, "
+					    "handle info (%d) %lx\n", i, h,
+					    GetFileType(h),
+					    GetHandleInformation(h, &fl),
+					    fl);
+			}
+			strbuf_addstr(&buf, "\nThis is a bug; please report it "
+				      "at\nhttps://github.com/git-for-windows/"
+				      "git/issues/new\n\n"
+				      "To suppress this warning, please set "
+				      "the environment variable\n\n"
+				      "\tSUPPRESS_HANDLE_INHERITANCE_WARNING=1"
+				      "\n");
+		}
+		restrict_handle_inheritance = 0;
+		flags &= ~EXTENDED_STARTUPINFO_PRESENT;
+		ret = CreateProcessW(*wcmd ? wcmd : NULL, wargs, NULL, NULL,
+				     TRUE, flags, wenvblk, dir ? wdir : NULL,
+				     &si.StartupInfo, &pi);
+		if (!ret)
+			errno = err_win_to_posix(GetLastError());
+		if (ret && buf.len) {
+			warning("failed to restrict file handles (%ld)\n\n%s",
+				err, buf.buf);
+		}
+		strbuf_release(&buf);
+	} else if (!ret)
+		errno = err_win_to_posix(GetLastError());
+
+	if (si.lpAttributeList)
+		DeleteProcThreadAttributeList(si.lpAttributeList);
+	if (attr_list)
+		HeapFree(GetProcessHeap(), 0, attr_list);
 
 	free(wenvblk);
 	free(wargs);
 
-	if (!ret) {
-		errno = ENOENT;
+	if (!ret)
 		return -1;
-	}
+
 	CloseHandle(pi.hThread);
 
 	/*
@@ -1566,7 +1821,7 @@ static int try_shell_exec(const char *cmd, char *const *argv)
 		while (argv[argc]) argc++;
 		ALLOC_ARRAY(argv2, argc + 1);
 		argv2[0] = (char *)cmd;	/* full path to the script file */
-		memcpy(&argv2[1], &argv[1], sizeof(*argv) * argc);
+		COPY_ARRAY(&argv2[1], &argv[1], argc);
 		exec_id = trace2_exec(prog, argv2);
 		pid = mingw_spawnv(prog, argv2, 1);
 		if (pid >= 0) {
@@ -2367,6 +2622,130 @@ static void setup_windows_environment(void)
 	}
 }
 
+int is_valid_win32_path(const char *path, int allow_literal_nul)
+{
+	const char *p = path;
+	int preceding_space_or_period = 0, i = 0, periods = 0;
+
+	if (!protect_ntfs)
+		return 1;
+
+	skip_dos_drive_prefix((char **)&path);
+	goto segment_start;
+
+	for (;;) {
+		char c = *(path++);
+		switch (c) {
+		case '\0':
+		case '/': case '\\':
+			/* cannot end in ` ` or `.`, except for `.` and `..` */
+			if (preceding_space_or_period &&
+			    (i != periods || periods > 2))
+				return 0;
+			if (!c)
+				return 1;
+
+			i = periods = preceding_space_or_period = 0;
+
+segment_start:
+			switch (*path) {
+			case 'a': case 'A': /* AUX */
+				if (((c = path[++i]) != 'u' && c != 'U') ||
+				    ((c = path[++i]) != 'x' && c != 'X')) {
+not_a_reserved_name:
+					path += i;
+					continue;
+				}
+				break;
+			case 'c': case 'C':
+				/* COM1 ... COM9, CON, CONIN$, CONOUT$ */
+				if ((c = path[++i]) != 'o' && c != 'O')
+					goto not_a_reserved_name;
+				c = path[++i];
+				if (c == 'm' || c == 'M') { /* COM1 ... COM9 */
+					c = path[++i];
+					if (c < '1' || c > '9')
+						goto not_a_reserved_name;
+				} else if (c == 'n' || c == 'N') { /* CON */
+					c = path[i + 1];
+					if ((c == 'i' || c == 'I') &&
+					    ((c = path[i + 2]) == 'n' ||
+					     c == 'N') &&
+					    path[i + 3] == '$')
+						i += 3; /* CONIN$ */
+					else if ((c == 'o' || c == 'O') &&
+						 ((c = path[i + 2]) == 'u' ||
+						  c == 'U') &&
+						 ((c = path[i + 3]) == 't' ||
+						  c == 'T') &&
+						 path[i + 4] == '$')
+						i += 4; /* CONOUT$ */
+				} else
+					goto not_a_reserved_name;
+				break;
+			case 'l': case 'L': /* LPT<N> */
+				if (((c = path[++i]) != 'p' && c != 'P') ||
+				    ((c = path[++i]) != 't' && c != 'T') ||
+				    !isdigit(path[++i]))
+					goto not_a_reserved_name;
+				break;
+			case 'n': case 'N': /* NUL */
+				if (((c = path[++i]) != 'u' && c != 'U') ||
+				    ((c = path[++i]) != 'l' && c != 'L') ||
+				    (allow_literal_nul &&
+				     !path[i + 1] && p == path))
+					goto not_a_reserved_name;
+				break;
+			case 'p': case 'P': /* PRN */
+				if (((c = path[++i]) != 'r' && c != 'R') ||
+				    ((c = path[++i]) != 'n' && c != 'N'))
+					goto not_a_reserved_name;
+				break;
+			default:
+				continue;
+			}
+
+			/*
+			 * So far, this looks like a reserved name. Let's see
+			 * whether it actually is one: trailing spaces, a file
+			 * extension, or an NTFS Alternate Data Stream do not
+			 * matter, the name is still reserved if any of those
+			 * follow immediately after the actual name.
+			 */
+			i++;
+			if (path[i] == ' ') {
+				preceding_space_or_period = 1;
+				while (path[++i] == ' ')
+					; /* skip all spaces */
+			}
+
+			c = path[i];
+			if (c && c != '.' && c != ':' && c != '/' && c != '\\')
+				goto not_a_reserved_name;
+
+			/* contains reserved name */
+			return 0;
+		case '.':
+			periods++;
+			/* fallthru */
+		case ' ':
+			preceding_space_or_period = 1;
+			i++;
+			continue;
+		case ':': /* DOS drive prefix was already skipped */
+		case '<': case '>': case '"': case '|': case '?': case '*':
+			/* illegal character */
+			return 0;
+		default:
+			if (c > '\0' && c < '\x20')
+				/* illegal character */
+				return 0;
+		}
+		preceding_space_or_period = 0;
+		i++;
+	}
+}
+
 #if !defined(_MSC_VER)
 /*
  * Disable MSVCRT command line wildcard expansion (__getmainargs called from
diff --git a/compat/mingw.h b/compat/mingw.h
index 9ad204c57c..c9a52ad64a 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -227,6 +227,7 @@ int mingw_rmdir(const char *path);
 
 int mingw_open (const char *filename, int oflags, ...);
 #define open mingw_open
+#undef OPEN_RETURNS_EINTR
 
 int mingw_fgetc(FILE *stream);
 #define fgetc mingw_fgetc
@@ -453,6 +454,27 @@ char *mingw_query_user_email(void);
 #endif
 
 /**
+ * Verifies that the given path is a valid one on Windows.
+ *
+ * In particular, path segments are disallowed which
+ *
+ * - end in a period or a space (except the special directories `.` and `..`).
+ *
+ * - contain any of the reserved characters, e.g. `:`, `;`, `*`, etc
+ *
+ * - correspond to reserved names (such as `AUX`, `PRN`, etc)
+ *
+ * The `allow_literal_nul` parameter controls whether the path `NUL` should
+ * be considered valid (this makes sense e.g. before opening files, as it is
+ * perfectly legitimate to open `NUL` on Windows, just as it is to open
+ * `/dev/null` on Unix/Linux).
+ *
+ * Returns 1 upon success, otherwise 0.
+ */
+int is_valid_win32_path(const char *path, int allow_literal_nul);
+#define is_valid_path(path) is_valid_win32_path(path, 0)
+
+/**
  * Converts UTF-8 encoded string to UTF-16LE.
  *
  * To support repositories with legacy-encoded file names, invalid UTF-8 bytes
@@ -558,7 +580,7 @@ int xwcstoutf(char *utf, const wchar_t *wcs, size_t utflen);
 
 /*
  * A critical section used in the implementation of the spawn
- * functions (mingw_spawnv[p]e()) and waitpid(). Intialised in
+ * functions (mingw_spawnv[p]e()) and waitpid(). Initialised in
  * the replacement main() macro below.
  */
 extern CRITICAL_SECTION pinfo_cs;
@@ -578,6 +600,16 @@ int wmain(int argc, const wchar_t **w_argv);
 int main(int argc, const char **argv);
 
 /*
+ * For debugging: if a problem occurs, say, in a Git process that is spawned
+ * from another Git process which in turn is spawned from yet another Git
+ * process, it can be quite daunting to figure out what is going on.
+ *
+ * Call this function to open a new MinTTY (this assumes you are in Git for
+ * Windows' SDK) with a GDB that attaches to the current process right away.
+ */
+void open_in_gdb(void);
+
+/*
  * Used by Pthread API implementation for Windows
  */
 int err_win_to_posix(DWORD winerr);
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/malloc.c.h b/compat/nedmalloc/malloc.c.h
index 9134349590..814845d4b3 100644
--- a/compat/nedmalloc/malloc.c.h
+++ b/compat/nedmalloc/malloc.c.h
@@ -1564,7 +1564,7 @@ static FORCEINLINE void* win32direct_mmap(size_t size) {
   return (ptr != 0)? ptr: MFAIL;
 }
 
-/* This function supports releasing coalesed segments */
+/* This function supports releasing coalesced segments */
 static FORCEINLINE int win32munmap(void* ptr, size_t size) {
   MEMORY_BASIC_INFORMATION minfo;
   char* cptr = (char*)ptr;
@@ -1655,7 +1655,7 @@ static FORCEINLINE int win32munmap(void* ptr, size_t size) {
     #define CALL_MREMAP(addr, osz, nsz, mv)     MFAIL
 #endif /* HAVE_MMAP && HAVE_MREMAP */
 
-/* mstate bit set if continguous morecore disabled or failed */
+/* mstate bit set if contiguous morecore disabled or failed */
 #define USE_NONCONTIGUOUS_BIT (4U)
 
 /* segment bit set in create_mspace_with_base */
@@ -2485,7 +2485,7 @@ typedef struct malloc_segment* msegmentptr;
 
   Trim support
     Fields holding the amount of unused topmost memory that should trigger
-    timming, and a counter to force periodic scanning to release unused
+    timing, and a counter to force periodic scanning to release unused
     non-topmost segments.
 
   Locking
diff --git a/compat/obstack.h b/compat/obstack.h
index ae36ed6a66..f90a46d9b9 100644
--- a/compat/obstack.h
+++ b/compat/obstack.h
@@ -79,7 +79,7 @@ change its address during its lifetime.
 When the chars burst over a chunk boundary, we allocate a larger
 chunk, and then copy the partly formed object from the end of the old
 chunk to the beginning of the new larger chunk.  We then carry on
-accreting characters to the end of the object as we normally would.
+accrediting characters to the end of the object as we normally would.
 
 A special macro is provided to add a single char at a time to a
 growing object.  This allows the use of register variables, which
@@ -135,8 +135,10 @@ extern "C" {
    alignment relative to 0.  */
 
 #define __PTR_ALIGN(B, P, A)						    \
-  __BPTR_ALIGN (sizeof (PTR_INT_TYPE) < sizeof (void *) ? (B) : (char *) 0, \
-		P, A)
+  (sizeof (PTR_INT_TYPE) < sizeof(void *) ?                                 \
+   __BPTR_ALIGN((B), (P), (A)) :                                            \
+   (void *)__BPTR_ALIGN((PTR_INT_TYPE)(void *)0, (PTR_INT_TYPE)(P), (A))            \
+  )
 
 #include <string.h>
 
diff --git a/compat/open.c b/compat/open.c
new file mode 100644
index 0000000000..eb3754a23b
--- /dev/null
+++ b/compat/open.c
@@ -0,0 +1,25 @@
+#include "git-compat-util.h"
+
+#undef open
+int git_open_with_retry(const char *path, int flags, ...)
+{
+	mode_t mode = 0;
+	int ret;
+
+	/*
+	 * Also O_TMPFILE would take a mode, but it isn't defined everywhere.
+	 * And anyway, we don't use it in our code base.
+	 */
+	if (flags & O_CREAT) {
+		va_list ap;
+		va_start(ap, flags);
+		mode = va_arg(ap, int);
+		va_end(ap);
+	}
+
+	do {
+		ret = open(path, flags, mode);
+	} while (ret < 0 && errno == EINTR);
+
+	return ret;
+}
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index 0e95dd493c..afa6d24584 100644
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -139,22 +139,10 @@ win32_compute_revents (HANDLE h, int *p_sought)
   INPUT_RECORD *irbuffer;
   DWORD avail, nbuffer;
   BOOL bRet;
-  IO_STATUS_BLOCK iosb;
-  FILE_PIPE_LOCAL_INFORMATION fpli;
-  static PNtQueryInformationFile NtQueryInformationFile;
-  static BOOL once_only;
 
   switch (GetFileType (h))
     {
     case FILE_TYPE_PIPE:
-      if (!once_only)
-	{
-	  NtQueryInformationFile = (PNtQueryInformationFile)(void (*)(void))
-	    GetProcAddress (GetModuleHandleW (L"ntdll.dll"),
-			    "NtQueryInformationFile");
-	  once_only = TRUE;
-	}
-
       happened = 0;
       if (PeekNamedPipe (h, NULL, 0, NULL, &avail, NULL) != 0)
 	{
@@ -166,22 +154,9 @@ win32_compute_revents (HANDLE h, int *p_sought)
 
       else
 	{
-	  /* It was the write-end of the pipe.  Check if it is writable.
-	     If NtQueryInformationFile fails, optimistically assume the pipe is
-	     writable.  This could happen on Win9x, where NtQueryInformationFile
-	     is not available, or if we inherit a pipe that doesn't permit
-	     FILE_READ_ATTRIBUTES access on the write end (I think this should
-	     not happen since WinXP SP2; WINE seems fine too).  Otherwise,
-	     ensure that enough space is available for atomic writes.  */
-	  memset (&iosb, 0, sizeof (iosb));
-	  memset (&fpli, 0, sizeof (fpli));
-
-	  if (!NtQueryInformationFile
-	      || NtQueryInformationFile (h, &iosb, &fpli, sizeof (fpli),
-					 FilePipeLocalInformation)
-	      || fpli.WriteQuotaAvailable >= PIPE_BUF
-	      || (fpli.OutboundQuota < PIPE_BUF &&
-		  fpli.WriteQuotaAvailable == fpli.OutboundQuota))
+	  /* It was the write-end of the pipe. Unfortunately there is no
+	     reliable way of knowing if it can be written without blocking.
+	     Just say that it's all good. */
 	    happened |= *p_sought & (POLLOUT | POLLWRNORM | POLLWRBAND);
 	}
       return happened;
diff --git a/compat/precompose_utf8.c b/compat/precompose_utf8.c
index 136250fbf6..cce1d57a46 100644
--- a/compat/precompose_utf8.c
+++ b/compat/precompose_utf8.c
@@ -60,32 +60,45 @@ void probe_utf8_pathname_composition(void)
 	strbuf_release(&path);
 }
 
-
-void precompose_argv(int argc, const char **argv)
+const char *precompose_string_if_needed(const char *in)
 {
-	int i = 0;
-	const char *oldarg;
-	char *newarg;
-	iconv_t ic_precompose;
+	size_t inlen;
+	size_t outlen;
+	if (!in)
+		return NULL;
+	if (has_non_ascii(in, (size_t)-1, &inlen)) {
+		iconv_t ic_prec;
+		char *out;
+		if (precomposed_unicode < 0)
+			git_config_get_bool("core.precomposeunicode", &precomposed_unicode);
+		if (precomposed_unicode != 1)
+			return in;
+		ic_prec = iconv_open(repo_encoding, path_encoding);
+		if (ic_prec == (iconv_t) -1)
+			return in;
+
+		out = reencode_string_iconv(in, inlen, ic_prec, 0, &outlen);
+		if (out) {
+			if (outlen == inlen && !memcmp(in, out, outlen))
+				free(out); /* no need to return indentical */
+			else
+				in = out;
+		}
+		iconv_close(ic_prec);
 
-	if (precomposed_unicode != 1)
-		return;
+	}
+	return in;
+}
 
-	ic_precompose = iconv_open(repo_encoding, path_encoding);
-	if (ic_precompose == (iconv_t) -1)
-		return;
+const char *precompose_argv_prefix(int argc, const char **argv, const char *prefix)
+{
+	int i = 0;
 
 	while (i < argc) {
-		size_t namelen;
-		oldarg = argv[i];
-		if (has_non_ascii(oldarg, (size_t)-1, &namelen)) {
-			newarg = reencode_string_iconv(oldarg, namelen, ic_precompose, 0, NULL);
-			if (newarg)
-				argv[i] = newarg;
-		}
+		argv[i] = precompose_string_if_needed(argv[i]);
 		i++;
 	}
-	iconv_close(ic_precompose);
+	return precompose_string_if_needed(prefix);
 }
 
 
diff --git a/compat/precompose_utf8.h b/compat/precompose_utf8.h
index 6f843d3e1a..fea06cf28a 100644
--- a/compat/precompose_utf8.h
+++ b/compat/precompose_utf8.h
@@ -28,7 +28,8 @@ typedef struct {
 	struct dirent_prec_psx *dirent_nfc;
 } PREC_DIR;
 
-void precompose_argv(int argc, const char **argv);
+const char *precompose_argv_prefix(int argc, const char **argv, const char *prefix);
+const char *precompose_string_if_needed(const char *in);
 void probe_utf8_pathname_composition(void);
 
 PREC_DIR *precompose_utf8_opendir(const char *dirname);
diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
index c0d838834a..d1bc09e49b 100644
--- a/compat/regex/regcomp.c
+++ b/compat/regex/regcomp.c
@@ -3462,7 +3462,7 @@ build_equiv_class (bitset_t sbcset, const unsigned char *name)
 	/* This isn't a valid character.  */
 	return REG_ECOLLATE;
 
-      /* Build single byte matcing table for this equivalence class.  */
+      /* Build single byte matching table for this equivalence class.  */
       char_buf[1] = (unsigned char) '\0';
       len = weights[idx1 & 0xffffff];
       for (ch = 0; ch < SBC_MAX; ++ch)
diff --git a/compat/regex/regex.c b/compat/regex/regex.c
index f3e03a9eab..e6f4a5d177 100644
--- a/compat/regex/regex.c
+++ b/compat/regex/regex.c
@@ -60,6 +60,7 @@
    #undefs RE_DUP_MAX and sets it to the right value.  */
 #include <limits.h>
 #include <stdint.h>
+#include <stdlib.h>
 
 #ifdef GAWK
 #undef alloca
diff --git a/compat/regex/regex.h b/compat/regex/regex.h
index 4d81358a83..2d3412860d 100644
--- a/compat/regex/regex.h
+++ b/compat/regex/regex.h
@@ -41,6 +41,11 @@
 extern "C" {
 #endif
 
+#define regcomp git_regcomp
+#define regexec git_regexec
+#define regerror git_regerror
+#define regfree git_regfree
+
 /* The following two types have to be signed and unsigned integer type
    wide enough to hold a value of a pointer.  For most ANSI compilers
    ptrdiff_t and size_t should be likely OK.  Still size of these two
@@ -322,7 +327,7 @@ typedef enum
   /* POSIX regcomp return error codes.  (In the order listed in the
      standard.)  */
   REG_BADPAT,		/* Invalid pattern.  */
-  REG_ECOLLATE,		/* Inalid collating element.  */
+  REG_ECOLLATE,		/* Invalid collating element.  */
   REG_ECTYPE,		/* Invalid character class name.  */
   REG_EESCAPE,		/* Trailing backslash.  */
   REG_ESUBREG,		/* Invalid back reference.  */
diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c
index 59bf151336..ec51cf3446 100644
--- a/compat/regex/regex_internal.c
+++ b/compat/regex/regex_internal.c
@@ -1616,7 +1616,7 @@ free_state (re_dfastate_t *state)
   re_free (state);
 }
 
-/* Create the new state which is independ of contexts.
+/* Create the new state which is independent of contexts.
    Return the new state if succeeded, otherwise return NULL.  */
 
 static re_dfastate_t *
diff --git a/compat/regex/regex_internal.h b/compat/regex/regex_internal.h
index 3ee8aae59d..0bad8b841e 100644
--- a/compat/regex/regex_internal.h
+++ b/compat/regex/regex_internal.h
@@ -23,7 +23,6 @@
 #include <assert.h>
 #include <ctype.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #if defined HAVE_LANGINFO_H || defined HAVE_LANGINFO_CODESET || defined _LIBC
diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c
index 1b5d89fd5e..49358ae475 100644
--- a/compat/regex/regexec.c
+++ b/compat/regex/regexec.c
@@ -2420,7 +2420,7 @@ find_recover_state (reg_errcode_t *err, re_match_context_t *mctx)
 /* From the node set CUR_NODES, pick up the nodes whose types are
    OP_OPEN_SUBEXP and which have corresponding back references in the regular
    expression. And register them to use them later for evaluating the
-   correspoding back references.  */
+   corresponding back references.  */
 
 static reg_errcode_t
 internal_function
@@ -3347,7 +3347,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
   dests_node = dests_alloc->dests_node;
   dests_ch = dests_alloc->dests_ch;
 
-  /* Initialize transiton table.  */
+  /* Initialize transition table.  */
   state->word_trtable = state->trtable = NULL;
 
   /* At first, group all nodes belonging to `state' into several
diff --git a/compat/simple-ipc/ipc-shared.c b/compat/simple-ipc/ipc-shared.c
new file mode 100644
index 0000000000..1b9d359ab6
--- /dev/null
+++ b/compat/simple-ipc/ipc-shared.c
@@ -0,0 +1,32 @@
+#include "cache.h"
+#include "simple-ipc.h"
+#include "strbuf.h"
+#include "pkt-line.h"
+#include "thread-utils.h"
+
+#ifndef SUPPORTS_SIMPLE_IPC
+/*
+ * This source file should only be compiled when Simple IPC is supported.
+ * See the top-level Makefile.
+ */
+#error SUPPORTS_SIMPLE_IPC not defined
+#endif
+
+int ipc_server_run(const char *path, const struct ipc_server_opts *opts,
+		   ipc_server_application_cb *application_cb,
+		   void *application_data)
+{
+	struct ipc_server_data *server_data = NULL;
+	int ret;
+
+	ret = ipc_server_run_async(&server_data, path, opts,
+				   application_cb, application_data);
+	if (ret)
+		return ret;
+
+	ret = ipc_server_await(server_data);
+
+	ipc_server_free(server_data);
+
+	return ret;
+}
diff --git a/compat/simple-ipc/ipc-unix-socket.c b/compat/simple-ipc/ipc-unix-socket.c
new file mode 100644
index 0000000000..1927e6ef4b
--- /dev/null
+++ b/compat/simple-ipc/ipc-unix-socket.c
@@ -0,0 +1,1003 @@
+#include "cache.h"
+#include "simple-ipc.h"
+#include "strbuf.h"
+#include "pkt-line.h"
+#include "thread-utils.h"
+#include "unix-socket.h"
+#include "unix-stream-server.h"
+
+#ifndef SUPPORTS_SIMPLE_IPC
+/*
+ * This source file should only be compiled when Simple IPC is supported.
+ * See the top-level Makefile.
+ */
+#error SUPPORTS_SIMPLE_IPC not defined
+#endif
+
+enum ipc_active_state ipc_get_active_state(const char *path)
+{
+	enum ipc_active_state state = IPC_STATE__OTHER_ERROR;
+	struct ipc_client_connect_options options
+		= IPC_CLIENT_CONNECT_OPTIONS_INIT;
+	struct stat st;
+	struct ipc_client_connection *connection_test = NULL;
+
+	options.wait_if_busy = 0;
+	options.wait_if_not_found = 0;
+
+	if (lstat(path, &st) == -1) {
+		switch (errno) {
+		case ENOENT:
+		case ENOTDIR:
+			return IPC_STATE__NOT_LISTENING;
+		default:
+			return IPC_STATE__INVALID_PATH;
+		}
+	}
+
+	/* also complain if a plain file is in the way */
+	if ((st.st_mode & S_IFMT) != S_IFSOCK)
+		return IPC_STATE__INVALID_PATH;
+
+	/*
+	 * Just because the filesystem has a S_IFSOCK type inode
+	 * at `path`, doesn't mean it that there is a server listening.
+	 * Ping it to be sure.
+	 */
+	state = ipc_client_try_connect(path, &options, &connection_test);
+	ipc_client_close_connection(connection_test);
+
+	return state;
+}
+
+/*
+ * Retry frequency when trying to connect to a server.
+ *
+ * This value should be short enough that we don't seriously delay our
+ * caller, but not fast enough that our spinning puts pressure on the
+ * system.
+ */
+#define WAIT_STEP_MS (50)
+
+/*
+ * Try to connect to the server.  If the server is just starting up or
+ * is very busy, we may not get a connection the first time.
+ */
+static enum ipc_active_state connect_to_server(
+	const char *path,
+	int timeout_ms,
+	const struct ipc_client_connect_options *options,
+	int *pfd)
+{
+	int k;
+
+	*pfd = -1;
+
+	for (k = 0; k < timeout_ms; k += WAIT_STEP_MS) {
+		int fd = unix_stream_connect(path, options->uds_disallow_chdir);
+
+		if (fd != -1) {
+			*pfd = fd;
+			return IPC_STATE__LISTENING;
+		}
+
+		if (errno == ENOENT) {
+			if (!options->wait_if_not_found)
+				return IPC_STATE__PATH_NOT_FOUND;
+
+			goto sleep_and_try_again;
+		}
+
+		if (errno == ETIMEDOUT) {
+			if (!options->wait_if_busy)
+				return IPC_STATE__NOT_LISTENING;
+
+			goto sleep_and_try_again;
+		}
+
+		if (errno == ECONNREFUSED) {
+			if (!options->wait_if_busy)
+				return IPC_STATE__NOT_LISTENING;
+
+			goto sleep_and_try_again;
+		}
+
+		return IPC_STATE__OTHER_ERROR;
+
+	sleep_and_try_again:
+		sleep_millisec(WAIT_STEP_MS);
+	}
+
+	return IPC_STATE__NOT_LISTENING;
+}
+
+/*
+ * The total amount of time that we are willing to wait when trying to
+ * connect to a server.
+ *
+ * When the server is first started, it might take a little while for
+ * it to become ready to service requests.  Likewise, the server may
+ * be very (temporarily) busy and not respond to our connections.
+ *
+ * We should gracefully and silently handle those conditions and try
+ * again for a reasonable time period.
+ *
+ * The value chosen here should be long enough for the server
+ * to reliably heal from the above conditions.
+ */
+#define MY_CONNECTION_TIMEOUT_MS (1000)
+
+enum ipc_active_state ipc_client_try_connect(
+	const char *path,
+	const struct ipc_client_connect_options *options,
+	struct ipc_client_connection **p_connection)
+{
+	enum ipc_active_state state = IPC_STATE__OTHER_ERROR;
+	int fd = -1;
+
+	*p_connection = NULL;
+
+	trace2_region_enter("ipc-client", "try-connect", NULL);
+	trace2_data_string("ipc-client", NULL, "try-connect/path", path);
+
+	state = connect_to_server(path, MY_CONNECTION_TIMEOUT_MS,
+				  options, &fd);
+
+	trace2_data_intmax("ipc-client", NULL, "try-connect/state",
+			   (intmax_t)state);
+	trace2_region_leave("ipc-client", "try-connect", NULL);
+
+	if (state == IPC_STATE__LISTENING) {
+		(*p_connection) = xcalloc(1, sizeof(struct ipc_client_connection));
+		(*p_connection)->fd = fd;
+	}
+
+	return state;
+}
+
+void ipc_client_close_connection(struct ipc_client_connection *connection)
+{
+	if (!connection)
+		return;
+
+	if (connection->fd != -1)
+		close(connection->fd);
+
+	free(connection);
+}
+
+int ipc_client_send_command_to_connection(
+	struct ipc_client_connection *connection,
+	const char *message, struct strbuf *answer)
+{
+	int ret = 0;
+
+	strbuf_setlen(answer, 0);
+
+	trace2_region_enter("ipc-client", "send-command", NULL);
+
+	if (write_packetized_from_buf_no_flush(message, strlen(message),
+					       connection->fd) < 0 ||
+	    packet_flush_gently(connection->fd) < 0) {
+		ret = error(_("could not send IPC command"));
+		goto done;
+	}
+
+	if (read_packetized_to_strbuf(
+		    connection->fd, answer,
+		    PACKET_READ_GENTLE_ON_EOF | PACKET_READ_GENTLE_ON_READ_ERROR) < 0) {
+		ret = error(_("could not read IPC response"));
+		goto done;
+	}
+
+done:
+	trace2_region_leave("ipc-client", "send-command", NULL);
+	return ret;
+}
+
+int ipc_client_send_command(const char *path,
+			    const struct ipc_client_connect_options *options,
+			    const char *message, struct strbuf *answer)
+{
+	int ret = -1;
+	enum ipc_active_state state;
+	struct ipc_client_connection *connection = NULL;
+
+	state = ipc_client_try_connect(path, options, &connection);
+
+	if (state != IPC_STATE__LISTENING)
+		return ret;
+
+	ret = ipc_client_send_command_to_connection(connection, message, answer);
+
+	ipc_client_close_connection(connection);
+
+	return ret;
+}
+
+static int set_socket_blocking_flag(int fd, int make_nonblocking)
+{
+	int flags;
+
+	flags = fcntl(fd, F_GETFL, NULL);
+
+	if (flags < 0)
+		return -1;
+
+	if (make_nonblocking)
+		flags |= O_NONBLOCK;
+	else
+		flags &= ~O_NONBLOCK;
+
+	return fcntl(fd, F_SETFL, flags);
+}
+
+/*
+ * Magic numbers used to annotate callback instance data.
+ * These are used to help guard against accidentally passing the
+ * wrong instance data across multiple levels of callbacks (which
+ * is easy to do if there are `void*` arguments).
+ */
+enum magic {
+	MAGIC_SERVER_REPLY_DATA,
+	MAGIC_WORKER_THREAD_DATA,
+	MAGIC_ACCEPT_THREAD_DATA,
+	MAGIC_SERVER_DATA,
+};
+
+struct ipc_server_reply_data {
+	enum magic magic;
+	int fd;
+	struct ipc_worker_thread_data *worker_thread_data;
+};
+
+struct ipc_worker_thread_data {
+	enum magic magic;
+	struct ipc_worker_thread_data *next_thread;
+	struct ipc_server_data *server_data;
+	pthread_t pthread_id;
+};
+
+struct ipc_accept_thread_data {
+	enum magic magic;
+	struct ipc_server_data *server_data;
+
+	struct unix_ss_socket *server_socket;
+
+	int fd_send_shutdown;
+	int fd_wait_shutdown;
+	pthread_t pthread_id;
+};
+
+/*
+ * With unix-sockets, the conceptual "ipc-server" is implemented as a single
+ * controller "accept-thread" thread and a pool of "worker-thread" threads.
+ * The former does the usual `accept()` loop and dispatches connections
+ * to an idle worker thread.  The worker threads wait in an idle loop for
+ * a new connection, communicate with the client and relay data to/from
+ * the `application_cb` and then wait for another connection from the
+ * server thread.  This avoids the overhead of constantly creating and
+ * destroying threads.
+ */
+struct ipc_server_data {
+	enum magic magic;
+	ipc_server_application_cb *application_cb;
+	void *application_data;
+	struct strbuf buf_path;
+
+	struct ipc_accept_thread_data *accept_thread;
+	struct ipc_worker_thread_data *worker_thread_list;
+
+	pthread_mutex_t work_available_mutex;
+	pthread_cond_t work_available_cond;
+
+	/*
+	 * Accepted but not yet processed client connections are kept
+	 * in a circular buffer FIFO.  The queue is empty when the
+	 * positions are equal.
+	 */
+	int *fifo_fds;
+	int queue_size;
+	int back_pos;
+	int front_pos;
+
+	int shutdown_requested;
+	int is_stopped;
+};
+
+/*
+ * Remove and return the oldest queued connection.
+ *
+ * Returns -1 if empty.
+ */
+static int fifo_dequeue(struct ipc_server_data *server_data)
+{
+	/* ASSERT holding mutex */
+
+	int fd;
+
+	if (server_data->back_pos == server_data->front_pos)
+		return -1;
+
+	fd = server_data->fifo_fds[server_data->front_pos];
+	server_data->fifo_fds[server_data->front_pos] = -1;
+
+	server_data->front_pos++;
+	if (server_data->front_pos == server_data->queue_size)
+		server_data->front_pos = 0;
+
+	return fd;
+}
+
+/*
+ * Push a new fd onto the back of the queue.
+ *
+ * Drop it and return -1 if queue is already full.
+ */
+static int fifo_enqueue(struct ipc_server_data *server_data, int fd)
+{
+	/* ASSERT holding mutex */
+
+	int next_back_pos;
+
+	next_back_pos = server_data->back_pos + 1;
+	if (next_back_pos == server_data->queue_size)
+		next_back_pos = 0;
+
+	if (next_back_pos == server_data->front_pos) {
+		/* Queue is full. Just drop it. */
+		close(fd);
+		return -1;
+	}
+
+	server_data->fifo_fds[server_data->back_pos] = fd;
+	server_data->back_pos = next_back_pos;
+
+	return fd;
+}
+
+/*
+ * Wait for a connection to be queued to the FIFO and return it.
+ *
+ * Returns -1 if someone has already requested a shutdown.
+ */
+static int worker_thread__wait_for_connection(
+	struct ipc_worker_thread_data *worker_thread_data)
+{
+	/* ASSERT NOT holding mutex */
+
+	struct ipc_server_data *server_data = worker_thread_data->server_data;
+	int fd = -1;
+
+	pthread_mutex_lock(&server_data->work_available_mutex);
+	for (;;) {
+		if (server_data->shutdown_requested)
+			break;
+
+		fd = fifo_dequeue(server_data);
+		if (fd >= 0)
+			break;
+
+		pthread_cond_wait(&server_data->work_available_cond,
+				  &server_data->work_available_mutex);
+	}
+	pthread_mutex_unlock(&server_data->work_available_mutex);
+
+	return fd;
+}
+
+/*
+ * Forward declare our reply callback function so that any compiler
+ * errors are reported when we actually define the function (in addition
+ * to any errors reported when we try to pass this callback function as
+ * a parameter in a function call).  The former are easier to understand.
+ */
+static ipc_server_reply_cb do_io_reply_callback;
+
+/*
+ * Relay application's response message to the client process.
+ * (We do not flush at this point because we allow the caller
+ * to chunk data to the client thru us.)
+ */
+static int do_io_reply_callback(struct ipc_server_reply_data *reply_data,
+		       const char *response, size_t response_len)
+{
+	if (reply_data->magic != MAGIC_SERVER_REPLY_DATA)
+		BUG("reply_cb called with wrong instance data");
+
+	return write_packetized_from_buf_no_flush(response, response_len,
+						  reply_data->fd);
+}
+
+/* A randomly chosen value. */
+#define MY_WAIT_POLL_TIMEOUT_MS (10)
+
+/*
+ * If the client hangs up without sending any data on the wire, just
+ * quietly close the socket and ignore this client.
+ *
+ * This worker thread is committed to reading the IPC request data
+ * from the client at the other end of this fd.  Wait here for the
+ * client to actually put something on the wire -- because if the
+ * client just does a ping (connect and hangup without sending any
+ * data), our use of the pkt-line read routines will spew an error
+ * message.
+ *
+ * Return -1 if the client hung up.
+ * Return 0 if data (possibly incomplete) is ready.
+ */
+static int worker_thread__wait_for_io_start(
+	struct ipc_worker_thread_data *worker_thread_data,
+	int fd)
+{
+	struct ipc_server_data *server_data = worker_thread_data->server_data;
+	struct pollfd pollfd[1];
+	int result;
+
+	for (;;) {
+		pollfd[0].fd = fd;
+		pollfd[0].events = POLLIN;
+
+		result = poll(pollfd, 1, MY_WAIT_POLL_TIMEOUT_MS);
+		if (result < 0) {
+			if (errno == EINTR)
+				continue;
+			goto cleanup;
+		}
+
+		if (result == 0) {
+			/* a timeout */
+
+			int in_shutdown;
+
+			pthread_mutex_lock(&server_data->work_available_mutex);
+			in_shutdown = server_data->shutdown_requested;
+			pthread_mutex_unlock(&server_data->work_available_mutex);
+
+			/*
+			 * If a shutdown is already in progress and this
+			 * client has not started talking yet, just drop it.
+			 */
+			if (in_shutdown)
+				goto cleanup;
+			continue;
+		}
+
+		if (pollfd[0].revents & POLLHUP)
+			goto cleanup;
+
+		if (pollfd[0].revents & POLLIN)
+			return 0;
+
+		goto cleanup;
+	}
+
+cleanup:
+	close(fd);
+	return -1;
+}
+
+/*
+ * Receive the request/command from the client and pass it to the
+ * registered request-callback.  The request-callback will compose
+ * a response and call our reply-callback to send it to the client.
+ */
+static int worker_thread__do_io(
+	struct ipc_worker_thread_data *worker_thread_data,
+	int fd)
+{
+	/* ASSERT NOT holding lock */
+
+	struct strbuf buf = STRBUF_INIT;
+	struct ipc_server_reply_data reply_data;
+	int ret = 0;
+
+	reply_data.magic = MAGIC_SERVER_REPLY_DATA;
+	reply_data.worker_thread_data = worker_thread_data;
+
+	reply_data.fd = fd;
+
+	ret = read_packetized_to_strbuf(
+		reply_data.fd, &buf,
+		PACKET_READ_GENTLE_ON_EOF | PACKET_READ_GENTLE_ON_READ_ERROR);
+	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);
+
+		packet_flush_gently(reply_data.fd);
+	}
+	else {
+		/*
+		 * The client probably disconnected/shutdown before it
+		 * could send a well-formed message.  Ignore it.
+		 */
+	}
+
+	strbuf_release(&buf);
+	close(reply_data.fd);
+
+	return ret;
+}
+
+/*
+ * Block SIGPIPE on the current thread (so that we get EPIPE from
+ * write() rather than an actual signal).
+ *
+ * Note that using sigchain_push() and _pop() to control SIGPIPE
+ * around our IO calls is not thread safe:
+ * [] It uses a global stack of handler frames.
+ * [] It uses ALLOC_GROW() to resize it.
+ * [] Finally, according to the `signal(2)` man-page:
+ *    "The effects of `signal()` in a multithreaded process are unspecified."
+ */
+static void thread_block_sigpipe(sigset_t *old_set)
+{
+	sigset_t new_set;
+
+	sigemptyset(&new_set);
+	sigaddset(&new_set, SIGPIPE);
+
+	sigemptyset(old_set);
+	pthread_sigmask(SIG_BLOCK, &new_set, old_set);
+}
+
+/*
+ * Thread proc for an IPC worker thread.  It handles a series of
+ * connections from clients.  It pulls the next fd from the queue
+ * processes it, and then waits for the next client.
+ *
+ * Block SIGPIPE in this worker thread for the life of the thread.
+ * This avoids stray (and sometimes delayed) SIGPIPE signals caused
+ * by client errors and/or when we are under extremely heavy IO load.
+ *
+ * This means that the application callback will have SIGPIPE blocked.
+ * The callback should not change it.
+ */
+static void *worker_thread_proc(void *_worker_thread_data)
+{
+	struct ipc_worker_thread_data *worker_thread_data = _worker_thread_data;
+	struct ipc_server_data *server_data = worker_thread_data->server_data;
+	sigset_t old_set;
+	int fd, io;
+	int ret;
+
+	trace2_thread_start("ipc-worker");
+
+	thread_block_sigpipe(&old_set);
+
+	for (;;) {
+		fd = worker_thread__wait_for_connection(worker_thread_data);
+		if (fd == -1)
+			break; /* in shutdown */
+
+		io = worker_thread__wait_for_io_start(worker_thread_data, fd);
+		if (io == -1)
+			continue; /* client hung up without sending anything */
+
+		ret = worker_thread__do_io(worker_thread_data, fd);
+
+		if (ret == SIMPLE_IPC_QUIT) {
+			trace2_data_string("ipc-worker", NULL, "queue_stop_async",
+					   "application_quit");
+			/*
+			 * The application layer is telling the ipc-server
+			 * layer to shutdown.
+			 *
+			 * We DO NOT have a response to send to the client.
+			 *
+			 * Queue an async stop (to stop the other threads) and
+			 * allow this worker thread to exit now (no sense waiting
+			 * for the thread-pool shutdown signal).
+			 *
+			 * Other non-idle worker threads are allowed to finish
+			 * responding to their current clients.
+			 */
+			ipc_server_stop_async(server_data);
+			break;
+		}
+	}
+
+	trace2_thread_exit();
+	return NULL;
+}
+
+/* A randomly chosen value. */
+#define MY_ACCEPT_POLL_TIMEOUT_MS (60 * 1000)
+
+/*
+ * Accept a new client connection on our socket.  This uses non-blocking
+ * IO so that we can also wait for shutdown requests on our socket-pair
+ * without actually spinning on a fast timeout.
+ */
+static int accept_thread__wait_for_connection(
+	struct ipc_accept_thread_data *accept_thread_data)
+{
+	struct pollfd pollfd[2];
+	int result;
+
+	for (;;) {
+		pollfd[0].fd = accept_thread_data->fd_wait_shutdown;
+		pollfd[0].events = POLLIN;
+
+		pollfd[1].fd = accept_thread_data->server_socket->fd_socket;
+		pollfd[1].events = POLLIN;
+
+		result = poll(pollfd, 2, MY_ACCEPT_POLL_TIMEOUT_MS);
+		if (result < 0) {
+			if (errno == EINTR)
+				continue;
+			return result;
+		}
+
+		if (result == 0) {
+			/* a timeout */
+
+			/*
+			 * If someone deletes or force-creates a new unix
+			 * domain socket at our path, all future clients
+			 * will be routed elsewhere and we silently starve.
+			 * If that happens, just queue a shutdown.
+			 */
+			if (unix_ss_was_stolen(
+				    accept_thread_data->server_socket)) {
+				trace2_data_string("ipc-accept", NULL,
+						   "queue_stop_async",
+						   "socket_stolen");
+				ipc_server_stop_async(
+					accept_thread_data->server_data);
+			}
+			continue;
+		}
+
+		if (pollfd[0].revents & POLLIN) {
+			/* shutdown message queued to socketpair */
+			return -1;
+		}
+
+		if (pollfd[1].revents & POLLIN) {
+			/* a connection is available on server_socket */
+
+			int client_fd =
+				accept(accept_thread_data->server_socket->fd_socket,
+				       NULL, NULL);
+			if (client_fd >= 0)
+				return client_fd;
+
+			/*
+			 * An error here is unlikely -- it probably
+			 * indicates that the connecting process has
+			 * already dropped the connection.
+			 */
+			continue;
+		}
+
+		BUG("unandled poll result errno=%d r[0]=%d r[1]=%d",
+		    errno, pollfd[0].revents, pollfd[1].revents);
+	}
+}
+
+/*
+ * Thread proc for the IPC server "accept thread".  This waits for
+ * an incoming socket connection, appends it to the queue of available
+ * connections, and notifies a worker thread to process it.
+ *
+ * Block SIGPIPE in this thread for the life of the thread.  This
+ * avoids any stray SIGPIPE signals when closing pipe fds under
+ * extremely heavy loads (such as when the fifo queue is full and we
+ * drop incomming connections).
+ */
+static void *accept_thread_proc(void *_accept_thread_data)
+{
+	struct ipc_accept_thread_data *accept_thread_data = _accept_thread_data;
+	struct ipc_server_data *server_data = accept_thread_data->server_data;
+	sigset_t old_set;
+
+	trace2_thread_start("ipc-accept");
+
+	thread_block_sigpipe(&old_set);
+
+	for (;;) {
+		int client_fd = accept_thread__wait_for_connection(
+			accept_thread_data);
+
+		pthread_mutex_lock(&server_data->work_available_mutex);
+		if (server_data->shutdown_requested) {
+			pthread_mutex_unlock(&server_data->work_available_mutex);
+			if (client_fd >= 0)
+				close(client_fd);
+			break;
+		}
+
+		if (client_fd < 0) {
+			/* ignore transient accept() errors */
+		}
+		else {
+			fifo_enqueue(server_data, client_fd);
+			pthread_cond_broadcast(&server_data->work_available_cond);
+		}
+		pthread_mutex_unlock(&server_data->work_available_mutex);
+	}
+
+	trace2_thread_exit();
+	return NULL;
+}
+
+/*
+ * We can't predict the connection arrival rate relative to the worker
+ * processing rate, therefore we allow the "accept-thread" to queue up
+ * a generous number of connections, since we'd rather have the client
+ * not unnecessarily timeout if we can avoid it.  (The assumption is
+ * that this will be used for FSMonitor and a few second wait on a
+ * connection is better than having the client timeout and do the full
+ * computation itself.)
+ *
+ * The FIFO queue size is set to a multiple of the worker pool size.
+ * This value chosen at random.
+ */
+#define FIFO_SCALE (100)
+
+/*
+ * The backlog value for `listen(2)`.  This doesn't need to huge,
+ * rather just large enough for our "accept-thread" to wake up and
+ * queue incoming connections onto the FIFO without the kernel
+ * dropping any.
+ *
+ * This value chosen at random.
+ */
+#define LISTEN_BACKLOG (50)
+
+static int create_listener_socket(
+	const char *path,
+	const struct ipc_server_opts *ipc_opts,
+	struct unix_ss_socket **new_server_socket)
+{
+	struct unix_ss_socket *server_socket = NULL;
+	struct unix_stream_listen_opts uslg_opts = UNIX_STREAM_LISTEN_OPTS_INIT;
+	int ret;
+
+	uslg_opts.listen_backlog_size = LISTEN_BACKLOG;
+	uslg_opts.disallow_chdir = ipc_opts->uds_disallow_chdir;
+
+	ret = unix_ss_create(path, &uslg_opts, -1, &server_socket);
+	if (ret)
+		return ret;
+
+	if (set_socket_blocking_flag(server_socket->fd_socket, 1)) {
+		int saved_errno = errno;
+		unix_ss_free(server_socket);
+		errno = saved_errno;
+		return -1;
+	}
+
+	*new_server_socket = server_socket;
+
+	trace2_data_string("ipc-server", NULL, "listen-with-lock", path);
+	return 0;
+}
+
+static int setup_listener_socket(
+	const char *path,
+	const struct ipc_server_opts *ipc_opts,
+	struct unix_ss_socket **new_server_socket)
+{
+	int ret, saved_errno;
+
+	trace2_region_enter("ipc-server", "create-listener_socket", NULL);
+
+	ret = create_listener_socket(path, ipc_opts, new_server_socket);
+
+	saved_errno = errno;
+	trace2_region_leave("ipc-server", "create-listener_socket", NULL);
+	errno = saved_errno;
+
+	return ret;
+}
+
+/*
+ * Start IPC server in a pool of background threads.
+ */
+int ipc_server_run_async(struct ipc_server_data **returned_server_data,
+			 const char *path, const struct ipc_server_opts *opts,
+			 ipc_server_application_cb *application_cb,
+			 void *application_data)
+{
+	struct unix_ss_socket *server_socket = NULL;
+	struct ipc_server_data *server_data;
+	int sv[2];
+	int k;
+	int ret;
+	int nr_threads = opts->nr_threads;
+
+	*returned_server_data = NULL;
+
+	/*
+	 * Create a socketpair and set sv[1] to non-blocking.  This
+	 * will used to send a shutdown message to the accept-thread
+	 * and allows the accept-thread to wait on EITHER a client
+	 * connection or a shutdown request without spinning.
+	 */
+	if (socketpair(AF_UNIX, SOCK_STREAM, 0, sv) < 0)
+		return -1;
+
+	if (set_socket_blocking_flag(sv[1], 1)) {
+		int saved_errno = errno;
+		close(sv[0]);
+		close(sv[1]);
+		errno = saved_errno;
+		return -1;
+	}
+
+	ret = setup_listener_socket(path, opts, &server_socket);
+	if (ret) {
+		int saved_errno = errno;
+		close(sv[0]);
+		close(sv[1]);
+		errno = saved_errno;
+		return ret;
+	}
+
+	server_data = xcalloc(1, sizeof(*server_data));
+	server_data->magic = MAGIC_SERVER_DATA;
+	server_data->application_cb = application_cb;
+	server_data->application_data = application_data;
+	strbuf_init(&server_data->buf_path, 0);
+	strbuf_addstr(&server_data->buf_path, path);
+
+	if (nr_threads < 1)
+		nr_threads = 1;
+
+	pthread_mutex_init(&server_data->work_available_mutex, NULL);
+	pthread_cond_init(&server_data->work_available_cond, NULL);
+
+	server_data->queue_size = nr_threads * FIFO_SCALE;
+	CALLOC_ARRAY(server_data->fifo_fds, server_data->queue_size);
+
+	server_data->accept_thread =
+		xcalloc(1, sizeof(*server_data->accept_thread));
+	server_data->accept_thread->magic = MAGIC_ACCEPT_THREAD_DATA;
+	server_data->accept_thread->server_data = server_data;
+	server_data->accept_thread->server_socket = server_socket;
+	server_data->accept_thread->fd_send_shutdown = sv[0];
+	server_data->accept_thread->fd_wait_shutdown = sv[1];
+
+	if (pthread_create(&server_data->accept_thread->pthread_id, NULL,
+			   accept_thread_proc, server_data->accept_thread))
+		die_errno(_("could not start accept_thread '%s'"), path);
+
+	for (k = 0; k < nr_threads; k++) {
+		struct ipc_worker_thread_data *wtd;
+
+		wtd = xcalloc(1, sizeof(*wtd));
+		wtd->magic = MAGIC_WORKER_THREAD_DATA;
+		wtd->server_data = server_data;
+
+		if (pthread_create(&wtd->pthread_id, NULL, worker_thread_proc,
+				   wtd)) {
+			if (k == 0)
+				die(_("could not start worker[0] for '%s'"),
+				    path);
+			/*
+			 * Limp along with the thread pool that we have.
+			 */
+			break;
+		}
+
+		wtd->next_thread = server_data->worker_thread_list;
+		server_data->worker_thread_list = wtd;
+	}
+
+	*returned_server_data = server_data;
+	return 0;
+}
+
+/*
+ * Gently tell the IPC server treads to shutdown.
+ * Can be run on any thread.
+ */
+int ipc_server_stop_async(struct ipc_server_data *server_data)
+{
+	/* ASSERT NOT holding mutex */
+
+	int fd;
+
+	if (!server_data)
+		return 0;
+
+	trace2_region_enter("ipc-server", "server-stop-async", NULL);
+
+	pthread_mutex_lock(&server_data->work_available_mutex);
+
+	server_data->shutdown_requested = 1;
+
+	/*
+	 * Write a byte to the shutdown socket pair to wake up the
+	 * accept-thread.
+	 */
+	if (write(server_data->accept_thread->fd_send_shutdown, "Q", 1) < 0)
+		error_errno("could not write to fd_send_shutdown");
+
+	/*
+	 * Drain the queue of existing connections.
+	 */
+	while ((fd = fifo_dequeue(server_data)) != -1)
+		close(fd);
+
+	/*
+	 * Gently tell worker threads to stop processing new connections
+	 * and exit.  (This does not abort in-process conversations.)
+	 */
+	pthread_cond_broadcast(&server_data->work_available_cond);
+
+	pthread_mutex_unlock(&server_data->work_available_mutex);
+
+	trace2_region_leave("ipc-server", "server-stop-async", NULL);
+
+	return 0;
+}
+
+/*
+ * Wait for all IPC server threads to stop.
+ */
+int ipc_server_await(struct ipc_server_data *server_data)
+{
+	pthread_join(server_data->accept_thread->pthread_id, NULL);
+
+	if (!server_data->shutdown_requested)
+		BUG("ipc-server: accept-thread stopped for '%s'",
+		    server_data->buf_path.buf);
+
+	while (server_data->worker_thread_list) {
+		struct ipc_worker_thread_data *wtd =
+			server_data->worker_thread_list;
+
+		pthread_join(wtd->pthread_id, NULL);
+
+		server_data->worker_thread_list = wtd->next_thread;
+		free(wtd);
+	}
+
+	server_data->is_stopped = 1;
+
+	return 0;
+}
+
+void ipc_server_free(struct ipc_server_data *server_data)
+{
+	struct ipc_accept_thread_data * accept_thread_data;
+
+	if (!server_data)
+		return;
+
+	if (!server_data->is_stopped)
+		BUG("cannot free ipc-server while running for '%s'",
+		    server_data->buf_path.buf);
+
+	accept_thread_data = server_data->accept_thread;
+	if (accept_thread_data) {
+		unix_ss_free(accept_thread_data->server_socket);
+
+		if (accept_thread_data->fd_send_shutdown != -1)
+			close(accept_thread_data->fd_send_shutdown);
+		if (accept_thread_data->fd_wait_shutdown != -1)
+			close(accept_thread_data->fd_wait_shutdown);
+
+		free(server_data->accept_thread);
+	}
+
+	while (server_data->worker_thread_list) {
+		struct ipc_worker_thread_data *wtd =
+			server_data->worker_thread_list;
+
+		server_data->worker_thread_list = wtd->next_thread;
+		free(wtd);
+	}
+
+	pthread_cond_destroy(&server_data->work_available_cond);
+	pthread_mutex_destroy(&server_data->work_available_mutex);
+
+	strbuf_release(&server_data->buf_path);
+
+	free(server_data->fifo_fds);
+	free(server_data);
+}
diff --git a/compat/simple-ipc/ipc-win32.c b/compat/simple-ipc/ipc-win32.c
new file mode 100644
index 0000000000..8dc7bda087
--- /dev/null
+++ b/compat/simple-ipc/ipc-win32.c
@@ -0,0 +1,755 @@
+#include "cache.h"
+#include "simple-ipc.h"
+#include "strbuf.h"
+#include "pkt-line.h"
+#include "thread-utils.h"
+
+#ifndef SUPPORTS_SIMPLE_IPC
+/*
+ * This source file should only be compiled when Simple IPC is supported.
+ * See the top-level Makefile.
+ */
+#error SUPPORTS_SIMPLE_IPC not defined
+#endif
+
+static int initialize_pipe_name(const char *path, wchar_t *wpath, size_t alloc)
+{
+	int off = 0;
+	struct strbuf realpath = STRBUF_INIT;
+
+	if (!strbuf_realpath(&realpath, path, 0))
+		return -1;
+
+	off = swprintf(wpath, alloc, L"\\\\.\\pipe\\");
+	if (xutftowcs(wpath + off, realpath.buf, alloc - off) < 0)
+		return -1;
+
+	/* Handle drive prefix */
+	if (wpath[off] && wpath[off + 1] == L':') {
+		wpath[off + 1] = L'_';
+		off += 2;
+	}
+
+	for (; wpath[off]; off++)
+		if (wpath[off] == L'/')
+			wpath[off] = L'\\';
+
+	strbuf_release(&realpath);
+	return 0;
+}
+
+static enum ipc_active_state get_active_state(wchar_t *pipe_path)
+{
+	if (WaitNamedPipeW(pipe_path, NMPWAIT_USE_DEFAULT_WAIT))
+		return IPC_STATE__LISTENING;
+
+	if (GetLastError() == ERROR_SEM_TIMEOUT)
+		return IPC_STATE__NOT_LISTENING;
+
+	if (GetLastError() == ERROR_FILE_NOT_FOUND)
+		return IPC_STATE__PATH_NOT_FOUND;
+
+	return IPC_STATE__OTHER_ERROR;
+}
+
+enum ipc_active_state ipc_get_active_state(const char *path)
+{
+	wchar_t pipe_path[MAX_PATH];
+
+	if (initialize_pipe_name(path, pipe_path, ARRAY_SIZE(pipe_path)) < 0)
+		return IPC_STATE__INVALID_PATH;
+
+	return get_active_state(pipe_path);
+}
+
+#define WAIT_STEP_MS (50)
+
+static enum ipc_active_state connect_to_server(
+	const wchar_t *wpath,
+	DWORD timeout_ms,
+	const struct ipc_client_connect_options *options,
+	int *pfd)
+{
+	DWORD t_start_ms, t_waited_ms;
+	DWORD step_ms;
+	HANDLE hPipe = INVALID_HANDLE_VALUE;
+	DWORD mode = PIPE_READMODE_BYTE;
+	DWORD gle;
+
+	*pfd = -1;
+
+	for (;;) {
+		hPipe = CreateFileW(wpath, GENERIC_READ | GENERIC_WRITE,
+				    0, NULL, OPEN_EXISTING, 0, NULL);
+		if (hPipe != INVALID_HANDLE_VALUE)
+			break;
+
+		gle = GetLastError();
+
+		switch (gle) {
+		case ERROR_FILE_NOT_FOUND:
+			if (!options->wait_if_not_found)
+				return IPC_STATE__PATH_NOT_FOUND;
+			if (!timeout_ms)
+				return IPC_STATE__PATH_NOT_FOUND;
+
+			step_ms = (timeout_ms < WAIT_STEP_MS) ?
+				timeout_ms : WAIT_STEP_MS;
+			sleep_millisec(step_ms);
+
+			timeout_ms -= step_ms;
+			break; /* try again */
+
+		case ERROR_PIPE_BUSY:
+			if (!options->wait_if_busy)
+				return IPC_STATE__NOT_LISTENING;
+			if (!timeout_ms)
+				return IPC_STATE__NOT_LISTENING;
+
+			t_start_ms = (DWORD)(getnanotime() / 1000000);
+
+			if (!WaitNamedPipeW(wpath, timeout_ms)) {
+				if (GetLastError() == ERROR_SEM_TIMEOUT)
+					return IPC_STATE__NOT_LISTENING;
+
+				return IPC_STATE__OTHER_ERROR;
+			}
+
+			/*
+			 * A pipe server instance became available.
+			 * Race other client processes to connect to
+			 * it.
+			 *
+			 * But first decrement our overall timeout so
+			 * that we don't starve if we keep losing the
+			 * race.  But also guard against special
+			 * NPMWAIT_ values (0 and -1).
+			 */
+			t_waited_ms = (DWORD)(getnanotime() / 1000000) - t_start_ms;
+			if (t_waited_ms < timeout_ms)
+				timeout_ms -= t_waited_ms;
+			else
+				timeout_ms = 1;
+			break; /* try again */
+
+		default:
+			return IPC_STATE__OTHER_ERROR;
+		}
+	}
+
+	if (!SetNamedPipeHandleState(hPipe, &mode, NULL, NULL)) {
+		CloseHandle(hPipe);
+		return IPC_STATE__OTHER_ERROR;
+	}
+
+	*pfd = _open_osfhandle((intptr_t)hPipe, O_RDWR|O_BINARY);
+	if (*pfd < 0) {
+		CloseHandle(hPipe);
+		return IPC_STATE__OTHER_ERROR;
+	}
+
+	/* fd now owns hPipe */
+
+	return IPC_STATE__LISTENING;
+}
+
+/*
+ * The default connection timeout for Windows clients.
+ *
+ * This is not currently part of the ipc_ API (nor the config settings)
+ * because of differences between Windows and other platforms.
+ *
+ * This value was chosen at random.
+ */
+#define WINDOWS_CONNECTION_TIMEOUT_MS (30000)
+
+enum ipc_active_state ipc_client_try_connect(
+	const char *path,
+	const struct ipc_client_connect_options *options,
+	struct ipc_client_connection **p_connection)
+{
+	wchar_t wpath[MAX_PATH];
+	enum ipc_active_state state = IPC_STATE__OTHER_ERROR;
+	int fd = -1;
+
+	*p_connection = NULL;
+
+	trace2_region_enter("ipc-client", "try-connect", NULL);
+	trace2_data_string("ipc-client", NULL, "try-connect/path", path);
+
+	if (initialize_pipe_name(path, wpath, ARRAY_SIZE(wpath)) < 0)
+		state = IPC_STATE__INVALID_PATH;
+	else
+		state = connect_to_server(wpath, WINDOWS_CONNECTION_TIMEOUT_MS,
+					  options, &fd);
+
+	trace2_data_intmax("ipc-client", NULL, "try-connect/state",
+			   (intmax_t)state);
+	trace2_region_leave("ipc-client", "try-connect", NULL);
+
+	if (state == IPC_STATE__LISTENING) {
+		(*p_connection) = xcalloc(1, sizeof(struct ipc_client_connection));
+		(*p_connection)->fd = fd;
+	}
+
+	return state;
+}
+
+void ipc_client_close_connection(struct ipc_client_connection *connection)
+{
+	if (!connection)
+		return;
+
+	if (connection->fd != -1)
+		close(connection->fd);
+
+	free(connection);
+}
+
+int ipc_client_send_command_to_connection(
+	struct ipc_client_connection *connection,
+	const char *message, struct strbuf *answer)
+{
+	int ret = 0;
+
+	strbuf_setlen(answer, 0);
+
+	trace2_region_enter("ipc-client", "send-command", NULL);
+
+	if (write_packetized_from_buf_no_flush(message, strlen(message),
+					       connection->fd) < 0 ||
+	    packet_flush_gently(connection->fd) < 0) {
+		ret = error(_("could not send IPC command"));
+		goto done;
+	}
+
+	FlushFileBuffers((HANDLE)_get_osfhandle(connection->fd));
+
+	if (read_packetized_to_strbuf(
+		    connection->fd, answer,
+		    PACKET_READ_GENTLE_ON_EOF | PACKET_READ_GENTLE_ON_READ_ERROR) < 0) {
+		ret = error(_("could not read IPC response"));
+		goto done;
+	}
+
+done:
+	trace2_region_leave("ipc-client", "send-command", NULL);
+	return ret;
+}
+
+int ipc_client_send_command(const char *path,
+			    const struct ipc_client_connect_options *options,
+			    const char *message, struct strbuf *response)
+{
+	int ret = -1;
+	enum ipc_active_state state;
+	struct ipc_client_connection *connection = NULL;
+
+	state = ipc_client_try_connect(path, options, &connection);
+
+	if (state != IPC_STATE__LISTENING)
+		return ret;
+
+	ret = ipc_client_send_command_to_connection(connection, message, response);
+
+	ipc_client_close_connection(connection);
+
+	return ret;
+}
+
+/*
+ * Duplicate the given pipe handle and wrap it in a file descriptor so
+ * that we can use pkt-line on it.
+ */
+static int dup_fd_from_pipe(const HANDLE pipe)
+{
+	HANDLE process = GetCurrentProcess();
+	HANDLE handle;
+	int fd;
+
+	if (!DuplicateHandle(process, pipe, process, &handle, 0, FALSE,
+			     DUPLICATE_SAME_ACCESS)) {
+		errno = err_win_to_posix(GetLastError());
+		return -1;
+	}
+
+	fd = _open_osfhandle((intptr_t)handle, O_RDWR|O_BINARY);
+	if (fd < 0) {
+		errno = err_win_to_posix(GetLastError());
+		CloseHandle(handle);
+		return -1;
+	}
+
+	/*
+	 * `handle` is now owned by `fd` and will be automatically closed
+	 * when the descriptor is closed.
+	 */
+
+	return fd;
+}
+
+/*
+ * Magic numbers used to annotate callback instance data.
+ * These are used to help guard against accidentally passing the
+ * wrong instance data across multiple levels of callbacks (which
+ * is easy to do if there are `void*` arguments).
+ */
+enum magic {
+	MAGIC_SERVER_REPLY_DATA,
+	MAGIC_SERVER_THREAD_DATA,
+	MAGIC_SERVER_DATA,
+};
+
+struct ipc_server_reply_data {
+	enum magic magic;
+	int fd;
+	struct ipc_server_thread_data *server_thread_data;
+};
+
+struct ipc_server_thread_data {
+	enum magic magic;
+	struct ipc_server_thread_data *next_thread;
+	struct ipc_server_data *server_data;
+	pthread_t pthread_id;
+	HANDLE hPipe;
+};
+
+/*
+ * On Windows, the conceptual "ipc-server" is implemented as a pool of
+ * n idential/peer "server-thread" threads.  That is, there is no
+ * hierarchy of threads; and therefore no controller thread managing
+ * the pool.  Each thread has an independent handle to the named pipe,
+ * receives incoming connections, processes the client, and re-uses
+ * the pipe for the next client connection.
+ *
+ * Therefore, the "ipc-server" only needs to maintain a list of the
+ * spawned threads for eventual "join" purposes.
+ *
+ * A single "stop-event" is visible to all of the server threads to
+ * tell them to shutdown (when idle).
+ */
+struct ipc_server_data {
+	enum magic magic;
+	ipc_server_application_cb *application_cb;
+	void *application_data;
+	struct strbuf buf_path;
+	wchar_t wpath[MAX_PATH];
+
+	HANDLE hEventStopRequested;
+	struct ipc_server_thread_data *thread_list;
+	int is_stopped;
+};
+
+enum connect_result {
+	CR_CONNECTED = 0,
+	CR_CONNECT_PENDING,
+	CR_CONNECT_ERROR,
+	CR_WAIT_ERROR,
+	CR_SHUTDOWN,
+};
+
+static enum connect_result queue_overlapped_connect(
+	struct ipc_server_thread_data *server_thread_data,
+	OVERLAPPED *lpo)
+{
+	if (ConnectNamedPipe(server_thread_data->hPipe, lpo))
+		goto failed;
+
+	switch (GetLastError()) {
+	case ERROR_IO_PENDING:
+		return CR_CONNECT_PENDING;
+
+	case ERROR_PIPE_CONNECTED:
+		SetEvent(lpo->hEvent);
+		return CR_CONNECTED;
+
+	default:
+		break;
+	}
+
+failed:
+	error(_("ConnectNamedPipe failed for '%s' (%lu)"),
+	      server_thread_data->server_data->buf_path.buf,
+	      GetLastError());
+	return CR_CONNECT_ERROR;
+}
+
+/*
+ * Use Windows Overlapped IO to wait for a connection or for our event
+ * to be signalled.
+ */
+static enum connect_result wait_for_connection(
+	struct ipc_server_thread_data *server_thread_data,
+	OVERLAPPED *lpo)
+{
+	enum connect_result r;
+	HANDLE waitHandles[2];
+	DWORD dwWaitResult;
+
+	r = queue_overlapped_connect(server_thread_data, lpo);
+	if (r != CR_CONNECT_PENDING)
+		return r;
+
+	waitHandles[0] = server_thread_data->server_data->hEventStopRequested;
+	waitHandles[1] = lpo->hEvent;
+
+	dwWaitResult = WaitForMultipleObjects(2, waitHandles, FALSE, INFINITE);
+	switch (dwWaitResult) {
+	case WAIT_OBJECT_0 + 0:
+		return CR_SHUTDOWN;
+
+	case WAIT_OBJECT_0 + 1:
+		ResetEvent(lpo->hEvent);
+		return CR_CONNECTED;
+
+	default:
+		return CR_WAIT_ERROR;
+	}
+}
+
+/*
+ * Forward declare our reply callback function so that any compiler
+ * errors are reported when we actually define the function (in addition
+ * to any errors reported when we try to pass this callback function as
+ * a parameter in a function call).  The former are easier to understand.
+ */
+static ipc_server_reply_cb do_io_reply_callback;
+
+/*
+ * Relay application's response message to the client process.
+ * (We do not flush at this point because we allow the caller
+ * to chunk data to the client thru us.)
+ */
+static int do_io_reply_callback(struct ipc_server_reply_data *reply_data,
+		       const char *response, size_t response_len)
+{
+	if (reply_data->magic != MAGIC_SERVER_REPLY_DATA)
+		BUG("reply_cb called with wrong instance data");
+
+	return write_packetized_from_buf_no_flush(response, response_len,
+						  reply_data->fd);
+}
+
+/*
+ * Receive the request/command from the client and pass it to the
+ * registered request-callback.  The request-callback will compose
+ * a response and call our reply-callback to send it to the client.
+ *
+ * Simple-IPC only contains one round trip, so we flush and close
+ * here after the response.
+ */
+static int do_io(struct ipc_server_thread_data *server_thread_data)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct ipc_server_reply_data reply_data;
+	int ret = 0;
+
+	reply_data.magic = MAGIC_SERVER_REPLY_DATA;
+	reply_data.server_thread_data = server_thread_data;
+
+	reply_data.fd = dup_fd_from_pipe(server_thread_data->hPipe);
+	if (reply_data.fd < 0)
+		return error(_("could not create fd from pipe for '%s'"),
+			     server_thread_data->server_data->buf_path.buf);
+
+	ret = read_packetized_to_strbuf(
+		reply_data.fd, &buf,
+		PACKET_READ_GENTLE_ON_EOF | PACKET_READ_GENTLE_ON_READ_ERROR);
+	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);
+
+		packet_flush_gently(reply_data.fd);
+
+		FlushFileBuffers((HANDLE)_get_osfhandle((reply_data.fd)));
+	}
+	else {
+		/*
+		 * The client probably disconnected/shutdown before it
+		 * could send a well-formed message.  Ignore it.
+		 */
+	}
+
+	strbuf_release(&buf);
+	close(reply_data.fd);
+
+	return ret;
+}
+
+/*
+ * Handle IPC request and response with this connected client.  And reset
+ * the pipe to prepare for the next client.
+ */
+static int use_connection(struct ipc_server_thread_data *server_thread_data)
+{
+	int ret;
+
+	ret = do_io(server_thread_data);
+
+	FlushFileBuffers(server_thread_data->hPipe);
+	DisconnectNamedPipe(server_thread_data->hPipe);
+
+	return ret;
+}
+
+/*
+ * Thread proc for an IPC server worker thread.  It handles a series of
+ * connections from clients.  It cleans and reuses the hPipe between each
+ * client.
+ */
+static void *server_thread_proc(void *_server_thread_data)
+{
+	struct ipc_server_thread_data *server_thread_data = _server_thread_data;
+	HANDLE hEventConnected = INVALID_HANDLE_VALUE;
+	OVERLAPPED oConnect;
+	enum connect_result cr;
+	int ret;
+
+	assert(server_thread_data->hPipe != INVALID_HANDLE_VALUE);
+
+	trace2_thread_start("ipc-server");
+	trace2_data_string("ipc-server", NULL, "pipe",
+			   server_thread_data->server_data->buf_path.buf);
+
+	hEventConnected = CreateEventW(NULL, TRUE, FALSE, NULL);
+
+	memset(&oConnect, 0, sizeof(oConnect));
+	oConnect.hEvent = hEventConnected;
+
+	for (;;) {
+		cr = wait_for_connection(server_thread_data, &oConnect);
+
+		switch (cr) {
+		case CR_SHUTDOWN:
+			goto finished;
+
+		case CR_CONNECTED:
+			ret = use_connection(server_thread_data);
+			if (ret == SIMPLE_IPC_QUIT) {
+				ipc_server_stop_async(
+					server_thread_data->server_data);
+				goto finished;
+			}
+			if (ret > 0) {
+				/*
+				 * Ignore (transient) IO errors with this
+				 * client and reset for the next client.
+				 */
+			}
+			break;
+
+		case CR_CONNECT_PENDING:
+			/* By construction, this should not happen. */
+			BUG("ipc-server[%s]: unexpeced CR_CONNECT_PENDING",
+			    server_thread_data->server_data->buf_path.buf);
+
+		case CR_CONNECT_ERROR:
+		case CR_WAIT_ERROR:
+			/*
+			 * Ignore these theoretical errors.
+			 */
+			DisconnectNamedPipe(server_thread_data->hPipe);
+			break;
+
+		default:
+			BUG("unandled case after wait_for_connection");
+		}
+	}
+
+finished:
+	CloseHandle(server_thread_data->hPipe);
+	CloseHandle(hEventConnected);
+
+	trace2_thread_exit();
+	return NULL;
+}
+
+static HANDLE create_new_pipe(wchar_t *wpath, int is_first)
+{
+	HANDLE hPipe;
+	DWORD dwOpenMode, dwPipeMode;
+	LPSECURITY_ATTRIBUTES lpsa = NULL;
+
+	dwOpenMode = PIPE_ACCESS_INBOUND | PIPE_ACCESS_OUTBOUND |
+		FILE_FLAG_OVERLAPPED;
+
+	dwPipeMode = PIPE_TYPE_MESSAGE | PIPE_READMODE_BYTE | PIPE_WAIT |
+		PIPE_REJECT_REMOTE_CLIENTS;
+
+	if (is_first) {
+		dwOpenMode |= FILE_FLAG_FIRST_PIPE_INSTANCE;
+
+		/*
+		 * On Windows, the first server pipe instance gets to
+		 * 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.
+		 */
+	}
+
+	hPipe = CreateNamedPipeW(wpath, dwOpenMode, dwPipeMode,
+				 PIPE_UNLIMITED_INSTANCES, 1024, 1024, 0, lpsa);
+
+	return hPipe;
+}
+
+int ipc_server_run_async(struct ipc_server_data **returned_server_data,
+			 const char *path, const struct ipc_server_opts *opts,
+			 ipc_server_application_cb *application_cb,
+			 void *application_data)
+{
+	struct ipc_server_data *server_data;
+	wchar_t wpath[MAX_PATH];
+	HANDLE hPipeFirst = INVALID_HANDLE_VALUE;
+	int k;
+	int ret = 0;
+	int nr_threads = opts->nr_threads;
+
+	*returned_server_data = NULL;
+
+	ret = initialize_pipe_name(path, wpath, ARRAY_SIZE(wpath));
+	if (ret < 0) {
+		errno = EINVAL;
+		return -1;
+	}
+
+	hPipeFirst = create_new_pipe(wpath, 1);
+	if (hPipeFirst == INVALID_HANDLE_VALUE) {
+		errno = EADDRINUSE;
+		return -2;
+	}
+
+	server_data = xcalloc(1, sizeof(*server_data));
+	server_data->magic = MAGIC_SERVER_DATA;
+	server_data->application_cb = application_cb;
+	server_data->application_data = application_data;
+	server_data->hEventStopRequested = CreateEvent(NULL, TRUE, FALSE, NULL);
+	strbuf_init(&server_data->buf_path, 0);
+	strbuf_addstr(&server_data->buf_path, path);
+	wcscpy(server_data->wpath, wpath);
+
+	if (nr_threads < 1)
+		nr_threads = 1;
+
+	for (k = 0; k < nr_threads; k++) {
+		struct ipc_server_thread_data *std;
+
+		std = xcalloc(1, sizeof(*std));
+		std->magic = MAGIC_SERVER_THREAD_DATA;
+		std->server_data = server_data;
+		std->hPipe = INVALID_HANDLE_VALUE;
+
+		std->hPipe = (k == 0)
+			? hPipeFirst
+			: create_new_pipe(server_data->wpath, 0);
+
+		if (std->hPipe == INVALID_HANDLE_VALUE) {
+			/*
+			 * If we've reached a pipe instance limit for
+			 * this path, just use fewer threads.
+			 */
+			free(std);
+			break;
+		}
+
+		if (pthread_create(&std->pthread_id, NULL,
+				   server_thread_proc, std)) {
+			/*
+			 * Likewise, if we're out of threads, just use
+			 * fewer threads than requested.
+			 *
+			 * However, we just give up if we can't even get
+			 * one thread.  This should not happen.
+			 */
+			if (k == 0)
+				die(_("could not start thread[0] for '%s'"),
+				    path);
+
+			CloseHandle(std->hPipe);
+			free(std);
+			break;
+		}
+
+		std->next_thread = server_data->thread_list;
+		server_data->thread_list = std;
+	}
+
+	*returned_server_data = server_data;
+	return 0;
+}
+
+int ipc_server_stop_async(struct ipc_server_data *server_data)
+{
+	if (!server_data)
+		return 0;
+
+	/*
+	 * Gently tell all of the ipc_server threads to shutdown.
+	 * This will be seen the next time they are idle (and waiting
+	 * for a connection).
+	 *
+	 * We DO NOT attempt to force them to drop an active connection.
+	 */
+	SetEvent(server_data->hEventStopRequested);
+	return 0;
+}
+
+int ipc_server_await(struct ipc_server_data *server_data)
+{
+	DWORD dwWaitResult;
+
+	if (!server_data)
+		return 0;
+
+	dwWaitResult = WaitForSingleObject(server_data->hEventStopRequested, INFINITE);
+	if (dwWaitResult != WAIT_OBJECT_0)
+		return error(_("wait for hEvent failed for '%s'"),
+			     server_data->buf_path.buf);
+
+	while (server_data->thread_list) {
+		struct ipc_server_thread_data *std = server_data->thread_list;
+
+		pthread_join(std->pthread_id, NULL);
+
+		server_data->thread_list = std->next_thread;
+		free(std);
+	}
+
+	server_data->is_stopped = 1;
+
+	return 0;
+}
+
+void ipc_server_free(struct ipc_server_data *server_data)
+{
+	if (!server_data)
+		return;
+
+	if (!server_data->is_stopped)
+		BUG("cannot free ipc-server while running for '%s'",
+		    server_data->buf_path.buf);
+
+	strbuf_release(&server_data->buf_path);
+
+	if (server_data->hEventStopRequested != INVALID_HANDLE_VALUE)
+		CloseHandle(server_data->hEventStopRequested);
+
+	while (server_data->thread_list) {
+		struct ipc_server_thread_data *std = server_data->thread_list;
+
+		server_data->thread_list = std->next_thread;
+		free(std);
+	}
+
+	free(server_data);
+}
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 fa13ee672d..43b73ddc75 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -2,6 +2,9 @@
 #include "compat/terminal.h"
 #include "sigchain.h"
 #include "strbuf.h"
+#include "run-command.h"
+#include "string-list.h"
+#include "hashmap.h"
 
 #if defined(HAVE_DEV_TTY) || defined(GIT_WINDOWS_NATIVE)
 
@@ -32,7 +35,7 @@ static void restore_term(void)
 	term_fd = -1;
 }
 
-static int disable_echo(void)
+static int disable_bits(tcflag_t bits)
 {
 	struct termios t;
 
@@ -43,7 +46,7 @@ static int disable_echo(void)
 	old_term = t;
 	sigchain_push_common(restore_term_on_signal);
 
-	t.c_lflag &= ~ECHO;
+	t.c_lflag &= ~bits;
 	if (!tcsetattr(term_fd, TCSAFLUSH, &t))
 		return 0;
 
@@ -53,17 +56,44 @@ error:
 	return -1;
 }
 
+static int disable_echo(void)
+{
+	return disable_bits(ECHO);
+}
+
+static int enable_non_canonical(void)
+{
+	return disable_bits(ICANON | ECHO);
+}
+
 #elif defined(GIT_WINDOWS_NATIVE)
 
 #define INPUT_PATH "CONIN$"
 #define OUTPUT_PATH "CONOUT$"
 #define FORCE_TEXT "t"
 
+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 void restore_term(void)
 {
+	if (use_stty) {
+		int i;
+		struct child_process cp = CHILD_PROCESS_INIT;
+
+		if (stty_restore.nr == 0)
+			return;
+
+		strvec_push(&cp.args, "stty");
+		for (i = 0; i < stty_restore.nr; i++)
+			strvec_push(&cp.args, stty_restore.items[i].string);
+		run_command(&cp);
+		string_list_clear(&stty_restore, 0);
+		return;
+	}
+
 	if (hconin == INVALID_HANDLE_VALUE)
 		return;
 
@@ -72,8 +102,39 @@ static void restore_term(void)
 	hconin = INVALID_HANDLE_VALUE;
 }
 
-static int disable_echo(void)
+static int disable_bits(DWORD bits)
 {
+	if (use_stty) {
+		struct child_process cp = CHILD_PROCESS_INIT;
+
+		strvec_push(&cp.args, "stty");
+
+		if (bits & ENABLE_LINE_INPUT) {
+			string_list_append(&stty_restore, "icanon");
+			strvec_push(&cp.args, "-icanon");
+		}
+
+		if (bits & ENABLE_ECHO_INPUT) {
+			string_list_append(&stty_restore, "echo");
+			strvec_push(&cp.args, "-echo");
+		}
+
+		if (bits & ENABLE_PROCESSED_INPUT) {
+			string_list_append(&stty_restore, "-ignbrk");
+			string_list_append(&stty_restore, "intr");
+			string_list_append(&stty_restore, "^c");
+			strvec_push(&cp.args, "ignbrk");
+			strvec_push(&cp.args, "intr");
+			strvec_push(&cp.args, "");
+		}
+
+		if (run_command(&cp) == 0)
+			return 0;
+
+		/* `stty` could not be executed; access the Console directly */
+		use_stty = 0;
+	}
+
 	hconin = CreateFile("CONIN$", GENERIC_READ | GENERIC_WRITE,
 	    FILE_SHARE_READ, NULL, OPEN_EXISTING,
 	    FILE_ATTRIBUTE_NORMAL, NULL);
@@ -82,7 +143,7 @@ static int disable_echo(void)
 
 	GetConsoleMode(hconin, &cmode);
 	sigchain_push_common(restore_term_on_signal);
-	if (!SetConsoleMode(hconin, cmode & (~ENABLE_ECHO_INPUT))) {
+	if (!SetConsoleMode(hconin, cmode & ~bits)) {
 		CloseHandle(hconin);
 		hconin = INVALID_HANDLE_VALUE;
 		return -1;
@@ -91,6 +152,47 @@ static int disable_echo(void)
 	return 0;
 }
 
+static int disable_echo(void)
+{
+	return disable_bits(ENABLE_ECHO_INPUT);
+}
+
+static int enable_non_canonical(void)
+{
+	return disable_bits(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
+}
+
+/*
+ * Override `getchar()`, as the default implementation does not use
+ * `ReadFile()`.
+ *
+ * This poses a problem when we want to see whether the standard
+ * input has more characters, as the default of Git for Windows is to start the
+ * Bash in a MinTTY, which uses a named pipe to emulate a pty, in which case
+ * our `poll()` emulation calls `PeekNamedPipe()`, which seems to require
+ * `ReadFile()` to be called first to work properly (it only reports 0
+ * available bytes, otherwise).
+ *
+ * So let's just override `getchar()` with a version backed by `ReadFile()` and
+ * go our merry ways from here.
+ */
+static int mingw_getchar(void)
+{
+	DWORD read = 0;
+	unsigned char ch;
+
+	if (!ReadFile(GetStdHandle(STD_INPUT_HANDLE), &ch, 1, &read, NULL))
+		return EOF;
+
+	if (!read) {
+		error("Unexpected 0 read");
+		return EOF;
+	}
+
+	return ch;
+}
+#define getchar mingw_getchar
+
 #endif
 
 #ifndef FORCE_TEXT
@@ -137,6 +239,126 @@ char *git_terminal_prompt(const char *prompt, int echo)
 	return buf.buf;
 }
 
+/*
+ * The `is_known_escape_sequence()` function returns 1 if the passed string
+ * corresponds to an Escape sequence that the terminal capabilities contains.
+ *
+ * To avoid depending on ncurses or other platform-specific libraries, we rely
+ * on the presence of the `infocmp` executable to do the job for us (failing
+ * silently if the program is not available or refused to run).
+ */
+struct escape_sequence_entry {
+	struct hashmap_entry entry;
+	char sequence[FLEX_ARRAY];
+};
+
+static int sequence_entry_cmp(const void *hashmap_cmp_fn_data,
+			      const struct escape_sequence_entry *e1,
+			      const struct escape_sequence_entry *e2,
+			      const void *keydata)
+{
+	return strcmp(e1->sequence, keydata ? keydata : e2->sequence);
+}
+
+static int is_known_escape_sequence(const char *sequence)
+{
+	static struct hashmap sequences;
+	static int initialized;
+
+	if (!initialized) {
+		struct child_process cp = CHILD_PROCESS_INIT;
+		struct strbuf buf = STRBUF_INIT;
+		char *p, *eol;
+
+		hashmap_init(&sequences, (hashmap_cmp_fn)sequence_entry_cmp,
+			     NULL, 0);
+
+		strvec_pushl(&cp.args, "infocmp", "-L", "-1", NULL);
+		if (pipe_command(&cp, NULL, 0, &buf, 0, NULL, 0))
+			strbuf_setlen(&buf, 0);
+
+		for (eol = p = buf.buf; *p; p = eol + 1) {
+			p = strchr(p, '=');
+			if (!p)
+				break;
+			p++;
+			eol = strchrnul(p, '\n');
+
+			if (starts_with(p, "\\E")) {
+				char *comma = memchr(p, ',', eol - p);
+				struct escape_sequence_entry *e;
+
+				p[0] = '^';
+				p[1] = '[';
+				FLEX_ALLOC_MEM(e, sequence, p, comma - p);
+				hashmap_entry_init(&e->entry,
+						   strhash(e->sequence));
+				hashmap_add(&sequences, &e->entry);
+			}
+			if (!*eol)
+				break;
+		}
+		initialized = 1;
+	}
+
+	return !!hashmap_get_from_hash(&sequences, strhash(sequence), sequence);
+}
+
+int read_key_without_echo(struct strbuf *buf)
+{
+	static int warning_displayed;
+	int ch;
+
+	if (warning_displayed || enable_non_canonical() < 0) {
+		if (!warning_displayed) {
+			warning("reading single keystrokes not supported on "
+				"this platform; reading line instead");
+			warning_displayed = 1;
+		}
+
+		return strbuf_getline(buf, stdin);
+	}
+
+	strbuf_reset(buf);
+	ch = getchar();
+	if (ch == EOF) {
+		restore_term();
+		return EOF;
+	}
+	strbuf_addch(buf, ch);
+
+	if (ch == '\033' /* ESC */) {
+		/*
+		 * We are most likely looking at an Escape sequence. Let's try
+		 * to read more bytes, waiting at most half a second, assuming
+		 * that the sequence is complete if we did not receive any byte
+		 * within that time.
+		 *
+		 * Start by replacing the Escape byte with ^[ */
+		strbuf_splice(buf, buf->len - 1, 1, "^[", 2);
+
+		/*
+		 * Query the terminal capabilities once about all the Escape
+		 * sequences it knows about, so that we can avoid waiting for
+		 * half a second when we know that the sequence is complete.
+		 */
+		while (!is_known_escape_sequence(buf->buf)) {
+			struct pollfd pfd = { .fd = 0, .events = POLLIN };
+
+			if (poll(&pfd, 1, 500) < 1)
+				break;
+
+			ch = getchar();
+			if (ch == EOF)
+				return 0;
+			strbuf_addch(buf, ch);
+		}
+	}
+
+	restore_term();
+	return 0;
+}
+
 #else
 
 char *git_terminal_prompt(const char *prompt, int echo)
@@ -144,4 +366,23 @@ char *git_terminal_prompt(const char *prompt, int echo)
 	return getpass(prompt);
 }
 
+int read_key_without_echo(struct strbuf *buf)
+{
+	static int warning_displayed;
+	const char *res;
+
+	if (!warning_displayed) {
+		warning("reading single keystrokes not supported on this "
+			"platform; reading line instead");
+		warning_displayed = 1;
+	}
+
+	res = getpass("");
+	strbuf_reset(buf);
+	if (!res)
+		return EOF;
+	strbuf_addstr(buf, res);
+	return 0;
+}
+
 #endif
diff --git a/compat/terminal.h b/compat/terminal.h
index 97db7cd69d..a9d52b8464 100644
--- a/compat/terminal.h
+++ b/compat/terminal.h
@@ -3,4 +3,7 @@
 
 char *git_terminal_prompt(const char *prompt, int echo);
 
+/* Read a single keystroke, without echoing it to the terminal */
+int read_key_without_echo(struct strbuf *buf);
+
 #endif /* COMPAT_TERMINAL_H */
diff --git a/compat/vcbuild/README b/compat/vcbuild/README
index 1b6dabf5a2..51fb083dbb 100644
--- a/compat/vcbuild/README
+++ b/compat/vcbuild/README
@@ -26,8 +26,8 @@ The Steps to Build Git with VS2015 or VS2017 from the command line.
    Use ONE of the following forms which should match how you want to
    compile git.exe.
 
-   $ ./compat/vcbuild/vcpkg_copy_packages.bat debug
-   $ ./compat/vcbuild/vcpkg_copy_packages.bat release
+   $ ./compat/vcbuild/vcpkg_copy_dlls.bat debug
+   $ ./compat/vcbuild/vcpkg_copy_dlls.bat release
 
 3. Build git using MSVC from an SDK bash window using one of the
    following commands:
@@ -92,8 +92,8 @@ The Steps of Build Git with VS2008
    the git operations.
 
 3. Inside Git's directory run the command:
-       make command-list.h
-   to generate the command-list.h file needed to compile git.
+       make command-list.h config-list.h
+   to generate the header file needed to compile git.
 
 4. Then either build Git with the GNU Make Makefile in the Git projects
    root
diff --git a/compat/vcbuild/find_vs_env.bat b/compat/vcbuild/find_vs_env.bat
index 40194dd230..b35d264c0e 100644
--- a/compat/vcbuild/find_vs_env.bat
+++ b/compat/vcbuild/find_vs_env.bat
@@ -18,7 +18,7 @@ REM and MAKE, we must blend these two different worlds.  This script
 REM attempts to do that.
 REM ================================================================
 REM This BAT file starts in a plain (non-developer) command prompt,
-REM searches for the "best" commmand prompt setup script, installs
+REM searches for the "best" command prompt setup script, installs
 REM it into the current CMD process, and exports the various MSVC
 REM environment variables for use by MAKE.
 REM
diff --git a/compat/vcbuild/scripts/clink.pl b/compat/vcbuild/scripts/clink.pl
index ec95a3b2d0..3bd824154b 100755
--- a/compat/vcbuild/scripts/clink.pl
+++ b/compat/vcbuild/scripts/clink.pl
@@ -23,7 +23,9 @@ while (@ARGV) {
 	    # before any "-l*" flags.
 	    $is_debug = 1;
 	}
-	if ("$arg" =~ /^-[DIMGOZ]/) {
+	if ("$arg" =~ /^-I\/mingw(32|64)/) {
+		# eat
+	} elsif ("$arg" =~ /^-[DIMGOZ]/) {
 		push(@cflags, $arg);
 	} elsif ("$arg" eq "-o") {
 		my $file_out = shift @ARGV;
@@ -43,11 +45,11 @@ while (@ARGV) {
 		push(@args, "zlib.lib");
 	    }
 	} elsif ("$arg" eq "-liconv") {
-		push(@args, "libiconv.lib");
+		push(@args, "iconv.lib");
 	} elsif ("$arg" eq "-lcrypto") {
-		push(@args, "libeay32.lib");
+		push(@args, "libcrypto.lib");
 	} elsif ("$arg" eq "-lssl") {
-		push(@args, "ssleay32.lib");
+		push(@args, "libssl.lib");
 	} elsif ("$arg" eq "-lcurl") {
 		my $lib = "";
 		# Newer vcpkg definitions call this libcurl_imp.lib; Do we
@@ -64,7 +66,7 @@ while (@ARGV) {
 		}
 		push(@args, $lib);
 	} elsif ("$arg" eq "-lexpat") {
-		push(@args, "expat.lib");
+		push(@args, "libexpat.lib");
 	} elsif ("$arg" =~ /^-L/ && "$arg" ne "-LTCG") {
 		$arg =~ s/^-L/-LIBPATH:/;
 		push(@lflags, $arg);
diff --git a/compat/win32/path-utils.c b/compat/win32/path-utils.c
index d9d3641de8..ebf2f12eb6 100644
--- a/compat/win32/path-utils.c
+++ b/compat/win32/path-utils.c
@@ -1,5 +1,29 @@
 #include "../../git-compat-util.h"
 
+int win32_has_dos_drive_prefix(const char *path)
+{
+	int i;
+
+	/*
+	 * Does it start with an ASCII letter (i.e. highest bit not set),
+	 * followed by a colon?
+	 */
+	if (!(0x80 & (unsigned char)*path))
+		return *path && path[1] == ':' ? 2 : 0;
+
+	/*
+	 * While drive letters must be letters of the English alphabet, it is
+	 * possible to assign virtually _any_ Unicode character via `subst` as
+	 * a drive letter to "virtual drives". Even `1`, or `ä`. Or fun stuff
+	 * like this:
+	 *
+	 *      subst Ö�: %USERPROFILE%\Desktop
+	 */
+	for (i = 1; i < 4 && (0x80 & (unsigned char)path[i]); i++)
+		; /* skip first UTF-8 character */
+	return path[i] == ':' ? i + 1 : 0;
+}
+
 int win32_skip_dos_drive_prefix(char **path)
 {
 	int ret = has_dos_drive_prefix(*path);
diff --git a/compat/win32/path-utils.h b/compat/win32/path-utils.h
index 8ed062a6b7..bba2b64408 100644
--- a/compat/win32/path-utils.h
+++ b/compat/win32/path-utils.h
@@ -1,8 +1,9 @@
 #ifndef WIN32_PATH_UTILS_H
 #define WIN32_PATH_UTILS_H
 
-#define has_dos_drive_prefix(path) \
-	(isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)
+int win32_has_dos_drive_prefix(const char *path);
+#define has_dos_drive_prefix win32_has_dos_drive_prefix
+
 int win32_skip_dos_drive_prefix(char **path);
 #define skip_dos_drive_prefix win32_skip_dos_drive_prefix
 static inline int win32_is_dir_sep(int c)
@@ -19,6 +20,17 @@ static inline char *win32_find_last_dir_sep(const char *path)
 	return ret;
 }
 #define find_last_dir_sep win32_find_last_dir_sep
+static inline int win32_has_dir_sep(const char *path)
+{
+	/*
+	 * See how long the non-separator part of the given path is, and
+	 * if and only if it covers the whole path (i.e. path[len] is NUL),
+	 * there is no separator in the path---otherwise there is a separator.
+	 */
+	size_t len = strcspn(path, "/\\");
+	return !!path[len];
+}
+#define has_dir_sep(path) win32_has_dir_sep(path)
 int win32_offset_1st_component(const char *path);
 #define offset_1st_component win32_offset_1st_component
 
diff --git a/compat/winansi.c b/compat/winansi.c
index 54fd701cbf..c27b20a79d 100644
--- a/compat/winansi.c
+++ b/compat/winansi.c
@@ -662,10 +662,20 @@ void winansi_init(void)
  */
 HANDLE winansi_get_osfhandle(int fd)
 {
+	HANDLE ret;
+
 	if (fd == 1 && (fd_is_interactive[1] & FD_SWAPPED))
 		return hconsole1;
 	if (fd == 2 && (fd_is_interactive[2] & FD_SWAPPED))
 		return hconsole2;
 
-	return (HANDLE)_get_osfhandle(fd);
+	ret = (HANDLE)_get_osfhandle(fd);
+
+	/*
+	 * There are obviously circumstances under which _get_osfhandle()
+	 * returns (HANDLE)-2. This is not documented anywhere, but that is so
+	 * clearly an invalid handle value that we can just work around this
+	 * and return the correct value for invalid handles.
+	 */
+	return ret == (HANDLE)-2 ? INVALID_HANDLE_VALUE : ret;
 }
diff --git a/config.c b/config.c
index e7052b3977..cb4a8058bf 100644
--- a/config.c
+++ b/config.c
@@ -8,6 +8,7 @@
 #include "cache.h"
 #include "branch.h"
 #include "config.h"
+#include "environment.h"
 #include "repository.h"
 #include "lockfile.h"
 #include "exec-cmd.h"
@@ -37,6 +38,7 @@ struct config_source {
 	enum config_error_action default_error_action;
 	int linenr;
 	int eof;
+	size_t total_len;
 	struct strbuf value;
 	struct strbuf var;
 	unsigned subsection_case_sensitive : 1;
@@ -135,7 +137,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;
@@ -183,7 +185,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);
@@ -204,7 +206,7 @@ static int prepare_include_condition_pattern(struct strbuf *pat)
 		strbuf_splice(pat, 0, 1, path.buf, slash - path.buf);
 		prefix = slash - path.buf + 1 /* slash */;
 	} else if (!is_absolute_path(pat->buf))
-		strbuf_insert(pat, 0, "**/", 3);
+		strbuf_insertstr(pat, 0, "**/");
 
 	add_trailing_starstar_for_dir(pat);
 
@@ -309,7 +311,7 @@ int git_config_include(const char *var, const char *value, void *data)
 {
 	struct config_include_data *inc = data;
 	const char *cond, *key;
-	int cond_len;
+	size_t cond_len;
 	int ret;
 
 	/*
@@ -331,7 +333,7 @@ int git_config_include(const char *var, const char *value, void *data)
 	return ret;
 }
 
-void git_config_push_parameter(const char *text)
+static void git_config_push_split_parameter(const char *key, const char *value)
 {
 	struct strbuf env = STRBUF_INIT;
 	const char *old = getenv(CONFIG_DATA_ENVIRONMENT);
@@ -339,11 +341,74 @@ void git_config_push_parameter(const char *text)
 		strbuf_addstr(&env, old);
 		strbuf_addch(&env, ' ');
 	}
-	sq_quote_buf(&env, text);
+	sq_quote_buf(&env, key);
+	strbuf_addch(&env, '=');
+	if (value)
+		sq_quote_buf(&env, value);
 	setenv(CONFIG_DATA_ENVIRONMENT, env.buf, 1);
 	strbuf_release(&env);
 }
 
+void git_config_push_parameter(const char *text)
+{
+	const char *value;
+
+	/*
+	 * When we see:
+	 *
+	 *   section.subsection=with=equals.key=value
+	 *
+	 * we cannot tell if it means:
+	 *
+	 *   [section "subsection=with=equals"]
+	 *   key = value
+	 *
+	 * or:
+	 *
+	 *   [section]
+	 *   subsection = with=equals.key=value
+	 *
+	 * We parse left-to-right for the first "=", meaning we'll prefer to
+	 * keep the value intact over the subsection. This is historical, but
+	 * also sensible since values are more likely to contain odd or
+	 * untrusted input than a section name.
+	 *
+	 * A missing equals is explicitly allowed (as a bool-only entry).
+	 */
+	value = strchr(text, '=');
+	if (value) {
+		char *key = xmemdupz(text, value - text);
+		git_config_push_split_parameter(key, value + 1);
+		free(key);
+	} else {
+		git_config_push_split_parameter(text, NULL);
+	}
+}
+
+void git_config_push_env(const char *spec)
+{
+	char *key;
+	const char *env_name;
+	const char *env_value;
+
+	env_name = strrchr(spec, '=');
+	if (!env_name)
+		die(_("invalid config format: %s"), spec);
+	key = xmemdupz(spec, env_name - spec);
+	env_name++;
+	if (!*env_name)
+		die(_("missing environment variable name for configuration '%.*s'"),
+		    (int)(env_name - spec - 1), spec);
+
+	env_value = getenv(env_name);
+	if (!env_value)
+		die(_("missing environment variable '%s' for configuration '%.*s'"),
+		    env_name, (int)(env_name - spec - 1), spec);
+
+	git_config_push_split_parameter(key, env_value);
+	free(key);
+}
+
 static inline int iskeychar(int c)
 {
 	return isalnum(c) || c == '-';
@@ -358,12 +423,13 @@ static inline int iskeychar(int c)
  *
  * store_key - pointer to char* which will hold a copy of the key with
  *             lowercase section and variable name
- * baselen - pointer to int which will hold the length of the
+ * 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, int *baselen_, int quiet)
+static int git_config_parse_key_1(const char *key, char **store_key, size_t *baselen_, int quiet)
 {
-	int i, dot, baselen;
+	size_t i, baselen;
+	int dot;
 	const char *last_dot = strrchr(key, '.');
 
 	/*
@@ -425,7 +491,7 @@ out_free_ret_1:
 	return -CONFIG_INVALID_KEY;
 }
 
-int git_config_parse_key(const char *key, char **store_key, int *baselen)
+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);
 }
@@ -435,11 +501,26 @@ 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)
+{
+	char *canonical_name;
+	int ret;
+
+	if (!strlen(key))
+		return error(_("empty config key"));
+	if (git_config_parse_key(key, &canonical_name, NULL))
+		return -1;
+
+	ret = (fn(canonical_name, value, data) < 0) ? -1 : 0;
+	free(canonical_name);
+	return ret;
+}
+
 int git_config_parse_parameter(const char *text,
 			       config_fn_t fn, void *data)
 {
 	const char *value;
-	char *canonical_name;
 	struct strbuf **pair;
 	int ret;
 
@@ -460,51 +541,131 @@ int git_config_parse_parameter(const char *text,
 		return error(_("bogus config parameter: %s"), text);
 	}
 
-	if (git_config_parse_key(pair[0]->buf, &canonical_name, NULL)) {
-		ret = -1;
-	} else {
-		ret = (fn(canonical_name, value, data) < 0) ? -1 : 0;
-		free(canonical_name);
-	}
+	ret = config_parse_pair(pair[0]->buf, value, fn, data);
 	strbuf_list_free(pair);
 	return ret;
 }
 
+static int parse_config_env_list(char *env, config_fn_t fn, void *data)
+{
+	char *cur = env;
+	while (cur && *cur) {
+		const char *key = sq_dequote_step(cur, &cur);
+		if (!key)
+			return error(_("bogus format in %s"),
+				     CONFIG_DATA_ENVIRONMENT);
+
+		if (!cur || isspace(*cur)) {
+			/* old-style 'key=value' */
+			if (git_config_parse_parameter(key, fn, data) < 0)
+				return -1;
+		}
+		else if (*cur == '=') {
+			/* new-style 'key'='value' */
+			const char *value;
+
+			cur++;
+			if (*cur == '\'') {
+				/* quoted value */
+				value = sq_dequote_step(cur, &cur);
+				if (!value || (cur && !isspace(*cur))) {
+					return error(_("bogus format in %s"),
+						     CONFIG_DATA_ENVIRONMENT);
+				}
+			} else if (!*cur || isspace(*cur)) {
+				/* implicit bool: 'key'= */
+				value = NULL;
+			} else {
+				return error(_("bogus format in %s"),
+					     CONFIG_DATA_ENVIRONMENT);
+			}
+
+			if (config_parse_pair(key, value, fn, data) < 0)
+				return -1;
+		}
+		else {
+			/* unknown format */
+			return error(_("bogus format in %s"),
+				     CONFIG_DATA_ENVIRONMENT);
+		}
+
+		if (cur) {
+			while (isspace(*cur))
+				cur++;
+		}
+	}
+	return 0;
+}
+
 int git_config_from_parameters(config_fn_t fn, void *data)
 {
-	const char *env = getenv(CONFIG_DATA_ENVIRONMENT);
+	const char *env;
+	struct strbuf envvar = STRBUF_INIT;
+	struct strvec to_free = STRVEC_INIT;
 	int ret = 0;
-	char *envw;
-	const char **argv = NULL;
-	int nr = 0, alloc = 0;
-	int i;
+	char *envw = NULL;
 	struct config_source source;
 
-	if (!env)
-		return 0;
-
 	memset(&source, 0, sizeof(source));
 	source.prev = cf;
 	source.origin_type = CONFIG_ORIGIN_CMDLINE;
 	cf = &source;
 
-	/* sq_dequote will write over it */
-	envw = xstrdup(env);
+	env = getenv(CONFIG_COUNT_ENVIRONMENT);
+	if (env) {
+		unsigned long count;
+		char *endp;
+		int i;
 
-	if (sq_dequote_to_argv(envw, &argv, &nr, &alloc) < 0) {
-		ret = error(_("bogus format in %s"), CONFIG_DATA_ENVIRONMENT);
-		goto out;
+		count = strtoul(env, &endp, 10);
+		if (*endp) {
+			ret = error(_("bogus count in %s"), CONFIG_COUNT_ENVIRONMENT);
+			goto out;
+		}
+		if (count > INT_MAX) {
+			ret = error(_("too many entries in %s"), CONFIG_COUNT_ENVIRONMENT);
+			goto out;
+		}
+
+		for (i = 0; i < count; i++) {
+			const char *key, *value;
+
+			strbuf_addf(&envvar, "GIT_CONFIG_KEY_%d", i);
+			key = getenv_safe(&to_free, envvar.buf);
+			if (!key) {
+				ret = error(_("missing config key %s"), envvar.buf);
+				goto out;
+			}
+			strbuf_reset(&envvar);
+
+			strbuf_addf(&envvar, "GIT_CONFIG_VALUE_%d", i);
+			value = getenv_safe(&to_free, envvar.buf);
+			if (!value) {
+				ret = error(_("missing config value %s"), envvar.buf);
+				goto out;
+			}
+			strbuf_reset(&envvar);
+
+			if (config_parse_pair(key, value, fn, data) < 0) {
+				ret = -1;
+				goto out;
+			}
+		}
 	}
 
-	for (i = 0; i < nr; i++) {
-		if (git_config_parse_parameter(argv[i], fn, data) < 0) {
+	env = getenv(CONFIG_DATA_ENVIRONMENT);
+	if (env) {
+		/* sq_dequote will write over it */
+		envw = xstrdup(env);
+		if (parse_config_env_list(envw, fn, data) < 0) {
 			ret = -1;
 			goto out;
 		}
 	}
 
 out:
-	free(argv);
+	strbuf_release(&envvar);
+	strvec_clear(&to_free);
 	free(envw);
 	cf = source.prev;
 	return ret;
@@ -523,6 +684,19 @@ static int get_next_char(void)
 			c = '\r';
 		}
 	}
+
+	if (c != EOF && ++cf->total_len > INT_MAX) {
+		/*
+		 * This is an absurdly long config file; refuse to parse
+		 * further in order to protect downstream code from integer
+		 * overflows. Note that we can't return an error specifically,
+		 * but we can mark EOF and put trash in the return value,
+		 * which will trigger a parse error.
+		 */
+		cf->eof = 1;
+		return 0;
+	}
+
 	if (c == '\n')
 		cf->linenr++;
 	if (c == EOF) {
@@ -728,7 +902,7 @@ static int git_parse_source(config_fn_t fn, void *data,
 			    const struct config_options *opts)
 {
 	int comment = 0;
-	int baselen = 0;
+	size_t baselen = 0;
 	struct strbuf *var = &cf->var;
 	int error_return = 0;
 	char *error_msg = NULL;
@@ -981,15 +1155,6 @@ static void die_bad_number(const char *name, const char *value)
 	if (!value)
 		value = "";
 
-	if (!strcmp(name, "GIT_TEST_GETTEXT_POISON"))
-		/*
-		 * We explicitly *don't* use _() here since it would
-		 * cause an infinite loop with _() needing to call
-		 * use_gettext_poison(). This is why marked up
-		 * translations with N_() above.
-		 */
-		die(bad_numeric, value, name, error_type);
-
 	if (!(cf && cf->name))
 		die(_(bad_numeric), value, name, _(error_type));
 
@@ -1087,8 +1252,10 @@ int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
 
 int git_config_bool(const char *name, const char *value)
 {
-	int discard;
-	return !!git_config_bool_or_int(name, value, &discard);
+	int v = git_parse_maybe_bool(value);
+	if (v < 0)
+		die(_("bad boolean config value '%s' for '%s'"), value, name);
+	return v;
 }
 
 int git_config_string(const char **dest, const char *var, const char *value)
@@ -1103,7 +1270,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;
@@ -1202,6 +1369,8 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
 			return config_error_nonbool(var);
 		if (!strcasecmp(value, "auto"))
 			default_abbrev = -1;
+		else if (!git_parse_maybe_bool_text(value))
+			default_abbrev = the_hash_algo->hexsz;
 		else {
 			int abbrev = git_config_int(var, value);
 			if (abbrev < minimum_abbrev || abbrev > the_hash_algo->hexsz)
@@ -1364,6 +1533,11 @@ static int git_default_core_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "core.sparsecheckoutcone")) {
+		core_sparse_checkout_cone = git_config_bool(var, value);
+		return 0;
+	}
+
 	if (!strcmp(var, "core.precomposeunicode")) {
 		precomposed_unicode = git_config_bool(var, value);
 		return 0;
@@ -1534,6 +1708,7 @@ static int do_config_from(struct config_source *top, config_fn_t fn, void *data,
 	top->prev = cf;
 	top->linenr = 1;
 	top->eof = 0;
+	top->total_len = 0;
 	strbuf_init(&top->value, 1024);
 	strbuf_init(&top->var, 1024);
 	cf = top;
@@ -1655,12 +1830,27 @@ static int git_config_from_blob_ref(config_fn_t fn,
 	return git_config_from_blob_oid(fn, name, &oid, data);
 }
 
-const char *git_etc_gitconfig(void)
+char *git_system_config(void)
+{
+	char *system_config = xstrdup_or_null(getenv("GIT_CONFIG_SYSTEM"));
+	if (!system_config)
+		system_config = system_path(ETC_GITCONFIG);
+	normalize_path_copy(system_config, system_config);
+	return system_config;
+}
+
+void git_global_config(char **user_out, char **xdg_out)
 {
-	static const char *system_wide;
-	if (!system_wide)
-		system_wide = system_path(ETC_GITCONFIG);
-	return system_wide;
+	char *user_config = xstrdup_or_null(getenv("GIT_CONFIG_GLOBAL"));
+	char *xdg_config = NULL;
+
+	if (!user_config) {
+		user_config = interpolate_path("~/.gitconfig", 0);
+		xdg_config = xdg_config_home("config");
+	}
+
+	*user_out = user_config;
+	*xdg_out = xdg_config;
 }
 
 /*
@@ -1694,9 +1884,11 @@ static int do_git_config_sequence(const struct config_options *opts,
 				  config_fn_t fn, void *data)
 {
 	int ret = 0;
-	char *xdg_config = xdg_config_home("config");
-	char *user_config = expand_user_path("~/.gitconfig", 0);
+	char *system_config = git_system_config();
+	char *xdg_config = NULL;
+	char *user_config = NULL;
 	char *repo_config;
+	enum config_scope prev_parsing_scope = current_parsing_scope;
 
 	if (opts->commondir)
 		repo_config = mkpathdup("%s/config", opts->commondir);
@@ -1706,28 +1898,26 @@ static int do_git_config_sequence(const struct config_options *opts,
 		repo_config = NULL;
 
 	current_parsing_scope = CONFIG_SCOPE_SYSTEM;
-	if (git_config_system() && !access_or_die(git_etc_gitconfig(), R_OK,
-						  opts->system_gently ?
-						  ACCESS_EACCES_OK : 0))
-		ret += git_config_from_file(fn, git_etc_gitconfig(),
-					    data);
+	if (git_config_system() && system_config &&
+	    !access_or_die(system_config, R_OK,
+			   opts->system_gently ? ACCESS_EACCES_OK : 0))
+		ret += git_config_from_file(fn, system_config, data);
 
 	current_parsing_scope = CONFIG_SCOPE_GLOBAL;
+	git_global_config(&user_config, &xdg_config);
+
 	if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK))
 		ret += git_config_from_file(fn, xdg_config, data);
 
 	if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK))
 		ret += git_config_from_file(fn, user_config, data);
 
-	current_parsing_scope = CONFIG_SCOPE_REPO;
+	current_parsing_scope = CONFIG_SCOPE_LOCAL;
 	if (!opts->ignore_repo && repo_config &&
 	    !access_or_die(repo_config, R_OK, 0))
 		ret += git_config_from_file(fn, repo_config, data);
 
-	/*
-	 * Note: this should have a new scope, CONFIG_SCOPE_WORKTREE.
-	 * But let's not complicate things before it's actually needed.
-	 */
+	current_parsing_scope = CONFIG_SCOPE_WORKTREE;
 	if (!opts->ignore_worktree && repository_format_worktree_config) {
 		char *path = git_pathdup("config.worktree");
 		if (!access_or_die(path, R_OK, 0))
@@ -1735,11 +1925,12 @@ static int do_git_config_sequence(const struct config_options *opts,
 		free(path);
 	}
 
-	current_parsing_scope = CONFIG_SCOPE_CMDLINE;
+	current_parsing_scope = CONFIG_SCOPE_COMMAND;
 	if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0)
 		die(_("unable to parse command-line config"));
 
-	current_parsing_scope = CONFIG_SCOPE_UNKNOWN;
+	current_parsing_scope = prev_parsing_scope;
+	free(system_config);
 	free(xdg_config);
 	free(user_config);
 	free(repo_config);
@@ -1760,6 +1951,9 @@ int config_with_options(config_fn_t fn, void *data,
 		data = &inc;
 	}
 
+	if (config_source)
+		current_parsing_scope = config_source->scope;
+
 	/*
 	 * If we have a specific filename, use it. Otherwise, follow the
 	 * regular lookup sequence.
@@ -1879,7 +2073,7 @@ static int configset_add_value(struct config_set *cs, const char *key, const cha
 		e = xmalloc(sizeof(*e));
 		hashmap_entry_init(&e->ent, strhash(key));
 		e->key = xstrdup(key);
-		string_list_init(&e->value_list, 1);
+		string_list_init_dup(&e->value_list);
 		hashmap_add(&cs->config_hash, &e->ent);
 	}
 	si = string_list_append_nodup(&e->value_list, xstrdup_or_null(value));
@@ -1941,7 +2135,7 @@ void git_configset_clear(struct config_set *cs)
 		free(entry->key);
 		string_list_clear(&entry->value_list, 1);
 	}
-	hashmap_free_entries(&cs->config_hash, struct config_set_element, ent);
+	hashmap_clear_and_free(&cs->config_hash, struct config_set_element, ent);
 	cs->hash_initialized = 0;
 	free(cs->list.items);
 	cs->list.nr = 0;
@@ -1984,18 +2178,27 @@ const struct string_list *git_configset_get_value_multi(struct config_set *cs, c
 	return e ? &e->value_list : NULL;
 }
 
-int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest)
+int git_configset_get_string(struct config_set *cs, const char *key, char **dest)
 {
 	const char *value;
 	if (!git_configset_get_value(cs, key, &value))
-		return git_config_string(dest, key, value);
+		return git_config_string((const char **)dest, key, value);
 	else
 		return 1;
 }
 
-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)
 {
-	return git_configset_get_string_const(cs, key, (const char **)dest);
+	const char *value;
+	if (!git_configset_get_value(cs, key, &value)) {
+		if (!value)
+			return config_error_nonbool(key);
+		*dest = value;
+		return 0;
+	} else {
+		return 1;
+	}
 }
 
 int git_configset_get_int(struct config_set *cs, const char *key, int *dest)
@@ -2070,7 +2273,7 @@ static void repo_read_config(struct repository *repo)
 	opts.git_dir = repo->gitdir;
 
 	if (!repo->config)
-		repo->config = xcalloc(1, sizeof(struct config_set));
+		CALLOC_ARRAY(repo->config, 1);
 	else
 		git_configset_clear(repo->config);
 
@@ -2125,22 +2328,26 @@ const struct string_list *repo_config_get_value_multi(struct repository *repo,
 	return git_configset_get_value_multi(repo->config, key);
 }
 
-int repo_config_get_string_const(struct repository *repo,
-				 const char *key, const char **dest)
+int repo_config_get_string(struct repository *repo,
+			   const char *key, char **dest)
 {
 	int ret;
 	git_config_check_init(repo);
-	ret = git_configset_get_string_const(repo->config, key, dest);
+	ret = git_configset_get_string(repo->config, key, dest);
 	if (ret < 0)
 		git_die_config(key, NULL);
 	return ret;
 }
 
-int repo_config_get_string(struct repository *repo,
-			   const char *key, char **dest)
+int repo_config_get_string_tmp(struct repository *repo,
+			       const char *key, const char **dest)
 {
+	int ret;
 	git_config_check_init(repo);
-	return repo_config_get_string_const(repo, key, (const char **)dest);
+	ret = git_configset_get_string_tmp(repo->config, key, dest);
+	if (ret < 0)
+		git_die_config(key, NULL);
+	return ret;
 }
 
 int repo_config_get_int(struct repository *repo,
@@ -2210,14 +2417,14 @@ const struct string_list *git_config_get_value_multi(const char *key)
 	return repo_config_get_value_multi(the_repository, key);
 }
 
-int git_config_get_string_const(const char *key, const char **dest)
+int git_config_get_string(const char *key, char **dest)
 {
-	return repo_config_get_string_const(the_repository, key, dest);
+	return repo_config_get_string(the_repository, key, dest);
 }
 
-int git_config_get_string(const char *key, char **dest)
+int git_config_get_string_tmp(const char *key, const char **dest)
 {
-	return repo_config_get_string(the_repository, key, dest);
+	return repo_config_get_string_tmp(the_repository, key, dest);
 }
 
 int git_config_get_int(const char *key, int *dest)
@@ -2252,7 +2459,7 @@ int git_config_get_pathname(const char *key, const char **dest)
 
 int git_config_get_expiry(const char *key, const char **output)
 {
-	int ret = git_config_get_string_const(key, output);
+	int ret = git_config_get_string(key, (char **)output);
 	if (ret)
 		return ret;
 	if (strcmp(*output, "now")) {
@@ -2265,11 +2472,11 @@ int git_config_get_expiry(const char *key, const char **output)
 
 int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestamp_t now)
 {
-	char *expiry_string;
+	const char *expiry_string;
 	intmax_t days;
 	timestamp_t when;
 
-	if (git_config_get_string(key, &expiry_string))
+	if (git_config_get_string_tmp(key, &expiry_string))
 		return 1; /* no such thing */
 
 	if (git_parse_signed(expiry_string, &days, maximum_signed_value_of_type(int))) {
@@ -2377,10 +2584,11 @@ void git_die_config(const char *key, const char *err, ...)
  */
 
 struct config_store_data {
-	int baselen;
+	size_t baselen;
 	char *key;
 	int do_not_match;
-	regex_t *value_regex;
+	const char *fixed_value;
+	regex_t *value_pattern;
 	int multi_replace;
 	struct {
 		size_t begin, end;
@@ -2394,10 +2602,10 @@ struct config_store_data {
 static void config_store_data_clear(struct config_store_data *store)
 {
 	free(store->key);
-	if (store->value_regex != NULL &&
-	    store->value_regex != CONFIG_REGEX_NONE) {
-		regfree(store->value_regex);
-		free(store->value_regex);
+	if (store->value_pattern != NULL &&
+	    store->value_pattern != CONFIG_REGEX_NONE) {
+		regfree(store->value_pattern);
+		free(store->value_pattern);
 	}
 	free(store->parsed);
 	free(store->seen);
@@ -2409,13 +2617,15 @@ static int matches(const char *key, const char *value,
 {
 	if (strcmp(key, store->key))
 		return 0; /* not ours */
-	if (!store->value_regex)
+	if (store->fixed_value)
+		return !strcmp(store->fixed_value, value);
+	if (!store->value_pattern)
 		return 1; /* always matches */
-	if (store->value_regex == CONFIG_REGEX_NONE)
+	if (store->value_pattern == CONFIG_REGEX_NONE)
 		return 0; /* never matches */
 
 	return store->do_not_match ^
-		(value && !regexec(store->value_regex, value, 0, NULL, 0));
+		(value && !regexec(store->value_pattern, value, 0, NULL, 0));
 }
 
 static int store_aux_event(enum config_event_t type,
@@ -2503,7 +2713,7 @@ static struct strbuf store_create_section(const char *key,
 					  const struct config_store_data *store)
 {
 	const char *dot;
-	int i;
+	size_t i;
 	struct strbuf sb = STRBUF_INIT;
 
 	dot = memchr(key, '.', store->baselen);
@@ -2516,7 +2726,9 @@ static struct strbuf store_create_section(const char *key,
 		}
 		strbuf_addstr(&sb, "\"]\n");
 	} else {
-		strbuf_addf(&sb, "[%.*s]\n", store->baselen, key);
+		strbuf_addch(&sb, '[');
+		strbuf_add(&sb, key, store->baselen);
+		strbuf_addstr(&sb, "]\n");
 	}
 
 	return sb;
@@ -2539,7 +2751,6 @@ static ssize_t write_pair(int fd, const char *key, const char *value,
 {
 	int i;
 	ssize_t ret;
-	int length = strlen(key + store->baselen + 1);
 	const char *quote = "";
 	struct strbuf sb = STRBUF_INIT;
 
@@ -2558,8 +2769,7 @@ static ssize_t write_pair(int fd, const char *key, const char *value,
 	if (i && value[i - 1] == ' ')
 		quote = "\"";
 
-	strbuf_addf(&sb, "\t%.*s = %s",
-		    length, key + store->baselen + 1, quote);
+	strbuf_addf(&sb, "\t%s = %s", key + store->baselen + 1, quote);
 
 	for (i = 0; value[i]; i++)
 		switch (value[i]) {
@@ -2628,7 +2838,7 @@ static void maybe_remove_section(struct config_store_data *store,
 	begin = store->parsed[i].begin;
 
 	/*
-	 * Next, make sure that we are removing he last key(s) in the section,
+	 * Next, make sure that we are removing the last key(s) in the section,
 	 * and that there are no comments that are possibly about the current
 	 * section.
 	 */
@@ -2691,12 +2901,12 @@ void git_config_set(const char *key, const char *value)
 
 /*
  * If value==NULL, unset in (remove from) config,
- * if value_regex!=NULL, disregard key/value pairs where value does not match.
- * if value_regex==CONFIG_REGEX_NONE, do not match any existing values
+ * if value_pattern!=NULL, disregard key/value pairs where value does not match.
+ * if value_pattern==CONFIG_REGEX_NONE, do not match any existing values
  *     (only add a new one)
- * if multi_replace==0, nothing, or only one matching key/value is replaced,
- *     else all matching key/values (regardless how many) are removed,
- *     before the new pair is written.
+ * if flags contains the CONFIG_FLAGS_MULTI_REPLACE flag, all matching
+ *     key/values are removed before a single new pair is written. If the
+ *     flag is not present, then replace only the first match.
  *
  * Returns 0 on success.
  *
@@ -2716,8 +2926,8 @@ void git_config_set(const char *key, const char *value)
  */
 int git_config_set_multivar_in_file_gently(const char *config_filename,
 					   const char *key, const char *value,
-					   const char *value_regex,
-					   int multi_replace)
+					   const char *value_pattern,
+					   unsigned flags)
 {
 	int fd = -1, in_fd = -1;
 	int ret;
@@ -2734,7 +2944,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 	if (ret)
 		goto out_free;
 
-	store.multi_replace = multi_replace;
+	store.multi_replace = (flags & CONFIG_FLAGS_MULTI_REPLACE) != 0;
 
 	if (!config_filename)
 		config_filename = filename_buf = git_pathdup("config");
@@ -2777,22 +2987,24 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		int i, new_line = 0;
 		struct config_options opts;
 
-		if (value_regex == NULL)
-			store.value_regex = NULL;
-		else if (value_regex == CONFIG_REGEX_NONE)
-			store.value_regex = CONFIG_REGEX_NONE;
+		if (value_pattern == NULL)
+			store.value_pattern = NULL;
+		else if (value_pattern == CONFIG_REGEX_NONE)
+			store.value_pattern = CONFIG_REGEX_NONE;
+		else if (flags & CONFIG_FLAGS_FIXED_VALUE)
+			store.fixed_value = value_pattern;
 		else {
-			if (value_regex[0] == '!') {
+			if (value_pattern[0] == '!') {
 				store.do_not_match = 1;
-				value_regex++;
+				value_pattern++;
 			} else
 				store.do_not_match = 0;
 
-			store.value_regex = (regex_t*)xmalloc(sizeof(regex_t));
-			if (regcomp(store.value_regex, value_regex,
+			store.value_pattern = (regex_t*)xmalloc(sizeof(regex_t));
+			if (regcomp(store.value_pattern, value_pattern,
 					REG_EXTENDED)) {
-				error(_("invalid pattern: %s"), value_regex);
-				FREE_AND_NULL(store.value_regex);
+				error(_("invalid pattern: %s"), value_pattern);
+				FREE_AND_NULL(store.value_pattern);
 				ret = CONFIG_INVALID_PATTERN;
 				goto out_free;
 			}
@@ -2823,7 +3035,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 
 		/* if nothing to unset, or too many matches, error out */
 		if ((store.seen_nr == 0 && value == NULL) ||
-		    (store.seen_nr > 1 && multi_replace == 0)) {
+		    (store.seen_nr > 1 && !store.multi_replace)) {
 			ret = CONFIG_NOTHING_SET;
 			goto out_free;
 		}
@@ -2840,7 +3052,8 @@ int git_config_set_multivar_in_file_gently(const char *config_filename,
 		if (contents == MAP_FAILED) {
 			if (errno == ENODEV && S_ISDIR(st.st_mode))
 				errno = EISDIR;
-			error_errno(_("unable to mmap '%s'"), config_filename);
+			error_errno(_("unable to mmap '%s'%s"),
+					config_filename, mmap_os_err());
 			ret = CONFIG_INVALID_FILE;
 			contents = NULL;
 			goto out_free;
@@ -2962,10 +3175,10 @@ write_err_out:
 
 void git_config_set_multivar_in_file(const char *config_filename,
 				     const char *key, const char *value,
-				     const char *value_regex, int multi_replace)
+				     const char *value_pattern, unsigned flags)
 {
 	if (!git_config_set_multivar_in_file_gently(config_filename, key, value,
-						    value_regex, multi_replace))
+						    value_pattern, flags))
 		return;
 	if (value)
 		die(_("could not set '%s' to '%s'"), key, value);
@@ -2974,17 +3187,17 @@ 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_regex, int multi_replace)
+				   const char *value_pattern, unsigned flags)
 {
-	return git_config_set_multivar_in_file_gently(NULL, key, value, value_regex,
-						      multi_replace);
+	return git_config_set_multivar_in_file_gently(NULL, key, value, value_pattern,
+						      flags);
 }
 
 void git_config_set_multivar(const char *key, const char *value,
-			     const char *value_regex, int multi_replace)
+			     const char *value_pattern, unsigned flags)
 {
-	git_config_set_multivar_in_file(NULL, key, value, value_regex,
-					multi_replace);
+	git_config_set_multivar_in_file(NULL, key, value, value_pattern,
+					flags);
 }
 
 static int section_name_match (const char *buf, const char *name)
@@ -3093,7 +3306,7 @@ static int git_config_copy_or_rename_section_in_file(const char *config_filename
 	}
 
 	while (fgets(buf, sizeof(buf), config_file)) {
-		int i;
+		unsigned i;
 		int length;
 		int is_section = 0;
 		char *output = buf;
@@ -3232,7 +3445,7 @@ int config_error_nonbool(const char *var)
 
 int parse_config_key(const char *var,
 		     const char *section,
-		     const char **subsection, int *subsection_len,
+		     const char **subsection, size_t *subsection_len,
 		     const char **key)
 {
 	const char *dot;
@@ -3292,6 +3505,26 @@ const char *current_config_origin_type(void)
 	}
 }
 
+const char *config_scope_name(enum config_scope scope)
+{
+	switch (scope) {
+	case CONFIG_SCOPE_SYSTEM:
+		return "system";
+	case CONFIG_SCOPE_GLOBAL:
+		return "global";
+	case CONFIG_SCOPE_LOCAL:
+		return "local";
+	case CONFIG_SCOPE_WORKTREE:
+		return "worktree";
+	case CONFIG_SCOPE_COMMAND:
+		return "command";
+	case CONFIG_SCOPE_SUBMODULE:
+		return "submodule";
+	default:
+		return "unknown";
+	}
+}
+
 const char *current_config_name(void)
 {
 	const char *name;
@@ -3312,6 +3545,14 @@ enum config_scope current_config_scope(void)
 		return current_parsing_scope;
 }
 
+int current_config_line(void)
+{
+	if (current_config_kvi)
+		return current_config_kvi->linenr;
+	else
+		return cf->linenr;
+}
+
 int lookup_config(const char **mapping, int nr_mapping, const char *var)
 {
 	int i;
diff --git a/config.h b/config.h
index f0ed464004..a2200f3111 100644
--- a/config.h
+++ b/config.h
@@ -4,6 +4,22 @@
 #include "hashmap.h"
 #include "string-list.h"
 
+
+/**
+ * The config API gives callers a way to access Git configuration files
+ * (and files which have the same syntax).
+ *
+ * General Usage
+ * -------------
+ *
+ * Config files are parsed linearly, and each variable found is passed to a
+ * caller-provided callback function. The callback function is responsible
+ * for any actions to be taken on the config option, and is free to ignore
+ * some options. It is not uncommon for the configuration to be parsed
+ * several times during the run of a Git program, with different callbacks
+ * picking out different variables useful to themselves.
+ */
+
 struct object_id;
 
 /* git_config_parse_key() returns these negated: */
@@ -19,10 +35,22 @@ struct object_id;
 
 #define CONFIG_REGEX_NONE ((void *)1)
 
+enum config_scope {
+	CONFIG_SCOPE_UNKNOWN = 0,
+	CONFIG_SCOPE_SYSTEM,
+	CONFIG_SCOPE_GLOBAL,
+	CONFIG_SCOPE_LOCAL,
+	CONFIG_SCOPE_WORKTREE,
+	CONFIG_SCOPE_COMMAND,
+	CONFIG_SCOPE_SUBMODULE,
+};
+const char *config_scope_name(enum config_scope scope);
+
 struct git_config_source {
 	unsigned int use_stdin:1;
 	const char *file;
 	const char *blob;
+	enum config_scope scope;
 };
 
 enum config_origin_type {
@@ -71,9 +99,34 @@ struct config_options {
 	} error_action;
 };
 
+/**
+ * A config callback function takes three parameters:
+ *
+ * - the name of the parsed variable. This is in canonical "flat" form: the
+ *   section, subsection, and variable segments will be separated by dots,
+ *   and the section and variable segments will be all lowercase. E.g.,
+ *   `core.ignorecase`, `diff.SomeType.textconv`.
+ *
+ * - the value of the found variable, as a string. If the variable had no
+ *   value specified, the value will be NULL (typically this means it
+ *   should be interpreted as boolean true).
+ *
+ * - a void pointer passed in by the caller of the config API; this can
+ *   contain callback-specific data
+ *
+ * A config callback should return 0 for success, or -1 if the variable
+ * could not be parsed properly.
+ */
 typedef int (*config_fn_t)(const char *, const char *, void *);
+
 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`.
+ */
 int git_config_from_file(config_fn_t fn, const char *, void *);
+
 int git_config_from_file_with_options(config_fn_t fn, const char *,
 				      void *,
 				      const struct config_options *);
@@ -85,41 +138,186 @@ int git_config_from_mem(config_fn_t fn,
 int git_config_from_blob_oid(config_fn_t fn, const char *name,
 			     const struct object_id *oid, void *data);
 void git_config_push_parameter(const char *text);
+void git_config_push_env(const char *spec);
 int git_config_from_parameters(config_fn_t fn, void *data);
 void read_early_config(config_fn_t cb, void *data);
 void read_very_early_config(config_fn_t cb, void *data);
+
+/**
+ * Most programs will simply want to look up variables in all config files
+ * that Git knows about, using the normal precedence rules. To do this,
+ * call `git_config` with a callback function and void data pointer.
+ *
+ * `git_config` will read all config sources in order of increasing
+ * priority. Thus a callback should typically overwrite previously-seen
+ * entries with new ones (e.g., if both the user-wide `~/.gitconfig` and
+ * repo-specific `.git/config` contain `color.ui`, the config machinery
+ * 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).
+ */
 void git_config(config_fn_t fn, void *);
+
+/**
+ * Lets the caller examine config while adjusting some of the default
+ * behavior of `git_config`. It should almost never be used by "regular"
+ * Git code that is looking up configuration variables.
+ * It is intended for advanced callers like `git-config`, which are
+ * intentionally tweaking the normal config-lookup process.
+ * It takes two extra parameters:
+ *
+ * - `config_source`
+ * If this parameter is non-NULL, it specifies the source to parse for
+ * configuration, rather than looking in the usual files. See `struct
+ * git_config_source` in `config.h` for details. Regular `git_config` defaults
+ * to `NULL`.
+ *
+ * - `opts`
+ * Specify options to adjust the behavior of parsing config files. See `struct
+ * config_options` in `config.h` for details. As an example: regular `git_config`
+ * sets `opts.respect_includes` to `1` by default.
+ */
 int config_with_options(config_fn_t fn, void *,
 			struct git_config_source *config_source,
 			const struct config_options *opts);
+
+/**
+ * Value Parsing Helpers
+ * ---------------------
+ *
+ * The following helper functions aid in parsing string values
+ */
+
 int git_parse_ssize_t(const char *, ssize_t *);
 int git_parse_ulong(const char *, unsigned long *);
+
+/**
+ * Same as `git_config_bool`, except that it returns -1 on error rather
+ * than dying.
+ */
 int git_parse_maybe_bool(const char *);
+
+/**
+ * Parse the string to an integer, including unit factors. Dies on error;
+ * otherwise, returns the parsed result.
+ */
 int git_config_int(const char *, const char *);
+
 int64_t git_config_int64(const char *, const char *);
+
+/**
+ * Identical to `git_config_int`, but for unsigned longs.
+ */
 unsigned long git_config_ulong(const char *, const char *);
+
 ssize_t git_config_ssize_t(const char *, const char *);
+
+/**
+ * Same as `git_config_bool`, except that integers are returned as-is, and
+ * an `is_bool` flag is unset.
+ */
 int git_config_bool_or_int(const char *, const char *, int *);
+
+/**
+ * Parse a string into a boolean value, respecting keywords like "true" and
+ * "false". Integer values are converted into true/false values (when they
+ * are non-zero or zero, respectively). Other values cause a die(). If
+ * parsing is successful, the return value is the result.
+ */
 int git_config_bool(const char *, const char *);
+
+/**
+ * Allocates and copies the value string into the `dest` parameter; if no
+ * string is given, prints an error message and returns -1.
+ */
 int git_config_string(const char **, const char *, const char *);
+
+/**
+ * Similar to `git_config_string`, but expands `~` or `~user` into the
+ * user's home directory when found at the beginning of the path.
+ */
 int git_config_pathname(const char **, const char *, const char *);
+
 int git_config_expiry_date(timestamp_t *, const char *, const char *);
 int git_config_color(char *, const char *, const char *);
 int git_config_set_in_file_gently(const char *, const char *, const char *);
+
+/**
+ * write config values to a specific config file, takes a key/value pair as
+ * parameter.
+ */
 void git_config_set_in_file(const char *, const char *, const char *);
+
 int git_config_set_gently(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 **, int *);
+
+int git_config_parse_key(const char *, char **, size_t *);
 int git_config_key_is_valid(const char *key);
-int git_config_set_multivar_gently(const char *, const char *, const char *, int);
-void git_config_set_multivar(const char *, const char *, const char *, int);
-int git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, int);
-void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
+
+/*
+ * The following macros specify flag bits that alter the behavior
+ * of the git_config_set_multivar*() methods.
+ */
+
+/*
+ * When CONFIG_FLAGS_MULTI_REPLACE is specified, all matching key/values
+ * are removed before a single new pair is written. If the flag is not
+ * present, then set operations replace only the first match.
+ */
+#define CONFIG_FLAGS_MULTI_REPLACE (1 << 0)
+
+/*
+ * When CONFIG_FLAGS_FIXED_VALUE is specified, match key/value pairs
+ * by string comparison (not regex match) to the provided value_pattern
+ * parameter.
+ */
+#define CONFIG_FLAGS_FIXED_VALUE (1 << 1)
+
+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 git_config_set_multivar_in_file_gently(const char *, const char *, const char *, const char *, unsigned);
+
+/**
+ * takes four parameters:
+ *
+ * - the name of the file, as a string, to which key/value pairs will be written.
+ *
+ * - the name of key, as a string. This is in canonical "flat" form: the section,
+ *   subsection, and variable segments will be separated by dots, and the section
+ *   and variable segments will be all lowercase.
+ *   E.g., `core.ignorecase`, `diff.SomeType.textconv`.
+ *
+ * - the value of the variable, as a string. If value is equal to NULL, it will
+ *   remove the matching key from the config file.
+ *
+ * - the value regex, as a string. It will disregard key/value pairs where value
+ *   does not match.
+ *
+ * - a flags value with bits corresponding to the CONFIG_FLAG_* macros.
+ *
+ * It returns 0 on success.
+ */
+void git_config_set_multivar_in_file(const char *config_filename,
+				     const char *key,
+				     const char *value,
+				     const char *value_pattern,
+				     unsigned flags);
+
+/**
+ * rename or remove sections in the config file
+ * parameters `old_name` and `new_name`
+ * If NULL is passed through `new_name` parameter,
+ * the section will be removed from the config file.
+ */
 int git_config_rename_section(const char *, const char *);
+
 int git_config_rename_section_in_file(const char *, const char *, const char *);
 int git_config_copy_section(const char *, const char *);
 int git_config_copy_section_in_file(const char *, const char *, const char *);
-const char *git_etc_gitconfig(void);
 int git_env_bool(const char *, int);
 unsigned long git_env_ulong(const char *, unsigned long);
 int git_config_system(void);
@@ -128,20 +326,40 @@ int config_error_nonbool(const char *);
 #define config_error_nonbool(s) (config_error_nonbool(s), const_error())
 #endif
 
-int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
+char *git_system_config(void);
+void git_global_config(char **user, char **xdg);
 
-enum config_scope {
-	CONFIG_SCOPE_UNKNOWN = 0,
-	CONFIG_SCOPE_SYSTEM,
-	CONFIG_SCOPE_GLOBAL,
-	CONFIG_SCOPE_REPO,
-	CONFIG_SCOPE_CMDLINE,
-};
+int git_config_parse_parameter(const char *, config_fn_t fn, void *data);
 
 enum config_scope current_config_scope(void);
 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;
@@ -166,9 +384,36 @@ int git_config_include(const char *name, const char *value, void *data);
  */
 int parse_config_key(const char *var,
 		     const char *section,
-		     const char **subsection, int *subsection_len,
+		     const char **subsection, size_t *subsection_len,
 		     const char **key);
 
+/**
+ * Custom Configsets
+ * -----------------
+ *
+ * A `config_set` can be used to construct an in-memory cache for
+ * config-like files that the caller specifies (i.e., files like `.gitmodules`,
+ * `~/.gitconfig` etc.). For example,
+ *
+ * ----------------------------------------
+ * struct config_set gm_config;
+ * git_configset_init(&gm_config);
+ * int b;
+ * //we add config files to the config_set
+ * git_configset_add_file(&gm_config, ".gitmodules");
+ * git_configset_add_file(&gm_config, ".gitmodules_alt");
+ *
+ * if (!git_configset_get_bool(gm_config, "submodule.frotz.ignore", &b)) {
+ * //hack hack hack
+ * }
+ *
+ * when we are done with the configset:
+ * git_configset_clear(&gm_config);
+ * ----------------------------------------
+ *
+ * Configset API provides functions for the above mentioned work flow
+ */
+
 struct config_set_element {
 	struct hashmap_entry ent;
 	char *key;
@@ -197,18 +442,49 @@ struct config_set {
 	struct configset_list list;
 };
 
+/**
+ * Initializes the config_set `cs`.
+ */
 void git_configset_init(struct config_set *cs);
+
+/**
+ * Parses the file and adds the variable-value pairs to the `config_set`,
+ * dies if there is an error in parsing the file. Returns 0 on success, or
+ * -1 if the file does not exist or is inaccessible. The caller decides
+ * whether to free the incomplete configset or continue using it when
+ * the function returns -1.
+ */
 int git_configset_add_file(struct config_set *cs, const char *filename);
+
+/**
+ * Finds and returns the value list, sorted in order of increasing priority
+ * for the configuration variable `key` and config set `cs`. When the
+ * configuration variable `key` is not found, returns NULL. The caller
+ * should not free or modify the returned pointer, as it is owned by the cache.
+ */
 const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
+
+/**
+ * Clears `config_set` structure, removes all saved variable-value pairs.
+ */
 void git_configset_clear(struct config_set *cs);
 
 /*
  * These functions return 1 if not found, and 0 if found, leaving the found
  * value in the 'dest' pointer.
  */
+
+/*
+ * Finds the highest-priority value for the configuration variable `key`
+ * and config set `cs`, stores the pointer to it in `value` and returns 0.
+ * When the configuration variable `key` is not found, returns 1 without
+ * touching `value`. The caller should not free or modify `value`, as it
+ * is owned by the cache.
+ */
 int git_configset_get_value(struct config_set *cs, const char *key, const char **dest);
-int git_configset_get_string_const(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);
@@ -223,10 +499,10 @@ int repo_config_get_value(struct repository *repo,
 			  const char *key, const char **value);
 const struct string_list *repo_config_get_value_multi(struct repository *repo,
 						      const char *key);
-int repo_config_get_string_const(struct repository *repo,
-				 const char *key, const char **dest);
 int repo_config_get_string(struct repository *repo,
 			   const char *key, char **dest);
+int repo_config_get_string_tmp(struct repository *repo,
+			       const char *key, const char **dest);
 int repo_config_get_int(struct repository *repo,
 			const char *key, int *dest);
 int repo_config_get_ulong(struct repository *repo,
@@ -240,17 +516,95 @@ int repo_config_get_maybe_bool(struct repository *repo,
 int repo_config_get_pathname(struct repository *repo,
 			     const char *key, const char **dest);
 
+/**
+ * Querying For Specific Variables
+ * -------------------------------
+ *
+ * For programs wanting to query for specific variables in a non-callback
+ * manner, the config API provides two functions `git_config_get_value`
+ * and `git_config_get_value_multi`. They both read values from an internal
+ * cache generated previously from reading the config files.
+ */
+
+/**
+ * Finds the highest-priority value for the configuration variable `key`,
+ * stores the pointer to it in `value` and returns 0. When the
+ * configuration variable `key` is not found, returns 1 without touching
+ * `value`. The caller should not free or modify `value`, as it is owned
+ * by the cache.
+ */
 int git_config_get_value(const char *key, const char **value);
+
+/**
+ * Finds and returns the value list, sorted in order of increasing priority
+ * for the configuration variable `key`. When the configuration variable
+ * `key` is not found, returns NULL. The caller should not free or modify
+ * the returned pointer, as it is owned by the cache.
+ */
 const struct string_list *git_config_get_value_multi(const char *key);
+
+/**
+ * Resets and invalidates the config cache.
+ */
 void git_config_clear(void);
-int git_config_get_string_const(const char *key, const char **dest);
+
+/**
+ * Allocates and copies the retrieved string into the `dest` parameter for
+ * the configuration variable `key`; if NULL string is given, prints an
+ * error message and returns -1. When the configuration variable `key` is
+ * not found, returns 1 without touching `dest`.
+ */
 int git_config_get_string(const char *key, char **dest);
+
+/**
+ * Similar to `git_config_get_string`, but does not allocate any new
+ * memory; on success `dest` will point to memory owned by the config
+ * machinery, which could be invalidated if it is discarded and reloaded.
+ */
+int git_config_get_string_tmp(const char *key, const char **dest);
+
+/**
+ * Finds and parses the value to an integer for the configuration variable
+ * `key`. Dies on error; otherwise, stores the value of the parsed integer in
+ * `dest` and returns 0. When the configuration variable `key` is not found,
+ * returns 1 without touching `dest`.
+ */
 int git_config_get_int(const char *key, int *dest);
+
+/**
+ * Similar to `git_config_get_int` but for unsigned longs.
+ */
 int git_config_get_ulong(const char *key, unsigned long *dest);
+
+/**
+ * Finds and parses the value into a boolean value, for the configuration
+ * variable `key` respecting keywords like "true" and "false". Integer
+ * values are converted into true/false values (when they are non-zero or
+ * zero, respectively). Other values cause a die(). If parsing is successful,
+ * stores the value of the parsed result in `dest` and returns 0. When the
+ * configuration variable `key` is not found, returns 1 without touching
+ * `dest`.
+ */
 int git_config_get_bool(const char *key, int *dest);
+
+/**
+ * Similar to `git_config_get_bool`, except that integers are copied as-is,
+ * and `is_bool` flag is unset.
+ */
 int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest);
+
+/**
+ * Similar to `git_config_get_bool`, except that it returns -1 on error
+ * rather than dying.
+ */
 int git_config_get_maybe_bool(const char *key, int *dest);
+
+/**
+ * Similar to `git_config_get_string`, but expands `~` or `~user` into
+ * the user's home directory when found at the beginning of the path.
+ */
 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);
@@ -270,7 +624,19 @@ struct key_value_info {
 	enum config_scope scope;
 };
 
+/**
+ * First prints the error message specified by the caller in `err` and then
+ * dies printing the line number and the file name of the highest priority
+ * value for the configuration variable `key`.
+ */
 NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
+
+/**
+ * Helper function which formats the die error message according to the
+ * parameters entered. Used by `git_die_config()`. It can be used by callers
+ * handling `git_config_get_value_multi()` to print the correct error message
+ * for the desired value.
+ */
 NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
 
 #define LOOKUP_CONFIG(mapping, var) \
diff --git a/config.mak.dev b/config.mak.dev
index bf1f3fcdee..022fb58218 100644
--- a/config.mak.dev
+++ b/config.mak.dev
@@ -1,5 +1,6 @@
 ifeq ($(filter no-error,$(DEVOPTS)),)
 DEVELOPER_CFLAGS += -Werror
+SPARSE_FLAGS += -Wsparse-error
 endif
 ifneq ($(filter pedantic,$(DEVOPTS)),)
 DEVELOPER_CFLAGS += -pedantic
@@ -9,13 +10,13 @@ endif
 DEVELOPER_CFLAGS += -Wall
 DEVELOPER_CFLAGS += -Wdeclaration-after-statement
 DEVELOPER_CFLAGS += -Wformat-security
-DEVELOPER_CFLAGS += -Wno-format-zero-length
 DEVELOPER_CFLAGS += -Wold-style-definition
 DEVELOPER_CFLAGS += -Woverflow
 DEVELOPER_CFLAGS += -Wpointer-arith
 DEVELOPER_CFLAGS += -Wstrict-prototypes
 DEVELOPER_CFLAGS += -Wunused
 DEVELOPER_CFLAGS += -Wvla
+DEVELOPER_CFLAGS += -fno-common
 
 ifndef COMPILER_FEATURES
 COMPILER_FEATURES := $(shell ./detect-compiler $(CC))
@@ -46,3 +47,5 @@ ifeq ($(filter gcc5,$(COMPILER_FEATURES)),)
 DEVELOPER_CFLAGS += -Wno-uninitialized
 endif
 endif
+
+GIT_TEST_PERL_FATAL_WARNINGS = YesPlease
diff --git a/config.mak.uname b/config.mak.uname
index cc8efd95b1..76516aaa9a 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -58,6 +58,8 @@ ifeq ($(uname_S),Linux)
 	FREAD_READS_DIRECTORIES = UnfortunatelyYes
 	BASIC_CFLAGS += -DHAVE_SYSINFO
 	PROCFS_EXECUTABLE_PATH = /proc/self/exe
+	HAVE_PLATFORM_PROCINFO = YesPlease
+	COMPAT_OBJS += compat/linux/procinfo.o
 endif
 ifeq ($(uname_S),GNU/kFreeBSD)
 	HAVE_ALLOCA_H = YesPlease
@@ -124,6 +126,9 @@ ifeq ($(uname_S),Darwin)
 	ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 11 && echo 1),1)
 		HAVE_GETDELIM = YesPlease
 	endif
+	ifeq ($(shell test "`expr "$(uname_R)" : '\([0-9][0-9]*\)\.'`" -ge 20 && echo 1),1)
+		OPEN_RETURNS_EINTR = UnfortunatelyYes
+	endif
 	NO_MEMMEM = YesPlease
 	USE_ST_TIMESPEC = YesPlease
 	HAVE_DEV_TTY = YesPlease
@@ -133,8 +138,17 @@ ifeq ($(uname_S),Darwin)
 	HAVE_BSD_SYSCTL = YesPlease
 	FREAD_READS_DIRECTORIES = UnfortunatelyYes
 	HAVE_NS_GET_EXECUTABLE_PATH = YesPlease
-	BASIC_CFLAGS += -I/usr/local/include
-	BASIC_LDFLAGS += -L/usr/local/lib
+
+	# Workaround for `gettext` being keg-only and not even being linked via
+	# `brew link --force gettext`, should be obsolete as of
+	# https://github.com/Homebrew/homebrew-core/pull/53489
+	ifeq ($(shell test -d /usr/local/opt/gettext/ && echo y),y)
+		BASIC_CFLAGS += -I/usr/local/include -I/usr/local/opt/gettext/include
+		BASIC_LDFLAGS += -L/usr/local/lib -L/usr/local/opt/gettext/lib
+		ifeq ($(shell test -x /usr/local/opt/gettext/bin/msgfmt && echo y),y)
+			MSGFMT = /usr/local/opt/gettext/bin/msgfmt
+		endif
+	endif
 endif
 ifeq ($(uname_S),SunOS)
 	NEEDS_SOCKET = YesPlease
@@ -237,7 +251,6 @@ ifeq ($(uname_S),FreeBSD)
 	PYTHON_PATH = /usr/local/bin/python
 	PERL_PATH = /usr/local/bin/perl
 	HAVE_PATHS_H = YesPlease
-	GMTIME_UNRELIABLE_ERRORS = UnfortunatelyYes
 	HAVE_BSD_SYSCTL = YesPlease
 	HAVE_BSD_KERN_PROC_SYSCTL = YesPlease
 	PAGER_ENV = LESS=FRX LV=-c MORE=FRX
@@ -308,6 +321,7 @@ ifeq ($(uname_S),GNU)
 	NO_STRLCPY = YesPlease
 	HAVE_PATHS_H = YesPlease
 	LIBC_CONTAINS_LIBINTL = YesPlease
+	FREAD_READS_DIRECTORIES = UnfortunatelyYes
 endif
 ifeq ($(uname_S),IRIX)
 	NO_SETENV = YesPlease
@@ -412,6 +426,7 @@ ifeq ($(uname_S),Windows)
 	RUNTIME_PREFIX = YesPlease
 	HAVE_WPGMPTR = YesWeDo
 	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
+	USE_WIN32_IPC = YesPlease
 	USE_WIN32_MMAP = YesPlease
 	MMAP_PREVENTS_DELETE = UnfortunatelyYes
 	# USE_NED_ALLOCATOR = YesPlease
@@ -424,6 +439,11 @@ ifeq ($(uname_S),Windows)
 	NO_POSIX_GOODIES = UnfortunatelyYes
 	NATIVE_CRLF = YesPlease
 	DEFAULT_HELP_FORMAT = html
+ifeq (/mingw64,$(subst 32,64,$(prefix)))
+	# Move system config into top-level /etc/
+	ETC_GITCONFIG = ../etc/gitconfig
+	ETC_GITATTRIBUTES = ../etc/gitattributes
+endif
 
 	CC = compat/vcbuild/scripts/clink.pl
 	AR = compat/vcbuild/scripts/lib.pl
@@ -454,7 +474,6 @@ ifneq ($(USE_MSVC_CRTDBG),)
 	# Optionally enable memory leak reporting.
 	BASIC_CFLAGS += -DUSE_MSVC_CRTDBG
 endif
-	BASIC_CFLAGS += -DPROTECT_NTFS_DEFAULT=1
 	# Always give "-Zi" to the compiler and "-debug" to linker (even in
 	# release mode) to force a PDB to be generated (like RelWithDebInfo).
 	BASIC_CFLAGS += -Zi
@@ -533,11 +552,6 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
 	# removing the directory at OS releases J06.21 and L17.02.
 	# Default to the older rm until those two releases are deprecated.
 	RM = /bin/rm -f
-	# As detected by './configure'.
-	# Missdetected, hence commented out, see below.
-	#NO_CURL = YesPlease
-	# Added manually, see above.
-	NEEDS_SSL_WITH_CURL = YesPlease
 	NEEDS_CRYPTO_WITH_SSL = YesPlease
 	HAVE_DEV_TTY = YesPlease
 	HAVE_LIBCHARSET_H = YesPlease
@@ -571,10 +585,6 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
 	NO_MMAP = YesPlease
 	NO_POLL = YesPlease
 	NO_INTPTR_T = UnfortunatelyYes
-	# Bug report 10-120822-4477 submitted to HP NonStop development.
-	MKDIR_WO_TRAILING_SLASH = YesPlease
-	# RFE 10-120912-4693 submitted to HP NonStop development.
-	NO_SETITIMER = UnfortunatelyYes
 	SANE_TOOL_PATH = /usr/coreutils/bin:/usr/local/bin
 	SHELL_PATH = /usr/coreutils/bin/bash
 endif
@@ -598,6 +608,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	RUNTIME_PREFIX = YesPlease
 	HAVE_WPGMPTR = YesWeDo
 	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
+	USE_WIN32_IPC = YesPlease
 	USE_WIN32_MMAP = YesPlease
 	MMAP_PREVENTS_DELETE = UnfortunatelyYes
 	USE_NED_ALLOCATOR = YesPlease
@@ -608,6 +619,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 	ETAGS_TARGET = ETAGS
 	NO_POSIX_GOODIES = UnfortunatelyYes
 	DEFAULT_HELP_FORMAT = html
+	HAVE_PLATFORM_PROCINFO = YesPlease
 	BASIC_LDFLAGS += -municode
 	COMPAT_CFLAGS += -DNOGDI -Icompat -Icompat/win32
 	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
@@ -616,7 +628,7 @@ ifneq (,$(findstring MINGW,$(uname_S)))
 		compat/win32/path-utils.o \
 		compat/win32/pthread.o compat/win32/syslog.o \
 		compat/win32/dirent.o
-	BASIC_CFLAGS += -DWIN32 -DPROTECT_NTFS_DEFAULT=1
+	BASIC_CFLAGS += -DWIN32
 	EXTLIBS += -lws2_32
 	GITLIBS += git.res
 	PTHREAD_LIBS =
@@ -628,7 +640,6 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
 	prefix =
 	INSTALL = /bin/install
 	EXTLIBS += /mingw/lib/libz.a
-	NO_R_TO_GCC_LINKER = YesPlease
 	INTERNAL_QSORT = YesPlease
 	HAVE_LIBCHARSET_H = YesPlease
 	NO_GETTEXT = YesPlease
@@ -661,15 +672,18 @@ else
 			-fstack-protector-strong
 		EXTLIBS += -lntdll
 		INSTALL = /bin/install
-		NO_R_TO_GCC_LINKER = YesPlease
 		INTERNAL_QSORT = YesPlease
 		HAVE_LIBCHARSET_H = YesPlease
 		NO_GETTEXT =
 		USE_GETTEXT_SCHEME = fallthrough
-		USE_LIBPCRE= YesPlease
-		NO_LIBPCRE1_JIT = UnfortunatelyYes
+		USE_LIBPCRE = YesPlease
 		NO_CURL =
 		USE_NED_ALLOCATOR = YesPlease
+		ifeq (/mingw64,$(subst 32,64,$(prefix)))
+			# Move system config into top-level /etc/
+			ETC_GITCONFIG = ../etc/gitconfig
+			ETC_GITATTRIBUTES = ../etc/gitattributes
+		endif
 	else
 		COMPAT_CFLAGS += -D__USE_MINGW_ANSI_STDIO
 		NO_CURL = YesPlease
@@ -687,7 +701,6 @@ ifeq ($(uname_S),QNX)
 	NO_MKDTEMP = YesPlease
 	NO_NSEC = YesPlease
 	NO_PTHREADS = YesPlease
-	NO_R_TO_GCC_LINKER = YesPlease
 	NO_STRCASESTR = YesPlease
 	NO_STRLCPY = YesPlease
 endif
@@ -722,9 +735,9 @@ vcxproj:
 	 echo '</Project>') >git-remote-http/LinkOrCopyRemoteHttp.targets
 	git add -f git/LinkOrCopyBuiltins.targets git-remote-http/LinkOrCopyRemoteHttp.targets
 
-	# Add command-list.h
-	$(MAKE) MSVC=1 SKIP_VCPKG=1 prefix=/mingw64 command-list.h
-	git add -f command-list.h
+	# 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 scripts
 	rm -f perl/perl.mak
diff --git a/configure.ac b/configure.ac
index a43b476402..031e8d3fee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,7 +85,7 @@ AC_DEFUN([GIT_PARSE_WITH],
 
 # GIT_PARSE_WITH_SET_MAKE_VAR(WITHNAME, VAR, HELP_TEXT)
 # -----------------------------------------------------
-# Set VAR to the value specied by --with-WITHNAME.
+# Set VAR to the value specified by --with-WITHNAME.
 # No verification of arguments is performed, but warnings are issued
 # if either 'yes' or 'no' is specified.
 # HELP_TEXT is presented when --help is called.
@@ -252,16 +252,17 @@ GIT_PARSE_WITH([openssl]))
 # Define USE_LIBPCRE if you have and want to use libpcre. Various
 # commands such as log and grep offer runtime options to use
 # Perl-compatible regular expressions instead of standard or extended
-# POSIX regular expressions.
-#
-# USE_LIBPCRE is a synonym for USE_LIBPCRE2, define USE_LIBPCRE1
-# instead if you'd like to use the legacy version 1 of the PCRE
-# library. Support for version 1 will likely be removed in some future
-# release of Git, as upstream has all but abandoned it.
+# POSIX regular expressions. Only libpcre version 2 is supported.
 #
 # Define LIBPCREDIR=/foo/bar if your PCRE header and library files are in
 # /foo/bar/include and /foo/bar/lib directories.
 #
+
+AC_ARG_WITH(libpcre1,
+AS_HELP_STRING([--with-libpcre1],[DEPRECATED]),
+    AC_MSG_ERROR([support for --with-libpcre1 has been removed. Use --with-libpcre2!])
+    )
+
 AC_ARG_WITH(libpcre,
 AS_HELP_STRING([--with-libpcre],[synonym for --with-libpcre2]),
     if test "$withval" = "no"; then
@@ -277,22 +278,6 @@ AS_HELP_STRING([--with-libpcre],[synonym for --with-libpcre2]),
 	GIT_CONF_SUBST([LIBPCREDIR])
     fi)
 
-AC_ARG_WITH(libpcre1,
-AS_HELP_STRING([--with-libpcre1],[support Perl-compatible regexes via libpcre1 (default is NO)])
-AS_HELP_STRING([],           [ARG can be also prefix for libpcre library and headers]),
-    if test "$withval" = "no"; then
-	USE_LIBPCRE1=
-    elif test "$withval" = "yes"; then
-	USE_LIBPCRE1=YesPlease
-    else
-	USE_LIBPCRE1=YesPlease
-	LIBPCREDIR=$withval
-	AC_MSG_NOTICE([Setting LIBPCREDIR to $LIBPCREDIR])
-        dnl USE_LIBPCRE1 can still be modified below, so don't substitute
-        dnl it yet.
-	GIT_CONF_SUBST([LIBPCREDIR])
-    fi)
-
 AC_ARG_WITH(libpcre2,
 AS_HELP_STRING([--with-libpcre2],[support Perl-compatible regexes via libpcre2 (default is NO)])
 AS_HELP_STRING([],           [ARG can be also prefix for libpcre library and headers]),
@@ -300,10 +285,6 @@ AS_HELP_STRING([],           [ARG can be also prefix for libpcre library and hea
         AC_MSG_ERROR([Only supply one of --with-libpcre or its synonym --with-libpcre2!])
     fi
 
-    if test -n "$USE_LIBPCRE1"; then
-        AC_MSG_ERROR([Only supply one of --with-libpcre1 or --with-libpcre2!])
-    fi
-
     if test "$withval" = "no"; then
 	USE_LIBPCRE2=
     elif test "$withval" = "yes"; then
@@ -554,25 +535,9 @@ GIT_CONF_SUBST([NEEDS_SSL_WITH_CRYPTO])
 GIT_CONF_SUBST([NO_OPENSSL])
 
 #
-# Handle the USE_LIBPCRE1 and USE_LIBPCRE2 options potentially set
-# above.
+# Handle the USE_LIBPCRE options potentially set above.
 #
 
-if test -n "$USE_LIBPCRE1"; then
-
-GIT_STASH_FLAGS($LIBPCREDIR)
-
-AC_CHECK_LIB([pcre], [pcre_version],
-[USE_LIBPCRE1=YesPlease],
-[USE_LIBPCRE1=])
-
-GIT_UNSTASH_FLAGS($LIBPCREDIR)
-
-GIT_CONF_SUBST([USE_LIBPCRE1])
-
-fi
-
-
 if test -n "$USE_LIBPCRE2"; then
 
 GIT_STASH_FLAGS($LIBPCREDIR)
@@ -844,12 +809,61 @@ AC_MSG_CHECKING([for old iconv()])
 AC_COMPILE_IFELSE([OLDICONVTEST_SRC],
 	[AC_MSG_RESULT([no])],
 	[AC_MSG_RESULT([yes])
+	AC_DEFINE(HAVE_OLD_ICONV, 1)
 	OLD_ICONV=UnfortunatelyYes])
 
 GIT_UNSTASH_FLAGS($ICONVDIR)
 
 GIT_CONF_SUBST([OLD_ICONV])
 
+#
+# Define ICONV_OMITS_BOM if you are on a system which
+# iconv omits bom for utf-{16,32}
+if test -z "$NO_ICONV"; then
+AC_CACHE_CHECK([whether iconv omits bom for utf-16 and utf-32],
+ [ac_cv_iconv_omits_bom],
+[
+old_LIBS="$LIBS"
+if test -n "$NEEDS_LIBICONV"; then
+	LIBS="$LIBS -liconv"
+fi
+
+AC_RUN_IFELSE(
+	[AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
+	#include <iconv.h>
+	#ifdef HAVE_OLD_ICONV
+	typedef const char *iconv_ibp;
+	#else
+	typedef char *iconv_ibp;
+	#endif
+	],
+	[[
+	int v;
+	iconv_t conv;
+	char in[] = "a"; iconv_ibp pin = in;
+	char out[20] = ""; char *pout = out;
+	size_t isz = sizeof in;
+	size_t osz = sizeof out;
+
+	conv = iconv_open("UTF-16", "UTF-8");
+	iconv(conv, &pin, &isz, &pout, &osz);
+	iconv_close(conv);
+	v = (unsigned char)(out[0]) + (unsigned char)(out[1]);
+	return v != 0xfe + 0xff;
+	]])],
+	[ac_cv_iconv_omits_bom=no],
+	[ac_cv_iconv_omits_bom=yes])
+
+LIBS="$old_LIBS"
+])
+if test "x$ac_cv_iconv_omits_bom" = xyes; then
+	ICONV_OMITS_BOM=Yes
+else
+	ICONV_OMITS_BOM=
+fi
+GIT_CONF_SUBST([ICONV_OMITS_BOM])
+fi
+
 ## Checks for typedefs, structures, and compiler characteristics.
 AC_MSG_NOTICE([CHECKS for typedefs, structures, and compiler characteristics])
 #
diff --git a/connect.c b/connect.c
index da7daa2b68..aff13a270e 100644
--- a/connect.c
+++ b/connect.c
@@ -9,7 +9,7 @@
 #include "connect.h"
 #include "url.h"
 #include "string-list.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "transport.h"
 #include "strbuf.h"
 #include "version.h"
@@ -17,8 +17,8 @@
 #include "alias.h"
 
 static char *server_capabilities_v1;
-static struct argv_array server_capabilities_v2 = ARGV_ARRAY_INIT;
-static const char *parse_feature_value(const char *, const char *, int *);
+static struct strvec server_capabilities_v2 = STRVEC_INIT;
+static const char *next_server_feature_value(const char *feature, int *len, int *offset);
 
 static int check_ref(const char *name, unsigned int flags)
 {
@@ -70,9 +70,9 @@ int server_supports_v2(const char *c, int die_on_error)
 {
 	int i;
 
-	for (i = 0; i < server_capabilities_v2.argc; i++) {
+	for (i = 0; i < server_capabilities_v2.nr; i++) {
 		const char *out;
-		if (skip_prefix(server_capabilities_v2.argv[i], c, &out) &&
+		if (skip_prefix(server_capabilities_v2.v[i], c, &out) &&
 		    (!*out || *out == '='))
 			return 1;
 	}
@@ -83,14 +83,29 @@ int server_supports_v2(const char *c, int die_on_error)
 	return 0;
 }
 
+int server_feature_v2(const char *c, const char **v)
+{
+	int i;
+
+	for (i = 0; i < server_capabilities_v2.nr; i++) {
+		const char *out;
+		if (skip_prefix(server_capabilities_v2.v[i], c, &out) &&
+		    (*out == '=')) {
+			*v = out + 1;
+			return 1;
+		}
+	}
+	return 0;
+}
+
 int server_supports_feature(const char *c, const char *feature,
 			    int die_on_error)
 {
 	int i;
 
-	for (i = 0; i < server_capabilities_v2.argc; i++) {
+	for (i = 0; i < server_capabilities_v2.nr; i++) {
 		const char *out;
-		if (skip_prefix(server_capabilities_v2.argv[i], c, &out) &&
+		if (skip_prefix(server_capabilities_v2.v[i], c, &out) &&
 		    (!*out || *(out++) == '=')) {
 			if (parse_feature_request(out, feature))
 				return 1;
@@ -108,7 +123,7 @@ int server_supports_feature(const char *c, const char *feature,
 static void process_capabilities_v2(struct packet_reader *reader)
 {
 	while (packet_reader_read(reader) == PACKET_READ_NORMAL)
-		argv_array_push(&server_capabilities_v2, reader->line);
+		strvec_push(&server_capabilities_v2, reader->line);
 
 	if (reader->status != PACKET_READ_FLUSH)
 		die(_("expected flush after capabilities"));
@@ -127,6 +142,7 @@ enum protocol_version discover_version(struct packet_reader *reader)
 		die_initial_contact(0);
 	case PACKET_READ_FLUSH:
 	case PACKET_READ_DELIM:
+	case PACKET_READ_RESPONSE_END:
 		version = protocol_v0;
 		break;
 	case PACKET_READ_NORMAL:
@@ -148,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;
 }
 
@@ -180,17 +198,16 @@ reject:
 static void annotate_refs_with_symref_info(struct ref *ref)
 {
 	struct string_list symref = STRING_LIST_INIT_DUP;
-	const char *feature_list = server_capabilities_v1;
+	int offset = 0;
 
-	while (feature_list) {
+	while (1) {
 		int len;
 		const char *val;
 
-		val = parse_feature_value(feature_list, "symref", &len);
+		val = next_server_feature_value("symref", &len, &offset);
 		if (!val)
 			break;
 		parse_one_symref_info(&symref, val, len);
-		feature_list = val + 1;
 	}
 	string_list_sort(&symref);
 
@@ -204,27 +221,42 @@ static void annotate_refs_with_symref_info(struct ref *ref)
 	string_list_clear(&symref, 0);
 }
 
-static void process_capabilities(const char *line, int *len)
+static void process_capabilities(struct packet_reader *reader, int *linelen)
 {
+	const char *feat_val;
+	int feat_len;
+	const char *line = reader->line;
 	int nul_location = strlen(line);
-	if (nul_location == *len)
+	if (nul_location == *linelen)
 		return;
 	server_capabilities_v1 = xstrdup(line + nul_location + 1);
-	*len = nul_location;
+	*linelen = nul_location;
+
+	feat_val = server_feature_value("object-format", &feat_len);
+	if (feat_val) {
+		char *hash_name = xstrndup(feat_val, feat_len);
+		int hash_algo = hash_algo_by_name(hash_name);
+		if (hash_algo != GIT_HASH_UNKNOWN)
+			reader->hash_algo = &hash_algos[hash_algo];
+		free(hash_name);
+	} else {
+		reader->hash_algo = &hash_algos[GIT_HASH_SHA1];
+	}
 }
 
-static int process_dummy_ref(const char *line)
+static int process_dummy_ref(const struct packet_reader *reader)
 {
+	const char *line = reader->line;
 	struct object_id oid;
 	const char *name;
 
-	if (parse_oid_hex(line, &oid, &name))
+	if (parse_oid_hex_algop(line, &oid, &name, reader->hash_algo))
 		return 0;
 	if (*name != ' ')
 		return 0;
 	name++;
 
-	return oideq(&null_oid, &oid) && !strcmp(name, "capabilities^{}");
+	return oideq(null_oid(), &oid) && !strcmp(name, "capabilities^{}");
 }
 
 static void check_no_capabilities(const char *line, int len)
@@ -234,13 +266,15 @@ static void check_no_capabilities(const char *line, int len)
 			line + strlen(line));
 }
 
-static int process_ref(const char *line, int len, struct ref ***list,
-		       unsigned int flags, struct oid_array *extra_have)
+static int process_ref(const struct packet_reader *reader, int len,
+		       struct ref ***list, unsigned int flags,
+		       struct oid_array *extra_have)
 {
+	const char *line = reader->line;
 	struct object_id old_oid;
 	const char *name;
 
-	if (parse_oid_hex(line, &old_oid, &name))
+	if (parse_oid_hex_algop(line, &old_oid, &name, reader->hash_algo))
 		return 0;
 	if (*name != ' ')
 		return 0;
@@ -260,16 +294,17 @@ static int process_ref(const char *line, int len, struct ref ***list,
 	return 1;
 }
 
-static int process_shallow(const char *line, int len,
+static int process_shallow(const struct packet_reader *reader, int len,
 			   struct oid_array *shallow_points)
 {
+	const char *line = reader->line;
 	const char *arg;
 	struct object_id old_oid;
 
 	if (!skip_prefix(line, "shallow ", &arg))
 		return 0;
 
-	if (get_oid_hex(arg, &old_oid))
+	if (get_oid_hex_algop(arg, &old_oid, reader->hash_algo))
 		die(_("protocol error: expected shallow sha-1, got '%s'"), arg);
 	if (!shallow_points)
 		die(_("repository on the other end cannot be shallow"));
@@ -310,25 +345,26 @@ struct ref **get_remote_heads(struct packet_reader *reader,
 			state = EXPECTING_DONE;
 			break;
 		case PACKET_READ_DELIM:
+		case PACKET_READ_RESPONSE_END:
 			die(_("invalid packet"));
 		}
 
 		switch (state) {
 		case EXPECTING_FIRST_REF:
-			process_capabilities(reader->line, &len);
-			if (process_dummy_ref(reader->line)) {
+			process_capabilities(reader, &len);
+			if (process_dummy_ref(reader)) {
 				state = EXPECTING_SHALLOW;
 				break;
 			}
 			state = EXPECTING_REF;
 			/* fallthrough */
 		case EXPECTING_REF:
-			if (process_ref(reader->line, len, &list, flags, extra_have))
+			if (process_ref(reader, len, &list, flags, extra_have))
 				break;
 			state = EXPECTING_SHALLOW;
 			/* fallthrough */
 		case EXPECTING_SHALLOW:
-			if (process_shallow(reader->line, len, shallow_points))
+			if (process_shallow(reader, len, shallow_points))
 				break;
 			die(_("protocol error: unexpected '%s'"), reader->line);
 		case EXPECTING_DONE:
@@ -342,7 +378,8 @@ 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(const char *line, struct ref ***list)
+static int process_ref_v2(struct packet_reader *reader, struct ref ***list,
+			  char **unborn_head_target)
 {
 	int ret = 1;
 	int i = 0;
@@ -350,6 +387,7 @@ static int process_ref_v2(const char *line, struct ref ***list)
 	struct ref *ref;
 	struct string_list line_sections = STRING_LIST_INIT_DUP;
 	const char *end;
+	const char *line = reader->line;
 
 	/*
 	 * Ref lines have a number of fields which are space deliminated.  The
@@ -362,7 +400,26 @@ static int process_ref_v2(const char *line, struct ref ***list)
 		goto out;
 	}
 
-	if (parse_oid_hex(line_sections.items[i++].string, &old_oid, &end) ||
+	if (!strcmp("unborn", line_sections.items[i].string)) {
+		i++;
+		if (unborn_head_target &&
+		    !strcmp("HEAD", line_sections.items[i++].string)) {
+			/*
+			 * Look for the symref target (if any). If found,
+			 * return it to the caller.
+			 */
+			for (; i < line_sections.nr; i++) {
+				const char *arg = line_sections.items[i].string;
+
+				if (skip_prefix(arg, "symref-target:", &arg)) {
+					*unborn_head_target = xstrdup(arg);
+					break;
+				}
+			}
+		}
+		goto out;
+	}
+	if (parse_oid_hex_algop(line_sections.items[i++].string, &old_oid, &end, reader->hash_algo) ||
 	    *end) {
 		ret = 0;
 		goto out;
@@ -370,7 +427,7 @@ static int process_ref_v2(const char *line, struct ref ***list)
 
 	ref = alloc_ref(line_sections.items[i++].string);
 
-	oidcpy(&ref->old_oid, &old_oid);
+	memcpy(ref->old_oid.hash, old_oid.hash, reader->hash_algo->rawsz);
 	**list = ref;
 	*list = &ref->next;
 
@@ -383,7 +440,8 @@ static int process_ref_v2(const char *line, struct ref ***list)
 			struct object_id peeled_oid;
 			char *peeled_name;
 			struct ref *peeled;
-			if (parse_oid_hex(arg, &peeled_oid, &end) || *end) {
+			if (parse_oid_hex_algop(arg, &peeled_oid, &end,
+						reader->hash_algo) || *end) {
 				ret = 0;
 				goto out;
 			}
@@ -391,7 +449,8 @@ static int process_ref_v2(const char *line, struct ref ***list)
 			peeled_name = xstrfmt("%s^{}", ref->name);
 			peeled = alloc_ref(peeled_name);
 
-			oidcpy(&peeled->old_oid, &peeled_oid);
+			memcpy(peeled->old_oid.hash, peeled_oid.hash,
+			       reader->hash_algo->rawsz);
 			**list = peeled;
 			*list = &peeled->next;
 
@@ -404,12 +463,28 @@ out:
 	return ret;
 }
 
+void check_stateless_delimiter(int stateless_rpc,
+			      struct packet_reader *reader,
+			      const char *error)
+{
+	if (!stateless_rpc)
+		return; /* not in stateless mode, no delimiter expected */
+	if (packet_reader_read(reader) != PACKET_READ_RESPONSE_END)
+		die("%s", error);
+}
+
 struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
 			     struct ref **list, int for_push,
-			     const struct argv_array *ref_prefixes,
-			     const struct string_list *server_options)
+			     struct transport_ls_refs_options *transport_options,
+			     const struct string_list *server_options,
+			     int stateless_rpc)
 {
 	int i;
+	const char *hash_name;
+	struct strvec *ref_prefixes = transport_options ?
+		&transport_options->ref_prefixes : NULL;
+	char **unborn_head_target = transport_options ?
+		&transport_options->unborn_head_target : NULL;
 	*list = NULL;
 
 	if (server_supports_v2("ls-refs", 1))
@@ -418,6 +493,16 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
 	if (server_supports_v2("agent", 0))
 		packet_write_fmt(fd_out, "agent=%s", git_user_agent_sanitized());
 
+	if (server_feature_v2("object-format", &hash_name)) {
+		int hash_algo = hash_algo_by_name(hash_name);
+		if (hash_algo == GIT_HASH_UNKNOWN)
+			die(_("unknown object format '%s' specified by server"), hash_name);
+		reader->hash_algo = &hash_algos[hash_algo];
+		packet_write_fmt(fd_out, "object-format=%s", reader->hash_algo->name);
+	} else {
+		reader->hash_algo = &hash_algos[GIT_HASH_SHA1];
+	}
+
 	if (server_options && server_options->nr &&
 	    server_supports_v2("server-option", 1))
 		for (i = 0; i < server_options->nr; i++)
@@ -429,25 +514,30 @@ struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
 	if (!for_push)
 		packet_write_fmt(fd_out, "peel\n");
 	packet_write_fmt(fd_out, "symrefs\n");
-	for (i = 0; ref_prefixes && i < ref_prefixes->argc; i++) {
+	if (server_supports_feature("ls-refs", "unborn", 0))
+		packet_write_fmt(fd_out, "unborn\n");
+	for (i = 0; ref_prefixes && i < ref_prefixes->nr; i++) {
 		packet_write_fmt(fd_out, "ref-prefix %s\n",
-				 ref_prefixes->argv[i]);
+				 ref_prefixes->v[i]);
 	}
 	packet_flush(fd_out);
 
 	/* Process response from server */
 	while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
-		if (!process_ref_v2(reader->line, &list))
+		if (!process_ref_v2(reader, &list, unborn_head_target))
 			die(_("invalid ls-refs response: %s"), reader->line);
 	}
 
 	if (reader->status != PACKET_READ_FLUSH)
 		die(_("expected flush after ref listing"));
 
+	check_stateless_delimiter(stateless_rpc, reader,
+				  _("expected response end packet after ref listing"));
+
 	return list;
 }
 
-static const char *parse_feature_value(const char *feature_list, const char *feature, int *lenp)
+const char *parse_feature_value(const char *feature_list, const char *feature, int *lenp, int *offset)
 {
 	int len;
 
@@ -455,6 +545,8 @@ static const char *parse_feature_value(const char *feature_list, const char *fea
 		return NULL;
 
 	len = strlen(feature);
+	if (offset)
+		feature_list += *offset;
 	while (*feature_list) {
 		const char *found = strstr(feature_list, feature);
 		if (!found)
@@ -469,9 +561,14 @@ static const char *parse_feature_value(const char *feature_list, const char *fea
 			}
 			/* feature with a value (e.g., "agent=git/1.2.3") */
 			else if (*value == '=') {
+				int end;
+
 				value++;
+				end = strcspn(value, " \t\n");
 				if (lenp)
-					*lenp = strcspn(value, " \t\n");
+					*lenp = end;
+				if (offset)
+					*offset = value + end - feature_list;
 				return value;
 			}
 			/*
@@ -484,14 +581,41 @@ static const char *parse_feature_value(const char *feature_list, const char *fea
 	return NULL;
 }
 
+int server_supports_hash(const char *desired, int *feature_supported)
+{
+	int offset = 0;
+	int len;
+	const char *hash;
+
+	hash = next_server_feature_value("object-format", &len, &offset);
+	if (feature_supported)
+		*feature_supported = !!hash;
+	if (!hash) {
+		hash = hash_algos[GIT_HASH_SHA1].name;
+		len = strlen(hash);
+	}
+	while (hash) {
+		if (!xstrncmpz(desired, hash, len))
+			return 1;
+
+		hash = next_server_feature_value("object-format", &len, &offset);
+	}
+	return 0;
+}
+
 int parse_feature_request(const char *feature_list, const char *feature)
 {
-	return !!parse_feature_value(feature_list, feature, NULL);
+	return !!parse_feature_value(feature_list, feature, NULL, NULL);
+}
+
+static const char *next_server_feature_value(const char *feature, int *len, int *offset)
+{
+	return parse_feature_value(server_capabilities_v1, feature, len, offset);
 }
 
 const char *server_feature_value(const char *feature, int *len)
 {
-	return parse_feature_value(server_capabilities_v1, feature, len);
+	return parse_feature_value(server_capabilities_v1, feature, len, NULL);
 }
 
 int server_supports(const char *feature)
@@ -511,7 +635,7 @@ int url_is_local_not_ssh(const char *url)
 	const char *colon = strchr(url, ':');
 	const char *slash = strchr(url, '/');
 	return !colon || (slash && slash < colon) ||
-		has_dos_drive_prefix(url);
+		(has_dos_drive_prefix(url) && is_valid_path(url));
 }
 
 static const char *prot_name(enum protocol protocol)
@@ -848,9 +972,9 @@ static struct child_process *git_proxy_connect(int fd[2], char *host)
 
 	proxy = xmalloc(sizeof(*proxy));
 	child_process_init(proxy);
-	argv_array_push(&proxy->args, git_proxy_command);
-	argv_array_push(&proxy->args, host);
-	argv_array_push(&proxy->args, port);
+	strvec_push(&proxy->args, git_proxy_command);
+	strvec_push(&proxy->args, host);
+	strvec_push(&proxy->args, port);
 	proxy->in = -1;
 	proxy->out = -1;
 	if (start_command(proxy))
@@ -956,7 +1080,7 @@ static const char *get_ssh_command(void)
 	if ((ssh = getenv("GIT_SSH_COMMAND")))
 		return ssh;
 
-	if (!git_config_get_string_const("core.sshcommand", &ssh))
+	if (!git_config_get_string_tmp("core.sshcommand", &ssh))
 		return ssh;
 
 	return NULL;
@@ -975,7 +1099,7 @@ static void override_ssh_variant(enum ssh_variant *ssh_variant)
 {
 	const char *variant = getenv("GIT_SSH_VARIANT");
 
-	if (!variant && git_config_get_string_const("ssh.variant", &variant))
+	if (!variant && git_config_get_string_tmp("ssh.variant", &variant))
 		return;
 
 	if (!strcmp(variant, "auto"))
@@ -1064,6 +1188,8 @@ static struct child_process *git_connect_git(int fd[2], char *hostandport,
 		target_host = xstrdup(hostandport);
 
 	transport_check_allowed("git");
+	if (strchr(target_host, '\n') || strchr(path, '\n'))
+		die(_("newline is forbidden in git:// hosts and repo paths"));
 
 	/*
 	 * These underlying connection commands die() if they
@@ -1103,16 +1229,16 @@ static struct child_process *git_connect_git(int fd[2], char *hostandport,
  * Append the appropriate environment variables to `env` and options to
  * `args` for running ssh in Git's SSH-tunneled transport.
  */
-static void push_ssh_options(struct argv_array *args, struct argv_array *env,
+static void push_ssh_options(struct strvec *args, struct strvec *env,
 			     enum ssh_variant variant, const char *port,
 			     enum protocol_version version, int flags)
 {
 	if (variant == VARIANT_SSH &&
 	    version > 0) {
-		argv_array_push(args, "-o");
-		argv_array_push(args, "SendEnv=" GIT_PROTOCOL_ENVIRONMENT);
-		argv_array_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=version=%d",
-				 version);
+		strvec_push(args, "-o");
+		strvec_push(args, "SendEnv=" GIT_PROTOCOL_ENVIRONMENT);
+		strvec_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=version=%d",
+			     version);
 	}
 
 	if (flags & CONNECT_IPV4) {
@@ -1125,7 +1251,7 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env,
 		case VARIANT_PLINK:
 		case VARIANT_PUTTY:
 		case VARIANT_TORTOISEPLINK:
-			argv_array_push(args, "-4");
+			strvec_push(args, "-4");
 		}
 	} else if (flags & CONNECT_IPV6) {
 		switch (variant) {
@@ -1137,12 +1263,12 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env,
 		case VARIANT_PLINK:
 		case VARIANT_PUTTY:
 		case VARIANT_TORTOISEPLINK:
-			argv_array_push(args, "-6");
+			strvec_push(args, "-6");
 		}
 	}
 
 	if (variant == VARIANT_TORTOISEPLINK)
-		argv_array_push(args, "-batch");
+		strvec_push(args, "-batch");
 
 	if (port) {
 		switch (variant) {
@@ -1151,15 +1277,15 @@ static void push_ssh_options(struct argv_array *args, struct argv_array *env,
 		case VARIANT_SIMPLE:
 			die(_("ssh variant 'simple' does not support setting port"));
 		case VARIANT_SSH:
-			argv_array_push(args, "-p");
+			strvec_push(args, "-p");
 			break;
 		case VARIANT_PLINK:
 		case VARIANT_PUTTY:
 		case VARIANT_TORTOISEPLINK:
-			argv_array_push(args, "-P");
+			strvec_push(args, "-P");
 		}
 
-		argv_array_push(args, port);
+		strvec_push(args, port);
 	}
 }
 
@@ -1197,18 +1323,18 @@ static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
 		detect.use_shell = conn->use_shell;
 		detect.no_stdin = detect.no_stdout = detect.no_stderr = 1;
 
-		argv_array_push(&detect.args, ssh);
-		argv_array_push(&detect.args, "-G");
+		strvec_push(&detect.args, ssh);
+		strvec_push(&detect.args, "-G");
 		push_ssh_options(&detect.args, &detect.env_array,
 				 VARIANT_SSH, port, version, flags);
-		argv_array_push(&detect.args, ssh_host);
+		strvec_push(&detect.args, ssh_host);
 
 		variant = run_command(&detect) ? VARIANT_SIMPLE : VARIANT_SSH;
 	}
 
-	argv_array_push(&conn->args, ssh);
+	strvec_push(&conn->args, ssh);
 	push_ssh_options(&conn->args, &conn->env_array, variant, port, version, flags);
-	argv_array_push(&conn->args, ssh_host);
+	strvec_push(&conn->args, ssh_host);
 }
 
 /*
@@ -1269,7 +1395,7 @@ struct child_process *git_connect(int fd[2], const char *url,
 
 		/* remove repo-local variables from the environment */
 		for (var = local_repo_env; *var; var++)
-			argv_array_push(&conn->env_array, *var);
+			strvec_push(&conn->env_array, *var);
 
 		conn->use_shell = 1;
 		conn->in = conn->out = -1;
@@ -1301,11 +1427,12 @@ struct child_process *git_connect(int fd[2], const char *url,
 			transport_check_allowed("file");
 			conn->trace2_child_class = "transport/file";
 			if (version > 0) {
-				argv_array_pushf(&conn->env_array, GIT_PROTOCOL_ENVIRONMENT "=version=%d",
-						 version);
+				strvec_pushf(&conn->env_array,
+					     GIT_PROTOCOL_ENVIRONMENT "=version=%d",
+					     version);
 			}
 		}
-		argv_array_push(&conn->args, cmd.buf);
+		strvec_push(&conn->args, cmd.buf);
 
 		if (start_command(conn))
 			die(_("unable to fork"));
diff --git a/connect.h b/connect.h
index 5f2382e018..c53586e929 100644
--- a/connect.h
+++ b/connect.h
@@ -18,8 +18,15 @@ int url_is_local_not_ssh(const char *url);
 struct packet_reader;
 enum protocol_version discover_version(struct packet_reader *reader);
 
+int server_supports_hash(const char *desired, int *feature_supported);
+const char *parse_feature_value(const char *feature_list, const char *feature, int *lenp, int *offset);
 int server_supports_v2(const char *c, int die_on_error);
+int server_feature_v2(const char *c, const char **v);
 int server_supports_feature(const char *c, const char *feature,
 			    int die_on_error);
 
+void check_stateless_delimiter(int stateless_rpc,
+			       struct packet_reader *reader,
+			       const char *error);
+
 #endif
diff --git a/connected.c b/connected.c
index 36c4e5dedb..b5f9523a5f 100644
--- a/connected.c
+++ b/connected.c
@@ -22,14 +22,13 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 		    struct check_connected_options *opt)
 {
 	struct child_process rev_list = CHILD_PROCESS_INIT;
+	FILE *rev_list_in;
 	struct check_connected_options defaults = CHECK_CONNECTED_INIT;
-	char commit[GIT_MAX_HEXSZ + 1];
 	struct object_id oid;
 	int err = 0;
 	struct packed_git *new_pack = NULL;
 	struct transport *transport;
 	size_t base_len;
-	const unsigned hexsz = the_hash_algo->hexsz;
 
 	if (!opt)
 		opt = &defaults;
@@ -43,49 +42,71 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 
 	if (transport && transport->smart_options &&
 	    transport->smart_options->self_contained_and_connected &&
-	    transport->pack_lockfile &&
-	    strip_suffix(transport->pack_lockfile, ".keep", &base_len)) {
+	    transport->pack_lockfiles.nr == 1 &&
+	    strip_suffix(transport->pack_lockfiles.items[0].string,
+			 ".keep", &base_len)) {
 		struct strbuf idx_file = STRBUF_INIT;
-		strbuf_add(&idx_file, transport->pack_lockfile, base_len);
+		strbuf_add(&idx_file, transport->pack_lockfiles.items[0].string,
+			   base_len);
 		strbuf_addstr(&idx_file, ".idx");
 		new_pack = add_packed_git(idx_file.buf, idx_file.len, 1);
 		strbuf_release(&idx_file);
 	}
 
-	if (opt->check_refs_only) {
+	if (has_promisor_remote()) {
 		/*
 		 * For partial clones, we don't want to have to do a regular
 		 * connectivity check because we have to enumerate and exclude
 		 * all promisor objects (slow), and then the connectivity check
 		 * itself becomes a no-op because in a partial clone every
 		 * object is a promisor object. Instead, just make sure we
-		 * received the objects pointed to by each wanted ref.
+		 * received, in a promisor packfile, the objects pointed to by
+		 * each wanted ref.
+		 *
+		 * Before checking for promisor packs, be sure we have the
+		 * latest pack-files loaded into memory.
 		 */
+		reprepare_packed_git(the_repository);
 		do {
-			if (!repo_has_object_file(the_repository, &oid))
-				return 1;
+			struct packed_git *p;
+
+			for (p = get_all_packs(the_repository); p; p = p->next) {
+				if (!p->pack_promisor)
+					continue;
+				if (find_pack_entry_one(oid.hash, p))
+					goto promisor_pack_found;
+			}
+			/*
+			 * Fallback to rev-list with oid and the rest of the
+			 * object IDs provided by fn.
+			 */
+			goto no_promisor_pack_found;
+promisor_pack_found:
+			;
 		} while (!fn(cb_data, &oid));
 		return 0;
 	}
 
+no_promisor_pack_found:
 	if (opt->shallow_file) {
-		argv_array_push(&rev_list.args, "--shallow-file");
-		argv_array_push(&rev_list.args, opt->shallow_file);
+		strvec_push(&rev_list.args, "--shallow-file");
+		strvec_push(&rev_list.args, opt->shallow_file);
 	}
-	argv_array_push(&rev_list.args,"rev-list");
-	argv_array_push(&rev_list.args, "--objects");
-	argv_array_push(&rev_list.args, "--stdin");
+	strvec_push(&rev_list.args,"rev-list");
+	strvec_push(&rev_list.args, "--objects");
+	strvec_push(&rev_list.args, "--stdin");
 	if (has_promisor_remote())
-		argv_array_push(&rev_list.args, "--exclude-promisor-objects");
+		strvec_push(&rev_list.args, "--exclude-promisor-objects");
 	if (!opt->is_deepening_fetch) {
-		argv_array_push(&rev_list.args, "--not");
-		argv_array_push(&rev_list.args, "--all");
+		strvec_push(&rev_list.args, "--not");
+		strvec_push(&rev_list.args, "--all");
 	}
-	argv_array_push(&rev_list.args, "--quiet");
-	argv_array_push(&rev_list.args, "--alternate-refs");
+	strvec_push(&rev_list.args, "--quiet");
+	strvec_push(&rev_list.args, "--alternate-refs");
 	if (opt->progress)
-		argv_array_pushf(&rev_list.args, "--progress=%s",
-				 _("Checking connectivity"));
+		strvec_pushf(&rev_list.args, "--progress=%s",
+			     _("Checking connectivity"));
+	strvec_push(&rev_list.args, "--unsorted-input");
 
 	rev_list.git_cmd = 1;
 	rev_list.env = opt->env;
@@ -101,7 +122,8 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 
 	sigchain_push(SIGPIPE, SIG_IGN);
 
-	commit[hexsz] = '\n';
+	rev_list_in = xfdopen(rev_list.in, "w");
+
 	do {
 		/*
 		 * If index-pack already checked that:
@@ -114,16 +136,17 @@ int check_connected(oid_iterate_fn fn, void *cb_data,
 		if (new_pack && find_pack_entry_one(oid.hash, new_pack))
 			continue;
 
-		memcpy(commit, oid_to_hex(&oid), hexsz);
-		if (write_in_full(rev_list.in, commit, hexsz + 1) < 0) {
-			if (errno != EPIPE && errno != EINVAL)
-				error_errno(_("failed write to rev-list"));
-			err = -1;
+		if (fprintf(rev_list_in, "%s\n", oid_to_hex(&oid)) < 0)
 			break;
-		}
 	} while (!fn(cb_data, &oid));
 
-	if (close(rev_list.in))
+	if (ferror(rev_list_in) || fflush(rev_list_in)) {
+		if (errno != EPIPE && errno != EINVAL)
+			error_errno(_("failed write to rev-list"));
+		err = -1;
+	}
+
+	if (fclose(rev_list_in))
 		err = error_errno(_("failed to close rev-list's stdin"));
 
 	sigchain_pop(SIGPIPE);
diff --git a/connected.h b/connected.h
index ce2e7d8f2e..8d5a6b3ad6 100644
--- a/connected.h
+++ b/connected.h
@@ -46,14 +46,6 @@ struct check_connected_options {
 	 * during a fetch.
 	 */
 	unsigned is_deepening_fetch : 1;
-
-	/*
-	 * If non-zero, only check the top-level objects referenced by the
-	 * wanted refs (passed in as cb_data). This is useful for partial
-	 * clones, where enumerating and excluding all promisor objects is very
-	 * slow and the commit-walk itself becomes a no-op.
-	 */
-	unsigned check_refs_only : 1;
 };
 
 #define CHECK_CONNECTED_INIT { 0 }
diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
new file mode 100644
index 0000000000..171b4124af
--- /dev/null
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -0,0 +1,1039 @@
+#
+#	Copyright (c) 2020 Sibi Siddharthan
+#
+
+#[[
+
+Instructions how to use this in Visual Studio:
+
+Open the worktree as a folder. Visual Studio 2019 and later will detect
+the CMake configuration automatically and set everything up for you,
+ready to build. You can then run the tests in `t/` via a regular Git Bash.
+
+Note: Visual Studio also has the option of opening `CMakeLists.txt`
+directly; Using this option, Visual Studio will not find the source code,
+though, therefore the `File>Open>Folder...` option is preferred.
+
+Instructions to run CMake manually:
+
+    mkdir -p contrib/buildsystems/out
+    cd contrib/buildsystems/out
+    cmake ../ -DCMAKE_BUILD_TYPE=Release
+
+This will build the git binaries in contrib/buildsystems/out
+directory (our top-level .gitignore file knows to ignore contents of
+this directory).
+
+Possible build configurations(-DCMAKE_BUILD_TYPE) with corresponding
+compiler flags
+Debug : -g
+Release: -O3
+RelWithDebInfo : -O2 -g
+MinSizeRel : -Os
+empty(default) :
+
+NOTE: -DCMAKE_BUILD_TYPE is optional. For multi-config generators like Visual Studio
+this option is ignored
+
+This process generates a Makefile(Linux/*BSD/MacOS) , Visual Studio solution(Windows) by default.
+Run `make` to build Git on Linux/*BSD/MacOS.
+Open git.sln on Windows and build Git.
+
+NOTE: By default CMake uses Makefile as the build tool on Linux and Visual Studio in Windows,
+to use another tool say `ninja` add this to the command line when configuring.
+`-G Ninja`
+
+NOTE: By default CMake will install vcpkg locally to your source tree on configuration,
+to avoid this, add `-DNO_VCPKG=TRUE` to the command line when configuring.
+
+]]
+cmake_minimum_required(VERSION 3.14)
+
+#set the source directory to root of git
+set(CMAKE_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../..)
+
+option(USE_VCPKG "Whether or not to use vcpkg for obtaining dependencies.  Only applicable to Windows platforms" ON)
+if(NOT WIN32)
+	set(USE_VCPKG OFF CACHE BOOL FORCE)
+endif()
+
+if(NOT DEFINED CMAKE_EXPORT_COMPILE_COMMANDS)
+	set(CMAKE_EXPORT_COMPILE_COMMANDS TRUE)
+endif()
+
+if(USE_VCPKG)
+	set(VCPKG_DIR "${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg")
+	if(NOT EXISTS ${VCPKG_DIR})
+		message("Initializing vcpkg and building the Git's dependencies (this will take a while...)")
+		execute_process(COMMAND ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg_install.bat)
+	endif()
+	list(APPEND CMAKE_PREFIX_PATH "${VCPKG_DIR}/installed/x64-windows")
+
+	# In the vcpkg edition, we need this to be able to link to libcurl
+	set(CURL_NO_CURL_CMAKE ON)
+
+	# Copy the necessary vcpkg DLLs (like iconv) to the install dir
+	set(X_VCPKG_APPLOCAL_DEPS_INSTALL ON)
+	set(CMAKE_TOOLCHAIN_FILE ${VCPKG_DIR}/scripts/buildsystems/vcpkg.cmake CACHE STRING "Vcpkg toolchain file")
+endif()
+
+find_program(SH_EXE sh PATHS "C:/Program Files/Git/bin")
+if(NOT SH_EXE)
+	message(FATAL_ERROR "sh: shell interpreter was not found in your path, please install one."
+			"On Windows, you can get it as part of 'Git for Windows' install at https://gitforwindows.org/")
+endif()
+
+#Create GIT-VERSION-FILE using GIT-VERSION-GEN
+if(NOT EXISTS ${CMAKE_SOURCE_DIR}/GIT-VERSION-FILE)
+	message("Generating GIT-VERSION-FILE")
+	execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/GIT-VERSION-GEN
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+endif()
+
+#Parse GIT-VERSION-FILE to get the version
+file(STRINGS ${CMAKE_SOURCE_DIR}/GIT-VERSION-FILE git_version REGEX "GIT_VERSION = (.*)")
+string(REPLACE "GIT_VERSION = " "" git_version ${git_version})
+string(FIND ${git_version} "GIT" location)
+if(location EQUAL -1)
+	string(REGEX MATCH "[0-9]*\\.[0-9]*\\.[0-9]*" git_version ${git_version})
+else()
+	string(REGEX MATCH "[0-9]*\\.[0-9]*" git_version ${git_version})
+	string(APPEND git_version ".0") #for building from a snapshot
+endif()
+
+project(git
+	VERSION ${git_version}
+	LANGUAGES C)
+
+
+#TODO gitk git-gui gitweb
+#TODO Enable NLS on windows natively
+#TODO Add pcre support
+
+#macros for parsing the Makefile for sources and scripts
+macro(parse_makefile_for_sources list_var regex)
+	file(STRINGS ${CMAKE_SOURCE_DIR}/Makefile ${list_var} REGEX "^${regex} \\+=(.*)")
+	string(REPLACE "${regex} +=" "" ${list_var} ${${list_var}})
+	string(REPLACE "$(COMPAT_OBJS)" "" ${list_var} ${${list_var}}) #remove "$(COMPAT_OBJS)" This is only for libgit.
+	string(STRIP ${${list_var}} ${list_var}) #remove trailing/leading whitespaces
+	string(REPLACE ".o" ".c;" ${list_var} ${${list_var}}) #change .o to .c, ; is for converting the string into a list
+	list(TRANSFORM ${list_var} STRIP) #remove trailing/leading whitespaces for each element in list
+	list(REMOVE_ITEM ${list_var} "") #remove empty list elements
+endmacro()
+
+macro(parse_makefile_for_scripts list_var regex lang)
+	file(STRINGS ${CMAKE_SOURCE_DIR}/Makefile ${list_var} REGEX "^${regex} \\+=(.*)")
+	string(REPLACE "${regex} +=" "" ${list_var} ${${list_var}})
+	string(STRIP ${${list_var}} ${list_var}) #remove trailing/leading whitespaces
+	string(REPLACE " " ";" ${list_var} ${${list_var}}) #convert string to a list
+	if(NOT ${lang}) #exclude for SCRIPT_LIB
+		list(TRANSFORM ${list_var} REPLACE "${lang}" "") #do the replacement
+	endif()
+endmacro()
+
+macro(parse_makefile_for_executables list_var regex)
+	file(STRINGS ${CMAKE_SOURCE_DIR}/Makefile ${list_var} REGEX "^${regex} \\+= git-(.*)")
+	string(REPLACE "${regex} +=" "" ${list_var} ${${list_var}})
+	string(STRIP ${${list_var}} ${list_var}) #remove trailing/leading whitespaces
+	string(REPLACE "git-" "" ${list_var} ${${list_var}}) #strip `git-` prefix
+	string(REPLACE "\$X" ";" ${list_var} ${${list_var}}) #strip $X, ; is for converting the string into a list
+	list(TRANSFORM ${list_var} STRIP) #remove trailing/leading whitespaces for each element in list
+	list(REMOVE_ITEM ${list_var} "") #remove empty list elements
+endmacro()
+
+include(CheckTypeSize)
+include(CheckCSourceRuns)
+include(CheckCSourceCompiles)
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+include(CheckSymbolExists)
+include(CheckStructHasMember)
+include(CTest)
+
+find_package(ZLIB REQUIRED)
+find_package(CURL)
+find_package(EXPAT)
+find_package(Iconv)
+
+#Don't use libintl on Windows Visual Studio and Clang builds
+if(NOT (WIN32 AND (CMAKE_C_COMPILER_ID STREQUAL "MSVC" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")))
+	find_package(Intl)
+endif()
+
+if(NOT Intl_FOUND)
+	add_compile_definitions(NO_GETTEXT)
+	if(NOT Iconv_FOUND)
+		add_compile_definitions(NO_ICONV)
+	endif()
+endif()
+
+include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS})
+if(CURL_FOUND)
+	include_directories(SYSTEM ${CURL_INCLUDE_DIRS})
+endif()
+if(EXPAT_FOUND)
+	include_directories(SYSTEM ${EXPAT_INCLUDE_DIRS})
+endif()
+if(Iconv_FOUND)
+	include_directories(SYSTEM ${Iconv_INCLUDE_DIRS})
+endif()
+if(Intl_FOUND)
+	include_directories(SYSTEM ${Intl_INCLUDE_DIRS})
+endif()
+
+
+if(WIN32 AND NOT MSVC)#not required for visual studio builds
+	find_program(WINDRES_EXE windres)
+	if(NOT WINDRES_EXE)
+		message(FATAL_ERROR "Install windres on Windows for resource files")
+	endif()
+endif()
+
+if(NO_GETTEXT)
+	message(STATUS "msgfmt not used under NO_GETTEXT")
+else()
+	find_program(MSGFMT_EXE msgfmt)
+	if(NOT MSGFMT_EXE)
+		if(USE_VCPKG)
+			set(MSGFMT_EXE ${CMAKE_SOURCE_DIR}/compat/vcbuild/vcpkg/downloads/tools/msys2/msys64/usr/bin/msgfmt.exe)
+		endif()
+		if(NOT EXISTS ${MSGFMT_EXE})
+			message(WARNING "Text Translations won't be built")
+			unset(MSGFMT_EXE)
+		endif()
+	endif()
+endif()
+
+#Force all visual studio outputs to CMAKE_BINARY_DIR
+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)
+endif()
+
+#default behaviour
+include_directories(${CMAKE_SOURCE_DIR})
+add_compile_definitions(GIT_HOST_CPU="${CMAKE_SYSTEM_PROCESSOR}")
+add_compile_definitions(SHA256_BLK INTERNAL_QSORT RUNTIME_PREFIX)
+add_compile_definitions(NO_OPENSSL SHA1_DC SHA1DC_NO_STANDARD_INCLUDES
+			SHA1DC_INIT_SAFE_HASH_DEFAULT=0
+			SHA1DC_CUSTOM_INCLUDE_SHA1_C="cache.h"
+			SHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="git-compat-util.h" )
+list(APPEND compat_SOURCES sha1dc_git.c sha1dc/sha1.c sha1dc/ubc_check.c block-sha1/sha1.c sha256/block/sha256.c compat/qsort_s.c)
+
+
+add_compile_definitions(PAGER_ENV="LESS=FRX LV=-c"
+			GIT_EXEC_PATH="libexec/git-core"
+			GIT_LOCALE_PATH="share/locale"
+			GIT_MAN_PATH="share/man"
+			GIT_INFO_PATH="share/info"
+			GIT_HTML_PATH="share/doc/git-doc"
+			DEFAULT_HELP_FORMAT="html"
+			DEFAULT_GIT_TEMPLATE_DIR="share/git-core/templates"
+			GIT_VERSION="${PROJECT_VERSION}.GIT"
+			GIT_USER_AGENT="git/${PROJECT_VERSION}.GIT"
+			BINDIR="bin"
+			GIT_BUILT_FROM_COMMIT="")
+
+if(WIN32)
+	set(FALLBACK_RUNTIME_PREFIX /mingw64)
+	# Move system config into top-level /etc/
+	add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}"
+		ETC_GITATTRIBUTES="../etc/gitattributes"
+		ETC_GITCONFIG="../etc/gitconfig")
+else()
+	set(FALLBACK_RUNTIME_PREFIX /home/$ENV{USER})
+	add_compile_definitions(FALLBACK_RUNTIME_PREFIX="${FALLBACK_RUNTIME_PREFIX}"
+		ETC_GITATTRIBUTES="etc/gitattributes"
+		ETC_GITCONFIG="etc/gitconfig")
+endif()
+
+
+#Platform Specific
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	if(CMAKE_C_COMPILER_ID STREQUAL "MSVC" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
+		include_directories(${CMAKE_SOURCE_DIR}/compat/vcbuild/include)
+		add_compile_definitions(_CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_DEPRECATE)
+	endif()
+	include_directories(${CMAKE_SOURCE_DIR}/compat/win32)
+	add_compile_definitions(HAVE_ALLOCA_H NO_POSIX_GOODIES NATIVE_CRLF NO_UNIX_SOCKETS WIN32
+				_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)
+	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
+		compat/nedmalloc/nedmalloc.c compat/strdup.c)
+	set(NO_UNIX_SOCKETS 1)
+
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+	add_compile_definitions(PROCFS_EXECUTABLE_PATH="/proc/self/exe" HAVE_DEV_TTY )
+	list(APPEND compat_SOURCES unix-socket.c unix-stream-server.c)
+endif()
+
+if(CMAKE_SYSTEM_NAME STREQUAL "Windows")
+	list(APPEND compat_SOURCES compat/simple-ipc/ipc-shared.c compat/simple-ipc/ipc-win32.c)
+	add_compile_definitions(SUPPORTS_SIMPLE_IPC)
+	set(SUPPORTS_SIMPLE_IPC 1)
+else()
+	# Simple IPC requires both Unix sockets and pthreads on Unix-based systems.
+	if(NOT NO_UNIX_SOCKETS AND NOT NO_PTHREADS)
+		list(APPEND compat_SOURCES compat/simple-ipc/ipc-shared.c compat/simple-ipc/ipc-unix-socket.c)
+		add_compile_definitions(SUPPORTS_SIMPLE_IPC)
+		set(SUPPORTS_SIMPLE_IPC 1)
+	endif()
+endif()
+
+set(EXE_EXTENSION ${CMAKE_EXECUTABLE_SUFFIX})
+
+#header checks
+check_include_file(libgen.h HAVE_LIBGEN_H)
+if(NOT HAVE_LIBGEN_H)
+	add_compile_definitions(NO_LIBGEN_H)
+	list(APPEND compat_SOURCES compat/basename.c)
+endif()
+
+check_include_file(sys/sysinfo.h HAVE_SYSINFO)
+if(HAVE_SYSINFO)
+	add_compile_definitions(HAVE_SYSINFO)
+endif()
+
+check_c_source_compiles("
+#include <alloca.h>
+
+int main(void)
+{
+	char *p = (char *) alloca(2 * sizeof(int));
+
+	if (p)
+		return 0;
+	return 0;
+}"
+HAVE_ALLOCA_H)
+if(HAVE_ALLOCA_H)
+	add_compile_definitions(HAVE_ALLOCA_H)
+endif()
+
+check_include_file(strings.h HAVE_STRINGS_H)
+if(HAVE_STRINGS_H)
+	add_compile_definitions(HAVE_STRINGS_H)
+endif()
+
+check_include_file(sys/select.h HAVE_SYS_SELECT_H)
+if(NOT HAVE_SYS_SELECT_H)
+	add_compile_definitions(NO_SYS_SELECT_H)
+endif()
+
+check_include_file(sys/poll.h HAVE_SYS_POLL_H)
+if(NOT HAVE_SYS_POLL_H)
+	add_compile_definitions(NO_SYS_POLL_H)
+endif()
+
+check_include_file(poll.h HAVE_POLL_H)
+if(NOT HAVE_POLL_H)
+	add_compile_definitions(NO_POLL_H)
+endif()
+
+check_include_file(inttypes.h HAVE_INTTYPES_H)
+if(NOT HAVE_INTTYPES_H)
+	add_compile_definitions(NO_INTTYPES_H)
+endif()
+
+check_include_file(paths.h HAVE_PATHS_H)
+if(HAVE_PATHS_H)
+	add_compile_definitions(HAVE_PATHS_H)
+endif()
+
+#function checks
+set(function_checks
+	strcasestr memmem strlcpy strtoimax strtoumax strtoull
+	setenv mkdtemp poll pread memmem)
+
+#unsetenv,hstrerror are incompatible with windows build
+if(NOT WIN32)
+	list(APPEND function_checks unsetenv hstrerror)
+endif()
+
+foreach(f ${function_checks})
+	string(TOUPPER ${f} uf)
+	check_function_exists(${f} HAVE_${uf})
+	if(NOT HAVE_${uf})
+		add_compile_definitions(NO_${uf})
+	endif()
+endforeach()
+
+if(NOT HAVE_POLL_H OR NOT HAVE_SYS_POLL_H OR NOT HAVE_POLL)
+	include_directories(${CMAKE_SOURCE_DIR}/compat/poll)
+	add_compile_definitions(NO_POLL)
+	list(APPEND compat_SOURCES compat/poll/poll.c)
+endif()
+
+if(NOT HAVE_STRCASESTR)
+	list(APPEND compat_SOURCES compat/strcasestr.c)
+endif()
+
+if(NOT HAVE_STRLCPY)
+	list(APPEND compat_SOURCES compat/strlcpy.c)
+endif()
+
+if(NOT HAVE_STRTOUMAX)
+	list(APPEND compat_SOURCES compat/strtoumax.c compat/strtoimax.c)
+endif()
+
+if(NOT HAVE_SETENV)
+	list(APPEND compat_SOURCES compat/setenv.c)
+endif()
+
+if(NOT HAVE_MKDTEMP)
+	list(APPEND compat_SOURCES compat/mkdtemp.c)
+endif()
+
+if(NOT HAVE_PREAD)
+	list(APPEND compat_SOURCES compat/pread.c)
+endif()
+
+if(NOT HAVE_MEMMEM)
+	list(APPEND compat_SOURCES compat/memmem.c)
+endif()
+
+if(NOT WIN32)
+	if(NOT HAVE_UNSETENV)
+		list(APPEND compat_SOURCES compat/unsetenv.c)
+	endif()
+
+	if(NOT HAVE_HSTRERROR)
+		list(APPEND compat_SOURCES compat/hstrerror.c)
+	endif()
+endif()
+
+check_function_exists(getdelim HAVE_GETDELIM)
+if(HAVE_GETDELIM)
+	add_compile_definitions(HAVE_GETDELIM)
+endif()
+
+check_function_exists(clock_gettime HAVE_CLOCK_GETTIME)
+check_symbol_exists(CLOCK_MONOTONIC "time.h" HAVE_CLOCK_MONOTONIC)
+if(HAVE_CLOCK_GETTIME)
+	add_compile_definitions(HAVE_CLOCK_GETTIME)
+endif()
+if(HAVE_CLOCK_MONOTONIC)
+	add_compile_definitions(HAVE_CLOCK_MONOTONIC)
+endif()
+
+#check for st_blocks in struct stat
+check_struct_has_member("struct stat" st_blocks "sys/stat.h" STRUCT_STAT_HAS_ST_BLOCKS)
+if(NOT STRUCT_STAT_HAS_ST_BLOCKS)
+	add_compile_definitions(NO_ST_BLOCKS_IN_STRUCT_STAT)
+endif()
+
+#compile checks
+check_c_source_runs("
+#include<stdio.h>
+#include<stdarg.h>
+#include<string.h>
+#include<stdlib.h>
+
+int test_vsnprintf(char *str, size_t maxsize, const char *format, ...)
+{
+	int ret;
+	va_list ap;
+
+	va_start(ap, format);
+	ret = vsnprintf(str, maxsize, format, ap);
+	va_end(ap);
+	return ret;
+}
+
+int main(void)
+{
+	char buf[6];
+
+	if (test_vsnprintf(buf, 3, \"%s\", \"12345\") != 5
+		|| strcmp(buf, \"12\"))
+			return 1;
+	if (snprintf(buf, 3, \"%s\", \"12345\") != 5
+		|| strcmp(buf, \"12\"))
+			return 1;
+	return 0;
+}"
+SNPRINTF_OK)
+if(NOT SNPRINTF_OK)
+	add_compile_definitions(SNPRINTF_RETURNS_BOGUS)
+	list(APPEND compat_SOURCES compat/snprintf.c)
+endif()
+
+check_c_source_runs("
+#include<stdio.h>
+
+int main(void)
+{
+	FILE *f = fopen(\".\", \"r\");
+
+	return f != NULL;
+}"
+FREAD_READS_DIRECTORIES_NO)
+if(NOT FREAD_READS_DIRECTORIES_NO)
+	add_compile_definitions(FREAD_READS_DIRECTORIES)
+	list(APPEND compat_SOURCES compat/fopen.c)
+endif()
+
+check_c_source_compiles("
+#include <regex.h>
+#ifndef REG_STARTEND
+#error oops we dont have it
+#endif
+
+int main(void)
+{
+	return 0;
+}"
+HAVE_REGEX)
+if(NOT HAVE_REGEX)
+	include_directories(${CMAKE_SOURCE_DIR}/compat/regex)
+	list(APPEND compat_SOURCES compat/regex/regex.c )
+	add_compile_definitions(NO_REGEX NO_MBSUPPORT GAWK)
+endif()
+
+
+check_c_source_compiles("
+#include <stddef.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
+
+int main(void)
+{
+	int val, mib[2];
+	size_t len;
+
+	mib[0] = CTL_HW;
+	mib[1] = 1;
+	len = sizeof(val);
+	return sysctl(mib, 2, &val, &len, NULL, 0) ? 1 : 0;
+}"
+HAVE_BSD_SYSCTL)
+if(HAVE_BSD_SYSCTL)
+	add_compile_definitions(HAVE_BSD_SYSCTL)
+endif()
+
+set(CMAKE_REQUIRED_LIBRARIES ${Iconv_LIBRARIES})
+set(CMAKE_REQUIRED_INCLUDES ${Iconv_INCLUDE_DIRS})
+
+check_c_source_compiles("
+#include <iconv.h>
+
+extern size_t iconv(iconv_t cd,
+		char **inbuf, size_t *inbytesleft,
+		char **outbuf, size_t *outbytesleft);
+
+int main(void)
+{
+	return 0;
+}"
+HAVE_NEW_ICONV)
+if(HAVE_NEW_ICONV)
+	set(HAVE_OLD_ICONV 0)
+else()
+	set(HAVE_OLD_ICONV 1)
+endif()
+
+check_c_source_runs("
+#include <iconv.h>
+#if ${HAVE_OLD_ICONV}
+typedef const char *iconv_ibp;
+#else
+typedef char *iconv_ibp;
+#endif
+
+int main(void)
+{
+	int v;
+	iconv_t conv;
+	char in[] = \"a\";
+	iconv_ibp pin = in;
+	char out[20] = \"\";
+	char *pout = out;
+	size_t isz = sizeof(in);
+	size_t osz = sizeof(out);
+
+	conv = iconv_open(\"UTF-16\", \"UTF-8\");
+	iconv(conv, &pin, &isz, &pout, &osz);
+	iconv_close(conv);
+	v = (unsigned char)(out[0]) + (unsigned char)(out[1]);
+	return v != 0xfe + 0xff;
+}"
+ICONV_DOESNOT_OMIT_BOM)
+if(NOT ICONV_DOESNOT_OMIT_BOM)
+	add_compile_definitions(ICONV_OMITS_BOM)
+endif()
+
+unset(CMAKE_REQUIRED_LIBRARIES)
+unset(CMAKE_REQUIRED_INCLUDES)
+
+
+#programs
+set(PROGRAMS_BUILT
+	git git-daemon git-http-backend git-sh-i18n--envsubst
+	git-shell)
+
+if(NOT CURL_FOUND)
+	list(APPEND excluded_progs git-http-fetch git-http-push)
+	add_compile_definitions(NO_CURL)
+	message(WARNING "git-http-push and git-http-fetch will not be built")
+else()
+	list(APPEND PROGRAMS_BUILT git-http-fetch git-http-push git-imap-send git-remote-http)
+	if(CURL_VERSION_STRING VERSION_GREATER_EQUAL 7.34.0)
+		add_compile_definitions(USE_CURL_FOR_IMAP_SEND)
+	endif()
+endif()
+
+if(NOT EXPAT_FOUND)
+	list(APPEND excluded_progs git-http-push)
+	add_compile_definitions(NO_EXPAT)
+else()
+	list(APPEND PROGRAMS_BUILT git-http-push)
+	if(EXPAT_VERSION_STRING VERSION_LESS_EQUAL 1.2)
+		add_compile_definitions(EXPAT_NEEDS_XMLPARSE_H)
+	endif()
+endif()
+
+list(REMOVE_DUPLICATES excluded_progs)
+list(REMOVE_DUPLICATES PROGRAMS_BUILT)
+
+
+foreach(p ${excluded_progs})
+	list(APPEND EXCLUSION_PROGS --exclude-program ${p} )
+endforeach()
+
+#for comparing null values
+list(APPEND EXCLUSION_PROGS empty)
+set(EXCLUSION_PROGS_CACHE ${EXCLUSION_PROGS} CACHE STRING "Programs not built" FORCE)
+
+if(NOT EXISTS ${CMAKE_BINARY_DIR}/command-list.h OR NOT EXCLUSION_PROGS_CACHE STREQUAL EXCLUSION_PROGS)
+	list(REMOVE_ITEM EXCLUSION_PROGS empty)
+	message("Generating command-list.h")
+	execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-cmdlist.sh ${EXCLUSION_PROGS} command-list.txt
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+			OUTPUT_FILE ${CMAKE_BINARY_DIR}/command-list.h)
+endif()
+
+if(NOT EXISTS ${CMAKE_BINARY_DIR}/config-list.h)
+	message("Generating config-list.h")
+	execute_process(COMMAND ${SH_EXE} ${CMAKE_SOURCE_DIR}/generate-configlist.sh
+			WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+			OUTPUT_FILE ${CMAKE_BINARY_DIR}/config-list.h)
+endif()
+
+include_directories(${CMAKE_BINARY_DIR})
+
+#build
+#libgit
+parse_makefile_for_sources(libgit_SOURCES "LIB_OBJS")
+
+list(TRANSFORM libgit_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
+list(TRANSFORM compat_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
+add_library(libgit ${libgit_SOURCES} ${compat_SOURCES})
+
+#libxdiff
+parse_makefile_for_sources(libxdiff_SOURCES "XDIFF_OBJS")
+
+list(TRANSFORM libxdiff_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
+add_library(xdiff STATIC ${libxdiff_SOURCES})
+
+if(WIN32)
+	if(NOT MSVC)#use windres when compiling with gcc and clang
+		add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.res
+				COMMAND ${WINDRES_EXE} -O coff -DMAJOR=${PROJECT_VERSION_MAJOR} -DMINOR=${PROJECT_VERSION_MINOR}
+					-DMICRO=${PROJECT_VERSION_PATCH} -DPATCHLEVEL=0 -DGIT_VERSION="\\\"${PROJECT_VERSION}.GIT\\\""
+					-i ${CMAKE_SOURCE_DIR}/git.rc -o ${CMAKE_BINARY_DIR}/git.res
+				WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+				VERBATIM)
+	else()#MSVC use rc
+		add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/git.res
+				COMMAND ${CMAKE_RC_COMPILER} /d MAJOR=${PROJECT_VERSION_MAJOR} /d MINOR=${PROJECT_VERSION_MINOR}
+					/d MICRO=${PROJECT_VERSION_PATCH} /d PATCHLEVEL=0 /d GIT_VERSION="${PROJECT_VERSION}.GIT"
+					/fo ${CMAKE_BINARY_DIR}/git.res ${CMAKE_SOURCE_DIR}/git.rc
+				WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+				VERBATIM)
+	endif()
+	add_custom_target(git-rc DEPENDS ${CMAKE_BINARY_DIR}/git.res)
+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})
+if(Intl_FOUND)
+	target_link_libraries(common-main ${Intl_LIBRARIES})
+endif()
+if(Iconv_FOUND)
+	target_link_libraries(common-main ${Iconv_LIBRARIES})
+endif()
+if(WIN32)
+	target_link_libraries(common-main ws2_32 ntdll ${CMAKE_BINARY_DIR}/git.res)
+	add_dependencies(common-main git-rc)
+	if(CMAKE_C_COMPILER_ID STREQUAL "GNU")
+		target_link_options(common-main PUBLIC -municode -Wl,--nxcompat -Wl,--dynamicbase -Wl,--pic-executable,-e,mainCRTStartup)
+	elseif(CMAKE_C_COMPILER_ID STREQUAL "Clang")
+		target_link_options(common-main PUBLIC -municode -Wl,-nxcompat -Wl,-dynamicbase -Wl,-entry:wmainCRTStartup -Wl,invalidcontinue.obj)
+	elseif(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+		target_link_options(common-main PUBLIC /IGNORE:4217 /IGNORE:4049 /NOLOGO /ENTRY:wmainCRTStartup /SUBSYSTEM:CONSOLE invalidcontinue.obj)
+	else()
+		message(FATAL_ERROR "Unhandled compiler: ${CMAKE_C_COMPILER_ID}")
+	endif()
+elseif(UNIX)
+	target_link_libraries(common-main pthread rt)
+endif()
+
+#git
+parse_makefile_for_sources(git_SOURCES "BUILTIN_OBJS")
+
+list(TRANSFORM git_SOURCES PREPEND "${CMAKE_SOURCE_DIR}/")
+add_executable(git ${CMAKE_SOURCE_DIR}/git.c ${git_SOURCES})
+target_link_libraries(git common-main)
+
+add_executable(git-daemon ${CMAKE_SOURCE_DIR}/daemon.c)
+target_link_libraries(git-daemon common-main)
+
+add_executable(git-http-backend ${CMAKE_SOURCE_DIR}/http-backend.c)
+target_link_libraries(git-http-backend common-main)
+
+add_executable(git-sh-i18n--envsubst ${CMAKE_SOURCE_DIR}/sh-i18n--envsubst.c)
+target_link_libraries(git-sh-i18n--envsubst common-main)
+
+add_executable(git-shell ${CMAKE_SOURCE_DIR}/shell.c)
+target_link_libraries(git-shell common-main)
+
+if(CURL_FOUND)
+	add_library(http_obj OBJECT ${CMAKE_SOURCE_DIR}/http.c)
+
+	add_executable(git-imap-send ${CMAKE_SOURCE_DIR}/imap-send.c)
+	target_link_libraries(git-imap-send http_obj common-main ${CURL_LIBRARIES})
+
+	add_executable(git-http-fetch ${CMAKE_SOURCE_DIR}/http-walker.c ${CMAKE_SOURCE_DIR}/http-fetch.c)
+	target_link_libraries(git-http-fetch http_obj common-main ${CURL_LIBRARIES})
+
+	add_executable(git-remote-http ${CMAKE_SOURCE_DIR}/http-walker.c ${CMAKE_SOURCE_DIR}/remote-curl.c)
+	target_link_libraries(git-remote-http http_obj common-main ${CURL_LIBRARIES} )
+
+	if(EXPAT_FOUND)
+		add_executable(git-http-push ${CMAKE_SOURCE_DIR}/http-push.c)
+		target_link_libraries(git-http-push http_obj common-main ${CURL_LIBRARIES} ${EXPAT_LIBRARIES})
+	endif()
+endif()
+
+parse_makefile_for_executables(git_builtin_extra "BUILT_INS")
+
+option(SKIP_DASHED_BUILT_INS "Skip hardlinking the dashed versions of the built-ins")
+
+#Creating hardlinks
+if(NOT SKIP_DASHED_BUILT_INS)
+foreach(s ${git_SOURCES} ${git_builtin_extra})
+	string(REPLACE "${CMAKE_SOURCE_DIR}/builtin/" "" s ${s})
+	string(REPLACE ".c" "" s ${s})
+	file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git${EXE_EXTENSION} git-${s}${EXE_EXTENSION})\n")
+	list(APPEND git_links ${CMAKE_BINARY_DIR}/git-${s}${EXE_EXTENSION})
+endforeach()
+endif()
+
+if(CURL_FOUND)
+	set(remote_exes
+		git-remote-https git-remote-ftp git-remote-ftps)
+	foreach(s ${remote_exes})
+		file(APPEND ${CMAKE_BINARY_DIR}/CreateLinks.cmake "file(CREATE_LINK git-remote-http${EXE_EXTENSION} ${s}${EXE_EXTENSION})\n")
+		list(APPEND git_http_links ${CMAKE_BINARY_DIR}/${s}${EXE_EXTENSION})
+	endforeach()
+endif()
+
+add_custom_command(OUTPUT ${git_links} ${git_http_links}
+		COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/CreateLinks.cmake
+		DEPENDS git git-remote-http)
+add_custom_target(git-links ALL DEPENDS ${git_links} ${git_http_links})
+
+
+#creating required scripts
+set(SHELL_PATH /bin/sh)
+set(PERL_PATH /usr/bin/perl)
+set(LOCALEDIR ${FALLBACK_RUNTIME_PREFIX}/share/locale)
+set(GITWEBDIR ${FALLBACK_RUNTIME_PREFIX}/share/locale)
+set(INSTLIBDIR ${FALLBACK_RUNTIME_PREFIX}/share/perl5)
+
+#shell scripts
+parse_makefile_for_scripts(git_sh_scripts "SCRIPT_SH" ".sh")
+parse_makefile_for_scripts(git_shlib_scripts "SCRIPT_LIB" "")
+set(git_shell_scripts
+	${git_sh_scripts} ${git_shlib_scripts} git-instaweb)
+
+foreach(script ${git_shell_scripts})
+	file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.sh content NEWLINE_CONSUME)
+	string(REPLACE "@SHELL_PATH@" "${SHELL_PATH}" content "${content}")
+	string(REPLACE "@@DIFF@@" "diff" content "${content}")
+	string(REPLACE "@LOCALEDIR@" "${LOCALEDIR}" content "${content}")
+	string(REPLACE "@GITWEBDIR@" "${GITWEBDIR}" content "${content}")
+	string(REPLACE "@@NO_CURL@@" "" content "${content}")
+	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()
+
+#perl scripts
+parse_makefile_for_scripts(git_perl_scripts "SCRIPT_PERL" ".perl")
+
+#create perl header
+file(STRINGS ${CMAKE_SOURCE_DIR}/perl/header_templates/fixed_prefix.template.pl perl_header )
+string(REPLACE "@@PATHSEP@@" ":" perl_header "${perl_header}")
+string(REPLACE "@@INSTLIBDIR@@" "${INSTLIBDIR}" perl_header "${perl_header}")
+
+foreach(script ${git_perl_scripts})
+	file(STRINGS ${CMAKE_SOURCE_DIR}/${script}.perl content NEWLINE_CONSUME)
+	string(REPLACE "#!/usr/bin/perl" "#!/usr/bin/perl\n${perl_header}\n" content "${content}")
+	string(REPLACE "@@GIT_VERSION@@" "${PROJECT_VERSION}" content "${content}")
+	file(WRITE ${CMAKE_BINARY_DIR}/${script} ${content})
+endforeach()
+
+#python script
+file(STRINGS ${CMAKE_SOURCE_DIR}/git-p4.py content NEWLINE_CONSUME)
+string(REPLACE "#!/usr/bin/env python" "#!/usr/bin/python" content "${content}")
+file(WRITE ${CMAKE_BINARY_DIR}/git-p4 ${content})
+
+#perl modules
+file(GLOB_RECURSE perl_modules "${CMAKE_SOURCE_DIR}/perl/*.pm")
+
+foreach(pm ${perl_modules})
+	string(REPLACE "${CMAKE_SOURCE_DIR}/perl/" "" file_path ${pm})
+	file(STRINGS ${pm} content NEWLINE_CONSUME)
+	string(REPLACE "@@LOCALEDIR@@" "${LOCALEDIR}" content "${content}")
+	string(REPLACE "@@NO_PERL_CPAN_FALLBACKS@@" "" content "${content}")
+	file(WRITE ${CMAKE_BINARY_DIR}/perl/build/lib/${file_path} ${content})
+#test-lib.sh requires perl/build/lib to be the build directory of perl modules
+endforeach()
+
+
+#templates
+file(GLOB templates "${CMAKE_SOURCE_DIR}/templates/*")
+list(TRANSFORM templates REPLACE "${CMAKE_SOURCE_DIR}/templates/" "")
+list(REMOVE_ITEM templates ".gitignore")
+list(REMOVE_ITEM templates "Makefile")
+list(REMOVE_ITEM templates "blt")# Prevents an error when reconfiguring for in source builds
+
+list(REMOVE_ITEM templates "branches--")
+file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/branches) #create branches
+
+#templates have @.*@ replacement so use configure_file instead
+foreach(tm ${templates})
+	string(REPLACE "--" "/" blt_tm ${tm})
+	string(REPLACE "this" "" blt_tm ${blt_tm})# for this--
+	configure_file(${CMAKE_SOURCE_DIR}/templates/${tm} ${CMAKE_BINARY_DIR}/templates/blt/${blt_tm} @ONLY)
+endforeach()
+
+
+#translations
+if(MSGFMT_EXE)
+	file(GLOB po_files "${CMAKE_SOURCE_DIR}/po/*.po")
+	list(TRANSFORM po_files REPLACE "${CMAKE_SOURCE_DIR}/po/" "")
+	list(TRANSFORM po_files REPLACE ".po" "")
+	foreach(po ${po_files})
+		file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES)
+		add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo
+				COMMAND ${MSGFMT_EXE} --check --statistics -o ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo ${CMAKE_SOURCE_DIR}/po/${po}.po)
+		list(APPEND po_gen ${CMAKE_BINARY_DIR}/po/build/locale/${po}/LC_MESSAGES/git.mo)
+	endforeach()
+	add_custom_target(po-gen ALL DEPENDS ${po_gen})
+endif()
+
+
+#to help with the install
+list(TRANSFORM git_shell_scripts PREPEND "${CMAKE_BINARY_DIR}/")
+list(TRANSFORM git_perl_scripts PREPEND "${CMAKE_BINARY_DIR}/")
+
+#install
+foreach(program ${PROGRAMS_BUILT})
+if(program STREQUAL "git" OR program STREQUAL "git-shell")
+install(TARGETS ${program}
+	RUNTIME DESTINATION bin)
+else()
+install(TARGETS ${program}
+	RUNTIME DESTINATION libexec/git-core)
+endif()
+endforeach()
+
+install(PROGRAMS ${CMAKE_BINARY_DIR}/git-cvsserver
+	DESTINATION bin)
+
+set(bin_links
+	git-receive-pack git-upload-archive git-upload-pack)
+
+foreach(b ${bin_links})
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/bin/${b}${EXE_EXTENSION})")
+endforeach()
+
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git${EXE_EXTENSION})")
+install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git-shell${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-shell${EXE_EXTENSION})")
+
+foreach(b ${git_links})
+	string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
+	install(CODE "file(CREATE_LINK ${CMAKE_INSTALL_PREFIX}/bin/git${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
+endforeach()
+
+foreach(b ${git_http_links})
+	string(REPLACE "${CMAKE_BINARY_DIR}" "" b ${b})
+	install(CODE "file(CREATE_LINK  ${CMAKE_INSTALL_PREFIX}/libexec/git-core/git-remote-http${EXE_EXTENSION} ${CMAKE_INSTALL_PREFIX}/libexec/git-core/${b})")
+endforeach()
+
+install(PROGRAMS ${git_shell_scripts} ${git_perl_scripts} ${CMAKE_BINARY_DIR}/git-p4
+	DESTINATION libexec/git-core)
+
+install(DIRECTORY ${CMAKE_SOURCE_DIR}/mergetools DESTINATION libexec/git-core)
+install(DIRECTORY ${CMAKE_BINARY_DIR}/perl/build/lib/ DESTINATION share/perl5
+	FILES_MATCHING PATTERN "*.pm")
+install(DIRECTORY ${CMAKE_BINARY_DIR}/templates/blt/ DESTINATION share/git-core/templates)
+
+if(MSGFMT_EXE)
+	install(DIRECTORY ${CMAKE_BINARY_DIR}/po/build/locale DESTINATION share)
+endif()
+
+
+if(BUILD_TESTING)
+
+#tests-helpers
+add_executable(test-fake-ssh ${CMAKE_SOURCE_DIR}/t/helper/test-fake-ssh.c)
+target_link_libraries(test-fake-ssh common-main)
+
+#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})
+target_link_libraries(test-tool common-main)
+
+set_target_properties(test-fake-ssh test-tool
+			PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/t/helper)
+
+if(MSVC)
+	set_target_properties(test-fake-ssh test-tool
+				PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}/t/helper)
+	set_target_properties(test-fake-ssh test-tool
+				PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/t/helper)
+endif()
+
+#wrapper scripts
+set(wrapper_scripts
+	git git-upload-pack git-receive-pack git-upload-archive git-shell git-remote-ext)
+
+set(wrapper_test_scripts
+	test-fake-ssh test-tool)
+
+
+foreach(script ${wrapper_scripts})
+	file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
+	string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
+	string(REPLACE "@@PROG@@" "${script}${EXE_EXTENSION}" content "${content}")
+	file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
+endforeach()
+
+foreach(script ${wrapper_test_scripts})
+	file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
+	string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
+	string(REPLACE "@@PROG@@" "t/helper/${script}${EXE_EXTENSION}" content "${content}")
+	file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/${script} ${content})
+endforeach()
+
+file(STRINGS ${CMAKE_SOURCE_DIR}/wrap-for-bin.sh content NEWLINE_CONSUME)
+string(REPLACE "@@BUILD_DIR@@" "${CMAKE_BINARY_DIR}" content "${content}")
+string(REPLACE "@@PROG@@" "git-cvsserver" content "${content}")
+file(WRITE ${CMAKE_BINARY_DIR}/bin-wrappers/git-cvsserver ${content})
+
+#options for configuring test options
+option(PERL_TESTS "Perform tests that use perl" ON)
+option(PYTHON_TESTS "Perform tests that use python" ON)
+
+#GIT-BUILD-OPTIONS
+set(TEST_SHELL_PATH ${SHELL_PATH})
+set(DIFF diff)
+set(PYTHON_PATH /usr/bin/python)
+set(TAR tar)
+set(NO_CURL )
+set(NO_EXPAT )
+set(USE_LIBPCRE2 )
+set(NO_PERL )
+set(NO_PTHREADS )
+set(NO_PYTHON )
+set(PAGER_ENV "LESS=FRX LV=-c")
+set(DC_SHA1 YesPlease)
+set(RUNTIME_PREFIX true)
+set(NO_GETTEXT )
+
+if(NOT CURL_FOUND)
+	set(NO_CURL 1)
+endif()
+
+if(NOT EXPAT_FOUND)
+	set(NO_EXPAT 1)
+endif()
+
+if(NOT Intl_FOUND)
+	set(NO_GETTEXT 1)
+endif()
+
+if(NOT PERL_TESTS)
+	set(NO_PERL 1)
+endif()
+
+if(NOT PYTHON_TESTS)
+	set(NO_PYTHON 1)
+endif()
+
+file(WRITE ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "SHELL_PATH='${SHELL_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "TEST_SHELL_PATH='${TEST_SHELL_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PERL_PATH='${PERL_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DIFF='${DIFF}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PYTHON_PATH='${PYTHON_PATH}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "TAR='${TAR}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_CURL='${NO_CURL}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_EXPAT='${NO_EXPAT}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PERL='${NO_PERL}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PTHREADS='${NO_PTHREADS}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_UNIX_SOCKETS='${NO_UNIX_SOCKETS}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PAGER_ENV='${PAGER_ENV}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "DC_SHA1='${DC_SHA1}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "X='${EXE_EXTENSION}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "RUNTIME_PREFIX='${RUNTIME_PREFIX}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PYTHON='${NO_PYTHON}'\n")
+file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "SUPPORTS_SIMPLE_IPC='${SUPPORTS_SIMPLE_IPC}'\n")
+if(USE_VCPKG)
+	file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
+endif()
+
+#Make the tests work when building out of the source tree
+get_filename_component(CACHE_PATH ${CMAKE_CURRENT_LIST_DIR}/../../CMakeCache.txt ABSOLUTE)
+if(NOT ${CMAKE_BINARY_DIR}/CMakeCache.txt STREQUAL ${CACHE_PATH})
+	file(RELATIVE_PATH BUILD_DIR_RELATIVE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR}/CMakeCache.txt)
+	string(REPLACE "/CMakeCache.txt" "" BUILD_DIR_RELATIVE ${BUILD_DIR_RELATIVE})
+	#Setting the build directory in test-lib.sh before running tests
+	file(WRITE ${CMAKE_BINARY_DIR}/CTestCustom.cmake
+		"file(STRINGS ${CMAKE_SOURCE_DIR}/t/test-lib.sh GIT_BUILD_DIR_REPL REGEX \"GIT_BUILD_DIR=(.*)\")\n"
+		"file(STRINGS ${CMAKE_SOURCE_DIR}/t/test-lib.sh content NEWLINE_CONSUME)\n"
+		"string(REPLACE \"\${GIT_BUILD_DIR_REPL}\" \"GIT_BUILD_DIR=\\\"$TEST_DIRECTORY/../${BUILD_DIR_RELATIVE}\\\"\" content \"\${content}\")\n"
+		"file(WRITE ${CMAKE_SOURCE_DIR}/t/test-lib.sh \${content})")
+	#misc copies
+	file(COPY ${CMAKE_SOURCE_DIR}/t/chainlint.sed DESTINATION ${CMAKE_BINARY_DIR}/t/)
+	file(COPY ${CMAKE_SOURCE_DIR}/po/is.po DESTINATION ${CMAKE_BINARY_DIR}/po/)
+	file(COPY ${CMAKE_SOURCE_DIR}/mergetools/tkdiff DESTINATION ${CMAKE_BINARY_DIR}/mergetools/)
+	file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-prompt.sh DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/)
+	file(COPY ${CMAKE_SOURCE_DIR}/contrib/completion/git-completion.bash DESTINATION ${CMAKE_BINARY_DIR}/contrib/completion/)
+endif()
+
+file(GLOB test_scipts "${CMAKE_SOURCE_DIR}/t/t[0-9]*.sh")
+
+#test
+foreach(tsh ${test_scipts})
+	add_test(NAME ${tsh}
+		COMMAND ${SH_EXE} ${tsh}
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/t)
+endforeach()
+
+endif()#BUILD_TESTING
diff --git a/contrib/buildsystems/Generators/Vcxproj.pm b/contrib/buildsystems/Generators/Vcxproj.pm
index 5c666f9ac0..d2584450ba 100644
--- a/contrib/buildsystems/Generators/Vcxproj.pm
+++ b/contrib/buildsystems/Generators/Vcxproj.pm
@@ -80,6 +80,7 @@ sub createProject {
       $libs_release = join(";", sort(grep /^(?!libgit\.lib|xdiff\/lib\.lib|vcs-svn\/lib\.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;
       $libs_debug =~ s/libcurl\.lib/libcurl-d\.lib/g;
     }
 
diff --git a/contrib/buildsystems/engine.pl b/contrib/buildsystems/engine.pl
index fba8a3f056..ed6c45988a 100755
--- a/contrib/buildsystems/engine.pl
+++ b/contrib/buildsystems/engine.pl
@@ -343,15 +343,15 @@ sub handleLinkLine
         } elsif ("$part" eq "-lz") {
             push(@libs, "zlib.lib");
         } elsif ("$part" eq "-lcrypto") {
-            push(@libs, "libeay32.lib");
+            push(@libs, "libcrypto.lib");
         } elsif ("$part" eq "-lssl") {
-            push(@libs, "ssleay32.lib");
+            push(@libs, "libssl.lib");
         } elsif ("$part" eq "-lcurl") {
             push(@libs, "libcurl.lib");
         } elsif ("$part" eq "-lexpat") {
-            push(@libs, "expat.lib");
+            push(@libs, "libexpat.lib");
         } elsif ("$part" eq "-liconv") {
-            push(@libs, "libiconv.lib");
+            push(@libs, "iconv.lib");
         } elsif ($part =~ /^[-\/]/) {
             push(@lflags, $part);
         } elsif ($part =~ /\.(a|lib)$/) {
diff --git a/contrib/coccinelle/array.cocci b/contrib/coccinelle/array.cocci
index 46b8d2ee11..9a4f00cb1b 100644
--- a/contrib/coccinelle/array.cocci
+++ b/contrib/coccinelle/array.cocci
@@ -88,3 +88,11 @@ expression n;
 @@
 - ptr = xmalloc((n) * sizeof(T));
 + ALLOC_ARRAY(ptr, n);
+
+@@
+type T;
+T *ptr;
+expression n != 1;
+@@
+- ptr = xcalloc(n, \( sizeof(*ptr) \| sizeof(T) \) )
++ CALLOC_ARRAY(ptr, n)
diff --git a/contrib/coccinelle/commit.cocci b/contrib/coccinelle/commit.cocci
index d03453341e..af6dd4c20c 100644
--- a/contrib/coccinelle/commit.cocci
+++ b/contrib/coccinelle/commit.cocci
@@ -20,7 +20,7 @@ expression s;
 + set_commit_tree(c, s)
   ...>}
 
-// These excluded functions must access c->maybe_tree direcly.
+// These excluded functions must access c->maybe_tree directly.
 // Note that if c->maybe_tree is written somewhere outside of these
 // functions, then the recommended transformation will be bogus with
 // repo_get_commit_tree() on the LHS.
@@ -32,3 +32,21 @@ expression c;
 - c->maybe_tree
 + repo_get_commit_tree(specify_the_right_repo_here, c)
   ...>}
+
+@@
+struct commit *c;
+expression E;
+@@
+(
+- c->generation = E;
++ commit_graph_data_at(c)->generation = E;
+|
+- c->graph_pos = E;
++ commit_graph_data_at(c)->graph_pos = E;
+|
+- c->generation
++ commit_graph_generation(c)
+|
+- c->graph_pos
++ commit_graph_position(c)
+)
diff --git a/contrib/coccinelle/object_id.cocci b/contrib/coccinelle/object_id.cocci
index 3e536a9834..ddf4f22bd7 100644
--- a/contrib/coccinelle/object_id.cocci
+++ b/contrib/coccinelle/object_id.cocci
@@ -13,38 +13,6 @@ struct object_id *OIDPTR;
 @@
 struct object_id OID;
 @@
-- sha1_to_hex(OID.hash)
-+ oid_to_hex(&OID)
-
-@@
-identifier f != oid_to_hex;
-struct object_id *OIDPTR;
-@@
-  f(...) {<...
-- sha1_to_hex(OIDPTR->hash)
-+ oid_to_hex(OIDPTR)
-  ...>}
-
-@@
-expression E;
-struct object_id OID;
-@@
-- sha1_to_hex_r(E, OID.hash)
-+ oid_to_hex_r(E, &OID)
-
-@@
-identifier f != oid_to_hex_r;
-expression E;
-struct object_id *OIDPTR;
-@@
-   f(...) {<...
-- sha1_to_hex_r(E, OIDPTR->hash)
-+ oid_to_hex_r(E, OIDPTR)
-  ...>}
-
-@@
-struct object_id OID;
-@@
 - hashclr(OID.hash)
 + oidclr(&OID)
 
diff --git a/contrib/coccinelle/xcalloc.cocci b/contrib/coccinelle/xcalloc.cocci
new file mode 100644
index 0000000000..c291011607
--- /dev/null
+++ b/contrib/coccinelle/xcalloc.cocci
@@ -0,0 +1,10 @@
+@@
+type T;
+T *ptr;
+expression n;
+@@
+  xcalloc(
++ n,
+  \( sizeof(T) \| sizeof(*ptr) \)
+- , n
+  )
diff --git a/contrib/coccinelle/xopen.cocci b/contrib/coccinelle/xopen.cocci
new file mode 100644
index 0000000000..814d7b8a1a
--- /dev/null
+++ b/contrib/coccinelle/xopen.cocci
@@ -0,0 +1,16 @@
+@@
+identifier fd;
+identifier die_fn =~ "^(die|die_errno)$";
+@@
+(
+  fd =
+- open
++ xopen
+  (...);
+|
+  int 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 00fbe6c03d..8108eda1e8 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -29,6 +29,15 @@
 # tell the completion to use commit completion.  This also works with aliases
 # of form "!sh -c '...'".  For example, "!sh -c ': git commit ; ... '".
 #
+# If you have a command that is not part of git, but you would still
+# like completion, you can use __git_complete:
+#
+#   __git_complete gl git_log
+#
+# Or if it's a main command (i.e. git or gitk):
+#
+#   __git_complete gk gitk
+#
 # Compatible with bash 3.2.57.
 #
 # You can set the following environment variables to influence the behavior of
@@ -39,6 +48,11 @@
 #     When set to "1", do not include "DWIM" suggestions in git-checkout
 #     and git-switch completion (e.g., completing "foo" when "origin/foo"
 #     exists).
+#
+#   GIT_COMPLETION_SHOW_ALL
+#
+#     When set to "1" suggest all options, including options which are
+#     typically hidden (e.g. '--allow-empty' for 'git commit').
 
 case "$COMP_WORDBREAKS" in
 *:*) : great ;;
@@ -50,7 +64,7 @@ esac
 # variable.
 __git_find_repo_path ()
 {
-	if [ -n "$__git_repo_path" ]; then
+	if [ -n "${__git_repo_path-}" ]; then
 		# we already know where it is
 		return
 	fi
@@ -63,7 +77,7 @@ __git_find_repo_path ()
 		test -d "$__git_dir" &&
 		__git_repo_path="$__git_dir"
 	elif [ -n "${GIT_DIR-}" ]; then
-		test -d "${GIT_DIR-}" &&
+		test -d "$GIT_DIR" &&
 		__git_repo_path="$GIT_DIR"
 	elif [ -d .git ]; then
 		__git_repo_path=.git
@@ -301,6 +315,19 @@ __gitcomp_direct ()
 	COMPREPLY=($1)
 }
 
+# Similar to __gitcomp_direct, but appends to COMPREPLY instead.
+# Callers must take care of providing only words that match the current word
+# to be completed and adding any prefix and/or suffix (trailing space!), if
+# necessary.
+# 1: List of newline-separated matching completion words, complete with
+#    prefix and suffix.
+__gitcomp_direct_append ()
+{
+	local IFS=$'\n'
+
+	COMPREPLY+=($1)
+}
+
 __gitcompappend ()
 {
 	local x i=${#COMPREPLY[@]}
@@ -329,7 +356,7 @@ __gitcomp ()
 	local cur_="${3-$cur}"
 
 	case "$cur_" in
-	--*=)
+	*=)
 		;;
 	--no-*)
 		local c i=0 IFS=$' \t\n'
@@ -373,7 +400,7 @@ __gitcomp ()
 # Clear the variables caching builtins' options when (re-)sourcing
 # the completion script.
 if [[ -n ${ZSH_VERSION-} ]]; then
-	unset $(set |sed -ne 's/^\(__gitcomp_builtin_[a-zA-Z0-9_][a-zA-Z0-9_]*\)=.*/\1/p') 2>/dev/null
+	unset ${(M)${(k)parameters[@]}:#__gitcomp_builtin_*} 2>/dev/null
 else
 	unset $(compgen -v __gitcomp_builtin_)
 fi
@@ -391,17 +418,23 @@ __gitcomp_builtin ()
 	# spaces must be replaced with underscore for multi-word
 	# commands, e.g. "git remote add" becomes remote_add.
 	local cmd="$1"
-	local incl="$2"
-	local excl="$3"
+	local incl="${2-}"
+	local excl="${3-}"
 
-	local var=__gitcomp_builtin_"${cmd/-/_}"
+	local var=__gitcomp_builtin_"${cmd//-/_}"
 	local options
-	eval "options=\$$var"
+	eval "options=\${$var-}"
 
 	if [ -z "$options" ]; then
+		local completion_helper
+		if [ "${GIT_COMPLETION_SHOW_ALL-}" = "1" ]; then
+			completion_helper="--git-completion-helper-all"
+		else
+			completion_helper="--git-completion-helper"
+		fi
 		# leading and trailing spaces are significant to make
 		# option removal work correctly.
-		options=" $incl $(__git ${cmd/_/ } --git-completion-helper) " || return
+		options=" $incl $(__git ${cmd/_/ } $completion_helper) " || return
 
 		for i in $excl; do
 			options="${options/ $i / }"
@@ -504,7 +537,7 @@ __git_index_files ()
 {
 	local root="$2" match="$3"
 
-	__git_ls_files_helper "$root" "$1" "$match" |
+	__git_ls_files_helper "$root" "$1" "${match:-?}" |
 	awk -F / -v pfx="${2//\\/\\\\}" '{
 		paths[$1] = 1
 	}
@@ -550,7 +583,7 @@ __git_index_files ()
 						 esc_idx, 1)
 			} else if (esc == "n") {
 				# Uh-oh, a newline character.
-				# We cant reliably put a pathname
+				# We cannot reliably put a pathname
 				# containing a newline into COMPREPLY,
 				# and the newline would create a mess.
 				# Skip this path.
@@ -565,7 +598,7 @@ __git_index_files ()
 			}
 		}
 		# Drop closing double quote, if there is one.
-		# (There isnt any if this is a directory, as it was
+		# (There is not any if this is a directory, as it was
 		# already stripped with the trailing path components.)
 		if (substr(p, length(p), 1) == "\"")
 			out = out substr(p, 1, length(p) - 1)
@@ -611,6 +644,19 @@ __git_heads ()
 			"refs/heads/$cur_*" "refs/heads/$cur_*/**"
 }
 
+# Lists branches from remote repositories.
+# 1: A prefix to be added to each listed branch (optional).
+# 2: List only branches matching this word (optional; list all branches if
+#    unset or empty).
+# 3: A suffix to be appended to each listed branch (optional).
+__git_remote_heads ()
+{
+	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
+
+	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
+			"refs/remotes/$cur_*" "refs/remotes/$cur_*/**"
+}
+
 # Lists tags from the local repository.
 # Accepts the same positional parameters as __git_heads() above.
 __git_tags ()
@@ -621,6 +667,26 @@ __git_tags ()
 			"refs/tags/$cur_*" "refs/tags/$cur_*/**"
 }
 
+# List unique branches from refs/remotes used for 'git checkout' and 'git
+# switch' tracking DWIMery.
+# 1: A prefix to be added to each listed branch (optional)
+# 2: List only branches matching this word (optional; list all branches if
+#    unset or empty).
+# 3: A suffix to be appended to each listed branch (optional).
+__git_dwim_remote_heads ()
+{
+	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
+	local fer_pfx="${pfx//\%/%%}" # "escape" for-each-ref format specifiers
+
+	# employ the heuristic used by git checkout and git switch
+	# Try to find a remote branch that cur_es the completion word
+	# but only output if the branch name is unique
+	__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
+		--sort="refname:strip=3" \
+		"refs/remotes/*/$cur_*" "refs/remotes/*/$cur_*/**" | \
+	uniq -u
+}
+
 # Lists refs from the local (by default) or from a remote repository.
 # It accepts 0, 1 or 2 arguments:
 # 1: The remote to list refs from (optional; ignored, if set but empty).
@@ -678,7 +744,7 @@ __git_refs ()
 			track=""
 			;;
 		*)
-			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD; do
+			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD; do
 				case "$i" in
 				$match*)
 					if [ -e "$dir/$i" ]; then
@@ -696,13 +762,7 @@ __git_refs ()
 		__git_dir="$dir" __git for-each-ref --format="$fer_pfx%($format)$sfx" \
 			"${refs[@]}"
 		if [ -n "$track" ]; then
-			# employ the heuristic used by git checkout
-			# Try to find a remote branch that matches the completion word
-			# but only output if the branch name is unique
-			__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
-				--sort="refname:strip=3" \
-				"refs/remotes/*/$match*" "refs/remotes/*/$match*/**" | \
-			uniq -u
+			__git_dwim_remote_heads "$pfx" "$match" "$sfx"
 		fi
 		return
 	fi
@@ -749,29 +809,51 @@ __git_refs ()
 # Usage: __git_complete_refs [<option>]...
 # --remote=<remote>: The remote to list refs from, can be the name of a
 #                    configured remote, a path, or a URL.
-# --track: List unique remote branches for 'git checkout's tracking DWIMery.
+# --dwim: List unique remote branches for 'git switch's tracking DWIMery.
 # --pfx=<prefix>: A prefix to be added to each ref.
 # --cur=<word>: The current ref to be completed.  Defaults to the current
 #               word to be completed.
 # --sfx=<suffix>: A suffix to be appended to each ref instead of the default
 #                 space.
+# --mode=<mode>: What set of refs to complete, one of 'refs' (the default) to
+#                complete all refs, 'heads' to complete only branches, or
+#                'remote-heads' to complete only remote branches. Note that
+#                --remote is only compatible with --mode=refs.
 __git_complete_refs ()
 {
-	local remote track pfx cur_="$cur" sfx=" "
+	local remote= dwim= pfx= cur_="$cur" sfx=" " mode="refs"
 
 	while test $# != 0; do
 		case "$1" in
 		--remote=*)	remote="${1##--remote=}" ;;
-		--track)	track="yes" ;;
+		--dwim)		dwim="yes" ;;
+		# --track is an old spelling of --dwim
+		--track)	dwim="yes" ;;
 		--pfx=*)	pfx="${1##--pfx=}" ;;
 		--cur=*)	cur_="${1##--cur=}" ;;
 		--sfx=*)	sfx="${1##--sfx=}" ;;
+		--mode=*)	mode="${1##--mode=}" ;;
 		*)		return 1 ;;
 		esac
 		shift
 	done
 
-	__gitcomp_direct "$(__git_refs "$remote" "$track" "$pfx" "$cur_" "$sfx")"
+	# complete references based on the specified mode
+	case "$mode" in
+		refs)
+			__gitcomp_direct "$(__git_refs "$remote" "" "$pfx" "$cur_" "$sfx")" ;;
+		heads)
+			__gitcomp_direct "$(__git_heads "$pfx" "$cur_" "$sfx")" ;;
+		remote-heads)
+			__gitcomp_direct "$(__git_remote_heads "$pfx" "$cur_" "$sfx")" ;;
+		*)
+			return 1 ;;
+	esac
+
+	# Append DWIM remote branch names if requested
+	if [ "$dwim" = "yes" ]; then
+		__gitcomp_direct_append "$(__git_dwim_remote_heads "$pfx" "$cur_" "$sfx")"
+	fi
 }
 
 # __git_refs2 requires 1 argument (to pass to __git_refs)
@@ -924,8 +1006,8 @@ __git_complete_revlist ()
 
 __git_complete_remote_or_refspec ()
 {
-	local cur_="$cur" cmd="${words[1]}"
-	local i c=2 remote="" pfx="" lhs=1 no_complete_refspec=0
+	local cur_="$cur" cmd="${words[__git_cmd_idx]}"
+	local i c=$((__git_cmd_idx+1)) remote="" pfx="" lhs=1 no_complete_refspec=0
 	if [ "$cmd" = "remote" ]; then
 		((c++))
 	fi
@@ -1047,37 +1129,72 @@ __git_pretty_aliases ()
 # __git_aliased_command requires 1 argument
 __git_aliased_command ()
 {
-	local word cmdline=$(__git config --get "alias.$1")
-	for word in $cmdline; do
-		case "$word" in
-		\!gitk|gitk)
-			echo "gitk"
-			return
-			;;
-		\!*)	: shell command alias ;;
-		-*)	: option ;;
-		*=*)	: setting env ;;
-		git)	: git itself ;;
-		\(\))   : skip parens of shell function definition ;;
-		{)	: skip start of shell helper function ;;
-		:)	: skip null command ;;
-		\'*)	: skip opening quote after sh -c ;;
-		*)
-			echo "$word"
+	local cur=$1 last list= word cmdline
+
+	while [[ -n "$cur" ]]; do
+		if [[ "$list" == *" $cur "* ]]; then
+			# loop detected
 			return
-		esac
+		fi
+
+		cmdline=$(__git config --get "alias.$cur")
+		list=" $cur $list"
+		last=$cur
+		cur=
+
+		for word in $cmdline; do
+			case "$word" in
+			\!gitk|gitk)
+				cur="gitk"
+				break
+				;;
+			\!*)	: shell command alias ;;
+			-*)	: option ;;
+			*=*)	: setting env ;;
+			git)	: git itself ;;
+			\(\))   : skip parens of shell function definition ;;
+			{)	: skip start of shell helper function ;;
+			:)	: skip null command ;;
+			\'*)	: skip opening quote after sh -c ;;
+			*)
+				cur="$word"
+				break
+			esac
+		done
 	done
+
+	cur=$last
+	if [[ "$cur" != "$1" ]]; then
+		echo "$cur"
+	fi
 }
 
-# __git_find_on_cmdline requires 1 argument
+# Check whether one of the given words is present on the command line,
+# and print the first word found.
+#
+# Usage: __git_find_on_cmdline [<option>]... "<wordlist>"
+# --show-idx: Optionally show the index of the found word in the $words array.
 __git_find_on_cmdline ()
 {
-	local word subcommand c=1
+	local word c="$__git_cmd_idx" show_idx
+
+	while test $# -gt 1; do
+		case "$1" in
+		--show-idx)	show_idx=y ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+	local wordlist="$1"
+
 	while [ $c -lt $cword ]; do
-		word="${words[c]}"
-		for subcommand in $1; do
-			if [ "$subcommand" = "$word" ]; then
-				echo "$subcommand"
+		for word in $wordlist; do
+			if [ "$word" = "${words[c]}" ]; then
+				if [ -n "${show_idx-}" ]; then
+					echo "$c $word"
+				else
+					echo "$word"
+				fi
 				return
 			fi
 		done
@@ -1085,6 +1202,40 @@ __git_find_on_cmdline ()
 	done
 }
 
+# Similar to __git_find_on_cmdline, except that it loops backwards and thus
+# prints the *last* word found. Useful for finding which of two options that
+# supersede each other came last, such as "--guess" and "--no-guess".
+#
+# Usage: __git_find_last_on_cmdline [<option>]... "<wordlist>"
+# --show-idx: Optionally show the index of the found word in the $words array.
+__git_find_last_on_cmdline ()
+{
+	local word c=$cword show_idx
+
+	while test $# -gt 1; do
+		case "$1" in
+		--show-idx)	show_idx=y ;;
+		*)		return 1 ;;
+		esac
+		shift
+	done
+	local wordlist="$1"
+
+	while [ $c -gt "$__git_cmd_idx" ]; do
+		((c--))
+		for word in $wordlist; do
+			if [ "$word" = "${words[c]}" ]; then
+				if [ -n "$show_idx" ]; then
+					echo "$c $word"
+				else
+					echo "$word"
+				fi
+				return
+			fi
+		done
+	done
+}
+
 # Echo the value of an option set on the command line or config
 #
 # $1: short option name
@@ -1155,7 +1306,7 @@ __git_count_arguments ()
 	local word i c=0
 
 	# Skip "git" (first argument)
-	for ((i=1; i < ${#words[@]}; i++)); do
+	for ((i=$__git_cmd_idx; i < ${#words[@]}; i++)); do
 		word="${words[i]}"
 
 		case "$word" in
@@ -1180,7 +1331,9 @@ __git_count_arguments ()
 
 __git_whitespacelist="nowarn warn error error-all fix"
 __git_patchformat="mbox stgit stgit-series hg mboxrd"
+__git_showcurrentpatch="diff raw"
 __git_am_inprogress_options="--skip --continue --resolved --abort --quit --show-current-patch"
+__git_quoted_cr="nowarn warn strip"
 
 _git_am ()
 {
@@ -1198,6 +1351,14 @@ _git_am ()
 		__gitcomp "$__git_patchformat" "" "${cur##--patch-format=}"
 		return
 		;;
+	--show-current-patch=*)
+		__gitcomp "$__git_showcurrentpatch" "" "${cur##--show-current-patch=}"
+		return
+		;;
+	--quoted-cr=*)
+		__gitcomp "$__git_quoted_cr" "" "${cur##--quoted-cr=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin am "" \
 			"$__git_am_inprogress_options"
@@ -1286,13 +1447,15 @@ __git_ref_fieldlist="refname objecttype objectsize objectname upstream push HEAD
 
 _git_branch ()
 {
-	local i c=1 only_local_ref="n" has_r="n"
+	local i c="$__git_cmd_idx" only_local_ref="n" has_r="n"
 
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		-d|--delete|-m|--move)	only_local_ref="y" ;;
-		-r|--remotes)		has_r="y" ;;
+		-d|-D|--delete|-m|-M|--move|-c|-C|--copy)
+			only_local_ref="y" ;;
+		-r|--remotes)
+			has_r="y" ;;
 		esac
 		((c++))
 	done
@@ -1316,12 +1479,12 @@ _git_branch ()
 
 _git_bundle ()
 {
-	local cmd="${words[2]}"
+	local cmd="${words[__git_cmd_idx+1]}"
 	case "$cword" in
-	2)
+	$((__git_cmd_idx+1)))
 		__gitcomp "create list-heads verify unbundle"
 		;;
-	3)
+	$((__git_cmd_idx+2)))
 		# looking for a file
 		;;
 	*)
@@ -1334,10 +1497,73 @@ _git_bundle ()
 	esac
 }
 
+# Helper function to decide whether or not we should enable DWIM logic for
+# git-switch and git-checkout.
+#
+# To decide between the following rules in decreasing priority order:
+# - the last provided of "--guess" or "--no-guess" explicitly enable or
+#   disable completion of DWIM logic respectively.
+# - If checkout.guess is false, disable completion of DWIM logic.
+# - If the --no-track option is provided, take this as a hint to disable the
+#   DWIM completion logic
+# - If GIT_COMPLETION_CHECKOUT_NO_GUESS is set, disable the DWIM completion
+#   logic, as requested by the user.
+# - Enable DWIM logic otherwise.
+#
+__git_checkout_default_dwim_mode ()
+{
+	local last_option dwim_opt="--dwim"
+
+	if [ "${GIT_COMPLETION_CHECKOUT_NO_GUESS-}" = "1" ]; then
+		dwim_opt=""
+	fi
+
+	# --no-track disables DWIM, but with lower priority than
+	# --guess/--no-guess/checkout.guess
+	if [ -n "$(__git_find_on_cmdline "--no-track")" ]; then
+		dwim_opt=""
+	fi
+
+	# checkout.guess = false disables DWIM, but with lower priority than
+	# --guess/--no-guess
+	if [ "$(__git config --type=bool checkout.guess)" = "false" ]; then
+		dwim_opt=""
+	fi
+
+	# Find the last provided --guess or --no-guess
+	last_option="$(__git_find_last_on_cmdline "--guess --no-guess")"
+	case "$last_option" in
+		--guess)
+			dwim_opt="--dwim"
+			;;
+		--no-guess)
+			dwim_opt=""
+			;;
+	esac
+
+	echo "$dwim_opt"
+}
+
 _git_checkout ()
 {
 	__git_has_doubledash && return
 
+	local dwim_opt="$(__git_checkout_default_dwim_mode)"
+
+	case "$prev" in
+	-b|-B|--orphan)
+		# Complete local branches (and DWIM branch
+		# remote branch names) for an option argument
+		# specifying a new branch name. This is for
+		# convenience, assuming new branches are
+		# possibly based on pre-existing branch names.
+		__git_complete_refs $dwim_opt --mode="heads"
+		return
+		;;
+	*)
+		;;
+	esac
+
 	case "$cur" in
 	--conflict=*)
 		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
@@ -1346,14 +1572,21 @@ _git_checkout ()
 		__gitcomp_builtin checkout
 		;;
 	*)
-		# check if --track, --no-track, or --no-guess was specified
-		# if so, disable DWIM mode
-		local flags="--track --no-track --no-guess" track_opt="--track"
-		if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
-		   [ -n "$(__git_find_on_cmdline "$flags")" ]; then
-			track_opt=''
+		# At this point, we've already handled special completion for
+		# the arguments to -b/-B, and --orphan. There are 3 main
+		# things left we can possibly complete:
+		# 1) a start-point for -b/-B, -d/--detach, or --orphan
+		# 2) a remote head, for --track
+		# 3) an arbitrary reference, possibly including DWIM names
+		#
+
+		if [ -n "$(__git_find_on_cmdline "-b -B -d --detach --orphan")" ]; then
+			__git_complete_refs --mode="refs"
+		elif [ -n "$(__git_find_on_cmdline "--track")" ]; then
+			__git_complete_refs --mode="remote-heads"
+		else
+			__git_complete_refs $dwim_opt --mode="refs"
 		fi
-		__git_complete_refs $track_opt
 		;;
 	esac
 }
@@ -1470,9 +1703,16 @@ __git_diff_algorithms="myers minimal patience histogram"
 
 __git_diff_submodule_formats="diff log short"
 
+__git_color_moved_opts="no default plain blocks zebra dimmed-zebra"
+
+__git_color_moved_ws_opts="no ignore-space-at-eol ignore-space-change
+			ignore-all-space allow-indentation-change"
+
 __git_diff_common_options="--stat --numstat --shortstat --summary
 			--patch-with-stat --name-only --name-status --color
 			--no-color --color-words --no-renames --check
+			--color-moved --color-moved= --no-color-moved
+			--color-moved-ws= --no-color-moved-ws
 			--full-index --binary --abbrev --diff-filter=
 			--find-copies-harder --ignore-cr-at-eol
 			--text --ignore-space-at-eol --ignore-space-change
@@ -1488,8 +1728,14 @@ __git_diff_common_options="--stat --numstat --shortstat --summary
 			--submodule --submodule= --ignore-submodules
 			--indent-heuristic --no-indent-heuristic
 			--textconv --no-textconv
+			--patch --no-patch
+			--anchored=
 "
 
+__git_diff_difftool_options="--cached --staged --pickaxe-all --pickaxe-regex
+			--base --ours --theirs --no-index --relative --merge-base
+			$__git_diff_common_options"
+
 _git_diff ()
 {
 	__git_has_doubledash && return
@@ -1503,11 +1749,16 @@ _git_diff ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--color-moved=*)
+		__gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
+		return
+		;;
+	--color-moved-ws=*)
+		__gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
+		return
+		;;
 	--*)
-		__gitcomp "--cached --staged --pickaxe-all --pickaxe-regex
-			--base --ours --theirs --no-index
-			$__git_diff_common_options
-			"
+		__gitcomp "$__git_diff_difftool_options"
 		return
 		;;
 	esac
@@ -1515,8 +1766,8 @@ _git_diff ()
 }
 
 __git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
-			tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc
-			codecompare smerge
+			tkdiff vimdiff nvimdiff gvimdiff xxdiff araxis p4merge
+			bc codecompare smerge
 "
 
 _git_difftool ()
@@ -1529,11 +1780,7 @@ _git_difftool ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin difftool "$__git_diff_common_options
-					--base --cached --ours --theirs
-					--pickaxe-all --pickaxe-regex
-					--relative --staged
-					"
+		__gitcomp_builtin difftool "$__git_diff_difftool_options"
 		return
 		;;
 	esac
@@ -1575,6 +1822,10 @@ _git_format_patch ()
 			" "" "${cur##--thread=}"
 		return
 		;;
+	--base=*|--interdiff=*|--range-diff=*)
+		__git_complete_refs --cur="${cur#--*=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin format-patch "$__git_format_patch_extra_options"
 		return
@@ -1595,7 +1846,7 @@ _git_fsck ()
 
 _git_gitk ()
 {
-	_gitk
+	__gitk_main
 }
 
 # Lists matching symbol names from a tag (as in ctags) file.
@@ -1649,7 +1900,7 @@ _git_grep ()
 	esac
 
 	case "$cword,$prev" in
-	2,*|*,-*)
+	$((__git_cmd_idx+1)),*|*,-*)
 		__git_complete_symbol && return
 		;;
 	esac
@@ -1665,7 +1916,7 @@ _git_help ()
 		return
 		;;
 	esac
-	if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
+	if test -n "${GIT_TESTING_ALL_COMMAND_LIST-}"
 	then
 		__gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
 	else
@@ -1749,7 +2000,7 @@ __git_log_shortlog_options="
 	--all-match --invert-grep
 "
 
-__git_log_pretty_formats="oneline short medium full fuller email raw format: mboxrd"
+__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 ()
@@ -1819,7 +2070,6 @@ _git_log ()
 			--no-walk --no-walk= --do-walk
 			--parents --children
 			--expand-tabs --expand-tabs= --no-expand-tabs
-			--patch
 			$merge
 			$__git_diff_common_options
 			--pickaxe-all --pickaxe-regex
@@ -2043,6 +2293,10 @@ _git_rebase ()
 		__gitcomp "$__git_whitespacelist" "" "${cur##--whitespace=}"
 		return
 		;;
+	--onto=*)
+		__git_complete_refs --cur="${cur##--onto=}"
+		return
+		;;
 	--*)
 		__gitcomp_builtin rebase "" \
 			"$__git_rebase_interactive_inprogress_options"
@@ -2174,6 +2428,22 @@ _git_status ()
 
 _git_switch ()
 {
+	local dwim_opt="$(__git_checkout_default_dwim_mode)"
+
+	case "$prev" in
+	-c|-C|--orphan)
+		# Complete local branches (and DWIM branch
+		# remote branch names) for an option argument
+		# specifying a new branch name. This is for
+		# convenience, assuming new branches are
+		# possibly based on pre-existing branch names.
+		__git_complete_refs $dwim_opt --mode="heads"
+		return
+		;;
+	*)
+		;;
+	esac
+
 	case "$cur" in
 	--conflict=*)
 		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
@@ -2182,29 +2452,26 @@ _git_switch ()
 		__gitcomp_builtin switch
 		;;
 	*)
-		# check if --track, --no-track, or --no-guess was specified
-		# if so, disable DWIM mode
-		local track_opt="--track" only_local_ref=n
-		if [ "$GIT_COMPLETION_CHECKOUT_NO_GUESS" = "1" ] ||
-		   [ -n "$(__git_find_on_cmdline "--track --no-track --no-guess")" ]; then
-			track_opt=''
-		fi
-		# explicit --guess enables DWIM mode regardless of
-		# $GIT_COMPLETION_CHECKOUT_NO_GUESS
-		if [ -n "$(__git_find_on_cmdline "--guess")" ]; then
-			track_opt='--track'
-		fi
-		if [ -z "$(__git_find_on_cmdline "-d --detach")" ]; then
-			only_local_ref=y
-		else
-			# --guess --detach is invalid combination, no
-			# dwim will be done when --detach is specified
-			track_opt=
+		# Unlike in git checkout, git switch --orphan does not take
+		# a start point. Thus we really have nothing to complete after
+		# the branch name.
+		if [ -n "$(__git_find_on_cmdline "--orphan")" ]; then
+			return
 		fi
-		if [ $only_local_ref = y -a -z "$track_opt" ]; then
-			__gitcomp_direct "$(__git_heads "" "$cur" " ")"
+
+		# At this point, we've already handled special completion for
+		# -c/-C, and --orphan. There are 3 main things left to
+		# complete:
+		# 1) a start-point for -c/-C or -d/--detach
+		# 2) a remote head, for --track
+		# 3) a branch name, possibly including DWIM remote branches
+
+		if [ -n "$(__git_find_on_cmdline "-c -C -d --detach")" ]; then
+			__git_complete_refs --mode="refs"
+		elif [ -n "$(__git_find_on_cmdline "--track")" ]; then
+			__git_complete_refs --mode="remote-heads"
 		else
-			__git_complete_refs $track_opt
+			__git_complete_refs $dwim_opt --mode="heads"
 		fi
 		;;
 	esac
@@ -2213,7 +2480,7 @@ _git_switch ()
 __git_config_get_set_variables ()
 {
 	local prevword word config_file= c=$cword
-	while [ $c -gt 1 ]; do
+	while [ $c -gt "$__git_cmd_idx" ]; do
 		word="${words[c]}"
 		case "$word" in
 		--system|--global|--local|--file=*)
@@ -2383,10 +2650,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.*.*)
@@ -2420,7 +2687,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.*.*)
@@ -2436,7 +2703,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.*.*)
@@ -2611,6 +2878,13 @@ _git_reset ()
 
 _git_restore ()
 {
+	case "$prev" in
+	-s)
+		__git_complete_refs
+		return
+		;;
+	esac
+
 	case "$cur" in
 	--conflict=*)
 		__gitcomp "diff3 merge" "" "${cur##--conflict=}"
@@ -2691,9 +2965,17 @@ _git_show ()
 		__gitcomp "$__git_diff_submodule_formats" "" "${cur##--submodule=}"
 		return
 		;;
+	--color-moved=*)
+		__gitcomp "$__git_color_moved_opts" "" "${cur##--color-moved=}"
+		return
+		;;
+	--color-moved-ws=*)
+		__gitcomp "$__git_color_moved_ws_opts" "" "${cur##--color-moved-ws=}"
+		return
+		;;
 	--*)
 		__gitcomp "--pretty= --format= --abbrev-commit --no-abbrev-commit
-			--oneline --show-signature --patch
+			--oneline --show-signature
 			--expand-tabs --expand-tabs= --no-expand-tabs
 			$__git_diff_common_options
 			"
@@ -2714,72 +2996,78 @@ _git_show_branch ()
 	__git_complete_revlist
 }
 
+_git_sparse_checkout ()
+{
+	local subcommands="list init set disable"
+	local subcommand="$(__git_find_on_cmdline "$subcommands")"
+	if [ -z "$subcommand" ]; then
+		__gitcomp "$subcommands"
+		return
+	fi
+
+	case "$subcommand,$cur" in
+	init,--*)
+		__gitcomp "--cone"
+		;;
+	set,--*)
+		__gitcomp "--stdin"
+		;;
+	*)
+		;;
+	esac
+}
+
 _git_stash ()
 {
-	local save_opts='--all --keep-index --no-keep-index --quiet --patch --include-untracked'
 	local subcommands='push list show apply clear drop pop create branch'
 	local subcommand="$(__git_find_on_cmdline "$subcommands save")"
-	if [ -n "$(__git_find_on_cmdline "-p")" ]; then
-		subcommand="push"
-	fi
+
 	if [ -z "$subcommand" ]; then
-		case "$cur" in
-		--*)
-			__gitcomp "$save_opts"
+		case "$((cword - __git_cmd_idx)),$cur" in
+		*,--*)
+			__gitcomp_builtin stash_push
 			;;
-		sa*)
-			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
-				__gitcomp "save"
-			fi
+		1,sa*)
+			__gitcomp "save"
 			;;
-		*)
-			if [ -z "$(__git_find_on_cmdline "$save_opts")" ]; then
-				__gitcomp "$subcommands"
-			fi
+		1,*)
+			__gitcomp "$subcommands"
 			;;
 		esac
-	else
-		case "$subcommand,$cur" in
-		push,--*)
-			__gitcomp "$save_opts --message"
-			;;
-		save,--*)
-			__gitcomp "$save_opts"
-			;;
-		apply,--*|pop,--*)
-			__gitcomp "--index --quiet"
-			;;
-		drop,--*)
-			__gitcomp "--quiet"
-			;;
-		list,--*)
-			__gitcomp "--name-status --oneline --patch-with-stat"
-			;;
-		show,--*|branch,--*)
-			;;
-		branch,*)
-			if [ $cword -eq 3 ]; then
-				__git_complete_refs
-			else
-				__gitcomp_nl "$(__git stash list \
-						| sed -n -e 's/:.*//p')"
-			fi
-			;;
-		show,*|apply,*|drop,*|pop,*)
+		return
+	fi
+
+	case "$subcommand,$cur" in
+	list,--*)
+		# NEEDSWORK: can we somehow unify this with the options in _git_log() and _git_show()
+		__gitcomp_builtin stash_list "$__git_log_common_options $__git_diff_common_options"
+		;;
+	show,--*)
+		__gitcomp_builtin stash_show "$__git_diff_common_options"
+		;;
+	*,--*)
+		__gitcomp_builtin "stash_$subcommand"
+		;;
+	branch,*)
+		if [ $cword -eq $((__git_cmd_idx+2)) ]; then
+			__git_complete_refs
+		else
 			__gitcomp_nl "$(__git stash list \
 					| sed -n -e 's/:.*//p')"
-			;;
-		*)
-			;;
-		esac
-	fi
+		fi
+		;;
+	show,*|apply,*|drop,*|pop,*)
+		__gitcomp_nl "$(__git stash list \
+				| sed -n -e 's/:.*//p')"
+		;;
+	esac
 }
 
 _git_submodule ()
 {
 	__git_has_doubledash && return
 
-	local subcommands="add status init deinit update set-branch summary foreach sync absorbgitdirs"
+	local subcommands="add status init deinit update set-branch set-url summary foreach sync absorbgitdirs"
 	local subcommand="$(__git_find_on_cmdline "$subcommands")"
 	if [ -z "$subcommand" ]; then
 		case "$cur" in
@@ -2843,6 +3131,7 @@ _git_svn ()
 			--log-window-size= --no-checkout --quiet
 			--repack-flags --use-log-author --localtime
 			--add-author-from
+			--recursive
 			--ignore-paths= --include-paths= $remote_opts
 			"
 		local init_opts="
@@ -2924,7 +3213,7 @@ _git_svn ()
 
 _git_tag ()
 {
-	local i c=1 f=0
+	local i c="$__git_cmd_idx" f=0
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
@@ -2964,33 +3253,84 @@ _git_whatchanged ()
 	_git_log
 }
 
+__git_complete_worktree_paths ()
+{
+	local IFS=$'\n'
+	# Generate completion reply from worktree list skipping the first
+	# entry: it's the path of the main worktree, which can't be moved,
+	# removed, locked, etc.
+	__gitcomp_nl "$(git worktree list --porcelain |
+		sed -n -e '2,$ s/^worktree //p')"
+}
+
 _git_worktree ()
 {
 	local subcommands="add list lock move prune remove unlock"
-	local subcommand="$(__git_find_on_cmdline "$subcommands")"
-	if [ -z "$subcommand" ]; then
+	local subcommand subcommand_idx
+
+	subcommand="$(__git_find_on_cmdline --show-idx "$subcommands")"
+	subcommand_idx="${subcommand% *}"
+	subcommand="${subcommand#* }"
+
+	case "$subcommand,$cur" in
+	,*)
 		__gitcomp "$subcommands"
-	else
-		case "$subcommand,$cur" in
-		add,--*)
-			__gitcomp_builtin worktree_add
-			;;
-		list,--*)
-			__gitcomp_builtin worktree_list
-			;;
-		lock,--*)
-			__gitcomp_builtin worktree_lock
-			;;
-		prune,--*)
-			__gitcomp_builtin worktree_prune
-			;;
-		remove,--*)
-			__gitcomp "--force"
+		;;
+	*,--*)
+		__gitcomp_builtin worktree_$subcommand
+		;;
+	add,*)	# usage: git worktree add [<options>] <path> [<commit-ish>]
+		# Here we are not completing an --option, it's either the
+		# path or a ref.
+		case "$prev" in
+		-b|-B)	# Complete refs for branch to be created/reseted.
+			__git_complete_refs
 			;;
-		*)
+		-*)	# The previous word is an -o|--option without an
+			# unstuck argument: have to complete the path for
+			# the new worktree, so don't list anything, but let
+			# Bash fall back to filename completion.
+			;;
+		*)	# The previous word is not an --option, so it must
+			# be either the 'add' subcommand, the unstuck
+			# argument of an option (e.g. branch for -b|-B), or
+			# the path for the new worktree.
+			if [ $cword -eq $((subcommand_idx+1)) ]; then
+				# Right after the 'add' subcommand: have to
+				# complete the path, so fall back to Bash
+				# filename completion.
+				:
+			else
+				case "${words[cword-2]}" in
+				-b|-B)	# After '-b <branch>': have to
+					# complete the path, so fall back
+					# to Bash filename completion.
+					;;
+				*)	# After the path: have to complete
+					# the ref to be checked out.
+					__git_complete_refs
+					;;
+				esac
+			fi
 			;;
 		esac
-	fi
+		;;
+	lock,*|remove,*|unlock,*)
+		__git_complete_worktree_paths
+		;;
+	move,*)
+		if [ $cword -eq $((subcommand_idx+1)) ]; then
+			# The first parameter must be an existing working
+			# tree to be moved.
+			__git_complete_worktree_paths
+		else
+			# The second parameter is the destination: it could
+			# be any path, so don't list anything, but let Bash
+			# fall back to filename completion.
+			:
+		fi
+		;;
+	esac
 }
 
 __git_complete_common () {
@@ -3018,15 +3358,19 @@ __git_support_parseopt_helper () {
 	esac
 }
 
+__git_have_func () {
+	declare -f -- "$1" >/dev/null 2>&1
+}
+
 __git_complete_command () {
 	local command="$1"
 	local completion_func="_git_${command//-/_}"
-	if ! declare -f $completion_func >/dev/null 2>/dev/null &&
-		declare -f _completion_loader >/dev/null 2>/dev/null
+	if ! __git_have_func $completion_func &&
+		__git_have_func _completion_loader
 	then
 		_completion_loader "git-$command"
 	fi
-	if declare -f $completion_func >/dev/null 2>/dev/null
+	if __git_have_func $completion_func
 	then
 		$completion_func
 		return 0
@@ -3043,26 +3387,45 @@ __git_main ()
 {
 	local i c=1 command __git_dir __git_repo_path
 	local __git_C_args C_args_count=0
+	local __git_cmd_idx
 
 	while [ $c -lt $cword ]; do
 		i="${words[c]}"
 		case "$i" in
-		--git-dir=*) __git_dir="${i#--git-dir=}" ;;
-		--git-dir)   ((c++)) ; __git_dir="${words[c]}" ;;
-		--bare)      __git_dir="." ;;
-		--help) command="help"; break ;;
-		-c|--work-tree|--namespace) ((c++)) ;;
-		-C)	__git_C_args[C_args_count++]=-C
+		--git-dir=*)
+			__git_dir="${i#--git-dir=}"
+			;;
+		--git-dir)
+			((c++))
+			__git_dir="${words[c]}"
+			;;
+		--bare)
+			__git_dir="."
+			;;
+		--help)
+			command="help"
+			break
+			;;
+		-c|--work-tree|--namespace)
+			((c++))
+			;;
+		-C)
+			__git_C_args[C_args_count++]=-C
 			((c++))
 			__git_C_args[C_args_count++]="${words[c]}"
 			;;
-		-*) ;;
-		*) command="$i"; break ;;
+		-*)
+			;;
+		*)
+			command="$i"
+			__git_cmd_idx="$c"
+			break
+			;;
 		esac
 		((c++))
 	done
 
-	if [ -z "$command" ]; then
+	if [ -z "${command-}" ]; then
 		case "$prev" in
 		--git-dir|-C|--work-tree)
 			# these need a path argument, let's fall back to
@@ -3079,7 +3442,8 @@ __git_main ()
 			;;
 		esac
 		case "$cur" in
-		--*)   __gitcomp "
+		--*)
+			__gitcomp "
 			--paginate
 			--no-pager
 			--git-dir=
@@ -3097,7 +3461,7 @@ __git_main ()
 			"
 			;;
 		*)
-			if test -n "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
+			if test -n "${GIT_TESTING_PORCELAIN_COMMAND_LIST-}"
 			then
 				__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
 			else
@@ -3141,102 +3505,20 @@ __gitk_main ()
 	__git_complete_revlist
 }
 
-if [[ -n ${ZSH_VERSION-} ]] &&
-   # Don't define these functions when sourced from 'git-completion.zsh',
-   # it has its own implementations.
-   [[ -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
-	echo "WARNING: this script is deprecated, please see git-completion.zsh" 1>&2
-
-	autoload -U +X compinit && compinit
-
-	__gitcomp ()
-	{
-		emulate -L zsh
-
-		local cur_="${3-$cur}"
-
-		case "$cur_" in
-		--*=)
-			;;
-		*)
-			local c IFS=$' \t\n'
-			local -a array
-			for c in ${=1}; do
-				c="$c${4-}"
-				case $c in
-				--*=*|*.) ;;
-				*) c="$c " ;;
-				esac
-				array[${#array[@]}+1]="$c"
-			done
-			compset -P '*[=:]'
-			compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
-			;;
-		esac
-	}
-
-	__gitcomp_direct ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -Q -- ${=1} && _ret=0
-	}
-
-	__gitcomp_nl ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
-	}
-
-	__gitcomp_file_direct ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -f -- ${=1} && _ret=0
-	}
-
-	__gitcomp_file ()
-	{
-		emulate -L zsh
-
-		local IFS=$'\n'
-		compset -P '*[=:]'
-		compadd -p "${2-}" -f -- ${=1} && _ret=0
-	}
-
-	_git ()
-	{
-		local _ret=1 cur cword prev
-		cur=${words[CURRENT]}
-		prev=${words[CURRENT-1]}
-		let cword=CURRENT-1
-		emulate ksh -c __${service}_main
-		let _ret && _default && _ret=0
-		return _ret
-	}
-
-	compdef _git git gitk
+if [[ -n ${ZSH_VERSION-} && -z ${GIT_SOURCING_ZSH_COMPLETION-} ]]; then
+	echo "ERROR: this script is obsolete, please see git-completion.zsh" 1>&2
 	return
 fi
 
 __git_func_wrap ()
 {
 	local cur words cword prev
+	local __git_cmd_idx=0
 	_get_comp_words_by_ref -n =: cur words cword prev
 	$1
 }
 
-# Setup completion for certain functions defined above by setting common
-# variables and workarounds.
-# This is NOT a public function; use at your own risk.
-__git_complete ()
+___git_complete ()
 {
 	local wrapper="__git_wrap${2}"
 	eval "$wrapper () { __git_func_wrap $2 ; }"
@@ -3244,25 +3526,33 @@ __git_complete ()
 		|| complete -o default -o nospace -F $wrapper $1
 }
 
-# wrapper for backwards compatibility
-_git ()
+# Setup the completion for git commands
+# 1: command or alias
+# 2: function to call (e.g. `git`, `gitk`, `git_fetch`)
+__git_complete ()
 {
-	__git_wrap__git_main
-}
+	local func
 
-# wrapper for backwards compatibility
-_gitk ()
-{
-	__git_wrap__gitk_main
+	if __git_have_func $2; then
+		func=$2
+	elif __git_have_func __$2_main; then
+		func=__$2_main
+	elif __git_have_func _$2; then
+		func=_$2
+	else
+		echo "ERROR: could not find function '$2'" 1>&2
+		return 1
+	fi
+	___git_complete $1 $func
 }
 
-__git_complete git __git_main
-__git_complete gitk __gitk_main
+___git_complete git __git_main
+___git_complete gitk __gitk_main
 
 # The following are necessary only for Cygwin, and only are needed
 # when the user has tab-completed the executable name and consequently
 # included the '.exe' suffix.
 #
-if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then
-__git_complete git.exe __git_main
+if [ "$OSTYPE" = cygwin ]; then
+	___git_complete git.exe __git_main
 fi
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/completion/git-completion.zsh b/contrib/completion/git-completion.zsh
index eef4eff53d..cac6f61881 100644
--- a/contrib/completion/git-completion.zsh
+++ b/contrib/completion/git-completion.zsh
@@ -2,26 +2,24 @@
 
 # zsh completion wrapper for git
 #
-# Copyright (c) 2012-2013 Felipe Contreras <felipe.contreras@gmail.com>
+# Copyright (c) 2012-2020 Felipe Contreras <felipe.contreras@gmail.com>
 #
-# You need git's bash completion script installed somewhere, by default it
-# would be the location bash-completion uses.
+# The recommended way to install this script is to make a copy of it as a
+# file named '_git' inside any directory in your fpath.
 #
-# If your script is somewhere else, you can configure it on your ~/.zshrc:
+# For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git',
+# and then add the following to your ~/.zshrc file:
 #
-#  zstyle ':completion:*:*:git:*' script ~/.git-completion.zsh
+#  fpath=(~/.zsh $fpath)
 #
-# The recommended way to install this script is to make a copy of it in
-# ~/.zsh/ directory as ~/.zsh/git-completion.zsh and then add the following
-# to your ~/.zshrc file:
+# You need git's bash completion script installed. By default bash-completion's
+# location will be used (e.g. pkg-config --variable=completionsdir bash-completion).
+#
+# If your bash completion script is somewhere else, you can specify the
+# location in your ~/.zshrc:
+#
+#  zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
 #
-#  fpath=(~/.zsh $fpath)
-
-complete ()
-{
-	# do nothing
-	return 0
-}
 
 zstyle -T ':completion:*:*:git:*' tag-order && \
 	zstyle ':completion:*:*:git:*' tag-order 'common-commands'
@@ -29,18 +27,26 @@ zstyle -T ':completion:*:*:git:*' tag-order && \
 zstyle -s ":completion:*:*:git:*" script script
 if [ -z "$script" ]; then
 	local -a locations
-	local e
+	local e bash_completion
+
+	bash_completion=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null) ||
+		bash_completion='/usr/share/bash-completion/completions/'
+
 	locations=(
-		$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash
-		'/etc/bash_completion.d/git' # fedora, old debian
-		'/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian
-		'/usr/share/bash-completion/git' # gentoo
+		"$(dirname ${funcsourcetrace[1]%:*})"/git-completion.bash
+		"$HOME/.local/share/bash-completion/completions/git"
+		"$bash_completion/git"
+		'/etc/bash_completion.d/git' # old debian
 		)
 	for e in $locations; do
 		test -f $e && script="$e" && break
 	done
 fi
+
+local old_complete="$functions[complete]"
+functions[complete]=:
 GIT_SOURCING_ZSH_COMPLETION=y . "$script"
+functions[complete]="$old_complete"
 
 __gitcomp ()
 {
@@ -51,13 +57,35 @@ __gitcomp ()
 	case "$cur_" in
 	--*=)
 		;;
+	--no-*)
+		local c IFS=$' \t\n'
+		local -a array
+		for c in ${=1}; do
+			if [[ $c == "--" ]]; then
+				continue
+			fi
+			c="$c${4-}"
+			case $c in
+			--*=|*.) ;;
+			*) c="$c " ;;
+			esac
+			array+=("$c")
+		done
+		compset -P '*[=:]'
+		compadd -Q -S '' -p "${2-}" -a -- array && _ret=0
+		;;
 	*)
 		local c IFS=$' \t\n'
 		local -a array
 		for c in ${=1}; do
+			if [[ $c == "--" ]]; then
+				c="--no-...${4-}"
+				array+=("$c ")
+				break
+			fi
 			c="$c${4-}"
 			case $c in
-			--*=*|*.) ;;
+			--*=|*.) ;;
 			*) c="$c " ;;
 			esac
 			array+=("$c")
@@ -72,44 +100,58 @@ __gitcomp_direct ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
 	compset -P '*[=:]'
-	compadd -Q -- ${=1} && _ret=0
+	compadd -Q -S '' -- ${(f)1} && _ret=0
 }
 
 __gitcomp_nl ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
 	compset -P '*[=:]'
-	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+	compadd -Q -S "${4- }" -p "${2-}" -- ${(f)1} && _ret=0
 }
 
-__gitcomp_nl_append ()
+__gitcomp_file ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
-	compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0
+	compset -P '*[=:]'
+	compadd -f -p "${2-}" -- ${(f)1} && _ret=0
+}
+
+__gitcomp_direct_append ()
+{
+	__gitcomp_direct "$@"
+}
+
+__gitcomp_nl_append ()
+{
+	__gitcomp_nl "$@"
 }
 
 __gitcomp_file_direct ()
 {
-	emulate -L zsh
+	__gitcomp_file "$1" ""
+}
 
-	local IFS=$'\n'
-	compset -P '*[=:]'
-	compadd -f -- ${=1} && _ret=0
+_git_zsh ()
+{
+	__gitcomp "v1.1"
 }
 
-__gitcomp_file ()
+__git_complete_command ()
 {
 	emulate -L zsh
 
-	local IFS=$'\n'
-	compset -P '*[=:]'
-	compadd -p "${2-}" -f -- ${=1} && _ret=0
+	local command="$1"
+	local completion_func="_git_${command//-/_}"
+	if (( $+functions[$completion_func] )); then
+		emulate ksh -c $completion_func
+		return 0
+	else
+		return 1
+	fi
 }
 
 __git_zsh_bash_func ()
@@ -118,14 +160,12 @@ __git_zsh_bash_func ()
 
 	local command=$1
 
-	local completion_func="_git_${command//-/_}"
-	declare -f $completion_func >/dev/null && $completion_func && return
+	__git_complete_command "$command" && return
 
 	local expansion=$(__git_aliased_command "$command")
 	if [ -n "$expansion" ]; then
 		words[1]=$expansion
-		completion_func="_git_${expansion//-/_}"
-		declare -f $completion_func >/dev/null && $completion_func
+		__git_complete_command "$expansion"
 	fi
 }
 
@@ -150,9 +190,11 @@ __git_zsh_cmd_common ()
 	push:'update remote refs along with associated objects'
 	rebase:'forward-port local commits to the updated upstream head'
 	reset:'reset current HEAD to the specified state'
+	restore:'restore working tree files'
 	rm:'remove files from the working tree and from the index'
 	show:'show various types of objects'
 	status:'show the working tree status'
+	switch:'switch branches'
 	tag:'create, list, delete or verify a tag object signed with GPG')
 	_describe -t common-commands 'common commands' list && _ret=0
 }
@@ -160,8 +202,9 @@ __git_zsh_cmd_common ()
 __git_zsh_cmd_alias ()
 {
 	local -a list
-	list=(${${${(0)"$(git config -z --get-regexp '^alias\.')"}#alias.}%$'\n'*})
-	_describe -t alias-commands 'aliases' list $* && _ret=0
+	list=(${${(0)"$(git config -z --get-regexp '^alias\.*')"}#alias.})
+	list=(${(f)"$(printf "%s:alias for '%s'\n" ${(f@)list})"})
+	_describe -t alias-commands 'aliases' list && _ret=0
 }
 
 __git_zsh_cmd_all ()
@@ -199,13 +242,16 @@ __git_zsh_main ()
 
 	case $state in
 	(command)
-		_alternative \
-                         'alias-commands:alias:__git_zsh_cmd_alias' \
-                         'common-commands:common:__git_zsh_cmd_common' \
-                         'all-commands:all:__git_zsh_cmd_all' && _ret=0
+		_tags common-commands alias-commands all-commands
+		while _tags; do
+			_requested common-commands && __git_zsh_cmd_common
+			_requested alias-commands && __git_zsh_cmd_alias
+			_requested all-commands && __git_zsh_cmd_all
+			let _ret || break
+		done
 		;;
 	(arg)
-		local command="${words[1]}" __git_dir
+		local command="${words[1]}" __git_dir __git_cmd_idx=1
 
 		if (( $+opt_args[--bare] )); then
 			__git_dir='.'
@@ -233,8 +279,12 @@ _git ()
 
 	if (( $+functions[__${service}_zsh_main] )); then
 		__${service}_zsh_main
-	else
+	elif (( $+functions[__${service}_main] )); then
 		emulate ksh -c __${service}_main
+	elif (( $+functions[_${service}] )); then
+		emulate ksh -c _${service}
+	elif ((	$+functions[_${service//-/_}] )); then
+		emulate ksh -c _${service//-/_}
 	fi
 
 	let _ret && _default && _ret=0
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index 1d510cd47b..db7c0068fb 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -70,6 +70,15 @@
 # state symbols by setting GIT_PS1_STATESEPARATOR. The default separator
 # is SP.
 #
+# When there is an in-progress operation such as a merge, rebase,
+# revert, cherry-pick, or bisect, the prompt will include information
+# related to the operation, often in the form "|<OPERATION-NAME>".
+#
+# When the repository has a sparse-checkout, a notification of the form
+# "|SPARSE" will be included in the prompt.  This can be shortened to a
+# single '?' character by setting GIT_PS1_COMPRESSSPARSESTATE, or omitted
+# by setting GIT_PS1_OMITSPARSESTATE.
+#
 # By default, __git_ps1 will compare HEAD to your SVN upstream if it can
 # find one, or @{upstream} otherwise.  Once you have set
 # GIT_PS1_SHOWUPSTREAM, you can override it on a per-repository basis by
@@ -88,7 +97,8 @@
 # If you would like a colored hint about the current dirty state, set
 # GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
 # the colored output of "git status -sb" and are available only when
-# using __git_ps1 for PROMPT_COMMAND or precmd.
+# using __git_ps1 for PROMPT_COMMAND or precmd in Bash,
+# but always available in Zsh.
 #
 # If you would like __git_ps1 to do nothing in the case when the current
 # directory is set up to be ignored by git, then set
@@ -128,6 +138,7 @@ __git_ps1_show_upstream ()
 	done <<< "$output"
 
 	# parse configuration values
+	local option
 	for option in ${GIT_PS1_SHOWUPSTREAM}; do
 		case "$option" in
 		git|svn) upstream="$option" ;;
@@ -421,6 +432,13 @@ __git_ps1 ()
 		return $exit
 	fi
 
+	local sparse=""
+	if [ -z "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
+	   [ -z "${GIT_PS1_OMITSPARSESTATE-}" ] &&
+	   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
+		sparse="|SPARSE"
+	fi
+
 	local r=""
 	local b=""
 	local step=""
@@ -429,11 +447,7 @@ __git_ps1 ()
 		__git_eread "$g/rebase-merge/head-name" b
 		__git_eread "$g/rebase-merge/msgnum" step
 		__git_eread "$g/rebase-merge/end" total
-		if [ -f "$g/rebase-merge/interactive" ]; then
-			r="|REBASE-i"
-		else
-			r="|REBASE-m"
-		fi
+		r="|REBASE"
 	else
 		if [ -d "$g/rebase-apply" ]; then
 			__git_eread "$g/rebase-apply/next" step
@@ -496,6 +510,7 @@ __git_ps1 ()
 	local i=""
 	local s=""
 	local u=""
+	local h=""
 	local c=""
 	local p=""
 
@@ -528,6 +543,11 @@ __git_ps1 ()
 			u="%${ZSH_VERSION+%}"
 		fi
 
+		if [ -n "${GIT_PS1_COMPRESSSPARSESTATE-}" ] &&
+		   [ "$(git config --bool core.sparseCheckout)" = "true" ]; then
+			h="?"
+		fi
+
 		if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then
 			__git_ps1_show_upstream
 		fi
@@ -535,9 +555,11 @@ __git_ps1 ()
 
 	local z="${GIT_PS1_STATESEPARATOR-" "}"
 
-	# NO color option unless in PROMPT_COMMAND mode
-	if [ $pcmode = yes ] && [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-		__git_ps1_colorize_gitstring
+	# NO color option unless in PROMPT_COMMAND mode or it's Zsh
+	if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
+		if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
+			__git_ps1_colorize_gitstring
+		fi
 	fi
 
 	b=${b##refs/heads/}
@@ -546,8 +568,8 @@ __git_ps1 ()
 		b="\${__git_ps1_branch_name}"
 	fi
 
-	local f="$w$i$s$u"
-	local gitstring="$c$b${f:+$z$f}$r$p"
+	local f="$h$w$i$s$u"
+	local gitstring="$c$b${f:+$z$f}${sparse}$r$p"
 
 	if [ $pcmode = yes ]; then
 		if [ "${__git_printf_supports_v-}" != yes ]; then
diff --git a/contrib/credential/netrc/.gitignore b/contrib/credential/netrc/.gitignore
new file mode 100644
index 0000000000..d41cdde84b
--- /dev/null
+++ b/contrib/credential/netrc/.gitignore
@@ -0,0 +1 @@
+git-credential-netrc
diff --git a/contrib/credential/netrc/Makefile b/contrib/credential/netrc/Makefile
index 6174e3bb83..c284fb8ac4 100644
--- a/contrib/credential/netrc/Makefile
+++ b/contrib/credential/netrc/Makefile
@@ -1,8 +1,30 @@
 # The default target of this Makefile is...
 all::
 
-test:
+SCRIPT_PERL = git-credential-netrc.perl
+GIT_ROOT_DIR = ../../..
+HERE = contrib/credential/netrc
+
+SCRIPT_PERL_FULL = $(patsubst %,$(HERE)/%,$(SCRIPT_PERL))
+
+all:: build
+
+build:
+	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
+                build-perl-script
+
+install: build
+	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
+                install-perl-script
+
+clean:
+	$(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL="$(SCRIPT_PERL_FULL)" \
+                clean-perl-script
+
+test: build
 	./t-git-credential-netrc.sh
 
-testverbose:
+testverbose: build
 	./t-git-credential-netrc.sh -d -v
+
+.PHONY: all build install clean test testverbose
diff --git a/contrib/credential/netrc/git-credential-netrc b/contrib/credential/netrc/git-credential-netrc.perl
index ebfc123ec6..bc57cc6588 100755
--- a/contrib/credential/netrc/git-credential-netrc
+++ b/contrib/credential/netrc/git-credential-netrc.perl
@@ -423,7 +423,7 @@ sub load_config {
 	# load settings from git config
 	my $options = shift;
 	# set from command argument, gpg.program option, or default to gpg
-	$options->{'gpg'} //= Git->repository()->config('gpg.program')
+	$options->{'gpg'} //= Git::config('gpg.program')
 	                  // 'gpg';
 	log_verbose("using $options{'gpg'} for GPG operations");
 }
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/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm
index e2589922a6..376f577737 100644
--- a/contrib/diff-highlight/DiffHighlight.pm
+++ b/contrib/diff-highlight/DiffHighlight.pm
@@ -112,7 +112,7 @@ sub handle_line {
 	# Since we can receive arbitrary input, there's no optimal
 	# place to flush. Flushing on a blank line is a heuristic that
 	# happens to match git-log output.
-	if (!length) {
+	if (/^$/) {
 		$flush_cb->();
 	}
 }
diff --git a/contrib/fast-import/import-tars.perl b/contrib/fast-import/import-tars.perl
index e800d9f5c9..d50ce26d5d 100755
--- a/contrib/fast-import/import-tars.perl
+++ b/contrib/fast-import/import-tars.perl
@@ -139,6 +139,8 @@ foreach my $tar_file (@ARGV)
 			print FI "\n";
 		}
 
+		next if ($typeflag eq 'g'); # ignore global header
+
 		my $path;
 		if ($prefix) {
 			$path = "$prefix/$name";
diff --git a/contrib/git-resurrect.sh b/contrib/git-resurrect.sh
index 8c171dd959..d843df3afd 100755
--- a/contrib/git-resurrect.sh
+++ b/contrib/git-resurrect.sh
@@ -27,7 +27,7 @@ n,dry-run            don't recreate the branch"
 
 search_reflog () {
 	sed -ne 's~^\([^ ]*\) .*	checkout: moving from '"$1"' .*~\1~p' \
-                < "$GIT_DIR"/logs/HEAD
+		< "$GIT_DIR"/logs/HEAD
 }
 
 search_reflog_merges () {
@@ -37,19 +37,18 @@ search_reflog_merges () {
 	)
 }
 
-_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"
+oid_pattern=$(git hash-object --stdin </dev/null | sed -e 's/./[0-9a-f]/g')
 
 search_merges () {
-        git rev-list --all --grep="Merge branch '$1'" \
-                --pretty=tformat:"%P %s" |
-        sed -ne "/^$_x40 \($_x40\) Merge .*/ {s//\1/p;$early_exit}"
+	git rev-list --all --grep="Merge branch '$1'" \
+		--pretty=tformat:"%P %s" |
+	sed -ne "/^$oid_pattern \($oid_pattern\) Merge .*/ {s//\1/p;$early_exit}"
 }
 
 search_merge_targets () {
 	git rev-list --all --grep="Merge branch '[^']*' into $branch\$" \
 		--pretty=tformat:"%H %s" --all |
-	sed -ne "/^\($_x40\) Merge .*/ {s//\1/p;$early_exit} "
+	sed -ne "/^\($oid_pattern\) Merge .*/ {s//\1/p;$early_exit} "
 }
 
 dry_run=
diff --git a/contrib/hooks/multimail/CHANGES b/contrib/hooks/multimail/CHANGES
deleted file mode 100644
index 35791fd02c..0000000000
--- a/contrib/hooks/multimail/CHANGES
+++ /dev/null
@@ -1,285 +0,0 @@
-Release 1.5.0
-=============
-
-Backward-incompatible change
-----------------------------
-
-The name of classes for environment was misnamed as `*Environement`.
-It is now `*Environment`.
-
-New features
-------------
-
-* A Thread-Index header is now added to each email sent (except for
-  combined emails where it would not make sense), so that MS Outlook
-  properly groups messages by threads even though they have a
-  different subject line. Unfortunately, even adding this header the
-  threading still seems to be unreliable, but it is unclear whether
-  this is an issue on our side or on MS Outlook's side (see discussion
-  here: https://github.com/git-multimail/git-multimail/pull/194).
-
-* A new variable multimailhook.ExcludeMergeRevisions was added to send
-  notification emails only for non-merge commits.
-
-* For gitolite environment, it is now possible to specify the mail map
-  in a separate file in addition to gitolite.conf, using the variable
-  multimailhook.MailaddressMap.
-
-Internal changes
-----------------
-
-* The testsuite now uses GIT_PRINT_SHA1_ELLIPSIS where needed for
-  compatibility with recent Git versions. Only tests are affected.
-
-* We don't try to install pyflakes in the continuous integration job
-  for old Python versions where it's no longer available.
-
-* Stop using the deprecated cgi.escape in Python 3.
-
-* New flake8 warnings have been fixed.
-
-* Python 3.6 is now tested against on Travis-CI.
-
-* A bunch of lgtm.com warnings have been fixed.
-
-Bug fixes
----------
-
-* SMTPMailer logs in only once now. It used to re-login for each email
-  sent which triggered errors for some SMTP servers.
-
-* migrate-mailhook-config was broken by internal refactoring, it
-  should now work again.
-
-This version was tested with Python 2.6 to 3.7. It was tested with Git
-1.7.10.406.gdc801, 2.15.1 and 2.20.1.98.gecbdaf0.
-
-Release 1.4.0
-=============
-
-New features to troubleshoot a git-multimail installation
----------------------------------------------------------
-
-* One can now perform a basic check of git-multimail's setup by
-  running the hook with the environment variable
-  GIT_MULTIMAIL_CHECK_SETUP set to a non-empty string. See
-  doc/troubleshooting.rst for details.
-
-* A new log files system was added. See the multimailhook.logFile,
-  multimailhook.errorLogFile and multimailhook.debugLogFile variables.
-
-* git_multimail.py can now be made more verbose using
-  multimailhook.verbose.
-
-* A new option --check-ref-filter is now available to help debugging
-  the refFilter* options.
-
-Formatting emails
------------------
-
-* Formatting of emails was made slightly more compact, to reduce the
-  odds of having long subject lines truncated or wrapped in short list
-  of commits.
-
-* multimailhook.emailPrefix may now use the '%(repo_shortname)s'
-  placeholder for the repository's short name.
-
-* A new option multimailhook.subjectMaxLength is available to truncate
-  overly long subject lines.
-
-Bug fixes and minor changes
----------------------------
-
-* Options refFilterDoSendRegex and refFilterDontSendRegex were
-  essentially broken. They should work now.
-
-* The behavior when both refFilter{Do,Dont}SendRegex and
-  refFilter{Exclusion,Inclusion}Regex are set have been slightly
-  changed. Exclusion/Inclusion is now strictly stronger than
-  DoSend/DontSend.
-
-* The management of precedence when a setting can be computed in
-  multiple ways has been considerably refactored and modified.
-  multimailhook.from and multimailhook.reponame now have precedence
-  over the environment-specific settings ($GL_REPO/$GL_USER for
-  gitolite, --stash-user/repo for Stash, --submitter/--project for
-  Gerrit).
-
-* The coverage of the testsuite has been considerably improved. All
-  configuration variables now appear at least once in the testsuite.
-
-This version was tested with Python 2.6 to 3.5. It also mostly works
-with Python 2.4, but there is one known breakage in the testsuite
-related to non-ascii characters. It was tested with Git
-1.7.10.406.gdc801, 1.8.5.6, 2.1.4, and 2.10.0.rc0.1.g07c9292.
-
-Release 1.3.1 (bugfix-only release)
-===================================
-
-* Generate links to commits in combined emails (it was done only for
-  commit emails in 1.3.0).
-
-* Fix broken links on PyPi.
-
-Release 1.3.0
-=============
-
-* New options multimailhook.htmlInIntro and multimailhook.htmlInFooter
-  now allow using HTML in the introduction and footer of emails (e.g.
-  for a more pleasant formatting or to insert a link to the commit on
-  a web interface).
-
-* A new option multimailhook.commitBrowseURL gives a simpler (and less
-  flexible) way to add a link to a web interface for commit emails
-  than multimailhook.htmlInIntro and multimailhook.htmlInFooter.
-
-* A new public function config.add_config_parameters was added to
-  allow custom hooks to set specific Git configuration variables
-  without modifying the configuration files. See an example in
-  post-receive.example.
-
-* Error handling for SMTP has been improved (we used to print Python
-  backtraces for legitimate errors).
-
-* The SMTP mailer can now check TLS certificates when the newly added
-  configuration variable multimailhook.smtpCACerts.
-
-* Python 3 portability has been improved.
-
-* The documentation's formatting has been improved.
-
-* The testsuite has been improved (we now use pyflakes to check for
-  errors in the code).
-
-This version has been tested with Python 2.4 and 2.6 to 3.5, and Git
-v1.7.10-406-gdc801e7, 2.1.4 and 2.8.1.339.g3ad15fd.
-
-No change since 1.3 RC1.
-
-Release 1.2.0
-=============
-
-* It is now possible to exclude some refs (e.g. exclude some branches
-  or tags). See refFilterDoSendRegex, refFilterDontSendRegex,
-  refFilterInclusionRegex and refFilterExclusionRegex.
-
-* New commitEmailFormat option which can be set to "html" to generate
-  simple colorized diffs using HTML for the commit emails.
-
-* git-multimail can now be ran as a Gerrit ref-updated hook, or from
-  Atlassian BitBucket Server (formerly known as Atlassian Stash).
-
-* The From: field is now more customizeable. It can be set
-  independently for refchange emails and commit emails (see
-  fromCommit, fromRefChange). The special values pusher and author can
-  be used in these configuration variable.
-
-* A new command-line option, --version, was added. The version is also
-  available in the X-Git-Multimail-Version header of sent emails.
-
-* Set X-Git-NotificationType header to differentiate the various types
-  of notifications. Current values are: diff, ref_changed_plus_diff,
-  ref_changed.
-
-* Preliminary support for Python 3. The testsuite passes with Python 3,
-  but it has not received as much testing as the Python 2 version yet.
-
-* Several encoding-related fixes. UTF-8 characters work in more
-  situations (but non-ascii characters in email address are still not
-  supported).
-
-* The testsuite and its documentation has been greatly improved.
-
-Plus all the bugfixes from version 1.1.1.
-
-This version has been tested with Python 2.4 and 2.6 to 3.5, and Git
-v1.7.10-406-gdc801e7, git-1.8.2.3 and 2.6.0. Git versions prior to
-v1.7.10-406-gdc801e7 probably work, but cannot run the testsuite
-properly.
-
-Release 1.1.1 (bugfix-only release)
-===================================
-
-* The SMTP mailer was not working with Python 2.4.
-
-Release 1.1.0
-=============
-
-* When a single commit is pushed, omit the reference changed email.
-  Set multimailhook.combineWhenSingleCommit to false to disable this
-  new feature.
-
-* In gitolite environments, the pusher's email address can be used as
-  the From address by creating a specially formatted comment block in
-  gitolite.conf (see multimailhook.from in README).
-
-* Support for SMTP authentication and SSL/TLS encryption was added,
-  see smtpUser, smtpPass, smtpEncryption in README.
-
-* A new option scanCommitForCc was added to allow git-multimail to
-  search the commit message for 'Cc: ...' lines, and add the
-  corresponding emails in Cc.
-
-* If $USER is not set, use the variable $USERNAME. This is needed on
-  Windows platform to recognize the pusher.
-
-* The emailPrefix variable can now be set to an empty string to remove
-  the prefix.
-
-* A short tutorial was added in doc/gitolite.rst to set up
-  git-multimail with gitolite.
-
-* The post-receive file was renamed to post-receive.example. It has
-  always been an example (the standard way to call git-multimail is to
-  call git_multimail.py), but it was unclear to many users.
-
-* A new refchangeShowGraph option was added to make it possible to
-  include both a graph and a log in the summary emails.  The options
-  to control the graph formatting can be set via the new graphOpts
-  option.
-
-* New option --force-send was added to disable new commit detection
-  for update hook. One use-case is to run git_multimail.py after
-  running "git fetch" to send emails about commits that have just been
-  fetched (the detection of new commits was unreliable in this mode).
-
-* The testing infrastructure was considerably improved (continuous
-  integration with travis-ci, automatic check of PEP8 and RST syntax,
-  many improvements to the test scripts).
-
-This version has been tested with Python 2.4 to 2.7, and Git 1.7.1 to
-2.4.
-
-Release 1.0.0
-=============
-
-* Fix encoding of non-ASCII email addresses in email headers.
-
-* Fix backwards-compatibility bugs for older Python 2.x versions.
-
-* Fix a backwards-compatibility bug for Git 1.7.1.
-
-* Add an option commitDiffOpts to customize logs for revisions.
-
-* Pass "-oi" to sendmail by default to prevent premature termination
-  on a line containing only ".".
-
-* Stagger email "Date:" values in an attempt to help mail clients
-  thread the emails in the right order.
-
-* If a mailing list setting is missing, just skip sending the
-  corresponding email (with a warning) instead of failing.
-
-* Add a X-Git-Host header that can be used for email filtering.
-
-* Allow the sender's fully-qualified domain name to be configured.
-
-* Minor documentation improvements.
-
-* Add this CHANGES file.
-
-
-Release 0.9.0
-=============
-
-* Initial release.
diff --git a/contrib/hooks/multimail/CONTRIBUTING.rst b/contrib/hooks/multimail/CONTRIBUTING.rst
deleted file mode 100644
index de20a54287..0000000000
--- a/contrib/hooks/multimail/CONTRIBUTING.rst
+++ /dev/null
@@ -1,60 +0,0 @@
-Contributing
-============
-
-git-multimail is an open-source project, built by volunteers. We would
-welcome your help!
-
-The current maintainers are `Matthieu Moy <http://matthieu-moy.fr>`__ and
-`Michael Haggerty <https://github.com/mhagger>`__.
-
-Please note that although a copy of git-multimail is distributed in
-the "contrib" section of the main Git project, development takes place
-in a separate `git-multimail repository on GitHub`_.
-
-Whenever enough changes to git-multimail have accumulated, a new
-code-drop of git-multimail will be submitted for inclusion in the Git
-project.
-
-We use the GitHub issue tracker to keep track of bugs and feature
-requests, and we use GitHub pull requests to exchange patches (though,
-if you prefer, you can send patches via the Git mailing list with CC
-to the maintainers). Please sign off your patches as per the `Git
-project practice
-<https://github.com/git/git/blob/master/Documentation/SubmittingPatches#L234>`__.
-
-Please vote for issues you would like to be addressed in priority
-(click "add your reaction" and then the "+1" thumbs-up button on the
-GitHub issue).
-
-General discussion of git-multimail can take place on the main `Git
-mailing list`_.
-
-Please CC emails regarding git-multimail to the maintainers so that we
-don't overlook them.
-
-Help needed: testers/maintainer for specific environments/OS
-------------------------------------------------------------
-
-The current maintainer uses and tests git-multimail on Linux with the
-Generic environment. More testers, or better contributors are needed
-to test git-multimail on other real-life setups:
-
-* Mac OS X, Windows: git-multimail is currently not supported on these
-  platforms. But since we have no external dependencies and try to
-  write code as portable as possible, it is possible that
-  git-multimail already runs there and if not, it is likely that it
-  could be ported easily.
-
-  Patches to improve support for Windows and OS X are welcome.
-  Ideally, there would be a sub-maintainer for each OS who would test
-  at least once before each release (around twice a year).
-
-* Gerrit, Stash, Gitolite environments: although the testsuite
-  contains tests for these environments, a tester/maintainer for each
-  environment would be welcome to test and report failure (or success)
-  on real-life environments periodically (here also, feedback before
-  each release would be highly appreciated).
-
-
-.. _`git-multimail repository on GitHub`: https://github.com/git-multimail/git-multimail
-.. _`Git mailing list`: git@vger.kernel.org
diff --git a/contrib/hooks/multimail/README.Git b/contrib/hooks/multimail/README.Git
index 044444245d..c427efc7bd 100644
--- a/contrib/hooks/multimail/README.Git
+++ b/contrib/hooks/multimail/README.Git
@@ -1,15 +1,7 @@
-This copy of git-multimail is distributed as part of the "contrib"
-section of the Git project as a convenience to Git users.
 git-multimail is developed as an independent project at the following
 website:
 
     https://github.com/git-multimail/git-multimail
 
-The version in this directory was obtained from the upstream project
-on January 07 2019 and consists of the "git-multimail" subdirectory from
-revision
-
-    04e80e6c40be465cc62b6c246f0fcb8fd2cfd454 refs/tags/1.5.0
-
-Please see the README file in this directory for information about how
-to report bugs or contribute to git-multimail.
+Please refer to that project page for information about how to report
+bugs or contribute to git-multimail.
diff --git a/contrib/hooks/multimail/README.migrate-from-post-receive-email b/contrib/hooks/multimail/README.migrate-from-post-receive-email
deleted file mode 100644
index 1e6a976699..0000000000
--- a/contrib/hooks/multimail/README.migrate-from-post-receive-email
+++ /dev/null
@@ -1,145 +0,0 @@
-git-multimail is close to, but not exactly, a plug-in replacement for
-the old Git project script contrib/hooks/post-receive-email.  This
-document describes the differences and explains how to configure
-git-multimail to get behavior closest to that of post-receive-email.
-
-If you are in a hurry
-=====================
-
-A script called migrate-mailhook-config is included with
-git-multimail.  If you run this script within a Git repository that is
-configured to use post-receive-email, it will convert the
-configuration settings into the approximate equivalent settings for
-git-multimail.  For more information, run
-
-    migrate-mailhook-config --help
-
-
-Configuration differences
-=========================
-
-* The names of the config options for git-multimail are in namespace
-  "multimailhook.*" instead of "hooks.*".  (Editorial comment:
-  post-receive-email should never have used such a generic top-level
-  namespace.)
-
-* In emails about new annotated tags, post-receive-email includes a
-  shortlog of all changes since the previous annotated tag.  To get
-  this behavior with git-multimail, you need to set
-  multimailhook.announceshortlog to true:
-
-      git config multimailhook.announceshortlog true
-
-* multimailhook.commitlist -- This is a new configuration variable.
-  Recipients listed here will receive a separate email for each new
-  commit.  However, if this variable is *not* set, it defaults to the
-  value of multimailhook.mailinglist.  Therefore, if you *don't* want
-  the members of multimailhook.mailinglist to receive one email per
-  commit, then set this value to the empty string:
-
-      git config multimailhook.commitlist ''
-
-* multimailhook.emailprefix -- If this value is not set, then the
-  subjects of generated emails are prefixed with the short name of the
-  repository enclosed in square brackets; e.g., "[myrepo]".
-  post-receive-email defaults to prefix "[SCM]" if this option is not
-  set.  So if you were using the old default and want to retain it
-  (for example, to avoid having to change your email filters), set
-  this variable explicitly to the old value:
-
-      git config multimailhook.emailprefix "[SCM]"
-
-* The "multimailhook.showrev" configuration option is not supported.
-  Its main use is obsoleted by the one-email-per-commit feature of
-  git-multimail.
-
-
-Other differences
-=================
-
-This section describes other differences in the behavior of
-git-multimail vs. post-receive-email.  For full details, please refer
-to the main README file:
-
-* One email per commit.  For each reference change, the script first
-  outputs one email summarizing the reference change (including
-  one-line summaries of the new commits), then it outputs a separate
-  email for each new commit that was introduced, including patches.
-  These one-email-per-commit emails go to the addresses listed in
-  multimailhook.commitlist.  post-receive-email sends only one email
-  for each *reference* that is changed, no matter how many commits
-  were added to the reference.
-
-* Better algorithm for detecting new commits.  post-receive-email
-  processes one reference change at a time, which causes it to fail to
-  describe new commits that were included in multiple branches.  For
-  example, if a single push adds the "*" commits in the diagram below,
-  then post-receive-email would never include the details of the two
-  commits that are common to "master" and "branch" in its
-  notifications.
-
-      o---o---o---*---*---*    <-- master
-                       \
-                        *---*  <-- branch
-
-  git-multimail analyzes all reference modifications to determine
-  which commits were not present before the change, therefore avoiding
-  that error.
-
-* In reference change emails, git-multimail tells which commits have
-  been added to the reference vs. are entirely new to the repository,
-  and which commits that have been omitted from the reference
-  vs. entirely discarded from the repository.
-
-* The environment in which Git is running can be configured via an
-  "Environment" abstraction.
-
-* Built-in support for Gitolite-managed repositories.
-
-* Instead of using full SHA1 object names in emails, git-multimail
-  mostly uses abbreviated SHA1s, plus one-line log message summaries
-  where appropriate.
-
-* In the schematic diagrams that explain non-fast-forward commits,
-  git-multimail shows the names of the branches involved.
-
-* The emails generated by git-multimail include the name of the Git
-  repository that was modified; this is convenient for recipients who
-  are monitoring multiple repositories.
-
-* git-multimail allows the email "From" addresses to be configured.
-
-* The recipients lists (multimailhook.mailinglist,
-  multimailhook.refchangelist, multimailhook.announcelist, and
-  multimailhook.commitlist) can be comma-separated values and/or
-  multivalued settings in the config file; e.g.,
-
-      [multimailhook]
-              mailinglist = mr.brown@example.com, mr.black@example.com
-              announcelist = Him <him@example.com>
-              announcelist = Jim <jim@example.com>
-              announcelist = pop@example.com
-
-  This might make it easier to maintain short recipients lists without
-  requiring full-fledged mailing list software.
-
-* By default, git-multimail sets email "Reply-To" headers to reply to
-  the pusher (for reference updates) and to the author (for commit
-  notifications).  By default, the pusher's email address is
-  constructed by appending "multimailhook.emaildomain" to the pusher's
-  username.
-
-* The generated emails contain a configurable footer.  By default, it
-  lists the name of the administrator who should be contacted to
-  unsubscribe from notification emails.
-
-* New option multimailhook.emailmaxlinelength to limit the length of
-  lines in the main part of the email body.  The default limit is 500
-  characters.
-
-* New option multimailhook.emailstrictutf8 to ensure that the main
-  part of the email body is valid UTF-8.  Invalid characters are
-  turned into the Unicode replacement character, U+FFFD.  By default
-  this option is turned on.
-
-* Written in Python.  Easier to add new features.
diff --git a/contrib/hooks/multimail/README.rst b/contrib/hooks/multimail/README.rst
deleted file mode 100644
index 7c0fc4a6ef..0000000000
--- a/contrib/hooks/multimail/README.rst
+++ /dev/null
@@ -1,774 +0,0 @@
-git-multimail version 1.5.0
-===========================
-
-.. image:: https://travis-ci.org/git-multimail/git-multimail.svg?branch=master
-    :target: https://travis-ci.org/git-multimail/git-multimail
-
-git-multimail is a tool for sending notification emails on pushes to a
-Git repository.  It includes a Python module called ``git_multimail.py``,
-which can either be used as a hook script directly or can be imported
-as a Python module into another script.
-
-git-multimail is derived from the Git project's old
-contrib/hooks/post-receive-email, and is mostly compatible with that
-script.  See README.migrate-from-post-receive-email for details about
-the differences and for how to migrate from post-receive-email to
-git-multimail.
-
-git-multimail, like the rest of the Git project, is licensed under
-GPLv2 (see the COPYING file for details).
-
-Please note: although, as a convenience, git-multimail may be
-distributed along with the main Git project, development of
-git-multimail takes place in its own, separate project.  Please, read
-`<CONTRIBUTING.rst>`__ for more information.
-
-
-By default, for each push received by the repository, git-multimail:
-
-1. Outputs one email summarizing each reference that was changed.
-   These "reference change" (called "refchange" below) emails describe
-   the nature of the change (e.g., was the reference created, deleted,
-   fast-forwarded, etc.) and include a one-line summary of each commit
-   that was added to the reference.
-
-2. Outputs one email for each new commit that was introduced by the
-   reference change.  These "commit" emails include a list of the
-   files changed by the commit, followed by the diffs of files
-   modified by the commit.  The commit emails are threaded to the
-   corresponding reference change email via "In-Reply-To".  This style
-   (similar to the "git format-patch" style used on the Git mailing
-   list) makes it easy to scan through the emails, jump to patches
-   that need further attention, and write comments about specific
-   commits.  Commits are handled in reverse topological order (i.e.,
-   parents shown before children).  For example::
-
-     [git] branch master updated
-     + [git] 01/08: doc: fix xref link from api docs to manual pages
-     + [git] 02/08: api-credentials.txt: show the big picture first
-     + [git] 03/08: api-credentials.txt: mention credential.helper explicitly
-     + [git] 04/08: api-credentials.txt: add "see also" section
-     + [git] 05/08: t3510 (cherry-pick-sequence): add missing '&&'
-     + [git] 06/08: Merge branch 'rr/maint-t3510-cascade-fix'
-     + [git] 07/08: Merge branch 'mm/api-credentials-doc'
-     + [git] 08/08: Git 1.7.11-rc2
-
-   By default, each commit appears in exactly one commit email, the
-   first time that it is pushed to the repository.  If a commit is later
-   merged into another branch, then a one-line summary of the commit
-   is included in the reference change email (as usual), but no
-   additional commit email is generated. See
-   `multimailhook.refFilter(Inclusion|Exclusion|DoSend|DontSend)Regex`
-   below to configure which branches and tags are watched by the hook.
-
-   By default, reference change emails have their "Reply-To" field set
-   to the person who pushed the change, and commit emails have their
-   "Reply-To" field set to the author of the commit.
-
-3. Output one "announce" mail for each new annotated tag, including
-   information about the tag and optionally a shortlog describing the
-   changes since the previous tag.  Such emails might be useful if you
-   use annotated tags to mark releases of your project.
-
-
-Requirements
-------------
-
-* Python 2.x, version 2.4 or later.  No non-standard Python modules
-  are required.  git-multimail has preliminary support for Python 3
-  (but it has been better tested with Python 2).
-
-* The ``git`` command must be in your PATH.  git-multimail is known to
-  work with Git versions back to 1.7.1.  (Earlier versions have not
-  been tested; if you do so, please report your results.)
-
-* To send emails using the default configuration, a standard sendmail
-  program must be located at '/usr/sbin/sendmail' or
-  '/usr/lib/sendmail' and must be configured correctly to send emails.
-  If this is not the case, set multimailhook.sendmailCommand, or see
-  the multimailhook.mailer configuration variable below for how to
-  configure git-multimail to send emails via an SMTP server.
-
-* git-multimail is currently tested only on Linux. It may or may not
-  work on other platforms such as Windows and Mac OS. See
-  `<CONTRIBUTING.rst>`__ to improve the situation.
-
-
-Invocation
-----------
-
-``git_multimail.py`` is designed to be used as a ``post-receive`` hook in a
-Git repository (see githooks(5)).  Link or copy it to
-$GIT_DIR/hooks/post-receive within the repository for which email
-notifications are desired.  Usually it should be installed on the
-central repository for a project, to which all commits are eventually
-pushed.
-
-For use on pre-v1.5.1 Git servers, ``git_multimail.py`` can also work as
-an ``update`` hook, taking its arguments on the command line.  To use
-this script in this manner, link or copy it to $GIT_DIR/hooks/update.
-Please note that the script is not completely reliable in this mode
-[1]_.
-
-Alternatively, ``git_multimail.py`` can be imported as a Python module
-into your own Python post-receive script.  This method is a bit more
-work, but allows the behavior of the hook to be customized using
-arbitrary Python code.  For example, you can use a custom environment
-(perhaps inheriting from GenericEnvironment or GitoliteEnvironment) to
-
-* change how the user who did the push is determined
-
-* read users' email addresses from an LDAP server or from a database
-
-* decide which users should be notified about which commits based on
-  the contents of the commits (e.g., for users who want to be notified
-  only about changes affecting particular files or subdirectories)
-
-Or you can change how emails are sent by writing your own Mailer
-class.  The ``post-receive`` script in this directory demonstrates how
-to use ``git_multimail.py`` as a Python module.  (If you make interesting
-changes of this type, please consider sharing them with the
-community.)
-
-
-Troubleshooting/FAQ
--------------------
-
-Please read `<doc/troubleshooting.rst>`__ for frequently asked
-questions and common issues with git-multimail.
-
-
-Configuration
--------------
-
-By default, git-multimail mostly takes its configuration from the
-following ``git config`` settings:
-
-multimailhook.environment
-    This describes the general environment of the repository. In most
-    cases, you do not need to specify a value for this variable:
-    `git-multimail` will autodetect which environment to use.
-    Currently supported values:
-
-    generic
-      the username of the pusher is read from $USER or $USERNAME and
-      the repository name is derived from the repository's path.
-
-    gitolite
-      Environment to use when ``git-multimail`` is ran as a gitolite_
-      hook.
-
-      The username of the pusher is read from $GL_USER, the repository
-      name is read from $GL_REPO, and the From: header value is
-      optionally read from gitolite.conf (see multimailhook.from).
-
-      For more information about gitolite and git-multimail, read
-      `<doc/gitolite.rst>`__
-
-    stash
-      Environment to use when ``git-multimail`` is ran as an Atlassian
-      BitBucket Server (formerly known as Atlassian Stash) hook.
-
-      **Warning:** this mode was provided by a third-party contributor
-      and never tested by the git-multimail maintainers. It is
-      provided as-is and may or may not work for you.
-
-      This value is automatically assumed when the stash-specific
-      flags (``--stash-user`` and ``--stash-repo``) are specified on
-      the command line. When this environment is active, the username
-      and repo come from these two command line flags, which must be
-      specified.
-
-    gerrit
-      Environment to use when ``git-multimail`` is ran as a
-      ``ref-updated`` Gerrit hook.
-
-      This value is used when the gerrit-specific command line flags
-      (``--oldrev``, ``--newrev``, ``--refname``, ``--project``) for
-      gerrit's ref-updated hook are present. When this environment is
-      active, the username of the pusher is taken from the
-      ``--submitter`` argument if that command line option is passed,
-      otherwise 'Gerrit' is used. The repository name is taken from
-      the ``--project`` option on the command line, which must be passed.
-
-      For more information about gerrit and git-multimail, read
-      `<doc/gerrit.rst>`__
-
-    If none of these environments is suitable for your setup, then you
-    can implement a Python class that inherits from Environment and
-    instantiate it via a script that looks like the example
-    post-receive script.
-
-    The environment value can be specified on the command line using
-    the ``--environment`` option. If it is not specified on the
-    command line or by ``multimailhook.environment``, the value is
-    guessed as follows:
-
-    * If stash-specific (respectively gerrit-specific) command flags
-      are present on the command-line, then ``stash`` (respectively
-      ``gerrit``) is used.
-
-    * If the environment variables $GL_USER and $GL_REPO are set, then
-      ``gitolite`` is used.
-
-    * If none of the above apply, then ``generic`` is used.
-
-multimailhook.repoName
-    A short name of this Git repository, to be used in various places
-    in the notification email text.  The default is to use $GL_REPO
-    for gitolite repositories, or otherwise to derive this value from
-    the repository path name.
-
-multimailhook.mailingList
-    The list of email addresses to which notification emails should be
-    sent, as RFC 2822 email addresses separated by commas.  This
-    configuration option can be multivalued.  Leave it unset or set it
-    to the empty string to not send emails by default.  The next few
-    settings can be used to configure specific address lists for
-    specific types of notification email.
-
-multimailhook.refchangeList
-    The list of email addresses to which summary emails about
-    reference changes should be sent, as RFC 2822 email addresses
-    separated by commas.  This configuration option can be
-    multivalued.  The default is the value in
-    multimailhook.mailingList.  Set this value to "none" (or the empty
-    string) to prevent reference change emails from being sent even if
-    multimailhook.mailingList is set.
-
-multimailhook.announceList
-    The list of email addresses to which emails about new annotated
-    tags should be sent, as RFC 2822 email addresses separated by
-    commas.  This configuration option can be multivalued.  The
-    default is the value in multimailhook.refchangeList or
-    multimailhook.mailingList.  Set this value to "none" (or the empty
-    string) to prevent annotated tag announcement emails from being sent
-    even if one of the other values is set.
-
-multimailhook.commitList
-    The list of email addresses to which emails about individual new
-    commits should be sent, as RFC 2822 email addresses separated by
-    commas.  This configuration option can be multivalued.  The
-    default is the value in multimailhook.mailingList.  Set this value
-    to "none" (or the empty string) to prevent notification emails about
-    individual commits from being sent even if
-    multimailhook.mailingList is set.
-
-multimailhook.announceShortlog
-    If this option is set to true, then emails about changes to
-    annotated tags include a shortlog of changes since the previous
-    tag.  This can be useful if the annotated tags represent releases;
-    then the shortlog will be a kind of rough summary of what has
-    happened since the last release.  But if your tagging policy is
-    not so straightforward, then the shortlog might be confusing
-    rather than useful.  Default is false.
-
-multimailhook.commitEmailFormat
-    The format of email messages for the individual commits, can be "text" or
-    "html". In the latter case, the emails will include diffs using colorized
-    HTML instead of plain text used by default. Note that this  currently the
-    ref change emails are always sent in plain text.
-
-    Note that when using "html", the formatting is done by parsing the
-    output of ``git log`` with ``-p``. When using
-    ``multimailhook.commitLogOpts`` to specify a ``--format`` for
-    ``git log``, one may get false positive (e.g. lines in the body of
-    the message starting with ``+++`` or ``---`` colored in red or
-    green).
-
-    By default, all the message is HTML-escaped. See
-    ``multimailhook.htmlInIntro`` to change this behavior.
-
-multimailhook.commitBrowseURL
-    Used to generate a link to an online repository browser in commit
-    emails. This variable must be a string. Format directives like
-    ``%(<variable>)s`` will be expanded the same way as template
-    strings. In particular, ``%(id)s`` will be replaced by the full
-    Git commit identifier (40-chars hexadecimal).
-
-    If the string does not contain any format directive, then
-    ``%(id)s`` will be automatically added to the string. If you don't
-    want ``%(id)s`` to be automatically added, use the empty format
-    directive ``%()s`` anywhere in the string.
-
-    For example, a suitable value for the git-multimail project itself
-    would be
-    ``https://github.com/git-multimail/git-multimail/commit/%(id)s``.
-
-multimailhook.htmlInIntro, multimailhook.htmlInFooter
-    When generating an HTML message, git-multimail escapes any HTML
-    sequence by default. This means that if a template contains HTML
-    like ``<a href="foo">link</a>``, the reader will see the HTML
-    source code and not a proper link.
-
-    Set ``multimailhook.htmlInIntro`` to true to allow writing HTML
-    formatting in introduction templates. Similarly, set
-    ``multimailhook.htmlInFooter`` for HTML in the footer.
-
-    Variables expanded in the template are still escaped. For example,
-    if a repository's path contains a ``<``, it will be rendered as
-    such in the message.
-
-    Read `<doc/customizing-emails.rst>`__ for more details and
-    examples.
-
-multimailhook.refchangeShowGraph
-    If this option is set to true, then summary emails about reference
-    changes will additionally include:
-
-    * a graph of the added commits (if any)
-
-    * a graph of the discarded commits (if any)
-
-    The log is generated by running ``git log --graph`` with the options
-    specified in graphOpts.  The default is false.
-
-multimailhook.refchangeShowLog
-    If this option is set to true, then summary emails about reference
-    changes will include a detailed log of the added commits in
-    addition to the one line summary.  The log is generated by running
-    ``git log`` with the options specified in multimailhook.logOpts.
-    Default is false.
-
-multimailhook.mailer
-    This option changes the way emails are sent.  Accepted values are:
-
-    * **sendmail (the default)**: use the command ``/usr/sbin/sendmail`` or
-      ``/usr/lib/sendmail`` (or sendmailCommand, if configured).  This
-      mode can be further customized via the following options:
-
-      multimailhook.sendmailCommand
-          The command used by mailer ``sendmail`` to send emails.  Shell
-          quoting is allowed in the value of this setting, but remember that
-          Git requires double-quotes to be escaped; e.g.::
-
-              git config multimailhook.sendmailcommand '/usr/sbin/sendmail -oi -t -F \"Git Repo\"'
-
-          Default is '/usr/sbin/sendmail -oi -t' or
-          '/usr/lib/sendmail -oi -t' (depending on which file is
-          present and executable).
-
-      multimailhook.envelopeSender
-          If set then pass this value to sendmail via the -f option to set
-          the envelope sender address.
-
-    * **smtp**: use Python's smtplib.  This is useful when the sendmail
-      command is not available on the system.  This mode can be
-      further customized via the following options:
-
-      multimailhook.smtpServer
-          The name of the SMTP server to connect to.  The value can
-          also include a colon and a port number; e.g.,
-          ``mail.example.com:25``.  Default is 'localhost' using port 25.
-
-      multimailhook.smtpUser, multimailhook.smtpPass
-          Server username and password. Required if smtpEncryption is 'ssl'.
-          Note that the username and password currently need to be
-          set cleartext in the configuration file, which is not
-          recommended. If you need to use this option, be sure your
-          configuration file is read-only.
-
-      multimailhook.envelopeSender
-        The sender address to be passed to the SMTP server.  If
-        unset, then the value of multimailhook.from is used.
-
-      multimailhook.smtpServerTimeout
-        Timeout in seconds. Default is 10.
-
-      multimailhook.smtpEncryption
-        Set the security type. Allowed values: ``none``, ``ssl``, ``tls`` (starttls).
-        Default is ``none``.
-
-      multimailhook.smtpCACerts
-        Set the path to a list of trusted CA certificate to verify the
-        server certificate, only supported when ``smtpEncryption`` is
-        ``tls``. If unset or empty, the server certificate is not
-        verified. If it targets a file containing a list of trusted CA
-        certificates (PEM format) these CAs will be used to verify the
-        server certificate. For debian, you can set
-        ``/etc/ssl/certs/ca-certificates.crt`` for using the system
-        trusted CAs. For self-signed server, you can add your server
-        certificate to the system store::
-
-            cd /usr/local/share/ca-certificates/
-            openssl s_client -starttls smtp \
-                   -connect mail.example.net:587 -showcerts \
-                   </dev/null 2>/dev/null \
-                 | openssl x509 -outform PEM >mail.example.net.crt
-            update-ca-certificates
-
-        and used the updated ``/etc/ssl/certs/ca-certificates.crt``. Or
-        directly use your ``/path/to/mail.example.net.crt``. Default is
-        unset.
-
-      multimailhook.smtpServerDebugLevel
-        Integer number. Set to greater than 0 to activate debugging.
-
-multimailhook.from, multimailhook.fromCommit, multimailhook.fromRefchange
-    If set, use this value in the From: field of generated emails.
-    ``fromCommit`` is used for commit emails, ``fromRefchange`` is
-    used for refchange emails, and ``from`` is used as fall-back in
-    all cases.
-
-    The value for these variables can be either:
-
-    - An email address, which will be used directly.
-
-    - The value ``pusher``, in which case the pusher's address (if
-      available) will be used.
-
-    - The value ``author`` (meaningful only for ``fromCommit``), in which
-      case the commit author's address will be used.
-
-    If config values are unset, the value of the From: header is
-    determined as follows:
-
-    1. (gitolite environment only)
-       1.a) If ``multimailhook.MailaddressMap`` is set, and is a path
-       to an existing file (if relative, it is considered relative to
-       the place where ``gitolite.conf`` is located), then this file
-       should contain lines like::
-
-           username Firstname Lastname <email@example.com>
-
-       git-multimail will then look for a line where ``$GL_USER``
-       matches the ``username`` part, and use the rest of the line for
-       the ``From:`` header.
-
-       1.b) Parse gitolite.conf, looking for a block of comments that
-       looks like this::
-
-           # BEGIN USER EMAILS
-           # username Firstname Lastname <email@example.com>
-           # END USER EMAILS
-
-       If that block exists, and there is a line between the BEGIN
-       USER EMAILS and END USER EMAILS lines where the first field
-       matches the gitolite username ($GL_USER), use the rest of the
-       line for the From: header.
-
-    2. If the user.email configuration setting is set, use its value
-       (and the value of user.name, if set).
-
-    3. Use the value of multimailhook.envelopeSender.
-
-multimailhook.MailaddressMap
-    (gitolite environment only)
-    File to look for a ``From:`` address based on the user doing the
-    push. Defaults to unset. See ``multimailhook.from`` for details.
-
-multimailhook.administrator
-    The name and/or email address of the administrator of the Git
-    repository; used in FOOTER_TEMPLATE.  Default is
-    multimailhook.envelopesender if it is set; otherwise a generic
-    string is used.
-
-multimailhook.emailPrefix
-    All emails have this string prepended to their subjects, to aid
-    email filtering (though filtering based on the X-Git-* email
-    headers is probably more robust).  Default is the short name of
-    the repository in square brackets; e.g., ``[myrepo]``.  Set this
-    value to the empty string to suppress the email prefix. You may
-    use the placeholder ``%(repo_shortname)s`` for the short name of
-    the repository.
-
-multimailhook.emailMaxLines
-    The maximum number of lines that should be included in the body of
-    a generated email.  If not specified, there is no limit.  Lines
-    beyond the limit are suppressed and counted, and a final line is
-    added indicating the number of suppressed lines.
-
-multimailhook.emailMaxLineLength
-    The maximum length of a line in the email body.  Lines longer than
-    this limit are truncated to this length with a trailing ``[...]``
-    added to indicate the missing text.  The default is 500, because
-    (a) diffs with longer lines are probably from binary files, for
-    which a diff is useless, and (b) even if a text file has such long
-    lines, the diffs are probably unreadable anyway.  To disable line
-    truncation, set this option to 0.
-
-multimailhook.subjectMaxLength
-    The maximum length of the subject line (i.e. the ``oneline`` field
-    in templates, not including the prefix). Lines longer than this
-    limit are truncated to this length with a trailing ``[...]`` added
-    to indicate the missing text. This option The default is to use
-    ``multimailhook.emailMaxLineLength``. This option avoids sending
-    emails with overly long subject lines, but should not be needed if
-    the commit messages follow the Git convention (one short subject
-    line, then a blank line, then the message body). To disable line
-    truncation, set this option to 0.
-
-multimailhook.maxCommitEmails
-    The maximum number of commit emails to send for a given change.
-    When the number of patches is larger that this value, only the
-    summary refchange email is sent.  This can avoid accidental
-    mailbombing, for example on an initial push.  To disable commit
-    emails limit, set this option to 0.  The default is 500.
-
-multimailhook.excludeMergeRevisions
-    When sending out revision emails, do not consider merge commits (the
-    functional equivalent of `rev-list --no-merges`).
-    The default is `false` (send merge commit emails).
-
-multimailhook.emailStrictUTF8
-    If this boolean option is set to `true`, then the main part of the
-    email body is forced to be valid UTF-8.  Any characters that are
-    not valid UTF-8 are converted to the Unicode replacement
-    character, U+FFFD.  The default is `true`.
-
-    This option is ineffective with Python 3, where non-UTF-8
-    characters are unconditionally replaced.
-
-multimailhook.diffOpts
-    Options passed to ``git diff-tree`` when generating the summary
-    information for ReferenceChange emails.  Default is ``--stat
-    --summary --find-copies-harder``.  Add -p to those options to
-    include a unified diff of changes in addition to the usual summary
-    output.  Shell quoting is allowed; see ``multimailhook.logOpts`` for
-    details.
-
-multimailhook.graphOpts
-    Options passed to ``git log --graph`` when generating graphs for the
-    reference change summary emails (used only if refchangeShowGraph
-    is true).  The default is '--oneline --decorate'.
-
-    Shell quoting is allowed; see logOpts for details.
-
-multimailhook.logOpts
-    Options passed to ``git log`` to generate additional info for
-    reference change emails (used only if refchangeShowLog is set).
-    For example, adding -p will show each commit's complete diff.  The
-    default is empty.
-
-    Shell quoting is allowed; for example, a log format that contains
-    spaces can be specified using something like::
-
-      git config multimailhook.logopts '--pretty=format:"%h %aN <%aE>%n%s%n%n%b%n"'
-
-    If you want to set this by editing your configuration file
-    directly, remember that Git requires double-quotes to be escaped
-    (see git-config(1) for more information)::
-
-      [multimailhook]
-              logopts = --pretty=format:\"%h %aN <%aE>%n%s%n%n%b%n\"
-
-multimailhook.commitLogOpts
-    Options passed to ``git log`` to generate additional info for
-    revision change emails.  For example, adding --ignore-all-spaces
-    will suppress whitespace changes.  The default options are ``-C
-    --stat -p --cc``.  Shell quoting is allowed; see
-    multimailhook.logOpts for details.
-
-multimailhook.dateSubstitute
-    String to use as a substitute for ``Date:`` in the output of ``git
-    log`` while formatting commit messages. This is useful to avoid
-    emitting a line that can be interpreted by mailers as the start of
-    a cited message (Zimbra webmail in particular). Defaults to
-    ``CommitDate:``. Set to an empty string or ``none`` to deactivate
-    the behavior.
-
-multimailhook.emailDomain
-    Domain name appended to the username of the person doing the push
-    to convert it into an email address
-    (via ``"%s@%s" % (username, emaildomain)``). More complicated
-    schemes can be implemented by overriding Environment and
-    overriding its get_pusher_email() method.
-
-multimailhook.replyTo, multimailhook.replyToCommit, multimailhook.replyToRefchange
-    Addresses to use in the Reply-To: field for commit emails
-    (replyToCommit) and refchange emails (replyToRefchange).
-    multimailhook.replyTo is used as default when replyToCommit or
-    replyToRefchange is not set. The shortcuts ``pusher`` and
-    ``author`` are allowed with the same semantics as for
-    ``multimailhook.from``. In addition, the value ``none`` can be
-    used to omit the ``Reply-To:`` field.
-
-    The default is ``pusher`` for refchange emails, and ``author`` for
-    commit emails.
-
-multimailhook.quiet
-    Do not output the list of email recipients from the hook
-
-multimailhook.stdout
-    For debugging, send emails to stdout rather than to the
-    mailer.  Equivalent to the --stdout command line option
-
-multimailhook.scanCommitForCc
-    If this option is set to true, than recipients from lines in commit body
-    that starts with ``CC:`` will be added to CC list.
-    Default: false
-
-multimailhook.combineWhenSingleCommit
-    If this option is set to true and a single new commit is pushed to
-    a branch, combine the summary and commit email messages into a
-    single email.
-    Default: true
-
-multimailhook.refFilterInclusionRegex, multimailhook.refFilterExclusionRegex, multimailhook.refFilterDoSendRegex, multimailhook.refFilterDontSendRegex
-    **Warning:** these options are experimental. They should work, but
-    the user-interface is not stable yet (in particular, the option
-    names may change). If you want to participate in stabilizing the
-    feature, please contact the maintainers and/or send pull-requests.
-    If you are happy with the current shape of the feature, please
-    report it too.
-
-    Regular expressions that can be used to limit refs for which email
-    updates will be sent.  It is an error to specify both an inclusion
-    and an exclusion regex.  If a ``refFilterInclusionRegex`` is
-    specified, emails will only be sent for refs which match this
-    regex.  If a ``refFilterExclusionRegex`` regex is specified,
-    emails will be sent for all refs except those that match this
-    regex (or that match a predefined regex specific to the
-    environment, such as "^refs/notes" for most environments and
-    "^refs/notes|^refs/changes" for the gerrit environment).
-
-    The expressions are matched against the complete refname, and is
-    considered to match if any substring matches. For example, to
-    filter-out all tags, set ``refFilterExclusionRegex`` to
-    ``^refs/tags/`` (note the leading ``^`` but no trailing ``$``). If
-    you set ``refFilterExclusionRegex`` to ``master``, then any ref
-    containing ``master`` will be excluded (the ``master`` branch, but
-    also ``refs/tags/master`` or ``refs/heads/foo-master-bar``).
-
-    ``refFilterDoSendRegex`` and ``refFilterDontSendRegex`` are
-    analogous to ``refFilterInclusionRegex`` and
-    ``refFilterExclusionRegex`` with one difference: with
-    ``refFilterDoSendRegex`` and ``refFilterDontSendRegex``, commits
-    introduced by one excluded ref will not be considered as new when
-    they reach an included ref. Typically, if you add a branch ``foo``
-    to  ``refFilterDontSendRegex``, push commits to this branch, and
-    later merge branch ``foo`` into ``master``, then the notification
-    email for ``master`` will contain a commit email only for the
-    merge commit. If you include ``foo`` in
-    ``refFilterExclusionRegex``, then at the time of merge, you will
-    receive one commit email per commit in the branch.
-
-    These variables can be multi-valued, like::
-
-      [multimailhook]
-              refFilterExclusionRegex = ^refs/tags/
-              refFilterExclusionRegex = ^refs/heads/master$
-
-    You can also provide a whitespace-separated list like::
-
-      [multimailhook]
-              refFilterExclusionRegex = ^refs/tags/ ^refs/heads/master$
-
-    Both examples exclude tags and the master branch, and are
-    equivalent to::
-
-      [multimailhook]
-              refFilterExclusionRegex = ^refs/tags/|^refs/heads/master$
-
-    ``refFilterInclusionRegex`` and ``refFilterExclusionRegex`` are
-    strictly stronger than ``refFilterDoSendRegex`` and
-    ``refFilterDontSendRegex``. In other words, adding a ref to a
-    DoSend/DontSend regex has no effect if it is already excluded by a
-    Exclusion/Inclusion regex.
-
-multimailhook.logFile, multimailhook.errorLogFile, multimailhook.debugLogFile
-
-    When set, these variable designate path to files where
-    git-multimail will log some messages. Normal messages and error
-    messages are sent to ``logFile``, and error messages are also sent
-    to ``errorLogFile``. Debug messages and all other messages are
-    sent to ``debugLogFile``. The recommended way is to set only one
-    of these variables, but it is also possible to set several of them
-    (part of the information is then duplicated in several log files,
-    for example errors are duplicated to all log files).
-
-    Relative path are relative to the Git repository where the push is
-    done.
-
-multimailhook.verbose
-
-    Verbosity level of git-multimail on its standard output. By
-    default, show only error and info messages. If set to true, show
-    also debug messages.
-
-Email filtering aids
---------------------
-
-All emails include extra headers to enable fine tuned filtering and
-give information for debugging.  All emails include the headers
-``X-Git-Host``, ``X-Git-Repo``, ``X-Git-Refname``, and ``X-Git-Reftype``.
-ReferenceChange emails also include headers ``X-Git-Oldrev`` and ``X-Git-Newrev``;
-Revision emails also include header ``X-Git-Rev``.
-
-
-Customizing email contents
---------------------------
-
-git-multimail mostly generates emails by expanding templates.  The
-templates can be customized.  To avoid the need to edit
-``git_multimail.py`` directly, the preferred way to change the templates
-is to write a separate Python script that imports ``git_multimail.py`` as
-a module, then replaces the templates in place.  See the provided
-post-receive script for an example of how this is done.
-
-
-Customizing git-multimail for your environment
-----------------------------------------------
-
-git-multimail is mostly customized via an "environment" that describes
-the local environment in which Git is running.  Two types of
-environment are built in:
-
-GenericEnvironment
-    a stand-alone Git repository.
-
-GitoliteEnvironment
-    a Git repository that is managed by gitolite_.  For such
-    repositories, the identity of the pusher is read from
-    environment variable $GL_USER, the name of the repository is read
-    from $GL_REPO (if it is not overridden by multimailhook.reponame),
-    and the From: header value is optionally read from gitolite.conf
-    (see multimailhook.from).
-
-By default, git-multimail assumes GitoliteEnvironment if $GL_USER and
-$GL_REPO are set, and otherwise assumes GenericEnvironment.
-Alternatively, you can choose one of these two environments explicitly
-by setting a ``multimailhook.environment`` config setting (which can
-have the value `generic` or `gitolite`) or by passing an --environment
-option to the script.
-
-If you need to customize the script in ways that are not supported by
-the existing environments, you can define your own environment class
-class using arbitrary Python code.  To do so, you need to import
-``git_multimail.py`` as a Python module, as demonstrated by the example
-post-receive script.  Then implement your environment class; it should
-usually inherit from one of the existing Environment classes and
-possibly one or more of the EnvironmentMixin classes.  Then set the
-``environment`` variable to an instance of your own environment class
-and pass it to ``run_as_post_receive_hook()``.
-
-The standard environment classes, GenericEnvironment and
-GitoliteEnvironment, are in fact themselves put together out of a
-number of mixin classes, each of which handles one aspect of the
-customization.  For the finest control over your configuration, you
-can specify exactly which mixin classes your own environment class
-should inherit from, and override individual methods (or even add your
-own mixin classes) to implement entirely new behaviors.  If you
-implement any mixins that might be useful to other people, please
-consider sharing them with the community!
-
-
-Getting involved
-----------------
-
-Please, read `<CONTRIBUTING.rst>`__ for instructions on how to
-contribute to git-multimail.
-
-
-Footnotes
----------
-
-.. [1] Because of the way information is passed to update hooks, the
-       script's method of determining whether a commit has already
-       been seen does not work when it is used as an ``update`` script.
-       In particular, no notification email will be generated for a
-       new commit that is added to multiple references in the same
-       push. A workaround is to use --force-send to force sending the
-       emails.
-
-.. _gitolite: https://github.com/sitaramc/gitolite
diff --git a/contrib/hooks/multimail/doc/customizing-emails.rst b/contrib/hooks/multimail/doc/customizing-emails.rst
deleted file mode 100644
index 3f5b67f768..0000000000
--- a/contrib/hooks/multimail/doc/customizing-emails.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-Customizing the content and formatting of emails
-================================================
-
-Overloading template strings
-----------------------------
-
-The content of emails is generated based on template strings defined
-in ``git_multimail.py``. You can customize these template strings
-without changing the script itself, by defining a Python wrapper
-around it. The python wrapper should ``import git_multimail`` and then
-override the ``git_multimail.*`` strings like this::
-
-  import sys  # needed for sys.argv
-
-  # Import and customize git_multimail:
-  import git_multimail
-  git_multimail.REVISION_INTRO_TEMPLATE = """..."""
-  git_multimail.COMBINED_INTRO_TEMPLATE = git_multimail.REVISION_INTRO_TEMPLATE
-
-  # start git_multimail itself:
-  git_multimail.main(sys.argv[1:])
-
-The template strings can use any value already used in the existing
-templates (read the source code).
-
-Using HTML in template strings
-------------------------------
-
-If ``multimailhook.commitEmailFormat`` is set to HTML, then
-git-multimail will generate HTML emails for commit notifications. The
-log and diff will be formatted automatically by git-multimail. By
-default, any HTML special character in the templates will be escaped.
-
-To use HTML formatting in the introduction of the email, set
-``multimailhook.htmlInIntro`` to ``true``. Then, the template can
-contain any HTML tags, that will be sent as-is in the email. For
-example, to add some formatting and a link to the online commit, use
-a format like::
-
-  git_multimail.REVISION_INTRO_TEMPLATE = """\
-  <span style="color:#808080">This is an automated email from the git hooks/post-receive script.</span><br /><br />
-
-  <strong>%(pusher)s</strong> pushed a commit to %(refname_type)s %(short_refname)s
-  in repository %(repo_shortname)s.<br />
-
-  <a href="https://github.com/git-multimail/git-multimail/commit/%(newrev)s">View on GitHub</a>.
-  """
-
-Note that the values expanded from ``%(variable)s`` in the format
-strings will still be escaped.
-
-For a less flexible but easier to set up way to add a link to commit
-emails, see ``multimailhook.commitBrowseURL``.
-
-Similarly, one can set ``multimailhook.htmlInFooter`` and override any
-of the ``*_FOOTER*`` template strings.
diff --git a/contrib/hooks/multimail/doc/gerrit.rst b/contrib/hooks/multimail/doc/gerrit.rst
deleted file mode 100644
index 8011d05dec..0000000000
--- a/contrib/hooks/multimail/doc/gerrit.rst
+++ /dev/null
@@ -1,56 +0,0 @@
-Setting up git-multimail on Gerrit
-==================================
-
-Gerrit has its own email-sending system, but you may prefer using
-``git-multimail`` instead. It supports Gerrit natively as a Gerrit
-``ref-updated`` hook (Warning: `Gerrit hooks
-<https://gerrit-review.googlesource.com/Documentation/config-hooks.html>`__
-are distinct from Git hooks). Setting up ``git-multimail`` on a Gerrit
-installation can be done following the instructions below.
-
-The explanations show an easy way to set up ``git-multimail``,
-but leave ``git-multimail`` installed and unconfigured for a while. If
-you run Gerrit on a production server, it is advised that you
-execute the step "Set up the hook" last to avoid confusing your users
-in the meantime.
-
-Set up the hook
----------------
-
-Create a directory ``$site_path/hooks/`` if it does not exist (if you
-don't know what ``$site_path`` is, run ``gerrit.sh status`` and look
-for a ``GERRIT_SITE`` line). Either copy ``git_multimail.py`` to
-``$site_path/hooks/ref-updated`` or create a wrapper script like
-this::
-
-  #! /bin/sh
-  exec /path/to/git_multimail.py "$@"
-
-In both cases, make sure the file is named exactly
-``$site_path/hooks/ref-updated`` and is executable.
-
-(Alternatively, you may configure the ``[hooks]`` section of
-gerrit.config)
-
-Configuration
--------------
-
-Log on the gerrit server and edit ``$site_path/git/$project/config``
-to configure ``git-multimail``.
-
-Troubleshooting
----------------
-
-Warning: this will disable ``git-multimail`` during the debug, and
-could confuse your users. Don't run on a production server.
-
-To debug configuration issues with ``git-multimail``, you can add the
-``--stdout`` option when calling ``git_multimail.py`` like this::
-
-  #!/bin/sh
-  exec /path/to/git-multimail/git-multimail/git_multimail.py \
-    --stdout "$@" >> /tmp/log.txt
-
-and try pushing from a test repository. You should see the source of
-the email that would have been sent in the output of ``git push`` in
-the file ``/tmp/log.txt``.
diff --git a/contrib/hooks/multimail/doc/gitolite.rst b/contrib/hooks/multimail/doc/gitolite.rst
deleted file mode 100644
index 5054833105..0000000000
--- a/contrib/hooks/multimail/doc/gitolite.rst
+++ /dev/null
@@ -1,118 +0,0 @@
-Setting up git-multimail on gitolite
-====================================
-
-``git-multimail`` supports gitolite 3 natively.
-The explanations below show an easy way to set up ``git-multimail``,
-but leave ``git-multimail`` installed and unconfigured for a while. If
-you run gitolite on a production server, it is advised that you
-execute the step "Set up the hook" last to avoid confusing your users
-in the meantime.
-
-Set up the hook
----------------
-
-Log in as your gitolite user.
-
-Create a file ``.gitolite/hooks/common/post-receive`` on your gitolite
-account containing (adapt the path, obviously)::
-
-  #!/bin/sh
-  exec /path/to/git-multimail/git-multimail/git_multimail.py "$@"
-
-Make sure it's executable (``chmod +x``). Record the hook in
-gitolite::
-
-  gitolite setup
-
-Configuration
--------------
-
-First, you have to allow the admin to set Git configuration variables.
-
-As gitolite user, edit the line containing ``GIT_CONFIG_KEYS`` in file
-``.gitolite.rc``, to make it look like::
-
-  GIT_CONFIG_KEYS                 =>  'multimailhook\..*',
-
-You can now log out and return to your normal user.
-
-In the ``gitolite-admin`` clone, edit the file ``conf/gitolite.conf``
-and add::
-
-  repo @all
-      # Not strictly needed as git_multimail.py will chose gitolite if
-      # $GL_USER is set.
-      config multimailhook.environment = gitolite
-      config multimailhook.mailingList = # Where emails should be sent
-      config multimailhook.from = # From address to use
-
-Note that by default, gitolite forbids ``<`` and ``>`` in variable
-values (for security/paranoia reasons, see
-`compensating for UNSAFE_PATT
-<http://gitolite.com/gitolite/git-config/index.html#compensating-for-unsafe95patt>`__
-in gitolite's documentation for explanations and a way to disable
-this). As a consequence, you will not be able to use ``First Last
-<First.Last@example.com>`` as recipient email, but specifying
-``First.Last@example.com`` alone works.
-
-Obviously, you can customize all parameters on a per-repository basis by
-adding these ``config multimailhook.*`` lines in the section
-corresponding to a repository or set of repositories.
-
-To activate ``git-multimail`` on a per-repository basis, do not set
-``multimailhook.mailingList`` in the ``@all`` section and set it only
-for repositories for which you want ``git-multimail``.
-
-Alternatively, you can set up the ``From:`` field on a per-user basis
-by adding a ``BEGIN USER EMAILS``/``END USER EMAILS`` section (see
-``../README``).
-
-Specificities of Gitolite for Configuration
--------------------------------------------
-
-Empty configuration variables
-.............................
-
-With gitolite, the syntax ``config multimailhook.commitList = ""``
-unsets the variable instead of setting it to an empty string (see
-`here
-<http://gitolite.com/gitolite/git-config.html#an-important-warning-about-deleting-a-config-line>`__).
-As a result, there is no way to set a variable to the empty string.
-In all most places where an empty value is required, git-multimail
-now allows to specify special ``"none"`` value (case-sensitive) to
-mean the same.
-
-Alternatively, one can use ``" "`` (a single space) instead of ``""``.
-In most cases (in particular ``multimailhook.*List`` variables), this
-will be equivalent to an empty string.
-
-If you have a use-case where ``"none"`` is not an acceptable value and
-you need ``" "`` or  ``""`` instead, please report it as a bug to
-git-multimail.
-
-Allowing Regular Expressions in Configuration
-.............................................
-
-gitolite has a mechanism to prevent unsafe configuration variable
-values, which prevent characters like ``|`` commonly used in regular
-expressions. If you do not need the safety feature of gitolite and
-need to use regular expressions in your configuration (e.g. for
-``multimailhook.refFilter*`` variables), set
-`UNSAFE_PATT
-<http://gitolite.com/gitolite/git-config.html#unsafe-patt>`__ to a
-less restrictive value.
-
-Troubleshooting
----------------
-
-Warning: this will disable ``git-multimail`` during the debug, and
-could confuse your users. Don't run on a production server.
-
-To debug configuration issues with ``git-multimail``, you can add the
-``--stdout`` option when calling ``git_multimail.py`` like this::
-
-  #!/bin/sh
-  exec /path/to/git-multimail/git-multimail/git_multimail.py --stdout "$@"
-
-and try pushing from a test repository. You should see the source of
-the email that would have been sent in the output of ``git push``.
diff --git a/contrib/hooks/multimail/doc/troubleshooting.rst b/contrib/hooks/multimail/doc/troubleshooting.rst
deleted file mode 100644
index 651b509ee6..0000000000
--- a/contrib/hooks/multimail/doc/troubleshooting.rst
+++ /dev/null
@@ -1,78 +0,0 @@
-Troubleshooting issues with git-multimail: a FAQ
-================================================
-
-How to check that git-multimail is properly set up?
----------------------------------------------------
-
-Since version 1.4.0, git-multimail allows a simple self-checking of
-its configuration: run it with the environment variable
-``GIT_MULTIMAIL_CHECK_SETUP`` set to a non-empty string. You should
-get something like this::
-
-  $ GIT_MULTIMAIL_CHECK_SETUP=true /home/moy/dev/git-multimail/git-multimail/git_multimail.py
-  Environment values:
-      administrator : 'the administrator of this repository'
-      charset : 'utf-8'
-      emailprefix : '[git-multimail] '
-      fqdn : 'anie'
-      projectdesc : 'UNNAMED PROJECT'
-      pusher : 'moy'
-      repo_path : '/home/moy/dev/git-multimail'
-      repo_shortname : 'git-multimail'
-
-  Now, checking that git-multimail's standard input is properly set ...
-  Please type some text and then press Return
-  foo
-  You have just entered:
-  foo
-  git-multimail seems properly set up.
-
-If you forgot to set an important variable, you may get instead::
-
-  $ GIT_MULTIMAIL_CHECK_SETUP=true /home/moy/dev/git-multimail/git-multimail/git_multimail.py
-  No email recipients configured!
-
-Do not set ``$GIT_MULTIMAIL_CHECK_SETUP`` other than for testing your
-configuration: it would disable the hook completely.
-
-Git is not using the right address in the From/To/Reply-To field
-----------------------------------------------------------------
-
-First, make sure that git-multimail actually uses what you think it is
-using. A lot happens to your email (especially when posting to a
-mailing-list) between the time `git_multimail.py` sends it and the
-time it reaches your inbox.
-
-A simple test (to do on a test repository, do not use in production as
-it would disable email sending): change your post-receive hook to call
-`git_multimail.py` with the `--stdout` option, and try to push to the
-repository. You should see something like::
-
-  Counting objects: 3, done.
-  Writing objects: 100% (3/3), 263 bytes | 0 bytes/s, done.
-  Total 3 (delta 0), reused 0 (delta 0)
-  remote: Sending notification emails to: foo.bar@example.com
-  remote: ===========================================================================
-  remote: Date: Mon, 25 Apr 2016 18:39:59 +0200
-  remote: To: foo.bar@example.com
-  remote: Subject: [git] branch master updated: foo
-  remote: MIME-Version: 1.0
-  remote: Content-Type: text/plain; charset=utf-8
-  remote: Content-Transfer-Encoding: 8bit
-  remote: Message-ID: <20160425163959.2311.20498@anie>
-  remote: From: Auth Or <Foo.Bar@example.com>
-  remote: Reply-To: Auth Or <Foo.Bar@example.com>
-  remote: X-Git-Host: example
-  ...
-  remote: --
-  remote: To stop receiving notification emails like this one, please contact
-  remote: the administrator of this repository.
-  remote: ===========================================================================
-  To /path/to/repo
-     6278f04..e173f20  master -> master
-
-Note: this does not include the sender (Return-Path: header), as it is
-not part of the message content but passed to the mailer. Some mailer
-show the ``Sender:`` field instead of the ``From:`` field (for
-example, Zimbra Webmail shows ``From: <sender-field> on behalf of
-<from-field>``).
diff --git a/contrib/hooks/multimail/git_multimail.py b/contrib/hooks/multimail/git_multimail.py
deleted file mode 100755
index 8823399e75..0000000000
--- a/contrib/hooks/multimail/git_multimail.py
+++ /dev/null
@@ -1,4346 +0,0 @@
-#! /usr/bin/env python
-
-__version__ = '1.5.0'
-
-# Copyright (c) 2015-2016 Matthieu Moy and others
-# Copyright (c) 2012-2014 Michael Haggerty and others
-# Derived from contrib/hooks/post-receive-email, which is
-# Copyright (c) 2007 Andy Parkins
-# and also includes contributions by other authors.
-#
-# This file is part of git-multimail.
-#
-# git-multimail is free software: you can redistribute it and/or
-# modify it under the terms of the GNU General Public License version
-# 2 as published by the Free Software Foundation.
-#
-# 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, see
-# <http://www.gnu.org/licenses/>.
-
-"""Generate notification emails for pushes to a git repository.
-
-This hook sends emails describing changes introduced by pushes to a
-git repository.  For each reference that was changed, it emits one
-ReferenceChange email summarizing how the reference was changed,
-followed by one Revision email for each new commit that was introduced
-by the reference change.
-
-Each commit is announced in exactly one Revision email.  If the same
-commit is merged into another branch in the same or a later push, then
-the ReferenceChange email will list the commit's SHA1 and its one-line
-summary, but no new Revision email will be generated.
-
-This script is designed to be used as a "post-receive" hook in a git
-repository (see githooks(5)).  It can also be used as an "update"
-script, but this usage is not completely reliable and is deprecated.
-
-To help with debugging, this script accepts a --stdout option, which
-causes the emails to be written to standard output rather than sent
-using sendmail.
-
-See the accompanying README file for the complete documentation.
-
-"""
-
-import sys
-import os
-import re
-import bisect
-import socket
-import subprocess
-import shlex
-import optparse
-import logging
-import smtplib
-try:
-    import ssl
-except ImportError:
-    # Python < 2.6 do not have ssl, but that's OK if we don't use it.
-    pass
-import time
-
-import uuid
-import base64
-
-PYTHON3 = sys.version_info >= (3, 0)
-
-if sys.version_info <= (2, 5):
-    def all(iterable):
-        for element in iterable:
-            if not element:
-                return False
-        return True
-
-
-def is_ascii(s):
-    return all(ord(c) < 128 and ord(c) > 0 for c in s)
-
-
-if PYTHON3:
-    def is_string(s):
-        return isinstance(s, str)
-
-    def str_to_bytes(s):
-        return s.encode(ENCODING)
-
-    def bytes_to_str(s, errors='strict'):
-        return s.decode(ENCODING, errors)
-
-    unicode = str
-
-    def write_str(f, msg):
-        # Try outputing with the default encoding. If it fails,
-        # try UTF-8.
-        try:
-            f.buffer.write(msg.encode(sys.getdefaultencoding()))
-        except UnicodeEncodeError:
-            f.buffer.write(msg.encode(ENCODING))
-
-    def read_line(f):
-        # Try reading with the default encoding. If it fails,
-        # try UTF-8.
-        out = f.buffer.readline()
-        try:
-            return out.decode(sys.getdefaultencoding())
-        except UnicodeEncodeError:
-            return out.decode(ENCODING)
-
-    import html
-
-    def html_escape(s):
-        return html.escape(s)
-
-else:
-    def is_string(s):
-        try:
-            return isinstance(s, basestring)
-        except NameError:  # Silence Pyflakes warning
-            raise
-
-    def str_to_bytes(s):
-        return s
-
-    def bytes_to_str(s, errors='strict'):
-        return s
-
-    def write_str(f, msg):
-        f.write(msg)
-
-    def read_line(f):
-        return f.readline()
-
-    def next(it):
-        return it.next()
-
-    import cgi
-
-    def html_escape(s):
-        return cgi.escape(s, True)
-
-try:
-    from email.charset import Charset
-    from email.utils import make_msgid
-    from email.utils import getaddresses
-    from email.utils import formataddr
-    from email.utils import formatdate
-    from email.header import Header
-except ImportError:
-    # Prior to Python 2.5, the email module used different names:
-    from email.Charset import Charset
-    from email.Utils import make_msgid
-    from email.Utils import getaddresses
-    from email.Utils import formataddr
-    from email.Utils import formatdate
-    from email.Header import Header
-
-
-DEBUG = False
-
-ZEROS = '0' * 40
-LOGBEGIN = '- Log -----------------------------------------------------------------\n'
-LOGEND = '-----------------------------------------------------------------------\n'
-
-ADDR_HEADERS = set(['from', 'to', 'cc', 'bcc', 'reply-to', 'sender'])
-
-# It is assumed in many places that the encoding is uniformly UTF-8,
-# so changing these constants is unsupported.  But define them here
-# anyway, to make it easier to find (at least most of) the places
-# where the encoding is important.
-(ENCODING, CHARSET) = ('UTF-8', 'utf-8')
-
-
-REF_CREATED_SUBJECT_TEMPLATE = (
-    '%(emailprefix)s%(refname_type)s %(short_refname)s created'
-    ' (now %(newrev_short)s)'
-    )
-REF_UPDATED_SUBJECT_TEMPLATE = (
-    '%(emailprefix)s%(refname_type)s %(short_refname)s updated'
-    ' (%(oldrev_short)s -> %(newrev_short)s)'
-    )
-REF_DELETED_SUBJECT_TEMPLATE = (
-    '%(emailprefix)s%(refname_type)s %(short_refname)s deleted'
-    ' (was %(oldrev_short)s)'
-    )
-
-COMBINED_REFCHANGE_REVISION_SUBJECT_TEMPLATE = (
-    '%(emailprefix)s%(refname_type)s %(short_refname)s updated: %(oneline)s'
-    )
-
-REFCHANGE_HEADER_TEMPLATE = """\
-Date: %(send_date)s
-To: %(recipients)s
-Subject: %(subject)s
-MIME-Version: 1.0
-Content-Type: text/%(contenttype)s; charset=%(charset)s
-Content-Transfer-Encoding: 8bit
-Message-ID: %(msgid)s
-From: %(fromaddr)s
-Reply-To: %(reply_to)s
-Thread-Index: %(thread_index)s
-X-Git-Host: %(fqdn)s
-X-Git-Repo: %(repo_shortname)s
-X-Git-Refname: %(refname)s
-X-Git-Reftype: %(refname_type)s
-X-Git-Oldrev: %(oldrev)s
-X-Git-Newrev: %(newrev)s
-X-Git-NotificationType: ref_changed
-X-Git-Multimail-Version: %(multimail_version)s
-Auto-Submitted: auto-generated
-"""
-
-REFCHANGE_INTRO_TEMPLATE = """\
-This is an automated email from the git hooks/post-receive script.
-
-%(pusher)s pushed a change to %(refname_type)s %(short_refname)s
-in repository %(repo_shortname)s.
-
-"""
-
-
-FOOTER_TEMPLATE = """\
-
--- \n\
-To stop receiving notification emails like this one, please contact
-%(administrator)s.
-"""
-
-
-REWIND_ONLY_TEMPLATE = """\
-This update removed existing revisions from the reference, leaving the
-reference pointing at a previous point in the repository history.
-
- * -- * -- N   %(refname)s (%(newrev_short)s)
-            \\
-             O -- O -- O   (%(oldrev_short)s)
-
-Any revisions marked "omit" are not gone; other references still
-refer to them.  Any revisions marked "discard" are gone forever.
-"""
-
-
-NON_FF_TEMPLATE = """\
-This update added new revisions after undoing existing revisions.
-That is to say, some revisions that were in the old version of the
-%(refname_type)s are not in the new version.  This situation occurs
-when a user --force pushes a change and generates a repository
-containing something like this:
-
- * -- * -- B -- O -- O -- O   (%(oldrev_short)s)
-            \\
-             N -- N -- N   %(refname)s (%(newrev_short)s)
-
-You should already have received notification emails for all of the O
-revisions, and so the following emails describe only the N revisions
-from the common base, B.
-
-Any revisions marked "omit" are not gone; other references still
-refer to them.  Any revisions marked "discard" are gone forever.
-"""
-
-
-NO_NEW_REVISIONS_TEMPLATE = """\
-No new revisions were added by this update.
-"""
-
-
-DISCARDED_REVISIONS_TEMPLATE = """\
-This change permanently discards the following revisions:
-"""
-
-
-NO_DISCARDED_REVISIONS_TEMPLATE = """\
-The revisions that were on this %(refname_type)s are still contained in
-other references; therefore, this change does not discard any commits
-from the repository.
-"""
-
-
-NEW_REVISIONS_TEMPLATE = """\
-The %(tot)s revisions listed above as "new" are entirely new to this
-repository and will be described in separate emails.  The revisions
-listed as "add" were already present in the repository and have only
-been added to this reference.
-
-"""
-
-
-TAG_CREATED_TEMPLATE = """\
-      at %(newrev_short)-8s (%(newrev_type)s)
-"""
-
-
-TAG_UPDATED_TEMPLATE = """\
-*** WARNING: tag %(short_refname)s was modified! ***
-
-    from %(oldrev_short)-8s (%(oldrev_type)s)
-      to %(newrev_short)-8s (%(newrev_type)s)
-"""
-
-
-TAG_DELETED_TEMPLATE = """\
-*** WARNING: tag %(short_refname)s was deleted! ***
-
-"""
-
-
-# The template used in summary tables.  It looks best if this uses the
-# same alignment as TAG_CREATED_TEMPLATE and TAG_UPDATED_TEMPLATE.
-BRIEF_SUMMARY_TEMPLATE = """\
-%(action)8s %(rev_short)-8s %(text)s
-"""
-
-
-NON_COMMIT_UPDATE_TEMPLATE = """\
-This is an unusual reference change because the reference did not
-refer to a commit either before or after the change.  We do not know
-how to provide full information about this reference change.
-"""
-
-
-REVISION_HEADER_TEMPLATE = """\
-Date: %(send_date)s
-To: %(recipients)s
-Cc: %(cc_recipients)s
-Subject: %(emailprefix)s%(num)02d/%(tot)02d: %(oneline)s
-MIME-Version: 1.0
-Content-Type: text/%(contenttype)s; charset=%(charset)s
-Content-Transfer-Encoding: 8bit
-From: %(fromaddr)s
-Reply-To: %(reply_to)s
-In-Reply-To: %(reply_to_msgid)s
-References: %(reply_to_msgid)s
-Thread-Index: %(thread_index)s
-X-Git-Host: %(fqdn)s
-X-Git-Repo: %(repo_shortname)s
-X-Git-Refname: %(refname)s
-X-Git-Reftype: %(refname_type)s
-X-Git-Rev: %(rev)s
-X-Git-NotificationType: diff
-X-Git-Multimail-Version: %(multimail_version)s
-Auto-Submitted: auto-generated
-"""
-
-REVISION_INTRO_TEMPLATE = """\
-This is an automated email from the git hooks/post-receive script.
-
-%(pusher)s pushed a commit to %(refname_type)s %(short_refname)s
-in repository %(repo_shortname)s.
-
-"""
-
-LINK_TEXT_TEMPLATE = """\
-View the commit online:
-%(browse_url)s
-
-"""
-
-LINK_HTML_TEMPLATE = """\
-<p><a href="%(browse_url)s">View the commit online</a>.</p>
-"""
-
-
-REVISION_FOOTER_TEMPLATE = FOOTER_TEMPLATE
-
-
-# Combined, meaning refchange+revision email (for single-commit additions)
-COMBINED_HEADER_TEMPLATE = """\
-Date: %(send_date)s
-To: %(recipients)s
-Subject: %(subject)s
-MIME-Version: 1.0
-Content-Type: text/%(contenttype)s; charset=%(charset)s
-Content-Transfer-Encoding: 8bit
-Message-ID: %(msgid)s
-From: %(fromaddr)s
-Reply-To: %(reply_to)s
-X-Git-Host: %(fqdn)s
-X-Git-Repo: %(repo_shortname)s
-X-Git-Refname: %(refname)s
-X-Git-Reftype: %(refname_type)s
-X-Git-Oldrev: %(oldrev)s
-X-Git-Newrev: %(newrev)s
-X-Git-Rev: %(rev)s
-X-Git-NotificationType: ref_changed_plus_diff
-X-Git-Multimail-Version: %(multimail_version)s
-Auto-Submitted: auto-generated
-"""
-
-COMBINED_INTRO_TEMPLATE = """\
-This is an automated email from the git hooks/post-receive script.
-
-%(pusher)s pushed a commit to %(refname_type)s %(short_refname)s
-in repository %(repo_shortname)s.
-
-"""
-
-COMBINED_FOOTER_TEMPLATE = FOOTER_TEMPLATE
-
-
-class CommandError(Exception):
-    def __init__(self, cmd, retcode):
-        self.cmd = cmd
-        self.retcode = retcode
-        Exception.__init__(
-            self,
-            'Command "%s" failed with retcode %s' % (' '.join(cmd), retcode,)
-            )
-
-
-class ConfigurationException(Exception):
-    pass
-
-
-# The "git" program (this could be changed to include a full path):
-GIT_EXECUTABLE = 'git'
-
-
-# How "git" should be invoked (including global arguments), as a list
-# of words.  This variable is usually initialized automatically by
-# read_git_output() via choose_git_command(), but if a value is set
-# here then it will be used unconditionally.
-GIT_CMD = None
-
-
-def choose_git_command():
-    """Decide how to invoke git, and record the choice in GIT_CMD."""
-
-    global GIT_CMD
-
-    if GIT_CMD is None:
-        try:
-            # Check to see whether the "-c" option is accepted (it was
-            # only added in Git 1.7.2).  We don't actually use the
-            # output of "git --version", though if we needed more
-            # specific version information this would be the place to
-            # do it.
-            cmd = [GIT_EXECUTABLE, '-c', 'foo.bar=baz', '--version']
-            read_output(cmd)
-            GIT_CMD = [GIT_EXECUTABLE, '-c', 'i18n.logoutputencoding=%s' % (ENCODING,)]
-        except CommandError:
-            GIT_CMD = [GIT_EXECUTABLE]
-
-
-def read_git_output(args, input=None, keepends=False, **kw):
-    """Read the output of a Git command."""
-
-    if GIT_CMD is None:
-        choose_git_command()
-
-    return read_output(GIT_CMD + args, input=input, keepends=keepends, **kw)
-
-
-def read_output(cmd, input=None, keepends=False, **kw):
-    if input:
-        stdin = subprocess.PIPE
-        input = str_to_bytes(input)
-    else:
-        stdin = None
-    errors = 'strict'
-    if 'errors' in kw:
-        errors = kw['errors']
-        del kw['errors']
-    p = subprocess.Popen(
-        tuple(str_to_bytes(w) for w in cmd),
-        stdin=stdin, stdout=subprocess.PIPE, stderr=subprocess.PIPE, **kw
-        )
-    (out, err) = p.communicate(input)
-    out = bytes_to_str(out, errors=errors)
-    retcode = p.wait()
-    if retcode:
-        raise CommandError(cmd, retcode)
-    if not keepends:
-        out = out.rstrip('\n\r')
-    return out
-
-
-def read_git_lines(args, keepends=False, **kw):
-    """Return the lines output by Git command.
-
-    Return as single lines, with newlines stripped off."""
-
-    return read_git_output(args, keepends=True, **kw).splitlines(keepends)
-
-
-def git_rev_list_ish(cmd, spec, args=None, **kw):
-    """Common functionality for invoking a 'git rev-list'-like command.
-
-    Parameters:
-      * cmd is the Git command to run, e.g., 'rev-list' or 'log'.
-      * spec is a list of revision arguments to pass to the named
-        command.  If None, this function returns an empty list.
-      * args is a list of extra arguments passed to the named command.
-      * All other keyword arguments (if any) are passed to the
-        underlying read_git_lines() function.
-
-    Return the output of the Git command in the form of a list, one
-    entry per output line.
-    """
-    if spec is None:
-        return []
-    if args is None:
-        args = []
-    args = [cmd, '--stdin'] + args
-    spec_stdin = ''.join(s + '\n' for s in spec)
-    return read_git_lines(args, input=spec_stdin, **kw)
-
-
-def git_rev_list(spec, **kw):
-    """Run 'git rev-list' with the given list of revision arguments.
-
-    See git_rev_list_ish() for parameter and return value
-    documentation.
-    """
-    return git_rev_list_ish('rev-list', spec, **kw)
-
-
-def git_log(spec, **kw):
-    """Run 'git log' with the given list of revision arguments.
-
-    See git_rev_list_ish() for parameter and return value
-    documentation.
-    """
-    return git_rev_list_ish('log', spec, **kw)
-
-
-def header_encode(text, header_name=None):
-    """Encode and line-wrap the value of an email header field."""
-
-    # Convert to unicode, if required.
-    if not isinstance(text, unicode):
-        text = unicode(text, 'utf-8')
-
-    if is_ascii(text):
-        charset = 'ascii'
-    else:
-        charset = 'utf-8'
-
-    return Header(text, header_name=header_name, charset=Charset(charset)).encode()
-
-
-def addr_header_encode(text, header_name=None):
-    """Encode and line-wrap the value of an email header field containing
-    email addresses."""
-
-    # Convert to unicode, if required.
-    if not isinstance(text, unicode):
-        text = unicode(text, 'utf-8')
-
-    text = ', '.join(
-        formataddr((header_encode(name), emailaddr))
-        for name, emailaddr in getaddresses([text])
-        )
-
-    if is_ascii(text):
-        charset = 'ascii'
-    else:
-        charset = 'utf-8'
-
-    return Header(text, header_name=header_name, charset=Charset(charset)).encode()
-
-
-class Config(object):
-    def __init__(self, section, git_config=None):
-        """Represent a section of the git configuration.
-
-        If git_config is specified, it is passed to "git config" in
-        the GIT_CONFIG environment variable, meaning that "git config"
-        will read the specified path rather than the Git default
-        config paths."""
-
-        self.section = section
-        if git_config:
-            self.env = os.environ.copy()
-            self.env['GIT_CONFIG'] = git_config
-        else:
-            self.env = None
-
-    @staticmethod
-    def _split(s):
-        """Split NUL-terminated values."""
-
-        words = s.split('\0')
-        assert words[-1] == ''
-        return words[:-1]
-
-    @staticmethod
-    def add_config_parameters(c):
-        """Add configuration parameters to Git.
-
-        c is either an str or a list of str, each element being of the
-        form 'var=val' or 'var', with the same syntax and meaning as
-        the argument of 'git -c var=val'.
-        """
-        if isinstance(c, str):
-            c = (c,)
-        parameters = os.environ.get('GIT_CONFIG_PARAMETERS', '')
-        if parameters:
-            parameters += ' '
-        # git expects GIT_CONFIG_PARAMETERS to be of the form
-        #    "'name1=value1' 'name2=value2' 'name3=value3'"
-        # including everything inside the double quotes (but not the double
-        # quotes themselves).  Spacing is critical.  Also, if a value contains
-        # a literal single quote that quote must be represented using the
-        # four character sequence: '\''
-        parameters += ' '.join("'" + x.replace("'", "'\\''") + "'" for x in c)
-        os.environ['GIT_CONFIG_PARAMETERS'] = parameters
-
-    def get(self, name, default=None):
-        try:
-            values = self._split(read_git_output(
-                ['config', '--get', '--null', '%s.%s' % (self.section, name)],
-                env=self.env, keepends=True,
-                ))
-            assert len(values) == 1
-            return values[0]
-        except CommandError:
-            return default
-
-    def get_bool(self, name, default=None):
-        try:
-            value = read_git_output(
-                ['config', '--get', '--bool', '%s.%s' % (self.section, name)],
-                env=self.env,
-                )
-        except CommandError:
-            return default
-        return value == 'true'
-
-    def get_all(self, name, default=None):
-        """Read a (possibly multivalued) setting from the configuration.
-
-        Return the result as a list of values, or default if the name
-        is unset."""
-
-        try:
-            return self._split(read_git_output(
-                ['config', '--get-all', '--null', '%s.%s' % (self.section, name)],
-                env=self.env, keepends=True,
-                ))
-        except CommandError:
-            t, e, traceback = sys.exc_info()
-            if e.retcode == 1:
-                # "the section or key is invalid"; i.e., there is no
-                # value for the specified key.
-                return default
-            else:
-                raise
-
-    def set(self, name, value):
-        read_git_output(
-            ['config', '%s.%s' % (self.section, name), value],
-            env=self.env,
-            )
-
-    def add(self, name, value):
-        read_git_output(
-            ['config', '--add', '%s.%s' % (self.section, name), value],
-            env=self.env,
-            )
-
-    def __contains__(self, name):
-        return self.get_all(name, default=None) is not None
-
-    # We don't use this method anymore internally, but keep it here in
-    # case somebody is calling it from their own code:
-    def has_key(self, name):
-        return name in self
-
-    def unset_all(self, name):
-        try:
-            read_git_output(
-                ['config', '--unset-all', '%s.%s' % (self.section, name)],
-                env=self.env,
-                )
-        except CommandError:
-            t, e, traceback = sys.exc_info()
-            if e.retcode == 5:
-                # The name doesn't exist, which is what we wanted anyway...
-                pass
-            else:
-                raise
-
-    def set_recipients(self, name, value):
-        self.unset_all(name)
-        for pair in getaddresses([value]):
-            self.add(name, formataddr(pair))
-
-
-def generate_summaries(*log_args):
-    """Generate a brief summary for each revision requested.
-
-    log_args are strings that will be passed directly to "git log" as
-    revision selectors.  Iterate over (sha1_short, subject) for each
-    commit specified by log_args (subject is the first line of the
-    commit message as a string without EOLs)."""
-
-    cmd = [
-        'log', '--abbrev', '--format=%h %s',
-        ] + list(log_args) + ['--']
-    for line in read_git_lines(cmd):
-        yield tuple(line.split(' ', 1))
-
-
-def limit_lines(lines, max_lines):
-    for (index, line) in enumerate(lines):
-        if index < max_lines:
-            yield line
-
-    if index >= max_lines:
-        yield '... %d lines suppressed ...\n' % (index + 1 - max_lines,)
-
-
-def limit_linelength(lines, max_linelength):
-    for line in lines:
-        # Don't forget that lines always include a trailing newline.
-        if len(line) > max_linelength + 1:
-            line = line[:max_linelength - 7] + ' [...]\n'
-        yield line
-
-
-class CommitSet(object):
-    """A (constant) set of object names.
-
-    The set should be initialized with full SHA1 object names.  The
-    __contains__() method returns True iff its argument is an
-    abbreviation of any the names in the set."""
-
-    def __init__(self, names):
-        self._names = sorted(names)
-
-    def __len__(self):
-        return len(self._names)
-
-    def __contains__(self, sha1_abbrev):
-        """Return True iff this set contains sha1_abbrev (which might be abbreviated)."""
-
-        i = bisect.bisect_left(self._names, sha1_abbrev)
-        return i < len(self) and self._names[i].startswith(sha1_abbrev)
-
-
-class GitObject(object):
-    def __init__(self, sha1, type=None):
-        if sha1 == ZEROS:
-            self.sha1 = self.type = self.commit_sha1 = None
-        else:
-            self.sha1 = sha1
-            self.type = type or read_git_output(['cat-file', '-t', self.sha1])
-
-            if self.type == 'commit':
-                self.commit_sha1 = self.sha1
-            elif self.type == 'tag':
-                try:
-                    self.commit_sha1 = read_git_output(
-                        ['rev-parse', '--verify', '%s^0' % (self.sha1,)]
-                        )
-                except CommandError:
-                    # Cannot deref tag to determine commit_sha1
-                    self.commit_sha1 = None
-            else:
-                self.commit_sha1 = None
-
-        self.short = read_git_output(['rev-parse', '--short', sha1])
-
-    def get_summary(self):
-        """Return (sha1_short, subject) for this commit."""
-
-        if not self.sha1:
-            raise ValueError('Empty commit has no summary')
-
-        return next(iter(generate_summaries('--no-walk', self.sha1)))
-
-    def __eq__(self, other):
-        return isinstance(other, GitObject) and self.sha1 == other.sha1
-
-    def __ne__(self, other):
-        return not self == other
-
-    def __hash__(self):
-        return hash(self.sha1)
-
-    def __nonzero__(self):
-        return bool(self.sha1)
-
-    def __bool__(self):
-        """Python 2 backward compatibility"""
-        return self.__nonzero__()
-
-    def __str__(self):
-        return self.sha1 or ZEROS
-
-
-class Change(object):
-    """A Change that has been made to the Git repository.
-
-    Abstract class from which both Revisions and ReferenceChanges are
-    derived.  A Change knows how to generate a notification email
-    describing itself."""
-
-    def __init__(self, environment):
-        self.environment = environment
-        self._values = None
-        self._contains_html_diff = False
-
-    def _contains_diff(self):
-        # We do contain a diff, should it be rendered in HTML?
-        if self.environment.commit_email_format == "html":
-            self._contains_html_diff = True
-
-    def _compute_values(self):
-        """Return a dictionary {keyword: expansion} for this Change.
-
-        Derived classes overload this method to add more entries to
-        the return value.  This method is used internally by
-        get_values().  The return value should always be a new
-        dictionary."""
-
-        values = self.environment.get_values()
-        fromaddr = self.environment.get_fromaddr(change=self)
-        if fromaddr is not None:
-            values['fromaddr'] = fromaddr
-        values['multimail_version'] = get_version()
-        return values
-
-    # Aliases usable in template strings. Tuple of pairs (destination,
-    # source).
-    VALUES_ALIAS = (
-        ("id", "newrev"),
-        )
-
-    def get_values(self, **extra_values):
-        """Return a dictionary {keyword: expansion} for this Change.
-
-        Return a dictionary mapping keywords to the values that they
-        should be expanded to for this Change (used when interpolating
-        template strings).  If any keyword arguments are supplied, add
-        those to the return value as well.  The return value is always
-        a new dictionary."""
-
-        if self._values is None:
-            self._values = self._compute_values()
-
-        values = self._values.copy()
-        if extra_values:
-            values.update(extra_values)
-
-        for alias, val in self.VALUES_ALIAS:
-            values[alias] = values[val]
-        return values
-
-    def expand(self, template, **extra_values):
-        """Expand template.
-
-        Expand the template (which should be a string) using string
-        interpolation of the values for this Change.  If any keyword
-        arguments are provided, also include those in the keywords
-        available for interpolation."""
-
-        return template % self.get_values(**extra_values)
-
-    def expand_lines(self, template, html_escape_val=False, **extra_values):
-        """Break template into lines and expand each line."""
-
-        values = self.get_values(**extra_values)
-        if html_escape_val:
-            for k in values:
-                if is_string(values[k]):
-                    values[k] = html_escape(values[k])
-        for line in template.splitlines(True):
-            yield line % values
-
-    def expand_header_lines(self, template, **extra_values):
-        """Break template into lines and expand each line as an RFC 2822 header.
-
-        Encode values and split up lines that are too long.  Silently
-        skip lines that contain references to unknown variables."""
-
-        values = self.get_values(**extra_values)
-        if self._contains_html_diff:
-            self._content_type = 'html'
-        else:
-            self._content_type = 'plain'
-        values['contenttype'] = self._content_type
-
-        for line in template.splitlines():
-            (name, value) = line.split(': ', 1)
-
-            try:
-                value = value % values
-            except KeyError:
-                t, e, traceback = sys.exc_info()
-                if DEBUG:
-                    self.environment.log_warning(
-                        'Warning: unknown variable %r in the following line; line skipped:\n'
-                        '    %s\n'
-                        % (e.args[0], line,)
-                        )
-            else:
-                if name.lower() in ADDR_HEADERS:
-                    value = addr_header_encode(value, name)
-                else:
-                    value = header_encode(value, name)
-                for splitline in ('%s: %s\n' % (name, value)).splitlines(True):
-                    yield splitline
-
-    def generate_email_header(self):
-        """Generate the RFC 2822 email headers for this Change, a line at a time.
-
-        The output should not include the trailing blank line."""
-
-        raise NotImplementedError()
-
-    def generate_browse_link(self, base_url):
-        """Generate a link to an online repository browser."""
-        return iter(())
-
-    def generate_email_intro(self, html_escape_val=False):
-        """Generate the email intro for this Change, a line at a time.
-
-        The output will be used as the standard boilerplate at the top
-        of the email body."""
-
-        raise NotImplementedError()
-
-    def generate_email_body(self, push):
-        """Generate the main part of the email body, a line at a time.
-
-        The text in the body might be truncated after a specified
-        number of lines (see multimailhook.emailmaxlines)."""
-
-        raise NotImplementedError()
-
-    def generate_email_footer(self, html_escape_val):
-        """Generate the footer of the email, a line at a time.
-
-        The footer is always included, irrespective of
-        multimailhook.emailmaxlines."""
-
-        raise NotImplementedError()
-
-    def _wrap_for_html(self, lines):
-        """Wrap the lines in HTML <pre> tag when using HTML format.
-
-        Escape special HTML characters and add <pre> and </pre> tags around
-        the given lines if we should be generating HTML as indicated by
-        self._contains_html_diff being set to true.
-        """
-        if self._contains_html_diff:
-            yield "<pre style='margin:0'>\n"
-
-            for line in lines:
-                yield html_escape(line)
-
-            yield '</pre>\n'
-        else:
-            for line in lines:
-                yield line
-
-    def generate_email(self, push, body_filter=None, extra_header_values={}):
-        """Generate an email describing this change.
-
-        Iterate over the lines (including the header lines) of an
-        email describing this change.  If body_filter is not None,
-        then use it to filter the lines that are intended for the
-        email body.
-
-        The extra_header_values field is received as a dict and not as
-        **kwargs, to allow passing other keyword arguments in the
-        future (e.g. passing extra values to generate_email_intro()"""
-
-        for line in self.generate_email_header(**extra_header_values):
-            yield line
-        yield '\n'
-        html_escape_val = (self.environment.html_in_intro and
-                           self._contains_html_diff)
-        intro = self.generate_email_intro(html_escape_val)
-        if not self.environment.html_in_intro:
-            intro = self._wrap_for_html(intro)
-        for line in intro:
-            yield line
-
-        if self.environment.commitBrowseURL:
-            for line in self.generate_browse_link(self.environment.commitBrowseURL):
-                yield line
-
-        body = self.generate_email_body(push)
-        if body_filter is not None:
-            body = body_filter(body)
-
-        diff_started = False
-        if self._contains_html_diff:
-            # "white-space: pre" is the default, but we need to
-            # specify it again in case the message is viewed in a
-            # webmail which wraps it in an element setting white-space
-            # to something else (Zimbra does this and sets
-            # white-space: pre-line).
-            yield '<pre style="white-space: pre; background: #F8F8F8">'
-        for line in body:
-            if self._contains_html_diff:
-                # This is very, very naive. It would be much better to really
-                # parse the diff, i.e. look at how many lines do we have in
-                # the hunk headers instead of blindly highlighting everything
-                # that looks like it might be part of a diff.
-                bgcolor = ''
-                fgcolor = ''
-                if line.startswith('--- a/'):
-                    diff_started = True
-                    bgcolor = 'e0e0ff'
-                elif line.startswith('diff ') or line.startswith('index '):
-                    diff_started = True
-                    fgcolor = '808080'
-                elif diff_started:
-                    if line.startswith('+++ '):
-                        bgcolor = 'e0e0ff'
-                    elif line.startswith('@@'):
-                        bgcolor = 'e0e0e0'
-                    elif line.startswith('+'):
-                        bgcolor = 'e0ffe0'
-                    elif line.startswith('-'):
-                        bgcolor = 'ffe0e0'
-                elif line.startswith('commit '):
-                    fgcolor = '808000'
-                elif line.startswith('    '):
-                    fgcolor = '404040'
-
-                # Chop the trailing LF, we don't want it inside <pre>.
-                line = html_escape(line[:-1])
-
-                if bgcolor or fgcolor:
-                    style = 'display:block; white-space:pre;'
-                    if bgcolor:
-                        style += 'background:#' + bgcolor + ';'
-                    if fgcolor:
-                        style += 'color:#' + fgcolor + ';'
-                    # Use a <span style='display:block> to color the
-                    # whole line. The newline must be inside the span
-                    # to display properly both in Firefox and in
-                    # text-based browser.
-                    line = "<span style='%s'>%s\n</span>" % (style, line)
-                else:
-                    line = line + '\n'
-
-            yield line
-        if self._contains_html_diff:
-            yield '</pre>'
-        html_escape_val = (self.environment.html_in_footer and
-                           self._contains_html_diff)
-        footer = self.generate_email_footer(html_escape_val)
-        if not self.environment.html_in_footer:
-            footer = self._wrap_for_html(footer)
-        for line in footer:
-            yield line
-
-    def get_specific_fromaddr(self):
-        """For kinds of Changes which specify it, return the kind-specific
-        From address to use."""
-        return None
-
-
-class Revision(Change):
-    """A Change consisting of a single git commit."""
-
-    CC_RE = re.compile(r'^\s*C[Cc]:\s*(?P<to>[^#]+@[^\s#]*)\s*(#.*)?$')
-
-    def __init__(self, reference_change, rev, num, tot):
-        Change.__init__(self, reference_change.environment)
-        self.reference_change = reference_change
-        self.rev = rev
-        self.change_type = self.reference_change.change_type
-        self.refname = self.reference_change.refname
-        self.num = num
-        self.tot = tot
-        self.author = read_git_output(['log', '--no-walk', '--format=%aN <%aE>', self.rev.sha1])
-        self.recipients = self.environment.get_revision_recipients(self)
-
-        # -s is short for --no-patch, but -s works on older git's (e.g. 1.7)
-        self.parents = read_git_lines(['show', '-s', '--format=%P',
-                                      self.rev.sha1])[0].split()
-
-        self.cc_recipients = ''
-        if self.environment.get_scancommitforcc():
-            self.cc_recipients = ', '.join(to.strip() for to in self._cc_recipients())
-            if self.cc_recipients:
-                self.environment.log_msg(
-                    'Add %s to CC for %s' % (self.cc_recipients, self.rev.sha1))
-
-    def _cc_recipients(self):
-        cc_recipients = []
-        message = read_git_output(['log', '--no-walk', '--format=%b', self.rev.sha1])
-        lines = message.strip().split('\n')
-        for line in lines:
-            m = re.match(self.CC_RE, line)
-            if m:
-                cc_recipients.append(m.group('to'))
-
-        return cc_recipients
-
-    def _compute_values(self):
-        values = Change._compute_values(self)
-
-        oneline = read_git_output(
-            ['log', '--format=%s', '--no-walk', self.rev.sha1]
-            )
-
-        max_subject_length = self.environment.get_max_subject_length()
-        if max_subject_length > 0 and len(oneline) > max_subject_length:
-            oneline = oneline[:max_subject_length - 6] + ' [...]'
-
-        values['rev'] = self.rev.sha1
-        values['parents'] = ' '.join(self.parents)
-        values['rev_short'] = self.rev.short
-        values['change_type'] = self.change_type
-        values['refname'] = self.refname
-        values['newrev'] = self.rev.sha1
-        values['short_refname'] = self.reference_change.short_refname
-        values['refname_type'] = self.reference_change.refname_type
-        values['reply_to_msgid'] = self.reference_change.msgid
-        values['thread_index'] = self.reference_change.thread_index
-        values['num'] = self.num
-        values['tot'] = self.tot
-        values['recipients'] = self.recipients
-        if self.cc_recipients:
-            values['cc_recipients'] = self.cc_recipients
-        values['oneline'] = oneline
-        values['author'] = self.author
-
-        reply_to = self.environment.get_reply_to_commit(self)
-        if reply_to:
-            values['reply_to'] = reply_to
-
-        return values
-
-    def generate_email_header(self, **extra_values):
-        for line in self.expand_header_lines(
-                REVISION_HEADER_TEMPLATE, **extra_values
-                ):
-            yield line
-
-    def generate_browse_link(self, base_url):
-        if '%(' not in base_url:
-            base_url += '%(id)s'
-        url = "".join(self.expand_lines(base_url))
-        if self._content_type == 'html':
-            for line in self.expand_lines(LINK_HTML_TEMPLATE,
-                                          html_escape_val=True,
-                                          browse_url=url):
-                yield line
-        elif self._content_type == 'plain':
-            for line in self.expand_lines(LINK_TEXT_TEMPLATE,
-                                          html_escape_val=False,
-                                          browse_url=url):
-                yield line
-        else:
-            raise NotImplementedError("Content-type %s unsupported. Please report it as a bug.")
-
-    def generate_email_intro(self, html_escape_val=False):
-        for line in self.expand_lines(REVISION_INTRO_TEMPLATE,
-                                      html_escape_val=html_escape_val):
-            yield line
-
-    def generate_email_body(self, push):
-        """Show this revision."""
-
-        for line in read_git_lines(
-                ['log'] + self.environment.commitlogopts + ['-1', self.rev.sha1],
-                keepends=True,
-                errors='replace'):
-            if line.startswith('Date:   ') and self.environment.date_substitute:
-                yield self.environment.date_substitute + line[len('Date:   '):]
-            else:
-                yield line
-
-    def generate_email_footer(self, html_escape_val):
-        return self.expand_lines(REVISION_FOOTER_TEMPLATE,
-                                 html_escape_val=html_escape_val)
-
-    def generate_email(self, push, body_filter=None, extra_header_values={}):
-        self._contains_diff()
-        return Change.generate_email(self, push, body_filter, extra_header_values)
-
-    def get_specific_fromaddr(self):
-        return self.environment.from_commit
-
-
-class ReferenceChange(Change):
-    """A Change to a Git reference.
-
-    An abstract class representing a create, update, or delete of a
-    Git reference.  Derived classes handle specific types of reference
-    (e.g., tags vs. branches).  These classes generate the main
-    reference change email summarizing the reference change and
-    whether it caused any any commits to be added or removed.
-
-    ReferenceChange objects are usually created using the static
-    create() method, which has the logic to decide which derived class
-    to instantiate."""
-
-    REF_RE = re.compile(r'^refs\/(?P<area>[^\/]+)\/(?P<shortname>.*)$')
-
-    @staticmethod
-    def create(environment, oldrev, newrev, refname):
-        """Return a ReferenceChange object representing the change.
-
-        Return an object that represents the type of change that is being
-        made. oldrev and newrev should be SHA1s or ZEROS."""
-
-        old = GitObject(oldrev)
-        new = GitObject(newrev)
-        rev = new or old
-
-        # The revision type tells us what type the commit is, combined with
-        # the location of the ref we can decide between
-        #  - working branch
-        #  - tracking branch
-        #  - unannotated tag
-        #  - annotated tag
-        m = ReferenceChange.REF_RE.match(refname)
-        if m:
-            area = m.group('area')
-            short_refname = m.group('shortname')
-        else:
-            area = ''
-            short_refname = refname
-
-        if rev.type == 'tag':
-            # Annotated tag:
-            klass = AnnotatedTagChange
-        elif rev.type == 'commit':
-            if area == 'tags':
-                # Non-annotated tag:
-                klass = NonAnnotatedTagChange
-            elif area == 'heads':
-                # Branch:
-                klass = BranchChange
-            elif area == 'remotes':
-                # Tracking branch:
-                environment.log_warning(
-                    '*** Push-update of tracking branch %r\n'
-                    '***  - incomplete email generated.'
-                    % (refname,)
-                    )
-                klass = OtherReferenceChange
-            else:
-                # Some other reference namespace:
-                environment.log_warning(
-                    '*** Push-update of strange reference %r\n'
-                    '***  - incomplete email generated.'
-                    % (refname,)
-                    )
-                klass = OtherReferenceChange
-        else:
-            # Anything else (is there anything else?)
-            environment.log_warning(
-                '*** Unknown type of update to %r (%s)\n'
-                '***  - incomplete email generated.'
-                % (refname, rev.type,)
-                )
-            klass = OtherReferenceChange
-
-        return klass(
-            environment,
-            refname=refname, short_refname=short_refname,
-            old=old, new=new, rev=rev,
-            )
-
-    @staticmethod
-    def make_thread_index():
-        """Return a string appropriate for the Thread-Index header,
-        needed by MS Outlook to get threading right.
-
-        The format is (base64-encoded):
-        - 1 byte must be 1
-        - 5 bytes encode a date (hardcoded here)
-        - 16 bytes for a globally unique identifier
-
-        FIXME: Unfortunately, even with the Thread-Index field, MS
-        Outlook doesn't seem to do the threading reliably (see
-        https://github.com/git-multimail/git-multimail/pull/194).
-        """
-        thread_index = b'\x01\x00\x00\x12\x34\x56' + uuid.uuid4().bytes
-        return base64.standard_b64encode(thread_index).decode('ascii')
-
-    def __init__(self, environment, refname, short_refname, old, new, rev):
-        Change.__init__(self, environment)
-        self.change_type = {
-            (False, True): 'create',
-            (True, True): 'update',
-            (True, False): 'delete',
-            }[bool(old), bool(new)]
-        self.refname = refname
-        self.short_refname = short_refname
-        self.old = old
-        self.new = new
-        self.rev = rev
-        self.msgid = make_msgid()
-        self.thread_index = self.make_thread_index()
-        self.diffopts = environment.diffopts
-        self.graphopts = environment.graphopts
-        self.logopts = environment.logopts
-        self.commitlogopts = environment.commitlogopts
-        self.showgraph = environment.refchange_showgraph
-        self.showlog = environment.refchange_showlog
-
-        self.header_template = REFCHANGE_HEADER_TEMPLATE
-        self.intro_template = REFCHANGE_INTRO_TEMPLATE
-        self.footer_template = FOOTER_TEMPLATE
-
-    def _compute_values(self):
-        values = Change._compute_values(self)
-
-        values['change_type'] = self.change_type
-        values['refname_type'] = self.refname_type
-        values['refname'] = self.refname
-        values['short_refname'] = self.short_refname
-        values['msgid'] = self.msgid
-        values['thread_index'] = self.thread_index
-        values['recipients'] = self.recipients
-        values['oldrev'] = str(self.old)
-        values['oldrev_short'] = self.old.short
-        values['newrev'] = str(self.new)
-        values['newrev_short'] = self.new.short
-
-        if self.old:
-            values['oldrev_type'] = self.old.type
-        if self.new:
-            values['newrev_type'] = self.new.type
-
-        reply_to = self.environment.get_reply_to_refchange(self)
-        if reply_to:
-            values['reply_to'] = reply_to
-
-        return values
-
-    def send_single_combined_email(self, known_added_sha1s):
-        """Determine if a combined refchange/revision email should be sent
-
-        If there is only a single new (non-merge) commit added by a
-        change, it is useful to combine the ReferenceChange and
-        Revision emails into one.  In such a case, return the single
-        revision; otherwise, return None.
-
-        This method is overridden in BranchChange."""
-
-        return None
-
-    def generate_combined_email(self, push, revision, body_filter=None, extra_header_values={}):
-        """Generate an email describing this change AND specified revision.
-
-        Iterate over the lines (including the header lines) of an
-        email describing this change.  If body_filter is not None,
-        then use it to filter the lines that are intended for the
-        email body.
-
-        The extra_header_values field is received as a dict and not as
-        **kwargs, to allow passing other keyword arguments in the
-        future (e.g. passing extra values to generate_email_intro()
-
-        This method is overridden in BranchChange."""
-
-        raise NotImplementedError
-
-    def get_subject(self):
-        template = {
-            'create': REF_CREATED_SUBJECT_TEMPLATE,
-            'update': REF_UPDATED_SUBJECT_TEMPLATE,
-            'delete': REF_DELETED_SUBJECT_TEMPLATE,
-            }[self.change_type]
-        return self.expand(template)
-
-    def generate_email_header(self, **extra_values):
-        if 'subject' not in extra_values:
-            extra_values['subject'] = self.get_subject()
-
-        for line in self.expand_header_lines(
-                self.header_template, **extra_values
-                ):
-            yield line
-
-    def generate_email_intro(self, html_escape_val=False):
-        for line in self.expand_lines(self.intro_template,
-                                      html_escape_val=html_escape_val):
-            yield line
-
-    def generate_email_body(self, push):
-        """Call the appropriate body-generation routine.
-
-        Call one of generate_create_summary() /
-        generate_update_summary() / generate_delete_summary()."""
-
-        change_summary = {
-            'create': self.generate_create_summary,
-            'delete': self.generate_delete_summary,
-            'update': self.generate_update_summary,
-            }[self.change_type](push)
-        for line in change_summary:
-            yield line
-
-        for line in self.generate_revision_change_summary(push):
-            yield line
-
-    def generate_email_footer(self, html_escape_val):
-        return self.expand_lines(self.footer_template,
-                                 html_escape_val=html_escape_val)
-
-    def generate_revision_change_graph(self, push):
-        if self.showgraph:
-            args = ['--graph'] + self.graphopts
-            for newold in ('new', 'old'):
-                has_newold = False
-                spec = push.get_commits_spec(newold, self)
-                for line in git_log(spec, args=args, keepends=True):
-                    if not has_newold:
-                        has_newold = True
-                        yield '\n'
-                        yield 'Graph of %s commits:\n\n' % (
-                            {'new': 'new', 'old': 'discarded'}[newold],)
-                    yield '  ' + line
-                if has_newold:
-                    yield '\n'
-
-    def generate_revision_change_log(self, new_commits_list):
-        if self.showlog:
-            yield '\n'
-            yield 'Detailed log of new commits:\n\n'
-            for line in read_git_lines(
-                    ['log', '--no-walk'] +
-                    self.logopts +
-                    new_commits_list +
-                    ['--'],
-                    keepends=True,
-                    ):
-                yield line
-
-    def generate_new_revision_summary(self, tot, new_commits_list, push):
-        for line in self.expand_lines(NEW_REVISIONS_TEMPLATE, tot=tot):
-            yield line
-        for line in self.generate_revision_change_graph(push):
-            yield line
-        for line in self.generate_revision_change_log(new_commits_list):
-            yield line
-
-    def generate_revision_change_summary(self, push):
-        """Generate a summary of the revisions added/removed by this change."""
-
-        if self.new.commit_sha1 and not self.old.commit_sha1:
-            # A new reference was created.  List the new revisions
-            # brought by the new reference (i.e., those revisions that
-            # were not in the repository before this reference
-            # change).
-            sha1s = list(push.get_new_commits(self))
-            sha1s.reverse()
-            tot = len(sha1s)
-            new_revisions = [
-                Revision(self, GitObject(sha1), num=i + 1, tot=tot)
-                for (i, sha1) in enumerate(sha1s)
-                ]
-
-            if new_revisions:
-                yield self.expand('This %(refname_type)s includes the following new commits:\n')
-                yield '\n'
-                for r in new_revisions:
-                    (sha1, subject) = r.rev.get_summary()
-                    yield r.expand(
-                        BRIEF_SUMMARY_TEMPLATE, action='new', text=subject,
-                        )
-                yield '\n'
-                for line in self.generate_new_revision_summary(
-                        tot, [r.rev.sha1 for r in new_revisions], push):
-                    yield line
-            else:
-                for line in self.expand_lines(NO_NEW_REVISIONS_TEMPLATE):
-                    yield line
-
-        elif self.new.commit_sha1 and self.old.commit_sha1:
-            # A reference was changed to point at a different commit.
-            # List the revisions that were removed and/or added *from
-            # that reference* by this reference change, along with a
-            # diff between the trees for its old and new values.
-
-            # List of the revisions that were added to the branch by
-            # this update.  Note this list can include revisions that
-            # have already had notification emails; we want such
-            # revisions in the summary even though we will not send
-            # new notification emails for them.
-            adds = list(generate_summaries(
-                '--topo-order', '--reverse', '%s..%s'
-                % (self.old.commit_sha1, self.new.commit_sha1,)
-                ))
-
-            # List of the revisions that were removed from the branch
-            # by this update.  This will be empty except for
-            # non-fast-forward updates.
-            discards = list(generate_summaries(
-                '%s..%s' % (self.new.commit_sha1, self.old.commit_sha1,)
-                ))
-
-            if adds:
-                new_commits_list = push.get_new_commits(self)
-            else:
-                new_commits_list = []
-            new_commits = CommitSet(new_commits_list)
-
-            if discards:
-                discarded_commits = CommitSet(push.get_discarded_commits(self))
-            else:
-                discarded_commits = CommitSet([])
-
-            if discards and adds:
-                for (sha1, subject) in discards:
-                    if sha1 in discarded_commits:
-                        action = 'discard'
-                    else:
-                        action = 'omit'
-                    yield self.expand(
-                        BRIEF_SUMMARY_TEMPLATE, action=action,
-                        rev_short=sha1, text=subject,
-                        )
-                for (sha1, subject) in adds:
-                    if sha1 in new_commits:
-                        action = 'new'
-                    else:
-                        action = 'add'
-                    yield self.expand(
-                        BRIEF_SUMMARY_TEMPLATE, action=action,
-                        rev_short=sha1, text=subject,
-                        )
-                yield '\n'
-                for line in self.expand_lines(NON_FF_TEMPLATE):
-                    yield line
-
-            elif discards:
-                for (sha1, subject) in discards:
-                    if sha1 in discarded_commits:
-                        action = 'discard'
-                    else:
-                        action = 'omit'
-                    yield self.expand(
-                        BRIEF_SUMMARY_TEMPLATE, action=action,
-                        rev_short=sha1, text=subject,
-                        )
-                yield '\n'
-                for line in self.expand_lines(REWIND_ONLY_TEMPLATE):
-                    yield line
-
-            elif adds:
-                (sha1, subject) = self.old.get_summary()
-                yield self.expand(
-                    BRIEF_SUMMARY_TEMPLATE, action='from',
-                    rev_short=sha1, text=subject,
-                    )
-                for (sha1, subject) in adds:
-                    if sha1 in new_commits:
-                        action = 'new'
-                    else:
-                        action = 'add'
-                    yield self.expand(
-                        BRIEF_SUMMARY_TEMPLATE, action=action,
-                        rev_short=sha1, text=subject,
-                        )
-
-            yield '\n'
-
-            if new_commits:
-                for line in self.generate_new_revision_summary(
-                        len(new_commits), new_commits_list, push):
-                    yield line
-            else:
-                for line in self.expand_lines(NO_NEW_REVISIONS_TEMPLATE):
-                    yield line
-                for line in self.generate_revision_change_graph(push):
-                    yield line
-
-            # The diffstat is shown from the old revision to the new
-            # revision.  This is to show the truth of what happened in
-            # this change.  There's no point showing the stat from the
-            # base to the new revision because the base is effectively a
-            # random revision at this point - the user will be interested
-            # in what this revision changed - including the undoing of
-            # previous revisions in the case of non-fast-forward updates.
-            yield '\n'
-            yield 'Summary of changes:\n'
-            for line in read_git_lines(
-                    ['diff-tree'] +
-                    self.diffopts +
-                    ['%s..%s' % (self.old.commit_sha1, self.new.commit_sha1,)],
-                    keepends=True,
-                    ):
-                yield line
-
-        elif self.old.commit_sha1 and not self.new.commit_sha1:
-            # A reference was deleted.  List the revisions that were
-            # removed from the repository by this reference change.
-
-            sha1s = list(push.get_discarded_commits(self))
-            tot = len(sha1s)
-            discarded_revisions = [
-                Revision(self, GitObject(sha1), num=i + 1, tot=tot)
-                for (i, sha1) in enumerate(sha1s)
-                ]
-
-            if discarded_revisions:
-                for line in self.expand_lines(DISCARDED_REVISIONS_TEMPLATE):
-                    yield line
-                yield '\n'
-                for r in discarded_revisions:
-                    (sha1, subject) = r.rev.get_summary()
-                    yield r.expand(
-                        BRIEF_SUMMARY_TEMPLATE, action='discard', text=subject,
-                        )
-                for line in self.generate_revision_change_graph(push):
-                    yield line
-            else:
-                for line in self.expand_lines(NO_DISCARDED_REVISIONS_TEMPLATE):
-                    yield line
-
-        elif not self.old.commit_sha1 and not self.new.commit_sha1:
-            for line in self.expand_lines(NON_COMMIT_UPDATE_TEMPLATE):
-                yield line
-
-    def generate_create_summary(self, push):
-        """Called for the creation of a reference."""
-
-        # This is a new reference and so oldrev is not valid
-        (sha1, subject) = self.new.get_summary()
-        yield self.expand(
-            BRIEF_SUMMARY_TEMPLATE, action='at',
-            rev_short=sha1, text=subject,
-            )
-        yield '\n'
-
-    def generate_update_summary(self, push):
-        """Called for the change of a pre-existing branch."""
-
-        return iter([])
-
-    def generate_delete_summary(self, push):
-        """Called for the deletion of any type of reference."""
-
-        (sha1, subject) = self.old.get_summary()
-        yield self.expand(
-            BRIEF_SUMMARY_TEMPLATE, action='was',
-            rev_short=sha1, text=subject,
-            )
-        yield '\n'
-
-    def get_specific_fromaddr(self):
-        return self.environment.from_refchange
-
-
-class BranchChange(ReferenceChange):
-    refname_type = 'branch'
-
-    def __init__(self, environment, refname, short_refname, old, new, rev):
-        ReferenceChange.__init__(
-            self, environment,
-            refname=refname, short_refname=short_refname,
-            old=old, new=new, rev=rev,
-            )
-        self.recipients = environment.get_refchange_recipients(self)
-        self._single_revision = None
-
-    def send_single_combined_email(self, known_added_sha1s):
-        if not self.environment.combine_when_single_commit:
-            return None
-
-        # In the sadly-all-too-frequent usecase of people pushing only
-        # one of their commits at a time to a repository, users feel
-        # the reference change summary emails are noise rather than
-        # important signal.  This is because, in this particular
-        # usecase, there is a reference change summary email for each
-        # new commit, and all these summaries do is point out that
-        # there is one new commit (which can readily be inferred by
-        # the existence of the individual revision email that is also
-        # sent).  In such cases, our users prefer there to be a combined
-        # reference change summary/new revision email.
-        #
-        # So, if the change is an update and it doesn't discard any
-        # commits, and it adds exactly one non-merge commit (gerrit
-        # forces a workflow where every commit is individually merged
-        # and the git-multimail hook fired off for just this one
-        # change), then we send a combined refchange/revision email.
-        try:
-            # If this change is a reference update that doesn't discard
-            # any commits...
-            if self.change_type != 'update':
-                return None
-
-            if read_git_lines(
-                    ['merge-base', self.old.sha1, self.new.sha1]
-                    ) != [self.old.sha1]:
-                return None
-
-            # Check if this update introduced exactly one non-merge
-            # commit:
-
-            def split_line(line):
-                """Split line into (sha1, [parent,...])."""
-
-                words = line.split()
-                return (words[0], words[1:])
-
-            # Get the new commits introduced by the push as a list of
-            # (sha1, [parent,...])
-            new_commits = [
-                split_line(line)
-                for line in read_git_lines(
-                    [
-                        'log', '-3', '--format=%H %P',
-                        '%s..%s' % (self.old.sha1, self.new.sha1),
-                        ]
-                    )
-                ]
-
-            if not new_commits:
-                return None
-
-            # If the newest commit is a merge, save it for a later check
-            # but otherwise ignore it
-            merge = None
-            tot = len(new_commits)
-            if len(new_commits[0][1]) > 1:
-                merge = new_commits[0][0]
-                del new_commits[0]
-
-            # Our primary check: we can't combine if more than one commit
-            # is introduced.  We also currently only combine if the new
-            # commit is a non-merge commit, though it may make sense to
-            # combine if it is a merge as well.
-            if not (
-                    len(new_commits) == 1 and
-                    len(new_commits[0][1]) == 1 and
-                    new_commits[0][0] in known_added_sha1s
-                    ):
-                return None
-
-            # We do not want to combine revision and refchange emails if
-            # those go to separate locations.
-            rev = Revision(self, GitObject(new_commits[0][0]), 1, tot)
-            if rev.recipients != self.recipients:
-                return None
-
-            # We ignored the newest commit if it was just a merge of the one
-            # commit being introduced.  But we don't want to ignore that
-            # merge commit it it involved conflict resolutions.  Check that.
-            if merge and merge != read_git_output(['diff-tree', '--cc', merge]):
-                return None
-
-            # We can combine the refchange and one new revision emails
-            # into one.  Return the Revision that a combined email should
-            # be sent about.
-            return rev
-        except CommandError:
-            # Cannot determine number of commits in old..new or new..old;
-            # don't combine reference/revision emails:
-            return None
-
-    def generate_combined_email(self, push, revision, body_filter=None, extra_header_values={}):
-        values = revision.get_values()
-        if extra_header_values:
-            values.update(extra_header_values)
-        if 'subject' not in extra_header_values:
-            values['subject'] = self.expand(COMBINED_REFCHANGE_REVISION_SUBJECT_TEMPLATE, **values)
-
-        self._single_revision = revision
-        self._contains_diff()
-        self.header_template = COMBINED_HEADER_TEMPLATE
-        self.intro_template = COMBINED_INTRO_TEMPLATE
-        self.footer_template = COMBINED_FOOTER_TEMPLATE
-
-        def revision_gen_link(base_url):
-            # revision is used only to generate the body, and
-            # _content_type is set while generating headers. Get it
-            # from the BranchChange object.
-            revision._content_type = self._content_type
-            return revision.generate_browse_link(base_url)
-        self.generate_browse_link = revision_gen_link
-        for line in self.generate_email(push, body_filter, values):
-            yield line
-
-    def generate_email_body(self, push):
-        '''Call the appropriate body generation routine.
-
-        If this is a combined refchange/revision email, the special logic
-        for handling this combined email comes from this function.  For
-        other cases, we just use the normal handling.'''
-
-        # If self._single_revision isn't set; don't override
-        if not self._single_revision:
-            for line in super(BranchChange, self).generate_email_body(push):
-                yield line
-            return
-
-        # This is a combined refchange/revision email; we first provide
-        # some info from the refchange portion, and then call the revision
-        # generate_email_body function to handle the revision portion.
-        adds = list(generate_summaries(
-            '--topo-order', '--reverse', '%s..%s'
-            % (self.old.commit_sha1, self.new.commit_sha1,)
-            ))
-
-        yield self.expand("The following commit(s) were added to %(refname)s by this push:\n")
-        for (sha1, subject) in adds:
-            yield self.expand(
-                BRIEF_SUMMARY_TEMPLATE, action='new',
-                rev_short=sha1, text=subject,
-                )
-
-        yield self._single_revision.rev.short + " is described below\n"
-        yield '\n'
-
-        for line in self._single_revision.generate_email_body(push):
-            yield line
-
-
-class AnnotatedTagChange(ReferenceChange):
-    refname_type = 'annotated tag'
-
-    def __init__(self, environment, refname, short_refname, old, new, rev):
-        ReferenceChange.__init__(
-            self, environment,
-            refname=refname, short_refname=short_refname,
-            old=old, new=new, rev=rev,
-            )
-        self.recipients = environment.get_announce_recipients(self)
-        self.show_shortlog = environment.announce_show_shortlog
-
-    ANNOTATED_TAG_FORMAT = (
-        '%(*objectname)\n'
-        '%(*objecttype)\n'
-        '%(taggername)\n'
-        '%(taggerdate)'
-        )
-
-    def describe_tag(self, push):
-        """Describe the new value of an annotated tag."""
-
-        # Use git for-each-ref to pull out the individual fields from
-        # the tag
-        [tagobject, tagtype, tagger, tagged] = read_git_lines(
-            ['for-each-ref', '--format=%s' % (self.ANNOTATED_TAG_FORMAT,), self.refname],
-            )
-
-        yield self.expand(
-            BRIEF_SUMMARY_TEMPLATE, action='tagging',
-            rev_short=tagobject, text='(%s)' % (tagtype,),
-            )
-        if tagtype == 'commit':
-            # If the tagged object is a commit, then we assume this is a
-            # release, and so we calculate which tag this tag is
-            # replacing
-            try:
-                prevtag = read_git_output(['describe', '--abbrev=0', '%s^' % (self.new,)])
-            except CommandError:
-                prevtag = None
-            if prevtag:
-                yield ' replaces %s\n' % (prevtag,)
-        else:
-            prevtag = None
-            yield '  length %s bytes\n' % (read_git_output(['cat-file', '-s', tagobject]),)
-
-        yield '      by %s\n' % (tagger,)
-        yield '      on %s\n' % (tagged,)
-        yield '\n'
-
-        # Show the content of the tag message; this might contain a
-        # change log or release notes so is worth displaying.
-        yield LOGBEGIN
-        contents = list(read_git_lines(['cat-file', 'tag', self.new.sha1], keepends=True))
-        contents = contents[contents.index('\n') + 1:]
-        if contents and contents[-1][-1:] != '\n':
-            contents.append('\n')
-        for line in contents:
-            yield line
-
-        if self.show_shortlog and tagtype == 'commit':
-            # Only commit tags make sense to have rev-list operations
-            # performed on them
-            yield '\n'
-            if prevtag:
-                # Show changes since the previous release
-                revlist = read_git_output(
-                    ['rev-list', '--pretty=short', '%s..%s' % (prevtag, self.new,)],
-                    keepends=True,
-                    )
-            else:
-                # No previous tag, show all the changes since time
-                # began
-                revlist = read_git_output(
-                    ['rev-list', '--pretty=short', '%s' % (self.new,)],
-                    keepends=True,
-                    )
-            for line in read_git_lines(['shortlog'], input=revlist, keepends=True):
-                yield line
-
-        yield LOGEND
-        yield '\n'
-
-    def generate_create_summary(self, push):
-        """Called for the creation of an annotated tag."""
-
-        for line in self.expand_lines(TAG_CREATED_TEMPLATE):
-            yield line
-
-        for line in self.describe_tag(push):
-            yield line
-
-    def generate_update_summary(self, push):
-        """Called for the update of an annotated tag.
-
-        This is probably a rare event and may not even be allowed."""
-
-        for line in self.expand_lines(TAG_UPDATED_TEMPLATE):
-            yield line
-
-        for line in self.describe_tag(push):
-            yield line
-
-    def generate_delete_summary(self, push):
-        """Called when a non-annotated reference is updated."""
-
-        for line in self.expand_lines(TAG_DELETED_TEMPLATE):
-            yield line
-
-        yield self.expand('   tag was  %(oldrev_short)s\n')
-        yield '\n'
-
-
-class NonAnnotatedTagChange(ReferenceChange):
-    refname_type = 'tag'
-
-    def __init__(self, environment, refname, short_refname, old, new, rev):
-        ReferenceChange.__init__(
-            self, environment,
-            refname=refname, short_refname=short_refname,
-            old=old, new=new, rev=rev,
-            )
-        self.recipients = environment.get_refchange_recipients(self)
-
-    def generate_create_summary(self, push):
-        """Called for the creation of an annotated tag."""
-
-        for line in self.expand_lines(TAG_CREATED_TEMPLATE):
-            yield line
-
-    def generate_update_summary(self, push):
-        """Called when a non-annotated reference is updated."""
-
-        for line in self.expand_lines(TAG_UPDATED_TEMPLATE):
-            yield line
-
-    def generate_delete_summary(self, push):
-        """Called when a non-annotated reference is updated."""
-
-        for line in self.expand_lines(TAG_DELETED_TEMPLATE):
-            yield line
-
-        for line in ReferenceChange.generate_delete_summary(self, push):
-            yield line
-
-
-class OtherReferenceChange(ReferenceChange):
-    refname_type = 'reference'
-
-    def __init__(self, environment, refname, short_refname, old, new, rev):
-        # We use the full refname as short_refname, because otherwise
-        # the full name of the reference would not be obvious from the
-        # text of the email.
-        ReferenceChange.__init__(
-            self, environment,
-            refname=refname, short_refname=refname,
-            old=old, new=new, rev=rev,
-            )
-        self.recipients = environment.get_refchange_recipients(self)
-
-
-class Mailer(object):
-    """An object that can send emails."""
-
-    def __init__(self, environment):
-        self.environment = environment
-
-    def close(self):
-        pass
-
-    def send(self, lines, to_addrs):
-        """Send an email consisting of lines.
-
-        lines must be an iterable over the lines constituting the
-        header and body of the email.  to_addrs is a list of recipient
-        addresses (can be needed even if lines already contains a
-        "To:" field).  It can be either a string (comma-separated list
-        of email addresses) or a Python list of individual email
-        addresses.
-
-        """
-
-        raise NotImplementedError()
-
-
-class SendMailer(Mailer):
-    """Send emails using 'sendmail -oi -t'."""
-
-    SENDMAIL_CANDIDATES = [
-        '/usr/sbin/sendmail',
-        '/usr/lib/sendmail',
-        ]
-
-    @staticmethod
-    def find_sendmail():
-        for path in SendMailer.SENDMAIL_CANDIDATES:
-            if os.access(path, os.X_OK):
-                return path
-        else:
-            raise ConfigurationException(
-                'No sendmail executable found.  '
-                'Try setting multimailhook.sendmailCommand.'
-                )
-
-    def __init__(self, environment, command=None, envelopesender=None):
-        """Construct a SendMailer instance.
-
-        command should be the command and arguments used to invoke
-        sendmail, as a list of strings.  If an envelopesender is
-        provided, it will also be passed to the command, via '-f
-        envelopesender'."""
-        super(SendMailer, self).__init__(environment)
-        if command:
-            self.command = command[:]
-        else:
-            self.command = [self.find_sendmail(), '-oi', '-t']
-
-        if envelopesender:
-            self.command.extend(['-f', envelopesender])
-
-    def send(self, lines, to_addrs):
-        try:
-            p = subprocess.Popen(self.command, stdin=subprocess.PIPE)
-        except OSError:
-            self.environment.get_logger().error(
-                '*** Cannot execute command: %s\n' % ' '.join(self.command) +
-                '*** %s\n' % sys.exc_info()[1] +
-                '*** Try setting multimailhook.mailer to "smtp"\n' +
-                '*** to send emails without using the sendmail command.\n'
-                )
-            sys.exit(1)
-        try:
-            lines = (str_to_bytes(line) for line in lines)
-            p.stdin.writelines(lines)
-        except Exception:
-            self.environment.get_logger().error(
-                '*** Error while generating commit email\n'
-                '***  - mail sending aborted.\n'
-                )
-            if hasattr(p, 'terminate'):
-                # subprocess.terminate() is not available in Python 2.4
-                p.terminate()
-            else:
-                import signal
-                os.kill(p.pid, signal.SIGTERM)
-            raise
-        else:
-            p.stdin.close()
-            retcode = p.wait()
-            if retcode:
-                raise CommandError(self.command, retcode)
-
-
-class SMTPMailer(Mailer):
-    """Send emails using Python's smtplib."""
-
-    def __init__(self, environment,
-                 envelopesender, smtpserver,
-                 smtpservertimeout=10.0, smtpserverdebuglevel=0,
-                 smtpencryption='none',
-                 smtpuser='', smtppass='',
-                 smtpcacerts=''
-                 ):
-        super(SMTPMailer, self).__init__(environment)
-        if not envelopesender:
-            self.environment.get_logger().error(
-                'fatal: git_multimail: cannot use SMTPMailer without a sender address.\n'
-                'please set either multimailhook.envelopeSender or user.email\n'
-                )
-            sys.exit(1)
-        if smtpencryption == 'ssl' and not (smtpuser and smtppass):
-            raise ConfigurationException(
-                'Cannot use SMTPMailer with security option ssl '
-                'without options username and password.'
-                )
-        self.envelopesender = envelopesender
-        self.smtpserver = smtpserver
-        self.smtpservertimeout = smtpservertimeout
-        self.smtpserverdebuglevel = smtpserverdebuglevel
-        self.security = smtpencryption
-        self.username = smtpuser
-        self.password = smtppass
-        self.smtpcacerts = smtpcacerts
-        self.loggedin = False
-        try:
-            def call(klass, server, timeout):
-                try:
-                    return klass(server, timeout=timeout)
-                except TypeError:
-                    # Old Python versions do not have timeout= argument.
-                    return klass(server)
-            if self.security == 'none':
-                self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)
-            elif self.security == 'ssl':
-                if self.smtpcacerts:
-                    raise smtplib.SMTPException(
-                        "Checking certificate is not supported for ssl, prefer starttls"
-                        )
-                self.smtp = call(smtplib.SMTP_SSL, self.smtpserver, timeout=self.smtpservertimeout)
-            elif self.security == 'tls':
-                if 'ssl' not in sys.modules:
-                    self.environment.get_logger().error(
-                        '*** Your Python version does not have the ssl library installed\n'
-                        '*** smtpEncryption=tls is not available.\n'
-                        '*** Either upgrade Python to 2.6 or later\n'
-                        '    or use git_multimail.py version 1.2.\n')
-                if ':' not in self.smtpserver:
-                    self.smtpserver += ':587'  # default port for TLS
-                self.smtp = call(smtplib.SMTP, self.smtpserver, timeout=self.smtpservertimeout)
-                # start: ehlo + starttls
-                # equivalent to
-                #     self.smtp.ehlo()
-                #     self.smtp.starttls()
-                # with acces to the ssl layer
-                self.smtp.ehlo()
-                if not self.smtp.has_extn("starttls"):
-                    raise smtplib.SMTPException("STARTTLS extension not supported by server")
-                resp, reply = self.smtp.docmd("STARTTLS")
-                if resp != 220:
-                    raise smtplib.SMTPException("Wrong answer to the STARTTLS command")
-                if self.smtpcacerts:
-                    self.smtp.sock = ssl.wrap_socket(
-                        self.smtp.sock,
-                        ca_certs=self.smtpcacerts,
-                        cert_reqs=ssl.CERT_REQUIRED
-                        )
-                else:
-                    self.smtp.sock = ssl.wrap_socket(
-                        self.smtp.sock,
-                        cert_reqs=ssl.CERT_NONE
-                        )
-                    self.environment.get_logger().error(
-                        '*** Warning, the server certificat is not verified (smtp) ***\n'
-                        '***          set the option smtpCACerts                   ***\n'
-                        )
-                if not hasattr(self.smtp.sock, "read"):
-                    # using httplib.FakeSocket with Python 2.5.x or earlier
-                    self.smtp.sock.read = self.smtp.sock.recv
-                self.smtp.file = smtplib.SSLFakeFile(self.smtp.sock)
-                self.smtp.helo_resp = None
-                self.smtp.ehlo_resp = None
-                self.smtp.esmtp_features = {}
-                self.smtp.does_esmtp = 0
-                # end:   ehlo + starttls
-                self.smtp.ehlo()
-            else:
-                sys.stdout.write('*** Error: Control reached an invalid option. ***')
-                sys.exit(1)
-            if self.smtpserverdebuglevel > 0:
-                sys.stdout.write(
-                    "*** Setting debug on for SMTP server connection (%s) ***\n"
-                    % self.smtpserverdebuglevel)
-                self.smtp.set_debuglevel(self.smtpserverdebuglevel)
-        except Exception:
-            self.environment.get_logger().error(
-                '*** Error establishing SMTP connection to %s ***\n'
-                '*** %s\n'
-                % (self.smtpserver, sys.exc_info()[1]))
-            sys.exit(1)
-
-    def close(self):
-        if hasattr(self, 'smtp'):
-            self.smtp.quit()
-            del self.smtp
-
-    def __del__(self):
-        self.close()
-
-    def send(self, lines, to_addrs):
-        try:
-            if self.username or self.password:
-                if not self.loggedin:
-                    self.smtp.login(self.username, self.password)
-                    self.loggedin = True
-            msg = ''.join(lines)
-            # turn comma-separated list into Python list if needed.
-            if is_string(to_addrs):
-                to_addrs = [email for (name, email) in getaddresses([to_addrs])]
-            self.smtp.sendmail(self.envelopesender, to_addrs, msg)
-        except socket.timeout:
-            self.environment.get_logger().error(
-                '*** Error sending email ***\n'
-                '*** SMTP server timed out (timeout is %s)\n'
-                % self.smtpservertimeout)
-        except smtplib.SMTPResponseException:
-            err = sys.exc_info()[1]
-            self.environment.get_logger().error(
-                '*** Error sending email ***\n'
-                '*** Error %d: %s\n'
-                % (err.smtp_code, bytes_to_str(err.smtp_error)))
-            try:
-                smtp = self.smtp
-                # delete the field before quit() so that in case of
-                # error, self.smtp is deleted anyway.
-                del self.smtp
-                smtp.quit()
-            except:
-                self.environment.get_logger().error(
-                    '*** Error closing the SMTP connection ***\n'
-                    '*** Exiting anyway ... ***\n'
-                    '*** %s\n' % sys.exc_info()[1])
-            sys.exit(1)
-
-
-class OutputMailer(Mailer):
-    """Write emails to an output stream, bracketed by lines of '=' characters.
-
-    This is intended for debugging purposes."""
-
-    SEPARATOR = '=' * 75 + '\n'
-
-    def __init__(self, f, environment=None):
-        super(OutputMailer, self).__init__(environment=environment)
-        self.f = f
-
-    def send(self, lines, to_addrs):
-        write_str(self.f, self.SEPARATOR)
-        for line in lines:
-            write_str(self.f, line)
-        write_str(self.f, self.SEPARATOR)
-
-
-def get_git_dir():
-    """Determine GIT_DIR.
-
-    Determine GIT_DIR either from the GIT_DIR environment variable or
-    from the working directory, using Git's usual rules."""
-
-    try:
-        return read_git_output(['rev-parse', '--git-dir'])
-    except CommandError:
-        sys.stderr.write('fatal: git_multimail: not in a git directory\n')
-        sys.exit(1)
-
-
-class Environment(object):
-    """Describes the environment in which the push is occurring.
-
-    An Environment object encapsulates information about the local
-    environment.  For example, it knows how to determine:
-
-    * the name of the repository to which the push occurred
-
-    * what user did the push
-
-    * what users want to be informed about various types of changes.
-
-    An Environment object is expected to have the following methods:
-
-        get_repo_shortname()
-
-            Return a short name for the repository, for display
-            purposes.
-
-        get_repo_path()
-
-            Return the absolute path to the Git repository.
-
-        get_emailprefix()
-
-            Return a string that will be prefixed to every email's
-            subject.
-
-        get_pusher()
-
-            Return the username of the person who pushed the changes.
-            This value is used in the email body to indicate who
-            pushed the change.
-
-        get_pusher_email() (may return None)
-
-            Return the email address of the person who pushed the
-            changes.  The value should be a single RFC 2822 email
-            address as a string; e.g., "Joe User <user@example.com>"
-            if available, otherwise "user@example.com".  If set, the
-            value is used as the Reply-To address for refchange
-            emails.  If it is impossible to determine the pusher's
-            email, this attribute should be set to None (in which case
-            no Reply-To header will be output).
-
-        get_sender()
-
-            Return the address to be used as the 'From' email address
-            in the email envelope.
-
-        get_fromaddr(change=None)
-
-            Return the 'From' email address used in the email 'From:'
-            headers.  If the change is known when this function is
-            called, it is passed in as the 'change' parameter.  (May
-            be a full RFC 2822 email address like 'Joe User
-            <user@example.com>'.)
-
-        get_administrator()
-
-            Return the name and/or email of the repository
-            administrator.  This value is used in the footer as the
-            person to whom requests to be removed from the
-            notification list should be sent.  Ideally, it should
-            include a valid email address.
-
-        get_reply_to_refchange()
-        get_reply_to_commit()
-
-            Return the address to use in the email "Reply-To" header,
-            as a string.  These can be an RFC 2822 email address, or
-            None to omit the "Reply-To" header.
-            get_reply_to_refchange() is used for refchange emails;
-            get_reply_to_commit() is used for individual commit
-            emails.
-
-        get_ref_filter_regex()
-
-            Return a tuple -- a compiled regex, and a boolean indicating
-            whether the regex picks refs to include (if False, the regex
-            matches on refs to exclude).
-
-        get_default_ref_ignore_regex()
-
-            Return a regex that should be ignored for both what emails
-            to send and when computing what commits are considered new
-            to the repository.  Default is "^refs/notes/".
-
-        get_max_subject_length()
-
-            Return an int giving the maximal length for the subject
-            (git log --oneline).
-
-    They should also define the following attributes:
-
-        announce_show_shortlog (bool)
-
-            True iff announce emails should include a shortlog.
-
-        commit_email_format (string)
-
-            If "html", generate commit emails in HTML instead of plain text
-            used by default.
-
-        html_in_intro (bool)
-        html_in_footer (bool)
-
-            When generating HTML emails, the introduction (respectively,
-            the footer) will be HTML-escaped iff html_in_intro (respectively,
-            the footer) is true. When false, only the values used to expand
-            the template are escaped.
-
-        refchange_showgraph (bool)
-
-            True iff refchanges emails should include a detailed graph.
-
-        refchange_showlog (bool)
-
-            True iff refchanges emails should include a detailed log.
-
-        diffopts (list of strings)
-
-            The options that should be passed to 'git diff' for the
-            summary email.  The value should be a list of strings
-            representing words to be passed to the command.
-
-        graphopts (list of strings)
-
-            Analogous to diffopts, but contains options passed to
-            'git log --graph' when generating the detailed graph for
-            a set of commits (see refchange_showgraph)
-
-        logopts (list of strings)
-
-            Analogous to diffopts, but contains options passed to
-            'git log' when generating the detailed log for a set of
-            commits (see refchange_showlog)
-
-        commitlogopts (list of strings)
-
-            The options that should be passed to 'git log' for each
-            commit mail.  The value should be a list of strings
-            representing words to be passed to the command.
-
-        date_substitute (string)
-
-            String to be used in substitution for 'Date:' at start of
-            line in the output of 'git log'.
-
-        quiet (bool)
-            On success do not write to stderr
-
-        stdout (bool)
-            Write email to stdout rather than emailing. Useful for debugging
-
-        combine_when_single_commit (bool)
-
-            True if a combined email should be produced when a single
-            new commit is pushed to a branch, False otherwise.
-
-        from_refchange, from_commit (strings)
-
-            Addresses to use for the From: field for refchange emails
-            and commit emails respectively.  Set from
-            multimailhook.fromRefchange and multimailhook.fromCommit
-            by ConfigEnvironmentMixin.
-
-        log_file, error_log_file, debug_log_file (string)
-
-            Name of a file to which logs should be sent.
-
-        verbose (int)
-
-            How verbose the system should be.
-            - 0 (default): show info, errors, ...
-            - 1 : show basic debug info
-    """
-
-    REPO_NAME_RE = re.compile(r'^(?P<name>.+?)(?:\.git)$')
-
-    def __init__(self, osenv=None):
-        self.osenv = osenv or os.environ
-        self.announce_show_shortlog = False
-        self.commit_email_format = "text"
-        self.html_in_intro = False
-        self.html_in_footer = False
-        self.commitBrowseURL = None
-        self.maxcommitemails = 500
-        self.excludemergerevisions = False
-        self.diffopts = ['--stat', '--summary', '--find-copies-harder']
-        self.graphopts = ['--oneline', '--decorate']
-        self.logopts = []
-        self.refchange_showgraph = False
-        self.refchange_showlog = False
-        self.commitlogopts = ['-C', '--stat', '-p', '--cc']
-        self.date_substitute = 'AuthorDate: '
-        self.quiet = False
-        self.stdout = False
-        self.combine_when_single_commit = True
-        self.logger = None
-
-        self.COMPUTED_KEYS = [
-            'administrator',
-            'charset',
-            'emailprefix',
-            'pusher',
-            'pusher_email',
-            'repo_path',
-            'repo_shortname',
-            'sender',
-            ]
-
-        self._values = None
-
-    def get_logger(self):
-        """Get (possibly creates) the logger associated to this environment."""
-        if self.logger is None:
-            self.logger = Logger(self)
-        return self.logger
-
-    def get_repo_shortname(self):
-        """Use the last part of the repo path, with ".git" stripped off if present."""
-
-        basename = os.path.basename(os.path.abspath(self.get_repo_path()))
-        m = self.REPO_NAME_RE.match(basename)
-        if m:
-            return m.group('name')
-        else:
-            return basename
-
-    def get_pusher(self):
-        raise NotImplementedError()
-
-    def get_pusher_email(self):
-        return None
-
-    def get_fromaddr(self, change=None):
-        config = Config('user')
-        fromname = config.get('name', default='')
-        fromemail = config.get('email', default='')
-        if fromemail:
-            return formataddr([fromname, fromemail])
-        return self.get_sender()
-
-    def get_administrator(self):
-        return 'the administrator of this repository'
-
-    def get_emailprefix(self):
-        return ''
-
-    def get_repo_path(self):
-        if read_git_output(['rev-parse', '--is-bare-repository']) == 'true':
-            path = get_git_dir()
-        else:
-            path = read_git_output(['rev-parse', '--show-toplevel'])
-        return os.path.abspath(path)
-
-    def get_charset(self):
-        return CHARSET
-
-    def get_values(self):
-        """Return a dictionary {keyword: expansion} for this Environment.
-
-        This method is called by Change._compute_values().  The keys
-        in the returned dictionary are available to be used in any of
-        the templates.  The dictionary is created by calling
-        self.get_NAME() for each of the attributes named in
-        COMPUTED_KEYS and recording those that do not return None.
-        The return value is always a new dictionary."""
-
-        if self._values is None:
-            values = {'': ''}  # %()s expands to the empty string.
-
-            for key in self.COMPUTED_KEYS:
-                value = getattr(self, 'get_%s' % (key,))()
-                if value is not None:
-                    values[key] = value
-
-            self._values = values
-
-        return self._values.copy()
-
-    def get_refchange_recipients(self, refchange):
-        """Return the recipients for notifications about refchange.
-
-        Return the list of email addresses to which notifications
-        about the specified ReferenceChange should be sent."""
-
-        raise NotImplementedError()
-
-    def get_announce_recipients(self, annotated_tag_change):
-        """Return the recipients for notifications about annotated_tag_change.
-
-        Return the list of email addresses to which notifications
-        about the specified AnnotatedTagChange should be sent."""
-
-        raise NotImplementedError()
-
-    def get_reply_to_refchange(self, refchange):
-        return self.get_pusher_email()
-
-    def get_revision_recipients(self, revision):
-        """Return the recipients for messages about revision.
-
-        Return the list of email addresses to which notifications
-        about the specified Revision should be sent.  This method
-        could be overridden, for example, to take into account the
-        contents of the revision when deciding whom to notify about
-        it.  For example, there could be a scheme for users to express
-        interest in particular files or subdirectories, and only
-        receive notification emails for revisions that affecting those
-        files."""
-
-        raise NotImplementedError()
-
-    def get_reply_to_commit(self, revision):
-        return revision.author
-
-    def get_default_ref_ignore_regex(self):
-        # The commit messages of git notes are essentially meaningless
-        # and "filenames" in git notes commits are an implementational
-        # detail that might surprise users at first.  As such, we
-        # would need a completely different method for handling emails
-        # of git notes in order for them to be of benefit for users,
-        # which we simply do not have right now.
-        return "^refs/notes/"
-
-    def get_max_subject_length(self):
-        """Return the maximal subject line (git log --oneline) length.
-        Longer subject lines will be truncated."""
-        raise NotImplementedError()
-
-    def filter_body(self, lines):
-        """Filter the lines intended for an email body.
-
-        lines is an iterable over the lines that would go into the
-        email body.  Filter it (e.g., limit the number of lines, the
-        line length, character set, etc.), returning another iterable.
-        See FilterLinesEnvironmentMixin and MaxlinesEnvironmentMixin
-        for classes implementing this functionality."""
-
-        return lines
-
-    def log_msg(self, msg):
-        """Write the string msg on a log file or on stderr.
-
-        Sends the text to stderr by default, override to change the behavior."""
-        self.get_logger().info(msg)
-
-    def log_warning(self, msg):
-        """Write the string msg on a log file or on stderr.
-
-        Sends the text to stderr by default, override to change the behavior."""
-        self.get_logger().warning(msg)
-
-    def log_error(self, msg):
-        """Write the string msg on a log file or on stderr.
-
-        Sends the text to stderr by default, override to change the behavior."""
-        self.get_logger().error(msg)
-
-    def check(self):
-        pass
-
-
-class ConfigEnvironmentMixin(Environment):
-    """A mixin that sets self.config to its constructor's config argument.
-
-    This class's constructor consumes the "config" argument.
-
-    Mixins that need to inspect the config should inherit from this
-    class (1) to make sure that "config" is still in the constructor
-    arguments with its own constructor runs and/or (2) to be sure that
-    self.config is set after construction."""
-
-    def __init__(self, config, **kw):
-        super(ConfigEnvironmentMixin, self).__init__(**kw)
-        self.config = config
-
-
-class ConfigOptionsEnvironmentMixin(ConfigEnvironmentMixin):
-    """An Environment that reads most of its information from "git config"."""
-
-    @staticmethod
-    def forbid_field_values(name, value, forbidden):
-        for forbidden_val in forbidden:
-            if value is not None and value.lower() == forbidden:
-                raise ConfigurationException(
-                    '"%s" is not an allowed setting for %s' % (value, name)
-                    )
-
-    def __init__(self, config, **kw):
-        super(ConfigOptionsEnvironmentMixin, self).__init__(
-            config=config, **kw
-            )
-
-        for var, cfg in (
-                ('announce_show_shortlog', 'announceshortlog'),
-                ('refchange_showgraph', 'refchangeShowGraph'),
-                ('refchange_showlog', 'refchangeshowlog'),
-                ('quiet', 'quiet'),
-                ('stdout', 'stdout'),
-                ):
-            val = config.get_bool(cfg)
-            if val is not None:
-                setattr(self, var, val)
-
-        commit_email_format = config.get('commitEmailFormat')
-        if commit_email_format is not None:
-            if commit_email_format != "html" and commit_email_format != "text":
-                self.log_warning(
-                    '*** Unknown value for multimailhook.commitEmailFormat: %s\n' %
-                    commit_email_format +
-                    '*** Expected either "text" or "html".  Ignoring.\n'
-                    )
-            else:
-                self.commit_email_format = commit_email_format
-
-        html_in_intro = config.get_bool('htmlInIntro')
-        if html_in_intro is not None:
-            self.html_in_intro = html_in_intro
-
-        html_in_footer = config.get_bool('htmlInFooter')
-        if html_in_footer is not None:
-            self.html_in_footer = html_in_footer
-
-        self.commitBrowseURL = config.get('commitBrowseURL')
-
-        self.excludemergerevisions = config.get('excludeMergeRevisions')
-
-        maxcommitemails = config.get('maxcommitemails')
-        if maxcommitemails is not None:
-            try:
-                self.maxcommitemails = int(maxcommitemails)
-            except ValueError:
-                self.log_warning(
-                    '*** Malformed value for multimailhook.maxCommitEmails: %s\n'
-                    % maxcommitemails +
-                    '*** Expected a number.  Ignoring.\n'
-                    )
-
-        diffopts = config.get('diffopts')
-        if diffopts is not None:
-            self.diffopts = shlex.split(diffopts)
-
-        graphopts = config.get('graphOpts')
-        if graphopts is not None:
-            self.graphopts = shlex.split(graphopts)
-
-        logopts = config.get('logopts')
-        if logopts is not None:
-            self.logopts = shlex.split(logopts)
-
-        commitlogopts = config.get('commitlogopts')
-        if commitlogopts is not None:
-            self.commitlogopts = shlex.split(commitlogopts)
-
-        date_substitute = config.get('dateSubstitute')
-        if date_substitute == 'none':
-            self.date_substitute = None
-        elif date_substitute is not None:
-            self.date_substitute = date_substitute
-
-        reply_to = config.get('replyTo')
-        self.__reply_to_refchange = config.get('replyToRefchange', default=reply_to)
-        self.forbid_field_values('replyToRefchange',
-                                 self.__reply_to_refchange,
-                                 ['author'])
-        self.__reply_to_commit = config.get('replyToCommit', default=reply_to)
-
-        self.from_refchange = config.get('fromRefchange')
-        self.forbid_field_values('fromRefchange',
-                                 self.from_refchange,
-                                 ['author', 'none'])
-        self.from_commit = config.get('fromCommit')
-        self.forbid_field_values('fromCommit',
-                                 self.from_commit,
-                                 ['none'])
-
-        combine = config.get_bool('combineWhenSingleCommit')
-        if combine is not None:
-            self.combine_when_single_commit = combine
-
-        self.log_file = config.get('logFile', default=None)
-        self.error_log_file = config.get('errorLogFile', default=None)
-        self.debug_log_file = config.get('debugLogFile', default=None)
-        if config.get_bool('Verbose', default=False):
-            self.verbose = 1
-        else:
-            self.verbose = 0
-
-    def get_administrator(self):
-        return (
-            self.config.get('administrator') or
-            self.get_sender() or
-            super(ConfigOptionsEnvironmentMixin, self).get_administrator()
-            )
-
-    def get_repo_shortname(self):
-        return (
-            self.config.get('reponame') or
-            super(ConfigOptionsEnvironmentMixin, self).get_repo_shortname()
-            )
-
-    def get_emailprefix(self):
-        emailprefix = self.config.get('emailprefix')
-        if emailprefix is not None:
-            emailprefix = emailprefix.strip()
-            if emailprefix:
-                emailprefix += ' '
-        else:
-            emailprefix = '[%(repo_shortname)s] '
-        short_name = self.get_repo_shortname()
-        try:
-            return emailprefix % {'repo_shortname': short_name}
-        except:
-            self.get_logger().error(
-                '*** Invalid multimailhook.emailPrefix: %s\n' % emailprefix +
-                '*** %s\n' % sys.exc_info()[1] +
-                "*** Only the '%(repo_shortname)s' placeholder is allowed\n"
-                )
-            raise ConfigurationException(
-                '"%s" is not an allowed setting for emailPrefix' % emailprefix
-                )
-
-    def get_sender(self):
-        return self.config.get('envelopesender')
-
-    def process_addr(self, addr, change):
-        if addr.lower() == 'author':
-            if hasattr(change, 'author'):
-                return change.author
-            else:
-                return None
-        elif addr.lower() == 'pusher':
-            return self.get_pusher_email()
-        elif addr.lower() == 'none':
-            return None
-        else:
-            return addr
-
-    def get_fromaddr(self, change=None):
-        fromaddr = self.config.get('from')
-        if change:
-            specific_fromaddr = change.get_specific_fromaddr()
-            if specific_fromaddr:
-                fromaddr = specific_fromaddr
-        if fromaddr:
-            fromaddr = self.process_addr(fromaddr, change)
-        if fromaddr:
-            return fromaddr
-        return super(ConfigOptionsEnvironmentMixin, self).get_fromaddr(change)
-
-    def get_reply_to_refchange(self, refchange):
-        if self.__reply_to_refchange is None:
-            return super(ConfigOptionsEnvironmentMixin, self).get_reply_to_refchange(refchange)
-        else:
-            return self.process_addr(self.__reply_to_refchange, refchange)
-
-    def get_reply_to_commit(self, revision):
-        if self.__reply_to_commit is None:
-            return super(ConfigOptionsEnvironmentMixin, self).get_reply_to_commit(revision)
-        else:
-            return self.process_addr(self.__reply_to_commit, revision)
-
-    def get_scancommitforcc(self):
-        return self.config.get('scancommitforcc')
-
-
-class FilterLinesEnvironmentMixin(Environment):
-    """Handle encoding and maximum line length of body lines.
-
-        email_max_line_length (int or None)
-
-            The maximum length of any single line in the email body.
-            Longer lines are truncated at that length with ' [...]'
-            appended.
-
-        strict_utf8 (bool)
-
-            If this field is set to True, then the email body text is
-            expected to be UTF-8.  Any invalid characters are
-            converted to U+FFFD, the Unicode replacement character
-            (encoded as UTF-8, of course).
-
-    """
-
-    def __init__(self, strict_utf8=True,
-                 email_max_line_length=500, max_subject_length=500,
-                 **kw):
-        super(FilterLinesEnvironmentMixin, self).__init__(**kw)
-        self.__strict_utf8 = strict_utf8
-        self.__email_max_line_length = email_max_line_length
-        self.__max_subject_length = max_subject_length
-
-    def filter_body(self, lines):
-        lines = super(FilterLinesEnvironmentMixin, self).filter_body(lines)
-        if self.__strict_utf8:
-            if not PYTHON3:
-                lines = (line.decode(ENCODING, 'replace') for line in lines)
-            # Limit the line length in Unicode-space to avoid
-            # splitting characters:
-            if self.__email_max_line_length > 0:
-                lines = limit_linelength(lines, self.__email_max_line_length)
-            if not PYTHON3:
-                lines = (line.encode(ENCODING, 'replace') for line in lines)
-        elif self.__email_max_line_length:
-            lines = limit_linelength(lines, self.__email_max_line_length)
-
-        return lines
-
-    def get_max_subject_length(self):
-        return self.__max_subject_length
-
-
-class ConfigFilterLinesEnvironmentMixin(
-        ConfigEnvironmentMixin,
-        FilterLinesEnvironmentMixin,
-        ):
-    """Handle encoding and maximum line length based on config."""
-
-    def __init__(self, config, **kw):
-        strict_utf8 = config.get_bool('emailstrictutf8', default=None)
-        if strict_utf8 is not None:
-            kw['strict_utf8'] = strict_utf8
-
-        email_max_line_length = config.get('emailmaxlinelength')
-        if email_max_line_length is not None:
-            kw['email_max_line_length'] = int(email_max_line_length)
-
-        max_subject_length = config.get('subjectMaxLength', default=email_max_line_length)
-        if max_subject_length is not None:
-            kw['max_subject_length'] = int(max_subject_length)
-
-        super(ConfigFilterLinesEnvironmentMixin, self).__init__(
-            config=config, **kw
-            )
-
-
-class MaxlinesEnvironmentMixin(Environment):
-    """Limit the email body to a specified number of lines."""
-
-    def __init__(self, emailmaxlines, **kw):
-        super(MaxlinesEnvironmentMixin, self).__init__(**kw)
-        self.__emailmaxlines = emailmaxlines
-
-    def filter_body(self, lines):
-        lines = super(MaxlinesEnvironmentMixin, self).filter_body(lines)
-        if self.__emailmaxlines > 0:
-            lines = limit_lines(lines, self.__emailmaxlines)
-        return lines
-
-
-class ConfigMaxlinesEnvironmentMixin(
-        ConfigEnvironmentMixin,
-        MaxlinesEnvironmentMixin,
-        ):
-    """Limit the email body to the number of lines specified in config."""
-
-    def __init__(self, config, **kw):
-        emailmaxlines = int(config.get('emailmaxlines', default='0'))
-        super(ConfigMaxlinesEnvironmentMixin, self).__init__(
-            config=config,
-            emailmaxlines=emailmaxlines,
-            **kw
-            )
-
-
-class FQDNEnvironmentMixin(Environment):
-    """A mixin that sets the host's FQDN to its constructor argument."""
-
-    def __init__(self, fqdn, **kw):
-        super(FQDNEnvironmentMixin, self).__init__(**kw)
-        self.COMPUTED_KEYS += ['fqdn']
-        self.__fqdn = fqdn
-
-    def get_fqdn(self):
-        """Return the fully-qualified domain name for this host.
-
-        Return None if it is unavailable or unwanted."""
-
-        return self.__fqdn
-
-
-class ConfigFQDNEnvironmentMixin(
-        ConfigEnvironmentMixin,
-        FQDNEnvironmentMixin,
-        ):
-    """Read the FQDN from the config."""
-
-    def __init__(self, config, **kw):
-        fqdn = config.get('fqdn')
-        super(ConfigFQDNEnvironmentMixin, self).__init__(
-            config=config,
-            fqdn=fqdn,
-            **kw
-            )
-
-
-class ComputeFQDNEnvironmentMixin(FQDNEnvironmentMixin):
-    """Get the FQDN by calling socket.getfqdn()."""
-
-    def __init__(self, **kw):
-        super(ComputeFQDNEnvironmentMixin, self).__init__(
-            fqdn=socket.getfqdn(),
-            **kw
-            )
-
-
-class PusherDomainEnvironmentMixin(ConfigEnvironmentMixin):
-    """Deduce pusher_email from pusher by appending an emaildomain."""
-
-    def __init__(self, **kw):
-        super(PusherDomainEnvironmentMixin, self).__init__(**kw)
-        self.__emaildomain = self.config.get('emaildomain')
-
-    def get_pusher_email(self):
-        if self.__emaildomain:
-            # Derive the pusher's full email address in the default way:
-            return '%s@%s' % (self.get_pusher(), self.__emaildomain)
-        else:
-            return super(PusherDomainEnvironmentMixin, self).get_pusher_email()
-
-
-class StaticRecipientsEnvironmentMixin(Environment):
-    """Set recipients statically based on constructor parameters."""
-
-    def __init__(
-            self,
-            refchange_recipients, announce_recipients, revision_recipients, scancommitforcc,
-            **kw
-            ):
-        super(StaticRecipientsEnvironmentMixin, self).__init__(**kw)
-
-        # The recipients for various types of notification emails, as
-        # RFC 2822 email addresses separated by commas (or the empty
-        # string if no recipients are configured).  Although there is
-        # a mechanism to choose the recipient lists based on on the
-        # actual *contents* of the change being reported, we only
-        # choose based on the *type* of the change.  Therefore we can
-        # compute them once and for all:
-        self.__refchange_recipients = refchange_recipients
-        self.__announce_recipients = announce_recipients
-        self.__revision_recipients = revision_recipients
-
-    def check(self):
-        if not (self.get_refchange_recipients(None) or
-                self.get_announce_recipients(None) or
-                self.get_revision_recipients(None) or
-                self.get_scancommitforcc()):
-            raise ConfigurationException('No email recipients configured!')
-        super(StaticRecipientsEnvironmentMixin, self).check()
-
-    def get_refchange_recipients(self, refchange):
-        if self.__refchange_recipients is None:
-            return super(StaticRecipientsEnvironmentMixin,
-                         self).get_refchange_recipients(refchange)
-        return self.__refchange_recipients
-
-    def get_announce_recipients(self, annotated_tag_change):
-        if self.__announce_recipients is None:
-            return super(StaticRecipientsEnvironmentMixin,
-                         self).get_refchange_recipients(annotated_tag_change)
-        return self.__announce_recipients
-
-    def get_revision_recipients(self, revision):
-        if self.__revision_recipients is None:
-            return super(StaticRecipientsEnvironmentMixin,
-                         self).get_refchange_recipients(revision)
-        return self.__revision_recipients
-
-
-class CLIRecipientsEnvironmentMixin(Environment):
-    """Mixin storing recipients information coming from the
-    command-line."""
-
-    def __init__(self, cli_recipients=None, **kw):
-        super(CLIRecipientsEnvironmentMixin, self).__init__(**kw)
-        self.__cli_recipients = cli_recipients
-
-    def get_refchange_recipients(self, refchange):
-        if self.__cli_recipients is None:
-            return super(CLIRecipientsEnvironmentMixin,
-                         self).get_refchange_recipients(refchange)
-        return self.__cli_recipients
-
-    def get_announce_recipients(self, annotated_tag_change):
-        if self.__cli_recipients is None:
-            return super(CLIRecipientsEnvironmentMixin,
-                         self).get_announce_recipients(annotated_tag_change)
-        return self.__cli_recipients
-
-    def get_revision_recipients(self, revision):
-        if self.__cli_recipients is None:
-            return super(CLIRecipientsEnvironmentMixin,
-                         self).get_revision_recipients(revision)
-        return self.__cli_recipients
-
-
-class ConfigRecipientsEnvironmentMixin(
-        ConfigEnvironmentMixin,
-        StaticRecipientsEnvironmentMixin
-        ):
-    """Determine recipients statically based on config."""
-
-    def __init__(self, config, **kw):
-        super(ConfigRecipientsEnvironmentMixin, self).__init__(
-            config=config,
-            refchange_recipients=self._get_recipients(
-                config, 'refchangelist', 'mailinglist',
-                ),
-            announce_recipients=self._get_recipients(
-                config, 'announcelist', 'refchangelist', 'mailinglist',
-                ),
-            revision_recipients=self._get_recipients(
-                config, 'commitlist', 'mailinglist',
-                ),
-            scancommitforcc=config.get('scancommitforcc'),
-            **kw
-            )
-
-    def _get_recipients(self, config, *names):
-        """Return the recipients for a particular type of message.
-
-        Return the list of email addresses to which a particular type
-        of notification email should be sent, by looking at the config
-        value for "multimailhook.$name" for each of names.  Use the
-        value from the first name that is configured.  The return
-        value is a (possibly empty) string containing RFC 2822 email
-        addresses separated by commas.  If no configuration could be
-        found, raise a ConfigurationException."""
-
-        for name in names:
-            lines = config.get_all(name)
-            if lines is not None:
-                lines = [line.strip() for line in lines]
-                # Single "none" is a special value equivalen to empty string.
-                if lines == ['none']:
-                    lines = ['']
-                return ', '.join(lines)
-        else:
-            return ''
-
-
-class StaticRefFilterEnvironmentMixin(Environment):
-    """Set branch filter statically based on constructor parameters."""
-
-    def __init__(self, ref_filter_incl_regex, ref_filter_excl_regex,
-                 ref_filter_do_send_regex, ref_filter_dont_send_regex,
-                 **kw):
-        super(StaticRefFilterEnvironmentMixin, self).__init__(**kw)
-
-        if ref_filter_incl_regex and ref_filter_excl_regex:
-            raise ConfigurationException(
-                "Cannot specify both a ref inclusion and exclusion regex.")
-        self.__is_inclusion_filter = bool(ref_filter_incl_regex)
-        default_exclude = self.get_default_ref_ignore_regex()
-        if ref_filter_incl_regex:
-            ref_filter_regex = ref_filter_incl_regex
-        elif ref_filter_excl_regex:
-            ref_filter_regex = ref_filter_excl_regex + '|' + default_exclude
-        else:
-            ref_filter_regex = default_exclude
-        try:
-            self.__compiled_regex = re.compile(ref_filter_regex)
-        except Exception:
-            raise ConfigurationException(
-                'Invalid Ref Filter Regex "%s": %s' % (ref_filter_regex, sys.exc_info()[1]))
-
-        if ref_filter_do_send_regex and ref_filter_dont_send_regex:
-            raise ConfigurationException(
-                "Cannot specify both a ref doSend and dontSend regex.")
-        self.__is_do_send_filter = bool(ref_filter_do_send_regex)
-        if ref_filter_do_send_regex:
-            ref_filter_send_regex = ref_filter_do_send_regex
-        elif ref_filter_dont_send_regex:
-            ref_filter_send_regex = ref_filter_dont_send_regex
-        else:
-            ref_filter_send_regex = '.*'
-            self.__is_do_send_filter = True
-        try:
-            self.__send_compiled_regex = re.compile(ref_filter_send_regex)
-        except Exception:
-            raise ConfigurationException(
-                'Invalid Ref Filter Regex "%s": %s' %
-                (ref_filter_send_regex, sys.exc_info()[1]))
-
-    def get_ref_filter_regex(self, send_filter=False):
-        if send_filter:
-            return self.__send_compiled_regex, self.__is_do_send_filter
-        else:
-            return self.__compiled_regex, self.__is_inclusion_filter
-
-
-class ConfigRefFilterEnvironmentMixin(
-        ConfigEnvironmentMixin,
-        StaticRefFilterEnvironmentMixin
-        ):
-    """Determine branch filtering statically based on config."""
-
-    def _get_regex(self, config, key):
-        """Get a list of whitespace-separated regex. The refFilter* config
-        variables are multivalued (hence the use of get_all), and we
-        allow each entry to be a whitespace-separated list (hence the
-        split on each line). The whole thing is glued into a single regex."""
-        values = config.get_all(key)
-        if values is None:
-            return values
-        items = []
-        for line in values:
-            for i in line.split():
-                items.append(i)
-        if items == []:
-            return None
-        return '|'.join(items)
-
-    def __init__(self, config, **kw):
-        super(ConfigRefFilterEnvironmentMixin, self).__init__(
-            config=config,
-            ref_filter_incl_regex=self._get_regex(config, 'refFilterInclusionRegex'),
-            ref_filter_excl_regex=self._get_regex(config, 'refFilterExclusionRegex'),
-            ref_filter_do_send_regex=self._get_regex(config, 'refFilterDoSendRegex'),
-            ref_filter_dont_send_regex=self._get_regex(config, 'refFilterDontSendRegex'),
-            **kw
-            )
-
-
-class ProjectdescEnvironmentMixin(Environment):
-    """Make a "projectdesc" value available for templates.
-
-    By default, it is set to the first line of $GIT_DIR/description
-    (if that file is present and appears to be set meaningfully)."""
-
-    def __init__(self, **kw):
-        super(ProjectdescEnvironmentMixin, self).__init__(**kw)
-        self.COMPUTED_KEYS += ['projectdesc']
-
-    def get_projectdesc(self):
-        """Return a one-line descripition of the project."""
-
-        git_dir = get_git_dir()
-        try:
-            projectdesc = open(os.path.join(git_dir, 'description')).readline().strip()
-            if projectdesc and not projectdesc.startswith('Unnamed repository'):
-                return projectdesc
-        except IOError:
-            pass
-
-        return 'UNNAMED PROJECT'
-
-
-class GenericEnvironmentMixin(Environment):
-    def get_pusher(self):
-        return self.osenv.get('USER', self.osenv.get('USERNAME', 'unknown user'))
-
-
-class GitoliteEnvironmentHighPrecMixin(Environment):
-    def get_pusher(self):
-        return self.osenv.get('GL_USER', 'unknown user')
-
-
-class GitoliteEnvironmentLowPrecMixin(
-        ConfigEnvironmentMixin,
-        Environment):
-
-    def get_repo_shortname(self):
-        # The gitolite environment variable $GL_REPO is a pretty good
-        # repo_shortname (though it's probably not as good as a value
-        # the user might have explicitly put in his config).
-        return (
-            self.osenv.get('GL_REPO', None) or
-            super(GitoliteEnvironmentLowPrecMixin, self).get_repo_shortname()
-            )
-
-    @staticmethod
-    def _compile_regex(re_template):
-        return (
-            re.compile(re_template % x)
-            for x in (
-                r'BEGIN\s+USER\s+EMAILS',
-                r'([^\s]+)\s+(.*)',
-                r'END\s+USER\s+EMAILS',
-                ))
-
-    def get_fromaddr(self, change=None):
-        GL_USER = self.osenv.get('GL_USER')
-        if GL_USER is not None:
-            # Find the path to gitolite.conf.  Note that gitolite v3
-            # did away with the GL_ADMINDIR and GL_CONF environment
-            # variables (they are now hard-coded).
-            GL_ADMINDIR = self.osenv.get(
-                'GL_ADMINDIR',
-                os.path.expanduser(os.path.join('~', '.gitolite')))
-            GL_CONF = self.osenv.get(
-                'GL_CONF',
-                os.path.join(GL_ADMINDIR, 'conf', 'gitolite.conf'))
-
-            mailaddress_map = self.config.get('MailaddressMap')
-            # If relative, consider relative to GL_CONF:
-            if mailaddress_map:
-                mailaddress_map = os.path.join(os.path.dirname(GL_CONF),
-                                               mailaddress_map)
-                if os.path.isfile(mailaddress_map):
-                    f = open(mailaddress_map, 'rU')
-                    try:
-                        # Leading '#' is optional
-                        re_begin, re_user, re_end = self._compile_regex(
-                            r'^(?:\s*#)?\s*%s\s*$')
-                        for l in f:
-                            l = l.rstrip('\n')
-                            if re_begin.match(l) or re_end.match(l):
-                                continue  # Ignore these lines
-                            m = re_user.match(l)
-                            if m:
-                                if m.group(1) == GL_USER:
-                                    return m.group(2)
-                                else:
-                                    continue  # Not this user, but not an error
-                            raise ConfigurationException(
-                                "Syntax error in mail address map.\n"
-                                "Check file {}.\n"
-                                "Line: {}".format(mailaddress_map, l))
-
-                    finally:
-                        f.close()
-
-            if os.path.isfile(GL_CONF):
-                f = open(GL_CONF, 'rU')
-                try:
-                    in_user_emails_section = False
-                    re_begin, re_user, re_end = self._compile_regex(
-                        r'^\s*#\s*%s\s*$')
-                    for l in f:
-                        l = l.rstrip('\n')
-                        if not in_user_emails_section:
-                            if re_begin.match(l):
-                                in_user_emails_section = True
-                            continue
-                        if re_end.match(l):
-                            break
-                        m = re_user.match(l)
-                        if m and m.group(1) == GL_USER:
-                            return m.group(2)
-                finally:
-                    f.close()
-        return super(GitoliteEnvironmentLowPrecMixin, self).get_fromaddr(change)
-
-
-class IncrementalDateTime(object):
-    """Simple wrapper to give incremental date/times.
-
-    Each call will result in a date/time a second later than the
-    previous call.  This can be used to falsify email headers, to
-    increase the likelihood that email clients sort the emails
-    correctly."""
-
-    def __init__(self):
-        self.time = time.time()
-        self.next = self.__next__  # Python 2 backward compatibility
-
-    def __next__(self):
-        formatted = formatdate(self.time, True)
-        self.time += 1
-        return formatted
-
-
-class StashEnvironmentHighPrecMixin(Environment):
-    def __init__(self, user=None, repo=None, **kw):
-        super(StashEnvironmentHighPrecMixin,
-              self).__init__(user=user, repo=repo, **kw)
-        self.__user = user
-        self.__repo = repo
-
-    def get_pusher(self):
-        return re.match(r'(.*?)\s*<', self.__user).group(1)
-
-    def get_pusher_email(self):
-        return self.__user
-
-
-class StashEnvironmentLowPrecMixin(Environment):
-    def __init__(self, user=None, repo=None, **kw):
-        super(StashEnvironmentLowPrecMixin, self).__init__(**kw)
-        self.__repo = repo
-        self.__user = user
-
-    def get_repo_shortname(self):
-        return self.__repo
-
-    def get_fromaddr(self, change=None):
-        return self.__user
-
-
-class GerritEnvironmentHighPrecMixin(Environment):
-    def __init__(self, project=None, submitter=None, update_method=None, **kw):
-        super(GerritEnvironmentHighPrecMixin,
-              self).__init__(submitter=submitter, project=project, **kw)
-        self.__project = project
-        self.__submitter = submitter
-        self.__update_method = update_method
-        "Make an 'update_method' value available for templates."
-        self.COMPUTED_KEYS += ['update_method']
-
-    def get_pusher(self):
-        if self.__submitter:
-            if self.__submitter.find('<') != -1:
-                # Submitter has a configured email, we transformed
-                # __submitter into an RFC 2822 string already.
-                return re.match(r'(.*?)\s*<', self.__submitter).group(1)
-            else:
-                # Submitter has no configured email, it's just his name.
-                return self.__submitter
-        else:
-            # If we arrive here, this means someone pushed "Submit" from
-            # the gerrit web UI for the CR (or used one of the programmatic
-            # APIs to do the same, such as gerrit review) and the
-            # merge/push was done by the Gerrit user.  It was technically
-            # triggered by someone else, but sadly we have no way of
-            # determining who that someone else is at this point.
-            return 'Gerrit'  # 'unknown user'?
-
-    def get_pusher_email(self):
-        if self.__submitter:
-            return self.__submitter
-        else:
-            return super(GerritEnvironmentHighPrecMixin, self).get_pusher_email()
-
-    def get_default_ref_ignore_regex(self):
-        default = super(GerritEnvironmentHighPrecMixin, self).get_default_ref_ignore_regex()
-        return default + '|^refs/changes/|^refs/cache-automerge/|^refs/meta/'
-
-    def get_revision_recipients(self, revision):
-        # Merge commits created by Gerrit when users hit "Submit this patchset"
-        # in the Web UI (or do equivalently with REST APIs or the gerrit review
-        # command) are not something users want to see an individual email for.
-        # Filter them out.
-        committer = read_git_output(['log', '--no-walk', '--format=%cN',
-                                     revision.rev.sha1])
-        if committer == 'Gerrit Code Review':
-            return []
-        else:
-            return super(GerritEnvironmentHighPrecMixin, self).get_revision_recipients(revision)
-
-    def get_update_method(self):
-        return self.__update_method
-
-
-class GerritEnvironmentLowPrecMixin(Environment):
-    def __init__(self, project=None, submitter=None, **kw):
-        super(GerritEnvironmentLowPrecMixin, self).__init__(**kw)
-        self.__project = project
-        self.__submitter = submitter
-
-    def get_repo_shortname(self):
-        return self.__project
-
-    def get_fromaddr(self, change=None):
-        if self.__submitter and self.__submitter.find('<') != -1:
-            return self.__submitter
-        else:
-            return super(GerritEnvironmentLowPrecMixin, self).get_fromaddr(change)
-
-
-class Push(object):
-    """Represent an entire push (i.e., a group of ReferenceChanges).
-
-    It is easy to figure out what commits were added to a *branch* by
-    a Reference change:
-
-        git rev-list change.old..change.new
-
-    or removed from a *branch*:
-
-        git rev-list change.new..change.old
-
-    But it is not quite so trivial to determine which entirely new
-    commits were added to the *repository* by a push and which old
-    commits were discarded by a push.  A big part of the job of this
-    class is to figure out these things, and to make sure that new
-    commits are only detailed once even if they were added to multiple
-    references.
-
-    The first step is to determine the "other" references--those
-    unaffected by the current push.  They are computed by listing all
-    references then removing any affected by this push.  The results
-    are stored in Push._other_ref_sha1s.
-
-    The commits contained in the repository before this push were
-
-        git rev-list other1 other2 other3 ... change1.old change2.old ...
-
-    Where "changeN.old" is the old value of one of the references
-    affected by this push.
-
-    The commits contained in the repository after this push are
-
-        git rev-list other1 other2 other3 ... change1.new change2.new ...
-
-    The commits added by this push are the difference between these
-    two sets, which can be written
-
-        git rev-list \
-            ^other1 ^other2 ... \
-            ^change1.old ^change2.old ... \
-            change1.new change2.new ...
-
-    The commits removed by this push can be computed by
-
-        git rev-list \
-            ^other1 ^other2 ... \
-            ^change1.new ^change2.new ... \
-            change1.old change2.old ...
-
-    The last point is that it is possible that other pushes are
-    occurring simultaneously to this one, so reference values can
-    change at any time.  It is impossible to eliminate all race
-    conditions, but we reduce the window of time during which problems
-    can occur by translating reference names to SHA1s as soon as
-    possible and working with SHA1s thereafter (because SHA1s are
-    immutable)."""
-
-    # A map {(changeclass, changetype): integer} specifying the order
-    # that reference changes will be processed if multiple reference
-    # changes are included in a single push.  The order is significant
-    # mostly because new commit notifications are threaded together
-    # with the first reference change that includes the commit.  The
-    # following order thus causes commits to be grouped with branch
-    # changes (as opposed to tag changes) if possible.
-    SORT_ORDER = dict(
-        (value, i) for (i, value) in enumerate([
-            (BranchChange, 'update'),
-            (BranchChange, 'create'),
-            (AnnotatedTagChange, 'update'),
-            (AnnotatedTagChange, 'create'),
-            (NonAnnotatedTagChange, 'update'),
-            (NonAnnotatedTagChange, 'create'),
-            (BranchChange, 'delete'),
-            (AnnotatedTagChange, 'delete'),
-            (NonAnnotatedTagChange, 'delete'),
-            (OtherReferenceChange, 'update'),
-            (OtherReferenceChange, 'create'),
-            (OtherReferenceChange, 'delete'),
-            ])
-        )
-
-    def __init__(self, environment, changes, ignore_other_refs=False):
-        self.changes = sorted(changes, key=self._sort_key)
-        self.__other_ref_sha1s = None
-        self.__cached_commits_spec = {}
-        self.environment = environment
-
-        if ignore_other_refs:
-            self.__other_ref_sha1s = set()
-
-    @classmethod
-    def _sort_key(klass, change):
-        return (klass.SORT_ORDER[change.__class__, change.change_type], change.refname,)
-
-    @property
-    def _other_ref_sha1s(self):
-        """The GitObjects referred to by references unaffected by this push.
-        """
-        if self.__other_ref_sha1s is None:
-            # The refnames being changed by this push:
-            updated_refs = set(
-                change.refname
-                for change in self.changes
-                )
-
-            # The SHA-1s of commits referred to by all references in this
-            # repository *except* updated_refs:
-            sha1s = set()
-            fmt = (
-                '%(objectname) %(objecttype) %(refname)\n'
-                '%(*objectname) %(*objecttype) %(refname)'
-                )
-            ref_filter_regex, is_inclusion_filter = \
-                self.environment.get_ref_filter_regex()
-            for line in read_git_lines(
-                    ['for-each-ref', '--format=%s' % (fmt,)]):
-                (sha1, type, name) = line.split(' ', 2)
-                if (sha1 and type == 'commit' and
-                        name not in updated_refs and
-                        include_ref(name, ref_filter_regex, is_inclusion_filter)):
-                    sha1s.add(sha1)
-
-            self.__other_ref_sha1s = sha1s
-
-        return self.__other_ref_sha1s
-
-    def _get_commits_spec_incl(self, new_or_old, reference_change=None):
-        """Get new or old SHA-1 from one or each of the changed refs.
-
-        Return a list of SHA-1 commit identifier strings suitable as
-        arguments to 'git rev-list' (or 'git log' or ...).  The
-        returned identifiers are either the old or new values from one
-        or all of the changed references, depending on the values of
-        new_or_old and reference_change.
-
-        new_or_old is either the string 'new' or the string 'old'.  If
-        'new', the returned SHA-1 identifiers are the new values from
-        each changed reference.  If 'old', the SHA-1 identifiers are
-        the old values from each changed reference.
-
-        If reference_change is specified and not None, only the new or
-        old reference from the specified reference is included in the
-        return value.
-
-        This function returns None if there are no matching revisions
-        (e.g., because a branch was deleted and new_or_old is 'new').
-        """
-
-        if not reference_change:
-            incl_spec = sorted(
-                getattr(change, new_or_old).sha1
-                for change in self.changes
-                if getattr(change, new_or_old)
-                )
-            if not incl_spec:
-                incl_spec = None
-        elif not getattr(reference_change, new_or_old).commit_sha1:
-            incl_spec = None
-        else:
-            incl_spec = [getattr(reference_change, new_or_old).commit_sha1]
-        return incl_spec
-
-    def _get_commits_spec_excl(self, new_or_old):
-        """Get exclusion revisions for determining new or discarded commits.
-
-        Return a list of strings suitable as arguments to 'git
-        rev-list' (or 'git log' or ...) that will exclude all
-        commits that, depending on the value of new_or_old, were
-        either previously in the repository (useful for determining
-        which commits are new to the repository) or currently in the
-        repository (useful for determining which commits were
-        discarded from the repository).
-
-        new_or_old is either the string 'new' or the string 'old'.  If
-        'new', the commits to be excluded are those that were in the
-        repository before the push.  If 'old', the commits to be
-        excluded are those that are currently in the repository.  """
-
-        old_or_new = {'old': 'new', 'new': 'old'}[new_or_old]
-        excl_revs = self._other_ref_sha1s.union(
-            getattr(change, old_or_new).sha1
-            for change in self.changes
-            if getattr(change, old_or_new).type in ['commit', 'tag']
-            )
-        return ['^' + sha1 for sha1 in sorted(excl_revs)]
-
-    def get_commits_spec(self, new_or_old, reference_change=None):
-        """Get rev-list arguments for added or discarded commits.
-
-        Return a list of strings suitable as arguments to 'git
-        rev-list' (or 'git log' or ...) that select those commits
-        that, depending on the value of new_or_old, are either new to
-        the repository or were discarded from the repository.
-
-        new_or_old is either the string 'new' or the string 'old'.  If
-        'new', the returned list is used to select commits that are
-        new to the repository.  If 'old', the returned value is used
-        to select the commits that have been discarded from the
-        repository.
-
-        If reference_change is specified and not None, the new or
-        discarded commits are limited to those that are reachable from
-        the new or old value of the specified reference.
-
-        This function returns None if there are no added (or discarded)
-        revisions.
-        """
-        key = (new_or_old, reference_change)
-        if key not in self.__cached_commits_spec:
-            ret = self._get_commits_spec_incl(new_or_old, reference_change)
-            if ret is not None:
-                ret.extend(self._get_commits_spec_excl(new_or_old))
-            self.__cached_commits_spec[key] = ret
-        return self.__cached_commits_spec[key]
-
-    def get_new_commits(self, reference_change=None):
-        """Return a list of commits added by this push.
-
-        Return a list of the object names of commits that were added
-        by the part of this push represented by reference_change.  If
-        reference_change is None, then return a list of *all* commits
-        added by this push."""
-
-        spec = self.get_commits_spec('new', reference_change)
-        return git_rev_list(spec)
-
-    def get_discarded_commits(self, reference_change):
-        """Return a list of commits discarded by this push.
-
-        Return a list of the object names of commits that were
-        entirely discarded from the repository by the part of this
-        push represented by reference_change."""
-
-        spec = self.get_commits_spec('old', reference_change)
-        return git_rev_list(spec)
-
-    def send_emails(self, mailer, body_filter=None):
-        """Use send all of the notification emails needed for this push.
-
-        Use send all of the notification emails (including reference
-        change emails and commit emails) needed for this push.  Send
-        the emails using mailer.  If body_filter is not None, then use
-        it to filter the lines that are intended for the email
-        body."""
-
-        # The sha1s of commits that were introduced by this push.
-        # They will be removed from this set as they are processed, to
-        # guarantee that one (and only one) email is generated for
-        # each new commit.
-        unhandled_sha1s = set(self.get_new_commits())
-        send_date = IncrementalDateTime()
-        for change in self.changes:
-            sha1s = []
-            for sha1 in reversed(list(self.get_new_commits(change))):
-                if sha1 in unhandled_sha1s:
-                    sha1s.append(sha1)
-                    unhandled_sha1s.remove(sha1)
-
-            # Check if we've got anyone to send to
-            if not change.recipients:
-                change.environment.log_warning(
-                    '*** no recipients configured so no email will be sent\n'
-                    '*** for %r update %s->%s'
-                    % (change.refname, change.old.sha1, change.new.sha1,)
-                    )
-            else:
-                if not change.environment.quiet:
-                    change.environment.log_msg(
-                        'Sending notification emails to: %s' % (change.recipients,))
-                extra_values = {'send_date': next(send_date)}
-
-                rev = change.send_single_combined_email(sha1s)
-                if rev:
-                    mailer.send(
-                        change.generate_combined_email(self, rev, body_filter, extra_values),
-                        rev.recipients,
-                        )
-                    # This change is now fully handled; no need to handle
-                    # individual revisions any further.
-                    continue
-                else:
-                    mailer.send(
-                        change.generate_email(self, body_filter, extra_values),
-                        change.recipients,
-                        )
-
-            max_emails = change.environment.maxcommitemails
-            if max_emails and len(sha1s) > max_emails:
-                change.environment.log_warning(
-                    '*** Too many new commits (%d), not sending commit emails.\n' % len(sha1s) +
-                    '*** Try setting multimailhook.maxCommitEmails to a greater value\n' +
-                    '*** Currently, multimailhook.maxCommitEmails=%d' % max_emails
-                    )
-                return
-
-            for (num, sha1) in enumerate(sha1s):
-                rev = Revision(change, GitObject(sha1), num=num + 1, tot=len(sha1s))
-                if len(rev.parents) > 1 and change.environment.excludemergerevisions:
-                    # skipping a merge commit
-                    continue
-                if not rev.recipients and rev.cc_recipients:
-                    change.environment.log_msg('*** Replacing Cc: with To:')
-                    rev.recipients = rev.cc_recipients
-                    rev.cc_recipients = None
-                if rev.recipients:
-                    extra_values = {'send_date': next(send_date)}
-                    mailer.send(
-                        rev.generate_email(self, body_filter, extra_values),
-                        rev.recipients,
-                        )
-
-        # Consistency check:
-        if unhandled_sha1s:
-            change.environment.log_error(
-                'ERROR: No emails were sent for the following new commits:\n'
-                '    %s'
-                % ('\n    '.join(sorted(unhandled_sha1s)),)
-                )
-
-
-def include_ref(refname, ref_filter_regex, is_inclusion_filter):
-    does_match = bool(ref_filter_regex.search(refname))
-    if is_inclusion_filter:
-        return does_match
-    else:  # exclusion filter -- we include the ref if the regex doesn't match
-        return not does_match
-
-
-def run_as_post_receive_hook(environment, mailer):
-    environment.check()
-    send_filter_regex, send_is_inclusion_filter = environment.get_ref_filter_regex(True)
-    ref_filter_regex, is_inclusion_filter = environment.get_ref_filter_regex(False)
-    changes = []
-    while True:
-        line = read_line(sys.stdin)
-        if line == '':
-            break
-        (oldrev, newrev, refname) = line.strip().split(' ', 2)
-        environment.get_logger().debug(
-            "run_as_post_receive_hook: oldrev=%s, newrev=%s, refname=%s" %
-            (oldrev, newrev, refname))
-
-        if not include_ref(refname, ref_filter_regex, is_inclusion_filter):
-            continue
-        if not include_ref(refname, send_filter_regex, send_is_inclusion_filter):
-            continue
-        changes.append(
-            ReferenceChange.create(environment, oldrev, newrev, refname)
-            )
-    if not changes:
-        mailer.close()
-        return
-    push = Push(environment, changes)
-    try:
-        push.send_emails(mailer, body_filter=environment.filter_body)
-    finally:
-        mailer.close()
-
-
-def run_as_update_hook(environment, mailer, refname, oldrev, newrev, force_send=False):
-    environment.check()
-    send_filter_regex, send_is_inclusion_filter = environment.get_ref_filter_regex(True)
-    ref_filter_regex, is_inclusion_filter = environment.get_ref_filter_regex(False)
-    if not include_ref(refname, ref_filter_regex, is_inclusion_filter):
-        return
-    if not include_ref(refname, send_filter_regex, send_is_inclusion_filter):
-        return
-    changes = [
-        ReferenceChange.create(
-            environment,
-            read_git_output(['rev-parse', '--verify', oldrev]),
-            read_git_output(['rev-parse', '--verify', newrev]),
-            refname,
-            ),
-        ]
-    if not changes:
-        mailer.close()
-        return
-    push = Push(environment, changes, force_send)
-    try:
-        push.send_emails(mailer, body_filter=environment.filter_body)
-    finally:
-        mailer.close()
-
-
-def check_ref_filter(environment):
-    send_filter_regex, send_is_inclusion = environment.get_ref_filter_regex(True)
-    ref_filter_regex, ref_is_inclusion = environment.get_ref_filter_regex(False)
-
-    def inc_exc_lusion(b):
-        if b:
-            return 'inclusion'
-        else:
-            return 'exclusion'
-
-    if send_filter_regex:
-        sys.stdout.write("DoSend/DontSend filter regex (" +
-                         (inc_exc_lusion(send_is_inclusion)) +
-                         '): ' + send_filter_regex.pattern +
-                         '\n')
-    if send_filter_regex:
-        sys.stdout.write("Include/Exclude filter regex (" +
-                         (inc_exc_lusion(ref_is_inclusion)) +
-                         '): ' + ref_filter_regex.pattern +
-                         '\n')
-    sys.stdout.write(os.linesep)
-
-    sys.stdout.write(
-        "Refs marked as EXCLUDE are excluded by either refFilterInclusionRegex\n"
-        "or refFilterExclusionRegex. No emails will be sent for commits included\n"
-        "in these refs.\n"
-        "Refs marked as DONT-SEND are excluded by either refFilterDoSendRegex or\n"
-        "refFilterDontSendRegex, but not by either refFilterInclusionRegex or\n"
-        "refFilterExclusionRegex. Emails will be sent for commits included in these\n"
-        "refs only when the commit reaches a ref which isn't excluded.\n"
-        "Refs marked as DO-SEND are not excluded by any filter. Emails will\n"
-        "be sent normally for commits included in these refs.\n")
-
-    sys.stdout.write(os.linesep)
-
-    for refname in read_git_lines(['for-each-ref', '--format', '%(refname)']):
-        sys.stdout.write(refname)
-        if not include_ref(refname, ref_filter_regex, ref_is_inclusion):
-            sys.stdout.write(' EXCLUDE')
-        elif not include_ref(refname, send_filter_regex, send_is_inclusion):
-            sys.stdout.write(' DONT-SEND')
-        else:
-            sys.stdout.write(' DO-SEND')
-
-        sys.stdout.write(os.linesep)
-
-
-def show_env(environment, out):
-    out.write('Environment values:\n')
-    for (k, v) in sorted(environment.get_values().items()):
-        if k:  # Don't show the {'' : ''} pair.
-            out.write('    %s : %r\n' % (k, v))
-    out.write('\n')
-    # Flush to avoid interleaving with further log output
-    out.flush()
-
-
-def check_setup(environment):
-    environment.check()
-    show_env(environment, sys.stdout)
-    sys.stdout.write("Now, checking that git-multimail's standard input "
-                     "is properly set ..." + os.linesep)
-    sys.stdout.write("Please type some text and then press Return" + os.linesep)
-    stdin = sys.stdin.readline()
-    sys.stdout.write("You have just entered:" + os.linesep)
-    sys.stdout.write(stdin)
-    sys.stdout.write("git-multimail seems properly set up." + os.linesep)
-
-
-def choose_mailer(config, environment):
-    mailer = config.get('mailer', default='sendmail')
-
-    if mailer == 'smtp':
-        smtpserver = config.get('smtpserver', default='localhost')
-        smtpservertimeout = float(config.get('smtpservertimeout', default=10.0))
-        smtpserverdebuglevel = int(config.get('smtpserverdebuglevel', default=0))
-        smtpencryption = config.get('smtpencryption', default='none')
-        smtpuser = config.get('smtpuser', default='')
-        smtppass = config.get('smtppass', default='')
-        smtpcacerts = config.get('smtpcacerts', default='')
-        mailer = SMTPMailer(
-            environment,
-            envelopesender=(environment.get_sender() or environment.get_fromaddr()),
-            smtpserver=smtpserver, smtpservertimeout=smtpservertimeout,
-            smtpserverdebuglevel=smtpserverdebuglevel,
-            smtpencryption=smtpencryption,
-            smtpuser=smtpuser,
-            smtppass=smtppass,
-            smtpcacerts=smtpcacerts
-            )
-    elif mailer == 'sendmail':
-        command = config.get('sendmailcommand')
-        if command:
-            command = shlex.split(command)
-        mailer = SendMailer(environment,
-                            command=command, envelopesender=environment.get_sender())
-    else:
-        environment.log_error(
-            'fatal: multimailhook.mailer is set to an incorrect value: "%s"\n' % mailer +
-            'please use one of "smtp" or "sendmail".'
-            )
-        sys.exit(1)
-    return mailer
-
-
-KNOWN_ENVIRONMENTS = {
-    'generic': {'highprec': GenericEnvironmentMixin},
-    'gitolite': {'highprec': GitoliteEnvironmentHighPrecMixin,
-                 'lowprec': GitoliteEnvironmentLowPrecMixin},
-    'stash': {'highprec': StashEnvironmentHighPrecMixin,
-              'lowprec': StashEnvironmentLowPrecMixin},
-    'gerrit': {'highprec': GerritEnvironmentHighPrecMixin,
-               'lowprec': GerritEnvironmentLowPrecMixin},
-    }
-
-
-def choose_environment(config, osenv=None, env=None, recipients=None,
-                       hook_info=None):
-    env_name = choose_environment_name(config, env, osenv)
-    environment_klass = build_environment_klass(env_name)
-    env = build_environment(environment_klass, env_name, config,
-                            osenv, recipients, hook_info)
-    return env
-
-
-def choose_environment_name(config, env, osenv):
-    if not osenv:
-        osenv = os.environ
-
-    if not env:
-        env = config.get('environment')
-
-    if not env:
-        if 'GL_USER' in osenv and 'GL_REPO' in osenv:
-            env = 'gitolite'
-        else:
-            env = 'generic'
-    return env
-
-
-COMMON_ENVIRONMENT_MIXINS = [
-    ConfigRecipientsEnvironmentMixin,
-    CLIRecipientsEnvironmentMixin,
-    ConfigRefFilterEnvironmentMixin,
-    ProjectdescEnvironmentMixin,
-    ConfigMaxlinesEnvironmentMixin,
-    ComputeFQDNEnvironmentMixin,
-    ConfigFilterLinesEnvironmentMixin,
-    PusherDomainEnvironmentMixin,
-    ConfigOptionsEnvironmentMixin,
-    ]
-
-
-def build_environment_klass(env_name):
-    if 'class' in KNOWN_ENVIRONMENTS[env_name]:
-        return KNOWN_ENVIRONMENTS[env_name]['class']
-
-    environment_mixins = []
-    known_env = KNOWN_ENVIRONMENTS[env_name]
-    if 'highprec' in known_env:
-        high_prec_mixin = known_env['highprec']
-        environment_mixins.append(high_prec_mixin)
-    environment_mixins = environment_mixins + COMMON_ENVIRONMENT_MIXINS
-    if 'lowprec' in known_env:
-        low_prec_mixin = known_env['lowprec']
-        environment_mixins.append(low_prec_mixin)
-    environment_mixins.append(Environment)
-    klass_name = env_name.capitalize() + 'Environment'
-    environment_klass = type(
-        klass_name,
-        tuple(environment_mixins),
-        {},
-        )
-    KNOWN_ENVIRONMENTS[env_name]['class'] = environment_klass
-    return environment_klass
-
-
-GerritEnvironment = build_environment_klass('gerrit')
-StashEnvironment = build_environment_klass('stash')
-GitoliteEnvironment = build_environment_klass('gitolite')
-GenericEnvironment = build_environment_klass('generic')
-
-
-def build_environment(environment_klass, env, config,
-                      osenv, recipients, hook_info):
-    environment_kw = {
-        'osenv': osenv,
-        'config': config,
-        }
-
-    if env == 'stash':
-        environment_kw['user'] = hook_info['stash_user']
-        environment_kw['repo'] = hook_info['stash_repo']
-    elif env == 'gerrit':
-        environment_kw['project'] = hook_info['project']
-        environment_kw['submitter'] = hook_info['submitter']
-        environment_kw['update_method'] = hook_info['update_method']
-
-    environment_kw['cli_recipients'] = recipients
-
-    return environment_klass(**environment_kw)
-
-
-def get_version():
-    oldcwd = os.getcwd()
-    try:
-        try:
-            os.chdir(os.path.dirname(os.path.realpath(__file__)))
-            git_version = read_git_output(['describe', '--tags', 'HEAD'])
-            if git_version == __version__:
-                return git_version
-            else:
-                return '%s (%s)' % (__version__, git_version)
-        except:
-            pass
-    finally:
-        os.chdir(oldcwd)
-    return __version__
-
-
-def compute_gerrit_options(options, args, required_gerrit_options,
-                           raw_refname):
-    if None in required_gerrit_options:
-        raise SystemExit("Error: Specify all of --oldrev, --newrev, --refname, "
-                         "and --project; or none of them.")
-
-    if options.environment not in (None, 'gerrit'):
-        raise SystemExit("Non-gerrit environments incompatible with --oldrev, "
-                         "--newrev, --refname, and --project")
-    options.environment = 'gerrit'
-
-    if args:
-        raise SystemExit("Error: Positional parameters not allowed with "
-                         "--oldrev, --newrev, and --refname.")
-
-    # Gerrit oddly omits 'refs/heads/' in the refname when calling
-    # ref-updated hook; put it back.
-    git_dir = get_git_dir()
-    if (not os.path.exists(os.path.join(git_dir, raw_refname)) and
-        os.path.exists(os.path.join(git_dir, 'refs', 'heads',
-                                    raw_refname))):
-        options.refname = 'refs/heads/' + options.refname
-
-    # New revisions can appear in a gerrit repository either due to someone
-    # pushing directly (in which case options.submitter will be set), or they
-    # can press "Submit this patchset" in the web UI for some CR (in which
-    # case options.submitter will not be set and gerrit will not have provided
-    # us the information about who pressed the button).
-    #
-    # Note for the nit-picky: I'm lumping in REST API calls and the ssh
-    # gerrit review command in with "Submit this patchset" button, since they
-    # have the same effect.
-    if options.submitter:
-        update_method = 'pushed'
-        # The submitter argument is almost an RFC 2822 email address; change it
-        # from 'User Name (email@domain)' to 'User Name <email@domain>' so it is
-        options.submitter = options.submitter.replace('(', '<').replace(')', '>')
-    else:
-        update_method = 'submitted'
-        # Gerrit knew who submitted this patchset, but threw that information
-        # away when it invoked this hook.  However, *IF* Gerrit created a
-        # merge to bring the patchset in (project 'Submit Type' is either
-        # "Always Merge", or is "Merge if Necessary" and happens to be
-        # necessary for this particular CR), then it will have the committer
-        # of that merge be 'Gerrit Code Review' and the author will be the
-        # person who requested the submission of the CR.  Since this is fairly
-        # likely for most gerrit installations (of a reasonable size), it's
-        # worth the extra effort to try to determine the actual submitter.
-        rev_info = read_git_lines(['log', '--no-walk', '--merges',
-                                   '--format=%cN%n%aN <%aE>', options.newrev])
-        if rev_info and rev_info[0] == 'Gerrit Code Review':
-            options.submitter = rev_info[1]
-
-    # We pass back refname, oldrev, newrev as args because then the
-    # gerrit ref-updated hook is much like the git update hook
-    return (options,
-            [options.refname, options.oldrev, options.newrev],
-            {'project': options.project, 'submitter': options.submitter,
-             'update_method': update_method})
-
-
-def check_hook_specific_args(options, args):
-    raw_refname = options.refname
-    # Convert each string option unicode for Python3.
-    if PYTHON3:
-        opts = ['environment', 'recipients', 'oldrev', 'newrev', 'refname',
-                'project', 'submitter', 'stash_user', 'stash_repo']
-        for opt in opts:
-            if not hasattr(options, opt):
-                continue
-            obj = getattr(options, opt)
-            if obj:
-                enc = obj.encode('utf-8', 'surrogateescape')
-                dec = enc.decode('utf-8', 'replace')
-                setattr(options, opt, dec)
-
-    # First check for stash arguments
-    if (options.stash_user is None) != (options.stash_repo is None):
-        raise SystemExit("Error: Specify both of --stash-user and "
-                         "--stash-repo or neither.")
-    if options.stash_user:
-        options.environment = 'stash'
-        return options, args, {'stash_user': options.stash_user,
-                               'stash_repo': options.stash_repo}
-
-    # Finally, check for gerrit specific arguments
-    required_gerrit_options = (options.oldrev, options.newrev, options.refname,
-                               options.project)
-    if required_gerrit_options != (None,) * 4:
-        return compute_gerrit_options(options, args, required_gerrit_options,
-                                      raw_refname)
-
-    # No special options in use, just return what we started with
-    return options, args, {}
-
-
-class Logger(object):
-    def parse_verbose(self, verbose):
-        if verbose > 0:
-            return logging.DEBUG
-        else:
-            return logging.INFO
-
-    def create_log_file(self, environment, name, path, verbosity):
-        log_file = logging.getLogger(name)
-        file_handler = logging.FileHandler(path)
-        log_fmt = logging.Formatter("%(asctime)s [%(levelname)-5.5s]  %(message)s")
-        file_handler.setFormatter(log_fmt)
-        log_file.addHandler(file_handler)
-        log_file.setLevel(verbosity)
-        return log_file
-
-    def __init__(self, environment):
-        self.environment = environment
-        self.loggers = []
-        stderr_log = logging.getLogger('git_multimail.stderr')
-
-        class EncodedStderr(object):
-            def write(self, x):
-                write_str(sys.stderr, x)
-
-            def flush(self):
-                sys.stderr.flush()
-
-        stderr_handler = logging.StreamHandler(EncodedStderr())
-        stderr_log.addHandler(stderr_handler)
-        stderr_log.setLevel(self.parse_verbose(environment.verbose))
-        self.loggers.append(stderr_log)
-
-        if environment.debug_log_file is not None:
-            debug_log_file = self.create_log_file(
-                environment, 'git_multimail.debug', environment.debug_log_file, logging.DEBUG)
-            self.loggers.append(debug_log_file)
-
-        if environment.log_file is not None:
-            log_file = self.create_log_file(
-                environment, 'git_multimail.file', environment.log_file, logging.INFO)
-            self.loggers.append(log_file)
-
-        if environment.error_log_file is not None:
-            error_log_file = self.create_log_file(
-                environment, 'git_multimail.error', environment.error_log_file, logging.ERROR)
-            self.loggers.append(error_log_file)
-
-    def info(self, msg, *args, **kwargs):
-        for l in self.loggers:
-            l.info(msg, *args, **kwargs)
-
-    def debug(self, msg, *args, **kwargs):
-        for l in self.loggers:
-            l.debug(msg, *args, **kwargs)
-
-    def warning(self, msg, *args, **kwargs):
-        for l in self.loggers:
-            l.warning(msg, *args, **kwargs)
-
-    def error(self, msg, *args, **kwargs):
-        for l in self.loggers:
-            l.error(msg, *args, **kwargs)
-
-
-def main(args):
-    parser = optparse.OptionParser(
-        description=__doc__,
-        usage='%prog [OPTIONS]\n   or: %prog [OPTIONS] REFNAME OLDREV NEWREV',
-        )
-
-    parser.add_option(
-        '--environment', '--env', action='store', type='choice',
-        choices=list(KNOWN_ENVIRONMENTS.keys()), default=None,
-        help=(
-            'Choose type of environment is in use.  Default is taken from '
-            'multimailhook.environment if set; otherwise "generic".'
-            ),
-        )
-    parser.add_option(
-        '--stdout', action='store_true', default=False,
-        help='Output emails to stdout rather than sending them.',
-        )
-    parser.add_option(
-        '--recipients', action='store', default=None,
-        help='Set list of email recipients for all types of emails.',
-        )
-    parser.add_option(
-        '--show-env', action='store_true', default=False,
-        help=(
-            'Write to stderr the values determined for the environment '
-            '(intended for debugging purposes), then proceed normally.'
-            ),
-        )
-    parser.add_option(
-        '--force-send', action='store_true', default=False,
-        help=(
-            'Force sending refchange email when using as an update hook. '
-            'This is useful to work around the unreliable new commits '
-            'detection in this mode.'
-            ),
-        )
-    parser.add_option(
-        '-c', metavar="<name>=<value>", action='append',
-        help=(
-            'Pass a configuration parameter through to git.  The value given '
-            'will override values from configuration files.  See the -c option '
-            'of git(1) for more details.  (Only works with git >= 1.7.3)'
-            ),
-        )
-    parser.add_option(
-        '--version', '-v', action='store_true', default=False,
-        help=(
-            "Display git-multimail's version"
-            ),
-        )
-
-    parser.add_option(
-        '--python-version', action='store_true', default=False,
-        help=(
-            "Display the version of Python used by git-multimail"
-            ),
-        )
-
-    parser.add_option(
-        '--check-ref-filter', action='store_true', default=False,
-        help=(
-            'List refs and show information on how git-multimail '
-            'will process them.'
-            )
-        )
-
-    # The following options permit this script to be run as a gerrit
-    # ref-updated hook.  See e.g.
-    # code.google.com/p/gerrit/source/browse/Documentation/config-hooks.txt
-    # We suppress help for these items, since these are specific to gerrit,
-    # and we don't want users directly using them any way other than how the
-    # gerrit ref-updated hook is called.
-    parser.add_option('--oldrev', action='store', help=optparse.SUPPRESS_HELP)
-    parser.add_option('--newrev', action='store', help=optparse.SUPPRESS_HELP)
-    parser.add_option('--refname', action='store', help=optparse.SUPPRESS_HELP)
-    parser.add_option('--project', action='store', help=optparse.SUPPRESS_HELP)
-    parser.add_option('--submitter', action='store', help=optparse.SUPPRESS_HELP)
-
-    # The following allow this to be run as a stash asynchronous post-receive
-    # hook (almost identical to a git post-receive hook but triggered also for
-    # merges of pull requests from the UI).  We suppress help for these items,
-    # since these are specific to stash.
-    parser.add_option('--stash-user', action='store', help=optparse.SUPPRESS_HELP)
-    parser.add_option('--stash-repo', action='store', help=optparse.SUPPRESS_HELP)
-
-    (options, args) = parser.parse_args(args)
-    (options, args, hook_info) = check_hook_specific_args(options, args)
-
-    if options.version:
-        sys.stdout.write('git-multimail version ' + get_version() + '\n')
-        return
-
-    if options.python_version:
-        sys.stdout.write('Python version ' + sys.version + '\n')
-        return
-
-    if options.c:
-        Config.add_config_parameters(options.c)
-
-    config = Config('multimailhook')
-
-    environment = None
-    try:
-        environment = choose_environment(
-            config, osenv=os.environ,
-            env=options.environment,
-            recipients=options.recipients,
-            hook_info=hook_info,
-            )
-
-        if options.show_env:
-            show_env(environment, sys.stderr)
-
-        if options.stdout or environment.stdout:
-            mailer = OutputMailer(sys.stdout, environment)
-        else:
-            mailer = choose_mailer(config, environment)
-
-        must_check_setup = os.environ.get('GIT_MULTIMAIL_CHECK_SETUP')
-        if must_check_setup == '':
-            must_check_setup = False
-        if options.check_ref_filter:
-            check_ref_filter(environment)
-        elif must_check_setup:
-            check_setup(environment)
-        # Dual mode: if arguments were specified on the command line, run
-        # like an update hook; otherwise, run as a post-receive hook.
-        elif args:
-            if len(args) != 3:
-                parser.error('Need zero or three non-option arguments')
-            (refname, oldrev, newrev) = args
-            environment.get_logger().debug(
-                "run_as_update_hook: refname=%s, oldrev=%s, newrev=%s, force_send=%s" %
-                (refname, oldrev, newrev, options.force_send))
-            run_as_update_hook(environment, mailer, refname, oldrev, newrev, options.force_send)
-        else:
-            run_as_post_receive_hook(environment, mailer)
-    except ConfigurationException:
-        sys.exit(sys.exc_info()[1])
-    except SystemExit:
-        raise
-    except Exception:
-        t, e, tb = sys.exc_info()
-        import traceback
-        sys.stderr.write('\n')  # Avoid mixing message with previous output
-        msg = (
-            'Exception \'' + t.__name__ +
-            '\' raised. Please report this as a bug to\n'
-            'https://github.com/git-multimail/git-multimail/issues\n'
-            'with the information below:\n\n'
-            'git-multimail version ' + get_version() + '\n'
-            'Python version ' + sys.version + '\n' +
-            traceback.format_exc())
-        try:
-            environment.get_logger().error(msg)
-        except:
-            sys.stderr.write(msg)
-        sys.exit(1)
-
-
-if __name__ == '__main__':
-    main(sys.argv[1:])
diff --git a/contrib/hooks/multimail/migrate-mailhook-config b/contrib/hooks/multimail/migrate-mailhook-config
deleted file mode 100755
index 241ba22fa3..0000000000
--- a/contrib/hooks/multimail/migrate-mailhook-config
+++ /dev/null
@@ -1,274 +0,0 @@
-#! /usr/bin/env python
-
-"""Migrate a post-receive-email configuration to be usable with git_multimail.py.
-
-See README.migrate-from-post-receive-email for more information.
-
-"""
-
-import sys
-import optparse
-
-from git_multimail import CommandError
-from git_multimail import Config
-from git_multimail import read_output
-
-
-OLD_NAMES = [
-    'mailinglist',
-    'announcelist',
-    'envelopesender',
-    'emailprefix',
-    'showrev',
-    'emailmaxlines',
-    'diffopts',
-    'scancommitforcc',
-    ]
-
-NEW_NAMES = [
-    'environment',
-    'reponame',
-    'mailinglist',
-    'refchangelist',
-    'commitlist',
-    'announcelist',
-    'announceshortlog',
-    'envelopesender',
-    'administrator',
-    'emailprefix',
-    'emailmaxlines',
-    'diffopts',
-    'emaildomain',
-    'scancommitforcc',
-    ]
-
-
-INFO = """\
-
-SUCCESS!
-
-Your post-receive-email configuration has been converted to
-git-multimail format.  Please see README and
-README.migrate-from-post-receive-email to learn about other
-git-multimail configuration possibilities.
-
-For example, git-multimail has the following new options with no
-equivalent in post-receive-email.  You might want to read about them
-to see if they would be useful in your situation:
-
-"""
-
-
-def _check_old_config_exists(old):
-    """Check that at least one old configuration value is set."""
-
-    for name in OLD_NAMES:
-        if name in old:
-            return True
-
-    return False
-
-
-def _check_new_config_clear(new):
-    """Check that none of the new configuration names are set."""
-
-    retval = True
-    for name in NEW_NAMES:
-        if name in new:
-            if retval:
-                sys.stderr.write('INFO: The following configuration values already exist:\n\n')
-            sys.stderr.write('    "%s.%s"\n' % (new.section, name))
-            retval = False
-
-    return retval
-
-
-def erase_values(config, names):
-    for name in names:
-        if name in config:
-            try:
-                sys.stderr.write('...unsetting "%s.%s"\n' % (config.section, name))
-                config.unset_all(name)
-            except CommandError:
-                sys.stderr.write(
-                    '\nWARNING: could not unset "%s.%s".  '
-                    'Perhaps it is not set at the --local level?\n\n'
-                    % (config.section, name)
-                    )
-
-
-def is_section_empty(section, local):
-    """Return True iff the specified configuration section is empty.
-
-    Iff local is True, use the --local option when invoking 'git
-    config'."""
-
-    if local:
-        local_option = ['--local']
-    else:
-        local_option = []
-
-    try:
-        read_output(
-            ['git', 'config'] +
-            local_option +
-            ['--get-regexp', '^%s\.' % (section,)]
-            )
-    except CommandError:
-        t, e, traceback = sys.exc_info()
-        if e.retcode == 1:
-            # This means that no settings were found.
-            return True
-        else:
-            raise
-    else:
-        return False
-
-
-def remove_section_if_empty(section):
-    """If the specified configuration section is empty, delete it."""
-
-    try:
-        empty = is_section_empty(section, local=True)
-    except CommandError:
-        # Older versions of git do not support the --local option, so
-        # if the first attempt fails, try without --local.
-        try:
-            empty = is_section_empty(section, local=False)
-        except CommandError:
-            sys.stderr.write(
-                '\nINFO: If configuration section "%s.*" is empty, you might want '
-                'to delete it.\n\n'
-                % (section,)
-                )
-            return
-
-    if empty:
-        sys.stderr.write('...removing section "%s.*"\n' % (section,))
-        read_output(['git', 'config', '--remove-section', section])
-    else:
-        sys.stderr.write(
-            '\nINFO: Configuration section "%s.*" still has contents.  '
-            'It will not be deleted.\n\n'
-            % (section,)
-            )
-
-
-def migrate_config(strict=False, retain=False, overwrite=False):
-    old = Config('hooks')
-    new = Config('multimailhook')
-    if not _check_old_config_exists(old):
-        sys.exit(
-            'Your repository has no post-receive-email configuration.  '
-            'Nothing to do.'
-            )
-    if not _check_new_config_clear(new):
-        if overwrite:
-            sys.stderr.write('\nWARNING: Erasing the above values...\n\n')
-            erase_values(new, NEW_NAMES)
-        else:
-            sys.exit(
-                '\nERROR: Refusing to overwrite existing values.  Use the --overwrite\n'
-                'option to continue anyway.'
-                )
-
-    name = 'showrev'
-    if name in old:
-        msg = 'git-multimail does not support "%s.%s"' % (old.section, name,)
-        if strict:
-            sys.exit(
-                'ERROR: %s.\n'
-                'Please unset that value then try again, or run without --strict.'
-                % (msg,)
-                )
-        else:
-            sys.stderr.write('\nWARNING: %s (ignoring).\n\n' % (msg,))
-
-    for name in ['mailinglist', 'announcelist']:
-        if name in old:
-            sys.stderr.write(
-                '...copying "%s.%s" to "%s.%s"\n' % (old.section, name, new.section, name)
-                )
-            old_recipients = old.get_all(name, default=None)
-            old_recipients = ', '.join(o.strip() for o in old_recipients)
-            new.set_recipients(name, old_recipients)
-
-    if strict:
-        sys.stderr.write(
-            '...setting "%s.commitlist" to the empty string\n' % (new.section,)
-            )
-        new.set_recipients('commitlist', '')
-        sys.stderr.write(
-            '...setting "%s.announceshortlog" to "true"\n' % (new.section,)
-            )
-        new.set('announceshortlog', 'true')
-
-    for name in ['envelopesender', 'emailmaxlines', 'diffopts', 'scancommitforcc']:
-        if name in old:
-            sys.stderr.write(
-                '...copying "%s.%s" to "%s.%s"\n' % (old.section, name, new.section, name)
-                )
-            new.set(name, old.get(name))
-
-    name = 'emailprefix'
-    if name in old:
-        sys.stderr.write(
-            '...copying "%s.%s" to "%s.%s"\n' % (old.section, name, new.section, name)
-            )
-        new.set(name, old.get(name))
-    elif strict:
-        sys.stderr.write(
-            '...setting "%s.%s" to "[SCM]" to preserve old subject lines\n'
-            % (new.section, name)
-            )
-        new.set(name, '[SCM]')
-
-    if not retain:
-        erase_values(old, OLD_NAMES)
-        remove_section_if_empty(old.section)
-
-    sys.stderr.write(INFO)
-    for name in NEW_NAMES:
-        if name not in OLD_NAMES:
-            sys.stderr.write('    "%s.%s"\n' % (new.section, name,))
-    sys.stderr.write('\n')
-
-
-def main(args):
-    parser = optparse.OptionParser(
-        description=__doc__,
-        usage='%prog [OPTIONS]',
-        )
-
-    parser.add_option(
-        '--strict', action='store_true', default=False,
-        help=(
-            'Slavishly configure git-multimail as closely as possible to '
-            'the post-receive-email configuration.  Default is to turn '
-            'on some new features that have no equivalent in post-receive-email.'
-            ),
-        )
-    parser.add_option(
-        '--retain', action='store_true', default=False,
-        help=(
-            'Retain the post-receive-email configuration values.  '
-            'Default is to delete them after the new values are set.'
-            ),
-        )
-    parser.add_option(
-        '--overwrite', action='store_true', default=False,
-        help=(
-            'Overwrite any existing git-multimail configuration settings.  '
-            'Default is to abort if such settings already exist.'
-            ),
-        )
-
-    (options, args) = parser.parse_args(args)
-
-    if args:
-        parser.error('Unexpected arguments: %s' % (' '.join(args),))
-
-    migrate_config(strict=options.strict, retain=options.retain, overwrite=options.overwrite)
-
-
-main(sys.argv[1:])
diff --git a/contrib/hooks/multimail/post-receive.example b/contrib/hooks/multimail/post-receive.example
deleted file mode 100755
index b9bb11834e..0000000000
--- a/contrib/hooks/multimail/post-receive.example
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /usr/bin/env python
-
-"""Example post-receive hook based on git-multimail.
-
-The simplest way to use git-multimail is to use the script
-git_multimail.py directly as a post-receive hook, and to configure it
-using Git's configuration files and command-line parameters.  You can
-also write your own Python wrapper for more advanced configurability,
-using git_multimail.py as a Python module.
-
-This script is a simple example of such a post-receive hook.  It is
-intended to be customized before use; see the comments in the script
-to help you get started.
-
-Using git-multimail as a Python module as done here provides more
-flexibility.  It has the following advantages:
-
-* The tool's behavior can be customized using arbitrary Python code,
-  without having to edit git_multimail.py.
-
-* Configuration settings can be read from other sources; for example,
-  user names and email addresses could be read from LDAP or from a
-  database.  Or the settings can even be hardcoded in the importing
-  Python script, if this is preferred.
-
-This script is a very basic example of how to use git_multimail.py as
-a module.  The comments below explain some of the points at which the
-script's behavior could be changed or customized.
-
-"""
-
-import sys
-
-# If necessary, add the path to the directory containing
-# git_multimail.py to the Python path as follows.  (This is not
-# necessary if git_multimail.py is in the same directory as this
-# script):
-
-#LIBDIR = 'path/to/directory/containing/module'
-#sys.path.insert(0, LIBDIR)
-
-import git_multimail
-
-# It is possible to modify the output templates here; e.g.:
-
-#git_multimail.FOOTER_TEMPLATE = """\
-#
-#-- \n\
-#This email was generated by the wonderful git-multimail tool.
-#"""
-
-
-# Specify which "git config" section contains the configuration for
-# git-multimail:
-config = git_multimail.Config('multimailhook')
-
-# Set some Git configuration variables. Equivalent to passing var=val
-# to "git -c var=val" each time git is called, or to adding the
-# configuration in .git/config (must come before instanciating the
-# environment) :
-#git_multimail.Config.add_config_parameters('multimailhook.commitEmailFormat=html')
-#git_multimail.Config.add_config_parameters(('user.name=foo', 'user.email=foo@example.com'))
-
-# Select the type of environment:
-try:
-    environment = git_multimail.GenericEnvironment(config=config)
-    #environment = git_multimail.GitoliteEnvironment(config=config)
-except git_multimail.ConfigurationException:
-    sys.stderr.write('*** %s\n' % sys.exc_info()[1])
-    sys.exit(1)
-
-
-# Choose the method of sending emails based on the git config:
-mailer = git_multimail.choose_mailer(config, environment)
-
-# Alternatively, you may hardcode the mailer using code like one of
-# the following:
-
-# Use "/usr/sbin/sendmail -oi -t" to send emails.  The envelopesender
-# argument is optional:
-#mailer = git_multimail.SendMailer(
-#    command=['/usr/sbin/sendmail', '-oi', '-t'],
-#    envelopesender='git-repo@example.com',
-#    )
-
-# Use Python's smtplib to send emails.  Both arguments are required.
-#mailer = git_multimail.SMTPMailer(
-#    environment=environment,
-#    envelopesender='git-repo@example.com',
-#    # The smtpserver argument can also include a port number; e.g.,
-#    #     smtpserver='mail.example.com:25'
-#    smtpserver='mail.example.com',
-#    )
-
-# OutputMailer is intended only for testing; it writes the emails to
-# the specified file stream.
-#mailer = git_multimail.OutputMailer(sys.stdout)
-
-
-# Read changes from stdin and send notification emails:
-git_multimail.run_as_post_receive_hook(environment, mailer)
diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email
index 8747b84334..ff565eb3d8 100755
--- a/contrib/hooks/post-receive-email
+++ b/contrib/hooks/post-receive-email
@@ -329,7 +329,7 @@ generate_update_branch_email()
 	#
 	#  git rev-parse --not --all | grep -v $(git rev-parse $refname)
 	#
-	# Get's us to something pretty safe (apart from the small time
+	# Gets us to something pretty safe (apart from the small time
 	# between refname being read, and git rev-parse running - for that,
 	# I give up)
 	#
diff --git a/contrib/hooks/update-paranoid b/contrib/hooks/update-paranoid
index d18b317b2f..0092d67b8a 100755
--- a/contrib/hooks/update-paranoid
+++ b/contrib/hooks/update-paranoid
@@ -49,7 +49,7 @@ opcode.
 Repository sections are matched on the basename of the repository
 (after removing the .git suffix).
 
-The opcode abbrevations are:
+The opcode abbreviations are:
 
   C: create new ref
   D: delete existing ref
diff --git a/contrib/mw-to-git/.perlcriticrc b/contrib/mw-to-git/.perlcriticrc
index 158958d363..b7333267ad 100644
--- a/contrib/mw-to-git/.perlcriticrc
+++ b/contrib/mw-to-git/.perlcriticrc
@@ -14,7 +14,7 @@
 
 # This rule states that each system call should have its return value checked
 # The problem is that it includes the print call. Checking every print call's
-# return value would be harmful to the code readabilty.
+# return value would be harmful to the code readability.
 # This configuration keeps all default function but print.
 [InputOutput::RequireCheckedSyscalls]
 functions = open say close
diff --git a/contrib/mw-to-git/git-mw.perl b/contrib/mw-to-git/git-mw.perl
index 28df3ee321..eb52a53d32 100755
--- a/contrib/mw-to-git/git-mw.perl
+++ b/contrib/mw-to-git/git-mw.perl
@@ -6,7 +6,7 @@
 # License: GPL v2 or later
 
 # Set of tools for git repo with a mediawiki remote.
-# Documentation & bugtracker: https://github.com/moy/Git-Mediawiki/
+# Documentation & bugtracker: https://github.com/Git-Mediawiki/Git-Mediawiki
 
 use strict;
 use warnings;
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index af9cbc9d0f..a5624413dc 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -9,7 +9,7 @@
 # License: GPL v2 or later
 
 # Gateway between Git and MediaWiki.
-# Documentation & bugtracker: https://github.com/moy/Git-Mediawiki/
+# Documentation & bugtracker: https://github.com/Git-Mediawiki/Git-Mediawiki
 
 use strict;
 use MediaWiki::API;
@@ -56,38 +56,38 @@ my $url = $ARGV[1];
 
 # Accept both space-separated and multiple keys in config file.
 # Spaces should be written as _ anyway because we'll use chomp.
-my @tracked_pages = split(/[ \n]/, run_git("config --get-all remote.${remotename}.pages"));
+my @tracked_pages = split(/[ \n]/, run_git_quoted(["config", "--get-all", "remote.${remotename}.pages"]));
 chomp(@tracked_pages);
 
 # Just like @tracked_pages, but for MediaWiki categories.
-my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
+my @tracked_categories = split(/[ \n]/, run_git_quoted(["config", "--get-all", "remote.${remotename}.categories"]));
 chomp(@tracked_categories);
 
 # Just like @tracked_categories, but for MediaWiki namespaces.
-my @tracked_namespaces = split(/[ \n]/, run_git("config --get-all remote.${remotename}.namespaces"));
+my @tracked_namespaces = split(/[ \n]/, run_git_quoted(["config", "--get-all", "remote.${remotename}.namespaces"]));
 for (@tracked_namespaces) { s/_/ /g; }
 chomp(@tracked_namespaces);
 
 # Import media files on pull
-my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
+my $import_media = run_git_quoted(["config", "--get", "--bool", "remote.${remotename}.mediaimport"]);
 chomp($import_media);
 $import_media = ($import_media eq 'true');
 
 # Export media files on push
-my $export_media = run_git("config --get --bool remote.${remotename}.mediaexport");
+my $export_media = run_git_quoted(["config", "--get", "--bool", "remote.${remotename}.mediaexport"]);
 chomp($export_media);
 $export_media = !($export_media eq 'false');
 
-my $wiki_login = run_git("config --get remote.${remotename}.mwLogin");
-# Note: mwPassword is discourraged. Use the credential system instead.
-my $wiki_passwd = run_git("config --get remote.${remotename}.mwPassword");
-my $wiki_domain = run_git("config --get remote.${remotename}.mwDomain");
+my $wiki_login = run_git_quoted(["config", "--get", "remote.${remotename}.mwLogin"]);
+# Note: mwPassword is discouraged. Use the credential system instead.
+my $wiki_passwd = run_git_quoted(["config", "--get", "remote.${remotename}.mwPassword"]);
+my $wiki_domain = run_git_quoted(["config", "--get", "remote.${remotename}.mwDomain"]);
 chomp($wiki_login);
 chomp($wiki_passwd);
 chomp($wiki_domain);
 
 # Import only last revisions (both for clone and fetch)
-my $shallow_import = run_git("config --get --bool remote.${remotename}.shallow");
+my $shallow_import = run_git_quoted(["config", "--get", "--bool", "remote.${remotename}.shallow"]);
 chomp($shallow_import);
 $shallow_import = ($shallow_import eq 'true');
 
@@ -97,9 +97,9 @@ $shallow_import = ($shallow_import eq 'true');
 # Possible values:
 # - by_rev: perform one query per new revision on the remote wiki
 # - by_page: query each tracked page for new revision
-my $fetch_strategy = run_git("config --get remote.${remotename}.fetchStrategy");
+my $fetch_strategy = run_git_quoted(["config", "--get", "remote.${remotename}.fetchStrategy"]);
 if (!$fetch_strategy) {
-	$fetch_strategy = run_git('config --get mediawiki.fetchStrategy');
+	$fetch_strategy = run_git_quoted(["config", "--get", "mediawiki.fetchStrategy"]);
 }
 chomp($fetch_strategy);
 if (!$fetch_strategy) {
@@ -123,9 +123,9 @@ my %basetimestamps;
 # will get the history with information lost). If the import is
 # deterministic, this means everybody gets the same sha1 for each
 # MediaWiki revision.
-my $dumb_push = run_git("config --get --bool remote.${remotename}.dumbPush");
+my $dumb_push = run_git_quoted(["config", "--get", "--bool", "remote.${remotename}.dumbPush"]);
 if (!$dumb_push) {
-	$dumb_push = run_git('config --get --bool mediawiki.dumbPush');
+	$dumb_push = run_git_quoted(["config", "--get", "--bool", "mediawiki.dumbPush"]);
 }
 chomp($dumb_push);
 $dumb_push = ($dumb_push eq 'true');
@@ -369,12 +369,14 @@ sub get_mw_pages {
 	return %pages;
 }
 
-# usage: $out = run_git("command args");
-#        $out = run_git("command args", "raw"); # don't interpret output as UTF-8.
-sub run_git {
+# usage: $out = run_git_quoted(["command", "args", ...]);
+#        $out = run_git_quoted(["command", "args", ...], "raw"); # don't interpret output as UTF-8.
+#        $out = run_git_quoted_nostderr(["command", "args", ...]); # discard stderr
+#        $out = run_git_quoted_nostderr(["command", "args", ...], "raw"); # ditto but raw instead of UTF-8 as above
+sub _run_git {
 	my $args = shift;
 	my $encoding = (shift || 'encoding(UTF-8)');
-	open(my $git, "-|:${encoding}", "git ${args}")
+	open(my $git, "-|:${encoding}", @$args)
 	    or die "Unable to fork: $!\n";
 	my $res = do {
 		local $/ = undef;
@@ -385,6 +387,13 @@ sub run_git {
 	return $res;
 }
 
+sub run_git_quoted {
+    _run_git(["git", @{$_[0]}], $_[1]);
+}
+
+sub run_git_quoted_nostderr {
+    _run_git(['sh', '-c', 'git "$@" 2>/dev/null', '--', @{$_[0]}], $_[1]);
+}
 
 sub get_all_mediafiles {
 	my $pages = shift;
@@ -511,8 +520,9 @@ sub download_mw_mediafile {
 }
 
 sub get_last_local_revision {
-	# Get note regarding last mediawiki revision
-	my $note = run_git("notes --ref=${remotename}/mediawiki show refs/mediawiki/${remotename}/master 2>/dev/null");
+	# Get note regarding last mediawiki revision.
+	my $note = run_git_quoted_nostderr(["notes", "--ref=${remotename}/mediawiki",
+					    "show", "refs/mediawiki/${remotename}/master"]);
 	my @note_info = split(/ /, $note);
 
 	my $lastrevision_number;
@@ -807,7 +817,10 @@ sub get_more_refs {
 sub mw_import {
 	# multiple import commands can follow each other.
 	my @refs = (shift, get_more_refs('import'));
+	my $processedRefs;
 	foreach my $ref (@refs) {
+		next if $processedRefs->{$ref}; # skip duplicates: "import refs/heads/master" being issued twice; TODO: why?
+		$processedRefs->{$ref} = 1;
 		mw_import_ref($ref);
 	}
 	print {*STDOUT} "done\n";
@@ -970,7 +983,7 @@ sub mw_import_revids {
 }
 
 sub error_non_fast_forward {
-	my $advice = run_git('config --bool advice.pushNonFastForward');
+	my $advice = run_git_quoted(["config", "--bool", "advice.pushNonFastForward"]);
 	chomp($advice);
 	if ($advice ne 'false') {
 		# Native git-push would show this after the summary.
@@ -1014,7 +1027,7 @@ sub mw_upload_file {
 		}
 	} else {
 		# Don't let perl try to interpret file content as UTF-8 => use "raw"
-		my $content = run_git("cat-file blob ${new_sha1}", 'raw');
+		my $content = run_git_quoted(["cat-file", "blob", $new_sha1], 'raw');
 		if ($content ne EMPTY) {
 			$mediawiki = connect_maybe($mediawiki, $remotename, $url);
 			$mediawiki->{config}->{upload_url} =
@@ -1084,7 +1097,7 @@ sub mw_push_file {
 			# with this content instead:
 			$file_content = DELETED_CONTENT;
 		} else {
-			$file_content = run_git("cat-file blob ${new_sha1}");
+			$file_content = run_git_quoted(["cat-file", "blob", $new_sha1]);
 		}
 
 		$mediawiki = connect_maybe($mediawiki, $remotename, $url);
@@ -1174,10 +1187,10 @@ sub mw_push_revision {
 	my $mw_revision = $last_remote_revid;
 
 	# Get sha1 of commit pointed by local HEAD
-	my $HEAD_sha1 = run_git("rev-parse ${local} 2>/dev/null");
+	my $HEAD_sha1 = run_git_quoted_nostderr(["rev-parse", $local]);
 	chomp($HEAD_sha1);
 	# Get sha1 of commit pointed by remotes/$remotename/master
-	my $remoteorigin_sha1 = run_git("rev-parse refs/remotes/${remotename}/master 2>/dev/null");
+	my $remoteorigin_sha1 = run_git_quoted_nostderr(["rev-parse", "refs/remotes/${remotename}/master"]);
 	chomp($remoteorigin_sha1);
 
 	if ($last_local_revid > 0 &&
@@ -1197,7 +1210,7 @@ sub mw_push_revision {
 		my $parsed_sha1 = $remoteorigin_sha1;
 		# Find a path from last MediaWiki commit to pushed commit
 		print {*STDERR} "Computing path from local to remote ...\n";
-		my @local_ancestry = split(/\n/, run_git("rev-list --boundary --parents ${local} ^${parsed_sha1}"));
+		my @local_ancestry = split(/\n/, run_git_quoted(["rev-list", "--boundary", "--parents", $local, "^${parsed_sha1}"]));
 		my %local_ancestry;
 		foreach my $line (@local_ancestry) {
 			if (my ($child, $parents) = $line =~ /^-?([a-f0-9]+) ([a-f0-9 ]+)/) {
@@ -1221,7 +1234,7 @@ sub mw_push_revision {
 		# No remote mediawiki revision. Export the whole
 		# history (linearized with --first-parent)
 		print {*STDERR} "Warning: no common ancestor, pushing complete history\n";
-		my $history = run_git("rev-list --first-parent --children ${local}");
+		my $history = run_git_quoted(["rev-list", "--first-parent", "--children", $local]);
 		my @history = split(/\n/, $history);
 		@history = @history[1..$#history];
 		foreach my $line (reverse @history) {
@@ -1233,12 +1246,12 @@ sub mw_push_revision {
 	foreach my $commit_info_split (@commit_pairs) {
 		my $sha1_child = @{$commit_info_split}[0];
 		my $sha1_commit = @{$commit_info_split}[1];
-		my $diff_infos = run_git("diff-tree -r --raw -z ${sha1_child} ${sha1_commit}");
+		my $diff_infos = run_git_quoted(["diff-tree", "-r", "--raw", "-z", $sha1_child, $sha1_commit]);
 		# TODO: we could detect rename, and encode them with a #redirect on the wiki.
 		# TODO: for now, it's just a delete+add
 		my @diff_info_list = split(/\0/, $diff_infos);
 		# Keep the subject line of the commit message as mediawiki comment for the revision
-		my $commit_msg = run_git(qq(log --no-walk --format="%s" ${sha1_commit}));
+		my $commit_msg = run_git_quoted(["log", "--no-walk", '--format="%s"', $sha1_commit]);
 		chomp($commit_msg);
 		# Push every blob
 		while (@diff_info_list) {
@@ -1263,7 +1276,10 @@ sub mw_push_revision {
 			}
 		}
 		if (!$dumb_push) {
-			run_git(qq(notes --ref=${remotename}/mediawiki add -f -m "mediawiki_revision: ${mw_revision}" ${sha1_commit}));
+			run_git_quoted(["notes", "--ref=${remotename}/mediawiki",
+					"add", "-f", "-m",
+					"mediawiki_revision: ${mw_revision}",
+					$sha1_commit]);
 		}
 	}
 
@@ -1304,7 +1320,7 @@ sub get_mw_namespace_id {
 		# already cached. Namespaces are stored in form:
 		# "Name_of_namespace:Id_namespace", ex.: "File:6".
 		my @temp = split(/\n/,
-				 run_git("config --get-all remote.${remotename}.namespaceCache"));
+				 run_git_quoted(["config", "--get-all", "remote.${remotename}.namespaceCache"]));
 		chomp(@temp);
 		foreach my $ns (@temp) {
 			my ($n, $id) = split(/:/, $ns);
@@ -1358,7 +1374,7 @@ sub get_mw_namespace_id {
 
 	# Store explicitly requested namespaces on disk
 	if (!exists $cached_mw_namespace_id{$name}) {
-		run_git(qq(config --add remote.${remotename}.namespaceCache "${name}:${store_id}"));
+		run_git_quoted(["config", "--add", "remote.${remotename}.namespaceCache", "${name}:${store_id}"]);
 		$cached_mw_namespace_id{$name} = 1;
 	}
 	return $id;
diff --git a/contrib/mw-to-git/git-remote-mediawiki.txt b/contrib/mw-to-git/git-remote-mediawiki.txt
index 23b7ef9f62..5da825f61e 100644
--- a/contrib/mw-to-git/git-remote-mediawiki.txt
+++ b/contrib/mw-to-git/git-remote-mediawiki.txt
@@ -4,4 +4,4 @@ objects from mediawiki just as one would do with a classic git
 repository thanks to remote-helpers.
 
 For more information, visit the wiki at
-https://github.com/moy/Git-Mediawiki/wiki
+https://github.com/Git-Mediawiki/Git-Mediawiki
diff --git a/contrib/mw-to-git/t/.gitignore b/contrib/mw-to-git/t/.gitignore
index a7a40b4964..2b8dc30c6d 100644
--- a/contrib/mw-to-git/t/.gitignore
+++ b/contrib/mw-to-git/t/.gitignore
@@ -1,4 +1,4 @@
 WEB/
-wiki/
+mediawiki/
 trash directory.t*/
 test-results/
diff --git a/contrib/mw-to-git/t/README b/contrib/mw-to-git/t/README
index 2ee34be7e4..72c4889db7 100644
--- a/contrib/mw-to-git/t/README
+++ b/contrib/mw-to-git/t/README
@@ -14,11 +14,11 @@ install the following packages (Debian/Ubuntu names, may need to be
 adapted for another distribution):
 
 * lighttpd
-* php5
-* php5-cgi
-* php5-cli
-* php5-curl
-* php5-sqlite
+* php
+* php-cgi
+* php-cli
+* php-curl
+* php-sqlite
 
 Principles and Technical Choices
 --------------------------------
diff --git a/contrib/mw-to-git/t/install-wiki/.gitignore b/contrib/mw-to-git/t/install-wiki/.gitignore
deleted file mode 100644
index b5a2a4408c..0000000000
--- a/contrib/mw-to-git/t/install-wiki/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-wikidb.sqlite
diff --git a/contrib/mw-to-git/t/install-wiki/LocalSettings.php b/contrib/mw-to-git/t/install-wiki/LocalSettings.php
deleted file mode 100644
index 745e47e881..0000000000
--- a/contrib/mw-to-git/t/install-wiki/LocalSettings.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-# This file was automatically generated by the MediaWiki 1.19.0
-# installer. If you make manual changes, please keep track in case you
-# need to recreate them later.
-#
-# See includes/DefaultSettings.php for all configurable settings
-# and their default values, but don't forget to make changes in _this_
-# file, not there.
-#
-# Further documentation for configuration settings may be found at:
-# http://www.mediawiki.org/wiki/Manual:Configuration_settings
-
-# Protect against web entry
-if ( !defined( 'MEDIAWIKI' ) ) {
-	exit;
-}
-
-## Uncomment this to disable output compression
-# $wgDisableOutputCompression = true;
-
-$wgSitename      = "Git-MediaWiki-Test";
-$wgMetaNamespace = "Git-MediaWiki-Test";
-
-## The URL base path to the directory containing the wiki;
-## defaults for all runtime URL paths are based off of this.
-## For more information on customizing the URLs please see:
-## http://www.mediawiki.org/wiki/Manual:Short_URL
-$wgScriptPath       = "@WG_SCRIPT_PATH@";
-$wgScriptExtension  = ".php";
-
-## The protocol and server name to use in fully-qualified URLs
-$wgServer           = "@WG_SERVER@";
-
-## The relative URL path to the skins directory
-$wgStylePath        = "$wgScriptPath/skins";
-
-## The relative URL path to the logo.  Make sure you change this from the default,
-## or else you'll overwrite your logo when you upgrade!
-$wgLogo             = "$wgStylePath/common/images/wiki.png";
-
-## UPO means: this is also a user preference option
-
-$wgEnableEmail      = true;
-$wgEnableUserEmail  = true; # UPO
-
-$wgEmergencyContact = "apache@localhost";
-$wgPasswordSender   = "apache@localhost";
-
-$wgEnotifUserTalk      = false; # UPO
-$wgEnotifWatchlist     = false; # UPO
-$wgEmailAuthentication = true;
-
-## Database settings
-$wgDBtype           = "sqlite";
-$wgDBserver         = "";
-$wgDBname           = "@WG_SQLITE_DATAFILE@";
-$wgDBuser           = "";
-$wgDBpassword       = "";
-
-# SQLite-specific settings
-$wgSQLiteDataDir    = "@WG_SQLITE_DATADIR@";
-
-
-## Shared memory settings
-$wgMainCacheType    = CACHE_NONE;
-$wgMemCachedServers = array();
-
-## To enable image uploads, make sure the 'images' directory
-## is writable, then set this to true:
-$wgEnableUploads  = true;
-$wgUseImageMagick = true;
-$wgImageMagickConvertCommand ="@CONVERT@";
-$wgFileExtensions[] = 'txt';
-
-# InstantCommons allows wiki to use images from http://commons.wikimedia.org
-$wgUseInstantCommons  = false;
-
-## If you use ImageMagick (or any other shell command) on a
-## Linux server, this will need to be set to the name of an
-## available UTF-8 locale
-$wgShellLocale = "en_US.utf8";
-
-## If you want to use image uploads under safe mode,
-## create the directories images/archive, images/thumb and
-## images/temp, and make them all writable. Then uncomment
-## this, if it's not already uncommented:
-#$wgHashedUploadDirectory = false;
-
-## Set $wgCacheDirectory to a writable directory on the web server
-## to make your wiki go slightly faster. The directory should not
-## be publicly accessible from the web.
-#$wgCacheDirectory = "$IP/cache";
-
-# Site language code, should be one of the list in ./languages/Names.php
-$wgLanguageCode = "en";
-
-$wgSecretKey = "1c912bfe3519fb70f5dc523ecc698111cd43d81a11c585b3eefb28f29c2699b7";
-#$wgSecretKey = "@SECRETKEY@";
-
-
-# Site upgrade key. Must be set to a string (default provided) to turn on the
-# web installer while LocalSettings.php is in place
-$wgUpgradeKey = "ddae7dc87cd0a645";
-
-## Default skin: you can change the default skin. Use the internal symbolic
-## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook', 'vector':
-$wgDefaultSkin = "vector";
-
-## For attaching licensing metadata to pages, and displaying an
-## appropriate copyright notice / icon. GNU Free Documentation
-## License and Creative Commons licenses are supported so far.
-$wgRightsPage = ""; # Set to the title of a wiki page that describes your license/copyright
-$wgRightsUrl  = "";
-$wgRightsText = "";
-$wgRightsIcon = "";
-
-# Path to the GNU diff3 utility. Used for conflict resolution.
-$wgDiff3 = "/usr/bin/diff3";
-
-# Query string length limit for ResourceLoader. You should only set this if
-# your web server has a query string length limit (then set it to that limit),
-# or if you have suhosin.get.max_value_length set in php.ini (then set it to
-# that value)
-$wgResourceLoaderMaxQueryLength = -1;
-
-
-
-# End of automatically generated settings.
-# Add more configuration options below.
diff --git a/contrib/mw-to-git/t/install-wiki/db_install.php b/contrib/mw-to-git/t/install-wiki/db_install.php
deleted file mode 100644
index 0f3f4e018a..0000000000
--- a/contrib/mw-to-git/t/install-wiki/db_install.php
+++ /dev/null
@@ -1,120 +0,0 @@
-<?php
-/**
- * This script generates a SQLite database for a MediaWiki version 1.19.0
- * You must specify the login of the admin (argument 1) and its
- * password (argument 2) and the folder where the database file
- * is located (absolute path in argument 3).
- * It is used by the script install-wiki.sh in order to make easy the
- * installation of a MediaWiki.
- *
- * In order to generate a SQLite database file, MediaWiki ask the user
- * to submit some forms in its web browser. This script simulates this
- * behavior though the functions <get> and <submit>
- *
- */
-$argc = $_SERVER['argc'];
-$argv = $_SERVER['argv'];
-
-$login = $argv[2];
-$pass = $argv[3];
-$tmp = $argv[4];
-$port = $argv[5];
-
-$url = 'http://localhost:'.$port.'/wiki/mw-config/index.php';
-$db_dir = urlencode($tmp);
-$tmp_cookie = tempnam($tmp, "COOKIE_");
-/*
- * Fetchs a page with cURL.
- */
-function get($page_name = "") {
-	$curl = curl_init();
-	$page_name_add = "";
-	if ($page_name != "") {
-		$page_name_add = '?page='.$page_name;
-	}
-	$url = $GLOBALS['url'].$page_name_add;
-	$tmp_cookie = $GLOBALS['tmp_cookie'];
-	curl_setopt($curl, CURLOPT_COOKIEJAR, $tmp_cookie);
-	curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-	curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-	curl_setopt($curl, CURLOPT_COOKIEFILE, $tmp_cookie);
-	curl_setopt($curl, CURLOPT_HEADER, true);
-	curl_setopt($curl, CURLOPT_URL, $url);
-
-	$page = curl_exec($curl);
-	if (!$page) {
-		die("Could not get page: $url\n");
-	}
-	curl_close($curl);
-	return $page;
-}
-
-/*
- * Submits a form with cURL.
- */
-function submit($page_name, $option = "") {
-	$curl = curl_init();
-	$datapost = 'submit-continue=Continue+%E2%86%92';
-	if ($option != "") {
-		$datapost = $option.'&'.$datapost;
-	}
-	$url = $GLOBALS['url'].'?page='.$page_name;
-	$tmp_cookie = $GLOBALS['tmp_cookie'];
-	curl_setopt($curl, CURLOPT_URL, $url);
-	curl_setopt($curl, CURLOPT_POST, true);
-	curl_setopt($curl, CURLOPT_FOLLOWLOCATION, true);
-	curl_setopt($curl, CURLOPT_POSTFIELDS, $datapost);
-	curl_setopt($curl, CURLOPT_RETURNTRANSFER, true);
-	curl_setopt($curl, CURLOPT_COOKIEJAR, $tmp_cookie);
-	curl_setopt($curl, CURLOPT_COOKIEFILE, $tmp_cookie);
-
-	$page = curl_exec($curl);
-	if (!$page) {
-		die("Could not get page: $url\n");
-	}
-	curl_close($curl);
-	return "$page";
-}
-
-/*
- * Here starts this script: simulates the behavior of the user
- * submitting forms to generates the database file.
- * Note this simulation was made for the MediaWiki version 1.19.0,
- * we can't assume it works with other versions.
- *
- */
-
-$page = get();
-if (!preg_match('/input type="hidden" value="([0-9]+)" name="LanguageRequestTime"/',
-		$page, $matches)) {
-	echo "Unexpected content for page downloaded:\n";
-	echo "$page";
-	die;
-};
-$timestamp = $matches[1];
-$language = "LanguageRequestTime=$timestamp&uselang=en&ContLang=en";
-$page = submit('Language', $language);
-
-submit('Welcome');
-
-$db_config = 'DBType=sqlite';
-$db_config = $db_config.'&sqlite_wgSQLiteDataDir='.$db_dir;
-$db_config = $db_config.'&sqlite_wgDBname='.$argv[1];
-submit('DBConnect', $db_config);
-
-$wiki_config = 'config_wgSitename=TEST';
-$wiki_config = $wiki_config.'&config__NamespaceType=site-name';
-$wiki_config = $wiki_config.'&config_wgMetaNamespace=MyWiki';
-$wiki_config = $wiki_config.'&config__AdminName='.$login;
-
-$wiki_config = $wiki_config.'&config__AdminPassword='.$pass;
-$wiki_config = $wiki_config.'&config__AdminPassword2='.$pass;
-
-$wiki_config = $wiki_config.'&wiki__configEmail=email%40email.org';
-$wiki_config = $wiki_config.'&config__SkipOptional=skip';
-submit('Name', $wiki_config);
-submit('Install');
-submit('Install');
-
-unlink($tmp_cookie);
-?>
diff --git a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
index cfbfe7ddf6..f08890d9e7 100755
--- a/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
+++ b/contrib/mw-to-git/t/t9360-mw-to-git-clone.sh
@@ -28,7 +28,7 @@ test_expect_success 'Git clone creates the expected git log with one file' '
 		git log --format=%s HEAD^..HEAD >log.tmp
 	) &&
 	echo "this must be the same" >msg.tmp &&
-	diff -b mw_dir_1/log.tmp msg.tmp
+	test_cmp msg.tmp mw_dir_1/log.tmp
 '
 
 
@@ -50,8 +50,8 @@ test_expect_success 'Git clone creates the expected git log with multiple files'
 	echo "this must be the same" >>msgDaddy.tmp &&
 	echo "identical too" >msgDj.tmp &&
 	echo "identical" >>msgDj.tmp &&
-	diff -b mw_dir_2/logDaddy.tmp msgDaddy.tmp &&
-	diff -b mw_dir_2/logDj.tmp msgDj.tmp
+	test_cmp msgDaddy.tmp mw_dir_2/logDaddy.tmp &&
+	test_cmp msgDj.tmp mw_dir_2/logDj.tmp
 '
 
 
@@ -86,7 +86,7 @@ test_expect_success 'Git clone works with page added' '
 test_expect_success 'Git clone works with an edited page ' '
 	wiki_reset &&
 	wiki_editpage foo "this page will be edited" \
-		false -s "first edition of page foo"&&
+		false -s "first edition of page foo" &&
 	wiki_editpage foo "this page has been edited and must be on the clone " true &&
 	git clone mediawiki::'"$WIKI_URL"' mw_dir_6 &&
 	test_path_is_file mw_dir_6/Foo.mw &&
@@ -135,7 +135,7 @@ test_expect_success 'Git clone works with one specific page cloned ' '
 		cd mw_dir_8 &&
 		echo "this log must stay" >msg.tmp &&
 		git log --format=%s >log.tmp &&
-		diff -b msg.tmp log.tmp
+		test_cmp msg.tmp log.tmp
 	) &&
 	wiki_check_content mw_dir_8/Namnam.mw Namnam
 '
@@ -143,7 +143,7 @@ test_expect_success 'Git clone works with one specific page cloned ' '
 test_expect_success 'Git clone works with multiple specific page cloned ' '
 	wiki_reset &&
 	wiki_editpage foo "I will be there" false &&
-	wiki_editpage bar "I will not disapear" false &&
+	wiki_editpage bar "I will not disappear" false &&
 	wiki_editpage namnam "I be erased" false &&
 	wiki_editpage nyancat "nyan nyan nyan you will not erase me" false &&
 	wiki_delete_page namnam &&
diff --git a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
index 6b0dbdac4d..526d92850f 100755
--- a/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
+++ b/contrib/mw-to-git/t/t9362-mw-to-git-utf8.sh
@@ -287,7 +287,7 @@ test_expect_success 'git push with \' '
 		git add \\ko\\o.mw &&
 		git commit -m " \\ko\\o added" &&
 		git push
-	)&&
+	) &&
 	wiki_page_exist \\ko\\o &&
 	wiki_check_content mw_dir_18/\\ko\\o.mw \\ko\\o
 
@@ -311,7 +311,7 @@ test_expect_success 'git push with \ in format control' '
 		git add \\fo\\o.mw &&
 		git commit -m " \\fo\\o added" &&
 		git push
-	)&&
+	) &&
 	wiki_page_exist \\fo\\o &&
 	wiki_check_content mw_dir_20/\\fo\\o.mw \\fo\\o
 
diff --git a/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh b/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
index 3ff3a09567..6187ec67fa 100755
--- a/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
+++ b/contrib/mw-to-git/t/t9363-mw-to-git-export-import.sh
@@ -27,12 +27,12 @@ test_git_reimport () {
 
 # Don't bother with permissions, be administrator by default
 test_expect_success 'setup config' '
-	git config --global remote.origin.mwLogin WikiAdmin &&
-	git config --global remote.origin.mwPassword AdminPass &&
+	git config --global remote.origin.mwLogin "$WIKI_ADMIN" &&
+	git config --global remote.origin.mwPassword "$WIKI_PASSW" &&
 	test_might_fail git config --global --unset remote.origin.mediaImport
 '
 
-test_expect_success 'git push can upload media (File:) files' '
+test_expect_failure 'git push can upload media (File:) files' '
 	wiki_reset &&
 	git clone mediawiki::'"$WIKI_URL"' mw_dir &&
 	(
@@ -48,13 +48,14 @@ test_expect_success 'git push can upload media (File:) files' '
 	)
 '
 
-test_expect_success 'git clone works on previously created wiki with media files' '
+test_expect_failure 'git clone works on previously created wiki with media files' '
 	test_when_finished "rm -rf mw_dir mw_dir_clone" &&
 	git clone -c remote.origin.mediaimport=true \
 		mediawiki::'"$WIKI_URL"' mw_dir_clone &&
 	test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt &&
 	(cd mw_dir_clone && git checkout HEAD^) &&
 	(cd mw_dir && git checkout HEAD^) &&
+	test_path_is_file mw_dir_clone/Foo.txt &&
 	test_cmp mw_dir_clone/Foo.txt mw_dir/Foo.txt
 '
 
diff --git a/contrib/mw-to-git/t/test-gitmw-lib.sh b/contrib/mw-to-git/t/test-gitmw-lib.sh
index 6546294f15..64e46c1671 100755
--- a/contrib/mw-to-git/t/test-gitmw-lib.sh
+++ b/contrib/mw-to-git/t/test-gitmw-lib.sh
@@ -13,7 +13,8 @@
 
 . ./test.config
 
-WIKI_URL=http://"$SERVER_ADDR:$PORT/$WIKI_DIR_NAME"
+WIKI_BASE_URL=http://$SERVER_ADDR:$PORT
+WIKI_URL=$WIKI_BASE_URL/$WIKI_DIR_NAME
 CURR_DIR=$(pwd)
 TEST_OUTPUT_DIRECTORY=$(pwd)
 TEST_DIRECTORY="$CURR_DIR"/../../../t
@@ -65,7 +66,7 @@ test_check_precond () {
 	GIT_EXEC_PATH=$(cd "$(dirname "$0")" && cd "../.." && pwd)
 	PATH="$GIT_EXEC_PATH"'/bin-wrapper:'"$PATH"
 
-	if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ];
+	if ! test -d "$WIKI_DIR_INST/$WIKI_DIR_NAME"
 	then
 		skip_all='skipping gateway git-mw tests, no mediawiki found'
 		test_done
@@ -279,7 +280,7 @@ start_lighttpd () {
 	"$LIGHTTPD_DIR"/lighttpd -f "$WEB"/lighttpd.conf
 
 	if test $? -ne 0 ; then
-		echo "Could not execute http deamon lighttpd"
+		echo "Could not execute http daemon lighttpd"
 		exit 1
 	fi
 }
@@ -291,27 +292,59 @@ stop_lighttpd () {
 	test -f "$WEB_TMP/pid" && kill $(cat "$WEB_TMP/pid")
 }
 
-# Create the SQLite database of the MediaWiki. If the database file already
-# exists, it will be deleted.
-# This script should be runned from the directory where $FILES_FOLDER is
-# located.
-create_db () {
-	rm -f "$TMP/$DB_FILE"
-
-	echo "Generating the SQLite database file. It can take some time ..."
-	# Run the php script to generate the SQLite database file
-	# with cURL calls.
-	php "$FILES_FOLDER/$DB_INSTALL_SCRIPT" $(basename "$DB_FILE" .sqlite) \
-		"$WIKI_ADMIN" "$WIKI_PASSW" "$TMP" "$PORT"
-
-	if [ ! -f "$TMP/$DB_FILE" ] ; then
-		error "Can't create database file $TMP/$DB_FILE. Try to run ./install-wiki.sh delete first."
+wiki_delete_db () {
+	rm -rf \
+	   "$FILES_FOLDER_DB"/* || error "Couldn't delete $FILES_FOLDER_DB/"
+}
+
+wiki_delete_db_backup () {
+	rm -rf \
+	   "$FILES_FOLDER_POST_INSTALL_DB"/* || error "Couldn't delete $FILES_FOLDER_POST_INSTALL_DB/"
+}
+
+# Install MediaWiki using its install.php script. If the database file
+# already exists, it will be deleted.
+install_mediawiki () {
+
+	localsettings="$WIKI_DIR_INST/$WIKI_DIR_NAME/LocalSettings.php"
+	if test -f "$localsettings"
+	then
+		error "We already installed the wiki, since $localsettings exists" \
+		      "perhaps you wanted to run 'delete' first?"
 	fi
 
-	# Copy the generated database file into the directory the
-	# user indicated.
-	cp "$TMP/$DB_FILE" "$FILES_FOLDER" ||
-		error "Unable to copy $TMP/$DB_FILE to $FILES_FOLDER"
+	wiki_delete_db
+	wiki_delete_db_backup
+	mkdir \
+		"$FILES_FOLDER_DB/" \
+		"$FILES_FOLDER_POST_INSTALL_DB/"
+
+	install_script="$WIKI_DIR_INST/$WIKI_DIR_NAME/maintenance/install.php"
+	echo "Installing MediaWiki using $install_script. This may take some time ..."
+
+	php "$WIKI_DIR_INST/$WIKI_DIR_NAME/maintenance/install.php" \
+	    --server $WIKI_BASE_URL \
+	    --scriptpath /wiki \
+	    --lang en \
+	    --dbtype sqlite \
+	    --dbpath $PWD/$FILES_FOLDER_DB/ \
+	    --pass "$WIKI_PASSW" \
+	    Git-MediaWiki-Test \
+	    "$WIKI_ADMIN" ||
+		error "Couldn't run $install_script, see errors above. Try to run ./install-wiki.sh delete first."
+	cat <<-'EOF' >>$localsettings
+# Custom settings added by test-gitmw-lib.sh
+#
+# Uploading text files is needed for
+# t9363-mw-to-git-export-import.sh
+$wgEnableUploads = true;
+$wgFileExtensions[] = 'txt';
+EOF
+
+	# Copy the initially generated database file into our backup
+	# folder
+	cp -R "$FILES_FOLDER_DB/"* "$FILES_FOLDER_POST_INSTALL_DB/" ||
+		error "Unable to copy $FILES_FOLDER_DB/* to $FILES_FOLDER_POST_INSTALL_DB/*"
 }
 
 # Install a wiki in your web server directory.
@@ -320,30 +353,33 @@ wiki_install () {
 		start_lighttpd
 	fi
 
-	SERVER_ADDR=$SERVER_ADDR:$PORT
 	# In this part, we change directory to $TMP in order to download,
 	# unpack and copy the files of MediaWiki
 	(
 	mkdir -p "$WIKI_DIR_INST/$WIKI_DIR_NAME"
-	if [ ! -d "$WIKI_DIR_INST/$WIKI_DIR_NAME" ] ; then
+	if ! test -d "$WIKI_DIR_INST/$WIKI_DIR_NAME"
+	then
 		error "Folder $WIKI_DIR_INST/$WIKI_DIR_NAME doesn't exist.
 		Please create it and launch the script again."
 	fi
 
-	# Fetch MediaWiki's archive if not already present in the TMP directory
+	# Fetch MediaWiki's archive if not already present in the
+	# download directory
+	mkdir -p "$FILES_FOLDER_DOWNLOAD"
 	MW_FILENAME="mediawiki-$MW_VERSION_MAJOR.$MW_VERSION_MINOR.tar.gz"
-	cd "$TMP"
-	if [ ! -f $MW_FILENAME ] ; then
+	cd "$FILES_FOLDER_DOWNLOAD"
+	if ! test -f $MW_FILENAME
+	then
 		echo "Downloading $MW_VERSION_MAJOR.$MW_VERSION_MINOR sources ..."
 		wget "http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/$MW_FILENAME" ||
 			error "Unable to download "\
 			"http://download.wikimedia.org/mediawiki/$MW_VERSION_MAJOR/"\
 			"$MW_FILENAME. "\
 			"Please fix your connection and launch the script again."
-		echo "$MW_FILENAME downloaded in $(pwd). "\
-			"You can delete it later if you want."
+		echo "$MW_FILENAME downloaded in $(pwd)/;" \
+		     "you can delete it later if you want."
 	else
-		echo "Reusing existing $MW_FILENAME downloaded in $(pwd)."
+		echo "Reusing existing $MW_FILENAME downloaded in $(pwd)/"
 	fi
 	archive_abs_path=$(pwd)/$MW_FILENAME
 	cd "$WIKI_DIR_INST/$WIKI_DIR_NAME/" ||
@@ -352,48 +388,12 @@ wiki_install () {
 		error "Unable to extract WikiMedia's files from $archive_abs_path to "\
 			"$WIKI_DIR_INST/$WIKI_DIR_NAME"
 	) || exit 1
+	echo Extracted in "$WIKI_DIR_INST/$WIKI_DIR_NAME"
 
-	create_db
-
-	# Copy the generic LocalSettings.php in the web server's directory
-	# And modify parameters according to the ones set at the top
-	# of this script.
-	# Note that LocalSettings.php is never modified.
-	if [ ! -f "$FILES_FOLDER/LocalSettings.php" ] ; then
-		error "Can't find $FILES_FOLDER/LocalSettings.php " \
-			"in the current folder. "\
-		"Please run the script inside its folder."
-	fi
-	cp "$FILES_FOLDER/LocalSettings.php" \
-		"$FILES_FOLDER/LocalSettings-tmp.php" ||
-		error "Unable to copy $FILES_FOLDER/LocalSettings.php " \
-		"to $FILES_FOLDER/LocalSettings-tmp.php"
-
-	# Parse and set the LocalSettings file of the user according to the
-	# CONFIGURATION VARIABLES section at the beginning of this script
-	file_swap="$FILES_FOLDER/LocalSettings-swap.php"
-	sed "s,@WG_SCRIPT_PATH@,/$WIKI_DIR_NAME," \
-		"$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap"
-	mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php"
-	sed "s,@WG_SERVER@,http://$SERVER_ADDR," \
-		"$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap"
-	mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php"
-	sed "s,@WG_SQLITE_DATADIR@,$TMP," \
-		"$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap"
-	mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php"
-	sed "s,@WG_SQLITE_DATAFILE@,$( basename $DB_FILE .sqlite)," \
-		"$FILES_FOLDER/LocalSettings-tmp.php" > "$file_swap"
-	mv "$file_swap" "$FILES_FOLDER/LocalSettings-tmp.php"
-
-	mv "$FILES_FOLDER/LocalSettings-tmp.php" \
-		"$WIKI_DIR_INST/$WIKI_DIR_NAME/LocalSettings.php" ||
-		error "Unable to move $FILES_FOLDER/LocalSettings-tmp.php" \
-		"in $WIKI_DIR_INST/$WIKI_DIR_NAME"
-	echo "File $FILES_FOLDER/LocalSettings.php is set in" \
-		" $WIKI_DIR_INST/$WIKI_DIR_NAME"
+	install_mediawiki
 
 	echo "Your wiki has been installed. You can check it at
-		http://$SERVER_ADDR/$WIKI_DIR_NAME"
+		$WIKI_URL"
 }
 
 # Reset the database of the wiki and the password of the admin
@@ -401,12 +401,18 @@ wiki_install () {
 # Warning: This function must be called only in a subdirectory of t/ directory
 wiki_reset () {
 	# Copy initial database of the wiki
-	if [ ! -f "../$FILES_FOLDER/$DB_FILE" ] ; then
-		error "Can't find ../$FILES_FOLDER/$DB_FILE in the current folder."
+	if ! test -d "../$FILES_FOLDER_DB"
+	then
+		error "No wiki database at ../$FILES_FOLDER_DB, not installed yet?"
+	fi
+	if ! test -d "../$FILES_FOLDER_POST_INSTALL_DB"
+	then
+		error "No wiki backup database at ../$FILES_FOLDER_POST_INSTALL_DB, failed installation?"
 	fi
-	cp "../$FILES_FOLDER/$DB_FILE" "$TMP" ||
-		error "Can't copy ../$FILES_FOLDER/$DB_FILE in $TMP"
-	echo "File $FILES_FOLDER/$DB_FILE is set in $TMP"
+	wiki_delete_db
+	cp -R "../$FILES_FOLDER_POST_INSTALL_DB/"* "../$FILES_FOLDER_DB/" ||
+		error "Can't copy ../$FILES_FOLDER_POST_INSTALL_DB/* to ../$FILES_FOLDER_DB/*"
+	echo "File $FILES_FOLDER_DB/* has been reset"
 }
 
 # Delete the wiki created in the web server's directory and all its content
@@ -420,13 +426,7 @@ wiki_delete () {
 		rm -rf "$WIKI_DIR_INST/$WIKI_DIR_NAME" ||
 			error "Wiki's directory $WIKI_DIR_INST/" \
 			"$WIKI_DIR_NAME could not be deleted"
-		# Delete the wiki's SQLite database.
-		rm -f "$TMP/$DB_FILE" ||
-			error "Database $TMP/$DB_FILE could not be deleted."
 	fi
-
-	# Delete the wiki's SQLite database
-	rm -f "$TMP/$DB_FILE" || error "Database $TMP/$DB_FILE could not be deleted."
-	rm -f "$FILES_FOLDER/$DB_FILE"
-	rm -rf "$TMP/mediawiki-$MW_VERSION_MAJOR.$MW_VERSION_MINOR.tar.gz"
+	wiki_delete_db
+	wiki_delete_db_backup
 }
diff --git a/contrib/mw-to-git/t/test-gitmw.pl b/contrib/mw-to-git/t/test-gitmw.pl
index 0ff76259fa..c5d687f078 100755
--- a/contrib/mw-to-git/t/test-gitmw.pl
+++ b/contrib/mw-to-git/t/test-gitmw.pl
@@ -24,9 +24,7 @@
 
 use MediaWiki::API;
 use Getopt::Long;
-use encoding 'utf8';
 use DateTime::Format::ISO8601;
-use open ':encoding(utf8)';
 use constant SLASH_REPLACEMENT => "%2F";
 
 #Parsing of the config file
@@ -87,7 +85,7 @@ sub wiki_getpage {
 	# Replace spaces by underscore in the page name
 	$pagename =~ s/ /_/g;
 	$pagename =~ s/\//%2F/g;
-	open(my $file, ">$destdir/$pagename.mw");
+	open(my $file, ">:encoding(UTF-8)", "$destdir/$pagename.mw");
 	print $file "$content";
 	close ($file);
 
@@ -172,7 +170,7 @@ sub wiki_getallpagename {
 				cmlimit => 500 },
 		)
 		|| die $mw->{error}->{code}.": ".$mw->{error}->{details};
-		open(my $file, ">all.txt");
+		open(my $file, ">:encoding(UTF-8)", "all.txt");
 		foreach my $page (@{$mw_pages}) {
 			print $file "$page->{title}\n";
 		}
@@ -185,7 +183,7 @@ sub wiki_getallpagename {
 				aplimit => 500,
 			})
 		|| die $mw->{error}->{code}.": ".$mw->{error}->{details};
-		open(my $file, ">all.txt");
+		open(my $file, ">:encoding(UTF-8)", "all.txt");
 		foreach my $page (@{$mw_pages}) {
 			print $file "$page->{title}\n";
 		}
@@ -214,12 +212,12 @@ my $fct_to_call = shift;
 
 wiki_login($wiki_admin, $wiki_admin_pass);
 
-my %functions_to_call = qw(
-	upload_file    wiki_upload_file
-	get_page       wiki_getpage
-	delete_page    wiki_delete_page
-	edit_page      wiki_editpage
-	getallpagename wiki_getallpagename
+my %functions_to_call = (
+	upload_file    => \&wiki_upload_file,
+	get_page       => \&wiki_getpage,
+	delete_page    => \&wiki_delete_page,
+	edit_page      => \&wiki_editpage,
+	getallpagename => \&wiki_getallpagename,
 );
 die "$0 ERROR: wrong argument" unless exists $functions_to_call{$fct_to_call};
-&{$functions_to_call{$fct_to_call}}(@ARGV);
+$functions_to_call{$fct_to_call}->(map { utf8::decode($_); $_ } @ARGV);
diff --git a/contrib/mw-to-git/t/test.config b/contrib/mw-to-git/t/test.config
index 5ba0684162..ed10b3e4a4 100644
--- a/contrib/mw-to-git/t/test.config
+++ b/contrib/mw-to-git/t/test.config
@@ -3,15 +3,11 @@ WIKI_DIR_NAME=wiki
 
 # Login and password of the wiki's admin
 WIKI_ADMIN=WikiAdmin
-WIKI_PASSW=AdminPass
+WIKI_PASSW=AdminPass1
 
 # Address of the web server
 SERVER_ADDR=localhost
 
-# SQLite database of the wiki, named DB_FILE, is located in TMP
-TMP=/tmp
-DB_FILE=wikidb.sqlite
-
 # If LIGHTTPD is not set to true, the script will use the default
 # web server running in WIKI_DIR_INST.
 WIKI_DIR_INST=/var/www
@@ -28,10 +24,17 @@ WEB=WEB
 WEB_TMP=$WEB/tmp
 WEB_WWW=$WEB/www
 
+# Where our configuration for the wiki is located
+FILES_FOLDER=mediawiki
+FILES_FOLDER_DOWNLOAD=$FILES_FOLDER/download
+FILES_FOLDER_DB=$FILES_FOLDER/db
+FILES_FOLDER_POST_INSTALL_DB=$FILES_FOLDER/post-install-db
+
 # The variables below are used by the script to install a wiki.
 # You should not modify these unless you are modifying the script itself.
-# tested versions: 1.19.X -> 1.21.1
-MW_VERSION_MAJOR=1.21
-MW_VERSION_MINOR=1
-FILES_FOLDER=install-wiki
-DB_INSTALL_SCRIPT=db_install.php
+# tested versions: 1.19.X -> 1.21.1 -> 1.34.2
+#
+# See https://www.mediawiki.org/wiki/Download for what the latest
+# version is.
+MW_VERSION_MAJOR=1.34
+MW_VERSION_MINOR=2
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 6906aae441..6fa7496bfd 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -25,14 +25,16 @@ ASCIIDOC_HTML    = xhtml11
 ASCIIDOC_DOCBOOK = docbook
 ASCIIDOC_EXTRA   =
 XMLTO            = xmlto
+XMLTO_EXTRA      =
 
 ifdef USE_ASCIIDOCTOR
 ASCIIDOC         = asciidoctor
 ASCIIDOC_CONF    =
 ASCIIDOC_HTML    = xhtml5
-ASCIIDOC_DOCBOOK = docbook45
+ASCIIDOC_DOCBOOK = docbook
 ASCIIDOC_EXTRA  += -I../../Documentation -rasciidoctor-extensions
 ASCIIDOC_EXTRA  += -alitdd='&\#x2d;&\#x2d;'
+XMLTO_EXTRA     += --skip-validation
 endif
 
 ifndef SHELL_PATH
@@ -78,7 +80,7 @@ install-html: $(GIT_SUBTREE_HTML)
 	$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
 
 $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
-	$(XMLTO) -m $(MANPAGE_XSL) man $^
+	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^
 
 $(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
 	$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 868e18b9a1..7f767b5c38 100755
--- a/contrib/subtree/git-subtree.sh
+++ b/contrib/subtree/git-subtree.sh
@@ -4,208 +4,265 @@
 #
 # Copyright (C) 2009 Avery Pennarun <apenwarr@gmail.com>
 #
-if test $# -eq 0
+
+if test -z "$GIT_EXEC_PATH" || ! test -f "$GIT_EXEC_PATH/git-sh-setup" || {
+	test "${PATH#"${GIT_EXEC_PATH}:"}" = "$PATH" &&
+	test ! "$GIT_EXEC_PATH" -ef "${PATH%%:*}" 2>/dev/null
+}
 then
-	set -- -h
+	basename=${0##*[/\\]}
+	echo >&2 'It looks like either your git installation or your'
+	echo >&2 'git-subtree installation is broken.'
+	echo >&2
+	echo >&2 "Tips:"
+	echo >&2 " - If \`git --exec-path\` does not print the correct path to"
+	echo >&2 "   your git install directory, then set the GIT_EXEC_PATH"
+	echo >&2 "   environment variable to the correct directory."
+	echo >&2 " - Make sure that your \`$basename\` file is either in your"
+	echo >&2 "   PATH or in your git exec path (\`$(git --exec-path)\`)."
+	echo >&2 " - You should run git-subtree as \`git ${basename#git-}\`,"
+	echo >&2 "   not as \`$basename\`." >&2
+	exit 126
 fi
+
 OPTS_SPEC="\
 git subtree add   --prefix=<prefix> <commit>
 git subtree add   --prefix=<prefix> <repository> <ref>
 git subtree merge --prefix=<prefix> <commit>
+git subtree split --prefix=<prefix> [<commit>]
 git subtree pull  --prefix=<prefix> <repository> <ref>
-git subtree push  --prefix=<prefix> <repository> <ref>
-git subtree split --prefix=<prefix> <commit>
+git subtree push  --prefix=<prefix> <repository> <refspec>
 --
 h,help        show the help
 q             quiet
 d             show debug messages
 P,prefix=     the name of the subdir to split out
-m,message=    use the given message as the commit message for the merge commit
- options for 'split'
+ options for 'split' (also: 'push')
 annotate=     add a prefix to commit message of new commits
 b,branch=     create a new branch from the split subtree
 ignore-joins  ignore prior --rejoin commits
 onto=         try connecting new tree to an existing one
 rejoin        merge the new branch back into HEAD
- options for 'add', 'merge', and 'pull'
+ options for 'add' and 'merge' (also: 'pull', 'split --rejoin', and 'push --rejoin')
 squash        merge subtree changes as a single commit
+m,message=    use the given message as the commit message for the merge commit
 "
-eval "$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"
-
-PATH=$PATH:$(git --exec-path)
-. git-sh-setup
 
-require_work_tree
-
-quiet=
-branch=
-debug=
-command=
-onto=
-rejoin=
-ignore_joins=
-annotate=
-squash=
-message=
-prefix=
+indent=0
 
+# Usage: debug [MSG...]
 debug () {
-	if test -n "$debug"
-	then
-		printf "%s\n" "$*" >&2
-	fi
-}
-
-say () {
-	if test -z "$quiet"
+	if test -n "$arg_debug"
 	then
-		printf "%s\n" "$*" >&2
+		printf "%$(($indent * 2))s%s\n" '' "$*" >&2
 	fi
 }
 
+# Usage: progress [MSG...]
 progress () {
-	if test -z "$quiet"
+	if test -z "$GIT_QUIET"
 	then
-		printf "%s\r" "$*" >&2
+		if test -z "$arg_debug"
+		then
+			# Debug mode is off.
+			#
+			# Print one progress line that we keep updating (use
+			# "\r" to return to the beginning of the line, rather
+			# than "\n" to start a new line).  This only really
+			# works when stderr is a terminal.
+			printf "%s\r" "$*" >&2
+		else
+			# Debug mode is on.  The `debug` function is regularly
+			# printing to stderr.
+			#
+			# Don't do the one-line-with-"\r" thing, because on a
+			# terminal the debug output would overwrite and hide the
+			# progress output.  Add a "progress:" prefix to make the
+			# progress output and the debug output easy to
+			# distinguish.  This ensures maximum readability whether
+			# stderr is a terminal or a file.
+			printf "progress: %s\n" "$*" >&2
+		fi
 	fi
 }
 
+# Usage: assert CMD...
 assert () {
 	if ! "$@"
 	then
-		die "assertion failed: " "$@"
+		die "assertion failed: $*"
 	fi
 }
 
-ensure_single_rev () {
-	if test $# -ne 1
+main () {
+	if test $# -eq 0
 	then
-		die "You must provide exactly one revision.  Got: '$@'"
+		set -- -h
 	fi
-}
-
-while test $# -gt 0
-do
-	opt="$1"
-	shift
-
-	case "$opt" in
-	-q)
-		quiet=1
-		;;
-	-d)
-		debug=1
-		;;
-	--annotate)
-		annotate="$1"
-		shift
-		;;
-	--no-annotate)
-		annotate=
-		;;
-	-b)
-		branch="$1"
-		shift
-		;;
-	-P)
-		prefix="${1%/}"
+	set_args="$(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)"
+	eval "$set_args"
+	. git-sh-setup
+	require_work_tree
+
+	# First figure out the command and whether we use --rejoin, so
+	# that we can provide more helpful validation when we do the
+	# "real" flag parsing.
+	arg_split_rejoin=
+	allow_split=
+	allow_addmerge=
+	while test $# -gt 0
+	do
+		opt="$1"
 		shift
+		case "$opt" in
+			--annotate|-b|-P|-m|--onto)
+				shift
+				;;
+			--rejoin)
+				arg_split_rejoin=1
+				;;
+			--no-rejoin)
+				arg_split_rejoin=
+				;;
+			--)
+				break
+				;;
+		esac
+	done
+	arg_command=$1
+	case "$arg_command" in
+	add|merge|pull)
+		allow_addmerge=1
 		;;
-	-m)
-		message="$1"
-		shift
+	split|push)
+		allow_split=1
+		allow_addmerge=$arg_split_rejoin
 		;;
-	--no-prefix)
-		prefix=
+	*)
+		die "Unknown command '$arg_command'"
 		;;
-	--onto)
-		onto="$1"
+	esac
+	# Reset the arguments array for "real" flag parsing.
+	eval "$set_args"
+
+	# Begin "real" flag parsing.
+	arg_debug=
+	arg_prefix=
+	arg_split_branch=
+	arg_split_onto=
+	arg_split_ignore_joins=
+	arg_split_annotate=
+	arg_addmerge_squash=
+	arg_addmerge_message=
+	while test $# -gt 0
+	do
+		opt="$1"
 		shift
-		;;
-	--no-onto)
-		onto=
-		;;
-	--rejoin)
-		rejoin=1
-		;;
-	--no-rejoin)
-		rejoin=
-		;;
-	--ignore-joins)
-		ignore_joins=1
-		;;
-	--no-ignore-joins)
-		ignore_joins=
-		;;
-	--squash)
-		squash=1
-		;;
-	--no-squash)
-		squash=
-		;;
-	--)
-		break
+
+		case "$opt" in
+		-q)
+			GIT_QUIET=1
+			;;
+		-d)
+			arg_debug=1
+			;;
+		--annotate)
+			test -n "$allow_split" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			arg_split_annotate="$1"
+			shift
+			;;
+		--no-annotate)
+			test -n "$allow_split" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			arg_split_annotate=
+			;;
+		-b)
+			test -n "$allow_split" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			arg_split_branch="$1"
+			shift
+			;;
+		-P)
+			arg_prefix="${1%/}"
+			shift
+			;;
+		-m)
+			test -n "$allow_addmerge" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			arg_addmerge_message="$1"
+			shift
+			;;
+		--no-prefix)
+			arg_prefix=
+			;;
+		--onto)
+			test -n "$allow_split" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			arg_split_onto="$1"
+			shift
+			;;
+		--no-onto)
+			test -n "$allow_split" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			arg_split_onto=
+			;;
+		--rejoin)
+			test -n "$allow_split" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			;;
+		--no-rejoin)
+			test -n "$allow_split" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			;;
+		--ignore-joins)
+			test -n "$allow_split" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			arg_split_ignore_joins=1
+			;;
+		--no-ignore-joins)
+			test -n "$allow_split" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			arg_split_ignore_joins=
+			;;
+		--squash)
+			test -n "$allow_addmerge" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			arg_addmerge_squash=1
+			;;
+		--no-squash)
+			test -n "$allow_addmerge" || die "The '$opt' flag does not make sense with 'git subtree $arg_command'."
+			arg_addmerge_squash=
+			;;
+		--)
+			break
+			;;
+		*)
+			die "Unexpected option: $opt"
+			;;
+		esac
+	done
+	shift
+
+	if test -z "$arg_prefix"
+	then
+		die "You must provide the --prefix option."
+	fi
+
+	case "$arg_command" in
+	add)
+		test -e "$arg_prefix" &&
+			die "prefix '$arg_prefix' already exists."
 		;;
 	*)
-		die "Unexpected option: $opt"
+		test -e "$arg_prefix" ||
+			die "'$arg_prefix' does not exist; use 'git subtree add'"
 		;;
 	esac
-done
-
-command="$1"
-shift
-
-case "$command" in
-add|merge|pull)
-	default=
-	;;
-split|push)
-	default="--default HEAD"
-	;;
-*)
-	die "Unknown command '$command'"
-	;;
-esac
-
-if test -z "$prefix"
-then
-	die "You must provide the --prefix option."
-fi
 
-case "$command" in
-add)
-	test -e "$prefix" &&
-		die "prefix '$prefix' already exists."
-	;;
-*)
-	test -e "$prefix" ||
-		die "'$prefix' does not exist; use 'git subtree add'"
-	;;
-esac
-
-dir="$(dirname "$prefix/.")"
-
-if test "$command" != "pull" &&
-		test "$command" != "add" &&
-		test "$command" != "push"
-then
-	revs=$(git rev-parse $default --revs-only "$@") || exit $?
-	dirs=$(git rev-parse --no-revs --no-flags "$@") || exit $?
-	ensure_single_rev $revs
-	if test -n "$dirs"
-	then
-		die "Error: Use --prefix instead of bare filenames."
-	fi
-fi
+	dir="$(dirname "$arg_prefix/.")"
+
+	debug "command: {$arg_command}"
+	debug "quiet: {$GIT_QUIET}"
+	debug "dir: {$dir}"
+	debug "opts: {$*}"
+	debug
 
-debug "command: {$command}"
-debug "quiet: {$quiet}"
-debug "revs: {$revs}"
-debug "dir: {$dir}"
-debug "opts: {$*}"
-debug
+	"cmd_$arg_command" "$@"
+}
 
+# Usage: cache_setup
 cache_setup () {
+	assert test $# = 0
 	cachedir="$GIT_DIR/subtree-cache/$$"
 	rm -rf "$cachedir" ||
 		die "Can't delete old cachedir: $cachedir"
@@ -216,6 +273,7 @@ cache_setup () {
 	debug "Using cachedir: $cachedir" >&2
 }
 
+# Usage: cache_get [REVS...]
 cache_get () {
 	for oldrev in "$@"
 	do
@@ -227,6 +285,7 @@ cache_get () {
 	done
 }
 
+# Usage: cache_miss [REVS...]
 cache_miss () {
 	for oldrev in "$@"
 	do
@@ -237,24 +296,30 @@ cache_miss () {
 	done
 }
 
+# Usage: check_parents PARENTS_EXPR
 check_parents () {
-	missed=$(cache_miss "$1")
-	local indent=$(($2 + 1))
+	assert test $# = 1
+	missed=$(cache_miss "$1") || exit $?
+	local indent=$(($indent + 1))
 	for miss in $missed
 	do
 		if ! test -r "$cachedir/notree/$miss"
 		then
-			debug "  incorrect order: $miss"
-			process_split_commit "$miss" "" "$indent"
+			debug "incorrect order: $miss"
+			process_split_commit "$miss" ""
 		fi
 	done
 }
 
+# Usage: set_notree REV
 set_notree () {
+	assert test $# = 1
 	echo "1" > "$cachedir/notree/$1"
 }
 
+# Usage: cache_set OLDREV NEWREV
 cache_set () {
+	assert test $# = 2
 	oldrev="$1"
 	newrev="$2"
 	if test "$oldrev" != "latest_old" &&
@@ -266,7 +331,9 @@ cache_set () {
 	echo "$newrev" >"$cachedir/$oldrev"
 }
 
+# Usage: rev_exists REV
 rev_exists () {
+	assert test $# = 1
 	if git rev-parse "$1" >/dev/null 2>&1
 	then
 		return 0
@@ -275,32 +342,25 @@ rev_exists () {
 	fi
 }
 
-rev_is_descendant_of_branch () {
-	newrev="$1"
-	branch="$2"
-	branch_hash=$(git rev-parse "$branch")
-	match=$(git rev-list -1 "$branch_hash" "^$newrev")
-
-	if test -z "$match"
-	then
-		return 0
-	else
-		return 1
-	fi
-}
-
-# if a commit doesn't have a parent, this might not work.  But we only want
+# Usage: try_remove_previous REV
+#
+# If a commit doesn't have a parent, this might not work.  But we only want
 # to remove the parent from the rev-list, and since it doesn't exist, it won't
 # be there anyway, so do nothing in that case.
 try_remove_previous () {
+	assert test $# = 1
 	if rev_exists "$1^"
 	then
 		echo "^$1^"
 	fi
 }
 
+# Usage: find_latest_squash DIR
 find_latest_squash () {
+	assert test $# = 1
 	debug "Looking for latest squash ($dir)..."
+	local indent=$(($indent + 1))
+
 	dir="$1"
 	sq=
 	main=
@@ -319,7 +379,7 @@ find_latest_squash () {
 			main="$b"
 			;;
 		git-subtree-split:)
-			sub="$(git rev-parse "$b^0")" ||
+			sub="$(git rev-parse "$b^{commit}")" ||
 			die "could not rev-parse split hash $b from commit $sq"
 			;;
 		END)
@@ -329,7 +389,8 @@ find_latest_squash () {
 				then
 					# a rejoin commit?
 					# Pretend its sub was a squash.
-					sq="$sub"
+					sq=$(git rev-parse --verify "$sq^2") ||
+						die
 				fi
 				debug "Squash found: $sq $sub"
 				echo "$sq" "$sub"
@@ -340,22 +401,26 @@ find_latest_squash () {
 			sub=
 			;;
 		esac
-	done
+	done || exit $?
 }
 
+# Usage: find_existing_splits DIR REV
 find_existing_splits () {
+	assert test $# = 2
 	debug "Looking for prior splits..."
+	local indent=$(($indent + 1))
+
 	dir="$1"
-	revs="$2"
+	rev="$2"
 	main=
 	sub=
 	local grep_format="^git-subtree-dir: $dir/*\$"
-	if test -n "$ignore_joins"
+	if test -n "$arg_split_ignore_joins"
 	then
 		grep_format="^Add '$dir/' from commit '"
 	fi
 	git log --grep="$grep_format" \
-		--no-show-signature --pretty=format:'START %H%n%s%n%n%b%nEND%n' $revs |
+		--no-show-signature --pretty=format:'START %H%n%s%n%n%b%nEND%n' "$rev" |
 	while read a b junk
 	do
 		case "$a" in
@@ -366,11 +431,11 @@ find_existing_splits () {
 			main="$b"
 			;;
 		git-subtree-split:)
-			sub="$(git rev-parse "$b^0")" ||
+			sub="$(git rev-parse "$b^{commit}")" ||
 			die "could not rev-parse split hash $b from commit $sq"
 			;;
 		END)
-			debug "  Main is: '$main'"
+			debug "Main is: '$main'"
 			if test -z "$main" -a -n "$sub"
 			then
 				# squash commits refer to a subtree
@@ -389,10 +454,12 @@ find_existing_splits () {
 			sub=
 			;;
 		esac
-	done
+	done || exit $?
 }
 
+# Usage: copy_commit REV TREE FLAGS_STR
 copy_commit () {
+	assert test $# = 3
 	# We're going to set some environment vars here, so
 	# do it in a subshell to get rid of them safely later
 	debug copy_commit "{$1}" "{$2}" "{$3}"
@@ -411,23 +478,32 @@ copy_commit () {
 			GIT_COMMITTER_EMAIL \
 			GIT_COMMITTER_DATE
 		(
-			printf "%s" "$annotate"
+			printf "%s" "$arg_split_annotate"
 			cat
 		) |
 		git commit-tree "$2" $3  # reads the rest of stdin
 	) || die "Can't copy commit $1"
 }
 
+# Usage: add_msg DIR LATEST_OLD LATEST_NEW
 add_msg () {
+	assert test $# = 3
 	dir="$1"
 	latest_old="$2"
 	latest_new="$3"
-	if test -n "$message"
+	if test -n "$arg_addmerge_message"
 	then
-		commit_message="$message"
+		commit_message="$arg_addmerge_message"
 	else
 		commit_message="Add '$dir/' from commit '$latest_new'"
 	fi
+	if test -n "$arg_split_rejoin"
+	then
+		# If this is from a --rejoin, then rejoin_msg has
+		# already inserted the `git-subtree-xxx:` tags
+		echo "$commit_message"
+		return
+	fi
 	cat <<-EOF
 		$commit_message
 
@@ -437,22 +513,26 @@ add_msg () {
 	EOF
 }
 
+# Usage: add_squashed_msg REV DIR
 add_squashed_msg () {
-	if test -n "$message"
+	assert test $# = 2
+	if test -n "$arg_addmerge_message"
 	then
-		echo "$message"
+		echo "$arg_addmerge_message"
 	else
 		echo "Merge commit '$1' as '$2'"
 	fi
 }
 
+# Usage: rejoin_msg DIR LATEST_OLD LATEST_NEW
 rejoin_msg () {
+	assert test $# = 3
 	dir="$1"
 	latest_old="$2"
 	latest_new="$3"
-	if test -n "$message"
+	if test -n "$arg_addmerge_message"
 	then
-		commit_message="$message"
+		commit_message="$arg_addmerge_message"
 	else
 		commit_message="Split '$dir/' into commit '$latest_new'"
 	fi
@@ -465,7 +545,9 @@ rejoin_msg () {
 	EOF
 }
 
+# Usage: squash_msg DIR OLD_SUBTREE_COMMIT NEW_SUBTREE_COMMIT
 squash_msg () {
+	assert test $# = 3
 	dir="$1"
 	oldsub="$2"
 	newsub="$3"
@@ -487,12 +569,16 @@ squash_msg () {
 	echo "git-subtree-split: $newsub"
 }
 
+# Usage: toptree_for_commit COMMIT
 toptree_for_commit () {
+	assert test $# = 1
 	commit="$1"
 	git rev-parse --verify "$commit^{tree}" || exit $?
 }
 
+# Usage: subtree_for_commit COMMIT DIR
 subtree_for_commit () {
+	assert test $# = 2
 	commit="$1"
 	dir="$2"
 	git ls-tree "$commit" -- "$dir" |
@@ -503,17 +589,19 @@ subtree_for_commit () {
 		test "$type" = "commit" && continue  # ignore submodules
 		echo $tree
 		break
-	done
+	done || exit $?
 }
 
+# Usage: tree_changed TREE [PARENTS...]
 tree_changed () {
+	assert test $# -gt 0
 	tree=$1
 	shift
 	if test $# -ne 1
 	then
 		return 0   # weird parents, consider it changed
 	else
-		ptree=$(toptree_for_commit $1)
+		ptree=$(toptree_for_commit $1) || exit $?
 		if test "$ptree" != "$tree"
 		then
 			return 0   # changed
@@ -523,7 +611,9 @@ tree_changed () {
 	fi
 }
 
+# Usage: new_squash_commit OLD_SQUASHED_COMMIT OLD_NONSQUASHED_COMMIT NEW_NONSQUASHED_COMMIT
 new_squash_commit () {
+	assert test $# = 3
 	old="$1"
 	oldsub="$2"
 	newsub="$3"
@@ -538,7 +628,9 @@ new_squash_commit () {
 	fi
 }
 
+# Usage: copy_or_skip REV TREE NEWPARENTS
 copy_or_skip () {
+	assert test $# = 3
 	rev="$1"
 	tree="$2"
 	newparents="$3"
@@ -613,7 +705,9 @@ copy_or_skip () {
 	fi
 }
 
+# Usage: ensure_clean
 ensure_clean () {
+	assert test $# = 0
 	if ! git diff-index HEAD --exit-code --quiet 2>&1
 	then
 		die "Working tree has modifications.  Cannot add."
@@ -624,15 +718,18 @@ ensure_clean () {
 	fi
 }
 
+# Usage: ensure_valid_ref_format REF
 ensure_valid_ref_format () {
+	assert test $# = 1
 	git check-ref-format "refs/heads/$1" ||
 		die "'$1' does not look like a ref"
 }
 
+# Usage: process_split_commit REV PARENTS
 process_split_commit () {
+	assert test $# = 2
 	local rev="$1"
 	local parents="$2"
-	local indent=$3
 
 	if test $indent -eq 0
 	then
@@ -647,20 +744,21 @@ process_split_commit () {
 	progress "$revcount/$revmax ($createcount) [$extracount]"
 
 	debug "Processing commit: $rev"
-	exists=$(cache_get "$rev")
+	local indent=$(($indent + 1))
+	exists=$(cache_get "$rev") || exit $?
 	if test -n "$exists"
 	then
-		debug "  prior: $exists"
+		debug "prior: $exists"
 		return
 	fi
 	createcount=$(($createcount + 1))
-	debug "  parents: $parents"
-	check_parents "$parents" "$indent"
-	newparents=$(cache_get $parents)
-	debug "  newparents: $newparents"
+	debug "parents: $parents"
+	check_parents "$parents"
+	newparents=$(cache_get $parents) || exit $?
+	debug "newparents: $newparents"
 
-	tree=$(subtree_for_commit "$rev" "$dir")
-	debug "  tree is: $tree"
+	tree=$(subtree_for_commit "$rev" "$dir") || exit $?
+	debug "tree is: $tree"
 
 	# ugly.  is there no better way to tell if this is a subtree
 	# vs. a mainline commit?  Does it matter?
@@ -675,17 +773,15 @@ process_split_commit () {
 	fi
 
 	newrev=$(copy_or_skip "$rev" "$tree" "$newparents") || exit $?
-	debug "  newrev is: $newrev"
+	debug "newrev is: $newrev"
 	cache_set "$rev" "$newrev"
 	cache_set latest_new "$newrev"
 	cache_set latest_old "$rev"
 }
 
+# Usage: cmd_add REV
+#    Or: cmd_add REPOSITORY REF
 cmd_add () {
-	if test -e "$dir"
-	then
-		die "'$dir' already exists.  Cannot add."
-	fi
 
 	ensure_clean
 
@@ -707,27 +803,35 @@ cmd_add () {
 
 		cmd_add_repository "$@"
 	else
-		say "error: parameters were '$@'"
+		say >&2 "error: parameters were '$*'"
 		die "Provide either a commit or a repository and commit."
 	fi
 }
 
+# Usage: cmd_add_repository REPOSITORY REFSPEC
 cmd_add_repository () {
+	assert test $# = 2
 	echo "git fetch" "$@"
 	repository=$1
 	refspec=$2
 	git fetch "$@" || exit $?
-	revs=FETCH_HEAD
-	set -- $revs
-	cmd_add_commit "$@"
+	cmd_add_commit FETCH_HEAD
 }
 
+# Usage: cmd_add_commit REV
 cmd_add_commit () {
-	rev=$(git rev-parse $default --revs-only "$@") || exit $?
-	ensure_single_rev $rev
+	# The rev has already been validated by cmd_add(), we just
+	# need to normalize it.
+	assert test $# = 1
+	rev=$(git rev-parse --verify "$1^{commit}") || exit $?
 
 	debug "Adding $dir as '$rev'..."
-	git read-tree --prefix="$dir" $rev || exit $?
+	if test -z "$arg_split_rejoin"
+	then
+		# Only bother doing this if this is a genuine 'add',
+		# not a synthetic 'add' from '--rejoin'.
+		git read-tree --prefix="$dir" $rev || exit $?
+	fi
 	git checkout -- "$dir" || exit $?
 	tree=$(git write-tree) || exit $?
 
@@ -739,44 +843,61 @@ cmd_add_commit () {
 		headp=
 	fi
 
-	if test -n "$squash"
+	if test -n "$arg_addmerge_squash"
 	then
 		rev=$(new_squash_commit "" "" "$rev") || exit $?
 		commit=$(add_squashed_msg "$rev" "$dir" |
 			git commit-tree "$tree" $headp -p "$rev") || exit $?
 	else
-		revp=$(peel_committish "$rev") &&
+		revp=$(peel_committish "$rev") || exit $?
 		commit=$(add_msg "$dir" $headrev "$rev" |
 			git commit-tree "$tree" $headp -p "$revp") || exit $?
 	fi
 	git reset "$commit" || exit $?
 
-	say "Added dir '$dir'"
+	say >&2 "Added dir '$dir'"
 }
 
+# Usage: cmd_split [REV]
 cmd_split () {
+	if test $# -eq 0
+	then
+		rev=$(git rev-parse HEAD)
+	elif test $# -eq 1
+	then
+		rev=$(git rev-parse -q --verify "$1^{commit}") ||
+			die "'$1' does not refer to a commit"
+	else
+		die "You must provide exactly one revision.  Got: '$*'"
+	fi
+
+	if test -n "$arg_split_rejoin"
+	then
+		ensure_clean
+	fi
+
 	debug "Splitting $dir..."
 	cache_setup || exit $?
 
-	if test -n "$onto"
+	if test -n "$arg_split_onto"
 	then
-		debug "Reading history for --onto=$onto..."
-		git rev-list $onto |
+		debug "Reading history for --onto=$arg_split_onto..."
+		git rev-list $arg_split_onto |
 		while read rev
 		do
 			# the 'onto' history is already just the subdir, so
 			# any parent we find there can be used verbatim
-			debug "  cache: $rev"
+			debug "cache: $rev"
 			cache_set "$rev" "$rev"
-		done
+		done || exit $?
 	fi
 
-	unrevs="$(find_existing_splits "$dir" "$revs")"
+	unrevs="$(find_existing_splits "$dir" "$rev")" || exit $?
 
 	# We can't restrict rev-list to only $dir here, because some of our
 	# parents have the $dir contents the root, and those won't match.
 	# (and rev-list --follow doesn't seem to solve this)
-	grl='git rev-list --topo-order --reverse --parents $revs $unrevs'
+	grl='git rev-list --topo-order --reverse --parents $rev $unrevs'
 	revmax=$(eval "$grl" | wc -l)
 	revcount=0
 	createcount=0
@@ -784,52 +905,58 @@ cmd_split () {
 	eval "$grl" |
 	while read rev parents
 	do
-		process_split_commit "$rev" "$parents" 0
+		process_split_commit "$rev" "$parents"
 	done || exit $?
 
-	latest_new=$(cache_get latest_new)
+	latest_new=$(cache_get latest_new) || exit $?
 	if test -z "$latest_new"
 	then
 		die "No new revisions were found"
 	fi
 
-	if test -n "$rejoin"
+	if test -n "$arg_split_rejoin"
 	then
 		debug "Merging split branch into HEAD..."
-		latest_old=$(cache_get latest_old)
-		git merge -s ours \
-			--allow-unrelated-histories \
-			-m "$(rejoin_msg "$dir" "$latest_old" "$latest_new")" \
-			"$latest_new" >&2 || exit $?
+		latest_old=$(cache_get latest_old) || exit $?
+		arg_addmerge_message="$(rejoin_msg "$dir" "$latest_old" "$latest_new")" || exit $?
+		if test -z "$(find_latest_squash "$dir")"
+		then
+			cmd_add "$latest_new" >&2 || exit $?
+		else
+			cmd_merge "$latest_new" >&2 || exit $?
+		fi
 	fi
-	if test -n "$branch"
+	if test -n "$arg_split_branch"
 	then
-		if rev_exists "refs/heads/$branch"
+		if rev_exists "refs/heads/$arg_split_branch"
 		then
-			if ! rev_is_descendant_of_branch "$latest_new" "$branch"
+			if ! git merge-base --is-ancestor "$arg_split_branch" "$latest_new"
 			then
-				die "Branch '$branch' is not an ancestor of commit '$latest_new'."
+				die "Branch '$arg_split_branch' is not an ancestor of commit '$latest_new'."
 			fi
 			action='Updated'
 		else
 			action='Created'
 		fi
 		git update-ref -m 'subtree split' \
-			"refs/heads/$branch" "$latest_new" || exit $?
-		say "$action branch '$branch'"
+			"refs/heads/$arg_split_branch" "$latest_new" || exit $?
+		say >&2 "$action branch '$arg_split_branch'"
 	fi
 	echo "$latest_new"
 	exit 0
 }
 
+# Usage: cmd_merge REV
 cmd_merge () {
-	rev=$(git rev-parse $default --revs-only "$@") || exit $?
-	ensure_single_rev $rev
+	test $# -eq 1 ||
+		die "You must provide exactly one revision.  Got: '$*'"
+	rev=$(git rev-parse -q --verify "$1^{commit}") ||
+		die "'$1' does not refer to a commit"
 	ensure_clean
 
-	if test -n "$squash"
+	if test -n "$arg_addmerge_squash"
 	then
-		first_split="$(find_latest_squash "$dir")"
+		first_split="$(find_latest_squash "$dir")" || exit $?
 		if test -z "$first_split"
 		then
 			die "Can't squash-merge: '$dir' was never added."
@@ -839,7 +966,7 @@ cmd_merge () {
 		sub=$2
 		if test "$sub" = "$rev"
 		then
-			say "Subtree is already at commit $rev."
+			say >&2 "Subtree is already at commit $rev."
 			exit 0
 		fi
 		new=$(new_squash_commit "$old" "$sub" "$rev") || exit $?
@@ -847,26 +974,16 @@ cmd_merge () {
 		rev="$new"
 	fi
 
-	version=$(git version)
-	if test "$version" \< "git version 1.7"
+	if test -n "$arg_addmerge_message"
 	then
-		if test -n "$message"
-		then
-			git merge -s subtree --message="$message" "$rev"
-		else
-			git merge -s subtree "$rev"
-		fi
+		git merge -Xsubtree="$arg_prefix" \
+			--message="$arg_addmerge_message" "$rev"
 	else
-		if test -n "$message"
-		then
-			git merge -Xsubtree="$prefix" \
-				--message="$message" "$rev"
-		else
-			git merge -Xsubtree="$prefix" $rev
-		fi
+		git merge -Xsubtree="$arg_prefix" $rev
 	fi
 }
 
+# Usage: cmd_pull REPOSITORY REMOTEREF
 cmd_pull () {
 	if test $# -ne 2
 	then
@@ -875,27 +992,36 @@ cmd_pull () {
 	ensure_clean
 	ensure_valid_ref_format "$2"
 	git fetch "$@" || exit $?
-	revs=FETCH_HEAD
-	set -- $revs
-	cmd_merge "$@"
+	cmd_merge FETCH_HEAD
 }
 
+# Usage: cmd_push REPOSITORY [+][LOCALREV:]REMOTEREF
 cmd_push () {
 	if test $# -ne 2
 	then
-		die "You must provide <repository> <ref>"
+		die "You must provide <repository> <refspec>"
 	fi
-	ensure_valid_ref_format "$2"
 	if test -e "$dir"
 	then
 		repository=$1
-		refspec=$2
+		refspec=${2#+}
+		remoteref=${refspec#*:}
+		if test "$remoteref" = "$refspec"
+		then
+			localrevname_presplit=HEAD
+		else
+			localrevname_presplit=${refspec%%:*}
+		fi
+		ensure_valid_ref_format "$remoteref"
+		localrev_presplit=$(git rev-parse -q --verify "$localrevname_presplit^{commit}") ||
+			die "'$localrevname_presplit' does not refer to a commit"
+
 		echo "git push using: " "$repository" "$refspec"
-		localrev=$(git subtree split --prefix="$prefix") || die
-		git push "$repository" "$localrev":"refs/heads/$refspec"
+		localrev=$(cmd_split "$localrev_presplit") || die
+		git push "$repository" "$localrev":"refs/heads/$remoteref"
 	else
 		die "'$dir' must already exist. Try 'git subtree add'."
 	fi
 }
 
-"cmd_$command" "$@"
+main "$@"
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 352deda69d..9cddfa2654 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -9,13 +9,14 @@ git-subtree - Merge subtrees together and split repository into subtrees
 SYNOPSIS
 --------
 [verse]
-'git subtree' add   -P <prefix> <commit>
-'git subtree' add   -P <prefix> <repository> <ref>
-'git subtree' pull  -P <prefix> <repository> <ref>
-'git subtree' push  -P <prefix> <repository> <ref>
-'git subtree' merge -P <prefix> <commit>
-'git subtree' split -P <prefix> [OPTIONS] [<commit>]
+'git subtree' [<options>] -P <prefix> add <local-commit>
+'git subtree' [<options>] -P <prefix> add <repository> <remote-ref>
+'git subtree' [<options>] -P <prefix> merge <local-commit>
+'git subtree' [<options>] -P <prefix> split [<local-commit>]
 
+[verse]
+'git subtree' [<options>] -P <prefix> pull <repository> <remote-ref>
+'git subtree' [<options>] -P <prefix> push <repository> <refspec>
 
 DESCRIPTION
 -----------
@@ -28,7 +29,7 @@ as a subdirectory of your application.
 
 Subtrees are not to be confused with submodules, which are meant for
 the same task. Unlike submodules, subtrees do not need any special
-constructions (like .gitmodules files or gitlinks) be present in
+constructions (like '.gitmodules' files or gitlinks) be present in
 your repository, and do not force end-users of your
 repository to do anything special or to understand how subtrees
 work. A subtree is just a subdirectory that can be
@@ -59,70 +60,71 @@ project as much as possible.  That is, if you make a change that
 affects both the library and the main application, commit it in
 two pieces.  That way, when you split the library commits out
 later, their descriptions will still make sense.  But if this
-isn't important to you, it's not *necessary*.  git subtree will
+isn't important to you, it's not *necessary*.  'git subtree' will
 simply leave out the non-library-related parts of the commit
 when it splits it out into the subproject later.
 
 
 COMMANDS
 --------
-add::
+add <local-commit>::
+add <repository> <remote-ref>::
 	Create the <prefix> subtree by importing its contents
-	from the given <commit> or <repository> and remote <ref>.
+	from the given <local-commit> or <repository> and <remote-ref>.
 	A new commit is created	automatically, joining the imported
-	project's history with your own.  With '--squash', imports
+	project's history with your own.  With '--squash', import
 	only a single commit from the subproject, rather than its
 	entire history.
 
-merge::
-	Merge recent changes up to <commit> into the <prefix>
+merge <local-commit>::
+	Merge recent changes up to <local-commit> into the <prefix>
 	subtree.  As with normal 'git merge', this doesn't
 	remove your own local changes; it just merges those
-	changes into the latest <commit>.  With '--squash',
-	creates only one commit that contains all the changes,
+	changes into the latest <local-commit>.  With '--squash',
+	create only one commit that contains all the changes,
 	rather than merging in the entire history.
 +
 If you use '--squash', the merge direction doesn't always have to be
 forward; you can use this command to go back in time from v2.5 to v2.4,
 for example.  If your merge introduces a conflict, you can resolve it in
 the usual ways.
-	
-pull::
-	Exactly like 'merge', but parallels 'git pull' in that
-	it fetches the given ref from the specified remote
-	repository.
-	
-push::
-	Does a 'split' (see below) using the <prefix> supplied
-	and then does a 'git push' to push the result to the 
-	repository and ref. This can be used to push your
-	subtree to different branches of the remote repository.
-
-split::
+
+split [<local-commit>]::
 	Extract a new, synthetic project history from the
-	history of the <prefix> subtree.  The new history
+	history of the <prefix> subtree of <local-commit>, or of
+	HEAD if no <local-commit> is given.  The new history
 	includes only the commits (including merges) that
 	affected <prefix>, and each of those commits now has the
 	contents of <prefix> at the root of the project instead
 	of in a subdirectory.  Thus, the newly created history
 	is suitable for export as a separate git repository.
 +
-After splitting successfully, a single commit id is printed to stdout.
+After splitting successfully, a single commit ID is printed to stdout.
 This corresponds to the HEAD of the newly created tree, which you can
 manipulate however you want.
 +
 Repeated splits of exactly the same history are guaranteed to be
-identical (i.e. to produce the same commit ids).  Because of this, if
-you add new commits and then re-split, the new commits will be attached
-as commits on top of the history you generated last time, so 'git merge'
-and friends will work as expected.
-+
-Note that if you use '--squash' when you merge, you should usually not
-just '--rejoin' when you split.
+identical (i.e. to produce the same commit IDs) as long as the
+settings passed to 'split' (such as '--annotate') are the same.
+Because of this, if you add new commits and then re-split, the new
+commits will be attached as commits on top of the history you
+generated last time, so 'git merge' and friends will work as expected.
+
+pull <repository> <remote-ref>::
+	Exactly like 'merge', but parallels 'git pull' in that
+	it fetches the given ref from the specified remote
+	repository.
 
+push <repository> [+][<local-commit>:]<remote-ref>::
+	Does a 'split' using the <prefix> subtree of <local-commit>
+	and then does a 'git push' to push the result to the
+	<repository> and <remote-ref>.  This can be used to push your
+	subtree to different branches of the remote repository.  Just
+	as with 'split', if no <local-commit> is given, then HEAD is
+	used.  The optional leading '+' is ignored.
 
-OPTIONS
--------
+OPTIONS FOR ALL COMMANDS
+------------------------
 -q::
 --quiet::
 	Suppress unnecessary output messages on stderr.
@@ -137,21 +139,16 @@ OPTIONS
 	want to manipulate.  This option is mandatory
 	for all commands.
 
--m <message>::
---message=<message>::
-	This option is only valid for add, merge and pull (unsure).
-	Specify <message> as the commit message for the merge commit.
-
+OPTIONS FOR 'add' AND 'merge' (ALSO: 'pull', 'split --rejoin', AND 'push --rejoin')
+-----------------------------------------------------------------------------------
+These options for 'add' and 'merge' may also be given to 'pull' (which
+wraps 'merge'), 'split --rejoin' (which wraps either 'add' or 'merge'
+as appropriate), and 'push --rejoin' (which wraps 'split --rejoin').
 
-OPTIONS FOR add, merge, push, pull
-----------------------------------
 --squash::
-	This option is only valid for add, merge, and pull
-	commands.
-+
-Instead of merging the entire history from the subtree project, produce
-only a single commit that contains all the differences you want to
-merge, and then merge that new commit into your project.
+	Instead of merging the entire history from the subtree project, produce
+	only a single commit that contains all the differences you want to
+	merge, and then merge that new commit into your project.
 +
 Using this option helps to reduce log clutter. People rarely want to see
 every change that happened between v1.0 and v1.1 of the library they're
@@ -174,57 +171,53 @@ Whether or not you use '--squash', changes made in your local repository
 remain intact and can be later split and send upstream to the
 subproject.
 
+-m <message>::
+--message=<message>::
+	Specify <message> as the commit message for the merge commit.
+
+OPTIONS FOR 'split' (ALSO: 'push')
+----------------------------------
+These options for 'split' may also be given to 'push' (which wraps
+'split').
 
-OPTIONS FOR split
------------------
 --annotate=<annotation>::
-	This option is only valid for the split command.
-+
-When generating synthetic history, add <annotation> as a prefix to each
-commit message.  Since we're creating new commits with the same commit
-message, but possibly different content, from the original commits, this
-can help to differentiate them and avoid confusion.
+	When generating synthetic history, add <annotation> as a prefix to each
+	commit message.  Since we're creating new commits with the same commit
+	message, but possibly different content, from the original commits, this
+	can help to differentiate them and avoid confusion.
 +
 Whenever you split, you need to use the same <annotation>, or else you
 don't have a guarantee that the new re-created history will be identical
 to the old one.  That will prevent merging from working correctly.  git
-subtree tries to make it work anyway, particularly if you use --rejoin,
+subtree tries to make it work anyway, particularly if you use '--rejoin',
 but it may not always be effective.
 
 -b <branch>::
 --branch=<branch>::
-	This option is only valid for the split command.
-+
-After generating the synthetic history, create a new branch called
-<branch> that contains the new history.  This is suitable for immediate
-pushing upstream.  <branch> must not already exist.
+	After generating the synthetic history, create a new branch called
+	<branch> that contains the new history.  This is suitable for immediate
+	pushing upstream.  <branch> must not already exist.
 
 --ignore-joins::
-	This option is only valid for the split command.
-+
-If you use '--rejoin', git subtree attempts to optimize its history
-reconstruction to generate only the new commits since the last
-'--rejoin'.  '--ignore-join' disables this behaviour, forcing it to
-regenerate the entire history.  In a large project, this can take a long
-time.
+	If you use '--rejoin', git subtree attempts to optimize its history
+	reconstruction to generate only the new commits since the last
+	'--rejoin'.  '--ignore-joins' disables this behavior, forcing it to
+	regenerate the entire history.  In a large project, this can take a long
+	time.
 
 --onto=<onto>::
-	This option is only valid for the split command.
-+
-If your subtree was originally imported using something other than git
-subtree, its history may not match what git subtree is expecting.  In
-that case, you can specify the commit id <onto> that corresponds to the
-first revision of the subproject's history that was imported into your
-project, and git subtree will attempt to build its history from there.
+	If your subtree was originally imported using something other than git
+	subtree, its history may not match what git subtree is expecting.  In
+	that case, you can specify the commit ID <onto> that corresponds to the
+	first revision of the subproject's history that was imported into your
+	project, and git subtree will attempt to build its history from there.
 +
 If you used 'git subtree add', you should never need this option.
 
 --rejoin::
-	This option is only valid for the split command.
-+
-After splitting, merge the newly created synthetic history back into
-your main project.  That way, future splits can search only the part of
-history that has been added since the most recent --rejoin.
+	After splitting, merge the newly created synthetic history back into
+	your main project.  That way, future splits can search only the part of
+	history that has been added since the most recent '--rejoin'.
 +
 If your split commits end up merged into the upstream subproject, and
 then you want to get the latest upstream version, this will allow git's
@@ -235,13 +228,12 @@ Unfortunately, using this option results in 'git log' showing an extra
 copy of every new commit that was created (the original, and the
 synthetic one).
 +
-If you do all your merges with '--squash', don't use '--rejoin' when you
-split, because you don't want the subproject's history to be part of
-your project anyway.
+If you do all your merges with '--squash', make sure you also use
+'--squash' when you 'split --rejoin'.
 
 
-EXAMPLE 1. Add command
-----------------------
+EXAMPLE 1. 'add' command
+------------------------
 Let's assume that you have a local repository that you would like
 to add an external vendor library to. In this case we will add the
 git-subtree repository as a subdirectory of your already existing
@@ -253,15 +245,15 @@ git-extensions repository in ~/git-extensions/:
 'master' needs to be a valid remote ref and can be a different branch
 name
 
-You can omit the --squash flag, but doing so will increase the number
+You can omit the '--squash' flag, but doing so will increase the number
 of commits that are included in your local repository.
 
 We now have a ~/git-extensions/git-subtree directory containing code
 from the master branch of git://github.com/apenwarr/git-subtree.git
 in our git-extensions repository.
 
-EXAMPLE 2. Extract a subtree using commit, merge and pull
----------------------------------------------------------
+EXAMPLE 2. Extract a subtree using 'commit', 'merge' and 'pull'
+---------------------------------------------------------------
 Let's use the repository for the git source code as an example.
 First, get your own copy of the git.git repository:
 
@@ -269,7 +261,7 @@ First, get your own copy of the git.git repository:
 	$ cd test-git
 
 gitweb (commit 1130ef3) was merged into git as of commit
-0a8f4f0, after which it was no longer maintained separately. 
+0a8f4f0, after which it was no longer maintained separately.
 But imagine it had been maintained separately, and we wanted to
 extract git's changes to gitweb since that time, to share with
 the upstream.  You could do this:
@@ -279,14 +271,14 @@ the upstream.  You could do this:
         	--branch gitweb-latest
         $ gitk gitweb-latest
         $ git push git@github.com:whatever/gitweb.git gitweb-latest:master
-        
+
 (We use '0a8f4f0^..' because that means "all the changes from
 0a8f4f0 to the current version, including 0a8f4f0 itself.")
 
 If gitweb had originally been merged using 'git subtree add' (or
-a previous split had already been done with --rejoin specified)
+a previous split had already been done with '--rejoin' specified)
 then you can do all your splits without having to remember any
-weird commit ids:
+weird commit IDs:
 
 	$ git subtree split --prefix=gitweb --annotate='(split) ' --rejoin \
 		--branch gitweb-latest2
@@ -313,7 +305,7 @@ And fast forward again:
 	$ git subtree merge --prefix=gitweb --squash gitweb-latest
 
 And notice that your change is still intact:
-	
+
 	$ ls -l gitweb/myfile
 
 And you can split it out and look at your changes versus
@@ -321,8 +313,8 @@ the standard gitweb:
 
 	git log gitweb-latest..$(git subtree split --prefix=gitweb)
 
-EXAMPLE 3. Extract a subtree using branch
------------------------------------------
+EXAMPLE 3. Extract a subtree using a branch
+-------------------------------------------
 Suppose you have a source directory with many files and
 subdirectories, and you want to extract the lib directory to its own
 git project. Here's a short way to do it:
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 57ff4b25c1..4153b65321 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -5,72 +5,24 @@
 #
 test_description='Basic porcelain support for subtrees
 
-This test verifies the basic operation of the add, pull, merge
-and split subcommands of git subtree.
+This test verifies the basic operation of the add, merge, split, pull,
+and push subcommands of git subtree.
 '
 
 TEST_DIRECTORY=$(pwd)/../../../t
-export TEST_DIRECTORY
+. "$TEST_DIRECTORY"/test-lib.sh
 
-. ../../../t/test-lib.sh
-
-subtree_test_create_repo()
-{
+# Use our own wrapper around test-lib.sh's test_create_repo, in order
+# to set log.date=relative.  `git subtree` parses the output of `git
+# log`, and so it must be careful to not be affected by settings that
+# change the `git log` output.  We test this by setting
+# log.date=relative for every repo in the tests.
+subtree_test_create_repo () {
 	test_create_repo "$1" &&
-	(
-		cd "$1" &&
-		git config log.date relative
-	)
-}
-
-create()
-{
-	echo "$1" >"$1" &&
-	git add "$1"
-}
-
-check_equal()
-{
-	test_debug 'echo'
-	test_debug "echo \"check a:\" \"{$1}\""
-	test_debug "echo \"      b:\" \"{$2}\""
-	if [ "$1" = "$2" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-undo()
-{
-	git reset --hard HEAD~
+	git -C "$1" config log.date relative
 }
 
-# Make sure no patch changes more than one file.
-# The original set of commits changed only one file each.
-# A multi-file change would imply that we pruned commits
-# too aggressively.
-join_commits()
-{
-	commit=
-	all=
-	while read x y; do
-		if [ -z "$x" ]; then
-			continue
-		elif [ "$x" = "commit:" ]; then
-			if [ -n "$commit" ]; then
-				echo "$commit $all"
-				all=
-			fi
-			commit="$y"
-		else
-			all="$all $y"
-		fi
-	done
-	echo "$commit $all"
-}
-
-test_create_commit() (
+test_create_commit () (
 	repo=$1 &&
 	commit=$2 &&
 	cd "$repo" &&
@@ -81,98 +33,116 @@ test_create_commit() (
 	git commit -m "$commit" || error "Could not commit"
 )
 
-last_commit_message()
-{
-	git log --pretty=format:%s -1
+test_wrong_flag() {
+	test_must_fail "$@" >out 2>err &&
+	test_must_be_empty out &&
+	grep "flag does not make sense with" err
 }
 
-subtree_test_count=0
-next_test() {
-	subtree_test_count=$(($subtree_test_count+1))
+last_commit_subject () {
+	git log --pretty=format:%s -1
 }
 
+test_expect_success 'shows short help text for -h' '
+	test_expect_code 129 git subtree -h >out 2>err &&
+	test_must_be_empty err &&
+	grep -e "^ *or: git subtree pull" out &&
+	grep -e --annotate out
+'
+
 #
 # Tests for 'git subtree add'
 #
 
-next_test
 test_expect_success 'no merge from non-existent subtree' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		test_must_fail git subtree merge --prefix="sub dir" FETCH_HEAD
 	)
 '
 
-next_test
 test_expect_success 'no pull from non-existent subtree' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
-		test_must_fail git subtree pull --prefix="sub dir" ./"sub proj" master
-	)'
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		test_must_fail git subtree pull --prefix="sub dir" ./"sub proj" HEAD
+	)
+'
+
+test_expect_success 'add rejects flags for split' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		test_wrong_flag git subtree add --prefix="sub dir" --annotate=foo FETCH_HEAD &&
+		test_wrong_flag git subtree add --prefix="sub dir" --branch=foo FETCH_HEAD &&
+		test_wrong_flag git subtree add --prefix="sub dir" --ignore-joins FETCH_HEAD &&
+		test_wrong_flag git subtree add --prefix="sub dir" --onto=foo FETCH_HEAD &&
+		test_wrong_flag git subtree add --prefix="sub dir" --rejoin FETCH_HEAD
+	)
+'
 
-next_test
 test_expect_success 'add subproj as subtree into sub dir/ with --prefix' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD &&
-		check_equal "$(last_commit_message)" "Add '\''sub dir/'\'' from commit '\''$(git rev-parse FETCH_HEAD)'\''"
+		test "$(last_commit_subject)" = "Add '\''sub dir/'\'' from commit '\''$(git rev-parse FETCH_HEAD)'\''"
 	)
 '
 
-next_test
 test_expect_success 'add subproj as subtree into sub dir/ with --prefix and --message' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" --message="Added subproject" FETCH_HEAD &&
-		check_equal "$(last_commit_message)" "Added subproject"
+		test "$(last_commit_subject)" = "Added subproject"
 	)
 '
 
-next_test
 test_expect_success 'add subproj as subtree into sub dir/ with --prefix as -P and --message as -m' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add -P "sub dir" -m "Added subproject" FETCH_HEAD &&
-		check_equal "$(last_commit_message)" "Added subproject"
+		test "$(last_commit_subject)" = "Added subproject"
 	)
 '
 
-next_test
 test_expect_success 'add subproj as subtree into sub dir/ with --squash and --prefix and --message' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" --message="Added subproject with squash" --squash FETCH_HEAD &&
-		check_equal "$(last_commit_message)" "Added subproject with squash"
+		test "$(last_commit_subject)" = "Added subproject with squash"
 	)
 '
 
@@ -180,100 +150,117 @@ test_expect_success 'add subproj as subtree into sub dir/ with --squash and --pr
 # Tests for 'git subtree merge'
 #
 
-next_test
+test_expect_success 'merge rejects flags for split' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		test_wrong_flag git subtree merge --prefix="sub dir" --annotate=foo FETCH_HEAD &&
+		test_wrong_flag git subtree merge --prefix="sub dir" --branch=foo FETCH_HEAD &&
+		test_wrong_flag git subtree merge --prefix="sub dir" --ignore-joins FETCH_HEAD &&
+		test_wrong_flag git subtree merge --prefix="sub dir" --onto=foo FETCH_HEAD &&
+		test_wrong_flag git subtree merge --prefix="sub dir" --rejoin FETCH_HEAD
+	)
+'
+
 test_expect_success 'merge new subproj history into sub dir/ with --prefix' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
-		check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
+		test "$(last_commit_subject)" = "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
 	)
 '
 
-next_test
 test_expect_success 'merge new subproj history into sub dir/ with --prefix and --message' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" --message="Merged changes from subproject" FETCH_HEAD &&
-		check_equal "$(last_commit_message)" "Merged changes from subproject"
+		test "$(last_commit_subject)" = "Merged changes from subproject"
 	)
 '
 
-next_test
 test_expect_success 'merge new subproj history into sub dir/ with --squash and --prefix and --message' '
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	subtree_test_create_repo "$subtree_test_count" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	subtree_test_create_repo "$test_count" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" --message="Merged changes from subproject using squash" --squash FETCH_HEAD &&
-		check_equal "$(last_commit_message)" "Merged changes from subproject using squash"
+		test "$(last_commit_subject)" = "Merged changes from subproject using squash"
 	)
 '
 
-next_test
 test_expect_success 'merge the added subproj again, should do nothing' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD &&
 		# this shouldn not actually do anything, since FETCH_HEAD
 		# is already a parent
 		result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) &&
-		check_equal "${result}" "Already up to date."
+		test "${result}" = "Already up to date."
 	)
 '
 
-next_test
 test_expect_success 'merge new subproj history into subdir/ with a slash appended to the argument of --prefix' '
-	test_create_repo "$test_count" &&
-	test_create_repo "$test_count/subproj" &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/subproj" &&
 	test_create_commit "$test_count" main1 &&
 	test_create_commit "$test_count/subproj" sub1 &&
 	(
 		cd "$test_count" &&
-		git fetch ./subproj master &&
+		git fetch ./subproj HEAD &&
 		git subtree add --prefix=subdir/ FETCH_HEAD
 	) &&
 	test_create_commit "$test_count/subproj" sub2 &&
 	(
 		cd "$test_count" &&
-		git fetch ./subproj master &&
+		git fetch ./subproj HEAD &&
 		git subtree merge --prefix=subdir/ FETCH_HEAD &&
-		check_equal "$(last_commit_message)" "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
+		test "$(last_commit_subject)" = "Merge commit '\''$(git rev-parse FETCH_HEAD)'\''"
 	)
 '
 
@@ -281,18 +268,17 @@ test_expect_success 'merge new subproj history into subdir/ with a slash appende
 # Tests for 'git subtree split'
 #
 
-next_test
 test_expect_success 'split requires option --prefix' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD &&
-		echo "You must provide the --prefix option." > expected &&
-		test_must_fail git subtree split > actual 2>&1 &&
+		echo "You must provide the --prefix option." >expected &&
+		test_must_fail git subtree split >actual 2>&1 &&
 		test_debug "printf '"expected: "'" &&
 		test_debug "cat expected" &&
 		test_debug "printf '"actual: "'" &&
@@ -301,18 +287,17 @@ test_expect_success 'split requires option --prefix' '
 	)
 '
 
-next_test
 test_expect_success 'split requires path given by option --prefix must exist' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD &&
-		echo "'\''non-existent-directory'\'' does not exist; use '\''git subtree add'\''" > expected &&
-		test_must_fail git subtree split --prefix=non-existent-directory > actual 2>&1 &&
+		echo "'\''non-existent-directory'\'' does not exist; use '\''git subtree add'\''" >expected &&
+		test_must_fail git subtree split --prefix=non-existent-directory >actual 2>&1 &&
 		test_debug "printf '"expected: "'" &&
 		test_debug "cat expected" &&
 		test_debug "printf '"actual: "'" &&
@@ -321,222 +306,696 @@ test_expect_success 'split requires path given by option --prefix must exist' '
 	)
 '
 
-next_test
+test_expect_success 'split rejects flags for add' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree merge --prefix="sub dir" FETCH_HEAD &&
+		split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
+		test_wrong_flag git subtree split --prefix="sub dir" --squash &&
+		test_wrong_flag git subtree split --prefix="sub dir" --message=foo
+	)
+'
+
 test_expect_success 'split sub dir/ with --rejoin' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
 		git subtree split --prefix="sub dir" --annotate="*" --rejoin &&
-		check_equal "$(last_commit_message)" "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
+		test "$(last_commit_subject)" = "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
 	)
- '
+'
 
-next_test
 test_expect_success 'split sub dir/ with --rejoin from scratch' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	test_create_commit "$subtree_test_count" main1 &&
+	subtree_test_create_repo "$test_count" &&
+	test_create_commit "$test_count" main1 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		mkdir "sub dir" &&
 		echo file >"sub dir"/file &&
 		git add "sub dir/file" &&
 		git commit -m"sub dir file" &&
 		split_hash=$(git subtree split --prefix="sub dir" --rejoin) &&
 		git subtree split --prefix="sub dir" --rejoin &&
-		check_equal "$(last_commit_message)" "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
+		test "$(last_commit_subject)" = "Split '\''sub dir/'\'' into commit '\''$split_hash'\''"
 	)
- '
+'
 
-next_test
 test_expect_success 'split sub dir/ with --rejoin and --message' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		git subtree split --prefix="sub dir" --message="Split & rejoin" --annotate="*" --rejoin &&
-		check_equal "$(last_commit_message)" "Split & rejoin"
+		test "$(last_commit_subject)" = "Split & rejoin"
+	)
+'
+
+test_expect_success 'split "sub dir"/ with --rejoin and --squash' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" --squash FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git subtree pull --prefix="sub dir" --squash ./"sub proj" HEAD &&
+		MAIN=$(git rev-parse --verify HEAD) &&
+		SUB=$(git -C "sub proj" rev-parse --verify HEAD) &&
+
+		SPLIT=$(git subtree split --prefix="sub dir" --annotate="*" --rejoin --squash) &&
+
+		test_must_fail git merge-base --is-ancestor $SUB HEAD &&
+		test_must_fail git merge-base --is-ancestor $SPLIT HEAD &&
+		git rev-list HEAD ^$MAIN >commit-list &&
+		test_line_count = 2 commit-list &&
+		test "$(git rev-parse --verify HEAD:)"           = "$(git rev-parse --verify $MAIN:)" &&
+		test "$(git rev-parse --verify HEAD:"sub dir")"  = "$(git rev-parse --verify $SPLIT:)" &&
+		test "$(git rev-parse --verify HEAD^1)"          = $MAIN &&
+		test "$(git rev-parse --verify HEAD^2)"         != $SPLIT &&
+		test "$(git rev-parse --verify HEAD^2:)"         = "$(git rev-parse --verify $SPLIT:)" &&
+		test "$(last_commit_subject)" = "Split '\''sub dir/'\'' into commit '\''$SPLIT'\''"
 	)
 '
 
-next_test
+test_expect_success 'split then pull "sub dir"/ with --rejoin and --squash' '
+	# 1. "add"
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	git -C "$test_count" subtree --prefix="sub dir" add --squash ./"sub proj" HEAD &&
+
+	# 2. commit from parent
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+
+	# 3. "split --rejoin --squash"
+	git -C "$test_count" subtree --prefix="sub dir" split --rejoin --squash &&
+
+	# 4. "pull --squash"
+	test_create_commit "$test_count/sub proj" sub2 &&
+	git -C "$test_count" subtree -d --prefix="sub dir" pull --squash ./"sub proj" HEAD &&
+
+	test_must_fail git merge-base HEAD FETCH_HEAD
+'
+
 test_expect_success 'split "sub dir"/ with --branch' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br &&
-		check_equal "$(git rev-parse subproj-br)" "$split_hash"
+		test "$(git rev-parse subproj-br)" = "$split_hash"
 	)
 '
 
-next_test
 test_expect_success 'check hash of split' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br &&
-		check_equal "$(git rev-parse subproj-br)" "$split_hash" &&
+		test "$(git rev-parse subproj-br)" = "$split_hash" &&
 		# Check hash of split
 		new_hash=$(git rev-parse subproj-br^2) &&
 		(
 			cd ./"sub proj" &&
 			subdir_hash=$(git rev-parse HEAD) &&
-			check_equal ''"$new_hash"'' "$subdir_hash"
+			test "$new_hash" = "$subdir_hash"
 		)
 	)
 '
 
-next_test
 test_expect_success 'split "sub dir"/ with --branch for an existing branch' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git branch subproj-br FETCH_HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br &&
-		check_equal "$(git rev-parse subproj-br)" "$split_hash"
+		test "$(git rev-parse subproj-br)" = "$split_hash"
 	)
 '
 
-next_test
 test_expect_success 'split "sub dir"/ with --branch for an incompatible branch' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git branch init HEAD &&
-		git fetch ./"sub proj" master &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		test_must_fail git subtree split --prefix="sub dir" --branch init
 	)
 '
 
 #
+# Tests for 'git subtree pull'
+#
+
+test_expect_success 'pull requires option --prefix' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	(
+		cd "$test_count" &&
+		test_must_fail git subtree pull ./"sub proj" HEAD >out 2>err &&
+
+		echo "You must provide the --prefix option." >expected &&
+		test_must_be_empty out &&
+		test_cmp expected err
+	)
+'
+
+test_expect_success 'pull requires path given by option --prefix must exist' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		test_must_fail git subtree pull --prefix="sub dir" ./"sub proj" HEAD >out 2>err &&
+
+		echo "'\''sub dir'\'' does not exist; use '\''git subtree add'\''" >expected &&
+		test_must_be_empty out &&
+		test_cmp expected err
+	)
+'
+
+test_expect_success 'pull basic operation' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	(
+		cd "$test_count" &&
+		exp=$(git -C "sub proj" rev-parse --verify HEAD:) &&
+		git subtree pull --prefix="sub dir" ./"sub proj" HEAD &&
+		act=$(git rev-parse --verify HEAD:"sub dir") &&
+		test "$act" = "$exp"
+	)
+'
+
+test_expect_success 'pull rejects flags for split' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	(
+		test_must_fail git subtree pull --prefix="sub dir" --annotate=foo ./"sub proj" HEAD &&
+		test_must_fail git subtree pull --prefix="sub dir" --branch=foo ./"sub proj" HEAD &&
+		test_must_fail git subtree pull --prefix="sub dir" --ignore-joins ./"sub proj" HEAD &&
+		test_must_fail git subtree pull --prefix="sub dir" --onto=foo ./"sub proj" HEAD &&
+		test_must_fail git subtree pull --prefix="sub dir" --rejoin ./"sub proj" HEAD
+	)
+'
+
+#
+# Tests for 'git subtree push'
+#
+
+test_expect_success 'push requires option --prefix' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD &&
+		echo "You must provide the --prefix option." >expected &&
+		test_must_fail git subtree push "./sub proj" from-mainline >actual 2>&1 &&
+		test_debug "printf '"expected: "'" &&
+		test_debug "cat expected" &&
+		test_debug "printf '"actual: "'" &&
+		test_debug "cat actual" &&
+		test_cmp expected actual
+	)
+'
+
+test_expect_success 'push requires path given by option --prefix must exist' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD &&
+		echo "'\''non-existent-directory'\'' does not exist; use '\''git subtree add'\''" >expected &&
+		test_must_fail git subtree push --prefix=non-existent-directory "./sub proj" from-mainline >actual 2>&1 &&
+		test_debug "printf '"expected: "'" &&
+		test_debug "cat expected" &&
+		test_debug "printf '"actual: "'" &&
+		test_debug "cat actual" &&
+		test_cmp expected actual
+	)
+'
+
+test_expect_success 'push rejects flags for add' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree merge --prefix="sub dir" FETCH_HEAD &&
+		test_wrong_flag git subtree split --prefix="sub dir" --squash ./"sub proj" from-mainline &&
+		test_wrong_flag git subtree split --prefix="sub dir" --message=foo ./"sub proj" from-mainline
+	)
+'
+
+test_expect_success 'push basic operation' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree merge --prefix="sub dir" FETCH_HEAD &&
+		before=$(git rev-parse --verify HEAD) &&
+		split_hash=$(git subtree split --prefix="sub dir") &&
+		git subtree push --prefix="sub dir" ./"sub proj" from-mainline &&
+		test "$before" = "$(git rev-parse --verify HEAD)" &&
+		test "$split_hash" = "$(git -C "sub proj" rev-parse --verify refs/heads/from-mainline)"
+	)
+'
+
+test_expect_success 'push sub dir/ with --rejoin' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree merge --prefix="sub dir" FETCH_HEAD &&
+		split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
+		git subtree push --prefix="sub dir" --annotate="*" --rejoin ./"sub proj" from-mainline &&
+		test "$(last_commit_subject)" = "Split '\''sub dir/'\'' into commit '\''$split_hash'\''" &&
+		test "$split_hash" = "$(git -C "sub proj" rev-parse --verify refs/heads/from-mainline)"
+	)
+'
+
+test_expect_success 'push sub dir/ with --rejoin from scratch' '
+	subtree_test_create_repo "$test_count" &&
+	test_create_commit "$test_count" main1 &&
+	(
+		cd "$test_count" &&
+		mkdir "sub dir" &&
+		echo file >"sub dir"/file &&
+		git add "sub dir/file" &&
+		git commit -m"sub dir file" &&
+		split_hash=$(git subtree split --prefix="sub dir" --rejoin) &&
+		git init --bare "sub proj.git" &&
+		git subtree push --prefix="sub dir" --rejoin ./"sub proj.git" from-mainline &&
+		test "$(last_commit_subject)" = "Split '\''sub dir/'\'' into commit '\''$split_hash'\''" &&
+		test "$split_hash" = "$(git -C "sub proj.git" rev-parse --verify refs/heads/from-mainline)"
+	)
+'
+
+test_expect_success 'push sub dir/ with --rejoin and --message' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree merge --prefix="sub dir" FETCH_HEAD &&
+		git subtree push --prefix="sub dir" --message="Split & rejoin" --annotate="*" --rejoin ./"sub proj" from-mainline &&
+		test "$(last_commit_subject)" = "Split & rejoin" &&
+		split_hash="$(git rev-parse --verify HEAD^2)" &&
+		test "$split_hash" = "$(git -C "sub proj" rev-parse --verify refs/heads/from-mainline)"
+	)
+'
+
+test_expect_success 'push "sub dir"/ with --rejoin and --squash' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" --squash FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git subtree pull --prefix="sub dir" --squash ./"sub proj" HEAD &&
+		MAIN=$(git rev-parse --verify HEAD) &&
+		SUB=$(git -C "sub proj" rev-parse --verify HEAD) &&
+
+		SPLIT=$(git subtree split --prefix="sub dir" --annotate="*") &&
+		git subtree push --prefix="sub dir" --annotate="*" --rejoin --squash ./"sub proj" from-mainline &&
+
+		test_must_fail git merge-base --is-ancestor $SUB HEAD &&
+		test_must_fail git merge-base --is-ancestor $SPLIT HEAD &&
+		git rev-list HEAD ^$MAIN >commit-list &&
+		test_line_count = 2 commit-list &&
+		test "$(git rev-parse --verify HEAD:)"           = "$(git rev-parse --verify $MAIN:)" &&
+		test "$(git rev-parse --verify HEAD:"sub dir")"  = "$(git rev-parse --verify $SPLIT:)" &&
+		test "$(git rev-parse --verify HEAD^1)"          = $MAIN &&
+		test "$(git rev-parse --verify HEAD^2)"         != $SPLIT &&
+		test "$(git rev-parse --verify HEAD^2:)"         = "$(git rev-parse --verify $SPLIT:)" &&
+		test "$(last_commit_subject)" = "Split '\''sub dir/'\'' into commit '\''$SPLIT'\''" &&
+		test "$SPLIT" = "$(git -C "sub proj" rev-parse --verify refs/heads/from-mainline)"
+	)
+'
+
+test_expect_success 'push "sub dir"/ with --branch' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree merge --prefix="sub dir" FETCH_HEAD &&
+		split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
+		git subtree push --prefix="sub dir" --annotate="*" --branch subproj-br ./"sub proj" from-mainline &&
+		test "$(git rev-parse subproj-br)" = "$split_hash" &&
+		test "$split_hash" = "$(git -C "sub proj" rev-parse --verify refs/heads/from-mainline)"
+	)
+'
+
+test_expect_success 'check hash of push' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree merge --prefix="sub dir" FETCH_HEAD &&
+		split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
+		git subtree push --prefix="sub dir" --annotate="*" --branch subproj-br ./"sub proj" from-mainline &&
+		test "$(git rev-parse subproj-br)" = "$split_hash" &&
+		# Check hash of split
+		new_hash=$(git rev-parse subproj-br^2) &&
+		(
+			cd ./"sub proj" &&
+			subdir_hash=$(git rev-parse HEAD) &&
+			test "$new_hash" = "$subdir_hash"
+		) &&
+		test "$split_hash" = "$(git -C "sub proj" rev-parse --verify refs/heads/from-mainline)"
+	)
+'
+
+test_expect_success 'push "sub dir"/ with --branch for an existing branch' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git branch subproj-br FETCH_HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree merge --prefix="sub dir" FETCH_HEAD &&
+		split_hash=$(git subtree split --prefix="sub dir" --annotate="*") &&
+		git subtree push --prefix="sub dir" --annotate="*" --branch subproj-br ./"sub proj" from-mainline &&
+		test "$(git rev-parse subproj-br)" = "$split_hash" &&
+		test "$split_hash" = "$(git -C "sub proj" rev-parse --verify refs/heads/from-mainline)"
+	)
+'
+
+test_expect_success 'push "sub dir"/ with --branch for an incompatible branch' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git branch init HEAD &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree merge --prefix="sub dir" FETCH_HEAD &&
+		test_must_fail git subtree push --prefix="sub dir" --branch init "./sub proj" from-mainline
+	)
+'
+
+test_expect_success 'push "sub dir"/ with a local rev' '
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
+	(
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
+		git subtree add --prefix="sub dir" FETCH_HEAD
+	) &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd "$test_count" &&
+		bad_tree=$(git rev-parse --verify HEAD:"sub dir") &&
+		good_tree=$(git rev-parse --verify HEAD^:"sub dir") &&
+		git subtree push --prefix="sub dir" --annotate="*" ./"sub proj" HEAD^:from-mainline &&
+		split_tree=$(git -C "sub proj" rev-parse --verify refs/heads/from-mainline:) &&
+		test "$split_tree" = "$good_tree"
+	)
+'
+
+#
 # Validity checking
 #
 
-next_test
 test_expect_success 'make sure exactly the right set of files ends up in the subproj' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub3 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
+	test_create_commit "$test_count/sub proj" sub3 &&
+	test_create_commit "$test_count" "sub dir"/main-sub3 &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub4 &&
+	test_create_commit "$test_count/sub proj" sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
+	test_create_commit "$test_count" "sub dir"/main-sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD &&
 
@@ -547,46 +1006,45 @@ test_expect_success 'make sure exactly the right set of files ends up in the sub
 	)
 '
 
-next_test
 test_expect_success 'make sure the subproj *only* contains commits that affect the "sub dir"' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub3 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
+	test_create_commit "$test_count/sub proj" sub3 &&
+	test_create_commit "$test_count" "sub dir"/main-sub3 &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub4 &&
+	test_create_commit "$test_count/sub proj" sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
+	test_create_commit "$test_count" "sub dir"/main-sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD &&
 
@@ -598,52 +1056,51 @@ test_expect_success 'make sure the subproj *only* contains commits that affect t
 	)
 '
 
-next_test
 test_expect_success 'make sure exactly the right set of files ends up in the mainline' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub3 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
+	test_create_commit "$test_count/sub proj" sub3 &&
+	test_create_commit "$test_count" "sub dir"/main-sub3 &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub4 &&
+	test_create_commit "$test_count/sub proj" sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
+	test_create_commit "$test_count" "sub dir"/main-sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD
 	) &&
 	(
-		cd "$subtree_test_count" &&
-		git subtree pull --prefix="sub dir" ./"sub proj" master &&
+		cd "$test_count" &&
+		git subtree pull --prefix="sub dir" ./"sub proj" HEAD &&
 
 		test_write_lines main1 main2 >chkm &&
 		test_write_lines main-sub1 main-sub2 main-sub3 main-sub4 >chkms &&
@@ -657,53 +1114,52 @@ test_expect_success 'make sure exactly the right set of files ends up in the mai
 	)
 '
 
-next_test
 test_expect_success 'make sure each filename changed exactly once in the entire history' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git config log.date relative &&
-		git fetch ./"sub proj" master &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub3 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
+	test_create_commit "$test_count/sub proj" sub3 &&
+	test_create_commit "$test_count" "sub dir"/main-sub3 &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub4 &&
+	test_create_commit "$test_count/sub proj" sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
+	test_create_commit "$test_count" "sub dir"/main-sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD
 	) &&
 	(
-		cd "$subtree_test_count" &&
-		git subtree pull --prefix="sub dir" ./"sub proj" master &&
+		cd "$test_count" &&
+		git subtree pull --prefix="sub dir" ./"sub proj" HEAD &&
 
 		test_write_lines main1 main2 >chkm &&
 		test_write_lines sub1 sub2 sub3 sub4 >chks &&
@@ -723,105 +1179,103 @@ test_expect_success 'make sure each filename changed exactly once in the entire
 	)
 '
 
-next_test
 test_expect_success 'make sure the --rejoin commits never make it into subproj' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub3 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
+	test_create_commit "$test_count/sub proj" sub3 &&
+	test_create_commit "$test_count" "sub dir"/main-sub3 &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub4 &&
+	test_create_commit "$test_count/sub proj" sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
+	test_create_commit "$test_count" "sub dir"/main-sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD
 	) &&
 	(
-		cd "$subtree_test_count" &&
-		git subtree pull --prefix="sub dir" ./"sub proj" master &&
-		check_equal "$(git log --pretty=format:"%s" HEAD^2 | grep -i split)" ""
+		cd "$test_count" &&
+		git subtree pull --prefix="sub dir" ./"sub proj" HEAD &&
+		test "$(git log --pretty=format:"%s" HEAD^2 | grep -i split)" = ""
 	)
 '
 
-next_test
 test_expect_success 'make sure no "git subtree" tagged commits make it into subproj' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub3 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
+	test_create_commit "$test_count/sub proj" sub3 &&
+	test_create_commit "$test_count" "sub dir"/main-sub3 &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		 git merge FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub4 &&
+	test_create_commit "$test_count/sub proj" sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub4 &&
+	test_create_commit "$test_count" "sub dir"/main-sub4 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --annotate="*" --branch subproj-br --rejoin
 	) &&
 	(
-		cd "$subtree_test_count/sub proj" &&
+		cd "$test_count/sub proj" &&
 		git fetch .. subproj-br &&
 		git merge FETCH_HEAD
 	) &&
 	(
-		cd "$subtree_test_count" &&
-		git subtree pull --prefix="sub dir" ./"sub proj" master &&
+		cd "$test_count" &&
+		git subtree pull --prefix="sub dir" ./"sub proj" HEAD &&
 
 		# They are meaningless to subproj since one side of the merge refers to the mainline
-		check_equal "$(git log --pretty=format:"%s%n%b" HEAD^2 | grep "git-subtree.*:")" ""
+		test "$(git log --pretty=format:"%s%n%b" HEAD^2 | grep "git-subtree.*:")" = ""
 	)
 '
 
@@ -829,145 +1283,135 @@ test_expect_success 'make sure no "git subtree" tagged commits make it into subp
 # A new set of tests
 #
 
-next_test
 test_expect_success 'make sure "git subtree split" find the correct parent' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git branch subproj-ref FETCH_HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --branch subproj-br &&
 
 		# at this point, the new commit parent should be subproj-ref, if it is
-		# not, something went wrong (the "newparent" of "master~" commit should
+		# not, something went wrong (the "newparent" of "HEAD~" commit should
 		# have been sub2, but it was not, because its cache was not set to
 		# itself)
-		check_equal "$(git log --pretty=format:%P -1 subproj-br)" "$(git rev-parse subproj-ref)"
+		test "$(git log --pretty=format:%P -1 subproj-br)" = "$(git rev-parse subproj-ref)"
 	)
 '
 
-next_test
 test_expect_success 'split a new subtree without --onto option' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --branch subproj-br
 	) &&
-	mkdir "$subtree_test_count"/"sub dir2" &&
-	test_create_commit "$subtree_test_count" "sub dir2"/main-sub2 &&
+	mkdir "$test_count"/"sub dir2" &&
+	test_create_commit "$test_count" "sub dir2"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 
 		# also test that we still can split out an entirely new subtree
 		# if the parent of the first commit in the tree is not empty,
 		# then the new subtree has accidentally been attached to something
 		git subtree split --prefix="sub dir2" --branch subproj2-br &&
-		check_equal "$(git log --pretty=format:%P -1 subproj2-br)" ""
+		test "$(git log --pretty=format:%P -1 subproj2-br)" = ""
 	)
 '
 
-next_test
 test_expect_success 'verify one file change per commit' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git branch sub1 FETCH_HEAD &&
 		git subtree add --prefix="sub dir" sub1
 	) &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir" --branch subproj-br
 	) &&
-	mkdir "$subtree_test_count"/"sub dir2" &&
-	test_create_commit "$subtree_test_count" "sub dir2"/main-sub2 &&
+	mkdir "$test_count"/"sub dir2" &&
+	test_create_commit "$test_count" "sub dir2"/main-sub2 &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git subtree split --prefix="sub dir2" --branch subproj2-br &&
 
-		x= &&
-		git log --pretty=format:"commit: %H" | join_commits |
-		(
-			while read commit a b; do
-				test_debug "echo Verifying commit $commit"
-				test_debug "echo a: $a"
-				test_debug "echo b: $b"
-				check_equal "$b" ""
-				x=1
-			done
-			check_equal "$x" 1
-		)
+		git log --format="%H" >commit-list &&
+		while read commit
+		do
+			git log -n1 --format="" --name-only "$commit" >file-list &&
+			test_line_count -le 1 file-list || return 1
+		done <commit-list
 	)
 '
 
-next_test
 test_expect_success 'push split to subproj' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	subtree_test_create_repo "$subtree_test_count/sub proj" &&
-	test_create_commit "$subtree_test_count" main1 &&
-	test_create_commit "$subtree_test_count/sub proj" sub1 &&
+	subtree_test_create_repo "$test_count" &&
+	subtree_test_create_repo "$test_count/sub proj" &&
+	test_create_commit "$test_count" main1 &&
+	test_create_commit "$test_count/sub proj" sub1 &&
 	(
-		cd "$subtree_test_count" &&
-		git fetch ./"sub proj" master &&
+		cd "$test_count" &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree add --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub1 &&
-	test_create_commit "$subtree_test_count" main2 &&
-	test_create_commit "$subtree_test_count/sub proj" sub2 &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub2 &&
-	(
-		cd $subtree_test_count/"sub proj" &&
-                git branch sub-branch-1 &&
-                cd .. &&
-		git fetch ./"sub proj" master &&
+	test_create_commit "$test_count" "sub dir"/main-sub1 &&
+	test_create_commit "$test_count" main2 &&
+	test_create_commit "$test_count/sub proj" sub2 &&
+	test_create_commit "$test_count" "sub dir"/main-sub2 &&
+	(
+		cd $test_count/"sub proj" &&
+		git branch sub-branch-1 &&
+		cd .. &&
+		git fetch ./"sub proj" HEAD &&
 		git subtree merge --prefix="sub dir" FETCH_HEAD
 	) &&
-	test_create_commit "$subtree_test_count" "sub dir"/main-sub3 &&
-        (
-		cd "$subtree_test_count" &&
-	        git subtree push ./"sub proj" --prefix "sub dir" sub-branch-1 &&
-                cd ./"sub proj" &&
-                git checkout sub-branch-1 &&
-         	check_equal "$(last_commit_message)" "sub dir/main-sub3"
+	test_create_commit "$test_count" "sub dir"/main-sub3 &&
+	(
+		cd "$test_count" &&
+		git subtree push ./"sub proj" --prefix "sub dir" sub-branch-1 &&
+		cd ./"sub proj" &&
+		git checkout sub-branch-1 &&
+		test "$(last_commit_subject)" = "sub dir/main-sub3"
 	)
 '
 
@@ -991,43 +1435,43 @@ test_expect_success 'push split to subproj' '
 #   set of commits.
 #
 
-next_test
 test_expect_success 'subtree descendant check' '
-	subtree_test_create_repo "$subtree_test_count" &&
-	test_create_commit "$subtree_test_count" folder_subtree/a &&
+	subtree_test_create_repo "$test_count" &&
+	defaultBranch=$(sed "s,ref: refs/heads/,," "$test_count/.git/HEAD") &&
+	test_create_commit "$test_count" folder_subtree/a &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git branch branch
 	) &&
-	test_create_commit "$subtree_test_count" folder_subtree/0 &&
-	test_create_commit "$subtree_test_count" folder_subtree/b &&
-	cherry=$(cd "$subtree_test_count"; git rev-parse HEAD) &&
+	test_create_commit "$test_count" folder_subtree/0 &&
+	test_create_commit "$test_count" folder_subtree/b &&
+	cherry=$(cd "$test_count"; git rev-parse HEAD) &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git checkout branch
 	) &&
-	test_create_commit "$subtree_test_count" commit_on_branch &&
+	test_create_commit "$test_count" commit_on_branch &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git cherry-pick $cherry &&
-		git checkout master &&
+		git checkout $defaultBranch &&
 		git merge -m "merge should be kept on subtree" branch &&
 		git branch no_subtree_work_branch
 	) &&
-	test_create_commit "$subtree_test_count" folder_subtree/d &&
+	test_create_commit "$test_count" folder_subtree/d &&
 	(
-		cd "$subtree_test_count" &&
+		cd "$test_count" &&
 		git checkout no_subtree_work_branch
 	) &&
-	test_create_commit "$subtree_test_count" not_a_subtree_change &&
+	test_create_commit "$test_count" not_a_subtree_change &&
 	(
-		cd "$subtree_test_count" &&
-		git checkout master &&
+		cd "$test_count" &&
+		git checkout $defaultBranch &&
 		git merge -m "merge should be skipped on subtree" no_subtree_work_branch &&
 
-		git subtree split --prefix folder_subtree/ --branch subtree_tip master &&
+		git subtree split --prefix folder_subtree/ --branch subtree_tip $defaultBranch &&
 		git subtree split --prefix folder_subtree/ --branch subtree_branch branch &&
-		check_equal $(git rev-list --count subtree_tip..subtree_branch) 0
+		test $(git rev-list --count subtree_tip..subtree_branch) = 0
 	)
 '
 
diff --git a/contrib/subtree/todo b/contrib/subtree/todo
index 0d0e777651..32d2ce3a40 100644
--- a/contrib/subtree/todo
+++ b/contrib/subtree/todo
@@ -23,9 +23,9 @@
 
 	"pull" and "merge" commands should fail if you've never merged
 		that --prefix before
-		
+
 	docs should provide an example of "add"
-	
+
 	note that the initial split doesn't *have* to have a commitid
 		specified... that's just an optimization
 
@@ -33,7 +33,7 @@
 		get a misleading "prefix must end with /" message from
 		one of the other git tools that git-subtree calls.  Should
 		detect this situation and print the *real* problem.
-	
+
 	"pull --squash" should do fetch-synthesize-merge, but instead just
 		does "pull" directly, which doesn't work at all.
 
diff --git a/contrib/svn-fe/.gitignore b/contrib/svn-fe/.gitignore
deleted file mode 100644
index 02a7791585..0000000000
--- a/contrib/svn-fe/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-/*.xml
-/*.1
-/*.html
-/svn-fe
diff --git a/contrib/svn-fe/Makefile b/contrib/svn-fe/Makefile
deleted file mode 100644
index e8651aaf4b..0000000000
--- a/contrib/svn-fe/Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
-all:: svn-fe$X
-
-CC = cc
-RM = rm -f
-MV = mv
-
-CFLAGS = -g -O2 -Wall
-LDFLAGS =
-EXTLIBS = -lz
-
-include ../../config.mak.uname
--include ../../config.mak.autogen
--include ../../config.mak
-
-ifeq ($(uname_S),Darwin)
-	ifndef NO_FINK
-		ifeq ($(shell test -d /sw/lib && echo y),y)
-			CFLAGS += -I/sw/include
-			LDFLAGS += -L/sw/lib
-		endif
-	endif
-	ifndef NO_DARWIN_PORTS
-		ifeq ($(shell test -d /opt/local/lib && echo y),y)
-			CFLAGS += -I/opt/local/include
-			LDFLAGS += -L/opt/local/lib
-		endif
-	endif
-endif
-
-ifndef NO_OPENSSL
-	EXTLIBS += -lssl
-	ifdef NEEDS_CRYPTO_WITH_SSL
-		EXTLIBS += -lcrypto
-	endif
-endif
-
-ifndef NO_PTHREADS
-	CFLAGS += $(PTHREADS_CFLAGS)
-	EXTLIBS += $(PTHREAD_LIBS)
-endif
-
-ifdef HAVE_CLOCK_GETTIME
-	CFLAGS += -DHAVE_CLOCK_GETTIME
-	EXTLIBS += -lrt
-endif
-
-ifdef NEEDS_LIBICONV
-	EXTLIBS += -liconv
-endif
-
-GIT_LIB = ../../libgit.a
-VCSSVN_LIB = ../../vcs-svn/lib.a
-XDIFF_LIB = ../../xdiff/lib.a
-
-LIBS = $(VCSSVN_LIB) $(GIT_LIB) $(XDIFF_LIB)
-
-QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
-QUIET_SUBDIR1 =
-
-ifneq ($(findstring $(MAKEFLAGS),w),w)
-PRINT_DIR = --no-print-directory
-else # "make -w"
-NO_SUBDIR = :
-endif
-
-ifneq ($(findstring $(MAKEFLAGS),s),s)
-ifndef V
-	QUIET_CC      = @echo '   ' CC $@;
-	QUIET_LINK    = @echo '   ' LINK $@;
-	QUIET_SUBDIR0 = +@subdir=
-	QUIET_SUBDIR1 = ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
-	                $(MAKE) $(PRINT_DIR) -C $$subdir
-endif
-endif
-
-svn-fe$X: svn-fe.o $(VCSSVN_LIB) $(XDIFF_LIB) $(GIT_LIB)
-	$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) $(EXTLIBS) -o $@ svn-fe.o $(LIBS)
-
-svn-fe.o: svn-fe.c ../../vcs-svn/svndump.h
-	$(QUIET_CC)$(CC) $(CFLAGS) -I../../vcs-svn -o $*.o -c $<
-
-svn-fe.html: svn-fe.txt
-	$(QUIET_SUBDIR0)../../Documentation $(QUIET_SUBDIR1) \
-		MAN_TXT=../contrib/svn-fe/svn-fe.txt \
-		../contrib/svn-fe/$@
-
-svn-fe.1: svn-fe.txt
-	$(QUIET_SUBDIR0)../../Documentation $(QUIET_SUBDIR1) \
-		MAN_TXT=../contrib/svn-fe/svn-fe.txt \
-		../contrib/svn-fe/$@
-	$(MV) ../../Documentation/svn-fe.1 .
-
-../../vcs-svn/lib.a: FORCE
-	$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) vcs-svn/lib.a
-
-../../xdiff/lib.a: FORCE
-	$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) xdiff/lib.a
-
-../../libgit.a: FORCE
-	$(QUIET_SUBDIR0)../.. $(QUIET_SUBDIR1) libgit.a
-
-clean:
-	$(RM) svn-fe$X svn-fe.o svn-fe.html svn-fe.xml svn-fe.1
-
-.PHONY: all clean FORCE
diff --git a/contrib/svn-fe/svn-fe.c b/contrib/svn-fe/svn-fe.c
deleted file mode 100644
index f363505abb..0000000000
--- a/contrib/svn-fe/svn-fe.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * This file is in the public domain.
- * You may freely use, modify, distribute, and relicense it.
- */
-
-#include <stdlib.h>
-#include "svndump.h"
-
-int main(int argc, char **argv)
-{
-	if (svndump_init(NULL))
-		return 1;
-	svndump_read((argc > 1) ? argv[1] : NULL, "refs/heads/master",
-			"refs/notes/svn/revs");
-	svndump_deinit();
-	svndump_reset();
-	return 0;
-}
diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
deleted file mode 100644
index 19333fc8df..0000000000
--- a/contrib/svn-fe/svn-fe.txt
+++ /dev/null
@@ -1,71 +0,0 @@
-svn-fe(1)
-=========
-
-NAME
-----
-svn-fe - convert an SVN "dumpfile" to a fast-import stream
-
-SYNOPSIS
---------
-[verse]
-mkfifo backchannel &&
-svnadmin dump --deltas REPO |
-	svn-fe [url] 3<backchannel |
-	git fast-import --cat-blob-fd=3 3>backchannel
-
-DESCRIPTION
------------
-
-Converts a Subversion dumpfile into input suitable for
-git-fast-import(1) and similar importers. REPO is a path to a
-Subversion repository mirrored on the local disk. Remote Subversion
-repositories can be mirrored on local disk using the `svnsync`
-command.
-
-Note: this tool is very young.  The details of its commandline
-interface may change in backward incompatible ways.
-
-INPUT FORMAT
-------------
-Subversion's repository dump format is documented in full in
-`notes/dump-load-format.txt` from the Subversion source tree.
-Files in this format can be generated using the 'svnadmin dump' or
-'svk admin dump' command.
-
-OUTPUT FORMAT
--------------
-The fast-import format is documented by the git-fast-import(1)
-manual page.
-
-NOTES
------
-Subversion dumps do not record a separate author and committer for
-each revision, nor do they record a separate display name and email
-address for each author.  Like git-svn(1), 'svn-fe' will use the name
-
----------
-user <user@UUID>
----------
-
-as committer, where 'user' is the value of the `svn:author` property
-and 'UUID' the repository's identifier.
-
-To support incremental imports, 'svn-fe' puts a `git-svn-id` line at
-the end of each commit log message if passed a URL on the command
-line.  This line has the form `git-svn-id: URL@REVNO UUID`.
-
-The resulting repository will generally require further processing
-to put each project in its own repository and to separate the history
-of each branch.  The 'git filter-repo --subdirectory-filter' command
-may be useful for this purpose.
-
-BUGS
-----
-Empty directories and unknown properties are silently discarded.
-
-The exit status does not reflect whether an error was detected.
-
-SEE ALSO
---------
-git-svn(1), svn2git(1), svk(1), git-filter-repo(1), git-fast-import(1),
-https://svn.apache.org/repos/asf/subversion/trunk/notes/dump-load-format.txt
diff --git a/contrib/svn-fe/svnrdump_sim.py b/contrib/svn-fe/svnrdump_sim.py
deleted file mode 100755
index 50c6a4f89d..0000000000
--- a/contrib/svn-fe/svnrdump_sim.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env python
-"""
-Simulates svnrdump by replaying an existing dump from a file, taking care
-of the specified revision range.
-To simulate incremental imports the environment variable SVNRMAX can be set
-to the highest revision that should be available.
-"""
-import sys
-import os
-
-if sys.hexversion < 0x02040000:
-    # The limiter is the ValueError() calls. This may be too conservative
-    sys.stderr.write("svnrdump-sim.py: requires Python 2.4 or later.\n")
-    sys.exit(1)
-
-
-def getrevlimit():
-    var = 'SVNRMAX'
-    if var in os.environ:
-        return os.environ[var]
-    return None
-
-
-def writedump(url, lower, upper):
-    if url.startswith('sim://'):
-        filename = url[6:]
-        if filename[-1] == '/':
-            filename = filename[:-1]  # remove terminating slash
-    else:
-        raise ValueError('sim:// url required')
-    f = open(filename, 'r')
-    state = 'header'
-    wroterev = False
-    while(True):
-        l = f.readline()
-        if l == '':
-            break
-        if state == 'header' and l.startswith('Revision-number: '):
-            state = 'prefix'
-        if state == 'prefix' and l == 'Revision-number: %s\n' % lower:
-            state = 'selection'
-        if not upper == 'HEAD' and state == 'selection' and \
-                l == 'Revision-number: %s\n' % upper:
-            break
-
-        if state == 'header' or state == 'selection':
-            if state == 'selection':
-                wroterev = True
-            sys.stdout.write(l)
-    return wroterev
-
-if __name__ == "__main__":
-    if not (len(sys.argv) in (3, 4, 5)):
-        print("usage: %s dump URL -rLOWER:UPPER")
-        sys.exit(1)
-    if not sys.argv[1] == 'dump':
-        raise NotImplementedError('only "dump" is suppported.')
-    url = sys.argv[2]
-    r = ('0', 'HEAD')
-    if len(sys.argv) == 4 and sys.argv[3][0:2] == '-r':
-        r = sys.argv[3][2:].lstrip().split(':')
-    if not getrevlimit() is None:
-        r[1] = getrevlimit()
-    if writedump(url, r[0], r[1]):
-        ret = 0
-    else:
-        ret = 1
-    sys.exit(ret)
diff --git a/convert.c b/convert.c
index 25ac525d5f..0d6fb3410a 100644
--- a/convert.c
+++ b/convert.c
@@ -24,17 +24,6 @@
 #define CONVERT_STAT_BITS_TXT_CRLF  0x2
 #define CONVERT_STAT_BITS_BIN       0x4
 
-enum crlf_action {
-	CRLF_UNDEFINED,
-	CRLF_BINARY,
-	CRLF_TEXT,
-	CRLF_TEXT_INPUT,
-	CRLF_TEXT_CRLF,
-	CRLF_AUTO,
-	CRLF_AUTO_INPUT,
-	CRLF_AUTO_CRLF
-};
-
 struct text_stat {
 	/* NUL, CR, LF and CRLF counts */
 	unsigned nul, lonecr, lonelf, crlf;
@@ -138,7 +127,7 @@ static const char *gather_convert_stats_ascii(const char *data, unsigned long si
 	}
 }
 
-const char *get_cached_convert_stats_ascii(const struct index_state *istate,
+const char *get_cached_convert_stats_ascii(struct index_state *istate,
 					   const char *path)
 {
 	const char *ret;
@@ -172,7 +161,7 @@ static int text_eol_is_crlf(void)
 	return 0;
 }
 
-static enum eol output_eol(enum crlf_action crlf_action)
+static enum eol output_eol(enum convert_crlf_action crlf_action)
 {
 	switch (crlf_action) {
 	case CRLF_BINARY:
@@ -195,7 +184,7 @@ static enum eol output_eol(enum crlf_action crlf_action)
 	return core_eol;
 }
 
-static void check_global_conv_flags_eol(const char *path, enum crlf_action crlf_action,
+static void check_global_conv_flags_eol(const char *path,
 			    struct text_stat *old_stats, struct text_stat *new_stats,
 			    int conv_flags)
 {
@@ -222,7 +211,7 @@ static void check_global_conv_flags_eol(const char *path, enum crlf_action crlf_
 	}
 }
 
-static int has_crlf_in_index(const struct index_state *istate, const char *path)
+static int has_crlf_in_index(struct index_state *istate, const char *path)
 {
 	unsigned long sz;
 	void *data;
@@ -246,7 +235,7 @@ static int has_crlf_in_index(const struct index_state *istate, const char *path)
 }
 
 static int will_convert_lf_to_crlf(struct text_stat *stats,
-				   enum crlf_action crlf_action)
+				   enum convert_crlf_action crlf_action)
 {
 	if (output_eol(crlf_action) != EOL_CRLF)
 		return 0;
@@ -270,8 +259,12 @@ static int will_convert_lf_to_crlf(struct text_stat *stats,
 static int validate_encoding(const char *path, const char *enc,
 		      const char *data, size_t len, int die_on_error)
 {
+	const char *stripped;
+
 	/* We only check for UTF here as UTF?? can be an alias for UTF-?? */
-	if (istarts_with(enc, "UTF")) {
+	if (skip_iprefix(enc, "UTF", &stripped)) {
+		skip_prefix(stripped, "-", &stripped);
+
 		/*
 		 * Check for detectable errors in UTF encodings
 		 */
@@ -285,15 +278,10 @@ static int validate_encoding(const char *path, const char *enc,
 			 */
 			const char *advise_msg = _(
 				"The file '%s' contains a byte order "
-				"mark (BOM). Please use UTF-%s as "
+				"mark (BOM). Please use UTF-%.*s as "
 				"working-tree-encoding.");
-			const char *stripped = NULL;
-			char *upper = xstrdup_toupper(enc);
-			upper[strlen(upper)-2] = '\0';
-			if (skip_prefix(upper, "UTF", &stripped))
-				skip_prefix(stripped, "-", &stripped);
-			advise(advise_msg, path, stripped);
-			free(upper);
+			int stripped_len = strlen(stripped) - strlen("BE");
+			advise(advise_msg, path, stripped_len, stripped);
 			if (die_on_error)
 				die(error_msg, path, enc);
 			else {
@@ -308,12 +296,7 @@ static int validate_encoding(const char *path, const char *enc,
 				"mark (BOM). Please use UTF-%sBE or UTF-%sLE "
 				"(depending on the byte order) as "
 				"working-tree-encoding.");
-			const char *stripped = NULL;
-			char *upper = xstrdup_toupper(enc);
-			if (skip_prefix(upper, "UTF", &stripped))
-				skip_prefix(stripped, "-", &stripped);
 			advise(advise_msg, path, stripped, stripped);
-			free(upper);
 			if (die_on_error)
 				die(error_msg, path, enc);
 			else {
@@ -418,7 +401,7 @@ static int encode_to_git(const char *path, const char *src, size_t src_len,
 	if (!dst) {
 		/*
 		 * We could add the blob "as-is" to Git. However, on checkout
-		 * we would try to reencode to the original encoding. This
+		 * we would try to re-encode to the original encoding. This
 		 * would fail and we would leave the user with a messed-up
 		 * working tree. Let's try to avoid this by screaming loud.
 		 */
@@ -502,10 +485,10 @@ static int encode_to_worktree(const char *path, const char *src, size_t src_len,
 	return 1;
 }
 
-static int crlf_to_git(const struct index_state *istate,
+static int crlf_to_git(struct index_state *istate,
 		       const char *path, const char *src, size_t len,
 		       struct strbuf *buf,
-		       enum crlf_action crlf_action, int conv_flags)
+		       enum convert_crlf_action crlf_action, int conv_flags)
 {
 	struct text_stat stats;
 	char *dst;
@@ -553,7 +536,7 @@ static int crlf_to_git(const struct index_state *istate,
 			new_stats.crlf += new_stats.lonelf;
 			new_stats.lonelf = 0;
 		}
-		check_global_conv_flags_eol(path, crlf_action, &stats, &new_stats, conv_flags);
+		check_global_conv_flags_eol(path, &stats, &new_stats, conv_flags);
 	}
 	if (!convert_crlf_into_lf)
 		return 0;
@@ -591,8 +574,8 @@ static int crlf_to_git(const struct index_state *istate,
 	return 1;
 }
 
-static int crlf_to_worktree(const char *src, size_t len,
-			    struct strbuf *buf, enum crlf_action crlf_action)
+static int crlf_to_worktree(const char *src, size_t len, struct strbuf *buf,
+			    enum convert_crlf_action crlf_action)
 {
 	char *to_free = NULL;
 	struct text_stat stats;
@@ -644,7 +627,6 @@ static int filter_buffer_or_fd(int in, int out, void *data)
 	struct child_process child_process = CHILD_PROCESS_INIT;
 	struct filter_params *params = (struct filter_params *)data;
 	int write_err, status;
-	const char *argv[] = { NULL, NULL };
 
 	/* apply % substitution to cmd */
 	struct strbuf cmd = STRBUF_INIT;
@@ -662,9 +644,7 @@ static int filter_buffer_or_fd(int in, int out, void *data)
 	strbuf_expand(&cmd, params->cmd, strbuf_expand_dict_cb, &dict);
 	strbuf_release(&path);
 
-	argv[0] = cmd.buf;
-
-	child_process.argv = argv;
+	strvec_push(&child_process.args, cmd.buf);
 	child_process.use_shell = 1;
 	child_process.in = -1;
 	child_process.out = out;
@@ -803,6 +783,7 @@ static void handle_filter_error(const struct strbuf *filter_status,
 static int apply_multi_file_filter(const char *path, const char *src, size_t len,
 				   int fd, struct strbuf *dst, const char *cmd,
 				   const unsigned int wanted_capability,
+				   const struct checkout_metadata *meta,
 				   struct delayed_checkout *dco)
 {
 	int err;
@@ -861,6 +842,24 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
 	if (err)
 		goto done;
 
+	if (meta && meta->refname) {
+		err = packet_write_fmt_gently(process->in, "ref=%s\n", meta->refname);
+		if (err)
+			goto done;
+	}
+
+	if (meta && !is_null_oid(&meta->treeish)) {
+		err = packet_write_fmt_gently(process->in, "treeish=%s\n", oid_to_hex(&meta->treeish));
+		if (err)
+			goto done;
+	}
+
+	if (meta && !is_null_oid(&meta->blob)) {
+		err = packet_write_fmt_gently(process->in, "blob=%s\n", oid_to_hex(&meta->blob));
+		if (err)
+			goto done;
+	}
+
 	if ((entry->supported_capabilities & CAP_DELAY) &&
 	    dco && dco->state == CE_CAN_DELAY) {
 		can_delay = 1;
@@ -874,9 +873,13 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
 		goto done;
 
 	if (fd >= 0)
-		err = write_packetized_from_fd(fd, process->in);
+		err = write_packetized_from_fd_no_flush(fd, process->in);
 	else
-		err = write_packetized_from_buf(src, len, process->in);
+		err = write_packetized_from_buf_no_flush(src, len, process->in);
+	if (err)
+		goto done;
+
+	err = packet_flush_gently(process->in);
 	if (err)
 		goto done;
 
@@ -893,7 +896,8 @@ static int apply_multi_file_filter(const char *path, const char *src, size_t len
 		if (err)
 			goto done;
 
-		err = read_packetized_to_strbuf(process->out, &nbuf) < 0;
+		err = read_packetized_to_strbuf(process->out, &nbuf,
+						PACKET_READ_GENTLE_ON_EOF) < 0;
 		if (err)
 			goto done;
 
@@ -912,6 +916,7 @@ done:
 	else
 		strbuf_swap(dst, &nbuf);
 	strbuf_release(&nbuf);
+	strbuf_release(&filter_status);
 	return !err;
 }
 
@@ -962,6 +967,7 @@ done:
 
 	if (err)
 		handle_filter_error(&filter_status, entry, 0);
+	strbuf_release(&filter_status);
 	return !err;
 }
 
@@ -977,6 +983,7 @@ static struct convert_driver {
 static int apply_filter(const char *path, const char *src, size_t len,
 			int fd, struct strbuf *dst, struct convert_driver *drv,
 			const unsigned int wanted_capability,
+			const struct checkout_metadata *meta,
 			struct delayed_checkout *dco)
 {
 	const char *cmd = NULL;
@@ -996,7 +1003,7 @@ static int apply_filter(const char *path, const char *src, size_t len,
 		return apply_single_file_filter(path, src, len, fd, dst, cmd);
 	else if (drv->process && *drv->process)
 		return apply_multi_file_filter(path, src, len, fd, dst,
-			drv->process, wanted_capability, dco);
+			drv->process, wanted_capability, meta, dco);
 
 	return 0;
 }
@@ -1004,7 +1011,7 @@ static int apply_filter(const char *path, const char *src, size_t len,
 static int read_convert_config(const char *var, const char *value, void *cb)
 {
 	const char *key, *name;
-	int namelen;
+	size_t namelen;
 	struct convert_driver *drv;
 
 	/*
@@ -1017,7 +1024,7 @@ static int read_convert_config(const char *var, const char *value, void *cb)
 		if (!strncmp(drv->name, name, namelen) && !drv->name[namelen])
 			break;
 	if (!drv) {
-		drv = xcalloc(1, sizeof(struct convert_driver));
+		CALLOC_ARRAY(drv, 1);
 		drv->name = xmemdupz(name, namelen);
 		*user_convert_tail = drv;
 		user_convert_tail = &(drv->next);
@@ -1152,7 +1159,7 @@ static int ident_to_worktree(const char *src, size_t len,
 	/* are we "faking" in place editing ? */
 	if (src == buf->buf)
 		to_free = strbuf_detach(buf, NULL);
-	hash_object_file(src, len, "blob", &oid);
+	hash_object_file(the_hash_algo, src, len, "blob", &oid);
 
 	strbuf_grow(buf, len + cnt * (the_hash_algo->hexsz + 3));
 	for (;;) {
@@ -1236,7 +1243,7 @@ static const char *git_path_check_encoding(struct attr_check_item *check)
 	return value;
 }
 
-static enum crlf_action git_path_check_crlf(struct attr_check_item *check)
+static enum convert_crlf_action git_path_check_crlf(struct attr_check_item *check)
 {
 	const char *value = check->value;
 
@@ -1286,18 +1293,10 @@ static int git_path_check_ident(struct attr_check_item *check)
 	return !!ATTR_TRUE(value);
 }
 
-struct conv_attrs {
-	struct convert_driver *drv;
-	enum crlf_action attr_action; /* What attr says */
-	enum crlf_action crlf_action; /* When no attr is set, use core.autocrlf */
-	int ident;
-	const char *working_tree_encoding; /* Supported encoding or default encoding if NULL */
-};
-
 static struct attr_check *check;
 
-static void convert_attrs(const struct index_state *istate,
-			  struct conv_attrs *ca, const char *path)
+void convert_attrs(struct index_state *istate,
+		   struct conv_attrs *ca, const char *path)
 {
 	struct attr_check_item *ccheck = NULL;
 
@@ -1358,7 +1357,7 @@ void reset_parsed_attributes(void)
 	user_convert_tail = NULL;
 }
 
-int would_convert_to_git_filter_fd(const struct index_state *istate, const char *path)
+int would_convert_to_git_filter_fd(struct index_state *istate, const char *path)
 {
 	struct conv_attrs ca;
 
@@ -1374,10 +1373,10 @@ int would_convert_to_git_filter_fd(const struct index_state *istate, const char
 	if (!ca.drv->required)
 		return 0;
 
-	return apply_filter(path, NULL, 0, -1, NULL, ca.drv, CAP_CLEAN, NULL);
+	return apply_filter(path, NULL, 0, -1, NULL, ca.drv, CAP_CLEAN, NULL, NULL);
 }
 
-const char *get_convert_attr_ascii(const struct index_state *istate, const char *path)
+const char *get_convert_attr_ascii(struct index_state *istate, const char *path)
 {
 	struct conv_attrs ca;
 
@@ -1403,7 +1402,7 @@ const char *get_convert_attr_ascii(const struct index_state *istate, const char
 	return "";
 }
 
-int convert_to_git(const struct index_state *istate,
+int convert_to_git(struct index_state *istate,
 		   const char *path, const char *src, size_t len,
 		   struct strbuf *dst, int conv_flags)
 {
@@ -1412,7 +1411,7 @@ int convert_to_git(const struct index_state *istate,
 
 	convert_attrs(istate, &ca, path);
 
-	ret |= apply_filter(path, src, len, -1, dst, ca.drv, CAP_CLEAN, NULL);
+	ret |= apply_filter(path, src, len, -1, dst, ca.drv, CAP_CLEAN, NULL, NULL);
 	if (!ret && ca.drv && ca.drv->required)
 		die(_("%s: clean filter '%s' failed"), path, ca.drv->name);
 
@@ -1437,7 +1436,7 @@ int convert_to_git(const struct index_state *istate,
 	return ret | ident_to_git(src, len, dst, ca.ident);
 }
 
-void convert_to_git_filter_fd(const struct index_state *istate,
+void convert_to_git_filter_fd(struct index_state *istate,
 			      const char *path, int fd, struct strbuf *dst,
 			      int conv_flags)
 {
@@ -1445,9 +1444,8 @@ void convert_to_git_filter_fd(const struct index_state *istate,
 	convert_attrs(istate, &ca, path);
 
 	assert(ca.drv);
-	assert(ca.drv->clean || ca.drv->process);
 
-	if (!apply_filter(path, NULL, 0, fd, dst, ca.drv, CAP_CLEAN, NULL))
+	if (!apply_filter(path, NULL, 0, fd, dst, ca.drv, CAP_CLEAN, NULL, NULL))
 		die(_("%s: clean filter '%s' failed"), path, ca.drv->name);
 
 	encode_to_git(path, dst->buf, dst->len, dst, ca.working_tree_encoding, conv_flags);
@@ -1455,17 +1453,16 @@ void convert_to_git_filter_fd(const struct index_state *istate,
 	ident_to_git(dst->buf, dst->len, dst, ca.ident);
 }
 
-static int convert_to_working_tree_internal(const struct index_state *istate,
-					    const char *path, const char *src,
-					    size_t len, struct strbuf *dst,
-					    int normalizing, struct delayed_checkout *dco)
+static int convert_to_working_tree_ca_internal(const struct conv_attrs *ca,
+					       const char *path, const char *src,
+					       size_t len, struct strbuf *dst,
+					       int normalizing,
+					       const struct checkout_metadata *meta,
+					       struct delayed_checkout *dco)
 {
 	int ret = 0, ret_filter = 0;
-	struct conv_attrs ca;
 
-	convert_attrs(istate, &ca, path);
-
-	ret |= ident_to_worktree(src, len, dst, ca.ident);
+	ret |= ident_to_worktree(src, len, dst, ca->ident);
 	if (ret) {
 		src = dst->buf;
 		len = dst->len;
@@ -1475,47 +1472,56 @@ static int convert_to_working_tree_internal(const struct index_state *istate,
 	 * is a smudge or process filter (even if the process filter doesn't
 	 * support smudge).  The filters might expect CRLFs.
 	 */
-	if ((ca.drv && (ca.drv->smudge || ca.drv->process)) || !normalizing) {
-		ret |= crlf_to_worktree(src, len, dst, ca.crlf_action);
+	if ((ca->drv && (ca->drv->smudge || ca->drv->process)) || !normalizing) {
+		ret |= crlf_to_worktree(src, len, dst, ca->crlf_action);
 		if (ret) {
 			src = dst->buf;
 			len = dst->len;
 		}
 	}
 
-	ret |= encode_to_worktree(path, src, len, dst, ca.working_tree_encoding);
+	ret |= encode_to_worktree(path, src, len, dst, ca->working_tree_encoding);
 	if (ret) {
 		src = dst->buf;
 		len = dst->len;
 	}
 
 	ret_filter = apply_filter(
-		path, src, len, -1, dst, ca.drv, CAP_SMUDGE, dco);
-	if (!ret_filter && ca.drv && ca.drv->required)
-		die(_("%s: smudge filter %s failed"), path, ca.drv->name);
+		path, src, len, -1, dst, ca->drv, CAP_SMUDGE, meta, dco);
+	if (!ret_filter && ca->drv && ca->drv->required)
+		die(_("%s: smudge filter %s failed"), path, ca->drv->name);
 
 	return ret | ret_filter;
 }
 
-int async_convert_to_working_tree(const struct index_state *istate,
-				  const char *path, const char *src,
-				  size_t len, struct strbuf *dst,
-				  void *dco)
+int async_convert_to_working_tree_ca(const struct conv_attrs *ca,
+				     const char *path, const char *src,
+				     size_t len, struct strbuf *dst,
+				     const struct checkout_metadata *meta,
+				     void *dco)
 {
-	return convert_to_working_tree_internal(istate, path, src, len, dst, 0, dco);
+	return convert_to_working_tree_ca_internal(ca, path, src, len, dst, 0,
+						   meta, dco);
 }
 
-int convert_to_working_tree(const struct index_state *istate,
-			    const char *path, const char *src,
-			    size_t len, struct strbuf *dst)
+int convert_to_working_tree_ca(const struct conv_attrs *ca,
+			       const char *path, const char *src,
+			       size_t len, struct strbuf *dst,
+			       const struct checkout_metadata *meta)
 {
-	return convert_to_working_tree_internal(istate, path, src, len, dst, 0, NULL);
+	return convert_to_working_tree_ca_internal(ca, path, src, len, dst, 0,
+						   meta, NULL);
 }
 
-int renormalize_buffer(const struct index_state *istate, const char *path,
+int renormalize_buffer(struct index_state *istate, const char *path,
 		       const char *src, size_t len, struct strbuf *dst)
 {
-	int ret = convert_to_working_tree_internal(istate, path, src, len, dst, 1, NULL);
+	struct conv_attrs ca;
+	int ret;
+
+	convert_attrs(istate, &ca, path);
+	ret = convert_to_working_tree_ca_internal(&ca, path, src, len, dst, 1,
+						  NULL, NULL);
 	if (ret) {
 		src = dst->buf;
 		len = dst->len;
@@ -1942,34 +1948,25 @@ static struct stream_filter *ident_filter(const struct object_id *oid)
 }
 
 /*
- * Return an appropriately constructed filter for the path, or NULL if
+ * Return an appropriately constructed filter for the given ca, or NULL if
  * the contents cannot be filtered without reading the whole thing
  * in-core.
  *
- * Note that you would be crazy to set CRLF, smuge/clean or ident to a
+ * Note that you would be crazy to set CRLF, smudge/clean or ident to a
  * large binary blob you would want us not to slurp into the memory!
  */
-struct stream_filter *get_stream_filter(const struct index_state *istate,
-					const char *path,
-					const struct object_id *oid)
+struct stream_filter *get_stream_filter_ca(const struct conv_attrs *ca,
+					   const struct object_id *oid)
 {
-	struct conv_attrs ca;
 	struct stream_filter *filter = NULL;
 
-	convert_attrs(istate, &ca, path);
-	if (ca.drv && (ca.drv->process || ca.drv->smudge || ca.drv->clean))
-		return NULL;
-
-	if (ca.working_tree_encoding)
+	if (classify_conv_attrs(ca) != CA_CLASS_STREAMABLE)
 		return NULL;
 
-	if (ca.crlf_action == CRLF_AUTO || ca.crlf_action == CRLF_AUTO_CRLF)
-		return NULL;
-
-	if (ca.ident)
+	if (ca->ident)
 		filter = ident_filter(oid);
 
-	if (output_eol(ca.crlf_action) == EOL_CRLF)
+	if (output_eol(ca->crlf_action) == EOL_CRLF)
 		filter = cascade_filter(filter, lf_to_crlf_filter());
 	else
 		filter = cascade_filter(filter, &null_filter_singleton);
@@ -1977,6 +1974,15 @@ struct stream_filter *get_stream_filter(const struct index_state *istate,
 	return filter;
 }
 
+struct stream_filter *get_stream_filter(struct index_state *istate,
+					const char *path,
+					const struct object_id *oid)
+{
+	struct conv_attrs ca;
+	convert_attrs(istate, &ca, path);
+	return get_stream_filter_ca(&ca, oid);
+}
+
 void free_stream_filter(struct stream_filter *filter)
 {
 	filter->vtbl->free(filter);
@@ -1988,3 +1994,43 @@ int stream_filter(struct stream_filter *filter,
 {
 	return filter->vtbl->filter(filter, input, isize_p, output, osize_p);
 }
+
+void init_checkout_metadata(struct checkout_metadata *meta, const char *refname,
+			    const struct object_id *treeish,
+			    const struct object_id *blob)
+{
+	memset(meta, 0, sizeof(*meta));
+	if (refname)
+		meta->refname = refname;
+	if (treeish)
+		oidcpy(&meta->treeish, treeish);
+	if (blob)
+		oidcpy(&meta->blob, blob);
+}
+
+void clone_checkout_metadata(struct checkout_metadata *dst,
+			     const struct checkout_metadata *src,
+			     const struct object_id *blob)
+{
+	memcpy(dst, src, sizeof(*dst));
+	if (blob)
+		oidcpy(&dst->blob, blob);
+}
+
+enum conv_attrs_classification classify_conv_attrs(const struct conv_attrs *ca)
+{
+	if (ca->drv) {
+		if (ca->drv->process)
+			return CA_CLASS_INCORE_PROCESS;
+		if (ca->drv->smudge || ca->drv->clean)
+			return CA_CLASS_INCORE_FILTER;
+	}
+
+	if (ca->working_tree_encoding)
+		return CA_CLASS_INCORE;
+
+	if (ca->crlf_action == CRLF_AUTO || ca->crlf_action == CRLF_AUTO_CRLF)
+		return CA_CLASS_INCORE;
+
+	return CA_CLASS_STREAMABLE;
+}
diff --git a/convert.h b/convert.h
index 3710969d43..5ee1c32205 100644
--- a/convert.h
+++ b/convert.h
@@ -4,10 +4,10 @@
 #ifndef CONVERT_H
 #define CONVERT_H
 
+#include "hash.h"
 #include "string-list.h"
 
 struct index_state;
-struct object_id;
 struct strbuf;
 
 #define CONV_EOL_RNDTRP_DIE   (1<<0) /* Die if CRLF to LF to CRLF is different */
@@ -57,44 +57,112 @@ struct delayed_checkout {
 	struct string_list paths;
 };
 
+struct checkout_metadata {
+	const char *refname;
+	struct object_id treeish;
+	struct object_id blob;
+};
+
+enum convert_crlf_action {
+	CRLF_UNDEFINED,
+	CRLF_BINARY,
+	CRLF_TEXT,
+	CRLF_TEXT_INPUT,
+	CRLF_TEXT_CRLF,
+	CRLF_AUTO,
+	CRLF_AUTO_INPUT,
+	CRLF_AUTO_CRLF
+};
+
+struct convert_driver;
+
+struct conv_attrs {
+	struct convert_driver *drv;
+	enum convert_crlf_action attr_action; /* What attr says */
+	enum convert_crlf_action crlf_action; /* When no attr is set, use core.autocrlf */
+	int ident;
+	const char *working_tree_encoding; /* Supported encoding or default encoding if NULL */
+};
+
+void convert_attrs(struct index_state *istate,
+		   struct conv_attrs *ca, const char *path);
+
 extern enum eol core_eol;
 extern char *check_roundtrip_encoding;
-const char *get_cached_convert_stats_ascii(const struct index_state *istate,
+const char *get_cached_convert_stats_ascii(struct index_state *istate,
 					   const char *path);
 const char *get_wt_convert_stats_ascii(const char *path);
-const char *get_convert_attr_ascii(const struct index_state *istate,
+const char *get_convert_attr_ascii(struct index_state *istate,
 				   const char *path);
 
 /* returns 1 if *dst was used */
-int convert_to_git(const struct index_state *istate,
+int convert_to_git(struct index_state *istate,
 		   const char *path, const char *src, size_t len,
 		   struct strbuf *dst, int conv_flags);
-int convert_to_working_tree(const struct index_state *istate,
-			    const char *path, const char *src,
-			    size_t len, struct strbuf *dst);
-int async_convert_to_working_tree(const struct index_state *istate,
-				  const char *path, const char *src,
-				  size_t len, struct strbuf *dst,
-				  void *dco);
+int convert_to_working_tree_ca(const struct conv_attrs *ca,
+			       const char *path, const char *src,
+			       size_t len, struct strbuf *dst,
+			       const struct checkout_metadata *meta);
+int async_convert_to_working_tree_ca(const struct conv_attrs *ca,
+				     const char *path, const char *src,
+				     size_t len, struct strbuf *dst,
+				     const struct checkout_metadata *meta,
+				     void *dco);
+static inline int convert_to_working_tree(struct index_state *istate,
+					  const char *path, const char *src,
+					  size_t len, struct strbuf *dst,
+					  const struct checkout_metadata *meta)
+{
+	struct conv_attrs ca;
+	convert_attrs(istate, &ca, path);
+	return convert_to_working_tree_ca(&ca, path, src, len, dst, meta);
+}
+static inline int async_convert_to_working_tree(struct index_state *istate,
+						const char *path, const char *src,
+						size_t len, struct strbuf *dst,
+						const struct checkout_metadata *meta,
+						void *dco)
+{
+	struct conv_attrs ca;
+	convert_attrs(istate, &ca, path);
+	return async_convert_to_working_tree_ca(&ca, path, src, len, dst, meta, dco);
+}
 int async_query_available_blobs(const char *cmd,
 				struct string_list *available_paths);
-int renormalize_buffer(const struct index_state *istate,
+int renormalize_buffer(struct index_state *istate,
 		       const char *path, const char *src, size_t len,
 		       struct strbuf *dst);
-static inline int would_convert_to_git(const struct index_state *istate,
+static inline int would_convert_to_git(struct index_state *istate,
 				       const char *path)
 {
 	return convert_to_git(istate, path, NULL, 0, NULL, 0);
 }
 /* Precondition: would_convert_to_git_filter_fd(path) == true */
-void convert_to_git_filter_fd(const struct index_state *istate,
+void convert_to_git_filter_fd(struct index_state *istate,
 			      const char *path, int fd,
 			      struct strbuf *dst,
 			      int conv_flags);
-int would_convert_to_git_filter_fd(const struct index_state *istate,
+int would_convert_to_git_filter_fd(struct index_state *istate,
 				   const char *path);
 
 /*
+ * Initialize the checkout metadata with the given values.  Any argument may be
+ * NULL if it is not applicable.  The treeish should be a commit if that is
+ * available, and a tree otherwise.
+ *
+ * The refname is not copied and must be valid for the lifetime of the struct.
+ * THe object IDs are copied.
+ */
+void init_checkout_metadata(struct checkout_metadata *meta, const char *refname,
+			    const struct object_id *treeish,
+			    const struct object_id *blob);
+
+/* Copy the metadata from src to dst, updating the blob. */
+void clone_checkout_metadata(struct checkout_metadata *dst,
+			     const struct checkout_metadata *src,
+			     const struct object_id *blob);
+
+/*
  * Reset the internal list of attributes used by convert_to_git and
  * convert_to_working_tree.
  */
@@ -108,9 +176,11 @@ void reset_parsed_attributes(void);
 
 struct stream_filter; /* opaque */
 
-struct stream_filter *get_stream_filter(const struct index_state *istate,
+struct stream_filter *get_stream_filter(struct index_state *istate,
 					const char *path,
 					const struct object_id *);
+struct stream_filter *get_stream_filter_ca(const struct conv_attrs *ca,
+					   const struct object_id *oid);
 void free_stream_filter(struct stream_filter *);
 int is_null_stream_filter(struct stream_filter *);
 
@@ -130,4 +200,37 @@ int stream_filter(struct stream_filter *,
 		  const char *input, size_t *isize_p,
 		  char *output, size_t *osize_p);
 
+enum conv_attrs_classification {
+	/*
+	 * The blob must be loaded into a buffer before it can be
+	 * smudged. All smudging is done in-proc.
+	 */
+	CA_CLASS_INCORE,
+
+	/*
+	 * The blob must be loaded into a buffer, but uses a
+	 * single-file driver filter, such as rot13.
+	 */
+	CA_CLASS_INCORE_FILTER,
+
+	/*
+	 * The blob must be loaded into a buffer, but uses a
+	 * long-running driver process, such as LFS. This might or
+	 * might not use delayed operations. (The important thing is
+	 * that there is a single subordinate long-running process
+	 * handling all associated blobs and in case of delayed
+	 * operations, may hold per-blob state.)
+	 */
+	CA_CLASS_INCORE_PROCESS,
+
+	/*
+	 * The blob can be streamed and smudged without needing to
+	 * completely read it into a buffer.
+	 */
+	CA_CLASS_STREAMABLE,
+};
+
+enum conv_attrs_classification classify_conv_attrs(
+	const struct conv_attrs *ca);
+
 #endif /* CONVERT_H */
diff --git a/credential.c b/credential.c
index 62be651b03..000ac7a8d4 100644
--- a/credential.c
+++ b/credential.c
@@ -6,11 +6,12 @@
 #include "url.h"
 #include "prompt.h"
 #include "sigchain.h"
+#include "urlmatch.h"
 
 void credential_init(struct credential *c)
 {
-	memset(c, 0, sizeof(*c));
-	c->helpers.strdup_strings = 1;
+	struct credential blank = CREDENTIAL_INIT;
+	memcpy(c, &blank, sizeof(*c));
 }
 
 void credential_clear(struct credential *c)
@@ -36,11 +37,15 @@ int credential_match(const struct credential *want,
 #undef CHECK
 }
 
+
+static int credential_from_potentially_partial_url(struct credential *c,
+						   const char *url);
+
 static int credential_config_callback(const char *var, const char *value,
 				      void *data)
 {
 	struct credential *c = data;
-	const char *key, *dot;
+	const char *key;
 
 	if (!skip_prefix(var, "credential.", &key))
 		return 0;
@@ -48,31 +53,16 @@ static int credential_config_callback(const char *var, const char *value,
 	if (!value)
 		return config_error_nonbool(var);
 
-	dot = strrchr(key, '.');
-	if (dot) {
-		struct credential want = CREDENTIAL_INIT;
-		char *url = xmemdupz(key, dot - key);
-		int matched;
-
-		credential_from_url(&want, url);
-		matched = credential_match(&want, c);
-
-		credential_clear(&want);
-		free(url);
-
-		if (!matched)
-			return 0;
-		key = dot + 1;
-	}
-
 	if (!strcmp(key, "helper")) {
 		if (*value)
 			string_list_append(&c->helpers, value);
 		else
 			string_list_clear(&c->helpers, 0);
 	} else if (!strcmp(key, "username")) {
-		if (!c->username)
+		if (!c->username_from_proto) {
+			free(c->username);
 			c->username = xstrdup(value);
+		}
 	}
 	else if (!strcmp(key, "usehttppath"))
 		c->use_http_path = git_config_bool(var, value);
@@ -87,11 +77,61 @@ static int proto_is_http(const char *s)
 	return !strcmp(s, "https") || !strcmp(s, "http");
 }
 
+static void credential_describe(struct credential *c, struct strbuf *out);
+static void credential_format(struct credential *c, struct strbuf *out);
+
+static int select_all(const struct urlmatch_item *a,
+		      const struct urlmatch_item *b)
+{
+	return 0;
+}
+
+static int match_partial_url(const char *url, void *cb)
+{
+	struct credential *c = cb;
+	struct credential want = CREDENTIAL_INIT;
+	int matches = 0;
+
+	if (credential_from_potentially_partial_url(&want, url) < 0)
+		warning(_("skipping credential lookup for key: credential.%s"),
+			url);
+	else
+		matches = credential_match(&want, c);
+	credential_clear(&want);
+
+	return matches;
+}
+
 static void credential_apply_config(struct credential *c)
 {
+	char *normalized_url;
+	struct urlmatch_config config = { STRING_LIST_INIT_DUP };
+	struct strbuf url = STRBUF_INIT;
+
+	if (!c->host)
+		die(_("refusing to work with credential missing host field"));
+	if (!c->protocol)
+		die(_("refusing to work with credential missing protocol field"));
+
 	if (c->configured)
 		return;
-	git_config(credential_config_callback, c);
+
+	config.section = "credential";
+	config.key = NULL;
+	config.collect_fn = credential_config_callback;
+	config.cascade_fn = NULL;
+	config.select_fn = select_all;
+	config.fallback_match_fn = match_partial_url;
+	config.cb = c;
+
+	credential_format(c, &url);
+	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);
+
 	c->configured = 1;
 
 	if (!c->use_http_path && proto_is_http(c->protocol)) {
@@ -112,6 +152,23 @@ static void credential_describe(struct credential *c, struct strbuf *out)
 		strbuf_addf(out, "/%s", c->path);
 }
 
+static void credential_format(struct credential *c, struct strbuf *out)
+{
+	if (!c->protocol)
+		return;
+	strbuf_addf(out, "%s://", c->protocol);
+	if (c->username && *c->username) {
+		strbuf_add_percentencode(out, c->username, STRBUF_ENCODE_SLASH);
+		strbuf_addch(out, '@');
+	}
+	if (c->host)
+		strbuf_addstr(out, c->host);
+	if (c->path) {
+		strbuf_addch(out, '/');
+		strbuf_add_percentencode(out, c->path, 0);
+	}
+}
+
 static char *credential_ask_one(const char *what, struct credential *c,
 				int flags)
 {
@@ -146,7 +203,7 @@ int credential_read(struct credential *c, FILE *fp)
 {
 	struct strbuf line = STRBUF_INIT;
 
-	while (strbuf_getline_lf(&line, fp) != EOF) {
+	while (strbuf_getline(&line, fp) != EOF) {
 		char *key = line.buf;
 		char *value = strchr(key, '=');
 
@@ -163,6 +220,7 @@ int credential_read(struct credential *c, FILE *fp)
 		if (!strcmp(key, "username")) {
 			free(c->username);
 			c->username = xstrdup(value);
+			c->username_from_proto = 1;
 		} else if (!strcmp(key, "password")) {
 			free(c->password);
 			c->password = xstrdup(value);
@@ -191,20 +249,25 @@ int credential_read(struct credential *c, FILE *fp)
 	return 0;
 }
 
-static void credential_write_item(FILE *fp, const char *key, const char *value)
+static void credential_write_item(FILE *fp, const char *key, const char *value,
+				  int required)
 {
+	if (!value && required)
+		BUG("credential value for %s is missing", key);
 	if (!value)
 		return;
+	if (strchr(value, '\n'))
+		die("credential value for %s contains newline", key);
 	fprintf(fp, "%s=%s\n", key, value);
 }
 
 void credential_write(const struct credential *c, FILE *fp)
 {
-	credential_write_item(fp, "protocol", c->protocol);
-	credential_write_item(fp, "host", c->host);
-	credential_write_item(fp, "path", c->path);
-	credential_write_item(fp, "username", c->username);
-	credential_write_item(fp, "password", c->password);
+	credential_write_item(fp, "protocol", c->protocol, 1);
+	credential_write_item(fp, "host", c->host, 1);
+	credential_write_item(fp, "path", c->path, 0);
+	credential_write_item(fp, "username", c->username, 0);
+	credential_write_item(fp, "password", c->password, 0);
 }
 
 static int run_credential_helper(struct credential *c,
@@ -212,11 +275,9 @@ static int run_credential_helper(struct credential *c,
 				 int want_output)
 {
 	struct child_process helper = CHILD_PROCESS_INIT;
-	const char *argv[] = { NULL, NULL };
 	FILE *fp;
 
-	argv[0] = cmd;
-	helper.argv = argv;
+	strvec_push(&helper.args, cmd);
 	helper.use_shell = 1;
 	helper.in = -1;
 	if (want_output)
@@ -322,7 +383,45 @@ void credential_reject(struct credential *c)
 	c->approved = 0;
 }
 
-void credential_from_url(struct credential *c, const char *url)
+static int check_url_component(const char *url, int quiet,
+			       const char *name, const char *value)
+{
+	if (!value)
+		return 0;
+	if (!strchr(value, '\n'))
+		return 0;
+
+	if (!quiet)
+		warning(_("url contains a newline in its %s component: %s"),
+			name, url);
+	return -1;
+}
+
+/*
+ * Potentially-partial URLs can, but do not have to, contain
+ *
+ * - a protocol (or scheme) of the form "<protocol>://"
+ *
+ * - a host name (the part after the protocol and before the first slash after
+ *   that, if any)
+ *
+ * - a user name and potentially a password (as "<user>[:<password>]@" part of
+ *   the host name)
+ *
+ * - a path (the part after the host name, if any, starting with the slash)
+ *
+ * Missing parts will be left unset in `struct credential`. Thus, `https://`
+ * will have only the `protocol` set, `example.com` only the host name, and
+ * `/git` only the path.
+ *
+ * Note that an empty host name in an otherwise fully-qualified URL (e.g.
+ * `cert:///path/to/cert.pem`) will be treated as unset if we expect the URL to
+ * be potentially partial, and only then (otherwise, the empty string is used).
+ *
+ * The credential_from_url() function does not allow partial URLs.
+ */
+static int credential_from_url_1(struct credential *c, const char *url,
+				 int allow_partial_url, int quiet)
 {
 	const char *at, *colon, *cp, *slash, *host, *proto_end;
 
@@ -335,12 +434,22 @@ void credential_from_url(struct credential *c, const char *url)
 	 *   (3) proto://<user>:<pass>@<host>/...
 	 */
 	proto_end = strstr(url, "://");
-	if (!proto_end)
-		return;
-	cp = proto_end + 3;
+	if (!allow_partial_url && (!proto_end || proto_end == url)) {
+		if (!quiet)
+			warning(_("url has no scheme: %s"), url);
+		return -1;
+	}
+	cp = proto_end ? proto_end + 3 : url;
 	at = strchr(cp, '@');
 	colon = strchr(cp, ':');
-	slash = strchrnul(cp, '/');
+
+	/*
+	 * A query or fragment marker before the slash ends the host portion.
+	 * We'll just continue to call this "slash" for simplicity. Notably our
+	 * "trim leading slashes" part won't skip over this part of the path,
+	 * but that's what we'd want.
+	 */
+	slash = cp + strcspn(cp, "/?#");
 
 	if (!at || slash <= at) {
 		/* Case (1) */
@@ -349,17 +458,21 @@ void credential_from_url(struct credential *c, const char *url)
 	else if (!colon || at <= colon) {
 		/* Case (2) */
 		c->username = url_decode_mem(cp, at - cp);
+		if (c->username && *c->username)
+			c->username_from_proto = 1;
 		host = at + 1;
 	} else {
 		/* Case (3) */
 		c->username = url_decode_mem(cp, colon - cp);
+		if (c->username && *c->username)
+			c->username_from_proto = 1;
 		c->password = url_decode_mem(colon + 1, at - (colon + 1));
 		host = at + 1;
 	}
 
-	if (proto_end - url > 0)
+	if (proto_end && proto_end - url > 0)
 		c->protocol = xmemdupz(url, proto_end - url);
-	if (slash - host > 0)
+	if (!allow_partial_url || slash - host > 0)
 		c->host = url_decode_mem(host, slash - host);
 	/* Trim leading and trailing slashes from path */
 	while (*slash == '/')
@@ -371,4 +484,30 @@ void credential_from_url(struct credential *c, const char *url)
 		while (p > c->path && *p == '/')
 			*p-- = '\0';
 	}
+
+	if (check_url_component(url, quiet, "username", c->username) < 0 ||
+	    check_url_component(url, quiet, "password", c->password) < 0 ||
+	    check_url_component(url, quiet, "protocol", c->protocol) < 0 ||
+	    check_url_component(url, quiet, "host", c->host) < 0 ||
+	    check_url_component(url, quiet, "path", c->path) < 0)
+		return -1;
+
+	return 0;
+}
+
+static int credential_from_potentially_partial_url(struct credential *c,
+						   const char *url)
+{
+	return credential_from_url_1(c, url, 1, 0);
+}
+
+int credential_from_url_gently(struct credential *c, const char *url, int quiet)
+{
+	return credential_from_url_1(c, url, 0, quiet);
+}
+
+void credential_from_url(struct credential *c, const char *url)
+{
+	if (credential_from_url_gently(c, url, 0) < 0)
+		die(_("credential url cannot be parsed: %s"), url);
 }
diff --git a/credential.h b/credential.h
index 6b0cd16be2..f430e77fea 100644
--- a/credential.h
+++ b/credential.h
@@ -3,12 +3,123 @@
 
 #include "string-list.h"
 
+/**
+ * The credentials API provides an abstracted way of gathering username and
+ * password credentials from the user.
+ *
+ * Typical setup
+ * -------------
+ *
+ * ------------
+ * +-----------------------+
+ * | Git code (C)          |--- to server requiring --->
+ * |                       |        authentication
+ * |.......................|
+ * | C credential API      |--- prompt ---> User
+ * +-----------------------+
+ * 	^      |
+ * 	| pipe |
+ * 	|      v
+ * +-----------------------+
+ * | Git credential helper |
+ * +-----------------------+
+ * ------------
+ *
+ * The Git code (typically a remote-helper) will call the C API to obtain
+ * credential data like a login/password pair (credential_fill). The
+ * API will itself call a remote helper (e.g. "git credential-cache" or
+ * "git credential-store") that may retrieve credential data from a
+ * store. If the credential helper cannot find the information, the C API
+ * will prompt the user. Then, the caller of the API takes care of
+ * contacting the server, and does the actual authentication.
+ *
+ * C API
+ * -----
+ *
+ * The credential C API is meant to be called by Git code which needs to
+ * acquire or store a credential. It is centered around an object
+ * representing a single credential and provides three basic operations:
+ * fill (acquire credentials by calling helpers and/or prompting the user),
+ * approve (mark a credential as successfully used so that it can be stored
+ * for later use), and reject (mark a credential as unsuccessful so that it
+ * can be erased from any persistent storage).
+ *
+ * Example
+ * ~~~~~~~
+ *
+ * The example below shows how the functions of the credential API could be
+ * used to login to a fictitious "foo" service on a remote host:
+ *
+ * -----------------------------------------------------------------------
+ * int foo_login(struct foo_connection *f)
+ * {
+ * 	int status;
+ * 	// Create a credential with some context; we don't yet know the
+ * 	// username or password.
+ *
+ * struct credential c = CREDENTIAL_INIT;
+ * c.protocol = xstrdup("foo");
+ * c.host = xstrdup(f->hostname);
+ *
+ * // Fill in the username and password fields by contacting
+ * // helpers and/or asking the user. The function will die if it
+ * // fails.
+ * credential_fill(&c);
+ *
+ * // Otherwise, we have a username and password. Try to use it.
+ *
+ * status = send_foo_login(f, c.username, c.password);
+ * switch (status) {
+ * case FOO_OK:
+ * // It worked. Store the credential for later use.
+ * credential_accept(&c);
+ * break;
+ * case FOO_BAD_LOGIN:
+ * // Erase the credential from storage so we don't try it again.
+ * credential_reject(&c);
+ * break;
+ * default:
+ * // Some other error occurred. We don't know if the
+ * // credential is good or bad, so report nothing to the
+ * // credential subsystem.
+ * }
+ *
+ * // Free any associated resources.
+ * credential_clear(&c);
+ *
+ * return status;
+ * }
+ * -----------------------------------------------------------------------
+ */
+
+
+/**
+ * This struct represents a single username/password combination
+ * along with any associated context. All string fields should be
+ * heap-allocated (or NULL if they are not known or not applicable).
+ * The meaning of the individual context fields is the same as
+ * their counterparts in the helper protocol.
+ *
+ * This struct should always be initialized with `CREDENTIAL_INIT` or
+ * `credential_init`.
+ */
 struct credential {
+
+	/**
+	 * A `string_list` of helpers. Each string specifies an external
+	 * helper which will be run, in order, to either acquire or store
+	 * credentials. This list is filled-in by the API functions
+	 * according to the corresponding configuration variables before
+	 * consulting helpers, so there usually is no need for a caller to
+	 * modify the helpers field at all.
+	 */
 	struct string_list helpers;
+
 	unsigned approved:1,
 		 configured:1,
 		 quit:1,
-		 use_http_path:1;
+		 use_http_path:1,
+		 username_from_proto:1;
 
 	char *username;
 	char *password;
@@ -17,19 +128,70 @@ struct credential {
 	char *path;
 };
 
-#define CREDENTIAL_INIT { STRING_LIST_INIT_DUP }
+#define CREDENTIAL_INIT { \
+	.helpers = STRING_LIST_INIT_DUP, \
+}
 
+/* Initialize a credential structure, setting all fields to empty. */
 void credential_init(struct credential *);
+
+/**
+ * Free any resources associated with the credential structure, returning
+ * it to a pristine initialized state.
+ */
 void credential_clear(struct credential *);
 
+/**
+ * Instruct the credential subsystem to fill the username and
+ * password fields of the passed credential struct by first
+ * consulting helpers, then asking the user. After this function
+ * returns, the username and password fields of the credential are
+ * guaranteed to be non-NULL. If an error occurs, the function will
+ * die().
+ */
 void credential_fill(struct credential *);
+
+/**
+ * Inform the credential subsystem that the provided credentials
+ * were successfully used for authentication.  This will cause the
+ * credential subsystem to notify any helpers of the approval, so
+ * that they may store the result to be used again.  Any errors
+ * from helpers are ignored.
+ */
 void credential_approve(struct credential *);
+
+/**
+ * Inform the credential subsystem that the provided credentials
+ * have been rejected. This will cause the credential subsystem to
+ * notify any helpers of the rejection (which allows them, for
+ * example, to purge the invalid credentials from storage). It
+ * will also free() the username and password fields of the
+ * credential and set them to NULL (readying the credential for
+ * another call to `credential_fill`). Any errors from helpers are
+ * ignored.
+ */
 void credential_reject(struct credential *);
 
 int credential_read(struct credential *, FILE *);
 void credential_write(const struct credential *, FILE *);
+
+/*
+ * Parse a url into a credential struct, replacing any existing contents.
+ *
+ * If the url can't be parsed (e.g., a missing "proto://" component), the
+ * resulting credential will be empty and the function will return an
+ * error (even in the "gently" form).
+ *
+ * If we encounter a component which cannot be represented as a credential
+ * value (e.g., because it contains a newline), the "gently" form will return
+ * an error but leave the broken state in the credential object for further
+ * examination.  The non-gentle form will issue a warning to stderr and return
+ * an empty credential.
+ */
 void credential_from_url(struct credential *, const char *url);
-int credential_match(const struct credential *have,
-		     const struct credential *want);
+int credential_from_url_gently(struct credential *, const char *url, int quiet);
+
+int credential_match(const struct credential *want,
+		     const struct credential *have);
 
 #endif /* CREDENTIAL_H */
diff --git a/csum-file.c b/csum-file.c
index 53ce37f7ca..26e8a6df44 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -11,35 +11,33 @@
 #include "progress.h"
 #include "csum-file.h"
 
+static void verify_buffer_or_die(struct hashfile *f,
+				 const void *buf,
+				 unsigned int count)
+{
+	ssize_t ret = read_in_full(f->check_fd, f->check_buffer, count);
+
+	if (ret < 0)
+		die_errno("%s: sha1 file read error", f->name);
+	if (ret != count)
+		die("%s: sha1 file truncated", f->name);
+	if (memcmp(buf, f->check_buffer, count))
+		die("sha1 file '%s' validation error", f->name);
+}
+
 static void flush(struct hashfile *f, const void *buf, unsigned int count)
 {
-	if (0 <= f->check_fd && count)  {
-		unsigned char check_buffer[8192];
-		ssize_t ret = read_in_full(f->check_fd, check_buffer, count);
-
-		if (ret < 0)
-			die_errno("%s: sha1 file read error", f->name);
-		if (ret != count)
-			die("%s: sha1 file truncated", f->name);
-		if (memcmp(buf, check_buffer, count))
-			die("sha1 file '%s' validation error", f->name);
-	}
+	if (0 <= f->check_fd && count)
+		verify_buffer_or_die(f, buf, count);
 
-	for (;;) {
-		int ret = xwrite(f->fd, buf, count);
-		if (ret > 0) {
-			f->total += ret;
-			display_throughput(f->tp, f->total);
-			buf = (char *) buf + ret;
-			count -= ret;
-			if (count)
-				continue;
-			return;
-		}
-		if (!ret)
+	if (write_in_full(f->fd, buf, count) < 0) {
+		if (errno == ENOSPC)
 			die("sha1 file '%s' write error. Out of diskspace", f->name);
 		die_errno("sha1 file '%s' write error", f->name);
 	}
+
+	f->total += count;
+	display_throughput(f->tp, f->total);
 }
 
 void hashflush(struct hashfile *f)
@@ -53,6 +51,13 @@ void hashflush(struct hashfile *f)
 	}
 }
 
+static void free_hashfile(struct hashfile *f)
+{
+	free(f->buffer);
+	free(f->check_buffer);
+	free(f);
+}
+
 int finalize_hashfile(struct hashfile *f, unsigned char *result, unsigned int flags)
 {
 	int fd;
@@ -82,64 +87,62 @@ int finalize_hashfile(struct hashfile *f, unsigned char *result, unsigned int fl
 		if (close(f->check_fd))
 			die_errno("%s: sha1 file error on close", f->name);
 	}
-	free(f);
+	free_hashfile(f);
 	return fd;
 }
 
 void hashwrite(struct hashfile *f, const void *buf, unsigned int count)
 {
 	while (count) {
-		unsigned offset = f->offset;
-		unsigned left = sizeof(f->buffer) - offset;
+		unsigned left = f->buffer_len - f->offset;
 		unsigned nr = count > left ? left : count;
-		const void *data;
 
 		if (f->do_crc)
 			f->crc32 = crc32(f->crc32, buf, nr);
 
-		if (nr == sizeof(f->buffer)) {
-			/* process full buffer directly without copy */
-			data = buf;
+		if (nr == f->buffer_len) {
+			/*
+			 * Flush a full batch worth of data directly
+			 * from the input, skipping the memcpy() to
+			 * the hashfile's buffer. In this block,
+			 * f->offset is necessarily zero.
+			 */
+			the_hash_algo->update_fn(&f->ctx, buf, nr);
+			flush(f, buf, nr);
 		} else {
-			memcpy(f->buffer + offset, buf, nr);
-			data = f->buffer;
+			/*
+			 * Copy to the hashfile's buffer, flushing only
+			 * if it became full.
+			 */
+			memcpy(f->buffer + f->offset, buf, nr);
+			f->offset += nr;
+			left -= nr;
+			if (!left)
+				hashflush(f);
 		}
 
 		count -= nr;
-		offset += nr;
 		buf = (char *) buf + nr;
-		left -= nr;
-		if (!left) {
-			the_hash_algo->update_fn(&f->ctx, data, offset);
-			flush(f, data, offset);
-			offset = 0;
-		}
-		f->offset = offset;
 	}
 }
 
-struct hashfile *hashfd(int fd, const char *name)
-{
-	return hashfd_throughput(fd, name, NULL);
-}
-
 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);
+
 	return f;
 }
 
-struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp)
+static struct hashfile *hashfd_internal(int fd, const char *name,
+					struct progress *tp,
+					size_t buffer_len)
 {
 	struct hashfile *f = xmalloc(sizeof(*f));
 	f->fd = fd;
@@ -150,14 +153,40 @@ struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp
 	f->name = name;
 	f->do_crc = 0;
 	the_hash_algo->init_fn(&f->ctx);
+
+	f->buffer_len = buffer_len;
+	f->buffer = xmalloc(buffer_len);
+	f->check_buffer = NULL;
+
 	return f;
 }
 
+struct hashfile *hashfd(int fd, const char *name)
+{
+	/*
+	 * Since we are not going to use a progress meter to
+	 * measure the rate of data passing through this hashfile,
+	 * use a larger buffer size to reduce fsync() calls.
+	 */
+	return hashfd_internal(fd, name, NULL, 128 * 1024);
+}
+
+struct hashfile *hashfd_throughput(int fd, const char *name, struct progress *tp)
+{
+	/*
+	 * Since we are expecting to report progress of the
+	 * write into this hashfile, use a smaller buffer
+	 * size so the progress indicators arrive at a more
+	 * frequent rate.
+	 */
+	return hashfd_internal(fd, name, tp, 8 * 1024);
+}
+
 void hashfile_checkpoint(struct hashfile *f, struct hashfile_checkpoint *checkpoint)
 {
 	hashflush(f);
 	checkpoint->offset = f->total;
-	checkpoint->ctx = f->ctx;
+	the_hash_algo->clone_fn(&checkpoint->ctx, &f->ctx);
 }
 
 int hashfile_truncate(struct hashfile *f, struct hashfile_checkpoint *checkpoint)
@@ -184,3 +213,19 @@ uint32_t crc32_end(struct hashfile *f)
 	f->do_crc = 0;
 	return f->crc32;
 }
+
+int hashfile_checksum_valid(const unsigned char *data, size_t total_len)
+{
+	unsigned char got[GIT_MAX_RAWSZ];
+	git_hash_ctx ctx;
+	size_t data_len = total_len - the_hash_algo->rawsz;
+
+	if (total_len < the_hash_algo->rawsz)
+		return 0; /* say "too short"? */
+
+	the_hash_algo->init_fn(&ctx);
+	the_hash_algo->update_fn(&ctx, data, data_len);
+	the_hash_algo->final_fn(got, &ctx);
+
+	return hasheq(got, data + data_len);
+}
diff --git a/csum-file.h b/csum-file.h
index a98b1eee53..291215b34e 100644
--- a/csum-file.h
+++ b/csum-file.h
@@ -16,7 +16,9 @@ struct hashfile {
 	const char *name;
 	int do_crc;
 	uint32_t crc32;
-	unsigned char buffer[8192];
+	size_t buffer_len;
+	unsigned char *buffer;
+	unsigned char *check_buffer;
 };
 
 /* Checkpoint */
@@ -42,6 +44,18 @@ void hashflush(struct hashfile *f);
 void crc32_begin(struct hashfile *);
 uint32_t crc32_end(struct hashfile *);
 
+/* Verify checksum validity while reading. Returns non-zero on success. */
+int hashfile_checksum_valid(const unsigned char *data, size_t len);
+
+/*
+ * Returns the total number of bytes fed to the hashfile so far (including ones
+ * that have not been written out to the descriptor yet).
+ */
+static inline off_t hashfile_total(struct hashfile *f)
+{
+	return f->total + f->offset;
+}
+
 static inline void hashwrite_u8(struct hashfile *f, uint8_t data)
 {
 	hashwrite(f, &data, sizeof(data));
@@ -53,4 +67,11 @@ static inline void hashwrite_be32(struct hashfile *f, uint32_t data)
 	hashwrite(f, &data, sizeof(data));
 }
 
+static inline size_t hashwrite_be64(struct hashfile *f, uint64_t data)
+{
+	data = htonll(data);
+	hashwrite(f, &data, sizeof(data));
+	return sizeof(data);
+}
+
 #endif
diff --git a/daemon.c b/daemon.c
index 9d2e0d20ef..5c4cbad62d 100644
--- a/daemon.c
+++ b/daemon.c
@@ -296,7 +296,7 @@ static const char *path_ok(const char *directory, struct hostinfo *hi)
 	return NULL;		/* Fallthrough. Deny by default */
 }
 
-typedef int (*daemon_service_fn)(const struct argv_array *env);
+typedef int (*daemon_service_fn)(const struct strvec *env);
 struct daemon_service {
 	const char *name;
 	const char *config_name;
@@ -377,7 +377,7 @@ error_return:
 }
 
 static int run_service(const char *dir, struct daemon_service *service,
-		       struct hostinfo *hi, const struct argv_array *env)
+		       struct hostinfo *hi, const struct strvec *env)
 {
 	const char *path;
 	int enabled = service->enabled;
@@ -462,7 +462,7 @@ static void copy_to_log(int fd)
 
 static int run_service_command(struct child_process *cld)
 {
-	argv_array_push(&cld->args, ".");
+	strvec_push(&cld->args, ".");
 	cld->git_cmd = 1;
 	cld->err = -1;
 	if (start_command(cld))
@@ -476,33 +476,33 @@ static int run_service_command(struct child_process *cld)
 	return finish_command(cld);
 }
 
-static int upload_pack(const struct argv_array *env)
+static int upload_pack(const struct strvec *env)
 {
 	struct child_process cld = CHILD_PROCESS_INIT;
-	argv_array_pushl(&cld.args, "upload-pack", "--strict", NULL);
-	argv_array_pushf(&cld.args, "--timeout=%u", timeout);
+	strvec_pushl(&cld.args, "upload-pack", "--strict", NULL);
+	strvec_pushf(&cld.args, "--timeout=%u", timeout);
 
-	argv_array_pushv(&cld.env_array, env->argv);
+	strvec_pushv(&cld.env_array, env->v);
 
 	return run_service_command(&cld);
 }
 
-static int upload_archive(const struct argv_array *env)
+static int upload_archive(const struct strvec *env)
 {
 	struct child_process cld = CHILD_PROCESS_INIT;
-	argv_array_push(&cld.args, "upload-archive");
+	strvec_push(&cld.args, "upload-archive");
 
-	argv_array_pushv(&cld.env_array, env->argv);
+	strvec_pushv(&cld.env_array, env->v);
 
 	return run_service_command(&cld);
 }
 
-static int receive_pack(const struct argv_array *env)
+static int receive_pack(const struct strvec *env)
 {
 	struct child_process cld = CHILD_PROCESS_INIT;
-	argv_array_push(&cld.args, "receive-pack");
+	strvec_push(&cld.args, "receive-pack");
 
-	argv_array_pushv(&cld.env_array, env->argv);
+	strvec_pushv(&cld.env_array, env->v);
 
 	return run_service_command(&cld);
 }
@@ -566,14 +566,14 @@ static void parse_host_and_port(char *hostport, char **host,
 
 /*
  * Sanitize a string from the client so that it's OK to be inserted into a
- * filesystem path. Specifically, we disallow slashes, runs of "..", and
- * trailing and leading dots, which means that the client cannot escape
- * our base path via ".." traversal.
+ * filesystem path. Specifically, we disallow directory separators, runs
+ * of "..", and trailing and leading dots, which means that the client
+ * cannot escape our base path via ".." traversal.
  */
 static void sanitize_client(struct strbuf *out, const char *in)
 {
 	for (; *in; in++) {
-		if (*in == '/')
+		if (is_dir_sep(*in))
 			continue;
 		if (*in == '.' && (!out->len || out->buf[out->len - 1] == '.'))
 			continue;
@@ -598,7 +598,7 @@ static void canonicalize_client(struct strbuf *out, const char *in)
  * Read the host as supplied by the client connection.
  *
  * Returns a pointer to the character after the NUL byte terminating the host
- * arguemnt, or 'extra_args' if there is no host arguemnt.
+ * argument, or 'extra_args' if there is no host argument.
  */
 static char *parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen)
 {
@@ -633,7 +633,7 @@ static char *parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen)
 	return extra_args;
 }
 
-static void parse_extra_args(struct hostinfo *hi, struct argv_array *env,
+static void parse_extra_args(struct hostinfo *hi, struct strvec *env,
 			     char *extra_args, int buflen)
 {
 	const char *end = extra_args + buflen;
@@ -652,7 +652,7 @@ static void parse_extra_args(struct hostinfo *hi, struct argv_array *env,
 		 * service that will be run.
 		 *
 		 * If there ends up being a particular arg in the future that
-		 * git-daemon needs to parse specificly (like the 'host' arg)
+		 * git-daemon needs to parse specifically (like the 'host' arg)
 		 * then it can be parsed here and not added to 'git_protocol'.
 		 */
 		if (*arg) {
@@ -664,8 +664,8 @@ static void parse_extra_args(struct hostinfo *hi, struct argv_array *env,
 
 	if (git_protocol.len > 0) {
 		loginfo("Extended attribute \"protocol\": %s", git_protocol.buf);
-		argv_array_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=%s",
-				 git_protocol.buf);
+		strvec_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=%s",
+			     git_protocol.buf);
 	}
 	strbuf_release(&git_protocol);
 }
@@ -761,7 +761,7 @@ static int execute(void)
 	int pktlen, len, i;
 	char *addr = getenv("REMOTE_ADDR"), *port = getenv("REMOTE_PORT");
 	struct hostinfo hi;
-	struct argv_array env = ARGV_ARRAY_INIT;
+	struct strvec env = STRVEC_INIT;
 
 	hostinfo_init(&hi);
 
@@ -794,13 +794,13 @@ static int execute(void)
 			 */
 			int rc = run_service(arg, s, &hi, &env);
 			hostinfo_clear(&hi);
-			argv_array_clear(&env);
+			strvec_clear(&env);
 			return rc;
 		}
 	}
 
 	hostinfo_clear(&hi);
-	argv_array_clear(&env);
+	strvec_clear(&env);
 	logerror("Protocol error: '%s'", line);
 	return -1;
 }
@@ -840,7 +840,7 @@ static void add_child(struct child_process *cld, struct sockaddr *addr, socklen_
 {
 	struct child *newborn, **cradle;
 
-	newborn = xcalloc(1, sizeof(*newborn));
+	CALLOC_ARRAY(newborn, 1);
 	live_children++;
 	memcpy(&newborn->cld, cld, sizeof(*cld));
 	memcpy(&newborn->address, addr, addrlen);
@@ -893,7 +893,7 @@ static void check_dead_children(void)
 			cradle = &blanket->next;
 }
 
-static struct argv_array cld_argv = ARGV_ARRAY_INIT;
+static struct strvec cld_argv = STRVEC_INIT;
 static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
 {
 	struct child_process cld = CHILD_PROCESS_INIT;
@@ -913,21 +913,21 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
 		char buf[128] = "";
 		struct sockaddr_in *sin_addr = (void *) addr;
 		inet_ntop(addr->sa_family, &sin_addr->sin_addr, buf, sizeof(buf));
-		argv_array_pushf(&cld.env_array, "REMOTE_ADDR=%s", buf);
-		argv_array_pushf(&cld.env_array, "REMOTE_PORT=%d",
-				 ntohs(sin_addr->sin_port));
+		strvec_pushf(&cld.env_array, "REMOTE_ADDR=%s", buf);
+		strvec_pushf(&cld.env_array, "REMOTE_PORT=%d",
+			     ntohs(sin_addr->sin_port));
 #ifndef NO_IPV6
 	} else if (addr->sa_family == AF_INET6) {
 		char buf[128] = "";
 		struct sockaddr_in6 *sin6_addr = (void *) addr;
 		inet_ntop(AF_INET6, &sin6_addr->sin6_addr, buf, sizeof(buf));
-		argv_array_pushf(&cld.env_array, "REMOTE_ADDR=[%s]", buf);
-		argv_array_pushf(&cld.env_array, "REMOTE_PORT=%d",
-				 ntohs(sin6_addr->sin6_port));
+		strvec_pushf(&cld.env_array, "REMOTE_ADDR=[%s]", buf);
+		strvec_pushf(&cld.env_array, "REMOTE_PORT=%d",
+			     ntohs(sin6_addr->sin6_port));
 #endif
 	}
 
-	cld.argv = cld_argv.argv;
+	cld.argv = cld_argv.v;
 	cld.in = incoming;
 	cld.out = dup(incoming);
 
@@ -1148,7 +1148,7 @@ static int service_loop(struct socketlist *socklist)
 	struct pollfd *pfd;
 	int i;
 
-	pfd = xcalloc(socklist->nr, sizeof(struct pollfd));
+	CALLOC_ARRAY(pfd, socklist->nr);
 
 	for (i = 0; i < socklist->nr; i++) {
 		pfd[i].fd = socklist->list[i];
@@ -1476,10 +1476,10 @@ int cmd_main(int argc, const char **argv)
 		write_file(pid_file, "%"PRIuMAX, (uintmax_t) getpid());
 
 	/* prepare argv for serving-processes */
-	argv_array_push(&cld_argv, argv[0]); /* git-daemon */
-	argv_array_push(&cld_argv, "--serve");
+	strvec_push(&cld_argv, argv[0]); /* git-daemon */
+	strvec_push(&cld_argv, "--serve");
 	for (i = 1; i < argc; ++i)
-		argv_array_push(&cld_argv, argv[i]);
+		strvec_push(&cld_argv, argv[i]);
 
 	return serve(&listen_addr, listen_port, cred);
 }
diff --git a/date.c b/date.c
index 041db7db4e..c55ea47e96 100644
--- a/date.c
+++ b/date.c
@@ -64,16 +64,16 @@ static time_t gm_time_t(timestamp_t time, int tz)
  * thing, which means that tz -0100 is passed in as the integer -100,
  * even though it means "sixty minutes off"
  */
-static struct tm *time_to_tm(timestamp_t time, int tz)
+static struct tm *time_to_tm(timestamp_t time, int tz, struct tm *tm)
 {
 	time_t t = gm_time_t(time, tz);
-	return gmtime(&t);
+	return gmtime_r(&t, tm);
 }
 
-static struct tm *time_to_tm_local(timestamp_t time)
+static struct tm *time_to_tm_local(timestamp_t time, struct tm *tm)
 {
 	time_t t = time;
-	return localtime(&t);
+	return localtime_r(&t, tm);
 }
 
 /*
@@ -283,6 +283,7 @@ static void show_date_normal(struct strbuf *buf, timestamp_t time, struct tm *tm
 const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
 {
 	struct tm *tm;
+	struct tm tmbuf = { 0 };
 	struct tm human_tm = { 0 };
 	int human_tz = -1;
 	static struct strbuf timebuf = STRBUF_INIT;
@@ -318,11 +319,11 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode)
 	}
 
 	if (mode->local)
-		tm = time_to_tm_local(time);
+		tm = time_to_tm_local(time, &tmbuf);
 	else
-		tm = time_to_tm(time, tz);
+		tm = time_to_tm(time, tz, &tmbuf);
 	if (!tm) {
-		tm = time_to_tm(0, 0);
+		tm = time_to_tm(0, 0, &tmbuf);
 		tz = 0;
 	}
 
@@ -496,7 +497,7 @@ static int match_alpha(const char *date, struct tm *tm, int *offset)
 	return skip_alpha(date);
 }
 
-static int is_date(int year, int month, int day, struct tm *now_tm, time_t now, struct tm *tm)
+static int set_date(int year, int month, int day, struct tm *now_tm, time_t now, struct tm *tm)
 {
 	if (month > 0 && month < 13 && day > 0 && day < 32) {
 		struct tm check = *tm;
@@ -517,9 +518,9 @@ static int is_date(int year, int month, int day, struct tm *now_tm, time_t now,
 		else if (year < 38)
 			r->tm_year = year + 100;
 		else
-			return 0;
+			return -1;
 		if (!now_tm)
-			return 1;
+			return 0;
 
 		specified = tm_to_time_t(r);
 
@@ -528,14 +529,33 @@ static int is_date(int year, int month, int day, struct tm *now_tm, time_t now,
 		 * sure it is not later than ten days from now...
 		 */
 		if ((specified != -1) && (now + 10*24*3600 < specified))
-			return 0;
+			return -1;
 		tm->tm_mon = r->tm_mon;
 		tm->tm_mday = r->tm_mday;
 		if (year != -1)
 			tm->tm_year = r->tm_year;
-		return 1;
+		return 0;
 	}
-	return 0;
+	return -1;
+}
+
+static int set_time(long hour, long minute, long second, struct tm *tm)
+{
+	/* We accept 61st second because of leap second */
+	if (0 <= hour && hour <= 24 &&
+	    0 <= minute && minute < 60 &&
+	    0 <= second && second <= 60) {
+		tm->tm_hour = hour;
+		tm->tm_min = minute;
+		tm->tm_sec = second;
+		return 0;
+	}
+	return -1;
+}
+
+static int is_date_known(struct tm *tm)
+{
+	return tm->tm_year != -1 && tm->tm_mon != -1 && tm->tm_mday != -1;
 }
 
 static int match_multi_number(timestamp_t num, char c, const char *date,
@@ -555,10 +575,14 @@ static int match_multi_number(timestamp_t num, char c, const char *date,
 	case ':':
 		if (num3 < 0)
 			num3 = 0;
-		if (num < 25 && num2 >= 0 && num2 < 60 && num3 >= 0 && num3 <= 60) {
-			tm->tm_hour = num;
-			tm->tm_min = num2;
-			tm->tm_sec = num3;
+		if (set_time(num, num2, num3, tm) == 0) {
+			/*
+			 * If %H:%M:%S was just parsed followed by: .<num4>
+			 * Consider (& discard) it as fractional second
+			 * if %Y%m%d is parsed before.
+			 */
+			if (*end == '.' && isdigit(end[1]) && is_date_known(tm))
+				strtol(end + 1, &end, 10);
 			break;
 		}
 		return 0;
@@ -574,10 +598,10 @@ static int match_multi_number(timestamp_t num, char c, const char *date,
 
 		if (num > 70) {
 			/* yyyy-mm-dd? */
-			if (is_date(num, num2, num3, NULL, now, tm))
+			if (set_date(num, num2, num3, NULL, now, tm) == 0)
 				break;
 			/* yyyy-dd-mm? */
-			if (is_date(num, num3, num2, NULL, now, tm))
+			if (set_date(num, num3, num2, NULL, now, tm) == 0)
 				break;
 		}
 		/* Our eastern European friends say dd.mm.yy[yy]
@@ -585,14 +609,14 @@ static int match_multi_number(timestamp_t num, char c, const char *date,
 		 * mm/dd/yy[yy] form only when separator is not '.'
 		 */
 		if (c != '.' &&
-		    is_date(num3, num, num2, refuse_future, now, tm))
+		    set_date(num3, num, num2, refuse_future, now, tm) == 0)
 			break;
 		/* European dd.mm.yy[yy] or funny US dd/mm/yy[yy] */
-		if (is_date(num3, num2, num, refuse_future, now, tm))
+		if (set_date(num3, num2, num, refuse_future, now, tm) == 0)
 			break;
 		/* Funny European mm.dd.yy */
 		if (c == '.' &&
-		    is_date(num3, num, num2, refuse_future, now, tm))
+		    set_date(num3, num, num2, refuse_future, now, tm) == 0)
 			break;
 		return 0;
 	}
@@ -663,6 +687,20 @@ static int match_digit(const char *date, struct tm *tm, int *offset, int *tm_gmt
 		n++;
 	} while (isdigit(date[n]));
 
+	/* 8 digits, compact style of ISO-8601's date: YYYYmmDD */
+	/* 6 digits, compact style of ISO-8601's time: HHMMSS */
+	if (n == 8 || n == 6) {
+		unsigned int num1 = num / 10000;
+		unsigned int num2 = (num % 10000) / 100;
+		unsigned int num3 = num % 100;
+		if (n == 8)
+			set_date(num1, num2, num3, NULL, time(NULL), tm);
+		else if (n == 6 && set_time(num1, num2, num3, tm) == 0 &&
+			 *end == '.' && isdigit(end[1]))
+			strtoul(end + 1, &end, 10);
+		return end - date;
+	}
+
 	/* Four-digit year or a timezone? */
 	if (n == 4) {
 		if (num <= 1400 && *offset == -1) {
@@ -870,7 +908,7 @@ int parse_expiry_date(const char *date, timestamp_t *timestamp)
 		/*
 		 * We take over "now" here, which usually translates
 		 * to the current timestamp.  This is because the user
-		 * really means to expire everything she has done in
+		 * really means to expire everything that was done in
 		 * the past, and by definition reflogs are the record
 		 * of the past, and there is nothing from the future
 		 * to be kept.
@@ -959,10 +997,11 @@ void datestamp(struct strbuf *out)
 {
 	time_t now;
 	int offset;
+	struct tm tm = { 0 };
 
 	time(&now);
 
-	offset = tm_to_time_t(localtime(&now)) - now;
+	offset = tm_to_time_t(localtime_r(&now, &tm)) - now;
 	offset /= 60;
 
 	date_string(now, offset, out);
diff --git a/decorate.c b/decorate.c
index a605b1b5f4..2036d15967 100644
--- a/decorate.c
+++ b/decorate.c
@@ -39,7 +39,7 @@ static void grow_decoration(struct decoration *n)
 	struct decoration_entry *old_entries = n->entries;
 
 	n->size = (old_size + 1000) * 3 / 2;
-	n->entries = xcalloc(n->size, sizeof(struct decoration_entry));
+	CALLOC_ARRAY(n->entries, n->size);
 	n->nr = 0;
 
 	for (i = 0; i < old_size; i++) {
diff --git a/delta-islands.c b/delta-islands.c
index 09dbd3cf72..aa98b2e541 100644
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -17,7 +17,7 @@
 #include "pack-bitmap.h"
 #include "pack-objects.h"
 #include "delta-islands.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "config.h"
 
 KHASH_INIT(str, const char *, void *, 1, kh_str_hash_func, kh_str_hash_equal)
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 61812f48c2..ca085a03ef 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -13,6 +13,7 @@
 #include "submodule.h"
 #include "dir.h"
 #include "fsmonitor.h"
+#include "commit-reach.h"
 
 /*
  * diff-files
@@ -27,9 +28,10 @@
  * exists for ce that is a submodule -- it is a submodule that is not
  * checked out).  Return negative for an error.
  */
-static int check_removed(const struct cache_entry *ce, struct stat *st)
+static int check_removed(const struct index_state *istate, const struct cache_entry *ce, struct stat *st)
 {
-	if (lstat(ce->name, st) < 0) {
+	assert(is_fsmonitor_refreshed(istate));
+	if (!(ce->ce_flags & CE_FSMONITOR_VALID) && lstat(ce->name, st) < 0) {
 		if (!is_missing_file_error(errno))
 			return -1;
 		return 1;
@@ -97,6 +99,8 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 
 	diff_set_mnemonic_prefix(&revs->diffopt, "i/", "w/");
 
+	refresh_fsmonitor(istate);
+
 	if (diff_unmerged_stage < 0)
 		diff_unmerged_stage = 2;
 	entries = istate->cache_nr;
@@ -113,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;
@@ -133,7 +141,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 			memset(&(dpath->parent[0]), 0,
 			       sizeof(struct combine_diff_parent)*5);
 
-			changed = check_removed(ce, &st);
+			changed = check_removed(istate, ce, &st);
 			if (!changed)
 				wt_mode = ce_mode_from_stat(ce, st.st_mode);
 			else {
@@ -177,9 +185,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 			i--;
 
 			if (revs->combine_merges && num_compare_stages == 2) {
-				show_combined_diff(dpath, 2,
-						   revs->dense_combined_merges,
-						   revs);
+				show_combined_diff(dpath, 2, revs);
 				free(dpath);
 				continue;
 			}
@@ -199,14 +205,23 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 		if (ce_uptodate(ce) || ce_skip_worktree(ce))
 			continue;
 
-		/* If CE_VALID is set, don't look at workdir for file removal */
-		if (ce->ce_flags & CE_VALID) {
+		/*
+		 * When CE_VALID is set (via "update-index --assume-unchanged"
+		 * or via adding paths while core.ignorestat is set to true),
+		 * the user has promised that the working tree file for that
+		 * path will not be modified.  When CE_FSMONITOR_VALID is true,
+		 * the fsmonitor knows that the path hasn't been modified since
+		 * we refreshed the cached stat information.  In either case,
+		 * we do not have to stat to see if the path has been removed
+		 * or modified.
+		 */
+		if (ce->ce_flags & (CE_VALID | CE_FSMONITOR_VALID)) {
 			changed = 0;
 			newmode = ce->ce_mode;
 		} else {
 			struct stat st;
 
-			changed = check_removed(ce, &st);
+			changed = check_removed(istate, ce, &st);
 			if (changed) {
 				if (changed < 0) {
 					perror(ce->name);
@@ -219,9 +234,9 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 				continue;
 			} else if (revs->diffopt.ita_invisible_in_index &&
 				   ce_intent_to_add(ce)) {
-				diff_addremove(&revs->diffopt, '+', ce->ce_mode,
-					       the_hash_algo->empty_tree, 0,
-					       ce->name, 0);
+				newmode = ce_mode_from_stat(ce, st.st_mode);
+				diff_addremove(&revs->diffopt, '+', newmode,
+					       null_oid(), 0, ce->name, 0);
 				continue;
 			}
 
@@ -238,7 +253,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
 		}
 		oldmode = ce->ce_mode;
 		old_oid = &ce->oid;
-		new_oid = changed ? &null_oid : &ce->oid;
+		new_oid = changed ? null_oid() : &ce->oid;
 		diff_change(&revs->diffopt, oldmode, newmode,
 			    old_oid, new_oid,
 			    !is_null_oid(old_oid),
@@ -268,7 +283,8 @@ static void diff_index_show_file(struct rev_info *revs,
 		       oid, oid_valid, ce->name, dirty_submodule);
 }
 
-static int get_stat_data(const struct cache_entry *ce,
+static int get_stat_data(const struct index_state *istate,
+			 const struct cache_entry *ce,
 			 const struct object_id **oidp,
 			 unsigned int *modep,
 			 int cached, int match_missing,
@@ -280,7 +296,7 @@ static int get_stat_data(const struct cache_entry *ce,
 	if (!cached && !ce_uptodate(ce)) {
 		int changed;
 		struct stat st;
-		changed = check_removed(ce, &st);
+		changed = check_removed(istate, ce, &st);
 		if (changed < 0)
 			return -1;
 		else if (changed) {
@@ -295,7 +311,7 @@ static int get_stat_data(const struct cache_entry *ce,
 						    0, dirty_submodule);
 		if (changed) {
 			mode = ce_mode_from_stat(ce, st.st_mode);
-			oid = &null_oid;
+			oid = null_oid();
 		}
 	}
 
@@ -311,12 +327,18 @@ static void show_new_file(struct rev_info *revs,
 	const struct object_id *oid;
 	unsigned int mode;
 	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.
 	 */
-	if (get_stat_data(new_file, &oid, &mode, cached, match_missing,
+	if (get_stat_data(istate, new_file, &oid, &mode, cached, match_missing,
 	    &dirty_submodule, &revs->diffopt) < 0)
 		return;
 
@@ -332,8 +354,23 @@ static int show_modified(struct rev_info *revs,
 	unsigned int mode, oldmode;
 	const struct object_id *oid;
 	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 (get_stat_data(new_entry, &oid, &mode, cached, match_missing,
+	/*
+	 * 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_index_show_file(revs, "-", old_entry,
@@ -361,7 +398,7 @@ static int show_modified(struct rev_info *revs,
 		p->parent[1].status = DIFF_STATUS_MODIFIED;
 		p->parent[1].mode = old_entry->ce_mode;
 		oidcpy(&p->parent[1].oid, &old_entry->oid);
-		show_combined_diff(p, 2, revs->dense_combined_merges, revs);
+		show_combined_diff(p, 2, revs);
 		free(p);
 		return 0;
 	}
@@ -405,14 +442,8 @@ static void do_oneway_diff(struct unpack_trees_options *o,
 	/* if the entry is not checked out, don't examine work tree */
 	cached = o->index_only ||
 		(idx && ((idx->ce_flags & CE_VALID) || ce_skip_worktree(idx)));
-	/*
-	 * Backward compatibility wart - "diff-index -m" does
-	 * not mean "do not ignore merges", but "match_missing".
-	 *
-	 * But with the revision flag parsing, that's found in
-	 * "!revs->ignore_merges".
-	 */
-	match_missing = !revs->ignore_merges;
+
+	match_missing = revs->match_missing;
 
 	if (cached && idx && ce_stage(idx)) {
 		struct diff_filepair *pair;
@@ -518,16 +549,77 @@ static int diff_cache(struct rev_info *revs,
 	return unpack_trees(1, &t, &opts);
 }
 
-int run_diff_index(struct rev_info *revs, int cached)
+void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb)
+{
+	int i;
+	struct commit *mb_child[2] = {0};
+	struct commit_list *merge_bases;
+
+	for (i = 0; i < revs->pending.nr; i++) {
+		struct object *obj = revs->pending.objects[i].item;
+		if (obj->flags)
+			die(_("--merge-base does not work with ranges"));
+		if (obj->type != OBJ_COMMIT)
+			die(_("--merge-base only works with commits"));
+	}
+
+	/*
+	 * This check must go after the for loop above because A...B
+	 * ranges produce three pending commits, resulting in a
+	 * misleading error message.
+	 */
+	if (revs->pending.nr < 1 || revs->pending.nr > 2)
+		BUG("unexpected revs->pending.nr: %d", revs->pending.nr);
+
+	for (i = 0; i < revs->pending.nr; i++)
+		mb_child[i] = lookup_commit_reference(the_repository, &revs->pending.objects[i].item->oid);
+	if (revs->pending.nr == 1) {
+		struct object_id oid;
+
+		if (get_oid("HEAD", &oid))
+			die(_("unable to get HEAD"));
+
+		mb_child[1] = lookup_commit_reference(the_repository, &oid);
+	}
+
+	merge_bases = repo_get_merge_bases(the_repository, mb_child[0], mb_child[1]);
+	if (!merge_bases)
+		die(_("no merge base found"));
+	if (merge_bases->next)
+		die(_("multiple merge bases found"));
+
+	oidcpy(mb, &merge_bases->item->object.oid);
+
+	free_commit_list(merge_bases);
+}
+
+int run_diff_index(struct rev_info *revs, unsigned int option)
 {
 	struct object_array_entry *ent;
+	int cached = !!(option & DIFF_INDEX_CACHED);
+	int merge_base = !!(option & DIFF_INDEX_MERGE_BASE);
+	struct object_id oid;
+	const char *name;
+	char merge_base_hex[GIT_MAX_HEXSZ + 1];
+	struct index_state *istate = revs->diffopt.repo->index;
 
 	if (revs->pending.nr != 1)
 		BUG("run_diff_index must be passed exactly one tree");
 
 	trace_performance_enter();
 	ent = revs->pending.objects;
-	if (diff_cache(revs, &ent->item->oid, ent->name, cached))
+
+	refresh_fsmonitor(istate);
+
+	if (merge_base) {
+		diff_get_merge_base(revs, &oid);
+		name = oid_to_hex_r(merge_base_hex, &oid);
+	} else {
+		oidcpy(&oid, &ent->item->oid);
+		name = ent->name;
+	}
+
+	if (diff_cache(revs, &oid, name, cached))
 		exit(128);
 
 	diff_set_mnemonic_prefix(&revs->diffopt, "c/", cached ? "i/" : "w/");
@@ -544,10 +636,12 @@ int do_diff_cache(const struct object_id *tree_oid, struct diff_options *opt)
 
 	repo_init_revisions(opt->repo, &revs, NULL);
 	copy_pathspec(&revs.prune_data, &opt->pathspec);
+	diff_setup_done(&revs.diffopt);
 	revs.diffopt = *opt;
 
 	if (diff_cache(&revs, tree_oid, NULL, 1))
 		exit(128);
+	clear_pathspec(&revs.prune_data);
 	return 0;
 }
 
@@ -571,3 +665,28 @@ int index_differs_from(struct repository *r,
 	object_array_clear(&rev.pending);
 	return (rev.diffopt.flags.has_changes != 0);
 }
+
+static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data)
+{
+	return data;
+}
+
+void show_interdiff(const struct object_id *oid1, const struct object_id *oid2,
+		    int indent, struct diff_options *diffopt)
+{
+	struct diff_options opts;
+	struct strbuf prefix = STRBUF_INIT;
+
+	memcpy(&opts, diffopt, sizeof(opts));
+	opts.output_format = DIFF_FORMAT_PATCH;
+	opts.output_prefix = idiff_prefix_cb;
+	strbuf_addchars(&prefix, ' ', indent);
+	opts.output_prefix_data = &prefix;
+	diff_setup_done(&opts);
+
+	diff_tree_oid(oid1, oid2, "", &opts);
+	diffcore_std(&opts);
+	diff_flush(&opts);
+
+	strbuf_release(&prefix);
+}
diff --git a/diff-merges.c b/diff-merges.c
new file mode 100644
index 0000000000..d897fd8a29
--- /dev/null
+++ b/diff-merges.c
@@ -0,0 +1,171 @@
+#include "diff-merges.h"
+
+#include "revision.h"
+
+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 void suppress(struct rev_info *revs)
+{
+	revs->separate_merges = 0;
+	revs->first_parent_merges = 0;
+	revs->combine_merges = 0;
+	revs->dense_combined_merges = 0;
+	revs->combined_all_paths = 0;
+	revs->merges_imply_patch = 0;
+	revs->merges_need_diff = 0;
+}
+
+static void set_separate(struct rev_info *revs)
+{
+	suppress(revs);
+	revs->separate_merges = 1;
+}
+
+static void set_first_parent(struct rev_info *revs)
+{
+	set_separate(revs);
+	revs->first_parent_merges = 1;
+}
+
+static void set_combined(struct rev_info *revs)
+{
+	suppress(revs);
+	revs->combine_merges = 1;
+	revs->dense_combined_merges = 0;
+}
+
+static void set_dense_combined(struct rev_info *revs)
+{
+	suppress(revs);
+	revs->combine_merges = 1;
+	revs->dense_combined_merges = 1;
+}
+
+static diff_merges_setup_func_t func_by_opt(const char *optarg)
+{
+	if (!strcmp(optarg, "off") || !strcmp(optarg, "none"))
+		return suppress;
+	if (!strcmp(optarg, "1") || !strcmp(optarg, "first-parent"))
+		return set_first_parent;
+	else if (!strcmp(optarg, "separate"))
+		return set_separate;
+	else if (!strcmp(optarg, "c") || !strcmp(optarg, "combined"))
+		return set_combined;
+	else if (!strcmp(optarg, "cc") || !strcmp(optarg, "dense-combined"))
+		return set_dense_combined;
+	else if (!strcmp(optarg, "m") || !strcmp(optarg, "on"))
+		return set_to_default;
+	return NULL;
+}
+
+static void set_diff_merges(struct rev_info *revs, const char *optarg)
+{
+	diff_merges_setup_func_t func = func_by_opt(optarg);
+
+	if (!func)
+		die(_("unknown value for --diff-merges: %s"), optarg);
+
+	func(revs);
+
+	/* NOTE: the merges_need_diff flag is cleared by func() call */
+	if (func != suppress)
+		revs->merges_need_diff = 1;
+}
+
+/*
+ * Public functions. They are in the order they are called.
+ */
+
+int diff_merges_config(const char *value)
+{
+	diff_merges_setup_func_t func = func_by_opt(value);
+
+	if (!func)
+		return -1;
+
+	set_to_default = func;
+	return 0;
+}
+
+void diff_merges_suppress_options_parsing(void)
+{
+	suppress_parsing = 1;
+}
+
+int diff_merges_parse_opts(struct rev_info *revs, const char **argv)
+{
+	int argcount = 1;
+	const char *optarg;
+	const char *arg = argv[0];
+
+	if (suppress_parsing)
+		return 0;
+
+	if (!strcmp(arg, "-m")) {
+		set_to_default(revs);
+	} 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, "--no-diff-merges")) {
+		suppress(revs);
+	} else if (!strcmp(arg, "--combined-all-paths")) {
+		revs->combined_all_paths = 1;
+	} else if ((argcount = parse_long_opt("diff-merges", argv, &optarg))) {
+		set_diff_merges(revs, optarg);
+	} else
+		return 0;
+
+	revs->explicit_diff_merges = 1;
+	return argcount;
+}
+
+void diff_merges_suppress(struct rev_info *revs)
+{
+	suppress(revs);
+}
+
+void diff_merges_default_to_first_parent(struct rev_info *revs)
+{
+	if (!revs->explicit_diff_merges)
+		revs->separate_merges = 1;
+	if (revs->separate_merges)
+		revs->first_parent_merges = 1;
+}
+
+void diff_merges_default_to_dense_combined(struct rev_info *revs)
+{
+	if (!revs->explicit_diff_merges)
+		set_dense_combined(revs);
+}
+
+void diff_merges_set_dense_combined_if_unset(struct rev_info *revs)
+{
+	if (!revs->combine_merges)
+		set_dense_combined(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)
+		revs->first_parent_merges = 0;
+	if (revs->combined_all_paths && !revs->combine_merges)
+		die("--combined-all-paths makes no sense without -c or --cc");
+	if (revs->merges_imply_patch)
+		revs->diff = 1;
+	if (revs->merges_imply_patch || revs->merges_need_diff) {
+		if (!revs->diffopt.output_format)
+			revs->diffopt.output_format = DIFF_FORMAT_PATCH;
+	}
+}
diff --git a/diff-merges.h b/diff-merges.h
new file mode 100644
index 0000000000..b5d57f6563
--- /dev/null
+++ b/diff-merges.h
@@ -0,0 +1,28 @@
+#ifndef DIFF_MERGES_H
+#define DIFF_MERGES_H
+
+/*
+ * diff-merges - utility module to handle command-line options for
+ * selection of particular diff format of merge commits
+ * representation.
+ */
+
+struct rev_info;
+
+int diff_merges_config(const char *value);
+
+void diff_merges_suppress_options_parsing(void);
+
+int diff_merges_parse_opts(struct rev_info *revs, const char **argv);
+
+void diff_merges_suppress(struct rev_info *revs);
+
+void diff_merges_default_to_first_parent(struct rev_info *revs);
+
+void diff_merges_default_to_dense_combined(struct rev_info *revs);
+
+void diff_merges_set_dense_combined_if_unset(struct rev_info *revs);
+
+void diff_merges_setup_revs(struct rev_info *revs);
+
+#endif
diff --git a/diff-no-index.c b/diff-no-index.c
index 7814eabfe0..9a8b09346b 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -26,9 +26,8 @@ static int read_directory_contents(const char *path, struct string_list *list)
 	if (!(dir = opendir(path)))
 		return error("Could not open directory %s", path);
 
-	while ((e = readdir(dir)))
-		if (!is_dot_or_dotdot(e->d_name))
-			string_list_insert(list, e->d_name);
+	while ((e = readdir_skip_dot_and_dotdot(dir)))
+		string_list_insert(list, e->d_name);
 
 	closedir(dir);
 	return 0;
@@ -83,7 +82,7 @@ static struct diff_filespec *noindex_filespec(const char *name, int mode)
 	if (!name)
 		name = "/dev/null";
 	s = alloc_filespec(name);
-	fill_filespec(s, &null_oid, 0, mode);
+	fill_filespec(s, null_oid(), 0, mode);
 	if (name == file_from_standard_input)
 		populate_from_stdin(s);
 	return s;
diff --git a/diff.c b/diff.c
index afe4400a60..a8113f1707 100644
--- a/diff.c
+++ b/diff.c
@@ -20,7 +20,7 @@
 #include "hashmap.h"
 #include "ll-merge.h"
 #include "string-list.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "graph.h"
 #include "packfile.h"
 #include "parse-options.h"
@@ -35,7 +35,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;
@@ -48,6 +48,7 @@ static const char *diff_order_file_cfg;
 int diff_auto_refresh_index = 1;
 static int diff_mnemonic_prefix;
 static int diff_no_prefix;
+static int diff_relative;
 static int diff_stat_graph_width;
 static int diff_dirstat_permille_default = 30;
 static struct diff_options default_diff_options;
@@ -386,6 +387,10 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
 		diff_no_prefix = git_config_bool(var, value);
 		return 0;
 	}
+	if (!strcmp(var, "diff.relative")) {
+		diff_relative = git_config_bool(var, value);
+		return 0;
+	}
 	if (!strcmp(var, "diff.statgraphwidth")) {
 		diff_stat_graph_width = git_config_int(var, value);
 		return 0;
@@ -414,14 +419,6 @@ int git_diff_ui_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
-	if (!strcmp(var, "diff.wserrorhighlight")) {
-		int val = parse_ws_error_highlight(value);
-		if (val < 0)
-			return -1;
-		ws_error_highlight_default = val;
-		return 0;
-	}
-
 	if (git_color_config(var, value, cb) < 0)
 		return -1;
 
@@ -450,6 +447,14 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
 		return color_parse(value, diff_colors[slot]);
 	}
 
+	if (!strcmp(var, "diff.wserrorhighlight")) {
+		int val = parse_ws_error_highlight(value);
+		if (val < 0)
+			return -1;
+		ws_error_highlight_default = val;
+		return 0;
+	}
+
 	/* like GNU diff's --suppress-blank-empty option  */
 	if (!strcmp(var, "diff.suppressblankempty") ||
 			/* for backwards compatibility */
@@ -477,14 +482,14 @@ int git_diff_basic_config(const char *var, const char *value, void *cb)
 
 static char *quote_two(const char *one, const char *two)
 {
-	int need_one = quote_c_style(one, NULL, NULL, 1);
-	int need_two = quote_c_style(two, NULL, NULL, 1);
+	int need_one = quote_c_style(one, NULL, NULL, CQUOTE_NODQ);
+	int need_two = quote_c_style(two, NULL, NULL, CQUOTE_NODQ);
 	struct strbuf res = STRBUF_INIT;
 
 	if (need_one + need_two) {
 		strbuf_addch(&res, '"');
-		quote_c_style(one, &res, NULL, 1);
-		quote_c_style(two, &res, NULL, 1);
+		quote_c_style(one, &res, NULL, CQUOTE_NODQ);
+		quote_c_style(two, &res, NULL, CQUOTE_NODQ);
 		strbuf_addch(&res, '"');
 	} else {
 		strbuf_addstr(&res, one);
@@ -573,7 +578,7 @@ static int fill_mmfile(struct repository *r, mmfile_t *mf,
 		mf->size = 0;
 		return 0;
 	}
-	else if (diff_populate_filespec(r, one, 0))
+	else if (diff_populate_filespec(r, one, NULL))
 		return -1;
 
 	mf->ptr = one->data;
@@ -585,9 +590,13 @@ static int fill_mmfile(struct repository *r, mmfile_t *mf,
 static unsigned long diff_filespec_size(struct repository *r,
 					struct diff_filespec *one)
 {
+	struct diff_populate_filespec_options dpf_options = {
+		.check_size_only = 1,
+	};
+
 	if (!DIFF_FILE_VALID(one))
 		return 0;
-	diff_populate_filespec(r, one, CHECK_SIZE_ONLY);
+	diff_populate_filespec(r, one, &dpf_options);
 	return one->size;
 }
 
@@ -2044,7 +2053,7 @@ static void fn_out_diff_words_aux(void *priv,
 static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
 		int *begin, int *end)
 {
-	if (word_regex && *begin < buffer->size) {
+	while (word_regex && *begin < buffer->size) {
 		regmatch_t match[1];
 		if (!regexec_buf(word_regex, buffer->ptr + *begin,
 				 buffer->size - *begin, 1, match, 0)) {
@@ -2052,9 +2061,13 @@ static int find_word_boundaries(mmfile_t *buffer, regex_t *word_regex,
 					'\n', match[0].rm_eo - match[0].rm_so);
 			*end = p ? p - buffer->ptr : match[0].rm_eo + *begin;
 			*begin += match[0].rm_so;
-			return *begin >= *end;
+			if (*begin == *end)
+				(*begin)++;
+			else
+				return *begin > *end;
+		} else {
+			return -1;
 		}
-		return -1;
 	}
 
 	/* find the next word */
@@ -2224,14 +2237,12 @@ static void init_diff_words_data(struct emit_callback *ecbdata,
 	struct diff_options *o = xmalloc(sizeof(struct diff_options));
 	memcpy(o, orig_opts, sizeof(struct diff_options));
 
-	ecbdata->diff_words =
-		xcalloc(1, sizeof(struct diff_words_data));
+	CALLOC_ARRAY(ecbdata->diff_words, 1);
 	ecbdata->diff_words->type = o->word_diff;
 	ecbdata->diff_words->opt = o;
 
 	if (orig_opts->emitted_symbols)
-		o->emitted_symbols =
-			xcalloc(1, sizeof(struct emitted_diff_symbols));
+		CALLOC_ARRAY(o->emitted_symbols, 1);
 
 	if (!o->word_regex)
 		o->word_regex = userdiff_word_regex(one, o->repo->index);
@@ -2329,7 +2340,7 @@ static void find_lno(const char *line, struct emit_callback *ecbdata)
 	ecbdata->lno_in_postimage = strtol(p + 1, NULL, 10);
 }
 
-static void fn_out_consume(void *priv, char *line, unsigned long len)
+static int fn_out_consume(void *priv, char *line, unsigned long len)
 {
 	struct emit_callback *ecbdata = priv;
 	struct diff_options *o = ecbdata->opt;
@@ -2365,7 +2376,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
 		len = sane_truncate_line(line, len);
 		find_lno(line, ecbdata);
 		emit_hunk_header(ecbdata, line, len);
-		return;
+		return 0;
 	}
 
 	if (ecbdata->diff_words) {
@@ -2375,11 +2386,11 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
 		if (line[0] == '-') {
 			diff_words_append(line, len,
 					  &ecbdata->diff_words->minus);
-			return;
+			return 0;
 		} else if (line[0] == '+') {
 			diff_words_append(line, len,
 					  &ecbdata->diff_words->plus);
-			return;
+			return 0;
 		} else if (starts_with(line, "\\ ")) {
 			/*
 			 * Eat the "no newline at eof" marker as if we
@@ -2388,11 +2399,11 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
 			 * defer processing. If this is the end of
 			 * preimage, more "+" lines may come after it.
 			 */
-			return;
+			return 0;
 		}
 		diff_words_flush(ecbdata);
 		emit_diff_symbol(o, s, line, len, 0);
-		return;
+		return 0;
 	}
 
 	switch (line[0]) {
@@ -2416,6 +2427,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len)
 				 line, len, 0);
 		break;
 	}
+	return 0;
 }
 
 static void pprint_rename(struct strbuf *name, const char *a, const char *b)
@@ -2495,28 +2507,12 @@ static void pprint_rename(struct strbuf *name, const char *a, const char *b)
 	}
 }
 
-struct diffstat_t {
-	int nr;
-	int alloc;
-	struct diffstat_file {
-		char *from_name;
-		char *name;
-		char *print_name;
-		const char *comments;
-		unsigned is_unmerged:1;
-		unsigned is_binary:1;
-		unsigned is_renamed:1;
-		unsigned is_interesting:1;
-		uintmax_t added, deleted;
-	} **files;
-};
-
 static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
 					  const char *name_a,
 					  const char *name_b)
 {
 	struct diffstat_file *x;
-	x = xcalloc(1, sizeof(*x));
+	CALLOC_ARRAY(x, 1);
 	ALLOC_GROW(diffstat->files, diffstat->nr + 1, diffstat->alloc);
 	diffstat->files[diffstat->nr++] = x;
 	if (name_b) {
@@ -2531,7 +2527,7 @@ static struct diffstat_file *diffstat_add(struct diffstat_t *diffstat,
 	return x;
 }
 
-static void diffstat_consume(void *priv, char *line, unsigned long len)
+static int diffstat_consume(void *priv, char *line, unsigned long len)
 {
 	struct diffstat_t *diffstat = priv;
 	struct diffstat_file *x = diffstat->files[diffstat->nr - 1];
@@ -2540,6 +2536,7 @@ static void diffstat_consume(void *priv, char *line, unsigned long len)
 		x->added++;
 	else if (line[0] == '-')
 		x->deleted++;
+	return 0;
 }
 
 const char mime_boundary_leader[] = "------------";
@@ -2551,7 +2548,7 @@ static int scale_linear(int it, int width, int max_change)
 	/*
 	 * make sure that at least one '-' or '+' is printed if
 	 * there is any change to this path. The easiest way is to
-	 * scale linearly as if the alloted width is one column shorter
+	 * scale linearly as if the allotted width is one column shorter
 	 * than it is, and then add 1 to the result.
 	 */
 	return 1 + (it * (width - 1) / max_change);
@@ -3036,6 +3033,9 @@ static void show_dirstat(struct diff_options *options)
 		struct diff_filepair *p = q->queue[i];
 		const char *name;
 		unsigned long copied, added, damage;
+		struct diff_populate_filespec_options dpf_options = {
+			.check_size_only = 1,
+		};
 
 		name = p->two->path ? p->two->path : p->one->path;
 
@@ -3063,19 +3063,19 @@ static void show_dirstat(struct diff_options *options)
 		}
 
 		if (DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
-			diff_populate_filespec(options->repo, p->one, 0);
-			diff_populate_filespec(options->repo, p->two, 0);
+			diff_populate_filespec(options->repo, p->one, NULL);
+			diff_populate_filespec(options->repo, p->two, NULL);
 			diffcore_count_changes(options->repo,
 					       p->one, p->two, NULL, NULL,
 					       &copied, &added);
 			diff_free_filespec_data(p->one);
 			diff_free_filespec_data(p->two);
 		} else if (DIFF_FILE_VALID(p->one)) {
-			diff_populate_filespec(options->repo, p->one, CHECK_SIZE_ONLY);
+			diff_populate_filespec(options->repo, p->one, &dpf_options);
 			copied = added = 0;
 			diff_free_filespec_data(p->one);
 		} else if (DIFF_FILE_VALID(p->two)) {
-			diff_populate_filespec(options->repo, p->two, CHECK_SIZE_ONLY);
+			diff_populate_filespec(options->repo, p->two, &dpf_options);
 			copied = 0;
 			added = p->two->size;
 			diff_free_filespec_data(p->two);
@@ -3157,16 +3157,19 @@ static void show_dirstat_by_line(struct diffstat_t *data, struct diff_options *o
 	gather_dirstat(options, &dir, changed, "", 0);
 }
 
-static void free_diffstat_info(struct diffstat_t *diffstat)
+static void free_diffstat_file(struct diffstat_file *f)
+{
+	free(f->print_name);
+	free(f->name);
+	free(f->from_name);
+	free(f);
+}
+
+void free_diffstat_info(struct diffstat_t *diffstat)
 {
 	int i;
-	for (i = 0; i < diffstat->nr; i++) {
-		struct diffstat_file *f = diffstat->files[i];
-		free(f->print_name);
-		free(f->name);
-		free(f->from_name);
-		free(f);
-	}
+	for (i = 0; i < diffstat->nr; i++)
+		free_diffstat_file(diffstat->files[i]);
 	free(diffstat->files);
 }
 
@@ -3196,7 +3199,7 @@ static int is_conflict_marker(const char *line, int marker_size, unsigned long l
 	for (cnt = 1; cnt < marker_size; cnt++)
 		if (line[cnt] != firstchar)
 			return 0;
-	/* line[1] thru line[marker_size-1] are same as firstchar */
+	/* line[1] through line[marker_size-1] are same as firstchar */
 	if (len < marker_size + 1 || !isspace(line[marker_size]))
 		return 0;
 	return 1;
@@ -3211,7 +3214,7 @@ static void checkdiff_consume_hunk(void *priv,
 	data->lineno = nb - 1;
 }
 
-static void checkdiff_consume(void *priv, char *line, unsigned long len)
+static int checkdiff_consume(void *priv, char *line, unsigned long len)
 {
 	struct checkdiff_t *data = priv;
 	int marker_size = data->conflict_marker_size;
@@ -3235,7 +3238,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
 		}
 		bad = ws_check(line + 1, len - 1, data->ws_rule);
 		if (!bad)
-			return;
+			return 0;
 		data->status |= bad;
 		err = whitespace_error_string(bad);
 		fprintf(data->o->file, "%s%s:%d: %s.\n",
@@ -3247,6 +3250,7 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len)
 	} else if (line[0] == ' ') {
 		data->lineno++;
 	}
+	return 0;
 }
 
 static unsigned char *deflate_it(char *data,
@@ -3355,13 +3359,17 @@ static void emit_binary_diff(struct diff_options *o,
 int diff_filespec_is_binary(struct repository *r,
 			    struct diff_filespec *one)
 {
+	struct diff_populate_filespec_options dpf_options = {
+		.check_binary = 1,
+	};
+
 	if (one->is_binary == -1) {
 		diff_filespec_load_driver(one, r->index);
 		if (one->driver->binary != -1)
 			one->is_binary = one->driver->binary;
 		else {
 			if (!one->data && DIFF_FILE_VALID(one))
-				diff_populate_filespec(r, one, CHECK_BINARY);
+				diff_populate_filespec(r, one, &dpf_options);
 			if (one->is_binary == -1 && one->data)
 				one->is_binary = buffer_is_binary(one->data,
 						one->size);
@@ -3429,7 +3437,7 @@ static void builtin_diff(const char *name_a,
 	if (o->submodule_format == DIFF_SUBMODULE_LOG &&
 	    (!one->mode || S_ISGITLINK(one->mode)) &&
 	    (!two->mode || S_ISGITLINK(two->mode))) {
-		show_submodule_summary(o, one->path ? one->path : two->path,
+		show_submodule_diff_summary(o, one->path ? one->path : two->path,
 				&one->oid, &two->oid,
 				two->dirty_submodule);
 		return;
@@ -3584,6 +3592,8 @@ static void builtin_diff(const char *name_a,
 		if (header.len && !o->flags.suppress_diff_headers)
 			ecbdata.header = &header;
 		xpp.flags = o->xdl_opts;
+		xpp.ignore_regex = o->ignore_regex;
+		xpp.ignore_regex_nr = o->ignore_regex_nr;
 		xpp.anchors = o->anchors;
 		xpp.anchors_nr = o->anchors_nr;
 		xecfg.ctxlen = o->context;
@@ -3660,7 +3670,7 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
 {
 	mmfile_t mf1, mf2;
 	struct diffstat_file *data;
-	int same_contents;
+	int may_differ;
 	int complete_rewrite = 0;
 
 	if (!DIFF_PAIR_UNMERGED(p)) {
@@ -3678,12 +3688,14 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
 		return;
 	}
 
-	same_contents = oideq(&one->oid, &two->oid);
+	/* saves some reads if true, not a guarantee of diff outcome */
+	may_differ = !(one->oid_valid && two->oid_valid &&
+			oideq(&one->oid, &two->oid));
 
 	if (diff_filespec_is_binary(o->repo, one) ||
 	    diff_filespec_is_binary(o->repo, two)) {
 		data->is_binary = 1;
-		if (same_contents) {
+		if (!may_differ) {
 			data->added = 0;
 			data->deleted = 0;
 		} else {
@@ -3693,13 +3705,13 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
 	}
 
 	else if (complete_rewrite) {
-		diff_populate_filespec(o->repo, one, 0);
-		diff_populate_filespec(o->repo, two, 0);
+		diff_populate_filespec(o->repo, one, NULL);
+		diff_populate_filespec(o->repo, two, NULL);
 		data->deleted = count_lines(one->data, one->size);
 		data->added = count_lines(two->data, two->size);
 	}
 
-	else if (!same_contents) {
+	else if (may_differ) {
 		/* Crazy xdl interfaces.. */
 		xpparam_t xpp;
 		xdemitconf_t xecfg;
@@ -3711,13 +3723,37 @@ static void builtin_diffstat(const char *name_a, const char *name_b,
 		memset(&xpp, 0, sizeof(xpp));
 		memset(&xecfg, 0, sizeof(xecfg));
 		xpp.flags = o->xdl_opts;
+		xpp.ignore_regex = o->ignore_regex;
+		xpp.ignore_regex_nr = o->ignore_regex_nr;
 		xpp.anchors = o->anchors;
 		xpp.anchors_nr = o->anchors_nr;
 		xecfg.ctxlen = o->context;
 		xecfg.interhunkctxlen = o->interhunkcontext;
-		if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line,
+		xecfg.flags = XDL_EMIT_NO_HUNK_HDR;
+		if (xdi_diff_outf(&mf1, &mf2, NULL,
 				  diffstat_consume, diffstat, &xpp, &xecfg))
 			die("unable to generate diffstat for %s", one->path);
+
+		if (DIFF_FILE_VALID(one) && DIFF_FILE_VALID(two)) {
+			struct diffstat_file *file =
+				diffstat->files[diffstat->nr - 1];
+			/*
+			 * Omit diffstats of modified files where nothing changed.
+			 * Even if may_differ, this might be the case due to
+			 * ignoring whitespace changes, etc.
+			 *
+			 * But note that we special-case additions, deletions,
+			 * renames, and mode changes as adding an empty file,
+			 * for example is still of interest.
+			 */
+			if ((p->status == DIFF_STATUS_MODIFIED)
+				&& !file->added
+				&& !file->deleted
+				&& one->mode == two->mode) {
+				free_diffstat_file(file);
+				diffstat->nr--;
+			}
+		}
 	}
 
 	diff_free_filespec_data(one);
@@ -3930,9 +3966,10 @@ static int diff_populate_gitlink(struct diff_filespec *s, int size_only)
  */
 int diff_populate_filespec(struct repository *r,
 			   struct diff_filespec *s,
-			   unsigned int flags)
+			   const struct diff_populate_filespec_options *options)
 {
-	int size_only = flags & CHECK_SIZE_ONLY;
+	int size_only = options ? options->check_size_only : 0;
+	int check_binary = options ? options->check_binary : 0;
 	int err = 0;
 	int conv_flags = global_conv_flags_eol;
 	/*
@@ -4002,7 +4039,7 @@ int diff_populate_filespec(struct repository *r,
 		 * opening the file and inspecting the contents, this
 		 * is probably fine.
 		 */
-		if ((flags & CHECK_BINARY) &&
+		if (check_binary &&
 		    s->size > big_file_threshold && s->is_binary == -1) {
 			s->is_binary = 1;
 			return 0;
@@ -4027,12 +4064,30 @@ int diff_populate_filespec(struct repository *r,
 		}
 	}
 	else {
-		enum object_type type;
-		if (size_only || (flags & CHECK_BINARY)) {
-			type = oid_object_info(r, &s->oid, &s->size);
-			if (type < 0)
-				die("unable to read %s",
-				    oid_to_hex(&s->oid));
+		struct object_info info = {
+			.sizep = &s->size
+		};
+
+		if (!(size_only || check_binary))
+			/*
+			 * Set contentp, since there is no chance that merely
+			 * the size is sufficient.
+			 */
+			info.contentp = &s->data;
+
+		if (options && options->missing_object_cb) {
+			if (!oid_object_info_extended(r, &s->oid, &info,
+						      OBJECT_INFO_LOOKUP_REPLACE |
+						      OBJECT_INFO_SKIP_FETCH_OBJECT))
+				goto object_read;
+			options->missing_object_cb(options->missing_object_data);
+		}
+		if (oid_object_info_extended(r, &s->oid, &info,
+					     OBJECT_INFO_LOOKUP_REPLACE))
+			die("unable to read %s", oid_to_hex(&s->oid));
+
+object_read:
+		if (size_only || check_binary) {
 			if (size_only)
 				return 0;
 			if (s->size > big_file_threshold && s->is_binary == -1) {
@@ -4040,9 +4095,12 @@ int diff_populate_filespec(struct repository *r,
 				return 0;
 			}
 		}
-		s->data = read_object_file(&s->oid, &type, &s->size);
-		if (!s->data)
-			die("unable to read %s", oid_to_hex(&s->oid));
+		if (!info.contentp) {
+			info.contentp = &s->data;
+			if (oid_object_info_extended(r, &s->oid, &info,
+						     OBJECT_INFO_LOOKUP_REPLACE))
+				die("unable to read %s", oid_to_hex(&s->oid));
+		}
 		s->should_free = 1;
 	}
 	return 0;
@@ -4063,6 +4121,9 @@ void diff_free_filespec_blob(struct diff_filespec *s)
 
 void diff_free_filespec_data(struct diff_filespec *s)
 {
+	if (!s)
+		return;
+
 	diff_free_filespec_blob(s);
 	FREE_AND_NULL(s->cnt_data);
 }
@@ -4078,6 +4139,9 @@ static void prep_temp_blob(struct index_state *istate,
 	struct strbuf tempfile = STRBUF_INIT;
 	char *path_dup = xstrdup(path);
 	const char *base = basename(path_dup);
+	struct checkout_metadata meta;
+
+	init_checkout_metadata(&meta, NULL, NULL, oid);
 
 	/* Generate "XXXXXX_basename.ext" */
 	strbuf_addstr(&tempfile, "XXXXXX_");
@@ -4087,7 +4151,7 @@ static void prep_temp_blob(struct index_state *istate,
 	if (!temp->tempfile)
 		die_errno("unable to create temp-file");
 	if (convert_to_working_tree(istate, path,
-			(const char *)blob, (size_t)size, &buf)) {
+			(const char *)blob, (size_t)size, &buf, &meta)) {
 		blob = buf.buf;
 		size = buf.len;
 	}
@@ -4134,7 +4198,7 @@ static struct diff_tempfile *prepare_temp_file(struct repository *r,
 				die_errno("readlink(%s)", name);
 			prep_temp_blob(r->index, name, temp, sb.buf, sb.len,
 				       (one->oid_valid ?
-					&one->oid : &null_oid),
+					&one->oid : null_oid()),
 				       (one->oid_valid ?
 					one->mode : S_IFLNK));
 			strbuf_release(&sb);
@@ -4143,7 +4207,7 @@ static struct diff_tempfile *prepare_temp_file(struct repository *r,
 			/* we can borrow from the file in the work tree */
 			temp->name = name;
 			if (!one->oid_valid)
-				oid_to_hex_r(temp->hex, &null_oid);
+				oid_to_hex_r(temp->hex, null_oid());
 			else
 				oid_to_hex_r(temp->hex, &one->oid);
 			/* Even though we may sometimes borrow the
@@ -4157,7 +4221,7 @@ static struct diff_tempfile *prepare_temp_file(struct repository *r,
 		return temp;
 	}
 	else {
-		if (diff_populate_filespec(r, one, 0))
+		if (diff_populate_filespec(r, one, NULL))
 			die("cannot read data blob for %s", one->path);
 		prep_temp_blob(r->index, name, temp,
 			       one->data, one->size,
@@ -4167,14 +4231,14 @@ static struct diff_tempfile *prepare_temp_file(struct repository *r,
 }
 
 static void add_external_diff_name(struct repository *r,
-				   struct argv_array *argv,
+				   struct strvec *argv,
 				   const char *name,
 				   struct diff_filespec *df)
 {
 	struct diff_tempfile *temp = prepare_temp_file(r, name, df);
-	argv_array_push(argv, temp->name);
-	argv_array_push(argv, temp->hex);
-	argv_array_push(argv, temp->mode);
+	strvec_push(argv, temp->name);
+	strvec_push(argv, temp->hex);
+	strvec_push(argv, temp->mode);
 }
 
 /* An external diff command takes:
@@ -4191,12 +4255,12 @@ static void run_external_diff(const char *pgm,
 			      const char *xfrm_msg,
 			      struct diff_options *o)
 {
-	struct argv_array argv = ARGV_ARRAY_INIT;
-	struct argv_array env = ARGV_ARRAY_INIT;
+	struct strvec argv = STRVEC_INIT;
+	struct strvec env = STRVEC_INIT;
 	struct diff_queue_struct *q = &diff_queued_diff;
 
-	argv_array_push(&argv, pgm);
-	argv_array_push(&argv, name);
+	strvec_push(&argv, pgm);
+	strvec_push(&argv, name);
 
 	if (one && two) {
 		add_external_diff_name(o->repo, &argv, name, one);
@@ -4204,22 +4268,22 @@ static void run_external_diff(const char *pgm,
 			add_external_diff_name(o->repo, &argv, name, two);
 		else {
 			add_external_diff_name(o->repo, &argv, other, two);
-			argv_array_push(&argv, other);
-			argv_array_push(&argv, xfrm_msg);
+			strvec_push(&argv, other);
+			strvec_push(&argv, xfrm_msg);
 		}
 	}
 
-	argv_array_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
-	argv_array_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
+	strvec_pushf(&env, "GIT_DIFF_PATH_COUNTER=%d", ++o->diff_path_counter);
+	strvec_pushf(&env, "GIT_DIFF_PATH_TOTAL=%d", q->nr);
 
 	diff_free_filespec_data(one);
 	diff_free_filespec_data(two);
-	if (run_command_v_opt_cd_env(argv.argv, RUN_USING_SHELL, NULL, env.argv))
+	if (run_command_v_opt_cd_env(argv.v, RUN_USING_SHELL, NULL, env.v))
 		die(_("external diff died, stopping at %s"), name);
 
 	remove_tempfile();
-	argv_array_clear(&argv);
-	argv_array_clear(&env);
+	strvec_clear(&argv);
+	strvec_clear(&env);
 }
 
 static int similarity_index(struct diff_filepair *p)
@@ -4294,7 +4358,10 @@ static void fill_metainfo(struct strbuf *msg,
 	}
 	if (one && two && !oideq(&one->oid, &two->oid)) {
 		const unsigned hexsz = the_hash_algo->hexsz;
-		int abbrev = o->flags.full_index ? hexsz : DEFAULT_ABBREV;
+		int abbrev = o->abbrev ? o->abbrev : DEFAULT_ABBREV;
+
+		if (o->flags.full_index)
+			abbrev = hexsz;
 
 		if (o->flags.binary) {
 			mmfile_t mf;
@@ -4518,6 +4585,7 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
 	options->interhunkcontext = diff_interhunk_context_default;
 	options->ws_error_highlight = ws_error_highlight_default;
 	options->flags.rename_empty = 1;
+	options->flags.relative_name = diff_relative;
 	options->objfind = NULL;
 
 	/* pathchange left =NULL by default */
@@ -4531,6 +4599,9 @@ void repo_diff_setup(struct repository *r, struct diff_options *options)
 
 	options->orderfile = diff_order_file_cfg;
 
+	if (!options->flags.ignore_submodule_set)
+		options->flags.ignore_untracked_in_submodules = 1;
+
 	if (diff_no_prefix) {
 		options->a_prefix = options->b_prefix = "";
 	} else if (!diff_mnemonic_prefix) {
@@ -4565,6 +4636,12 @@ void diff_setup_done(struct diff_options *options)
 	if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
 		die(_("-G, -S and --find-object are mutually exclusive"));
 
+	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"));
+
+	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"));
+
 	/*
 	 * Most of the time we can say "there are changes"
 	 * only by checking if there are changed paths, but
@@ -4572,7 +4649,8 @@ void diff_setup_done(struct diff_options *options)
 	 * inside contents.
 	 */
 
-	if ((options->xdl_opts & XDF_WHITESPACE_FLAGS))
+	if ((options->xdl_opts & XDF_WHITESPACE_FLAGS) ||
+	    options->ignore_regex_nr)
 		options->flags.diff_from_contents = 1;
 	else
 		options->flags.diff_from_contents = 0;
@@ -4852,7 +4930,7 @@ static int diff_opt_find_object(const struct option *option,
 		return error(_("unable to resolve '%s'"), arg);
 
 	if (!opt->objfind)
-		opt->objfind = xcalloc(1, sizeof(*opt->objfind));
+		CALLOC_ARRAY(opt->objfind, 1);
 
 	opt->pickaxe_opts |= DIFF_PICKAXE_KIND_OBJFIND;
 	opt->flags.recursive = 1;
@@ -5148,6 +5226,22 @@ static int diff_opt_patience(const struct option *opt,
 	return 0;
 }
 
+static int diff_opt_ignore_regex(const struct option *opt,
+				 const char *arg, int unset)
+{
+	struct diff_options *options = opt->value;
+	regex_t *regex;
+
+	BUG_ON_OPT_NEG(unset);
+	regex = xmalloc(sizeof(*regex));
+	if (regcomp(regex, arg, REG_EXTENDED | REG_NEWLINE))
+		return error(_("invalid regex given to -I: '%s'"), arg);
+	ALLOC_GROW(options->ignore_regex, options->ignore_regex_nr + 1,
+		   options->ignore_regex_alloc);
+	options->ignore_regex[options->ignore_regex_nr++] = regex;
+	return 0;
+}
+
 static int diff_opt_pickaxe_regex(const struct option *opt,
 				  const char *arg, int unset)
 {
@@ -5175,8 +5269,7 @@ static int diff_opt_relative(const struct option *opt,
 {
 	struct diff_options *options = opt->value;
 
-	BUG_ON_OPT_NEG(unset);
-	options->flags.relative_name = 1;
+	options->flags.relative_name = !unset;
 	if (arg)
 		options->prefix = arg;
 	return 0;
@@ -5267,6 +5360,19 @@ static int diff_opt_word_diff_regex(const struct option *opt,
 	return 0;
 }
 
+static int diff_opt_rotate_to(const struct option *opt, const char *arg, int unset)
+{
+	struct diff_options *options = opt->value;
+
+	BUG_ON_OPT_NEG(unset);
+	if (!strcmp(opt->long_name, "skip-to"))
+		options->skip_instead_of_rotate = 1;
+	else
+		options->skip_instead_of_rotate = 0;
+	options->rotate_to = arg;
+	return 0;
+}
+
 static void prep_parse_options(struct diff_options *options)
 {
 	struct option parseopts[] = {
@@ -5437,6 +5543,9 @@ static void prep_parse_options(struct diff_options *options)
 		OPT_BIT_F(0, "ignore-blank-lines", &options->xdl_opts,
 			  N_("ignore changes whose lines are all blank"),
 			  XDF_IGNORE_BLANK_LINES, PARSE_OPT_NONEG),
+		OPT_CALLBACK_F('I', "ignore-matching-lines", options, N_("<regex>"),
+			       N_("ignore changes whose all lines match <regex>"),
+			       0, diff_opt_ignore_regex),
 		OPT_BIT(0, "indent-heuristic", &options->xdl_opts,
 			N_("heuristic to shift diff hunk boundaries for easy reading"),
 			XDF_INDENT_HEURISTIC),
@@ -5472,7 +5581,7 @@ static void prep_parse_options(struct diff_options *options)
 		OPT_GROUP(N_("Other diff options")),
 		OPT_CALLBACK_F(0, "relative", options, N_("<prefix>"),
 			       N_("when run from subdir, exclude changes outside and show relative paths"),
-			       PARSE_OPT_NONEG | PARSE_OPT_OPTARG,
+			       PARSE_OPT_OPTARG,
 			       diff_opt_relative),
 		OPT_BOOL('a', "text", &options->flags.text,
 			 N_("treat all files as text")),
@@ -5515,6 +5624,12 @@ static void prep_parse_options(struct diff_options *options)
 			  DIFF_PICKAXE_REGEX, PARSE_OPT_NONEG),
 		OPT_FILENAME('O', NULL, &options->orderfile,
 			     N_("control the order in which files appear in the output")),
+		OPT_CALLBACK_F(0, "rotate-to", options, N_("<path>"),
+			       N_("show the change in the specified path first"),
+			       PARSE_OPT_NONEG, diff_opt_rotate_to),
+		OPT_CALLBACK_F(0, "skip-to", options, N_("<path>"),
+			       N_("skip the output to the specified path"),
+			       PARSE_OPT_NONEG, diff_opt_rotate_to),
 		OPT_CALLBACK_F(0, "find-object", options, N_("<object-id>"),
 			       N_("look for differences that change the number of occurrences of the specified object"),
 			       PARSE_OPT_NONEG, diff_opt_find_object),
@@ -6014,15 +6129,18 @@ void flush_one_hunk(struct object_id *result, git_hash_ctx *ctx)
 	}
 }
 
-static void patch_id_consume(void *priv, char *line, unsigned long len)
+static int patch_id_consume(void *priv, char *line, unsigned long len)
 {
 	struct patch_id_t *data = priv;
 	int new_len;
 
+	if (len > 12 && starts_with(line, "\\ "))
+		return 0;
 	new_len = remove_space(line, len);
 
 	the_hash_algo->update_fn(data->ctx, line, new_len);
 	data->patchlen += new_len;
+	return 0;
 }
 
 static void patch_id_add_string(git_hash_ctx *ctx, const char *str)
@@ -6120,8 +6238,8 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
 
 		xpp.flags = 0;
 		xecfg.ctxlen = 3;
-		xecfg.flags = 0;
-		if (xdi_diff_outf(&mf1, &mf2, discard_hunk_line,
+		xecfg.flags = XDL_EMIT_NO_HUNK_HDR;
+		if (xdi_diff_outf(&mf1, &mf2, NULL,
 				  patch_id_consume, &data, &xpp, &xecfg))
 			return error("unable to generate patch-id diff for %s",
 				     p->one->path);
@@ -6131,7 +6249,7 @@ static int diff_get_patch_id(struct diff_options *options, struct object_id *oid
 	}
 
 	if (!stable)
-		the_hash_algo->final_fn(oid->hash, &ctx);
+		the_hash_algo->final_oid_fn(oid, &ctx);
 
 	return 0;
 }
@@ -6177,7 +6295,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.");
@@ -6233,9 +6351,9 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o)
 			if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
 				dim_moved_lines(o);
 
-			hashmap_free_entries(&add_lines, struct moved_entry,
+			hashmap_clear_and_free(&add_lines, struct moved_entry,
 						ent);
-			hashmap_free_entries(&del_lines, struct moved_entry,
+			hashmap_clear_and_free(&del_lines, struct moved_entry,
 						ent);
 		}
 
@@ -6250,6 +6368,32 @@ static void diff_flush_patch_all_file_pairs(struct diff_options *o)
 	}
 }
 
+static void diff_free_file(struct diff_options *options)
+{
+	if (options->close_file)
+		fclose(options->file);
+}
+
+static void diff_free_ignore_regex(struct diff_options *options)
+{
+	int i;
+
+	for (i = 0; i < options->ignore_regex_nr; i++) {
+		regfree(options->ignore_regex[i]);
+		free(options->ignore_regex[i]);
+	}
+	free(options->ignore_regex);
+}
+
+void diff_free(struct diff_options *options)
+{
+	if (options->no_free)
+		return;
+
+	diff_free_file(options);
+	diff_free_ignore_regex(options);
+}
+
 void diff_flush(struct diff_options *options)
 {
 	struct diff_queue_struct *q = &diff_queued_diff;
@@ -6283,12 +6427,7 @@ void diff_flush(struct diff_options *options)
 	    dirstat_by_line) {
 		struct diffstat_t diffstat;
 
-		memset(&diffstat, 0, sizeof(struct diffstat_t));
-		for (i = 0; i < q->nr; i++) {
-			struct diff_filepair *p = q->queue[i];
-			if (check_pair_status(p))
-				diff_flush_stat(p, options, &diffstat);
-		}
+		compute_diffstat(options, &diffstat, q);
 		if (output_format & DIFF_FORMAT_NUMSTAT)
 			show_numstat(&diffstat, options);
 		if (output_format & DIFF_FORMAT_DIFFSTAT)
@@ -6318,8 +6457,7 @@ void diff_flush(struct diff_options *options)
 		 * options->file to /dev/null should be safe, because we
 		 * aren't supposed to produce any output anyway.
 		 */
-		if (options->close_file)
-			fclose(options->file);
+		diff_free_file(options);
 		options->file = xfopen("/dev/null", "w");
 		options->close_file = 1;
 		options->color_moved = 0;
@@ -6352,8 +6490,7 @@ void diff_flush(struct diff_options *options)
 free_queue:
 	free(q->queue);
 	DIFF_QUEUE_CLEAR(q);
-	if (options->close_file)
-		fclose(options->file);
+	diff_free(options);
 
 	/*
 	 * Report the content-level differences with HAS_CHANGES;
@@ -6428,9 +6565,9 @@ static int diff_filespec_is_identical(struct repository *r,
 {
 	if (S_ISGITLINK(one->mode))
 		return 0;
-	if (diff_populate_filespec(r, one, 0))
+	if (diff_populate_filespec(r, one, NULL))
 		return 0;
-	if (diff_populate_filespec(r, two, 0))
+	if (diff_populate_filespec(r, two, NULL))
 		return 0;
 	return !memcmp(one->data, two->data, one->size);
 }
@@ -6438,6 +6575,12 @@ static int diff_filespec_is_identical(struct repository *r,
 static int diff_filespec_check_stat_unmatch(struct repository *r,
 					    struct diff_filepair *p)
 {
+	struct diff_populate_filespec_options dpf_options = {
+		.check_size_only = 1,
+		.missing_object_cb = diff_queued_diff_prefetch,
+		.missing_object_data = r,
+	};
+
 	if (p->done_skip_stat_unmatch)
 		return p->skip_stat_unmatch_result;
 
@@ -6460,8 +6603,8 @@ static int diff_filespec_check_stat_unmatch(struct repository *r,
 	    !DIFF_FILE_VALID(p->two) ||
 	    (p->one->oid_valid && p->two->oid_valid) ||
 	    (p->one->mode != p->two->mode) ||
-	    diff_populate_filespec(r, p->one, CHECK_SIZE_ONLY) ||
-	    diff_populate_filespec(r, p->two, CHECK_SIZE_ONLY) ||
+	    diff_populate_filespec(r, p->one, &dpf_options) ||
+	    diff_populate_filespec(r, p->two, &dpf_options) ||
 	    (p->one->size != p->two->size) ||
 	    !diff_filespec_is_identical(r, p->one, p->two)) /* (2) */
 		p->skip_stat_unmatch_result = 1;
@@ -6512,9 +6655,9 @@ void diffcore_fix_diff_index(void)
 	QSORT(q->queue, q->nr, diffnamecmp);
 }
 
-static void add_if_missing(struct repository *r,
-			   struct oid_array *to_fetch,
-			   const struct diff_filespec *filespec)
+void diff_add_if_missing(struct repository *r,
+			 struct oid_array *to_fetch,
+			 const struct diff_filespec *filespec)
 {
 	if (filespec && filespec->oid_valid &&
 	    !S_ISGITLINK(filespec->mode) &&
@@ -6523,30 +6666,48 @@ static void add_if_missing(struct repository *r,
 		oid_array_append(to_fetch, &filespec->oid);
 }
 
-void diffcore_std(struct diff_options *options)
+void diff_queued_diff_prefetch(void *repository)
 {
-	if (options->repo == the_repository && has_promisor_remote()) {
-		/*
-		 * Prefetch the diff pairs that are about to be flushed.
-		 */
-		int i;
-		struct diff_queue_struct *q = &diff_queued_diff;
-		struct oid_array to_fetch = OID_ARRAY_INIT;
+	struct repository *repo = repository;
+	int i;
+	struct diff_queue_struct *q = &diff_queued_diff;
+	struct oid_array to_fetch = OID_ARRAY_INIT;
 
-		for (i = 0; i < q->nr; i++) {
-			struct diff_filepair *p = q->queue[i];
-			add_if_missing(options->repo, &to_fetch, p->one);
-			add_if_missing(options->repo, &to_fetch, p->two);
-		}
-		if (to_fetch.nr)
-			/*
-			 * NEEDSWORK: Consider deduplicating the OIDs sent.
-			 */
-			promisor_remote_get_direct(options->repo,
-						   to_fetch.oid, to_fetch.nr);
-		oid_array_clear(&to_fetch);
+	for (i = 0; i < q->nr; i++) {
+		struct diff_filepair *p = q->queue[i];
+		diff_add_if_missing(repo, &to_fetch, p->one);
+		diff_add_if_missing(repo, &to_fetch, p->two);
 	}
 
+	/*
+	 * NEEDSWORK: Consider deduplicating the OIDs sent.
+	 */
+	promisor_remote_get_direct(repo, to_fetch.oid, to_fetch.nr);
+
+	oid_array_clear(&to_fetch);
+}
+
+void diffcore_std(struct diff_options *options)
+{
+	int output_formats_to_prefetch = DIFF_FORMAT_DIFFSTAT |
+		DIFF_FORMAT_NUMSTAT |
+		DIFF_FORMAT_PATCH |
+		DIFF_FORMAT_SHORTSTAT |
+		DIFF_FORMAT_DIRSTAT;
+
+	/*
+	 * Check if the user requested a blob-data-requiring diff output and/or
+	 * break-rewrite detection (which requires blob data). If yes, prefetch
+	 * the diff pairs.
+	 *
+	 * If no prefetching occurs, diffcore_rename() will prefetch if it
+	 * decides that it needs inexact rename detection.
+	 */
+	if (options->repo == the_repository && has_promisor_remote() &&
+	    (options->output_format & output_formats_to_prefetch ||
+	     options->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK))
+		diff_queued_diff_prefetch(options->repo);
+
 	/* NOTE please keep the following in sync with diff_tree_combined() */
 	if (options->skip_stat_unmatch)
 		diffcore_skip_stat_unmatch(options);
@@ -6564,6 +6725,8 @@ void diffcore_std(struct diff_options *options)
 		diffcore_pickaxe(options);
 	if (options->orderfile)
 		diffcore_order(options->orderfile);
+	if (options->rotate_to)
+		diffcore_rotate(options);
 	if (!options->found_follow)
 		/* See try_to_follow_renames() in tree-diff.c */
 		diff_resolve_rename_copy();
@@ -6621,6 +6784,20 @@ static int is_submodule_ignored(const char *path, struct diff_options *options)
 	return ignored;
 }
 
+void compute_diffstat(struct diff_options *options,
+		      struct diffstat_t *diffstat,
+		      struct diff_queue_struct *q)
+{
+	int i;
+
+	memset(diffstat, 0, sizeof(struct diffstat_t));
+	for (i = 0; i < q->nr; i++) {
+		struct diff_filepair *p = q->queue[i];
+		if (check_pair_status(p))
+			diff_flush_stat(p, options, diffstat);
+	}
+}
+
 void diff_addremove(struct diff_options *options,
 		    int addremove, unsigned mode,
 		    const struct object_id *oid,
@@ -6705,8 +6882,11 @@ void diff_change(struct diff_options *options,
 		return;
 
 	if (options->flags.quick && options->skip_stat_unmatch &&
-	    !diff_filespec_check_stat_unmatch(options->repo, p))
+	    !diff_filespec_check_stat_unmatch(options->repo, p)) {
+		diff_free_filespec_data(p->one);
+		diff_free_filespec_data(p->two);
 		return;
+	}
 
 	options->flags.has_changes = 1;
 }
@@ -6778,7 +6958,7 @@ size_t fill_textconv(struct repository *r,
 			*outbuf = "";
 			return 0;
 		}
-		if (diff_populate_filespec(r, df, 0))
+		if (diff_populate_filespec(r, df, NULL))
 			die("unable to read files to diff");
 		*outbuf = df->data;
 		return df->size;
diff --git a/diff.h b/diff.h
index 7f8f024feb..8ba85c5e60 100644
--- a/diff.h
+++ b/diff.h
@@ -9,6 +9,59 @@
 #include "object.h"
 #include "oidset.h"
 
+/**
+ * The diff API is for programs that compare two sets of files (e.g. two trees,
+ * one tree and the index) and present the found difference in various ways.
+ * The calling program is responsible for feeding the API pairs of files, one
+ * from the "old" set and the corresponding one from "new" set, that are
+ * different.
+ * The library called through this API is called diffcore, and is responsible
+ * for two things.
+ *
+ * - finding total rewrites (`-B`), renames (`-M`) and copies (`-C`), and
+ * changes that touch a string (`-S`), as specified by the caller.
+ *
+ * - outputting the differences in various formats, as specified by the caller.
+ *
+ * Calling sequence
+ * ----------------
+ *
+ * - Prepare `struct diff_options` to record the set of diff options, and then
+ * call `repo_diff_setup()` to initialize this structure.  This sets up the
+ * vanilla default.
+ *
+ * - Fill in the options structure to specify desired output format, rename
+ * detection, etc.  `diff_opt_parse()` can be used to parse options given
+ * from the command line in a way consistent with existing git-diff family
+ * of programs.
+ *
+ * - Call `diff_setup_done()`; this inspects the options set up so far for
+ * internal consistency and make necessary tweaking to it (e.g. if textual
+ * patch output was asked, recursive behaviour is turned on); the callback
+ * set_default in diff_options can be used to tweak this more.
+ *
+ * - As you find different pairs of files, call `diff_change()` to feed
+ * modified files, `diff_addremove()` to feed created or deleted files, or
+ * `diff_unmerge()` to feed a file whose state is 'unmerged' to the API.
+ * These are thin wrappers to a lower-level `diff_queue()` function that is
+ * flexible enough to record any of these kinds of changes.
+ *
+ * - Once you finish feeding the pairs of files, call `diffcore_std()`.
+ * This will tell the diffcore library to go ahead and do its work.
+ *
+ * - Calling `diff_flush()` will produce the output, it will call
+ *   `diff_free()` to free any resources, e.g. those allocated in
+ *   `diff_opt_parse()`.
+ *
+ * - Set `.no_free = 1` before calling `diff_flush()` to defer the
+ *   freeing of allocated memory in diff_options. This is useful when
+ *   `diff_flush()` is being called in a loop, rather than as a
+ *   one-off. When setting `.no_free = 1` you must ensure that
+ *   `diff_free()` is called at the end, either by flipping the flag
+ *   before the last `diff_flush()` call, or by flipping it before
+ *   calling `diff_free()` yourself.
+ */
+
 struct combine_diff_path;
 struct commit;
 struct diff_filespec;
@@ -65,21 +118,66 @@ typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data)
 
 #define DIFF_FLAGS_INIT { 0 }
 struct diff_flags {
+
+	/**
+	 * Tells if tree traversal done by tree-diff should recursively descend
+	 * into a tree object pair that are different in preimage and postimage set.
+	 */
 	unsigned recursive;
 	unsigned tree_in_recursive;
+
+	/* Affects the way how a file that is seemingly binary is treated. */
 	unsigned binary;
 	unsigned text;
+
+	/**
+	 * Tells the patch output format not to use abbreviated object names on the
+	 * "index" lines.
+	 */
 	unsigned full_index;
+
+	/* Affects if diff-files shows removed files. */
 	unsigned silent_on_remove;
+
+	/**
+	 * Tells the diffcore library that the caller is feeding unchanged
+	 * filepairs to allow copies from unmodified files be detected.
+	 */
 	unsigned find_copies_harder;
+
 	unsigned follow_renames;
 	unsigned rename_empty;
+
+	/* Internal; used for optimization to see if there is any change. */
 	unsigned has_changes;
+
 	unsigned quick;
+
+	/**
+	 * Tells diff-files that the input is not tracked files but files in random
+	 * locations on the filesystem.
+	 */
 	unsigned no_index;
+
+	/**
+	 * Tells output routine that it is Ok to call user specified patch output
+	 * routine.  Plumbing disables this to ensure stable output.
+	 */
 	unsigned allow_external;
+
+	/**
+	 * For communication between the calling program and the options parser;
+	 * tell the calling program to signal the presence of difference using
+	 * program exit code.
+	 */
 	unsigned exit_with_status;
+
+	/**
+	 * Tells the library that the calling program is feeding the filepairs
+	 * reversed; `one` is two, and `two` is one.
+	 */
 	unsigned reverse_diff;
+
 	unsigned check_failed;
 	unsigned relative_name;
 	unsigned ignore_submodules;
@@ -90,6 +188,7 @@ struct diff_flags {
 	unsigned diff_from_contents;
 	unsigned dirty_submodules;
 	unsigned ignore_untracked_in_submodules;
+	unsigned ignore_submodule_set;
 	unsigned ignore_dirty_submodules;
 	unsigned override_submodule_config;
 	unsigned dirstat_by_line;
@@ -131,36 +230,99 @@ enum diff_submodule_format {
 	DIFF_SUBMODULE_INLINE_DIFF
 };
 
+/**
+ * the set of options the calling program wants to affect the operation of
+ * diffcore library with.
+ */
 struct diff_options {
 	const char *orderfile;
+
+	/*
+	 * "--rotate-to=<file>" would start showing at <file> and when
+	 * the output reaches the end, wrap around by default.
+	 * Setting skip_instead_of_rotate to true stops the output at the
+	 * end, effectively discarding the earlier part of the output
+	 * before <file>'s diff (this is used to implement the
+	 * "--skip-to=<file>" option).
+	 *
+	 * When rotate_to_strict is set, it is an error if there is no
+	 * <file> in the diff.  Otherwise, the output starts at the
+	 * path that is the same as, or first path that sorts after,
+	 * <file>.  Because it is unreasonable to require the exact
+	 * match for "git log -p --rotate-to=<file>" (i.e. not all
+	 * commit would touch that single <file>), "git log" sets it
+	 * to false.  "git diff" sets it to true to detect an error
+	 * in the command line option.
+	 */
+	const char *rotate_to;
+	int skip_instead_of_rotate;
+	int rotate_to_strict;
+
+	/**
+	 * A constant string (can and typically does contain newlines to look for
+	 * a block of text, not just a single line) to filter out the filepairs
+	 * that do not change the number of strings contained in its preimage and
+	 * postimage of the diff_queue.
+	 */
 	const char *pickaxe;
+	unsigned pickaxe_opts;
+
+	/* -I<regex> */
+	regex_t **ignore_regex;
+	size_t ignore_regex_nr, ignore_regex_alloc;
+
 	const char *single_follow;
 	const char *a_prefix, *b_prefix;
 	const char *line_prefix;
 	size_t line_prefix_length;
+
+	/**
+	 * collection of boolean options that affects the operation, but some do
+	 * not have anything to do with the diffcore library.
+	 */
 	struct diff_flags flags;
 
 	/* diff-filter bits */
 	unsigned int filter;
 
 	int use_color;
+
+	/* Number of context lines to generate in patch output. */
 	int context;
+
 	int interhunkcontext;
+
+	/* Affects the way detection logic for complete rewrites, renames and
+	 * copies.
+	 */
 	int break_opt;
 	int detect_rename;
+
 	int irreversible_delete;
 	int skip_stat_unmatch;
 	int line_termination;
+
+	/* The output format used when `diff_flush()` is run. */
 	int output_format;
-	unsigned pickaxe_opts;
+
+	/* Affects the way detection logic for complete rewrites, renames and
+	 * copies.
+	 */
 	int rename_score;
 	int rename_limit;
+
 	int needed_rename_limit;
 	int degraded_cc_to_c;
 	int show_rename_progress;
 	int dirstat_permille;
 	int setup;
+
+	/* Number of hexdigits to abbreviate raw format output to. */
 	int abbrev;
+
+	/* If non-zero, then stop computing after this many changes. */
+	int max_changes;
+
 	int ita_invisible_in_index;
 /* white-space error highlighting */
 #define WSEH_NEW (1<<12)
@@ -192,6 +354,7 @@ struct diff_options {
 	/* to support internal diff recursion by --follow hack*/
 	int found_follow;
 
+	/* Callback which allows tweaking the options in diff_setup_done(). */
 	void (*set_default)(struct diff_options *);
 
 	FILE *file;
@@ -232,6 +395,8 @@ struct diff_options {
 
 	struct repository *repo;
 	struct option *parseopts;
+
+	int no_free;
 };
 
 unsigned diff_filter_bit(char status);
@@ -245,6 +410,22 @@ void diff_emit_submodule_error(struct diff_options *o, const char *err);
 void diff_emit_submodule_pipethrough(struct diff_options *o,
 				     const char *line, int len);
 
+struct diffstat_t {
+	int nr;
+	int alloc;
+	struct diffstat_file {
+		char *from_name;
+		char *name;
+		char *print_name;
+		const char *comments;
+		unsigned is_unmerged:1;
+		unsigned is_binary:1;
+		unsigned is_renamed:1;
+		unsigned is_interesting:1;
+		uintmax_t added, deleted;
+	} **files;
+};
+
 enum color_diff {
 	DIFF_RESET = 0,
 	DIFF_CONTEXT = 1,
@@ -270,6 +451,7 @@ enum color_diff {
 	DIFF_FILE_OLD_BOLD = 21,
 	DIFF_FILE_NEW_BOLD = 22,
 };
+
 const char *diff_get_color(int diff_use_color, enum color_diff ix);
 #define diff_get_color_opt(o, ix) \
 	diff_get_color((o)->use_color, ix)
@@ -284,11 +466,11 @@ struct combine_diff_path *diff_tree_paths(
 	struct combine_diff_path *p, const struct object_id *oid,
 	const struct object_id **parents_oid, int nparent,
 	struct strbuf *base, struct diff_options *opt);
-int diff_tree_oid(const struct object_id *old_oid,
-		  const struct object_id *new_oid,
-		  const char *base, struct diff_options *opt);
-int diff_root_tree_oid(const struct object_id *new_oid, const char *base,
-		       struct diff_options *opt);
+void diff_tree_oid(const struct object_id *old_oid,
+		   const struct object_id *new_oid,
+		   const char *base, struct diff_options *opt);
+void diff_root_tree_oid(const struct object_id *new_oid, const char *base,
+			struct diff_options *opt);
 
 struct combine_diff_path {
 	struct combine_diff_path *next;
@@ -307,11 +489,11 @@ struct combine_diff_path {
 		st_mult(sizeof(struct combine_diff_parent), (n)))
 
 void show_combined_diff(struct combine_diff_path *elem, int num_parent,
-			int dense, struct rev_info *);
+			struct rev_info *);
 
-void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, int dense, struct rev_info *rev);
+void diff_tree_combined(const struct object_id *oid, const struct oid_array *parents, struct rev_info *rev);
 
-void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev);
+void diff_tree_combined_merge(const struct commit *commit, struct rev_info *rev);
 
 void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b);
 
@@ -334,6 +516,10 @@ void diff_change(struct diff_options *,
 
 struct diff_filepair *diff_unmerge(struct diff_options *, const char *path);
 
+void compute_diffstat(struct diff_options *options, struct diffstat_t *diffstat,
+		      struct diff_queue_struct *q);
+void free_diffstat_info(struct diffstat_t *diffstat);
+
 #define DIFF_SETUP_REVERSE      	1
 #define DIFF_SETUP_USE_SIZE_CACHE	4
 
@@ -369,6 +555,10 @@ int git_config_rename(const char *var, const char *value);
 #define DIFF_PICKAXE_KINDS_MASK (DIFF_PICKAXE_KIND_S | \
 				 DIFF_PICKAXE_KIND_G | \
 				 DIFF_PICKAXE_KIND_OBJFIND)
+#define DIFF_PICKAXE_KINDS_G_REGEX_MASK (DIFF_PICKAXE_KIND_G | \
+					 DIFF_PICKAXE_REGEX)
+#define DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK (DIFF_PICKAXE_ALL | \
+					     DIFF_PICKAXE_KIND_OBJFIND)
 
 #define DIFF_PICKAXE_IGNORE_CASE	32
 
@@ -405,6 +595,7 @@ void diffcore_fix_diff_index(void);
 
 int diff_queue_is_empty(void);
 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-raw status letters */
@@ -429,12 +620,17 @@ void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc);
  */
 const char *diff_aligned_abbrev(const struct object_id *sha1, int);
 
+void diff_get_merge_base(const struct rev_info *revs, struct object_id *mb);
+
 /* do not report anything on removed paths */
 #define DIFF_SILENT_ON_REMOVED 01
 /* report racily-clean paths as modified */
 #define DIFF_RACY_IS_MODIFIED 02
 int run_diff_files(struct rev_info *revs, unsigned int option);
-int run_diff_index(struct rev_info *revs, int cached);
+
+#define DIFF_INDEX_CACHED 01
+#define DIFF_INDEX_MERGE_BASE 02
+int run_diff_index(struct rev_info *revs, unsigned int option);
 
 int do_diff_cache(const struct object_id *, struct diff_options *);
 int diff_flush_patch_id(struct diff_options *, struct object_id *, int, int);
@@ -450,6 +646,13 @@ int index_differs_from(struct repository *r, const char *def,
 		       int ita_invisible_in_index);
 
 /*
+ * Emit an interdiff of two object ID's to 'diff_options.file' optionally
+ * indented by 'indent' spaces.
+ */
+void show_interdiff(const struct object_id *, const struct object_id *,
+		    int indent, struct diff_options *);
+
+/*
  * Fill the contents of the filespec "df", respecting any textconv defined by
  * its userdiff driver.  The "driver" parameter must come from a
  * previous call to get_textconv(), and therefore should either be NULL or have
diff --git a/diffcore-break.c b/diffcore-break.c
index 9d20a6a6fc..0d4a14964d 100644
--- a/diffcore-break.c
+++ b/diffcore-break.c
@@ -4,6 +4,7 @@
 #include "cache.h"
 #include "diff.h"
 #include "diffcore.h"
+#include "promisor-remote.h"
 
 static int should_break(struct repository *r,
 			struct diff_filespec *src,
@@ -49,6 +50,8 @@ static int should_break(struct repository *r,
 	unsigned long delta_size, max_size;
 	unsigned long src_copied, literal_added, src_removed;
 
+	struct diff_populate_filespec_options options = { 0 };
+
 	*merge_score_p = 0; /* assume no deletion --- "do not break"
 			     * is the default.
 			     */
@@ -62,8 +65,13 @@ static int should_break(struct repository *r,
 	    oideq(&src->oid, &dst->oid))
 		return 0; /* they are the same */
 
-	if (diff_populate_filespec(r, src, 0) ||
-	    diff_populate_filespec(r, dst, 0))
+	if (r == the_repository && has_promisor_remote()) {
+		options.missing_object_cb = diff_queued_diff_prefetch;
+		options.missing_object_data = r;
+	}
+
+	if (diff_populate_filespec(r, src, &options) ||
+	    diff_populate_filespec(r, dst, &options))
 		return 0; /* error but caught downstream */
 
 	max_size = ((src->size > dst->size) ? src->size : dst->size);
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index a9c6d60df2..c88e50c632 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -19,38 +19,31 @@ struct diffgrep_cb {
 	int hit;
 };
 
-static void diffgrep_consume(void *priv, char *line, unsigned long len)
+static int diffgrep_consume(void *priv, char *line, unsigned long len)
 {
 	struct diffgrep_cb *data = priv;
 	regmatch_t regmatch;
 
 	if (line[0] != '+' && line[0] != '-')
-		return;
+		return 0;
 	if (data->hit)
-		/*
-		 * NEEDSWORK: we should have a way to terminate the
-		 * caller early.
-		 */
-		return;
-	data->hit = !regexec_buf(data->regexp, line + 1, len - 1, 1,
-				 &regmatch, 0);
+		BUG("Already matched in diffgrep_consume! Broken xdiff_emit_line_fn?");
+	if (!regexec_buf(data->regexp, line + 1, len - 1, 1,
+			 &regmatch, 0)) {
+		data->hit = 1;
+		return 1;
+	}
+	return 0;
 }
 
 static int diff_grep(mmfile_t *one, mmfile_t *two,
 		     struct diff_options *o,
 		     regex_t *regexp, kwset_t kws)
 {
-	regmatch_t regmatch;
 	struct diffgrep_cb ecbdata;
 	xpparam_t xpp;
 	xdemitconf_t xecfg;
-
-	if (!one)
-		return !regexec_buf(regexp, two->ptr, two->size,
-				    1, &regmatch, 0);
-	if (!two)
-		return !regexec_buf(regexp, one->ptr, one->size,
-				    1, &regmatch, 0);
+	int ret;
 
 	/*
 	 * We have both sides; need to run textual diff and see if
@@ -60,38 +53,47 @@ static int diff_grep(mmfile_t *one, mmfile_t *two,
 	memset(&xecfg, 0, sizeof(xecfg));
 	ecbdata.regexp = regexp;
 	ecbdata.hit = 0;
+	xecfg.flags = XDL_EMIT_NO_HUNK_HDR;
 	xecfg.ctxlen = o->context;
 	xecfg.interhunkctxlen = o->interhunkcontext;
-	if (xdi_diff_outf(one, two, discard_hunk_line, diffgrep_consume,
-			  &ecbdata, &xpp, &xecfg))
-		return 0;
-	return ecbdata.hit;
+
+	/*
+	 * An xdiff error might be our "data->hit" from above. See the
+	 * comment for xdiff_emit_line_fn in xdiff-interface.h
+	 */
+	ret = xdi_diff_outf(one, two, NULL, diffgrep_consume,
+			    &ecbdata, &xpp, &xecfg);
+	if (ecbdata.hit)
+		return 1;
+	if (ret)
+		return ret;
+	return 0;
 }
 
-static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)
+static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws,
+			     unsigned int limit)
 {
-	unsigned int cnt;
-	unsigned long sz;
-	const char *data;
-
-	sz = mf->size;
-	data = mf->ptr;
-	cnt = 0;
+	unsigned int cnt = 0;
+	unsigned long sz = mf->size;
+	const char *data = mf->ptr;
 
 	if (regexp) {
 		regmatch_t regmatch;
 		int flags = 0;
 
-		while (sz && *data &&
+		while (sz &&
 		       !regexec_buf(regexp, data, sz, 1, &regmatch, flags)) {
 			flags |= REG_NOTBOL;
 			data += regmatch.rm_eo;
 			sz -= regmatch.rm_eo;
-			if (sz && *data && regmatch.rm_so == regmatch.rm_eo) {
+			if (sz && regmatch.rm_so == regmatch.rm_eo) {
 				data++;
 				sz--;
 			}
 			cnt++;
+
+			if (limit && cnt == limit)
+				return cnt;
 		}
 
 	} else { /* Classic exact string match */
@@ -103,6 +105,9 @@ static unsigned int contains(mmfile_t *mf, regex_t *regexp, kwset_t kws)
 			sz -= offset + kwsm.size[0];
 			data += offset + kwsm.size[0];
 			cnt++;
+
+			if (limit && cnt == limit)
+				return cnt;
 		}
 	}
 	return cnt;
@@ -112,9 +117,9 @@ static int has_changes(mmfile_t *one, mmfile_t *two,
 		       struct diff_options *o,
 		       regex_t *regexp, kwset_t kws)
 {
-	unsigned int one_contains = one ? contains(one, regexp, kws) : 0;
-	unsigned int two_contains = two ? contains(two, regexp, kws) : 0;
-	return one_contains != two_contains;
+	unsigned int c1 = one ? contains(one, regexp, kws, 0) : 0;
+	unsigned int c2 = two ? contains(two, regexp, kws, c1 + 1) : 0;
+	return c1 != c2;
 }
 
 static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
@@ -136,9 +141,6 @@ static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
 			 oidset_contains(o->objfind, &p->two->oid));
 	}
 
-	if (!o->pickaxe[0])
-		return 0;
-
 	if (o->flags.allow_textconv) {
 		textconv_one = get_textconv(o->repo, p->one);
 		textconv_two = get_textconv(o->repo, p->two);
@@ -163,9 +165,7 @@ static int pickaxe_match(struct diff_filepair *p, struct diff_options *o,
 	mf1.size = fill_textconv(o->repo, textconv_one, p->one, &mf1.ptr);
 	mf2.size = fill_textconv(o->repo, textconv_two, p->two, &mf2.ptr);
 
-	ret = fn(DIFF_FILE_VALID(p->one) ? &mf1 : NULL,
-		 DIFF_FILE_VALID(p->two) ? &mf2 : NULL,
-		 o, regexp, kws);
+	ret = fn(&mf1, &mf2, o, regexp, kws);
 
 	if (textconv_one)
 		free(mf1.ptr);
@@ -232,13 +232,31 @@ void diffcore_pickaxe(struct diff_options *o)
 	int opts = o->pickaxe_opts;
 	regex_t regex, *regexp = NULL;
 	kwset_t kws = NULL;
+	pickaxe_fn fn;
 
+	if (opts & ~DIFF_PICKAXE_KIND_OBJFIND &&
+	    (!needle || !*needle))
+		BUG("should have needle under -G or -S");
 	if (opts & (DIFF_PICKAXE_REGEX | DIFF_PICKAXE_KIND_G)) {
 		int cflags = REG_EXTENDED | REG_NEWLINE;
 		if (o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE)
 			cflags |= REG_ICASE;
 		regcomp_or_die(&regex, needle, cflags);
 		regexp = &regex;
+
+		if (opts & DIFF_PICKAXE_KIND_G)
+			fn = diff_grep;
+		else if (opts & DIFF_PICKAXE_REGEX)
+			fn = has_changes;
+		else
+			/*
+			 * We don't need to check the combination of
+			 * -G and --pickaxe-regex, by the time we get
+			 * here diff.c has already died if they're
+			 * combined. See the usage tests in
+			 * t4209-log-pickaxe.sh.
+			 */
+			BUG("unreachable");
 	} else if (opts & DIFF_PICKAXE_KIND_S) {
 		if (o->pickaxe_opts & DIFF_PICKAXE_IGNORE_CASE &&
 		    has_non_ascii(needle)) {
@@ -255,10 +273,14 @@ void diffcore_pickaxe(struct diff_options *o)
 			kwsincr(kws, needle, strlen(needle));
 			kwsprep(kws);
 		}
+		fn = has_changes;
+	} else if (opts & DIFF_PICKAXE_KIND_OBJFIND) {
+		fn = NULL;
+	} else {
+		BUG("unknown pickaxe_opts flag");
 	}
 
-	pickaxe(&diff_queued_diff, o, regexp, kws,
-		(opts & DIFF_PICKAXE_KIND_G) ? diff_grep : has_changes);
+	pickaxe(&diff_queued_diff, o, regexp, kws, fn);
 
 	if (regexp)
 		regfree(regexp);
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 531d7adeaf..bebd4ed6a4 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -1,4 +1,5 @@
 /*
+ *
  * Copyright (C) 2005 Junio C Hamano
  */
 #include "cache.h"
@@ -7,63 +8,37 @@
 #include "object-store.h"
 #include "hashmap.h"
 #include "progress.h"
+#include "promisor-remote.h"
+#include "strmap.h"
 
 /* Table of rename/copy destinations */
 
 static struct diff_rename_dst {
-	struct diff_filespec *two;
-	struct diff_filepair *pair;
+	struct diff_filepair *p;
+	struct diff_filespec *filespec_to_free;
+	int is_rename; /* false -> just a create; true -> rename or copy */
 } *rename_dst;
 static int rename_dst_nr, rename_dst_alloc;
+/* Mapping from break source pathname to break destination index */
+static struct strintmap *break_idx = NULL;
 
-static int find_rename_dst(struct diff_filespec *two)
-{
-	int first, last;
-
-	first = 0;
-	last = rename_dst_nr;
-	while (last > first) {
-		int next = first + ((last - first) >> 1);
-		struct diff_rename_dst *dst = &(rename_dst[next]);
-		int cmp = strcmp(two->path, dst->two->path);
-		if (!cmp)
-			return next;
-		if (cmp < 0) {
-			last = next;
-			continue;
-		}
-		first = next+1;
-	}
-	return -first - 1;
-}
-
-static struct diff_rename_dst *locate_rename_dst(struct diff_filespec *two)
+static struct diff_rename_dst *locate_rename_dst(struct diff_filepair *p)
 {
-	int ofs = find_rename_dst(two);
-	return ofs < 0 ? NULL : &rename_dst[ofs];
+	/* Lookup by p->ONE->path */
+	int idx = break_idx ? strintmap_get(break_idx, p->one->path) : -1;
+	return (idx == -1) ? NULL : &rename_dst[idx];
 }
 
 /*
  * Returns 0 on success, -1 if we found a duplicate.
  */
-static int add_rename_dst(struct diff_filespec *two)
+static int add_rename_dst(struct diff_filepair *p)
 {
-	int first = find_rename_dst(two);
-
-	if (first >= 0)
-		return -1;
-	first = -first - 1;
-
-	/* insert to make it at "first" */
 	ALLOC_GROW(rename_dst, rename_dst_nr + 1, rename_dst_alloc);
+	rename_dst[rename_dst_nr].p = p;
+	rename_dst[rename_dst_nr].filespec_to_free = NULL;
+	rename_dst[rename_dst_nr].is_rename = 0;
 	rename_dst_nr++;
-	if (first < rename_dst_nr)
-		MOVE_ARRAY(rename_dst + first + 1, rename_dst + first,
-			   rename_dst_nr - first - 1);
-	rename_dst[first].two = alloc_filespec(two->path);
-	fill_filespec(rename_dst[first].two, &two->oid, two->oid_valid,
-		      two->mode);
-	rename_dst[first].pair = NULL;
 	return 0;
 }
 
@@ -74,36 +49,20 @@ static struct diff_rename_src {
 } *rename_src;
 static int rename_src_nr, rename_src_alloc;
 
-static struct diff_rename_src *register_rename_src(struct diff_filepair *p)
-{
-	int first, last;
-	struct diff_filespec *one = p->one;
-	unsigned short score = p->score;
-
-	first = 0;
-	last = rename_src_nr;
-	while (last > first) {
-		int next = first + ((last - first) >> 1);
-		struct diff_rename_src *src = &(rename_src[next]);
-		int cmp = strcmp(one->path, src->p->one->path);
-		if (!cmp)
-			return src;
-		if (cmp < 0) {
-			last = next;
-			continue;
+static void register_rename_src(struct diff_filepair *p)
+{
+	if (p->broken_pair) {
+		if (!break_idx) {
+			break_idx = xmalloc(sizeof(*break_idx));
+			strintmap_init_with_options(break_idx, -1, NULL, 0);
 		}
-		first = next+1;
+		strintmap_set(break_idx, p->one->path, rename_dst_nr);
 	}
 
-	/* insert to make it at "first" */
 	ALLOC_GROW(rename_src, rename_src_nr + 1, rename_src_alloc);
+	rename_src[rename_src_nr].p = p;
+	rename_src[rename_src_nr].score = p->score;
 	rename_src_nr++;
-	if (first < rename_src_nr)
-		MOVE_ARRAY(rename_src + first + 1, rename_src + first,
-			   rename_src_nr - first - 1);
-	rename_src[first].p = p;
-	rename_src[first].score = score;
-	return &(rename_src[first]);
 }
 
 static int basename_same(struct diff_filespec *src, struct diff_filespec *dst)
@@ -128,10 +87,46 @@ struct diff_score {
 	short name_score;
 };
 
+struct inexact_prefetch_options {
+	struct repository *repo;
+	int skip_unmodified;
+};
+static void inexact_prefetch(void *prefetch_options)
+{
+	struct inexact_prefetch_options *options = prefetch_options;
+	int i;
+	struct oid_array to_fetch = OID_ARRAY_INIT;
+
+	for (i = 0; i < rename_dst_nr; i++) {
+		if (rename_dst[i].p->renamed_pair)
+			/*
+			 * The loop in diffcore_rename() will not need these
+			 * blobs, so skip prefetching.
+			 */
+			continue; /* already found exact match */
+		diff_add_if_missing(options->repo, &to_fetch,
+				    rename_dst[i].p->two);
+	}
+	for (i = 0; i < rename_src_nr; i++) {
+		if (options->skip_unmodified &&
+		    diff_unmodified_pair(rename_src[i].p))
+			/*
+			 * The loop in diffcore_rename() will not need these
+			 * blobs, so skip prefetching.
+			 */
+			continue;
+		diff_add_if_missing(options->repo, &to_fetch,
+				    rename_src[i].p->one);
+	}
+	promisor_remote_get_direct(options->repo, to_fetch.oid, to_fetch.nr);
+	oid_array_clear(&to_fetch);
+}
+
 static int estimate_similarity(struct repository *r,
 			       struct diff_filespec *src,
 			       struct diff_filespec *dst,
-			       int minimum_score)
+			       int minimum_score,
+			       struct diff_populate_filespec_options *dpf_opt)
 {
 	/* src points at a file that existed in the original tree (or
 	 * optionally a file in the destination tree) and dst points
@@ -165,11 +160,13 @@ static int estimate_similarity(struct repository *r,
 	 * is a possible size - we really should have a flag to
 	 * say whether the size is valid or not!)
 	 */
+	dpf_opt->check_size_only = 1;
+
 	if (!src->cnt_data &&
-	    diff_populate_filespec(r, src, CHECK_SIZE_ONLY))
+	    diff_populate_filespec(r, src, dpf_opt))
 		return 0;
 	if (!dst->cnt_data &&
-	    diff_populate_filespec(r, dst, CHECK_SIZE_ONLY))
+	    diff_populate_filespec(r, dst, dpf_opt))
 		return 0;
 
 	max_size = ((src->size > dst->size) ? src->size : dst->size);
@@ -187,9 +184,11 @@ static int estimate_similarity(struct repository *r,
 	if (max_size * (MAX_SCORE-minimum_score) < delta_size * MAX_SCORE)
 		return 0;
 
-	if (!src->cnt_data && diff_populate_filespec(r, src, 0))
+	dpf_opt->check_size_only = 0;
+
+	if (!src->cnt_data && diff_populate_filespec(r, src, dpf_opt))
 		return 0;
-	if (!dst->cnt_data && diff_populate_filespec(r, dst, 0))
+	if (!dst->cnt_data && diff_populate_filespec(r, dst, dpf_opt))
 		return 0;
 
 	if (diffcore_count_changes(r, src, dst,
@@ -209,26 +208,24 @@ static int estimate_similarity(struct repository *r,
 
 static void record_rename_pair(int dst_index, int src_index, int score)
 {
-	struct diff_filespec *src, *dst;
-	struct diff_filepair *dp;
+	struct diff_filepair *src = rename_src[src_index].p;
+	struct diff_filepair *dst = rename_dst[dst_index].p;
 
-	if (rename_dst[dst_index].pair)
+	if (dst->renamed_pair)
 		die("internal error: dst already matched.");
 
-	src = rename_src[src_index].p->one;
-	src->rename_used++;
-	src->count++;
+	src->one->rename_used++;
+	src->one->count++;
 
-	dst = rename_dst[dst_index].two;
-	dst->count++;
+	rename_dst[dst_index].filespec_to_free = dst->one;
+	rename_dst[dst_index].is_rename = 1;
 
-	dp = diff_queue(NULL, src, dst);
-	dp->renamed_pair = 1;
-	if (!strcmp(src->path, dst->path))
-		dp->score = rename_src[src_index].score;
+	dst->one = src->one;
+	dst->renamed_pair = 1;
+	if (!strcmp(dst->one->path, dst->two->path))
+		dst->score = rename_src[src_index].score;
 	else
-		dp->score = score;
-	rename_dst[dst_index].pair = dp;
+		dst->score = score;
 }
 
 /*
@@ -261,10 +258,10 @@ static unsigned int hash_filespec(struct repository *r,
 				  struct diff_filespec *filespec)
 {
 	if (!filespec->oid_valid) {
-		if (diff_populate_filespec(r, filespec, 0))
+		if (diff_populate_filespec(r, filespec, NULL))
 			return 0;
-		hash_object_file(filespec->data, filespec->size, "blob",
-				 &filespec->oid);
+		hash_object_file(r->hash_algo, filespec->data, filespec->size,
+				 "blob", &filespec->oid);
 	}
 	return oidhash(&filespec->oid);
 }
@@ -274,7 +271,7 @@ static int find_identical_files(struct hashmap *srcs,
 				struct diff_options *options)
 {
 	int renames = 0;
-	struct diff_filespec *target = rename_dst[dst_index].two;
+	struct diff_filespec *target = rename_dst[dst_index].p->two;
 	struct file_similarity *p, *best = NULL;
 	int i = 100, best_score = -1;
 	unsigned int hash = hash_filespec(options->repo, target);
@@ -320,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;
@@ -339,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;
@@ -349,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);
 
@@ -357,8 +356,701 @@ 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_free_entries(&file_table, struct file_similarity, entry);
+	/* Free the hash data structure (entries will be freed with the pool) */
+	hashmap_clear(&file_table);
+
+	return renames;
+}
+
+struct dir_rename_info {
+	struct strintmap idx_map;
+	struct strmap dir_rename_guess;
+	struct strmap *dir_rename_count;
+	struct strintmap *relevant_source_dirs;
+	unsigned setup;
+};
+
+static char *get_dirname(const char *filename)
+{
+	char *slash = strrchr(filename, '/');
+	return slash ? xstrndup(filename, slash - filename) : xstrdup("");
+}
+
+static void dirname_munge(char *filename)
+{
+	char *slash = strrchr(filename, '/');
+	if (!slash)
+		slash = filename;
+	*slash = '\0';
+}
+
+static const char *get_highest_rename_path(struct strintmap *counts)
+{
+	int highest_count = 0;
+	const char *highest_destination_dir = NULL;
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+
+	strintmap_for_each_entry(counts, &iter, entry) {
+		const char *destination_dir = entry->key;
+		intptr_t count = (intptr_t)entry->value;
+		if (count > highest_count) {
+			highest_count = count;
+			highest_destination_dir = destination_dir;
+		}
+	}
+	return highest_destination_dir;
+}
+
+static char *UNKNOWN_DIR = "/";  /* placeholder -- short, illegal directory */
+
+static int dir_rename_already_determinable(struct strintmap *counts)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+	int first = 0, second = 0, unknown = 0;
+	strintmap_for_each_entry(counts, &iter, entry) {
+		const char *destination_dir = entry->key;
+		intptr_t count = (intptr_t)entry->value;
+		if (!strcmp(destination_dir, UNKNOWN_DIR)) {
+			unknown = count;
+		} else if (count >= first) {
+			second = first;
+			first = count;
+		} else if (count >= second) {
+			second = count;
+		}
+	}
+	return first > second + unknown;
+}
+
+static void increment_count(struct dir_rename_info *info,
+			    char *old_dir,
+			    char *new_dir)
+{
+	struct strintmap *counts;
+	struct strmap_entry *e;
+
+	/* Get the {new_dirs -> counts} mapping using old_dir */
+	e = strmap_get_entry(info->dir_rename_count, old_dir);
+	if (e) {
+		counts = e->value;
+	} else {
+		counts = xmalloc(sizeof(*counts));
+		strintmap_init_with_options(counts, 0, NULL, 1);
+		strmap_put(info->dir_rename_count, old_dir, counts);
+	}
+
+	/* Increment the count for new_dir */
+	strintmap_incr(counts, new_dir, 1);
+}
+
+static void update_dir_rename_counts(struct dir_rename_info *info,
+				     struct strintmap *dirs_removed,
+				     const char *oldname,
+				     const char *newname)
+{
+	char *old_dir;
+	char *new_dir;
+	const char new_dir_first_char = newname[0];
+	int first_time_in_loop = 1;
+
+	if (!info->setup)
+		/*
+		 * info->setup is 0 here in two cases: (1) all auxiliary
+		 * vars (like dirs_removed) were NULL so
+		 * initialize_dir_rename_info() returned early, or (2)
+		 * either break detection or copy detection are active so
+		 * that we never called initialize_dir_rename_info().  In
+		 * the former case, we don't have enough info to know if
+		 * directories were renamed (because dirs_removed lets us
+		 * know about a necessary prerequisite, namely if they were
+		 * removed), and in the latter, we don't care about
+		 * directory renames or find_basename_matches.
+		 *
+		 * This matters because both basename and inexact matching
+		 * will also call update_dir_rename_counts().  In either of
+		 * the above two cases info->dir_rename_counts will not
+		 * have been properly initialized which prevents us from
+		 * updating it, but in these two cases we don't care about
+		 * dir_rename_counts anyway, so we can just exit early.
+		 */
+		return;
+
+
+	old_dir = xstrdup(oldname);
+	new_dir = xstrdup(newname);
+
+	while (1) {
+		int drd_flag = NOT_RELEVANT;
+
+		/* Get old_dir, skip if its directory isn't relevant. */
+		dirname_munge(old_dir);
+		if (info->relevant_source_dirs &&
+		    !strintmap_contains(info->relevant_source_dirs, old_dir))
+			break;
+
+		/* Get new_dir */
+		dirname_munge(new_dir);
+
+		/*
+		 * When renaming
+		 *   "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
+		 * then this suggests that both
+		 *   a/b/c/d/e/ => a/b/some/thing/else/e/
+		 *   a/b/c/d/   => a/b/some/thing/else/
+		 * so we want to increment counters for both.  We do NOT,
+		 * however, also want to suggest that there was the following
+		 * rename:
+		 *   a/b/c/ => a/b/some/thing/
+		 * so we need to quit at that point.
+		 *
+		 * Note the when first_time_in_loop, we only strip off the
+		 * basename, and we don't care if that's different.
+		 */
+		if (!first_time_in_loop) {
+			char *old_sub_dir = strchr(old_dir, '\0')+1;
+			char *new_sub_dir = strchr(new_dir, '\0')+1;
+			if (!*new_dir) {
+				/*
+				 * Special case when renaming to root directory,
+				 * i.e. when new_dir == "".  In this case, we had
+				 * something like
+				 *    a/b/subdir => subdir
+				 * and so dirname_munge() sets things up so that
+				 *    old_dir = "a/b\0subdir\0"
+				 *    new_dir = "\0ubdir\0"
+				 * We didn't have a '/' to overwrite a '\0' onto
+				 * in new_dir, so we have to compare differently.
+				 */
+				if (new_dir_first_char != old_sub_dir[0] ||
+				    strcmp(old_sub_dir+1, new_sub_dir))
+					break;
+			} else {
+				if (strcmp(old_sub_dir, new_sub_dir))
+					break;
+			}
+		}
+
+		/*
+		 * Above we suggested that we'd keep recording renames for
+		 * all ancestor directories where the trailing directories
+		 * matched, i.e. for
+		 *   "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c"
+		 * we'd increment rename counts for each of
+		 *   a/b/c/d/e/ => a/b/some/thing/else/e/
+		 *   a/b/c/d/   => a/b/some/thing/else/
+		 * However, we only need the rename counts for directories
+		 * in dirs_removed whose value is RELEVANT_FOR_SELF.
+		 * However, we add one special case of also recording it for
+		 * first_time_in_loop because find_basename_matches() can
+		 * use that as a hint to find a good pairing.
+		 */
+		if (dirs_removed)
+			drd_flag = strintmap_get(dirs_removed, old_dir);
+		if (drd_flag == RELEVANT_FOR_SELF || first_time_in_loop)
+			increment_count(info, old_dir, new_dir);
+
+		first_time_in_loop = 0;
+		if (drd_flag == NOT_RELEVANT)
+			break;
+		/* If we hit toplevel directory ("") for old or new dir, quit */
+		if (!*old_dir || !*new_dir)
+			break;
+	}
+
+	/* Free resources we don't need anymore */
+	free(old_dir);
+	free(new_dir);
+}
+
+static void initialize_dir_rename_info(struct dir_rename_info *info,
+				       struct strintmap *relevant_sources,
+				       struct strintmap *dirs_removed,
+				       struct strmap *dir_rename_count,
+				       struct strmap *cached_pairs)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+	int i;
+
+	if (!dirs_removed && !relevant_sources) {
+		info->setup = 0;
+		return;
+	}
+	info->setup = 1;
+
+	info->dir_rename_count = dir_rename_count;
+	if (!info->dir_rename_count) {
+		info->dir_rename_count = xmalloc(sizeof(*dir_rename_count));
+		strmap_init(info->dir_rename_count);
+	}
+	strintmap_init_with_options(&info->idx_map, -1, NULL, 0);
+	strmap_init_with_options(&info->dir_rename_guess, NULL, 0);
+
+	/* Setup info->relevant_source_dirs */
+	info->relevant_source_dirs = NULL;
+	if (dirs_removed || !relevant_sources) {
+		info->relevant_source_dirs = dirs_removed; /* might be NULL */
+	} else {
+		info->relevant_source_dirs = xmalloc(sizeof(struct strintmap));
+		strintmap_init(info->relevant_source_dirs, 0 /* unused */);
+		strintmap_for_each_entry(relevant_sources, &iter, entry) {
+			char *dirname = get_dirname(entry->key);
+			if (!dirs_removed ||
+			    strintmap_contains(dirs_removed, dirname))
+				strintmap_set(info->relevant_source_dirs,
+					      dirname, 0 /* value irrelevant */);
+			free(dirname);
+		}
+	}
+
+	/*
+	 * Loop setting up both info->idx_map, and doing setup of
+	 * info->dir_rename_count.
+	 */
+	for (i = 0; i < rename_dst_nr; ++i) {
+		/*
+		 * For non-renamed files, make idx_map contain mapping of
+		 *   filename -> index (index within rename_dst, that is)
+		 */
+		if (!rename_dst[i].is_rename) {
+			char *filename = rename_dst[i].p->two->path;
+			strintmap_set(&info->idx_map, filename, i);
+			continue;
+		}
+
+		/*
+		 * For everything else (i.e. renamed files), make
+		 * dir_rename_count contain a map of a map:
+		 *   old_directory -> {new_directory -> count}
+		 * In other words, for every pair look at the directories for
+		 * the old filename and the new filename and count how many
+		 * times that pairing occurs.
+		 */
+		update_dir_rename_counts(info, dirs_removed,
+					 rename_dst[i].p->one->path,
+					 rename_dst[i].p->two->path);
+	}
+
+	/* Add cached_pairs to counts */
+	strmap_for_each_entry(cached_pairs, &iter, entry) {
+		const char *old_name = entry->key;
+		const char *new_name = entry->value;
+		if (!new_name)
+			/* known delete; ignore it */
+			continue;
+
+		update_dir_rename_counts(info, dirs_removed, old_name, new_name);
+	}
+
+	/*
+	 * Now we collapse
+	 *    dir_rename_count: old_directory -> {new_directory -> count}
+	 * down to
+	 *    dir_rename_guess: old_directory -> best_new_directory
+	 * where best_new_directory is the one with the highest count.
+	 */
+	strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
+		/* entry->key is source_dir */
+		struct strintmap *counts = entry->value;
+		char *best_newdir;
+
+		best_newdir = xstrdup(get_highest_rename_path(counts));
+		strmap_put(&info->dir_rename_guess, entry->key,
+			   best_newdir);
+	}
+}
+
+void partial_clear_dir_rename_count(struct strmap *dir_rename_count)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+
+	strmap_for_each_entry(dir_rename_count, &iter, entry) {
+		struct strintmap *counts = entry->value;
+		strintmap_clear(counts);
+	}
+	strmap_partial_clear(dir_rename_count, 1);
+}
+
+static void cleanup_dir_rename_info(struct dir_rename_info *info,
+				    struct strintmap *dirs_removed,
+				    int keep_dir_rename_count)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+	struct string_list to_remove = STRING_LIST_INIT_NODUP;
+	int i;
+
+	if (!info->setup)
+		return;
+
+	/* idx_map */
+	strintmap_clear(&info->idx_map);
+
+	/* dir_rename_guess */
+	strmap_clear(&info->dir_rename_guess, 1);
+
+	/* relevant_source_dirs */
+	if (info->relevant_source_dirs &&
+	    info->relevant_source_dirs != dirs_removed) {
+		strintmap_clear(info->relevant_source_dirs);
+		FREE_AND_NULL(info->relevant_source_dirs);
+	}
+
+	/* dir_rename_count */
+	if (!keep_dir_rename_count) {
+		partial_clear_dir_rename_count(info->dir_rename_count);
+		strmap_clear(info->dir_rename_count, 1);
+		FREE_AND_NULL(info->dir_rename_count);
+		return;
+	}
+
+	/*
+	 * Although dir_rename_count was passed in
+	 * diffcore_rename_extended() and we want to keep it around and
+	 * return it to that caller, we first want to remove any counts in
+	 * the maps associated with UNKNOWN_DIR entries and any data
+	 * associated with directories that weren't renamed.
+	 */
+	strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
+		const char *source_dir = entry->key;
+		struct strintmap *counts = entry->value;
+
+		if (!strintmap_get(dirs_removed, source_dir)) {
+			string_list_append(&to_remove, source_dir);
+			strintmap_clear(counts);
+			continue;
+		}
+
+		if (strintmap_contains(counts, UNKNOWN_DIR))
+			strintmap_remove(counts, UNKNOWN_DIR);
+	}
+	for (i = 0; i < to_remove.nr; ++i)
+		strmap_remove(info->dir_rename_count,
+			      to_remove.items[i].string, 1);
+	string_list_clear(&to_remove, 0);
+}
+
+static const char *get_basename(const char *filename)
+{
+	/*
+	 * gitbasename() has to worry about special drives, multiple
+	 * directory separator characters, trailing slashes, NULL or
+	 * empty strings, etc.  We only work on filenames as stored in
+	 * git, and thus get to ignore all those complications.
+	 */
+	const char *base = strrchr(filename, '/');
+	return base ? base + 1 : filename;
+}
+
+static int idx_possible_rename(char *filename, struct dir_rename_info *info)
+{
+	/*
+	 * Our comparison of files with the same basename (see
+	 * find_basename_matches() below), is only helpful when after exact
+	 * rename detection we have exactly one file with a given basename
+	 * among the rename sources and also only exactly one file with
+	 * that basename among the rename destinations.  When we have
+	 * multiple files with the same basename in either set, we do not
+	 * know which to compare against.  However, there are some
+	 * filenames that occur in large numbers (particularly
+	 * build-related filenames such as 'Makefile', '.gitignore', or
+	 * 'build.gradle' that potentially exist within every single
+	 * subdirectory), and for performance we want to be able to quickly
+	 * find renames for these files too.
+	 *
+	 * The reason basename comparisons are a useful heuristic was that it
+	 * is common for people to move files across directories while keeping
+	 * their filename the same.  If we had a way of determining or even
+	 * making a good educated guess about which directory these non-unique
+	 * basename files had moved the file to, we could check it.
+	 * Luckily...
+	 *
+	 * When an entire directory is in fact renamed, we have two factors
+	 * helping us out:
+	 *   (a) the original directory disappeared giving us a hint
+	 *       about when we can apply an extra heuristic.
+	 *   (a) we often have several files within that directory and
+	 *       subdirectories that are renamed without changes
+	 * So, rules for a heuristic:
+	 *   (0) If there basename matches are non-unique (the condition under
+	 *       which this function is called) AND
+	 *   (1) the directory in which the file was found has disappeared
+	 *       (i.e. dirs_removed is non-NULL and has a relevant entry) THEN
+	 *   (2) use exact renames of files within the directory to determine
+	 *       where the directory is likely to have been renamed to.  IF
+	 *       there is at least one exact rename from within that
+	 *       directory, we can proceed.
+	 *   (3) If there are multiple places the directory could have been
+	 *       renamed to based on exact renames, ignore all but one of them.
+	 *       Just use the destination with the most renames going to it.
+	 *   (4) Check if applying that directory rename to the original file
+	 *       would result in a destination filename that is in the
+	 *       potential rename set.  If so, return the index of the
+	 *       destination file (the index within rename_dst).
+	 *   (5) Compare the original file and returned destination for
+	 *       similarity, and if they are sufficiently similar, record the
+	 *       rename.
+	 *
+	 * This function, idx_possible_rename(), is only responsible for (4).
+	 * The conditions/steps in (1)-(3) are handled via setting up
+	 * dir_rename_count and dir_rename_guess in
+	 * initialize_dir_rename_info().  Steps (0) and (5) are handled by
+	 * the caller of this function.
+	 */
+	char *old_dir, *new_dir;
+	struct strbuf new_path = STRBUF_INIT;
+	int idx;
+
+	if (!info->setup)
+		return -1;
+
+	old_dir = get_dirname(filename);
+	new_dir = strmap_get(&info->dir_rename_guess, old_dir);
+	free(old_dir);
+	if (!new_dir)
+		return -1;
+
+	strbuf_addstr(&new_path, new_dir);
+	strbuf_addch(&new_path, '/');
+	strbuf_addstr(&new_path, get_basename(filename));
+
+	idx = strintmap_get(&info->idx_map, new_path.buf);
+	strbuf_release(&new_path);
+	return idx;
+}
+
+struct basename_prefetch_options {
+	struct repository *repo;
+	struct strintmap *relevant_sources;
+	struct strintmap *sources;
+	struct strintmap *dests;
+	struct dir_rename_info *info;
+};
+static void basename_prefetch(void *prefetch_options)
+{
+	struct basename_prefetch_options *options = prefetch_options;
+	struct strintmap *relevant_sources = options->relevant_sources;
+	struct strintmap *sources = options->sources;
+	struct strintmap *dests = options->dests;
+	struct dir_rename_info *info = options->info;
+	int i;
+	struct oid_array to_fetch = OID_ARRAY_INIT;
+
+	/*
+	 * TODO: The following loops mirror the code/logic from
+	 * find_basename_matches(), though not quite exactly.  Maybe
+	 * abstract the iteration logic out somehow?
+	 */
+	for (i = 0; i < rename_src_nr; ++i) {
+		char *filename = rename_src[i].p->one->path;
+		const char *base = NULL;
+		intptr_t src_index;
+		intptr_t dst_index;
+
+		/* Skip irrelevant sources */
+		if (relevant_sources &&
+		    !strintmap_contains(relevant_sources, filename))
+			continue;
+
+		/*
+		 * If the basename is unique among remaining sources, then
+		 * src_index will equal 'i' and we can attempt to match it
+		 * to a unique basename in the destinations.  Otherwise,
+		 * use directory rename heuristics, if possible.
+		 */
+		base = get_basename(filename);
+		src_index = strintmap_get(sources, base);
+		assert(src_index == -1 || src_index == i);
+
+		if (strintmap_contains(dests, base)) {
+			struct diff_filespec *one, *two;
+
+			/* Find a matching destination, if possible */
+			dst_index = strintmap_get(dests, base);
+			if (src_index == -1 || dst_index == -1) {
+				src_index = i;
+				dst_index = idx_possible_rename(filename, info);
+			}
+			if (dst_index == -1)
+				continue;
+
+			/* Ignore this dest if already used in a rename */
+			if (rename_dst[dst_index].is_rename)
+				continue; /* already used previously */
+
+			one = rename_src[src_index].p->one;
+			two = rename_dst[dst_index].p->two;
+
+			/* Add the pairs */
+			diff_add_if_missing(options->repo, &to_fetch, two);
+			diff_add_if_missing(options->repo, &to_fetch, one);
+		}
+	}
+
+	promisor_remote_get_direct(options->repo, to_fetch.oid, to_fetch.nr);
+	oid_array_clear(&to_fetch);
+}
+
+static int find_basename_matches(struct diff_options *options,
+				 int minimum_score,
+				 struct dir_rename_info *info,
+				 struct strintmap *relevant_sources,
+				 struct strintmap *dirs_removed)
+{
+	/*
+	 * When I checked in early 2020, over 76% of file renames in linux
+	 * just moved files to a different directory but kept the same
+	 * basename.  gcc did that with over 64% of renames, gecko did it
+	 * with over 79%, and WebKit did it with over 89%.
+	 *
+	 * Therefore we can bypass the normal exhaustive NxM matrix
+	 * comparison of similarities between all potential rename sources
+	 * and destinations by instead using file basename as a hint (i.e.
+	 * the portion of the filename after the last '/'), checking for
+	 * similarity between files with the same basename, and if we find
+	 * a pair that are sufficiently similar, record the rename pair and
+	 * exclude those two from the NxM matrix.
+	 *
+	 * This *might* cause us to find a less than optimal pairing (if
+	 * there is another file that we are even more similar to but has a
+	 * different basename).  Given the huge performance advantage
+	 * basename matching provides, and given the frequency with which
+	 * people use the same basename in real world projects, that's a
+	 * trade-off we are willing to accept when doing just rename
+	 * detection.
+	 *
+	 * If someone wants copy detection that implies they are willing to
+	 * spend more cycles to find similarities between files, so it may
+	 * be less likely that this heuristic is wanted.  If someone is
+	 * doing break detection, that means they do not want filename
+	 * similarity to imply any form of content similiarity, and thus
+	 * this heuristic would definitely be incompatible.
+	 */
+
+	int i, renames = 0;
+	struct strintmap sources;
+	struct strintmap dests;
+	struct diff_populate_filespec_options dpf_options = {
+		.check_binary = 0,
+		.missing_object_cb = NULL,
+		.missing_object_data = NULL
+	};
+	struct basename_prefetch_options prefetch_options = {
+		.repo = options->repo,
+		.relevant_sources = relevant_sources,
+		.sources = &sources,
+		.dests = &dests,
+		.info = info
+	};
+
+	/*
+	 * Create maps of basename -> fullname(s) for remaining sources and
+	 * dests.
+	 */
+	strintmap_init_with_options(&sources, -1, NULL, 0);
+	strintmap_init_with_options(&dests, -1, NULL, 0);
+	for (i = 0; i < rename_src_nr; ++i) {
+		char *filename = rename_src[i].p->one->path;
+		const char *base;
+
+		/* exact renames removed in remove_unneeded_paths_from_src() */
+		assert(!rename_src[i].p->one->rename_used);
+
+		/* Record index within rename_src (i) if basename is unique */
+		base = get_basename(filename);
+		if (strintmap_contains(&sources, base))
+			strintmap_set(&sources, base, -1);
+		else
+			strintmap_set(&sources, base, i);
+	}
+	for (i = 0; i < rename_dst_nr; ++i) {
+		char *filename = rename_dst[i].p->two->path;
+		const char *base;
+
+		if (rename_dst[i].is_rename)
+			continue; /* involved in exact match already. */
+
+		/* Record index within rename_dst (i) if basename is unique */
+		base = get_basename(filename);
+		if (strintmap_contains(&dests, base))
+			strintmap_set(&dests, base, -1);
+		else
+			strintmap_set(&dests, base, i);
+	}
+
+	if (options->repo == the_repository && has_promisor_remote()) {
+		dpf_options.missing_object_cb = basename_prefetch;
+		dpf_options.missing_object_data = &prefetch_options;
+	}
+
+	/* Now look for basename matchups and do similarity estimation */
+	for (i = 0; i < rename_src_nr; ++i) {
+		char *filename = rename_src[i].p->one->path;
+		const char *base = NULL;
+		intptr_t src_index;
+		intptr_t dst_index;
+
+		/* Skip irrelevant sources */
+		if (relevant_sources &&
+		    !strintmap_contains(relevant_sources, filename))
+			continue;
+
+		/*
+		 * If the basename is unique among remaining sources, then
+		 * src_index will equal 'i' and we can attempt to match it
+		 * to a unique basename in the destinations.  Otherwise,
+		 * use directory rename heuristics, if possible.
+		 */
+		base = get_basename(filename);
+		src_index = strintmap_get(&sources, base);
+		assert(src_index == -1 || src_index == i);
+
+		if (strintmap_contains(&dests, base)) {
+			struct diff_filespec *one, *two;
+			int score;
+
+			/* Find a matching destination, if possible */
+			dst_index = strintmap_get(&dests, base);
+			if (src_index == -1 || dst_index == -1) {
+				src_index = i;
+				dst_index = idx_possible_rename(filename, info);
+			}
+			if (dst_index == -1)
+				continue;
+
+			/* Ignore this dest if already used in a rename */
+			if (rename_dst[dst_index].is_rename)
+				continue; /* already used previously */
+
+			/* Estimate the similarity */
+			one = rename_src[src_index].p->one;
+			two = rename_dst[dst_index].p->two;
+			score = estimate_similarity(options->repo, one, two,
+						    minimum_score, &dpf_options);
+
+			/* If sufficiently similar, record as rename pair */
+			if (score < minimum_score)
+				continue;
+			record_rename_pair(dst_index, src_index, score);
+			renames++;
+			update_dir_rename_counts(info, dirs_removed,
+						 one->path, two->path);
+
+			/*
+			 * Found a rename so don't need text anymore; if we
+			 * didn't find a rename, the filespec_blob would get
+			 * re-used when doing the matrix of comparisons.
+			 */
+			diff_free_filespec_blob(one);
+			diff_free_filespec_blob(two);
+		}
+	}
+
+	strintmap_clear(&sources);
+	strintmap_clear(&dests);
 
 	return renames;
 }
@@ -385,12 +1077,11 @@ static void record_if_better(struct diff_score m[], struct diff_score *o)
  * 1 if we need to disable inexact rename detection;
  * 2 if we would be under the limit if we were given -C instead of -C -C.
  */
-static int too_many_rename_candidates(int num_create,
+static int too_many_rename_candidates(int num_destinations, int num_sources,
 				      struct diff_options *options)
 {
 	int rename_limit = options->rename_limit;
-	int num_src = rename_src_nr;
-	int i;
+	int i, limited_sources;
 
 	options->needed_rename_limit = 0;
 
@@ -398,36 +1089,44 @@ static int too_many_rename_candidates(int num_create,
 	 * This basically does a test for the rename matrix not
 	 * growing larger than a "rename_limit" square matrix, ie:
 	 *
-	 *    num_create * num_src > rename_limit * rename_limit
+	 *    num_destinations * num_sources > rename_limit * rename_limit
+	 *
+	 * We use st_mult() to check overflow conditions; in the
+	 * exceptional circumstance that size_t isn't large enough to hold
+	 * the multiplication, the system won't be able to allocate enough
+	 * memory for the matrix anyway.
 	 */
 	if (rename_limit <= 0)
-		rename_limit = 32767;
-	if ((num_create <= rename_limit || num_src <= rename_limit) &&
-	    ((uint64_t)num_create * (uint64_t)num_src
-	     <= (uint64_t)rename_limit * (uint64_t)rename_limit))
+		return 0; /* treat as unlimited */
+	if (st_mult(num_destinations, num_sources)
+	    <= st_mult(rename_limit, rename_limit))
 		return 0;
 
 	options->needed_rename_limit =
-		num_src > num_create ? num_src : num_create;
+		num_sources > num_destinations ? num_sources : num_destinations;
 
 	/* Are we running under -C -C? */
 	if (!options->flags.find_copies_harder)
 		return 1;
 
 	/* Would we bust the limit if we were running under -C? */
-	for (num_src = i = 0; i < rename_src_nr; i++) {
+	for (limited_sources = i = 0; i < num_sources; i++) {
 		if (diff_unmodified_pair(rename_src[i].p))
 			continue;
-		num_src++;
+		limited_sources++;
 	}
-	if ((num_create <= rename_limit || num_src <= rename_limit) &&
-	    ((uint64_t)num_create * (uint64_t)num_src
-	     <= (uint64_t)rename_limit * (uint64_t)rename_limit))
+	if (st_mult(num_destinations, limited_sources)
+	    <= st_mult(rename_limit, rename_limit))
 		return 2;
 	return 1;
 }
 
-static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, int copies)
+static int find_renames(struct diff_score *mx,
+			int dst_cnt,
+			int minimum_score,
+			int copies,
+			struct dir_rename_info *info,
+			struct strintmap *dirs_removed)
 {
 	int count = 0, i;
 
@@ -438,17 +1137,246 @@ static int find_renames(struct diff_score *mx, int dst_cnt, int minimum_score, i
 		    (mx[i].score < minimum_score))
 			break; /* there is no more usable pair. */
 		dst = &rename_dst[mx[i].dst];
-		if (dst->pair)
+		if (dst->is_rename)
 			continue; /* already done, either exact or fuzzy. */
 		if (!copies && rename_src[mx[i].src].p->one->rename_used)
 			continue;
 		record_rename_pair(mx[i].dst, mx[i].src, mx[i].score);
 		count++;
+		update_dir_rename_counts(info, dirs_removed,
+					 rename_src[mx[i].src].p->one->path,
+					 rename_dst[mx[i].dst].p->two->path);
 	}
 	return count;
 }
 
-void diffcore_rename(struct diff_options *options)
+static void remove_unneeded_paths_from_src(int detecting_copies,
+					   struct strintmap *interesting)
+{
+	int i, new_num_src;
+
+	if (detecting_copies && !interesting)
+		return; /* nothing to remove */
+	if (break_idx)
+		return; /* culling incompatible with break detection */
+
+	/*
+	 * Note on reasons why we cull unneeded sources but not destinations:
+	 *   1) Pairings are stored in rename_dst (not rename_src), which we
+	 *      need to keep around.  So, we just can't cull rename_dst even
+	 *      if we wanted to.  But doing so wouldn't help because...
+	 *
+	 *   2) There is a matrix pairwise comparison that follows the
+	 *      "Performing inexact rename detection" progress message.
+	 *      Iterating over the destinations is done in the outer loop,
+	 *      hence we only iterate over each of those once and we can
+	 *      easily skip the outer loop early if the destination isn't
+	 *      relevant.  That's only one check per destination path to
+	 *      skip.
+	 *
+	 *      By contrast, the sources are iterated in the inner loop; if
+	 *      we check whether a source can be skipped, then we'll be
+	 *      checking it N separate times, once for each destination.
+	 *      We don't want to have to iterate over known-not-needed
+	 *      sources N times each, so avoid that by removing the sources
+	 *      from rename_src here.
+	 */
+	for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
+		struct diff_filespec *one = rename_src[i].p->one;
+
+		/*
+		 * renames are stored in rename_dst, so if a rename has
+		 * already been detected using this source, we can just
+		 * remove the source knowing rename_dst has its info.
+		 */
+		if (!detecting_copies && one->rename_used)
+			continue;
+
+		/* If we don't care about the source path, skip it */
+		if (interesting && !strintmap_contains(interesting, one->path))
+			continue;
+
+		if (new_num_src < i)
+			memcpy(&rename_src[new_num_src], &rename_src[i],
+			       sizeof(struct diff_rename_src));
+		new_num_src++;
+	}
+
+	rename_src_nr = new_num_src;
+}
+
+static void handle_early_known_dir_renames(struct dir_rename_info *info,
+					   struct strintmap *relevant_sources,
+					   struct strintmap *dirs_removed)
+{
+	/*
+	 * Directory renames are determined via an aggregate of all renames
+	 * under them and using a "majority wins" rule.  The fact that
+	 * "majority wins", though, means we don't need all the renames
+	 * under the given directory, we only need enough to ensure we have
+	 * a majority.
+	 */
+
+	int i, new_num_src;
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+
+	if (!dirs_removed || !relevant_sources)
+		return; /* nothing to cull */
+	if (break_idx)
+		return; /* culling incompatbile with break detection */
+
+	/*
+	 * Supplement dir_rename_count with number of potential renames,
+	 * marking all potential rename sources as mapping to UNKNOWN_DIR.
+	 */
+	for (i = 0; i < rename_src_nr; i++) {
+		char *old_dir;
+		struct diff_filespec *one = rename_src[i].p->one;
+
+		/*
+		 * sources that are part of a rename will have already been
+		 * removed by a prior call to remove_unneeded_paths_from_src()
+		 */
+		assert(!one->rename_used);
+
+		old_dir = get_dirname(one->path);
+		while (*old_dir != '\0' &&
+		       NOT_RELEVANT != strintmap_get(dirs_removed, old_dir)) {
+			char *freeme = old_dir;
+
+			increment_count(info, old_dir, UNKNOWN_DIR);
+			old_dir = get_dirname(old_dir);
+
+			/* Free resources we don't need anymore */
+			free(freeme);
+		}
+		/*
+		 * old_dir and new_dir free'd in increment_count, but
+		 * get_dirname() gives us a new pointer we need to free for
+		 * old_dir.  Also, if the loop runs 0 times we need old_dir
+		 * to be freed.
+		 */
+		free(old_dir);
+	}
+
+	/*
+	 * For any directory which we need a potential rename detected for
+	 * (i.e. those marked as RELEVANT_FOR_SELF in dirs_removed), check
+	 * whether we have enough renames to satisfy the "majority rules"
+	 * requirement such that detecting any more renames of files under
+	 * it won't change the result.  For any such directory, mark that
+	 * we no longer need to detect a rename for it.  However, since we
+	 * might need to still detect renames for an ancestor of that
+	 * directory, use RELEVANT_FOR_ANCESTOR.
+	 */
+	strmap_for_each_entry(info->dir_rename_count, &iter, entry) {
+		/* entry->key is source_dir */
+		struct strintmap *counts = entry->value;
+
+		if (strintmap_get(dirs_removed, entry->key) ==
+		    RELEVANT_FOR_SELF &&
+		    dir_rename_already_determinable(counts)) {
+			strintmap_set(dirs_removed, entry->key,
+				      RELEVANT_FOR_ANCESTOR);
+		}
+	}
+
+	for (i = 0, new_num_src = 0; i < rename_src_nr; i++) {
+		struct diff_filespec *one = rename_src[i].p->one;
+		int val;
+
+		val = strintmap_get(relevant_sources, one->path);
+
+		/*
+		 * sources that were not found in relevant_sources should
+		 * have already been removed by a prior call to
+		 * remove_unneeded_paths_from_src()
+		 */
+		assert(val != -1);
+
+		if (val == RELEVANT_LOCATION) {
+			int removable = 1;
+			char *dir = get_dirname(one->path);
+			while (1) {
+				char *freeme = dir;
+				int res = strintmap_get(dirs_removed, dir);
+
+				/* Quit if not found or irrelevant */
+				if (res == NOT_RELEVANT)
+					break;
+				/* If RELEVANT_FOR_SELF, can't remove */
+				if (res == RELEVANT_FOR_SELF) {
+					removable = 0;
+					break;
+				}
+				/* Else continue searching upwards */
+				assert(res == RELEVANT_FOR_ANCESTOR);
+				dir = get_dirname(dir);
+				free(freeme);
+			}
+			free(dir);
+			if (removable) {
+				strintmap_set(relevant_sources, one->path,
+					      RELEVANT_NO_MORE);
+				continue;
+			}
+		}
+
+		if (new_num_src < i)
+			memcpy(&rename_src[new_num_src], &rename_src[i],
+			       sizeof(struct diff_rename_src));
+		new_num_src++;
+	}
+
+	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,
+			      struct strmap *cached_pairs)
 {
 	int detect_rename = options->detect_rename;
 	int minimum_score = options->rename_score;
@@ -456,9 +1384,28 @@ void diffcore_rename(struct diff_options *options)
 	struct diff_queue_struct outq;
 	struct diff_score *mx;
 	int i, j, rename_count, skip_unmodified = 0;
-	int num_create, dst_cnt;
+	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,
+		.missing_object_cb = NULL,
+		.missing_object_data = NULL
+	};
+	struct inexact_prefetch_options prefetch_options = {
+		.repo = options->repo
+	};
+
+	trace2_region_enter("diff", "setup", options->repo);
+	info.setup = 0;
+	assert(!dir_rename_count || strmap_empty(dir_rename_count));
+	want_copies = (detect_rename == DIFF_DETECT_COPY);
+	if (dirs_removed && (break_idx || want_copies))
+		BUG("dirs_removed incompatible with break/copy detection");
+	if (break_idx && relevant_sources)
+		BUG("break detection incompatible with source specification");
 	if (!minimum_score)
 		minimum_score = DEFAULT_RENAME_SCORE;
 
@@ -473,7 +1420,7 @@ void diffcore_rename(struct diff_options *options)
 			else if (!options->flags.rename_empty &&
 				 is_empty_blob_oid(&p->two->oid))
 				continue;
-			else if (add_rename_dst(p->two) < 0) {
+			else if (add_rename_dst(p) < 0) {
 				warning("skipping rename detection, detected"
 					" duplicate destination '%s'",
 					p->two->path);
@@ -495,7 +1442,7 @@ void diffcore_rename(struct diff_options *options)
 				p->one->rename_used++;
 			register_rename_src(p);
 		}
-		else if (detect_rename == DIFF_DETECT_COPY) {
+		else if (want_copies) {
 			/*
 			 * Increment the "rename_used" score by
 			 * one, to indicate ourselves as a user.
@@ -504,30 +1451,103 @@ void diffcore_rename(struct diff_options *options)
 			register_rename_src(p);
 		}
 	}
+	trace2_region_leave("diff", "setup", options->repo);
 	if (rename_dst_nr == 0 || rename_src_nr == 0)
 		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? */
 	if (minimum_score == MAX_SCORE)
 		goto cleanup;
 
-	/*
-	 * Calculate how many renames are left (but all the source
-	 * files still remain as options for rename/copies!)
-	 */
-	num_create = (rename_dst_nr - rename_count);
+	num_sources = rename_src_nr;
+
+	if (want_copies || break_idx) {
+		/*
+		 * Cull sources:
+		 *   - remove ones corresponding to exact renames
+		 *   - remove ones not found in relevant_sources
+		 */
+		trace2_region_enter("diff", "cull after exact", options->repo);
+		remove_unneeded_paths_from_src(want_copies, relevant_sources);
+		trace2_region_leave("diff", "cull after exact", options->repo);
+	} else {
+		/* Determine minimum score to match basenames */
+		double factor = 0.5;
+		char *basename_factor = getenv("GIT_BASENAME_FACTOR");
+		int min_basename_score;
+
+		if (basename_factor)
+			factor = strtol(basename_factor, NULL, 10)/100.0;
+		assert(factor >= 0.0 && factor <= 1.0);
+		min_basename_score = minimum_score +
+			(int)(factor * (MAX_SCORE - minimum_score));
+
+		/*
+		 * Cull sources:
+		 *   - remove ones involved in renames (found via exact match)
+		 */
+		trace2_region_enter("diff", "cull after exact", options->repo);
+		remove_unneeded_paths_from_src(want_copies, NULL);
+		trace2_region_leave("diff", "cull after exact", options->repo);
+
+		/* Preparation for basename-driven matching. */
+		trace2_region_enter("diff", "dir rename setup", options->repo);
+		initialize_dir_rename_info(&info, relevant_sources,
+					   dirs_removed, dir_rename_count,
+					   cached_pairs);
+		trace2_region_leave("diff", "dir rename setup", options->repo);
+
+		/* Utilize file basenames to quickly find renames. */
+		trace2_region_enter("diff", "basename matches", options->repo);
+		rename_count += find_basename_matches(options,
+						      min_basename_score,
+						      &info,
+						      relevant_sources,
+						      dirs_removed);
+		trace2_region_leave("diff", "basename matches", options->repo);
+
+		/*
+		 * Cull sources, again:
+		 *   - remove ones involved in renames (found via basenames)
+		 *   - remove ones not found in relevant_sources
+		 * and
+		 *   - remove ones in relevant_sources which are needed only
+		 *     for directory renames IF no ancestory directory
+		 *     actually needs to know any more individual path
+		 *     renames under them
+		 */
+		trace2_region_enter("diff", "cull basename", options->repo);
+		remove_unneeded_paths_from_src(want_copies, relevant_sources);
+		handle_early_known_dir_renames(&info, relevant_sources,
+					       dirs_removed);
+		trace2_region_leave("diff", "cull basename", options->repo);
+	}
+
+	/* Calculate how many rename destinations are left */
+	num_destinations = (rename_dst_nr - rename_count);
+	num_sources = rename_src_nr; /* rename_src_nr reflects lower number */
 
 	/* All done? */
-	if (!num_create)
+	if (!num_destinations || !num_sources)
 		goto cleanup;
 
-	switch (too_many_rename_candidates(num_create, options)) {
+	switch (too_many_rename_candidates(num_destinations, num_sources,
+					   options)) {
 	case 1:
 		goto cleanup;
 	case 2:
@@ -538,19 +1558,27 @@ void diffcore_rename(struct diff_options *options)
 		break;
 	}
 
+	trace2_region_enter("diff", "inexact renames", options->repo);
 	if (options->show_rename_progress) {
 		progress = start_delayed_progress(
 				_("Performing inexact rename detection"),
-				(uint64_t)rename_dst_nr * (uint64_t)rename_src_nr);
+				(uint64_t)num_destinations * (uint64_t)num_sources);
 	}
 
-	mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx));
+	/* Finish setting up dpf_options */
+	prefetch_options.skip_unmodified = skip_unmodified;
+	if (options->repo == the_repository && has_promisor_remote()) {
+		dpf_options.missing_object_cb = inexact_prefetch;
+		dpf_options.missing_object_data = &prefetch_options;
+	}
+
+	CALLOC_ARRAY(mx, st_mult(NUM_CANDIDATE_PER_DST, num_destinations));
 	for (dst_cnt = i = 0; i < rename_dst_nr; i++) {
-		struct diff_filespec *two = rename_dst[i].two;
+		struct diff_filespec *two = rename_dst[i].p->two;
 		struct diff_score *m;
 
-		if (rename_dst[i].pair)
-			continue; /* dealt with exact match already. */
+		if (rename_dst[i].is_rename)
+			continue; /* exact or basename match already handled */
 
 		m = &mx[dst_cnt * NUM_CANDIDATE_PER_DST];
 		for (j = 0; j < NUM_CANDIDATE_PER_DST; j++)
@@ -560,13 +1588,16 @@ void diffcore_rename(struct diff_options *options)
 			struct diff_filespec *one = rename_src[j].p->one;
 			struct diff_score this_src;
 
+			assert(!one->rename_used || want_copies || break_idx);
+
 			if (skip_unmodified &&
 			    diff_unmodified_pair(rename_src[j].p))
 				continue;
 
 			this_src.score = estimate_similarity(options->repo,
 							     one, two,
-							     minimum_score);
+							     minimum_score,
+							     &dpf_options);
 			this_src.name_score = basename_same(one, two);
 			this_src.dst = i;
 			this_src.src = j;
@@ -579,22 +1610,27 @@ void diffcore_rename(struct diff_options *options)
 			diff_free_filespec_blob(two);
 		}
 		dst_cnt++;
-		display_progress(progress, (uint64_t)(i+1)*(uint64_t)rename_src_nr);
+		display_progress(progress,
+				 (uint64_t)dst_cnt * (uint64_t)num_sources);
 	}
 	stop_progress(&progress);
 
 	/* cost matrix sorted by most to least similar pair */
 	STABLE_QSORT(mx, dst_cnt * NUM_CANDIDATE_PER_DST, score_compare);
 
-	rename_count += find_renames(mx, dst_cnt, minimum_score, 0);
-	if (detect_rename == DIFF_DETECT_COPY)
-		rename_count += find_renames(mx, dst_cnt, minimum_score, 1);
+	rename_count += find_renames(mx, dst_cnt, minimum_score, 0,
+				     &info, dirs_removed);
+	if (want_copies)
+		rename_count += find_renames(mx, dst_cnt, minimum_score, 1,
+					     &info, dirs_removed);
 	free(mx);
+	trace2_region_leave("diff", "inexact renames", options->repo);
 
  cleanup:
 	/* At this point, we have found some renames and copies and they
 	 * are recorded in rename_dst.  The original list is still in *q.
 	 */
+	trace2_region_enter("diff", "write back to queue", options->repo);
 	DIFF_QUEUE_CLEAR(&outq);
 	for (i = 0; i < q->nr; i++) {
 		struct diff_filepair *p = q->queue[i];
@@ -604,22 +1640,8 @@ void diffcore_rename(struct diff_options *options)
 			diff_q(&outq, p);
 		}
 		else if (!DIFF_FILE_VALID(p->one) && DIFF_FILE_VALID(p->two)) {
-			/*
-			 * Creation
-			 *
-			 * We would output this create record if it has
-			 * not been turned into a rename/copy already.
-			 */
-			struct diff_rename_dst *dst = locate_rename_dst(p->two);
-			if (dst && dst->pair) {
-				diff_q(&outq, dst->pair);
-				pair_to_free = p;
-			}
-			else
-				/* no matching rename/copy source, so
-				 * record this as a creation.
-				 */
-				diff_q(&outq, p);
+			/* Creation */
+			diff_q(&outq, p);
 		}
 		else if (DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two)) {
 			/*
@@ -640,8 +1662,10 @@ void diffcore_rename(struct diff_options *options)
 			 */
 			if (DIFF_PAIR_BROKEN(p)) {
 				/* broken delete */
-				struct diff_rename_dst *dst = locate_rename_dst(p->one);
-				if (dst && dst->pair)
+				struct diff_rename_dst *dst = locate_rename_dst(p);
+				if (!dst)
+					BUG("tracking failed somehow; failed to find associated dst for broken pair");
+				if (dst->is_rename)
 					/* counterpart is now rename/copy */
 					pair_to_free = p;
 			}
@@ -651,9 +1675,7 @@ void diffcore_rename(struct diff_options *options)
 					pair_to_free = p;
 			}
 
-			if (pair_to_free)
-				;
-			else
+			if (!pair_to_free)
 				diff_q(&outq, p);
 		}
 		else if (!diff_unmodified_pair(p))
@@ -664,7 +1686,7 @@ void diffcore_rename(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);
 
@@ -673,11 +1695,23 @@ void diffcore_rename(struct diff_options *options)
 	diff_debug_queue("done collapsing", q);
 
 	for (i = 0; i < rename_dst_nr; i++)
-		free_filespec(rename_dst[i].two);
+		if (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);
 	rename_dst_nr = rename_dst_alloc = 0;
 	FREE_AND_NULL(rename_src);
 	rename_src_nr = rename_src_alloc = 0;
+	if (break_idx) {
+		strintmap_clear(break_idx);
+		FREE_AND_NULL(break_idx);
+	}
+	trace2_region_leave("diff", "write back to queue", options->repo);
 	return;
 }
+
+void diffcore_rename(struct diff_options *options)
+{
+	diffcore_rename_extended(options, NULL, NULL, NULL, NULL, NULL);
+}
diff --git a/diffcore-rotate.c b/diffcore-rotate.c
new file mode 100644
index 0000000000..445f060ab0
--- /dev/null
+++ b/diffcore-rotate.c
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2021, Google LLC.
+ * Based on diffcore-order.c, which is Copyright (C) 2005, Junio C Hamano
+ */
+#include "cache.h"
+#include "diff.h"
+#include "diffcore.h"
+
+void diffcore_rotate(struct diff_options *opt)
+{
+	struct diff_queue_struct *q = &diff_queued_diff;
+	struct diff_queue_struct outq;
+	int rotate_to, i;
+
+	if (!q->nr)
+		return;
+
+	for (i = 0; i < q->nr; i++) {
+		int cmp = strcmp(opt->rotate_to, q->queue[i]->two->path);
+		if (!cmp)
+			break; /* exact match */
+		if (!opt->rotate_to_strict && cmp < 0)
+			break; /* q->queue[i] is now past the target pathname */
+	}
+
+	if (q->nr <= i) {
+		/* we did not find the specified path */
+		if (opt->rotate_to_strict)
+			die(_("No such path '%s' in the diff"), opt->rotate_to);
+		return;
+	}
+
+	DIFF_QUEUE_CLEAR(&outq);
+	rotate_to = i;
+
+	for (i = rotate_to; i < q->nr; i++)
+		diff_q(&outq, q->queue[i]);
+	for (i = 0; i < rotate_to; i++) {
+		if (opt->skip_instead_of_rotate)
+			diff_free_filepair(q->queue[i]);
+		else
+			diff_q(&outq, q->queue[i]);
+	}
+	free(q->queue);
+	*q = outq;
+}
diff --git a/diffcore.h b/diffcore.h
index b651061c0e..badc2261c2 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -8,6 +8,8 @@
 
 struct diff_options;
 struct repository;
+struct strintmap;
+struct strmap;
 struct userdiff_driver;
 
 /* This header file is internal between diff.c and its diff transformers
@@ -28,6 +30,12 @@ struct userdiff_driver;
 
 #define MINIMUM_BREAK_SIZE     400 /* do not break a file smaller than this */
 
+/**
+ * the internal representation for a single file (blob).  It records the blob
+ * object name (if known -- for a work tree file it typically is a NUL SHA-1),
+ * filemode and pathname.  This is what the `diff_addremove()`, `diff_change()`
+ * and `diff_unmerge()` synthesize and feed `diff_queue()` function with.
+ */
 struct diff_filespec {
 	struct object_id oid;
 	char *path;
@@ -59,13 +67,40 @@ void free_filespec(struct diff_filespec *);
 void fill_filespec(struct diff_filespec *, const struct object_id *,
 		   int, unsigned short);
 
-#define CHECK_SIZE_ONLY 1
-#define CHECK_BINARY    2
-int diff_populate_filespec(struct repository *, struct diff_filespec *, unsigned int);
+/*
+ * Prefetch the entries in diff_queued_diff. The parameter is a pointer to a
+ * struct repository.
+ */
+void diff_queued_diff_prefetch(void *repository);
+
+struct diff_populate_filespec_options {
+	unsigned check_size_only : 1;
+	unsigned check_binary : 1;
+
+	/*
+	 * If an object is missing, diff_populate_filespec() will invoke this
+	 * callback before attempting to read that object again.
+	 */
+	void (*missing_object_cb)(void *);
+	void *missing_object_data;
+};
+int diff_populate_filespec(struct repository *, struct diff_filespec *,
+			   const struct diff_populate_filespec_options *);
 void diff_free_filespec_data(struct diff_filespec *);
 void diff_free_filespec_blob(struct diff_filespec *);
 int diff_filespec_is_binary(struct repository *, struct diff_filespec *);
 
+/**
+ * This records a pair of `struct diff_filespec`; the filespec for a file in
+ * the "old" set (i.e. preimage) is called `one`, and the filespec for a file
+ * in the "new" set (i.e. postimage) is called `two`.  A change that represents
+ * file creation has NULL in `one`, and file deletion has NULL in `two`.
+ *
+ * A `filepair` starts pointing at `one` and `two` that are from the same
+ * filename, but `diffcore_std()` can break pairs and match component filespecs
+ * with other filespecs from a different filepair to form new filepair. This is
+ * called 'rename detection'.
+ */
 struct diff_filepair {
 	struct diff_filespec *one;
 	struct diff_filespec *two;
@@ -77,6 +112,7 @@ struct diff_filepair {
 	unsigned done_skip_stat_unmatch : 1;
 	unsigned skip_stat_unmatch_result : 1;
 };
+
 #define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged)
 
 #define DIFF_PAIR_RENAME(p) ((p)->renamed_pair)
@@ -91,14 +127,30 @@ 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 *);
 
+/**
+ * This is a collection of filepairs.  Notable members are:
+ *
+ * - `queue`:
+ * An array of pointers to `struct diff_filepair`. This dynamically grows as
+ * you add filepairs;
+ *
+ * - `alloc`:
+ * The allocated size of the `queue` array;
+ *
+ * - `nr`:
+ * The number of elements in the `queue` array.
+ */
 struct diff_queue_struct {
 	struct diff_filepair **queue;
 	int alloc;
 	int nr;
 };
+
 #define DIFF_QUEUE_CLEAR(q) \
 	do { \
 		(q)->queue = NULL; \
@@ -111,11 +163,33 @@ struct diff_filepair *diff_queue(struct diff_queue_struct *,
 				 struct diff_filespec *);
 void diff_q(struct diff_queue_struct *, struct diff_filepair *);
 
+/* dir_rename_relevance: the reason we want rename information for a dir */
+enum dir_rename_relevance {
+	NOT_RELEVANT = 0,
+	RELEVANT_FOR_ANCESTOR = 1,
+	RELEVANT_FOR_SELF = 2
+};
+/* file_rename_relevance: the reason(s) we want rename information for a file */
+enum file_rename_relevance {
+	RELEVANT_NO_MORE = 0,  /* i.e. NOT relevant */
+	RELEVANT_CONTENT = 1,
+	RELEVANT_LOCATION = 2
+};
+
+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,
+			      struct strmap *cached_pairs);
 void diffcore_merge_broken(void);
 void diffcore_pickaxe(struct diff_options *);
 void diffcore_order(const char *orderfile);
+void diffcore_rotate(struct diff_options *);
 
 /* low-level interface to diffcore_order */
 struct obj_order {
@@ -150,4 +224,12 @@ int diffcore_count_changes(struct repository *r,
 			   unsigned long *src_copied,
 			   unsigned long *literal_added);
 
+/*
+ * If filespec contains an OID and if that object is missing from the given
+ * repository, add that OID to to_fetch.
+ */
+void diff_add_if_missing(struct repository *r,
+			 struct oid_array *to_fetch,
+			 const struct diff_filespec *filespec);
+
 #endif
diff --git a/dir.c b/dir.c
index 61f559f980..03c4d21267 100644
--- a/dir.c
+++ b/dir.c
@@ -2,8 +2,6 @@
  * This handles recursive filename detection with exclude
  * files, index knowledge etc..
  *
- * See Documentation/technical/api-directory-listing.txt
- *
  * Copyright (C) Linus Torvalds, 2005-2006
  *		 Junio Hamano, 2005-2006
  */
@@ -43,7 +41,8 @@ struct cached_dir {
 	int nr_files;
 	int nr_dirs;
 
-	struct dirent *de;
+	const char *d_name;
+	int d_type;
 	const char *file;
 	struct untracked_cache_dir *ucd;
 };
@@ -52,8 +51,18 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 	struct index_state *istate, const char *path, int len,
 	struct untracked_cache_dir *untracked,
 	int check_only, int stop_at_first_file, const struct pathspec *pathspec);
-static int get_dtype(struct dirent *de, struct index_state *istate,
-		     const char *path, int len);
+static int resolve_dtype(int dtype, struct index_state *istate,
+			 const char *path, int len);
+struct dirent *readdir_skip_dot_and_dotdot(DIR *dirp)
+{
+	struct dirent *e;
+
+	while ((e = readdir(dirp)) != NULL) {
+		if (!is_dot_or_dotdot(e->d_name))
+			break;
+	}
+	return e;
+}
 
 int count_slashes(const char *s)
 {
@@ -69,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)
@@ -194,6 +213,10 @@ int fill_directory(struct dir_struct *dir,
 	const char *prefix;
 	size_t prefix_len;
 
+	unsigned exclusive_flags = DIR_SHOW_IGNORED | DIR_SHOW_IGNORED_TOO;
+	if ((dir->flags & exclusive_flags) == exclusive_flags)
+		BUG("DIR_SHOW_IGNORED and DIR_SHOW_IGNORED_TOO are exclusive");
+
 	/*
 	 * Calculate common prefix for the pathspec, and
 	 * use that to optimize the directory walk
@@ -298,7 +321,7 @@ static int do_read_blob(const struct object_id *oid, struct oid_stat *oid_stat,
  * [1] Only if DO_MATCH_DIRECTORY is passed; otherwise, this is NOT a match.
  * [2] Only if DO_MATCH_LEADING_PATHSPEC is passed; otherwise, not a match.
  */
-static int match_pathspec_item(const struct index_state *istate,
+static int match_pathspec_item(struct index_state *istate,
 			       const struct pathspec_item *item, int prefix,
 			       const char *name, int namelen, unsigned flags)
 {
@@ -365,7 +388,8 @@ static int match_pathspec_item(const struct index_state *istate,
 		return MATCHED_FNMATCH;
 
 	/* Perform checks to see if "name" is a leading string of the pathspec */
-	if (flags & DO_MATCH_LEADING_PATHSPEC) {
+	if ( (flags & DO_MATCH_LEADING_PATHSPEC) &&
+	    !(flags & DO_MATCH_EXCLUDE)) {
 		/* name is a literal prefix of the pathspec */
 		int offset = name[namelen-1] == '/' ? 1 : 0;
 		if ((namelen < matchlen) &&
@@ -373,13 +397,20 @@ static int match_pathspec_item(const struct index_state *istate,
 		    !ps_strncmp(item, match, name, namelen))
 			return MATCHED_RECURSIVELY_LEADING_PATHSPEC;
 
-		/* name" doesn't match up to the first wild character */
+		/* name doesn't match up to the first wild character */
 		if (item->nowildcard_len < item->len &&
 		    ps_strncmp(item, match, name,
 			       item->nowildcard_len - prefix))
 			return 0;
 
 		/*
+		 * name has no wildcard, and it didn't match as a leading
+		 * pathspec so return.
+		 */
+		if (item->nowildcard_len == item->len)
+			return 0;
+
+		/*
 		 * Here is where we would perform a wildmatch to check if
 		 * "name" can be matched as a directory (or a prefix) against
 		 * the pathspec.  Since wildmatch doesn't have this capability
@@ -395,6 +426,10 @@ static int match_pathspec_item(const struct index_state *istate,
 }
 
 /*
+ * do_match_pathspec() is meant to ONLY be called by
+ * match_pathspec_with_flags(); calling it directly risks pathspecs
+ * like ':!unwanted_path' being ignored.
+ *
  * Given a name and a list of pathspecs, returns the nature of the
  * closest (i.e. most specific) match of the name to any of the
  * pathspecs.
@@ -409,7 +444,7 @@ static int match_pathspec_item(const struct index_state *istate,
  * pathspec did not match any names, which could indicate that the
  * user mistyped the nth pathspec.
  */
-static int do_match_pathspec(const struct index_state *istate,
+static int do_match_pathspec(struct index_state *istate,
 			     const struct pathspec *ps,
 			     const char *name, int namelen,
 			     int prefix, char *seen,
@@ -480,13 +515,12 @@ static int do_match_pathspec(const struct index_state *istate,
 	return retval;
 }
 
-int match_pathspec(const struct index_state *istate,
-		   const struct pathspec *ps,
-		   const char *name, int namelen,
-		   int prefix, char *seen, int is_dir)
+static int match_pathspec_with_flags(struct index_state *istate,
+				     const struct pathspec *ps,
+				     const char *name, int namelen,
+				     int prefix, char *seen, unsigned flags)
 {
 	int positive, negative;
-	unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0;
 	positive = do_match_pathspec(istate, ps, name, namelen,
 				     prefix, seen, flags);
 	if (!(ps->magic & PATHSPEC_EXCLUDE) || !positive)
@@ -497,19 +531,29 @@ int match_pathspec(const struct index_state *istate,
 	return negative ? 0 : positive;
 }
 
+int match_pathspec(struct index_state *istate,
+		   const struct pathspec *ps,
+		   const char *name, int namelen,
+		   int prefix, char *seen, int is_dir)
+{
+	unsigned flags = is_dir ? DO_MATCH_DIRECTORY : 0;
+	return match_pathspec_with_flags(istate, ps, name, namelen,
+					 prefix, seen, flags);
+}
+
 /**
  * Check if a submodule is a superset of the pathspec
  */
-int submodule_path_match(const struct index_state *istate,
+int submodule_path_match(struct index_state *istate,
 			 const struct pathspec *ps,
 			 const char *submodule_name,
 			 char *seen)
 {
-	int matched = do_match_pathspec(istate, ps, submodule_name,
-					strlen(submodule_name),
-					0, seen,
-					DO_MATCH_DIRECTORY |
-					DO_MATCH_LEADING_PATHSPEC);
+	int matched = match_pathspec_with_flags(istate, ps, submodule_name,
+						strlen(submodule_name),
+						0, seen,
+						DO_MATCH_DIRECTORY |
+						DO_MATCH_LEADING_PATHSPEC);
 	return matched;
 }
 
@@ -611,6 +655,223 @@ void parse_path_pattern(const char **pattern,
 	*patternlen = len;
 }
 
+int pl_hashmap_cmp(const void *unused_cmp_data,
+		   const struct hashmap_entry *a,
+		   const struct hashmap_entry *b,
+		   const void *key)
+{
+	const struct pattern_entry *ee1 =
+			container_of(a, struct pattern_entry, ent);
+	const struct pattern_entry *ee2 =
+			container_of(b, struct pattern_entry, ent);
+
+	size_t min_len = ee1->patternlen <= ee2->patternlen
+			 ? ee1->patternlen
+			 : ee2->patternlen;
+
+	if (ignore_case)
+		return strncasecmp(ee1->pattern, ee2->pattern, min_len);
+	return strncmp(ee1->pattern, ee2->pattern, min_len);
+}
+
+static char *dup_and_filter_pattern(const char *pattern)
+{
+	char *set, *read;
+	size_t count  = 0;
+	char *result = xstrdup(pattern);
+
+	set = result;
+	read = result;
+
+	while (*read) {
+		/* skip escape characters (once) */
+		if (*read == '\\')
+			read++;
+
+		*set = *read;
+
+		set++;
+		read++;
+		count++;
+	}
+	*set = 0;
+
+	if (count > 2 &&
+	    *(set - 1) == '*' &&
+	    *(set - 2) == '/')
+		*(set - 2) = 0;
+
+	return result;
+}
+
+static void add_pattern_to_hashsets(struct pattern_list *pl, struct path_pattern *given)
+{
+	struct pattern_entry *translated;
+	char *truncated;
+	char *data = NULL;
+	const char *prev, *cur, *next;
+
+	if (!pl->use_cone_patterns)
+		return;
+
+	if (given->flags & PATTERN_FLAG_NEGATIVE &&
+	    given->flags & PATTERN_FLAG_MUSTBEDIR &&
+	    !strcmp(given->pattern, "/*")) {
+		pl->full_cone = 0;
+		return;
+	}
+
+	if (!given->flags && !strcmp(given->pattern, "/*")) {
+		pl->full_cone = 1;
+		return;
+	}
+
+	if (given->patternlen < 2 ||
+	    *given->pattern == '*' ||
+	    strstr(given->pattern, "**")) {
+		/* Not a cone pattern. */
+		warning(_("unrecognized pattern: '%s'"), given->pattern);
+		goto clear_hashmaps;
+	}
+
+	prev = given->pattern;
+	cur = given->pattern + 1;
+	next = given->pattern + 2;
+
+	while (*cur) {
+		/* Watch for glob characters '*', '\', '[', '?' */
+		if (!is_glob_special(*cur))
+			goto increment;
+
+		/* But only if *prev != '\\' */
+		if (*prev == '\\')
+			goto increment;
+
+		/* But allow the initial '\' */
+		if (*cur == '\\' &&
+		    is_glob_special(*next))
+			goto increment;
+
+		/* But a trailing '/' then '*' is fine */
+		if (*prev == '/' &&
+		    *cur == '*' &&
+		    *next == 0)
+			goto increment;
+
+		/* Not a cone pattern. */
+		warning(_("unrecognized pattern: '%s'"), given->pattern);
+		goto clear_hashmaps;
+
+	increment:
+		prev++;
+		cur++;
+		next++;
+	}
+
+	if (given->patternlen > 2 &&
+	    !strcmp(given->pattern + given->patternlen - 2, "/*")) {
+		if (!(given->flags & PATTERN_FLAG_NEGATIVE)) {
+			/* Not a cone pattern. */
+			warning(_("unrecognized pattern: '%s'"), given->pattern);
+			goto clear_hashmaps;
+		}
+
+		truncated = dup_and_filter_pattern(given->pattern);
+
+		translated = xmalloc(sizeof(struct pattern_entry));
+		translated->pattern = truncated;
+		translated->patternlen = given->patternlen - 2;
+		hashmap_entry_init(&translated->ent,
+				   fspathhash(translated->pattern));
+
+		if (!hashmap_get_entry(&pl->recursive_hashmap,
+				       translated, ent, NULL)) {
+			/* We did not see the "parent" included */
+			warning(_("unrecognized negative pattern: '%s'"),
+				given->pattern);
+			free(truncated);
+			free(translated);
+			goto clear_hashmaps;
+		}
+
+		hashmap_add(&pl->parent_hashmap, &translated->ent);
+		hashmap_remove(&pl->recursive_hashmap, &translated->ent, &data);
+		free(data);
+		return;
+	}
+
+	if (given->flags & PATTERN_FLAG_NEGATIVE) {
+		warning(_("unrecognized negative pattern: '%s'"),
+			given->pattern);
+		goto clear_hashmaps;
+	}
+
+	translated = xmalloc(sizeof(struct pattern_entry));
+
+	translated->pattern = dup_and_filter_pattern(given->pattern);
+	translated->patternlen = given->patternlen;
+	hashmap_entry_init(&translated->ent,
+			   fspathhash(translated->pattern));
+
+	hashmap_add(&pl->recursive_hashmap, &translated->ent);
+
+	if (hashmap_get_entry(&pl->parent_hashmap, translated, ent, NULL)) {
+		/* 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);
+	}
+
+	return;
+
+clear_hashmaps:
+	warning(_("disabling cone pattern matching"));
+	hashmap_clear_and_free(&pl->parent_hashmap, struct pattern_entry, ent);
+	hashmap_clear_and_free(&pl->recursive_hashmap, struct pattern_entry, ent);
+	pl->use_cone_patterns = 0;
+}
+
+static int hashmap_contains_path(struct hashmap *map,
+				 struct strbuf *pattern)
+{
+	struct pattern_entry p;
+
+	/* Check straight mapping */
+	p.pattern = pattern->buf;
+	p.patternlen = pattern->len;
+	hashmap_entry_init(&p.ent, fspathhash(p.pattern));
+	return !!hashmap_get_entry(map, &p, ent, NULL);
+}
+
+int hashmap_contains_parent(struct hashmap *map,
+			    const char *path,
+			    struct strbuf *buffer)
+{
+	char *slash_pos;
+
+	strbuf_setlen(buffer, 0);
+
+	if (path[0] != '/')
+		strbuf_addch(buffer, '/');
+
+	strbuf_addstr(buffer, path);
+
+	slash_pos = strrchr(buffer->buf, '/');
+
+	while (slash_pos > buffer->buf) {
+		strbuf_setlen(buffer, slash_pos - buffer->buf);
+
+		if (hashmap_contains_path(map, buffer))
+			return 1;
+
+		slash_pos = strrchr(buffer->buf, '/');
+	}
+
+	return 0;
+}
+
 void add_pattern(const char *string, const char *base,
 		 int baselen, struct pattern_list *pl, int srcpos)
 {
@@ -635,9 +896,11 @@ void add_pattern(const char *string, const char *base,
 	ALLOC_GROW(pl->patterns, pl->nr + 1, pl->alloc);
 	pl->patterns[pl->nr++] = pattern;
 	pattern->pl = pl;
+
+	add_pattern_to_hashsets(pl, pattern);
 }
 
-static int read_skip_worktree_file_from_index(const struct index_state *istate,
+static int read_skip_worktree_file_from_index(struct index_state *istate,
 					      const char *path,
 					      size_t *size_out, char **data_out,
 					      struct oid_stat *oid_stat)
@@ -666,6 +929,8 @@ void clear_pattern_list(struct pattern_list *pl)
 		free(pl->patterns[i]);
 	free(pl->patterns);
 	free(pl->filebuf);
+	hashmap_clear_and_free(&pl->recursive_hashmap, struct pattern_entry, ent);
+	hashmap_clear_and_free(&pl->parent_hashmap, struct pattern_entry, ent);
 
 	memset(pl, 0, sizeof(*pl));
 }
@@ -778,18 +1043,21 @@ static int add_patterns_from_buffer(char *buf, size_t size,
 				    const char *base, int baselen,
 				    struct pattern_list *pl);
 
+/* Flags for add_patterns() */
+#define PATTERN_NOFOLLOW (1<<0)
+
 /*
  * Given a file with name "fname", read it (either from disk, or from
  * an index if 'istate' is non-null), parse it and store the
  * exclude rules in "pl".
  *
- * If "ss" is not NULL, compute SHA-1 of the exclude file and fill
+ * If "oid_stat" is not NULL, compute oid of the exclude file and fill
  * stat data from disk (only valid if add_patterns returns zero). If
- * ss_valid is non-zero, "ss" must contain good value as input.
+ * oid_stat.valid is non-zero, "oid_stat" must contain good value as input.
  */
 static int add_patterns(const char *fname, const char *base, int baselen,
 			struct pattern_list *pl, struct index_state *istate,
-			struct oid_stat *oid_stat)
+			unsigned flags, struct oid_stat *oid_stat)
 {
 	struct stat st;
 	int r;
@@ -797,7 +1065,11 @@ static int add_patterns(const char *fname, const char *base, int baselen,
 	size_t size = 0;
 	char *buf;
 
-	fd = open(fname, O_RDONLY);
+	if (flags & PATTERN_NOFOLLOW)
+		fd = open_nofollow(fname, O_RDONLY);
+	else
+		fd = open(fname, O_RDONLY);
+
 	if (fd < 0 || fstat(fd, &st) < 0) {
 		if (fd < 0)
 			warn_on_fopen_errors(fname);
@@ -833,7 +1105,7 @@ static int add_patterns(const char *fname, const char *base, int baselen,
 			int pos;
 			if (oid_stat->valid &&
 			    !match_stat_data_racy(istate, &oid_stat->stat, &st))
-				; /* no content change, ss->sha1 still good */
+				; /* no content change, oid_stat->oid still good */
 			else if (istate &&
 				 (pos = index_name_pos(istate, fname, strlen(fname))) >= 0 &&
 				 !ce_stage(istate->cache[pos]) &&
@@ -842,8 +1114,8 @@ static int add_patterns(const char *fname, const char *base, int baselen,
 				oidcpy(&oid_stat->oid,
 				       &istate->cache[pos]->oid);
 			else
-				hash_object_file(buf, size, "blob",
-						 &oid_stat->oid);
+				hash_object_file(the_hash_algo, buf, size,
+						 "blob", &oid_stat->oid);
 			fill_stat_data(&oid_stat->stat, &st);
 			oid_stat->valid = 1;
 		}
@@ -860,6 +1132,9 @@ static int add_patterns_from_buffer(char *buf, size_t size,
 	int i, lineno = 1;
 	char *entry;
 
+	hashmap_init(&pl->recursive_hashmap, pl_hashmap_cmp, NULL, 0);
+	hashmap_init(&pl->parent_hashmap, pl_hashmap_cmp, NULL, 0);
+
 	pl->filebuf = buf;
 
 	if (skip_utf8_bom(&buf, size))
@@ -883,9 +1158,10 @@ static int add_patterns_from_buffer(char *buf, size_t size,
 
 int add_patterns_from_file_to_list(const char *fname, const char *base,
 				   int baselen, struct pattern_list *pl,
-				   struct index_state *istate)
+				   struct index_state *istate,
+				   unsigned flags)
 {
-	return add_patterns(fname, base, baselen, pl, istate, NULL);
+	return add_patterns(fname, base, baselen, pl, istate, flags, NULL);
 }
 
 int add_patterns_from_blob_to_list(
@@ -934,7 +1210,7 @@ static void add_patterns_from_file_1(struct dir_struct *dir, const char *fname,
 	if (!dir->untracked)
 		dir->unmanaged_exclude_files++;
 	pl = add_pattern_list(dir, EXC_FILE, fname);
-	if (add_patterns(fname, "", 0, pl, NULL, oid_stat) < 0)
+	if (add_patterns(fname, "", 0, pl, NULL, 0, oid_stat) < 0)
 		die(_("cannot use %s as an exclude file"), fname);
 }
 
@@ -1052,8 +1328,7 @@ static struct path_pattern *last_matching_pattern_from_list(const char *pathname
 		int prefix = pattern->nowildcardlen;
 
 		if (pattern->flags & PATTERN_FLAG_MUSTBEDIR) {
-			if (*dtype == DT_UNKNOWN)
-				*dtype = get_dtype(NULL, istate, pathname, pathlen);
+			*dtype = resolve_dtype(*dtype, istate, pathname, pathlen);
 			if (*dtype != DT_DIR)
 				continue;
 		}
@@ -1096,16 +1371,72 @@ enum pattern_match_result path_matches_pattern_list(
 				struct index_state *istate)
 {
 	struct path_pattern *pattern;
-	pattern = last_matching_pattern_from_list(pathname, pathlen, basename,
-						  dtype, pl, istate);
-	if (pattern) {
-		if (pattern->flags & PATTERN_FLAG_NEGATIVE)
-			return NOT_MATCHED;
-		else
-			return MATCHED;
+	struct strbuf parent_pathname = STRBUF_INIT;
+	int result = NOT_MATCHED;
+	size_t slash_pos;
+
+	if (!pl->use_cone_patterns) {
+		pattern = last_matching_pattern_from_list(pathname, pathlen, basename,
+							dtype, pl, istate);
+		if (pattern) {
+			if (pattern->flags & PATTERN_FLAG_NEGATIVE)
+				return NOT_MATCHED;
+			else
+				return MATCHED;
+		}
+
+		return UNDECIDED;
 	}
 
-	return UNDECIDED;
+	if (pl->full_cone)
+		return MATCHED;
+
+	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;
+	}
+
+	if (!slash_pos) {
+		/* include every file in root */
+		result = MATCHED;
+		goto done;
+	}
+
+	strbuf_setlen(&parent_pathname, slash_pos);
+
+	if (hashmap_contains_path(&pl->parent_hashmap, &parent_pathname)) {
+		result = MATCHED;
+		goto done;
+	}
+
+	if (hashmap_contains_parent(&pl->recursive_hashmap,
+				    pathname,
+				    &parent_pathname))
+		result = MATCHED_RECURSIVE;
+
+done:
+	strbuf_release(&parent_pathname);
+	return result;
 }
 
 static struct path_pattern *last_matching_pattern_from_lists(
@@ -1187,7 +1518,7 @@ static void prep_exclude(struct dir_struct *dir,
 		const char *cp;
 		struct oid_stat oid_stat;
 
-		stk = xcalloc(1, sizeof(*stk));
+		CALLOC_ARRAY(stk, 1);
 		if (current < 0) {
 			cp = base;
 			current = 0;
@@ -1257,6 +1588,7 @@ static void prep_exclude(struct dir_struct *dir,
 			strbuf_addstr(&sb, dir->exclude_per_dir);
 			pl->src = strbuf_detach(&sb, NULL);
 			add_patterns(pl->src, pl->src, stk->baselen, pl, istate,
+				     PATTERN_NOFOLLOW,
 				     untracked ? &oid_stat : NULL);
 		}
 		/*
@@ -1439,45 +1771,76 @@ static enum exist_status directory_exists_in_index(struct index_state *istate,
  * Case 3: if we didn't have it in the index previously, we
  * have a few sub-cases:
  *
- *  (a) if "show_other_directories" is true, we show it as
- *      just a directory, unless "hide_empty_directories" is
+ *  (a) if DIR_SHOW_OTHER_DIRECTORIES flag is set, we show it as
+ *      just a directory, unless DIR_HIDE_EMPTY_DIRECTORIES is
  *      also true, in which case we need to check if it contains any
  *      untracked and / or ignored files.
- *  (b) if it looks like a git directory, and we don't have
- *      'no_gitlinks' set we treat it as a gitlink, and show it
- *      as a directory.
+ *  (b) if it looks like a git directory and we don't have the
+ *      DIR_NO_GITLINKS flag, then we treat it as a gitlink, and
+ *      show it as a directory.
  *  (c) otherwise, we recurse into it.
  */
 static enum path_treatment treat_directory(struct dir_struct *dir,
 	struct index_state *istate,
 	struct untracked_cache_dir *untracked,
-	const char *dirname, int len, int baselen, int exclude,
+	const char *dirname, int len, int baselen, int excluded,
 	const struct pathspec *pathspec)
 {
+	/*
+	 * WARNING: From this function, you can return path_recurse or you
+	 *          can call read_directory_recursive() (or neither), but
+	 *          you CAN'T DO BOTH.
+	 */
+	enum path_treatment state;
+	int matches_how = 0;
+	int nested_repo = 0, check_only, stop_early;
+	int old_ignored_nr, old_untracked_nr;
 	/* The "len-1" is to strip the final '/' */
-	switch (directory_exists_in_index(istate, dirname, len-1)) {
-	case index_directory:
-		return path_recurse;
+	enum exist_status status = directory_exists_in_index(istate, dirname, len-1);
 
-	case index_gitdir:
+	if (status == index_directory)
+		return path_recurse;
+	if (status == index_gitdir)
 		return path_none;
+	if (status != index_nonexistent)
+		BUG("Unhandled value for directory_exists_in_index: %d\n", status);
 
-	case index_nonexistent:
-		if (dir->flags & DIR_SKIP_NESTED_GIT) {
-			int nested_repo;
-			struct strbuf sb = STRBUF_INIT;
-			strbuf_addstr(&sb, dirname);
-			nested_repo = is_nonbare_repository_dir(&sb);
-			strbuf_release(&sb);
-			if (nested_repo)
-				return path_none;
-		}
+	/*
+	 * We don't want to descend into paths that don't match the necessary
+	 * patterns.  Clearly, if we don't have a pathspec, then we can't check
+	 * for matching patterns.  Also, if (excluded) then we know we matched
+	 * the exclusion patterns so as an optimization we can skip checking
+	 * for matching patterns.
+	 */
+	if (pathspec && !excluded) {
+		matches_how = match_pathspec_with_flags(istate, pathspec,
+							dirname, len,
+							0 /* prefix */,
+							NULL /* seen */,
+							DO_MATCH_LEADING_PATHSPEC);
+		if (!matches_how)
+			return path_none;
+	}
 
-		if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES)
-			break;
-		if (exclude &&
-			(dir->flags & DIR_SHOW_IGNORED_TOO) &&
-			(dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) {
+
+	if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
+		!(dir->flags & DIR_NO_GITLINKS)) {
+		struct strbuf sb = STRBUF_INIT;
+		strbuf_addstr(&sb, dirname);
+		nested_repo = is_nonbare_repository_dir(&sb);
+		strbuf_release(&sb);
+	}
+	if (nested_repo) {
+		if ((dir->flags & DIR_SKIP_NESTED_GIT) ||
+		    (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC))
+			return path_none;
+		return excluded ? path_excluded : path_untracked;
+	}
+
+	if (!(dir->flags & DIR_SHOW_OTHER_DIRECTORIES)) {
+		if (excluded &&
+		    (dir->flags & DIR_SHOW_IGNORED_TOO) &&
+		    (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) {
 
 			/*
 			 * This is an excluded directory and we are
@@ -1499,30 +1862,155 @@ static enum path_treatment treat_directory(struct dir_struct *dir,
 
 			return path_none;
 		}
-		if (!(dir->flags & DIR_NO_GITLINKS)) {
-			struct strbuf sb = STRBUF_INIT;
-			strbuf_addstr(&sb, dirname);
-			if (is_nonbare_repository_dir(&sb))
-				return exclude ? path_excluded : path_untracked;
-			strbuf_release(&sb);
-		}
 		return path_recurse;
 	}
 
-	/* This is the "show_other_directories" case */
+	assert(dir->flags & DIR_SHOW_OTHER_DIRECTORIES);
 
-	if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
-		return exclude ? path_excluded : path_untracked;
+	/*
+	 * If we have a pathspec which could match something _below_ this
+	 * directory (e.g. when checking 'subdir/' having a pathspec like
+	 * 'subdir/some/deep/path/file' or 'subdir/widget-*.c'), then we
+	 * need to recurse.
+	 */
+	if (matches_how == MATCHED_RECURSIVELY_LEADING_PATHSPEC)
+		return path_recurse;
 
+	/* Special cases for where this directory is excluded/ignored */
+	if (excluded) {
+		/*
+		 * If DIR_SHOW_OTHER_DIRECTORIES is set and we're not
+		 * hiding empty directories, there is no need to
+		 * recurse into an ignored directory.
+		 */
+		if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
+			return path_excluded;
+
+		/*
+		 * Even if we are hiding empty directories, we can still avoid
+		 * recursing into ignored directories for DIR_SHOW_IGNORED_TOO
+		 * if DIR_SHOW_IGNORED_TOO_MODE_MATCHING is also set.
+		 */
+		if ((dir->flags & DIR_SHOW_IGNORED_TOO) &&
+		    (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING))
+			return path_excluded;
+	}
+
+	/*
+	 * Other than the path_recurse case above, we only need to
+	 * recurse into untracked directories if any of the following
+	 * bits is set:
+	 *   - DIR_SHOW_IGNORED (because then we need to determine if
+	 *                       there are ignored entries below)
+	 *   - DIR_SHOW_IGNORED_TOO (same as above)
+	 *   - DIR_HIDE_EMPTY_DIRECTORIES (because we have to determine if
+	 *                                 the directory is empty)
+	 */
+	if (!excluded &&
+	    !(dir->flags & (DIR_SHOW_IGNORED |
+			    DIR_SHOW_IGNORED_TOO |
+			    DIR_HIDE_EMPTY_DIRECTORIES))) {
+		return path_untracked;
+	}
+
+	/*
+	 * Even if we don't want to know all the paths under an untracked or
+	 * ignored directory, we may still need to go into the directory to
+	 * determine if it is empty (because with DIR_HIDE_EMPTY_DIRECTORIES,
+	 * an empty directory should be path_none instead of path_excluded or
+	 * path_untracked).
+	 */
+	check_only = ((dir->flags & DIR_HIDE_EMPTY_DIRECTORIES) &&
+		      !(dir->flags & DIR_SHOW_IGNORED_TOO));
+
+	/*
+	 * However, there's another optimization possible as a subset of
+	 * check_only, based on the cases we have to consider:
+	 *   A) Directory matches no exclude patterns:
+	 *     * Directory is empty => path_none
+	 *     * Directory has an untracked file under it => path_untracked
+	 *     * Directory has only ignored files under it => path_excluded
+	 *   B) Directory matches an exclude pattern:
+	 *     * Directory is empty => path_none
+	 *     * Directory has an untracked file under it => path_excluded
+	 *     * Directory has only ignored files under it => path_excluded
+	 * In case A, we can exit as soon as we've found an untracked
+	 * file but otherwise have to walk all files.  In case B, though,
+	 * we can stop at the first file we find under the directory.
+	 */
+	stop_early = check_only && excluded;
+
+	/*
+	 * If /every/ file within an untracked directory is ignored, then
+	 * we want to treat the directory as ignored (for e.g. status
+	 * --porcelain), without listing the individual ignored files
+	 * underneath.  To do so, we'll save the current ignored_nr, and
+	 * pop all the ones added after it if it turns out the entire
+	 * directory is ignored.  Also, when DIR_SHOW_IGNORED_TOO and
+	 * !DIR_KEEP_UNTRACKED_CONTENTS then we don't want to show
+	 * untracked paths so will need to pop all those off the last
+	 * after we traverse.
+	 */
+	old_ignored_nr = dir->ignored_nr;
+	old_untracked_nr = dir->nr;
+
+	/* Actually recurse into dirname now, we'll fixup the state later. */
 	untracked = lookup_untracked(dir->untracked, untracked,
 				     dirname + baselen, len - baselen);
+	state = read_directory_recursive(dir, istate, dirname, len, untracked,
+					 check_only, stop_early, pathspec);
+
+	/* There are a variety of reasons we may need to fixup the state... */
+	if (state == path_excluded) {
+		/* state == path_excluded implies all paths under
+		 * dirname were ignored...
+		 *
+		 * if running e.g. `git status --porcelain --ignored=matching`,
+		 * then we want to see the subpaths that are ignored.
+		 *
+		 * if running e.g. just `git status --porcelain`, then
+		 * we just want the directory itself to be listed as ignored
+		 * and not the individual paths underneath.
+		 */
+		int want_ignored_subpaths =
+			((dir->flags & DIR_SHOW_IGNORED_TOO) &&
+			 (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING));
+
+		if (want_ignored_subpaths) {
+			/*
+			 * with --ignored=matching, we want the subpaths
+			 * INSTEAD of the directory itself.
+			 */
+			state = path_none;
+		} else {
+			int i;
+			for (i = old_ignored_nr + 1; i<dir->ignored_nr; ++i)
+				FREE_AND_NULL(dir->ignored[i]);
+			dir->ignored_nr = old_ignored_nr;
+		}
+	}
 
 	/*
-	 * If this is an excluded directory, then we only need to check if
-	 * the directory contains any files.
+	 * We may need to ignore some of the untracked paths we found while
+	 * traversing subdirectories.
 	 */
-	return read_directory_recursive(dir, istate, dirname, len,
-					untracked, 1, exclude, pathspec);
+	if ((dir->flags & DIR_SHOW_IGNORED_TOO) &&
+	    !(dir->flags & DIR_KEEP_UNTRACKED_CONTENTS)) {
+		int i;
+		for (i = old_untracked_nr + 1; i<dir->nr; ++i)
+			FREE_AND_NULL(dir->entries[i]);
+		dir->nr = old_untracked_nr;
+	}
+
+	/*
+	 * If there is nothing under the current directory and we are not
+	 * hiding empty directories, then we need to report on the
+	 * untracked or ignored status of the directory itself.
+	 */
+	if (state == path_none && !(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
+		state = excluded ? path_excluded : path_untracked;
+
+	return state;
 }
 
 /*
@@ -1641,10 +2129,9 @@ static int get_index_dtype(struct index_state *istate,
 	return DT_UNKNOWN;
 }
 
-static int get_dtype(struct dirent *de, struct index_state *istate,
-		     const char *path, int len)
+static int resolve_dtype(int dtype, struct index_state *istate,
+			 const char *path, int len)
 {
-	int dtype = de ? DTYPE(de) : DT_UNKNOWN;
 	struct stat st;
 
 	if (dtype != DT_UNKNOWN)
@@ -1663,22 +2150,68 @@ static int get_dtype(struct dirent *de, struct index_state *istate,
 	return dtype;
 }
 
-static enum path_treatment treat_one_path(struct dir_struct *dir,
-					  struct untracked_cache_dir *untracked,
-					  struct index_state *istate,
-					  struct strbuf *path,
-					  int baselen,
-					  const struct pathspec *pathspec,
-					  int dtype, struct dirent *de)
+static enum path_treatment treat_path_fast(struct dir_struct *dir,
+					   struct cached_dir *cdir,
+					   struct index_state *istate,
+					   struct strbuf *path,
+					   int baselen,
+					   const struct pathspec *pathspec)
+{
+	/*
+	 * WARNING: From this function, you can return path_recurse or you
+	 *          can call read_directory_recursive() (or neither), but
+	 *          you CAN'T DO BOTH.
+	 */
+	strbuf_setlen(path, baselen);
+	if (!cdir->ucd) {
+		strbuf_addstr(path, cdir->file);
+		return path_untracked;
+	}
+	strbuf_addstr(path, cdir->ucd->name);
+	/* treat_one_path() does this before it calls treat_directory() */
+	strbuf_complete(path, '/');
+	if (cdir->ucd->check_only)
+		/*
+		 * check_only is set as a result of treat_directory() getting
+		 * to its bottom. Verify again the same set of directories
+		 * with check_only set.
+		 */
+		return read_directory_recursive(dir, istate, path->buf, path->len,
+						cdir->ucd, 1, 0, pathspec);
+	/*
+	 * We get path_recurse in the first run when
+	 * directory_exists_in_index() returns index_nonexistent. We
+	 * are sure that new changes in the index does not impact the
+	 * outcome. Return now.
+	 */
+	return path_recurse;
+}
+
+static enum path_treatment treat_path(struct dir_struct *dir,
+				      struct untracked_cache_dir *untracked,
+				      struct cached_dir *cdir,
+				      struct index_state *istate,
+				      struct strbuf *path,
+				      int baselen,
+				      const struct pathspec *pathspec)
 {
-	int exclude;
-	int has_path_in_index = !!index_file_exists(istate, path->buf, path->len, ignore_case);
-	enum path_treatment path_treatment;
+	int has_path_in_index, dtype, excluded;
 
-	if (dtype == DT_UNKNOWN)
-		dtype = get_dtype(de, istate, path->buf, path->len);
+	if (!cdir->d_name)
+		return treat_path_fast(dir, cdir, istate, path,
+				       baselen, pathspec);
+	if (is_dot_or_dotdot(cdir->d_name) || !fspathcmp(cdir->d_name, ".git"))
+		return path_none;
+	strbuf_setlen(path, baselen);
+	strbuf_addstr(path, cdir->d_name);
+	if (simplify_away(path->buf, path->len, pathspec))
+		return path_none;
+
+	dtype = resolve_dtype(cdir->d_type, istate, path->buf, path->len);
 
 	/* Always exclude indexed files */
+	has_path_in_index = !!index_file_exists(istate, path->buf, path->len,
+						ignore_case);
 	if (dtype != DT_DIR && has_path_in_index)
 		return path_none;
 
@@ -1706,99 +2239,40 @@ static enum path_treatment treat_one_path(struct dir_struct *dir,
 	    (directory_exists_in_index(istate, path->buf, path->len) == index_nonexistent))
 		return path_none;
 
-	exclude = is_excluded(dir, istate, path->buf, &dtype);
+	excluded = is_excluded(dir, istate, path->buf, &dtype);
 
 	/*
 	 * Excluded? If we don't explicitly want to show
 	 * ignored files, ignore it
 	 */
-	if (exclude && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO)))
+	if (excluded && !(dir->flags & (DIR_SHOW_IGNORED|DIR_SHOW_IGNORED_TOO)))
 		return path_excluded;
 
 	switch (dtype) {
 	default:
 		return path_none;
 	case DT_DIR:
-		strbuf_addch(path, '/');
-		path_treatment = treat_directory(dir, istate, untracked,
-						 path->buf, path->len,
-						 baselen, exclude, pathspec);
 		/*
-		 * If 1) we only want to return directories that
-		 * match an exclude pattern and 2) this directory does
-		 * not match an exclude pattern but all of its
-		 * contents are excluded, then indicate that we should
-		 * recurse into this directory (instead of marking the
-		 * directory itself as an ignored path).
+		 * WARNING: Do not ignore/amend the return value from
+		 * treat_directory(), and especially do not change it to return
+		 * path_recurse as that can cause exponential slowdown.
+		 * Instead, modify treat_directory() to return the right value.
 		 */
-		if (!exclude &&
-		    path_treatment == path_excluded &&
-		    (dir->flags & DIR_SHOW_IGNORED_TOO) &&
-		    (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING))
-			return path_recurse;
-		return path_treatment;
+		strbuf_addch(path, '/');
+		return treat_directory(dir, istate, untracked,
+				       path->buf, path->len,
+				       baselen, excluded, pathspec);
 	case DT_REG:
 	case DT_LNK:
-		return exclude ? path_excluded : path_untracked;
-	}
-}
-
-static enum path_treatment treat_path_fast(struct dir_struct *dir,
-					   struct untracked_cache_dir *untracked,
-					   struct cached_dir *cdir,
-					   struct index_state *istate,
-					   struct strbuf *path,
-					   int baselen,
-					   const struct pathspec *pathspec)
-{
-	strbuf_setlen(path, baselen);
-	if (!cdir->ucd) {
-		strbuf_addstr(path, cdir->file);
+		if (pathspec &&
+		    !match_pathspec(istate, pathspec, path->buf, path->len,
+				    0 /* prefix */, NULL /* seen */,
+				    0 /* is_dir */))
+			return path_none;
+		if (excluded)
+			return path_excluded;
 		return path_untracked;
 	}
-	strbuf_addstr(path, cdir->ucd->name);
-	/* treat_one_path() does this before it calls treat_directory() */
-	strbuf_complete(path, '/');
-	if (cdir->ucd->check_only)
-		/*
-		 * check_only is set as a result of treat_directory() getting
-		 * to its bottom. Verify again the same set of directories
-		 * with check_only set.
-		 */
-		return read_directory_recursive(dir, istate, path->buf, path->len,
-						cdir->ucd, 1, 0, pathspec);
-	/*
-	 * We get path_recurse in the first run when
-	 * directory_exists_in_index() returns index_nonexistent. We
-	 * are sure that new changes in the index does not impact the
-	 * outcome. Return now.
-	 */
-	return path_recurse;
-}
-
-static enum path_treatment treat_path(struct dir_struct *dir,
-				      struct untracked_cache_dir *untracked,
-				      struct cached_dir *cdir,
-				      struct index_state *istate,
-				      struct strbuf *path,
-				      int baselen,
-				      const struct pathspec *pathspec)
-{
-	int dtype;
-	struct dirent *de = cdir->de;
-
-	if (!de)
-		return treat_path_fast(dir, untracked, cdir, istate, path,
-				       baselen, pathspec);
-	if (is_dot_or_dotdot(de->d_name) || !fspathcmp(de->d_name, ".git"))
-		return path_none;
-	strbuf_setlen(path, baselen);
-	strbuf_addstr(path, de->d_name);
-	if (simplify_away(path->buf, path->len, pathspec))
-		return path_none;
-
-	dtype = DTYPE(de);
-	return treat_one_path(dir, untracked, istate, path, baselen, pathspec, dtype, de);
 }
 
 static void add_untracked(struct untracked_cache_dir *dir, const char *name)
@@ -1886,10 +2360,17 @@ static int open_cached_dir(struct cached_dir *cdir,
 
 static int read_cached_dir(struct cached_dir *cdir)
 {
+	struct dirent *de;
+
 	if (cdir->fdir) {
-		cdir->de = readdir(cdir->fdir);
-		if (!cdir->de)
+		de = readdir_skip_dot_and_dotdot(cdir->fdir);
+		if (!de) {
+			cdir->d_name = NULL;
+			cdir->d_type = DT_UNKNOWN;
 			return -1;
+		}
+		cdir->d_name = de->d_name;
+		cdir->d_type = DTYPE(de);
 		return 0;
 	}
 	while (cdir->nr_dirs < cdir->untracked->dirs_nr) {
@@ -1925,6 +2406,40 @@ static void close_cached_dir(struct cached_dir *cdir)
 	}
 }
 
+static void add_path_to_appropriate_result_list(struct dir_struct *dir,
+	struct untracked_cache_dir *untracked,
+	struct cached_dir *cdir,
+	struct index_state *istate,
+	struct strbuf *path,
+	int baselen,
+	const struct pathspec *pathspec,
+	enum path_treatment state)
+{
+	/* add the path to the appropriate result list */
+	switch (state) {
+	case path_excluded:
+		if (dir->flags & DIR_SHOW_IGNORED)
+			dir_add_name(dir, istate, path->buf, path->len);
+		else if ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
+			((dir->flags & DIR_COLLECT_IGNORED) &&
+			exclude_matches_pathspec(path->buf, path->len,
+						 pathspec)))
+			dir_add_ignored(dir, istate, path->buf, path->len);
+		break;
+
+	case path_untracked:
+		if (dir->flags & DIR_SHOW_IGNORED)
+			break;
+		dir_add_name(dir, istate, path->buf, path->len);
+		if (cdir->fdir)
+			add_untracked(untracked, path->buf + baselen);
+		break;
+
+	default:
+		break;
+	}
+}
+
 /*
  * Read a directory tree. We currently ignore anything but
  * directories, regular files and symlinks. That's because git
@@ -1937,7 +2452,7 @@ static void close_cached_dir(struct cached_dir *cdir)
  * If 'stop_at_first_file' is specified, 'path_excluded' is returned
  * to signal that a file was found. This is the least significant value that
  * indicates that a file was encountered that does not depend on the order of
- * whether an untracked or exluded path was encountered first.
+ * whether an untracked or excluded path was encountered first.
  *
  * Returns the most significant path_treatment value encountered in the scan.
  * If 'stop_at_first_file' is specified, `path_excluded` is the most
@@ -1949,6 +2464,11 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 	struct untracked_cache_dir *untracked, int check_only,
 	int stop_at_first_file, const struct pathspec *pathspec)
 {
+	/*
+	 * WARNING: Do NOT recurse unless path_recurse is returned from
+	 *          treat_path().  Recursing on any other return value
+	 *          can result in exponential slowdown.
+	 */
 	struct cached_dir cdir;
 	enum path_treatment state, subdir_state, dir_state = path_none;
 	struct strbuf path = STRBUF_INIT;
@@ -1957,6 +2477,7 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 
 	if (open_cached_dir(&cdir, dir, untracked, istate, &path, check_only))
 		goto out;
+	dir->visited_directories++;
 
 	if (untracked)
 		untracked->check_only = !!check_only;
@@ -1965,18 +2486,13 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 		/* check how the file or directory should be treated */
 		state = treat_path(dir, untracked, &cdir, istate, &path,
 				   baselen, pathspec);
+		dir->visited_paths++;
 
 		if (state > dir_state)
 			dir_state = state;
 
 		/* recurse into subdir if instructed by treat_path */
-		if ((state == path_recurse) ||
-			((state == path_untracked) &&
-			 (get_dtype(cdir.de, istate, path.buf, path.len) == DT_DIR) &&
-			 ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
-			  (pathspec &&
-			   do_match_pathspec(istate, pathspec, path.buf, path.len,
-					     baselen, NULL, DO_MATCH_LEADING_PATHSPEC) == MATCHED_RECURSIVELY_LEADING_PATHSPEC)))) {
+		if (state == path_recurse) {
 			struct untracked_cache_dir *ud;
 			ud = lookup_untracked(dir->untracked, untracked,
 					      path.buf + baselen,
@@ -2024,33 +2540,13 @@ static enum path_treatment read_directory_recursive(struct dir_struct *dir,
 					add_untracked(untracked, path.buf + baselen);
 				break;
 			}
-			/* skip the dir_add_* part */
+			/* skip the add_path_to_appropriate_result_list() */
 			continue;
 		}
 
-		/* add the path to the appropriate result list */
-		switch (state) {
-		case path_excluded:
-			if (dir->flags & DIR_SHOW_IGNORED)
-				dir_add_name(dir, istate, path.buf, path.len);
-			else if ((dir->flags & DIR_SHOW_IGNORED_TOO) ||
-				((dir->flags & DIR_COLLECT_IGNORED) &&
-				exclude_matches_pathspec(path.buf, path.len,
-							 pathspec)))
-				dir_add_ignored(dir, istate, path.buf, path.len);
-			break;
-
-		case path_untracked:
-			if (dir->flags & DIR_SHOW_IGNORED)
-				break;
-			dir_add_name(dir, istate, path.buf, path.len);
-			if (cdir.fdir)
-				add_untracked(untracked, path.buf + baselen);
-			break;
-
-		default:
-			break;
-		}
+		add_path_to_appropriate_result_list(dir, untracked, &cdir,
+						    istate, &path, baselen,
+						    pathspec, state);
 	}
 	close_cached_dir(&cdir);
  out:
@@ -2081,40 +2577,69 @@ static int treat_leading_path(struct dir_struct *dir,
 			      const struct pathspec *pathspec)
 {
 	struct strbuf sb = STRBUF_INIT;
-	int baselen, rc = 0;
+	struct strbuf subdir = STRBUF_INIT;
+	int prevlen, baselen;
 	const char *cp;
-	int old_flags = dir->flags;
+	struct cached_dir cdir;
+	enum path_treatment state = path_none;
+
+	/*
+	 * For each directory component of path, we are going to check whether
+	 * that path is relevant given the pathspec.  For example, if path is
+	 *    foo/bar/baz/
+	 * then we will ask treat_path() whether we should go into foo, then
+	 * whether we should go into bar, then whether baz is relevant.
+	 * Checking each is important because e.g. if path is
+	 *    .git/info/
+	 * then we need to check .git to know we shouldn't traverse it.
+	 * If the return from treat_path() is:
+	 *    * path_none, for any path, we return false.
+	 *    * path_recurse, for all path components, we return true
+	 *    * <anything else> for some intermediate component, we make sure
+	 *        to add that path to the relevant list but return false
+	 *        signifying that we shouldn't recurse into it.
+	 */
 
 	while (len && path[len - 1] == '/')
 		len--;
 	if (!len)
 		return 1;
+
+	memset(&cdir, 0, sizeof(cdir));
+	cdir.d_type = DT_DIR;
 	baselen = 0;
-	dir->flags &= ~DIR_SHOW_OTHER_DIRECTORIES;
+	prevlen = 0;
 	while (1) {
-		cp = path + baselen + !!baselen;
+		prevlen = baselen + !!baselen;
+		cp = path + prevlen;
 		cp = memchr(cp, '/', path + len - cp);
 		if (!cp)
 			baselen = len;
 		else
 			baselen = cp - path;
-		strbuf_setlen(&sb, 0);
+		strbuf_reset(&sb);
 		strbuf_add(&sb, path, baselen);
 		if (!is_directory(sb.buf))
 			break;
-		if (simplify_away(sb.buf, sb.len, pathspec))
-			break;
-		if (treat_one_path(dir, NULL, istate, &sb, baselen, pathspec,
-				   DT_DIR, NULL) == path_none)
+		strbuf_reset(&sb);
+		strbuf_add(&sb, path, prevlen);
+		strbuf_reset(&subdir);
+		strbuf_add(&subdir, path+prevlen, baselen-prevlen);
+		cdir.d_name = subdir.buf;
+		state = treat_path(dir, NULL, &cdir, istate, &sb, prevlen, pathspec);
+
+		if (state != path_recurse)
 			break; /* do not recurse into it */
-		if (len <= baselen) {
-			rc = 1;
+		if (len <= baselen)
 			break; /* finished checking */
-		}
 	}
+	add_path_to_appropriate_result_list(dir, NULL, &cdir, istate,
+					    &sb, baselen, pathspec,
+					    state);
+
+	strbuf_release(&subdir);
 	strbuf_release(&sb);
-	dir->flags = old_flags;
-	return rc;
+	return state == path_recurse;
 }
 
 static const char *get_ident_string(void)
@@ -2253,11 +2778,8 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d
 		return NULL;
 	}
 
-	if (!dir->untracked->root) {
-		const int len = sizeof(*dir->untracked->root);
-		dir->untracked->root = xmalloc(len);
-		memset(dir->untracked->root, 0, len);
-	}
+	if (!dir->untracked->root)
+		FLEX_ALLOC_STR(dir->untracked->root, name, "");
 
 	/* Validate $GIT_DIR/info/exclude and core.excludesfile */
 	root = dir->untracked->root;
@@ -2277,15 +2799,53 @@ static struct untracked_cache_dir *validate_untracked_cache(struct dir_struct *d
 	return root;
 }
 
+static void emit_traversal_statistics(struct dir_struct *dir,
+				      struct repository *repo,
+				      const char *path,
+				      int path_len)
+{
+	if (!trace2_is_enabled())
+		return;
+
+	if (!path_len) {
+		trace2_data_string("read_directory", repo, "path", "");
+	} else {
+		struct strbuf tmp = STRBUF_INIT;
+		strbuf_add(&tmp, path, path_len);
+		trace2_data_string("read_directory", repo, "path", tmp.buf);
+		strbuf_release(&tmp);
+	}
+
+	trace2_data_intmax("read_directory", repo,
+			   "directories-visited", dir->visited_directories);
+	trace2_data_intmax("read_directory", repo,
+			   "paths-visited", dir->visited_paths);
+
+	if (!dir->untracked)
+		return;
+	trace2_data_intmax("read_directory", repo,
+			   "node-creation", dir->untracked->dir_created);
+	trace2_data_intmax("read_directory", repo,
+			   "gitignore-invalidation",
+			   dir->untracked->gitignore_invalidated);
+	trace2_data_intmax("read_directory", repo,
+			   "directory-invalidation",
+			   dir->untracked->dir_invalidated);
+	trace2_data_intmax("read_directory", repo,
+			   "opendir", dir->untracked->dir_opened);
+}
+
 int read_directory(struct dir_struct *dir, struct index_state *istate,
 		   const char *path, int len, const struct pathspec *pathspec)
 {
 	struct untracked_cache_dir *untracked;
 
-	trace_performance_enter();
+	trace2_region_enter("dir", "read_directory", istate->repo);
+	dir->visited_paths = 0;
+	dir->visited_directories = 0;
 
 	if (has_symlink_leading_path(path, len)) {
-		trace_performance_leave("read directory %.*s", len, path);
+		trace2_region_leave("dir", "read_directory", istate->repo);
 		return dir->nr;
 	}
 
@@ -2301,45 +2861,15 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
 	QSORT(dir->entries, dir->nr, cmp_dir_entry);
 	QSORT(dir->ignored, dir->ignored_nr, cmp_dir_entry);
 
-	/*
-	 * If DIR_SHOW_IGNORED_TOO is set, read_directory_recursive() will
-	 * also pick up untracked contents of untracked dirs; by default
-	 * we discard these, but given DIR_KEEP_UNTRACKED_CONTENTS we do not.
-	 */
-	if ((dir->flags & DIR_SHOW_IGNORED_TOO) &&
-		     !(dir->flags & DIR_KEEP_UNTRACKED_CONTENTS)) {
-		int i, j;
-
-		/* remove from dir->entries untracked contents of untracked dirs */
-		for (i = j = 0; j < dir->nr; j++) {
-			if (i &&
-			    check_dir_entry_contains(dir->entries[i - 1], dir->entries[j])) {
-				FREE_AND_NULL(dir->entries[j]);
-			} else {
-				dir->entries[i++] = dir->entries[j];
-			}
-		}
+	emit_traversal_statistics(dir, istate->repo, path, len);
 
-		dir->nr = i;
-	}
-
-	trace_performance_leave("read directory %.*s", len, path);
+	trace2_region_leave("dir", "read_directory", istate->repo);
 	if (dir->untracked) {
 		static int force_untracked_cache = -1;
-		static struct trace_key trace_untracked_stats = TRACE_KEY_INIT(UNTRACKED_STATS);
 
 		if (force_untracked_cache < 0)
 			force_untracked_cache =
 				git_env_bool("GIT_FORCE_UNTRACKED_CACHE", 0);
-		trace_printf_key(&trace_untracked_stats,
-				 "node creation: %u\n"
-				 "gitignore invalidation: %u\n"
-				 "directory invalidation: %u\n"
-				 "opendir: %u\n",
-				 dir->untracked->dir_created,
-				 dir->untracked->gitignore_invalidated,
-				 dir->untracked->dir_invalidated,
-				 dir->untracked->dir_opened);
 		if (force_untracked_cache &&
 			dir->untracked == istate->untracked &&
 		    (dir->untracked->dir_opened ||
@@ -2350,6 +2880,7 @@ int read_directory(struct dir_struct *dir, struct index_state *istate,
 			FREE_AND_NULL(dir->untracked);
 		}
 	}
+
 	return dir->nr;
 }
 
@@ -2431,11 +2962,9 @@ int is_empty_dir(const char *path)
 	if (!dir)
 		return 0;
 
-	while ((e = readdir(dir)) != NULL)
-		if (!is_dot_or_dotdot(e->d_name)) {
-			ret = 0;
-			break;
-		}
+	e = readdir_skip_dot_and_dotdot(dir);
+	if (e)
+		ret = 0;
 
 	closedir(dir);
 	return ret;
@@ -2475,10 +3004,8 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
 	strbuf_complete(path, '/');
 
 	len = path->len;
-	while ((e = readdir(dir)) != NULL) {
+	while ((e = readdir_skip_dot_and_dotdot(dir)) != NULL) {
 		struct stat st;
-		if (is_dot_or_dotdot(e->d_name))
-			continue;
 
 		strbuf_setlen(path, len);
 		strbuf_addstr(path, e->d_name);
@@ -2489,7 +3016,7 @@ static int remove_dir_recurse(struct strbuf *path, int flag, int *kept_up)
 				 * wanted anyway
 				 */
 				continue;
-			/* fall thru */
+			/* fall through */
 		} else if (S_ISDIR(st.st_mode)) {
 			if (!remove_dir_recurse(path, flag, &kept_down))
 				continue; /* happy */
@@ -2543,6 +3070,23 @@ void setup_standard_excludes(struct dir_struct *dir)
 	}
 }
 
+char *get_sparse_checkout_filename(void)
+{
+	return git_pathdup("info/sparse-checkout");
+}
+
+int get_sparse_checkout_patterns(struct pattern_list *pl)
+{
+	int res;
+	char *sparse_filename = get_sparse_checkout_filename();
+
+	pl->use_cone_patterns = core_sparse_checkout_cone;
+	res = add_patterns_from_file_to_list(sparse_filename, "", 0, pl, NULL, 0);
+
+	free(sparse_filename);
+	return res;
+}
+
 int remove_path(const char *name)
 {
 	char *slash;
@@ -2563,15 +3107,16 @@ int remove_path(const char *name)
 }
 
 /*
- * Frees memory within dir which was allocated for exclude lists and
- * the exclude_stack.  Does not free dir itself.
+ * Frees memory within dir which was allocated, and resets fields for further
+ * use.  Does not free dir itself.
  */
-void clear_directory(struct dir_struct *dir)
+void dir_clear(struct dir_struct *dir)
 {
 	int i, j;
 	struct exclude_list_group *group;
 	struct pattern_list *pl;
 	struct exclude_stack *stk;
+	struct dir_struct new = DIR_INIT;
 
 	for (i = EXC_CMDL; i <= EXC_FILE; i++) {
 		group = &dir->exclude_list_group[i];
@@ -2584,6 +3129,13 @@ void clear_directory(struct dir_struct *dir)
 		free(group->pl);
 	}
 
+	for (i = 0; i < dir->ignored_nr; i++)
+		free(dir->ignored[i]);
+	for (i = 0; i < dir->nr; i++)
+		free(dir->entries[i]);
+	free(dir->ignored);
+	free(dir->entries);
+
 	stk = dir->exclude_stack;
 	while (stk) {
 		struct exclude_stack *prev = stk->prev;
@@ -2591,6 +3143,8 @@ void clear_directory(struct dir_struct *dir)
 		stk = prev;
 	}
 	strbuf_release(&dir->basebuf);
+
+	memcpy(dir, &new, sizeof(*dir));
 }
 
 struct ondisk_untracked_cache {
@@ -2684,7 +3238,7 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untra
 	int varint_len;
 	const unsigned hashsz = the_hash_algo->rawsz;
 
-	ouc = xcalloc(1, sizeof(*ouc));
+	CALLOC_ARRAY(ouc, 1);
 	stat_data_to_disk(&ouc->info_exclude_stat, &untracked->ss_info_exclude.stat);
 	stat_data_to_disk(&ouc->excludes_file_stat, &untracked->ss_excludes_file.stat);
 	ouc->dir_flags = htonl(untracked->dir_flags);
@@ -2857,7 +3411,7 @@ static void read_oid(size_t pos, void *cb)
 		rd->data = rd->end + 1;
 		return;
 	}
-	hashcpy(ud->exclude_oid.hash, rd->data);
+	oidread(&ud->exclude_oid, rd->data);
 	rd->data += the_hash_algo->rawsz;
 }
 
@@ -2865,7 +3419,7 @@ static void load_oid_stat(struct oid_stat *oid_stat, const unsigned char *data,
 			  const unsigned char *sha1)
 {
 	stat_data_from_disk(&oid_stat->stat, data);
-	hashcpy(oid_stat->oid.hash, sha1);
+	oidread(&oid_stat->oid, sha1);
 	oid_stat->valid = 1;
 }
 
@@ -2895,7 +3449,7 @@ struct untracked_cache *read_untracked_extension(const void *data, unsigned long
 	if (next + exclude_per_dir_offset + 1 > end)
 		return NULL;
 
-	uc = xcalloc(1, sizeof(*uc));
+	CALLOC_ARRAY(uc, 1);
 	strbuf_init(&uc->ident, ident_len);
 	strbuf_add(&uc->ident, ident, ident_len);
 	load_oid_stat(&uc->ss_info_exclude,
@@ -3055,6 +3609,8 @@ static void connect_wt_gitdir_in_nested(const char *sub_worktree,
 	if (repo_read_index(&subrepo) < 0)
 		die(_("index file corrupt in repo %s"), subrepo.gitdir);
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(subrepo.index);
 	for (i = 0; i < subrepo.index->cache_nr; i++) {
 		const struct cache_entry *ce = subrepo.index->cache[i];
 
@@ -3069,7 +3625,7 @@ static void connect_wt_gitdir_in_nested(const char *sub_worktree,
 			 */
 			i++;
 
-		sub = submodule_from_path(&subrepo, &null_oid, ce->name);
+		sub = submodule_from_path(&subrepo, null_oid(), ce->name);
 		if (!sub || !is_submodule_active(&subrepo, ce->name))
 			/* .gitmodules broken or inactive sub */
 			continue;
diff --git a/dir.h b/dir.h
index 2fbdef014f..b3e1a54a97 100644
--- a/dir.h
+++ b/dir.h
@@ -1,11 +1,44 @@
 #ifndef DIR_H
 #define DIR_H
 
-/* See Documentation/technical/api-directory-listing.txt */
-
 #include "cache.h"
+#include "hashmap.h"
 #include "strbuf.h"
 
+/**
+ * The directory listing API is used to enumerate paths in the work tree,
+ * optionally taking `.git/info/exclude` and `.gitignore` files per directory
+ * into account.
+ */
+
+/**
+ * Calling sequence
+ * ----------------
+ *
+ * Note: The index may be checked for .gitignore files that are
+ * CE_SKIP_WORKTREE marked. If you want to exclude files, make sure you have
+ * loaded the index first.
+ *
+ * - Prepare `struct dir_struct dir` using `dir_init()` function.
+ *
+ * - To add single exclude pattern, call `add_pattern_list()` and then
+ *   `add_pattern()`.
+ *
+ * - To add patterns from a file (e.g. `.git/info/exclude`), call
+ *   `add_patterns_from_file()` , and/or set `dir.exclude_per_dir`.
+ *
+ * - A short-hand function `setup_standard_excludes()` can be used to set
+ *   up the standard set of exclude settings, instead of manually calling
+ *   the add_pattern*() family of functions.
+ *
+ * - Call `fill_directory()`.
+ *
+ * - Use `dir.entries[]` and `dir.ignored[]`.
+ *
+ * - Call `dir_clear()` when the contained elements are no longer in use.
+ *
+ */
+
 struct dir_entry {
 	unsigned int len;
 	char name[FLEX_ARRAY]; /* more */
@@ -37,6 +70,13 @@ struct path_pattern {
 	int srcpos;
 };
 
+/* used for hashmaps for cone patterns */
+struct pattern_entry {
+	struct hashmap_entry ent;
+	char *pattern;
+	size_t patternlen;
+};
+
 /*
  * Each excludes file will be parsed into a fresh exclude_list which
  * is appended to the relevant exclude_list_group (either EXC_DIRS or
@@ -55,6 +95,26 @@ struct pattern_list {
 	const char *src;
 
 	struct path_pattern **patterns;
+
+	/*
+	 * While scanning the excludes, we attempt to match the patterns
+	 * with a more restricted set that allows us to use hashsets for
+	 * matching logic, which is faster than the linear lookup in the
+	 * excludes array above. If non-zero, that check succeeded.
+	 */
+	unsigned use_cone_patterns;
+	unsigned full_cone;
+
+	/*
+	 * Stores paths where everything starting with those paths
+	 * is included.
+	 */
+	struct hashmap recursive_hashmap;
+
+	/*
+	 * Used to check single-level parents of blobs.
+	 */
+	struct hashmap parent_hashmap;
 };
 
 /*
@@ -144,25 +204,101 @@ struct untracked_cache {
 	unsigned int use_fsmonitor : 1;
 };
 
+/**
+ * structure is used to pass directory traversal options to the library and to
+ * record the paths discovered. A single `struct dir_struct` is used regardless
+ * of whether or not the traversal recursively descends into subdirectories.
+ */
 struct dir_struct {
-	int nr, alloc;
-	int ignored_nr, ignored_alloc;
+
+	/* The number of members in `entries[]` array. */
+	int nr;
+
+	/* Internal use; keeps track of allocation of `entries[]` array.*/
+	int alloc;
+
+	/* The number of members in `ignored[]` array. */
+	int ignored_nr;
+
+	int ignored_alloc;
+
+	/* bit-field of options */
 	enum {
+
+		/**
+		 * Return just ignored files in `entries[]`, not untracked files.
+		 * This flag is mutually exclusive with `DIR_SHOW_IGNORED_TOO`.
+		 */
 		DIR_SHOW_IGNORED = 1<<0,
+
+		/* Include a directory that is not tracked. */
 		DIR_SHOW_OTHER_DIRECTORIES = 1<<1,
+
+		/* Do not include a directory that is not tracked and is empty. */
 		DIR_HIDE_EMPTY_DIRECTORIES = 1<<2,
+
+		/**
+		 * If set, recurse into a directory that looks like a Git directory.
+		 * Otherwise it is shown as a directory.
+		 */
 		DIR_NO_GITLINKS = 1<<3,
+
+		/**
+		 * Special mode for git-add. Return ignored files in `ignored[]` and
+		 * untracked files in `entries[]`. Only returns ignored files that match
+		 * pathspec exactly (no wildcards). Does not recurse into ignored
+		 * directories.
+		 */
 		DIR_COLLECT_IGNORED = 1<<4,
+
+		/**
+		 * Similar to `DIR_SHOW_IGNORED`, but return ignored files in
+		 * `ignored[]` in addition to untracked files in `entries[]`.
+		 * This flag is mutually exclusive with `DIR_SHOW_IGNORED`.
+		 */
 		DIR_SHOW_IGNORED_TOO = 1<<5,
+
 		DIR_COLLECT_KILLED_ONLY = 1<<6,
+
+		/**
+		 * Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if this is
+		 * set, the untracked contents of untracked directories are also
+		 * returned in `entries[]`.
+		 */
 		DIR_KEEP_UNTRACKED_CONTENTS = 1<<7,
+
+		/**
+		 * Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if this is
+		 * set, returns ignored files and directories that match an exclude
+		 * pattern. If a directory matches an exclude pattern, then the
+		 * directory is returned and the contained paths are not. A directory
+		 * that does not match an exclude pattern will not be returned even if
+		 * all of its contents are ignored. In this case, the contents are
+		 * returned as individual entries.
+		 *
+		 * If this is set, files and directories that explicitly match an ignore
+		 * pattern are reported. Implicitly ignored directories (directories that
+		 * do not match an ignore pattern, but whose contents are all ignored)
+		 * are not reported, instead all of the contents are reported.
+		 */
 		DIR_SHOW_IGNORED_TOO_MODE_MATCHING = 1<<8,
+
 		DIR_SKIP_NESTED_GIT = 1<<9
 	} flags;
+
+	/* An array of `struct dir_entry`, each element of which describes a path. */
 	struct dir_entry **entries;
+
+	/**
+	 * used for ignored paths with the `DIR_SHOW_IGNORED_TOO` and
+	 * `DIR_COLLECT_IGNORED` flags.
+	 */
 	struct dir_entry **ignored;
 
-	/* Exclude info */
+	/**
+	 * The name of the file to be read in each directory for excluded files
+	 * (typically `.gitignore`).
+	 */
 	const char *exclude_per_dir;
 
 	/*
@@ -200,8 +336,16 @@ struct dir_struct {
 	struct oid_stat ss_info_exclude;
 	struct oid_stat ss_excludes_file;
 	unsigned unmanaged_exclude_files;
+
+	/* Stats about the traversal */
+	unsigned visited_paths;
+	unsigned visited_directories;
 };
 
+#define DIR_INIT { 0 }
+
+struct dirent *readdir_skip_dot_and_dotdot(DIR *dirp);
+
 /*Count the number of slashes for string s*/
 int count_slashes(const char *s);
 
@@ -218,7 +362,7 @@ int count_slashes(const char *s);
 int simple_length(const char *match);
 int no_wildcard(const char *string);
 char *common_prefix(const struct pathspec *pathspec);
-int match_pathspec(const struct index_state *istate,
+int match_pathspec(struct index_state *istate,
 		   const struct pathspec *pathspec,
 		   const char *name, int namelen,
 		   int prefix, char *seen, int is_dir);
@@ -236,6 +380,7 @@ enum pattern_match_result {
 	UNDECIDED = -1,
 	NOT_MATCHED = 0,
 	MATCHED = 1,
+	MATCHED_RECURSIVE = 2,
 };
 
 /*
@@ -271,10 +416,18 @@ int is_excluded(struct dir_struct *dir,
 		struct index_state *istate,
 		const char *name, int *dtype);
 
+int pl_hashmap_cmp(const void *unused_cmp_data,
+		   const struct hashmap_entry *a,
+		   const struct hashmap_entry *b,
+		   const void *key);
+int hashmap_contains_parent(struct hashmap *map,
+			    const char *path,
+			    struct strbuf *buffer);
 struct pattern_list *add_pattern_list(struct dir_struct *dir,
 				      int group_type, const char *src);
 int add_patterns_from_file_to_list(const char *fname, const char *base, int baselen,
-				   struct pattern_list *pl, struct  index_state *istate);
+				   struct pattern_list *pl, struct index_state *istate,
+				   unsigned flags);
 void add_patterns_from_file(struct dir_struct *, const char *fname);
 int add_patterns_from_blob_to_list(struct object_id *oid,
 				   const char *base, int baselen,
@@ -283,7 +436,7 @@ void parse_path_pattern(const char **string, int *patternlen, unsigned *flags, i
 void add_pattern(const char *string, const char *base,
 		 int baselen, struct pattern_list *pl, int srcpos);
 void clear_pattern_list(struct pattern_list *pl);
-void clear_directory(struct dir_struct *dir);
+void dir_clear(struct dir_struct *dir);
 
 int repo_file_exists(struct repository *repo, const char *path);
 int file_exists(const char *);
@@ -302,6 +455,8 @@ int is_empty_dir(const char *dir);
 
 void setup_standard_excludes(struct dir_struct *dir);
 
+char *get_sparse_checkout_filename(void);
+int get_sparse_checkout_patterns(struct pattern_list *pl);
 
 /* Constants for remove_dir_recursively: */
 
@@ -334,7 +489,9 @@ int remove_dir_recursively(struct strbuf *path, int flag);
 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.
@@ -344,12 +501,12 @@ int git_fnmatch(const struct pathspec_item *item,
 		const char *pattern, const char *string,
 		int prefix);
 
-int submodule_path_match(const struct index_state *istate,
+int submodule_path_match(struct index_state *istate,
 			 const struct pathspec *ps,
 			 const char *submodule_name,
 			 char *seen);
 
-static inline int ce_path_match(const struct index_state *istate,
+static inline int ce_path_match(struct index_state *istate,
 				const struct cache_entry *ce,
 				const struct pathspec *pathspec,
 				char *seen)
@@ -358,7 +515,7 @@ static inline int ce_path_match(const struct index_state *istate,
 			      S_ISDIR(ce->ce_mode) || S_ISGITLINK(ce->ce_mode));
 }
 
-static inline int dir_path_match(const struct index_state *istate,
+static inline int dir_path_match(struct index_state *istate,
 				 const struct dir_entry *ent,
 				 const struct pathspec *pathspec,
 				 int prefix, char *seen)
diff --git a/editor.c b/editor.c
index f079abbf11..6303ae0ab0 100644
--- a/editor.c
+++ b/editor.c
@@ -40,7 +40,7 @@ const char *git_sequence_editor(void)
 	const char *editor = getenv("GIT_SEQUENCE_EDITOR");
 
 	if (!editor)
-		git_config_get_string_const("sequence.editor", &editor);
+		git_config_get_string_tmp("sequence.editor", &editor);
 	if (!editor)
 		editor = git_editor();
 
@@ -54,7 +54,8 @@ static int launch_specified_editor(const char *editor, const char *path,
 		return error("Terminal is dumb, but EDITOR unset");
 
 	if (strcmp(editor, ":")) {
-		const char *args[] = { editor, real_path(path), NULL };
+		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);
@@ -75,16 +76,22 @@ static int launch_specified_editor(const char *editor, const char *path,
 			fflush(stderr);
 		}
 
+		strbuf_realpath(&realpath, path, 1);
+		args[1] = realpath.buf;
+
 		p.argv = args;
 		p.env = env;
 		p.use_shell = 1;
 		p.trace2_child_class = "editor";
-		if (start_command(&p) < 0)
+		if (start_command(&p) < 0) {
+			strbuf_release(&realpath);
 			return error("unable to start editor '%s'", editor);
+		}
 
 		sigchain_push(SIGINT, SIG_IGN);
 		sigchain_push(SIGQUIT, SIG_IGN);
 		ret = finish_command(&p);
+		strbuf_release(&realpath);
 		sig = ret - 128;
 		sigchain_pop(SIGINT);
 		sigchain_pop(SIGQUIT);
diff --git a/entry.c b/entry.c
index 53380bb614..044e8ec92c 100644
--- a/entry.c
+++ b/entry.c
@@ -6,6 +6,8 @@
 #include "submodule.h"
 #include "progress.h"
 #include "fsmonitor.h"
+#include "entry.h"
+#include "parallel-checkout.h"
 
 static void create_directories(const char *path, int path_len,
 			       const struct checkout *state)
@@ -56,12 +58,9 @@ static void remove_subtree(struct strbuf *path)
 
 	if (!dir)
 		die_errno("cannot opendir '%s'", path->buf);
-	while ((de = readdir(dir)) != NULL) {
+	while ((de = readdir_skip_dot_and_dotdot(dir)) != NULL) {
 		struct stat st;
 
-		if (is_dot_or_dotdot(de->d_name))
-			continue;
-
 		strbuf_addch(path, '/');
 		strbuf_addstr(path, de->d_name);
 		if (lstat(path->buf, &st))
@@ -83,7 +82,7 @@ static int create_file(const char *path, unsigned int mode)
 	return open(path, O_WRONLY | O_CREAT | O_EXCL, mode);
 }
 
-static void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
+void *read_blob_entry(const struct cache_entry *ce, unsigned long *size)
 {
 	enum object_type type;
 	void *blob_data = read_object_file(&ce->oid, &type, size);
@@ -108,13 +107,12 @@ static int open_output_fd(char *path, const struct cache_entry *ce, int to_tempf
 	}
 }
 
-static int fstat_output(int fd, const struct checkout *state, struct stat *st)
+int fstat_checkout_output(int fd, const struct checkout *state, struct stat *st)
 {
 	/* use fstat() only when path == ce->name */
 	if (fstat_is_reliable() &&
 	    state->refresh_cache && !state->base_dir_len) {
-		fstat(fd, st);
-		return 1;
+		return !fstat(fd, st);
 	}
 	return 0;
 }
@@ -132,7 +130,7 @@ static int streaming_write_entry(const struct cache_entry *ce, char *path,
 		return -1;
 
 	result |= stream_blob_to_fd(fd, &ce->oid, filter, 1);
-	*fstat_done = fstat_output(fd, state, statbuf);
+	*fstat_done = fstat_checkout_output(fd, state, statbuf);
 	result |= close(fd);
 
 	if (result)
@@ -145,8 +143,8 @@ void enable_delayed_checkout(struct checkout *state)
 	if (!state->delayed_checkout) {
 		state->delayed_checkout = xmalloc(sizeof(*state->delayed_checkout));
 		state->delayed_checkout->state = CE_CAN_DELAY;
-		string_list_init(&state->delayed_checkout->filters, 0);
-		string_list_init(&state->delayed_checkout->paths, 0);
+		string_list_init_nodup(&state->delayed_checkout->filters);
+		string_list_init_nodup(&state->delayed_checkout->paths);
 	}
 }
 
@@ -161,7 +159,8 @@ 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;
@@ -175,7 +174,9 @@ int finish_delayed_checkout(struct checkout *state, int *nr_checkouts)
 
 	dco->state = CE_RETRY;
 	delayed_object_count = dco->paths.nr;
-	progress = start_delayed_progress(_("Filtering content"), delayed_object_count);
+	progress = show_progress
+		? start_delayed_progress(_("Filtering content"), delayed_object_count)
+		: NULL;
 	while (dco->filters.nr > 0) {
 		for_each_string_list_item(filter, &dco->filters) {
 			struct string_list available_paths = STRING_LIST_INIT_NODUP;
@@ -251,8 +252,21 @@ int finish_delayed_checkout(struct checkout *state, int *nr_checkouts)
 	return errs;
 }
 
-static int write_entry(struct cache_entry *ce,
-		       char *path, const struct checkout *state, int to_tempfile)
+void update_ce_after_write(const struct checkout *state, struct cache_entry *ce,
+			   struct stat *st)
+{
+	if (state->refresh_cache) {
+		assert(state->istate);
+		fill_stat_cache_info(state->istate, ce, st);
+		ce->ce_flags |= CE_UPDATE_IN_BASE;
+		mark_fsmonitor_invalid(state->istate, ce);
+		state->istate->cache_changed |= CE_ENTRY_CHANGED;
+	}
+}
+
+/* Note: ca is used (and required) iff the entry refers to a regular file. */
+static int write_entry(struct cache_entry *ce, char *path, struct conv_attrs *ca,
+		       const struct checkout *state, int to_tempfile)
 {
 	unsigned int ce_mode_s_ifmt = ce->ce_mode & S_IFMT;
 	struct delayed_checkout *dco = state->delayed_checkout;
@@ -264,10 +278,12 @@ static int write_entry(struct cache_entry *ce,
 	size_t newsize = 0;
 	struct stat st;
 	const struct submodule *sub;
+	struct checkout_metadata meta;
+
+	clone_checkout_metadata(&meta, &state->meta, &ce->oid);
 
 	if (ce_mode_s_ifmt == S_IFREG) {
-		struct stream_filter *filter = get_stream_filter(state->istate, ce->name,
-								 &ce->oid);
+		struct stream_filter *filter = get_stream_filter_ca(ca, &ce->oid);
 		if (filter &&
 		    !streaming_write_entry(ce, path, filter,
 					   state, to_tempfile,
@@ -280,7 +296,7 @@ static int write_entry(struct cache_entry *ce,
 		new_blob = read_blob_entry(ce, &size);
 		if (!new_blob)
 			return error("unable to read sha1 file of %s (%s)",
-				     path, oid_to_hex(&ce->oid));
+				     ce->name, oid_to_hex(&ce->oid));
 
 		/*
 		 * We can't make a real symlink; write out a regular file entry
@@ -307,21 +323,24 @@ static int write_entry(struct cache_entry *ce,
 			new_blob = read_blob_entry(ce, &size);
 			if (!new_blob)
 				return error("unable to read sha1 file of %s (%s)",
-					     path, oid_to_hex(&ce->oid));
+					     ce->name, oid_to_hex(&ce->oid));
 		}
 
 		/*
 		 * Convert from git internal format to working tree format
 		 */
 		if (dco && dco->state != CE_NO_DELAY) {
-			ret = async_convert_to_working_tree(state->istate, ce->name, new_blob,
-							    size, &buf, dco);
+			ret = async_convert_to_working_tree_ca(ca, ce->name,
+							       new_blob, size,
+							       &buf, &meta, dco);
 			if (ret && string_list_has_string(&dco->paths, ce->name)) {
 				free(new_blob);
 				goto delayed;
 			}
-		} else
-			ret = convert_to_working_tree(state->istate, ce->name, new_blob, size, &buf);
+		} else {
+			ret = convert_to_working_tree_ca(ca, ce->name, new_blob,
+							 size, &buf, &meta);
+		}
 
 		if (ret) {
 			free(new_blob);
@@ -343,7 +362,7 @@ static int write_entry(struct cache_entry *ce,
 
 		wrote = write_in_full(fd, new_blob, size);
 		if (!to_tempfile)
-			fstat_done = fstat_output(fd, state, &st);
+			fstat_done = fstat_checkout_output(fd, state, &st);
 		close(fd);
 		free(new_blob);
 		if (wrote < 0)
@@ -352,7 +371,7 @@ static int write_entry(struct cache_entry *ce,
 
 	case S_IFGITLINK:
 		if (to_tempfile)
-			return error("cannot create temporary submodule %s", path);
+			return error("cannot create temporary submodule %s", ce->name);
 		if (mkdir(path, 0777) < 0)
 			return error("cannot create submodule directory %s", path);
 		sub = submodule_from_ce(ce);
@@ -363,20 +382,15 @@ static int write_entry(struct cache_entry *ce,
 		break;
 
 	default:
-		return error("unknown file mode for %s in index", path);
+		return error("unknown file mode for %s in index", ce->name);
 	}
 
 finish:
 	if (state->refresh_cache) {
-		assert(state->istate);
-		if (!fstat_done)
-			if (lstat(ce->name, &st) < 0)
-				return error_errno("unable to stat just-written file %s",
-						   ce->name);
-		fill_stat_cache_info(state->istate, ce, &st);
-		ce->ce_flags |= CE_UPDATE_IN_BASE;
-		mark_fsmonitor_invalid(state->istate, ce);
-		state->istate->cache_changed |= CE_ENTRY_CHANGED;
+		if (!fstat_done && lstat(ce->name, &st) < 0)
+			return error_errno("unable to stat just-written file %s",
+					   ce->name);
+		update_ce_after_write(state, ce , &st);
 	}
 delayed:
 	return 0;
@@ -410,11 +424,22 @@ static void mark_colliding_entries(const struct checkout *state,
 
 	ce->ce_flags |= CE_MATCHED;
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(state->istate);
 	for (i = 0; i < state->istate->cache_nr; i++) {
 		struct cache_entry *dup = state->istate->cache[i];
 
-		if (dup == ce)
-			break;
+		if (dup == ce) {
+			/*
+			 * Parallel checkout doesn't create the files in index
+			 * order. So the other side of the collision may appear
+			 * after the given cache_entry in the array.
+			 */
+			if (parallel_checkout_status() == PC_RUNNING)
+				continue;
+			else
+				break;
+		}
 
 		if (dup->ce_flags & (CE_MATCHED | CE_VALID | CE_SKIP_WORKTREE))
 			continue;
@@ -427,19 +452,13 @@ static void mark_colliding_entries(const struct checkout *state,
 	}
 }
 
-/*
- * Write the contents from ce out to the working tree.
- *
- * When topath[] is not NULL, instead of writing to the working tree
- * file named by ce, a temporary file is created by this function and
- * its name is returned in topath[], which must be able to hold at
- * least TEMPORARY_FILENAME_LENGTH bytes long.
- */
-int checkout_entry(struct cache_entry *ce, const struct checkout *state,
-		   char *topath, int *nr_checkouts)
+int checkout_entry_ca(struct cache_entry *ce, struct conv_attrs *ca,
+		      const struct checkout *state, char *topath,
+		      int *nr_checkouts)
 {
 	static struct strbuf path = STRBUF_INIT;
 	struct stat st;
+	struct conv_attrs ca_buf;
 
 	if (ce->ce_flags & CE_WT_REMOVE) {
 		if (topath)
@@ -452,8 +471,13 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state,
 		return 0;
 	}
 
-	if (topath)
-		return write_entry(ce, topath, state, 1);
+	if (topath) {
+		if (S_ISREG(ce->ce_mode) && !ca) {
+			convert_attrs(state->istate, &ca_buf, ce->name);
+			ca = &ca_buf;
+		}
+		return write_entry(ce, topath, ca, state, 1);
+	}
 
 	strbuf_reset(&path);
 	strbuf_add(&path, state->base_dir, state->base_dir_len);
@@ -508,8 +532,6 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state,
 			/* If it is a gitlink, leave it alone! */
 			if (S_ISGITLINK(ce->ce_mode))
 				return 0;
-			if (!state->force)
-				return error("%s is a directory", path.buf);
 			remove_subtree(&path);
 		} else if (unlink(path.buf))
 			return error_errno("unable to unlink old '%s'", path.buf);
@@ -517,9 +539,19 @@ int checkout_entry(struct cache_entry *ce, const struct checkout *state,
 		return 0;
 
 	create_directories(path.buf, path.len, state);
+
 	if (nr_checkouts)
 		(*nr_checkouts)++;
-	return write_entry(ce, path.buf, state, 0);
+
+	if (S_ISREG(ce->ce_mode) && !ca) {
+		convert_attrs(state->istate, &ca_buf, ce->name);
+		ca = &ca_buf;
+	}
+
+	if (!enqueue_checkout(ce, ca))
+		return 0;
+
+	return write_entry(ce, path.buf, ca, state, 0);
 }
 
 void unlink_entry(const struct cache_entry *ce)
@@ -530,7 +562,7 @@ void unlink_entry(const struct cache_entry *ce)
 		submodule_move_head(ce->name, "HEAD", NULL,
 				    SUBMODULE_MOVE_HEAD_FORCE);
 	}
-	if (!check_leading_path(ce->name, ce_namelen(ce)))
+	if (check_leading_path(ce->name, ce_namelen(ce), 1) >= 0)
 		return;
 	if (remove_or_warn(ce->ce_mode, ce->name))
 		return;
diff --git a/entry.h b/entry.h
new file mode 100644
index 0000000000..7c889e58fd
--- /dev/null
+++ b/entry.h
@@ -0,0 +1,60 @@
+#ifndef ENTRY_H
+#define ENTRY_H
+
+#include "cache.h"
+#include "convert.h"
+
+struct checkout {
+	struct index_state *istate;
+	const char *base_dir;
+	int base_dir_len;
+	struct delayed_checkout *delayed_checkout;
+	struct checkout_metadata meta;
+	unsigned force:1,
+		 quiet:1,
+		 not_new:1,
+		 clone:1,
+		 refresh_cache:1;
+};
+#define CHECKOUT_INIT { NULL, "" }
+
+#define TEMPORARY_FILENAME_LENGTH 25
+/*
+ * Write the contents from ce out to the working tree.
+ *
+ * When topath[] is not NULL, instead of writing to the working tree
+ * file named by ce, a temporary file is created by this function and
+ * its name is returned in topath[], which must be able to hold at
+ * least TEMPORARY_FILENAME_LENGTH bytes long.
+ *
+ * With checkout_entry_ca(), callers can optionally pass a preloaded
+ * conv_attrs struct (to avoid reloading it), when ce refers to a
+ * regular file. If ca is NULL, the attributes will be loaded
+ * internally when (and if) needed.
+ */
+int checkout_entry_ca(struct cache_entry *ce, struct conv_attrs *ca,
+		      const struct checkout *state, char *topath,
+		      int *nr_checkouts);
+static inline int checkout_entry(struct cache_entry *ce,
+				 const struct checkout *state, char *topath,
+				 int *nr_checkouts)
+{
+	return checkout_entry_ca(ce, NULL, state, topath, nr_checkouts);
+}
+
+void enable_delayed_checkout(struct checkout *state);
+int finish_delayed_checkout(struct checkout *state, int *nr_checkouts,
+			    int show_progress);
+
+/*
+ * Unlink the last component and schedule the leading directories for
+ * removal, such that empty directories get removed.
+ */
+void unlink_entry(const struct cache_entry *ce);
+
+void *read_blob_entry(const struct cache_entry *ce, unsigned long *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);
+
+#endif /* ENTRY_H */
diff --git a/environment.c b/environment.c
index efa072680a..d6b22ede7e 100644
--- a/environment.c
+++ b/environment.c
@@ -9,14 +9,16 @@
  */
 #include "cache.h"
 #include "branch.h"
+#include "environment.h"
 #include "repository.h"
 #include "config.h"
 #include "refs.h"
 #include "fmt-merge-msg.h"
 #include "commit.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "object-store.h"
 #include "chdir-notify.h"
+#include "shallow.h"
 
 int trust_executable_bit = 1;
 int trust_ctime = 1;
@@ -34,8 +36,8 @@ int repository_format_precious_objects;
 int repository_format_worktree_config;
 const char *git_commit_encoding;
 const char *git_log_output_encoding;
-const char *apply_default_whitespace;
-const char *apply_default_ignorewhitespace;
+char *apply_default_whitespace;
+char *apply_default_ignorewhitespace;
 const char *git_attributes_file;
 const char *git_hooks_path;
 int zlib_compression_level = Z_BEST_SPEED;
@@ -67,6 +69,7 @@ enum object_creation_mode object_creation_mode = OBJECT_CREATION_MODE;
 char *notes_ref_name;
 int grafts_replace_parents = 1;
 int core_apply_sparse_checkout;
+int core_sparse_checkout_cone;
 int merge_log_config = -1;
 int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */
 unsigned long pack_size_limit_cfg;
@@ -78,7 +81,7 @@ enum log_refs_config log_all_ref_updates = LOG_REFS_UNSET;
 int protect_hfs = PROTECT_HFS_DEFAULT;
 
 #ifndef PROTECT_NTFS_DEFAULT
-#define PROTECT_NTFS_DEFAULT 0
+#define PROTECT_NTFS_DEFAULT 1
 #endif
 int protect_ntfs = PROTECT_NTFS_DEFAULT;
 const char *core_fsmonitor;
@@ -114,6 +117,7 @@ const char * const local_repo_env[] = {
 	ALTERNATE_DB_ENVIRONMENT,
 	CONFIG_ENVIRONMENT,
 	CONFIG_DATA_ENVIRONMENT,
+	CONFIG_COUNT_ENVIRONMENT,
 	DB_ENVIRONMENT,
 	GIT_DIR_ENVIRONMENT,
 	GIT_WORK_TREE_ENVIRONMENT,
@@ -150,19 +154,15 @@ static char *expand_namespace(const char *raw_namespace)
 	return strbuf_detach(&buf, NULL);
 }
 
-/*
- * Wrapper of getenv() that returns a strdup value. This value is kept
- * in argv to be freed later.
- */
-static const char *getenv_safe(struct argv_array *argv, const char *name)
+const char *getenv_safe(struct strvec *argv, const char *name)
 {
 	const char *value = getenv(name);
 
 	if (!value)
 		return NULL;
 
-	argv_array_push(argv, value);
-	return argv->argv[argv->argc - 1];
+	strvec_push(argv, value);
+	return argv->v[argv->nr - 1];
 }
 
 void setup_git_env(const char *git_dir)
@@ -170,7 +170,7 @@ void setup_git_env(const char *git_dir)
 	const char *shallow_file;
 	const char *replace_ref_base;
 	struct set_gitdir_args args = { NULL };
-	struct argv_array to_free = ARGV_ARRAY_INIT;
+	struct strvec to_free = STRVEC_INIT;
 
 	args.commondir = getenv_safe(&to_free, GIT_COMMON_DIR_ENVIRONMENT);
 	args.object_dir = getenv_safe(&to_free, DB_ENVIRONMENT);
@@ -178,7 +178,7 @@ void setup_git_env(const char *git_dir)
 	args.index_file = getenv_safe(&to_free, INDEX_ENVIRONMENT);
 	args.alternate_db = getenv_safe(&to_free, ALTERNATE_DB_ENVIRONMENT);
 	repo_set_gitdir(the_repository, git_dir, &args);
-	argv_array_clear(&to_free);
+	strvec_clear(&to_free);
 
 	if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT))
 		read_replace_refs = 0;
@@ -254,11 +254,15 @@ static int git_work_tree_initialized;
 void set_git_work_tree(const char *new_work_tree)
 {
 	if (git_work_tree_initialized) {
-		new_work_tree = real_path(new_work_tree);
+		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;
@@ -344,11 +348,20 @@ static void update_relative_gitdir(const char *name,
 	free(path);
 }
 
-void set_git_dir(const char *path)
+void set_git_dir(const char *path, int make_realpath)
 {
+	struct strbuf realpath = STRBUF_INIT;
+
+	if (make_realpath) {
+		strbuf_realpath(&realpath, path, 1);
+		path = realpath.buf;
+	}
+
 	set_git_dir_1(path);
 	if (!is_absolute_path(path))
 		chdir_notify_register(NULL, update_relative_gitdir, NULL);
+
+	strbuf_release(&realpath);
 }
 
 const char *get_log_output_encoding(void)
diff --git a/environment.h b/environment.h
new file mode 100644
index 0000000000..d438b5c8f3
--- /dev/null
+++ b/environment.h
@@ -0,0 +1,12 @@
+#ifndef ENVIRONMENT_H
+#define ENVIRONMENT_H
+
+#include "strvec.h"
+
+/*
+ * Wrapper of getenv() that returns a strdup value. This value is kept
+ * in argv to be freed later.
+ */
+const char *getenv_safe(struct strvec *argv, const char *name);
+
+#endif
diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index 52f1178db4..38a47c44db 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -22,29 +22,50 @@
 #define EWAH_MASK(x) ((eword_t)1 << (x % BITS_IN_EWORD))
 #define EWAH_BLOCK(x) (x / BITS_IN_EWORD)
 
-struct bitmap *bitmap_new(void)
+struct bitmap *bitmap_word_alloc(size_t word_alloc)
 {
 	struct bitmap *bitmap = xmalloc(sizeof(struct bitmap));
-	bitmap->words = xcalloc(32, sizeof(eword_t));
-	bitmap->word_alloc = 32;
+	CALLOC_ARRAY(bitmap->words, word_alloc);
+	bitmap->word_alloc = word_alloc;
 	return bitmap;
 }
 
+struct bitmap *bitmap_new(void)
+{
+	return bitmap_word_alloc(32);
+}
+
+struct bitmap *bitmap_dup(const struct bitmap *src)
+{
+	struct bitmap *dst = bitmap_word_alloc(src->word_alloc);
+	COPY_ARRAY(dst->words, src->words, src->word_alloc);
+	return dst;
+}
+
+static void bitmap_grow(struct bitmap *self, size_t word_alloc)
+{
+	size_t old_size = self->word_alloc;
+	ALLOC_GROW(self->words, word_alloc, self->word_alloc);
+	memset(self->words + old_size, 0x0,
+	       (self->word_alloc - old_size) * sizeof(eword_t));
+}
+
 void bitmap_set(struct bitmap *self, size_t pos)
 {
 	size_t block = EWAH_BLOCK(pos);
 
-	if (block >= self->word_alloc) {
-		size_t old_size = self->word_alloc;
-		self->word_alloc = block * 2;
-		REALLOC_ARRAY(self->words, self->word_alloc);
-		memset(self->words + old_size, 0x0,
-			(self->word_alloc - old_size) * sizeof(eword_t));
-	}
-
+	bitmap_grow(self, block + 1);
 	self->words[block] |= EWAH_MASK(pos);
 }
 
+void bitmap_unset(struct bitmap *self, size_t pos)
+{
+	size_t block = EWAH_BLOCK(pos);
+
+	if (block < self->word_alloc)
+		self->words[block] &= ~EWAH_MASK(pos);
+}
+
 int bitmap_get(struct bitmap *self, size_t pos)
 {
 	size_t block = EWAH_BLOCK(pos);
@@ -108,6 +129,15 @@ void bitmap_and_not(struct bitmap *self, struct bitmap *other)
 		self->words[i] &= ~other->words[i];
 }
 
+void bitmap_or(struct bitmap *self, const struct bitmap *other)
+{
+	size_t i;
+
+	bitmap_grow(self, other->word_alloc);
+	for (i = 0; i < other->word_alloc; i++)
+		self->words[i] |= other->words[i];
+}
+
 void bitmap_or_ewah(struct bitmap *self, struct ewah_bitmap *other)
 {
 	size_t original_size = self->word_alloc;
@@ -165,6 +195,27 @@ int bitmap_equals(struct bitmap *self, struct bitmap *other)
 	return 1;
 }
 
+int bitmap_is_subset(struct bitmap *self, struct bitmap *other)
+{
+	size_t common_size, i;
+
+	if (self->word_alloc < other->word_alloc)
+		common_size = self->word_alloc;
+	else {
+		common_size = other->word_alloc;
+		for (i = common_size; i < self->word_alloc; i++) {
+			if (self->words[i])
+				return 1;
+		}
+	}
+
+	for (i = 0; i < common_size; i++) {
+		if (self->words[i] & ~other->words[i])
+			return 1;
+	}
+	return 0;
+}
+
 void bitmap_reset(struct bitmap *bitmap)
 {
 	memset(bitmap->words, 0x0, bitmap->word_alloc * sizeof(eword_t));
diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c
index d59b1afe3d..2a8c7c5c33 100644
--- a/ewah/ewah_bitmap.c
+++ b/ewah/ewah_bitmap.c
@@ -19,6 +19,7 @@
 #include "git-compat-util.h"
 #include "ewok.h"
 #include "ewok_rlw.h"
+#include "cache.h"
 
 static inline size_t min_size(size_t a, size_t b)
 {
@@ -33,20 +34,13 @@ static inline size_t max_size(size_t a, size_t b)
 static inline void buffer_grow(struct ewah_bitmap *self, size_t new_size)
 {
 	size_t rlw_offset = (uint8_t *)self->rlw - (uint8_t *)self->buffer;
-
-	if (self->alloc_size >= new_size)
-		return;
-
-	self->alloc_size = new_size;
-	REALLOC_ARRAY(self->buffer, self->alloc_size);
+	ALLOC_GROW(self->buffer, new_size, self->alloc_size);
 	self->rlw = self->buffer + (rlw_offset / sizeof(eword_t));
 }
 
 static inline void buffer_push(struct ewah_bitmap *self, eword_t value)
 {
-	if (self->buffer_size + 1 >= self->alloc_size)
-		buffer_grow(self, self->buffer_size * 3 / 2);
-
+	buffer_grow(self, self->buffer_size + 1);
 	self->buffer[self->buffer_size++] = value;
 }
 
@@ -137,8 +131,7 @@ void ewah_add_dirty_words(
 
 		rlw_set_literal_words(self->rlw, literals + can_add);
 
-		if (self->buffer_size + can_add >= self->alloc_size)
-			buffer_grow(self, (self->buffer_size + can_add) * 3 / 2);
+		buffer_grow(self, self->buffer_size + can_add);
 
 		if (negate) {
 			size_t i;
diff --git a/ewah/ewok.h b/ewah/ewok.h
index 84b2a29faa..66920965da 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -172,12 +172,15 @@ struct bitmap {
 };
 
 struct bitmap *bitmap_new(void);
+struct bitmap *bitmap_word_alloc(size_t word_alloc);
+struct bitmap *bitmap_dup(const struct bitmap *src);
 void bitmap_set(struct bitmap *self, size_t pos);
+void bitmap_unset(struct bitmap *self, size_t pos);
 int bitmap_get(struct bitmap *self, size_t pos);
 void bitmap_reset(struct bitmap *self);
 void bitmap_free(struct bitmap *self);
 int bitmap_equals(struct bitmap *self, struct bitmap *other);
-int bitmap_is_subset(struct bitmap *self, struct bitmap *super);
+int bitmap_is_subset(struct bitmap *self, struct bitmap *other);
 
 struct ewah_bitmap * bitmap_to_ewah(struct bitmap *bitmap);
 struct bitmap *ewah_to_bitmap(struct ewah_bitmap *ewah);
diff --git a/exec-cmd.c b/exec-cmd.c
index 7deeab3039..eeb2ee52b8 100644
--- a/exec-cmd.c
+++ b/exec-cmd.c
@@ -1,7 +1,7 @@
 #include "cache.h"
 #include "exec-cmd.h"
 #include "quote.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 #if defined(RUNTIME_PREFIX)
 
@@ -320,26 +320,26 @@ void setup_path(void)
 	strbuf_release(&new_path);
 }
 
-const char **prepare_git_cmd(struct argv_array *out, const char **argv)
+const char **prepare_git_cmd(struct strvec *out, const char **argv)
 {
-	argv_array_push(out, "git");
-	argv_array_pushv(out, argv);
-	return out->argv;
+	strvec_push(out, "git");
+	strvec_pushv(out, argv);
+	return out->v;
 }
 
 int execv_git_cmd(const char **argv)
 {
-	struct argv_array nargv = ARGV_ARRAY_INIT;
+	struct strvec nargv = STRVEC_INIT;
 
 	prepare_git_cmd(&nargv, argv);
-	trace_argv_printf(nargv.argv, "trace: exec:");
+	trace_argv_printf(nargv.v, "trace: exec:");
 
 	/* execvp() can only ever return if it fails */
-	sane_execvp("git", (char **)nargv.argv);
+	sane_execvp("git", (char **)nargv.v);
 
 	trace_printf("trace: exec failed: %s\n", strerror(errno));
 
-	argv_array_clear(&nargv);
+	strvec_clear(&nargv);
 	return -1;
 }
 
diff --git a/exec-cmd.h b/exec-cmd.h
index 8cd1df28d3..330b41d54d 100644
--- a/exec-cmd.h
+++ b/exec-cmd.h
@@ -1,13 +1,13 @@
 #ifndef GIT_EXEC_CMD_H
 #define GIT_EXEC_CMD_H
 
-struct argv_array;
+struct strvec;
 
 void git_set_exec_path(const char *exec_path);
 void git_resolve_executable_dir(const char *path);
 const char *git_exec_path(void);
 void setup_path(void);
-const char **prepare_git_cmd(struct argv_array *out, const char **argv);
+const char **prepare_git_cmd(struct strvec *out, const char **argv);
 int execv_git_cmd(const char **argv); /* NULL terminated */
 LAST_ARG_MUST_BE_NULL
 int execl_git_cmd(const char *cmd, ...);
diff --git a/fetch-negotiator.c b/fetch-negotiator.c
index 0a1357dc9d..57ed5784e1 100644
--- a/fetch-negotiator.c
+++ b/fetch-negotiator.c
@@ -2,6 +2,7 @@
 #include "fetch-negotiator.h"
 #include "negotiator/default.h"
 #include "negotiator/skipping.h"
+#include "negotiator/noop.h"
 #include "repository.h"
 
 void fetch_negotiator_init(struct repository *r,
@@ -13,6 +14,10 @@ void fetch_negotiator_init(struct repository *r,
 		skipping_negotiator_init(negotiator);
 		return;
 
+	case FETCH_NEGOTIATION_NOOP:
+		noop_negotiator_init(negotiator);
+		return;
+
 	case FETCH_NEGOTIATION_DEFAULT:
 	default:
 		default_negotiator_init(negotiator);
diff --git a/fetch-pack.c b/fetch-pack.c
index f80e2d1149..0bf7ed7e47 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -15,13 +15,16 @@
 #include "connect.h"
 #include "transport.h"
 #include "version.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "oidset.h"
 #include "packfile.h"
 #include "object-store.h"
 #include "connected.h"
 #include "fetch-negotiator.h"
 #include "fsck.h"
+#include "shallow.h"
+#include "commit-reach.h"
+#include "commit-graph.h"
 
 static int transfer_unpack_limit = -1;
 static int fetch_unpack_limit = -1;
@@ -34,13 +37,18 @@ static int fetch_fsck_objects = -1;
 static int transfer_fsck_objects = -1;
 static int agent_supported;
 static int server_supports_filtering;
-static struct lock_file shallow_lock;
+static int advertise_sid;
+static struct shallow_lock shallow_lock;
 static const char *alternate_shallow_file;
+static struct fsck_options fsck_options = FSCK_OPTIONS_MISSING_GITMODULES;
 static struct strbuf fsck_msg_types = STRBUF_INIT;
+static struct string_list uri_protocols = STRING_LIST_INIT_DUP;
 
 /* Remember to update object flag allocation in object.h */
 #define COMPLETE	(1U << 0)
 #define ALTERNATE	(1U << 1)
+#define COMMON		(1U << 6)
+#define REACH_SCRATCH	(1U << 7)
 
 /*
  * After sending this many "have"s if we do not get any new ACK , we
@@ -106,24 +114,54 @@ static void for_each_cached_alternate(struct fetch_negotiator *negotiator,
 		cb(negotiator, cache.items[i]);
 }
 
+static struct commit *deref_without_lazy_fetch(const struct object_id *oid,
+					       int mark_tags_complete)
+{
+	enum object_type type;
+	struct object_info info = { .typep = &type };
+
+	while (1) {
+		if (oid_object_info_extended(the_repository, oid, &info,
+					     OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK))
+			return NULL;
+		if (type == OBJ_TAG) {
+			struct tag *tag = (struct tag *)
+				parse_object(the_repository, oid);
+
+			if (!tag->tagged)
+				return NULL;
+			if (mark_tags_complete)
+				tag->object.flags |= COMPLETE;
+			oid = &tag->tagged->oid;
+		} else {
+			break;
+		}
+	}
+
+	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;
+}
+
 static int rev_list_insert_ref(struct fetch_negotiator *negotiator,
-			       const char *refname,
 			       const struct object_id *oid)
 {
-	struct object *o = deref_tag(the_repository,
-				     parse_object(the_repository, oid),
-				     refname, 0);
-
-	if (o && o->type == OBJ_COMMIT)
-		negotiator->add_tip(negotiator, (struct commit *)o);
+	struct commit *c = deref_without_lazy_fetch(oid, 0);
 
+	if (c)
+		negotiator->add_tip(negotiator, c);
 	return 0;
 }
 
 static int rev_list_insert_ref_oid(const char *refname, const struct object_id *oid,
 				   int flag, void *cb_data)
 {
-	return rev_list_insert_ref(cb_data, refname, oid);
+	return rev_list_insert_ref(cb_data, oid);
 }
 
 enum ack_type {
@@ -199,7 +237,7 @@ static void send_request(struct fetch_pack_args *args,
 static void insert_one_alternate_object(struct fetch_negotiator *negotiator,
 					struct object *obj)
 {
-	rev_list_insert_ref(negotiator, NULL, &obj->oid);
+	rev_list_insert_ref(negotiator, &obj->oid);
 }
 
 #define INITIAL_FLUSH 16
@@ -228,13 +266,12 @@ static void mark_tips(struct fetch_negotiator *negotiator,
 	int i;
 
 	if (!negotiation_tips) {
-		for_each_ref(rev_list_insert_ref_oid, negotiator);
+		for_each_rawref(rev_list_insert_ref_oid, negotiator);
 		return;
 	}
 
 	for (i = 0; i < negotiation_tips->nr; i++)
-		rev_list_insert_ref(negotiator, NULL,
-				    &negotiation_tips->oid[i]);
+		rev_list_insert_ref(negotiator, &negotiation_tips->oid[i]);
 	return;
 }
 
@@ -260,10 +297,8 @@ static int find_common(struct fetch_negotiator *negotiator,
 			   PACKET_READ_CHOMP_NEWLINE |
 			   PACKET_READ_DIE_ON_ERR_PACKET);
 
-	if (!args->no_dependents) {
-		mark_tips(negotiator, args->negotiation_tips);
-		for_each_cached_alternate(negotiator, insert_one_alternate_object);
-	}
+	mark_tips(negotiator, args->negotiation_tips);
+	for_each_cached_alternate(negotiator, insert_one_alternate_object);
 
 	fetching = 0;
 	for ( ; refs ; refs = refs->next) {
@@ -280,12 +315,8 @@ static int find_common(struct fetch_negotiator *negotiator,
 		 * We use lookup_object here because we are only
 		 * interested in the case we *know* the object is
 		 * reachable and we have already scanned it.
-		 *
-		 * Do this only if args->no_dependents is false (if it is true,
-		 * we cannot trust the object flags).
 		 */
-		if (!args->no_dependents &&
-		    ((o = lookup_object(the_repository, remote)) != NULL) &&
+		if (((o = lookup_object(the_repository, remote)) != NULL) &&
 				(o->flags & COMPLETE)) {
 			continue;
 		}
@@ -307,6 +338,8 @@ static int find_common(struct fetch_negotiator *negotiator,
 			if (deepen_not_ok)      strbuf_addstr(&c, " deepen-not");
 			if (agent_supported)    strbuf_addf(&c, " agent=%s",
 							    git_user_agent_sanitized());
+			if (advertise_sid)
+				strbuf_addf(&c, " session-id=%s", trace2_session_id());
 			if (args->filter_options.choice)
 				strbuf_addstr(&c, " filter");
 			packet_buf_write(&req_buf, "want %s%s\n", remote_hex, c.buf);
@@ -385,8 +418,6 @@ static int find_common(struct fetch_negotiator *negotiator,
 	trace2_region_enter("fetch-pack", "negotiation_v0_v1", the_repository);
 	flushes = 0;
 	retval = -1;
-	if (args->no_dependents)
-		goto done;
 	while ((oid = negotiator->next(negotiator))) {
 		packet_buf_write(&req_buf, "have %s\n", oid_to_hex(oid));
 		print_verbose(args, "have %s", oid_to_hex(oid));
@@ -501,21 +532,11 @@ static struct commit_list *complete;
 
 static int mark_complete(const struct object_id *oid)
 {
-	struct object *o = parse_object(the_repository, oid);
-
-	while (o && o->type == OBJ_TAG) {
-		struct tag *t = (struct tag *) o;
-		if (!t->tagged)
-			break; /* broken repository */
-		o->flags |= COMPLETE;
-		o = parse_object(the_repository, &t->tagged->oid);
-	}
-	if (o && o->type == OBJ_COMMIT) {
-		struct commit *commit = (struct commit *)o;
-		if (!(commit->object.flags & COMPLETE)) {
-			commit->object.flags |= COMPLETE;
-			commit_list_insert(commit, &complete);
-		}
+	struct commit *commit = deref_without_lazy_fetch(oid, 1);
+
+	if (commit && !(commit->object.flags & COMPLETE)) {
+		commit->object.flags |= COMPLETE;
+		commit_list_insert(commit, &complete);
 	}
 	return 0;
 }
@@ -651,9 +672,7 @@ struct loose_object_iter {
 
 /*
  * Mark recent commits available locally and reachable from a local ref as
- * COMPLETE. If args->no_dependents is false, also mark COMPLETE remote refs as
- * COMMON_REF (otherwise, we are not planning to participate in negotiation, and
- * thus do not need COMMON_REF marks).
+ * COMPLETE.
  *
  * The cutoff time for recency is determined by this heuristic: it is the
  * earliest commit time of the objects in refs that are commits and that we know
@@ -669,17 +688,20 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 
 	save_commit_buffer = 0;
 
+	trace2_region_enter("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
 	for (ref = *refs; ref; ref = ref->next) {
 		struct object *o;
 
 		if (!has_object_file_with_flags(&ref->old_oid,
-						OBJECT_INFO_QUICK))
+						OBJECT_INFO_QUICK |
+							OBJECT_INFO_SKIP_FETCH_OBJECT))
 			continue;
 		o = parse_object(the_repository, &ref->old_oid);
 		if (!o)
 			continue;
 
-		/* We already have it -- which may mean that we were
+		/*
+		 * 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).
 		 */
@@ -689,31 +711,36 @@ static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
 				cutoff = commit->date;
 		}
 	}
+	trace2_region_leave("fetch-pack", "parse_remote_refs_and_find_cutoff", NULL);
 
+	/*
+	 * This block marks all local refs as COMPLETE, and then recursively marks all
+	 * parents of those refs as COMPLETE.
+	 */
+	trace2_region_enter("fetch-pack", "mark_complete_local_refs", NULL);
 	if (!args->deepen) {
-		for_each_ref(mark_complete_oid, NULL);
+		for_each_rawref(mark_complete_oid, NULL);
 		for_each_cached_alternate(NULL, mark_alternate_complete);
 		commit_list_sort_by_date(&complete);
 		if (cutoff)
 			mark_recent_complete_commits(args, cutoff);
 	}
+	trace2_region_leave("fetch-pack", "mark_complete_local_refs", NULL);
 
 	/*
 	 * Mark all complete remote refs as common refs.
 	 * Don't mark them common yet; the server has to be told so first.
 	 */
+	trace2_region_enter("fetch-pack", "mark_common_remote_refs", NULL);
 	for (ref = *refs; ref; ref = ref->next) {
-		struct object *o = deref_tag(the_repository,
-					     lookup_object(the_repository,
-					     &ref->old_oid),
-					     NULL, 0);
+		struct commit *c = deref_without_lazy_fetch(&ref->old_oid, 0);
 
-		if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE))
+		if (!c || !(c->object.flags & COMPLETE))
 			continue;
 
-		negotiator->known_common(negotiator,
-					 (struct commit *)o);
+		negotiator->known_common(negotiator, c);
 	}
+	trace2_region_leave("fetch-pack", "mark_common_remote_refs", NULL);
 
 	save_commit_buffer = old_save_commit_buffer;
 }
@@ -756,13 +783,11 @@ static int sideband_demux(int in, int out, void *data)
 	return ret;
 }
 
-static void write_promisor_file(const char *keep_name,
-				struct ref **sought, int nr_sought)
+static void create_promisor_file(const char *keep_name,
+				 struct ref **sought, int nr_sought)
 {
 	struct strbuf promisor_name = STRBUF_INIT;
 	int suffix_stripped;
-	FILE *output;
-	int i;
 
 	strbuf_addstr(&promisor_name, keep_name);
 	suffix_stripped = strbuf_strip_suffix(&promisor_name, ".keep");
@@ -771,18 +796,41 @@ static void write_promisor_file(const char *keep_name,
 		    keep_name);
 	strbuf_addstr(&promisor_name, ".promisor");
 
-	output = xfopen(promisor_name.buf, "w");
-	for (i = 0; i < nr_sought; i++)
-		fprintf(output, "%s %s\n", oid_to_hex(&sought[i]->old_oid),
-			sought[i]->name);
-	fclose(output);
+	write_promisor_file(promisor_name.buf, sought, nr_sought);
 
 	strbuf_release(&promisor_name);
 }
 
+static void parse_gitmodules_oids(int fd, struct oidset *gitmodules_oids)
+{
+	int len = the_hash_algo->hexsz + 1; /* hash + NL */
+
+	do {
+		char hex_hash[GIT_MAX_HEXSZ + 1];
+		int read_len = read_in_full(fd, hex_hash, len);
+		struct object_id oid;
+		const char *end;
+
+		if (!read_len)
+			return;
+		if (read_len != len)
+			die("invalid length read %d", read_len);
+		if (parse_oid_hex(hex_hash, &oid, &end) || *end != '\n')
+			die("invalid hash");
+		oidset_insert(gitmodules_oids, &oid);
+	} while (1);
+}
+
+/*
+ * If packfile URIs were provided, pass a non-NULL pointer to index_pack_args.
+ * The strings to pass as the --index-pack-arg arguments to http-fetch will be
+ * stored there. (It must be freed by the caller.)
+ */
 static int get_pack(struct fetch_pack_args *args,
-		    int xd[2], char **pack_lockfile,
-		    struct ref **sought, int nr_sought)
+		    int xd[2], struct string_list *pack_lockfiles,
+		    struct strvec *index_pack_args,
+		    struct ref **sought, int nr_sought,
+		    struct oidset *gitmodules_oids)
 {
 	struct async demux;
 	int do_keep = args->keep_pack;
@@ -790,6 +838,7 @@ static int get_pack(struct fetch_pack_args *args,
 	struct pack_header header;
 	int pass_header = 0;
 	struct child_process cmd = CHILD_PROCESS_INIT;
+	int fsck_objects = 0;
 	int ret;
 
 	memset(&demux, 0, sizeof(demux));
@@ -808,7 +857,7 @@ static int get_pack(struct fetch_pack_args *args,
 	else
 		demux.out = xd[0];
 
-	if (!args->keep_pack && unpack_limit) {
+	if (!args->keep_pack && unpack_limit && !index_pack_args) {
 
 		if (read_pack_header(demux.out, &header))
 			die(_("protocol error: bad pack header"));
@@ -820,74 +869,101 @@ static int get_pack(struct fetch_pack_args *args,
 	}
 
 	if (alternate_shallow_file) {
-		argv_array_push(&cmd.args, "--shallow-file");
-		argv_array_push(&cmd.args, alternate_shallow_file);
+		strvec_push(&cmd.args, "--shallow-file");
+		strvec_push(&cmd.args, alternate_shallow_file);
 	}
 
-	if (do_keep || args->from_promisor) {
-		if (pack_lockfile)
+	if (fetch_fsck_objects >= 0
+	    ? fetch_fsck_objects
+	    : transfer_fsck_objects >= 0
+	    ? transfer_fsck_objects
+	    : 0)
+		fsck_objects = 1;
+
+	if (do_keep || args->from_promisor || index_pack_args || fsck_objects) {
+		if (pack_lockfiles || fsck_objects)
 			cmd.out = -1;
 		cmd_name = "index-pack";
-		argv_array_push(&cmd.args, cmd_name);
-		argv_array_push(&cmd.args, "--stdin");
+		strvec_push(&cmd.args, cmd_name);
+		strvec_push(&cmd.args, "--stdin");
 		if (!args->quiet && !args->no_progress)
-			argv_array_push(&cmd.args, "-v");
+			strvec_push(&cmd.args, "-v");
 		if (args->use_thin_pack)
-			argv_array_push(&cmd.args, "--fix-thin");
-		if (do_keep && (args->lock_pack || unpack_limit)) {
+			strvec_push(&cmd.args, "--fix-thin");
+		if ((do_keep || index_pack_args) && (args->lock_pack || unpack_limit)) {
 			char hostname[HOST_NAME_MAX + 1];
 			if (xgethostname(hostname, sizeof(hostname)))
 				xsnprintf(hostname, sizeof(hostname), "localhost");
-			argv_array_pushf(&cmd.args,
-					"--keep=fetch-pack %"PRIuMAX " on %s",
-					(uintmax_t)getpid(), hostname);
+			strvec_pushf(&cmd.args,
+				     "--keep=fetch-pack %"PRIuMAX " on %s",
+				     (uintmax_t)getpid(), hostname);
 		}
-		if (args->check_self_contained_and_connected)
-			argv_array_push(&cmd.args, "--check-self-contained-and-connected");
-		/*
-		 * If we're obtaining the filename of a lockfile, we'll use
-		 * that filename to write a .promisor file with more
-		 * information below. If not, we need index-pack to do it for
-		 * us.
-		 */
-		if (!(do_keep && pack_lockfile) && args->from_promisor)
-			argv_array_push(&cmd.args, "--promisor");
+		if (!index_pack_args && args->check_self_contained_and_connected)
+			strvec_push(&cmd.args, "--check-self-contained-and-connected");
+		else
+			/*
+			 * We cannot perform any connectivity checks because
+			 * not all packs have been downloaded; let the caller
+			 * have this responsibility.
+			 */
+			args->check_self_contained_and_connected = 0;
+
+		if (args->from_promisor)
+			/*
+			 * create_promisor_file() may be called afterwards but
+			 * we still need index-pack to know that this is a
+			 * promisor pack. For example, if transfer.fsckobjects
+			 * is true, index-pack needs to know that .gitmodules
+			 * is a promisor object (so that it won't complain if
+			 * it is missing).
+			 */
+			strvec_push(&cmd.args, "--promisor");
 	}
 	else {
 		cmd_name = "unpack-objects";
-		argv_array_push(&cmd.args, cmd_name);
+		strvec_push(&cmd.args, cmd_name);
 		if (args->quiet || args->no_progress)
-			argv_array_push(&cmd.args, "-q");
+			strvec_push(&cmd.args, "-q");
 		args->check_self_contained_and_connected = 0;
 	}
 
 	if (pass_header)
-		argv_array_pushf(&cmd.args, "--pack_header=%"PRIu32",%"PRIu32,
-				 ntohl(header.hdr_version),
+		strvec_pushf(&cmd.args, "--pack_header=%"PRIu32",%"PRIu32,
+			     ntohl(header.hdr_version),
 				 ntohl(header.hdr_entries));
-	if (fetch_fsck_objects >= 0
-	    ? fetch_fsck_objects
-	    : transfer_fsck_objects >= 0
-	    ? transfer_fsck_objects
-	    : 0) {
-		if (args->from_promisor)
+	if (fsck_objects) {
+		if (args->from_promisor || index_pack_args)
 			/*
 			 * We cannot use --strict in index-pack because it
 			 * checks both broken objects and links, but we only
 			 * want to check for broken objects.
 			 */
-			argv_array_push(&cmd.args, "--fsck-objects");
+			strvec_push(&cmd.args, "--fsck-objects");
 		else
-			argv_array_pushf(&cmd.args, "--strict%s",
-					 fsck_msg_types.buf);
+			strvec_pushf(&cmd.args, "--strict%s",
+				     fsck_msg_types.buf);
+	}
+
+	if (index_pack_args) {
+		int i;
+
+		for (i = 0; i < cmd.args.nr; i++)
+			strvec_push(index_pack_args, cmd.args.v[i]);
 	}
 
 	cmd.in = demux.out;
 	cmd.git_cmd = 1;
 	if (start_command(&cmd))
 		die(_("fetch-pack: unable to fork off %s"), cmd_name);
-	if (do_keep && pack_lockfile) {
-		*pack_lockfile = index_pack_lockfile(cmd.out);
+	if (do_keep && (pack_lockfiles || fsck_objects)) {
+		int is_well_formed;
+		char *pack_lockfile = index_pack_lockfile(cmd.out, &is_well_formed);
+
+		if (!is_well_formed)
+			die(_("fetch-pack: invalid index-pack output"));
+		if (pack_lockfile)
+			string_list_append_nodup(pack_lockfiles, pack_lockfile);
+		parse_gitmodules_oids(cmd.out, gitmodules_oids);
 		close(cmd.out);
 	}
 
@@ -909,8 +985,8 @@ static int get_pack(struct fetch_pack_args *args,
 	 * Now that index-pack has succeeded, write the promisor file using the
 	 * obtained .keep filename if necessary
 	 */
-	if (do_keep && pack_lockfile && args->from_promisor)
-		write_promisor_file(*pack_lockfile, sought, nr_sought);
+	if (do_keep && pack_lockfiles && pack_lockfiles->nr && args->from_promisor)
+		create_promisor_file(pack_lockfiles->items[0].string, sought, nr_sought);
 
 	return 0;
 }
@@ -927,15 +1003,18 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
 				 const struct ref *orig_ref,
 				 struct ref **sought, int nr_sought,
 				 struct shallow_info *si,
-				 char **pack_lockfile)
+				 struct string_list *pack_lockfiles)
 {
 	struct repository *r = the_repository;
 	struct ref *ref = copy_ref_list(orig_ref);
 	struct object_id oid;
 	const char *agent_feature;
 	int agent_len;
-	struct fetch_negotiator negotiator;
-	fetch_negotiator_init(r, &negotiator);
+	struct fetch_negotiator negotiator_alloc;
+	struct fetch_negotiator *negotiator;
+
+	negotiator = &negotiator_alloc;
+	fetch_negotiator_init(r, negotiator);
 
 	sort_ref_list(&ref, ref_compare_name);
 	QSORT(sought, nr_sought, cmp_ref_by_name);
@@ -947,6 +1026,9 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
 				      agent_len, agent_feature);
 	}
 
+	if (!server_supports("session-id"))
+		advertise_sid = 0;
+
 	if (server_supports("shallow"))
 		print_verbose(args, _("Server supports %s"), "shallow");
 	else if (args->depth > 0 || is_repository_shallow(r))
@@ -1020,18 +1102,16 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
 		print_verbose(args, _("Server supports %s"), "deepen-relative");
 	else if (args->deepen_relative)
 		die(_("Server does not support --deepen"));
+	if (!server_supports_hash(the_hash_algo->name, NULL))
+		die(_("Server does not support this repository's object format"));
 
-	if (!args->no_dependents) {
-		mark_complete_and_common_ref(&negotiator, args, &ref);
-		filter_refs(args, &ref, sought, nr_sought);
-		if (everything_local(args, &ref)) {
-			packet_flush(fd[1]);
-			goto all_done;
-		}
-	} else {
-		filter_refs(args, &ref, sought, nr_sought);
+	mark_complete_and_common_ref(negotiator, args, &ref);
+	filter_refs(args, &ref, sought, nr_sought);
+	if (everything_local(args, &ref)) {
+		packet_flush(fd[1]);
+		goto all_done;
 	}
-	if (find_common(&negotiator, args, fd, &oid, ref) < 0)
+	if (find_common(negotiator, args, fd, &oid, ref) < 0)
 		if (!args->keep_pack)
 			/* When cloning, it is not unusual to have
 			 * no common commit.
@@ -1043,15 +1123,21 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
 	if (args->deepen)
 		setup_alternate_shallow(&shallow_lock, &alternate_shallow_file,
 					NULL);
-	else if (si->nr_ours || si->nr_theirs)
+	else if (si->nr_ours || si->nr_theirs) {
+		if (args->reject_shallow_remote)
+			die(_("source repository is shallow, reject to clone."));
 		alternate_shallow_file = setup_temporary_shallow(si->shallow);
-	else
+	} else
 		alternate_shallow_file = NULL;
-	if (get_pack(args, fd, pack_lockfile, sought, nr_sought))
+	if (get_pack(args, fd, pack_lockfiles, NULL, sought, nr_sought,
+		     &fsck_options.gitmodules_found))
 		die(_("git fetch-pack: fetch failed."));
+	if (fsck_finish(&fsck_options))
+		die("fsck failed");
 
  all_done:
-	negotiator.release(&negotiator);
+	if (negotiator)
+		negotiator->release(negotiator);
 	return ref;
 }
 
@@ -1077,7 +1163,7 @@ static void add_shallow_requests(struct strbuf *req_buf,
 		packet_buf_write(req_buf, "deepen-relative\n");
 }
 
-static void add_wants(int no_dependents, const struct ref *wants, struct strbuf *req_buf)
+static void add_wants(const struct ref *wants, struct strbuf *req_buf)
 {
 	int use_ref_in_want = server_supports_feature("fetch", "ref-in-want", 0);
 
@@ -1094,12 +1180,8 @@ static void add_wants(int no_dependents, const struct ref *wants, struct strbuf
 		 * We use lookup_object here because we are only
 		 * interested in the case we *know* the object is
 		 * reachable and we have already scanned it.
-		 *
-		 * Do this only if args->no_dependents is false (if it is true,
-		 * we cannot trust the object flags).
 		 */
-		if (!no_dependents &&
-		    ((o = lookup_object(the_repository, remote)) != NULL) &&
+		if (((o = lookup_object(the_repository, remote)) != NULL) &&
 		    (o->flags & COMPLETE)) {
 			continue;
 		}
@@ -1124,9 +1206,8 @@ static void add_common(struct strbuf *req_buf, struct oidset *common)
 
 static int add_haves(struct fetch_negotiator *negotiator,
 		     struct strbuf *req_buf,
-		     int *haves_to_send, int *in_vain)
+		     int *haves_to_send)
 {
-	int ret = 0;
 	int haves_added = 0;
 	const struct object_id *oid;
 
@@ -1136,41 +1217,56 @@ static int add_haves(struct fetch_negotiator *negotiator,
 			break;
 	}
 
-	*in_vain += haves_added;
-	if (!haves_added || *in_vain >= MAX_IN_VAIN) {
-		/* Send Done */
-		packet_buf_write(req_buf, "done\n");
-		ret = 1;
-	}
-
 	/* Increase haves to send on next round */
 	*haves_to_send = next_flush(1, *haves_to_send);
 
-	return ret;
+	return haves_added;
+}
+
+static void write_fetch_command_and_capabilities(struct strbuf *req_buf,
+						 const struct string_list *server_options)
+{
+	const char *hash_name;
+
+	if (server_supports_v2("fetch", 1))
+		packet_buf_write(req_buf, "command=fetch");
+	if (server_supports_v2("agent", 0))
+		packet_buf_write(req_buf, "agent=%s", git_user_agent_sanitized());
+	if (advertise_sid && server_supports_v2("session-id", 0))
+		packet_buf_write(req_buf, "session-id=%s", trace2_session_id());
+	if (server_options && server_options->nr &&
+	    server_supports_v2("server-option", 1)) {
+		int i;
+		for (i = 0; i < server_options->nr; i++)
+			packet_buf_write(req_buf, "server-option=%s",
+					 server_options->items[i].string);
+	}
+
+	if (server_feature_v2("object-format", &hash_name)) {
+		int hash_algo = hash_algo_by_name(hash_name);
+		if (hash_algo_by_ptr(the_hash_algo) != hash_algo)
+			die(_("mismatched algorithms: client %s; server %s"),
+			    the_hash_algo->name, hash_name);
+		packet_buf_write(req_buf, "object-format=%s", the_hash_algo->name);
+	} else if (hash_algo_by_ptr(the_hash_algo) != GIT_HASH_SHA1) {
+		die(_("the server does not support algorithm '%s'"),
+		    the_hash_algo->name);
+	}
+	packet_buf_delim(req_buf);
 }
 
 static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
 			      struct fetch_pack_args *args,
 			      const struct ref *wants, struct oidset *common,
 			      int *haves_to_send, int *in_vain,
-			      int sideband_all)
+			      int sideband_all, int seen_ack)
 {
-	int ret = 0;
+	int haves_added;
+	int done_sent = 0;
 	struct strbuf req_buf = STRBUF_INIT;
 
-	if (server_supports_v2("fetch", 1))
-		packet_buf_write(&req_buf, "command=fetch");
-	if (server_supports_v2("agent", 0))
-		packet_buf_write(&req_buf, "agent=%s", git_user_agent_sanitized());
-	if (args->server_options && args->server_options->nr &&
-	    server_supports_v2("server-option", 1)) {
-		int i;
-		for (i = 0; i < args->server_options->nr; i++)
-			packet_buf_write(&req_buf, "server-option=%s",
-					 args->server_options->items[i].string);
-	}
+	write_fetch_command_and_capabilities(&req_buf, args->server_options);
 
-	packet_buf_delim(&req_buf);
 	if (args->use_thin_pack)
 		packet_buf_write(&req_buf, "thin-pack");
 	if (args->no_progress)
@@ -1199,18 +1295,38 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
 		warning("filtering not recognized by server, ignoring");
 	}
 
+	if (server_supports_feature("fetch", "packfile-uris", 0)) {
+		int i;
+		struct strbuf to_send = STRBUF_INIT;
+
+		for (i = 0; i < uri_protocols.nr; i++) {
+			const char *s = uri_protocols.items[i].string;
+
+			if (!strcmp(s, "https") || !strcmp(s, "http")) {
+				if (to_send.len)
+					strbuf_addch(&to_send, ',');
+				strbuf_addstr(&to_send, s);
+			}
+		}
+		if (to_send.len) {
+			packet_buf_write(&req_buf, "packfile-uris %s",
+					 to_send.buf);
+			strbuf_release(&to_send);
+		}
+	}
+
 	/* add wants */
-	add_wants(args->no_dependents, wants, &req_buf);
+	add_wants(wants, &req_buf);
 
-	if (args->no_dependents) {
-		packet_buf_write(&req_buf, "done");
-		ret = 1;
-	} else {
-		/* Add all of the common commits we've found in previous rounds */
-		add_common(&req_buf, common);
+	/* Add all of the common commits we've found in previous rounds */
+	add_common(&req_buf, common);
 
-		/* Add initial haves */
-		ret = add_haves(negotiator, &req_buf, haves_to_send, in_vain);
+	haves_added = add_haves(negotiator, &req_buf, haves_to_send);
+	*in_vain += haves_added;
+	if (!haves_added || (seen_ack && *in_vain >= MAX_IN_VAIN)) {
+		/* Send Done */
+		packet_buf_write(&req_buf, "done\n");
+		done_sent = 1;
 	}
 
 	/* Send request */
@@ -1219,7 +1335,7 @@ static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
 		die_errno(_("unable to write request to remote"));
 
 	strbuf_release(&req_buf);
-	return ret;
+	return done_sent;
 }
 
 /*
@@ -1248,15 +1364,11 @@ static int process_section_header(struct packet_reader *reader,
 	return ret;
 }
 
-static int process_acks(struct fetch_negotiator *negotiator,
-			struct packet_reader *reader,
-			struct oidset *common)
+static int process_ack(struct fetch_negotiator *negotiator,
+		       struct packet_reader *reader,
+		       struct object_id *common_oid,
+		       int *received_ready)
 {
-	/* received */
-	int received_ready = 0;
-	int received_ack = 0;
-
-	process_section_header(reader, "acknowledgments", 0);
 	while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
 		const char *arg;
 
@@ -1264,18 +1376,17 @@ static int process_acks(struct fetch_negotiator *negotiator,
 			continue;
 
 		if (skip_prefix(reader->line, "ACK ", &arg)) {
-			struct object_id oid;
-			if (!get_oid_hex(arg, &oid)) {
+			if (!get_oid_hex(arg, common_oid)) {
 				struct commit *commit;
-				oidset_insert(common, &oid);
-				commit = lookup_commit(the_repository, &oid);
-				negotiator->ack(negotiator, commit);
+				commit = lookup_commit(the_repository, common_oid);
+				if (negotiator)
+					negotiator->ack(negotiator, commit);
 			}
-			continue;
+			return 1;
 		}
 
 		if (!strcmp(reader->line, "ready")) {
-			received_ready = 1;
+			*received_ready = 1;
 			continue;
 		}
 
@@ -1293,13 +1404,12 @@ static int process_acks(struct fetch_negotiator *negotiator,
 	 * sent. Therefore, a DELIM is expected if "ready" is sent, and a FLUSH
 	 * otherwise.
 	 */
-	if (received_ready && reader->status != PACKET_READ_DELIM)
+	if (*received_ready && reader->status != PACKET_READ_DELIM)
 		die(_("expected packfile to be sent after 'ready'"));
-	if (!received_ready && reader->status != PACKET_READ_FLUSH)
+	if (!*received_ready && reader->status != PACKET_READ_FLUSH)
 		die(_("expected no other sections to be sent after no 'ready'"));
 
-	/* return 0 if no common, 1 if there are common, or 2 if ready */
-	return received_ready ? 2 : (received_ack ? 1 : 0);
+	return 0;
 }
 
 static void receive_shallow_info(struct fetch_pack_args *args,
@@ -1360,10 +1470,12 @@ static void receive_shallow_info(struct fetch_pack_args *args,
 		 * rejected (unless --update-shallow is set); do the same.
 		 */
 		prepare_shallow_info(si, shallows);
-		if (si->nr_ours || si->nr_theirs)
+		if (si->nr_ours || si->nr_theirs) {
+			if (args->reject_shallow_remote)
+				die(_("source repository is shallow, reject to clone."));
 			alternate_shallow_file =
 				setup_temporary_shallow(si->shallow);
-		else
+		} else
 			alternate_shallow_file = NULL;
 	} else {
 		alternate_shallow_file = NULL;
@@ -1398,6 +1510,21 @@ static void receive_wanted_refs(struct packet_reader *reader,
 		die(_("error processing wanted refs: %d"), reader->status);
 }
 
+static void receive_packfile_uris(struct packet_reader *reader,
+				  struct string_list *uris)
+{
+	process_section_header(reader, "packfile-uris", 0);
+	while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
+		if (reader->pktlen < the_hash_algo->hexsz ||
+		    reader->line[the_hash_algo->hexsz] != ' ')
+			die("expected '<hash> <uri>', got: %s\n", reader->line);
+
+		string_list_append(uris, reader->line);
+	}
+	if (reader->status != PACKET_READ_DELIM)
+		die("expected DELIM");
+}
+
 enum fetch_state {
 	FETCH_CHECK_LOCAL = 0,
 	FETCH_SEND_REQUEST,
@@ -1406,13 +1533,20 @@ enum fetch_state {
 	FETCH_DONE,
 };
 
+static void do_check_stateless_delimiter(int stateless_rpc,
+					 struct packet_reader *reader)
+{
+	check_stateless_delimiter(stateless_rpc, reader,
+				  _("git fetch-pack: expected response end packet"));
+}
+
 static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 				    int fd[2],
 				    const struct ref *orig_ref,
 				    struct ref **sought, int nr_sought,
 				    struct oid_array *shallows,
 				    struct shallow_info *si,
-				    char **pack_lockfile)
+				    struct string_list *pack_lockfiles)
 {
 	struct repository *r = the_repository;
 	struct ref *ref = copy_ref_list(orig_ref);
@@ -1421,8 +1555,18 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 	struct packet_reader reader;
 	int in_vain = 0, negotiation_started = 0;
 	int haves_to_send = INITIAL_FLUSH;
-	struct fetch_negotiator negotiator;
-	fetch_negotiator_init(r, &negotiator);
+	struct fetch_negotiator negotiator_alloc;
+	struct fetch_negotiator *negotiator;
+	int seen_ack = 0;
+	struct object_id common_oid;
+	int received_ready = 0;
+	struct string_list packfile_uris = STRING_LIST_INIT_DUP;
+	int i;
+	struct strvec index_pack_args = STRVEC_INIT;
+
+	negotiator = &negotiator_alloc;
+	fetch_negotiator_init(r, negotiator);
+
 	packet_reader_init(&reader, fd[0], NULL, 0,
 			   PACKET_READ_CHOMP_NEWLINE |
 			   PACKET_READ_DIE_ON_ERR_PACKET);
@@ -1445,21 +1589,16 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 				args->deepen = 1;
 
 			/* Filter 'ref' by 'sought' and those that aren't local */
-			if (!args->no_dependents) {
-				mark_complete_and_common_ref(&negotiator, args, &ref);
-				filter_refs(args, &ref, sought, nr_sought);
-				if (everything_local(args, &ref))
-					state = FETCH_DONE;
-				else
-					state = FETCH_SEND_REQUEST;
-
-				mark_tips(&negotiator, args->negotiation_tips);
-				for_each_cached_alternate(&negotiator,
-							  insert_one_alternate_object);
-			} else {
-				filter_refs(args, &ref, sought, nr_sought);
+			mark_complete_and_common_ref(negotiator, args, &ref);
+			filter_refs(args, &ref, sought, nr_sought);
+			if (everything_local(args, &ref))
+				state = FETCH_DONE;
+			else
 				state = FETCH_SEND_REQUEST;
-			}
+
+			mark_tips(negotiator, args->negotiation_tips);
+			for_each_cached_alternate(negotiator,
+						  insert_one_alternate_object);
 			break;
 		case FETCH_SEND_REQUEST:
 			if (!negotiation_started) {
@@ -1468,26 +1607,33 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 						    "negotiation_v2",
 						    the_repository);
 			}
-			if (send_fetch_request(&negotiator, fd[1], args, ref,
+			if (send_fetch_request(negotiator, fd[1], args, ref,
 					       &common,
 					       &haves_to_send, &in_vain,
-					       reader.use_sideband))
+					       reader.use_sideband,
+					       seen_ack))
 				state = FETCH_GET_PACK;
 			else
 				state = FETCH_PROCESS_ACKS;
 			break;
 		case FETCH_PROCESS_ACKS:
 			/* Process ACKs/NAKs */
-			switch (process_acks(&negotiator, &reader, &common)) {
-			case 2:
-				state = FETCH_GET_PACK;
-				break;
-			case 1:
+			process_section_header(&reader, "acknowledgments", 0);
+			while (process_ack(negotiator, &reader, &common_oid,
+					   &received_ready)) {
 				in_vain = 0;
-				/* fallthrough */
-			default:
+				seen_ack = 1;
+				oidset_insert(&common, &common_oid);
+			}
+			if (received_ready) {
+				/*
+				 * Don't check for response delimiter; get_pack() will
+				 * read the rest of this response.
+				 */
+				state = FETCH_GET_PACK;
+			} else {
+				do_check_stateless_delimiter(args->stateless_rpc, &reader);
 				state = FETCH_SEND_REQUEST;
-				break;
 			}
 			break;
 		case FETCH_GET_PACK:
@@ -1501,10 +1647,24 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 			if (process_section_header(&reader, "wanted-refs", 1))
 				receive_wanted_refs(&reader, sought, nr_sought);
 
-			/* get the pack */
+			/* get the pack(s) */
+			if (process_section_header(&reader, "packfile-uris", 1))
+				receive_packfile_uris(&reader, &packfile_uris);
 			process_section_header(&reader, "packfile", 0);
-			if (get_pack(args, fd, pack_lockfile, sought, nr_sought))
+
+			/*
+			 * this is the final request we'll make of the server;
+			 * do a half-duplex shutdown to indicate that they can
+			 * hang up as soon as the pack is sent.
+			 */
+			close(fd[1]);
+			fd[1] = -1;
+
+			if (get_pack(args, fd, pack_lockfiles,
+				     packfile_uris.nr ? &index_pack_args : NULL,
+				     sought, nr_sought, &fsck_options.gitmodules_found))
 				die(_("git fetch-pack: fetch failed."));
+			do_check_stateless_delimiter(args->stateless_rpc, &reader);
 
 			state = FETCH_DONE;
 			break;
@@ -1513,7 +1673,65 @@ static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
 		}
 	}
 
-	negotiator.release(&negotiator);
+	for (i = 0; i < packfile_uris.nr; i++) {
+		int j;
+		struct child_process cmd = CHILD_PROCESS_INIT;
+		char packname[GIT_MAX_HEXSZ + 1];
+		const char *uri = packfile_uris.items[i].string +
+			the_hash_algo->hexsz + 1;
+
+		strvec_push(&cmd.args, "http-fetch");
+		strvec_pushf(&cmd.args, "--packfile=%.*s",
+			     (int) the_hash_algo->hexsz,
+			     packfile_uris.items[i].string);
+		for (j = 0; j < index_pack_args.nr; j++)
+			strvec_pushf(&cmd.args, "--index-pack-arg=%s",
+				     index_pack_args.v[j]);
+		strvec_push(&cmd.args, uri);
+		cmd.git_cmd = 1;
+		cmd.no_stdin = 1;
+		cmd.out = -1;
+		if (start_command(&cmd))
+			die("fetch-pack: unable to spawn http-fetch");
+
+		if (read_in_full(cmd.out, packname, 5) < 0 ||
+		    memcmp(packname, "keep\t", 5))
+			die("fetch-pack: expected keep then TAB at start of http-fetch output");
+
+		if (read_in_full(cmd.out, packname,
+				 the_hash_algo->hexsz + 1) < 0 ||
+		    packname[the_hash_algo->hexsz] != '\n')
+			die("fetch-pack: expected hash then LF at end of http-fetch output");
+
+		packname[the_hash_algo->hexsz] = '\0';
+
+		parse_gitmodules_oids(cmd.out, &fsck_options.gitmodules_found);
+
+		close(cmd.out);
+
+		if (finish_command(&cmd))
+			die("fetch-pack: unable to finish http-fetch");
+
+		if (memcmp(packfile_uris.items[i].string, packname,
+			   the_hash_algo->hexsz))
+			die("fetch-pack: pack downloaded from %s does not match expected hash %.*s",
+			    uri, (int) the_hash_algo->hexsz,
+			    packfile_uris.items[i].string);
+
+		string_list_append_nodup(pack_lockfiles,
+					 xstrfmt("%s/pack/pack-%s.keep",
+						 get_object_directory(),
+						 packname));
+	}
+	string_list_clear(&packfile_uris, 0);
+	strvec_clear(&index_pack_args);
+
+	if (fsck_finish(&fsck_options))
+		die("fsck failed");
+
+	if (negotiator)
+		negotiator->release(negotiator);
+
 	oidset_clear(&common);
 	return ref;
 }
@@ -1550,6 +1768,15 @@ static void fetch_pack_config(void)
 	git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta);
 	git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects);
 	git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects);
+	git_config_get_bool("transfer.advertisesid", &advertise_sid);
+	if (!uri_protocols.nr) {
+		char *str;
+
+		if (!git_config_get_string("fetch.uriprotocols", &str) && str) {
+			string_list_split(&uri_protocols, str, ',', -1);
+			free(str);
+		}
+	}
 
 	git_config(fetch_pack_config_cb, NULL);
 }
@@ -1599,9 +1826,9 @@ static void update_shallow(struct fetch_pack_args *args,
 	if (args->deepen && alternate_shallow_file) {
 		if (*alternate_shallow_file == '\0') { /* --unshallow */
 			unlink_or_warn(git_path_shallow(the_repository));
-			rollback_lock_file(&shallow_lock);
+			rollback_shallow_file(the_repository, &shallow_lock);
 		} else
-			commit_lock_file(&shallow_lock);
+			commit_shallow_file(the_repository, &shallow_lock);
 		alternate_shallow_file = NULL;
 		return;
 	}
@@ -1625,7 +1852,7 @@ static void update_shallow(struct fetch_pack_args *args,
 			setup_alternate_shallow(&shallow_lock,
 						&alternate_shallow_file,
 						&extra);
-			commit_lock_file(&shallow_lock);
+			commit_shallow_file(the_repository, &shallow_lock);
 			alternate_shallow_file = NULL;
 		}
 		oid_array_clear(&extra);
@@ -1663,7 +1890,7 @@ static void update_shallow(struct fetch_pack_args *args,
 		setup_alternate_shallow(&shallow_lock,
 					&alternate_shallow_file,
 					&extra);
-		commit_lock_file(&shallow_lock);
+		commit_shallow_file(the_repository, &shallow_lock);
 		oid_array_clear(&extra);
 		oid_array_clear(&ref);
 		alternate_shallow_file = NULL;
@@ -1674,7 +1901,7 @@ static void update_shallow(struct fetch_pack_args *args,
 	 * remote is also shallow, check what ref is safe to update
 	 * without updating .git/shallow
 	 */
-	status = xcalloc(nr_sought, sizeof(*status));
+	CALLOC_ARRAY(status, nr_sought);
 	assign_shallow_commits_to_refs(si, NULL, status);
 	if (si->nr_ours || si->nr_theirs) {
 		for (i = 0; i < nr_sought; i++)
@@ -1702,7 +1929,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
 		       const struct ref *ref,
 		       struct ref **sought, int nr_sought,
 		       struct oid_array *shallow,
-		       char **pack_lockfile,
+		       struct string_list *pack_lockfiles,
 		       enum protocol_version version)
 {
 	struct ref *ref_cpy;
@@ -1713,20 +1940,6 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
 	if (nr_sought)
 		nr_sought = remove_duplicates_in_refs(sought, nr_sought);
 
-	if (args->no_dependents && !args->filter_options.choice) {
-		/*
-		 * The protocol does not support requesting that only the
-		 * wanted objects be sent, so approximate this by setting a
-		 * "blob:none" filter if no filter is already set. This works
-		 * for all object types: note that wanted blobs will still be
-		 * sent because they are directly specified as a "want".
-		 *
-		 * NEEDSWORK: Add an option in the protocol to request that
-		 * only the wanted objects be sent, and implement it.
-		 */
-		parse_list_objects_filter(&args->filter_options, "blob:none");
-	}
-
 	if (version != protocol_v2 && !ref) {
 		packet_flush(fd[1]);
 		die(_("no matching remote head"));
@@ -1737,11 +1950,11 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
 		memset(&si, 0, sizeof(si));
 		ref_cpy = do_fetch_pack_v2(args, fd, ref, sought, nr_sought,
 					   &shallows_scratch, &si,
-					   pack_lockfile);
+					   pack_lockfiles);
 	} else {
 		prepare_shallow_info(&si, shallow);
 		ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought,
-					&si, pack_lockfile);
+					&si, pack_lockfiles);
 	}
 	reprepare_packed_git(the_repository);
 
@@ -1755,7 +1968,7 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
 			error(_("remote did not send all necessary objects"));
 			free_refs(ref_cpy);
 			ref_cpy = NULL;
-			rollback_lock_file(&shallow_lock);
+			rollback_shallow_file(the_repository, &shallow_lock);
 			goto cleanup;
 		}
 		args->connectivity_checked = 1;
@@ -1768,6 +1981,105 @@ cleanup:
 	return ref_cpy;
 }
 
+static int add_to_object_array(const struct object_id *oid, void *data)
+{
+	struct object_array *a = data;
+
+	add_object_array(lookup_object(the_repository, oid), "", a);
+	return 0;
+}
+
+static void clear_common_flag(struct oidset *s)
+{
+	struct oidset_iter iter;
+	const struct object_id *oid;
+	oidset_iter_init(s, &iter);
+
+	while ((oid = oidset_iter_next(&iter))) {
+		struct object *obj = lookup_object(the_repository, oid);
+		obj->flags &= ~COMMON;
+	}
+}
+
+void negotiate_using_fetch(const struct oid_array *negotiation_tips,
+			   const struct string_list *server_options,
+			   int stateless_rpc,
+			   int fd[],
+			   struct oidset *acked_commits)
+{
+	struct fetch_negotiator negotiator;
+	struct packet_reader reader;
+	struct object_array nt_object_array = OBJECT_ARRAY_INIT;
+	struct strbuf req_buf = STRBUF_INIT;
+	int haves_to_send = INITIAL_FLUSH;
+	int in_vain = 0;
+	int seen_ack = 0;
+	int last_iteration = 0;
+	timestamp_t min_generation = GENERATION_NUMBER_INFINITY;
+
+	fetch_negotiator_init(the_repository, &negotiator);
+	mark_tips(&negotiator, negotiation_tips);
+
+	packet_reader_init(&reader, fd[0], NULL, 0,
+			   PACKET_READ_CHOMP_NEWLINE |
+			   PACKET_READ_DIE_ON_ERR_PACKET);
+
+	oid_array_for_each((struct oid_array *) negotiation_tips,
+			   add_to_object_array,
+			   &nt_object_array);
+
+	while (!last_iteration) {
+		int haves_added;
+		struct object_id common_oid;
+		int received_ready = 0;
+
+		strbuf_reset(&req_buf);
+		write_fetch_command_and_capabilities(&req_buf, server_options);
+
+		packet_buf_write(&req_buf, "wait-for-done");
+
+		haves_added = add_haves(&negotiator, &req_buf, &haves_to_send);
+		in_vain += haves_added;
+		if (!haves_added || (seen_ack && in_vain >= MAX_IN_VAIN))
+			last_iteration = 1;
+
+		/* Send request */
+		packet_buf_flush(&req_buf);
+		if (write_in_full(fd[1], req_buf.buf, req_buf.len) < 0)
+			die_errno(_("unable to write request to remote"));
+
+		/* Process ACKs/NAKs */
+		process_section_header(&reader, "acknowledgments", 0);
+		while (process_ack(&negotiator, &reader, &common_oid,
+				   &received_ready)) {
+			struct commit *commit = lookup_commit(the_repository,
+							      &common_oid);
+			if (commit) {
+				timestamp_t generation;
+
+				parse_commit_or_die(commit);
+				commit->object.flags |= COMMON;
+				generation = commit_graph_generation(commit);
+				if (generation < min_generation)
+					min_generation = generation;
+			}
+			in_vain = 0;
+			seen_ack = 1;
+			oidset_insert(acked_commits, &common_oid);
+		}
+		if (received_ready)
+			die(_("unexpected 'ready' from remote"));
+		else
+			do_check_stateless_delimiter(stateless_rpc, &reader);
+		if (can_all_from_reach_with_flag(&nt_object_array, COMMON,
+						 REACH_SCRATCH, 0,
+						 min_generation))
+			last_iteration = 1;
+	}
+	clear_common_flag(acked_commits);
+	strbuf_release(&req_buf);
+}
+
 int report_unmatched_refs(struct ref **sought, int nr_sought)
 {
 	int i, ret = 0;
diff --git a/fetch-pack.h b/fetch-pack.h
index 67f684229a..7f94a2a583 100644
--- a/fetch-pack.h
+++ b/fetch-pack.h
@@ -5,6 +5,7 @@
 #include "run-command.h"
 #include "protocol.h"
 #include "list-objects-filter-options.h"
+#include "oidset.h"
 
 struct oid_array;
 
@@ -39,22 +40,17 @@ struct fetch_pack_args {
 	unsigned self_contained_and_connected:1;
 	unsigned cloning:1;
 	unsigned update_shallow:1;
+	unsigned reject_shallow_remote:1;
 	unsigned deepen:1;
-	unsigned from_promisor:1;
 
 	/*
-	 * Attempt to fetch only the wanted objects, and not any objects
-	 * referred to by them. Due to protocol limitations, extraneous
-	 * objects may still be included. (When fetching non-blob
-	 * objects, only blobs are excluded; when fetching a blob, the
-	 * blob itself will still be sent. The client does not need to
-	 * know whether a wanted object is a blob or not.)
-	 *
-	 * If 1, fetch_pack() will also not modify any object flags.
-	 * This allows fetch_pack() to safely be called by any function,
-	 * regardless of which object flags it uses (if any).
+	 * Indicate that the remote of this request is a promisor remote. The
+	 * pack received does not need all referred-to objects to be present in
+	 * the local object store, and fetch-pack will store the pack received
+	 * together with a ".promisor" file indicating that the aforementioned
+	 * pack is a promisor pack.
 	 */
-	unsigned no_dependents:1;
+	unsigned from_promisor:1;
 
 	/*
 	 * Because fetch_pack() overwrites the shallow file upon a
@@ -83,10 +79,23 @@ struct ref *fetch_pack(struct fetch_pack_args *args,
 		       struct ref **sought,
 		       int nr_sought,
 		       struct oid_array *shallow,
-		       char **pack_lockfile,
+		       struct string_list *pack_lockfiles,
 		       enum protocol_version version);
 
 /*
+ * Execute the --negotiate-only mode of "git fetch", adding all known common
+ * commits to acked_commits.
+ *
+ * In the capability advertisement that has happened prior to invoking this
+ * function, the "wait-for-done" capability must be present.
+ */
+void negotiate_using_fetch(const struct oid_array *negotiation_tips,
+			   const struct string_list *server_options,
+			   int stateless_rpc,
+			   int fd[],
+			   struct oidset *acked_commits);
+
+/*
  * Print an appropriate error message for each sought ref that wasn't
  * matched.  Return 0 if all sought refs were matched, otherwise 1.
  */
diff --git a/fmt-merge-msg.c b/fmt-merge-msg.c
new file mode 100644
index 0000000000..b969dc6ebb
--- /dev/null
+++ b/fmt-merge-msg.c
@@ -0,0 +1,698 @@
+#include "config.h"
+#include "refs.h"
+#include "object-store.h"
+#include "diff.h"
+#include "diff-merges.h"
+#include "revision.h"
+#include "tag.h"
+#include "string-list.h"
+#include "branch.h"
+#include "fmt-merge-msg.h"
+#include "commit-reach.h"
+
+static int use_branch_desc;
+static int suppress_dest_pattern_seen;
+static struct string_list suppress_dest_patterns = STRING_LIST_INIT_DUP;
+
+int fmt_merge_msg_config(const char *key, const char *value, void *cb)
+{
+	if (!strcmp(key, "merge.log") || !strcmp(key, "merge.summary")) {
+		int is_bool;
+		merge_log_config = git_config_bool_or_int(key, value, &is_bool);
+		if (!is_bool && merge_log_config < 0)
+			return error("%s: negative length %s", key, value);
+		if (is_bool && merge_log_config)
+			merge_log_config = DEFAULT_MERGE_LOG_LEN;
+	} else if (!strcmp(key, "merge.branchdesc")) {
+		use_branch_desc = git_config_bool(key, value);
+	} else if (!strcmp(key, "merge.suppressdest")) {
+		if (!value)
+			return config_error_nonbool(key);
+		if (!*value)
+			string_list_clear(&suppress_dest_patterns, 0);
+		else
+			string_list_append(&suppress_dest_patterns, value);
+		suppress_dest_pattern_seen = 1;
+	} else {
+		return git_default_config(key, value, cb);
+	}
+	return 0;
+}
+
+/* merge data per repository where the merged tips came from */
+struct src_data {
+	struct string_list branch, tag, r_branch, generic;
+	int head_status;
+};
+
+struct origin_data {
+	struct object_id oid;
+	unsigned is_local_branch:1;
+};
+
+static void init_src_data(struct src_data *data)
+{
+	data->branch.strdup_strings = 1;
+	data->tag.strdup_strings = 1;
+	data->r_branch.strdup_strings = 1;
+	data->generic.strdup_strings = 1;
+}
+
+static struct string_list srcs = STRING_LIST_INIT_DUP;
+static struct string_list origins = STRING_LIST_INIT_DUP;
+
+struct merge_parents {
+	int alloc, nr;
+	struct merge_parent {
+		struct object_id given;
+		struct object_id commit;
+		unsigned char used;
+	} *item;
+};
+
+/*
+ * I know, I know, this is inefficient, but you won't be pulling and merging
+ * hundreds of heads at a time anyway.
+ */
+static struct merge_parent *find_merge_parent(struct merge_parents *table,
+					      struct object_id *given,
+					      struct object_id *commit)
+{
+	int i;
+	for (i = 0; i < table->nr; i++) {
+		if (given && !oideq(&table->item[i].given, given))
+			continue;
+		if (commit && !oideq(&table->item[i].commit, commit))
+			continue;
+		return &table->item[i];
+	}
+	return NULL;
+}
+
+static void add_merge_parent(struct merge_parents *table,
+			     struct object_id *given,
+			     struct object_id *commit)
+{
+	if (table->nr && find_merge_parent(table, given, commit))
+		return;
+	ALLOC_GROW(table->item, table->nr + 1, table->alloc);
+	oidcpy(&table->item[table->nr].given, given);
+	oidcpy(&table->item[table->nr].commit, commit);
+	table->item[table->nr].used = 0;
+	table->nr++;
+}
+
+static int handle_line(char *line, struct merge_parents *merge_parents)
+{
+	int i, len = strlen(line);
+	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;
+	struct object_id oid;
+	const unsigned hexsz = the_hash_algo->hexsz;
+
+	if (len < hexsz + 3 || line[hexsz] != '\t')
+		return 1;
+
+	if (starts_with(line + hexsz + 1, "not-for-merge"))
+		return 0;
+
+	if (line[hexsz + 1] != '\t')
+		return 2;
+
+	i = get_oid_hex(line, &oid);
+	if (i)
+		return 3;
+
+	if (!find_merge_parent(merge_parents, &oid, NULL))
+		return 0; /* subsumed by other parents */
+
+	CALLOC_ARRAY(origin_data, 1);
+	oidcpy(&origin_data->oid, &oid);
+
+	if (line[len - 1] == '\n')
+		line[len - 1] = 0;
+	line += hexsz + 2;
+
+	/*
+	 * At this point, line points at the beginning of comment e.g.
+	 * "branch 'frotz' of git://that/repository.git".
+	 * Find the repository name and point it with src.
+	 */
+	src = strstr(line, " of ");
+	if (src) {
+		*src = 0;
+		src += 4;
+		pulling_head = 0;
+	} else {
+		src = line;
+		pulling_head = 1;
+	}
+
+	item = unsorted_string_list_lookup(&srcs, src);
+	if (!item) {
+		item = string_list_append(&srcs, src);
+		item->util = xcalloc(1, sizeof(struct src_data));
+		init_src_data(item->util);
+	}
+	src_data = item->util;
+
+	if (pulling_head) {
+		origin = src;
+		src_data->head_status |= 1;
+	} else if (skip_prefix(line, "branch ", &origin)) {
+		origin_data->is_local_branch = 1;
+		string_list_append(&src_data->branch, origin);
+		src_data->head_status |= 2;
+	} else if (skip_prefix(line, "tag ", &tag_name)) {
+		origin = line;
+		string_list_append(&src_data->tag, tag_name);
+		src_data->head_status |= 2;
+	} else if (skip_prefix(line, "remote-tracking branch ", &origin)) {
+		string_list_append(&src_data->r_branch, origin);
+		src_data->head_status |= 2;
+	} else {
+		origin = src;
+		string_list_append(&src_data->generic, line);
+		src_data->head_status |= 2;
+	}
+
+	if (!strcmp(".", src) || !strcmp(src, origin)) {
+		int len = strlen(origin);
+		if (origin[0] == '\'' && origin[len - 1] == '\'')
+			origin = to_free = xmemdupz(origin + 1, len - 2);
+	} else
+		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;
+}
+
+static void print_joined(const char *singular, const char *plural,
+		struct string_list *list, struct strbuf *out)
+{
+	if (list->nr == 0)
+		return;
+	if (list->nr == 1) {
+		strbuf_addf(out, "%s%s", singular, list->items[0].string);
+	} else {
+		int i;
+		strbuf_addstr(out, plural);
+		for (i = 0; i < list->nr - 1; i++)
+			strbuf_addf(out, "%s%s", i > 0 ? ", " : "",
+				    list->items[i].string);
+		strbuf_addf(out, " and %s", list->items[list->nr - 1].string);
+	}
+}
+
+static void add_branch_desc(struct strbuf *out, const char *name)
+{
+	struct strbuf desc = STRBUF_INIT;
+
+	if (!read_branch_desc(&desc, name)) {
+		const char *bp = desc.buf;
+		while (*bp) {
+			const char *ep = strchrnul(bp, '\n');
+			if (*ep)
+				ep++;
+			strbuf_addf(out, "  : %.*s", (int)(ep - bp), bp);
+			bp = ep;
+		}
+		strbuf_complete_line(out);
+	}
+	strbuf_release(&desc);
+}
+
+#define util_as_integral(elem) ((intptr_t)((elem)->util))
+
+static void record_person_from_buf(int which, struct string_list *people,
+				   const char *buffer)
+{
+	char *name_buf, *name, *name_end;
+	struct string_list_item *elem;
+	const char *field;
+
+	field = (which == 'a') ? "\nauthor " : "\ncommitter ";
+	name = strstr(buffer, field);
+	if (!name)
+		return;
+	name += strlen(field);
+	name_end = strchrnul(name, '<');
+	if (*name_end)
+		name_end--;
+	while (isspace(*name_end) && name <= name_end)
+		name_end--;
+	if (name_end < name)
+		return;
+	name_buf = xmemdupz(name, name_end - name + 1);
+
+	elem = string_list_lookup(people, name_buf);
+	if (!elem) {
+		elem = string_list_insert(people, name_buf);
+		elem->util = (void *)0;
+	}
+	elem->util = (void*)(util_as_integral(elem) + 1);
+	free(name_buf);
+}
+
+
+static void record_person(int which, struct string_list *people,
+			  struct commit *commit)
+{
+	const char *buffer = get_commit_buffer(commit, NULL);
+	record_person_from_buf(which, people, buffer);
+	unuse_commit_buffer(commit, buffer);
+}
+
+static int cmp_string_list_util_as_integral(const void *a_, const void *b_)
+{
+	const struct string_list_item *a = a_, *b = b_;
+	return util_as_integral(b) - util_as_integral(a);
+}
+
+static void add_people_count(struct strbuf *out, struct string_list *people)
+{
+	if (people->nr == 1)
+		strbuf_addstr(out, people->items[0].string);
+	else if (people->nr == 2)
+		strbuf_addf(out, "%s (%d) and %s (%d)",
+			    people->items[0].string,
+			    (int)util_as_integral(&people->items[0]),
+			    people->items[1].string,
+			    (int)util_as_integral(&people->items[1]));
+	else if (people->nr)
+		strbuf_addf(out, "%s (%d) and others",
+			    people->items[0].string,
+			    (int)util_as_integral(&people->items[0]));
+}
+
+static void credit_people(struct strbuf *out,
+			  struct string_list *them,
+			  int kind)
+{
+	const char *label;
+	const char *me;
+
+	if (kind == 'a') {
+		label = "By";
+		me = git_author_info(IDENT_NO_DATE);
+	} else {
+		label = "Via";
+		me = git_committer_info(IDENT_NO_DATE);
+	}
+
+	if (!them->nr ||
+	    (them->nr == 1 &&
+	     me &&
+	     skip_prefix(me, them->items->string, &me) &&
+	     starts_with(me, " <")))
+		return;
+	strbuf_addf(out, "\n%c %s ", comment_line_char, label);
+	add_people_count(out, them);
+}
+
+static void add_people_info(struct strbuf *out,
+			    struct string_list *authors,
+			    struct string_list *committers)
+{
+	QSORT(authors->items, authors->nr,
+	      cmp_string_list_util_as_integral);
+	QSORT(committers->items, committers->nr,
+	      cmp_string_list_util_as_integral);
+
+	credit_people(out, authors, 'a');
+	credit_people(out, committers, 'c');
+}
+
+static void shortlog(const char *name,
+		     struct origin_data *origin_data,
+		     struct commit *head,
+		     struct rev_info *rev,
+		     struct fmt_merge_msg_opts *opts,
+		     struct strbuf *out)
+{
+	int i, count = 0;
+	struct commit *commit;
+	struct object *branch;
+	struct string_list subjects = STRING_LIST_INIT_DUP;
+	struct string_list authors = STRING_LIST_INIT_DUP;
+	struct string_list committers = STRING_LIST_INIT_DUP;
+	int flags = UNINTERESTING | TREESAME | SEEN | SHOWN | ADDED;
+	struct strbuf sb = STRBUF_INIT;
+	const struct object_id *oid = &origin_data->oid;
+	int limit = opts->shortlog_len;
+
+	branch = deref_tag(the_repository, parse_object(the_repository, oid),
+			   oid_to_hex(oid),
+			   the_hash_algo->hexsz);
+	if (!branch || branch->type != OBJ_COMMIT)
+		return;
+
+	setup_revisions(0, NULL, rev, NULL);
+	add_pending_object(rev, branch, name);
+	add_pending_object(rev, &head->object, "^HEAD");
+	head->object.flags |= UNINTERESTING;
+	if (prepare_revision_walk(rev))
+		die("revision walk setup failed");
+	while ((commit = get_revision(rev)) != NULL) {
+		struct pretty_print_context ctx = {0};
+
+		if (commit->parents && commit->parents->next) {
+			/* do not list a merge but count committer */
+			if (opts->credit_people)
+				record_person('c', &committers, commit);
+			continue;
+		}
+		if (!count && opts->credit_people)
+			/* the 'tip' committer */
+			record_person('c', &committers, commit);
+		if (opts->credit_people)
+			record_person('a', &authors, commit);
+		count++;
+		if (subjects.nr > limit)
+			continue;
+
+		format_commit_message(commit, "%s", &sb, &ctx);
+		strbuf_ltrim(&sb);
+
+		if (!sb.len)
+			string_list_append(&subjects,
+					   oid_to_hex(&commit->object.oid));
+		else
+			string_list_append_nodup(&subjects,
+						 strbuf_detach(&sb, NULL));
+	}
+
+	if (opts->credit_people)
+		add_people_info(out, &authors, &committers);
+	if (count > limit)
+		strbuf_addf(out, "\n* %s: (%d commits)\n", name, count);
+	else
+		strbuf_addf(out, "\n* %s:\n", name);
+
+	if (origin_data->is_local_branch && use_branch_desc)
+		add_branch_desc(out, name);
+
+	for (i = 0; i < subjects.nr; i++)
+		if (i >= limit)
+			strbuf_addstr(out, "  ...\n");
+		else
+			strbuf_addf(out, "  %s\n", subjects.items[i].string);
+
+	clear_commit_marks((struct commit *)branch, flags);
+	clear_commit_marks(head, flags);
+	free_commit_list(rev->commits);
+	rev->commits = NULL;
+	rev->pending.nr = 0;
+
+	string_list_clear(&authors, 0);
+	string_list_clear(&committers, 0);
+	string_list_clear(&subjects, 0);
+}
+
+/*
+ * See if dest_branch matches with any glob pattern on the
+ * suppress_dest_patterns list.
+ *
+ * We may want to also allow negative matches e.g. ":!glob" like we do
+ * for pathspec, but for now, let's keep it simple and stupid.
+ */
+static int dest_suppressed(const char *dest_branch)
+{
+	struct string_list_item *item;
+
+	for_each_string_list_item(item, &suppress_dest_patterns) {
+		if (!wildmatch(item->string, dest_branch, WM_PATHNAME))
+			return 1;
+	}
+	return 0;
+}
+
+static void fmt_merge_msg_title(struct strbuf *out,
+				const char *current_branch)
+{
+	int i = 0;
+	char *sep = "";
+
+	strbuf_addstr(out, "Merge ");
+	for (i = 0; i < srcs.nr; i++) {
+		struct src_data *src_data = srcs.items[i].util;
+		const char *subsep = "";
+
+		strbuf_addstr(out, sep);
+		sep = "; ";
+
+		if (src_data->head_status == 1) {
+			strbuf_addstr(out, srcs.items[i].string);
+			continue;
+		}
+		if (src_data->head_status == 3) {
+			subsep = ", ";
+			strbuf_addstr(out, "HEAD");
+		}
+		if (src_data->branch.nr) {
+			strbuf_addstr(out, subsep);
+			subsep = ", ";
+			print_joined("branch ", "branches ", &src_data->branch,
+					out);
+		}
+		if (src_data->r_branch.nr) {
+			strbuf_addstr(out, subsep);
+			subsep = ", ";
+			print_joined("remote-tracking branch ", "remote-tracking branches ",
+					&src_data->r_branch, out);
+		}
+		if (src_data->tag.nr) {
+			strbuf_addstr(out, subsep);
+			subsep = ", ";
+			print_joined("tag ", "tags ", &src_data->tag, out);
+		}
+		if (src_data->generic.nr) {
+			strbuf_addstr(out, subsep);
+			print_joined("commit ", "commits ", &src_data->generic,
+					out);
+		}
+		if (strcmp(".", srcs.items[i].string))
+			strbuf_addf(out, " of %s", srcs.items[i].string);
+	}
+
+	if (!dest_suppressed(current_branch))
+		strbuf_addf(out, " into %s", current_branch);
+	strbuf_addch(out, '\n');
+}
+
+static void fmt_tag_signature(struct strbuf *tagbuf,
+			      struct strbuf *sig,
+			      const char *buf,
+			      unsigned long len)
+{
+	const char *tag_body = strstr(buf, "\n\n");
+	if (tag_body) {
+		tag_body += 2;
+		strbuf_add(tagbuf, tag_body, buf + len - tag_body);
+	}
+	strbuf_complete_line(tagbuf);
+	if (sig->len) {
+		strbuf_addch(tagbuf, '\n');
+		strbuf_add_commented_lines(tagbuf, sig->buf, sig->len);
+	}
+}
+
+static void fmt_merge_msg_sigs(struct strbuf *out)
+{
+	int i, tag_number = 0, first_tag = 0;
+	struct strbuf tagbuf = STRBUF_INIT;
+
+	for (i = 0; i < origins.nr; i++) {
+		struct object_id *oid = origins.items[i].util;
+		enum object_type type;
+		unsigned long size;
+		char *buf = read_object_file(oid, &type, &size);
+		char *origbuf = buf;
+		unsigned long len = size;
+		struct signature_check sigc = { NULL };
+		struct strbuf payload = STRBUF_INIT, sig = STRBUF_INIT;
+
+		if (!buf || type != OBJ_TAG)
+			goto next;
+
+		if (!parse_signature(buf, size, &payload, &sig))
+			;/* merely annotated */
+		else {
+			buf = payload.buf;
+			len = payload.len;
+			if (check_signature(payload.buf, payload.len, sig.buf,
+					 sig.len, &sigc) &&
+				!sigc.gpg_output)
+				strbuf_addstr(&sig, "gpg verification failed.\n");
+			else
+				strbuf_addstr(&sig, sigc.gpg_output);
+		}
+		signature_check_clear(&sigc);
+
+		if (!tag_number++) {
+			fmt_tag_signature(&tagbuf, &sig, buf, len);
+			first_tag = i;
+		} else {
+			if (tag_number == 2) {
+				struct strbuf tagline = STRBUF_INIT;
+				strbuf_addch(&tagline, '\n');
+				strbuf_add_commented_lines(&tagline,
+						origins.items[first_tag].string,
+						strlen(origins.items[first_tag].string));
+				strbuf_insert(&tagbuf, 0, tagline.buf,
+					      tagline.len);
+				strbuf_release(&tagline);
+			}
+			strbuf_addch(&tagbuf, '\n');
+			strbuf_add_commented_lines(&tagbuf,
+					origins.items[i].string,
+					strlen(origins.items[i].string));
+			fmt_tag_signature(&tagbuf, &sig, buf, len);
+		}
+		strbuf_release(&payload);
+		strbuf_release(&sig);
+	next:
+		free(origbuf);
+	}
+	if (tagbuf.len) {
+		strbuf_addch(out, '\n');
+		strbuf_addbuf(out, &tagbuf);
+	}
+	strbuf_release(&tagbuf);
+}
+
+static void find_merge_parents(struct merge_parents *result,
+			       struct strbuf *in, struct object_id *head)
+{
+	struct commit_list *parents;
+	struct commit *head_commit;
+	int pos = 0, i, j;
+
+	parents = NULL;
+	while (pos < in->len) {
+		int len;
+		char *p = in->buf + pos;
+		char *newline = strchr(p, '\n');
+		const char *q;
+		struct object_id oid;
+		struct commit *parent;
+		struct object *obj;
+
+		len = newline ? newline - p : strlen(p);
+		pos += len + !!newline;
+
+		if (parse_oid_hex(p, &oid, &q) ||
+		    q[0] != '\t' ||
+		    q[1] != '\t')
+			continue; /* skip not-for-merge */
+		/*
+		 * Do not use get_merge_parent() here; we do not have
+		 * "name" here and we do not want to contaminate its
+		 * util field yet.
+		 */
+		obj = parse_object(the_repository, &oid);
+		parent = (struct commit *)peel_to_type(NULL, 0, obj, OBJ_COMMIT);
+		if (!parent)
+			continue;
+		commit_list_insert(parent, &parents);
+		add_merge_parent(result, &obj->oid, &parent->object.oid);
+	}
+	head_commit = lookup_commit(the_repository, head);
+	if (head_commit)
+		commit_list_insert(head_commit, &parents);
+	reduce_heads_replace(&parents);
+
+	while (parents) {
+		struct commit *cmit = pop_commit(&parents);
+		for (i = 0; i < result->nr; i++)
+			if (oideq(&result->item[i].commit, &cmit->object.oid))
+				result->item[i].used = 1;
+	}
+
+	for (i = j = 0; i < result->nr; i++) {
+		if (result->item[i].used) {
+			if (i != j)
+				result->item[j] = result->item[i];
+			j++;
+		}
+	}
+	result->nr = j;
+}
+
+
+int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
+		  struct fmt_merge_msg_opts *opts)
+{
+	int i = 0, pos = 0;
+	struct object_id head_oid;
+	const char *current_branch;
+	void *current_branch_to_free;
+	struct merge_parents merge_parents;
+
+	if (!suppress_dest_pattern_seen) {
+		string_list_append(&suppress_dest_patterns, "main");
+		string_list_append(&suppress_dest_patterns, "master");
+	}
+
+	memset(&merge_parents, 0, sizeof(merge_parents));
+
+	/* get current branch */
+	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/"))
+		current_branch += 11;
+
+	find_merge_parents(&merge_parents, in, &head_oid);
+
+	/* get a line */
+	while (pos < in->len) {
+		int len;
+		char *newline, *p = in->buf + pos;
+
+		newline = strchr(p, '\n');
+		len = newline ? newline - p : strlen(p);
+		pos += len + !!newline;
+		i++;
+		p[len] = 0;
+		if (handle_line(p, &merge_parents))
+			die("error in line %d: %.*s", i, len, p);
+	}
+
+	if (opts->add_title && srcs.nr)
+		fmt_merge_msg_title(out, current_branch);
+
+	if (origins.nr)
+		fmt_merge_msg_sigs(out);
+
+	if (opts->shortlog_len) {
+		struct commit *head;
+		struct rev_info rev;
+
+		head = lookup_commit_or_die(&head_oid, "HEAD");
+		repo_init_revisions(the_repository, &rev, NULL);
+		rev.commit_format = CMIT_FMT_ONELINE;
+		diff_merges_suppress(&rev);
+		rev.limited = 1;
+
+		strbuf_complete_line(out);
+
+		for (i = 0; i < origins.nr; i++)
+			shortlog(origins.items[i].string,
+				 origins.items[i].util,
+				 head, &rev, opts, out);
+	}
+
+	strbuf_complete_line(out);
+	free(current_branch_to_free);
+	free(merge_parents.item);
+	return 0;
+}
diff --git a/fmt-merge-msg.h b/fmt-merge-msg.h
index 01e3aa88c5..f2ab0e0085 100644
--- a/fmt-merge-msg.h
+++ b/fmt-merge-msg.h
@@ -1,7 +1,20 @@
 #ifndef FMT_MERGE_MSG_H
 #define FMT_MERGE_MSG_H
 
+#include "strbuf.h"
+
+#define DEFAULT_MERGE_LOG_LEN 20
+
+struct fmt_merge_msg_opts {
+	unsigned add_title:1,
+		credit_people:1;
+	int shortlog_len;
+};
+
 extern int merge_log_config;
 int fmt_merge_msg_config(const char *key, const char *value, void *cb);
+int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
+		  struct fmt_merge_msg_opts *);
+
 
 #endif /* FMT_MERGE_MSG_H */
diff --git a/fsck.c b/fsck.c
index cdb7d8db03..3ec500d707 100644
--- a/fsck.c
+++ b/fsck.c
@@ -9,99 +9,29 @@
 #include "tag.h"
 #include "fsck.h"
 #include "refs.h"
+#include "url.h"
 #include "utf8.h"
 #include "decorate.h"
 #include "oidset.h"
 #include "packfile.h"
 #include "submodule-config.h"
 #include "config.h"
+#include "credential.h"
 #include "help.h"
 
-static struct oidset gitmodules_found = OIDSET_INIT;
-static struct oidset gitmodules_done = OIDSET_INIT;
-
-#define FSCK_FATAL -1
-#define FSCK_INFO -2
-
-#define FOREACH_MSG_ID(FUNC) \
-	/* fatal errors */ \
-	FUNC(NUL_IN_HEADER, FATAL) \
-	FUNC(UNTERMINATED_HEADER, FATAL) \
-	/* errors */ \
-	FUNC(BAD_DATE, ERROR) \
-	FUNC(BAD_DATE_OVERFLOW, ERROR) \
-	FUNC(BAD_EMAIL, ERROR) \
-	FUNC(BAD_NAME, ERROR) \
-	FUNC(BAD_OBJECT_SHA1, ERROR) \
-	FUNC(BAD_PARENT_SHA1, ERROR) \
-	FUNC(BAD_TAG_OBJECT, ERROR) \
-	FUNC(BAD_TIMEZONE, ERROR) \
-	FUNC(BAD_TREE, ERROR) \
-	FUNC(BAD_TREE_SHA1, ERROR) \
-	FUNC(BAD_TYPE, ERROR) \
-	FUNC(DUPLICATE_ENTRIES, ERROR) \
-	FUNC(MISSING_AUTHOR, ERROR) \
-	FUNC(MISSING_COMMITTER, ERROR) \
-	FUNC(MISSING_EMAIL, ERROR) \
-	FUNC(MISSING_GRAFT, ERROR) \
-	FUNC(MISSING_NAME_BEFORE_EMAIL, ERROR) \
-	FUNC(MISSING_OBJECT, ERROR) \
-	FUNC(MISSING_PARENT, ERROR) \
-	FUNC(MISSING_SPACE_BEFORE_DATE, ERROR) \
-	FUNC(MISSING_SPACE_BEFORE_EMAIL, ERROR) \
-	FUNC(MISSING_TAG, ERROR) \
-	FUNC(MISSING_TAG_ENTRY, ERROR) \
-	FUNC(MISSING_TAG_OBJECT, ERROR) \
-	FUNC(MISSING_TREE, ERROR) \
-	FUNC(MISSING_TREE_OBJECT, ERROR) \
-	FUNC(MISSING_TYPE, ERROR) \
-	FUNC(MISSING_TYPE_ENTRY, ERROR) \
-	FUNC(MULTIPLE_AUTHORS, ERROR) \
-	FUNC(TAG_OBJECT_NOT_TAG, ERROR) \
-	FUNC(TREE_NOT_SORTED, ERROR) \
-	FUNC(UNKNOWN_TYPE, ERROR) \
-	FUNC(ZERO_PADDED_DATE, ERROR) \
-	FUNC(GITMODULES_MISSING, ERROR) \
-	FUNC(GITMODULES_BLOB, ERROR) \
-	FUNC(GITMODULES_LARGE, ERROR) \
-	FUNC(GITMODULES_NAME, ERROR) \
-	FUNC(GITMODULES_SYMLINK, ERROR) \
-	FUNC(GITMODULES_URL, ERROR) \
-	FUNC(GITMODULES_PATH, ERROR) \
-	/* warnings */ \
-	FUNC(BAD_FILEMODE, WARN) \
-	FUNC(EMPTY_NAME, WARN) \
-	FUNC(FULL_PATHNAME, WARN) \
-	FUNC(HAS_DOT, WARN) \
-	FUNC(HAS_DOTDOT, WARN) \
-	FUNC(HAS_DOTGIT, WARN) \
-	FUNC(NULL_SHA1, WARN) \
-	FUNC(ZERO_PADDED_FILEMODE, WARN) \
-	FUNC(NUL_IN_COMMIT, WARN) \
-	/* infos (reported as warnings, but ignored by default) */ \
-	FUNC(GITMODULES_PARSE, INFO) \
-	FUNC(BAD_TAG_NAME, INFO) \
-	FUNC(MISSING_TAGGER_ENTRY, INFO)
-
-#define MSG_ID(id, msg_type) FSCK_MSG_##id,
-enum fsck_msg_id {
-	FOREACH_MSG_ID(MSG_ID)
-	FSCK_MSG_MAX
-};
-#undef MSG_ID
-
 #define STR(x) #x
 #define MSG_ID(id, msg_type) { STR(id), NULL, NULL, FSCK_##msg_type },
 static struct {
 	const char *id_string;
 	const char *downcased;
 	const char *camelcased;
-	int msg_type;
+	enum fsck_msg_type msg_type;
 } msg_id_info[FSCK_MSG_MAX + 1] = {
-	FOREACH_MSG_ID(MSG_ID)
+	FOREACH_FSCK_MSG_ID(MSG_ID)
 	{ NULL, NULL, NULL, -1 }
 };
 #undef MSG_ID
+#undef STR
 
 static void prepare_msg_ids(void)
 {
@@ -163,25 +93,23 @@ void list_config_fsck_msg_ids(struct string_list *list, const char *prefix)
 		list_config_item(list, prefix, msg_id_info[i].camelcased);
 }
 
-static int fsck_msg_type(enum fsck_msg_id msg_id,
+static enum fsck_msg_type fsck_msg_type(enum fsck_msg_id msg_id,
 	struct fsck_options *options)
 {
-	int msg_type;
-
 	assert(msg_id >= 0 && msg_id < FSCK_MSG_MAX);
 
-	if (options->msg_type)
-		msg_type = options->msg_type[msg_id];
-	else {
-		msg_type = msg_id_info[msg_id].msg_type;
+	if (!options->msg_type) {
+		enum fsck_msg_type msg_type = msg_id_info[msg_id].msg_type;
+
 		if (options->strict && msg_type == FSCK_WARN)
 			msg_type = FSCK_ERROR;
+		return msg_type;
 	}
 
-	return msg_type;
+	return options->msg_type[msg_id];
 }
 
-static int parse_msg_type(const char *str)
+static enum fsck_msg_type parse_msg_type(const char *str)
 {
 	if (!strcmp(str, "error"))
 		return FSCK_ERROR;
@@ -201,28 +129,35 @@ int is_valid_msg_type(const char *msg_id, const char *msg_type)
 	return 1;
 }
 
-void fsck_set_msg_type(struct fsck_options *options,
-		const char *msg_id, const char *msg_type)
+void fsck_set_msg_type_from_ids(struct fsck_options *options,
+				enum fsck_msg_id msg_id,
+				enum fsck_msg_type msg_type)
 {
-	int id = parse_msg_id(msg_id), type;
-
-	if (id < 0)
-		die("Unhandled message id: %s", msg_id);
-	type = parse_msg_type(msg_type);
-
-	if (type != FSCK_ERROR && msg_id_info[id].msg_type == FSCK_FATAL)
-		die("Cannot demote %s to %s", msg_id, msg_type);
-
 	if (!options->msg_type) {
 		int i;
-		int *msg_type;
-		ALLOC_ARRAY(msg_type, FSCK_MSG_MAX);
+		enum fsck_msg_type *severity;
+		ALLOC_ARRAY(severity, FSCK_MSG_MAX);
 		for (i = 0; i < FSCK_MSG_MAX; i++)
-			msg_type[i] = fsck_msg_type(i, options);
-		options->msg_type = msg_type;
+			severity[i] = fsck_msg_type(i, options);
+		options->msg_type = severity;
 	}
 
-	options->msg_type[id] = type;
+	options->msg_type[msg_id] = msg_type;
+}
+
+void fsck_set_msg_type(struct fsck_options *options,
+		       const char *msg_id_str, const char *msg_type_str)
+{
+	int msg_id = parse_msg_id(msg_id_str);
+	enum fsck_msg_type msg_type = parse_msg_type(msg_type_str);
+
+	if (msg_id < 0)
+		die("Unhandled message id: %s", msg_id_str);
+
+	if (msg_type != FSCK_ERROR && msg_id_info[msg_id].msg_type == FSCK_FATAL)
+		die("Cannot demote %s to %s", msg_id_str, msg_type_str);
+
+	fsck_set_msg_type_from_ids(options, msg_id, msg_type);
 }
 
 void fsck_set_msg_types(struct fsck_options *options, const char *values)
@@ -263,41 +198,26 @@ void fsck_set_msg_types(struct fsck_options *options, const char *values)
 	free(to_free);
 }
 
-static void append_msg_id(struct strbuf *sb, const char *msg_id)
+static int object_on_skiplist(struct fsck_options *opts,
+			      const struct object_id *oid)
 {
-	for (;;) {
-		char c = *(msg_id)++;
-
-		if (!c)
-			break;
-		if (c != '_')
-			strbuf_addch(sb, tolower(c));
-		else {
-			assert(*msg_id);
-			strbuf_addch(sb, *(msg_id)++);
-		}
-	}
-
-	strbuf_addstr(sb, ": ");
-}
-
-static int object_on_skiplist(struct fsck_options *opts, struct object *obj)
-{
-	return opts && obj && oidset_contains(&opts->skiplist, &obj->oid);
+	return opts && oid && oidset_contains(&opts->skiplist, oid);
 }
 
-__attribute__((format (printf, 4, 5)))
-static int report(struct fsck_options *options, struct object *object,
-	enum fsck_msg_id id, const char *fmt, ...)
+__attribute__((format (printf, 5, 6)))
+static int report(struct fsck_options *options,
+		  const struct object_id *oid, enum object_type object_type,
+		  enum fsck_msg_id msg_id, const char *fmt, ...)
 {
 	va_list ap;
 	struct strbuf sb = STRBUF_INIT;
-	int msg_type = fsck_msg_type(id, options), result;
+	enum fsck_msg_type msg_type = fsck_msg_type(msg_id, options);
+	int result;
 
 	if (msg_type == FSCK_IGNORE)
 		return 0;
 
-	if (object_on_skiplist(options, object))
+	if (object_on_skiplist(options, oid))
 		return 0;
 
 	if (msg_type == FSCK_FATAL)
@@ -305,53 +225,76 @@ static int report(struct fsck_options *options, struct object *object,
 	else if (msg_type == FSCK_INFO)
 		msg_type = FSCK_WARN;
 
-	append_msg_id(&sb, msg_id_info[id].id_string);
+	prepare_msg_ids();
+	strbuf_addf(&sb, "%s: ", msg_id_info[msg_id].camelcased);
 
 	va_start(ap, fmt);
 	strbuf_vaddf(&sb, fmt, ap);
-	result = options->error_func(options, object, msg_type, sb.buf);
+	result = options->error_func(options, oid, object_type,
+				     msg_type, msg_id, sb.buf);
 	strbuf_release(&sb);
 	va_end(ap);
 
 	return result;
 }
 
-static char *get_object_name(struct fsck_options *options, struct object *obj)
+void fsck_enable_object_names(struct fsck_options *options)
 {
 	if (!options->object_names)
+		options->object_names = kh_init_oid_map();
+}
+
+const char *fsck_get_object_name(struct fsck_options *options,
+				 const struct object_id *oid)
+{
+	khiter_t pos;
+	if (!options->object_names)
+		return NULL;
+	pos = kh_get_oid_map(options->object_names, *oid);
+	if (pos >= kh_end(options->object_names))
 		return NULL;
-	return lookup_decoration(options->object_names, obj);
+	return kh_value(options->object_names, pos);
 }
 
-static void put_object_name(struct fsck_options *options, struct object *obj,
-	const char *fmt, ...)
+void fsck_put_object_name(struct fsck_options *options,
+			  const struct object_id *oid,
+			  const char *fmt, ...)
 {
 	va_list ap;
 	struct strbuf buf = STRBUF_INIT;
-	char *existing;
+	khiter_t pos;
+	int hashret;
 
 	if (!options->object_names)
 		return;
-	existing = lookup_decoration(options->object_names, obj);
-	if (existing)
+
+	pos = kh_put_oid_map(options->object_names, *oid, &hashret);
+	if (!hashret)
 		return;
 	va_start(ap, fmt);
 	strbuf_vaddf(&buf, fmt, ap);
-	add_decoration(options->object_names, obj, strbuf_detach(&buf, NULL));
+	kh_value(options->object_names, pos) = strbuf_detach(&buf, NULL);
 	va_end(ap);
 }
 
-static const char *describe_object(struct fsck_options *o, struct object *obj)
+const char *fsck_describe_object(struct fsck_options *options,
+				 const struct object_id *oid)
 {
-	static struct strbuf buf = STRBUF_INIT;
-	char *name;
-
-	strbuf_reset(&buf);
-	strbuf_addstr(&buf, oid_to_hex(&obj->oid));
-	if (o->object_names && (name = lookup_decoration(o->object_names, obj)))
-		strbuf_addf(&buf, " (%s)", name);
+	static struct strbuf bufs[] = {
+		STRBUF_INIT, STRBUF_INIT, STRBUF_INIT, STRBUF_INIT
+	};
+	static int b = 0;
+	struct strbuf *buf;
+	const char *name = fsck_get_object_name(options, oid);
+
+	buf = bufs + b;
+	b = (b + 1) % ARRAY_SIZE(bufs);
+	strbuf_reset(buf);
+	strbuf_addstr(buf, oid_to_hex(oid));
+	if (name)
+		strbuf_addf(buf, " (%s)", name);
 
-	return buf.buf;
+	return buf->buf;
 }
 
 static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *options)
@@ -364,7 +307,7 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
 	if (parse_tree(tree))
 		return -1;
 
-	name = get_object_name(options, &tree->object);
+	name = fsck_get_object_name(options, &tree->object.oid);
 	if (init_tree_desc_gently(&desc, tree->buffer, tree->size))
 		return -1;
 	while (tree_entry_gently(&desc, &entry)) {
@@ -377,20 +320,21 @@ static int fsck_walk_tree(struct tree *tree, void *data, struct fsck_options *op
 		if (S_ISDIR(entry.mode)) {
 			obj = (struct object *)lookup_tree(the_repository, &entry.oid);
 			if (name && obj)
-				put_object_name(options, obj, "%s%s/", name,
-					entry.path);
+				fsck_put_object_name(options, &entry.oid, "%s%s/",
+						     name, entry.path);
 			result = options->walk(obj, OBJ_TREE, data, options);
 		}
 		else if (S_ISREG(entry.mode) || S_ISLNK(entry.mode)) {
 			obj = (struct object *)lookup_blob(the_repository, &entry.oid);
 			if (name && obj)
-				put_object_name(options, obj, "%s%s", name,
-					entry.path);
+				fsck_put_object_name(options, &entry.oid, "%s%s",
+						     name, entry.path);
 			result = options->walk(obj, OBJ_BLOB, data, options);
 		}
 		else {
 			result = error("in tree %s: entry %s has bad mode %.6o",
-					describe_object(options, &tree->object), entry.path, entry.mode);
+				       fsck_describe_object(options, &tree->object.oid),
+				       entry.path, entry.mode);
 		}
 		if (result < 0)
 			return result;
@@ -411,10 +355,10 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
 	if (parse_commit(commit))
 		return -1;
 
-	name = get_object_name(options, &commit->object);
+	name = fsck_get_object_name(options, &commit->object.oid);
 	if (name)
-		put_object_name(options, &get_commit_tree(commit)->object,
-				"%s:", name);
+		fsck_put_object_name(options, get_commit_tree_oid(commit),
+				     "%s:", name);
 
 	result = options->walk((struct object *)get_commit_tree(commit),
 			       OBJ_TREE, data, options);
@@ -437,21 +381,27 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
 				generation += power * (name[--len] - '0');
 			if (power > 1 && len && name[len - 1] == '~')
 				name_prefix_len = len - 1;
+			else {
+				/* Maybe a non-first parent, e.g. HEAD^2 */
+				generation = 0;
+				name_prefix_len = len;
+			}
 		}
 	}
 
 	while (parents) {
 		if (name) {
-			struct object *obj = &parents->item->object;
+			struct object_id *oid = &parents->item->object.oid;
 
 			if (counter++)
-				put_object_name(options, obj, "%s^%d",
-					name, counter);
+				fsck_put_object_name(options, oid, "%s^%d",
+						     name, counter);
 			else if (generation > 0)
-				put_object_name(options, obj, "%.*s~%d",
-					name_prefix_len, name, generation + 1);
+				fsck_put_object_name(options, oid, "%.*s~%d",
+						     name_prefix_len, name,
+						     generation + 1);
 			else
-				put_object_name(options, obj, "%s^", name);
+				fsck_put_object_name(options, oid, "%s^", name);
 		}
 		result = options->walk((struct object *)parents->item, OBJ_COMMIT, data, options);
 		if (result < 0)
@@ -465,12 +415,12 @@ static int fsck_walk_commit(struct commit *commit, void *data, struct fsck_optio
 
 static int fsck_walk_tag(struct tag *tag, void *data, struct fsck_options *options)
 {
-	char *name = get_object_name(options, &tag->object);
+	const char *name = fsck_get_object_name(options, &tag->object.oid);
 
 	if (parse_tag(tag))
 		return -1;
 	if (name)
-		put_object_name(options, tag->tagged, "%s", name);
+		fsck_put_object_name(options, &tag->tagged->oid, "%s", name);
 	return options->walk(tag->tagged, OBJ_ANY, data, options);
 }
 
@@ -492,11 +442,34 @@ int fsck_walk(struct object *obj, void *data, struct fsck_options *options)
 	case OBJ_TAG:
 		return fsck_walk_tag((struct tag *)obj, data, options);
 	default:
-		error("Unknown object type for %s", describe_object(options, obj));
+		error("Unknown object type for %s",
+		      fsck_describe_object(options, &obj->oid));
 		return -1;
 	}
 }
 
+struct name_stack {
+	const char **names;
+	size_t nr, alloc;
+};
+
+static void name_stack_push(struct name_stack *stack, const char *name)
+{
+	ALLOC_GROW(stack->names, stack->nr + 1, stack->alloc);
+	stack->names[stack->nr++] = name;
+}
+
+static const char *name_stack_pop(struct name_stack *stack)
+{
+	return stack->nr ? stack->names[--stack->nr] : NULL;
+}
+
+static void name_stack_clear(struct name_stack *stack)
+{
+	FREE_AND_NULL(stack->names);
+	stack->nr = stack->alloc = 0;
+}
+
 /*
  * The entries in a tree are ordered in the _path_ order,
  * which means that a directory entry is ordered by adding
@@ -508,7 +481,14 @@ int fsck_walk(struct object *obj, void *data, struct fsck_options *options)
 #define TREE_UNORDERED (-1)
 #define TREE_HAS_DUPS  (-2)
 
-static int verify_ordered(unsigned mode1, const char *name1, unsigned mode2, const char *name2)
+static int is_less_than_slash(unsigned char c)
+{
+	return '\0' < c && c < '/';
+}
+
+static int verify_ordered(unsigned mode1, const char *name1,
+			  unsigned mode2, const char *name2,
+			  struct name_stack *candidates)
 {
 	int len1 = strlen(name1);
 	int len2 = strlen(name2);
@@ -540,10 +520,47 @@ static int verify_ordered(unsigned mode1, const char *name1, unsigned mode2, con
 		c1 = '/';
 	if (!c2 && S_ISDIR(mode2))
 		c2 = '/';
+
+	/*
+	 * There can be non-consecutive duplicates due to the implicitly
+	 * added slash, e.g.:
+	 *
+	 *   foo
+	 *   foo.bar
+	 *   foo.bar.baz
+	 *   foo.bar/
+	 *   foo/
+	 *
+	 * Record non-directory candidates (like "foo" and "foo.bar" in
+	 * the example) on a stack and check directory candidates (like
+	 * foo/" and "foo.bar/") against that stack.
+	 */
+	if (!c1 && is_less_than_slash(c2)) {
+		name_stack_push(candidates, name1);
+	} else if (c2 == '/' && is_less_than_slash(c1)) {
+		for (;;) {
+			const char *p;
+			const char *f_name = name_stack_pop(candidates);
+
+			if (!f_name)
+				break;
+			if (!skip_prefix(name2, f_name, &p))
+				continue;
+			if (!*p)
+				return TREE_HAS_DUPS;
+			if (is_less_than_slash(*p)) {
+				name_stack_push(candidates, f_name);
+				break;
+			}
+		}
+	}
+
 	return c1 < c2 ? 0 : TREE_UNORDERED;
 }
 
-static int fsck_tree(struct tree *item, struct fsck_options *options)
+static int fsck_tree(const struct object_id *tree_oid,
+		     const char *buffer, unsigned long size,
+		     struct fsck_options *options)
 {
 	int retval = 0;
 	int has_null_sha1 = 0;
@@ -559,9 +576,12 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 	struct tree_desc desc;
 	unsigned o_mode;
 	const char *o_name;
+	struct name_stack df_dup_candidates = { NULL };
 
-	if (init_tree_desc_gently(&desc, item->buffer, item->size)) {
-		retval += report(options, &item->object, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree");
+	if (init_tree_desc_gently(&desc, buffer, size)) {
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_BAD_TREE,
+				 "cannot be parsed as a tree");
 		return retval;
 	}
 
@@ -570,12 +590,12 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 
 	while (desc.size) {
 		unsigned short mode;
-		const char *name;
-		const struct object_id *oid;
+		const char *name, *backslash;
+		const struct object_id *entry_oid;
 
-		oid = tree_entry_extract(&desc, &name, &mode);
+		entry_oid = tree_entry_extract(&desc, &name, &mode);
 
-		has_null_sha1 |= is_null_oid(oid);
+		has_null_sha1 |= is_null_oid(entry_oid);
 		has_full_path |= !!strchr(name, '/');
 		has_empty_name |= !*name;
 		has_dot |= !strcmp(name, ".");
@@ -585,15 +605,54 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 
 		if (is_hfs_dotgitmodules(name) || is_ntfs_dotgitmodules(name)) {
 			if (!S_ISLNK(mode))
-				oidset_insert(&gitmodules_found, oid);
+				oidset_insert(&options->gitmodules_found,
+					      entry_oid);
 			else
-				retval += report(options, &item->object,
+				retval += report(options,
+						 tree_oid, OBJ_TREE,
 						 FSCK_MSG_GITMODULES_SYMLINK,
 						 ".gitmodules is a symbolic link");
 		}
 
+		if (S_ISLNK(mode)) {
+			if (is_hfs_dotgitignore(name) ||
+			    is_ntfs_dotgitignore(name))
+				retval += report(options, tree_oid, OBJ_TREE,
+						 FSCK_MSG_GITIGNORE_SYMLINK,
+						 ".gitignore is a symlink");
+			if (is_hfs_dotgitattributes(name) ||
+			    is_ntfs_dotgitattributes(name))
+				retval += report(options, tree_oid, OBJ_TREE,
+						 FSCK_MSG_GITATTRIBUTES_SYMLINK,
+						 ".gitattributes is a symlink");
+			if (is_hfs_dotmailmap(name) ||
+			    is_ntfs_dotmailmap(name))
+				retval += report(options, tree_oid, OBJ_TREE,
+						 FSCK_MSG_MAILMAP_SYMLINK,
+						 ".mailmap is a symlink");
+		}
+
+		if ((backslash = strchr(name, '\\'))) {
+			while (backslash) {
+				backslash++;
+				has_dotgit |= is_ntfs_dotgit(backslash);
+				if (is_ntfs_dotgitmodules(backslash)) {
+					if (!S_ISLNK(mode))
+						oidset_insert(&options->gitmodules_found,
+							      entry_oid);
+					else
+						retval += report(options, tree_oid, OBJ_TREE,
+								 FSCK_MSG_GITMODULES_SYMLINK,
+								 ".gitmodules is a symbolic link");
+				}
+				backslash = strchr(backslash, '\\');
+			}
+		}
+
 		if (update_tree_entry_gently(&desc)) {
-			retval += report(options, &item->object, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree");
+			retval += report(options, tree_oid, OBJ_TREE,
+					 FSCK_MSG_BAD_TREE,
+					 "cannot be parsed as a tree");
 			break;
 		}
 
@@ -621,7 +680,8 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 		}
 
 		if (o_name) {
-			switch (verify_ordered(o_mode, o_name, mode, name)) {
+			switch (verify_ordered(o_mode, o_name, mode, name,
+					       &df_dup_candidates)) {
 			case TREE_UNORDERED:
 				not_properly_sorted = 1;
 				break;
@@ -637,31 +697,54 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 		o_name = name;
 	}
 
+	name_stack_clear(&df_dup_candidates);
+
 	if (has_null_sha1)
-		retval += report(options, &item->object, FSCK_MSG_NULL_SHA1, "contains entries pointing to null sha1");
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_NULL_SHA1,
+				 "contains entries pointing to null sha1");
 	if (has_full_path)
-		retval += report(options, &item->object, FSCK_MSG_FULL_PATHNAME, "contains full pathnames");
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_FULL_PATHNAME,
+				 "contains full pathnames");
 	if (has_empty_name)
-		retval += report(options, &item->object, FSCK_MSG_EMPTY_NAME, "contains empty pathname");
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_EMPTY_NAME,
+				 "contains empty pathname");
 	if (has_dot)
-		retval += report(options, &item->object, FSCK_MSG_HAS_DOT, "contains '.'");
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_HAS_DOT,
+				 "contains '.'");
 	if (has_dotdot)
-		retval += report(options, &item->object, FSCK_MSG_HAS_DOTDOT, "contains '..'");
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_HAS_DOTDOT,
+				 "contains '..'");
 	if (has_dotgit)
-		retval += report(options, &item->object, FSCK_MSG_HAS_DOTGIT, "contains '.git'");
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_HAS_DOTGIT,
+				 "contains '.git'");
 	if (has_zero_pad)
-		retval += report(options, &item->object, FSCK_MSG_ZERO_PADDED_FILEMODE, "contains zero-padded file modes");
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_ZERO_PADDED_FILEMODE,
+				 "contains zero-padded file modes");
 	if (has_bad_modes)
-		retval += report(options, &item->object, FSCK_MSG_BAD_FILEMODE, "contains bad file modes");
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_BAD_FILEMODE,
+				 "contains bad file modes");
 	if (has_dup_entries)
-		retval += report(options, &item->object, FSCK_MSG_DUPLICATE_ENTRIES, "contains duplicate file entries");
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_DUPLICATE_ENTRIES,
+				 "contains duplicate file entries");
 	if (not_properly_sorted)
-		retval += report(options, &item->object, FSCK_MSG_TREE_NOT_SORTED, "not properly sorted");
+		retval += report(options, tree_oid, OBJ_TREE,
+				 FSCK_MSG_TREE_NOT_SORTED,
+				 "not properly sorted");
 	return retval;
 }
 
 static int verify_headers(const void *data, unsigned long size,
-			  struct object *obj, struct fsck_options *options)
+			  const struct object_id *oid, enum object_type type,
+			  struct fsck_options *options)
 {
 	const char *buffer = (const char *)data;
 	unsigned long i;
@@ -669,7 +752,7 @@ static int verify_headers(const void *data, unsigned long size,
 	for (i = 0; i < size; i++) {
 		switch (buffer[i]) {
 		case '\0':
-			return report(options, obj,
+			return report(options, oid, type,
 				FSCK_MSG_NUL_IN_HEADER,
 				"unterminated header: NUL at offset %ld", i);
 		case '\n':
@@ -687,11 +770,13 @@ static int verify_headers(const void *data, unsigned long size,
 	if (size && buffer[size - 1] == '\n')
 		return 0;
 
-	return report(options, obj,
+	return report(options, oid, type,
 		FSCK_MSG_UNTERMINATED_HEADER, "unterminated header");
 }
 
-static int fsck_ident(const char **ident, struct object *obj, struct fsck_options *options)
+static int fsck_ident(const char **ident,
+		      const struct object_id *oid, enum object_type type,
+		      struct fsck_options *options)
 {
 	const char *p = *ident;
 	char *end;
@@ -701,28 +786,28 @@ static int fsck_ident(const char **ident, struct object *obj, struct fsck_option
 		(*ident)++;
 
 	if (*p == '<')
-		return report(options, obj, FSCK_MSG_MISSING_NAME_BEFORE_EMAIL, "invalid author/committer line - missing space before email");
+		return report(options, oid, type, FSCK_MSG_MISSING_NAME_BEFORE_EMAIL, "invalid author/committer line - missing space before email");
 	p += strcspn(p, "<>\n");
 	if (*p == '>')
-		return report(options, obj, FSCK_MSG_BAD_NAME, "invalid author/committer line - bad name");
+		return report(options, oid, type, FSCK_MSG_BAD_NAME, "invalid author/committer line - bad name");
 	if (*p != '<')
-		return report(options, obj, FSCK_MSG_MISSING_EMAIL, "invalid author/committer line - missing email");
+		return report(options, oid, type, FSCK_MSG_MISSING_EMAIL, "invalid author/committer line - missing email");
 	if (p[-1] != ' ')
-		return report(options, obj, FSCK_MSG_MISSING_SPACE_BEFORE_EMAIL, "invalid author/committer line - missing space before email");
+		return report(options, oid, type, FSCK_MSG_MISSING_SPACE_BEFORE_EMAIL, "invalid author/committer line - missing space before email");
 	p++;
 	p += strcspn(p, "<>\n");
 	if (*p != '>')
-		return report(options, obj, FSCK_MSG_BAD_EMAIL, "invalid author/committer line - bad email");
+		return report(options, oid, type, FSCK_MSG_BAD_EMAIL, "invalid author/committer line - bad email");
 	p++;
 	if (*p != ' ')
-		return report(options, obj, FSCK_MSG_MISSING_SPACE_BEFORE_DATE, "invalid author/committer line - missing space before date");
+		return report(options, oid, type, FSCK_MSG_MISSING_SPACE_BEFORE_DATE, "invalid author/committer line - missing space before date");
 	p++;
 	if (*p == '0' && p[1] != ' ')
-		return report(options, obj, FSCK_MSG_ZERO_PADDED_DATE, "invalid author/committer line - zero-padded date");
+		return report(options, oid, type, FSCK_MSG_ZERO_PADDED_DATE, "invalid author/committer line - zero-padded date");
 	if (date_overflows(parse_timestamp(p, &end, 10)))
-		return report(options, obj, FSCK_MSG_BAD_DATE_OVERFLOW, "invalid author/committer line - date causes integer overflow");
+		return report(options, oid, type, FSCK_MSG_BAD_DATE_OVERFLOW, "invalid author/committer line - date causes integer overflow");
 	if ((end == p || *end != ' '))
-		return report(options, obj, FSCK_MSG_BAD_DATE, "invalid author/committer line - bad date");
+		return report(options, oid, type, FSCK_MSG_BAD_DATE, "invalid author/committer line - bad date");
 	p = end + 1;
 	if ((*p != '+' && *p != '-') ||
 	    !isdigit(p[1]) ||
@@ -730,83 +815,60 @@ static int fsck_ident(const char **ident, struct object *obj, struct fsck_option
 	    !isdigit(p[3]) ||
 	    !isdigit(p[4]) ||
 	    (p[5] != '\n'))
-		return report(options, obj, FSCK_MSG_BAD_TIMEZONE, "invalid author/committer line - bad time zone");
+		return report(options, oid, type, FSCK_MSG_BAD_TIMEZONE, "invalid author/committer line - bad time zone");
 	p += 6;
 	return 0;
 }
 
-static int fsck_commit_buffer(struct commit *commit, const char *buffer,
-	unsigned long size, struct fsck_options *options)
+static int fsck_commit(const struct object_id *oid,
+		       const char *buffer, unsigned long size,
+		       struct fsck_options *options)
 {
-	struct object_id tree_oid, oid;
-	struct commit_graft *graft;
-	unsigned parent_count, parent_line_count = 0, author_count;
+	struct object_id tree_oid, parent_oid;
+	unsigned author_count;
 	int err;
 	const char *buffer_begin = buffer;
 	const char *p;
 
-	if (verify_headers(buffer, size, &commit->object, options))
+	if (verify_headers(buffer, size, oid, OBJ_COMMIT, options))
 		return -1;
 
 	if (!skip_prefix(buffer, "tree ", &buffer))
-		return report(options, &commit->object, FSCK_MSG_MISSING_TREE, "invalid format - expected 'tree' line");
+		return report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_TREE, "invalid format - expected 'tree' line");
 	if (parse_oid_hex(buffer, &tree_oid, &p) || *p != '\n') {
-		err = report(options, &commit->object, FSCK_MSG_BAD_TREE_SHA1, "invalid 'tree' line format - bad sha1");
+		err = report(options, oid, OBJ_COMMIT, FSCK_MSG_BAD_TREE_SHA1, "invalid 'tree' line format - bad sha1");
 		if (err)
 			return err;
 	}
 	buffer = p + 1;
 	while (skip_prefix(buffer, "parent ", &buffer)) {
-		if (parse_oid_hex(buffer, &oid, &p) || *p != '\n') {
-			err = report(options, &commit->object, FSCK_MSG_BAD_PARENT_SHA1, "invalid 'parent' line format - bad sha1");
+		if (parse_oid_hex(buffer, &parent_oid, &p) || *p != '\n') {
+			err = report(options, oid, OBJ_COMMIT, FSCK_MSG_BAD_PARENT_SHA1, "invalid 'parent' line format - bad sha1");
 			if (err)
 				return err;
 		}
 		buffer = p + 1;
-		parent_line_count++;
-	}
-	graft = lookup_commit_graft(the_repository, &commit->object.oid);
-	parent_count = commit_list_count(commit->parents);
-	if (graft) {
-		if (graft->nr_parent == -1 && !parent_count)
-			; /* shallow commit */
-		else if (graft->nr_parent != parent_count) {
-			err = report(options, &commit->object, FSCK_MSG_MISSING_GRAFT, "graft objects missing");
-			if (err)
-				return err;
-		}
-	} else {
-		if (parent_count != parent_line_count) {
-			err = report(options, &commit->object, FSCK_MSG_MISSING_PARENT, "parent objects missing");
-			if (err)
-				return err;
-		}
 	}
 	author_count = 0;
 	while (skip_prefix(buffer, "author ", &buffer)) {
 		author_count++;
-		err = fsck_ident(&buffer, &commit->object, options);
+		err = fsck_ident(&buffer, oid, OBJ_COMMIT, options);
 		if (err)
 			return err;
 	}
 	if (author_count < 1)
-		err = report(options, &commit->object, FSCK_MSG_MISSING_AUTHOR, "invalid format - expected 'author' line");
+		err = report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_AUTHOR, "invalid format - expected 'author' line");
 	else if (author_count > 1)
-		err = report(options, &commit->object, FSCK_MSG_MULTIPLE_AUTHORS, "invalid format - multiple 'author' lines");
+		err = report(options, oid, OBJ_COMMIT, FSCK_MSG_MULTIPLE_AUTHORS, "invalid format - multiple 'author' lines");
 	if (err)
 		return err;
 	if (!skip_prefix(buffer, "committer ", &buffer))
-		return report(options, &commit->object, FSCK_MSG_MISSING_COMMITTER, "invalid format - expected 'committer' line");
-	err = fsck_ident(&buffer, &commit->object, options);
+		return report(options, oid, OBJ_COMMIT, FSCK_MSG_MISSING_COMMITTER, "invalid format - expected 'committer' line");
+	err = fsck_ident(&buffer, oid, OBJ_COMMIT, options);
 	if (err)
 		return err;
-	if (!get_commit_tree(commit)) {
-		err = report(options, &commit->object, FSCK_MSG_BAD_TREE, "could not load commit's tree %s", oid_to_hex(&tree_oid));
-		if (err)
-			return err;
-	}
 	if (memchr(buffer_begin, '\0', size)) {
-		err = report(options, &commit->object, FSCK_MSG_NUL_IN_COMMIT,
+		err = report(options, oid, OBJ_COMMIT, FSCK_MSG_NUL_IN_COMMIT,
 			     "NUL byte in the commit object body");
 		if (err)
 			return err;
@@ -814,91 +876,71 @@ static int fsck_commit_buffer(struct commit *commit, const char *buffer,
 	return 0;
 }
 
-static int fsck_commit(struct commit *commit, const char *data,
-	unsigned long size, struct fsck_options *options)
+static int fsck_tag(const struct object_id *oid, const char *buffer,
+		    unsigned long size, struct fsck_options *options)
 {
-	const char *buffer = data ?  data : get_commit_buffer(commit, &size);
-	int ret = fsck_commit_buffer(commit, buffer, size, options);
-	if (!data)
-		unuse_commit_buffer(commit, buffer);
-	return ret;
+	struct object_id tagged_oid;
+	int tagged_type;
+	return fsck_tag_standalone(oid, buffer, size, options, &tagged_oid,
+				   &tagged_type);
 }
 
-static int fsck_tag_buffer(struct tag *tag, const char *data,
-	unsigned long size, struct fsck_options *options)
+int fsck_tag_standalone(const struct object_id *oid, const char *buffer,
+			unsigned long size, struct fsck_options *options,
+			struct object_id *tagged_oid,
+			int *tagged_type)
 {
-	struct object_id oid;
 	int ret = 0;
-	const char *buffer;
-	char *to_free = NULL, *eol;
+	char *eol;
 	struct strbuf sb = STRBUF_INIT;
 	const char *p;
 
-	if (data)
-		buffer = data;
-	else {
-		enum object_type type;
-
-		buffer = to_free =
-			read_object_file(&tag->object.oid, &type, &size);
-		if (!buffer)
-			return report(options, &tag->object,
-				FSCK_MSG_MISSING_TAG_OBJECT,
-				"cannot read tag object");
-
-		if (type != OBJ_TAG) {
-			ret = report(options, &tag->object,
-				FSCK_MSG_TAG_OBJECT_NOT_TAG,
-				"expected tag got %s",
-			    type_name(type));
-			goto done;
-		}
-	}
-
-	ret = verify_headers(buffer, size, &tag->object, options);
+	ret = verify_headers(buffer, size, oid, OBJ_TAG, options);
 	if (ret)
 		goto done;
 
 	if (!skip_prefix(buffer, "object ", &buffer)) {
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_OBJECT, "invalid format - expected 'object' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_OBJECT, "invalid format - expected 'object' line");
 		goto done;
 	}
-	if (parse_oid_hex(buffer, &oid, &p) || *p != '\n') {
-		ret = report(options, &tag->object, FSCK_MSG_BAD_OBJECT_SHA1, "invalid 'object' line format - bad sha1");
+	if (parse_oid_hex(buffer, tagged_oid, &p) || *p != '\n') {
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_BAD_OBJECT_SHA1, "invalid 'object' line format - bad sha1");
 		if (ret)
 			goto done;
 	}
 	buffer = p + 1;
 
 	if (!skip_prefix(buffer, "type ", &buffer)) {
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_TYPE_ENTRY, "invalid format - expected 'type' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TYPE_ENTRY, "invalid format - expected 'type' line");
 		goto done;
 	}
 	eol = strchr(buffer, '\n');
 	if (!eol) {
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_TYPE, "invalid format - unexpected end after 'type' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TYPE, "invalid format - unexpected end after 'type' line");
 		goto done;
 	}
-	if (type_from_string_gently(buffer, eol - buffer, 1) < 0)
-		ret = report(options, &tag->object, FSCK_MSG_BAD_TYPE, "invalid 'type' value");
+	*tagged_type = type_from_string_gently(buffer, eol - buffer, 1);
+	if (*tagged_type < 0)
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_BAD_TYPE, "invalid 'type' value");
 	if (ret)
 		goto done;
 	buffer = eol + 1;
 
 	if (!skip_prefix(buffer, "tag ", &buffer)) {
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_TAG_ENTRY, "invalid format - expected 'tag' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAG_ENTRY, "invalid format - expected 'tag' line");
 		goto done;
 	}
 	eol = strchr(buffer, '\n');
 	if (!eol) {
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_TAG, "invalid format - unexpected end after 'type' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAG, "invalid format - unexpected end after 'type' line");
 		goto done;
 	}
 	strbuf_addf(&sb, "refs/tags/%.*s", (int)(eol - buffer), buffer);
 	if (check_refname_format(sb.buf, 0)) {
-		ret = report(options, &tag->object, FSCK_MSG_BAD_TAG_NAME,
-			   "invalid 'tag' name: %.*s",
-			   (int)(eol - buffer), buffer);
+		ret = report(options, oid, OBJ_TAG,
+			     FSCK_MSG_BAD_TAG_NAME,
+			     "invalid 'tag' name: %.*s",
+			     (int)(eol - buffer), buffer);
 		if (ret)
 			goto done;
 	}
@@ -906,32 +948,178 @@ static int fsck_tag_buffer(struct tag *tag, const char *data,
 
 	if (!skip_prefix(buffer, "tagger ", &buffer)) {
 		/* early tags do not contain 'tagger' lines; warn only */
-		ret = report(options, &tag->object, FSCK_MSG_MISSING_TAGGER_ENTRY, "invalid format - expected 'tagger' line");
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_MISSING_TAGGER_ENTRY, "invalid format - expected 'tagger' line");
 		if (ret)
 			goto done;
 	}
 	else
-		ret = fsck_ident(&buffer, &tag->object, options);
+		ret = fsck_ident(&buffer, oid, OBJ_TAG, options);
+	if (!*buffer)
+		goto done;
+
+	if (!starts_with(buffer, "\n")) {
+		/*
+		 * The verify_headers() check will allow
+		 * e.g. "[...]tagger <tagger>\nsome
+		 * garbage\n\nmessage" to pass, thinking "some
+		 * garbage" could be a custom header. E.g. "mktag"
+		 * doesn't want any unknown headers.
+		 */
+		ret = report(options, oid, OBJ_TAG, FSCK_MSG_EXTRA_HEADER_ENTRY, "invalid format - extra header(s) after 'tagger'");
+		if (ret)
+			goto done;
+	}
 
 done:
 	strbuf_release(&sb);
-	free(to_free);
 	return ret;
 }
 
-static int fsck_tag(struct tag *tag, const char *data,
-	unsigned long size, struct fsck_options *options)
+/*
+ * Like builtin/submodule--helper.c's starts_with_dot_slash, but without
+ * relying on the platform-dependent is_dir_sep helper.
+ *
+ * This is for use in checking whether a submodule URL is interpreted as
+ * relative to the current directory on any platform, since \ is a
+ * directory separator on Windows but not on other platforms.
+ */
+static int starts_with_dot_slash(const char *str)
 {
-	struct object *tagged = tag->tagged;
+	return str[0] == '.' && (str[1] == '/' || str[1] == '\\');
+}
 
-	if (!tagged)
-		return report(options, &tag->object, FSCK_MSG_BAD_TAG_OBJECT, "could not load tagged object");
+/*
+ * Like starts_with_dot_slash, this is a variant of submodule--helper's
+ * helper of the same name with the twist that it accepts backslash as a
+ * directory separator even on non-Windows platforms.
+ */
+static int starts_with_dot_dot_slash(const char *str)
+{
+	return str[0] == '.' && starts_with_dot_slash(str + 1);
+}
 
-	return fsck_tag_buffer(tag, data, size, options);
+static int submodule_url_is_relative(const char *url)
+{
+	return starts_with_dot_slash(url) || starts_with_dot_dot_slash(url);
+}
+
+/*
+ * Count directory components that a relative submodule URL should chop
+ * from the remote_url it is to be resolved against.
+ *
+ * In other words, this counts "../" components at the start of a
+ * submodule URL.
+ *
+ * Returns the number of directory components to chop and writes a
+ * pointer to the next character of url after all leading "./" and
+ * "../" components to out.
+ */
+static int count_leading_dotdots(const char *url, const char **out)
+{
+	int result = 0;
+	while (1) {
+		if (starts_with_dot_dot_slash(url)) {
+			result++;
+			url += strlen("../");
+			continue;
+		}
+		if (starts_with_dot_slash(url)) {
+			url += strlen("./");
+			continue;
+		}
+		*out = url;
+		return result;
+	}
+}
+/*
+ * Check whether a transport is implemented by git-remote-curl.
+ *
+ * If it is, returns 1 and writes the URL that would be passed to
+ * git-remote-curl to the "out" parameter.
+ *
+ * Otherwise, returns 0 and leaves "out" untouched.
+ *
+ * Examples:
+ *   http::https://example.com/repo.git -> 1, https://example.com/repo.git
+ *   https://example.com/repo.git -> 1, https://example.com/repo.git
+ *   git://example.com/repo.git -> 0
+ *
+ * This is for use in checking for previously exploitable bugs that
+ * required a submodule URL to be passed to git-remote-curl.
+ */
+static int url_to_curl_url(const char *url, const char **out)
+{
+	/*
+	 * We don't need to check for case-aliases, "http.exe", and so
+	 * on because in the default configuration, is_transport_allowed
+	 * prevents URLs with those schemes from being cloned
+	 * automatically.
+	 */
+	if (skip_prefix(url, "http::", out) ||
+	    skip_prefix(url, "https::", out) ||
+	    skip_prefix(url, "ftp::", out) ||
+	    skip_prefix(url, "ftps::", out))
+		return 1;
+	if (starts_with(url, "http://") ||
+	    starts_with(url, "https://") ||
+	    starts_with(url, "ftp://") ||
+	    starts_with(url, "ftps://")) {
+		*out = url;
+		return 1;
+	}
+	return 0;
+}
+
+static int check_submodule_url(const char *url)
+{
+	const char *curl_url;
+
+	if (looks_like_command_line_option(url))
+		return -1;
+
+	if (submodule_url_is_relative(url) || starts_with(url, "git://")) {
+		char *decoded;
+		const char *next;
+		int has_nl;
+
+		/*
+		 * This could be appended to an http URL and url-decoded;
+		 * check for malicious characters.
+		 */
+		decoded = url_decode(url);
+		has_nl = !!strchr(decoded, '\n');
+
+		free(decoded);
+		if (has_nl)
+			return -1;
+
+		/*
+		 * URLs which escape their root via "../" can overwrite
+		 * the host field and previous components, resolving to
+		 * URLs like https::example.com/submodule.git and
+		 * https:///example.com/submodule.git that were
+		 * susceptible to CVE-2020-11008.
+		 */
+		if (count_leading_dotdots(url, &next) > 0 &&
+		    (*next == ':' || *next == '/'))
+			return -1;
+	}
+
+	else if (url_to_curl_url(url, &curl_url)) {
+		struct credential c = CREDENTIAL_INIT;
+		int ret = 0;
+		if (credential_from_url_gently(&c, curl_url, 1) ||
+		    !*c.host)
+			ret = -1;
+		credential_clear(&c);
+		return ret;
+	}
+
+	return 0;
 }
 
 struct fsck_gitmodules_data {
-	struct object *obj;
+	const struct object_id *oid;
 	struct fsck_options *options;
 	int ret;
 };
@@ -940,7 +1128,7 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata)
 {
 	struct fsck_gitmodules_data *data = vdata;
 	const char *subsection, *key;
-	int subsection_len;
+	size_t subsection_len;
 	char *name;
 
 	if (parse_config_key(var, "submodule", &subsection, &subsection_len, &key) < 0 ||
@@ -949,38 +1137,47 @@ static int fsck_gitmodules_fn(const char *var, const char *value, void *vdata)
 
 	name = xmemdupz(subsection, subsection_len);
 	if (check_submodule_name(name) < 0)
-		data->ret |= report(data->options, data->obj,
+		data->ret |= report(data->options,
+				    data->oid, OBJ_BLOB,
 				    FSCK_MSG_GITMODULES_NAME,
 				    "disallowed submodule name: %s",
 				    name);
 	if (!strcmp(key, "url") && value &&
-	    looks_like_command_line_option(value))
-		data->ret |= report(data->options, data->obj,
+	    check_submodule_url(value) < 0)
+		data->ret |= report(data->options,
+				    data->oid, OBJ_BLOB,
 				    FSCK_MSG_GITMODULES_URL,
 				    "disallowed submodule url: %s",
 				    value);
 	if (!strcmp(key, "path") && value &&
 	    looks_like_command_line_option(value))
-		data->ret |= report(data->options, data->obj,
+		data->ret |= report(data->options,
+				    data->oid, OBJ_BLOB,
 				    FSCK_MSG_GITMODULES_PATH,
 				    "disallowed submodule path: %s",
 				    value);
+	if (!strcmp(key, "update") && value &&
+	    parse_submodule_update_type(value) == SM_UPDATE_COMMAND)
+		data->ret |= report(data->options, data->oid, OBJ_BLOB,
+				    FSCK_MSG_GITMODULES_UPDATE,
+				    "disallowed submodule update setting: %s",
+				    value);
 	free(name);
 
 	return 0;
 }
 
-static int fsck_blob(struct blob *blob, const char *buf,
+static int fsck_blob(const struct object_id *oid, const char *buf,
 		     unsigned long size, struct fsck_options *options)
 {
 	struct fsck_gitmodules_data data;
 	struct config_options config_opts = { 0 };
 
-	if (!oidset_contains(&gitmodules_found, &blob->object.oid))
+	if (!oidset_contains(&options->gitmodules_found, oid))
 		return 0;
-	oidset_insert(&gitmodules_done, &blob->object.oid);
+	oidset_insert(&options->gitmodules_done, oid);
 
-	if (object_on_skiplist(options, &blob->object))
+	if (object_on_skiplist(options, oid))
 		return 0;
 
 	if (!buf) {
@@ -989,18 +1186,18 @@ static int fsck_blob(struct blob *blob, const char *buf,
 		 * blob too gigantic to load into memory. Let's just consider
 		 * that an error.
 		 */
-		return report(options, &blob->object,
+		return report(options, oid, OBJ_BLOB,
 			      FSCK_MSG_GITMODULES_LARGE,
 			      ".gitmodules too large to parse");
 	}
 
-	data.obj = &blob->object;
+	data.oid = oid;
 	data.options = options;
 	data.ret = 0;
 	config_opts.error_action = CONFIG_ERROR_SILENT;
 	if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB,
 				".gitmodules", buf, size, &data, &config_opts))
-		data.ret |= report(options, &blob->object,
+		data.ret |= report(options, oid, OBJ_BLOB,
 				   FSCK_MSG_GITMODULES_PARSE,
 				   "could not parse gitmodules blob");
 
@@ -1011,31 +1208,35 @@ int fsck_object(struct object *obj, void *data, unsigned long size,
 	struct fsck_options *options)
 {
 	if (!obj)
-		return report(options, obj, FSCK_MSG_BAD_OBJECT_SHA1, "no valid object to fsck");
+		return report(options, NULL, OBJ_NONE, FSCK_MSG_BAD_OBJECT_SHA1, "no valid object to fsck");
 
 	if (obj->type == OBJ_BLOB)
-		return fsck_blob((struct blob *)obj, data, size, options);
+		return fsck_blob(&obj->oid, data, size, options);
 	if (obj->type == OBJ_TREE)
-		return fsck_tree((struct tree *) obj, options);
+		return fsck_tree(&obj->oid, data, size, options);
 	if (obj->type == OBJ_COMMIT)
-		return fsck_commit((struct commit *) obj, (const char *) data,
-			size, options);
+		return fsck_commit(&obj->oid, data, size, options);
 	if (obj->type == OBJ_TAG)
-		return fsck_tag((struct tag *) obj, (const char *) data,
-			size, options);
+		return fsck_tag(&obj->oid, data, size, options);
 
-	return report(options, obj, FSCK_MSG_UNKNOWN_TYPE, "unknown type '%d' (internal fsck error)",
-			  obj->type);
+	return report(options, &obj->oid, obj->type,
+		      FSCK_MSG_UNKNOWN_TYPE,
+		      "unknown type '%d' (internal fsck error)",
+		      obj->type);
 }
 
 int fsck_error_function(struct fsck_options *o,
-	struct object *obj, int msg_type, const char *message)
+			const struct object_id *oid,
+			enum object_type object_type,
+			enum fsck_msg_type msg_type,
+			enum fsck_msg_id msg_id,
+			const char *message)
 {
 	if (msg_type == FSCK_WARN) {
-		warning("object %s: %s", describe_object(o, obj), message);
+		warning("object %s: %s", fsck_describe_object(o, oid), message);
 		return 0;
 	}
-	error("object %s: %s", describe_object(o, obj), message);
+	error("object %s: %s", fsck_describe_object(o, oid), message);
 	return 1;
 }
 
@@ -1045,46 +1246,80 @@ int fsck_finish(struct fsck_options *options)
 	struct oidset_iter iter;
 	const struct object_id *oid;
 
-	oidset_iter_init(&gitmodules_found, &iter);
+	oidset_iter_init(&options->gitmodules_found, &iter);
 	while ((oid = oidset_iter_next(&iter))) {
-		struct blob *blob;
 		enum object_type type;
 		unsigned long size;
 		char *buf;
 
-		if (oidset_contains(&gitmodules_done, oid))
-			continue;
-
-		blob = lookup_blob(the_repository, oid);
-		if (!blob) {
-			struct object *obj = lookup_unknown_object(oid);
-			ret |= report(options, obj,
-				      FSCK_MSG_GITMODULES_BLOB,
-				      "non-blob found at .gitmodules");
+		if (oidset_contains(&options->gitmodules_done, oid))
 			continue;
-		}
 
 		buf = read_object_file(oid, &type, &size);
 		if (!buf) {
-			if (is_promisor_object(&blob->object.oid))
+			if (is_promisor_object(oid))
 				continue;
-			ret |= report(options, &blob->object,
+			ret |= report(options,
+				      oid, OBJ_BLOB,
 				      FSCK_MSG_GITMODULES_MISSING,
 				      "unable to read .gitmodules blob");
 			continue;
 		}
 
 		if (type == OBJ_BLOB)
-			ret |= fsck_blob(blob, buf, size, options);
+			ret |= fsck_blob(oid, buf, size, options);
 		else
-			ret |= report(options, &blob->object,
+			ret |= report(options,
+				      oid, type,
 				      FSCK_MSG_GITMODULES_BLOB,
 				      "non-blob found at .gitmodules");
 		free(buf);
 	}
 
 
-	oidset_clear(&gitmodules_found);
-	oidset_clear(&gitmodules_done);
+	oidset_clear(&options->gitmodules_found);
+	oidset_clear(&options->gitmodules_done);
 	return ret;
 }
+
+int git_fsck_config(const char *var, const char *value, void *cb)
+{
+	struct fsck_options *options = cb;
+	if (strcmp(var, "fsck.skiplist") == 0) {
+		const char *path;
+		struct strbuf sb = STRBUF_INIT;
+
+		if (git_config_pathname(&path, var, value))
+			return 1;
+		strbuf_addf(&sb, "skiplist=%s", path);
+		free((char *)path);
+		fsck_set_msg_types(options, sb.buf);
+		strbuf_release(&sb);
+		return 0;
+	}
+
+	if (skip_prefix(var, "fsck.", &var)) {
+		fsck_set_msg_type(options, var, value);
+		return 0;
+	}
+
+	return git_default_config(var, value, cb);
+}
+
+/*
+ * Custom error callbacks that are used in more than one place.
+ */
+
+int fsck_error_cb_print_missing_gitmodules(struct fsck_options *o,
+					   const struct object_id *oid,
+					   enum object_type object_type,
+					   enum fsck_msg_type msg_type,
+					   enum fsck_msg_id msg_id,
+					   const char *message)
+{
+	if (msg_id == FSCK_MSG_GITMODULES_MISSING) {
+		puts(oid_to_hex(oid));
+		return 0;
+	}
+	return fsck_error_function(o, oid, object_type, msg_type, msg_id, message);
+}
diff --git a/fsck.h b/fsck.h
index b95595ae5f..d07f7a2459 100644
--- a/fsck.h
+++ b/fsck.h
@@ -3,15 +3,93 @@
 
 #include "oidset.h"
 
-#define FSCK_ERROR 1
-#define FSCK_WARN 2
-#define FSCK_IGNORE 3
+enum fsck_msg_type {
+	/* for internal use only */
+	FSCK_IGNORE,
+	FSCK_INFO,
+	FSCK_FATAL,
+	/* "public", fed to e.g. error_func callbacks */
+	FSCK_ERROR,
+	FSCK_WARN,
+};
+
+#define FOREACH_FSCK_MSG_ID(FUNC) \
+	/* fatal errors */ \
+	FUNC(NUL_IN_HEADER, FATAL) \
+	FUNC(UNTERMINATED_HEADER, FATAL) \
+	/* errors */ \
+	FUNC(BAD_DATE, ERROR) \
+	FUNC(BAD_DATE_OVERFLOW, ERROR) \
+	FUNC(BAD_EMAIL, ERROR) \
+	FUNC(BAD_NAME, ERROR) \
+	FUNC(BAD_OBJECT_SHA1, ERROR) \
+	FUNC(BAD_PARENT_SHA1, ERROR) \
+	FUNC(BAD_TAG_OBJECT, ERROR) \
+	FUNC(BAD_TIMEZONE, ERROR) \
+	FUNC(BAD_TREE, ERROR) \
+	FUNC(BAD_TREE_SHA1, ERROR) \
+	FUNC(BAD_TYPE, ERROR) \
+	FUNC(DUPLICATE_ENTRIES, ERROR) \
+	FUNC(MISSING_AUTHOR, ERROR) \
+	FUNC(MISSING_COMMITTER, ERROR) \
+	FUNC(MISSING_EMAIL, ERROR) \
+	FUNC(MISSING_NAME_BEFORE_EMAIL, ERROR) \
+	FUNC(MISSING_OBJECT, ERROR) \
+	FUNC(MISSING_SPACE_BEFORE_DATE, ERROR) \
+	FUNC(MISSING_SPACE_BEFORE_EMAIL, ERROR) \
+	FUNC(MISSING_TAG, ERROR) \
+	FUNC(MISSING_TAG_ENTRY, ERROR) \
+	FUNC(MISSING_TREE, ERROR) \
+	FUNC(MISSING_TREE_OBJECT, ERROR) \
+	FUNC(MISSING_TYPE, ERROR) \
+	FUNC(MISSING_TYPE_ENTRY, ERROR) \
+	FUNC(MULTIPLE_AUTHORS, ERROR) \
+	FUNC(TREE_NOT_SORTED, ERROR) \
+	FUNC(UNKNOWN_TYPE, ERROR) \
+	FUNC(ZERO_PADDED_DATE, ERROR) \
+	FUNC(GITMODULES_MISSING, ERROR) \
+	FUNC(GITMODULES_BLOB, ERROR) \
+	FUNC(GITMODULES_LARGE, ERROR) \
+	FUNC(GITMODULES_NAME, ERROR) \
+	FUNC(GITMODULES_SYMLINK, ERROR) \
+	FUNC(GITMODULES_URL, ERROR) \
+	FUNC(GITMODULES_PATH, ERROR) \
+	FUNC(GITMODULES_UPDATE, ERROR) \
+	/* warnings */ \
+	FUNC(BAD_FILEMODE, WARN) \
+	FUNC(EMPTY_NAME, WARN) \
+	FUNC(FULL_PATHNAME, WARN) \
+	FUNC(HAS_DOT, WARN) \
+	FUNC(HAS_DOTDOT, WARN) \
+	FUNC(HAS_DOTGIT, WARN) \
+	FUNC(NULL_SHA1, WARN) \
+	FUNC(ZERO_PADDED_FILEMODE, WARN) \
+	FUNC(NUL_IN_COMMIT, WARN) \
+	/* infos (reported as warnings, but ignored by default) */ \
+	FUNC(GITMODULES_PARSE, INFO) \
+	FUNC(GITIGNORE_SYMLINK, INFO) \
+	FUNC(GITATTRIBUTES_SYMLINK, INFO) \
+	FUNC(MAILMAP_SYMLINK, INFO) \
+	FUNC(BAD_TAG_NAME, INFO) \
+	FUNC(MISSING_TAGGER_ENTRY, INFO) \
+	/* ignored (elevated when requested) */ \
+	FUNC(EXTRA_HEADER_ENTRY, IGNORE)
+
+#define MSG_ID(id, msg_type) FSCK_MSG_##id,
+enum fsck_msg_id {
+	FOREACH_FSCK_MSG_ID(MSG_ID)
+	FSCK_MSG_MAX
+};
+#undef MSG_ID
 
 struct fsck_options;
 struct object;
 
+void fsck_set_msg_type_from_ids(struct fsck_options *options,
+				enum fsck_msg_id msg_id,
+				enum fsck_msg_type msg_type);
 void fsck_set_msg_type(struct fsck_options *options,
-		const char *msg_id, const char *msg_type);
+		       const char *msg_id, const char *msg_type);
 void fsck_set_msg_types(struct fsck_options *options, const char *values);
 int is_valid_msg_type(const char *msg_id, const char *msg_type);
 
@@ -23,26 +101,55 @@ int is_valid_msg_type(const char *msg_id, const char *msg_type);
  *     <0	error signaled and abort
  *     >0	error signaled and do not abort
  */
-typedef int (*fsck_walk_func)(struct object *obj, int type, void *data, struct fsck_options *options);
+typedef int (*fsck_walk_func)(struct object *obj, enum object_type object_type,
+			      void *data, struct fsck_options *options);
 
 /* callback for fsck_object, type is FSCK_ERROR or FSCK_WARN */
 typedef int (*fsck_error)(struct fsck_options *o,
-	struct object *obj, int type, const char *message);
+			  const struct object_id *oid, enum object_type object_type,
+			  enum fsck_msg_type msg_type, enum fsck_msg_id msg_id,
+			  const char *message);
 
 int fsck_error_function(struct fsck_options *o,
-	struct object *obj, int type, const char *message);
+			const struct object_id *oid, enum object_type object_type,
+			enum fsck_msg_type msg_type, enum fsck_msg_id msg_id,
+			const char *message);
+int fsck_error_cb_print_missing_gitmodules(struct fsck_options *o,
+					   const struct object_id *oid,
+					   enum object_type object_type,
+					   enum fsck_msg_type msg_type,
+					   enum fsck_msg_id msg_id,
+					   const char *message);
 
 struct fsck_options {
 	fsck_walk_func walk;
 	fsck_error error_func;
 	unsigned strict:1;
-	int *msg_type;
+	enum fsck_msg_type *msg_type;
 	struct oidset skiplist;
-	struct decoration *object_names;
+	struct oidset gitmodules_found;
+	struct oidset gitmodules_done;
+	kh_oid_map_t *object_names;
 };
 
-#define FSCK_OPTIONS_DEFAULT { NULL, fsck_error_function, 0, NULL, OIDSET_INIT }
-#define FSCK_OPTIONS_STRICT { NULL, fsck_error_function, 1, NULL, OIDSET_INIT }
+#define FSCK_OPTIONS_DEFAULT { \
+	.skiplist = OIDSET_INIT, \
+	.gitmodules_found = OIDSET_INIT, \
+	.gitmodules_done = OIDSET_INIT, \
+	.error_func = fsck_error_function \
+}
+#define FSCK_OPTIONS_STRICT { \
+	.strict = 1, \
+	.gitmodules_found = OIDSET_INIT, \
+	.gitmodules_done = OIDSET_INIT, \
+	.error_func = fsck_error_function, \
+}
+#define FSCK_OPTIONS_MISSING_GITMODULES { \
+	.strict = 1, \
+	.gitmodules_found = OIDSET_INIT, \
+	.gitmodules_done = OIDSET_INIT, \
+	.error_func = fsck_error_cb_print_missing_gitmodules, \
+}
 
 /* descend in all linked child objects
  * the return value is:
@@ -52,15 +159,59 @@ struct fsck_options {
  *    0		everything OK
  */
 int fsck_walk(struct object *obj, void *data, struct fsck_options *options);
-/* If NULL is passed for data, we assume the object is local and read it. */
+
+/*
+ * Blob objects my pass a NULL data pointer, which indicates they are too large
+ * to fit in memory. All other types must pass a real buffer.
+ */
 int fsck_object(struct object *obj, void *data, unsigned long size,
 	struct fsck_options *options);
 
 /*
+ * fsck a tag, and pass info about it back to the caller. This is
+ * exposed fsck_object() internals for git-mktag(1).
+ */
+int fsck_tag_standalone(const struct object_id *oid, const char *buffer,
+			unsigned long size, struct fsck_options *options,
+			struct object_id *tagged_oid,
+			int *tag_type);
+
+/*
  * Some fsck checks are context-dependent, and may end up queued; run this
  * after completing all fsck_object() calls in order to resolve any remaining
  * checks.
  */
 int fsck_finish(struct fsck_options *options);
 
+/*
+ * Subsystem for storing human-readable names for each object.
+ *
+ * If fsck_enable_object_names() has not been called, all other functions are
+ * noops.
+ *
+ * Use fsck_put_object_name() to seed initial names (e.g. from refnames); the
+ * fsck code will extend that while walking trees, etc.
+ *
+ * Use fsck_get_object_name() to get a single name (or NULL if none). Or the
+ * more convenient describe_object(), which always produces an output string
+ * with the oid combined with the name (if any). Note that the return value
+ * points to a rotating array of static buffers, and may be invalidated by a
+ * subsequent call.
+ */
+void fsck_enable_object_names(struct fsck_options *options);
+const char *fsck_get_object_name(struct fsck_options *options,
+				 const struct object_id *oid);
+__attribute__((format (printf,3,4)))
+void fsck_put_object_name(struct fsck_options *options,
+			  const struct object_id *oid,
+			  const char *fmt, ...);
+const char *fsck_describe_object(struct fsck_options *options,
+				 const struct object_id *oid);
+
+/*
+ * git_config() callback for use by fsck-y tools that want to support
+ * fsck.<msg> fsck.skipList etc.
+ */
+int git_fsck_config(const char *var, const char *value, void *cb);
+
 #endif
diff --git a/fsmonitor.c b/fsmonitor.c
index 1f4aa1b150..ab9bfc60b3 100644
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -6,24 +6,47 @@
 #include "run-command.h"
 #include "strbuf.h"
 
-#define INDEX_EXTENSION_VERSION	(1)
-#define HOOK_INTERFACE_VERSION	(1)
+#define INDEX_EXTENSION_VERSION1	(1)
+#define INDEX_EXTENSION_VERSION2	(2)
+#define HOOK_INTERFACE_VERSION1		(1)
+#define HOOK_INTERFACE_VERSION2		(2)
 
 struct trace_key trace_fsmonitor = TRACE_KEY_INIT(FSMONITOR);
 
+static void assert_index_minimum(struct index_state *istate, size_t pos)
+{
+	if (pos > istate->cache_nr)
+		BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
+		    (uintmax_t)pos, istate->cache_nr);
+}
+
 static void fsmonitor_ewah_callback(size_t pos, void *is)
 {
 	struct index_state *istate = (struct index_state *)is;
 	struct cache_entry *ce;
 
-	if (pos >= istate->cache_nr)
-		BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" >= %u)",
-		    (uintmax_t)pos, istate->cache_nr);
+	assert_index_minimum(istate, pos + 1);
 
 	ce = istate->cache[pos];
 	ce->ce_flags &= ~CE_FSMONITOR_VALID;
 }
 
+static int fsmonitor_hook_version(void)
+{
+	int hook_version;
+
+	if (git_config_get_int("core.fsmonitorhookversion", &hook_version))
+		return -1;
+
+	if (hook_version == HOOK_INTERFACE_VERSION1 ||
+	    hook_version == HOOK_INTERFACE_VERSION2)
+		return hook_version;
+
+	warning("Invalid hook version '%i' in core.fsmonitorhookversion. "
+		"Must be 1 or 2.", hook_version);
+	return -1;
+}
+
 int read_fsmonitor_extension(struct index_state *istate, const void *data,
 	unsigned long sz)
 {
@@ -32,17 +55,26 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data,
 	uint32_t ewah_size;
 	struct ewah_bitmap *fsmonitor_dirty;
 	int ret;
+	uint64_t timestamp;
+	struct strbuf last_update = STRBUF_INIT;
 
-	if (sz < sizeof(uint32_t) + sizeof(uint64_t) + sizeof(uint32_t))
+	if (sz < sizeof(uint32_t) + 1 + sizeof(uint32_t))
 		return error("corrupt fsmonitor extension (too short)");
 
 	hdr_version = get_be32(index);
 	index += sizeof(uint32_t);
-	if (hdr_version != INDEX_EXTENSION_VERSION)
+	if (hdr_version == INDEX_EXTENSION_VERSION1) {
+		timestamp = get_be64(index);
+		strbuf_addf(&last_update, "%"PRIu64"", timestamp);
+		index += sizeof(uint64_t);
+	} else if (hdr_version == INDEX_EXTENSION_VERSION2) {
+		strbuf_addstr(&last_update, index);
+		index += last_update.len + 1;
+	} else {
 		return error("bad fsmonitor version %d", hdr_version);
+	}
 
-	istate->fsmonitor_last_update = get_be64(index);
-	index += sizeof(uint64_t);
+	istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL);
 
 	ewah_size = get_be32(index);
 	index += sizeof(uint32_t);
@@ -55,11 +87,14 @@ int read_fsmonitor_extension(struct index_state *istate, const void *data,
 	}
 	istate->fsmonitor_dirty = fsmonitor_dirty;
 
-	if (istate->fsmonitor_dirty->bit_size > istate->cache_nr)
-		BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
-		    (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
+	if (!istate->split_index)
+		assert_index_minimum(istate, istate->fsmonitor_dirty->bit_size);
 
-	trace_printf_key(&trace_fsmonitor, "read fsmonitor extension successful");
+	trace2_data_string("index", NULL, "extension/fsmn/read/token",
+			   istate->fsmonitor_last_update);
+	trace_printf_key(&trace_fsmonitor,
+			 "read fsmonitor extension successful '%s'",
+			 istate->fsmonitor_last_update);
 	return 0;
 }
 
@@ -78,20 +113,19 @@ void fill_fsmonitor_bitmap(struct index_state *istate)
 void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
 {
 	uint32_t hdr_version;
-	uint64_t tm;
 	uint32_t ewah_start;
 	uint32_t ewah_size = 0;
 	int fixup = 0;
 
-	if (istate->fsmonitor_dirty->bit_size > istate->cache_nr)
-		BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
-		    (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
+	if (!istate->split_index)
+		assert_index_minimum(istate, istate->fsmonitor_dirty->bit_size);
 
-	put_be32(&hdr_version, INDEX_EXTENSION_VERSION);
+	put_be32(&hdr_version, INDEX_EXTENSION_VERSION2);
 	strbuf_add(sb, &hdr_version, sizeof(uint32_t));
 
-	put_be64(&tm, istate->fsmonitor_last_update);
-	strbuf_add(sb, &tm, sizeof(uint64_t));
+	strbuf_addstr(sb, istate->fsmonitor_last_update);
+	strbuf_addch(sb, 0); /* Want to keep a NUL */
+
 	fixup = sb->len;
 	strbuf_add(sb, &ewah_size, sizeof(uint32_t)); /* we'll fix this up later */
 
@@ -104,35 +138,87 @@ void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
 	put_be32(&ewah_size, sb->len - ewah_start);
 	memcpy(sb->buf + fixup, &ewah_size, sizeof(uint32_t));
 
-	trace_printf_key(&trace_fsmonitor, "write fsmonitor extension successful");
+	trace2_data_string("index", NULL, "extension/fsmn/write/token",
+			   istate->fsmonitor_last_update);
+	trace_printf_key(&trace_fsmonitor,
+			 "write fsmonitor extension successful '%s'",
+			 istate->fsmonitor_last_update);
 }
 
 /*
- * Call the query-fsmonitor hook passing the time of the last saved results.
+ * Call the query-fsmonitor hook passing the last update token of the saved results.
  */
-static int query_fsmonitor(int version, uint64_t last_update, struct strbuf *query_result)
+static int query_fsmonitor(int version, const char *last_update, struct strbuf *query_result)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
+	int result;
 
 	if (!core_fsmonitor)
 		return -1;
 
-	argv_array_push(&cp.args, core_fsmonitor);
-	argv_array_pushf(&cp.args, "%d", version);
-	argv_array_pushf(&cp.args, "%" PRIuMAX, (uintmax_t)last_update);
+	strvec_push(&cp.args, core_fsmonitor);
+	strvec_pushf(&cp.args, "%d", version);
+	strvec_pushf(&cp.args, "%s", last_update);
 	cp.use_shell = 1;
 	cp.dir = get_git_work_tree();
 
-	return capture_command(&cp, query_result, 1024);
+	trace2_region_enter("fsm_hook", "query", NULL);
+
+	result = capture_command(&cp, query_result, 1024);
+
+	if (result)
+		trace2_data_intmax("fsm_hook", NULL, "query/failed", result);
+	else {
+		trace2_data_intmax("fsm_hook", NULL, "query/response-length",
+				   query_result->len);
+
+		if (fsmonitor_is_trivial_response(query_result))
+			trace2_data_intmax("fsm_hook", NULL,
+					   "query/trivial-response", 1);
+	}
+
+	trace2_region_leave("fsm_hook", "query", NULL);
+
+	return result;
 }
 
-static void fsmonitor_refresh_callback(struct index_state *istate, const char *name)
+int fsmonitor_is_trivial_response(const struct strbuf *query_result)
 {
-	int pos = index_name_pos(istate, name, strlen(name));
+	static char trivial_response[3] = { '\0', '/', '\0' };
 
-	if (pos >= 0) {
-		struct cache_entry *ce = istate->cache[pos];
-		ce->ce_flags &= ~CE_FSMONITOR_VALID;
+	return query_result->len >= 3 &&
+		!memcmp(trivial_response,
+			&query_result->buf[query_result->len - 3], 3);
+}
+
+static void fsmonitor_refresh_callback(struct index_state *istate, char *name)
+{
+	int i, len = strlen(name);
+	if (name[len - 1] == '/') {
+
+		/*
+		 * TODO We should binary search to find the first path with
+		 * TODO this directory prefix.  Then linearly update entries
+		 * TODO while the prefix matches.  Taking care to search without
+		 * TODO the trailing slash -- because '/' sorts after a few
+		 * TODO interesting special chars, like '.' and ' '.
+		 */
+
+		/* Mark all entries for the folder invalid */
+		for (i = 0; i < istate->cache_nr; i++) {
+			if (istate->cache[i]->ce_flags & CE_FSMONITOR_VALID &&
+			    starts_with(istate->cache[i]->name, name))
+				istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+		}
+		/* Need to remove the / from the path for the untracked cache */
+		name[len - 1] = '\0';
+	} else {
+		int pos = index_name_pos(istate, name, strlen(name));
+
+		if (pos >= 0) {
+			struct cache_entry *ce = istate->cache[pos];
+			ce->ce_flags &= ~CE_FSMONITOR_VALID;
+		}
 	}
 
 	/*
@@ -146,14 +232,18 @@ static void fsmonitor_refresh_callback(struct index_state *istate, const char *n
 void refresh_fsmonitor(struct index_state *istate)
 {
 	struct strbuf query_result = STRBUF_INIT;
-	int query_success = 0;
-	size_t bol; /* beginning of line */
+	int query_success = 0, hook_version = -1;
+	size_t bol = 0; /* beginning of line */
 	uint64_t last_update;
+	struct strbuf last_update_token = STRBUF_INIT;
 	char *buf;
 	unsigned int i;
 
 	if (!core_fsmonitor || istate->fsmonitor_has_run_once)
 		return;
+
+	hook_version = fsmonitor_hook_version();
+
 	istate->fsmonitor_has_run_once = 1;
 
 	trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
@@ -162,26 +252,60 @@ void refresh_fsmonitor(struct index_state *istate)
 	 * should be inclusive to ensure we don't miss potential changes.
 	 */
 	last_update = getnanotime();
+	if (hook_version == HOOK_INTERFACE_VERSION1)
+		strbuf_addf(&last_update_token, "%"PRIu64"", last_update);
 
 	/*
-	 * If we have a last update time, call query_fsmonitor for the set of
-	 * changes since that time, else assume everything is possibly dirty
+	 * If we have a last update token, call query_fsmonitor for the set of
+	 * changes since that token, else assume everything is possibly dirty
 	 * and check it all.
 	 */
 	if (istate->fsmonitor_last_update) {
-		query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION,
-			istate->fsmonitor_last_update, &query_result);
+		if (hook_version == -1 || hook_version == HOOK_INTERFACE_VERSION2) {
+			query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION2,
+				istate->fsmonitor_last_update, &query_result);
+
+			if (query_success) {
+				if (hook_version < 0)
+					hook_version = HOOK_INTERFACE_VERSION2;
+
+				/*
+				 * First entry will be the last update token
+				 * Need to use a char * variable because static
+				 * analysis was suggesting to use strbuf_addbuf
+				 * but we don't want to copy the entire strbuf
+				 * only the chars up to the first NUL
+				 */
+				buf = query_result.buf;
+				strbuf_addstr(&last_update_token, buf);
+				if (!last_update_token.len) {
+					warning("Empty last update token.");
+					query_success = 0;
+				} else {
+					bol = last_update_token.len + 1;
+				}
+			} else if (hook_version < 0) {
+				hook_version = HOOK_INTERFACE_VERSION1;
+				if (!last_update_token.len)
+					strbuf_addf(&last_update_token, "%"PRIu64"", last_update);
+			}
+		}
+
+		if (hook_version == HOOK_INTERFACE_VERSION1) {
+			query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION1,
+				istate->fsmonitor_last_update, &query_result);
+		}
+
 		trace_performance_since(last_update, "fsmonitor process '%s'", core_fsmonitor);
 		trace_printf_key(&trace_fsmonitor, "fsmonitor process '%s' returned %s",
 			core_fsmonitor, query_success ? "success" : "failure");
 	}
 
 	/* a fsmonitor process can return '/' to indicate all entries are invalid */
-	if (query_success && query_result.buf[0] != '/') {
+	if (query_success && query_result.buf[bol] != '/') {
 		/* Mark all entries returned by the monitor as dirty */
 		buf = query_result.buf;
-		bol = 0;
-		for (i = 0; i < query_result.len; i++) {
+		for (i = bol; i < query_result.len; i++) {
 			if (buf[i] != '\0')
 				continue;
 			fsmonitor_refresh_callback(istate, buf + bol);
@@ -189,21 +313,66 @@ void refresh_fsmonitor(struct index_state *istate)
 		}
 		if (bol < query_result.len)
 			fsmonitor_refresh_callback(istate, buf + bol);
+
+		/* Now mark the untracked cache for fsmonitor usage */
+		if (istate->untracked)
+			istate->untracked->use_fsmonitor = 1;
 	} else {
+
+		/* We only want to run the post index changed hook if we've actually changed entries, so keep track
+		 * if we actually changed entries or not */
+		int is_cache_changed = 0;
 		/* Mark all entries invalid */
-		for (i = 0; i < istate->cache_nr; i++)
-			istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+		for (i = 0; i < istate->cache_nr; i++) {
+			if (istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) {
+				is_cache_changed = 1;
+				istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+			}
+		}
 
 		/* If we're going to check every file, ensure we save the results */
-		istate->cache_changed |= FSMONITOR_CHANGED;
+		if (is_cache_changed)
+			istate->cache_changed |= FSMONITOR_CHANGED;
 
 		if (istate->untracked)
 			istate->untracked->use_fsmonitor = 0;
 	}
 	strbuf_release(&query_result);
 
-	/* Now that we've updated istate, save the last_update time */
-	istate->fsmonitor_last_update = last_update;
+	/* Now that we've updated istate, save the last_update_token */
+	FREE_AND_NULL(istate->fsmonitor_last_update);
+	istate->fsmonitor_last_update = strbuf_detach(&last_update_token, NULL);
+}
+
+/*
+ * The caller wants to turn on FSMonitor.  And when the caller writes
+ * the index to disk, a FSMonitor extension should be included.  This
+ * requires that `istate->fsmonitor_last_update` not be NULL.  But we
+ * have not actually talked to a FSMonitor process yet, so we don't
+ * have an initial value for this field.
+ *
+ * For a protocol V1 FSMonitor process, this field is a formatted
+ * "nanoseconds since epoch" field.  However, for a protocol V2
+ * FSMonitor process, this field is an opaque token.
+ *
+ * Historically, `add_fsmonitor()` has initialized this field to the
+ * current time for protocol V1 processes.  There are lots of race
+ * conditions here, but that code has shipped...
+ *
+ * The only true solution is to use a V2 FSMonitor and get a current
+ * or default token value (that it understands), but we cannot do that
+ * until we have actually talked to an instance of the FSMonitor process
+ * (but the protocol requires that we send a token first...).
+ *
+ * For simplicity, just initialize like we have a V1 process and require
+ * that V2 processes adapt.
+ */
+static void initialize_fsmonitor_last_update(struct index_state *istate)
+{
+	struct strbuf last_update = STRBUF_INIT;
+
+	strbuf_addf(&last_update, "%"PRIu64"", getnanotime());
+	istate->fsmonitor_last_update = strbuf_detach(&last_update, NULL);
 }
 
 void add_fsmonitor(struct index_state *istate)
@@ -213,7 +382,7 @@ void add_fsmonitor(struct index_state *istate)
 	if (!istate->fsmonitor_last_update) {
 		trace_printf_key(&trace_fsmonitor, "add fsmonitor");
 		istate->cache_changed |= FSMONITOR_CHANGED;
-		istate->fsmonitor_last_update = getnanotime();
+		initialize_fsmonitor_last_update(istate);
 
 		/* reset the fsmonitor state */
 		for (i = 0; i < istate->cache_nr; i++)
@@ -235,7 +404,7 @@ void remove_fsmonitor(struct index_state *istate)
 	if (istate->fsmonitor_last_update) {
 		trace_printf_key(&trace_fsmonitor, "remove fsmonitor");
 		istate->cache_changed |= FSMONITOR_CHANGED;
-		istate->fsmonitor_last_update = 0;
+		FREE_AND_NULL(istate->fsmonitor_last_update);
 	}
 }
 
@@ -252,14 +421,10 @@ void tweak_fsmonitor(struct index_state *istate)
 			}
 
 			/* Mark all previously saved entries as dirty */
-			if (istate->fsmonitor_dirty->bit_size > istate->cache_nr)
-				BUG("fsmonitor_dirty has more entries than the index (%"PRIuMAX" > %u)",
-				    (uintmax_t)istate->fsmonitor_dirty->bit_size, istate->cache_nr);
+			assert_index_minimum(istate, istate->fsmonitor_dirty->bit_size);
 			ewah_each_bit(istate->fsmonitor_dirty, fsmonitor_ewah_callback, istate);
 
-			/* Now mark the untracked cache for fsmonitor usage */
-			if (istate->untracked)
-				istate->untracked->use_fsmonitor = 1;
+			refresh_fsmonitor(istate);
 		}
 
 		ewah_free(istate->fsmonitor_dirty);
diff --git a/fsmonitor.h b/fsmonitor.h
index 739318ab6d..f20d72631d 100644
--- a/fsmonitor.h
+++ b/fsmonitor.h
@@ -45,6 +45,22 @@ void tweak_fsmonitor(struct index_state *istate);
 void refresh_fsmonitor(struct index_state *istate);
 
 /*
+ * Does the received result contain the "trivial" response?
+ */
+int fsmonitor_is_trivial_response(const struct strbuf *query_result);
+
+/*
+ * Check if refresh_fsmonitor has been called at least once.
+ * refresh_fsmonitor is idempotent. Returns true if fsmonitor is
+ * not enabled (since the state will be "fresh" w/ CE_FSMONITOR_VALID unset)
+ * This version is useful for assertions
+ */
+static inline int is_fsmonitor_refreshed(const struct index_state *istate)
+{
+	return !core_fsmonitor || istate->fsmonitor_has_run_once;
+}
+
+/*
  * Set the given cache entries CE_FSMONITOR_VALID bit. This should be
  * called any time the cache entry has been updated to reflect the
  * current state of the file on disk.
diff --git a/fuzz-commit-graph.c b/fuzz-commit-graph.c
index 0157acbf2e..e7cf6d5b0f 100644
--- a/fuzz-commit-graph.c
+++ b/fuzz-commit-graph.c
@@ -1,8 +1,8 @@
 #include "commit-graph.h"
 #include "repository.h"
 
-struct commit_graph *parse_commit_graph(void *graph_map, int fd,
-					size_t graph_size);
+struct commit_graph *parse_commit_graph(struct repository *r,
+					void *graph_map, size_t graph_size);
 
 int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size);
 
@@ -11,9 +11,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size)
 	struct commit_graph *g;
 
 	initialize_the_repository();
-	g = parse_commit_graph((void *)data, -1, size);
+	g = parse_commit_graph(the_repository, (void *)data, size);
 	repo_clear(the_repository);
-	free(g);
+	free_commit_graph(g);
 
 	return 0;
 }
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 71158f7d8b..9dbbb08e70 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -10,7 +10,7 @@ command_list () {
 }
 
 get_categories () {
-	tr ' ' '\n'|
+	tr ' ' '\012'|
 	grep -v '^$' |
 	sort |
 	uniq
@@ -76,23 +76,6 @@ print_command_list () {
 	echo "};"
 }
 
-print_config_list () {
-	cat <<EOF
-static const char *config_name_list[] = {
-EOF
-	grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt |
-	sed '/deprecated/d; s/::$//; s/,  */\n/g' |
-	sort |
-	while read line
-	do
-		echo "	\"$line\","
-	done
-	cat <<EOF
-	NULL,
-};
-EOF
-}
-
 exclude_programs=
 while test "--exclude-program" = "$1"
 do
@@ -113,5 +96,3 @@ echo
 define_category_names "$1"
 echo
 print_command_list "$1"
-echo
-print_config_list
diff --git a/generate-configlist.sh b/generate-configlist.sh
new file mode 100755
index 0000000000..8692fe5cf4
--- /dev/null
+++ b/generate-configlist.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+echo "/* Automatically generated by generate-configlist.sh */"
+echo
+
+print_config_list () {
+	cat <<EOF
+static const char *config_name_list[] = {
+EOF
+	grep -h '^[a-zA-Z].*\..*::$' Documentation/*config.txt Documentation/config/*.txt |
+	sed '/deprecated/d; s/::$//; s/,  */\n/g' |
+	sort |
+	sed 's/^.*$/	"&",/'
+	cat <<EOF
+	NULL,
+};
+EOF
+}
+
+echo
+print_config_list
diff --git a/gettext.c b/gettext.c
index 35d2c1218d..bb5ba1fe7c 100644
--- a/gettext.c
+++ b/gettext.c
@@ -65,15 +65,8 @@ const char *get_preferred_languages(void)
 	return NULL;
 }
 
-int use_gettext_poison(void)
-{
-	static int poison_requested = -1;
-	if (poison_requested == -1)
-		poison_requested = git_env_bool("GIT_TEST_GETTEXT_POISON", 0);
-	return poison_requested;
-}
-
 #ifndef NO_GETTEXT
+__attribute__((format (printf, 1, 2)))
 static int test_vsnprintf(const char *fmt, ...)
 {
 	char buf[26];
@@ -87,88 +80,24 @@ static int test_vsnprintf(const char *fmt, ...)
 
 static void init_gettext_charset(const char *domain)
 {
-	/*
-	   This trick arranges for messages to be emitted in the user's
-	   requested encoding, but avoids setting LC_CTYPE from the
-	   environment for the whole program.
-
-	   This primarily done to avoid a bug in vsnprintf in the GNU C
-	   Library [1]. which triggered a "your vsnprintf is broken" error
-	   on Git's own repository when inspecting v0.99.6~1 under a UTF-8
-	   locale.
-
-	   That commit contains a ISO-8859-1 encoded author name, which
-	   the locale aware vsnprintf(3) won't interpolate in the format
-	   argument, due to mismatch between the data encoding and the
-	   locale.
-
-	   Even if it wasn't for that bug we wouldn't want to use LC_CTYPE at
-	   this point, because it'd require auditing all the code that uses C
-	   functions whose semantics are modified by LC_CTYPE.
-
-	   But only setting LC_MESSAGES as we do creates a problem, since
-	   we declare the encoding of our PO files[2] the gettext
-	   implementation will try to recode it to the user's locale, but
-	   without LC_CTYPE it'll emit something like this on 'git init'
-	   under the Icelandic locale:
-
-	       Bj? til t?ma Git lind ? /hlagh/.git/
-
-	   Gettext knows about the encoding of our PO file, but we haven't
-	   told it about the user's encoding, so all the non-US-ASCII
-	   characters get encoded to question marks.
-
-	   But we're in luck! We can set LC_CTYPE from the environment
-	   only while we call nl_langinfo and
-	   bind_textdomain_codeset. That suffices to tell gettext what
-	   encoding it should emit in, so it'll now say:
-
-	       Bjó til tóma Git lind í /hlagh/.git/
-
-	   And the equivalent ISO-8859-1 string will be emitted under a
-	   ISO-8859-1 locale.
-
-	   With this change way we get the advantages of setting LC_CTYPE
-	   (talk to the user in his language/encoding), without the major
-	   drawbacks (changed semantics for C functions we rely on).
-
-	   However foreign functions using other message catalogs that
-	   aren't using our neat trick will still have a problem, e.g. if
-	   we have to call perror(3):
-
-	   #include <stdio.h>
-	   #include <locale.h>
-	   #include <errno.h>
-
-	   int main(void)
-	   {
-		   setlocale(LC_MESSAGES, "");
-		   setlocale(LC_CTYPE, "C");
-		   errno = ENODEV;
-		   perror("test");
-		   return 0;
-	   }
-
-	   Running that will give you a message with question marks:
-
-	   $ LANGUAGE= LANG=de_DE.utf8 ./test
-	   test: Kein passendes Ger?t gefunden
-
-	   The vsnprintf bug has been fixed since glibc 2.17.
-
-	   Then we could simply set LC_CTYPE from the environment, which would
-	   make things like the external perror(3) messages work.
-
-	   See t/t0203-gettext-setlocale-sanity.sh's "gettext.c" tests for
-	   regression tests.
-
-	   1. http://sourceware.org/bugzilla/show_bug.cgi?id=6530
-	   2. E.g. "Content-Type: text/plain; charset=UTF-8\n" in po/is.po
-	*/
 	setlocale(LC_CTYPE, "");
 	charset = locale_charset();
 	bind_textdomain_codeset(domain, charset);
-	/* the string is taken from v0.99.6~1 */
+
+	/*
+	 * Work around an old bug fixed in glibc 2.17 (released on
+	 * 2012-12-24), at the cost of potentially making translated
+	 * messages from external functions like perror() emitted in
+	 * the wrong encoding.
+	 *
+	 * The bug affected e.g. git.git's own 7eb93c89651 ([PATCH]
+	 * Simplify git script, 2005-09-07), which is the origin of
+	 * the "David_K\345gedal" test string.
+	 *
+	 * See a much longer comment added to this file in 5e9637c6297
+	 * (i18n: add infrastructure for translating Git with gettext,
+	 * 2011-11-18) for more details.
+	 */
 	if (test_vsnprintf("%.*s", 13, "David_K\345gedal") < 0)
 		setlocale(LC_CTYPE, "C");
 }
@@ -181,8 +110,6 @@ void git_setup_gettext(void)
 	if (!podir)
 		podir = p = system_path(GIT_LOCALE_PATH);
 
-	use_gettext_poison(); /* getenv() reentrancy paranoia */
-
 	if (!is_directory(podir)) {
 		free(p);
 		return;
diff --git a/gettext.h b/gettext.h
index bee52eb113..c8b34fd612 100644
--- a/gettext.h
+++ b/gettext.h
@@ -28,15 +28,12 @@
 
 #define FORMAT_PRESERVING(n) __attribute__((format_arg(n)))
 
-int use_gettext_poison(void);
-
 #ifndef NO_GETTEXT
 void git_setup_gettext(void);
 int gettext_width(const char *s);
 #else
 static inline void git_setup_gettext(void)
 {
-	use_gettext_poison(); /* getenv() reentrancy paranoia */
 }
 static inline int gettext_width(const char *s)
 {
@@ -48,14 +45,12 @@ static inline FORMAT_PRESERVING(1) const char *_(const char *msgid)
 {
 	if (!*msgid)
 		return "";
-	return use_gettext_poison() ? "# GETTEXT POISON #" : gettext(msgid);
+	return gettext(msgid);
 }
 
 static inline FORMAT_PRESERVING(1) FORMAT_PRESERVING(2)
 const char *Q_(const char *msgid, const char *plu, unsigned long n)
 {
-	if (use_gettext_poison())
-		return "# GETTEXT POISON #";
 	return ngettext(msgid, plu, n);
 }
 
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 52659bb74c..bc3a1e8eff 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -30,9 +30,9 @@ my ($fraginfo_color) =
 	$diff_use_color ? (
 		$repo->get_color('color.diff.frag', 'cyan'),
 	) : ();
-my ($diff_plain_color) =
+my ($diff_context_color) =
 	$diff_use_color ? (
-		$repo->get_color('color.diff.plain', ''),
+		$repo->get_color($repo->config('color.diff.context') ? 'color.diff.context' : 'color.diff.plain', ''),
 	) : ();
 my ($diff_old_color) =
 	$diff_use_color ? (
@@ -177,7 +177,9 @@ sub run_cmd_pipe {
 	} else {
 		my $fh = undef;
 		open($fh, '-|', @_) or die;
-		return <$fh>;
+		my @out = <$fh>;
+		close $fh || die "Cannot close @_ ($!)";
+		return @out;
 	}
 }
 
@@ -224,7 +226,7 @@ my $status_head = sprintf($status_fmt, __('staged'), __('unstaged'), __('path'))
 	sub get_empty_tree {
 		return $empty_tree if defined $empty_tree;
 
-		$empty_tree = run_cmd_pipe(qw(git hash-object -t tree /dev/null));
+		($empty_tree) = run_cmd_pipe(qw(git hash-object -t tree /dev/null));
 		chomp $empty_tree;
 		return $empty_tree;
 	}
@@ -481,10 +483,8 @@ sub list_and_choose {
 		my $last_lf = 0;
 
 		if ($opts->{HEADER}) {
-			if (!$opts->{LIST_FLAT}) {
-				print "     ";
-			}
-			print colored $header_color, "$opts->{HEADER}\n";
+			my $indent = $opts->{LIST_FLAT} ? "" : "     ";
+			print colored $header_color, "$indent$opts->{HEADER}\n";
 		}
 		for ($i = 0; $i < @stuff; $i++) {
 			my $chosen = $chosen[$i] ? '*' : ' ';
@@ -712,7 +712,7 @@ sub parse_diff {
 	if (defined $patch_mode_revision) {
 		push @diff_cmd, get_diff_reference($patch_mode_revision);
 	}
-	my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path);
+	my @diff = run_cmd_pipe("git", @diff_cmd, qw(--no-color --), $path);
 	my @colored = ();
 	if ($diff_use_color) {
 		my @display_cmd = ("git", @diff_cmd, qw(--color --), $path);
@@ -752,8 +752,13 @@ sub parse_diff_header {
 	my $head = { TEXT => [], DISPLAY => [], TYPE => 'header' };
 	my $mode = { TEXT => [], DISPLAY => [], TYPE => 'mode' };
 	my $deletion = { TEXT => [], DISPLAY => [], TYPE => 'deletion' };
+	my $addition;
 
 	for (my $i = 0; $i < @{$src->{TEXT}}; $i++) {
+		if ($src->{TEXT}->[$i] =~ /^new file/) {
+			$addition = 1;
+			$head->{TYPE} = 'addition';
+		}
 		my $dest =
 		   $src->{TEXT}->[$i] =~ /^(old|new) mode (\d+)$/ ? $mode :
 		   $src->{TEXT}->[$i] =~ /^deleted file/ ? $deletion :
@@ -761,7 +766,7 @@ sub parse_diff_header {
 		push @{$dest->{TEXT}}, $src->{TEXT}->[$i];
 		push @{$dest->{DISPLAY}}, $src->{DISPLAY}->[$i];
 	}
-	return ($head, $mode, $deletion);
+	return ($head, $mode, $deletion, $addition);
 }
 
 sub hunk_splittable {
@@ -1041,7 +1046,7 @@ sub color_diff {
 		colored((/^@/  ? $fraginfo_color :
 			 /^\+/ ? $diff_new_color :
 			 /^-/  ? $diff_old_color :
-			 $diff_plain_color),
+			 $diff_context_color),
 			$_);
 	} @_;
 }
@@ -1127,7 +1132,7 @@ aborted and the hunk is left unchanged.
 EOF2
 	close $fh;
 
-	chomp(my $editor = run_cmd_pipe(qw(git var GIT_EDITOR)));
+	chomp(my ($editor) = run_cmd_pipe(qw(git var GIT_EDITOR)));
 	system('sh', '-c', $editor.' "$@"', $editor, $hunkfile);
 
 	if ($? != 0) {
@@ -1425,46 +1430,55 @@ my %patch_update_prompt_modes = (
 	stage => {
 		mode => N__("Stage mode change [y,n,q,a,d%s,?]? "),
 		deletion => N__("Stage deletion [y,n,q,a,d%s,?]? "),
+		addition => N__("Stage addition [y,n,q,a,d%s,?]? "),
 		hunk => N__("Stage this hunk [y,n,q,a,d%s,?]? "),
 	},
 	stash => {
 		mode => N__("Stash mode change [y,n,q,a,d%s,?]? "),
 		deletion => N__("Stash deletion [y,n,q,a,d%s,?]? "),
+		addition => N__("Stash addition [y,n,q,a,d%s,?]? "),
 		hunk => N__("Stash this hunk [y,n,q,a,d%s,?]? "),
 	},
 	reset_head => {
 		mode => N__("Unstage mode change [y,n,q,a,d%s,?]? "),
 		deletion => N__("Unstage deletion [y,n,q,a,d%s,?]? "),
+		addition => N__("Unstage addition [y,n,q,a,d%s,?]? "),
 		hunk => N__("Unstage this hunk [y,n,q,a,d%s,?]? "),
 	},
 	reset_nothead => {
 		mode => N__("Apply mode change to index [y,n,q,a,d%s,?]? "),
 		deletion => N__("Apply deletion to index [y,n,q,a,d%s,?]? "),
+		addition => N__("Apply addition to index [y,n,q,a,d%s,?]? "),
 		hunk => N__("Apply this hunk to index [y,n,q,a,d%s,?]? "),
 	},
 	checkout_index => {
 		mode => N__("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
 		deletion => N__("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
+		addition => N__("Discard addition from worktree [y,n,q,a,d%s,?]? "),
 		hunk => N__("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
 	},
 	checkout_head => {
 		mode => N__("Discard mode change from index and worktree [y,n,q,a,d%s,?]? "),
 		deletion => N__("Discard deletion from index and worktree [y,n,q,a,d%s,?]? "),
+		addition => N__("Discard addition from index and worktree [y,n,q,a,d%s,?]? "),
 		hunk => N__("Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "),
 	},
 	checkout_nothead => {
 		mode => N__("Apply mode change to index and worktree [y,n,q,a,d%s,?]? "),
 		deletion => N__("Apply deletion to index and worktree [y,n,q,a,d%s,?]? "),
+		addition => N__("Apply addition to index and worktree [y,n,q,a,d%s,?]? "),
 		hunk => N__("Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "),
 	},
 	worktree_head => {
 		mode => N__("Discard mode change from worktree [y,n,q,a,d%s,?]? "),
 		deletion => N__("Discard deletion from worktree [y,n,q,a,d%s,?]? "),
+		addition => N__("Discard addition from worktree [y,n,q,a,d%s,?]? "),
 		hunk => N__("Discard this hunk from worktree [y,n,q,a,d%s,?]? "),
 	},
 	worktree_nothead => {
 		mode => N__("Apply mode change to worktree [y,n,q,a,d%s,?]? "),
 		deletion => N__("Apply deletion to worktree [y,n,q,a,d%s,?]? "),
+		addition => N__("Apply addition to worktree [y,n,q,a,d%s,?]? "),
 		hunk => N__("Apply this hunk to worktree [y,n,q,a,d%s,?]? "),
 	},
 );
@@ -1474,7 +1488,7 @@ sub patch_update_file {
 	my ($ix, $num);
 	my $path = shift;
 	my ($head, @hunk) = parse_diff($path);
-	($head, my $mode, my $deletion) = parse_diff_header($head);
+	($head, my $mode, my $deletion, my $addition) = parse_diff_header($head);
 	for (@{$head->{DISPLAY}}) {
 		print;
 	}
@@ -1497,6 +1511,7 @@ sub patch_update_file {
 		my ($prev, $next, $other, $undecided, $i);
 		$other = '';
 
+		last if ($ix and !$num);
 		if ($num <= $ix) {
 			$ix = 0;
 		}
@@ -1529,35 +1544,51 @@ sub patch_update_file {
 				last;
 			}
 		}
-		last if (!$undecided);
+		last if (!$undecided && ($num || !$addition));
 
-		if ($hunk[$ix]{TYPE} eq 'hunk' &&
-		    hunk_splittable($hunk[$ix]{TEXT})) {
-			$other .= ',s';
-		}
-		if ($hunk[$ix]{TYPE} eq 'hunk') {
-			$other .= ',e';
-		}
-		for (@{$hunk[$ix]{DISPLAY}}) {
-			print;
+		if ($num) {
+			if ($hunk[$ix]{TYPE} eq 'hunk' &&
+			    hunk_splittable($hunk[$ix]{TEXT})) {
+				$other .= ',s';
+			}
+			if ($hunk[$ix]{TYPE} eq 'hunk') {
+				$other .= ',e';
+			}
+			for (@{$hunk[$ix]{DISPLAY}}) {
+				print;
+			}
 		}
-		print colored $prompt_color, "(", ($ix+1), "/$num) ",
-			sprintf(__($patch_update_prompt_modes{$patch_mode}{$hunk[$ix]{TYPE}}), $other);
+		my $type = $num ? $hunk[$ix]{TYPE} : $head->{TYPE};
+		print colored $prompt_color, "(", ($ix+1), "/", ($num ? $num : 1), ") ",
+			sprintf(__($patch_update_prompt_modes{$patch_mode}{$type}), $other);
 
 		my $line = prompt_single_character;
 		last unless defined $line;
 		if ($line) {
 			if ($line =~ /^y/i) {
-				$hunk[$ix]{USE} = 1;
+				if ($num) {
+					$hunk[$ix]{USE} = 1;
+				} else {
+					$head->{USE} = 1;
+				}
 			}
 			elsif ($line =~ /^n/i) {
-				$hunk[$ix]{USE} = 0;
+				if ($num) {
+					$hunk[$ix]{USE} = 0;
+				} else {
+					$head->{USE} = 0;
+				}
 			}
 			elsif ($line =~ /^a/i) {
-				while ($ix < $num) {
-					if (!defined $hunk[$ix]{USE}) {
-						$hunk[$ix]{USE} = 1;
+				if ($num) {
+					while ($ix < $num) {
+						if (!defined $hunk[$ix]{USE}) {
+							$hunk[$ix]{USE} = 1;
+						}
+						$ix++;
 					}
+				} else {
+					$head->{USE} = 1;
 					$ix++;
 				}
 				next;
@@ -1594,19 +1625,28 @@ sub patch_update_file {
 				next;
 			}
 			elsif ($line =~ /^d/i) {
-				while ($ix < $num) {
-					if (!defined $hunk[$ix]{USE}) {
-						$hunk[$ix]{USE} = 0;
+				if ($num) {
+					while ($ix < $num) {
+						if (!defined $hunk[$ix]{USE}) {
+							$hunk[$ix]{USE} = 0;
+						}
+						$ix++;
 					}
+				} else {
+					$head->{USE} = 0;
 					$ix++;
 				}
 				next;
 			}
 			elsif ($line =~ /^q/i) {
-				for ($i = 0; $i < $num; $i++) {
-					if (!defined $hunk[$i]{USE}) {
-						$hunk[$i]{USE} = 0;
+				if ($num) {
+					for ($i = 0; $i < $num; $i++) {
+						if (!defined $hunk[$i]{USE}) {
+							$hunk[$i]{USE} = 0;
+						}
 					}
+				} elsif (!defined $head->{USE}) {
+					$head->{USE} = 0;
 				}
 				$quit = 1;
 				last;
@@ -1724,7 +1764,7 @@ sub patch_update_file {
 		}
 	}
 
-	@hunk = coalesce_overlapping_hunks(@hunk);
+	@hunk = coalesce_overlapping_hunks(@hunk) if ($num);
 
 	my $n_lofs = 0;
 	my @result = ();
@@ -1734,7 +1774,7 @@ sub patch_update_file {
 		}
 	}
 
-	if (@result) {
+	if (@result or $head->{USE}) {
 		my @patch = reassemble_patch($head->{TEXT}, @result);
 		my $apply_routine = $patch_mode_flavour{APPLY};
 		&$apply_routine(@patch);
@@ -1788,6 +1828,13 @@ sub process_args {
 				$arg = shift @ARGV or die __("missing --");
 				if ($arg ne '--') {
 					$patch_mode_revision = $arg;
+
+					# NEEDSWORK: Instead of comparing to the literal "HEAD",
+					# compare the commit objects instead so that other ways of
+					# saying the same thing (such as "@") are also handled
+					# appropriately.
+					#
+					# This applies to the cases below too.
 					$patch_mode = ($arg eq 'HEAD' ?
 						       'reset_head' : 'reset_nothead');
 					$arg = shift @ARGV or die __("missing --");
diff --git a/git-bisect.sh b/git-bisect.sh
index efee12b8b1..6a7afaea8d 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -3,8 +3,8 @@
 USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]'
 LONG_USAGE='git bisect help
 	print this long help message.
-git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
-		 [--no-checkout] [<bad> [<good>...]] [--] [<pathspec>...]
+git bisect start [--term-{new,bad}=<term> --term-{old,good}=<term>]
+		 [--no-checkout] [--first-parent] [<bad> [<good>...]] [--] [<pathspec>...]
 	reset bisect state and start bisection.
 git bisect (bad|new) [<rev>]
 	mark <rev> a known-bad revision/
@@ -39,148 +39,6 @@ _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"
 TERM_BAD=bad
 TERM_GOOD=good
 
-bisect_head()
-{
-	if test -f "$GIT_DIR/BISECT_HEAD"
-	then
-		echo BISECT_HEAD
-	else
-		echo HEAD
-	fi
-}
-
-bisect_autostart() {
-	test -s "$GIT_DIR/BISECT_START" || {
-		gettextln "You need to start by \"git bisect start\"" >&2
-		if test -t 0
-		then
-			# TRANSLATORS: Make sure to include [Y] and [n] in your
-			# translation. The program will only accept English input
-			# at this point.
-			gettext "Do you want me to do it for you [Y/n]? " >&2
-			read yesno
-			case "$yesno" in
-			[Nn]*)
-				exit ;;
-			esac
-			bisect_start
-		else
-			exit 1
-		fi
-	}
-}
-
-bisect_start() {
-	git bisect--helper --bisect-start $@ || exit
-
-	#
-	# Change state.
-	# In case of mistaken revs or checkout error, or signals received,
-	# "bisect_auto_next" below may exit or misbehave.
-	# We have to trap this to be able to clean up using
-	# "bisect_clean_state".
-	#
-	trap 'git bisect--helper --bisect-clean-state' 0
-	trap 'exit 255' 1 2 3 15
-
-	#
-	# Check if we can proceed to the next bisect state.
-	#
-	get_terms
-	bisect_auto_next
-
-	trap '-' 0
-}
-
-bisect_skip() {
-	all=''
-	for arg in "$@"
-	do
-		case "$arg" in
-		*..*)
-			revs=$(git rev-list "$arg") || die "$(eval_gettext "Bad rev input: \$arg")" ;;
-		*)
-			revs=$(git rev-parse --sq-quote "$arg") ;;
-		esac
-		all="$all $revs"
-	done
-	eval bisect_state 'skip' $all
-}
-
-bisect_state() {
-	bisect_autostart
-	state=$1
-	git bisect--helper --check-and-set-terms $state $TERM_GOOD $TERM_BAD || exit
-	get_terms
-	case "$#,$state" in
-	0,*)
-		die "Please call 'bisect_state' with at least one argument." ;;
-	1,"$TERM_BAD"|1,"$TERM_GOOD"|1,skip)
-		bisected_head=$(bisect_head)
-		rev=$(git rev-parse --verify "$bisected_head") ||
-			die "$(eval_gettext "Bad rev input: \$bisected_head")"
-		git bisect--helper --bisect-write "$state" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit
-		git bisect--helper --check-expected-revs "$rev" ;;
-	2,"$TERM_BAD"|*,"$TERM_GOOD"|*,skip)
-		shift
-		hash_list=''
-		for rev in "$@"
-		do
-			sha=$(git rev-parse --verify "$rev^{commit}") ||
-				die "$(eval_gettext "Bad rev input: \$rev")"
-			hash_list="$hash_list $sha"
-		done
-		for rev in $hash_list
-		do
-			git bisect--helper --bisect-write "$state" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit
-		done
-		git bisect--helper --check-expected-revs $hash_list ;;
-	*,"$TERM_BAD")
-		die "$(eval_gettext "'git bisect \$TERM_BAD' can take only one argument.")" ;;
-	*)
-		usage ;;
-	esac
-	bisect_auto_next
-}
-
-bisect_auto_next() {
-	git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD && bisect_next || :
-}
-
-bisect_next() {
-	case "$#" in 0) ;; *) usage ;; esac
-	bisect_autostart
-	git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD $TERM_GOOD|| exit
-
-	# Perform all bisection computation, display and checkout
-	git bisect--helper --next-all $(test -f "$GIT_DIR/BISECT_HEAD" && echo --no-checkout)
-	res=$?
-
-	# Check if we should exit because bisection is finished
-	if test $res -eq 10
-	then
-		bad_rev=$(git show-ref --hash --verify refs/bisect/$TERM_BAD)
-		bad_commit=$(git show-branch $bad_rev)
-		echo "# first $TERM_BAD commit: $bad_commit" >>"$GIT_DIR/BISECT_LOG"
-		exit 0
-	elif test $res -eq 2
-	then
-		echo "# only skipped commits left to test" >>"$GIT_DIR/BISECT_LOG"
-		good_revs=$(git for-each-ref --format="%(objectname)" "refs/bisect/$TERM_GOOD-*")
-		for skipped in $(git rev-list refs/bisect/$TERM_BAD --not $good_revs)
-		do
-			skipped_commit=$(git show-branch $skipped)
-			echo "# possible first $TERM_BAD commit: $skipped_commit" >>"$GIT_DIR/BISECT_LOG"
-		done
-		exit $res
-	fi
-
-	# Check for an error in the bisection process
-	test $res -ne 0 && exit $res
-
-	return 0
-}
-
 bisect_visualize() {
 	git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit
 
@@ -204,37 +62,6 @@ bisect_visualize() {
 	eval '"$@"' --bisect -- $(cat "$GIT_DIR/BISECT_NAMES")
 }
 
-bisect_replay () {
-	file="$1"
-	test "$#" -eq 1 || die "$(gettext "No logfile given")"
-	test -r "$file" || die "$(eval_gettext "cannot read \$file for replaying")"
-	git bisect--helper --bisect-reset || exit
-	while read git bisect command rev
-	do
-		test "$git $bisect" = "git bisect" || test "$git" = "git-bisect" || continue
-		if test "$git" = "git-bisect"
-		then
-			rev="$command"
-			command="$bisect"
-		fi
-		get_terms
-		git bisect--helper --check-and-set-terms "$command" "$TERM_GOOD" "$TERM_BAD" || exit
-		get_terms
-		case "$command" in
-		start)
-			cmd="bisect_start $rev"
-			eval "$cmd" ;;
-		"$TERM_GOOD"|"$TERM_BAD"|skip)
-			git bisect--helper --bisect-write "$command" "$rev" "$TERM_GOOD" "$TERM_BAD" || exit;;
-		terms)
-			git bisect--helper --bisect-terms $rev || exit;;
-		*)
-			die "$(gettext "?? what are you talking about?")" ;;
-		esac
-	done <"$file"
-	bisect_auto_next
-}
-
 bisect_run () {
 	git bisect--helper --bisect-next-check $TERM_GOOD $TERM_BAD fail || exit
 
@@ -267,8 +94,7 @@ exit code \$res from '\$command' is < 0 or >= 128" >&2
 			state="$TERM_GOOD"
 		fi
 
-		# We have to use a subshell because "bisect_state" can exit.
-		( bisect_state $state >"$GIT_DIR/BISECT_RUN" )
+		git bisect--helper --bisect-state $state >"$GIT_DIR/BISECT_RUN"
 		res=$?
 
 		cat "$GIT_DIR/BISECT_RUN"
@@ -283,7 +109,7 @@ exit code \$res from '\$command' is < 0 or >= 128" >&2
 		if [ $res -ne 0 ]
 		then
 			eval_gettextln "bisect run failed:
-'bisect_state \$state' exited with error code \$res" >&2
+'bisect-state \$state' exited with error code \$res" >&2
 			exit $res
 		fi
 
@@ -296,11 +122,6 @@ exit code \$res from '\$command' is < 0 or >= 128" >&2
 	done
 }
 
-bisect_log () {
-	test -s "$GIT_DIR/BISECT_LOG" || die "$(gettext "We are not bisecting.")"
-	cat "$GIT_DIR/BISECT_LOG"
-}
-
 get_terms () {
 	if test -s "$GIT_DIR/BISECT_TERMS"
 	then
@@ -322,22 +143,22 @@ case "$#" in
 	help)
 		git bisect -h ;;
 	start)
-		bisect_start "$@" ;;
+		git bisect--helper --bisect-start "$@" ;;
 	bad|good|new|old|"$TERM_BAD"|"$TERM_GOOD")
-		bisect_state "$cmd" "$@" ;;
+		git bisect--helper --bisect-state "$cmd" "$@" ;;
 	skip)
-		bisect_skip "$@" ;;
+		git bisect--helper --bisect-skip "$@" || exit;;
 	next)
 		# Not sure we want "next" at the UI level anymore.
-		bisect_next "$@" ;;
+		git bisect--helper --bisect-next "$@" || exit ;;
 	visualize|view)
 		bisect_visualize "$@" ;;
 	reset)
 		git bisect--helper --bisect-reset "$@" ;;
 	replay)
-		bisect_replay "$@" ;;
+		git bisect--helper --bisect-replay "$@" || exit;;
 	log)
-		bisect_log ;;
+		git bisect--helper --bisect-log || exit ;;
 	run)
 		bisect_run "$@" ;;
 	terms)
diff --git a/git-compat-util.h b/git-compat-util.h
index 607dca7534..b46605300a 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -252,8 +252,15 @@ typedef unsigned long uintptr_t;
 #ifdef PRECOMPOSE_UNICODE
 #include "compat/precompose_utf8.h"
 #else
-#define precompose_str(in,i_nfd2nfc)
-#define precompose_argv(c,v)
+static inline const char *precompose_argv_prefix(int argc, const char **argv, const char *prefix)
+{
+	return prefix;
+}
+static inline const char *precompose_string_if_needed(const char *in)
+{
+	return in;
+}
+
 #define probe_utf8_pathname_composition()
 #endif
 
@@ -270,7 +277,9 @@ struct itimerval {
 #endif
 
 #ifdef NO_SETITIMER
-#define setitimer(which,value,ovalue)
+static inline int setitimer(int which, const struct itimerval *value, struct itimerval *newvalue) {
+	return 0; /* pretend success */
+}
 #endif
 
 #ifndef NO_LIBGEN_H
@@ -320,26 +329,6 @@ char *gitdirname(char *);
 #define PATH_MAX 4096
 #endif
 
-#ifndef PRIuMAX
-#define PRIuMAX "llu"
-#endif
-
-#ifndef SCNuMAX
-#define SCNuMAX PRIuMAX
-#endif
-
-#ifndef PRIu32
-#define PRIu32 "u"
-#endif
-
-#ifndef PRIx32
-#define PRIx32 "x"
-#endif
-
-#ifndef PRIo32
-#define PRIo32 "o"
-#endif
-
 typedef uintmax_t timestamp_t;
 #define PRItime PRIuMAX
 #define parse_timestamp strtoumax
@@ -365,6 +354,11 @@ static inline int noop_core_config(const char *var, const char *value, void *cb)
 #define platform_core_config noop_core_config
 #endif
 
+int lstat_cache_aware_rmdir(const char *path);
+#if !defined(__MINGW32__) && !defined(_MSC_VER)
+#define rmdir lstat_cache_aware_rmdir
+#endif
+
 #ifndef has_dos_drive_prefix
 static inline int git_has_dos_drive_prefix(const char *path)
 {
@@ -397,6 +391,10 @@ static inline int git_offset_1st_component(const char *path)
 #define offset_1st_component git_offset_1st_component
 #endif
 
+#ifndef is_valid_path
+#define is_valid_path(path) 1
+#endif
+
 #ifndef find_last_dir_sep
 static inline char *git_find_last_dir_sep(const char *path)
 {
@@ -405,6 +403,14 @@ static inline char *git_find_last_dir_sep(const char *path)
 #define find_last_dir_sep git_find_last_dir_sep
 #endif
 
+#ifndef has_dir_sep
+static inline int git_has_dir_sep(const char *path)
+{
+	return !!strchr(path, '/');
+}
+#define has_dir_sep(path) git_has_dir_sep(path)
+#endif
+
 #ifndef query_user_email
 #define query_user_email() NULL
 #endif
@@ -493,11 +499,13 @@ static inline int const_error(void)
 #define error_errno(...) (error_errno(__VA_ARGS__), const_error())
 #endif
 
-void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));
-void set_error_routine(void (*routine)(const char *err, va_list params));
-extern void (*get_error_routine(void))(const char *err, va_list params);
-void set_warn_routine(void (*routine)(const char *warn, va_list params));
-extern void (*get_warn_routine(void))(const char *warn, va_list params);
+typedef void (*report_fn)(const char *, va_list params);
+
+void set_die_routine(NORETURN_PTR report_fn routine);
+void set_error_routine(report_fn routine);
+report_fn get_error_routine(void);
+void set_warn_routine(report_fn routine);
+report_fn get_warn_routine(void);
 void set_die_is_recursing_routine(int (*routine)(void));
 
 int starts_with(const char *str, const char *prefix);
@@ -790,6 +798,12 @@ int git_vsnprintf(char *str, size_t maxsize,
 		  const char *format, va_list ap);
 #endif
 
+#ifdef OPEN_RETURNS_EINTR
+#undef open
+#define open git_open_with_retry
+int git_open_with_retry(const char *path, int flag, ...);
+#endif
+
 #ifdef __GLIBC_PREREQ
 #if __GLIBC_PREREQ(2, 1)
 #define HAVE_STRCHRNUL
@@ -862,6 +876,7 @@ char *xstrndup(const char *str, size_t len);
 void *xrealloc(void *ptr, size_t size);
 void *xcalloc(size_t nmemb, size_t size);
 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);
 int xopen(const char *path, int flags, ...);
 ssize_t xread(int fd, void *buf, size_t len);
@@ -877,13 +892,19 @@ FILE *fopen_for_writing(const char *path);
 FILE *fopen_or_warn(const char *path, const char *mode);
 
 /*
+ * Like strncmp, but only return zero if s is NUL-terminated and exactly len
+ * characters long.  If it is not, consider it greater than t.
+ */
+int xstrncmpz(const char *s, const char *t, size_t len);
+
+/*
  * FREE_AND_NULL(ptr) is like free(ptr) followed by ptr = NULL. Note
  * that ptr is used twice, so don't pass e.g. ptr++.
  */
 #define FREE_AND_NULL(p) do { free(p); (p) = NULL; } while (0)
 
 #define ALLOC_ARRAY(x, alloc) (x) = xmalloc(st_mult(sizeof(*(x)), (alloc)))
-#define CALLOC_ARRAY(x, alloc) (x) = xcalloc((alloc), sizeof(*(x)));
+#define CALLOC_ARRAY(x, alloc) (x) = xcalloc((alloc), sizeof(*(x)))
 #define REALLOC_ARRAY(x, alloc) (x) = xrealloc((x), st_mult(sizeof(*(x)), (alloc)))
 
 #define COPY_ARRAY(dst, src, n) copy_array((dst), (src), (n), sizeof(*(dst)) + \
@@ -966,11 +987,9 @@ static inline char *xstrdup_or_null(const char *str)
 
 static inline size_t xsize_t(off_t len)
 {
-	size_t size = (size_t) len;
-
-	if (len != (off_t) size)
+	if (len < 0 || (uintmax_t) len > SIZE_MAX)
 		die("Cannot handle files this big");
-	return size;
+	return (size_t) len;
 }
 
 __attribute__((format (printf, 3, 4)))
@@ -1172,9 +1191,12 @@ static inline int regexec_buf(const regex_t *preg, const char *buf, size_t size,
 #endif
 #endif
 
-#if defined(__GNUC__) || (_MSC_VER >= 1400) || defined(__C99_MACRO_WITH_VA_ARGS)
+/*
+ * This is always defined as a first step towards making the use of variadic
+ * macros unconditional. If it causes compilation problems on your platform,
+ * please report it to the Git mailing list at git@vger.kernel.org.
+ */
 #define HAVE_VARIADIC_MACROS 1
-#endif
 
 /* usage.c: only to be used for testing BUG() implementation (see test-tool) */
 extern int BUG_exit_code;
@@ -1224,12 +1246,12 @@ int access_or_die(const char *path, int mode, unsigned flag);
 /* Warn on an inaccessible file if errno indicates this is an error */
 int warn_on_fopen_errors(const char *path);
 
-#ifdef GMTIME_UNRELIABLE_ERRORS
-struct tm *git_gmtime(const time_t *);
-struct tm *git_gmtime_r(const time_t *, struct tm *);
-#define gmtime git_gmtime
-#define gmtime_r git_gmtime_r
-#endif
+/*
+ * Open with O_NOFOLLOW, or equivalent. Note that the fallback equivalent
+ * may be racy. Do not use this as protection against an attacker who can
+ * simultaneously create paths.
+ */
+int open_nofollow(const char *path, int flags);
 
 #if !defined(USE_PARENS_AROUND_GETTEXT_N) && defined(__GNUC__)
 #define USE_PARENS_AROUND_GETTEXT_N 1
@@ -1240,8 +1262,14 @@ struct tm *git_gmtime_r(const time_t *, struct tm *);
 #endif
 
 #ifndef _POSIX_THREAD_SAFE_FUNCTIONS
-#define flockfile(fh)
-#define funlockfile(fh)
+static inline void flockfile(FILE *fh)
+{
+	; /* nothing */
+}
+static inline void funlockfile(FILE *fh)
+{
+	; /* nothing */
+}
 #define getc_unlocked(fh) getc(fh)
 #endif
 
@@ -1339,7 +1367,7 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset)
 	(type *)container_of_or_null_offset(ptr, offsetof(type, member))
 
 /*
- * like offsetof(), but takes a pointer to a a variable of type which
+ * like offsetof(), but takes a pointer to a variable of type which
  * contains @member, instead of a specified type.
  * @ptr is subject to multiple evaluation since we can't rely on __typeof__
  * everywhere.
@@ -1351,4 +1379,6 @@ static inline void *container_of_or_null_offset(void *ptr, size_t offset)
 	((uintptr_t)&(ptr)->member - (uintptr_t)(ptr))
 #endif /* !__GNUC__ */
 
+void sleep_millisec(int millisec);
+
 #endif
diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl
index fc00d5946a..289d4bc684 100755
--- a/git-cvsexportcommit.perl
+++ b/git-cvsexportcommit.perl
@@ -22,11 +22,15 @@ die "Need at least one commit identifier!" unless @ARGV;
 my $repo = Git->repository();
 $opt_w = $repo->config('cvsexportcommit.cvsdir') unless defined $opt_w;
 
+my $tmpdir = File::Temp::tempdir(CLEANUP => 1);
+my $hash_algo = $repo->config('extensions.objectformat') || 'sha1';
+my $hexsz = $hash_algo eq 'sha256' ? 64 : 40;
+
 if ($opt_w || $opt_W) {
 	# Remember where GIT_DIR is before changing to CVS checkout
 	unless ($ENV{GIT_DIR}) {
 		# No GIT_DIR set. Figure it out for ourselves
-		my $gd =`git-rev-parse --git-dir`;
+		my $gd =`git rev-parse --git-dir`;
 		chomp($gd);
 		$ENV{GIT_DIR} = $gd;
 	}
@@ -62,7 +66,7 @@ if ($opt_d) {
 # resolve target commit
 my $commit;
 $commit = pop @ARGV;
-$commit = safe_pipe_capture('git-rev-parse', '--verify', "$commit^0");
+$commit = safe_pipe_capture('git', 'rev-parse', '--verify', "$commit^0");
 chomp $commit;
 if ($?) {
     die "The commit reference $commit did not resolve!";
@@ -72,7 +76,7 @@ if ($?) {
 my $parent;
 if (@ARGV) {
     $parent = pop @ARGV;
-    $parent =  safe_pipe_capture('git-rev-parse', '--verify', "$parent^0");
+    $parent =  safe_pipe_capture('git', 'rev-parse', '--verify', "$parent^0");
     chomp $parent;
     if ($?) {
 	die "The parent reference did not resolve!";
@@ -80,7 +84,7 @@ if (@ARGV) {
 }
 
 # find parents from the commit itself
-my @commit  = safe_pipe_capture('git-cat-file', 'commit', $commit);
+my @commit  = safe_pipe_capture('git', 'cat-file', 'commit', $commit);
 my @parents;
 my $committer;
 my $author;
@@ -96,7 +100,7 @@ foreach my $line (@commit) {
     }
 
     if ($stage eq 'headers') {
-	if ($line =~ m/^parent (\w{40})$/) { # found a parent
+	if ($line =~ m/^parent ([0-9a-f]{$hexsz})$/) { # found a parent
 	    push @parents, $1;
 	} elsif ($line =~ m/^author (.+) \d+ [-+]\d+$/) {
 	    $author = $1;
@@ -111,7 +115,7 @@ foreach my $line (@commit) {
     }
 }
 
-my $noparent = "0000000000000000000000000000000000000000";
+my $noparent = "0" x $hexsz;
 if ($parent) {
     my $found;
     # double check that it's a valid parent
@@ -158,9 +162,9 @@ if ($opt_a) {
 close MSG;
 
 if ($parent eq $noparent) {
-    `git-diff-tree --binary -p --root $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
+    `git diff-tree --binary -p --root $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
 } else {
-    `git-diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
+    `git diff-tree --binary -p $parent $commit >.cvsexportcommit.diff`;# || die "Cannot diff";
 }
 
 ## apply non-binary changes
@@ -174,7 +178,7 @@ my $context = $opt_p ? '' : '-C1';
 print "Checking if patch will apply\n";
 
 my @stat;
-open APPLY, "GIT_DIR= git-apply $context --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch";
+open APPLY, "GIT_INDEX_FILE=$tmpdir/index git apply $context --summary --numstat<.cvsexportcommit.diff|" || die "cannot patch";
 @stat=<APPLY>;
 close APPLY || die "Cannot patch";
 my (@bfiles,@files,@afiles,@dfiles);
@@ -329,7 +333,7 @@ print "Applying\n";
 if ($opt_W) {
     system("git checkout -q $commit^0") && die "cannot patch";
 } else {
-    `GIT_DIR= git-apply $context --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch";
+    `GIT_INDEX_FILE=$tmpdir/index git apply $context --summary --numstat --apply <.cvsexportcommit.diff` || die "cannot patch";
 }
 
 print "Patch applied successfully. Adding new files and directories to CVS\n";
@@ -407,7 +411,7 @@ unlink(".cvsexportcommit.diff");
 
 if ($opt_W) {
     system("git checkout $go_back_to") && die "cannot move back to $go_back_to";
-    if (!($go_back_to =~ /^[0-9a-fA-F]{40}$/)) {
+    if (!($go_back_to =~ /^[0-9a-fA-F]{$hexsz}$/)) {
 	system("git symbolic-ref HEAD $go_back_to") &&
 	    die "cannot move back to $go_back_to";
     }
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index b31613cb8a..7bf3c12d67 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -600,7 +600,7 @@ my $cvs = CVSconn->new($opt_d, $cvs_tree);
 sub pdate($) {
 	my ($d) = @_;
 	m#(\d{2,4})/(\d\d)/(\d\d)\s(\d\d):(\d\d)(?::(\d\d))?#
-		or die "Unparseable date: $d\n";
+		or die "Unparsable date: $d\n";
 	my $y=$1;
 	$y+=100 if $y<70;
 	$y+=1900 if $y<1000;
@@ -637,9 +637,9 @@ sub getwd() {
 	return $pwd;
 }
 
-sub is_sha1 {
+sub is_oid {
 	my $s = shift;
-	return $s =~ /^[a-f0-9]{40}$/;
+	return $s =~ /^[a-f0-9]{40}(?:[a-f0-9]{24})?$/;
 }
 
 sub get_headref ($) {
@@ -810,7 +810,7 @@ sub write_tree () {
 	open(my $fh, '-|', qw(git write-tree))
 		or die "unable to open git write-tree: $!";
 	chomp(my $tree = <$fh>);
-	is_sha1($tree)
+	is_oid($tree)
 		or die "Cannot get tree id ($tree): $!";
 	close($fh)
 		or die "Error running git write-tree: $?\n";
@@ -896,7 +896,7 @@ sub commit {
 
 	print "Committed patch $patchset ($branch $commit_date)\n" if $opt_v;
 	chomp(my $cid = <$commit_read>);
-	is_sha1($cid) or die "Cannot get commit id ($cid): $!\n";
+	is_oid($cid) or die "Cannot get commit id ($cid): $!\n";
 	print "Commit ID $cid\n" if $opt_v;
 	close($commit_read);
 
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index ae1044273d..ed035f32c2 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -365,7 +365,7 @@ sub req_Root
     }
     foreach my $line ( @gitvars )
     {
-        next unless ( $line =~ /^(gitcvs)\.(?:(ext|pserver)\.)?([\w-]+)=(.*)$/ );
+        next unless ( $line =~ /^(gitcvs|extensions)\.(?:(ext|pserver)\.)?([\w-]+)=(.*)$/ );
         unless ($2) {
             $cfg->{$1}{$3} = $4;
         } else {
@@ -392,6 +392,9 @@ sub req_Root
         $log->nofile();
     }
 
+    $state->{rawsz} = ($cfg->{'extensions'}{'objectformat'} || 'sha1') eq 'sha256' ? 32 : 20;
+    $state->{hexsz} = $state->{rawsz} * 2;
+
     return 1;
 }
 
@@ -1581,7 +1584,7 @@ sub req_ci
 
             $parenthash = safe_pipe_capture('git', 'show-ref', '-s', $branchRef);
             chomp $parenthash;
-            if ($parenthash !~ /^[0-9a-f]{40}$/)
+            if ($parenthash !~ /^[0-9a-f]{$state->{hexsz}}$/)
             {
                 if ( defined($stickyInfo) && defined($stickyInfo->{tag}) )
                 {
@@ -1708,7 +1711,7 @@ sub req_ci
     chomp($commithash);
     $log->info("Commit hash : $commithash");
 
-    unless ( $commithash =~ /[a-zA-Z0-9]{40}/ )
+    unless ( $commithash =~ /[a-zA-Z0-9]{$state->{hexsz}}/ )
     {
         $log->warn("Commit failed (Invalid commit hash)");
         print "error 1 Commit failed (unknown reason)\n";
@@ -2146,7 +2149,7 @@ sub req_diff
                    ( $meta2->{revision} or "workingcopy" ));
 
         # TODO: Use --label instead of -L because -L is no longer
-        #  documented and may go away someday.  Not sure if there there are
+        #  documented and may go away someday.  Not sure if there are
         #  versions that only support -L, which would make this change risky?
         #  http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html
         #    ("man diff" should actually document the best migration strategy,
@@ -2375,7 +2378,7 @@ sub req_annotate
         print "E ***************\n";
         while ( <ANNOTATE> )
         {
-            if (m/^([a-zA-Z0-9]{40})\t\([^\)]*\)(.*)$/i)
+            if (m/^([a-zA-Z0-9]{$state->{hexsz}})\t\([^\)]*\)(.*)$/i)
             {
                 my $commithash = $1;
                 my $data = $2;
@@ -2852,7 +2855,7 @@ sub transmitfile
         return;
     }
 
-    die "Need filehash" unless ( defined ( $filehash ) and $filehash =~ /^[a-zA-Z0-9]{40}$/ );
+    die "Need filehash" unless ( defined ( $filehash ) and $filehash =~ /^[a-zA-Z0-9]{$state->{hexsz}}$/ );
 
     my $type = safe_pipe_capture('git', 'cat-file', '-t', $filehash);
     chomp $type;
@@ -3042,7 +3045,7 @@ sub ensureWorkTree
 
     my $ver = safe_pipe_capture('git', 'show-ref', '-s', "refs/heads/$state->{module}");
     chomp $ver;
-    if ($ver !~ /^[0-9a-f]{40}$/)
+    if ($ver !~ /^[0-9a-f]{$state->{hexsz}}$/)
     {
         $log->warn("Error from git show-ref -s refs/head$state->{module}");
         print "error 1 cannot find the current HEAD of module";
@@ -3281,7 +3284,7 @@ sub open_blob_or_die
     }
     elsif( $srcType eq "sha1" )
     {
-        unless ( defined ( $name ) and $name =~ /^[a-zA-Z0-9]{40}$/ )
+        unless ( defined ( $name ) and $name =~ /^[a-zA-Z0-9]{$state->{hexsz}}$/ )
         {
             $log->warn("Need filehash");
             die "Need filehash\n";
@@ -3817,7 +3820,7 @@ sub update
     chomp $commitsha1;
 
     my $commitinfo = ::safe_pipe_capture('git', 'cat-file', 'commit', $self->{module});
-    unless ( $commitinfo =~ /tree\s+[a-zA-Z0-9]{40}/ )
+    unless ( $commitinfo =~ /tree\s+[a-zA-Z0-9]{$state->{hexsz}}/ )
     {
         die("Invalid module '$self->{module}'");
     }
@@ -3957,7 +3960,7 @@ sub update
             while ( <FILELIST> )
             {
 		chomp;
-                unless ( /^:\d{6}\s+([0-7]{6})\s+[a-f0-9]{40}\s+([a-f0-9]{40})\s+(\w)$/o )
+                unless ( /^:\d{6}\s+([0-7]{6})\s+[a-f0-9]{$state->{hexsz}}\s+([a-f0-9]{$state->{hexsz}})\s+(\w)$/o )
                 {
                     die("Couldn't process git-diff-tree line : $_");
                 }
@@ -4625,11 +4628,11 @@ sub getmeta
             $db_query->execute($filename, $intRev);
             $meta = $db_query->fetchrow_hashref;
         }
-        elsif ( $revision =~ /^2\.1\.1\.2000(\.[1-3][0-9][0-9]){20}$/ )
+        elsif ( $revision =~ /^2\.1\.1\.2000(\.[1-3][0-9][0-9]){$state->{rawsz}}$/ )
         {
             my ($commitHash)=($revision=~/^2\.1\.1\.2000(.*)$/);
             $commitHash=~s/\.([0-9]+)/sprintf("%02x",$1-100)/eg;
-            if($commitHash=~/^[0-9a-f]{40}$/)
+            if($commitHash=~/^[0-9a-f]{$state->{hexsz}}$/)
             {
                 return $self->getMetaFromCommithash($filename,$commitHash);
             }
@@ -4639,7 +4642,7 @@ sub getmeta
             $log->warning("failed get $revision with commithash=$commitHash");
             undef $revision;
         }
-        elsif ( $revision =~ /^[0-9a-f]{40}$/ )
+        elsif ( $revision =~ /^[0-9a-f]{$state->{hexsz}}$/ )
         {
             # Try DB first.  This is mostly only useful for req_annotate(),
             # which only calls this for stuff that should already be in
@@ -4658,7 +4661,7 @@ sub getmeta
             if(! $meta)
             {
                 my($revCommit)=$self->lookupCommitRef($revision);
-                if($revCommit=~/^[0-9a-f]{40}$/)
+                if($revCommit=~/^[0-9a-f]{$state->{hexsz}}$/)
                 {
                     return $self->getMetaFromCommithash($filename,$revCommit);
                 }
@@ -4672,7 +4675,7 @@ sub getmeta
         else
         {
             my($revCommit)=$self->lookupCommitRef($revision);
-            if($revCommit=~/^[0-9a-f]{40}$/)
+            if($revCommit=~/^[0-9a-f]{$state->{hexsz}}$/)
             {
                 return $self->getMetaFromCommithash($filename,$revCommit);
             }
@@ -4767,7 +4770,7 @@ sub getMetaFromCommithash
 
     my($fileHash) = ::safe_pipe_capture("git","rev-parse","$revCommit:$filename");
     chomp $fileHash;
-    if(!($fileHash=~/^[0-9a-f]{40}$/))
+    if(!($fileHash=~/^[0-9a-f]{$state->{hexsz}}$/))
     {
         die "Invalid fileHash '$fileHash' looking up"
                     ." '$revCommit:$filename'\n";
@@ -4863,7 +4866,7 @@ sub lookupCommitRef
     $commitHash = ::safe_pipe_capture("git","rev-parse","--verify","--quiet",
 				      $self->unescapeRefName($ref));
     $commitHash=~s/\s*$//;
-    if(!($commitHash=~/^[0-9a-f]{40}$/))
+    if(!($commitHash=~/^[0-9a-f]{$state->{hexsz}}$/))
     {
         $commitHash=undef;
     }
@@ -4909,7 +4912,7 @@ sub commitmessage
     my $commithash = shift;
     my $tablename = $self->tablename("commitmsgs");
 
-    die("Need commithash") unless ( defined($commithash) and $commithash =~ /^[a-zA-Z0-9]{40}$/ );
+    die("Need commithash") unless ( defined($commithash) and $commithash =~ /^[a-zA-Z0-9]{$state->{hexsz}}$/ );
 
     my $db_query;
     $db_query = $self->{dbh}->prepare_cached("SELECT value FROM $tablename WHERE key=?",{},1);
diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh
index 46af3e60b7..992124cc67 100755
--- a/git-difftool--helper.sh
+++ b/git-difftool--helper.sh
@@ -61,6 +61,9 @@ launch_merge_tool () {
 		export BASE
 		eval $GIT_DIFFTOOL_EXTCMD '"$LOCAL"' '"$REMOTE"'
 	else
+		initialize_merge_tool "$merge_tool"
+		# ignore the error from the above --- run_merge_tool
+		# will diagnose unusable tool by itself
 		run_merge_tool "$merge_tool"
 	fi
 }
@@ -79,6 +82,9 @@ if test -n "$GIT_DIFFTOOL_DIRDIFF"
 then
 	LOCAL="$1"
 	REMOTE="$2"
+	initialize_merge_tool "$merge_tool"
+	# ignore the error from the above --- run_merge_tool
+	# will diagnose unusable tool by itself
 	run_merge_tool "$merge_tool" false
 else
 	# Launch the merge tool on each path provided by 'git diff'
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index fea7964617..cb89372813 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -492,14 +492,12 @@ then
 		sha1=$(git rev-parse "$ref"^0)
 		test -f "$workdir"/../map/$sha1 && continue
 		ancestor=$(git rev-list --simplify-merges -1 "$ref" "$@")
-		test "$ancestor" && echo $(map $ancestor) >> "$workdir"/../map/$sha1
+		test "$ancestor" && echo $(map $ancestor) >"$workdir"/../map/$sha1
 	done < "$tempdir"/heads
 fi
 
 # Finally update the refs
 
-_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"
 echo
 while read ref
 do
@@ -519,7 +517,7 @@ do
 		git update-ref -m "filter-branch: delete" -d "$ref" $sha1 ||
 			die "Could not delete $ref"
 	;;
-	$_x40)
+	*)
 		echo "Ref '$ref' was rewritten"
 		if ! git update-ref -m "filter-branch: rewrite" \
 					"$ref" $rewritten $sha1 2>/dev/null; then
@@ -533,16 +531,6 @@ do
 			fi
 		fi
 	;;
-	*)
-		# NEEDSWORK: possibly add -Werror, making this an error
-		warn "WARNING: '$ref' was rewritten into multiple commits:"
-		warn "$rewritten"
-		warn "WARNING: Ref '$ref' points to the first one now."
-		rewritten=$(echo "$rewritten" | head -n 1)
-		git update-ref -m "filter-branch: rewrite to first" \
-				"$ref" $rewritten $sha1 ||
-			die "Could not rewrite $ref"
-	;;
 	esac
 	git update-ref -m "filter-branch: backup" "$orig_namespace$ref" $sha1 ||
 		 exit
diff --git a/git-gui/Makefile b/git-gui/Makefile
index f10caedaa7..56c85a85c1 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -9,7 +9,9 @@ all::
 
 GIT-VERSION-FILE: FORCE
 	@$(SHELL_PATH) ./GIT-VERSION-GEN
+ifneq ($(MAKECMDGOALS),clean)
 -include GIT-VERSION-FILE
+endif
 
 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
 uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not')
diff --git a/git-gui/git-gui--askpass b/git-gui/git-gui--askpass
index 4277f30c41..71a536d232 100755
--- a/git-gui/git-gui--askpass
+++ b/git-gui/git-gui--askpass
@@ -26,8 +26,21 @@ pack .m -side top -fill x -padx 20 -pady 20 -expand 1
 entry .e -textvariable answer -width 50
 pack .e -side top -fill x -padx 10 -pady 10
 
+proc on_show_input_changed {args} {
+	global show_input
+	if {$show_input} {
+		.e configure -show ""
+	} else {
+		.e configure -show "*"
+	}
+}
+trace add variable show_input write "on_show_input_changed"
+
+set show_input 0
+
 if {!$yesno} {
-	.e configure -show "*"
+	checkbutton .cb_show -text "Show input" -variable show_input
+	pack .cb_show -side top -anchor nw
 }
 
 frame .b
@@ -56,6 +69,11 @@ proc finish {} {
 		}
 	}
 
+	# On Windows, force the encoding to UTF-8: it is what `git.exe` expects
+	if {$::tcl_platform(platform) eq {windows}} {
+		set ::answer [encoding convertto utf-8 $::answer]
+	}
+
 	puts $::answer
 	set ::rc 0
 }
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 0d21f5688b..201524c34e 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -30,8 +30,8 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.}]
 ##
 ## Tcl/Tk sanity check
 
-if {[catch {package require Tcl 8.4} err]
- || [catch {package require Tk  8.4} err]
+if {[catch {package require Tcl 8.5} err]
+ || [catch {package require Tk  8.5} err]
 } {
 	catch {wm withdraw .}
 	tk_messageBox \
@@ -684,6 +684,7 @@ proc load_current_branch {} {
 	global current_branch is_detached
 
 	set fd [open [gitdir HEAD] r]
+	fconfigure $fd -translation binary -encoding utf-8
 	if {[gets $fd ref] < 1} {
 		set ref {}
 	}
@@ -719,7 +720,6 @@ proc rmsel_tag {text} {
 		-background [$text cget -background] \
 		-foreground [$text cget -foreground] \
 		-borderwidth 0
-	$text tag conf in_sel -background lightgray
 	bind $text <Motion> break
 	return $text
 }
@@ -862,6 +862,7 @@ proc apply_config {} {
 			set NS ttk
 			bind [winfo class .] <<ThemeChanged>> [list InitTheme]
 			pave_toplevel .
+			color::sync_with_theme
 		}
 	}
 }
@@ -946,15 +947,15 @@ if {![regsub {^git version } $_git_version {} _git_version]} {
 }
 
 proc get_trimmed_version {s} {
-    set r {}
-    foreach x [split $s -._] {
-        if {[string is integer -strict $x]} {
-            lappend r $x
-        } else {
-            break
-        }
-    }
-    return [join $r .]
+	set r {}
+	foreach x [split $s -._] {
+		if {[string is integer -strict $x]} {
+			lappend r $x
+		} else {
+			break
+		}
+	}
+	return [join $r .]
 }
 set _real_git_version $_git_version
 set _git_version [get_trimmed_version $_git_version]
@@ -966,7 +967,7 @@ if {![regexp {^[1-9]+(\.[0-9]+)+$} $_git_version]} {
 		-type yesno \
 		-default no \
 		-title "[appname]: warning" \
-		 -message [mc "Git version cannot be determined.
+		-message [mc "Git version cannot be determined.
 
 %s claims it is version '%s'.
 
@@ -1478,6 +1479,7 @@ proc rescan {after {honor_trustmtime 1}} {
 		} elseif {[run_prepare_commit_msg_hook]} {
 		} elseif {[load_message MERGE_MSG]} {
 		} elseif {[load_message SQUASH_MSG]} {
+		} elseif {[load_message [get_config commit.template]]} {
 		}
 		$ui_comm edit reset
 		$ui_comm edit modified false
@@ -1612,6 +1614,12 @@ proc run_prepare_commit_msg_hook {} {
 		fconfigure $fd_sm -encoding utf-8
 		puts -nonewline $fd_pcm [read $fd_sm]
 		close $fd_sm
+	} elseif {[file isfile [get_config commit.template]]} {
+		set pcm_source "template"
+		set fd_sm [open [get_config commit.template] r]
+		fconfigure $fd_sm -encoding utf-8
+		puts -nonewline $fd_pcm [read $fd_sm]
+		close $fd_sm
 	} else {
 		set pcm_source ""
 	}
@@ -1652,7 +1660,7 @@ proc prepare_commit_msg_hook_wait {fd_ph} {
 		set pch_error {}
 		catch {file delete [gitdir PREPARE_COMMIT_MSG]}
 		return
-        }
+	}
 	fconfigure $fd_ph -blocking 0
 	catch {file delete [gitdir PREPARE_COMMIT_MSG]}
 }
@@ -1797,10 +1805,10 @@ proc ui_status {msg} {
 	}
 }
 
-proc ui_ready {{test {}}} {
+proc ui_ready {} {
 	global main_status
 	if {[info exists main_status]} {
-		$main_status show [mc "Ready."] $test
+		$main_status show [mc "Ready."]
 	}
 }
 
@@ -2000,72 +2008,72 @@ set filemask {
 #define mask_width 14
 #define mask_height 15
 static unsigned char mask_bits[] = {
-   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
-   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
-   0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
+	0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
+	0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f,
+	0xfe, 0x1f, 0xfe, 0x1f, 0xfe, 0x1f};
 }
 
 image create bitmap file_plain -background white -foreground black -data {
 #define plain_width 14
 #define plain_height 15
 static unsigned char plain_bits[] = {
-   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
-   0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
-   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
+	0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
+	0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10, 0x02, 0x10,
+	0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 } -maskdata $filemask
 
 image create bitmap file_mod -background white -foreground blue -data {
 #define mod_width 14
 #define mod_height 15
 static unsigned char mod_bits[] = {
-   0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
-   0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
-   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
+	0xfe, 0x01, 0x02, 0x03, 0x7a, 0x05, 0x02, 0x09, 0x7a, 0x1f, 0x02, 0x10,
+	0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
+	0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
 } -maskdata $filemask
 
 image create bitmap file_fulltick -background white -foreground "#007000" -data {
 #define file_fulltick_width 14
 #define file_fulltick_height 15
 static unsigned char file_fulltick_bits[] = {
-   0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
-   0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
-   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
+	0xfe, 0x01, 0x02, 0x1a, 0x02, 0x0c, 0x02, 0x0c, 0x02, 0x16, 0x02, 0x16,
+	0x02, 0x13, 0x00, 0x13, 0x86, 0x11, 0x8c, 0x11, 0xd8, 0x10, 0xf2, 0x10,
+	0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 } -maskdata $filemask
 
 image create bitmap file_question -background white -foreground black -data {
 #define file_question_width 14
 #define file_question_height 15
 static unsigned char file_question_bits[] = {
-   0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
-   0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
-   0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
+	0xfe, 0x01, 0x02, 0x02, 0xe2, 0x04, 0xf2, 0x09, 0x1a, 0x1b, 0x0a, 0x13,
+	0x82, 0x11, 0xc2, 0x10, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10, 0x62, 0x10,
+	0x62, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 } -maskdata $filemask
 
 image create bitmap file_removed -background white -foreground red -data {
 #define file_removed_width 14
 #define file_removed_height 15
 static unsigned char file_removed_bits[] = {
-   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
-   0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
-   0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
+	0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x02, 0x10,
+	0x1a, 0x16, 0x32, 0x13, 0xe2, 0x11, 0xc2, 0x10, 0xe2, 0x11, 0x32, 0x13,
+	0x1a, 0x16, 0x02, 0x10, 0xfe, 0x1f};
 } -maskdata $filemask
 
 image create bitmap file_merge -background white -foreground blue -data {
 #define file_merge_width 14
 #define file_merge_height 15
 static unsigned char file_merge_bits[] = {
-   0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
-   0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
-   0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
+	0xfe, 0x01, 0x02, 0x03, 0x62, 0x05, 0x62, 0x09, 0x62, 0x1f, 0x62, 0x10,
+	0xfa, 0x11, 0xf2, 0x10, 0x62, 0x10, 0x02, 0x10, 0xfa, 0x17, 0x02, 0x10,
+	0xfa, 0x17, 0x02, 0x10, 0xfe, 0x1f};
 } -maskdata $filemask
 
 image create bitmap file_statechange -background white -foreground green -data {
 #define file_statechange_width 14
 #define file_statechange_height 15
 static unsigned char file_statechange_bits[] = {
-   0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
-   0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
-   0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
+	0xfe, 0x01, 0x02, 0x03, 0x02, 0x05, 0x02, 0x09, 0x02, 0x1f, 0x62, 0x10,
+	0x62, 0x10, 0xba, 0x11, 0xba, 0x11, 0x62, 0x10, 0x62, 0x10, 0x02, 0x10,
+	0x02, 0x10, 0x02, 0x10, 0xfe, 0x1f};
 } -maskdata $filemask
 
 set ui_index .vpane.files.index.list
@@ -2150,8 +2158,6 @@ proc incr_font_size {font {amt 1}} {
 ##
 ## ui commands
 
-set starting_gitk_msg [mc "Starting gitk... please wait..."]
-
 proc do_gitk {revs {is_submodule false}} {
 	global current_diff_path file_states current_diff_side ui_index
 	global _gitdir _gitworktree
@@ -2206,9 +2212,12 @@ proc do_gitk {revs {is_submodule false}} {
 		set env(GIT_WORK_TREE) $_gitworktree
 		cd $pwd
 
-		ui_status $::starting_gitk_msg
-		after 10000 {
-			ui_ready $starting_gitk_msg
+		if {[info exists main_status]} {
+			set status_operation [$::main_status \
+				start \
+				[mc "Starting %s... please wait..." "gitk"]]
+
+			after 3500 [list $status_operation stop]
 		}
 	}
 }
@@ -2240,16 +2249,16 @@ proc do_git_gui {} {
 		set env(GIT_WORK_TREE) $_gitworktree
 		cd $pwd
 
-		ui_status $::starting_gitk_msg
-		after 10000 {
-			ui_ready $starting_gitk_msg
-		}
+		set status_operation [$::main_status \
+			start \
+			[mc "Starting %s... please wait..." "git-gui"]]
+
+		after 3500 [list $status_operation stop]
 	}
 }
 
-proc do_explore {} {
-	global _gitworktree
-	set explorer {}
+# Get the system-specific explorer app/command.
+proc get_explorer {} {
 	if {[is_Cygwin] || [is_Windows]} {
 		set explorer "explorer.exe"
 	} elseif {[is_MacOSX]} {
@@ -2258,9 +2267,23 @@ proc do_explore {} {
 		# freedesktop.org-conforming system is our best shot
 		set explorer "xdg-open"
 	}
+	return $explorer
+}
+
+proc do_explore {} {
+	global _gitworktree
+	set explorer [get_explorer]
 	eval exec $explorer [list [file nativename $_gitworktree]] &
 }
 
+# Open file relative to the working tree by the default associated app.
+proc do_file_open {file} {
+	global _gitworktree
+	set explorer [get_explorer]
+	set full_file_path [file join $_gitworktree $file]
+	exec $explorer [file nativename $full_file_path] &
+}
+
 set is_quitting 0
 set ret_code    1
 
@@ -2286,11 +2309,10 @@ proc do_quit {{rc {1}}} {
 		if {$GITGUI_BCK_exists && ![$ui_comm edit modified]} {
 			file rename -force [gitdir GITGUI_BCK] $save
 			set GITGUI_BCK_exists 0
-		} else {
+		} elseif {[$ui_comm edit modified]} {
 			set msg [string trim [$ui_comm get 0.0 end]]
 			regsub -all -line {[ \r\t]+$} $msg {} msg
-			if {(![string match amend* $commit_type]
-				|| [$ui_comm edit modified])
+			if {![string match amend* $commit_type]
 				&& $msg ne {}} {
 				catch {
 					set fd [open $save w]
@@ -2584,12 +2606,12 @@ proc toggle_or_diff {mode w args} {
 			update_indexinfo \
 				"Unstaging [short_path $path] from commit" \
 				[list $path] \
-				[concat $after [list ui_ready]]
+				[concat $after {ui_ready;}]
 		} elseif {$w eq $ui_workdir} {
 			update_index \
 				"Adding [short_path $path]" \
 				[list $path] \
-				[concat $after [list ui_ready]]
+				[concat $after {ui_ready;}]
 		}
 	} else {
 		set selected_paths($path) 1
@@ -3256,7 +3278,7 @@ pack .vpane -anchor n -side top -fill both -expand 1
 textframe .vpane.files.workdir -height 100 -width 200
 tlabel .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
 	-background lightsalmon -foreground black
-ttext $ui_workdir -background white -foreground black \
+ttext $ui_workdir \
 	-borderwidth 0 \
 	-width 20 -height 10 \
 	-wrap none \
@@ -3278,7 +3300,7 @@ textframe .vpane.files.index -height 100 -width 200
 tlabel .vpane.files.index.title \
 	-text [mc "Staged Changes (Will Commit)"] \
 	-background lightgreen -foreground black
-ttext $ui_index -background white -foreground black \
+ttext $ui_index \
 	-borderwidth 0 \
 	-width 20 -height 10 \
 	-wrap none \
@@ -3303,9 +3325,20 @@ if {!$use_ttk} {
 	.vpane.files paneconfigure .vpane.files.index -sticky news
 }
 
+proc set_selection_colors {w has_focus} {
+	foreach tag [list in_diff in_sel] {
+		$w tag conf $tag \
+			-background [expr {$has_focus ? $color::select_bg : $color::inactive_select_bg}] \
+			-foreground [expr {$has_focus ? $color::select_fg : $color::inactive_select_fg}]
+	}
+}
+
 foreach i [list $ui_index $ui_workdir] {
 	rmsel_tag $i
-	$i tag conf in_diff -background [$i tag cget in_sel -background]
+
+	set_selection_colors $i 0
+	bind $i <FocusIn>	{ set_selection_colors %W 1 }
+	bind $i <FocusOut>	{ set_selection_colors %W 0 }
 }
 unset i
 
@@ -3413,7 +3446,7 @@ if {![is_enabled nocommit]} {
 }
 
 textframe .vpane.lower.commarea.buffer.frame
-ttext $ui_comm -background white -foreground black \
+ttext $ui_comm \
 	-borderwidth 1 \
 	-undo true \
 	-maxundo 20 \
@@ -3512,9 +3545,11 @@ tlabel .vpane.lower.diff.header.file \
 	-justify left
 tlabel .vpane.lower.diff.header.path \
 	-background gold \
-	-foreground black \
+	-foreground blue \
 	-anchor w \
-	-justify left
+	-justify left \
+	-font [eval font create [font configure font_ui] -underline 1] \
+	-cursor hand2
 pack .vpane.lower.diff.header.status -side left
 pack .vpane.lower.diff.header.file -side left
 pack .vpane.lower.diff.header.path -fill x
@@ -3529,14 +3564,18 @@ $ctxm add command \
 			-type STRING \
 			-- $current_diff_path
 	}
+$ctxm add command \
+	-label [mc Open] \
+	-command {do_file_open $current_diff_path}
 lappend diff_actions [list $ctxm entryconf [$ctxm index last] -state]
 bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
+bind .vpane.lower.diff.header.path <Button-1> {do_file_open $current_diff_path}
 
 # -- Diff Body
 #
 textframe .vpane.lower.diff.body
 set ui_diff .vpane.lower.diff.body.t
-ttext $ui_diff -background white -foreground black \
+ttext $ui_diff \
 	-borderwidth 0 \
 	-width 80 -height 5 -wrap none \
 	-font font_diff \
@@ -3856,18 +3895,18 @@ proc on_application_mapped {} {
 	set gm $repo_config(gui.geometry)
 	if {$use_ttk} {
 		bind .vpane <Map> \
-		    [list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
+			[list on_ttk_pane_mapped %W 0 [lindex $gm 1]]
 		bind .vpane.files <Map> \
-		    [list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
+			[list on_ttk_pane_mapped %W 0 [lindex $gm 2]]
 	} else {
 		bind .vpane <Map> \
-		    [list on_tk_pane_mapped %W 0 \
-			 [lindex $gm 1] \
-			 [lindex [.vpane sash coord 0] 1]]
+			[list on_tk_pane_mapped %W 0 \
+			[lindex $gm 1] \
+			[lindex [.vpane sash coord 0] 1]]
 		bind .vpane.files <Map> \
-		    [list on_tk_pane_mapped %W 0 \
-			 [lindex [.vpane.files sash coord 0] 0] \
-			 [lindex $gm 2]]
+			[list on_tk_pane_mapped %W 0 \
+			[lindex [.vpane.files sash coord 0] 0] \
+			[lindex $gm 2]]
 	}
 	wm geometry . [lindex $gm 0]
 }
@@ -3906,6 +3945,8 @@ bind $ui_comm <$M1B-Key-KP_Subtract> {show_less_context;break}
 bind $ui_comm <$M1B-Key-equal> {show_more_context;break}
 bind $ui_comm <$M1B-Key-plus> {show_more_context;break}
 bind $ui_comm <$M1B-Key-KP_Add> {show_more_context;break}
+bind $ui_comm <$M1B-Key-BackSpace> {event generate %W <Meta-Delete>;break}
+bind $ui_comm <$M1B-Key-Delete> {event generate %W <Meta-d>;break}
 
 bind $ui_diff <$M1B-Key-x> {tk_textCopy %W;break}
 bind $ui_diff <$M1B-Key-X> {tk_textCopy %W;break}
@@ -4159,6 +4200,9 @@ if {$picked && [is_config_true gui.autoexplore]} {
 	do_explore
 }
 
+# Clear "Initializing..." status
+after 500 {$main_status show ""}
+
 # Local variables:
 # mode: tcl
 # indent-tabs-mode: t
diff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl
index a1aeb8b96e..8441e109be 100644
--- a/git-gui/lib/blame.tcl
+++ b/git-gui/lib/blame.tcl
@@ -24,6 +24,7 @@ field w_cviewer  ; # pane showing commit message
 field finder     ; # find mini-dialog frame
 field gotoline   ; # line goto mini-dialog frame
 field status     ; # status mega-widget instance
+field status_operation ; # operation displayed by status mega-widget
 field old_height ; # last known height of $w.file_pane
 
 
@@ -274,6 +275,7 @@ constructor new {i_commit i_path i_jump} {
 	pack $w_cviewer -expand 1 -fill both
 
 	set status [::status_bar::new $w.status]
+	set status_operation {}
 
 	menu $w.ctxm -tearoff 0
 	$w.ctxm add command \
@@ -326,6 +328,7 @@ constructor new {i_commit i_path i_jump} {
 		bind $i <Any-Motion>  [cb _show_tooltip $i @%x,%y]
 		bind $i <Any-Enter>   [cb _hide_tooltip]
 		bind $i <Any-Leave>   [cb _hide_tooltip]
+		bind $i <Deactivate>  [cb _hide_tooltip]
 		bind_button3 $i "
 			[cb _hide_tooltip]
 			set cursorX %x
@@ -602,16 +605,23 @@ method _exec_blame {cur_w cur_d options cur_s} {
 	} else {
 		lappend options $commit
 	}
+
+	# We may recurse in from another call to _exec_blame and already have
+	# a status operation.
+	if {$status_operation == {}} {
+		set status_operation [$status start \
+			$cur_s \
+			[mc "lines annotated"]]
+	} else {
+		$status_operation restart $cur_s
+	}
+
 	lappend options -- $path
 	set fd [eval git_read --nice blame $options]
 	fconfigure $fd -blocking 0 -translation lf -encoding utf-8
 	fileevent $fd readable [cb _read_blame $fd $cur_w $cur_d]
 	set current_fd $fd
 	set blame_lines 0
-
-	$status start \
-		$cur_s \
-		[mc "lines annotated"]
 }
 
 method _read_blame {fd cur_w cur_d} {
@@ -806,10 +816,11 @@ method _read_blame {fd cur_w cur_d} {
 				[mc "Loading original location annotations..."]
 		} else {
 			set current_fd {}
-			$status stop [mc "Annotation complete."]
+			$status_operation stop [mc "Annotation complete."]
+			set status_operation {}
 		}
 	} else {
-		$status update $blame_lines $total_lines
+		$status_operation update $blame_lines $total_lines
 	}
 } ifdeleted { catch {close $fd} }
 
@@ -1124,7 +1135,7 @@ method _blameparent {} {
 			set diffcmd [list diff-tree --unified=0 $cparent $cmit -- $new_path]
 		}
 		if {[catch {set fd [eval git_read $diffcmd]} err]} {
-			$status stop [mc "Unable to display parent"]
+			$status_operation stop [mc "Unable to display parent"]
 			error_popup [strcat [mc "Error loading diff:"] "\n\n$err"]
 			return
 		}
diff --git a/git-gui/lib/branch.tcl b/git-gui/lib/branch.tcl
index 777eeb79c1..8b0c485889 100644
--- a/git-gui/lib/branch.tcl
+++ b/git-gui/lib/branch.tcl
@@ -8,6 +8,7 @@ proc load_all_heads {} {
 	set rh_len [expr {[string length $rh] + 1}]
 	set all_heads [list]
 	set fd [git_read for-each-ref --format=%(refname) $rh]
+	fconfigure $fd -translation binary -encoding utf-8
 	while {[gets $fd line] > 0} {
 		if {!$some_heads_tracking || ![is_tracking_branch $line]} {
 			lappend all_heads [string range $line $rh_len end]
@@ -24,6 +25,7 @@ proc load_all_tags {} {
 		--sort=-taggerdate \
 		--format=%(refname) \
 		refs/tags]
+	fconfigure $fd -translation binary -encoding utf-8
 	while {[gets $fd line] > 0} {
 		if {![regsub ^refs/tags/ $line {} name]} continue
 		lappend all_tags $name
diff --git a/git-gui/lib/checkout_op.tcl b/git-gui/lib/checkout_op.tcl
index a5228297db..21ea768d80 100644
--- a/git-gui/lib/checkout_op.tcl
+++ b/git-gui/lib/checkout_op.tcl
@@ -341,9 +341,9 @@ method _readtree {} {
 	global HEAD
 
 	set readtree_d {}
-	$::main_status start \
+	set status_bar_operation [$::main_status start \
 		[mc "Updating working directory to '%s'..." [_name $this]] \
-		[mc "files checked out"]
+		[mc "files checked out"]]
 
 	set fd [git_read --stderr read-tree \
 		-m \
@@ -354,26 +354,27 @@ method _readtree {} {
 		$new_hash \
 		]
 	fconfigure $fd -blocking 0 -translation binary
-	fileevent $fd readable [cb _readtree_wait $fd]
+	fileevent $fd readable [cb _readtree_wait $fd $status_bar_operation]
 }
 
-method _readtree_wait {fd} {
+method _readtree_wait {fd status_bar_operation} {
 	global current_branch
 
 	set buf [read $fd]
-	$::main_status update_meter $buf
+	$status_bar_operation update_meter $buf
 	append readtree_d $buf
 
 	fconfigure $fd -blocking 1
 	if {![eof $fd]} {
 		fconfigure $fd -blocking 0
+		$status_bar_operation stop
 		return
 	}
 
 	if {[catch {close $fd}]} {
 		set err $readtree_d
 		regsub {^fatal: } $err {} err
-		$::main_status stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]]
+		$status_bar_operation stop [mc "Aborted checkout of '%s' (file level merging is required)." [_name $this]]
 		warn_popup [strcat [mc "File level merge required."] "
 
 $err
@@ -384,7 +385,7 @@ $err
 		return
 	}
 
-	$::main_status stop
+	$status_bar_operation stop
 	_after_readtree $this
 }
 
diff --git a/git-gui/lib/choose_repository.tcl b/git-gui/lib/choose_repository.tcl
index 80f5a59bbb..af1fee7c75 100644
--- a/git-gui/lib/choose_repository.tcl
+++ b/git-gui/lib/choose_repository.tcl
@@ -9,6 +9,18 @@ field w_body      ; # Widget holding the center content
 field w_next      ; # Next button
 field w_quit      ; # Quit button
 field o_cons      ; # Console object (if active)
+
+# Status mega-widget instance during _do_clone2 (used by _copy_files and
+# _link_files). Widget is destroyed before _do_clone2 calls
+# _do_clone_checkout
+field o_status
+
+# Operation displayed by status mega-widget during _do_clone_checkout =>
+# _readtree_wait => _postcheckout_wait => _do_clone_submodules =>
+# _do_validate_submodule_cloning. The status mega-widget is a different
+# instance than that stored in $o_status in earlier operations.
+field o_status_op
+
 field w_types     ; # List of type buttons in clone
 field w_recentlist ; # Listbox containing recent repositories
 field w_localpath  ; # Entry widget bound to local_path
@@ -345,31 +357,10 @@ proc _is_git {path {outdir_var ""}} {
 	if {$outdir_var ne ""} {
 		upvar 1 $outdir_var outdir
 	}
-	if {[file isfile $path]} {
-		set fp [open $path r]
-		gets $fp line
-		close $fp
-		if {[regexp "^gitdir: (.+)$" $line line link_target]} {
-			set path [file join [file dirname $path] $link_target]
-			set path [file normalize $path]
-		}
-	}
-
-	if {[file exists [file join $path HEAD]]
-	 && [file exists [file join $path objects]]
-	 && [file exists [file join $path config]]} {
-		set outdir $path
-		return 1
-	}
-	if {[is_Cygwin]} {
-		if {[file exists [file join $path HEAD]]
-		 && [file exists [file join $path objects.lnk]]
-		 && [file exists [file join $path config.lnk]]} {
-			set outdir $path
-			return 1
-		}
+	if {[catch {set outdir [git rev-parse --resolve-git-dir $path]}]} {
+		return 0
 	}
-	return 0
+	return 1
 }
 
 proc _objdir {path} {
@@ -659,12 +650,12 @@ method _do_clone2 {} {
 
 	switch -exact -- $clone_type {
 	hardlink {
-		set o_cons [status_bar::two_line $w_body]
+		set o_status [status_bar::two_line $w_body]
 		pack $w_body -fill x -padx 10 -pady 10
 
-		$o_cons start \
+		set status_op [$o_status start \
 			[mc "Counting objects"] \
-			[mc "buckets"]
+			[mc "buckets"]]
 		update
 
 		if {[file exists [file join $objdir info alternates]]} {
@@ -689,6 +680,7 @@ method _do_clone2 {} {
 			} err]} {
 				catch {cd $pwd}
 				_clone_failed $this [mc "Unable to copy objects/info/alternates: %s" $err]
+				$status_op stop
 				return
 			}
 		}
@@ -700,7 +692,7 @@ method _do_clone2 {} {
 			-directory [file join $objdir] ??]
 		set bcnt [expr {[llength $buckets] + 2}]
 		set bcur 1
-		$o_cons update $bcur $bcnt
+		$status_op update $bcur $bcnt
 		update
 
 		file mkdir [file join .git objects pack]
@@ -708,7 +700,7 @@ method _do_clone2 {} {
 			-directory [file join $objdir pack] *] {
 			lappend tolink [file join pack $i]
 		}
-		$o_cons update [incr bcur] $bcnt
+		$status_op update [incr bcur] $bcnt
 		update
 
 		foreach i $buckets {
@@ -717,10 +709,10 @@ method _do_clone2 {} {
 				-directory [file join $objdir $i] *] {
 				lappend tolink [file join $i $j]
 			}
-			$o_cons update [incr bcur] $bcnt
+			$status_op update [incr bcur] $bcnt
 			update
 		}
-		$o_cons stop
+		$status_op stop
 
 		if {$tolink eq {}} {
 			info_popup [strcat \
@@ -747,6 +739,8 @@ method _do_clone2 {} {
 		if {!$i} return
 
 		destroy $w_body
+
+		set o_status {}
 	}
 	full {
 		set o_cons [console::embed \
@@ -781,9 +775,9 @@ method _do_clone2 {} {
 }
 
 method _copy_files {objdir tocopy} {
-	$o_cons start \
+	set status_op [$o_status start \
 		[mc "Copying objects"] \
-		[mc "KiB"]
+		[mc "KiB"]]
 	set tot 0
 	set cmp 0
 	foreach p $tocopy {
@@ -798,7 +792,7 @@ method _copy_files {objdir tocopy} {
 
 				while {![eof $f_in]} {
 					incr cmp [fcopy $f_in $f_cp -size 16384]
-					$o_cons update \
+					$status_op update \
 						[expr {$cmp / 1024}] \
 						[expr {$tot / 1024}]
 					update
@@ -808,17 +802,19 @@ method _copy_files {objdir tocopy} {
 				close $f_cp
 			} err]} {
 			_clone_failed $this [mc "Unable to copy object: %s" $err]
+			$status_op stop
 			return 0
 		}
 	}
+	$status_op stop
 	return 1
 }
 
 method _link_files {objdir tolink} {
 	set total [llength $tolink]
-	$o_cons start \
+	set status_op [$o_status start \
 		[mc "Linking objects"] \
-		[mc "objects"]
+		[mc "objects"]]
 	for {set i 0} {$i < $total} {} {
 		set p [lindex $tolink $i]
 		if {[catch {
@@ -827,15 +823,17 @@ method _link_files {objdir tolink} {
 					[file join $objdir $p]
 			} err]} {
 			_clone_failed $this [mc "Unable to hardlink object: %s" $err]
+			$status_op stop
 			return 0
 		}
 
 		incr i
 		if {$i % 5 == 0} {
-			$o_cons update $i $total
+			$status_op update $i $total
 			update
 		}
 	}
+	$status_op stop
 	return 1
 }
 
@@ -958,11 +956,26 @@ method _do_clone_checkout {HEAD} {
 		return
 	}
 
-	set o_cons [status_bar::two_line $w_body]
+	set status [status_bar::two_line $w_body]
 	pack $w_body -fill x -padx 10 -pady 10
-	$o_cons start \
+
+	# We start the status operation here.
+	#
+	# This function calls _readtree_wait as a callback.
+	#
+	# _readtree_wait in turn either calls _do_clone_submodules directly,
+	# or calls _postcheckout_wait as a callback which then calls
+	# _do_clone_submodules.
+	#
+	# _do_clone_submodules calls _do_validate_submodule_cloning.
+	#
+	# _do_validate_submodule_cloning stops the status operation.
+	#
+	# There are no other calls into this chain from other code.
+
+	set o_status_op [$status start \
 		[mc "Creating working directory"] \
-		[mc "files"]
+		[mc "files"]]
 
 	set readtree_err {}
 	set fd [git_read --stderr read-tree \
@@ -976,33 +989,9 @@ method _do_clone_checkout {HEAD} {
 	fileevent $fd readable [cb _readtree_wait $fd]
 }
 
-method _do_validate_submodule_cloning {ok} {
-	if {$ok} {
-		$o_cons done $ok
-		set done 1
-	} else {
-		_clone_failed $this [mc "Cannot clone submodules."]
-	}
-}
-
-method _do_clone_submodules {} {
-	if {$recursive eq {true}} {
-		destroy $w_body
-		set o_cons [console::embed \
-			$w_body \
-			[mc "Cloning submodules"]]
-		pack $w_body -fill both -expand 1 -padx 10
-		$o_cons exec \
-			[list git submodule update --init --recursive] \
-			[cb _do_validate_submodule_cloning]
-	} else {
-		set done 1
-	}
-}
-
 method _readtree_wait {fd} {
 	set buf [read $fd]
-	$o_cons update_meter $buf
+	$o_status_op update_meter $buf
 	append readtree_err $buf
 
 	fconfigure $fd -blocking 1
@@ -1050,6 +1039,34 @@ method _postcheckout_wait {fd_ph} {
 	fconfigure $fd_ph -blocking 0
 }
 
+method _do_clone_submodules {} {
+	if {$recursive eq {true}} {
+		$o_status_op stop
+		set o_status_op {}
+
+		destroy $w_body
+
+		set o_cons [console::embed \
+			$w_body \
+			[mc "Cloning submodules"]]
+		pack $w_body -fill both -expand 1 -padx 10
+		$o_cons exec \
+			[list git submodule update --init --recursive] \
+			[cb _do_validate_submodule_cloning]
+	} else {
+		set done 1
+	}
+}
+
+method _do_validate_submodule_cloning {ok} {
+	if {$ok} {
+		$o_cons done $ok
+		set done 1
+	} else {
+		_clone_failed $this [mc "Cannot clone submodules."]
+	}
+}
+
 ######################################################################
 ##
 ## Open Existing Repository
diff --git a/git-gui/lib/chord.tcl b/git-gui/lib/chord.tcl
new file mode 100644
index 0000000000..e21e7d3d0b
--- /dev/null
+++ b/git-gui/lib/chord.tcl
@@ -0,0 +1,158 @@
+# Simple Chord for Tcl
+#
+# A "chord" is a method with more than one entrypoint and only one body, such
+# that the body runs only once all the entrypoints have been called by
+# different asynchronous tasks. In this implementation, the chord is defined
+# dynamically for each invocation. A SimpleChord object is created, supplying
+# body script to be run when the chord is completed, and then one or more notes
+# are added to the chord. Each note can be called like a proc, and returns
+# immediately if the chord isn't yet complete. When the last remaining note is
+# called, the body runs before the note returns.
+#
+# The SimpleChord class has a constructor that takes the body script, and a
+# method add_note that returns a note object. Since the body script does not
+# run in the context of the procedure that defined it, a mechanism is provided
+# for injecting variables into the chord for use by the body script. The
+# activation of a note is idempotent; multiple calls have the same effect as
+# a simple call.
+#
+# If you are invoking asynchronous operations with chord notes as completion
+# callbacks, and there is a possibility that earlier operations could complete
+# before later ones are started, it is a good practice to create a "common"
+# note on the chord that prevents it from being complete until you're certain
+# you've added all the notes you need.
+#
+# Example:
+#
+#   # Turn off the UI while running a couple of async operations.
+#   lock_ui
+#
+#   set chord [SimpleChord::new {
+#     unlock_ui
+#     # Note: $notice here is not referenced in the calling scope
+#     if {$notice} { info_popup $notice }
+#   }
+#
+#   # Configure a note to keep the chord from completing until
+#   # all operations have been initiated.
+#   set common_note [$chord add_note]
+#
+#   # Activate notes in 'after' callbacks to other operations
+#   set newnote [$chord add_note]
+#   async_operation $args [list $newnote activate]
+#
+#   # Communicate with the chord body
+#   if {$condition} {
+#     # This sets $notice in the same context that the chord body runs in.
+#     $chord eval { set notice "Something interesting" }
+#   }
+#
+#   # Activate the common note, making the chord eligible to complete
+#   $common_note activate
+#
+# At this point, the chord will complete at some unknown point in the future.
+# The common note might have been the first note activated, or the async
+# operations might have completed synchronously and the common note is the
+# last one, completing the chord before this code finishes, or anything in
+# between. The purpose of the chord is to not have to worry about the order.
+
+# SimpleChord class:
+#   Represents a procedure that conceptually has multiple entrypoints that must
+#   all be called before the procedure executes. Each entrypoint is called a
+#   "note". The chord is only "completed" when all the notes are "activated".
+class SimpleChord {
+	field notes
+	field body
+	field is_completed
+	field eval_ns
+
+	# Constructor:
+	#   set chord [SimpleChord::new {body}]
+	#     Creates a new chord object with the specified body script. The
+	#     body script is evaluated at most once, when a note is activated
+	#     and the chord has no other non-activated notes.
+	constructor new {i_body} {
+		set notes [list]
+		set body $i_body
+		set is_completed 0
+		set eval_ns "[namespace qualifiers $this]::eval"
+		return $this
+	}
+
+	# Method:
+	#   $chord eval {script}
+	#     Runs the specified script in the same context (namespace) in which
+	#     the chord body will be evaluated. This can be used to set variable
+	#     values for the chord body to use.
+	method eval {script} {
+		namespace eval $eval_ns $script
+	}
+
+	# Method:
+	#   set note [$chord add_note]
+	#     Adds a new note to the chord, an instance of ChordNote. Raises an
+	#     error if the chord is already completed, otherwise the chord is
+	#     updated so that the new note must also be activated before the
+	#     body is evaluated.
+	method add_note {} {
+		if {$is_completed} { error "Cannot add a note to a completed chord" }
+
+		set note [ChordNote::new $this]
+
+		lappend notes $note
+
+		return $note
+	}
+
+	# This method is for internal use only and is intentionally undocumented.
+	method notify_note_activation {} {
+		if {!$is_completed} {
+			foreach note $notes {
+				if {![$note is_activated]} { return }
+			}
+
+			set is_completed 1
+
+			namespace eval $eval_ns $body
+			delete_this
+		}
+	}
+}
+
+# ChordNote class:
+#   Represents a note within a chord, providing a way to activate it. When the
+#   final note of the chord is activated (this can be any note in the chord,
+#   with all other notes already previously activated in any order), the chord's
+#   body is evaluated.
+class ChordNote {
+	field chord
+	field is_activated
+
+	# Constructor:
+	#   Instances of ChordNote are created internally by calling add_note on
+	#   SimpleChord objects.
+	constructor new {c} {
+		set chord $c
+		set is_activated 0
+		return $this
+	}
+
+	# Method:
+	#   [$note is_activated]
+	#     Returns true if this note has already been activated.
+	method is_activated {} {
+		return $is_activated
+	}
+
+	# Method:
+	#   $note activate
+	#     Activates the note, if it has not already been activated, and
+	#     completes the chord if there are no other notes awaiting
+	#     activation. Subsequent calls will have no further effect.
+	method activate {} {
+		if {!$is_activated} {
+			set is_activated 1
+			$chord notify_note_activation
+		}
+	}
+}
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index b516aa2990..11379f8ad3 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -456,6 +456,7 @@ A rescan will be automatically started now.
 	}
 
 	$ui_comm delete 0.0 end
+	load_message [get_config commit.template]
 	$ui_comm edit reset
 	$ui_comm edit modified false
 	if {$::GITGUI_BCK_exists} {
diff --git a/git-gui/lib/console.tcl b/git-gui/lib/console.tcl
index 1f3248ffd1..bb6b9c889e 100644
--- a/git-gui/lib/console.tcl
+++ b/git-gui/lib/console.tcl
@@ -203,6 +203,8 @@ method done {ok} {
 			focus $w.ok
 		}
 	}
+
+	bind $w <Key-Escape> "destroy $w;break"
 }
 
 method _sb_set {sb orient first last} {
diff --git a/git-gui/lib/index.tcl b/git-gui/lib/index.tcl
index e07b7a3762..d2ec24bd80 100644
--- a/git-gui/lib/index.tcl
+++ b/git-gui/lib/index.tcl
@@ -7,67 +7,74 @@ proc _delete_indexlock {} {
 	}
 }
 
-proc _close_updateindex {fd after} {
-	global use_ttk NS
-	fconfigure $fd -blocking 1
-	if {[catch {close $fd} err]} {
-		set w .indexfried
-		Dialog $w
-		wm withdraw $w
-		wm title $w [strcat "[appname] ([reponame]): " [mc "Index Error"]]
-		wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
-		set s [mc "Updating the Git index failed.  A rescan will be automatically started to resynchronize git-gui."]
-		text $w.msg -yscrollcommand [list $w.vs set] \
-			-width [string length $s] -relief flat \
-			-borderwidth 0 -highlightthickness 0 \
-			-background [get_bg_color $w]
-		$w.msg tag configure bold -font font_uibold -justify center
-		${NS}::scrollbar $w.vs -command [list $w.msg yview]
-		$w.msg insert end $s bold \n\n$err {}
-		$w.msg configure -state disabled
-
-		${NS}::button $w.continue \
-			-text [mc "Continue"] \
-			-command [list destroy $w]
-		${NS}::button $w.unlock \
-			-text [mc "Unlock Index"] \
-			-command "destroy $w; _delete_indexlock"
-		grid $w.msg - $w.vs -sticky news
-		grid $w.unlock $w.continue - -sticky se -padx 2 -pady 2
-		grid columnconfigure $w 0 -weight 1
-		grid rowconfigure $w 0 -weight 1
-
-		wm protocol $w WM_DELETE_WINDOW update
-		bind $w.continue <Visibility> "
-			grab $w
-			focus %W
-		"
-		wm deiconify $w
-		tkwait window $w
-
-		$::main_status stop
+proc close_and_unlock_index {fd after} {
+	if {![catch {_close_updateindex $fd} err]} {
 		unlock_index
-		rescan $after 0
-		return
+		uplevel #0 $after
+	} else {
+		rescan_on_error $err $after
 	}
+}
 
-	$::main_status stop
+proc _close_updateindex {fd} {
+	fconfigure $fd -blocking 1
+	close $fd
+}
+
+proc rescan_on_error {err {after {}}} {
+	global use_ttk NS
+
+	set w .indexfried
+	Dialog $w
+	wm withdraw $w
+	wm title $w [strcat "[appname] ([reponame]): " [mc "Index Error"]]
+	wm geometry $w "+[winfo rootx .]+[winfo rooty .]"
+	set s [mc "Updating the Git index failed.  A rescan will be automatically started to resynchronize git-gui."]
+	text $w.msg -yscrollcommand [list $w.vs set] \
+		-width [string length $s] -relief flat \
+		-borderwidth 0 -highlightthickness 0 \
+		-background [get_bg_color $w]
+	$w.msg tag configure bold -font font_uibold -justify center
+	${NS}::scrollbar $w.vs -command [list $w.msg yview]
+	$w.msg insert end $s bold \n\n$err {}
+	$w.msg configure -state disabled
+
+	${NS}::button $w.continue \
+		-text [mc "Continue"] \
+		-command [list destroy $w]
+	${NS}::button $w.unlock \
+		-text [mc "Unlock Index"] \
+		-command "destroy $w; _delete_indexlock"
+	grid $w.msg - $w.vs -sticky news
+	grid $w.unlock $w.continue - -sticky se -padx 2 -pady 2
+	grid columnconfigure $w 0 -weight 1
+	grid rowconfigure $w 0 -weight 1
+
+	wm protocol $w WM_DELETE_WINDOW update
+	bind $w.continue <Visibility> "
+		grab $w
+		focus %W
+	"
+	wm deiconify $w
+	tkwait window $w
+
+	$::main_status stop_all
 	unlock_index
-	uplevel #0 $after
+	rescan [concat $after {ui_ready;}] 0
 }
 
-proc update_indexinfo {msg pathList after} {
+proc update_indexinfo {msg path_list after} {
 	global update_index_cp
 
 	if {![lock_index update]} return
 
 	set update_index_cp 0
-	set pathList [lsort $pathList]
-	set totalCnt [llength $pathList]
-	set batch [expr {int($totalCnt * .01) + 1}]
+	set path_list [lsort $path_list]
+	set total_cnt [llength $path_list]
+	set batch [expr {int($total_cnt * .01) + 1}]
 	if {$batch > 25} {set batch 25}
 
-	$::main_status start $msg [mc "files"]
+	set status_bar_operation [$::main_status start $msg [mc "files"]]
 	set fd [git_write update-index -z --index-info]
 	fconfigure $fd \
 		-blocking 0 \
@@ -78,26 +85,29 @@ proc update_indexinfo {msg pathList after} {
 	fileevent $fd writable [list \
 		write_update_indexinfo \
 		$fd \
-		$pathList \
-		$totalCnt \
+		$path_list \
+		$total_cnt \
 		$batch \
+		$status_bar_operation \
 		$after \
 		]
 }
 
-proc write_update_indexinfo {fd pathList totalCnt batch after} {
+proc write_update_indexinfo {fd path_list total_cnt batch status_bar_operation \
+	after} {
 	global update_index_cp
 	global file_states current_diff_path
 
-	if {$update_index_cp >= $totalCnt} {
-		_close_updateindex $fd $after
+	if {$update_index_cp >= $total_cnt} {
+		$status_bar_operation stop
+		close_and_unlock_index $fd $after
 		return
 	}
 
 	for {set i $batch} \
-		{$update_index_cp < $totalCnt && $i > 0} \
+		{$update_index_cp < $total_cnt && $i > 0} \
 		{incr i -1} {
-		set path [lindex $pathList $update_index_cp]
+		set path [lindex $path_list $update_index_cp]
 		incr update_index_cp
 
 		set s $file_states($path)
@@ -119,21 +129,21 @@ proc write_update_indexinfo {fd pathList totalCnt batch after} {
 		display_file $path $new
 	}
 
-	$::main_status update $update_index_cp $totalCnt
+	$status_bar_operation update $update_index_cp $total_cnt
 }
 
-proc update_index {msg pathList after} {
+proc update_index {msg path_list after} {
 	global update_index_cp
 
 	if {![lock_index update]} return
 
 	set update_index_cp 0
-	set pathList [lsort $pathList]
-	set totalCnt [llength $pathList]
-	set batch [expr {int($totalCnt * .01) + 1}]
+	set path_list [lsort $path_list]
+	set total_cnt [llength $path_list]
+	set batch [expr {int($total_cnt * .01) + 1}]
 	if {$batch > 25} {set batch 25}
 
-	$::main_status start $msg [mc "files"]
+	set status_bar_operation [$::main_status start $msg [mc "files"]]
 	set fd [git_write update-index --add --remove -z --stdin]
 	fconfigure $fd \
 		-blocking 0 \
@@ -144,26 +154,29 @@ proc update_index {msg pathList after} {
 	fileevent $fd writable [list \
 		write_update_index \
 		$fd \
-		$pathList \
-		$totalCnt \
+		$path_list \
+		$total_cnt \
 		$batch \
+		$status_bar_operation \
 		$after \
 		]
 }
 
-proc write_update_index {fd pathList totalCnt batch after} {
+proc write_update_index {fd path_list total_cnt batch status_bar_operation \
+	after} {
 	global update_index_cp
 	global file_states current_diff_path
 
-	if {$update_index_cp >= $totalCnt} {
-		_close_updateindex $fd $after
+	if {$update_index_cp >= $total_cnt} {
+		$status_bar_operation stop
+		close_and_unlock_index $fd $after
 		return
 	}
 
 	for {set i $batch} \
-		{$update_index_cp < $totalCnt && $i > 0} \
+		{$update_index_cp < $total_cnt && $i > 0} \
 		{incr i -1} {
-		set path [lindex $pathList $update_index_cp]
+		set path [lindex $path_list $update_index_cp]
 		incr update_index_cp
 
 		switch -glob -- [lindex $file_states($path) 0] {
@@ -190,21 +203,21 @@ proc write_update_index {fd pathList totalCnt batch after} {
 		display_file $path $new
 	}
 
-	$::main_status update $update_index_cp $totalCnt
+	$status_bar_operation update $update_index_cp $total_cnt
 }
 
-proc checkout_index {msg pathList after} {
+proc checkout_index {msg path_list after capture_error} {
 	global update_index_cp
 
 	if {![lock_index update]} return
 
 	set update_index_cp 0
-	set pathList [lsort $pathList]
-	set totalCnt [llength $pathList]
-	set batch [expr {int($totalCnt * .01) + 1}]
+	set path_list [lsort $path_list]
+	set total_cnt [llength $path_list]
+	set batch [expr {int($total_cnt * .01) + 1}]
 	if {$batch > 25} {set batch 25}
 
-	$::main_status start $msg [mc "files"]
+	set status_bar_operation [$::main_status start $msg [mc "files"]]
 	set fd [git_write checkout-index \
 		--index \
 		--quiet \
@@ -221,26 +234,45 @@ proc checkout_index {msg pathList after} {
 	fileevent $fd writable [list \
 		write_checkout_index \
 		$fd \
-		$pathList \
-		$totalCnt \
+		$path_list \
+		$total_cnt \
 		$batch \
+		$status_bar_operation \
 		$after \
+		$capture_error \
 		]
 }
 
-proc write_checkout_index {fd pathList totalCnt batch after} {
+proc write_checkout_index {fd path_list total_cnt batch status_bar_operation \
+	after capture_error} {
 	global update_index_cp
 	global file_states current_diff_path
 
-	if {$update_index_cp >= $totalCnt} {
-		_close_updateindex $fd $after
+	if {$update_index_cp >= $total_cnt} {
+		$status_bar_operation stop
+
+		# We do not unlock the index directly here because this
+		# operation expects to potentially run in parallel with file
+		# deletions scheduled by revert_helper. We're done with the
+		# update index, so we close it, but actually unlocking the index
+		# and dealing with potential errors is deferred to the chord
+		# body that runs when all async operations are completed.
+		#
+		# (See after_chord in revert_helper.)
+
+		if {[catch {_close_updateindex $fd} err]} {
+			uplevel #0 $capture_error [list $err]
+		}
+
+		uplevel #0 $after
+
 		return
 	}
 
 	for {set i $batch} \
-		{$update_index_cp < $totalCnt && $i > 0} \
+		{$update_index_cp < $total_cnt && $i > 0} \
 		{incr i -1} {
-		set path [lindex $pathList $update_index_cp]
+		set path [lindex $path_list $update_index_cp]
 		incr update_index_cp
 		switch -glob -- [lindex $file_states($path) 0] {
 		U? {continue}
@@ -253,7 +285,7 @@ proc write_checkout_index {fd pathList totalCnt batch after} {
 		}
 	}
 
-	$::main_status update $update_index_cp $totalCnt
+	$status_bar_operation update $update_index_cp $total_cnt
 }
 
 proc unstage_helper {txt paths} {
@@ -261,7 +293,7 @@ proc unstage_helper {txt paths} {
 
 	if {![lock_index begin-update]} return
 
-	set pathList [list]
+	set path_list [list]
 	set after {}
 	foreach path $paths {
 		switch -glob -- [lindex $file_states($path) 0] {
@@ -269,20 +301,20 @@ proc unstage_helper {txt paths} {
 		M? -
 		T? -
 		D? {
-			lappend pathList $path
+			lappend path_list $path
 			if {$path eq $current_diff_path} {
 				set after {reshow_diff;}
 			}
 		}
 		}
 	}
-	if {$pathList eq {}} {
+	if {$path_list eq {}} {
 		unlock_index
 	} else {
 		update_indexinfo \
 			$txt \
-			$pathList \
-			[concat $after [list ui_ready]]
+			$path_list \
+			[concat $after {ui_ready;}]
 	}
 }
 
@@ -305,7 +337,7 @@ proc add_helper {txt paths} {
 
 	if {![lock_index begin-update]} return
 
-	set pathList [list]
+	set path_list [list]
 	set after {}
 	foreach path $paths {
 		switch -glob -- [lindex $file_states($path) 0] {
@@ -321,20 +353,20 @@ proc add_helper {txt paths} {
 		?M -
 		?D -
 		?T {
-			lappend pathList $path
+			lappend path_list $path
 			if {$path eq $current_diff_path} {
 				set after {reshow_diff;}
 			}
 		}
 		}
 	}
-	if {$pathList eq {}} {
+	if {$path_list eq {}} {
 		unlock_index
 	} else {
 		update_index \
 			$txt \
-			$pathList \
-			[concat $after {ui_status [mc "Ready to commit."]}]
+			$path_list \
+			[concat $after {ui_status [mc "Ready to commit."];}]
 	}
 }
 
@@ -388,66 +420,303 @@ proc do_add_all {} {
 	add_helper [mc "Adding all changed files"] $paths
 }
 
+# Copied from TclLib package "lambda".
+proc lambda {arguments body args} {
+	return [list ::apply [list $arguments $body] {*}$args]
+}
+
 proc revert_helper {txt paths} {
 	global file_states current_diff_path
 
 	if {![lock_index begin-update]} return
 
-	set pathList [list]
-	set after {}
+	# Common "after" functionality that waits until multiple asynchronous
+	# operations are complete (by waiting for them to activate their notes
+	# on the chord).
+	#
+	# The asynchronous operations are each indicated below by a comment
+	# before the code block that starts the async operation.
+	set after_chord [SimpleChord::new {
+		if {[string trim $err] != ""} {
+			rescan_on_error $err
+		} else {
+			unlock_index
+			if {$should_reshow_diff} { reshow_diff }
+			ui_ready
+		}
+	}]
+
+	$after_chord eval { set should_reshow_diff 0 }
+
+	# This function captures an error for processing when after_chord is
+	# completed. (The chord is curried into the lambda function.)
+	set capture_error [lambda \
+		{chord error} \
+		{ $chord eval [list set err $error] } \
+		$after_chord]
+
+	# We don't know how many notes we're going to create (it's dynamic based
+	# on conditional paths below), so create a common note that will delay
+	# the chord's completion until we activate it, and then activate it
+	# after all the other notes have been created.
+	set after_common_note [$after_chord add_note]
+
+	set path_list [list]
+	set untracked_list [list]
+
 	foreach path $paths {
 		switch -glob -- [lindex $file_states($path) 0] {
 		U? {continue}
+		?O {
+			lappend untracked_list $path
+		}
 		?M -
 		?T -
 		?D {
-			lappend pathList $path
+			lappend path_list $path
 			if {$path eq $current_diff_path} {
-				set after {reshow_diff;}
+				$after_chord eval { set should_reshow_diff 1 }
 			}
 		}
 		}
 	}
 
+	set path_cnt [llength $path_list]
+	set untracked_cnt [llength $untracked_list]
+
+	# Asynchronous operation: revert changes by checking them out afresh
+	# from the index.
+	if {$path_cnt > 0} {
+		# Split question between singular and plural cases, because
+		# such distinction is needed in some languages. Previously, the
+		# code used "Revert changes in" for both, but that can't work
+		# in languages where 'in' must be combined with word from
+		# rest of string (in different way for both cases of course).
+		#
+		# FIXME: Unfortunately, even that isn't enough in some languages
+		# as they have quite complex plural-form rules. Unfortunately,
+		# msgcat doesn't seem to support that kind of string
+		# translation.
+		#
+		if {$path_cnt == 1} {
+			set query [mc \
+				"Revert changes in file %s?" \
+				[short_path [lindex $path_list]] \
+				]
+		} else {
+			set query [mc \
+				"Revert changes in these %i files?" \
+				$path_cnt]
+		}
 
-	# Split question between singular and plural cases, because
-	# such distinction is needed in some languages. Previously, the
-	# code used "Revert changes in" for both, but that can't work
-	# in languages where 'in' must be combined with word from
-	# rest of string (in different way for both cases of course).
-	#
-	# FIXME: Unfortunately, even that isn't enough in some languages
-	# as they have quite complex plural-form rules. Unfortunately,
-	# msgcat doesn't seem to support that kind of string translation.
-	#
-	set n [llength $pathList]
-	if {$n == 0} {
-		unlock_index
-		return
-	} elseif {$n == 1} {
-		set query [mc "Revert changes in file %s?" [short_path [lindex $pathList]]]
-	} else {
-		set query [mc "Revert changes in these %i files?" $n]
+		set reply [tk_dialog \
+			.confirm_revert \
+			"[appname] ([reponame])" \
+			"$query
+
+[mc "Any unstaged changes will be permanently lost by the revert."]" \
+			question \
+			1 \
+			[mc "Do Nothing"] \
+			[mc "Revert Changes"] \
+			]
+
+		if {$reply == 1} {
+			set note [$after_chord add_note]
+			checkout_index \
+				$txt \
+				$path_list \
+				[list $note activate] \
+				$capture_error
+		}
+	}
+
+	# Asynchronous operation: Deletion of untracked files.
+	if {$untracked_cnt > 0} {
+		# Split question between singular and plural cases, because
+		# such distinction is needed in some languages.
+		#
+		# FIXME: Unfortunately, even that isn't enough in some languages
+		# as they have quite complex plural-form rules. Unfortunately,
+		# msgcat doesn't seem to support that kind of string
+		# translation.
+		#
+		if {$untracked_cnt == 1} {
+			set query [mc \
+				"Delete untracked file %s?" \
+				[short_path [lindex $untracked_list]] \
+				]
+		} else {
+			set query [mc \
+				"Delete these %i untracked files?" \
+				$untracked_cnt \
+				]
+		}
+
+		set reply [tk_dialog \
+			.confirm_revert \
+			"[appname] ([reponame])" \
+			"$query
+
+[mc "Files will be permanently deleted."]" \
+			question \
+			1 \
+			[mc "Do Nothing"] \
+			[mc "Delete Files"] \
+			]
+
+		if {$reply == 1} {
+			$after_chord eval { set should_reshow_diff 1 }
+
+			set note [$after_chord add_note]
+			delete_files $untracked_list [list $note activate]
+		}
 	}
 
-	set reply [tk_dialog \
-		.confirm_revert \
-		"[appname] ([reponame])" \
-		"$query
+	# Activate the common note. If no other notes were created, this
+	# completes the chord. If other notes were created, then this common
+	# note prevents a race condition where the chord might complete early.
+	$after_common_note activate
+}
 
-[mc "Any unstaged changes will be permanently lost by the revert."]" \
-		question \
-		1 \
-		[mc "Do Nothing"] \
-		[mc "Revert Changes"] \
-		]
-	if {$reply == 1} {
-		checkout_index \
-			$txt \
-			$pathList \
-			[concat $after [list ui_ready]]
+# Delete all of the specified files, performing deletion in batches to allow the
+# UI to remain responsive and updated.
+proc delete_files {path_list after} {
+	# Enable progress bar status updates
+	set status_bar_operation [$::main_status \
+		start \
+		[mc "Deleting"] \
+		[mc "files"]]
+
+	set path_index 0
+	set deletion_errors [list]
+	set batch_size 50
+
+	delete_helper \
+		$path_list \
+		$path_index \
+		$deletion_errors \
+		$batch_size \
+		$status_bar_operation \
+		$after
+}
+
+# Helper function to delete a list of files in batches. Each call deletes one
+# batch of files, and then schedules a call for the next batch after any UI
+# messages have been processed.
+proc delete_helper {path_list path_index deletion_errors batch_size \
+	status_bar_operation after} {
+	global file_states
+
+	set path_cnt [llength $path_list]
+
+	set batch_remaining $batch_size
+
+	while {$batch_remaining > 0} {
+		if {$path_index >= $path_cnt} { break }
+
+		set path [lindex $path_list $path_index]
+
+		set deletion_failed [catch {file delete -- $path} deletion_error]
+
+		if {$deletion_failed} {
+			lappend deletion_errors [list "$deletion_error"]
+		} else {
+			remove_empty_directories [file dirname $path]
+
+			# Don't assume the deletion worked. Remove the file from
+			# the UI, but only if it no longer exists.
+			if {![path_exists $path]} {
+				unset file_states($path)
+				display_file $path __
+			}
+		}
+
+		incr path_index 1
+		incr batch_remaining -1
+	}
+
+	# Update the progress bar to indicate that this batch has been
+	# completed. The update will be visible when this procedure returns
+	# and allows the UI thread to process messages.
+	$status_bar_operation update $path_index $path_cnt
+
+	if {$path_index < $path_cnt} {
+		# The Tcler's Wiki lists this as the best practice for keeping
+		# a UI active and processing messages during a long-running
+		# operation.
+
+		after idle [list after 0 [list \
+			delete_helper \
+			$path_list \
+			$path_index \
+			$deletion_errors \
+			$batch_size \
+			$status_bar_operation \
+			$after
+			]]
 	} else {
-		unlock_index
+		# Finish the status bar operation.
+		$status_bar_operation stop
+
+		# Report error, if any, based on how many deletions failed.
+		set deletion_error_cnt [llength $deletion_errors]
+
+		if {($deletion_error_cnt > 0)
+		 && ($deletion_error_cnt <= [MAX_VERBOSE_FILES_IN_DELETION_ERROR])} {
+			set error_text [mc "Encountered errors deleting files:\n"]
+
+			foreach deletion_error $deletion_errors {
+				append error_text "* [lindex $deletion_error 0]\n"
+			}
+
+			error_popup $error_text
+		} elseif {$deletion_error_cnt == $path_cnt} {
+			error_popup [mc \
+				"None of the %d selected files could be deleted." \
+				$path_cnt \
+				]
+		} elseif {$deletion_error_cnt > 1} {
+			error_popup [mc \
+				"%d of the %d selected files could not be deleted." \
+				$deletion_error_cnt \
+				$path_cnt \
+				]
+		}
+
+		uplevel #0 $after
+	}
+}
+
+proc MAX_VERBOSE_FILES_IN_DELETION_ERROR {} { return 10; }
+
+# This function is from the TCL documentation:
+#
+#   https://wiki.tcl-lang.org/page/file+exists
+#
+# [file exists] returns false if the path does exist but is a symlink to a path
+# that doesn't exist. This proc returns true if the path exists, regardless of
+# whether it is a symlink and whether it is broken.
+proc path_exists {name} {
+	expr {![catch {file lstat $name finfo}]}
+}
+
+# Remove as many empty directories as we can starting at the specified path,
+# walking up the directory tree. If we encounter a directory that is not
+# empty, or if a directory deletion fails, then we stop the operation and
+# return to the caller. Even if this procedure fails to delete any
+# directories at all, it does not report failure.
+proc remove_empty_directories {directory_path} {
+	set parent_path [file dirname $directory_path]
+
+	while {$parent_path != $directory_path} {
+		set contents [glob -nocomplain -dir $directory_path *]
+
+		if {[llength $contents] > 0} { break }
+		if {[catch {file delete -- $directory_path}]} { break }
+
+		set directory_path $parent_path
+		set parent_path [file dirname $directory_path]
 	}
 }
 
diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
index 9f253db5b3..664803cf3f 100644
--- a/git-gui/lib/merge.tcl
+++ b/git-gui/lib/merge.tcl
@@ -241,23 +241,27 @@ Continue with resetting the current changes?"]
 	if {[ask_popup $op_question] eq {yes}} {
 		set fd [git_read --stderr read-tree --reset -u -v HEAD]
 		fconfigure $fd -blocking 0 -translation binary
-		fileevent $fd readable [namespace code [list _reset_wait $fd]]
-		$::main_status start [mc "Aborting"] [mc "files reset"]
+		set status_bar_operation [$::main_status \
+			start \
+			[mc "Aborting"] \
+			[mc "files reset"]]
+		fileevent $fd readable [namespace code [list \
+			_reset_wait $fd $status_bar_operation]]
 	} else {
 		unlock_index
 	}
 }
 
-proc _reset_wait {fd} {
+proc _reset_wait {fd status_bar_operation} {
 	global ui_comm
 
-	$::main_status update_meter [read $fd]
+	$status_bar_operation update_meter [read $fd]
 
 	fconfigure $fd -blocking 1
 	if {[eof $fd]} {
 		set fail [catch {close $fd} err]
-		$::main_status stop
 		unlock_index
+		$status_bar_operation stop
 
 		$ui_comm delete 0.0 end
 		$ui_comm edit modified false
diff --git a/git-gui/lib/mergetool.tcl b/git-gui/lib/mergetool.tcl
index 120bc4064b..e688b016ef 100644
--- a/git-gui/lib/mergetool.tcl
+++ b/git-gui/lib/mergetool.tcl
@@ -59,7 +59,7 @@ proc merge_add_resolution {path} {
 	update_index \
 		[mc "Adding resolution for %s" [short_path $path]] \
 		[list $path] \
-		[concat $after [list ui_ready]]
+		[concat $after {ui_ready;}]
 }
 
 proc merge_force_stage {stage} {
diff --git a/git-gui/lib/status_bar.tcl b/git-gui/lib/status_bar.tcl
index 02111a1742..d32b14142f 100644
--- a/git-gui/lib/status_bar.tcl
+++ b/git-gui/lib/status_bar.tcl
@@ -1,16 +1,42 @@
 # git-gui status bar mega-widget
 # Copyright (C) 2007 Shawn Pearce
 
+# The status_bar class manages the entire status bar. It is possible for
+# multiple overlapping asynchronous operations to want to display status
+# simultaneously. Each one receives a status_bar_operation when it calls the
+# start method, and the status bar combines all active operations into the
+# line of text it displays. Most of the time, there will be at most one
+# ongoing operation.
+#
+# Note that the entire status bar can be either in single-line or two-line
+# mode, depending on the constructor. Multiple active operations are only
+# supported for single-line status bars.
+
 class status_bar {
 
+field allow_multiple ; # configured at construction
+
 field w         ; # our own window path
 field w_l       ; # text widget we draw messages into
 field w_c       ; # canvas we draw a progress bar into
 field c_pack    ; # script to pack the canvas with
-field status  {}; # single line of text we show
-field prefix  {}; # text we format into status
-field units   {}; # unit of progress
-field meter   {}; # current core git progress meter (if active)
+
+field baseline_text   ; # text to show if there are no operations
+field status_bar_text ; # combined text for all operations
+
+field operations ; # list of current ongoing operations
+
+# The status bar can display a progress bar, updated when consumers call the
+# update method on their status_bar_operation. When there are multiple
+# operations, the status bar shows the combined status of all operations.
+#
+# When an overlapping operation completes, the progress bar is going to
+# abruptly have one fewer operation in the calculation, causing a discontinuity.
+# Therefore, whenever an operation completes, if it is not the last operation,
+# this counter is increased, and the progress bar is calculated as though there
+# were still another operation at 100%. When the last operation completes, this
+# is reset to 0.
+field completed_operation_count
 
 constructor new {path} {
 	global use_ttk NS
@@ -18,12 +44,19 @@ constructor new {path} {
 	set w_l $w.l
 	set w_c $w.c
 
+	# Standard single-line status bar: Permit overlapping operations
+	set allow_multiple 1
+
+	set baseline_text ""
+	set operations [list]
+	set completed_operation_count 0
+
 	${NS}::frame $w
 	if {!$use_ttk} {
 		$w configure -borderwidth 1 -relief sunken
 	}
 	${NS}::label $w_l \
-		-textvariable @status \
+		-textvariable @status_bar_text \
 		-anchor w \
 		-justify left
 	pack $w_l -side left
@@ -44,9 +77,16 @@ constructor two_line {path} {
 	set w_l $w.l
 	set w_c $w.c
 
+	# Two-line status bar: Only one ongoing operation permitted.
+	set allow_multiple 0
+
+	set baseline_text ""
+	set operations [list]
+	set completed_operation_count 0
+
 	${NS}::frame $w
 	${NS}::label $w_l \
-		-textvariable @status \
+		-textvariable @status_bar_text \
 		-anchor w \
 		-justify left
 	pack $w_l -anchor w -fill x
@@ -56,7 +96,7 @@ constructor two_line {path} {
 	return $this
 }
 
-method start {msg uds} {
+method ensure_canvas {} {
 	if {[winfo exists $w_c]} {
 		$w_c coords bar 0 0 0 20
 	} else {
@@ -68,31 +108,170 @@ method start {msg uds} {
 		$w_c create rectangle 0 0 0 20 -tags bar -fill navy
 		eval $c_pack
 	}
+}
+
+method show {msg} {
+	$this ensure_canvas
+	set baseline_text $msg
+	$this refresh
+}
+
+method start {msg {uds {}}} {
+	set baseline_text ""
+
+	if {!$allow_multiple && [llength $operations]} {
+		return [lindex $operations 0]
+	}
+
+	$this ensure_canvas
+
+	set operation [status_bar_operation::new $this $msg $uds]
+
+	lappend operations $operation
+
+	$this refresh
+
+	return $operation
+}
+
+method refresh {} {
+	set new_text ""
+
+	set total [expr $completed_operation_count * 100]
+	set have $total
+
+	foreach operation $operations {
+		if {$new_text != ""} {
+			append new_text " / "
+		}
+
+		append new_text [$operation get_status]
+
+		set total [expr $total + 100]
+		set have [expr $have + [$operation get_progress]]
+	}
+
+	if {$new_text == ""} {
+		set new_text $baseline_text
+	}
+
+	set status_bar_text $new_text
+
+	if {[winfo exists $w_c]} {
+		set pixel_width 0
+		if {$have > 0} {
+			set pixel_width [expr {[winfo width $w_c] * $have / $total}]
+		}
+
+		$w_c coords bar 0 0 $pixel_width 20
+	}
+}
+
+method stop {operation stop_msg} {
+	set idx [lsearch $operations $operation]
+
+	if {$idx >= 0} {
+		set operations [lreplace $operations $idx $idx]
+		set completed_operation_count [expr \
+			$completed_operation_count + 1]
+
+		if {[llength $operations] == 0} {
+			set completed_operation_count 0
+
+			destroy $w_c
+			if {$stop_msg ne {}} {
+				set baseline_text $stop_msg
+			}
+		}
+
+		$this refresh
+	}
+}
+
+method stop_all {{stop_msg {}}} {
+	# This makes the operation's call to stop a no-op.
+	set operations_copy $operations
+	set operations [list]
+
+	foreach operation $operations_copy {
+		$operation stop
+	}
+
+	if {$stop_msg ne {}} {
+		set baseline_text $stop_msg
+	}
+
+	$this refresh
+}
+
+method _delete {current} {
+	if {$current eq $w} {
+		delete_this
+	}
+}
+
+}
+
+# The status_bar_operation class tracks a single consumer's ongoing status bar
+# activity, with the context that there are a few situations where multiple
+# overlapping asynchronous operations might want to display status information
+# simultaneously. Instances of status_bar_operation are created by calling
+# start on the status_bar, and when the caller is done with its stauts bar
+# operation, it calls stop on the operation.
+
+class status_bar_operation {
+
+field status_bar; # reference back to the status_bar that owns this object
+
+field is_active;
+
+field status   {}; # single line of text we show
+field progress {}; # current progress (0 to 100)
+field prefix   {}; # text we format into status
+field units    {}; # unit of progress
+field meter    {}; # current core git progress meter (if active)
+
+constructor new {owner msg uds} {
+	set status_bar $owner
 
 	set status $msg
+	set progress 0
 	set prefix $msg
 	set units  $uds
 	set meter  {}
+
+	set is_active 1
+
+	return $this
 }
 
+method get_is_active {} { return $is_active }
+method get_status {} { return $status }
+method get_progress {} { return $progress }
+
 method update {have total} {
-	set pdone 0
-	set cdone 0
+	if {!$is_active} { return }
+
+	set progress 0
+
 	if {$total > 0} {
-		set pdone [expr {100 * $have / $total}]
-		set cdone [expr {[winfo width $w_c] * $have / $total}]
+		set progress [expr {100 * $have / $total}]
 	}
 
 	set prec [string length [format %i $total]]
+
 	set status [mc "%s ... %*i of %*i %s (%3i%%)" \
 		$prefix \
 		$prec $have \
 		$prec $total \
-		$units $pdone]
-	$w_c coords bar 0 0 $cdone 20
+		$units $progress]
+
+	$status_bar refresh
 }
 
 method update_meter {buf} {
+	if {!$is_active} { return }
+
 	append meter $buf
 	set r [string last "\r" $meter]
 	if {$r == -1} {
@@ -109,23 +288,25 @@ method update_meter {buf} {
 	}
 }
 
-method stop {{msg {}}} {
-	destroy $w_c
-	if {$msg ne {}} {
-		set status $msg
+method stop {{stop_msg {}}} {
+	if {$is_active} {
+		set is_active 0
+		$status_bar stop $this $stop_msg
 	}
 }
 
-method show {msg {test {}}} {
-	if {$test eq {} || $status eq $test} {
-		set status $msg
-	}
+method restart {msg} {
+	if {!$is_active} { return }
+
+	set status $msg
+	set prefix $msg
+	set meter {}
+	$status_bar refresh
 }
 
-method _delete {current} {
-	if {$current eq $w} {
-		delete_this
-	}
+method _delete {} {
+	stop
+	delete_this
 }
 
 }
diff --git a/git-gui/lib/themed.tcl b/git-gui/lib/themed.tcl
index 88b3119a75..f43d84e54f 100644
--- a/git-gui/lib/themed.tcl
+++ b/git-gui/lib/themed.tcl
@@ -1,6 +1,61 @@
 # Functions for supporting the use of themed Tk widgets in git-gui.
 # Copyright (C) 2009 Pat Thoyts <patthoyts@users.sourceforge.net>
 
+
+namespace eval color {
+	# Variable colors
+	# Preffered way to set widget colors is using add_option.
+	# In some cases, like with tags in_diff/in_sel, we use these colors.
+	variable select_bg				lightgray
+	variable select_fg				black
+	variable inactive_select_bg		lightgray
+	variable inactive_select_fg		black
+
+	proc sync_with_theme {} {
+		set base_bg				[ttk::style lookup . -background]
+		set base_fg				[ttk::style lookup . -foreground]
+		set text_bg				[ttk::style lookup Treeview -background]
+		set text_fg				[ttk::style lookup Treeview -foreground]
+		set select_bg			[ttk::style lookup Default -selectbackground]
+		set select_fg			[ttk::style lookup Default -selectforeground]
+		set inactive_select_bg	[convert_rgb_to_gray $select_bg]
+		set inactive_select_fg	$select_fg
+
+		set color::select_bg $select_bg
+		set color::select_fg $select_fg
+		set color::inactive_select_bg $inactive_select_bg
+		set color::inactive_select_fg $inactive_select_fg
+
+		proc add_option {key val} {
+			option add $key $val widgetDefault
+		}
+		# Add options for plain Tk widgets
+		# Using `option add` instead of tk_setPalette to avoid unintended
+		# consequences.
+		if {![is_MacOSX]} {
+			add_option *Menu.Background $base_bg
+			add_option *Menu.Foreground $base_fg
+			add_option *Menu.activeBackground $select_bg
+			add_option *Menu.activeForeground $select_fg
+		}
+		add_option *Text.Background $text_bg
+		add_option *Text.Foreground $text_fg
+		add_option *Text.selectBackground $select_bg
+		add_option *Text.selectForeground $select_fg
+		add_option *Text.inactiveSelectBackground $inactive_select_bg
+		add_option *Text.inactiveSelectForeground $inactive_select_fg
+	}
+}
+
+proc convert_rgb_to_gray {rgb} {
+	# Simply take the average of red, green and blue. This wouldn't be good
+	# enough for, say, converting a photo to grayscale, but for this simple
+	# purpose of approximating the brightness of a color it's good enough.
+	lassign [winfo rgb . $rgb] r g b
+	set gray [expr {($r / 256 + $g / 256 + $b / 256) / 3}]
+	return [format "#%2.2X%2.2X%2.2X" $gray $gray $gray]
+}
+
 proc ttk_get_current_theme {} {
 	# Handle either current Tk or older versions of 8.5
 	if {[catch {set theme [ttk::style theme use]}]} {
@@ -136,7 +191,7 @@ proc InitEntryFrame {} {
 
 proc gold_frame {w args} {
 	global use_ttk
-	if {$use_ttk} {
+	if {$use_ttk && ![is_MacOSX]} {
 		eval [linsert $args 0 ttk::frame $w -style Gold.TFrame]
 	} else {
 		eval [linsert $args 0 frame $w -background gold]
@@ -145,7 +200,7 @@ proc gold_frame {w args} {
 
 proc tlabel {w args} {
 	global use_ttk
-	if {$use_ttk} {
+	if {$use_ttk && ![is_MacOSX]} {
 		set cmd [list ttk::label $w -style Color.TLabel]
 		foreach {k v} $args {
 			switch -glob -- $k {
diff --git a/git-gui/po/de.po b/git-gui/po/de.po
index baebff2fff..a8d5f61ca3 100644
--- a/git-gui/po/de.po
+++ b/git-gui/po/de.po
@@ -7,41 +7,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: git-gui\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-26 22:22+0100\n"
-"PO-Revision-Date: 2010-01-26 22:25+0100\n"
-"Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
+"POT-Creation-Date: 2020-02-08 22:54+0100\n"
+"PO-Revision-Date: 2020-02-09 22:40+0100\n"
+"Last-Translator: Christian Stimming <christian@cstimming.de>\n"
 "Language-Team: German\n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
-#: git-gui.sh:922
-msgid "git-gui: fatal error"
-msgstr "git-gui: Programmfehler"
-
-#: git-gui.sh:743
+#: git-gui.sh:847
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "Ungültige Zeichensatz-Angabe in %s:"
 
-#: git-gui.sh:779
+#: git-gui.sh:901
 msgid "Main Font"
 msgstr "Programmschriftart"
 
-#: git-gui.sh:780
+#: git-gui.sh:902
 msgid "Diff/Console Font"
 msgstr "Vergleich-Schriftart"
 
-#: git-gui.sh:794
+#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053
+#: git-gui.sh:3212
+msgid "git-gui: fatal error"
+msgstr "git-gui: Programmfehler"
+
+#: git-gui.sh:918
 msgid "Cannot find git in PATH."
 msgstr "Git kann im PATH nicht gefunden werden."
 
-#: git-gui.sh:821
+#: git-gui.sh:945
 msgid "Cannot parse Git version string:"
 msgstr "Git Versionsangabe kann nicht erkannt werden:"
 
-#: git-gui.sh:839
+#: git-gui.sh:970
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -60,479 +61,524 @@ msgstr ""
 "\n"
 "Soll angenommen werden, »%s« sei Version 1.5.0?\n"
 
-#: git-gui.sh:1128
+#: git-gui.sh:1267
 msgid "Git directory not found:"
 msgstr "Git-Verzeichnis nicht gefunden:"
 
-#: git-gui.sh:1146
+#: git-gui.sh:1301
 msgid "Cannot move to top of working directory:"
 msgstr ""
 "Es konnte nicht in das oberste Verzeichnis der Arbeitskopie gewechselt "
 "werden:"
 
-#: git-gui.sh:1154
+#: git-gui.sh:1309
 msgid "Cannot use bare repository:"
-msgstr "Bloßes Projektarchiv kann nicht benutzt werden:"
+msgstr "Bloßes Repository kann nicht benutzt werden:"
 
-#: git-gui.sh:1162
+#: git-gui.sh:1317
 msgid "No working directory"
 msgstr "Kein Arbeitsverzeichnis"
 
-#: git-gui.sh:1334 lib/checkout_op.tcl:306
+#: git-gui.sh:1491 lib/checkout_op.tcl:306
 msgid "Refreshing file status..."
 msgstr "Dateistatus aktualisieren..."
 
-#: git-gui.sh:1390
+#: git-gui.sh:1551
 msgid "Scanning for modified files ..."
 msgstr "Nach geänderten Dateien suchen..."
 
-#: git-gui.sh:1454
+#: git-gui.sh:1629
 msgid "Calling prepare-commit-msg hook..."
-msgstr "Aufrufen der Eintragen-Vorbereiten-Kontrolle (»prepare-commit hook«)..."
+msgstr "Aufrufen des »prepare-commit-msg hook«..."
 
-#: git-gui.sh:1471
+#: git-gui.sh:1646
 msgid "Commit declined by prepare-commit-msg hook."
-msgstr ""
-"Eintragen abgelehnt durch Eintragen-Vorbereiten-Kontrolle (»prepare-commit "
-"hook«)."
+msgstr "Commit abgelehnt durch »prepare-commit-msg hook«."
 
-#: git-gui.sh:1629 lib/browser.tcl:246
+#: git-gui.sh:1804 lib/browser.tcl:252
 msgid "Ready."
 msgstr "Bereit."
 
-#: git-gui.sh:1787
+#: git-gui.sh:1968
 #, tcl-format
-msgid "Displaying only %s of %s files."
-msgstr "Nur %s von %s Dateien werden angezeigt."
+msgid ""
+"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files."
+msgstr ""
+"Anzeigelimit erreicht (gui.maxfilesdisplayed = %s) für Anzahl Einträge. Es "
+"werden nicht alle %s Dateien gezeigt."
 
-#: git-gui.sh:1913
+#: git-gui.sh:2091
 msgid "Unmodified"
 msgstr "Unverändert"
 
-#: git-gui.sh:1915
+#: git-gui.sh:2093
 msgid "Modified, not staged"
 msgstr "Verändert, nicht bereitgestellt"
 
-#: git-gui.sh:1916 git-gui.sh:1924
+#: git-gui.sh:2094 git-gui.sh:2106
 msgid "Staged for commit"
-msgstr "Bereitgestellt zum Eintragen"
+msgstr "Bereitgestellt zum Committen"
 
-#: git-gui.sh:1917 git-gui.sh:1925
+#: git-gui.sh:2095 git-gui.sh:2107
 msgid "Portions staged for commit"
-msgstr "Teilweise bereitgestellt zum Eintragen"
+msgstr "Teilweise bereitgestellt zum Committen"
 
-#: git-gui.sh:1918 git-gui.sh:1926
+#: git-gui.sh:2096 git-gui.sh:2108
 msgid "Staged for commit, missing"
-msgstr "Bereitgestellt zum Eintragen, fehlend"
+msgstr "Bereitgestellt zum Committen, fehlend"
 
-#: git-gui.sh:1920
+#: git-gui.sh:2098
 msgid "File type changed, not staged"
 msgstr "Dateityp geändert, nicht bereitgestellt"
 
-#: git-gui.sh:1921
+#: git-gui.sh:2099 git-gui.sh:2100
+msgid "File type changed, old type staged for commit"
+msgstr "Dateityp geändert, alter Dateityp bereitgestellt"
+
+#: git-gui.sh:2101
 msgid "File type changed, staged"
 msgstr "Dateityp geändert, bereitgestellt"
 
-#: git-gui.sh:1923
+#: git-gui.sh:2102
+msgid "File type change staged, modification not staged"
+msgstr "Dateityp-Änderung bereitgestellt, Inhaltsänderung nicht bereitgestellt"
+
+#: git-gui.sh:2103
+msgid "File type change staged, file missing"
+msgstr "Dateityp-Änderung bereitgestellt, Datei gelöscht"
+
+#: git-gui.sh:2105
 msgid "Untracked, not staged"
-msgstr "Nicht unter Versionskontrolle, nicht bereitgestellt"
+msgstr "Unversioniert, nicht bereitgestellt"
 
-#: git-gui.sh:1928
+#: git-gui.sh:2110
 msgid "Missing"
 msgstr "Fehlend"
 
-#: git-gui.sh:1929
+#: git-gui.sh:2111
 msgid "Staged for removal"
 msgstr "Bereitgestellt zum Löschen"
 
-#: git-gui.sh:1930
+#: git-gui.sh:2112
 msgid "Staged for removal, still present"
 msgstr "Bereitgestellt zum Löschen, trotzdem vorhanden"
 
-#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
-#: git-gui.sh:1936 git-gui.sh:1937
+#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117
+#: git-gui.sh:2118 git-gui.sh:2119
 msgid "Requires merge resolution"
 msgstr "Konfliktauflösung nötig"
 
-#: git-gui.sh:1972
-msgid "Starting gitk... please wait..."
-msgstr "Gitk wird gestartet... bitte warten."
-
-#: git-gui.sh:1984
+#: git-gui.sh:2164
 msgid "Couldn't find gitk in PATH"
 msgstr "Gitk kann im PATH nicht gefunden werden."
 
-#: git-gui.sh:2043
+#: git-gui.sh:2210 git-gui.sh:2245
+#, tcl-format
+msgid "Starting %s... please wait..."
+msgstr "%s wird gestartet... bitte warten."
+
+#: git-gui.sh:2224
 msgid "Couldn't find git gui in PATH"
 msgstr "»Git gui« kann im PATH nicht gefunden werden."
 
-#: git-gui.sh:2455 lib/choose_repository.tcl:36
+#: git-gui.sh:2726 lib/choose_repository.tcl:53
 msgid "Repository"
-msgstr "Projektarchiv"
+msgstr "Repository"
 
-#: git-gui.sh:2456
+#: git-gui.sh:2727
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: git-gui.sh:2458 lib/choose_rev.tcl:561
+#: git-gui.sh:2729 lib/choose_rev.tcl:567
 msgid "Branch"
-msgstr "Zweig"
+msgstr "Branch"
 
-#: git-gui.sh:2461 lib/choose_rev.tcl:548
+#: git-gui.sh:2732 lib/choose_rev.tcl:554
 msgid "Commit@@noun"
-msgstr "Version"
+msgstr "Commit"
 
-#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174
 msgid "Merge"
 msgstr "Zusammenführen"
 
-#: git-gui.sh:2465 lib/choose_rev.tcl:557
+#: git-gui.sh:2736 lib/choose_rev.tcl:563
 msgid "Remote"
-msgstr "Externe Archive"
+msgstr "Extern"
 
-#: git-gui.sh:2468
+#: git-gui.sh:2739
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: git-gui.sh:2477
+#: git-gui.sh:2748
 msgid "Explore Working Copy"
-msgstr "Arbeitskopie im Dateimanager"
+msgstr "Arbeitskopie im Dateimanager öffnen"
+
+#: git-gui.sh:2763
+msgid "Git Bash"
+msgstr "Git Bash"
 
-#: git-gui.sh:2483
+#: git-gui.sh:2772
 msgid "Browse Current Branch's Files"
-msgstr "Aktuellen Zweig durchblättern"
+msgstr "Aktuellen Branch durchblättern"
 
-#: git-gui.sh:2487
+#: git-gui.sh:2776
 msgid "Browse Branch Files..."
-msgstr "Einen Zweig durchblättern..."
+msgstr "Branch durchblättern..."
 
-#: git-gui.sh:2492
+#: git-gui.sh:2781
 msgid "Visualize Current Branch's History"
-msgstr "Aktuellen Zweig darstellen"
+msgstr "Aktuellen Branch darstellen"
 
-#: git-gui.sh:2496
+#: git-gui.sh:2785
 msgid "Visualize All Branch History"
-msgstr "Alle Zweige darstellen"
+msgstr "Historie aller Branches darstellen"
 
-#: git-gui.sh:2503
+#: git-gui.sh:2792
 #, tcl-format
 msgid "Browse %s's Files"
-msgstr "Zweig »%s« durchblättern"
+msgstr "Branch »%s« durchblättern"
 
-#: git-gui.sh:2505
+#: git-gui.sh:2794
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "Historie von »%s« darstellen"
 
-#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2799 lib/database.tcl:40
 msgid "Database Statistics"
 msgstr "Datenbankstatistik"
 
-#: git-gui.sh:2513 lib/database.tcl:34
+#: git-gui.sh:2802 lib/database.tcl:33
 msgid "Compress Database"
 msgstr "Datenbank komprimieren"
 
-#: git-gui.sh:2516
+#: git-gui.sh:2805
 msgid "Verify Database"
 msgstr "Datenbank überprüfen"
 
-#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
-#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
+#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820
 msgid "Create Desktop Icon"
 msgstr "Desktop-Icon erstellen"
 
-#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217
 msgid "Quit"
 msgstr "Beenden"
 
-#: git-gui.sh:2547
+#: git-gui.sh:2836
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: git-gui.sh:2550
+#: git-gui.sh:2839
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: git-gui.sh:2554 git-gui.sh:3109
+#: git-gui.sh:2843 git-gui.sh:3461
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
+#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr "Kopieren"
 
-#: git-gui.sh:2560 git-gui.sh:3115
+#: git-gui.sh:2849 git-gui.sh:3467
 msgid "Paste"
 msgstr "Einfügen"
 
-#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
-#: lib/remote_branch_delete.tcl:38
+#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39
+#: lib/branch_delete.tcl:28
 msgid "Delete"
 msgstr "Löschen"
 
-#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
+#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71
 msgid "Select All"
 msgstr "Alle auswählen"
 
-#: git-gui.sh:2576
+#: git-gui.sh:2865
 msgid "Create..."
 msgstr "Erstellen..."
 
-#: git-gui.sh:2582
+#: git-gui.sh:2871
 msgid "Checkout..."
-msgstr "Umstellen..."
+msgstr "Auschecken..."
 
-#: git-gui.sh:2588
+#: git-gui.sh:2877
 msgid "Rename..."
 msgstr "Umbenennen..."
 
-#: git-gui.sh:2593
+#: git-gui.sh:2882
 msgid "Delete..."
 msgstr "Löschen..."
 
-#: git-gui.sh:2598
+#: git-gui.sh:2887
 msgid "Reset..."
-msgstr "Zurücksetzen..."
+msgstr "Änderungen verwerfen..."
 
-#: git-gui.sh:2608
+#: git-gui.sh:2897
 msgid "Done"
 msgstr "Fertig"
 
-#: git-gui.sh:2610
+#: git-gui.sh:2899
 msgid "Commit@@verb"
-msgstr "Eintragen"
+msgstr "Committen"
 
-#: git-gui.sh:2619 git-gui.sh:3050
-msgid "New Commit"
-msgstr "Neue Version"
-
-#: git-gui.sh:2627 git-gui.sh:3057
+#: git-gui.sh:2908 git-gui.sh:3400
 msgid "Amend Last Commit"
-msgstr "Letzte nachbessern"
+msgstr "Letzten Commit nachbessern"
 
-#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101
 msgid "Rescan"
 msgstr "Neu laden"
 
-#: git-gui.sh:2643
+#: git-gui.sh:2924
 msgid "Stage To Commit"
-msgstr "Zum Eintragen bereitstellen"
+msgstr "Für Commit bereitstellen"
 
-#: git-gui.sh:2649
+#: git-gui.sh:2930
 msgid "Stage Changed Files To Commit"
-msgstr "Geänderte Dateien bereitstellen"
+msgstr "Geänderte Dateien für Commit bereitstellen"
 
-#: git-gui.sh:2655
+#: git-gui.sh:2936
 msgid "Unstage From Commit"
-msgstr "Aus der Bereitstellung herausnehmen"
+msgstr "Aus Commit-Bereitstellung herausnehmen"
 
-#: git-gui.sh:2661 lib/index.tcl:412
+#: git-gui.sh:2942 lib/index.tcl:521
 msgid "Revert Changes"
 msgstr "Änderungen verwerfen"
 
-#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
+#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731
 msgid "Show Less Context"
 msgstr "Weniger Zeilen anzeigen"
 
-#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
+#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735
 msgid "Show More Context"
 msgstr "Mehr Zeilen anzeigen"
 
-#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
+#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485
 msgid "Sign Off"
 msgstr "Abzeichnen"
 
-#: git-gui.sh:2696
+#: git-gui.sh:2977
 msgid "Local Merge..."
 msgstr "Lokales Zusammenführen..."
 
-#: git-gui.sh:2701
+#: git-gui.sh:2982
 msgid "Abort Merge..."
 msgstr "Zusammenführen abbrechen..."
 
-#: git-gui.sh:2713 git-gui.sh:2741
+#: git-gui.sh:2994 git-gui.sh:3022
 msgid "Add..."
-msgstr "Hinzufügen..."
+msgstr "Neues hinzufügen..."
 
-#: git-gui.sh:2717
+#: git-gui.sh:2998
 msgid "Push..."
 msgstr "Versenden..."
 
-#: git-gui.sh:2721
+#: git-gui.sh:3002
 msgid "Delete Branch..."
-msgstr "Zweig löschen..."
+msgstr "Branch löschen..."
 
-#: git-gui.sh:2731 git-gui.sh:3292
+#: git-gui.sh:3012 git-gui.sh:3666
 msgid "Options..."
 msgstr "Optionen..."
 
-#: git-gui.sh:2742
+#: git-gui.sh:3023
 msgid "Remove..."
 msgstr "Entfernen..."
 
-#: git-gui.sh:2751 lib/choose_repository.tcl:50
+#: git-gui.sh:3032 lib/choose_repository.tcl:67
 msgid "Help"
 msgstr "Hilfe"
 
-#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61
+#: lib/choose_repository.tcl:70 lib/about.tcl:14
 #, tcl-format
 msgid "About %s"
 msgstr "Ãœber %s"
 
-#: git-gui.sh:2783
+#: git-gui.sh:3064
 msgid "Online Documentation"
 msgstr "Online-Dokumentation"
 
-#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73
 msgid "Show SSH Key"
 msgstr "SSH-Schlüssel anzeigen"
 
-#: git-gui.sh:2893
+#: git-gui.sh:3097 git-gui.sh:3229
+msgid "usage:"
+msgstr "Verwendung:"
+
+#: git-gui.sh:3101 git-gui.sh:3233
+msgid "Usage"
+msgstr "Verwendung"
+
+#: git-gui.sh:3182 lib/blame.tcl:575
+msgid "Error"
+msgstr "Fehler"
+
+#: git-gui.sh:3213
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 "Fehler: Verzeichnis »%s« kann nicht gelesen werden: Datei oder Verzeichnis "
 "nicht gefunden"
 
-#: git-gui.sh:2926
+#: git-gui.sh:3246
 msgid "Current Branch:"
-msgstr "Aktueller Zweig:"
+msgstr "Aktueller Branch:"
 
-#: git-gui.sh:2947
-msgid "Staged Changes (Will Commit)"
-msgstr "Bereitstellung (zum Eintragen)"
-
-#: git-gui.sh:2967
+#: git-gui.sh:3271
 msgid "Unstaged Changes"
 msgstr "Nicht bereitgestellte Änderungen"
 
-#: git-gui.sh:3017
+#: git-gui.sh:3293
+msgid "Staged Changes (Will Commit)"
+msgstr "Bereitstellung (zum Committen)"
+
+#: git-gui.sh:3367
 msgid "Stage Changed"
 msgstr "Alles bereitstellen"
 
-#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
+#: git-gui.sh:3386 lib/transport.tcl:137
 msgid "Push"
 msgstr "Versenden"
 
-#: git-gui.sh:3071
+#: git-gui.sh:3413
 msgid "Initial Commit Message:"
-msgstr "Erste Versionsbeschreibung:"
+msgstr "Erste Commit-Beschreibung:"
 
-#: git-gui.sh:3072
+#: git-gui.sh:3414
 msgid "Amended Commit Message:"
 msgstr "Nachgebesserte Beschreibung:"
 
-#: git-gui.sh:3073
+#: git-gui.sh:3415
 msgid "Amended Initial Commit Message:"
 msgstr "Nachgebesserte erste Beschreibung:"
 
-#: git-gui.sh:3074
+#: git-gui.sh:3416
 msgid "Amended Merge Commit Message:"
 msgstr "Nachgebesserte Zusammenführungs-Beschreibung:"
 
-#: git-gui.sh:3075
+#: git-gui.sh:3417
 msgid "Merge Commit Message:"
 msgstr "Zusammenführungs-Beschreibung:"
 
-#: git-gui.sh:3076
+#: git-gui.sh:3418
 msgid "Commit Message:"
-msgstr "Versionsbeschreibung:"
+msgstr "Commit-Beschreibung:"
 
-#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
+#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73
 msgid "Copy All"
 msgstr "Alle kopieren"
 
-#: git-gui.sh:3149 lib/blame.tcl:104
+#: git-gui.sh:3501 lib/blame.tcl:106
 msgid "File:"
 msgstr "Datei:"
 
-#: git-gui.sh:3255
+#: git-gui.sh:3549 lib/choose_repository.tcl:1100
+msgid "Open"
+msgstr "Öffnen"
+
+#: git-gui.sh:3629
 msgid "Refresh"
 msgstr "Aktualisieren"
 
-#: git-gui.sh:3276
+#: git-gui.sh:3650
 msgid "Decrease Font Size"
 msgstr "Schriftgröße verkleinern"
 
-#: git-gui.sh:3280
+#: git-gui.sh:3654
 msgid "Increase Font Size"
 msgstr "Schriftgröße vergrößern"
 
-#: git-gui.sh:3288 lib/blame.tcl:281
+#: git-gui.sh:3662 lib/blame.tcl:296
 msgid "Encoding"
 msgstr "Zeichenkodierung"
 
-#: git-gui.sh:3299
+#: git-gui.sh:3673
 msgid "Apply/Reverse Hunk"
-msgstr "Kontext anwenden/umkehren"
+msgstr "Patch-Block anwenden/zurücknehmen"
 
-#: git-gui.sh:3304
+#: git-gui.sh:3678
 msgid "Apply/Reverse Line"
-msgstr "Zeile anwenden/umkehren"
+msgstr "Zeile anwenden/zurücknehmen"
+
+#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805
+msgid "Revert Hunk"
+msgstr "Patch-Block zurücknehmen"
+
+#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812
+msgid "Revert Line"
+msgstr "Zeilenänderungen zurücknehmen"
+
+#: git-gui.sh:3694 git-gui.sh:3791
+msgid "Undo Last Revert"
+msgstr "Letztes Zurücknehmen rückgängig"
 
-#: git-gui.sh:3323
+#: git-gui.sh:3713
 msgid "Run Merge Tool"
 msgstr "Zusammenführungswerkzeug"
 
-#: git-gui.sh:3328
+#: git-gui.sh:3718
 msgid "Use Remote Version"
 msgstr "Externe Version benutzen"
 
-#: git-gui.sh:3332
+#: git-gui.sh:3722
 msgid "Use Local Version"
 msgstr "Lokale Version benutzen"
 
-#: git-gui.sh:3336
+#: git-gui.sh:3726
 msgid "Revert To Base"
-msgstr "Ursprüngliche Version benutzen"
+msgstr "Zurücksetzen auf ursprünglichen Commit"
 
-#: git-gui.sh:3354
+#: git-gui.sh:3744
 msgid "Visualize These Changes In The Submodule"
-msgstr "Diese Änderungen im Untermodul darstellen"
+msgstr "Diese Änderungen im Submodul darstellen"
 
-#: git-gui.sh:3358
+#: git-gui.sh:3748
 msgid "Visualize Current Branch History In The Submodule"
-msgstr "Aktuellen Zweig im Untermodul darstellen"
+msgstr "Aktuellen Branch im Submodul darstellen"
 
-#: git-gui.sh:3362
+#: git-gui.sh:3752
 msgid "Visualize All Branch History In The Submodule"
-msgstr "Alle Zweige im Untermodul darstellen"
+msgstr "Alle Branches im Submodul darstellen"
 
-#: git-gui.sh:3367
+#: git-gui.sh:3757
 msgid "Start git gui In The Submodule"
-msgstr "Git gui im Untermodul starten"
+msgstr "Git gui im Submodul starten"
 
-#: git-gui.sh:3389
+#: git-gui.sh:3793
 msgid "Unstage Hunk From Commit"
-msgstr "Kontext aus Bereitstellung herausnehmen"
+msgstr "Patch-Block aus Bereitstellung herausnehmen"
 
-#: git-gui.sh:3391
+#: git-gui.sh:3797
 msgid "Unstage Lines From Commit"
 msgstr "Zeilen aus der Bereitstellung herausnehmen"
 
-#: git-gui.sh:3393
+#: git-gui.sh:3798 git-gui.sh:3809
+msgid "Revert Lines"
+msgstr "Zeilenänderung zurücknehmen"
+
+#: git-gui.sh:3800
 msgid "Unstage Line From Commit"
 msgstr "Zeile aus der Bereitstellung herausnehmen"
 
-#: git-gui.sh:3396
+#: git-gui.sh:3804
 msgid "Stage Hunk For Commit"
-msgstr "Kontext zur Bereitstellung hinzufügen"
+msgstr "Patch-Block zur Bereitstellung hinzufügen"
 
-#: git-gui.sh:3398
+#: git-gui.sh:3808
 msgid "Stage Lines For Commit"
 msgstr "Zeilen zur Bereitstellung hinzufügen"
 
-#: git-gui.sh:3400
+#: git-gui.sh:3811
 msgid "Stage Line For Commit"
 msgstr "Zeile zur Bereitstellung hinzufügen"
 
-#: git-gui.sh:3424
+#: git-gui.sh:3861
 msgid "Initializing..."
 msgstr "Initialisieren..."
 
-#: git-gui.sh:3541
+#: git-gui.sh:4017
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
@@ -548,7 +594,7 @@ msgstr ""
 "von %s an Git weitergegeben werden:\n"
 "\n"
 
-#: git-gui.sh:3570
+#: git-gui.sh:4046
 msgid ""
 "\n"
 "This is due to a known issue with the\n"
@@ -558,7 +604,7 @@ msgstr ""
 "Dies ist ein bekanntes Problem der Tcl-Version, die\n"
 "in Cygwin mitgeliefert wird."
 
-#: git-gui.sh:3575
+#: git-gui.sh:4051
 #, tcl-format
 msgid ""
 "\n"
@@ -574,315 +620,151 @@ msgstr ""
 "gewünschten Werte für die Einstellung user.name und \n"
 "user.email in Ihre Datei ~/.gitconfig einfügen.\n"
 
-#: lib/about.tcl:26
-msgid "git-gui - a graphical user interface for Git."
-msgstr "git-gui - eine grafische Oberfläche für Git."
-
-#: lib/blame.tcl:72
-msgid "File Viewer"
-msgstr "Datei-Browser"
-
-#: lib/blame.tcl:78
-msgid "Commit:"
-msgstr "Version:"
-
-#: lib/blame.tcl:271
-msgid "Copy Commit"
-msgstr "Version kopieren"
-
-#: lib/blame.tcl:275
-msgid "Find Text..."
-msgstr "Text suchen..."
-
-#: lib/blame.tcl:284
-msgid "Do Full Copy Detection"
-msgstr "Volle Kopie-Erkennung"
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "Rechtschreibprüfungsprogramm nicht unterstützt"
 
-#: lib/blame.tcl:288
-msgid "Show History Context"
-msgstr "Historien-Kontext anzeigen"
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "Rechtschreibprüfung nicht verfügbar"
 
-#: lib/blame.tcl:291
-msgid "Blame Parent Commit"
-msgstr "Elternversion annotieren"
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung"
 
-#: lib/blame.tcl:450
+#: lib/spellcheck.tcl:70
 #, tcl-format
-msgid "Reading %s..."
-msgstr "%s lesen..."
-
-#: lib/blame.tcl:557
-msgid "Loading copy/move tracking annotations..."
-msgstr "Annotierungen für Kopieren/Verschieben werden geladen..."
-
-#: lib/blame.tcl:577
-msgid "lines annotated"
-msgstr "Zeilen annotiert"
-
-#: lib/blame.tcl:769
-msgid "Loading original location annotations..."
-msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
-
-#: lib/blame.tcl:772
-msgid "Annotation complete."
-msgstr "Annotierung vollständig."
-
-#: lib/blame.tcl:802
-msgid "Busy"
-msgstr "Verarbeitung läuft"
-
-#: lib/blame.tcl:803
-msgid "Annotation process is already running."
-msgstr "Annotierung läuft bereits."
-
-#: lib/blame.tcl:842
-msgid "Running thorough copy detection..."
-msgstr "Intensive Kopie-Erkennung läuft..."
-
-#: lib/blame.tcl:910
-msgid "Loading annotation..."
-msgstr "Annotierung laden..."
-
-#: lib/blame.tcl:963
-msgid "Author:"
-msgstr "Autor:"
-
-#: lib/blame.tcl:967
-msgid "Committer:"
-msgstr "Eintragender:"
-
-#: lib/blame.tcl:972
-msgid "Original File:"
-msgstr "Ursprüngliche Datei:"
-
-#: lib/blame.tcl:1020
-msgid "Cannot find HEAD commit:"
-msgstr "Zweigspitze (»HEAD«) kann nicht gefunden werden:"
-
-#: lib/blame.tcl:1075
-msgid "Cannot find parent commit:"
-msgstr "Elternversion kann nicht gefunden werden:"
-
-#: lib/blame.tcl:1090
-msgid "Unable to display parent"
-msgstr "Elternversion kann nicht angezeigt werden"
-
-#: lib/blame.tcl:1091 lib/diff.tcl:320
-msgid "Error loading diff:"
-msgstr "Fehler beim Laden des Vergleichs:"
-
-#: lib/blame.tcl:1231
-msgid "Originally By:"
-msgstr "Ursprünglich von:"
-
-#: lib/blame.tcl:1237
-msgid "In File:"
-msgstr "In Datei:"
-
-#: lib/blame.tcl:1242
-msgid "Copied Or Moved Here By:"
-msgstr "Kopiert oder verschoben durch:"
-
-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
-msgid "Checkout Branch"
-msgstr "Auf Zweig umstellen"
-
-#: lib/branch_checkout.tcl:23
-msgid "Checkout"
-msgstr "Umstellen"
-
-#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
-#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
-#: lib/transport.tcl:108
-msgid "Cancel"
-msgstr "Abbrechen"
-
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
-msgid "Revision"
-msgstr "Version"
-
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
-msgid "Options"
-msgstr "Optionen"
-
-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
-msgid "Fetch Tracking Branch"
-msgstr "Ãœbernahmezweig anfordern"
-
-#: lib/branch_checkout.tcl:44
-msgid "Detach From Local Branch"
-msgstr "Verbindung zu lokalem Zweig lösen"
-
-#: lib/branch_create.tcl:22
-msgid "Create Branch"
-msgstr "Zweig erstellen"
-
-#: lib/branch_create.tcl:27
-msgid "Create New Branch"
-msgstr "Neuen Zweig erstellen"
-
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
-msgid "Create"
-msgstr "Erstellen"
-
-#: lib/branch_create.tcl:40
-msgid "Branch Name"
-msgstr "Zweigname"
-
-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
-msgid "Name:"
-msgstr "Name:"
-
-#: lib/branch_create.tcl:58
-msgid "Match Tracking Branch Name"
-msgstr "Passend zu Ãœbernahmezweig-Name"
-
-#: lib/branch_create.tcl:66
-msgid "Starting Revision"
-msgstr "Anfangsversion"
-
-#: lib/branch_create.tcl:72
-msgid "Update Existing Branch:"
-msgstr "Existierenden Zweig aktualisieren:"
+msgid "Reverting dictionary to %s."
+msgstr "Wörterbuch auf %s zurückgesetzt."
 
-#: lib/branch_create.tcl:75
-msgid "No"
-msgstr "Nein"
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen"
 
-#: lib/branch_create.tcl:80
-msgid "Fast Forward Only"
-msgstr "Nur Schnellzusammenführung"
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "Unbekanntes Rechtschreibprüfungsprogramm"
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
-msgid "Reset"
-msgstr "Zurücksetzen"
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr "Keine Vorschläge"
 
-#: lib/branch_create.tcl:97
-msgid "Checkout After Creation"
-msgstr "Arbeitskopie umstellen nach Erstellen"
+#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm"
 
-#: lib/branch_create.tcl:131
-msgid "Please select a tracking branch."
-msgstr "Bitte wählen Sie einen Übernahmezweig."
+#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr "Rechtschreibprüfung fehlgeschlagen"
 
-#: lib/branch_create.tcl:140
+#: lib/transport.tcl:6 lib/remote_add.tcl:132
 #, tcl-format
-msgid "Tracking branch %s is not a branch in the remote repository."
-msgstr "Übernahmezweig »%s« ist kein Zweig im externen Projektarchiv."
+msgid "fetch %s"
+msgstr "»%s« anfordern"
 
-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
-msgid "Please supply a branch name."
-msgstr "Bitte geben Sie einen Zweignamen an."
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
+msgstr "Neue Änderungen von »%s« holen"
 
-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#: lib/transport.tcl:18
 #, tcl-format
-msgid "'%s' is not an acceptable branch name."
-msgstr "»%s« ist kein zulässiger Zweigname."
+msgid "remote prune %s"
+msgstr "Gelöschte externe Branches aus »%s« entfernen"
 
-#: lib/branch_delete.tcl:15
-msgid "Delete Branch"
-msgstr "Zweig löschen"
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
+msgstr "Gelöschte externe Trackingbranches aus »%s« werden entfernt"
 
-#: lib/branch_delete.tcl:20
-msgid "Delete Local Branch"
-msgstr "Lokalen Zweig löschen"
+#: lib/transport.tcl:25
+msgid "fetch all remotes"
+msgstr "Abrufen aller externen"
 
-#: lib/branch_delete.tcl:37
-msgid "Local Branches"
-msgstr "Lokale Zweige"
+#: lib/transport.tcl:26
+msgid "Fetching new changes from all remotes"
+msgstr "Neue Änderungen von allen externen anfordern"
 
-#: lib/branch_delete.tcl:52
-msgid "Delete Only If Merged Into"
-msgstr "Nur löschen, wenn zusammengeführt nach"
+#: lib/transport.tcl:40
+msgid "remote prune all remotes"
+msgstr "Extern veraltete Branches entfernen aller Repositories"
 
-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
-msgstr "Immer (Keine Zusammenführungsprüfung)"
+#: lib/transport.tcl:41
+msgid "Pruning tracking branches deleted from all remotes"
+msgstr ""
+"Gelöschte externe Trackingbranches aus allen Repositories werden entfernt"
 
-#: lib/branch_delete.tcl:103
+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
+#: lib/remote_add.tcl:162
 #, tcl-format
-msgid "The following branches are not completely merged into %s:"
-msgstr "Folgende Zweige sind noch nicht mit »%s« zusammengeführt:"
-
-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
-msgid ""
-"Recovering deleted branches is difficult.\n"
-"\n"
-"Delete the selected branches?"
-msgstr ""
-"Das Wiederherstellen von gelöschten Zweigen ist nur mit größerem Aufwand "
-"möglich.\n"
-"\n"
-"Sollen die ausgewählten Zweige gelöscht werden?"
+msgid "push %s"
+msgstr "»%s« versenden..."
 
-#: lib/branch_delete.tcl:141
+#: lib/transport.tcl:55
 #, tcl-format
-msgid ""
-"Failed to delete branches:\n"
-"%s"
-msgstr ""
-"Fehler beim Löschen der Zweige:\n"
-"%s"
+msgid "Pushing changes to %s"
+msgstr "Änderungen nach »%s« versenden"
 
-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
-msgid "Rename Branch"
-msgstr "Zweig umbenennen"
+#: lib/transport.tcl:93
+#, tcl-format
+msgid "Mirroring to %s"
+msgstr "Spiegeln nach %s"
 
-#: lib/branch_rename.tcl:26
-msgid "Rename"
-msgstr "Umbenennen"
+#: lib/transport.tcl:111
+#, tcl-format
+msgid "Pushing %s %s to %s"
+msgstr "%s %s nach %s versenden"
 
-#: lib/branch_rename.tcl:36
-msgid "Branch:"
-msgstr "Zweig:"
+#: lib/transport.tcl:132
+msgid "Push Branches"
+msgstr "Branches versenden"
 
-#: lib/branch_rename.tcl:39
-msgid "New Name:"
-msgstr "Neuer Name:"
+#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34
+#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32
+#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41
+#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43
+#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178
+msgid "Cancel"
+msgstr "Abbrechen"
 
-#: lib/branch_rename.tcl:75
-msgid "Please select a branch to rename."
-msgstr "Bitte wählen Sie einen Zweig zum umbenennen."
+#: lib/transport.tcl:147
+msgid "Source Branches"
+msgstr "Lokale Branches"
 
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
-#, tcl-format
-msgid "Branch '%s' already exists."
-msgstr "Zweig »%s« existiert bereits."
+#: lib/transport.tcl:162
+msgid "Destination Repository"
+msgstr "Ziel-Repository"
 
-#: lib/branch_rename.tcl:117
-#, tcl-format
-msgid "Failed to rename '%s'."
-msgstr "Fehler beim Umbenennen von »%s«."
+#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51
+msgid "Remote:"
+msgstr "Externes Repository:"
 
-#: lib/browser.tcl:17
-msgid "Starting..."
-msgstr "Starten..."
+#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72
+msgid "Arbitrary Location:"
+msgstr "Beliebige Adresse:"
 
-#: lib/browser.tcl:26
-msgid "File Browser"
-msgstr "Datei-Browser"
+#: lib/transport.tcl:205
+msgid "Transfer Options"
+msgstr "Netzwerk-Einstellungen"
 
-#: lib/browser.tcl:126 lib/browser.tcl:143
-#, tcl-format
-msgid "Loading %s..."
-msgstr "%s laden..."
+#: lib/transport.tcl:207
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr ""
+"Überschreiben von existierenden Branches erzwingen (könnte Änderungen "
+"löschen)"
 
-#: lib/browser.tcl:187
-msgid "[Up To Parent]"
-msgstr "[Nach oben]"
+#: lib/transport.tcl:211
+msgid "Use thin pack (for slow network connections)"
+msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
 
-#: lib/browser.tcl:267 lib/browser.tcl:273
-msgid "Browse Branch Files"
-msgstr "Dateien des Zweigs durchblättern"
+#: lib/transport.tcl:215
+msgid "Include tags"
+msgstr "Mit Tags versenden"
 
-#: lib/browser.tcl:278 lib/choose_repository.tcl:398
-#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
-#: lib/choose_repository.tcl:1028
-msgid "Browse"
-msgstr "Blättern"
+#: lib/transport.tcl:229
+#, tcl-format
+msgid "%s (%s): Push"
+msgstr "%s (%s): Versenden"
 
 #: lib/checkout_op.tcl:85
 #, tcl-format
@@ -892,23 +774,28 @@ msgstr "Änderungen »%s« von »%s« anfordern"
 #: lib/checkout_op.tcl:133
 #, tcl-format
 msgid "fatal: Cannot resolve %s"
-msgstr "Fehler: »%s« kann nicht als Zweig oder Version erkannt werden"
+msgstr "Fehler: »%s« kann nicht als Branch oder Version erkannt werden"
 
-#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
-#: lib/sshkey.tcl:53
+#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81
+#: lib/database.tcl:30
 msgid "Close"
 msgstr "Schließen"
 
 #: lib/checkout_op.tcl:175
 #, tcl-format
 msgid "Branch '%s' does not exist."
-msgstr "Zweig »%s« existiert nicht."
+msgstr "Branch »%s« existiert nicht."
 
 #: lib/checkout_op.tcl:194
 #, tcl-format
 msgid "Failed to configure simplified git-pull for '%s'."
 msgstr "Fehler beim Einrichten der vereinfachten git-pull für »%s«."
 
+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
+#, tcl-format
+msgid "Branch '%s' already exists."
+msgstr "Branch »%s« existiert bereits."
+
 #: lib/checkout_op.tcl:229
 #, tcl-format
 msgid ""
@@ -917,10 +804,10 @@ msgid ""
 "It cannot fast-forward to %s.\n"
 "A merge is required."
 msgstr ""
-"Zweig »%s« existiert bereits.\n"
+"Branch »%s« existiert bereits.\n"
 "\n"
-"Zweig kann nicht mit »%s« schnellzusammengeführt werden. Reguläres "
-"Zusammenführen ist notwendig."
+"Branch kann nicht auf »%s« vorgespult werden. Reguläres Zusammenführen ist "
+"notwendig."
 
 #: lib/checkout_op.tcl:243
 #, tcl-format
@@ -945,76 +832,79 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
+"Der letzte geladene Status stimmt nicht mehr mit dem Repository überein.\n"
 "\n"
-"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
-"geändert.  Vor dem Wechseln des lokalen Zweigs muss neu geladen werden.\n"
+"Ein anderes Git-Programm hat das Repository seit dem letzten Laden "
+"geändert.  Vor dem Wechseln des lokalen Branches muss neu geladen werden.\n"
 "\n"
 "Es wird gleich neu geladen.\n"
 
 #: lib/checkout_op.tcl:345
 #, tcl-format
 msgid "Updating working directory to '%s'..."
-msgstr "Arbeitskopie umstellen auf »%s«..."
+msgstr "Arbeitskopie aktualisieren auf »%s«..."
 
 #: lib/checkout_op.tcl:346
 msgid "files checked out"
 msgstr "Dateien aktualisiert"
 
-#: lib/checkout_op.tcl:376
+#: lib/checkout_op.tcl:377
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr ""
-"Auf Zweig »%s« umstellen abgebrochen (Zusammenführen der Dateien ist "
+"Branch »%s« Auschecken abgebrochen (Zusammenführen der Dateien ist "
 "notwendig)."
 
-#: lib/checkout_op.tcl:377
+#: lib/checkout_op.tcl:378
 msgid "File level merge required."
 msgstr "Zusammenführen der Dateien ist notwendig."
 
-#: lib/checkout_op.tcl:381
+#: lib/checkout_op.tcl:382
 #, tcl-format
 msgid "Staying on branch '%s'."
-msgstr "Es wird auf Zweig »%s« verblieben."
+msgstr "Es wird auf Branch »%s« verblieben."
 
-#: lib/checkout_op.tcl:452
+#: lib/checkout_op.tcl:453
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
 "If you wanted to be on a branch, create one now starting from 'This Detached "
 "Checkout'."
 msgstr ""
-"Die Arbeitskopie ist nicht auf einem lokalen Zweig.\n"
+"Die Arbeitskopie ist nicht auf einem lokalen Branch.\n"
 "\n"
-"Wenn Sie auf einem Zweig arbeiten möchten, erstellen Sie bitte jetzt einen "
-"Zweig mit der Auswahl »Abgetrennte Arbeitskopie-Version«."
+"Wenn Sie auf einem Branch arbeiten möchten, erstellen Sie bitte jetzt einen "
+"Branch mit der Auswahl »Losgelöste Arbeitskopie-Version«."
 
-#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
+#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "Umgestellt auf »%s«."
 
-#: lib/checkout_op.tcl:535
+#: lib/checkout_op.tcl:536
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
-msgstr "Zurücksetzen von »%s« nach »%s« wird folgende Versionen verwerfen:"
+msgstr "Umsetzen von »%s« nach »%s« wird folgende Commits verlieren:"
 
-#: lib/checkout_op.tcl:557
+#: lib/checkout_op.tcl:558
 msgid "Recovering lost commits may not be easy."
 msgstr ""
-"Verworfene Versionen können nur mit größerem Aufwand wiederhergestellt "
-"werden."
+"Verlorene Commits können nur mit größerem Aufwand wiederhergestellt werden."
 
-#: lib/checkout_op.tcl:562
+#: lib/checkout_op.tcl:563
 #, tcl-format
 msgid "Reset '%s'?"
-msgstr "»%s« zurücksetzen?"
+msgstr "»%s« umsetzen?"
 
-#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170
 msgid "Visualize"
 msgstr "Darstellen"
 
-#: lib/checkout_op.tcl:635
+#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85
+msgid "Reset"
+msgstr "Umsetzen (Reset)"
+
+#: lib/checkout_op.tcl:636
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
@@ -1024,7 +914,7 @@ msgid ""
 "\n"
 "This should not have occurred.  %s will now close and give up."
 msgstr ""
-"Lokaler Zweig kann nicht gesetzt werden.\n"
+"Lokaler Branch kann nicht gesetzt werden.\n"
 "\n"
 "Diese Arbeitskopie ist nur teilweise umgestellt. Die Dateien sind korrekt "
 "aktualisiert, aber einige interne Git-Dateien konnten nicht geändert "
@@ -1032,23 +922,345 @@ msgstr ""
 "\n"
 "Dies ist ein interner Programmfehler von %s. Programm wird jetzt abgebrochen."
 
-#: lib/choose_font.tcl:39
+#: lib/remote_add.tcl:20
+#, tcl-format
+msgid "%s (%s): Add Remote"
+msgstr "%s (%s): Externes Repository hinzufügen"
+
+#: lib/remote_add.tcl:25
+msgid "Add New Remote"
+msgstr "Neues externes Repository hinzufügen"
+
+#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37
+msgid "Add"
+msgstr "Hinzufügen"
+
+#: lib/remote_add.tcl:39
+msgid "Remote Details"
+msgstr "Einzelheiten des externen Repository"
+
+#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44
+msgid "Name:"
+msgstr "Name:"
+
+#: lib/remote_add.tcl:50
+msgid "Location:"
+msgstr "Adresse:"
+
+#: lib/remote_add.tcl:60
+msgid "Further Action"
+msgstr "Weitere Aktion"
+
+#: lib/remote_add.tcl:63
+msgid "Fetch Immediately"
+msgstr "Jetzt anfordern"
+
+#: lib/remote_add.tcl:69
+msgid "Initialize Remote Repository and Push"
+msgstr "Externes Repository initialisieren und dahin versenden"
+
+#: lib/remote_add.tcl:75
+msgid "Do Nothing Else Now"
+msgstr "Keine weitere Aktion"
+
+#: lib/remote_add.tcl:100
+msgid "Please supply a remote name."
+msgstr "Bitte geben Sie einen Namen des externen Repository an."
+
+#: lib/remote_add.tcl:113
+#, tcl-format
+msgid "'%s' is not an acceptable remote name."
+msgstr "»%s« ist kein zulässiger Name eines externen Repository."
+
+#: lib/remote_add.tcl:124
+#, tcl-format
+msgid "Failed to add remote '%s' of location '%s'."
+msgstr "Fehler beim Hinzufügen des externen Repository »%s« aus Adresse »%s«."
+
+#: lib/remote_add.tcl:133
+#, tcl-format
+msgid "Fetching the %s"
+msgstr "»%s« anfordern"
+
+#: lib/remote_add.tcl:156
+#, tcl-format
+msgid "Do not know how to initialize repository at location '%s'."
+msgstr ""
+"Initialisieren eines externen Repositories an Adresse »%s« ist nicht möglich."
+
+#: lib/remote_add.tcl:163
+#, tcl-format
+msgid "Setting up the %s (at %s)"
+msgstr "Einrichten von »%s« an »%s«"
+
+#: lib/browser.tcl:17
+msgid "Starting..."
+msgstr "Starten..."
+
+#: lib/browser.tcl:27
+#, tcl-format
+msgid "%s (%s): File Browser"
+msgstr "%s (%s): Datei-Browser"
+
+#: lib/browser.tcl:132 lib/browser.tcl:149
+#, tcl-format
+msgid "Loading %s..."
+msgstr "%s laden..."
+
+#: lib/browser.tcl:193
+msgid "[Up To Parent]"
+msgstr "[Nach oben]"
+
+#: lib/browser.tcl:275
+#, tcl-format
+msgid "%s (%s): Browse Branch Files"
+msgstr "%s (%s): Dateien des Branches durchblättern"
+
+#: lib/browser.tcl:282
+msgid "Browse Branch Files"
+msgstr "Dateien des Branches durchblättern"
+
+#: lib/browser.tcl:288 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533
+#: lib/choose_repository.tcl:1115
+msgid "Browse"
+msgstr "Blättern"
+
+#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321
+msgid "Revision"
+msgstr "Version"
+
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
+msgstr "Bereitstellung kann nicht wieder freigegeben werden."
+
+#: lib/index.tcl:30
+msgid "Index Error"
+msgstr "Fehler in Bereitstellung"
+
+#: lib/index.tcl:32
+msgid ""
+"Updating the Git index failed.  A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr ""
+"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine "
+"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu "
+"synchronisieren."
+
+#: lib/index.tcl:43
+msgid "Continue"
+msgstr "Fortsetzen"
+
+#: lib/index.tcl:46
+msgid "Unlock Index"
+msgstr "Bereitstellung freigeben"
+
+#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587
+#: lib/choose_repository.tcl:999
+msgid "files"
+msgstr "Dateien"
+
+#: lib/index.tcl:326
+msgid "Unstaging selected files from commit"
+msgstr "Gewählte Dateien aus der Bereitstellung herausnehmen"
+
+#: lib/index.tcl:330
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
+
+#: lib/index.tcl:369
+msgid "Ready to commit."
+msgstr "Bereit zum Committen."
+
+#: lib/index.tcl:378
+msgid "Adding selected files"
+msgstr "Gewählte Dateien hinzufügen"
+
+#: lib/index.tcl:382
+#, tcl-format
+msgid "Adding %s"
+msgstr "»%s« hinzufügen"
+
+#: lib/index.tcl:412
+#, tcl-format
+msgid "Stage %d untracked files?"
+msgstr "%d unversionierte Dateien bereitstellen?"
+
+#: lib/index.tcl:420
+msgid "Adding all changed files"
+msgstr "Alle geänderten Dateien hinzufügen"
+
+#: lib/index.tcl:503
+#, tcl-format
+msgid "Revert changes in file %s?"
+msgstr "Änderungen in Datei »%s« verwerfen?"
+
+#: lib/index.tcl:508
+#, tcl-format
+msgid "Revert changes in these %i files?"
+msgstr "Änderungen in diesen %i Dateien verwerfen?"
+
+#: lib/index.tcl:517
+msgid "Any unstaged changes will be permanently lost by the revert."
+msgstr ""
+"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
+
+#: lib/index.tcl:520 lib/index.tcl:563
+msgid "Do Nothing"
+msgstr "Nichts tun"
+
+#: lib/index.tcl:545
+#, tcl-format
+msgid "Delete untracked file %s?"
+msgstr "Unversionierte Datei »%s« löschen?"
+
+#: lib/index.tcl:550
+#, tcl-format
+msgid "Delete these %i untracked files?"
+msgstr "Diese %i unversionierten Dateien löschen?"
+
+#: lib/index.tcl:560
+msgid "Files will be permanently deleted."
+msgstr "Dateien werden endgültig gelöscht."
+
+#: lib/index.tcl:564
+msgid "Delete Files"
+msgstr "Dateien löschen"
+
+#: lib/index.tcl:586
+msgid "Deleting"
+msgstr "Löschen"
+
+#: lib/index.tcl:665
+msgid "Encountered errors deleting files:\n"
+msgstr "Fehler beim Löschen der Dateien:\n"
+
+#: lib/index.tcl:674
+#, tcl-format
+msgid "None of the %d selected files could be deleted."
+msgstr "Keine der %d gewählten Dateien konnten gelöscht werden."
+
+#: lib/index.tcl:679
+#, tcl-format
+msgid "%d of the %d selected files could not be deleted."
+msgstr "%d der %d gewählten Dateien konnten nicht gelöscht werden."
+
+#: lib/index.tcl:726
+msgid "Reverting selected files"
+msgstr "Änderungen in gewählten Dateien verwerfen"
+
+#: lib/index.tcl:730
+#, tcl-format
+msgid "Reverting %s"
+msgstr "Änderungen in %s verwerfen"
+
+#: lib/branch_checkout.tcl:16
+#, tcl-format
+msgid "%s (%s): Checkout Branch"
+msgstr "%s (%s): Branch auschecken"
+
+#: lib/branch_checkout.tcl:21
+msgid "Checkout Branch"
+msgstr "Branch auschecken"
+
+#: lib/branch_checkout.tcl:26
+msgid "Checkout"
+msgstr "Auschecken"
+
+#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69
+msgid "Options"
+msgstr "Optionen"
+
+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
+msgstr "Trackingbranch anfordern"
+
+#: lib/branch_checkout.tcl:47
+msgid "Detach From Local Branch"
+msgstr "Verbindung zu lokalem Branch lösen"
+
+#: lib/status_bar.tcl:263
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
+msgstr "%s ... %*i von %*i %s (%3i%%)"
+
+#: lib/remote.tcl:200
+msgid "Push to"
+msgstr "Versenden nach"
+
+#: lib/remote.tcl:218
+msgid "Remove Remote"
+msgstr "Externes Repository entfernen"
+
+#: lib/remote.tcl:223
+msgid "Prune from"
+msgstr "Veraltete Branches entfernen"
+
+#: lib/remote.tcl:228
+msgid "Fetch from"
+msgstr "Anfordern"
+
+#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264
+msgid "All"
+msgstr "Alle"
+
+#: lib/branch_rename.tcl:15
+#, tcl-format
+msgid "%s (%s): Rename Branch"
+msgstr "%s (%s): Branch umbenennen"
+
+#: lib/branch_rename.tcl:23
+msgid "Rename Branch"
+msgstr "Branch umbenennen"
+
+#: lib/branch_rename.tcl:28
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: lib/branch_rename.tcl:38
+msgid "Branch:"
+msgstr "Branch:"
+
+#: lib/branch_rename.tcl:46
+msgid "New Name:"
+msgstr "Neuer Name:"
+
+#: lib/branch_rename.tcl:81
+msgid "Please select a branch to rename."
+msgstr "Bitte wählen Sie einen Branch zum umbenennen."
+
+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
+msgid "Please supply a branch name."
+msgstr "Bitte geben Sie einen Branchnamen an."
+
+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
+#, tcl-format
+msgid "'%s' is not an acceptable branch name."
+msgstr "»%s« ist kein zulässiger Branchname."
+
+#: lib/branch_rename.tcl:123
+#, tcl-format
+msgid "Failed to rename '%s'."
+msgstr "Fehler beim Umbenennen von »%s«."
+
+#: lib/choose_font.tcl:41
 msgid "Select"
 msgstr "Auswählen"
 
-#: lib/choose_font.tcl:53
+#: lib/choose_font.tcl:55
 msgid "Font Family"
 msgstr "Schriftfamilie"
 
-#: lib/choose_font.tcl:74
+#: lib/choose_font.tcl:76
 msgid "Font Size"
 msgstr "Schriftgröße"
 
-#: lib/choose_font.tcl:91
+#: lib/choose_font.tcl:93
 msgid "Font Example"
 msgstr "Schriftbeispiel"
 
-#: lib/choose_font.tcl:103
+#: lib/choose_font.tcl:105
 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."
@@ -1056,277 +1268,1137 @@ msgstr ""
 "Dies ist ein Beispieltext.\n"
 "Wenn Ihnen dieser Text gefällt, sollten Sie diese Schriftart wählen."
 
-#: lib/choose_repository.tcl:28
+#: lib/option.tcl:11
+#, tcl-format
+msgid "Invalid global encoding '%s'"
+msgstr "Ungültige globale Zeichenkodierung »%s«"
+
+#: lib/option.tcl:19
+#, tcl-format
+msgid "Invalid repo encoding '%s'"
+msgstr "Ungültige Repository-Zeichenkodierung »%s«"
+
+#: lib/option.tcl:119
+msgid "Restore Defaults"
+msgstr "Voreinstellungen wiederherstellen"
+
+#: lib/option.tcl:123
+msgid "Save"
+msgstr "Speichern"
+
+#: lib/option.tcl:133
+#, tcl-format
+msgid "%s Repository"
+msgstr "%s Repository"
+
+#: lib/option.tcl:134
+msgid "Global (All Repositories)"
+msgstr "Global (Alle Repositories)"
+
+#: lib/option.tcl:140
+msgid "User Name"
+msgstr "Benutzername"
+
+#: lib/option.tcl:141
+msgid "Email Address"
+msgstr "E-Mail-Adresse"
+
+#: lib/option.tcl:143
+msgid "Summarize Merge Commits"
+msgstr "Zusammenführungs-Commits zusammenfassen"
+
+#: lib/option.tcl:144
+msgid "Merge Verbosity"
+msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
+
+#: lib/option.tcl:145
+msgid "Show Diffstat After Merge"
+msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
+
+#: lib/option.tcl:146
+msgid "Use Merge Tool"
+msgstr "Zusammenführungswerkzeug"
+
+#: lib/option.tcl:148
+msgid "Trust File Modification Timestamps"
+msgstr "Auf Dateiänderungsdatum verlassen"
+
+#: lib/option.tcl:149
+msgid "Prune Tracking Branches During Fetch"
+msgstr "Veraltete Trackingbranches entfernen während Anforderung"
+
+#: lib/option.tcl:150
+msgid "Match Tracking Branches"
+msgstr "Neue Branches automatisch als Trackingbranch"
+
+#: lib/option.tcl:151
+msgid "Use Textconv For Diffs and Blames"
+msgstr "Benutze »textconv« für Vergleich und Annotieren"
+
+#: lib/option.tcl:152
+msgid "Blame Copy Only On Changed Files"
+msgstr "Kopie-Annotieren nur bei geänderten Dateien"
+
+#: lib/option.tcl:153
+msgid "Maximum Length of Recent Repositories List"
+msgstr "Anzahl Einträge in »Letzte Repositories«"
+
+#: lib/option.tcl:154
+msgid "Minimum Letters To Blame Copy On"
+msgstr "Mindestzahl Zeichen für Kopie-Annotieren"
+
+#: lib/option.tcl:155
+msgid "Blame History Context Radius (days)"
+msgstr "Anzahl Tage für Annotieren-Historien-Kontext"
+
+#: lib/option.tcl:156
+msgid "Number of Diff Context Lines"
+msgstr "Anzahl der Kontextzeilen beim Vergleich"
+
+#: lib/option.tcl:157
+msgid "Additional Diff Parameters"
+msgstr "Zusätzliche Vergleich-/diff-Parameter"
+
+#: lib/option.tcl:158
+msgid "Commit Message Text Width"
+msgstr "Textbreite der Commit-Beschreibung"
+
+#: lib/option.tcl:159
+msgid "New Branch Name Template"
+msgstr "Namensvorlage für neue Branches"
+
+#: lib/option.tcl:160
+msgid "Default File Contents Encoding"
+msgstr "Voreingestellte Zeichenkodierung"
+
+#: lib/option.tcl:161
+msgid "Warn before committing to a detached head"
+msgstr "Warnen vor Committen auf losgelöste Branchspitze"
+
+#: lib/option.tcl:162
+msgid "Staging of untracked files"
+msgstr "Unversionierte Dateien bereitstellen"
+
+#: lib/option.tcl:163
+msgid "Show untracked files"
+msgstr "Unversionierte Dateien anzeigen"
+
+#: lib/option.tcl:164
+msgid "Tab spacing"
+msgstr "Tabulator-Breite"
+
+#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282
+#: lib/database.tcl:57
+#, tcl-format
+msgid "%s:"
+msgstr "%s:"
+
+#: lib/option.tcl:210
+msgid "Change"
+msgstr "Ändern"
+
+#: lib/option.tcl:254
+msgid "Spelling Dictionary:"
+msgstr "Wörterbuch Rechtschreibprüfung:"
+
+#: lib/option.tcl:284
+msgid "Change Font"
+msgstr "Schriftart ändern"
+
+#: lib/option.tcl:288
+#, tcl-format
+msgid "Choose %s"
+msgstr "%s wählen"
+
+#: lib/option.tcl:294
+msgid "pt."
+msgstr "pt."
+
+#: lib/option.tcl:308
+msgid "Preferences"
+msgstr "Einstellungen"
+
+#: lib/option.tcl:345
+msgid "Failed to completely save options:"
+msgstr "Optionen konnten nicht gespeichert werden:"
+
+#: lib/encoding.tcl:443
+msgid "Default"
+msgstr "Voreinstellung"
+
+#: lib/encoding.tcl:448
+#, tcl-format
+msgid "System (%s)"
+msgstr "Systemweit (%s)"
+
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
+msgid "Other"
+msgstr "Andere"
+
+#: lib/tools.tcl:76
+#, tcl-format
+msgid "Running %s requires a selected file."
+msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein."
+
+#: lib/tools.tcl:92
+#, tcl-format
+msgid "Are you sure you want to run %1$s on file \"%2$s\"?"
+msgstr "Wollen Sie %1$s wirklich auf Datei »%2$s« starten?"
+
+#: lib/tools.tcl:96
+#, tcl-format
+msgid "Are you sure you want to run %s?"
+msgstr "Wollen Sie %s wirklich starten?"
+
+#: lib/tools.tcl:118
+#, tcl-format
+msgid "Tool: %s"
+msgstr "Werkzeug: %s"
+
+#: lib/tools.tcl:119
+#, tcl-format
+msgid "Running: %s"
+msgstr "Starten: %s"
+
+#: lib/tools.tcl:158
+#, tcl-format
+msgid "Tool completed successfully: %s"
+msgstr "Werkzeug erfolgreich abgeschlossen: %s"
+
+#: lib/tools.tcl:160
+#, tcl-format
+msgid "Tool failed: %s"
+msgstr "Werkzeug fehlgeschlagen: %s"
+
+#: lib/mergetool.tcl:8
+msgid "Force resolution to the base version?"
+msgstr "Konflikt durch Basisversion ersetzen?"
+
+#: lib/mergetool.tcl:9
+msgid "Force resolution to this branch?"
+msgstr "Konflikt durch diesen Branch ersetzen?"
+
+#: lib/mergetool.tcl:10
+msgid "Force resolution to the other branch?"
+msgstr "Konflikt durch anderen Branch ersetzen?"
+
+#: lib/mergetool.tcl:14
+#, tcl-format
+msgid ""
+"Note that the diff shows only conflicting changes.\n"
+"\n"
+"%s will be overwritten.\n"
+"\n"
+"This operation can be undone only by restarting the merge."
+msgstr ""
+"Hinweis: Der Vergleich zeigt nur konfliktverursachende Änderungen an.\n"
+"\n"
+"»%s« wird überschrieben.\n"
+"\n"
+"Diese Operation kann nur rückgängig gemacht werden, wenn die\n"
+"Zusammenführung erneut gestartet wird."
+
+#: lib/mergetool.tcl:45
+#, tcl-format
+msgid "File %s seems to have unresolved conflicts, still stage?"
+msgstr "Datei »%s« hat nicht aufgelöste Konflikte. Trotzdem bereitstellen?"
+
+#: lib/mergetool.tcl:60
+#, tcl-format
+msgid "Adding resolution for %s"
+msgstr "Auflösung hinzugefügt für %s"
+
+#: lib/mergetool.tcl:141
+msgid "Cannot resolve deletion or link conflicts using a tool"
+msgstr ""
+"Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch "
+"das Zusamenführungswerkzeug gelöst werden."
+
+#: lib/mergetool.tcl:146
+msgid "Conflict file does not exist"
+msgstr "Konflikt-Datei existiert nicht"
+
+#: lib/mergetool.tcl:246
+#, tcl-format
+msgid "Not a GUI merge tool: '%s'"
+msgstr "Kein GUI Zusammenführungswerkzeug: »%s«"
+
+#: lib/mergetool.tcl:275
+#, tcl-format
+msgid "Unsupported merge tool '%s'"
+msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«"
+
+#: lib/mergetool.tcl:310
+msgid "Merge tool is already running, terminate it?"
+msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?"
+
+#: lib/mergetool.tcl:330
+#, tcl-format
+msgid ""
+"Error retrieving versions:\n"
+"%s"
+msgstr ""
+"Fehler beim Abrufen der Dateiversionen:\n"
+"%s"
+
+#: lib/mergetool.tcl:350
+#, tcl-format
+msgid ""
+"Could not start the merge tool:\n"
+"\n"
+"%s"
+msgstr ""
+"Zusammenführungswerkzeug konnte nicht gestartet werden:\n"
+"\n"
+"%s"
+
+#: lib/mergetool.tcl:354
+msgid "Running merge tool..."
+msgstr "Zusammenführungswerkzeug starten..."
+
+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
+msgid "Merge tool failed."
+msgstr "Zusammenführungswerkzeug fehlgeschlagen."
+
+#: lib/tools_dlg.tcl:22
+#, tcl-format
+msgid "%s (%s): Add Tool"
+msgstr "%s (%s): Werkzeug hinzufügen"
+
+#: lib/tools_dlg.tcl:28
+msgid "Add New Tool Command"
+msgstr "Neues Kommando für Werkzeug hinzufügen"
+
+#: lib/tools_dlg.tcl:34
+msgid "Add globally"
+msgstr "Global hinzufügen"
+
+#: lib/tools_dlg.tcl:46
+msgid "Tool Details"
+msgstr "Einzelheiten des Werkzeugs"
+
+#: lib/tools_dlg.tcl:49
+msgid "Use '/' separators to create a submenu tree:"
+msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:"
+
+#: lib/tools_dlg.tcl:60
+msgid "Command:"
+msgstr "Kommando:"
+
+#: lib/tools_dlg.tcl:71
+msgid "Show a dialog before running"
+msgstr "Bestätigungsfrage vor Starten anzeigen"
+
+#: lib/tools_dlg.tcl:77
+msgid "Ask the user to select a revision (sets $REVISION)"
+msgstr "Benutzer nach Version fragen (setzt $REVISION)"
+
+#: lib/tools_dlg.tcl:82
+msgid "Ask the user for additional arguments (sets $ARGS)"
+msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)"
+
+#: lib/tools_dlg.tcl:89
+msgid "Don't show the command output window"
+msgstr "Kein Ausgabefenster zeigen"
+
+#: lib/tools_dlg.tcl:94
+msgid "Run only if a diff is selected ($FILENAME not empty)"
+msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)"
+
+#: lib/tools_dlg.tcl:118
+msgid "Please supply a name for the tool."
+msgstr "Bitte geben Sie einen Werkzeugnamen an."
+
+#: lib/tools_dlg.tcl:126
+#, tcl-format
+msgid "Tool '%s' already exists."
+msgstr "Werkzeug »%s« existiert bereits."
+
+#: lib/tools_dlg.tcl:148
+#, tcl-format
+msgid ""
+"Could not add tool:\n"
+"%s"
+msgstr ""
+"Werkzeug konnte nicht hinzugefügt werden:\n"
+"\n"
+"%s"
+
+#: lib/tools_dlg.tcl:187
+#, tcl-format
+msgid "%s (%s): Remove Tool"
+msgstr "%s (%s): Werkzeug entfernen"
+
+#: lib/tools_dlg.tcl:193
+msgid "Remove Tool Commands"
+msgstr "Werkzeugkommandos entfernen"
+
+#: lib/tools_dlg.tcl:198
+msgid "Remove"
+msgstr "Entfernen"
+
+#: lib/tools_dlg.tcl:231
+msgid "(Blue denotes repository-local tools)"
+msgstr "(Werkzeuge für lokales Repository werden in Blau angezeigt)"
+
+#: lib/tools_dlg.tcl:283
+#, tcl-format
+msgid "%s (%s):"
+msgstr "%s (%s):"
+
+#: lib/tools_dlg.tcl:292
+#, tcl-format
+msgid "Run Command: %s"
+msgstr "Kommando aufrufen: %s"
+
+#: lib/tools_dlg.tcl:306
+msgid "Arguments"
+msgstr "Argumente"
+
+#: lib/tools_dlg.tcl:341
+msgid "OK"
+msgstr "Ok"
+
+#: lib/search.tcl:48
+msgid "Find:"
+msgstr "Suchen:"
+
+#: lib/search.tcl:50
+msgid "Next"
+msgstr "Nächster"
+
+#: lib/search.tcl:51
+msgid "Prev"
+msgstr "Voriger"
+
+#: lib/search.tcl:52
+msgid "RegExp"
+msgstr "RegAusdruck"
+
+#: lib/search.tcl:54
+msgid "Case"
+msgstr "Groß/klein"
+
+#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75
+#, tcl-format
+msgid "%s (%s): Create Desktop Icon"
+msgstr "%s (%s): Desktop-Icon erstellen"
+
+#: lib/shortcut.tcl:24 lib/shortcut.tcl:65
+msgid "Cannot write shortcut:"
+msgstr "Fehler beim Schreiben der Verknüpfung:"
+
+#: lib/shortcut.tcl:140
+msgid "Cannot write icon:"
+msgstr "Fehler beim Erstellen des Icons:"
+
+#: lib/remote_branch_delete.tcl:29
+#, tcl-format
+msgid "%s (%s): Delete Branch Remotely"
+msgstr "%s (%s): Branch in externem Repository löschen"
+
+#: lib/remote_branch_delete.tcl:34
+msgid "Delete Branch Remotely"
+msgstr "Branch in externem Repository löschen"
+
+#: lib/remote_branch_delete.tcl:48
+msgid "From Repository"
+msgstr "In Repository"
+
+#: lib/remote_branch_delete.tcl:88
+msgid "Branches"
+msgstr "Branches"
+
+#: lib/remote_branch_delete.tcl:110
+msgid "Delete Only If"
+msgstr "Nur löschen, wenn"
+
+#: lib/remote_branch_delete.tcl:112
+msgid "Merged Into:"
+msgstr "Zusammengeführt mit:"
+
+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
+msgid "Always (Do not perform merge checks)"
+msgstr "Immer (Keine Zusammenführungsprüfung)"
+
+#: lib/remote_branch_delete.tcl:153
+msgid "A branch is required for 'Merged Into'."
+msgstr "Für »Zusammenführen mit« muss ein Branch angegeben werden."
+
+#: lib/remote_branch_delete.tcl:185
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr ""
+"Folgende Branches sind noch nicht mit »%s« zusammengeführt:\n"
+"\n"
+" - %s"
+
+#: lib/remote_branch_delete.tcl:190
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits.  Try fetching from %s first."
+msgstr ""
+"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die "
+"notwendigen Commits vorher angefordert haben.  Sie sollten versuchen, zuerst "
+"von »%s« anzufordern."
+
+#: lib/remote_branch_delete.tcl:208
+msgid "Please select one or more branches to delete."
+msgstr "Bitte wählen Sie mindestens einen Branch, der gelöscht werden soll."
+
+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr ""
+"Das Wiederherstellen von gelöschten Branches ist nur mit größerem Aufwand "
+"möglich.\n"
+"\n"
+"Sollen die ausgewählten Branches gelöscht werden?"
+
+#: lib/remote_branch_delete.tcl:227
+#, tcl-format
+msgid "Deleting branches from %s"
+msgstr "Branches auf »%s« werden gelöscht"
+
+#: lib/remote_branch_delete.tcl:300
+msgid "No repository selected."
+msgstr "Kein Repository ausgewählt."
+
+#: lib/remote_branch_delete.tcl:305
+#, tcl-format
+msgid "Scanning %s..."
+msgstr "»%s« laden..."
+
+#: lib/choose_repository.tcl:45
 msgid "Git Gui"
 msgstr "Git Gui"
 
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
+#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427
 msgid "Create New Repository"
-msgstr "Neues Projektarchiv"
+msgstr "Repository neu erstellen"
 
-#: lib/choose_repository.tcl:93
+#: lib/choose_repository.tcl:110
 msgid "New..."
 msgstr "Neu..."
 
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
+#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511
 msgid "Clone Existing Repository"
-msgstr "Projektarchiv klonen"
+msgstr "Repository klonen"
 
-#: lib/choose_repository.tcl:106
+#: lib/choose_repository.tcl:128
 msgid "Clone..."
 msgstr "Klonen..."
 
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
+#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105
 msgid "Open Existing Repository"
-msgstr "Projektarchiv öffnen"
+msgstr "Repository öffnen"
 
-#: lib/choose_repository.tcl:119
+#: lib/choose_repository.tcl:141
 msgid "Open..."
 msgstr "Öffnen..."
 
-#: lib/choose_repository.tcl:132
+#: lib/choose_repository.tcl:154
 msgid "Recent Repositories"
-msgstr "Zuletzt benutzte Projektarchive"
+msgstr "Letzte Repositories"
 
-#: lib/choose_repository.tcl:138
+#: lib/choose_repository.tcl:164
 msgid "Open Recent Repository:"
-msgstr "Zuletzt benutztes Projektarchiv öffnen:"
+msgstr "Zuletzt benutztes Repository öffnen:"
 
-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
-#: lib/choose_repository.tcl:320
+#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338
+#: lib/choose_repository.tcl:345
 #, tcl-format
 msgid "Failed to create repository %s:"
-msgstr "Projektarchiv »%s« konnte nicht erstellt werden:"
+msgstr "Repository »%s« konnte nicht erstellt werden:"
 
-#: lib/choose_repository.tcl:391
+#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33
+msgid "Create"
+msgstr "Erstellen"
+
+#: lib/choose_repository.tcl:432
 msgid "Directory:"
 msgstr "Verzeichnis:"
 
-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
-#: lib/choose_repository.tcl:1052
+#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588
+#: lib/choose_repository.tcl:1139
 msgid "Git Repository"
-msgstr "Git Projektarchiv"
+msgstr "Git Repository"
 
-#: lib/choose_repository.tcl:448
+#: lib/choose_repository.tcl:487
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Verzeichnis »%s« existiert bereits."
 
-#: lib/choose_repository.tcl:452
+#: lib/choose_repository.tcl:491
 #, tcl-format
 msgid "File %s already exists."
 msgstr "Datei »%s« existiert bereits."
 
-#: lib/choose_repository.tcl:466
+#: lib/choose_repository.tcl:506
 msgid "Clone"
 msgstr "Klonen"
 
-#: lib/choose_repository.tcl:479
+#: lib/choose_repository.tcl:519
 msgid "Source Location:"
-msgstr "Herkunft:"
+msgstr "Herkunfts-Adresse:"
 
-#: lib/choose_repository.tcl:490
+#: lib/choose_repository.tcl:528
 msgid "Target Directory:"
 msgstr "Zielverzeichnis:"
 
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:538
 msgid "Clone Type:"
 msgstr "Art des Klonens:"
 
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:543
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Standard (schnell, teilweise redundant, Hardlinks)"
 
-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:548
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Alles kopieren (langsamer, volle Redundanz)"
 
-#: lib/choose_repository.tcl:520
+#: lib/choose_repository.tcl:553
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Verknüpft (schnell, nicht empfohlen, kein Backup)"
 
-#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
-#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
-#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
+#: lib/choose_repository.tcl:560
+msgid "Recursively clone submodules too"
+msgstr "Rekursiv weitere Submodule klonen"
+
+#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864
+#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153
 #, tcl-format
 msgid "Not a Git repository: %s"
-msgstr "Kein Git-Projektarchiv in »%s« gefunden."
+msgstr "Kein Git-Repository: %s"
 
-#: lib/choose_repository.tcl:592
+#: lib/choose_repository.tcl:630
 msgid "Standard only available for local repository."
-msgstr "Standard ist nur für lokale Projektarchive verfügbar."
+msgstr "Standard ist nur für lokale Repositories verfügbar."
 
-#: lib/choose_repository.tcl:596
+#: lib/choose_repository.tcl:634
 msgid "Shared only available for local repository."
-msgstr "Verknüpft ist nur für lokale Projektarchive verfügbar."
+msgstr "Verknüpft ist nur für lokale Repositories verfügbar."
 
-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:655
 #, tcl-format
 msgid "Location %s already exists."
-msgstr "Projektarchiv »%s« existiert bereits."
+msgstr "Adresse »%s« existiert bereits."
 
-#: lib/choose_repository.tcl:628
+#: lib/choose_repository.tcl:666
 msgid "Failed to configure origin"
 msgstr "Der Ursprungsort konnte nicht eingerichtet werden"
 
-#: lib/choose_repository.tcl:640
+#: lib/choose_repository.tcl:678
 msgid "Counting objects"
 msgstr "Objekte werden gezählt"
 
-#: lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:679
 msgid "buckets"
 msgstr "Buckets"
 
-#: lib/choose_repository.tcl:665
+#: lib/choose_repository.tcl:703
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "Kopien von Objekten/Info/Alternates konnten nicht erstellt werden: %s"
 
-#: lib/choose_repository.tcl:701
+#: lib/choose_repository.tcl:740
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "Von »%s« konnte nichts geklont werden."
 
-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
-#: lib/choose_repository.tcl:929
+#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962
+#: lib/choose_repository.tcl:974
 msgid "The 'master' branch has not been initialized."
-msgstr "Der »master«-Zweig wurde noch nicht initialisiert."
+msgstr "Der »master«-Branch wurde noch nicht initialisiert."
 
-#: lib/choose_repository.tcl:716
+#: lib/choose_repository.tcl:755
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "Hardlinks nicht verfügbar. Stattdessen wird kopiert."
 
-#: lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:769
 #, tcl-format
 msgid "Cloning from %s"
 msgstr "Kopieren von »%s«"
 
-#: lib/choose_repository.tcl:759
+#: lib/choose_repository.tcl:800
 msgid "Copying objects"
 msgstr "Objektdatenbank kopieren"
 
-#: lib/choose_repository.tcl:760
+#: lib/choose_repository.tcl:801
 msgid "KiB"
 msgstr "KB"
 
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:825
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "Objekt kann nicht kopiert werden: %s"
 
-#: lib/choose_repository.tcl:794
+#: lib/choose_repository.tcl:837
 msgid "Linking objects"
 msgstr "Objekte verlinken"
 
-#: lib/choose_repository.tcl:795
+#: lib/choose_repository.tcl:838
 msgid "objects"
 msgstr "Objekte"
 
-#: lib/choose_repository.tcl:803
+#: lib/choose_repository.tcl:846
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "Für Objekt konnte kein Hardlink erstellt werden: %s"
 
-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:903
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
-"Zweige und Objekte konnten nicht angefordert werden.  Kontrollieren Sie die "
-"Ausgaben auf der Konsole für weitere Angaben."
+"Branches und Objekte konnten nicht angefordert werden.  Kontrollieren Sie "
+"die Ausgaben auf der Konsole für weitere Angaben."
 
-#: lib/choose_repository.tcl:869
+#: lib/choose_repository.tcl:914
 msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
-"Markierungen konnten nicht angefordert werden.  Kontrollieren Sie die "
-"Ausgaben auf der Konsole für weitere Angaben."
+"Tags konnten nicht angefordert werden.  Kontrollieren Sie die Ausgaben auf "
+"der Konsole für weitere Angaben."
 
-#: lib/choose_repository.tcl:893
+#: lib/choose_repository.tcl:938
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr ""
-"Die Zweigspitze (HEAD) konnte nicht gefunden werden.  Kontrollieren Sie die "
+"Die Branchspitze (HEAD) konnte nicht gefunden werden.  Kontrollieren Sie die "
 "Ausgaben auf der Konsole für weitere Angaben."
 
-#: lib/choose_repository.tcl:902
+#: lib/choose_repository.tcl:947
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "Verzeichnis »%s« kann nicht aufgeräumt werden."
 
-#: lib/choose_repository.tcl:908
+#: lib/choose_repository.tcl:953
 msgid "Clone failed."
 msgstr "Klonen fehlgeschlagen."
 
-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:960
 msgid "No default branch obtained."
-msgstr "Kein voreingestellter Zweig gefunden."
+msgstr "Kein voreingestellter Branch gefunden."
 
-#: lib/choose_repository.tcl:926
+#: lib/choose_repository.tcl:971
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
-msgstr "»%s« wurde nicht als Version gefunden."
+msgstr "»%s« wurde nicht als Commit gefunden."
 
-#: lib/choose_repository.tcl:938
+#: lib/choose_repository.tcl:998
 msgid "Creating working directory"
 msgstr "Arbeitskopie erstellen"
 
-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
-#: lib/index.tcl:198
-msgid "files"
-msgstr "Dateien"
-
-#: lib/choose_repository.tcl:968
+#: lib/choose_repository.tcl:1028
 msgid "Initial file checkout failed."
 msgstr "Erstellen der Arbeitskopie fehlgeschlagen."
 
-#: lib/choose_repository.tcl:1011
-msgid "Open"
-msgstr "Öffnen"
+#: lib/choose_repository.tcl:1072
+msgid "Cloning submodules"
+msgstr "Klone Submodul"
 
-#: lib/choose_repository.tcl:1021
+#: lib/choose_repository.tcl:1087
+msgid "Cannot clone submodules."
+msgstr "Submodul konnte nicht geklont werden."
+
+#: lib/choose_repository.tcl:1110
 msgid "Repository:"
-msgstr "Projektarchiv:"
+msgstr "Repository:"
 
-#: lib/choose_repository.tcl:1072
+#: lib/choose_repository.tcl:1159
 #, tcl-format
 msgid "Failed to open repository %s:"
-msgstr "Projektarchiv »%s« konnte nicht geöffnet werden."
+msgstr "Repository »%s« konnte nicht geöffnet werden."
+
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - eine grafische Oberfläche für Git."
+
+#: lib/blame.tcl:74
+#, tcl-format
+msgid "%s (%s): File Viewer"
+msgstr "%s (%s): Datei-Browser"
+
+#: lib/blame.tcl:80
+msgid "Commit:"
+msgstr "Commit:"
+
+#: lib/blame.tcl:282
+msgid "Copy Commit"
+msgstr "Commit kopieren"
+
+#: lib/blame.tcl:286
+msgid "Find Text..."
+msgstr "Text suchen..."
+
+#: lib/blame.tcl:290
+msgid "Goto Line..."
+msgstr "Gehe zu Zeile..."
+
+#: lib/blame.tcl:299
+msgid "Do Full Copy Detection"
+msgstr "Volle Kopie-Erkennung"
+
+#: lib/blame.tcl:303
+msgid "Show History Context"
+msgstr "Historien-Kontext anzeigen"
+
+#: lib/blame.tcl:306
+msgid "Blame Parent Commit"
+msgstr "Elterncommit annotieren"
+
+#: lib/blame.tcl:468
+#, tcl-format
+msgid "Reading %s..."
+msgstr "%s lesen..."
+
+#: lib/blame.tcl:596
+msgid "Loading copy/move tracking annotations..."
+msgstr "Annotierungen für Kopieren/Verschieben werden geladen..."
+
+#: lib/blame.tcl:613
+msgid "lines annotated"
+msgstr "Zeilen annotiert"
+
+#: lib/blame.tcl:815
+msgid "Loading original location annotations..."
+msgstr "Annotierungen für ursprünglichen Ort werden geladen..."
+
+#: lib/blame.tcl:818
+msgid "Annotation complete."
+msgstr "Annotierung vollständig."
+
+#: lib/blame.tcl:849
+msgid "Busy"
+msgstr "Verarbeitung läuft"
+
+#: lib/blame.tcl:850
+msgid "Annotation process is already running."
+msgstr "Annotierung läuft bereits."
+
+#: lib/blame.tcl:889
+msgid "Running thorough copy detection..."
+msgstr "Intensive Kopie-Erkennung läuft..."
+
+#: lib/blame.tcl:957
+msgid "Loading annotation..."
+msgstr "Annotierung laden..."
+
+#: lib/blame.tcl:1010
+msgid "Author:"
+msgstr "Autor:"
+
+#: lib/blame.tcl:1014
+msgid "Committer:"
+msgstr "Committer:"
+
+#: lib/blame.tcl:1019
+msgid "Original File:"
+msgstr "Ursprüngliche Datei:"
+
+#: lib/blame.tcl:1067
+msgid "Cannot find HEAD commit:"
+msgstr "Branchspitze (»HEAD commit«) kann nicht gefunden werden:"
+
+#: lib/blame.tcl:1122
+msgid "Cannot find parent commit:"
+msgstr "Elterncommit kann nicht gefunden werden:"
+
+#: lib/blame.tcl:1137
+msgid "Unable to display parent"
+msgstr "Elterncommit kann nicht angezeigt werden"
+
+#: lib/blame.tcl:1138 lib/diff.tcl:345
+msgid "Error loading diff:"
+msgstr "Fehler beim Laden des Vergleichs:"
+
+#: lib/blame.tcl:1279
+msgid "Originally By:"
+msgstr "Ursprünglich von:"
+
+#: lib/blame.tcl:1285
+msgid "In File:"
+msgstr "In Datei:"
+
+#: lib/blame.tcl:1290
+msgid "Copied Or Moved Here By:"
+msgstr "Kopiert oder verschoben durch:"
+
+#: lib/diff.tcl:77
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but "
+"the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have "
+"the same state."
+msgstr ""
+"Keine Änderungen feststellbar.\n"
+"\n"
+"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei "
+"von einem anderen Programm modifiziert, aber der Inhalt der Datei ist "
+"unverändert.\n"
+"\n"
+"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen "
+"Dateien zu prüfen."
+
+#: lib/diff.tcl:117
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Vergleich von »%s« laden..."
+
+#: lib/diff.tcl:143
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
+msgstr ""
+"LOKAL: gelöscht\n"
+"EXTERN:\n"
+
+#: lib/diff.tcl:148
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
+msgstr ""
+"EXTERN: gelöscht\n"
+"LOKAL:\n"
+
+#: lib/diff.tcl:155
+msgid "LOCAL:\n"
+msgstr "LOKAL:\n"
+
+#: lib/diff.tcl:158
+msgid "REMOTE:\n"
+msgstr "EXTERN:\n"
+
+#: lib/diff.tcl:220 lib/diff.tcl:344
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "Datei »%s« kann nicht angezeigt werden"
+
+#: lib/diff.tcl:221
+msgid "Error loading file:"
+msgstr "Fehler beim Laden der Datei:"
+
+#: lib/diff.tcl:227
+msgid "Git Repository (subproject)"
+msgstr "Git-Repository (Subprojekt)"
+
+#: lib/diff.tcl:239
+msgid "* Binary file (not showing content)."
+msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
+
+#: lib/diff.tcl:244
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"
+msgstr ""
+"* Unversionierte Datei hat %d Bytes.\n"
+"* Nur erste %d Bytes werden angezeigt.\n"
+
+#: lib/diff.tcl:250
+#, tcl-format
+msgid ""
+"\n"
+"* Untracked file clipped here by %s.\n"
+"* To see the entire file, use an external editor.\n"
+msgstr ""
+"\n"
+"* Unversionierte Datei, hier abgeschnitten durch %s.\n"
+"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n"
+
+#: lib/diff.tcl:583
+msgid "Failed to unstage selected hunk."
+msgstr ""
+"Fehler beim Herausnehmen des gewählten Patch-Blocks aus der Bereitstellung."
+
+#: lib/diff.tcl:591
+msgid "Failed to revert selected hunk."
+msgstr "Fehler beim Zurücknehmen des gewählten Patch-Blocks."
+
+#: lib/diff.tcl:594
+msgid "Failed to stage selected hunk."
+msgstr "Fehler beim Bereitstellen des gewählten Patch-Blocks."
+
+#: lib/diff.tcl:687
+msgid "Failed to unstage selected line."
+msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung."
+
+#: lib/diff.tcl:696
+msgid "Failed to revert selected line."
+msgstr "Fehler beim Zurücknehmen der gewählten Zeile."
+
+#: lib/diff.tcl:700
+msgid "Failed to stage selected line."
+msgstr "Fehler beim Bereitstellen der gewählten Zeile."
+
+#: lib/diff.tcl:889
+msgid "Failed to undo last revert."
+msgstr "Fehler beim Rückgängigmachen des letzten Zurücknehmen-Commits"
+
+#: lib/sshkey.tcl:34
+msgid "No keys found."
+msgstr "Keine Schlüssel gefunden."
+
+#: lib/sshkey.tcl:37
+#, tcl-format
+msgid "Found a public key in: %s"
+msgstr "Öffentlicher Schlüssel gefunden in: %s"
+
+#: lib/sshkey.tcl:43
+msgid "Generate Key"
+msgstr "Schlüssel erzeugen"
 
-#: lib/choose_rev.tcl:53
+#: lib/sshkey.tcl:61
+msgid "Copy To Clipboard"
+msgstr "In Zwischenablage kopieren"
+
+#: lib/sshkey.tcl:75
+msgid "Your OpenSSH Public Key"
+msgstr "Ihr OpenSSH öffenlicher Schlüssel"
+
+#: lib/sshkey.tcl:83
+msgid "Generating..."
+msgstr "Erzeugen..."
+
+#: lib/sshkey.tcl:89
+#, tcl-format
+msgid ""
+"Could not start ssh-keygen:\n"
+"\n"
+"%s"
+msgstr ""
+"Konnte »ssh-keygen« nicht starten:\n"
+"\n"
+"%s"
+
+#: lib/sshkey.tcl:116
+msgid "Generation failed."
+msgstr "Schlüsselerzeugung fehlgeschlagen."
+
+#: lib/sshkey.tcl:123
+msgid "Generation succeeded, but no keys found."
+msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden."
+
+#: lib/sshkey.tcl:126
+#, tcl-format
+msgid "Your key is in: %s"
+msgstr "Ihr Schlüssel ist abgelegt in: %s"
+
+#: lib/branch_create.tcl:23
+#, tcl-format
+msgid "%s (%s): Create Branch"
+msgstr "%s (%s): Branch erstellen"
+
+#: lib/branch_create.tcl:28
+msgid "Create New Branch"
+msgstr "Neuen Branch erstellen"
+
+#: lib/branch_create.tcl:42
+msgid "Branch Name"
+msgstr "Branchname"
+
+#: lib/branch_create.tcl:57
+msgid "Match Tracking Branch Name"
+msgstr "Passend zu Trackingbranch-Name"
+
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
+msgstr "Anfangsversion"
+
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
+msgstr "Existierenden Branch aktualisieren:"
+
+#: lib/branch_create.tcl:75
+msgid "No"
+msgstr "Nein"
+
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
+msgstr "Nur Vorspulen"
+
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
+msgstr "Branch auschecken nach Erstellen"
+
+#: lib/branch_create.tcl:132
+msgid "Please select a tracking branch."
+msgstr "Bitte wählen Sie einen Trackingbranch."
+
+#: lib/branch_create.tcl:141
+#, tcl-format
+msgid "Tracking branch %s is not a branch in the remote repository."
+msgstr "Trackingbranch »%s« ist kein Branch im externen Repository."
+
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr "Verarbeitung. Bitte warten..."
+
+#: lib/console.tcl:186
+msgid "Success"
+msgstr "Erfolgreich"
+
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr "Fehler: Kommando fehlgeschlagen"
+
+#: lib/line.tcl:17
+msgid "Goto Line:"
+msgstr "Gehe zu Zeile:"
+
+#: lib/line.tcl:23
+msgid "Go"
+msgstr "Gehe"
+
+#: lib/choose_rev.tcl:52
 msgid "This Detached Checkout"
-msgstr "Abgetrennte Arbeitskopie-Version"
+msgstr "Losgelöste Arbeitskopie-Version"
 
 #: lib/choose_rev.tcl:60
 msgid "Revision Expression:"
-msgstr "Version Regexp-Ausdruck:"
+msgstr "Version Regex-Ausdruck:"
 
-#: lib/choose_rev.tcl:74
+#: lib/choose_rev.tcl:72
 msgid "Local Branch"
-msgstr "Lokaler Zweig"
+msgstr "Lokaler Branch"
 
-#: lib/choose_rev.tcl:79
+#: lib/choose_rev.tcl:77
 msgid "Tracking Branch"
-msgstr "Ãœbernahmezweig"
+msgstr "Trackingbranch"
 
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544
 msgid "Tag"
-msgstr "Markierung"
+msgstr "Tag"
 
-#: lib/choose_rev.tcl:317
+#: lib/choose_rev.tcl:321
 #, tcl-format
 msgid "Invalid revision: %s"
 msgstr "Ungültige Version: %s"
 
-#: lib/choose_rev.tcl:338
+#: lib/choose_rev.tcl:342
 msgid "No revision selected."
 msgstr "Keine Version ausgewählt."
 
-#: lib/choose_rev.tcl:346
+#: lib/choose_rev.tcl:350
 msgid "Revision expression is empty."
 msgstr "Versions-Ausdruck ist leer."
 
-#: lib/choose_rev.tcl:531
+#: lib/choose_rev.tcl:537
 msgid "Updated"
 msgstr "Aktualisiert"
 
-#: lib/choose_rev.tcl:559
+#: lib/choose_rev.tcl:565
 msgid "URL"
 msgstr "URL"
 
@@ -1337,10 +2409,10 @@ msgid ""
 "You are about to create the initial commit.  There is no commit before this "
 "to amend.\n"
 msgstr ""
-"Keine Version zur Nachbesserung vorhanden.\n"
+"Kein Commit zur Nachbesserung vorhanden.\n"
 "\n"
-"Sie sind dabei, die erste Version zu übertragen. Es gibt keine existierende "
-"Version, die Sie nachbessern könnten.\n"
+"Sie sind dabei, den ersten Commit zu erstellen. Es gibt keinen existierenden "
+"Commit, den Sie nachbessern könnten.\n"
 
 #: lib/commit.tcl:18
 msgid ""
@@ -1350,31 +2422,31 @@ msgid ""
 "completed.  You cannot amend the prior commit unless you first abort the "
 "current merge activity.\n"
 msgstr ""
-"Nachbesserung währen Zusammenführung nicht möglich.\n"
+"Nachbesserung bei Zusammenführung nicht möglich.\n"
 "\n"
-"Sie haben das Zusammenführen von Versionen angefangen, aber noch nicht "
-"beendet. Sie können keine vorige Übertragung nachbessern, solange eine "
+"Sie haben das Zusammenführen von Commits angefangen, aber noch nicht "
+"beendet. Sie können keinen vorigen Commit nachbessern, solange eine "
 "unfertige Zusammenführung existiert. Dazu müssen Sie die Zusammenführung "
 "beenden oder abbrechen.\n"
 
-#: lib/commit.tcl:48
+#: lib/commit.tcl:56
 msgid "Error loading commit data for amend:"
-msgstr "Fehler beim Laden der Versionsdaten für Nachbessern:"
+msgstr "Fehler beim Laden der Commitdaten für Nachbessern:"
 
-#: lib/commit.tcl:75
+#: lib/commit.tcl:83
 msgid "Unable to obtain your identity:"
 msgstr "Benutzername konnte nicht bestimmt werden:"
 
-#: lib/commit.tcl:80
+#: lib/commit.tcl:88
 msgid "Invalid GIT_COMMITTER_IDENT:"
 msgstr "Ungültiger Wert von GIT_COMMITTER_INDENT:"
 
-#: lib/commit.tcl:129
+#: lib/commit.tcl:138
 #, tcl-format
 msgid "warning: Tcl does not support encoding '%s'."
 msgstr "Warning: Tcl/Tk unterstützt die Zeichencodierung »%s« nicht."
 
-#: lib/commit.tcl:149
+#: lib/commit.tcl:158
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -1383,14 +2455,14 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
+"Der letzte geladene Status stimmt nicht mehr mit dem Repository überein.\n"
 "\n"
-"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
-"geändert.  Vor dem Eintragen einer neuen Version muss neu geladen werden.\n"
+"Ein anderes Git-Programm hat das Repository seit dem letzten Laden "
+"geändert.  Vor dem nächsten Commit muss neu geladen werden.\n"
 "\n"
 "Es wird gleich neu geladen.\n"
 
-#: lib/commit.tcl:172
+#: lib/commit.tcl:182
 #, tcl-format
 msgid ""
 "Unmerged files cannot be committed.\n"
@@ -1398,12 +2470,13 @@ msgid ""
 "File %s has merge conflicts.  You must resolve them and stage the file "
 "before committing.\n"
 msgstr ""
-"Nicht zusammengeführte Dateien können nicht eingetragen werden.\n"
+"Nicht zusammengeführte Dateien können nicht committet werden.\n"
 "\n"
 "Die Datei »%s« hat noch nicht aufgelöste Zusammenführungs-Konflikte. Sie "
-"müssen diese Konflikte auflösen, bevor Sie eintragen können.\n"
+"müssen diese Konflikte auflösen und die Dateien in die Bereitstellung "
+"hinzufügen, bevor Sie committen können.\n"
 
-#: lib/commit.tcl:180
+#: lib/commit.tcl:190
 #, tcl-format
 msgid ""
 "Unknown file state %s detected.\n"
@@ -1412,19 +2485,19 @@ msgid ""
 msgstr ""
 "Unbekannter Dateizustand »%s«.\n"
 "\n"
-"Datei »%s« kann nicht eingetragen werden.\n"
+"Datei »%s« kann nicht committet werden.\n"
 
-#: lib/commit.tcl:188
+#: lib/commit.tcl:198
 msgid ""
 "No changes to commit.\n"
 "\n"
 "You must stage at least 1 file before you can commit.\n"
 msgstr ""
-"Keine Änderungen vorhanden, die eingetragen werden könnten.\n"
+"Keine Änderungen vorhanden, die committet werden könnten.\n"
 "\n"
-"Sie müssen mindestens eine Datei bereitstellen, bevor Sie eintragen können.\n"
+"Sie müssen mindestens eine Datei bereitstellen, bevor Sie committen können.\n"
 
-#: lib/commit.tcl:203
+#: lib/commit.tcl:213
 msgid ""
 "Please supply a commit message.\n"
 "\n"
@@ -1444,42 +2517,58 @@ msgstr ""
 "\n"
 "- Rest: Eine ausführliche Beschreibung, warum diese Änderung hilfreich ist.\n"
 
-#: lib/commit.tcl:234
+#: lib/commit.tcl:244
 msgid "Calling pre-commit hook..."
-msgstr "Aufrufen der Vor-Eintragen-Kontrolle (»pre-commit hook«)..."
+msgstr "Aufrufen des »pre-commit hook«..."
 
-#: lib/commit.tcl:249
+#: lib/commit.tcl:259
 msgid "Commit declined by pre-commit hook."
-msgstr "Eintragen abgelehnt durch Vor-Eintragen-Kontrolle (»pre-commit hook«)."
+msgstr "Committen abgelehnt durch »pre-commit hook«."
 
-#: lib/commit.tcl:272
+#: lib/commit.tcl:278
+msgid ""
+"You are about to commit on a detached head. This is a potentially dangerous "
+"thing to do because if you switch to another branch you will lose your "
+"changes and it can be difficult to retrieve them later from the reflog. You "
+"should probably cancel this commit and create a new branch to continue.\n"
+" \n"
+" Do you really want to proceed with your Commit?"
+msgstr ""
+"Sie sind dabei, einen Commit auf losgelöste Branchspitze (»commit to "
+"detached head«) zu erstellen. Das ist riskant, denn wenn Sie zu einem "
+"anderen Branch wechseln, würden Sie diese Änderungen verlieren und es ist "
+"nachträglich schwierig, diese aus dem Commit-Log (»reflog«) wiederzufinden. "
+"Es wird empfohlen, diesen Commit abzubrechen und zunächst einen neuen Branch "
+"zu erstellen.\n"
+"\n"
+" Wollen Sie den Commit trotzdem in dieser Form erstellen?"
+
+#: lib/commit.tcl:299
 msgid "Calling commit-msg hook..."
-msgstr "Aufrufen der Versionsbeschreibungs-Kontrolle (»commit-message hook«)..."
+msgstr "Aufrufen des »commit-msg hook«..."
 
-#: lib/commit.tcl:287
+#: lib/commit.tcl:314
 msgid "Commit declined by commit-msg hook."
-msgstr ""
-"Eintragen abgelehnt durch Versionsbeschreibungs-Kontrolle (»commit-message "
-"hook«)."
+msgstr "Committen abgelehnt durch »commit-msg hook«."
 
-#: lib/commit.tcl:300
+#: lib/commit.tcl:327
 msgid "Committing changes..."
-msgstr "Änderungen eintragen..."
+msgstr "Änderungen committen..."
 
-#: lib/commit.tcl:316
+#: lib/commit.tcl:344
 msgid "write-tree failed:"
 msgstr "write-tree fehlgeschlagen:"
 
-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
+#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422
 msgid "Commit failed."
-msgstr "Eintragen fehlgeschlagen."
+msgstr "Committen fehlgeschlagen."
 
-#: lib/commit.tcl:334
+#: lib/commit.tcl:362
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "Version »%s« scheint beschädigt zu sein"
 
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
 msgid ""
 "No changes to commit.\n"
 "\n"
@@ -1487,70 +2576,104 @@ msgid ""
 "\n"
 "A rescan will be automatically started now.\n"
 msgstr ""
-"Keine Änderungen einzutragen.\n"
+"Keine Änderungen zum committen.\n"
 "\n"
-"Es gibt keine geänderte Datei bei dieser Version und es wurde auch nichts "
+"Es gibt keine geänderte Datei in diesem Commit und es wurde auch nichts "
 "zusammengeführt.\n"
 "\n"
 "Das Arbeitsverzeichnis wird daher jetzt neu geladen.\n"
 
-#: lib/commit.tcl:346
+#: lib/commit.tcl:374
 msgid "No changes to commit."
-msgstr "Keine Änderungen, die eingetragen werden können."
+msgstr "Keine Änderungen, die committet werden können."
 
-#: lib/commit.tcl:360
+#: lib/commit.tcl:394
 msgid "commit-tree failed:"
 msgstr "commit-tree fehlgeschlagen:"
 
-#: lib/commit.tcl:381
+#: lib/commit.tcl:421
 msgid "update-ref failed:"
 msgstr "update-ref fehlgeschlagen:"
 
-#: lib/commit.tcl:469
+#: lib/commit.tcl:514
 #, tcl-format
 msgid "Created commit %s: %s"
-msgstr "Version %s übertragen: %s"
+msgstr "Commit %s erstellt: %s"
 
-#: lib/console.tcl:59
-msgid "Working... please wait..."
-msgstr "Verarbeitung. Bitte warten..."
+#: lib/branch_delete.tcl:16
+#, tcl-format
+msgid "%s (%s): Delete Branch"
+msgstr "%s (%s): Branch löschen"
 
-#: lib/console.tcl:186
-msgid "Success"
-msgstr "Erfolgreich"
+#: lib/branch_delete.tcl:21
+msgid "Delete Local Branch"
+msgstr "Lokalen Branch löschen"
 
-#: lib/console.tcl:200
-msgid "Error: Command Failed"
-msgstr "Fehler: Kommando fehlgeschlagen"
+#: lib/branch_delete.tcl:39
+msgid "Local Branches"
+msgstr "Lokale Branches"
 
-#: lib/database.tcl:43
+#: lib/branch_delete.tcl:51
+msgid "Delete Only If Merged Into"
+msgstr "Nur löschen, wenn zusammengeführt nach"
+
+#: lib/branch_delete.tcl:103
+#, tcl-format
+msgid "The following branches are not completely merged into %s:"
+msgstr "Folgende Branches sind noch nicht mit »%s« zusammengeführt:"
+
+#: lib/branch_delete.tcl:131
+#, tcl-format
+msgid " - %s:"
+msgstr " - %s:"
+
+#: lib/branch_delete.tcl:141
+#, tcl-format
+msgid ""
+"Failed to delete branches:\n"
+"%s"
+msgstr ""
+"Fehler beim Löschen der Branches:\n"
+"%s"
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "Ungültiges Datum von Git: %s"
+
+#: lib/database.tcl:42
 msgid "Number of loose objects"
 msgstr "Anzahl unverknüpfter Objekte"
 
-#: lib/database.tcl:44
+#: lib/database.tcl:43
 msgid "Disk space used by loose objects"
 msgstr "Festplattenplatz von unverknüpften Objekten"
 
-#: lib/database.tcl:45
+#: lib/database.tcl:44
 msgid "Number of packed objects"
 msgstr "Anzahl komprimierter Objekte"
 
-#: lib/database.tcl:46
+#: lib/database.tcl:45
 msgid "Number of packs"
 msgstr "Anzahl Komprimierungseinheiten"
 
-#: lib/database.tcl:47
+#: lib/database.tcl:46
 msgid "Disk space used by packed objects"
 msgstr "Festplattenplatz von komprimierten Objekten"
 
-#: lib/database.tcl:48
+#: lib/database.tcl:47
 msgid "Packed objects waiting for pruning"
 msgstr "Komprimierte Objekte, die zum Aufräumen vorgesehen sind"
 
-#: lib/database.tcl:49
+#: lib/database.tcl:48
 msgid "Garbage files"
 msgstr "Dateien im Mülleimer"
 
+#: lib/database.tcl:66
+#, tcl-format
+msgid "%s (%s): Database Statistics"
+msgstr "%s (%s): Datenbankstatistik"
+
 #: lib/database.tcl:72
 msgid "Compressing the object database"
 msgstr "Objektdatenbank komprimieren"
@@ -1569,214 +2692,37 @@ msgid ""
 "\n"
 "Compress the database now?"
 msgstr ""
-"Dieses Projektarchiv enthält ungefähr %i nicht verknüpfte Objekte.\n"
+"Dieses Repository enthält ungefähr %i nicht verknüpfte Objekte.\n"
 "\n"
-"Für eine optimale Performance wird empfohlen, die Datenbank des Projektarchivs zu komprimieren.\n"
+"Für eine optimale Performance wird empfohlen, die Datenbank des Repository "
+"zu komprimieren.\n"
 "\n"
 "Soll die Datenbank jetzt komprimiert werden?"
 
-#: lib/date.tcl:25
+#: lib/error.tcl:20
 #, tcl-format
-msgid "Invalid date from Git: %s"
-msgstr "Ungültiges Datum von Git: %s"
-
-#: lib/diff.tcl:64
-#, tcl-format
-msgid ""
-"No differences detected.\n"
-"\n"
-"%s has no changes.\n"
-"\n"
-"The modification date of this file was updated by another application, but "
-"the content within the file was not changed.\n"
-"\n"
-"A rescan will be automatically started to find other files which may have "
-"the same state."
-msgstr ""
-"Keine Änderungen feststellbar.\n"
-"\n"
-"»%s« enthält keine Änderungen. Zwar wurde das Änderungsdatum dieser Datei von "
-"einem anderen Programm modifiziert, aber der Inhalt der Datei ist "
-"unverändert.\n"
-"\n"
-"Das Arbeitsverzeichnis wird jetzt neu geladen, um diese Änderung bei allen "
-"Dateien zu prüfen."
-
-#: lib/diff.tcl:104
-#, tcl-format
-msgid "Loading diff of %s..."
-msgstr "Vergleich von »%s« laden..."
-
-#: lib/diff.tcl:125
-msgid ""
-"LOCAL: deleted\n"
-"REMOTE:\n"
-msgstr ""
-"LOKAL: gelöscht\n"
-"ANDERES:\n"
-
-#: lib/diff.tcl:130
-msgid ""
-"REMOTE: deleted\n"
-"LOCAL:\n"
-msgstr ""
-"ANDERES: gelöscht\n"
-"LOKAL:\n"
-
-#: lib/diff.tcl:137
-msgid "LOCAL:\n"
-msgstr "LOKAL:\n"
-
-#: lib/diff.tcl:140
-msgid "REMOTE:\n"
-msgstr "ANDERES:\n"
-
-#: lib/diff.tcl:202 lib/diff.tcl:319
-#, tcl-format
-msgid "Unable to display %s"
-msgstr "Datei »%s« kann nicht angezeigt werden"
-
-#: lib/diff.tcl:203
-msgid "Error loading file:"
-msgstr "Fehler beim Laden der Datei:"
-
-#: lib/diff.tcl:210
-msgid "Git Repository (subproject)"
-msgstr "Git-Projektarchiv (Unterprojekt)"
-
-#: lib/diff.tcl:222
-msgid "* Binary file (not showing content)."
-msgstr "* Binärdatei (Inhalt wird nicht angezeigt)"
-
-#: lib/diff.tcl:227
-#, tcl-format
-msgid ""
-"* Untracked file is %d bytes.\n"
-"* Showing only first %d bytes.\n"
-msgstr ""
-"* Datei nicht unter Versionskontrolle, Dateigröße %d Bytes.\n"
-"* Nur erste %d Bytes werden angezeigt.\n"
-
-#: lib/diff.tcl:233
-#, tcl-format
-msgid ""
-"\n"
-"* Untracked file clipped here by %s.\n"
-"* To see the entire file, use an external editor.\n"
-msgstr ""
-"\n"
-"* Datei nicht unter Versionskontrolle, hier abgeschnitten durch %s.\n"
-"* Zum Ansehen der vollständigen Datei externen Editor benutzen.\n"
-
-#: lib/diff.tcl:482
-msgid "Failed to unstage selected hunk."
-msgstr ""
-"Fehler beim Herausnehmen des gewählten Kontexts aus der Bereitstellung."
-
-#: lib/diff.tcl:489
-msgid "Failed to stage selected hunk."
-msgstr "Fehler beim Bereitstellen des gewählten Kontexts."
-
-#: lib/diff.tcl:568
-msgid "Failed to unstage selected line."
-msgstr "Fehler beim Herausnehmen der gewählten Zeile aus der Bereitstellung."
-
-#: lib/diff.tcl:576
-msgid "Failed to stage selected line."
-msgstr "Fehler beim Bereitstellen der gewählten Zeile."
-
-#: lib/encoding.tcl:443
-msgid "Default"
-msgstr "Voreinstellung"
-
-#: lib/encoding.tcl:448
-#, tcl-format
-msgid "System (%s)"
-msgstr "Systemweit (%s)"
-
-#: lib/encoding.tcl:459 lib/encoding.tcl:465
-msgid "Other"
-msgstr "Andere"
-
-#: lib/error.tcl:20 lib/error.tcl:114
-msgid "error"
-msgstr "Fehler"
+msgid "%s: error"
+msgstr "%s: Fehler"
 
 #: lib/error.tcl:36
-msgid "warning"
-msgstr "Warnung"
-
-#: lib/error.tcl:94
-msgid "You must correct the above errors before committing."
-msgstr ""
-"Sie müssen die obigen Fehler zuerst beheben, bevor Sie eintragen können."
-
-#: lib/index.tcl:6
-msgid "Unable to unlock the index."
-msgstr "Bereitstellung kann nicht wieder freigegeben werden."
-
-#: lib/index.tcl:15
-msgid "Index Error"
-msgstr "Fehler in Bereitstellung"
-
-#: lib/index.tcl:17
-msgid ""
-"Updating the Git index failed.  A rescan will be automatically started to "
-"resynchronize git-gui."
-msgstr ""
-"Das Aktualisieren der Git-Bereitstellung ist fehlgeschlagen. Eine allgemeine "
-"Git-Aktualisierung wird jetzt gestartet, um git-gui wieder mit git zu "
-"synchronisieren."
-
-#: lib/index.tcl:28
-msgid "Continue"
-msgstr "Fortsetzen"
-
-#: lib/index.tcl:31
-msgid "Unlock Index"
-msgstr "Bereitstellung freigeben"
-
-#: lib/index.tcl:289
 #, tcl-format
-msgid "Unstaging %s from commit"
-msgstr "Datei »%s« aus der Bereitstellung herausnehmen"
+msgid "%s: warning"
+msgstr "%s: Warnung"
 
-#: lib/index.tcl:328
-msgid "Ready to commit."
-msgstr "Bereit zum Eintragen."
-
-#: lib/index.tcl:341
+#: lib/error.tcl:80
 #, tcl-format
-msgid "Adding %s"
-msgstr "»%s« hinzufügen..."
+msgid "%s hook failed:"
+msgstr "%s hook fehlgeschlagen:"
 
-#: lib/index.tcl:398
-#, tcl-format
-msgid "Revert changes in file %s?"
-msgstr "Änderungen in Datei »%s« verwerfen?"
-
-#: lib/index.tcl:400
-#, tcl-format
-msgid "Revert changes in these %i files?"
-msgstr "Änderungen in den gewählten %i Dateien verwerfen?"
-
-#: lib/index.tcl:408
-msgid "Any unstaged changes will be permanently lost by the revert."
+#: lib/error.tcl:96
+msgid "You must correct the above errors before committing."
 msgstr ""
-"Alle nicht bereitgestellten Änderungen werden beim Verwerfen verloren gehen."
-
-#: lib/index.tcl:411
-msgid "Do Nothing"
-msgstr "Nichts tun"
-
-#: lib/index.tcl:429
-msgid "Reverting selected files"
-msgstr "Änderungen in gewählten Dateien verwerfen"
+"Sie müssen die obigen Fehler zuerst beheben, bevor Sie committen können."
 
-#: lib/index.tcl:433
+#: lib/error.tcl:116
 #, tcl-format
-msgid "Reverting %s"
-msgstr "Änderungen in %s verwerfen"
+msgid "%s (%s): error"
+msgstr "%s (%s): Fehler"
 
 #: lib/merge.tcl:13
 msgid ""
@@ -1786,7 +2732,7 @@ msgid ""
 msgstr ""
 "Zusammenführen kann nicht gleichzeitig mit Nachbessern durchgeführt werden.\n"
 "\n"
-"Sie müssen zuerst die Nachbesserungs-Version abschließen, bevor Sie "
+"Sie müssen zuerst den Nachbesserungs-Commit abschließen, bevor Sie "
 "zusammenführen können.\n"
 
 #: lib/merge.tcl:27
@@ -1798,9 +2744,9 @@ msgid ""
 "\n"
 "The rescan will be automatically started now.\n"
 msgstr ""
-"Der letzte geladene Status stimmt nicht mehr mit dem Projektarchiv überein.\n"
+"Der letzte geladene Status stimmt nicht mehr mit dem Repository überein.\n"
 "\n"
-"Ein anderes Git-Programm hat das Projektarchiv seit dem letzten Laden "
+"Ein anderes Git-Programm hat das Repository seit dem letzten Laden "
 "geändert.  Vor einem Zusammenführen muss neu geladen werden.\n"
 "\n"
 "Es wird gleich neu geladen.\n"
@@ -1817,10 +2763,11 @@ msgid ""
 msgstr ""
 "Zusammenführung mit Konflikten.\n"
 "\n"
-"Die Datei »%s« enthält Konflikte beim Zusammenführen. Sie müssen diese "
-"Konflikte per Hand auflösen. Anschließend müssen Sie die Datei wieder "
-"bereitstellen und eintragen, um die Zusammenführung abzuschließen. Erst "
-"danach kann eine neue Zusammenführung begonnen werden.\n"
+"Die Datei »%s« enthält Konflikte beim Zusammenführen.\n"
+"\n"
+"Sie müssen diese Konflikte per Hand auflösen. Anschließend müssen Sie die "
+"Datei wieder bereitstellen und committen, um die Zusammenführung "
+"abzuschließen. Erst danach kann eine neue Zusammenführung begonnen werden.\n"
 
 #: lib/merge.tcl:55
 #, tcl-format
@@ -1834,39 +2781,45 @@ msgid ""
 msgstr ""
 "Es liegen Änderungen vor.\n"
 "\n"
-"Die Datei »%s« wurde geändert.  Sie sollten zuerst die bereitgestellte "
-"Version abschließen, bevor Sie eine Zusammenführung beginnen.  Mit dieser "
-"Reihenfolge können Sie mögliche Konflikte beim Zusammenführen wesentlich "
-"einfacher beheben oder abbrechen.\n"
+"Die Datei »%s« wurde geändert.\n"
+"\n"
+"Sie sollten zuerst den bereitgestellten Commit abschließen, bevor Sie eine "
+"Zusammenführung beginnen.  Mit dieser Reihenfolge können Sie mögliche "
+"Konflikte beim Zusammenführen wesentlich einfacher beheben oder abbrechen.\n"
 
-#: lib/merge.tcl:107
+#: lib/merge.tcl:108
 #, tcl-format
 msgid "%s of %s"
 msgstr "%s von %s"
 
-#: lib/merge.tcl:120
+#: lib/merge.tcl:126
 #, tcl-format
 msgid "Merging %s and %s..."
 msgstr "Zusammenführen von %s und %s..."
 
-#: lib/merge.tcl:131
+#: lib/merge.tcl:137
 msgid "Merge completed successfully."
 msgstr "Zusammenführen erfolgreich abgeschlossen."
 
-#: lib/merge.tcl:133
+#: lib/merge.tcl:139
 msgid "Merge failed.  Conflict resolution is required."
 msgstr "Zusammenführen fehlgeschlagen. Konfliktauflösung ist notwendig."
 
-#: lib/merge.tcl:158
+#: lib/merge.tcl:156
+#, tcl-format
+msgid "%s (%s): Merge"
+msgstr "%s (%s): Zusammenführen"
+
+#: lib/merge.tcl:164
 #, tcl-format
 msgid "Merge Into %s"
 msgstr "Zusammenführen in »%s«"
 
-#: lib/merge.tcl:177
+#: lib/merge.tcl:183
 msgid "Revision To Merge"
 msgstr "Zusammenzuführende Version"
 
-#: lib/merge.tcl:212
+#: lib/merge.tcl:218
 msgid ""
 "Cannot abort while amending.\n"
 "\n"
@@ -1874,9 +2827,9 @@ msgid ""
 msgstr ""
 "Abbruch der Nachbesserung ist nicht möglich.\n"
 "\n"
-"Sie müssen die Nachbesserung der Version abschließen.\n"
+"Sie müssen die Nachbesserung diese Commits abschließen.\n"
 
-#: lib/merge.tcl:222
+#: lib/merge.tcl:228
 msgid ""
 "Abort merge?\n"
 "\n"
@@ -1886,12 +2839,11 @@ msgid ""
 msgstr ""
 "Zusammenführen abbrechen?\n"
 "\n"
-"Wenn Sie abbrechen, gehen alle noch nicht eingetragenen Änderungen "
-"verloren.\n"
+"Wenn Sie abbrechen, gehen alle noch nicht committeten Änderungen verloren.\n"
 "\n"
 "Zusammenführen jetzt abbrechen?"
 
-#: lib/merge.tcl:228
+#: lib/merge.tcl:234
 msgid ""
 "Reset changes?\n"
 "\n"
@@ -1899,694 +2851,24 @@ msgid ""
 "\n"
 "Continue with resetting the current changes?"
 msgstr ""
-"Änderungen zurücksetzen?\n"
+"Änderungen verwerfen?\n"
 "\n"
-"Wenn Sie zurücksetzen, gehen alle noch nicht eingetragenen Änderungen "
-"verloren.\n"
+"Alle noch nicht committeten Änderungen würden verloren gehen.\n"
 "\n"
-"Änderungen jetzt zurücksetzen?"
+"Änderungen jetzt verwerfen?"
 
-#: lib/merge.tcl:239
+#: lib/merge.tcl:246
 msgid "Aborting"
 msgstr "Abbruch"
 
-#: lib/merge.tcl:239
+#: lib/merge.tcl:247
 msgid "files reset"
 msgstr "Dateien zurückgesetzt"
 
-#: lib/merge.tcl:267
+#: lib/merge.tcl:277
 msgid "Abort failed."
 msgstr "Abbruch fehlgeschlagen."
 
-#: lib/merge.tcl:269
+#: lib/merge.tcl:279
 msgid "Abort completed.  Ready."
 msgstr "Abbruch durchgeführt. Bereit."
-
-#: lib/mergetool.tcl:8
-msgid "Force resolution to the base version?"
-msgstr "Konflikt durch Basisversion ersetzen?"
-
-#: lib/mergetool.tcl:9
-msgid "Force resolution to this branch?"
-msgstr "Konflikt durch diesen Zweig ersetzen?"
-
-#: lib/mergetool.tcl:10
-msgid "Force resolution to the other branch?"
-msgstr "Konflikt durch anderen Zweig ersetzen?"
-
-#: lib/mergetool.tcl:14
-#, tcl-format
-msgid ""
-"Note that the diff shows only conflicting changes.\n"
-"\n"
-"%s will be overwritten.\n"
-"\n"
-"This operation can be undone only by restarting the merge."
-msgstr ""
-"Hinweis: Der Vergleich zeigt nur konfliktverursachende Änderungen an.\n"
-"\n"
-"»%s« wird überschrieben.\n"
-"\n"
-"Diese Operation kann nur rückgängig gemacht werden, wenn die\n"
-"Zusammenführung erneut gestartet wird."
-
-#: lib/mergetool.tcl:45
-#, tcl-format
-msgid "File %s seems to have unresolved conflicts, still stage?"
-msgstr "Datei »%s« hat nicht aufgelöste Konflikte. Trotzdem bereitstellen?"
-
-#: lib/mergetool.tcl:60
-#, tcl-format
-msgid "Adding resolution for %s"
-msgstr "Auflösung hinzugefügt für %s"
-
-#: lib/mergetool.tcl:141
-msgid "Cannot resolve deletion or link conflicts using a tool"
-msgstr ""
-"Konflikte durch gelöschte Dateien oder symbolische Links können nicht durch "
-"das Zusamenführungswerkzeug gelöst werden."
-
-#: lib/mergetool.tcl:146
-msgid "Conflict file does not exist"
-msgstr "Konflikt-Datei existiert nicht"
-
-#: lib/mergetool.tcl:264
-#, tcl-format
-msgid "Not a GUI merge tool: '%s'"
-msgstr "Kein GUI Zusammenführungswerkzeug: »%s«"
-
-#: lib/mergetool.tcl:268
-#, tcl-format
-msgid "Unsupported merge tool '%s'"
-msgstr "Unbekanntes Zusammenführungswerkzeug: »%s«"
-
-#: lib/mergetool.tcl:303
-msgid "Merge tool is already running, terminate it?"
-msgstr "Zusammenführungswerkzeug läuft bereits. Soll es abgebrochen werden?"
-
-#: lib/mergetool.tcl:323
-#, tcl-format
-msgid ""
-"Error retrieving versions:\n"
-"%s"
-msgstr ""
-"Fehler beim Abrufen der Dateiversionen:\n"
-"%s"
-
-#: lib/mergetool.tcl:343
-#, tcl-format
-msgid ""
-"Could not start the merge tool:\n"
-"\n"
-"%s"
-msgstr ""
-"Zusammenführungswerkzeug konnte nicht gestartet werden:\n"
-"\n"
-"%s"
-
-#: lib/mergetool.tcl:347
-msgid "Running merge tool..."
-msgstr "Zusammenführungswerkzeug starten..."
-
-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
-msgid "Merge tool failed."
-msgstr "Zusammenführungswerkzeug fehlgeschlagen."
-
-#: lib/option.tcl:11
-#, tcl-format
-msgid "Invalid global encoding '%s'"
-msgstr "Ungültige globale Zeichenkodierung »%s«"
-
-#: lib/option.tcl:19
-#, tcl-format
-msgid "Invalid repo encoding '%s'"
-msgstr "Ungültige Archiv-Zeichenkodierung »%s«"
-
-#: lib/option.tcl:117
-msgid "Restore Defaults"
-msgstr "Voreinstellungen wiederherstellen"
-
-#: lib/option.tcl:121
-msgid "Save"
-msgstr "Speichern"
-
-#: lib/option.tcl:131
-#, tcl-format
-msgid "%s Repository"
-msgstr "Projektarchiv %s"
-
-#: lib/option.tcl:132
-msgid "Global (All Repositories)"
-msgstr "Global (Alle Projektarchive)"
-
-#: lib/option.tcl:138
-msgid "User Name"
-msgstr "Benutzername"
-
-#: lib/option.tcl:139
-msgid "Email Address"
-msgstr "E-Mail-Adresse"
-
-#: lib/option.tcl:141
-msgid "Summarize Merge Commits"
-msgstr "Zusammenführungs-Versionen zusammenfassen"
-
-#: lib/option.tcl:142
-msgid "Merge Verbosity"
-msgstr "Ausführlichkeit der Zusammenführen-Meldungen"
-
-#: lib/option.tcl:143
-msgid "Show Diffstat After Merge"
-msgstr "Vergleichsstatistik nach Zusammenführen anzeigen"
-
-#: lib/option.tcl:144
-msgid "Use Merge Tool"
-msgstr "Zusammenführungswerkzeug"
-
-#: lib/option.tcl:146
-msgid "Trust File Modification Timestamps"
-msgstr "Auf Dateiänderungsdatum verlassen"
-
-#: lib/option.tcl:147
-msgid "Prune Tracking Branches During Fetch"
-msgstr "Übernahmezweige aufräumen während Anforderung"
-
-#: lib/option.tcl:148
-msgid "Match Tracking Branches"
-msgstr "Passend zu Ãœbernahmezweig"
-
-#: lib/option.tcl:149
-msgid "Blame Copy Only On Changed Files"
-msgstr "Kopie-Annotieren nur bei geänderten Dateien"
-
-#: lib/option.tcl:150
-msgid "Minimum Letters To Blame Copy On"
-msgstr "Mindestzahl Zeichen für Kopie-Annotieren"
-
-#: lib/option.tcl:151
-msgid "Blame History Context Radius (days)"
-msgstr "Anzahl Tage für Historien-Kontext"
-
-#: lib/option.tcl:152
-msgid "Number of Diff Context Lines"
-msgstr "Anzahl der Kontextzeilen beim Vergleich"
-
-#: lib/option.tcl:153
-msgid "Commit Message Text Width"
-msgstr "Textbreite der Versionsbeschreibung"
-
-#: lib/option.tcl:154
-msgid "New Branch Name Template"
-msgstr "Namensvorschlag für neue Zweige"
-
-#: lib/option.tcl:155
-msgid "Default File Contents Encoding"
-msgstr "Voreingestellte Zeichenkodierung"
-
-#: lib/option.tcl:203
-msgid "Change"
-msgstr "Ändern"
-
-#: lib/option.tcl:230
-msgid "Spelling Dictionary:"
-msgstr "Wörterbuch Rechtschreibprüfung:"
-
-#: lib/option.tcl:254
-msgid "Change Font"
-msgstr "Schriftart ändern"
-
-#: lib/option.tcl:258
-#, tcl-format
-msgid "Choose %s"
-msgstr "%s wählen"
-
-#: lib/option.tcl:264
-msgid "pt."
-msgstr "pt."
-
-#: lib/option.tcl:278
-msgid "Preferences"
-msgstr "Einstellungen"
-
-#: lib/option.tcl:314
-msgid "Failed to completely save options:"
-msgstr "Optionen konnten nicht gespeichert werden:"
-
-#: lib/remote_add.tcl:19
-msgid "Add Remote"
-msgstr "Externes Archiv hinzufügen"
-
-#: lib/remote_add.tcl:24
-msgid "Add New Remote"
-msgstr "Neues externes Archiv hinzufügen"
-
-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
-msgid "Add"
-msgstr "Hinzufügen"
-
-#: lib/remote_add.tcl:37
-msgid "Remote Details"
-msgstr "Einzelheiten des externen Archivs"
-
-#: lib/remote_add.tcl:50
-msgid "Location:"
-msgstr "Adresse:"
-
-#: lib/remote_add.tcl:62
-msgid "Further Action"
-msgstr "Weitere Aktion jetzt"
-
-#: lib/remote_add.tcl:65
-msgid "Fetch Immediately"
-msgstr "Gleich anfordern"
-
-#: lib/remote_add.tcl:71
-msgid "Initialize Remote Repository and Push"
-msgstr "Externes Archiv initialisieren und dahin versenden"
-
-#: lib/remote_add.tcl:77
-msgid "Do Nothing Else Now"
-msgstr "Nichts tun"
-
-#: lib/remote_add.tcl:101
-msgid "Please supply a remote name."
-msgstr "Bitte geben Sie einen Namen des externen Archivs an."
-
-#: lib/remote_add.tcl:114
-#, tcl-format
-msgid "'%s' is not an acceptable remote name."
-msgstr "»%s« ist kein zulässiger Name eines externen Archivs."
-
-#: lib/remote_add.tcl:125
-#, tcl-format
-msgid "Failed to add remote '%s' of location '%s'."
-msgstr "Fehler beim Hinzufügen des externen Archivs »%s« aus Herkunftsort »%s«."
-
-#: lib/remote_add.tcl:133 lib/transport.tcl:6
-#, tcl-format
-msgid "fetch %s"
-msgstr "»%s« anfordern"
-
-#: lib/remote_add.tcl:134
-#, tcl-format
-msgid "Fetching the %s"
-msgstr "»%s« anfordern"
-
-#: lib/remote_add.tcl:157
-#, tcl-format
-msgid "Do not know how to initialize repository at location '%s'."
-msgstr "Initialisieren eines externen Archivs an Adresse »%s« ist nicht möglich."
-
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
-#: lib/transport.tcl:81
-#, tcl-format
-msgid "push %s"
-msgstr "»%s« versenden..."
-
-#: lib/remote_add.tcl:164
-#, tcl-format
-msgid "Setting up the %s (at %s)"
-msgstr "Einrichten von »%s« an »%s«"
-
-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
-msgid "Delete Branch Remotely"
-msgstr "Zweig in externem Archiv löschen"
-
-#: lib/remote_branch_delete.tcl:47
-msgid "From Repository"
-msgstr "In Projektarchiv"
-
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
-msgid "Remote:"
-msgstr "Externes Archiv:"
-
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
-msgid "Arbitrary Location:"
-msgstr "Adresse:"
-
-#: lib/remote_branch_delete.tcl:84
-msgid "Branches"
-msgstr "Zweige"
-
-#: lib/remote_branch_delete.tcl:109
-msgid "Delete Only If"
-msgstr "Nur löschen, wenn"
-
-#: lib/remote_branch_delete.tcl:111
-msgid "Merged Into:"
-msgstr "Zusammengeführt mit:"
-
-#: lib/remote_branch_delete.tcl:152
-msgid "A branch is required for 'Merged Into'."
-msgstr "Für »Zusammenführen mit« muss ein Zweig angegeben werden."
-
-#: lib/remote_branch_delete.tcl:184
-#, tcl-format
-msgid ""
-"The following branches are not completely merged into %s:\n"
-"\n"
-" - %s"
-msgstr ""
-"Folgende Zweige sind noch nicht mit »%s« zusammengeführt:\n"
-"\n"
-" - %s"
-
-#: lib/remote_branch_delete.tcl:189
-#, tcl-format
-msgid ""
-"One or more of the merge tests failed because you have not fetched the "
-"necessary commits.  Try fetching from %s first."
-msgstr ""
-"Ein oder mehrere Zusammenführungen sind fehlgeschlagen, da Sie nicht die "
-"notwendigen Versionen vorher angefordert haben.  Sie sollten versuchen, "
-"zuerst von »%s« anzufordern."
-
-#: lib/remote_branch_delete.tcl:207
-msgid "Please select one or more branches to delete."
-msgstr "Bitte wählen Sie mindestens einen Zweig, der gelöscht werden soll."
-
-#: lib/remote_branch_delete.tcl:226
-#, tcl-format
-msgid "Deleting branches from %s"
-msgstr "Zweige auf »%s« werden gelöscht"
-
-#: lib/remote_branch_delete.tcl:292
-msgid "No repository selected."
-msgstr "Kein Projektarchiv ausgewählt."
-
-#: lib/remote_branch_delete.tcl:297
-#, tcl-format
-msgid "Scanning %s..."
-msgstr "»%s« laden..."
-
-#: lib/remote.tcl:163
-msgid "Remove Remote"
-msgstr "Externes Archiv entfernen"
-
-#: lib/remote.tcl:168
-msgid "Prune from"
-msgstr "Aufräumen von"
-
-#: lib/remote.tcl:173
-msgid "Fetch from"
-msgstr "Anfordern von"
-
-#: lib/remote.tcl:215
-msgid "Push to"
-msgstr "Versenden nach"
-
-#: lib/search.tcl:21
-msgid "Find:"
-msgstr "Suchen:"
-
-#: lib/search.tcl:23
-msgid "Next"
-msgstr "Nächster"
-
-#: lib/search.tcl:24
-msgid "Prev"
-msgstr "Voriger"
-
-#: lib/search.tcl:25
-msgid "Case-Sensitive"
-msgstr "Groß-/Kleinschreibung unterscheiden"
-
-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
-msgid "Cannot write shortcut:"
-msgstr "Fehler beim Schreiben der Verknüpfung:"
-
-#: lib/shortcut.tcl:137
-msgid "Cannot write icon:"
-msgstr "Fehler beim Erstellen des Icons:"
-
-#: lib/spellcheck.tcl:57
-msgid "Unsupported spell checker"
-msgstr "Rechtschreibprüfungsprogramm nicht unterstützt"
-
-#: lib/spellcheck.tcl:65
-msgid "Spell checking is unavailable"
-msgstr "Rechtschreibprüfung nicht verfügbar"
-
-#: lib/spellcheck.tcl:68
-msgid "Invalid spell checking configuration"
-msgstr "Unbenutzbare Konfiguration der Rechtschreibprüfung"
-
-#: lib/spellcheck.tcl:70
-#, tcl-format
-msgid "Reverting dictionary to %s."
-msgstr "Wörterbuch auf %s zurückgesetzt."
-
-#: lib/spellcheck.tcl:73
-msgid "Spell checker silently failed on startup"
-msgstr "Rechtschreibprüfungsprogramm mit Fehler abgebrochen"
-
-#: lib/spellcheck.tcl:80
-msgid "Unrecognized spell checker"
-msgstr "Unbekanntes Rechtschreibprüfungsprogramm"
-
-#: lib/spellcheck.tcl:186
-msgid "No Suggestions"
-msgstr "Keine Vorschläge"
-
-#: lib/spellcheck.tcl:388
-msgid "Unexpected EOF from spell checker"
-msgstr "Unerwartetes EOF vom Rechtschreibprüfungsprogramm"
-
-#: lib/spellcheck.tcl:392
-msgid "Spell Checker Failed"
-msgstr "Rechtschreibprüfung fehlgeschlagen"
-
-#: lib/sshkey.tcl:31
-msgid "No keys found."
-msgstr "Keine Schlüssel gefunden."
-
-#: lib/sshkey.tcl:34
-#, tcl-format
-msgid "Found a public key in: %s"
-msgstr "Öffentlicher Schlüssel gefunden in: %s"
-
-#: lib/sshkey.tcl:40
-msgid "Generate Key"
-msgstr "Schlüssel erzeugen"
-
-#: lib/sshkey.tcl:56
-msgid "Copy To Clipboard"
-msgstr "In Zwischenablage kopieren"
-
-#: lib/sshkey.tcl:70
-msgid "Your OpenSSH Public Key"
-msgstr "Ihr OpenSSH öffenlicher Schlüssel"
-
-#: lib/sshkey.tcl:78
-msgid "Generating..."
-msgstr "Erzeugen..."
-
-#: lib/sshkey.tcl:84
-#, tcl-format
-msgid ""
-"Could not start ssh-keygen:\n"
-"\n"
-"%s"
-msgstr ""
-"Konnte »ssh-keygen« nicht starten:\n"
-"\n"
-"%s"
-
-#: lib/sshkey.tcl:111
-msgid "Generation failed."
-msgstr "Schlüsselerzeugung fehlgeschlagen."
-
-#: lib/sshkey.tcl:118
-msgid "Generation succeeded, but no keys found."
-msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden."
-
-#: lib/sshkey.tcl:121
-#, tcl-format
-msgid "Your key is in: %s"
-msgstr "Ihr Schlüssel ist abgelegt in: %s"
-
-#: lib/status_bar.tcl:83
-#, tcl-format
-msgid "%s ... %*i of %*i %s (%3i%%)"
-msgstr "%s ... %*i von %*i %s (%3i%%)"
-
-#: lib/tools_dlg.tcl:22
-msgid "Add Tool"
-msgstr "Werkzeug hinzufügen"
-
-#: lib/tools_dlg.tcl:28
-msgid "Add New Tool Command"
-msgstr "Neues Kommando für Werkzeug hinzufügen"
-
-#: lib/tools_dlg.tcl:33
-msgid "Add globally"
-msgstr "Global hinzufügen"
-
-#: lib/tools_dlg.tcl:45
-msgid "Tool Details"
-msgstr "Einzelheiten des Werkzeugs"
-
-#: lib/tools_dlg.tcl:48
-msgid "Use '/' separators to create a submenu tree:"
-msgstr "Benutzen Sie einen Schrägstrich »/«, um Untermenüs zu erstellen:"
-
-#: lib/tools_dlg.tcl:61
-msgid "Command:"
-msgstr "Kommando:"
-
-#: lib/tools_dlg.tcl:74
-msgid "Show a dialog before running"
-msgstr "Bestätigungsfrage vor Starten anzeigen"
-
-#: lib/tools_dlg.tcl:80
-msgid "Ask the user to select a revision (sets $REVISION)"
-msgstr "Benutzer nach Version fragen (setzt $REVISION)"
-
-#: lib/tools_dlg.tcl:85
-msgid "Ask the user for additional arguments (sets $ARGS)"
-msgstr "Benutzer nach zusätzlichen Argumenten fragen (setzt $ARGS)"
-
-#: lib/tools_dlg.tcl:92
-msgid "Don't show the command output window"
-msgstr "Kein Ausgabefenster zeigen"
-
-#: lib/tools_dlg.tcl:97
-msgid "Run only if a diff is selected ($FILENAME not empty)"
-msgstr "Nur starten, wenn ein Vergleich gewählt ist ($FILENAME ist nicht leer)"
-
-#: lib/tools_dlg.tcl:121
-msgid "Please supply a name for the tool."
-msgstr "Bitte geben Sie einen Werkzeugnamen an."
-
-#: lib/tools_dlg.tcl:129
-#, tcl-format
-msgid "Tool '%s' already exists."
-msgstr "Werkzeug »%s« existiert bereits."
-
-#: lib/tools_dlg.tcl:151
-#, tcl-format
-msgid ""
-"Could not add tool:\n"
-"%s"
-msgstr ""
-"Werkzeug konnte nicht hinzugefügt werden:\n"
-"\n"
-"%s"
-
-#: lib/tools_dlg.tcl:190
-msgid "Remove Tool"
-msgstr "Werkzeug entfernen"
-
-#: lib/tools_dlg.tcl:196
-msgid "Remove Tool Commands"
-msgstr "Werkzeugkommandos entfernen"
-
-#: lib/tools_dlg.tcl:200
-msgid "Remove"
-msgstr "Entfernen"
-
-#: lib/tools_dlg.tcl:236
-msgid "(Blue denotes repository-local tools)"
-msgstr "(Werkzeuge für lokales Archiv werden in Blau angezeigt)"
-
-#: lib/tools_dlg.tcl:297
-#, tcl-format
-msgid "Run Command: %s"
-msgstr "Kommando aufrufen: %s"
-
-#: lib/tools_dlg.tcl:311
-msgid "Arguments"
-msgstr "Argumente"
-
-#: lib/tools_dlg.tcl:348
-msgid "OK"
-msgstr "Ok"
-
-#: lib/tools.tcl:75
-#, tcl-format
-msgid "Running %s requires a selected file."
-msgstr "Um »%s« zu starten, muss eine Datei ausgewählt sein."
-
-#: lib/tools.tcl:90
-#, tcl-format
-msgid "Are you sure you want to run %s?"
-msgstr "Wollen Sie %s wirklich starten?"
-
-#: lib/tools.tcl:110
-#, tcl-format
-msgid "Tool: %s"
-msgstr "Werkzeug: %s"
-
-#: lib/tools.tcl:111
-#, tcl-format
-msgid "Running: %s"
-msgstr "Starten: %s"
-
-#: lib/tools.tcl:149
-#, tcl-format
-msgid "Tool completed successfully: %s"
-msgstr "Werkzeug erfolgreich abgeschlossen: %s"
-
-#: lib/tools.tcl:151
-#, tcl-format
-msgid "Tool failed: %s"
-msgstr "Werkzeug fehlgeschlagen: %s"
-
-#: lib/transport.tcl:7
-#, tcl-format
-msgid "Fetching new changes from %s"
-msgstr "Neue Änderungen von »%s« holen"
-
-#: lib/transport.tcl:18
-#, tcl-format
-msgid "remote prune %s"
-msgstr "Aufräumen von »%s«"
-
-#: lib/transport.tcl:19
-#, tcl-format
-msgid "Pruning tracking branches deleted from %s"
-msgstr "Übernahmezweige aufräumen und entfernen, die in »%s« gelöscht wurden"
-
-#: lib/transport.tcl:26
-#, tcl-format
-msgid "Pushing changes to %s"
-msgstr "Änderungen nach »%s« versenden"
-
-#: lib/transport.tcl:64
-#, tcl-format
-msgid "Mirroring to %s"
-msgstr "Spiegeln nach %s"
-
-#: lib/transport.tcl:82
-#, tcl-format
-msgid "Pushing %s %s to %s"
-msgstr "%s %s nach %s versenden"
-
-#: lib/transport.tcl:100
-msgid "Push Branches"
-msgstr "Zweige versenden"
-
-#: lib/transport.tcl:114
-msgid "Source Branches"
-msgstr "Lokale Zweige"
-
-#: lib/transport.tcl:131
-msgid "Destination Repository"
-msgstr "Ziel-Projektarchiv"
-
-#: lib/transport.tcl:169
-msgid "Transfer Options"
-msgstr "Netzwerk-Einstellungen"
-
-#: lib/transport.tcl:171
-msgid "Force overwrite existing branch (may discard changes)"
-msgstr ""
-"Überschreiben von existierenden Zweigen erzwingen (könnte Änderungen löschen)"
-
-#: lib/transport.tcl:175
-msgid "Use thin pack (for slow network connections)"
-msgstr "Kompaktes Datenformat benutzen (für langsame Netzverbindungen)"
-
-#: lib/transport.tcl:179
-msgid "Include tags"
-msgstr "Mit Markierungen übertragen"
diff --git a/git-gui/po/git-gui.pot b/git-gui/po/git-gui.pot
index 0c94f9c2c6..b79ed4e133 100644
--- a/git-gui/po/git-gui.pot
+++ b/git-gui/po/git-gui.pot
@@ -8,41 +8,42 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-26 15:47-0800\n"
+"POT-Creation-Date: 2020-02-08 22:54+0100\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-Transfer-Encoding: 8bit\n"
 
-#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
-#: git-gui.sh:922
-msgid "git-gui: fatal error"
-msgstr ""
-
-#: git-gui.sh:743
+#: git-gui.sh:847
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr ""
 
-#: git-gui.sh:779
+#: git-gui.sh:901
 msgid "Main Font"
 msgstr ""
 
-#: git-gui.sh:780
+#: git-gui.sh:902
 msgid "Diff/Console Font"
 msgstr ""
 
-#: git-gui.sh:794
+#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053
+#: git-gui.sh:3212
+msgid "git-gui: fatal error"
+msgstr ""
+
+#: git-gui.sh:918
 msgid "Cannot find git in PATH."
 msgstr ""
 
-#: git-gui.sh:821
+#: git-gui.sh:945
 msgid "Cannot parse Git version string:"
 msgstr ""
 
-#: git-gui.sh:839
+#: git-gui.sh:970
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -54,473 +55,518 @@ msgid ""
 "Assume '%s' is version 1.5.0?\n"
 msgstr ""
 
-#: git-gui.sh:1128
+#: git-gui.sh:1267
 msgid "Git directory not found:"
 msgstr ""
 
-#: git-gui.sh:1146
+#: git-gui.sh:1301
 msgid "Cannot move to top of working directory:"
 msgstr ""
 
-#: git-gui.sh:1154
+#: git-gui.sh:1309
 msgid "Cannot use bare repository:"
 msgstr ""
 
-#: git-gui.sh:1162
+#: git-gui.sh:1317
 msgid "No working directory"
 msgstr ""
 
-#: git-gui.sh:1334 lib/checkout_op.tcl:306
+#: git-gui.sh:1491 lib/checkout_op.tcl:306
 msgid "Refreshing file status..."
 msgstr ""
 
-#: git-gui.sh:1390
+#: git-gui.sh:1551
 msgid "Scanning for modified files ..."
 msgstr ""
 
-#: git-gui.sh:1454
+#: git-gui.sh:1629
 msgid "Calling prepare-commit-msg hook..."
 msgstr ""
 
-#: git-gui.sh:1471
+#: git-gui.sh:1646
 msgid "Commit declined by prepare-commit-msg hook."
 msgstr ""
 
-#: git-gui.sh:1629 lib/browser.tcl:246
+#: git-gui.sh:1804 lib/browser.tcl:252
 msgid "Ready."
 msgstr ""
 
-#: git-gui.sh:1787
+#: git-gui.sh:1968
 #, tcl-format
-msgid "Displaying only %s of %s files."
+msgid ""
+"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s files."
 msgstr ""
 
-#: git-gui.sh:1913
+#: git-gui.sh:2091
 msgid "Unmodified"
 msgstr ""
 
-#: git-gui.sh:1915
+#: git-gui.sh:2093
 msgid "Modified, not staged"
 msgstr ""
 
-#: git-gui.sh:1916 git-gui.sh:1924
+#: git-gui.sh:2094 git-gui.sh:2106
 msgid "Staged for commit"
 msgstr ""
 
-#: git-gui.sh:1917 git-gui.sh:1925
+#: git-gui.sh:2095 git-gui.sh:2107
 msgid "Portions staged for commit"
 msgstr ""
 
-#: git-gui.sh:1918 git-gui.sh:1926
+#: git-gui.sh:2096 git-gui.sh:2108
 msgid "Staged for commit, missing"
 msgstr ""
 
-#: git-gui.sh:1920
+#: git-gui.sh:2098
 msgid "File type changed, not staged"
 msgstr ""
 
-#: git-gui.sh:1921
+#: git-gui.sh:2099 git-gui.sh:2100
+msgid "File type changed, old type staged for commit"
+msgstr ""
+
+#: git-gui.sh:2101
 msgid "File type changed, staged"
 msgstr ""
 
-#: git-gui.sh:1923
+#: git-gui.sh:2102
+msgid "File type change staged, modification not staged"
+msgstr ""
+
+#: git-gui.sh:2103
+msgid "File type change staged, file missing"
+msgstr ""
+
+#: git-gui.sh:2105
 msgid "Untracked, not staged"
 msgstr ""
 
-#: git-gui.sh:1928
+#: git-gui.sh:2110
 msgid "Missing"
 msgstr ""
 
-#: git-gui.sh:1929
+#: git-gui.sh:2111
 msgid "Staged for removal"
 msgstr ""
 
-#: git-gui.sh:1930
+#: git-gui.sh:2112
 msgid "Staged for removal, still present"
 msgstr ""
 
-#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
-#: git-gui.sh:1936 git-gui.sh:1937
+#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117
+#: git-gui.sh:2118 git-gui.sh:2119
 msgid "Requires merge resolution"
 msgstr ""
 
-#: git-gui.sh:1972
-msgid "Starting gitk... please wait..."
+#: git-gui.sh:2164
+msgid "Couldn't find gitk in PATH"
 msgstr ""
 
-#: git-gui.sh:1984
-msgid "Couldn't find gitk in PATH"
+#: git-gui.sh:2210 git-gui.sh:2245
+#, tcl-format
+msgid "Starting %s... please wait..."
 msgstr ""
 
-#: git-gui.sh:2043
+#: git-gui.sh:2224
 msgid "Couldn't find git gui in PATH"
 msgstr ""
 
-#: git-gui.sh:2455 lib/choose_repository.tcl:36
+#: git-gui.sh:2726 lib/choose_repository.tcl:53
 msgid "Repository"
 msgstr ""
 
-#: git-gui.sh:2456
+#: git-gui.sh:2727
 msgid "Edit"
 msgstr ""
 
-#: git-gui.sh:2458 lib/choose_rev.tcl:561
+#: git-gui.sh:2729 lib/choose_rev.tcl:567
 msgid "Branch"
 msgstr ""
 
-#: git-gui.sh:2461 lib/choose_rev.tcl:548
+#: git-gui.sh:2732 lib/choose_rev.tcl:554
 msgid "Commit@@noun"
 msgstr ""
 
-#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174
 msgid "Merge"
 msgstr ""
 
-#: git-gui.sh:2465 lib/choose_rev.tcl:557
+#: git-gui.sh:2736 lib/choose_rev.tcl:563
 msgid "Remote"
 msgstr ""
 
-#: git-gui.sh:2468
+#: git-gui.sh:2739
 msgid "Tools"
 msgstr ""
 
-#: git-gui.sh:2477
+#: git-gui.sh:2748
 msgid "Explore Working Copy"
 msgstr ""
 
-#: git-gui.sh:2483
+#: git-gui.sh:2763
+msgid "Git Bash"
+msgstr ""
+
+#: git-gui.sh:2772
 msgid "Browse Current Branch's Files"
 msgstr ""
 
-#: git-gui.sh:2487
+#: git-gui.sh:2776
 msgid "Browse Branch Files..."
 msgstr ""
 
-#: git-gui.sh:2492
+#: git-gui.sh:2781
 msgid "Visualize Current Branch's History"
 msgstr ""
 
-#: git-gui.sh:2496
+#: git-gui.sh:2785
 msgid "Visualize All Branch History"
 msgstr ""
 
-#: git-gui.sh:2503
+#: git-gui.sh:2792
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr ""
 
-#: git-gui.sh:2505
+#: git-gui.sh:2794
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr ""
 
-#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2799 lib/database.tcl:40
 msgid "Database Statistics"
 msgstr ""
 
-#: git-gui.sh:2513 lib/database.tcl:34
+#: git-gui.sh:2802 lib/database.tcl:33
 msgid "Compress Database"
 msgstr ""
 
-#: git-gui.sh:2516
+#: git-gui.sh:2805
 msgid "Verify Database"
 msgstr ""
 
-#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
-#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
+#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820
 msgid "Create Desktop Icon"
 msgstr ""
 
-#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217
 msgid "Quit"
 msgstr ""
 
-#: git-gui.sh:2547
+#: git-gui.sh:2836
 msgid "Undo"
 msgstr ""
 
-#: git-gui.sh:2550
+#: git-gui.sh:2839
 msgid "Redo"
 msgstr ""
 
-#: git-gui.sh:2554 git-gui.sh:3109
+#: git-gui.sh:2843 git-gui.sh:3461
 msgid "Cut"
 msgstr ""
 
-#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
+#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr ""
 
-#: git-gui.sh:2560 git-gui.sh:3115
+#: git-gui.sh:2849 git-gui.sh:3467
 msgid "Paste"
 msgstr ""
 
-#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
-#: lib/remote_branch_delete.tcl:38
+#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39
+#: lib/branch_delete.tcl:28
 msgid "Delete"
 msgstr ""
 
-#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
+#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71
 msgid "Select All"
 msgstr ""
 
-#: git-gui.sh:2576
+#: git-gui.sh:2865
 msgid "Create..."
 msgstr ""
 
-#: git-gui.sh:2582
+#: git-gui.sh:2871
 msgid "Checkout..."
 msgstr ""
 
-#: git-gui.sh:2588
+#: git-gui.sh:2877
 msgid "Rename..."
 msgstr ""
 
-#: git-gui.sh:2593
+#: git-gui.sh:2882
 msgid "Delete..."
 msgstr ""
 
-#: git-gui.sh:2598
+#: git-gui.sh:2887
 msgid "Reset..."
 msgstr ""
 
-#: git-gui.sh:2608
+#: git-gui.sh:2897
 msgid "Done"
 msgstr ""
 
-#: git-gui.sh:2610
+#: git-gui.sh:2899
 msgid "Commit@@verb"
 msgstr ""
 
-#: git-gui.sh:2619 git-gui.sh:3050
-msgid "New Commit"
-msgstr ""
-
-#: git-gui.sh:2627 git-gui.sh:3057
+#: git-gui.sh:2908 git-gui.sh:3400
 msgid "Amend Last Commit"
 msgstr ""
 
-#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101
 msgid "Rescan"
 msgstr ""
 
-#: git-gui.sh:2643
+#: git-gui.sh:2924
 msgid "Stage To Commit"
 msgstr ""
 
-#: git-gui.sh:2649
+#: git-gui.sh:2930
 msgid "Stage Changed Files To Commit"
 msgstr ""
 
-#: git-gui.sh:2655
+#: git-gui.sh:2936
 msgid "Unstage From Commit"
 msgstr ""
 
-#: git-gui.sh:2661 lib/index.tcl:412
+#: git-gui.sh:2942 lib/index.tcl:521
 msgid "Revert Changes"
 msgstr ""
 
-#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
+#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731
 msgid "Show Less Context"
 msgstr ""
 
-#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
+#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735
 msgid "Show More Context"
 msgstr ""
 
-#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
+#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485
 msgid "Sign Off"
 msgstr ""
 
-#: git-gui.sh:2696
+#: git-gui.sh:2977
 msgid "Local Merge..."
 msgstr ""
 
-#: git-gui.sh:2701
+#: git-gui.sh:2982
 msgid "Abort Merge..."
 msgstr ""
 
-#: git-gui.sh:2713 git-gui.sh:2741
+#: git-gui.sh:2994 git-gui.sh:3022
 msgid "Add..."
 msgstr ""
 
-#: git-gui.sh:2717
+#: git-gui.sh:2998
 msgid "Push..."
 msgstr ""
 
-#: git-gui.sh:2721
+#: git-gui.sh:3002
 msgid "Delete Branch..."
 msgstr ""
 
-#: git-gui.sh:2731 git-gui.sh:3292
+#: git-gui.sh:3012 git-gui.sh:3666
 msgid "Options..."
 msgstr ""
 
-#: git-gui.sh:2742
+#: git-gui.sh:3023
 msgid "Remove..."
 msgstr ""
 
-#: git-gui.sh:2751 lib/choose_repository.tcl:50
+#: git-gui.sh:3032 lib/choose_repository.tcl:67
 msgid "Help"
 msgstr ""
 
-#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61
+#: lib/choose_repository.tcl:70 lib/about.tcl:14
 #, tcl-format
 msgid "About %s"
 msgstr ""
 
-#: git-gui.sh:2783
+#: git-gui.sh:3064
 msgid "Online Documentation"
 msgstr ""
 
-#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73
 msgid "Show SSH Key"
 msgstr ""
 
-#: git-gui.sh:2893
+#: git-gui.sh:3097 git-gui.sh:3229
+msgid "usage:"
+msgstr ""
+
+#: git-gui.sh:3101 git-gui.sh:3233
+msgid "Usage"
+msgstr ""
+
+#: git-gui.sh:3182 lib/blame.tcl:575
+msgid "Error"
+msgstr ""
+
+#: git-gui.sh:3213
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr ""
 
-#: git-gui.sh:2926
+#: git-gui.sh:3246
 msgid "Current Branch:"
 msgstr ""
 
-#: git-gui.sh:2947
-msgid "Staged Changes (Will Commit)"
+#: git-gui.sh:3271
+msgid "Unstaged Changes"
 msgstr ""
 
-#: git-gui.sh:2967
-msgid "Unstaged Changes"
+#: git-gui.sh:3293
+msgid "Staged Changes (Will Commit)"
 msgstr ""
 
-#: git-gui.sh:3017
+#: git-gui.sh:3367
 msgid "Stage Changed"
 msgstr ""
 
-#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
+#: git-gui.sh:3386 lib/transport.tcl:137
 msgid "Push"
 msgstr ""
 
-#: git-gui.sh:3071
+#: git-gui.sh:3413
 msgid "Initial Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3072
+#: git-gui.sh:3414
 msgid "Amended Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3073
+#: git-gui.sh:3415
 msgid "Amended Initial Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3074
+#: git-gui.sh:3416
 msgid "Amended Merge Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3075
+#: git-gui.sh:3417
 msgid "Merge Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3076
+#: git-gui.sh:3418
 msgid "Commit Message:"
 msgstr ""
 
-#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
+#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73
 msgid "Copy All"
 msgstr ""
 
-#: git-gui.sh:3149 lib/blame.tcl:104
+#: git-gui.sh:3501 lib/blame.tcl:106
 msgid "File:"
 msgstr ""
 
-#: git-gui.sh:3255
+#: git-gui.sh:3549 lib/choose_repository.tcl:1100
+msgid "Open"
+msgstr ""
+
+#: git-gui.sh:3629
 msgid "Refresh"
 msgstr ""
 
-#: git-gui.sh:3276
+#: git-gui.sh:3650
 msgid "Decrease Font Size"
 msgstr ""
 
-#: git-gui.sh:3280
+#: git-gui.sh:3654
 msgid "Increase Font Size"
 msgstr ""
 
-#: git-gui.sh:3288 lib/blame.tcl:281
+#: git-gui.sh:3662 lib/blame.tcl:296
 msgid "Encoding"
 msgstr ""
 
-#: git-gui.sh:3299
+#: git-gui.sh:3673
 msgid "Apply/Reverse Hunk"
 msgstr ""
 
-#: git-gui.sh:3304
+#: git-gui.sh:3678
 msgid "Apply/Reverse Line"
 msgstr ""
 
-#: git-gui.sh:3323
+#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805
+msgid "Revert Hunk"
+msgstr ""
+
+#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812
+msgid "Revert Line"
+msgstr ""
+
+#: git-gui.sh:3694 git-gui.sh:3791
+msgid "Undo Last Revert"
+msgstr ""
+
+#: git-gui.sh:3713
 msgid "Run Merge Tool"
 msgstr ""
 
-#: git-gui.sh:3328
+#: git-gui.sh:3718
 msgid "Use Remote Version"
 msgstr ""
 
-#: git-gui.sh:3332
+#: git-gui.sh:3722
 msgid "Use Local Version"
 msgstr ""
 
-#: git-gui.sh:3336
+#: git-gui.sh:3726
 msgid "Revert To Base"
 msgstr ""
 
-#: git-gui.sh:3354
+#: git-gui.sh:3744
 msgid "Visualize These Changes In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3358
+#: git-gui.sh:3748
 msgid "Visualize Current Branch History In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3362
+#: git-gui.sh:3752
 msgid "Visualize All Branch History In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3367
+#: git-gui.sh:3757
 msgid "Start git gui In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3389
+#: git-gui.sh:3793
 msgid "Unstage Hunk From Commit"
 msgstr ""
 
-#: git-gui.sh:3391
+#: git-gui.sh:3797
 msgid "Unstage Lines From Commit"
 msgstr ""
 
-#: git-gui.sh:3393
+#: git-gui.sh:3798 git-gui.sh:3809
+msgid "Revert Lines"
+msgstr ""
+
+#: git-gui.sh:3800
 msgid "Unstage Line From Commit"
 msgstr ""
 
-#: git-gui.sh:3396
+#: git-gui.sh:3804
 msgid "Stage Hunk For Commit"
 msgstr ""
 
-#: git-gui.sh:3398
+#: git-gui.sh:3808
 msgid "Stage Lines For Commit"
 msgstr ""
 
-#: git-gui.sh:3400
+#: git-gui.sh:3811
 msgid "Stage Line For Commit"
 msgstr ""
 
-#: git-gui.sh:3424
+#: git-gui.sh:3861
 msgid "Initializing..."
 msgstr ""
 
-#: git-gui.sh:3541
+#: git-gui.sh:4017
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
@@ -531,14 +577,14 @@ msgid ""
 "\n"
 msgstr ""
 
-#: git-gui.sh:3570
+#: git-gui.sh:4046
 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 "Tcl binary distributed by Cygwin."
 msgstr ""
 
-#: git-gui.sh:3575
+#: git-gui.sh:4051
 #, tcl-format
 msgid ""
 "\n"
@@ -549,1846 +595,2072 @@ msgid ""
 "~/.gitconfig file.\n"
 msgstr ""
 
-#: lib/about.tcl:26
-msgid "git-gui - a graphical user interface for Git."
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
 msgstr ""
 
-#: lib/blame.tcl:72
-msgid "File Viewer"
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
 msgstr ""
 
-#: lib/blame.tcl:78
-msgid "Commit:"
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
 msgstr ""
 
-#: lib/blame.tcl:271
-msgid "Copy Commit"
+#: lib/spellcheck.tcl:70
+#, tcl-format
+msgid "Reverting dictionary to %s."
 msgstr ""
 
-#: lib/blame.tcl:275
-msgid "Find Text..."
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
 msgstr ""
 
-#: lib/blame.tcl:284
-msgid "Do Full Copy Detection"
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
 msgstr ""
 
-#: lib/blame.tcl:288
-msgid "Show History Context"
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
 msgstr ""
 
-#: lib/blame.tcl:291
-msgid "Blame Parent Commit"
+#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
 msgstr ""
 
-#: lib/blame.tcl:450
-#, tcl-format
-msgid "Reading %s..."
+#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
 msgstr ""
 
-#: lib/blame.tcl:557
-msgid "Loading copy/move tracking annotations..."
+#: lib/transport.tcl:6 lib/remote_add.tcl:132
+#, tcl-format
+msgid "fetch %s"
 msgstr ""
 
-#: lib/blame.tcl:577
-msgid "lines annotated"
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
 msgstr ""
 
-#: lib/blame.tcl:769
-msgid "Loading original location annotations..."
+#: lib/transport.tcl:18
+#, tcl-format
+msgid "remote prune %s"
 msgstr ""
 
-#: lib/blame.tcl:772
-msgid "Annotation complete."
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
 msgstr ""
 
-#: lib/blame.tcl:802
-msgid "Busy"
+#: lib/transport.tcl:25
+msgid "fetch all remotes"
 msgstr ""
 
-#: lib/blame.tcl:803
-msgid "Annotation process is already running."
+#: lib/transport.tcl:26
+msgid "Fetching new changes from all remotes"
 msgstr ""
 
-#: lib/blame.tcl:842
-msgid "Running thorough copy detection..."
+#: lib/transport.tcl:40
+msgid "remote prune all remotes"
 msgstr ""
 
-#: lib/blame.tcl:910
-msgid "Loading annotation..."
+#: lib/transport.tcl:41
+msgid "Pruning tracking branches deleted from all remotes"
 msgstr ""
 
-#: lib/blame.tcl:963
-msgid "Author:"
+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
+#: lib/remote_add.tcl:162
+#, tcl-format
+msgid "push %s"
 msgstr ""
 
-#: lib/blame.tcl:967
-msgid "Committer:"
+#: lib/transport.tcl:55
+#, tcl-format
+msgid "Pushing changes to %s"
 msgstr ""
 
-#: lib/blame.tcl:972
-msgid "Original File:"
+#: lib/transport.tcl:93
+#, tcl-format
+msgid "Mirroring to %s"
 msgstr ""
 
-#: lib/blame.tcl:1020
-msgid "Cannot find HEAD commit:"
+#: lib/transport.tcl:111
+#, tcl-format
+msgid "Pushing %s %s to %s"
 msgstr ""
 
-#: lib/blame.tcl:1075
-msgid "Cannot find parent commit:"
+#: lib/transport.tcl:132
+msgid "Push Branches"
 msgstr ""
 
-#: lib/blame.tcl:1090
-msgid "Unable to display parent"
+#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34
+#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32
+#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41
+#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43
+#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178
+msgid "Cancel"
 msgstr ""
 
-#: lib/blame.tcl:1091 lib/diff.tcl:320
-msgid "Error loading diff:"
+#: lib/transport.tcl:147
+msgid "Source Branches"
 msgstr ""
 
-#: lib/blame.tcl:1231
-msgid "Originally By:"
+#: lib/transport.tcl:162
+msgid "Destination Repository"
 msgstr ""
 
-#: lib/blame.tcl:1237
-msgid "In File:"
+#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51
+msgid "Remote:"
 msgstr ""
 
-#: lib/blame.tcl:1242
-msgid "Copied Or Moved Here By:"
+#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72
+msgid "Arbitrary Location:"
 msgstr ""
 
-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
-msgid "Checkout Branch"
+#: lib/transport.tcl:205
+msgid "Transfer Options"
 msgstr ""
 
-#: lib/branch_checkout.tcl:23
-msgid "Checkout"
+#: lib/transport.tcl:207
+msgid "Force overwrite existing branch (may discard changes)"
 msgstr ""
 
-#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
-#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
-#: lib/transport.tcl:108
-msgid "Cancel"
+#: lib/transport.tcl:211
+msgid "Use thin pack (for slow network connections)"
 msgstr ""
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
-msgid "Revision"
+#: lib/transport.tcl:215
+msgid "Include tags"
 msgstr ""
 
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
-msgid "Options"
+#: lib/transport.tcl:229
+#, tcl-format
+msgid "%s (%s): Push"
 msgstr ""
 
-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
-msgid "Fetch Tracking Branch"
+#: lib/checkout_op.tcl:85
+#, tcl-format
+msgid "Fetching %s from %s"
 msgstr ""
 
-#: lib/branch_checkout.tcl:44
-msgid "Detach From Local Branch"
+#: lib/checkout_op.tcl:133
+#, tcl-format
+msgid "fatal: Cannot resolve %s"
 msgstr ""
 
-#: lib/branch_create.tcl:22
-msgid "Create Branch"
+#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81
+#: lib/database.tcl:30
+msgid "Close"
 msgstr ""
 
-#: lib/branch_create.tcl:27
-msgid "Create New Branch"
+#: lib/checkout_op.tcl:175
+#, tcl-format
+msgid "Branch '%s' does not exist."
 msgstr ""
 
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
-msgid "Create"
+#: lib/checkout_op.tcl:194
+#, tcl-format
+msgid "Failed to configure simplified git-pull for '%s'."
 msgstr ""
 
-#: lib/branch_create.tcl:40
-msgid "Branch Name"
+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
+#, tcl-format
+msgid "Branch '%s' already exists."
 msgstr ""
 
-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
-msgid "Name:"
+#: lib/checkout_op.tcl:229
+#, tcl-format
+msgid ""
+"Branch '%s' already exists.\n"
+"\n"
+"It cannot fast-forward to %s.\n"
+"A merge is required."
 msgstr ""
 
-#: lib/branch_create.tcl:58
-msgid "Match Tracking Branch Name"
+#: lib/checkout_op.tcl:243
+#, tcl-format
+msgid "Merge strategy '%s' not supported."
 msgstr ""
 
-#: lib/branch_create.tcl:66
-msgid "Starting Revision"
+#: lib/checkout_op.tcl:262
+#, tcl-format
+msgid "Failed to update '%s'."
 msgstr ""
 
-#: lib/branch_create.tcl:72
-msgid "Update Existing Branch:"
+#: lib/checkout_op.tcl:274
+msgid "Staging area (index) is already locked."
 msgstr ""
 
-#: lib/branch_create.tcl:75
-msgid "No"
+#: lib/checkout_op.tcl:289
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan.  A "
+"rescan must be performed before the current branch can be changed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/branch_create.tcl:80
-msgid "Fast Forward Only"
+#: lib/checkout_op.tcl:345
+#, tcl-format
+msgid "Updating working directory to '%s'..."
 msgstr ""
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
-msgid "Reset"
+#: lib/checkout_op.tcl:346
+msgid "files checked out"
 msgstr ""
 
-#: lib/branch_create.tcl:97
-msgid "Checkout After Creation"
+#: lib/checkout_op.tcl:377
+#, tcl-format
+msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr ""
 
-#: lib/branch_create.tcl:131
-msgid "Please select a tracking branch."
+#: lib/checkout_op.tcl:378
+msgid "File level merge required."
 msgstr ""
 
-#: lib/branch_create.tcl:140
+#: lib/checkout_op.tcl:382
 #, tcl-format
-msgid "Tracking branch %s is not a branch in the remote repository."
+msgid "Staying on branch '%s'."
 msgstr ""
 
-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
-msgid "Please supply a branch name."
+#: lib/checkout_op.tcl:453
+msgid ""
+"You are no longer on a local branch.\n"
+"\n"
+"If you wanted to be on a branch, create one now starting from 'This Detached "
+"Checkout'."
 msgstr ""
 
-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508
 #, tcl-format
-msgid "'%s' is not an acceptable branch name."
+msgid "Checked out '%s'."
 msgstr ""
 
-#: lib/branch_delete.tcl:15
-msgid "Delete Branch"
+#: lib/checkout_op.tcl:536
+#, tcl-format
+msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr ""
 
-#: lib/branch_delete.tcl:20
-msgid "Delete Local Branch"
+#: lib/checkout_op.tcl:558
+msgid "Recovering lost commits may not be easy."
 msgstr ""
 
-#: lib/branch_delete.tcl:37
-msgid "Local Branches"
+#: lib/checkout_op.tcl:563
+#, tcl-format
+msgid "Reset '%s'?"
 msgstr ""
 
-#: lib/branch_delete.tcl:52
-msgid "Delete Only If Merged Into"
+#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170
+msgid "Visualize"
 msgstr ""
 
-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
+#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85
+msgid "Reset"
 msgstr ""
 
-#: lib/branch_delete.tcl:103
+#: lib/checkout_op.tcl:636
 #, tcl-format
-msgid "The following branches are not completely merged into %s:"
-msgstr ""
-
-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
 msgid ""
-"Recovering deleted branches is difficult.\n"
+"Failed to set current branch.\n"
 "\n"
-"Delete the selected branches?"
+"This working directory is only partially switched.  We successfully updated "
+"your files, but failed to update an internal Git file.\n"
+"\n"
+"This should not have occurred.  %s will now close and give up."
 msgstr ""
 
-#: lib/branch_delete.tcl:141
+#: lib/remote_add.tcl:20
 #, tcl-format
-msgid ""
-"Failed to delete branches:\n"
-"%s"
+msgid "%s (%s): Add Remote"
 msgstr ""
 
-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
-msgid "Rename Branch"
+#: lib/remote_add.tcl:25
+msgid "Add New Remote"
 msgstr ""
 
-#: lib/branch_rename.tcl:26
-msgid "Rename"
+#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37
+msgid "Add"
 msgstr ""
 
-#: lib/branch_rename.tcl:36
-msgid "Branch:"
+#: lib/remote_add.tcl:39
+msgid "Remote Details"
 msgstr ""
 
-#: lib/branch_rename.tcl:39
-msgid "New Name:"
+#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44
+msgid "Name:"
 msgstr ""
 
-#: lib/branch_rename.tcl:75
-msgid "Please select a branch to rename."
+#: lib/remote_add.tcl:50
+msgid "Location:"
 msgstr ""
 
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
+#: lib/remote_add.tcl:60
+msgid "Further Action"
+msgstr ""
+
+#: lib/remote_add.tcl:63
+msgid "Fetch Immediately"
+msgstr ""
+
+#: lib/remote_add.tcl:69
+msgid "Initialize Remote Repository and Push"
+msgstr ""
+
+#: lib/remote_add.tcl:75
+msgid "Do Nothing Else Now"
+msgstr ""
+
+#: lib/remote_add.tcl:100
+msgid "Please supply a remote name."
+msgstr ""
+
+#: lib/remote_add.tcl:113
 #, tcl-format
-msgid "Branch '%s' already exists."
+msgid "'%s' is not an acceptable remote name."
 msgstr ""
 
-#: lib/branch_rename.tcl:117
+#: lib/remote_add.tcl:124
 #, tcl-format
-msgid "Failed to rename '%s'."
+msgid "Failed to add remote '%s' of location '%s'."
+msgstr ""
+
+#: lib/remote_add.tcl:133
+#, tcl-format
+msgid "Fetching the %s"
+msgstr ""
+
+#: lib/remote_add.tcl:156
+#, tcl-format
+msgid "Do not know how to initialize repository at location '%s'."
+msgstr ""
+
+#: lib/remote_add.tcl:163
+#, tcl-format
+msgid "Setting up the %s (at %s)"
 msgstr ""
 
 #: lib/browser.tcl:17
 msgid "Starting..."
 msgstr ""
 
-#: lib/browser.tcl:26
-msgid "File Browser"
+#: lib/browser.tcl:27
+#, tcl-format
+msgid "%s (%s): File Browser"
 msgstr ""
 
-#: lib/browser.tcl:126 lib/browser.tcl:143
+#: lib/browser.tcl:132 lib/browser.tcl:149
 #, tcl-format
 msgid "Loading %s..."
 msgstr ""
 
-#: lib/browser.tcl:187
+#: lib/browser.tcl:193
 msgid "[Up To Parent]"
 msgstr ""
 
-#: lib/browser.tcl:267 lib/browser.tcl:273
+#: lib/browser.tcl:275
+#, tcl-format
+msgid "%s (%s): Browse Branch Files"
+msgstr ""
+
+#: lib/browser.tcl:282
 msgid "Browse Branch Files"
 msgstr ""
 
-#: lib/browser.tcl:278 lib/choose_repository.tcl:398
-#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
-#: lib/choose_repository.tcl:1028
+#: lib/browser.tcl:288 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533
+#: lib/choose_repository.tcl:1115
 msgid "Browse"
 msgstr ""
 
-#: lib/checkout_op.tcl:85
-#, tcl-format
-msgid "Fetching %s from %s"
+#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321
+msgid "Revision"
 msgstr ""
 
-#: lib/checkout_op.tcl:133
-#, tcl-format
-msgid "fatal: Cannot resolve %s"
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
 msgstr ""
 
-#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
-#: lib/sshkey.tcl:53
-msgid "Close"
+#: lib/index.tcl:30
+msgid "Index Error"
 msgstr ""
 
-#: lib/checkout_op.tcl:175
+#: lib/index.tcl:32
+msgid ""
+"Updating the Git index failed.  A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr ""
+
+#: lib/index.tcl:43
+msgid "Continue"
+msgstr ""
+
+#: lib/index.tcl:46
+msgid "Unlock Index"
+msgstr ""
+
+#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587
+#: lib/choose_repository.tcl:999
+msgid "files"
+msgstr ""
+
+#: lib/index.tcl:326
+msgid "Unstaging selected files from commit"
+msgstr ""
+
+#: lib/index.tcl:330
 #, tcl-format
-msgid "Branch '%s' does not exist."
+msgid "Unstaging %s from commit"
 msgstr ""
 
-#: lib/checkout_op.tcl:194
+#: lib/index.tcl:369
+msgid "Ready to commit."
+msgstr ""
+
+#: lib/index.tcl:378
+msgid "Adding selected files"
+msgstr ""
+
+#: lib/index.tcl:382
 #, tcl-format
-msgid "Failed to configure simplified git-pull for '%s'."
+msgid "Adding %s"
 msgstr ""
 
-#: lib/checkout_op.tcl:229
+#: lib/index.tcl:412
 #, tcl-format
-msgid ""
-"Branch '%s' already exists.\n"
-"\n"
-"It cannot fast-forward to %s.\n"
-"A merge is required."
+msgid "Stage %d untracked files?"
 msgstr ""
 
-#: lib/checkout_op.tcl:243
+#: lib/index.tcl:420
+msgid "Adding all changed files"
+msgstr ""
+
+#: lib/index.tcl:503
 #, tcl-format
-msgid "Merge strategy '%s' not supported."
+msgid "Revert changes in file %s?"
 msgstr ""
 
-#: lib/checkout_op.tcl:262
+#: lib/index.tcl:508
 #, tcl-format
-msgid "Failed to update '%s'."
+msgid "Revert changes in these %i files?"
 msgstr ""
 
-#: lib/checkout_op.tcl:274
-msgid "Staging area (index) is already locked."
+#: lib/index.tcl:517
+msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr ""
 
-#: lib/checkout_op.tcl:289
-msgid ""
-"Last scanned state does not match repository state.\n"
-"\n"
-"Another Git program has modified this repository since the last scan.  A "
-"rescan must be performed before the current branch can be changed.\n"
-"\n"
-"The rescan will be automatically started now.\n"
+#: lib/index.tcl:520 lib/index.tcl:563
+msgid "Do Nothing"
 msgstr ""
 
-#: lib/checkout_op.tcl:345
+#: lib/index.tcl:545
 #, tcl-format
-msgid "Updating working directory to '%s'..."
+msgid "Delete untracked file %s?"
 msgstr ""
 
-#: lib/checkout_op.tcl:346
-msgid "files checked out"
+#: lib/index.tcl:550
+#, tcl-format
+msgid "Delete these %i untracked files?"
 msgstr ""
 
-#: lib/checkout_op.tcl:376
-#, tcl-format
-msgid "Aborted checkout of '%s' (file level merging is required)."
+#: lib/index.tcl:560
+msgid "Files will be permanently deleted."
 msgstr ""
 
-#: lib/checkout_op.tcl:377
-msgid "File level merge required."
+#: lib/index.tcl:564
+msgid "Delete Files"
 msgstr ""
 
-#: lib/checkout_op.tcl:381
-#, tcl-format
-msgid "Staying on branch '%s'."
+#: lib/index.tcl:586
+msgid "Deleting"
 msgstr ""
 
-#: lib/checkout_op.tcl:452
-msgid ""
-"You are no longer on a local branch.\n"
-"\n"
-"If you wanted to be on a branch, create one now starting from 'This Detached "
-"Checkout'."
+#: lib/index.tcl:665
+msgid "Encountered errors deleting files:\n"
 msgstr ""
 
-#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
+#: lib/index.tcl:674
 #, tcl-format
-msgid "Checked out '%s'."
+msgid "None of the %d selected files could be deleted."
 msgstr ""
 
-#: lib/checkout_op.tcl:535
+#: lib/index.tcl:679
 #, tcl-format
-msgid "Resetting '%s' to '%s' will lose the following commits:"
+msgid "%d of the %d selected files could not be deleted."
 msgstr ""
 
-#: lib/checkout_op.tcl:557
-msgid "Recovering lost commits may not be easy."
+#: lib/index.tcl:726
+msgid "Reverting selected files"
 msgstr ""
 
-#: lib/checkout_op.tcl:562
+#: lib/index.tcl:730
 #, tcl-format
-msgid "Reset '%s'?"
+msgid "Reverting %s"
 msgstr ""
 
-#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
-msgid "Visualize"
+#: lib/branch_checkout.tcl:16
+#, tcl-format
+msgid "%s (%s): Checkout Branch"
 msgstr ""
 
-#: lib/checkout_op.tcl:635
-#, tcl-format
-msgid ""
-"Failed to set current branch.\n"
-"\n"
-"This working directory is only partially switched.  We successfully updated "
-"your files, but failed to update an internal Git file.\n"
-"\n"
-"This should not have occurred.  %s will now close and give up."
+#: lib/branch_checkout.tcl:21
+msgid "Checkout Branch"
 msgstr ""
 
-#: lib/choose_font.tcl:39
-msgid "Select"
+#: lib/branch_checkout.tcl:26
+msgid "Checkout"
 msgstr ""
 
-#: lib/choose_font.tcl:53
-msgid "Font Family"
+#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69
+msgid "Options"
 msgstr ""
 
-#: lib/choose_font.tcl:74
-msgid "Font Size"
+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
 msgstr ""
 
-#: lib/choose_font.tcl:91
-msgid "Font Example"
+#: lib/branch_checkout.tcl:47
+msgid "Detach From Local Branch"
 msgstr ""
 
-#: lib/choose_font.tcl:103
-msgid ""
-"This is example text.\n"
-"If you like this text, it can be your font."
+#: lib/status_bar.tcl:263
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr ""
 
-#: lib/choose_repository.tcl:28
-msgid "Git Gui"
+#: lib/remote.tcl:200
+msgid "Push to"
 msgstr ""
 
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
-msgid "Create New Repository"
+#: lib/remote.tcl:218
+msgid "Remove Remote"
 msgstr ""
 
-#: lib/choose_repository.tcl:93
-msgid "New..."
+#: lib/remote.tcl:223
+msgid "Prune from"
 msgstr ""
 
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
-msgid "Clone Existing Repository"
+#: lib/remote.tcl:228
+msgid "Fetch from"
 msgstr ""
 
-#: lib/choose_repository.tcl:106
-msgid "Clone..."
+#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264
+msgid "All"
 msgstr ""
 
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
-msgid "Open Existing Repository"
+#: lib/branch_rename.tcl:15
+#, tcl-format
+msgid "%s (%s): Rename Branch"
 msgstr ""
 
-#: lib/choose_repository.tcl:119
-msgid "Open..."
+#: lib/branch_rename.tcl:23
+msgid "Rename Branch"
 msgstr ""
 
-#: lib/choose_repository.tcl:132
-msgid "Recent Repositories"
+#: lib/branch_rename.tcl:28
+msgid "Rename"
 msgstr ""
 
-#: lib/choose_repository.tcl:138
-msgid "Open Recent Repository:"
+#: lib/branch_rename.tcl:38
+msgid "Branch:"
 msgstr ""
 
-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
-#: lib/choose_repository.tcl:320
-#, tcl-format
-msgid "Failed to create repository %s:"
+#: lib/branch_rename.tcl:46
+msgid "New Name:"
 msgstr ""
 
-#: lib/choose_repository.tcl:391
-msgid "Directory:"
+#: lib/branch_rename.tcl:81
+msgid "Please select a branch to rename."
 msgstr ""
 
-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
-#: lib/choose_repository.tcl:1052
-msgid "Git Repository"
+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
+msgid "Please supply a branch name."
 msgstr ""
 
-#: lib/choose_repository.tcl:448
+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
 #, tcl-format
-msgid "Directory %s already exists."
+msgid "'%s' is not an acceptable branch name."
 msgstr ""
 
-#: lib/choose_repository.tcl:452
+#: lib/branch_rename.tcl:123
 #, tcl-format
-msgid "File %s already exists."
+msgid "Failed to rename '%s'."
 msgstr ""
 
-#: lib/choose_repository.tcl:466
-msgid "Clone"
+#: lib/choose_font.tcl:41
+msgid "Select"
 msgstr ""
 
-#: lib/choose_repository.tcl:479
-msgid "Source Location:"
+#: lib/choose_font.tcl:55
+msgid "Font Family"
 msgstr ""
 
-#: lib/choose_repository.tcl:490
-msgid "Target Directory:"
+#: lib/choose_font.tcl:76
+msgid "Font Size"
 msgstr ""
 
-#: lib/choose_repository.tcl:502
-msgid "Clone Type:"
+#: lib/choose_font.tcl:93
+msgid "Font Example"
 msgstr ""
 
-#: lib/choose_repository.tcl:508
-msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
+#: lib/choose_font.tcl:105
+msgid ""
+"This is example text.\n"
+"If you like this text, it can be your font."
 msgstr ""
 
-#: lib/choose_repository.tcl:514
-msgid "Full Copy (Slower, Redundant Backup)"
+#: lib/option.tcl:11
+#, tcl-format
+msgid "Invalid global encoding '%s'"
 msgstr ""
 
-#: lib/choose_repository.tcl:520
-msgid "Shared (Fastest, Not Recommended, No Backup)"
+#: lib/option.tcl:19
+#, tcl-format
+msgid "Invalid repo encoding '%s'"
+msgstr ""
+
+#: lib/option.tcl:119
+msgid "Restore Defaults"
+msgstr ""
+
+#: lib/option.tcl:123
+msgid "Save"
 msgstr ""
 
-#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
-#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
-#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
+#: lib/option.tcl:133
 #, tcl-format
-msgid "Not a Git repository: %s"
+msgid "%s Repository"
 msgstr ""
 
-#: lib/choose_repository.tcl:592
-msgid "Standard only available for local repository."
+#: lib/option.tcl:134
+msgid "Global (All Repositories)"
 msgstr ""
 
-#: lib/choose_repository.tcl:596
-msgid "Shared only available for local repository."
+#: lib/option.tcl:140
+msgid "User Name"
 msgstr ""
 
-#: lib/choose_repository.tcl:617
-#, tcl-format
-msgid "Location %s already exists."
+#: lib/option.tcl:141
+msgid "Email Address"
 msgstr ""
 
-#: lib/choose_repository.tcl:628
-msgid "Failed to configure origin"
+#: lib/option.tcl:143
+msgid "Summarize Merge Commits"
 msgstr ""
 
-#: lib/choose_repository.tcl:640
-msgid "Counting objects"
+#: lib/option.tcl:144
+msgid "Merge Verbosity"
 msgstr ""
 
-#: lib/choose_repository.tcl:641
-msgid "buckets"
+#: lib/option.tcl:145
+msgid "Show Diffstat After Merge"
 msgstr ""
 
-#: lib/choose_repository.tcl:665
-#, tcl-format
-msgid "Unable to copy objects/info/alternates: %s"
+#: lib/option.tcl:146
+msgid "Use Merge Tool"
 msgstr ""
 
-#: lib/choose_repository.tcl:701
-#, tcl-format
-msgid "Nothing to clone from %s."
+#: lib/option.tcl:148
+msgid "Trust File Modification Timestamps"
 msgstr ""
 
-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
-#: lib/choose_repository.tcl:929
-msgid "The 'master' branch has not been initialized."
+#: lib/option.tcl:149
+msgid "Prune Tracking Branches During Fetch"
 msgstr ""
 
-#: lib/choose_repository.tcl:716
-msgid "Hardlinks are unavailable.  Falling back to copying."
+#: lib/option.tcl:150
+msgid "Match Tracking Branches"
 msgstr ""
 
-#: lib/choose_repository.tcl:728
-#, tcl-format
-msgid "Cloning from %s"
+#: lib/option.tcl:151
+msgid "Use Textconv For Diffs and Blames"
 msgstr ""
 
-#: lib/choose_repository.tcl:759
-msgid "Copying objects"
+#: lib/option.tcl:152
+msgid "Blame Copy Only On Changed Files"
 msgstr ""
 
-#: lib/choose_repository.tcl:760
-msgid "KiB"
+#: lib/option.tcl:153
+msgid "Maximum Length of Recent Repositories List"
 msgstr ""
 
-#: lib/choose_repository.tcl:784
-#, tcl-format
-msgid "Unable to copy object: %s"
+#: lib/option.tcl:154
+msgid "Minimum Letters To Blame Copy On"
 msgstr ""
 
-#: lib/choose_repository.tcl:794
-msgid "Linking objects"
+#: lib/option.tcl:155
+msgid "Blame History Context Radius (days)"
 msgstr ""
 
-#: lib/choose_repository.tcl:795
-msgid "objects"
+#: lib/option.tcl:156
+msgid "Number of Diff Context Lines"
 msgstr ""
 
-#: lib/choose_repository.tcl:803
-#, tcl-format
-msgid "Unable to hardlink object: %s"
+#: lib/option.tcl:157
+msgid "Additional Diff Parameters"
 msgstr ""
 
-#: lib/choose_repository.tcl:858
-msgid "Cannot fetch branches and objects.  See console output for details."
+#: lib/option.tcl:158
+msgid "Commit Message Text Width"
 msgstr ""
 
-#: lib/choose_repository.tcl:869
-msgid "Cannot fetch tags.  See console output for details."
+#: lib/option.tcl:159
+msgid "New Branch Name Template"
 msgstr ""
 
-#: lib/choose_repository.tcl:893
-msgid "Cannot determine HEAD.  See console output for details."
+#: lib/option.tcl:160
+msgid "Default File Contents Encoding"
 msgstr ""
 
-#: lib/choose_repository.tcl:902
-#, tcl-format
-msgid "Unable to cleanup %s"
+#: lib/option.tcl:161
+msgid "Warn before committing to a detached head"
 msgstr ""
 
-#: lib/choose_repository.tcl:908
-msgid "Clone failed."
+#: lib/option.tcl:162
+msgid "Staging of untracked files"
 msgstr ""
 
-#: lib/choose_repository.tcl:915
-msgid "No default branch obtained."
+#: lib/option.tcl:163
+msgid "Show untracked files"
 msgstr ""
 
-#: lib/choose_repository.tcl:926
+#: lib/option.tcl:164
+msgid "Tab spacing"
+msgstr ""
+
+#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282
+#: lib/database.tcl:57
 #, tcl-format
-msgid "Cannot resolve %s as a commit."
+msgid "%s:"
 msgstr ""
 
-#: lib/choose_repository.tcl:938
-msgid "Creating working directory"
+#: lib/option.tcl:210
+msgid "Change"
 msgstr ""
 
-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
-#: lib/index.tcl:198
-msgid "files"
+#: lib/option.tcl:254
+msgid "Spelling Dictionary:"
 msgstr ""
 
-#: lib/choose_repository.tcl:968
-msgid "Initial file checkout failed."
+#: lib/option.tcl:284
+msgid "Change Font"
 msgstr ""
 
-#: lib/choose_repository.tcl:1011
-msgid "Open"
+#: lib/option.tcl:288
+#, tcl-format
+msgid "Choose %s"
 msgstr ""
 
-#: lib/choose_repository.tcl:1021
-msgid "Repository:"
+#: lib/option.tcl:294
+msgid "pt."
 msgstr ""
 
-#: lib/choose_repository.tcl:1072
+#: lib/option.tcl:308
+msgid "Preferences"
+msgstr ""
+
+#: lib/option.tcl:345
+msgid "Failed to completely save options:"
+msgstr ""
+
+#: lib/encoding.tcl:443
+msgid "Default"
+msgstr ""
+
+#: lib/encoding.tcl:448
 #, tcl-format
-msgid "Failed to open repository %s:"
+msgid "System (%s)"
 msgstr ""
 
-#: lib/choose_rev.tcl:53
-msgid "This Detached Checkout"
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
+msgid "Other"
 msgstr ""
 
-#: lib/choose_rev.tcl:60
-msgid "Revision Expression:"
+#: lib/tools.tcl:76
+#, tcl-format
+msgid "Running %s requires a selected file."
 msgstr ""
 
-#: lib/choose_rev.tcl:74
-msgid "Local Branch"
+#: lib/tools.tcl:92
+#, tcl-format
+msgid "Are you sure you want to run %1$s on file \"%2$s\"?"
 msgstr ""
 
-#: lib/choose_rev.tcl:79
-msgid "Tracking Branch"
+#: lib/tools.tcl:96
+#, tcl-format
+msgid "Are you sure you want to run %s?"
 msgstr ""
 
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
-msgid "Tag"
+#: lib/tools.tcl:118
+#, tcl-format
+msgid "Tool: %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:317
+#: lib/tools.tcl:119
 #, tcl-format
-msgid "Invalid revision: %s"
+msgid "Running: %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:338
-msgid "No revision selected."
+#: lib/tools.tcl:158
+#, tcl-format
+msgid "Tool completed successfully: %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:346
-msgid "Revision expression is empty."
+#: lib/tools.tcl:160
+#, tcl-format
+msgid "Tool failed: %s"
 msgstr ""
 
-#: lib/choose_rev.tcl:531
-msgid "Updated"
+#: lib/mergetool.tcl:8
+msgid "Force resolution to the base version?"
 msgstr ""
 
-#: lib/choose_rev.tcl:559
-msgid "URL"
+#: lib/mergetool.tcl:9
+msgid "Force resolution to this branch?"
 msgstr ""
 
-#: lib/commit.tcl:9
-msgid ""
-"There is nothing to amend.\n"
-"\n"
-"You are about to create the initial commit.  There is no commit before this "
-"to amend.\n"
+#: lib/mergetool.tcl:10
+msgid "Force resolution to the other branch?"
 msgstr ""
 
-#: lib/commit.tcl:18
+#: lib/mergetool.tcl:14
+#, tcl-format
 msgid ""
-"Cannot amend while merging.\n"
+"Note that the diff shows only conflicting changes.\n"
 "\n"
-"You are currently in the middle of a merge that has not been fully "
-"completed.  You cannot amend the prior commit unless you first abort the "
-"current merge activity.\n"
+"%s will be overwritten.\n"
+"\n"
+"This operation can be undone only by restarting the merge."
 msgstr ""
 
-#: lib/commit.tcl:48
-msgid "Error loading commit data for amend:"
+#: lib/mergetool.tcl:45
+#, tcl-format
+msgid "File %s seems to have unresolved conflicts, still stage?"
 msgstr ""
 
-#: lib/commit.tcl:75
-msgid "Unable to obtain your identity:"
+#: lib/mergetool.tcl:60
+#, tcl-format
+msgid "Adding resolution for %s"
 msgstr ""
 
-#: lib/commit.tcl:80
-msgid "Invalid GIT_COMMITTER_IDENT:"
+#: lib/mergetool.tcl:141
+msgid "Cannot resolve deletion or link conflicts using a tool"
 msgstr ""
 
-#: lib/commit.tcl:129
+#: lib/mergetool.tcl:146
+msgid "Conflict file does not exist"
+msgstr ""
+
+#: lib/mergetool.tcl:246
 #, tcl-format
-msgid "warning: Tcl does not support encoding '%s'."
+msgid "Not a GUI merge tool: '%s'"
 msgstr ""
 
-#: lib/commit.tcl:149
-msgid ""
-"Last scanned state does not match repository state.\n"
-"\n"
-"Another Git program has modified this repository since the last scan.  A "
-"rescan must be performed before another commit can be created.\n"
-"\n"
-"The rescan will be automatically started now.\n"
+#: lib/mergetool.tcl:275
+#, tcl-format
+msgid "Unsupported merge tool '%s'"
 msgstr ""
 
-#: lib/commit.tcl:172
+#: lib/mergetool.tcl:310
+msgid "Merge tool is already running, terminate it?"
+msgstr ""
+
+#: lib/mergetool.tcl:330
 #, tcl-format
 msgid ""
-"Unmerged files cannot be committed.\n"
-"\n"
-"File %s has merge conflicts.  You must resolve them and stage the file "
-"before committing.\n"
+"Error retrieving versions:\n"
+"%s"
 msgstr ""
 
-#: lib/commit.tcl:180
+#: lib/mergetool.tcl:350
 #, tcl-format
 msgid ""
-"Unknown file state %s detected.\n"
+"Could not start the merge tool:\n"
 "\n"
-"File %s cannot be committed by this program.\n"
+"%s"
 msgstr ""
 
-#: lib/commit.tcl:188
-msgid ""
-"No changes to commit.\n"
-"\n"
-"You must stage at least 1 file before you can commit.\n"
+#: lib/mergetool.tcl:354
+msgid "Running merge tool..."
 msgstr ""
 
-#: lib/commit.tcl:203
-msgid ""
-"Please supply a commit message.\n"
-"\n"
-"A good commit message has the following format:\n"
-"\n"
-"- First line: Describe in one sentence what you did.\n"
-"- Second line: Blank\n"
-"- Remaining lines: Describe why this change is good.\n"
+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
+msgid "Merge tool failed."
 msgstr ""
 
-#: lib/commit.tcl:234
-msgid "Calling pre-commit hook..."
+#: lib/tools_dlg.tcl:22
+#, tcl-format
+msgid "%s (%s): Add Tool"
 msgstr ""
 
-#: lib/commit.tcl:249
-msgid "Commit declined by pre-commit hook."
+#: lib/tools_dlg.tcl:28
+msgid "Add New Tool Command"
 msgstr ""
 
-#: lib/commit.tcl:272
-msgid "Calling commit-msg hook..."
+#: lib/tools_dlg.tcl:34
+msgid "Add globally"
 msgstr ""
 
-#: lib/commit.tcl:287
-msgid "Commit declined by commit-msg hook."
+#: lib/tools_dlg.tcl:46
+msgid "Tool Details"
 msgstr ""
 
-#: lib/commit.tcl:300
-msgid "Committing changes..."
+#: lib/tools_dlg.tcl:49
+msgid "Use '/' separators to create a submenu tree:"
 msgstr ""
 
-#: lib/commit.tcl:316
-msgid "write-tree failed:"
+#: lib/tools_dlg.tcl:60
+msgid "Command:"
 msgstr ""
 
-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
-msgid "Commit failed."
+#: lib/tools_dlg.tcl:71
+msgid "Show a dialog before running"
 msgstr ""
 
-#: lib/commit.tcl:334
-#, tcl-format
-msgid "Commit %s appears to be corrupt"
+#: lib/tools_dlg.tcl:77
+msgid "Ask the user to select a revision (sets $REVISION)"
 msgstr ""
 
-#: lib/commit.tcl:339
-msgid ""
-"No changes to commit.\n"
-"\n"
-"No files were modified by this commit and it was not a merge commit.\n"
-"\n"
-"A rescan will be automatically started now.\n"
+#: lib/tools_dlg.tcl:82
+msgid "Ask the user for additional arguments (sets $ARGS)"
 msgstr ""
 
-#: lib/commit.tcl:346
-msgid "No changes to commit."
+#: lib/tools_dlg.tcl:89
+msgid "Don't show the command output window"
 msgstr ""
 
-#: lib/commit.tcl:360
-msgid "commit-tree failed:"
+#: lib/tools_dlg.tcl:94
+msgid "Run only if a diff is selected ($FILENAME not empty)"
 msgstr ""
 
-#: lib/commit.tcl:381
-msgid "update-ref failed:"
+#: lib/tools_dlg.tcl:118
+msgid "Please supply a name for the tool."
 msgstr ""
 
-#: lib/commit.tcl:469
+#: lib/tools_dlg.tcl:126
 #, tcl-format
-msgid "Created commit %s: %s"
+msgid "Tool '%s' already exists."
 msgstr ""
 
-#: lib/console.tcl:59
-msgid "Working... please wait..."
+#: lib/tools_dlg.tcl:148
+#, tcl-format
+msgid ""
+"Could not add tool:\n"
+"%s"
 msgstr ""
 
-#: lib/console.tcl:186
-msgid "Success"
+#: lib/tools_dlg.tcl:187
+#, tcl-format
+msgid "%s (%s): Remove Tool"
 msgstr ""
 
-#: lib/console.tcl:200
-msgid "Error: Command Failed"
+#: lib/tools_dlg.tcl:193
+msgid "Remove Tool Commands"
 msgstr ""
 
-#: lib/database.tcl:43
-msgid "Number of loose objects"
+#: lib/tools_dlg.tcl:198
+msgid "Remove"
 msgstr ""
 
-#: lib/database.tcl:44
-msgid "Disk space used by loose objects"
+#: lib/tools_dlg.tcl:231
+msgid "(Blue denotes repository-local tools)"
 msgstr ""
 
-#: lib/database.tcl:45
-msgid "Number of packed objects"
+#: lib/tools_dlg.tcl:283
+#, tcl-format
+msgid "%s (%s):"
 msgstr ""
 
-#: lib/database.tcl:46
-msgid "Number of packs"
+#: lib/tools_dlg.tcl:292
+#, tcl-format
+msgid "Run Command: %s"
 msgstr ""
 
-#: lib/database.tcl:47
-msgid "Disk space used by packed objects"
+#: lib/tools_dlg.tcl:306
+msgid "Arguments"
 msgstr ""
 
-#: lib/database.tcl:48
-msgid "Packed objects waiting for pruning"
+#: lib/tools_dlg.tcl:341
+msgid "OK"
 msgstr ""
 
-#: lib/database.tcl:49
-msgid "Garbage files"
+#: lib/search.tcl:48
+msgid "Find:"
 msgstr ""
 
-#: lib/database.tcl:72
-msgid "Compressing the object database"
+#: lib/search.tcl:50
+msgid "Next"
 msgstr ""
 
-#: lib/database.tcl:83
-msgid "Verifying the object database with fsck-objects"
+#: lib/search.tcl:51
+msgid "Prev"
 msgstr ""
 
-#: lib/database.tcl:107
-#, tcl-format
-msgid ""
-"This repository currently has approximately %i loose objects.\n"
-"\n"
-"To maintain optimal performance it is strongly recommended that you compress "
-"the database.\n"
-"\n"
-"Compress the database now?"
+#: lib/search.tcl:52
+msgid "RegExp"
 msgstr ""
 
-#: lib/date.tcl:25
-#, tcl-format
-msgid "Invalid date from Git: %s"
+#: lib/search.tcl:54
+msgid "Case"
 msgstr ""
 
-#: lib/diff.tcl:64
+#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75
 #, tcl-format
-msgid ""
-"No differences detected.\n"
-"\n"
-"%s has no changes.\n"
-"\n"
-"The modification date of this file was updated by another application, but "
-"the content within the file was not changed.\n"
-"\n"
-"A rescan will be automatically started to find other files which may have "
-"the same state."
+msgid "%s (%s): Create Desktop Icon"
 msgstr ""
 
-#: lib/diff.tcl:104
-#, tcl-format
-msgid "Loading diff of %s..."
+#: lib/shortcut.tcl:24 lib/shortcut.tcl:65
+msgid "Cannot write shortcut:"
 msgstr ""
 
-#: lib/diff.tcl:125
-msgid ""
-"LOCAL: deleted\n"
-"REMOTE:\n"
+#: lib/shortcut.tcl:140
+msgid "Cannot write icon:"
 msgstr ""
 
-#: lib/diff.tcl:130
-msgid ""
-"REMOTE: deleted\n"
-"LOCAL:\n"
+#: lib/remote_branch_delete.tcl:29
+#, tcl-format
+msgid "%s (%s): Delete Branch Remotely"
 msgstr ""
 
-#: lib/diff.tcl:137
-msgid "LOCAL:\n"
+#: lib/remote_branch_delete.tcl:34
+msgid "Delete Branch Remotely"
 msgstr ""
 
-#: lib/diff.tcl:140
-msgid "REMOTE:\n"
+#: lib/remote_branch_delete.tcl:48
+msgid "From Repository"
 msgstr ""
 
-#: lib/diff.tcl:202 lib/diff.tcl:319
-#, tcl-format
-msgid "Unable to display %s"
+#: lib/remote_branch_delete.tcl:88
+msgid "Branches"
 msgstr ""
 
-#: lib/diff.tcl:203
-msgid "Error loading file:"
+#: lib/remote_branch_delete.tcl:110
+msgid "Delete Only If"
 msgstr ""
 
-#: lib/diff.tcl:210
-msgid "Git Repository (subproject)"
+#: lib/remote_branch_delete.tcl:112
+msgid "Merged Into:"
 msgstr ""
 
-#: lib/diff.tcl:222
-msgid "* Binary file (not showing content)."
+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
+msgid "Always (Do not perform merge checks)"
 msgstr ""
 
-#: lib/diff.tcl:227
-#, tcl-format
-msgid ""
-"* Untracked file is %d bytes.\n"
-"* Showing only first %d bytes.\n"
+#: lib/remote_branch_delete.tcl:153
+msgid "A branch is required for 'Merged Into'."
 msgstr ""
 
-#: lib/diff.tcl:233
+#: lib/remote_branch_delete.tcl:185
 #, tcl-format
 msgid ""
+"The following branches are not completely merged into %s:\n"
 "\n"
-"* Untracked file clipped here by %s.\n"
-"* To see the entire file, use an external editor.\n"
+" - %s"
 msgstr ""
 
-#: lib/diff.tcl:482
-msgid "Failed to unstage selected hunk."
+#: lib/remote_branch_delete.tcl:190
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits.  Try fetching from %s first."
 msgstr ""
 
-#: lib/diff.tcl:489
-msgid "Failed to stage selected hunk."
+#: lib/remote_branch_delete.tcl:208
+msgid "Please select one or more branches to delete."
 msgstr ""
 
-#: lib/diff.tcl:568
-msgid "Failed to unstage selected line."
+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
 msgstr ""
 
-#: lib/diff.tcl:576
-msgid "Failed to stage selected line."
+#: lib/remote_branch_delete.tcl:227
+#, tcl-format
+msgid "Deleting branches from %s"
 msgstr ""
 
-#: lib/encoding.tcl:443
-msgid "Default"
+#: lib/remote_branch_delete.tcl:300
+msgid "No repository selected."
 msgstr ""
 
-#: lib/encoding.tcl:448
+#: lib/remote_branch_delete.tcl:305
 #, tcl-format
-msgid "System (%s)"
+msgid "Scanning %s..."
 msgstr ""
 
-#: lib/encoding.tcl:459 lib/encoding.tcl:465
-msgid "Other"
+#: lib/choose_repository.tcl:45
+msgid "Git Gui"
 msgstr ""
 
-#: lib/error.tcl:20 lib/error.tcl:114
-msgid "error"
+#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427
+msgid "Create New Repository"
 msgstr ""
 
-#: lib/error.tcl:36
-msgid "warning"
+#: lib/choose_repository.tcl:110
+msgid "New..."
 msgstr ""
 
-#: lib/error.tcl:94
-msgid "You must correct the above errors before committing."
+#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511
+msgid "Clone Existing Repository"
 msgstr ""
 
-#: lib/index.tcl:6
-msgid "Unable to unlock the index."
+#: lib/choose_repository.tcl:128
+msgid "Clone..."
 msgstr ""
 
-#: lib/index.tcl:15
-msgid "Index Error"
+#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105
+msgid "Open Existing Repository"
 msgstr ""
 
-#: lib/index.tcl:17
-msgid ""
-"Updating the Git index failed.  A rescan will be automatically started to "
-"resynchronize git-gui."
+#: lib/choose_repository.tcl:141
+msgid "Open..."
 msgstr ""
 
-#: lib/index.tcl:28
-msgid "Continue"
+#: lib/choose_repository.tcl:154
+msgid "Recent Repositories"
 msgstr ""
 
-#: lib/index.tcl:31
-msgid "Unlock Index"
+#: lib/choose_repository.tcl:164
+msgid "Open Recent Repository:"
 msgstr ""
 
-#: lib/index.tcl:289
+#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338
+#: lib/choose_repository.tcl:345
 #, tcl-format
-msgid "Unstaging %s from commit"
+msgid "Failed to create repository %s:"
 msgstr ""
 
-#: lib/index.tcl:328
-msgid "Ready to commit."
+#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33
+msgid "Create"
 msgstr ""
 
-#: lib/index.tcl:341
-#, tcl-format
-msgid "Adding %s"
+#: lib/choose_repository.tcl:432
+msgid "Directory:"
 msgstr ""
 
-#: lib/index.tcl:398
+#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588
+#: lib/choose_repository.tcl:1139
+msgid "Git Repository"
+msgstr ""
+
+#: lib/choose_repository.tcl:487
 #, tcl-format
-msgid "Revert changes in file %s?"
+msgid "Directory %s already exists."
 msgstr ""
 
-#: lib/index.tcl:400
+#: lib/choose_repository.tcl:491
 #, tcl-format
-msgid "Revert changes in these %i files?"
+msgid "File %s already exists."
 msgstr ""
 
-#: lib/index.tcl:408
-msgid "Any unstaged changes will be permanently lost by the revert."
+#: lib/choose_repository.tcl:506
+msgid "Clone"
 msgstr ""
 
-#: lib/index.tcl:411
-msgid "Do Nothing"
+#: lib/choose_repository.tcl:519
+msgid "Source Location:"
 msgstr ""
 
-#: lib/index.tcl:429
-msgid "Reverting selected files"
+#: lib/choose_repository.tcl:528
+msgid "Target Directory:"
 msgstr ""
 
-#: lib/index.tcl:433
-#, tcl-format
-msgid "Reverting %s"
+#: lib/choose_repository.tcl:538
+msgid "Clone Type:"
 msgstr ""
 
-#: lib/merge.tcl:13
-msgid ""
-"Cannot merge while amending.\n"
-"\n"
-"You must finish amending this commit before starting any type of merge.\n"
+#: lib/choose_repository.tcl:543
+msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr ""
 
-#: lib/merge.tcl:27
-msgid ""
-"Last scanned state does not match repository state.\n"
-"\n"
-"Another Git program has modified this repository since the last scan.  A "
-"rescan must be performed before a merge can be performed.\n"
-"\n"
-"The rescan will be automatically started now.\n"
+#: lib/choose_repository.tcl:548
+msgid "Full Copy (Slower, Redundant Backup)"
 msgstr ""
 
-#: lib/merge.tcl:45
+#: lib/choose_repository.tcl:553
+msgid "Shared (Fastest, Not Recommended, No Backup)"
+msgstr ""
+
+#: lib/choose_repository.tcl:560
+msgid "Recursively clone submodules too"
+msgstr ""
+
+#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864
+#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153
 #, tcl-format
-msgid ""
-"You are in the middle of a conflicted merge.\n"
-"\n"
-"File %s has merge conflicts.\n"
-"\n"
-"You must resolve them, stage the file, and commit to complete the current "
-"merge.  Only then can you begin another merge.\n"
+msgid "Not a Git repository: %s"
 msgstr ""
 
-#: lib/merge.tcl:55
+#: lib/choose_repository.tcl:630
+msgid "Standard only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:634
+msgid "Shared only available for local repository."
+msgstr ""
+
+#: lib/choose_repository.tcl:655
 #, tcl-format
-msgid ""
-"You are in the middle of a change.\n"
-"\n"
-"File %s is modified.\n"
-"\n"
-"You should complete the current commit before starting a merge.  Doing so "
-"will help you abort a failed merge, should the need arise.\n"
+msgid "Location %s already exists."
+msgstr ""
+
+#: lib/choose_repository.tcl:666
+msgid "Failed to configure origin"
+msgstr ""
+
+#: lib/choose_repository.tcl:678
+msgid "Counting objects"
+msgstr ""
+
+#: lib/choose_repository.tcl:679
+msgid "buckets"
 msgstr ""
 
-#: lib/merge.tcl:107
+#: lib/choose_repository.tcl:703
 #, tcl-format
-msgid "%s of %s"
+msgid "Unable to copy objects/info/alternates: %s"
 msgstr ""
 
-#: lib/merge.tcl:120
+#: lib/choose_repository.tcl:740
 #, tcl-format
-msgid "Merging %s and %s..."
+msgid "Nothing to clone from %s."
 msgstr ""
 
-#: lib/merge.tcl:131
-msgid "Merge completed successfully."
+#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962
+#: lib/choose_repository.tcl:974
+msgid "The 'master' branch has not been initialized."
 msgstr ""
 
-#: lib/merge.tcl:133
-msgid "Merge failed.  Conflict resolution is required."
+#: lib/choose_repository.tcl:755
+msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr ""
 
-#: lib/merge.tcl:158
+#: lib/choose_repository.tcl:769
 #, tcl-format
-msgid "Merge Into %s"
+msgid "Cloning from %s"
 msgstr ""
 
-#: lib/merge.tcl:177
-msgid "Revision To Merge"
+#: lib/choose_repository.tcl:800
+msgid "Copying objects"
 msgstr ""
 
-#: lib/merge.tcl:212
-msgid ""
-"Cannot abort while amending.\n"
-"\n"
-"You must finish amending this commit.\n"
+#: lib/choose_repository.tcl:801
+msgid "KiB"
 msgstr ""
 
-#: lib/merge.tcl:222
-msgid ""
-"Abort merge?\n"
-"\n"
-"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
-"\n"
-"Continue with aborting the current merge?"
+#: lib/choose_repository.tcl:825
+#, tcl-format
+msgid "Unable to copy object: %s"
 msgstr ""
 
-#: lib/merge.tcl:228
-msgid ""
-"Reset changes?\n"
-"\n"
-"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
-"\n"
-"Continue with resetting the current changes?"
+#: lib/choose_repository.tcl:837
+msgid "Linking objects"
 msgstr ""
 
-#: lib/merge.tcl:239
-msgid "Aborting"
+#: lib/choose_repository.tcl:838
+msgid "objects"
 msgstr ""
 
-#: lib/merge.tcl:239
-msgid "files reset"
+#: lib/choose_repository.tcl:846
+#, tcl-format
+msgid "Unable to hardlink object: %s"
 msgstr ""
 
-#: lib/merge.tcl:267
-msgid "Abort failed."
+#: lib/choose_repository.tcl:903
+msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr ""
 
-#: lib/merge.tcl:269
-msgid "Abort completed.  Ready."
+#: lib/choose_repository.tcl:914
+msgid "Cannot fetch tags.  See console output for details."
 msgstr ""
 
-#: lib/mergetool.tcl:8
-msgid "Force resolution to the base version?"
+#: lib/choose_repository.tcl:938
+msgid "Cannot determine HEAD.  See console output for details."
 msgstr ""
 
-#: lib/mergetool.tcl:9
-msgid "Force resolution to this branch?"
+#: lib/choose_repository.tcl:947
+#, tcl-format
+msgid "Unable to cleanup %s"
 msgstr ""
 
-#: lib/mergetool.tcl:10
-msgid "Force resolution to the other branch?"
+#: lib/choose_repository.tcl:953
+msgid "Clone failed."
 msgstr ""
 
-#: lib/mergetool.tcl:14
-#, tcl-format
-msgid ""
-"Note that the diff shows only conflicting changes.\n"
-"\n"
-"%s will be overwritten.\n"
-"\n"
-"This operation can be undone only by restarting the merge."
+#: lib/choose_repository.tcl:960
+msgid "No default branch obtained."
 msgstr ""
 
-#: lib/mergetool.tcl:45
+#: lib/choose_repository.tcl:971
 #, tcl-format
-msgid "File %s seems to have unresolved conflicts, still stage?"
+msgid "Cannot resolve %s as a commit."
 msgstr ""
 
-#: lib/mergetool.tcl:60
-#, tcl-format
-msgid "Adding resolution for %s"
+#: lib/choose_repository.tcl:998
+msgid "Creating working directory"
 msgstr ""
 
-#: lib/mergetool.tcl:141
-msgid "Cannot resolve deletion or link conflicts using a tool"
+#: lib/choose_repository.tcl:1028
+msgid "Initial file checkout failed."
 msgstr ""
 
-#: lib/mergetool.tcl:146
-msgid "Conflict file does not exist"
+#: lib/choose_repository.tcl:1072
+msgid "Cloning submodules"
 msgstr ""
 
-#: lib/mergetool.tcl:264
-#, tcl-format
-msgid "Not a GUI merge tool: '%s'"
+#: lib/choose_repository.tcl:1087
+msgid "Cannot clone submodules."
+msgstr ""
+
+#: lib/choose_repository.tcl:1110
+msgid "Repository:"
 msgstr ""
 
-#: lib/mergetool.tcl:268
+#: lib/choose_repository.tcl:1159
 #, tcl-format
-msgid "Unsupported merge tool '%s'"
+msgid "Failed to open repository %s:"
 msgstr ""
 
-#: lib/mergetool.tcl:303
-msgid "Merge tool is already running, terminate it?"
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
 msgstr ""
 
-#: lib/mergetool.tcl:323
+#: lib/blame.tcl:74
 #, tcl-format
-msgid ""
-"Error retrieving versions:\n"
-"%s"
+msgid "%s (%s): File Viewer"
 msgstr ""
 
-#: lib/mergetool.tcl:343
-#, tcl-format
-msgid ""
-"Could not start the merge tool:\n"
-"\n"
-"%s"
+#: lib/blame.tcl:80
+msgid "Commit:"
 msgstr ""
 
-#: lib/mergetool.tcl:347
-msgid "Running merge tool..."
+#: lib/blame.tcl:282
+msgid "Copy Commit"
 msgstr ""
 
-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
-msgid "Merge tool failed."
+#: lib/blame.tcl:286
+msgid "Find Text..."
 msgstr ""
 
-#: lib/option.tcl:11
-#, tcl-format
-msgid "Invalid global encoding '%s'"
+#: lib/blame.tcl:290
+msgid "Goto Line..."
 msgstr ""
 
-#: lib/option.tcl:19
-#, tcl-format
-msgid "Invalid repo encoding '%s'"
+#: lib/blame.tcl:299
+msgid "Do Full Copy Detection"
 msgstr ""
 
-#: lib/option.tcl:117
-msgid "Restore Defaults"
+#: lib/blame.tcl:303
+msgid "Show History Context"
 msgstr ""
 
-#: lib/option.tcl:121
-msgid "Save"
+#: lib/blame.tcl:306
+msgid "Blame Parent Commit"
 msgstr ""
 
-#: lib/option.tcl:131
+#: lib/blame.tcl:468
 #, tcl-format
-msgid "%s Repository"
+msgid "Reading %s..."
 msgstr ""
 
-#: lib/option.tcl:132
-msgid "Global (All Repositories)"
+#: lib/blame.tcl:596
+msgid "Loading copy/move tracking annotations..."
 msgstr ""
 
-#: lib/option.tcl:138
-msgid "User Name"
+#: lib/blame.tcl:613
+msgid "lines annotated"
 msgstr ""
 
-#: lib/option.tcl:139
-msgid "Email Address"
+#: lib/blame.tcl:815
+msgid "Loading original location annotations..."
 msgstr ""
 
-#: lib/option.tcl:141
-msgid "Summarize Merge Commits"
+#: lib/blame.tcl:818
+msgid "Annotation complete."
 msgstr ""
 
-#: lib/option.tcl:142
-msgid "Merge Verbosity"
+#: lib/blame.tcl:849
+msgid "Busy"
 msgstr ""
 
-#: lib/option.tcl:143
-msgid "Show Diffstat After Merge"
+#: lib/blame.tcl:850
+msgid "Annotation process is already running."
 msgstr ""
 
-#: lib/option.tcl:144
-msgid "Use Merge Tool"
+#: lib/blame.tcl:889
+msgid "Running thorough copy detection..."
 msgstr ""
 
-#: lib/option.tcl:146
-msgid "Trust File Modification Timestamps"
+#: lib/blame.tcl:957
+msgid "Loading annotation..."
 msgstr ""
 
-#: lib/option.tcl:147
-msgid "Prune Tracking Branches During Fetch"
+#: lib/blame.tcl:1010
+msgid "Author:"
 msgstr ""
 
-#: lib/option.tcl:148
-msgid "Match Tracking Branches"
+#: lib/blame.tcl:1014
+msgid "Committer:"
 msgstr ""
 
-#: lib/option.tcl:149
-msgid "Blame Copy Only On Changed Files"
+#: lib/blame.tcl:1019
+msgid "Original File:"
 msgstr ""
 
-#: lib/option.tcl:150
-msgid "Minimum Letters To Blame Copy On"
+#: lib/blame.tcl:1067
+msgid "Cannot find HEAD commit:"
 msgstr ""
 
-#: lib/option.tcl:151
-msgid "Blame History Context Radius (days)"
+#: lib/blame.tcl:1122
+msgid "Cannot find parent commit:"
 msgstr ""
 
-#: lib/option.tcl:152
-msgid "Number of Diff Context Lines"
+#: lib/blame.tcl:1137
+msgid "Unable to display parent"
 msgstr ""
 
-#: lib/option.tcl:153
-msgid "Commit Message Text Width"
+#: lib/blame.tcl:1138 lib/diff.tcl:345
+msgid "Error loading diff:"
 msgstr ""
 
-#: lib/option.tcl:154
-msgid "New Branch Name Template"
+#: lib/blame.tcl:1279
+msgid "Originally By:"
 msgstr ""
 
-#: lib/option.tcl:155
-msgid "Default File Contents Encoding"
+#: lib/blame.tcl:1285
+msgid "In File:"
 msgstr ""
 
-#: lib/option.tcl:203
-msgid "Change"
+#: lib/blame.tcl:1290
+msgid "Copied Or Moved Here By:"
 msgstr ""
 
-#: lib/option.tcl:230
-msgid "Spelling Dictionary:"
+#: lib/diff.tcl:77
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but "
+"the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have "
+"the same state."
 msgstr ""
 
-#: lib/option.tcl:254
-msgid "Change Font"
+#: lib/diff.tcl:117
+#, tcl-format
+msgid "Loading diff of %s..."
 msgstr ""
 
-#: lib/option.tcl:258
-#, tcl-format
-msgid "Choose %s"
+#: lib/diff.tcl:143
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
 msgstr ""
 
-#: lib/option.tcl:264
-msgid "pt."
+#: lib/diff.tcl:148
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
 msgstr ""
 
-#: lib/option.tcl:278
-msgid "Preferences"
+#: lib/diff.tcl:155
+msgid "LOCAL:\n"
 msgstr ""
 
-#: lib/option.tcl:314
-msgid "Failed to completely save options:"
+#: lib/diff.tcl:158
+msgid "REMOTE:\n"
 msgstr ""
 
-#: lib/remote.tcl:163
-msgid "Remove Remote"
+#: lib/diff.tcl:220 lib/diff.tcl:344
+#, tcl-format
+msgid "Unable to display %s"
 msgstr ""
 
-#: lib/remote.tcl:168
-msgid "Prune from"
+#: lib/diff.tcl:221
+msgid "Error loading file:"
 msgstr ""
 
-#: lib/remote.tcl:173
-msgid "Fetch from"
+#: lib/diff.tcl:227
+msgid "Git Repository (subproject)"
 msgstr ""
 
-#: lib/remote.tcl:215
-msgid "Push to"
+#: lib/diff.tcl:239
+msgid "* Binary file (not showing content)."
 msgstr ""
 
-#: lib/remote_add.tcl:19
-msgid "Add Remote"
+#: lib/diff.tcl:244
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"
 msgstr ""
 
-#: lib/remote_add.tcl:24
-msgid "Add New Remote"
+#: lib/diff.tcl:250
+#, tcl-format
+msgid ""
+"\n"
+"* Untracked file clipped here by %s.\n"
+"* To see the entire file, use an external editor.\n"
 msgstr ""
 
-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
-msgid "Add"
+#: lib/diff.tcl:583
+msgid "Failed to unstage selected hunk."
 msgstr ""
 
-#: lib/remote_add.tcl:37
-msgid "Remote Details"
+#: lib/diff.tcl:591
+msgid "Failed to revert selected hunk."
 msgstr ""
 
-#: lib/remote_add.tcl:50
-msgid "Location:"
+#: lib/diff.tcl:594
+msgid "Failed to stage selected hunk."
 msgstr ""
 
-#: lib/remote_add.tcl:62
-msgid "Further Action"
+#: lib/diff.tcl:687
+msgid "Failed to unstage selected line."
 msgstr ""
 
-#: lib/remote_add.tcl:65
-msgid "Fetch Immediately"
+#: lib/diff.tcl:696
+msgid "Failed to revert selected line."
 msgstr ""
 
-#: lib/remote_add.tcl:71
-msgid "Initialize Remote Repository and Push"
+#: lib/diff.tcl:700
+msgid "Failed to stage selected line."
 msgstr ""
 
-#: lib/remote_add.tcl:77
-msgid "Do Nothing Else Now"
+#: lib/diff.tcl:889
+msgid "Failed to undo last revert."
 msgstr ""
 
-#: lib/remote_add.tcl:101
-msgid "Please supply a remote name."
+#: lib/sshkey.tcl:34
+msgid "No keys found."
 msgstr ""
 
-#: lib/remote_add.tcl:114
+#: lib/sshkey.tcl:37
 #, tcl-format
-msgid "'%s' is not an acceptable remote name."
+msgid "Found a public key in: %s"
 msgstr ""
 
-#: lib/remote_add.tcl:125
-#, tcl-format
-msgid "Failed to add remote '%s' of location '%s'."
+#: lib/sshkey.tcl:43
+msgid "Generate Key"
 msgstr ""
 
-#: lib/remote_add.tcl:133 lib/transport.tcl:6
-#, tcl-format
-msgid "fetch %s"
+#: lib/sshkey.tcl:61
+msgid "Copy To Clipboard"
 msgstr ""
 
-#: lib/remote_add.tcl:134
-#, tcl-format
-msgid "Fetching the %s"
+#: lib/sshkey.tcl:75
+msgid "Your OpenSSH Public Key"
 msgstr ""
 
-#: lib/remote_add.tcl:157
+#: lib/sshkey.tcl:83
+msgid "Generating..."
+msgstr ""
+
+#: lib/sshkey.tcl:89
 #, tcl-format
-msgid "Do not know how to initialize repository at location '%s'."
+msgid ""
+"Could not start ssh-keygen:\n"
+"\n"
+"%s"
+msgstr ""
+
+#: lib/sshkey.tcl:116
+msgid "Generation failed."
 msgstr ""
 
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
-#: lib/transport.tcl:81
+#: lib/sshkey.tcl:123
+msgid "Generation succeeded, but no keys found."
+msgstr ""
+
+#: lib/sshkey.tcl:126
 #, tcl-format
-msgid "push %s"
+msgid "Your key is in: %s"
 msgstr ""
 
-#: lib/remote_add.tcl:164
+#: lib/branch_create.tcl:23
 #, tcl-format
-msgid "Setting up the %s (at %s)"
+msgid "%s (%s): Create Branch"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
-msgid "Delete Branch Remotely"
+#: lib/branch_create.tcl:28
+msgid "Create New Branch"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:47
-msgid "From Repository"
+#: lib/branch_create.tcl:42
+msgid "Branch Name"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
-msgid "Remote:"
+#: lib/branch_create.tcl:57
+msgid "Match Tracking Branch Name"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
-msgid "Arbitrary Location:"
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:84
-msgid "Branches"
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:109
-msgid "Delete Only If"
+#: lib/branch_create.tcl:75
+msgid "No"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:111
-msgid "Merged Into:"
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:152
-msgid "A branch is required for 'Merged Into'."
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:184
-#, tcl-format
-msgid ""
-"The following branches are not completely merged into %s:\n"
-"\n"
-" - %s"
+#: lib/branch_create.tcl:132
+msgid "Please select a tracking branch."
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:189
+#: lib/branch_create.tcl:141
 #, tcl-format
-msgid ""
-"One or more of the merge tests failed because you have not fetched the "
-"necessary commits.  Try fetching from %s first."
+msgid "Tracking branch %s is not a branch in the remote repository."
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:207
-msgid "Please select one or more branches to delete."
+#: lib/console.tcl:59
+msgid "Working... please wait..."
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:226
-#, tcl-format
-msgid "Deleting branches from %s"
+#: lib/console.tcl:186
+msgid "Success"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:292
-msgid "No repository selected."
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr ""
+
+#: lib/line.tcl:17
+msgid "Goto Line:"
+msgstr ""
+
+#: lib/line.tcl:23
+msgid "Go"
+msgstr ""
+
+#: lib/choose_rev.tcl:52
+msgid "This Detached Checkout"
+msgstr ""
+
+#: lib/choose_rev.tcl:60
+msgid "Revision Expression:"
+msgstr ""
+
+#: lib/choose_rev.tcl:72
+msgid "Local Branch"
+msgstr ""
+
+#: lib/choose_rev.tcl:77
+msgid "Tracking Branch"
+msgstr ""
+
+#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544
+msgid "Tag"
 msgstr ""
 
-#: lib/remote_branch_delete.tcl:297
+#: lib/choose_rev.tcl:321
 #, tcl-format
-msgid "Scanning %s..."
+msgid "Invalid revision: %s"
 msgstr ""
 
-#: lib/search.tcl:21
-msgid "Find:"
+#: lib/choose_rev.tcl:342
+msgid "No revision selected."
 msgstr ""
 
-#: lib/search.tcl:23
-msgid "Next"
+#: lib/choose_rev.tcl:350
+msgid "Revision expression is empty."
 msgstr ""
 
-#: lib/search.tcl:24
-msgid "Prev"
+#: lib/choose_rev.tcl:537
+msgid "Updated"
 msgstr ""
 
-#: lib/search.tcl:25
-msgid "Case-Sensitive"
+#: lib/choose_rev.tcl:565
+msgid "URL"
 msgstr ""
 
-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
-msgid "Cannot write shortcut:"
+#: lib/commit.tcl:9
+msgid ""
+"There is nothing to amend.\n"
+"\n"
+"You are about to create the initial commit.  There is no commit before this "
+"to amend.\n"
 msgstr ""
 
-#: lib/shortcut.tcl:137
-msgid "Cannot write icon:"
+#: lib/commit.tcl:18
+msgid ""
+"Cannot amend while merging.\n"
+"\n"
+"You are currently in the middle of a merge that has not been fully "
+"completed.  You cannot amend the prior commit unless you first abort the "
+"current merge activity.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:57
-msgid "Unsupported spell checker"
+#: lib/commit.tcl:56
+msgid "Error loading commit data for amend:"
 msgstr ""
 
-#: lib/spellcheck.tcl:65
-msgid "Spell checking is unavailable"
+#: lib/commit.tcl:83
+msgid "Unable to obtain your identity:"
 msgstr ""
 
-#: lib/spellcheck.tcl:68
-msgid "Invalid spell checking configuration"
+#: lib/commit.tcl:88
+msgid "Invalid GIT_COMMITTER_IDENT:"
 msgstr ""
 
-#: lib/spellcheck.tcl:70
+#: lib/commit.tcl:138
 #, tcl-format
-msgid "Reverting dictionary to %s."
+msgid "warning: Tcl does not support encoding '%s'."
 msgstr ""
 
-#: lib/spellcheck.tcl:73
-msgid "Spell checker silently failed on startup"
+#: lib/commit.tcl:158
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan.  A "
+"rescan must be performed before another commit can be created.\n"
+"\n"
+"The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:80
-msgid "Unrecognized spell checker"
+#: lib/commit.tcl:182
+#, tcl-format
+msgid ""
+"Unmerged files cannot be committed.\n"
+"\n"
+"File %s has merge conflicts.  You must resolve them and stage the file "
+"before committing.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:186
-msgid "No Suggestions"
+#: lib/commit.tcl:190
+#, tcl-format
+msgid ""
+"Unknown file state %s detected.\n"
+"\n"
+"File %s cannot be committed by this program.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:388
-msgid "Unexpected EOF from spell checker"
+#: lib/commit.tcl:198
+msgid ""
+"No changes to commit.\n"
+"\n"
+"You must stage at least 1 file before you can commit.\n"
 msgstr ""
 
-#: lib/spellcheck.tcl:392
-msgid "Spell Checker Failed"
+#: lib/commit.tcl:213
+msgid ""
+"Please supply a commit message.\n"
+"\n"
+"A good commit message has the following format:\n"
+"\n"
+"- First line: Describe in one sentence what you did.\n"
+"- Second line: Blank\n"
+"- Remaining lines: Describe why this change is good.\n"
 msgstr ""
 
-#: lib/sshkey.tcl:31
-msgid "No keys found."
+#: lib/commit.tcl:244
+msgid "Calling pre-commit hook..."
 msgstr ""
 
-#: lib/sshkey.tcl:34
-#, tcl-format
-msgid "Found a public key in: %s"
+#: lib/commit.tcl:259
+msgid "Commit declined by pre-commit hook."
 msgstr ""
 
-#: lib/sshkey.tcl:40
-msgid "Generate Key"
+#: lib/commit.tcl:278
+msgid ""
+"You are about to commit on a detached head. This is a potentially dangerous "
+"thing to do because if you switch to another branch you will lose your "
+"changes and it can be difficult to retrieve them later from the reflog. You "
+"should probably cancel this commit and create a new branch to continue.\n"
+" \n"
+" Do you really want to proceed with your Commit?"
 msgstr ""
 
-#: lib/sshkey.tcl:56
-msgid "Copy To Clipboard"
+#: lib/commit.tcl:299
+msgid "Calling commit-msg hook..."
 msgstr ""
 
-#: lib/sshkey.tcl:70
-msgid "Your OpenSSH Public Key"
+#: lib/commit.tcl:314
+msgid "Commit declined by commit-msg hook."
 msgstr ""
 
-#: lib/sshkey.tcl:78
-msgid "Generating..."
+#: lib/commit.tcl:327
+msgid "Committing changes..."
+msgstr ""
+
+#: lib/commit.tcl:344
+msgid "write-tree failed:"
+msgstr ""
+
+#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422
+msgid "Commit failed."
 msgstr ""
 
-#: lib/sshkey.tcl:84
+#: lib/commit.tcl:362
 #, tcl-format
+msgid "Commit %s appears to be corrupt"
+msgstr ""
+
+#: lib/commit.tcl:367
 msgid ""
-"Could not start ssh-keygen:\n"
+"No changes to commit.\n"
 "\n"
-"%s"
+"No files were modified by this commit and it was not a merge commit.\n"
+"\n"
+"A rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/sshkey.tcl:111
-msgid "Generation failed."
+#: lib/commit.tcl:374
+msgid "No changes to commit."
 msgstr ""
 
-#: lib/sshkey.tcl:118
-msgid "Generation succeeded, but no keys found."
+#: lib/commit.tcl:394
+msgid "commit-tree failed:"
 msgstr ""
 
-#: lib/sshkey.tcl:121
-#, tcl-format
-msgid "Your key is in: %s"
+#: lib/commit.tcl:421
+msgid "update-ref failed:"
 msgstr ""
 
-#: lib/status_bar.tcl:83
+#: lib/commit.tcl:514
 #, tcl-format
-msgid "%s ... %*i of %*i %s (%3i%%)"
+msgid "Created commit %s: %s"
 msgstr ""
 
-#: lib/tools.tcl:75
+#: lib/branch_delete.tcl:16
 #, tcl-format
-msgid "Running %s requires a selected file."
+msgid "%s (%s): Delete Branch"
 msgstr ""
 
-#: lib/tools.tcl:90
-#, tcl-format
-msgid "Are you sure you want to run %s?"
+#: lib/branch_delete.tcl:21
+msgid "Delete Local Branch"
+msgstr ""
+
+#: lib/branch_delete.tcl:39
+msgid "Local Branches"
 msgstr ""
 
-#: lib/tools.tcl:110
+#: lib/branch_delete.tcl:51
+msgid "Delete Only If Merged Into"
+msgstr ""
+
+#: lib/branch_delete.tcl:103
 #, tcl-format
-msgid "Tool: %s"
+msgid "The following branches are not completely merged into %s:"
 msgstr ""
 
-#: lib/tools.tcl:111
+#: lib/branch_delete.tcl:131
 #, tcl-format
-msgid "Running: %s"
+msgid " - %s:"
 msgstr ""
 
-#: lib/tools.tcl:149
+#: lib/branch_delete.tcl:141
 #, tcl-format
-msgid "Tool completed successfully: %s"
+msgid ""
+"Failed to delete branches:\n"
+"%s"
 msgstr ""
 
-#: lib/tools.tcl:151
+#: lib/date.tcl:25
 #, tcl-format
-msgid "Tool failed: %s"
+msgid "Invalid date from Git: %s"
 msgstr ""
 
-#: lib/tools_dlg.tcl:22
-msgid "Add Tool"
+#: lib/database.tcl:42
+msgid "Number of loose objects"
 msgstr ""
 
-#: lib/tools_dlg.tcl:28
-msgid "Add New Tool Command"
+#: lib/database.tcl:43
+msgid "Disk space used by loose objects"
 msgstr ""
 
-#: lib/tools_dlg.tcl:33
-msgid "Add globally"
+#: lib/database.tcl:44
+msgid "Number of packed objects"
 msgstr ""
 
-#: lib/tools_dlg.tcl:45
-msgid "Tool Details"
+#: lib/database.tcl:45
+msgid "Number of packs"
 msgstr ""
 
-#: lib/tools_dlg.tcl:48
-msgid "Use '/' separators to create a submenu tree:"
+#: lib/database.tcl:46
+msgid "Disk space used by packed objects"
 msgstr ""
 
-#: lib/tools_dlg.tcl:61
-msgid "Command:"
+#: lib/database.tcl:47
+msgid "Packed objects waiting for pruning"
 msgstr ""
 
-#: lib/tools_dlg.tcl:74
-msgid "Show a dialog before running"
+#: lib/database.tcl:48
+msgid "Garbage files"
 msgstr ""
 
-#: lib/tools_dlg.tcl:80
-msgid "Ask the user to select a revision (sets $REVISION)"
+#: lib/database.tcl:66
+#, tcl-format
+msgid "%s (%s): Database Statistics"
 msgstr ""
 
-#: lib/tools_dlg.tcl:85
-msgid "Ask the user for additional arguments (sets $ARGS)"
+#: lib/database.tcl:72
+msgid "Compressing the object database"
 msgstr ""
 
-#: lib/tools_dlg.tcl:92
-msgid "Don't show the command output window"
+#: lib/database.tcl:83
+msgid "Verifying the object database with fsck-objects"
 msgstr ""
 
-#: lib/tools_dlg.tcl:97
-msgid "Run only if a diff is selected ($FILENAME not empty)"
+#: lib/database.tcl:107
+#, tcl-format
+msgid ""
+"This repository currently has approximately %i loose objects.\n"
+"\n"
+"To maintain optimal performance it is strongly recommended that you compress "
+"the database.\n"
+"\n"
+"Compress the database now?"
 msgstr ""
 
-#: lib/tools_dlg.tcl:121
-msgid "Please supply a name for the tool."
+#: lib/error.tcl:20
+#, tcl-format
+msgid "%s: error"
 msgstr ""
 
-#: lib/tools_dlg.tcl:129
+#: lib/error.tcl:36
 #, tcl-format
-msgid "Tool '%s' already exists."
+msgid "%s: warning"
 msgstr ""
 
-#: lib/tools_dlg.tcl:151
+#: lib/error.tcl:80
 #, tcl-format
-msgid ""
-"Could not add tool:\n"
-"%s"
+msgid "%s hook failed:"
 msgstr ""
 
-#: lib/tools_dlg.tcl:190
-msgid "Remove Tool"
+#: lib/error.tcl:96
+msgid "You must correct the above errors before committing."
 msgstr ""
 
-#: lib/tools_dlg.tcl:196
-msgid "Remove Tool Commands"
+#: lib/error.tcl:116
+#, tcl-format
+msgid "%s (%s): error"
 msgstr ""
 
-#: lib/tools_dlg.tcl:200
-msgid "Remove"
+#: lib/merge.tcl:13
+msgid ""
+"Cannot merge while amending.\n"
+"\n"
+"You must finish amending this commit before starting any type of merge.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:236
-msgid "(Blue denotes repository-local tools)"
+#: lib/merge.tcl:27
+msgid ""
+"Last scanned state does not match repository state.\n"
+"\n"
+"Another Git program has modified this repository since the last scan.  A "
+"rescan must be performed before a merge can be performed.\n"
+"\n"
+"The rescan will be automatically started now.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:297
+#: lib/merge.tcl:45
 #, tcl-format
-msgid "Run Command: %s"
+msgid ""
+"You are in the middle of a conflicted merge.\n"
+"\n"
+"File %s has merge conflicts.\n"
+"\n"
+"You must resolve them, stage the file, and commit to complete the current "
+"merge.  Only then can you begin another merge.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:311
-msgid "Arguments"
+#: lib/merge.tcl:55
+#, tcl-format
+msgid ""
+"You are in the middle of a change.\n"
+"\n"
+"File %s is modified.\n"
+"\n"
+"You should complete the current commit before starting a merge.  Doing so "
+"will help you abort a failed merge, should the need arise.\n"
 msgstr ""
 
-#: lib/tools_dlg.tcl:348
-msgid "OK"
+#: lib/merge.tcl:108
+#, tcl-format
+msgid "%s of %s"
 msgstr ""
 
-#: lib/transport.tcl:7
+#: lib/merge.tcl:126
 #, tcl-format
-msgid "Fetching new changes from %s"
+msgid "Merging %s and %s..."
 msgstr ""
 
-#: lib/transport.tcl:18
-#, tcl-format
-msgid "remote prune %s"
+#: lib/merge.tcl:137
+msgid "Merge completed successfully."
 msgstr ""
 
-#: lib/transport.tcl:19
-#, tcl-format
-msgid "Pruning tracking branches deleted from %s"
+#: lib/merge.tcl:139
+msgid "Merge failed.  Conflict resolution is required."
 msgstr ""
 
-#: lib/transport.tcl:26
+#: lib/merge.tcl:156
 #, tcl-format
-msgid "Pushing changes to %s"
+msgid "%s (%s): Merge"
 msgstr ""
 
-#: lib/transport.tcl:64
+#: lib/merge.tcl:164
 #, tcl-format
-msgid "Mirroring to %s"
+msgid "Merge Into %s"
 msgstr ""
 
-#: lib/transport.tcl:82
-#, tcl-format
-msgid "Pushing %s %s to %s"
+#: lib/merge.tcl:183
+msgid "Revision To Merge"
 msgstr ""
 
-#: lib/transport.tcl:100
-msgid "Push Branches"
+#: lib/merge.tcl:218
+msgid ""
+"Cannot abort while amending.\n"
+"\n"
+"You must finish amending this commit.\n"
 msgstr ""
 
-#: lib/transport.tcl:114
-msgid "Source Branches"
+#: lib/merge.tcl:228
+msgid ""
+"Abort merge?\n"
+"\n"
+"Aborting the current merge will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with aborting the current merge?"
 msgstr ""
 
-#: lib/transport.tcl:131
-msgid "Destination Repository"
+#: lib/merge.tcl:234
+msgid ""
+"Reset changes?\n"
+"\n"
+"Resetting the changes will cause *ALL* uncommitted changes to be lost.\n"
+"\n"
+"Continue with resetting the current changes?"
 msgstr ""
 
-#: lib/transport.tcl:169
-msgid "Transfer Options"
+#: lib/merge.tcl:246
+msgid "Aborting"
 msgstr ""
 
-#: lib/transport.tcl:171
-msgid "Force overwrite existing branch (may discard changes)"
+#: lib/merge.tcl:247
+msgid "files reset"
 msgstr ""
 
-#: lib/transport.tcl:175
-msgid "Use thin pack (for slow network connections)"
+#: lib/merge.tcl:277
+msgid "Abort failed."
 msgstr ""
 
-#: lib/transport.tcl:179
-msgid "Include tags"
+#: lib/merge.tcl:279
+msgid "Abort completed.  Ready."
 msgstr ""
diff --git a/git-gui/po/glossary/de.po b/git-gui/po/glossary/de.po
index 35764d1d22..4c5f233ee5 100644
--- a/git-gui/po/glossary/de.po
+++ b/git-gui/po/glossary/de.po
@@ -6,10 +6,11 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: git-gui glossary\n"
-"POT-Creation-Date: 2008-01-07 21:20+0100\n"
-"PO-Revision-Date: 2008-02-16 21:48+0100\n"
+"POT-Creation-Date: 2020-01-26 22:26+0100\n"
+"PO-Revision-Date: 2020-02-09 21:22+0100\n"
 "Last-Translator: Christian Stimming <stimming@tuhh.de>\n"
 "Language-Team: German \n"
+"Language: de_DE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,6 +20,9 @@ msgid ""
 "English Term (Dear translator: This file will never be visible to the user!)"
 msgstr ""
 "Deutsche Ãœbersetzung.\n"
+"Git-core glossary:\n"
+"  https://github.com/ruester/git-po-de/wiki/Translation-Guidelines\n"
+"\n"
 "Andere deutsche SCM:\n"
 "  http://tortoisesvn.net/docs/release/TortoiseSVN_de/index.html und http://"
 "tortoisesvn.tigris.org/svn/tortoisesvn/trunk/Languages/Tortoise_de.po "
@@ -32,33 +36,77 @@ msgstr ""
 "  http://rapidsvn.tigris.org/svn/rapidsvn/trunk/src/locale/de/rapidsvn.po "
 "(username=guest, password empty, schlecht)"
 
+#. "prematurely stop and abandon an operation"
+msgid "abort"
+msgstr "abbrechen"
+
 #. ""
 msgid "amend"
 msgstr "nachbessern (ergänzen)"
 
+#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
+msgid "ancestor"
+msgstr "Vorgänger-Commit"
+
 #. ""
 msgid "annotate"
 msgstr "annotieren"
 
+#. "The person who initially created (authored) a commit"
+msgid "author"
+msgstr "Autor"
+
+#. "a repository with only .git directory, without working directory"
+msgid "bare repository"
+msgstr "bloßes Projektarchiv"
+
+#. "a parent version of the current file"
+msgid "base"
+msgstr "Ursprung"
+
+#. ""
+msgid "bisect"
+msgstr "binäre Suche [noun], binäre Suche benutzen [verb]"
+
+#. "get the authors responsible for each line in a file"
+msgid "blame"
+msgstr "annotieren"
+
+#.      ""
+msgid "blob"
+msgstr "Blob"
+
 #. "A 'branch' is an active line of development."
 msgid "branch [noun]"
-msgstr "Zweig"
+msgstr "Branch"
 
 #. ""
 msgid "branch [verb]"
-msgstr "verzweigen"
+msgstr "branchen"
 
 #. ""
 msgid "checkout [noun]"
 msgstr ""
-"Arbeitskopie (Erstellung einer Arbeitskopie; Auscheck? Ausspielung? Abruf? "
-"Source Safe: Auscheckvorgang)"
+"Arbeitskopie (Checkout; Erstellung einer Arbeitskopie; Auscheck? Source "
+"Safe: Auscheckvorgang)"
 
 #. "The action of updating the working tree to a revision which was stored in the object database."
 msgid "checkout [verb]"
 msgstr ""
-"Arbeitskopie erstellen; Zweig umstellen [checkout a branch] (auschecken? "
-"ausspielen? abrufen? Source Safe: auschecken)"
+"Arbeitskopie erstellen; Branch auschecken [checkout a branch] (umstellen? "
+"Source Safe: auschecken)"
+
+#. "to select and apply a single commit to the current HEAD without merging"
+msgid "cherry-pick"
+msgstr "cherry-pick (pflücken?)"
+
+#. "a commit that directly succeeds the current one in git's graph of commits"
+msgid "child commit"
+msgstr "Kind-Commit"
+
+#. "clean the state of the git repository, often after manually stopped operation"
+msgid "cleanup"
+msgstr "aufräumen"
 
 #. ""
 msgid "clone [verb]"
@@ -66,39 +114,98 @@ msgstr "klonen"
 
 #. "A single point in the git history."
 msgid "commit [noun]"
-msgstr ""
-"Version; Eintragung; Änderung (Buchung?, Eintragung?, Übertragung?, "
-"Sendung?, Ãœbergabe?, Einspielung?, Ablagevorgang?)"
+msgstr "Commit (Version?)"
 
 #. "The action of storing a new snapshot of the project's state in the git history."
 msgid "commit [verb]"
 msgstr ""
-"eintragen (TortoiseSVN: übertragen; Source Safe: einchecken; senden?, "
-"übergeben?, einspielen?, einpflegen?, ablegen?)"
+"committen (eintragen?, TortoiseSVN: übertragen; Source Safe: einchecken)"
+
+#. "a message that gets attached with any commit"
+msgid "commit message"
+msgstr "Commit-Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)"
+
+#.   "The person who committed a commit (to the current branch), which might be different than the author."
+msgid "committer"
+msgstr "Committer"
+
+#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)"
+msgid "descendant"
+msgstr "Nachfolger-Commit"
+
+#.       "checkout of a revision rather than some head"
+msgid "detached HEAD"
+msgstr "losgelöster HEAD / Branchspitze"
+
+#. "checkout of a revision rather than some head"
+msgid "detached checkout"
+msgstr "losgelöster Commit (von Branch losgelöster Commit?)"
 
 #. ""
 msgid "diff [noun]"
-msgstr "Vergleich (Source Safe: Unterschiede)"
+msgstr "Vergleich (Diff? Source Safe: Unterschiede)"
 
 #. ""
 msgid "diff [verb]"
 msgstr "vergleichen"
 
-#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
-msgid "fast forward merge"
-msgstr "Schnellzusammenführung"
+#.   ""
+msgid "directory"
+msgstr "Verzeichnis"
+
+#. "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
+msgid "fast-forward"
+msgstr "vorspulen"
 
 #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
 msgid "fetch"
 msgstr "anfordern (holen?)"
 
+#. "any merge strategy that works on a file by file basis"
+msgid "file level merging"
+msgstr "Datei-basiertes zusammenführen"
+
+#.      ""
+msgid "file"
+msgstr "Datei"
+
+#. "the last revision in a branch"
+msgid "head"
+msgstr "HEAD / Branchspitze"
+
+#. "script that gets executed automatically on some event"
+msgid "hook"
+msgstr "Hook (in der dt. Informatik wohl als Einschubmethode bezeichnet)"
+
 #. "One context of consecutive lines in a whole patch, which consists of many such hunks"
 msgid "hunk"
-msgstr "Kontext"
+msgstr "Patch-Block (Kontext?)"
 
 #. "A collection of files. The index is a stored version of your working tree."
 msgid "index (in git-gui: staging area)"
-msgstr "Bereitstellung"
+msgstr ""
+"Bereitstellung (sofern der git index gemeint ist. In git-gui sowieso: "
+"staging area)"
+
+#. "the first checkout during a clone operation"
+msgid "initial checkout"
+msgstr "Erstellen der Arbeitskopie, auschecken"
+
+#. "The very first commit in a repository"
+msgid "initial commit"
+msgstr "Allererster Commit"
+
+#. "a branch that resides in the local git repository"
+msgid "local branch"
+msgstr "Lokaler Branch"
+
+#. "a Git object that is not part of any pack"
+msgid "loose object"
+msgstr "loses Objekt"
+
+#. "a branch called by convention 'master' that exists in a newly created git repository"
+msgid "master branch"
+msgstr "Master-Branch"
 
 #. "A successful merge results in the creation of a new commit representing the result of the merge."
 msgid "merge [noun]"
@@ -112,78 +219,212 @@ msgstr "zusammenführen"
 msgid "message"
 msgstr "Beschreibung (Meldung?, Nachricht?; Source Safe: Kommentar)"
 
-#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
+#. "a remote called by convention 'origin' that the current git repository has been cloned from"
+msgid "origin"
+msgstr "origin"
+
+#.       ""
+msgid "orphan commit"
+msgstr "verwaister Commit"
+
+#.  ""
+msgid "orphan reference"
+msgstr "verwaiste Referenz"
+
+#. "a file containing many git objects packed together"
+msgid "pack [noun]"
+msgstr "Pack-Datei"
+
+#.     "the process of creating a pack file"
+msgid "pack [verb]"
+msgstr "Pack-Datei erstellen"
+
+#. "a Git object part of some pack"
+msgid "packed object"
+msgstr "gepacktes Objekt"
+
+#. "a commit that directly precedes the current one in git's graph of commits"
+msgid "parent commit"
+msgstr "Eltern-Commit"
+
+msgid "patch"
+msgstr "Patch"
+
+#. "The path to a file"
+msgid "path"
+msgstr "Pfad"
+
+#. "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
 msgid "prune"
-msgstr "aufräumen (entfernen?)"
+msgstr "veraltete Branches entfernen (aufräumen?, entfernen?)"
 
 #. "Pulling a branch means to fetch it and merge it."
 msgid "pull"
-msgstr "übernehmen (ziehen?)"
+msgstr ""
+"übernehmen (pull? ziehen? Vorsicht: zusammenführen = merge, aber pull kann "
+"auch rebase bewirken)"
 
 #. "Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)"
 msgid "push"
 msgstr "versenden (ausliefern? hochladen? verschicken? schieben?)"
 
+#. "The process of rebasing one set of commits on top of another branch's head"
+msgid "rebase [noun]"
+msgstr "der Rebase (das Umpflanzen)"
+
+#. "Re-apply one set of commits on top of another branch's head. Contrary to merge."
+msgid "rebase [verb]"
+msgstr "rebase (umpflanzen)"
+
 #. ""
 msgid "redo"
 msgstr "wiederholen"
 
-#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
-msgid "remote"
-msgstr "Andere Archive (Gegenseite?, Entfernte?, Server?)"
+#.   ""
+msgid "reference"
+msgstr "Referenz"
+
+#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
+msgid "reflog"
+msgstr "Commit-Log, »reflog«"
+
+msgid "refmap"
+msgstr "Refmap"
+
+#. ""
+msgid "refspec"
+msgstr "Refspec"
+
+#. "The adjective for anything which is outside of the current (local) repository"
+msgid "remote [adj]"
+msgstr "Extern (Andere?, Gegenseite?, Entfernte?, Server?)"
+
+#.       "A branch in any other ('remote') repository"
+msgid "remote branch"
+msgstr "Externer branch"
+
+#.   "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
+msgid "remote repository"
+msgstr "Externes Repository"
 
 #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)"
 msgid "repository"
-msgstr "Projektarchiv"
+msgstr "Repository"
 
 #. ""
 msgid "reset"
-msgstr "zurücksetzen (zurückkehren?)"
+msgstr "umsetzen (reset to commit), Änderungen verwerfen (reset to HEAD)"
+
+#. "decide which changes from alternative versions of a file should persist in Git"
+msgid "resolve (a conflict)"
+msgstr "auflösen (einen Konflikt)"
+
+#. "abandon changes and go to pristine version"
+msgid "revert changes"
+msgstr ""
+"verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also "
+"mit neuem commit; umkehren?)"
 
 #. ""
 msgid "revert"
-msgstr "verwerfen (bei git-reset), revidieren (bei git-revert, also mit neuem commit)"
+msgstr ""
+"verwerfen (bei git-reset bzw. checkout), zurücknehmen (bei git-revert, also "
+"mit neuem commit; umkehren?)"
+
+#. "expression that signifies a revision in git"
+msgid "revision expression"
+msgstr "Version Regexp-Ausdruck"
 
 #. "A particular state of files and directories which was stored in the object database."
 msgid "revision"
-msgstr "Version (TortoiseSVN: Revision; Source Safe: Version)"
+msgstr ""
+"Version (aber was macht das Wort revision hier im Git?? TortoiseSVN: "
+"Revision; Source Safe: Version)"
 
 #. ""
 msgid "sign off"
-msgstr "abzeichnen (gegenzeichnen?, freizeichnen?, absegnen?)"
+msgstr "abzeichnen (signieren? gegenzeichnen?, freizeichnen?)"
 
-#. ""
+#.     "see: staging area. In some areas of git this is called 'index'."
+msgid "stage [noun], index"
+msgstr "Bereitstellung"
+
+#. "add some content of files and directories to the staging area in preparation for a commit"
+msgid "stage [verb]"
+msgstr "bereitstellen"
+
+#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'."
 msgid "staging area"
 msgstr "Bereitstellung"
 
+#. "The place (stack) where changes can be temporarily saved without committing"
+msgid "stash [noun]"
+msgstr "der Stash"
+
+#. "temporarily save changes in a stack without committing"
+msgid "stash [verb]"
+msgstr "in Stash speichern; \"stash\" benutzen"
+
 #. ""
 msgid "status"
 msgstr "Status"
 
-#. "A ref pointing to a tag or commit object"
+#. ""
+msgid "submodule"
+msgstr "Submodul (Untermodul?)"
+
+#. "A ref pointing to some commit object. In other words: A label on a specific commit."
 msgid "tag [noun]"
-msgstr "Markierung"
+msgstr "Tag (Markierung?)"
 
-#. ""
+#. "The process of creating a tag at a specific commit object"
 msgid "tag [verb]"
-msgstr "markieren"
+msgstr "taggen (markieren?)"
+
+#. "The person who created a tag"
+msgid "tagger"
+msgstr "Tag-Ersteller (Markierungs-Ersteller?)"
+
+#. "file whose content is tracked/not tracked by git"
+msgid "tracked/untracked"
+msgstr "versioniert/unversioniert"
 
 #. "A regular git branch that is used to follow changes from another repository."
 msgid "tracking branch"
-msgstr "Ãœbernahmezweig"
+msgstr "Tracking-Branch (Verfolgungsbranch? Ãœbernahmebranch?)"
+
+#. ""
+msgid "trailer"
+msgstr "Anhang"
+
+#. "1. tree object, 2. directory tree"
+msgid "tree"
+msgstr "1. Baum-Objekt, 2. Verzeichnisbaum"
 
 #. ""
 msgid "undo"
 msgstr "rückgängig"
 
+#. "Remove content of files from the staging area again so that it will not be part of the next commit"
+msgid "unstage"
+msgstr "aus Bereitstellung herausnehmen"
+
+#. "Retrieving the temporarily saved changes back again from the stash"
+msgid "unstash [verb]"
+msgstr "aus Stash zurückladen"
+
 #. ""
 msgid "update"
 msgstr "aktualisieren"
 
 #. ""
+msgid "upstream branch"
+msgstr "Upstream-Branch"
+
+#. ""
 msgid "verify"
 msgstr "überprüfen"
 
 #. "The tree of actual checked out files."
-msgid "working copy, working tree"
+msgid "working directory, working copy, working tree"
 msgstr "Arbeitskopie"
diff --git a/git-gui/po/glossary/git-gui-glossary.pot b/git-gui/po/glossary/git-gui-glossary.pot
index 40eb3e9c07..4e66e0da3a 100644
--- a/git-gui/po/glossary/git-gui-glossary.pot
+++ b/git-gui/po/glossary/git-gui-glossary.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2008-01-07 21:20+0100\n"
+"POT-Creation-Date: 2020-01-26 22:26+0100\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"
@@ -18,14 +18,46 @@ msgstr ""
 msgid "English Term (Dear translator: This file will never be visible to the user!)"
 msgstr ""
 
+#. "prematurely stop and abandon an operation"
+msgid "abort"
+msgstr ""
+
 #. ""
 msgid "amend"
 msgstr ""
 
+#. "a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
+msgid "ancestor"
+msgstr ""
+
 #. ""
 msgid "annotate"
 msgstr ""
 
+#. "The person who initially created (authored) a commit"
+msgid "author"
+msgstr ""
+
+#. "a repository with only .git directory, without working directory"
+msgid "bare repository"
+msgstr ""
+
+#. "a parent version of the current file"
+msgid "base"
+msgstr ""
+
+#. ""
+msgid "bisect"
+msgstr ""
+
+#. "get the authors responsible for each line in a file"
+msgid "blame"
+msgstr ""
+
+#.      ""
+msgid "blob"
+msgstr ""
+
 #. "A 'branch' is an active line of development."
 msgid "branch [noun]"
 msgstr ""
@@ -42,6 +74,18 @@ msgstr ""
 msgid "checkout [verb]"
 msgstr ""
 
+#. "to select and apply a single commit to the current HEAD without merging"
+msgid "cherry-pick"
+msgstr ""
+
+#. "a commit that directly succeeds the current one in git's graph of commits"
+msgid "child commit"
+msgstr ""
+
+#. "clean the state of the git repository, often after manually stopped operation"
+msgid "cleanup"
+msgstr ""
+
 #. ""
 msgid "clone [verb]"
 msgstr ""
@@ -54,6 +98,26 @@ msgstr ""
 msgid "commit [verb]"
 msgstr ""
 
+#. "a message that gets attached with any commit"
+msgid "commit message"
+msgstr ""
+
+#.   "The person who committed a commit (to the current branch), which might be different than the author."
+msgid "committer"
+msgstr ""
+
+#. "a commit that precedes the current one in git's graph of commits (not necessarily directly)"
+msgid "descendant"
+msgstr ""
+
+#.       "checkout of a revision rather than some head"
+msgid "detached HEAD"
+msgstr ""
+
+#. "checkout of a revision rather than some head"
+msgid "detached checkout"
+msgstr ""
+
 #. ""
 msgid "diff [noun]"
 msgstr ""
@@ -62,14 +126,34 @@ msgstr ""
 msgid "diff [verb]"
 msgstr ""
 
-#. "A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
-msgid "fast forward merge"
+#.   ""
+msgid "directory"
+msgstr ""
+
+#. "A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
+msgid "fast-forward"
 msgstr ""
 
 #. "Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
 msgid "fetch"
 msgstr ""
 
+#. "any merge strategy that works on a file by file basis"
+msgid "file level merging"
+msgstr ""
+
+#.      ""
+msgid "file"
+msgstr ""
+
+#. "the last revision in a branch"
+msgid "head"
+msgstr ""
+
+#. "script that gets executed automatically on some event"
+msgid "hook"
+msgstr ""
+
 #. "One context of consecutive lines in a whole patch, which consists of many such hunks"
 msgid "hunk"
 msgstr ""
@@ -78,6 +162,26 @@ msgstr ""
 msgid "index (in git-gui: staging area)"
 msgstr ""
 
+#. "the first checkout during a clone operation"
+msgid "initial checkout"
+msgstr ""
+
+#. "The very first commit in a repository"
+msgid "initial commit"
+msgstr ""
+
+#. "a branch that resides in the local git repository"
+msgid "local branch"
+msgstr ""
+
+#. "a Git object that is not part of any pack"
+msgid "loose object"
+msgstr ""
+
+#. "a branch called by convention 'master' that exists in a newly created git repository"
+msgid "master branch"
+msgstr ""
+
 #. "A successful merge results in the creation of a new commit representing the result of the merge."
 msgid "merge [noun]"
 msgstr ""
@@ -90,7 +194,42 @@ msgstr ""
 msgid "message"
 msgstr ""
 
-#. "Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
+#. "a remote called by convention 'origin' that the current git repository has been cloned from"
+msgid "origin"
+msgstr ""
+
+#.       ""
+msgid "orphan commit"
+msgstr ""
+
+#.  ""
+msgid "orphan reference"
+msgstr ""
+
+#. "a file containing many git objects packed together"
+msgid "pack [noun]"
+msgstr ""
+
+#.     "the process of creating a pack file"
+msgid "pack [verb]"
+msgstr ""
+
+#. "a Git object part of some pack"
+msgid "packed object"
+msgstr ""
+
+#. "a commit that directly precedes the current one in git's graph of commits"
+msgid "parent commit"
+msgstr ""
+
+msgid "patch" ""
+msgstr ""
+
+#. "The path to a file"
+msgid "path"
+msgstr ""
+
+#. "Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
 msgid "prune"
 msgstr ""
 
@@ -102,12 +241,43 @@ msgstr ""
 msgid "push"
 msgstr ""
 
+#. "The process of rebasing one set of commits on top of another branch's head"
+msgid "rebase [noun]"
+msgstr ""
+
+#. "Re-apply one set of commits on top of another branch's head. Contrary to merge."
+msgid "rebase [verb]"
+msgstr ""
+
 #. ""
 msgid "redo"
 msgstr ""
 
-#. "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
-msgid "remote"
+#.   ""
+msgid "reference"
+msgstr ""
+
+#. "the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
+msgid "reflog"
+msgstr ""
+
+msgid "refmap"       ""
+msgstr ""
+
+#. ""
+msgid "refspec"
+msgstr ""
+
+#. "The adjective for anything which is outside of the current (local) repository"
+msgid "remote [adj]"
+msgstr ""
+
+#.       "A branch in any other ('remote') repository"
+msgid "remote branch"
+msgstr ""
+
+#.   "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
+msgid "remote repository"
 msgstr ""
 
 #. "A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)"
@@ -118,10 +288,22 @@ msgstr ""
 msgid "reset"
 msgstr ""
 
+#. "decide which changes from alternative versions of a file should persist in Git"
+msgid "resolve (a conflict)"
+msgstr ""
+
+#. "abandon changes and go to pristine version"
+msgid "revert changes"
+msgstr ""
+
 #. ""
 msgid "revert"
 msgstr ""
 
+#. "expression that signifies a revision in git"
+msgid "revision expression"
+msgstr ""
+
 #. "A particular state of files and directories which was stored in the object database."
 msgid "revision"
 msgstr ""
@@ -130,39 +312,87 @@ msgstr ""
 msgid "sign off"
 msgstr ""
 
-#. ""
+#.     "see: staging area. In some areas of git this is called 'index'."
+msgid "stage [noun], index"
+msgstr ""
+
+#. "add some content of files and directories to the staging area in preparation for a commit"
+msgid "stage [verb]"
+msgstr ""
+
+#. "The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'."
 msgid "staging area"
 msgstr ""
 
+#. "The place (stack) where changes can be temporarily saved without committing"
+msgid "stash [noun]"
+msgstr ""
+
+#. "temporarily save changes in a stack without committing"
+msgid "stash [verb]"
+msgstr ""
+
 #. ""
 msgid "status"
 msgstr ""
 
-#. "A ref pointing to a tag or commit object"
+#. ""
+msgid "submodule"
+msgstr ""
+
+#. "A ref pointing to some commit object. In other words: A label on a specific commit."
 msgid "tag [noun]"
 msgstr ""
 
-#. ""
+#. "The process of creating a tag at a specific commit object"
 msgid "tag [verb]"
 msgstr ""
 
+#. "The person who created a tag"
+msgid "tagger"
+msgstr ""
+
+#. "file whose content is tracked/not tracked by git"
+msgid "tracked/untracked"
+msgstr ""
+
 #. "A regular git branch that is used to follow changes from another repository."
 msgid "tracking branch"
 msgstr ""
 
 #. ""
+msgid "trailer"
+msgstr ""
+
+#. "1. tree object, 2. directory tree"
+msgid "tree"
+msgstr ""
+
+#. ""
 msgid "undo"
 msgstr ""
 
+#. "Remove content of files from the staging area again so that it will not be part of the next commit"
+msgid "unstage"
+msgstr ""
+
+#. "Retrieving the temporarily saved changes back again from the stash"
+msgid "unstash [verb]"
+msgstr ""
+
 #. ""
 msgid "update"
 msgstr ""
 
 #. ""
+msgid "upstream branch"
+msgstr ""
+
+#. ""
 msgid "verify"
 msgstr ""
 
 #. "The tree of actual checked out files."
-msgid "working copy, working tree"
+msgid "working directory, working copy, working tree"
 msgstr ""
 
diff --git a/git-gui/po/glossary/git-gui-glossary.txt b/git-gui/po/glossary/git-gui-glossary.txt
index 409304692d..48b9f10e57 100644
--- a/git-gui/po/glossary/git-gui-glossary.txt
+++ b/git-gui/po/glossary/git-gui-glossary.txt
@@ -1,67 +1,96 @@
 "English Term (Dear translator: This file will never be visible to the user!)"	"English Definition (Dear translator: This file will never be visible to the user! It should only serve as a tool for you, the translator. Nothing more.)"
+"abort"	"prematurely stop and abandon an operation"
 "amend"	""
+"ancestor"	"a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
 "annotate"	""
+"author"	"The person who initially created (authored) a commit"
+"bare repository"	"a repository with only .git directory, without working directory"
+"base"	"a parent version of the current file"
+"bisect"	""
+"blame"	"get the authors responsible for each line in a file"
+"blob"	     ""
 "branch [noun]"	"A 'branch' is an active line of development."
 "branch [verb]"	""
 "checkout [noun]"	""
 "checkout [verb]"	"The action of updating the working tree to a revision which was stored in the object database."
+"cherry-pick"	"to select and apply a single commit to the current HEAD without merging"
+"child commit"	"a commit that directly succeeds the current one in git's graph of commits"
+"cleanup"	"clean the state of the git repository, often after manually stopped operation"
 "clone [verb]"	""
 "commit [noun]"	"A single point in the git history."
 "commit [verb]"	"The action of storing a new snapshot of the project's state in the git history."
+"commit message"	"a message that gets attached with any commit"
+"committer"	  "The person who committed a commit (to the current branch), which might be different than the author."
+"descendant"	"a commit that precedes the current one in git's graph of commits (not necessarily directly)"
+"detached HEAD"	      "checkout of a revision rather than some head"
+"detached checkout"	"checkout of a revision rather than some head"
 "diff [noun]"	""
 "diff [verb]"	""
-"fast forward merge"	"A fast-forward is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
+"directory"	  ""
+"fast-forward"	"A fast-forward merge is a special type of merge where you have a revision and you are merging another branch's changes that happen to be a descendant of what you have."
 "fetch"	"Fetching a branch means to get the branch's head from a remote repository, to find out which objects are missing from the local object database, and to get them, too."
+"file level merging"	"any merge strategy that works on a file by file basis"
+"file"	     ""
+"head"	"the last revision in a branch"
+"hook"	"script that gets executed automatically on some event"
 "hunk"	"One context of consecutive lines in a whole patch, which consists of many such hunks"
 "index (in git-gui: staging area)"	"A collection of files. The index is a stored version of your working tree."
+"initial checkout"	"the first checkout during a clone operation"
+"initial commit"	"The very first commit in a repository"
+"local branch"	"a branch that resides in the local git repository"
+"loose object"	"a Git object that is not part of any pack"
+"master branch"	"a branch called by convention 'master' that exists in a newly created git repository"
 "merge [noun]"	"A successful merge results in the creation of a new commit representing the result of the merge."
 "merge [verb]"	"To bring the contents of another branch into the current branch."
 "message"	""
-"prune"	"Deletes all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
+"origin"	"a remote called by convention 'origin' that the current git repository has been cloned from"
+"orphan commit"	      ""
+"orphan reference"	 ""
+"pack [noun]"	"a file containing many git objects packed together"
+"pack [verb]"	    "the process of creating a pack file"
+"packed object"	"a Git object part of some pack"
+"parent commit"	"a commit that directly precedes the current one in git's graph of commits"
+"patch" ""
+"path"	"The path to a file"
+"prune"	"Delete all stale tracking branches under <name>. These stale branches have already been removed from the remote repository referenced by <name>, but are still locally available in 'remotes/<name>'."
 "pull"	"Pulling a branch means to fetch it and merge it."
 "push"	"Pushing a branch means to get the branch's head ref from a remote repository, and ... (well, can someone please explain it for mere mortals?)"
+"rebase [noun]"	"The process of rebasing one set of commits on top of another branch's head"
+"rebase [verb]"	"Re-apply one set of commits on top of another branch's head. Contrary to merge."
 "redo"	""
-"remote"	"An other repository ('remote'). One might have a set of remotes whose branches one tracks."
+"reference"	  ""
+"reflog"	"the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
+"refmap"       ""
+"refspec"	""
+"remote [adj]"	"The adjective for anything which is outside of the current (local) repository"
+"remote branch"	      "A branch in any other ('remote') repository"
+"remote repository"	  "An other repository ('remote'). One might have a set of remotes whose branches one tracks."
 "repository"	"A collection of refs (?) together with an object database containing all objects which are reachable from the refs... (oops, you've lost me here. Again, please an explanation for mere mortals?)"
 "reset"	""
+"resolve (a conflict)"	"decide which changes from alternative versions of a file should persist in Git"
+"revert changes"	"abandon changes and go to pristine version"
 "revert"	""
+"revision expression"	"expression that signifies a revision in git"
 "revision"	"A particular state of files and directories which was stored in the object database."
 "sign off"	""
-"staging area"	""
+"stage [noun], index"	    "see: staging area. In some areas of git this is called 'index'."
+"stage [verb]"	"add some content of files and directories to the staging area in preparation for a commit"
+"staging area"	"The place where changes from files are marked to be included for the next commit. In some areas of git this is called 'index'."
+"stash [noun]"	"The place (stack) where changes can be temporarily saved without committing"
+"stash [verb]"	"temporarily save changes in a stack without committing"
 "status"	""
-"tag [noun]"	"A ref pointing to a tag or commit object"
-"tag [verb]"	""
+"submodule"	""
+"tag [noun]"	"A ref pointing to some commit object. In other words: A label on a specific commit."
+"tag [verb]"	"The process of creating a tag at a specific commit object"
+"tagger"	"The person who created a tag"
+"tracked/untracked"	"file whose content is tracked/not tracked by git"
 "tracking branch"	"A regular git branch that is used to follow changes from another repository."
+"trailer"	""
+"tree"	"1. tree object, 2. directory tree"
 "undo"	""
+"unstage"	"Remove content of files from the staging area again so that it will not be part of the next commit"
+"unstash [verb]"	"Retrieving the temporarily saved changes back again from the stash"
 "update"	""
+"upstream branch"	""
 "verify"	""
-"working copy, working tree"	"The tree of actual checked out files."
-"ancestor"	"a commit that succeeds the current one in git's graph of commits (not necessarily directly)"
-"abort"	"prematurely stop and abandon an operation"
-"bare repository"	"a repository with only .git directory, without working directory"
-"base"	"a parent version of the current file"
-"blame"	"get the authors responsible for each line in a file"
-"cherry-pick"	"to select and apply a single commit without merging"
-"child"	"a commit that directly succeeds the current one in git's graph of commits"
-"cleanup"	"clean the state of the git repository, often after manually stopped operation"
-"commit message"	"a message that gets attached with any commit"
-"descendant"	"a commit that precedes the current one in git's graph of commits (not necessarily directly)"
-"detached checkout"	"checkout of a revision rather than a some head"
-"file level merging"	"any merge strategy that works on a file by file basis"
-"head"	"the last revision in a branch"
-"hook"	"script that gets executed automatically on some event"
-"initial checkout"	"the first checkout during a clone operation"
-"local branch"	"a branch that resides in the local git repository"
-"loose object"	"a Git object that is not part of any pack"
-"master branch"	"a branch called by convention 'master' that exists in a newly created git repository"
-"origin"	"a remote called by convention 'origin' that the current git repository has been cloned from"
-"pack [noun]"	"a file containing many git objects packed together"
-"packed object"	"a Git object part of some pack"
-"parent"	"a commit that directly precedes the current one in git's graph of commits"
-"reflog"	"the log file containing all states of the HEAD reference (in other words past pristine states of the working copy)"
-"resolve (a conflict)"	"decide which changes from alternative versions of a file should persist in Git"
-"revert changes"	"abandon changes and go to pristine version"
-"revision expression"	"expression that signifies a revision in git"
-"stage/unstage"	"add some content of files and directories to the staging area in preparation for a commit"
-"stash"	"temporarily save changes in a stack without committing"
-"tracked/untracked"	"file whose content is tracked/not tracked by git"
+"working directory, working copy, working tree"	"The tree of actual checked out files."
diff --git a/git-gui/po/ru.po b/git-gui/po/ru.po
index 9f5305c43e..7aebaf809d 100644
--- a/git-gui/po/ru.po
+++ b/git-gui/po/ru.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2007 Shawn Pearce
 # This file is distributed under the same license as the git-gui package.
 # Translators:
-# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015-2016
+# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2015-2016,2020
 # Irina Riesen <irina.riesen@gmail.com>, 2007
 msgid ""
 msgstr ""
 "Project-Id-Version: Git Russian Localization Project\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-26 15:47-0800\n"
-"PO-Revision-Date: 2016-06-30 12:39+0000\n"
+"POT-Creation-Date: 2020-02-08 22:54+0100\n"
+"PO-Revision-Date: 2020-11-05 11:20+0000\n"
 "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -18,33 +18,33 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
-#: git-gui.sh:922
-msgid "git-gui: fatal error"
-msgstr "git-gui: критиче�ка� ошибка"
-
-#: git-gui.sh:743
+#: git-gui.sh:847
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "В %s у�тановлен неверный шрифт:"
 
-#: git-gui.sh:779
+#: git-gui.sh:901
 msgid "Main Font"
 msgstr "Шрифт интерфей�а"
 
-#: git-gui.sh:780
+#: git-gui.sh:902
 msgid "Diff/Console Font"
 msgstr "Шрифт кон�оли и изменений (diff)"
 
-#: git-gui.sh:794
+#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034
+#: git-gui.sh:1053 git-gui.sh:3212
+msgid "git-gui: fatal error"
+msgstr "git-gui: критиче�ка� ошибка"
+
+#: git-gui.sh:918
 msgid "Cannot find git in PATH."
 msgstr "git не найден в PATH."
 
-#: git-gui.sh:821
+#: git-gui.sh:945
 msgid "Cannot parse Git version string:"
 msgstr "�евозможно ра�познать �троку вер�ии Git: "
 
-#: git-gui.sh:839
+#: git-gui.sh:970
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -56,473 +56,519 @@ msgid ""
 "Assume '%s' is version 1.5.0?\n"
 msgstr "�евозможно определить вер�ию Git\n\n%s указывает на вер�ию «%s».\n\nдл� %s требует�� вер�и� Git, начина� � 1.5.0\n\nПредположить, что «%s» и е�ть вер�и� 1.5.0?\n"
 
-#: git-gui.sh:1128
+#: git-gui.sh:1267
 msgid "Git directory not found:"
 msgstr "Каталог Git не найден:"
 
-#: git-gui.sh:1146
+#: git-gui.sh:1301
 msgid "Cannot move to top of working directory:"
 msgstr "�евозможно перейти к корню рабочего каталога репозитори�: "
 
-#: git-gui.sh:1154
+#: git-gui.sh:1309
 msgid "Cannot use bare repository:"
 msgstr "�евозможно и�пользование репозитори� без рабочего каталога:"
 
-#: git-gui.sh:1162
+#: git-gui.sh:1317
 msgid "No working directory"
 msgstr "От�ут�твует рабочий каталог"
 
-#: git-gui.sh:1334 lib/checkout_op.tcl:306
+#: git-gui.sh:1491 lib/checkout_op.tcl:306
 msgid "Refreshing file status..."
 msgstr "Обновление информации о �о�то�нии файлов…"
 
-#: git-gui.sh:1390
+#: git-gui.sh:1551
 msgid "Scanning for modified files ..."
 msgstr "Пои�к измененных файлов…"
 
-#: git-gui.sh:1454
+#: git-gui.sh:1629
 msgid "Calling prepare-commit-msg hook..."
 msgstr "Вызов перехватчика prepare-commit-msg…"
 
-#: git-gui.sh:1471
+#: git-gui.sh:1646
 msgid "Commit declined by prepare-commit-msg hook."
 msgstr "Коммит прерван перехватчиком prepare-commit-msg."
 
-#: git-gui.sh:1629 lib/browser.tcl:246
+#: git-gui.sh:1804 lib/browser.tcl:252
 msgid "Ready."
 msgstr "Готово."
 
-#: git-gui.sh:1787
+#: git-gui.sh:1968
 #, tcl-format
-msgid "Displaying only %s of %s files."
-msgstr "Показано %s из %s файлов."
+msgid ""
+"Display limit (gui.maxfilesdisplayed = %s) reached, not showing all %s "
+"files."
+msgstr "Лимит отображаемых файлов до�тигнут (gui.maxfilesdisplayed = %s), не в�е %s файлы показаны."
 
-#: git-gui.sh:1913
+#: git-gui.sh:2091
 msgid "Unmodified"
 msgstr "�е изменено"
 
-#: git-gui.sh:1915
+#: git-gui.sh:2093
 msgid "Modified, not staged"
 msgstr "Изменено, не в индек�е"
 
-#: git-gui.sh:1916 git-gui.sh:1924
+#: git-gui.sh:2094 git-gui.sh:2106
 msgid "Staged for commit"
 msgstr "В индек�е дл� коммита"
 
-#: git-gui.sh:1917 git-gui.sh:1925
+#: git-gui.sh:2095 git-gui.sh:2107
 msgid "Portions staged for commit"
 msgstr "Ча�ти, в индек�е дл� коммита"
 
-#: git-gui.sh:1918 git-gui.sh:1926
+#: git-gui.sh:2096 git-gui.sh:2108
 msgid "Staged for commit, missing"
 msgstr "В индек�е дл� коммита, от�ут�твует"
 
-#: git-gui.sh:1920
+#: git-gui.sh:2098
 msgid "File type changed, not staged"
 msgstr "Тип файла изменён, не в индек�е"
 
-#: git-gui.sh:1921
+#: git-gui.sh:2099 git-gui.sh:2100
+msgid "File type changed, old type staged for commit"
+msgstr "Тип файла изменён, �тарый тип файла в индек�е"
+
+#: git-gui.sh:2101
 msgid "File type changed, staged"
 msgstr "Тип файла изменён, в индек�е"
 
-#: git-gui.sh:1923
+#: git-gui.sh:2102
+msgid "File type change staged, modification not staged"
+msgstr "Изменение типа файла в индек�е, изменение не в индек�е"
+
+#: git-gui.sh:2103
+msgid "File type change staged, file missing"
+msgstr "Изменение типа файла в индек�е, файл не найден"
+
+#: git-gui.sh:2105
 msgid "Untracked, not staged"
 msgstr "�е от�леживает��, не в индек�е"
 
-#: git-gui.sh:1928
+#: git-gui.sh:2110
 msgid "Missing"
 msgstr "От�ут�твует"
 
-#: git-gui.sh:1929
+#: git-gui.sh:2111
 msgid "Staged for removal"
 msgstr "В индек�е дл� удалени�"
 
-#: git-gui.sh:1930
+#: git-gui.sh:2112
 msgid "Staged for removal, still present"
 msgstr "В индек�е дл� удалени�, еще не удалено"
 
-#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
-#: git-gui.sh:1936 git-gui.sh:1937
+#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117
+#: git-gui.sh:2118 git-gui.sh:2119
 msgid "Requires merge resolution"
 msgstr "Требует�� разрешение конфликта при �ли�нии"
 
-#: git-gui.sh:1972
-msgid "Starting gitk... please wait..."
-msgstr "Запу�кает�� gitk… Подождите, пожалуй�та…"
-
-#: git-gui.sh:1984
+#: git-gui.sh:2164
 msgid "Couldn't find gitk in PATH"
 msgstr "gitk не найден в PATH."
 
-#: git-gui.sh:2043
+#: git-gui.sh:2210 git-gui.sh:2245
+#, tcl-format
+msgid "Starting %s... please wait..."
+msgstr "Запу�кает�� %s… Подождите, пожалуй�та…"
+
+#: git-gui.sh:2224
 msgid "Couldn't find git gui in PATH"
 msgstr "git gui не найден в PATH."
 
-#: git-gui.sh:2455 lib/choose_repository.tcl:36
+#: git-gui.sh:2726 lib/choose_repository.tcl:53
 msgid "Repository"
 msgstr "Репозиторий"
 
-#: git-gui.sh:2456
+#: git-gui.sh:2727
 msgid "Edit"
-msgstr "Редактировать"
+msgstr "Правка"
 
-#: git-gui.sh:2458 lib/choose_rev.tcl:561
+#: git-gui.sh:2729 lib/choose_rev.tcl:567
 msgid "Branch"
 msgstr "Ветка"
 
-#: git-gui.sh:2461 lib/choose_rev.tcl:548
+#: git-gui.sh:2732 lib/choose_rev.tcl:554
 msgid "Commit@@noun"
 msgstr "Коммит"
 
-#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174
 msgid "Merge"
 msgstr "Сли�ние"
 
-#: git-gui.sh:2465 lib/choose_rev.tcl:557
+#: git-gui.sh:2736 lib/choose_rev.tcl:563
 msgid "Remote"
 msgstr "Внешние репозитории"
 
-#: git-gui.sh:2468
+#: git-gui.sh:2739
 msgid "Tools"
 msgstr "В�помогательные операции"
 
-#: git-gui.sh:2477
+#: git-gui.sh:2748
 msgid "Explore Working Copy"
 msgstr "Про�мотр рабочего каталога"
 
-#: git-gui.sh:2483
+#: git-gui.sh:2763
+msgid "Git Bash"
+msgstr "Git Bash"
+
+#: git-gui.sh:2772
 msgid "Browse Current Branch's Files"
 msgstr "Про�мотреть файлы текущей ветки"
 
-#: git-gui.sh:2487
+#: git-gui.sh:2776
 msgid "Browse Branch Files..."
 msgstr "Показать файлы ветки…"
 
-#: git-gui.sh:2492
+#: git-gui.sh:2781
 msgid "Visualize Current Branch's History"
 msgstr "Показать и�торию текущей ветки"
 
-#: git-gui.sh:2496
+#: git-gui.sh:2785
 msgid "Visualize All Branch History"
 msgstr "Показать и�торию в�ех веток"
 
-#: git-gui.sh:2503
+#: git-gui.sh:2792
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "Показать файлы ветки %s"
 
-#: git-gui.sh:2505
+#: git-gui.sh:2794
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "Показать и�торию ветки %s"
 
-#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2799 lib/database.tcl:40
 msgid "Database Statistics"
 msgstr "Стати�тика базы данных"
 
-#: git-gui.sh:2513 lib/database.tcl:34
+#: git-gui.sh:2802 lib/database.tcl:33
 msgid "Compress Database"
 msgstr "Сжать базу данных"
 
-#: git-gui.sh:2516
+#: git-gui.sh:2805
 msgid "Verify Database"
 msgstr "Проверить базу данных"
 
-#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
-#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
+#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820
 msgid "Create Desktop Icon"
 msgstr "Создать �рлык на рабочем �толе"
 
-#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217
 msgid "Quit"
 msgstr "Выход"
 
-#: git-gui.sh:2547
+#: git-gui.sh:2836
 msgid "Undo"
 msgstr "Отменить"
 
-#: git-gui.sh:2550
+#: git-gui.sh:2839
 msgid "Redo"
 msgstr "Повторить"
 
-#: git-gui.sh:2554 git-gui.sh:3109
+#: git-gui.sh:2843 git-gui.sh:3461
 msgid "Cut"
 msgstr "Вырезать"
 
-#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
+#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr "Копировать"
 
-#: git-gui.sh:2560 git-gui.sh:3115
+#: git-gui.sh:2849 git-gui.sh:3467
 msgid "Paste"
 msgstr "В�тавить"
 
-#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
-#: lib/remote_branch_delete.tcl:38
+#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39
+#: lib/branch_delete.tcl:28
 msgid "Delete"
 msgstr "Удалить"
 
-#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
+#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71
 msgid "Select All"
-msgstr "Выделить в�е"
+msgstr "Выделить в�ё"
 
-#: git-gui.sh:2576
+#: git-gui.sh:2865
 msgid "Create..."
 msgstr "Создать…"
 
-#: git-gui.sh:2582
+#: git-gui.sh:2871
 msgid "Checkout..."
 msgstr "Перейти…"
 
-#: git-gui.sh:2588
+#: git-gui.sh:2877
 msgid "Rename..."
 msgstr "Переименовать…"
 
-#: git-gui.sh:2593
+#: git-gui.sh:2882
 msgid "Delete..."
 msgstr "Удалить…"
 
-#: git-gui.sh:2598
+#: git-gui.sh:2887
 msgid "Reset..."
 msgstr "Сбро�ить…"
 
-#: git-gui.sh:2608
+#: git-gui.sh:2897
 msgid "Done"
 msgstr "Завершено"
 
-#: git-gui.sh:2610
+#: git-gui.sh:2899
 msgid "Commit@@verb"
 msgstr "Закоммитить"
 
-#: git-gui.sh:2619 git-gui.sh:3050
-msgid "New Commit"
-msgstr "�овый коммит"
-
-#: git-gui.sh:2627 git-gui.sh:3057
+#: git-gui.sh:2908 git-gui.sh:3400
 msgid "Amend Last Commit"
 msgstr "И�править по�ледний коммит"
 
-#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101
 msgid "Rescan"
 msgstr "Перечитать"
 
-#: git-gui.sh:2643
+#: git-gui.sh:2924
 msgid "Stage To Commit"
 msgstr "Добавить в индек�"
 
-#: git-gui.sh:2649
+#: git-gui.sh:2930
 msgid "Stage Changed Files To Commit"
 msgstr "Добавить изменённые файлы в индек�"
 
-#: git-gui.sh:2655
+#: git-gui.sh:2936
 msgid "Unstage From Commit"
-msgstr "Убрать из издек�а"
+msgstr "Убрать из индек�а"
 
-#: git-gui.sh:2661 lib/index.tcl:412
+#: git-gui.sh:2942 lib/index.tcl:521
 msgid "Revert Changes"
 msgstr "Обратить изменени�"
 
-#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
+#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731
 msgid "Show Less Context"
 msgstr "Меньше контек�та"
 
-#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
+#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735
 msgid "Show More Context"
 msgstr "Больше контек�та"
 
-#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
+#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485
 msgid "Sign Off"
 msgstr "В�тавить Signed-off-by"
 
-#: git-gui.sh:2696
+#: git-gui.sh:2977
 msgid "Local Merge..."
 msgstr "Локальное �ли�ние…"
 
-#: git-gui.sh:2701
+#: git-gui.sh:2982
 msgid "Abort Merge..."
 msgstr "Прервать �ли�ние…"
 
-#: git-gui.sh:2713 git-gui.sh:2741
+#: git-gui.sh:2994 git-gui.sh:3022
 msgid "Add..."
 msgstr "Добавить…"
 
-#: git-gui.sh:2717
+#: git-gui.sh:2998
 msgid "Push..."
 msgstr "Отправить…"
 
-#: git-gui.sh:2721
+#: git-gui.sh:3002
 msgid "Delete Branch..."
 msgstr "Удалить ветку…"
 
-#: git-gui.sh:2731 git-gui.sh:3292
+#: git-gui.sh:3012 git-gui.sh:3666
 msgid "Options..."
 msgstr "�а�тройки…"
 
-#: git-gui.sh:2742
+#: git-gui.sh:3023
 msgid "Remove..."
 msgstr "Удалить…"
 
-#: git-gui.sh:2751 lib/choose_repository.tcl:50
+#: git-gui.sh:3032 lib/choose_repository.tcl:67
 msgid "Help"
-msgstr "Помощь"
+msgstr "Справка"
 
-#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61
+#: lib/choose_repository.tcl:70 lib/about.tcl:14
 #, tcl-format
 msgid "About %s"
 msgstr "О %s"
 
-#: git-gui.sh:2783
+#: git-gui.sh:3064
 msgid "Online Documentation"
 msgstr "Документаци� в интернете"
 
-#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73
 msgid "Show SSH Key"
 msgstr "Показать ключ SSH"
 
-#: git-gui.sh:2893
+#: git-gui.sh:3097 git-gui.sh:3229
+msgid "usage:"
+msgstr "и�пользование:"
+
+#: git-gui.sh:3101 git-gui.sh:3233
+msgid "Usage"
+msgstr "И�пользование"
+
+#: git-gui.sh:3182 lib/blame.tcl:575
+msgid "Error"
+msgstr "Ошибка"
+
+#: git-gui.sh:3213
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr "критиче�ка� ошибка: %s: нет такого файла или каталога"
 
-#: git-gui.sh:2926
+#: git-gui.sh:3246
 msgid "Current Branch:"
 msgstr "Текуща� ветка:"
 
-#: git-gui.sh:2947
-msgid "Staged Changes (Will Commit)"
-msgstr "Изменени� в индек�е (будут закоммичены)"
-
-#: git-gui.sh:2967
+#: git-gui.sh:3271
 msgid "Unstaged Changes"
 msgstr "Изменено (не будет �охранено)"
 
-#: git-gui.sh:3017
+#: git-gui.sh:3293
+msgid "Staged Changes (Will Commit)"
+msgstr "Изменени� в индек�е (будут закоммичены)"
+
+#: git-gui.sh:3367
 msgid "Stage Changed"
 msgstr "Индек�ировать в�ё"
 
-#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
+#: git-gui.sh:3386 lib/transport.tcl:137
 msgid "Push"
 msgstr "Отправить"
 
-#: git-gui.sh:3071
+#: git-gui.sh:3413
 msgid "Initial Commit Message:"
 msgstr "Сообщение первого коммита:"
 
-#: git-gui.sh:3072
+#: git-gui.sh:3414
 msgid "Amended Commit Message:"
 msgstr "Сообщение и�правленного коммита:"
 
-#: git-gui.sh:3073
+#: git-gui.sh:3415
 msgid "Amended Initial Commit Message:"
 msgstr "Сообщение и�правленного первого коммита:"
 
-#: git-gui.sh:3074
+#: git-gui.sh:3416
 msgid "Amended Merge Commit Message:"
 msgstr "Сообщение и�правленного �ли�ни�:"
 
-#: git-gui.sh:3075
+#: git-gui.sh:3417
 msgid "Merge Commit Message:"
 msgstr "Сообщение �ли�ни�:"
 
-#: git-gui.sh:3076
+#: git-gui.sh:3418
 msgid "Commit Message:"
 msgstr "Сообщение коммита:"
 
-#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
+#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73
 msgid "Copy All"
 msgstr "Копировать в�е"
 
-#: git-gui.sh:3149 lib/blame.tcl:104
+#: git-gui.sh:3501 lib/blame.tcl:106
 msgid "File:"
 msgstr "Файл:"
 
-#: git-gui.sh:3255
+#: git-gui.sh:3549 lib/choose_repository.tcl:1100
+msgid "Open"
+msgstr "Открыть"
+
+#: git-gui.sh:3629
 msgid "Refresh"
 msgstr "Обновить"
 
-#: git-gui.sh:3276
+#: git-gui.sh:3650
 msgid "Decrease Font Size"
 msgstr "Уменьшить размер шрифта"
 
-#: git-gui.sh:3280
+#: git-gui.sh:3654
 msgid "Increase Font Size"
 msgstr "Увеличить размер шрифта"
 
-#: git-gui.sh:3288 lib/blame.tcl:281
+#: git-gui.sh:3662 lib/blame.tcl:296
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: git-gui.sh:3299
+#: git-gui.sh:3673
 msgid "Apply/Reverse Hunk"
 msgstr "Применить/Убрать изменение"
 
-#: git-gui.sh:3304
+#: git-gui.sh:3678
 msgid "Apply/Reverse Line"
 msgstr "Применить/Убрать �троку"
 
-#: git-gui.sh:3323
+#: git-gui.sh:3684 git-gui.sh:3794 git-gui.sh:3805
+msgid "Revert Hunk"
+msgstr "Обратить изменени� блока"
+
+#: git-gui.sh:3689 git-gui.sh:3801 git-gui.sh:3812
+msgid "Revert Line"
+msgstr "Обратить изменени� �троки"
+
+#: git-gui.sh:3694 git-gui.sh:3791
+msgid "Undo Last Revert"
+msgstr "Отменить по�леднее обращение изменений"
+
+#: git-gui.sh:3713
 msgid "Run Merge Tool"
 msgstr "Запу�тить программу �ли�ни�"
 
-#: git-gui.sh:3328
+#: git-gui.sh:3718
 msgid "Use Remote Version"
 msgstr "Вз�ть внешнюю вер�ию"
 
-#: git-gui.sh:3332
+#: git-gui.sh:3722
 msgid "Use Local Version"
 msgstr "Вз�ть локальную вер�ию"
 
-#: git-gui.sh:3336
+#: git-gui.sh:3726
 msgid "Revert To Base"
 msgstr "Обратить изменени�"
 
-#: git-gui.sh:3354
+#: git-gui.sh:3744
 msgid "Visualize These Changes In The Submodule"
 msgstr "Показать �ти изменени� подмодул�"
 
-#: git-gui.sh:3358
+#: git-gui.sh:3748
 msgid "Visualize Current Branch History In The Submodule"
 msgstr "Показать и�торию текущей ветки подмодул�"
 
-#: git-gui.sh:3362
+#: git-gui.sh:3752
 msgid "Visualize All Branch History In The Submodule"
 msgstr "Показать и�торию в�ех веток подмодул�"
 
-#: git-gui.sh:3367
+#: git-gui.sh:3757
 msgid "Start git gui In The Submodule"
 msgstr "Запу�тить git gui в подмодуле"
 
-#: git-gui.sh:3389
+#: git-gui.sh:3793
 msgid "Unstage Hunk From Commit"
 msgstr "Убрать блок из индек�а"
 
-#: git-gui.sh:3391
+#: git-gui.sh:3797
 msgid "Unstage Lines From Commit"
 msgstr "Убрать �троки из индек�а"
 
-#: git-gui.sh:3393
+#: git-gui.sh:3798 git-gui.sh:3809
+msgid "Revert Lines"
+msgstr "Обратить изменени� �трок"
+
+#: git-gui.sh:3800
 msgid "Unstage Line From Commit"
 msgstr "Убрать �троку из индек�а"
 
-#: git-gui.sh:3396
+#: git-gui.sh:3804
 msgid "Stage Hunk For Commit"
 msgstr "Добавить блок в индек�"
 
-#: git-gui.sh:3398
+#: git-gui.sh:3808
 msgid "Stage Lines For Commit"
 msgstr "Добавить �троки в индек�"
 
-#: git-gui.sh:3400
+#: git-gui.sh:3811
 msgid "Stage Line For Commit"
 msgstr "Добавить �троку в индек�"
 
-#: git-gui.sh:3424
+#: git-gui.sh:3861
 msgid "Initializing..."
 msgstr "Инициализаци�…"
 
-#: git-gui.sh:3541
+#: git-gui.sh:4017
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
@@ -533,14 +579,14 @@ msgid ""
 "\n"
 msgstr "Возможны ошибки в переменных окружени�.\n\nПеременные окружени�, которые возможно\nбудут проигнорированы командами Git,\nзапущенными из %s\n\n"
 
-#: git-gui.sh:3570
+#: git-gui.sh:4046
 msgid ""
 "\n"
 "This is due to a known issue with the\n"
 "Tcl binary distributed by Cygwin."
 msgstr "\nЭто изве�тна� проблема � Tcl,\nра�про�тран�емым Cygwin."
 
-#: git-gui.sh:3575
+#: git-gui.sh:4051
 #, tcl-format
 msgid ""
 "\n"
@@ -551,309 +597,148 @@ msgid ""
 "~/.gitconfig file.\n"
 msgstr "\n\nВме�то и�пользовани� %s можно\n�охранить значени� user.name и\nuser.email в Вашем пер�ональном\nфайле ~/.gitconfig.\n"
 
-#: lib/about.tcl:26
-msgid "git-gui - a graphical user interface for Git."
-msgstr "git-gui - графиче�кий пользователь�кий интерфей� к Git."
-
-#: lib/blame.tcl:72
-msgid "File Viewer"
-msgstr "Про�мотр файла"
-
-#: lib/blame.tcl:78
-msgid "Commit:"
-msgstr "Коммит:"
-
-#: lib/blame.tcl:271
-msgid "Copy Commit"
-msgstr "Копировать SHA-1"
-
-#: lib/blame.tcl:275
-msgid "Find Text..."
-msgstr "�айти тек�т…"
-
-#: lib/blame.tcl:284
-msgid "Do Full Copy Detection"
-msgstr "Прове�ти полный пои�к копий"
+#: lib/spellcheck.tcl:57
+msgid "Unsupported spell checker"
+msgstr "�еподдерживаема� программа проверки правопи�ани�"
 
-#: lib/blame.tcl:288
-msgid "Show History Context"
-msgstr "Показать и�ториче�кий контек�т"
+#: lib/spellcheck.tcl:65
+msgid "Spell checking is unavailable"
+msgstr "Проверка правопи�ани� не до�тупна"
 
-#: lib/blame.tcl:291
-msgid "Blame Parent Commit"
-msgstr "�вторы родитель�кого коммита"
+#: lib/spellcheck.tcl:68
+msgid "Invalid spell checking configuration"
+msgstr "�еправильна� конфигураци� программы проверки правопи�ани�"
 
-#: lib/blame.tcl:450
+#: lib/spellcheck.tcl:70
 #, tcl-format
-msgid "Reading %s..."
-msgstr "Чтение %s…"
-
-#: lib/blame.tcl:557
-msgid "Loading copy/move tracking annotations..."
-msgstr "Загрузка аннотации копирований/переименований…"
-
-#: lib/blame.tcl:577
-msgid "lines annotated"
-msgstr "�трок прокомментировано"
-
-#: lib/blame.tcl:769
-msgid "Loading original location annotations..."
-msgstr "Загрузка аннотаций первоначального положени� объекта…"
-
-#: lib/blame.tcl:772
-msgid "Annotation complete."
-msgstr "�ннотаци� завершена."
-
-#: lib/blame.tcl:802
-msgid "Busy"
-msgstr "Зан�т"
-
-#: lib/blame.tcl:803
-msgid "Annotation process is already running."
-msgstr "�ннотаци� уже запущена"
-
-#: lib/blame.tcl:842
-msgid "Running thorough copy detection..."
-msgstr "Выполнение полного пои�ка копий…"
-
-#: lib/blame.tcl:910
-msgid "Loading annotation..."
-msgstr "Загрузка аннотации…"
-
-#: lib/blame.tcl:963
-msgid "Author:"
-msgstr "�втор:"
-
-#: lib/blame.tcl:967
-msgid "Committer:"
-msgstr "Коммитер:"
-
-#: lib/blame.tcl:972
-msgid "Original File:"
-msgstr "И�ходный файл:"
-
-#: lib/blame.tcl:1020
-msgid "Cannot find HEAD commit:"
-msgstr "�е удало�ь найти текущее �о�то�ние:"
-
-#: lib/blame.tcl:1075
-msgid "Cannot find parent commit:"
-msgstr "�е удало�ь найти родитель�кое �о�то�ние:"
-
-#: lib/blame.tcl:1090
-msgid "Unable to display parent"
-msgstr "�е могу показать предка"
-
-#: lib/blame.tcl:1091 lib/diff.tcl:320
-msgid "Error loading diff:"
-msgstr "Ошибка загрузки изменений:"
-
-#: lib/blame.tcl:1231
-msgid "Originally By:"
-msgstr "И�точник:"
-
-#: lib/blame.tcl:1237
-msgid "In File:"
-msgstr "Файл:"
-
-#: lib/blame.tcl:1242
-msgid "Copied Or Moved Here By:"
-msgstr "Скопировано/перемещено в:"
-
-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
-msgid "Checkout Branch"
-msgstr "Перейти на ветку"
-
-#: lib/branch_checkout.tcl:23
-msgid "Checkout"
-msgstr "Перейти"
-
-#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
-#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
-#: lib/transport.tcl:108
-msgid "Cancel"
-msgstr "Отмена"
-
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
-msgid "Revision"
-msgstr "Вер�и�"
-
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
-msgid "Options"
-msgstr "�а�тройки"
-
-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
-msgid "Fetch Tracking Branch"
-msgstr "Извлечь изменени� из внешней ветки"
-
-#: lib/branch_checkout.tcl:44
-msgid "Detach From Local Branch"
-msgstr "От�оединить от локальной ветки"
-
-#: lib/branch_create.tcl:22
-msgid "Create Branch"
-msgstr "Создать ветку"
-
-#: lib/branch_create.tcl:27
-msgid "Create New Branch"
-msgstr "Создать новую ветку"
-
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
-msgid "Create"
-msgstr "Создать"
-
-#: lib/branch_create.tcl:40
-msgid "Branch Name"
-msgstr "Им� ветки"
-
-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
-msgid "Name:"
-msgstr "�азвание:"
-
-#: lib/branch_create.tcl:58
-msgid "Match Tracking Branch Name"
-msgstr "Соответ�твовать имени от�леживаемой ветки"
-
-#: lib/branch_create.tcl:66
-msgid "Starting Revision"
-msgstr "�ачальна� вер�и�"
-
-#: lib/branch_create.tcl:72
-msgid "Update Existing Branch:"
-msgstr "Обновить имеющую�� ветку:"
+msgid "Reverting dictionary to %s."
+msgstr "Словарь вернут к %s."
 
-#: lib/branch_create.tcl:75
-msgid "No"
-msgstr "�ет"
+#: lib/spellcheck.tcl:73
+msgid "Spell checker silently failed on startup"
+msgstr "Программа проверки правопи�ани� не �могла запу�тить��"
 
-#: lib/branch_create.tcl:80
-msgid "Fast Forward Only"
-msgstr "Только Fast Forward"
+#: lib/spellcheck.tcl:80
+msgid "Unrecognized spell checker"
+msgstr "�ера�познанна� программа проверки правопи�ани�"
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
-msgid "Reset"
-msgstr "Сбро�"
+#: lib/spellcheck.tcl:186
+msgid "No Suggestions"
+msgstr "И�правлений не найдено"
 
-#: lib/branch_create.tcl:97
-msgid "Checkout After Creation"
-msgstr "По�ле �оздани� �делать текущей"
+#: lib/spellcheck.tcl:388
+msgid "Unexpected EOF from spell checker"
+msgstr "Программа проверки правопи�ани� прервала передачу данных"
 
-#: lib/branch_create.tcl:131
-msgid "Please select a tracking branch."
-msgstr "Укажите отлеживаемую ветку."
+#: lib/spellcheck.tcl:392
+msgid "Spell Checker Failed"
+msgstr "Ошибка проверки правопи�ани�"
 
-#: lib/branch_create.tcl:140
+#: lib/transport.tcl:6 lib/remote_add.tcl:132
 #, tcl-format
-msgid "Tracking branch %s is not a branch in the remote repository."
-msgstr "От�леживаема� ветка %s не �вл�ет�� веткой на внешнем репозитории."
+msgid "fetch %s"
+msgstr "извлечение %s"
 
-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
-msgid "Please supply a branch name."
-msgstr "Укажите им� ветки."
+#: lib/transport.tcl:7
+#, tcl-format
+msgid "Fetching new changes from %s"
+msgstr "Извлечение изменений из %s "
 
-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#: lib/transport.tcl:18
 #, tcl-format
-msgid "'%s' is not an acceptable branch name."
-msgstr "�едопу�тимое им� ветки «%s»."
+msgid "remote prune %s"
+msgstr "чи�тка внешнего %s"
 
-#: lib/branch_delete.tcl:15
-msgid "Delete Branch"
-msgstr "Удаление ветки"
+#: lib/transport.tcl:19
+#, tcl-format
+msgid "Pruning tracking branches deleted from %s"
+msgstr "Чи�тка от�леживаемых веток, удалённых из %s"
 
-#: lib/branch_delete.tcl:20
-msgid "Delete Local Branch"
-msgstr "Удалить локальную ветку"
+#: lib/transport.tcl:25
+msgid "fetch all remotes"
+msgstr "извлечь �о в�ех внешних репозиториев"
 
-#: lib/branch_delete.tcl:37
-msgid "Local Branches"
-msgstr "Локальные ветки"
+#: lib/transport.tcl:26
+msgid "Fetching new changes from all remotes"
+msgstr "Получение изменений �о в�ех внешних репозиториев"
 
-#: lib/branch_delete.tcl:52
-msgid "Delete Only If Merged Into"
-msgstr "Удалить только в �лучае, е�ли было �ли�ние �"
+#: lib/transport.tcl:40
+msgid "remote prune all remotes"
+msgstr "чи�тка в�ех внешних репозиториев"
 
-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
-msgid "Always (Do not perform merge checks)"
-msgstr "В�егда (не выполн�ть проверку на �ли�ние)"
+#: lib/transport.tcl:41
+msgid "Pruning tracking branches deleted from all remotes"
+msgstr "Чи�тка от�леживаемых веток, удалённых �о в�ех внешних репозиториев"
 
-#: lib/branch_delete.tcl:103
+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
+#: lib/remote_add.tcl:162
 #, tcl-format
-msgid "The following branches are not completely merged into %s:"
-msgstr "Ветки, которые не полно�тью �ливают�� � %s:"
-
-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
-msgid ""
-"Recovering deleted branches is difficult.\n"
-"\n"
-"Delete the selected branches?"
-msgstr "Во��тановить удаленные ветки �ложно.\n\nПродолжить?"
+msgid "push %s"
+msgstr "отправить %s"
 
-#: lib/branch_delete.tcl:141
+#: lib/transport.tcl:55
 #, tcl-format
-msgid ""
-"Failed to delete branches:\n"
-"%s"
-msgstr "�е удало�ь удалить ветки:\n%s"
+msgid "Pushing changes to %s"
+msgstr "Отправка изменений в %s "
 
-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
-msgid "Rename Branch"
-msgstr "Переименование ветки"
+#: lib/transport.tcl:93
+#, tcl-format
+msgid "Mirroring to %s"
+msgstr "Точное копирование в %s"
 
-#: lib/branch_rename.tcl:26
-msgid "Rename"
-msgstr "Переименовать"
+#: lib/transport.tcl:111
+#, tcl-format
+msgid "Pushing %s %s to %s"
+msgstr "Отправка %s %s в %s"
 
-#: lib/branch_rename.tcl:36
-msgid "Branch:"
-msgstr "Ветка:"
+#: lib/transport.tcl:132
+msgid "Push Branches"
+msgstr "Отправить ветки"
 
-#: lib/branch_rename.tcl:39
-msgid "New Name:"
-msgstr "�овое название:"
+#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34
+#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32
+#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41
+#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43
+#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178
+msgid "Cancel"
+msgstr "Отмена"
 
-#: lib/branch_rename.tcl:75
-msgid "Please select a branch to rename."
-msgstr "Укажите ветку дл� переименовани�."
+#: lib/transport.tcl:147
+msgid "Source Branches"
+msgstr "И�ходные ветки"
 
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
-#, tcl-format
-msgid "Branch '%s' already exists."
-msgstr "Ветка «%s» уже �уще�твует."
+#: lib/transport.tcl:162
+msgid "Destination Repository"
+msgstr "Репозиторий назначени�"
 
-#: lib/branch_rename.tcl:117
-#, tcl-format
-msgid "Failed to rename '%s'."
-msgstr "�е удало�ь переименовать «%s». "
+#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51
+msgid "Remote:"
+msgstr "внешний:"
 
-#: lib/browser.tcl:17
-msgid "Starting..."
-msgstr "Запу�к…"
+#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72
+msgid "Arbitrary Location:"
+msgstr "Указанное положение:"
 
-#: lib/browser.tcl:26
-msgid "File Browser"
-msgstr "Про�мотр �пи�ка файлов"
+#: lib/transport.tcl:205
+msgid "Transfer Options"
+msgstr "�а�тройки отправки"
 
-#: lib/browser.tcl:126 lib/browser.tcl:143
-#, tcl-format
-msgid "Loading %s..."
-msgstr "Загрузка %s…"
+#: lib/transport.tcl:207
+msgid "Force overwrite existing branch (may discard changes)"
+msgstr "Принудительно перезапи�ать �уще�твующую ветку (возможна потер� изменений)"
 
-#: lib/browser.tcl:187
-msgid "[Up To Parent]"
-msgstr "[�а уровень выше]"
+#: lib/transport.tcl:211
+msgid "Use thin pack (for slow network connections)"
+msgstr "И�пользовать thin pack (дл� медленных �етевых подключений)"
 
-#: lib/browser.tcl:267 lib/browser.tcl:273
-msgid "Browse Branch Files"
-msgstr "Показать файлы ветки"
+#: lib/transport.tcl:215
+msgid "Include tags"
+msgstr "Передать метки"
 
-#: lib/browser.tcl:278 lib/choose_repository.tcl:398
-#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
-#: lib/choose_repository.tcl:1028
-msgid "Browse"
-msgstr "Показать"
+#: lib/transport.tcl:229
+#, tcl-format
+msgid "%s (%s): Push"
+msgstr "%s (%s): Отправка"
 
 #: lib/checkout_op.tcl:85
 #, tcl-format
@@ -865,8 +750,8 @@ msgstr "Извлечение %s из %s "
 msgid "fatal: Cannot resolve %s"
 msgstr "критиче�ка� ошибка: невозможно разрешить %s"
 
-#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
-#: lib/sshkey.tcl:53
+#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81
+#: lib/database.tcl:30
 msgid "Close"
 msgstr "Закрыть"
 
@@ -880,6 +765,11 @@ msgstr "Ветка «%s» не �уще�твует."
 msgid "Failed to configure simplified git-pull for '%s'."
 msgstr "Ошибка �оздани� упрощённой конфигурации git pull дл� «%s»."
 
+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
+#, tcl-format
+msgid "Branch '%s' already exists."
+msgstr "Ветка «%s» уже �уще�твует."
+
 #: lib/checkout_op.tcl:229
 #, tcl-format
 msgid ""
@@ -921,51 +811,55 @@ msgstr "Обновление рабочего каталога из «%s»…"
 msgid "files checked out"
 msgstr "файлы извлечены"
 
-#: lib/checkout_op.tcl:376
+#: lib/checkout_op.tcl:377
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr "Прерван переход на «%s» (требует�� �ли�ние �одержимого файлов)"
 
-#: lib/checkout_op.tcl:377
+#: lib/checkout_op.tcl:378
 msgid "File level merge required."
 msgstr "Требует�� �ли�ние �одержани� файлов."
 
-#: lib/checkout_op.tcl:381
+#: lib/checkout_op.tcl:382
 #, tcl-format
 msgid "Staying on branch '%s'."
 msgstr "Ветка «%s» о�таёт�� текущей."
 
-#: lib/checkout_op.tcl:452
+#: lib/checkout_op.tcl:453
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
 "If you wanted to be on a branch, create one now starting from 'This Detached Checkout'."
 msgstr "Вы более не находите�ь на локальной ветке.\n\nЕ�ли вы хотите �нова вернуть�� к какой-нибудь ветке, �оздайте её �ейча�, начина� � «Текущего от�оединенного �о�то�ни�»."
 
-#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
+#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "Выполнен переход на «%s»."
 
-#: lib/checkout_op.tcl:535
+#: lib/checkout_op.tcl:536
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr "Сбро� «%s»  на «%s» приведет к потере �ледующих коммитов:"
 
-#: lib/checkout_op.tcl:557
+#: lib/checkout_op.tcl:558
 msgid "Recovering lost commits may not be easy."
 msgstr "Во��тановить потер�нные коммиты будет �ложно."
 
-#: lib/checkout_op.tcl:562
+#: lib/checkout_op.tcl:563
 #, tcl-format
 msgid "Reset '%s'?"
 msgstr "Сбро�ить «%s»?"
 
-#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170
 msgid "Visualize"
 msgstr "�агл�дно"
 
-#: lib/checkout_op.tcl:635
+#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85
+msgid "Reset"
+msgstr "Сбро�"
+
+#: lib/checkout_op.tcl:636
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
@@ -975,256 +869,1384 @@ msgid ""
 "This should not have occurred.  %s will now close and give up."
 msgstr "�е удало�ь у�тановить текущую ветку.\n\nВаш рабочий каталог обновлён только ча�тично. Были обновлены в�е файлы кроме �лужебных файлов Git. \n\nЭтого не должно было произойти. %s завершает��."
 
-#: lib/choose_font.tcl:39
+#: lib/remote_add.tcl:20
+#, tcl-format
+msgid "%s (%s): Add Remote"
+msgstr "%s (%s): Добавление внешнего репозитори�"
+
+#: lib/remote_add.tcl:25
+msgid "Add New Remote"
+msgstr "Добавить внешний репозиторий"
+
+#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37
+msgid "Add"
+msgstr "Добавить"
+
+#: lib/remote_add.tcl:39
+msgid "Remote Details"
+msgstr "Информаци� о внешнем репозитории"
+
+#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44
+msgid "Name:"
+msgstr "�азвание:"
+
+#: lib/remote_add.tcl:50
+msgid "Location:"
+msgstr "Положение:"
+
+#: lib/remote_add.tcl:60
+msgid "Further Action"
+msgstr "Следующа� операци�"
+
+#: lib/remote_add.tcl:63
+msgid "Fetch Immediately"
+msgstr "Сразу извлечь изменени�"
+
+#: lib/remote_add.tcl:69
+msgid "Initialize Remote Repository and Push"
+msgstr "Инициализировать внешний репозиторий и отправить"
+
+#: lib/remote_add.tcl:75
+msgid "Do Nothing Else Now"
+msgstr "Больше ничего не делать"
+
+#: lib/remote_add.tcl:100
+msgid "Please supply a remote name."
+msgstr "Укажите название внешнего репозитори�."
+
+#: lib/remote_add.tcl:113
+#, tcl-format
+msgid "'%s' is not an acceptable remote name."
+msgstr "«%s» не �вл�ет�� допу�тимым именем внешнего репозитори�."
+
+#: lib/remote_add.tcl:124
+#, tcl-format
+msgid "Failed to add remote '%s' of location '%s'."
+msgstr "�е удало�ь добавить «%s» из «%s». "
+
+#: lib/remote_add.tcl:133
+#, tcl-format
+msgid "Fetching the %s"
+msgstr "Извлечение %s"
+
+#: lib/remote_add.tcl:156
+#, tcl-format
+msgid "Do not know how to initialize repository at location '%s'."
+msgstr "�евозможно инициализировать репозиторий в «%s»."
+
+#: lib/remote_add.tcl:163
+#, tcl-format
+msgid "Setting up the %s (at %s)"
+msgstr "�а�тройка %s (в %s)"
+
+#: lib/browser.tcl:17
+msgid "Starting..."
+msgstr "Запу�к…"
+
+#: lib/browser.tcl:27
+#, tcl-format
+msgid "%s (%s): File Browser"
+msgstr "%s (%s): Про�мотр �пи�ка файлов"
+
+#: lib/browser.tcl:132 lib/browser.tcl:149
+#, tcl-format
+msgid "Loading %s..."
+msgstr "Загрузка %s…"
+
+#: lib/browser.tcl:193
+msgid "[Up To Parent]"
+msgstr "[�а уровень выше]"
+
+#: lib/browser.tcl:275
+#, tcl-format
+msgid "%s (%s): Browse Branch Files"
+msgstr "%s (%s): Про�мотр файлов ветки"
+
+#: lib/browser.tcl:282
+msgid "Browse Branch Files"
+msgstr "Показать файлы ветки"
+
+#: lib/browser.tcl:288 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533
+#: lib/choose_repository.tcl:1115
+msgid "Browse"
+msgstr "Показать"
+
+#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321
+msgid "Revision"
+msgstr "Вер�и�"
+
+#: lib/index.tcl:6
+msgid "Unable to unlock the index."
+msgstr "�е удало�ь разблокировать индек�"
+
+#: lib/index.tcl:30
+msgid "Index Error"
+msgstr "Ошибка в индек�е"
+
+#: lib/index.tcl:32
+msgid ""
+"Updating the Git index failed.  A rescan will be automatically started to "
+"resynchronize git-gui."
+msgstr "�е удало�ь обновить индек� Git. Со�то�ние репозитори� будет перечитано автоматиче�ки."
+
+#: lib/index.tcl:43
+msgid "Continue"
+msgstr "Продолжить"
+
+#: lib/index.tcl:46
+msgid "Unlock Index"
+msgstr "Разблокировать индек�"
+
+#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587
+#: lib/choose_repository.tcl:999
+msgid "files"
+msgstr "файлов"
+
+#: lib/index.tcl:326
+msgid "Unstaging selected files from commit"
+msgstr "Уборка выбранных файлов из индек�а"
+
+#: lib/index.tcl:330
+#, tcl-format
+msgid "Unstaging %s from commit"
+msgstr "Удаление %s из индек�а"
+
+#: lib/index.tcl:369
+msgid "Ready to commit."
+msgstr "Готов дл� коммита."
+
+#: lib/index.tcl:378
+msgid "Adding selected files"
+msgstr "Добавление выбранных файлов"
+
+#: lib/index.tcl:382
+#, tcl-format
+msgid "Adding %s"
+msgstr "Добавление %s…"
+
+#: lib/index.tcl:412
+#, tcl-format
+msgid "Stage %d untracked files?"
+msgstr "Проиндек�ировать %d неот�леживаемые файла?"
+
+#: lib/index.tcl:420
+msgid "Adding all changed files"
+msgstr "Добавление в�ех измененных файлов"
+
+#: lib/index.tcl:503
+#, tcl-format
+msgid "Revert changes in file %s?"
+msgstr "Обратить изменени� в файле %s?"
+
+#: lib/index.tcl:508
+#, tcl-format
+msgid "Revert changes in these %i files?"
+msgstr "Обратить изменени� в %i файле(-ах)?"
+
+#: lib/index.tcl:517
+msgid "Any unstaged changes will be permanently lost by the revert."
+msgstr "Любые непроиндек�ированные изменени�, будут потер�ны при обращении изменений."
+
+#: lib/index.tcl:520 lib/index.tcl:563
+msgid "Do Nothing"
+msgstr "�ичего не делать"
+
+#: lib/index.tcl:545
+#, tcl-format
+msgid "Delete untracked file %s?"
+msgstr "Удалить неот�леживаемый файл %s?"
+
+#: lib/index.tcl:550
+#, tcl-format
+msgid "Delete these %i untracked files?"
+msgstr "Удалить %i неот�леживаемые файла?"
+
+#: lib/index.tcl:560
+msgid "Files will be permanently deleted."
+msgstr "Файлы будут удалены нав�егда."
+
+#: lib/index.tcl:564
+msgid "Delete Files"
+msgstr "Удалить файлы"
+
+#: lib/index.tcl:586
+msgid "Deleting"
+msgstr "Удаление"
+
+#: lib/index.tcl:665
+msgid "Encountered errors deleting files:\n"
+msgstr "Возникшие ошибки при удалении файлов:\n"
+
+#: lib/index.tcl:674
+#, tcl-format
+msgid "None of the %d selected files could be deleted."
+msgstr "�е удало�ь удалить ни один из выбранных %d файлов."
+
+#: lib/index.tcl:679
+#, tcl-format
+msgid "%d of the %d selected files could not be deleted."
+msgstr "�е удало�ь удалить %d из выбранных  %d файлов."
+
+#: lib/index.tcl:726
+msgid "Reverting selected files"
+msgstr "Обращение изменений в выбранных файлах"
+
+#: lib/index.tcl:730
+#, tcl-format
+msgid "Reverting %s"
+msgstr "Обращение изменений в %s"
+
+#: lib/branch_checkout.tcl:16
+#, tcl-format
+msgid "%s (%s): Checkout Branch"
+msgstr "%s (%s): Переход на ветку"
+
+#: lib/branch_checkout.tcl:21
+msgid "Checkout Branch"
+msgstr "Перейти на ветку"
+
+#: lib/branch_checkout.tcl:26
+msgid "Checkout"
+msgstr "Перейти"
+
+#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69
+msgid "Options"
+msgstr "�а�тройки"
+
+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
+msgid "Fetch Tracking Branch"
+msgstr "Извлечь изменени� из внешней ветки"
+
+#: lib/branch_checkout.tcl:47
+msgid "Detach From Local Branch"
+msgstr "От�оединить от локальной ветки"
+
+#: lib/status_bar.tcl:263
+#, tcl-format
+msgid "%s ... %*i of %*i %s (%3i%%)"
+msgstr "%s … %*i из %*i %s (%3i%%)"
+
+#: lib/remote.tcl:200
+msgid "Push to"
+msgstr "Отправить"
+
+#: lib/remote.tcl:218
+msgid "Remove Remote"
+msgstr "Удалить ��ылку на внешний репозиторий"
+
+#: lib/remote.tcl:223
+msgid "Prune from"
+msgstr "Чи�тка"
+
+#: lib/remote.tcl:228
+msgid "Fetch from"
+msgstr "Извлечение из"
+
+#: lib/remote.tcl:249 lib/remote.tcl:253 lib/remote.tcl:258 lib/remote.tcl:264
+msgid "All"
+msgstr "В�е"
+
+#: lib/branch_rename.tcl:15
+#, tcl-format
+msgid "%s (%s): Rename Branch"
+msgstr "%s (%s): Переименовать ветку"
+
+#: lib/branch_rename.tcl:23
+msgid "Rename Branch"
+msgstr "Переименование ветки"
+
+#: lib/branch_rename.tcl:28
+msgid "Rename"
+msgstr "Переименовать"
+
+#: lib/branch_rename.tcl:38
+msgid "Branch:"
+msgstr "Ветка:"
+
+#: lib/branch_rename.tcl:46
+msgid "New Name:"
+msgstr "�овое название:"
+
+#: lib/branch_rename.tcl:81
+msgid "Please select a branch to rename."
+msgstr "Укажите ветку дл� переименовани�."
+
+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
+msgid "Please supply a branch name."
+msgstr "Укажите им� ветки."
+
+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
+#, tcl-format
+msgid "'%s' is not an acceptable branch name."
+msgstr "�едопу�тимое им� ветки «%s»."
+
+#: lib/branch_rename.tcl:123
+#, tcl-format
+msgid "Failed to rename '%s'."
+msgstr "�е удало�ь переименовать «%s». "
+
+#: lib/choose_font.tcl:41
 msgid "Select"
 msgstr "Выбрать"
 
-#: lib/choose_font.tcl:53
+#: lib/choose_font.tcl:55
 msgid "Font Family"
 msgstr "Шрифт"
 
-#: lib/choose_font.tcl:74
+#: lib/choose_font.tcl:76
 msgid "Font Size"
 msgstr "Размер шрифта"
 
-#: lib/choose_font.tcl:91
+#: lib/choose_font.tcl:93
 msgid "Font Example"
 msgstr "Пример тек�та"
 
-#: lib/choose_font.tcl:103
+#: lib/choose_font.tcl:105
 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."
 msgstr "Это пример тек�та.\nЕ�ли Вам нравит�� �тот тек�т, �то может быть Ваш шрифт."
 
-#: lib/choose_repository.tcl:28
+#: lib/option.tcl:11
+#, tcl-format
+msgid "Invalid global encoding '%s'"
+msgstr "�еверна� глобальна� кодировка «%s»"
+
+#: lib/option.tcl:19
+#, tcl-format
+msgid "Invalid repo encoding '%s'"
+msgstr "�еверна� кодировка репозитори� «%s»"
+
+#: lib/option.tcl:119
+msgid "Restore Defaults"
+msgstr "Во��тановить на�тройки по умолчанию"
+
+#: lib/option.tcl:123
+msgid "Save"
+msgstr "Сохранить"
+
+#: lib/option.tcl:133
+#, tcl-format
+msgid "%s Repository"
+msgstr "Дл� репозитори� %s"
+
+#: lib/option.tcl:134
+msgid "Global (All Repositories)"
+msgstr "Общие (дл� в�ех репозиториев)"
+
+#: lib/option.tcl:140
+msgid "User Name"
+msgstr "Им� пользовател�"
+
+#: lib/option.tcl:141
+msgid "Email Address"
+msgstr "�дре� �лектронной почты"
+
+#: lib/option.tcl:143
+msgid "Summarize Merge Commits"
+msgstr "Суммарное �ообщение при �ли�нии"
+
+#: lib/option.tcl:144
+msgid "Merge Verbosity"
+msgstr "Уровень детально�ти �ообщений при �ли�нии"
+
+#: lib/option.tcl:145
+msgid "Show Diffstat After Merge"
+msgstr "Показать отчет об изменени�х по�ле �ли�ни�"
+
+#: lib/option.tcl:146
+msgid "Use Merge Tool"
+msgstr "И�пользовать дл� �ли�ни� программу"
+
+#: lib/option.tcl:148
+msgid "Trust File Modification Timestamps"
+msgstr "Довер�ть времени модификации файла"
+
+#: lib/option.tcl:149
+msgid "Prune Tracking Branches During Fetch"
+msgstr "Чи�тка от�леживаемых веток при извлечении изменений"
+
+#: lib/option.tcl:150
+msgid "Match Tracking Branches"
+msgstr "Такое же им�, как и у от�леживаемой ветки"
+
+#: lib/option.tcl:151
+msgid "Use Textconv For Diffs and Blames"
+msgstr "И�пользовать Textconv дл� про�мотра различий и автор�тва"
+
+#: lib/option.tcl:152
+msgid "Blame Copy Only On Changed Files"
+msgstr "Пои�к копий только в изменённых файлах"
+
+#: lib/option.tcl:153
+msgid "Maximum Length of Recent Repositories List"
+msgstr "Мак�имальна� длинна �пи�ка недавних репозиториев"
+
+#: lib/option.tcl:154
+msgid "Minimum Letters To Blame Copy On"
+msgstr "Минимальное количе�тво �имволов дл� пои�ка копий"
+
+#: lib/option.tcl:155
+msgid "Blame History Context Radius (days)"
+msgstr "Радиу� и�ториче�кого контек�та (в дн�х)"
+
+#: lib/option.tcl:156
+msgid "Number of Diff Context Lines"
+msgstr "Чи�ло �трок в контек�те diff"
+
+#: lib/option.tcl:157
+msgid "Additional Diff Parameters"
+msgstr "Дополнительные параметры дл� diff"
+
+#: lib/option.tcl:158
+msgid "Commit Message Text Width"
+msgstr "Ширина тек�та �ообщени� коммита"
+
+#: lib/option.tcl:159
+msgid "New Branch Name Template"
+msgstr "Шаблон дл� имени новой ветки"
+
+#: lib/option.tcl:160
+msgid "Default File Contents Encoding"
+msgstr "Кодировка �одержани� файла по умолчанию"
+
+#: lib/option.tcl:161
+msgid "Warn before committing to a detached head"
+msgstr "Предупреждать перед коммитом в отделённый HEAD"
+
+#: lib/option.tcl:162
+msgid "Staging of untracked files"
+msgstr "Индек�ирование неот�леживаемых файлов"
+
+#: lib/option.tcl:163
+msgid "Show untracked files"
+msgstr "Показать неот�леживаемые файлы"
+
+#: lib/option.tcl:164
+msgid "Tab spacing"
+msgstr "Ширина табул�ции"
+
+#: lib/option.tcl:182 lib/option.tcl:197 lib/option.tcl:220 lib/option.tcl:282
+#: lib/database.tcl:57
+#, tcl-format
+msgid "%s:"
+msgstr "%s:"
+
+#: lib/option.tcl:210
+msgid "Change"
+msgstr "Изменить"
+
+#: lib/option.tcl:254
+msgid "Spelling Dictionary:"
+msgstr "Словарь дл� проверки правопи�ани�:"
+
+#: lib/option.tcl:284
+msgid "Change Font"
+msgstr "Изменить"
+
+#: lib/option.tcl:288
+#, tcl-format
+msgid "Choose %s"
+msgstr "Выберите %s"
+
+#: lib/option.tcl:294
+msgid "pt."
+msgstr "п."
+
+#: lib/option.tcl:308
+msgid "Preferences"
+msgstr "�а�тройки"
+
+#: lib/option.tcl:345
+msgid "Failed to completely save options:"
+msgstr "�е удало�ь полно�тью �охранить на�тройки:"
+
+#: lib/encoding.tcl:443
+msgid "Default"
+msgstr "По умолчанию"
+
+#: lib/encoding.tcl:448
+#, tcl-format
+msgid "System (%s)"
+msgstr "Си�темна� (%s)"
+
+#: lib/encoding.tcl:459 lib/encoding.tcl:465
+msgid "Other"
+msgstr "Друга�"
+
+#: lib/tools.tcl:76
+#, tcl-format
+msgid "Running %s requires a selected file."
+msgstr "Запу�к %s требует выбранного файла."
+
+#: lib/tools.tcl:92
+#, tcl-format
+msgid "Are you sure you want to run %1$s on file \"%2$s\"?"
+msgstr "Вы дей�твительно хотите выполнить %1$s на «%2$s»?"
+
+#: lib/tools.tcl:96
+#, tcl-format
+msgid "Are you sure you want to run %s?"
+msgstr "Дей�твительно запу�тить %s?"
+
+#: lib/tools.tcl:118
+#, tcl-format
+msgid "Tool: %s"
+msgstr "В�помогательна� операци�: %s"
+
+#: lib/tools.tcl:119
+#, tcl-format
+msgid "Running: %s"
+msgstr "Выполнение: %s"
+
+#: lib/tools.tcl:158
+#, tcl-format
+msgid "Tool completed successfully: %s"
+msgstr "Программа %s завершила�ь у�пешно."
+
+#: lib/tools.tcl:160
+#, tcl-format
+msgid "Tool failed: %s"
+msgstr "Ошибка выполнени� программы: %s"
+
+#: lib/mergetool.tcl:8
+msgid "Force resolution to the base version?"
+msgstr "И�пользовать базовую вер�ию дл� разрешени� конфликта?"
+
+#: lib/mergetool.tcl:9
+msgid "Force resolution to this branch?"
+msgstr "И�пользовать вер�ию из �той ветки дл� разрешени� конфликта?"
+
+#: lib/mergetool.tcl:10
+msgid "Force resolution to the other branch?"
+msgstr "И�пользовать вер�ию из другой ветки дл� разрешени� конфликта?"
+
+#: lib/mergetool.tcl:14
+#, tcl-format
+msgid ""
+"Note that the diff shows only conflicting changes.\n"
+"\n"
+"%s will be overwritten.\n"
+"\n"
+"This operation can be undone only by restarting the merge."
+msgstr "Внимание! Спи�ок изменений показывает только конфликтующие отличи�.\n\n%s будет перепи�ан.\n\nЭто дей�твие можно отменить только перезапу�ком операции �ли�ни�."
+
+#: lib/mergetool.tcl:45
+#, tcl-format
+msgid "File %s seems to have unresolved conflicts, still stage?"
+msgstr "Похоже, что файл %s �одержит неразрешенные конфликты. Продолжить индек�ацию?"
+
+#: lib/mergetool.tcl:60
+#, tcl-format
+msgid "Adding resolution for %s"
+msgstr "Добавл�ю результат разрешени� дл� %s"
+
+#: lib/mergetool.tcl:141
+msgid "Cannot resolve deletion or link conflicts using a tool"
+msgstr "Программа �ли�ни� не обрабатывает конфликты � удалением или уча�тием ��ылок"
+
+#: lib/mergetool.tcl:146
+msgid "Conflict file does not exist"
+msgstr "Конфликтующий файл не �уще�твует"
+
+#: lib/mergetool.tcl:246
+#, tcl-format
+msgid "Not a GUI merge tool: '%s'"
+msgstr "«%s» не �вл�ет�� программой �ли�ни�"
+
+#: lib/mergetool.tcl:275
+#, tcl-format
+msgid "Unsupported merge tool '%s'"
+msgstr "�еподдерживаема� программа �ли�ни� «%s»"
+
+#: lib/mergetool.tcl:310
+msgid "Merge tool is already running, terminate it?"
+msgstr "Программа �ли�ни� уже работает. Прервать?"
+
+#: lib/mergetool.tcl:330
+#, tcl-format
+msgid ""
+"Error retrieving versions:\n"
+"%s"
+msgstr "Ошибка получени� вер�ий:\n%s"
+
+#: lib/mergetool.tcl:350
+#, tcl-format
+msgid ""
+"Could not start the merge tool:\n"
+"\n"
+"%s"
+msgstr "Ошибка запу�ка программы �ли�ни�:\n\n%s"
+
+#: lib/mergetool.tcl:354
+msgid "Running merge tool..."
+msgstr "Запу�к программы �ли�ни�…"
+
+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
+msgid "Merge tool failed."
+msgstr "Ошибка выполнени� программы �ли�ни�."
+
+#: lib/tools_dlg.tcl:22
+#, tcl-format
+msgid "%s (%s): Add Tool"
+msgstr "%s (%s): Добавить ин�трумент"
+
+#: lib/tools_dlg.tcl:28
+msgid "Add New Tool Command"
+msgstr "�ова� в�помогательна� операци�"
+
+#: lib/tools_dlg.tcl:34
+msgid "Add globally"
+msgstr "Добавить дл� в�ех репозиториев"
+
+#: lib/tools_dlg.tcl:46
+msgid "Tool Details"
+msgstr "Опи�ание в�помогательной операции"
+
+#: lib/tools_dlg.tcl:49
+msgid "Use '/' separators to create a submenu tree:"
+msgstr "И�пользуйте «/» дл� �оздани� подменю"
+
+#: lib/tools_dlg.tcl:60
+msgid "Command:"
+msgstr "Команда:"
+
+#: lib/tools_dlg.tcl:71
+msgid "Show a dialog before running"
+msgstr "Показать диалог перед запу�ком"
+
+#: lib/tools_dlg.tcl:77
+msgid "Ask the user to select a revision (sets $REVISION)"
+msgstr "Запро� на выбор вер�ии (у�танавливает $REVISION)"
+
+#: lib/tools_dlg.tcl:82
+msgid "Ask the user for additional arguments (sets $ARGS)"
+msgstr "Запро� дополнительных аргументов (у�танавливает $ARGS)"
+
+#: lib/tools_dlg.tcl:89
+msgid "Don't show the command output window"
+msgstr "�е показывать окно вывода команды"
+
+#: lib/tools_dlg.tcl:94
+msgid "Run only if a diff is selected ($FILENAME not empty)"
+msgstr "Запу�к только е�ли показан �пи�ок изменений ($FILENAME не пу�то)"
+
+#: lib/tools_dlg.tcl:118
+msgid "Please supply a name for the tool."
+msgstr "Укажите название в�помогательной операции."
+
+#: lib/tools_dlg.tcl:126
+#, tcl-format
+msgid "Tool '%s' already exists."
+msgstr "В�помогательна� операци� «%s» уже �уще�твует."
+
+#: lib/tools_dlg.tcl:148
+#, tcl-format
+msgid ""
+"Could not add tool:\n"
+"%s"
+msgstr "Ошибка добавлени� программы:\n%s"
+
+#: lib/tools_dlg.tcl:187
+#, tcl-format
+msgid "%s (%s): Remove Tool"
+msgstr "%s (%s): Удалить ин�трумент"
+
+#: lib/tools_dlg.tcl:193
+msgid "Remove Tool Commands"
+msgstr "Удалить команды программы"
+
+#: lib/tools_dlg.tcl:198
+msgid "Remove"
+msgstr "Удалить"
+
+#: lib/tools_dlg.tcl:231
+msgid "(Blue denotes repository-local tools)"
+msgstr "(Синим выделены программы локальные репозиторию)"
+
+#: lib/tools_dlg.tcl:283
+#, tcl-format
+msgid "%s (%s):"
+msgstr "%s (%s):"
+
+#: lib/tools_dlg.tcl:292
+#, tcl-format
+msgid "Run Command: %s"
+msgstr "Запу�к команды: %s"
+
+#: lib/tools_dlg.tcl:306
+msgid "Arguments"
+msgstr "�ргументы"
+
+#: lib/tools_dlg.tcl:341
+msgid "OK"
+msgstr "OK"
+
+#: lib/search.tcl:48
+msgid "Find:"
+msgstr "Пои�к:"
+
+#: lib/search.tcl:50
+msgid "Next"
+msgstr "Дальше"
+
+#: lib/search.tcl:51
+msgid "Prev"
+msgstr "Обратно"
+
+#: lib/search.tcl:52
+msgid "RegExp"
+msgstr "Регул�рные выражени�"
+
+#: lib/search.tcl:54
+msgid "Case"
+msgstr "Учёт реги�тра"
+
+#: lib/shortcut.tcl:8 lib/shortcut.tcl:43 lib/shortcut.tcl:75
+#, tcl-format
+msgid "%s (%s): Create Desktop Icon"
+msgstr "%s (%s): Создать �рлык на рабочем �толе"
+
+#: lib/shortcut.tcl:24 lib/shortcut.tcl:65
+msgid "Cannot write shortcut:"
+msgstr "�евозможно запи�ать ��ылку:"
+
+#: lib/shortcut.tcl:140
+msgid "Cannot write icon:"
+msgstr "�евозможно запи�ать значок:"
+
+#: lib/remote_branch_delete.tcl:29
+#, tcl-format
+msgid "%s (%s): Delete Branch Remotely"
+msgstr "%s (%s): Удаление внешней ветки"
+
+#: lib/remote_branch_delete.tcl:34
+msgid "Delete Branch Remotely"
+msgstr "Удаление ветки во внешнем репозитории"
+
+#: lib/remote_branch_delete.tcl:48
+msgid "From Repository"
+msgstr "Из репозитори�"
+
+#: lib/remote_branch_delete.tcl:88
+msgid "Branches"
+msgstr "Ветки"
+
+#: lib/remote_branch_delete.tcl:110
+msgid "Delete Only If"
+msgstr "Удалить только в �лучае, е�ли"
+
+#: lib/remote_branch_delete.tcl:112
+msgid "Merged Into:"
+msgstr "Сли�ние �:"
+
+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
+msgid "Always (Do not perform merge checks)"
+msgstr "В�егда (не выполн�ть проверку на �ли�ние)"
+
+#: lib/remote_branch_delete.tcl:153
+msgid "A branch is required for 'Merged Into'."
+msgstr "Дл� операции «Сли�ние �» требует�� указать ветку."
+
+#: lib/remote_branch_delete.tcl:185
+#, tcl-format
+msgid ""
+"The following branches are not completely merged into %s:\n"
+"\n"
+" - %s"
+msgstr "Следующие ветки могут быть объединены � %s при помощи операции �ли�ни�:\n\n - %s"
+
+#: lib/remote_branch_delete.tcl:190
+#, tcl-format
+msgid ""
+"One or more of the merge tests failed because you have not fetched the "
+"necessary commits.  Try fetching from %s first."
+msgstr "�екоторые те�ты на �ли�ние не прошли, потому что вы не извлекли необходимые коммиты. Попытайте�ь извлечь их из %s."
+
+#: lib/remote_branch_delete.tcl:208
+msgid "Please select one or more branches to delete."
+msgstr "Укажите одну или не�колько веток дл� удалени�."
+
+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
+msgid ""
+"Recovering deleted branches is difficult.\n"
+"\n"
+"Delete the selected branches?"
+msgstr "Во��тановить удаленные ветки �ложно.\n\nПродолжить?"
+
+#: lib/remote_branch_delete.tcl:227
+#, tcl-format
+msgid "Deleting branches from %s"
+msgstr "Удаление веток из %s"
+
+#: lib/remote_branch_delete.tcl:300
+msgid "No repository selected."
+msgstr "�е указан репозиторий."
+
+#: lib/remote_branch_delete.tcl:305
+#, tcl-format
+msgid "Scanning %s..."
+msgstr "Перечитывание %s…"
+
+#: lib/choose_repository.tcl:45
 msgid "Git Gui"
 msgstr "Git Gui"
 
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
+#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427
 msgid "Create New Repository"
 msgstr "Создать новый репозиторий"
 
-#: lib/choose_repository.tcl:93
+#: lib/choose_repository.tcl:110
 msgid "New..."
 msgstr "�овый…"
 
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
+#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511
 msgid "Clone Existing Repository"
 msgstr "Склонировать �уще�твующий репозиторий"
 
-#: lib/choose_repository.tcl:106
+#: lib/choose_repository.tcl:128
 msgid "Clone..."
 msgstr "Клонировать…"
 
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
+#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105
 msgid "Open Existing Repository"
 msgstr "Выбрать �уще�твующий репозиторий"
 
-#: lib/choose_repository.tcl:119
+#: lib/choose_repository.tcl:141
 msgid "Open..."
 msgstr "Открыть…"
 
-#: lib/choose_repository.tcl:132
+#: lib/choose_repository.tcl:154
 msgid "Recent Repositories"
 msgstr "�едавние репозитории"
 
-#: lib/choose_repository.tcl:138
+#: lib/choose_repository.tcl:164
 msgid "Open Recent Repository:"
 msgstr "Открыть по�ледний репозиторий"
 
-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
-#: lib/choose_repository.tcl:320
+#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338
+#: lib/choose_repository.tcl:345
 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "�е удало�ь �оздать репозиторий %s:"
 
-#: lib/choose_repository.tcl:391
+#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33
+msgid "Create"
+msgstr "Создать"
+
+#: lib/choose_repository.tcl:432
 msgid "Directory:"
 msgstr "Каталог:"
 
-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
-#: lib/choose_repository.tcl:1052
+#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588
+#: lib/choose_repository.tcl:1139
 msgid "Git Repository"
 msgstr "Репозиторий"
 
-#: lib/choose_repository.tcl:448
+#: lib/choose_repository.tcl:487
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "Каталог '%s' уже �уще�твует."
 
-#: lib/choose_repository.tcl:452
+#: lib/choose_repository.tcl:491
 #, tcl-format
 msgid "File %s already exists."
 msgstr "Файл '%s' уже �уще�твует."
 
-#: lib/choose_repository.tcl:466
+#: lib/choose_repository.tcl:506
 msgid "Clone"
 msgstr "Склонировать"
 
-#: lib/choose_repository.tcl:479
+#: lib/choose_repository.tcl:519
 msgid "Source Location:"
 msgstr "И�ходное положение:"
 
-#: lib/choose_repository.tcl:490
+#: lib/choose_repository.tcl:528
 msgid "Target Directory:"
 msgstr "Каталог назначени�:"
 
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:538
 msgid "Clone Type:"
 msgstr "Тип клона:"
 
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:543
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "Стандартный (Бы�трый, полуизбыточный, «же�ткие» ��ылки)"
 
-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:548
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "Полна� копи� (Медленный, �оздает резервную копию)"
 
-#: lib/choose_repository.tcl:520
+#: lib/choose_repository.tcl:553
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "Общий (Самый бы�трый, не рекомендует��, без резервной копии)"
 
-#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
-#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
-#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
+#: lib/choose_repository.tcl:560
+msgid "Recursively clone submodules too"
+msgstr "Также рекур�ивно клонировать подмодули"
+
+#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864
+#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153
 #, tcl-format
 msgid "Not a Git repository: %s"
-msgstr "Каталог не �вл�ет�� репозиторием: %s"
+msgstr "Каталог не �вл�ет�� репозиторием Git: %s"
 
-#: lib/choose_repository.tcl:592
+#: lib/choose_repository.tcl:630
 msgid "Standard only available for local repository."
 msgstr "Стандартный клон возможен только дл� локального репозитори�."
 
-#: lib/choose_repository.tcl:596
+#: lib/choose_repository.tcl:634
 msgid "Shared only available for local repository."
 msgstr "Общий клон возможен только дл� локального репозитори�."
 
-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:655
 #, tcl-format
 msgid "Location %s already exists."
-msgstr "Путь '%s' уже �уще�твует."
+msgstr "Путь %s уже �уще�твует."
 
-#: lib/choose_repository.tcl:628
+#: lib/choose_repository.tcl:666
 msgid "Failed to configure origin"
-msgstr "�е могу �конфигурировать и�ходный репозиторий."
+msgstr "�е удало�ь �конфигурировать и�ходный репозиторий"
 
-#: lib/choose_repository.tcl:640
+#: lib/choose_repository.tcl:678
 msgid "Counting objects"
-msgstr "Считаю объекты"
+msgstr "Под�чёт объектов"
 
-#: lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:679
 msgid "buckets"
 msgstr "блоки"
 
-#: lib/choose_repository.tcl:665
+#: lib/choose_repository.tcl:703
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
-msgstr "�е могу �копировать objects/info/alternates: %s"
+msgstr "�е удало�ь �копировать objects/info/alternates: %s"
 
-#: lib/choose_repository.tcl:701
+#: lib/choose_repository.tcl:740
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "�ечего клонировать � %s."
 
-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
-#: lib/choose_repository.tcl:929
+#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962
+#: lib/choose_repository.tcl:974
 msgid "The 'master' branch has not been initialized."
-msgstr "�е инициализирована ветвь «master»."
+msgstr "�е инициализирована ветка «master»."
 
-#: lib/choose_repository.tcl:716
+#: lib/choose_repository.tcl:755
 msgid "Hardlinks are unavailable.  Falling back to copying."
-msgstr "«Же�ткие ��ылки» недо�тупны. Будет и�пользовано копирование."
+msgstr "Же�ткие ��ылки недо�тупны. Будет и�пользовано копирование."
 
-#: lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:769
 #, tcl-format
 msgid "Cloning from %s"
-msgstr "Клонирование %s"
+msgstr "Клонирование из %s"
 
-#: lib/choose_repository.tcl:759
+#: lib/choose_repository.tcl:800
 msgid "Copying objects"
-msgstr "Копирование objects"
+msgstr "Копирование объектов"
 
-#: lib/choose_repository.tcl:760
+#: lib/choose_repository.tcl:801
 msgid "KiB"
 msgstr "КБ"
 
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:825
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "�е могу �копировать объект: %s"
 
-#: lib/choose_repository.tcl:794
+#: lib/choose_repository.tcl:837
 msgid "Linking objects"
 msgstr "Создание ��ылок на objects"
 
-#: lib/choose_repository.tcl:795
+#: lib/choose_repository.tcl:838
 msgid "objects"
 msgstr "объекты"
 
-#: lib/choose_repository.tcl:803
+#: lib/choose_repository.tcl:846
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "�е могу �оздать «же�ткую ��ылку» на объект: %s"
 
-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:903
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr "�е удало�ь извлечь ветки и объекты. Дополнительна� информаци� на кон�оли."
 
-#: lib/choose_repository.tcl:869
+#: lib/choose_repository.tcl:914
 msgid "Cannot fetch tags.  See console output for details."
 msgstr "�е удало�ь извлечь метки. Дополнительна� информаци� на кон�оли."
 
-#: lib/choose_repository.tcl:893
+#: lib/choose_repository.tcl:938
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "�е могу определить HEAD. Дополнительна� информаци� на кон�оли."
 
-#: lib/choose_repository.tcl:902
+#: lib/choose_repository.tcl:947
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "�е могу очи�тить %s"
 
-#: lib/choose_repository.tcl:908
+#: lib/choose_repository.tcl:953
 msgid "Clone failed."
 msgstr "Клонирование не удало�ь."
 
-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:960
 msgid "No default branch obtained."
 msgstr "Ветка по умолчанию не была получена."
 
-#: lib/choose_repository.tcl:926
+#: lib/choose_repository.tcl:971
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "�е могу ра�познать %s как коммит."
 
-#: lib/choose_repository.tcl:938
+#: lib/choose_repository.tcl:998
 msgid "Creating working directory"
 msgstr "Создаю рабочий каталог"
 
-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
-#: lib/index.tcl:198
-msgid "files"
-msgstr "файлов"
-
-#: lib/choose_repository.tcl:968
+#: lib/choose_repository.tcl:1028
 msgid "Initial file checkout failed."
 msgstr "�е удало�ь получить начальное �о�то�ние файлов репозитори�."
 
-#: lib/choose_repository.tcl:1011
-msgid "Open"
-msgstr "Открыть"
+#: lib/choose_repository.tcl:1072
+msgid "Cloning submodules"
+msgstr "Клонирование подмодулей"
 
-#: lib/choose_repository.tcl:1021
+#: lib/choose_repository.tcl:1087
+msgid "Cannot clone submodules."
+msgstr "�е удало�ь клонировать подмодули."
+
+#: lib/choose_repository.tcl:1110
 msgid "Repository:"
 msgstr "Репозиторий:"
 
-#: lib/choose_repository.tcl:1072
+#: lib/choose_repository.tcl:1159
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "�е удало�ь открыть репозиторий %s:"
 
-#: lib/choose_rev.tcl:53
+#: lib/about.tcl:26
+msgid "git-gui - a graphical user interface for Git."
+msgstr "git-gui - графиче�кий пользователь�кий интерфей� к Git."
+
+#: lib/blame.tcl:74
+#, tcl-format
+msgid "%s (%s): File Viewer"
+msgstr "%s (%s): Про�мотр файла"
+
+#: lib/blame.tcl:80
+msgid "Commit:"
+msgstr "Коммит:"
+
+#: lib/blame.tcl:282
+msgid "Copy Commit"
+msgstr "Копировать SHA-1"
+
+#: lib/blame.tcl:286
+msgid "Find Text..."
+msgstr "�айти тек�т…"
+
+#: lib/blame.tcl:290
+msgid "Goto Line..."
+msgstr "Перейти на �троку…"
+
+#: lib/blame.tcl:299
+msgid "Do Full Copy Detection"
+msgstr "Прове�ти полный пои�к копий"
+
+#: lib/blame.tcl:303
+msgid "Show History Context"
+msgstr "Показать и�ториче�кий контек�т"
+
+#: lib/blame.tcl:306
+msgid "Blame Parent Commit"
+msgstr "�вторы родитель�кого коммита"
+
+#: lib/blame.tcl:468
+#, tcl-format
+msgid "Reading %s..."
+msgstr "Чтение %s…"
+
+#: lib/blame.tcl:596
+msgid "Loading copy/move tracking annotations..."
+msgstr "Загрузка аннотации копирований/переименований…"
+
+#: lib/blame.tcl:613
+msgid "lines annotated"
+msgstr "�трок прокомментировано"
+
+#: lib/blame.tcl:815
+msgid "Loading original location annotations..."
+msgstr "Загрузка аннотаций первоначального положени� объекта…"
+
+#: lib/blame.tcl:818
+msgid "Annotation complete."
+msgstr "�ннотаци� завершена."
+
+#: lib/blame.tcl:849
+msgid "Busy"
+msgstr "Зан�т"
+
+#: lib/blame.tcl:850
+msgid "Annotation process is already running."
+msgstr "�ннотаци� уже запущена"
+
+#: lib/blame.tcl:889
+msgid "Running thorough copy detection..."
+msgstr "Выполнение полного пои�ка копий…"
+
+#: lib/blame.tcl:957
+msgid "Loading annotation..."
+msgstr "Загрузка аннотации…"
+
+#: lib/blame.tcl:1010
+msgid "Author:"
+msgstr "�втор:"
+
+#: lib/blame.tcl:1014
+msgid "Committer:"
+msgstr "Коммитер:"
+
+#: lib/blame.tcl:1019
+msgid "Original File:"
+msgstr "И�ходный файл:"
+
+#: lib/blame.tcl:1067
+msgid "Cannot find HEAD commit:"
+msgstr "�е удало�ь найти текущее �о�то�ние:"
+
+#: lib/blame.tcl:1122
+msgid "Cannot find parent commit:"
+msgstr "�е удало�ь найти родитель�кое �о�то�ние:"
+
+#: lib/blame.tcl:1137
+msgid "Unable to display parent"
+msgstr "�е могу показать предка"
+
+#: lib/blame.tcl:1138 lib/diff.tcl:345
+msgid "Error loading diff:"
+msgstr "Ошибка загрузки изменений:"
+
+#: lib/blame.tcl:1279
+msgid "Originally By:"
+msgstr "И�точник:"
+
+#: lib/blame.tcl:1285
+msgid "In File:"
+msgstr "Файл:"
+
+#: lib/blame.tcl:1290
+msgid "Copied Or Moved Here By:"
+msgstr "Скопировано/перемещено в:"
+
+#: lib/diff.tcl:77
+#, tcl-format
+msgid ""
+"No differences detected.\n"
+"\n"
+"%s has no changes.\n"
+"\n"
+"The modification date of this file was updated by another application, but the content within the file was not changed.\n"
+"\n"
+"A rescan will be automatically started to find other files which may have the same state."
+msgstr "Изменений не обнаружено.\n\nв %s от�ут�твуют изменени�.\n\nДата изменени� файла была обновлена другой программой, но �одержимое файла о�тало�ь прежним.\n\nСейча� будет запущено перечитывание репозитори�, чтобы найти подобные файлы."
+
+#: lib/diff.tcl:117
+#, tcl-format
+msgid "Loading diff of %s..."
+msgstr "Загрузка изменений %s…"
+
+#: lib/diff.tcl:143
+msgid ""
+"LOCAL: deleted\n"
+"REMOTE:\n"
+msgstr "ЛОК�ЛЬ�О: удалён\nВ�ЕШ�ИЙ:\n"
+
+#: lib/diff.tcl:148
+msgid ""
+"REMOTE: deleted\n"
+"LOCAL:\n"
+msgstr "В�ЕШ�ИЙ: удалён\nЛОК�ЛЬ�О:\n"
+
+#: lib/diff.tcl:155
+msgid "LOCAL:\n"
+msgstr "ЛОК�ЛЬ�О:\n"
+
+#: lib/diff.tcl:158
+msgid "REMOTE:\n"
+msgstr "В�ЕШ�ИЙ:\n"
+
+#: lib/diff.tcl:220 lib/diff.tcl:344
+#, tcl-format
+msgid "Unable to display %s"
+msgstr "�е могу показать %s"
+
+#: lib/diff.tcl:221
+msgid "Error loading file:"
+msgstr "Ошибка загрузки файла:"
+
+#: lib/diff.tcl:227
+msgid "Git Repository (subproject)"
+msgstr "Репозиторий Git (подпроект)"
+
+#: lib/diff.tcl:239
+msgid "* Binary file (not showing content)."
+msgstr "* Двоичный файл (�одержимое не показано)"
+
+#: lib/diff.tcl:244
+#, tcl-format
+msgid ""
+"* Untracked file is %d bytes.\n"
+"* Showing only first %d bytes.\n"
+msgstr "* Размер неот�леживаемого файла %d байт.\n* Показано первых %d байт.\n"
+
+#: lib/diff.tcl:250
+#, tcl-format
+msgid ""
+"\n"
+"* Untracked file clipped here by %s.\n"
+"* To see the entire file, use an external editor.\n"
+msgstr "\n* �еот�леживаемый файл обрезан: %s.\n* Чтобы увидеть ве�ь файл, и�пользуйте внешний редактор.\n"
+
+#: lib/diff.tcl:583
+msgid "Failed to unstage selected hunk."
+msgstr "�е удало�ь и�ключить выбранную ча�ть."
+
+#: lib/diff.tcl:591
+msgid "Failed to revert selected hunk."
+msgstr "�е удало�ь обратить изменени� выбранного блока."
+
+#: lib/diff.tcl:594
+msgid "Failed to stage selected hunk."
+msgstr "�е удало�ь проиндек�ировать выбранный блок изменений."
+
+#: lib/diff.tcl:687
+msgid "Failed to unstage selected line."
+msgstr "�е удало�ь и�ключить выбранную �троку."
+
+#: lib/diff.tcl:696
+msgid "Failed to revert selected line."
+msgstr "�е удало�ь обратить изменени� выбраной �троки."
+
+#: lib/diff.tcl:700
+msgid "Failed to stage selected line."
+msgstr "�е удало�ь проиндек�ировать выбранную �троку."
+
+#: lib/diff.tcl:889
+msgid "Failed to undo last revert."
+msgstr "�е удало�ь отменить по�ленднее обращение изменений."
+
+#: lib/sshkey.tcl:34
+msgid "No keys found."
+msgstr "Ключ не найден"
+
+#: lib/sshkey.tcl:37
+#, tcl-format
+msgid "Found a public key in: %s"
+msgstr "Публичный ключ из %s"
+
+#: lib/sshkey.tcl:43
+msgid "Generate Key"
+msgstr "Создать ключ"
+
+#: lib/sshkey.tcl:61
+msgid "Copy To Clipboard"
+msgstr "Скопировать в буфер обмена"
+
+#: lib/sshkey.tcl:75
+msgid "Your OpenSSH Public Key"
+msgstr "Ваш публичный ключ OpenSSH"
+
+#: lib/sshkey.tcl:83
+msgid "Generating..."
+msgstr "Создание…"
+
+#: lib/sshkey.tcl:89
+#, tcl-format
+msgid ""
+"Could not start ssh-keygen:\n"
+"\n"
+"%s"
+msgstr "Ошибка запу�ка ssh-keygen:\n\n%s"
+
+#: lib/sshkey.tcl:116
+msgid "Generation failed."
+msgstr "Ключ не �оздан."
+
+#: lib/sshkey.tcl:123
+msgid "Generation succeeded, but no keys found."
+msgstr "Создание ключа завершило�ь, но результат не был найден"
+
+#: lib/sshkey.tcl:126
+#, tcl-format
+msgid "Your key is in: %s"
+msgstr "Ваш ключ находит�� в: %s"
+
+#: lib/branch_create.tcl:23
+#, tcl-format
+msgid "%s (%s): Create Branch"
+msgstr "%s (%s): Создание ветки"
+
+#: lib/branch_create.tcl:28
+msgid "Create New Branch"
+msgstr "Создать новую ветку"
+
+#: lib/branch_create.tcl:42
+msgid "Branch Name"
+msgstr "Им� ветки"
+
+#: lib/branch_create.tcl:57
+msgid "Match Tracking Branch Name"
+msgstr "Соответ�твовать имени от�леживаемой ветки"
+
+#: lib/branch_create.tcl:66
+msgid "Starting Revision"
+msgstr "�ачальна� вер�и�"
+
+#: lib/branch_create.tcl:72
+msgid "Update Existing Branch:"
+msgstr "Обновить имеющую�� ветку:"
+
+#: lib/branch_create.tcl:75
+msgid "No"
+msgstr "�ет"
+
+#: lib/branch_create.tcl:80
+msgid "Fast Forward Only"
+msgstr "Только Fast Forward"
+
+#: lib/branch_create.tcl:97
+msgid "Checkout After Creation"
+msgstr "По�ле �оздани� �делать текущей"
+
+#: lib/branch_create.tcl:132
+msgid "Please select a tracking branch."
+msgstr "Укажите отлеживаемую ветку."
+
+#: lib/branch_create.tcl:141
+#, tcl-format
+msgid "Tracking branch %s is not a branch in the remote repository."
+msgstr "От�леживаема� ветка %s не �вл�ет�� веткой на внешнем репозитории."
+
+#: lib/console.tcl:59
+msgid "Working... please wait..."
+msgstr "В проце��е… пожалуй�та, ждите…"
+
+#: lib/console.tcl:186
+msgid "Success"
+msgstr "Проце�� у�пешно завершен"
+
+#: lib/console.tcl:200
+msgid "Error: Command Failed"
+msgstr "Ошибка: не удало�ь выполнить команду"
+
+#: lib/line.tcl:17
+msgid "Goto Line:"
+msgstr "Перейти на �троку:"
+
+#: lib/line.tcl:23
+msgid "Go"
+msgstr "Перейти"
+
+#: lib/choose_rev.tcl:52
 msgid "This Detached Checkout"
 msgstr "Текущее от�оединенное �о�то�ние"
 
@@ -1232,36 +2254,36 @@ msgstr "Текущее от�оединенное �о�то�ние"
 msgid "Revision Expression:"
 msgstr "Выражение дл� определени� вер�ии:"
 
-#: lib/choose_rev.tcl:74
+#: lib/choose_rev.tcl:72
 msgid "Local Branch"
 msgstr "Локальна� ветка:"
 
-#: lib/choose_rev.tcl:79
+#: lib/choose_rev.tcl:77
 msgid "Tracking Branch"
 msgstr "От�леживаема� ветка"
 
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544
 msgid "Tag"
 msgstr "Метка"
 
-#: lib/choose_rev.tcl:317
+#: lib/choose_rev.tcl:321
 #, tcl-format
 msgid "Invalid revision: %s"
 msgstr "�еверна� вер�и�: %s"
 
-#: lib/choose_rev.tcl:338
+#: lib/choose_rev.tcl:342
 msgid "No revision selected."
 msgstr "Вер�и� не указана."
 
-#: lib/choose_rev.tcl:346
+#: lib/choose_rev.tcl:350
 msgid "Revision expression is empty."
 msgstr "Пу�тое выражение дл� определени� вер�ии."
 
-#: lib/choose_rev.tcl:531
+#: lib/choose_rev.tcl:537
 msgid "Updated"
 msgstr "Обновлено"
 
-#: lib/choose_rev.tcl:559
+#: lib/choose_rev.tcl:565
 msgid "URL"
 msgstr "С�ылка"
 
@@ -1279,24 +2301,24 @@ msgid ""
 "You are currently in the middle of a merge that has not been fully completed.  You cannot amend the prior commit unless you first abort the current merge activity.\n"
 msgstr "�евозможно и�править коммит во врем� �ли�ни�.\n\nТекущее �ли�ние не завершено. �евозможно и�править предыдуий коммит, не прерыва� �ту операцию.\n"
 
-#: lib/commit.tcl:48
+#: lib/commit.tcl:56
 msgid "Error loading commit data for amend:"
 msgstr "Ошибка при загрузке данных дл� и�правлени� коммита:"
 
-#: lib/commit.tcl:75
+#: lib/commit.tcl:83
 msgid "Unable to obtain your identity:"
 msgstr "�евозможно получить информацию об автор�тве:"
 
-#: lib/commit.tcl:80
+#: lib/commit.tcl:88
 msgid "Invalid GIT_COMMITTER_IDENT:"
 msgstr "�едопу�тимый GIT_COMMITTER_IDENT:"
 
-#: lib/commit.tcl:129
+#: lib/commit.tcl:138
 #, tcl-format
 msgid "warning: Tcl does not support encoding '%s'."
 msgstr "предупреждение: Tcl не поддерживает кодировку «%s»."
 
-#: lib/commit.tcl:149
+#: lib/commit.tcl:158
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -1305,7 +2327,7 @@ msgid ""
 "The rescan will be automatically started now.\n"
 msgstr "По�леднее прочитанное �о�то�ние репозитори� не �оответ�твует текущему.\n\nС момента по�ледней проверки репозиторий был изменен другой программой Git. �еобходимо перечитать репозиторий, прежде чем измен�ть текущую ветвь. \n\nЭто будет �делано �ейча� автоматиче�ки.\n"
 
-#: lib/commit.tcl:172
+#: lib/commit.tcl:182
 #, tcl-format
 msgid ""
 "Unmerged files cannot be committed.\n"
@@ -1313,7 +2335,7 @@ msgid ""
 "File %s has merge conflicts.  You must resolve them and stage the file before committing.\n"
 msgstr "�ельз� выполнить коммит � незавершённой операцией �ли�ни�.\n\nДл� файла %s возник конфликт �ли�ни�. Разрешите конфликт и добавьте их в индек� перед выполнением коммита.\n"
 
-#: lib/commit.tcl:180
+#: lib/commit.tcl:190
 #, tcl-format
 msgid ""
 "Unknown file state %s detected.\n"
@@ -1321,14 +2343,14 @@ msgid ""
 "File %s cannot be committed by this program.\n"
 msgstr "Обнаружено неизве�тное �о�то�ние файла %s.\n\nФайл %s не может быть закоммичен �той программой.\n"
 
-#: lib/commit.tcl:188
+#: lib/commit.tcl:198
 msgid ""
 "No changes to commit.\n"
 "\n"
 "You must stage at least 1 file before you can commit.\n"
 msgstr "От�ут�твуют изменени� дл� �охранени�.\n\nДобавьте в индек� хот� бы один файл перед выполнением коммита.\n"
 
-#: lib/commit.tcl:203
+#: lib/commit.tcl:213
 msgid ""
 "Please supply a commit message.\n"
 "\n"
@@ -1339,40 +2361,47 @@ msgid ""
 "- Remaining lines: Describe why this change is good.\n"
 msgstr "Укажите �ообщение коммита.\n\nРекомендует�� �ледующий формат �ообщени�:\n\n- в первой �троке краткое опи�ание �деланных изменений\n- втора� �трока пу�та�\n- в о�тавших�� �троках опишите, что дают ваши изменени�\n"
 
-#: lib/commit.tcl:234
+#: lib/commit.tcl:244
 msgid "Calling pre-commit hook..."
 msgstr "Вызов перехватчика pre-commit…"
 
-#: lib/commit.tcl:249
+#: lib/commit.tcl:259
 msgid "Commit declined by pre-commit hook."
 msgstr "Коммит прерван переватчиком pre-commit."
 
-#: lib/commit.tcl:272
+#: lib/commit.tcl:278
+msgid ""
+"You are about to commit on a detached head. This is a potentially dangerous thing to do because if you switch to another branch you will lose your changes and it can be difficult to retrieve them later from the reflog. You should probably cancel this commit and create a new branch to continue.\n"
+" \n"
+" Do you really want to proceed with your Commit?"
+msgstr "Вы �обираете�ь �делать коммит в отделённый HEAD. Это дей�твие потенциально опа�но, так как е�ли вы переключите�ь на другую ветку по�ле �того, то вы потер�ете �вои изменени� и их �ложно будет потом найти � помощью журнала ��ылок (reflog). Вам �корее в�его �ледует отменить �тот коммит и �оздать новую ветку до продолжени�.\n \n Вы дей�твительно хотите продолжить и �оздать коммит?"
+
+#: lib/commit.tcl:299
 msgid "Calling commit-msg hook..."
 msgstr "Вызов перехватчика commit-msg…"
 
-#: lib/commit.tcl:287
+#: lib/commit.tcl:314
 msgid "Commit declined by commit-msg hook."
 msgstr "Коммит прерван переватчиком commit-msg"
 
-#: lib/commit.tcl:300
+#: lib/commit.tcl:327
 msgid "Committing changes..."
 msgstr "Коммит изменений…"
 
-#: lib/commit.tcl:316
+#: lib/commit.tcl:344
 msgid "write-tree failed:"
 msgstr "Программа write-tree завершила�ь � ошибкой:"
 
-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
+#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422
 msgid "Commit failed."
 msgstr "�е удало�ь закоммитить изменени�."
 
-#: lib/commit.tcl:334
+#: lib/commit.tcl:362
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "Коммит %s похоже поврежден"
 
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
 msgid ""
 "No changes to commit.\n"
 "\n"
@@ -1381,63 +2410,95 @@ msgid ""
 "A rescan will be automatically started now.\n"
 msgstr "�ет изменени� дл� коммита.\n\n�и один файл не был изменен и не было �ли�ни�.\n\nСейча� автоматиче�ки запу�тит�� перечитывание репозитори�.\n"
 
-#: lib/commit.tcl:346
+#: lib/commit.tcl:374
 msgid "No changes to commit."
 msgstr "�ет изменени� дл� коммита."
 
-#: lib/commit.tcl:360
+#: lib/commit.tcl:394
 msgid "commit-tree failed:"
 msgstr "Программа commit-tree завершила�ь � ошибкой:"
 
-#: lib/commit.tcl:381
+#: lib/commit.tcl:421
 msgid "update-ref failed:"
 msgstr "Программа update-ref завершила�ь � ошибкой:"
 
-#: lib/commit.tcl:469
+#: lib/commit.tcl:514
 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "Создан коммит %s: %s "
 
-#: lib/console.tcl:59
-msgid "Working... please wait..."
-msgstr "В проце��е… пожалуй�та, ждите…"
+#: lib/branch_delete.tcl:16
+#, tcl-format
+msgid "%s (%s): Delete Branch"
+msgstr "%s (%s): Удаление ветки"
 
-#: lib/console.tcl:186
-msgid "Success"
-msgstr "Проце�� у�пешно завершен"
+#: lib/branch_delete.tcl:21
+msgid "Delete Local Branch"
+msgstr "Удалить локальную ветку"
 
-#: lib/console.tcl:200
-msgid "Error: Command Failed"
-msgstr "Ошибка: не удало�ь выполнить команду"
+#: lib/branch_delete.tcl:39
+msgid "Local Branches"
+msgstr "Локальные ветки"
 
-#: lib/database.tcl:43
+#: lib/branch_delete.tcl:51
+msgid "Delete Only If Merged Into"
+msgstr "Удалить только в �лучае, е�ли было �ли�ние �"
+
+#: lib/branch_delete.tcl:103
+#, tcl-format
+msgid "The following branches are not completely merged into %s:"
+msgstr "Ветки, которые не полно�тью �ливают�� � %s:"
+
+#: lib/branch_delete.tcl:131
+#, tcl-format
+msgid " - %s:"
+msgstr " — %s:"
+
+#: lib/branch_delete.tcl:141
+#, tcl-format
+msgid ""
+"Failed to delete branches:\n"
+"%s"
+msgstr "�е удало�ь удалить ветки:\n%s"
+
+#: lib/date.tcl:25
+#, tcl-format
+msgid "Invalid date from Git: %s"
+msgstr "�еправильна� дата в репозитории: %s"
+
+#: lib/database.tcl:42
 msgid "Number of loose objects"
 msgstr "Количе�тво не�в�занных объектов"
 
-#: lib/database.tcl:44
+#: lib/database.tcl:43
 msgid "Disk space used by loose objects"
 msgstr "Объем ди�кового про�тран�тва, зан�тый не�в�занными объектами"
 
-#: lib/database.tcl:45
+#: lib/database.tcl:44
 msgid "Number of packed objects"
 msgstr "Количе�тво упакованных объектов"
 
-#: lib/database.tcl:46
+#: lib/database.tcl:45
 msgid "Number of packs"
 msgstr "Количе�тво pack-файлов"
 
-#: lib/database.tcl:47
+#: lib/database.tcl:46
 msgid "Disk space used by packed objects"
 msgstr "Объем ди�кового про�тран�тва, зан�тый упакованными объектами"
 
-#: lib/database.tcl:48
+#: lib/database.tcl:47
 msgid "Packed objects waiting for pruning"
 msgstr "�е�в�занные объекты, которые можно удалить"
 
-#: lib/database.tcl:49
+#: lib/database.tcl:48
 msgid "Garbage files"
 msgstr "Му�ор"
 
+#: lib/database.tcl:66
+#, tcl-format
+msgid "%s (%s): Database Statistics"
+msgstr "%s (%s): Стати�тика базы данных"
+
 #: lib/database.tcl:72
 msgid "Compressing the object database"
 msgstr "Сжатие базы объектов"
@@ -1456,183 +2517,29 @@ msgid ""
 "Compress the database now?"
 msgstr "Этот репозиторий �ейча� �одержит примерно %i �вободных объектов\n\nДл� лучшей производительно�ти рекомендует�� �жать базу данных.\n\nСжать базу данных �ейча�?"
 
-#: lib/date.tcl:25
-#, tcl-format
-msgid "Invalid date from Git: %s"
-msgstr "�еправильна� дата в репозитории: %s"
-
-#: lib/diff.tcl:64
-#, tcl-format
-msgid ""
-"No differences detected.\n"
-"\n"
-"%s has no changes.\n"
-"\n"
-"The modification date of this file was updated by another application, but the content within the file was not changed.\n"
-"\n"
-"A rescan will be automatically started to find other files which may have the same state."
-msgstr "Изменений не обнаружено.\n\nв %s от�ут�твуют изменени�.\n\nДата изменени� файла была обновлена другой программой, но �одержимое файла о�тало�ь прежним.\n\nСейча� будет запущено перечитывание репозитори�, чтобы найти подобные файлы."
-
-#: lib/diff.tcl:104
-#, tcl-format
-msgid "Loading diff of %s..."
-msgstr "Загрузка изменений %s…"
-
-#: lib/diff.tcl:125
-msgid ""
-"LOCAL: deleted\n"
-"REMOTE:\n"
-msgstr "ЛОК�ЛЬ�О: удалён\nВ�ЕШ�ИЙ:\n"
-
-#: lib/diff.tcl:130
-msgid ""
-"REMOTE: deleted\n"
-"LOCAL:\n"
-msgstr "В�ЕШ�ИЙ: удалён\nЛОК�ЛЬ�О:\n"
-
-#: lib/diff.tcl:137
-msgid "LOCAL:\n"
-msgstr "ЛОК�ЛЬ�О:\n"
-
-#: lib/diff.tcl:140
-msgid "REMOTE:\n"
-msgstr "В�ЕШ�ИЙ:\n"
-
-#: lib/diff.tcl:202 lib/diff.tcl:319
+#: lib/error.tcl:20
 #, tcl-format
-msgid "Unable to display %s"
-msgstr "�е могу показать %s"
+msgid "%s: error"
+msgstr "%s: ошибка"
 
-#: lib/diff.tcl:203
-msgid "Error loading file:"
-msgstr "Ошибка загрузки файла:"
-
-#: lib/diff.tcl:210
-msgid "Git Repository (subproject)"
-msgstr "Репозиторий Git (подпроект)"
-
-#: lib/diff.tcl:222
-msgid "* Binary file (not showing content)."
-msgstr "* Двоичный файл (�одержимое не показано)"
-
-#: lib/diff.tcl:227
-#, tcl-format
-msgid ""
-"* Untracked file is %d bytes.\n"
-"* Showing only first %d bytes.\n"
-msgstr "* Размер неот�леживаемого файла %d байт.\n* Показано первых %d байт.\n"
-
-#: lib/diff.tcl:233
+#: lib/error.tcl:36
 #, tcl-format
-msgid ""
-"\n"
-"* Untracked file clipped here by %s.\n"
-"* To see the entire file, use an external editor.\n"
-msgstr "\n* �еот�леживаемый файл обрезан: %s.\n* Чтобы увидеть ве�ь файл, и�пользуйте внешний редактор.\n"
+msgid "%s: warning"
+msgstr "%s: предупреждение"
 
-#: lib/diff.tcl:482
-msgid "Failed to unstage selected hunk."
-msgstr "�е удало�ь и�ключить выбранную ча�ть."
-
-#: lib/diff.tcl:489
-msgid "Failed to stage selected hunk."
-msgstr "�е удало�ь проиндек�ировать выбранный блок изменений."
-
-#: lib/diff.tcl:568
-msgid "Failed to unstage selected line."
-msgstr "�е удало�ь и�ключить выбранную �троку."
-
-#: lib/diff.tcl:576
-msgid "Failed to stage selected line."
-msgstr "�е удало�ь проиндек�ировать выбранную �троку."
-
-#: lib/encoding.tcl:443
-msgid "Default"
-msgstr "По умолчанию"
-
-#: lib/encoding.tcl:448
+#: lib/error.tcl:80
 #, tcl-format
-msgid "System (%s)"
-msgstr "Си�темна� (%s)"
-
-#: lib/encoding.tcl:459 lib/encoding.tcl:465
-msgid "Other"
-msgstr "Друга�"
-
-#: lib/error.tcl:20 lib/error.tcl:114
-msgid "error"
-msgstr "ошибка"
-
-#: lib/error.tcl:36
-msgid "warning"
-msgstr "предупреждение"
+msgid "%s hook failed:"
+msgstr "ошибка перехватчика %s:"
 
-#: lib/error.tcl:94
+#: lib/error.tcl:96
 msgid "You must correct the above errors before committing."
 msgstr "Перед коммитом, и�правьте вышеуказанные ошибки."
 
-#: lib/index.tcl:6
-msgid "Unable to unlock the index."
-msgstr "�е удало�ь разблокировать индек�"
-
-#: lib/index.tcl:15
-msgid "Index Error"
-msgstr "Ошибка в индек�е"
-
-#: lib/index.tcl:17
-msgid ""
-"Updating the Git index failed.  A rescan will be automatically started to "
-"resynchronize git-gui."
-msgstr "�е удало�ь обновить индек� Git. Со�то�ние репозитори� будет перечитано автоматиче�ки."
-
-#: lib/index.tcl:28
-msgid "Continue"
-msgstr "Продолжить"
-
-#: lib/index.tcl:31
-msgid "Unlock Index"
-msgstr "Разблокировать индек�"
-
-#: lib/index.tcl:289
-#, tcl-format
-msgid "Unstaging %s from commit"
-msgstr "Удаление %s из индек�а"
-
-#: lib/index.tcl:328
-msgid "Ready to commit."
-msgstr "Готов дл� коммита."
-
-#: lib/index.tcl:341
-#, tcl-format
-msgid "Adding %s"
-msgstr "Добавление %s…"
-
-#: lib/index.tcl:398
-#, tcl-format
-msgid "Revert changes in file %s?"
-msgstr "Обратить изменени� в файле %s?"
-
-#: lib/index.tcl:400
+#: lib/error.tcl:116
 #, tcl-format
-msgid "Revert changes in these %i files?"
-msgstr "Обратить изменени� в %i файле(-ах)?"
-
-#: lib/index.tcl:408
-msgid "Any unstaged changes will be permanently lost by the revert."
-msgstr "Любые непроиндек�ированные изменени�, будут потер�ны при обращении изменений."
-
-#: lib/index.tcl:411
-msgid "Do Nothing"
-msgstr "�ичего не делать"
-
-#: lib/index.tcl:429
-msgid "Reverting selected files"
-msgstr "Обращение изменений в выбранных файлах"
-
-#: lib/index.tcl:433
-#, tcl-format
-msgid "Reverting %s"
-msgstr "Обращение изменений в %s"
+msgid "%s (%s): error"
+msgstr "%s (%s): ошибка"
 
 #: lib/merge.tcl:13
 msgid ""
@@ -1670,41 +2577,46 @@ msgid ""
 "You should complete the current commit before starting a merge.  Doing so will help you abort a failed merge, should the need arise.\n"
 msgstr "Вы находите�ь в проце��е изменений.\n\nФайл %s изменён.\n\nВы должны завершить текущий коммит перед началом �ли�ни�. В �лучае необходимо�ти, �то позволит прервать операцию �ли�ни�.\n"
 
-#: lib/merge.tcl:107
+#: lib/merge.tcl:108
 #, tcl-format
 msgid "%s of %s"
 msgstr "%s из %s"
 
-#: lib/merge.tcl:120
+#: lib/merge.tcl:126
 #, tcl-format
 msgid "Merging %s and %s..."
 msgstr "Сли�ние %s и %s…"
 
-#: lib/merge.tcl:131
+#: lib/merge.tcl:137
 msgid "Merge completed successfully."
 msgstr "Сли�ние у�пешно завершено."
 
-#: lib/merge.tcl:133
+#: lib/merge.tcl:139
 msgid "Merge failed.  Conflict resolution is required."
 msgstr "�е удало�ь завершить �ли�ние. Требует�� разрешение конфликта."
 
-#: lib/merge.tcl:158
+#: lib/merge.tcl:156
+#, tcl-format
+msgid "%s (%s): Merge"
+msgstr "%s (%s): Сли�ние"
+
+#: lib/merge.tcl:164
 #, tcl-format
 msgid "Merge Into %s"
 msgstr "Сли�ние � %s"
 
-#: lib/merge.tcl:177
+#: lib/merge.tcl:183
 msgid "Revision To Merge"
 msgstr "Вер�и�, � которой прове�ти �ли�ние"
 
-#: lib/merge.tcl:212
+#: lib/merge.tcl:218
 msgid ""
 "Cannot abort while amending.\n"
 "\n"
 "You must finish amending this commit.\n"
 msgstr "�евозможно прервать и�правление.\n\nЗавершите текущее и�правление коммита.\n"
 
-#: lib/merge.tcl:222
+#: lib/merge.tcl:228
 msgid ""
 "Abort merge?\n"
 "\n"
@@ -1713,7 +2625,7 @@ msgid ""
 "Continue with aborting the current merge?"
 msgstr "Прервать операцию �ли�ни�?\n\nПрерывание текущего �ли�ни� приведет к потере *ВСЕХ* не�охраненных изменений.\n\nПродолжить?"
 
-#: lib/merge.tcl:228
+#: lib/merge.tcl:234
 msgid ""
 "Reset changes?\n"
 "\n"
@@ -1722,661 +2634,18 @@ msgid ""
 "Continue with resetting the current changes?"
 msgstr "Сбро�ить изменени�?\n\nСбро� изменений приведет к потере *ВСЕХ* не�охраненных изменений.\n\nПродолжить?"
 
-#: lib/merge.tcl:239
+#: lib/merge.tcl:246
 msgid "Aborting"
 msgstr "Прерываю"
 
-#: lib/merge.tcl:239
+#: lib/merge.tcl:247
 msgid "files reset"
 msgstr "изменени� в файлах отменены"
 
-#: lib/merge.tcl:267
+#: lib/merge.tcl:277
 msgid "Abort failed."
 msgstr "Прервать не удало�ь."
 
-#: lib/merge.tcl:269
+#: lib/merge.tcl:279
 msgid "Abort completed.  Ready."
 msgstr "Прервано."
-
-#: lib/mergetool.tcl:8
-msgid "Force resolution to the base version?"
-msgstr "И�пользовать базовую вер�ию дл� разрешени� конфликта?"
-
-#: lib/mergetool.tcl:9
-msgid "Force resolution to this branch?"
-msgstr "И�пользовать вер�ию из �той ветки дл� разрешени� конфликта?"
-
-#: lib/mergetool.tcl:10
-msgid "Force resolution to the other branch?"
-msgstr "И�пользовать вер�ию из другой ветки дл� разрешени� конфликта?"
-
-#: lib/mergetool.tcl:14
-#, tcl-format
-msgid ""
-"Note that the diff shows only conflicting changes.\n"
-"\n"
-"%s will be overwritten.\n"
-"\n"
-"This operation can be undone only by restarting the merge."
-msgstr "Внимание! Спи�ок изменений показывает только конфликтующие отличи�.\n\n%s будет перепи�ан.\n\nЭто дей�твие можно отменить только перезапу�ком операции �ли�ни�."
-
-#: lib/mergetool.tcl:45
-#, tcl-format
-msgid "File %s seems to have unresolved conflicts, still stage?"
-msgstr "Похоже, что файл %s �одержит неразрешенные конфликты. Продолжить индек�ацию?"
-
-#: lib/mergetool.tcl:60
-#, tcl-format
-msgid "Adding resolution for %s"
-msgstr "Добавл�ю результат разрешени� дл� %s"
-
-#: lib/mergetool.tcl:141
-msgid "Cannot resolve deletion or link conflicts using a tool"
-msgstr "Программа �ли�ни� не обрабатывает конфликты � удалением или уча�тием ��ылок"
-
-#: lib/mergetool.tcl:146
-msgid "Conflict file does not exist"
-msgstr "Конфликтующий файл не �уще�твует"
-
-#: lib/mergetool.tcl:264
-#, tcl-format
-msgid "Not a GUI merge tool: '%s'"
-msgstr "«%s» не �вл�ет�� программой �ли�ни�"
-
-#: lib/mergetool.tcl:268
-#, tcl-format
-msgid "Unsupported merge tool '%s'"
-msgstr "�еподдерживаема� программа �ли�ни� «%s»"
-
-#: lib/mergetool.tcl:303
-msgid "Merge tool is already running, terminate it?"
-msgstr "Программа �ли�ни� уже работает. Прервать?"
-
-#: lib/mergetool.tcl:323
-#, tcl-format
-msgid ""
-"Error retrieving versions:\n"
-"%s"
-msgstr "Ошибка получени� вер�ий:\n%s"
-
-#: lib/mergetool.tcl:343
-#, tcl-format
-msgid ""
-"Could not start the merge tool:\n"
-"\n"
-"%s"
-msgstr "Ошибка запу�ка программы �ли�ни�:\n\n%s"
-
-#: lib/mergetool.tcl:347
-msgid "Running merge tool..."
-msgstr "Запу�к программы �ли�ни�…"
-
-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
-msgid "Merge tool failed."
-msgstr "Ошибка выполнени� программы �ли�ни�."
-
-#: lib/option.tcl:11
-#, tcl-format
-msgid "Invalid global encoding '%s'"
-msgstr "�еверна� глобальна� кодировка «%s»"
-
-#: lib/option.tcl:19
-#, tcl-format
-msgid "Invalid repo encoding '%s'"
-msgstr "�еверна� кодировка репозитори� «%s»"
-
-#: lib/option.tcl:117
-msgid "Restore Defaults"
-msgstr "Во��тановить на�тройки по умолчанию"
-
-#: lib/option.tcl:121
-msgid "Save"
-msgstr "Сохранить"
-
-#: lib/option.tcl:131
-#, tcl-format
-msgid "%s Repository"
-msgstr "Дл� репозитори� %s"
-
-#: lib/option.tcl:132
-msgid "Global (All Repositories)"
-msgstr "Общие (дл� в�ех репозиториев)"
-
-#: lib/option.tcl:138
-msgid "User Name"
-msgstr "Им� пользовател�"
-
-#: lib/option.tcl:139
-msgid "Email Address"
-msgstr "�дре� �лектронной почты"
-
-#: lib/option.tcl:141
-msgid "Summarize Merge Commits"
-msgstr "Суммарное �ообщение при �ли�нии"
-
-#: lib/option.tcl:142
-msgid "Merge Verbosity"
-msgstr "Уровень детально�ти �ообщений при �ли�нии"
-
-#: lib/option.tcl:143
-msgid "Show Diffstat After Merge"
-msgstr "Показать отчет об изменени�х по�ле �ли�ни�"
-
-#: lib/option.tcl:144
-msgid "Use Merge Tool"
-msgstr "И�пользовать дл� �ли�ни� программу"
-
-#: lib/option.tcl:146
-msgid "Trust File Modification Timestamps"
-msgstr "Довер�ть времени модификации файла"
-
-#: lib/option.tcl:147
-msgid "Prune Tracking Branches During Fetch"
-msgstr "Чи�тка от�леживаемых веток при извлечении изменений"
-
-#: lib/option.tcl:148
-msgid "Match Tracking Branches"
-msgstr "Такое же им�, как и у от�леживаемой ветки"
-
-#: lib/option.tcl:149
-msgid "Blame Copy Only On Changed Files"
-msgstr "Пои�к копий только в изменённых файлах"
-
-#: lib/option.tcl:150
-msgid "Minimum Letters To Blame Copy On"
-msgstr "Минимальное количе�тво �имволов дл� пои�ка копий"
-
-#: lib/option.tcl:151
-msgid "Blame History Context Radius (days)"
-msgstr "Радиу� и�ториче�кого контек�та (в дн�х)"
-
-#: lib/option.tcl:152
-msgid "Number of Diff Context Lines"
-msgstr "Чи�ло �трок в контек�те diff"
-
-#: lib/option.tcl:153
-msgid "Commit Message Text Width"
-msgstr "Ширина тек�та �ообщени� коммита"
-
-#: lib/option.tcl:154
-msgid "New Branch Name Template"
-msgstr "Шаблон дл� имени новой ветки"
-
-#: lib/option.tcl:155
-msgid "Default File Contents Encoding"
-msgstr "Кодировка �одержани� файла по умолчанию"
-
-#: lib/option.tcl:203
-msgid "Change"
-msgstr "Изменить"
-
-#: lib/option.tcl:230
-msgid "Spelling Dictionary:"
-msgstr "Словарь дл� проверки правопи�ани�:"
-
-#: lib/option.tcl:254
-msgid "Change Font"
-msgstr "Изменить"
-
-#: lib/option.tcl:258
-#, tcl-format
-msgid "Choose %s"
-msgstr "Выберите %s"
-
-#: lib/option.tcl:264
-msgid "pt."
-msgstr "pt."
-
-#: lib/option.tcl:278
-msgid "Preferences"
-msgstr "�а�тройки"
-
-#: lib/option.tcl:314
-msgid "Failed to completely save options:"
-msgstr "�е удало�ь полно�тью �охранить на�тройки:"
-
-#: lib/remote.tcl:163
-msgid "Remove Remote"
-msgstr "Удалить ��ылку на внешний репозиторий"
-
-#: lib/remote.tcl:168
-msgid "Prune from"
-msgstr "Чи�тка"
-
-#: lib/remote.tcl:173
-msgid "Fetch from"
-msgstr "Извлечение из"
-
-#: lib/remote.tcl:215
-msgid "Push to"
-msgstr "Отправить"
-
-#: lib/remote_add.tcl:19
-msgid "Add Remote"
-msgstr "Зареги�трировать внешний репозиторий"
-
-#: lib/remote_add.tcl:24
-msgid "Add New Remote"
-msgstr "Добавить внешний репозиторий"
-
-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
-msgid "Add"
-msgstr "Добавить"
-
-#: lib/remote_add.tcl:37
-msgid "Remote Details"
-msgstr "Информаци� о внешнем репозитории"
-
-#: lib/remote_add.tcl:50
-msgid "Location:"
-msgstr "Положение:"
-
-#: lib/remote_add.tcl:62
-msgid "Further Action"
-msgstr "Следующа� операци�"
-
-#: lib/remote_add.tcl:65
-msgid "Fetch Immediately"
-msgstr "Сразу извлечь изменени�"
-
-#: lib/remote_add.tcl:71
-msgid "Initialize Remote Repository and Push"
-msgstr "Инициализировать внешний репозиторий и отправить"
-
-#: lib/remote_add.tcl:77
-msgid "Do Nothing Else Now"
-msgstr "Больше ничего не делать"
-
-#: lib/remote_add.tcl:101
-msgid "Please supply a remote name."
-msgstr "Укажите название внешнего репозитори�."
-
-#: lib/remote_add.tcl:114
-#, tcl-format
-msgid "'%s' is not an acceptable remote name."
-msgstr "«%s» не �вл�ет�� допу�тимым именем внешнего репозитори�."
-
-#: lib/remote_add.tcl:125
-#, tcl-format
-msgid "Failed to add remote '%s' of location '%s'."
-msgstr "�е удало�ь добавить «%s» из «%s». "
-
-#: lib/remote_add.tcl:133 lib/transport.tcl:6
-#, tcl-format
-msgid "fetch %s"
-msgstr "извлечение %s"
-
-#: lib/remote_add.tcl:134
-#, tcl-format
-msgid "Fetching the %s"
-msgstr "Извлечение %s"
-
-#: lib/remote_add.tcl:157
-#, tcl-format
-msgid "Do not know how to initialize repository at location '%s'."
-msgstr "�евозможно инициализировать репозиторий в «%s»."
-
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
-#: lib/transport.tcl:81
-#, tcl-format
-msgid "push %s"
-msgstr "отправить %s"
-
-#: lib/remote_add.tcl:164
-#, tcl-format
-msgid "Setting up the %s (at %s)"
-msgstr "�а�тройка %s (в %s)"
-
-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
-msgid "Delete Branch Remotely"
-msgstr "Удаление ветки во внешнем репозитории"
-
-#: lib/remote_branch_delete.tcl:47
-msgid "From Repository"
-msgstr "Из репозитори�"
-
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
-msgid "Remote:"
-msgstr "внешний:"
-
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
-msgid "Arbitrary Location:"
-msgstr "Указанное положение:"
-
-#: lib/remote_branch_delete.tcl:84
-msgid "Branches"
-msgstr "Ветки"
-
-#: lib/remote_branch_delete.tcl:109
-msgid "Delete Only If"
-msgstr "Удалить только в �лучае, е�ли"
-
-#: lib/remote_branch_delete.tcl:111
-msgid "Merged Into:"
-msgstr "Сли�ние �:"
-
-#: lib/remote_branch_delete.tcl:152
-msgid "A branch is required for 'Merged Into'."
-msgstr "Дл� операции «Сли�ние �» требует�� указать ветку."
-
-#: lib/remote_branch_delete.tcl:184
-#, tcl-format
-msgid ""
-"The following branches are not completely merged into %s:\n"
-"\n"
-" - %s"
-msgstr "Следующие ветки могут быть объединены � %s при помощи операции �ли�ни�:\n\n - %s"
-
-#: lib/remote_branch_delete.tcl:189
-#, tcl-format
-msgid ""
-"One or more of the merge tests failed because you have not fetched the "
-"necessary commits.  Try fetching from %s first."
-msgstr "�екоторые те�ты на �ли�ние не прошли, потому что вы не извлекли необходимые коммиты. Попытайте�ь извлечь их из %s."
-
-#: lib/remote_branch_delete.tcl:207
-msgid "Please select one or more branches to delete."
-msgstr "Укажите одну или не�колько веток дл� удалени�."
-
-#: lib/remote_branch_delete.tcl:226
-#, tcl-format
-msgid "Deleting branches from %s"
-msgstr "Удаление веток из %s"
-
-#: lib/remote_branch_delete.tcl:292
-msgid "No repository selected."
-msgstr "�е указан репозиторий."
-
-#: lib/remote_branch_delete.tcl:297
-#, tcl-format
-msgid "Scanning %s..."
-msgstr "Перечитывание %s…"
-
-#: lib/search.tcl:21
-msgid "Find:"
-msgstr "Пои�к:"
-
-#: lib/search.tcl:23
-msgid "Next"
-msgstr "Дальше"
-
-#: lib/search.tcl:24
-msgid "Prev"
-msgstr "Обратно"
-
-#: lib/search.tcl:25
-msgid "Case-Sensitive"
-msgstr "Игн. большие/маленькие"
-
-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
-msgid "Cannot write shortcut:"
-msgstr "�евозможно запи�ать ��ылку:"
-
-#: lib/shortcut.tcl:137
-msgid "Cannot write icon:"
-msgstr "�евозможно запи�ать значок:"
-
-#: lib/spellcheck.tcl:57
-msgid "Unsupported spell checker"
-msgstr "�еподдерживаема� программа проверки правопи�ани�"
-
-#: lib/spellcheck.tcl:65
-msgid "Spell checking is unavailable"
-msgstr "Проверка правопи�ани� не до�тупна"
-
-#: lib/spellcheck.tcl:68
-msgid "Invalid spell checking configuration"
-msgstr "�еправильна� конфигураци� программы проверки правопи�ани�"
-
-#: lib/spellcheck.tcl:70
-#, tcl-format
-msgid "Reverting dictionary to %s."
-msgstr "Словарь вернут к %s."
-
-#: lib/spellcheck.tcl:73
-msgid "Spell checker silently failed on startup"
-msgstr "Программа проверки правопи�ани� не �могла запу�тить��"
-
-#: lib/spellcheck.tcl:80
-msgid "Unrecognized spell checker"
-msgstr "�ера�познанна� программа проверки правопи�ани�"
-
-#: lib/spellcheck.tcl:186
-msgid "No Suggestions"
-msgstr "И�правлений не найдено"
-
-#: lib/spellcheck.tcl:388
-msgid "Unexpected EOF from spell checker"
-msgstr "Программа проверки правопи�ани� прервала передачу данных"
-
-#: lib/spellcheck.tcl:392
-msgid "Spell Checker Failed"
-msgstr "Ошибка проверки правопи�ани�"
-
-#: lib/sshkey.tcl:31
-msgid "No keys found."
-msgstr "Ключ не найден"
-
-#: lib/sshkey.tcl:34
-#, tcl-format
-msgid "Found a public key in: %s"
-msgstr "Публичный ключ из %s"
-
-#: lib/sshkey.tcl:40
-msgid "Generate Key"
-msgstr "Создать ключ"
-
-#: lib/sshkey.tcl:56
-msgid "Copy To Clipboard"
-msgstr "Скопировать в буфер обмена"
-
-#: lib/sshkey.tcl:70
-msgid "Your OpenSSH Public Key"
-msgstr "Ваш публичный ключ OpenSSH"
-
-#: lib/sshkey.tcl:78
-msgid "Generating..."
-msgstr "Создание…"
-
-#: lib/sshkey.tcl:84
-#, tcl-format
-msgid ""
-"Could not start ssh-keygen:\n"
-"\n"
-"%s"
-msgstr "Ошибка запу�ка ssh-keygen:\n\n%s"
-
-#: lib/sshkey.tcl:111
-msgid "Generation failed."
-msgstr "Ключ не �оздан."
-
-#: lib/sshkey.tcl:118
-msgid "Generation succeeded, but no keys found."
-msgstr "Создание ключа завершило�ь, но результат не был найден"
-
-#: lib/sshkey.tcl:121
-#, tcl-format
-msgid "Your key is in: %s"
-msgstr "Ваш ключ находит�� в: %s"
-
-#: lib/status_bar.tcl:83
-#, tcl-format
-msgid "%s ... %*i of %*i %s (%3i%%)"
-msgstr "%s … %*i из %*i %s (%3i%%)"
-
-#: lib/tools.tcl:75
-#, tcl-format
-msgid "Running %s requires a selected file."
-msgstr "Запу�к %s требует выбранного файла."
-
-#: lib/tools.tcl:90
-#, tcl-format
-msgid "Are you sure you want to run %s?"
-msgstr "Дей�твительно запу�тить %s?"
-
-#: lib/tools.tcl:110
-#, tcl-format
-msgid "Tool: %s"
-msgstr "В�помогательна� операци�: %s"
-
-#: lib/tools.tcl:111
-#, tcl-format
-msgid "Running: %s"
-msgstr "Выполнение: %s"
-
-#: lib/tools.tcl:149
-#, tcl-format
-msgid "Tool completed successfully: %s"
-msgstr "Программа %s завершила�ь у�пешно."
-
-#: lib/tools.tcl:151
-#, tcl-format
-msgid "Tool failed: %s"
-msgstr "Ошибка выполнени� программы: %s"
-
-#: lib/tools_dlg.tcl:22
-msgid "Add Tool"
-msgstr "Добавить в�помогательную операцию"
-
-#: lib/tools_dlg.tcl:28
-msgid "Add New Tool Command"
-msgstr "�ова� в�помогательна� операци�"
-
-#: lib/tools_dlg.tcl:33
-msgid "Add globally"
-msgstr "Добавить дл� в�ех репозиториев"
-
-#: lib/tools_dlg.tcl:45
-msgid "Tool Details"
-msgstr "Опи�ание в�помогательной операции"
-
-#: lib/tools_dlg.tcl:48
-msgid "Use '/' separators to create a submenu tree:"
-msgstr "И�пользуйте «/» дл� �оздани� подменю"
-
-#: lib/tools_dlg.tcl:61
-msgid "Command:"
-msgstr "Команда:"
-
-#: lib/tools_dlg.tcl:74
-msgid "Show a dialog before running"
-msgstr "Показать диалог перед запу�ком"
-
-#: lib/tools_dlg.tcl:80
-msgid "Ask the user to select a revision (sets $REVISION)"
-msgstr "Запро� на выбор вер�ии (у�танавливает $REVISION)"
-
-#: lib/tools_dlg.tcl:85
-msgid "Ask the user for additional arguments (sets $ARGS)"
-msgstr "Запро� дополнительных аргументов (у�танавливает $ARGS)"
-
-#: lib/tools_dlg.tcl:92
-msgid "Don't show the command output window"
-msgstr "�е показывать окно вывода команды"
-
-#: lib/tools_dlg.tcl:97
-msgid "Run only if a diff is selected ($FILENAME not empty)"
-msgstr "Запу�к только е�ли показан �пи�ок изменений ($FILENAME не пу�то)"
-
-#: lib/tools_dlg.tcl:121
-msgid "Please supply a name for the tool."
-msgstr "Укажите название в�помогательной операции."
-
-#: lib/tools_dlg.tcl:129
-#, tcl-format
-msgid "Tool '%s' already exists."
-msgstr "В�помогательна� операци� «%s» уже �уще�твует."
-
-#: lib/tools_dlg.tcl:151
-#, tcl-format
-msgid ""
-"Could not add tool:\n"
-"%s"
-msgstr "Ошибка добавлени� программы:\n%s"
-
-#: lib/tools_dlg.tcl:190
-msgid "Remove Tool"
-msgstr "Удалить программу"
-
-#: lib/tools_dlg.tcl:196
-msgid "Remove Tool Commands"
-msgstr "Удалить команды программы"
-
-#: lib/tools_dlg.tcl:200
-msgid "Remove"
-msgstr "Удалить"
-
-#: lib/tools_dlg.tcl:236
-msgid "(Blue denotes repository-local tools)"
-msgstr "(Синим выделены программы локальные репозиторию)"
-
-#: lib/tools_dlg.tcl:297
-#, tcl-format
-msgid "Run Command: %s"
-msgstr "Запу�к команды: %s"
-
-#: lib/tools_dlg.tcl:311
-msgid "Arguments"
-msgstr "�ргументы"
-
-#: lib/tools_dlg.tcl:348
-msgid "OK"
-msgstr "OK"
-
-#: lib/transport.tcl:7
-#, tcl-format
-msgid "Fetching new changes from %s"
-msgstr "Извлечение изменений из %s "
-
-#: lib/transport.tcl:18
-#, tcl-format
-msgid "remote prune %s"
-msgstr "чи�тка внешнего %s"
-
-#: lib/transport.tcl:19
-#, tcl-format
-msgid "Pruning tracking branches deleted from %s"
-msgstr "Чи�тка от�леживаемых веток, удалённых из %s"
-
-#: lib/transport.tcl:26
-#, tcl-format
-msgid "Pushing changes to %s"
-msgstr "Отправка изменений в %s "
-
-#: lib/transport.tcl:64
-#, tcl-format
-msgid "Mirroring to %s"
-msgstr "Точное копирование в %s"
-
-#: lib/transport.tcl:82
-#, tcl-format
-msgid "Pushing %s %s to %s"
-msgstr "Отправка %s %s в %s"
-
-#: lib/transport.tcl:100
-msgid "Push Branches"
-msgstr "Отправить ветки"
-
-#: lib/transport.tcl:114
-msgid "Source Branches"
-msgstr "И�ходные ветки"
-
-#: lib/transport.tcl:131
-msgid "Destination Repository"
-msgstr "Репозиторий назначени�"
-
-#: lib/transport.tcl:169
-msgid "Transfer Options"
-msgstr "�а�тройки отправки"
-
-#: lib/transport.tcl:171
-msgid "Force overwrite existing branch (may discard changes)"
-msgstr "Принудительно перезапи�ать �уще�твующую ветку (возможна потер� изменений)"
-
-#: lib/transport.tcl:175
-msgid "Use thin pack (for slow network connections)"
-msgstr "И�пользовать thin pack (дл� медленных �етевых подключений)"
-
-#: lib/transport.tcl:179
-msgid "Include tags"
-msgstr "Передать метки"
diff --git a/git-legacy-stash.sh b/git-legacy-stash.sh
deleted file mode 100755
index 07ad4a5459..0000000000
--- a/git-legacy-stash.sh
+++ /dev/null
@@ -1,797 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2007, Nanako Shiraishi
-
-dashless=$(basename "$0" | sed -e 's/-/ /')
-USAGE="list [<options>]
-   or: $dashless show [<stash>]
-   or: $dashless drop [-q|--quiet] [<stash>]
-   or: $dashless ( pop | apply ) [--index] [-q|--quiet] [<stash>]
-   or: $dashless branch <branchname> [<stash>]
-   or: $dashless save [--patch] [-k|--[no-]keep-index] [-q|--quiet]
-		      [-u|--include-untracked] [-a|--all] [<message>]
-   or: $dashless [push [--patch] [-k|--[no-]keep-index] [-q|--quiet]
-		       [-u|--include-untracked] [-a|--all] [-m <message>]
-		       [-- <pathspec>...]]
-   or: $dashless clear"
-
-SUBDIRECTORY_OK=Yes
-OPTIONS_SPEC=
-START_DIR=$(pwd)
-. git-sh-setup
-require_work_tree
-prefix=$(git rev-parse --show-prefix) || exit 1
-cd_to_toplevel
-
-TMP="$GIT_DIR/.git-stash.$$"
-TMPindex=${GIT_INDEX_FILE-"$(git rev-parse --git-path index)"}.stash.$$
-trap 'rm -f "$TMP-"* "$TMPindex"' 0
-
-ref_stash=refs/stash
-
-if git config --get-colorbool color.interactive; then
-       help_color="$(git config --get-color color.interactive.help 'red bold')"
-       reset_color="$(git config --get-color '' reset)"
-else
-       help_color=
-       reset_color=
-fi
-
-no_changes () {
-	git diff-index --quiet --cached HEAD --ignore-submodules -- "$@" &&
-	git diff-files --quiet --ignore-submodules -- "$@" &&
-	(test -z "$untracked" || test -z "$(untracked_files "$@")")
-}
-
-untracked_files () {
-	if test "$1" = "-z"
-	then
-		shift
-		z=-z
-	else
-		z=
-	fi
-	excl_opt=--exclude-standard
-	test "$untracked" = "all" && excl_opt=
-	git ls-files -o $z $excl_opt -- "$@"
-}
-
-prepare_fallback_ident () {
-	if ! git -c user.useconfigonly=yes var GIT_COMMITTER_IDENT >/dev/null 2>&1
-	then
-		GIT_AUTHOR_NAME="git stash"
-		GIT_AUTHOR_EMAIL=git@stash
-		GIT_COMMITTER_NAME="git stash"
-		GIT_COMMITTER_EMAIL=git@stash
-		export GIT_AUTHOR_NAME
-		export GIT_AUTHOR_EMAIL
-		export GIT_COMMITTER_NAME
-		export GIT_COMMITTER_EMAIL
-	fi
-}
-
-clear_stash () {
-	if test $# != 0
-	then
-		die "$(gettext "git stash clear with parameters is unimplemented")"
-	fi
-	if current=$(git rev-parse --verify --quiet $ref_stash)
-	then
-		git update-ref -d $ref_stash $current
-	fi
-}
-
-maybe_quiet () {
-	case "$1" in
-	--keep-stdout)
-		shift
-		if test -n "$GIT_QUIET"
-		then
-			"$@" 2>/dev/null
-		else
-			"$@"
-		fi
-		;;
-	*)
-		if test -n "$GIT_QUIET"
-		then
-			"$@" >/dev/null 2>&1
-		else
-			"$@"
-		fi
-		;;
-	esac
-}
-
-create_stash () {
-
-	prepare_fallback_ident
-
-	stash_msg=
-	untracked=
-	while test $# != 0
-	do
-		case "$1" in
-		-m|--message)
-			shift
-			stash_msg=${1?"BUG: create_stash () -m requires an argument"}
-			;;
-		-m*)
-			stash_msg=${1#-m}
-			;;
-		--message=*)
-			stash_msg=${1#--message=}
-			;;
-		-u|--include-untracked)
-			shift
-			untracked=${1?"BUG: create_stash () -u requires an argument"}
-			;;
-		--)
-			shift
-			break
-			;;
-		esac
-		shift
-	done
-
-	git update-index -q --refresh
-	if maybe_quiet no_changes "$@"
-	then
-		exit 0
-	fi
-
-	# state of the base commit
-	if b_commit=$(maybe_quiet --keep-stdout git rev-parse --verify HEAD)
-	then
-		head=$(git rev-list --oneline -n 1 HEAD --)
-	elif test -n "$GIT_QUIET"
-	then
-		exit 1
-	else
-		die "$(gettext "You do not have the initial commit yet")"
-	fi
-
-	if branch=$(git symbolic-ref -q HEAD)
-	then
-		branch=${branch#refs/heads/}
-	else
-		branch='(no branch)'
-	fi
-	msg=$(printf '%s: %s' "$branch" "$head")
-
-	# state of the index
-	i_tree=$(git write-tree) &&
-	i_commit=$(printf 'index on %s\n' "$msg" |
-		git commit-tree $i_tree -p $b_commit) ||
-		die "$(gettext "Cannot save the current index state")"
-
-	if test -n "$untracked"
-	then
-		# Untracked files are stored by themselves in a parentless commit, for
-		# ease of unpacking later.
-		u_commit=$(
-			untracked_files -z "$@" | (
-				GIT_INDEX_FILE="$TMPindex" &&
-				export GIT_INDEX_FILE &&
-				rm -f "$TMPindex" &&
-				git update-index -z --add --remove --stdin &&
-				u_tree=$(git write-tree) &&
-				printf 'untracked files on %s\n' "$msg" | git commit-tree $u_tree  &&
-				rm -f "$TMPindex"
-		) ) || die "$(gettext "Cannot save the untracked files")"
-
-		untracked_commit_option="-p $u_commit";
-	else
-		untracked_commit_option=
-	fi
-
-	if test -z "$patch_mode"
-	then
-
-		# state of the working tree
-		w_tree=$( (
-			git read-tree --index-output="$TMPindex" -m $i_tree &&
-			GIT_INDEX_FILE="$TMPindex" &&
-			export GIT_INDEX_FILE &&
-			git diff-index --name-only -z HEAD -- "$@" >"$TMP-stagenames" &&
-			git update-index -z --add --remove --stdin <"$TMP-stagenames" &&
-			git write-tree &&
-			rm -f "$TMPindex"
-		) ) ||
-			die "$(gettext "Cannot save the current worktree state")"
-
-	else
-
-		rm -f "$TMP-index" &&
-		GIT_INDEX_FILE="$TMP-index" git read-tree HEAD &&
-
-		# find out what the user wants
-		GIT_INDEX_FILE="$TMP-index" \
-			git add--interactive --patch=stash -- "$@" &&
-
-		# state of the working tree
-		w_tree=$(GIT_INDEX_FILE="$TMP-index" git write-tree) ||
-		die "$(gettext "Cannot save the current worktree state")"
-
-		git diff-tree -p HEAD $w_tree -- >"$TMP-patch" &&
-		test -s "$TMP-patch" ||
-		die "$(gettext "No changes selected")"
-
-		rm -f "$TMP-index" ||
-		die "$(gettext "Cannot remove temporary index (can't happen)")"
-
-	fi
-
-	# create the stash
-	if test -z "$stash_msg"
-	then
-		stash_msg=$(printf 'WIP on %s' "$msg")
-	else
-		stash_msg=$(printf 'On %s: %s' "$branch" "$stash_msg")
-	fi
-	w_commit=$(printf '%s\n' "$stash_msg" |
-	git commit-tree $w_tree -p $b_commit -p $i_commit $untracked_commit_option) ||
-	die "$(gettext "Cannot record working tree state")"
-}
-
-store_stash () {
-	while test $# != 0
-	do
-		case "$1" in
-		-m|--message)
-			shift
-			stash_msg="$1"
-			;;
-		-m*)
-			stash_msg=${1#-m}
-			;;
-		--message=*)
-			stash_msg=${1#--message=}
-			;;
-		-q|--quiet)
-			quiet=t
-			;;
-		*)
-			break
-			;;
-		esac
-		shift
-	done
-	test $# = 1 ||
-	die "$(eval_gettext "\"$dashless store\" requires one <commit> argument")"
-
-	w_commit="$1"
-	if test -z "$stash_msg"
-	then
-		stash_msg="Created via \"git stash store\"."
-	fi
-
-	git update-ref --create-reflog -m "$stash_msg" $ref_stash $w_commit
-	ret=$?
-	test $ret != 0 && test -z "$quiet" &&
-	die "$(eval_gettext "Cannot update \$ref_stash with \$w_commit")"
-	return $ret
-}
-
-push_stash () {
-	keep_index=
-	patch_mode=
-	untracked=
-	stash_msg=
-	while test $# != 0
-	do
-		case "$1" in
-		-k|--keep-index)
-			keep_index=t
-			;;
-		--no-keep-index)
-			keep_index=n
-			;;
-		-p|--patch)
-			patch_mode=t
-			# only default to keep if we don't already have an override
-			test -z "$keep_index" && keep_index=t
-			;;
-		-q|--quiet)
-			GIT_QUIET=t
-			;;
-		-u|--include-untracked)
-			untracked=untracked
-			;;
-		-a|--all)
-			untracked=all
-			;;
-		-m|--message)
-			shift
-			test -z ${1+x} && usage
-			stash_msg=$1
-			;;
-		-m*)
-			stash_msg=${1#-m}
-			;;
-		--message=*)
-			stash_msg=${1#--message=}
-			;;
-		--help)
-			show_help
-			;;
-		--)
-			shift
-			break
-			;;
-		-*)
-			option="$1"
-			eval_gettextln "error: unknown option for 'stash push': \$option"
-			usage
-			;;
-		*)
-			break
-			;;
-		esac
-		shift
-	done
-
-	eval "set $(git rev-parse --sq --prefix "$prefix" -- "$@")"
-
-	if test -n "$patch_mode" && test -n "$untracked"
-	then
-		die "$(gettext "Can't use --patch and --include-untracked or --all at the same time")"
-	fi
-
-	test -n "$untracked" || git ls-files --error-unmatch -- "$@" >/dev/null || exit 1
-
-	git update-index -q --refresh
-	if maybe_quiet no_changes "$@"
-	then
-		say "$(gettext "No local changes to save")"
-		exit 0
-	fi
-
-	git reflog exists $ref_stash ||
-		clear_stash || die "$(gettext "Cannot initialize stash")"
-
-	create_stash -m "$stash_msg" -u "$untracked" -- "$@"
-	store_stash -m "$stash_msg" -q $w_commit ||
-	die "$(gettext "Cannot save the current status")"
-	say "$(eval_gettext "Saved working directory and index state \$stash_msg")"
-
-	if test -z "$patch_mode"
-	then
-		test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION=
-		if test -n "$untracked" && test $# = 0
-		then
-			git clean --force --quiet -d $CLEAN_X_OPTION
-		fi
-
-		if test $# != 0
-		then
-			test -z "$untracked" && UPDATE_OPTION="-u" || UPDATE_OPTION=
-			test "$untracked" = "all" && FORCE_OPTION="--force" || FORCE_OPTION=
-			git add $UPDATE_OPTION $FORCE_OPTION -- "$@"
-			git diff-index -p --cached --binary HEAD -- "$@" |
-			git apply --index -R
-		else
-			git reset --hard -q --no-recurse-submodules
-		fi
-
-		if test "$keep_index" = "t" && test -n "$i_tree"
-		then
-			git read-tree --reset $i_tree
-			git ls-files -z --modified -- "$@" |
-			git checkout-index -z --force --stdin
-		fi
-	else
-		git apply -R < "$TMP-patch" ||
-		die "$(gettext "Cannot remove worktree changes")"
-
-		if test "$keep_index" != "t"
-		then
-			git reset -q -- "$@"
-		fi
-	fi
-}
-
-save_stash () {
-	push_options=
-	while test $# != 0
-	do
-		case "$1" in
-		-q|--quiet)
-			GIT_QUIET=t
-			;;
-		--)
-			shift
-			break
-			;;
-		-*)
-			# pass all options through to push_stash
-			push_options="$push_options $1"
-			;;
-		*)
-			break
-			;;
-		esac
-		shift
-	done
-
-	stash_msg="$*"
-
-	if test -z "$stash_msg"
-	then
-		push_stash $push_options
-	else
-		push_stash $push_options -m "$stash_msg"
-	fi
-}
-
-have_stash () {
-	git rev-parse --verify --quiet $ref_stash >/dev/null
-}
-
-list_stash () {
-	have_stash || return 0
-	git log --format="%gd: %gs" -g --first-parent -m "$@" $ref_stash --
-}
-
-show_stash () {
-	ALLOW_UNKNOWN_FLAGS=t
-	assert_stash_like "$@"
-
-	if test -z "$FLAGS"
-	then
-		if test "$(git config --bool stash.showStat || echo true)" = "true"
-		then
-			FLAGS=--stat
-		fi
-
-		if test "$(git config --bool stash.showPatch || echo false)" = "true"
-		then
-			FLAGS=${FLAGS}${FLAGS:+ }-p
-		fi
-
-		if test -z "$FLAGS"
-		then
-			return 0
-		fi
-	fi
-
-	git diff ${FLAGS} $b_commit $w_commit
-}
-
-show_help () {
-	exec git help stash
-	exit 1
-}
-
-#
-# Parses the remaining options looking for flags and
-# at most one revision defaulting to ${ref_stash}@{0}
-# if none found.
-#
-# Derives related tree and commit objects from the
-# revision, if one is found.
-#
-# stash records the work tree, and is a merge between the
-# base commit (first parent) and the index tree (second parent).
-#
-#   REV is set to the symbolic version of the specified stash-like commit
-#   IS_STASH_LIKE is non-blank if ${REV} looks like a stash
-#   IS_STASH_REF is non-blank if the ${REV} looks like a stash ref
-#   s is set to the SHA1 of the stash commit
-#   w_commit is set to the commit containing the working tree
-#   b_commit is set to the base commit
-#   i_commit is set to the commit containing the index tree
-#   u_commit is set to the commit containing the untracked files tree
-#   w_tree is set to the working tree
-#   b_tree is set to the base tree
-#   i_tree is set to the index tree
-#   u_tree is set to the untracked files tree
-#
-#   GIT_QUIET is set to t if -q is specified
-#   INDEX_OPTION is set to --index if --index is specified.
-#   FLAGS is set to the remaining flags (if allowed)
-#
-# dies if:
-#   * too many revisions specified
-#   * no revision is specified and there is no stash stack
-#   * a revision is specified which cannot be resolve to a SHA1
-#   * a non-existent stash reference is specified
-#   * unknown flags were set and ALLOW_UNKNOWN_FLAGS is not "t"
-#
-
-parse_flags_and_rev()
-{
-	test "$PARSE_CACHE" = "$*" && return 0 # optimisation
-	PARSE_CACHE="$*"
-
-	IS_STASH_LIKE=
-	IS_STASH_REF=
-	INDEX_OPTION=
-	s=
-	w_commit=
-	b_commit=
-	i_commit=
-	u_commit=
-	w_tree=
-	b_tree=
-	i_tree=
-	u_tree=
-
-	FLAGS=
-	REV=
-	for opt
-	do
-		case "$opt" in
-			-q|--quiet)
-				GIT_QUIET=-t
-			;;
-			--index)
-				INDEX_OPTION=--index
-			;;
-			--help)
-				show_help
-			;;
-			-*)
-				test "$ALLOW_UNKNOWN_FLAGS" = t ||
-					die "$(eval_gettext "unknown option: \$opt")"
-				FLAGS="${FLAGS}${FLAGS:+ }$opt"
-			;;
-			*)
-				REV="${REV}${REV:+ }'$opt'"
-			;;
-		esac
-	done
-
-	eval set -- $REV
-
-	case $# in
-		0)
-			have_stash || die "$(gettext "No stash entries found.")"
-			set -- ${ref_stash}@{0}
-		;;
-		1)
-			:
-		;;
-		*)
-			die "$(eval_gettext "Too many revisions specified: \$REV")"
-		;;
-	esac
-
-	case "$1" in
-		*[!0-9]*)
-			:
-		;;
-		*)
-			set -- "${ref_stash}@{$1}"
-		;;
-	esac
-
-	REV=$(git rev-parse --symbolic --verify --quiet "$1") || {
-		reference="$1"
-		die "$(eval_gettext "\$reference is not a valid reference")"
-	}
-
-	i_commit=$(git rev-parse --verify --quiet "$REV^2") &&
-	set -- $(git rev-parse "$REV" "$REV^1" "$REV:" "$REV^1:" "$REV^2:" 2>/dev/null) &&
-	s=$1 &&
-	w_commit=$1 &&
-	b_commit=$2 &&
-	w_tree=$3 &&
-	b_tree=$4 &&
-	i_tree=$5 &&
-	IS_STASH_LIKE=t &&
-	test "$ref_stash" = "$(git rev-parse --symbolic-full-name "${REV%@*}")" &&
-	IS_STASH_REF=t
-
-	u_commit=$(git rev-parse --verify --quiet "$REV^3") &&
-	u_tree=$(git rev-parse "$REV^3:" 2>/dev/null)
-}
-
-is_stash_like()
-{
-	parse_flags_and_rev "$@"
-	test -n "$IS_STASH_LIKE"
-}
-
-assert_stash_like() {
-	is_stash_like "$@" || {
-		args="$*"
-		die "$(eval_gettext "'\$args' is not a stash-like commit")"
-	}
-}
-
-is_stash_ref() {
-	is_stash_like "$@" && test -n "$IS_STASH_REF"
-}
-
-assert_stash_ref() {
-	is_stash_ref "$@" || {
-		args="$*"
-		die "$(eval_gettext "'\$args' is not a stash reference")"
-	}
-}
-
-apply_stash () {
-
-	assert_stash_like "$@"
-
-	git update-index -q --refresh || die "$(gettext "unable to refresh index")"
-
-	# current index state
-	c_tree=$(git write-tree) ||
-		die "$(gettext "Cannot apply a stash in the middle of a merge")"
-
-	unstashed_index_tree=
-	if test -n "$INDEX_OPTION" && test "$b_tree" != "$i_tree" &&
-			test "$c_tree" != "$i_tree"
-	then
-		git diff-tree --binary $s^2^..$s^2 | git apply --cached
-		test $? -ne 0 &&
-			die "$(gettext "Conflicts in index. Try without --index.")"
-		unstashed_index_tree=$(git write-tree) ||
-			die "$(gettext "Could not save index tree")"
-		git reset
-	fi
-
-	if test -n "$u_tree"
-	then
-		GIT_INDEX_FILE="$TMPindex" git read-tree "$u_tree" &&
-		GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
-		rm -f "$TMPindex" ||
-		die "$(gettext "Could not restore untracked files from stash entry")"
-	fi
-
-	eval "
-		GITHEAD_$w_tree='Stashed changes' &&
-		GITHEAD_$c_tree='Updated upstream' &&
-		GITHEAD_$b_tree='Version stash was based on' &&
-		export GITHEAD_$w_tree GITHEAD_$c_tree GITHEAD_$b_tree
-	"
-
-	if test -n "$GIT_QUIET"
-	then
-		GIT_MERGE_VERBOSITY=0 && export GIT_MERGE_VERBOSITY
-	fi
-	if git merge-recursive $b_tree -- $c_tree $w_tree
-	then
-		# No conflict
-		if test -n "$unstashed_index_tree"
-		then
-			git read-tree "$unstashed_index_tree"
-		else
-			a="$TMP-added" &&
-			git diff-index --cached --name-only --diff-filter=A $c_tree >"$a" &&
-			git read-tree --reset $c_tree &&
-			git update-index --add --stdin <"$a" ||
-				die "$(gettext "Cannot unstage modified files")"
-			rm -f "$a"
-		fi
-		squelch=
-		if test -n "$GIT_QUIET"
-		then
-			squelch='>/dev/null 2>&1'
-		fi
-		(cd "$START_DIR" && eval "git status $squelch") || :
-	else
-		# Merge conflict; keep the exit status from merge-recursive
-		status=$?
-		git rerere
-		if test -n "$INDEX_OPTION"
-		then
-			gettextln "Index was not unstashed." >&2
-		fi
-		exit $status
-	fi
-}
-
-pop_stash() {
-	assert_stash_ref "$@"
-
-	if apply_stash "$@"
-	then
-		drop_stash "$@"
-	else
-		status=$?
-		say "$(gettext "The stash entry is kept in case you need it again.")"
-		exit $status
-	fi
-}
-
-drop_stash () {
-	assert_stash_ref "$@"
-
-	git reflog delete --updateref --rewrite "${REV}" &&
-		say "$(eval_gettext "Dropped \${REV} (\$s)")" ||
-		die "$(eval_gettext "\${REV}: Could not drop stash entry")"
-
-	# clear_stash if we just dropped the last stash entry
-	git rev-parse --verify --quiet "$ref_stash@{0}" >/dev/null ||
-	clear_stash
-}
-
-apply_to_branch () {
-	test -n "$1" || die "$(gettext "No branch name specified")"
-	branch=$1
-	shift 1
-
-	set -- --index "$@"
-	assert_stash_like "$@"
-
-	git checkout -b $branch $REV^ &&
-	apply_stash "$@" && {
-		test -z "$IS_STASH_REF" || drop_stash "$@"
-	}
-}
-
-test "$1" = "-p" && set "push" "$@"
-
-PARSE_CACHE='--not-parsed'
-# The default command is "push" if nothing but options are given
-seen_non_option=
-for opt
-do
-	case "$opt" in
-	--) break ;;
-	-*) ;;
-	*) seen_non_option=t; break ;;
-	esac
-done
-
-test -n "$seen_non_option" || set "push" "$@"
-
-# Main command set
-case "$1" in
-list)
-	shift
-	list_stash "$@"
-	;;
-show)
-	shift
-	show_stash "$@"
-	;;
-save)
-	shift
-	save_stash "$@"
-	;;
-push)
-	shift
-	push_stash "$@"
-	;;
-apply)
-	shift
-	apply_stash "$@"
-	;;
-clear)
-	shift
-	clear_stash "$@"
-	;;
-create)
-	shift
-	create_stash -m "$*" && echo "$w_commit"
-	;;
-store)
-	shift
-	store_stash "$@"
-	;;
-drop)
-	shift
-	drop_stash "$@"
-	;;
-pop)
-	shift
-	pop_stash "$@"
-	;;
-branch)
-	shift
-	apply_to_branch "$@"
-	;;
-*)
-	case $# in
-	0)
-		push_stash &&
-		say "$(gettext "(To restore them type \"git stash apply\")")"
-		;;
-	*)
-		usage
-	esac
-	;;
-esac
diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
index 204a5acd66..542a6a75eb 100644
--- a/git-mergetool--lib.sh
+++ b/git-mergetool--lib.sh
@@ -43,7 +43,16 @@ show_tool_names () {
 
 	shown_any=
 	( cd "$MERGE_TOOLS_DIR" && ls ) | {
-		while read toolname
+		while read scriptname
+		do
+			setup_tool "$scriptname" 2>/dev/null
+			# We need an actual line feed here
+			variants="$variants
+$(list_tool_variants)"
+		done
+		variants="$(echo "$variants" | sort -u)"
+
+		for toolname in $variants
 		do
 			if setup_tool "$toolname" 2>/dev/null &&
 				(eval "$condition" "$toolname")
@@ -131,6 +140,10 @@ setup_user_tool () {
 	merge_cmd () {
 		( eval $merge_tool_cmd )
 	}
+
+	list_tool_variants () {
+		echo "$tool"
+	}
 }
 
 setup_tool () {
@@ -153,10 +166,18 @@ setup_tool () {
 		return 1
 	}
 
+	hide_resolved_enabled () {
+		return 0
+	}
+
 	translate_merge_tool_path () {
 		echo "$1"
 	}
 
+	list_tool_variants () {
+		echo "$tool"
+	}
+
 	# Most tools' exit codes cannot be trusted, so By default we ignore
 	# their exit code and check the merged file's modification time in
 	# check_unchanged() to determine whether or not the merge was
@@ -178,19 +199,26 @@ setup_tool () {
 		false
 	}
 
-
-	if ! test -f "$MERGE_TOOLS_DIR/$tool"
+	if test -f "$MERGE_TOOLS_DIR/$tool"
+	then
+		. "$MERGE_TOOLS_DIR/$tool"
+	elif test -f "$MERGE_TOOLS_DIR/${tool%[0-9]}"
 	then
+		. "$MERGE_TOOLS_DIR/${tool%[0-9]}"
+	else
 		setup_user_tool
 		return $?
 	fi
 
-	# Load the redefined functions
-	. "$MERGE_TOOLS_DIR/$tool"
 	# Now let the user override the default command for the tool.  If
 	# they have not done so then this will return 1 which we ignore.
 	setup_user_tool
 
+	if ! list_tool_variants | grep -q "^$tool$"
+	then
+		return 1
+	fi
+
 	if merge_mode && ! can_merge
 	then
 		echo "error: '$tool' can not be used to resolve merges" >&2
@@ -226,6 +254,10 @@ trust_exit_code () {
 	fi
 }
 
+initialize_merge_tool () {
+	# Bring tool-specific functions into scope
+	setup_tool "$1" || return 1
+}
 
 # Entry point for running tools
 run_merge_tool () {
@@ -237,9 +269,6 @@ run_merge_tool () {
 	merge_tool_path=$(get_merge_tool_path "$1") || exit
 	base_present="$2"
 
-	# Bring tool-specific functions into scope
-	setup_tool "$1" || return 1
-
 	if merge_mode
 	then
 		run_merge_cmd "$1"
@@ -286,11 +315,14 @@ list_merge_tool_candidates () {
 		tools="$tools smerge"
 	fi
 	case "${VISUAL:-$EDITOR}" in
+	*nvim*)
+		tools="$tools nvimdiff vimdiff emerge"
+		;;
 	*vim*)
-		tools="$tools vimdiff emerge"
+		tools="$tools vimdiff nvimdiff emerge"
 		;;
 	*)
-		tools="$tools emerge vimdiff"
+		tools="$tools emerge vimdiff nvimdiff"
 		;;
 	esac
 }
diff --git a/git-mergetool.sh b/git-mergetool.sh
index e3f6d543fb..f751d9cfe2 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -239,6 +239,13 @@ checkout_staged_file () {
 	fi
 }
 
+hide_resolved () {
+	git merge-file --ours -q -p "$LOCAL" "$BASE" "$REMOTE" >"$LCONFL"
+	git merge-file --theirs -q -p "$LOCAL" "$BASE" "$REMOTE" >"$RCONFL"
+	mv -- "$LCONFL" "$LOCAL"
+	mv -- "$RCONFL" "$REMOTE"
+}
+
 merge_file () {
 	MERGED="$1"
 
@@ -265,6 +272,8 @@ merge_file () {
 		ext=
 	esac
 
+	initialize_merge_tool "$merge_tool" || return
+
 	mergetool_tmpdir_init
 
 	if test "$MERGETOOL_TMPDIR" != "."
@@ -276,7 +285,9 @@ merge_file () {
 
 	BACKUP="$MERGETOOL_TMPDIR/${BASE}_BACKUP_$$$ext"
 	LOCAL="$MERGETOOL_TMPDIR/${BASE}_LOCAL_$$$ext"
+	LCONFL="$MERGETOOL_TMPDIR/${BASE}_LOCAL_LCONFL_$$$ext"
 	REMOTE="$MERGETOOL_TMPDIR/${BASE}_REMOTE_$$$ext"
+	RCONFL="$MERGETOOL_TMPDIR/${BASE}_REMOTE_RCONFL_$$$ext"
 	BASE="$MERGETOOL_TMPDIR/${BASE}_BASE_$$$ext"
 
 	base_mode= local_mode= remote_mode=
@@ -322,6 +333,40 @@ merge_file () {
 	checkout_staged_file 2 "$MERGED" "$LOCAL"
 	checkout_staged_file 3 "$MERGED" "$REMOTE"
 
+	# hideResolved preferences hierarchy.
+	global_config="mergetool.hideResolved"
+	tool_config="mergetool.${merge_tool}.hideResolved"
+
+	if enabled=$(git config --type=bool "$tool_config")
+	then
+		# The user has a specific preference for a specific tool and no
+		# other preferences should override that.
+		: ;
+	elif enabled=$(git config --type=bool "$global_config")
+	then
+		# The user has a general preference for all tools.
+		#
+		# 'true' means the user likes the feature so we should use it
+		# where possible but tool authors can still override.
+		#
+		# 'false' means the user doesn't like the feature so we should
+		# not use it anywhere.
+		if test "$enabled" = true && hide_resolved_enabled
+		then
+		    enabled=true
+		else
+		    enabled=false
+		fi
+	else
+		# The user does not have a preference. Default to disabled.
+		enabled=false
+	fi
+
+	if test "$enabled" = true
+	then
+		hide_resolved
+	fi
+
 	if test -z "$local_mode" || test -z "$remote_mode"
 	then
 		echo "Deleted merge conflict for '$MERGED':"
diff --git a/git-p4.py b/git-p4.py
index 60c73b6a37..2b4500226a 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -7,13 +7,21 @@
 #            2007 Trolltech ASA
 # License: MIT <http://www.opensource.org/licenses/mit-license.php>
 #
+# pylint: disable=invalid-name,missing-docstring,too-many-arguments,broad-except
+# pylint: disable=no-self-use,wrong-import-position,consider-iterating-dictionary
+# pylint: disable=wrong-import-order,unused-import,too-few-public-methods
+# pylint: disable=too-many-lines,ungrouped-imports,fixme,too-many-locals
+# pylint: disable=line-too-long,bad-whitespace,superfluous-parens
+# pylint: disable=too-many-statements,too-many-instance-attributes
+# pylint: disable=too-many-branches,too-many-nested-blocks
+#
 import sys
-if sys.hexversion < 0x02040000:
-    # The limiter is the subprocess module
-    sys.stderr.write("git-p4: requires Python 2.4 or later.\n")
+if sys.version_info.major < 3 and sys.version_info.minor < 7:
+    sys.stderr.write("git-p4: requires Python 2.7 or later.\n")
     sys.exit(1)
 import os
 import optparse
+import functools
 import marshal
 import subprocess
 import tempfile
@@ -26,37 +34,17 @@ import zipfile
 import zlib
 import ctypes
 import errno
+import glob
 
+# On python2.7 where raw_input() and input() are both availble,
+# we want raw_input's semantics, but aliased to input for python3
+# compatibility
 # support basestring in python3
 try:
-    unicode = unicode
-except NameError:
-    # 'unicode' is undefined, must be Python 3
-    str = str
-    unicode = str
-    bytes = bytes
-    basestring = (str,bytes)
-else:
-    # 'unicode' exists, must be Python 2
-    str = str
-    unicode = unicode
-    bytes = str
-    basestring = basestring
-
-try:
-    from subprocess import CalledProcessError
-except ImportError:
-    # from python2.7:subprocess.py
-    # Exception classes used by this module.
-    class CalledProcessError(Exception):
-        """This exception is raised when a process run by check_call() returns
-        a non-zero exit status.  The exit status will be stored in the
-        returncode attribute."""
-        def __init__(self, returncode, cmd):
-            self.returncode = returncode
-            self.cmd = cmd
-        def __str__(self):
-            return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode)
+    if raw_input and input:
+        input = raw_input
+except:
+    pass
 
 verbose = False
 
@@ -105,7 +93,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 isinstance(cmd,basestring):
+    if not isinstance(cmd, list):
         real_cmd = ' '.join(real_cmd) + ' ' + cmd
     else:
         real_cmd += cmd
@@ -161,17 +149,135 @@ def calcDiskFree():
         return st.f_bavail * st.f_frsize
 
 def die(msg):
+    """ Terminate execution. Make sure that any running child processes have been wait()ed for before
+        calling this.
+    """
     if verbose:
         raise Exception(msg)
     else:
         sys.stderr.write(msg + "\n")
         sys.exit(1)
 
+def prompt(prompt_text):
+    """ Prompt the user to choose one of the choices
+
+    Choices are identified in the prompt_text by square brackets around
+    a single letter option.
+    """
+    choices = set(m.group(1) for m in re.finditer(r"\[(.)\]", prompt_text))
+    while True:
+        sys.stderr.flush()
+        sys.stdout.write(prompt_text)
+        sys.stdout.flush()
+        response=sys.stdin.readline().strip().lower()
+        if not response:
+            continue
+        response = response[0]
+        if response in choices:
+            return response
+
+# We need different encoding/decoding strategies for text data being passed
+# around in pipes depending on python version
+if bytes is not str:
+    # For python3, always encode and decode as appropriate
+    def decode_text_stream(s):
+        return s.decode() if isinstance(s, bytes) else s
+    def encode_text_stream(s):
+        return s.encode() if isinstance(s, str) else s
+else:
+    # For python2.7, pass read strings as-is, but also allow writing unicode
+    def decode_text_stream(s):
+        return s
+    def encode_text_stream(s):
+        return s.encode('utf_8') if isinstance(s, unicode) else s
+
+def decode_path(path):
+    """Decode a given string (bytes or otherwise) using configured path encoding options
+    """
+    encoding = gitConfig('git-p4.pathEncoding') or 'utf_8'
+    if bytes is not str:
+        return path.decode(encoding, errors='replace') if isinstance(path, bytes) else path
+    else:
+        try:
+            path.decode('ascii')
+        except:
+            path = path.decode(encoding, errors='replace')
+            if verbose:
+                print('Path with non-ASCII characters detected. Used {} to decode: {}'.format(encoding, path))
+        return path
+
+def run_git_hook(cmd, param=[]):
+    """Execute a hook if the hook exists."""
+    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))
 
-    expand = isinstance(c,basestring)
+    expand = not isinstance(c, list)
     p = subprocess.Popen(c, stdin=subprocess.PIPE, shell=expand)
     pipe = p.stdin
     val = pipe.write(stdin)
@@ -183,6 +289,8 @@ def write_pipe(c, stdin):
 
 def p4_write_pipe(c, stdin):
     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)
 
 def read_pipe_full(c):
@@ -193,15 +301,17 @@ def read_pipe_full(c):
     if verbose:
         sys.stderr.write('Reading pipe: %s\n' % str(c))
 
-    expand = isinstance(c,basestring)
+    expand = not isinstance(c, list)
     p = subprocess.Popen(c, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=expand)
     (out, err) = p.communicate()
-    return (p.returncode, out, err)
+    return (p.returncode, out, decode_text_stream(err))
 
-def read_pipe(c, ignore_error=False):
+def read_pipe(c, ignore_error=False, raw=False):
     """ 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)
     if retcode != 0:
@@ -209,6 +319,8 @@ def read_pipe(c, ignore_error=False):
             out = ""
         else:
             die('Command failed: %s\nError: %s' % (str(c), err))
+    if not raw:
+        out = decode_text_stream(out)
     return out
 
 def read_pipe_text(c):
@@ -219,23 +331,22 @@ def read_pipe_text(c):
     if retcode != 0:
         return None
     else:
-        return out.rstrip()
+        return decode_text_stream(out).rstrip()
 
-def p4_read_pipe(c, ignore_error=False):
+def p4_read_pipe(c, ignore_error=False, raw=False):
     real_cmd = p4_build_cmd(c)
-    return read_pipe(real_cmd, ignore_error)
+    return read_pipe(real_cmd, ignore_error, raw=raw)
 
 def read_pipe_lines(c):
     if verbose:
         sys.stderr.write('Reading pipe: %s\n' % str(c))
 
-    expand = isinstance(c, basestring)
+    expand = not isinstance(c, list)
     p = subprocess.Popen(c, stdout=subprocess.PIPE, shell=expand)
     pipe = p.stdout
-    val = pipe.readlines()
+    val = [decode_text_stream(line) for line in pipe.readlines()]
     if pipe.close() or p.wait():
         die('Command failed: %s' % str(c))
-
     return val
 
 def p4_read_pipe_lines(c):
@@ -263,6 +374,7 @@ def p4_has_move_command():
     cmd = p4_build_cmd(["move", "-k", "@from", "@to"])
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     (out, err) = p.communicate()
+    err = decode_text_stream(err)
     # return code will be 1 in either case
     if err.find("Invalid option") >= 0:
         return False
@@ -272,7 +384,7 @@ def p4_has_move_command():
     return True
 
 def system(cmd, ignore_error=False):
-    expand = isinstance(cmd,basestring)
+    expand = not isinstance(cmd, list)
     if verbose:
         sys.stderr.write("executing %s\n" % str(cmd))
     retcode = subprocess.call(cmd, shell=expand)
@@ -284,7 +396,7 @@ def system(cmd, ignore_error=False):
 def p4_system(cmd):
     """Specifically invoke p4 as the system command. """
     real_cmd = p4_build_cmd(cmd)
-    expand = isinstance(real_cmd, basestring)
+    expand = not isinstance(real_cmd, list)
     retcode = subprocess.call(real_cmd, shell=expand)
     if retcode:
         raise CalledProcessError(retcode, real_cmd)
@@ -522,7 +634,7 @@ def getP4OpenedType(file):
 # Return the set of all p4 labels
 def getP4Labels(depotPaths):
     labels = set()
-    if isinstance(depotPaths,basestring):
+    if not isinstance(depotPaths, list):
         depotPaths = [depotPaths]
 
     for l in p4CmdList(["labels"] + ["%s..." % p for p in depotPaths]):
@@ -539,12 +651,7 @@ def getGitTags():
         gitTags.add(tag)
     return gitTags
 
-def diffTreePattern():
-    # This is a simple generator for the diff tree regex pattern. This could be
-    # a class variable if this and parseDiffTreeEntry were a part of a class.
-    pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)')
-    while True:
-        yield pattern
+_diff_tree_pattern = None
 
 def parseDiffTreeEntry(entry):
     """Parses a single diff tree entry into its component elements.
@@ -565,7 +672,11 @@ def parseDiffTreeEntry(entry):
 
     If the pattern is not matched, None is returned."""
 
-    match = diffTreePattern().next().match(entry)
+    global _diff_tree_pattern
+    if not _diff_tree_pattern:
+        _diff_tree_pattern = re.compile(':(\d+) (\d+) (\w+) (\w+) ([A-Z])(\d+)?\t(.*?)((\t(.*))|$)')
+
+    match = _diff_tree_pattern.match(entry)
     if match:
         return {
             'src_mode': match.group(1),
@@ -603,13 +714,21 @@ class P4RequestSizeException(P4ServerException):
         super(P4RequestSizeException, self).__init__(exit_code, p4_result)
         self.limit = limit
 
+class P4CommandException(P4Exception):
+    """ Something went wrong calling p4 which means we have to give up """
+    def __init__(self, msg):
+        self.msg = msg
+
+    def __str__(self):
+        return self.msg
+
 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 isinstance(cmd,basestring):
+    if not isinstance(cmd, list):
         cmd = "-G " + cmd
         expand = True
     else:
@@ -626,11 +745,12 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
     stdin_file = None
     if stdin is not None:
         stdin_file = tempfile.TemporaryFile(prefix='p4-stdin', mode=stdin_mode)
-        if isinstance(stdin,basestring):
+        if not isinstance(stdin, list):
             stdin_file.write(stdin)
         else:
             for i in stdin:
-                stdin_file.write(i + '\n')
+                stdin_file.write(encode_text_stream(i))
+                stdin_file.write(b'\n')
         stdin_file.flush()
         stdin_file.seek(0)
 
@@ -643,6 +763,20 @@ def p4CmdList(cmd, stdin=None, stdin_mode='w+b', cb=None, skip_info=False,
     try:
         while True:
             entry = marshal.load(p4.stdout)
+            if bytes is not str:
+                # Decode unmarshalled dict to use str keys and values, except for:
+                #   - `data` which may contain arbitrary binary data
+                #   - `depotFile[0-9]*`, `path`, or `clientFile` which may contain non-UTF8 encoded text
+                decoded_entry = {}
+                for key, value in entry.items():
+                    key = key.decode()
+                    if isinstance(value, bytes) and not (key in ('data', 'path', 'clientFile') or key.startswith('depotFile')):
+                        value = value.decode()
+                    decoded_entry[key] = value
+                # Parse out data if it's an error response
+                if decoded_entry.get('code') == 'error' and 'data' in decoded_entry:
+                    decoded_entry['data'] = decoded_entry['data'].decode()
+                entry = decoded_entry
             if skip_info:
                 if 'code' in entry and entry['code'] == 'info':
                     continue
@@ -693,7 +827,8 @@ def p4Where(depotPath):
         if "depotFile" in entry:
             # Search for the base client side depot path, as long as it starts with the branch's P4 path.
             # The base path always ends with "/...".
-            if entry["depotFile"].find(depotPath) == 0 and entry["depotFile"][-4:] == "/...":
+            entry_path = decode_path(entry['depotFile'])
+            if entry_path.find(depotPath) == 0 and entry_path[-4:] == "/...":
                 output = entry
                 break
         elif "data" in entry:
@@ -708,11 +843,11 @@ def p4Where(depotPath):
         return ""
     clientPath = ""
     if "path" in output:
-        clientPath = output.get("path")
+        clientPath = decode_path(output['path'])
     elif "data" in output:
         data = output.get("data")
-        lastSpace = data.rfind(" ")
-        clientPath = data[lastSpace + 1:]
+        lastSpace = data.rfind(b" ")
+        clientPath = decode_path(data[lastSpace + 1:])
 
     if clientPath.endswith("..."):
         clientPath = clientPath[:-3]
@@ -860,6 +995,7 @@ def branch_exists(branch):
     cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ]
     p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     out, _ = p.communicate()
+    out = decode_text_stream(out)
     if p.returncode:
         return False
     # expect exactly one line of output: the branch name
@@ -1137,7 +1273,7 @@ class LargeFileSystem(object):
         assert False, "Method 'pushFile' required in " + self.__class__.__name__
 
     def hasLargeFileExtension(self, relPath):
-        return reduce(
+        return functools.reduce(
             lambda a, b: a or b,
             [relPath.endswith('.' + e) for e in gitConfigList('git-p4.largeFileExtensions')],
             False
@@ -1244,7 +1380,7 @@ class GitLFS(LargeFileSystem):
             ['git', 'lfs', 'pointer', '--file=' + contentFile],
             stdout=subprocess.PIPE
         )
-        pointerFile = pointerProcess.stdout.read()
+        pointerFile = decode_text_stream(pointerProcess.stdout.read())
         if pointerProcess.wait():
             os.remove(contentFile)
             die('git-lfs pointer command failed. Did you install the extension?')
@@ -1257,9 +1393,15 @@ class GitLFS(LargeFileSystem):
             pointerFile = re.sub(r'Git LFS pointer for.*\n\n', '', pointerFile)
 
         oid = re.search(r'^oid \w+:(\w+)', pointerFile, re.MULTILINE).group(1)
+        # if someone use external lfs.storage ( not in local repo git )
+        lfs_path = gitConfig('lfs.storage')
+        if not lfs_path:
+            lfs_path = 'lfs'
+        if not os.path.isabs(lfs_path):
+            lfs_path = os.path.join(os.getcwd(), '.git', lfs_path)
         localLargeFile = os.path.join(
-            os.getcwd(),
-            '.git', 'lfs', 'objects', oid[:2], oid[2:4],
+            lfs_path,
+            'objects', oid[:2], oid[2:4],
             oid,
         )
         # LFS Spec states that pointer files should not have the executable bit set.
@@ -1374,14 +1516,14 @@ class P4UserMap:
         for (key, val) in self.users.items():
             s += "%s\t%s\n" % (key.expandtabs(1), val.expandtabs(1))
 
-        open(self.getUserCacheFilename(), "wb").write(s)
+        open(self.getUserCacheFilename(), 'w').write(s)
         self.userMapFromPerforceServer = True
 
     def loadUserMapFromCache(self):
         self.users = {}
         self.userMapFromPerforceServer = False
         try:
-            cache = open(self.getUserCacheFilename(), "rb")
+            cache = open(self.getUserCacheFilename(), 'r')
             lines = cache.readlines()
             cache.close()
             for line in lines:
@@ -1496,13 +1638,39 @@ class P4Submit(Command, P4UserMap):
                                      "work from a local git branch that is not master"),
                 optparse.make_option("--disable-p4sync", dest="disable_p4sync", action="store_true",
                                      help="Skip Perforce sync of p4/master after submit or shelve"),
+                optparse.make_option("--no-verify", dest="no_verify", action="store_true",
+                                     help="Bypass p4-pre-submit and p4-changelist hooks"),
         ]
         self.description = """Submit changes from git to the perforce depot.\n
-    The `p4-pre-submit` hook is executed if it exists and is executable.
-    The hook takes no parameters and nothing from standard input. Exiting with
-    non-zero status from this script prevents `git-p4 submit` from launching.
-
-    One usage scenario is to run unit tests in the hook."""
+    The `p4-pre-submit` hook is executed if it exists and is executable. It
+    can be bypassed with the `--no-verify` command line option. The hook takes
+    no parameters and nothing from standard input. Exiting with a non-zero status
+    from this script prevents `git-p4 submit` from launching.
+
+    One usage scenario is to run unit tests in the hook.
+
+    The `p4-prepare-changelist` hook is executed right after preparing the default
+    changelist message and before the editor is started. It takes one parameter,
+    the name of the file that contains the changelist text. Exiting with a non-zero
+    status from the script will abort the process.
+
+    The purpose of the hook is to edit the message file in place, and it is not
+    supressed by the `--no-verify` option. This hook is called even if
+    `--prepare-p4-only` is set.
+
+    The `p4-changelist` hook is executed after the changelist message has been
+    edited by the user. It can be bypassed with the `--no-verify` option. It
+    takes a single parameter, the name of the file that holds the proposed
+    changelist text. Exiting with a non-zero status causes the command to abort.
+
+    The hook is allowed to edit the changelist file and can be used to normalize
+    the text into some project standard format. It can also be used to refuse the
+    Submit after inspect the message file.
+
+    The `p4-post-changelist` hook is invoked after the submit has successfully
+    occurred in P4. It takes no parameters and is meant primarily for notification
+    and cannot affect the outcome of the git p4 submit action.
+    """
 
         self.usage += " [name of git branch to submit into perforce depot]"
         self.origin = ""
@@ -1520,6 +1688,7 @@ class P4Submit(Command, P4UserMap):
         self.exportLabels = False
         self.p4HasMoveCommand = p4_has_move_command()
         self.branch = None
+        self.no_verify = False
 
         if gitConfig('git-p4.largeFileSystem'):
             die("Large file system not supported for git-p4 submit command. Please remove it from config.")
@@ -1658,7 +1827,8 @@ class P4Submit(Command, P4UserMap):
         c = changes[0]
         if c['User'] == newUser: return   # nothing to do
         c['User'] = newUser
-        input = marshal.dumps(c)
+        # p4 does not understand format version 3 and above
+        input = marshal.dumps(c, 2)
 
         result = p4CmdList("change -f -i", stdin=input)
         for r in result:
@@ -1722,7 +1892,7 @@ class P4Submit(Command, P4UserMap):
                 break
         if not change_entry:
             die('Failed to decode output of p4 change -o')
-        for key, value in change_entry.iteritems():
+        for key, value in change_entry.items():
             if key.startswith('File'):
                 if 'depot-paths' in settings:
                     if not [p for p in settings['depot-paths']
@@ -1778,12 +1948,11 @@ class P4Submit(Command, P4UserMap):
         if os.stat(template_file).st_mtime > mtime:
             return True
 
-        while True:
-            response = raw_input("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
-            if response == 'y':
-                return True
-            if response == 'n':
-                return False
+        response = prompt("Submit template unchanged. Submit anyway? [y]es, [n]o (skip this patch) ")
+        if response == 'y':
+            return True
+        if response == 'n':
+            return False
 
     def get_diff_description(self, editedFiles, filesToAdd, symlinks):
         # diff
@@ -1808,8 +1977,11 @@ class P4Submit(Command, P4UserMap):
                 newdiff += "+%s\n" % os.readlink(newFile)
             else:
                 f = open(newFile, "r")
-                for line in f.readlines():
-                    newdiff += "+" + line
+                try:
+                    for line in f.readlines():
+                        newdiff += "+" + line
+                except UnicodeDecodeError:
+                    pass # Found non-text data and skip, since diff description should only include text
                 f.close()
 
         return (diff + newdiff).replace('\r\n', '\n')
@@ -1907,6 +2079,9 @@ class P4Submit(Command, P4UserMap):
         applyPatchCmd = patchcmd + "--check --apply -"
         patch_succeeded = True
 
+        if verbose:
+            print("TryPatch: %s" % tryPatchCmd)
+
         if os.system(tryPatchCmd) != 0:
             fixed_rcs_keywords = False
             patch_succeeded = False
@@ -1946,6 +2121,7 @@ class P4Submit(Command, P4UserMap):
                 print("Retrying the patch with RCS keywords cleaned up")
                 if os.system(tryPatchCmd) == 0:
                     patch_succeeded = True
+                    print("Patch succeesed this time with RCS keywords cleaned")
 
         if not patch_succeeded:
             for f in editedFiles:
@@ -2003,58 +2179,76 @@ class P4Submit(Command, P4UserMap):
         tmpFile = os.fdopen(handle, "w+b")
         if self.isWindows:
             submitTemplate = submitTemplate.replace("\n", "\r\n")
-        tmpFile.write(submitTemplate)
+        tmpFile.write(encode_text_stream(submitTemplate))
         tmpFile.close()
 
-        if self.prepare_p4_only:
-            #
-            # Leave the p4 tree prepared, and the submit template around
-            # and let the user decide what to do next
-            #
-            print()
-            print("P4 workspace prepared for submission.")
-            print("To submit or revert, go to client workspace")
-            print("  " + self.clientPath)
-            print()
-            print("To submit, use \"p4 submit\" to write a new description,")
-            print("or \"p4 submit -i <%s\" to use the one prepared by" \
-                  " \"git p4\"." % fileName)
-            print("You can delete the file \"%s\" when finished." % fileName)
-
-            if self.preserveUser and p4User and not self.p4UserIsMe(p4User):
-                print("To preserve change ownership by user %s, you must\n" \
-                      "do \"p4 change -f <change>\" after submitting and\n" \
-                      "edit the User field.")
-            if pureRenameCopy:
-                print("After submitting, renamed files must be re-synced.")
-                print("Invoke \"p4 sync -f\" on each of these files:")
-                for f in pureRenameCopy:
-                    print("  " + f)
-
-            print()
-            print("To revert the changes, use \"p4 revert ...\", and delete")
-            print("the submit template file \"%s\"" % fileName)
-            if filesToAdd:
-                print("Since the commit adds new files, they must be deleted:")
-                for f in filesToAdd:
-                    print("  " + f)
-            print()
-            return True
-
-        #
-        # Let the user edit the change description, then submit it.
-        #
         submitted = False
 
         try:
+            # Allow the hook to edit the changelist text before presenting it
+            # to the user.
+            if not run_git_hook("p4-prepare-changelist", [fileName]):
+                return False
+
+            if self.prepare_p4_only:
+                #
+                # Leave the p4 tree prepared, and the submit template around
+                # and let the user decide what to do next
+                #
+                submitted = True
+                print("")
+                print("P4 workspace prepared for submission.")
+                print("To submit or revert, go to client workspace")
+                print("  " + self.clientPath)
+                print("")
+                print("To submit, use \"p4 submit\" to write a new description,")
+                print("or \"p4 submit -i <%s\" to use the one prepared by" \
+                      " \"git p4\"." % fileName)
+                print("You can delete the file \"%s\" when finished." % fileName)
+
+                if self.preserveUser and p4User and not self.p4UserIsMe(p4User):
+                    print("To preserve change ownership by user %s, you must\n" \
+                          "do \"p4 change -f <change>\" after submitting and\n" \
+                          "edit the User field.")
+                if pureRenameCopy:
+                    print("After submitting, renamed files must be re-synced.")
+                    print("Invoke \"p4 sync -f\" on each of these files:")
+                    for f in pureRenameCopy:
+                        print("  " + f)
+
+                print("")
+                print("To revert the changes, use \"p4 revert ...\", and delete")
+                print("the submit template file \"%s\"" % fileName)
+                if filesToAdd:
+                    print("Since the commit adds new files, they must be deleted:")
+                    for f in filesToAdd:
+                        print("  " + f)
+                print("")
+                sys.stdout.flush()
+                return True
+
             if self.edit_template(fileName):
+                if not self.no_verify:
+                    if not run_git_hook("p4-changelist", [fileName]):
+                        print("The p4-changelist hook failed.")
+                        sys.stdout.flush()
+                        return False
+
                 # read the edited message and submit
                 tmpFile = open(fileName, "rb")
-                message = tmpFile.read()
+                message = decode_text_stream(tmpFile.read())
                 tmpFile.close()
                 if self.isWindows:
                     message = message.replace("\r\n", "\n")
-                submitTemplate = message[:message.index(separatorLine)]
+                if message.find(separatorLine) != -1:
+                    submitTemplate = message[:message.index(separatorLine)]
+                else:
+                    submitTemplate = message
+
+                if len(submitTemplate.strip()) == 0:
+                    print("Changelist is empty, aborting this changelist.")
+                    sys.stdout.flush()
+                    return False
 
                 if update_shelve:
                     p4_write_pipe(['shelve', '-r', '-i'], submitTemplate)
@@ -2077,20 +2271,23 @@ class P4Submit(Command, P4UserMap):
 
                 submitted = True
 
+                run_git_hook("p4-post-changelist")
         finally:
-            # skip this patch
+            # Revert changes if we skip this patch
             if not submitted or self.shelve:
                 if self.shelve:
                     print ("Reverting shelved files.")
                 else:
                     print ("Submission cancelled, undoing p4 changes.")
+                sys.stdout.flush()
                 for f in editedFiles | filesToDelete:
                     p4_revert(f)
                 for f in filesToAdd:
                     p4_revert(f)
                     os.remove(f)
 
-        os.remove(fileName)
+            if not self.prepare_p4_only:
+                os.remove(fileName)
         return submitted
 
     # Export git tags as p4 labels. Create a p4 label and then tag
@@ -2314,13 +2511,17 @@ class P4Submit(Command, P4UserMap):
             sys.exit("number of commits (%d) must match number of shelved changelist (%d)" %
                      (len(commits), num_shelves))
 
-        hooks_path = gitConfig("core.hooksPath")
-        if len(hooks_path) <= 0:
-            hooks_path = os.path.join(os.environ.get("GIT_DIR", ".git"), "hooks")
-
-        hook_file = os.path.join(hooks_path, "p4-pre-submit")
-        if os.path.isfile(hook_file) and os.access(hook_file, os.X_OK) and subprocess.call([hook_file]) != 0:
-            sys.exit(1)
+        if not self.no_verify:
+            try:
+                if not run_git_hook("p4-pre-submit"):
+                    print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nYou can skip " \
+                        "this pre-submission check by adding\nthe command line option '--no-verify', " \
+                        "however,\nthis will also skip the p4-changelist hook as well.")
+                    sys.exit(1)
+            except Exception as e:
+                print("\nThe p4-pre-submit hook failed, aborting the submit.\n\nThe hook failed "\
+                    "with the error '{0}'".format(e.message) )
+                sys.exit(1)
 
         #
         # Apply the commits, one at a time.  On failure, ask if should
@@ -2339,37 +2540,29 @@ class P4Submit(Command, P4UserMap):
                 ok = self.applyCommit(commit)
             if ok:
                 applied.append(commit)
-            else:
-                if self.prepare_p4_only and i < last:
-                    print("Processing only the first commit due to option" \
-                          " --prepare-p4-only")
+                if self.prepare_p4_only:
+                    if i < last:
+                        print("Processing only the first commit due to option" \
+                                " --prepare-p4-only")
                     break
+            else:
                 if i < last:
-                    quit = False
-                    while True:
-                        # prompt for what to do, or use the option/variable
-                        if self.conflict_behavior == "ask":
-                            print("What do you want to do?")
-                            response = raw_input("[s]kip this commit but apply"
-                                                 " the rest, or [q]uit? ")
-                            if not response:
-                                continue
-                        elif self.conflict_behavior == "skip":
-                            response = "s"
-                        elif self.conflict_behavior == "quit":
-                            response = "q"
-                        else:
-                            die("Unknown conflict_behavior '%s'" %
-                                self.conflict_behavior)
-
-                        if response[0] == "s":
-                            print("Skipping this commit, but applying the rest")
-                            break
-                        if response[0] == "q":
-                            print("Quitting")
-                            quit = True
-                            break
-                    if quit:
+                    # prompt for what to do, or use the option/variable
+                    if self.conflict_behavior == "ask":
+                        print("What do you want to do?")
+                        response = prompt("[s]kip this commit but apply the rest, or [q]uit? ")
+                    elif self.conflict_behavior == "skip":
+                        response = "s"
+                    elif self.conflict_behavior == "quit":
+                        response = "q"
+                    else:
+                        die("Unknown conflict_behavior '%s'" %
+                            self.conflict_behavior)
+
+                    if response == "s":
+                        print("Skipping this commit, but applying the rest")
+                    if response == "q":
+                        print("Quitting")
                         break
 
         chdir(self.oldWorkingDirectory)
@@ -2479,7 +2672,7 @@ class View(object):
 
     def convert_client_path(self, clientFile):
         # chop off //client/ part to make it relative
-        if not clientFile.startswith(self.client_prefix):
+        if not decode_path(clientFile).startswith(self.client_prefix):
             die("No prefix '%s' on clientFile '%s'" %
                 (self.client_prefix, clientFile))
         return clientFile[len(self.client_prefix):]
@@ -2488,7 +2681,7 @@ class View(object):
         """ Caching file paths by "p4 where" batch query """
 
         # List depot file paths exclude that already cached
-        fileArgs = [f['path'] for f in files if f['path'] not in self.client_spec_path_cache]
+        fileArgs = [f['path'] for f in files if decode_path(f['path']) not in self.client_spec_path_cache]
 
         if len(fileArgs) == 0:
             return  # All files in cache
@@ -2503,16 +2696,18 @@ class View(object):
             if "unmap" in res:
                 # it will list all of them, but only one not unmap-ped
                 continue
+            depot_path = decode_path(res['depotFile'])
             if gitConfigBool("core.ignorecase"):
-                res['depotFile'] = res['depotFile'].lower()
-            self.client_spec_path_cache[res['depotFile']] = self.convert_client_path(res["clientFile"])
+                depot_path = depot_path.lower()
+            self.client_spec_path_cache[depot_path] = self.convert_client_path(res["clientFile"])
 
         # not found files or unmap files set to ""
         for depotFile in fileArgs:
+            depotFile = decode_path(depotFile)
             if gitConfigBool("core.ignorecase"):
                 depotFile = depotFile.lower()
             if depotFile not in self.client_spec_path_cache:
-                self.client_spec_path_cache[depotFile] = ""
+                self.client_spec_path_cache[depotFile] = b''
 
     def map_in_client(self, depot_path):
         """Return the relative location in the client where this
@@ -2617,6 +2812,7 @@ class P4Sync(Command, P4UserMap):
     def checkpoint(self):
         self.gitStream.write("checkpoint\n\n")
         self.gitStream.write("progress checkpoint\n\n")
+        self.gitStream.flush()
         out = self.gitOutput.readline()
         if self.verbose:
             print("checkpoint finished: " + out)
@@ -2630,7 +2826,7 @@ class P4Sync(Command, P4UserMap):
             elif path.lower() == p.lower():
                 return False
         for p in self.depotPaths:
-            if p4PathStartsWith(path, p):
+            if p4PathStartsWith(path, decode_path(p)):
                 return True
         return False
 
@@ -2639,7 +2835,7 @@ class P4Sync(Command, P4UserMap):
         fnum = 0
         while "depotFile%s" % fnum in commit:
             path =  commit["depotFile%s" % fnum]
-            found = self.isPathWanted(path)
+            found = self.isPathWanted(decode_path(path))
             if not found:
                 fnum = fnum + 1
                 continue
@@ -2673,7 +2869,7 @@ class P4Sync(Command, P4UserMap):
         if self.useClientSpec:
             # branch detection moves files up a level (the branch name)
             # from what client spec interpretation gives
-            path = self.clientSpecDirs.map_in_client(path)
+            path = decode_path(self.clientSpecDirs.map_in_client(path))
             if self.detectBranches:
                 for b in self.knownBranches:
                     if p4PathStartsWith(path, b + "/"):
@@ -2707,14 +2903,15 @@ class P4Sync(Command, P4UserMap):
         branches = {}
         fnum = 0
         while "depotFile%s" % fnum in commit:
-            path =  commit["depotFile%s" % fnum]
+            raw_path = commit["depotFile%s" % fnum]
+            path = decode_path(raw_path)
             found = self.isPathWanted(path)
             if not found:
                 fnum = fnum + 1
                 continue
 
             file = {}
-            file["path"] = path
+            file["path"] = raw_path
             file["rev"] = commit["rev%s" % fnum]
             file["action"] = commit["action%s" % fnum]
             file["type"] = commit["type%s" % fnum]
@@ -2723,7 +2920,7 @@ class P4Sync(Command, P4UserMap):
             # start with the full relative path where this file would
             # go in a p4 client
             if self.useClientSpec:
-                relPath = self.clientSpecDirs.map_in_client(path)
+                relPath = decode_path(self.clientSpecDirs.map_in_client(path))
             else:
                 relPath = self.stripRepoPath(path, self.depotPaths)
 
@@ -2739,7 +2936,7 @@ class P4Sync(Command, P4UserMap):
         return branches
 
     def writeToGitStream(self, gitMode, relPath, contents):
-        self.gitStream.write('M %s inline %s\n' % (gitMode, relPath))
+        self.gitStream.write(encode_text_stream(u'M {} inline {}\n'.format(gitMode, relPath)))
         self.gitStream.write('data %d\n' % sum(len(d) for d in contents))
         for d in contents:
             self.gitStream.write(d)
@@ -2761,14 +2958,15 @@ class P4Sync(Command, P4UserMap):
     # - helper for streamP4Files
 
     def streamOneP4File(self, file, contents):
-        relPath = self.stripRepoPath(file['depotFile'], self.branchPrefixes)
-        relPath = self.encodeWithUTF8(relPath)
+        file_path = file['depotFile']
+        relPath = self.stripRepoPath(decode_path(file_path), self.branchPrefixes)
+
         if verbose:
             if 'fileSize' in self.stream_file:
                 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['depotFile'], relPath, size/1024/1024))
+            sys.stdout.write('\r%s --> %s (%i MB)\n' % (file_path, relPath, size/1024/1024))
             sys.stdout.flush()
 
         (type_base, type_mods) = split_p4_type(file["type"])
@@ -2780,13 +2978,13 @@ class P4Sync(Command, P4UserMap):
             git_mode = "120000"
             # p4 print on a symlink sometimes contains "target\n";
             # if it does, remove the newline
-            data = ''.join(contents)
+            data = ''.join(decode_text_stream(c) for c in contents)
             if not data:
                 # Some version of p4 allowed creating a symlink that pointed
                 # to nothing.  This causes p4 errors when checking out such
                 # a change, and errors here too.  Work around it by ignoring
                 # the bad symlink; hopefully a future change fixes it.
-                print("\nIgnoring empty symlink in %s" % file['depotFile'])
+                print("\nIgnoring empty symlink in %s" % file_path)
                 return
             elif data[-1] == '\n':
                 contents = [data[:-1]]
@@ -2805,7 +3003,7 @@ class P4Sync(Command, P4UserMap):
             # just the native "NT" type.
             #
             try:
-                text = p4_read_pipe(['print', '-q', '-o', '-', '%s@%s' % (file['depotFile'], file['change'])])
+                text = p4_read_pipe(['print', '-q', '-o', '-', '%s@%s' % (decode_path(file['depotFile']), file['change'])], raw=True)
             except Exception as e:
                 if 'Translation of file content failed' in str(e):
                     type_base = 'binary'
@@ -2813,7 +3011,7 @@ class P4Sync(Command, P4UserMap):
                     raise e
             else:
                 if p4_version_string().find('/NT') >= 0:
-                    text = text.replace('\r\n', '\n')
+                    text = text.replace(b'\r\n', b'\n')
                 contents = [ text ]
 
         if type_base == "apple":
@@ -2834,9 +3032,9 @@ class P4Sync(Command, P4UserMap):
         pattern = p4_keywords_regexp_for_type(type_base, type_mods)
         if pattern:
             regexp = re.compile(pattern, re.VERBOSE)
-            text = ''.join(contents)
+            text = ''.join(decode_text_stream(c) for c in contents)
             text = regexp.sub(r'$\1$', text)
-            contents = [ text ]
+            contents = [ encode_text_stream(text) ]
 
         if self.largeFileSystem:
             (git_mode, contents) = self.largeFileSystem.processContent(git_mode, relPath, contents)
@@ -2844,12 +3042,11 @@ class P4Sync(Command, P4UserMap):
         self.writeToGitStream(git_mode, relPath, contents)
 
     def streamOneP4Deletion(self, file):
-        relPath = self.stripRepoPath(file['path'], self.branchPrefixes)
-        relPath = self.encodeWithUTF8(relPath)
+        relPath = self.stripRepoPath(decode_path(file['path']), self.branchPrefixes)
         if verbose:
             sys.stdout.write("delete %s\n" % relPath)
             sys.stdout.flush()
-        self.gitStream.write("D %s\n" % relPath)
+        self.gitStream.write(encode_text_stream(u'D {}\n'.format(relPath)))
 
         if self.largeFileSystem and self.largeFileSystem.isLargeFile(relPath):
             self.largeFileSystem.removeLargeFile(relPath)
@@ -2949,9 +3146,9 @@ class P4Sync(Command, P4UserMap):
                 if 'shelved_cl' in f:
                     # Handle shelved CLs using the "p4 print file@=N" syntax to print
                     # the contents
-                    fileArg = '%s@=%d' % (f['path'], f['shelved_cl'])
+                    fileArg = f['path'] + encode_text_stream('@={}'.format(f['shelved_cl']))
                 else:
-                    fileArg = '%s#%s' % (f['path'], f['rev'])
+                    fileArg = f['path'] + encode_text_stream('#{}'.format(f['rev']))
 
                 fileArgs.append(fileArg)
 
@@ -3021,6 +3218,42 @@ class P4Sync(Command, P4UserMap):
             print('Ignoring file outside of prefix: {0}'.format(path))
         return hasPrefix
 
+    def findShadowedFiles(self, files, change):
+        # Perforce allows you commit files and directories with the same name,
+        # so you could have files //depot/foo and //depot/foo/bar both checked
+        # in.  A p4 sync of a repository in this state fails.  Deleting one of
+        # the files recovers the repository.
+        #
+        # Git will not allow the broken state to exist and only the most recent
+        # of the conflicting names is left in the repository.  When one of the
+        # conflicting files is deleted we need to re-add the other one to make
+        # sure the git repository recovers in the same way as perforce.
+        deleted = [f for f in files if f['action'] in self.delete_actions]
+        to_check = set()
+        for f in deleted:
+            path = decode_path(f['path'])
+            to_check.add(path + '/...')
+            while True:
+                path = path.rsplit("/", 1)[0]
+                if path == "/" or path in to_check:
+                    break
+                to_check.add(path)
+        to_check = ['%s@%s' % (wildcard_encode(p), change) for p in to_check
+            if self.hasBranchPrefix(p)]
+        if to_check:
+            stat_result = p4CmdList(["-x", "-", "fstat", "-T",
+                "depotFile,headAction,headRev,headType"], stdin=to_check)
+            for record in stat_result:
+                if record['code'] != 'stat':
+                    continue
+                if record['headAction'] in self.delete_actions:
+                    continue
+                files.append({
+                    'action': 'add',
+                    'path': record['depotFile'],
+                    'rev': record['headRev'],
+                    'type': record['headType']})
+
     def commit(self, details, files, branch, parent = "", allow_empty=False):
         epoch = details["time"]
         author = details["user"]
@@ -3029,11 +3262,14 @@ class P4Sync(Command, P4UserMap):
         if self.verbose:
             print('commit into {0}'.format(branch))
 
+        files = [f for f in files
+            if self.hasBranchPrefix(decode_path(f['path']))]
+        self.findShadowedFiles(files, details['change'])
+
         if self.clientSpecDirs:
             self.clientSpecDirs.update_client_spec_path_cache(files)
 
-        files = [f for f in files
-            if self.inClientSpec(f['path']) and self.hasBranchPrefix(f['path'])]
+        files = [f for f in files if self.inClientSpec(decode_path(f['path']))]
 
         if gitConfigBool('git-p4.keepEmptyCommits'):
             allow_empty = True
@@ -3367,19 +3603,18 @@ class P4Sync(Command, P4UserMap):
         return True
 
     def searchParent(self, parent, branch, target):
-        parentFound = False
-        for blob in read_pipe_lines(["git", "rev-list", "--reverse",
+        targetTree = read_pipe(["git", "rev-parse",
+                                "{}^{{tree}}".format(target)]).strip()
+        for line in read_pipe_lines(["git", "rev-list", "--format=%H %T",
                                      "--no-merges", parent]):
-            blob = blob.strip()
-            if len(read_pipe(["git", "diff-tree", blob, target])) == 0:
-                parentFound = True
+            if line.startswith("commit "):
+                continue
+            commit, tree = line.strip().split(" ")
+            if tree == targetTree:
                 if self.verbose:
-                    print("Found parent of %s in commit %s" % (branch, blob))
-                break
-        if parentFound:
-            return blob
-        else:
-            return None
+                    print("Found parent of %s in commit %s" % (branch, commit))
+                return commit
+        return None
 
     def importChanges(self, changes, origin_revision=0):
         cnt = 1
@@ -3528,6 +3763,74 @@ class P4Sync(Command, P4UserMap):
             print("IO error details: {}".format(err))
             print(self.gitError.read())
 
+
+    def importRevisions(self, args, branch_arg_given):
+        changes = []
+
+        if len(self.changesFile) > 0:
+            with open(self.changesFile) as f:
+                output = f.readlines()
+            changeSet = set()
+            for line in output:
+                changeSet.add(int(line))
+
+            for change in changeSet:
+                changes.append(change)
+
+            changes.sort()
+        else:
+            # catch "git p4 sync" with no new branches, in a repo that
+            # does not have any existing p4 branches
+            if len(args) == 0:
+                if not self.p4BranchesInGit:
+                    raise P4CommandException("No remote p4 branches.  Perhaps you never did \"git p4 clone\" in here.")
+
+                # The default branch is master, unless --branch is used to
+                # specify something else.  Make sure it exists, or complain
+                # nicely about how to use --branch.
+                if not self.detectBranches:
+                    if not branch_exists(self.branch):
+                        if branch_arg_given:
+                            raise P4CommandException("Error: branch %s does not exist." % self.branch)
+                        else:
+                            raise P4CommandException("Error: no branch %s; perhaps specify one with --branch." %
+                                self.branch)
+
+            if self.verbose:
+                print("Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
+                                                          self.changeRange))
+            changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)
+
+            if len(self.maxChanges) > 0:
+                changes = changes[:min(int(self.maxChanges), len(changes))]
+
+        if len(changes) == 0:
+            if not self.silent:
+                print("No changes to import!")
+        else:
+            if not self.silent and not self.detectBranches:
+                print("Import destination: %s" % self.branch)
+
+            self.updatedBranches = set()
+
+            if not self.detectBranches:
+                if args:
+                    # start a new branch
+                    self.initialParent = ""
+                else:
+                    # build on a previous revision
+                    self.initialParent = parseRevision(self.branch)
+
+            self.importChanges(changes)
+
+            if not self.silent:
+                print("")
+                if len(self.updatedBranches) > 0:
+                    sys.stdout.write("Updated branches: ")
+                    for b in self.updatedBranches:
+                        sys.stdout.write("%s " % b)
+                    sys.stdout.write("\n")
+
     def openStreams(self):
         self.importProcess = subprocess.Popen(["git", "fast-import"],
                                               stdin=subprocess.PIPE,
@@ -3537,12 +3840,24 @@ class P4Sync(Command, P4UserMap):
         self.gitStream = self.importProcess.stdin
         self.gitError = self.importProcess.stderr
 
+        if bytes is not str:
+            # Wrap gitStream.write() so that it can be called using `str` arguments
+            def make_encoded_write(write):
+                def encoded_write(s):
+                    return write(s.encode() if isinstance(s, str) else s)
+                return encoded_write
+
+            self.gitStream.write = make_encoded_write(self.gitStream.write)
+
     def closeStreams(self):
+        if self.gitStream is None:
+            return
         self.gitStream.close()
         if self.importProcess.wait() != 0:
             die("fast-import failed: %s" % self.gitError.read())
         self.gitOutput.close()
         self.gitError.close()
+        self.gitStream = None
 
     def run(self, args):
         if self.importIntoRemotes:
@@ -3726,87 +4041,36 @@ class P4Sync(Command, P4UserMap):
                     b = b[len(self.projectName):]
                 self.createdBranches.add(b)
 
-        self.openStreams()
-
-        if revision:
-            self.importHeadRevision(revision)
-        else:
-            changes = []
-
-            if len(self.changesFile) > 0:
-                output = open(self.changesFile).readlines()
-                changeSet = set()
-                for line in output:
-                    changeSet.add(int(line))
-
-                for change in changeSet:
-                    changes.append(change)
-
-                changes.sort()
-            else:
-                # catch "git p4 sync" with no new branches, in a repo that
-                # does not have any existing p4 branches
-                if len(args) == 0:
-                    if not self.p4BranchesInGit:
-                        die("No remote p4 branches.  Perhaps you never did \"git p4 clone\" in here.")
-
-                    # The default branch is master, unless --branch is used to
-                    # specify something else.  Make sure it exists, or complain
-                    # nicely about how to use --branch.
-                    if not self.detectBranches:
-                        if not branch_exists(self.branch):
-                            if branch_arg_given:
-                                die("Error: branch %s does not exist." % self.branch)
-                            else:
-                                die("Error: no branch %s; perhaps specify one with --branch." %
-                                    self.branch)
+        p4_check_access()
 
-                if self.verbose:
-                    print("Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),
-                                                              self.changeRange))
-                changes = p4ChangesForPaths(self.depotPaths, self.changeRange, self.changes_block_size)
+        self.openStreams()
 
-                if len(self.maxChanges) > 0:
-                    changes = changes[:min(int(self.maxChanges), len(changes))]
+        err = None
 
-            if len(changes) == 0:
-                if not self.silent:
-                    print("No changes to import!")
+        try:
+            if revision:
+                self.importHeadRevision(revision)
             else:
-                if not self.silent and not self.detectBranches:
-                    print("Import destination: %s" % self.branch)
+                self.importRevisions(args, branch_arg_given)
 
-                self.updatedBranches = set()
+            if gitConfigBool("git-p4.importLabels"):
+                self.importLabels = True
 
-                if not self.detectBranches:
-                    if args:
-                        # start a new branch
-                        self.initialParent = ""
-                    else:
-                        # build on a previous revision
-                        self.initialParent = parseRevision(self.branch)
+            if self.importLabels:
+                p4Labels = getP4Labels(self.depotPaths)
+                gitTags = getGitTags()
 
-                self.importChanges(changes)
+                missingP4Labels = p4Labels - gitTags
+                self.importP4Labels(self.gitStream, missingP4Labels)
 
-                if not self.silent:
-                    print("")
-                    if len(self.updatedBranches) > 0:
-                        sys.stdout.write("Updated branches: ")
-                        for b in self.updatedBranches:
-                            sys.stdout.write("%s " % b)
-                        sys.stdout.write("\n")
-
-        if gitConfigBool("git-p4.importLabels"):
-            self.importLabels = True
-
-        if self.importLabels:
-            p4Labels = getP4Labels(self.depotPaths)
-            gitTags = getGitTags()
+        except P4CommandException as e:
+            err = e
 
-            missingP4Labels = p4Labels - gitTags
-            self.importP4Labels(self.gitStream, missingP4Labels)
+        finally:
+            self.closeStreams()
 
-        self.closeStreams()
+        if err:
+            die(str(err))
 
         # Cleanup temporary branches created during import
         if self.tempBranches != []:
@@ -3924,7 +4188,7 @@ class P4Clone(P4Sync):
 
         # create a master branch and check out a work tree
         if gitBranchExists(self.branch):
-            system([ "git", "branch", "master", self.branch ])
+            system([ "git", "branch", currentGitBranch(), self.branch ])
             if not self.cloneBare:
                 system([ "git", "checkout", "-f" ])
         else:
@@ -3975,7 +4239,7 @@ class P4Unshelve(Command):
         """
 
         for parent in (range(65535)):
-            log = extractLogMessageFromGitCommit("{0}^{1}".format(starting_point, parent))
+            log = extractLogMessageFromGitCommit("{0}~{1}".format(starting_point, parent))
             settings = extractSettingsGitLog(log)
             if 'change' in settings:
                 return settings
@@ -4110,7 +4374,6 @@ commands = {
     "unshelve" : P4Unshelve,
 }
 
-
 def main():
     if len(sys.argv[1:]) == 0:
         printUsage(commands.keys())
@@ -4140,7 +4403,12 @@ def main():
                                    description = cmd.description,
                                    formatter = HelpFormatter())
 
-    (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
+    try:
+        (cmd, args) = parser.parse_args(sys.argv[2:], cmd);
+    except:
+        parser.print_help()
+        raise
+
     global verbose
     verbose = cmd.verbose
     if cmd.needsGit:
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
deleted file mode 100644
index d3c39980f3..0000000000
--- a/git-parse-remote.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-# This is a shell library to calculate the remote repository and
-# upstream branch that should be pulled by "git pull" from the current
-# branch.
-
-# git-ls-remote could be called from outside a git managed repository;
-# this would fail in that case and would issue an error message.
-GIT_DIR=$(git rev-parse -q --git-dir) || :;
-
-get_default_remote () {
-	curr_branch=$(git symbolic-ref -q HEAD)
-	curr_branch="${curr_branch#refs/heads/}"
-	origin=$(git config --get "branch.$curr_branch.remote")
-	echo ${origin:-origin}
-}
-
-get_remote_merge_branch () {
-	case "$#" in
-	0|1)
-	    origin="$1"
-	    default=$(get_default_remote)
-	    test -z "$origin" && origin=$default
-	    curr_branch=$(git symbolic-ref -q HEAD) &&
-	    [ "$origin" = "$default" ] &&
-	    echo $(git for-each-ref --format='%(upstream)' $curr_branch)
-	    ;;
-	*)
-	    repo=$1
-	    shift
-	    ref=$1
-	    # FIXME: It should return the tracking branch
-	    #        Currently only works with the default mapping
-	    case "$ref" in
-	    +*)
-		ref=$(expr "z$ref" : 'z+\(.*\)')
-		;;
-	    esac
-	    expr "z$ref" : 'z.*:' >/dev/null || ref="${ref}:"
-	    remote=$(expr "z$ref" : 'z\([^:]*\):')
-	    case "$remote" in
-	    '' | HEAD ) remote=HEAD ;;
-	    heads/*) remote=${remote#heads/} ;;
-	    refs/heads/*) remote=${remote#refs/heads/} ;;
-	    refs/* | tags/* | remotes/* ) remote=
-	    esac
-	    [ -n "$remote" ] && case "$repo" in
-		.)
-		    echo "refs/heads/$remote"
-		    ;;
-		*)
-		    echo "refs/remotes/$repo/$remote"
-		    ;;
-	    esac
-	esac
-}
-
-error_on_missing_default_upstream () {
-	cmd="$1"
-	op_type="$2"
-	op_prep="$3" # FIXME: op_prep is no longer used
-	example="$4"
-	branch_name=$(git symbolic-ref -q HEAD)
-	display_branch_name="${branch_name#refs/heads/}"
-	# If there's only one remote, use that in the suggestion
-	remote="$(gettext "<remote>")"
-	branch="$(gettext "<branch>")"
-	if test $(git remote | wc -l) = 1
-	then
-		remote=$(git remote)
-	fi
-
-	if test -z "$branch_name"
-	then
-		gettextln "You are not currently on a branch."
-	else
-		gettextln "There is no tracking information for the current branch."
-	fi
-	case "$op_type" in
-	rebase)
-		gettextln "Please specify which branch you want to rebase against."
-		;;
-	merge)
-		gettextln "Please specify which branch you want to merge with."
-		;;
-	*)
-		echo >&2 "BUG: unknown operation type: $op_type"
-		exit 1
-		;;
-	esac
-	eval_gettextln "See git-\${cmd}(1) for details."
-	echo
-	echo "    $example"
-	echo
-	if test -n "$branch_name"
-	then
-		gettextln "If you wish to set tracking information for this branch you can do so with:"
-		echo
-		echo "    git branch --set-upstream-to=$remote/$branch $display_branch_name"
-		echo
-	fi
-	exit 1
-}
diff --git a/git-rebase--preserve-merges.sh b/git-rebase--preserve-merges.sh
index dec90e9af6..b9c71d2a71 100644
--- a/git-rebase--preserve-merges.sh
+++ b/git-rebase--preserve-merges.sh
@@ -193,16 +193,6 @@ mark_action_done () {
 	fi
 }
 
-# Put the last action marked done at the beginning of the todo list
-# again. If there has not been an action marked done yet, leave the list of
-# items on the todo list unchanged.
-reschedule_last_action () {
-	tail -n 1 "$done" | cat - "$todo" >"$todo".new
-	sed -e \$d <"$done" >"$done".new
-	mv -f "$todo".new "$todo"
-	mv -f "$done".new "$done"
-}
-
 append_todo_help () {
 	gettext "
 Commands:
diff --git a/git-send-email.perl b/git-send-email.perl
index 5f92c89c1c..e65d969d0b 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -18,21 +18,11 @@
 
 use 5.008;
 use strict;
-use warnings;
-use POSIX qw/strftime/;
-use Term::ReadLine;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use Getopt::Long;
-use Text::ParseWords;
-use Term::ANSIColor;
-use File::Temp qw/ tempdir tempfile /;
-use File::Spec::Functions qw(catdir catfile);
 use Git::LoadCPAN::Error qw(:try);
-use Cwd qw(abs_path cwd);
 use Git;
 use Git::I18N;
-use Net::Domain ();
-use Net::SMTP ();
-use Git::LoadCPAN::Mail::Address;
 
 Getopt::Long::Configure qw/ pass_through /;
 
@@ -70,6 +60,7 @@ git send-email --dump-aliases
 
   Sending:
     --envelope-sender       <str>  * Email envelope sender.
+    --sendmail-cmd          <str>  * Command to run to send email.
     --smtp-server       <str:int>  * Outgoing SMTP server to use. The port
                                      is optional. Default 'localhost'.
     --smtp-server-option    <str>  * Outgoing SMTP server option to use.
@@ -166,7 +157,6 @@ sub format_2822_time {
 		       );
 }
 
-my $have_email_valid = eval { require Email::Valid; 1 };
 my $smtp;
 my $auth;
 my $num_sent = 0;
@@ -192,14 +182,6 @@ my (@config_bcc, @getopt_bcc);
 
 my $repo = eval { Git->repository() };
 my @repo = $repo ? ($repo) : ();
-my $term = eval {
-	$ENV{"GIT_SEND_EMAIL_NOTTY"}
-		? new Term::ReadLine 'git-send-email', \*STDIN, \*STDOUT
-		: new Term::ReadLine 'git-send-email';
-};
-if ($@) {
-	$term = new FakeTerm "$@: going non-interactive";
-}
 
 # Behavior modification variables
 my ($quiet, $dry_run) = (0, 0);
@@ -212,22 +194,41 @@ my $dump_aliases = 0;
 my $multiedit;
 my $editor;
 
+sub system_or_msg {
+	my ($args, $msg) = @_;
+	system(@$args);
+	my $signalled = $? & 127;
+	my $exit_code = $? >> 8;
+	return unless $signalled or $exit_code;
+
+	my @sprintf_args = ($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
+		# "no warnings 'redundant'", since that category was
+		# introduced in perl 5.22, and asking for it will die
+		# on older perls.
+		no warnings;
+		return sprintf($msg, @sprintf_args);
+	}
+	return sprintf(__("fatal: command '%s' died with exit code %d"),
+		       @sprintf_args);
+}
+
+sub system_or_die {
+	my $msg = system_or_msg(@_);
+	die $msg if $msg;
+}
+
 sub do_edit {
 	if (!defined($editor)) {
 		$editor = Git::command_oneline('var', 'GIT_EDITOR');
 	}
+	my $die_msg = __("the editor exited uncleanly, aborting everything");
 	if (defined($multiedit) && !$multiedit) {
-		map {
-			system('sh', '-c', $editor.' "$@"', $editor, $_);
-			if (($? & 127) || ($? >> 8)) {
-				die(__("the editor exited uncleanly, aborting everything"));
-			}
-		} @_;
+		system_or_die(['sh', '-c', $editor.' "$@"', $editor, $_], $die_msg) for @_;
 	} else {
-		system('sh', '-c', $editor.' "$@"', $editor, @_);
-		if (($? & 127) || ($? >> 8)) {
-			die(__("the editor exited uncleanly, aborting everything"));
-		}
+		system_or_die(['sh', '-c', $editor.' "$@"', $editor, @_], $die_msg);
 	}
 }
 
@@ -243,6 +244,7 @@ my ($confirm);
 my (@suppress_cc);
 my ($auto_8bit_encoding);
 my ($compose_encoding);
+my ($sendmail_cmd);
 # Variables with corresponding config settings & hardcoded defaults
 my ($debug_net_smtp) = 0;		# Net::SMTP, see send_message()
 my $thread = 1;
@@ -250,6 +252,7 @@ my $chain_reply_to = 0;
 my $use_xmailer = 1;
 my $validate = 1;
 my $target_xfer_encoding = 'auto';
+my $forbid_sendmail_variables = 1;
 
 my %config_bool_settings = (
     "thread" => \$thread,
@@ -263,9 +266,11 @@ my %config_bool_settings = (
     "multiedit" => \$multiedit,
     "annotate" => \$annotate,
     "xmailer" => \$use_xmailer,
+    "forbidsendmailvariables" => \$forbid_sendmail_variables,
 );
 
 my %config_settings = (
+    "smtpencryption" => \$smtp_encryption,
     "smtpserver" => \$smtp_server,
     "smtpserverport" => \$smtp_server_port,
     "smtpserveroption" => \@smtp_server_options,
@@ -288,6 +293,7 @@ my %config_settings = (
     "assume8bitencoding" => \$auto_8bit_encoding,
     "composeencoding" => \$compose_encoding,
     "transferencoding" => \$target_xfer_encoding,
+    "sendmailcmd" => \$sendmail_cmd,
 );
 
 my %config_path_settings = (
@@ -297,9 +303,9 @@ my %config_path_settings = (
 
 # Handle Uncouth Termination
 sub signal_handler {
-
 	# Make text normal
-	print color("reset"), "\n";
+	require Term::ANSIColor;
+	print Term::ANSIColor::color("reset"), "\n";
 
 	# SMTP password masked
 	system "stty echo";
@@ -325,11 +331,17 @@ $SIG{INT}  = \&signal_handler;
 
 # Read our sendemail.* config
 sub read_config {
-	my ($configured, $prefix) = @_;
+	my ($known_keys, $configured, $prefix) = @_;
 
 	foreach my $setting (keys %config_bool_settings) {
 		my $target = $config_bool_settings{$setting};
-		my $v = Git::config_bool(@repo, "$prefix.$setting");
+		my $key = "$prefix.$setting";
+		next unless exists $known_keys->{$key};
+		my $v = (@{$known_keys->{$key}} == 1 &&
+			 (defined $known_keys->{$key}->[0] &&
+			  $known_keys->{$key}->[0] =~ /^(?:true|false)$/s))
+			? $known_keys->{$key}->[0] eq 'true'
+			: Git::config_bool(@repo, $key);
 		next unless defined $v;
 		next if $configured->{$setting}++;
 		$$target = $v;
@@ -337,8 +349,10 @@ sub read_config {
 
 	foreach my $setting (keys %config_path_settings) {
 		my $target = $config_path_settings{$setting};
+		my $key = "$prefix.$setting";
+		next unless exists $known_keys->{$key};
 		if (ref($target) eq "ARRAY") {
-			my @values = Git::config_path(@repo, "$prefix.$setting");
+			my @values = Git::config_path(@repo, $key);
 			next unless @values;
 			next if $configured->{$setting}++;
 			@$target = @values;
@@ -353,36 +367,64 @@ sub read_config {
 
 	foreach my $setting (keys %config_settings) {
 		my $target = $config_settings{$setting};
+		my $key = "$prefix.$setting";
+		next unless exists $known_keys->{$key};
 		if (ref($target) eq "ARRAY") {
-			my @values = Git::config(@repo, "$prefix.$setting");
-			next unless @values;
+			my @values = @{$known_keys->{$key}};
+			@values = grep { defined } @values;
 			next if $configured->{$setting}++;
 			@$target = @values;
 		}
 		else {
-			my $v = Git::config(@repo, "$prefix.$setting");
+			my $v = $known_keys->{$key}->[0];
 			next unless defined $v;
 			next if $configured->{$setting}++;
 			$$target = $v;
 		}
 	}
+}
 
-	if (!defined $smtp_encryption) {
-		my $setting = "$prefix.smtpencryption";
-		my $enc = Git::config(@repo, $setting);
-		return unless defined $enc;
-		return if $configured->{$setting}++;
-		if (defined $enc) {
-			$smtp_encryption = $enc;
-		} elsif (Git::config_bool(@repo, "$prefix.smtpssl")) {
-			$smtp_encryption = 'ssl';
-		}
+sub config_regexp {
+	my ($regex) = @_;
+	my @ret;
+	eval {
+		my $ret = Git::command(
+			'config',
+			'--null',
+			'--get-regexp',
+			$regex,
+		);
+		@ret = map {
+			# We must always return ($k, $v) here, since
+			# empty config values will be just "key\0",
+			# not "key\nvalue\0".
+			my ($k, $v) = split /\n/, $_, 2;
+			($k, $v);
+		} split /\0/, $ret;
+		1;
+	} or do {
+		# If we have no keys we're OK, otherwise re-throw
+		die $@ if $@->value != 1;
+	};
+	return @ret;
+}
+
+# Save ourselves a lot of work of shelling out to 'git config' (it
+# parses 'bool' etc.) by only doing so for config keys that exist.
+my %known_config_keys;
+{
+	my @kv = config_regexp("^sende?mail[.]");
+	while (my ($k, $v) = splice @kv, 0, 2) {
+		push @{$known_config_keys{$k}} => $v;
 	}
 }
 
 # sendemail.identity yields to --identity. We must parse this
 # special-case first before the rest of the config is read.
-$identity = Git::config(@repo, "sendemail.identity");
+{
+	my $key = "sendemail.identity";
+	$identity = Git::config(@repo, $key) if exists $known_config_keys{$key};
+}
 my $rc = GetOptions(
 	"identity=s" => \$identity,
 	"no-identity" => \$no_identity,
@@ -393,8 +435,8 @@ undef $identity if $no_identity;
 # Now we know enough to read the config
 {
     my %configured;
-    read_config(\%configured, "sendemail.$identity") if defined $identity;
-    read_config(\%configured, "sendemail");
+    read_config(\%known_config_keys, \%configured, "sendemail.$identity") if defined $identity;
+    read_config(\%known_config_keys, \%configured, "sendemail");
 }
 
 # Begin by accumulating all the variables (defined above), that we will end up
@@ -421,6 +463,7 @@ $rc = GetOptions(
 		    "no-bcc" => \$no_bcc,
 		    "chain-reply-to!" => \$chain_reply_to,
 		    "no-chain-reply-to" => sub {$chain_reply_to = 0},
+		    "sendmail-cmd=s" => \$sendmail_cmd,
 		    "smtp-server=s" => \$smtp_server,
 		    "smtp-server-option=s" => \@smtp_server_options,
 		    "smtp-server-port=s" => \$smtp_server_port,
@@ -478,6 +521,12 @@ unless ($rc) {
     usage();
 }
 
+if ($forbid_sendmail_variables && grep { /^sendmail/s } keys %known_config_keys) {
+	die __("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");
+}
+
 die __("Cannot run git format-patch from outside a repository\n")
 	if $format_patch and not $repo;
 
@@ -537,15 +586,27 @@ if (0) {
 }
 
 my ($repoauthor, $repocommitter);
-($repoauthor) = Git::ident_person(@repo, 'author');
-($repocommitter) = Git::ident_person(@repo, 'committer');
+{
+	my %cache;
+	my ($author, $committer);
+	my $common = sub {
+		my ($what) = @_;
+		return $cache{$what} if exists $cache{$what};
+		($cache{$what}) = Git::ident_person(@repo, $what);
+		return $cache{$what};
+	};
+	$repoauthor = sub { $common->('author') };
+	$repocommitter = sub { $common->('committer') };
+}
 
 sub parse_address_line {
+	require Git::LoadCPAN::Mail::Address;
 	return map { $_->format } Mail::Address->parse($_[0]);
 }
 
 sub split_addrs {
-	return quotewords('\s*,\s*', 1, @_);
+	require Text::ParseWords;
+	return Text::ParseWords::quotewords('\s*,\s*', 1, @_);
 }
 
 my %aliases;
@@ -594,10 +655,11 @@ my %parse_alias = (
 			s/\\"/"/g foreach @addr;
 			$aliases{$alias} = \@addr
 		}}},
-	mailrc => sub { my $fh = shift; while (<$fh>) {
+	mailrc => sub {	my $fh = shift; while (<$fh>) {
 		if (/^alias\s+(\S+)\s+(.*?)\s*$/) {
+			require Text::ParseWords;
 			# spaces delimit multiple addresses
-			$aliases{$1} = [ quotewords('\s+', 0, $2) ];
+			$aliases{$1} = [ Text::ParseWords::quotewords('\s+', 0, $2) ];
 		}}},
 	pine => sub { my $fh = shift; my $f='\t[^\t]*';
 	        for (my $x = ''; defined($x); $x = $_) {
@@ -645,7 +707,7 @@ sub is_format_patch_arg {
 		if (defined($format_patch)) {
 			return $format_patch;
 		}
-		die sprintf(__ <<EOF, $f, $f);
+		die sprintf(__(<<EOF), $f, $f);
 File '%s' exists but it could also be the range of commits
 to produce patches for.  Please disambiguate by...
 
@@ -669,7 +731,8 @@ while (defined(my $f = shift @ARGV)) {
 		opendir my $dh, $f
 			or die sprintf(__("Failed to opendir %s: %s"), $f, $!);
 
-		push @files, grep { -f $_ } map { catfile($f, $_) }
+		require File::Spec;
+		push @files, grep { -f $_ } map { File::Spec->catfile($f, $_) }
 				sort readdir $dh;
 		closedir $dh;
 	} elsif ((-f $f or -p $f) and !is_format_patch_arg($f)) {
@@ -682,7 +745,8 @@ while (defined(my $f = shift @ARGV)) {
 if (@rev_list_opts) {
 	die __("Cannot run git format-patch from outside a repository\n")
 		unless $repo;
-	push @files, $repo->command('format-patch', '-o', tempdir(CLEANUP => 1), @rev_list_opts);
+	require File::Temp;
+	push @files, $repo->command('format-patch', '-o', File::Temp::tempdir(CLEANUP => 1), @rev_list_opts);
 }
 
 @files = handle_backup_files(@files);
@@ -690,9 +754,7 @@ if (@rev_list_opts) {
 if ($validate) {
 	foreach my $f (@files) {
 		unless (-p $f) {
-			my $error = validate_patch($f, $target_xfer_encoding);
-			$error and die sprintf(__("fatal: %s: %s\nwarning: no patches were sent\n"),
-						  $f, $error);
+			validate_patch($f, $target_xfer_encoding);
 		}
 	}
 }
@@ -721,19 +783,20 @@ sub get_patch_subject {
 if ($compose) {
 	# Note that this does not need to be secure, but we will make a small
 	# effort to have it be unique
+	require File::Temp;
 	$compose_filename = ($repo ?
-		tempfile(".gitsendemail.msg.XXXXXX", DIR => $repo->repo_path()) :
-		tempfile(".gitsendemail.msg.XXXXXX", DIR => "."))[1];
+		File::Temp::tempfile(".gitsendemail.msg.XXXXXX", DIR => $repo->repo_path()) :
+		File::Temp::tempfile(".gitsendemail.msg.XXXXXX", DIR => "."))[1];
 	open my $c, ">", $compose_filename
 		or die sprintf(__("Failed to open for writing %s: %s"), $compose_filename, $!);
 
 
-	my $tpl_sender = $sender || $repoauthor || $repocommitter || '';
+	my $tpl_sender = $sender || $repoauthor->() || $repocommitter->() || '';
 	my $tpl_subject = $initial_subject || '';
 	my $tpl_in_reply_to = $initial_in_reply_to || '';
 	my $tpl_reply_to = $reply_to || '';
 
-	print $c <<EOT1, Git::prefix_lines("GIT: ", __ <<EOT2), <<EOT3;
+	print $c <<EOT1, Git::prefix_lines("GIT: ", __(<<EOT2)), <<EOT3;
 From $tpl_sender # This line is ignored.
 EOT1
 Lines beginning in "GIT:" will be removed.
@@ -830,6 +893,19 @@ EOT3
 	do_edit(@files);
 }
 
+sub term {
+	my $term = eval {
+		require Term::ReadLine;
+		$ENV{"GIT_SEND_EMAIL_NOTTY"}
+			? Term::ReadLine->new('git-send-email', \*STDIN, \*STDOUT)
+			: Term::ReadLine->new('git-send-email');
+	};
+	if ($@) {
+		$term = FakeTerm->new("$@: going non-interactive");
+	}
+	return $term;
+}
+
 sub ask {
 	my ($prompt, %arg) = @_;
 	my $valid_re = $arg{valid_re};
@@ -837,6 +913,7 @@ sub ask {
 	my $confirm_only = $arg{confirm_only};
 	my $resp;
 	my $i = 0;
+	my $term = term();
 	return defined $default ? $default : undef
 		unless defined $term->IN and defined fileno($term->IN) and
 		       defined $term->OUT and defined fileno($term->OUT);
@@ -934,7 +1011,7 @@ if (defined $sender) {
 	$sender =~ s/^\s+|\s+$//g;
 	($sender) = expand_aliases($sender);
 } else {
-	$sender = $repoauthor || $repocommitter || '';
+	$sender = $repoauthor->() || $repocommitter->() || '';
 }
 
 # $sender could be an already sanitized address
@@ -988,16 +1065,19 @@ if (defined $reply_to) {
 	$reply_to = sanitize_address($reply_to);
 }
 
-if (!defined $smtp_server) {
+if (!defined $sendmail_cmd && !defined $smtp_server) {
 	my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail );
 	push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH};
 	foreach (@sendmail_paths) {
 		if (-x $_) {
-			$smtp_server = $_;
+			$sendmail_cmd = $_;
 			last;
 		}
 	}
-	$smtp_server ||= 'localhost'; # could be 127.0.0.1, too... *shrug*
+
+	if (!defined $sendmail_cmd) {
+		$smtp_server = 'localhost'; # could be 127.0.0.1, too... *shrug*
+	}
 }
 
 if ($compose && $compose > 0) {
@@ -1017,6 +1097,7 @@ sub extract_valid_address {
 	return $address if ($address =~ /^($local_part_regexp)$/);
 
 	$address =~ s/^\s*<(.*)>\s*$/$1/;
+	my $have_email_valid = eval { require Email::Valid; 1 };
 	if ($have_email_valid) {
 		return scalar Email::Valid->address($address);
 	}
@@ -1076,14 +1157,15 @@ my ($message_id_stamp, $message_id_serial);
 sub make_message_id {
 	my $uniq;
 	if (!defined $message_id_stamp) {
-		$message_id_stamp = strftime("%Y%m%d%H%M%S.$$", gmtime(time));
+		require POSIX;
+		$message_id_stamp = POSIX::strftime("%Y%m%d%H%M%S.$$", gmtime(time));
 		$message_id_serial = 0;
 	}
 	$message_id_serial++;
 	$uniq = "$message_id_stamp-$message_id_serial";
 
 	my $du_part;
-	for ($sender, $repocommitter, $repoauthor) {
+	for ($sender, $repocommitter->(), $repoauthor->()) {
 		$du_part = extract_valid_address(sanitize_address($_));
 		last if (defined $du_part and $du_part ne '');
 	}
@@ -1228,7 +1310,7 @@ sub process_address_list {
 # domain name that corresponds the IP address in the HELO/EHLO
 # handshake. This is used to verify the connection and prevent
 # spammers from trying to hide their identity. If the DNS and IP don't
-# match, the receiveing MTA may deny the connection.
+# match, the receiving MTA may deny the connection.
 #
 # Here is a deny example of Net::SMTP with the default "localhost.localdomain"
 #
@@ -1246,6 +1328,7 @@ sub valid_fqdn {
 sub maildomain_net {
 	my $maildomain;
 
+	require Net::Domain;
 	my $domain = Net::Domain::domainname();
 	$maildomain = $domain if valid_fqdn($domain);
 
@@ -1256,6 +1339,7 @@ sub maildomain_mta {
 	my $maildomain;
 
 	for my $host (qw(mailhost localhost)) {
+		require Net::SMTP;
 		my $smtp = Net::SMTP->new($host);
 		if (defined $smtp) {
 			my $domain = $smtp->domain;
@@ -1477,11 +1561,17 @@ EOF
 
 	if ($dry_run) {
 		# We don't want to send the email.
-	} elsif (file_name_is_absolute($smtp_server)) {
+	} elsif (defined $sendmail_cmd || file_name_is_absolute($smtp_server)) {
 		my $pid = open my $sm, '|-';
 		defined $pid or die $!;
 		if (!$pid) {
-			exec($smtp_server, @sendmail_parameters) or die $!;
+			if (defined $sendmail_cmd) {
+				exec ("sh", "-c", "$sendmail_cmd \"\$@\"", "-", @sendmail_parameters)
+					or die $!;
+			} else {
+				exec ($smtp_server, @sendmail_parameters)
+					or die $!;
+			}
 		}
 		print $sm "$header\n$message";
 		close $sm or die $!;
@@ -1577,14 +1667,21 @@ EOF
 		printf($dry_run ? __("Dry-Sent %s\n") : __("Sent %s\n"), $subject);
 	} else {
 		print($dry_run ? __("Dry-OK. Log says:\n") : __("OK. Log says:\n"));
-		if (!file_name_is_absolute($smtp_server)) {
+		if (!defined $sendmail_cmd && !file_name_is_absolute($smtp_server)) {
 			print "Server: $smtp_server\n";
 			print "MAIL FROM:<$raw_from>\n";
 			foreach my $entry (@recipients) {
 			    print "RCPT TO:<$entry>\n";
 			}
 		} else {
-			print "Sendmail: $smtp_server ".join(' ',@sendmail_parameters)."\n";
+			my $sm;
+			if (defined $sendmail_cmd) {
+				$sm = $sendmail_cmd;
+			} else {
+				$sm = $smtp_server;
+			}
+
+			print "Sendmail: $sm ".join(' ',@sendmail_parameters)."\n";
 		}
 		print $header, "\n";
 		if ($smtp) {
@@ -1699,10 +1796,14 @@ sub process_file {
 				$xfer_encoding = $1 if not defined $xfer_encoding;
 			}
 			elsif (/^In-Reply-To: (.*)/i) {
-				$in_reply_to = $1;
+				if (!$initial_in_reply_to || $thread) {
+					$in_reply_to = $1;
+				}
 			}
 			elsif (/^References: (.*)/i) {
-				$references = $1;
+				if (!$initial_in_reply_to || $thread) {
+					$references = $1;
+				}
 			}
 			elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) {
 				push @xh, $_;
@@ -1930,21 +2031,27 @@ sub validate_patch {
 	my ($fn, $xfer_encoding) = @_;
 
 	if ($repo) {
-		my $validate_hook = catfile(catdir($repo->repo_path(), 'hooks'),
+		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 $hook_error;
 		if (-x $validate_hook) {
-			my $target = abs_path($fn);
+			require Cwd;
+			my $target = Cwd::abs_path($fn);
 			# The hook needs a correct cwd and GIT_DIR.
-			my $cwd_save = cwd();
+			my $cwd_save = Cwd::getcwd();
 			chdir($repo->wc_path() or $repo->repo_path())
 				or die("chdir: $!");
 			local $ENV{"GIT_DIR"} = $repo->repo_path();
-			$hook_error = "rejected by sendemail-validate hook"
-				if system($validate_hook, $target);
+			$hook_error = system_or_msg([$validate_hook, $target]);
 			chdir($cwd_save) or die("chdir: $!");
 		}
-		return $hook_error if $hook_error;
+		if ($hook_error) {
+			die sprintf(__("fatal: %s: rejected by sendemail-validate hook\n" .
+				       "%s\n" .
+				       "warning: no patches were sent\n"), $fn, $hook_error);
+		}
 	}
 
 	# Any long lines will be automatically fixed if we use a suitable transfer
@@ -1954,7 +2061,8 @@ sub validate_patch {
 			or die sprintf(__("unable to open %s: %s\n"), $fn, $!);
 		while (my $line = <$fh>) {
 			if (length($line) > 998) {
-				return sprintf(__("%s: patch contains a line longer than 998 characters"), $.);
+				die sprintf(__("fatal: %s:%d is longer than 998 characters\n" .
+					       "warning: no patches were sent\n"), $fn, $.);
 			}
 		}
 	}
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index 8eef60b43f..e3d9f4836d 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -17,12 +17,7 @@ export TEXTDOMAINDIR
 
 # First decide what scheme to use...
 GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "$GIT_TEST_GETTEXT_POISON" &&
-	    git env--helper --type=bool --default=0 --exit-code \
-		GIT_TEST_GETTEXT_POISON
-then
-	GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
-elif test -n "@@USE_GETTEXT_SCHEME@@"
+if test -n "@@USE_GETTEXT_SCHEME@@"
 then
 	GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
 elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
@@ -63,21 +58,6 @@ gettext_without_eval_gettext)
 		)
 	}
 	;;
-poison)
-	# Emit garbage so that tests that incorrectly rely on translatable
-	# strings will fail.
-	gettext () {
-		printf "%s" "# GETTEXT POISON #"
-	}
-
-	eval_gettext () {
-		printf "%s" "# GETTEXT POISON #"
-	}
-
-	eval_ngettext () {
-		printf "%s" "# GETTEXT POISON #"
-	}
-	;;
 *)
 	gettext () {
 		printf "%s" "$1"
diff --git a/git-submodule.sh b/git-submodule.sh
index c7f58c5756..dbd2ec2050 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -10,8 +10,9 @@ USAGE="[--quiet] [--cached]
    or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...]
    or: $dashless [--quiet] init [--] [<path>...]
    or: $dashless [--quiet] deinit [-f|--force] (--all| [--] <path>...)
-   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--] [<path>...]
+   or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--checkout|--merge|--rebase] [--[no-]recommend-shallow] [--reference <repository>] [--recursive] [--[no-]single-branch] [--] [<path>...]
    or: $dashless [--quiet] set-branch (--default|--branch <branch>) [--] <path>
+   or: $dashless [--quiet] set-url [--] <path> <newurl>
    or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...]
    or: $dashless [--quiet] foreach [--recursive] <command>
    or: $dashless [--quiet] sync [--recursive] [--] [<path>...]
@@ -19,7 +20,6 @@ USAGE="[--quiet] [--cached]
 OPTIONS_SPEC=
 SUBDIRECTORY_OK=Yes
 . git-sh-setup
-. git-parse-remote
 require_work_tree
 wt_prefix=$(git rev-parse --show-prefix)
 cd_to_toplevel
@@ -36,6 +36,7 @@ reference=
 cached=
 recursive=
 init=
+require_init=
 files=
 remote=
 nofetch=
@@ -45,6 +46,9 @@ custom_name=
 depth=
 progress=
 dissociate=
+single_branch=
+jobs=
+recommend_shallow=
 
 die_if_unmatched ()
 {
@@ -54,31 +58,6 @@ die_if_unmatched ()
 	fi
 }
 
-#
-# Print a submodule configuration setting
-#
-# $1 = submodule name
-# $2 = option name
-# $3 = default value
-#
-# Checks in the usual git-config places first (for overrides),
-# otherwise it falls back on .gitmodules.  This allows you to
-# distribute project-wide defaults in .gitmodules, while still
-# customizing individual repositories if necessary.  If the option is
-# not in .gitmodules either, print a default value.
-#
-get_submodule_config () {
-	name="$1"
-	option="$2"
-	default="$3"
-	value=$(git config submodule."$name"."$option")
-	if test -z "$value"
-	then
-		value=$(git submodule--helper config submodule."$name"."$option")
-	fi
-	printf '%s' "${value:-$default}"
-}
-
 isnumber()
 {
 	n=$(($1 + 0)) 2>/dev/null && test "$n" = "$1"
@@ -168,7 +147,7 @@ cmd_add()
 
 	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")"
+		 die "fatal: $(eval_gettext "please make sure that the .gitmodules file is in the working tree")"
 	fi
 
 	if test -n "$reference_path"
@@ -197,7 +176,7 @@ cmd_add()
 	case "$repo" in
 	./*|../*)
 		test -z "$wt_prefix" ||
-		die "$(gettext "Relative path can only be used from the toplevel of the working tree")"
+		die "fatal: $(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
@@ -207,7 +186,7 @@ cmd_add()
 		realrepo=$repo
 		;;
 	*)
-		die "$(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
+		die "fatal: $(eval_gettext "repo URL: '\$repo' must be absolute or begin with ./|../")"
 	;;
 	esac
 
@@ -226,26 +205,28 @@ cmd_add()
 	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")"
+		die "fatal: $(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")"
+		die "fatal: $(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")"
+	    die "fatal: $(eval_gettext "'\$sm_path' does not have a commit checked out")"
 	fi
 
-	if test -z "$force" &&
-		! git add --dry-run --ignore-missing --no-warn-embedded-repo "$sm_path" > /dev/null 2>&1
+	if test -z "$force"
 	then
-		eval_gettextln "The following path is ignored by one of your .gitignore files:
-\$sm_path
-Use -f if you really want to add it." >&2
-		exit 1
+	    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"
@@ -257,50 +238,14 @@ Use -f if you really want to add it." >&2
 
 	if ! git submodule--helper check-name "$sm_name"
 	then
-		die "$(eval_gettext "'$sm_name' is not a valid submodule name")"
+		die "fatal: $(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 submodule--helper add-clone ${GIT_QUIET:+--quiet} ${force:+"--force"} ${progress:+"--progress"} ${branch:+--branch "$branch"} --prefix "$wt_prefix" --path "$sm_path" --name "$sm_name" --url "$realrepo" ${reference:+"$reference"} ${dissociate:+"--dissociate"} ${depth:+"$depth"} || exit
 	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'")"
+	die "fatal: $(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" &&
@@ -309,7 +254,7 @@ or you are unsure what this means choose another name with the '--name' option."
 		git submodule--helper config submodule."$sm_name".branch "$branch"
 	fi &&
 	git add --force .gitmodules ||
-	die "$(eval_gettext "Failed to register submodule '\$sm_path'")"
+	die "fatal: $(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.
@@ -354,7 +299,7 @@ cmd_foreach()
 		shift
 	done
 
-	git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@"
+	git ${wt_prefix:+-C "$wt_prefix"} submodule--helper foreach ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@"
 }
 
 #
@@ -421,7 +366,7 @@ cmd_deinit()
 		shift
 	done
 
-	git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${prefix:+--prefix "$prefix"} ${force:+--force} ${deinit_all:+--all} -- "$@"
+	git ${wt_prefix:+-C "$wt_prefix"} submodule--helper deinit ${GIT_QUIET:+--quiet} ${force:+--force} ${deinit_all:+--all} -- "$@"
 }
 
 is_tip_reachable () (
@@ -431,16 +376,18 @@ is_tip_reachable () (
 	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>.
 fetch_in_submodule () (
 	sanitize_submodule_env &&
 	cd "$1" &&
-	case "$2" in
-	'')
-		git fetch ;;
-	*)
-		shift
-		git fetch $(get_default_remote) "$@" ;;
-	esac
+	if test $# -eq 3
+	then
+		echo "$3" | git fetch ${GIT_QUIET:+--quiet} --stdin ${2:+"$2"}
+	else
+		git fetch ${GIT_QUIET:+--quiet} ${2:+"$2"}
+	fi
 )
 
 #
@@ -458,7 +405,7 @@ cmd_update()
 			GIT_QUIET=1
 			;;
 		-v)
-			GIT_QUIET=0
+			unset GIT_QUIET
 			;;
 		--progress)
 			progress=1
@@ -466,6 +413,10 @@ cmd_update()
 		-i|--init)
 			init=1
 			;;
+		--require-init)
+			init=1
+			require_init=1
+			;;
 		--remote)
 			remote=1
 			;;
@@ -520,6 +471,12 @@ cmd_update()
 		--jobs=*)
 			jobs=$1
 			;;
+		--single-branch)
+			single_branch="--single-branch"
+			;;
+		--no-single-branch)
+			single_branch="--no-single-branch"
+			;;
 		--)
 			shift
 			break
@@ -548,6 +505,8 @@ cmd_update()
 		${reference:+"$reference"} \
 		${dissociate:+"--dissociate"} \
 		${depth:+--depth "$depth"} \
+		${require_init:+--require-init} \
+		$single_branch \
 		$recommend_shallow \
 		$jobs \
 		-- \
@@ -570,7 +529,7 @@ cmd_update()
 		else
 			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"
@@ -580,12 +539,12 @@ 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" && get_default_remote)
+			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"
@@ -608,37 +567,37 @@ cmd_update()
 				# 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.")"
+				fetch_in_submodule "$sm_path" "$depth" "$sha1" ||
+				die "fatal: $(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'")"
+				die_msg="fatal: $(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$displaypath'")"
 				say_msg="$(eval_gettext "Submodule path '\$displaypath': checked out '\$sha1'")"
 				;;
 			rebase)
-				command="git rebase"
-				die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$displaypath'")"
+				command="git rebase ${GIT_QUIET:+--quiet}"
+				die_msg="fatal: $(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"
-				die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$displaypath'")"
+				command="git merge ${GIT_QUIET:+--quiet}"
+				die_msg="fatal: $(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'")"
+				die_msg="fatal: $(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'")"
+				die "fatal: $(eval_gettext "Invalid update mode '$update_module' for submodule path '$path'")"
 			esac
 
 			if (sanitize_submodule_env; cd "$sm_path" && $command "$sha1")
@@ -665,7 +624,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"
@@ -700,7 +659,7 @@ cmd_update()
 # $@ = requested path
 #
 cmd_set_branch() {
-	unset_branch=false
+	default=
 	branch=
 
 	while test $# -ne 0
@@ -710,7 +669,7 @@ cmd_set_branch() {
 			# we don't do anything with this but we need to accept it
 			;;
 		-d|--default)
-			unset_branch=true
+			default=1
 			;;
 		-b|--branch)
 			case "$2" in '') usage ;; esac
@@ -731,33 +690,36 @@ cmd_set_branch() {
 		shift
 	done
 
-	if test $# -ne 1
-	then
-		usage
-	fi
-
-	# we can't use `git submodule--helper name` here because internally, it
-	# hashes the path so a trailing slash could lead to an unintentional no match
-	name="$(git submodule--helper list "$1" | cut -f2)"
-	if test -z "$name"
-	then
-		exit 1
-	fi
-
-	test -n "$branch"; has_branch=$?
-	test "$unset_branch" = true; has_unset_branch=$?
+	git ${wt_prefix:+-C "$wt_prefix"} submodule--helper set-branch ${GIT_QUIET:+--quiet} ${branch:+--branch "$branch"} ${default:+--default} -- "$@"
+}
 
-	if test $((!$has_branch != !$has_unset_branch)) -eq 0
-	then
-		usage
-	fi
+#
+# Configures a submodule's remote url
+#
+# $@ = requested path, requested url
+#
+cmd_set_url() {
+	while test $# -ne 0
+	do
+		case "$1" in
+		-q|--quiet)
+			GIT_QUIET=1
+			;;
+		--)
+			shift
+			break
+			;;
+		-*)
+			usage
+			;;
+		*)
+			break
+			;;
+		esac
+		shift
+	done
 
-	if test $has_branch -eq 0
-	then
-		git submodule--helper config submodule."$name".branch "$branch"
-	else
-		git submodule--helper config --unset submodule."$name".branch
-	fi
+	git ${wt_prefix:+-C "$wt_prefix"} submodule--helper set-url ${GIT_QUIET:+--quiet} -- "$@"
 }
 
 #
@@ -809,166 +771,7 @@ cmd_summary() {
 		shift
 	done
 
-	test $summary_limit = 0 && return
-
-	if rev=$(git rev-parse -q --verify --default HEAD ${1+"$1"})
-	then
-		head=$rev
-		test $# = 0 || shift
-	elif test -z "$1" || test "$1" = "HEAD"
-	then
-		# before the first commit: compare with an empty tree
-		head=$(git hash-object -w -t tree --stdin </dev/null)
-		test -z "$1" || shift
-	else
-		head="HEAD"
-	fi
-
-	if [ -n "$files" ]
-	then
-		test -n "$cached" &&
-		die "$(gettext "The --cached option cannot be used with the --files option")"
-		diff_cmd=diff-files
-		head=
-	fi
-
-	cd_to_toplevel
-	eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")"
-	# Get modified modules cared by user
-	modules=$(git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- "$@" |
-		sane_egrep '^:([0-7]* )?160000' |
-		while read -r mod_src mod_dst sha1_src sha1_dst status sm_path
-		do
-			# Always show modules deleted or type-changed (blob<->module)
-			if test "$status" = D || test "$status" = T
-			then
-				printf '%s\n' "$sm_path"
-				continue
-			fi
-			# Respect the ignore setting for --for-status.
-			if test -n "$for_status"
-			then
-				name=$(git submodule--helper name "$sm_path")
-				ignore_config=$(get_submodule_config "$name" ignore none)
-				test $status != A && test $ignore_config = all && continue
-			fi
-			# Also show added or modified modules which are checked out
-			GIT_DIR="$sm_path/.git" git rev-parse --git-dir >/dev/null 2>&1 &&
-			printf '%s\n' "$sm_path"
-		done
-	)
-
-	test -z "$modules" && return
-
-	git $diff_cmd $cached --ignore-submodules=dirty --raw $head -- $modules |
-	sane_egrep '^:([0-7]* )?160000' |
-	cut -c2- |
-	while read -r mod_src mod_dst sha1_src sha1_dst status name
-	do
-		if test -z "$cached" &&
-			is_zero_oid $sha1_dst
-		then
-			case "$mod_dst" in
-			160000)
-				sha1_dst=$(GIT_DIR="$name/.git" git rev-parse HEAD)
-				;;
-			100644 | 100755 | 120000)
-				sha1_dst=$(git hash-object $name)
-				;;
-			000000)
-				;; # removed
-			*)
-				# unexpected type
-				eval_gettextln "unexpected mode \$mod_dst" >&2
-				continue ;;
-			esac
-		fi
-		missing_src=
-		missing_dst=
-
-		test $mod_src = 160000 &&
-		! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_src^0 >/dev/null &&
-		missing_src=t
-
-		test $mod_dst = 160000 &&
-		! GIT_DIR="$name/.git" git rev-parse -q --verify $sha1_dst^0 >/dev/null &&
-		missing_dst=t
-
-		display_name=$(git submodule--helper relative-path "$name" "$wt_prefix")
-
-		total_commits=
-		case "$missing_src,$missing_dst" in
-		t,)
-			errmsg="$(eval_gettext "  Warn: \$display_name doesn't contain commit \$sha1_src")"
-			;;
-		,t)
-			errmsg="$(eval_gettext "  Warn: \$display_name doesn't contain commit \$sha1_dst")"
-			;;
-		t,t)
-			errmsg="$(eval_gettext "  Warn: \$display_name doesn't contain commits \$sha1_src and \$sha1_dst")"
-			;;
-		*)
-			errmsg=
-			total_commits=$(
-			if test $mod_src = 160000 && test $mod_dst = 160000
-			then
-				range="$sha1_src...$sha1_dst"
-			elif test $mod_src = 160000
-			then
-				range=$sha1_src
-			else
-				range=$sha1_dst
-			fi
-			GIT_DIR="$name/.git" \
-			git rev-list --first-parent $range -- | wc -l
-			)
-			total_commits=" ($(($total_commits + 0)))"
-			;;
-		esac
-
-		sha1_abbr_src=$(GIT_DIR="$name/.git" git rev-parse --short $sha1_src 2>/dev/null ||
-			echo $sha1_src | cut -c1-7)
-		sha1_abbr_dst=$(GIT_DIR="$name/.git" git rev-parse --short $sha1_dst 2>/dev/null ||
-			echo $sha1_dst | cut -c1-7)
-
-		if test $status = T
-		then
-			blob="$(gettext "blob")"
-			submodule="$(gettext "submodule")"
-			if test $mod_dst = 160000
-			then
-				echo "* $display_name $sha1_abbr_src($blob)->$sha1_abbr_dst($submodule)$total_commits:"
-			else
-				echo "* $display_name $sha1_abbr_src($submodule)->$sha1_abbr_dst($blob)$total_commits:"
-			fi
-		else
-			echo "* $display_name $sha1_abbr_src...$sha1_abbr_dst$total_commits:"
-		fi
-		if test -n "$errmsg"
-		then
-			# Don't give error msg for modification whose dst is not submodule
-			# i.e. deleted or changed to blob
-			test $mod_dst = 160000 && echo "$errmsg"
-		else
-			if test $mod_src = 160000 && test $mod_dst = 160000
-			then
-				limit=
-				test $summary_limit -gt 0 && limit="-$summary_limit"
-				GIT_DIR="$name/.git" \
-				git log $limit --pretty='format:  %m %s' \
-				--first-parent $sha1_src...$sha1_dst
-			elif test $mod_dst = 160000
-			then
-				GIT_DIR="$name/.git" \
-				git log --pretty='format:  > %s' -1 $sha1_dst
-			else
-				GIT_DIR="$name/.git" \
-				git log --pretty='format:  < %s' -1 $sha1_src
-			fi
-			echo
-		fi
-		echo
-	done
+	git ${wt_prefix:+-C "$wt_prefix"} submodule--helper summary ${files:+--files} ${cached:+--cached} ${for_status:+--for-status} ${summary_limit:+-n $summary_limit} -- "$@"
 }
 #
 # List all submodules, prefixed with:
@@ -1009,7 +812,7 @@ cmd_status()
 		shift
 	done
 
-	git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper status ${GIT_QUIET:+--quiet} ${cached:+--cached} ${recursive:+--recursive} -- "$@"
+	git ${wt_prefix:+-C "$wt_prefix"} submodule--helper status ${GIT_QUIET:+--quiet} ${cached:+--cached} ${recursive:+--recursive} -- "$@"
 }
 #
 # Sync remote urls for submodules
@@ -1042,7 +845,7 @@ cmd_sync()
 		esac
 	done
 
-	git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper sync ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@"
+	git ${wt_prefix:+-C "$wt_prefix"} submodule--helper sync ${GIT_QUIET:+--quiet} ${recursive:+--recursive} -- "$@"
 }
 
 cmd_absorbgitdirs()
@@ -1059,7 +862,7 @@ cmd_absorbgitdirs()
 while test $# != 0 && test -z "$command"
 do
 	case "$1" in
-	add | foreach | init | deinit | update | set-branch | status | summary | sync | absorbgitdirs)
+	add | foreach | init | deinit | update | set-branch | set-url | status | summary | sync | absorbgitdirs)
 		command=$1
 		;;
 	-q|--quiet)
diff --git a/git-svn.perl b/git-svn.perl
index 050f2a36f4..70cb5e2a83 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2,10 +2,11 @@
 # Copyright (C) 2006, Eric Wong <normalperson@yhbt.net>
 # License: GPL v2 or later
 use 5.008;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use strict;
 use vars qw/	$AUTHOR $VERSION
-		$sha1 $sha1_short $_revision $_repository
+		$oid $oid_short $oid_length
+		$_revision $_repository
 		$_q $_authors $_authors_prog %users/;
 $AUTHOR = 'Eric Wong <normalperson@yhbt.net>';
 $VERSION = '@@GIT_VERSION@@';
@@ -103,14 +104,15 @@ sub _req_svn {
 	}
 }
 
-$sha1 = qr/[a-f\d]{40}/;
-$sha1_short = qr/[a-f\d]{4,40}/;
+$oid = qr/(?:[a-f\d]{40}(?:[a-f\d]{24})?)/;
+$oid_short = qr/[a-f\d]{4,64}/;
+$oid_length = 40;
 my ($_stdin, $_help, $_edit,
 	$_message, $_file, $_branch_dest,
 	$_template, $_shared,
 	$_version, $_fetch_all, $_no_rebase, $_fetch_parent,
 	$_before, $_after,
-	$_merge, $_strategy, $_preserve_merges, $_dry_run, $_parents, $_local,
+	$_merge, $_strategy, $_rebase_merges, $_dry_run, $_parents, $_local,
 	$_prefix, $_no_checkout, $_url, $_verbose,
 	$_commit_url, $_tag, $_merge_info, $_interactive, $_set_svn_props);
 
@@ -270,7 +272,8 @@ my %cmd = (
 			  'local|l' => \$_local,
 			  'fetch-all|all' => \$_fetch_all,
 			  'dry-run|n' => \$_dry_run,
-			  'preserve-merges|p' => \$_preserve_merges,
+			  'rebase-merges|p' => \$_rebase_merges,
+			  'preserve-merges|p' => \$_rebase_merges,
 			  %fc_opts } ],
 	'commit-diff' => [ \&cmd_commit_diff,
 	                   'Commit a diff between two trees',
@@ -497,6 +500,7 @@ sub do_git_init_db {
 		command_noisy('config', "$pfx.preserve-empty-dirs", 'true');
 		command_noisy('config', "$pfx.placeholder-filename", $$fname);
 	}
+	load_object_format();
 }
 
 sub init_subdir {
@@ -581,7 +585,7 @@ sub cmd_set_tree {
 		print "Reading from stdin...\n";
 		@commits = ();
 		while (<STDIN>) {
-			if (/\b($sha1_short)\b/o) {
+			if (/\b($oid_short)\b/o) {
 				unshift @commits, $1;
 			}
 		}
@@ -1054,7 +1058,7 @@ sub cmd_dcommit {
 					  'If you are attempting to commit ',
 					  "merges, try running:\n\t",
 					  'git rebase --interactive',
-					  '--preserve-merges ',
+					  '--rebase-merges ',
 					  $gs->refname,
 					  "\nBefore dcommitting";
 				}
@@ -1717,7 +1721,7 @@ sub rebase_cmd {
 	push @cmd, '-v' if $_verbose;
 	push @cmd, qw/--merge/ if $_merge;
 	push @cmd, "--strategy=$_strategy" if $_strategy;
-	push @cmd, "--preserve-merges" if $_preserve_merges;
+	push @cmd, "--rebase-merges" if $_rebase_merges;
 	@cmd;
 }
 
@@ -1830,7 +1834,7 @@ sub get_tree_from_treeish {
 	if ($type eq 'commit') {
 		$expected = (grep /^tree /, command(qw/cat-file commit/,
 		                                    $treeish))[0];
-		($expected) = ($expected =~ /^tree ($sha1)$/o);
+		($expected) = ($expected =~ /^tree ($oid)$/o);
 		die "Unable to get tree from $treeish\n" unless $expected;
 	} elsif ($type eq 'tree') {
 		$expected = $treeish;
@@ -1974,9 +1978,15 @@ sub read_git_config {
 			}
 		}
 	}
+	load_object_format();
 	delete @$opts{@config_only} if @config_only;
 }
 
+sub load_object_format {
+	chomp(my $hash = `git config --get extensions.objectformat`);
+	$::oid_length = 64 if $hash eq 'sha256';
+}
+
 sub extract_metadata {
 	my $id = shift or return (undef, undef, undef);
 	my ($url, $rev, $uuid) = ($id =~ /^\s*git-svn-id:\s+(.*)\@(\d+)
@@ -2005,10 +2015,10 @@ sub cmt_sha2rev_batch {
 		print $out $sha, "\n";
 
 		while (my $line = <$in>) {
-			if ($first && $line =~ /^[[:xdigit:]]{40}\smissing$/) {
+			if ($first && $line =~ /^$::oid\smissing$/) {
 				last;
 			} elsif ($first &&
-			       $line =~ /^[[:xdigit:]]{40}\scommit\s(\d+)$/) {
+			       $line =~ /^$::oid\scommit\s(\d+)$/) {
 				$first = 0;
 				$size = $1;
 				next;
@@ -2035,7 +2045,7 @@ sub working_head_info {
 	my $hash;
 	my %max;
 	while (<$fh>) {
-		if ( m{^commit ($::sha1)$} ) {
+		if ( m{^commit ($::oid)$} ) {
 			unshift @$refs, $hash if $hash and $refs;
 			$hash = $1;
 			next;
diff --git a/git.c b/git.c
index ce6ab0ece2..18bed9a996 100644
--- a/git.c
+++ b/git.c
@@ -4,6 +4,7 @@
 #include "help.h"
 #include "run-command.h"
 #include "alias.h"
+#include "shallow.h"
 
 #define RUN_SETUP		(1<<0)
 #define RUN_SETUP_GENTLY	(1<<1)
@@ -28,6 +29,7 @@ const char git_usage_string[] =
 	   "           [--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>]");
 
 const char git_more_info_string[] =
@@ -253,6 +255,16 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
 			git_config_push_parameter((*argv)[1]);
 			(*argv)++;
 			(*argc)--;
+		} else if (!strcmp(cmd, "--config-env")) {
+			if (*argc < 2) {
+				fprintf(stderr, _("no config key given for --config-env\n" ));
+				usage(git_usage_string);
+			}
+			git_config_push_env((*argv)[1]);
+			(*argv)++;
+			(*argc)--;
+		} else if (skip_prefix(cmd, "--config-env=", &cmd)) {
+			git_config_push_env(cmd);
 		} else if (!strcmp(cmd, "--literal-pathspecs")) {
 			setenv(GIT_LITERAL_PATHSPECS_ENVIRONMENT, "1", 1);
 			if (envchanged)
@@ -345,12 +357,15 @@ static int handle_alias(int *argcp, const char ***argv)
 			commit_pager_choice();
 
 			child.use_shell = 1;
+			child.clean_on_exit = 1;
+			child.wait_after_clean = 1;
 			child.trace2_child_class = "shell_alias";
-			argv_array_push(&child.args, alias_string + 1);
-			argv_array_pushv(&child.args, (*argv) + 1);
+			strvec_push(&child.args, alias_string + 1);
+			strvec_pushv(&child.args, (*argv) + 1);
 
-			trace2_cmd_alias(alias_command, child.args.argv);
+			trace2_cmd_alias(alias_command, child.args.v);
 			trace2_cmd_list_config();
+			trace2_cmd_list_env_vars();
 			trace2_cmd_name("_run_shell_alias_");
 
 			ret = run_command(&child);
@@ -388,6 +403,7 @@ static int handle_alias(int *argcp, const char ***argv)
 
 		trace2_cmd_alias(alias_command, new_argv);
 		trace2_cmd_list_config();
+		trace2_cmd_list_env_vars();
 
 		*argv = new_argv;
 		*argcp += count - 1;
@@ -415,7 +431,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 			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);
@@ -439,6 +455,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 	trace_argv_printf(argv, "trace: built-in: git");
 	trace2_cmd_name(p->cmd);
 	trace2_cmd_list_config();
+	trace2_cmd_list_env_vars();
 
 	validate_cache_entries(the_repository->index);
 	status = p->fn(argc, argv, prefix);
@@ -473,6 +490,7 @@ static struct cmd_struct commands[] = {
 	{ "bisect--helper", cmd_bisect__helper, RUN_SETUP },
 	{ "blame", cmd_blame, RUN_SETUP },
 	{ "branch", cmd_branch, RUN_SETUP | DELAY_PAGER_CONFIG },
+	{ "bugreport", cmd_bugreport, RUN_SETUP_GENTLY },
 	{ "bundle", cmd_bundle, RUN_SETUP_GENTLY | NO_PARSEOPT },
 	{ "cat-file", cmd_cat_file, RUN_SETUP },
 	{ "check-attr", cmd_check_attr, RUN_SETUP },
@@ -480,6 +498,8 @@ static struct cmd_struct commands[] = {
 	{ "check-mailmap", cmd_check_mailmap, RUN_SETUP },
 	{ "check-ref-format", cmd_check_ref_format, NO_PARSEOPT  },
 	{ "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE },
+	{ "checkout--worker", cmd_checkout__worker,
+		RUN_SETUP | NEED_WORK_TREE | SUPPORT_SUPER_PREFIX },
 	{ "checkout-index", cmd_checkout_index,
 		RUN_SETUP | NEED_WORK_TREE},
 	{ "cherry", cmd_cherry, RUN_SETUP },
@@ -493,6 +513,9 @@ static struct cmd_struct commands[] = {
 	{ "config", cmd_config, RUN_SETUP_GENTLY | DELAY_PAGER_CONFIG },
 	{ "count-objects", cmd_count_objects, RUN_SETUP },
 	{ "credential", cmd_credential, RUN_SETUP_GENTLY | NO_PARSEOPT },
+	{ "credential-cache", cmd_credential_cache },
+	{ "credential-cache--daemon", cmd_credential_cache_daemon },
+	{ "credential-store", cmd_credential_store },
 	{ "describe", cmd_describe, RUN_SETUP },
 	{ "diff", cmd_diff, NO_PARSEOPT },
 	{ "diff-files", cmd_diff_files, RUN_SETUP | NEED_WORK_TREE | NO_PARSEOPT },
@@ -501,10 +524,12 @@ static struct cmd_struct commands[] = {
 	{ "difftool", cmd_difftool, RUN_SETUP_GENTLY },
 	{ "env--helper", cmd_env__helper },
 	{ "fast-export", cmd_fast_export, RUN_SETUP },
+	{ "fast-import", cmd_fast_import, RUN_SETUP | NO_PARSEOPT },
 	{ "fetch", cmd_fetch, RUN_SETUP },
 	{ "fetch-pack", cmd_fetch_pack, RUN_SETUP | NO_PARSEOPT },
 	{ "fmt-merge-msg", cmd_fmt_merge_msg, RUN_SETUP },
 	{ "for-each-ref", cmd_for_each_ref, RUN_SETUP },
+	{ "for-each-repo", cmd_for_each_repo, RUN_SETUP_GENTLY },
 	{ "format-patch", cmd_format_patch, RUN_SETUP },
 	{ "fsck", cmd_fsck, RUN_SETUP },
 	{ "fsck-objects", cmd_fsck, RUN_SETUP },
@@ -523,6 +548,7 @@ static struct cmd_struct commands[] = {
 	{ "ls-tree", cmd_ls_tree, RUN_SETUP },
 	{ "mailinfo", cmd_mailinfo, RUN_SETUP_GENTLY | NO_PARSEOPT },
 	{ "mailsplit", cmd_mailsplit, NO_PARSEOPT },
+	{ "maintenance", cmd_maintenance, RUN_SETUP | NO_PARSEOPT },
 	{ "merge", cmd_merge, RUN_SETUP | NEED_WORK_TREE },
 	{ "merge-base", cmd_merge_base, RUN_SETUP },
 	{ "merge-file", cmd_merge_file, RUN_SETUP_GENTLY },
@@ -570,15 +596,11 @@ static struct cmd_struct commands[] = {
 	{ "shortlog", cmd_shortlog, RUN_SETUP_GENTLY | USE_PAGER },
 	{ "show", cmd_show, RUN_SETUP },
 	{ "show-branch", cmd_show_branch, RUN_SETUP },
-	{ "show-index", cmd_show_index },
+	{ "show-index", cmd_show_index, RUN_SETUP_GENTLY },
 	{ "show-ref", cmd_show_ref, RUN_SETUP },
+	{ "sparse-checkout", cmd_sparse_checkout, RUN_SETUP | NEED_WORK_TREE },
 	{ "stage", cmd_add, RUN_SETUP | NEED_WORK_TREE },
-	/*
-	 * NEEDSWORK: Until the builtin stash is thoroughly robust and no
-	 * longer needs redirection to the stash shell script this is kept as
-	 * is, then should be changed to RUN_SETUP | NEED_WORK_TREE
-	 */
-	{ "stash", cmd_stash },
+	{ "stash", cmd_stash, RUN_SETUP | NEED_WORK_TREE },
 	{ "status", cmd_status, RUN_SETUP | NEED_WORK_TREE },
 	{ "stripspace", cmd_stripspace },
 	{ "submodule--helper", cmd_submodule__helper, RUN_SETUP | SUPPORT_SUPER_PREFIX | NO_PARSEOPT },
@@ -630,6 +652,25 @@ static void list_builtins(struct string_list *out, unsigned int exclude_option)
 	}
 }
 
+void load_builtin_commands(const char *prefix, struct cmdnames *cmds)
+{
+	const char *name;
+	int i;
+
+	/*
+	 * Callers can ask for a subset of the commands based on a certain
+	 * prefix, which is then dropped from the added names. The names in
+	 * the `commands[]` array do not have the `git-` prefix, though,
+	 * therefore we must expect the `prefix` to at least start with `git-`.
+	 */
+	if (!skip_prefix(prefix, "git-", &prefix))
+		BUG("prefix '%s' must start with 'git-'", prefix);
+
+	for (i = 0; i < ARRAY_SIZE(commands); i++)
+		if (skip_prefix(commands[i].cmd, prefix, &name))
+			add_cmdname(cmds, name, strlen(name));
+}
+
 #ifdef STRIP_EXTENSION
 static void strip_extension(const char **argv)
 {
@@ -644,7 +685,7 @@ static void strip_extension(const char **argv)
 
 static void handle_builtin(int argc, const char **argv)
 {
-	struct argv_array args = ARGV_ARRAY_INIT;
+	struct strvec args = STRVEC_INIT;
 	const char *cmd;
 	struct cmd_struct *builtin;
 
@@ -659,19 +700,19 @@ static void handle_builtin(int argc, const char **argv)
 		argv[0] = cmd = "help";
 
 		for (i = 0; i < argc; i++) {
-			argv_array_push(&args, argv[i]);
+			strvec_push(&args, argv[i]);
 			if (!i)
-				argv_array_push(&args, "--exclude-guides");
+				strvec_push(&args, "--exclude-guides");
 		}
 
 		argc++;
-		argv = args.argv;
+		argv = args.v;
 	}
 
 	builtin = get_builtin(cmd);
 	if (builtin)
 		exit(run_builtin(builtin, argc, argv));
-	argv_array_clear(&args);
+	strvec_clear(&args);
 }
 
 static void execv_dashed_external(const char **argv)
@@ -686,8 +727,8 @@ static void execv_dashed_external(const char **argv)
 		use_pager = check_pager_config(argv[0]);
 	commit_pager_choice();
 
-	argv_array_pushf(&cmd.args, "git-%s", argv[0]);
-	argv_array_pushv(&cmd.args, argv + 1);
+	strvec_pushf(&cmd.args, "git-%s", argv[0]);
+	strvec_pushv(&cmd.args, argv + 1);
 	cmd.clean_on_exit = 1;
 	cmd.wait_after_clean = 1;
 	cmd.silent_exec_failure = 1;
@@ -699,7 +740,7 @@ static void execv_dashed_external(const char **argv)
 	 * The code in run_command() logs trace2 child_start/child_exit
 	 * events, so we do not need to report exec/exec_result events here.
 	 */
-	trace_argv_printf(cmd.args.argv, "trace: exec:");
+	trace_argv_printf(cmd.args.v, "trace: exec:");
 
 	/*
 	 * If we fail because the command is not found, it is
@@ -739,7 +780,7 @@ static int run_argv(int *argcp, const char ***argv)
 		if (!done_alias)
 			handle_builtin(*argcp, *argv);
 		else if (get_builtin(**argv)) {
-			struct argv_array args = ARGV_ARRAY_INIT;
+			struct strvec args = STRVEC_INIT;
 			int i;
 
 			/*
@@ -756,18 +797,18 @@ static int run_argv(int *argcp, const char ***argv)
 
 			commit_pager_choice();
 
-			argv_array_push(&args, "git");
+			strvec_push(&args, "git");
 			for (i = 0; i < *argcp; i++)
-				argv_array_push(&args, (*argv)[i]);
+				strvec_push(&args, (*argv)[i]);
 
-			trace_argv_printf(args.argv, "trace: exec:");
+			trace_argv_printf(args.v, "trace: exec:");
 
 			/*
 			 * if we fail because the command is not found, it is
 			 * OK to return. Otherwise, we just pass along the status code.
 			 */
-			i = run_command_v_opt_tr2(args.argv, RUN_SILENT_EXEC_FAILURE |
-						  RUN_CLEAN_ON_EXIT, "git_alias");
+			i = run_command_v_opt_tr2(args.v, RUN_SILENT_EXEC_FAILURE |
+						  RUN_CLEAN_ON_EXIT | RUN_WAIT_AFTER_CLEAN, "git_alias");
 			if (i >= 0 || errno != ENOENT)
 				exit(i);
 			die("could not execute builtin %s", **argv);
diff --git a/gitk-git/gitk b/gitk-git/gitk
index abe4805ade..23d9dd1fe0 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -11,14 +11,14 @@ package require Tk
 
 proc hasworktree {} {
     return [expr {[exec git rev-parse --is-bare-repository] == "false" &&
-		  [exec git rev-parse --is-inside-git-dir] == "false"}]
+                  [exec git rev-parse --is-inside-git-dir] == "false"}]
 }
 
 proc reponame {} {
     global gitdir
     set n [file normalize $gitdir]
     if {[string match "*/.git" $n]} {
-	set n [string range $n 0 end-5]
+        set n [string range $n 0 end-5]
     }
     return [file tail $n]
 }
@@ -26,7 +26,7 @@ proc reponame {} {
 proc gitworktree {} {
     variable _gitworktree
     if {[info exists _gitworktree]} {
-	return $_gitworktree
+        return $_gitworktree
     }
     # v1.7.0 introduced --show-toplevel to return the canonical work-tree
     if {[catch {set _gitworktree [exec git rev-parse --show-toplevel]}]} {
@@ -34,10 +34,9 @@ proc gitworktree {} {
         # cdup to obtain a relative path to the top of the worktree. If
         # run from the top, the ./ prefix ensures normalize expands pwd.
         if {[catch { set _gitworktree $env(GIT_WORK_TREE) }]} {
-	    catch {set _gitworktree [exec git config --get core.worktree]}
-	    if {$_gitworktree eq ""} {
-		set _gitworktree [file normalize ./[exec git rev-parse --show-cdup]]
-	    }
+            if {[catch {set _gitworktree [exec git config --get core.worktree]}]} {
+                set _gitworktree [file normalize ./[exec git rev-parse --show-cdup]]
+            }
         }
     }
     return $_gitworktree
@@ -54,7 +53,7 @@ proc run args {
     set script $args
     if {[info exists isonrunq($script)]} return
     if {$runq eq {} && ![info exists currunq]} {
-	after idle dorunq
+        after idle dorunq
     }
     lappend runq [list {} $script]
     set isonrunq($script) 1
@@ -69,7 +68,7 @@ proc filereadable {fd script} {
 
     fileevent $fd readable {}
     if {$runq eq {} && ![info exists currunq]} {
-	after idle dorunq
+        after idle dorunq
     }
     lappend runq [list $fd $script]
 }
@@ -78,11 +77,11 @@ proc nukefile {fd} {
     global runq
 
     for {set i 0} {$i < [llength $runq]} {} {
-	if {[lindex $runq $i 0] eq $fd} {
-	    set runq [lreplace $runq $i $i]
-	} else {
-	    incr i
-	}
+        if {[lindex $runq $i 0] eq $fd} {
+            set runq [lreplace $runq $i $i]
+        } else {
+            incr i
+        }
     }
 }
 
@@ -92,30 +91,30 @@ proc dorunq {} {
     set tstart [clock clicks -milliseconds]
     set t0 $tstart
     while {[llength $runq] > 0} {
-	set fd [lindex $runq 0 0]
-	set script [lindex $runq 0 1]
-	set currunq [lindex $runq 0]
-	set runq [lrange $runq 1 end]
-	set repeat [eval $script]
-	unset currunq
-	set t1 [clock clicks -milliseconds]
-	set t [expr {$t1 - $t0}]
-	if {$repeat ne {} && $repeat} {
-	    if {$fd eq {} || $repeat == 2} {
-		# script returns 1 if it wants to be readded
-		# file readers return 2 if they could do more straight away
-		lappend runq [list $fd $script]
-	    } else {
-		fileevent $fd readable [list filereadable $fd $script]
-	    }
-	} elseif {$fd eq {}} {
-	    unset isonrunq($script)
-	}
-	set t0 $t1
-	if {$t1 - $tstart >= 80} break
+        set fd [lindex $runq 0 0]
+        set script [lindex $runq 0 1]
+        set currunq [lindex $runq 0]
+        set runq [lrange $runq 1 end]
+        set repeat [eval $script]
+        unset currunq
+        set t1 [clock clicks -milliseconds]
+        set t [expr {$t1 - $t0}]
+        if {$repeat ne {} && $repeat} {
+            if {$fd eq {} || $repeat == 2} {
+                # script returns 1 if it wants to be readded
+                # file readers return 2 if they could do more straight away
+                lappend runq [list $fd $script]
+            } else {
+                fileevent $fd readable [list filereadable $fd $script]
+            }
+        } elseif {$fd eq {}} {
+            unset isonrunq($script)
+        }
+        set t0 $t1
+        if {$t1 - $tstart >= 80} break
     }
     if {$runq ne {}} {
-	after idle dorunq
+        after idle dorunq
     }
 }
 
@@ -135,20 +134,20 @@ proc unmerged_files {files} {
     set mlist {}
     set nr_unmerged 0
     if {[catch {
-	set fd [open "| git ls-files -u" r]
+        set fd [open "| git ls-files -u" r]
     } err]} {
-	show_error {} . "[mc "Couldn't get list of unmerged files:"] $err"
-	exit 1
+        show_error {} . "[mc "Couldn't get list of unmerged files:"] $err"
+        exit 1
     }
     while {[gets $fd line] >= 0} {
-	set i [string first "\t" $line]
-	if {$i < 0} continue
-	set fname [string range $line [expr {$i+1}] end]
-	if {[lsearch -exact $mlist $fname] >= 0} continue
-	incr nr_unmerged
-	if {$files eq {} || [path_filter $files $fname]} {
-	    lappend mlist $fname
-	}
+        set i [string first "\t" $line]
+        if {$i < 0} continue
+        set fname [string range $line [expr {$i+1}] end]
+        if {[lsearch -exact $mlist $fname] >= 0} continue
+        incr nr_unmerged
+        if {$files eq {} || [path_filter $files $fname]} {
+            lappend mlist $fname
+        }
     }
     catch {close $fd}
     return $mlist
@@ -171,115 +170,115 @@ proc parseviewargs {n arglist} {
     set filtered 0
     set i -1
     foreach arg $arglist {
-	incr i
-	if {$nextisval} {
-	    lappend glflags $arg
-	    set nextisval 0
-	    continue
-	}
-	switch -glob -- $arg {
-	    "-d" -
-	    "--date-order" {
-		set vdatemode($n) 1
-		# remove from origargs in case we hit an unknown option
-		set origargs [lreplace $origargs $i $i]
-		incr i -1
-	    }
-	    "-[puabwcrRBMC]" -
-	    "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" -
-	    "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" -
-	    "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" -
-	    "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" -
-	    "--ignore-space-change" - "-U*" - "--unified=*" {
-		# These request or affect diff output, which we don't want.
-		# Some could be used to set our defaults for diff display.
-		lappend diffargs $arg
-	    }
-	    "--raw" - "--patch-with-raw" - "--patch-with-stat" -
-	    "--name-only" - "--name-status" - "--color" -
-	    "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" -
-	    "--cc" - "-z" - "--header" - "--parents" - "--boundary" -
-	    "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" -
-	    "--timestamp" - "relative-date" - "--date=*" - "--stdin" -
-	    "--objects" - "--objects-edge" - "--reverse" {
-		# These cause our parsing of git log's output to fail, or else
-		# they're options we want to set ourselves, so ignore them.
-	    }
-	    "--color-words*" - "--word-diff=color" {
-		# These trigger a word diff in the console interface,
-		# so help the user by enabling our own support
-		if {[package vcompare $git_version "1.7.2"] >= 0} {
-		    set worddiff [mc "Color words"]
-		}
-	    }
-	    "--word-diff*" {
-		if {[package vcompare $git_version "1.7.2"] >= 0} {
-		    set worddiff [mc "Markup words"]
-		}
-	    }
-	    "--stat=*" - "--numstat" - "--shortstat" - "--summary" -
-	    "--check" - "--exit-code" - "--quiet" - "--topo-order" -
-	    "--full-history" - "--dense" - "--sparse" -
-	    "--follow" - "--left-right" - "--encoding=*" {
-		# These are harmless, and some are even useful
-		lappend glflags $arg
-	    }
-	    "--diff-filter=*" - "--no-merges" - "--unpacked" -
-	    "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" -
-	    "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" -
-	    "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" -
-	    "--remove-empty" - "--first-parent" - "--cherry-pick" -
-	    "-S*" - "-G*" - "--pickaxe-all" - "--pickaxe-regex" -
-	    "--simplify-by-decoration" {
-		# These mean that we get a subset of the commits
-		set filtered 1
-		lappend glflags $arg
-	    }
-	    "-L*" {
-		# Line-log with 'stuck' argument (unstuck form is
-		# not supported)
-		set filtered 1
-		set vinlinediff($n) 1
-		set allknown 0
-		lappend glflags $arg
-	    }
-	    "-n" {
-		# This appears to be the only one that has a value as a
-		# separate word following it
-		set filtered 1
-		set nextisval 1
-		lappend glflags $arg
-	    }
-	    "--not" - "--all" {
-		lappend revargs $arg
-	    }
-	    "--merge" {
-		set vmergeonly($n) 1
-		# git rev-parse doesn't understand --merge
-		lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD
-	    }
-	    "--no-replace-objects" {
-		set env(GIT_NO_REPLACE_OBJECTS) "1"
-	    }
-	    "-*" {
-		# Other flag arguments including -<n>
-		if {[string is digit -strict [string range $arg 1 end]]} {
-		    set filtered 1
-		} else {
-		    # a flag argument that we don't recognize;
-		    # that means we can't optimize
-		    set allknown 0
-		}
-		lappend glflags $arg
-	    }
-	    default {
-		# Non-flag arguments specify commits or ranges of commits
-		if {[string match "*...*" $arg]} {
-		    lappend revargs --gitk-symmetric-diff-marker
-		}
-		lappend revargs $arg
-	    }
-	}
+        incr i
+        if {$nextisval} {
+            lappend glflags $arg
+            set nextisval 0
+            continue
+        }
+        switch -glob -- $arg {
+            "-d" -
+            "--date-order" {
+                set vdatemode($n) 1
+                # remove from origargs in case we hit an unknown option
+                set origargs [lreplace $origargs $i $i]
+                incr i -1
+            }
+            "-[puabwcrRBMC]" -
+            "--no-renames" - "--full-index" - "--binary" - "--abbrev=*" -
+            "--find-copies-harder" - "-l*" - "--ext-diff" - "--no-ext-diff" -
+            "--src-prefix=*" - "--dst-prefix=*" - "--no-prefix" -
+            "-O*" - "--text" - "--full-diff" - "--ignore-space-at-eol" -
+            "--ignore-space-change" - "-U*" - "--unified=*" {
+                # These request or affect diff output, which we don't want.
+                # Some could be used to set our defaults for diff display.
+                lappend diffargs $arg
+            }
+            "--raw" - "--patch-with-raw" - "--patch-with-stat" -
+            "--name-only" - "--name-status" - "--color" -
+            "--log-size" - "--pretty=*" - "--decorate" - "--abbrev-commit" -
+            "--cc" - "-z" - "--header" - "--parents" - "--boundary" -
+            "--no-color" - "-g" - "--walk-reflogs" - "--no-walk" -
+            "--timestamp" - "relative-date" - "--date=*" - "--stdin" -
+            "--objects" - "--objects-edge" - "--reverse" {
+                # These cause our parsing of git log's output to fail, or else
+                # they're options we want to set ourselves, so ignore them.
+            }
+            "--color-words*" - "--word-diff=color" {
+                # These trigger a word diff in the console interface,
+                # so help the user by enabling our own support
+                if {[package vcompare $git_version "1.7.2"] >= 0} {
+                    set worddiff [mc "Color words"]
+                }
+            }
+            "--word-diff*" {
+                if {[package vcompare $git_version "1.7.2"] >= 0} {
+                    set worddiff [mc "Markup words"]
+                }
+            }
+            "--stat=*" - "--numstat" - "--shortstat" - "--summary" -
+            "--check" - "--exit-code" - "--quiet" - "--topo-order" -
+            "--full-history" - "--dense" - "--sparse" -
+            "--follow" - "--left-right" - "--encoding=*" {
+                # These are harmless, and some are even useful
+                lappend glflags $arg
+            }
+            "--diff-filter=*" - "--no-merges" - "--unpacked" -
+            "--max-count=*" - "--skip=*" - "--since=*" - "--after=*" -
+            "--until=*" - "--before=*" - "--max-age=*" - "--min-age=*" -
+            "--author=*" - "--committer=*" - "--grep=*" - "-[iE]" -
+            "--remove-empty" - "--first-parent" - "--cherry-pick" -
+            "-S*" - "-G*" - "--pickaxe-all" - "--pickaxe-regex" -
+            "--simplify-by-decoration" {
+                # These mean that we get a subset of the commits
+                set filtered 1
+                lappend glflags $arg
+            }
+            "-L*" {
+                # Line-log with 'stuck' argument (unstuck form is
+                # not supported)
+                set filtered 1
+                set vinlinediff($n) 1
+                set allknown 0
+                lappend glflags $arg
+            }
+            "-n" {
+                # This appears to be the only one that has a value as a
+                # separate word following it
+                set filtered 1
+                set nextisval 1
+                lappend glflags $arg
+            }
+            "--not" - "--all" {
+                lappend revargs $arg
+            }
+            "--merge" {
+                set vmergeonly($n) 1
+                # git rev-parse doesn't understand --merge
+                lappend revargs --gitk-symmetric-diff-marker MERGE_HEAD...HEAD
+            }
+            "--no-replace-objects" {
+                set env(GIT_NO_REPLACE_OBJECTS) "1"
+            }
+            "-*" {
+                # Other flag arguments including -<n>
+                if {[string is digit -strict [string range $arg 1 end]]} {
+                    set filtered 1
+                } else {
+                    # a flag argument that we don't recognize;
+                    # that means we can't optimize
+                    set allknown 0
+                }
+                lappend glflags $arg
+            }
+            default {
+                # Non-flag arguments specify commits or ranges of commits
+                if {[string match "*...*" $arg]} {
+                    lappend revargs --gitk-symmetric-diff-marker
+                }
+                lappend revargs $arg
+            }
+        }
     }
     set vdflags($n) $diffargs
     set vflags($n) $glflags
@@ -293,61 +292,61 @@ proc parseviewrevs {view revs} {
     global vposids vnegids
 
     if {$revs eq {}} {
-	set revs HEAD
+        set revs HEAD
     } elseif {[lsearch -exact $revs --all] >= 0} {
-	lappend revs HEAD
+        lappend revs HEAD
     }
     if {[catch {set ids [eval exec git rev-parse $revs]} err]} {
-	# we get stdout followed by stderr in $err
-	# for an unknown rev, git rev-parse echoes it and then errors out
-	set errlines [split $err "\n"]
-	set badrev {}
-	for {set l 0} {$l < [llength $errlines]} {incr l} {
-	    set line [lindex $errlines $l]
-	    if {!([string length $line] == 40 && [string is xdigit $line])} {
-		if {[string match "fatal:*" $line]} {
-		    if {[string match "fatal: ambiguous argument*" $line]
-			&& $badrev ne {}} {
-			if {[llength $badrev] == 1} {
-			    set err "unknown revision $badrev"
-			} else {
-			    set err "unknown revisions: [join $badrev ", "]"
-			}
-		    } else {
-			set err [join [lrange $errlines $l end] "\n"]
-		    }
-		    break
-		}
-		lappend badrev $line
-	    }
-	}
-	error_popup "[mc "Error parsing revisions:"] $err"
-	return {}
+        # we get stdout followed by stderr in $err
+        # for an unknown rev, git rev-parse echoes it and then errors out
+        set errlines [split $err "\n"]
+        set badrev {}
+        for {set l 0} {$l < [llength $errlines]} {incr l} {
+            set line [lindex $errlines $l]
+            if {!([string length $line] == 40 && [string is xdigit $line])} {
+                if {[string match "fatal:*" $line]} {
+                    if {[string match "fatal: ambiguous argument*" $line]
+                        && $badrev ne {}} {
+                        if {[llength $badrev] == 1} {
+                            set err "unknown revision $badrev"
+                        } else {
+                            set err "unknown revisions: [join $badrev ", "]"
+                        }
+                    } else {
+                        set err [join [lrange $errlines $l end] "\n"]
+                    }
+                    break
+                }
+                lappend badrev $line
+            }
+        }
+        error_popup "[mc "Error parsing revisions:"] $err"
+        return {}
     }
     set ret {}
     set pos {}
     set neg {}
     set sdm 0
     foreach id [split $ids "\n"] {
-	if {$id eq "--gitk-symmetric-diff-marker"} {
-	    set sdm 4
-	} elseif {[string match "^*" $id]} {
-	    if {$sdm != 1} {
-		lappend ret $id
-		if {$sdm == 3} {
-		    set sdm 0
-		}
-	    }
-	    lappend neg [string range $id 1 end]
-	} else {
-	    if {$sdm != 2} {
-		lappend ret $id
-	    } else {
-		lset ret end $id...[lindex $ret end]
-	    }
-	    lappend pos $id
-	}
-	incr sdm -1
+        if {$id eq "--gitk-symmetric-diff-marker"} {
+            set sdm 4
+        } elseif {[string match "^*" $id]} {
+            if {$sdm != 1} {
+                lappend ret $id
+                if {$sdm == 3} {
+                    set sdm 0
+                }
+            }
+            lappend neg [string range $id 1 end]
+        } else {
+            if {$sdm != 2} {
+                lappend ret $id
+            } else {
+                lset ret end $id...[lindex $ret end]
+            }
+            lappend pos $id
+        }
+        incr sdm -1
     }
     set vposids($view) $pos
     set vnegids($view) $neg
@@ -374,63 +373,63 @@ proc start_rev_list {view} {
 
     set args $viewargs($view)
     if {$viewargscmd($view) ne {}} {
-	if {[catch {
-	    set str [exec sh -c $viewargscmd($view)]
-	} err]} {
-	    error_popup "[mc "Error executing --argscmd command:"] $err"
-	    return 0
-	}
-	set args [concat $args [split $str "\n"]]
+        if {[catch {
+            set str [exec sh -c $viewargscmd($view)]
+        } err]} {
+            error_popup "[mc "Error executing --argscmd command:"] $err"
+            return 0
+        }
+        set args [concat $args [split $str "\n"]]
     }
     set vcanopt($view) [parseviewargs $view $args]
 
     set files $viewfiles($view)
     if {$vmergeonly($view)} {
-	set files [unmerged_files $files]
-	if {$files eq {}} {
-	    global nr_unmerged
-	    if {$nr_unmerged == 0} {
-		error_popup [mc "No files selected: --merge specified but\
-			     no files are unmerged."]
-	    } else {
-		error_popup [mc "No files selected: --merge specified but\
-			     no unmerged files are within file limit."]
-	    }
-	    return 0
-	}
+        set files [unmerged_files $files]
+        if {$files eq {}} {
+            global nr_unmerged
+            if {$nr_unmerged == 0} {
+                error_popup [mc "No files selected: --merge specified but\
+                             no files are unmerged."]
+            } else {
+                error_popup [mc "No files selected: --merge specified but\
+                             no unmerged files are within file limit."]
+            }
+            return 0
+        }
     }
     set vfilelimit($view) $files
 
     if {$vcanopt($view)} {
-	set revs [parseviewrevs $view $vrevs($view)]
-	if {$revs eq {}} {
-	    return 0
-	}
-	set args [concat $vflags($view) $revs]
+        set revs [parseviewrevs $view $vrevs($view)]
+        if {$revs eq {}} {
+            return 0
+        }
+        set args [concat $vflags($view) $revs]
     } else {
-	set args $vorigargs($view)
+        set args $vorigargs($view)
     }
 
     if {[catch {
-	set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
-			--parents --boundary $args "--" $files] r]
+        set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
+                        --parents --boundary $args "--" $files] r]
     } err]} {
-	error_popup "[mc "Error executing git log:"] $err"
-	return 0
+        error_popup "[mc "Error executing git log:"] $err"
+        return 0
     }
     set i [reg_instance $fd]
     set viewinstances($view) [list $i]
     set viewmainheadid($view) $mainheadid
     set viewmainheadid_orig($view) $mainheadid
     if {$files ne {} && $mainheadid ne {}} {
-	get_viewmainhead $view
+        get_viewmainhead $view
     }
     if {$showlocalchanges && $viewmainheadid($view) ne {}} {
-	interestedin $viewmainheadid($view) dodiffindex
+        interestedin $viewmainheadid($view) dodiffindex
     }
     fconfigure $fd -blocking 0 -translation lf -eofchar {}
     if {$tclencoding != {}} {
-	fconfigure $fd -encoding $tclencoding
+        fconfigure $fd -encoding $tclencoding
     }
     filerun $fd [list getcommitlines $fd $i $view 0]
     nowbusy $view [mc "Reading"]
@@ -444,13 +443,13 @@ proc stop_instance {inst} {
 
     set fd $commfd($inst)
     catch {
-	set pid [pid $fd]
+        set pid [pid $fd]
 
-	if {$::tcl_platform(platform) eq {windows}} {
-	    exec taskkill /pid $pid
-	} else {
-	    exec kill $pid
-	}
+        if {$::tcl_platform(platform) eq {windows}} {
+            exec taskkill /pid $pid
+        } else {
+            exec kill $pid
+        }
     }
     catch {close $fd}
     nukefile $fd
@@ -462,7 +461,7 @@ proc stop_backends {} {
     global commfd
 
     foreach inst [array names commfd] {
-	stop_instance $inst
+        stop_instance $inst
     }
 }
 
@@ -470,7 +469,7 @@ proc stop_rev_list {view} {
     global viewinstances
 
     foreach inst $viewinstances($view) {
-	stop_instance $inst
+        stop_instance $inst
     }
     set viewinstances($view) {}
 }
@@ -479,11 +478,11 @@ proc reset_pending_select {selid} {
     global pending_select mainheadid selectheadid
 
     if {$selid ne {}} {
-	set pending_select $selid
+        set pending_select $selid
     } elseif {$selectheadid ne {}} {
-	set pending_select $selectheadid
+        set pending_select $selectheadid
     } else {
-	set pending_select $mainheadid
+        set pending_select $mainheadid
     }
 }
 
@@ -492,11 +491,11 @@ proc getcommits {selid} {
 
     initlayout
     if {[start_rev_list $curview]} {
-	reset_pending_select $selid
-	show_status [mc "Reading commits..."]
-	set need_redisplay 1
+        reset_pending_select $selid
+        show_status [mc "Reading commits..."]
+        set need_redisplay 1
     } else {
-	show_status [mc "No commits selected"]
+        show_status [mc "No commits selected"]
     }
 }
 
@@ -513,67 +512,67 @@ proc updatecommits {} {
     rereadrefs
     set view $curview
     if {$mainheadid ne $viewmainheadid_orig($view)} {
-	if {$showlocalchanges} {
-	    dohidelocalchanges
-	}
-	set viewmainheadid($view) $mainheadid
-	set viewmainheadid_orig($view) $mainheadid
-	if {$vfilelimit($view) ne {}} {
-	    get_viewmainhead $view
-	}
+        if {$showlocalchanges} {
+            dohidelocalchanges
+        }
+        set viewmainheadid($view) $mainheadid
+        set viewmainheadid_orig($view) $mainheadid
+        if {$vfilelimit($view) ne {}} {
+            get_viewmainhead $view
+        }
     }
     if {$showlocalchanges} {
-	doshowlocalchanges
+        doshowlocalchanges
     }
     if {$vcanopt($view)} {
-	set oldpos $vposids($view)
-	set oldneg $vnegids($view)
-	set revs [parseviewrevs $view $vrevs($view)]
-	if {$revs eq {}} {
-	    return
-	}
-	# note: getting the delta when negative refs change is hard,
-	# and could require multiple git log invocations, so in that
-	# case we ask git log for all the commits (not just the delta)
-	if {$oldneg eq $vnegids($view)} {
-	    set newrevs {}
-	    set npos 0
-	    # take out positive refs that we asked for before or
-	    # that we have already seen
-	    foreach rev $revs {
-		if {[string length $rev] == 40} {
-		    if {[lsearch -exact $oldpos $rev] < 0
-			&& ![info exists varcid($view,$rev)]} {
-			lappend newrevs $rev
-			incr npos
-		    }
-		} else {
-		    lappend $newrevs $rev
-		}
-	    }
-	    if {$npos == 0} return
-	    set revs $newrevs
-	    set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]]
-	}
-	set args [concat $vflags($view) $revs --not $oldpos]
+        set oldpos $vposids($view)
+        set oldneg $vnegids($view)
+        set revs [parseviewrevs $view $vrevs($view)]
+        if {$revs eq {}} {
+            return
+        }
+        # note: getting the delta when negative refs change is hard,
+        # and could require multiple git log invocations, so in that
+        # case we ask git log for all the commits (not just the delta)
+        if {$oldneg eq $vnegids($view)} {
+            set newrevs {}
+            set npos 0
+            # take out positive refs that we asked for before or
+            # that we have already seen
+            foreach rev $revs {
+                if {[string length $rev] == 40} {
+                    if {[lsearch -exact $oldpos $rev] < 0
+                        && ![info exists varcid($view,$rev)]} {
+                        lappend newrevs $rev
+                        incr npos
+                    }
+                } else {
+                    lappend $newrevs $rev
+                }
+            }
+            if {$npos == 0} return
+            set revs $newrevs
+            set vposids($view) [lsort -unique [concat $oldpos $vposids($view)]]
+        }
+        set args [concat $vflags($view) $revs --not $oldpos]
     } else {
-	set args $vorigargs($view)
+        set args $vorigargs($view)
     }
     if {[catch {
-	set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
-			--parents --boundary $args "--" $vfilelimit($view)] r]
+        set fd [open [concat | git log --no-color -z --pretty=raw $show_notes \
+                        --parents --boundary $args "--" $vfilelimit($view)] r]
     } err]} {
-	error_popup "[mc "Error executing git log:"] $err"
-	return
+        error_popup "[mc "Error executing git log:"] $err"
+        return
     }
     if {$viewactive($view) == 0} {
-	set startmsecs [clock clicks -milliseconds]
+        set startmsecs [clock clicks -milliseconds]
     }
     set i [reg_instance $fd]
     lappend viewinstances($view) $i
     fconfigure $fd -blocking 0 -translation lf -eofchar {}
     if {$tclencoding != {}} {
-	fconfigure $fd -encoding $tclencoding
+        fconfigure $fd -encoding $tclencoding
     }
     filerun $fd [list getcommitlines $fd $i $view 1]
     incr viewactive($view)
@@ -581,7 +580,7 @@ proc updatecommits {} {
     reset_pending_select {}
     nowbusy $view [mc "Reading"]
     if {$showneartags} {
-	getallcommits
+        getallcommits
     }
 }
 
@@ -592,11 +591,11 @@ proc reloadcommits {} {
 
     set selid {}
     if {$selectedline ne {}} {
-	set selid $currentid
+        set selid $currentid
     }
 
     if {!$viewcomplete($curview)} {
-	stop_rev_list $curview
+        stop_rev_list $curview
     }
     resetvarcs $curview
     set selectedline {}
@@ -606,7 +605,7 @@ proc reloadcommits {} {
     readrefs
     changedrefs
     if {$showneartags} {
-	getallcommits
+        getallcommits
     }
     clear_display
     unset -nocomplain commitinfo
@@ -622,11 +621,11 @@ proc reloadcommits {} {
 # sorts as a string in numerical order
 proc strrep {n} {
     if {$n < 16} {
-	return [format "%x" $n]
+        return [format "%x" $n]
     } elseif {$n < 256} {
-	return [format "x%.2x" $n]
+        return [format "x%.2x" $n]
     } elseif {$n < 65536} {
-	return [format "y%.4x" $n]
+        return [format "y%.4x" $n]
     }
     return [format "z%.8x" $n]
 }
@@ -657,22 +656,22 @@ proc resetvarcs {view} {
     global vshortids
 
     foreach vid [array names varcid $view,*] {
-	unset varcid($vid)
-	unset children($vid)
-	unset parents($vid)
+        unset varcid($vid)
+        unset children($vid)
+        unset parents($vid)
     }
     foreach vid [array names vshortids $view,*] {
-	unset vshortids($vid)
+        unset vshortids($vid)
     }
     # some commits might have children but haven't been seen yet
     foreach vid [array names children $view,*] {
-	unset children($vid)
+        unset children($vid)
     }
     foreach va [array names varccommits $view,*] {
-	unset varccommits($va)
+        unset varccommits($va)
     }
     foreach vd [array names vseedcount $view,*] {
-	unset vseedcount($vd)
+        unset vseedcount($vd)
     }
     unset -nocomplain ordertok
 }
@@ -684,8 +683,8 @@ proc seeds {v} {
     set ret {}
     set a [lindex $vdownptr($v) 0]
     while {$a != 0} {
-	lappend ret [lindex $varcstart($v) $a]
-	set a [lindex $vleftptr($v) $a]
+        lappend ret [lindex $varcstart($v) $a]
+        set a [lindex $vleftptr($v) $a]
     }
     return $ret
 }
@@ -698,60 +697,60 @@ proc newvarc {view id} {
     set a [llength $varctok($view)]
     set vid $view,$id
     if {[llength $children($vid)] == 0 || $vdatemode($view)} {
-	if {![info exists commitinfo($id)]} {
-	    parsecommit $id $commitdata($id) 1
-	}
-	set cdate [lindex [lindex $commitinfo($id) 4] 0]
-	if {![string is integer -strict $cdate]} {
-	    set cdate 0
-	}
-	if {![info exists vseedcount($view,$cdate)]} {
-	    set vseedcount($view,$cdate) -1
-	}
-	set c [incr vseedcount($view,$cdate)]
-	set cdate [expr {$cdate ^ 0xffffffff}]
-	set tok "s[strrep $cdate][strrep $c]"
+        if {![info exists commitinfo($id)]} {
+            parsecommit $id $commitdata($id) 1
+        }
+        set cdate [lindex [lindex $commitinfo($id) 4] 0]
+        if {![string is integer -strict $cdate]} {
+            set cdate 0
+        }
+        if {![info exists vseedcount($view,$cdate)]} {
+            set vseedcount($view,$cdate) -1
+        }
+        set c [incr vseedcount($view,$cdate)]
+        set cdate [expr {$cdate ^ 0xffffffff}]
+        set tok "s[strrep $cdate][strrep $c]"
     } else {
-	set tok {}
+        set tok {}
     }
     set ka 0
     if {[llength $children($vid)] > 0} {
-	set kid [lindex $children($vid) end]
-	set k $varcid($view,$kid)
-	if {[string compare [lindex $varctok($view) $k] $tok] > 0} {
-	    set ki $kid
-	    set ka $k
-	    set tok [lindex $varctok($view) $k]
-	}
+        set kid [lindex $children($vid) end]
+        set k $varcid($view,$kid)
+        if {[string compare [lindex $varctok($view) $k] $tok] > 0} {
+            set ki $kid
+            set ka $k
+            set tok [lindex $varctok($view) $k]
+        }
     }
     if {$ka != 0} {
-	set i [lsearch -exact $parents($view,$ki) $id]
-	set j [expr {[llength $parents($view,$ki)] - 1 - $i}]
-	append tok [strrep $j]
+        set i [lsearch -exact $parents($view,$ki) $id]
+        set j [expr {[llength $parents($view,$ki)] - 1 - $i}]
+        append tok [strrep $j]
     }
     set c [lindex $vlastins($view) $ka]
     if {$c == 0 || [string compare $tok [lindex $varctok($view) $c]] < 0} {
-	set c $ka
-	set b [lindex $vdownptr($view) $ka]
+        set c $ka
+        set b [lindex $vdownptr($view) $ka]
     } else {
-	set b [lindex $vleftptr($view) $c]
+        set b [lindex $vleftptr($view) $c]
     }
     while {$b != 0 && [string compare $tok [lindex $varctok($view) $b]] >= 0} {
-	set c $b
-	set b [lindex $vleftptr($view) $c]
+        set c $b
+        set b [lindex $vleftptr($view) $c]
     }
     if {$c == $ka} {
-	lset vdownptr($view) $ka $a
-	lappend vbackptr($view) 0
+        lset vdownptr($view) $ka $a
+        lappend vbackptr($view) 0
     } else {
-	lset vleftptr($view) $c $a
-	lappend vbackptr($view) $c
+        lset vleftptr($view) $c $a
+        lappend vbackptr($view) $c
     }
     lset vlastins($view) $ka $a
     lappend vupptr($view) $ka
     lappend vleftptr($view) $b
     if {$b != 0} {
-	lset vbackptr($view) $b $a
+        lset vbackptr($view) $b $a
     }
     lappend varctok($view) $tok
     lappend varcstart($view) $id
@@ -782,7 +781,7 @@ proc splitvarc {p v} {
     set varccommits($v,$na) [lrange $ac $i end]
     lappend varcstart($v) $p
     foreach id $varccommits($v,$na) {
-	set varcid($v,$id) $na
+        set varcid($v,$id) $na
     }
     lappend vdownptr($v) [lindex $vdownptr($v) $oa]
     lappend vlastins($v) [lindex $vlastins($v) $oa]
@@ -792,10 +791,10 @@ proc splitvarc {p v} {
     lappend vleftptr($v) 0
     lappend vbackptr($v) 0
     for {set b [lindex $vdownptr($v) $na]} {$b != 0} {set b [lindex $vleftptr($v) $b]} {
-	lset vupptr($v) $b $na
+        lset vupptr($v) $b $na
     }
     if {[string compare $otok $vtokmod($v)] <= 0} {
-	modify_arc $v $oa
+        modify_arc $v $oa
     }
 }
 
@@ -809,120 +808,120 @@ proc renumbervarc {a v} {
     set kidchanged($a) 1
     set ntot 0
     while {$a != 0} {
-	if {[info exists isrelated($a)]} {
-	    lappend todo $a
-	    set id [lindex $varccommits($v,$a) end]
-	    foreach p $parents($v,$id) {
-		if {[info exists varcid($v,$p)]} {
-		    set isrelated($varcid($v,$p)) 1
-		}
-	    }
-	}
-	incr ntot
-	set b [lindex $vdownptr($v) $a]
-	if {$b == 0} {
-	    while {$a != 0} {
-		set b [lindex $vleftptr($v) $a]
-		if {$b != 0} break
-		set a [lindex $vupptr($v) $a]
-	    }
-	}
-	set a $b
+        if {[info exists isrelated($a)]} {
+            lappend todo $a
+            set id [lindex $varccommits($v,$a) end]
+            foreach p $parents($v,$id) {
+                if {[info exists varcid($v,$p)]} {
+                    set isrelated($varcid($v,$p)) 1
+                }
+            }
+        }
+        incr ntot
+        set b [lindex $vdownptr($v) $a]
+        if {$b == 0} {
+            while {$a != 0} {
+                set b [lindex $vleftptr($v) $a]
+                if {$b != 0} break
+                set a [lindex $vupptr($v) $a]
+            }
+        }
+        set a $b
     }
     foreach a $todo {
-	if {![info exists kidchanged($a)]} continue
-	set id [lindex $varcstart($v) $a]
-	if {[llength $children($v,$id)] > 1} {
-	    set children($v,$id) [lsort -command [list vtokcmp $v] \
-				      $children($v,$id)]
-	}
-	set oldtok [lindex $varctok($v) $a]
-	if {!$vdatemode($v)} {
-	    set tok {}
-	} else {
-	    set tok $oldtok
-	}
-	set ka 0
-	set kid [last_real_child $v,$id]
-	if {$kid ne {}} {
-	    set k $varcid($v,$kid)
-	    if {[string compare [lindex $varctok($v) $k] $tok] > 0} {
-		set ki $kid
-		set ka $k
-		set tok [lindex $varctok($v) $k]
-	    }
-	}
-	if {$ka != 0} {
-	    set i [lsearch -exact $parents($v,$ki) $id]
-	    set j [expr {[llength $parents($v,$ki)] - 1 - $i}]
-	    append tok [strrep $j]
-	}
-	if {$tok eq $oldtok} {
-	    continue
-	}
-	set id [lindex $varccommits($v,$a) end]
-	foreach p $parents($v,$id) {
-	    if {[info exists varcid($v,$p)]} {
-		set kidchanged($varcid($v,$p)) 1
-	    } else {
-		set sortkids($p) 1
-	    }
-	}
-	lset varctok($v) $a $tok
-	set b [lindex $vupptr($v) $a]
-	if {$b != $ka} {
-	    if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} {
-		modify_arc $v $ka
-	    }
-	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
-		modify_arc $v $b
-	    }
-	    set c [lindex $vbackptr($v) $a]
-	    set d [lindex $vleftptr($v) $a]
-	    if {$c == 0} {
-		lset vdownptr($v) $b $d
-	    } else {
-		lset vleftptr($v) $c $d
-	    }
-	    if {$d != 0} {
-		lset vbackptr($v) $d $c
-	    }
-	    if {[lindex $vlastins($v) $b] == $a} {
-		lset vlastins($v) $b $c
-	    }
-	    lset vupptr($v) $a $ka
-	    set c [lindex $vlastins($v) $ka]
-	    if {$c == 0 || \
-		    [string compare $tok [lindex $varctok($v) $c]] < 0} {
-		set c $ka
-		set b [lindex $vdownptr($v) $ka]
-	    } else {
-		set b [lindex $vleftptr($v) $c]
-	    }
-	    while {$b != 0 && \
-		      [string compare $tok [lindex $varctok($v) $b]] >= 0} {
-		set c $b
-		set b [lindex $vleftptr($v) $c]
-	    }
-	    if {$c == $ka} {
- 		lset vdownptr($v) $ka $a
-		lset vbackptr($v) $a 0
-	    } else {
-		lset vleftptr($v) $c $a
-		lset vbackptr($v) $a $c
-	    }
-	    lset vleftptr($v) $a $b
-	    if {$b != 0} {
-		lset vbackptr($v) $b $a
-	    }
-	    lset vlastins($v) $ka $a
-	}
+        if {![info exists kidchanged($a)]} continue
+        set id [lindex $varcstart($v) $a]
+        if {[llength $children($v,$id)] > 1} {
+            set children($v,$id) [lsort -command [list vtokcmp $v] \
+                                      $children($v,$id)]
+        }
+        set oldtok [lindex $varctok($v) $a]
+        if {!$vdatemode($v)} {
+            set tok {}
+        } else {
+            set tok $oldtok
+        }
+        set ka 0
+        set kid [last_real_child $v,$id]
+        if {$kid ne {}} {
+            set k $varcid($v,$kid)
+            if {[string compare [lindex $varctok($v) $k] $tok] > 0} {
+                set ki $kid
+                set ka $k
+                set tok [lindex $varctok($v) $k]
+            }
+        }
+        if {$ka != 0} {
+            set i [lsearch -exact $parents($v,$ki) $id]
+            set j [expr {[llength $parents($v,$ki)] - 1 - $i}]
+            append tok [strrep $j]
+        }
+        if {$tok eq $oldtok} {
+            continue
+        }
+        set id [lindex $varccommits($v,$a) end]
+        foreach p $parents($v,$id) {
+            if {[info exists varcid($v,$p)]} {
+                set kidchanged($varcid($v,$p)) 1
+            } else {
+                set sortkids($p) 1
+            }
+        }
+        lset varctok($v) $a $tok
+        set b [lindex $vupptr($v) $a]
+        if {$b != $ka} {
+            if {[string compare [lindex $varctok($v) $ka] $vtokmod($v)] < 0} {
+                modify_arc $v $ka
+            }
+            if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
+                modify_arc $v $b
+            }
+            set c [lindex $vbackptr($v) $a]
+            set d [lindex $vleftptr($v) $a]
+            if {$c == 0} {
+                lset vdownptr($v) $b $d
+            } else {
+                lset vleftptr($v) $c $d
+            }
+            if {$d != 0} {
+                lset vbackptr($v) $d $c
+            }
+            if {[lindex $vlastins($v) $b] == $a} {
+                lset vlastins($v) $b $c
+            }
+            lset vupptr($v) $a $ka
+            set c [lindex $vlastins($v) $ka]
+            if {$c == 0 || \
+                    [string compare $tok [lindex $varctok($v) $c]] < 0} {
+                set c $ka
+                set b [lindex $vdownptr($v) $ka]
+            } else {
+                set b [lindex $vleftptr($v) $c]
+            }
+            while {$b != 0 && \
+                      [string compare $tok [lindex $varctok($v) $b]] >= 0} {
+                set c $b
+                set b [lindex $vleftptr($v) $c]
+            }
+            if {$c == $ka} {
+                lset vdownptr($v) $ka $a
+                lset vbackptr($v) $a 0
+            } else {
+                lset vleftptr($v) $c $a
+                lset vbackptr($v) $a $c
+            }
+            lset vleftptr($v) $a $b
+            if {$b != 0} {
+                lset vbackptr($v) $b $a
+            }
+            lset vlastins($v) $ka $a
+        }
     }
     foreach id [array names sortkids] {
-	if {[llength $children($v,$id)] > 1} {
-	    set children($v,$id) [lsort -command [list vtokcmp $v] \
-				      $children($v,$id)]
-	}
+        if {[llength $children($v,$id)] > 1} {
+            set children($v,$id) [lsort -command [list vtokcmp $v] \
+                                      $children($v,$id)]
+        }
     }
     set t2 [clock clicks -milliseconds]
     #puts "renumbervarc did [llength $todo] of $ntot arcs in [expr {$t2-$t1}]ms"
@@ -936,14 +935,14 @@ proc fix_reversal {p a v} {
 
     set pa $varcid($v,$p)
     if {$p ne [lindex $varcstart($v) $pa]} {
-	splitvarc $p $v
-	set pa $varcid($v,$p)
+        splitvarc $p $v
+        set pa $varcid($v,$p)
     }
     # seeds always need to be renumbered
     if {[lindex $vupptr($v) $pa] == 0 ||
-	[string compare [lindex $varctok($v) $a] \
-	     [lindex $varctok($v) $pa]] > 0} {
-	renumbervarc $pa $v
+        [string compare [lindex $varctok($v) $a] \
+             [lindex $varctok($v) $pa]] > 0} {
+        renumbervarc $pa $v
     }
 }
 
@@ -961,24 +960,24 @@ proc insertrow {id p v} {
     set varcid($vid) $a
     lappend vshortids($v,[string range $id 0 3]) $id
     if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] < 0} {
-	modify_arc $v $a
+        modify_arc $v $a
     }
     lappend varccommits($v,$a) $id
     set vp $v,$p
     if {[llength [lappend children($vp) $id]] > 1} {
-	set children($vp) [lsort -command [list vtokcmp $v] $children($vp)]
-	unset -nocomplain ordertok
+        set children($vp) [lsort -command [list vtokcmp $v] $children($vp)]
+        unset -nocomplain ordertok
     }
     fix_reversal $p $a $v
     incr commitidx($v)
     if {$v == $curview} {
-	set numcommits $commitidx($v)
-	setcanvscroll
-	if {[info exists targetid]} {
-	    if {![comes_before $targetid $p]} {
-		incr targetrow
-	    }
-	}
+        set numcommits $commitidx($v)
+        setcanvscroll
+        if {[info exists targetid]} {
+            if {![comes_before $targetid $p]} {
+                incr targetrow
+            }
+        }
     }
 }
 
@@ -990,8 +989,8 @@ proc insertfakerow {id p} {
     set a $varcid($v,$p)
     set i [lsearch -exact $varccommits($v,$a) $p]
     if {$i < 0} {
-	puts "oops: insertfakerow can't find [shortids $p] on arc $a"
-	return
+        puts "oops: insertfakerow can't find [shortids $p] on arc $a"
+        return
     }
     set children($v,$id) {}
     set parents($v,$id) [list $p]
@@ -1003,9 +1002,9 @@ proc insertfakerow {id p} {
     set varccommits($v,$a) [linsert $varccommits($v,$a) $i $id]
     modify_arc $v $a $i
     if {[info exists targetid]} {
-	if {![comes_before $targetid $p]} {
-	    incr targetrow
-	}
+        if {![comes_before $targetid $p]} {
+            incr targetrow
+        }
     }
     setcanvscroll
     drawvisible
@@ -1018,15 +1017,15 @@ proc removefakerow {id} {
 
     set v $curview
     if {[llength $parents($v,$id)] != 1} {
-	puts "oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
-	return
+        puts "oops: removefakerow [shortids $id] has [llength $parents($v,$id)] parents"
+        return
     }
     set p [lindex $parents($v,$id) 0]
     set a $varcid($v,$id)
     set i [lsearch -exact $varccommits($v,$a) $id]
     if {$i < 0} {
-	puts "oops: removefakerow can't find [shortids $id] on arc $a"
-	return
+        puts "oops: removefakerow can't find [shortids $id] on arc $a"
+        return
     }
     unset varcid($v,$id)
     set varccommits($v,$a) [lreplace $varccommits($v,$a) $i $i]
@@ -1036,15 +1035,15 @@ proc removefakerow {id} {
     set numcommits [incr commitidx($v) -1]
     set j [lsearch -exact $children($v,$p) $id]
     if {$j >= 0} {
-	set children($v,$p) [lreplace $children($v,$p) $j $j]
+        set children($v,$p) [lreplace $children($v,$p) $j $j]
     }
     modify_arc $v $a $i
     if {[info exist currentid] && $id eq $currentid} {
-	unset currentid
-	set selectedline {}
+        unset currentid
+        set selectedline {}
     }
     if {[info exists targetid] && $targetid eq $id} {
-	set targetid $p
+        set targetid $p
     }
     setcanvscroll
     drawvisible
@@ -1055,9 +1054,9 @@ proc real_children {vp} {
 
     set kids {}
     foreach id $children($vp) {
-	if {$id ne $nullid && $id ne $nullid2} {
-	    lappend kids $id
-	}
+        if {$id ne $nullid && $id ne $nullid2} {
+            lappend kids $id
+        }
     }
     return $kids
 }
@@ -1066,9 +1065,9 @@ proc first_real_child {vp} {
     global children nullid nullid2
 
     foreach id $children($vp) {
-	if {$id ne $nullid && $id ne $nullid2} {
-	    return $id
-	}
+        if {$id ne $nullid && $id ne $nullid2} {
+            return $id
+        }
     }
     return {}
 }
@@ -1078,10 +1077,10 @@ proc last_real_child {vp} {
 
     set kids $children($vp)
     for {set i [llength $kids]} {[incr i -1] >= 0} {} {
-	set id [lindex $kids $i]
-	if {$id ne $nullid && $id ne $nullid2} {
-	    return $id
-	}
+        set id [lindex $kids $i]
+        if {$id ne $nullid && $id ne $nullid2} {
+            return $id
+        }
     }
     return {}
 }
@@ -1090,7 +1089,7 @@ proc vtokcmp {v a b} {
     global varctok varcid
 
     return [string compare [lindex $varctok($v) $varcid($v,$a)] \
-		[lindex $varctok($v) $varcid($v,$b)]]
+                [lindex $varctok($v) $varcid($v,$b)]]
 }
 
 # This assumes that if lim is not given, the caller has checked that
@@ -1099,29 +1098,29 @@ proc modify_arc {v a {lim {}}} {
     global varctok vtokmod varcmod varcrow vupptr curview vrowmod varccommits
 
     if {$lim ne {}} {
-	set c [string compare [lindex $varctok($v) $a] $vtokmod($v)]
-	if {$c > 0} return
-	if {$c == 0} {
-	    set r [lindex $varcrow($v) $a]
-	    if {$r ne {} && $vrowmod($v) <= $r + $lim} return
-	}
+        set c [string compare [lindex $varctok($v) $a] $vtokmod($v)]
+        if {$c > 0} return
+        if {$c == 0} {
+            set r [lindex $varcrow($v) $a]
+            if {$r ne {} && $vrowmod($v) <= $r + $lim} return
+        }
     }
     set vtokmod($v) [lindex $varctok($v) $a]
     set varcmod($v) $a
     if {$v == $curview} {
-	while {$a != 0 && [lindex $varcrow($v) $a] eq {}} {
-	    set a [lindex $vupptr($v) $a]
-	    set lim {}
-	}
-	set r 0
-	if {$a != 0} {
-	    if {$lim eq {}} {
-		set lim [llength $varccommits($v,$a)]
-	    }
-	    set r [expr {[lindex $varcrow($v) $a] + $lim}]
-	}
-	set vrowmod($v) $r
-	undolayout $r
+        while {$a != 0 && [lindex $varcrow($v) $a] eq {}} {
+            set a [lindex $vupptr($v) $a]
+            set lim {}
+        }
+        set r 0
+        if {$a != 0} {
+            if {$lim eq {}} {
+                set lim [llength $varccommits($v,$a)]
+            }
+            set r [expr {[lindex $varcrow($v) $a] + $lim}]
+        }
+        set vrowmod($v) $r
+        undolayout $r
     }
 }
 
@@ -1133,62 +1132,62 @@ proc update_arcrows {v} {
 
     if {$vrowmod($v) == $commitidx($v)} return
     if {$v == $curview} {
-	if {[llength $displayorder] > $vrowmod($v)} {
-	    set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]]
-	    set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]]
-	}
-	unset -nocomplain cached_commitrow
+        if {[llength $displayorder] > $vrowmod($v)} {
+            set displayorder [lrange $displayorder 0 [expr {$vrowmod($v) - 1}]]
+            set parentlist [lrange $parentlist 0 [expr {$vrowmod($v) - 1}]]
+        }
+        unset -nocomplain cached_commitrow
     }
     set narctot [expr {[llength $varctok($v)] - 1}]
     set a $varcmod($v)
     while {$a != 0 && [lindex $varcix($v) $a] eq {}} {
-	# go up the tree until we find something that has a row number,
-	# or we get to a seed
-	set a [lindex $vupptr($v) $a]
+        # go up the tree until we find something that has a row number,
+        # or we get to a seed
+        set a [lindex $vupptr($v) $a]
     }
     if {$a == 0} {
-	set a [lindex $vdownptr($v) 0]
-	if {$a == 0} return
-	set vrownum($v) {0}
-	set varcorder($v) [list $a]
-	lset varcix($v) $a 0
-	lset varcrow($v) $a 0
-	set arcn 0
-	set row 0
+        set a [lindex $vdownptr($v) 0]
+        if {$a == 0} return
+        set vrownum($v) {0}
+        set varcorder($v) [list $a]
+        lset varcix($v) $a 0
+        lset varcrow($v) $a 0
+        set arcn 0
+        set row 0
     } else {
-	set arcn [lindex $varcix($v) $a]
-	if {[llength $vrownum($v)] > $arcn + 1} {
-	    set vrownum($v) [lrange $vrownum($v) 0 $arcn]
-	    set varcorder($v) [lrange $varcorder($v) 0 $arcn]
-	}
-	set row [lindex $varcrow($v) $a]
+        set arcn [lindex $varcix($v) $a]
+        if {[llength $vrownum($v)] > $arcn + 1} {
+            set vrownum($v) [lrange $vrownum($v) 0 $arcn]
+            set varcorder($v) [lrange $varcorder($v) 0 $arcn]
+        }
+        set row [lindex $varcrow($v) $a]
     }
     while {1} {
-	set p $a
-	incr row [llength $varccommits($v,$a)]
-	# go down if possible
-	set b [lindex $vdownptr($v) $a]
-	if {$b == 0} {
-	    # if not, go left, or go up until we can go left
-	    while {$a != 0} {
-		set b [lindex $vleftptr($v) $a]
-		if {$b != 0} break
-		set a [lindex $vupptr($v) $a]
-	    }
-	    if {$a == 0} break
-	}
-	set a $b
-	incr arcn
-	lappend vrownum($v) $row
-	lappend varcorder($v) $a
-	lset varcix($v) $a $arcn
-	lset varcrow($v) $a $row
+        set p $a
+        incr row [llength $varccommits($v,$a)]
+        # go down if possible
+        set b [lindex $vdownptr($v) $a]
+        if {$b == 0} {
+            # if not, go left, or go up until we can go left
+            while {$a != 0} {
+                set b [lindex $vleftptr($v) $a]
+                if {$b != 0} break
+                set a [lindex $vupptr($v) $a]
+            }
+            if {$a == 0} break
+        }
+        set a $b
+        incr arcn
+        lappend vrownum($v) $row
+        lappend varcorder($v) $a
+        lset varcix($v) $a $arcn
+        lset varcrow($v) $a $row
     }
     set vtokmod($v) [lindex $varctok($v) $p]
     set varcmod($v) $p
     set vrowmod($v) $row
     if {[info exists currentid]} {
-	set selectedline [rowofcommit $currentid]
+        set selectedline [rowofcommit $currentid]
     }
 }
 
@@ -1206,20 +1205,20 @@ proc rowofcommit {id} {
 
     set v $curview
     if {![info exists varcid($v,$id)]} {
-	puts "oops rowofcommit no arc for [shortids $id]"
-	return {}
+        puts "oops rowofcommit no arc for [shortids $id]"
+        return {}
     }
     set a $varcid($v,$id)
     if {[string compare [lindex $varctok($v) $a] $vtokmod($v)] >= 0} {
-	update_arcrows $v
+        update_arcrows $v
     }
     if {[info exists cached_commitrow($id)]} {
-	return $cached_commitrow($id)
+        return $cached_commitrow($id)
     }
     set i [lsearch -exact $varccommits($v,$a) $id]
     if {$i < 0} {
-	puts "oops didn't find commit [shortids $id] in arc $a"
-	return {}
+        puts "oops didn't find commit [shortids $id] in arc $a"
+        return {}
     }
     incr i [lindex $varcrow($v) $a]
     set cached_commitrow($id) $i
@@ -1232,32 +1231,32 @@ proc comes_before {a b} {
 
     set v $curview
     if {$a eq $b || ![info exists varcid($v,$a)] || \
-	    ![info exists varcid($v,$b)]} {
-	return 0
+            ![info exists varcid($v,$b)]} {
+        return 0
     }
     if {$varcid($v,$a) != $varcid($v,$b)} {
-	return [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \
-			   [lindex $varctok($v) $varcid($v,$b)]] < 0}]
+        return [expr {[string compare [lindex $varctok($v) $varcid($v,$a)] \
+                           [lindex $varctok($v) $varcid($v,$b)]] < 0}]
     }
     return [expr {[rowofcommit $a] < [rowofcommit $b]}]
 }
 
 proc bsearch {l elt} {
     if {[llength $l] == 0 || $elt <= [lindex $l 0]} {
-	return 0
+        return 0
     }
     set lo 0
     set hi [llength $l]
     while {$hi - $lo > 1} {
-	set mid [expr {int(($lo + $hi) / 2)}]
-	set t [lindex $l $mid]
-	if {$elt < $t} {
-	    set hi $mid
-	} elseif {$elt > $t} {
-	    set lo $mid
-	} else {
-	    return $mid
-	}
+        set mid [expr {int(($lo + $hi) / 2)}]
+        set t [lindex $l $mid]
+        if {$elt < $t} {
+            set hi $mid
+        } elseif {$elt > $t} {
+            set lo $mid
+        } else {
+            return $mid
+        }
     }
     return $lo
 }
@@ -1269,37 +1268,37 @@ proc make_disporder {start end} {
     global d_valid_start d_valid_end
 
     if {$end > $vrowmod($curview)} {
-	update_arcrows $curview
+        update_arcrows $curview
     }
     set ai [bsearch $vrownum($curview) $start]
     set start [lindex $vrownum($curview) $ai]
     set narc [llength $vrownum($curview)]
     for {set r $start} {$ai < $narc && $r < $end} {incr ai} {
-	set a [lindex $varcorder($curview) $ai]
-	set l [llength $displayorder]
-	set al [llength $varccommits($curview,$a)]
-	if {$l < $r + $al} {
-	    if {$l < $r} {
-		set pad [ntimes [expr {$r - $l}] {}]
-		set displayorder [concat $displayorder $pad]
-		set parentlist [concat $parentlist $pad]
-	    } elseif {$l > $r} {
-		set displayorder [lrange $displayorder 0 [expr {$r - 1}]]
-		set parentlist [lrange $parentlist 0 [expr {$r - 1}]]
-	    }
-	    foreach id $varccommits($curview,$a) {
-		lappend displayorder $id
-		lappend parentlist $parents($curview,$id)
-	    }
-	} elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} {
-	    set i $r
-	    foreach id $varccommits($curview,$a) {
-		lset displayorder $i $id
-		lset parentlist $i $parents($curview,$id)
-		incr i
-	    }
-	}
-	incr r $al
+        set a [lindex $varcorder($curview) $ai]
+        set l [llength $displayorder]
+        set al [llength $varccommits($curview,$a)]
+        if {$l < $r + $al} {
+            if {$l < $r} {
+                set pad [ntimes [expr {$r - $l}] {}]
+                set displayorder [concat $displayorder $pad]
+                set parentlist [concat $parentlist $pad]
+            } elseif {$l > $r} {
+                set displayorder [lrange $displayorder 0 [expr {$r - 1}]]
+                set parentlist [lrange $parentlist 0 [expr {$r - 1}]]
+            }
+            foreach id $varccommits($curview,$a) {
+                lappend displayorder $id
+                lappend parentlist $parents($curview,$id)
+            }
+        } elseif {[lindex $displayorder [expr {$r + $al - 1}]] eq {}} {
+            set i $r
+            foreach id $varccommits($curview,$a) {
+                lset displayorder $i $id
+                lset parentlist $i $parents($curview,$id)
+                incr i
+            }
+        }
+        incr r $al
     }
 }
 
@@ -1308,8 +1307,8 @@ proc commitonrow {row} {
 
     set id [lindex $displayorder $row]
     if {$id eq {}} {
-	make_disporder $row [expr {$row + 1}]
-	set id [lindex $displayorder $row]
+        make_disporder $row [expr {$row + 1}]
+        set id [lindex $displayorder $row]
     }
     return $id
 }
@@ -1322,35 +1321,35 @@ proc closevarcs {v} {
     set scripts {}
     set narcs [llength $varctok($v)]
     for {set a 1} {$a < $narcs} {incr a} {
-	set id [lindex $varccommits($v,$a) end]
-	foreach p $parents($v,$id) {
-	    if {[info exists varcid($v,$p)]} continue
-	    # add p as a new commit
-	    incr missing_parents
-	    set cmitlisted($v,$p) 0
-	    set parents($v,$p) {}
-	    if {[llength $children($v,$p)] == 1 &&
-		[llength $parents($v,$id)] == 1} {
-		set b $a
-	    } else {
-		set b [newvarc $v $p]
-	    }
-	    set varcid($v,$p) $b
-	    if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
-		modify_arc $v $b
-	    }
-	    lappend varccommits($v,$b) $p
-	    incr commitidx($v)
-	    if {$v == $curview} {
-		set numcommits $commitidx($v)
-	    }
-	    set scripts [check_interest $p $scripts]
-	}
+        set id [lindex $varccommits($v,$a) end]
+        foreach p $parents($v,$id) {
+            if {[info exists varcid($v,$p)]} continue
+            # add p as a new commit
+            incr missing_parents
+            set cmitlisted($v,$p) 0
+            set parents($v,$p) {}
+            if {[llength $children($v,$p)] == 1 &&
+                [llength $parents($v,$id)] == 1} {
+                set b $a
+            } else {
+                set b [newvarc $v $p]
+            }
+            set varcid($v,$p) $b
+            if {[string compare [lindex $varctok($v) $b] $vtokmod($v)] < 0} {
+                modify_arc $v $b
+            }
+            lappend varccommits($v,$b) $p
+            incr commitidx($v)
+            if {$v == $curview} {
+                set numcommits $commitidx($v)
+            }
+            set scripts [check_interest $p $scripts]
+        }
     }
     if {$missing_parents > 0} {
-	foreach s $scripts {
-	    eval $s
-	}
+        foreach s $scripts {
+            eval $s
+        }
     }
 }
 
@@ -1360,23 +1359,23 @@ proc rewrite_commit {v id rwid} {
     global children parents varcid varctok vtokmod varccommits
 
     foreach ch $children($v,$id) {
-	# make $rwid be $ch's parent in place of $id
-	set i [lsearch -exact $parents($v,$ch) $id]
-	if {$i < 0} {
-	    puts "oops rewrite_commit didn't find $id in parent list for $ch"
-	}
-	set parents($v,$ch) [lreplace $parents($v,$ch) $i $i $rwid]
-	# add $ch to $rwid's children and sort the list if necessary
-	if {[llength [lappend children($v,$rwid) $ch]] > 1} {
-	    set children($v,$rwid) [lsort -command [list vtokcmp $v] \
-					$children($v,$rwid)]
-	}
-	# fix the graph after joining $id to $rwid
-	set a $varcid($v,$ch)
-	fix_reversal $rwid $a $v
-	# parentlist is wrong for the last element of arc $a
-	# even if displayorder is right, hence the 3rd arg here
-	modify_arc $v $a [expr {[llength $varccommits($v,$a)] - 1}]
+        # make $rwid be $ch's parent in place of $id
+        set i [lsearch -exact $parents($v,$ch) $id]
+        if {$i < 0} {
+            puts "oops rewrite_commit didn't find $id in parent list for $ch"
+        }
+        set parents($v,$ch) [lreplace $parents($v,$ch) $i $i $rwid]
+        # add $ch to $rwid's children and sort the list if necessary
+        if {[llength [lappend children($v,$rwid) $ch]] > 1} {
+            set children($v,$rwid) [lsort -command [list vtokcmp $v] \
+                                        $children($v,$rwid)]
+        }
+        # fix the graph after joining $id to $rwid
+        set a $varcid($v,$ch)
+        fix_reversal $rwid $a $v
+        # parentlist is wrong for the last element of arc $a
+        # even if displayorder is right, hence the 3rd arg here
+        modify_arc $v $a [expr {[llength $varccommits($v,$a)] - 1}]
     }
 }
 
@@ -1396,19 +1395,19 @@ proc check_interest {id scripts} {
 
     set prefix [string range $id 0 3]
     if {[info exists commitinterest($prefix)]} {
-	set newlist {}
-	foreach {i script} $commitinterest($prefix) {
-	    if {[string match "$i*" $id]} {
-		lappend scripts [string map [list "%I" $id "%P" $i] $script]
-	    } else {
-		lappend newlist $i $script
-	    }
-	}
-	if {$newlist ne {}} {
-	    set commitinterest($prefix) $newlist
-	} else {
-	    unset commitinterest($prefix)
-	}
+        set newlist {}
+        foreach {i script} $commitinterest($prefix) {
+            if {[string match "$i*" $id]} {
+                lappend scripts [string map [list "%I" $id "%P" $i] $script]
+            } else {
+                lappend newlist $i $script
+            }
+        }
+        if {$newlist ne {}} {
+            set commitinterest($prefix) $newlist
+        } else {
+            unset commitinterest($prefix)
+        }
     }
     return $scripts
 }
@@ -1423,192 +1422,192 @@ proc getcommitlines {fd inst view updating}  {
     set stuff [read $fd 500000]
     # git log doesn't terminate the last commit with a null...
     if {$stuff == {} && $leftover($inst) ne {} && [eof $fd]} {
-	set stuff "\0"
+        set stuff "\0"
     }
     if {$stuff == {}} {
-	if {![eof $fd]} {
-	    return 1
-	}
-	global commfd viewcomplete viewactive viewname
-	global viewinstances
-	unset commfd($inst)
-	set i [lsearch -exact $viewinstances($view) $inst]
-	if {$i >= 0} {
-	    set viewinstances($view) [lreplace $viewinstances($view) $i $i]
-	}
-	# set it blocking so we wait for the process to terminate
-	fconfigure $fd -blocking 1
-	if {[catch {close $fd} err]} {
-	    set fv {}
-	    if {$view != $curview} {
-		set fv " for the \"$viewname($view)\" view"
-	    }
-	    if {[string range $err 0 4] == "usage"} {
-		set err "Gitk: error reading commits$fv:\
-			bad arguments to git log."
-		if {$viewname($view) eq [mc "Command line"]} {
-		    append err \
-			"  (Note: arguments to gitk are passed to git log\
-			 to allow selection of commits to be displayed.)"
-		}
-	    } else {
-		set err "Error reading commits$fv: $err"
-	    }
-	    error_popup $err
-	}
-	if {[incr viewactive($view) -1] <= 0} {
-	    set viewcomplete($view) 1
-	    # Check if we have seen any ids listed as parents that haven't
-	    # appeared in the list
-	    closevarcs $view
-	    notbusy $view
-	}
-	if {$view == $curview} {
-	    run chewcommits
-	}
-	return 0
+        if {![eof $fd]} {
+            return 1
+        }
+        global commfd viewcomplete viewactive viewname
+        global viewinstances
+        unset commfd($inst)
+        set i [lsearch -exact $viewinstances($view) $inst]
+        if {$i >= 0} {
+            set viewinstances($view) [lreplace $viewinstances($view) $i $i]
+        }
+        # set it blocking so we wait for the process to terminate
+        fconfigure $fd -blocking 1
+        if {[catch {close $fd} err]} {
+            set fv {}
+            if {$view != $curview} {
+                set fv " for the \"$viewname($view)\" view"
+            }
+            if {[string range $err 0 4] == "usage"} {
+                set err "Gitk: error reading commits$fv:\
+                        bad arguments to git log."
+                if {$viewname($view) eq [mc "Command line"]} {
+                    append err \
+                        "  (Note: arguments to gitk are passed to git log\
+                         to allow selection of commits to be displayed.)"
+                }
+            } else {
+                set err "Error reading commits$fv: $err"
+            }
+            error_popup $err
+        }
+        if {[incr viewactive($view) -1] <= 0} {
+            set viewcomplete($view) 1
+            # Check if we have seen any ids listed as parents that haven't
+            # appeared in the list
+            closevarcs $view
+            notbusy $view
+        }
+        if {$view == $curview} {
+            run chewcommits
+        }
+        return 0
     }
     set start 0
     set gotsome 0
     set scripts {}
     while 1 {
-	set i [string first "\0" $stuff $start]
-	if {$i < 0} {
-	    append leftover($inst) [string range $stuff $start end]
-	    break
-	}
-	if {$start == 0} {
-	    set cmit $leftover($inst)
-	    append cmit [string range $stuff 0 [expr {$i - 1}]]
-	    set leftover($inst) {}
-	} else {
-	    set cmit [string range $stuff $start [expr {$i - 1}]]
-	}
-	set start [expr {$i + 1}]
-	set j [string first "\n" $cmit]
-	set ok 0
-	set listed 1
-	if {$j >= 0 && [string match "commit *" $cmit]} {
-	    set ids [string range $cmit 7 [expr {$j - 1}]]
-	    if {[string match {[-^<>]*} $ids]} {
-		switch -- [string index $ids 0] {
-		    "-" {set listed 0}
-		    "^" {set listed 2}
-		    "<" {set listed 3}
-		    ">" {set listed 4}
-		}
-		set ids [string range $ids 1 end]
-	    }
-	    set ok 1
-	    foreach id $ids {
-		if {[string length $id] != 40} {
-		    set ok 0
-		    break
-		}
-	    }
-	}
-	if {!$ok} {
-	    set shortcmit $cmit
-	    if {[string length $shortcmit] > 80} {
-		set shortcmit "[string range $shortcmit 0 80]..."
-	    }
-	    error_popup "[mc "Can't parse git log output:"] {$shortcmit}"
-	    exit 1
-	}
-	set id [lindex $ids 0]
-	set vid $view,$id
-
-	lappend vshortids($view,[string range $id 0 3]) $id
-
-	if {!$listed && $updating && ![info exists varcid($vid)] &&
-	    $vfilelimit($view) ne {}} {
-	    # git log doesn't rewrite parents for unlisted commits
-	    # when doing path limiting, so work around that here
-	    # by working out the rewritten parent with git rev-list
-	    # and if we already know about it, using the rewritten
-	    # parent as a substitute parent for $id's children.
-	    if {![catch {
-		set rwid [exec git rev-list --first-parent --max-count=1 \
-			      $id -- $vfilelimit($view)]
-	    }]} {
-		if {$rwid ne {} && [info exists varcid($view,$rwid)]} {
-		    # use $rwid in place of $id
-		    rewrite_commit $view $id $rwid
-		    continue
-		}
-	    }
-	}
-
-	set a 0
-	if {[info exists varcid($vid)]} {
-	    if {$cmitlisted($vid) || !$listed} continue
-	    set a $varcid($vid)
-	}
-	if {$listed} {
-	    set olds [lrange $ids 1 end]
-	} else {
-	    set olds {}
-	}
-	set commitdata($id) [string range $cmit [expr {$j + 1}] end]
-	set cmitlisted($vid) $listed
-	set parents($vid) $olds
-	if {![info exists children($vid)]} {
-	    set children($vid) {}
-	} elseif {$a == 0 && [llength $children($vid)] == 1} {
-	    set k [lindex $children($vid) 0]
-	    if {[llength $parents($view,$k)] == 1 &&
-		(!$vdatemode($view) ||
-		 $varcid($view,$k) == [llength $varctok($view)] - 1)} {
-		set a $varcid($view,$k)
-	    }
-	}
-	if {$a == 0} {
-	    # new arc
-	    set a [newvarc $view $id]
-	}
-	if {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} {
-	    modify_arc $view $a
-	}
-	if {![info exists varcid($vid)]} {
-	    set varcid($vid) $a
-	    lappend varccommits($view,$a) $id
-	    incr commitidx($view)
-	}
-
-	set i 0
-	foreach p $olds {
-	    if {$i == 0 || [lsearch -exact $olds $p] >= $i} {
-		set vp $view,$p
-		if {[llength [lappend children($vp) $id]] > 1 &&
-		    [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} {
-		    set children($vp) [lsort -command [list vtokcmp $view] \
-					   $children($vp)]
-		    unset -nocomplain ordertok
-		}
-		if {[info exists varcid($view,$p)]} {
-		    fix_reversal $p $a $view
-		}
-	    }
-	    incr i
-	}
-
-	set scripts [check_interest $id $scripts]
-	set gotsome 1
+        set i [string first "\0" $stuff $start]
+        if {$i < 0} {
+            append leftover($inst) [string range $stuff $start end]
+            break
+        }
+        if {$start == 0} {
+            set cmit $leftover($inst)
+            append cmit [string range $stuff 0 [expr {$i - 1}]]
+            set leftover($inst) {}
+        } else {
+            set cmit [string range $stuff $start [expr {$i - 1}]]
+        }
+        set start [expr {$i + 1}]
+        set j [string first "\n" $cmit]
+        set ok 0
+        set listed 1
+        if {$j >= 0 && [string match "commit *" $cmit]} {
+            set ids [string range $cmit 7 [expr {$j - 1}]]
+            if {[string match {[-^<>]*} $ids]} {
+                switch -- [string index $ids 0] {
+                    "-" {set listed 0}
+                    "^" {set listed 2}
+                    "<" {set listed 3}
+                    ">" {set listed 4}
+                }
+                set ids [string range $ids 1 end]
+            }
+            set ok 1
+            foreach id $ids {
+                if {[string length $id] != 40} {
+                    set ok 0
+                    break
+                }
+            }
+        }
+        if {!$ok} {
+            set shortcmit $cmit
+            if {[string length $shortcmit] > 80} {
+                set shortcmit "[string range $shortcmit 0 80]..."
+            }
+            error_popup "[mc "Can't parse git log output:"] {$shortcmit}"
+            exit 1
+        }
+        set id [lindex $ids 0]
+        set vid $view,$id
+
+        lappend vshortids($view,[string range $id 0 3]) $id
+
+        if {!$listed && $updating && ![info exists varcid($vid)] &&
+            $vfilelimit($view) ne {}} {
+            # git log doesn't rewrite parents for unlisted commits
+            # when doing path limiting, so work around that here
+            # by working out the rewritten parent with git rev-list
+            # and if we already know about it, using the rewritten
+            # parent as a substitute parent for $id's children.
+            if {![catch {
+                set rwid [exec git rev-list --first-parent --max-count=1 \
+                              $id -- $vfilelimit($view)]
+            }]} {
+                if {$rwid ne {} && [info exists varcid($view,$rwid)]} {
+                    # use $rwid in place of $id
+                    rewrite_commit $view $id $rwid
+                    continue
+                }
+            }
+        }
+
+        set a 0
+        if {[info exists varcid($vid)]} {
+            if {$cmitlisted($vid) || !$listed} continue
+            set a $varcid($vid)
+        }
+        if {$listed} {
+            set olds [lrange $ids 1 end]
+        } else {
+            set olds {}
+        }
+        set commitdata($id) [string range $cmit [expr {$j + 1}] end]
+        set cmitlisted($vid) $listed
+        set parents($vid) $olds
+        if {![info exists children($vid)]} {
+            set children($vid) {}
+        } elseif {$a == 0 && [llength $children($vid)] == 1} {
+            set k [lindex $children($vid) 0]
+            if {[llength $parents($view,$k)] == 1 &&
+                (!$vdatemode($view) ||
+                 $varcid($view,$k) == [llength $varctok($view)] - 1)} {
+                set a $varcid($view,$k)
+            }
+        }
+        if {$a == 0} {
+            # new arc
+            set a [newvarc $view $id]
+        }
+        if {[string compare [lindex $varctok($view) $a] $vtokmod($view)] < 0} {
+            modify_arc $view $a
+        }
+        if {![info exists varcid($vid)]} {
+            set varcid($vid) $a
+            lappend varccommits($view,$a) $id
+            incr commitidx($view)
+        }
+
+        set i 0
+        foreach p $olds {
+            if {$i == 0 || [lsearch -exact $olds $p] >= $i} {
+                set vp $view,$p
+                if {[llength [lappend children($vp) $id]] > 1 &&
+                    [vtokcmp $view [lindex $children($vp) end-1] $id] > 0} {
+                    set children($vp) [lsort -command [list vtokcmp $view] \
+                                           $children($vp)]
+                    unset -nocomplain ordertok
+                }
+                if {[info exists varcid($view,$p)]} {
+                    fix_reversal $p $a $view
+                }
+            }
+            incr i
+        }
+
+        set scripts [check_interest $id $scripts]
+        set gotsome 1
     }
     if {$gotsome} {
-	global numcommits hlview
-
-	if {$view == $curview} {
-	    set numcommits $commitidx($view)
-	    run chewcommits
-	}
-	if {[info exists hlview] && $view == $hlview} {
-	    # we never actually get here...
-	    run vhighlightmore
-	}
-	foreach s $scripts {
-	    eval $s
-	}
+        global numcommits hlview
+
+        if {$view == $curview} {
+            set numcommits $commitidx($view)
+            run chewcommits
+        }
+        if {[info exists hlview] && $view == $hlview} {
+            # we never actually get here...
+            run vhighlightmore
+        }
+        foreach s $scripts {
+            eval $s
+        }
     }
     return 2
 }
@@ -1619,28 +1618,28 @@ proc chewcommits {} {
 
     layoutmore
     if {$viewcomplete($curview)} {
-	global commitidx varctok
-	global numcommits startmsecs
-
-	if {[info exists pending_select]} {
-	    update
-	    reset_pending_select {}
-
-	    if {[commitinview $pending_select $curview]} {
-		selectline [rowofcommit $pending_select] 1
-	    } else {
-		set row [first_real_row]
-		selectline $row 1
-	    }
-	}
-	if {$commitidx($curview) > 0} {
-	    #set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
-	    #puts "overall $ms ms for $numcommits commits"
-	    #puts "[llength $varctok($view)] arcs, $commitidx($view) commits"
-	} else {
-	    show_status [mc "No commits selected"]
-	}
-	notbusy layout
+        global commitidx varctok
+        global numcommits startmsecs
+
+        if {[info exists pending_select]} {
+            update
+            reset_pending_select {}
+
+            if {[commitinview $pending_select $curview]} {
+                selectline [rowofcommit $pending_select] 1
+            } else {
+                set row [first_real_row]
+                selectline $row 1
+            }
+        }
+        if {$commitidx($curview) > 0} {
+            #set ms [expr {[clock clicks -milliseconds] - $startmsecs}]
+            #puts "overall $ms ms for $numcommits commits"
+            #puts "[llength $varctok($view)] arcs, $commitidx($view) commits"
+        } else {
+            show_status [mc "No commits selected"]
+        }
+        notbusy layout
     }
     return 0
 }
@@ -1653,7 +1652,7 @@ proc do_readcommit {id} {
     # Read the results using i18n.logoutputencoding
     fconfigure $fd -translation lf -eofchar {}
     if {$tclencoding != {}} {
-	fconfigure $fd -encoding $tclencoding
+        fconfigure $fd -encoding $tclencoding
     }
     set contents [read $fd]
     close $fd
@@ -1680,44 +1679,44 @@ proc parsecommit {id contents listed} {
     set comdate {}
     set hdrend [string first "\n\n" $contents]
     if {$hdrend < 0} {
-	# should never happen...
-	set hdrend [string length $contents]
+        # should never happen...
+        set hdrend [string length $contents]
     }
     set header [string range $contents 0 [expr {$hdrend - 1}]]
     set comment [string range $contents [expr {$hdrend + 2}] end]
     foreach line [split $header "\n"] {
-	set line [split $line " "]
-	set tag [lindex $line 0]
-	if {$tag == "author"} {
-	    set audate [lrange $line end-1 end]
-	    set auname [join [lrange $line 1 end-2] " "]
-	} elseif {$tag == "committer"} {
-	    set comdate [lrange $line end-1 end]
-	    set comname [join [lrange $line 1 end-2] " "]
-	}
+        set line [split $line " "]
+        set tag [lindex $line 0]
+        if {$tag == "author"} {
+            set audate [lrange $line end-1 end]
+            set auname [join [lrange $line 1 end-2] " "]
+        } elseif {$tag == "committer"} {
+            set comdate [lrange $line end-1 end]
+            set comname [join [lrange $line 1 end-2] " "]
+        }
     }
     set headline {}
     # take the first non-blank line of the comment as the headline
     set headline [string trimleft $comment]
     set i [string first "\n" $headline]
     if {$i >= 0} {
-	set headline [string range $headline 0 $i]
+        set headline [string range $headline 0 $i]
     }
     set headline [string trimright $headline]
     set i [string first "\r" $headline]
     if {$i >= 0} {
-	set headline [string trimright [string range $headline 0 $i]]
+        set headline [string trimright [string range $headline 0 $i]]
     }
     if {!$listed} {
-	# git log indents the comment by 4 spaces;
-	# if we got this via git cat-file, add the indentation
-	set newcomment {}
-	foreach line [split $comment "\n"] {
-	    append newcomment "    "
-	    append newcomment $line
-	    append newcomment "\n"
-	}
-	set comment $newcomment
+        # git log indents the comment by 4 spaces;
+        # if we got this via git cat-file, add the indentation
+        set newcomment {}
+        foreach line [split $comment "\n"] {
+            append newcomment "    "
+            append newcomment $line
+            append newcomment "\n"
+        }
+        set comment $newcomment
     }
     set hasnote [string first "\nNotes:\n" $contents]
     set diff ""
@@ -1726,23 +1725,23 @@ proc parsecommit {id contents listed} {
     # diff.
     set i [string first "\n\ndiff" $comment]
     if {$i >= 0} {
-	set diff [string range $comment $i+1 end]
-	set comment [string range $comment 0 $i-1]
+        set diff [string range $comment $i+1 end]
+        set comment [string range $comment 0 $i-1]
     }
     set commitinfo($id) [list $headline $auname $audate \
-			     $comname $comdate $comment $hasnote $diff]
+                             $comname $comdate $comment $hasnote $diff]
 }
 
 proc getcommit {id} {
     global commitdata commitinfo
 
     if {[info exists commitdata($id)]} {
-	parsecommit $id $commitdata($id) 1
+        parsecommit $id $commitdata($id) 1
     } else {
-	readcommit $id
-	if {![info exists commitinfo($id)]} {
-	    set commitinfo($id) [list [mc "No commit information available"]]
-	}
+        readcommit $id
+        if {![info exists commitinfo($id)]} {
+            set commitinfo($id) [list [mc "No commit information available"]]
+        }
     }
     return 1
 }
@@ -1755,22 +1754,22 @@ proc longid {prefix} {
 
     set ids {}
     if {[string length $prefix] >= 4} {
-	set vshortid $curview,[string range $prefix 0 3]
-	if {[info exists vshortids($vshortid)]} {
-	    foreach id $vshortids($vshortid) {
-		if {[string match "$prefix*" $id]} {
-		    if {[lsearch -exact $ids $id] < 0} {
-			lappend ids $id
-			if {[llength $ids] >= 2} break
-		    }
-		}
-	    }
-	}
+        set vshortid $curview,[string range $prefix 0 3]
+        if {[info exists vshortids($vshortid)]} {
+            foreach id $vshortids($vshortid) {
+                if {[string match "$prefix*" $id]} {
+                    if {[lsearch -exact $ids $id] < 0} {
+                        lappend ids $id
+                        if {[llength $ids] >= 2} break
+                    }
+                }
+            }
+        }
     } else {
-	foreach match [array names varcid "$curview,$prefix*"] {
-	    lappend ids [lindex [split $match ","] 1]
-	    if {[llength $ids] >= 2} break
-	}
+        foreach match [array names varcid "$curview,$prefix*"] {
+            lappend ids [lindex [split $match ","] 1]
+            if {[llength $ids] >= 2} break
+        }
     }
     return $ids
 }
@@ -1780,57 +1779,61 @@ proc readrefs {} {
     global otherrefids idotherrefs mainhead mainheadid
     global selecthead selectheadid
     global hideremotes
+    global tclencoding
 
     foreach v {tagids idtags headids idheads otherrefids idotherrefs} {
-	unset -nocomplain $v
+        unset -nocomplain $v
     }
     set refd [open [list | git show-ref -d] r]
+    if {$tclencoding != {}} {
+        fconfigure $refd -encoding $tclencoding
+    }
     while {[gets $refd line] >= 0} {
-	if {[string index $line 40] ne " "} continue
-	set id [string range $line 0 39]
-	set ref [string range $line 41 end]
-	if {![string match "refs/*" $ref]} continue
-	set name [string range $ref 5 end]
-	if {[string match "remotes/*" $name]} {
-	    if {![string match "*/HEAD" $name] && !$hideremotes} {
-		set headids($name) $id
-		lappend idheads($id) $name
-	    }
-	} elseif {[string match "heads/*" $name]} {
-	    set name [string range $name 6 end]
-	    set headids($name) $id
-	    lappend idheads($id) $name
-	} elseif {[string match "tags/*" $name]} {
-	    # this lets refs/tags/foo^{} overwrite refs/tags/foo,
-	    # which is what we want since the former is the commit ID
-	    set name [string range $name 5 end]
-	    if {[string match "*^{}" $name]} {
-		set name [string range $name 0 end-3]
-	    } else {
-		set tagobjid($name) $id
-	    }
-	    set tagids($name) $id
-	    lappend idtags($id) $name
-	} else {
-	    set otherrefids($name) $id
-	    lappend idotherrefs($id) $name
-	}
+        if {[string index $line 40] ne " "} continue
+        set id [string range $line 0 39]
+        set ref [string range $line 41 end]
+        if {![string match "refs/*" $ref]} continue
+        set name [string range $ref 5 end]
+        if {[string match "remotes/*" $name]} {
+            if {![string match "*/HEAD" $name] && !$hideremotes} {
+                set headids($name) $id
+                lappend idheads($id) $name
+            }
+        } elseif {[string match "heads/*" $name]} {
+            set name [string range $name 6 end]
+            set headids($name) $id
+            lappend idheads($id) $name
+        } elseif {[string match "tags/*" $name]} {
+            # this lets refs/tags/foo^{} overwrite refs/tags/foo,
+            # which is what we want since the former is the commit ID
+            set name [string range $name 5 end]
+            if {[string match "*^{}" $name]} {
+                set name [string range $name 0 end-3]
+            } else {
+                set tagobjid($name) $id
+            }
+            set tagids($name) $id
+            lappend idtags($id) $name
+        } else {
+            set otherrefids($name) $id
+            lappend idotherrefs($id) $name
+        }
     }
     catch {close $refd}
     set mainhead {}
     set mainheadid {}
     catch {
-	set mainheadid [exec git rev-parse HEAD]
-	set thehead [exec git symbolic-ref HEAD]
-	if {[string match "refs/heads/*" $thehead]} {
-	    set mainhead [string range $thehead 11 end]
-	}
+        set mainheadid [exec git rev-parse HEAD]
+        set thehead [exec git symbolic-ref HEAD]
+        if {[string match "refs/heads/*" $thehead]} {
+            set mainhead [string range $thehead 11 end]
+        }
     }
     set selectheadid {}
     if {$selecthead ne {}} {
-	catch {
-	    set selectheadid [exec git rev-parse --verify $selecthead]
-	}
+        catch {
+            set selectheadid [exec git rev-parse --verify $selecthead]
+        }
     }
 }
 
@@ -1839,10 +1842,10 @@ proc first_real_row {} {
     global nullid nullid2 numcommits
 
     for {set row 0} {$row < $numcommits} {incr row} {
-	set id [commitonrow $row]
-	if {$id ne $nullid && $id ne $nullid2} {
-	    break
-	}
+        set id [commitonrow $row]
+        if {$id ne $nullid && $id ne $nullid2} {
+            break
+        }
     }
     return $row
 }
@@ -1861,12 +1864,12 @@ proc removehead {id name} {
     global headids idheads
 
     if {$idheads($id) eq $name} {
-	unset idheads($id)
+        unset idheads($id)
     } else {
-	set i [lsearch -exact $idheads($id) $name]
-	if {$i >= 0} {
-	    set idheads($id) [lreplace $idheads($id) $i $i]
-	}
+        set i [lsearch -exact $idheads($id) $name]
+        if {$i >= 0} {
+            set idheads($id) [lreplace $idheads($id) $i $i]
+        }
     }
     unset headids($name)
 }
@@ -1894,7 +1897,7 @@ proc make_transient {window origin} {
     # Windows fails to place transient windows normally, so
     # schedule a callback to center them on the parent.
     if {[tk windowingsystem] eq {win32}} {
-	after idle [list tk::PlaceWindow $window widget $origin]
+        after idle [list tk::PlaceWindow $window widget $origin]
     }
 }
 
@@ -1994,41 +1997,41 @@ proc setttkstyle {} {
 proc makemenu {m items} {
     menu $m
     if {[tk windowingsystem] eq {aqua}} {
-	set Meta1 Cmd
+        set Meta1 Cmd
     } else {
-	set Meta1 Ctrl
+        set Meta1 Ctrl
     }
     foreach i $items {
-	set name [mc [lindex $i 1]]
-	set type [lindex $i 2]
-	set thing [lindex $i 3]
-	set params [list $type]
-	if {$name ne {}} {
-	    set u [string first "&" [string map {&& x} $name]]
-	    lappend params -label [string map {&& & & {}} $name]
-	    if {$u >= 0} {
-		lappend params -underline $u
-	    }
-	}
-	switch -- $type {
-	    "cascade" {
-		set submenu [string tolower [string map {& ""} [lindex $i 1]]]
-		lappend params -menu $m.$submenu
-	    }
-	    "command" {
-		lappend params -command $thing
-	    }
-	    "radiobutton" {
-		lappend params -variable [lindex $thing 0] \
-		    -value [lindex $thing 1]
-	    }
-	}
-	set tail [lrange $i 4 end]
-	regsub -all {\yMeta1\y} $tail $Meta1 tail
-	eval $m add $params $tail
-	if {$type eq "cascade"} {
-	    makemenu $m.$submenu $thing
-	}
+        set name [mc [lindex $i 1]]
+        set type [lindex $i 2]
+        set thing [lindex $i 3]
+        set params [list $type]
+        if {$name ne {}} {
+            set u [string first "&" [string map {&& x} $name]]
+            lappend params -label [string map {&& & & {}} $name]
+            if {$u >= 0} {
+                lappend params -underline $u
+            }
+        }
+        switch -- $type {
+            "cascade" {
+                set submenu [string tolower [string map {& ""} [lindex $i 1]]]
+                lappend params -menu $m.$submenu
+            }
+            "command" {
+                lappend params -command $thing
+            }
+            "radiobutton" {
+                lappend params -variable [lindex $thing 0] \
+                    -value [lindex $thing 1]
+            }
+        }
+        set tail [lrange $i 4 end]
+        regsub -all {\yMeta1\y} $tail $Meta1 tail
+        eval $m add $params $tail
+        if {$type eq "cascade"} {
+            makemenu $m.$submenu $thing
+        }
     }
 }
 
@@ -2048,12 +2051,12 @@ proc makedroplist {w varname args} {
             set cx [string length $label]
             if {$cx > $width} {set width $cx}
         }
-	set gm [ttk::combobox $w -width $width -state readonly\
-		    -textvariable $varname -values $args \
-		    -exportselection false]
-	bind $gm <<ComboboxSelected>> [list $gm selection clear]
+        set gm [ttk::combobox $w -width $width -state readonly\
+                    -textvariable $varname -values $args \
+                    -exportselection false]
+        bind $gm <<ComboboxSelected>> [list $gm selection clear]
     } else {
-	set gm [eval [linsert $args 0 tk_optionMenu $w $varname]]
+        set gm [eval [linsert $args 0 tk_optionMenu $w $varname]]
     }
     return $gm
 }
@@ -2069,7 +2072,7 @@ proc makewindow {} {
     global rowctxmenu fakerowmenu mergemax wrapcomment
     global highlight_files gdttype
     global searchstring sstring
-    global bgcolor fgcolor bglist fglist diffcolors selectbgcolor
+    global bgcolor fgcolor bglist fglist diffcolors diffbgcolors selectbgcolor
     global uifgcolor uifgdisabledcolor
     global filesepbgcolor filesepfgcolor
     global mergecolors foundbgcolor currentsearchhitbgcolor
@@ -2083,49 +2086,49 @@ proc makewindow {} {
     # The "mc" arguments here are purely so that xgettext
     # sees the following string as needing to be translated
     set file {
-	mc "&File" cascade {
-	    {mc "&Update" command updatecommits -accelerator F5}
-	    {mc "&Reload" command reloadcommits -accelerator Shift-F5}
-	    {mc "Reread re&ferences" command rereadrefs}
-	    {mc "&List references" command showrefs -accelerator F2}
-	    {xx "" separator}
-	    {mc "Start git &gui" command {exec git gui &}}
-	    {xx "" separator}
-	    {mc "&Quit" command doquit -accelerator Meta1-Q}
-	}}
+        mc "&File" cascade {
+            {mc "&Update" command updatecommits -accelerator F5}
+            {mc "&Reload" command reloadcommits -accelerator Shift-F5}
+            {mc "Reread re&ferences" command rereadrefs}
+            {mc "&List references" command showrefs -accelerator F2}
+            {xx "" separator}
+            {mc "Start git &gui" command {exec git gui &}}
+            {xx "" separator}
+            {mc "&Quit" command doquit -accelerator Meta1-Q}
+        }}
     set edit {
-	mc "&Edit" cascade {
-	    {mc "&Preferences" command doprefs}
-	}}
+        mc "&Edit" cascade {
+            {mc "&Preferences" command doprefs}
+        }}
     set view {
-	mc "&View" cascade {
-	    {mc "&New view..." command {newview 0} -accelerator Shift-F4}
-	    {mc "&Edit view..." command editview -state disabled -accelerator F4}
-	    {mc "&Delete view" command delview -state disabled}
-	    {xx "" separator}
-	    {mc "&All files" radiobutton {selectedview 0} -command {showview 0}}
-	}}
+        mc "&View" cascade {
+            {mc "&New view..." command {newview 0} -accelerator Shift-F4}
+            {mc "&Edit view..." command editview -state disabled -accelerator F4}
+            {mc "&Delete view" command delview -state disabled}
+            {xx "" separator}
+            {mc "&All files" radiobutton {selectedview 0} -command {showview 0}}
+        }}
     if {[tk windowingsystem] ne "aqua"} {
-	set help {
-	mc "&Help" cascade {
-	    {mc "&About gitk" command about}
-	    {mc "&Key bindings" command keys}
-	}}
-	set bar [list $file $edit $view $help]
+        set help {
+        mc "&Help" cascade {
+            {mc "&About gitk" command about}
+            {mc "&Key bindings" command keys}
+        }}
+        set bar [list $file $edit $view $help]
     } else {
-	proc ::tk::mac::ShowPreferences {} {doprefs}
-	proc ::tk::mac::Quit {} {doquit}
-	lset file end [lreplace [lindex $file end] end-1 end]
-	set apple {
-	xx "&Apple" cascade {
-	    {mc "&About gitk" command about}
-	    {xx "" separator}
-	}}
-	set help {
-	mc "&Help" cascade {
-	    {mc "&Key bindings" command keys}
-	}}
-	set bar [list $apple $file $view $help]
+        proc ::tk::mac::ShowPreferences {} {doprefs}
+        proc ::tk::mac::Quit {} {doquit}
+        lset file end [lreplace [lindex $file end] end-1 end]
+        set apple {
+        xx "&Apple" cascade {
+            {mc "&About gitk" command about}
+            {xx "" separator}
+        }}
+        set help {
+        mc "&Help" cascade {
+            {mc "&Key bindings" command keys}
+        }}
+        set bar [list $apple $file $view $help]
     }
     makemenu .bar $bar
     . configure -menu .bar
@@ -2153,36 +2156,36 @@ proc makewindow {} {
     ${NS}::frame .tf.histframe
     ${NS}::panedwindow .tf.histframe.pwclist -orient horizontal
     if {!$use_ttk} {
-	.tf.histframe.pwclist configure -sashpad 0 -handlesize 4
+        .tf.histframe.pwclist configure -sashpad 0 -handlesize 4
     }
 
     # create three canvases
     set cscroll .tf.histframe.csb
     set canv .tf.histframe.pwclist.canv
     canvas $canv \
-	-selectbackground $selectbgcolor \
-	-background $bgcolor -bd 0 \
-	-yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
+        -selectbackground $selectbgcolor \
+        -background $bgcolor -bd 0 \
+        -yscrollincr $linespc -yscrollcommand "scrollcanv $cscroll"
     .tf.histframe.pwclist add $canv
     set canv2 .tf.histframe.pwclist.canv2
     canvas $canv2 \
-	-selectbackground $selectbgcolor \
-	-background $bgcolor -bd 0 -yscrollincr $linespc
+        -selectbackground $selectbgcolor \
+        -background $bgcolor -bd 0 -yscrollincr $linespc
     .tf.histframe.pwclist add $canv2
     set canv3 .tf.histframe.pwclist.canv3
     canvas $canv3 \
-	-selectbackground $selectbgcolor \
-	-background $bgcolor -bd 0 -yscrollincr $linespc
+        -selectbackground $selectbgcolor \
+        -background $bgcolor -bd 0 -yscrollincr $linespc
     .tf.histframe.pwclist add $canv3
     if {$use_ttk} {
-	bind .tf.histframe.pwclist <Map> {
-	    bind %W <Map> {}
-	    .tf.histframe.pwclist sashpos 1 [lindex $::geometry(pwsash1) 0]
-	    .tf.histframe.pwclist sashpos 0 [lindex $::geometry(pwsash0) 0]
-	}
+        bind .tf.histframe.pwclist <Map> {
+            bind %W <Map> {}
+            .tf.histframe.pwclist sashpos 1 [lindex $::geometry(pwsash1) 0]
+            .tf.histframe.pwclist sashpos 0 [lindex $::geometry(pwsash0) 0]
+        }
     } else {
-	eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
-	eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
+        eval .tf.histframe.pwclist sash place 0 $geometry(pwsash0)
+        eval .tf.histframe.pwclist sash place 1 $geometry(pwsash1)
     }
 
     # a scroll bar to rule them
@@ -2201,7 +2204,7 @@ proc makewindow {} {
     set entries $sha1entry
     set sha1but .tf.bar.sha1label
     button $sha1but -text "[mc "SHA1 ID:"] " -state disabled -relief flat \
-	-command gotocommit -width 8
+        -command gotocommit -width 8
     $sha1but conf -disabledforeground [$sha1but cget -foreground]
     pack .tf.bar.sha1label -side left
     ${NS}::entry $sha1entry -width 40 -font textfont -textvariable sha1string
@@ -2209,20 +2212,20 @@ proc makewindow {} {
     pack $sha1entry -side left -pady 2
 
     set bm_left_data {
-	#define left_width 16
-	#define left_height 16
-	static unsigned char left_bits[] = {
-	0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
-	0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
-	0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
+        #define left_width 16
+        #define left_height 16
+        static unsigned char left_bits[] = {
+        0x00, 0x00, 0xc0, 0x01, 0xe0, 0x00, 0x70, 0x00, 0x38, 0x00, 0x1c, 0x00,
+        0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00,
+        0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01};
     }
     set bm_right_data {
-	#define right_width 16
-	#define right_height 16
-	static unsigned char right_bits[] = {
-	0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
-	0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
-	0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
+        #define right_width 16
+        #define right_height 16
+        static unsigned char right_bits[] = {
+        0x00, 0x00, 0xc0, 0x01, 0x80, 0x03, 0x00, 0x07, 0x00, 0x0e, 0x00, 0x1c,
+        0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c,
+        0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01};
     }
     image create bitmap bm-left -data $bm_left_data -foreground $uifgcolor
     image create bitmap bm-left-gray -data $bm_left_data -foreground $uifgdisabledcolor
@@ -2231,28 +2234,28 @@ proc makewindow {} {
 
     ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26
     if {$use_ttk} {
-	.tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray]
+        .tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray]
     } else {
-	.tf.bar.leftbut configure -image bm-left
+        .tf.bar.leftbut configure -image bm-left
     }
     pack .tf.bar.leftbut -side left -fill y
     ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26
     if {$use_ttk} {
-	.tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray]
+        .tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray]
     } else {
-	.tf.bar.rightbut configure -image bm-right
+        .tf.bar.rightbut configure -image bm-right
     }
     pack .tf.bar.rightbut -side left -fill y
 
     ${NS}::label .tf.bar.rowlabel -text [mc "Row"]
     set rownumsel {}
     ${NS}::label .tf.bar.rownum -width 7 -textvariable rownumsel \
-	-relief sunken -anchor e
+        -relief sunken -anchor e
     ${NS}::label .tf.bar.rowlabel2 -text "/"
     ${NS}::label .tf.bar.numcommits -width 7 -textvariable numcommits \
-	-relief sunken -anchor e
+        -relief sunken -anchor e
     pack .tf.bar.rowlabel .tf.bar.rownum .tf.bar.rowlabel2 .tf.bar.numcommits \
-	-side left
+        -side left
     if {!$use_ttk} {
         foreach w {rownum numcommits} {.tf.bar.$w configure -font textfont}
     }
@@ -2264,14 +2267,14 @@ proc makewindow {} {
     ${NS}::label $statusw -width 15 -relief sunken
     pack $statusw -side left -padx 5
     if {$use_ttk} {
-	set progresscanv [ttk::progressbar .tf.bar.progress]
+        set progresscanv [ttk::progressbar .tf.bar.progress]
     } else {
-	set h [expr {[font metrics uifont -linespace] + 2}]
-	set progresscanv .tf.bar.progress
-	canvas $progresscanv -relief sunken -height $h -borderwidth 2
-	set progressitem [$progresscanv create rect -1 0 0 $h -fill "#00ff00"]
-	set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
-	set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
+        set h [expr {[font metrics uifont -linespace] + 2}]
+        set progresscanv .tf.bar.progress
+        canvas $progresscanv -relief sunken -height $h -borderwidth 2
+        set progressitem [$progresscanv create rect -1 0 0 $h -fill "#00ff00"]
+        set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
+        set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
     }
     pack $progresscanv -side right -expand 1 -fill x -padx {0 2}
     set progresscoords {0 0}
@@ -2285,26 +2288,26 @@ proc makewindow {} {
     ${NS}::label .tf.lbar.flabel -text "[mc "Find"] "
 
     set bm_down_data {
-	#define down_width 16
-	#define down_height 16
-	static unsigned char down_bits[] = {
-	0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
-	0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
-	0x87, 0xe1, 0x8e, 0x71, 0x9c, 0x39, 0xb8, 0x1d,
-	0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01};
+        #define down_width 16
+        #define down_height 16
+        static unsigned char down_bits[] = {
+        0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
+        0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
+        0x87, 0xe1, 0x8e, 0x71, 0x9c, 0x39, 0xb8, 0x1d,
+        0xf0, 0x0f, 0xe0, 0x07, 0xc0, 0x03, 0x80, 0x01};
     }
     image create bitmap bm-down -data $bm_down_data -foreground $uifgcolor
     ${NS}::button .tf.lbar.fnext -width 26 -command {dofind 1 1}
     .tf.lbar.fnext configure -image bm-down
 
     set bm_up_data {
-	#define up_width 16
-	#define up_height 16
-	static unsigned char up_bits[] = {
-	0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
-	0xb8, 0x1d, 0x9c, 0x39, 0x8e, 0x71, 0x87, 0xe1,
-	0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
-	0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01};
+        #define up_width 16
+        #define up_height 16
+        static unsigned char up_bits[] = {
+        0x80, 0x01, 0xc0, 0x03, 0xe0, 0x07, 0xf0, 0x0f,
+        0xb8, 0x1d, 0x9c, 0x39, 0x8e, 0x71, 0x87, 0xe1,
+        0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01,
+        0x80, 0x01, 0x80, 0x01, 0x80, 0x01, 0x80, 0x01};
     }
     image create bitmap bm-up -data $bm_up_data -foreground $uifgcolor
     ${NS}::button .tf.lbar.fprev -width 26 -command {dofind -1 1}
@@ -2313,13 +2316,13 @@ proc makewindow {} {
     ${NS}::label .tf.lbar.flab2 -text " [mc "commit"] "
 
     pack .tf.lbar.flabel .tf.lbar.fnext .tf.lbar.fprev .tf.lbar.flab2 \
-	-side left -fill y
+        -side left -fill y
     set gdttype [mc "containing:"]
     set gm [makedroplist .tf.lbar.gdttype gdttype \
-		[mc "containing:"] \
-		[mc "touching paths:"] \
-		[mc "adding/removing string:"] \
-		[mc "changing lines matching:"]]
+                [mc "containing:"] \
+                [mc "touching paths:"] \
+                [mc "adding/removing string:"] \
+                [mc "changing lines matching:"]]
     trace add variable gdttype write gdttype_change
     pack .tf.lbar.gdttype -side left -fill y
 
@@ -2330,11 +2333,11 @@ proc makewindow {} {
     trace add variable findstring write find_change
     set findtype [mc "Exact"]
     set findtypemenu [makedroplist .tf.lbar.findtype \
-			  findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]]
+                          findtype [mc "Exact"] [mc "IgnCase"] [mc "Regexp"]]
     trace add variable findtype write findcom_change
     set findloc [mc "All fields"]
     makedroplist .tf.lbar.findloc findloc [mc "All fields"] [mc "Headline"] \
-	[mc "Comments"] [mc "Author"] [mc "Committer"]
+        [mc "Comments"] [mc "Author"] [mc "Committer"]
     trace add variable findloc write find_change
     pack .tf.lbar.findloc -side right
     pack .tf.lbar.findtype -side right
@@ -2346,8 +2349,8 @@ proc makewindow {} {
     pack .tf.histframe -fill both -side top -expand 1
     .ctop add .tf
     if {!$use_ttk} {
-	.ctop paneconfigure .tf -height $geometry(topheight)
-	.ctop paneconfigure .tf -width $geometry(topwidth)
+        .ctop paneconfigure .tf -height $geometry(topheight)
+        .ctop paneconfigure .tf -width $geometry(topwidth)
     }
 
     # now build up the bottom
@@ -2357,9 +2360,9 @@ proc makewindow {} {
     # if we know window height, then that will set the lower text height, otherwise
     # we set lower text height which will drive window height
     if {[info exists geometry(main)]} {
-	${NS}::frame .bleft -width $geometry(botwidth)
+        ${NS}::frame .bleft -width $geometry(botwidth)
     } else {
-	${NS}::frame .bleft -width $geometry(botwidth) -height $geometry(botheight)
+        ${NS}::frame .bleft -width $geometry(botwidth) -height $geometry(botheight)
     }
     ${NS}::frame .bleft.top
     ${NS}::frame .bleft.mid
@@ -2377,41 +2380,41 @@ proc makewindow {} {
     trace add variable searchstring write incrsearch
     pack $sstring -side left -expand 1 -fill x
     ${NS}::radiobutton .bleft.mid.diff -text [mc "Diff"] \
-	-command changediffdisp -variable diffelide -value {0 0}
+        -command changediffdisp -variable diffelide -value {0 0}
     ${NS}::radiobutton .bleft.mid.old -text [mc "Old version"] \
-	-command changediffdisp -variable diffelide -value {0 1}
+        -command changediffdisp -variable diffelide -value {0 1}
     ${NS}::radiobutton .bleft.mid.new -text [mc "New version"] \
-	-command changediffdisp -variable diffelide -value {1 0}
+        -command changediffdisp -variable diffelide -value {1 0}
 
     ${NS}::label .bleft.mid.labeldiffcontext -text "      [mc "Lines of context"]: "
     pack .bleft.mid.diff .bleft.mid.old .bleft.mid.new -side left -ipadx $wgap
     spinbox .bleft.mid.diffcontext -width 5 \
-	-from 0 -increment 1 -to 10000000 \
-	-validate all -validatecommand "diffcontextvalidate %P" \
-	-textvariable diffcontextstring
+        -from 0 -increment 1 -to 10000000 \
+        -validate all -validatecommand "diffcontextvalidate %P" \
+        -textvariable diffcontextstring
     .bleft.mid.diffcontext set $diffcontext
     trace add variable diffcontextstring write diffcontextchange
     lappend entries .bleft.mid.diffcontext
     pack .bleft.mid.labeldiffcontext .bleft.mid.diffcontext -side left -ipadx $wgap
     ${NS}::checkbutton .bleft.mid.ignspace -text [mc "Ignore space change"] \
-	-command changeignorespace -variable ignorespace
+        -command changeignorespace -variable ignorespace
     pack .bleft.mid.ignspace -side left -padx 5
 
     set worddiff [mc "Line diff"]
     if {[package vcompare $git_version "1.7.2"] >= 0} {
-	makedroplist .bleft.mid.worddiff worddiff [mc "Line diff"] \
-	    [mc "Markup words"] [mc "Color words"]
-	trace add variable worddiff write changeworddiff
-	pack .bleft.mid.worddiff -side left -padx 5
+        makedroplist .bleft.mid.worddiff worddiff [mc "Line diff"] \
+            [mc "Markup words"] [mc "Color words"]
+        trace add variable worddiff write changeworddiff
+        pack .bleft.mid.worddiff -side left -padx 5
     }
 
     set ctext .bleft.bottom.ctext
     text $ctext -background $bgcolor -foreground $fgcolor \
-	-state disabled -undo 0 -font textfont \
-	-yscrollcommand scrolltext -wrap none \
-	-xscrollcommand ".bleft.bottom.sbhorizontal set"
+        -state disabled -undo 0 -font textfont \
+        -yscrollcommand scrolltext -wrap none \
+        -xscrollcommand ".bleft.bottom.sbhorizontal set"
     if {$have_tk85} {
-	$ctext conf -tabstyle wordprocessor
+        $ctext conf -tabstyle wordprocessor
     }
     ${NS}::scrollbar .bleft.bottom.sb -command "$ctext yview"
     ${NS}::scrollbar .bleft.bottom.sbhorizontal -command "$ctext xview" -orient h
@@ -2430,7 +2433,9 @@ proc makewindow {} {
     $ctext tag conf filesep -font textfontbold -fore $filesepfgcolor -back $filesepbgcolor
     $ctext tag conf hunksep -fore [lindex $diffcolors 2]
     $ctext tag conf d0 -fore [lindex $diffcolors 0]
+    $ctext tag conf d0 -back [lindex $diffbgcolors 0]
     $ctext tag conf dresult -fore [lindex $diffcolors 1]
+    $ctext tag conf dresult -back [lindex $diffbgcolors 1]
     $ctext tag conf m0 -fore [lindex $mergecolors 0]
     $ctext tag conf m1 -fore [lindex $mergecolors 1]
     $ctext tag conf m2 -fore [lindex $mergecolors 2]
@@ -2455,38 +2460,44 @@ proc makewindow {} {
     $ctext tag conf currentsearchhit -back $currentsearchhitbgcolor
     $ctext tag conf wwrap -wrap word -lmargin2 1c
     $ctext tag conf bold -font textfontbold
+    # set these to the lowest priority:
+    $ctext tag lower currentsearchhit
+    $ctext tag lower found
+    $ctext tag lower filesep
+    $ctext tag lower dresult
+    $ctext tag lower d0
 
     .pwbottom add .bleft
     if {!$use_ttk} {
-	.pwbottom paneconfigure .bleft -width $geometry(botwidth)
+        .pwbottom paneconfigure .bleft -width $geometry(botwidth)
     }
 
     # lower right
     ${NS}::frame .bright
     ${NS}::frame .bright.mode
     ${NS}::radiobutton .bright.mode.patch -text [mc "Patch"] \
-	-command reselectline -variable cmitmode -value "patch"
+        -command reselectline -variable cmitmode -value "patch"
     ${NS}::radiobutton .bright.mode.tree -text [mc "Tree"] \
-	-command reselectline -variable cmitmode -value "tree"
+        -command reselectline -variable cmitmode -value "tree"
     grid .bright.mode.patch .bright.mode.tree -sticky ew
     pack .bright.mode -side top -fill x
     set cflist .bright.cfiles
     set indent [font measure mainfont "nn"]
     text $cflist \
-	-selectbackground $selectbgcolor \
-	-background $bgcolor -foreground $fgcolor \
-	-font mainfont \
-	-tabs [list $indent [expr {2 * $indent}]] \
-	-yscrollcommand ".bright.sb set" \
-	-cursor [. cget -cursor] \
-	-spacing1 1 -spacing3 1
+        -selectbackground $selectbgcolor \
+        -background $bgcolor -foreground $fgcolor \
+        -font mainfont \
+        -tabs [list $indent [expr {2 * $indent}]] \
+        -yscrollcommand ".bright.sb set" \
+        -cursor [. cget -cursor] \
+        -spacing1 1 -spacing3 1
     lappend bglist $cflist
     lappend fglist $cflist
     ${NS}::scrollbar .bright.sb -command "$cflist yview"
     pack .bright.sb -side right -fill y
     pack $cflist -side left -fill both -expand 1
     $cflist tag configure highlight \
-	-background [$cflist cget -selectbackground]
+        -background [$cflist cget -selectbackground]
     $cflist tag configure bold -font mainfontbold
 
     .pwbottom add .bright
@@ -2494,15 +2505,15 @@ proc makewindow {} {
 
     # restore window width & height if known
     if {[info exists geometry(main)]} {
-	if {[scan $geometry(main) "%dx%d" w h] >= 2} {
-	    if {$w > [winfo screenwidth .]} {
-		set w [winfo screenwidth .]
-	    }
-	    if {$h > [winfo screenheight .]} {
-		set h [winfo screenheight .]
-	    }
-	    wm geometry . "${w}x$h"
-	}
+        if {[scan $geometry(main) "%dx%d" w h] >= 2} {
+            if {$w > [winfo screenwidth .]} {
+                set w [winfo screenwidth .]
+            }
+            if {$h > [winfo screenheight .]} {
+                set h [winfo screenheight .]
+            }
+            wm geometry . "${w}x$h"
+        }
     }
 
     if {[info exists geometry(state)] && $geometry(state) eq "zoomed"} {
@@ -2526,25 +2537,25 @@ proc makewindow {} {
             bind %W <Map> {}
             %W sashpos 0 $::geometry(botwidth)
         }
+        bind .pwbottom <Configure> {resizecdetpanes %W %w}
     }
 
-    bind .pwbottom <Configure> {resizecdetpanes %W %w}
     pack .ctop -fill both -expand 1
     bindall <1> {selcanvline %W %x %y}
     #bindall <B1-Motion> {selcanvline %W %x %y}
     if {[tk windowingsystem] == "win32"} {
-	bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D }
-	bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break }
+        bind . <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D }
+        bind $ctext <MouseWheel> { windows_mousewheel_redirector %W %X %Y %D ; break }
     } else {
-	bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
-	bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
-	bind $ctext <Button> {
-	    if {"%b" eq 6} {
-		$ctext xview scroll -5 units
-	    } elseif {"%b" eq 7} {
-		$ctext xview scroll 5 units
-	    }
-	}
+        bindall <ButtonRelease-4> "allcanvs yview scroll -5 units"
+        bindall <ButtonRelease-5> "allcanvs yview scroll 5 units"
+        bind $ctext <Button> {
+            if {"%b" eq 6} {
+                $ctext xview scroll -5 units
+            } elseif {"%b" eq 7} {
+                $ctext xview scroll 5 units
+            }
+        }
         if {[tk windowingsystem] eq "aqua"} {
             bindall <MouseWheel> {
                 set delta [expr {- (%D)}]
@@ -2627,7 +2638,7 @@ proc makewindow {} {
     bind $ctext <Button-1> {focus %W}
     bind $ctext <<Selection>> rehighlight_search_results
     for {set i 1} {$i < 10} {incr i} {
-	bind . <$M1B-Key-$i> [list go_to_parent $i]
+        bind . <$M1B-Key-$i> [list go_to_parent $i]
     }
 
     set maincursor [. cget -cursor]
@@ -2636,60 +2647,60 @@ proc makewindow {} {
 
     set rowctxmenu .rowctxmenu
     makemenu $rowctxmenu {
-	{mc "Diff this -> selected" command {diffvssel 0}}
-	{mc "Diff selected -> this" command {diffvssel 1}}
-	{mc "Make patch" command mkpatch}
-	{mc "Create tag" command mktag}
-	{mc "Copy commit summary" command copysummary}
-	{mc "Write commit to file" command writecommit}
-	{mc "Create new branch" command mkbranch}
-	{mc "Cherry-pick this commit" command cherrypick}
-	{mc "Reset HEAD branch to here" command resethead}
-	{mc "Mark this commit" command markhere}
-	{mc "Return to mark" command gotomark}
-	{mc "Find descendant of this and mark" command find_common_desc}
-	{mc "Compare with marked commit" command compare_commits}
-	{mc "Diff this -> marked commit" command {diffvsmark 0}}
-	{mc "Diff marked commit -> this" command {diffvsmark 1}}
-	{mc "Revert this commit" command revert}
+        {mc "Diff this -> selected" command {diffvssel 0}}
+        {mc "Diff selected -> this" command {diffvssel 1}}
+        {mc "Make patch" command mkpatch}
+        {mc "Create tag" command mktag}
+        {mc "Copy commit reference" command copyreference}
+        {mc "Write commit to file" command writecommit}
+        {mc "Create new branch" command mkbranch}
+        {mc "Cherry-pick this commit" command cherrypick}
+        {mc "Reset HEAD branch to here" command resethead}
+        {mc "Mark this commit" command markhere}
+        {mc "Return to mark" command gotomark}
+        {mc "Find descendant of this and mark" command find_common_desc}
+        {mc "Compare with marked commit" command compare_commits}
+        {mc "Diff this -> marked commit" command {diffvsmark 0}}
+        {mc "Diff marked commit -> this" command {diffvsmark 1}}
+        {mc "Revert this commit" command revert}
     }
     $rowctxmenu configure -tearoff 0
 
     set fakerowmenu .fakerowmenu
     makemenu $fakerowmenu {
-	{mc "Diff this -> selected" command {diffvssel 0}}
-	{mc "Diff selected -> this" command {diffvssel 1}}
-	{mc "Make patch" command mkpatch}
-	{mc "Diff this -> marked commit" command {diffvsmark 0}}
-	{mc "Diff marked commit -> this" command {diffvsmark 1}}
+        {mc "Diff this -> selected" command {diffvssel 0}}
+        {mc "Diff selected -> this" command {diffvssel 1}}
+        {mc "Make patch" command mkpatch}
+        {mc "Diff this -> marked commit" command {diffvsmark 0}}
+        {mc "Diff marked commit -> this" command {diffvsmark 1}}
     }
     $fakerowmenu configure -tearoff 0
 
     set headctxmenu .headctxmenu
     makemenu $headctxmenu {
-	{mc "Check out this branch" command cobranch}
-	{mc "Rename this branch" command mvbranch}
-	{mc "Remove this branch" command rmbranch}
-	{mc "Copy branch name" command {clipboard clear; clipboard append $headmenuhead}}
+        {mc "Check out this branch" command cobranch}
+        {mc "Rename this branch" command mvbranch}
+        {mc "Remove this branch" command rmbranch}
+        {mc "Copy branch name" command {clipboard clear; clipboard append $headmenuhead}}
     }
     $headctxmenu configure -tearoff 0
 
     global flist_menu
     set flist_menu .flistctxmenu
     makemenu $flist_menu {
-	{mc "Highlight this too" command {flist_hl 0}}
-	{mc "Highlight this only" command {flist_hl 1}}
-	{mc "External diff" command {external_diff}}
-	{mc "Blame parent commit" command {external_blame 1}}
-	{mc "Copy path" command {clipboard clear; clipboard append $flist_menu_file}}
+        {mc "Highlight this too" command {flist_hl 0}}
+        {mc "Highlight this only" command {flist_hl 1}}
+        {mc "External diff" command {external_diff}}
+        {mc "Blame parent commit" command {external_blame 1}}
+        {mc "Copy path" command {clipboard clear; clipboard append $flist_menu_file}}
     }
     $flist_menu configure -tearoff 0
 
     global diff_menu
     set diff_menu .diffctxmenu
     makemenu $diff_menu {
-	{mc "Show origin of this line" command show_line_source}
-	{mc "Run git gui blame on this line" command {external_blame_diff}}
+        {mc "Show origin of this line" command show_line_source}
+        {mc "Run git gui blame on this line" command {external_blame_diff}}
     }
     $diff_menu configure -tearoff 0
 }
@@ -2701,14 +2712,14 @@ proc windows_mousewheel_redirector {W X Y D} {
     global canv canv2 canv3
     set w [winfo containing -displayof $W $X $Y]
     if {$w ne ""} {
-	set u [expr {$D < 0 ? 5 : -5}]
-	if {$w == $canv || $w == $canv2 || $w == $canv3} {
-	    allcanvs yview scroll $u units
-	} else {
-	    catch {
-		$w yview scroll $u units
-	    }
-	}
+        set u [expr {$D < 0 ? 5 : -5}]
+        if {$w == $canv || $w == $canv2 || $w == $canv3} {
+            allcanvs yview scroll $u units
+        } else {
+            catch {
+                $w yview scroll $u units
+            }
+        }
     }
 }
 
@@ -2717,9 +2728,9 @@ proc selectedline_change {n1 n2 op} {
     global selectedline rownumsel
 
     if {$selectedline eq {}} {
-	set rownumsel {}
+        set rownumsel {}
     } else {
-	set rownumsel [expr {$selectedline + 1}]
+        set rownumsel [expr {$selectedline + 1}]
     }
 }
 
@@ -2728,11 +2739,11 @@ proc selectedline_change {n1 n2 op} {
 proc canvscan {op w x y} {
     global canv canv2 canv3
     foreach c [list $canv $canv2 $canv3] {
-	if {$c == $w} {
-	    $c scan $op $x $y
-	} else {
-	    $c scan $op 0 $y
-	}
+        if {$c == $w} {
+            $c scan $op $x $y
+        } else {
+            $c scan $op 0 $y
+        }
     }
 }
 
@@ -2750,10 +2761,10 @@ proc bindkey {ev script} {
     bind . $ev $script
     set escript [bind Entry $ev]
     if {$escript == {}} {
-	set escript [bind Entry <Key>]
+        set escript [bind Entry <Key>]
     }
     foreach e $entries {
-	bind $e $ev "$escript; break"
+        bind $e $ev "$escript; break"
     }
 }
 
@@ -2767,7 +2778,7 @@ proc bindmodfunctionkey {mod n script} {
 proc click {w} {
     global ctext entries
     foreach e [concat $entries $ctext] {
-	if {$w == $e} return
+        if {$w == $e} return
     }
     focus .
 }
@@ -2779,8 +2790,8 @@ proc adjustprogress {} {
     global rprogitem rprogcoord use_ttk
 
     if {$use_ttk} {
-	$progresscanv configure -value [expr {int($fprogcoord * 100)}]
-	return
+        $progresscanv configure -value [expr {int($fprogcoord * 100)}]
+        return
     }
 
     set w [expr {[winfo width $progresscanv] - 4}]
@@ -2792,11 +2803,11 @@ proc adjustprogress {} {
     $progresscanv coords $rprogitem 0 0 [expr {$w * $rprogcoord}] $h
     set now [clock clicks -milliseconds]
     if {$now >= $lastprogupdate + 100} {
-	set progupdatepending 0
-	update
+        set progupdatepending 0
+        update
     } elseif {!$progupdatepending} {
-	set progupdatepending 1
-	after [expr {$lastprogupdate + 100 - $now}] doprogupdate
+        set progupdatepending 1
+        after [expr {$lastprogupdate + 100 - $now}] doprogupdate
     }
 }
 
@@ -2804,9 +2815,9 @@ proc doprogupdate {} {
     global lastprogupdate progupdatepending
 
     if {$progupdatepending} {
-	set progupdatepending 0
-	set lastprogupdate [clock clicks -milliseconds]
-	update
+        set progupdatepending 0
+        set lastprogupdate [clock clicks -milliseconds]
+        update
     }
 }
 
@@ -2814,14 +2825,14 @@ proc config_check_tmp_exists {tries_left} {
     global config_file_tmp
 
     if {[file exists $config_file_tmp]} {
-	incr tries_left -1
-	if {$tries_left > 0} {
-	    after 100 [list config_check_tmp_exists $tries_left]
-	} else {
-	    error_popup "There appears to be a stale $config_file_tmp\
+        incr tries_left -1
+        if {$tries_left > 0} {
+            after 100 [list config_check_tmp_exists $tries_left]
+        } else {
+            error_popup "There appears to be a stale $config_file_tmp\
  file, which will prevent gitk from saving its configuration on exit.\
  Please remove it if it is not being used by any existing gitk process."
-	}
+        }
     }
 }
 
@@ -2838,9 +2849,9 @@ proc config_variable_change_cb {name name2 op} {
 
     upvar #0 $name var
     if {$op eq "write" &&
-	(![info exists config_variable_original($name)] ||
-	 $config_variable_original($name) ne $var)} {
-	set config_variable_changed($name) 1
+        (![info exists config_variable_original($name)] ||
+         $config_variable_original($name) ne $var)} {
+        set config_variable_changed($name) 1
     }
 }
 
@@ -2862,151 +2873,158 @@ proc savestuff {w} {
     if {![winfo viewable .]} return
     set remove_tmp 0
     if {[catch {
-	set try_count 0
-	while {[catch {set f [open $config_file_tmp {WRONLY CREAT EXCL}]}]} {
-	    if {[incr try_count] > 50} {
-		error "Unable to write config file: $config_file_tmp exists"
-	    }
-	    after 100
-	}
-	set remove_tmp 1
-	if {$::tcl_platform(platform) eq {windows}} {
-	    file attributes $config_file_tmp -hidden true
-	}
-	if {[file exists $config_file]} {
-	    source $config_file
-	}
-	foreach var_name $config_variables {
-	    upvar #0 $var_name var
-	    upvar 0 $var_name old_var
-	    if {!$config_variable_changed($var_name) && [info exists old_var]} {
-		puts $f [list set $var_name $old_var]
-	    } else {
-		puts $f [list set $var_name $var]
-	    }
-	}
-
-	puts $f "set geometry(main) [wm geometry .]"
-	puts $f "set geometry(state) [wm state .]"
-	puts $f "set geometry(topwidth) [winfo width .tf]"
-	puts $f "set geometry(topheight) [winfo height .tf]"
-	if {$current_use_ttk} {
-	    puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\""
-	    puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\""
-	} else {
-	    puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
-	    puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
-	}
-	puts $f "set geometry(botwidth) [winfo width .bleft]"
-	puts $f "set geometry(botheight) [winfo height .bleft]"
-
-	array set view_save {}
-	array set views {}
-	if {![info exists permviews]} { set permviews {} }
-	foreach view $permviews {
-	    set view_save([lindex $view 0]) 1
-	    set views([lindex $view 0]) $view
-	}
-	puts -nonewline $f "set permviews {"
-	for {set v 1} {$v < $current_nextviewnum} {incr v} {
-	    if {$viewchanged($v)} {
-		if {$current_viewperm($v)} {
-		    set views($current_viewname($v)) [list $current_viewname($v) $current_viewfiles($v) $current_viewargs($v) $current_viewargscmd($v)]
-		} else {
-		    set view_save($current_viewname($v)) 0
-		}
-	    }
-	}
-	# write old and updated view to their places and append remaining to the end
-	foreach view $permviews {
-	    set view_name [lindex $view 0]
-	    if {$view_save($view_name)} {
-		puts $f "{$views($view_name)}"
-	    }
-	    unset views($view_name)
-	}
-	foreach view_name [array names views] {
-	    puts $f "{$views($view_name)}"
-	}
-	puts $f "}"
-	close $f
-	file rename -force $config_file_tmp $config_file
-	set remove_tmp 0
+        set try_count 0
+        while {[catch {set f [open $config_file_tmp {WRONLY CREAT EXCL}]}]} {
+            if {[incr try_count] > 50} {
+                error "Unable to write config file: $config_file_tmp exists"
+            }
+            after 100
+        }
+        set remove_tmp 1
+        if {$::tcl_platform(platform) eq {windows}} {
+            file attributes $config_file_tmp -hidden true
+        }
+        if {[file exists $config_file]} {
+            source $config_file
+        }
+        foreach var_name $config_variables {
+            upvar #0 $var_name var
+            upvar 0 $var_name old_var
+            if {!$config_variable_changed($var_name) && [info exists old_var]} {
+                puts $f [list set $var_name $old_var]
+            } else {
+                puts $f [list set $var_name $var]
+            }
+        }
+
+        puts $f "set geometry(main) [wm geometry .]"
+        puts $f "set geometry(state) [wm state .]"
+        puts $f "set geometry(topwidth) [winfo width .tf]"
+        puts $f "set geometry(topheight) [winfo height .tf]"
+        if {$current_use_ttk} {
+            puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sashpos 0] 1\""
+            puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\""
+        } else {
+            puts $f "set geometry(pwsash0) \"[.tf.histframe.pwclist sash coord 0]\""
+            puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sash coord 1]\""
+        }
+        puts $f "set geometry(botwidth) [winfo width .bleft]"
+        puts $f "set geometry(botheight) [winfo height .bleft]"
+
+        array set view_save {}
+        array set views {}
+        if {![info exists permviews]} { set permviews {} }
+        foreach view $permviews {
+            set view_save([lindex $view 0]) 1
+            set views([lindex $view 0]) $view
+        }
+        puts -nonewline $f "set permviews {"
+        for {set v 1} {$v < $current_nextviewnum} {incr v} {
+            if {$viewchanged($v)} {
+                if {$current_viewperm($v)} {
+                    set views($current_viewname($v)) [list $current_viewname($v) $current_viewfiles($v) $current_viewargs($v) $current_viewargscmd($v)]
+                } else {
+                    set view_save($current_viewname($v)) 0
+                }
+            }
+        }
+        # write old and updated view to their places and append remaining to the end
+        foreach view $permviews {
+            set view_name [lindex $view 0]
+            if {$view_save($view_name)} {
+                puts $f "{$views($view_name)}"
+            }
+            unset views($view_name)
+        }
+        foreach view_name [array names views] {
+            puts $f "{$views($view_name)}"
+        }
+        puts $f "}"
+        close $f
+        file rename -force $config_file_tmp $config_file
+        set remove_tmp 0
     } err]} {
         puts "Error saving config: $err"
     }
     if {$remove_tmp} {
-	file delete -force $config_file_tmp
+        file delete -force $config_file_tmp
     }
     set stuffsaved 1
 }
 
 proc resizeclistpanes {win w} {
-    global oldwidth use_ttk
+    global oldwidth oldsash use_ttk
     if {[info exists oldwidth($win)]} {
-	if {$use_ttk} {
-	    set s0 [$win sashpos 0]
-	    set s1 [$win sashpos 1]
-	} else {
-	    set s0 [$win sash coord 0]
-	    set s1 [$win sash coord 1]
-	}
-	if {$w < 60} {
-	    set sash0 [expr {int($w/2 - 2)}]
-	    set sash1 [expr {int($w*5/6 - 2)}]
-	} else {
-	    set factor [expr {1.0 * $w / $oldwidth($win)}]
-	    set sash0 [expr {int($factor * [lindex $s0 0])}]
-	    set sash1 [expr {int($factor * [lindex $s1 0])}]
-	    if {$sash0 < 30} {
-		set sash0 30
-	    }
-	    if {$sash1 < $sash0 + 20} {
-		set sash1 [expr {$sash0 + 20}]
-	    }
-	    if {$sash1 > $w - 10} {
-		set sash1 [expr {$w - 10}]
-		if {$sash0 > $sash1 - 20} {
-		    set sash0 [expr {$sash1 - 20}]
-		}
-	    }
-	}
-	if {$use_ttk} {
-	    $win sashpos 0 $sash0
-	    $win sashpos 1 $sash1
-	} else {
-	    $win sash place 0 $sash0 [lindex $s0 1]
-	    $win sash place 1 $sash1 [lindex $s1 1]
-	}
+	if {[info exists oldsash($win)]} {
+	    set s0 [lindex $oldsash($win) 0]
+	    set s1 [lindex $oldsash($win) 1]
+        } elseif {$use_ttk} {
+            set s0 [$win sashpos 0]
+            set s1 [$win sashpos 1]
+        } else {
+            set s0 [$win sash coord 0]
+            set s1 [$win sash coord 1]
+        }
+        if {$w < 60} {
+            set sash0 [expr {int($w/2 - 2)}]
+            set sash1 [expr {int($w*5/6 - 2)}]
+        } else {
+            set factor [expr {1.0 * $w / $oldwidth($win)}]
+            set sash0 [expr {int($factor * [lindex $s0 0])}]
+            set sash1 [expr {int($factor * [lindex $s1 0])}]
+            if {$sash0 < 30} {
+                set sash0 30
+            }
+            if {$sash1 < $sash0 + 20} {
+                set sash1 [expr {$sash0 + 20}]
+            }
+            if {$sash1 > $w - 10} {
+                set sash1 [expr {$w - 10}]
+                if {$sash0 > $sash1 - 20} {
+                    set sash0 [expr {$sash1 - 20}]
+                }
+            }
+        }
+        if {$use_ttk} {
+            $win sashpos 0 $sash0
+            $win sashpos 1 $sash1
+        } else {
+            $win sash place 0 $sash0 [lindex $s0 1]
+            $win sash place 1 $sash1 [lindex $s1 1]
+        }
+	set oldsash($win) [list $sash0 $sash1]
     }
     set oldwidth($win) $w
 }
 
 proc resizecdetpanes {win w} {
-    global oldwidth use_ttk
+    global oldwidth oldsash use_ttk
     if {[info exists oldwidth($win)]} {
-	if {$use_ttk} {
-	    set s0 [$win sashpos 0]
-	} else {
-	    set s0 [$win sash coord 0]
-	}
-	if {$w < 60} {
-	    set sash0 [expr {int($w*3/4 - 2)}]
-	} else {
-	    set factor [expr {1.0 * $w / $oldwidth($win)}]
-	    set sash0 [expr {int($factor * [lindex $s0 0])}]
-	    if {$sash0 < 45} {
-		set sash0 45
-	    }
-	    if {$sash0 > $w - 15} {
-		set sash0 [expr {$w - 15}]
-	    }
-	}
-	if {$use_ttk} {
-	    $win sashpos 0 $sash0
-	} else {
-	    $win sash place 0 $sash0 [lindex $s0 1]
-	}
+	if {[info exists oldsash($win)]} {
+	    set s0 $oldsash($win)
+        } elseif {$use_ttk} {
+            set s0 [$win sashpos 0]
+        } else {
+            set s0 [$win sash coord 0]
+        }
+        if {$w < 60} {
+            set sash0 [expr {int($w*3/4 - 2)}]
+        } else {
+            set factor [expr {1.0 * $w / $oldwidth($win)}]
+            set sash0 [expr {int($factor * [lindex $s0 0])}]
+            if {$sash0 < 45} {
+                set sash0 45
+            }
+            if {$sash0 > $w - 15} {
+                set sash0 [expr {$w - 15}]
+            }
+        }
+        if {$use_ttk} {
+            $win sashpos 0 $sash0
+        } else {
+            $win sash place 0 $sash0 [lindex $s0 1]
+        }
+	set oldsash($win) $sash0
     }
     set oldwidth($win) $w
 }
@@ -3029,8 +3047,8 @@ proc about {} {
     global bgcolor NS
     set w .about
     if {[winfo exists $w]} {
-	raise $w
-	return
+        raise $w
+        return
     }
     ttk_toplevel $w
     wm title $w [mc "About gitk"]
@@ -3041,7 +3059,7 @@ Gitk - a commit viewer for git
 Copyright \u00a9 2005-2016 Paul Mackerras
 
 Use and redistribute under the terms of the GNU General Public License"] \
-	    -justify center -aspect 400 -border 2 -bg $bgcolor -relief groove
+            -justify center -aspect 400 -border 2 -bg $bgcolor -relief groove
     pack $w.m -side top -fill x -padx 2 -pady 2
     ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
     pack $w.ok -side bottom
@@ -3055,13 +3073,13 @@ proc keys {} {
     global bgcolor NS
     set w .keys
     if {[winfo exists $w]} {
-	raise $w
-	return
+        raise $w
+        return
     }
     if {[tk windowingsystem] eq {aqua}} {
-	set M1T Cmd
+        set M1T Cmd
     } else {
-	set M1T Ctrl
+        set M1T Ctrl
     }
     ttk_toplevel $w
     wm title $w [mc "Gitk key bindings"]
@@ -3108,7 +3126,7 @@ proc keys {} {
 [mc "<%s-minus>	Decrease font size" $M1T]
 [mc "<F5>		Update"]
 " \
-	    -justify left -bg $bgcolor -border 2 -relief groove
+            -justify left -bg $bgcolor -border 2 -relief groove
     pack $w.m -side top -fill both -padx 2 -pady 2
     ${NS}::button $w.ok -text [mc "Close"] -command "destroy $w" -default active
     bind $w <Key-Escape> [list destroy $w]
@@ -3135,68 +3153,68 @@ proc treeview {w l openlevs} {
     set treecontents() {}
     $w conf -state normal
     foreach f $l {
-	while {[string range $f 0 $prefixend] ne $prefix} {
-	    if {$lev <= $openlevs} {
-		$w mark set e:$treeindex($prefix) "end -1c"
-		$w mark gravity e:$treeindex($prefix) left
-	    }
-	    set treeheight($prefix) $ht
-	    incr ht [lindex $htstack end]
-	    set htstack [lreplace $htstack end end]
-	    set prefixend [lindex $prefendstack end]
-	    set prefendstack [lreplace $prefendstack end end]
-	    set prefix [string range $prefix 0 $prefixend]
-	    incr lev -1
-	}
-	set tail [string range $f [expr {$prefixend+1}] end]
-	while {[set slash [string first "/" $tail]] >= 0} {
-	    lappend htstack $ht
-	    set ht 0
-	    lappend prefendstack $prefixend
-	    incr prefixend [expr {$slash + 1}]
-	    set d [string range $tail 0 $slash]
-	    lappend treecontents($prefix) $d
-	    set oldprefix $prefix
-	    append prefix $d
-	    set treecontents($prefix) {}
-	    set treeindex($prefix) [incr ix]
-	    set treeparent($prefix) $oldprefix
-	    set tail [string range $tail [expr {$slash+1}] end]
-	    if {$lev <= $openlevs} {
-		set ht 1
-		set treediropen($prefix) [expr {$lev < $openlevs}]
-		set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
-		$w mark set d:$ix "end -1c"
-		$w mark gravity d:$ix left
-		set str "\n"
-		for {set i 0} {$i < $lev} {incr i} {append str "\t"}
-		$w insert end $str
-		$w image create end -align center -image $bm -padx 1 \
-		    -name a:$ix
-		$w insert end $d [highlight_tag $prefix]
-		$w mark set s:$ix "end -1c"
-		$w mark gravity s:$ix left
-	    }
-	    incr lev
-	}
-	if {$tail ne {}} {
-	    if {$lev <= $openlevs} {
-		incr ht
-		set str "\n"
-		for {set i 0} {$i < $lev} {incr i} {append str "\t"}
-		$w insert end $str
-		$w insert end $tail [highlight_tag $f]
-	    }
-	    lappend treecontents($prefix) $tail
-	}
+        while {[string range $f 0 $prefixend] ne $prefix} {
+            if {$lev <= $openlevs} {
+                $w mark set e:$treeindex($prefix) "end -1c"
+                $w mark gravity e:$treeindex($prefix) left
+            }
+            set treeheight($prefix) $ht
+            incr ht [lindex $htstack end]
+            set htstack [lreplace $htstack end end]
+            set prefixend [lindex $prefendstack end]
+            set prefendstack [lreplace $prefendstack end end]
+            set prefix [string range $prefix 0 $prefixend]
+            incr lev -1
+        }
+        set tail [string range $f [expr {$prefixend+1}] end]
+        while {[set slash [string first "/" $tail]] >= 0} {
+            lappend htstack $ht
+            set ht 0
+            lappend prefendstack $prefixend
+            incr prefixend [expr {$slash + 1}]
+            set d [string range $tail 0 $slash]
+            lappend treecontents($prefix) $d
+            set oldprefix $prefix
+            append prefix $d
+            set treecontents($prefix) {}
+            set treeindex($prefix) [incr ix]
+            set treeparent($prefix) $oldprefix
+            set tail [string range $tail [expr {$slash+1}] end]
+            if {$lev <= $openlevs} {
+                set ht 1
+                set treediropen($prefix) [expr {$lev < $openlevs}]
+                set bm [expr {$lev == $openlevs? "tri-rt": "tri-dn"}]
+                $w mark set d:$ix "end -1c"
+                $w mark gravity d:$ix left
+                set str "\n"
+                for {set i 0} {$i < $lev} {incr i} {append str "\t"}
+                $w insert end $str
+                $w image create end -align center -image $bm -padx 1 \
+                    -name a:$ix
+                $w insert end $d [highlight_tag $prefix]
+                $w mark set s:$ix "end -1c"
+                $w mark gravity s:$ix left
+            }
+            incr lev
+        }
+        if {$tail ne {}} {
+            if {$lev <= $openlevs} {
+                incr ht
+                set str "\n"
+                for {set i 0} {$i < $lev} {incr i} {append str "\t"}
+                $w insert end $str
+                $w insert end $tail [highlight_tag $f]
+            }
+            lappend treecontents($prefix) $tail
+        }
     }
     while {$htstack ne {}} {
-	set treeheight($prefix) $ht
-	incr ht [lindex $htstack end]
-	set htstack [lreplace $htstack end end]
-	set prefixend [lindex $prefendstack end]
-	set prefendstack [lreplace $prefendstack end end]
-	set prefix [string range $prefix 0 $prefixend]
+        set treeheight($prefix) $ht
+        incr ht [lindex $htstack end]
+        set htstack [lreplace $htstack end end]
+        set prefixend [lindex $prefendstack end]
+        set prefendstack [lreplace $prefendstack end end]
+        set prefix [string range $prefix 0 $prefixend]
     }
     $w conf -state disabled
 }
@@ -3207,21 +3225,21 @@ proc linetoelt {l} {
     set y 2
     set prefix {}
     while {1} {
-	foreach e $treecontents($prefix) {
-	    if {$y == $l} {
-		return "$prefix$e"
-	    }
-	    set n 1
-	    if {[string index $e end] eq "/"} {
-		set n $treeheight($prefix$e)
-		if {$y + $n > $l} {
-		    append prefix $e
-		    incr y
-		    break
-		}
-	    }
-	    incr y $n
-	}
+        foreach e $treecontents($prefix) {
+            if {$y == $l} {
+                return "$prefix$e"
+            }
+            set n 1
+            if {[string index $e end] eq "/"} {
+                set n $treeheight($prefix$e)
+                if {$y + $n > $l} {
+                    append prefix $e
+                    incr y
+                    break
+                }
+            }
+            incr y $n
+        }
     }
 }
 
@@ -3229,14 +3247,14 @@ proc highlight_tree {y prefix} {
     global treeheight treecontents cflist
 
     foreach e $treecontents($prefix) {
-	set path $prefix$e
-	if {[highlight_tag $path] ne {}} {
-	    $cflist tag add bold $y.0 "$y.0 lineend"
-	}
-	incr y
-	if {[string index $e end] eq "/" && $treeheight($path) > 1} {
-	    set y [highlight_tree $y $path]
-	}
+        set path $prefix$e
+        if {[highlight_tag $path] ne {}} {
+            $cflist tag add bold $y.0 "$y.0 lineend"
+        }
+        incr y
+        if {[string index $e end] eq "/" && $treeheight($path) > 1} {
+            set y [highlight_tree $y $path]
+        }
     }
     return $y
 }
@@ -3252,8 +3270,8 @@ proc treeclosedir {w dir} {
     $w conf -state disabled
     set n [expr {1 - $treeheight($dir)}]
     while {$dir ne {}} {
-	incr treeheight($dir) $n
-	set dir $treeparent($dir)
+        incr treeheight($dir) $n
+        set dir $treeparent($dir)
     }
 }
 
@@ -3269,28 +3287,28 @@ proc treeopendir {w dir} {
     set str "\n"
     set n [llength $treecontents($dir)]
     for {set x $dir} {$x ne {}} {set x $treeparent($x)} {
-	incr lev
-	append str "\t"
-	incr treeheight($x) $n
+        incr lev
+        append str "\t"
+        incr treeheight($x) $n
     }
     foreach e $treecontents($dir) {
-	set de $dir$e
-	if {[string index $e end] eq "/"} {
-	    set iy $treeindex($de)
-	    $w mark set d:$iy e:$ix
-	    $w mark gravity d:$iy left
-	    $w insert e:$ix $str
-	    set treediropen($de) 0
-	    $w image create e:$ix -align center -image tri-rt -padx 1 \
-		-name a:$iy
-	    $w insert e:$ix $e [highlight_tag $de]
-	    $w mark set s:$iy e:$ix
-	    $w mark gravity s:$iy left
-	    set treeheight($de) 1
-	} else {
-	    $w insert e:$ix $str
-	    $w insert e:$ix $e [highlight_tag $de]
-	}
+        set de $dir$e
+        if {[string index $e end] eq "/"} {
+            set iy $treeindex($de)
+            $w mark set d:$iy e:$ix
+            $w mark gravity d:$iy left
+            $w insert e:$ix $str
+            set treediropen($de) 0
+            $w image create e:$ix -align center -image tri-rt -padx 1 \
+                -name a:$iy
+            $w insert e:$ix $e [highlight_tag $de]
+            $w mark set s:$iy e:$ix
+            $w mark gravity s:$iy left
+            set treeheight($de) 1
+        } else {
+            $w insert e:$ix $str
+            $w insert e:$ix $e [highlight_tag $de]
+        }
     }
     $w mark gravity e:$ix right
     $w conf -state disabled
@@ -3299,13 +3317,13 @@ proc treeopendir {w dir} {
     set ht [$w cget -height]
     set l [lindex [split [$w index s:$ix] .] 0]
     if {$l < $top} {
-	$w yview $l.0
+        $w yview $l.0
     } elseif {$l + $n + 1 > $top + $ht} {
-	set top [expr {$l + $n + 2 - $ht}]
-	if {$l < $top} {
-	    set top $l
-	}
-	$w yview $top.0
+        set top [expr {$l + $n + 2 - $ht}]
+        if {$l < $top} {
+            set top $l
+        }
+        $w yview $top.0
     }
 }
 
@@ -3319,16 +3337,16 @@ proc treeclick {w x y} {
     $cflist tag add highlight $l.0 "$l.0 lineend"
     set cflist_top $l
     if {$l == 1} {
-	$ctext yview 1.0
-	return
+        $ctext yview 1.0
+        return
     }
     set e [linetoelt $l]
     if {[string index $e end] ne "/"} {
-	showfile $e
+        showfile $e
     } elseif {$treediropen($e)} {
-	treeclosedir $w $e
+        treeclosedir $w $e
     } else {
-	treeopendir $w $e
+        treeopendir $w $e
     }
 }
 
@@ -3337,10 +3355,10 @@ proc setfilelist {id} {
 
     treeview $cflist $treefilelist($id) 0
     if {$jump_to_here ne {}} {
-	set f [lindex $jump_to_here 0]
-	if {[lsearch -exact $treefilelist($id) $f] >= 0} {
-	    showfile $f
-	}
+        set f [lindex $jump_to_here 0]
+        if {[lsearch -exact $treefilelist($id) $f] >= 0} {
+            showfile $f
+        }
     }
 }
 
@@ -3415,11 +3433,11 @@ proc init_flist {first} {
     $cflist conf -state normal
     $cflist delete 0.0 end
     if {$first ne {}} {
-	$cflist insert end $first
-	set cflist_top 1
-	$cflist tag add highlight 1.0 "1.0 lineend"
+        $cflist insert end $first
+        set cflist_top 1
+        $cflist tag add highlight 1.0 "1.0 lineend"
     } else {
-	unset -nocomplain cflist_top
+        unset -nocomplain cflist_top
     }
     $cflist conf -state disabled
     set difffilestart {}
@@ -3429,9 +3447,9 @@ proc highlight_tag {f} {
     global highlight_paths
 
     foreach p $highlight_paths {
-	if {[string match $p $f]} {
-	    return "bold"
-	}
+        if {[string match $p $f]} {
+            return "bold"
+        }
     }
     return {}
 }
@@ -3441,15 +3459,15 @@ proc highlight_filelist {} {
 
     $cflist conf -state normal
     if {$cmitmode ne "tree"} {
-	set end [lindex [split [$cflist index end] .] 0]
-	for {set l 2} {$l < $end} {incr l} {
-	    set line [$cflist get $l.0 "$l.0 lineend"]
-	    if {[highlight_tag $line] ne {}} {
-		$cflist tag add bold $l.0 "$l.0 lineend"
-	    }
-	}
+        set end [lindex [split [$cflist index end] .] 0]
+        for {set l 2} {$l < $end} {incr l} {
+            set line [$cflist get $l.0 "$l.0 lineend"]
+            if {[highlight_tag $line] ne {}} {
+                $cflist tag add bold $l.0 "$l.0 lineend"
+            }
+        }
     } else {
-	highlight_tree 2 {}
+        highlight_tree 2 {}
     }
     $cflist conf -state disabled
 }
@@ -3467,8 +3485,8 @@ proc add_flist {fl} {
 
     $cflist conf -state normal
     foreach f $fl {
-	$cflist insert end "\n"
-	$cflist insert end $f [highlight_tag $f]
+        $cflist insert end "\n"
+        $cflist insert end $f [highlight_tag $f]
     }
     $cflist conf -state disabled
 }
@@ -3483,9 +3501,9 @@ proc sel_flist {w x y} {
     $cflist tag add highlight $l.0 "$l.0 lineend"
     set cflist_top $l
     if {$l == 1} {
-	$ctext yview 1.0
+        $ctext yview 1.0
     } else {
-	catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
+        catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]}
     }
     suppress_highlighting_file_for_current_scrollpos
 }
@@ -3498,15 +3516,15 @@ proc pop_flist_menu {w X Y x y} {
     set l [lindex [split [$w index "@$x,$y"] "."] 0]
     if {$l <= 1} return
     if {$cmitmode eq "tree"} {
-	set e [linetoelt $l]
-	if {[string index $e end] eq "/"} return
+        set e [linetoelt $l]
+        if {[string index $e end] eq "/"} return
     } else {
-	set e [lindex $treediffs($diffids) [expr {$l-2}]]
+        set e [lindex $treediffs($diffids) [expr {$l-2}]]
     }
     set flist_menu_file $e
     set xdiffstate "normal"
     if {$cmitmode eq "tree"} {
-	set xdiffstate "disabled"
+        set xdiffstate "disabled"
     }
     # Disable "External diff" item in tree mode
     $flist_menu entryconf 2 -state $xdiffstate
@@ -3535,7 +3553,7 @@ proc pop_diff_menu {w X Y x y} {
     set diff_menu_line [lindex $diff_menu_txtpos 0]
     # don't pop up the menu on hunk-separator or file-separator lines
     if {[lsearch -glob [$ctext tag names $diff_menu_line.0] "*sep"] >= 0} {
-	return
+        return
     }
     stopfinding
     set f [find_ctext_fileinfo $diff_menu_line]
@@ -3550,9 +3568,9 @@ proc flist_hl {only} {
 
     set x [shellquote $flist_menu_file]
     if {$only || $findstring eq {} || $gdttype ne [mc "touching paths:"]} {
-	set findstring $x
+        set findstring $x
     } else {
-	append findstring " " $x
+        append findstring " " $x
     }
     set gdttype [mc "touching paths:"]
 }
@@ -3561,29 +3579,29 @@ proc gitknewtmpdir {} {
     global diffnum gitktmpdir gitdir env
 
     if {![info exists gitktmpdir]} {
-	if {[info exists env(GITK_TMPDIR)]} {
-	    set tmpdir $env(GITK_TMPDIR)
-	} elseif {[info exists env(TMPDIR)]} {
-	    set tmpdir $env(TMPDIR)
-	} else {
-	    set tmpdir $gitdir
-	}
-	set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"]
-	if {[catch {set gitktmpdir [exec mktemp -d $gitktmpformat]}]} {
-	    set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
-	}
-	if {[catch {file mkdir $gitktmpdir} err]} {
-	    error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
-	    unset gitktmpdir
-	    return {}
-	}
-	set diffnum 0
+        if {[info exists env(GITK_TMPDIR)]} {
+            set tmpdir $env(GITK_TMPDIR)
+        } elseif {[info exists env(TMPDIR)]} {
+            set tmpdir $env(TMPDIR)
+        } else {
+            set tmpdir $gitdir
+        }
+        set gitktmpformat [file join $tmpdir ".gitk-tmp.XXXXXX"]
+        if {[catch {set gitktmpdir [exec mktemp -d $gitktmpformat]}]} {
+            set gitktmpdir [file join $gitdir [format ".gitk-tmp.%s" [pid]]]
+        }
+        if {[catch {file mkdir $gitktmpdir} err]} {
+            error_popup "[mc "Error creating temporary directory %s:" $gitktmpdir] $err"
+            unset gitktmpdir
+            return {}
+        }
+        set diffnum 0
     }
     incr diffnum
     set diffdir [file join $gitktmpdir $diffnum]
     if {[catch {file mkdir $diffdir} err]} {
-	error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err"
-	return {}
+        error_popup "[mc "Error creating temporary directory %s:" $diffdir] $err"
+        return {}
     }
     return $diffdir
 }
@@ -3592,11 +3610,11 @@ proc save_file_from_commit {filename output what} {
     global nullfile
 
     if {[catch {exec git show $filename -- > $output} err]} {
-	if {[string match "fatal: bad revision *" $err]} {
-	    return $nullfile
-	}
-	error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
-	return {}
+        if {[string match "fatal: bad revision *" $err]} {
+            return $nullfile
+        }
+        error_popup "[mc "Error getting \"%s\" from %s:" $filename $what] $err"
+        return {}
     }
     return $output
 }
@@ -3607,10 +3625,10 @@ proc external_diff_get_one_file {diffid filename diffdir} {
 
     if {$diffid == $nullid} {
         set difffile [file join $worktree $filename]
-	if {[file exists $difffile]} {
-	    return $difffile
-	}
-	return $nullfile
+        if {[file exists $difffile]} {
+            return $difffile
+        }
+        return $nullfile
     }
     if {$diffid == $nullid2} {
         set difffile [file join $diffdir "\[index\] [file tail $filename]"]
@@ -3618,7 +3636,7 @@ proc external_diff_get_one_file {diffid filename diffdir} {
     }
     set difffile [file join $diffdir "\[$diffid\] [file tail $filename]"]
     return [save_file_from_commit $diffid:$filename $difffile \
-	       "revision $diffid"]
+               "revision $diffid"]
 }
 
 proc external_diff {} {
@@ -3675,18 +3693,18 @@ proc find_hunk_blamespec {base line} {
 
     set s_line [$ctext get $s_lix "$s_lix + 1 lines"]
     if {![regexp {^@@@*(( -\d+(,\d+)?)+) \+(\d+)(,\d+)? @@} $s_line \
-	    s_line old_specs osz osz1 new_line nsz]} {
-	return
+            s_line old_specs osz osz1 new_line nsz]} {
+        return
     }
 
     # base lines for the parents
     set base_lines [list $new_line]
     foreach old_spec [lrange [split $old_specs " "] 1 end] {
-	if {![regexp -- {-(\d+)(,\d+)?} $old_spec \
-	        old_spec old_line osz]} {
-	    return
-	}
-	lappend base_lines $old_line
+        if {![regexp -- {-(\d+)(,\d+)?} $old_spec \
+                old_spec old_line osz]} {
+            return
+        }
+        lappend base_lines $old_line
     }
 
     # Now scan the lines to determine offset within the hunk
@@ -3697,38 +3715,38 @@ proc find_hunk_blamespec {base line} {
     # Determine if the line is removed
     set chunk [$ctext get $line.0 "$line.1 + $max_parent chars"]
     if {[string match {[-+ ]*} $chunk]} {
-	set removed_idx [string first "-" $chunk]
-	# Choose a parent index
-	if {$removed_idx >= 0} {
-	    set parent $removed_idx
-	} else {
-	    set unchanged_idx [string first " " $chunk]
-	    if {$unchanged_idx >= 0} {
-		set parent $unchanged_idx
-	    } else {
-		# blame the current commit
-		set parent -1
-	    }
-	}
-	# then count other lines that belong to it
-	for {set i $line} {[incr i -1] > $s_lno} {} {
-	    set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"]
-	    # Determine if the line is removed
-	    set removed_idx [string first "-" $chunk]
-	    if {$parent >= 0} {
-		set code [string index $chunk $parent]
-		if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} {
-		    incr dline
-		}
-	    } else {
-		if {$removed_idx < 0} {
-		    incr dline
-		}
-	    }
-	}
-	incr parent
+        set removed_idx [string first "-" $chunk]
+        # Choose a parent index
+        if {$removed_idx >= 0} {
+            set parent $removed_idx
+        } else {
+            set unchanged_idx [string first " " $chunk]
+            if {$unchanged_idx >= 0} {
+                set parent $unchanged_idx
+            } else {
+                # blame the current commit
+                set parent -1
+            }
+        }
+        # then count other lines that belong to it
+        for {set i $line} {[incr i -1] > $s_lno} {} {
+            set chunk [$ctext get $i.0 "$i.1 + $max_parent chars"]
+            # Determine if the line is removed
+            set removed_idx [string first "-" $chunk]
+            if {$parent >= 0} {
+                set code [string index $chunk $parent]
+                if {$code eq "-" || ($removed_idx < 0 && $code ne "+")} {
+                    incr dline
+                }
+            } else {
+                if {$removed_idx < 0} {
+                    incr dline
+                }
+            }
+        }
+        incr parent
     } else {
-	set parent 0
+        set parent 0
     }
 
     incr dline [lindex $base_lines $parent]
@@ -3741,17 +3759,17 @@ proc external_blame_diff {} {
     global diff_menu_filebase flist_menu_file
 
     if {$cmitmode eq "tree"} {
-	set parent_idx 0
-	set line [expr {$diff_menu_line - $diff_menu_filebase}]
+        set parent_idx 0
+        set line [expr {$diff_menu_line - $diff_menu_filebase}]
     } else {
-	set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
-	if {$hinfo ne {}} {
-	    set parent_idx [lindex $hinfo 0]
-	    set line [lindex $hinfo 1]
-	} else {
-	    set parent_idx 0
-	    set line 0
-	}
+        set hinfo [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
+        if {$hinfo ne {}} {
+            set parent_idx [lindex $hinfo 0]
+            set line [lindex $hinfo 1]
+        } else {
+            set parent_idx 0
+            set line 0
+        }
     }
 
     external_blame $parent_idx $line
@@ -3762,12 +3780,12 @@ proc external_blame_diff {} {
 proc index_sha1 {fname} {
     set f [open [list | git ls-files -s $fname] r]
     while {[gets $f line] >= 0} {
-	set info [lindex [split $line "\t"] 0]
-	set stage [lindex $info 2]
-	if {$stage eq "0" || $stage eq "2"} {
-	    close $f
-	    return [lindex $info 1]
-	}
+        set info [lindex [split $line "\t"] 0]
+        set stage [lindex $info 2]
+        if {$stage eq "0" || $stage eq "2"} {
+            close $f
+            return [lindex $info 1]
+        }
     }
     close $f
     return {}
@@ -3776,7 +3794,7 @@ proc index_sha1 {fname} {
 # Turn an absolute path into one relative to the current directory
 proc make_relative {f} {
     if {[file pathtype $f] eq "relative"} {
-	return $f
+        return $f
     }
     set elts [file split $f]
     set here [file split [pwd]]
@@ -3784,12 +3802,12 @@ proc make_relative {f} {
     set hi 0
     set res {}
     foreach d $here {
-	if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} {
-	    lappend res ".."
-	} else {
-	    incr ei
-	}
-	incr hi
+        if {$ei < $hi || $ei >= [llength $elts] || [lindex $elts $ei] ne $d} {
+            lappend res ".."
+        } else {
+            incr ei
+        }
+        incr hi
     }
     set elts [concat $res [lrange $elts $ei end]]
     return [eval file join $elts]
@@ -3801,19 +3819,19 @@ proc external_blame {parent_idx {line {}}} {
     global parentlist selectedline currentid
 
     if {$parent_idx > 0} {
-	set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]]
+        set base_commit [lindex $parentlist $selectedline [expr {$parent_idx-1}]]
     } else {
-	set base_commit $currentid
+        set base_commit $currentid
     }
 
     if {$base_commit eq {} || $base_commit eq $nullid || $base_commit eq $nullid2} {
-	error_popup [mc "No such commit"]
-	return
+        error_popup [mc "No such commit"]
+        return
     }
 
     set cmdline [list git gui blame]
     if {$line ne {} && $line > 1} {
-	lappend cmdline "--line=$line"
+        lappend cmdline "--line=$line"
     }
     set f [file join $cdup $flist_menu_file]
     # Unfortunately it seems git gui blame doesn't like
@@ -3821,7 +3839,7 @@ proc external_blame {parent_idx {line {}}} {
     set f [make_relative $f]
     lappend cmdline $base_commit $f
     if {[catch {eval exec $cmdline &} err]} {
-	error_popup "[mc "git gui blame: command failed:"] $err"
+        error_popup "[mc "git gui blame: command failed:"] $err"
     }
 }
 
@@ -3832,61 +3850,61 @@ proc show_line_source {} {
 
     set from_index {}
     if {$cmitmode eq "tree"} {
-	set id $currentid
-	set line [expr {$diff_menu_line - $diff_menu_filebase}]
+        set id $currentid
+        set line [expr {$diff_menu_line - $diff_menu_filebase}]
     } else {
-	set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
-	if {$h eq {}} return
-	set pi [lindex $h 0]
-	if {$pi == 0} {
-	    mark_ctext_line $diff_menu_line
-	    return
-	}
-	incr pi -1
-	if {$currentid eq $nullid} {
-	    if {$pi > 0} {
-		# must be a merge in progress...
-		if {[catch {
-		    # get the last line from .git/MERGE_HEAD
-		    set f [open [file join $gitdir MERGE_HEAD] r]
-		    set id [lindex [split [read $f] "\n"] end-1]
-		    close $f
-		} err]} {
-		    error_popup [mc "Couldn't read merge head: %s" $err]
-		    return
-		}
-	    } elseif {$parents($curview,$currentid) eq $nullid2} {
-		# need to do the blame from the index
-		if {[catch {
-		    set from_index [index_sha1 $flist_menu_file]
-		} err]} {
-		    error_popup [mc "Error reading index: %s" $err]
-		    return
-		}
-	    } else {
-		set id $parents($curview,$currentid)
-	    }
-	} else {
-	    set id [lindex $parents($curview,$currentid) $pi]
-	}
-	set line [lindex $h 1]
+        set h [find_hunk_blamespec $diff_menu_filebase $diff_menu_line]
+        if {$h eq {}} return
+        set pi [lindex $h 0]
+        if {$pi == 0} {
+            mark_ctext_line $diff_menu_line
+            return
+        }
+        incr pi -1
+        if {$currentid eq $nullid} {
+            if {$pi > 0} {
+                # must be a merge in progress...
+                if {[catch {
+                    # get the last line from .git/MERGE_HEAD
+                    set f [open [file join $gitdir MERGE_HEAD] r]
+                    set id [lindex [split [read $f] "\n"] end-1]
+                    close $f
+                } err]} {
+                    error_popup [mc "Couldn't read merge head: %s" $err]
+                    return
+                }
+            } elseif {$parents($curview,$currentid) eq $nullid2} {
+                # need to do the blame from the index
+                if {[catch {
+                    set from_index [index_sha1 $flist_menu_file]
+                } err]} {
+                    error_popup [mc "Error reading index: %s" $err]
+                    return
+                }
+            } else {
+                set id $parents($curview,$currentid)
+            }
+        } else {
+            set id [lindex $parents($curview,$currentid) $pi]
+        }
+        set line [lindex $h 1]
     }
     set blameargs {}
     if {$from_index ne {}} {
-	lappend blameargs | git cat-file blob $from_index
+        lappend blameargs | git cat-file blob $from_index
     }
     lappend blameargs | git blame -p -L$line,+1
     if {$from_index ne {}} {
-	lappend blameargs --contents -
+        lappend blameargs --contents -
     } else {
-	lappend blameargs $id
+        lappend blameargs $id
     }
     lappend blameargs -- [file join $cdup $flist_menu_file]
     if {[catch {
-	set f [open $blameargs r]
+        set f [open $blameargs r]
     } err]} {
-	error_popup [mc "Couldn't start git blame: %s" $err]
-	return
+        error_popup [mc "Couldn't start git blame: %s" $err]
+        return
     }
     nowbusy blaming [mc "Searching"]
     fconfigure $f -blocking 0
@@ -3900,9 +3918,9 @@ proc stopblaming {} {
     global blameinst
 
     if {[info exists blameinst]} {
-	stop_instance $blameinst
-	unset blameinst
-	notbusy blaming
+        stop_instance $blameinst
+        unset blameinst
+        notbusy blaming
     }
 }
 
@@ -3910,18 +3928,18 @@ proc read_line_source {fd inst} {
     global blamestuff curview commfd blameinst nullid nullid2
 
     while {[gets $fd line] >= 0} {
-	lappend blamestuff($inst) $line
+        lappend blamestuff($inst) $line
     }
     if {![eof $fd]} {
-	return 1
+        return 1
     }
     unset commfd($inst)
     unset blameinst
     notbusy blaming
     fconfigure $fd -blocking 1
     if {[catch {close $fd} err]} {
-	error_popup [mc "Error running git blame: %s" $err]
-	return 0
+        error_popup [mc "Error running git blame: %s" $err]
+        return 0
     }
 
     set fname {}
@@ -3929,30 +3947,30 @@ proc read_line_source {fd inst} {
     set id [lindex $line 0]
     set lnum [lindex $line 1]
     if {[string length $id] == 40 && [string is xdigit $id] &&
-	[string is digit -strict $lnum]} {
-	# look for "filename" line
-	foreach l $blamestuff($inst) {
-	    if {[string match "filename *" $l]} {
-		set fname [string range $l 9 end]
-		break
-	    }
-	}
+        [string is digit -strict $lnum]} {
+        # look for "filename" line
+        foreach l $blamestuff($inst) {
+            if {[string match "filename *" $l]} {
+                set fname [string range $l 9 end]
+                break
+            }
+        }
     }
     if {$fname ne {}} {
-	# all looks good, select it
-	if {$id eq $nullid} {
-	    # blame uses all-zeroes to mean not committed,
-	    # which would mean a change in the index
-	    set id $nullid2
-	}
-	if {[commitinview $id $curview]} {
-	    selectline [rowofcommit $id] 1 [list $fname $lnum] 1
-	} else {
-	    error_popup [mc "That line comes from commit %s, \
-			     which is not in this view" [shortids $id]]
-	}
+        # all looks good, select it
+        if {$id eq $nullid} {
+            # blame uses all-zeroes to mean not committed,
+            # which would mean a change in the index
+            set id $nullid2
+        }
+        if {[commitinview $id $curview]} {
+            selectline [rowofcommit $id] 1 [list $fname $lnum] 1
+        } else {
+            error_popup [mc "That line comes from commit %s, \
+                             which is not in this view" [shortids $id]]
+        }
     } else {
-	puts "oops couldn't parse git blame output"
+        puts "oops couldn't parse git blame output"
     }
     return 0
 }
@@ -3961,11 +3979,11 @@ proc read_line_source {fd inst} {
 proc delete_at_eof {f dir} {
     while {[gets $f line] >= 0} {}
     if {[eof $f]} {
-	if {[catch {close $f} err]} {
-	    error_popup "[mc "External diff viewer failed:"] $err"
-	}
-	file delete -force $dir
-	return 0
+        if {[catch {close $f} err]} {
+            error_popup "[mc "External diff viewer failed:"] $err"
+        }
+        file delete -force $dir
+        return 0
     }
     return 1
 }
@@ -3974,13 +3992,13 @@ proc delete_at_eof {f dir} {
 
 proc shellquote {str} {
     if {![string match "*\['\"\\ \t]*" $str]} {
-	return $str
+        return $str
     }
     if {![string match "*\['\"\\]*" $str]} {
-	return "\"$str\""
+        return "\"$str\""
     }
     if {![string match "*'*" $str]} {
-	return "'$str'"
+        return "'$str'"
     }
     return "\"[string map {\" \\\" \\ \\\\} $str]\""
 }
@@ -3988,10 +4006,10 @@ proc shellquote {str} {
 proc shellarglist {l} {
     set str {}
     foreach a $l {
-	if {$str ne {}} {
-	    append str " "
-	}
-	append str [shellquote $a]
+        if {$str ne {}} {
+            append str " "
+        }
+        append str [shellquote $a]
     }
     return $str
 }
@@ -4000,52 +4018,52 @@ proc shelldequote {str} {
     set ret {}
     set used -1
     while {1} {
-	incr used
-	if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
-	    append ret [string range $str $used end]
-	    set used [string length $str]
-	    break
-	}
-	set first [lindex $first 0]
-	set ch [string index $str $first]
-	if {$first > $used} {
-	    append ret [string range $str $used [expr {$first - 1}]]
-	    set used $first
-	}
-	if {$ch eq " " || $ch eq "\t"} break
-	incr used
-	if {$ch eq "'"} {
-	    set first [string first "'" $str $used]
-	    if {$first < 0} {
-		error "unmatched single-quote"
-	    }
-	    append ret [string range $str $used [expr {$first - 1}]]
-	    set used $first
-	    continue
-	}
-	if {$ch eq "\\"} {
-	    if {$used >= [string length $str]} {
-		error "trailing backslash"
-	    }
-	    append ret [string index $str $used]
-	    continue
-	}
-	# here ch == "\""
-	while {1} {
-	    if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
-		error "unmatched double-quote"
-	    }
-	    set first [lindex $first 0]
-	    set ch [string index $str $first]
-	    if {$first > $used} {
-		append ret [string range $str $used [expr {$first - 1}]]
-		set used $first
-	    }
-	    if {$ch eq "\""} break
-	    incr used
-	    append ret [string index $str $used]
-	    incr used
-	}
+        incr used
+        if {![regexp -start $used -indices "\['\"\\\\ \t]" $str first]} {
+            append ret [string range $str $used end]
+            set used [string length $str]
+            break
+        }
+        set first [lindex $first 0]
+        set ch [string index $str $first]
+        if {$first > $used} {
+            append ret [string range $str $used [expr {$first - 1}]]
+            set used $first
+        }
+        if {$ch eq " " || $ch eq "\t"} break
+        incr used
+        if {$ch eq "'"} {
+            set first [string first "'" $str $used]
+            if {$first < 0} {
+                error "unmatched single-quote"
+            }
+            append ret [string range $str $used [expr {$first - 1}]]
+            set used $first
+            continue
+        }
+        if {$ch eq "\\"} {
+            if {$used >= [string length $str]} {
+                error "trailing backslash"
+            }
+            append ret [string index $str $used]
+            continue
+        }
+        # here ch == "\""
+        while {1} {
+            if {![regexp -start $used -indices "\[\"\\\\]" $str first]} {
+                error "unmatched double-quote"
+            }
+            set first [lindex $first 0]
+            set ch [string index $str $first]
+            if {$first > $used} {
+                append ret [string range $str $used [expr {$first - 1}]]
+                set used $first
+            }
+            if {$ch eq "\""} break
+            incr used
+            append ret [string index $str $used]
+            incr used
+        }
     }
     return [list $used $ret]
 }
@@ -4053,13 +4071,13 @@ proc shelldequote {str} {
 proc shellsplit {str} {
     set l {}
     while {1} {
-	set str [string trimleft $str]
-	if {$str eq {}} break
-	set dq [shelldequote $str]
-	set n [lindex $dq 0]
-	set word [lindex $dq 1]
-	set str [string range $str $n end]
-	lappend l $word
+        set str [string trimleft $str]
+        if {$str eq {}} break
+        set dq [shelldequote $str]
+        set n [lindex $dq 0]
+        set word [lindex $dq 1]
+        set str [string range $str $n end]
+        lappend l $word
     }
     return $l
 }
@@ -4068,11 +4086,11 @@ proc set_window_title {} {
     global appname curview viewname vrevs
     set rev [mc "All files"]
     if {$curview ne 0} {
-	if {$viewname($curview) eq [mc "Command line"]} {
-	    set rev [string map {"--gitk-symmetric-diff-marker" "--merge"} $vrevs($curview)]
-	} else {
-	    set rev $viewname($curview)
-	}
+        if {$viewname($curview) eq [mc "Command line"]} {
+            set rev [string map {"--gitk-symmetric-diff-marker" "--merge"} $vrevs($curview)]
+        } else {
+            set rev $viewname($curview)
+        }
     }
     wm title . "[reponame]: $rev - $appname"
 }
@@ -4086,8 +4104,8 @@ proc newview {ishighlight} {
     set newishighlight $ishighlight
     set top .gitkview
     if {[winfo exists $top]} {
-	raise $top
-	return
+        raise $top
+        return
     }
     decode_view_opts $nextviewnum $revtreeargs
     set newviewname($nextviewnum) "[mc "View"] $nextviewnum"
@@ -4136,29 +4154,29 @@ proc encode_view_opts {n} {
 
     set rargs [list]
     foreach opt $known_view_options {
-	set patterns [lindex $opt 3]
-	if {$patterns eq {}} continue
-	set pattern [lindex $patterns 0]
-
-	if {[lindex $opt 1] eq "b"} {
-	    set val $newviewopts($n,[lindex $opt 0])
-	    if {$val} {
-		lappend rargs $pattern
-	    }
-	} elseif {[regexp {^r(\d+)$} [lindex $opt 1] type value]} {
-	    regexp {^(.*_)} [lindex $opt 0] uselessvar button_id
-	    set val $newviewopts($n,$button_id)
-	    if {$val eq $value} {
-		lappend rargs $pattern
-	    }
-	} else {
-	    set val $newviewopts($n,[lindex $opt 0])
-	    set val [string trim $val]
-	    if {$val ne {}} {
-		set pfix [string range $pattern 0 end-1]
-		lappend rargs $pfix$val
-	    }
-	}
+        set patterns [lindex $opt 3]
+        if {$patterns eq {}} continue
+        set pattern [lindex $patterns 0]
+
+        if {[lindex $opt 1] eq "b"} {
+            set val $newviewopts($n,[lindex $opt 0])
+            if {$val} {
+                lappend rargs $pattern
+            }
+        } elseif {[regexp {^r(\d+)$} [lindex $opt 1] type value]} {
+            regexp {^(.*_)} [lindex $opt 0] uselessvar button_id
+            set val $newviewopts($n,$button_id)
+            if {$val eq $value} {
+                lappend rargs $pattern
+            }
+        } else {
+            set val $newviewopts($n,[lindex $opt 0])
+            set val [string trim $val]
+            if {$val ne {}} {
+                set pfix [string range $pattern 0 end-1]
+                lappend rargs $pfix$val
+            }
+        }
     }
     set rargs [concat $rargs [shellsplit $newviewopts($n,refs)]]
     return [concat $rargs [shellsplit $newviewopts($n,args)]]
@@ -4169,59 +4187,59 @@ proc decode_view_opts {n view_args} {
     global known_view_options newviewopts
 
     foreach opt $known_view_options {
-	set id [lindex $opt 0]
-	if {[lindex $opt 1] eq "b"} {
-	    # Checkboxes
-	    set val 0
+        set id [lindex $opt 0]
+        if {[lindex $opt 1] eq "b"} {
+            # Checkboxes
+            set val 0
         } elseif {[regexp {^r(\d+)$} [lindex $opt 1]]} {
-	    # Radiobuttons
-	    regexp {^(.*_)} $id uselessvar id
-	    set val 0
-	} else {
-	    # Text fields
-	    set val {}
-	}
-	set newviewopts($n,$id) $val
+            # Radiobuttons
+            regexp {^(.*_)} $id uselessvar id
+            set val 0
+        } else {
+            # Text fields
+            set val {}
+        }
+        set newviewopts($n,$id) $val
     }
     set oargs [list]
     set refargs [list]
     foreach arg $view_args {
-	if {[regexp -- {^-([0-9]+)$} $arg arg cnt]
-	    && ![info exists found(limit)]} {
-	    set newviewopts($n,limit) $cnt
-	    set found(limit) 1
-	    continue
-	}
-	catch { unset val }
-	foreach opt $known_view_options {
-	    set id [lindex $opt 0]
-	    if {[info exists found($id)]} continue
-	    foreach pattern [lindex $opt 3] {
-		if {![string match $pattern $arg]} continue
-		if {[lindex $opt 1] eq "b"} {
-		    # Check buttons
-		    set val 1
-		} elseif {[regexp {^r(\d+)$} [lindex $opt 1] match num]} {
-		    # Radio buttons
-		    regexp {^(.*_)} $id uselessvar id
-		    set val $num
-		} else {
-		    # Text input fields
-		    set size [string length $pattern]
-		    set val [string range $arg [expr {$size-1}] end]
-		}
-		set newviewopts($n,$id) $val
-		set found($id) 1
-		break
-	    }
-	    if {[info exists val]} break
-	}
-	if {[info exists val]} continue
-	if {[regexp {^-} $arg]} {
-	    lappend oargs $arg
-	} else {
-	    lappend refargs $arg
-	}
+        if {[regexp -- {^-([0-9]+)$} $arg arg cnt]
+            && ![info exists found(limit)]} {
+            set newviewopts($n,limit) $cnt
+            set found(limit) 1
+            continue
+        }
+        catch { unset val }
+        foreach opt $known_view_options {
+            set id [lindex $opt 0]
+            if {[info exists found($id)]} continue
+            foreach pattern [lindex $opt 3] {
+                if {![string match $pattern $arg]} continue
+                if {[lindex $opt 1] eq "b"} {
+                    # Check buttons
+                    set val 1
+                } elseif {[regexp {^r(\d+)$} [lindex $opt 1] match num]} {
+                    # Radio buttons
+                    regexp {^(.*_)} $id uselessvar id
+                    set val $num
+                } else {
+                    # Text input fields
+                    set size [string length $pattern]
+                    set val [string range $arg [expr {$size-1}] end]
+                }
+                set newviewopts($n,$id) $val
+                set found($id) 1
+                break
+            }
+            if {[info exists val]} break
+        }
+        if {[info exists val]} continue
+        if {[regexp {^-} $arg]} {
+            lappend oargs $arg
+        } else {
+            lappend refargs $arg
+        }
     }
     set newviewopts($n,refs) [shellarglist $refargs]
     set newviewopts($n,args) [shellarglist $oargs]
@@ -4231,9 +4249,9 @@ proc edit_or_newview {} {
     global curview
 
     if {$curview > 0} {
-	editview
+        editview
     } else {
-	newview 0
+        newview 0
     }
 }
 
@@ -4244,8 +4262,8 @@ proc editview {} {
 
     set top .gitkvedit-$curview
     if {[winfo exists $top]} {
-	raise $top
-	return
+        raise $top
+        return
     }
     decode_view_opts $curview $viewargs($curview)
     set newviewname($curview)      $viewname($curview)
@@ -4275,66 +4293,66 @@ proc vieweditor {top n title} {
     set cexpand 0
     set cnt 0
     foreach opt $known_view_options {
-	set id [lindex $opt 0]
-	set type [lindex $opt 1]
-	set flags [lindex $opt 2]
-	set title [eval [lindex $opt 4]]
-	set lxpad 0
-
-	if {$flags eq "+" || $flags eq "*"} {
-	    set cframe $top.fr$cnt
-	    incr cnt
-	    ${NS}::frame $cframe
-	    pack $cframe -in $top -fill x -pady 3 -padx 3
-	    set cexpand [expr {$flags eq "*"}]
+        set id [lindex $opt 0]
+        set type [lindex $opt 1]
+        set flags [lindex $opt 2]
+        set title [eval [lindex $opt 4]]
+        set lxpad 0
+
+        if {$flags eq "+" || $flags eq "*"} {
+            set cframe $top.fr$cnt
+            incr cnt
+            ${NS}::frame $cframe
+            pack $cframe -in $top -fill x -pady 3 -padx 3
+            set cexpand [expr {$flags eq "*"}]
         } elseif {$flags eq ".." || $flags eq "*."} {
-	    set cframe $top.fr$cnt
-	    incr cnt
-	    ${NS}::frame $cframe
-	    pack $cframe -in $top -fill x -pady 3 -padx [list 15 3]
-	    set cexpand [expr {$flags eq "*."}]
-	} else {
-	    set lxpad 5
-	}
-
-	if {$type eq "l"} {
+            set cframe $top.fr$cnt
+            incr cnt
+            ${NS}::frame $cframe
+            pack $cframe -in $top -fill x -pady 3 -padx [list 15 3]
+            set cexpand [expr {$flags eq "*."}]
+        } else {
+            set lxpad 5
+        }
+
+        if {$type eq "l"} {
             ${NS}::label $cframe.l_$id -text $title
             pack $cframe.l_$id -in $cframe -side left -pady [list 3 0] -anchor w
-	} elseif {$type eq "b"} {
-	    ${NS}::checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id)
-	    pack $cframe.c_$id -in $cframe -side left \
-		-padx [list $lxpad 0] -expand $cexpand -anchor w
-	} elseif {[regexp {^r(\d+)$} $type type sz]} {
-	    regexp {^(.*_)} $id uselessvar button_id
-	    ${NS}::radiobutton $cframe.c_$id -text $title -variable newviewopts($n,$button_id) -value $sz
-	    pack $cframe.c_$id -in $cframe -side left \
-		-padx [list $lxpad 0] -expand $cexpand -anchor w
-	} elseif {[regexp {^t(\d+)$} $type type sz]} {
-	    ${NS}::label $cframe.l_$id -text $title
-	    ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
-		-textvariable newviewopts($n,$id)
-	    pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0]
-	    pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x
-	} elseif {[regexp {^t(\d+)=$} $type type sz]} {
-	    ${NS}::label $cframe.l_$id -text $title
-	    ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
-		-textvariable newviewopts($n,$id)
-	    pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w
-	    pack $cframe.e_$id -in $cframe -side top -fill x
-	} elseif {$type eq "path"} {
-	    ${NS}::label $top.l -text $title
-	    pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3
-	    text $top.t -width 40 -height 5 -background $bgcolor
-	    if {[info exists viewfiles($n)]} {
-		foreach f $viewfiles($n) {
-		    $top.t insert end $f
-		    $top.t insert end "\n"
-		}
-		$top.t delete {end - 1c} end
-		$top.t mark set insert 0.0
-	    }
-	    pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3
-	}
+        } elseif {$type eq "b"} {
+            ${NS}::checkbutton $cframe.c_$id -text $title -variable newviewopts($n,$id)
+            pack $cframe.c_$id -in $cframe -side left \
+                -padx [list $lxpad 0] -expand $cexpand -anchor w
+        } elseif {[regexp {^r(\d+)$} $type type sz]} {
+            regexp {^(.*_)} $id uselessvar button_id
+            ${NS}::radiobutton $cframe.c_$id -text $title -variable newviewopts($n,$button_id) -value $sz
+            pack $cframe.c_$id -in $cframe -side left \
+                -padx [list $lxpad 0] -expand $cexpand -anchor w
+        } elseif {[regexp {^t(\d+)$} $type type sz]} {
+            ${NS}::label $cframe.l_$id -text $title
+            ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
+                -textvariable newviewopts($n,$id)
+            pack $cframe.l_$id -in $cframe -side left -padx [list $lxpad 0]
+            pack $cframe.e_$id -in $cframe -side left -expand 1 -fill x
+        } elseif {[regexp {^t(\d+)=$} $type type sz]} {
+            ${NS}::label $cframe.l_$id -text $title
+            ${NS}::entry $cframe.e_$id -width $sz -background $bgcolor \
+                -textvariable newviewopts($n,$id)
+            pack $cframe.l_$id -in $cframe -side top -pady [list 3 0] -anchor w
+            pack $cframe.e_$id -in $cframe -side top -fill x
+        } elseif {$type eq "path"} {
+            ${NS}::label $top.l -text $title
+            pack $top.l -in $top -side top -pady [list 3 0] -anchor w -padx 3
+            text $top.t -width 40 -height 5 -background $bgcolor
+            if {[info exists viewfiles($n)]} {
+                foreach f $viewfiles($n) {
+                    $top.t insert end $f
+                    $top.t insert end "\n"
+                }
+                $top.t delete {end - 1c} end
+                $top.t mark set insert 0.0
+            }
+            pack $top.t -in $top -side top -pady [list 0 5] -fill both -expand 1 -padx 3
+        }
     }
 
     ${NS}::frame $top.buts
@@ -4355,10 +4373,10 @@ proc vieweditor {top n title} {
 proc doviewmenu {m first cmd op argv} {
     set nmenu [$m index end]
     for {set i $first} {$i <= $nmenu} {incr i} {
-	if {[$m entrycget $i -command] eq $cmd} {
-	    eval $m $op $i $argv
-	    break
-	}
+        if {[$m entrycget $i -command] eq $cmd} {
+            eval $m $op $i $argv
+            break
+        }
     }
 }
 
@@ -4375,53 +4393,53 @@ proc newviewok {top n {apply 0}} {
     global viewargs viewargscmd newviewopts viewhlmenu
 
     if {[catch {
-	set newargs [encode_view_opts $n]
+        set newargs [encode_view_opts $n]
     } err]} {
-	error_popup "[mc "Error in commit selection arguments:"] $err" $top
-	return
+        error_popup "[mc "Error in commit selection arguments:"] $err" $top
+        return
     }
     set files {}
     foreach f [split [$top.t get 0.0 end] "\n"] {
-	set ft [string trim $f]
-	if {$ft ne {}} {
-	    lappend files $ft
-	}
+        set ft [string trim $f]
+        if {$ft ne {}} {
+            lappend files $ft
+        }
     }
     if {![info exists viewfiles($n)]} {
-	# creating a new view
-	incr nextviewnum
-	set viewname($n) $newviewname($n)
-	set viewperm($n) $newviewopts($n,perm)
-	set viewchanged($n) 1
-	set viewfiles($n) $files
-	set viewargs($n) $newargs
-	set viewargscmd($n) $newviewopts($n,cmd)
-	addviewmenu $n
-	if {!$newishighlight} {
-	    run showview $n
-	} else {
-	    run addvhighlight $n
-	}
+        # creating a new view
+        incr nextviewnum
+        set viewname($n) $newviewname($n)
+        set viewperm($n) $newviewopts($n,perm)
+        set viewchanged($n) 1
+        set viewfiles($n) $files
+        set viewargs($n) $newargs
+        set viewargscmd($n) $newviewopts($n,cmd)
+        addviewmenu $n
+        if {!$newishighlight} {
+            run showview $n
+        } else {
+            run addvhighlight $n
+        }
     } else {
-	# editing an existing view
-	set viewperm($n) $newviewopts($n,perm)
-	set viewchanged($n) 1
-	if {$newviewname($n) ne $viewname($n)} {
-	    set viewname($n) $newviewname($n)
-	    doviewmenu .bar.view 5 [list showview $n] \
-		entryconf [list -label $viewname($n)]
-	    # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
-		# entryconf [list -label $viewname($n) -value $viewname($n)]
-	}
-	if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
-		$newviewopts($n,cmd) ne $viewargscmd($n)} {
-	    set viewfiles($n) $files
-	    set viewargs($n) $newargs
-	    set viewargscmd($n) $newviewopts($n,cmd)
-	    if {$curview == $n} {
-		run reloadcommits
-	    }
-	}
+        # editing an existing view
+        set viewperm($n) $newviewopts($n,perm)
+        set viewchanged($n) 1
+        if {$newviewname($n) ne $viewname($n)} {
+            set viewname($n) $newviewname($n)
+            doviewmenu .bar.view 5 [list showview $n] \
+                entryconf [list -label $viewname($n)]
+            # doviewmenu $viewhlmenu 1 [list addvhighlight $n] \
+                # entryconf [list -label $viewname($n) -value $viewname($n)]
+        }
+        if {$files ne $viewfiles($n) || $newargs ne $viewargs($n) || \
+                $newviewopts($n,cmd) ne $viewargscmd($n)} {
+            set viewfiles($n) $files
+            set viewargs($n) $newargs
+            set viewargscmd($n) $newviewopts($n,cmd)
+            if {$curview == $n} {
+                run reloadcommits
+            }
+        }
     }
     if {$apply} return
     catch {destroy $top}
@@ -4432,8 +4450,8 @@ proc delview {} {
 
     if {$curview == 0} return
     if {[info exists hlview] && $hlview == $curview} {
-	set selectedhlview [mc "None"]
-	unset hlview
+        set selectedhlview [mc "None"]
+        unset hlview
     }
     allviewmenus $curview delete
     set viewperm($curview) 0
@@ -4445,7 +4463,7 @@ proc addviewmenu {n} {
     global viewname viewhlmenu
 
     .bar.view add radiobutton -label $viewname($n) \
-	-command [list showview $n] -variable selectedview -value $n
+        -command [list showview $n] -variable selectedview -value $n
     #$viewhlmenu add radiobutton -label $viewname($n) \
     #	-command [list addvhighlight $n] -variable selectedhlview
 }
@@ -4470,22 +4488,22 @@ proc showview {n} {
     set ybot [expr {[lindex $span 1] * $ymax}]
     set yscreen [expr {($ybot - $ytop) / 2}]
     if {$selectedline ne {}} {
-	set selid $currentid
-	set y [yc $selectedline]
-	if {$ytop < $y && $y < $ybot} {
-	    set yscreen [expr {$y - $ytop}]
-	}
+        set selid $currentid
+        set y [yc $selectedline]
+        if {$ytop < $y && $y < $ybot} {
+            set yscreen [expr {$y - $ytop}]
+        }
     } elseif {[info exists pending_select]} {
-	set selid $pending_select
-	unset pending_select
+        set selid $pending_select
+        unset pending_select
     }
     unselectline
     normalline
     unset -nocomplain treediffs
     clear_display
     if {[info exists hlview] && $hlview == $n} {
-	unset hlview
-	set selectedhlview [mc "None"]
+        unset hlview
+        set selectedhlview [mc "None"]
     }
     unset -nocomplain commitinterest
     unset -nocomplain cached_commitrow
@@ -4498,8 +4516,8 @@ proc showview {n} {
 
     run refill_reflist
     if {![info exists viewcomplete($n)]} {
-	getcommits $selid
-	return
+        getcommits $selid
+        return
     }
 
     set displayorder {}
@@ -4519,39 +4537,39 @@ proc showview {n} {
     set yf 0
     set row {}
     if {$selid ne {} && [commitinview $selid $n]} {
-	set row [rowofcommit $selid]
-	# try to get the selected row in the same position on the screen
-	set ymax [lindex [$canv cget -scrollregion] 3]
-	set ytop [expr {[yc $row] - $yscreen}]
-	if {$ytop < 0} {
-	    set ytop 0
-	}
-	set yf [expr {$ytop * 1.0 / $ymax}]
+        set row [rowofcommit $selid]
+        # try to get the selected row in the same position on the screen
+        set ymax [lindex [$canv cget -scrollregion] 3]
+        set ytop [expr {[yc $row] - $yscreen}]
+        if {$ytop < 0} {
+            set ytop 0
+        }
+        set yf [expr {$ytop * 1.0 / $ymax}]
     }
     allcanvs yview moveto $yf
     drawvisible
     if {$row ne {}} {
-	selectline $row 0
+        selectline $row 0
     } elseif {!$viewcomplete($n)} {
-	reset_pending_select $selid
+        reset_pending_select $selid
     } else {
-	reset_pending_select {}
+        reset_pending_select {}
 
-	if {[commitinview $pending_select $curview]} {
-	    selectline [rowofcommit $pending_select] 1
-	} else {
-	    set row [first_real_row]
-	    if {$row < $numcommits} {
-		selectline $row 0
-	    }
-	}
+        if {[commitinview $pending_select $curview]} {
+            selectline [rowofcommit $pending_select] 1
+        } else {
+            set row [first_real_row]
+            if {$row < $numcommits} {
+                selectline $row 0
+            }
+        }
     }
     if {!$viewcomplete($n)} {
-	if {$numcommits == 0} {
-	    show_status [mc "Reading commits..."]
-	}
+        if {$numcommits == 0} {
+            show_status [mc "Reading commits..."]
+        }
     } elseif {$numcommits == 0} {
-	show_status [mc "No commits selected"]
+        show_status [mc "No commits selected"]
     }
     set_window_title
 }
@@ -4562,16 +4580,16 @@ proc ishighlighted {id} {
     global vhighlights fhighlights nhighlights rhighlights
 
     if {[info exists nhighlights($id)] && $nhighlights($id) > 0} {
-	return $nhighlights($id)
+        return $nhighlights($id)
     }
     if {[info exists vhighlights($id)] && $vhighlights($id) > 0} {
-	return $vhighlights($id)
+        return $vhighlights($id)
     }
     if {[info exists fhighlights($id)] && $fhighlights($id) > 0} {
-	return $fhighlights($id)
+        return $fhighlights($id)
     }
     if {[info exists rhighlights($id)] && $rhighlights($id) > 0} {
-	return $rhighlights($id)
+        return $rhighlights($id)
     }
     return 0
 }
@@ -4584,14 +4602,14 @@ proc bolden {id font} {
     lappend boldids $id
     $canv itemconf $linehtag($id) -font $font
     if {[info exists currentid] && $id eq $currentid} {
-	$canv delete secsel
-	set t [eval $canv create rect [$canv bbox $linehtag($id)] \
-		   -outline {{}} -tags secsel \
-		   -fill [$canv cget -selectbackground]]
-	$canv lower $t
+        $canv delete secsel
+        set t [eval $canv create rect [$canv bbox $linehtag($id)] \
+                   -outline {{}} -tags secsel \
+                   -fill [$canv cget -selectbackground]]
+        $canv lower $t
     }
     if {[info exists markedid] && $id eq $markedid} {
-	make_idmark $id
+        make_idmark $id
     }
 }
 
@@ -4602,11 +4620,11 @@ proc bolden_name {id font} {
     lappend boldnameids $id
     $canv2 itemconf $linentag($id) -font $font
     if {[info exists currentid] && $id eq $currentid} {
-	$canv2 delete secsel
-	set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \
-		   -outline {{}} -tags secsel \
-		   -fill [$canv2 cget -selectbackground]]
-	$canv2 lower $t
+        $canv2 delete secsel
+        set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] \
+                   -outline {{}} -tags secsel \
+                   -fill [$canv2 cget -selectbackground]]
+        $canv2 lower $t
     }
 }
 
@@ -4615,11 +4633,11 @@ proc unbolden {} {
 
     set stillbold {}
     foreach id $boldids {
-	if {![ishighlighted $id]} {
-	    bolden $id mainfont
-	} else {
-	    lappend stillbold $id
-	}
+        if {![ishighlighted $id]} {
+            bolden $id mainfont
+        } else {
+            lappend stillbold $id
+        }
     }
     set boldids $stillbold
 }
@@ -4628,15 +4646,15 @@ proc addvhighlight {n} {
     global hlview viewcomplete curview vhl_done commitidx
 
     if {[info exists hlview]} {
-	delvhighlight
+        delvhighlight
     }
     set hlview $n
     if {$n != $curview && ![info exists viewcomplete($n)]} {
-	start_rev_list $n
+        start_rev_list $n
     }
     set vhl_done $commitidx($hlview)
     if {$vhl_done > 0} {
-	drawvisible
+        drawvisible
     }
 }
 
@@ -4657,16 +4675,16 @@ proc vhighlightmore {} {
     set r0 [lindex $vr 0]
     set r1 [lindex $vr 1]
     for {set i $vhl_done} {$i < $max} {incr i} {
-	set id [commitonrow $i $hlview]
-	if {[commitinview $id $curview]} {
-	    set row [rowofcommit $id]
-	    if {$r0 <= $row && $row <= $r1} {
-		if {![highlighted $row]} {
-		    bolden $id mainfontbold
-		}
-		set vhighlights($id) 1
-	    }
-	}
+        set id [commitonrow $i $hlview]
+        if {[commitinview $id $curview]} {
+            set row [rowofcommit $id]
+            if {$r0 <= $row && $row <= $r1} {
+                if {![highlighted $row]} {
+                    bolden $id mainfontbold
+                }
+                set vhighlights($id) 1
+            }
+        }
     }
     set vhl_done $max
     return 0
@@ -4676,12 +4694,12 @@ proc askvhighlight {row id} {
     global hlview vhighlights iddrawn
 
     if {[commitinview $id $hlview]} {
-	if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
-	    bolden $id mainfontbold
-	}
-	set vhighlights($id) 1
+        if {[info exists iddrawn($id)] && ![ishighlighted $id]} {
+            bolden $id mainfontbold
+        }
+        set vhighlights($id) 1
     } else {
-	set vhighlights($id) 0
+        set vhighlights($id) 0
     }
 }
 
@@ -4690,18 +4708,18 @@ proc hfiles_change {} {
     global highlight_paths
 
     if {[info exists filehighlight]} {
-	# delete previous highlights
-	catch {close $filehighlight}
-	unset filehighlight
-	unset -nocomplain fhighlights
-	unbolden
-	unhighlight_filelist
+        # delete previous highlights
+        catch {close $filehighlight}
+        unset filehighlight
+        unset -nocomplain fhighlights
+        unbolden
+        unhighlight_filelist
     }
     set highlight_paths {}
     after cancel do_file_hl $fh_serial
     incr fh_serial
     if {$highlight_files ne {}} {
-	after 300 do_file_hl $fh_serial
+        after 300 do_file_hl $fh_serial
     }
 }
 
@@ -4710,21 +4728,21 @@ proc gdttype_change {name ix op} {
 
     stopfinding
     if {$findstring ne {}} {
-	if {$gdttype eq [mc "containing:"]} {
-	    if {$highlight_files ne {}} {
-		set highlight_files {}
-		hfiles_change
-	    }
-	    findcom_change
-	} else {
-	    if {$findpattern ne {}} {
-		set findpattern {}
-		findcom_change
-	    }
-	    set highlight_files $findstring
-	    hfiles_change
-	}
-	drawvisible
+        if {$gdttype eq [mc "containing:"]} {
+            if {$highlight_files ne {}} {
+                set highlight_files {}
+                hfiles_change
+            }
+            findcom_change
+        } else {
+            if {$findpattern ne {}} {
+                set findpattern {}
+                findcom_change
+            }
+            set highlight_files $findstring
+            hfiles_change
+        }
+        drawvisible
     }
     # enable/disable findtype/findloc menus too
 }
@@ -4734,12 +4752,12 @@ proc find_change {name ix op} {
 
     stopfinding
     if {$gdttype eq [mc "containing:"]} {
-	findcom_change
+        findcom_change
     } else {
-	if {$highlight_files ne $findstring} {
-	    set highlight_files $findstring
-	    hfiles_change
-	}
+        if {$highlight_files ne $findstring} {
+            set highlight_files $findstring
+            hfiles_change
+        }
     }
     drawvisible
 }
@@ -4751,33 +4769,33 @@ proc findcom_change args {
     stopfinding
     # delete previous highlights, if any
     foreach id $boldnameids {
-	bolden_name $id mainfont
+        bolden_name $id mainfont
     }
     set boldnameids {}
     unset -nocomplain nhighlights
     unbolden
     unmarkmatches
     if {$gdttype ne [mc "containing:"] || $findstring eq {}} {
-	set findpattern {}
+        set findpattern {}
     } elseif {$findtype eq [mc "Regexp"]} {
-	set findpattern $findstring
+        set findpattern $findstring
     } else {
-	set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
-		   $findstring]
-	set findpattern "*$e*"
+        set e [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} \
+                   $findstring]
+        set findpattern "*$e*"
     }
 }
 
 proc makepatterns {l} {
     set ret {}
     foreach e $l {
-	set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e]
-	if {[string index $ee end] eq "/"} {
-	    lappend ret "$ee*"
-	} else {
-	    lappend ret $ee
-	    lappend ret "$ee/*"
-	}
+        set ee [string map {"*" "\\*" "?" "\\?" "\[" "\\\[" "\\" "\\\\"} $e]
+        if {[string index $ee end] eq "/"} {
+            lappend ret "$ee*"
+        } else {
+            lappend ret $ee
+            lappend ret "$ee/*"
+        }
     }
     return $ret
 }
@@ -4787,26 +4805,26 @@ proc do_file_hl {serial} {
     global cdup findtype
 
     if {$gdttype eq [mc "touching paths:"]} {
-	# If "exact" match then convert backslashes to forward slashes.
-	# Most useful to support Windows-flavoured file paths.
-	if {$findtype eq [mc "Exact"]} {
-	    set highlight_files [string map {"\\" "/"} $highlight_files]
-	}
-	if {[catch {set paths [shellsplit $highlight_files]}]} return
-	set highlight_paths [makepatterns $paths]
-	highlight_filelist
-	set relative_paths {}
-	foreach path $paths {
-	    lappend relative_paths [file join $cdup $path]
-	}
-	set gdtargs [concat -- $relative_paths]
+        # If "exact" match then convert backslashes to forward slashes.
+        # Most useful to support Windows-flavoured file paths.
+        if {$findtype eq [mc "Exact"]} {
+            set highlight_files [string map {"\\" "/"} $highlight_files]
+        }
+        if {[catch {set paths [shellsplit $highlight_files]}]} return
+        set highlight_paths [makepatterns $paths]
+        highlight_filelist
+        set relative_paths {}
+        foreach path $paths {
+            lappend relative_paths [file join $cdup $path]
+        }
+        set gdtargs [concat -- $relative_paths]
     } elseif {$gdttype eq [mc "adding/removing string:"]} {
-	set gdtargs [list "-S$highlight_files"]
+        set gdtargs [list "-S$highlight_files"]
     } elseif {$gdttype eq [mc "changing lines matching:"]} {
-	set gdtargs [list "-G$highlight_files"]
+        set gdtargs [list "-G$highlight_files"]
     } else {
-	# must be "containing:", i.e. we're searching commit info
-	return
+        # must be "containing:", i.e. we're searching commit info
+        return
     }
     set cmd [concat | git diff-tree -r -s --stdin $gdtargs]
     set filehighlight [open $cmd r+]
@@ -4821,9 +4839,9 @@ proc flushhighlights {} {
     global filehighlight fhl_list
 
     if {[info exists filehighlight]} {
-	lappend fhl_list {}
-	puts $filehighlight ""
-	flush $filehighlight
+        lappend fhl_list {}
+        puts $filehighlight ""
+        flush $filehighlight
     }
 }
 
@@ -4840,34 +4858,34 @@ proc readfhighlight {} {
     global fhl_list find_dirn
 
     if {![info exists filehighlight]} {
-	return 0
+        return 0
     }
     set nr 0
     while {[incr nr] <= 100 && [gets $filehighlight line] >= 0} {
-	set line [string trim $line]
-	set i [lsearch -exact $fhl_list $line]
-	if {$i < 0} continue
-	for {set j 0} {$j < $i} {incr j} {
-	    set id [lindex $fhl_list $j]
-	    set fhighlights($id) 0
-	}
-	set fhl_list [lrange $fhl_list [expr {$i+1}] end]
-	if {$line eq {}} continue
-	if {![commitinview $line $curview]} continue
-	if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
-	    bolden $line mainfontbold
-	}
-	set fhighlights($line) 1
+        set line [string trim $line]
+        set i [lsearch -exact $fhl_list $line]
+        if {$i < 0} continue
+        for {set j 0} {$j < $i} {incr j} {
+            set id [lindex $fhl_list $j]
+            set fhighlights($id) 0
+        }
+        set fhl_list [lrange $fhl_list [expr {$i+1}] end]
+        if {$line eq {}} continue
+        if {![commitinview $line $curview]} continue
+        if {[info exists iddrawn($line)] && ![ishighlighted $line]} {
+            bolden $line mainfontbold
+        }
+        set fhighlights($line) 1
     }
     if {[eof $filehighlight]} {
-	# strange...
-	puts "oops, git diff-tree died"
-	catch {close $filehighlight}
-	unset filehighlight
-	return 0
+        # strange...
+        puts "oops, git diff-tree died"
+        catch {close $filehighlight}
+        unset filehighlight
+        return 0
     }
     if {[info exists find_dirn]} {
-	run findmore
+        run findmore
     }
     return 1
 }
@@ -4876,11 +4894,11 @@ proc doesmatch {f} {
     global findtype findpattern
 
     if {$findtype eq [mc "Regexp"]} {
-	return [regexp $findpattern $f]
+        return [regexp $findpattern $f]
     } elseif {$findtype eq [mc "IgnCase"]} {
-	return [string match -nocase $findpattern $f]
+        return [string match -nocase $findpattern $f]
     } else {
-	return [string match $findpattern $f]
+        return [string match $findpattern $f]
     }
 }
 
@@ -4890,32 +4908,32 @@ proc askfindhighlight {row id} {
     global markingmatches
 
     if {![info exists commitinfo($id)]} {
-	getcommit $id
+        getcommit $id
     }
     set info $commitinfo($id)
     set isbold 0
     set fldtypes [list [mc Headline] [mc Author] "" [mc Committer] "" [mc Comments]]
     foreach f $info ty $fldtypes {
-	if {$ty eq ""} continue
-	if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
-	    [doesmatch $f]} {
-	    if {$ty eq [mc "Author"]} {
-		set isbold 2
-		break
-	    }
-	    set isbold 1
-	}
+        if {$ty eq ""} continue
+        if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
+            [doesmatch $f]} {
+            if {$ty eq [mc "Author"]} {
+                set isbold 2
+                break
+            }
+            set isbold 1
+        }
     }
     if {$isbold && [info exists iddrawn($id)]} {
-	if {![ishighlighted $id]} {
-	    bolden $id mainfontbold
-	    if {$isbold > 1} {
-		bolden_name $id mainfontbold
-	    }
-	}
-	if {$markingmatches} {
-	    markrowmatches $row $id
-	}
+        if {![ishighlighted $id]} {
+            bolden $id mainfontbold
+            if {$isbold > 1} {
+                bolden_name $id mainfontbold
+            }
+        }
+        if {$markingmatches} {
+            markrowmatches $row $id
+        }
     }
     set nhighlights($id) $isbold
 }
@@ -4928,18 +4946,18 @@ proc markrowmatches {row id} {
     $canv delete match$row
     $canv2 delete match$row
     if {$findloc eq [mc "All fields"] || $findloc eq [mc "Headline"]} {
-	set m [findmatches $headline]
-	if {$m ne {}} {
-	    markmatches $canv $row $headline $linehtag($id) $m \
-		[$canv itemcget $linehtag($id) -font] $row
-	}
+        set m [findmatches $headline]
+        if {$m ne {}} {
+            markmatches $canv $row $headline $linehtag($id) $m \
+                [$canv itemcget $linehtag($id) -font] $row
+        }
     }
     if {$findloc eq [mc "All fields"] || $findloc eq [mc "Author"]} {
-	set m [findmatches $author]
-	if {$m ne {}} {
-	    markmatches $canv2 $row $author $linentag($id) $m \
-		[$canv2 itemcget $linentag($id) -font] $row
-	}
+        set m [findmatches $author]
+        if {$m ne {}} {
+            markmatches $canv2 $row $author $linentag($id) $m \
+                [$canv2 itemcget $linentag($id) -font] $row
+        }
     }
 }
 
@@ -4948,7 +4966,7 @@ proc vrel_change {name ix op} {
 
     rhighlight_none
     if {$highlight_related ne [mc "None"]} {
-	run drawvisible
+        run drawvisible
     }
 }
 
@@ -4962,8 +4980,8 @@ proc rhighlight_sel {a} {
     unset -nocomplain ancestor
     set anc_todo [list $a]
     if {$highlight_related ne [mc "None"]} {
-	rhighlight_none
-	run drawvisible
+        rhighlight_none
+        run drawvisible
     }
 }
 
@@ -4983,24 +5001,24 @@ proc is_descendent {a} {
     set leftover {}
     set done 0
     for {set i 0} {$i < [llength $todo]} {incr i} {
-	set do [lindex $todo $i]
-	if {[rowofcommit $do] < $la} {
-	    lappend leftover $do
-	    continue
-	}
-	foreach nk $children($v,$do) {
-	    if {![info exists descendent($nk)]} {
-		set descendent($nk) 1
-		lappend todo $nk
-		if {$nk eq $a} {
-		    set done 1
-		}
-	    }
-	}
-	if {$done} {
-	    set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
-	    return
-	}
+        set do [lindex $todo $i]
+        if {[rowofcommit $do] < $la} {
+            lappend leftover $do
+            continue
+        }
+        foreach nk $children($v,$do) {
+            if {![info exists descendent($nk)]} {
+                set descendent($nk) 1
+                lappend todo $nk
+                if {$nk eq $a} {
+                    set done 1
+                }
+            }
+        }
+        if {$done} {
+            set desc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
+            return
+        }
     }
     set descendent($a) 0
     set desc_todo $leftover
@@ -5015,24 +5033,24 @@ proc is_ancestor {a} {
     set leftover {}
     set done 0
     for {set i 0} {$i < [llength $todo]} {incr i} {
-	set do [lindex $todo $i]
-	if {![commitinview $do $v] || [rowofcommit $do] > $la} {
-	    lappend leftover $do
-	    continue
-	}
-	foreach np $parents($v,$do) {
-	    if {![info exists ancestor($np)]} {
-		set ancestor($np) 1
-		lappend todo $np
-		if {$np eq $a} {
-		    set done 1
-		}
-	    }
-	}
-	if {$done} {
-	    set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
-	    return
-	}
+        set do [lindex $todo $i]
+        if {![commitinview $do $v] || [rowofcommit $do] > $la} {
+            lappend leftover $do
+            continue
+        }
+        foreach np $parents($v,$do) {
+            if {![info exists ancestor($np)]} {
+                set ancestor($np) 1
+                lappend todo $np
+                if {$np eq $a} {
+                    set done 1
+                }
+            }
+        }
+        if {$done} {
+            set anc_todo [concat $leftover [lrange $todo [expr {$i+1}] end]]
+            return
+        }
     }
     set ancestor($a) 0
     set anc_todo $leftover
@@ -5045,26 +5063,26 @@ proc askrelhighlight {row id} {
     if {$selectedline eq {}} return
     set isbold 0
     if {$highlight_related eq [mc "Descendant"] ||
-	$highlight_related eq [mc "Not descendant"]} {
-	if {![info exists descendent($id)]} {
-	    is_descendent $id
-	}
-	if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
-	    set isbold 1
-	}
+        $highlight_related eq [mc "Not descendant"]} {
+        if {![info exists descendent($id)]} {
+            is_descendent $id
+        }
+        if {$descendent($id) == ($highlight_related eq [mc "Descendant"])} {
+            set isbold 1
+        }
     } elseif {$highlight_related eq [mc "Ancestor"] ||
-	      $highlight_related eq [mc "Not ancestor"]} {
-	if {![info exists ancestor($id)]} {
-	    is_ancestor $id
-	}
-	if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
-	    set isbold 1
-	}
+              $highlight_related eq [mc "Not ancestor"]} {
+        if {![info exists ancestor($id)]} {
+            is_ancestor $id
+        }
+        if {$ancestor($id) == ($highlight_related eq [mc "Ancestor"])} {
+            set isbold 1
+        }
     }
     if {[info exists iddrawn($id)]} {
-	if {$isbold && ![ishighlighted $id]} {
-	    bolden $id mainfontbold
-	}
+        if {$isbold && ![ishighlighted $id]} {
+            bolden $id mainfontbold
+        }
     }
     set rhighlights($id) $isbold
 }
@@ -5074,13 +5092,13 @@ proc askrelhighlight {row id} {
 proc shortids {ids} {
     set res {}
     foreach id $ids {
-	if {[llength $id] > 1} {
-	    lappend res [shortids $id]
-	} elseif {[regexp {^[0-9a-f]{40}$} $id]} {
-	    lappend res [string range $id 0 7]
-	} else {
-	    lappend res $id
-	}
+        if {[llength $id] > 1} {
+            lappend res [shortids $id]
+        } elseif {[regexp {^[0-9a-f]{40}$} $id]} {
+            lappend res [string range $id 0 7]
+        } else {
+            lappend res $id
+        }
     }
     return $res
 }
@@ -5089,10 +5107,10 @@ proc ntimes {n o} {
     set ret {}
     set o [list $o]
     for {set mask 1} {$mask <= $n} {incr mask $mask} {
-	if {($n & $mask) != 0} {
-	    set ret [concat $ret $o]
-	}
-	set o [concat $o $o]
+        if {($n & $mask) != 0} {
+            set ret [concat $ret $o]
+        }
+        set o [concat $o $o]
     }
     return $ret
 }
@@ -5102,41 +5120,41 @@ proc ordertoken {id} {
     global nullid nullid2
 
     if {[info exists ordertok($id)]} {
-	return $ordertok($id)
+        return $ordertok($id)
     }
     set origid $id
     set todo {}
     while {1} {
-	if {[info exists varcid($curview,$id)]} {
-	    set a $varcid($curview,$id)
-	    set p [lindex $varcstart($curview) $a]
-	} else {
-	    set p [lindex $children($curview,$id) 0]
-	}
-	if {[info exists ordertok($p)]} {
-	    set tok $ordertok($p)
-	    break
-	}
-	set id [first_real_child $curview,$p]
-	if {$id eq {}} {
-	    # it's a root
-	    set tok [lindex $varctok($curview) $varcid($curview,$p)]
-	    break
-	}
-	if {[llength $parents($curview,$id)] == 1} {
-	    lappend todo [list $p {}]
-	} else {
-	    set j [lsearch -exact $parents($curview,$id) $p]
-	    if {$j < 0} {
-		puts "oops didn't find [shortids $p] in parents of [shortids $id]"
-	    }
-	    lappend todo [list $p [strrep $j]]
-	}
+        if {[info exists varcid($curview,$id)]} {
+            set a $varcid($curview,$id)
+            set p [lindex $varcstart($curview) $a]
+        } else {
+            set p [lindex $children($curview,$id) 0]
+        }
+        if {[info exists ordertok($p)]} {
+            set tok $ordertok($p)
+            break
+        }
+        set id [first_real_child $curview,$p]
+        if {$id eq {}} {
+            # it's a root
+            set tok [lindex $varctok($curview) $varcid($curview,$p)]
+            break
+        }
+        if {[llength $parents($curview,$id)] == 1} {
+            lappend todo [list $p {}]
+        } else {
+            set j [lsearch -exact $parents($curview,$id) $p]
+            if {$j < 0} {
+                puts "oops didn't find [shortids $p] in parents of [shortids $id]"
+            }
+            lappend todo [list $p [strrep $j]]
+        }
     }
     for {set i [llength $todo]} {[incr i -1] >= 0} {} {
-	set p [lindex $todo $i 0]
-	append tok [lindex $todo $i 1]
-	set ordertok($p) $tok
+        set p [lindex $todo $i 0]
+        append tok [lindex $todo $i 1]
+        set ordertok($p) $tok
     }
     set ordertok($origid) $tok
     return $tok
@@ -5147,19 +5165,19 @@ proc ordertoken {id} {
 proc idcol {idlist id {i 0}} {
     set t [ordertoken $id]
     if {$i < 0} {
-	set i 0
+        set i 0
     }
     if {$i >= [llength $idlist] || $t < [ordertoken [lindex $idlist $i]]} {
-	if {$i > [llength $idlist]} {
-	    set i [llength $idlist]
-	}
-	while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
-	incr i
+        if {$i > [llength $idlist]} {
+            set i [llength $idlist]
+        }
+        while {[incr i -1] >= 0 && $t < [ordertoken [lindex $idlist $i]]} {}
+        incr i
     } else {
-	if {$t > [ordertoken [lindex $idlist $i]]} {
-	    while {[incr i] < [llength $idlist] &&
-		   $t >= [ordertoken [lindex $idlist $i]]} {}
-	}
+        if {$t > [ordertoken [lindex $idlist $i]]} {
+            while {[incr i] < [llength $idlist] &&
+                   $t >= [ordertoken [lindex $idlist $i]]} {}
+        }
     }
     return $i
 }
@@ -5204,12 +5222,12 @@ proc visiblerows {} {
     set y0 [expr {int([lindex $f 0] * $ymax)}]
     set r0 [expr {int(($y0 - 3) / $linespc) - 1}]
     if {$r0 < 0} {
-	set r0 0
+        set r0 0
     }
     set y1 [expr {int([lindex $f 1] * $ymax)}]
     set r1 [expr {int(($y1 - 3) / $linespc) + 1}]
     if {$r1 >= $numcommits} {
-	set r1 [expr {$numcommits - 1}]
+        set r1 [expr {$numcommits - 1}]
     }
     return [list $r0 $r1]
 }
@@ -5220,13 +5238,13 @@ proc layoutmore {} {
     global lastscrollset lastscrollrows
 
     if {$lastscrollrows < 100 || $viewcomplete($curview) ||
-	[clock clicks -milliseconds] - $lastscrollset > 500} {
-	setcanvscroll
+        [clock clicks -milliseconds] - $lastscrollset > 500} {
+        setcanvscroll
     }
     if {[info exists pending_select] &&
-	[commitinview $pending_select $curview]} {
-	update
-	selectline [rowofcommit $pending_select] 1
+        [commitinview $pending_select $curview]} {
+        update
+        selectline [rowofcommit $pending_select] 1
     }
     drawvisible
 }
@@ -5238,13 +5256,13 @@ proc get_viewmainhead {view} {
     global viewmainheadid vfilelimit viewinstances mainheadid
 
     catch {
-	set rfd [open [concat | git rev-list -1 $mainheadid \
-			   -- $vfilelimit($view)] r]
-	set j [reg_instance $rfd]
-	lappend viewinstances($view) $j
-	fconfigure $rfd -blocking 0
-	filerun $rfd [list getviewhead $rfd $j $view]
-	set viewmainheadid($curview) {}
+        set rfd [open [concat | git rev-list -1 $mainheadid \
+                           -- $vfilelimit($view)] r]
+        set j [reg_instance $rfd]
+        lappend viewinstances($view) $j
+        fconfigure $rfd -blocking 0
+        filerun $rfd [list getviewhead $rfd $j $view]
+        set viewmainheadid($curview) {}
     }
 }
 
@@ -5254,21 +5272,21 @@ proc getviewhead {fd inst view} {
 
     set id {}
     if {[gets $fd line] < 0} {
-	if {![eof $fd]} {
-	    return 1
-	}
+        if {![eof $fd]} {
+            return 1
+        }
     } elseif {[string length $line] == 40 && [string is xdigit $line]} {
-	set id $line
+        set id $line
     }
     set viewmainheadid($view) $id
     close $fd
     unset commfd($inst)
     set i [lsearch -exact $viewinstances($view) $inst]
     if {$i >= 0} {
-	set viewinstances($view) [lreplace $viewinstances($view) $i $i]
+        set viewinstances($view) [lreplace $viewinstances($view) $i $i]
     }
     if {$showlocalchanges && $id ne {} && $view == $curview} {
-	doshowlocalchanges
+        doshowlocalchanges
     }
     return 0
 }
@@ -5278,9 +5296,9 @@ proc doshowlocalchanges {} {
 
     if {$viewmainheadid($curview) eq {}} return
     if {[commitinview $viewmainheadid($curview) $curview]} {
-	dodiffindex
+        dodiffindex
     } else {
-	interestedin $viewmainheadid($curview) dodiffindex
+        interestedin $viewmainheadid($curview) dodiffindex
     }
 }
 
@@ -5288,10 +5306,10 @@ proc dohidelocalchanges {} {
     global nullid nullid2 lserial curview
 
     if {[commitinview $nullid $curview]} {
-	removefakerow $nullid
+        removefakerow $nullid
     }
     if {[commitinview $nullid2 $curview]} {
-	removefakerow $nullid2
+        removefakerow $nullid2
     }
     incr lserial
 }
@@ -5304,12 +5322,12 @@ proc dodiffindex {} {
     if {!$showlocalchanges || !$hasworktree} return
     incr lserial
     if {[package vcompare $git_version "1.7.2"] >= 0} {
-	set cmd "|git diff-index --cached --ignore-submodules=dirty HEAD"
+        set cmd "|git diff-index --cached --ignore-submodules=dirty HEAD"
     } else {
-	set cmd "|git diff-index --cached HEAD"
+        set cmd "|git diff-index --cached HEAD"
     }
     if {$vfilelimit($curview) ne {}} {
-	set cmd [concat $cmd -- $vfilelimit($curview)]
+        set cmd [concat $cmd -- $vfilelimit($curview)]
     }
     set fd [open $cmd r]
     fconfigure $fd -blocking 0
@@ -5323,22 +5341,22 @@ proc readdiffindex {fd serial inst} {
 
     set isdiff 1
     if {[gets $fd line] < 0} {
-	if {![eof $fd]} {
-	    return 1
-	}
-	set isdiff 0
+        if {![eof $fd]} {
+            return 1
+        }
+        set isdiff 0
     }
     # we only need to see one line and we don't really care what it says...
     stop_instance $inst
 
     if {$serial != $lserial} {
-	return 0
+        return 0
     }
 
     # now see if there are any local changes not checked in to the index
     set cmd "|git diff-files"
     if {$vfilelimit($curview) ne {}} {
-	set cmd [concat $cmd -- $vfilelimit($curview)]
+        set cmd [concat $cmd -- $vfilelimit($curview)]
     }
     set fd [open $cmd r]
     fconfigure $fd -blocking 0
@@ -5346,19 +5364,19 @@ proc readdiffindex {fd serial inst} {
     filerun $fd [list readdifffiles $fd $serial $i]
 
     if {$isdiff && ![commitinview $nullid2 $curview]} {
-	# add the line for the changes in the index to the graph
-	set hl [mc "Local changes checked in to index but not committed"]
-	set commitinfo($nullid2) [list  $hl {} {} {} {} "    $hl\n"]
-	set commitdata($nullid2) "\n    $hl\n"
-	if {[commitinview $nullid $curview]} {
-	    removefakerow $nullid
-	}
-	insertfakerow $nullid2 $viewmainheadid($curview)
+        # add the line for the changes in the index to the graph
+        set hl [mc "Local changes checked in to index but not committed"]
+        set commitinfo($nullid2) [list  $hl {} {} {} {} "    $hl\n"]
+        set commitdata($nullid2) "\n    $hl\n"
+        if {[commitinview $nullid $curview]} {
+            removefakerow $nullid
+        }
+        insertfakerow $nullid2 $viewmainheadid($curview)
     } elseif {!$isdiff && [commitinview $nullid2 $curview]} {
-	if {[commitinview $nullid $curview]} {
-	    removefakerow $nullid
-	}
-	removefakerow $nullid2
+        if {[commitinview $nullid $curview]} {
+            removefakerow $nullid
+        }
+        removefakerow $nullid2
     }
     return 0
 }
@@ -5369,31 +5387,31 @@ proc readdifffiles {fd serial inst} {
 
     set isdiff 1
     if {[gets $fd line] < 0} {
-	if {![eof $fd]} {
-	    return 1
-	}
-	set isdiff 0
+        if {![eof $fd]} {
+            return 1
+        }
+        set isdiff 0
     }
     # we only need to see one line and we don't really care what it says...
     stop_instance $inst
 
     if {$serial != $lserial} {
-	return 0
+        return 0
     }
 
     if {$isdiff && ![commitinview $nullid $curview]} {
-	# add the line for the local diff to the graph
-	set hl [mc "Local uncommitted changes, not checked in to index"]
-	set commitinfo($nullid) [list  $hl {} {} {} {} "    $hl\n"]
-	set commitdata($nullid) "\n    $hl\n"
-	if {[commitinview $nullid2 $curview]} {
-	    set p $nullid2
-	} else {
-	    set p $viewmainheadid($curview)
-	}
-	insertfakerow $nullid $p
+        # add the line for the local diff to the graph
+        set hl [mc "Local uncommitted changes, not checked in to index"]
+        set commitinfo($nullid) [list  $hl {} {} {} {} "    $hl\n"]
+        set commitdata($nullid) "\n    $hl\n"
+        if {[commitinview $nullid2 $curview]} {
+            set p $nullid2
+        } else {
+            set p $viewmainheadid($curview)
+        }
+        insertfakerow $nullid $p
     } elseif {!$isdiff && [commitinview $nullid $curview]} {
-	removefakerow $nullid
+        removefakerow $nullid
     }
     return 0
 }
@@ -5402,17 +5420,17 @@ proc nextuse {id row} {
     global curview children
 
     if {[info exists children($curview,$id)]} {
-	foreach kid $children($curview,$id) {
-	    if {![commitinview $kid $curview]} {
-		return -1
-	    }
-	    if {[rowofcommit $kid] > $row} {
-		return [rowofcommit $kid]
-	    }
-	}
+        foreach kid $children($curview,$id) {
+            if {![commitinview $kid $curview]} {
+                return -1
+            }
+            if {[rowofcommit $kid] > $row} {
+                return [rowofcommit $kid]
+            }
+        }
     }
     if {[commitinview $id $curview]} {
-	return [rowofcommit $id]
+        return [rowofcommit $id]
     }
     return -1
 }
@@ -5422,12 +5440,12 @@ proc prevuse {id row} {
 
     set ret -1
     if {[info exists children($curview,$id)]} {
-	foreach kid $children($curview,$id) {
-	    if {![commitinview $kid $curview]} break
-	    if {[rowofcommit $kid] < $row} {
-		set ret [rowofcommit $kid]
-	    }
-	}
+        foreach kid $children($curview,$id) {
+            if {![commitinview $kid $curview]} break
+            if {[rowofcommit $kid] < $row} {
+                set ret [rowofcommit $kid]
+            }
+        }
     }
     return $ret
 }
@@ -5438,70 +5456,70 @@ proc make_idlist {row} {
 
     set r [expr {$row - $mingaplen - $downarrowlen - 1}]
     if {$r < 0} {
-	set r 0
+        set r 0
     }
     set ra [expr {$row - $downarrowlen}]
     if {$ra < 0} {
-	set ra 0
+        set ra 0
     }
     set rb [expr {$row + $uparrowlen}]
     if {$rb > $commitidx($curview)} {
-	set rb $commitidx($curview)
+        set rb $commitidx($curview)
     }
     make_disporder $r [expr {$rb + 1}]
     set ids {}
     for {} {$r < $ra} {incr r} {
-	set nextid [lindex $displayorder [expr {$r + 1}]]
-	foreach p [lindex $parentlist $r] {
-	    if {$p eq $nextid} continue
-	    set rn [nextuse $p $r]
-	    if {$rn >= $row &&
-		$rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} {
-		lappend ids [list [ordertoken $p] $p]
-	    }
-	}
+        set nextid [lindex $displayorder [expr {$r + 1}]]
+        foreach p [lindex $parentlist $r] {
+            if {$p eq $nextid} continue
+            set rn [nextuse $p $r]
+            if {$rn >= $row &&
+                $rn <= $r + $downarrowlen + $mingaplen + $uparrowlen} {
+                lappend ids [list [ordertoken $p] $p]
+            }
+        }
     }
     for {} {$r < $row} {incr r} {
-	set nextid [lindex $displayorder [expr {$r + 1}]]
-	foreach p [lindex $parentlist $r] {
-	    if {$p eq $nextid} continue
-	    set rn [nextuse $p $r]
-	    if {$rn < 0 || $rn >= $row} {
-		lappend ids [list [ordertoken $p] $p]
-	    }
-	}
+        set nextid [lindex $displayorder [expr {$r + 1}]]
+        foreach p [lindex $parentlist $r] {
+            if {$p eq $nextid} continue
+            set rn [nextuse $p $r]
+            if {$rn < 0 || $rn >= $row} {
+                lappend ids [list [ordertoken $p] $p]
+            }
+        }
     }
     set id [lindex $displayorder $row]
     lappend ids [list [ordertoken $id] $id]
     while {$r < $rb} {
-	foreach p [lindex $parentlist $r] {
-	    set firstkid [lindex $children($curview,$p) 0]
-	    if {[rowofcommit $firstkid] < $row} {
-		lappend ids [list [ordertoken $p] $p]
-	    }
-	}
-	incr r
-	set id [lindex $displayorder $r]
-	if {$id ne {}} {
-	    set firstkid [lindex $children($curview,$id) 0]
-	    if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
-		lappend ids [list [ordertoken $id] $id]
-	    }
-	}
+        foreach p [lindex $parentlist $r] {
+            set firstkid [lindex $children($curview,$p) 0]
+            if {[rowofcommit $firstkid] < $row} {
+                lappend ids [list [ordertoken $p] $p]
+            }
+        }
+        incr r
+        set id [lindex $displayorder $r]
+        if {$id ne {}} {
+            set firstkid [lindex $children($curview,$id) 0]
+            if {$firstkid ne {} && [rowofcommit $firstkid] < $row} {
+                lappend ids [list [ordertoken $id] $id]
+            }
+        }
     }
     set idlist {}
     foreach idx [lsort -unique $ids] {
-	lappend idlist [lindex $idx 1]
+        lappend idlist [lindex $idx 1]
     }
     return $idlist
 }
 
 proc rowsequal {a b} {
     while {[set i [lsearch -exact $a {}]] >= 0} {
-	set a [lreplace $a $i $i]
+        set a [lreplace $a $i $i]
     }
     while {[set i [lsearch -exact $b {}]] >= 0} {
-	set b [lreplace $b $i $i]
+        set b [lreplace $b $i $i]
     }
     return [expr {$a eq $b}]
 }
@@ -5510,20 +5528,20 @@ proc makeupline {id row rend col} {
     global rowidlist uparrowlen downarrowlen mingaplen
 
     for {set r $rend} {1} {set r $rstart} {
-	set rstart [prevuse $id $r]
-	if {$rstart < 0} return
-	if {$rstart < $row} break
+        set rstart [prevuse $id $r]
+        if {$rstart < 0} return
+        if {$rstart < $row} break
     }
     if {$rstart + $uparrowlen + $mingaplen + $downarrowlen < $rend} {
-	set rstart [expr {$rend - $uparrowlen - 1}]
+        set rstart [expr {$rend - $uparrowlen - 1}]
     }
     for {set r $rstart} {[incr r] <= $row} {} {
-	set idlist [lindex $rowidlist $r]
-	if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} {
-	    set col [idcol $idlist $id $col]
-	    lset rowidlist $r [linsert $idlist $col $id]
-	    changedrow $r
-	}
+        set idlist [lindex $rowidlist $r]
+        if {$idlist ne {} && [lsearch -exact $idlist $id] < 0} {
+            set col [idcol $idlist $id $col]
+            lset rowidlist $r [linsert $idlist $col $id]
+            changedrow $r
+        }
     }
 }
 
@@ -5536,100 +5554,100 @@ proc layoutrows {row endrow} {
     make_disporder [expr {$row - 1}] [expr {$endrow + $uparrowlen}]
     set idlist {}
     if {$row > 0} {
-	set rm1 [expr {$row - 1}]
-	foreach id [lindex $rowidlist $rm1] {
-	    if {$id ne {}} {
-		lappend idlist $id
-	    }
-	}
-	set final [lindex $rowfinal $rm1]
+        set rm1 [expr {$row - 1}]
+        foreach id [lindex $rowidlist $rm1] {
+            if {$id ne {}} {
+                lappend idlist $id
+            }
+        }
+        set final [lindex $rowfinal $rm1]
     }
     for {} {$row < $endrow} {incr row} {
-	set rm1 [expr {$row - 1}]
-	if {$rm1 < 0 || $idlist eq {}} {
-	    set idlist [make_idlist $row]
-	    set final 1
-	} else {
-	    set id [lindex $displayorder $rm1]
-	    set col [lsearch -exact $idlist $id]
-	    set idlist [lreplace $idlist $col $col]
-	    foreach p [lindex $parentlist $rm1] {
-		if {[lsearch -exact $idlist $p] < 0} {
-		    set col [idcol $idlist $p $col]
-		    set idlist [linsert $idlist $col $p]
-		    # if not the first child, we have to insert a line going up
-		    if {$id ne [lindex $children($curview,$p) 0]} {
-			makeupline $p $rm1 $row $col
-		    }
-		}
-	    }
-	    set id [lindex $displayorder $row]
-	    if {$row > $downarrowlen} {
-		set termrow [expr {$row - $downarrowlen - 1}]
-		foreach p [lindex $parentlist $termrow] {
-		    set i [lsearch -exact $idlist $p]
-		    if {$i < 0} continue
-		    set nr [nextuse $p $termrow]
-		    if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} {
-			set idlist [lreplace $idlist $i $i]
-		    }
-		}
-	    }
-	    set col [lsearch -exact $idlist $id]
-	    if {$col < 0} {
-		set col [idcol $idlist $id]
-		set idlist [linsert $idlist $col $id]
-		if {$children($curview,$id) ne {}} {
-		    makeupline $id $rm1 $row $col
-		}
-	    }
-	    set r [expr {$row + $uparrowlen - 1}]
-	    if {$r < $commitidx($curview)} {
-		set x $col
-		foreach p [lindex $parentlist $r] {
-		    if {[lsearch -exact $idlist $p] >= 0} continue
-		    set fk [lindex $children($curview,$p) 0]
-		    if {[rowofcommit $fk] < $row} {
-			set x [idcol $idlist $p $x]
-			set idlist [linsert $idlist $x $p]
-		    }
-		}
-		if {[incr r] < $commitidx($curview)} {
-		    set p [lindex $displayorder $r]
-		    if {[lsearch -exact $idlist $p] < 0} {
-			set fk [lindex $children($curview,$p) 0]
-			if {$fk ne {} && [rowofcommit $fk] < $row} {
-			    set x [idcol $idlist $p $x]
-			    set idlist [linsert $idlist $x $p]
-			}
-		    }
-		}
-	    }
-	}
-	if {$final && !$viewcomplete($curview) &&
-	    $row + $uparrowlen + $mingaplen + $downarrowlen
-		>= $commitidx($curview)} {
-	    set final 0
-	}
-	set l [llength $rowidlist]
-	if {$row == $l} {
-	    lappend rowidlist $idlist
-	    lappend rowisopt 0
-	    lappend rowfinal $final
-	} elseif {$row < $l} {
-	    if {![rowsequal $idlist [lindex $rowidlist $row]]} {
-		lset rowidlist $row $idlist
-		changedrow $row
-	    }
-	    lset rowfinal $row $final
-	} else {
-	    set pad [ntimes [expr {$row - $l}] {}]
-	    set rowidlist [concat $rowidlist $pad]
-	    lappend rowidlist $idlist
-	    set rowfinal [concat $rowfinal $pad]
-	    lappend rowfinal $final
-	    set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
-	}
+        set rm1 [expr {$row - 1}]
+        if {$rm1 < 0 || $idlist eq {}} {
+            set idlist [make_idlist $row]
+            set final 1
+        } else {
+            set id [lindex $displayorder $rm1]
+            set col [lsearch -exact $idlist $id]
+            set idlist [lreplace $idlist $col $col]
+            foreach p [lindex $parentlist $rm1] {
+                if {[lsearch -exact $idlist $p] < 0} {
+                    set col [idcol $idlist $p $col]
+                    set idlist [linsert $idlist $col $p]
+                    # if not the first child, we have to insert a line going up
+                    if {$id ne [lindex $children($curview,$p) 0]} {
+                        makeupline $p $rm1 $row $col
+                    }
+                }
+            }
+            set id [lindex $displayorder $row]
+            if {$row > $downarrowlen} {
+                set termrow [expr {$row - $downarrowlen - 1}]
+                foreach p [lindex $parentlist $termrow] {
+                    set i [lsearch -exact $idlist $p]
+                    if {$i < 0} continue
+                    set nr [nextuse $p $termrow]
+                    if {$nr < 0 || $nr >= $row + $mingaplen + $uparrowlen} {
+                        set idlist [lreplace $idlist $i $i]
+                    }
+                }
+            }
+            set col [lsearch -exact $idlist $id]
+            if {$col < 0} {
+                set col [idcol $idlist $id]
+                set idlist [linsert $idlist $col $id]
+                if {$children($curview,$id) ne {}} {
+                    makeupline $id $rm1 $row $col
+                }
+            }
+            set r [expr {$row + $uparrowlen - 1}]
+            if {$r < $commitidx($curview)} {
+                set x $col
+                foreach p [lindex $parentlist $r] {
+                    if {[lsearch -exact $idlist $p] >= 0} continue
+                    set fk [lindex $children($curview,$p) 0]
+                    if {[rowofcommit $fk] < $row} {
+                        set x [idcol $idlist $p $x]
+                        set idlist [linsert $idlist $x $p]
+                    }
+                }
+                if {[incr r] < $commitidx($curview)} {
+                    set p [lindex $displayorder $r]
+                    if {[lsearch -exact $idlist $p] < 0} {
+                        set fk [lindex $children($curview,$p) 0]
+                        if {$fk ne {} && [rowofcommit $fk] < $row} {
+                            set x [idcol $idlist $p $x]
+                            set idlist [linsert $idlist $x $p]
+                        }
+                    }
+                }
+            }
+        }
+        if {$final && !$viewcomplete($curview) &&
+            $row + $uparrowlen + $mingaplen + $downarrowlen
+                >= $commitidx($curview)} {
+            set final 0
+        }
+        set l [llength $rowidlist]
+        if {$row == $l} {
+            lappend rowidlist $idlist
+            lappend rowisopt 0
+            lappend rowfinal $final
+        } elseif {$row < $l} {
+            if {![rowsequal $idlist [lindex $rowidlist $row]]} {
+                lset rowidlist $row $idlist
+                changedrow $row
+            }
+            lset rowfinal $row $final
+        } else {
+            set pad [ntimes [expr {$row - $l}] {}]
+            set rowidlist [concat $rowidlist $pad]
+            lappend rowidlist $idlist
+            set rowfinal [concat $rowfinal $pad]
+            lappend rowfinal $final
+            set rowisopt [concat $rowisopt [ntimes [expr {$row - $l + 1}] 0]]
+        }
     }
     return $row
 }
@@ -5639,17 +5657,17 @@ proc changedrow {row} {
 
     set l [llength $rowisopt]
     if {$row < $l} {
-	lset rowisopt $row 0
-	if {$row + 1 < $l} {
-	    lset rowisopt [expr {$row + 1}] 0
-	    if {$row + 2 < $l} {
-		lset rowisopt [expr {$row + 2}] 0
-	    }
-	}
+        lset rowisopt $row 0
+        if {$row + 1 < $l} {
+            lset rowisopt [expr {$row + 1}] 0
+            if {$row + 2 < $l} {
+                lset rowisopt [expr {$row + 2}] 0
+            }
+        }
     }
     set id [lindex $displayorder $row]
     if {[info exists iddrawn($id)]} {
-	set need_redisplay 1
+        set need_redisplay 1
     }
 }
 
@@ -5662,7 +5680,7 @@ proc insert_pad {row col npad} {
     set aft [lrange $idlist $col end]
     set i [lsearch -exact $aft {}]
     if {$i > 0} {
-	set aft [lreplace $aft $i $i]
+        set aft [lreplace $aft $i $i]
     }
     lset rowidlist $row [concat $bef $pad $aft]
     changedrow $row
@@ -5672,123 +5690,123 @@ proc optimize_rows {row col endrow} {
     global rowidlist rowisopt displayorder curview children
 
     if {$row < 1} {
-	set row 1
+        set row 1
     }
     for {} {$row < $endrow} {incr row; set col 0} {
-	if {[lindex $rowisopt $row]} continue
-	set haspad 0
-	set y0 [expr {$row - 1}]
-	set ym [expr {$row - 2}]
-	set idlist [lindex $rowidlist $row]
-	set previdlist [lindex $rowidlist $y0]
-	if {$idlist eq {} || $previdlist eq {}} continue
-	if {$ym >= 0} {
-	    set pprevidlist [lindex $rowidlist $ym]
-	    if {$pprevidlist eq {}} continue
-	} else {
-	    set pprevidlist {}
-	}
-	set x0 -1
-	set xm -1
-	for {} {$col < [llength $idlist]} {incr col} {
-	    set id [lindex $idlist $col]
-	    if {[lindex $previdlist $col] eq $id} continue
-	    if {$id eq {}} {
-		set haspad 1
-		continue
-	    }
-	    set x0 [lsearch -exact $previdlist $id]
-	    if {$x0 < 0} continue
-	    set z [expr {$x0 - $col}]
-	    set isarrow 0
-	    set z0 {}
-	    if {$ym >= 0} {
-		set xm [lsearch -exact $pprevidlist $id]
-		if {$xm >= 0} {
-		    set z0 [expr {$xm - $x0}]
-		}
-	    }
-	    if {$z0 eq {}} {
-		# if row y0 is the first child of $id then it's not an arrow
-		if {[lindex $children($curview,$id) 0] ne
-		    [lindex $displayorder $y0]} {
-		    set isarrow 1
-		}
-	    }
-	    if {!$isarrow && $id ne [lindex $displayorder $row] &&
-		[lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
-		set isarrow 1
-	    }
-	    # Looking at lines from this row to the previous row,
-	    # make them go straight up if they end in an arrow on
-	    # the previous row; otherwise make them go straight up
-	    # or at 45 degrees.
-	    if {$z < -1 || ($z < 0 && $isarrow)} {
-		# Line currently goes left too much;
-		# insert pads in the previous row, then optimize it
-		set npad [expr {-1 - $z + $isarrow}]
-		insert_pad $y0 $x0 $npad
-		if {$y0 > 0} {
-		    optimize_rows $y0 $x0 $row
-		}
-		set previdlist [lindex $rowidlist $y0]
-		set x0 [lsearch -exact $previdlist $id]
-		set z [expr {$x0 - $col}]
-		if {$z0 ne {}} {
-		    set pprevidlist [lindex $rowidlist $ym]
-		    set xm [lsearch -exact $pprevidlist $id]
-		    set z0 [expr {$xm - $x0}]
-		}
-	    } elseif {$z > 1 || ($z > 0 && $isarrow)} {
-		# Line currently goes right too much;
-		# insert pads in this line
-		set npad [expr {$z - 1 + $isarrow}]
-		insert_pad $row $col $npad
-		set idlist [lindex $rowidlist $row]
-		incr col $npad
-		set z [expr {$x0 - $col}]
-		set haspad 1
-	    }
-	    if {$z0 eq {} && !$isarrow && $ym >= 0} {
-		# this line links to its first child on row $row-2
-		set id [lindex $displayorder $ym]
-		set xc [lsearch -exact $pprevidlist $id]
-		if {$xc >= 0} {
-		    set z0 [expr {$xc - $x0}]
-		}
-	    }
-	    # avoid lines jigging left then immediately right
-	    if {$z0 ne {} && $z < 0 && $z0 > 0} {
-		insert_pad $y0 $x0 1
-		incr x0
-		optimize_rows $y0 $x0 $row
-		set previdlist [lindex $rowidlist $y0]
-	    }
-	}
-	if {!$haspad} {
-	    # Find the first column that doesn't have a line going right
-	    for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
-		set id [lindex $idlist $col]
-		if {$id eq {}} break
-		set x0 [lsearch -exact $previdlist $id]
-		if {$x0 < 0} {
-		    # check if this is the link to the first child
-		    set kid [lindex $displayorder $y0]
-		    if {[lindex $children($curview,$id) 0] eq $kid} {
-			# it is, work out offset to child
-			set x0 [lsearch -exact $previdlist $kid]
-		    }
-		}
-		if {$x0 <= $col} break
-	    }
-	    # Insert a pad at that column as long as it has a line and
-	    # isn't the last column
-	    if {$x0 >= 0 && [incr col] < [llength $idlist]} {
-		set idlist [linsert $idlist $col {}]
-		lset rowidlist $row $idlist
-		changedrow $row
-	    }
-	}
+        if {[lindex $rowisopt $row]} continue
+        set haspad 0
+        set y0 [expr {$row - 1}]
+        set ym [expr {$row - 2}]
+        set idlist [lindex $rowidlist $row]
+        set previdlist [lindex $rowidlist $y0]
+        if {$idlist eq {} || $previdlist eq {}} continue
+        if {$ym >= 0} {
+            set pprevidlist [lindex $rowidlist $ym]
+            if {$pprevidlist eq {}} continue
+        } else {
+            set pprevidlist {}
+        }
+        set x0 -1
+        set xm -1
+        for {} {$col < [llength $idlist]} {incr col} {
+            set id [lindex $idlist $col]
+            if {[lindex $previdlist $col] eq $id} continue
+            if {$id eq {}} {
+                set haspad 1
+                continue
+            }
+            set x0 [lsearch -exact $previdlist $id]
+            if {$x0 < 0} continue
+            set z [expr {$x0 - $col}]
+            set isarrow 0
+            set z0 {}
+            if {$ym >= 0} {
+                set xm [lsearch -exact $pprevidlist $id]
+                if {$xm >= 0} {
+                    set z0 [expr {$xm - $x0}]
+                }
+            }
+            if {$z0 eq {}} {
+                # if row y0 is the first child of $id then it's not an arrow
+                if {[lindex $children($curview,$id) 0] ne
+                    [lindex $displayorder $y0]} {
+                    set isarrow 1
+                }
+            }
+            if {!$isarrow && $id ne [lindex $displayorder $row] &&
+                [lsearch -exact [lindex $rowidlist [expr {$row+1}]] $id] < 0} {
+                set isarrow 1
+            }
+            # Looking at lines from this row to the previous row,
+            # make them go straight up if they end in an arrow on
+            # the previous row; otherwise make them go straight up
+            # or at 45 degrees.
+            if {$z < -1 || ($z < 0 && $isarrow)} {
+                # Line currently goes left too much;
+                # insert pads in the previous row, then optimize it
+                set npad [expr {-1 - $z + $isarrow}]
+                insert_pad $y0 $x0 $npad
+                if {$y0 > 0} {
+                    optimize_rows $y0 $x0 $row
+                }
+                set previdlist [lindex $rowidlist $y0]
+                set x0 [lsearch -exact $previdlist $id]
+                set z [expr {$x0 - $col}]
+                if {$z0 ne {}} {
+                    set pprevidlist [lindex $rowidlist $ym]
+                    set xm [lsearch -exact $pprevidlist $id]
+                    set z0 [expr {$xm - $x0}]
+                }
+            } elseif {$z > 1 || ($z > 0 && $isarrow)} {
+                # Line currently goes right too much;
+                # insert pads in this line
+                set npad [expr {$z - 1 + $isarrow}]
+                insert_pad $row $col $npad
+                set idlist [lindex $rowidlist $row]
+                incr col $npad
+                set z [expr {$x0 - $col}]
+                set haspad 1
+            }
+            if {$z0 eq {} && !$isarrow && $ym >= 0} {
+                # this line links to its first child on row $row-2
+                set id [lindex $displayorder $ym]
+                set xc [lsearch -exact $pprevidlist $id]
+                if {$xc >= 0} {
+                    set z0 [expr {$xc - $x0}]
+                }
+            }
+            # avoid lines jigging left then immediately right
+            if {$z0 ne {} && $z < 0 && $z0 > 0} {
+                insert_pad $y0 $x0 1
+                incr x0
+                optimize_rows $y0 $x0 $row
+                set previdlist [lindex $rowidlist $y0]
+            }
+        }
+        if {!$haspad} {
+            # Find the first column that doesn't have a line going right
+            for {set col [llength $idlist]} {[incr col -1] >= 0} {} {
+                set id [lindex $idlist $col]
+                if {$id eq {}} break
+                set x0 [lsearch -exact $previdlist $id]
+                if {$x0 < 0} {
+                    # check if this is the link to the first child
+                    set kid [lindex $displayorder $y0]
+                    if {[lindex $children($curview,$id) 0] eq $kid} {
+                        # it is, work out offset to child
+                        set x0 [lsearch -exact $previdlist $kid]
+                    }
+                }
+                if {$x0 <= $col} break
+            }
+            # Insert a pad at that column as long as it has a line and
+            # isn't the last column
+            if {$x0 >= 0 && [incr col] < [llength $idlist]} {
+                set idlist [linsert $idlist $col {}]
+                lset rowidlist $row $idlist
+                changedrow $row
+            }
+        }
     }
 }
 
@@ -5807,7 +5825,7 @@ proc linewidth {id} {
 
     set wid $lthickness
     if {[info exists thickerline] && $id eq $thickerline} {
-	set wid [expr {2 * $lthickness}]
+        set wid [expr {2 * $lthickness}]
     }
     return $wid
 }
@@ -5818,52 +5836,52 @@ proc rowranges {id} {
 
     set kids $children($curview,$id)
     if {$kids eq {}} {
-	return {}
+        return {}
     }
     set ret {}
     lappend kids $id
     foreach child $kids {
-	if {![commitinview $child $curview]} break
-	set row [rowofcommit $child]
-	if {![info exists prev]} {
-	    lappend ret [expr {$row + 1}]
-	} else {
-	    if {$row <= $prevrow} {
-		puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
-	    }
-	    # see if the line extends the whole way from prevrow to row
-	    if {$row > $prevrow + $uparrowlen + $downarrowlen &&
-		[lsearch -exact [lindex $rowidlist \
-			    [expr {int(($row + $prevrow) / 2)}]] $id] < 0} {
-		# it doesn't, see where it ends
-		set r [expr {$prevrow + $downarrowlen}]
-		if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
-		    while {[incr r -1] > $prevrow &&
-			   [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
-		} else {
-		    while {[incr r] <= $row &&
-			   [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
-		    incr r -1
-		}
-		lappend ret $r
-		# see where it starts up again
-		set r [expr {$row - $uparrowlen}]
-		if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
-		    while {[incr r] < $row &&
-			   [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
-		} else {
-		    while {[incr r -1] >= $prevrow &&
-			   [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
-		    incr r
-		}
-		lappend ret $r
-	    }
-	}
-	if {$child eq $id} {
-	    lappend ret $row
-	}
-	set prev $child
-	set prevrow $row
+        if {![commitinview $child $curview]} break
+        set row [rowofcommit $child]
+        if {![info exists prev]} {
+            lappend ret [expr {$row + 1}]
+        } else {
+            if {$row <= $prevrow} {
+                puts "oops children of [shortids $id] out of order [shortids $child] $row <= [shortids $prev] $prevrow"
+            }
+            # see if the line extends the whole way from prevrow to row
+            if {$row > $prevrow + $uparrowlen + $downarrowlen &&
+                [lsearch -exact [lindex $rowidlist \
+                            [expr {int(($row + $prevrow) / 2)}]] $id] < 0} {
+                # it doesn't, see where it ends
+                set r [expr {$prevrow + $downarrowlen}]
+                if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
+                    while {[incr r -1] > $prevrow &&
+                           [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
+                } else {
+                    while {[incr r] <= $row &&
+                           [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
+                    incr r -1
+                }
+                lappend ret $r
+                # see where it starts up again
+                set r [expr {$row - $uparrowlen}]
+                if {[lsearch -exact [lindex $rowidlist $r] $id] < 0} {
+                    while {[incr r] < $row &&
+                           [lsearch -exact [lindex $rowidlist $r] $id] < 0} {}
+                } else {
+                    while {[incr r -1] >= $prevrow &&
+                           [lsearch -exact [lindex $rowidlist $r] $id] >= 0} {}
+                    incr r
+                }
+                lappend ret $r
+            }
+        }
+        if {$child eq $id} {
+            lappend ret $row
+        }
+        set prev $child
+        set prevrow $row
     }
     return $ret
 }
@@ -5876,158 +5894,158 @@ proc drawlineseg {id row endrow arrowlow} {
     set le [expr {$row + 1}]
     set arrowhigh 1
     while {1} {
-	set c [lsearch -exact [lindex $rowidlist $le] $id]
-	if {$c < 0} {
-	    incr le -1
-	    break
-	}
-	lappend cols $c
-	set x [lindex $displayorder $le]
-	if {$x eq $id} {
-	    set arrowhigh 0
-	    break
-	}
-	if {[info exists iddrawn($x)] || $le == $endrow} {
-	    set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id]
-	    if {$c >= 0} {
-		lappend cols $c
-		set arrowhigh 0
-	    }
-	    break
-	}
-	incr le
+        set c [lsearch -exact [lindex $rowidlist $le] $id]
+        if {$c < 0} {
+            incr le -1
+            break
+        }
+        lappend cols $c
+        set x [lindex $displayorder $le]
+        if {$x eq $id} {
+            set arrowhigh 0
+            break
+        }
+        if {[info exists iddrawn($x)] || $le == $endrow} {
+            set c [lsearch -exact [lindex $rowidlist [expr {$le+1}]] $id]
+            if {$c >= 0} {
+                lappend cols $c
+                set arrowhigh 0
+            }
+            break
+        }
+        incr le
     }
     if {$le <= $row} {
-	return $row
+        return $row
     }
 
     set lines {}
     set i 0
     set joinhigh 0
     if {[info exists linesegs($id)]} {
-	set lines $linesegs($id)
-	foreach li $lines {
-	    set r0 [lindex $li 0]
-	    if {$r0 > $row} {
-		if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} {
-		    set joinhigh 1
-		}
-		break
-	    }
-	    incr i
-	}
+        set lines $linesegs($id)
+        foreach li $lines {
+            set r0 [lindex $li 0]
+            if {$r0 > $row} {
+                if {$r0 == $le && [lindex $li 1] - $row <= $maxlinelen} {
+                    set joinhigh 1
+                }
+                break
+            }
+            incr i
+        }
     }
     set joinlow 0
     if {$i > 0} {
-	set li [lindex $lines [expr {$i-1}]]
-	set r1 [lindex $li 1]
-	if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} {
-	    set joinlow 1
-	}
+        set li [lindex $lines [expr {$i-1}]]
+        set r1 [lindex $li 1]
+        if {$r1 == $row && $le - [lindex $li 0] <= $maxlinelen} {
+            set joinlow 1
+        }
     }
 
     set x [lindex $cols [expr {$le - $row}]]
     set xp [lindex $cols [expr {$le - 1 - $row}]]
     set dir [expr {$xp - $x}]
     if {$joinhigh} {
-	set ith [lindex $lines $i 2]
-	set coords [$canv coords $ith]
-	set ah [$canv itemcget $ith -arrow]
-	set arrowhigh [expr {$ah eq "first" || $ah eq "both"}]
-	set x2 [lindex $cols [expr {$le + 1 - $row}]]
-	if {$x2 ne {} && $x - $x2 == $dir} {
-	    set coords [lrange $coords 0 end-2]
-	}
+        set ith [lindex $lines $i 2]
+        set coords [$canv coords $ith]
+        set ah [$canv itemcget $ith -arrow]
+        set arrowhigh [expr {$ah eq "first" || $ah eq "both"}]
+        set x2 [lindex $cols [expr {$le + 1 - $row}]]
+        if {$x2 ne {} && $x - $x2 == $dir} {
+            set coords [lrange $coords 0 end-2]
+        }
     } else {
-	set coords [list [xc $le $x] [yc $le]]
+        set coords [list [xc $le $x] [yc $le]]
     }
     if {$joinlow} {
-	set itl [lindex $lines [expr {$i-1}] 2]
-	set al [$canv itemcget $itl -arrow]
-	set arrowlow [expr {$al eq "last" || $al eq "both"}]
+        set itl [lindex $lines [expr {$i-1}] 2]
+        set al [$canv itemcget $itl -arrow]
+        set arrowlow [expr {$al eq "last" || $al eq "both"}]
     } elseif {$arrowlow} {
-	if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
-	    [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
-	    set arrowlow 0
-	}
+        if {[lsearch -exact [lindex $rowidlist [expr {$row-1}]] $id] >= 0 ||
+            [lsearch -exact [lindex $parentlist [expr {$row-1}]] $id] >= 0} {
+            set arrowlow 0
+        }
     }
     set arrow [lindex {none first last both} [expr {$arrowhigh + 2*$arrowlow}]]
     for {set y $le} {[incr y -1] > $row} {} {
-	set x $xp
-	set xp [lindex $cols [expr {$y - 1 - $row}]]
-	set ndir [expr {$xp - $x}]
-	if {$dir != $ndir || $xp < 0} {
-	    lappend coords [xc $y $x] [yc $y]
-	}
-	set dir $ndir
+        set x $xp
+        set xp [lindex $cols [expr {$y - 1 - $row}]]
+        set ndir [expr {$xp - $x}]
+        if {$dir != $ndir || $xp < 0} {
+            lappend coords [xc $y $x] [yc $y]
+        }
+        set dir $ndir
     }
     if {!$joinlow} {
-	if {$xp < 0} {
-	    # join parent line to first child
-	    set ch [lindex $displayorder $row]
-	    set xc [lsearch -exact [lindex $rowidlist $row] $ch]
-	    if {$xc < 0} {
-		puts "oops: drawlineseg: child $ch not on row $row"
-	    } elseif {$xc != $x} {
-		if {($arrowhigh && $le == $row + 1) || $dir == 0} {
-		    set d [expr {int(0.5 * $linespc)}]
-		    set x1 [xc $row $x]
-		    if {$xc < $x} {
-			set x2 [expr {$x1 - $d}]
-		    } else {
-			set x2 [expr {$x1 + $d}]
-		    }
-		    set y2 [yc $row]
-		    set y1 [expr {$y2 + $d}]
-		    lappend coords $x1 $y1 $x2 $y2
-		} elseif {$xc < $x - 1} {
-		    lappend coords [xc $row [expr {$x-1}]] [yc $row]
-		} elseif {$xc > $x + 1} {
-		    lappend coords [xc $row [expr {$x+1}]] [yc $row]
-		}
-		set x $xc
-	    }
-	    lappend coords [xc $row $x] [yc $row]
-	} else {
-	    set xn [xc $row $xp]
-	    set yn [yc $row]
-	    lappend coords $xn $yn
-	}
-	if {!$joinhigh} {
-	    assigncolor $id
-	    set t [$canv create line $coords -width [linewidth $id] \
-		       -fill $colormap($id) -tags lines.$id -arrow $arrow]
-	    $canv lower $t
-	    bindline $t $id
-	    set lines [linsert $lines $i [list $row $le $t]]
-	} else {
-	    $canv coords $ith $coords
-	    if {$arrow ne $ah} {
-		$canv itemconf $ith -arrow $arrow
-	    }
-	    lset lines $i 0 $row
-	}
+        if {$xp < 0} {
+            # join parent line to first child
+            set ch [lindex $displayorder $row]
+            set xc [lsearch -exact [lindex $rowidlist $row] $ch]
+            if {$xc < 0} {
+                puts "oops: drawlineseg: child $ch not on row $row"
+            } elseif {$xc != $x} {
+                if {($arrowhigh && $le == $row + 1) || $dir == 0} {
+                    set d [expr {int(0.5 * $linespc)}]
+                    set x1 [xc $row $x]
+                    if {$xc < $x} {
+                        set x2 [expr {$x1 - $d}]
+                    } else {
+                        set x2 [expr {$x1 + $d}]
+                    }
+                    set y2 [yc $row]
+                    set y1 [expr {$y2 + $d}]
+                    lappend coords $x1 $y1 $x2 $y2
+                } elseif {$xc < $x - 1} {
+                    lappend coords [xc $row [expr {$x-1}]] [yc $row]
+                } elseif {$xc > $x + 1} {
+                    lappend coords [xc $row [expr {$x+1}]] [yc $row]
+                }
+                set x $xc
+            }
+            lappend coords [xc $row $x] [yc $row]
+        } else {
+            set xn [xc $row $xp]
+            set yn [yc $row]
+            lappend coords $xn $yn
+        }
+        if {!$joinhigh} {
+            assigncolor $id
+            set t [$canv create line $coords -width [linewidth $id] \
+                       -fill $colormap($id) -tags lines.$id -arrow $arrow]
+            $canv lower $t
+            bindline $t $id
+            set lines [linsert $lines $i [list $row $le $t]]
+        } else {
+            $canv coords $ith $coords
+            if {$arrow ne $ah} {
+                $canv itemconf $ith -arrow $arrow
+            }
+            lset lines $i 0 $row
+        }
     } else {
-	set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id]
-	set ndir [expr {$xo - $xp}]
-	set clow [$canv coords $itl]
-	if {$dir == $ndir} {
-	    set clow [lrange $clow 2 end]
-	}
-	set coords [concat $coords $clow]
-	if {!$joinhigh} {
-	    lset lines [expr {$i-1}] 1 $le
-	} else {
-	    # coalesce two pieces
-	    $canv delete $ith
-	    set b [lindex $lines [expr {$i-1}] 0]
-	    set e [lindex $lines $i 1]
-	    set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]]
-	}
-	$canv coords $itl $coords
-	if {$arrow ne $al} {
-	    $canv itemconf $itl -arrow $arrow
-	}
+        set xo [lsearch -exact [lindex $rowidlist [expr {$row - 1}]] $id]
+        set ndir [expr {$xo - $xp}]
+        set clow [$canv coords $itl]
+        if {$dir == $ndir} {
+            set clow [lrange $clow 2 end]
+        }
+        set coords [concat $coords $clow]
+        if {!$joinhigh} {
+            lset lines [expr {$i-1}] 1 $le
+        } else {
+            # coalesce two pieces
+            $canv delete $ith
+            set b [lindex $lines [expr {$i-1}] 0]
+            set e [lindex $lines $i 1]
+            set lines [lreplace $lines [expr {$i-1}] $i [list $b $e $itl]]
+        }
+        $canv coords $itl $coords
+        if {$arrow ne $al} {
+            $canv itemconf $itl -arrow $arrow
+        }
     }
 
     set linesegs($id) $lines
@@ -6052,54 +6070,54 @@ proc drawparentlinks {id row} {
     # rmx = right-most X coord used
     set rmx 0
     foreach p $olds {
-	set i [lsearch -exact $ids $p]
-	if {$i < 0} {
-	    puts "oops, parent $p of $id not in list"
-	    continue
-	}
-	set x2 [xc $row2 $i]
-	if {$x2 > $rmx} {
-	    set rmx $x2
-	}
-	set j [lsearch -exact $rowids $p]
-	if {$j < 0} {
-	    # drawlineseg will do this one for us
-	    continue
-	}
-	assigncolor $p
-	# should handle duplicated parents here...
-	set coords [list $x $y]
-	if {$i != $col} {
-	    # if attaching to a vertical segment, draw a smaller
-	    # slant for visual distinctness
-	    if {$i == $j} {
-		if {$i < $col} {
-		    lappend coords [expr {$x2 + $d}] $y $x2 $ymid
-		} else {
-		    lappend coords [expr {$x2 - $d}] $y $x2 $ymid
-		}
-	    } elseif {$i < $col && $i < $j} {
-		# segment slants towards us already
-		lappend coords [xc $row $j] $y
-	    } else {
-		if {$i < $col - 1} {
-		    lappend coords [expr {$x2 + $linespc}] $y
-		} elseif {$i > $col + 1} {
-		    lappend coords [expr {$x2 - $linespc}] $y
-		}
-		lappend coords $x2 $y2
-	    }
-	} else {
-	    lappend coords $x2 $y2
-	}
-	set t [$canv create line $coords -width [linewidth $p] \
-		   -fill $colormap($p) -tags lines.$p]
-	$canv lower $t
-	bindline $t $p
+        set i [lsearch -exact $ids $p]
+        if {$i < 0} {
+            puts "oops, parent $p of $id not in list"
+            continue
+        }
+        set x2 [xc $row2 $i]
+        if {$x2 > $rmx} {
+            set rmx $x2
+        }
+        set j [lsearch -exact $rowids $p]
+        if {$j < 0} {
+            # drawlineseg will do this one for us
+            continue
+        }
+        assigncolor $p
+        # should handle duplicated parents here...
+        set coords [list $x $y]
+        if {$i != $col} {
+            # if attaching to a vertical segment, draw a smaller
+            # slant for visual distinctness
+            if {$i == $j} {
+                if {$i < $col} {
+                    lappend coords [expr {$x2 + $d}] $y $x2 $ymid
+                } else {
+                    lappend coords [expr {$x2 - $d}] $y $x2 $ymid
+                }
+            } elseif {$i < $col && $i < $j} {
+                # segment slants towards us already
+                lappend coords [xc $row $j] $y
+            } else {
+                if {$i < $col - 1} {
+                    lappend coords [expr {$x2 + $linespc}] $y
+                } elseif {$i > $col + 1} {
+                    lappend coords [expr {$x2 - $linespc}] $y
+                }
+                lappend coords $x2 $y2
+            }
+        } else {
+            lappend coords $x2 $y2
+        }
+        set t [$canv create line $coords -width [linewidth $p] \
+                   -fill $colormap($p) -tags lines.$p]
+        $canv lower $t
+        bindline $t $p
     }
     if {$rmx > [lindex $idpos($id) 1]} {
-	lset idpos($id) 1 $rmx
-	redrawtags $id
+        lset idpos($id) 1 $rmx
+        redrawtags $id
     }
 }
 
@@ -6122,35 +6140,35 @@ proc drawcmittext {id row col} {
     # listed is 0 for boundary, 1 for normal, 2 for negative, 3 for left, 4 for right
     set listed $cmitlisted($curview,$id)
     if {$id eq $nullid} {
-	set ofill $workingfilescirclecolor
+        set ofill $workingfilescirclecolor
     } elseif {$id eq $nullid2} {
-	set ofill $indexcirclecolor
+        set ofill $indexcirclecolor
     } elseif {$id eq $mainheadid} {
-	set ofill $mainheadcirclecolor
+        set ofill $mainheadcirclecolor
     } else {
-	set ofill [lindex $circlecolors $listed]
+        set ofill [lindex $circlecolors $listed]
     }
     set x [xc $row $col]
     set y [yc $row]
     set orad [expr {$linespc / 3}]
     if {$listed <= 2} {
-	set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
-		   [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
-		   -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
+        set t [$canv create oval [expr {$x - $orad}] [expr {$y - $orad}] \
+                   [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
+                   -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
     } elseif {$listed == 3} {
-	# triangle pointing left for left-side commits
-	set t [$canv create polygon \
-		   [expr {$x - $orad}] $y \
-		   [expr {$x + $orad - 1}] [expr {$y - $orad}] \
-		   [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
-		   -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
+        # triangle pointing left for left-side commits
+        set t [$canv create polygon \
+                   [expr {$x - $orad}] $y \
+                   [expr {$x + $orad - 1}] [expr {$y - $orad}] \
+                   [expr {$x + $orad - 1}] [expr {$y + $orad - 1}] \
+                   -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
     } else {
-	# triangle pointing right for right-side commits
-	set t [$canv create polygon \
-		   [expr {$x + $orad - 1}] $y \
-		   [expr {$x - $orad}] [expr {$y - $orad}] \
-		   [expr {$x - $orad}] [expr {$y + $orad - 1}] \
-		   -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
+        # triangle pointing right for right-side commits
+        set t [$canv create polygon \
+                   [expr {$x + $orad - 1}] $y \
+                   [expr {$x - $orad}] [expr {$y - $orad}] \
+                   [expr {$x - $orad}] [expr {$y + $orad - 1}] \
+                   -fill $ofill -outline $circleoutlinecolor -width 1 -tags circle]
     }
     set circleitem($row) $t
     $canv raise $t
@@ -6158,23 +6176,23 @@ proc drawcmittext {id row col} {
     set rmx [llength [lindex $rowidlist $row]]
     set olds [lindex $parentlist $row]
     if {$olds ne {}} {
-	set nextids [lindex $rowidlist [expr {$row + 1}]]
-	foreach p $olds {
-	    set i [lsearch -exact $nextids $p]
-	    if {$i > $rmx} {
-		set rmx $i
-	    }
-	}
+        set nextids [lindex $rowidlist [expr {$row + 1}]]
+        foreach p $olds {
+            set i [lsearch -exact $nextids $p]
+            if {$i > $rmx} {
+                set rmx $i
+            }
+        }
     }
     set xt [xc $row $rmx]
     set rowtextx($row) $xt
     set idpos($id) [list $x $xt $y]
     if {[info exists idtags($id)] || [info exists idheads($id)]
-	|| [info exists idotherrefs($id)]} {
-	set xt [drawtags $id $x $xt $y]
+        || [info exists idotherrefs($id)]} {
+        set xt [drawtags $id $x $xt $y]
     }
     if {[lindex $commitinfo($id) 6] > 0} {
-	set xt [drawnotesign $xt $y]
+        set xt [drawnotesign $xt $y]
     }
     set headline [lindex $commitinfo($id) 0]
     set name [lindex $commitinfo($id) 1]
@@ -6184,30 +6202,30 @@ proc drawcmittext {id row col} {
     set nfont mainfont
     set isbold [ishighlighted $id]
     if {$isbold > 0} {
-	lappend boldids $id
-	set font mainfontbold
-	if {$isbold > 1} {
-	    lappend boldnameids $id
-	    set nfont mainfontbold
-	}
+        lappend boldids $id
+        set font mainfontbold
+        if {$isbold > 1} {
+            lappend boldnameids $id
+            set nfont mainfontbold
+        }
     }
     set linehtag($id) [$canv create text $xt $y -anchor w -fill $fgcolor \
-			   -text $headline -font $font -tags text]
+                           -text $headline -font $font -tags text]
     $canv bind $linehtag($id) $ctxbut "rowmenu %X %Y $id"
     set linentag($id) [$canv2 create text 3 $y -anchor w -fill $fgcolor \
-			   -text $name -font $nfont -tags text]
+                           -text $name -font $nfont -tags text]
     set linedtag($id) [$canv3 create text 3 $y -anchor w -fill $fgcolor \
-			   -text $date -font mainfont -tags text]
+                           -text $date -font mainfont -tags text]
     if {$selectedline == $row} {
-	make_secsel $id
+        make_secsel $id
     }
     if {[info exists markedid] && $markedid eq $id} {
-	make_idmark $id
+        make_idmark $id
     }
     set xr [expr {$xt + [font measure $font $headline]}]
     if {$xr > $canvxmax} {
-	set canvxmax $xr
-	setcanvscroll
+        set canvxmax $xr
+        setcanvscroll
     }
 }
 
@@ -6223,33 +6241,33 @@ proc drawcmitrow {row} {
 
     set id [lindex $displayorder $row]
     if {[info exists hlview] && ![info exists vhighlights($id)]} {
-	askvhighlight $row $id
+        askvhighlight $row $id
     }
     if {[info exists filehighlight] && ![info exists fhighlights($id)]} {
-	askfilehighlight $row $id
+        askfilehighlight $row $id
     }
     if {$findpattern ne {} && ![info exists nhighlights($id)]} {
-	askfindhighlight $row $id
+        askfindhighlight $row $id
     }
     if {$highlight_related ne [mc "None"] && ![info exists rhighlights($id)]} {
-	askrelhighlight $row $id
+        askrelhighlight $row $id
     }
     if {![info exists iddrawn($id)]} {
-	set col [lsearch -exact [lindex $rowidlist $row] $id]
-	if {$col < 0} {
-	    puts "oops, row $row id $id not in list"
-	    return
-	}
-	if {![info exists commitinfo($id)]} {
-	    getcommit $id
-	}
-	assigncolor $id
-	drawcmittext $id $row $col
-	set iddrawn($id) 1
-	incr nrows_drawn
+        set col [lsearch -exact [lindex $rowidlist $row] $id]
+        if {$col < 0} {
+            puts "oops, row $row id $id not in list"
+            return
+        }
+        if {![info exists commitinfo($id)]} {
+            getcommit $id
+        }
+        assigncolor $id
+        drawcmittext $id $row $col
+        set iddrawn($id) 1
+        incr nrows_drawn
     }
     if {$markingmatches} {
-	markrowmatches $row $id
+        markrowmatches $row $id
     }
 }
 
@@ -6258,78 +6276,78 @@ proc drawcommits {row {endrow {}}} {
     global parentlist rowidlist rowfinal uparrowlen downarrowlen nrows_drawn
 
     if {$row < 0} {
-	set row 0
+        set row 0
     }
     if {$endrow eq {}} {
-	set endrow $row
+        set endrow $row
     }
     if {$endrow >= $numcommits} {
-	set endrow [expr {$numcommits - 1}]
+        set endrow [expr {$numcommits - 1}]
     }
 
     set rl1 [expr {$row - $downarrowlen - 3}]
     if {$rl1 < 0} {
-	set rl1 0
+        set rl1 0
     }
     set ro1 [expr {$row - 3}]
     if {$ro1 < 0} {
-	set ro1 0
+        set ro1 0
     }
     set r2 [expr {$endrow + $uparrowlen + 3}]
     if {$r2 > $numcommits} {
-	set r2 $numcommits
+        set r2 $numcommits
     }
     for {set r $rl1} {$r < $r2} {incr r} {
-	if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
-	    if {$rl1 < $r} {
-		layoutrows $rl1 $r
-	    }
-	    set rl1 [expr {$r + 1}]
-	}
+        if {[lindex $rowidlist $r] ne {} && [lindex $rowfinal $r]} {
+            if {$rl1 < $r} {
+                layoutrows $rl1 $r
+            }
+            set rl1 [expr {$r + 1}]
+        }
     }
     if {$rl1 < $r} {
-	layoutrows $rl1 $r
+        layoutrows $rl1 $r
     }
     optimize_rows $ro1 0 $r2
     if {$need_redisplay || $nrows_drawn > 2000} {
-	clear_display
+        clear_display
     }
 
     # make the lines join to already-drawn rows either side
     set r [expr {$row - 1}]
     if {$r < 0 || ![info exists iddrawn([lindex $displayorder $r])]} {
-	set r $row
+        set r $row
     }
     set er [expr {$endrow + 1}]
     if {$er >= $numcommits ||
-	![info exists iddrawn([lindex $displayorder $er])]} {
-	set er $endrow
+        ![info exists iddrawn([lindex $displayorder $er])]} {
+        set er $endrow
     }
     for {} {$r <= $er} {incr r} {
-	set id [lindex $displayorder $r]
-	set wasdrawn [info exists iddrawn($id)]
-	drawcmitrow $r
-	if {$r == $er} break
-	set nextid [lindex $displayorder [expr {$r + 1}]]
-	if {$wasdrawn && [info exists iddrawn($nextid)]} continue
-	drawparentlinks $id $r
-
-	set rowids [lindex $rowidlist $r]
-	foreach lid $rowids {
-	    if {$lid eq {}} continue
-	    if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
-	    if {$lid eq $id} {
-		# see if this is the first child of any of its parents
-		foreach p [lindex $parentlist $r] {
-		    if {[lsearch -exact $rowids $p] < 0} {
-			# make this line extend up to the child
-			set lineend($p) [drawlineseg $p $r $er 0]
-		    }
-		}
-	    } else {
-		set lineend($lid) [drawlineseg $lid $r $er 1]
-	    }
-	}
+        set id [lindex $displayorder $r]
+        set wasdrawn [info exists iddrawn($id)]
+        drawcmitrow $r
+        if {$r == $er} break
+        set nextid [lindex $displayorder [expr {$r + 1}]]
+        if {$wasdrawn && [info exists iddrawn($nextid)]} continue
+        drawparentlinks $id $r
+
+        set rowids [lindex $rowidlist $r]
+        foreach lid $rowids {
+            if {$lid eq {}} continue
+            if {[info exists lineend($lid)] && $lineend($lid) > $r} continue
+            if {$lid eq $id} {
+                # see if this is the first child of any of its parents
+                foreach p [lindex $parentlist $r] {
+                    if {[lsearch -exact $rowids $p] < 0} {
+                        # make this line extend up to the child
+                        set lineend($p) [drawlineseg $p $r $er 0]
+                    }
+                }
+            } else {
+                set lineend($lid) [drawlineseg $lid $r $er 1]
+            }
+        }
     }
 }
 
@@ -6339,15 +6357,15 @@ proc undolayout {row} {
 
     set r [expr {$row - ($uparrowlen + $mingaplen + $downarrowlen)}]
     if {$r < 0} {
-	set r 0
+        set r 0
     }
     if {[llength $rowidlist] > $r} {
-	incr r -1
-	set rowidlist [lrange $rowidlist 0 $r]
-	set rowfinal [lrange $rowfinal 0 $r]
-	set rowisopt [lrange $rowisopt 0 $r]
-	set need_redisplay 1
-	run drawvisible
+        incr r -1
+        set rowidlist [lrange $rowidlist 0 $r]
+        set rowfinal [lrange $rowfinal 0 $r]
+        set rowisopt [lrange $rowisopt 0 $r]
+        set need_redisplay 1
+        run drawvisible
     }
 }
 
@@ -6364,44 +6382,44 @@ proc drawvisible {} {
     set y1 [expr {int($f1 * $ymax)}]
 
     if {[info exists targetid]} {
-	if {[commitinview $targetid $curview]} {
-	    set r [rowofcommit $targetid]
-	    if {$r != $targetrow} {
-		# Fix up the scrollregion and change the scrolling position
-		# now that our target row has moved.
-		set diff [expr {($r - $targetrow) * $linespc}]
-		set targetrow $r
-		setcanvscroll
-		set ymax [lindex [$canv cget -scrollregion] 3]
-		incr y0 $diff
-		incr y1 $diff
-		set f0 [expr {$y0 / $ymax}]
-		set f1 [expr {$y1 / $ymax}]
-		allcanvs yview moveto $f0
-		$cscroll set $f0 $f1
-		set need_redisplay 1
-	    }
-	} else {
-	    unset targetid
-	}
+        if {[commitinview $targetid $curview]} {
+            set r [rowofcommit $targetid]
+            if {$r != $targetrow} {
+                # Fix up the scrollregion and change the scrolling position
+                # now that our target row has moved.
+                set diff [expr {($r - $targetrow) * $linespc}]
+                set targetrow $r
+                setcanvscroll
+                set ymax [lindex [$canv cget -scrollregion] 3]
+                incr y0 $diff
+                incr y1 $diff
+                set f0 [expr {$y0 / $ymax}]
+                set f1 [expr {$y1 / $ymax}]
+                allcanvs yview moveto $f0
+                $cscroll set $f0 $f1
+                set need_redisplay 1
+            }
+        } else {
+            unset targetid
+        }
     }
 
     set row [expr {int(($y0 - 3) / $linespc) - 1}]
     set endrow [expr {int(($y1 - 3) / $linespc) + 1}]
     if {$endrow >= $vrowmod($curview)} {
-	update_arcrows $curview
+        update_arcrows $curview
     }
     if {$selectedline ne {} &&
-	$row <= $selectedline && $selectedline <= $endrow} {
-	set targetrow $selectedline
+        $row <= $selectedline && $selectedline <= $endrow} {
+        set targetrow $selectedline
     } elseif {[info exists targetid]} {
-	set targetrow [expr {int(($row + $endrow) / 2)}]
+        set targetrow [expr {int(($row + $endrow) / 2)}]
     }
     if {[info exists targetrow]} {
-	if {$targetrow >= $numcommits} {
-	    set targetrow [expr {$numcommits - 1}]
-	}
-	set targetid [commitonrow $targetrow]
+        if {$targetrow >= $numcommits} {
+            set targetrow [expr {$numcommits - 1}]
+        }
+        set targetid [commitonrow $targetrow]
     }
     drawcommits $row $endrow
 }
@@ -6433,31 +6451,31 @@ proc findcrossings {id} {
     set cross {}
     set ccross {}
     foreach {s e} [rowranges $id] {
-	if {$e >= $numcommits} {
-	    set e [expr {$numcommits - 1}]
-	}
-	if {$e <= $s} continue
-	for {set row $e} {[incr row -1] >= $s} {} {
-	    set x [lsearch -exact [lindex $rowidlist $row] $id]
-	    if {$x < 0} break
-	    set olds [lindex $parentlist $row]
-	    set kid [lindex $displayorder $row]
-	    set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
-	    if {$kidx < 0} continue
-	    set nextrow [lindex $rowidlist [expr {$row + 1}]]
-	    foreach p $olds {
-		set px [lsearch -exact $nextrow $p]
-		if {$px < 0} continue
-		if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
-		    if {[lsearch -exact $ccross $p] >= 0} continue
-		    if {$x == $px + ($kidx < $px? -1: 1)} {
-			lappend ccross $p
-		    } elseif {[lsearch -exact $cross $p] < 0} {
-			lappend cross $p
-		    }
-		}
-	    }
-	}
+        if {$e >= $numcommits} {
+            set e [expr {$numcommits - 1}]
+        }
+        if {$e <= $s} continue
+        for {set row $e} {[incr row -1] >= $s} {} {
+            set x [lsearch -exact [lindex $rowidlist $row] $id]
+            if {$x < 0} break
+            set olds [lindex $parentlist $row]
+            set kid [lindex $displayorder $row]
+            set kidx [lsearch -exact [lindex $rowidlist $row] $kid]
+            if {$kidx < 0} continue
+            set nextrow [lindex $rowidlist [expr {$row + 1}]]
+            foreach p $olds {
+                set px [lsearch -exact $nextrow $p]
+                if {$px < 0} continue
+                if {($kidx < $x && $x < $px) || ($px < $x && $x < $kidx)} {
+                    if {[lsearch -exact $ccross $p] >= 0} continue
+                    if {$x == $px + ($kidx < $px? -1: 1)} {
+                        lappend ccross $p
+                    } elseif {[lsearch -exact $cross $p] < 0} {
+                        lappend cross $p
+                    }
+                }
+            }
+        }
     }
     return [concat $ccross {{}} $cross]
 }
@@ -6469,58 +6487,58 @@ proc assigncolor {id} {
     if {[info exists colormap($id)]} return
     set ncolors [llength $colors]
     if {[info exists children($curview,$id)]} {
-	set kids $children($curview,$id)
+        set kids $children($curview,$id)
     } else {
-	set kids {}
+        set kids {}
     }
     if {[llength $kids] == 1} {
-	set child [lindex $kids 0]
-	if {[info exists colormap($child)]
-	    && [llength $parents($curview,$child)] == 1} {
-	    set colormap($id) $colormap($child)
-	    return
-	}
+        set child [lindex $kids 0]
+        if {[info exists colormap($child)]
+            && [llength $parents($curview,$child)] == 1} {
+            set colormap($id) $colormap($child)
+            return
+        }
     }
     set badcolors {}
     set origbad {}
     foreach x [findcrossings $id] {
-	if {$x eq {}} {
-	    # delimiter between corner crossings and other crossings
-	    if {[llength $badcolors] >= $ncolors - 1} break
-	    set origbad $badcolors
-	}
-	if {[info exists colormap($x)]
-	    && [lsearch -exact $badcolors $colormap($x)] < 0} {
-	    lappend badcolors $colormap($x)
-	}
+        if {$x eq {}} {
+            # delimiter between corner crossings and other crossings
+            if {[llength $badcolors] >= $ncolors - 1} break
+            set origbad $badcolors
+        }
+        if {[info exists colormap($x)]
+            && [lsearch -exact $badcolors $colormap($x)] < 0} {
+            lappend badcolors $colormap($x)
+        }
     }
     if {[llength $badcolors] >= $ncolors} {
-	set badcolors $origbad
+        set badcolors $origbad
     }
     set origbad $badcolors
     if {[llength $badcolors] < $ncolors - 1} {
-	foreach child $kids {
-	    if {[info exists colormap($child)]
-		&& [lsearch -exact $badcolors $colormap($child)] < 0} {
-		lappend badcolors $colormap($child)
-	    }
-	    foreach p $parents($curview,$child) {
-		if {[info exists colormap($p)]
-		    && [lsearch -exact $badcolors $colormap($p)] < 0} {
-		    lappend badcolors $colormap($p)
-		}
-	    }
-	}
-	if {[llength $badcolors] >= $ncolors} {
-	    set badcolors $origbad
-	}
+        foreach child $kids {
+            if {[info exists colormap($child)]
+                && [lsearch -exact $badcolors $colormap($child)] < 0} {
+                lappend badcolors $colormap($child)
+            }
+            foreach p $parents($curview,$child) {
+                if {[info exists colormap($p)]
+                    && [lsearch -exact $badcolors $colormap($p)] < 0} {
+                    lappend badcolors $colormap($p)
+                }
+            }
+        }
+        if {[llength $badcolors] >= $ncolors} {
+            set badcolors $origbad
+        }
     }
     for {set i 0} {$i <= $ncolors} {incr i} {
-	set c [lindex $colors $nextcolor]
-	if {[incr nextcolor] >= $ncolors} {
-	    set nextcolor 0
-	}
-	if {[lsearch -exact $badcolors $c]} break
+        set c [lindex $colors $nextcolor]
+        if {[incr nextcolor] >= $ncolors} {
+            set nextcolor 0
+        }
+        if {[lsearch -exact $badcolors $c]} break
     }
     set colormap($id) $c
 }
@@ -6538,9 +6556,9 @@ proc graph_pane_width {} {
     global use_ttk
 
     if {$use_ttk} {
-	set g [.tf.histframe.pwclist sashpos 0]
+        set g [.tf.histframe.pwclist sashpos 0]
     } else {
-	set g [.tf.histframe.pwclist sash coord 0]
+        set g [.tf.histframe.pwclist sash coord 0]
     }
     return [lindex $g 0]
 }
@@ -6548,7 +6566,7 @@ proc graph_pane_width {} {
 proc totalwidth {l font extra} {
     set tot 0
     foreach str $l {
-	set tot [expr {$tot + [font measure $font $str] + $extra}]
+        set tot [expr {$tot + [font measure $font $str] + $extra}]
     }
     return $tot
 }
@@ -6572,29 +6590,29 @@ proc drawtags {id x xt y1} {
     set extra [expr {$delta + $lthickness + $linespc}]
 
     if {[info exists idtags($id)]} {
-	set marks $idtags($id)
-	set ntags [llength $marks]
-	if {$ntags > $maxtags ||
-	    [totalwidth $marks mainfont $extra] > $maxwidth} {
-	    # show just a single "n tags..." tag
-	    set singletag 1
-	    if {$ntags == 1} {
-		set marks [list "tag..."]
-	    } else {
-		set marks [list [format "%d tags..." $ntags]]
-	    }
-	    set ntags 1
-	}
+        set marks $idtags($id)
+        set ntags [llength $marks]
+        if {$ntags > $maxtags ||
+            [totalwidth $marks mainfont $extra] > $maxwidth} {
+            # show just a single "n tags..." tag
+            set singletag 1
+            if {$ntags == 1} {
+                set marks [list "tag..."]
+            } else {
+                set marks [list [format "%d tags..." $ntags]]
+            }
+            set ntags 1
+        }
     }
     if {[info exists idheads($id)]} {
-	set marks [concat $marks $idheads($id)]
-	set nheads [llength $idheads($id)]
+        set marks [concat $marks $idheads($id)]
+        set nheads [llength $idheads($id)]
     }
     if {[info exists idotherrefs($id)]} {
-	set marks [concat $marks $idotherrefs($id)]
+        set marks [concat $marks $idotherrefs($id)]
     }
     if {$marks eq {}} {
-	return $xt
+        return $xt
     }
 
     set yt [expr {$y1 - 0.5 * $linespc}]
@@ -6603,66 +6621,66 @@ proc drawtags {id x xt y1} {
     set wvals {}
     set i -1
     foreach tag $marks {
-	incr i
-	if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
-	    set wid [font measure mainfontbold $tag]
-	} else {
-	    set wid [font measure mainfont $tag]
-	}
-	lappend xvals $xt
-	lappend wvals $wid
-	set xt [expr {$xt + $wid + $extra}]
+        incr i
+        if {$i >= $ntags && $i < $ntags + $nheads && $tag eq $mainhead} {
+            set wid [font measure mainfontbold $tag]
+        } else {
+            set wid [font measure mainfont $tag]
+        }
+        lappend xvals $xt
+        lappend wvals $wid
+        set xt [expr {$xt + $wid + $extra}]
     }
     set t [$canv create line $x $y1 [lindex $xvals end] $y1 \
-	       -width $lthickness -fill $reflinecolor -tags tag.$id]
+               -width $lthickness -fill $reflinecolor -tags tag.$id]
     $canv lower $t
     foreach tag $marks x $xvals wid $wvals {
-	set tag_quoted [string map {% %%} $tag]
-	set xl [expr {$x + $delta}]
-	set xr [expr {$x + $delta + $wid + $lthickness}]
-	set font mainfont
-	if {[incr ntags -1] >= 0} {
-	    # draw a tag
-	    set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
-		       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
-		       -width 1 -outline $tagoutlinecolor -fill $tagbgcolor \
-		       -tags tag.$id]
-	    if {$singletag} {
-		set tagclick [list showtags $id 1]
-	    } else {
-		set tagclick [list showtag $tag_quoted 1]
-	    }
-	    $canv bind $t <1> $tagclick
-	    set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
-	} else {
-	    # draw a head or other ref
-	    if {[incr nheads -1] >= 0} {
-		set col $headbgcolor
-		if {$tag eq $mainhead} {
-		    set font mainfontbold
-		}
-	    } else {
-		set col "#ddddff"
-	    }
-	    set xl [expr {$xl - $delta/2}]
-	    $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
-		-width 1 -outline black -fill $col -tags tag.$id
-	    if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
-	        set rwid [font measure mainfont $remoteprefix]
-		set xi [expr {$x + 1}]
-		set yti [expr {$yt + 1}]
-		set xri [expr {$x + $rwid}]
-		$canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
-			-width 0 -fill $remotebgcolor -tags tag.$id
-	    }
-	}
-	set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \
-		   -font $font -tags [list tag.$id text]]
-	if {$ntags >= 0} {
-	    $canv bind $t <1> $tagclick
-	} elseif {$nheads >= 0} {
-	    $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted]
-	}
+        set tag_quoted [string map {% %%} $tag]
+        set xl [expr {$x + $delta}]
+        set xr [expr {$x + $delta + $wid + $lthickness}]
+        set font mainfont
+        if {[incr ntags -1] >= 0} {
+            # draw a tag
+            set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
+                       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
+                       -width 1 -outline $tagoutlinecolor -fill $tagbgcolor \
+                       -tags tag.$id]
+            if {$singletag} {
+                set tagclick [list showtags $id 1]
+            } else {
+                set tagclick [list showtag $tag_quoted 1]
+            }
+            $canv bind $t <1> $tagclick
+            set rowtextx([rowofcommit $id]) [expr {$xr + $linespc}]
+        } else {
+            # draw a head or other ref
+            if {[incr nheads -1] >= 0} {
+                set col $headbgcolor
+                if {$tag eq $mainhead} {
+                    set font mainfontbold
+                }
+            } else {
+                set col "#ddddff"
+            }
+            set xl [expr {$xl - $delta/2}]
+            $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \
+                -width 1 -outline black -fill $col -tags tag.$id
+            if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} {
+                set rwid [font measure mainfont $remoteprefix]
+                set xi [expr {$x + 1}]
+                set yti [expr {$yt + 1}]
+                set xri [expr {$x + $rwid}]
+                $canv create polygon $xi $yti $xri $yti $xri $yb $xi $yb \
+                        -width 0 -fill $remotebgcolor -tags tag.$id
+            }
+        }
+        set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \
+                   -font $font -tags [list tag.$id text]]
+        if {$ntags >= 0} {
+            $canv bind $t <1> $tagclick
+        } elseif {$nheads >= 0} {
+            $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted]
+        }
     }
     return $xt
 }
@@ -6672,8 +6690,8 @@ proc drawnotesign {xt y} {
 
     set orad [expr {$linespc / 3}]
     set t [$canv create rectangle [expr {$xt - $orad}] [expr {$y - $orad}] \
-	       [expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \
-	       -fill yellow -outline $fgcolor -width 1 -tags circle]
+               [expr {$xt + $orad - 1}] [expr {$y + $orad - 1}] \
+               -fill yellow -outline $fgcolor -width 1 -tags circle]
     set xt [expr {$xt + $orad * 3}]
     return $xt
 }
@@ -6683,9 +6701,9 @@ proc xcoord {i level ln} {
 
     set x [expr {$canvx0 + $i * $xspc1($ln)}]
     if {$i > 0 && $i == $level} {
-	set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
+        set x [expr {$x + 0.5 * ($xspc2 - $xspc1($ln))}]
     } elseif {$i > $level} {
-	set x [expr {$x + $xspc2 - $xspc1($ln)}]
+        set x [expr {$x + $xspc2 - $xspc1($ln)}]
     }
     return $x
 }
@@ -6696,7 +6714,7 @@ proc show_status {msg} {
     clear_display
     set_window_title
     $canv create text 3 3 -anchor nw -text $msg -font mainfont \
-	-tags text -fill $fgcolor
+        -tags text -fill $fgcolor
 }
 
 # Don't change the text pane cursor if it is currently the hand cursor,
@@ -6705,7 +6723,7 @@ proc settextcursor {c} {
     global ctext curtextcursor
 
     if {[$ctext cget -cursor] == $curtextcursor} {
-	$ctext config -cursor $c
+        $ctext config -cursor $c
     }
     set curtextcursor $c
 }
@@ -6714,13 +6732,13 @@ proc nowbusy {what {name {}}} {
     global isbusy busyname statusw
 
     if {[array names isbusy] eq {}} {
-	. config -cursor watch
-	settextcursor watch
+        . config -cursor watch
+        settextcursor watch
     }
     set isbusy($what) 1
     set busyname($what) $name
     if {$name ne {}} {
-	$statusw conf -text $name
+        $statusw conf -text $name
     }
 }
 
@@ -6728,35 +6746,35 @@ proc notbusy {what} {
     global isbusy maincursor textcursor busyname statusw
 
     catch {
-	unset isbusy($what)
-	if {$busyname($what) ne {} &&
-	    [$statusw cget -text] eq $busyname($what)} {
-	    $statusw conf -text {}
-	}
+        unset isbusy($what)
+        if {$busyname($what) ne {} &&
+            [$statusw cget -text] eq $busyname($what)} {
+            $statusw conf -text {}
+        }
     }
     if {[array names isbusy] eq {}} {
-	. config -cursor $maincursor
-	settextcursor $textcursor
+        . config -cursor $maincursor
+        settextcursor $textcursor
     }
 }
 
 proc findmatches {f} {
     global findtype findstring
     if {$findtype == [mc "Regexp"]} {
-	set matches [regexp -indices -all -inline $findstring $f]
+        set matches [regexp -indices -all -inline $findstring $f]
     } else {
-	set fs $findstring
-	if {$findtype == [mc "IgnCase"]} {
-	    set f [string tolower $f]
-	    set fs [string tolower $fs]
-	}
-	set matches {}
-	set i 0
-	set l [string length $fs]
-	while {[set j [string first $fs $f $i]] >= 0} {
-	    lappend matches [list $j [expr {$j+$l-1}]]
-	    set i [expr {$j + $l}]
-	}
+        set fs $findstring
+        if {$findtype == [mc "IgnCase"]} {
+            set f [string tolower $f]
+            set fs [string tolower $fs]
+        }
+        set matches {}
+        set i 0
+        set l [string length $fs]
+        while {[set j [string first $fs $f $i]] >= 0} {
+            lappend matches [list $j [expr {$j+$l-1}]]
+            set i [expr {$j + $l}]
+        }
     }
     return $matches
 }
@@ -6766,21 +6784,21 @@ proc dofind {{dirn 1} {wrap 1}} {
     global gdttype filehighlight fh_serial find_dirn findallowwrap
 
     if {[info exists find_dirn]} {
-	if {$find_dirn == $dirn} return
-	stopfinding
+        if {$find_dirn == $dirn} return
+        stopfinding
     }
     focus .
     if {$findstring eq {} || $numcommits == 0} return
     if {$selectedline eq {}} {
-	set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
+        set findstartline [lindex [visiblerows] [expr {$dirn < 0}]]
     } else {
-	set findstartline $selectedline
+        set findstartline $selectedline
     }
     set findcurline $findstartline
     nowbusy finding [mc "Searching"]
     if {$gdttype ne [mc "containing:"] && ![info exists filehighlight]} {
-	after cancel do_file_hl $fh_serial
-	do_file_hl $fh_serial
+        after cancel do_file_hl $fh_serial
+        do_file_hl $fh_serial
     }
     set find_dirn $dirn
     set findallowwrap $wrap
@@ -6791,11 +6809,11 @@ proc stopfinding {} {
     global find_dirn findcurline fprogcoord
 
     if {[info exists find_dirn]} {
-	unset find_dirn
-	unset findcurline
-	notbusy finding
-	set fprogcoord 0
-	adjustprogress
+        unset find_dirn
+        unset findcurline
+        notbusy finding
+        set fprogcoord 0
+        adjustprogress
     }
     stopblaming
 }
@@ -6807,41 +6825,41 @@ proc findmore {} {
     global curview varcorder vrownum varccommits vrowmod
 
     if {![info exists find_dirn]} {
-	return 0
+        return 0
     }
     set fldtypes [list [mc "Headline"] [mc "Author"] "" [mc "Committer"] "" [mc "Comments"]]
     set l $findcurline
     set moretodo 0
     if {$find_dirn > 0} {
-	incr l
-	if {$l >= $numcommits} {
-	    set l 0
-	}
-	if {$l <= $findstartline} {
-	    set lim [expr {$findstartline + 1}]
-	} else {
-	    set lim $numcommits
-	    set moretodo $findallowwrap
-	}
+        incr l
+        if {$l >= $numcommits} {
+            set l 0
+        }
+        if {$l <= $findstartline} {
+            set lim [expr {$findstartline + 1}]
+        } else {
+            set lim $numcommits
+            set moretodo $findallowwrap
+        }
     } else {
-	if {$l == 0} {
-	    set l $numcommits
-	}
-	incr l -1
-	if {$l >= $findstartline} {
-	    set lim [expr {$findstartline - 1}]
-	} else {
-	    set lim -1
-	    set moretodo $findallowwrap
-	}
+        if {$l == 0} {
+            set l $numcommits
+        }
+        incr l -1
+        if {$l >= $findstartline} {
+            set lim [expr {$findstartline - 1}]
+        } else {
+            set lim -1
+            set moretodo $findallowwrap
+        }
     }
     set n [expr {($lim - $l) * $find_dirn}]
     if {$n > 500} {
-	set n 500
-	set moretodo 1
+        set n 500
+        set moretodo 1
     }
     if {$l + ($find_dirn > 0? $n: 1) > $vrowmod($curview)} {
-	update_arcrows $curview
+        update_arcrows $curview
     }
     set found 0
     set domore 1
@@ -6851,81 +6869,81 @@ proc findmore {} {
     set ids [lindex $varccommits($curview,$a)]
     set arowend [expr {$arow + [llength $ids]}]
     if {$gdttype eq [mc "containing:"]} {
-	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
-	    if {$l < $arow || $l >= $arowend} {
-		incr ai $find_dirn
-		set a [lindex $varcorder($curview) $ai]
-		set arow [lindex $vrownum($curview) $ai]
-		set ids [lindex $varccommits($curview,$a)]
-		set arowend [expr {$arow + [llength $ids]}]
-	    }
-	    set id [lindex $ids [expr {$l - $arow}]]
-	    # shouldn't happen unless git log doesn't give all the commits...
-	    if {![info exists commitdata($id)] ||
-		![doesmatch $commitdata($id)]} {
-		continue
-	    }
-	    if {![info exists commitinfo($id)]} {
-		getcommit $id
-	    }
-	    set info $commitinfo($id)
-	    foreach f $info ty $fldtypes {
-		if {$ty eq ""} continue
-		if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
-		    [doesmatch $f]} {
-		    set found 1
-		    break
-		}
-	    }
-	    if {$found} break
-	}
+        for {} {$n > 0} {incr n -1; incr l $find_dirn} {
+            if {$l < $arow || $l >= $arowend} {
+                incr ai $find_dirn
+                set a [lindex $varcorder($curview) $ai]
+                set arow [lindex $vrownum($curview) $ai]
+                set ids [lindex $varccommits($curview,$a)]
+                set arowend [expr {$arow + [llength $ids]}]
+            }
+            set id [lindex $ids [expr {$l - $arow}]]
+            # shouldn't happen unless git log doesn't give all the commits...
+            if {![info exists commitdata($id)] ||
+                ![doesmatch $commitdata($id)]} {
+                continue
+            }
+            if {![info exists commitinfo($id)]} {
+                getcommit $id
+            }
+            set info $commitinfo($id)
+            foreach f $info ty $fldtypes {
+                if {$ty eq ""} continue
+                if {($findloc eq [mc "All fields"] || $findloc eq $ty) &&
+                    [doesmatch $f]} {
+                    set found 1
+                    break
+                }
+            }
+            if {$found} break
+        }
     } else {
-	for {} {$n > 0} {incr n -1; incr l $find_dirn} {
-	    if {$l < $arow || $l >= $arowend} {
-		incr ai $find_dirn
-		set a [lindex $varcorder($curview) $ai]
-		set arow [lindex $vrownum($curview) $ai]
-		set ids [lindex $varccommits($curview,$a)]
-		set arowend [expr {$arow + [llength $ids]}]
-	    }
-	    set id [lindex $ids [expr {$l - $arow}]]
-	    if {![info exists fhighlights($id)]} {
-		# this sets fhighlights($id) to -1
-		askfilehighlight $l $id
-	    }
-	    if {$fhighlights($id) > 0} {
-		set found $domore
-		break
-	    }
-	    if {$fhighlights($id) < 0} {
-		if {$domore} {
-		    set domore 0
-		    set findcurline [expr {$l - $find_dirn}]
-		}
-	    }
-	}
+        for {} {$n > 0} {incr n -1; incr l $find_dirn} {
+            if {$l < $arow || $l >= $arowend} {
+                incr ai $find_dirn
+                set a [lindex $varcorder($curview) $ai]
+                set arow [lindex $vrownum($curview) $ai]
+                set ids [lindex $varccommits($curview,$a)]
+                set arowend [expr {$arow + [llength $ids]}]
+            }
+            set id [lindex $ids [expr {$l - $arow}]]
+            if {![info exists fhighlights($id)]} {
+                # this sets fhighlights($id) to -1
+                askfilehighlight $l $id
+            }
+            if {$fhighlights($id) > 0} {
+                set found $domore
+                break
+            }
+            if {$fhighlights($id) < 0} {
+                if {$domore} {
+                    set domore 0
+                    set findcurline [expr {$l - $find_dirn}]
+                }
+            }
+        }
     }
     if {$found || ($domore && !$moretodo)} {
-	unset findcurline
-	unset find_dirn
-	notbusy finding
-	set fprogcoord 0
-	adjustprogress
-	if {$found} {
-	    findselectline $l
-	} else {
-	    bell
-	}
-	return 0
+        unset findcurline
+        unset find_dirn
+        notbusy finding
+        set fprogcoord 0
+        adjustprogress
+        if {$found} {
+            findselectline $l
+        } else {
+            bell
+        }
+        return 0
     }
     if {!$domore} {
-	flushhighlights
+        flushhighlights
     } else {
-	set findcurline [expr {$l - $find_dirn}]
+        set findcurline [expr {$l - $find_dirn}]
     }
     set n [expr {($findcurline - $findstartline) * $find_dirn - 1}]
     if {$n < 0} {
-	incr n $numcommits
+        incr n $numcommits
     }
     set fprogcoord [expr {$n * 1.0 / $numcommits}]
     adjustprogress
@@ -6939,15 +6957,15 @@ proc findselectline {l} {
     set findcurline $l
     selectline $l 1
     if {$markingmatches &&
-	($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} {
-	# highlight the matches in the comments
-	set f [$ctext get 1.0 $commentend]
-	set matches [findmatches $f]
-	foreach match $matches {
-	    set start [lindex $match 0]
-	    set end [expr {[lindex $match 1] + 1}]
-	    $ctext tag add found "1.0 + $start c" "1.0 + $end c"
-	}
+        ($findloc eq [mc "All fields"] || $findloc eq [mc "Comments"])} {
+        # highlight the matches in the comments
+        set f [$ctext get 1.0 $commentend]
+        set matches [findmatches $f]
+        foreach match $matches {
+            set start [lindex $match 0]
+            set end [expr {[lindex $match 1] + 1}]
+            $ctext tag add found "1.0 + $start c" "1.0 + $end c"
+        }
     }
     drawvisible
 }
@@ -6961,18 +6979,18 @@ proc markmatches {canv l str tag matches font row} {
     set y0 [lindex $bbox 1]
     set y1 [lindex $bbox 3]
     foreach match $matches {
-	set start [lindex $match 0]
-	set end [lindex $match 1]
-	if {$start > $end} continue
-	set xoff [font measure $font [string range $str 0 [expr {$start-1}]]]
-	set xlen [font measure $font [string range $str 0 [expr {$end}]]]
-	set t [$canv create rect [expr {$x0+$xoff}] $y0 \
-		   [expr {$x0+$xlen+2}] $y1 \
-		   -outline {} -tags [list match$l matches] -fill yellow]
-	$canv lower $t
-	if {$row == $selectedline} {
-	    $canv raise $t secsel
-	}
+        set start [lindex $match 0]
+        set end [lindex $match 1]
+        if {$start > $end} continue
+        set xoff [font measure $font [string range $str 0 [expr {$start-1}]]]
+        set xlen [font measure $font [string range $str 0 [expr {$end}]]]
+        set t [$canv create rect [expr {$x0+$xoff}] $y0 \
+                   [expr {$x0+$xlen+2}] $y1 \
+                   -outline {} -tags [list match$l matches] -fill yellow]
+        $canv lower $t
+        if {$row == $selectedline} {
+            $canv raise $t secsel
+        }
     }
 }
 
@@ -6993,12 +7011,12 @@ proc selcanvline {w x y} {
     set y [expr {$y + $yfrac * $ymax}]
     set l [expr {int(($y - $canvy0) / $linespc + 0.5)}]
     if {$l < 0} {
-	set l 0
+        set l 0
     }
     if {$w eq $canv} {
-	set xmax [lindex [$canv cget -scrollregion] 2]
-	set xleft [expr {[lindex [$canv xview] 0] * $xmax}]
-	if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return
+        set xmax [lindex [$canv cget -scrollregion] 2]
+        set xleft [expr {[lindex [$canv xview] 0] * $xmax}]
+        if {![info exists rowtextx($l)] || $xleft + $x < $rowtextx($l)} return
     }
     unmarkmatches
     selectline $l 1
@@ -7007,11 +7025,11 @@ proc selcanvline {w x y} {
 proc commit_descriptor {p} {
     global commitinfo
     if {![info exists commitinfo($p)]} {
-	getcommit $p
+        getcommit $p
     }
     set l "..."
     if {[llength $commitinfo($p)] > 1} {
-	set l [lindex $commitinfo($p) 0]
+        set l [lindex $commitinfo($p) 0]
     }
     return "$p ($l)\n"
 }
@@ -7026,26 +7044,26 @@ proc appendwithlinks {text tags} {
     $ctext insert end $text $tags
     set links [regexp -indices -all -inline {(?:\m|-g)[0-9a-f]{6,40}\M} $text]
     foreach l $links {
-	set s [lindex $l 0]
-	set e [lindex $l 1]
-	set linkid [string range $text $s $e]
-	incr e
-	$ctext tag delete link$linknum
-	$ctext tag add link$linknum "$start + $s c" "$start + $e c"
-	setlink $linkid link$linknum
-	incr linknum
+        set s [lindex $l 0]
+        set e [lindex $l 1]
+        set linkid [string range $text $s $e]
+        incr e
+        $ctext tag delete link$linknum
+        $ctext tag add link$linknum "$start + $s c" "$start + $e c"
+        setlink $linkid link$linknum
+        incr linknum
     }
     set wlinks [regexp -indices -all -inline -line \
-		    {https?://[^[:space:]]+} $text]
+                    {https?://[^[:space:]]+} $text]
     foreach l $wlinks {
-	set s2 [lindex $l 0]
-	set e2 [lindex $l 1]
-	set url [string range $text $s2 $e2]
-	incr e2
-	$ctext tag delete link$linknum
-	$ctext tag add link$linknum "$start + $s2 c" "$start + $e2 c"
-	setwlink $url link$linknum
-	incr linknum
+        set s2 [lindex $l 0]
+        set e2 [lindex $l 1]
+        set url [string range $text $s2 $e2]
+        incr e2
+        $ctext tag delete link$linknum
+        $ctext tag add link$linknum "$start + $s2 c" "$start + $e2 c"
+        setwlink $url link$linknum
+        incr linknum
     }
 }
 
@@ -7059,23 +7077,23 @@ proc setlink {id lk} {
 
     set known 0
     if {[string length $id] < 40} {
-	set matches [longid $id]
-	if {[llength $matches] > 0} {
-	    if {[llength $matches] > 1} return
-	    set known 1
-	    set id [lindex $matches 0]
-	}
+        set matches [longid $id]
+        if {[llength $matches] > 0} {
+            if {[llength $matches] > 1} return
+            set known 1
+            set id [lindex $matches 0]
+        }
     } else {
-	set known [commitinview $id $curview]
+        set known [commitinview $id $curview]
     }
     if {$known} {
-	$ctext tag conf $lk -foreground $linkfgcolor -underline 1
-	$ctext tag bind $lk <1> [list selbyid $id]
-	$ctext tag bind $lk <Enter> {linkcursor %W 1}
-	$ctext tag bind $lk <Leave> {linkcursor %W -1}
+        $ctext tag conf $lk -foreground $linkfgcolor -underline 1
+        $ctext tag bind $lk <1> [list selbyid $id]
+        $ctext tag bind $lk <Enter> {linkcursor %W 1}
+        $ctext tag bind $lk <Leave> {linkcursor %W -1}
     } else {
-	lappend pendinglinks($id) $lk
-	interestedin $id {makelink %P}
+        lappend pendinglinks($id) $lk
+        interestedin $id {makelink %P}
     }
 }
 
@@ -7107,7 +7125,7 @@ proc makelink {id} {
 
     if {![info exists pendinglinks($id)]} return
     foreach lk $pendinglinks($id) {
-	setlink $id $lk
+        setlink $id $lk
     }
     unset pendinglinks($id)
 }
@@ -7116,12 +7134,12 @@ proc linkcursor {w inc} {
     global linkentercount curtextcursor
 
     if {[incr linkentercount $inc] > 0} {
-	$w configure -cursor hand2
+        $w configure -cursor hand2
     } else {
-	$w configure -cursor $curtextcursor
-	if {$linkentercount < 0} {
-	    set linkentercount 0
-	}
+        $w configure -cursor $curtextcursor
+        if {$linkentercount < 0} {
+            set linkentercount 0
+        }
     }
 }
 
@@ -7131,7 +7149,7 @@ proc browseweb {url} {
     if {$web_browser eq {}} return
     # Use eval here in case $web_browser is a command plus some arguments
     if {[catch {eval exec $web_browser [list $url] &} err]} {
-	error_popup "[mc "Error starting web browser:"] $err"
+        error_popup "[mc "Error starting web browser:"] $err"
     }
 }
 
@@ -7144,9 +7162,9 @@ proc viewnextline {dir} {
     set wtop [expr {[lindex $wnow 0] * $ymax}]
     set newtop [expr {$wtop + $dir * $linespc}]
     if {$newtop < 0} {
-	set newtop 0
+        set newtop 0
     } elseif {$newtop > $ymax} {
-	set newtop $ymax
+        set newtop $ymax
     }
     allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
 }
@@ -7157,15 +7175,15 @@ proc appendrefs {pos ids var} {
     global ctext linknum curview $var maxrefs visiblerefs mainheadid
 
     if {[catch {$ctext index $pos}]} {
-	return 0
+        return 0
     }
     $ctext conf -state normal
     $ctext delete $pos "$pos lineend"
     set tags {}
     foreach id $ids {
-	foreach tag [set $var\($id\)] {
-	    lappend tags [list $tag $id]
-	}
+        foreach tag [set $var\($id\)] {
+            lappend tags [list $tag $id]
+        }
     }
 
     set sep {}
@@ -7173,44 +7191,44 @@ proc appendrefs {pos ids var} {
     set nutags 0
 
     if {[llength $tags] > $maxrefs} {
-	# If we are displaying heads, and there are too many,
-	# see if there are some important heads to display.
-	# Currently that are the current head and heads listed in $visiblerefs option
-	set itags {}
-	if {$var eq "idheads"} {
-	    set utags {}
-	    foreach ti $tags {
-		set hname [lindex $ti 0]
-		set id [lindex $ti 1]
-		if {([lsearch -exact $visiblerefs $hname] != -1 || $id eq $mainheadid) &&
-		    [llength $itags] < $maxrefs} {
-		    lappend itags $ti
-		} else {
-		    lappend utags $ti
-		}
-	    }
-	    set tags $utags
-	}
-	if {$itags ne {}} {
-	    set str [mc "and many more"]
-	    set sep " "
-	} else {
-	    set str [mc "many"]
-	}
-	$ctext insert $pos "$str ([llength $tags])"
-	set nutags [llength $tags]
-	set tags $itags
+        # If we are displaying heads, and there are too many,
+        # see if there are some important heads to display.
+        # Currently that are the current head and heads listed in $visiblerefs option
+        set itags {}
+        if {$var eq "idheads"} {
+            set utags {}
+            foreach ti $tags {
+                set hname [lindex $ti 0]
+                set id [lindex $ti 1]
+                if {([lsearch -exact $visiblerefs $hname] != -1 || $id eq $mainheadid) &&
+                    [llength $itags] < $maxrefs} {
+                    lappend itags $ti
+                } else {
+                    lappend utags $ti
+                }
+            }
+            set tags $utags
+        }
+        if {$itags ne {}} {
+            set str [mc "and many more"]
+            set sep " "
+        } else {
+            set str [mc "many"]
+        }
+        $ctext insert $pos "$str ([llength $tags])"
+        set nutags [llength $tags]
+        set tags $itags
     }
 
     foreach ti $tags {
-	set id [lindex $ti 1]
-	set lk link$linknum
-	incr linknum
-	$ctext tag delete $lk
-	$ctext insert $pos $sep
-	$ctext insert $pos [lindex $ti 0] $lk
-	setlink $id $lk
-	set sep ", "
+        set id [lindex $ti 1]
+        set lk link$linknum
+        incr linknum
+        $ctext tag delete $lk
+        $ctext insert $pos $sep
+        $ctext insert $pos [lindex $ti 0] $lk
+        setlink $id $lk
+        set sep ", "
     }
     $ctext tag add wwrap "$pos linestart" "$pos lineend"
     $ctext conf -state disabled
@@ -7224,11 +7242,11 @@ proc dispneartags {delay} {
     if {$selectedline eq {} || !$showneartags} return
     after cancel dispnexttag
     if {$delay} {
-	after 200 dispnexttag
-	set tagphase -1
+        after 200 dispnexttag
+        set tagphase -1
     } else {
-	after idle dispnexttag
-	set tagphase 0
+        after idle dispnexttag
+        set tagphase 0
     }
 }
 
@@ -7237,33 +7255,33 @@ proc dispnexttag {} {
 
     if {$selectedline eq {} || !$showneartags} return
     switch -- $tagphase {
-	0 {
-	    set dtags [desctags $currentid]
-	    if {$dtags ne {}} {
-		appendrefs precedes $dtags idtags
-	    }
-	}
-	1 {
-	    set atags [anctags $currentid]
-	    if {$atags ne {}} {
-		appendrefs follows $atags idtags
-	    }
-	}
-	2 {
-	    set dheads [descheads $currentid]
-	    if {$dheads ne {}} {
-		if {[appendrefs branch $dheads idheads] > 1
-		    && [$ctext get "branch -3c"] eq "h"} {
-		    # turn "Branch" into "Branches"
-		    $ctext conf -state normal
-		    $ctext insert "branch -2c" "es"
-		    $ctext conf -state disabled
-		}
-	    }
-	}
+        0 {
+            set dtags [desctags $currentid]
+            if {$dtags ne {}} {
+                appendrefs precedes $dtags idtags
+            }
+        }
+        1 {
+            set atags [anctags $currentid]
+            if {$atags ne {}} {
+                appendrefs follows $atags idtags
+            }
+        }
+        2 {
+            set dheads [descheads $currentid]
+            if {$dheads ne {}} {
+                if {[appendrefs branch $dheads idheads] > 1
+                    && [$ctext get "branch -3c"] eq "h"} {
+                    # turn "Branch" into "Branches"
+                    $ctext conf -state normal
+                    $ctext insert "branch -2c" "es"
+                    $ctext conf -state disabled
+                }
+            }
+        }
     }
     if {[incr tagphase] <= 2} {
-	after idle dispnexttag
+        after idle dispnexttag
     }
 }
 
@@ -7273,15 +7291,15 @@ proc make_secsel {id} {
     if {![info exists linehtag($id)]} return
     $canv delete secsel
     set t [eval $canv create rect [$canv bbox $linehtag($id)] -outline {{}} \
-	       -tags secsel -fill [$canv cget -selectbackground]]
+               -tags secsel -fill [$canv cget -selectbackground]]
     $canv lower $t
     $canv2 delete secsel
     set t [eval $canv2 create rect [$canv2 bbox $linentag($id)] -outline {{}} \
-	       -tags secsel -fill [$canv2 cget -selectbackground]]
+               -tags secsel -fill [$canv2 cget -selectbackground]]
     $canv2 lower $t
     $canv3 delete secsel
     set t [eval $canv3 create rect [$canv3 bbox $linedtag($id)] -outline {{}} \
-	       -tags secsel -fill [$canv3 cget -selectbackground]]
+               -tags secsel -fill [$canv3 cget -selectbackground]]
     $canv3 lower $t
 }
 
@@ -7291,7 +7309,7 @@ proc make_idmark {id} {
     if {![info exists linehtag($id)]} return
     $canv delete markid
     set t [eval $canv create rect [$canv bbox $linehtag($id)] \
-	       -tags markid -outline $fgcolor]
+               -tags markid -outline $fgcolor]
     $canv raise $t
 }
 
@@ -7318,7 +7336,7 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
     set selectedline $l
     set currentid $id
     if {$lastscrollrows < $numcommits} {
-	setcanvscroll
+        setcanvscroll
     }
 
     if {$cmitmode ne "patch" && $switch_to_patch} {
@@ -7335,42 +7353,42 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
     set wh [expr {$wbot - $wtop}]
     set newtop $wtop
     if {$ytop < $wtop} {
-	if {$ybot < $wtop} {
-	    set newtop [expr {$y - $wh / 2.0}]
-	} else {
-	    set newtop $ytop
-	    if {$newtop > $wtop - $linespc} {
-		set newtop [expr {$wtop - $linespc}]
-	    }
-	}
+        if {$ybot < $wtop} {
+            set newtop [expr {$y - $wh / 2.0}]
+        } else {
+            set newtop $ytop
+            if {$newtop > $wtop - $linespc} {
+                set newtop [expr {$wtop - $linespc}]
+            }
+        }
     } elseif {$ybot > $wbot} {
-	if {$ytop > $wbot} {
-	    set newtop [expr {$y - $wh / 2.0}]
-	} else {
-	    set newtop [expr {$ybot - $wh}]
-	    if {$newtop < $wtop + $linespc} {
-		set newtop [expr {$wtop + $linespc}]
-	    }
-	}
+        if {$ytop > $wbot} {
+            set newtop [expr {$y - $wh / 2.0}]
+        } else {
+            set newtop [expr {$ybot - $wh}]
+            if {$newtop < $wtop + $linespc} {
+                set newtop [expr {$wtop + $linespc}]
+            }
+        }
     }
     if {$newtop != $wtop} {
-	if {$newtop < 0} {
-	    set newtop 0
-	}
-	allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
-	drawvisible
+        if {$newtop < 0} {
+            set newtop 0
+        }
+        allcanvs yview moveto [expr {$newtop * 1.0 / $ymax}]
+        drawvisible
     }
 
     make_secsel $id
 
     if {$isnew} {
-	addtohistory [list selbyid $id 0] savecmitpos
+        addtohistory [list selbyid $id 0] savecmitpos
     }
 
     $sha1entry delete 0 end
     $sha1entry insert 0 $id
     if {$autoselect} {
-	$sha1entry selection range 0 $autosellen
+        $sha1entry selection range 0 $autosellen
     }
     rhighlight_sel $id
 
@@ -7378,7 +7396,7 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
     clear_ctext
     set linknum 0
     if {![info exists commitinfo($id)]} {
-	getcommit $id
+        getcommit $id
     }
     set info $commitinfo($id)
     set date [formatdate [lindex $info 2]]
@@ -7386,59 +7404,59 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
     set date [formatdate [lindex $info 4]]
     $ctext insert end "[mc "Committer"]: [lindex $info 3]  $date\n"
     if {[info exists idtags($id)]} {
-	$ctext insert end [mc "Tags:"]
-	foreach tag $idtags($id) {
-	    $ctext insert end " $tag"
-	}
-	$ctext insert end "\n"
+        $ctext insert end [mc "Tags:"]
+        foreach tag $idtags($id) {
+            $ctext insert end " $tag"
+        }
+        $ctext insert end "\n"
     }
 
     set headers {}
     set olds $parents($curview,$id)
     if {[llength $olds] > 1} {
-	set np 0
-	foreach p $olds {
-	    if {$np >= $mergemax} {
-		set tag mmax
-	    } else {
-		set tag m$np
-	    }
-	    $ctext insert end "[mc "Parent"]: " $tag
-	    appendwithlinks [commit_descriptor $p] {}
-	    incr np
-	}
+        set np 0
+        foreach p $olds {
+            if {$np >= $mergemax} {
+                set tag mmax
+            } else {
+                set tag m$np
+            }
+            $ctext insert end "[mc "Parent"]: " $tag
+            appendwithlinks [commit_descriptor $p] {}
+            incr np
+        }
     } else {
-	foreach p $olds {
-	    append headers "[mc "Parent"]: [commit_descriptor $p]"
-	}
+        foreach p $olds {
+            append headers "[mc "Parent"]: [commit_descriptor $p]"
+        }
     }
 
     foreach c $children($curview,$id) {
-	append headers "[mc "Child"]:  [commit_descriptor $c]"
+        append headers "[mc "Child"]:  [commit_descriptor $c]"
     }
 
     # make anything that looks like a SHA1 ID be a clickable link
     appendwithlinks $headers {}
     if {$showneartags} {
-	if {![info exists allcommits]} {
-	    getallcommits
-	}
-	$ctext insert end "[mc "Branch"]: "
-	$ctext mark set branch "end -1c"
-	$ctext mark gravity branch left
-	$ctext insert end "\n[mc "Follows"]: "
-	$ctext mark set follows "end -1c"
-	$ctext mark gravity follows left
-	$ctext insert end "\n[mc "Precedes"]: "
-	$ctext mark set precedes "end -1c"
-	$ctext mark gravity precedes left
-	$ctext insert end "\n"
-	dispneartags 1
+        if {![info exists allcommits]} {
+            getallcommits
+        }
+        $ctext insert end "[mc "Branch"]: "
+        $ctext mark set branch "end -1c"
+        $ctext mark gravity branch left
+        $ctext insert end "\n[mc "Follows"]: "
+        $ctext mark set follows "end -1c"
+        $ctext mark gravity follows left
+        $ctext insert end "\n[mc "Precedes"]: "
+        $ctext mark set precedes "end -1c"
+        $ctext mark gravity precedes left
+        $ctext insert end "\n"
+        dispneartags 1
     }
     $ctext insert end "\n"
     set comment [lindex $info 5]
     if {[string first "\r" $comment] >= 0} {
-	set comment [string map {"\r" "\n    "} $comment]
+        set comment [string map {"\r" "\n    "} $comment]
     }
     appendwithlinks $comment {comment}
 
@@ -7449,13 +7467,13 @@ proc selectline {l isnew {desired_loc {}} {switch_to_patch 0}} {
     set jump_to_here $desired_loc
     init_flist [mc "Comments"]
     if {$cmitmode eq "tree"} {
-	gettree $id
+        gettree $id
     } elseif {$vinlinediff($curview) == 1} {
-	showinlinediff $id
+        showinlinediff $id
     } elseif {[llength $olds] <= 1} {
-	startdiff $id
+        startdiff $id
     } else {
-	mergediff $id
+        mergediff $id
     }
 }
 
@@ -7485,14 +7503,14 @@ proc selnextpage {dir} {
 
     set lpp [expr {([winfo height $canv] - 2) / $linespc}]
     if {$lpp < 1} {
-	set lpp 1
+        set lpp 1
     }
     allcanvs yview scroll [expr {$dir * $lpp}] units
     drawvisible
     if {$selectedline eq {}} return
     set l [expr {$selectedline + $dir * $lpp}]
     if {$l < 0} {
-	set l 0
+        set l 0
     } elseif {$l >= $numcommits} {
         set l [expr $numcommits - 1]
     }
@@ -7513,7 +7531,7 @@ proc reselectline {} {
     global selectedline
 
     if {$selectedline ne {}} {
-	selectline $selectedline 0
+        selectline $selectedline 0
     }
 }
 
@@ -7524,20 +7542,20 @@ proc addtohistory {cmd {saveproc {}}} {
     save_position
     set elt [list $curview $cmd $saveproc {}]
     if {$historyindex > 0
-	&& [lindex $history [expr {$historyindex - 1}]] == $elt} {
-	return
+        && [lindex $history [expr {$historyindex - 1}]] == $elt} {
+        return
     }
 
     if {$historyindex < [llength $history]} {
-	set history [lreplace $history $historyindex end $elt]
+        set history [lreplace $history $historyindex end $elt]
     } else {
-	lappend history $elt
+        lappend history $elt
     }
     incr historyindex
     if {$historyindex > 1} {
-	.tf.bar.leftbut conf -state normal
+        .tf.bar.leftbut conf -state normal
     } else {
-	.tf.bar.leftbut conf -state disabled
+        .tf.bar.leftbut conf -state disabled
     }
     .tf.bar.rightbut conf -state disabled
 }
@@ -7550,7 +7568,7 @@ proc save_position {} {
     set hi [expr {$historyindex - 1}]
     set fn [lindex $history $hi 2]
     if {$fn ne {}} {
-	lset history $hi 3 [eval $fn]
+        lset history $hi 3 [eval $fn]
     }
 }
 
@@ -7558,11 +7576,11 @@ proc unset_posvars {} {
     global last_posvars
 
     if {[info exists last_posvars]} {
-	foreach {var val} $last_posvars {
-	    global $var
-	    unset -nocomplain $var
-	}
-	unset last_posvars
+        foreach {var val} $last_posvars {
+            global $var
+            unset -nocomplain $var
+        }
+        unset last_posvars
     }
 }
 
@@ -7573,12 +7591,12 @@ proc godo {elt} {
     set cmd [lindex $elt 1]
     set pv [lindex $elt 3]
     if {$curview != $view} {
-	showview $view
+        showview $view
     }
     unset_posvars
     foreach {var val} $pv {
-	global $var
-	set $var $val
+        global $var
+        set $var $val
     }
     set last_posvars $pv
     eval $cmd
@@ -7589,13 +7607,13 @@ proc goback {} {
     focus .
 
     if {$historyindex > 1} {
-	save_position
-	incr historyindex -1
-	godo [lindex $history [expr {$historyindex - 1}]]
-	.tf.bar.rightbut conf -state normal
+        save_position
+        incr historyindex -1
+        godo [lindex $history [expr {$historyindex - 1}]]
+        .tf.bar.rightbut conf -state normal
     }
     if {$historyindex <= 1} {
-	.tf.bar.leftbut conf -state disabled
+        .tf.bar.leftbut conf -state disabled
     }
 }
 
@@ -7604,14 +7622,14 @@ proc goforw {} {
     focus .
 
     if {$historyindex < [llength $history]} {
-	save_position
-	set cmd [lindex $history $historyindex]
-	incr historyindex
-	godo $cmd
-	.tf.bar.leftbut conf -state normal
+        save_position
+        set cmd [lindex $history $historyindex]
+        incr historyindex
+        godo $cmd
+        .tf.bar.leftbut conf -state normal
     }
     if {$historyindex >= [llength $history]} {
-	.tf.bar.rightbut conf -state disabled
+        .tf.bar.rightbut conf -state disabled
     }
 }
 
@@ -7619,7 +7637,7 @@ proc go_to_parent {i} {
     global parents curview targetid
     set ps $parents($curview,$targetid)
     if {[llength $ps] >= $i} {
-	selbyid [lindex $ps [expr $i - 1]]
+        selbyid [lindex $ps [expr $i - 1]]
     }
 }
 
@@ -7630,25 +7648,25 @@ proc gettree {id} {
     set diffids $id
     unset -nocomplain diffmergeid
     if {![info exists treefilelist($id)]} {
-	if {![info exists treepending]} {
-	    if {$id eq $nullid} {
-		set cmd [list | git ls-files]
-	    } elseif {$id eq $nullid2} {
-		set cmd [list | git ls-files --stage -t]
-	    } else {
-		set cmd [list | git ls-tree -r $id]
-	    }
-	    if {[catch {set gtf [open $cmd r]}]} {
-		return
-	    }
-	    set treepending $id
-	    set treefilelist($id) {}
-	    set treeidlist($id) {}
-	    fconfigure $gtf -blocking 0 -encoding binary
-	    filerun $gtf [list gettreeline $gtf $id]
-	}
+        if {![info exists treepending]} {
+            if {$id eq $nullid} {
+                set cmd [list | git ls-files]
+            } elseif {$id eq $nullid2} {
+                set cmd [list | git ls-files --stage -t]
+            } else {
+                set cmd [list | git ls-tree -r $id]
+            }
+            if {[catch {set gtf [open $cmd r]}]} {
+                return
+            }
+            set treepending $id
+            set treefilelist($id) {}
+            set treeidlist($id) {}
+            fconfigure $gtf -blocking 0 -encoding binary
+            filerun $gtf [list gettreeline $gtf $id]
+        }
     } else {
-	setfilelist $id
+        setfilelist $id
     }
 }
 
@@ -7657,36 +7675,36 @@ proc gettreeline {gtf id} {
 
     set nl 0
     while {[incr nl] <= 1000 && [gets $gtf line] >= 0} {
-	if {$diffids eq $nullid} {
-	    set fname $line
-	} else {
-	    set i [string first "\t" $line]
-	    if {$i < 0} continue
-	    set fname [string range $line [expr {$i+1}] end]
-	    set line [string range $line 0 [expr {$i-1}]]
-	    if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
-	    set sha1 [lindex $line 2]
-	    lappend treeidlist($id) $sha1
-	}
-	if {[string index $fname 0] eq "\""} {
-	    set fname [lindex $fname 0]
-	}
-	set fname [encoding convertfrom $fname]
-	lappend treefilelist($id) $fname
+        if {$diffids eq $nullid} {
+            set fname $line
+        } else {
+            set i [string first "\t" $line]
+            if {$i < 0} continue
+            set fname [string range $line [expr {$i+1}] end]
+            set line [string range $line 0 [expr {$i-1}]]
+            if {$diffids ne $nullid2 && [lindex $line 1] ne "blob"} continue
+            set sha1 [lindex $line 2]
+            lappend treeidlist($id) $sha1
+        }
+        if {[string index $fname 0] eq "\""} {
+            set fname [lindex $fname 0]
+        }
+        set fname [encoding convertfrom $fname]
+        lappend treefilelist($id) $fname
     }
     if {![eof $gtf]} {
-	return [expr {$nl >= 1000? 2: 1}]
+        return [expr {$nl >= 1000? 2: 1}]
     }
     close $gtf
     unset treepending
     if {$cmitmode ne "tree"} {
-	if {![info exists diffmergeid]} {
-	    gettreediffs $diffids
-	}
+        if {![info exists diffmergeid]} {
+            gettreediffs $diffids
+        }
     } elseif {$id ne $diffids} {
-	gettree $diffids
+        gettree $diffids
     } else {
-	setfilelist $id
+        setfilelist $id
     }
     return 0
 }
@@ -7698,20 +7716,20 @@ proc showfile {f} {
 
     set i [lsearch -exact $treefilelist($diffids) $f]
     if {$i < 0} {
-	puts "oops, $f not in list for id $diffids"
-	return
+        puts "oops, $f not in list for id $diffids"
+        return
     }
     if {$diffids eq $nullid} {
-	if {[catch {set bf [open $f r]} err]} {
-	    puts "oops, can't read $f: $err"
-	    return
-	}
+        if {[catch {set bf [open $f r]} err]} {
+            puts "oops, can't read $f: $err"
+            return
+        }
     } else {
-	set blob [lindex $treeidlist($diffids) $i]
-	if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
-	    puts "oops, error reading blob $blob: $err"
-	    return
-	}
+        set blob [lindex $treeidlist($diffids) $i]
+        if {[catch {set bf [open [concat | git cat-file blob $blob] r]} err]} {
+            puts "oops, error reading blob $blob: $err"
+            return
+        }
     }
     fconfigure $bf -blocking 0 -encoding [get_path_encoding $f]
     filerun $bf [list getblobline $bf $diffids]
@@ -7730,28 +7748,28 @@ proc getblobline {bf id} {
     global diffids cmitmode ctext
 
     if {$id ne $diffids || $cmitmode ne "tree"} {
-	catch {close $bf}
-	return 0
+        catch {close $bf}
+        return 0
     }
     $ctext config -state normal
     set nl 0
     while {[incr nl] <= 1000 && [gets $bf line] >= 0} {
-	$ctext insert end "$line\n"
+        $ctext insert end "$line\n"
     }
     if {[eof $bf]} {
-	global jump_to_here ctext_file_names commentend
-
-	# delete last newline
-	$ctext delete "end - 2c" "end - 1c"
-	close $bf
-	if {$jump_to_here ne {} &&
-	    [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} {
-	    set lnum [expr {[lindex $jump_to_here 1] +
-			    [lindex [split $commentend .] 0]}]
-	    mark_ctext_line $lnum
-	}
-	$ctext config -state disabled
-	return 0
+        global jump_to_here ctext_file_names commentend
+
+        # delete last newline
+        $ctext delete "end - 2c" "end - 1c"
+        close $bf
+        if {$jump_to_here ne {} &&
+            [lindex $jump_to_here 0] eq [lindex $ctext_file_names 0]} {
+            set lnum [expr {[lindex $jump_to_here 1] +
+                            [lindex [split $commentend .] 0]}]
+            mark_ctext_line $lnum
+        }
+        $ctext config -state disabled
+        return 0
     }
     $ctext config -state disabled
     return [expr {$nl >= 1000? 2: 1}]
@@ -7786,13 +7804,13 @@ proc startdiff {ids} {
     set diffids $ids
     unset -nocomplain diffmergeid
     if {![info exists treediffs($ids)] ||
-	[lsearch -exact $ids $nullid] >= 0 ||
-	[lsearch -exact $ids $nullid2] >= 0} {
-	if {![info exists treepending]} {
-	    gettreediffs $ids
-	}
+        [lsearch -exact $ids $nullid] >= 0 ||
+        [lsearch -exact $ids $nullid2] >= 0} {
+        if {![info exists treepending]} {
+            gettreediffs $ids
+        }
     } else {
-	addtocflist $ids
+        addtocflist $ids
     }
 }
 
@@ -7809,13 +7827,13 @@ proc showinlinediff {ids} {
 
     set inhdr 0
     foreach line $difflines {
-	if {![string compare -length 5 "diff " $line]} {
-	    set inhdr 1
-	} elseif {$inhdr && ![string compare -length 4 "+++ " $line]} {
-	    # offset also accounts for the b/ prefix
-	    lappend treediff [string range $line 6 end]
-	    set inhdr 0
-	}
+        if {![string compare -length 5 "diff " $line]} {
+            set inhdr 1
+        } elseif {$inhdr && ![string compare -length 4 "+++ " $line]} {
+            # offset also accounts for the b/ prefix
+            lappend treediff [string range $line 6 end]
+            set inhdr 0
+        }
     }
 
     set treediffs($ids) $treediff
@@ -7823,7 +7841,7 @@ proc showinlinediff {ids} {
 
     $ctext conf -state normal
     foreach line $difflines {
-	parseblobdiffline $ids $line
+        parseblobdiffline $ids $line
     }
     maybe_scroll_ctext 1
     $ctext conf -state disabled
@@ -7834,11 +7852,11 @@ proc showinlinediff {ids} {
 proc path_filter {filter name} {
     set worktree [gitworktree]
     foreach p $filter {
-	set fq_p [file normalize $p]
-	set fq_n [file normalize [file join $worktree $name]]
-	if {[string match [file normalize $fq_p]* $fq_n]} {
-	    return 1
-	}
+        set fq_p [file normalize $p]
+        set fq_n [file normalize [file join $worktree $name]]
+        if {[string match [file normalize $fq_p]* $fq_n]} {
+            return 1
+        }
     }
     return 0
 }
@@ -7856,42 +7874,42 @@ proc diffcmd {ids flags} {
     set i [lsearch -exact $ids $nullid]
     set j [lsearch -exact $ids $nullid2]
     if {$i >= 0} {
-	if {[llength $ids] > 1 && $j < 0} {
-	    # comparing working directory with some specific revision
-	    set cmd [concat | git diff-index $flags]
-	    if {$i == 0} {
-		lappend cmd -R [lindex $ids 1]
-	    } else {
-		lappend cmd [lindex $ids 0]
-	    }
-	} else {
-	    # comparing working directory with index
-	    set cmd [concat | git diff-files $flags]
-	    if {$j == 1} {
-		lappend cmd -R
-	    }
-	}
+        if {[llength $ids] > 1 && $j < 0} {
+            # comparing working directory with some specific revision
+            set cmd [concat | git diff-index $flags]
+            if {$i == 0} {
+                lappend cmd -R [lindex $ids 1]
+            } else {
+                lappend cmd [lindex $ids 0]
+            }
+        } else {
+            # comparing working directory with index
+            set cmd [concat | git diff-files $flags]
+            if {$j == 1} {
+                lappend cmd -R
+            }
+        }
     } elseif {$j >= 0} {
-	if {[package vcompare $git_version "1.7.2"] >= 0} {
-	    set flags "$flags --ignore-submodules=dirty"
-	}
-	set cmd [concat | git diff-index --cached $flags]
-	if {[llength $ids] > 1} {
-	    # comparing index with specific revision
-	    if {$j == 0} {
-		lappend cmd -R [lindex $ids 1]
-	    } else {
-		lappend cmd [lindex $ids 0]
-	    }
-	} else {
-	    # comparing index with HEAD
-	    lappend cmd HEAD
-	}
+        if {[package vcompare $git_version "1.7.2"] >= 0} {
+            set flags "$flags --ignore-submodules=dirty"
+        }
+        set cmd [concat | git diff-index --cached $flags]
+        if {[llength $ids] > 1} {
+            # comparing index with specific revision
+            if {$j == 0} {
+                lappend cmd -R [lindex $ids 1]
+            } else {
+                lappend cmd [lindex $ids 0]
+            }
+        } else {
+            # comparing index with HEAD
+            lappend cmd HEAD
+        }
     } else {
-	if {$log_showroot} {
-	    lappend flags --root
-	}
-	set cmd [concat | git diff-tree -r $flags $ids]
+        if {$log_showroot} {
+            lappend flags --root
+        }
+        set cmd [concat | git diff-tree -r $flags $ids]
     }
     return $cmd
 }
@@ -7901,7 +7919,7 @@ proc gettreediffs {ids} {
 
     set cmd [diffcmd $ids {--no-commit-id}]
     if {$limitdiffs && $vfilelimit($curview) ne {}} {
-	    set cmd [concat $cmd -- $vfilelimit($curview)]
+            set cmd [concat $cmd -- $vfilelimit($curview)]
     }
     if {[catch {set gdtf [open $cmd r]}]} return
 
@@ -7919,44 +7937,44 @@ proc gettreediffline {gdtf ids} {
     set sublist {}
     set max 1000
     if {$perfile_attrs} {
-	# cache_gitattr is slow, and even slower on win32 where we
-	# have to invoke it for only about 30 paths at a time
-	set max 500
-	if {[tk windowingsystem] == "win32"} {
-	    set max 120
-	}
+        # cache_gitattr is slow, and even slower on win32 where we
+        # have to invoke it for only about 30 paths at a time
+        set max 500
+        if {[tk windowingsystem] == "win32"} {
+            set max 120
+        }
     }
     while {[incr nr] <= $max && [gets $gdtf line] >= 0} {
-	set i [string first "\t" $line]
-	if {$i >= 0} {
-	    set file [string range $line [expr {$i+1}] end]
-	    if {[string index $file 0] eq "\""} {
-		set file [lindex $file 0]
-	    }
-	    set file [encoding convertfrom $file]
-	    if {$file ne [lindex $treediff end]} {
-		lappend treediff $file
-		lappend sublist $file
-	    }
-	}
+        set i [string first "\t" $line]
+        if {$i >= 0} {
+            set file [string range $line [expr {$i+1}] end]
+            if {[string index $file 0] eq "\""} {
+                set file [lindex $file 0]
+            }
+            set file [encoding convertfrom $file]
+            if {$file ne [lindex $treediff end]} {
+                lappend treediff $file
+                lappend sublist $file
+            }
+        }
     }
     if {$perfile_attrs} {
-	cache_gitattr encoding $sublist
+        cache_gitattr encoding $sublist
     }
     if {![eof $gdtf]} {
-	return [expr {$nr >= $max? 2: 1}]
+        return [expr {$nr >= $max? 2: 1}]
     }
     close $gdtf
     set treediffs($ids) $treediff
     unset treepending
     if {$cmitmode eq "tree" && [llength $diffids] == 1} {
-	gettree $diffids
+        gettree $diffids
     } elseif {$ids != $diffids} {
-	if {![info exists diffmergeid]} {
-	    gettreediffs $diffids
-	}
+        if {![info exists diffmergeid]} {
+            gettreediffs $diffids
+        }
     } else {
-	addtocflist $ids
+        addtocflist $ids
     }
     return 0
 }
@@ -7970,10 +7988,10 @@ proc diffcontextchange {n1 n2 op} {
     global diffcontextstring diffcontext
 
     if {[string is integer -strict $diffcontextstring]} {
-	if {$diffcontextstring >= 0} {
-	    set diffcontext $diffcontextstring
-	    reselectline
-	}
+        if {$diffcontextstring >= 0} {
+            set diffcontext $diffcontextstring
+            reselectline
+        }
     }
 }
 
@@ -8007,25 +8025,25 @@ proc getblobdiffs {ids} {
 
     set textconv {}
     if {[package vcompare $git_version "1.6.1"] >= 0} {
-	set textconv "--textconv"
+        set textconv "--textconv"
     }
     set submodule {}
     if {[package vcompare $git_version "1.6.6"] >= 0} {
-	set submodule "--submodule"
+        set submodule "--submodule"
     }
     set cmd [diffcmd $ids "-p $textconv $submodule  -C --cc --no-commit-id -U$diffcontext"]
     if {$ignorespace} {
-	append cmd " -w"
+        append cmd " -w"
     }
     if {$worddiff ne [mc "Line diff"]} {
-	append cmd " --word-diff=porcelain"
+        append cmd " --word-diff=porcelain"
     }
     if {$limitdiffs && $vfilelimit($curview) ne {}} {
-	set cmd [concat $cmd -- $vfilelimit($curview)]
+        set cmd [concat $cmd -- $vfilelimit($curview)]
     }
     if {[catch {set bdf [open $cmd r]} err]} {
-	error_popup [mc "Error getting diffs: %s" $err]
-	return
+        error_popup [mc "Error getting diffs: %s" $err]
+        return
     }
     fconfigure $bdf -blocking 0 -encoding binary -eofchar {}
     set blobdifffd($ids) $bdf
@@ -8037,7 +8055,7 @@ proc savecmitpos {} {
     global ctext cmitmode
 
     if {$cmitmode eq "tree"} {
-	return {}
+        return {}
     }
     return [list target_scrollpos [$ctext index @0,0]]
 }
@@ -8053,9 +8071,9 @@ proc maybe_scroll_ctext {ateof} {
 
     if {![info exists target_scrollpos]} return
     if {!$ateof} {
-	set nlines [expr {[winfo height $ctext]
-			  / [font metrics textfont -linespace]}]
-	if {[$ctext compare "$target_scrollpos + $nlines lines" <= end]} return
+        set nlines [expr {[winfo height $ctext]
+                          / [font metrics textfont -linespace]}]
+        if {[$ctext compare "$target_scrollpos + $nlines lines" <= end]} return
     }
     $ctext yview $target_scrollpos
     unset target_scrollpos
@@ -8065,12 +8083,12 @@ proc setinlist {var i val} {
     global $var
 
     while {[llength [set $var]] < $i} {
-	lappend $var {}
+        lappend $var {}
     }
     if {[llength [set $var]] == $i} {
-	lappend $var $val
+        lappend $var $val
     } else {
-	lset $var $i $val
+        lset $var $i $val
     }
 }
 
@@ -8082,7 +8100,7 @@ proc makediffhdr {fname ids} {
     set diffencoding [get_path_encoding $fname]
     set i [lsearch -exact $treediffs($ids) $fname]
     if {$i >= 0} {
-	setinlist difffilestart $i $curdiffstart
+        setinlist difffilestart $i $curdiffstart
     }
     lset ctext_file_names end $fname
     set l [expr {(78 - [string length $fname]) / 2}]
@@ -8090,7 +8108,7 @@ proc makediffhdr {fname ids} {
     $ctext insert $curdiffstart "$pad $fname $pad" filesep
     set targetline {}
     if {$jump_to_here ne {} && [lindex $jump_to_here 0] eq $fname} {
-	set targetline [lindex $jump_to_here 1]
+        set targetline [lindex $jump_to_here 1]
     }
     set diffline 0
 }
@@ -8098,7 +8116,7 @@ proc makediffhdr {fname ids} {
 proc blobdiffmaybeseehere {ateof} {
     global diffseehere
     if {$diffseehere >= 0} {
-	mark_ctext_line [lindex [split $diffseehere .] 0]
+        mark_ctext_line [lindex [split $diffseehere .] 0]
     }
     maybe_scroll_ctext $ateof
 }
@@ -8110,22 +8128,22 @@ proc getblobdiffline {bdf ids} {
     set nr 0
     $ctext conf -state normal
     while {[incr nr] <= 1000 && [gets $bdf line] >= 0} {
-	if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
-	    # Older diff read. Abort it.
-	    catch {close $bdf}
-	    if {$ids != $diffids} {
-		array unset blobdifffd $ids
-	    }
-	    return 0
-	}
-	parseblobdiffline $ids $line
+        if {$ids != $diffids || $bdf != $blobdifffd($ids)} {
+            # Older diff read. Abort it.
+            catch {close $bdf}
+            if {$ids != $diffids} {
+                array unset blobdifffd $ids
+            }
+            return 0
+        }
+        parseblobdiffline $ids $line
     }
     $ctext conf -state disabled
     blobdiffmaybeseehere [eof $bdf]
     if {[eof $bdf]} {
-	catch {close $bdf}
-	array unset blobdifffd $ids
-	return 0
+        catch {close $bdf}
+        array unset blobdifffd $ids
+        return 0
     }
     return [expr {$nr >= 1000? 2: 1}]
 }
@@ -8139,199 +8157,199 @@ proc parseblobdiffline {ids line} {
     global worddiff diffseehere
 
     if {![string compare -length 5 "diff " $line]} {
-	if {![regexp {^diff (--cc|--git) } $line m type]} {
-	    set line [encoding convertfrom $line]
-	    $ctext insert end "$line\n" hunksep
-	    continue
-	}
-	# start of a new file
-	set diffinhdr 1
-	$ctext insert end "\n"
-	set curdiffstart [$ctext index "end - 1c"]
-	lappend ctext_file_names ""
-	lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
-	$ctext insert end "\n" filesep
-
-	if {$type eq "--cc"} {
-	    # start of a new file in a merge diff
-	    set fname [string range $line 10 end]
-	    if {[lsearch -exact $treediffs($ids) $fname] < 0} {
-		lappend treediffs($ids) $fname
-		add_flist [list $fname]
-	    }
-
-	} else {
-	    set line [string range $line 11 end]
-	    # If the name hasn't changed the length will be odd,
-	    # the middle char will be a space, and the two bits either
-	    # side will be a/name and b/name, or "a/name" and "b/name".
-	    # If the name has changed we'll get "rename from" and
-	    # "rename to" or "copy from" and "copy to" lines following
-	    # this, and we'll use them to get the filenames.
-	    # This complexity is necessary because spaces in the
-	    # filename(s) don't get escaped.
-	    set l [string length $line]
-	    set i [expr {$l / 2}]
-	    if {!(($l & 1) && [string index $line $i] eq " " &&
-		  [string range $line 2 [expr {$i - 1}]] eq \
-		      [string range $line [expr {$i + 3}] end])} {
-		return
-	    }
-	    # unescape if quoted and chop off the a/ from the front
-	    if {[string index $line 0] eq "\""} {
-		set fname [string range [lindex $line 0] 2 end]
-	    } else {
-		set fname [string range $line 2 [expr {$i - 1}]]
-	    }
-	}
-	makediffhdr $fname $ids
+        if {![regexp {^diff (--cc|--git) } $line m type]} {
+            set line [encoding convertfrom $line]
+            $ctext insert end "$line\n" hunksep
+            continue
+        }
+        # start of a new file
+        set diffinhdr 1
+        set currdiffsubmod ""
+
+        $ctext insert end "\n"
+        set curdiffstart [$ctext index "end - 1c"]
+        lappend ctext_file_names ""
+        lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
+        $ctext insert end "\n" filesep
+
+        if {$type eq "--cc"} {
+            # start of a new file in a merge diff
+            set fname [string range $line 10 end]
+            if {[lsearch -exact $treediffs($ids) $fname] < 0} {
+                lappend treediffs($ids) $fname
+                add_flist [list $fname]
+            }
+
+        } else {
+            set line [string range $line 11 end]
+            # If the name hasn't changed the length will be odd,
+            # the middle char will be a space, and the two bits either
+            # side will be a/name and b/name, or "a/name" and "b/name".
+            # If the name has changed we'll get "rename from" and
+            # "rename to" or "copy from" and "copy to" lines following
+            # this, and we'll use them to get the filenames.
+            # This complexity is necessary because spaces in the
+            # filename(s) don't get escaped.
+            set l [string length $line]
+            set i [expr {$l / 2}]
+            if {!(($l & 1) && [string index $line $i] eq " " &&
+                  [string range $line 2 [expr {$i - 1}]] eq \
+                      [string range $line [expr {$i + 3}] end])} {
+                return
+            }
+            # unescape if quoted and chop off the a/ from the front
+            if {[string index $line 0] eq "\""} {
+                set fname [string range [lindex $line 0] 2 end]
+            } else {
+                set fname [string range $line 2 [expr {$i - 1}]]
+            }
+        }
+        makediffhdr $fname $ids
 
     } elseif {![string compare -length 16 "* Unmerged path " $line]} {
-	set fname [encoding convertfrom [string range $line 16 end]]
-	$ctext insert end "\n"
-	set curdiffstart [$ctext index "end - 1c"]
-	lappend ctext_file_names $fname
-	lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
-	$ctext insert end "$line\n" filesep
-	set i [lsearch -exact $treediffs($ids) $fname]
-	if {$i >= 0} {
-	    setinlist difffilestart $i $curdiffstart
-	}
+        set fname [encoding convertfrom [string range $line 16 end]]
+        $ctext insert end "\n"
+        set curdiffstart [$ctext index "end - 1c"]
+        lappend ctext_file_names $fname
+        lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
+        $ctext insert end "$line\n" filesep
+        set i [lsearch -exact $treediffs($ids) $fname]
+        if {$i >= 0} {
+            setinlist difffilestart $i $curdiffstart
+        }
 
     } elseif {![string compare -length 2 "@@" $line]} {
-	regexp {^@@+} $line ats
-	set line [encoding convertfrom $diffencoding $line]
-	$ctext insert end "$line\n" hunksep
-	if {[regexp { \+(\d+),\d+ @@} $line m nl]} {
-	    set diffline $nl
-	}
-	set diffnparents [expr {[string length $ats] - 1}]
-	set diffinhdr 0
+        regexp {^@@+} $line ats
+        set line [encoding convertfrom $diffencoding $line]
+        $ctext insert end "$line\n" hunksep
+        if {[regexp { \+(\d+),\d+ @@} $line m nl]} {
+            set diffline $nl
+        }
+        set diffnparents [expr {[string length $ats] - 1}]
+        set diffinhdr 0
 
     } elseif {![string compare -length 10 "Submodule " $line]} {
-	# start of a new submodule
-	if {[regexp -indices "\[0-9a-f\]+\\.\\." $line nameend]} {
-	    set fname [string range $line 10 [expr [lindex $nameend 0] - 2]]
-	} else {
-	    set fname [string range $line 10 [expr [string first "contains " $line] - 2]]
-	}
-	if {$currdiffsubmod != $fname} {
-	    $ctext insert end "\n";     # Add newline after commit message
-	}
-	set curdiffstart [$ctext index "end - 1c"]
-	lappend ctext_file_names ""
-	if {$currdiffsubmod != $fname} {
-	    lappend ctext_file_lines $fname
-	    makediffhdr $fname $ids
-	    set currdiffsubmod $fname
-	    $ctext insert end "\n$line\n" filesep
-	} else {
-	    $ctext insert end "$line\n" filesep
-	}
+        # start of a new submodule
+        if {[regexp -indices "\[0-9a-f\]+\\.\\." $line nameend]} {
+            set fname [string range $line 10 [expr [lindex $nameend 0] - 2]]
+        } else {
+            set fname [string range $line 10 [expr [string first "contains " $line] - 2]]
+        }
+        if {$currdiffsubmod != $fname} {
+            $ctext insert end "\n";     # Add newline after commit message
+        }
+        if {$currdiffsubmod != $fname} {
+            set curdiffstart [$ctext index "end - 1c"]
+            lappend ctext_file_names ""
+            lappend ctext_file_lines [lindex [split $curdiffstart "."] 0]
+            makediffhdr $fname $ids
+            set currdiffsubmod $fname
+            $ctext insert end "\n$line\n" filesep
+        } else {
+            $ctext insert end "$line\n" filesep
+        }
     } elseif {$currdiffsubmod != "" && ![string compare -length 3 "  >" $line]} {
-	set $currdiffsubmod ""
-	set line [encoding convertfrom $diffencoding $line]
-	$ctext insert end "$line\n" dresult
+        set line [encoding convertfrom $diffencoding $line]
+        $ctext insert end "$line\n" dresult
     } elseif {$currdiffsubmod != "" && ![string compare -length 3 "  <" $line]} {
-	set $currdiffsubmod ""
-	set line [encoding convertfrom $diffencoding $line]
-	$ctext insert end "$line\n" d0
+        set line [encoding convertfrom $diffencoding $line]
+        $ctext insert end "$line\n" d0
     } elseif {$diffinhdr} {
-	if {![string compare -length 12 "rename from " $line]} {
-	    set fname [string range $line [expr 6 + [string first " from " $line] ] end]
-	    if {[string index $fname 0] eq "\""} {
-		set fname [lindex $fname 0]
-	    }
-	    set fname [encoding convertfrom $fname]
-	    set i [lsearch -exact $treediffs($ids) $fname]
-	    if {$i >= 0} {
-		setinlist difffilestart $i $curdiffstart
-	    }
-	} elseif {![string compare -length 10 $line "rename to "] ||
-		  ![string compare -length 8 $line "copy to "]} {
-	    set fname [string range $line [expr 4 + [string first " to " $line] ] end]
-	    if {[string index $fname 0] eq "\""} {
-		set fname [lindex $fname 0]
-	    }
-	    makediffhdr $fname $ids
-	} elseif {[string compare -length 3 $line "---"] == 0} {
-	    # do nothing
-	    return
-	} elseif {[string compare -length 3 $line "+++"] == 0} {
-	    set diffinhdr 0
-	    return
-	}
-	$ctext insert end "$line\n" filesep
+        if {![string compare -length 12 "rename from " $line]} {
+            set fname [string range $line [expr 6 + [string first " from " $line] ] end]
+            if {[string index $fname 0] eq "\""} {
+                set fname [lindex $fname 0]
+            }
+            set fname [encoding convertfrom $fname]
+            set i [lsearch -exact $treediffs($ids) $fname]
+            if {$i >= 0} {
+                setinlist difffilestart $i $curdiffstart
+            }
+        } elseif {![string compare -length 10 $line "rename to "] ||
+                  ![string compare -length 8 $line "copy to "]} {
+            set fname [string range $line [expr 4 + [string first " to " $line] ] end]
+            if {[string index $fname 0] eq "\""} {
+                set fname [lindex $fname 0]
+            }
+            makediffhdr $fname $ids
+        } elseif {[string compare -length 3 $line "---"] == 0} {
+            # do nothing
+            return
+        } elseif {[string compare -length 3 $line "+++"] == 0} {
+            set diffinhdr 0
+            return
+        }
+        $ctext insert end "$line\n" filesep
 
     } else {
-	set line [string map {\x1A ^Z} \
-		      [encoding convertfrom $diffencoding $line]]
-	# parse the prefix - one ' ', '-' or '+' for each parent
-	set prefix [string range $line 0 [expr {$diffnparents - 1}]]
-	set tag [expr {$diffnparents > 1? "m": "d"}]
-	set dowords [expr {$worddiff ne [mc "Line diff"] && $diffnparents == 1}]
-	set words_pre_markup ""
-	set words_post_markup ""
-	if {[string trim $prefix " -+"] eq {}} {
-	    # prefix only has " ", "-" and "+" in it: normal diff line
-	    set num [string first "-" $prefix]
-	    if {$dowords} {
-		set line [string range $line 1 end]
-	    }
-	    if {$num >= 0} {
-		# removed line, first parent with line is $num
-		if {$num >= $mergemax} {
-		    set num "max"
-		}
-		if {$dowords && $worddiff eq [mc "Markup words"]} {
-		    $ctext insert end "\[-$line-\]" $tag$num
-		} else {
-		    $ctext insert end "$line" $tag$num
-		}
-		if {!$dowords} {
-		    $ctext insert end "\n" $tag$num
-		}
-	    } else {
-		set tags {}
-		if {[string first "+" $prefix] >= 0} {
-		    # added line
-		    lappend tags ${tag}result
-		    if {$diffnparents > 1} {
-			set num [string first " " $prefix]
-			if {$num >= 0} {
-			    if {$num >= $mergemax} {
-				set num "max"
-			    }
-			    lappend tags m$num
-			}
-		    }
-		    set words_pre_markup "{+"
-		    set words_post_markup "+}"
-		}
-		if {$targetline ne {}} {
-		    if {$diffline == $targetline} {
-			set diffseehere [$ctext index "end - 1 chars"]
-			set targetline {}
-		    } else {
-			incr diffline
-		    }
-		}
-		if {$dowords && $worddiff eq [mc "Markup words"]} {
-		    $ctext insert end "$words_pre_markup$line$words_post_markup" $tags
-		} else {
-		    $ctext insert end "$line" $tags
-		}
-		if {!$dowords} {
-		    $ctext insert end "\n" $tags
-		}
-	    }
-	} elseif {$dowords && $prefix eq "~"} {
-	    $ctext insert end "\n" {}
-	} else {
-	    # "\ No newline at end of file",
-	    # or something else we don't recognize
-	    $ctext insert end "$line\n" hunksep
-	}
+        set line [string map {\x1A ^Z} \
+                      [encoding convertfrom $diffencoding $line]]
+        # parse the prefix - one ' ', '-' or '+' for each parent
+        set prefix [string range $line 0 [expr {$diffnparents - 1}]]
+        set tag [expr {$diffnparents > 1? "m": "d"}]
+        set dowords [expr {$worddiff ne [mc "Line diff"] && $diffnparents == 1}]
+        set words_pre_markup ""
+        set words_post_markup ""
+        if {[string trim $prefix " -+"] eq {}} {
+            # prefix only has " ", "-" and "+" in it: normal diff line
+            set num [string first "-" $prefix]
+            if {$dowords} {
+                set line [string range $line 1 end]
+            }
+            if {$num >= 0} {
+                # removed line, first parent with line is $num
+                if {$num >= $mergemax} {
+                    set num "max"
+                }
+                if {$dowords && $worddiff eq [mc "Markup words"]} {
+                    $ctext insert end "\[-$line-\]" $tag$num
+                } else {
+                    $ctext insert end "$line" $tag$num
+                }
+                if {!$dowords} {
+                    $ctext insert end "\n" $tag$num
+                }
+            } else {
+                set tags {}
+                if {[string first "+" $prefix] >= 0} {
+                    # added line
+                    lappend tags ${tag}result
+                    if {$diffnparents > 1} {
+                        set num [string first " " $prefix]
+                        if {$num >= 0} {
+                            if {$num >= $mergemax} {
+                                set num "max"
+                            }
+                            lappend tags m$num
+                        }
+                    }
+                    set words_pre_markup "{+"
+                    set words_post_markup "+}"
+                }
+                if {$targetline ne {}} {
+                    if {$diffline == $targetline} {
+                        set diffseehere [$ctext index "end - 1 chars"]
+                        set targetline {}
+                    } else {
+                        incr diffline
+                    }
+                }
+                if {$dowords && $worddiff eq [mc "Markup words"]} {
+                    $ctext insert end "$words_pre_markup$line$words_post_markup" $tags
+                } else {
+                    $ctext insert end "$line" $tags
+                }
+                if {!$dowords} {
+                    $ctext insert end "\n" $tags
+                }
+            }
+        } elseif {$dowords && $prefix eq "~"} {
+            $ctext insert end "\n" {}
+        } else {
+            # "\ No newline at end of file",
+            # or something else we don't recognize
+            $ctext insert end "$line\n" hunksep
+        }
     }
 }
 
@@ -8361,9 +8379,9 @@ proc highlightfile_for_scrollpos {topidx} {
 
     set top [lindex [split $topidx .] 0]
     if {$difffilestart eq {} || $top < [lindex $difffilestart 0]} {
-	highlightfile 0
+        highlightfile 0
     } else {
-	highlightfile [expr {[bsearch $difffilestart $top] + 2}]
+        highlightfile [expr {[bsearch $difffilestart $top] + 2}]
     }
 }
 
@@ -8374,11 +8392,11 @@ proc prevfile {} {
     set prev 0.0
     set here [$ctext index @0,0]
     foreach loc $difffilestart {
-	if {[$ctext compare $loc >= $here]} {
-	    $ctext yview $prev
-	    return
-	}
-	set prev $loc
+        if {[$ctext compare $loc >= $here]} {
+            $ctext yview $prev
+            return
+        }
+        set prev $loc
     }
     $ctext yview $prev
 }
@@ -8389,10 +8407,10 @@ proc nextfile {} {
     if {$cmitmode eq "tree"} return
     set here [$ctext index @0,0]
     foreach loc $difffilestart {
-	if {[$ctext compare $loc > $here]} {
-	    $ctext yview $loc
-	    return
-	}
+        if {[$ctext compare $loc > $here]} {
+            $ctext yview $loc
+            return
+        }
     }
 }
 
@@ -8403,14 +8421,14 @@ proc clear_ctext {{first 1.0}} {
 
     set l [lindex [split $first .] 0]
     if {![info exists smarktop] || [$ctext compare $first < $smarktop.0]} {
-	set smarktop $l
+        set smarktop $l
     }
     if {![info exists smarkbot] || [$ctext compare $first < $smarkbot.0]} {
-	set smarkbot $l
+        set smarkbot $l
     }
     $ctext delete $first end
     if {$first eq "1.0"} {
-	unset -nocomplain pendinglinks
+        unset -nocomplain pendinglinks
     }
     set ctext_file_names {}
     set ctext_file_lines {}
@@ -8420,16 +8438,16 @@ proc settabs {{firstab {}}} {
     global firsttabstop tabstop ctext have_tk85
 
     if {$firstab ne {} && $have_tk85} {
-	set firsttabstop $firstab
+        set firsttabstop $firstab
     }
     set w [font measure textfont "0"]
     if {$firsttabstop != 0} {
-	$ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
-			       [expr {($firsttabstop + 2 * $tabstop) * $w}]]
+        $ctext conf -tabs [list [expr {($firsttabstop + $tabstop) * $w}] \
+                               [expr {($firsttabstop + 2 * $tabstop) * $w}]]
     } elseif {$have_tk85 || $tabstop != 8} {
-	$ctext conf -tabs [expr {$tabstop * $w}]
+        $ctext conf -tabs [expr {$tabstop * $w}]
     } else {
-	$ctext conf -tabs {}
+        $ctext conf -tabs {}
     }
 }
 
@@ -8437,26 +8455,26 @@ proc incrsearch {name ix op} {
     global ctext searchstring searchdirn
 
     if {[catch {$ctext index anchor}]} {
-	# no anchor set, use start of selection, or of visible area
-	set sel [$ctext tag ranges sel]
-	if {$sel ne {}} {
-	    $ctext mark set anchor [lindex $sel 0]
-	} elseif {$searchdirn eq "-forwards"} {
-	    $ctext mark set anchor @0,0
-	} else {
-	    $ctext mark set anchor @0,[winfo height $ctext]
-	}
+        # no anchor set, use start of selection, or of visible area
+        set sel [$ctext tag ranges sel]
+        if {$sel ne {}} {
+            $ctext mark set anchor [lindex $sel 0]
+        } elseif {$searchdirn eq "-forwards"} {
+            $ctext mark set anchor @0,0
+        } else {
+            $ctext mark set anchor @0,[winfo height $ctext]
+        }
     }
     if {$searchstring ne {}} {
-	set here [$ctext search -count mlen $searchdirn -- $searchstring anchor]
-	if {$here ne {}} {
-	    $ctext see $here
-	    set mend "$here + $mlen c"
-	    $ctext tag remove sel 1.0 end
-	    $ctext tag add sel $here $mend
-	    suppress_highlighting_file_for_current_scrollpos
-	    highlightfile_for_scrollpos $here
-	}
+        set here [$ctext search -count mlen $searchdirn -- $searchstring anchor]
+        if {$here ne {}} {
+            $ctext see $here
+            set mend "$here + $mlen c"
+            $ctext tag remove sel 1.0 end
+            $ctext tag add sel $here $mend
+            suppress_highlighting_file_for_current_scrollpos
+            highlightfile_for_scrollpos $here
+        }
     }
     rehighlight_search_results
 }
@@ -8468,25 +8486,25 @@ proc dosearch {} {
     $sstring icursor end
     set searchdirn -forwards
     if {$searchstring ne {}} {
-	set sel [$ctext tag ranges sel]
-	if {$sel ne {}} {
-	    set start "[lindex $sel 0] + 1c"
-	} elseif {[catch {set start [$ctext index anchor]}]} {
-	    set start "@0,0"
-	}
-	set match [$ctext search -count mlen -- $searchstring $start]
-	$ctext tag remove sel 1.0 end
-	if {$match eq {}} {
-	    bell
-	    return
-	}
-	$ctext see $match
-	suppress_highlighting_file_for_current_scrollpos
-	highlightfile_for_scrollpos $match
-	set mend "$match + $mlen c"
-	$ctext tag add sel $match $mend
-	$ctext mark unset anchor
-	rehighlight_search_results
+        set sel [$ctext tag ranges sel]
+        if {$sel ne {}} {
+            set start "[lindex $sel 0] + 1c"
+        } elseif {[catch {set start [$ctext index anchor]}]} {
+            set start "@0,0"
+        }
+        set match [$ctext search -count mlen -- $searchstring $start]
+        $ctext tag remove sel 1.0 end
+        if {$match eq {}} {
+            bell
+            return
+        }
+        $ctext see $match
+        suppress_highlighting_file_for_current_scrollpos
+        highlightfile_for_scrollpos $match
+        set mend "$match + $mlen c"
+        $ctext tag add sel $match $mend
+        $ctext mark unset anchor
+        rehighlight_search_results
     }
 }
 
@@ -8497,25 +8515,25 @@ proc dosearchback {} {
     $sstring icursor end
     set searchdirn -backwards
     if {$searchstring ne {}} {
-	set sel [$ctext tag ranges sel]
-	if {$sel ne {}} {
-	    set start [lindex $sel 0]
-	} elseif {[catch {set start [$ctext index anchor]}]} {
-	    set start @0,[winfo height $ctext]
-	}
-	set match [$ctext search -backwards -count ml -- $searchstring $start]
-	$ctext tag remove sel 1.0 end
-	if {$match eq {}} {
-	    bell
-	    return
-	}
-	$ctext see $match
-	suppress_highlighting_file_for_current_scrollpos
-	highlightfile_for_scrollpos $match
-	set mend "$match + $ml c"
-	$ctext tag add sel $match $mend
-	$ctext mark unset anchor
-	rehighlight_search_results
+        set sel [$ctext tag ranges sel]
+        if {$sel ne {}} {
+            set start [lindex $sel 0]
+        } elseif {[catch {set start [$ctext index anchor]}]} {
+            set start @0,[winfo height $ctext]
+        }
+        set match [$ctext search -backwards -count ml -- $searchstring $start]
+        $ctext tag remove sel 1.0 end
+        if {$match eq {}} {
+            bell
+            return
+        }
+        $ctext see $match
+        suppress_highlighting_file_for_current_scrollpos
+        highlightfile_for_scrollpos $match
+        set mend "$match + $ml c"
+        $ctext tag add sel $match $mend
+        $ctext mark unset anchor
+        rehighlight_search_results
     }
 }
 
@@ -8526,7 +8544,7 @@ proc rehighlight_search_results {} {
     $ctext tag remove currentsearchhit 1.0 end
 
     if {$searchstring ne {}} {
-	searchmarkvisible 1
+        searchmarkvisible 1
     }
 }
 
@@ -8537,14 +8555,14 @@ proc searchmark {first last} {
 
     set mend $first.0
     while {1} {
-	set match [$ctext search -count mlen -- $searchstring $mend $last.end]
-	if {$match eq {}} break
-	set mend "$match + $mlen c"
-	if {$sel ne {} && [$ctext compare $match == [lindex $sel 0]]} {
-	    $ctext tag add currentsearchhit $match $mend
-	} else {
-	    $ctext tag add found $match $mend
-	}
+        set match [$ctext search -count mlen -- $searchstring $mend $last.end]
+        if {$match eq {}} break
+        set mend "$match + $mlen c"
+        if {$sel ne {} && [$ctext compare $match == [lindex $sel 0]]} {
+            $ctext tag add currentsearchhit $match $mend
+        } else {
+            $ctext tag add found $match $mend
+        }
     }
 }
 
@@ -8554,19 +8572,19 @@ proc searchmarkvisible {doall} {
     set topline [lindex [split [$ctext index @0,0] .] 0]
     set botline [lindex [split [$ctext index @0,[winfo height $ctext]] .] 0]
     if {$doall || $botline < $smarktop || $topline > $smarkbot} {
-	# no overlap with previous
-	searchmark $topline $botline
-	set smarktop $topline
-	set smarkbot $botline
+        # no overlap with previous
+        searchmark $topline $botline
+        set smarktop $topline
+        set smarkbot $botline
     } else {
-	if {$topline < $smarktop} {
-	    searchmark $topline [expr {$smarktop-1}]
-	    set smarktop $topline
-	}
-	if {$botline > $smarkbot} {
-	    searchmark [expr {$smarkbot+1}] $botline
-	    set smarkbot $botline
-	}
+        if {$topline < $smarktop} {
+            searchmark $topline [expr {$smarktop-1}]
+            set smarktop $topline
+        }
+        if {$botline > $smarkbot} {
+            searchmark [expr {$smarkbot+1}] $botline
+            set smarkbot $botline
+        }
     }
 }
 
@@ -8582,15 +8600,15 @@ proc scrolltext {f0 f1} {
 
     set topidx [$ctext index @0,0]
     if {![info exists suppress_highlighting_file_for_this_scrollpos]
-	|| $topidx ne $suppress_highlighting_file_for_this_scrollpos} {
-	highlightfile_for_scrollpos $topidx
+        || $topidx ne $suppress_highlighting_file_for_this_scrollpos} {
+        highlightfile_for_scrollpos $topidx
     }
 
     unset -nocomplain suppress_highlighting_file_for_this_scrollpos
 
     .bleft.bottom.sb set $f0 $f1
     if {$searchstring ne {}} {
-	searchmarkvisible 0
+        searchmarkvisible 0
     }
 }
 
@@ -8619,8 +8637,8 @@ proc redisplay {} {
     allcanvs yview moveto [lindex $span 0]
     drawvisible
     if {$selectedline ne {}} {
-	selectline $selectedline 0
-	allcanvs yview moveto [lindex $span 0]
+        selectline $selectedline 0
+        allcanvs yview moveto [lindex $span 0]
     }
 }
 
@@ -8630,20 +8648,20 @@ proc parsefont {f n} {
     set fontattr($f,family) [lindex $n 0]
     set s [lindex $n 1]
     if {$s eq {} || $s == 0} {
-	set s 10
+        set s 10
     } elseif {$s < 0} {
-	set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}]
+        set s [expr {int(-$s / [winfo fpixels . 1p] + 0.5)}]
     }
     set fontattr($f,size) $s
     set fontattr($f,weight) normal
     set fontattr($f,slant) roman
     foreach style [lrange $n 2 end] {
-	switch -- $style {
-	    "normal" -
-	    "bold"   {set fontattr($f,weight) $style}
-	    "roman" -
-	    "italic" {set fontattr($f,slant) $style}
-	}
+        switch -- $style {
+            "normal" -
+            "bold"   {set fontattr($f,weight) $style}
+            "roman" -
+            "italic" {set fontattr($f,slant) $style}
+        }
     }
 }
 
@@ -8651,8 +8669,8 @@ proc fontflags {f {isbold 0}} {
     global fontattr
 
     return [list -family $fontattr($f,family) -size $fontattr($f,size) \
-		-weight [expr {$isbold? "bold": $fontattr($f,weight)}] \
-		-slant $fontattr($f,slant)]
+                -weight [expr {$isbold? "bold": $fontattr($f,weight)}] \
+                -slant $fontattr($f,slant)]
 }
 
 proc fontname {f} {
@@ -8660,10 +8678,10 @@ proc fontname {f} {
 
     set n [list $fontattr($f,family) $fontattr($f,size)]
     if {$fontattr($f,weight) eq "bold"} {
-	lappend n "bold"
+        lappend n "bold"
     }
     if {$fontattr($f,slant) eq "italic"} {
-	lappend n "italic"
+        lappend n "italic"
     }
     return $n
 }
@@ -8676,7 +8694,7 @@ proc incrfont {inc} {
     set s $fontattr(mainfont,size)
     incr s $inc
     if {$s < 1} {
-	set s 1
+        set s 1
     }
     set fontattr(mainfont,size) $s
     font config mainfont -size $s
@@ -8685,7 +8703,7 @@ proc incrfont {inc} {
     set s $fontattr(textfont,size)
     incr s $inc
     if {$s < 1} {
-	set s 1
+        set s 1
     }
     set fontattr(textfont,size) $s
     font config textfont -size $s
@@ -8699,23 +8717,23 @@ proc incrfont {inc} {
 proc clearsha1 {} {
     global sha1entry sha1string
     if {[string length $sha1string] == 40} {
-	$sha1entry delete 0 end
+        $sha1entry delete 0 end
     }
 }
 
 proc sha1change {n1 n2 op} {
     global sha1string currentid sha1but
     if {$sha1string == {}
-	|| ([info exists currentid] && $sha1string == $currentid)} {
-	set state disabled
+        || ([info exists currentid] && $sha1string == $currentid)} {
+        set state disabled
     } else {
-	set state normal
+        set state normal
     }
     if {[$sha1but cget -state] == $state} return
     if {$state == "normal"} {
-	$sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
+        $sha1but conf -state normal -relief raised -text "[mc "Goto:"] "
     } else {
-	$sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
+        $sha1but conf -state disabled -relief flat -text "[mc "SHA1 ID:"] "
     }
 }
 
@@ -8723,37 +8741,37 @@ proc gotocommit {} {
     global sha1string tagids headids curview varcid
 
     if {$sha1string == {}
-	|| ([info exists currentid] && $sha1string == $currentid)} return
+        || ([info exists currentid] && $sha1string == $currentid)} return
     if {[info exists tagids($sha1string)]} {
-	set id $tagids($sha1string)
+        set id $tagids($sha1string)
     } elseif {[info exists headids($sha1string)]} {
-	set id $headids($sha1string)
+        set id $headids($sha1string)
     } else {
-	set id [string tolower $sha1string]
-	if {[regexp {^[0-9a-f]{4,39}$} $id]} {
-	    set matches [longid $id]
-	    if {$matches ne {}} {
-		if {[llength $matches] > 1} {
-		    error_popup [mc "Short SHA1 id %s is ambiguous" $id]
-		    return
-		}
-		set id [lindex $matches 0]
-	    }
-	} else {
-	    if {[catch {set id [exec git rev-parse --verify $sha1string]}]} {
-		error_popup [mc "Revision %s is not known" $sha1string]
-		return
-	    }
-	}
+        set id [string tolower $sha1string]
+        if {[regexp {^[0-9a-f]{4,39}$} $id]} {
+            set matches [longid $id]
+            if {$matches ne {}} {
+                if {[llength $matches] > 1} {
+                    error_popup [mc "Short SHA1 id %s is ambiguous" $id]
+                    return
+                }
+                set id [lindex $matches 0]
+            }
+        } else {
+            if {[catch {set id [exec git rev-parse --verify $sha1string]}]} {
+                error_popup [mc "Revision %s is not known" $sha1string]
+                return
+            }
+        }
     }
     if {[commitinview $id $curview]} {
-	selectline [rowofcommit $id] 1
-	return
+        selectline [rowofcommit $id] 1
+        return
     }
     if {[regexp {^[0-9a-fA-F]{4,}$} $sha1string]} {
-	set msg [mc "SHA1 id %s is not known" $sha1string]
+        set msg [mc "SHA1 id %s is not known" $sha1string]
     } else {
-	set msg [mc "Revision %s is not in the current view" $sha1string]
+        set msg [mc "Revision %s is not in the current view" $sha1string]
     }
     error_popup $msg
 }
@@ -8767,7 +8785,7 @@ proc lineenter {x y id} {
     set hovery $y
     set hoverid $id
     if {[info exists hovertimer]} {
-	after cancel $hovertimer
+        after cancel $hovertimer
     }
     set hovertimer [after 500 linehover]
     $canv delete hover
@@ -8777,12 +8795,12 @@ proc linemotion {x y id} {
     global hoverx hovery hoverid hovertimer
 
     if {[info exists hoverid] && $id == $hoverid} {
-	set hoverx $x
-	set hovery $y
-	if {[info exists hovertimer]} {
-	    after cancel $hovertimer
-	}
-	set hovertimer [after 500 linehover]
+        set hoverx $x
+        set hovery $y
+        if {[info exists hovertimer]} {
+            after cancel $hovertimer
+        }
+        set hovertimer [after 500 linehover]
     }
 }
 
@@ -8790,12 +8808,12 @@ proc lineleave {id} {
     global hoverid hovertimer canv
 
     if {[info exists hoverid] && $id == $hoverid} {
-	$canv delete hover
-	if {[info exists hovertimer]} {
-	    after cancel $hovertimer
-	    unset hovertimer
-	}
-	unset hoverid
+        $canv delete hover
+        if {[info exists hovertimer]} {
+            after cancel $hovertimer
+            unset hovertimer
+        }
+        unset hoverid
     }
 }
 
@@ -8817,11 +8835,11 @@ proc linehover {} {
     set x1 [expr {$x + [font measure mainfont $text] + 2 * $lthickness}]
     set y1 [expr {$y + $linespc + 2 * $lthickness}]
     set t [$canv create rectangle $x0 $y0 $x1 $y1 \
-	       -fill $linehoverbgcolor -outline $linehoveroutlinecolor \
-	       -width 1 -tags hover]
+               -fill $linehoverbgcolor -outline $linehoveroutlinecolor \
+               -width 1 -tags hover]
     $canv raise $t
     set t [$canv create text $x $y -anchor nw -text $text -tags hover \
-	       -font mainfont -fill $linehoverfgcolor]
+               -font mainfont -fill $linehoverfgcolor]
     $canv raise $t
 }
 
@@ -8832,10 +8850,10 @@ proc clickisonarrow {id y} {
     set thresh [expr {2 * $lthickness + 6}]
     set n [expr {[llength $ranges] - 1}]
     for {set i 1} {$i < $n} {incr i} {
-	set row [lindex $ranges $i]
-	if {abs([yc $row] - $y) < $thresh} {
-	    return $i
-	}
+        set row [lindex $ranges $i]
+        if {abs([yc $row] - $y) < $thresh} {
+            return $i
+        }
     }
     return {}
 }
@@ -8853,7 +8871,7 @@ proc arrowjump {id n y} {
     set yspan [expr {[lindex $view 1] - [lindex $view 0]}]
     set yfrac [expr {$yt / $ymax - $yspan / 2}]
     if {$yfrac < 0} {
-	set yfrac 0
+        set yfrac 0
     }
     allcanvs yview moveto $yfrac
 }
@@ -8870,19 +8888,19 @@ proc lineclick {x y id isnew} {
     set thickerline $id
     drawlines $id
     if {$isnew} {
-	set ymax [lindex [$canv cget -scrollregion] 3]
-	if {$ymax eq {}} return
-	set yfrac [lindex [$canv yview] 0]
-	set y [expr {$y + $yfrac * $ymax}]
+        set ymax [lindex [$canv cget -scrollregion] 3]
+        if {$ymax eq {}} return
+        set yfrac [lindex [$canv yview] 0]
+        set y [expr {$y + $yfrac * $ymax}]
     }
     set dirn [clickisonarrow $id $y]
     if {$dirn ne {}} {
-	arrowjump $id $dirn $y
-	return
+        arrowjump $id $dirn $y
+        return
     }
 
     if {$isnew} {
-	addtohistory [list lineclick $x $y $id 0] savectextpos
+        addtohistory [list lineclick $x $y $id 0] savectextpos
     }
     # fill the details pane with info about this line
     $ctext conf -state normal
@@ -8898,20 +8916,20 @@ proc lineclick {x y id isnew} {
     $ctext insert end "\t[mc "Date"]:\t$date\n"
     set kids $children($curview,$id)
     if {$kids ne {}} {
-	$ctext insert end "\n[mc "Children"]:"
-	set i 0
-	foreach child $kids {
-	    incr i
-	    if {![info exists commitinfo($child)] && ![getcommit $child]} continue
-	    set info $commitinfo($child)
-	    $ctext insert end "\n\t"
-	    $ctext insert end $child link$i
-	    setlink $child link$i
-	    $ctext insert end "\n\t[lindex $info 0]"
-	    $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
-	    set date [formatdate [lindex $info 2]]
-	    $ctext insert end "\n\t[mc "Date"]:\t$date\n"
-	}
+        $ctext insert end "\n[mc "Children"]:"
+        set i 0
+        foreach child $kids {
+            incr i
+            if {![info exists commitinfo($child)] && ![getcommit $child]} continue
+            set info $commitinfo($child)
+            $ctext insert end "\n\t"
+            $ctext insert end $child link$i
+            setlink $child link$i
+            $ctext insert end "\n\t[lindex $info 0]"
+            $ctext insert end "\n\t[mc "Author"]:\t[lindex $info 1]"
+            set date [formatdate [lindex $info 2]]
+            $ctext insert end "\n\t[mc "Date"]:\t$date\n"
+        }
     }
     maybe_scroll_ctext 1
     $ctext conf -state disabled
@@ -8921,23 +8939,23 @@ proc lineclick {x y id isnew} {
 proc normalline {} {
     global thickerline
     if {[info exists thickerline]} {
-	set id $thickerline
-	unset thickerline
-	drawlines $id
+        set id $thickerline
+        unset thickerline
+        drawlines $id
     }
 }
 
 proc selbyid {id {isnew 1}} {
     global curview
     if {[commitinview $id $curview]} {
-	selectline [rowofcommit $id] $isnew
+        selectline [rowofcommit $id] $isnew
     }
 }
 
 proc mstime {} {
     global startmstime
     if {![info exists startmstime]} {
-	set startmstime [clock clicks -milliseconds]
+        set startmstime [clock clicks -milliseconds]
     }
     return [format "%.3f" [expr {([clock click -milliseconds] - $startmstime) / 1000.0}]]
 }
@@ -8949,27 +8967,27 @@ proc rowmenu {x y id} {
     stopfinding
     set rowmenuid $id
     if {$selectedline eq {} || [rowofcommit $id] eq $selectedline} {
-	set state disabled
+        set state disabled
     } else {
-	set state normal
+        set state normal
     }
     if {[info exists markedid] && $markedid ne $id} {
-	set mstate normal
+        set mstate normal
     } else {
-	set mstate disabled
+        set mstate disabled
     }
     if {$id ne $nullid && $id ne $nullid2} {
-	set menu $rowctxmenu
-	if {$mainhead ne {}} {
-	    $menu entryconfigure 8 -label [mc "Reset %s branch to here" $mainhead] -state normal
-	} else {
-	    $menu entryconfigure 8 -label [mc "Detached head: can't reset" $mainhead] -state disabled
-	}
-	$menu entryconfigure 10 -state $mstate
-	$menu entryconfigure 11 -state $mstate
-	$menu entryconfigure 12 -state $mstate
+        set menu $rowctxmenu
+        if {$mainhead ne {}} {
+            $menu entryconfigure 8 -label [mc "Reset %s branch to here" $mainhead] -state normal
+        } else {
+            $menu entryconfigure 8 -label [mc "Detached head: can't reset" $mainhead] -state disabled
+        }
+        $menu entryconfigure 10 -state $mstate
+        $menu entryconfigure 11 -state $mstate
+        $menu entryconfigure 12 -state $mstate
     } else {
-	set menu $fakerowmenu
+        set menu $fakerowmenu
     }
     $menu entryconfigure [mca "Diff this -> selected"] -state $state
     $menu entryconfigure [mca "Diff selected -> this"] -state $state
@@ -8990,7 +9008,7 @@ proc gotomark {} {
     global markedid
 
     if {[info exists markedid]} {
-	selbyid $markedid
+        selbyid $markedid
     }
 }
 
@@ -9000,7 +9018,7 @@ proc replace_by_kids {l r} {
     set id [commitonrow $r]
     set l [lreplace $l 0 0]
     foreach kid $children($curview,$id) {
-	lappend l [rowofcommit $kid]
+        lappend l [rowofcommit $kid]
     }
     return [lsort -integer -decreasing -unique $l]
 }
@@ -9010,23 +9028,23 @@ proc find_common_desc {} {
 
     if {![info exists markedid]} return
     if {![commitinview $markedid $curview] ||
-	![commitinview $rowmenuid $curview]} return
+        ![commitinview $rowmenuid $curview]} return
     #set t1 [clock clicks -milliseconds]
     set l1 [list [rowofcommit $markedid]]
     set l2 [list [rowofcommit $rowmenuid]]
     while 1 {
-	set r1 [lindex $l1 0]
-	set r2 [lindex $l2 0]
-	if {$r1 eq {} || $r2 eq {}} break
-	if {$r1 == $r2} {
-	    selectline $r1 1
-	    break
-	}
-	if {$r1 > $r2} {
-	    set l1 [replace_by_kids $l1 $r1]
-	} else {
-	    set l2 [replace_by_kids $l2 $r2]
-	}
+        set r1 [lindex $l1 0]
+        set r2 [lindex $l2 0]
+        if {$r1 eq {} || $r2 eq {}} break
+        if {$r1 == $r2} {
+            selectline $r1 1
+            break
+        }
+        if {$r1 > $r2} {
+            set l1 [replace_by_kids $l1 $r1]
+        } else {
+            set l2 [replace_by_kids $l2 $r2]
+        }
     }
     #set t2 [clock clicks -milliseconds]
     #puts "took [expr {$t2-$t1}]ms"
@@ -9045,15 +9063,15 @@ proc getpatchid {id} {
     global patchids
 
     if {![info exists patchids($id)]} {
-	set cmd [diffcmd [list $id] {-p --root}]
-	# trim off the initial "|"
-	set cmd [lrange $cmd 1 end]
-	if {[catch {
-	    set x [eval exec $cmd | git patch-id]
-	    set patchids($id) [lindex $x 0]
-	}]} {
-	    set patchids($id) "error"
-	}
+        set cmd [diffcmd [list $id] {-p --root}]
+        # trim off the initial "|"
+        set cmd [lrange $cmd 1 end]
+        if {[catch {
+            set x [eval exec $cmd | git patch-id]
+            set patchids($id) [lindex $x 0]
+        }]} {
+            set patchids($id) "error"
+        }
     }
     return $patchids($id)
 }
@@ -9065,75 +9083,75 @@ proc do_cmp_commits {a b} {
     clear_ctext
     init_flist {}
     for {set i 0} {$i < 100} {incr i} {
-	set skipa 0
-	set skipb 0
-	if {[llength $parents($curview,$a)] > 1} {
-	    appendshortlink $a [mc "Skipping merge commit "] "\n"
-	    set skipa 1
-	} else {
-	    set patcha [getpatchid $a]
-	}
-	if {[llength $parents($curview,$b)] > 1} {
-	    appendshortlink $b [mc "Skipping merge commit "] "\n"
-	    set skipb 1
-	} else {
-	    set patchb [getpatchid $b]
-	}
-	if {!$skipa && !$skipb} {
-	    set heada [lindex $commitinfo($a) 0]
-	    set headb [lindex $commitinfo($b) 0]
-	    if {$patcha eq "error"} {
-		appendshortlink $a [mc "Error getting patch ID for "] \
-		    [mc " - stopping\n"]
-		break
-	    }
-	    if {$patchb eq "error"} {
-		appendshortlink $b [mc "Error getting patch ID for "] \
-		    [mc " - stopping\n"]
-		break
-	    }
-	    if {$patcha eq $patchb} {
-		if {$heada eq $headb} {
-		    appendshortlink $a [mc "Commit "]
-		    appendshortlink $b " == " "  $heada\n"
-		} else {
-		    appendshortlink $a [mc "Commit "] "  $heada\n"
-		    appendshortlink $b [mc " is the same patch as\n       "] \
-			"  $headb\n"
-		}
-		set skipa 1
-		set skipb 1
-	    } else {
-		$ctext insert end "\n"
-		appendshortlink $a [mc "Commit "] "  $heada\n"
-		appendshortlink $b [mc " differs from\n       "] \
-		    "  $headb\n"
-		$ctext insert end [mc "Diff of commits:\n\n"]
-		$ctext conf -state disabled
-		update
-		diffcommits $a $b
-		return
-	    }
-	}
-	if {$skipa} {
-	    set kids [real_children $curview,$a]
-	    if {[llength $kids] != 1} {
-		$ctext insert end "\n"
-		appendshortlink $a [mc "Commit "] \
-		    [mc " has %s children - stopping\n" [llength $kids]]
-		break
-	    }
-	    set a [lindex $kids 0]
-	}
-	if {$skipb} {
-	    set kids [real_children $curview,$b]
-	    if {[llength $kids] != 1} {
-		appendshortlink $b [mc "Commit "] \
-		    [mc " has %s children - stopping\n" [llength $kids]]
-		break
-	    }
-	    set b [lindex $kids 0]
-	}
+        set skipa 0
+        set skipb 0
+        if {[llength $parents($curview,$a)] > 1} {
+            appendshortlink $a [mc "Skipping merge commit "] "\n"
+            set skipa 1
+        } else {
+            set patcha [getpatchid $a]
+        }
+        if {[llength $parents($curview,$b)] > 1} {
+            appendshortlink $b [mc "Skipping merge commit "] "\n"
+            set skipb 1
+        } else {
+            set patchb [getpatchid $b]
+        }
+        if {!$skipa && !$skipb} {
+            set heada [lindex $commitinfo($a) 0]
+            set headb [lindex $commitinfo($b) 0]
+            if {$patcha eq "error"} {
+                appendshortlink $a [mc "Error getting patch ID for "] \
+                    [mc " - stopping\n"]
+                break
+            }
+            if {$patchb eq "error"} {
+                appendshortlink $b [mc "Error getting patch ID for "] \
+                    [mc " - stopping\n"]
+                break
+            }
+            if {$patcha eq $patchb} {
+                if {$heada eq $headb} {
+                    appendshortlink $a [mc "Commit "]
+                    appendshortlink $b " == " "  $heada\n"
+                } else {
+                    appendshortlink $a [mc "Commit "] "  $heada\n"
+                    appendshortlink $b [mc " is the same patch as\n       "] \
+                        "  $headb\n"
+                }
+                set skipa 1
+                set skipb 1
+            } else {
+                $ctext insert end "\n"
+                appendshortlink $a [mc "Commit "] "  $heada\n"
+                appendshortlink $b [mc " differs from\n       "] \
+                    "  $headb\n"
+                $ctext insert end [mc "Diff of commits:\n\n"]
+                $ctext conf -state disabled
+                update
+                diffcommits $a $b
+                return
+            }
+        }
+        if {$skipa} {
+            set kids [real_children $curview,$a]
+            if {[llength $kids] != 1} {
+                $ctext insert end "\n"
+                appendshortlink $a [mc "Commit "] \
+                    [mc " has %s children - stopping\n" [llength $kids]]
+                break
+            }
+            set a [lindex $kids 0]
+        }
+        if {$skipb} {
+            set kids [real_children $curview,$b]
+            if {[llength $kids] != 1} {
+                appendshortlink $b [mc "Commit "] \
+                    [mc " has %s children - stopping\n" [llength $kids]]
+                break
+            }
+            set b [lindex $kids 0]
+        }
     }
     $ctext conf -state disabled
 }
@@ -9145,17 +9163,17 @@ proc diffcommits {a b} {
     set fna [file join $tmpdir "commit-[string range $a 0 7]"]
     set fnb [file join $tmpdir "commit-[string range $b 0 7]"]
     if {[catch {
-	exec git diff-tree -p --pretty $a >$fna
-	exec git diff-tree -p --pretty $b >$fnb
+        exec git diff-tree -p --pretty $a >$fna
+        exec git diff-tree -p --pretty $b >$fnb
     } err]} {
-	error_popup [mc "Error writing commit to file: %s" $err]
-	return
+        error_popup [mc "Error writing commit to file: %s" $err]
+        return
     }
     if {[catch {
-	set fd [open "| diff -U$diffcontext $fna $fnb" r]
+        set fd [open "| diff -U$diffcontext $fna $fnb" r]
     } err]} {
-	error_popup [mc "Error diffing commits: %s" $err]
-	return
+        error_popup [mc "Error diffing commits: %s" $err]
+        return
     }
     set diffids [list commits $a $b]
     set blobdifffd($diffids) $fd
@@ -9169,11 +9187,11 @@ proc diffvssel {dirn} {
 
     if {$selectedline eq {}} return
     if {$dirn} {
-	set oldid [commitonrow $selectedline]
-	set newid $rowmenuid
+        set oldid [commitonrow $selectedline]
+        set newid $rowmenuid
     } else {
-	set oldid $rowmenuid
-	set newid [commitonrow $selectedline]
+        set oldid $rowmenuid
+        set newid [commitonrow $selectedline]
     }
     addtohistory [list doseldiff $oldid $newid] savectextpos
     doseldiff $oldid $newid
@@ -9184,11 +9202,11 @@ proc diffvsmark {dirn} {
 
     if {![info exists markedid]} return
     if {$dirn} {
-	set oldid $markedid
-	set newid $rowmenuid
+        set oldid $markedid
+        set newid $rowmenuid
     } else {
-	set oldid $rowmenuid
-	set newid $markedid
+        set oldid $rowmenuid
+        set newid $markedid
     }
     addtohistory [list doseldiff $oldid $newid] savectextpos
     doseldiff $oldid $newid
@@ -9277,11 +9295,11 @@ proc mkpatchrev {} {
     set newid [$patchtop.tosha1 get]
     set newhead [$patchtop.tohead get]
     foreach e [list fromsha1 fromhead tosha1 tohead] \
-	    v [list $newid $newhead $oldid $oldhead] {
-	$patchtop.$e conf -state normal
-	$patchtop.$e delete 0 end
-	$patchtop.$e insert 0 $v
-	$patchtop.$e conf -state readonly
+            v [list $newid $newhead $oldid $oldhead] {
+        $patchtop.$e conf -state normal
+        $patchtop.$e delete 0 end
+        $patchtop.$e insert 0 $v
+        $patchtop.$e conf -state readonly
     }
 }
 
@@ -9296,7 +9314,7 @@ proc mkpatchgo {} {
     set cmd [lrange $cmd 1 end]
     lappend cmd >$fname &
     if {[catch {eval exec $cmd} err]} {
-	error_popup "[mc "Error creating patch:"] $err" $patchtop
+        error_popup "[mc "Error creating patch:"] $err" $patchtop
     }
     catch {destroy $patchtop}
     unset patchtop
@@ -9355,22 +9373,22 @@ proc domktag {} {
     set tag [$mktagtop.tag get]
     set msg [$mktagtop.msg get]
     if {$tag == {}} {
-	error_popup [mc "No tag name specified"] $mktagtop
-	return 0
+        error_popup [mc "No tag name specified"] $mktagtop
+        return 0
     }
     if {[info exists tagids($tag)]} {
-	error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop
-	return 0
+        error_popup [mc "Tag \"%s\" already exists" $tag] $mktagtop
+        return 0
     }
     if {[catch {
-	if {$msg != {}} {
-	    exec git tag -a -m $msg $tag $id
-	} else {
-	    exec git tag $tag $id
-	}
+        if {$msg != {}} {
+            exec git tag -a -m $msg $tag $id
+        } else {
+            exec git tag $tag $id
+        }
     } err]} {
-	error_popup "[mc "Error creating tag:"] $err" $mktagtop
-	return 0
+        error_popup "[mc "Error creating tag:"] $err" $mktagtop
+        return 0
     }
 
     set tagids($tag) $id
@@ -9391,9 +9409,9 @@ proc redrawtags {id} {
     if {![info exists iddrawn($id)]} return
     set row [rowofcommit $id]
     if {$id eq $mainheadid} {
-	set ofill $mainheadcirclecolor
+        set ofill $mainheadcirclecolor
     } else {
-	set ofill [lindex $circlecolors $cmitlisted($curview,$id)]
+        set ofill [lindex $circlecolors $cmitlisted($curview,$id)]
     }
     $canv itemconf $circleitem($row) -fill $ofill
     $canv delete tag.$id
@@ -9403,14 +9421,14 @@ proc redrawtags {id} {
     set font [$canv itemcget $linehtag($id) -font]
     set xr [expr {$xt + [font measure $font $text]}]
     if {$xr > $canvxmax} {
-	set canvxmax $xr
-	setcanvscroll
+        set canvxmax $xr
+        setcanvscroll
     }
     if {[info exists currentid] && $currentid == $id} {
-	make_secsel $id
+        make_secsel $id
     }
     if {[info exists markedid] && $markedid eq $id} {
-	make_idmark $id
+        make_idmark $id
     }
 }
 
@@ -9426,7 +9444,7 @@ proc mktaggo {} {
     mktagcan
 }
 
-proc copysummary {} {
+proc copyreference {} {
     global rowmenuid autosellen
 
     set format "%h (\"%s\", %ad)"
@@ -9434,10 +9452,10 @@ proc copysummary {} {
     if {$autosellen < 40} {
         lappend cmd --abbrev=$autosellen
     }
-    set summary [eval exec $cmd $rowmenuid]
+    set reference [eval exec $cmd $rowmenuid]
 
     clipboard clear
-    clipboard append $summary
+    clipboard append $reference
 }
 
 proc writecommit {} {
@@ -9485,7 +9503,7 @@ proc wrcomgo {} {
     set cmd "echo $id | [$wrcomtop.cmd get]"
     set fname [$wrcomtop.fname get]
     if {[catch {exec sh -c $cmd >$fname &} err]} {
-	error_popup "[mc "Error writing commit:"] $err" $wrcomtop
+        error_popup "[mc "Error writing commit:"] $err" $wrcomtop
     }
     catch {destroy $wrcomtop}
     unset wrcomtop
@@ -9572,41 +9590,41 @@ proc mkbrgo {top} {
     set cmdargs {}
     set old_id {}
     if {$name eq {}} {
-	error_popup [mc "Please specify a name for the new branch"] $top
-	return
+        error_popup [mc "Please specify a name for the new branch"] $top
+        return
     }
     if {[info exists headids($name)]} {
-	if {![confirm_popup [mc \
-		"Branch '%s' already exists. Overwrite?" $name] $top]} {
-	    return
-	}
-	set old_id $headids($name)
-	lappend cmdargs -f
+        if {![confirm_popup [mc \
+                "Branch '%s' already exists. Overwrite?" $name] $top]} {
+            return
+        }
+        set old_id $headids($name)
+        lappend cmdargs -f
     }
     catch {destroy $top}
     lappend cmdargs $name $id
     nowbusy newbranch
     update
     if {[catch {
-	eval exec git branch $cmdargs
+        eval exec git branch $cmdargs
     } err]} {
-	notbusy newbranch
-	error_popup $err
+        notbusy newbranch
+        error_popup $err
     } else {
-	notbusy newbranch
-	if {$old_id ne {}} {
-	    movehead $id $name
-	    movedhead $id $name
-	    redrawtags $old_id
-	    redrawtags $id
-	} else {
-	    set headids($name) $id
-	    lappend idheads($id) $name
-	    addedhead $id $name
-	    redrawtags $id
-	}
-	dispneartags 0
-	run refill_reflist
+        notbusy newbranch
+        if {$old_id ne {}} {
+            movehead $id $name
+            movedhead $id $name
+            redrawtags $old_id
+            redrawtags $id
+        } else {
+            set headids($name) $id
+            lappend idheads($id) $name
+            addedhead $id $name
+            redrawtags $id
+        }
+        dispneartags 0
+        run refill_reflist
     }
 }
 
@@ -9617,36 +9635,36 @@ proc mvbrgo {top prevname} {
     set id [$top.sha1 get]
     set cmdargs {}
     if {$name eq $prevname} {
-	catch {destroy $top}
-	return
+        catch {destroy $top}
+        return
     }
     if {$name eq {}} {
-	error_popup [mc "Please specify a new name for the branch"] $top
-	return
+        error_popup [mc "Please specify a new name for the branch"] $top
+        return
     }
     catch {destroy $top}
     lappend cmdargs -m $prevname $name
     nowbusy renamebranch
     update
     if {[catch {
-	eval exec git branch $cmdargs
+        eval exec git branch $cmdargs
     } err]} {
-	notbusy renamebranch
-	error_popup $err
+        notbusy renamebranch
+        error_popup $err
     } else {
-	notbusy renamebranch
-	removehead $id $prevname
-	removedhead $id $prevname
-	set headids($name) $id
-	lappend idheads($id) $name
-	addedhead $id $name
-	if {$prevname eq $mainhead} {
-	    set mainhead $name
-	    set mainheadid $id
-	}
-	redrawtags $id
-	dispneartags 0
-	run refill_reflist
+        notbusy renamebranch
+        removehead $id $prevname
+        removedhead $id $prevname
+        set headids($name) $id
+        lappend idheads($id) $name
+        addedhead $id $name
+        if {$prevname eq $mainhead} {
+            set mainhead $name
+            set mainheadid $id
+        }
+        redrawtags $id
+        dispneartags 0
+        run refill_reflist
     }
 }
 
@@ -9656,18 +9674,18 @@ proc exec_citool {tool_args {baseid {}}} {
     set save_env [array get env GIT_AUTHOR_*]
 
     if {$baseid ne {}} {
-	if {![info exists commitinfo($baseid)]} {
-	    getcommit $baseid
-	}
-	set author [lindex $commitinfo($baseid) 1]
-	set date [lindex $commitinfo($baseid) 2]
-	if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \
-	            $author author name email]
-	    && $date ne {}} {
-	    set env(GIT_AUTHOR_NAME) $name
-	    set env(GIT_AUTHOR_EMAIL) $email
-	    set env(GIT_AUTHOR_DATE) $date
-	}
+        if {![info exists commitinfo($baseid)]} {
+            getcommit $baseid
+        }
+        set author [lindex $commitinfo($baseid) 1]
+        set date [lindex $commitinfo($baseid) 2]
+        if {[regexp {^\s*(\S.*\S|\S)\s*<(.*)>\s*$} \
+                    $author author name email]
+            && $date ne {}} {
+            set env(GIT_AUTHOR_NAME) $name
+            set env(GIT_AUTHOR_EMAIL) $email
+            set env(GIT_AUTHOR_DATE) $date
+        }
     }
 
     eval exec git citool $tool_args &
@@ -9684,57 +9702,57 @@ proc cherrypick {} {
     set oldhead [exec git rev-parse HEAD]
     set dheads [descheads $rowmenuid]
     if {$dheads ne {} && [lsearch -exact $dheads $oldhead] >= 0} {
-	set ok [confirm_popup [mc "Commit %s is already\
-		included in branch %s -- really re-apply it?" \
-				   [string range $rowmenuid 0 7] $mainhead]]
-	if {!$ok} return
+        set ok [confirm_popup [mc "Commit %s is already\
+                included in branch %s -- really re-apply it?" \
+                                   [string range $rowmenuid 0 7] $mainhead]]
+        if {!$ok} return
     }
     nowbusy cherrypick [mc "Cherry-picking"]
     update
     # Unfortunately git-cherry-pick writes stuff to stderr even when
     # no error occurs, and exec takes that as an indication of error...
     if {[catch {exec sh -c "git cherry-pick -r $rowmenuid 2>&1"} err]} {
-	notbusy cherrypick
-	if {[regexp -line \
-		 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \
-		 $err msg fname]} {
-	    error_popup [mc "Cherry-pick failed because of local changes\
-			to file '%s'.\nPlease commit, reset or stash\
-			your changes and try again." $fname]
-	} elseif {[regexp -line \
-		       {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \
-		       $err]} {
-	    if {[confirm_popup [mc "Cherry-pick failed because of merge\
-			conflict.\nDo you wish to run git citool to\
-			resolve it?"]]} {
-		# Force citool to read MERGE_MSG
-		file delete [file join $gitdir "GITGUI_MSG"]
-		exec_citool {} $rowmenuid
-	    }
-	} else {
-	    error_popup $err
-	}
-	run updatecommits
-	return
+        notbusy cherrypick
+        if {[regexp -line \
+                 {Entry '(.*)' (would be overwritten by merge|not uptodate)} \
+                 $err msg fname]} {
+            error_popup [mc "Cherry-pick failed because of local changes\
+                        to file '%s'.\nPlease commit, reset or stash\
+                        your changes and try again." $fname]
+        } elseif {[regexp -line \
+                       {^(CONFLICT \(.*\):|Automatic cherry-pick failed|error: could not apply)} \
+                       $err]} {
+            if {[confirm_popup [mc "Cherry-pick failed because of merge\
+                        conflict.\nDo you wish to run git citool to\
+                        resolve it?"]]} {
+                # Force citool to read MERGE_MSG
+                file delete [file join $gitdir "GITGUI_MSG"]
+                exec_citool {} $rowmenuid
+            }
+        } else {
+            error_popup $err
+        }
+        run updatecommits
+        return
     }
     set newhead [exec git rev-parse HEAD]
     if {$newhead eq $oldhead} {
-	notbusy cherrypick
-	error_popup [mc "No changes committed"]
-	return
+        notbusy cherrypick
+        error_popup [mc "No changes committed"]
+        return
     }
     addnewchild $newhead $oldhead
     if {[commitinview $oldhead $curview]} {
-	# XXX this isn't right if we have a path limit...
-	insertrow $newhead $oldhead $curview
-	if {$mainhead ne {}} {
-	    movehead $newhead $mainhead
-	    movedhead $newhead $mainhead
-	}
-	set mainheadid $newhead
-	redrawtags $oldhead
-	redrawtags $newhead
-	selbyid $newhead
+        # XXX this isn't right if we have a path limit...
+        insertrow $newhead $oldhead $curview
+        if {$mainhead ne {}} {
+            movehead $newhead $mainhead
+            movedhead $newhead $mainhead
+        }
+        set mainheadid $newhead
+        redrawtags $oldhead
+        redrawtags $newhead
+        selbyid $newhead
     }
     notbusy cherrypick
 }
@@ -9809,18 +9827,18 @@ proc resethead {} {
     make_transient $w .
     wm title $w [mc "Confirm reset"]
     ${NS}::label $w.m -text \
-	[mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]]
+        [mc "Reset branch %s to %s?" $mainhead [string range $rowmenuid 0 7]]
     pack $w.m -side top -fill x -padx 20 -pady 20
     ${NS}::labelframe $w.f -text [mc "Reset type:"]
     set resettype mixed
     ${NS}::radiobutton $w.f.soft -value soft -variable resettype \
-	-text [mc "Soft: Leave working tree and index untouched"]
+        -text [mc "Soft: Leave working tree and index untouched"]
     grid $w.f.soft -sticky w
     ${NS}::radiobutton $w.f.mixed -value mixed -variable resettype \
-	-text [mc "Mixed: Leave working tree untouched, reset index"]
+        -text [mc "Mixed: Leave working tree untouched, reset index"]
     grid $w.f.mixed -sticky w
     ${NS}::radiobutton $w.f.hard -value hard -variable resettype \
-	-text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
+        -text [mc "Hard: Reset working tree and index\n(discard ALL local changes)"]
     grid $w.f.hard -sticky w
     pack $w.f -side top -fill x -padx 4
     ${NS}::button $w.ok -text [mc OK] -command "set confirm_ok 1; destroy $w"
@@ -9832,13 +9850,13 @@ proc resethead {} {
     tkwait window $w
     if {!$confirm_ok} return
     if {[catch {set fd [open \
-	    [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
-	error_popup $err
+            [list | git reset --$resettype $rowmenuid 2>@1] r]} err]} {
+        error_popup $err
     } else {
-	dohidelocalchanges
-	filerun $fd [list readresetstat $fd]
-	nowbusy reset [mc "Resetting"]
-	selbyid $rowmenuid
+        dohidelocalchanges
+        filerun $fd [list readresetstat $fd]
+        nowbusy reset [mc "Resetting"]
+        selbyid $rowmenuid
     }
 }
 
@@ -9846,29 +9864,29 @@ proc readresetstat {fd} {
     global mainhead mainheadid showlocalchanges rprogcoord
 
     if {[gets $fd line] >= 0} {
-	if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
-	    set rprogcoord [expr {1.0 * $m / $n}]
-	    adjustprogress
-	}
-	return 1
+        if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
+            set rprogcoord [expr {1.0 * $m / $n}]
+            adjustprogress
+        }
+        return 1
     }
     set rprogcoord 0
     adjustprogress
     notbusy reset
     if {[catch {close $fd} err]} {
-	error_popup $err
+        error_popup $err
     }
     set oldhead $mainheadid
     set newhead [exec git rev-parse HEAD]
     if {$newhead ne $oldhead} {
-	movehead $newhead $mainhead
-	movedhead $newhead $mainhead
-	set mainheadid $newhead
-	redrawtags $oldhead
-	redrawtags $newhead
+        movehead $newhead $mainhead
+        movedhead $newhead $mainhead
+        set mainheadid $newhead
+        redrawtags $oldhead
+        redrawtags $newhead
     }
     if {$showlocalchanges} {
-	doshowlocalchanges
+        doshowlocalchanges
     }
     return 0
 }
@@ -9882,17 +9900,17 @@ proc headmenu {x y id head} {
     set headmenuhead $head
     array set state {0 normal 1 normal 2 normal}
     if {[string match "remotes/*" $head]} {
-	set localhead [string range $head [expr [string last / $head] + 1] end]
-	if {[info exists headids($localhead)]} {
-	    set state(0) disabled
-	}
-	array set state {1 disabled 2 disabled}
+        set localhead [string range $head [expr [string last / $head] + 1] end]
+        if {[info exists headids($localhead)]} {
+            set state(0) disabled
+        }
+        array set state {1 disabled 2 disabled}
     }
     if {$head eq $mainhead} {
-	array set state {0 disabled 2 disabled}
+        array set state {0 disabled 2 disabled}
     }
     foreach i {0 1 2} {
-	$headctxmenu entryconfigure $i -state $state($i)
+        $headctxmenu entryconfigure $i -state $state($i)
     }
     tk_popup $headctxmenu $x $y
 }
@@ -9905,32 +9923,32 @@ proc cobranch {} {
     set newhead $headmenuhead
     set command [list | git checkout]
     if {[string match "remotes/*" $newhead]} {
-	set remote $newhead
-	set newhead [string range $newhead [expr [string last / $newhead] + 1] end]
-	# The following check is redundant - the menu option should
-	# be disabled to begin with...
-	if {[info exists headids($newhead)]} {
-	    error_popup [mc "A local branch named %s exists already" $newhead]
-	    return
-	}
-	lappend command -b $newhead --track $remote
+        set remote $newhead
+        set newhead [string range $newhead [expr [string last / $newhead] + 1] end]
+        # The following check is redundant - the menu option should
+        # be disabled to begin with...
+        if {[info exists headids($newhead)]} {
+            error_popup [mc "A local branch named %s exists already" $newhead]
+            return
+        }
+        lappend command -b $newhead --track $remote
     } else {
-	lappend command $newhead
+        lappend command $newhead
     }
     lappend command 2>@1
     nowbusy checkout [mc "Checking out"]
     update
     dohidelocalchanges
     if {[catch {
-	set fd [open $command r]
+        set fd [open $command r]
     } err]} {
-	notbusy checkout
-	error_popup $err
-	if {$showlocalchanges} {
-	    dodiffindex
-	}
+        notbusy checkout
+        error_popup $err
+        if {$showlocalchanges} {
+            dodiffindex
+        }
     } else {
-	filerun $fd [list readcheckoutstat $fd $newhead $headmenuid]
+        filerun $fd [list readcheckoutstat $fd $newhead $headmenuid]
     }
 }
 
@@ -9939,24 +9957,24 @@ proc readcheckoutstat {fd newhead newheadid} {
     global viewmainheadid curview
 
     if {[gets $fd line] >= 0} {
-	if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
-	    set progresscoords [list 0 [expr {1.0 * $m / $n}]]
-	    adjustprogress
-	}
-	return 1
+        if {[regexp {([0-9]+)% \(([0-9]+)/([0-9]+)\)} $line match p m n]} {
+            set progresscoords [list 0 [expr {1.0 * $m / $n}]]
+            adjustprogress
+        }
+        return 1
     }
     set progresscoords {0 0}
     adjustprogress
     notbusy checkout
     if {[catch {close $fd} err]} {
-	error_popup $err
-	return
+        error_popup $err
+        return
     }
     set oldmainid $mainheadid
     if {! [info exists headids($newhead)]} {
-	set headids($newhead) $newheadid
-	lappend idheads($newheadid) $newhead
-	addedhead $newheadid $newhead
+        set headids($newhead) $newheadid
+        lappend idheads($newheadid) $newhead
+        addedhead $newheadid $newhead
     }
     set mainhead $newhead
     set mainheadid $newheadid
@@ -9965,7 +9983,7 @@ proc readcheckoutstat {fd newhead newheadid} {
     redrawtags $newheadid
     selbyid $newheadid
     if {$showlocalchanges} {
-	dodiffindex
+        dodiffindex
     }
 }
 
@@ -9977,21 +9995,21 @@ proc rmbranch {} {
     set id $headmenuid
     # this check shouldn't be needed any more...
     if {$head eq $mainhead} {
-	error_popup [mc "Cannot delete the currently checked-out branch"]
-	return
+        error_popup [mc "Cannot delete the currently checked-out branch"]
+        return
     }
     set dheads [descheads $id]
     if {[llength $dheads] == 1 && $idheads($dheads) eq $head} {
-	# the stuff on this branch isn't on any other branch
-	if {![confirm_popup [mc "The commits on branch %s aren't on any other\
-			branch.\nReally delete branch %s?" $head $head]]} return
+        # the stuff on this branch isn't on any other branch
+        if {![confirm_popup [mc "The commits on branch %s aren't on any other\
+                        branch.\nReally delete branch %s?" $head $head]]} return
     }
     nowbusy rmbranch
     update
     if {[catch {exec git branch -D $head} err]} {
-	notbusy rmbranch
-	error_popup $err
-	return
+        notbusy rmbranch
+        error_popup $err
+        return
     }
     removehead $id $head
     removedhead $id $head
@@ -10009,22 +10027,22 @@ proc showrefs {} {
     set top .showrefs
     set showrefstop $top
     if {[winfo exists $top]} {
-	raise $top
-	refill_reflist
-	return
+        raise $top
+        refill_reflist
+        return
     }
     ttk_toplevel $top
     wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
     make_transient $top .
     text $top.list -background $bgcolor -foreground $fgcolor \
-	-selectbackground $selectbgcolor -font mainfont \
-	-xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \
-	-width 30 -height 20 -cursor $maincursor \
-	-spacing1 1 -spacing3 1 -state disabled
+        -selectbackground $selectbgcolor -font mainfont \
+        -xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \
+        -width 30 -height 20 -cursor $maincursor \
+        -spacing1 1 -spacing3 1 -state disabled
     $top.list tag configure highlight -background $selectbgcolor
     if {![lsearch -exact $bglist $top.list]} {
-	lappend bglist $top.list
-	lappend fglist $top.list
+        lappend bglist $top.list
+        lappend fglist $top.list
     }
     ${NS}::scrollbar $top.ysb -command "$top.list yview" -orient vertical
     ${NS}::scrollbar $top.xsb -command "$top.list xview" -orient horizontal
@@ -10058,10 +10076,10 @@ proc sel_reflist {w x y} {
     set ref [lindex $reflist [expr {$l-1}]]
     set n [lindex $ref 0]
     switch -- [lindex $ref 1] {
-	"H" {selbyid $headids($n)}
-	"R" {selbyid $headids($n)}
-	"T" {selbyid $tagids($n)}
-	"o" {selbyid $otherrefids($n)}
+        "H" {selbyid $headids($n)}
+        "R" {selbyid $headids($n)}
+        "T" {selbyid $tagids($n)}
+        "o" {selbyid $otherrefids($n)}
     }
     $showrefstop.list tag add highlight $l.0 "$l.0 lineend"
 }
@@ -10087,35 +10105,35 @@ proc refill_reflist {} {
     if {![info exists showrefstop] || ![winfo exists $showrefstop]} return
     set refs {}
     foreach n [array names headids] {
-	if {[string match $reflistfilter $n]} {
-	    if {[commitinview $headids($n) $curview]} {
-		if {[string match "remotes/*" $n]} {
-		    lappend refs [list $n R]
-		} else {
-		    lappend refs [list $n H]
-		}
-	    } else {
-		interestedin $headids($n) {run refill_reflist}
-	    }
-	}
+        if {[string match $reflistfilter $n]} {
+            if {[commitinview $headids($n) $curview]} {
+                if {[string match "remotes/*" $n]} {
+                    lappend refs [list $n R]
+                } else {
+                    lappend refs [list $n H]
+                }
+            } else {
+                interestedin $headids($n) {run refill_reflist}
+            }
+        }
     }
     foreach n [array names tagids] {
-	if {[string match $reflistfilter $n]} {
-	    if {[commitinview $tagids($n) $curview]} {
-		lappend refs [list $n T]
-	    } else {
-		interestedin $tagids($n) {run refill_reflist}
-	    }
-	}
+        if {[string match $reflistfilter $n]} {
+            if {[commitinview $tagids($n) $curview]} {
+                lappend refs [list $n T]
+            } else {
+                interestedin $tagids($n) {run refill_reflist}
+            }
+        }
     }
     foreach n [array names otherrefids] {
-	if {[string match $reflistfilter $n]} {
-	    if {[commitinview $otherrefids($n) $curview]} {
-		lappend refs [list $n o]
-	    } else {
-		interestedin $otherrefids($n) {run refill_reflist}
-	    }
-	}
+        if {[string match $reflistfilter $n]} {
+            if {[commitinview $otherrefids($n) $curview]} {
+                lappend refs [list $n o]
+            } else {
+                interestedin $otherrefids($n) {run refill_reflist}
+            }
+        }
     }
     set refs [lsort -index 0 $refs]
     if {$refs eq $reflist} return
@@ -10127,37 +10145,37 @@ proc refill_reflist {} {
     set i 0
     set j 0
     while {$i < [llength $reflist] || $j < [llength $refs]} {
-	if {$i < [llength $reflist]} {
-	    if {$j < [llength $refs]} {
-		set cmp [string compare [lindex $reflist $i 0] \
-			     [lindex $refs $j 0]]
-		if {$cmp == 0} {
-		    set cmp [string compare [lindex $reflist $i 1] \
-				 [lindex $refs $j 1]]
-		}
-	    } else {
-		set cmp -1
-	    }
-	} else {
-	    set cmp 1
-	}
-	switch -- $cmp {
-	    -1 {
-		$showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0"
-		incr i
-	    }
-	    0 {
-		incr i
-		incr j
-	    }
-	    1 {
-		set l [expr {$j + 1}]
-		$showrefstop.list image create $l.0 -align baseline \
-		    -image reficon-[lindex $refs $j 1] -padx 2
-		$showrefstop.list insert $l.1 "[lindex $refs $j 0]\n"
-		incr j
-	    }
-	}
+        if {$i < [llength $reflist]} {
+            if {$j < [llength $refs]} {
+                set cmp [string compare [lindex $reflist $i 0] \
+                             [lindex $refs $j 0]]
+                if {$cmp == 0} {
+                    set cmp [string compare [lindex $reflist $i 1] \
+                                 [lindex $refs $j 1]]
+                }
+            } else {
+                set cmp -1
+            }
+        } else {
+            set cmp 1
+        }
+        switch -- $cmp {
+            -1 {
+                $showrefstop.list delete "[expr {$j+1}].0" "[expr {$j+2}].0"
+                incr i
+            }
+            0 {
+                incr i
+                incr j
+            }
+            1 {
+                set l [expr {$j + 1}]
+                $showrefstop.list image create $l.0 -align baseline \
+                    -image reficon-[lindex $refs $j 1] -padx 2
+                $showrefstop.list insert $l.1 "[lindex $refs $j 0]\n"
+                incr j
+            }
+        }
     }
     set reflist $refs
     # delete last newline
@@ -10172,54 +10190,54 @@ proc getallcommits {} {
     global gitdir
 
     if {![info exists allcommits]} {
-	set nextarc 0
-	set allcommits 0
-	set seeds {}
-	set allcwait 0
-	set cachedarcs 0
-	set allccache [file join $gitdir "gitk.cache"]
-	if {![catch {
-	    set f [open $allccache r]
-	    set allcwait 1
-	    getcache $f
-	}]} return
+        set nextarc 0
+        set allcommits 0
+        set seeds {}
+        set allcwait 0
+        set cachedarcs 0
+        set allccache [file join $gitdir "gitk.cache"]
+        if {![catch {
+            set f [open $allccache r]
+            set allcwait 1
+            getcache $f
+        }]} return
     }
 
     if {$allcwait} {
-	return
+        return
     }
     set cmd [list | git rev-list --parents]
     set allcupdate [expr {$seeds ne {}}]
     if {!$allcupdate} {
-	set ids "--all"
+        set ids "--all"
     } else {
-	set refs [concat [array names idheads] [array names idtags] \
-		      [array names idotherrefs]]
-	set ids {}
-	set tagobjs {}
-	foreach name [array names tagobjid] {
-	    lappend tagobjs $tagobjid($name)
-	}
-	foreach id [lsort -unique $refs] {
-	    if {![info exists allparents($id)] &&
-		[lsearch -exact $tagobjs $id] < 0} {
-		lappend ids $id
-	    }
-	}
-	if {$ids ne {}} {
-	    foreach id $seeds {
-		lappend ids "^$id"
-	    }
-	}
+        set refs [concat [array names idheads] [array names idtags] \
+                      [array names idotherrefs]]
+        set ids {}
+        set tagobjs {}
+        foreach name [array names tagobjid] {
+            lappend tagobjs $tagobjid($name)
+        }
+        foreach id [lsort -unique $refs] {
+            if {![info exists allparents($id)] &&
+                [lsearch -exact $tagobjs $id] < 0} {
+                lappend ids $id
+            }
+        }
+        if {$ids ne {}} {
+            foreach id $seeds {
+                lappend ids "^$id"
+            }
+        }
     }
     if {$ids ne {}} {
-	set fd [open [concat $cmd $ids] r]
-	fconfigure $fd -blocking 0
-	incr allcommits
-	nowbusy allcommits
-	filerun $fd [list getallclines $fd]
+        set fd [open [concat $cmd $ids] r]
+        fconfigure $fd -blocking 0
+        incr allcommits
+        nowbusy allcommits
+        filerun $fd [list getallclines $fd]
     } else {
-	dispneartags 0
+        dispneartags 0
     }
 }
 
@@ -10245,103 +10263,103 @@ proc getallclines {fd} {
 
     set nid 0
     while {[incr nid] <= 1000 && [gets $fd line] >= 0} {
-	set id [lindex $line 0]
-	if {[info exists allparents($id)]} {
-	    # seen it already
-	    continue
-	}
-	set cachedarcs 0
-	set olds [lrange $line 1 end]
-	set allparents($id) $olds
-	if {![info exists allchildren($id)]} {
-	    set allchildren($id) {}
-	    set arcnos($id) {}
-	    lappend seeds $id
-	} else {
-	    set a $arcnos($id)
-	    if {[llength $olds] == 1 && [llength $a] == 1} {
-		lappend arcids($a) $id
-		if {[info exists idtags($id)]} {
-		    lappend arctags($a) $id
-		}
-		if {[info exists idheads($id)]} {
-		    lappend archeads($a) $id
-		}
-		if {[info exists allparents($olds)]} {
-		    # seen parent already
-		    if {![info exists arcout($olds)]} {
-			splitarc $olds
-		    }
-		    lappend arcids($a) $olds
-		    set arcend($a) $olds
-		    unset growing($a)
-		}
-		lappend allchildren($olds) $id
-		lappend arcnos($olds) $a
-		continue
-	    }
-	}
-	foreach a $arcnos($id) {
-	    lappend arcids($a) $id
-	    set arcend($a) $id
-	    unset growing($a)
-	}
-
-	set ao {}
-	foreach p $olds {
-	    lappend allchildren($p) $id
-	    set a [incr nextarc]
-	    set arcstart($a) $id
-	    set archeads($a) {}
-	    set arctags($a) {}
-	    set archeads($a) {}
-	    set arcids($a) {}
-	    lappend ao $a
-	    set growing($a) 1
-	    if {[info exists allparents($p)]} {
-		# seen it already, may need to make a new branch
-		if {![info exists arcout($p)]} {
-		    splitarc $p
-		}
-		lappend arcids($a) $p
-		set arcend($a) $p
-		unset growing($a)
-	    }
-	    lappend arcnos($p) $a
-	}
-	set arcout($id) $ao
+        set id [lindex $line 0]
+        if {[info exists allparents($id)]} {
+            # seen it already
+            continue
+        }
+        set cachedarcs 0
+        set olds [lrange $line 1 end]
+        set allparents($id) $olds
+        if {![info exists allchildren($id)]} {
+            set allchildren($id) {}
+            set arcnos($id) {}
+            lappend seeds $id
+        } else {
+            set a $arcnos($id)
+            if {[llength $olds] == 1 && [llength $a] == 1} {
+                lappend arcids($a) $id
+                if {[info exists idtags($id)]} {
+                    lappend arctags($a) $id
+                }
+                if {[info exists idheads($id)]} {
+                    lappend archeads($a) $id
+                }
+                if {[info exists allparents($olds)]} {
+                    # seen parent already
+                    if {![info exists arcout($olds)]} {
+                        splitarc $olds
+                    }
+                    lappend arcids($a) $olds
+                    set arcend($a) $olds
+                    unset growing($a)
+                }
+                lappend allchildren($olds) $id
+                lappend arcnos($olds) $a
+                continue
+            }
+        }
+        foreach a $arcnos($id) {
+            lappend arcids($a) $id
+            set arcend($a) $id
+            unset growing($a)
+        }
+
+        set ao {}
+        foreach p $olds {
+            lappend allchildren($p) $id
+            set a [incr nextarc]
+            set arcstart($a) $id
+            set archeads($a) {}
+            set arctags($a) {}
+            set archeads($a) {}
+            set arcids($a) {}
+            lappend ao $a
+            set growing($a) 1
+            if {[info exists allparents($p)]} {
+                # seen it already, may need to make a new branch
+                if {![info exists arcout($p)]} {
+                    splitarc $p
+                }
+                lappend arcids($a) $p
+                set arcend($a) $p
+                unset growing($a)
+            }
+            lappend arcnos($p) $a
+        }
+        set arcout($id) $ao
     }
     if {$nid > 0} {
-	global cached_dheads cached_dtags cached_atags
-	unset -nocomplain cached_dheads
-	unset -nocomplain cached_dtags
-	unset -nocomplain cached_atags
+        global cached_dheads cached_dtags cached_atags
+        unset -nocomplain cached_dheads
+        unset -nocomplain cached_dtags
+        unset -nocomplain cached_atags
     }
     if {![eof $fd]} {
-	return [expr {$nid >= 1000? 2: 1}]
+        return [expr {$nid >= 1000? 2: 1}]
     }
     set cacheok 1
     if {[catch {
-	fconfigure $fd -blocking 1
-	close $fd
+        fconfigure $fd -blocking 1
+        close $fd
     } err]} {
-	# got an error reading the list of commits
-	# if we were updating, try rereading the whole thing again
-	if {$allcupdate} {
-	    incr allcommits -1
-	    dropcache $err
-	    return
-	}
-	error_popup "[mc "Error reading commit topology information;\
-		branch and preceding/following tag information\
-	        will be incomplete."]\n($err)"
-	set cacheok 0
+        # got an error reading the list of commits
+        # if we were updating, try rereading the whole thing again
+        if {$allcupdate} {
+            incr allcommits -1
+            dropcache $err
+            return
+        }
+        error_popup "[mc "Error reading commit topology information;\
+                branch and preceding/following tag information\
+                will be incomplete."]\n($err)"
+        set cacheok 0
     }
     if {[incr allcommits -1] == 0} {
-	notbusy allcommits
-	if {$cacheok} {
-	    run savecache
-	}
+        notbusy allcommits
+        if {$cacheok} {
+            run savecache
+        }
     }
     dispneartags 0
     return 0
@@ -10353,12 +10371,12 @@ proc recalcarc {a} {
     set at {}
     set ah {}
     foreach id [lrange $arcids($a) 0 end-1] {
-	if {[info exists idtags($id)]} {
-	    lappend at $id
-	}
-	if {[info exists idheads($id)]} {
-	    lappend ah $id
-	}
+        if {[info exists idtags($id)]} {
+            lappend at $id
+        }
+        if {[info exists idheads($id)]} {
+            lappend ah $id
+        }
     }
     set arctags($a) $at
     set archeads($a) $ah
@@ -10370,22 +10388,22 @@ proc splitarc {p} {
 
     set a $arcnos($p)
     if {[llength $a] != 1} {
-	puts "oops splitarc called but [llength $a] arcs already"
-	return
+        puts "oops splitarc called but [llength $a] arcs already"
+        return
     }
     set a [lindex $a 0]
     set i [lsearch -exact $arcids($a) $p]
     if {$i < 0} {
-	puts "oops splitarc $p not in arc $a"
-	return
+        puts "oops splitarc $p not in arc $a"
+        return
     }
     set na [incr nextarc]
     if {[info exists arcend($a)]} {
-	set arcend($na) $arcend($a)
+        set arcend($na) $arcend($a)
     } else {
-	set l [lindex $allparents([lindex $arcids($a) end]) 0]
-	set j [lsearch -exact $arcnos($l) $a]
-	set arcnos($l) [lreplace $arcnos($l) $j $j $na]
+        set l [lindex $allparents([lindex $arcids($a) end]) 0]
+        set j [lsearch -exact $arcnos($l) $a]
+        set arcnos($l) [lreplace $arcnos($l) $j $j $na]
     }
     set tail [lrange $arcids($a) [expr {$i+1}] end]
     set arcids($a) [lrange $arcids($a) 0 $i]
@@ -10394,26 +10412,26 @@ proc splitarc {p} {
     set arcout($p) $na
     set arcids($na) $tail
     if {[info exists growing($a)]} {
-	set growing($na) 1
-	unset growing($a)
+        set growing($na) 1
+        unset growing($a)
     }
 
     foreach id $tail {
-	if {[llength $arcnos($id)] == 1} {
-	    set arcnos($id) $na
-	} else {
-	    set j [lsearch -exact $arcnos($id) $a]
-	    set arcnos($id) [lreplace $arcnos($id) $j $j $na]
-	}
+        if {[llength $arcnos($id)] == 1} {
+            set arcnos($id) $na
+        } else {
+            set j [lsearch -exact $arcnos($id) $a]
+            set arcnos($id) [lreplace $arcnos($id) $j $j $na]
+        }
     }
 
     # reconstruct tags and heads lists
     if {$arctags($a) ne {} || $archeads($a) ne {}} {
-	recalcarc $a
-	recalcarc $na
+        recalcarc $a
+        recalcarc $na
     } else {
-	set arctags($na) {}
-	set archeads($na) {}
+        set arctags($na) {}
+        set archeads($na) {}
     }
 }
 
@@ -10437,7 +10455,7 @@ proc addnewchild {id p} {
     set arcids($a) [list $p]
     set arcend($a) $p
     if {![info exists arcout($p)]} {
-	splitarc $p
+        splitarc $p
     }
     lappend arcnos($p) $a
     set arcout($id) [list $a]
@@ -10454,78 +10472,78 @@ proc readcache {f} {
     set a $nextarc
     set lim $cachedarcs
     if {$lim - $a > 500} {
-	set lim [expr {$a + 500}]
+        set lim [expr {$a + 500}]
     }
     if {[catch {
-	if {$a == $lim} {
-	    # finish reading the cache and setting up arctags, etc.
-	    set line [gets $f]
-	    if {$line ne "1"} {error "bad final version"}
-	    close $f
-	    foreach id [array names idtags] {
-		if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
-		    [llength $allparents($id)] == 1} {
-		    set a [lindex $arcnos($id) 0]
-		    if {$arctags($a) eq {}} {
-			recalcarc $a
-		    }
-		}
-	    }
-	    foreach id [array names idheads] {
-		if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
-		    [llength $allparents($id)] == 1} {
-		    set a [lindex $arcnos($id) 0]
-		    if {$archeads($a) eq {}} {
-			recalcarc $a
-		    }
-		}
-	    }
-	    foreach id [lsort -unique $possible_seeds] {
-		if {$arcnos($id) eq {}} {
-		    lappend seeds $id
-		}
-	    }
-	    set allcwait 0
-	} else {
-	    while {[incr a] <= $lim} {
-		set line [gets $f]
-		if {[llength $line] != 3} {error "bad line"}
-		set s [lindex $line 0]
-		set arcstart($a) $s
-		lappend arcout($s) $a
-		if {![info exists arcnos($s)]} {
-		    lappend possible_seeds $s
-		    set arcnos($s) {}
-		}
-		set e [lindex $line 1]
-		if {$e eq {}} {
-		    set growing($a) 1
-		} else {
-		    set arcend($a) $e
-		    if {![info exists arcout($e)]} {
-			set arcout($e) {}
-		    }
-		}
-		set arcids($a) [lindex $line 2]
-		foreach id $arcids($a) {
-		    lappend allparents($s) $id
-		    set s $id
-		    lappend arcnos($id) $a
-		}
-		if {![info exists allparents($s)]} {
-		    set allparents($s) {}
-		}
-		set arctags($a) {}
-		set archeads($a) {}
-	    }
-	    set nextarc [expr {$a - 1}]
-	}
+        if {$a == $lim} {
+            # finish reading the cache and setting up arctags, etc.
+            set line [gets $f]
+            if {$line ne "1"} {error "bad final version"}
+            close $f
+            foreach id [array names idtags] {
+                if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
+                    [llength $allparents($id)] == 1} {
+                    set a [lindex $arcnos($id) 0]
+                    if {$arctags($a) eq {}} {
+                        recalcarc $a
+                    }
+                }
+            }
+            foreach id [array names idheads] {
+                if {[info exists arcnos($id)] && [llength $arcnos($id)] == 1 &&
+                    [llength $allparents($id)] == 1} {
+                    set a [lindex $arcnos($id) 0]
+                    if {$archeads($a) eq {}} {
+                        recalcarc $a
+                    }
+                }
+            }
+            foreach id [lsort -unique $possible_seeds] {
+                if {$arcnos($id) eq {}} {
+                    lappend seeds $id
+                }
+            }
+            set allcwait 0
+        } else {
+            while {[incr a] <= $lim} {
+                set line [gets $f]
+                if {[llength $line] != 3} {error "bad line"}
+                set s [lindex $line 0]
+                set arcstart($a) $s
+                lappend arcout($s) $a
+                if {![info exists arcnos($s)]} {
+                    lappend possible_seeds $s
+                    set arcnos($s) {}
+                }
+                set e [lindex $line 1]
+                if {$e eq {}} {
+                    set growing($a) 1
+                } else {
+                    set arcend($a) $e
+                    if {![info exists arcout($e)]} {
+                        set arcout($e) {}
+                    }
+                }
+                set arcids($a) [lindex $line 2]
+                foreach id $arcids($a) {
+                    lappend allparents($s) $id
+                    set s $id
+                    lappend arcnos($id) $a
+                }
+                if {![info exists allparents($s)]} {
+                    set allparents($s) {}
+                }
+                set arctags($a) {}
+                set archeads($a) {}
+            }
+            set nextarc [expr {$a - 1}]
+        }
     } err]} {
-	dropcache $err
-	return 0
+        dropcache $err
+        return 0
     }
     if {!$allcwait} {
-	getallcommits
+        getallcommits
     }
     return $allcwait
 }
@@ -10534,16 +10552,16 @@ proc getcache {f} {
     global nextarc cachedarcs possible_seeds
 
     if {[catch {
-	set line [gets $f]
-	if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"}
-	# make sure it's an integer
-	set cachedarcs [expr {int([lindex $line 1])}]
-	if {$cachedarcs < 0} {error "bad number of arcs"}
-	set nextarc 0
-	set possible_seeds {}
-	run readcache $f
+        set line [gets $f]
+        if {[llength $line] != 2 || [lindex $line 0] ne "1"} {error "bad version"}
+        # make sure it's an integer
+        set cachedarcs [expr {int([lindex $line 1])}]
+        if {$cachedarcs < 0} {error "bad number of arcs"}
+        set nextarc 0
+        set possible_seeds {}
+        run readcache $f
     } err]} {
-	dropcache $err
+        dropcache $err
     }
     return 0
 }
@@ -10553,9 +10571,9 @@ proc dropcache {err} {
 
     #puts "dropping cache ($err)"
     foreach v {arcnos arcout arcids arcstart arcend growing \
-		   arctags archeads allparents allchildren} {
-	global $v
-	unset -nocomplain $v
+                   arctags archeads allparents allchildren} {
+        global $v
+        unset -nocomplain $v
     }
     set allcwait 0
     set nextarc 0
@@ -10571,27 +10589,27 @@ proc writecache {f} {
     set a $cachearc
     set lim $cachedarcs
     if {$lim - $a > 1000} {
-	set lim [expr {$a + 1000}]
+        set lim [expr {$a + 1000}]
     }
     if {[catch {
-	while {[incr a] <= $lim} {
-	    if {[info exists arcend($a)]} {
-		puts $f [list $arcstart($a) $arcend($a) $arcids($a)]
-	    } else {
-		puts $f [list $arcstart($a) {} $arcids($a)]
-	    }
-	}
+        while {[incr a] <= $lim} {
+            if {[info exists arcend($a)]} {
+                puts $f [list $arcstart($a) $arcend($a) $arcids($a)]
+            } else {
+                puts $f [list $arcstart($a) {} $arcids($a)]
+            }
+        }
     } err]} {
-	catch {close $f}
-	catch {file delete $allccache}
-	#puts "writing cache failed ($err)"
-	return 0
+        catch {close $f}
+        catch {file delete $allccache}
+        #puts "writing cache failed ($err)"
+        return 0
     }
     set cachearc [expr {$a - 1}]
     if {$a > $cachedarcs} {
-	puts $f "1"
-	close $f
-	return 0
+        puts $f "1"
+        close $f
+        return 0
     }
     return 1
 }
@@ -10603,9 +10621,9 @@ proc savecache {} {
     set cachearc 0
     set cachedarcs $nextarc
     catch {
-	set f [open $allccache w]
-	puts $f [list 1 $cachedarcs]
-	run writecache $f
+        set f [open $allccache w]
+        puts $f [list 1 $cachedarcs]
+        run writecache $f
     }
 }
 
@@ -10615,92 +10633,92 @@ proc anc_or_desc {a b} {
     global arcout arcstart arcend arcnos cached_isanc
 
     if {$arcnos($a) eq $arcnos($b)} {
-	# Both are on the same arc(s); either both are the same BMP,
-	# or if one is not a BMP, the other is also not a BMP or is
-	# the BMP at end of the arc (and it only has 1 incoming arc).
-	# Or both can be BMPs with no incoming arcs.
-	if {$a eq $b || $arcnos($a) eq {}} {
-	    return 0
-	}
-	# assert {[llength $arcnos($a)] == 1}
-	set arc [lindex $arcnos($a) 0]
-	set i [lsearch -exact $arcids($arc) $a]
-	set j [lsearch -exact $arcids($arc) $b]
-	if {$i < 0 || $i > $j} {
-	    return 1
-	} else {
-	    return -1
-	}
+        # Both are on the same arc(s); either both are the same BMP,
+        # or if one is not a BMP, the other is also not a BMP or is
+        # the BMP at end of the arc (and it only has 1 incoming arc).
+        # Or both can be BMPs with no incoming arcs.
+        if {$a eq $b || $arcnos($a) eq {}} {
+            return 0
+        }
+        # assert {[llength $arcnos($a)] == 1}
+        set arc [lindex $arcnos($a) 0]
+        set i [lsearch -exact $arcids($arc) $a]
+        set j [lsearch -exact $arcids($arc) $b]
+        if {$i < 0 || $i > $j} {
+            return 1
+        } else {
+            return -1
+        }
     }
 
     if {![info exists arcout($a)]} {
-	set arc [lindex $arcnos($a) 0]
-	if {[info exists arcend($arc)]} {
-	    set aend $arcend($arc)
-	} else {
-	    set aend {}
-	}
-	set a $arcstart($arc)
+        set arc [lindex $arcnos($a) 0]
+        if {[info exists arcend($arc)]} {
+            set aend $arcend($arc)
+        } else {
+            set aend {}
+        }
+        set a $arcstart($arc)
     } else {
-	set aend $a
+        set aend $a
     }
     if {![info exists arcout($b)]} {
-	set arc [lindex $arcnos($b) 0]
-	if {[info exists arcend($arc)]} {
-	    set bend $arcend($arc)
-	} else {
-	    set bend {}
-	}
-	set b $arcstart($arc)
+        set arc [lindex $arcnos($b) 0]
+        if {[info exists arcend($arc)]} {
+            set bend $arcend($arc)
+        } else {
+            set bend {}
+        }
+        set b $arcstart($arc)
     } else {
-	set bend $b
+        set bend $b
     }
     if {$a eq $bend} {
-	return 1
+        return 1
     }
     if {$b eq $aend} {
-	return -1
+        return -1
     }
     if {[info exists cached_isanc($a,$bend)]} {
-	if {$cached_isanc($a,$bend)} {
-	    return 1
-	}
+        if {$cached_isanc($a,$bend)} {
+            return 1
+        }
     }
     if {[info exists cached_isanc($b,$aend)]} {
-	if {$cached_isanc($b,$aend)} {
-	    return -1
-	}
-	if {[info exists cached_isanc($a,$bend)]} {
-	    return 0
-	}
+        if {$cached_isanc($b,$aend)} {
+            return -1
+        }
+        if {[info exists cached_isanc($a,$bend)]} {
+            return 0
+        }
     }
 
     set todo [list $a $b]
     set anc($a) a
     set anc($b) b
     for {set i 0} {$i < [llength $todo]} {incr i} {
-	set x [lindex $todo $i]
-	if {$anc($x) eq {}} {
-	    continue
-	}
-	foreach arc $arcnos($x) {
-	    set xd $arcstart($arc)
-	    if {$xd eq $bend} {
-		set cached_isanc($a,$bend) 1
-		set cached_isanc($b,$aend) 0
-		return 1
-	    } elseif {$xd eq $aend} {
-		set cached_isanc($b,$aend) 1
-		set cached_isanc($a,$bend) 0
-		return -1
-	    }
-	    if {![info exists anc($xd)]} {
-		set anc($xd) $anc($x)
-		lappend todo $xd
-	    } elseif {$anc($xd) ne $anc($x)} {
-		set anc($xd) {}
-	    }
-	}
+        set x [lindex $todo $i]
+        if {$anc($x) eq {}} {
+            continue
+        }
+        foreach arc $arcnos($x) {
+            set xd $arcstart($arc)
+            if {$xd eq $bend} {
+                set cached_isanc($a,$bend) 1
+                set cached_isanc($b,$aend) 0
+                return 1
+            } elseif {$xd eq $aend} {
+                set cached_isanc($b,$aend) 1
+                set cached_isanc($a,$bend) 0
+                return -1
+            }
+            if {![info exists anc($xd)]} {
+                set anc($xd) $anc($x)
+                lappend todo $xd
+            } elseif {$anc($xd) ne $anc($x)} {
+                set anc($xd) {}
+            }
+        }
     }
     set cached_isanc($a,$bend) 0
     set cached_isanc($b,$aend) 0
@@ -10723,90 +10741,90 @@ proc is_certain {desc anc} {
 
     set certain {}
     if {[llength $arcnos($anc)] == 1} {
-	# tags on the same arc are certain
-	if {$arcnos($desc) eq $arcnos($anc)} {
-	    return 1
-	}
-	if {![info exists arcout($anc)]} {
-	    # if $anc is partway along an arc, use the start of the arc instead
-	    set a [lindex $arcnos($anc) 0]
-	    set anc $arcstart($a)
-	}
+        # tags on the same arc are certain
+        if {$arcnos($desc) eq $arcnos($anc)} {
+            return 1
+        }
+        if {![info exists arcout($anc)]} {
+            # if $anc is partway along an arc, use the start of the arc instead
+            set a [lindex $arcnos($anc) 0]
+            set anc $arcstart($a)
+        }
     }
     if {[llength $arcnos($desc)] > 1 || [info exists arcout($desc)]} {
-	set x $desc
+        set x $desc
     } else {
-	set a [lindex $arcnos($desc) 0]
-	set x $arcend($a)
+        set a [lindex $arcnos($desc) 0]
+        set x $arcend($a)
     }
     if {$x == $anc} {
-	return 1
+        return 1
     }
     set anclist [list $x]
     set dl($x) 1
     set nnh 1
     set ngrowanc 0
     for {set i 0} {$i < [llength $anclist] && ($nnh > 0 || $ngrowanc > 0)} {incr i} {
-	set x [lindex $anclist $i]
-	if {$dl($x)} {
-	    incr nnh -1
-	}
-	set done($x) 1
-	foreach a $arcout($x) {
-	    if {[info exists growing($a)]} {
-		if {![info exists growanc($x)] && $dl($x)} {
-		    set growanc($x) 1
-		    incr ngrowanc
-		}
-	    } else {
-		set y $arcend($a)
-		if {[info exists dl($y)]} {
-		    if {$dl($y)} {
-			if {!$dl($x)} {
-			    set dl($y) 0
-			    if {![info exists done($y)]} {
-				incr nnh -1
-			    }
-			    if {[info exists growanc($x)]} {
-				incr ngrowanc -1
-			    }
-			    set xl [list $y]
-			    for {set k 0} {$k < [llength $xl]} {incr k} {
-				set z [lindex $xl $k]
-				foreach c $arcout($z) {
-				    if {[info exists arcend($c)]} {
-					set v $arcend($c)
-					if {[info exists dl($v)] && $dl($v)} {
-					    set dl($v) 0
-					    if {![info exists done($v)]} {
-						incr nnh -1
-					    }
-					    if {[info exists growanc($v)]} {
-						incr ngrowanc -1
-					    }
-					    lappend xl $v
-					}
-				    }
-				}
-			    }
-			}
-		    }
-		} elseif {$y eq $anc || !$dl($x)} {
-		    set dl($y) 0
-		    lappend anclist $y
-		} else {
-		    set dl($y) 1
-		    lappend anclist $y
-		    incr nnh
-		}
-	    }
-	}
+        set x [lindex $anclist $i]
+        if {$dl($x)} {
+            incr nnh -1
+        }
+        set done($x) 1
+        foreach a $arcout($x) {
+            if {[info exists growing($a)]} {
+                if {![info exists growanc($x)] && $dl($x)} {
+                    set growanc($x) 1
+                    incr ngrowanc
+                }
+            } else {
+                set y $arcend($a)
+                if {[info exists dl($y)]} {
+                    if {$dl($y)} {
+                        if {!$dl($x)} {
+                            set dl($y) 0
+                            if {![info exists done($y)]} {
+                                incr nnh -1
+                            }
+                            if {[info exists growanc($x)]} {
+                                incr ngrowanc -1
+                            }
+                            set xl [list $y]
+                            for {set k 0} {$k < [llength $xl]} {incr k} {
+                                set z [lindex $xl $k]
+                                foreach c $arcout($z) {
+                                    if {[info exists arcend($c)]} {
+                                        set v $arcend($c)
+                                        if {[info exists dl($v)] && $dl($v)} {
+                                            set dl($v) 0
+                                            if {![info exists done($v)]} {
+                                                incr nnh -1
+                                            }
+                                            if {[info exists growanc($v)]} {
+                                                incr ngrowanc -1
+                                            }
+                                            lappend xl $v
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } elseif {$y eq $anc || !$dl($x)} {
+                    set dl($y) 0
+                    lappend anclist $y
+                } else {
+                    set dl($y) 1
+                    lappend anclist $y
+                    incr nnh
+                }
+            }
+        }
     }
     foreach x [array names growanc] {
-	if {$dl($x)} {
-	    return 0
-	}
-	return 0
+        if {$dl($x)} {
+            return 0
+        }
+        return 0
     }
     return 1
 }
@@ -10817,11 +10835,11 @@ proc validate_arctags {a} {
     set i -1
     set na $arctags($a)
     foreach id $arctags($a) {
-	incr i
-	if {![info exists idtags($id)]} {
-	    set na [lreplace $na $i $i]
-	    incr i -1
-	}
+        incr i
+        if {![info exists idtags($id)]} {
+            set na [lreplace $na $i $i]
+            incr i -1
+        }
     }
     set arctags($a) $na
 }
@@ -10832,11 +10850,11 @@ proc validate_archeads {a} {
     set i -1
     set na $archeads($a)
     foreach id $archeads($a) {
-	incr i
-	if {![info exists idheads($id)]} {
-	    set na [lreplace $na $i $i]
-	    incr i -1
-	}
+        incr i
+        if {![info exists idheads($id)]} {
+            set na [lreplace $na $i $i]
+            incr i -1
+        }
     }
     set archeads($a) $na
 }
@@ -10848,33 +10866,33 @@ proc desctags {id} {
     global growing cached_dtags
 
     if {![info exists allparents($id)]} {
-	return {}
+        return {}
     }
     set t1 [clock clicks -milliseconds]
     set argid $id
     if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
-	# part-way along an arc; check that arc first
-	set a [lindex $arcnos($id) 0]
-	if {$arctags($a) ne {}} {
-	    validate_arctags $a
-	    set i [lsearch -exact $arcids($a) $id]
-	    set tid {}
-	    foreach t $arctags($a) {
-		set j [lsearch -exact $arcids($a) $t]
-		if {$j >= $i} break
-		set tid $t
-	    }
-	    if {$tid ne {}} {
-		return $tid
-	    }
-	}
-	set id $arcstart($a)
-	if {[info exists idtags($id)]} {
-	    return $id
-	}
+        # part-way along an arc; check that arc first
+        set a [lindex $arcnos($id) 0]
+        if {$arctags($a) ne {}} {
+            validate_arctags $a
+            set i [lsearch -exact $arcids($a) $id]
+            set tid {}
+            foreach t $arctags($a) {
+                set j [lsearch -exact $arcids($a) $t]
+                if {$j >= $i} break
+                set tid $t
+            }
+            if {$tid ne {}} {
+                return $tid
+            }
+        }
+        set id $arcstart($a)
+        if {[info exists idtags($id)]} {
+            return $id
+        }
     }
     if {[info exists cached_dtags($id)]} {
-	return $cached_dtags($id)
+        return $cached_dtags($id)
     }
 
     set origid $id
@@ -10882,111 +10900,111 @@ proc desctags {id} {
     set queued($id) 1
     set nc 1
     for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
-	set id [lindex $todo $i]
-	set done($id) 1
-	set ta [info exists hastaggedancestor($id)]
-	if {!$ta} {
-	    incr nc -1
-	}
-	# ignore tags on starting node
-	if {!$ta && $i > 0} {
-	    if {[info exists idtags($id)]} {
-		set tagloc($id) $id
-		set ta 1
-	    } elseif {[info exists cached_dtags($id)]} {
-		set tagloc($id) $cached_dtags($id)
-		set ta 1
-	    }
-	}
-	foreach a $arcnos($id) {
-	    set d $arcstart($a)
-	    if {!$ta && $arctags($a) ne {}} {
-		validate_arctags $a
-		if {$arctags($a) ne {}} {
-		    lappend tagloc($id) [lindex $arctags($a) end]
-		}
-	    }
-	    if {$ta || $arctags($a) ne {}} {
-		set tomark [list $d]
-		for {set j 0} {$j < [llength $tomark]} {incr j} {
-		    set dd [lindex $tomark $j]
-		    if {![info exists hastaggedancestor($dd)]} {
-			if {[info exists done($dd)]} {
-			    foreach b $arcnos($dd) {
-				lappend tomark $arcstart($b)
-			    }
-			    if {[info exists tagloc($dd)]} {
-				unset tagloc($dd)
-			    }
-			} elseif {[info exists queued($dd)]} {
-			    incr nc -1
-			}
-			set hastaggedancestor($dd) 1
-		    }
-		}
-	    }
-	    if {![info exists queued($d)]} {
-		lappend todo $d
-		set queued($d) 1
-		if {![info exists hastaggedancestor($d)]} {
-		    incr nc
-		}
-	    }
-	}
+        set id [lindex $todo $i]
+        set done($id) 1
+        set ta [info exists hastaggedancestor($id)]
+        if {!$ta} {
+            incr nc -1
+        }
+        # ignore tags on starting node
+        if {!$ta && $i > 0} {
+            if {[info exists idtags($id)]} {
+                set tagloc($id) $id
+                set ta 1
+            } elseif {[info exists cached_dtags($id)]} {
+                set tagloc($id) $cached_dtags($id)
+                set ta 1
+            }
+        }
+        foreach a $arcnos($id) {
+            set d $arcstart($a)
+            if {!$ta && $arctags($a) ne {}} {
+                validate_arctags $a
+                if {$arctags($a) ne {}} {
+                    lappend tagloc($id) [lindex $arctags($a) end]
+                }
+            }
+            if {$ta || $arctags($a) ne {}} {
+                set tomark [list $d]
+                for {set j 0} {$j < [llength $tomark]} {incr j} {
+                    set dd [lindex $tomark $j]
+                    if {![info exists hastaggedancestor($dd)]} {
+                        if {[info exists done($dd)]} {
+                            foreach b $arcnos($dd) {
+                                lappend tomark $arcstart($b)
+                            }
+                            if {[info exists tagloc($dd)]} {
+                                unset tagloc($dd)
+                            }
+                        } elseif {[info exists queued($dd)]} {
+                            incr nc -1
+                        }
+                        set hastaggedancestor($dd) 1
+                    }
+                }
+            }
+            if {![info exists queued($d)]} {
+                lappend todo $d
+                set queued($d) 1
+                if {![info exists hastaggedancestor($d)]} {
+                    incr nc
+                }
+            }
+        }
     }
     set tags {}
     foreach id [array names tagloc] {
-	if {![info exists hastaggedancestor($id)]} {
-	    foreach t $tagloc($id) {
-		if {[lsearch -exact $tags $t] < 0} {
-		    lappend tags $t
-		}
-	    }
-	}
+        if {![info exists hastaggedancestor($id)]} {
+            foreach t $tagloc($id) {
+                if {[lsearch -exact $tags $t] < 0} {
+                    lappend tags $t
+                }
+            }
+        }
     }
     set t2 [clock clicks -milliseconds]
     set loopix $i
 
     # remove tags that are descendents of other tags
     for {set i 0} {$i < [llength $tags]} {incr i} {
-	set a [lindex $tags $i]
-	for {set j 0} {$j < $i} {incr j} {
-	    set b [lindex $tags $j]
-	    set r [anc_or_desc $a $b]
-	    if {$r == 1} {
-		set tags [lreplace $tags $j $j]
-		incr j -1
-		incr i -1
-	    } elseif {$r == -1} {
-		set tags [lreplace $tags $i $i]
-		incr i -1
-		break
-	    }
-	}
+        set a [lindex $tags $i]
+        for {set j 0} {$j < $i} {incr j} {
+            set b [lindex $tags $j]
+            set r [anc_or_desc $a $b]
+            if {$r == 1} {
+                set tags [lreplace $tags $j $j]
+                incr j -1
+                incr i -1
+            } elseif {$r == -1} {
+                set tags [lreplace $tags $i $i]
+                incr i -1
+                break
+            }
+        }
     }
 
     if {[array names growing] ne {}} {
-	# graph isn't finished, need to check if any tag could get
-	# eclipsed by another tag coming later.  Simply ignore any
-	# tags that could later get eclipsed.
-	set ctags {}
-	foreach t $tags {
-	    if {[is_certain $t $origid]} {
-		lappend ctags $t
-	    }
-	}
-	if {$tags eq $ctags} {
-	    set cached_dtags($origid) $tags
-	} else {
-	    set tags $ctags
-	}
+        # graph isn't finished, need to check if any tag could get
+        # eclipsed by another tag coming later.  Simply ignore any
+        # tags that could later get eclipsed.
+        set ctags {}
+        foreach t $tags {
+            if {[is_certain $t $origid]} {
+                lappend ctags $t
+            }
+        }
+        if {$tags eq $ctags} {
+            set cached_dtags($origid) $tags
+        } else {
+            set tags $ctags
+        }
     } else {
-	set cached_dtags($origid) $tags
+        set cached_dtags($origid) $tags
     }
     set t3 [clock clicks -milliseconds]
     if {0 && $t3 - $t1 >= 100} {
-	puts "iterating descendents ($loopix/[llength $todo] nodes) took\
-    	    [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
+        puts "iterating descendents ($loopix/[llength $todo] nodes) took\
+            [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
     }
     return $tags
 }
@@ -10996,33 +11014,33 @@ proc anctags {id} {
     global growing cached_atags
 
     if {![info exists allparents($id)]} {
-	return {}
+        return {}
     }
     set t1 [clock clicks -milliseconds]
     set argid $id
     if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} {
-	# part-way along an arc; check that arc first
-	set a [lindex $arcnos($id) 0]
-	if {$arctags($a) ne {}} {
-	    validate_arctags $a
-	    set i [lsearch -exact $arcids($a) $id]
-	    foreach t $arctags($a) {
-		set j [lsearch -exact $arcids($a) $t]
-		if {$j > $i} {
-		    return $t
-		}
-	    }
-	}
-	if {![info exists arcend($a)]} {
-	    return {}
-	}
-	set id $arcend($a)
-	if {[info exists idtags($id)]} {
-	    return $id
-	}
+        # part-way along an arc; check that arc first
+        set a [lindex $arcnos($id) 0]
+        if {$arctags($a) ne {}} {
+            validate_arctags $a
+            set i [lsearch -exact $arcids($a) $id]
+            foreach t $arctags($a) {
+                set j [lsearch -exact $arcids($a) $t]
+                if {$j > $i} {
+                    return $t
+                }
+            }
+        }
+        if {![info exists arcend($a)]} {
+            return {}
+        }
+        set id $arcend($a)
+        if {[info exists idtags($id)]} {
+            return $id
+        }
     }
     if {[info exists cached_atags($id)]} {
-	return $cached_atags($id)
+        return $cached_atags($id)
     }
 
     set origid $id
@@ -11031,114 +11049,114 @@ proc anctags {id} {
     set taglist {}
     set nc 1
     for {set i 0} {$i < [llength $todo] && $nc > 0} {incr i} {
-	set id [lindex $todo $i]
-	set done($id) 1
-	set td [info exists hastaggeddescendent($id)]
-	if {!$td} {
-	    incr nc -1
-	}
-	# ignore tags on starting node
-	if {!$td && $i > 0} {
-	    if {[info exists idtags($id)]} {
-		set tagloc($id) $id
-		set td 1
-	    } elseif {[info exists cached_atags($id)]} {
-		set tagloc($id) $cached_atags($id)
-		set td 1
-	    }
-	}
-	foreach a $arcout($id) {
-	    if {!$td && $arctags($a) ne {}} {
-		validate_arctags $a
-		if {$arctags($a) ne {}} {
-		    lappend tagloc($id) [lindex $arctags($a) 0]
-		}
-	    }
-	    if {![info exists arcend($a)]} continue
-	    set d $arcend($a)
-	    if {$td || $arctags($a) ne {}} {
-		set tomark [list $d]
-		for {set j 0} {$j < [llength $tomark]} {incr j} {
-		    set dd [lindex $tomark $j]
-		    if {![info exists hastaggeddescendent($dd)]} {
-			if {[info exists done($dd)]} {
-			    foreach b $arcout($dd) {
-				if {[info exists arcend($b)]} {
-				    lappend tomark $arcend($b)
-				}
-			    }
-			    if {[info exists tagloc($dd)]} {
-				unset tagloc($dd)
-			    }
-			} elseif {[info exists queued($dd)]} {
-			    incr nc -1
-			}
-			set hastaggeddescendent($dd) 1
-		    }
-		}
-	    }
-	    if {![info exists queued($d)]} {
-		lappend todo $d
-		set queued($d) 1
-		if {![info exists hastaggeddescendent($d)]} {
-		    incr nc
-		}
-	    }
-	}
+        set id [lindex $todo $i]
+        set done($id) 1
+        set td [info exists hastaggeddescendent($id)]
+        if {!$td} {
+            incr nc -1
+        }
+        # ignore tags on starting node
+        if {!$td && $i > 0} {
+            if {[info exists idtags($id)]} {
+                set tagloc($id) $id
+                set td 1
+            } elseif {[info exists cached_atags($id)]} {
+                set tagloc($id) $cached_atags($id)
+                set td 1
+            }
+        }
+        foreach a $arcout($id) {
+            if {!$td && $arctags($a) ne {}} {
+                validate_arctags $a
+                if {$arctags($a) ne {}} {
+                    lappend tagloc($id) [lindex $arctags($a) 0]
+                }
+            }
+            if {![info exists arcend($a)]} continue
+            set d $arcend($a)
+            if {$td || $arctags($a) ne {}} {
+                set tomark [list $d]
+                for {set j 0} {$j < [llength $tomark]} {incr j} {
+                    set dd [lindex $tomark $j]
+                    if {![info exists hastaggeddescendent($dd)]} {
+                        if {[info exists done($dd)]} {
+                            foreach b $arcout($dd) {
+                                if {[info exists arcend($b)]} {
+                                    lappend tomark $arcend($b)
+                                }
+                            }
+                            if {[info exists tagloc($dd)]} {
+                                unset tagloc($dd)
+                            }
+                        } elseif {[info exists queued($dd)]} {
+                            incr nc -1
+                        }
+                        set hastaggeddescendent($dd) 1
+                    }
+                }
+            }
+            if {![info exists queued($d)]} {
+                lappend todo $d
+                set queued($d) 1
+                if {![info exists hastaggeddescendent($d)]} {
+                    incr nc
+                }
+            }
+        }
     }
     set t2 [clock clicks -milliseconds]
     set loopix $i
     set tags {}
     foreach id [array names tagloc] {
-	if {![info exists hastaggeddescendent($id)]} {
-	    foreach t $tagloc($id) {
-		if {[lsearch -exact $tags $t] < 0} {
-		    lappend tags $t
-		}
-	    }
-	}
+        if {![info exists hastaggeddescendent($id)]} {
+            foreach t $tagloc($id) {
+                if {[lsearch -exact $tags $t] < 0} {
+                    lappend tags $t
+                }
+            }
+        }
     }
 
     # remove tags that are ancestors of other tags
     for {set i 0} {$i < [llength $tags]} {incr i} {
-	set a [lindex $tags $i]
-	for {set j 0} {$j < $i} {incr j} {
-	    set b [lindex $tags $j]
-	    set r [anc_or_desc $a $b]
-	    if {$r == -1} {
-		set tags [lreplace $tags $j $j]
-		incr j -1
-		incr i -1
-	    } elseif {$r == 1} {
-		set tags [lreplace $tags $i $i]
-		incr i -1
-		break
-	    }
-	}
+        set a [lindex $tags $i]
+        for {set j 0} {$j < $i} {incr j} {
+            set b [lindex $tags $j]
+            set r [anc_or_desc $a $b]
+            if {$r == -1} {
+                set tags [lreplace $tags $j $j]
+                incr j -1
+                incr i -1
+            } elseif {$r == 1} {
+                set tags [lreplace $tags $i $i]
+                incr i -1
+                break
+            }
+        }
     }
 
     if {[array names growing] ne {}} {
-	# graph isn't finished, need to check if any tag could get
-	# eclipsed by another tag coming later.  Simply ignore any
-	# tags that could later get eclipsed.
-	set ctags {}
-	foreach t $tags {
-	    if {[is_certain $origid $t]} {
-		lappend ctags $t
-	    }
-	}
-	if {$tags eq $ctags} {
-	    set cached_atags($origid) $tags
-	} else {
-	    set tags $ctags
-	}
+        # graph isn't finished, need to check if any tag could get
+        # eclipsed by another tag coming later.  Simply ignore any
+        # tags that could later get eclipsed.
+        set ctags {}
+        foreach t $tags {
+            if {[is_certain $origid $t]} {
+                lappend ctags $t
+            }
+        }
+        if {$tags eq $ctags} {
+            set cached_atags($origid) $tags
+        } else {
+            set tags $ctags
+        }
     } else {
-	set cached_atags($origid) $tags
+        set cached_atags($origid) $tags
     }
     set t3 [clock clicks -milliseconds]
     if {0 && $t3 - $t1 >= 100} {
-	puts "iterating ancestors ($loopix/[llength $todo] nodes) took\
-    	    [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
+        puts "iterating ancestors ($loopix/[llength $todo] nodes) took\
+            [expr {$t2-$t1}]+[expr {$t3-$t2}]ms, $nc candidates left"
     }
     return $tags
 }
@@ -11150,49 +11168,49 @@ proc descheads {id} {
     global allparents arcout
 
     if {![info exists allparents($id)]} {
-	return {}
+        return {}
     }
     set aret {}
     if {![info exists arcout($id)]} {
-	# part-way along an arc; check it first
-	set a [lindex $arcnos($id) 0]
-	if {$archeads($a) ne {}} {
-	    validate_archeads $a
-	    set i [lsearch -exact $arcids($a) $id]
-	    foreach t $archeads($a) {
-		set j [lsearch -exact $arcids($a) $t]
-		if {$j > $i} break
-		lappend aret $t
-	    }
-	}
-	set id $arcstart($a)
+        # part-way along an arc; check it first
+        set a [lindex $arcnos($id) 0]
+        if {$archeads($a) ne {}} {
+            validate_archeads $a
+            set i [lsearch -exact $arcids($a) $id]
+            foreach t $archeads($a) {
+                set j [lsearch -exact $arcids($a) $t]
+                if {$j > $i} break
+                lappend aret $t
+            }
+        }
+        set id $arcstart($a)
     }
     set origid $id
     set todo [list $id]
     set seen($id) 1
     set ret {}
     for {set i 0} {$i < [llength $todo]} {incr i} {
-	set id [lindex $todo $i]
-	if {[info exists cached_dheads($id)]} {
-	    set ret [concat $ret $cached_dheads($id)]
-	} else {
-	    if {[info exists idheads($id)]} {
-		lappend ret $id
-	    }
-	    foreach a $arcnos($id) {
-		if {$archeads($a) ne {}} {
-		    validate_archeads $a
-		    if {$archeads($a) ne {}} {
-			set ret [concat $ret $archeads($a)]
-		    }
-		}
-		set d $arcstart($a)
-		if {![info exists seen($d)]} {
-		    lappend todo $d
-		    set seen($d) 1
-		}
-	    }
-	}
+        set id [lindex $todo $i]
+        if {[info exists cached_dheads($id)]} {
+            set ret [concat $ret $cached_dheads($id)]
+        } else {
+            if {[info exists idheads($id)]} {
+                lappend ret $id
+            }
+            foreach a $arcnos($id) {
+                if {$archeads($a) ne {}} {
+                    validate_archeads $a
+                    if {$archeads($a) ne {}} {
+                        set ret [concat $ret $archeads($a)]
+                    }
+                }
+                set d $arcstart($a)
+                if {![info exists seen($d)]} {
+                    lappend todo $d
+                    set seen($d) 1
+                }
+            }
+        }
     }
     set ret [lsort -unique $ret]
     set cached_dheads($origid) $ret
@@ -11204,7 +11222,7 @@ proc addedtag {id} {
 
     if {![info exists arcnos($id)]} return
     if {![info exists arcout($id)]} {
-	recalcarc [lindex $arcnos($id) 0]
+        recalcarc [lindex $arcnos($id) 0]
     }
     unset -nocomplain cached_dtags
     unset -nocomplain cached_atags
@@ -11215,7 +11233,7 @@ proc addedhead {hid head} {
 
     if {![info exists arcnos($hid)]} return
     if {![info exists arcout($hid)]} {
-	recalcarc [lindex $arcnos($hid) 0]
+        recalcarc [lindex $arcnos($hid) 0]
     }
     unset -nocomplain cached_dheads
 }
@@ -11231,7 +11249,7 @@ proc movedhead {hid head} {
 
     if {![info exists arcnos($hid)]} return
     if {![info exists arcout($hid)]} {
-	recalcarc [lindex $arcnos($hid) 0]
+        recalcarc [lindex $arcnos($hid) 0]
     }
     unset -nocomplain cached_dheads
 }
@@ -11241,13 +11259,13 @@ proc changedrefs {} {
     global arctags archeads arcnos arcout idheads idtags
 
     foreach id [concat [array names idheads] [array names idtags]] {
-	if {[info exists arcnos($id)] && ![info exists arcout($id)]} {
-	    set a [lindex $arcnos($id) 0]
-	    if {![info exists donearc($a)]} {
-		recalcarc $a
-		set donearc($a) 1
-	    }
-	}
+        if {[info exists arcnos($id)] && ![info exists arcout($id)]} {
+            set a [lindex $arcnos($id) 0]
+            if {![info exists donearc($a)]} {
+                recalcarc $a
+                set donearc($a) 1
+            }
+        }
     }
     unset -nocomplain cached_tagcontent
     unset -nocomplain cached_dtags
@@ -11259,26 +11277,26 @@ proc rereadrefs {} {
     global idtags idheads idotherrefs mainheadid
 
     set refids [concat [array names idtags] \
-		    [array names idheads] [array names idotherrefs]]
+                    [array names idheads] [array names idotherrefs]]
     foreach id $refids {
-	if {![info exists ref($id)]} {
-	    set ref($id) [listrefs $id]
-	}
+        if {![info exists ref($id)]} {
+            set ref($id) [listrefs $id]
+        }
     }
     set oldmainhead $mainheadid
     readrefs
     changedrefs
     set refids [lsort -unique [concat $refids [array names idtags] \
-			[array names idheads] [array names idotherrefs]]]
+                        [array names idheads] [array names idotherrefs]]]
     foreach id $refids {
-	set v [listrefs $id]
-	if {![info exists ref($id)] || $ref($id) != $v} {
-	    redrawtags $id
-	}
+        set v [listrefs $id]
+        if {![info exists ref($id)] || $ref($id) != $v} {
+            redrawtags $id
+        }
     }
     if {$oldmainhead ne $mainheadid} {
-	redrawtags $oldmainhead
-	redrawtags $mainheadid
+        redrawtags $oldmainhead
+        redrawtags $mainheadid
     }
     run refill_reflist
 }
@@ -11288,15 +11306,15 @@ proc listrefs {id} {
 
     set x {}
     if {[info exists idtags($id)]} {
-	set x $idtags($id)
+        set x $idtags($id)
     }
     set y {}
     if {[info exists idheads($id)]} {
-	set y $idheads($id)
+        set y $idheads($id)
     }
     set z {}
     if {[info exists idotherrefs($id)]} {
-	set z $idotherrefs($id)
+        set z $idotherrefs($id)
     }
     return [list $x $y $z]
 }
@@ -11305,15 +11323,15 @@ proc add_tag_ctext {tag} {
     global ctext cached_tagcontent tagids
 
     if {![info exists cached_tagcontent($tag)]} {
-	catch {
-	    set cached_tagcontent($tag) [exec git cat-file -p $tag]
-	}
+        catch {
+            set cached_tagcontent($tag) [exec git cat-file -p $tag]
+        }
     }
     $ctext insert end "[mc "Tag"]: $tag\n" bold
     if {[info exists cached_tagcontent($tag)]} {
-	set text $cached_tagcontent($tag)
+        set text $cached_tagcontent($tag)
     } else {
-	set text "[mc "Id"]:  $tagids($tag)"
+        set text "[mc "Id"]:  $tagids($tag)"
     }
     appendwithlinks $text {}
 }
@@ -11322,7 +11340,7 @@ proc showtag {tag isnew} {
     global ctext cached_tagcontent tagids linknum tagobjid
 
     if {$isnew} {
-	addtohistory [list showtag $tag 0] savectextpos
+        addtohistory [list showtag $tag 0] savectextpos
     }
     $ctext conf -state normal
     clear_ctext
@@ -11338,7 +11356,7 @@ proc showtags {id isnew} {
     global idtags ctext linknum
 
     if {$isnew} {
-	addtohistory [list showtags $id 0] savectextpos
+        addtohistory [list showtags $id 0] savectextpos
     }
     $ctext conf -state normal
     clear_ctext
@@ -11346,9 +11364,9 @@ proc showtags {id isnew} {
     set linknum 0
     set sep {}
     foreach tag $idtags($id) {
-	$ctext insert end $sep
-	add_tag_ctext $tag
-	set sep "\n\n"
+        $ctext insert end $sep
+        add_tag_ctext $tag
+        set sep "\n\n"
     }
     maybe_scroll_ctext 1
     $ctext conf -state disabled
@@ -11364,7 +11382,7 @@ proc doquit {} {
     destroy .
 
     if {[info exists gitktmpdir]} {
-	catch {file delete -force $gitktmpdir}
+        catch {file delete -force $gitktmpdir}
     }
 }
 
@@ -11373,9 +11391,9 @@ proc mkfontdisp {font top which} {
 
     set fontpref($font) [set $font]
     ${NS}::button $top.${font}but -text $which \
-	-command [list choosefont $font $which]
+        -command [list choosefont $font $which]
     ${NS}::label $top.$font -relief flat -font $font \
-	-text $fontattr($font,family) -justify left
+        -text $fontattr($font,family) -justify left
     grid x $top.${font}but $top.$font -sticky w
 }
 
@@ -11392,58 +11410,58 @@ proc choosefont {font which} {
     set top .gitkfont
     set fonttop $top
     if {![winfo exists $top]} {
-	font create sample
-	eval font config sample [font actual $font]
-	ttk_toplevel $top
-	make_transient $top $prefstop
-	wm title $top [mc "Gitk font chooser"]
-	${NS}::label $top.l -textvariable fontparam(which)
-	pack $top.l -side top
-	set fontlist [lsort [font families]]
-	${NS}::frame $top.f
-	listbox $top.f.fam -listvariable fontlist \
-	    -yscrollcommand [list $top.f.sb set]
-	bind $top.f.fam <<ListboxSelect>> selfontfam
-	${NS}::scrollbar $top.f.sb -command [list $top.f.fam yview]
-	pack $top.f.sb -side right -fill y
-	pack $top.f.fam -side left -fill both -expand 1
-	pack $top.f -side top -fill both -expand 1
-	${NS}::frame $top.g
-	spinbox $top.g.size -from 4 -to 40 -width 4 \
-	    -textvariable fontparam(size) \
-	    -validatecommand {string is integer -strict %s}
-	checkbutton $top.g.bold -padx 5 \
-	    -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
-	    -variable fontparam(weight) -onvalue bold -offvalue normal
-	checkbutton $top.g.ital -padx 5 \
-	    -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0  \
-	    -variable fontparam(slant) -onvalue italic -offvalue roman
-	pack $top.g.size $top.g.bold $top.g.ital -side left
-	pack $top.g -side top
-	canvas $top.c -width 150 -height 50 -border 2 -relief sunk \
-	    -background white
-	$top.c create text 100 25 -anchor center -text $which -font sample \
-	    -fill black -tags text
-	bind $top.c <Configure> [list centertext $top.c]
-	pack $top.c -side top -fill x
-	${NS}::frame $top.buts
-	${NS}::button $top.buts.ok -text [mc "OK"] -command fontok -default active
-	${NS}::button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
-	bind $top <Key-Return> fontok
-	bind $top <Key-Escape> fontcan
-	grid $top.buts.ok $top.buts.can
-	grid columnconfigure $top.buts 0 -weight 1 -uniform a
-	grid columnconfigure $top.buts 1 -weight 1 -uniform a
-	pack $top.buts -side bottom -fill x
-	trace add variable fontparam write chg_fontparam
+        font create sample
+        eval font config sample [font actual $font]
+        ttk_toplevel $top
+        make_transient $top $prefstop
+        wm title $top [mc "Gitk font chooser"]
+        ${NS}::label $top.l -textvariable fontparam(which)
+        pack $top.l -side top
+        set fontlist [lsort [font families]]
+        ${NS}::frame $top.f
+        listbox $top.f.fam -listvariable fontlist \
+            -yscrollcommand [list $top.f.sb set]
+        bind $top.f.fam <<ListboxSelect>> selfontfam
+        ${NS}::scrollbar $top.f.sb -command [list $top.f.fam yview]
+        pack $top.f.sb -side right -fill y
+        pack $top.f.fam -side left -fill both -expand 1
+        pack $top.f -side top -fill both -expand 1
+        ${NS}::frame $top.g
+        spinbox $top.g.size -from 4 -to 40 -width 4 \
+            -textvariable fontparam(size) \
+            -validatecommand {string is integer -strict %s}
+        checkbutton $top.g.bold -padx 5 \
+            -font {{Times New Roman} 12 bold} -text [mc "B"] -indicatoron 0 \
+            -variable fontparam(weight) -onvalue bold -offvalue normal
+        checkbutton $top.g.ital -padx 5 \
+            -font {{Times New Roman} 12 italic} -text [mc "I"] -indicatoron 0  \
+            -variable fontparam(slant) -onvalue italic -offvalue roman
+        pack $top.g.size $top.g.bold $top.g.ital -side left
+        pack $top.g -side top
+        canvas $top.c -width 150 -height 50 -border 2 -relief sunk \
+            -background white
+        $top.c create text 100 25 -anchor center -text $which -font sample \
+            -fill black -tags text
+        bind $top.c <Configure> [list centertext $top.c]
+        pack $top.c -side top -fill x
+        ${NS}::frame $top.buts
+        ${NS}::button $top.buts.ok -text [mc "OK"] -command fontok -default active
+        ${NS}::button $top.buts.can -text [mc "Cancel"] -command fontcan -default normal
+        bind $top <Key-Return> fontok
+        bind $top <Key-Escape> fontcan
+        grid $top.buts.ok $top.buts.can
+        grid columnconfigure $top.buts 0 -weight 1 -uniform a
+        grid columnconfigure $top.buts 1 -weight 1 -uniform a
+        pack $top.buts -side bottom -fill x
+        trace add variable fontparam write chg_fontparam
     } else {
-	raise $top
-	$top.c itemconf text -text $which
+        raise $top
+        $top.c itemconf text -text $which
     }
     set i [lsearch -exact $fontlist $fontparam(family)]
     if {$i >= 0} {
-	$top.f.fam selection set $i
-	$top.f.fam see $i
+        $top.f.fam selection set $i
+        $top.f.fam see $i
     }
 }
 
@@ -11457,10 +11475,10 @@ proc fontok {} {
     set f $fontparam(font)
     set fontpref($f) [list $fontparam(family) $fontparam(size)]
     if {$fontparam(weight) eq "bold"} {
-	lappend fontpref($f) "bold"
+        lappend fontpref($f) "bold"
     }
     if {$fontparam(slant) eq "italic"} {
-	lappend fontpref($f) "italic"
+        lappend fontpref($f) "italic"
     }
     set w $prefstop.notebook.fonts.$f
     $w conf -text $fontparam(family) -font $fontpref($f)
@@ -11472,10 +11490,10 @@ proc fontcan {} {
     global fonttop fontparam
 
     if {[info exists fonttop]} {
-	catch {destroy $fonttop}
-	catch {font delete sample}
-	unset fonttop
-	unset fontparam
+        catch {destroy $fonttop}
+        catch {font delete sample}
+        unset fonttop
+        unset fontparam
     }
 }
 
@@ -11483,21 +11501,21 @@ if {[package vsatisfies [package provide Tk] 8.6]} {
     # In Tk 8.6 we have a native font chooser dialog. Overwrite the above
     # function to make use of it.
     proc choosefont {font which} {
-	tk fontchooser configure -title $which -font $font \
-	    -command [list on_choosefont $font $which]
-	tk fontchooser show
+        tk fontchooser configure -title $which -font $font \
+            -command [list on_choosefont $font $which]
+        tk fontchooser show
     }
     proc on_choosefont {font which newfont} {
-	global fontparam
-	puts stderr "$font $newfont"
-	array set f [font actual $newfont]
-	set fontparam(which) $which
-	set fontparam(font) $font
-	set fontparam(family) $f(-family)
-	set fontparam(size) $f(-size)
-	set fontparam(weight) $f(-weight)
-	set fontparam(slant) $f(-slant)
-	fontok
+        global fontparam
+        puts stderr "$font $newfont"
+        array set f [font actual $newfont]
+        set fontparam(which) $which
+        set fontparam(font) $font
+        set fontparam(family) $f(-family)
+        set fontparam(size) $f(-size)
+        set fontparam(weight) $f(-weight)
+        set fontparam(slant) $f(-slant)
+        fontok
     }
 }
 
@@ -11506,7 +11524,7 @@ proc selfontfam {} {
 
     set i [$fonttop.f.fam curselection]
     if {$i ne {}} {
-	set fontparam(family) [$fonttop.f.fam get $i]
+        set fontparam(family) [$fonttop.f.fam get $i]
     }
 }
 
@@ -11521,9 +11539,9 @@ proc create_prefs_page {w} {
     global NS
     set parent [join [lrange [split $w .] 0 end-1] .]
     if {[winfo class $parent] eq "TNotebook"} {
-	${NS}::frame $w
+        ${NS}::frame $w
     } else {
-	${NS}::labelframe $w
+        ${NS}::labelframe $w
     }
 }
 
@@ -11545,14 +11563,14 @@ proc prefspage_general {notebook} {
     spinbox $page.maxpct -from 1 -to 100 -width 4 -textvariable maxgraphpct
     grid x $page.maxpctl $page.maxpct -sticky w
     ${NS}::checkbutton $page.showlocal -text [mc "Show local changes"] \
-	-variable showlocalchanges
+        -variable showlocalchanges
     grid x $page.showlocal -sticky w
     ${NS}::checkbutton $page.autoselect -text [mc "Auto-select SHA1 (length)"] \
-	-variable autoselect
+        -variable autoselect
     spinbox $page.autosellen -from 1 -to 40 -width 4 -textvariable autosellen
     grid x $page.autoselect $page.autosellen -sticky w
     ${NS}::checkbutton $page.hideremotes -text [mc "Hide remote refs"] \
-	-variable hideremotes
+        -variable hideremotes
     grid x $page.hideremotes -sticky w
 
     ${NS}::label $page.ddisp -text [mc "Diff display options"]
@@ -11561,16 +11579,16 @@ proc prefspage_general {notebook} {
     spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop
     grid x $page.tabstopl $page.tabstop -sticky w
     ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \
-	-variable showneartags
+        -variable showneartags
     grid x $page.ntag -sticky w
     ${NS}::label $page.maxrefsl -text [mc "Maximum # tags/heads to show"]
     spinbox $page.maxrefs -from 1 -to 1000 -width 4 -textvariable maxrefs
     grid x $page.maxrefsl $page.maxrefs -sticky w
     ${NS}::checkbutton $page.ldiff -text [mc "Limit diffs to listed paths"] \
-	-variable limitdiffs
+        -variable limitdiffs
     grid x $page.ldiff -sticky w
     ${NS}::checkbutton $page.lattr -text [mc "Support per-file encodings"] \
-	-variable perfile_attrs
+        -variable perfile_attrs
     grid x $page.lattr -sticky w
 
     ${NS}::entry $page.extdifft -textvariable extdifftool
@@ -11591,11 +11609,11 @@ proc prefspage_general {notebook} {
     ${NS}::label $page.lgen -text [mc "General options"]
     grid $page.lgen - -sticky w -pady 10
     ${NS}::checkbutton $page.want_ttk -variable want_ttk \
-	-text [mc "Use themed widgets"]
+        -text [mc "Use themed widgets"]
     if {$have_ttk} {
-	${NS}::label $page.ttk_note -text [mc "(change requires restart)"]
+        ${NS}::label $page.ttk_note -text [mc "(change requires restart)"]
     } else {
-	${NS}::label $page.ttk_note -text [mc "(currently unavailable)"]
+        ${NS}::label $page.ttk_note -text [mc "(currently unavailable)"]
     }
     grid x $page.want_ttk $page.ttk_note -sticky w
     return $page
@@ -11603,6 +11621,7 @@ proc prefspage_general {notebook} {
 
 proc prefspage_colors {notebook} {
     global NS uicolor bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor
+    global diffbgcolors
 
     set page [create_prefs_page $notebook.colors]
 
@@ -11614,37 +11633,49 @@ proc prefspage_colors {notebook} {
     grid x $page.uibut $page.ui -sticky w
     label $page.bg -padx 40 -relief sunk -background $bgcolor
     ${NS}::button $page.bgbut -text [mc "Background"] \
-	-command [list choosecolor bgcolor {} $page.bg [mc "background"] setbg]
+        -command [list choosecolor bgcolor {} $page.bg [mc "background"] setbg]
     grid x $page.bgbut $page.bg -sticky w
     label $page.fg -padx 40 -relief sunk -background $fgcolor
     ${NS}::button $page.fgbut -text [mc "Foreground"] \
-	-command [list choosecolor fgcolor {} $page.fg [mc "foreground"] setfg]
+        -command [list choosecolor fgcolor {} $page.fg [mc "foreground"] setfg]
     grid x $page.fgbut $page.fg -sticky w
     label $page.diffold -padx 40 -relief sunk -background [lindex $diffcolors 0]
     ${NS}::button $page.diffoldbut -text [mc "Diff: old lines"] \
-	-command [list choosecolor diffcolors 0 $page.diffold [mc "diff old lines"] \
-		      [list $ctext tag conf d0 -foreground]]
+        -command [list choosecolor diffcolors 0 $page.diffold [mc "diff old lines"] \
+                      [list $ctext tag conf d0 -foreground]]
     grid x $page.diffoldbut $page.diffold -sticky w
+    label $page.diffoldbg -padx 40 -relief sunk -background [lindex $diffbgcolors 0]
+    ${NS}::button $page.diffoldbgbut -text [mc "Diff: old lines bg"] \
+        -command [list choosecolor diffbgcolors 0 $page.diffoldbg \
+                      [mc "diff old lines bg"] \
+                      [list $ctext tag conf d0 -background]]
+    grid x $page.diffoldbgbut $page.diffoldbg -sticky w
     label $page.diffnew -padx 40 -relief sunk -background [lindex $diffcolors 1]
     ${NS}::button $page.diffnewbut -text [mc "Diff: new lines"] \
-	-command [list choosecolor diffcolors 1 $page.diffnew [mc "diff new lines"] \
-		      [list $ctext tag conf dresult -foreground]]
+        -command [list choosecolor diffcolors 1 $page.diffnew [mc "diff new lines"] \
+                      [list $ctext tag conf dresult -foreground]]
     grid x $page.diffnewbut $page.diffnew -sticky w
+    label $page.diffnewbg -padx 40 -relief sunk -background [lindex $diffbgcolors 1]
+    ${NS}::button $page.diffnewbgbut -text [mc "Diff: new lines bg"] \
+        -command [list choosecolor diffbgcolors 1 $page.diffnewbg \
+                      [mc "diff new lines bg"] \
+                      [list $ctext tag conf dresult -background]]
+    grid x $page.diffnewbgbut $page.diffnewbg -sticky w
     label $page.hunksep -padx 40 -relief sunk -background [lindex $diffcolors 2]
     ${NS}::button $page.hunksepbut -text [mc "Diff: hunk header"] \
-	-command [list choosecolor diffcolors 2 $page.hunksep \
-		      [mc "diff hunk header"] \
-		      [list $ctext tag conf hunksep -foreground]]
+        -command [list choosecolor diffcolors 2 $page.hunksep \
+                      [mc "diff hunk header"] \
+                      [list $ctext tag conf hunksep -foreground]]
     grid x $page.hunksepbut $page.hunksep -sticky w
     label $page.markbgsep -padx 40 -relief sunk -background $markbgcolor
     ${NS}::button $page.markbgbut -text [mc "Marked line bg"] \
-	-command [list choosecolor markbgcolor {} $page.markbgsep \
-		      [mc "marked line background"] \
-		      [list $ctext tag conf omark -background]]
+        -command [list choosecolor markbgcolor {} $page.markbgsep \
+                      [mc "marked line background"] \
+                      [list $ctext tag conf omark -background]]
     grid x $page.markbgbut $page.markbgsep -sticky w
     label $page.selbgsep -padx 40 -relief sunk -background $selectbgcolor
     ${NS}::button $page.selbgbut -text [mc "Select bg"] \
-	-command [list choosecolor selectbgcolor {} $page.selbgsep [mc "background"] setselbg]
+        -command [list choosecolor selectbgcolor {} $page.selbgsep [mc "background"] setselbg]
     grid x $page.selbgbut $page.selbgsep -sticky w
     return $page
 }
@@ -11670,21 +11701,21 @@ proc doprefs {} {
     set top .gitkprefs
     set prefstop $top
     if {[winfo exists $top]} {
-	raise $top
-	return
+        raise $top
+        return
     }
     foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
-		   limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
-	set oldprefs($v) [set $v]
+                   limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
+        set oldprefs($v) [set $v]
     }
     ttk_toplevel $top
     wm title $top [mc "Gitk preferences"]
     make_transient $top .
 
     if {[set use_notebook [expr {$use_ttk && [info command ::ttk::notebook] ne ""}]]} {
-	set notebook [ttk::notebook $top.notebook]
+        set notebook [ttk::notebook $top.notebook]
     } else {
-	set notebook [${NS}::frame $top.notebook -borderwidth 0 -relief flat]
+        set notebook [${NS}::frame $top.notebook -borderwidth 0 -relief flat]
     }
 
     lappend pages [prefspage_general $notebook] [mc "General"]
@@ -11692,21 +11723,21 @@ proc doprefs {} {
     lappend pages [prefspage_fonts $notebook] [mc "Fonts"]
     set col 0
     foreach {page title} $pages {
-	if {$use_notebook} {
-	    $notebook add $page -text $title
-	} else {
-	    set btn [${NS}::button $notebook.b_[string map {. X} $page] \
-			 -text $title -command [list raise $page]]
-	    $page configure -text $title
-	    grid $btn -row 0 -column [incr col] -sticky w
-	    grid $page -row 1 -column 0 -sticky news -columnspan 100
-	}
+        if {$use_notebook} {
+            $notebook add $page -text $title
+        } else {
+            set btn [${NS}::button $notebook.b_[string map {. X} $page] \
+                         -text $title -command [list raise $page]]
+            $page configure -text $title
+            grid $btn -row 0 -column [incr col] -sticky w
+            grid $page -row 1 -column 0 -sticky news -columnspan 100
+        }
     }
 
     if {!$use_notebook} {
-	grid columnconfigure $notebook 0 -weight 1
-	grid rowconfigure $notebook 1 -weight 1
-	raise [lindex $pages 0]
+        grid columnconfigure $notebook 0 -weight 1
+        grid rowconfigure $notebook 1 -weight 1
+        raise [lindex $pages 0]
     }
 
     grid $notebook -sticky news -padx 2 -pady 2
@@ -11731,7 +11762,7 @@ proc choose_extdiff {} {
 
     set prog [tk_getOpenFile -title [mc "External diff tool"] -multiple false]
     if {$prog ne {}} {
-	set extdifftool $prog
+        set extdifftool $prog
     }
 }
 
@@ -11739,7 +11770,7 @@ proc choosecolor {v vi w x cmd} {
     global $v
 
     set c [tk_chooseColor -initialcolor [lindex [set $v] $vi] \
-	       -title [mc "Gitk: choose color for %s" $x]]
+               -title [mc "Gitk: choose color for %s" $x]]
     if {$c eq {}} return
     $w conf -background $c
     lset $v $vi $c
@@ -11749,12 +11780,12 @@ proc choosecolor {v vi w x cmd} {
 proc setselbg {c} {
     global bglist cflist
     foreach w $bglist {
-	if {[winfo exists $w]} {
-	    $w configure -selectbackground $c
-	}
+        if {[winfo exists $w]} {
+            $w configure -selectbackground $c
+        }
     }
     $cflist tag configure highlight \
-	-background [$cflist cget -selectbackground]
+        -background [$cflist cget -selectbackground]
     allcanvs itemconf secsel -fill $c
 }
 
@@ -11768,7 +11799,7 @@ proc setui {c} {
     set bg [winfo rgb . $c]
     set selc black
     if {[lindex $bg 0] + 1.5 * [lindex $bg 1] + 0.5 * [lindex $bg 2] > 100000} {
-	set selc white
+        set selc white
     }
     tk_setPalette background $c selectColor $selc
 }
@@ -11777,9 +11808,9 @@ proc setbg {c} {
     global bglist
 
     foreach w $bglist {
-	if {[winfo exists $w]} {
-	    $w conf -background $c
-	}
+        if {[winfo exists $w]} {
+            $w conf -background $c
+        }
     }
 }
 
@@ -11787,9 +11818,9 @@ proc setfg {c} {
     global fglist canv
 
     foreach w $fglist {
-	if {[winfo exists $w]} {
-	    $w conf -foreground $c
-	}
+        if {[winfo exists $w]} {
+            $w conf -foreground $c
+        }
     }
     allcanvs itemconf text -fill $c
     $canv itemconf circle -outline $c
@@ -11800,9 +11831,9 @@ proc prefscan {} {
     global oldprefs prefstop
 
     foreach v {maxwidth maxgraphpct showneartags showlocalchanges \
-		   limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
-	global $v
-	set $v $oldprefs($v)
+                   limitdiffs tabstop perfile_attrs hideremotes want_ttk} {
+        global $v
+        set $v $oldprefs($v)
     }
     catch {destroy $prefstop}
     unset prefstop
@@ -11821,76 +11852,76 @@ proc prefsok {} {
     fontcan
     set fontchanged 0
     if {$mainfont ne $fontpref(mainfont)} {
-	set mainfont $fontpref(mainfont)
-	parsefont mainfont $mainfont
-	eval font configure mainfont [fontflags mainfont]
-	eval font configure mainfontbold [fontflags mainfont 1]
-	setcoords
-	set fontchanged 1
+        set mainfont $fontpref(mainfont)
+        parsefont mainfont $mainfont
+        eval font configure mainfont [fontflags mainfont]
+        eval font configure mainfontbold [fontflags mainfont 1]
+        setcoords
+        set fontchanged 1
     }
     if {$textfont ne $fontpref(textfont)} {
-	set textfont $fontpref(textfont)
-	parsefont textfont $textfont
-	eval font configure textfont [fontflags textfont]
-	eval font configure textfontbold [fontflags textfont 1]
+        set textfont $fontpref(textfont)
+        parsefont textfont $textfont
+        eval font configure textfont [fontflags textfont]
+        eval font configure textfontbold [fontflags textfont 1]
     }
     if {$uifont ne $fontpref(uifont)} {
-	set uifont $fontpref(uifont)
-	parsefont uifont $uifont
-	eval font configure uifont [fontflags uifont]
+        set uifont $fontpref(uifont)
+        parsefont uifont $uifont
+        eval font configure uifont [fontflags uifont]
     }
     settabs
     if {$showlocalchanges != $oldprefs(showlocalchanges)} {
-	if {$showlocalchanges} {
-	    doshowlocalchanges
-	} else {
-	    dohidelocalchanges
-	}
+        if {$showlocalchanges} {
+            doshowlocalchanges
+        } else {
+            dohidelocalchanges
+        }
     }
     if {$limitdiffs != $oldprefs(limitdiffs) ||
-	($perfile_attrs && !$oldprefs(perfile_attrs))} {
-	# treediffs elements are limited by path;
-	# won't have encodings cached if perfile_attrs was just turned on
-	unset -nocomplain treediffs
+        ($perfile_attrs && !$oldprefs(perfile_attrs))} {
+        # treediffs elements are limited by path;
+        # won't have encodings cached if perfile_attrs was just turned on
+        unset -nocomplain treediffs
     }
     if {$fontchanged || $maxwidth != $oldprefs(maxwidth)
-	|| $maxgraphpct != $oldprefs(maxgraphpct)} {
-	redisplay
+        || $maxgraphpct != $oldprefs(maxgraphpct)} {
+        redisplay
     } elseif {$showneartags != $oldprefs(showneartags) ||
-	  $limitdiffs != $oldprefs(limitdiffs)} {
-	reselectline
+          $limitdiffs != $oldprefs(limitdiffs)} {
+        reselectline
     }
     if {$hideremotes != $oldprefs(hideremotes)} {
-	rereadrefs
+        rereadrefs
     }
 }
 
 proc formatdate {d} {
     global datetimeformat
     if {$d ne {}} {
-	# If $datetimeformat includes a timezone, display in the
-	# timezone of the argument.  Otherwise, display in local time.
-	if {[string match {*%[zZ]*} $datetimeformat]} {
-	    if {[catch {set d [clock format [lindex $d 0] -timezone [lindex $d 1] -format $datetimeformat]}]} {
-		# Tcl < 8.5 does not support -timezone.  Emulate it by
-		# setting TZ (e.g. TZ=<-0430>+04:30).
-		global env
-		if {[info exists env(TZ)]} {
-		    set savedTZ $env(TZ)
-		}
-		set zone [lindex $d 1]
-		set sign [string map {+ - - +} [string index $zone 0]]
-		set env(TZ) <$zone>$sign[string range $zone 1 2]:[string range $zone 3 4]
-		set d [clock format [lindex $d 0] -format $datetimeformat]
-		if {[info exists savedTZ]} {
-		    set env(TZ) $savedTZ
-		} else {
-		    unset env(TZ)
-		}
-	    }
-	} else {
-	    set d [clock format [lindex $d 0] -format $datetimeformat]
-	}
+        # If $datetimeformat includes a timezone, display in the
+        # timezone of the argument.  Otherwise, display in local time.
+        if {[string match {*%[zZ]*} $datetimeformat]} {
+            if {[catch {set d [clock format [lindex $d 0] -timezone [lindex $d 1] -format $datetimeformat]}]} {
+                # Tcl < 8.5 does not support -timezone.  Emulate it by
+                # setting TZ (e.g. TZ=<-0430>+04:30).
+                global env
+                if {[info exists env(TZ)]} {
+                    set savedTZ $env(TZ)
+                }
+                set zone [lindex $d 1]
+                set sign [string map {+ - - +} [string index $zone 0]]
+                set env(TZ) <$zone>$sign[string range $zone 1 2]:[string range $zone 3 4]
+                set d [clock format [lindex $d 0] -format $datetimeformat]
+                if {[info exists savedTZ]} {
+                    set env(TZ) $savedTZ
+                } else {
+                    unset env(TZ)
+                }
+            }
+        } else {
+            set d [clock format [lindex $d 0] -format $datetimeformat]
+        }
     }
     return $d
 }
@@ -12136,38 +12167,38 @@ set encoding_aliases {
 proc tcl_encoding {enc} {
     global encoding_aliases tcl_encoding_cache
     if {[info exists tcl_encoding_cache($enc)]} {
-	return $tcl_encoding_cache($enc)
+        return $tcl_encoding_cache($enc)
     }
     set names [encoding names]
     set lcnames [string tolower $names]
     set enc [string tolower $enc]
     set i [lsearch -exact $lcnames $enc]
     if {$i < 0} {
-	# look for "isonnn" instead of "iso-nnn" or "iso_nnn"
-	if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
-	    set i [lsearch -exact $lcnames $encx]
-	}
+        # look for "isonnn" instead of "iso-nnn" or "iso_nnn"
+        if {[regsub {^(iso|cp|ibm|jis)[-_]} $enc {\1} encx]} {
+            set i [lsearch -exact $lcnames $encx]
+        }
     }
     if {$i < 0} {
-	foreach l $encoding_aliases {
-	    set ll [string tolower $l]
-	    if {[lsearch -exact $ll $enc] < 0} continue
-	    # look through the aliases for one that tcl knows about
-	    foreach e $ll {
-		set i [lsearch -exact $lcnames $e]
-		if {$i < 0} {
-		    if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} {
-			set i [lsearch -exact $lcnames $ex]
-		    }
-		}
-		if {$i >= 0} break
-	    }
-	    break
-	}
+        foreach l $encoding_aliases {
+            set ll [string tolower $l]
+            if {[lsearch -exact $ll $enc] < 0} continue
+            # look through the aliases for one that tcl knows about
+            foreach e $ll {
+                set i [lsearch -exact $lcnames $e]
+                if {$i < 0} {
+                    if {[regsub {^(iso|cp|ibm|jis)[-_]} $e {\1} ex]} {
+                        set i [lsearch -exact $lcnames $ex]
+                    }
+                }
+                if {$i >= 0} break
+            }
+            break
+        }
     }
     set tclenc {}
     if {$i >= 0} {
-	set tclenc [lindex $names $i]
+        set tclenc [lindex $names $i]
     }
     set tcl_encoding_cache($enc) $tclenc
     return $tclenc
@@ -12176,16 +12207,16 @@ proc tcl_encoding {enc} {
 proc gitattr {path attr default} {
     global path_attr_cache
     if {[info exists path_attr_cache($attr,$path)]} {
-	set r $path_attr_cache($attr,$path)
+        set r $path_attr_cache($attr,$path)
     } else {
-	set r "unspecified"
-	if {![catch {set line [exec git check-attr $attr -- $path]}]} {
-	    regexp "(.*): $attr: (.*)" $line m f r
-	}
-	set path_attr_cache($attr,$path) $r
+        set r "unspecified"
+        if {![catch {set line [exec git check-attr $attr -- $path]}]} {
+            regexp "(.*): $attr: (.*)" $line m f r
+        }
+        set path_attr_cache($attr,$path) $r
     }
     if {$r eq "unspecified"} {
-	return $default
+        return $default
     }
     return $r
 }
@@ -12194,28 +12225,28 @@ proc cache_gitattr {attr pathlist} {
     global path_attr_cache
     set newlist {}
     foreach path $pathlist {
-	if {![info exists path_attr_cache($attr,$path)]} {
-	    lappend newlist $path
-	}
+        if {![info exists path_attr_cache($attr,$path)]} {
+            lappend newlist $path
+        }
     }
     set lim 1000
     if {[tk windowingsystem] == "win32"} {
-	# windows has a 32k limit on the arguments to a command...
-	set lim 30
+        # windows has a 32k limit on the arguments to a command...
+        set lim 30
     }
     while {$newlist ne {}} {
-	set head [lrange $newlist 0 [expr {$lim - 1}]]
-	set newlist [lrange $newlist $lim end]
-	if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} {
-	    foreach row [split $rlist "\n"] {
-		if {[regexp "(.*): $attr: (.*)" $row m path value]} {
-		    if {[string index $path 0] eq "\""} {
-			set path [encoding convertfrom [lindex $path 0]]
-		    }
-		    set path_attr_cache($attr,$path) $value
-		}
-	    }
-	}
+        set head [lrange $newlist 0 [expr {$lim - 1}]]
+        set newlist [lrange $newlist $lim end]
+        if {![catch {set rlist [eval exec git check-attr $attr -- $head]}]} {
+            foreach row [split $rlist "\n"] {
+                if {[regexp "(.*): $attr: (.*)" $row m path value]} {
+                    if {[string index $path 0] eq "\""} {
+                        set path [encoding convertfrom [lindex $path 0]]
+                    }
+                    set path_attr_cache($attr,$path) $value
+                }
+            }
+        }
     }
 }
 
@@ -12223,10 +12254,10 @@ proc get_path_encoding {path} {
     global gui_encoding perfile_attrs
     set tcl_enc $gui_encoding
     if {$path ne {} && $perfile_attrs} {
-	set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]]
-	if {$enc2 ne {}} {
-	    set tcl_enc $enc2
-	}
+        set enc2 [tcl_encoding [gitattr $path encoding $tcl_enc]]
+        if {$enc2 ne {}} {
+            set tcl_enc $enc2
+        }
     }
     return $tcl_enc
 }
@@ -12253,7 +12284,7 @@ namespace import ::msgcat::mc
 # First check that Tcl/Tk is recent enough
 if {[catch {package require Tk 8.4} err]} {
     show_error {} . [mc "Sorry, gitk cannot run with this version of Tcl/Tk.\n\
-			 Gitk requires at least Tcl/Tk 8.4."]
+                         Gitk requires at least Tcl/Tk 8.4."]
     exit 1
 }
 
@@ -12293,12 +12324,12 @@ set gui_encoding [encoding system]
 catch {
     set enc [exec git config --get gui.encoding]
     if {$enc ne {}} {
-	set tclenc [tcl_encoding $enc]
-	if {$tclenc ne {}} {
-	    set gui_encoding $tclenc
-	} else {
-	    puts stderr "Warning: encoding $enc is not supported by Tcl/Tk"
-	}
+        set tclenc [tcl_encoding $enc]
+        if {$tclenc ne {}} {
+            set gui_encoding $tclenc
+        } else {
+            puts stderr "Warning: encoding $enc is not supported by Tcl/Tk"
+        }
     }
 }
 
@@ -12368,12 +12399,13 @@ if {[tk windowingsystem] eq "win32"} {
     set fgcolor black
     set selectbgcolor gray85
     if {[tk windowingsystem] eq "aqua"} {
-	set web_browser "open"
+        set web_browser "open"
     } else {
-	set web_browser "xdg-open"
+        set web_browser "xdg-open"
     }
 }
-set diffcolors {red "#00a000" blue}
+set diffcolors {"#c30000" "#009800" blue}
+set diffbgcolors {"#fff3f3" "#f0fff0"}
 set diffcontext 3
 set mergecolors {red blue "#00ff00" purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
 set ignorespace 0
@@ -12413,22 +12445,22 @@ catch {
     # follow the XDG base directory specification by default. See
     # http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
     if {[info exists env(XDG_CONFIG_HOME)] && $env(XDG_CONFIG_HOME) ne ""} {
-	# XDG_CONFIG_HOME environment variable is set
-	set config_file [file join $env(XDG_CONFIG_HOME) git gitk]
-	set config_file_tmp [file join $env(XDG_CONFIG_HOME) git gitk-tmp]
+        # XDG_CONFIG_HOME environment variable is set
+        set config_file [file join $env(XDG_CONFIG_HOME) git gitk]
+        set config_file_tmp [file join $env(XDG_CONFIG_HOME) git gitk-tmp]
     } else {
-	# default XDG_CONFIG_HOME
-	set config_file "~/.config/git/gitk"
-	set config_file_tmp "~/.config/git/gitk-tmp"
+        # default XDG_CONFIG_HOME
+        set config_file "~/.config/git/gitk"
+        set config_file_tmp "~/.config/git/gitk-tmp"
     }
     if {![file exists $config_file]} {
-	# for backward compatibility use the old config file if it exists
-	if {[file exists "~/.gitk"]} {
-	    set config_file "~/.gitk"
-	    set config_file_tmp "~/.gitk-tmp"
-	} elseif {![file exists [file dirname $config_file]]} {
-	    file mkdir [file dirname $config_file]
-	}
+        # for backward compatibility use the old config file if it exists
+        if {[file exists "~/.gitk"]} {
+            set config_file "~/.gitk"
+            set config_file_tmp "~/.gitk-tmp"
+        } elseif {![file exists [file dirname $config_file]]} {
+            file mkdir [file dirname $config_file]
+        }
     }
     source $config_file
 }
@@ -12444,7 +12476,7 @@ set config_variables {
     remotebgcolor tagbgcolor tagfgcolor tagoutlinecolor reflinecolor
     filesepbgcolor filesepfgcolor linehoverbgcolor linehoverfgcolor
     linehoveroutlinecolor mainheadcirclecolor workingfilescirclecolor
-    indexcirclecolor circlecolors linkfgcolor circleoutlinecolor
+    indexcirclecolor circlecolors linkfgcolor circleoutlinecolor diffbgcolors
     web_browser
 }
 foreach var $config_variables {
@@ -12482,20 +12514,20 @@ set i 0
 set revtreeargscmd {}
 foreach arg $argv {
     switch -glob -- $arg {
-	"" { }
-	"--" {
-	    set cmdline_files [lrange $argv [expr {$i + 1}] end]
-	    break
-	}
-	"--select-commit=*" {
-	    set selecthead [string range $arg 16 end]
-	}
-	"--argscmd=*" {
-	    set revtreeargscmd [string range $arg 10 end]
-	}
-	default {
-	    lappend revtreeargs $arg
-	}
+        "" { }
+        "--" {
+            set cmdline_files [lrange $argv [expr {$i + 1}] end]
+            break
+        }
+        "--select-commit=*" {
+            set selecthead [string range $arg 16 end]
+        }
+        "--argscmd=*" {
+            set revtreeargscmd [string range $arg 10 end]
+        }
+        default {
+            lappend revtreeargs $arg
+        }
     }
     incr i
 }
@@ -12507,29 +12539,29 @@ if {$selecthead eq "HEAD"} {
 if {$i >= [llength $argv] && $revtreeargs ne {}} {
     # no -- on command line, but some arguments (other than --argscmd)
     if {[catch {
-	set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
-	set cmdline_files [split $f "\n"]
-	set n [llength $cmdline_files]
-	set revtreeargs [lrange $revtreeargs 0 end-$n]
-	# Unfortunately git rev-parse doesn't produce an error when
-	# something is both a revision and a filename.  To be consistent
-	# with git log and git rev-list, check revtreeargs for filenames.
-	foreach arg $revtreeargs {
-	    if {[file exists $arg]} {
-		show_error {} . [mc "Ambiguous argument '%s': both revision\
-				 and filename" $arg]
-		exit 1
-	    }
-	}
+        set f [eval exec git rev-parse --no-revs --no-flags $revtreeargs]
+        set cmdline_files [split $f "\n"]
+        set n [llength $cmdline_files]
+        set revtreeargs [lrange $revtreeargs 0 end-$n]
+        # Unfortunately git rev-parse doesn't produce an error when
+        # something is both a revision and a filename.  To be consistent
+        # with git log and git rev-list, check revtreeargs for filenames.
+        foreach arg $revtreeargs {
+            if {[file exists $arg]} {
+                show_error {} . [mc "Ambiguous argument '%s': both revision\
+                                 and filename" $arg]
+                exit 1
+            }
+        }
     } err]} {
-	# unfortunately we get both stdout and stderr in $err,
-	# so look for "fatal:".
-	set i [string first "fatal:" $err]
-	if {$i > 0} {
-	    set err [string range $err [expr {$i + 6}] end]
-	}
-	show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
-	exit 1
+        # unfortunately we get both stdout and stderr in $err,
+        # so look for "fatal:".
+        set i [string first "fatal:" $err]
+        if {$i > 0} {
+            set err [string range $err [expr {$i + 6}] end]
+        }
+        show_error {} . "[mc "Bad arguments to gitk:"]\n$err"
+        exit 1
     }
 }
 
@@ -12599,7 +12631,7 @@ set cdup {}
 if {[expr {[exec git rev-parse --is-inside-work-tree] == "true"}]} {
     set cdup [exec git rev-parse --show-cdup]
 }
-set worktree [exec git rev-parse --show-toplevel]
+set worktree [gitworktree]
 setcoords
 makewindow
 catch {
@@ -12650,15 +12682,15 @@ if {$cmdline_files ne {} || $revtreeargs ne {} || $revtreeargscmd ne {}} {
 
 if {[info exists permviews]} {
     foreach v $permviews {
-	set n $nextviewnum
-	incr nextviewnum
-	set viewname($n) [lindex $v 0]
-	set viewfiles($n) [lindex $v 1]
-	set viewargs($n) [lindex $v 2]
-	set viewargscmd($n) [lindex $v 3]
-	set viewperm($n) 1
-	set viewchanged($n) 0
-	addviewmenu $n
+        set n $nextviewnum
+        incr nextviewnum
+        set viewname($n) [lindex $v 0]
+        set viewfiles($n) [lindex $v 1]
+        set viewargs($n) [lindex $v 2]
+        set viewargscmd($n) [lindex $v 3]
+        set viewperm($n) 1
+        set viewchanged($n) 0
+        addviewmenu $n
     }
 }
 
diff --git a/gitweb/Makefile b/gitweb/Makefile
index cd194d057f..f13e23c4de 100644
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -48,7 +48,9 @@ HIGHLIGHT_BIN = highlight
 ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
 	$(QUIET_SUBDIR0)../ $(QUIET_SUBDIR1) GIT-VERSION-FILE
 
+ifneq ($(MAKECMDGOALS),clean)
 -include ../GIT-VERSION-FILE
+endif
 
 ### Build rules
 
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 7fef19fe59..e09e024a09 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -569,6 +569,15 @@ our %feature = (
 		'sub' => \&feature_extra_branch_refs,
 		'override' => 0,
 		'default' => []},
+
+	# Redact e-mail addresses.
+
+	# To enable system wide have in $GITWEB_CONFIG
+	# $feature{'email-privacy'}{'default'} = [1];
+	'email-privacy' => {
+		'sub' => sub { feature_bool('email-privacy', @_) },
+		'override' => 1,
+		'default' => [0]},
 );
 
 sub gitweb_get_feature {
@@ -741,7 +750,7 @@ sub evaluate_gitweb_config {
 	$GITWEB_CONFIG_SYSTEM = "" if ($GITWEB_CONFIG_SYSTEM eq $GITWEB_CONFIG_COMMON);
 
 	# Common system-wide settings for convenience.
-	# Those settings can be ovverriden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM.
+	# Those settings can be overridden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM.
 	read_config_file($GITWEB_CONFIG_COMMON);
 
 	# Use first config file that exists.  This means use the per-instance
@@ -1291,9 +1300,23 @@ our $is_last_request = sub { 1 };
 our ($pre_dispatch_hook, $post_dispatch_hook, $pre_listen_hook);
 our $CGI = 'CGI';
 our $cgi;
+our $FCGI_Stream_PRINT_raw = \&FCGI::Stream::PRINT;
 sub configure_as_fcgi {
 	require CGI::Fast;
 	our $CGI = 'CGI::Fast';
+	# FCGI is not Unicode aware hence the UTF-8 encoding must be done manually.
+	# However no encoding must be done within git_blob_plain() and git_snapshot()
+	# which must still output in raw binary mode.
+	no warnings 'redefine';
+	my $enc = Encode::find_encoding('UTF-8');
+	*FCGI::Stream::PRINT = sub {
+		my @OUTPUT = @_;
+		for (my $i = 1; $i < @_; $i++) {
+			$OUTPUT[$i] = $enc->encode($_[$i], Encode::FB_CROAK|Encode::LEAVE_SRC);
+		}
+		@_ = @OUTPUT;
+		goto $FCGI_Stream_PRINT_raw;
+	};
 
 	my $request_number = 0;
 	# let each child service 100 requests
@@ -1657,15 +1680,15 @@ sub quot_cec {
 	my $cntrl = shift;
 	my %opts = @_;
 	my %es = ( # character escape codes, aka escape sequences
-		"\t" => '\t',   # tab            (HT)
-		"\n" => '\n',   # line feed      (LF)
-		"\r" => '\r',   # carrige return (CR)
-		"\f" => '\f',   # form feed      (FF)
-		"\b" => '\b',   # backspace      (BS)
-		"\a" => '\a',   # alarm (bell)   (BEL)
-		"\e" => '\e',   # escape         (ESC)
-		"\013" => '\v', # vertical tab   (VT)
-		"\000" => '\0', # nul character  (NUL)
+		"\t" => '\t',   # tab             (HT)
+		"\n" => '\n',   # line feed       (LF)
+		"\r" => '\r',   # carriage return (CR)
+		"\f" => '\f',   # form feed       (FF)
+		"\b" => '\b',   # backspace       (BS)
+		"\a" => '\a',   # alarm (bell)    (BEL)
+		"\e" => '\e',   # escape          (ESC)
+		"\013" => '\v', # vertical tab    (VT)
+		"\000" => '\0', # nul character   (NUL)
 	);
 	my $chr = ( (exists $es{$cntrl})
 		    ? $es{$cntrl}
@@ -3435,6 +3458,13 @@ sub parse_date {
 	return %date;
 }
 
+sub hide_mailaddrs_if_private {
+	my $line = shift;
+	return $line unless gitweb_check_feature('email-privacy');
+	$line =~ s/<[^@>]+@[^>]+>/<redacted>/g;
+	return $line;
+}
+
 sub parse_tag {
 	my $tag_id = shift;
 	my %tag;
@@ -3451,7 +3481,7 @@ sub parse_tag {
 		} elsif ($line =~ m/^tag (.+)$/) {
 			$tag{'name'} = $1;
 		} elsif ($line =~ m/^tagger (.*) ([0-9]+) (.*)$/) {
-			$tag{'author'} = $1;
+			$tag{'author'} = hide_mailaddrs_if_private($1);
 			$tag{'author_epoch'} = $2;
 			$tag{'author_tz'} = $3;
 			if ($tag{'author'} =~ m/^([^<]+) <([^>]*)>/) {
@@ -3499,7 +3529,7 @@ sub parse_commit_text {
 		} elsif ((!defined $withparents) && ($line =~ m/^parent ($oid_regex)$/)) {
 			push @parents, $1;
 		} elsif ($line =~ m/^author (.*) ([0-9]+) (.*)$/) {
-			$co{'author'} = to_utf8($1);
+			$co{'author'} = hide_mailaddrs_if_private(to_utf8($1));
 			$co{'author_epoch'} = $2;
 			$co{'author_tz'} = $3;
 			if ($co{'author'} =~ m/^([^<]+) <([^>]*)>/) {
@@ -3509,7 +3539,7 @@ sub parse_commit_text {
 				$co{'author_name'} = $co{'author'};
 			}
 		} elsif ($line =~ m/^committer (.*) ([0-9]+) (.*)$/) {
-			$co{'committer'} = to_utf8($1);
+			$co{'committer'} = hide_mailaddrs_if_private(to_utf8($1));
 			$co{'committer_epoch'} = $2;
 			$co{'committer_tz'} = $3;
 			if ($co{'committer'} =~ m/^([^<]+) <([^>]*)>/) {
@@ -3554,9 +3584,10 @@ sub parse_commit_text {
 	if (! defined $co{'title'} || $co{'title'} eq "") {
 		$co{'title'} = $co{'title_short'} = '(no commit message)';
 	}
-	# remove added spaces
+	# remove added spaces, redact e-mail addresses if applicable.
 	foreach my $line (@commit_lines) {
 		$line =~ s/^    //;
+		$line = hide_mailaddrs_if_private($line);
 	}
 	$co{'comment'} = \@commit_lines;
 
@@ -4048,7 +4079,7 @@ sub print_feed_meta {
 
 			$href_params{'extra_options'} = undef;
 			$href_params{'action'} = $type;
-			$link_attr{'-href'} = href(%href_params);
+			$link_attr{'-href'} = esc_attr(href(%href_params));
 			print "<link ".
 			      "rel=\"$link_attr{'-rel'}\" ".
 			      "title=\"$link_attr{'-title'}\" ".
@@ -4057,7 +4088,7 @@ sub print_feed_meta {
 			      "/>\n";
 
 			$href_params{'extra_options'} = '--no-merges';
-			$link_attr{'-href'} = href(%href_params);
+			$link_attr{'-href'} = esc_attr(href(%href_params));
 			$link_attr{'-title'} .= ' (no merges)';
 			print "<link ".
 			      "rel=\"$link_attr{'-rel'}\" ".
@@ -4070,10 +4101,12 @@ sub print_feed_meta {
 	} else {
 		printf('<link rel="alternate" title="%s projects list" '.
 		       'href="%s" type="text/plain; charset=utf-8" />'."\n",
-		       esc_attr($site_name), href(project=>undef, action=>"project_index"));
+		       esc_attr($site_name),
+		       esc_attr(href(project=>undef, action=>"project_index")));
 		printf('<link rel="alternate" title="%s projects feeds" '.
 		       'href="%s" type="text/x-opml" />'."\n",
-		       esc_attr($site_name), href(project=>undef, action=>"opml"));
+		       esc_attr($site_name),
+		       esc_attr(href(project=>undef, action=>"opml")));
 	}
 }
 
@@ -4287,8 +4320,8 @@ sub git_footer_html {
 	if (defined $action &&
 	    $action eq 'blame_incremental') {
 		print qq!<script type="text/javascript">\n!.
-		      qq!startBlame("!. href(action=>"blame_data", -replay=>1) .qq!",\n!.
-		      qq!           "!. href() .qq!");\n!.
+		      qq!startBlame("!. esc_attr(href(action=>"blame_data", -replay=>1)) .qq!",\n!.
+		      qq!           "!. esc_attr(href()) .qq!");\n!.
 		      qq!</script>\n!;
 	} else {
 		my ($jstimezone, $tz_cookie, $datetime_class) =
@@ -4625,7 +4658,7 @@ sub git_print_log {
 	# print log
 	my $skip_blank_line = 0;
 	foreach my $line (@$log) {
-		if ($line =~ m/^\s*([A-Z][-A-Za-z]*-[Bb]y|C[Cc]): /) {
+		if ($line =~ m/^\s*([A-Z][-A-Za-z]*-([Bb]y|[Tt]o)|C[Cc]|(Clos|Fix)es): /) {
 			if (! $opts{'-remove_signoff'}) {
 				print "<span class=\"signoff\">" . esc_html($line) . "</span><br/>\n";
 				$skip_blank_line = 1;
@@ -5283,7 +5316,7 @@ sub format_ctx_rem_add_lines {
 		#    + c
 		#   +  d
 		#
-		# Otherwise the highlightling would be confusing.
+		# Otherwise the highlighting would be confusing.
 		if ($is_combined) {
 			for (my $i = 0; $i < @$add; $i++) {
 				my $prefix_rem = substr($rem->[$i], 0, $num_parents);
@@ -7077,6 +7110,7 @@ sub git_blob_plain {
 			($sandbox ? 'attachment' : 'inline')
 			. '; filename="' . $save_as . '"');
 	local $/ = undef;
+	local *FCGI::Stream::PRINT = $FCGI_Stream_PRINT_raw;
 	binmode STDOUT, ':raw';
 	print <$fd>;
 	binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
@@ -7155,8 +7189,8 @@ sub git_blob {
 			print qq! alt="!.esc_attr($file_name).qq!" title="!.esc_attr($file_name).qq!"!;
 		}
 		print qq! src="! .
-		      href(action=>"blob_plain", hash=>$hash,
-		           hash_base=>$hash_base, file_name=>$file_name) .
+		      esc_attr(href(action=>"blob_plain", hash=>$hash,
+		           hash_base=>$hash_base, file_name=>$file_name)) .
 		      qq!" />\n!;
 	} else {
 		my $nr;
@@ -7415,6 +7449,7 @@ sub git_snapshot {
 
 	open my $fd, "-|", $cmd
 		or die_error(500, "Execute git-archive failed");
+	local *FCGI::Stream::PRINT = $FCGI_Stream_PRINT_raw;
 	binmode STDOUT, ':raw';
 	print <$fd>;
 	binmode STDOUT, ':utf8'; # as set at the beginning of gitweb.cgi
@@ -7471,7 +7506,8 @@ sub git_log_generic {
 			         -accesskey => "n", -title => "Alt-n"}, "next");
 	}
 	my $patch_max = gitweb_get_feature('patches');
-	if ($patch_max && !defined $file_name) {
+	if ($patch_max && !defined $file_name &&
+		!gitweb_check_feature('email-privacy')) {
 		if ($patch_max < 0 || @commitlist <= $patch_max) {
 			$paging_nav .= " &sdot; " .
 				$cgi->a({-href => href(action=>"patches", -replay=>1)},
@@ -7532,7 +7568,8 @@ sub git_commit {
 			} @$parents ) .
 			')';
 	}
-	if (gitweb_check_feature('patches') && @$parents <= 1) {
+	if (gitweb_check_feature('patches') && @$parents <= 1 &&
+		!gitweb_check_feature('email-privacy')) {
 		$formats_nav .= " | " .
 			$cgi->a({-href => href(action=>"patch", -replay=>1)},
 				"patch");
@@ -7845,7 +7882,8 @@ sub git_commitdiff {
 		$formats_nav =
 			$cgi->a({-href => href(action=>"commitdiff_plain", -replay=>1)},
 			        "raw");
-		if ($patch_max && @{$co{'parents'}} <= 1) {
+		if ($patch_max && @{$co{'parents'}} <= 1 &&
+			!gitweb_check_feature('email-privacy')) {
 			$formats_nav .= " | " .
 				$cgi->a({-href => href(action=>"patch", -replay=>1)},
 					"patch");
@@ -8239,6 +8277,7 @@ sub git_feed {
 	} else {
 		$alt_url = href(-full=>1, action=>"summary");
 	}
+	$alt_url = esc_attr($alt_url);
 	print qq!<?xml version="1.0" encoding="utf-8"?>\n!;
 	if ($format eq 'rss') {
 		print <<XML;
@@ -8276,7 +8315,7 @@ XML
 		      $alt_url . '" />' . "\n" .
 		      '<link rel="self" type="' . $content_type . '" href="' .
 		      $cgi->self_url() . '" />' . "\n" .
-		      "<id>" . href(-full=>1) . "</id>\n" .
+		      "<id>" . esc_url(href(-full=>1)) . "</id>\n" .
 		      # use project owner for feed author
 		      "<author><name>$owner</name></author>\n";
 		if (defined $favicon) {
@@ -8322,7 +8361,7 @@ XML
 			      "<author>" . esc_html($co{'author'}) . "</author>\n" .
 			      "<pubDate>$cd{'rfc2822'}</pubDate>\n" .
 			      "<guid isPermaLink=\"true\">$co_url</guid>\n" .
-			      "<link>$co_url</link>\n" .
+			      "<link>" . esc_html($co_url) . "</link>\n" .
 			      "<description>" . esc_html($co{'title'}) . "</description>\n" .
 			      "<content:encoded>" .
 			      "<![CDATA[\n";
@@ -8344,8 +8383,8 @@ XML
 			}
 			print "</contributor>\n" .
 			      "<published>$cd{'iso-8601'}</published>\n" .
-			      "<link rel=\"alternate\" type=\"text/html\" href=\"$co_url\" />\n" .
-			      "<id>$co_url</id>\n" .
+			      "<link rel=\"alternate\" type=\"text/html\" href=\"" . esc_attr($co_url) . "\" />\n" .
+			      "<id>" . esc_html($co_url) . "</id>\n" .
 			      "<content type=\"xhtml\" xml:base=\"" . esc_url($my_url) . "\">\n" .
 			      "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n";
 		}
@@ -8452,8 +8491,8 @@ XML
 		}
 
 		my $path = esc_html(chop_str($proj{'path'}, 25, 5));
-		my $rss  = href('project' => $proj{'path'}, 'action' => 'rss', -full => 1);
-		my $html = href('project' => $proj{'path'}, 'action' => 'summary', -full => 1);
+		my $rss  = esc_attr(href('project' => $proj{'path'}, 'action' => 'rss', -full => 1));
+		my $html = esc_attr(href('project' => $proj{'path'}, 'action' => 'summary', -full => 1));
 		print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
 	}
 	print <<XML;
diff --git a/gpg-interface.c b/gpg-interface.c
index d60115ca40..127aecfc2b 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -1,4 +1,5 @@
 #include "cache.h"
+#include "commit.h"
 #include "config.h"
 #include "run-command.h"
 #include "strbuf.h"
@@ -7,6 +8,8 @@
 #include "tempfile.h"
 
 static char *configured_signing_key;
+static enum signature_trust_level configured_min_trust_level = TRUST_UNDEFINED;
+
 struct gpg_format {
 	const char *name;
 	const char *program;
@@ -85,6 +88,8 @@ void signature_check_clear(struct signature_check *sigc)
 #define GPG_STATUS_UID		(1<<2)
 /* The status includes key fingerprints */
 #define GPG_STATUS_FINGERPRINT	(1<<3)
+/* The status includes trust level */
+#define GPG_STATUS_TRUST_LEVEL	(1<<4)
 
 /* Short-hand for standard exclusive *SIG status with keyid & UID */
 #define GPG_STATUS_STDSIG	(GPG_STATUS_EXCLUSIVE|GPG_STATUS_KEYID|GPG_STATUS_UID)
@@ -96,15 +101,49 @@ static struct {
 } sigcheck_gpg_status[] = {
 	{ 'G', "GOODSIG ", GPG_STATUS_STDSIG },
 	{ 'B', "BADSIG ", GPG_STATUS_STDSIG },
-	{ 'U', "TRUST_NEVER", 0 },
-	{ 'U', "TRUST_UNDEFINED", 0 },
 	{ 'E', "ERRSIG ", GPG_STATUS_EXCLUSIVE|GPG_STATUS_KEYID },
 	{ 'X', "EXPSIG ", GPG_STATUS_STDSIG },
 	{ 'Y', "EXPKEYSIG ", GPG_STATUS_STDSIG },
 	{ 'R', "REVKEYSIG ", GPG_STATUS_STDSIG },
 	{ 0, "VALIDSIG ", GPG_STATUS_FINGERPRINT },
+	{ 0, "TRUST_", GPG_STATUS_TRUST_LEVEL },
+};
+
+static struct {
+	const char *key;
+	enum signature_trust_level value;
+} sigcheck_gpg_trust_level[] = {
+	{ "UNDEFINED", TRUST_UNDEFINED },
+	{ "NEVER", TRUST_NEVER },
+	{ "MARGINAL", TRUST_MARGINAL },
+	{ "FULLY", TRUST_FULLY },
+	{ "ULTIMATE", TRUST_ULTIMATE },
 };
 
+static void replace_cstring(char **field, const char *line, const char *next)
+{
+	free(*field);
+
+	if (line && next)
+		*field = xmemdupz(line, next - line);
+	else
+		*field = NULL;
+}
+
+static int parse_gpg_trust_level(const char *level,
+				 enum signature_trust_level *res)
+{
+	size_t i;
+
+	for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_trust_level); i++) {
+		if (!strcmp(sigcheck_gpg_trust_level[i].key, level)) {
+			*res = sigcheck_gpg_trust_level[i].value;
+			return 0;
+		}
+	}
+	return 1;
+}
+
 static void parse_gpg_output(struct signature_check *sigc)
 {
 	const char *buf = sigc->gpg_status;
@@ -126,9 +165,18 @@ static void parse_gpg_output(struct signature_check *sigc)
 		/* Iterate over all search strings */
 		for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
 			if (skip_prefix(line, sigcheck_gpg_status[i].check, &line)) {
+				/*
+				 * GOODSIG, BADSIG etc. can occur only once for
+				 * each signature.  Therefore, if we had more
+				 * than one then we're dealing with multiple
+				 * signatures.  We don't support them
+				 * currently, and they're rather hard to
+				 * create, so something is likely fishy and we
+				 * should reject them altogether.
+				 */
 				if (sigcheck_gpg_status[i].flags & GPG_STATUS_EXCLUSIVE) {
 					if (seen_exclusive_status++)
-						goto found_duplicate_status;
+						goto error;
 				}
 
 				if (sigcheck_gpg_status[i].result)
@@ -136,33 +184,62 @@ static void parse_gpg_output(struct signature_check *sigc)
 				/* Do we have key information? */
 				if (sigcheck_gpg_status[i].flags & GPG_STATUS_KEYID) {
 					next = strchrnul(line, ' ');
-					free(sigc->key);
-					sigc->key = xmemdupz(line, next - line);
+					replace_cstring(&sigc->key, line, next);
 					/* Do we have signer information? */
 					if (*next && (sigcheck_gpg_status[i].flags & GPG_STATUS_UID)) {
 						line = next + 1;
 						next = strchrnul(line, '\n');
-						free(sigc->signer);
-						sigc->signer = xmemdupz(line, next - line);
+						replace_cstring(&sigc->signer, line, next);
 					}
 				}
+
+				/* Do we have trust level? */
+				if (sigcheck_gpg_status[i].flags & GPG_STATUS_TRUST_LEVEL) {
+					/*
+					 * GPG v1 and v2 differs in how the
+					 * TRUST_ lines are written.  Some
+					 * trust lines contain no additional
+					 * space-separated information for v1.
+					 */
+					size_t trust_size = strcspn(line, " \n");
+					char *trust = xmemdupz(line, trust_size);
+
+					if (parse_gpg_trust_level(trust, &sigc->trust_level)) {
+						free(trust);
+						goto error;
+					}
+					free(trust);
+				}
+
 				/* Do we have fingerprint? */
 				if (sigcheck_gpg_status[i].flags & GPG_STATUS_FINGERPRINT) {
-					next = strchrnul(line, ' ');
-					free(sigc->fingerprint);
-					sigc->fingerprint = xmemdupz(line, next - line);
+					const char *limit;
+					char **field;
 
-					/* Skip interim fields */
+					next = strchrnul(line, ' ');
+					replace_cstring(&sigc->fingerprint, line, next);
+
+					/*
+					 * Skip interim fields.  The search is
+					 * limited to the same line since only
+					 * OpenPGP signatures has a field with
+					 * the primary fingerprint.
+					 */
+					limit = strchrnul(line, '\n');
 					for (j = 9; j > 0; j--) {
-						if (!*next)
+						if (!*next || limit <= next)
 							break;
 						line = next + 1;
 						next = strchrnul(line, ' ');
 					}
 
-					next = strchrnul(line, '\n');
-					free(sigc->primary_key_fingerprint);
-					sigc->primary_key_fingerprint = xmemdupz(line, next - line);
+					field = &sigc->primary_key_fingerprint;
+					if (!j) {
+						next = strchrnul(line, '\n');
+						replace_cstring(field, line, next);
+					} else {
+						replace_cstring(field, NULL, NULL);
+					}
 				}
 
 				break;
@@ -171,14 +248,7 @@ static void parse_gpg_output(struct signature_check *sigc)
 	}
 	return;
 
-found_duplicate_status:
-	/*
-	 * GOODSIG, BADSIG etc. can occur only once for each signature.
-	 * Therefore, if we had more than one then we're dealing with multiple
-	 * signatures.  We don't support them currently, and they're rather
-	 * hard to create, so something is likely fishy and we should reject
-	 * them altogether.
-	 */
+error:
 	sigc->result = 'E';
 	/* Clear partial data to avoid confusion */
 	FREE_AND_NULL(sigc->primary_key_fingerprint);
@@ -187,6 +257,55 @@ found_duplicate_status:
 	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)
+{
+	struct child_process gpg = CHILD_PROCESS_INIT;
+	struct gpg_format *fmt;
+	struct tempfile *temp;
+	int ret;
+	struct strbuf buf = STRBUF_INIT;
+
+	temp = mks_tempfile_t(".git_vtag_tmpXXXXXX");
+	if (!temp)
+		return error_errno(_("could not create temporary file"));
+	if (write_in_full(temp->fd, signature, signature_size) < 0 ||
+	    close_tempfile_gently(temp) < 0) {
+		error_errno(_("failed writing detached signature to '%s'"),
+			    temp->filename.buf);
+		delete_tempfile(&temp);
+		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,
+		     "--status-fd=1",
+		     "--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);
+	sigchain_pop(SIGPIPE);
+
+	delete_tempfile(&temp);
+
+	ret |= !strstr(gpg_status->buf, "\n[GNUPG:] GOODSIG ");
+	strbuf_release(&buf); /* no matter it was used or not */
+
+	return ret;
+}
+
 int check_signature(const char *payload, size_t plen, const char *signature,
 	size_t slen, struct signature_check *sigc)
 {
@@ -195,6 +314,7 @@ int check_signature(const char *payload, size_t plen, const char *signature,
 	int status;
 
 	sigc->result = 'N';
+	sigc->trust_level = -1;
 
 	status = verify_signed_buffer(payload, plen, signature, slen,
 				      &gpg_output, &gpg_status);
@@ -204,7 +324,8 @@ int check_signature(const char *payload, size_t plen, const char *signature,
 	sigc->gpg_output = strbuf_detach(&gpg_output, NULL);
 	sigc->gpg_status = strbuf_detach(&gpg_status, NULL);
 	parse_gpg_output(sigc);
-	status |= sigc->result != 'G' && sigc->result != 'U';
+	status |= sigc->result != 'G';
+	status |= sigc->trust_level < configured_min_trust_level;
 
  out:
 	strbuf_release(&gpg_status);
@@ -225,7 +346,7 @@ void print_signature_buffer(const struct signature_check *sigc, unsigned flags)
 		fputs(output, stderr);
 }
 
-size_t parse_signature(const char *buf, size_t size)
+size_t parse_signed_buffer(const char *buf, size_t size)
 {
 	size_t len = 0;
 	size_t match = size;
@@ -241,6 +362,18 @@ size_t parse_signature(const char *buf, size_t size)
 	return match;
 }
 
+int parse_signature(const char *buf, size_t size, struct strbuf *payload, struct strbuf *signature)
+{
+	size_t match = parse_signed_buffer(buf, size);
+	if (match != size) {
+		strbuf_add(payload, buf, match);
+		remove_signature(payload);
+		strbuf_add(signature, buf + match, size - match);
+		return 1;
+	}
+	return 0;
+}
+
 void set_signing_key(const char *key)
 {
 	free(configured_signing_key);
@@ -251,6 +384,8 @@ int git_gpg_config(const char *var, const char *value, void *cb)
 {
 	struct gpg_format *fmt = NULL;
 	char *fmtname = NULL;
+	char *trust;
+	int ret;
 
 	if (!strcmp(var, "user.signingkey")) {
 		if (!value)
@@ -270,6 +405,20 @@ int git_gpg_config(const char *var, const char *value, void *cb)
 		return 0;
 	}
 
+	if (!strcmp(var, "gpg.mintrustlevel")) {
+		if (!value)
+			return config_error_nonbool(var);
+
+		trust = xstrdup_toupper(value);
+		ret = parse_gpg_trust_level(trust, &configured_min_trust_level);
+		free(trust);
+
+		if (ret)
+			return error("unsupported value for %s: %s", var,
+				     value);
+		return 0;
+	}
+
 	if (!strcmp(var, "gpg.program") || !strcmp(var, "gpg.openpgp.program"))
 		fmtname = "openpgp";
 
@@ -298,11 +447,11 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig
 	size_t i, j, bottom;
 	struct strbuf gpg_status = STRBUF_INIT;
 
-	argv_array_pushl(&gpg.args,
-			 use_format->program,
-			 "--status-fd=2",
-			 "-bsau", signing_key,
-			 NULL);
+	strvec_pushl(&gpg.args,
+		     use_format->program,
+		     "--status-fd=2",
+		     "-bsau", signing_key,
+		     NULL);
 
 	bottom = signature->len;
 
@@ -331,51 +480,3 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig
 
 	return 0;
 }
-
-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)
-{
-	struct child_process gpg = CHILD_PROCESS_INIT;
-	struct gpg_format *fmt;
-	struct tempfile *temp;
-	int ret;
-	struct strbuf buf = STRBUF_INIT;
-
-	temp = mks_tempfile_t(".git_vtag_tmpXXXXXX");
-	if (!temp)
-		return error_errno(_("could not create temporary file"));
-	if (write_in_full(temp->fd, signature, signature_size) < 0 ||
-	    close_tempfile_gently(temp) < 0) {
-		error_errno(_("failed writing detached signature to '%s'"),
-			    temp->filename.buf);
-		delete_tempfile(&temp);
-		return -1;
-	}
-
-	fmt = get_format_by_sig(signature);
-	if (!fmt)
-		BUG("bad signature '%s'", signature);
-
-	argv_array_push(&gpg.args, fmt->program);
-	argv_array_pushv(&gpg.args, fmt->verify_args);
-	argv_array_pushl(&gpg.args,
-			 "--status-fd=1",
-			 "--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);
-	sigchain_pop(SIGPIPE);
-
-	delete_tempfile(&temp);
-
-	ret |= !strstr(gpg_status->buf, "\n[GNUPG:] GOODSIG ");
-	strbuf_release(&buf); /* no matter it was used or not */
-
-	return ret;
-}
diff --git a/gpg-interface.h b/gpg-interface.h
index 3e624ec289..80567e4894 100644
--- a/gpg-interface.h
+++ b/gpg-interface.h
@@ -7,6 +7,14 @@ struct strbuf;
 #define GPG_VERIFY_RAW			2
 #define GPG_VERIFY_OMIT_STATUS	4
 
+enum signature_trust_level {
+	TRUST_UNDEFINED,
+	TRUST_NEVER,
+	TRUST_MARGINAL,
+	TRUST_FULLY,
+	TRUST_ULTIMATE,
+};
+
 struct signature_check {
 	char *payload;
 	char *gpg_output;
@@ -16,7 +24,6 @@ struct signature_check {
 	 * possible "result":
 	 * 0 (not checked)
 	 * N (checked but no further result)
-	 * U (untrusted good)
 	 * G (good)
 	 * B (bad)
 	 */
@@ -25,17 +32,25 @@ struct signature_check {
 	char *key;
 	char *fingerprint;
 	char *primary_key_fingerprint;
+	enum signature_trust_level trust_level;
 };
 
 void signature_check_clear(struct signature_check *sigc);
 
 /*
+ * Look at a GPG signed tag object.  If such a signature exists, store it in
+ * signature and the signed content in payload.  Return 1 if a signature was
+ * found, and 0 otherwise.
+ */
+int parse_signature(const char *buf, size_t size, struct strbuf *payload, struct strbuf *signature);
+
+/*
  * Look at GPG signed content (e.g. a signed tag object), whose
  * payload is followed by a detached signature on it.  Return the
  * offset where the embedded detached signature begins, or the end of
  * the data when there is no such signature.
  */
-size_t parse_signature(const char *buf, size_t size);
+size_t parse_signed_buffer(const char *buf, size_t size);
 
 /*
  * Create a detached signature for the contents of "buffer" and append
@@ -46,15 +61,6 @@ size_t parse_signature(const char *buf, size_t size);
 int sign_buffer(struct strbuf *buffer, struct strbuf *signature,
 		const char *signing_key);
 
-/*
- * Run "gpg" to see if the payload matches the detached signature.
- * gpg_output, when set, receives the diagnostic output from GPG.
- * gpg_status, when set, receives the status output from GPG.
- */
-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);
-
 int git_gpg_config(const char *, const char *, void *);
 void set_signing_key(const char *);
 const char *get_signing_key(void);
diff --git a/graph.c b/graph.c
index f53135485f..e3828eb8f2 100644
--- a/graph.c
+++ b/graph.c
@@ -4,7 +4,7 @@
 #include "color.h"
 #include "graph.h"
 #include "revision.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 /* Internal API */
 
@@ -34,6 +34,7 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb);
  * handle directly. It is assumed that this is the same file handle as the
  * file specified by the graph diff options. This is necessary so that
  * graph_show_strbuf can be called even with a NULL graph.
+ * If a NULL graph is supplied, the strbuf is printed as-is.
  */
 static void graph_show_strbuf(struct git_graph *graph,
 			      FILE *file,
@@ -81,7 +82,7 @@ static void graph_show_line_prefix(const struct diff_options *diffopt)
 static const char **column_colors;
 static unsigned short column_colors_max;
 
-static void parse_graph_colors_config(struct argv_array *colors, const char *string)
+static void parse_graph_colors_config(struct strvec *colors, const char *string)
 {
 	const char *end, *start;
 
@@ -92,13 +93,13 @@ static void parse_graph_colors_config(struct argv_array *colors, const char *str
 		char color[COLOR_MAXLEN];
 
 		if (!color_parse_mem(start, comma - start, color))
-			argv_array_push(colors, color);
+			strvec_push(colors, color);
 		else
-			warning(_("ignore invalid color '%.*s' in log.graphColors"),
+			warning(_("ignored invalid color '%.*s' in log.graphColors"),
 				(int)(comma - start), start);
 		start = comma + 1;
 	}
-	argv_array_push(colors, GIT_COLOR_RESET);
+	strvec_push(colors, GIT_COLOR_RESET);
 }
 
 void graph_set_column_colors(const char **colors, unsigned short colors_max)
@@ -112,14 +113,42 @@ static const char *column_get_color_code(unsigned short color)
 	return column_colors[color];
 }
 
-static void strbuf_write_column(struct strbuf *sb, const struct column *c,
-				char col_char)
+struct graph_line {
+	struct strbuf *buf;
+	size_t width;
+};
+
+static inline void graph_line_addch(struct graph_line *line, int c)
+{
+	strbuf_addch(line->buf, c);
+	line->width++;
+}
+
+static inline void graph_line_addchars(struct graph_line *line, int c, size_t n)
+{
+	strbuf_addchars(line->buf, c, n);
+	line->width += n;
+}
+
+static inline void graph_line_addstr(struct graph_line *line, const char *s)
+{
+	strbuf_addstr(line->buf, s);
+	line->width += strlen(s);
+}
+
+static inline void graph_line_addcolor(struct graph_line *line, unsigned short color)
+{
+	strbuf_addstr(line->buf, column_get_color_code(color));
+}
+
+static void graph_line_write_column(struct graph_line *line, const struct column *c,
+				    char col_char)
 {
 	if (c->color < column_colors_max)
-		strbuf_addstr(sb, column_get_color_code(c->color));
-	strbuf_addch(sb, col_char);
+		graph_line_addcolor(line, c->color);
+	graph_line_addch(line, col_char);
 	if (c->color < column_colors_max)
-		strbuf_addstr(sb, column_get_color_code(column_colors_max));
+		graph_line_addcolor(line, column_colors_max);
 }
 
 struct git_graph {
@@ -175,9 +204,63 @@ struct git_graph {
 	 */
 	int prev_commit_index;
 	/*
+	 * Which layout variant to use to display merge commits. If the
+	 * commit's first parent is known to be in a column to the left of the
+	 * merge, then this value is 0 and we use the layout on the left.
+	 * Otherwise, the value is 1 and the layout on the right is used. This
+	 * field tells us how many columns the first parent occupies.
+	 *
+	 * 		0)			1)
+	 *
+	 * 		| | | *-.		| | *---.
+	 * 		| |_|/|\ \		| | |\ \ \
+	 * 		|/| | | | |		| | | | | *
+	 */
+	int merge_layout;
+	/*
+	 * The number of columns added to the graph by the current commit. For
+	 * 2-way and octopus merges, this is usually one less than the
+	 * number of parents:
+	 *
+	 * 		| | |			| |    \
+	 *		| * |			| *---. \
+	 *		| |\ \			| |\ \ \ \
+	 *		| | | |         	| | | | | |
+	 *
+	 *		num_parents: 2		num_parents: 4
+	 *		edges_added: 1		edges_added: 3
+	 *
+	 * For left-skewed merges, the first parent fuses with its neighbor and
+	 * so one less column is added:
+	 *
+	 *		| | |			| |  \
+	 *		| * |			| *-. \
+	 *		|/| |			|/|\ \ \
+	 *		| | |			| | | | |
+	 *
+	 *		num_parents: 2		num_parents: 4
+	 *		edges_added: 0		edges_added: 2
+	 *
+	 * This number determines how edges to the right of the merge are
+	 * displayed in commit and post-merge lines; if no columns have been
+	 * added then a vertical line should be used where a right-tracking
+	 * line would otherwise be used.
+	 *
+	 *		| * \			| * |
+	 *		| |\ \			|/| |
+	 *		| | * \			| * |
+	 */
+	int edges_added;
+	/*
+	 * The number of columns added by the previous commit, which is used to
+	 * smooth edges appearing to the right of a commit in a commit line
+	 * following a post-merge line.
+	 */
+	int prev_edges_added;
+	/*
 	 * The maximum number of columns that can be stored in the columns
 	 * and new_columns arrays.  This is also half the number of entries
-	 * that can be stored in the mapping and new_mapping arrays.
+	 * that can be stored in the mapping and old_mapping arrays.
 	 */
 	int column_capacity;
 	/*
@@ -215,12 +298,12 @@ struct git_graph {
 	 */
 	int *mapping;
 	/*
-	 * A temporary array for computing the next mapping state
-	 * while we are outputting a mapping line.  This is stored as part
-	 * of the git_graph simply so we don't have to allocate a new
-	 * temporary array each time we have to output a collapsing line.
+	 * A copy of the contents of the mapping array from the last commit,
+	 * which we use to improve the display of columns that are tracking
+	 * from right to left through a commit line.  We also use this to
+	 * avoid allocating a fresh array when we compute the next mapping.
 	 */
-	int *new_mapping;
+	int *old_mapping;
 	/*
 	 * The current default column color being used.  This is
 	 * stored as an index into the array column_colors.
@@ -267,13 +350,13 @@ struct git_graph *graph_init(struct rev_info *opt)
 			graph_set_column_colors(column_colors_ansi,
 						column_colors_ansi_max);
 		} else {
-			static struct argv_array custom_colors = ARGV_ARRAY_INIT;
-			argv_array_clear(&custom_colors);
+			static struct strvec custom_colors = STRVEC_INIT;
+			strvec_clear(&custom_colors);
 			parse_graph_colors_config(&custom_colors, string);
 			free(string);
 			/* graph_set_column_colors takes a max-index, not a count */
-			graph_set_column_colors(custom_colors.argv,
-						custom_colors.argc - 1);
+			graph_set_column_colors(custom_colors.v,
+						custom_colors.nr - 1);
 		}
 	}
 
@@ -285,6 +368,9 @@ struct git_graph *graph_init(struct rev_info *opt)
 	graph->prev_state = GRAPH_PADDING;
 	graph->commit_index = 0;
 	graph->prev_commit_index = 0;
+	graph->merge_layout = 0;
+	graph->edges_added = 0;
+	graph->prev_edges_added = 0;
 	graph->num_columns = 0;
 	graph->num_new_columns = 0;
 	graph->mapping_size = 0;
@@ -303,7 +389,7 @@ struct git_graph *graph_init(struct rev_info *opt)
 	ALLOC_ARRAY(graph->columns, graph->column_capacity);
 	ALLOC_ARRAY(graph->new_columns, graph->column_capacity);
 	ALLOC_ARRAY(graph->mapping, 2 * graph->column_capacity);
-	ALLOC_ARRAY(graph->new_mapping, 2 * graph->column_capacity);
+	ALLOC_ARRAY(graph->old_mapping, 2 * graph->column_capacity);
 
 	/*
 	 * The diff output prefix callback, with this we can make
@@ -333,7 +419,7 @@ static void graph_ensure_capacity(struct git_graph *graph, int num_columns)
 	REALLOC_ARRAY(graph->columns, graph->column_capacity);
 	REALLOC_ARRAY(graph->new_columns, graph->column_capacity);
 	REALLOC_ARRAY(graph->mapping, graph->column_capacity * 2);
-	REALLOC_ARRAY(graph->new_mapping, graph->column_capacity * 2);
+	REALLOC_ARRAY(graph->old_mapping, graph->column_capacity * 2);
 }
 
 /*
@@ -432,74 +518,76 @@ static unsigned short graph_find_commit_color(const struct git_graph *graph,
 	return graph_get_current_column_color(graph);
 }
 
-static void graph_insert_into_new_columns(struct git_graph *graph,
-					  struct commit *commit,
-					  int *mapping_index)
+static int graph_find_new_column_by_commit(struct git_graph *graph,
+					   struct commit *commit)
 {
 	int i;
-
-	/*
-	 * If the commit is already in the new_columns list, we don't need to
-	 * add it.  Just update the mapping correctly.
-	 */
 	for (i = 0; i < graph->num_new_columns; i++) {
-		if (graph->new_columns[i].commit == commit) {
-			graph->mapping[*mapping_index] = i;
-			*mapping_index += 2;
-			return;
-		}
+		if (graph->new_columns[i].commit == commit)
+			return i;
 	}
-
-	/*
-	 * This commit isn't already in new_columns.  Add it.
-	 */
-	graph->new_columns[graph->num_new_columns].commit = commit;
-	graph->new_columns[graph->num_new_columns].color = graph_find_commit_color(graph, commit);
-	graph->mapping[*mapping_index] = graph->num_new_columns;
-	*mapping_index += 2;
-	graph->num_new_columns++;
+	return -1;
 }
 
-static void graph_update_width(struct git_graph *graph,
-			       int is_commit_in_existing_columns)
+static void graph_insert_into_new_columns(struct git_graph *graph,
+					  struct commit *commit,
+					  int idx)
 {
-	/*
-	 * Compute the width needed to display the graph for this commit.
-	 * This is the maximum width needed for any row.  All other rows
-	 * will be padded to this width.
-	 *
-	 * Compute the number of columns in the widest row:
-	 * Count each existing column (graph->num_columns), and each new
-	 * column added by this commit.
-	 */
-	int max_cols = graph->num_columns + graph->num_parents;
+	int i = graph_find_new_column_by_commit(graph, commit);
+	int mapping_idx;
 
 	/*
-	 * Even if the current commit has no parents to be printed, it
-	 * still takes up a column for itself.
+	 * If the commit is not already in the new_columns array, then add it
+	 * and record it as being in the final column.
 	 */
-	if (graph->num_parents < 1)
-		max_cols++;
+	if (i < 0) {
+		i = graph->num_new_columns++;
+		graph->new_columns[i].commit = commit;
+		graph->new_columns[i].color = graph_find_commit_color(graph, commit);
+	}
 
-	/*
-	 * We added a column for the current commit as part of
-	 * graph->num_parents.  If the current commit was already in
-	 * graph->columns, then we have double counted it.
-	 */
-	if (is_commit_in_existing_columns)
-		max_cols--;
+	if (graph->num_parents > 1 && idx > -1 && graph->merge_layout == -1) {
+		/*
+		 * If this is the first parent of a merge, choose a layout for
+		 * the merge line based on whether the parent appears in a
+		 * column to the left of the merge
+		 */
+		int dist, shift;
 
-	/*
-	 * Each column takes up 2 spaces
-	 */
-	graph->width = max_cols * 2;
+		dist = idx - i;
+		shift = (dist > 1) ? 2 * dist - 3 : 1;
+
+		graph->merge_layout = (dist > 0) ? 0 : 1;
+		graph->edges_added = graph->num_parents + graph->merge_layout  - 2;
+
+		mapping_idx = graph->width + (graph->merge_layout - 1) * shift;
+		graph->width += 2 * graph->merge_layout;
+
+	} else if (graph->edges_added > 0 && i == graph->mapping[graph->width - 2]) {
+		/*
+		 * If some columns have been added by a merge, but this commit
+		 * was found in the last existing column, then adjust the
+		 * numbers so that the two edges immediately join, i.e.:
+		 *
+		 *		* |		* |
+		 *		|\ \	=>	|\|
+		 *		| |/		| *
+		 *		| *
+		 */
+		mapping_idx = graph->width - 2;
+		graph->edges_added = -1;
+	} else {
+		mapping_idx = graph->width;
+		graph->width += 2;
+	}
+
+	graph->mapping[mapping_idx] = i;
 }
 
 static void graph_update_columns(struct git_graph *graph)
 {
 	struct commit_list *parent;
 	int max_new_columns;
-	int mapping_idx;
 	int i, seen_this, is_commit_in_columns;
 
 	/*
@@ -532,6 +620,10 @@ static void graph_update_columns(struct git_graph *graph)
 	for (i = 0; i < graph->mapping_size; i++)
 		graph->mapping[i] = -1;
 
+	graph->width = 0;
+	graph->prev_edges_added = graph->edges_added;
+	graph->edges_added = 0;
+
 	/*
 	 * Populate graph->new_columns and graph->mapping
 	 *
@@ -542,7 +634,6 @@ static void graph_update_columns(struct git_graph *graph)
 	 * supposed to end up after the collapsing is performed.
 	 */
 	seen_this = 0;
-	mapping_idx = 0;
 	is_commit_in_columns = 1;
 	for (i = 0; i <= graph->num_columns; i++) {
 		struct commit *col_commit;
@@ -556,9 +647,9 @@ static void graph_update_columns(struct git_graph *graph)
 		}
 
 		if (col_commit == graph->commit) {
-			int old_mapping_idx = mapping_idx;
 			seen_this = 1;
 			graph->commit_index = i;
+			graph->merge_layout = -1;
 			for (parent = first_interesting_parent(graph);
 			     parent;
 			     parent = next_interesting_parent(graph, parent)) {
@@ -571,21 +662,18 @@ static void graph_update_columns(struct git_graph *graph)
 				    !is_commit_in_columns) {
 					graph_increment_column_color(graph);
 				}
-				graph_insert_into_new_columns(graph,
-							      parent->item,
-							      &mapping_idx);
+				graph_insert_into_new_columns(graph, parent->item, i);
 			}
 			/*
-			 * We always need to increment mapping_idx by at
+			 * We always need to increment graph->width by at
 			 * least 2, even if it has no interesting parents.
 			 * The current commit always takes up at least 2
 			 * spaces.
 			 */
-			if (mapping_idx == old_mapping_idx)
-				mapping_idx += 2;
+			if (graph->num_parents == 0)
+				graph->width += 2;
 		} else {
-			graph_insert_into_new_columns(graph, col_commit,
-						      &mapping_idx);
+			graph_insert_into_new_columns(graph, col_commit, -1);
 		}
 	}
 
@@ -595,11 +683,43 @@ static void graph_update_columns(struct git_graph *graph)
 	while (graph->mapping_size > 1 &&
 	       graph->mapping[graph->mapping_size - 1] < 0)
 		graph->mapping_size--;
+}
+
+static int graph_num_dashed_parents(struct git_graph *graph)
+{
+	return graph->num_parents + graph->merge_layout - 3;
+}
 
+static int graph_num_expansion_rows(struct git_graph *graph)
+{
 	/*
-	 * Compute graph->width for this commit
+	 * Normally, we need two expansion rows for each dashed parent line from
+	 * an octopus merge:
+	 *
+	 * 		| *
+	 * 		| |\
+	 * 		| | \
+	 * 		| |  \
+	 * 		| *-. \
+	 * 		| |\ \ \
+	 *
+	 * If the merge is skewed to the left, then its parents occupy one less
+	 * column, and we don't need as many expansion rows to route around it;
+	 * in some cases that means we don't need any expansion rows at all:
+	 *
+	 * 		| *
+	 * 		| |\
+	 * 		| * \
+	 * 		|/|\ \
 	 */
-	graph_update_width(graph, is_commit_in_columns);
+	return graph_num_dashed_parents(graph) * 2;
+}
+
+static int graph_needs_pre_commit_line(struct git_graph *graph)
+{
+	return graph->num_parents >= 3 &&
+	       graph->commit_index < (graph->num_columns - 1) &&
+	       graph->expansion_row < graph_num_expansion_rows(graph);
 }
 
 void graph_update(struct git_graph *graph, struct commit *commit)
@@ -657,8 +777,7 @@ void graph_update(struct git_graph *graph, struct commit *commit)
 	 */
 	if (graph->state != GRAPH_PADDING)
 		graph->state = GRAPH_SKIP;
-	else if (graph->num_parents >= 3 &&
-		 graph->commit_index < (graph->num_columns - 1))
+	else if (graph_needs_pre_commit_line(graph))
 		graph->state = GRAPH_PRE_COMMIT;
 	else
 		graph->state = GRAPH_COMMIT;
@@ -686,8 +805,7 @@ static int graph_is_mapping_correct(struct git_graph *graph)
 	return 1;
 }
 
-static void graph_pad_horizontally(struct git_graph *graph, struct strbuf *sb,
-				   int chars_written)
+static void graph_pad_horizontally(struct git_graph *graph, struct graph_line *line)
 {
 	/*
 	 * Add additional spaces to the end of the strbuf, so that all
@@ -696,34 +814,22 @@ static void graph_pad_horizontally(struct git_graph *graph, struct strbuf *sb,
 	 * This way, fields printed to the right of the graph will remain
 	 * aligned for the entire commit.
 	 */
-	if (chars_written < graph->width)
-		strbuf_addchars(sb, ' ', graph->width - chars_written);
+	if (line->width < graph->width)
+		graph_line_addchars(line, ' ', graph->width - line->width);
 }
 
 static void graph_output_padding_line(struct git_graph *graph,
-				      struct strbuf *sb)
+				      struct graph_line *line)
 {
 	int i;
 
 	/*
-	 * We could conceivable be called with a NULL commit
-	 * if our caller has a bug, and invokes graph_next_line()
-	 * immediately after graph_init(), without first calling
-	 * graph_update().  Return without outputting anything in this
-	 * case.
-	 */
-	if (!graph->commit)
-		return;
-
-	/*
 	 * Output a padding row, that leaves all branch lines unchanged
 	 */
 	for (i = 0; i < graph->num_new_columns; i++) {
-		strbuf_write_column(sb, &graph->new_columns[i], '|');
-		strbuf_addch(sb, ' ');
+		graph_line_write_column(line, &graph->new_columns[i], '|');
+		graph_line_addch(line, ' ');
 	}
-
-	graph_pad_horizontally(graph, sb, graph->num_new_columns * 2);
 }
 
 
@@ -733,28 +839,24 @@ int graph_width(struct git_graph *graph)
 }
 
 
-static void graph_output_skip_line(struct git_graph *graph, struct strbuf *sb)
+static void graph_output_skip_line(struct git_graph *graph, struct graph_line *line)
 {
 	/*
 	 * Output an ellipsis to indicate that a portion
 	 * of the graph is missing.
 	 */
-	strbuf_addstr(sb, "...");
-	graph_pad_horizontally(graph, sb, 3);
+	graph_line_addstr(line, "...");
 
-	if (graph->num_parents >= 3 &&
-	    graph->commit_index < (graph->num_columns - 1))
+	if (graph_needs_pre_commit_line(graph))
 		graph_update_state(graph, GRAPH_PRE_COMMIT);
 	else
 		graph_update_state(graph, GRAPH_COMMIT);
 }
 
 static void graph_output_pre_commit_line(struct git_graph *graph,
-					 struct strbuf *sb)
+					 struct graph_line *line)
 {
-	int num_expansion_rows;
 	int i, seen_this;
-	int chars_written;
 
 	/*
 	 * This function formats a row that increases the space around a commit
@@ -764,27 +866,24 @@ static void graph_output_pre_commit_line(struct git_graph *graph,
 	 * We need 2 extra rows for every parent over 2.
 	 */
 	assert(graph->num_parents >= 3);
-	num_expansion_rows = (graph->num_parents - 2) * 2;
 
 	/*
 	 * graph->expansion_row tracks the current expansion row we are on.
 	 * It should be in the range [0, num_expansion_rows - 1]
 	 */
 	assert(0 <= graph->expansion_row &&
-	       graph->expansion_row < num_expansion_rows);
+	       graph->expansion_row < graph_num_expansion_rows(graph));
 
 	/*
 	 * Output the row
 	 */
 	seen_this = 0;
-	chars_written = 0;
 	for (i = 0; i < graph->num_columns; i++) {
 		struct column *col = &graph->columns[i];
 		if (col->commit == graph->commit) {
 			seen_this = 1;
-			strbuf_write_column(sb, col, '|');
-			strbuf_addchars(sb, ' ', graph->expansion_row);
-			chars_written += 1 + graph->expansion_row;
+			graph_line_write_column(line, col, '|');
+			graph_line_addchars(line, ' ', graph->expansion_row);
 		} else if (seen_this && (graph->expansion_row == 0)) {
 			/*
 			 * This is the first line of the pre-commit output.
@@ -797,33 +896,27 @@ static void graph_output_pre_commit_line(struct git_graph *graph,
 			 */
 			if (graph->prev_state == GRAPH_POST_MERGE &&
 			    graph->prev_commit_index < i)
-				strbuf_write_column(sb, col, '\\');
+				graph_line_write_column(line, col, '\\');
 			else
-				strbuf_write_column(sb, col, '|');
-			chars_written++;
+				graph_line_write_column(line, col, '|');
 		} else if (seen_this && (graph->expansion_row > 0)) {
-			strbuf_write_column(sb, col, '\\');
-			chars_written++;
+			graph_line_write_column(line, col, '\\');
 		} else {
-			strbuf_write_column(sb, col, '|');
-			chars_written++;
+			graph_line_write_column(line, col, '|');
 		}
-		strbuf_addch(sb, ' ');
-		chars_written++;
+		graph_line_addch(line, ' ');
 	}
 
-	graph_pad_horizontally(graph, sb, chars_written);
-
 	/*
 	 * Increment graph->expansion_row,
 	 * and move to state GRAPH_COMMIT if necessary
 	 */
 	graph->expansion_row++;
-	if (graph->expansion_row >= num_expansion_rows)
+	if (!graph_needs_pre_commit_line(graph))
 		graph_update_state(graph, GRAPH_COMMIT);
 }
 
-static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb)
+static void graph_output_commit_char(struct git_graph *graph, struct graph_line *line)
 {
 	/*
 	 * For boundary commits, print 'o'
@@ -831,72 +924,67 @@ static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb)
 	 */
 	if (graph->commit->object.flags & BOUNDARY) {
 		assert(graph->revs->boundary);
-		strbuf_addch(sb, 'o');
+		graph_line_addch(line, 'o');
 		return;
 	}
 
 	/*
 	 * get_revision_mark() handles all other cases without assert()
 	 */
-	strbuf_addstr(sb, get_revision_mark(graph->revs, graph->commit));
+	graph_line_addstr(line, get_revision_mark(graph->revs, graph->commit));
 }
 
 /*
- * Draw the horizontal dashes of an octopus merge and return the number of
- * characters written.
+ * Draw the horizontal dashes of an octopus merge.
  */
-static int graph_draw_octopus_merge(struct git_graph *graph,
-				    struct strbuf *sb)
+static void graph_draw_octopus_merge(struct git_graph *graph, struct graph_line *line)
 {
 	/*
-	 * Here dashless_parents represents the number of parents which don't
-	 * need to have dashes (the edges labeled "0" and "1").  And
-	 * dashful_parents are the remaining ones.
+	 * The parents of a merge commit can be arbitrarily reordered as they
+	 * are mapped onto display columns, for example this is a valid merge:
 	 *
-	 * | *---.
-	 * | |\ \ \
-	 * | | | | |
-	 * x 0 1 2 3
+	 *	| | *---.
+	 *	| | |\ \ \
+	 *	| | |/ / /
+	 *	| |/| | /
+	 *	| |_|_|/
+	 *	|/| | |
+	 *	3 1 0 2
 	 *
-	 */
-	const int dashless_parents = 2;
-	int dashful_parents = graph->num_parents - dashless_parents;
-
-	/*
-	 * Usually, we add one new column for each parent (like the diagram
-	 * above) but sometimes the first parent goes into an existing column,
-	 * like this:
+	 * The numbers denote which parent of the merge each visual column
+	 * corresponds to; we can't assume that the parents will initially
+	 * display in the order given by new_columns.
 	 *
-	 * | *---.
-	 * | |\ \ \
-	 * |/ / / /
-	 * x 0 1 2
+	 * To find the right color for each dash, we need to consult the
+	 * mapping array, starting from the column 2 places to the right of the
+	 * merge commit, and use that to find out which logical column each
+	 * edge will collapse to.
 	 *
-	 * In which case the number of parents will be one greater than the
-	 * number of added columns.
+	 * Commits are rendered once all edges have collapsed to their correct
+	 * logcial column, so commit_index gives us the right visual offset for
+	 * the merge commit.
 	 */
-	int added_cols = (graph->num_new_columns - graph->num_columns);
-	int parent_in_old_cols = graph->num_parents - added_cols;
 
-	/*
-	 * In both cases, commit_index corresponds to the edge labeled "0".
-	 */
-	int first_col = graph->commit_index + dashless_parents
-	    - parent_in_old_cols;
+	int i, j;
+	struct column *col;
 
-	int i;
-	for (i = 0; i < dashful_parents; i++) {
-		strbuf_write_column(sb, &graph->new_columns[i+first_col], '-');
-		strbuf_write_column(sb, &graph->new_columns[i+first_col],
-				    i == dashful_parents-1 ? '.' : '-');
+	int dashed_parents = graph_num_dashed_parents(graph);
+
+	for (i = 0; i < dashed_parents; i++) {
+		j = graph->mapping[(graph->commit_index + i + 2) * 2];
+		col = &graph->new_columns[j];
+
+		graph_line_write_column(line, col, '-');
+		graph_line_write_column(line, col, (i == dashed_parents - 1) ? '.' : '-');
 	}
-	return 2 * dashful_parents;
+
+	return;
 }
 
-static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
+static void graph_output_commit_line(struct git_graph *graph, struct graph_line *line)
 {
 	int seen_this = 0;
-	int i, chars_written;
+	int i;
 
 	/*
 	 * Output the row containing this commit
@@ -906,7 +994,6 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 	 * children that we have already processed.)
 	 */
 	seen_this = 0;
-	chars_written = 0;
 	for (i = 0; i <= graph->num_columns; i++) {
 		struct column *col = &graph->columns[i];
 		struct commit *col_commit;
@@ -920,19 +1007,17 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 
 		if (col_commit == graph->commit) {
 			seen_this = 1;
-			graph_output_commit_char(graph, sb);
-			chars_written++;
+			graph_output_commit_char(graph, line);
 
 			if (graph->num_parents > 2)
-				chars_written += graph_draw_octopus_merge(graph,
-									  sb);
-		} else if (seen_this && (graph->num_parents > 2)) {
-			strbuf_write_column(sb, col, '\\');
-			chars_written++;
-		} else if (seen_this && (graph->num_parents == 2)) {
+				graph_draw_octopus_merge(graph, line);
+		} else if (seen_this && (graph->edges_added > 1)) {
+			graph_line_write_column(line, col, '\\');
+		} else if (seen_this && (graph->edges_added == 1)) {
 			/*
-			 * This is a 2-way merge commit.
-			 * There is no GRAPH_PRE_COMMIT stage for 2-way
+			 * This is either a right-skewed 2-way merge
+			 * commit, or a left-skewed 3-way merge.
+			 * There is no GRAPH_PRE_COMMIT stage for such
 			 * merges, so this is the first line of output
 			 * for this commit.  Check to see what the previous
 			 * line of output was.
@@ -944,21 +1029,21 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 			 * makes the output look nicer.
 			 */
 			if (graph->prev_state == GRAPH_POST_MERGE &&
+			    graph->prev_edges_added > 0 &&
 			    graph->prev_commit_index < i)
-				strbuf_write_column(sb, col, '\\');
+				graph_line_write_column(line, col, '\\');
 			else
-				strbuf_write_column(sb, col, '|');
-			chars_written++;
+				graph_line_write_column(line, col, '|');
+		} else if (graph->prev_state == GRAPH_COLLAPSING &&
+			   graph->old_mapping[2 * i + 1] == i &&
+			   graph->mapping[2 * i] < i) {
+			graph_line_write_column(line, col, '/');
 		} else {
-			strbuf_write_column(sb, col, '|');
-			chars_written++;
+			graph_line_write_column(line, col, '|');
 		}
-		strbuf_addch(sb, ' ');
-		chars_written++;
+		graph_line_addch(line, ' ');
 	}
 
-	graph_pad_horizontally(graph, sb, chars_written);
-
 	/*
 	 * Update graph->state
 	 */
@@ -970,26 +1055,19 @@ static void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 		graph_update_state(graph, GRAPH_COLLAPSING);
 }
 
-static struct column *find_new_column_by_commit(struct git_graph *graph,
-						struct commit *commit)
-{
-	int i;
-	for (i = 0; i < graph->num_new_columns; i++) {
-		if (graph->new_columns[i].commit == commit)
-			return &graph->new_columns[i];
-	}
-	return NULL;
-}
+static const char merge_chars[] = {'/', '|', '\\'};
 
-static void graph_output_post_merge_line(struct git_graph *graph, struct strbuf *sb)
+static void graph_output_post_merge_line(struct git_graph *graph, struct graph_line *line)
 {
 	int seen_this = 0;
-	int i, j, chars_written;
+	int i, j;
+
+	struct commit_list *first_parent = first_interesting_parent(graph);
+	struct column *parent_col = NULL;
 
 	/*
 	 * Output the post-merge row
 	 */
-	chars_written = 0;
 	for (i = 0; i <= graph->num_columns; i++) {
 		struct column *col = &graph->columns[i];
 		struct commit *col_commit;
@@ -1008,37 +1086,49 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct strbuf
 			 * new_columns and use those to format the
 			 * edges.
 			 */
-			struct commit_list *parents = NULL;
-			struct column *par_column;
+			struct commit_list *parents = first_parent;
+			int par_column;
+			int idx = graph->merge_layout;
+			char c;
 			seen_this = 1;
-			parents = first_interesting_parent(graph);
-			assert(parents);
-			par_column = find_new_column_by_commit(graph, parents->item);
-			assert(par_column);
-
-			strbuf_write_column(sb, par_column, '|');
-			chars_written++;
-			for (j = 0; j < graph->num_parents - 1; j++) {
+
+			for (j = 0; j < graph->num_parents; j++) {
+				par_column = graph_find_new_column_by_commit(graph, parents->item);
+				assert(par_column >= 0);
+
+				c = merge_chars[idx];
+				graph_line_write_column(line, &graph->new_columns[par_column], c);
+				if (idx == 2) {
+					if (graph->edges_added > 0 || j < graph->num_parents - 1)
+						graph_line_addch(line, ' ');
+				} else {
+					idx++;
+				}
 				parents = next_interesting_parent(graph, parents);
-				assert(parents);
-				par_column = find_new_column_by_commit(graph, parents->item);
-				assert(par_column);
-				strbuf_write_column(sb, par_column, '\\');
-				strbuf_addch(sb, ' ');
 			}
-			chars_written += j * 2;
+			if (graph->edges_added == 0)
+				graph_line_addch(line, ' ');
+
 		} else if (seen_this) {
-			strbuf_write_column(sb, col, '\\');
-			strbuf_addch(sb, ' ');
-			chars_written += 2;
+			if (graph->edges_added > 0)
+				graph_line_write_column(line, col, '\\');
+			else
+				graph_line_write_column(line, col, '|');
+			graph_line_addch(line, ' ');
 		} else {
-			strbuf_write_column(sb, col, '|');
-			strbuf_addch(sb, ' ');
-			chars_written += 2;
+			graph_line_write_column(line, col, '|');
+			if (graph->merge_layout != 0 || i != graph->commit_index - 1) {
+				if (parent_col)
+					graph_line_write_column(
+						line, parent_col, '_');
+				else
+					graph_line_addch(line, ' ');
+			}
 		}
-	}
 
-	graph_pad_horizontally(graph, sb, chars_written);
+		if (col_commit == first_parent->item)
+			parent_col = col;
+	}
 
 	/*
 	 * Update graph->state
@@ -1049,7 +1139,7 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct strbuf
 		graph_update_state(graph, GRAPH_COLLAPSING);
 }
 
-static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf *sb)
+static void graph_output_collapsing_line(struct git_graph *graph, struct graph_line *line)
 {
 	int i;
 	short used_horizontal = 0;
@@ -1057,13 +1147,18 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 	int horizontal_edge_target = -1;
 
 	/*
-	 * Clear out the new_mapping array
+	 * Swap the mapping and old_mapping arrays
+	 */
+	SWAP(graph->mapping, graph->old_mapping);
+
+	/*
+	 * Clear out the mapping array
 	 */
 	for (i = 0; i < graph->mapping_size; i++)
-		graph->new_mapping[i] = -1;
+		graph->mapping[i] = -1;
 
 	for (i = 0; i < graph->mapping_size; i++) {
-		int target = graph->mapping[i];
+		int target = graph->old_mapping[i];
 		if (target < 0)
 			continue;
 
@@ -1084,14 +1179,14 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 			 * This column is already in the
 			 * correct place
 			 */
-			assert(graph->new_mapping[i] == -1);
-			graph->new_mapping[i] = target;
-		} else if (graph->new_mapping[i - 1] < 0) {
+			assert(graph->mapping[i] == -1);
+			graph->mapping[i] = target;
+		} else if (graph->mapping[i - 1] < 0) {
 			/*
 			 * Nothing is to the left.
 			 * Move to the left by one
 			 */
-			graph->new_mapping[i - 1] = target;
+			graph->mapping[i - 1] = target;
 			/*
 			 * If there isn't already an edge moving horizontally
 			 * select this one.
@@ -1107,9 +1202,9 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 				 * line.
 				 */
 				for (j = (target * 2)+3; j < (i - 2); j += 2)
-					graph->new_mapping[j] = target;
+					graph->mapping[j] = target;
 			}
-		} else if (graph->new_mapping[i - 1] == target) {
+		} else if (graph->mapping[i - 1] == target) {
 			/*
 			 * There is a branch line to our left
 			 * already, and it is our target.  We
@@ -1117,7 +1212,7 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 			 * the same parent commit.
 			 *
 			 * We don't have to add anything to the
-			 * output or new_mapping, since the
+			 * output or mapping, since the
 			 * existing branch line has already taken
 			 * care of it.
 			 */
@@ -1129,39 +1224,46 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 			 *
 			 * The space just to the left of this
 			 * branch should always be empty.
-			 *
-			 * The branch to the left of that space
-			 * should be our eventual target.
 			 */
-			assert(graph->new_mapping[i - 1] > target);
-			assert(graph->new_mapping[i - 2] < 0);
-			assert(graph->new_mapping[i - 3] == target);
-			graph->new_mapping[i - 2] = target;
+			assert(graph->mapping[i - 1] > target);
+			assert(graph->mapping[i - 2] < 0);
+			graph->mapping[i - 2] = target;
 			/*
 			 * Mark this branch as the horizontal edge to
 			 * prevent any other edges from moving
 			 * horizontally.
 			 */
-			if (horizontal_edge == -1)
-				horizontal_edge = i;
+			if (horizontal_edge == -1) {
+				int j;
+				horizontal_edge_target = target;
+				horizontal_edge = i - 1;
+
+				for (j = (target * 2) + 3; j < (i - 2); j += 2)
+					graph->mapping[j] = target;
+			}
 		}
 	}
 
 	/*
+	 * Copy the current mapping array into old_mapping
+	 */
+	COPY_ARRAY(graph->old_mapping, graph->mapping, graph->mapping_size);
+
+	/*
 	 * The new mapping may be 1 smaller than the old mapping
 	 */
-	if (graph->new_mapping[graph->mapping_size - 1] < 0)
+	if (graph->mapping[graph->mapping_size - 1] < 0)
 		graph->mapping_size--;
 
 	/*
 	 * Output out a line based on the new mapping info
 	 */
 	for (i = 0; i < graph->mapping_size; i++) {
-		int target = graph->new_mapping[i];
+		int target = graph->mapping[i];
 		if (target < 0)
-			strbuf_addch(sb, ' ');
+			graph_line_addch(line, ' ');
 		else if (target * 2 == i)
-			strbuf_write_column(sb, &graph->new_columns[target], '|');
+			graph_line_write_column(line, &graph->new_columns[target], '|');
 		else if (target == horizontal_edge_target &&
 			 i != horizontal_edge - 1) {
 				/*
@@ -1170,24 +1272,17 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 				 * won't continue into the next line.
 				 */
 				if (i != (target * 2)+3)
-					graph->new_mapping[i] = -1;
+					graph->mapping[i] = -1;
 				used_horizontal = 1;
-			strbuf_write_column(sb, &graph->new_columns[target], '_');
+			graph_line_write_column(line, &graph->new_columns[target], '_');
 		} else {
 			if (used_horizontal && i < horizontal_edge)
-				graph->new_mapping[i] = -1;
-			strbuf_write_column(sb, &graph->new_columns[target], '/');
+				graph->mapping[i] = -1;
+			graph_line_write_column(line, &graph->new_columns[target], '/');
 
 		}
 	}
 
-	graph_pad_horizontally(graph, sb, graph->mapping_size);
-
-	/*
-	 * Swap mapping and new_mapping
-	 */
-	SWAP(graph->mapping, graph->new_mapping);
-
 	/*
 	 * If graph->mapping indicates that all of the branch lines
 	 * are already in the correct positions, we are done.
@@ -1199,35 +1294,49 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf
 
 int graph_next_line(struct git_graph *graph, struct strbuf *sb)
 {
+	int shown_commit_line = 0;
+	struct graph_line line = { .buf = sb, .width = 0 };
+
+	/*
+	 * We could conceivable be called with a NULL commit
+	 * if our caller has a bug, and invokes graph_next_line()
+	 * immediately after graph_init(), without first calling
+	 * graph_update().  Return without outputting anything in this
+	 * case.
+	 */
+	if (!graph->commit)
+		return -1;
+
 	switch (graph->state) {
 	case GRAPH_PADDING:
-		graph_output_padding_line(graph, sb);
-		return 0;
+		graph_output_padding_line(graph, &line);
+		break;
 	case GRAPH_SKIP:
-		graph_output_skip_line(graph, sb);
-		return 0;
+		graph_output_skip_line(graph, &line);
+		break;
 	case GRAPH_PRE_COMMIT:
-		graph_output_pre_commit_line(graph, sb);
-		return 0;
+		graph_output_pre_commit_line(graph, &line);
+		break;
 	case GRAPH_COMMIT:
-		graph_output_commit_line(graph, sb);
-		return 1;
+		graph_output_commit_line(graph, &line);
+		shown_commit_line = 1;
+		break;
 	case GRAPH_POST_MERGE:
-		graph_output_post_merge_line(graph, sb);
-		return 0;
+		graph_output_post_merge_line(graph, &line);
+		break;
 	case GRAPH_COLLAPSING:
-		graph_output_collapsing_line(graph, sb);
-		return 0;
+		graph_output_collapsing_line(graph, &line);
+		break;
 	}
 
-	assert(0);
-	return 0;
+	graph_pad_horizontally(graph, &line);
+	return shown_commit_line;
 }
 
 static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
 {
 	int i;
-	int chars_written = 0;
+	struct graph_line line = { .buf = sb, .width = 0 };
 
 	if (graph->state != GRAPH_COMMIT) {
 		graph_next_line(graph, sb);
@@ -1244,20 +1353,17 @@ static void graph_padding_line(struct git_graph *graph, struct strbuf *sb)
 	for (i = 0; i < graph->num_columns; i++) {
 		struct column *col = &graph->columns[i];
 
-		strbuf_write_column(sb, col, '|');
-		chars_written++;
+		graph_line_write_column(&line, col, '|');
 
 		if (col->commit == graph->commit && graph->num_parents > 2) {
 			int len = (graph->num_parents - 2) * 2;
-			strbuf_addchars(sb, ' ', len);
-			chars_written += len;
+			graph_line_addchars(&line, ' ', len);
 		} else {
-			strbuf_addch(sb, ' ');
-			chars_written++;
+			graph_line_addch(&line, ' ');
 		}
 	}
 
-	graph_pad_horizontally(graph, sb, chars_written);
+	graph_pad_horizontally(graph, &line);
 
 	/*
 	 * Update graph->prev_state since we have output a padding line
diff --git a/graph.h b/graph.h
index af623390b6..8313e293c7 100644
--- a/graph.h
+++ b/graph.h
@@ -2,6 +2,103 @@
 #define GRAPH_H
 #include "diff.h"
 
+/**
+ * The graph API is used to draw a text-based representation of the commit
+ * history. The API generates the graph in a line-by-line fashion.
+ *
+ * Calling sequence
+ * ----------------
+ *
+ * - Create a `struct git_graph` by calling `graph_init()`.  When using the
+ *   revision walking API, this is done automatically by `setup_revisions()` if
+ *   the '--graph' option is supplied.
+ *
+ * - Use the revision walking API to walk through a group of contiguous commits.
+ *   The `get_revision()` function automatically calls `graph_update()` each time
+ *   it is invoked.
+ *
+ * - For each commit, call `graph_next_line()` repeatedly, until
+ *   `graph_is_commit_finished()` returns non-zero.  Each call to
+ *   `graph_next_line()` will output a single line of the graph.  The resulting
+ *   lines will not contain any newlines.  `graph_next_line()` returns 1 if the
+ *   resulting line contains the current commit, or 0 if this is merely a line
+ *   needed to adjust the graph before or after the current commit.  This return
+ *   value can be used to determine where to print the commit summary information
+ *   alongside the graph output.
+ *
+ * Limitations
+ * -----------
+ * - Check the graph_update() function for its limitations.
+ *
+ * - The graph API does not currently support reverse commit ordering.  In
+ *   order to implement reverse ordering, the graphing API needs an
+ *   (efficient) mechanism to find the children of a commit.
+ *
+ * Sample usage
+ * ------------
+ *
+ * ------------
+ * struct commit *commit;
+ * struct git_graph *graph = graph_init(opts);
+ *
+ * while ((commit = get_revision(opts)) != NULL) {
+ * 	while (!graph_is_commit_finished(graph))
+ * 	{
+ * 		struct strbuf sb;
+ * 		int is_commit_line;
+ *
+ * 		strbuf_init(&sb, 0);
+ * 		is_commit_line = graph_next_line(graph, &sb);
+ * 		fputs(sb.buf, stdout);
+ *
+ * 		if (is_commit_line)
+ * 			log_tree_commit(opts, commit);
+ * 		else
+ * 			putchar(opts->diffopt.line_termination);
+ * 	}
+ * }
+ * ------------
+ * Sample output
+ * -------------
+ *
+ * The following is an example of the output from the graph API.  This output does
+ * not include any commit summary information--callers are responsible for
+ * outputting that information, if desired.
+ * ------------
+ * *
+ * *
+ * *
+ * |\
+ * * |
+ * | | *
+ * | \ \
+ * |  \ \
+ * *-. \ \
+ * |\ \ \ \
+ * | | * | |
+ * | | | | | *
+ * | | | | | *
+ * | | | | | *
+ * | | | | | |\
+ * | | | | | | *
+ * | * | | | | |
+ * | | | | | *  \
+ * | | | | | |\  |
+ * | | | | * | | |
+ * | | | | * | | |
+ * * | | | | | | |
+ * | |/ / / / / /
+ * |/| / / / / /
+ * * | | | | | |
+ * |/ / / / / /
+ * * | | | | |
+ * | | | | | *
+ * | | | | |/
+ * | | | | *
+ * ------------
+ *
+ */
+
 /* A graph is a pointer to this opaque structure */
 struct git_graph;
 
@@ -50,6 +147,21 @@ struct git_graph *graph_init(struct rev_info *opt);
  * If graph_update() is called before graph_is_commit_finished() returns 1,
  * the next call to graph_next_line() will output an ellipsis ("...")
  * to indicate that a portion of the graph is missing.
+ *
+ * Limitations:
+ * -----------
+ *
+ * - `graph_update()` must be called with commits in topological order.  It should
+ *   not be called on a commit if it has already been invoked with an ancestor of
+ *   that commit, or the graph output will be incorrect.
+ *
+ * - `graph_update()` must be called on a contiguous group of commits.  If
+ *   `graph_update()` is called on a particular commit, it should later be called
+ *   on all parents of that commit.  Parents must not be skipped, or the graph
+ *   output will appear incorrect.
+ *
+ * - `graph_update()` may be used on a pruned set of commits only if the parent list
+ *   has been rewritten so as to include only ancestors from the pruned set.
  */
 void graph_update(struct git_graph *graph, struct commit *commit);
 
@@ -62,6 +174,10 @@ void graph_update(struct git_graph *graph, struct commit *commit);
  * for this commit.  If 0 is returned, graph_next_line() may still be
  * called without calling graph_update(), and it will merely output
  * appropriate "vertical padding" in the graph.
+ *
+ * If `graph_update()` is called before all lines for the current commit have
+ * been printed, the next call to `graph_next_line()` will output an ellipsis,
+ * to indicate that a portion of the graph was omitted.
  */
 int graph_is_commit_finished(struct git_graph const *graph);
 
@@ -112,6 +228,7 @@ void graph_show_padding(struct git_graph *graph);
 /*
  * If the graph is non-NULL, print the rest of the history graph for this
  * commit to stdout.  Does not print a terminating newline on the last line.
+ * Returns 1 if output was printed, and 0 if no output was necessary.
  */
 int graph_show_remainder(struct git_graph *graph);
 
@@ -121,6 +238,10 @@ int graph_show_remainder(struct git_graph *graph);
  * This is similar to graph_show_strbuf(), but it always prints the
  * remainder of the graph.
  *
+ * It is better than directly calling `graph_show_strbuf()` followed by
+ * `graph_show_remainder()` since it properly handles buffers that do not end in
+ * a terminating newline.
+ *
  * If the strbuf ends with a newline, the output printed by
  * graph_show_commit_msg() will end with a newline.  If the strbuf is
  * missing a terminating newline (including if it is empty), the output
diff --git a/grep.c b/grep.c
index b7ae5a442a..424a39591b 100644
--- a/grep.c
+++ b/grep.c
@@ -14,21 +14,31 @@ static int grep_source_load(struct grep_source *gs);
 static int grep_source_is_binary(struct grep_source *gs,
 				 struct index_state *istate);
 
-static struct grep_opt grep_defaults;
-
-#ifdef USE_LIBPCRE2
-static pcre2_general_context *pcre2_global_context;
-
-static void *pcre2_malloc(PCRE2_SIZE size, MAYBE_UNUSED void *memory_data)
+static void std_output(struct grep_opt *opt, const void *buf, size_t size)
 {
-	return malloc(size);
+	fwrite(buf, size, 1, stdout);
 }
 
-static void pcre2_free(void *pointer, MAYBE_UNUSED void *memory_data)
-{
-	return free(pointer);
-}
-#endif
+static struct grep_opt grep_defaults = {
+	.relative = 1,
+	.pathname = 1,
+	.max_depth = -1,
+	.pattern_type_option = GREP_PATTERN_TYPE_UNSPECIFIED,
+	.colors = {
+		[GREP_COLOR_CONTEXT] = "",
+		[GREP_COLOR_FILENAME] = "",
+		[GREP_COLOR_FUNCTION] = "",
+		[GREP_COLOR_LINENO] = "",
+		[GREP_COLOR_COLUMNNO] = "",
+		[GREP_COLOR_MATCH_CONTEXT] = GIT_COLOR_BOLD_RED,
+		[GREP_COLOR_MATCH_SELECTED] = GIT_COLOR_BOLD_RED,
+		[GREP_COLOR_SELECTED] = "",
+		[GREP_COLOR_SEP] = GIT_COLOR_CYAN,
+	},
+	.only_matching = 0,
+	.color = -1,
+	.output = std_output,
+};
 
 static const char *color_grep_slots[] = {
 	[GREP_COLOR_CONTEXT]	    = "context",
@@ -42,50 +52,6 @@ static const char *color_grep_slots[] = {
 	[GREP_COLOR_SEP]	    = "separator",
 };
 
-static void std_output(struct grep_opt *opt, const void *buf, size_t size)
-{
-	fwrite(buf, size, 1, stdout);
-}
-
-static void color_set(char *dst, const char *color_bytes)
-{
-	xsnprintf(dst, COLOR_MAXLEN, "%s", color_bytes);
-}
-
-/*
- * Initialize the grep_defaults template with hardcoded defaults.
- * We could let the compiler do this, but without C99 initializers
- * the code gets unwieldy and unreadable, so...
- */
-void init_grep_defaults(struct repository *repo)
-{
-	struct grep_opt *opt = &grep_defaults;
-	static int run_once;
-
-	if (run_once)
-		return;
-	run_once++;
-
-	memset(opt, 0, sizeof(*opt));
-	opt->repo = repo;
-	opt->relative = 1;
-	opt->pathname = 1;
-	opt->max_depth = -1;
-	opt->pattern_type_option = GREP_PATTERN_TYPE_UNSPECIFIED;
-	color_set(opt->colors[GREP_COLOR_CONTEXT], "");
-	color_set(opt->colors[GREP_COLOR_FILENAME], "");
-	color_set(opt->colors[GREP_COLOR_FUNCTION], "");
-	color_set(opt->colors[GREP_COLOR_LINENO], "");
-	color_set(opt->colors[GREP_COLOR_COLUMNNO], "");
-	color_set(opt->colors[GREP_COLOR_MATCH_CONTEXT], GIT_COLOR_BOLD_RED);
-	color_set(opt->colors[GREP_COLOR_MATCH_SELECTED], GIT_COLOR_BOLD_RED);
-	color_set(opt->colors[GREP_COLOR_SELECTED], "");
-	color_set(opt->colors[GREP_COLOR_SEP], GIT_COLOR_CYAN);
-	opt->only_matching = 0;
-	opt->color = -1;
-	opt->output = std_output;
-}
-
 static int parse_pattern_type_arg(const char *opt, const char *arg)
 {
 	if (!strcmp(arg, "default"))
@@ -115,6 +81,14 @@ int grep_config(const char *var, const char *value, void *cb)
 	if (userdiff_config(var, value) < 0)
 		return -1;
 
+	/*
+	 * The instance of grep_opt that we set up here is copied by
+	 * grep_init() to be used by each individual invocation.
+	 * When populating a new field of this structure here, be
+	 * sure to think about ownership -- e.g., you might need to
+	 * override the shallow copy in grep_init() with a deep copy.
+	 */
+
 	if (!strcmp(var, "grep.extendedregexp")) {
 		opt->extended_regexp_option = git_config_bool(var, value);
 		return 0;
@@ -164,55 +138,16 @@ int grep_config(const char *var, const char *value, void *cb)
  * Initialize one instance of grep_opt and copy the
  * default values from the template we read the configuration
  * information in an earlier call to git_config(grep_config).
- *
- * If using PCRE, make sure that the library is configured
- * to use the same allocator as Git (e.g. nedmalloc on Windows).
- *
- * Any allocated memory needs to be released in grep_destroy().
  */
 void grep_init(struct grep_opt *opt, struct repository *repo, const char *prefix)
 {
-	struct grep_opt *def = &grep_defaults;
-	int i;
-
-#if defined(USE_LIBPCRE2)
-	if (!pcre2_global_context)
-		pcre2_global_context = pcre2_general_context_create(
-					pcre2_malloc, pcre2_free, NULL);
-#endif
-
-#ifdef USE_LIBPCRE1
-	pcre_malloc = malloc;
-	pcre_free = free;
-#endif
+	*opt = grep_defaults;
 
-	memset(opt, 0, sizeof(*opt));
 	opt->repo = repo;
 	opt->prefix = prefix;
 	opt->prefix_length = (prefix && *prefix) ? strlen(prefix) : 0;
 	opt->pattern_tail = &opt->pattern_list;
 	opt->header_tail = &opt->header_list;
-
-	opt->only_matching = def->only_matching;
-	opt->color = def->color;
-	opt->extended_regexp_option = def->extended_regexp_option;
-	opt->pattern_type_option = def->pattern_type_option;
-	opt->linenum = def->linenum;
-	opt->columnnum = def->columnnum;
-	opt->max_depth = def->max_depth;
-	opt->pathname = def->pathname;
-	opt->relative = def->relative;
-	opt->output = def->output;
-
-	for (i = 0; i < NR_GREP_COLORS; i++)
-		color_set(opt->colors[i], def->colors[i]);
-}
-
-void grep_destroy(void)
-{
-#ifdef USE_LIBPCRE2
-	pcre2_general_context_free(pcre2_global_context);
-#endif
 }
 
 static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, struct grep_opt *opt)
@@ -251,17 +186,7 @@ static void grep_set_pattern_type_option(enum grep_pattern_type pattern_type, st
 		break;
 
 	case GREP_PATTERN_TYPE_PCRE:
-#ifdef USE_LIBPCRE2
 		opt->pcre2 = 1;
-#else
-		/*
-		 * It's important that pcre1 always be assigned to
-		 * even when there's no USE_LIBPCRE* defined. We still
-		 * call the PCRE stub function, it just dies with
-		 * "cannot use Perl-compatible regexes[...]".
-		 */
-		opt->pcre1 = 1;
-#endif
 		break;
 	}
 }
@@ -405,93 +330,29 @@ static int is_fixed(const char *s, size_t len)
 	return 1;
 }
 
-#ifdef USE_LIBPCRE1
-static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt)
-{
-	const char *error;
-	int erroffset;
-	int options = PCRE_MULTILINE;
-	int study_options = 0;
-
-	if (opt->ignore_case) {
-		if (!opt->ignore_locale && has_non_ascii(p->pattern))
-			p->pcre1_tables = pcre_maketables();
-		options |= PCRE_CASELESS;
-	}
-	if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern))
-		options |= PCRE_UTF8;
-
-	p->pcre1_regexp = pcre_compile(p->pattern, options, &error, &erroffset,
-				      p->pcre1_tables);
-	if (!p->pcre1_regexp)
-		compile_regexp_failed(p, error);
-
-#if defined(PCRE_CONFIG_JIT) && !defined(NO_LIBPCRE1_JIT)
-	pcre_config(PCRE_CONFIG_JIT, &p->pcre1_jit_on);
-	if (opt->debug)
-		fprintf(stderr, "pcre1_jit_on=%d\n", p->pcre1_jit_on);
-
-	if (p->pcre1_jit_on)
-		study_options = PCRE_STUDY_JIT_COMPILE;
-#endif
-
-	p->pcre1_extra_info = pcre_study(p->pcre1_regexp, study_options, &error);
-	if (!p->pcre1_extra_info && error)
-		die("%s", error);
-}
-
-static int pcre1match(struct grep_pat *p, const char *line, const char *eol,
-		regmatch_t *match, int eflags)
-{
-	int ovector[30], ret, flags = PCRE_NO_UTF8_CHECK;
-
-	if (eflags & REG_NOTBOL)
-		flags |= PCRE_NOTBOL;
-
-	ret = pcre_exec(p->pcre1_regexp, p->pcre1_extra_info, line,
-			eol - line, 0, flags, ovector,
-			ARRAY_SIZE(ovector));
-
-	if (ret < 0 && ret != PCRE_ERROR_NOMATCH)
-		die("pcre_exec failed with error code %d", ret);
-	if (ret > 0) {
-		ret = 0;
-		match->rm_so = ovector[0];
-		match->rm_eo = ovector[1];
-	}
-
-	return ret;
-}
+#ifdef USE_LIBPCRE2
+#define GREP_PCRE2_DEBUG_MALLOC 0
 
-static void free_pcre1_regexp(struct grep_pat *p)
+static void *pcre2_malloc(PCRE2_SIZE size, MAYBE_UNUSED void *memory_data)
 {
-	pcre_free(p->pcre1_regexp);
-#ifdef PCRE_CONFIG_JIT
-	if (p->pcre1_jit_on)
-		pcre_free_study(p->pcre1_extra_info);
-	else
+	void *pointer = malloc(size);
+#if GREP_PCRE2_DEBUG_MALLOC
+	static int count = 1;
+	fprintf(stderr, "PCRE2:%p -> #%02d: alloc(%lu)\n", pointer, count++, size);
 #endif
-		pcre_free(p->pcre1_extra_info);
-	pcre_free((void *)p->pcre1_tables);
-}
-#else /* !USE_LIBPCRE1 */
-static void compile_pcre1_regexp(struct grep_pat *p, const struct grep_opt *opt)
-{
-	die("cannot use Perl-compatible regexes when not compiled with USE_LIBPCRE");
-}
-
-static int pcre1match(struct grep_pat *p, const char *line, const char *eol,
-		regmatch_t *match, int eflags)
-{
-	return 1;
+	return pointer;
 }
 
-static void free_pcre1_regexp(struct grep_pat *p)
+static void pcre2_free(void *pointer, MAYBE_UNUSED void *memory_data)
 {
+#if GREP_PCRE2_DEBUG_MALLOC
+	static int count = 1;
+	if (pointer)
+		fprintf(stderr, "PCRE2:%p -> #%02d: free()\n", pointer, count++);
+#endif
+	free(pointer);
 }
-#endif /* !USE_LIBPCRE1 */
 
-#ifdef USE_LIBPCRE2
 static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt)
 {
 	int error;
@@ -502,17 +363,20 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 	int patinforet;
 	size_t jitsizearg;
 
-	assert(opt->pcre2);
-
-	p->pcre2_compile_context = NULL;
+	/*
+	 * Call pcre2_general_context_create() before calling any
+	 * other pcre2_*(). It sets up our malloc()/free() functions
+	 * with which everything else is allocated.
+	 */
+	p->pcre2_general_context = pcre2_general_context_create(
+		pcre2_malloc, pcre2_free, NULL);
+	if (!p->pcre2_general_context)
+		die("Couldn't allocate PCRE2 general context");
 
-	/* pcre2_global_context is initialized in append_grep_pattern */
 	if (opt->ignore_case) {
 		if (!opt->ignore_locale && has_non_ascii(p->pattern)) {
-			if (!pcre2_global_context)
-				BUG("pcre2_global_context uninitialized");
-			p->pcre2_tables = pcre2_maketables(pcre2_global_context);
-			p->pcre2_compile_context = pcre2_compile_context_create(NULL);
+			p->pcre2_tables = pcre2_maketables(p->pcre2_general_context);
+			p->pcre2_compile_context = pcre2_compile_context_create(p->pcre2_general_context);
 			pcre2_set_character_tables(p->pcre2_compile_context,
 							p->pcre2_tables);
 		}
@@ -520,14 +384,20 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 	}
 	if (!opt->ignore_locale && is_utf8_locale() && has_non_ascii(p->pattern) &&
 	    !(!opt->ignore_case && (p->fixed || p->is_fixed)))
-		options |= PCRE2_UTF;
+		options |= (PCRE2_UTF | PCRE2_MATCH_INVALID_UTF);
+
+#ifdef GIT_PCRE2_VERSION_10_36_OR_HIGHER
+	/* Work around https://bugs.exim.org/show_bug.cgi?id=2642 fixed in 10.36 */
+	if (PCRE2_MATCH_INVALID_UTF && options & (PCRE2_UTF | PCRE2_CASELESS))
+		options |= PCRE2_NO_START_OPTIMIZE;
+#endif
 
 	p->pcre2_pattern = pcre2_compile((PCRE2_SPTR)p->pattern,
 					 p->patternlen, options, &error, &erroffset,
 					 p->pcre2_compile_context);
 
 	if (p->pcre2_pattern) {
-		p->pcre2_match_data = pcre2_match_data_create_from_pattern(p->pcre2_pattern, NULL);
+		p->pcre2_match_data = pcre2_match_data_create_from_pattern(p->pcre2_pattern, p->pcre2_general_context);
 		if (!p->pcre2_match_data)
 			die("Couldn't allocate PCRE2 match data");
 	} else {
@@ -536,8 +406,6 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 	}
 
 	pcre2_config(PCRE2_CONFIG_JIT, &p->pcre2_jit_on);
-	if (opt->debug)
-		fprintf(stderr, "pcre2_jit_on=%d\n", p->pcre2_jit_on);
 	if (p->pcre2_jit_on) {
 		jitret = pcre2_jit_compile(p->pcre2_pattern, PCRE2_JIT_COMPLETE);
 		if (jitret)
@@ -563,9 +431,6 @@ static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt
 			BUG("pcre2_pattern_info() failed: %d", patinforet);
 		if (jitsizearg == 0) {
 			p->pcre2_jit_on = 0;
-			if (opt->debug)
-				fprintf(stderr, "pcre2_jit_on=%d: (*NO_JIT) in regex\n",
-					p->pcre2_jit_on);
 			return;
 		}
 	}
@@ -611,16 +476,16 @@ static void free_pcre2_pattern(struct grep_pat *p)
 	pcre2_compile_context_free(p->pcre2_compile_context);
 	pcre2_code_free(p->pcre2_pattern);
 	pcre2_match_data_free(p->pcre2_match_data);
+#ifdef GIT_PCRE2_VERSION_10_34_OR_HIGHER
+	pcre2_maketables_free(p->pcre2_general_context, p->pcre2_tables);
+#else
 	free((void *)p->pcre2_tables);
+#endif
+	pcre2_general_context_free(p->pcre2_general_context);
 }
 #else /* !USE_LIBPCRE2 */
 static void compile_pcre2_pattern(struct grep_pat *p, const struct grep_opt *opt)
 {
-	/*
-	 * Unreachable until USE_LIBPCRE2 becomes synonymous with
-	 * USE_LIBPCRE. See the sibling comment in
-	 * grep_set_pattern_type_option().
-	 */
 	die("cannot use Perl-compatible regexes when not compiled with USE_LIBPCRE");
 }
 
@@ -644,8 +509,6 @@ static void compile_fixed_regexp(struct grep_pat *p, struct grep_opt *opt)
 	if (opt->ignore_case)
 		regflags |= REG_ICASE;
 	err = regcomp(&p->regexp, sb.buf, regflags);
-	if (opt->debug)
-		fprintf(stderr, "fixed %s\n", sb.buf);
 	strbuf_release(&sb);
 	if (err) {
 		char errbuf[1024];
@@ -680,7 +543,6 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
 #endif
 	if (p->fixed || p->is_fixed) {
 #ifdef USE_LIBPCRE2
-		opt->pcre2 = 1;
 		if (p->is_fixed) {
 			compile_pcre2_pattern(p, opt);
 		} else {
@@ -721,11 +583,6 @@ static void compile_regexp(struct grep_pat *p, struct grep_opt *opt)
 		return;
 	}
 
-	if (opt->pcre1) {
-		compile_pcre1_regexp(p, opt);
-		return;
-	}
-
 	if (p->ignore_case)
 		regflags |= REG_ICASE;
 	if (opt->extended_regexp_option)
@@ -751,7 +608,7 @@ static struct grep_expr *compile_pattern_atom(struct grep_pat **list)
 	case GREP_PATTERN: /* atom */
 	case GREP_PATTERN_HEAD:
 	case GREP_PATTERN_BODY:
-		x = xcalloc(1, sizeof (struct grep_expr));
+		CALLOC_ARRAY(x, 1);
 		x->node = GREP_NODE_ATOM;
 		x->u.atom = p;
 		*list = p->next;
@@ -781,7 +638,7 @@ static struct grep_expr *compile_pattern_not(struct grep_pat **list)
 		if (!p->next)
 			die("--not not followed by pattern expression");
 		*list = p->next;
-		x = xcalloc(1, sizeof (struct grep_expr));
+		CALLOC_ARRAY(x, 1);
 		x->node = GREP_NODE_NOT;
 		x->u.unary = compile_pattern_not(list);
 		if (!x->u.unary)
@@ -800,13 +657,15 @@ static struct grep_expr *compile_pattern_and(struct grep_pat **list)
 	x = compile_pattern_not(list);
 	p = *list;
 	if (p && p->token == GREP_AND) {
+		if (!x)
+			die("--and not preceded by pattern expression");
 		if (!p->next)
 			die("--and not followed by pattern expression");
 		*list = p->next;
 		y = compile_pattern_and(list);
 		if (!y)
 			die("--and not followed by pattern expression");
-		z = xcalloc(1, sizeof (struct grep_expr));
+		CALLOC_ARRAY(z, 1);
 		z->node = GREP_NODE_AND;
 		z->u.binary.left = x;
 		z->u.binary.right = y;
@@ -826,7 +685,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);
-		z = xcalloc(1, sizeof (struct grep_expr));
+		CALLOC_ARRAY(z, 1);
 		z->node = GREP_NODE_OR;
 		z->u.binary.left = x;
 		z->u.binary.right = y;
@@ -840,87 +699,6 @@ static struct grep_expr *compile_pattern_expr(struct grep_pat **list)
 	return compile_pattern_or(list);
 }
 
-static void indent(int in)
-{
-	while (in-- > 0)
-		fputc(' ', stderr);
-}
-
-static void dump_grep_pat(struct grep_pat *p)
-{
-	switch (p->token) {
-	case GREP_AND: fprintf(stderr, "*and*"); break;
-	case GREP_OPEN_PAREN: fprintf(stderr, "*(*"); break;
-	case GREP_CLOSE_PAREN: fprintf(stderr, "*)*"); break;
-	case GREP_NOT: fprintf(stderr, "*not*"); break;
-	case GREP_OR: fprintf(stderr, "*or*"); break;
-
-	case GREP_PATTERN: fprintf(stderr, "pattern"); break;
-	case GREP_PATTERN_HEAD: fprintf(stderr, "pattern_head"); break;
-	case GREP_PATTERN_BODY: fprintf(stderr, "pattern_body"); break;
-	}
-
-	switch (p->token) {
-	default: break;
-	case GREP_PATTERN_HEAD:
-		fprintf(stderr, "<head %d>", p->field); break;
-	case GREP_PATTERN_BODY:
-		fprintf(stderr, "<body>"); break;
-	}
-	switch (p->token) {
-	default: break;
-	case GREP_PATTERN_HEAD:
-	case GREP_PATTERN_BODY:
-	case GREP_PATTERN:
-		fprintf(stderr, "%.*s", (int)p->patternlen, p->pattern);
-		break;
-	}
-	fputc('\n', stderr);
-}
-
-static void dump_grep_expression_1(struct grep_expr *x, int in)
-{
-	indent(in);
-	switch (x->node) {
-	case GREP_NODE_TRUE:
-		fprintf(stderr, "true\n");
-		break;
-	case GREP_NODE_ATOM:
-		dump_grep_pat(x->u.atom);
-		break;
-	case GREP_NODE_NOT:
-		fprintf(stderr, "(not\n");
-		dump_grep_expression_1(x->u.unary, in+1);
-		indent(in);
-		fprintf(stderr, ")\n");
-		break;
-	case GREP_NODE_AND:
-		fprintf(stderr, "(and\n");
-		dump_grep_expression_1(x->u.binary.left, in+1);
-		dump_grep_expression_1(x->u.binary.right, in+1);
-		indent(in);
-		fprintf(stderr, ")\n");
-		break;
-	case GREP_NODE_OR:
-		fprintf(stderr, "(or\n");
-		dump_grep_expression_1(x->u.binary.left, in+1);
-		dump_grep_expression_1(x->u.binary.right, in+1);
-		indent(in);
-		fprintf(stderr, ")\n");
-		break;
-	}
-}
-
-static void dump_grep_expression(struct grep_opt *opt)
-{
-	struct grep_expr *x = opt->pattern_expression;
-
-	if (opt->all_match)
-		fprintf(stderr, "[all-match]\n");
-	dump_grep_expression_1(x, 0);
-	fflush(NULL);
-}
-
 static struct grep_expr *grep_true_expr(void)
 {
 	struct grep_expr *z = xcalloc(1, sizeof(*z));
@@ -1001,7 +779,7 @@ static struct grep_expr *grep_splice_or(struct grep_expr *x, struct grep_expr *y
 	return z;
 }
 
-static void compile_grep_patterns_real(struct grep_opt *opt)
+void compile_grep_patterns(struct grep_opt *opt)
 {
 	struct grep_pat *p;
 	struct grep_expr *header_expr = prep_header_patterns(opt);
@@ -1021,7 +799,7 @@ static void compile_grep_patterns_real(struct grep_opt *opt)
 
 	if (opt->all_match || header_expr)
 		opt->extended = 1;
-	else if (!opt->extended && !opt->debug)
+	else if (!opt->extended)
 		return;
 
 	p = opt->pattern_list;
@@ -1044,13 +822,6 @@ static void compile_grep_patterns_real(struct grep_opt *opt)
 	opt->all_match = 1;
 }
 
-void compile_grep_patterns(struct grep_opt *opt)
-{
-	compile_grep_patterns_real(opt);
-	if (opt->debug)
-		dump_grep_expression(opt);
-}
-
 static void free_pattern_expr(struct grep_expr *x)
 {
 	switch (x->node) {
@@ -1079,9 +850,7 @@ void free_grep_patterns(struct grep_opt *opt)
 		case GREP_PATTERN: /* atom */
 		case GREP_PATTERN_HEAD:
 		case GREP_PATTERN_BODY:
-			if (p->pcre1_regexp)
-				free_pcre1_regexp(p);
-			else if (p->pcre2_pattern)
+			if (p->pcre2_pattern)
 				free_pcre2_pattern(p);
 			else
 				regfree(&p->regexp);
@@ -1144,9 +913,7 @@ static int patmatch(struct grep_pat *p, char *line, char *eol,
 {
 	int hit;
 
-	if (p->pcre1_regexp)
-		hit = !pcre1match(p, line, eol, match, eflags);
-	else if (p->pcre2_pattern)
+	if (p->pcre2_pattern)
 		hit = !pcre2match(p, line, eol, match, eflags);
 	else
 		hit = !regexec_buf(&p->regexp, line, eol - line, 1, match,
@@ -1540,11 +1307,6 @@ static inline void grep_attr_unlock(void)
 		pthread_mutex_unlock(&grep_attr_mutex);
 }
 
-/*
- * Same as git_attr_mutex, but protecting the thread-unsafe object db access.
- */
-pthread_mutex_t grep_read_mutex;
-
 static int match_funcname(struct grep_opt *opt, struct grep_source *gs, char *bol, char *eol)
 {
 	xdemitconf_t *xecfg = opt->priv;
@@ -1734,20 +1496,27 @@ static int fill_textconv_grep(struct repository *r,
 		fill_filespec(df, gs->identifier, 1, 0100644);
 		break;
 	case GREP_SOURCE_FILE:
-		fill_filespec(df, &null_oid, 0, 0100644);
+		fill_filespec(df, null_oid(), 0, 0100644);
 		break;
 	default:
 		BUG("attempt to textconv something without a path?");
 	}
 
 	/*
-	 * fill_textconv is not remotely thread-safe; it may load objects
-	 * behind the scenes, and it modifies the global diff tempfile
-	 * structure.
+	 * fill_textconv is not remotely thread-safe; it modifies the global
+	 * diff tempfile structure, writes to the_repo's odb and might
+	 * internally call thread-unsafe functions such as the
+	 * prepare_packed_git() lazy-initializator. Because of the last two, we
+	 * must ensure mutual exclusion between this call and the object reading
+	 * API, thus we use obj_read_lock() here.
+	 *
+	 * TODO: allowing text conversion to run in parallel with object
+	 * reading operations might increase performance in the multithreaded
+	 * non-worktreee git-grep with --textconv.
 	 */
-	grep_read_lock();
+	obj_read_lock();
 	size = fill_textconv(r, driver, df, &buf);
-	grep_read_unlock();
+	obj_read_unlock();
 	free_filespec(df);
 
 	/*
@@ -1813,10 +1582,15 @@ static int grep_source_1(struct grep_opt *opt, struct grep_source *gs, int colle
 		grep_source_load_driver(gs, opt->repo->index);
 		/*
 		 * We might set up the shared textconv cache data here, which
-		 * is not thread-safe.
+		 * is not thread-safe. Also, get_oid_with_context() and
+		 * parse_object() might be internally called. As they are not
+		 * currently thread-safe and might be racy with object reading,
+		 * obj_read_lock() must be called.
 		 */
 		grep_attr_lock();
+		obj_read_lock();
 		textconv = userdiff_get_textconv(opt->repo, gs->driver);
+		obj_read_unlock();
 		grep_attr_unlock();
 	}
 
@@ -2116,10 +1890,7 @@ static int grep_source_load_oid(struct grep_source *gs)
 {
 	enum object_type type;
 
-	grep_read_lock();
 	gs->buf = read_object_file(gs->identifier, &type, &gs->size);
-	grep_read_unlock();
-
 	if (!gs->buf)
 		return error(_("'%s': unable to read %s"),
 			     gs->name,
diff --git a/grep.h b/grep.h
index 811fd274c9..72f82b1e30 100644
--- a/grep.h
+++ b/grep.h
@@ -1,22 +1,24 @@
 #ifndef GREP_H
 #define GREP_H
 #include "color.h"
-#ifdef USE_LIBPCRE1
-#include <pcre.h>
-#ifndef PCRE_NO_UTF8_CHECK
-#define PCRE_NO_UTF8_CHECK 0
-#endif
-#else
-typedef int pcre;
-typedef int pcre_extra;
-#endif
 #ifdef USE_LIBPCRE2
 #define PCRE2_CODE_UNIT_WIDTH 8
 #include <pcre2.h>
+#if (PCRE2_MAJOR >= 10 && PCRE2_MINOR >= 36) || PCRE2_MAJOR >= 11
+#define GIT_PCRE2_VERSION_10_36_OR_HIGHER
+#endif
+#if (PCRE2_MAJOR >= 10 && PCRE2_MINOR >= 34) || PCRE2_MAJOR >= 11
+#define GIT_PCRE2_VERSION_10_34_OR_HIGHER
+#endif
 #else
 typedef int pcre2_code;
 typedef int pcre2_match_data;
 typedef int pcre2_compile_context;
+typedef int pcre2_general_context;
+#endif
+#ifndef PCRE2_MATCH_INVALID_UTF
+/* PCRE2_MATCH_* dummy also with !USE_LIBPCRE2, for test-pcre2-config.c */
+#define PCRE2_MATCH_INVALID_UTF 0
 #endif
 #include "thread-utils.h"
 #include "userdiff.h"
@@ -71,13 +73,10 @@ struct grep_pat {
 	size_t patternlen;
 	enum grep_header_field field;
 	regex_t regexp;
-	pcre *pcre1_regexp;
-	pcre_extra *pcre1_extra_info;
-	const unsigned char *pcre1_tables;
-	int pcre1_jit_on;
 	pcre2_code *pcre2_pattern;
 	pcre2_match_data *pcre2_match_data;
 	pcre2_compile_context *pcre2_compile_context;
+	pcre2_general_context *pcre2_general_context;
 	const uint8_t *pcre2_tables;
 	uint32_t pcre2_jit_on;
 	unsigned fixed:1;
@@ -136,7 +135,6 @@ struct grep_opt {
 	int word_regexp;
 	int fixed;
 	int all_match;
-	int debug;
 #define GREP_BINARY_DEFAULT	0
 #define GREP_BINARY_NOMATCH	1
 #define GREP_BINARY_TEXT	2
@@ -144,7 +142,6 @@ struct grep_opt {
 	int allow_textconv;
 	int extended;
 	int use_reflog_filter;
-	int pcre1;
 	int pcre2;
 	int relative;
 	int pathname;
@@ -170,10 +167,8 @@ struct grep_opt {
 	void *output_priv;
 };
 
-void init_grep_defaults(struct repository *);
 int grep_config(const char *var, const char *value, void *);
 void grep_init(struct grep_opt *, struct repository *repo, const char *prefix);
-void grep_destroy(void);
 void grep_commit_pattern_type(enum grep_pattern_type, struct grep_opt *opt);
 
 void append_grep_pat(struct grep_opt *opt, const char *pat, size_t patlen, const char *origin, int no, enum grep_pat_token t);
@@ -220,18 +215,5 @@ int grep_threads_ok(const struct grep_opt *opt);
  */
 extern int grep_use_locks;
 extern pthread_mutex_t grep_attr_mutex;
-extern pthread_mutex_t grep_read_mutex;
-
-static inline void grep_read_lock(void)
-{
-	if (grep_use_locks)
-		pthread_mutex_lock(&grep_read_mutex);
-}
-
-static inline void grep_read_unlock(void)
-{
-	if (grep_use_locks)
-		pthread_mutex_unlock(&grep_read_mutex);
-}
 
 #endif
diff --git a/sha1-lookup.c b/hash-lookup.c
index 29185844ec..b98ed5e11e 100644
--- a/sha1-lookup.c
+++ b/hash-lookup.c
@@ -1,9 +1,9 @@
 #include "cache.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 
-static uint32_t take2(const unsigned char *sha1)
+static uint32_t take2(const struct object_id *oid, size_t ofs)
 {
-	return ((sha1[0] << 8) | sha1[1]);
+	return ((oid->hash[ofs] << 8) | oid->hash[ofs + 1]);
 }
 
 /*
@@ -47,11 +47,11 @@ static uint32_t take2(const unsigned char *sha1)
  */
 /*
  * The table should contain "nr" elements.
- * The sha1 of element i (between 0 and nr - 1) should be returned
+ * The oid of element i (between 0 and nr - 1) should be returned
  * by "fn(i, table)".
  */
-int sha1_pos(const unsigned char *hash, void *table, size_t nr,
-	     sha1_access_fn fn)
+int oid_pos(const struct object_id *oid, const void *table, size_t nr,
+	    oid_access_fn fn)
 {
 	size_t hi = nr;
 	size_t lo = 0;
@@ -64,9 +64,9 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr,
 		size_t lov, hiv, miv, ofs;
 
 		for (ofs = 0; ofs < the_hash_algo->rawsz - 2; ofs += 2) {
-			lov = take2(fn(0, table) + ofs);
-			hiv = take2(fn(nr - 1, table) + ofs);
-			miv = take2(hash + ofs);
+			lov = take2(fn(0, table), ofs);
+			hiv = take2(fn(nr - 1, table), ofs);
+			miv = take2(oid, ofs);
 			if (miv < lov)
 				return -1;
 			if (hiv < miv)
@@ -74,7 +74,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr,
 			if (lov != hiv) {
 				/*
 				 * At this point miv could be equal
-				 * to hiv (but sha1 could still be higher);
+				 * to hiv (but hash could still be higher);
 				 * the invariant of (mi < hi) should be
 				 * kept.
 				 */
@@ -88,7 +88,7 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr,
 
 	do {
 		int cmp;
-		cmp = hashcmp(fn(mi, table), hash);
+		cmp = oidcmp(fn(mi, table), oid);
 		if (!cmp)
 			return mi;
 		if (cmp > 0)
@@ -100,17 +100,17 @@ int sha1_pos(const unsigned char *hash, void *table, size_t nr,
 	return index_pos_to_insert_pos(lo);
 }
 
-int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,
+int bsearch_hash(const unsigned char *hash, const uint32_t *fanout_nbo,
 		 const unsigned char *table, size_t stride, uint32_t *result)
 {
 	uint32_t hi, lo;
 
-	hi = ntohl(fanout_nbo[*sha1]);
-	lo = ((*sha1 == 0x0) ? 0 : ntohl(fanout_nbo[*sha1 - 1]));
+	hi = ntohl(fanout_nbo[*hash]);
+	lo = ((*hash == 0x0) ? 0 : ntohl(fanout_nbo[*hash - 1]));
 
 	while (lo < hi) {
 		unsigned mi = lo + (hi - lo) / 2;
-		int cmp = hashcmp(table + mi * stride, sha1);
+		int cmp = hashcmp(table + mi * stride, hash);
 
 		if (!cmp) {
 			if (result)
diff --git a/sha1-lookup.h b/hash-lookup.h
index 5afcd011c6..dbd71ebaf7 100644
--- a/sha1-lookup.h
+++ b/hash-lookup.h
@@ -1,20 +1,20 @@
-#ifndef SHA1_LOOKUP_H
-#define SHA1_LOOKUP_H
+#ifndef HASH_LOOKUP_H
+#define HASH_LOOKUP_H
 
-typedef const unsigned char *sha1_access_fn(size_t index, void *table);
+typedef const struct object_id *oid_access_fn(size_t index, const void *table);
 
-int sha1_pos(const unsigned char *sha1,
-	     void *table,
-	     size_t nr,
-	     sha1_access_fn fn);
+int oid_pos(const struct object_id *oid,
+	    const void *table,
+	    size_t nr,
+	    oid_access_fn fn);
 
 /*
- * Searches for sha1 in table, using the given fanout table to determine the
+ * Searches for hash in table, using the given fanout table to determine the
  * interval to search, then using binary search. Returns 1 if found, 0 if not.
  *
  * Takes the following parameters:
  *
- *  - sha1: the hash to search for
+ *  - hash: the hash to search for
  *  - fanout_nbo: a 256-element array of NETWORK-order 32-bit integers; the
  *    integer at position i represents the number of elements in table whose
  *    first byte is less than or equal to i
@@ -23,10 +23,10 @@ int sha1_pos(const unsigned char *sha1,
  *    GIT_MAX_RAWSZ or greater)
  *  - result: if not NULL, this function stores the element index of the
  *    position found (if the search is successful) or the index of the least
- *    element that is greater than sha1 (if the search is not successful)
+ *    element that is greater than hash (if the search is not successful)
  *
  * This function does not verify the validity of the fanout table.
  */
-int bsearch_hash(const unsigned char *sha1, const uint32_t *fanout_nbo,
+int bsearch_hash(const unsigned char *hash, const uint32_t *fanout_nbo,
 		 const unsigned char *table, size_t stride, uint32_t *result);
 #endif
diff --git a/hash.h b/hash.h
index 52a4f1a3f4..9e25c40e9a 100644
--- a/hash.h
+++ b/hash.h
@@ -2,6 +2,7 @@
 #define HASH_H
 
 #include "git-compat-util.h"
+#include "repository.h"
 
 #if defined(SHA1_PPC)
 #include "ppc/sha1.h"
@@ -16,6 +17,7 @@
 #endif
 
 #if defined(SHA256_GCRYPT)
+#define SHA256_NEEDS_CLONE_HELPER
 #include "sha256/gcrypt.h"
 #elif defined(SHA256_OPENSSL)
 #include <openssl/sha.h>
@@ -54,12 +56,28 @@
 #define git_SHA256_Update	platform_SHA256_Update
 #define git_SHA256_Final	platform_SHA256_Final
 
+#ifdef platform_SHA256_Clone
+#define git_SHA256_Clone	platform_SHA256_Clone
+#endif
+
 #ifdef SHA1_MAX_BLOCK_SIZE
 #include "compat/sha1-chunked.h"
 #undef git_SHA1_Update
 #define git_SHA1_Update		git_SHA1_Update_Chunked
 #endif
 
+static inline void git_SHA1_Clone(git_SHA_CTX *dst, const git_SHA_CTX *src)
+{
+	memcpy(dst, src, sizeof(*dst));
+}
+
+#ifndef SHA256_NEEDS_CLONE_HELPER
+static inline void git_SHA256_Clone(git_SHA256_CTX *dst, const git_SHA256_CTX *src)
+{
+	memcpy(dst, src, sizeof(*dst));
+}
+#endif
+
 /*
  * Note that these constants are suitable for indexing the hash_algos array and
  * comparing against each other, but are otherwise arbitrary, so they should not
@@ -77,6 +95,29 @@
 /* Number of algorithms supported (including unknown). */
 #define GIT_HASH_NALGOS (GIT_HASH_SHA256 + 1)
 
+/* 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
+
+/* 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)
+/* The block size of SHA-256. */
+#define GIT_SHA256_BLKSZ 64
+
+/* The length in byte and in hex digits of the largest possible hash value. */
+#define GIT_MAX_RAWSZ GIT_SHA256_RAWSZ
+#define GIT_MAX_HEXSZ GIT_SHA256_HEXSZ
+/* The largest possible block size for any supported hash. */
+#define GIT_MAX_BLKSZ GIT_SHA256_BLKSZ
+
+struct object_id {
+	unsigned char hash[GIT_MAX_RAWSZ];
+	int algo;	/* XXX requires 4-byte alignment */
+};
+
 /* A suitably aligned type for stack allocations of hash contexts. */
 union git_hash_ctx {
 	git_SHA_CTX sha1;
@@ -85,8 +126,10 @@ union git_hash_ctx {
 typedef union git_hash_ctx git_hash_ctx;
 
 typedef void (*git_hash_init_fn)(git_hash_ctx *ctx);
+typedef void (*git_hash_clone_fn)(git_hash_ctx *dst, const git_hash_ctx *src);
 typedef void (*git_hash_update_fn)(git_hash_ctx *ctx, const void *in, size_t len);
 typedef void (*git_hash_final_fn)(unsigned char *hash, git_hash_ctx *ctx);
+typedef void (*git_hash_final_oid_fn)(struct object_id *oid, git_hash_ctx *ctx);
 
 struct git_hash_algo {
 	/*
@@ -110,17 +153,26 @@ struct git_hash_algo {
 	/* The hash initialization function. */
 	git_hash_init_fn init_fn;
 
+	/* The hash context cloning function. */
+	git_hash_clone_fn clone_fn;
+
 	/* The hash update function. */
 	git_hash_update_fn update_fn;
 
 	/* The hash finalization function. */
 	git_hash_final_fn final_fn;
 
+	/* The hash finalization function for object IDs. */
+	git_hash_final_oid_fn final_oid_fn;
+
 	/* The OID of the empty tree. */
 	const struct object_id *empty_tree;
 
 	/* The OID of the empty blob. */
 	const struct object_id *empty_blob;
+
+	/* The all-zeros OID. */
+	const struct object_id *null_oid;
 };
 extern const struct git_hash_algo hash_algos[GIT_HASH_NALGOS];
 
@@ -139,28 +191,144 @@ static inline int hash_algo_by_ptr(const struct git_hash_algo *p)
 	return p - hash_algos;
 }
 
-/* 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
+#define the_hash_algo the_repository->hash_algo
 
-/* 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)
-/* The block size of SHA-256. */
-#define GIT_SHA256_BLKSZ 64
+const struct object_id *null_oid(void);
 
-/* The length in byte and in hex digits of the largest possible hash value. */
-#define GIT_MAX_RAWSZ GIT_SHA256_RAWSZ
-#define GIT_MAX_HEXSZ GIT_SHA256_HEXSZ
-/* The largest possible block size for any supported hash. */
-#define GIT_MAX_BLKSZ GIT_SHA256_BLKSZ
+static inline int hashcmp_algop(const unsigned char *sha1, const unsigned char *sha2, const struct git_hash_algo *algop)
+{
+	/*
+	 * Teach the compiler that there are only two possibilities of hash size
+	 * here, so that it can optimize for this case as much as possible.
+	 */
+	if (algop->rawsz == GIT_MAX_RAWSZ)
+		return memcmp(sha1, sha2, GIT_MAX_RAWSZ);
+	return memcmp(sha1, sha2, GIT_SHA1_RAWSZ);
+}
 
-struct object_id {
-	unsigned char hash[GIT_MAX_RAWSZ];
-};
+static inline int hashcmp(const unsigned char *sha1, const unsigned char *sha2)
+{
+	return hashcmp_algop(sha1, sha2, the_hash_algo);
+}
 
-#define the_hash_algo the_repository->hash_algo
+static inline int oidcmp(const struct object_id *oid1, const struct object_id *oid2)
+{
+	const struct git_hash_algo *algop;
+	if (!oid1->algo)
+		algop = the_hash_algo;
+	else
+		algop = &hash_algos[oid1->algo];
+	return hashcmp_algop(oid1->hash, oid2->hash, algop);
+}
+
+static inline int hasheq_algop(const unsigned char *sha1, const unsigned char *sha2, const struct git_hash_algo *algop)
+{
+	/*
+	 * We write this here instead of deferring to hashcmp so that the
+	 * compiler can properly inline it and avoid calling memcmp.
+	 */
+	if (algop->rawsz == GIT_MAX_RAWSZ)
+		return !memcmp(sha1, sha2, GIT_MAX_RAWSZ);
+	return !memcmp(sha1, sha2, GIT_SHA1_RAWSZ);
+}
+
+static inline int hasheq(const unsigned char *sha1, const unsigned char *sha2)
+{
+	return hasheq_algop(sha1, sha2, the_hash_algo);
+}
+
+static inline int oideq(const struct object_id *oid1, const struct object_id *oid2)
+{
+	const struct git_hash_algo *algop;
+	if (!oid1->algo)
+		algop = the_hash_algo;
+	else
+		algop = &hash_algos[oid1->algo];
+	return hasheq_algop(oid1->hash, oid2->hash, algop);
+}
+
+static inline int is_null_oid(const struct object_id *oid)
+{
+	return oideq(oid, null_oid());
+}
+
+static inline void hashcpy(unsigned char *sha_dst, const unsigned char *sha_src)
+{
+	memcpy(sha_dst, sha_src, the_hash_algo->rawsz);
+}
+
+static inline void oidcpy(struct object_id *dst, const struct object_id *src)
+{
+	memcpy(dst->hash, src->hash, GIT_MAX_RAWSZ);
+	dst->algo = src->algo;
+}
+
+/* Like oidcpy() but zero-pads the unused bytes in dst's hash array. */
+static inline void oidcpy_with_padding(struct object_id *dst,
+				       const struct object_id *src)
+{
+	size_t hashsz;
+
+	if (!src->algo)
+		hashsz = the_hash_algo->rawsz;
+	else
+		hashsz = hash_algos[src->algo].rawsz;
+
+	memcpy(dst->hash, src->hash, hashsz);
+	memset(dst->hash + hashsz, 0, GIT_MAX_RAWSZ - hashsz);
+	dst->algo = src->algo;
+}
+
+static inline struct object_id *oiddup(const struct object_id *src)
+{
+	struct object_id *dst = xmalloc(sizeof(struct object_id));
+	oidcpy(dst, src);
+	return dst;
+}
+
+static inline void hashclr(unsigned char *hash)
+{
+	memset(hash, 0, the_hash_algo->rawsz);
+}
+
+static inline void oidclr(struct object_id *oid)
+{
+	memset(oid->hash, 0, GIT_MAX_RAWSZ);
+	oid->algo = hash_algo_by_ptr(the_hash_algo);
+}
+
+static inline void oidread(struct object_id *oid, const unsigned char *hash)
+{
+	memcpy(oid->hash, hash, the_hash_algo->rawsz);
+	oid->algo = hash_algo_by_ptr(the_hash_algo);
+}
+
+static inline int is_empty_blob_sha1(const unsigned char *sha1)
+{
+	return hasheq(sha1, the_hash_algo->empty_blob->hash);
+}
+
+static inline int is_empty_blob_oid(const struct object_id *oid)
+{
+	return oideq(oid, the_hash_algo->empty_blob);
+}
+
+static inline int is_empty_tree_sha1(const unsigned char *sha1)
+{
+	return hasheq(sha1, the_hash_algo->empty_tree->hash);
+}
+
+static inline int is_empty_tree_oid(const struct object_id *oid)
+{
+	return oideq(oid, the_hash_algo->empty_tree);
+}
+
+static inline void oid_set_algo(struct object_id *oid, const struct git_hash_algo *algop)
+{
+	oid->algo = hash_algo_by_ptr(algop);
+}
+
+const char *empty_tree_oid_hex(void);
+const char *empty_blob_oid_hex(void);
 
 #endif
diff --git a/hashmap.c b/hashmap.c
index 39c13110bc..134d2eec80 100644
--- a/hashmap.c
+++ b/hashmap.c
@@ -51,7 +51,7 @@ unsigned int memihash(const void *buf, size_t len)
 }
 
 /*
- * Incoporate another chunk of data into a memihash
+ * Incorporate another chunk of data into a memihash
  * computation.
  */
 unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len)
@@ -76,7 +76,7 @@ unsigned int memihash_cont(unsigned int hash_seed, const void *buf, size_t len)
 static void alloc_table(struct hashmap *map, unsigned int size)
 {
 	map->tablesize = size;
-	map->table = xcalloc(size, sizeof(struct hashmap_entry *));
+	CALLOC_ARRAY(map->table, size);
 
 	/* calculate resize thresholds for new size */
 	map->grow_at = (unsigned int) ((uint64_t) size * HASHMAP_LOAD_FACTOR / 100);
@@ -92,8 +92,9 @@ static void alloc_table(struct hashmap *map, unsigned int size)
 }
 
 static inline int entry_equals(const struct hashmap *map,
-		const struct hashmap_entry *e1, const struct hashmap_entry *e2,
-		const void *keydata)
+			       const struct hashmap_entry *e1,
+			       const struct hashmap_entry *e2,
+			       const void *keydata)
 {
 	return (e1 == e2) ||
 	       (e1->hash == e2->hash &&
@@ -101,7 +102,7 @@ static inline int entry_equals(const struct hashmap *map,
 }
 
 static inline unsigned int bucket(const struct hashmap *map,
-		const struct hashmap_entry *key)
+				  const struct hashmap_entry *key)
 {
 	return key->hash & (map->tablesize - 1);
 }
@@ -113,6 +114,7 @@ int hashmap_bucket(const struct hashmap *map, unsigned int hash)
 
 static void rehash(struct hashmap *map, unsigned int newsize)
 {
+	/* map->table MUST NOT be NULL when this function is called */
 	unsigned int i, oldsize = map->tablesize;
 	struct hashmap_entry **oldtable = map->table;
 
@@ -133,6 +135,7 @@ static void rehash(struct hashmap *map, unsigned int newsize)
 static inline struct hashmap_entry **find_entry_ptr(const struct hashmap *map,
 		const struct hashmap_entry *key, const void *keydata)
 {
+	/* map->table MUST NOT be NULL when this function is called */
 	struct hashmap_entry **e = &map->table[bucket(map, key)];
 	while (*e && !entry_equals(map, *e, key, keydata))
 		e = &(*e)->next;
@@ -148,7 +151,7 @@ static int always_equal(const void *unused_cmp_data,
 }
 
 void hashmap_init(struct hashmap *map, hashmap_cmp_fn equals_function,
-		const void *cmpfn_data, size_t initial_size)
+		  const void *cmpfn_data, size_t initial_size)
 {
 	unsigned int size = HASHMAP_INITIAL_SIZE;
 
@@ -171,22 +174,37 @@ void hashmap_init(struct hashmap *map, hashmap_cmp_fn equals_function,
 	map->do_count_items = 1;
 }
 
-void hashmap_free_(struct hashmap *map, ssize_t entry_offset)
+static void free_individual_entries(struct hashmap *map, ssize_t entry_offset)
+{
+	struct hashmap_iter iter;
+	struct hashmap_entry *e;
+
+	hashmap_iter_init(map, &iter);
+	while ((e = hashmap_iter_next(&iter)))
+		/*
+		 * like container_of, but using caller-calculated
+		 * offset (caller being hashmap_clear_and_free)
+		 */
+		free((char *)e - entry_offset);
+}
+
+void hashmap_partial_clear_(struct hashmap *map, ssize_t entry_offset)
 {
 	if (!map || !map->table)
 		return;
-	if (entry_offset >= 0) { /* called by hashmap_free_entries */
-		struct hashmap_iter iter;
-		struct hashmap_entry *e;
-
-		hashmap_iter_init(map, &iter);
-		while ((e = hashmap_iter_next(&iter)))
-			/*
-			 * like container_of, but using caller-calculated
-			 * offset (caller being hashmap_free_entries)
-			 */
-			free((char *)e - entry_offset);
-	}
+	if (entry_offset >= 0)  /* called by hashmap_clear_entries */
+		free_individual_entries(map, entry_offset);
+	memset(map->table, 0, map->tablesize * sizeof(struct hashmap_entry *));
+	map->shrink_at = 0;
+	map->private_size = 0;
+}
+
+void hashmap_clear_(struct hashmap *map, ssize_t entry_offset)
+{
+	if (!map || !map->table)
+		return;
+	if (entry_offset >= 0)  /* called by hashmap_clear_and_free */
+		free_individual_entries(map, entry_offset);
 	free(map->table);
 	memset(map, 0, sizeof(*map));
 }
@@ -195,11 +213,13 @@ struct hashmap_entry *hashmap_get(const struct hashmap *map,
 				const struct hashmap_entry *key,
 				const void *keydata)
 {
+	if (!map->table)
+		return NULL;
 	return *find_entry_ptr(map, key, keydata);
 }
 
 struct hashmap_entry *hashmap_get_next(const struct hashmap *map,
-			const struct hashmap_entry *entry)
+				       const struct hashmap_entry *entry)
 {
 	struct hashmap_entry *e = entry->next;
 	for (; e; e = e->next)
@@ -210,8 +230,12 @@ struct hashmap_entry *hashmap_get_next(const struct hashmap *map,
 
 void hashmap_add(struct hashmap *map, struct hashmap_entry *entry)
 {
-	unsigned int b = bucket(map, entry);
+	unsigned int b;
+
+	if (!map->table)
+		alloc_table(map, HASHMAP_INITIAL_SIZE);
 
+	b = bucket(map, entry);
 	/* add entry */
 	entry->next = map->table[b];
 	map->table[b] = entry;
@@ -225,11 +249,15 @@ void hashmap_add(struct hashmap *map, struct hashmap_entry *entry)
 }
 
 struct hashmap_entry *hashmap_remove(struct hashmap *map,
-					const struct hashmap_entry *key,
-					const void *keydata)
+				     const struct hashmap_entry *key,
+				     const void *keydata)
 {
 	struct hashmap_entry *old;
-	struct hashmap_entry **e = find_entry_ptr(map, key, keydata);
+	struct hashmap_entry **e;
+
+	if (!map->table)
+		return NULL;
+	e = find_entry_ptr(map, key, keydata);
 	if (!*e)
 		return NULL;
 
@@ -249,7 +277,7 @@ struct hashmap_entry *hashmap_remove(struct hashmap *map,
 }
 
 struct hashmap_entry *hashmap_put(struct hashmap *map,
-				struct hashmap_entry *entry)
+				  struct hashmap_entry *entry)
 {
 	struct hashmap_entry *old = hashmap_remove(map, entry, NULL);
 	hashmap_add(map, entry);
diff --git a/hashmap.h b/hashmap.h
index bd2701549f..7251687d73 100644
--- a/hashmap.h
+++ b/hashmap.h
@@ -59,7 +59,7 @@
  *
  *         if (!strcmp("print_all_by_key", action)) {
  *             struct long2string k, *e;
- *             hashmap_entry_init(&k->ent, memhash(&key, sizeof(long)));
+ *             hashmap_entry_init(&k.ent, memhash(&key, sizeof(long)));
  *             k.key = key;
  *
  *             flags &= ~COMPARE_VALUE;
@@ -87,16 +87,16 @@
  *
  *         if (!strcmp("has_exact_match_no_heap_alloc", action)) {
  *             struct long2string k;
- *             hashmap_entry_init(&k->ent, memhash(&key, sizeof(long)));
+ *             hashmap_entry_init(&k.ent, memhash(&key, sizeof(long)));
  *             k.key = key;
  *
  *             flags |= COMPARE_VALUE;
  *             printf("%sfound\n",
- *                    hashmap_get(&map, &k->ent, value) ? "" : "not ");
+ *                    hashmap_get(&map, &k.ent, value) ? "" : "not ");
  *         }
  *
  *         if (!strcmp("end", action)) {
- *             hashmap_free_entries(&map, struct long2string, ent);
+ *             hashmap_clear_and_free(&map, struct long2string, ent);
  *             break;
  *         }
  *     }
@@ -168,7 +168,7 @@ struct hashmap_entry {
  * argument `keydata`, respectively. Otherwise, `keydata` is NULL.
  *
  * When it is too expensive to allocate a user entry (either because it is
- * large or varialbe sized, such that it is not on the stack), then the
+ * large or variable sized, such that it is not on the stack), then the
  * relevant data to check for equality should be passed via `keydata`.
  * In this case `key` can be a stripped down version of the user key data
  * or even just a hashmap_entry having the correct hash.
@@ -210,6 +210,9 @@ struct hashmap {
 
 /* hashmap functions */
 
+#define HASHMAP_INIT(fn, data) { .cmpfn = fn, .cmpfn_data = data, \
+				 .do_count_items = 1 }
+
 /*
  * Initializes a hashmap structure.
  *
@@ -228,24 +231,72 @@ struct hashmap {
  * prevent expensive resizing. If 0, the table is dynamically resized.
  */
 void hashmap_init(struct hashmap *map,
-			 hashmap_cmp_fn equals_function,
-			 const void *equals_function_data,
-			 size_t initial_size);
+		  hashmap_cmp_fn equals_function,
+		  const void *equals_function_data,
+		  size_t initial_size);
 
-/* internal function for freeing hashmap */
-void hashmap_free_(struct hashmap *map, ssize_t offset);
+/* internal functions for clearing or freeing hashmap */
+void hashmap_partial_clear_(struct hashmap *map, ssize_t offset);
+void hashmap_clear_(struct hashmap *map, ssize_t offset);
 
 /*
- * Frees a hashmap structure and allocated memory, leaves entries undisturbed
+ * Frees a hashmap structure and allocated memory for the table, but does not
+ * free the entries nor anything they point to.
+ *
+ * Usage note:
+ *
+ * Many callers will need to iterate over all entries and free the data each
+ * entry points to; in such a case, they can free the entry itself while at it.
+ * Thus, you might see:
+ *
+ *    hashmap_for_each_entry(map, hashmap_iter, e, hashmap_entry_name) {
+ *      free(e->somefield);
+ *      free(e);
+ *    }
+ *    hashmap_clear(map);
+ *
+ * instead of
+ *
+ *    hashmap_for_each_entry(map, hashmap_iter, e, hashmap_entry_name) {
+ *      free(e->somefield);
+ *    }
+ *    hashmap_clear_and_free(map, struct my_entry_struct, hashmap_entry_name);
+ *
+ * to avoid the implicit extra loop over the entries.  However, if there are
+ * no special fields in your entry that need to be freed beyond the entry
+ * itself, it is probably simpler to avoid the explicit loop and just call
+ * hashmap_clear_and_free().
  */
-#define hashmap_free(map) hashmap_free_(map, -1)
+#define hashmap_clear(map) hashmap_clear_(map, -1)
 
 /*
- * Frees @map and all entries.  @type is the struct type of the entry
- * where @member is the hashmap_entry struct used to associate with @map
+ * Similar to hashmap_clear(), except that the table is no deallocated; it
+ * is merely zeroed out but left the same size as before.  If the hashmap
+ * will be reused, this avoids the overhead of deallocating and
+ * reallocating map->table.  As with hashmap_clear(), you may need to free
+ * the entries yourself before calling this function.
+ */
+#define hashmap_partial_clear(map) hashmap_partial_clear_(map, -1)
+
+/*
+ * Similar to hashmap_clear() but also frees all entries.  @type is the
+ * struct type of the entry where @member is the hashmap_entry struct used
+ * to associate with @map.
+ *
+ * See usage note above hashmap_clear().
+ */
+#define hashmap_clear_and_free(map, type, member) \
+	hashmap_clear_(map, offsetof(type, member))
+
+/*
+ * Similar to hashmap_partial_clear() but also frees all entries.  @type is
+ * the struct type of the entry where @member is the hashmap_entry struct
+ * used to associate with @map.
+ *
+ * See usage note above hashmap_clear().
  */
-#define hashmap_free_entries(map, type, member) \
-	hashmap_free_(map, offsetof(type, member));
+#define hashmap_partial_clear_and_free(map, type, member) \
+	hashmap_partial_clear_(map, offsetof(type, member))
 
 /* hashmap_entry functions */
 
@@ -261,7 +312,7 @@ void hashmap_free_(struct hashmap *map, ssize_t offset);
  * and if it is on stack, you can just let it go out of scope).
  */
 static inline void hashmap_entry_init(struct hashmap_entry *e,
-					unsigned int hash)
+				      unsigned int hash)
 {
 	e->hash = hash;
 	e->next = NULL;
@@ -303,8 +354,8 @@ static inline unsigned int hashmap_get_size(struct hashmap *map)
  * to `hashmap_cmp_fn` to decide whether the entry matches the key.
  */
 struct hashmap_entry *hashmap_get(const struct hashmap *map,
-				const struct hashmap_entry *key,
-				const void *keydata);
+				  const struct hashmap_entry *key,
+				  const void *keydata);
 
 /*
  * Returns the hashmap entry for the specified hash code and key data,
@@ -337,7 +388,7 @@ static inline struct hashmap_entry *hashmap_get_from_hash(
  * call to `hashmap_get` or `hashmap_get_next`.
  */
 struct hashmap_entry *hashmap_get_next(const struct hashmap *map,
-			const struct hashmap_entry *entry);
+				       const struct hashmap_entry *entry);
 
 /*
  * Adds a hashmap entry. This allows to add duplicate entries (i.e.
@@ -357,7 +408,7 @@ void hashmap_add(struct hashmap *map, struct hashmap_entry *entry);
  * Returns the replaced entry, or NULL if not found (i.e. the entry was added).
  */
 struct hashmap_entry *hashmap_put(struct hashmap *map,
-				struct hashmap_entry *entry);
+				  struct hashmap_entry *entry);
 
 /*
  * Adds or replaces a hashmap entry contained within @keyvar,
@@ -379,8 +430,8 @@ struct hashmap_entry *hashmap_put(struct hashmap *map,
  * Argument explanation is the same as in `hashmap_get`.
  */
 struct hashmap_entry *hashmap_remove(struct hashmap *map,
-					const struct hashmap_entry *key,
-					const void *keydata);
+				     const struct hashmap_entry *key,
+				     const void *keydata);
 
 /*
  * Removes a hashmap entry contained within @keyvar,
@@ -422,7 +473,7 @@ struct hashmap_entry *hashmap_iter_next(struct hashmap_iter *iter);
 
 /* Initializes the iterator and returns the first entry, if any. */
 static inline struct hashmap_entry *hashmap_iter_first(struct hashmap *map,
-		struct hashmap_iter *iter)
+						       struct hashmap_iter *iter)
 {
 	hashmap_iter_init(map, iter);
 	return hashmap_iter_next(iter);
@@ -449,7 +500,8 @@ static inline struct hashmap_entry *hashmap_iter_first(struct hashmap *map,
  * containing a @member which is a "struct hashmap_entry"
  */
 #define hashmap_for_each_entry(map, iter, var, member) \
-	for (var = hashmap_iter_first_entry_offset(map, iter, \
+	for (var = NULL, /* for systems without typeof */ \
+	     var = hashmap_iter_first_entry_offset(map, iter, \
 						OFFSETOF_VAR(var, member)); \
 		var; \
 		var = hashmap_iter_next_entry_offset(iter, \
@@ -502,7 +554,7 @@ static inline void hashmap_disable_item_counting(struct hashmap *map)
 }
 
 /*
- * Re-enable item couting when adding/removing items.
+ * Re-enable item counting when adding/removing items.
  * If counting is currently disabled, it will force count them.
  * It WILL NOT automatically rehash them.
  */
diff --git a/help.c b/help.c
index 9ff2be6b18..3c3bdec213 100644
--- a/help.c
+++ b/help.c
@@ -34,7 +34,7 @@ static struct category_description main_categories[] = {
 	{ CAT_foreignscminterface, N_("Interacting with Others") },
 	{ CAT_plumbingmanipulators, N_("Low-level Commands / Manipulators") },
 	{ CAT_plumbinginterrogators, N_("Low-level Commands / Interrogators") },
-	{ CAT_synchingrepositories, N_("Low-level Commands / Synching Repositories") },
+	{ CAT_synchingrepositories, N_("Low-level Commands / Syncing Repositories") },
 	{ CAT_purehelpers, N_("Low-level Commands / Internal Helpers") },
 	{ 0, NULL }
 };
@@ -263,6 +263,8 @@ void load_command_list(const char *prefix,
 	const char *env_path = getenv("PATH");
 	const char *exec_path = git_exec_path();
 
+	load_builtin_commands(prefix, main_cmds);
+
 	if (exec_path) {
 		list_commands_in_dir(main_cmds, exec_path, prefix);
 		QSORT(main_cmds->names, main_cmds->cnt, cmdname_compare);
@@ -375,7 +377,7 @@ void list_cmds_by_config(struct string_list *list)
 {
 	const char *cmd_list;
 
-	if (git_config_get_string_const("completion.commands", &cmd_list))
+	if (git_config_get_string_tmp("completion.commands", &cmd_list))
 		return;
 
 	string_list_sort(list);
@@ -397,101 +399,16 @@ void list_cmds_by_config(struct string_list *list)
 	}
 }
 
-void list_common_guides_help(void)
+void list_guides_help(void)
 {
 	struct category_description catdesc[] = {
-		{ CAT_guide, N_("The common Git guides are:") },
+		{ CAT_guide, N_("The Git concept guides are:") },
 		{ 0, NULL }
 	};
 	print_cmd_by_category(catdesc, NULL);
 	putchar('\n');
 }
 
-struct slot_expansion {
-	const char *prefix;
-	const char *placeholder;
-	void (*fn)(struct string_list *list, const char *prefix);
-	int found;
-};
-
-void list_config_help(int for_human)
-{
-	struct slot_expansion slot_expansions[] = {
-		{ "advice", "*", list_config_advices },
-		{ "color.branch", "<slot>", list_config_color_branch_slots },
-		{ "color.decorate", "<slot>", list_config_color_decorate_slots },
-		{ "color.diff", "<slot>", list_config_color_diff_slots },
-		{ "color.grep", "<slot>", list_config_color_grep_slots },
-		{ "color.interactive", "<slot>", list_config_color_interactive_slots },
-		{ "color.remote", "<slot>", list_config_color_sideband_slots },
-		{ "color.status", "<slot>", list_config_color_status_slots },
-		{ "fsck", "<msg-id>", list_config_fsck_msg_ids },
-		{ "receive.fsck", "<msg-id>", list_config_fsck_msg_ids },
-		{ NULL, NULL, NULL }
-	};
-	const char **p;
-	struct slot_expansion *e;
-	struct string_list keys = STRING_LIST_INIT_DUP;
-	int i;
-
-	for (p = config_name_list; *p; p++) {
-		const char *var = *p;
-		struct strbuf sb = STRBUF_INIT;
-
-		for (e = slot_expansions; e->prefix; e++) {
-
-			strbuf_reset(&sb);
-			strbuf_addf(&sb, "%s.%s", e->prefix, e->placeholder);
-			if (!strcasecmp(var, sb.buf)) {
-				e->fn(&keys, e->prefix);
-				e->found++;
-				break;
-			}
-		}
-		strbuf_release(&sb);
-		if (!e->prefix)
-			string_list_append(&keys, var);
-	}
-
-	for (e = slot_expansions; e->prefix; e++)
-		if (!e->found)
-			BUG("slot_expansion %s.%s is not used",
-			    e->prefix, e->placeholder);
-
-	string_list_sort(&keys);
-	for (i = 0; i < keys.nr; i++) {
-		const char *var = keys.items[i].string;
-		const char *wildcard, *tag, *cut;
-
-		if (for_human) {
-			puts(var);
-			continue;
-		}
-
-		wildcard = strchr(var, '*');
-		tag = strchr(var, '<');
-
-		if (!wildcard && !tag) {
-			puts(var);
-			continue;
-		}
-
-		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);
-	}
-	string_list_clear(&keys, 0);
-}
-
 static int get_alias(const char *var, const char *value, void *data)
 {
 	struct string_list *list = data;
@@ -555,12 +472,26 @@ int is_in_cmdlist(struct cmdnames *c, const char *s)
 static int autocorrect;
 static struct cmdnames aliases;
 
+#define AUTOCORRECT_NEVER (-2)
+#define AUTOCORRECT_IMMEDIATELY (-1)
+
 static int git_unknown_cmd_config(const char *var, const char *value, void *cb)
 {
 	const char *p;
 
-	if (!strcmp(var, "help.autocorrect"))
-		autocorrect = git_config_int(var,value);
+	if (!strcmp(var, "help.autocorrect")) {
+		if (!value)
+			return config_error_nonbool(var);
+		if (!strcmp(value, "never")) {
+			autocorrect = AUTOCORRECT_NEVER;
+		} else if (!strcmp(value, "immediate")) {
+			autocorrect = AUTOCORRECT_IMMEDIATELY;
+		} else {
+			int v = git_config_int(var, value);
+			autocorrect = (v < 0)
+				? AUTOCORRECT_IMMEDIATELY : v;
+		}
+	}
 	/* Also use aliases for command lookup */
 	if (skip_prefix(var, "alias.", &p))
 		add_cmdname(&aliases, p, strlen(p));
@@ -608,6 +539,11 @@ const char *help_unknown_cmd(const char *cmd)
 
 	read_early_config(git_unknown_cmd_config, NULL);
 
+	if (autocorrect == AUTOCORRECT_NEVER) {
+		fprintf_ln(stderr, _("git: '%s' is not a git command. See 'git --help'."), cmd);
+		exit(1);
+	}
+
 	load_command_list("git-", &main_cmds, &other_cmds);
 
 	add_cmd_list(&main_cmds, &aliases);
@@ -677,7 +613,7 @@ const char *help_unknown_cmd(const char *cmd)
 			   _("WARNING: You called a Git command named '%s', "
 			     "which does not exist."),
 			   cmd);
-		if (autocorrect < 0)
+		if (autocorrect == AUTOCORRECT_IMMEDIATELY)
 			fprintf_ln(stderr,
 				   _("Continuing under the assumption that "
 				     "you meant '%s'."),
@@ -707,8 +643,33 @@ const char *help_unknown_cmd(const char *cmd)
 	exit(1);
 }
 
+void get_version_info(struct strbuf *buf, int show_build_options)
+{
+	/*
+	 * The format of this string should be kept stable for compatibility
+	 * with external projects that rely on the output of "git version".
+	 *
+	 * Always show the version, even if other options are given.
+	 */
+	strbuf_addf(buf, "git version %s\n", git_version_string);
+
+	if (show_build_options) {
+		strbuf_addf(buf, "cpu: %s\n", GIT_HOST_CPU);
+		if (git_built_from_commit_string[0])
+			strbuf_addf(buf, "built from commit: %s\n",
+			       git_built_from_commit_string);
+		else
+			strbuf_addstr(buf, "no commit associated with this build\n");
+		strbuf_addf(buf, "sizeof-long: %d\n", (int)sizeof(long));
+		strbuf_addf(buf, "sizeof-size_t: %d\n", (int)sizeof(size_t));
+		strbuf_addf(buf, "shell-path: %s\n", SHELL_PATH);
+		/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
+	}
+}
+
 int cmd_version(int argc, const char **argv, const char *prefix)
 {
+	struct strbuf buf = STRBUF_INIT;
 	int build_options = 0;
 	const char * const usage[] = {
 		N_("git version [<options>]"),
@@ -722,25 +683,11 @@ int cmd_version(int argc, const char **argv, const char *prefix)
 
 	argc = parse_options(argc, argv, prefix, options, usage, 0);
 
-	/*
-	 * The format of this string should be kept stable for compatibility
-	 * with external projects that rely on the output of "git version".
-	 *
-	 * Always show the version, even if other options are given.
-	 */
-	printf("git version %s\n", git_version_string);
+	get_version_info(&buf, build_options);
+	printf("%s", buf.buf);
+
+	strbuf_release(&buf);
 
-	if (build_options) {
-		printf("cpu: %s\n", GIT_HOST_CPU);
-		if (git_built_from_commit_string[0])
-			printf("built from commit: %s\n",
-			       git_built_from_commit_string);
-		else
-			printf("no commit associated with this build\n");
-		printf("sizeof-long: %d\n", (int)sizeof(long));
-		printf("sizeof-size_t: %d\n", (int)sizeof(size_t));
-		/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
-	}
 	return 0;
 }
 
diff --git a/help.h b/help.h
index 7a455beeb7..5871e93ba2 100644
--- a/help.h
+++ b/help.h
@@ -21,8 +21,7 @@ static inline void mput_char(char c, unsigned int num)
 
 void list_common_cmds_help(void);
 void list_all_cmds_help(void);
-void list_common_guides_help(void);
-void list_config_help(int for_human);
+void list_guides_help(void);
 
 void list_all_main_cmds(struct string_list *list);
 void list_all_other_cmds(struct string_list *list);
@@ -33,11 +32,13 @@ const char *help_unknown_cmd(const char *cmd);
 void load_command_list(const char *prefix,
 		       struct cmdnames *main_cmds,
 		       struct cmdnames *other_cmds);
+void load_builtin_commands(const char *prefix, struct cmdnames *cmds);
 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 get_version_info(struct strbuf *buf, int show_build_options);
 
 /*
  * call this to die(), when it is suspected that the user mistyped a
diff --git a/hex.c b/hex.c
index 7850a8879d..4f64d34696 100644
--- a/hex.c
+++ b/hex.c
@@ -47,32 +47,76 @@ int hex_to_bytes(unsigned char *binary, const char *hex, size_t len)
 	return 0;
 }
 
-int get_sha1_hex(const char *hex, unsigned char *sha1)
+static int get_hash_hex_algop(const char *hex, unsigned char *hash,
+			      const struct git_hash_algo *algop)
 {
 	int i;
-	for (i = 0; i < the_hash_algo->rawsz; i++) {
+	for (i = 0; i < algop->rawsz; i++) {
 		int val = hex2chr(hex);
 		if (val < 0)
 			return -1;
-		*sha1++ = val;
+		*hash++ = val;
 		hex += 2;
 	}
 	return 0;
 }
 
+int get_sha1_hex(const char *hex, unsigned char *sha1)
+{
+	return get_hash_hex_algop(hex, sha1, the_hash_algo);
+}
+
+int get_oid_hex_algop(const char *hex, struct object_id *oid,
+		      const struct git_hash_algo *algop)
+{
+	int ret = get_hash_hex_algop(hex, oid->hash, algop);
+	if (!ret)
+		oid_set_algo(oid, algop);
+	return ret;
+}
+
+/*
+ * NOTE: This function relies on hash algorithms being in order from shortest
+ * length to longest length.
+ */
+int get_oid_hex_any(const char *hex, struct object_id *oid)
+{
+	int i;
+	for (i = GIT_HASH_NALGOS - 1; i > 0; i--) {
+		if (!get_oid_hex_algop(hex, oid, &hash_algos[i]))
+			return i;
+	}
+	return GIT_HASH_UNKNOWN;
+}
+
 int get_oid_hex(const char *hex, struct object_id *oid)
 {
-	return get_sha1_hex(hex, oid->hash);
+	return get_oid_hex_algop(hex, oid, the_hash_algo);
 }
 
-int parse_oid_hex(const char *hex, struct object_id *oid, const char **end)
+int parse_oid_hex_algop(const char *hex, struct object_id *oid,
+			const char **end,
+			const struct git_hash_algo *algop)
 {
-	int ret = get_oid_hex(hex, oid);
+	int ret = get_oid_hex_algop(hex, oid, algop);
 	if (!ret)
-		*end = hex + the_hash_algo->hexsz;
+		*end = hex + algop->hexsz;
+	return ret;
+}
+
+int parse_oid_hex_any(const char *hex, struct object_id *oid, const char **end)
+{
+	int ret = get_oid_hex_any(hex, oid);
+	if (ret)
+		*end = hex + hash_algos[ret].hexsz;
 	return ret;
 }
 
+int parse_oid_hex(const char *hex, struct object_id *oid, const char **end)
+{
+	return parse_oid_hex_algop(hex, oid, end, the_hash_algo);
+}
+
 char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash,
 			  const struct git_hash_algo *algop)
 {
@@ -80,6 +124,13 @@ char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash,
 	char *buf = buffer;
 	int i;
 
+	/*
+	 * Our struct object_id has been memset to 0, so default to printing
+	 * using the default hash.
+	 */
+	if (algop == &hash_algos[0])
+		algop = the_hash_algo;
+
 	for (i = 0; i < algop->rawsz; i++) {
 		unsigned int val = *hash++;
 		*buf++ = hex[val >> 4];
@@ -90,14 +141,9 @@ char *hash_to_hex_algop_r(char *buffer, const unsigned char *hash,
 	return buffer;
 }
 
-char *sha1_to_hex_r(char *buffer, const unsigned char *sha1)
-{
-	return hash_to_hex_algop_r(buffer, sha1, &hash_algos[GIT_HASH_SHA1]);
-}
-
 char *oid_to_hex_r(char *buffer, const struct object_id *oid)
 {
-	return hash_to_hex_algop_r(buffer, oid->hash, the_hash_algo);
+	return hash_to_hex_algop_r(buffer, oid->hash, &hash_algos[oid->algo]);
 }
 
 char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *algop)
@@ -108,11 +154,6 @@ char *hash_to_hex_algop(const unsigned char *hash, const struct git_hash_algo *a
 	return hash_to_hex_algop_r(hexbuffer[bufno], hash, algop);
 }
 
-char *sha1_to_hex(const unsigned char *sha1)
-{
-	return hash_to_hex_algop(sha1, &hash_algos[GIT_HASH_SHA1]);
-}
-
 char *hash_to_hex(const unsigned char *hash)
 {
 	return hash_to_hex_algop(hash, the_hash_algo);
@@ -120,5 +161,5 @@ char *hash_to_hex(const unsigned char *hash)
 
 char *oid_to_hex(const struct object_id *oid)
 {
-	return hash_to_hex_algop(oid->hash, the_hash_algo);
+	return hash_to_hex_algop(oid->hash, &hash_algos[oid->algo]);
 }
diff --git a/http-backend.c b/http-backend.c
index ec3144b444..b329bf63f0 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -9,7 +9,7 @@
 #include "run-command.h"
 #include "string-list.h"
 #include "url.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "packfile.h"
 #include "object-store.h"
 #include "protocol.h"
@@ -39,7 +39,7 @@ static struct string_list *get_parameters(void)
 	if (!query_params) {
 		const char *query = getenv("QUERY_STRING");
 
-		query_params = xcalloc(1, sizeof(*query_params));
+		CALLOC_ARRAY(query_params, 1);
 		while (query && *query) {
 			char *name = url_decode_parameter_name(&query);
 			char *value = url_decode_parameter_value(&query);
@@ -477,10 +477,10 @@ static void run_service(const char **argv, int buffer_input)
 		host = "(none)";
 
 	if (!getenv("GIT_COMMITTER_NAME"))
-		argv_array_pushf(&cld.env_array, "GIT_COMMITTER_NAME=%s", user);
+		strvec_pushf(&cld.env_array, "GIT_COMMITTER_NAME=%s", user);
 	if (!getenv("GIT_COMMITTER_EMAIL"))
-		argv_array_pushf(&cld.env_array,
-				 "GIT_COMMITTER_EMAIL=%s@http.%s", user, host);
+		strvec_pushf(&cld.env_array,
+			     "GIT_COMMITTER_EMAIL=%s@http.%s", user, host);
 
 	cld.argv = argv;
 	if (buffer_input || gzipped_request || req_len >= 0)
diff --git a/http-fetch.c b/http-fetch.c
index a32ac118d9..fa642462a9 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -3,24 +3,99 @@
 #include "exec-cmd.h"
 #include "http.h"
 #include "walker.h"
+#include "strvec.h"
 
 static const char http_fetch_usage[] = "git http-fetch "
-"[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin] commit-id url";
+"[-c] [-t] [-a] [-v] [--recover] [-w ref] [--stdin | --packfile=hash | commit-id] url";
 
-int cmd_main(int argc, const char **argv)
+static int fetch_using_walker(const char *raw_url, int get_verbosely,
+			      int get_recover, int commits, char **commit_id,
+			      const char **write_ref, int commits_on_stdin)
 {
+	char *url = NULL;
 	struct walker *walker;
+	int rc;
+
+	str_end_url_with_slash(raw_url, &url);
+
+	http_init(NULL, url, 0);
+
+	walker = get_http_walker(url);
+	walker->get_verbosely = get_verbosely;
+	walker->get_recover = get_recover;
+	walker->get_progress = 0;
+
+	rc = walker_fetch(walker, commits, commit_id, write_ref, url);
+
+	if (commits_on_stdin)
+		walker_targets_free(commits, commit_id, write_ref);
+
+	if (walker->corrupt_object_found) {
+		fprintf(stderr,
+"Some loose object were found to be corrupt, but they might be just\n"
+"a false '404 Not Found' error message sent with incorrect HTTP\n"
+"status code.  Suggest running 'git fsck'.\n");
+	}
+
+	walker_free(walker);
+	http_cleanup();
+	free(url);
+
+	return rc;
+}
+
+static void fetch_single_packfile(struct object_id *packfile_hash,
+				  const char *url,
+				  const char **index_pack_args) {
+	struct http_pack_request *preq;
+	struct slot_results results;
+	int ret;
+
+	http_init(NULL, url, 0);
+
+	preq = new_direct_http_pack_request(packfile_hash->hash, xstrdup(url));
+	if (preq == NULL)
+		die("couldn't create http pack request");
+	preq->slot->results = &results;
+	preq->index_pack_args = index_pack_args;
+	preq->preserve_index_pack_stdout = 1;
+
+	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);
+		}
+	} else {
+		die("Unable to start request");
+	}
+
+	if ((ret = finish_http_pack_request(preq)))
+		die("finish_http_pack_request gave result %d", ret);
+
+	release_http_pack_request(preq);
+	http_cleanup();
+}
+
+int cmd_main(int argc, const char **argv)
+{
 	int commits_on_stdin = 0;
 	int commits;
 	const char **write_ref = NULL;
 	char **commit_id;
-	char *url = NULL;
 	int arg = 1;
-	int rc = 0;
 	int get_verbosely = 0;
 	int get_recover = 0;
+	int packfile = 0;
+	int nongit;
+	struct object_id packfile_hash;
+	struct strvec index_pack_args = STRVEC_INIT;
+
+	setup_git_directory_gently(&nongit);
 
 	while (arg < argc && argv[arg][0] == '-') {
+		const char *p;
+
 		if (argv[arg][1] == 't') {
 		} else if (argv[arg][1] == 'c') {
 		} else if (argv[arg][1] == 'a') {
@@ -35,46 +110,45 @@ int cmd_main(int argc, const char **argv)
 			get_recover = 1;
 		} else if (!strcmp(argv[arg], "--stdin")) {
 			commits_on_stdin = 1;
+		} else if (skip_prefix(argv[arg], "--packfile=", &p)) {
+			const char *end;
+
+			packfile = 1;
+			if (parse_oid_hex(p, &packfile_hash, &end) || *end)
+				die(_("argument to --packfile must be a valid hash (got '%s')"), p);
+		} else if (skip_prefix(argv[arg], "--index-pack-arg=", &p)) {
+			strvec_push(&index_pack_args, p);
 		}
 		arg++;
 	}
-	if (argc != arg + 2 - commits_on_stdin)
+	if (argc != arg + 2 - (commits_on_stdin || packfile))
 		usage(http_fetch_usage);
-	if (commits_on_stdin) {
-		commits = walker_targets_stdin(&commit_id, &write_ref);
-	} else {
-		commit_id = (char **) &argv[arg++];
-		commits = 1;
-	}
-
-	if (argv[arg])
-		str_end_url_with_slash(argv[arg], &url);
 
-	setup_git_directory();
+	if (nongit)
+		die(_("not a git repository"));
 
 	git_config(git_default_config, NULL);
 
-	http_init(NULL, url, 0);
-	walker = get_http_walker(url);
-	walker->get_verbosely = get_verbosely;
-	walker->get_recover = get_recover;
+	if (packfile) {
+		if (!index_pack_args.nr)
+			die(_("--packfile requires --index-pack-args"));
 
-	rc = walker_fetch(walker, commits, commit_id, write_ref, url);
+		fetch_single_packfile(&packfile_hash, argv[arg],
+				      index_pack_args.v);
 
-	if (commits_on_stdin)
-		walker_targets_free(commits, commit_id, write_ref);
-
-	if (walker->corrupt_object_found) {
-		fprintf(stderr,
-"Some loose object were found to be corrupt, but they might be just\n"
-"a false '404 Not Found' error message sent with incorrect HTTP\n"
-"status code.  Suggest running 'git fsck'.\n");
+		return 0;
 	}
 
-	walker_free(walker);
-	http_cleanup();
+	if (index_pack_args.nr)
+		die(_("--index-pack-args can only be used with --packfile"));
 
-	free(url);
-
-	return rc;
+	if (commits_on_stdin) {
+		commits = walker_targets_stdin(&commit_id, &write_ref);
+	} else {
+		commit_id = (char **) &argv[arg++];
+		commits = 1;
+	}
+	return fetch_using_walker(argv[arg], get_verbosely, get_recover,
+				  commits, commit_id, write_ref,
+				  commits_on_stdin);
 }
diff --git a/http-push.c b/http-push.c
index 822f326599..3309aaf004 100644
--- a/http-push.c
+++ b/http-push.c
@@ -11,7 +11,7 @@
 #include "remote.h"
 #include "list-objects.h"
 #include "sigchain.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "packfile.h"
 #include "object-store.h"
 #include "commit-reach.h"
@@ -70,10 +70,10 @@ enum XML_Status {
 #define LOCK_REFRESH 30
 
 /* Remember to update object flag allocation in object.h */
-#define LOCAL    (1u<<16)
-#define REMOTE   (1u<<17)
-#define FETCHING (1u<<18)
-#define PUSHING  (1u<<19)
+#define LOCAL    (1u<<11)
+#define REMOTE   (1u<<12)
+#define FETCHING (1u<<13)
+#define PUSHING  (1u<<14)
 
 /* We allow "recursive" symbolic refs. Only within reason, though */
 #define MAXDEPTH 5
@@ -117,6 +117,7 @@ enum transfer_state {
 
 struct transfer_request {
 	struct object *obj;
+	struct packed_git *target;
 	char *url;
 	char *dest;
 	struct remote_lock *lock;
@@ -202,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);
@@ -248,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;
@@ -298,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)
 {
@@ -314,17 +310,18 @@ static void start_fetch_packed(struct transfer_request *request)
 		release_request(request);
 		return;
 	}
+	close_pack_index(target);
+	request->target = target;
 
 	fprintf(stderr,	"Fetching pack %s\n",
 		hash_to_hex(target->hash));
 	fprintf(stderr, " which contains %s\n", oid_to_hex(&request->obj->oid));
 
-	preq = new_http_pack_request(target, repo->url);
+	preq = new_http_pack_request(target->hash, repo->url);
 	if (preq == NULL) {
 		repo->can_update_info_refs = 0;
 		return;
 	}
-	preq->lst = &repo->packs;
 
 	/* Make sure there isn't another open request for this pack */
 	while (check_request) {
@@ -597,11 +594,12 @@ static void finish_request(struct transfer_request *request)
 		}
 		if (fail)
 			repo->can_update_info_refs = 0;
+		else
+			http_install_packfile(request->target, &repo->packs);
 		release_request(request);
 	}
 }
 
-#ifdef USE_CURL_MULTI
 static int is_running_queue;
 static int fill_active_slot(void *unused)
 {
@@ -625,7 +623,6 @@ static int fill_active_slot(void *unused)
 	}
 	return 0;
 }
-#endif
 
 static void get_remote_object_list(unsigned char parent);
 
@@ -654,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)
@@ -692,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;
 }
@@ -890,9 +883,9 @@ 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);
 
-	lock = xcalloc(1, sizeof(*lock));
+	CALLOC_ARRAY(lock, 1);
 	lock->timeout = -1;
 
 	if (start_active_slot(slot)) {
@@ -1018,6 +1011,8 @@ static void remote_ls(const char *path, int flags,
 /* extract hex from sharded "xx/x{38}" filename */
 static int get_oid_hex_from_objpath(const char *path, struct object_id *oid)
 {
+	oid->algo = hash_algo_by_ptr(the_hash_algo);
+
 	if (strlen(path) != the_hash_algo->hexsz + 1)
 		return -1;
 
@@ -1147,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);
@@ -1221,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);
@@ -1432,7 +1427,7 @@ static void one_remote_ref(const char *refname)
 	 * may be required for updating server info later.
 	 */
 	if (repo->can_update_info_refs && !has_object_file(&ref->old_oid)) {
-		obj = lookup_unknown_object(&ref->old_oid);
+		obj = lookup_unknown_object(the_repository, &ref->old_oid);
 		fprintf(stderr,	"  fetch %s for %s\n",
 			oid_to_hex(&ref->old_oid), refname);
 		add_fetch_request(obj);
@@ -1676,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)
@@ -1709,7 +1698,7 @@ int cmd_main(int argc, const char **argv)
 	int new_refs;
 	struct ref *ref, *local_refs;
 
-	repo = xcalloc(1, sizeof(*repo));
+	CALLOC_ARRAY(repo, 1);
 
 	argv++;
 	for (i = 1; i < argc; i++, argv++) {
@@ -1764,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);
 
@@ -1780,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()) {
@@ -1842,7 +1825,7 @@ int cmd_main(int argc, const char **argv)
 
 	new_refs = 0;
 	for (ref = remote_refs; ref; ref = ref->next) {
-		struct argv_array commit_argv = ARGV_ARRAY_INIT;
+		struct strvec commit_argv = STRVEC_INIT;
 
 		if (!ref->peer_ref)
 			continue;
@@ -1920,14 +1903,14 @@ int cmd_main(int argc, const char **argv)
 		}
 
 		/* Set up revision info for this refspec */
-		argv_array_push(&commit_argv, ""); /* ignored */
-		argv_array_push(&commit_argv, "--objects");
-		argv_array_push(&commit_argv, oid_to_hex(&ref->new_oid));
+		strvec_push(&commit_argv, ""); /* ignored */
+		strvec_push(&commit_argv, "--objects");
+		strvec_push(&commit_argv, oid_to_hex(&ref->new_oid));
 		if (!push_all && !is_null_oid(&ref->old_oid))
-			argv_array_pushf(&commit_argv, "^%s",
-					 oid_to_hex(&ref->old_oid));
+			strvec_pushf(&commit_argv, "^%s",
+				     oid_to_hex(&ref->old_oid));
 		repo_init_revisions(the_repository, &revs, setup_git_directory());
-		setup_revisions(commit_argv.argc, commit_argv.argv, &revs, NULL);
+		setup_revisions(commit_argv.nr, commit_argv.v, &revs, NULL);
 		revs.edge_hint = 0; /* just in case */
 
 		/* Generate a list of objects that need to be pushed */
@@ -1957,7 +1940,7 @@ int cmd_main(int argc, const char **argv)
 			printf("%s %s\n", !rc ? "ok" : "error", ref->name);
 		unlock_remote(ref_lock);
 		check_locks();
-		argv_array_clear(&commit_argv);
+		strvec_clear(&commit_argv);
 	}
 
 	/* Update remote server info if appropriate */
diff --git a/http-walker.c b/http-walker.c
index fe15e325fa..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)
 {
@@ -155,7 +153,7 @@ static void prefetch(struct walker *walker, unsigned char *sha1)
 
 	newreq = xmalloc(sizeof(*newreq));
 	newreq->walker = walker;
-	hashcpy(newreq->oid.hash, sha1);
+	oidread(&newreq->oid, sha1);
 	newreq->repo = data->alt;
 	newreq->state = WAITING;
 	newreq->req = NULL;
@@ -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);
 
@@ -439,6 +433,7 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne
 	target = find_sha1_pack(sha1, repo->packs);
 	if (!target)
 		return -1;
+	close_pack_index(target);
 
 	if (walker->get_verbosely) {
 		fprintf(stderr, "Getting pack %s\n",
@@ -447,10 +442,9 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne
 			hash_to_hex(sha1));
 	}
 
-	preq = new_http_pack_request(target, repo->base);
+	preq = new_http_pack_request(target->hash, repo->base);
 	if (preq == NULL)
 		goto abort;
-	preq->lst = &repo->packs;
 	preq->slot->results = &results;
 
 	if (start_active_slot(preq->slot)) {
@@ -469,6 +463,7 @@ static int http_fetch_pack(struct walker *walker, struct alt_base *repo, unsigne
 	release_http_pack_request(preq);
 	if (ret)
 		return ret;
+	http_install_packfile(target, &repo->packs);
 
 	return 0;
 
@@ -504,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
@@ -622,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 027a86d75d..a0f169d2fe 100644
--- a/http.c
+++ b/http.c
@@ -18,29 +18,17 @@
 
 static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);
 static int trace_curl_data = 1;
-static struct string_list cookies_to_redact = STRING_LIST_INIT_DUP;
-#if LIBCURL_VERSION_NUM >= 0x070a08
+static int trace_curl_redact = 1;
 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
 
@@ -68,15 +56,9 @@ static struct {
 	{ "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
 static const char *ssl_pinnedkey;
 #endif
@@ -86,6 +68,13 @@ static long curl_low_speed_time = -1;
 static int curl_ftp_no_epsv;
 static const char *curl_http_proxy;
 static const char *http_proxy_authmethod;
+
+static const char *http_proxy_ssl_cert;
+static const char *http_proxy_ssl_key;
+static const char *http_proxy_ssl_ca_info;
+static struct credential proxy_cert_auth = CREDENTIAL_INIT;
+static int proxy_ssl_cert_password_required;
+
 static struct {
 	const char *name;
 	long curlauth_param;
@@ -94,9 +83,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
@@ -126,31 +113,19 @@ 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;
-static struct curl_slist *extra_http_headers;
+static struct string_list extra_http_headers = STRING_LIST_INIT_DUP;
 
 static struct active_request_slot *active_queue_head;
 
@@ -179,7 +154,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;
@@ -196,7 +170,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_)
 {
@@ -230,12 +203,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);
@@ -248,12 +217,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;
@@ -281,7 +247,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)
 {
@@ -298,14 +263,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)) {
@@ -334,18 +295,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;
@@ -365,6 +322,20 @@ static int http_options(const char *var, const char *value, void *cb)
 	if (!strcmp("http.proxyauthmethod", var))
 		return git_config_string(&http_proxy_authmethod, var, value);
 
+	if (!strcmp("http.proxysslcert", var))
+		return git_config_string(&http_proxy_ssl_cert, var, value);
+
+	if (!strcmp("http.proxysslkey", var))
+		return git_config_string(&http_proxy_ssl_key, var, value);
+
+	if (!strcmp("http.proxysslcainfo", var))
+		return git_config_string(&http_proxy_ssl_ca_info, var, value);
+
+	if (!strcmp("http.proxysslcertpasswordprotected", var)) {
+		proxy_ssl_cert_password_required = git_config_bool(var, value);
+		return 0;
+	}
+
 	if (!strcmp("http.cookiefile", var))
 		return git_config_pathname(&curl_cookie_file, var, value);
 	if (!strcmp("http.savecookies", var)) {
@@ -414,11 +385,9 @@ static int http_options(const char *var, const char *value, void *cb)
 		if (!value) {
 			return config_error_nonbool(var);
 		} else if (!*value) {
-			curl_slist_free_all(extra_http_headers);
-			extra_http_headers = NULL;
+			string_list_clear(&extra_http_headers, 0);
 		} else {
-			extra_http_headers =
-				curl_slist_append(extra_http_headers, value);
+			string_list_append(&extra_http_headers, value);
 		}
 		return 0;
 	}
@@ -442,12 +411,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
@@ -460,7 +423,6 @@ static int curl_empty_auth_enabled(void)
 	if (http_auth_methods_restricted &&
 	    (http_auth_methods & ~empty_auth_useless))
 		return 1;
-#endif
 	return 0;
 }
 
@@ -474,24 +436,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 */
@@ -505,22 +451,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)
@@ -533,7 +467,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++) {
@@ -551,7 +484,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)
@@ -560,6 +492,7 @@ static int has_cert_password(void)
 		return 0;
 	if (!cert_auth.password) {
 		cert_auth.protocol = xstrdup("cert");
+		cert_auth.host = xstrdup("");
 		cert_auth.username = xstrdup("");
 		cert_auth.path = xstrdup(ssl_cert);
 		credential_fill(&cert_auth);
@@ -567,13 +500,29 @@ static int has_cert_password(void)
 	return 1;
 }
 
+#if LIBCURL_VERSION_NUM >= 0x073400
+static int has_proxy_cert_password(void)
+{
+	if (http_proxy_ssl_cert == NULL || proxy_ssl_cert_password_required != 1)
+		return 0;
+	if (!proxy_cert_auth.password) {
+		proxy_cert_auth.protocol = xstrdup("cert");
+		proxy_cert_auth.host = xstrdup("");
+		proxy_cert_auth.username = xstrdup("");
+		proxy_cert_auth.path = xstrdup(http_proxy_ssl_cert);
+		credential_fill(&proxy_cert_auth);
+	}
+	return 1;
+}
+#endif
+
 #if LIBCURL_VERSION_NUM >= 0x071900
 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;
@@ -594,20 +543,15 @@ 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)
 {
 	const char *sensitive_header;
 
-	if (skip_prefix(header->buf, "Authorization:", &sensitive_header) ||
-	    skip_prefix(header->buf, "Proxy-Authorization:", &sensitive_header)) {
+	if (trace_curl_redact &&
+	    (skip_prefix(header->buf, "Authorization:", &sensitive_header) ||
+	     skip_prefix(header->buf, "Proxy-Authorization:", &sensitive_header))) {
 		/* The first token is the type, which is OK to log */
 		while (isspace(*sensitive_header))
 			sensitive_header++;
@@ -616,20 +560,15 @@ static void redact_sensitive_header(struct strbuf *header)
 		/* Everything else is opaque and possibly sensitive */
 		strbuf_setlen(header,  sensitive_header - header->buf);
 		strbuf_addstr(header, " <redacted>");
-	} else if (cookies_to_redact.nr &&
+	} else if (trace_curl_redact &&
 		   skip_prefix(header->buf, "Cookie:", &sensitive_header)) {
 		struct strbuf redacted_header = STRBUF_INIT;
-		char *cookie;
+		const char *cookie;
 
 		while (isspace(*sensitive_header))
 			sensitive_header++;
 
-		/*
-		 * The contents of header starting from sensitive_header will
-		 * subsequently be overridden, so it is fine to mutate this
-		 * string (hence the assignment to "char *").
-		 */
-		cookie = (char *) sensitive_header;
+		cookie = sensitive_header;
 
 		while (cookie) {
 			char *equals;
@@ -642,14 +581,8 @@ static void redact_sensitive_header(struct strbuf *header)
 				strbuf_addstr(&redacted_header, cookie);
 				continue;
 			}
-			*equals = 0; /* temporarily set to NUL for lookup */
-			if (string_list_lookup(&cookies_to_redact, cookie)) {
-				strbuf_addstr(&redacted_header, cookie);
-				strbuf_addstr(&redacted_header, "=<redacted>");
-			} else {
-				*equals = '=';
-				strbuf_addstr(&redacted_header, cookie);
-			}
+			strbuf_add(&redacted_header, cookie, equals - cookie);
+			strbuf_addstr(&redacted_header, "=<redacted>");
 			if (semicolon) {
 				/*
 				 * There are more cookies. (Or, for some
@@ -682,8 +615,8 @@ static void curl_dump_header(const char *text, unsigned char *ptr, size_t size,
 	for (header = headers; *header; header++) {
 		if (hide_sensitive_header)
 			redact_sensitive_header(*header);
-		strbuf_insert((*header), 0, text, strlen(text));
-		strbuf_insert((*header), strlen(text), ": ", 2);
+		strbuf_insertstr((*header), 0, text);
+		strbuf_insertstr((*header), strlen(text), ": ");
 		strbuf_rtrim((*header));
 		strbuf_addch((*header), '\n');
 		trace_strbuf(&trace_curl, (*header));
@@ -768,6 +701,12 @@ static int curl_trace(CURL *handle, curl_infotype type, char *data, size_t size,
 	return 0;
 }
 
+void http_trace_curl_no_data(void)
+{
+	trace_override_envvar(&trace_curl, "1");
+	trace_curl_data = 0;
+}
+
 void setup_curl_trace(CURL *handle)
 {
 	if (!trace_want(&trace_curl))
@@ -777,7 +716,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;
@@ -793,7 +731,6 @@ static long get_curl_allowed_protocols(int from_user)
 
 	return allowed_protocols;
 }
-#endif
 
 #if LIBCURL_VERSION_NUM >=0x072f00
 static int get_curl_http_version_opt(const char *version_string, long *opt)
@@ -847,12 +784,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) {
@@ -908,14 +841,10 @@ 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
 	if (ssl_pinnedkey != NULL)
 		curl_easy_setopt(result, CURLOPT_PINNEDPUBLICKEY, ssl_pinnedkey);
@@ -926,8 +855,14 @@ static CURL *get_curl_handle(void)
 #if LIBCURL_VERSION_NUM >= 0x073400
 		curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, NULL);
 #endif
-	} else if (ssl_cainfo != NULL)
-		curl_easy_setopt(result, CURLOPT_CAINFO, ssl_cainfo);
+	} 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
+		if (http_proxy_ssl_ca_info != NULL)
+			curl_easy_setopt(result, CURLOPT_PROXY_CAINFO, http_proxy_ssl_ca_info);
+#endif
+	}
 
 	if (curl_low_speed_limit > 0 && curl_low_speed_time > 0) {
 		curl_easy_setopt(result, CURLOPT_LOW_SPEED_LIMIT,
@@ -937,29 +872,18 @@ 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"))
-		curl_easy_setopt(result, CURLOPT_VERBOSE, 1L);
+		http_trace_curl_no_data();
 	setup_curl_trace(result);
 	if (getenv("GIT_TRACE_CURL_NO_DATA"))
 		trace_curl_data = 0;
-	if (getenv("GIT_REDACT_COOKIES")) {
-		string_list_split(&cookies_to_redact,
-				  getenv("GIT_REDACT_COOKIES"), ',', -1);
-		string_list_sort(&cookies_to_redact);
-	}
+	if (!git_env_bool("GIT_TRACE_REDACT", 1))
+		trace_curl_redact = 0;
 
 	curl_easy_setopt(result, CURLOPT_USERAGENT,
 		user_agent ? user_agent : git_user_agent());
@@ -967,10 +891,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
@@ -1020,9 +942,18 @@ static CURL *get_curl_handle(void)
 				CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
 #endif
 #if LIBCURL_VERSION_NUM >= 0x073400
-		else if (starts_with(curl_http_proxy, "https"))
-			curl_easy_setopt(result,
-				CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
+		else if (starts_with(curl_http_proxy, "https")) {
+			curl_easy_setopt(result, CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
+
+			if (http_proxy_ssl_cert)
+				curl_easy_setopt(result, CURLOPT_PROXY_SSLCERT, http_proxy_ssl_cert);
+
+			if (http_proxy_ssl_key)
+				curl_easy_setopt(result, CURLOPT_PROXY_SSLKEY, http_proxy_ssl_key);
+
+			if (has_proxy_cert_password())
+				curl_easy_setopt(result, CURLOPT_PROXY_KEYPASSWD, proxy_cert_auth.password);
+		}
 #endif
 		if (strstr(curl_http_proxy, "://"))
 			credential_from_url(&proxy_auth, curl_http_proxy);
@@ -1037,11 +968,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);
 
@@ -1120,7 +1049,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)
@@ -1130,18 +1058,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");
@@ -1157,10 +1080,15 @@ 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");
+	set_from_env(&http_proxy_ssl_ca_info, "GIT_PROXY_SSL_CAINFO");
+
+	if (getenv("GIT_PROXY_SSL_CERT_PASSWORD_PROTECTED"))
+		proxy_ssl_cert_password_required = 1;
 
 	if (getenv("GIT_CURL_FTP_NO_EPSV"))
 		curl_ftp_no_epsv = 1;
@@ -1173,9 +1101,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)
@@ -1193,17 +1119,12 @@ 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();
 
-	curl_slist_free_all(extra_http_headers);
-	extra_http_headers = NULL;
+	string_list_clear(&extra_http_headers, 0);
 
 	curl_slist_free_all(pragma_header);
 	pragma_header = NULL;
@@ -1233,6 +1154,12 @@ void http_cleanup(void)
 	}
 	ssl_cert_password_required = 0;
 
+	if (proxy_cert_auth.password != NULL) {
+		memset(proxy_cert_auth.password, 0, strlen(proxy_cert_auth.password));
+		FREE_AND_NULL(proxy_cert_auth.password);
+	}
+	proxy_ssl_cert_password_required = 0;
+
 	FREE_AND_NULL(cached_accept_language);
 }
 
@@ -1241,7 +1168,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 */
@@ -1250,7 +1176,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;
@@ -1273,11 +1198,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++;
 	}
 
@@ -1311,12 +1232,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);
 
@@ -1325,7 +1242,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;
 
@@ -1343,11 +1259,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 *);
@@ -1406,11 +1320,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;
@@ -1423,7 +1335,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) {
@@ -1435,10 +1346,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);
@@ -1461,12 +1368,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)
@@ -1480,9 +1381,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)
@@ -1579,9 +1478,18 @@ static int handle_curl_result(struct slot_results *results)
 
 	if (results->curl_result == CURLE_OK) {
 		credential_approve(&http_auth);
-		if (proxy_auth.password)
-			credential_approve(&proxy_auth);
+		credential_approve(&proxy_auth);
+		credential_approve(&cert_auth);
 		return HTTP_OK;
+	} else if (results->curl_result == CURLE_SSL_CERTPROBLEM) {
+		/*
+		 * We can't tell from here whether it's a bad path, bad
+		 * certificate, bad password, or something else wrong
+		 * with the certificate.  So we reject the credential to
+		 * avoid caching or saving a bad password.
+		 */
+		credential_reject(&cert_auth);
+		return HTTP_NOAUTH;
 	} else if (missing_target(results))
 		return HTTP_MISSING_TARGET;
 	else if (results->http_code == 401) {
@@ -1589,24 +1497,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;
 	}
 }
@@ -1627,10 +1531,11 @@ int run_one_slot(struct active_request_slot *slot,
 
 struct curl_slist *http_copy_default_headers(void)
 {
-	struct curl_slist *headers = NULL, *h;
+	struct curl_slist *headers = NULL;
+	const struct string_list_item *item;
 
-	for (h = extra_http_headers; h; h = h->next)
-		headers = curl_slist_append(headers, h->data);
+	for_each_string_list_item(item, &extra_http_headers)
+		headers = curl_slist_append(headers, item->string);
 
 	return headers;
 }
@@ -1864,7 +1769,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);
@@ -2202,72 +2107,77 @@ void release_http_pack_request(struct http_pack_request *preq)
 	free(preq);
 }
 
+static const char *default_index_pack_args[] =
+	{"index-pack", "--stdin", NULL};
+
 int finish_http_pack_request(struct http_pack_request *preq)
 {
-	struct packed_git **lst;
-	struct packed_git *p = preq->target;
-	char *tmp_idx;
-	size_t len;
 	struct child_process ip = CHILD_PROCESS_INIT;
-
-	close_pack_index(p);
+	int tmpfile_fd;
+	int ret = 0;
 
 	fclose(preq->packfile);
 	preq->packfile = NULL;
 
-	lst = preq->lst;
-	while (*lst != p)
-		lst = &((*lst)->next);
-	*lst = (*lst)->next;
-
-	if (!strip_suffix(preq->tmpfile.buf, ".pack.temp", &len))
-		BUG("pack tmpfile does not end in .pack.temp?");
-	tmp_idx = xstrfmt("%.*s.idx.temp", (int)len, preq->tmpfile.buf);
+	tmpfile_fd = xopen(preq->tmpfile.buf, O_RDONLY);
 
-	argv_array_push(&ip.args, "index-pack");
-	argv_array_pushl(&ip.args, "-o", tmp_idx, NULL);
-	argv_array_push(&ip.args, preq->tmpfile.buf);
 	ip.git_cmd = 1;
-	ip.no_stdin = 1;
-	ip.no_stdout = 1;
+	ip.in = tmpfile_fd;
+	ip.argv = preq->index_pack_args ? preq->index_pack_args
+					: default_index_pack_args;
+
+	if (preq->preserve_index_pack_stdout)
+		ip.out = 0;
+	else
+		ip.no_stdout = 1;
 
 	if (run_command(&ip)) {
-		unlink(preq->tmpfile.buf);
-		unlink(tmp_idx);
-		free(tmp_idx);
-		return -1;
+		ret = -1;
+		goto cleanup;
 	}
 
-	unlink(sha1_pack_index_name(p->hash));
+cleanup:
+	close(tmpfile_fd);
+	unlink(preq->tmpfile.buf);
+	return ret;
+}
 
-	if (finalize_object_file(preq->tmpfile.buf, sha1_pack_name(p->hash))
-	 || finalize_object_file(tmp_idx, sha1_pack_index_name(p->hash))) {
-		free(tmp_idx);
-		return -1;
-	}
+void http_install_packfile(struct packed_git *p,
+			   struct packed_git **list_to_remove_from)
+{
+	struct packed_git **lst = list_to_remove_from;
+
+	while (*lst != p)
+		lst = &((*lst)->next);
+	*lst = (*lst)->next;
 
 	install_packed_git(the_repository, p);
-	free(tmp_idx);
-	return 0;
 }
 
 struct http_pack_request *new_http_pack_request(
-	struct packed_git *target, const char *base_url)
+	const unsigned char *packed_git_hash, const char *base_url) {
+
+	struct strbuf buf = STRBUF_INIT;
+
+	end_url_with_slash(&buf, base_url);
+	strbuf_addf(&buf, "objects/pack/pack-%s.pack",
+		hash_to_hex(packed_git_hash));
+	return new_direct_http_pack_request(packed_git_hash,
+					    strbuf_detach(&buf, NULL));
+}
+
+struct http_pack_request *new_direct_http_pack_request(
+	const unsigned char *packed_git_hash, char *url)
 {
 	off_t prev_posn = 0;
-	struct strbuf buf = STRBUF_INIT;
 	struct http_pack_request *preq;
 
-	preq = xcalloc(1, sizeof(*preq));
+	CALLOC_ARRAY(preq, 1);
 	strbuf_init(&preq->tmpfile, 0);
-	preq->target = target;
 
-	end_url_with_slash(&buf, base_url);
-	strbuf_addf(&buf, "objects/pack/pack-%s.pack",
-		hash_to_hex(target->hash));
-	preq->url = strbuf_detach(&buf, NULL);
+	preq->url = url;
 
-	strbuf_addf(&preq->tmpfile, "%s.temp", sha1_pack_name(target->hash));
+	strbuf_addf(&preq->tmpfile, "%s.temp", sha1_pack_name(packed_git_hash));
 	preq->packfile = fopen(preq->tmpfile.buf, "a");
 	if (!preq->packfile) {
 		error("Unable to open local file %s for pack",
@@ -2276,7 +2186,7 @@ struct http_pack_request *new_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,
@@ -2291,7 +2201,7 @@ struct http_pack_request *new_http_pack_request(
 		if (http_is_verbose)
 			fprintf(stderr,
 				"Resuming fetch of pack %s at byte %"PRIuMAX"\n",
-				hash_to_hex(target->hash),
+				hash_to_hex(packed_git_hash),
 				(uintmax_t)prev_posn);
 		http_opt_request_remainder(preq->slot->curl, prev_posn);
 	}
@@ -2357,7 +2267,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
 	off_t prev_posn = 0;
 	struct http_object_request *freq;
 
-	freq = xcalloc(1, sizeof(*freq));
+	CALLOC_ARRAY(freq, 1);
 	strbuf_init(&freq->tmpfile, 0);
 	oidcpy(&freq->oid, oid);
 	freq->localfile = -1;
@@ -2447,7 +2357,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);
@@ -2504,7 +2414,7 @@ int finish_http_object_request(struct http_object_request *freq)
 	}
 
 	git_inflate_end(&freq->stream);
-	the_hash_algo->final_fn(freq->real_oid.hash, &freq->c);
+	the_hash_algo->final_oid_fn(&freq->real_oid, &freq->c);
 	if (freq->zret != Z_STREAM_END) {
 		unlink_or_warn(freq->tmpfile.buf);
 		return -1;
diff --git a/http.h b/http.h
index 5e0ad724f9..3db5a0cf32 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);
@@ -216,18 +170,36 @@ int http_get_info_packs(const char *base_url,
 
 struct http_pack_request {
 	char *url;
-	struct packed_git *target;
-	struct packed_git **lst;
+
+	/*
+	 * index-pack command to run. Must be terminated by NULL.
+	 *
+	 * If NULL, defaults to	{"index-pack", "--stdin", NULL}.
+	 */
+	const char **index_pack_args;
+	unsigned preserve_index_pack_stdout : 1;
+
 	FILE *packfile;
 	struct strbuf tmpfile;
 	struct active_request_slot *slot;
 };
 
 struct http_pack_request *new_http_pack_request(
-	struct packed_git *target, const char *base_url);
+	const unsigned char *packed_git_hash, const char *base_url);
+struct http_pack_request *new_direct_http_pack_request(
+	const unsigned char *packed_git_hash, char *url);
 int finish_http_pack_request(struct http_pack_request *preq);
 void release_http_pack_request(struct http_pack_request *preq);
 
+/*
+ * Remove p from the given list, and invoke install_packed_git() on it.
+ *
+ * This is a convenience function for users that have obtained a list of packs
+ * from http_get_info_packs() and have chosen a specific pack to fetch.
+ */
+void http_install_packfile(struct packed_git *p,
+			   struct packed_git **list_to_remove_from);
+
 /* Helpers for fetching object */
 struct http_object_request {
 	char *url;
@@ -252,6 +224,13 @@ int finish_http_object_request(struct http_object_request *freq);
 void abort_http_object_request(struct http_object_request *freq);
 void release_http_object_request(struct http_object_request *freq);
 
+/*
+ * Instead of using environment variables to determine if curl tracing happens,
+ * behave as if GIT_TRACE_CURL=1 and GIT_TRACE_CURL_NO_DATA=1 is set. Call this
+ * before calling setup_curl_trace().
+ */
+void http_trace_curl_no_data(void);
+
 /* setup routine for curl_easy_setopt CURLOPT_DEBUGFUNCTION */
 void setup_curl_trace(CURL *handle);
 #endif /* HTTP_H */
diff --git a/ident.c b/ident.c
index e666ee4e59..6aba4b5cb6 100644
--- a/ident.c
+++ b/ident.c
@@ -345,27 +345,45 @@ person_only:
 	return 0;
 }
 
-static const char *env_hint =
-N_("\n"
-   "*** Please tell me who you are.\n"
-   "\n"
-   "Run\n"
-   "\n"
-   "  git config --global user.email \"you@example.com\"\n"
-   "  git config --global user.name \"Your Name\"\n"
-   "\n"
-   "to set your account\'s default identity.\n"
-   "Omit --global to set the identity only in this repository.\n"
-   "\n");
+
+static void ident_env_hint(enum want_ident whose_ident)
+{
+	switch (whose_ident) {
+	case WANT_AUTHOR_IDENT:
+		fputs(_("Author identity unknown\n"), stderr);
+		break;
+	case WANT_COMMITTER_IDENT:
+		fputs(_("Committer identity unknown\n"), stderr);
+		break;
+	default:
+		break;
+	}
+
+	fputs(_("\n"
+		"*** Please tell me who you are.\n"
+		"\n"
+		"Run\n"
+		"\n"
+		"  git config --global user.email \"you@example.com\"\n"
+		"  git config --global user.name \"Your Name\"\n"
+		"\n"
+		"to set your account\'s default identity.\n"
+		"Omit --global to set the identity only in this repository.\n"
+		"\n"), stderr);
+}
 
 const char *fmt_ident(const char *name, const char *email,
 		      enum want_ident whose_ident, const char *date_str, int flag)
 {
-	static struct strbuf ident = STRBUF_INIT;
+	static int index;
+	static struct strbuf ident_pool[2] = { STRBUF_INIT, STRBUF_INIT };
 	int strict = (flag & IDENT_STRICT);
 	int want_date = !(flag & IDENT_NO_DATE);
 	int want_name = !(flag & IDENT_NO_NAME);
 
+	struct strbuf *ident = &ident_pool[index];
+	index = (index + 1) % ARRAY_SIZE(ident_pool);
+
 	if (!email) {
 		if (whose_ident == WANT_AUTHOR_IDENT && git_author_email.len)
 			email = git_author_email.buf;
@@ -375,12 +393,12 @@ const char *fmt_ident(const char *name, const char *email,
 	if (!email) {
 		if (strict && ident_use_config_only
 		    && !(ident_config_given & IDENT_MAIL_GIVEN)) {
-			fputs(_(env_hint), stderr);
+			ident_env_hint(whose_ident);
 			die(_("no email was given and auto-detection is disabled"));
 		}
 		email = ident_default_email();
 		if (strict && default_email_is_bogus) {
-			fputs(_(env_hint), stderr);
+			ident_env_hint(whose_ident);
 			die(_("unable to auto-detect email address (got '%s')"), email);
 		}
 	}
@@ -397,13 +415,13 @@ const char *fmt_ident(const char *name, const char *email,
 		if (!name) {
 			if (strict && ident_use_config_only
 			    && !(ident_config_given & IDENT_NAME_GIVEN)) {
-				fputs(_(env_hint), stderr);
+				ident_env_hint(whose_ident);
 				die(_("no name was given and auto-detection is disabled"));
 			}
 			name = ident_default_name();
 			using_default = 1;
 			if (strict && default_name_is_bogus) {
-				fputs(_(env_hint), stderr);
+				ident_env_hint(whose_ident);
 				die(_("unable to auto-detect name (got '%s')"), name);
 			}
 		}
@@ -411,7 +429,7 @@ const char *fmt_ident(const char *name, const char *email,
 			struct passwd *pw;
 			if (strict) {
 				if (using_default)
-					fputs(_(env_hint), stderr);
+					ident_env_hint(whose_ident);
 				die(_("empty ident name (for <%s>) not allowed"), email);
 			}
 			pw = xgetpwuid_self(NULL);
@@ -421,25 +439,25 @@ const char *fmt_ident(const char *name, const char *email,
 			die(_("name consists only of disallowed characters: %s"), name);
 	}
 
-	strbuf_reset(&ident);
+	strbuf_reset(ident);
 	if (want_name) {
-		strbuf_addstr_without_crud(&ident, name);
-		strbuf_addstr(&ident, " <");
+		strbuf_addstr_without_crud(ident, name);
+		strbuf_addstr(ident, " <");
 	}
-	strbuf_addstr_without_crud(&ident, email);
+	strbuf_addstr_without_crud(ident, email);
 	if (want_name)
-			strbuf_addch(&ident, '>');
+		strbuf_addch(ident, '>');
 	if (want_date) {
-		strbuf_addch(&ident, ' ');
+		strbuf_addch(ident, ' ');
 		if (date_str && date_str[0]) {
-			if (parse_date(date_str, &ident) < 0)
+			if (parse_date(date_str, ident) < 0)
 				die(_("invalid date format: %s"), date_str);
 		}
 		else
-			strbuf_addstr(&ident, ident_default_date());
+			strbuf_addstr(ident, ident_default_date());
 	}
 
-	return ident.buf;
+	return ident->buf;
 }
 
 const char *fmt_name(enum want_ident whose_ident)
diff --git a/imap-send.c b/imap-send.c
index 6c54d8c29d..49a5f8aa59 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -84,17 +84,17 @@ static int nfvasprintf(char **strp, const char *fmt, va_list ap)
 }
 
 struct imap_server_conf {
-	char *name;
-	char *tunnel;
-	char *host;
+	const char *name;
+	const char *tunnel;
+	const char *host;
 	int port;
-	char *folder;
-	char *user;
-	char *pass;
+	const char *folder;
+	const char *user;
+	const char *pass;
 	int use_ssl;
 	int ssl_verify;
 	int use_html;
-	char *auth_method;
+	const char *auth_method;
 };
 
 static struct imap_server_conf server = {
@@ -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;
@@ -955,7 +958,7 @@ static void server_fill_credential(struct imap_server_conf *srvc, struct credent
 		srvc->pass = xstrdup(cred->password);
 }
 
-static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *folder)
+static struct imap_store *imap_open_store(struct imap_server_conf *srvc, const char *folder)
 {
 	struct credential cred = CREDENTIAL_INIT;
 	struct imap_store *ctx;
@@ -963,9 +966,9 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
 	char *arg, *rsp;
 	int s = -1, preauth;
 
-	ctx = xcalloc(1, sizeof(*ctx));
+	CALLOC_ARRAY(ctx, 1);
 
-	ctx->imap = imap = xcalloc(1, sizeof(*imap));
+	ctx->imap = CALLOC_ARRAY(imap, 1);
 	imap->buf.sock.fd[0] = imap->buf.sock.fd[1] = -1;
 	imap->in_progress_append = &imap->in_progress;
 
@@ -976,7 +979,7 @@ static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *f
 
 		imap_info("Starting tunnel '%s'... ", srvc->tunnel);
 
-		argv_array_push(&tunnel.args, srvc->tunnel);
+		strvec_push(&tunnel.args, srvc->tunnel);
 		tunnel.use_shell = 1;
 		tunnel.in = -1;
 		tunnel.out = -1;
@@ -1266,18 +1269,6 @@ static void wrap_in_html(struct strbuf *msg)
 	*msg = buf;
 }
 
-#define CHUNKSIZE 0x1000
-
-static int read_message(FILE *f, struct strbuf *all_msgs)
-{
-	do {
-		if (strbuf_fread(all_msgs, CHUNKSIZE, f) <= 0)
-			break;
-	} while (!feof(f));
-
-	return ferror(f) ? -1 : 0;
-}
-
 static int count_messages(struct strbuf *all_msgs)
 {
 	int count = 0;
@@ -1338,15 +1329,26 @@ static int split_msg(struct strbuf *all_msgs, struct strbuf *msg, int *ofs)
 	return 1;
 }
 
-static void git_imap_config(void)
+static int git_imap_config(const char *var, const char *val, void *cb)
 {
-	const char *val = NULL;
-
-	git_config_get_bool("imap.sslverify", &server.ssl_verify);
-	git_config_get_bool("imap.preformattedhtml", &server.use_html);
-	git_config_get_string("imap.folder", &server.folder);
 
-	if (!git_config_get_value("imap.host", &val)) {
+	if (!strcmp("imap.sslverify", var))
+		server.ssl_verify = git_config_bool(var, val);
+	else if (!strcmp("imap.preformattedhtml", var))
+		server.use_html = git_config_bool(var, val);
+	else if (!strcmp("imap.folder", var))
+		return git_config_string(&server.folder, var, val);
+	else if (!strcmp("imap.user", var))
+		return git_config_string(&server.user, var, val);
+	else if (!strcmp("imap.pass", var))
+		return git_config_string(&server.pass, var, val);
+	else if (!strcmp("imap.tunnel", var))
+		return git_config_string(&server.tunnel, var, val);
+	else if (!strcmp("imap.authmethod", var))
+		return git_config_string(&server.auth_method, var, val);
+	else if (!strcmp("imap.port", var))
+		server.port = git_config_int(var, val);
+	else if (!strcmp("imap.host", var)) {
 		if (!val) {
 			git_die_config("imap.host", "Missing value for 'imap.host'");
 		} else {
@@ -1360,13 +1362,10 @@ static void git_imap_config(void)
 				val += 2;
 			server.host = xstrdup(val);
 		}
-	}
+	} else
+		return git_default_config(var, val, cb);
 
-	git_config_get_string("imap.user", &server.user);
-	git_config_get_string("imap.pass", &server.pass);
-	git_config_get_int("imap.port", &server.port);
-	git_config_get_string("imap.tunnel", &server.tunnel);
-	git_config_get_string("imap.authmethod", &server.auth_method);
+	return 0;
 }
 
 static int append_msgs_to_imap(struct imap_server_conf *server,
@@ -1464,7 +1463,7 @@ static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred)
 	curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);
 
 	if (0 < verbosity || getenv("GIT_CURL_VERBOSE"))
-		curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
+		http_trace_curl_no_data();
 	setup_curl_trace(curl);
 
 	return curl;
@@ -1518,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);
 	}
 
@@ -1539,7 +1534,7 @@ int cmd_main(int argc, const char **argv)
 	int nongit_ok;
 
 	setup_git_directory_gently(&nongit_ok);
-	git_imap_config();
+	git_config(git_imap_config, NULL);
 
 	argc = parse_options(argc, (const char **)argv, "", imap_send_options, imap_send_usage, 0);
 
@@ -1574,8 +1569,8 @@ int cmd_main(int argc, const char **argv)
 	}
 
 	/* read the messages */
-	if (read_message(stdin, &all_msgs)) {
-		fprintf(stderr, "error reading input\n");
+	if (strbuf_read(&all_msgs, 0, 0) < 0) {
+		error_errno(_("could not read from stdin"));
 		return 1;
 	}
 
diff --git a/interdiff.c b/interdiff.c
deleted file mode 100644
index c81d680a6c..0000000000
--- a/interdiff.c
+++ /dev/null
@@ -1,28 +0,0 @@
-#include "cache.h"
-#include "commit.h"
-#include "revision.h"
-#include "interdiff.h"
-
-static struct strbuf *idiff_prefix_cb(struct diff_options *opt, void *data)
-{
-	return data;
-}
-
-void show_interdiff(struct rev_info *rev, int indent)
-{
-	struct diff_options opts;
-	struct strbuf prefix = STRBUF_INIT;
-
-	memcpy(&opts, &rev->diffopt, sizeof(opts));
-	opts.output_format = DIFF_FORMAT_PATCH;
-	opts.output_prefix = idiff_prefix_cb;
-	strbuf_addchars(&prefix, ' ', indent);
-	opts.output_prefix_data = &prefix;
-	diff_setup_done(&opts);
-
-	diff_tree_oid(rev->idiff_oid1, rev->idiff_oid2, "", &opts);
-	diffcore_std(&opts);
-	diff_flush(&opts);
-
-	strbuf_release(&prefix);
-}
diff --git a/interdiff.h b/interdiff.h
deleted file mode 100644
index 01c730a5c9..0000000000
--- a/interdiff.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef INTERDIFF_H
-#define INTERDIFF_H
-
-struct rev_info;
-
-void show_interdiff(struct rev_info *, int indent);
-
-#endif
diff --git a/json-writer.c b/json-writer.c
index aadb9dbddc..f1cfd8fa8c 100644
--- a/json-writer.c
+++ b/json-writer.c
@@ -3,10 +3,8 @@
 
 void jw_init(struct json_writer *jw)
 {
-	strbuf_init(&jw->json, 0);
-	strbuf_init(&jw->open_stack, 0);
-	jw->need_comma = 0;
-	jw->pretty = 0;
+	struct json_writer blank = JSON_WRITER_INIT;
+	memcpy(jw, &blank, sizeof(*jw));;
 }
 
 void jw_release(struct json_writer *jw)
diff --git a/json-writer.h b/json-writer.h
index 83906b09c1..209355e0f1 100644
--- a/json-writer.h
+++ b/json-writer.h
@@ -64,7 +64,10 @@ struct json_writer
 	unsigned int pretty:1;
 };
 
-#define JSON_WRITER_INIT { STRBUF_INIT, STRBUF_INIT, 0, 0 }
+#define JSON_WRITER_INIT { \
+	.json = STRBUF_INIT, \
+	.open_stack = STRBUF_INIT, \
+}
 
 void jw_init(struct json_writer *jw);
 void jw_release(struct json_writer *jw);
diff --git a/khash.h b/khash.h
index 21c2095216..cb79bf8856 100644
--- a/khash.h
+++ b/khash.h
@@ -74,7 +74,7 @@ static const double __ac_HASH_UPPER = 0.77;
 	void kh_destroy_##name(kh_##name##_t *h);					\
 	void kh_clear_##name(kh_##name##_t *h);						\
 	khint_t kh_get_##name(const kh_##name##_t *h, khkey_t key); \
-	int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
+	void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets); \
 	khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret); \
 	void kh_del_##name(kh_##name##_t *h, khint_t x);
 
@@ -116,7 +116,7 @@ static const double __ac_HASH_UPPER = 0.77;
 			return __ac_iseither(h->flags, i)? h->n_buckets : i;		\
 		} else return 0;												\
 	}																	\
-	SCOPE int kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
+	SCOPE void kh_resize_##name(kh_##name##_t *h, khint_t new_n_buckets) \
 	{ /* This function uses 0.25*n_buckets bytes of working space instead of [sizeof(key_t+val_t)+.25]*n_buckets. */ \
 		khint32_t *new_flags = NULL;										\
 		khint_t j = 1;													\
@@ -126,7 +126,6 @@ static const double __ac_HASH_UPPER = 0.77;
 			if (h->size >= (khint_t)(new_n_buckets * __ac_HASH_UPPER + 0.5)) j = 0;	/* requested size is too small */ \
 			else { /* hash table size to be changed (shrink or expand); rehash */ \
 				ALLOC_ARRAY(new_flags, __ac_fsize(new_n_buckets)); \
-				if (!new_flags) return -1;								\
 				memset(new_flags, 0xaa, __ac_fsize(new_n_buckets) * sizeof(khint32_t)); \
 				if (h->n_buckets < new_n_buckets) {	/* expand */		\
 					REALLOC_ARRAY(h->keys, new_n_buckets); \
@@ -173,18 +172,15 @@ static const double __ac_HASH_UPPER = 0.77;
 			h->n_occupied = h->size;									\
 			h->upper_bound = (khint_t)(h->n_buckets * __ac_HASH_UPPER + 0.5); \
 		}																\
-		return 0;														\
 	}																	\
 	SCOPE khint_t kh_put_##name(kh_##name##_t *h, khkey_t key, int *ret) \
 	{																	\
 		khint_t x;														\
 		if (h->n_occupied >= h->upper_bound) { /* update the hash table */ \
 			if (h->n_buckets > (h->size<<1)) {							\
-				if (kh_resize_##name(h, h->n_buckets - 1) < 0) { /* clear "deleted" elements */ \
-					*ret = -1; return h->n_buckets;						\
-				}														\
-			} else if (kh_resize_##name(h, h->n_buckets + 1) < 0) { /* expand the hash table */ \
-				*ret = -1; return h->n_buckets;							\
+				kh_resize_##name(h, h->n_buckets - 1); /* clear "deleted" elements */ \
+			} else { \
+				kh_resize_##name(h, h->n_buckets + 1); /* expand the hash table */ \
 			}															\
 		} /* TODO: to implement automatically shrinking; resize() already support shrinking */ \
 		{																\
diff --git a/kwset.h b/kwset.h
index df99a92178..f50ecae573 100644
--- a/kwset.h
+++ b/kwset.h
@@ -1,3 +1,6 @@
+#ifndef KWSET_H
+#define KWSET_H
+
 /* This file has been copied from commit e7ac713d^ in the GNU grep git
  * repository. A few small changes have been made to adapt the code to
  * Git.
@@ -59,3 +62,4 @@ size_t kwsexec(kwset_t, char const *, size_t, struct kwsmatch *);
 /* Deallocate the given keyword set and all its associated storage. */
 void kwsfree(kwset_t);
 
+#endif /* KWSET_H */
diff --git a/line-log.c b/line-log.c
index 9010e00950..51d93310a4 100644
--- a/line-log.c
+++ b/line-log.c
@@ -14,7 +14,8 @@
 #include "graph.h"
 #include "userdiff.h"
 #include "line-log.h"
-#include "argv-array.h"
+#include "strvec.h"
+#include "bloom.h"
 
 static void range_set_grow(struct range_set *rs, size_t extra)
 {
@@ -295,7 +296,7 @@ static void line_log_data_insert(struct line_log_data **list,
 		return;
 	}
 
-	p = xcalloc(1, sizeof(struct line_log_data));
+	CALLOC_ARRAY(p, 1);
 	p->path = path;
 	range_set_append(&p->ranges, begin, end);
 	if (ip) {
@@ -480,7 +481,7 @@ static struct commit *check_single_commit(struct rev_info *revs)
 		if (obj->flags & UNINTERESTING)
 			continue;
 		obj = deref_tag(revs->repo, obj, NULL, 0);
-		if (obj->type != OBJ_COMMIT)
+		if (!obj || obj->type != OBJ_COMMIT)
 			die("Non commit %s?", revs->pending.objects[i].name);
 		if (commit)
 			die("More than one commit to dig from: %s and %s?",
@@ -519,7 +520,7 @@ static void fill_line_ends(struct repository *r,
 	unsigned long *ends = NULL;
 	char *data = NULL;
 
-	if (diff_populate_filespec(r, spec, 0))
+	if (diff_populate_filespec(r, spec, NULL))
 		die("Cannot read blob %s", oid_to_hex(&spec->oid));
 
 	ALLOC_ARRAY(ends, size);
@@ -757,12 +758,12 @@ static void parse_pathspec_from_ranges(struct pathspec *pathspec,
 				       struct line_log_data *range)
 {
 	struct line_log_data *r;
-	struct argv_array array = ARGV_ARRAY_INIT;
+	struct strvec array = STRVEC_INIT;
 	const char **paths;
 
 	for (r = range; r; r = r->next)
-		argv_array_push(&array, r->path);
-	paths = argv_array_detach(&array);
+		strvec_push(&array, r->path);
+	paths = strvec_detach(&array);
 
 	parse_pathspec(pathspec, 0, PATHSPEC_PREFER_FULL, "", paths);
 	/* strings are now owned by pathspec */
@@ -1045,12 +1046,12 @@ static int process_diff_filepair(struct rev_info *rev,
 		return 0;
 
 	assert(pair->two->oid_valid);
-	diff_populate_filespec(rev->diffopt.repo, pair->two, 0);
+	diff_populate_filespec(rev->diffopt.repo, pair->two, NULL);
 	file_target.ptr = pair->two->data;
 	file_target.size = pair->two->size;
 
 	if (pair->one->oid_valid) {
-		diff_populate_filespec(rev->diffopt.repo, pair->one, 0);
+		diff_populate_filespec(rev->diffopt.repo, pair->one, NULL);
 		file_parent.ptr = pair->one->data;
 		file_parent.size = pair->one->size;
 	} else {
@@ -1146,6 +1147,37 @@ int line_log_print(struct rev_info *rev, struct commit *commit)
 	return 1;
 }
 
+static int bloom_filter_check(struct rev_info *rev,
+			      struct commit *commit,
+			      struct line_log_data *range)
+{
+	struct bloom_filter *filter;
+	struct bloom_key key;
+	int result = 0;
+
+	if (!commit->parents)
+		return 1;
+
+	if (!rev->bloom_filter_settings ||
+	    !(filter = get_bloom_filter(rev->repo, commit)))
+		return 1;
+
+	if (!range)
+		return 0;
+
+	while (!result && range) {
+		fill_bloom_key(range->path, strlen(range->path), &key, rev->bloom_filter_settings);
+
+		if (bloom_filter_contains(filter, &key, rev->bloom_filter_settings))
+			result = 1;
+
+		clear_bloom_key(&key);
+		range = range->next;
+	}
+
+	return result;
+}
+
 static int process_ranges_ordinary_commit(struct rev_info *rev, struct commit *commit,
 					  struct line_log_data *range)
 {
@@ -1159,6 +1191,7 @@ static int process_ranges_ordinary_commit(struct rev_info *rev, struct commit *c
 
 	queue_diffs(range, &rev->diffopt, &queue, commit, parent);
 	changed = process_all_files(&parent_range, rev, &queue, range);
+
 	if (parent)
 		add_line_range(rev, parent, parent_range);
 	free_line_log_data(parent_range);
@@ -1227,13 +1260,17 @@ static int process_ranges_merge_commit(struct rev_info *rev, struct commit *comm
 	/* NEEDSWORK leaking like a sieve */
 }
 
-static int process_ranges_arbitrary_commit(struct rev_info *rev, struct commit *commit)
+int line_log_process_ranges_arbitrary_commit(struct rev_info *rev, struct commit *commit)
 {
 	struct line_log_data *range = lookup_line_range(rev, commit);
 	int changed = 0;
 
 	if (range) {
-		if (!commit->parents || !commit->parents->next)
+		if (commit->parents && !bloom_filter_check(rev, commit, range)) {
+			struct line_log_data *prange = line_log_data_copy(range);
+			add_line_range(rev, commit->parents->item, prange);
+			clear_commit_line_range(rev, commit);
+		} else if (!commit->parents || !commit->parents->next)
 			changed = process_ranges_ordinary_commit(rev, commit, range);
 		else
 			changed = process_ranges_merge_commit(rev, commit, range);
@@ -1270,7 +1307,7 @@ int line_log_filter(struct rev_info *rev)
 	while (list) {
 		struct commit_list *to_free = NULL;
 		commit = list->item;
-		if (process_ranges_arbitrary_commit(rev, commit)) {
+		if (line_log_process_ranges_arbitrary_commit(rev, commit)) {
 			*pp = list;
 			pp = &list->next;
 		} else
diff --git a/line-log.h b/line-log.h
index 8ee7a2bd4a..82ae8d98a4 100644
--- a/line-log.h
+++ b/line-log.h
@@ -46,10 +46,7 @@ void sort_and_merge_range_set(struct range_set *);
 struct line_log_data {
 	struct line_log_data *next;
 	char *path;
-	char status;
 	struct range_set ranges;
-	int arg_alloc, arg_nr;
-	const char **args;
 	struct diff_filepair *pair;
 	struct diff_ranges diff;
 };
@@ -57,6 +54,8 @@ struct line_log_data {
 void line_log_init(struct rev_info *rev, const char *prefix, struct string_list *args);
 
 int line_log_filter(struct rev_info *rev);
+int line_log_process_ranges_arbitrary_commit(struct rev_info *rev,
+						    struct commit *commit);
 
 int line_log_print(struct rev_info *rev, struct commit *commit);
 
diff --git a/line-range.c b/line-range.c
index 9b50583dc0..955a8a9535 100644
--- a/line-range.c
+++ b/line-range.c
@@ -202,7 +202,7 @@ static const char *parse_range_funcname(
 	drv = userdiff_find_by_path(istate, path);
 	if (drv && drv->funcname.pattern) {
 		const struct userdiff_funcname *pe = &drv->funcname;
-		xecfg = xcalloc(1, sizeof(*xecfg));
+		CALLOC_ARRAY(xecfg, 1);
 		xdiff_set_find_func(xecfg, pe->pattern, pe->cflags);
 	}
 
diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
index 256bcfbdfe..fd8d59f653 100644
--- a/list-objects-filter-options.c
+++ b/list-objects-filter-options.c
@@ -2,7 +2,7 @@
 #include "commit.h"
 #include "config.h"
 #include "revision.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "list-objects.h"
 #include "list-objects-filter.h"
 #include "list-objects-filter-options.h"
@@ -15,6 +15,31 @@ static int parse_combine_filter(
 	const char *arg,
 	struct strbuf *errbuf);
 
+const char *list_object_filter_config_name(enum list_objects_filter_choice c)
+{
+	switch (c) {
+	case LOFC_DISABLED:
+		/* we have no name for "no filter at all" */
+		break;
+	case LOFC_BLOB_NONE:
+		return "blob:none";
+	case LOFC_BLOB_LIMIT:
+		return "blob:limit";
+	case LOFC_TREE_DEPTH:
+		return "tree";
+	case LOFC_SPARSE_OID:
+		return "sparse:oid";
+	case LOFC_OBJECT_TYPE:
+		return "object:type";
+	case LOFC_COMBINE:
+		return "combine";
+	case LOFC__COUNT:
+		/* not a real filter type; just the count of all filters */
+		break;
+	}
+	BUG("list_object_filter_config_name: invalid argument '%d'", c);
+}
+
 /*
  * Parse value of the argument to the "filter" keyword.
  * On the command line this looks like:
@@ -74,6 +99,19 @@ static int gently_parse_list_objects_filter(
 		}
 		return 1;
 
+	} else if (skip_prefix(arg, "object:type=", &v0)) {
+		int type = type_from_string_gently(v0, strlen(v0), 1);
+		if (type < 0) {
+			strbuf_addf(errbuf, _("'%s' for 'object:type=<type>' is "
+					      "not a valid object type"), v0);
+			return 1;
+		}
+
+		filter_options->object_type = type;
+		filter_options->choice = LOFC_OBJECT_TYPE;
+
+		return 0;
+
 	} else if (skip_prefix(arg, "combine:", &v0)) {
 		return parse_combine_filter(filter_options, v0, errbuf);
 
@@ -321,12 +359,21 @@ void partial_clone_register(
 	const char *remote,
 	struct list_objects_filter_options *filter_options)
 {
+	struct promisor_remote *promisor_remote;
 	char *cfg_name;
 	char *filter_name;
 
 	/* Check if it is already registered */
-	if (!promisor_remote_find(remote)) {
-		git_config_set("core.repositoryformatversion", "1");
+	if ((promisor_remote = promisor_remote_find(remote))) {
+		if (promisor_remote->partial_clone_filter)
+			/*
+			 * Remote is already registered and a filter is already
+			 * set, so we don't need to do anything here.
+			 */
+			return;
+	} else {
+		if (upgrade_repository_format(1) < 0)
+			die(_("unable to upgrade repository format to support partial clone"));
 
 		/* Add promisor config for the remote */
 		cfg_name = xstrfmt("remote.%s.promisor", remote);
diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
index 2ffb39222c..da5b6737e2 100644
--- a/list-objects-filter-options.h
+++ b/list-objects-filter-options.h
@@ -1,6 +1,7 @@
 #ifndef LIST_OBJECTS_FILTER_OPTIONS_H
 #define LIST_OBJECTS_FILTER_OPTIONS_H
 
+#include "cache.h"
 #include "parse-options.h"
 #include "string-list.h"
 
@@ -13,10 +14,17 @@ enum list_objects_filter_choice {
 	LOFC_BLOB_LIMIT,
 	LOFC_TREE_DEPTH,
 	LOFC_SPARSE_OID,
+	LOFC_OBJECT_TYPE,
 	LOFC_COMBINE,
 	LOFC__COUNT /* must be last */
 };
 
+/*
+ * Returns a configuration key suitable for describing the given object filter,
+ * e.g.: "blob:none", "combine", etc.
+ */
+const char *list_object_filter_config_name(enum list_objects_filter_choice c);
+
 struct list_objects_filter_options {
 	/*
 	 * 'filter_spec' is the raw argument value given on the command line
@@ -48,6 +56,7 @@ struct list_objects_filter_options {
 	char *sparse_oid_name;
 	unsigned long blob_limit_value;
 	unsigned long tree_exclude_depth;
+	enum object_type object_type;
 
 	/* LOFC_COMBINE values */
 
@@ -82,9 +91,9 @@ int opt_parse_list_objects_filter(const struct option *opt,
 				  const char *arg, int unset);
 
 #define OPT_PARSE_LIST_OBJECTS_FILTER(fo) \
-	{ OPTION_CALLBACK, 0, CL_ARG__FILTER, fo, N_("args"), \
-	  N_("object filtering"), 0, \
-	  opt_parse_list_objects_filter }
+	OPT_CALLBACK(0, CL_ARG__FILTER, fo, N_("args"), \
+	  N_("object filtering"), \
+	  opt_parse_list_objects_filter)
 
 /*
  * Translates abbreviated numbers in the filter's filter_spec into their
diff --git a/list-objects-filter.c b/list-objects-filter.c
index 1e8d4e763d..1c1ee3d1bb 100644
--- a/list-objects-filter.c
+++ b/list-objects-filter.c
@@ -21,7 +21,7 @@
  * in the traversal (until we mark it SEEN).  This is a way to
  * let us silently de-dup calls to show() in the caller.  This
  * is subtly different from the "revision.h:SHOWN" and the
- * "sha1-name.c:ONELINE_SEEN" bits.  And also different from
+ * "object-name.c:ONELINE_SEEN" bits.  And also different from
  * the non-de-dup usage in pack-bitmap.c
  */
 #define FILTER_SHOWN_BUT_REVISIT (1<<21)
@@ -82,6 +82,16 @@ static enum list_objects_filter_result filter_blobs_none(
 	default:
 		BUG("unknown filter_situation: %d", filter_situation);
 
+	case LOFS_TAG:
+		assert(obj->type == OBJ_TAG);
+		/* always include all tag objects */
+		return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
+	case LOFS_COMMIT:
+		assert(obj->type == OBJ_COMMIT);
+		/* always include all commit objects */
+		return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
 	case LOFS_BEGIN_TREE:
 		assert(obj->type == OBJ_TREE);
 		/* always include all tree objects */
@@ -173,6 +183,16 @@ static enum list_objects_filter_result filter_trees_depth(
 	default:
 		BUG("unknown filter_situation: %d", filter_situation);
 
+	case LOFS_TAG:
+		assert(obj->type == OBJ_TAG);
+		/* always include all tag objects */
+		return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
+	case LOFS_COMMIT:
+		assert(obj->type == OBJ_COMMIT);
+		/* always include all commit objects */
+		return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
 	case LOFS_END_TREE:
 		assert(obj->type == OBJ_TREE);
 		filter_data->current_depth--;
@@ -186,7 +206,7 @@ static enum list_objects_filter_result filter_trees_depth(
 		seen_info = oidmap_get(
 			&filter_data->seen_at_depth, &obj->oid);
 		if (!seen_info) {
-			seen_info = xcalloc(1, sizeof(*seen_info));
+			CALLOC_ARRAY(seen_info, 1);
 			oidcpy(&seen_info->base.oid, &obj->oid);
 			seen_info->depth = filter_data->current_depth;
 			oidmap_put(&filter_data->seen_at_depth, seen_info);
@@ -267,6 +287,16 @@ static enum list_objects_filter_result filter_blobs_limit(
 	default:
 		BUG("unknown filter_situation: %d", filter_situation);
 
+	case LOFS_TAG:
+		assert(obj->type == OBJ_TAG);
+		/* always include all tag objects */
+		return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
+	case LOFS_COMMIT:
+		assert(obj->type == OBJ_COMMIT);
+		/* always include all commit objects */
+		return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
 	case LOFS_BEGIN_TREE:
 		assert(obj->type == OBJ_TREE);
 		/* always include all tree objects */
@@ -371,6 +401,16 @@ static enum list_objects_filter_result filter_sparse(
 	default:
 		BUG("unknown filter_situation: %d", filter_situation);
 
+	case LOFS_TAG:
+		assert(obj->type == OBJ_TAG);
+		/* always include all tag objects */
+		return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
+	case LOFS_COMMIT:
+		assert(obj->type == OBJ_COMMIT);
+		/* always include all commit objects */
+		return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
 	case LOFS_BEGIN_TREE:
 		assert(obj->type == OBJ_TREE);
 		dtype = DT_DIR;
@@ -505,6 +545,81 @@ static void filter_sparse_oid__init(
 	filter->free_fn = filter_sparse_free;
 }
 
+/*
+ * A filter for list-objects to omit large blobs.
+ * And to OPTIONALLY collect a list of the omitted OIDs.
+ */
+struct filter_object_type_data {
+	enum object_type object_type;
+};
+
+static enum list_objects_filter_result filter_object_type(
+	struct repository *r,
+	enum list_objects_filter_situation filter_situation,
+	struct object *obj,
+	const char *pathname,
+	const char *filename,
+	struct oidset *omits,
+	void *filter_data_)
+{
+	struct filter_object_type_data *filter_data = filter_data_;
+
+	switch (filter_situation) {
+	default:
+		BUG("unknown filter_situation: %d", filter_situation);
+
+	case LOFS_TAG:
+		assert(obj->type == OBJ_TAG);
+		if (filter_data->object_type == OBJ_TAG)
+			return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+		return LOFR_MARK_SEEN;
+
+	case LOFS_COMMIT:
+		assert(obj->type == OBJ_COMMIT);
+		if (filter_data->object_type == OBJ_COMMIT)
+			return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+		return LOFR_MARK_SEEN;
+
+	case LOFS_BEGIN_TREE:
+		assert(obj->type == OBJ_TREE);
+
+		/*
+		 * If we only want to show commits or tags, then there is no
+		 * need to walk down trees.
+		 */
+		if (filter_data->object_type == OBJ_COMMIT ||
+		    filter_data->object_type == OBJ_TAG)
+			return LOFR_SKIP_TREE;
+
+		if (filter_data->object_type == OBJ_TREE)
+			return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
+		return LOFR_MARK_SEEN;
+
+	case LOFS_BLOB:
+		assert(obj->type == OBJ_BLOB);
+
+		if (filter_data->object_type == OBJ_BLOB)
+			return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+		return LOFR_MARK_SEEN;
+
+	case LOFS_END_TREE:
+		return LOFR_ZERO;
+	}
+}
+
+static void filter_object_type__init(
+	struct list_objects_filter_options *filter_options,
+	struct filter *filter)
+{
+	struct filter_object_type_data *d = xcalloc(1, sizeof(*d));
+	d->object_type = filter_options->object_type;
+
+	filter->filter_data = d;
+	filter->filter_object_fn = filter_object_type;
+	filter->free_fn = free;
+}
+
 /* A filter which only shows objects shown by all sub-filters. */
 struct combine_filter_data {
 	struct subfilter *sub;
@@ -626,7 +741,7 @@ static void filter_combine__init(
 	size_t sub;
 
 	d->nr = filter_options->sub_nr;
-	d->sub = xcalloc(d->nr, sizeof(*d->sub));
+	CALLOC_ARRAY(d->sub, d->nr);
 	for (sub = 0; sub < d->nr; sub++)
 		d->sub[sub].filter = list_objects_filter__init(
 			filter->omits ? &d->sub[sub].omits : NULL,
@@ -651,6 +766,7 @@ static filter_init_fn s_filters[] = {
 	filter_blobs_limit__init,
 	filter_trees_depth__init,
 	filter_sparse_oid__init,
+	filter_object_type__init,
 	filter_combine__init,
 };
 
@@ -663,6 +779,9 @@ struct filter *list_objects_filter__init(
 
 	assert((sizeof(s_filters) / sizeof(s_filters[0])) == LOFC__COUNT);
 
+	if (!filter_options)
+		return NULL;
+
 	if (filter_options->choice >= LOFC__COUNT)
 		BUG("invalid list-objects filter choice: %d",
 		    filter_options->choice);
@@ -671,7 +790,7 @@ struct filter *list_objects_filter__init(
 	if (!init_fn)
 		return NULL;
 
-	filter = xcalloc(1, sizeof(*filter));
+	CALLOC_ARRAY(filter, 1);
 	filter->omits = omitted;
 	init_fn(filter_options, filter);
 	return filter;
diff --git a/list-objects-filter.h b/list-objects-filter.h
index cfd784e203..9e98814111 100644
--- a/list-objects-filter.h
+++ b/list-objects-filter.h
@@ -55,6 +55,8 @@ enum list_objects_filter_result {
 };
 
 enum list_objects_filter_situation {
+	LOFS_COMMIT,
+	LOFS_TAG,
 	LOFS_BEGIN_TREE,
 	LOFS_END_TREE,
 	LOFS_BLOB
diff --git a/list-objects.c b/list-objects.c
index e19589baa0..2f623f8211 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -164,6 +164,9 @@ static void process_tree(struct traversal_context *ctx,
 		die("bad tree object");
 	if (obj->flags & (UNINTERESTING | SEEN))
 		return;
+	if (revs->include_check_obj &&
+	    !revs->include_check_obj(&tree->object, revs->include_check_data))
+		return;
 
 	failed_parse = parse_tree_gently(tree, 1);
 	if (failed_parse) {
@@ -213,6 +216,21 @@ static void process_tree(struct traversal_context *ctx,
 	free_tree_buffer(tree);
 }
 
+static void process_tag(struct traversal_context *ctx,
+			struct tag *tag,
+			const char *name)
+{
+	enum list_objects_filter_result r;
+
+	r = list_objects_filter__filter_object(ctx->revs->repo, LOFS_TAG,
+					       &tag->object, NULL, NULL,
+					       ctx->filter);
+	if (r & LOFR_MARK_SEEN)
+		tag->object.flags |= SEEN;
+	if (r & LOFR_DO_SHOW)
+		ctx->show_object(&tag->object, name, ctx->show_data);
+}
+
 static void mark_edge_parents_uninteresting(struct commit *commit,
 					    struct rev_info *revs,
 					    show_edge_fn show_edge)
@@ -319,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;
 
@@ -334,8 +352,7 @@ static void traverse_trees_and_blobs(struct traversal_context *ctx,
 		if (obj->flags & (UNINTERESTING | SEEN))
 			continue;
 		if (obj->type == OBJ_TAG) {
-			obj->flags |= SEEN;
-			ctx->show_object(obj, name, ctx->show_data);
+			process_tag(ctx, (struct tag *)obj, name);
 			continue;
 		}
 		if (!path)
@@ -361,6 +378,12 @@ static void do_traverse(struct traversal_context *ctx)
 	strbuf_init(&csp, PATH_MAX);
 
 	while ((commit = get_revision(ctx->revs)) != NULL) {
+		enum list_objects_filter_result r;
+
+		r = list_objects_filter__filter_object(ctx->revs->repo,
+				LOFS_COMMIT, &commit->object,
+				NULL, NULL, ctx->filter);
+
 		/*
 		 * an uninteresting boundary commit may not have its tree
 		 * parsed yet, but we are not going to show them anyway
@@ -375,7 +398,11 @@ static void do_traverse(struct traversal_context *ctx)
 			die(_("unable to load root tree for commit %s"),
 			      oid_to_hex(&commit->object.oid));
 		}
-		ctx->show_commit(commit, ctx->show_data);
+
+		if (r & LOFR_MARK_SEEN)
+			commit->object.flags |= SEEN;
+		if (r & LOFR_DO_SHOW)
+			ctx->show_commit(commit, ctx->show_data);
 
 		if (ctx->revs->tree_blobs_in_commit_order)
 			/*
@@ -383,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/ll-merge.c b/ll-merge.c
index d65a8971db..261657578c 100644
--- a/ll-merge.c
+++ b/ll-merge.c
@@ -91,7 +91,9 @@ static int ll_binary_merge(const struct ll_merge_driver *drv_unused,
 	 * With -Xtheirs or -Xours, we have cleanly merged;
 	 * otherwise we got a conflict.
 	 */
-	return (opts->variant ? 0 : 1);
+	return opts->variant == XDL_MERGE_FAVOR_OURS ||
+	       opts->variant == XDL_MERGE_FAVOR_THEIRS ?
+	       0 : 1;
 }
 
 static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
@@ -136,7 +138,7 @@ static int ll_xdl_merge(const struct ll_merge_driver *drv_unused,
 
 static int ll_union_merge(const struct ll_merge_driver *drv_unused,
 			  mmbuffer_t *result,
-			  const char *path_unused,
+			  const char *path,
 			  mmfile_t *orig, const char *orig_name,
 			  mmfile_t *src1, const char *name1,
 			  mmfile_t *src2, const char *name2,
@@ -148,8 +150,8 @@ static int ll_union_merge(const struct ll_merge_driver *drv_unused,
 	assert(opts);
 	o = *opts;
 	o.variant = XDL_MERGE_FAVOR_UNION;
-	return ll_xdl_merge(drv_unused, result, path_unused,
-			    orig, NULL, src1, NULL, src2, NULL,
+	return ll_xdl_merge(drv_unused, result, path,
+			    orig, orig_name, src1, name1, src2, name2,
 			    &o, marker_size);
 }
 
@@ -247,7 +249,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
 {
 	struct ll_merge_driver *fn;
 	const char *key, *name;
-	int namelen;
+	size_t namelen;
 
 	if (!strcmp(var, "merge.default"))
 		return git_config_string(&default_ll_merge, var, value);
@@ -268,7 +270,7 @@ static int read_merge_config(const char *var, const char *value, void *cb)
 		if (!strncmp(fn->name, name, namelen) && !fn->name[namelen])
 			break;
 	if (!fn) {
-		fn = xcalloc(1, sizeof(struct ll_merge_driver));
+		CALLOC_ARRAY(fn, 1);
 		fn->name = xmemdupz(name, namelen);
 		fn->fn = ll_ext_merge;
 		*ll_user_merge_tail = fn;
diff --git a/ll-merge.h b/ll-merge.h
index e78973dd55..aceb1b2413 100644
--- a/ll-merge.h
+++ b/ll-merge.h
@@ -7,16 +7,87 @@
 
 #include "xdiff/xdiff.h"
 
+/**
+ *
+ * Calling sequence:
+ * ----------------
+ *
+ * - Prepare a `struct ll_merge_options` to record options.
+ *   If you have no special requests, skip this and pass `NULL`
+ *   as the `opts` parameter to use the default options.
+ *
+ * - Allocate an mmbuffer_t variable for the result.
+ *
+ * - Allocate and fill variables with the file's original content
+ *   and two modified versions (using `read_mmfile`, for example).
+ *
+ * - Call `ll_merge()`.
+ *
+ * - Read the merged content from `result_buf.ptr` and `result_buf.size`.
+ *
+ * - Release buffers when finished.  A simple
+ *   `free(ancestor.ptr); free(ours.ptr); free(theirs.ptr);
+ *   free(result_buf.ptr);` will do.
+ *
+ * If the modifications do not merge cleanly, `ll_merge` will return a
+ * nonzero value and `result_buf` will generally include a description of
+ * the conflict bracketed by markers such as the traditional `<<<<<<<`
+ * and `>>>>>>>`.
+ *
+ * The `ancestor_label`, `our_label`, and `their_label` parameters are
+ * used to label the different sides of a conflict if the merge driver
+ * supports this.
+ */
+
+
 struct index_state;
 
+/**
+ * This describes the set of options the calling program wants to affect
+ * the operation of a low-level (single file) merge.
+ */
 struct ll_merge_options {
+
+	/**
+	 * Behave as though this were part of a merge between common ancestors in
+	 * a recursive merge (merges of binary files may need to be handled
+	 * differently in such cases, for example). If a helper program is
+	 * specified by the `[merge "<driver>"] recursive` configuration, it will
+	 * be used.
+	 */
 	unsigned virtual_ancestor : 1;
-	unsigned variant : 2;	/* favor ours, favor theirs, or union merge */
+
+	/**
+	 * Resolve local conflicts automatically in favor of one side or the other
+	 * (as in 'git merge-file' `--ours`/`--theirs`/`--union`).  Can be `0`,
+	 * `XDL_MERGE_FAVOR_OURS`, `XDL_MERGE_FAVOR_THEIRS`,
+	 * or `XDL_MERGE_FAVOR_UNION`.
+	 */
+	unsigned variant : 2;
+
+	/**
+	 * Resmudge and clean the "base", "theirs" and "ours" files before merging.
+	 * Use this when the merge is likely to have overlapped with a change in
+	 * smudge/clean or end-of-line normalization rules.
+	 */
 	unsigned renormalize : 1;
+
+	/**
+	 * Increase the length of conflict markers so that nested conflicts
+	 * can be differentiated.
+	 */
 	unsigned extra_marker_size;
+
+	/* Extra xpparam_t flags as defined in xdiff/xdiff.h. */
 	long xdl_opts;
 };
 
+/**
+ * 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,
 	     const char *path,
 	     mmfile_t *ancestor, const char *ancestor_label,
diff --git a/lockfile.c b/lockfile.c
index 8e8ab4f29f..cc9a4b8428 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -70,7 +70,8 @@ static void resolve_symlink(struct strbuf *path)
 }
 
 /* Make sure errno contains a meaningful value on error */
-static int lock_file(struct lock_file *lk, const char *path, int flags)
+static int lock_file(struct lock_file *lk, const char *path, int flags,
+		     int mode)
 {
 	struct strbuf filename = STRBUF_INIT;
 
@@ -79,7 +80,7 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
 		resolve_symlink(&filename);
 
 	strbuf_addstr(&filename, LOCK_SUFFIX);
-	lk->tempfile = create_tempfile(filename.buf);
+	lk->tempfile = create_tempfile_mode(filename.buf, mode);
 	strbuf_release(&filename);
 	return lk->tempfile ? lk->tempfile->fd : -1;
 }
@@ -99,7 +100,7 @@ static int lock_file(struct lock_file *lk, const char *path, int flags)
  * exactly once. If timeout_ms is -1, try indefinitely.
  */
 static int lock_file_timeout(struct lock_file *lk, const char *path,
-			     int flags, long timeout_ms)
+			     int flags, long timeout_ms, int mode)
 {
 	int n = 1;
 	int multiplier = 1;
@@ -107,7 +108,7 @@ static int lock_file_timeout(struct lock_file *lk, const char *path,
 	static int random_initialized = 0;
 
 	if (timeout_ms == 0)
-		return lock_file(lk, path, flags);
+		return lock_file(lk, path, flags, mode);
 
 	if (!random_initialized) {
 		srand((unsigned int)getpid());
@@ -121,7 +122,7 @@ static int lock_file_timeout(struct lock_file *lk, const char *path,
 		long backoff_ms, wait_ms;
 		int fd;
 
-		fd = lock_file(lk, path, flags);
+		fd = lock_file(lk, path, flags, mode);
 
 		if (fd >= 0)
 			return fd; /* success */
@@ -169,10 +170,11 @@ NORETURN void unable_to_lock_die(const char *path, int err)
 }
 
 /* This should return a meaningful errno on failure */
-int hold_lock_file_for_update_timeout(struct lock_file *lk, const char *path,
-				      int flags, long timeout_ms)
+int hold_lock_file_for_update_timeout_mode(struct lock_file *lk,
+					   const char *path, int flags,
+					   long timeout_ms, int mode)
 {
-	int fd = lock_file_timeout(lk, path, flags, timeout_ms);
+	int fd = lock_file_timeout(lk, path, flags, timeout_ms, mode);
 	if (fd < 0) {
 		if (flags & LOCK_DIE_ON_ERROR)
 			unable_to_lock_die(path, errno);
diff --git a/lockfile.h b/lockfile.h
index 9843053ce8..db93e6ba73 100644
--- a/lockfile.h
+++ b/lockfile.h
@@ -90,6 +90,15 @@
  * functions. In particular, the state diagram and the cleanup
  * machinery are all implemented in the tempfile module.
  *
+ * Permission bits
+ * ---------------
+ *
+ * If you call either `hold_lock_file_for_update_mode` or
+ * `hold_lock_file_for_update_timeout_mode`, you can specify a suggested
+ * mode for the underlying temporary file. Note that the file isn't
+ * guaranteed to have this exact mode, since it may be limited by either
+ * the umask, 'core.sharedRepository', or both. See `adjust_shared_perm`
+ * for more.
  *
  * Error handling
  * --------------
@@ -156,12 +165,20 @@ struct lock_file {
  * file descriptor for writing to it, or -1 on error. If the file is
  * currently locked, retry with quadratic backoff for at least
  * timeout_ms milliseconds. If timeout_ms is 0, try exactly once; if
- * timeout_ms is -1, retry indefinitely. The flags argument and error
- * handling are described above.
+ * timeout_ms is -1, retry indefinitely. The flags argument, error
+ * handling, and mode are described above.
  */
-int hold_lock_file_for_update_timeout(
+int hold_lock_file_for_update_timeout_mode(
+		struct lock_file *lk, const char *path,
+		int flags, long timeout_ms, int mode);
+
+static inline int hold_lock_file_for_update_timeout(
 		struct lock_file *lk, const char *path,
-		int flags, long timeout_ms);
+		int flags, long timeout_ms)
+{
+	return hold_lock_file_for_update_timeout_mode(lk, path, flags,
+						      timeout_ms, 0666);
+}
 
 /*
  * Attempt to create a lockfile for the file at `path` and return a
@@ -175,6 +192,13 @@ static inline int hold_lock_file_for_update(
 	return hold_lock_file_for_update_timeout(lk, path, flags, 0);
 }
 
+static inline int hold_lock_file_for_update_mode(
+		struct lock_file *lk, const char *path,
+		int flags, int mode)
+{
+	return hold_lock_file_for_update_timeout_mode(lk, path, flags, 0, mode);
+}
+
 /*
  * Return a nonzero value iff `lk` is currently locked.
  */
diff --git a/log-tree.c b/log-tree.c
index 923a299e70..6dc4412268 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -15,7 +15,6 @@
 #include "sequencer.h"
 #include "line-log.h"
 #include "help.h"
-#include "interdiff.h"
 #include "range-diff.h"
 
 static struct decoration name_decoration = { "object names" };
@@ -81,16 +80,65 @@ const struct name_decoration *get_name_decoration(const struct object *obj)
 	return lookup_decoration(&name_decoration, obj);
 }
 
+static int match_ref_pattern(const char *refname,
+			     const struct string_list_item *item)
+{
+	int matched = 0;
+	if (item->util == NULL) {
+		if (!wildmatch(item->string, refname, 0))
+			matched = 1;
+	} else {
+		const char *rest;
+		if (skip_prefix(refname, item->string, &rest) &&
+		    (!*rest || *rest == '/'))
+			matched = 1;
+	}
+	return matched;
+}
+
+static int ref_filter_match(const char *refname,
+			    const struct decoration_filter *filter)
+{
+	struct string_list_item *item;
+	const struct string_list *exclude_patterns = filter->exclude_ref_pattern;
+	const struct string_list *include_patterns = filter->include_ref_pattern;
+	const struct string_list *exclude_patterns_config =
+				filter->exclude_ref_config_pattern;
+
+	if (exclude_patterns && exclude_patterns->nr) {
+		for_each_string_list_item(item, exclude_patterns) {
+			if (match_ref_pattern(refname, item))
+				return 0;
+		}
+	}
+
+	if (include_patterns && include_patterns->nr) {
+		for_each_string_list_item(item, include_patterns) {
+			if (match_ref_pattern(refname, item))
+				return 1;
+		}
+		return 0;
+	}
+
+	if (exclude_patterns_config && exclude_patterns_config->nr) {
+		for_each_string_list_item(item, exclude_patterns_config) {
+			if (match_ref_pattern(refname, item))
+				return 0;
+		}
+	}
+
+	return 1;
+}
+
 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->include_ref_pattern,
-			      filter->exclude_ref_pattern))
+	if (filter && !ref_filter_match(refname, filter))
 		return 0;
 
 	if (starts_with(refname, git_replace_ref_base)) {
@@ -108,28 +156,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;
@@ -155,6 +204,9 @@ void load_ref_decorations(struct decoration_filter *filter, int flags)
 			for_each_string_list_item(item, filter->include_ref_pattern) {
 				normalize_glob_ref(item, NULL, item->string);
 			}
+			for_each_string_list_item(item, filter->exclude_ref_config_pattern) {
+				normalize_glob_ref(item, NULL, item->string);
+			}
 		}
 		decoration_loaded = 1;
 		decoration_flags = flags;
@@ -317,10 +369,16 @@ void fmt_output_subject(struct strbuf *filename,
 	const char *suffix = info->patch_suffix;
 	int nr = info->nr;
 	int start_len = filename->len;
-	int max_len = start_len + FORMAT_PATCH_NAME_MAX - (strlen(suffix) + 1);
+	int max_len = start_len + info->patch_name_max - (strlen(suffix) + 1);
+
+	if (info->reroll_count) {
+		struct strbuf temp = STRBUF_INIT;
 
-	if (0 < info->reroll_count)
-		strbuf_addf(filename, "v%d-", info->reroll_count);
+		strbuf_addf(&temp, "v%s", info->reroll_count);
+		format_sanitized_subject(filename, temp.buf, temp.len);
+		strbuf_addstr(filename, "-");
+		strbuf_release(&temp);
+	}
 	strbuf_addf(filename, "%04d-%s", nr, subject);
 
 	if (max_len < filename->len)
@@ -363,7 +421,7 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
 {
 	const char *extra_headers = opt->extra_headers;
 	const char *name = oid_to_hex(opt->zero_commit ?
-				      &null_oid : &commit->object.oid);
+				      null_oid() : &commit->object.oid);
 
 	*need_8bit_cte_p = 0; /* unknown */
 
@@ -449,22 +507,21 @@ static void show_signature(struct rev_info *opt, struct commit *commit)
 {
 	struct strbuf payload = STRBUF_INIT;
 	struct strbuf signature = STRBUF_INIT;
-	struct strbuf gpg_output = STRBUF_INIT;
+	struct signature_check sigc = { 0 };
 	int status;
 
-	if (parse_signed_commit(commit, &payload, &signature) <= 0)
+	if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0)
 		goto out;
 
-	status = verify_signed_buffer(payload.buf, payload.len,
-				      signature.buf, signature.len,
-				      &gpg_output, NULL);
-	if (status && !gpg_output.len)
-		strbuf_addstr(&gpg_output, "No signature\n");
-
-	show_sig_lines(opt, status, gpg_output.buf);
+	status = check_signature(payload.buf, payload.len, signature.buf,
+				 signature.len, &sigc);
+	if (status && !sigc.gpg_output)
+		show_sig_lines(opt, status, "No signature\n");
+	else
+		show_sig_lines(opt, status, sigc.gpg_output);
+	signature_check_clear(&sigc);
 
  out:
-	strbuf_release(&gpg_output);
 	strbuf_release(&payload);
 	strbuf_release(&signature);
 }
@@ -497,10 +554,13 @@ static int show_one_mergetag(struct commit *commit,
 	struct object_id oid;
 	struct tag *tag;
 	struct strbuf verify_message;
+	struct signature_check sigc = { 0 };
 	int status, nth;
-	size_t payload_size, gpg_message_offset;
+	struct strbuf payload = STRBUF_INIT;
+	struct strbuf signature = STRBUF_INIT;
 
-	hash_object_file(extra->value, extra->len, type_name(OBJ_TAG), &oid);
+	hash_object_file(the_hash_algo, extra->value, extra->len,
+			 type_name(OBJ_TAG), &oid);
 	tag = lookup_tag(the_repository, &oid);
 	if (!tag)
 		return -1; /* error message already given */
@@ -515,28 +575,28 @@ static int show_one_mergetag(struct commit *commit,
 			    "merged tag '%s'\n", tag->tag);
 	else if ((nth = which_parent(&tag->tagged->oid, commit)) < 0)
 		strbuf_addf(&verify_message, "tag %s names a non-parent %s\n",
-				    tag->tag, tag->tagged->oid.hash);
+				    tag->tag, oid_to_hex(&tag->tagged->oid));
 	else
 		strbuf_addf(&verify_message,
 			    "parent #%d, tagged '%s'\n", nth + 1, tag->tag);
-	gpg_message_offset = verify_message.len;
 
-	payload_size = parse_signature(extra->value, extra->len);
 	status = -1;
-	if (extra->len > payload_size) {
+	if (parse_signature(extra->value, extra->len, &payload, &signature)) {
 		/* could have a good signature */
-		if (!verify_signed_buffer(extra->value, payload_size,
-					  extra->value + payload_size,
-					  extra->len - payload_size,
-					  &verify_message, NULL))
-			status = 0; /* good */
-		else if (verify_message.len <= gpg_message_offset)
+		status = check_signature(payload.buf, payload.len,
+					 signature.buf, signature.len, &sigc);
+		if (sigc.gpg_output)
+			strbuf_addstr(&verify_message, sigc.gpg_output);
+		else
 			strbuf_addstr(&verify_message, "No signature\n");
+		signature_check_clear(&sigc);
 		/* otherwise we couldn't verify, which is shown as bad */
 	}
 
 	show_sig_lines(opt, status, verify_message.buf);
 	strbuf_release(&verify_message);
+	strbuf_release(&payload);
+	strbuf_release(&signature);
 	return 0;
 }
 
@@ -692,6 +752,7 @@ void show_log(struct rev_info *opt)
 	ctx.abbrev = opt->diffopt.abbrev;
 	ctx.after_subject = extra_headers;
 	ctx.preserve_subject = opt->preserve_subject;
+	ctx.encode_email_headers = opt->encode_email_headers;
 	ctx.reflog_info = opt->reflog_info;
 	ctx.fmt = opt->commit_format;
 	ctx.mailmap = opt->mailmap;
@@ -747,7 +808,8 @@ void show_log(struct rev_info *opt)
 
 		next_commentary_block(opt, NULL);
 		fprintf_ln(opt->diffopt.file, "%s", opt->idiff_title);
-		show_interdiff(opt, 2);
+		show_interdiff(opt->idiff_oid1, opt->idiff_oid2, 2,
+			       &opt->diffopt);
 
 		memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff));
 	}
@@ -755,6 +817,11 @@ void show_log(struct rev_info *opt)
 	if (cmit_fmt_is_mail(ctx.fmt) && opt->rdiff1) {
 		struct diff_queue_struct dq;
 		struct diff_options opts;
+		struct range_diff_options range_diff_opts = {
+			.creation_factor = opt->creation_factor,
+			.dual_color = 1,
+			.diffopt = &opts
+		};
 
 		memcpy(&dq, &diff_queued_diff, sizeof(diff_queued_diff));
 		DIFF_QUEUE_CLEAR(&diff_queued_diff);
@@ -769,8 +836,7 @@ void show_log(struct rev_info *opt)
 		opts.file = opt->diffopt.file;
 		opts.use_color = opt->diffopt.use_color;
 		diff_setup_done(&opts);
-		show_range_diff(opt->rdiff1, opt->rdiff2,
-				opt->creation_factor, 1, &opts);
+		show_range_diff(opt->rdiff1, opt->rdiff2, &range_diff_opts);
 
 		memcpy(&diff_queued_diff, &dq, sizeof(diff_queued_diff));
 	}
@@ -832,7 +898,7 @@ int log_tree_diff_flush(struct rev_info *opt)
 
 static int do_diff_combined(struct rev_info *opt, struct commit *commit)
 {
-	diff_tree_combined_merge(commit, opt->dense_combined_merges, opt);
+	diff_tree_combined_merge(commit, opt);
 	return !opt->loginfo;
 }
 
@@ -846,15 +912,21 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
 	int showed_log;
 	struct commit_list *parents;
 	struct object_id *oid;
+	int is_merge;
+	int all_need_diff = opt->diff || opt->diffopt.flags.exit_with_status;
 
-	if (!opt->diff && !opt->diffopt.flags.exit_with_status)
+	if (!all_need_diff && !opt->merges_need_diff)
 		return 0;
 
 	parse_commit_or_die(commit);
 	oid = get_commit_tree_oid(commit);
 
-	/* Root commit? */
 	parents = get_saved_parents(opt, commit);
+	is_merge = parents && parents->next;
+	if (!is_merge && !all_need_diff)
+		return 0;
+
+	/* Root commit? */
 	if (!parents) {
 		if (opt->show_root_diff) {
 			diff_root_tree_oid(oid, "", &opt->diffopt);
@@ -863,27 +935,16 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
 		return !opt->loginfo;
 	}
 
-	/* More than one parent? */
-	if (parents && parents->next) {
-		if (opt->ignore_merges)
-			return 0;
-		else if (opt->combine_merges)
+	if (is_merge) {
+		if (opt->combine_merges)
 			return do_diff_combined(opt, commit);
-		else if (opt->first_parent_only) {
-			/*
-			 * Generate merge log entry only for the first
-			 * parent, showing summary diff of the others
-			 * we merged _in_.
-			 */
-			parse_commit_or_die(parents->item);
-			diff_tree_oid(get_commit_tree_oid(parents->item),
-				      oid, "", &opt->diffopt);
-			log_tree_diff_flush(opt);
-			return !opt->loginfo;
-		}
-
-		/* If we show individual diffs, show the parent info */
-		log->parent = parents->item;
+		if (opt->separate_merges) {
+			if (!opt->first_parent_merges) {
+				/* Show parent info for multiple diffs */
+				log->parent = parents->item;
+			}
+		} else
+			return 0;
 	}
 
 	showed_log = 0;
@@ -899,7 +960,7 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
 
 		/* Set up the log info for the next parent, if any.. */
 		parents = parents->next;
-		if (!parents)
+		if (!parents || opt->first_parent_merges)
 			break;
 		log->parent = parents->item;
 		opt->loginfo = log;
@@ -910,12 +971,14 @@ static int log_tree_diff(struct rev_info *opt, struct commit *commit, struct log
 int log_tree_commit(struct rev_info *opt, struct commit *commit)
 {
 	struct log_info log;
-	int shown, close_file = opt->diffopt.close_file;
+	int shown;
+	/* maybe called by e.g. cmd_log_walk(), maybe stand-alone */
+	int no_free = opt->diffopt.no_free;
 
 	log.commit = commit;
 	log.parent = NULL;
 	opt->loginfo = &log;
-	opt->diffopt.close_file = 0;
+	opt->diffopt.no_free = 1;
 
 	if (opt->line_level_traverse)
 		return line_log_print(opt, commit);
@@ -932,7 +995,7 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
 		fprintf(opt->diffopt.file, "\n%s\n", opt->break_bar);
 	opt->loginfo = NULL;
 	maybe_flush_or_die(opt->diffopt.file, "stdout");
-	if (close_file)
-		fclose(opt->diffopt.file);
+	opt->diffopt.no_free = no_free;
+	diff_free(&opt->diffopt);
 	return shown;
 }
diff --git a/log-tree.h b/log-tree.h
index e668628074..1e8c91dbf2 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -8,7 +8,9 @@ struct log_info {
 };
 
 struct decoration_filter {
-	struct string_list *include_ref_pattern, *exclude_ref_pattern;
+	struct string_list *include_ref_pattern;
+	struct string_list *exclude_ref_pattern;
+	struct string_list *exclude_ref_config_pattern;
 };
 
 int parse_decorate_color_config(const char *var, const char *slot_name, const char *value);
@@ -31,7 +33,6 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit,
 			     int maybe_multipart);
 void load_ref_decorations(struct decoration_filter *filter, int flags);
 
-#define FORMAT_PATCH_NAME_MAX 64
 void fmt_output_commit(struct strbuf *, struct commit *, struct rev_info *);
 void fmt_output_subject(struct strbuf *, const char *subject, struct rev_info *);
 void fmt_output_email_subject(struct strbuf *, struct rev_info *);
diff --git a/ls-refs.c b/ls-refs.c
index 818aef70a0..84021416ca 100644
--- a/ls-refs.c
+++ b/ls-refs.c
@@ -2,24 +2,57 @@
 #include "repository.h"
 #include "refs.h"
 #include "remote.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "ls-refs.h"
 #include "pkt-line.h"
 #include "config.h"
 
+static int config_read;
+static int advertise_unborn;
+static int allow_unborn;
+
+static void ensure_config_read(void)
+{
+	const char *str = NULL;
+
+	if (config_read)
+		return;
+
+	if (repo_config_get_string_tmp(the_repository, "lsrefs.unborn", &str)) {
+		/*
+		 * If there is no such config, advertise and allow it by
+		 * default.
+		 */
+		advertise_unborn = 1;
+		allow_unborn = 1;
+	} else {
+		if (!strcmp(str, "advertise")) {
+			advertise_unborn = 1;
+			allow_unborn = 1;
+		} else if (!strcmp(str, "allow")) {
+			allow_unborn = 1;
+		} else if (!strcmp(str, "ignore")) {
+			/* do nothing */
+		} else {
+			die(_("invalid value '%s' for lsrefs.unborn"), str);
+		}
+	}
+	config_read = 1;
+}
+
 /*
  * Check if one of the prefixes is a prefix of the ref.
  * If no prefixes were provided, all refs match.
  */
-static int ref_match(const struct argv_array *prefixes, const char *refname)
+static int ref_match(const struct strvec *prefixes, const char *refname)
 {
 	int i;
 
-	if (!prefixes->argc)
+	if (!prefixes->nr)
 		return 1; /* no restriction */
 
-	for (i = 0; i < prefixes->argc; i++) {
-		const char *prefix = prefixes->argv[i];
+	for (i = 0; i < prefixes->nr; i++) {
+		const char *prefix = prefixes->v[i];
 
 		if (starts_with(refname, prefix))
 			return 1;
@@ -31,7 +64,9 @@ static int ref_match(const struct argv_array *prefixes, const char *refname)
 struct ls_refs_data {
 	unsigned peel;
 	unsigned symrefs;
-	struct argv_array prefixes;
+	struct strvec prefixes;
+	struct strbuf buf;
+	unsigned unborn : 1;
 };
 
 static int send_ref(const char *refname, const struct object_id *oid,
@@ -39,7 +74,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;
@@ -47,7 +83,10 @@ static int send_ref(const char *refname, const struct object_id *oid,
 	if (!ref_match(&data->prefixes, refname_nons))
 		return 0;
 
-	strbuf_addf(&refline, "%s %s", oid_to_hex(oid), refname_nons);
+	if (oid)
+		strbuf_addf(&data->buf, "%s %s", oid_to_hex(oid), refname_nons);
+	else
+		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,
@@ -57,23 +96,39 @@ 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) {
+	if (data->peel && oid) {
 		struct object_id peeled;
-		if (!peel_ref(refname, &peeled))
-			strbuf_addf(&refline, " peeled:%s", oid_to_hex(&peeled));
+		if (!peel_iterated_oid(oid, &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_write(1, data->buf.buf, data->buf.len);
 
-	strbuf_release(&refline);
 	return 0;
 }
 
+static void send_possibly_unborn_head(struct ls_refs_data *data)
+{
+	struct strbuf namespaced = STRBUF_INIT;
+	struct object_id oid;
+	int flag;
+	int oid_is_null;
+
+	strbuf_addf(&namespaced, "%sHEAD", get_git_namespace());
+	if (!resolve_ref_unsafe(namespaced.buf, 0, &oid, &flag))
+		return; /* bad ref */
+	oid_is_null = is_null_oid(&oid);
+	if (!oid_is_null ||
+	    (data->unborn && data->symrefs && (flag & REF_ISSYMREF)))
+		send_ref(namespaced.buf, oid_is_null ? NULL : &oid, flag, data);
+	strbuf_release(&namespaced);
+}
+
 static int ls_refs_config(const char *var, const char *value, void *data)
 {
 	/*
@@ -84,16 +139,19 @@ 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 argv_array *keys,
+int ls_refs(struct repository *r, struct strvec *keys,
 	    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);
 
-	while (packet_reader_read(request) != PACKET_READ_FLUSH) {
+	while (packet_reader_read(request) == PACKET_READ_NORMAL) {
 		const char *arg = request->line;
 		const char *out;
 
@@ -102,12 +160,32 @@ int ls_refs(struct repository *r, struct argv_array *keys,
 		else if (!strcmp("symrefs", arg))
 			data.symrefs = 1;
 		else if (skip_prefix(arg, "ref-prefix ", &out))
-			argv_array_push(&data.prefixes, out);
+			strvec_push(&data.prefixes, out);
+		else if (!strcmp("unborn", arg))
+			data.unborn = allow_unborn;
 	}
 
-	head_ref_namespaced(send_ref, &data);
-	for_each_namespaced_ref(send_ref, &data);
+	if (request->status != PACKET_READ_FLUSH)
+		die(_("expected flush after ls-refs arguments"));
+
+	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);
-	argv_array_clear(&data.prefixes);
+	strvec_clear(&data.prefixes);
+	strbuf_release(&data.buf);
 	return 0;
 }
+
+int ls_refs_advertise(struct repository *r, struct strbuf *value)
+{
+	if (value) {
+		ensure_config_read();
+		if (advertise_unborn)
+			strbuf_addstr(value, "unborn");
+	}
+
+	return 1;
+}
diff --git a/ls-refs.h b/ls-refs.h
index 7e5646f5f6..a99e4be0bd 100644
--- a/ls-refs.h
+++ b/ls-refs.h
@@ -2,9 +2,10 @@
 #define LS_REFS_H
 
 struct repository;
-struct argv_array;
+struct strvec;
 struct packet_reader;
-int ls_refs(struct repository *r, struct argv_array *keys,
+int ls_refs(struct repository *r, struct strvec *keys,
 	    struct packet_reader *request);
+int ls_refs_advertise(struct repository *r, struct strbuf *value);
 
 #endif /* LS_REFS_H */
diff --git a/mailinfo.c b/mailinfo.c
index b395adbdf2..02f6f95357 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -19,8 +19,7 @@ static void cleanup_space(struct strbuf *sb)
 static void get_sane_name(struct strbuf *out, struct strbuf *name, struct strbuf *email)
 {
 	struct strbuf *src = name;
-	if (name->len < 3 || 60 < name->len || strchr(name->buf, '@') ||
-		strchr(name->buf, '<') || strchr(name->buf, '>'))
+	if (!name->len || 60 < name->len || strpbrk(name->buf, "@<>"))
 		src = email;
 	else if (name == out)
 		return;
@@ -254,7 +253,7 @@ static void handle_content_type(struct mailinfo *mi, struct strbuf *line)
 	mi->delsp = has_attr_value(line->buf, "delsp=", "yes");
 
 	if (slurp_attr(line->buf, "boundary=", boundary)) {
-		strbuf_insert(boundary, 0, "--", 2);
+		strbuf_insertstr(boundary, 0, "--");
 		if (++mi->content_top >= &mi->content[MAX_BOUNDARIES]) {
 			error("Too many boundaries to handle");
 			mi->input_error = -1;
@@ -346,11 +345,17 @@ static const char *header[MAX_HDR_PARSED] = {
 	"From","Subject","Date",
 };
 
-static inline int cmp_header(const struct strbuf *line, const char *hdr)
+static inline int skip_header(const struct strbuf *line, const char *hdr,
+			      const char **outval)
 {
-	int len = strlen(hdr);
-	return !strncasecmp(line->buf, hdr, len) && line->len > len &&
-			line->buf[len] == ':' && isspace(line->buf[len + 1]);
+	const char *val;
+	if (!skip_iprefix(line->buf, hdr, &val) ||
+	    *val++ != ':')
+		return 0;
+	while (isspace(*val))
+		val++;
+	*outval = val;
+	return 1;
 }
 
 static int is_format_patch_separator(const char *line, int len)
@@ -442,19 +447,21 @@ static int convert_to_utf8(struct mailinfo *mi,
 			   struct strbuf *line, const char *charset)
 {
 	char *out;
+	size_t out_len;
 
 	if (!mi->metainfo_charset || !charset || !*charset)
 		return 0;
 
 	if (same_encoding(mi->metainfo_charset, charset))
 		return 0;
-	out = reencode_string(line->buf, mi->metainfo_charset, charset);
+	out = reencode_string_len(line->buf, line->len,
+				  mi->metainfo_charset, charset, &out_len);
 	if (!out) {
 		mi->input_error = -1;
 		return error("cannot convert from %s to %s",
 			     charset, mi->metainfo_charset);
 	}
-	strbuf_attach(line, out, strlen(out), strlen(out));
+	strbuf_attach(line, out, out_len, out_len);
 	return 0;
 }
 
@@ -543,22 +550,36 @@ release_return:
 		mi->input_error = -1;
 }
 
+/*
+ * Returns true if "line" contains a header matching "hdr", in which case "val"
+ * will contain the value of the header with any RFC2047 B and Q encoding
+ * unwrapped, and optionally normalize the meta information to utf8.
+ */
+static int parse_header(const struct strbuf *line,
+			const char *hdr,
+			struct mailinfo *mi,
+			struct strbuf *val)
+{
+	const char *val_str;
+
+	if (!skip_header(line, hdr, &val_str))
+		return 0;
+	strbuf_addstr(val, val_str);
+	decode_header(mi, val);
+	return 1;
+}
+
 static int check_header(struct mailinfo *mi,
 			const struct strbuf *line,
 			struct strbuf *hdr_data[], int overwrite)
 {
-	int i, ret = 0, len;
+	int i, ret = 0;
 	struct strbuf sb = STRBUF_INIT;
 
 	/* search for the interesting parts */
 	for (i = 0; header[i]; i++) {
-		int len = strlen(header[i]);
-		if ((!hdr_data[i] || overwrite) && cmp_header(line, header[i])) {
-			/* Unwrap inline B and Q encoding, and optionally
-			 * normalize the meta information to utf8.
-			 */
-			strbuf_add(&sb, line->buf + len + 2, line->len - len - 2);
-			decode_header(mi, &sb);
+		if ((!hdr_data[i] || overwrite) &&
+		    parse_header(line, header[i], mi, &sb)) {
 			handle_header(&hdr_data[i], &sb);
 			ret = 1;
 			goto check_header_out;
@@ -566,27 +587,17 @@ static int check_header(struct mailinfo *mi,
 	}
 
 	/* Content stuff */
-	if (cmp_header(line, "Content-Type")) {
-		len = strlen("Content-Type: ");
-		strbuf_add(&sb, line->buf + len, line->len - len);
-		decode_header(mi, &sb);
-		strbuf_insert(&sb, 0, "Content-Type: ", len);
+	if (parse_header(line, "Content-Type", mi, &sb)) {
 		handle_content_type(mi, &sb);
 		ret = 1;
 		goto check_header_out;
 	}
-	if (cmp_header(line, "Content-Transfer-Encoding")) {
-		len = strlen("Content-Transfer-Encoding: ");
-		strbuf_add(&sb, line->buf + len, line->len - len);
-		decode_header(mi, &sb);
+	if (parse_header(line, "Content-Transfer-Encoding", mi, &sb)) {
 		handle_content_transfer_encoding(mi, &sb);
 		ret = 1;
 		goto check_header_out;
 	}
-	if (cmp_header(line, "Message-Id")) {
-		len = strlen("Message-Id: ");
-		strbuf_add(&sb, line->buf + len, line->len - len);
-		decode_header(mi, &sb);
+	if (parse_header(line, "Message-Id", mi, &sb)) {
 		if (mi->add_message_id)
 			mi->message_id = strbuf_detach(&sb, NULL);
 		ret = 1;
@@ -607,8 +618,9 @@ static int is_inbody_header(const struct mailinfo *mi,
 			    const struct strbuf *line)
 {
 	int i;
+	const char *val;
 	for (i = 0; header[i]; i++)
-		if (!mi->s_hdr_data[i] && cmp_header(line, header[i]))
+		if (!mi->s_hdr_data[i] && skip_header(line, header[i], &val))
 			return 1;
 	return 0;
 }
@@ -693,8 +705,8 @@ static int is_scissors_line(const char *line)
 			perforation++;
 			continue;
 		}
-		if ((!memcmp(c, ">8", 2) || !memcmp(c, "8<", 2) ||
-		     !memcmp(c, ">%", 2) || !memcmp(c, "%<", 2))) {
+		if (starts_with(c, ">8") || starts_with(c, "8<") ||
+		    starts_with(c, ">%") || starts_with(c, "%<")) {
 			in_perforation = 1;
 			perforation += 2;
 			scissors += 2;
@@ -809,7 +821,7 @@ static int handle_commit_msg(struct mailinfo *mi, struct strbuf *line)
 		for (i = 0; header[i]; i++) {
 			if (mi->s_hdr_data[i])
 				strbuf_release(mi->s_hdr_data[i]);
-			mi->s_hdr_data[i] = NULL;
+			FREE_AND_NULL(mi->s_hdr_data[i]);
 		}
 		return 0;
 	}
@@ -982,6 +994,16 @@ static void handle_filter_flowed(struct mailinfo *mi, struct strbuf *line,
 	const char *rest;
 
 	if (!mi->format_flowed) {
+		if (len >= 2 &&
+		    line->buf[len - 2] == '\r' &&
+		    line->buf[len - 1] == '\n') {
+			mi->have_quoted_cr = 1;
+			if (mi->quoted_cr == quoted_cr_strip) {
+				strbuf_setlen(line, len - 2);
+				strbuf_addch(line, '\n');
+				len--;
+			}
+		}
 		handle_filter(mi, line);
 		return;
 	}
@@ -1021,6 +1043,13 @@ static void handle_filter_flowed(struct mailinfo *mi, struct strbuf *line,
 	handle_filter(mi, line);
 }
 
+static void summarize_quoted_cr(struct mailinfo *mi)
+{
+	if (mi->have_quoted_cr &&
+	    mi->quoted_cr == quoted_cr_warn)
+		warning(_("quoted CRLF detected"));
+}
+
 static void handle_body(struct mailinfo *mi, struct strbuf *line)
 {
 	struct strbuf prev = STRBUF_INIT;
@@ -1039,6 +1068,8 @@ static void handle_body(struct mailinfo *mi, struct strbuf *line)
 				handle_filter(mi, &prev);
 				strbuf_reset(&prev);
 			}
+			summarize_quoted_cr(mi);
+			mi->have_quoted_cr = 0;
 			if (!handle_boundary(mi, line))
 				goto handle_body_out;
 		}
@@ -1088,6 +1119,7 @@ static void handle_body(struct mailinfo *mi, struct strbuf *line)
 
 	if (prev.len)
 		handle_filter(mi, &prev);
+	summarize_quoted_cr(mi);
 
 	flush_inbody_header_accum(mi);
 
@@ -1126,6 +1158,11 @@ static void handle_info(struct mailinfo *mi)
 		else
 			continue;
 
+		if (memchr(hdr->buf, '\0', hdr->len)) {
+			error("a NUL byte in '%s' is not allowed.", header[i]);
+			mi->input_error = -1;
+		}
+
 		if (!strcmp(header[i], "Subject")) {
 			if (!mi->keep_subject) {
 				cleanup_subject(mi, hdr);
@@ -1189,6 +1226,19 @@ int mailinfo(struct mailinfo *mi, const char *msg, const char *patch)
 	return mi->input_error;
 }
 
+int mailinfo_parse_quoted_cr_action(const char *actionstr, int *action)
+{
+	if (!strcmp(actionstr, "nowarn"))
+		*action = quoted_cr_nowarn;
+	else if (!strcmp(actionstr, "warn"))
+		*action = quoted_cr_warn;
+	else if (!strcmp(actionstr, "strip"))
+		*action = quoted_cr_strip;
+	else
+		return -1;
+	return 0;
+}
+
 static int git_mailinfo_config(const char *var, const char *value, void *mi_)
 {
 	struct mailinfo *mi = mi_;
@@ -1199,6 +1249,11 @@ static int git_mailinfo_config(const char *var, const char *value, void *mi_)
 		mi->use_scissors = git_config_bool(var, value);
 		return 0;
 	}
+	if (!strcmp(var, "mailinfo.quotedcr")) {
+		if (mailinfo_parse_quoted_cr_action(value, &mi->quoted_cr) != 0)
+			return error(_("bad action '%s' for '%s'"), value, var);
+		return 0;
+	}
 	/* perhaps others here */
 	return 0;
 }
@@ -1211,6 +1266,7 @@ void setup_mailinfo(struct mailinfo *mi)
 	strbuf_init(&mi->charset, 0);
 	strbuf_init(&mi->log_message, 0);
 	strbuf_init(&mi->inbody_header_accum, 0);
+	mi->quoted_cr = quoted_cr_warn;
 	mi->header_stage = 1;
 	mi->use_inbody_headers = 1;
 	mi->content_top = mi->content;
@@ -1219,22 +1275,14 @@ void setup_mailinfo(struct mailinfo *mi)
 
 void clear_mailinfo(struct mailinfo *mi)
 {
-	int i;
-
 	strbuf_release(&mi->name);
 	strbuf_release(&mi->email);
 	strbuf_release(&mi->charset);
 	strbuf_release(&mi->inbody_header_accum);
 	free(mi->message_id);
 
-	if (mi->p_hdr_data)
-		for (i = 0; mi->p_hdr_data[i]; i++)
-			strbuf_release(mi->p_hdr_data[i]);
-	free(mi->p_hdr_data);
-	if (mi->s_hdr_data)
-		for (i = 0; mi->s_hdr_data[i]; i++)
-			strbuf_release(mi->s_hdr_data[i]);
-	free(mi->s_hdr_data);
+	strbuf_list_free(mi->p_hdr_data);
+	strbuf_list_free(mi->s_hdr_data);
 
 	while (mi->content < mi->content_top) {
 		free(*(mi->content_top));
diff --git a/mailinfo.h b/mailinfo.h
index 79b1d6774e..f2ffd0349e 100644
--- a/mailinfo.h
+++ b/mailinfo.h
@@ -5,6 +5,13 @@
 
 #define MAX_BOUNDARIES 5
 
+enum quoted_cr_action {
+	quoted_cr_unset = -1,
+	quoted_cr_nowarn,
+	quoted_cr_warn,
+	quoted_cr_strip,
+};
+
 struct mailinfo {
 	FILE *input;
 	FILE *output;
@@ -14,6 +21,7 @@ struct mailinfo {
 	struct strbuf email;
 	int keep_subject;
 	int keep_non_patch_brackets_in_subject;
+	int quoted_cr; /* enum quoted_cr_action */
 	int add_message_id;
 	int use_scissors;
 	int use_inbody_headers;
@@ -24,6 +32,7 @@ struct mailinfo {
 	struct strbuf charset;
 	unsigned int format_flowed:1;
 	unsigned int delsp:1;
+	unsigned int have_quoted_cr:1;
 	char *message_id;
 	enum  {
 		TE_DONTCARE, TE_QP, TE_BASE64
@@ -39,6 +48,7 @@ struct mailinfo {
 	int input_error;
 };
 
+int mailinfo_parse_quoted_cr_action(const char *actionstr, int *action);
 void setup_mailinfo(struct mailinfo *);
 int mailinfo(struct mailinfo *, const char *msg, const char *patch);
 void clear_mailinfo(struct mailinfo *);
diff --git a/mailmap.c b/mailmap.c
index 962fd86d6d..462b395634 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
@@ -83,7 +84,7 @@ static void add_mapping(struct string_list *map,
 	if (item->util) {
 		me = (struct mailmap_entry *)item->util;
 	} else {
-		me = xcalloc(1, sizeof(struct mailmap_entry));
+		CALLOC_ARRAY(me, 1);
 		me->namemap.strdup_strings = 1;
 		me->namemap.cmp = namemap_cmp;
 		item->util = me;
@@ -143,31 +144,13 @@ static char *parse_name_and_email(char *buffer, char **name,
 	return (*right == '\0' ? NULL : right);
 }
 
-static void read_mailmap_line(struct string_list *map, char *buffer,
-			      char **repo_abbrev)
+static void read_mailmap_line(struct string_list *map, char *buffer)
 {
 	char *name1 = NULL, *email1 = NULL, *name2 = NULL, *email2 = NULL;
-	if (buffer[0] == '#') {
-		static const char abbrev[] = "# repo-abbrev:";
-		int abblen = sizeof(abbrev) - 1;
-		int len = strlen(buffer);
 
-		if (!repo_abbrev)
-			return;
-
-		if (len && buffer[len - 1] == '\n')
-			buffer[--len] = 0;
-		if (!strncmp(buffer, abbrev, abblen)) {
-			char *cp;
-
-			free(*repo_abbrev);
-
-			for (cp = buffer + abblen; isspace(*cp); cp++)
-				; /* nothing */
-			*repo_abbrev = xstrdup(cp);
-		}
+	if (buffer[0] == '#')
 		return;
-	}
+
 	if ((name2 = parse_name_and_email(buffer, &name1, &email1, 0)) != NULL)
 		parse_name_and_email(name2, &name2, &email2, 1);
 
@@ -175,30 +158,38 @@ static void read_mailmap_line(struct string_list *map, char *buffer,
 		add_mapping(map, name1, email1, name2, email2);
 }
 
+/* Flags for read_mailmap_file() */
+#define MAILMAP_NOFOLLOW (1<<0)
+
 static int read_mailmap_file(struct string_list *map, const char *filename,
-			     char **repo_abbrev)
+			     unsigned flags)
 {
 	char buffer[1024];
 	FILE *f;
+	int fd;
 
 	if (!filename)
 		return 0;
 
-	f = fopen(filename, "r");
-	if (!f) {
+	if (flags & MAILMAP_NOFOLLOW)
+		fd = open_nofollow(filename, O_RDONLY);
+	else
+		fd = open(filename, O_RDONLY);
+
+	if (fd < 0) {
 		if (errno == ENOENT)
 			return 0;
 		return error_errno("unable to open mailmap at %s", filename);
 	}
+	f = xfdopen(fd, "r");
 
 	while (fgets(buffer, sizeof(buffer), f) != NULL)
-		read_mailmap_line(map, buffer, repo_abbrev);
+		read_mailmap_line(map, buffer);
 	fclose(f);
 	return 0;
 }
 
-static void read_mailmap_string(struct string_list *map, char *buf,
-				char **repo_abbrev)
+static void read_mailmap_string(struct string_list *map, char *buf)
 {
 	while (*buf) {
 		char *end = strchrnul(buf, '\n');
@@ -206,14 +197,12 @@ static void read_mailmap_string(struct string_list *map, char *buf,
 		if (*end)
 			*end++ = '\0';
 
-		read_mailmap_line(map, buf, repo_abbrev);
+		read_mailmap_line(map, buf);
 		buf = end;
 	}
 }
 
-static int read_mailmap_blob(struct string_list *map,
-			     const char *name,
-			     char **repo_abbrev)
+static int read_mailmap_blob(struct string_list *map, const char *name)
 {
 	struct object_id oid;
 	char *buf;
@@ -231,13 +220,13 @@ static int read_mailmap_blob(struct string_list *map,
 	if (type != OBJ_BLOB)
 		return error("mailmap is not a blob: %s", name);
 
-	read_mailmap_string(map, buf, repo_abbrev);
+	read_mailmap_string(map, buf);
 
 	free(buf);
 	return 0;
 }
 
-int read_mailmap(struct string_list *map, char **repo_abbrev)
+int read_mailmap(struct string_list *map)
 {
 	int err = 0;
 
@@ -247,10 +236,13 @@ int read_mailmap(struct string_list *map, char **repo_abbrev)
 	if (!git_mailmap_blob && is_bare_repository())
 		git_mailmap_blob = "HEAD:.mailmap";
 
-	err |= read_mailmap_file(map, ".mailmap", repo_abbrev);
+	if (!startup_info->have_repository || !is_bare_repository())
+		err |= read_mailmap_file(map, ".mailmap",
+					 startup_info->have_repository ?
+					 MAILMAP_NOFOLLOW : 0);
 	if (startup_info->have_repository)
-		err |= read_mailmap_blob(map, git_mailmap_blob, repo_abbrev);
-	err |= read_mailmap_file(map, git_mailmap_file, repo_abbrev);
+		err |= read_mailmap_blob(map, git_mailmap_blob);
+	err |= read_mailmap_file(map, git_mailmap_file, 0);
 	return err;
 }
 
diff --git a/mailmap.h b/mailmap.h
index d0e65646cb..7e99fccb46 100644
--- a/mailmap.h
+++ b/mailmap.h
@@ -3,7 +3,7 @@
 
 struct string_list;
 
-int read_mailmap(struct string_list *map, char **repo_abbrev);
+int read_mailmap(struct string_list *map);
 void clear_mailmap(struct string_list *map);
 
 int map_user(struct string_list *map,
diff --git a/match-trees.c b/match-trees.c
index f6c194c1cc..df413989fa 100644
--- a/match-trees.c
+++ b/match-trees.c
@@ -226,7 +226,7 @@ static int splice_tree(const struct object_id *oid1, const char *prefix,
 		    oid_to_hex(oid1));
 	if (*subpath) {
 		struct object_id tree_oid;
-		hashcpy(tree_oid.hash, rewrite_here);
+		oidread(&tree_oid, rewrite_here);
 		status = splice_tree(&tree_oid, subpath, oid2, &subtree);
 		if (status)
 			return status;
diff --git a/mem-pool.c b/mem-pool.c
index a2841a4a9a..ccdcad2e3d 100644
--- a/mem-pool.c
+++ b/mem-pool.c
@@ -5,18 +5,20 @@
 #include "cache.h"
 #include "mem-pool.h"
 
-#define BLOCK_GROWTH_SIZE 1024*1024 - sizeof(struct mp_block);
+#define BLOCK_GROWTH_SIZE (1024 * 1024 - sizeof(struct mp_block))
 
 /*
  * 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.
  */
-static struct mp_block *mem_pool_alloc_block(struct mem_pool *mem_pool, size_t block_alloc, struct mp_block *insert_after)
+static struct mp_block *mem_pool_alloc_block(struct mem_pool *pool,
+					     size_t block_alloc,
+					     struct mp_block *insert_after)
 {
 	struct mp_block *p;
 
-	mem_pool->pool_alloc += sizeof(struct mp_block) + block_alloc;
+	pool->pool_alloc += sizeof(struct mp_block) + block_alloc;
 	p = xmalloc(st_add(sizeof(struct mp_block), block_alloc));
 
 	p->next_free = (char *)p->space;
@@ -26,35 +28,27 @@ static struct mp_block *mem_pool_alloc_block(struct mem_pool *mem_pool, size_t b
 		p->next_block = insert_after->next_block;
 		insert_after->next_block = p;
 	} else {
-		p->next_block = mem_pool->mp_block;
-		mem_pool->mp_block = p;
+		p->next_block = pool->mp_block;
+		pool->mp_block = p;
 	}
 
 	return p;
 }
 
-void mem_pool_init(struct mem_pool **mem_pool, size_t initial_size)
+void mem_pool_init(struct mem_pool *pool, size_t initial_size)
 {
-	struct mem_pool *pool;
-
-	if (*mem_pool)
-		return;
-
-	pool = xcalloc(1, sizeof(*pool));
-
+	memset(pool, 0, sizeof(*pool));
 	pool->block_alloc = BLOCK_GROWTH_SIZE;
 
 	if (initial_size > 0)
 		mem_pool_alloc_block(pool, initial_size, NULL);
-
-	*mem_pool = pool;
 }
 
-void mem_pool_discard(struct mem_pool *mem_pool, int invalidate_memory)
+void mem_pool_discard(struct mem_pool *pool, int invalidate_memory)
 {
 	struct mp_block *block, *block_to_free;
 
-	block = mem_pool->mp_block;
+	block = pool->mp_block;
 	while (block)
 	{
 		block_to_free = block;
@@ -66,10 +60,11 @@ void mem_pool_discard(struct mem_pool *mem_pool, int invalidate_memory)
 		free(block_to_free);
 	}
 
-	free(mem_pool);
+	pool->mp_block = NULL;
+	pool->pool_alloc = 0;
 }
 
-void *mem_pool_alloc(struct mem_pool *mem_pool, size_t len)
+void *mem_pool_alloc(struct mem_pool *pool, size_t len)
 {
 	struct mp_block *p = NULL;
 	void *r;
@@ -78,15 +73,15 @@ void *mem_pool_alloc(struct mem_pool *mem_pool, size_t len)
 	if (len & (sizeof(uintmax_t) - 1))
 		len += sizeof(uintmax_t) - (len & (sizeof(uintmax_t) - 1));
 
-	if (mem_pool->mp_block &&
-	    mem_pool->mp_block->end - mem_pool->mp_block->next_free >= len)
-		p = mem_pool->mp_block;
+	if (pool->mp_block &&
+	    pool->mp_block->end - pool->mp_block->next_free >= len)
+		p = pool->mp_block;
 
 	if (!p) {
-		if (len >= (mem_pool->block_alloc / 2))
-			return mem_pool_alloc_block(mem_pool, len, mem_pool->mp_block);
+		if (len >= (pool->block_alloc / 2))
+			return mem_pool_alloc_block(pool, len, pool->mp_block);
 
-		p = mem_pool_alloc_block(mem_pool, mem_pool->block_alloc, NULL);
+		p = mem_pool_alloc_block(pool, pool->block_alloc, NULL);
 	}
 
 	r = p->next_free;
@@ -94,20 +89,38 @@ void *mem_pool_alloc(struct mem_pool *mem_pool, size_t len)
 	return r;
 }
 
-void *mem_pool_calloc(struct mem_pool *mem_pool, size_t count, size_t size)
+void *mem_pool_calloc(struct mem_pool *pool, size_t count, size_t size)
 {
 	size_t len = st_mult(count, size);
-	void *r = mem_pool_alloc(mem_pool, len);
+	void *r = mem_pool_alloc(pool, len);
 	memset(r, 0, len);
 	return r;
 }
 
-int mem_pool_contains(struct mem_pool *mem_pool, void *mem)
+char *mem_pool_strdup(struct mem_pool *pool, const char *str)
+{
+	size_t len = strlen(str) + 1;
+	char *ret = mem_pool_alloc(pool, len);
+
+	return memcpy(ret, str, len);
+}
+
+char *mem_pool_strndup(struct mem_pool *pool, const char *str, size_t len)
+{
+	char *p = memchr(str, '\0', len);
+	size_t actual_len = (p ? p - str : len);
+	char *ret = mem_pool_alloc(pool, actual_len+1);
+
+	ret[actual_len] = '\0';
+	return memcpy(ret, str, actual_len);
+}
+
+int mem_pool_contains(struct mem_pool *pool, void *mem)
 {
 	struct mp_block *p;
 
 	/* Check if memory is allocated in a block */
-	for (p = mem_pool->mp_block; p; p = p->next_block)
+	for (p = pool->mp_block; p; p = p->next_block)
 		if ((mem >= ((void *)p->space)) &&
 		    (mem < ((void *)p->end)))
 			return 1;
diff --git a/mem-pool.h b/mem-pool.h
index 999d3c3a52..fe7507f022 100644
--- a/mem-pool.h
+++ b/mem-pool.h
@@ -24,12 +24,12 @@ struct mem_pool {
 /*
  * Initialize mem_pool with specified initial size.
  */
-void mem_pool_init(struct mem_pool **mem_pool, size_t initial_size);
+void mem_pool_init(struct mem_pool *pool, size_t initial_size);
 
 /*
- * Discard a memory pool and free all the memory it is responsible for.
+ * Discard all the memory the memory pool is responsible for.
  */
-void mem_pool_discard(struct mem_pool *mem_pool, int invalidate_memory);
+void mem_pool_discard(struct mem_pool *pool, int invalidate_memory);
 
 /*
  * Alloc memory from the mem_pool.
@@ -42,6 +42,12 @@ void *mem_pool_alloc(struct mem_pool *pool, size_t len);
 void *mem_pool_calloc(struct mem_pool *pool, size_t count, size_t size);
 
 /*
+ * Allocate memory from the memory pool and copy str into it.
+ */
+char *mem_pool_strdup(struct mem_pool *pool, const char *str);
+char *mem_pool_strndup(struct mem_pool *pool, const char *str, size_t len);
+
+/*
  * Move the memory associated with the 'src' pool to the 'dst' pool. The 'src'
  * pool will be empty and not contain any memory. It still needs to be free'd
  * with a call to `mem_pool_discard`.
@@ -52,6 +58,6 @@ void mem_pool_combine(struct mem_pool *dst, struct mem_pool *src);
  * Check if a memory pointed at by 'mem' is part of the range of
  * memory managed by the specified mem_pool.
  */
-int mem_pool_contains(struct mem_pool *mem_pool, void *mem);
+int mem_pool_contains(struct mem_pool *pool, void *mem);
 
 #endif
diff --git a/merge-ort-wrappers.c b/merge-ort-wrappers.c
new file mode 100644
index 0000000000..ad04106169
--- /dev/null
+++ b/merge-ort-wrappers.c
@@ -0,0 +1,62 @@
+#include "cache.h"
+#include "merge-ort.h"
+#include "merge-ort-wrappers.h"
+
+#include "commit.h"
+
+static int unclean(struct merge_options *opt, struct tree *head)
+{
+	/* Sanity check on repo state; index must match head */
+	struct strbuf sb = STRBUF_INIT;
+
+	if (head && repo_index_has_changes(opt->repo, head, &sb)) {
+		fprintf(stderr, _("Your local changes to the following files would be overwritten by merge:\n  %s"),
+		    sb.buf);
+		strbuf_release(&sb);
+		return -1;
+	}
+
+	return 0;
+}
+
+int merge_ort_nonrecursive(struct merge_options *opt,
+			   struct tree *head,
+			   struct tree *merge,
+			   struct tree *merge_base)
+{
+	struct merge_result result;
+
+	if (unclean(opt, head))
+		return -1;
+
+	if (oideq(&merge_base->object.oid, &merge->object.oid)) {
+		printf_ln(_("Already up to date."));
+		return 1;
+	}
+
+	memset(&result, 0, sizeof(result));
+	merge_incore_nonrecursive(opt, merge_base, head, merge, &result);
+	merge_switch_to_result(opt, head, &result, 1, 1);
+
+	return result.clean;
+}
+
+int merge_ort_recursive(struct merge_options *opt,
+			struct commit *side1,
+			struct commit *side2,
+			struct commit_list *merge_bases,
+			struct commit **result)
+{
+	struct tree *head = repo_get_commit_tree(opt->repo, side1);
+	struct merge_result tmp;
+
+	if (unclean(opt, head))
+		return -1;
+
+	memset(&tmp, 0, sizeof(tmp));
+	merge_incore_recursive(opt, merge_bases, side1, side2, &tmp);
+	merge_switch_to_result(opt, head, &tmp, 1, 1);
+	*result = NULL;
+
+	return tmp.clean;
+}
diff --git a/merge-ort-wrappers.h b/merge-ort-wrappers.h
new file mode 100644
index 0000000000..0c4c57adbb
--- /dev/null
+++ b/merge-ort-wrappers.h
@@ -0,0 +1,25 @@
+#ifndef MERGE_ORT_WRAPPERS_H
+#define MERGE_ORT_WRAPPERS_H
+
+#include "merge-recursive.h"
+
+/*
+ * rename-detecting three-way merge, no recursion.
+ * Wrapper mimicking the old merge_trees() function.
+ */
+int merge_ort_nonrecursive(struct merge_options *opt,
+			   struct tree *head,
+			   struct tree *merge,
+			   struct tree *common);
+
+/*
+ * rename-detecting three-way merge with recursive ancestor consolidation.
+ * Wrapper mimicking the old merge_recursive() function.
+ */
+int merge_ort_recursive(struct merge_options *opt,
+			struct commit *h1,
+			struct commit *h2,
+			struct commit_list *ancestors,
+			struct commit **result);
+
+#endif
diff --git a/merge-ort.c b/merge-ort.c
new file mode 100644
index 0000000000..515dc39b7f
--- /dev/null
+++ b/merge-ort.c
@@ -0,0 +1,4666 @@
+/*
+ * "Ostensibly Recursive's Twin" merge strategy, or "ort" for short.  Meant
+ * as a drop-in replacement for the "recursive" merge strategy, allowing one
+ * to replace
+ *
+ *   git merge [-s recursive]
+ *
+ * with
+ *
+ *   git merge -s ort
+ *
+ * Note: git's parser allows the space between '-s' and its argument to be
+ * missing.  (Should I have backronymed "ham", "alsa", "kip", "nap, "alvo",
+ * "cale", "peedy", or "ins" instead of "ort"?)
+ */
+
+#include "cache.h"
+#include "merge-ort.h"
+
+#include "alloc.h"
+#include "attr.h"
+#include "blob.h"
+#include "cache-tree.h"
+#include "commit.h"
+#include "commit-reach.h"
+#include "diff.h"
+#include "diffcore.h"
+#include "dir.h"
+#include "entry.h"
+#include "ll-merge.h"
+#include "object-store.h"
+#include "promisor-remote.h"
+#include "revision.h"
+#include "strmap.h"
+#include "submodule.h"
+#include "tree.h"
+#include "unpack-trees.h"
+#include "xdiff-interface.h"
+
+/*
+ * We have many arrays of size 3.  Whenever we have such an array, the
+ * indices refer to one of the sides of the three-way merge.  This is so
+ * pervasive that the constants 0, 1, and 2 are used in many places in the
+ * code (especially in arithmetic operations to find the other side's index
+ * or to compute a relevant mask), but sometimes these enum names are used
+ * to aid code clarity.
+ *
+ * See also 'filemask' and 'dirmask' in struct conflict_info; the "ith side"
+ * referred to there is one of these three sides.
+ */
+enum merge_side {
+	MERGE_BASE = 0,
+	MERGE_SIDE1 = 1,
+	MERGE_SIDE2 = 2
+};
+
+static unsigned RESULT_INITIALIZED = 0x1abe11ed; /* unlikely accidental value */
+
+struct traversal_callback_data {
+	unsigned long mask;
+	unsigned long dirmask;
+	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
+	 * for the sides in enum merge_side.  Index 0 is almost always unused
+	 * because we often only need to track information for MERGE_SIDE1 and
+	 * MERGE_SIDE2 (MERGE_BASE can't have rename information since renames
+	 * are determined relative to what changed since the MERGE_BASE).
+	 */
+
+	/*
+	 * pairs: pairing of filenames from diffcore_rename()
+	 */
+	struct diff_queue_struct pairs[3];
+
+	/*
+	 * dirs_removed: directories removed on a given side of history.
+	 *
+	 * The keys of dirs_removed[side] are the directories that were removed
+	 * on the given side of history.  The value of the strintmap for each
+	 * directory is a value from enum dir_rename_relevance.
+	 */
+	struct strintmap dirs_removed[3];
+
+	/*
+	 * dir_rename_count: tracking where parts of a directory were renamed to
+	 *
+	 * When files in a directory are renamed, they may not all go to the
+	 * same location.  Each strmap here tracks:
+	 *      old_dir => {new_dir => int}
+	 * That is, dir_rename_count[side] is a strmap to a strintmap.
+	 */
+	struct strmap dir_rename_count[3];
+
+	/*
+	 * dir_renames: computed directory renames
+	 *
+	 * This is a map of old_dir => new_dir and is derived in part from
+	 * dir_rename_count.
+	 */
+	struct strmap dir_renames[3];
+
+	/*
+	 * relevant_sources: deleted paths wanted in rename detection, and why
+	 *
+	 * relevant_sources is a set of deleted paths on each side of
+	 * history for which we need rename detection.  If a path is deleted
+	 * on one side of history, we need to detect if it is part of a
+	 * rename if either
+	 *    * the file is modified/deleted on the other side of history
+	 *    * we need to detect renames for an ancestor directory
+	 * If neither of those are true, we can skip rename detection for
+	 * that path.  The reason is stored as a value from enum
+	 * file_rename_relevance, as the reason can inform the algorithm in
+	 * diffcore_rename_extended().
+	 */
+	struct strintmap relevant_sources[3];
+
+	struct deferred_traversal_data deferred[3];
+
+	/*
+	 * dir_rename_mask:
+	 *   0: optimization removing unmodified potential rename source okay
+	 *   2 or 4: optimization okay, but must check for files added to dir
+	 *   7: optimization forbidden; need rename source in case of dir rename
+	 */
+	unsigned dir_rename_mask:3;
+
+	/*
+	 * callback_data_*: supporting data structures for alternate traversal
+	 *
+	 * We sometimes need to be able to traverse through all the files
+	 * in a given tree before all immediate subdirectories within that
+	 * tree.  Since traverse_trees() doesn't do that naturally, we have
+	 * a traverse_trees_wrapper() that stores any immediate
+	 * subdirectories while traversing files, then traverses the
+	 * immediate subdirectories later.  These callback_data* variables
+	 * store the information for the subdirectories so that we can do
+	 * that traversal order.
+	 */
+	struct traversal_callback_data *callback_data;
+	int callback_data_nr, callback_data_alloc;
+	char *callback_data_traverse_path;
+
+	/*
+	 * merge_trees: trees passed to the merge algorithm for the merge
+	 *
+	 * merge_trees records the trees passed to the merge algorithm.  But,
+	 * this data also is stored in merge_result->priv.  If a sequence of
+	 * merges are being done (such as when cherry-picking or rebasing),
+	 * the next merge can look at this and re-use information from
+	 * previous merges under certain circumstances.
+	 *
+	 * See also all the cached_* variables.
+	 */
+	struct tree *merge_trees[3];
+
+	/*
+	 * cached_pairs_valid_side: which side's cached info can be reused
+	 *
+	 * See the description for merge_trees.  For repeated merges, at most
+	 * only one side's cached information can be used.  Valid values:
+	 *   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;
+
+	/*
+	 * cached_pairs: Caching of renames and deletions.
+	 *
+	 * These are mappings recording renames and deletions of individual
+	 * files (not directories).  They are thus a map from an old
+	 * filename to either NULL (for deletions) or a new filename (for
+	 * renames).
+	 */
+	struct strmap cached_pairs[3];
+
+	/*
+	 * cached_target_names: just the destinations from cached_pairs
+	 *
+	 * We sometimes want a fast lookup to determine if a given filename
+	 * is one of the destinations in cached_pairs.  cached_target_names
+	 * is thus duplicative information, but it provides a fast lookup.
+	 */
+	struct strset cached_target_names[3];
+
+	/*
+	 * cached_irrelevant: Caching of rename_sources that aren't relevant.
+	 *
+	 * If we try to detect a rename for a source path and succeed, it's
+	 * part of a rename.  If we try to detect a rename for a source path
+	 * and fail, then it's a delete.  If we do not try to detect a rename
+	 * for a path, then we don't know if it's a rename or a delete.  If
+	 * merge-ort doesn't think the path is relevant, then we just won't
+	 * cache anything for that path.  But there's a slight problem in
+	 * that merge-ort can think a path is RELEVANT_LOCATION, but due to
+	 * commit 9bd342137e ("diffcore-rename: determine which
+	 * relevant_sources are no longer relevant", 2021-03-13),
+	 * diffcore-rename can downgrade the path to RELEVANT_NO_MORE.  To
+	 * avoid excessive calls to diffcore_rename_extended() we still need
+	 * to cache such paths, though we cannot record them as either
+	 * renames or deletes.  So we cache them here as a "turned out to be
+	 * irrelevant *for this commit*" as they are often also irrelevant
+	 * for subsequent commits, though we will have to do some extra
+	 * checking to see whether such paths become relevant for rename
+	 * detection when cherry-picking/rebasing subsequent commits.
+	 */
+	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
+	 * rename detection to run, this records the limit needed.  Otherwise,
+	 * this value remains 0.
+	 */
+	int needed_limit;
+};
+
+struct merge_options_internal {
+	/*
+	 * paths: primary data structure in all of merge ort.
+	 *
+	 * The keys of paths:
+	 *   * are full relative paths from the toplevel of the repository
+	 *     (e.g. "drivers/firmware/raspberrypi.c").
+	 *   * store all relevant paths in the repo, both directories and
+	 *     files (e.g. drivers, drivers/firmware would also be included)
+	 *   * 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.
+	 *
+	 * The values of paths:
+	 *   * either a pointer to a merged_info, or a conflict_info struct
+	 *   * merged_info contains all relevant information for a
+	 *     non-conflicted entry.
+	 *   * conflict_info contains a merged_info, plus any additional
+	 *     information about a conflict such as the higher orders stages
+	 *     involved and the names of the paths those came from (handy
+	 *     once renames get involved).
+	 *   * a path may start "conflicted" (i.e. point to a conflict_info)
+	 *     and then a later step (e.g. three-way content merge) determines
+	 *     it can be cleanly merged, at which point it'll be marked clean
+	 *     and the algorithm will ignore any data outside the contained
+	 *     merged_info for that entry
+	 *   * If an entry remains conflicted, the merged_info portion of a
+	 *     conflict_info will later be filled with whatever version of
+	 *     the file should be placed in the working directory (e.g. an
+	 *     as-merged-as-possible variation that contains conflict markers).
+	 */
+	struct strmap paths;
+
+	/*
+	 * conflicted: a subset of keys->values from "paths"
+	 *
+	 * conflicted is basically an optimization between process_entries()
+	 * and record_conflicted_index_entries(); the latter could loop over
+	 * ALL the entries in paths AGAIN and look for the ones that are
+	 * still conflicted, but since process_entries() has to loop over
+	 * all of them, it saves the ones it couldn't resolve in this strmap
+	 * so that record_conflicted_index_entries() can iterate just the
+	 * relevant entries.
+	 */
+	struct strmap conflicted;
+
+	/*
+	 * pool: memory pool for fast allocation/deallocation
+	 *
+	 * 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 mem_pool pool;
+
+	/*
+	 * output: special messages and conflict notices for various paths
+	 *
+	 * This is a map of pathnames (a subset of the keys in "paths" above)
+	 * to strbufs.  It gathers various warning/conflict/notice messages
+	 * for later processing.
+	 */
+	struct strmap output;
+
+	/*
+	 * renames: various data relating to rename detection
+	 */
+	struct rename_info renames;
+
+	/*
+	 * attr_index: hacky minimal index used for renormalization
+	 *
+	 * renormalization code _requires_ an index, though it only needs to
+	 * find a .gitattributes file within the index.  So, when
+	 * renormalization is important, we create a special index with just
+	 * that one file.
+	 */
+	struct index_state attr_index;
+
+	/*
+	 * current_dir_name, toplevel_dir: temporary vars
+	 *
+	 * These are used in collect_merge_info_callback(), and will set the
+	 * various merged_info.directory_name for the various paths we get;
+	 * see documentation for that variable and the requirements placed on
+	 * that field.
+	 */
+	const char *current_dir_name;
+	const char *toplevel_dir;
+
+	/* call_depth: recursion level counter for merging merge bases */
+	int call_depth;
+};
+
+struct version_info {
+	struct object_id oid;
+	unsigned short mode;
+};
+
+struct merged_info {
+	/* if is_null, ignore result.  otherwise result has oid & mode */
+	struct version_info result;
+	unsigned is_null:1;
+
+	/*
+	 * clean: whether the path in question is cleanly merged.
+	 *
+	 * see conflict_info.merged for more details.
+	 */
+	unsigned clean:1;
+
+	/*
+	 * basename_offset: offset of basename of path.
+	 *
+	 * perf optimization to avoid recomputing offset of final '/'
+	 * character in pathname (0 if no '/' in pathname).
+	 */
+	size_t basename_offset;
+
+	 /*
+	  * directory_name: containing directory name.
+	  *
+	  * Note that we assume directory_name is constructed such that
+	  *    strcmp(dir1_name, dir2_name) == 0 iff dir1_name == dir2_name,
+	  * i.e. string equality is equivalent to pointer equality.  For this
+	  * to hold, we have to be careful setting directory_name.
+	  */
+	const char *directory_name;
+};
+
+struct conflict_info {
+	/*
+	 * merged: the version of the path that will be written to working tree
+	 *
+	 * WARNING: It is critical to check merged.clean and ensure it is 0
+	 * before reading any conflict_info fields outside of merged.
+	 * Allocated merge_info structs will always have clean set to 1.
+	 * Allocated conflict_info structs will have merged.clean set to 0
+	 * initially.  The merged.clean field is how we know if it is safe
+	 * to access other parts of conflict_info besides merged; if a
+	 * conflict_info's merged.clean is changed to 1, the rest of the
+	 * algorithm is not allowed to look at anything outside of the
+	 * merged member anymore.
+	 */
+	struct merged_info merged;
+
+	/* oids & modes from each of the three trees for this path */
+	struct version_info stages[3];
+
+	/* pathnames for each stage; may differ due to rename detection */
+	const char *pathnames[3];
+
+	/* Whether this path is/was involved in a directory/file conflict */
+	unsigned df_conflict:1;
+
+	/*
+	 * Whether this path is/was involved in a non-content conflict other
+	 * than a directory/file conflict (e.g. rename/rename, rename/delete,
+	 * file location based on possible directory rename).
+	 */
+	unsigned path_conflict:1;
+
+	/*
+	 * For filemask and dirmask, the ith bit corresponds to whether the
+	 * ith entry is a file (filemask) or a directory (dirmask).  Thus,
+	 * filemask & dirmask is always zero, and filemask | dirmask is at
+	 * most 7 but can be less when a path does not appear as either a
+	 * file or a directory on at least one side of history.
+	 *
+	 * Note that these masks are related to enum merge_side, as the ith
+	 * entry corresponds to side i.
+	 *
+	 * These values come from a traverse_trees() call; more info may be
+	 * found looking at tree-walk.h's struct traverse_info,
+	 * particularly the documentation above the "fn" member (note that
+	 * filemask = mask & ~dirmask from that documentation).
+	 */
+	unsigned filemask:3;
+	unsigned dirmask:3;
+
+	/*
+	 * Optimization to track which stages match, to avoid the need to
+	 * recompute it in multiple steps. Either 0 or at least 2 bits are
+	 * set; if at least 2 bits are set, their corresponding stages match.
+	 */
+	unsigned match_mask:3;
+};
+
+/*** Function Grouping: various utility functions ***/
+
+/*
+ * For the next three macros, see warning for conflict_info.merged.
+ *
+ * In each of the below, mi is a struct merged_info*, and ci was defined
+ * as a struct conflict_info* (but we need to verify ci isn't actually
+ * pointed at a struct merged_info*).
+ *
+ * INITIALIZE_CI: Assign ci to mi but only if it's safe; set to NULL otherwise.
+ * VERIFY_CI: Ensure that something we assigned to a conflict_info* is one.
+ * ASSIGN_AND_VERIFY_CI: Similar to VERIFY_CI but do assignment first.
+ */
+#define INITIALIZE_CI(ci, mi) do {                                           \
+	(ci) = (!(mi) || (mi)->clean) ? NULL : (struct conflict_info *)(mi); \
+} while (0)
+#define VERIFY_CI(ci) assert(ci && !ci->merged.clean);
+#define ASSIGN_AND_VERIFY_CI(ci, mi) do {    \
+	(ci) = (struct conflict_info *)(mi);  \
+	assert((ci) && !(mi)->clean);        \
+} while (0)
+
+static void free_strmap_strings(struct strmap *map)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+
+	strmap_for_each_entry(map, &iter, entry) {
+		free((char*)entry->key);
+	}
+}
+
+static void clear_or_reinit_internal_opts(struct merge_options_internal *opti,
+					  int reinitialize)
+{
+	struct rename_info *renames = &opti->renames;
+	int i;
+	void (*strmap_clear_func)(struct strmap *, int) =
+		reinitialize ? strmap_partial_clear : strmap_clear;
+	void (*strintmap_clear_func)(struct strintmap *) =
+		reinitialize ? strintmap_partial_clear : strintmap_clear;
+	void (*strset_clear_func)(struct strset *) =
+		reinitialize ? strset_partial_clear : strset_clear;
+
+	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_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_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 &&
+		    -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;
+
+	if (!reinitialize) {
+		struct hashmap_iter iter;
+		struct strmap_entry *e;
+
+		/* Release and free each strbuf found in output */
+		strmap_for_each_entry(&opti->output, &iter, e) {
+			struct strbuf *sb = e->value;
+			strbuf_release(sb);
+			/*
+			 * While strictly speaking we don't need to free(sb)
+			 * here because we could pass free_values=1 when
+			 * calling strmap_clear() on opti->output, that would
+			 * require strmap_clear to do another
+			 * strmap_for_each_entry() loop, so we just free it
+			 * while we're iterating anyway.
+			 */
+			free(sb);
+		}
+		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;
+	struct strbuf sb = STRBUF_INIT;
+
+	strbuf_addstr(&sb, "error: ");
+	va_start(params, err);
+	strbuf_vaddf(&sb, err, params);
+	va_end(params);
+
+	error("%s", sb.buf);
+	strbuf_release(&sb);
+
+	return -1;
+}
+
+static void format_commit(struct strbuf *sb,
+			  int indent,
+			  struct commit *commit)
+{
+	struct merge_remote_desc *desc;
+	struct pretty_print_context ctx = {0};
+	ctx.abbrev = DEFAULT_ABBREV;
+
+	strbuf_addchars(sb, ' ', indent);
+	desc = merge_remote_util(commit);
+	if (desc) {
+		strbuf_addf(sb, "virtual %s\n", desc->name);
+		return;
+	}
+
+	format_commit_message(commit, "%h %s", sb, &ctx);
+	strbuf_addch(sb, '\n');
+}
+
+__attribute__((format (printf, 4, 5)))
+static void path_msg(struct merge_options *opt,
+		     const char *path,
+		     int omittable_hint, /* skippable under --remerge-diff */
+		     const char *fmt, ...)
+{
+	va_list ap;
+	struct strbuf *sb = strmap_get(&opt->priv->output, path);
+	if (!sb) {
+		sb = xmalloc(sizeof(*sb));
+		strbuf_init(sb, 0);
+		strmap_put(&opt->priv->output, path, sb);
+	}
+
+	va_start(ap, fmt);
+	strbuf_vaddf(sb, fmt, ap);
+	va_end(ap);
+
+	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)
+{
+	size_t i = out->len;
+	strbuf_addstr(out, s);
+	for (; i < out->len; i++)
+		if (out->buf[i] == '/')
+			out->buf[i] = '_';
+}
+
+static char *unique_path(struct strmap *existing_paths,
+			 const char *path,
+			 const char *branch)
+{
+	struct strbuf newpath = STRBUF_INIT;
+	int suffix = 0;
+	size_t base_len;
+
+	strbuf_addf(&newpath, "%s~", path);
+	add_flattened_path(&newpath, branch);
+
+	base_len = newpath.len;
+	while (strmap_contains(existing_paths, newpath.buf)) {
+		strbuf_setlen(&newpath, base_len);
+		strbuf_addf(&newpath, "_%d", suffix++);
+	}
+
+	return strbuf_detach(&newpath, NULL);
+}
+
+/*** Function Grouping: functions related to collect_merge_info() ***/
+
+static int traverse_trees_wrapper_callback(int n,
+					   unsigned long mask,
+					   unsigned long dirmask,
+					   struct name_entry *names,
+					   struct traverse_info *info)
+{
+	struct merge_options *opt = info->data;
+	struct rename_info *renames = &opt->priv->renames;
+	unsigned filemask = mask & ~dirmask;
+
+	assert(n==3);
+
+	if (!renames->callback_data_traverse_path)
+		renames->callback_data_traverse_path = xstrdup(info->traverse_path);
+
+	if (filemask && filemask == renames->dir_rename_mask)
+		renames->dir_rename_mask = 0x07;
+
+	ALLOC_GROW(renames->callback_data, renames->callback_data_nr + 1,
+		   renames->callback_data_alloc);
+	renames->callback_data[renames->callback_data_nr].mask = mask;
+	renames->callback_data[renames->callback_data_nr].dirmask = dirmask;
+	COPY_ARRAY(renames->callback_data[renames->callback_data_nr].names,
+		   names, 3);
+	renames->callback_data_nr++;
+
+	return mask;
+}
+
+/*
+ * Much like traverse_trees(), BUT:
+ *   - read all the tree entries FIRST, saving them
+ *   - note that the above step provides an opportunity to compute necessary
+ *     additional details before the "real" traversal
+ *   - loop through the saved entries and call the original callback on them
+ */
+static int traverse_trees_wrapper(struct index_state *istate,
+				  int n,
+				  struct tree_desc *t,
+				  struct traverse_info *info)
+{
+	int ret, i, old_offset;
+	traverse_callback_t old_fn;
+	char *old_callback_data_traverse_path;
+	struct merge_options *opt = info->data;
+	struct rename_info *renames = &opt->priv->renames;
+
+	assert(renames->dir_rename_mask == 2 || renames->dir_rename_mask == 4);
+
+	old_callback_data_traverse_path = renames->callback_data_traverse_path;
+	old_fn = info->fn;
+	old_offset = renames->callback_data_nr;
+
+	renames->callback_data_traverse_path = NULL;
+	info->fn = traverse_trees_wrapper_callback;
+	ret = traverse_trees(istate, n, t, info);
+	if (ret < 0)
+		return ret;
+
+	info->traverse_path = renames->callback_data_traverse_path;
+	info->fn = old_fn;
+	for (i = old_offset; i < renames->callback_data_nr; ++i) {
+		info->fn(n,
+			 renames->callback_data[i].mask,
+			 renames->callback_data[i].dirmask,
+			 renames->callback_data[i].names,
+			 info);
+	}
+
+	renames->callback_data_nr = old_offset;
+	free(renames->callback_data_traverse_path);
+	renames->callback_data_traverse_path = old_callback_data_traverse_path;
+	info->traverse_path = NULL;
+	return 0;
+}
+
+static void setup_path_info(struct merge_options *opt,
+			    struct string_list_item *result,
+			    const char *current_dir_name,
+			    int current_dir_name_len,
+			    char *fullpath, /* we'll take over ownership */
+			    struct name_entry *names,
+			    struct name_entry *merged_version,
+			    unsigned is_null,     /* boolean */
+			    unsigned df_conflict, /* boolean */
+			    unsigned filemask,
+			    unsigned dirmask,
+			    int resolved          /* boolean */)
+{
+	/* result->util is void*, so mi is a convenience typed variable */
+	struct merged_info *mi;
+
+	assert(!is_null || resolved);
+	assert(!df_conflict || !resolved); /* df_conflict implies !resolved */
+	assert(resolved == (merged_version != NULL));
+
+	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;
+	if (resolved) {
+		mi->result.mode = merged_version->mode;
+		oidcpy(&mi->result.oid, &merged_version->oid);
+		mi->is_null = !!is_null;
+	} else {
+		int i;
+		struct conflict_info *ci;
+
+		ASSIGN_AND_VERIFY_CI(ci, mi);
+		for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) {
+			ci->pathnames[i] = fullpath;
+			ci->stages[i].mode = names[i].mode;
+			oidcpy(&ci->stages[i].oid, &names[i].oid);
+		}
+		ci->filemask = filemask;
+		ci->dirmask = dirmask;
+		ci->df_conflict = !!df_conflict;
+		if (dirmask)
+			/*
+			 * Assume is_null for now, but if we have entries
+			 * under the directory then when it is complete in
+			 * write_completed_directory() it'll update this.
+			 * Also, for D/F conflicts, we have to handle the
+			 * directory first, then clear this bit and process
+			 * the file to see how it is handled -- that occurs
+			 * near the top of process_entry().
+			 */
+			mi->is_null = 1;
+	}
+	strmap_put(&opt->priv->paths, fullpath, mi);
+	result->string = fullpath;
+	result->util = mi;
+}
+
+static void add_pair(struct merge_options *opt,
+		     struct name_entry *names,
+		     const char *pathname,
+		     unsigned side,
+		     unsigned is_add /* if false, is_delete */,
+		     unsigned match_mask,
+		     unsigned dir_rename_mask)
+{
+	struct diff_filespec *one, *two;
+	struct rename_info *renames = &opt->priv->renames;
+	int names_idx = is_add ? side : 0;
+
+	if (is_add) {
+		assert(match_mask == 0 || match_mask == 6);
+		if (strset_contains(&renames->cached_target_names[side],
+				    pathname))
+			return;
+	} else {
+		unsigned content_relevant = (match_mask == 0);
+		unsigned location_relevant = (dir_rename_mask == 0x07);
+
+		assert(match_mask == 0 || match_mask == 3 || match_mask == 5);
+
+		/*
+		 * If pathname is found in cached_irrelevant[side] due to
+		 * previous pick but for this commit content is relevant,
+		 * then we need to remove it from cached_irrelevant.
+		 */
+		if (content_relevant)
+			/* strset_remove is no-op if strset doesn't have key */
+			strset_remove(&renames->cached_irrelevant[side],
+				      pathname);
+
+		/*
+		 * We do not need to re-detect renames for paths that we already
+		 * know the pairing, i.e. for cached_pairs (or
+		 * cached_irrelevant).  However, handle_deferred_entries() needs
+		 * to loop over the union of keys from relevant_sources[side] and
+		 * cached_pairs[side], so for simplicity we set relevant_sources
+		 * for all the cached_pairs too and then strip them back out in
+		 * prune_cached_from_relevant() at the beginning of
+		 * detect_regular_renames().
+		 */
+		if (content_relevant || location_relevant) {
+			/* content_relevant trumps location_relevant */
+			strintmap_set(&renames->relevant_sources[side], pathname,
+				      content_relevant ? RELEVANT_CONTENT : RELEVANT_LOCATION);
+		}
+
+		/*
+		 * Avoid creating pair if we've already cached rename results.
+		 * Note that we do this after setting relevant_sources[side]
+		 * as noted in the comment above.
+		 */
+		if (strmap_contains(&renames->cached_pairs[side], pathname) ||
+		    strset_contains(&renames->cached_irrelevant[side], pathname))
+			return;
+	}
+
+	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);
+	pool_diff_queue(&opt->priv->pool, &renames->pairs[side], one, two);
+}
+
+static void collect_rename_info(struct merge_options *opt,
+				struct name_entry *names,
+				const char *dirname,
+				const char *fullname,
+				unsigned filemask,
+				unsigned dirmask,
+				unsigned match_mask)
+{
+	struct rename_info *renames = &opt->priv->renames;
+	unsigned side;
+
+	/*
+	 * Update dir_rename_mask (determines ignore-rename-source validity)
+	 *
+	 * dir_rename_mask helps us keep track of when directory rename
+	 * detection may be relevant.  Basically, whenver a directory is
+	 * removed on one side of history, and a file is added to that
+	 * directory on the other side of history, directory rename
+	 * detection is relevant (meaning we have to detect renames for all
+	 * files within that directory to deduce where the directory
+	 * moved).  Also, whenever a directory needs directory rename
+	 * detection, due to the "majority rules" choice for where to move
+	 * it (see t6423 testcase 1f), we also need to detect renames for
+	 * all files within subdirectories of that directory as well.
+	 *
+	 * Here we haven't looked at files within the directory yet, we are
+	 * just looking at the directory itself.  So, if we aren't yet in
+	 * a case where a parent directory needed directory rename detection
+	 * (i.e. dir_rename_mask != 0x07), and if the directory was removed
+	 * on one side of history, record the mask of the other side of
+	 * history in dir_rename_mask.
+	 */
+	if (renames->dir_rename_mask != 0x07 &&
+	    (dirmask == 3 || dirmask == 5)) {
+		/* simple sanity check */
+		assert(renames->dir_rename_mask == 0 ||
+		       renames->dir_rename_mask == (dirmask & ~1));
+		/* update dir_rename_mask; have it record mask of new side */
+		renames->dir_rename_mask = (dirmask & ~1);
+	}
+
+	/* Update dirs_removed, as needed */
+	if (dirmask == 1 || dirmask == 3 || dirmask == 5) {
+		/* absent_mask = 0x07 - dirmask; sides = absent_mask/2 */
+		unsigned sides = (0x07 - dirmask)/2;
+		unsigned relevance = (renames->dir_rename_mask == 0x07) ?
+					RELEVANT_FOR_ANCESTOR : NOT_RELEVANT;
+		/*
+		 * Record relevance of this directory.  However, note that
+		 * when collect_merge_info_callback() recurses into this
+		 * directory and calls collect_rename_info() on paths
+		 * within that directory, if we find a path that was added
+		 * to this directory on the other side of history, we will
+		 * upgrade this value to RELEVANT_FOR_SELF; see below.
+		 */
+		if (sides & 1)
+			strintmap_set(&renames->dirs_removed[1], fullname,
+				      relevance);
+		if (sides & 2)
+			strintmap_set(&renames->dirs_removed[2], fullname,
+				      relevance);
+	}
+
+	/*
+	 * Here's the block that potentially upgrades to RELEVANT_FOR_SELF.
+	 * When we run across a file added to a directory.  In such a case,
+	 * find the directory of the file and upgrade its relevance.
+	 */
+	if (renames->dir_rename_mask == 0x07 &&
+	    (filemask == 2 || filemask == 4)) {
+		/*
+		 * Need directory rename for parent directory on other side
+		 * of history from added file.  Thus
+		 *    side = (~filemask & 0x06) >> 1
+		 * or
+		 *    side = 3 - (filemask/2).
+		 */
+		unsigned side = 3 - (filemask >> 1);
+		strintmap_set(&renames->dirs_removed[side], dirname,
+			      RELEVANT_FOR_SELF);
+	}
+
+	if (filemask == 0 || filemask == 7)
+		return;
+
+	for (side = MERGE_SIDE1; side <= MERGE_SIDE2; ++side) {
+		unsigned side_mask = (1 << side);
+
+		/* Check for deletion on side */
+		if ((filemask & 1) && !(filemask & side_mask))
+			add_pair(opt, names, fullname, side, 0 /* delete */,
+				 match_mask & filemask,
+				 renames->dir_rename_mask);
+
+		/* Check for addition on side */
+		if (!(filemask & 1) && (filemask & side_mask))
+			add_pair(opt, names, fullname, side, 1 /* add */,
+				 match_mask & filemask,
+				 renames->dir_rename_mask);
+	}
+}
+
+static int collect_merge_info_callback(int n,
+				       unsigned long mask,
+				       unsigned long dirmask,
+				       struct name_entry *names,
+				       struct traverse_info *info)
+{
+	/*
+	 * n is 3.  Always.
+	 * common ancestor (mbase) has mask 1, and stored in index 0 of names
+	 * head of side 1  (side1) has mask 2, and stored in index 1 of names
+	 * head of side 2  (side2) has mask 4, and stored in index 2 of names
+	 */
+	struct merge_options *opt = info->data;
+	struct merge_options_internal *opti = opt->priv;
+	struct rename_info *renames = &opt->priv->renames;
+	struct string_list_item pi;  /* Path Info */
+	struct conflict_info *ci; /* typed alias to pi.util (which is void*) */
+	struct name_entry *p;
+	size_t len;
+	char *fullpath;
+	const char *dirname = opti->current_dir_name;
+	unsigned prev_dir_rename_mask = renames->dir_rename_mask;
+	unsigned filemask = mask & ~dirmask;
+	unsigned match_mask = 0; /* will be updated below */
+	unsigned mbase_null = !(mask & 1);
+	unsigned side1_null = !(mask & 2);
+	unsigned side2_null = !(mask & 4);
+	unsigned side1_matches_mbase = (!side1_null && !mbase_null &&
+					names[0].mode == names[1].mode &&
+					oideq(&names[0].oid, &names[1].oid));
+	unsigned side2_matches_mbase = (!side2_null && !mbase_null &&
+					names[0].mode == names[2].mode &&
+					oideq(&names[0].oid, &names[2].oid));
+	unsigned sides_match = (!side1_null && !side2_null &&
+				names[1].mode == names[2].mode &&
+				oideq(&names[1].oid, &names[2].oid));
+
+	/*
+	 * Note: When a path is a file on one side of history and a directory
+	 * in another, we have a directory/file conflict.  In such cases, if
+	 * the conflict doesn't resolve from renames and deletions, then we
+	 * always leave directories where they are and move files out of the
+	 * way.  Thus, while struct conflict_info has a df_conflict field to
+	 * track such conflicts, we ignore that field for any directories at
+	 * a path and only pay attention to it for files at the given path.
+	 * The fact that we leave directories were they are also means that
+	 * we do not need to worry about getting additional df_conflict
+	 * information propagated from parent directories down to children
+	 * (unlike, say traverse_trees_recursive() in unpack-trees.c, which
+	 * sets a newinfo.df_conflicts field specifically to propagate it).
+	 */
+	unsigned df_conflict = (filemask != 0) && (dirmask != 0);
+
+	/* n = 3 is a fundamental assumption. */
+	if (n != 3)
+		BUG("Called collect_merge_info_callback wrong");
+
+	/*
+	 * A bunch of sanity checks verifying that traverse_trees() calls
+	 * us the way I expect.  Could just remove these at some point,
+	 * though maybe they are helpful to future code readers.
+	 */
+	assert(mbase_null == is_null_oid(&names[0].oid));
+	assert(side1_null == is_null_oid(&names[1].oid));
+	assert(side2_null == is_null_oid(&names[2].oid));
+	assert(!mbase_null || !side1_null || !side2_null);
+	assert(mask > 0 && mask < 8);
+
+	/* Determine match_mask */
+	if (side1_matches_mbase)
+		match_mask = (side2_matches_mbase ? 7 : 3);
+	else if (side2_matches_mbase)
+		match_mask = 5;
+	else if (sides_match)
+		match_mask = 6;
+
+	/*
+	 * Get the name of the relevant filepath, which we'll pass to
+	 * setup_path_info() for tracking.
+	 */
+	p = names;
+	while (!p->mode)
+		p++;
+	len = traverse_path_len(info, p->pathlen);
+
+	/* +1 in both of the following lines to include the NUL byte */
+	fullpath = mem_pool_alloc(&opt->priv->pool, len + 1);
+	make_traverse_path(fullpath, len + 1, info, p->path, p->pathlen);
+
+	/*
+	 * If mbase, side1, and side2 all match, we can resolve early.  Even
+	 * if these are trees, there will be no renames or anything
+	 * underneath.
+	 */
+	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 /* 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;
+	}
+
+	/*
+	 * 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);
+
+	/*
+	 * 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);
+
+	ci = pi.util;
+	VERIFY_CI(ci);
+	ci->match_mask = match_mask;
+
+	/* If dirmask, recurse into subdirectories */
+	if (dirmask) {
+		struct traverse_info newinfo;
+		struct tree_desc t[3];
+		void *buf[3] = {NULL, NULL, NULL};
+		const char *original_dir_name;
+		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;
+		newinfo.name = p->path;
+		newinfo.namelen = p->pathlen;
+		newinfo.pathlen = st_add3(newinfo.pathlen, p->pathlen, 1);
+		/*
+		 * If this directory we are about to recurse into cared about
+		 * its parent directory (the current directory) having a D/F
+		 * conflict, then we'd propagate the masks in this way:
+		 *    newinfo.df_conflicts |= (mask & ~dirmask);
+		 * But we don't worry about propagating D/F conflicts.  (See
+		 * comment near setting of local df_conflict variable near
+		 * the beginning of this function).
+		 */
+
+		for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) {
+			if (i == 1 && side1_matches_mbase)
+				t[1] = t[0];
+			else if (i == 2 && side2_matches_mbase)
+				t[2] = t[0];
+			else if (i == 2 && sides_match)
+				t[2] = t[1];
+			else {
+				const struct object_id *oid = NULL;
+				if (dirmask & 1)
+					oid = &names[i].oid;
+				buf[i] = fill_tree_descriptor(opt->repo,
+							      t + i, oid);
+			}
+			dirmask >>= 1;
+		}
+
+		original_dir_name = opti->current_dir_name;
+		opti->current_dir_name = pi.string;
+		if (renames->dir_rename_mask == 0 ||
+		    renames->dir_rename_mask == 0x07)
+			ret = traverse_trees(NULL, 3, t, &newinfo);
+		else
+			ret = traverse_trees_wrapper(NULL, 3, t, &newinfo);
+		opti->current_dir_name = original_dir_name;
+		renames->dir_rename_mask = prev_dir_rename_mask;
+
+		for (i = MERGE_BASE; i <= MERGE_SIDE2; i++)
+			free(buf[i]);
+
+		if (ret < 0)
+			return -1;
+	}
+
+	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,
+			      struct tree *side2)
+{
+	int ret;
+	struct tree_desc t[3];
+	struct traverse_info info;
+
+	opt->priv->toplevel_dir = "";
+	opt->priv->current_dir_name = opt->priv->toplevel_dir;
+	setup_traverse_info(&info, opt->priv->toplevel_dir);
+	info.fn = collect_merge_info_callback;
+	info.data = opt;
+	info.show_all_errors = 1;
+
+	parse_tree(merge_base);
+	parse_tree(side1);
+	parse_tree(side2);
+	init_tree_desc(t + 0, merge_base->buffer, merge_base->size);
+	init_tree_desc(t + 1, side1->buffer, side1->size);
+	init_tree_desc(t + 2, side2->buffer, side2->size);
+
+	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;
+}
+
+/*** Function Grouping: functions related to threeway content merges ***/
+
+static int find_first_merges(struct repository *repo,
+			     const char *path,
+			     struct commit *a,
+			     struct commit *b,
+			     struct object_array *result)
+{
+	int i, j;
+	struct object_array merges = OBJECT_ARRAY_INIT;
+	struct commit *commit;
+	int contains_another;
+
+	char merged_revision[GIT_MAX_HEXSZ + 2];
+	const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path",
+				   "--all", merged_revision, NULL };
+	struct rev_info revs;
+	struct setup_revision_opt rev_opts;
+
+	memset(result, 0, sizeof(struct object_array));
+	memset(&rev_opts, 0, sizeof(rev_opts));
+
+	/* get all revisions that merge commit a */
+	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);
+
+	/* save all revisions from the above list that contain b */
+	if (prepare_revision_walk(&revs))
+		die("revision walk setup failed");
+	while ((commit = get_revision(&revs)) != NULL) {
+		struct object *o = &(commit->object);
+		if (in_merge_bases(b, commit))
+			add_object_array(o, NULL, &merges);
+	}
+	reset_revision_walk();
+
+	/* Now we've got all merges that contain a and b. Prune all
+	 * merges that contain another found merge and save them in
+	 * result.
+	 */
+	for (i = 0; i < merges.nr; i++) {
+		struct commit *m1 = (struct commit *) merges.objects[i].item;
+
+		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)) {
+				contains_another = 1;
+				break;
+			}
+		}
+
+		if (!contains_another)
+			add_object_array(merges.objects[i].item, NULL, result);
+	}
+
+	object_array_clear(&merges);
+	return result->nr;
+}
+
+static int merge_submodule(struct merge_options *opt,
+			   const char *path,
+			   const struct object_id *o,
+			   const struct object_id *a,
+			   const struct object_id *b,
+			   struct object_id *result)
+{
+	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;
+
+	/* store fallback answer in result in case we fail */
+	oidcpy(result, opt->priv->call_depth ? o : a);
+
+	/* we can not handle deletion conflicts */
+	if (is_null_oid(o))
+		return 0;
+	if (is_null_oid(a))
+		return 0;
+	if (is_null_oid(b))
+		return 0;
+
+	if (add_submodule_odb(path)) {
+		path_msg(opt, path, 0,
+			 _("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))) {
+		path_msg(opt, path, 0,
+			 _("Failed to merge submodule %s (commits not present)"),
+			 path);
+		return 0;
+	}
+
+	/* check whether both changes are forward */
+	if (!in_merge_bases(commit_o, commit_a) ||
+	    !in_merge_bases(commit_o, commit_b)) {
+		path_msg(opt, path, 0,
+			 _("Failed to merge submodule %s "
+			   "(commits don't follow merge-base)"),
+			 path);
+		return 0;
+	}
+
+	/* Case #1: a is contained in b or vice versa */
+	if (in_merge_bases(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;
+	}
+	if (in_merge_bases(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;
+	}
+
+	/*
+	 * Case #2: There are one or more merges that contain a and b in
+	 * the submodule. If there is only one, then present it as a
+	 * suggestion to the user, but leave it marked unmerged so the
+	 * user needs to confirm the resolution.
+	 */
+
+	/* Skip the search if makes no sense to the calling context.  */
+	if (!search)
+		return 0;
+
+	/* find commit which merges them */
+	parent_count = find_first_merges(opt->repo, path, commit_a, commit_b,
+					 &merges);
+	switch (parent_count) {
+	case 0:
+		path_msg(opt, path, 0, _("Failed to merge submodule %s"), path);
+		break;
+
+	case 1:
+		format_commit(&sb, 4,
+			      (struct commit *)merges.objects[0].item);
+		path_msg(opt, path, 0,
+			 _("Failed to merge submodule %s, but a possible merge "
+			   "resolution exists:\n%s\n"),
+			 path, sb.buf);
+		path_msg(opt, path, 1,
+			 _("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"),
+			 oid_to_hex(&merges.objects[0].item->oid), path);
+		strbuf_release(&sb);
+		break;
+	default:
+		for (i = 0; i < merges.nr; i++)
+			format_commit(&sb, 4,
+				      (struct commit *)merges.objects[i].item);
+		path_msg(opt, path, 0,
+			 _("Failed to merge submodule %s, but multiple "
+			   "possible merges exist:\n%s"), path, sb.buf);
+		strbuf_release(&sb);
+	}
+
+	object_array_clear(&merges);
+	return 0;
+}
+
+static void initialize_attr_index(struct merge_options *opt)
+{
+	/*
+	 * The renormalize_buffer() functions require attributes, and
+	 * annoyingly those can only be read from the working tree or from
+	 * an index_state.  merge-ort doesn't have an index_state, so we
+	 * generate a fake one containing only attribute information.
+	 */
+	struct merged_info *mi;
+	struct index_state *attr_index = &opt->priv->attr_index;
+	struct cache_entry *ce;
+
+	attr_index->initialized = 1;
+
+	if (!opt->renormalize)
+		return;
+
+	mi = strmap_get(&opt->priv->paths, GITATTRIBUTES_FILE);
+	if (!mi)
+		return;
+
+	if (mi->clean) {
+		int len = strlen(GITATTRIBUTES_FILE);
+		ce = make_empty_cache_entry(attr_index, len);
+		ce->ce_mode = create_ce_mode(mi->result.mode);
+		ce->ce_flags = create_ce_flags(0);
+		ce->ce_namelen = len;
+		oidcpy(&ce->oid, &mi->result.oid);
+		memcpy(ce->name, GITATTRIBUTES_FILE, len);
+		add_index_entry(attr_index, ce,
+				ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
+		get_stream_filter(attr_index, GITATTRIBUTES_FILE, &ce->oid);
+	} else {
+		int stage, len;
+		struct conflict_info *ci;
+
+		ASSIGN_AND_VERIFY_CI(ci, mi);
+		for (stage = 0; stage < 3; stage++) {
+			unsigned stage_mask = (1 << stage);
+
+			if (!(ci->filemask & stage_mask))
+				continue;
+			len = strlen(GITATTRIBUTES_FILE);
+			ce = make_empty_cache_entry(attr_index, len);
+			ce->ce_mode = create_ce_mode(ci->stages[stage].mode);
+			ce->ce_flags = create_ce_flags(stage);
+			ce->ce_namelen = len;
+			oidcpy(&ce->oid, &ci->stages[stage].oid);
+			memcpy(ce->name, GITATTRIBUTES_FILE, len);
+			add_index_entry(attr_index, ce,
+					ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE);
+			get_stream_filter(attr_index, GITATTRIBUTES_FILE,
+					  &ce->oid);
+		}
+	}
+}
+
+static int merge_3way(struct merge_options *opt,
+		      const char *path,
+		      const struct object_id *o,
+		      const struct object_id *a,
+		      const struct object_id *b,
+		      const char *pathnames[3],
+		      const int extra_marker_size,
+		      mmbuffer_t *result_buf)
+{
+	mmfile_t orig, src1, src2;
+	struct ll_merge_options ll_opts = {0};
+	char *base, *name1, *name2;
+	int merge_status;
+
+	if (!opt->priv->attr_index.initialized)
+		initialize_attr_index(opt);
+
+	ll_opts.renormalize = opt->renormalize;
+	ll_opts.extra_marker_size = extra_marker_size;
+	ll_opts.xdl_opts = opt->xdl_opts;
+
+	if (opt->priv->call_depth) {
+		ll_opts.virtual_ancestor = 1;
+		ll_opts.variant = 0;
+	} else {
+		switch (opt->recursive_variant) {
+		case MERGE_VARIANT_OURS:
+			ll_opts.variant = XDL_MERGE_FAVOR_OURS;
+			break;
+		case MERGE_VARIANT_THEIRS:
+			ll_opts.variant = XDL_MERGE_FAVOR_THEIRS;
+			break;
+		default:
+			ll_opts.variant = 0;
+			break;
+		}
+	}
+
+	assert(pathnames[0] && pathnames[1] && pathnames[2] && opt->ancestor);
+	if (pathnames[0] == pathnames[1] && pathnames[1] == pathnames[2]) {
+		base  = mkpathdup("%s", opt->ancestor);
+		name1 = mkpathdup("%s", opt->branch1);
+		name2 = mkpathdup("%s", opt->branch2);
+	} else {
+		base  = mkpathdup("%s:%s", opt->ancestor, pathnames[0]);
+		name1 = mkpathdup("%s:%s", opt->branch1,  pathnames[1]);
+		name2 = mkpathdup("%s:%s", opt->branch2,  pathnames[2]);
+	}
+
+	read_mmblob(&orig, o);
+	read_mmblob(&src1, a);
+	read_mmblob(&src2, b);
+
+	merge_status = ll_merge(result_buf, path, &orig, base,
+				&src1, name1, &src2, name2,
+				&opt->priv->attr_index, &ll_opts);
+
+	free(base);
+	free(name1);
+	free(name2);
+	free(orig.ptr);
+	free(src1.ptr);
+	free(src2.ptr);
+	return merge_status;
+}
+
+static int handle_content_merge(struct merge_options *opt,
+				const char *path,
+				const struct version_info *o,
+				const struct version_info *a,
+				const struct version_info *b,
+				const char *pathnames[3],
+				const int extra_marker_size,
+				struct version_info *result)
+{
+	/*
+	 * path is the target location where we want to put the file, and
+	 * is used to determine any normalization rules in ll_merge.
+	 *
+	 * The normal case is that path and all entries in pathnames are
+	 * identical, though renames can affect which path we got one of
+	 * the three blobs to merge on various sides of history.
+	 *
+	 * extra_marker_size is the amount to extend conflict markers in
+	 * ll_merge; this is neeed if we have content merges of content
+	 * merges, which happens for example with rename/rename(2to1) and
+	 * rename/add conflicts.
+	 */
+	unsigned clean = 1;
+
+	/*
+	 * handle_content_merge() needs both files to be of the same type, i.e.
+	 * both files OR both submodules OR both symlinks.  Conflicting types
+	 * needs to be handled elsewhere.
+	 */
+	assert((S_IFMT & a->mode) == (S_IFMT & b->mode));
+
+	/* Merge modes */
+	if (a->mode == b->mode || a->mode == o->mode)
+		result->mode = b->mode;
+	else {
+		/* must be the 100644/100755 case */
+		assert(S_ISREG(a->mode));
+		result->mode = a->mode;
+		clean = (b->mode == o->mode);
+		/*
+		 * FIXME: If opt->priv->call_depth && !clean, then we really
+		 * should not make result->mode match either a->mode or
+		 * b->mode; that causes t6036 "check conflicting mode for
+		 * regular file" to fail.  It would be best to use some other
+		 * mode, but we'll confuse all kinds of stuff if we use one
+		 * where S_ISREG(result->mode) isn't true, and if we use
+		 * something like 0100666, then tree-walk.c's calls to
+		 * canon_mode() will just normalize that to 100644 for us and
+		 * thus not solve anything.
+		 *
+		 * Figure out if there's some kind of way we can work around
+		 * this...
+		 */
+	}
+
+	/*
+	 * Trivial oid merge.
+	 *
+	 * Note: While one might assume that the next four lines would
+	 * be unnecessary due to the fact that match_mask is often
+	 * setup and already handled, renames don't always take care
+	 * of that.
+	 */
+	if (oideq(&a->oid, &b->oid) || oideq(&a->oid, &o->oid))
+		oidcpy(&result->oid, &b->oid);
+	else if (oideq(&b->oid, &o->oid))
+		oidcpy(&result->oid, &a->oid);
+
+	/* Remaining rules depend on file vs. submodule vs. symlink. */
+	else if (S_ISREG(a->mode)) {
+		mmbuffer_t result_buf;
+		int ret = 0, merge_status;
+		int two_way;
+
+		/*
+		 * If 'o' is different type, treat it as null so we do a
+		 * two-way merge.
+		 */
+		two_way = ((S_IFMT & o->mode) != (S_IFMT & a->mode));
+
+		merge_status = merge_3way(opt, path,
+					  two_way ? null_oid() : &o->oid,
+					  &a->oid, &b->oid,
+					  pathnames, extra_marker_size,
+					  &result_buf);
+
+		if ((merge_status < 0) || !result_buf.ptr)
+			ret = err(opt, _("Failed to execute internal merge"));
+
+		if (!ret &&
+		    write_object_file(result_buf.ptr, result_buf.size,
+				      blob_type, &result->oid))
+			ret = err(opt, _("Unable to add %s to database"),
+				  path);
+
+		free(result_buf.ptr);
+		if (ret)
+			return -1;
+		clean &= (merge_status == 0);
+		path_msg(opt, path, 1, _("Auto-merging %s"), path);
+	} else if (S_ISGITLINK(a->mode)) {
+		int two_way = ((S_IFMT & o->mode) != (S_IFMT & a->mode));
+		clean = merge_submodule(opt, pathnames[0],
+					two_way ? null_oid() : &o->oid,
+					&a->oid, &b->oid, &result->oid);
+		if (opt->priv->call_depth && two_way && !clean) {
+			result->mode = o->mode;
+			oidcpy(&result->oid, &o->oid);
+		}
+	} else if (S_ISLNK(a->mode)) {
+		if (opt->priv->call_depth) {
+			clean = 0;
+			result->mode = o->mode;
+			oidcpy(&result->oid, &o->oid);
+		} else {
+			switch (opt->recursive_variant) {
+			case MERGE_VARIANT_NORMAL:
+				clean = 0;
+				oidcpy(&result->oid, &a->oid);
+				break;
+			case MERGE_VARIANT_OURS:
+				oidcpy(&result->oid, &a->oid);
+				break;
+			case MERGE_VARIANT_THEIRS:
+				oidcpy(&result->oid, &b->oid);
+				break;
+			}
+		}
+	} else
+		BUG("unsupported object type in the tree: %06o for %s",
+		    a->mode, path);
+
+	return clean;
+}
+
+/*** Function Grouping: functions related to detect_and_process_renames(), ***
+ *** which are split into directory and regular rename detection sections. ***/
+
+/*** Function Grouping: functions related to directory rename detection ***/
+
+struct collision_info {
+	struct string_list source_files;
+	unsigned reported_already:1;
+};
+
+/*
+ * Return a new string that replaces the beginning portion (which matches
+ * rename_info->key), with rename_info->util.new_dir.  In perl-speak:
+ *   new_path_name = (old_path =~ s/rename_info->key/rename_info->value/);
+ * NOTE:
+ *   Caller must ensure that old_path starts with rename_info->key + '/'.
+ */
+static char *apply_dir_rename(struct strmap_entry *rename_info,
+			      const char *old_path)
+{
+	struct strbuf new_path = STRBUF_INIT;
+	const char *old_dir = rename_info->key;
+	const char *new_dir = rename_info->value;
+	int oldlen, newlen, new_dir_len;
+
+	oldlen = strlen(old_dir);
+	if (*new_dir == '\0')
+		/*
+		 * If someone renamed/merged a subdirectory into the root
+		 * directory (e.g. 'some/subdir' -> ''), then we want to
+		 * avoid returning
+		 *     '' + '/filename'
+		 * as the rename; we need to make old_path + oldlen advance
+		 * past the '/' character.
+		 */
+		oldlen++;
+	new_dir_len = strlen(new_dir);
+	newlen = new_dir_len + (strlen(old_path) - oldlen) + 1;
+	strbuf_grow(&new_path, newlen);
+	strbuf_add(&new_path, new_dir, new_dir_len);
+	strbuf_addstr(&new_path, &old_path[oldlen]);
+
+	return strbuf_detach(&new_path, NULL);
+}
+
+static int path_in_way(struct strmap *paths, const char *path, unsigned side_mask)
+{
+	struct merged_info *mi = strmap_get(paths, path);
+	struct conflict_info *ci;
+	if (!mi)
+		return 0;
+	INITIALIZE_CI(ci, mi);
+	return mi->clean || (side_mask & (ci->filemask | ci->dirmask));
+}
+
+/*
+ * See if there is a directory rename for path, and if there are any file
+ * level conflicts on the given side for the renamed location.  If there is
+ * a rename and there are no conflicts, return the new name.  Otherwise,
+ * return NULL.
+ */
+static char *handle_path_level_conflicts(struct merge_options *opt,
+					 const char *path,
+					 unsigned side_index,
+					 struct strmap_entry *rename_info,
+					 struct strmap *collisions)
+{
+	char *new_path = NULL;
+	struct collision_info *c_info;
+	int clean = 1;
+	struct strbuf collision_paths = STRBUF_INIT;
+
+	/*
+	 * entry has the mapping of old directory name to new directory name
+	 * that we want to apply to path.
+	 */
+	new_path = apply_dir_rename(rename_info, path);
+	if (!new_path)
+		BUG("Failed to apply directory rename!");
+
+	/*
+	 * The caller needs to have ensured that it has pre-populated
+	 * collisions with all paths that map to new_path.  Do a quick check
+	 * to ensure that's the case.
+	 */
+	c_info = strmap_get(collisions, new_path);
+	if (c_info == NULL)
+		BUG("c_info is NULL");
+
+	/*
+	 * Check for one-sided add/add/.../add conflicts, i.e.
+	 * where implicit renames from the other side doing
+	 * directory rename(s) can affect this side of history
+	 * to put multiple paths into the same location.  Warn
+	 * and bail on directory renames for such paths.
+	 */
+	if (c_info->reported_already) {
+		clean = 0;
+	} else if (path_in_way(&opt->priv->paths, new_path, 1 << side_index)) {
+		c_info->reported_already = 1;
+		strbuf_add_separated_string_list(&collision_paths, ", ",
+						 &c_info->source_files);
+		path_msg(opt, new_path, 0,
+			 _("CONFLICT (implicit dir rename): Existing file/dir "
+			   "at %s in the way of implicit directory rename(s) "
+			   "putting the following path(s) there: %s."),
+		       new_path, collision_paths.buf);
+		clean = 0;
+	} else if (c_info->source_files.nr > 1) {
+		c_info->reported_already = 1;
+		strbuf_add_separated_string_list(&collision_paths, ", ",
+						 &c_info->source_files);
+		path_msg(opt, new_path, 0,
+			 _("CONFLICT (implicit dir rename): Cannot map more "
+			   "than one path to %s; implicit directory renames "
+			   "tried to put these paths there: %s"),
+		       new_path, collision_paths.buf);
+		clean = 0;
+	}
+
+	/* Free memory we no longer need */
+	strbuf_release(&collision_paths);
+	if (!clean && new_path) {
+		free(new_path);
+		return NULL;
+	}
+
+	return new_path;
+}
+
+static void get_provisional_directory_renames(struct merge_options *opt,
+					      unsigned side,
+					      int *clean)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+	struct rename_info *renames = &opt->priv->renames;
+
+	/*
+	 * Collapse
+	 *    dir_rename_count: old_directory -> {new_directory -> count}
+	 * down to
+	 *    dir_renames: old_directory -> best_new_directory
+	 * where best_new_directory is the one with the unique highest count.
+	 */
+	strmap_for_each_entry(&renames->dir_rename_count[side], &iter, entry) {
+		const char *source_dir = entry->key;
+		struct strintmap *counts = entry->value;
+		struct hashmap_iter count_iter;
+		struct strmap_entry *count_entry;
+		int max = 0;
+		int bad_max = 0;
+		const char *best = NULL;
+
+		strintmap_for_each_entry(counts, &count_iter, count_entry) {
+			const char *target_dir = count_entry->key;
+			intptr_t count = (intptr_t)count_entry->value;
+
+			if (count == max)
+				bad_max = max;
+			else if (count > max) {
+				max = count;
+				best = target_dir;
+			}
+		}
+
+		if (max == 0)
+			continue;
+
+		if (bad_max == max) {
+			path_msg(opt, source_dir, 0,
+			       _("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."),
+			       source_dir);
+			*clean = 0;
+		} else {
+			strmap_put(&renames->dir_renames[side],
+				   source_dir, (void*)best);
+		}
+	}
+}
+
+static void handle_directory_level_conflicts(struct merge_options *opt)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+	struct string_list duplicated = STRING_LIST_INIT_NODUP;
+	struct rename_info *renames = &opt->priv->renames;
+	struct strmap *side1_dir_renames = &renames->dir_renames[MERGE_SIDE1];
+	struct strmap *side2_dir_renames = &renames->dir_renames[MERGE_SIDE2];
+	int i;
+
+	strmap_for_each_entry(side1_dir_renames, &iter, entry) {
+		if (strmap_contains(side2_dir_renames, entry->key))
+			string_list_append(&duplicated, entry->key);
+	}
+
+	for (i = 0; i < duplicated.nr; i++) {
+		strmap_remove(side1_dir_renames, duplicated.items[i].string, 0);
+		strmap_remove(side2_dir_renames, duplicated.items[i].string, 0);
+	}
+	string_list_clear(&duplicated, 0);
+}
+
+static struct strmap_entry *check_dir_renamed(const char *path,
+					      struct strmap *dir_renames)
+{
+	char *temp = xstrdup(path);
+	char *end;
+	struct strmap_entry *e = NULL;
+
+	while ((end = strrchr(temp, '/'))) {
+		*end = '\0';
+		e = strmap_get_entry(dir_renames, temp);
+		if (e)
+			break;
+	}
+	free(temp);
+	return e;
+}
+
+static void compute_collisions(struct strmap *collisions,
+			       struct strmap *dir_renames,
+			       struct diff_queue_struct *pairs)
+{
+	int i;
+
+	strmap_init_with_options(collisions, NULL, 0);
+	if (strmap_empty(dir_renames))
+		return;
+
+	/*
+	 * Multiple files can be mapped to the same path due to directory
+	 * renames done by the other side of history.  Since that other
+	 * side of history could have merged multiple directories into one,
+	 * if our side of history added the same file basename to each of
+	 * those directories, then all N of them would get implicitly
+	 * renamed by the directory rename detection into the same path,
+	 * and we'd get an add/add/.../add conflict, and all those adds
+	 * from *this* side of history.  This is not representable in the
+	 * index, and users aren't going to easily be able to make sense of
+	 * it.  So we need to provide a good warning about what's
+	 * happening, and fall back to no-directory-rename detection
+	 * behavior for those paths.
+	 *
+	 * See testcases 9e and all of section 5 from t6043 for examples.
+	 */
+	for (i = 0; i < pairs->nr; ++i) {
+		struct strmap_entry *rename_info;
+		struct collision_info *collision_info;
+		char *new_path;
+		struct diff_filepair *pair = pairs->queue[i];
+
+		if (pair->status != 'A' && pair->status != 'R')
+			continue;
+		rename_info = check_dir_renamed(pair->two->path, dir_renames);
+		if (!rename_info)
+			continue;
+
+		new_path = apply_dir_rename(rename_info, pair->two->path);
+		assert(new_path);
+		collision_info = strmap_get(collisions, new_path);
+		if (collision_info) {
+			free(new_path);
+		} else {
+			CALLOC_ARRAY(collision_info, 1);
+			string_list_init_nodup(&collision_info->source_files);
+			strmap_put(collisions, new_path, collision_info);
+		}
+		string_list_insert(&collision_info->source_files,
+				   pair->two->path);
+	}
+}
+
+static char *check_for_directory_rename(struct merge_options *opt,
+					const char *path,
+					unsigned side_index,
+					struct strmap *dir_renames,
+					struct strmap *dir_rename_exclusions,
+					struct strmap *collisions,
+					int *clean_merge)
+{
+	char *new_path = NULL;
+	struct strmap_entry *rename_info;
+	struct strmap_entry *otherinfo = NULL;
+	const char *new_dir;
+
+	if (strmap_empty(dir_renames))
+		return new_path;
+	rename_info = check_dir_renamed(path, dir_renames);
+	if (!rename_info)
+		return new_path;
+	/* old_dir = rename_info->key; */
+	new_dir = rename_info->value;
+
+	/*
+	 * This next part is a little weird.  We do not want to do an
+	 * implicit rename into a directory we renamed on our side, because
+	 * that will result in a spurious rename/rename(1to2) conflict.  An
+	 * example:
+	 *   Base commit: dumbdir/afile, otherdir/bfile
+	 *   Side 1:      smrtdir/afile, otherdir/bfile
+	 *   Side 2:      dumbdir/afile, dumbdir/bfile
+	 * Here, while working on Side 1, we could notice that otherdir was
+	 * renamed/merged to dumbdir, and change the diff_filepair for
+	 * otherdir/bfile into a rename into dumbdir/bfile.  However, Side
+	 * 2 will notice the rename from dumbdir to smrtdir, and do the
+	 * transitive rename to move it from dumbdir/bfile to
+	 * smrtdir/bfile.  That gives us bfile in dumbdir vs being in
+	 * smrtdir, a rename/rename(1to2) conflict.  We really just want
+	 * the file to end up in smrtdir.  And the way to achieve that is
+	 * to not let Side1 do the rename to dumbdir, since we know that is
+	 * the source of one of our directory renames.
+	 *
+	 * That's why otherinfo and dir_rename_exclusions is here.
+	 *
+	 * As it turns out, this also prevents N-way transient rename
+	 * confusion; See testcases 9c and 9d of t6043.
+	 */
+	otherinfo = strmap_get_entry(dir_rename_exclusions, new_dir);
+	if (otherinfo) {
+		path_msg(opt, rename_info->key, 1,
+			 _("WARNING: Avoiding applying %s -> %s rename "
+			   "to %s, because %s itself was renamed."),
+			 rename_info->key, new_dir, path, new_dir);
+		return NULL;
+	}
+
+	new_path = handle_path_level_conflicts(opt, path, side_index,
+					       rename_info, collisions);
+	*clean_merge &= (new_path != NULL);
+
+	return new_path;
+}
+
+static void apply_directory_rename_modifications(struct merge_options *opt,
+						 struct diff_filepair *pair,
+						 char *new_path)
+{
+	/*
+	 * The basic idea is to get the conflict_info from opt->priv->paths
+	 * at old path, and insert it into new_path; basically just this:
+	 *     ci = strmap_get(&opt->priv->paths, old_path);
+	 *     strmap_remove(&opt->priv->paths, old_path, 0);
+	 *     strmap_put(&opt->priv->paths, new_path, ci);
+	 * However, there are some factors complicating this:
+	 *     - opt->priv->paths may already have an entry at new_path
+	 *     - Each ci tracks its containing directory, so we need to
+	 *       update that
+	 *     - If another ci has the same containing directory, then
+	 *       the two char*'s MUST point to the same location.  See the
+	 *       comment in struct merged_info.  strcmp equality is not
+	 *       enough; we need pointer equality.
+	 *     - opt->priv->paths must hold the parent directories of any
+	 *       entries that are added.  So, if this directory rename
+	 *       causes entirely new directories, we must recursively add
+	 *       parent directories.
+	 *     - For each parent directory added to opt->priv->paths, we
+	 *       also need to get its parent directory stored in its
+	 *       conflict_info->merged.directory_name with all the same
+	 *       requirements about pointer equality.
+	 */
+	struct string_list dirs_to_insert = STRING_LIST_INIT_NODUP;
+	struct conflict_info *ci, *new_ci;
+	struct strmap_entry *entry;
+	const char *branch_with_new_path, *branch_with_dir_rename;
+	const char *old_path = pair->two->path;
+	const char *parent_name;
+	const char *cur_path;
+	int i, len;
+
+	entry = strmap_get_entry(&opt->priv->paths, old_path);
+	old_path = entry->key;
+	ci = entry->value;
+	VERIFY_CI(ci);
+
+	/* Find parent directories missing from opt->priv->paths */
+	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 = mem_pool_strndup(&opt->priv->pool,
+						       cur_path,
+						       last_slash - cur_path);
+		} else {
+			parent_name = opt->priv->toplevel_dir;
+			break;
+		}
+
+		/* Look it up in opt->priv->paths */
+		entry = strmap_get_entry(&opt->priv->paths, parent_name);
+		if (entry) {
+			parent_name = entry->key; /* reuse known pointer */
+			break;
+		}
+
+		/* Record this is one of the directories we need to insert */
+		string_list_append(&dirs_to_insert, parent_name);
+		cur_path = parent_name;
+	}
+
+	/* Traverse dirs_to_insert and insert them into opt->priv->paths */
+	for (i = dirs_to_insert.nr-1; i >= 0; --i) {
+		struct conflict_info *dir_ci;
+		char *cur_dir = dirs_to_insert.items[i].string;
+
+		CALLOC_ARRAY(dir_ci, 1);
+
+		dir_ci->merged.directory_name = parent_name;
+		len = strlen(parent_name);
+		/* len+1 because of trailing '/' character */
+		dir_ci->merged.basename_offset = (len > 0 ? len+1 : len);
+		dir_ci->dirmask = ci->filemask;
+		strmap_put(&opt->priv->paths, cur_dir, dir_ci);
+
+		parent_name = cur_dir;
+	}
+
+	assert(ci->filemask == 2 || ci->filemask == 4);
+	assert(ci->dirmask == 0);
+	strmap_remove(&opt->priv->paths, old_path, 0);
+
+	branch_with_new_path   = (ci->filemask == 2) ? opt->branch1 : opt->branch2;
+	branch_with_dir_rename = (ci->filemask == 2) ? opt->branch2 : opt->branch1;
+
+	/* Now, finally update ci and stick it into opt->priv->paths */
+	ci->merged.directory_name = parent_name;
+	len = strlen(parent_name);
+	ci->merged.basename_offset = (len > 0 ? len+1 : len);
+	new_ci = strmap_get(&opt->priv->paths, new_path);
+	if (!new_ci) {
+		/* Place ci back into opt->priv->paths, but at new_path */
+		strmap_put(&opt->priv->paths, new_path, ci);
+	} else {
+		int index;
+
+		/* A few sanity checks */
+		VERIFY_CI(new_ci);
+		assert(ci->filemask == 2 || ci->filemask == 4);
+		assert((new_ci->filemask & ci->filemask) == 0);
+		assert(!new_ci->merged.clean);
+
+		/* Copy stuff from ci into new_ci */
+		new_ci->filemask |= ci->filemask;
+		if (new_ci->dirmask)
+			new_ci->df_conflict = 1;
+		index = (ci->filemask >> 1);
+		new_ci->pathnames[index] = ci->pathnames[index];
+		new_ci->stages[index].mode = ci->stages[index].mode;
+		oidcpy(&new_ci->stages[index].oid, &ci->stages[index].oid);
+
+		ci = new_ci;
+	}
+
+	if (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_TRUE) {
+		/* Notify user of updated path */
+		if (pair->status == 'A')
+			path_msg(opt, new_path, 1,
+				 _("Path updated: %s added in %s inside a "
+				   "directory that was renamed in %s; moving "
+				   "it to %s."),
+				 old_path, branch_with_new_path,
+				 branch_with_dir_rename, new_path);
+		else
+			path_msg(opt, new_path, 1,
+				 _("Path updated: %s renamed to %s in %s, "
+				   "inside a directory that was renamed in %s; "
+				   "moving it to %s."),
+				 pair->one->path, old_path, branch_with_new_path,
+				 branch_with_dir_rename, new_path);
+	} else {
+		/*
+		 * opt->detect_directory_renames has the value
+		 * MERGE_DIRECTORY_RENAMES_CONFLICT, so mark these as conflicts.
+		 */
+		ci->path_conflict = 1;
+		if (pair->status == 'A')
+			path_msg(opt, new_path, 0,
+				 _("CONFLICT (file location): %s added in %s "
+				   "inside a directory that was renamed in %s, "
+				   "suggesting it should perhaps be moved to "
+				   "%s."),
+				 old_path, branch_with_new_path,
+				 branch_with_dir_rename, new_path);
+		else
+			path_msg(opt, new_path, 0,
+				 _("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."),
+				 pair->one->path, old_path, branch_with_new_path,
+				 branch_with_dir_rename, new_path);
+	}
+
+	/*
+	 * Finally, record the new location.
+	 */
+	pair->two->path = new_path;
+}
+
+/*** Function Grouping: functions related to regular rename detection ***/
+
+static int process_renames(struct merge_options *opt,
+			   struct diff_queue_struct *renames)
+{
+	int clean_merge = 1, i;
+
+	for (i = 0; i < renames->nr; ++i) {
+		const char *oldpath = NULL, *newpath;
+		struct diff_filepair *pair = renames->queue[i];
+		struct conflict_info *oldinfo = NULL, *newinfo = NULL;
+		struct strmap_entry *old_ent, *new_ent;
+		unsigned int old_sidemask;
+		int target_index, other_source_index;
+		int source_deleted, collision, type_changed;
+		const char *rename_branch = NULL, *delete_branch = NULL;
+
+		old_ent = strmap_get_entry(&opt->priv->paths, pair->one->path);
+		new_ent = strmap_get_entry(&opt->priv->paths, pair->two->path);
+		if (old_ent) {
+			oldpath = old_ent->key;
+			oldinfo = old_ent->value;
+		}
+		newpath = pair->two->path;
+		if (new_ent) {
+			newpath = new_ent->key;
+			newinfo = new_ent->value;
+		}
+
+		/*
+		 * If pair->one->path isn't in opt->priv->paths, that means
+		 * that either directory rename detection removed that
+		 * path, or a parent directory of oldpath was resolved and
+		 * we don't even need the rename; in either case, we can
+		 * skip it.  If oldinfo->merged.clean, then the other side
+		 * of history had no changes to oldpath and we don't need
+		 * the rename and can skip it.
+		 */
+		if (!oldinfo || oldinfo->merged.clean)
+			continue;
+
+		/*
+		 * diff_filepairs have copies of pathnames, thus we have to
+		 * use standard 'strcmp()' (negated) instead of '=='.
+		 */
+		if (i + 1 < renames->nr &&
+		    !strcmp(oldpath, renames->queue[i+1]->one->path)) {
+			/* Handle rename/rename(1to2) or rename/rename(1to1) */
+			const char *pathnames[3];
+			struct version_info merged;
+			struct conflict_info *base, *side1, *side2;
+			unsigned was_binary_blob = 0;
+
+			pathnames[0] = oldpath;
+			pathnames[1] = newpath;
+			pathnames[2] = renames->queue[i+1]->two->path;
+
+			base = strmap_get(&opt->priv->paths, pathnames[0]);
+			side1 = strmap_get(&opt->priv->paths, pathnames[1]);
+			side2 = strmap_get(&opt->priv->paths, pathnames[2]);
+
+			VERIFY_CI(base);
+			VERIFY_CI(side1);
+			VERIFY_CI(side2);
+
+			if (!strcmp(pathnames[1], pathnames[2])) {
+				struct rename_info *ri = &opt->priv->renames;
+				int j;
+
+				/* Both sides renamed the same way */
+				assert(side1 == side2);
+				memcpy(&side1->stages[0], &base->stages[0],
+				       sizeof(merged));
+				side1->filemask |= (1 << MERGE_BASE);
+				/* Mark base as resolved by removal */
+				base->merged.is_null = 1;
+				base->merged.clean = 1;
+
+				/*
+				 * Disable remembering renames optimization;
+				 * rename/rename(1to1) is incredibly rare, and
+				 * just disabling the optimization is easier
+				 * than purging cached_pairs,
+				 * cached_target_names, and dir_rename_counts.
+				 */
+				for (j = 0; j < 3; j++)
+					ri->merge_trees[j] = NULL;
+
+				/* We handled both renames, i.e. i+1 handled */
+				i++;
+				/* Move to next rename */
+				continue;
+			}
+
+			/* This is a rename/rename(1to2) */
+			clean_merge = handle_content_merge(opt,
+							   pair->one->path,
+							   &base->stages[0],
+							   &side1->stages[1],
+							   &side2->stages[2],
+							   pathnames,
+							   1 + 2 * opt->priv->call_depth,
+							   &merged);
+			if (!clean_merge &&
+			    merged.mode == side1->stages[1].mode &&
+			    oideq(&merged.oid, &side1->stages[1].oid))
+				was_binary_blob = 1;
+			memcpy(&side1->stages[1], &merged, sizeof(merged));
+			if (was_binary_blob) {
+				/*
+				 * Getting here means we were attempting to
+				 * merge a binary blob.
+				 *
+				 * Since we can't merge binaries,
+				 * handle_content_merge() just takes one
+				 * side.  But we don't want to copy the
+				 * contents of one side to both paths.  We
+				 * used the contents of side1 above for
+				 * side1->stages, let's use the contents of
+				 * side2 for side2->stages below.
+				 */
+				oidcpy(&merged.oid, &side2->stages[2].oid);
+				merged.mode = side2->stages[2].mode;
+			}
+			memcpy(&side2->stages[2], &merged, sizeof(merged));
+
+			side1->path_conflict = 1;
+			side2->path_conflict = 1;
+			/*
+			 * TODO: For renames we normally remove the path at the
+			 * old name.  It would thus seem consistent to do the
+			 * same for rename/rename(1to2) cases, but we haven't
+			 * done so traditionally and a number of the regression
+			 * tests now encode an expectation that the file is
+			 * left there at stage 1.  If we ever decide to change
+			 * this, add the following two lines here:
+			 *    base->merged.is_null = 1;
+			 *    base->merged.clean = 1;
+			 * and remove the setting of base->path_conflict to 1.
+			 */
+			base->path_conflict = 1;
+			path_msg(opt, oldpath, 0,
+				 _("CONFLICT (rename/rename): %s renamed to "
+				   "%s in %s and to %s in %s."),
+				 pathnames[0],
+				 pathnames[1], opt->branch1,
+				 pathnames[2], opt->branch2);
+
+			i++; /* We handled both renames, i.e. i+1 handled */
+			continue;
+		}
+
+		VERIFY_CI(oldinfo);
+		VERIFY_CI(newinfo);
+		target_index = pair->score; /* from collect_renames() */
+		assert(target_index == 1 || target_index == 2);
+		other_source_index = 3 - target_index;
+		old_sidemask = (1 << other_source_index); /* 2 or 4 */
+		source_deleted = (oldinfo->filemask == 1);
+		collision = ((newinfo->filemask & old_sidemask) != 0);
+		type_changed = !source_deleted &&
+			(S_ISREG(oldinfo->stages[other_source_index].mode) !=
+			 S_ISREG(newinfo->stages[target_index].mode));
+		if (type_changed && collision) {
+			/*
+			 * special handling so later blocks can handle this...
+			 *
+			 * if type_changed && collision are both true, then this
+			 * was really a double rename, but one side wasn't
+			 * detected due to lack of break detection.  I.e.
+			 * something like
+			 *    orig: has normal file 'foo'
+			 *    side1: renames 'foo' to 'bar', adds 'foo' symlink
+			 *    side2: renames 'foo' to 'bar'
+			 * In this case, the foo->bar rename on side1 won't be
+			 * detected because the new symlink named 'foo' is
+			 * there and we don't do break detection.  But we detect
+			 * this here because we don't want to merge the content
+			 * of the foo symlink with the foo->bar file, so we
+			 * have some logic to handle this special case.  The
+			 * easiest way to do that is make 'bar' on side1 not
+			 * be considered a colliding file but the other part
+			 * of a normal rename.  If the file is very different,
+			 * well we're going to get content merge conflicts
+			 * anyway so it doesn't hurt.  And if the colliding
+			 * file also has a different type, that'll be handled
+			 * by the content merge logic in process_entry() too.
+			 *
+			 * See also t6430, 'rename vs. rename/symlink'
+			 */
+			collision = 0;
+		}
+		if (source_deleted) {
+			if (target_index == 1) {
+				rename_branch = opt->branch1;
+				delete_branch = opt->branch2;
+			} else {
+				rename_branch = opt->branch2;
+				delete_branch = opt->branch1;
+			}
+		}
+
+		assert(source_deleted || oldinfo->filemask & old_sidemask);
+
+		/* Need to check for special types of rename conflicts... */
+		if (collision && !source_deleted) {
+			/* collision: rename/add or rename/rename(2to1) */
+			const char *pathnames[3];
+			struct version_info merged;
+
+			struct conflict_info *base, *side1, *side2;
+			unsigned clean;
+
+			pathnames[0] = oldpath;
+			pathnames[other_source_index] = oldpath;
+			pathnames[target_index] = newpath;
+
+			base = strmap_get(&opt->priv->paths, pathnames[0]);
+			side1 = strmap_get(&opt->priv->paths, pathnames[1]);
+			side2 = strmap_get(&opt->priv->paths, pathnames[2]);
+
+			VERIFY_CI(base);
+			VERIFY_CI(side1);
+			VERIFY_CI(side2);
+
+			clean = handle_content_merge(opt, pair->one->path,
+						     &base->stages[0],
+						     &side1->stages[1],
+						     &side2->stages[2],
+						     pathnames,
+						     1 + 2 * opt->priv->call_depth,
+						     &merged);
+
+			memcpy(&newinfo->stages[target_index], &merged,
+			       sizeof(merged));
+			if (!clean) {
+				path_msg(opt, newpath, 0,
+					 _("CONFLICT (rename involved in "
+					   "collision): rename of %s -> %s has "
+					   "content conflicts AND collides "
+					   "with another path; this may result "
+					   "in nested conflict markers."),
+					 oldpath, newpath);
+			}
+		} else if (collision && source_deleted) {
+			/*
+			 * rename/add/delete or rename/rename(2to1)/delete:
+			 * since oldpath was deleted on the side that didn't
+			 * do the rename, there's not much of a content merge
+			 * we can do for the rename.  oldinfo->merged.is_null
+			 * was already set, so we just leave things as-is so
+			 * they look like an add/add conflict.
+			 */
+
+			newinfo->path_conflict = 1;
+			path_msg(opt, newpath, 0,
+				 _("CONFLICT (rename/delete): %s renamed "
+				   "to %s in %s, but deleted in %s."),
+				 oldpath, newpath, rename_branch, delete_branch);
+		} else {
+			/*
+			 * a few different cases...start by copying the
+			 * existing stage(s) from oldinfo over the newinfo
+			 * and update the pathname(s).
+			 */
+			memcpy(&newinfo->stages[0], &oldinfo->stages[0],
+			       sizeof(newinfo->stages[0]));
+			newinfo->filemask |= (1 << MERGE_BASE);
+			newinfo->pathnames[0] = oldpath;
+			if (type_changed) {
+				/* rename vs. typechange */
+				/* Mark the original as resolved by removal */
+				memcpy(&oldinfo->stages[0].oid, null_oid(),
+				       sizeof(oldinfo->stages[0].oid));
+				oldinfo->stages[0].mode = 0;
+				oldinfo->filemask &= 0x06;
+			} else if (source_deleted) {
+				/* rename/delete */
+				newinfo->path_conflict = 1;
+				path_msg(opt, newpath, 0,
+					 _("CONFLICT (rename/delete): %s renamed"
+					   " to %s in %s, but deleted in %s."),
+					 oldpath, newpath,
+					 rename_branch, delete_branch);
+			} else {
+				/* normal rename */
+				memcpy(&newinfo->stages[other_source_index],
+				       &oldinfo->stages[other_source_index],
+				       sizeof(newinfo->stages[0]));
+				newinfo->filemask |= (1 << other_source_index);
+				newinfo->pathnames[other_source_index] = oldpath;
+			}
+		}
+
+		if (!type_changed) {
+			/* Mark the original as resolved by removal */
+			oldinfo->merged.is_null = 1;
+			oldinfo->merged.clean = 1;
+		}
+
+	}
+
+	return clean_merge;
+}
+
+static inline int possible_side_renames(struct rename_info *renames,
+					unsigned side_index)
+{
+	return renames->pairs[side_index].nr > 0 &&
+	       !strintmap_empty(&renames->relevant_sources[side_index]);
+}
+
+static inline int possible_renames(struct rename_info *renames)
+{
+	return possible_side_renames(renames, 1) ||
+	       possible_side_renames(renames, 2) ||
+	       !strmap_empty(&renames->cached_pairs[1]) ||
+	       !strmap_empty(&renames->cached_pairs[2]);
+}
+
+static void resolve_diffpair_statuses(struct diff_queue_struct *q)
+{
+	/*
+	 * A simplified version of diff_resolve_rename_copy(); would probably
+	 * just use that function but it's static...
+	 */
+	int i;
+	struct diff_filepair *p;
+
+	for (i = 0; i < q->nr; ++i) {
+		p = q->queue[i];
+		p->status = 0; /* undecided */
+		if (!DIFF_FILE_VALID(p->one))
+			p->status = DIFF_STATUS_ADDED;
+		else if (!DIFF_FILE_VALID(p->two))
+			p->status = DIFF_STATUS_DELETED;
+		else if (DIFF_PAIR_RENAME(p))
+			p->status = DIFF_STATUS_RENAMED;
+	}
+}
+
+static void prune_cached_from_relevant(struct rename_info *renames,
+				       unsigned side)
+{
+	/* Reason for this function described in add_pair() */
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+
+	/* Remove from relevant_sources all entries in cached_pairs[side] */
+	strmap_for_each_entry(&renames->cached_pairs[side], &iter, entry) {
+		strintmap_remove(&renames->relevant_sources[side],
+				 entry->key);
+	}
+	/* Remove from relevant_sources all entries in cached_irrelevant[side] */
+	strset_for_each_entry(&renames->cached_irrelevant[side], &iter, entry) {
+		strintmap_remove(&renames->relevant_sources[side],
+				 entry->key);
+	}
+}
+
+static void use_cached_pairs(struct merge_options *opt,
+			     struct strmap *cached_pairs,
+			     struct diff_queue_struct *pairs)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+
+	/*
+	 * Add to side_pairs all entries from renames->cached_pairs[side_index].
+	 * (Info in cached_irrelevant[side_index] is not relevant here.)
+	 */
+	strmap_for_each_entry(cached_pairs, &iter, entry) {
+		struct diff_filespec *one, *two;
+		const char *old_name = entry->key;
+		const char *new_name = entry->value;
+		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 = 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';
+	}
+}
+
+static void cache_new_pair(struct rename_info *renames,
+			   int side,
+			   char *old_path,
+			   char *new_path,
+			   int free_old_value)
+{
+	char *old_value;
+	new_path = xstrdup(new_path);
+	old_value = strmap_put(&renames->cached_pairs[side],
+			       old_path, new_path);
+	strset_add(&renames->cached_target_names[side], new_path);
+	if (free_old_value)
+		free(old_value);
+	else
+		assert(!old_value);
+}
+
+static void possibly_cache_new_pair(struct rename_info *renames,
+				    struct diff_filepair *p,
+				    unsigned side,
+				    char *new_path)
+{
+	int dir_renamed_side = 0;
+
+	if (new_path) {
+		/*
+		 * Directory renames happen on the other side of history from
+		 * the side that adds new files to the old directory.
+		 */
+		dir_renamed_side = 3 - side;
+	} else {
+		int val = strintmap_get(&renames->relevant_sources[side],
+					p->one->path);
+		if (val == RELEVANT_NO_MORE) {
+			assert(p->status == 'D');
+			strset_add(&renames->cached_irrelevant[side],
+				   p->one->path);
+		}
+		if (val <= 0)
+			return;
+	}
+
+	if (p->status == 'D') {
+		/*
+		 * If we already had this delete, we'll just set it's value
+		 * to NULL again, so no harm.
+		 */
+		strmap_put(&renames->cached_pairs[side], p->one->path, NULL);
+	} else if (p->status == 'R') {
+		if (!new_path)
+			new_path = p->two->path;
+		else
+			cache_new_pair(renames, dir_renamed_side,
+				       p->two->path, new_path, 0);
+		cache_new_pair(renames, side, p->one->path, new_path, 1);
+	} else if (p->status == 'A' && new_path) {
+		cache_new_pair(renames, dir_renamed_side,
+			       p->two->path, new_path, 0);
+	}
+}
+
+static int compare_pairs(const void *a_, const void *b_)
+{
+	const struct diff_filepair *a = *((const struct diff_filepair **)a_);
+	const struct diff_filepair *b = *((const struct diff_filepair **)b_);
+
+	return strcmp(a->one->path, b->one->path);
+}
+
+/* Call diffcore_rename() to update deleted/added pairs into rename pairs */
+static int detect_regular_renames(struct merge_options *opt,
+				  unsigned side_index)
+{
+	struct diff_options diff_opts;
+	struct rename_info *renames = &opt->priv->renames;
+
+	prune_cached_from_relevant(renames, side_index);
+	if (!possible_side_renames(renames, side_index)) {
+		/*
+		 * No rename detection needed for this side, but we still need
+		 * to make sure 'adds' are marked correctly in case the other
+		 * side had directory renames.
+		 */
+		resolve_diffpair_statuses(&renames->pairs[side_index]);
+		return 0;
+	}
+
+	partial_clear_dir_rename_count(&renames->dir_rename_count[side_index]);
+	repo_diff_setup(opt->repo, &diff_opts);
+	diff_opts.flags.recursive = 1;
+	diff_opts.flags.rename_empty = 0;
+	diff_opts.detect_rename = DIFF_DETECT_RENAME;
+	diff_opts.rename_limit = opt->rename_limit;
+	if (opt->rename_limit <= 0)
+		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;
+	diff_setup_done(&diff_opts);
+
+	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],
+				 &renames->cached_pairs[side_index]);
+	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;
+
+	renames->pairs[side_index] = diff_queued_diff;
+
+	diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
+	diff_queued_diff.nr = 0;
+	diff_queued_diff.queue = NULL;
+	diff_flush(&diff_opts);
+
+	return 1;
+}
+
+/*
+ * Get information of all renames which occurred in 'side_pairs', making use
+ * of any implicit directory renames in side_dir_renames (also making use of
+ * implicit directory renames rename_exclusions as needed by
+ * check_for_directory_rename()).  Add all (updated) renames into result.
+ */
+static int collect_renames(struct merge_options *opt,
+			   struct diff_queue_struct *result,
+			   unsigned side_index,
+			   struct strmap *dir_renames_for_side,
+			   struct strmap *rename_exclusions)
+{
+	int i, clean = 1;
+	struct strmap collisions;
+	struct diff_queue_struct *side_pairs;
+	struct hashmap_iter iter;
+	struct strmap_entry *entry;
+	struct rename_info *renames = &opt->priv->renames;
+
+	side_pairs = &renames->pairs[side_index];
+	compute_collisions(&collisions, dir_renames_for_side, side_pairs);
+
+	for (i = 0; i < side_pairs->nr; ++i) {
+		struct diff_filepair *p = side_pairs->queue[i];
+		char *new_path; /* non-NULL only with directory renames */
+
+		if (p->status != 'A' && p->status != 'R') {
+			possibly_cache_new_pair(renames, p, side_index, NULL);
+			pool_diff_free_filepair(&opt->priv->pool, p);
+			continue;
+		}
+
+		new_path = check_for_directory_rename(opt, p->two->path,
+						      side_index,
+						      dir_renames_for_side,
+						      rename_exclusions,
+						      &collisions,
+						      &clean);
+
+		possibly_cache_new_pair(renames, p, side_index, new_path);
+		if (p->status != 'R' && !new_path) {
+			pool_diff_free_filepair(&opt->priv->pool, p);
+			continue;
+		}
+
+		if (new_path)
+			apply_directory_rename_modifications(opt, p, new_path);
+
+		/*
+		 * p->score comes back from diffcore_rename_extended() with
+		 * the similarity of the renamed file.  The similarity is
+		 * was used to determine that the two files were related
+		 * and are a rename, which we have already used, but beyond
+		 * that we have no use for the similarity.  So p->score is
+		 * now irrelevant.  However, process_renames() will need to
+		 * know which side of the merge this rename was associated
+		 * with, so overwrite p->score with that value.
+		 */
+		p->score = side_index;
+		result->queue[result->nr++] = p;
+	}
+
+	/* Free each value in the collisions map */
+	strmap_for_each_entry(&collisions, &iter, entry) {
+		struct collision_info *info = entry->value;
+		string_list_clear(&info->source_files, 0);
+	}
+	/*
+	 * In compute_collisions(), we set collisions.strdup_strings to 0
+	 * so that we wouldn't have to make another copy of the new_path
+	 * allocated by apply_dir_rename().  But now that we've used them
+	 * and have no other references to these strings, it is time to
+	 * deallocate them.
+	 */
+	free_strmap_strings(&collisions);
+	strmap_clear(&collisions, 1);
+	return clean;
+}
+
+static int detect_and_process_renames(struct merge_options *opt,
+				      struct tree *merge_base,
+				      struct tree *side1,
+				      struct tree *side2)
+{
+	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);
+	detection_run |= detect_regular_renames(opt, MERGE_SIDE1);
+	detection_run |= detect_regular_renames(opt, MERGE_SIDE2);
+	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);
+
+	trace2_region_enter("merge", "directory renames", opt->repo);
+	need_dir_renames =
+	  !opt->priv->call_depth &&
+	  (opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_TRUE ||
+	   opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_CONFLICT);
+
+	if (need_dir_renames) {
+		get_provisional_directory_renames(opt, MERGE_SIDE1, &clean);
+		get_provisional_directory_renames(opt, MERGE_SIDE2, &clean);
+		handle_directory_level_conflicts(opt);
+	}
+
+	ALLOC_GROW(combined.queue,
+		   renames->pairs[1].nr + renames->pairs[2].nr,
+		   combined.alloc);
+	clean &= collect_renames(opt, &combined, MERGE_SIDE1,
+				 &renames->dir_renames[2],
+				 &renames->dir_renames[1]);
+	clean &= collect_renames(opt, &combined, MERGE_SIDE2,
+				 &renames->dir_renames[1],
+				 &renames->dir_renames[2]);
+	STABLE_QSORT(combined.queue, combined.nr, compare_pairs);
+	trace2_region_leave("merge", "directory renames", opt->repo);
+
+	trace2_region_enter("merge", "process renames", opt->repo);
+	clean &= process_renames(opt, &combined);
+	trace2_region_leave("merge", "process renames", opt->repo);
+
+	goto simple_cleanup; /* collect_renames() handles some of cleanup */
+
+cleanup:
+	/*
+	 * Free now unneeded filepairs, which would have been handled
+	 * in collect_renames() normally but we skipped that code.
+	 */
+	for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) {
+		struct diff_queue_struct *side_pairs;
+		int i;
+
+		side_pairs = &renames->pairs[s];
+		for (i = 0; i < side_pairs->nr; ++i) {
+			struct diff_filepair *p = side_pairs->queue[i];
+			pool_diff_free_filepair(&opt->priv->pool, p);
+		}
+	}
+
+simple_cleanup:
+	/* Free memory for renames->pairs[] and combined */
+	for (s = MERGE_SIDE1; s <= MERGE_SIDE2; s++) {
+		free(renames->pairs[s].queue);
+		DIFF_QUEUE_CLEAR(&renames->pairs[s]);
+	}
+	if (combined.nr) {
+		int i;
+		for (i = 0; i < combined.nr; i++)
+			pool_diff_free_filepair(&opt->priv->pool,
+						combined.queue[i]);
+		free(combined.queue);
+	}
+
+	return clean;
+}
+
+/*** Function Grouping: functions related to process_entries() ***/
+
+static int sort_dirs_next_to_their_children(const char *one, const char *two)
+{
+	unsigned char c1, c2;
+
+	/*
+	 * Here we only care that entries for directories appear adjacent
+	 * to and before files underneath the directory.  We can achieve
+	 * that by pretending to add a trailing slash to every file and
+	 * then sorting.  In other words, we do not want the natural
+	 * sorting of
+	 *     foo
+	 *     foo.txt
+	 *     foo/bar
+	 * Instead, we want "foo" to sort as though it were "foo/", so that
+	 * we instead get
+	 *     foo.txt
+	 *     foo
+	 *     foo/bar
+	 * To achieve this, we basically implement our own strcmp, except that
+	 * if we get to the end of either string instead of comparing NUL to
+	 * another character, we compare '/' to it.
+	 *
+	 * If this unusual "sort as though '/' were appended" perplexes
+	 * you, perhaps it will help to note that this is not the final
+	 * sort.  write_tree() will sort again without the trailing slash
+	 * magic, but just on paths immediately under a given tree.
+	 *
+	 * The reason to not use df_name_compare directly was that it was
+	 * just too expensive (we don't have the string lengths handy), so
+	 * it was reimplemented.
+	 */
+
+	/*
+	 * NOTE: This function will never be called with two equal strings,
+	 * because it is used to sort the keys of a strmap, and strmaps have
+	 * unique keys by construction.  That simplifies our c1==c2 handling
+	 * below.
+	 */
+
+	while (*one && (*one == *two)) {
+		one++;
+		two++;
+	}
+
+	c1 = *one ? *one : '/';
+	c2 = *two ? *two : '/';
+
+	if (c1 == c2) {
+		/* Getting here means one is a leading directory of the other */
+		return (*one) ? 1 : -1;
+	} else
+		return c1 - c2;
+}
+
+static int read_oid_strbuf(struct merge_options *opt,
+			   const struct object_id *oid,
+			   struct strbuf *dst)
+{
+	void *buf;
+	enum object_type type;
+	unsigned long size;
+	buf = read_object_file(oid, &type, &size);
+	if (!buf)
+		return err(opt, _("cannot read object %s"), oid_to_hex(oid));
+	if (type != OBJ_BLOB) {
+		free(buf);
+		return err(opt, _("object %s is not a blob"), oid_to_hex(oid));
+	}
+	strbuf_attach(dst, buf, size, size + 1);
+	return 0;
+}
+
+static int blob_unchanged(struct merge_options *opt,
+			  const struct version_info *base,
+			  const struct version_info *side,
+			  const char *path)
+{
+	struct strbuf basebuf = STRBUF_INIT;
+	struct strbuf sidebuf = STRBUF_INIT;
+	int ret = 0; /* assume changed for safety */
+	struct index_state *idx = &opt->priv->attr_index;
+
+	if (!idx->initialized)
+		initialize_attr_index(opt);
+
+	if (base->mode != side->mode)
+		return 0;
+	if (oideq(&base->oid, &side->oid))
+		return 1;
+
+	if (read_oid_strbuf(opt, &base->oid, &basebuf) ||
+	    read_oid_strbuf(opt, &side->oid, &sidebuf))
+		goto error_return;
+	/*
+	 * Note: binary | is used so that both renormalizations are
+	 * performed.  Comparison can be skipped if both files are
+	 * unchanged since their sha1s have already been compared.
+	 */
+	if (renormalize_buffer(idx, path, basebuf.buf, basebuf.len, &basebuf) |
+	    renormalize_buffer(idx, path, sidebuf.buf, sidebuf.len, &sidebuf))
+		ret = (basebuf.len == sidebuf.len &&
+		       !memcmp(basebuf.buf, sidebuf.buf, basebuf.len));
+
+error_return:
+	strbuf_release(&basebuf);
+	strbuf_release(&sidebuf);
+	return ret;
+}
+
+struct directory_versions {
+	/*
+	 * versions: list of (basename -> version_info)
+	 *
+	 * The basenames are in reverse lexicographic order of full pathnames,
+	 * as processed in process_entries().  This puts all entries within
+	 * a directory together, and covers the directory itself after
+	 * everything within it, allowing us to write subtrees before needing
+	 * to record information for the tree itself.
+	 */
+	struct string_list versions;
+
+	/*
+	 * offsets: list of (full relative path directories -> integer offsets)
+	 *
+	 * Since versions contains basenames from files in multiple different
+	 * directories, we need to know which entries in versions correspond
+	 * to which directories.  Values of e.g.
+	 *     ""             0
+	 *     src            2
+	 *     src/moduleA    5
+	 * Would mean that entries 0-1 of versions are files in the toplevel
+	 * directory, entries 2-4 are files under src/, and the remaining
+	 * entries starting at index 5 are files under src/moduleA/.
+	 */
+	struct string_list offsets;
+
+	/*
+	 * last_directory: directory that previously processed file found in
+	 *
+	 * last_directory starts NULL, but records the directory in which the
+	 * previous file was found within.  As soon as
+	 *    directory(current_file) != last_directory
+	 * then we need to start updating accounting in versions & offsets.
+	 * Note that last_directory is always the last path in "offsets" (or
+	 * NULL if "offsets" is empty) so this exists just for quick access.
+	 */
+	const char *last_directory;
+
+	/* last_directory_len: cached computation of strlen(last_directory) */
+	unsigned last_directory_len;
+};
+
+static int tree_entry_order(const void *a_, const void *b_)
+{
+	const struct string_list_item *a = a_;
+	const struct string_list_item *b = b_;
+
+	const struct merged_info *ami = a->util;
+	const struct merged_info *bmi = b->util;
+	return base_name_compare(a->string, strlen(a->string), ami->result.mode,
+				 b->string, strlen(b->string), bmi->result.mode);
+}
+
+static void write_tree(struct object_id *result_oid,
+		       struct string_list *versions,
+		       unsigned int offset,
+		       size_t hash_size)
+{
+	size_t maxlen = 0, extra;
+	unsigned int nr;
+	struct strbuf buf = STRBUF_INIT;
+	int i;
+
+	assert(offset <= versions->nr);
+	nr = versions->nr - offset;
+	if (versions->nr)
+		/* No need for STABLE_QSORT -- filenames must be unique */
+		QSORT(versions->items + offset, nr, tree_entry_order);
+
+	/* Pre-allocate some space in buf */
+	extra = hash_size + 8; /* 8: 6 for mode, 1 for space, 1 for NUL char */
+	for (i = 0; i < nr; i++) {
+		maxlen += strlen(versions->items[offset+i].string) + extra;
+	}
+	strbuf_grow(&buf, maxlen);
+
+	/* Write each entry out to buf */
+	for (i = 0; i < nr; i++) {
+		struct merged_info *mi = versions->items[offset+i].util;
+		struct version_info *ri = &mi->result;
+		strbuf_addf(&buf, "%o %s%c",
+			    ri->mode,
+			    versions->items[offset+i].string, '\0');
+		strbuf_add(&buf, ri->oid.hash, hash_size);
+	}
+
+	/* Write this object file out, and record in result_oid */
+	write_object_file(buf.buf, buf.len, tree_type, result_oid);
+	strbuf_release(&buf);
+}
+
+static void record_entry_for_tree(struct directory_versions *dir_metadata,
+				  const char *path,
+				  struct merged_info *mi)
+{
+	const char *basename;
+
+	if (mi->is_null)
+		/* nothing to record */
+		return;
+
+	basename = path + mi->basename_offset;
+	assert(strchr(basename, '/') == NULL);
+	string_list_append(&dir_metadata->versions,
+			   basename)->util = &mi->result;
+}
+
+static void write_completed_directory(struct merge_options *opt,
+				      const char *new_directory_name,
+				      struct directory_versions *info)
+{
+	const char *prev_dir;
+	struct merged_info *dir_info = NULL;
+	unsigned int offset;
+
+	/*
+	 * Some explanation of info->versions and info->offsets...
+	 *
+	 * process_entries() iterates over all relevant files AND
+	 * directories in reverse lexicographic order, and calls this
+	 * function.  Thus, an example of the paths that process_entries()
+	 * could operate on (along with the directories for those paths
+	 * being shown) is:
+	 *
+	 *     xtract.c             ""
+	 *     tokens.txt           ""
+	 *     src/moduleB/umm.c    src/moduleB
+	 *     src/moduleB/stuff.h  src/moduleB
+	 *     src/moduleB/baz.c    src/moduleB
+	 *     src/moduleB          src
+	 *     src/moduleA/foo.c    src/moduleA
+	 *     src/moduleA/bar.c    src/moduleA
+	 *     src/moduleA          src
+	 *     src                  ""
+	 *     Makefile             ""
+	 *
+	 * info->versions:
+	 *
+	 *     always contains the unprocessed entries and their
+	 *     version_info information.  For example, after the first five
+	 *     entries above, info->versions would be:
+	 *
+	 *     	   xtract.c     <xtract.c's version_info>
+	 *     	   token.txt    <token.txt's version_info>
+	 *     	   umm.c        <src/moduleB/umm.c's version_info>
+	 *     	   stuff.h      <src/moduleB/stuff.h's version_info>
+	 *     	   baz.c        <src/moduleB/baz.c's version_info>
+	 *
+	 *     Once a subdirectory is completed we remove the entries in
+	 *     that subdirectory from info->versions, writing it as a tree
+	 *     (write_tree()).  Thus, as soon as we get to src/moduleB,
+	 *     info->versions would be updated to
+	 *
+	 *     	   xtract.c     <xtract.c's version_info>
+	 *     	   token.txt    <token.txt's version_info>
+	 *     	   moduleB      <src/moduleB's version_info>
+	 *
+	 * info->offsets:
+	 *
+	 *     helps us track which entries in info->versions correspond to
+	 *     which directories.  When we are N directories deep (e.g. 4
+	 *     for src/modA/submod/subdir/), we have up to N+1 unprocessed
+	 *     directories (+1 because of toplevel dir).  Corresponding to
+	 *     the info->versions example above, after processing five entries
+	 *     info->offsets will be:
+	 *
+	 *     	   ""           0
+	 *     	   src/moduleB  2
+	 *
+	 *     which is used to know that xtract.c & token.txt are from the
+	 *     toplevel dirctory, while umm.c & stuff.h & baz.c are from the
+	 *     src/moduleB directory.  Again, following the example above,
+	 *     once we need to process src/moduleB, then info->offsets is
+	 *     updated to
+	 *
+	 *     	   ""           0
+	 *     	   src          2
+	 *
+	 *     which says that moduleB (and only moduleB so far) is in the
+	 *     src directory.
+	 *
+	 *     One unique thing to note about info->offsets here is that
+	 *     "src" was not added to info->offsets until there was a path
+	 *     (a file OR directory) immediately below src/ that got
+	 *     processed.
+	 *
+	 * Since process_entry() just appends new entries to info->versions,
+	 * write_completed_directory() only needs to do work if the next path
+	 * is in a directory that is different than the last directory found
+	 * in info->offsets.
+	 */
+
+	/*
+	 * If we are working with the same directory as the last entry, there
+	 * is no work to do.  (See comments above the directory_name member of
+	 * struct merged_info for why we can use pointer comparison instead of
+	 * strcmp here.)
+	 */
+	if (new_directory_name == info->last_directory)
+		return;
+
+	/*
+	 * If we are just starting (last_directory is NULL), or last_directory
+	 * is a prefix of the current directory, then we can just update
+	 * info->offsets to record the offset where we started this directory
+	 * and update last_directory to have quick access to it.
+	 */
+	if (info->last_directory == NULL ||
+	    !strncmp(new_directory_name, info->last_directory,
+		     info->last_directory_len)) {
+		uintptr_t offset = info->versions.nr;
+
+		info->last_directory = new_directory_name;
+		info->last_directory_len = strlen(info->last_directory);
+		/*
+		 * Record the offset into info->versions where we will
+		 * start recording basenames of paths found within
+		 * new_directory_name.
+		 */
+		string_list_append(&info->offsets,
+				   info->last_directory)->util = (void*)offset;
+		return;
+	}
+
+	/*
+	 * The next entry that will be processed will be within
+	 * new_directory_name.  Since at this point we know that
+	 * new_directory_name is within a different directory than
+	 * info->last_directory, we have all entries for info->last_directory
+	 * in info->versions and we need to create a tree object for them.
+	 */
+	dir_info = strmap_get(&opt->priv->paths, info->last_directory);
+	assert(dir_info);
+	offset = (uintptr_t)info->offsets.items[info->offsets.nr-1].util;
+	if (offset == info->versions.nr) {
+		/*
+		 * Actually, we don't need to create a tree object in this
+		 * case.  Whenever all files within a directory disappear
+		 * during the merge (e.g. unmodified on one side and
+		 * deleted on the other, or files were renamed elsewhere),
+		 * then we get here and the directory itself needs to be
+		 * omitted from its parent tree as well.
+		 */
+		dir_info->is_null = 1;
+	} else {
+		/*
+		 * Write out the tree to the git object directory, and also
+		 * record the mode and oid in dir_info->result.
+		 */
+		dir_info->is_null = 0;
+		dir_info->result.mode = S_IFDIR;
+		write_tree(&dir_info->result.oid, &info->versions, offset,
+			   opt->repo->hash_algo->rawsz);
+	}
+
+	/*
+	 * We've now used several entries from info->versions and one entry
+	 * from info->offsets, so we get rid of those values.
+	 */
+	info->offsets.nr--;
+	info->versions.nr = offset;
+
+	/*
+	 * Now we've taken care of the completed directory, but we need to
+	 * prepare things since future entries will be in
+	 * new_directory_name.  (In particular, process_entry() will be
+	 * appending new entries to info->versions.)  So, we need to make
+	 * sure new_directory_name is the last entry in info->offsets.
+	 */
+	prev_dir = info->offsets.nr == 0 ? NULL :
+		   info->offsets.items[info->offsets.nr-1].string;
+	if (new_directory_name != prev_dir) {
+		uintptr_t c = info->versions.nr;
+		string_list_append(&info->offsets,
+				   new_directory_name)->util = (void*)c;
+	}
+
+	/* And, of course, we need to update last_directory to match. */
+	info->last_directory = new_directory_name;
+	info->last_directory_len = strlen(info->last_directory);
+}
+
+/* Per entry merge function */
+static void process_entry(struct merge_options *opt,
+			  const char *path,
+			  struct conflict_info *ci,
+			  struct directory_versions *dir_metadata)
+{
+	int df_file_index = 0;
+
+	VERIFY_CI(ci);
+	assert(ci->filemask >= 0 && ci->filemask <= 7);
+	/* ci->match_mask == 7 was handled in collect_merge_info_callback() */
+	assert(ci->match_mask == 0 || ci->match_mask == 3 ||
+	       ci->match_mask == 5 || ci->match_mask == 6);
+
+	if (ci->dirmask) {
+		record_entry_for_tree(dir_metadata, path, &ci->merged);
+		if (ci->filemask == 0)
+			/* nothing else to handle */
+			return;
+		assert(ci->df_conflict);
+	}
+
+	if (ci->df_conflict && ci->merged.result.mode == 0) {
+		int i;
+
+		/*
+		 * directory no longer in the way, but we do have a file we
+		 * need to place here so we need to clean away the "directory
+		 * merges to nothing" result.
+		 */
+		ci->df_conflict = 0;
+		assert(ci->filemask != 0);
+		ci->merged.clean = 0;
+		ci->merged.is_null = 0;
+		/* and we want to zero out any directory-related entries */
+		ci->match_mask = (ci->match_mask & ~ci->dirmask);
+		ci->dirmask = 0;
+		for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) {
+			if (ci->filemask & (1 << i))
+				continue;
+			ci->stages[i].mode = 0;
+			oidcpy(&ci->stages[i].oid, null_oid());
+		}
+	} else if (ci->df_conflict && ci->merged.result.mode != 0) {
+		/*
+		 * This started out as a D/F conflict, and the entries in
+		 * the competing directory were not removed by the merge as
+		 * evidenced by write_completed_directory() writing a value
+		 * to ci->merged.result.mode.
+		 */
+		struct conflict_info *new_ci;
+		const char *branch;
+		const char *old_path = path;
+		int i;
+
+		assert(ci->merged.result.mode == S_IFDIR);
+
+		/*
+		 * If filemask is 1, we can just ignore the file as having
+		 * been deleted on both sides.  We do not want to overwrite
+		 * ci->merged.result, since it stores the tree for all the
+		 * files under it.
+		 */
+		if (ci->filemask == 1) {
+			ci->filemask = 0;
+			return;
+		}
+
+		/*
+		 * This file still exists on at least one side, and we want
+		 * the directory to remain here, so we need to move this
+		 * path to some new location.
+		 */
+		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
+		 * those out immediately.  We do want the rest of ci copied.
+		 */
+		memcpy(new_ci, ci, sizeof(*ci));
+		new_ci->match_mask = (new_ci->match_mask & ~new_ci->dirmask);
+		new_ci->dirmask = 0;
+		for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) {
+			if (new_ci->filemask & (1 << i))
+				continue;
+			/* zero out any entries related to directories */
+			new_ci->stages[i].mode = 0;
+			oidcpy(&new_ci->stages[i].oid, null_oid());
+		}
+
+		/*
+		 * Find out which side this file came from; note that we
+		 * cannot just use ci->filemask, because renames could cause
+		 * the filemask to go back to 7.  So we use dirmask, then
+		 * pick the opposite side's index.
+		 */
+		df_file_index = (ci->dirmask & (1 << 1)) ? 2 : 1;
+		branch = (df_file_index == 1) ? opt->branch1 : opt->branch2;
+		path = unique_path(&opt->priv->paths, path, branch);
+		strmap_put(&opt->priv->paths, path, new_ci);
+
+		path_msg(opt, path, 0,
+			 _("CONFLICT (file/directory): directory in the way "
+			   "of %s from %s; moving it to %s instead."),
+			 old_path, branch, path);
+
+		/*
+		 * Zero out the filemask for the old ci.  At this point, ci
+		 * was just an entry for a directory, so we don't need to
+		 * do anything more with it.
+		 */
+		ci->filemask = 0;
+
+		/*
+		 * Now note that we're working on the new entry (path was
+		 * updated above.
+		 */
+		ci = new_ci;
+	}
+
+	/*
+	 * NOTE: Below there is a long switch-like if-elseif-elseif... block
+	 *       which the code goes through even for the df_conflict cases
+	 *       above.
+	 */
+	if (ci->match_mask) {
+		ci->merged.clean = !ci->df_conflict && !ci->path_conflict;
+		if (ci->match_mask == 6) {
+			/* stages[1] == stages[2] */
+			ci->merged.result.mode = ci->stages[1].mode;
+			oidcpy(&ci->merged.result.oid, &ci->stages[1].oid);
+		} else {
+			/* determine the mask of the side that didn't match */
+			unsigned int othermask = 7 & ~ci->match_mask;
+			int side = (othermask == 4) ? 2 : 1;
+
+			ci->merged.result.mode = ci->stages[side].mode;
+			ci->merged.is_null = !ci->merged.result.mode;
+			if (ci->merged.is_null)
+				ci->merged.clean = 1;
+			oidcpy(&ci->merged.result.oid, &ci->stages[side].oid);
+
+			assert(othermask == 2 || othermask == 4);
+			assert(ci->merged.is_null ==
+			       (ci->filemask == ci->match_mask));
+		}
+	} else if (ci->filemask >= 6 &&
+		   (S_IFMT & ci->stages[1].mode) !=
+		   (S_IFMT & ci->stages[2].mode)) {
+		/* Two different items from (file/submodule/symlink) */
+		if (opt->priv->call_depth) {
+			/* Just use the version from the merge base */
+			ci->merged.clean = 0;
+			oidcpy(&ci->merged.result.oid, &ci->stages[0].oid);
+			ci->merged.result.mode = ci->stages[0].mode;
+			ci->merged.is_null = (ci->merged.result.mode == 0);
+		} else {
+			/* Handle by renaming one or both to separate paths. */
+			unsigned o_mode = ci->stages[0].mode;
+			unsigned a_mode = ci->stages[1].mode;
+			unsigned b_mode = ci->stages[2].mode;
+			struct conflict_info *new_ci;
+			const char *a_path = NULL, *b_path = NULL;
+			int rename_a = 0, rename_b = 0;
+
+			new_ci = mem_pool_alloc(&opt->priv->pool,
+						sizeof(*new_ci));
+
+			if (S_ISREG(a_mode))
+				rename_a = 1;
+			else if (S_ISREG(b_mode))
+				rename_b = 1;
+			else {
+				rename_a = 1;
+				rename_b = 1;
+			}
+
+			if (rename_a && rename_b) {
+				path_msg(opt, path, 0,
+					 _("CONFLICT (distinct types): %s had "
+					   "different types on each side; "
+					   "renamed both of them so each can "
+					   "be recorded somewhere."),
+					 path);
+			} else {
+				path_msg(opt, path, 0,
+					 _("CONFLICT (distinct types): %s had "
+					   "different types on each side; "
+					   "renamed one of them so each can be "
+					   "recorded somewhere."),
+					 path);
+			}
+
+			ci->merged.clean = 0;
+			memcpy(new_ci, ci, sizeof(*new_ci));
+
+			/* Put b into new_ci, removing a from stages */
+			new_ci->merged.result.mode = ci->stages[2].mode;
+			oidcpy(&new_ci->merged.result.oid, &ci->stages[2].oid);
+			new_ci->stages[1].mode = 0;
+			oidcpy(&new_ci->stages[1].oid, null_oid());
+			new_ci->filemask = 5;
+			if ((S_IFMT & b_mode) != (S_IFMT & o_mode)) {
+				new_ci->stages[0].mode = 0;
+				oidcpy(&new_ci->stages[0].oid, null_oid());
+				new_ci->filemask = 4;
+			}
+
+			/* Leave only a in ci, fixing stages. */
+			ci->merged.result.mode = ci->stages[1].mode;
+			oidcpy(&ci->merged.result.oid, &ci->stages[1].oid);
+			ci->stages[2].mode = 0;
+			oidcpy(&ci->stages[2].oid, null_oid());
+			ci->filemask = 3;
+			if ((S_IFMT & a_mode) != (S_IFMT & o_mode)) {
+				ci->stages[0].mode = 0;
+				oidcpy(&ci->stages[0].oid, null_oid());
+				ci->filemask = 2;
+			}
+
+			/* Insert entries into opt->priv_paths */
+			assert(rename_a || rename_b);
+			if (rename_a) {
+				a_path = unique_path(&opt->priv->paths,
+						     path, opt->branch1);
+				strmap_put(&opt->priv->paths, a_path, ci);
+			}
+
+			if (rename_b)
+				b_path = unique_path(&opt->priv->paths,
+						     path, opt->branch2);
+			else
+				b_path = path;
+			strmap_put(&opt->priv->paths, b_path, new_ci);
+
+			if (rename_a && rename_b)
+				strmap_remove(&opt->priv->paths, path, 0);
+
+			/*
+			 * Do special handling for b_path since process_entry()
+			 * won't be called on it specially.
+			 */
+			strmap_put(&opt->priv->conflicted, b_path, new_ci);
+			record_entry_for_tree(dir_metadata, b_path,
+					      &new_ci->merged);
+
+			/*
+			 * Remaining code for processing this entry should
+			 * think in terms of processing a_path.
+			 */
+			if (a_path)
+				path = a_path;
+		}
+	} else if (ci->filemask >= 6) {
+		/* Need a two-way or three-way content merge */
+		struct version_info merged_file;
+		unsigned clean_merge;
+		struct version_info *o = &ci->stages[0];
+		struct version_info *a = &ci->stages[1];
+		struct version_info *b = &ci->stages[2];
+
+		clean_merge = handle_content_merge(opt, path, o, a, b,
+						   ci->pathnames,
+						   opt->priv->call_depth * 2,
+						   &merged_file);
+		ci->merged.clean = clean_merge &&
+				   !ci->df_conflict && !ci->path_conflict;
+		ci->merged.result.mode = merged_file.mode;
+		ci->merged.is_null = (merged_file.mode == 0);
+		oidcpy(&ci->merged.result.oid, &merged_file.oid);
+		if (clean_merge && ci->df_conflict) {
+			assert(df_file_index == 1 || df_file_index == 2);
+			ci->filemask = 1 << df_file_index;
+			ci->stages[df_file_index].mode = merged_file.mode;
+			oidcpy(&ci->stages[df_file_index].oid, &merged_file.oid);
+		}
+		if (!clean_merge) {
+			const char *reason = _("content");
+			if (ci->filemask == 6)
+				reason = _("add/add");
+			if (S_ISGITLINK(merged_file.mode))
+				reason = _("submodule");
+			path_msg(opt, path, 0,
+				 _("CONFLICT (%s): Merge conflict in %s"),
+				 reason, path);
+		}
+	} else if (ci->filemask == 3 || ci->filemask == 5) {
+		/* Modify/delete */
+		const char *modify_branch, *delete_branch;
+		int side = (ci->filemask == 5) ? 2 : 1;
+		int index = opt->priv->call_depth ? 0 : side;
+
+		ci->merged.result.mode = ci->stages[index].mode;
+		oidcpy(&ci->merged.result.oid, &ci->stages[index].oid);
+		ci->merged.clean = 0;
+
+		modify_branch = (side == 1) ? opt->branch1 : opt->branch2;
+		delete_branch = (side == 1) ? opt->branch2 : opt->branch1;
+
+		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);
+		} else if (ci->path_conflict &&
+			   oideq(&ci->stages[0].oid, &ci->stages[side].oid)) {
+			/*
+			 * This came from a rename/delete; no action to take,
+			 * but avoid printing "modify/delete" conflict notice
+			 * since the contents were not modified.
+			 */
+		} else {
+			path_msg(opt, path, 0,
+				 _("CONFLICT (modify/delete): %s deleted in %s "
+				   "and modified in %s.  Version %s of %s left "
+				   "in tree."),
+				 path, delete_branch, modify_branch,
+				 modify_branch, path);
+		}
+	} else if (ci->filemask == 2 || ci->filemask == 4) {
+		/* Added on one side */
+		int side = (ci->filemask == 4) ? 2 : 1;
+		ci->merged.result.mode = ci->stages[side].mode;
+		oidcpy(&ci->merged.result.oid, &ci->stages[side].oid);
+		ci->merged.clean = !ci->df_conflict && !ci->path_conflict;
+	} else if (ci->filemask == 1) {
+		/* Deleted on both sides */
+		ci->merged.is_null = 1;
+		ci->merged.result.mode = 0;
+		oidcpy(&ci->merged.result.oid, null_oid());
+		assert(!ci->df_conflict);
+		ci->merged.clean = !ci->path_conflict;
+	}
+
+	/*
+	 * If still conflicted, record it separately.  This allows us to later
+	 * iterate over just conflicted entries when updating the index instead
+	 * of iterating over all entries.
+	 */
+	if (!ci->merged.clean)
+		strmap_put(&opt->priv->conflicted, path, ci);
+
+	/* Record metadata for ci->merged in dir_metadata */
+	record_entry_for_tree(dir_metadata, path, &ci->merged);
+}
+
+static void prefetch_for_content_merges(struct merge_options *opt,
+					struct string_list *plist)
+{
+	struct string_list_item *e;
+	struct oid_array to_fetch = OID_ARRAY_INIT;
+
+	if (opt->repo != the_repository || !has_promisor_remote())
+		return;
+
+	for (e = &plist->items[plist->nr-1]; e >= plist->items; --e) {
+		/* char *path = e->string; */
+		struct conflict_info *ci = e->util;
+		int i;
+
+		/* Ignore clean entries */
+		if (ci->merged.clean)
+			continue;
+
+		/* Ignore entries that don't need a content merge */
+		if (ci->match_mask || ci->filemask < 6 ||
+		    !S_ISREG(ci->stages[1].mode) ||
+		    !S_ISREG(ci->stages[2].mode) ||
+		    oideq(&ci->stages[1].oid, &ci->stages[2].oid))
+			continue;
+
+		/* Also don't need content merge if base matches either side */
+		if (ci->filemask == 7 &&
+		    S_ISREG(ci->stages[0].mode) &&
+		    (oideq(&ci->stages[0].oid, &ci->stages[1].oid) ||
+		     oideq(&ci->stages[0].oid, &ci->stages[2].oid)))
+			continue;
+
+		for (i = 0; i < 3; i++) {
+			unsigned side_mask = (1 << i);
+			struct version_info *vi = &ci->stages[i];
+
+			if ((ci->filemask & side_mask) &&
+			    S_ISREG(vi->mode) &&
+			    oid_object_info_extended(opt->repo, &vi->oid, NULL,
+						     OBJECT_INFO_FOR_PREFETCH))
+				oid_array_append(&to_fetch, &vi->oid);
+		}
+	}
+
+	promisor_remote_get_direct(opt->repo, to_fetch.oid, to_fetch.nr);
+	oid_array_clear(&to_fetch);
+}
+
+static void process_entries(struct merge_options *opt,
+			    struct object_id *result_oid)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *e;
+	struct string_list plist = STRING_LIST_INIT_NODUP;
+	struct string_list_item *entry;
+	struct directory_versions dir_metadata = { STRING_LIST_INIT_NODUP,
+						   STRING_LIST_INIT_NODUP,
+						   NULL, 0 };
+
+	trace2_region_enter("merge", "process_entries setup", opt->repo);
+	if (strmap_empty(&opt->priv->paths)) {
+		oidcpy(result_oid, opt->repo->hash_algo->empty_tree);
+		return;
+	}
+
+	/* Hack to pre-allocate plist to the desired size */
+	trace2_region_enter("merge", "plist grow", opt->repo);
+	ALLOC_GROW(plist.items, strmap_get_size(&opt->priv->paths), plist.alloc);
+	trace2_region_leave("merge", "plist grow", opt->repo);
+
+	/* Put every entry from paths into plist, then sort */
+	trace2_region_enter("merge", "plist copy", opt->repo);
+	strmap_for_each_entry(&opt->priv->paths, &iter, e) {
+		string_list_append(&plist, e->key)->util = e->value;
+	}
+	trace2_region_leave("merge", "plist copy", opt->repo);
+
+	trace2_region_enter("merge", "plist special sort", opt->repo);
+	plist.cmp = sort_dirs_next_to_their_children;
+	string_list_sort(&plist);
+	trace2_region_leave("merge", "plist special sort", opt->repo);
+
+	trace2_region_leave("merge", "process_entries setup", opt->repo);
+
+	/*
+	 * Iterate over the items in reverse order, so we can handle paths
+	 * below a directory before needing to handle the directory itself.
+	 *
+	 * This allows us to write subtrees before we need to write trees,
+	 * and it also enables sane handling of directory/file conflicts
+	 * (because it allows us to know whether the directory is still in
+	 * the way when it is time to process the file at the same path).
+	 */
+	trace2_region_enter("merge", "processing", opt->repo);
+	prefetch_for_content_merges(opt, &plist);
+	for (entry = &plist.items[plist.nr-1]; entry >= plist.items; --entry) {
+		char *path = entry->string;
+		/*
+		 * NOTE: mi may actually be a pointer to a conflict_info, but
+		 * we have to check mi->clean first to see if it's safe to
+		 * reassign to such a pointer type.
+		 */
+		struct merged_info *mi = entry->util;
+
+		write_completed_directory(opt, mi->directory_name,
+					  &dir_metadata);
+		if (mi->clean)
+			record_entry_for_tree(&dir_metadata, path, mi);
+		else {
+			struct conflict_info *ci = (struct conflict_info *)mi;
+			process_entry(opt, path, ci, &dir_metadata);
+		}
+	}
+	trace2_region_leave("merge", "processing", opt->repo);
+
+	trace2_region_enter("merge", "process_entries cleanup", opt->repo);
+	if (dir_metadata.offsets.nr != 1 ||
+	    (uintptr_t)dir_metadata.offsets.items[0].util != 0) {
+		printf("dir_metadata.offsets.nr = %d (should be 1)\n",
+		       dir_metadata.offsets.nr);
+		printf("dir_metadata.offsets.items[0].util = %u (should be 0)\n",
+		       (unsigned)(uintptr_t)dir_metadata.offsets.items[0].util);
+		fflush(stdout);
+		BUG("dir_metadata accounting completely off; shouldn't happen");
+	}
+	write_tree(result_oid, &dir_metadata.versions, 0,
+		   opt->repo->hash_algo->rawsz);
+	string_list_clear(&plist, 0);
+	string_list_clear(&dir_metadata.versions, 0);
+	string_list_clear(&dir_metadata.offsets, 0);
+	trace2_region_leave("merge", "process_entries cleanup", opt->repo);
+}
+
+/*** Function Grouping: functions related to merge_switch_to_result() ***/
+
+static int checkout(struct merge_options *opt,
+		    struct tree *prev,
+		    struct tree *next)
+{
+	/* Switch the index/working copy from old to new */
+	int ret;
+	struct tree_desc trees[2];
+	struct unpack_trees_options unpack_opts;
+
+	memset(&unpack_opts, 0, sizeof(unpack_opts));
+	unpack_opts.head_idx = -1;
+	unpack_opts.src_index = opt->repo->index;
+	unpack_opts.dst_index = opt->repo->index;
+
+	setup_unpack_trees_porcelain(&unpack_opts, "merge");
+
+	/*
+	 * NOTE: if this were just "git checkout" code, we would probably
+	 * read or refresh the cache and check for a conflicted index, but
+	 * builtin/merge.c or sequencer.c really needs to read the index
+	 * and check for conflicted entries before starting merging for a
+	 * good user experience (no sense waiting for merges/rebases before
+	 * erroring out), so there's no reason to duplicate that work here.
+	 */
+
+	/* 2-way merge to the new branch */
+	unpack_opts.update = 1;
+	unpack_opts.merge = 1;
+	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);
+	}
+	parse_tree(prev);
+	init_tree_desc(&trees[0], prev->buffer, prev->size);
+	parse_tree(next);
+	init_tree_desc(&trees[1], next->buffer, next->size);
+
+	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;
+}
+
+static int record_conflicted_index_entries(struct merge_options *opt)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *e;
+	struct index_state *index = opt->repo->index;
+	struct checkout state = CHECKOUT_INIT;
+	int errs = 0;
+	int original_cache_nr;
+
+	if (strmap_empty(&opt->priv->conflicted))
+		return 0;
+
+	/* If any entries have skip_worktree set, we'll have to check 'em out */
+	state.force = 1;
+	state.quiet = 1;
+	state.refresh_cache = 1;
+	state.istate = index;
+	original_cache_nr = index->cache_nr;
+
+	/* Put every entry from paths into plist, then sort */
+	strmap_for_each_entry(&opt->priv->conflicted, &iter, e) {
+		const char *path = e->key;
+		struct conflict_info *ci = e->value;
+		int pos;
+		struct cache_entry *ce;
+		int i;
+
+		VERIFY_CI(ci);
+
+		/*
+		 * The index will already have a stage=0 entry for this path,
+		 * because we created an as-merged-as-possible version of the
+		 * file and checkout() moved the working copy and index over
+		 * to that version.
+		 *
+		 * However, previous iterations through this loop will have
+		 * added unstaged entries to the end of the cache which
+		 * ignore the standard alphabetical ordering of cache
+		 * entries and break invariants needed for index_name_pos()
+		 * to work.  However, we know the entry we want is before
+		 * those appended cache entries, so do a temporary swap on
+		 * cache_nr to only look through entries of interest.
+		 */
+		SWAP(index->cache_nr, original_cache_nr);
+		pos = index_name_pos(index, path, strlen(path));
+		SWAP(index->cache_nr, original_cache_nr);
+		if (pos < 0) {
+			if (ci->filemask != 1)
+				BUG("Conflicted %s but nothing in basic working tree or index; this shouldn't happen", path);
+			cache_tree_invalidate_path(index, path);
+		} else {
+			ce = index->cache[pos];
+
+			/*
+			 * Clean paths with CE_SKIP_WORKTREE set will not be
+			 * written to the working tree by the unpack_trees()
+			 * call in checkout().  Our conflicted entries would
+			 * have appeared clean to that code since we ignored
+			 * the higher order stages.  Thus, we need override
+			 * the CE_SKIP_WORKTREE bit and manually write those
+			 * files to the working disk here.
+			 */
+			if (ce_skip_worktree(ce)) {
+				struct stat st;
+
+				if (!lstat(path, &st)) {
+					char *new_name = unique_path(&opt->priv->paths,
+								     path,
+								     "cruft");
+
+					path_msg(opt, path, 1,
+						 _("Note: %s not up to date and in way of checking out conflicted version; old copy renamed to %s"),
+						 path, new_name);
+					errs |= rename(path, new_name);
+					free(new_name);
+				}
+				errs |= checkout_entry(ce, &state, NULL, NULL);
+			}
+
+			/*
+			 * Mark this cache entry for removal and instead add
+			 * new stage>0 entries corresponding to the
+			 * conflicts.  If there are many conflicted entries, we
+			 * want to avoid memmove'ing O(NM) entries by
+			 * inserting the new entries one at a time.  So,
+			 * instead, we just add the new cache entries to the
+			 * end (ignoring normal index requirements on sort
+			 * order) and sort the index once we're all done.
+			 */
+			ce->ce_flags |= CE_REMOVE;
+		}
+
+		for (i = MERGE_BASE; i <= MERGE_SIDE2; i++) {
+			struct version_info *vi;
+			if (!(ci->filemask & (1ul << i)))
+				continue;
+			vi = &ci->stages[i];
+			ce = make_cache_entry(index, vi->mode, &vi->oid,
+					      path, i+1, 0);
+			add_index_entry(index, ce, ADD_CACHE_JUST_APPEND);
+		}
+	}
+
+	/*
+	 * Remove the unused cache entries (and invalidate the relevant
+	 * cache-trees), then sort the index entries to get the conflicted
+	 * entries we added to the end into their right locations.
+	 */
+	remove_marked_cache_entries(index, 1);
+	/*
+	 * No need for STABLE_QSORT -- cmp_cache_name_compare sorts primarily
+	 * on filename and secondarily on stage, and (name, stage #) are a
+	 * unique tuple.
+	 */
+	QSORT(index->cache, index->cache_nr, cmp_cache_name_compare);
+
+	return errs;
+}
+
+void merge_switch_to_result(struct merge_options *opt,
+			    struct tree *head,
+			    struct merge_result *result,
+			    int update_worktree_and_index,
+			    int display_update_msgs)
+{
+	assert(opt->priv == NULL);
+	if (result->clean >= 0 && update_worktree_and_index) {
+		const char *filename;
+		FILE *fp;
+
+		trace2_region_enter("merge", "checkout", opt->repo);
+		if (checkout(opt, head, result->tree)) {
+			/* failure to function */
+			result->clean = -1;
+			return;
+		}
+		trace2_region_leave("merge", "checkout", opt->repo);
+
+		trace2_region_enter("merge", "record_conflicted", opt->repo);
+		opt->priv = result->priv;
+		if (record_conflicted_index_entries(opt)) {
+			/* failure to function */
+			opt->priv = NULL;
+			result->clean = -1;
+			return;
+		}
+		opt->priv = NULL;
+		trace2_region_leave("merge", "record_conflicted", opt->repo);
+
+		trace2_region_enter("merge", "write_auto_merge", opt->repo);
+		filename = git_path_auto_merge(opt->repo);
+		fp = xfopen(filename, "w");
+		fprintf(fp, "%s\n", oid_to_hex(&result->tree->object.oid));
+		fclose(fp);
+		trace2_region_leave("merge", "write_auto_merge", opt->repo);
+	}
+
+	if (display_update_msgs) {
+		struct merge_options_internal *opti = result->priv;
+		struct hashmap_iter iter;
+		struct strmap_entry *e;
+		struct string_list olist = STRING_LIST_INIT_NODUP;
+		int i;
+
+		trace2_region_enter("merge", "display messages", opt->repo);
+
+		/* Hack to pre-allocate olist to the desired size */
+		ALLOC_GROW(olist.items, strmap_get_size(&opti->output),
+			   olist.alloc);
+
+		/* Put every entry from output into olist, then sort */
+		strmap_for_each_entry(&opti->output, &iter, e) {
+			string_list_append(&olist, e->key)->util = e->value;
+		}
+		string_list_sort(&olist);
+
+		/* Iterate over the items, printing them */
+		for (i = 0; i < olist.nr; ++i) {
+			struct strbuf *sb = olist.items[i].util;
+
+			printf("%s", sb->buf);
+		}
+		string_list_clear(&olist, 0);
+
+		/* Also include needed rename limit adjustment now */
+		diff_warn_rename_limit("merge.renamelimit",
+				       opti->renames.needed_limit, 0);
+
+		trace2_region_leave("merge", "display messages", opt->repo);
+	}
+
+	merge_finalize(opt, result);
+}
+
+void merge_finalize(struct merge_options *opt,
+		    struct merge_result *result)
+{
+	struct merge_options_internal *opti = result->priv;
+
+	if (opt->renormalize)
+		git_attr_set_direction(GIT_ATTR_CHECKIN);
+	assert(opt->priv == NULL);
+
+	clear_or_reinit_internal_opts(opti, 0);
+	FREE_AND_NULL(opti);
+}
+
+/*** Function Grouping: helper functions for merge_incore_*() ***/
+
+static struct tree *shift_tree_object(struct repository *repo,
+				      struct tree *one, struct tree *two,
+				      const char *subtree_shift)
+{
+	struct object_id shifted;
+
+	if (!*subtree_shift) {
+		shift_tree(repo, &one->object.oid, &two->object.oid, &shifted, 0);
+	} else {
+		shift_tree_by(repo, &one->object.oid, &two->object.oid, &shifted,
+			      subtree_shift);
+	}
+	if (oideq(&two->object.oid, &shifted))
+		return two;
+	return lookup_tree(repo, &shifted);
+}
+
+static inline void set_commit_tree(struct commit *c, struct tree *t)
+{
+	c->maybe_tree = t;
+}
+
+static struct commit *make_virtual_commit(struct repository *repo,
+					  struct tree *tree,
+					  const char *comment)
+{
+	struct commit *commit = alloc_commit_node(repo);
+
+	set_merge_remote_desc(commit, comment, (struct object *)commit);
+	set_commit_tree(commit, tree);
+	commit->object.parsed = 1;
+	return commit;
+}
+
+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);
+	assert(opt->repo);
+
+	assert(opt->branch1 && opt->branch2);
+
+	assert(opt->detect_directory_renames >= MERGE_DIRECTORY_RENAMES_NONE &&
+	       opt->detect_directory_renames <= MERGE_DIRECTORY_RENAMES_TRUE);
+	assert(opt->rename_limit >= -1);
+	assert(opt->rename_score >= 0 && opt->rename_score <= MAX_SCORE);
+	assert(opt->show_rename_progress >= 0 && opt->show_rename_progress <= 1);
+
+	assert(opt->xdl_opts >= 0);
+	assert(opt->recursive_variant >= MERGE_VARIANT_NORMAL &&
+	       opt->recursive_variant <= MERGE_VARIANT_THEIRS);
+
+	/*
+	 * detect_renames, verbosity, buffer_output, and obuf are ignored
+	 * fields that were used by "recursive" rather than "ort" -- but
+	 * sanity check them anyway.
+	 */
+	assert(opt->detect_renames >= -1 &&
+	       opt->detect_renames <= DIFF_DETECT_COPY);
+	assert(opt->verbosity >= 0 && opt->verbosity <= 5);
+	assert(opt->buffer_output <= 2);
+	assert(opt->obuf.len == 0);
+
+	assert(opt->priv == NULL);
+	if (result->_properly_initialized != 0 &&
+	    result->_properly_initialized != RESULT_INITIALIZED)
+		BUG("struct merge_result passed to merge_incore_*recursive() must be zeroed or filled with values from a previous run");
+	assert(!!result->priv == !!result->_properly_initialized);
+	if (result->priv) {
+		opt->priv = result->priv;
+		result->priv = NULL;
+		/*
+		 * opt->priv non-NULL means we had results from a previous
+		 * run; do a few sanity checks that user didn't mess with
+		 * it in an obvious fashion.
+		 */
+		assert(opt->priv->call_depth == 0);
+		assert(!opt->priv->toplevel_dir ||
+		       0 == strlen(opt->priv->toplevel_dir));
+	}
+	trace2_region_leave("merge", "sanity checks", opt->repo);
+
+	/* Default to histogram diff.  Actually, just hardcode it...for now. */
+	opt->xdl_opts = DIFF_WITH_ALG(opt, HISTOGRAM_DIFF);
+
+	/* Handle attr direction stuff for renormalization */
+	if (opt->renormalize)
+		git_attr_set_direction(GIT_ATTR_CHECKOUT);
+
+	/* Initialization of opt->priv, our internal merge data */
+	trace2_region_enter("merge", "allocate/init", opt->repo);
+	if (opt->priv) {
+		clear_or_reinit_internal_opts(opt->priv, 1);
+		trace2_region_leave("merge", "allocate/init", opt->repo);
+		return;
+	}
+	opt->priv = xcalloc(1, sizeof(*opt->priv));
+
+	/* 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, pool, 0);
+		strmap_init_with_options(&renames->dir_rename_count[i],
+					 NULL, 1);
+		strmap_init_with_options(&renames->dir_renames[i],
+					 NULL, 0);
+		/*
+		 * relevant_sources uses -1 for the default, because we need
+		 * to be able to distinguish not-in-strintmap from valid
+		 * relevant_source values from enum file_rename_relevance.
+		 * In particular, possibly_cache_new_pair() expects a negative
+		 * value for not-found entries.
+		 */
+		strintmap_init_with_options(&renames->relevant_sources[i],
+					    -1 /* explicitly invalid */,
+					    pool, 0);
+		strmap_init_with_options(&renames->cached_pairs[i],
+					 NULL, 1);
+		strset_init_with_options(&renames->cached_irrelevant[i],
+					 NULL, 1);
+		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.
+	 *
+	 * 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, pool, 0);
+	strmap_init_with_options(&opt->priv->conflicted, pool, 0);
+
+	/*
+	 * keys & strbufs in output will sometimes need to outlive "paths",
+	 * so it will have a copy of relevant keys.  It's probably a small
+	 * subset of the overall paths that have special output.
+	 */
+	strmap_init(&opt->priv->output);
+
+	trace2_region_leave("merge", "allocate/init", opt->repo);
+}
+
+static void merge_check_renames_reusable(struct merge_options *opt,
+					 struct merge_result *result,
+					 struct tree *merge_base,
+					 struct tree *side1,
+					 struct tree *side2)
+{
+	struct rename_info *renames;
+	struct tree **merge_trees;
+	struct merge_options_internal *opti = result->priv;
+
+	if (!opti)
+		return;
+
+	renames = &opti->renames;
+	merge_trees = renames->merge_trees;
+
+	/*
+	 * Handle case where previous merge operation did not want cache to
+	 * take effect, e.g. because rename/rename(1to1) makes it invalid.
+	 */
+	if (!merge_trees[0]) {
+		assert(!merge_trees[0] && !merge_trees[1] && !merge_trees[2]);
+		renames->cached_pairs_valid_side = 0; /* neither side valid */
+		return;
+	}
+
+	/*
+	 * Handle other cases; note that merge_trees[0..2] will only
+	 * be NULL if opti is, or if all three were manually set to
+	 * NULL by e.g. rename/rename(1to1) handling.
+	 */
+	assert(merge_trees[0] && merge_trees[1] && merge_trees[2]);
+
+	/* Check if we meet a condition for re-using cached_pairs */
+	if (oideq(&merge_base->object.oid, &merge_trees[2]->object.oid) &&
+	    oideq(&side1->object.oid, &result->tree->object.oid))
+		renames->cached_pairs_valid_side = MERGE_SIDE1;
+	else if (oideq(&merge_base->object.oid, &merge_trees[1]->object.oid) &&
+		 oideq(&side2->object.oid, &result->tree->object.oid))
+		renames->cached_pairs_valid_side = MERGE_SIDE2;
+	else
+		renames->cached_pairs_valid_side = 0; /* neither side valid */
+}
+
+/*** Function Grouping: merge_incore_*() and their internal variants ***/
+
+/*
+ * Originally from merge_trees_internal(); heavily adapted, though.
+ */
+static void merge_ort_nonrecursive_internal(struct merge_options *opt,
+					    struct tree *merge_base,
+					    struct tree *side1,
+					    struct tree *side2,
+					    struct merge_result *result)
+{
+	struct object_id working_tree_oid;
+
+	if (opt->subtree_shift) {
+		side2 = shift_tree_object(opt->repo, side1, side2,
+					  opt->subtree_shift);
+		merge_base = shift_tree_object(opt->repo, side1, merge_base,
+					       opt->subtree_shift);
+	}
+
+redo:
+	trace2_region_enter("merge", "collect_merge_info", opt->repo);
+	if (collect_merge_info(opt, merge_base, side1, side2) != 0) {
+		/*
+		 * TRANSLATORS: The %s arguments are: 1) tree hash of a merge
+		 * base, and 2-3) the trees for the two trees we're merging.
+		 */
+		err(opt, _("collecting merge info failed for trees %s, %s, %s"),
+		    oid_to_hex(&merge_base->object.oid),
+		    oid_to_hex(&side1->object.oid),
+		    oid_to_hex(&side2->object.oid));
+		result->clean = -1;
+		return;
+	}
+	trace2_region_leave("merge", "collect_merge_info", opt->repo);
+
+	trace2_region_enter("merge", "renames", opt->repo);
+	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->tree = parse_tree_indirect(&working_tree_oid);
+	/* existence of conflicted entries implies unclean */
+	result->clean &= strmap_empty(&opt->priv->conflicted);
+	if (!opt->priv->call_depth) {
+		result->priv = opt->priv;
+		result->_properly_initialized = RESULT_INITIALIZED;
+		opt->priv = NULL;
+	}
+}
+
+/*
+ * Originally from merge_recursive_internal(); somewhat adapted, though.
+ */
+static void merge_ort_internal(struct merge_options *opt,
+			       struct commit_list *merge_bases,
+			       struct commit *h1,
+			       struct commit *h2,
+			       struct merge_result *result)
+{
+	struct commit_list *iter;
+	struct commit *merged_merge_bases;
+	const char *ancestor_name;
+	struct strbuf merge_base_abbrev = STRBUF_INIT;
+
+	if (!merge_bases) {
+		merge_bases = get_merge_bases(h1, h2);
+		/* See merge-ort.h:merge_incore_recursive() declaration NOTE */
+		merge_bases = reverse_commit_list(merge_bases);
+	}
+
+	merged_merge_bases = pop_commit(&merge_bases);
+	if (merged_merge_bases == NULL) {
+		/* if there is no common ancestor, use an empty tree */
+		struct tree *tree;
+
+		tree = lookup_tree(opt->repo, opt->repo->hash_algo->empty_tree);
+		merged_merge_bases = make_virtual_commit(opt->repo, tree,
+							 "ancestor");
+		ancestor_name = "empty tree";
+	} else if (merge_bases) {
+		ancestor_name = "merged common ancestors";
+	} else {
+		strbuf_add_unique_abbrev(&merge_base_abbrev,
+					 &merged_merge_bases->object.oid,
+					 DEFAULT_ABBREV);
+		ancestor_name = merge_base_abbrev.buf;
+	}
+
+	for (iter = merge_bases; iter; iter = iter->next) {
+		const char *saved_b1, *saved_b2;
+		struct commit *prev = merged_merge_bases;
+
+		opt->priv->call_depth++;
+		/*
+		 * When the merge fails, the result contains files
+		 * with conflict markers. The cleanness flag is
+		 * ignored (unless indicating an error), it was never
+		 * actually used, as result of merge_trees has always
+		 * overwritten it: the committed "conflicts" were
+		 * already resolved.
+		 */
+		saved_b1 = opt->branch1;
+		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);
+		if (result->clean < 0)
+			return;
+		opt->branch1 = saved_b1;
+		opt->branch2 = saved_b2;
+		opt->priv->call_depth--;
+
+		merged_merge_bases = make_virtual_commit(opt->repo,
+							 result->tree,
+							 "merged tree");
+		commit_list_insert(prev, &merged_merge_bases->parents);
+		commit_list_insert(iter->item,
+				   &merged_merge_bases->parents->next);
+
+		clear_or_reinit_internal_opts(opt->priv, 1);
+	}
+
+	opt->ancestor = ancestor_name;
+	merge_ort_nonrecursive_internal(opt,
+					repo_get_commit_tree(opt->repo,
+							     merged_merge_bases),
+					repo_get_commit_tree(opt->repo, h1),
+					repo_get_commit_tree(opt->repo, h2),
+					result);
+	strbuf_release(&merge_base_abbrev);
+	opt->ancestor = NULL;  /* avoid accidental re-use of opt->ancestor */
+}
+
+void merge_incore_nonrecursive(struct merge_options *opt,
+			       struct tree *merge_base,
+			       struct tree *side1,
+			       struct tree *side2,
+			       struct merge_result *result)
+{
+	trace2_region_enter("merge", "incore_nonrecursive", opt->repo);
+
+	trace2_region_enter("merge", "merge_start", opt->repo);
+	assert(opt->ancestor != NULL);
+	merge_check_renames_reusable(opt, result, merge_base, side1, side2);
+	merge_start(opt, result);
+	/*
+	 * Record the trees used in this merge, so if there's a next merge in
+	 * a cherry-pick or rebase sequence it might be able to take advantage
+	 * of the cached_pairs in that next merge.
+	 */
+	opt->priv->renames.merge_trees[0] = merge_base;
+	opt->priv->renames.merge_trees[1] = side1;
+	opt->priv->renames.merge_trees[2] = side2;
+	trace2_region_leave("merge", "merge_start", opt->repo);
+
+	merge_ort_nonrecursive_internal(opt, merge_base, side1, side2, result);
+	trace2_region_leave("merge", "incore_nonrecursive", opt->repo);
+}
+
+void merge_incore_recursive(struct merge_options *opt,
+			    struct commit_list *merge_bases,
+			    struct commit *side1,
+			    struct commit *side2,
+			    struct merge_result *result)
+{
+	trace2_region_enter("merge", "incore_recursive", opt->repo);
+
+	/* We set the ancestor label based on the merge_bases */
+	assert(opt->ancestor == NULL);
+
+	trace2_region_enter("merge", "merge_start", opt->repo);
+	merge_start(opt, result);
+	trace2_region_leave("merge", "merge_start", opt->repo);
+
+	merge_ort_internal(opt, merge_bases, side1, side2, result);
+	trace2_region_leave("merge", "incore_recursive", opt->repo);
+}
diff --git a/merge-ort.h b/merge-ort.h
new file mode 100644
index 0000000000..c011864ffe
--- /dev/null
+++ b/merge-ort.h
@@ -0,0 +1,77 @@
+#ifndef MERGE_ORT_H
+#define MERGE_ORT_H
+
+#include "merge-recursive.h"
+
+struct commit;
+struct tree;
+
+struct merge_result {
+	/*
+	 * Whether the merge is clean; possible values:
+	 *    1: clean
+	 *    0: not clean (merge conflicts)
+	 *   <0: operation aborted prematurely.  (object database
+	 *       unreadable, disk full, etc.)  Worktree may be left in an
+	 *       inconsistent state if operation failed near the end.
+	 */
+	int clean;
+
+	/*
+	 * Result of merge.  If !clean, represents what would go in worktree
+	 * (thus possibly including files containing conflict markers).
+	 */
+	struct tree *tree;
+
+	/*
+	 * 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.
+	 */
+	void *priv;
+	/* Also private */
+	unsigned _properly_initialized;
+};
+
+/*
+ * rename-detecting three-way merge with recursive ancestor consolidation.
+ * working tree and index are untouched.
+ *
+ * merge_bases will be consumed (emptied) so make a copy if you need it.
+ *
+ * NOTE: empirically, the recursive algorithm will perform better if you
+ *       pass the merge_bases in the order of oldest commit to the
+ *       newest[1][2].
+ *
+ *       [1] https://lore.kernel.org/git/nycvar.QRO.7.76.6.1907252055500.21907@tvgsbejvaqbjf.bet/
+ *       [2] commit 8918b0c9c2 ("merge-recur: try to merge older merge bases
+ *           first", 2006-08-09)
+ */
+void merge_incore_recursive(struct merge_options *opt,
+			    struct commit_list *merge_bases,
+			    struct commit *side1,
+			    struct commit *side2,
+			    struct merge_result *result);
+
+/*
+ * rename-detecting three-way merge, no recursion.
+ * working tree and index are untouched.
+ */
+void merge_incore_nonrecursive(struct merge_options *opt,
+			       struct tree *merge_base,
+			       struct tree *side1,
+			       struct tree *side2,
+			       struct merge_result *result);
+
+/* Update the working tree and index from head to result after incore merge */
+void merge_switch_to_result(struct merge_options *opt,
+			    struct tree *head,
+			    struct merge_result *result,
+			    int update_worktree_and_index,
+			    int display_update_msgs);
+
+/* Do needed cleanup when not calling merge_switch_to_result() */
+void merge_finalize(struct merge_options *opt,
+		    struct merge_result *result);
+
+#endif
diff --git a/merge-recursive.c b/merge-recursive.c
index 42be7c9960..3355d50e8a 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -61,11 +61,6 @@ static int path_hashmap_cmp(const void *cmp_data,
 		return strcmp(a->path, key ? key : b->path);
 }
 
-static unsigned int path_hash(const char *path)
-{
-	return ignore_case ? strihash(path) : strhash(path);
-}
-
 /*
  * For dir_rename_entry, directory names are stored as a full path from the
  * toplevel of the repository and do not include a trailing '/'.  Also:
@@ -121,7 +116,7 @@ static void dir_rename_entry_init(struct dir_rename_entry *entry,
 	entry->dir = directory;
 	entry->non_unique_new_dir = 0;
 	strbuf_init(&entry->new_dir, 0);
-	string_list_init(&entry->possible_new_dirs, 0);
+	string_list_init_nodup(&entry->possible_new_dirs);
 }
 
 struct collision_entry {
@@ -167,6 +162,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;
@@ -224,17 +220,6 @@ static struct commit *make_virtual_commit(struct repository *repo,
 	return commit;
 }
 
-/*
- * Since we use get_tree_entry(), which does not put the read object into
- * the object pool, we cannot rely on a == b.
- */
-static int oid_eq(const struct object_id *a, const struct object_id *b)
-{
-	if (!a && !b)
-		return 2;
-	return a && b && oideq(a, b);
-}
-
 enum rename_type {
 	RENAME_NORMAL = 0,
 	RENAME_VIA_DIR,
@@ -314,7 +299,7 @@ static inline void setup_rename_conflict_info(enum rename_type rename_type,
 		return;
 	}
 
-	ci = xcalloc(1, sizeof(struct rename_conflict_info));
+	CALLOC_ARRAY(ci, 1);
 	ci->rename_type = rename_type;
 	ci->ren1 = ren1;
 	ci->ren2 = ren2;
@@ -464,7 +449,7 @@ static void unpack_trees_finish(struct merge_options *opt)
 
 static int save_files_dirs(const struct object_id *oid,
 			   struct strbuf *base, const char *path,
-			   unsigned int mode, int stage, void *context)
+			   unsigned int mode, void *context)
 {
 	struct path_hashmap_entry *entry;
 	int baselen = base->len;
@@ -473,7 +458,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);
@@ -484,8 +469,8 @@ static void get_files_dirs(struct merge_options *opt, struct tree *tree)
 {
 	struct pathspec match_all;
 	memset(&match_all, 0, sizeof(match_all));
-	read_tree_recursive(opt->repo, tree, "", 0, 0,
-			    &match_all, save_files_dirs, opt);
+	read_tree(opt->repo, tree,
+		  &match_all, save_files_dirs, opt);
 }
 
 static int get_tree_entry_if_blob(struct repository *r,
@@ -497,7 +482,7 @@ static int get_tree_entry_if_blob(struct repository *r,
 
 	ret = get_tree_entry(r, tree, path, &dfs->oid, &dfs->mode);
 	if (S_ISDIR(dfs->mode)) {
-		oidcpy(&dfs->oid, &null_oid);
+		oidcpy(&dfs->oid, null_oid());
 		dfs->mode = 0;
 	}
 	return ret;
@@ -533,6 +518,8 @@ static struct string_list *get_unmerged(struct index_state *istate)
 
 	unmerged->strdup_strings = 1;
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(istate);
 	for (i = 0; i < istate->cache_nr; i++) {
 		struct string_list_item *item;
 		struct stage_data *e;
@@ -745,14 +732,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);
 }
@@ -805,7 +792,7 @@ static int was_tracked_and_matches(struct merge_options *opt, const char *path,
 
 	/* See if the file we were tracking before matches */
 	ce = opt->priv->orig_index.cache[pos];
-	return (oid_eq(&ce->oid, &blob->oid) && ce->ce_mode == blob->mode);
+	return (oideq(&ce->oid, &blob->oid) && ce->ce_mode == blob->mode);
 }
 
 /*
@@ -969,7 +956,7 @@ static int update_file_flags(struct merge_options *opt,
 		if (S_ISREG(contents->mode)) {
 			struct strbuf strbuf = STRBUF_INIT;
 			if (convert_to_working_tree(opt->repo->index,
-						    path, buf, size, &strbuf)) {
+						    path, buf, size, &strbuf, NULL)) {
 				free(buf);
 				size = strbuf.len;
 				buf = strbuf_detach(&strbuf, NULL);
@@ -1009,10 +996,13 @@ static int update_file_flags(struct merge_options *opt,
 		free(buf);
 	}
 update_index:
-	if (!ret && update_cache)
-		if (add_cacheinfo(opt, contents, path, 0, update_wd,
+	if (!ret && update_cache) {
+		int refresh = (!opt->priv->call_depth &&
+			       contents->mode != S_IFGITLINK);
+		if (add_cacheinfo(opt, contents, path, 0, refresh,
 				  ADD_CACHE_OK_TO_ADD))
 			return -1;
+	}
 	return ret;
 }
 
@@ -1083,6 +1073,11 @@ static int merge_3way(struct merge_options *opt,
 	read_mmblob(&src1, &a->oid);
 	read_mmblob(&src2, &b->oid);
 
+	/*
+	 * FIXME: Using a->path for normalization rules in ll_merge could be
+	 * wrong if we renamed from a->path to b->path.  We should use the
+	 * target path for where the file will be written.
+	 */
 	merge_status = ll_merge(result_buf, a->path, &orig, base,
 				&src1, name1, &src2, name2,
 				opt->repo->index, &ll_opts);
@@ -1162,6 +1157,8 @@ static void print_commit(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);
 	fprintf(stderr, "%s\n", sb.buf);
 	strbuf_release(&sb);
@@ -1185,6 +1182,11 @@ static int merge_submodule(struct merge_options *opt,
 	int search = !opt->priv->call_depth;
 
 	/* store a in result in case we fail */
+	/* FIXME: This is the WRONG resolution for the recursive case when
+	 * we need to be careful to avoid accidentally matching either side.
+	 * Should probably use o instead there, much like we do for merging
+	 * binaries.
+	 */
 	oidcpy(result, a);
 
 	/* we can not handle deletion conflicts */
@@ -1309,6 +1311,13 @@ static int merge_mode_and_contents(struct merge_options *opt,
 
 	if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) {
 		result->clean = 0;
+		/*
+		 * FIXME: This is a bad resolution for recursive case; for
+		 * the recursive case we want something that is unlikely to
+		 * accidentally match either side.  Also, while it makes
+		 * sense to prefer regular files over symlinks, it doesn't
+		 * make sense to prefer regular files over submodules.
+		 */
 		if (S_ISREG(a->mode)) {
 			result->blob.mode = a->mode;
 			oidcpy(&result->blob.oid, &a->oid);
@@ -1317,7 +1326,7 @@ static int merge_mode_and_contents(struct merge_options *opt,
 			oidcpy(&result->blob.oid, &b->oid);
 		}
 	} else {
-		if (!oid_eq(&a->oid, &o->oid) && !oid_eq(&b->oid, &o->oid))
+		if (!oideq(&a->oid, &o->oid) && !oideq(&b->oid, &o->oid))
 			result->merge = 1;
 
 		/*
@@ -1333,9 +1342,9 @@ static int merge_mode_and_contents(struct merge_options *opt,
 			}
 		}
 
-		if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &o->oid))
+		if (oideq(&a->oid, &b->oid) || oideq(&a->oid, &o->oid))
 			oidcpy(&result->blob.oid, &b->oid);
-		else if (oid_eq(&b->oid, &o->oid))
+		else if (oideq(&b->oid, &o->oid))
 			oidcpy(&result->blob.oid, &a->oid);
 		else if (S_ISREG(a->mode)) {
 			mmbuffer_t result_buf;
@@ -1357,6 +1366,7 @@ static int merge_mode_and_contents(struct merge_options *opt,
 			free(result_buf.ptr);
 			if (ret)
 				return ret;
+			/* FIXME: bug, what if modes didn't match? */
 			result->clean = (merge_status == 0);
 		} else if (S_ISGITLINK(a->mode)) {
 			result->clean = merge_submodule(opt, &result->blob.oid,
@@ -1368,7 +1378,7 @@ static int merge_mode_and_contents(struct merge_options *opt,
 			switch (opt->recursive_variant) {
 			case MERGE_VARIANT_NORMAL:
 				oidcpy(&result->blob.oid, &a->oid);
-				if (!oid_eq(&a->oid, &b->oid))
+				if (!oideq(&a->oid, &b->oid))
 					result->clean = 0;
 				break;
 			case MERGE_VARIANT_OURS:
@@ -1568,35 +1578,6 @@ static int handle_file_collision(struct merge_options *opt,
 					     b, a);
 	}
 
-	/*
-	 * In the recursive case, we just opt to undo renames
-	 */
-	if (opt->priv->call_depth && (prev_path1 || prev_path2)) {
-		/* Put first file (a->oid, a->mode) in its original spot */
-		if (prev_path1) {
-			if (update_file(opt, 1, a, prev_path1))
-				return -1;
-		} else {
-			if (update_file(opt, 1, a, collide_path))
-				return -1;
-		}
-
-		/* Put second file (b->oid, b->mode) in its original spot */
-		if (prev_path2) {
-			if (update_file(opt, 1, b, prev_path2))
-				return -1;
-		} else {
-			if (update_file(opt, 1, b, collide_path))
-				return -1;
-		}
-
-		/* Don't leave something at collision path if unrenaming both */
-		if (prev_path1 && prev_path2)
-			remove_file(opt, 1, collide_path, 0);
-
-		return 0;
-	}
-
 	/* Remove rename sources if rename/add or rename/rename(2to1) */
 	if (prev_path1)
 		remove_file(opt, 1, prev_path1,
@@ -1641,7 +1622,7 @@ static int handle_file_collision(struct merge_options *opt,
 
 	/* Store things in diff_filespecs for functions that need it */
 	null.path = (char *)collide_path;
-	oidcpy(&null.oid, &null_oid);
+	oidcpy(&null.oid, null_oid());
 	null.mode = 0;
 
 	if (merge_mode_and_contents(opt, &null, a, b, collide_path,
@@ -1723,6 +1704,14 @@ static char *find_path_for_conflict(struct merge_options *opt,
 	return new_path;
 }
 
+/*
+ * Toggle the stage number between "ours" and "theirs" (2 and 3).
+ */
+static inline int flip_stage(int stage)
+{
+	return (2 + 3) - stage;
+}
+
 static int handle_rename_rename_1to2(struct merge_options *opt,
 				     struct rename_conflict_info *ci)
 {
@@ -1749,85 +1738,68 @@ static int handle_rename_rename_1to2(struct merge_options *opt,
 		return -1;
 	free(path_desc);
 
-	if (opt->priv->call_depth) {
-		/*
-		 * FIXME: For rename/add-source conflicts (if we could detect
-		 * such), this is wrong.  We should instead find a unique
-		 * pathname and then either rename the add-source file to that
-		 * unique path, or use that unique path instead of src here.
-		 */
-		if (update_file(opt, 0, &mfi.blob, o->path))
+	if (opt->priv->call_depth)
+		remove_file_from_index(opt->repo->index, o->path);
+
+	/*
+	 * For each destination path, we need to see if there is a
+	 * rename/add collision.  If not, we can write the file out
+	 * to the specified location.
+	 */
+	add = &ci->ren1->dst_entry->stages[flip_stage(2)];
+	if (is_valid(add)) {
+		add->path = mfi.blob.path = a->path;
+		if (handle_file_collision(opt, a->path,
+					  NULL, NULL,
+					  ci->ren1->branch,
+					  ci->ren2->branch,
+					  &mfi.blob, add) < 0)
 			return -1;
+	} else {
+		char *new_path = find_path_for_conflict(opt, a->path,
+							ci->ren1->branch,
+							ci->ren2->branch);
+		if (update_file(opt, 0, &mfi.blob,
+				new_path ? new_path : a->path))
+			return -1;
+		free(new_path);
+		if (!opt->priv->call_depth &&
+		    update_stages(opt, a->path, NULL, a, NULL))
+			return -1;
+	}
 
+	if (!mfi.clean && mfi.blob.mode == a->mode &&
+	    oideq(&mfi.blob.oid, &a->oid)) {
 		/*
-		 * Above, we put the merged content at the merge-base's
-		 * path.  Now we usually need to delete both a->path and
-		 * b->path.  However, the rename on each side of the merge
-		 * could also be involved in a rename/add conflict.  In
-		 * such cases, we should keep the added file around,
-		 * resolving the conflict at that path in its favor.
+		 * Getting here means we were attempting to merge a binary
+		 * blob.  Since we can't merge binaries, the merge algorithm
+		 * just takes one side.  But we don't want to copy the
+		 * contents of one side to both paths; we'd rather use the
+		 * original content at the given path for each path.
 		 */
-		add = &ci->ren1->dst_entry->stages[2 ^ 1];
-		if (is_valid(add)) {
-			if (update_file(opt, 0, add, a->path))
-				return -1;
-		}
-		else
-			remove_file_from_index(opt->repo->index, a->path);
-		add = &ci->ren2->dst_entry->stages[3 ^ 1];
-		if (is_valid(add)) {
-			if (update_file(opt, 0, add, b->path))
-				return -1;
-		}
-		else
-			remove_file_from_index(opt->repo->index, b->path);
+		oidcpy(&mfi.blob.oid, &b->oid);
+		mfi.blob.mode = b->mode;
+	}
+	add = &ci->ren2->dst_entry->stages[flip_stage(3)];
+	if (is_valid(add)) {
+		add->path = mfi.blob.path = b->path;
+		if (handle_file_collision(opt, b->path,
+					  NULL, NULL,
+					  ci->ren1->branch,
+					  ci->ren2->branch,
+					  add, &mfi.blob) < 0)
+			return -1;
 	} else {
-		/*
-		 * For each destination path, we need to see if there is a
-		 * rename/add collision.  If not, we can write the file out
-		 * to the specified location.
-		 */
-		add = &ci->ren1->dst_entry->stages[2 ^ 1];
-		if (is_valid(add)) {
-			add->path = mfi.blob.path = a->path;
-			if (handle_file_collision(opt, a->path,
-						  NULL, NULL,
-						  ci->ren1->branch,
-						  ci->ren2->branch,
-						  &mfi.blob, add) < 0)
-				return -1;
-		} else {
-			char *new_path = find_path_for_conflict(opt, a->path,
-								ci->ren1->branch,
-								ci->ren2->branch);
-			if (update_file(opt, 0, &mfi.blob,
-					new_path ? new_path : a->path))
-				return -1;
-			free(new_path);
-			if (update_stages(opt, a->path, NULL, a, NULL))
-				return -1;
-		}
-
-		add = &ci->ren2->dst_entry->stages[3 ^ 1];
-		if (is_valid(add)) {
-			add->path = mfi.blob.path = b->path;
-			if (handle_file_collision(opt, b->path,
-						  NULL, NULL,
-						  ci->ren1->branch,
-						  ci->ren2->branch,
-						  add, &mfi.blob) < 0)
-				return -1;
-		} else {
-			char *new_path = find_path_for_conflict(opt, b->path,
-								ci->ren2->branch,
-								ci->ren1->branch);
-			if (update_file(opt, 0, &mfi.blob,
-					new_path ? new_path : b->path))
-				return -1;
-			free(new_path);
-			if (update_stages(opt, b->path, NULL, NULL, b))
-				return -1;
-		}
+		char *new_path = find_path_for_conflict(opt, b->path,
+							ci->ren2->branch,
+							ci->ren1->branch);
+		if (update_file(opt, 0, &mfi.blob,
+				new_path ? new_path : b->path))
+			return -1;
+		free(new_path);
+		if (!opt->priv->call_depth &&
+		    update_stages(opt, b->path, NULL, NULL, b))
+			return -1;
 	}
 
 	return 0;
@@ -1857,7 +1829,7 @@ static int handle_rename_rename_2to1(struct merge_options *opt,
 	path_side_1_desc = xstrfmt("version of %s from %s", path, a->path);
 	path_side_2_desc = xstrfmt("version of %s from %s", path, b->path);
 	ostage1 = ci->ren1->branch == opt->branch1 ? 3 : 2;
-	ostage2 = ostage1 ^ 1;
+	ostage2 = flip_stage(ostage1);
 	ci->ren1->src_entry->stages[ostage1].path = a->path;
 	ci->ren2->src_entry->stages[ostage2].path = b->path;
 	if (merge_mode_and_contents(opt, a, c1,
@@ -1903,7 +1875,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;
@@ -1951,6 +1923,16 @@ static char *apply_dir_rename(struct dir_rename_entry *entry,
 		return NULL;
 
 	oldlen = strlen(entry->dir);
+	if (entry->new_dir.len == 0)
+		/*
+		 * If someone renamed/merged a subdirectory into the root
+		 * directory (e.g. 'some/subdir' -> ''), then we want to
+		 * avoid returning
+		 *     '' + '/filename'
+		 * as the rename; we need to make old_path + oldlen advance
+		 * past the '/' character.
+		 */
+		oldlen++;
 	newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1;
 	strbuf_grow(&new_path, newlen);
 	strbuf_addbuf(&new_path, &entry->new_dir);
@@ -1963,8 +1945,8 @@ static void get_renamed_dir_portion(const char *old_path, const char *new_path,
 				    char **old_dir, char **new_dir)
 {
 	char *end_of_old, *end_of_new;
-	int old_len, new_len;
 
+	/* Default return values: NULL, meaning no rename */
 	*old_dir = NULL;
 	*new_dir = NULL;
 
@@ -1975,43 +1957,91 @@ static void get_renamed_dir_portion(const char *old_path, const char *new_path,
 	 *    "a/b/c/d" was renamed to "a/b/some/thing/else"
 	 * so, for this example, this function returns "a/b/c/d" in
 	 * *old_dir and "a/b/some/thing/else" in *new_dir.
-	 *
-	 * Also, if the basename of the file changed, we don't care.  We
-	 * want to know which portion of the directory, if any, changed.
+	 */
+
+	/*
+	 * If the basename of the file changed, we don't care.  We want
+	 * to know which portion of the directory, if any, changed.
 	 */
 	end_of_old = strrchr(old_path, '/');
 	end_of_new = strrchr(new_path, '/');
 
-	if (end_of_old == NULL || end_of_new == NULL)
+	/*
+	 * If end_of_old is NULL, old_path wasn't in a directory, so there
+	 * could not be a directory rename (our rule elsewhere that a
+	 * directory which still exists is not considered to have been
+	 * renamed means the root directory can never be renamed -- because
+	 * the root directory always exists).
+	 */
+	if (end_of_old == NULL)
+		return; /* Note: *old_dir and *new_dir are still NULL */
+
+	/*
+	 * If new_path contains no directory (end_of_new is NULL), then we
+	 * have a rename of old_path's directory to the root directory.
+	 */
+	if (end_of_new == NULL) {
+		*old_dir = xstrndup(old_path, end_of_old - old_path);
+		*new_dir = xstrdup("");
 		return;
+	}
+
+	/* Find the first non-matching character traversing backwards */
 	while (*--end_of_new == *--end_of_old &&
 	       end_of_old != old_path &&
 	       end_of_new != new_path)
 		; /* Do nothing; all in the while loop */
+
 	/*
-	 * We've found the first non-matching character in the directory
-	 * paths.  That means the current directory we were comparing
-	 * represents the rename.  Move end_of_old and end_of_new back
-	 * to the full directory name.
+	 * If both got back to the beginning of their strings, then the
+	 * directory didn't change at all, only the basename did.
 	 */
-	if (*end_of_old == '/')
-		end_of_old++;
-	if (*end_of_old != '/')
-		end_of_new++;
-	end_of_old = strchr(end_of_old, '/');
-	end_of_new = strchr(end_of_new, '/');
+	if (end_of_old == old_path && end_of_new == new_path &&
+	    *end_of_old == *end_of_new)
+		return; /* Note: *old_dir and *new_dir are still NULL */
 
 	/*
-	 * It may have been the case that old_path and new_path were the same
-	 * directory all along.  Don't claim a rename if they're the same.
+	 * If end_of_new got back to the beginning of its string, and
+	 * end_of_old got back to the beginning of some subdirectory, then
+	 * we have a rename/merge of a subdirectory into the root, which
+	 * needs slightly special handling.
+	 *
+	 * Note: There is no need to consider the opposite case, with a
+	 * rename/merge of the root directory into some subdirectory
+	 * because as noted above the root directory always exists so it
+	 * cannot be considered to be renamed.
 	 */
-	old_len = end_of_old - old_path;
-	new_len = end_of_new - new_path;
-
-	if (old_len != new_len || strncmp(old_path, new_path, old_len)) {
-		*old_dir = xstrndup(old_path, old_len);
-		*new_dir = xstrndup(new_path, new_len);
+	if (end_of_new == new_path &&
+	    end_of_old != old_path && end_of_old[-1] == '/') {
+		*old_dir = xstrndup(old_path, --end_of_old - old_path);
+		*new_dir = xstrdup("");
+		return;
 	}
+
+	/*
+	 * We've found the first non-matching character in the directory
+	 * paths.  That means the current characters we were looking at
+	 * were part of the first non-matching subdir name going back from
+	 * the end of the strings.  Get the whole name by advancing both
+	 * end_of_old and end_of_new to the NEXT '/' character.  That will
+	 * represent the entire directory rename.
+	 *
+	 * The reason for the increment is cases like
+	 *    a/b/star/foo/whatever.c -> a/b/tar/foo/random.c
+	 * After dropping the basename and going back to the first
+	 * non-matching character, we're now comparing:
+	 *    a/b/s          and         a/b/
+	 * and we want to be comparing:
+	 *    a/b/star/      and         a/b/tar/
+	 * but without the pre-increment, the one on the right would stay
+	 * a/b/.
+	 */
+	end_of_old = strchr(++end_of_old, '/');
+	end_of_new = strchr(++end_of_new, '/');
+
+	/* Copy the old and new directories into *old_dir and *new_dir. */
+	*old_dir = xstrndup(old_path, end_of_old - old_path);
+	*new_dir = xstrndup(new_path, end_of_new - new_path);
 }
 
 static void remove_hashmap_entries(struct hashmap *dir_renames,
@@ -2118,7 +2148,7 @@ static char *handle_path_level_conflicts(struct merge_options *opt,
  *      implicit renaming of files that should be left in place.  (See
  *      testcase 6b in t6043 for details.)
  *   2. Prune directory renames if there are still files left in the
- *      the original directory.  These represent a partial directory rename,
+ *      original directory.  These represent a partial directory rename,
  *      i.e. a rename where only some of the files within the directory
  *      were renamed elsewhere.  (Technically, this could be done earlier
  *      in get_directory_renames(), except that would prevent us from
@@ -2377,8 +2407,7 @@ static void compute_collisions(struct hashmap *collisions,
 			continue;
 		collision_ent = collision_find_entry(collisions, new_path);
 		if (!collision_ent) {
-			collision_ent = xcalloc(1,
-						sizeof(struct collision_entry));
+			CALLOC_ARRAY(collision_ent, 1);
 			hashmap_entry_init(&collision_ent->ent,
 						strhash(new_path));
 			hashmap_put(collisions, &collision_ent->ent);
@@ -2582,7 +2611,7 @@ static struct string_list *get_renames(struct merge_options *opt,
 	struct string_list *renames;
 
 	compute_collisions(&collisions, dir_renames, pairs);
-	renames = xcalloc(1, sizeof(struct string_list));
+	CALLOC_ARRAY(renames, 1);
 
 	for (i = 0; i < pairs->nr; ++i) {
 		struct string_list_item *item;
@@ -2639,7 +2668,7 @@ static struct string_list *get_renames(struct merge_options *opt,
 		free(e->target_file);
 		string_list_clear(&e->source_files, 0);
 	}
-	hashmap_free_entries(&collisions, struct collision_entry, ent);
+	hashmap_clear_and_free(&collisions, struct collision_entry, ent);
 	return renames;
 }
 
@@ -2652,6 +2681,14 @@ static int process_renames(struct merge_options *opt,
 	struct string_list b_by_dst = STRING_LIST_INIT_NODUP;
 	const struct rename *sre;
 
+	/*
+	 * FIXME: As string-list.h notes, it's O(n^2) to build a sorted
+	 * string_list one-by-one, but O(n log n) to build it unsorted and
+	 * then sort it.  Note that as we build the list, we do not need to
+	 * check if the existing destination path is already in the list,
+	 * because the structure of diffcore_rename guarantees we won't
+	 * have duplicates.
+	 */
 	for (i = 0; i < a_renames->nr; i++) {
 		sre = a_renames->items[i].util;
 		string_list_insert(&a_by_dst, sre->pair->two->path)->util
@@ -2763,12 +2800,19 @@ static int process_renames(struct merge_options *opt,
 			int renamed_stage = a_renames == renames1 ? 2 : 3;
 			int other_stage =   a_renames == renames1 ? 3 : 2;
 
+			/*
+			 * Directory renames have a funny corner case...
+			 */
+			int renamed_to_self = !strcmp(ren1_src, ren1_dst);
+
 			/* BUG: We should only remove ren1_src in the base
 			 * stage and in other_stage (think of rename +
 			 * add-source case).
 			 */
-			remove_file(opt, 1, ren1_src,
-				    renamed_stage == 2 || !was_tracked(opt, ren1_src));
+			if (!renamed_to_self)
+				remove_file(opt, 1, ren1_src,
+					    renamed_stage == 2 ||
+					    !was_tracked(opt, ren1_src));
 
 			oidcpy(&src_other.oid,
 			       &ren1->src_entry->stages[other_stage].oid);
@@ -2778,15 +2822,18 @@ static int process_renames(struct merge_options *opt,
 			dst_other.mode = ren1->dst_entry->stages[other_stage].mode;
 			try_merge = 0;
 
-			if (oid_eq(&src_other.oid, &null_oid) &&
+			if (oideq(&src_other.oid, null_oid()) &&
 			    ren1->dir_rename_original_type == 'A') {
 				setup_rename_conflict_info(RENAME_VIA_DIR,
 							   opt, ren1, NULL);
-			} else if (oid_eq(&src_other.oid, &null_oid)) {
+			} else if (renamed_to_self) {
+				setup_rename_conflict_info(RENAME_NORMAL,
+							   opt, ren1, NULL);
+			} else if (oideq(&src_other.oid, null_oid())) {
 				setup_rename_conflict_info(RENAME_DELETE,
 							   opt, ren1, NULL);
 			} else if ((dst_other.mode == ren1->pair->two->mode) &&
-				   oid_eq(&dst_other.oid, &ren1->pair->two->oid)) {
+				   oideq(&dst_other.oid, &ren1->pair->two->oid)) {
 				/*
 				 * Added file on the other side identical to
 				 * the file being renamed: clean merge.
@@ -2801,7 +2848,7 @@ static int process_renames(struct merge_options *opt,
 						      1, /* update_cache */
 						      0  /* update_wd    */))
 					clean_merge = -1;
-			} else if (!oid_eq(&dst_other.oid, &null_oid)) {
+			} else if (!oideq(&dst_other.oid, null_oid())) {
 				/*
 				 * Probably not a clean merge, but it's
 				 * premature to set clean_merge to 0 here,
@@ -2858,7 +2905,7 @@ static void initial_cleanup_rename(struct diff_queue_struct *pairs,
 		strbuf_release(&e->new_dir);
 		/* possible_new_dirs already cleared in get_directory_renames */
 	}
-	hashmap_free_entries(dir_renames, struct dir_rename_entry, ent);
+	hashmap_clear_and_free(dir_renames, struct dir_rename_entry, ent);
 	free(dir_renames);
 
 	free(pairs->queue);
@@ -2975,11 +3022,11 @@ static int blob_unchanged(struct merge_options *opt,
 	struct strbuf obuf = STRBUF_INIT;
 	struct strbuf abuf = STRBUF_INIT;
 	int ret = 0; /* assume changed for safety */
-	const struct index_state *idx = opt->repo->index;
+	struct index_state *idx = opt->repo->index;
 
 	if (a->mode != o->mode)
 		return 0;
-	if (oid_eq(&o->oid, &a->oid))
+	if (oideq(&o->oid, &a->oid))
 		return 1;
 	if (!renormalize)
 		return 0;
@@ -3139,7 +3186,6 @@ static int handle_rename_normal(struct merge_options *opt,
 	struct rename *ren = ci->ren1;
 	struct merge_file_info mfi;
 	int clean;
-	int side = (ren->branch == opt->branch1 ? 2 : 3);
 
 	/* Merge the content and write it out */
 	clean = handle_content_merge(&mfi, opt, path, was_dirty(opt, path),
@@ -3149,9 +3195,7 @@ static int handle_rename_normal(struct merge_options *opt,
 	    opt->detect_directory_renames == MERGE_DIRECTORY_RENAMES_CONFLICT &&
 	    ren->dir_rename_original_dest) {
 		if (update_stages(opt, path,
-				  NULL,
-				  side == 2 ? &mfi.blob : NULL,
-				  side == 2 ? NULL : &mfi.blob))
+				  &mfi.blob, &mfi.blob, &mfi.blob))
 			return -1;
 		clean = 0; /* not clean, but conflicted */
 	}
@@ -3420,8 +3464,8 @@ static int merge_trees_internal(struct merge_options *opt,
 					       opt->subtree_shift);
 	}
 
-	if (oid_eq(&merge_base->object.oid, &merge->object.oid)) {
-		output(opt, 0, _("Already up to date!"));
+	if (oideq(&merge_base->object.oid, &merge->object.oid)) {
+		output(opt, 0, _("Already up to date."));
 		*result = head;
 		return 1;
 	}
@@ -3485,7 +3529,7 @@ static int merge_trees_internal(struct merge_options *opt,
 		string_list_clear(entries, 1);
 		free(entries);
 
-		hashmap_free_entries(&opt->priv->current_file_dir_set,
+		hashmap_clear_and_free(&opt->priv->current_file_dir_set,
 					struct path_hashmap_entry, e);
 
 		if (clean < 0) {
@@ -3505,20 +3549,10 @@ static int merge_trees_internal(struct merge_options *opt,
 	return clean;
 }
 
-static struct commit_list *reverse_commit_list(struct commit_list *list)
-{
-	struct commit_list *next = NULL, *current, *backup;
-	for (current = list; current; current = backup) {
-		backup = current->next;
-		current->next = next;
-		next = current;
-	}
-	return next;
-}
-
 /*
- * Merge the commits h1 and h2, return the resulting virtual
- * commit object and a flag indicating the cleanness of the merge.
+ * Merge the commits h1 and h2, returning a flag (int) indicating the
+ * cleanness of the merge.  Also, if opt->priv->call_depth, create a
+ * virtual commit and write its location to *result.
  */
 static int merge_recursive_internal(struct merge_options *opt,
 				    struct commit *h1,
@@ -3600,6 +3634,15 @@ static int merge_recursive_internal(struct merge_options *opt,
 			return err(opt, _("merge returned no commit"));
 	}
 
+	/*
+	 * FIXME: Since merge_recursive_internal() is only ever called by
+	 * places that ensure the index is loaded first
+	 * (e.g. builtin/merge.c, rebase/sequencer, etc.), in the common
+	 * case where the merge base was unique that means when we get here
+	 * we immediately discard the index and re-read it, which is a
+	 * complete waste of time.  We should only be discarding and
+	 * re-reading if we were forced to recurse.
+	 */
 	discard_index(opt->repo->index);
 	if (!opt->priv->call_depth)
 		repo_read_index(opt->repo);
@@ -3662,8 +3705,8 @@ static int merge_start(struct merge_options *opt, struct tree *head)
 		return -1;
 	}
 
-	opt->priv = xcalloc(1, sizeof(*opt->priv));
-	string_list_init(&opt->priv->df_conflict_file_set, 1);
+	CALLOC_ARRAY(opt->priv, 1);
+	string_list_init_dup(&opt->priv->df_conflict_file_set);
 	return 0;
 }
 
@@ -3779,9 +3822,12 @@ int merge_recursive_generic(struct merge_options *opt,
 static void merge_recursive_config(struct merge_options *opt)
 {
 	char *value = NULL;
+	int renormalize = 0;
 	git_config_get_int("merge.verbosity", &opt->verbosity);
 	git_config_get_int("diff.renamelimit", &opt->rename_limit);
 	git_config_get_int("merge.renamelimit", &opt->rename_limit);
+	git_config_get_bool("merge.renormalize", &renormalize);
+	opt->renormalize = renormalize;
 	if (!git_config_get_string("diff.renames", &value)) {
 		opt->detect_renames = git_config_rename("diff.renames", value);
 		free(value);
diff --git a/merge-recursive.h b/merge-recursive.h
index 978847e672..0795a1d3ec 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -69,9 +69,8 @@ int parse_merge_opt(struct merge_options *opt, const char *s);
  *
  * Outputs:
  *   - See RETURN VALUES above
- *   - No commit is created
  *   - opt->repo->index has the new index
- *   - $GIT_INDEX_FILE is not updated
+ *   - new index NOT written to disk
  *   - The working tree is updated with results of the merge
  */
 int merge_trees(struct merge_options *opt,
@@ -81,7 +80,7 @@ int merge_trees(struct merge_options *opt,
 
 /*
  * merge_recursive is like merge_trees() but with recursive ancestor
- * consolidation and, if the commit is clean, creation of a commit.
+ * consolidation.
  *
  * NOTE: empirically, about a decade ago it was determined that with more
  *       than two merge bases, optimal behavior was found when the
@@ -91,9 +90,9 @@ int merge_trees(struct merge_options *opt,
  *
  * Outputs:
  *   - See RETURN VALUES above
- *   - If merge is clean, a commit is created and its address written to *result
+ *   - *result is treated as scratch space for temporary recursive merges
  *   - opt->repo->index has the new index
- *   - $GIT_INDEX_FILE is not updated
+ *   - new index NOT written to disk
  *   - The working tree is updated with results of the merge
  */
 int merge_recursive(struct merge_options *opt,
@@ -109,9 +108,9 @@ int merge_recursive(struct merge_options *opt,
  *
  * Outputs:
  *   - See RETURN VALUES above
- *   - If merge is clean, a commit is created and its address written to *result
+ *   - *result is treated as scratch space for temporary recursive merges
  *   - opt->repo->index has the new index
- *   - $GIT_INDEX_FILE is updated
+ *   - new index also written to $GIT_INDEX_FILE on disk
  *   - The working tree is updated with results of the merge
  */
 int merge_recursive_generic(struct merge_options *opt,
diff --git a/merge.c b/merge.c
index 7c1d756c3f..6e736881d9 100644
--- a/merge.c
+++ b/merge.c
@@ -19,22 +19,22 @@ int try_merge_command(struct repository *r,
 		      const char **xopts, struct commit_list *common,
 		      const char *head_arg, struct commit_list *remotes)
 {
-	struct argv_array args = ARGV_ARRAY_INIT;
+	struct strvec args = STRVEC_INIT;
 	int i, ret;
 	struct commit_list *j;
 
-	argv_array_pushf(&args, "merge-%s", strategy);
+	strvec_pushf(&args, "merge-%s", strategy);
 	for (i = 0; i < xopts_nr; i++)
-		argv_array_pushf(&args, "--%s", xopts[i]);
+		strvec_pushf(&args, "--%s", xopts[i]);
 	for (j = common; j; j = j->next)
-		argv_array_push(&args, merge_argument(j->item));
-	argv_array_push(&args, "--");
-	argv_array_push(&args, head_arg);
+		strvec_push(&args, merge_argument(j->item));
+	strvec_push(&args, "--");
+	strvec_push(&args, head_arg);
 	for (j = remotes; j; j = j->next)
-		argv_array_push(&args, merge_argument(j->item));
+		strvec_push(&args, merge_argument(j->item));
 
-	ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
-	argv_array_clear(&args);
+	ret = run_command_v_opt(args.v, RUN_GIT_CMD);
+	strvec_clear(&args);
 
 	discard_index(r->index);
 	if (repo_read_index(r) < 0)
@@ -53,7 +53,7 @@ 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;
+	struct dir_struct dir = DIR_INIT;
 	struct lock_file lock_file = LOCK_INIT;
 
 	refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
@@ -81,7 +81,6 @@ int checkout_fast_forward(struct repository *r,
 
 	memset(&opts, 0, sizeof(opts));
 	if (overwrite_ignore) {
-		memset(&dir, 0, sizeof(dir));
 		dir.flags |= DIR_SHOW_IGNORED;
 		setup_standard_excludes(&dir);
 		opts.dir = &dir;
@@ -94,6 +93,7 @@ int checkout_fast_forward(struct repository *r,
 	opts.verbose_update = 1;
 	opts.merge = 1;
 	opts.fn = twoway_merge;
+	init_checkout_metadata(&opts.meta, NULL, remote, NULL);
 	setup_unpack_trees_porcelain(&opts, "merge");
 
 	if (unpack_trees(nr_trees, t, &opts)) {
@@ -101,6 +101,7 @@ 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/mergetools/bc b/mergetools/bc
index 3a69e60faa..26c19d46a5 100644
--- a/mergetools/bc
+++ b/mergetools/bc
@@ -21,3 +21,9 @@ translate_merge_tool_path() {
 		echo bcompare
 	fi
 }
+
+list_tool_variants () {
+	echo bc
+	echo bc3
+	echo bc4
+}
diff --git a/mergetools/bc3 b/mergetools/bc3
deleted file mode 100644
index 5d8dd48184..0000000000
--- a/mergetools/bc3
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/bc"
diff --git a/mergetools/gvimdiff3 b/mergetools/gvimdiff3
deleted file mode 100644
index 04a5bb0ea8..0000000000
--- a/mergetools/gvimdiff3
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index 0264ed5b20..520cb914a1 100644
--- a/mergetools/kdiff3
+++ b/mergetools/kdiff3
@@ -25,3 +25,12 @@ merge_cmd () {
 exit_code_trustable () {
 	true
 }
+
+translate_merge_tool_path() {
+	if type kdiff3 >/dev/null 2>/dev/null
+	then
+		echo kdiff3
+	else
+		mergetool_find_win32_cmd "kdiff3.exe" "Kdiff3"
+	fi
+}
diff --git a/mergetools/meld b/mergetools/meld
index 7a08470f88..aab4ebb935 100644
--- a/mergetools/meld
+++ b/mergetools/meld
@@ -3,34 +3,87 @@ diff_cmd () {
 }
 
 merge_cmd () {
-	if test -z "${meld_has_output_option:+set}"
+	check_meld_for_features
+
+	option_auto_merge=
+	if test "$meld_use_auto_merge_option" = true
 	then
-		check_meld_for_output_version
+		option_auto_merge="--auto-merge"
 	fi
 
 	if test "$meld_has_output_option" = true
 	then
-		"$merge_tool_path" --output="$MERGED" \
+		"$merge_tool_path" $option_auto_merge --output="$MERGED" \
 			"$LOCAL" "$BASE" "$REMOTE"
 	else
-		"$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+		"$merge_tool_path" $option_auto_merge "$LOCAL" "$MERGED" "$REMOTE"
 	fi
 }
 
-# Check whether we should use 'meld --output <file>'
-check_meld_for_output_version () {
-	meld_path="$(git config mergetool.meld.path)"
-	meld_path="${meld_path:-meld}"
+# Get meld help message
+init_meld_help_msg () {
+	if test -z "$meld_help_msg"
+	then
+		meld_path="$(git config mergetool.meld.path || echo meld)"
+		meld_help_msg=$("$meld_path" --help 2>&1)
+	fi
+}
 
-	if meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
+# Check the features and set flags
+check_meld_for_features () {
+	# Check whether we should use 'meld --output <file>'
+	if test -z "$meld_has_output_option"
 	then
-		: use configured value
-	elif "$meld_path" --help 2>&1 |
-		grep -e '--output=' -e '\[OPTION\.\.\.\]' >/dev/null
+		meld_has_output_option=$(git config --bool mergetool.meld.hasOutput)
+		case "$meld_has_output_option" in
+		true | false)
+			: use configured value
+			;;
+		*)
+			: empty or invalid configured value, detecting "--output" automatically
+			init_meld_help_msg
+
+			case "$meld_help_msg" in
+			*"--output="* | *'[OPTION...]'*)
+				# All version that has [OPTION...] supports --output
+				meld_has_output_option=true
+				;;
+			*)
+				meld_has_output_option=false
+				;;
+			esac
+			;;
+		esac
+	fi
+	# Check whether we should use 'meld --auto-merge ...'
+	if test -z "$meld_use_auto_merge_option"
 	then
-		: old ones mention --output and new ones just say OPTION...
-		meld_has_output_option=true
-	else
-		meld_has_output_option=false
+		meld_use_auto_merge_option=$(
+			git config --bool-or-str mergetool.meld.useAutoMerge
+		)
+		case "$meld_use_auto_merge_option" in
+		true | false)
+			: use well formatted boolean value
+			;;
+		auto)
+			# testing the "--auto-merge" option only if config is "auto"
+			init_meld_help_msg
+
+			case "$meld_help_msg" in
+			*"--auto-merge"* | *'[OPTION...]'*)
+				meld_use_auto_merge_option=true
+				;;
+			*)
+				meld_use_auto_merge_option=false
+				;;
+			esac
+			;;
+		"")
+			meld_use_auto_merge_option=false
+			;;
+		*)
+			die "unknown mergetool.meld.useAutoMerge: $meld_use_auto_merge_option"
+			;;
+		esac
 	fi
 }
diff --git a/mergetools/gvimdiff2 b/mergetools/nvimdiff
index 04a5bb0ea8..04a5bb0ea8 100644
--- a/mergetools/gvimdiff2
+++ b/mergetools/nvimdiff
diff --git a/mergetools/vimdiff b/mergetools/vimdiff
index 10d86f3e19..96f6209a04 100644
--- a/mergetools/vimdiff
+++ b/mergetools/vimdiff
@@ -5,7 +5,7 @@ diff_cmd () {
 
 merge_cmd () {
 	case "$1" in
-	gvimdiff|vimdiff)
+	*vimdiff)
 		if $base_present
 		then
 			"$merge_tool_path" -f -d -c '4wincmd w | wincmd J' \
@@ -15,11 +15,22 @@ merge_cmd () {
 				"$LOCAL" "$MERGED" "$REMOTE"
 		fi
 		;;
-	gvimdiff2|vimdiff2)
+	*vimdiff1)
+		"$merge_tool_path" -f -d \
+			-c 'echon "Resolve conflicts leftward then save. Use :cq to abort."' \
+			"$LOCAL" "$REMOTE"
+		ret="$?"
+		if test "$ret" -eq 0
+		then
+			cp -- "$LOCAL" "$MERGED"
+		fi
+		return "$ret"
+		;;
+	*vimdiff2)
 		"$merge_tool_path" -f -d -c 'wincmd l' \
 			"$LOCAL" "$MERGED" "$REMOTE"
 		;;
-	gvimdiff3|vimdiff3)
+	*vimdiff3)
 		if $base_present
 		then
 			"$merge_tool_path" -f -d -c 'hid | hid | hid' \
@@ -34,10 +45,13 @@ merge_cmd () {
 
 translate_merge_tool_path() {
 	case "$1" in
-	gvimdiff|gvimdiff2|gvimdiff3)
+	nvimdiff*)
+		echo nvim
+		;;
+	gvimdiff*)
 		echo gvim
 		;;
-	vimdiff|vimdiff2|vimdiff3)
+	vimdiff*)
 		echo vim
 		;;
 	esac
@@ -46,3 +60,11 @@ translate_merge_tool_path() {
 exit_code_trustable () {
 	true
 }
+
+list_tool_variants () {
+	for prefix in '' g n; do
+		for suffix in '' 1 2 3; do
+			echo "${prefix}vimdiff${suffix}"
+		done
+	done
+}
diff --git a/mergetools/vimdiff2 b/mergetools/vimdiff2
deleted file mode 100644
index 04a5bb0ea8..0000000000
--- a/mergetools/vimdiff2
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/mergetools/vimdiff3 b/mergetools/vimdiff3
deleted file mode 100644
index 04a5bb0ea8..0000000000
--- a/mergetools/vimdiff3
+++ /dev/null
@@ -1 +0,0 @@
-. "$MERGE_TOOLS_DIR/vimdiff"
diff --git a/midx.c b/midx.c
index f29afc0d2d..321c6fdd2f 100644
--- a/midx.c
+++ b/midx.c
@@ -5,11 +5,14 @@
 #include "lockfile.h"
 #include "packfile.h"
 #include "object-store.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 #include "midx.h"
 #include "progress.h"
 #include "trace2.h"
 #include "run-command.h"
+#include "repository.h"
+#include "chunk-format.h"
+#include "pack.h"
 
 #define MIDX_SIGNATURE 0x4d494458 /* "MIDX" */
 #define MIDX_VERSION 1
@@ -17,18 +20,15 @@
 #define MIDX_BYTE_HASH_VERSION 5
 #define MIDX_BYTE_NUM_CHUNKS 6
 #define MIDX_BYTE_NUM_PACKS 8
-#define MIDX_HASH_VERSION 1
 #define MIDX_HEADER_SIZE 12
 #define MIDX_MIN_SIZE (MIDX_HEADER_SIZE + the_hash_algo->rawsz)
 
-#define MIDX_MAX_CHUNKS 5
 #define MIDX_CHUNK_ALIGNMENT 4
 #define MIDX_CHUNKID_PACKNAMES 0x504e414d /* "PNAM" */
 #define MIDX_CHUNKID_OIDFANOUT 0x4f494446 /* "OIDF" */
 #define MIDX_CHUNKID_OIDLOOKUP 0x4f49444c /* "OIDL" */
 #define MIDX_CHUNKID_OBJECTOFFSETS 0x4f4f4646 /* "OOFF" */
 #define MIDX_CHUNKID_LARGEOFFSETS 0x4c4f4646 /* "LOFF" */
-#define MIDX_CHUNKLOOKUP_WIDTH (sizeof(uint32_t) + sizeof(uint64_t))
 #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))
@@ -36,11 +36,47 @@
 
 #define PACK_EXPIRED UINT_MAX
 
+static uint8_t oid_version(void)
+{
+	switch (hash_algo_by_ptr(the_hash_algo)) {
+	case GIT_HASH_SHA1:
+		return 1;
+	case GIT_HASH_SHA256:
+		return 2;
+	default:
+		die(_("invalid hash version"));
+	}
+}
+
+static 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)
 {
 	return xstrfmt("%s/pack/multi-pack-index", object_dir);
 }
 
+char *get_midx_rev_filename(struct multi_pack_index *m)
+{
+	return xstrfmt("%s/pack/multi-pack-index-%s.rev",
+		       m->object_dir, hash_to_hex(get_midx_checksum(m)));
+}
+
+static int midx_read_oid_fanout(const unsigned char *chunk_start,
+				size_t chunk_size, void *data)
+{
+	struct multi_pack_index *m = data;
+	m->chunk_oid_fanout = (uint32_t *)chunk_start;
+
+	if (chunk_size != 4 * 256) {
+		error(_("multi-pack-index OID fanout is of the wrong size"));
+		return 1;
+	}
+	return 0;
+}
+
 struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local)
 {
 	struct multi_pack_index *m = NULL;
@@ -52,6 +88,7 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
 	char *midx_name = get_midx_filename(object_dir);
 	uint32_t i;
 	const char *cur_pack_name;
+	struct chunkfile *cf = NULL;
 
 	fd = git_open(midx_name);
 
@@ -72,9 +109,9 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
 	FREE_AND_NULL(midx_name);
 
 	midx_map = xmmap(NULL, midx_size, PROT_READ, MAP_PRIVATE, fd, 0);
+	close(fd);
 
 	FLEX_ALLOC_STR(m, object_dir, object_dir);
-	m->fd = fd;
 	m->data = midx_map;
 	m->data_len = midx_size;
 	m->local = local;
@@ -90,70 +127,38 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
 		      m->version);
 
 	hash_version = m->data[MIDX_BYTE_HASH_VERSION];
-	if (hash_version != MIDX_HASH_VERSION)
-		die(_("hash version %u does not match"), hash_version);
+	if (hash_version != oid_version()) {
+		error(_("multi-pack-index hash version %u does not match version %u"),
+		      hash_version, oid_version());
+		goto cleanup_fail;
+	}
 	m->hash_len = the_hash_algo->rawsz;
 
 	m->num_chunks = m->data[MIDX_BYTE_NUM_CHUNKS];
 
 	m->num_packs = get_be32(m->data + MIDX_BYTE_NUM_PACKS);
 
-	for (i = 0; i < m->num_chunks; i++) {
-		uint32_t chunk_id = get_be32(m->data + MIDX_HEADER_SIZE +
-					     MIDX_CHUNKLOOKUP_WIDTH * i);
-		uint64_t chunk_offset = get_be64(m->data + MIDX_HEADER_SIZE + 4 +
-						 MIDX_CHUNKLOOKUP_WIDTH * i);
-
-		if (chunk_offset >= m->data_len)
-			die(_("invalid chunk offset (too large)"));
+	cf = init_chunkfile(NULL);
 
-		switch (chunk_id) {
-			case MIDX_CHUNKID_PACKNAMES:
-				m->chunk_pack_names = m->data + chunk_offset;
-				break;
-
-			case MIDX_CHUNKID_OIDFANOUT:
-				m->chunk_oid_fanout = (uint32_t *)(m->data + chunk_offset);
-				break;
-
-			case MIDX_CHUNKID_OIDLOOKUP:
-				m->chunk_oid_lookup = m->data + chunk_offset;
-				break;
-
-			case MIDX_CHUNKID_OBJECTOFFSETS:
-				m->chunk_object_offsets = m->data + chunk_offset;
-				break;
-
-			case MIDX_CHUNKID_LARGEOFFSETS:
-				m->chunk_large_offsets = m->data + chunk_offset;
-				break;
-
-			case 0:
-				die(_("terminating multi-pack-index chunk id appears earlier than expected"));
-				break;
-
-			default:
-				/*
-				 * Do nothing on unrecognized chunks, allowing future
-				 * extensions to add optional chunks.
-				 */
-				break;
-		}
-	}
+	if (read_table_of_contents(cf, m->data, midx_size,
+				   MIDX_HEADER_SIZE, m->num_chunks))
+		goto cleanup_fail;
 
-	if (!m->chunk_pack_names)
+	if (pair_chunk(cf, MIDX_CHUNKID_PACKNAMES, &m->chunk_pack_names) == CHUNK_NOT_FOUND)
 		die(_("multi-pack-index missing required pack-name chunk"));
-	if (!m->chunk_oid_fanout)
+	if (read_chunk(cf, MIDX_CHUNKID_OIDFANOUT, midx_read_oid_fanout, m) == CHUNK_NOT_FOUND)
 		die(_("multi-pack-index missing required OID fanout chunk"));
-	if (!m->chunk_oid_lookup)
+	if (pair_chunk(cf, MIDX_CHUNKID_OIDLOOKUP, &m->chunk_oid_lookup) == CHUNK_NOT_FOUND)
 		die(_("multi-pack-index missing required OID lookup chunk"));
-	if (!m->chunk_object_offsets)
+	if (pair_chunk(cf, MIDX_CHUNKID_OBJECTOFFSETS, &m->chunk_object_offsets) == CHUNK_NOT_FOUND)
 		die(_("multi-pack-index missing required object offsets chunk"));
 
+	pair_chunk(cf, MIDX_CHUNKID_LARGEOFFSETS, &m->chunk_large_offsets);
+
 	m->num_objects = ntohl(m->chunk_oid_fanout[255]);
 
-	m->pack_names = xcalloc(m->num_packs, sizeof(*m->pack_names));
-	m->packs = xcalloc(m->num_packs, sizeof(*m->packs));
+	CALLOC_ARRAY(m->pack_names, m->num_packs);
+	CALLOC_ARRAY(m->packs, m->num_packs);
 
 	cur_pack_name = (const char *)m->chunk_pack_names;
 	for (i = 0; i < m->num_packs; i++) {
@@ -175,6 +180,7 @@ struct multi_pack_index *load_multi_pack_index(const char *object_dir, int local
 cleanup_fail:
 	free(m);
 	free(midx_name);
+	free(cf);
 	if (midx_map)
 		munmap(midx_map, midx_size);
 	if (0 <= fd)
@@ -190,8 +196,6 @@ void close_midx(struct multi_pack_index *m)
 		return;
 
 	munmap((unsigned char *)m->data, m->data_len);
-	close(m->fd);
-	m->fd = -1;
 
 	for (i = 0; i < m->num_packs; i++) {
 		if (m->packs[i])
@@ -243,16 +247,16 @@ struct object_id *nth_midxed_object_oid(struct object_id *oid,
 	if (n >= m->num_objects)
 		return NULL;
 
-	hashcpy(oid->hash, m->chunk_oid_lookup + m->hash_len * n);
+	oidread(oid, m->chunk_oid_lookup + m->hash_len * n);
 	return oid;
 }
 
-static off_t nth_midxed_offset(struct multi_pack_index *m, uint32_t pos)
+off_t nth_midxed_offset(struct multi_pack_index *m, uint32_t pos)
 {
 	const unsigned char *offset_data;
 	uint32_t offset32;
 
-	offset_data = m->chunk_object_offsets + pos * MIDX_CHUNK_OFFSET_WIDTH;
+	offset_data = m->chunk_object_offsets + (off_t)pos * MIDX_CHUNK_OFFSET_WIDTH;
 	offset32 = get_be32(offset_data + sizeof(uint32_t));
 
 	if (m->chunk_large_offsets && offset32 & MIDX_LARGE_OFFSET_NEEDED) {
@@ -266,9 +270,10 @@ static off_t nth_midxed_offset(struct multi_pack_index *m, uint32_t pos)
 	return offset32;
 }
 
-static uint32_t nth_midxed_pack_int_id(struct multi_pack_index *m, uint32_t pos)
+uint32_t nth_midxed_pack_int_id(struct multi_pack_index *m, uint32_t pos)
 {
-	return get_be32(m->chunk_object_offsets + pos * MIDX_CHUNK_OFFSET_WIDTH);
+	return get_be32(m->chunk_object_offsets +
+			(off_t)pos * MIDX_CHUNK_OFFSET_WIDTH);
 }
 
 static int nth_midxed_pack_entry(struct repository *r,
@@ -285,7 +290,7 @@ static int nth_midxed_pack_entry(struct repository *r,
 	pack_int_id = nth_midxed_pack_int_id(m, pos);
 
 	if (prepare_midx_pack(r, m, pack_int_id))
-		die(_("error preparing packfile from multi-pack-index"));
+		return 0;
 	p = m->packs[pack_int_id];
 
 	/*
@@ -386,15 +391,9 @@ int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, i
 {
 	struct multi_pack_index *m;
 	struct multi_pack_index *m_search;
-	int config_value;
-	static int env_value = -1;
 
-	if (env_value < 0)
-		env_value = git_env_bool(GIT_TEST_MULTI_PACK_INDEX, 0);
-
-	if (!env_value &&
-	    (repo_config_get_bool(r, "core.multipackindex", &config_value) ||
-	    !config_value))
+	prepare_repo_settings(r);
+	if (!r->settings.core_multi_pack_index)
 		return 0;
 
 	for (m_search = r->objects->multi_pack_index; m_search; m_search = m_search->next)
@@ -404,8 +403,12 @@ int prepare_multi_pack_index_one(struct repository *r, const char *object_dir, i
 	m = load_multi_pack_index(object_dir, local);
 
 	if (m) {
-		m->next = r->objects->multi_pack_index;
-		r->objects->multi_pack_index = m;
+		struct multi_pack_index *mp = r->objects->multi_pack_index;
+		if (mp) {
+			m->next = mp->next;
+			mp->next = m;
+		} else
+			r->objects->multi_pack_index = m;
 		return 1;
 	}
 
@@ -416,14 +419,11 @@ static size_t write_midx_header(struct hashfile *f,
 				unsigned char num_chunks,
 				uint32_t num_packs)
 {
-	unsigned char byte_values[4];
-
 	hashwrite_be32(f, MIDX_SIGNATURE);
-	byte_values[0] = MIDX_VERSION;
-	byte_values[1] = MIDX_HASH_VERSION;
-	byte_values[2] = num_chunks;
-	byte_values[3] = 0; /* unused */
-	hashwrite(f, byte_values, sizeof(byte_values));
+	hashwrite_u8(f, MIDX_VERSION);
+	hashwrite_u8(f, oid_version());
+	hashwrite_u8(f, num_chunks);
+	hashwrite_u8(f, 0); /* unused */
 	hashwrite_be32(f, num_packs);
 
 	return MIDX_HEADER_SIZE;
@@ -443,46 +443,67 @@ static int pack_info_compare(const void *_a, const void *_b)
 	return strcmp(a->pack_name, b->pack_name);
 }
 
-struct pack_list {
+static int idx_or_pack_name_cmp(const void *_va, const void *_vb)
+{
+	const char *pack_name = _va;
+	const struct pack_info *compar = _vb;
+
+	return cmp_idx_or_pack_name(pack_name, compar->pack_name);
+}
+
+struct write_midx_context {
 	struct pack_info *info;
 	uint32_t nr;
 	uint32_t alloc;
 	struct multi_pack_index *m;
+	struct progress *progress;
+	unsigned pack_paths_checked;
+
+	struct pack_midx_entry *entries;
+	uint32_t entries_nr;
+
+	uint32_t *pack_perm;
+	uint32_t *pack_order;
+	unsigned large_offsets_needed:1;
+	uint32_t num_large_offsets;
+
+	int preferred_pack_idx;
 };
 
 static void add_pack_to_midx(const char *full_path, size_t full_path_len,
 			     const char *file_name, void *data)
 {
-	struct pack_list *packs = (struct pack_list *)data;
+	struct write_midx_context *ctx = data;
 
 	if (ends_with(file_name, ".idx")) {
-		if (packs->m && midx_contains_pack(packs->m, file_name))
+		display_progress(ctx->progress, ++ctx->pack_paths_checked);
+		if (ctx->m && midx_contains_pack(ctx->m, file_name))
 			return;
 
-		ALLOC_GROW(packs->info, packs->nr + 1, packs->alloc);
+		ALLOC_GROW(ctx->info, ctx->nr + 1, ctx->alloc);
 
-		packs->info[packs->nr].p = add_packed_git(full_path,
-							  full_path_len,
-							  0);
+		ctx->info[ctx->nr].p = add_packed_git(full_path,
+						      full_path_len,
+						      0);
 
-		if (!packs->info[packs->nr].p) {
+		if (!ctx->info[ctx->nr].p) {
 			warning(_("failed to add packfile '%s'"),
 				full_path);
 			return;
 		}
 
-		if (open_pack_index(packs->info[packs->nr].p)) {
+		if (open_pack_index(ctx->info[ctx->nr].p)) {
 			warning(_("failed to open pack-index '%s'"),
 				full_path);
-			close_pack(packs->info[packs->nr].p);
-			FREE_AND_NULL(packs->info[packs->nr].p);
+			close_pack(ctx->info[ctx->nr].p);
+			FREE_AND_NULL(ctx->info[ctx->nr].p);
 			return;
 		}
 
-		packs->info[packs->nr].pack_name = xstrdup(file_name);
-		packs->info[packs->nr].orig_pack_int_id = packs->nr;
-		packs->info[packs->nr].expired = 0;
-		packs->nr++;
+		ctx->info[ctx->nr].pack_name = xstrdup(file_name);
+		ctx->info[ctx->nr].orig_pack_int_id = ctx->nr;
+		ctx->info[ctx->nr].expired = 0;
+		ctx->nr++;
 	}
 }
 
@@ -491,6 +512,7 @@ struct pack_midx_entry {
 	uint32_t pack_int_id;
 	time_t pack_mtime;
 	uint64_t offset;
+	unsigned preferred : 1;
 };
 
 static int midx_oid_compare(const void *_a, const void *_b)
@@ -502,6 +524,12 @@ static int midx_oid_compare(const void *_a, const void *_b)
 	if (cmp)
 		return cmp;
 
+	/* Sort objects in a preferred pack first when multiple copies exist. */
+	if (a->preferred > b->preferred)
+		return -1;
+	if (a->preferred < b->preferred)
+		return 1;
+
 	if (a->pack_mtime > b->pack_mtime)
 		return -1;
 	else if (a->pack_mtime < b->pack_mtime)
@@ -529,15 +557,17 @@ static int nth_midxed_pack_midx_entry(struct multi_pack_index *m,
 static void fill_pack_entry(uint32_t pack_int_id,
 			    struct packed_git *p,
 			    uint32_t cur_object,
-			    struct pack_midx_entry *entry)
+			    struct pack_midx_entry *entry,
+			    int preferred)
 {
-	if (!nth_packed_object_oid(&entry->oid, p, cur_object))
+	if (nth_packed_object_id(&entry->oid, p, cur_object) < 0)
 		die(_("failed to locate object %d in packfile"), cur_object);
 
 	entry->pack_int_id = pack_int_id;
 	entry->pack_mtime = p->mtime;
 
 	entry->offset = nth_packed_object_offset(p, cur_object);
+	entry->preferred = !!preferred;
 }
 
 /*
@@ -554,7 +584,8 @@ static void fill_pack_entry(uint32_t pack_int_id,
 static struct pack_midx_entry *get_sorted_entries(struct multi_pack_index *m,
 						  struct pack_info *info,
 						  uint32_t nr_packs,
-						  uint32_t *nr_objects)
+						  uint32_t *nr_objects,
+						  int preferred_pack)
 {
 	uint32_t cur_fanout, cur_pack, cur_object;
 	uint32_t alloc_fanout, alloc_objects, total_objects = 0;
@@ -591,12 +622,17 @@ static struct pack_midx_entry *get_sorted_entries(struct multi_pack_index *m,
 				nth_midxed_pack_midx_entry(m,
 							   &entries_by_fanout[nr_fanout],
 							   cur_object);
+				if (nth_midxed_pack_int_id(m, cur_object) == preferred_pack)
+					entries_by_fanout[nr_fanout].preferred = 1;
+				else
+					entries_by_fanout[nr_fanout].preferred = 0;
 				nr_fanout++;
 			}
 		}
 
 		for (cur_pack = start_pack; cur_pack < nr_packs; cur_pack++) {
 			uint32_t start = 0, end;
+			int preferred = cur_pack == preferred_pack;
 
 			if (cur_fanout)
 				start = get_pack_fanout(info[cur_pack].p, cur_fanout - 1);
@@ -604,7 +640,11 @@ static struct pack_midx_entry *get_sorted_entries(struct multi_pack_index *m,
 
 			for (cur_object = start; cur_object < end; cur_object++) {
 				ALLOC_GROW(entries_by_fanout, nr_fanout + 1, alloc_fanout);
-				fill_pack_entry(cur_pack, info[cur_pack].p, cur_object, &entries_by_fanout[nr_fanout]);
+				fill_pack_entry(cur_pack,
+						info[cur_pack].p,
+						cur_object,
+						&entries_by_fanout[nr_fanout],
+						preferred);
 				nr_fanout++;
 			}
 		}
@@ -632,27 +672,26 @@ static struct pack_midx_entry *get_sorted_entries(struct multi_pack_index *m,
 	return deduplicated_entries;
 }
 
-static size_t write_midx_pack_names(struct hashfile *f,
-				    struct pack_info *info,
-				    uint32_t num_packs)
+static int write_midx_pack_names(struct hashfile *f, void *data)
 {
+	struct write_midx_context *ctx = data;
 	uint32_t i;
 	unsigned char padding[MIDX_CHUNK_ALIGNMENT];
 	size_t written = 0;
 
-	for (i = 0; i < num_packs; i++) {
+	for (i = 0; i < ctx->nr; i++) {
 		size_t writelen;
 
-		if (info[i].expired)
+		if (ctx->info[i].expired)
 			continue;
 
-		if (i && strcmp(info[i].pack_name, info[i - 1].pack_name) <= 0)
+		if (i && strcmp(ctx->info[i].pack_name, ctx->info[i - 1].pack_name) <= 0)
 			BUG("incorrect pack-file order: %s before %s",
-			    info[i - 1].pack_name,
-			    info[i].pack_name);
+			    ctx->info[i - 1].pack_name,
+			    ctx->info[i].pack_name);
 
-		writelen = strlen(info[i].pack_name) + 1;
-		hashwrite(f, info[i].pack_name, writelen);
+		writelen = strlen(ctx->info[i].pack_name) + 1;
+		hashwrite(f, ctx->info[i].pack_name, writelen);
 		written += writelen;
 	}
 
@@ -661,18 +700,17 @@ static size_t write_midx_pack_names(struct hashfile *f,
 	if (i < MIDX_CHUNK_ALIGNMENT) {
 		memset(padding, 0, sizeof(padding));
 		hashwrite(f, padding, i);
-		written += i;
 	}
 
-	return written;
+	return 0;
 }
 
-static size_t write_midx_oid_fanout(struct hashfile *f,
-				    struct pack_midx_entry *objects,
-				    uint32_t nr_objects)
+static int write_midx_oid_fanout(struct hashfile *f,
+				 void *data)
 {
-	struct pack_midx_entry *list = objects;
-	struct pack_midx_entry *last = objects + nr_objects;
+	struct write_midx_context *ctx = data;
+	struct pack_midx_entry *list = ctx->entries;
+	struct pack_midx_entry *last = ctx->entries + ctx->entries_nr;
 	uint32_t count = 0;
 	uint32_t i;
 
@@ -693,21 +731,21 @@ static size_t write_midx_oid_fanout(struct hashfile *f,
 		list = next;
 	}
 
-	return MIDX_CHUNK_FANOUT_SIZE;
+	return 0;
 }
 
-static size_t write_midx_oid_lookup(struct hashfile *f, unsigned char hash_len,
-				    struct pack_midx_entry *objects,
-				    uint32_t nr_objects)
+static int write_midx_oid_lookup(struct hashfile *f,
+				 void *data)
 {
-	struct pack_midx_entry *list = objects;
+	struct write_midx_context *ctx = data;
+	unsigned char hash_len = the_hash_algo->rawsz;
+	struct pack_midx_entry *list = ctx->entries;
 	uint32_t i;
-	size_t written = 0;
 
-	for (i = 0; i < nr_objects; i++) {
+	for (i = 0; i < ctx->entries_nr; i++) {
 		struct pack_midx_entry *obj = list++;
 
-		if (i < nr_objects - 1) {
+		if (i < ctx->entries_nr - 1) {
 			struct pack_midx_entry *next = list;
 			if (oidcmp(&obj->oid, &next->oid) >= 0)
 				BUG("OIDs not in order: %s >= %s",
@@ -716,50 +754,48 @@ static size_t write_midx_oid_lookup(struct hashfile *f, unsigned char hash_len,
 		}
 
 		hashwrite(f, obj->oid.hash, (int)hash_len);
-		written += hash_len;
 	}
 
-	return written;
+	return 0;
 }
 
-static size_t write_midx_object_offsets(struct hashfile *f, int large_offset_needed,
-					uint32_t *perm,
-					struct pack_midx_entry *objects, uint32_t nr_objects)
+static int write_midx_object_offsets(struct hashfile *f,
+				     void *data)
 {
-	struct pack_midx_entry *list = objects;
+	struct write_midx_context *ctx = data;
+	struct pack_midx_entry *list = ctx->entries;
 	uint32_t i, nr_large_offset = 0;
-	size_t written = 0;
 
-	for (i = 0; i < nr_objects; i++) {
+	for (i = 0; i < ctx->entries_nr; i++) {
 		struct pack_midx_entry *obj = list++;
 
-		if (perm[obj->pack_int_id] == PACK_EXPIRED)
+		if (ctx->pack_perm[obj->pack_int_id] == PACK_EXPIRED)
 			BUG("object %s is in an expired pack with int-id %d",
 			    oid_to_hex(&obj->oid),
 			    obj->pack_int_id);
 
-		hashwrite_be32(f, perm[obj->pack_int_id]);
+		hashwrite_be32(f, ctx->pack_perm[obj->pack_int_id]);
 
-		if (large_offset_needed && obj->offset >> 31)
+		if (ctx->large_offsets_needed && obj->offset >> 31)
 			hashwrite_be32(f, MIDX_LARGE_OFFSET_NEEDED | nr_large_offset++);
-		else if (!large_offset_needed && obj->offset >> 32)
+		else if (!ctx->large_offsets_needed && obj->offset >> 32)
 			BUG("object %s requires a large offset (%"PRIx64") but the MIDX is not writing large offsets!",
 			    oid_to_hex(&obj->oid),
 			    obj->offset);
 		else
 			hashwrite_be32(f, (uint32_t)obj->offset);
-
-		written += MIDX_CHUNK_OFFSET_WIDTH;
 	}
 
-	return written;
+	return 0;
 }
 
-static size_t write_midx_large_offsets(struct hashfile *f, uint32_t nr_large_offset,
-				       struct pack_midx_entry *objects, uint32_t nr_objects)
+static int write_midx_large_offsets(struct hashfile *f,
+				    void *data)
 {
-	struct pack_midx_entry *list = objects, *end = objects + nr_objects;
-	size_t written = 0;
+	struct write_midx_context *ctx = data;
+	struct pack_midx_entry *list = ctx->entries;
+	struct pack_midx_entry *end = ctx->entries + ctx->entries_nr;
+	uint32_t nr_large_offset = ctx->num_large_offsets;
 
 	while (nr_large_offset) {
 		struct pack_midx_entry *obj;
@@ -774,92 +810,181 @@ static size_t write_midx_large_offsets(struct hashfile *f, uint32_t nr_large_off
 		if (!(offset >> 31))
 			continue;
 
-		hashwrite_be32(f, offset >> 32);
-		hashwrite_be32(f, offset & 0xffffffffUL);
-		written += 2 * sizeof(uint32_t);
+		hashwrite_be64(f, offset);
 
 		nr_large_offset--;
 	}
 
-	return written;
+	return 0;
+}
+
+struct midx_pack_order_data {
+	uint32_t nr;
+	uint32_t pack;
+	off_t offset;
+};
+
+static int midx_pack_order_cmp(const void *va, const void *vb)
+{
+	const struct midx_pack_order_data *a = va, *b = vb;
+	if (a->pack < b->pack)
+		return -1;
+	else if (a->pack > b->pack)
+		return 1;
+	else if (a->offset < b->offset)
+		return -1;
+	else if (a->offset > b->offset)
+		return 1;
+	else
+		return 0;
+}
+
+static uint32_t *midx_pack_order(struct write_midx_context *ctx)
+{
+	struct midx_pack_order_data *data;
+	uint32_t *pack_order;
+	uint32_t i;
+
+	ALLOC_ARRAY(data, ctx->entries_nr);
+	for (i = 0; i < ctx->entries_nr; i++) {
+		struct pack_midx_entry *e = &ctx->entries[i];
+		data[i].nr = i;
+		data[i].pack = ctx->pack_perm[e->pack_int_id];
+		if (!e->preferred)
+			data[i].pack |= (1U << 31);
+		data[i].offset = e->offset;
+	}
+
+	QSORT(data, ctx->entries_nr, midx_pack_order_cmp);
+
+	ALLOC_ARRAY(pack_order, ctx->entries_nr);
+	for (i = 0; i < ctx->entries_nr; i++)
+		pack_order[i] = data[i].nr;
+	free(data);
+
+	return pack_order;
+}
+
+static void write_midx_reverse_index(char *midx_name, unsigned char *midx_hash,
+				     struct write_midx_context *ctx)
+{
+	struct strbuf buf = STRBUF_INIT;
+	const char *tmp_file;
+
+	strbuf_addf(&buf, "%s-%s.rev", midx_name, hash_to_hex(midx_hash));
+
+	tmp_file = write_rev_file_order(NULL, ctx->pack_order, ctx->entries_nr,
+					midx_hash, WRITE_REV);
+
+	if (finalize_object_file(tmp_file, buf.buf))
+		die(_("cannot store reverse index file"));
+
+	strbuf_release(&buf);
+}
+
+static void clear_midx_files_ext(struct repository *r, const char *ext,
+				 unsigned char *keep_hash);
+
+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,
-			       struct string_list *packs_to_drop)
+			       struct string_list *packs_to_drop,
+			       const char *preferred_pack_name,
+			       unsigned flags)
 {
-	unsigned char cur_chunk, num_chunks = 0;
 	char *midx_name;
+	unsigned char midx_hash[GIT_MAX_RAWSZ];
 	uint32_t i;
 	struct hashfile *f = NULL;
 	struct lock_file lk;
-	struct pack_list packs;
-	uint32_t *pack_perm = NULL;
-	uint64_t written = 0;
-	uint32_t chunk_ids[MIDX_MAX_CHUNKS + 1];
-	uint64_t chunk_offsets[MIDX_MAX_CHUNKS + 1];
-	uint32_t nr_entries, num_large_offsets = 0;
-	struct pack_midx_entry *entries = NULL;
-	int large_offsets_needed = 0;
+	struct write_midx_context ctx = { 0 };
 	int pack_name_concat_len = 0;
 	int dropped_packs = 0;
 	int result = 0;
+	struct chunkfile *cf;
 
 	midx_name = get_midx_filename(object_dir);
-	if (safe_create_leading_directories(midx_name)) {
-		UNLEAK(midx_name);
+	if (safe_create_leading_directories(midx_name))
 		die_errno(_("unable to create leading directories of %s"),
 			  midx_name);
-	}
 
 	if (m)
-		packs.m = m;
+		ctx.m = m;
 	else
-		packs.m = load_multi_pack_index(object_dir, 1);
-
-	packs.nr = 0;
-	packs.alloc = packs.m ? packs.m->num_packs : 16;
-	packs.info = NULL;
-	ALLOC_ARRAY(packs.info, packs.alloc);
-
-	if (packs.m) {
-		for (i = 0; i < packs.m->num_packs; i++) {
-			ALLOC_GROW(packs.info, packs.nr + 1, packs.alloc);
-
-			packs.info[packs.nr].orig_pack_int_id = i;
-			packs.info[packs.nr].pack_name = xstrdup(packs.m->pack_names[i]);
-			packs.info[packs.nr].p = NULL;
-			packs.info[packs.nr].expired = 0;
-			packs.nr++;
+		ctx.m = load_multi_pack_index(object_dir, 1);
+
+	if (ctx.m && !midx_checksum_valid(ctx.m)) {
+		warning(_("ignoring existing multi-pack-index; checksum mismatch"));
+		ctx.m = NULL;
+	}
+
+	ctx.nr = 0;
+	ctx.alloc = ctx.m ? ctx.m->num_packs : 16;
+	ctx.info = NULL;
+	ALLOC_ARRAY(ctx.info, ctx.alloc);
+
+	if (ctx.m) {
+		for (i = 0; i < ctx.m->num_packs; i++) {
+			ALLOC_GROW(ctx.info, ctx.nr + 1, ctx.alloc);
+
+			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].expired = 0;
+			ctx.nr++;
 		}
 	}
 
-	for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &packs);
+	ctx.pack_paths_checked = 0;
+	if (flags & MIDX_PROGRESS)
+		ctx.progress = start_delayed_progress(_("Adding packfiles to multi-pack-index"), 0);
+	else
+		ctx.progress = NULL;
+
+	for_each_file_in_pack_dir(object_dir, add_pack_to_midx, &ctx);
+	stop_progress(&ctx.progress);
 
-	if (packs.m && packs.nr == packs.m->num_packs && !packs_to_drop)
+	if (ctx.m && ctx.nr == ctx.m->num_packs && !packs_to_drop)
 		goto cleanup;
 
-	entries = get_sorted_entries(packs.m, packs.info, packs.nr, &nr_entries);
+	ctx.preferred_pack_idx = -1;
+	if (preferred_pack_name) {
+		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;
+				break;
+			}
+		}
+	}
 
-	for (i = 0; i < nr_entries; i++) {
-		if (entries[i].offset > 0x7fffffff)
-			num_large_offsets++;
-		if (entries[i].offset > 0xffffffff)
-			large_offsets_needed = 1;
+	ctx.entries = get_sorted_entries(ctx.m, ctx.info, ctx.nr, &ctx.entries_nr,
+					 ctx.preferred_pack_idx);
+
+	ctx.large_offsets_needed = 0;
+	for (i = 0; i < ctx.entries_nr; i++) {
+		if (ctx.entries[i].offset > 0x7fffffff)
+			ctx.num_large_offsets++;
+		if (ctx.entries[i].offset > 0xffffffff)
+			ctx.large_offsets_needed = 1;
 	}
 
-	QSORT(packs.info, packs.nr, pack_info_compare);
+	QSORT(ctx.info, ctx.nr, pack_info_compare);
 
 	if (packs_to_drop && packs_to_drop->nr) {
 		int drop_index = 0;
 		int missing_drops = 0;
 
-		for (i = 0; i < packs.nr && drop_index < packs_to_drop->nr; i++) {
-			int cmp = strcmp(packs.info[i].pack_name,
+		for (i = 0; i < ctx.nr && drop_index < packs_to_drop->nr; i++) {
+			int cmp = strcmp(ctx.info[i].pack_name,
 					 packs_to_drop->items[drop_index].string);
 
 			if (!cmp) {
 				drop_index++;
-				packs.info[i].expired = 1;
+				ctx.info[i].expired = 1;
 			} else if (cmp > 0) {
 				error(_("did not see pack-file %s to drop"),
 				      packs_to_drop->items[drop_index].string);
@@ -867,7 +992,7 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 				missing_drops++;
 				i--;
 			} else {
-				packs.info[i].expired = 0;
+				ctx.info[i].expired = 0;
 			}
 		}
 
@@ -883,19 +1008,37 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 	 *
 	 * pack_perm[old_id] = new_id
 	 */
-	ALLOC_ARRAY(pack_perm, packs.nr);
-	for (i = 0; i < packs.nr; i++) {
-		if (packs.info[i].expired) {
+	ALLOC_ARRAY(ctx.pack_perm, ctx.nr);
+	for (i = 0; i < ctx.nr; i++) {
+		if (ctx.info[i].expired) {
 			dropped_packs++;
-			pack_perm[packs.info[i].orig_pack_int_id] = PACK_EXPIRED;
+			ctx.pack_perm[ctx.info[i].orig_pack_int_id] = PACK_EXPIRED;
 		} else {
-			pack_perm[packs.info[i].orig_pack_int_id] = i - dropped_packs;
+			ctx.pack_perm[ctx.info[i].orig_pack_int_id] = i - dropped_packs;
 		}
 	}
 
-	for (i = 0; i < packs.nr; i++) {
-		if (!packs.info[i].expired)
-			pack_name_concat_len += strlen(packs.info[i].pack_name) + 1;
+	for (i = 0; i < ctx.nr; i++) {
+		if (!ctx.info[i].expired)
+			pack_name_concat_len += strlen(ctx.info[i].pack_name) + 1;
+	}
+
+	/* Check that the preferred pack wasn't expired (if given). */
+	if (preferred_pack_name) {
+		struct pack_info *preferred = bsearch(preferred_pack_name,
+						      ctx.info, ctx.nr,
+						      sizeof(*ctx.info),
+						      idx_or_pack_name_cmp);
+
+		if (!preferred)
+			warning(_("unknown preferred pack: '%s'"),
+				preferred_pack_name);
+		else {
+			uint32_t perm = ctx.pack_perm[preferred->orig_pack_int_id];
+			if (perm == PACK_EXPIRED)
+				warning(_("preferred pack '%s' is expired"),
+					preferred_pack_name);
+		}
 	}
 
 	if (pack_name_concat_len % MIDX_CHUNK_ALIGNMENT)
@@ -903,122 +1046,111 @@ static int write_midx_internal(const char *object_dir, struct multi_pack_index *
 					(pack_name_concat_len % MIDX_CHUNK_ALIGNMENT);
 
 	hold_lock_file_for_update(&lk, midx_name, LOCK_DIE_ON_ERROR);
-	f = hashfd(lk.tempfile->fd, lk.tempfile->filename.buf);
-	FREE_AND_NULL(midx_name);
-
-	if (packs.m)
-		close_midx(packs.m);
-
-	cur_chunk = 0;
-	num_chunks = large_offsets_needed ? 5 : 4;
-
-	written = write_midx_header(f, num_chunks, packs.nr - dropped_packs);
-
-	chunk_ids[cur_chunk] = MIDX_CHUNKID_PACKNAMES;
-	chunk_offsets[cur_chunk] = written + (num_chunks + 1) * MIDX_CHUNKLOOKUP_WIDTH;
-
-	cur_chunk++;
-	chunk_ids[cur_chunk] = MIDX_CHUNKID_OIDFANOUT;
-	chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + pack_name_concat_len;
-
-	cur_chunk++;
-	chunk_ids[cur_chunk] = MIDX_CHUNKID_OIDLOOKUP;
-	chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + MIDX_CHUNK_FANOUT_SIZE;
+	f = hashfd(get_lock_file_fd(&lk), get_lock_file_path(&lk));
 
-	cur_chunk++;
-	chunk_ids[cur_chunk] = MIDX_CHUNKID_OBJECTOFFSETS;
-	chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * the_hash_algo->rawsz;
+	if (ctx.m)
+		close_midx(ctx.m);
 
-	cur_chunk++;
-	chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] + nr_entries * MIDX_CHUNK_OFFSET_WIDTH;
-	if (large_offsets_needed) {
-		chunk_ids[cur_chunk] = MIDX_CHUNKID_LARGEOFFSETS;
-
-		cur_chunk++;
-		chunk_offsets[cur_chunk] = chunk_offsets[cur_chunk - 1] +
-					   num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH;
+	if (ctx.nr - dropped_packs == 0) {
+		error(_("no pack files to index."));
+		result = 1;
+		goto cleanup;
 	}
 
-	chunk_ids[cur_chunk] = 0;
-
-	for (i = 0; i <= num_chunks; i++) {
-		if (i && chunk_offsets[i] < chunk_offsets[i - 1])
-			BUG("incorrect chunk offsets: %"PRIu64" before %"PRIu64,
-			    chunk_offsets[i - 1],
-			    chunk_offsets[i]);
-
-		if (chunk_offsets[i] % MIDX_CHUNK_ALIGNMENT)
-			BUG("chunk offset %"PRIu64" is not properly aligned",
-			    chunk_offsets[i]);
-
-		hashwrite_be32(f, chunk_ids[i]);
-		hashwrite_be32(f, chunk_offsets[i] >> 32);
-		hashwrite_be32(f, chunk_offsets[i]);
+	cf = init_chunkfile(f);
 
-		written += MIDX_CHUNKLOOKUP_WIDTH;
-	}
+	add_chunk(cf, MIDX_CHUNKID_PACKNAMES, pack_name_concat_len,
+		  write_midx_pack_names);
+	add_chunk(cf, MIDX_CHUNKID_OIDFANOUT, MIDX_CHUNK_FANOUT_SIZE,
+		  write_midx_oid_fanout);
+	add_chunk(cf, MIDX_CHUNKID_OIDLOOKUP,
+		  (size_t)ctx.entries_nr * the_hash_algo->rawsz,
+		  write_midx_oid_lookup);
+	add_chunk(cf, MIDX_CHUNKID_OBJECTOFFSETS,
+		  (size_t)ctx.entries_nr * MIDX_CHUNK_OFFSET_WIDTH,
+		  write_midx_object_offsets);
 
-	for (i = 0; i < num_chunks; i++) {
-		if (written != chunk_offsets[i])
-			BUG("incorrect chunk offset (%"PRIu64" != %"PRIu64") for chunk id %"PRIx32,
-			    chunk_offsets[i],
-			    written,
-			    chunk_ids[i]);
+	if (ctx.large_offsets_needed)
+		add_chunk(cf, MIDX_CHUNKID_LARGEOFFSETS,
+			(size_t)ctx.num_large_offsets * MIDX_CHUNK_LARGE_OFFSET_WIDTH,
+			write_midx_large_offsets);
 
-		switch (chunk_ids[i]) {
-			case MIDX_CHUNKID_PACKNAMES:
-				written += write_midx_pack_names(f, packs.info, packs.nr);
-				break;
+	write_midx_header(f, get_num_chunks(cf), ctx.nr - dropped_packs);
+	write_chunkfile(cf, &ctx);
 
-			case MIDX_CHUNKID_OIDFANOUT:
-				written += write_midx_oid_fanout(f, entries, nr_entries);
-				break;
+	finalize_hashfile(f, midx_hash, CSUM_FSYNC | CSUM_HASH_IN_STREAM);
+	free_chunkfile(cf);
 
-			case MIDX_CHUNKID_OIDLOOKUP:
-				written += write_midx_oid_lookup(f, the_hash_algo->rawsz, entries, nr_entries);
-				break;
+	if (flags & MIDX_WRITE_REV_INDEX)
+		ctx.pack_order = midx_pack_order(&ctx);
 
-			case MIDX_CHUNKID_OBJECTOFFSETS:
-				written += write_midx_object_offsets(f, large_offsets_needed, pack_perm, entries, nr_entries);
-				break;
+	if (flags & MIDX_WRITE_REV_INDEX)
+		write_midx_reverse_index(midx_name, midx_hash, &ctx);
+	clear_midx_files_ext(the_repository, ".rev", midx_hash);
 
-			case MIDX_CHUNKID_LARGEOFFSETS:
-				written += write_midx_large_offsets(f, num_large_offsets, entries, nr_entries);
-				break;
-
-			default:
-				BUG("trying to write unknown chunk id %"PRIx32,
-				    chunk_ids[i]);
-		}
-	}
-
-	if (written != chunk_offsets[num_chunks])
-		BUG("incorrect final offset %"PRIu64" != %"PRIu64,
-		    written,
-		    chunk_offsets[num_chunks]);
-
-	finalize_hashfile(f, NULL, CSUM_FSYNC | CSUM_HASH_IN_STREAM);
 	commit_lock_file(&lk);
 
 cleanup:
-	for (i = 0; i < packs.nr; i++) {
-		if (packs.info[i].p) {
-			close_pack(packs.info[i].p);
-			free(packs.info[i].p);
+	for (i = 0; i < ctx.nr; i++) {
+		if (ctx.info[i].p) {
+			close_pack(ctx.info[i].p);
+			free(ctx.info[i].p);
 		}
-		free(packs.info[i].pack_name);
+		free(ctx.info[i].pack_name);
 	}
 
-	free(packs.info);
-	free(entries);
-	free(pack_perm);
+	free(ctx.info);
+	free(ctx.entries);
+	free(ctx.pack_perm);
+	free(ctx.pack_order);
 	free(midx_name);
 	return result;
 }
 
-int write_midx_file(const char *object_dir)
+int write_midx_file(const char *object_dir,
+		    const char *preferred_pack_name,
+		    unsigned flags)
+{
+	return write_midx_internal(object_dir, NULL, NULL, preferred_pack_name,
+				   flags);
+}
+
+struct clear_midx_data {
+	char *keep;
+	const char *ext;
+};
+
+static void clear_midx_file_ext(const char *full_path, size_t full_path_len,
+				const char *file_name, void *_data)
+{
+	struct clear_midx_data *data = _data;
+
+	if (!(starts_with(file_name, "multi-pack-index-") &&
+	      ends_with(file_name, data->ext)))
+		return;
+	if (data->keep && !strcmp(data->keep, file_name))
+		return;
+
+	if (unlink(full_path))
+		die_errno(_("failed to remove %s"), full_path);
+}
+
+static void clear_midx_files_ext(struct repository *r, const char *ext,
+				 unsigned char *keep_hash)
 {
-	return write_midx_internal(object_dir, NULL, NULL);
+	struct clear_midx_data data;
+	memset(&data, 0, sizeof(struct clear_midx_data));
+
+	if (keep_hash)
+		data.keep = xstrfmt("multi-pack-index-%s%s",
+				    hash_to_hex(keep_hash), ext);
+	data.ext = ext;
+
+	for_each_file_in_pack_dir(r->objects->odb->path,
+				  clear_midx_file_ext,
+				  &data);
+
+	free(data.keep);
 }
 
 void clear_midx_file(struct repository *r)
@@ -1030,16 +1162,17 @@ void clear_midx_file(struct repository *r)
 		r->objects->multi_pack_index = NULL;
 	}
 
-	if (remove_path(midx)) {
-		UNLEAK(midx);
+	if (remove_path(midx))
 		die(_("failed to clear multi-pack-index at %s"), midx);
-	}
+
+	clear_midx_files_ext(r, ".rev", NULL);
 
 	free(midx);
 }
 
 static int verify_midx_error;
 
+__attribute__((format (printf, 1, 2)))
 static void midx_report(const char *fmt, ...)
 {
 	va_list ap;
@@ -1076,19 +1209,32 @@ static int compare_pair_pos_vs_id(const void *_a, const void *_b)
 			display_progress(progress, _n); \
 	} while (0)
 
-int verify_midx_file(struct repository *r, const char *object_dir)
+int verify_midx_file(struct repository *r, const char *object_dir, unsigned flags)
 {
 	struct pair_pos_vs_id *pairs = NULL;
 	uint32_t i;
-	struct progress *progress;
+	struct progress *progress = NULL;
 	struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
 	verify_midx_error = 0;
 
-	if (!m)
-		return 0;
+	if (!m) {
+		int result = 0;
+		struct stat sb;
+		char *filename = get_midx_filename(object_dir);
+		if (!stat(filename, &sb)) {
+			error(_("multi-pack-index file exists, but failed to parse"));
+			result = 1;
+		}
+		free(filename);
+		return result;
+	}
+
+	if (!midx_checksum_valid(m))
+		midx_report(_("incorrect checksum"));
 
-	progress = start_progress(_("Looking for referenced packfiles"),
-				  m->num_packs);
+	if (flags & MIDX_PROGRESS)
+		progress = start_delayed_progress(_("Looking for referenced packfiles"),
+					  m->num_packs);
 	for (i = 0; i < m->num_packs; i++) {
 		if (prepare_midx_pack(r, m, i))
 			midx_report("failed to load pack in position %d", i);
@@ -1106,8 +1252,18 @@ int verify_midx_file(struct repository *r, const char *object_dir)
 				    i, oid_fanout1, oid_fanout2, i + 1);
 	}
 
-	progress = start_sparse_progress(_("Verifying OID order in MIDX"),
-					 m->num_objects - 1);
+	if (m->num_objects == 0) {
+		midx_report(_("the midx contains no oid"));
+		/*
+		 * Remaining tests assume that we have objects, so we can
+		 * return here.
+		 */
+		return verify_midx_error;
+	}
+
+	if (flags & MIDX_PROGRESS)
+		progress = start_sparse_progress(_("Verifying OID order in multi-pack-index"),
+						 m->num_objects - 1);
 	for (i = 0; i < m->num_objects - 1; i++) {
 		struct object_id oid1, oid2;
 
@@ -1134,13 +1290,15 @@ int verify_midx_file(struct repository *r, const char *object_dir)
 		pairs[i].pack_int_id = nth_midxed_pack_int_id(m, i);
 	}
 
-	progress = start_sparse_progress(_("Sorting objects by packfile"),
-					 m->num_objects);
+	if (flags & MIDX_PROGRESS)
+		progress = start_sparse_progress(_("Sorting objects by packfile"),
+						 m->num_objects);
 	display_progress(progress, 0); /* TODO: Measure QSORT() progress */
 	QSORT(pairs, m->num_objects, compare_pair_pos_vs_id);
 	stop_progress(&progress);
 
-	progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects);
+	if (flags & MIDX_PROGRESS)
+		progress = start_sparse_progress(_("Verifying object offsets"), m->num_objects);
 	for (i = 0; i < m->num_objects; i++) {
 		struct object_id oid;
 		struct pack_entry e;
@@ -1183,23 +1341,34 @@ int verify_midx_file(struct repository *r, const char *object_dir)
 	return verify_midx_error;
 }
 
-int expire_midx_packs(struct repository *r, const char *object_dir)
+int expire_midx_packs(struct repository *r, const char *object_dir, unsigned flags)
 {
 	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 progress *progress = NULL;
 
 	if (!m)
 		return 0;
 
-	count = xcalloc(m->num_packs, sizeof(uint32_t));
+	CALLOC_ARRAY(count, m->num_packs);
+
+	if (flags & MIDX_PROGRESS)
+		progress = start_delayed_progress(_("Counting referenced objects"),
+					  m->num_objects);
 	for (i = 0; i < m->num_objects; i++) {
 		int pack_int_id = nth_midxed_pack_int_id(m, i);
 		count[pack_int_id]++;
+		display_progress(progress, i + 1);
 	}
+	stop_progress(&progress);
 
+	if (flags & MIDX_PROGRESS)
+		progress = start_delayed_progress(_("Finding and deleting unreferenced packfiles"),
+					  m->num_packs);
 	for (i = 0; i < m->num_packs; i++) {
 		char *pack_name;
+		display_progress(progress, i + 1);
 
 		if (count[i])
 			continue;
@@ -1217,11 +1386,12 @@ int expire_midx_packs(struct repository *r, const char *object_dir)
 		unlink_pack_path(pack_name, 0);
 		free(pack_name);
 	}
+	stop_progress(&progress);
 
 	free(count);
 
 	if (packs_to_drop.nr)
-		result = write_midx_internal(object_dir, m, &packs_to_drop);
+		result = write_midx_internal(object_dir, m, &packs_to_drop, NULL, flags);
 
 	string_list_clear(&packs_to_drop, 0);
 	return result;
@@ -1247,15 +1417,26 @@ static int compare_by_mtime(const void *a_, const void *b_)
 	return 0;
 }
 
-static int fill_included_packs_all(struct multi_pack_index *m,
+static int fill_included_packs_all(struct repository *r,
+				   struct multi_pack_index *m,
 				   unsigned char *include_pack)
 {
-	uint32_t i;
+	uint32_t i, count = 0;
+	int pack_kept_objects = 0;
+
+	repo_config_get_bool(r, "repack.packkeptobjects", &pack_kept_objects);
+
+	for (i = 0; i < m->num_packs; i++) {
+		if (prepare_midx_pack(r, m, i))
+			continue;
+		if (!pack_kept_objects && m->packs[i]->pack_keep)
+			continue;
 
-	for (i = 0; i < m->num_packs; i++)
 		include_pack[i] = 1;
+		count++;
+	}
 
-	return m->num_packs < 2;
+	return count < 2;
 }
 
 static int fill_included_packs_batch(struct repository *r,
@@ -1266,6 +1447,9 @@ static int fill_included_packs_batch(struct repository *r,
 	uint32_t i, packs_to_repack;
 	size_t total_size;
 	struct repack_info *pack_info = xcalloc(m->num_packs, sizeof(struct repack_info));
+	int pack_kept_objects = 0;
+
+	repo_config_get_bool(r, "repack.packkeptobjects", &pack_kept_objects);
 
 	for (i = 0; i < m->num_packs; i++) {
 		pack_info[i].pack_int_id = i;
@@ -1292,6 +1476,8 @@ static int fill_included_packs_batch(struct repository *r,
 
 		if (!p)
 			continue;
+		if (!pack_kept_objects && p->pack_keep)
+			continue;
 		if (open_pack_index(p) || !p->num_objects)
 			continue;
 
@@ -1309,37 +1495,60 @@ static int fill_included_packs_batch(struct repository *r,
 
 	free(pack_info);
 
-	if (total_size < batch_size || packs_to_repack < 2)
+	if (packs_to_repack < 2)
 		return 1;
 
 	return 0;
 }
 
-int midx_repack(struct repository *r, const char *object_dir, size_t batch_size)
+int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned flags)
 {
 	int result = 0;
 	uint32_t i;
 	unsigned char *include_pack;
 	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);
 
+	/*
+	 * When updating the default for these configuration
+	 * variables in builtin/repack.c, these must be adjusted
+	 * to match.
+	 */
+	int delta_base_offset = 1;
+	int use_delta_islands = 0;
+
 	if (!m)
 		return 0;
 
-	include_pack = xcalloc(m->num_packs, sizeof(unsigned char));
+	CALLOC_ARRAY(include_pack, m->num_packs);
 
 	if (batch_size) {
 		if (fill_included_packs_batch(r, m, include_pack, batch_size))
 			goto cleanup;
-	} else if (fill_included_packs_all(m, include_pack))
+	} else if (fill_included_packs_all(r, m, include_pack))
 		goto cleanup;
 
-	argv_array_push(&cmd.args, "pack-objects");
+	repo_config_get_bool(r, "repack.usedeltabaseoffset", &delta_base_offset);
+	repo_config_get_bool(r, "repack.usedeltaislands", &use_delta_islands);
+
+	strvec_push(&cmd.args, "pack-objects");
 
 	strbuf_addstr(&base_name, object_dir);
 	strbuf_addstr(&base_name, "/pack/pack");
-	argv_array_push(&cmd.args, base_name.buf);
+	strvec_push(&cmd.args, base_name.buf);
+
+	if (delta_base_offset)
+		strvec_push(&cmd.args, "--delta-base-offset");
+	if (use_delta_islands)
+		strvec_push(&cmd.args, "--delta-islands");
+
+	if (flags & MIDX_PROGRESS)
+		strvec_push(&cmd.args, "--progress");
+	else
+		strvec_push(&cmd.args, "-q");
+
 	strbuf_release(&base_name);
 
 	cmd.git_cmd = 1;
@@ -1351,6 +1560,8 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size)
 		goto cleanup;
 	}
 
+	cmd_in = xfdopen(cmd.in, "w");
+
 	for (i = 0; i < m->num_objects; i++) {
 		struct object_id oid;
 		uint32_t pack_int_id = nth_midxed_pack_int_id(m, i);
@@ -1359,10 +1570,9 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size)
 			continue;
 
 		nth_midxed_object_oid(&oid, m, i);
-		xwrite(cmd.in, oid_to_hex(&oid), the_hash_algo->hexsz);
-		xwrite(cmd.in, "\n", 1);
+		fprintf(cmd_in, "%s\n", oid_to_hex(&oid));
 	}
-	close(cmd.in);
+	fclose(cmd_in);
 
 	if (finish_command(&cmd)) {
 		error(_("could not finish pack-objects"));
@@ -1370,7 +1580,7 @@ int midx_repack(struct repository *r, const char *object_dir, size_t batch_size)
 		goto cleanup;
 	}
 
-	result = write_midx_internal(object_dir, m, NULL);
+	result = write_midx_internal(object_dir, m, NULL, NULL, flags);
 	m = NULL;
 
 cleanup:
diff --git a/midx.h b/midx.h
index f0ae656b5d..8684cf0fef 100644
--- a/midx.h
+++ b/midx.h
@@ -12,11 +12,13 @@ struct repository;
 struct multi_pack_index {
 	struct multi_pack_index *next;
 
-	int fd;
-
 	const unsigned char *data;
 	size_t data_len;
 
+	const uint32_t *revindex_data;
+	const uint32_t *revindex_map;
+	size_t revindex_len;
+
 	uint32_t signature;
 	unsigned char version;
 	unsigned char hash_len;
@@ -37,9 +39,16 @@ struct multi_pack_index {
 	char object_dir[FLEX_ARRAY];
 };
 
+#define MIDX_PROGRESS     (1 << 0)
+#define MIDX_WRITE_REV_INDEX (1 << 1)
+
+char *get_midx_rev_filename(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);
 int bsearch_midx(const struct object_id *oid, struct multi_pack_index *m, uint32_t *result);
+off_t nth_midxed_offset(struct multi_pack_index *m, uint32_t pos);
+uint32_t nth_midxed_pack_int_id(struct multi_pack_index *m, uint32_t pos);
 struct object_id *nth_midxed_object_oid(struct object_id *oid,
 					struct multi_pack_index *m,
 					uint32_t n);
@@ -47,11 +56,11 @@ 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);
+int write_midx_file(const char *object_dir, const char *preferred_pack_name, unsigned flags);
 void clear_midx_file(struct repository *r);
-int verify_midx_file(struct repository *r, const char *object_dir);
-int expire_midx_packs(struct repository *r, const char *object_dir);
-int midx_repack(struct repository *r, const char *object_dir, size_t batch_size);
+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);
+int midx_repack(struct repository *r, const char *object_dir, size_t batch_size, unsigned flags);
 
 void close_midx(struct multi_pack_index *m);
 
diff --git a/name-hash.c b/name-hash.c
index ceb1d7bd6f..7487d33124 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -7,6 +7,8 @@
  */
 #include "cache.h"
 #include "thread-utils.h"
+#include "trace2.h"
+#include "sparse-index.h"
 
 struct dir_entry {
 	struct hashmap_entry ent;
@@ -108,8 +110,11 @@ static void hash_index_entry(struct index_state *istate, struct cache_entry *ce)
 	if (ce->ce_flags & CE_HASHED)
 		return;
 	ce->ce_flags |= CE_HASHED;
-	hashmap_entry_init(&ce->ent, memihash(ce->name, ce_namelen(ce)));
-	hashmap_add(&istate->name_hash, &ce->ent);
+
+	if (!S_ISSPARSEDIR(ce->ce_mode)) {
+		hashmap_entry_init(&ce->ent, memihash(ce->name, ce_namelen(ce)));
+		hashmap_add(&istate->name_hash, &ce->ent);
+	}
 
 	if (ignore_case)
 		add_dir_entry(istate, ce);
@@ -138,7 +143,7 @@ static int lazy_nr_dir_threads;
 
 /*
  * Set a minimum number of cache_entries that we will handle per
- * thread and use that to decide how many threads to run (upto
+ * thread and use that to decide how many threads to run (up to
  * the number on the system).
  *
  * For guidance setting the lower per-thread bound, see:
@@ -218,13 +223,13 @@ static int lookup_lazy_params(struct index_state *istate)
  * However, the hashmap is going to put items into bucket
  * chains based on their hash values.  Use that to create n
  * mutexes and lock on mutex[bucket(hash) % n].  This will
- * decrease the collision rate by (hopefully) by a factor of n.
+ * decrease the collision rate by (hopefully) a factor of n.
  */
 static void init_dir_mutex(void)
 {
 	int j;
 
-	lazy_dir_mutex_array = xcalloc(LAZY_MAX_MUTEX, sizeof(pthread_mutex_t));
+	CALLOC_ARRAY(lazy_dir_mutex_array, LAZY_MAX_MUTEX);
 
 	for (j = 0; j < LAZY_MAX_MUTEX; j++)
 		init_recursive_mutex(&lazy_dir_mutex_array[j]);
@@ -513,9 +518,9 @@ static void threaded_lazy_init_name_hash(
 	k_start = 0;
 	nr_each = DIV_ROUND_UP(istate->cache_nr, lazy_nr_dir_threads);
 
-	lazy_entries = xcalloc(istate->cache_nr, sizeof(struct lazy_entry));
-	td_dir = xcalloc(lazy_nr_dir_threads, sizeof(struct lazy_dir_thread_data));
-	td_name = xcalloc(1, sizeof(struct lazy_name_thread_data));
+	CALLOC_ARRAY(lazy_entries, istate->cache_nr);
+	CALLOC_ARRAY(td_dir, lazy_nr_dir_threads);
+	CALLOC_ARRAY(td_name, 1);
 
 	init_dir_mutex();
 
@@ -577,6 +582,7 @@ static void lazy_init_name_hash(struct index_state *istate)
 	if (istate->name_hash_initialized)
 		return;
 	trace_performance_enter();
+	trace2_region_enter("index", "name-hash-init", istate->repo);
 	hashmap_init(&istate->name_hash, cache_entry_cmp, NULL, istate->cache_nr);
 	hashmap_init(&istate->dir_hash, dir_entry_cmp, NULL, istate->cache_nr);
 
@@ -597,6 +603,7 @@ static void lazy_init_name_hash(struct index_state *istate)
 	}
 
 	istate->name_hash_initialized = 1;
+	trace2_region_leave("index", "name-hash-init", istate->repo);
 	trace_performance_leave("initialize name hash");
 }
 
@@ -677,6 +684,7 @@ int index_dir_exists(struct index_state *istate, const char *name, int namelen)
 	struct dir_entry *dir;
 
 	lazy_init_name_hash(istate);
+	expand_to_path(istate, name, namelen, 0);
 	dir = find_dir_entry(istate, name, namelen);
 	return dir && dir->nr;
 }
@@ -687,6 +695,7 @@ void adjust_dirname_case(struct index_state *istate, char *name)
 	const char *ptr = startPtr;
 
 	lazy_init_name_hash(istate);
+	expand_to_path(istate, name, strlen(name), 0);
 	while (*ptr) {
 		while (*ptr && *ptr != '/')
 			ptr++;
@@ -710,6 +719,7 @@ struct cache_entry *index_file_exists(struct index_state *istate, const char *na
 	unsigned int hash = memihash(name, namelen);
 
 	lazy_init_name_hash(istate);
+	expand_to_path(istate, name, namelen, icase);
 
 	ce = hashmap_get_entry_from_hash(&istate->name_hash, hash, NULL,
 					 struct cache_entry, ent);
@@ -726,6 +736,6 @@ void free_name_hash(struct index_state *istate)
 		return;
 	istate->name_hash_initialized = 0;
 
-	hashmap_free(&istate->name_hash);
-	hashmap_free_entries(&istate->dir_hash, struct dir_entry, ent);
+	hashmap_clear(&istate->name_hash);
+	hashmap_clear_and_free(&istate->dir_hash, struct dir_entry, ent);
 }
diff --git a/negotiator/default.c b/negotiator/default.c
index 4b78f6bf36..434189ae5d 100644
--- a/negotiator/default.c
+++ b/negotiator/default.c
@@ -167,7 +167,7 @@ void default_negotiator_init(struct fetch_negotiator *negotiator)
 	negotiator->next = next;
 	negotiator->ack = ack;
 	negotiator->release = release;
-	negotiator->data = ns = xcalloc(1, sizeof(*ns));
+	negotiator->data = CALLOC_ARRAY(ns, 1);
 	ns->rev_list.compare = compare_commits_by_commit_date;
 
 	if (marked)
diff --git a/negotiator/noop.c b/negotiator/noop.c
new file mode 100644
index 0000000000..60569b8350
--- /dev/null
+++ b/negotiator/noop.c
@@ -0,0 +1,44 @@
+#include "cache.h"
+#include "noop.h"
+#include "../commit.h"
+#include "../fetch-negotiator.h"
+
+static void known_common(struct fetch_negotiator *n, struct commit *c)
+{
+	/* do nothing */
+}
+
+static void add_tip(struct fetch_negotiator *n, struct commit *c)
+{
+	/* do nothing */
+}
+
+static const struct object_id *next(struct fetch_negotiator *n)
+{
+	return NULL;
+}
+
+static int ack(struct fetch_negotiator *n, struct commit *c)
+{
+	/*
+	 * This negotiator does not emit any commits, so there is no commit to
+	 * be acknowledged. If there is any ack, there is a bug.
+	 */
+	BUG("ack with noop negotiator, which does not emit any commits");
+	return 0;
+}
+
+static void release(struct fetch_negotiator *n)
+{
+	/* nothing to release */
+}
+
+void noop_negotiator_init(struct fetch_negotiator *negotiator)
+{
+	negotiator->known_common = known_common;
+	negotiator->add_tip = add_tip;
+	negotiator->next = next;
+	negotiator->ack = ack;
+	negotiator->release = release;
+	negotiator->data = NULL;
+}
diff --git a/negotiator/noop.h b/negotiator/noop.h
new file mode 100644
index 0000000000..2b4ec5d07a
--- /dev/null
+++ b/negotiator/noop.h
@@ -0,0 +1,8 @@
+#ifndef NEGOTIATOR_NOOP_H
+#define NEGOTIATOR_NOOP_H
+
+struct fetch_negotiator;
+
+void noop_negotiator_init(struct fetch_negotiator *negotiator);
+
+#endif
diff --git a/negotiator/skipping.c b/negotiator/skipping.c
index dffbc76c49..1236e79224 100644
--- a/negotiator/skipping.c
+++ b/negotiator/skipping.c
@@ -62,7 +62,7 @@ static struct entry *rev_list_push(struct data *data, struct commit *commit, int
 	struct entry *entry;
 	commit->object.flags |= mark | SEEN;
 
-	entry = xcalloc(1, sizeof(*entry));
+	CALLOC_ARRAY(entry, 1);
 	entry->commit = commit;
 	prio_queue_put(&data->rev_list, entry);
 
@@ -241,7 +241,7 @@ void skipping_negotiator_init(struct fetch_negotiator *negotiator)
 	negotiator->next = next;
 	negotiator->ack = ack;
 	negotiator->release = release;
-	negotiator->data = data = xcalloc(1, sizeof(*data));
+	negotiator->data = CALLOC_ARRAY(data, 1);
 	data->rev_list.compare = compare;
 
 	if (marked)
diff --git a/notes-merge.c b/notes-merge.c
index 2fe724f1cf..46c1f7c7f1 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -136,7 +136,7 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
 	diff_tree_oid(base, remote, "", &opt);
 	diffcore_std(&opt);
 
-	changes = xcalloc(diff_queued_diff.nr, sizeof(struct notes_merge_pair));
+	CALLOC_ARRAY(changes, diff_queued_diff.nr);
 
 	for (i = 0; i < diff_queued_diff.nr; i++) {
 		struct diff_filepair *p = diff_queued_diff.queue[i];
@@ -600,7 +600,7 @@ int notes_merge(struct notes_merge_options *o,
 	/* Find merge bases */
 	bases = get_merge_bases(local, remote);
 	if (!bases) {
-		base_oid = &null_oid;
+		base_oid = null_oid();
 		base_tree_oid = the_hash_algo->empty_tree;
 		if (o->verbosity >= 4)
 			printf("No merge base found; doing history-less merge\n");
@@ -628,7 +628,7 @@ int notes_merge(struct notes_merge_options *o,
 	if (oideq(&remote->object.oid, base_oid)) {
 		/* Already merged; result == local commit */
 		if (o->verbosity >= 2)
-			printf("Already up to date!\n");
+			printf_ln("Already up to date.");
 		oidcpy(result_oid, &local->object.oid);
 		goto found_result;
 	}
@@ -695,13 +695,10 @@ int notes_merge_commit(struct notes_merge_options *o,
 
 	strbuf_addch(&path, '/');
 	baselen = path.len;
-	while ((e = readdir(dir)) != NULL) {
+	while ((e = readdir_skip_dot_and_dotdot(dir)) != NULL) {
 		struct stat st;
 		struct object_id obj_oid, blob_oid;
 
-		if (is_dot_or_dotdot(e->d_name))
-			continue;
-
 		if (get_oid_hex(e->d_name, &obj_oid)) {
 			if (o->verbosity >= 3)
 				printf("Skipping non-SHA1 entry '%s%s'\n",
diff --git a/notes-utils.c b/notes-utils.c
index a819410698..d7d18e30f5 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -52,7 +52,7 @@ void commit_notes(struct repository *r, struct notes_tree *t, const char *msg)
 	strbuf_complete_line(&buf);
 
 	create_notes_commit(r, t, NULL, buf.buf, buf.len, &commit_oid);
-	strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
+	strbuf_insertstr(&buf, 0, "notes: ");
 	update_ref(buf.buf, t->update_ref, &commit_oid, NULL, 0,
 		   UPDATE_REFS_DIE_ON_ERR);
 
@@ -129,7 +129,7 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd)
 	c->cmd = cmd;
 	c->enabled = 1;
 	c->combine = combine_notes_concatenate;
-	c->refs = xcalloc(1, sizeof(struct string_list));
+	CALLOC_ARRAY(c->refs, 1);
 	c->refs->strdup_strings = 1;
 	c->refs_from_env = 0;
 	c->mode_from_env = 0;
diff --git a/notes.c b/notes.c
index 03e7d0cd2d..f87dac4068 100644
--- a/notes.c
+++ b/notes.c
@@ -352,7 +352,7 @@ static void add_non_note(struct notes_tree *t, char *path,
 	n->next = NULL;
 	n->path = path;
 	n->mode = mode;
-	hashcpy(n->oid.hash, sha1);
+	oidread(&n->oid, sha1);
 	t->prev_non_note = n;
 
 	if (!t->first_non_note) {
@@ -452,9 +452,11 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
 			goto handle_non_note;
 		}
 
-		l = xcalloc(1, sizeof(*l));
+		CALLOC_ARRAY(l, 1);
 		oidcpy(&l->key_oid, &object_oid);
 		oidcpy(&l->val_oid, &entry.oid);
+		oid_set_algo(&l->key_oid, the_hash_algo);
+		oid_set_algo(&l->val_oid, the_hash_algo);
 		if (note_tree_insert(t, node, n, l, type,
 				     combine_notes_concatenate))
 			die("Failed to load %s %s into notes tree "
@@ -484,6 +486,7 @@ handle_non_note:
 				strbuf_addch(&non_note_path, '/');
 			}
 			strbuf_addstr(&non_note_path, entry.path);
+			oid_set_algo(&entry.oid, the_hash_algo);
 			add_non_note(t, strbuf_detach(&non_note_path, NULL),
 				     entry.mode, entry.oid.hash);
 		}
@@ -576,16 +579,16 @@ redo:
 			 * the note tree that have not yet been explored. There
 			 * is a direct relationship between subtree entries at
 			 * level 'n' in the tree, and the 'fanout' variable:
-			 * Subtree entries at level 'n <= 2 * fanout' should be
+			 * Subtree entries at level 'n < 2 * fanout' should be
 			 * preserved, since they correspond exactly to a fanout
 			 * directory in the on-disk structure. However, subtree
-			 * entries at level 'n > 2 * fanout' should NOT be
+			 * entries at level 'n >= 2 * fanout' should NOT be
 			 * preserved, but rather consolidated into the above
 			 * notes tree level. We achieve this by unconditionally
 			 * unpacking subtree entries that exist below the
 			 * threshold level at 'n = 2 * fanout'.
 			 */
-			if (n <= 2 * fanout &&
+			if (n < 2 * fanout &&
 			    flags & FOR_EACH_NOTE_YIELD_SUBTREES) {
 				/* invoke callback with subtree */
 				unsigned int path_len =
@@ -602,7 +605,7 @@ redo:
 					 path,
 					 cb_data);
 			}
-			if (n > fanout * 2 ||
+			if (n >= 2 * fanout ||
 			    !(flags & FOR_EACH_NOTE_DONT_UNPACK_SUBTREES)) {
 				/* unpack subtree and resume traversal */
 				tree->a[i] = NULL;
@@ -723,13 +726,15 @@ static int write_each_note_helper(struct tree_write_stack *tws,
 
 struct write_each_note_data {
 	struct tree_write_stack *root;
-	struct non_note *next_non_note;
+	struct non_note **nn_list;
+	struct non_note *nn_prev;
 };
 
 static int write_each_non_note_until(const char *note_path,
 		struct write_each_note_data *d)
 {
-	struct non_note *n = d->next_non_note;
+	struct non_note *p = d->nn_prev;
+	struct non_note *n = p ? p->next : *d->nn_list;
 	int cmp = 0, ret;
 	while (n && (!note_path || (cmp = strcmp(n->path, note_path)) <= 0)) {
 		if (note_path && cmp == 0)
@@ -740,9 +745,10 @@ static int write_each_non_note_until(const char *note_path,
 			if (ret)
 				return ret;
 		}
+		p = n;
 		n = n->next;
 	}
-	d->next_non_note = n;
+	d->nn_prev = p;
 	return 0;
 }
 
@@ -967,7 +973,7 @@ static int notes_display_config(const char *k, const char *v, void *cb)
 
 	if (*load_refs && !strcmp(k, "notes.displayref")) {
 		if (!v)
-			config_error_nonbool(k);
+			return config_error_nonbool(k);
 		string_list_add_refs_by_glob(&display_notes_refs, v);
 	}
 
@@ -1043,6 +1049,39 @@ struct notes_tree **load_notes_trees(struct string_list *refs, int flags)
 
 void init_display_notes(struct display_notes_opt *opt)
 {
+	memset(opt, 0, sizeof(*opt));
+	opt->use_default_notes = -1;
+}
+
+void enable_default_display_notes(struct display_notes_opt *opt, int *show_notes)
+{
+	opt->use_default_notes = 1;
+	*show_notes = 1;
+}
+
+void enable_ref_display_notes(struct display_notes_opt *opt, int *show_notes,
+		const char *ref) {
+	struct strbuf buf = STRBUF_INIT;
+	strbuf_addstr(&buf, ref);
+	expand_notes_ref(&buf);
+	string_list_append(&opt->extra_notes_refs,
+			strbuf_detach(&buf, NULL));
+	*show_notes = 1;
+}
+
+void disable_display_notes(struct display_notes_opt *opt, int *show_notes)
+{
+	opt->use_default_notes = -1;
+	/* we have been strdup'ing ourselves, so trick
+	 * string_list into free()ing strings */
+	opt->extra_notes_refs.strdup_strings = 1;
+	string_list_clear(&opt->extra_notes_refs, 0);
+	opt->extra_notes_refs.strdup_strings = 0;
+	*show_notes = 0;
+}
+
+void load_display_notes(struct display_notes_opt *opt)
+{
 	char *display_ref_env;
 	int load_config_refs = 0;
 	display_notes_refs.strdup_strings = 1;
@@ -1098,7 +1137,7 @@ int remove_note(struct notes_tree *t, const unsigned char *object_sha1)
 	if (!t)
 		t = &default_notes_tree;
 	assert(t->initialized);
-	hashcpy(l.key_oid.hash, object_sha1);
+	oidread(&l.key_oid, object_sha1);
 	oidclr(&l.val_oid);
 	note_tree_remove(t, t->root, 0, &l);
 	if (is_null_oid(&l.val_oid)) /* no note was removed */
@@ -1144,7 +1183,8 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
 	strbuf_init(&root.buf, 256 * (32 + the_hash_algo->hexsz)); /* assume 256 entries */
 	root.path[0] = root.path[1] = '\0';
 	cb_data.root = &root;
-	cb_data.next_non_note = t->first_non_note;
+	cb_data.nn_list = &(t->first_non_note);
+	cb_data.nn_prev = NULL;
 
 	/* Write tree objects representing current notes tree */
 	flags = FOR_EACH_NOTE_DONT_UNPACK_SUBTREES |
@@ -1246,10 +1286,8 @@ static void format_note(struct notes_tree *t, const struct object_id *object_oid
 		if (!ref || !strcmp(ref, GIT_NOTES_DEFAULT_REF)) {
 			strbuf_addstr(sb, "\nNotes:\n");
 		} else {
-			if (starts_with(ref, "refs/"))
-				ref += 5;
-			if (starts_with(ref, "notes/"))
-				ref += 6;
+			skip_prefix(ref, "refs/", &ref);
+			skip_prefix(ref, "notes/", &ref);
 			strbuf_addf(sb, "\nNotes (%s):\n", ref);
 		}
 	}
@@ -1289,7 +1327,7 @@ int copy_note(struct notes_tree *t,
 	if (note)
 		return add_note(t, to_obj, note, combine_notes);
 	else if (existing_note)
-		return add_note(t, to_obj, &null_oid, combine_notes);
+		return add_note(t, to_obj, null_oid(), combine_notes);
 
 	return 0;
 }
@@ -1299,9 +1337,9 @@ void expand_notes_ref(struct strbuf *sb)
 	if (starts_with(sb->buf, "refs/notes/"))
 		return; /* we're happy */
 	else if (starts_with(sb->buf, "notes/"))
-		strbuf_insert(sb, 0, "refs/", 5);
+		strbuf_insertstr(sb, 0, "refs/");
 	else
-		strbuf_insert(sb, 0, "refs/notes/", 11);
+		strbuf_insertstr(sb, 0, "refs/notes/");
 }
 
 void expand_loose_notes_ref(struct strbuf *sb)
diff --git a/notes.h b/notes.h
index 76337f2384..c1682c39a9 100644
--- a/notes.h
+++ b/notes.h
@@ -261,6 +261,26 @@ struct display_notes_opt {
 };
 
 /*
+ * Initialize a display_notes_opt to its default value.
+ */
+void init_display_notes(struct display_notes_opt *opt);
+
+/*
+ * This family of functions enables or disables the display of notes. In
+ * particular, 'enable_default_display_notes' will display the default notes,
+ * 'enable_ref_display_notes' will display the notes ref 'ref' and
+ * 'disable_display_notes' will disable notes, including those added by previous
+ * invocations of the 'enable_*_display_notes' functions.
+ *
+ * 'show_notes' is a pointer to a boolean which will be set to 1 if notes are
+ * displayed, else 0. It must not be NULL.
+ */
+void enable_default_display_notes(struct display_notes_opt *opt, int *show_notes);
+void enable_ref_display_notes(struct display_notes_opt *opt, int *show_notes,
+		const char *ref);
+void disable_display_notes(struct display_notes_opt *opt, int *show_notes);
+
+/*
  * Load the notes machinery for displaying several notes trees.
  *
  * If 'opt' is not NULL, then it specifies additional settings for the
@@ -272,16 +292,16 @@ struct display_notes_opt {
  * - extra_notes_refs may contain a list of globs (in the same style
  *   as notes.displayRef) where notes should be loaded from.
  */
-void init_display_notes(struct display_notes_opt *opt);
+void load_display_notes(struct display_notes_opt *opt);
 
 /*
  * Append notes for the given 'object_sha1' from all trees set up by
- * init_display_notes() to 'sb'.
+ * load_display_notes() to 'sb'.
  *
  * If 'raw' is false the note will be indented by 4 places and
  * a 'Notes (refname):' header added.
  *
- * You *must* call init_display_notes() before using this function.
+ * You *must* call load_display_notes() before using this function.
  */
 void format_display_notes(const struct object_id *object_oid,
 			  struct strbuf *sb, const char *output_encoding, int raw);
diff --git a/sha1-file.c b/object-file.c
index 188de57634..a8be899481 100644
--- a/sha1-file.c
+++ b/object-file.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) Linus Torvalds, 2005
  *
- * This handles basic git sha1 object files - packing, unpacking,
+ * This handles basic git object files - packing, unpacking,
  * creation etc.
  */
 #include "cache.h"
@@ -20,7 +20,7 @@
 #include "tree-walk.h"
 #include "refs.h"
 #include "pack-revindex.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 #include "bulk-checkin.h"
 #include "repository.h"
 #include "replace-object.h"
@@ -55,18 +55,29 @@
 	"\x6f\xe1\x41\xf7\x74\x91\x20\xa3\x03\x72" \
 	"\x18\x13"
 
-const struct object_id null_oid;
 static const struct object_id empty_tree_oid = {
-	EMPTY_TREE_SHA1_BIN_LITERAL
+	.hash = EMPTY_TREE_SHA1_BIN_LITERAL,
+	.algo = GIT_HASH_SHA1,
 };
 static const struct object_id empty_blob_oid = {
-	EMPTY_BLOB_SHA1_BIN_LITERAL
+	.hash = EMPTY_BLOB_SHA1_BIN_LITERAL,
+	.algo = GIT_HASH_SHA1,
+};
+static const struct object_id null_oid_sha1 = {
+	.hash = {0},
+	.algo = GIT_HASH_SHA1,
 };
 static const struct object_id empty_tree_oid_sha256 = {
-	EMPTY_TREE_SHA256_BIN_LITERAL
+	.hash = EMPTY_TREE_SHA256_BIN_LITERAL,
+	.algo = GIT_HASH_SHA256,
 };
 static const struct object_id empty_blob_oid_sha256 = {
-	EMPTY_BLOB_SHA256_BIN_LITERAL
+	.hash = EMPTY_BLOB_SHA256_BIN_LITERAL,
+	.algo = GIT_HASH_SHA256,
+};
+static const struct object_id null_oid_sha256 = {
+	.hash = {0},
+	.algo = GIT_HASH_SHA256,
 };
 
 static void git_hash_sha1_init(git_hash_ctx *ctx)
@@ -74,6 +85,11 @@ static void git_hash_sha1_init(git_hash_ctx *ctx)
 	git_SHA1_Init(&ctx->sha1);
 }
 
+static void git_hash_sha1_clone(git_hash_ctx *dst, const git_hash_ctx *src)
+{
+	git_SHA1_Clone(&dst->sha1, &src->sha1);
+}
+
 static void git_hash_sha1_update(git_hash_ctx *ctx, const void *data, size_t len)
 {
 	git_SHA1_Update(&ctx->sha1, data, len);
@@ -84,12 +100,24 @@ static void git_hash_sha1_final(unsigned char *hash, git_hash_ctx *ctx)
 	git_SHA1_Final(hash, &ctx->sha1);
 }
 
+static void git_hash_sha1_final_oid(struct object_id *oid, git_hash_ctx *ctx)
+{
+	git_SHA1_Final(oid->hash, &ctx->sha1);
+	memset(oid->hash + GIT_SHA1_RAWSZ, 0, GIT_MAX_RAWSZ - GIT_SHA1_RAWSZ);
+	oid->algo = GIT_HASH_SHA1;
+}
+
 
 static void git_hash_sha256_init(git_hash_ctx *ctx)
 {
 	git_SHA256_Init(&ctx->sha256);
 }
 
+static void git_hash_sha256_clone(git_hash_ctx *dst, const git_hash_ctx *src)
+{
+	git_SHA256_Clone(&dst->sha256, &src->sha256);
+}
+
 static void git_hash_sha256_update(git_hash_ctx *ctx, const void *data, size_t len)
 {
 	git_SHA256_Update(&ctx->sha256, data, len);
@@ -100,11 +128,27 @@ static void git_hash_sha256_final(unsigned char *hash, git_hash_ctx *ctx)
 	git_SHA256_Final(hash, &ctx->sha256);
 }
 
+static void git_hash_sha256_final_oid(struct object_id *oid, git_hash_ctx *ctx)
+{
+	git_SHA256_Final(oid->hash, &ctx->sha256);
+	/*
+	 * This currently does nothing, so the compiler should optimize it out,
+	 * but keep it in case we extend the hash size again.
+	 */
+	memset(oid->hash + GIT_SHA256_RAWSZ, 0, GIT_MAX_RAWSZ - GIT_SHA256_RAWSZ);
+	oid->algo = GIT_HASH_SHA256;
+}
+
 static void git_hash_unknown_init(git_hash_ctx *ctx)
 {
 	BUG("trying to init unknown hash");
 }
 
+static void git_hash_unknown_clone(git_hash_ctx *dst, const git_hash_ctx *src)
+{
+	BUG("trying to clone unknown hash");
+}
+
 static void git_hash_unknown_update(git_hash_ctx *ctx, const void *data, size_t len)
 {
 	BUG("trying to update unknown hash");
@@ -115,6 +159,12 @@ static void git_hash_unknown_final(unsigned char *hash, git_hash_ctx *ctx)
 	BUG("trying to finalize unknown hash");
 }
 
+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,
@@ -123,8 +173,11 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
 		0,
 		0,
 		git_hash_unknown_init,
+		git_hash_unknown_clone,
 		git_hash_unknown_update,
 		git_hash_unknown_final,
+		git_hash_unknown_final_oid,
+		NULL,
 		NULL,
 		NULL,
 	},
@@ -136,10 +189,13 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
 		GIT_SHA1_HEXSZ,
 		GIT_SHA1_BLKSZ,
 		git_hash_sha1_init,
+		git_hash_sha1_clone,
 		git_hash_sha1_update,
 		git_hash_sha1_final,
+		git_hash_sha1_final_oid,
 		&empty_tree_oid,
 		&empty_blob_oid,
+		&null_oid_sha1,
 	},
 	{
 		"sha256",
@@ -149,13 +205,21 @@ const struct git_hash_algo hash_algos[GIT_HASH_NALGOS] = {
 		GIT_SHA256_HEXSZ,
 		GIT_SHA256_BLKSZ,
 		git_hash_sha256_init,
+		git_hash_sha256_clone,
 		git_hash_sha256_update,
 		git_hash_sha256_final,
+		git_hash_sha256_final_oid,
 		&empty_tree_oid_sha256,
 		&empty_blob_oid_sha256,
+		&null_oid_sha256,
 	}
 };
 
+const struct object_id *null_oid(void)
+{
+	return the_hash_algo->null_oid;
+}
+
 const char *empty_tree_oid_hex(void)
 {
 	static char buf[GIT_MAX_HEXSZ + 1];
@@ -273,7 +337,7 @@ int mkdir_in_gitdir(const char *path)
 	return adjust_shared_perm(path);
 }
 
-enum scld_error safe_create_leading_directories(char *path)
+static enum scld_error safe_create_leading_directories_1(char *path, int share)
 {
 	char *next_component = path + offset_1st_component(path);
 	enum scld_error ret = SCLD_OK;
@@ -319,7 +383,7 @@ enum scld_error safe_create_leading_directories(char *path)
 				ret = SCLD_VANISHED;
 			else
 				ret = SCLD_FAILED;
-		} else if (adjust_shared_perm(path)) {
+		} else if (share && adjust_shared_perm(path)) {
 			ret = SCLD_PERMS;
 		}
 		*slash = slash_character;
@@ -327,6 +391,16 @@ enum scld_error safe_create_leading_directories(char *path)
 	return ret;
 }
 
+enum scld_error safe_create_leading_directories(char *path)
+{
+	return safe_create_leading_directories_1(path, 1);
+}
+
+enum scld_error safe_create_leading_directories_no_share(char *path)
+{
+	return safe_create_leading_directories_1(path, 0);
+}
+
 enum scld_error safe_create_leading_directories_const(const char *path)
 {
 	int save_errno;
@@ -443,9 +517,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)) {
@@ -459,14 +533,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;
 }
 
 /*
@@ -480,24 +560,25 @@ static int alt_odb_usable(struct raw_object_store *o,
  * LF separated.  Its base points at a statically allocated buffer that
  * contains "/the/directory/corresponding/to/.git/objects/...", while
  * its name points just after the slash at the end of ".git/objects/"
- * in the example above, and has enough space to hold 40-byte hex
- * SHA1, an extra slash for the first level indirection, and the
- * terminating NUL.
+ * in the example above, and has enough space to hold all hex characters
+ * of the object ID, an extra slash for the first level indirection, and
+ * the terminating NUL.
  */
 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"),
@@ -513,23 +594,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;
 	}
 
-	ent = xcalloc(1, sizeof(*ent));
-	ent->path = xstrdup(pathbuf.buf);
+	CALLOC_ARRAY(ent, 1);
+	/* 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;
 }
 
@@ -586,7 +669,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);
@@ -676,20 +759,15 @@ void add_to_alternates_memory(const char *reference)
 char *compute_alternate_path(const char *path, struct strbuf *err)
 {
 	char *ref_git = NULL;
-	const char *repo, *ref_git_s;
+	const char *repo;
 	int seen_error = 0;
 
-	ref_git_s = real_path_if_valid(path);
-	if (!ref_git_s) {
+	ref_git = real_pathdup(path, 0);
+	if (!ref_git) {
 		seen_error = 1;
 		strbuf_addf(err, _("path '%s' does not exist"), path);
 		goto out;
-	} else
-		/*
-		 * Beware: read_gitfile(), real_path() and mkpath()
-		 * return static buffer
-		 */
-		ref_git = xstrdup(ref_git_s);
+	}
 
 	repo = read_gitfile(ref_git);
 	if (!repo)
@@ -750,18 +828,18 @@ static void fill_alternate_refs_command(struct child_process *cmd,
 	if (!git_config_get_value("core.alternateRefsCommand", &value)) {
 		cmd->use_shell = 1;
 
-		argv_array_push(&cmd->args, value);
-		argv_array_push(&cmd->args, repo_path);
+		strvec_push(&cmd->args, value);
+		strvec_push(&cmd->args, repo_path);
 	} else {
 		cmd->git_cmd = 1;
 
-		argv_array_pushf(&cmd->args, "--git-dir=%s", repo_path);
-		argv_array_push(&cmd->args, "for-each-ref");
-		argv_array_push(&cmd->args, "--format=%(objectname)");
+		strvec_pushf(&cmd->args, "--git-dir=%s", repo_path);
+		strvec_push(&cmd->args, "for-each-ref");
+		strvec_push(&cmd->args, "--format=%(objectname)");
 
 		if (!git_config_get_value("core.alternateRefsPrefixes", &value)) {
-			argv_array_push(&cmd->args, "--");
-			argv_array_split(&cmd->args, value);
+			strvec_push(&cmd->args, "--");
+			strvec_split(&cmd->args, value);
 		}
 	}
 
@@ -868,9 +946,7 @@ void prepare_alt_odb(struct repository *r)
 /* Returns 1 if we have successfully freshened the file, 0 otherwise. */
 static int freshen_file(const char *fn)
 {
-	struct utimbuf t;
-	t.actime = t.modtime = time(NULL);
-	return !utime(fn, &t);
+	return !utime(fn, NULL);
 }
 
 /*
@@ -956,12 +1032,26 @@ void *xmmap_gently(void *start, size_t length,
 	return ret;
 }
 
+const char *mmap_os_err(void)
+{
+	static const char blank[] = "";
+#if defined(__linux__)
+	if (errno == ENOMEM) {
+		/* this continues an existing error message: */
+		static const char enomem[] =
+", check sys.vm.max_map_count and/or RLIMIT_DATA";
+		return enomem;
+	}
+#endif /* OS-specific bits */
+	return blank;
+}
+
 void *xmmap(void *start, size_t length,
 	int prot, int flags, int fd, off_t offset)
 {
 	void *ret = xmmap_gently(start, length, prot, flags, fd, offset);
 	if (ret == MAP_FAILED)
-		die_errno(_("mmap failed"));
+		die_errno(_("mmap failed%s"), mmap_os_err());
 	return ret;
 }
 
@@ -971,8 +1061,8 @@ void *xmmap(void *start, size_t length,
  * With "map" == NULL, try reading the object named with "oid" using
  * the streaming interface and rehash it to do the same.
  */
-int check_object_signature(const struct object_id *oid, void *map,
-			   unsigned long size, const char *type)
+int check_object_signature(struct repository *r, const struct object_id *oid,
+			   void *map, unsigned long size, const char *type)
 {
 	struct object_id real_oid;
 	enum object_type obj_type;
@@ -982,11 +1072,11 @@ int check_object_signature(const struct object_id *oid, void *map,
 	int hdrlen;
 
 	if (map) {
-		hash_object_file(map, size, type, &real_oid);
+		hash_object_file(r->hash_algo, map, size, type, &real_oid);
 		return !oideq(oid, &real_oid) ? -1 : 0;
 	}
 
-	st = open_istream(oid, &obj_type, &size, NULL);
+	st = open_istream(r, oid, &obj_type, &size, NULL);
 	if (!st)
 		return -1;
 
@@ -994,8 +1084,8 @@ int check_object_signature(const struct object_id *oid, void *map,
 	hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %"PRIuMAX , type_name(obj_type), (uintmax_t)size) + 1;
 
 	/* Sha1.. */
-	the_hash_algo->init_fn(&c);
-	the_hash_algo->update_fn(&c, hdr, hdrlen);
+	r->hash_algo->init_fn(&c);
+	r->hash_algo->update_fn(&c, hdr, hdrlen);
 	for (;;) {
 		char buf[1024 * 16];
 		ssize_t readlen = read_istream(st, buf, sizeof(buf));
@@ -1006,9 +1096,9 @@ int check_object_signature(const struct object_id *oid, void *map,
 		}
 		if (!readlen)
 			break;
-		the_hash_algo->update_fn(&c, buf, readlen);
+		r->hash_algo->update_fn(&c, buf, readlen);
 	}
-	the_hash_algo->final_fn(real_oid.hash, &c);
+	r->hash_algo->final_oid_fn(&real_oid, &c);
 	close_istream(st);
 	return !oideq(oid, &real_oid) ? -1 : 0;
 }
@@ -1097,7 +1187,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;
@@ -1147,6 +1237,8 @@ static int unpack_loose_short_header(git_zstream *stream,
 				     unsigned char *map, unsigned long mapsize,
 				     void *buffer, unsigned long bufsiz)
 {
+	int ret;
+
 	/* Get the data stream */
 	memset(stream, 0, sizeof(*stream));
 	stream->next_in = map;
@@ -1155,7 +1247,11 @@ static int unpack_loose_short_header(git_zstream *stream,
 	stream->avail_out = bufsiz;
 
 	git_inflate_init(stream);
-	return git_inflate(stream, 0);
+	obj_read_unlock();
+	ret = git_inflate(stream, 0);
+	obj_read_lock();
+
+	return ret;
 }
 
 int unpack_loose_header(git_zstream *stream,
@@ -1200,7 +1296,9 @@ static int unpack_loose_header_to_strbuf(git_zstream *stream, unsigned char *map
 	stream->avail_out = bufsiz;
 
 	do {
+		obj_read_unlock();
 		status = git_inflate(stream, 0);
+		obj_read_lock();
 		strbuf_add(header, buffer, stream->next_out - (unsigned char *)buffer);
 		if (memchr(buffer, '\0', stream->next_out - (unsigned char *)buffer))
 			return 0;
@@ -1240,8 +1338,11 @@ static void *unpack_loose_rest(git_zstream *stream,
 		 */
 		stream->next_out = buf + bytes;
 		stream->avail_out = size - bytes;
-		while (status == Z_OK)
+		while (status == Z_OK) {
+			obj_read_unlock();
 			status = git_inflate(stream, Z_FINISH);
+			obj_read_lock();
+		}
 	}
 	if (status == Z_STREAM_END && !stream->avail_in) {
 		git_inflate_end(stream);
@@ -1343,8 +1444,8 @@ static int loose_object_info(struct repository *r,
 	struct strbuf hdrbuf = STRBUF_INIT;
 	unsigned long size_scratch;
 
-	if (oi->delta_base_sha1)
-		hashclr(oi->delta_base_sha1);
+	if (oi->delta_base_oid)
+		oidclr(oi->delta_base_oid);
 
 	/*
 	 * If we don't care about type or size, then we don't
@@ -1411,17 +1512,41 @@ static int loose_object_info(struct repository *r,
 	return (status < 0) ? status : 0;
 }
 
+int obj_read_use_lock = 0;
+pthread_mutex_t obj_read_mutex;
+
+void enable_obj_read_lock(void)
+{
+	if (obj_read_use_lock)
+		return;
+
+	obj_read_use_lock = 1;
+	init_recursive_mutex(&obj_read_mutex);
+}
+
+void disable_obj_read_lock(void)
+{
+	if (!obj_read_use_lock)
+		return;
+
+	obj_read_use_lock = 0;
+	pthread_mutex_destroy(&obj_read_mutex);
+}
+
 int fetch_if_missing = 1;
 
-int oid_object_info_extended(struct repository *r, const struct object_id *oid,
-			     struct object_info *oi, unsigned flags)
+static int do_oid_object_info_extended(struct repository *r,
+				       const struct object_id *oid,
+				       struct object_info *oi, unsigned flags)
 {
 	static struct object_info blank_oi = OBJECT_INFO_INIT;
+	struct cached_object *co;
 	struct pack_entry e;
 	int rtype;
 	const struct object_id *real = oid;
 	int already_retried = 0;
 
+
 	if (flags & OBJECT_INFO_LOOKUP_REPLACE)
 		real = lookup_replace_object(r, oid);
 
@@ -1431,24 +1556,22 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
 	if (!oi)
 		oi = &blank_oi;
 
-	if (!(flags & OBJECT_INFO_SKIP_CACHED)) {
-		struct cached_object *co = find_cached_object(real);
-		if (co) {
-			if (oi->typep)
-				*(oi->typep) = co->type;
-			if (oi->sizep)
-				*(oi->sizep) = co->size;
-			if (oi->disk_sizep)
-				*(oi->disk_sizep) = 0;
-			if (oi->delta_base_sha1)
-				hashclr(oi->delta_base_sha1);
-			if (oi->type_name)
-				strbuf_addstr(oi->type_name, type_name(co->type));
-			if (oi->contentp)
-				*oi->contentp = xmemdupz(co->buf, co->size);
-			oi->whence = OI_CACHED;
-			return 0;
-		}
+	co = find_cached_object(real);
+	if (co) {
+		if (oi->typep)
+			*(oi->typep) = co->type;
+		if (oi->sizep)
+			*(oi->sizep) = co->size;
+		if (oi->disk_sizep)
+			*(oi->disk_sizep) = 0;
+		if (oi->delta_base_oid)
+			oidclr(oi->delta_base_oid);
+		if (oi->type_name)
+			strbuf_addstr(oi->type_name, type_name(co->type));
+		if (oi->contentp)
+			*oi->contentp = xmemdupz(co->buf, co->size);
+		oi->whence = OI_CACHED;
+		return 0;
 	}
 
 	while (1) {
@@ -1470,15 +1593,12 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
 		}
 
 		/* Check if it is a missing object */
-		if (fetch_if_missing && has_promisor_remote() &&
-		    !already_retried && r == the_repository &&
+		if (fetch_if_missing && repo_has_promisor_remote(r) &&
+		    !already_retried &&
 		    !(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) {
 			/*
 			 * TODO Investigate checking promisor_remote_get_direct()
 			 * TODO return value and stopping on error here.
-			 * TODO Pass a repository struct through
-			 * promisor_remote_get_direct(), such that arbitrary
-			 * repositories work.
 			 */
 			promisor_remote_get_direct(r, real, 1);
 			already_retried = 1;
@@ -1497,7 +1617,7 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
 	rtype = packed_object_info(r, e.p, e.offset, oi);
 	if (rtype < 0) {
 		mark_bad_packed_object(e.p, real->hash);
-		return oid_object_info_extended(r, real, oi, 0);
+		return do_oid_object_info_extended(r, real, oi, 0);
 	} else if (oi->whence == OI_PACKED) {
 		oi->u.packed.offset = e.offset;
 		oi->u.packed.pack = e.p;
@@ -1508,6 +1628,17 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid,
 	return 0;
 }
 
+int oid_object_info_extended(struct repository *r, const struct object_id *oid,
+			     struct object_info *oi, unsigned flags)
+{
+	int ret;
+	obj_read_lock();
+	ret = do_oid_object_info_extended(r, oid, oi, flags);
+	obj_read_unlock();
+	return ret;
+}
+
+
 /* returns enum object_type or negative */
 int oid_object_info(struct repository *r,
 		    const struct object_id *oid,
@@ -1544,8 +1675,9 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type,
 {
 	struct cached_object *co;
 
-	hash_object_file(buf, len, type_name(type), oid);
-	if (has_object_file(oid) || find_cached_object(oid))
+	hash_object_file(the_hash_algo, buf, len, type_name(type), oid);
+	if (has_object_file_with_flags(oid, OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT) ||
+	    find_cached_object(oid))
 		return 0;
 	ALLOC_GROW(cached_objects, cached_object_nr + 1, cached_object_alloc);
 	co = &cached_objects[cached_object_nr++];
@@ -1580,6 +1712,7 @@ void *read_object_file_extended(struct repository *r,
 	if (data)
 		return data;
 
+	obj_read_lock();
 	if (errno && errno != ENOENT)
 		die_errno(_("failed to read object %s"), oid_to_hex(oid));
 
@@ -1595,6 +1728,7 @@ void *read_object_file_extended(struct repository *r,
 	if ((p = has_packed_and_bad(r, repl->hash)) != NULL)
 		die(_("packed object %s (stored in %s) is corrupt"),
 		    oid_to_hex(repl), p->pack_name);
+	obj_read_unlock();
 
 	return NULL;
 }
@@ -1648,7 +1782,8 @@ void *read_object_with_reference(struct repository *r,
 	}
 }
 
-static void write_object_file_prepare(const void *buf, unsigned long len,
+static void write_object_file_prepare(const struct git_hash_algo *algo,
+				      const void *buf, unsigned long len,
 				      const char *type, struct object_id *oid,
 				      char *hdr, int *hdrlen)
 {
@@ -1658,10 +1793,10 @@ static void write_object_file_prepare(const void *buf, unsigned long len,
 	*hdrlen = xsnprintf(hdr, *hdrlen, "%s %"PRIuMAX , type, (uintmax_t)len)+1;
 
 	/* Sha1.. */
-	the_hash_algo->init_fn(&c);
-	the_hash_algo->update_fn(&c, hdr, *hdrlen);
-	the_hash_algo->update_fn(&c, buf, len);
-	the_hash_algo->final_fn(oid->hash, &c);
+	algo->init_fn(&c);
+	algo->update_fn(&c, hdr, *hdrlen);
+	algo->update_fn(&c, buf, len);
+	algo->final_oid_fn(oid, &c);
 }
 
 /*
@@ -1714,12 +1849,13 @@ static int write_buffer(int fd, const void *buf, size_t len)
 	return 0;
 }
 
-int hash_object_file(const void *buf, unsigned long len, const char *type,
+int hash_object_file(const struct git_hash_algo *algo, const void *buf,
+		     unsigned long len, const char *type,
 		     struct object_id *oid)
 {
 	char hdr[MAX_HEADER_LEN];
 	int hdrlen = sizeof(hdr);
-	write_object_file_prepare(buf, len, type, oid, hdr, &hdrlen);
+	write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen);
 	return 0;
 }
 
@@ -1832,7 +1968,7 @@ static int write_loose_object(const struct object_id *oid, char *hdr,
 	if (ret != Z_OK)
 		die(_("deflateEnd on object %s failed (%d)"), oid_to_hex(oid),
 		    ret);
-	the_hash_algo->final_fn(parano_oid.hash, &c);
+	the_hash_algo->final_oid_fn(&parano_oid, &c);
 	if (!oideq(oid, &parano_oid))
 		die(_("confused by unstable object source data for %s"),
 		    oid_to_hex(oid));
@@ -1877,7 +2013,8 @@ int write_object_file(const void *buf, unsigned long len, const char *type,
 	/* Normally if we have it in the pack then we do not bother writing
 	 * it out into .git/objects/??/?{38} file.
 	 */
-	write_object_file_prepare(buf, len, type, oid, hdr, &hdrlen);
+	write_object_file_prepare(the_hash_algo, buf, len, type, oid, hdr,
+				  &hdrlen);
 	if (freshen_packed_object(oid) || freshen_loose_object(oid))
 		return 0;
 	return write_loose_object(oid, hdr, hdrlen, buf, len, 0);
@@ -1893,7 +2030,8 @@ int hash_object_file_literally(const void *buf, unsigned long len,
 	/* type string, SP, %lu of the length plus NUL must fit this */
 	hdrlen = strlen(type) + MAX_HEADER_LEN;
 	header = xmalloc(hdrlen);
-	write_object_file_prepare(buf, len, type, oid, header, &hdrlen);
+	write_object_file_prepare(the_hash_algo, buf, len, type, oid, header,
+				  &hdrlen);
 
 	if (!(flags & HASH_WRITE_OBJECT))
 		goto cleanup;
@@ -1927,13 +2065,24 @@ int force_object_loose(const struct object_id *oid, time_t mtime)
 	return ret;
 }
 
+int has_object(struct repository *r, const struct object_id *oid,
+	       unsigned flags)
+{
+	int quick = !(flags & HAS_OBJECT_RECHECK_PACKED);
+	unsigned object_info_flags = OBJECT_INFO_SKIP_FETCH_OBJECT |
+		(quick ? OBJECT_INFO_QUICK : 0);
+
+	if (!startup_info->have_repository)
+		return 0;
+	return oid_object_info_extended(r, oid, NULL, object_info_flags) >= 0;
+}
+
 int repo_has_object_file_with_flags(struct repository *r,
 				    const struct object_id *oid, int flags)
 {
 	if (!startup_info->have_repository)
 		return 0;
-	return oid_object_info_extended(r, oid, NULL,
-					flags | OBJECT_INFO_SKIP_CACHED) >= 0;
+	return oid_object_info_extended(r, oid, NULL, flags) >= 0;
 }
 
 int repo_has_object_file(struct repository *r,
@@ -2004,7 +2153,8 @@ static int index_mem(struct index_state *istate,
 	if (write_object)
 		ret = write_object_file(buf, size, type_name(type), oid);
 	else
-		ret = hash_object_file(buf, size, type_name(type), oid);
+		ret = hash_object_file(the_hash_algo, buf, size,
+				       type_name(type), oid);
 	if (re_allocated)
 		free(buf);
 	return ret;
@@ -2030,8 +2180,8 @@ static int index_stream_convert_blob(struct index_state *istate,
 		ret = write_object_file(sbuf.buf, sbuf.len, type_name(OBJ_BLOB),
 					oid);
 	else
-		ret = hash_object_file(sbuf.buf, sbuf.len, type_name(OBJ_BLOB),
-				       oid);
+		ret = hash_object_file(the_hash_algo, sbuf.buf, sbuf.len,
+				       type_name(OBJ_BLOB), oid);
 	strbuf_release(&sbuf);
 	return ret;
 }
@@ -2149,7 +2299,8 @@ int index_path(struct index_state *istate, struct object_id *oid,
 		if (strbuf_readlink(&sb, path, st->st_size))
 			return error_errno("readlink(\"%s\")", path);
 		if (!(flags & HASH_WRITE_OBJECT))
-			hash_object_file(sb.buf, sb.len, blob_type, oid);
+			hash_object_file(the_hash_algo, sb.buf, sb.len,
+					 blob_type, oid);
 		else if (write_object_file(sb.buf, sb.len, blob_type, oid))
 			rc = error(_("%s: failed to insert into database"), path);
 		strbuf_release(&sb);
@@ -2219,10 +2370,8 @@ int for_each_file_in_obj_subdir(unsigned int subdir_nr,
 	strbuf_addch(path, '/');
 	baselen = path->len;
 
-	while ((de = readdir(dir))) {
+	while ((de = readdir_skip_dot_and_dotdot(dir))) {
 		size_t namelen;
-		if (is_dot_or_dotdot(de->d_name))
-			continue;
 
 		namelen = strlen(de->d_name);
 		strbuf_setlen(path, baselen);
@@ -2230,6 +2379,7 @@ int for_each_file_in_obj_subdir(unsigned int subdir_nr,
 		if (namelen == the_hash_algo->hexsz - 2 &&
 		    !hex_to_bytes(oid.hash + 1, de->d_name,
 				  the_hash_algo->rawsz - 1)) {
+			oid_set_algo(&oid, the_hash_algo);
 			if (obj_cb) {
 				r = obj_cb(&oid, path->buf, data);
 				if (r)
@@ -2313,39 +2463,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 = 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));
 }
@@ -2398,7 +2554,7 @@ static int check_stream_oid(git_zstream *stream,
 		return -1;
 	}
 
-	the_hash_algo->final_fn(real_oid.hash, &c);
+	the_hash_algo->final_oid_fn(&real_oid, &c);
 	if (!oideq(expected_oid, &real_oid)) {
 		error(_("hash mismatch for %s (expected %s)"), path,
 		      oid_to_hex(expected_oid));
@@ -2450,8 +2606,9 @@ int read_loose_object(const char *path,
 			git_inflate_end(&stream);
 			goto out;
 		}
-		if (check_object_signature(expected_oid, *contents,
-					 *size, type_name(*type))) {
+		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);
diff --git a/sha1-name.c b/object-name.c
index 200eb373ad..3263c19457 100644
--- a/sha1-name.c
+++ b/object-name.c
@@ -8,7 +8,7 @@
 #include "refs.h"
 #include "remote.h"
 #include "dir.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "packfile.h"
 #include "object-store.h"
 #include "repository.h"
@@ -85,32 +85,26 @@ static void update_candidates(struct disambiguate_state *ds, const struct object
 	/* otherwise, current can be discarded and candidate is still good */
 }
 
-static int match_sha(unsigned, const unsigned char *, const unsigned char *);
+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_sha(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_sha(unsigned len, const unsigned char *a, const unsigned char *b)
+static int match_hash(unsigned len, const unsigned char *a, const unsigned char *b)
 {
 	do {
 		if (*a != *b)
@@ -145,7 +139,7 @@ static void unique_in_midx(struct multi_pack_index *m,
 	for (i = first; i < num && !ds->ambiguous; i++) {
 		struct object_id oid;
 		current = nth_midxed_object_oid(&oid, m, i);
-		if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash))
+		if (!match_hash(ds->len, ds->bin_pfx.hash, current->hash))
 			break;
 		update_candidates(ds, current);
 	}
@@ -155,7 +149,6 @@ static void unique_in_pack(struct packed_git *p,
 			   struct disambiguate_state *ds)
 {
 	uint32_t num, i, first = 0;
-	const struct object_id *current = NULL;
 
 	if (p->multi_pack_index)
 		return;
@@ -173,10 +166,10 @@ static void unique_in_pack(struct packed_git *p,
 	 */
 	for (i = first; i < num && !ds->ambiguous; i++) {
 		struct object_id oid;
-		current = nth_packed_object_oid(&oid, p, i);
-		if (!match_sha(ds->len, ds->bin_pfx.hash, current->hash))
+		nth_packed_object_id(&oid, p, i);
+		if (!match_hash(ds->len, ds->bin_pfx.hash, oid.hash))
 			break;
-		update_candidates(ds, current);
+		update_candidates(ds, &oid);
 	}
 }
 
@@ -484,7 +477,7 @@ static enum get_oid_result get_short_oid(struct repository *r,
 	if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
 		struct oid_array collect = OID_ARRAY_INIT;
 
-		error(_("short SHA1 %s is ambiguous"), ds.hex_pfx);
+		error(_("short object ID %s is ambiguous"), ds.hex_pfx);
 
 		/*
 		 * We may still have ambiguity if we simply saw a series of
@@ -643,14 +636,14 @@ static void find_abbrev_len_for_pack(struct packed_git *p,
 	 */
 	mad->init_len = 0;
 	if (!match) {
-		if (nth_packed_object_oid(&oid, p, first))
+		if (!nth_packed_object_id(&oid, p, first))
 			extend_abbrev_len(&oid, mad);
 	} else if (first < num - 1) {
-		if (nth_packed_object_oid(&oid, p, first + 1))
+		if (!nth_packed_object_id(&oid, p, first + 1))
 			extend_abbrev_len(&oid, mad);
 	}
 	if (first > 0) {
-		if (nth_packed_object_oid(&oid, p, first - 1))
+		if (!nth_packed_object_id(&oid, p, first - 1))
 			extend_abbrev_len(&oid, mad);
 	}
 	mad->init_len = mad->cur_len;
@@ -810,7 +803,7 @@ static int get_oid_basic(struct repository *r, const char *str, int len,
 
 	if (len == r->hash_algo->hexsz && !get_oid_hex(str, oid)) {
 		if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
-			refs_found = repo_dwim_ref(r, str, len, &tmp_oid, &real_ref);
+			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)
@@ -861,11 +854,11 @@ static int get_oid_basic(struct repository *r, const char *str, int len,
 
 	if (!len && reflog_len)
 		/* allow "@{...}" to mean the current branch reflog */
-		refs_found = repo_dwim_ref(r, "HEAD", 4, oid, &real_ref);
+		refs_found = repo_dwim_ref(r, "HEAD", 4, oid, &real_ref, 0);
 	else if (reflog_len)
 		refs_found = repo_dwim_log(r, str, len, oid, &real_ref);
 	else
-		refs_found = repo_dwim_ref(r, str, len, oid, &real_ref);
+		refs_found = repo_dwim_ref(r, str, len, oid, &real_ref, 0);
 
 	if (!refs_found)
 		return -1;
@@ -908,26 +901,21 @@ static int get_oid_basic(struct repository *r, const char *str, int len,
 				real_ref, flags, at_time, nth, oid, NULL,
 				&co_time, &co_tz, &co_cnt)) {
 			if (!len) {
-				if (starts_with(real_ref, "refs/heads/")) {
-					str = real_ref + 11;
-					len = strlen(real_ref + 11);
-				} else {
-					/* detached HEAD */
+				if (!skip_prefix(real_ref, "refs/heads/", &str))
 					str = "HEAD";
-					len = 4;
-				}
+				len = strlen(str);
 			}
 			if (at_time) {
 				if (!(flags & GET_OID_QUIETLY)) {
-					warning("Log for '%.*s' only goes "
-						"back to %s.", len, str,
+					warning(_("log for '%.*s' only goes back to %s"),
+						len, str,
 						show_date(co_time, co_tz, DATE_MODE(RFC2822)));
 				}
 			} else {
 				if (flags & GET_OID_QUIETLY) {
 					exit(128);
 				}
-				die("Log for '%.*s' only has %d entries.",
+				die(_("log for '%.*s' only has %d entries"),
 				    len, str, co_cnt);
 			}
 		}
@@ -1433,9 +1421,12 @@ static int reinterpret(struct repository *r,
 	struct strbuf tmp = STRBUF_INIT;
 	int used = buf->len;
 	int ret;
+	struct interpret_branch_name_options options = {
+		.allowed = allowed
+	};
 
 	strbuf_add(buf, name + len, namelen - len);
-	ret = repo_interpret_branch_name(r, buf->buf, buf->len, &tmp, allowed);
+	ret = repo_interpret_branch_name(r, buf->buf, buf->len, &tmp, &options);
 	/* that data was not interpreted, remove our cruft */
 	if (ret < 0) {
 		strbuf_setlen(buf, used);
@@ -1477,7 +1468,7 @@ static int interpret_branch_mark(struct repository *r,
 				 int (*get_mark)(const char *, int),
 				 const char *(*get_data)(struct branch *,
 							 struct strbuf *),
-				 unsigned allowed)
+				 const struct interpret_branch_name_options *options)
 {
 	int len;
 	struct branch *branch;
@@ -1499,10 +1490,16 @@ static int interpret_branch_mark(struct repository *r,
 		branch = branch_get(NULL);
 
 	value = get_data(branch, &err);
-	if (!value)
-		die("%s", err.buf);
+	if (!value) {
+		if (options->nonfatal_dangling_mark) {
+			strbuf_release(&err);
+			return -1;
+		} else {
+			die("%s", err.buf);
+		}
+	}
 
-	if (!branch_interpret_allowed(value, allowed))
+	if (!branch_interpret_allowed(value, options->allowed))
 		return -1;
 
 	set_shortened_ref(r, buf, value);
@@ -1512,7 +1509,7 @@ static int interpret_branch_mark(struct repository *r,
 int repo_interpret_branch_name(struct repository *r,
 			       const char *name, int namelen,
 			       struct strbuf *buf,
-			       unsigned allowed)
+			       const struct interpret_branch_name_options *options)
 {
 	char *at;
 	const char *start;
@@ -1521,7 +1518,7 @@ int repo_interpret_branch_name(struct repository *r,
 	if (!namelen)
 		namelen = strlen(name);
 
-	if (!allowed || (allowed & INTERPRET_BRANCH_LOCAL)) {
+	if (!options->allowed || (options->allowed & INTERPRET_BRANCH_LOCAL)) {
 		len = interpret_nth_prior_checkout(r, name, namelen, buf);
 		if (!len) {
 			return len; /* syntax Ok, not enough switches */
@@ -1529,7 +1526,8 @@ int repo_interpret_branch_name(struct repository *r,
 			if (len == namelen)
 				return len; /* consumed all */
 			else
-				return reinterpret(r, name, namelen, len, buf, allowed);
+				return reinterpret(r, name, namelen, len, buf,
+						   options->allowed);
 		}
 	}
 
@@ -1537,22 +1535,22 @@ int repo_interpret_branch_name(struct repository *r,
 	     (at = memchr(start, '@', namelen - (start - name)));
 	     start = at + 1) {
 
-		if (!allowed || (allowed & INTERPRET_BRANCH_HEAD)) {
+		if (!options->allowed || (options->allowed & INTERPRET_BRANCH_HEAD)) {
 			len = interpret_empty_at(name, namelen, at - name, buf);
 			if (len > 0)
 				return reinterpret(r, name, namelen, len, buf,
-						   allowed);
+						   options->allowed);
 		}
 
 		len = interpret_branch_mark(r, name, namelen, at - name, buf,
 					    upstream_mark, branch_get_upstream,
-					    allowed);
+					    options);
 		if (len > 0)
 			return len;
 
 		len = interpret_branch_mark(r, name, namelen, at - name, buf,
 					    push_mark, branch_get_push,
-					    allowed);
+					    options);
 		if (len > 0)
 			return len;
 	}
@@ -1563,7 +1561,10 @@ int repo_interpret_branch_name(struct repository *r,
 void strbuf_branchname(struct strbuf *sb, const char *name, unsigned allowed)
 {
 	int len = strlen(name);
-	int used = interpret_branch_name(name, len, sb, allowed);
+	struct interpret_branch_name_options options = {
+		.allowed = allowed
+	};
+	int used = interpret_branch_name(name, len, sb, &options);
 
 	if (used < 0)
 		used = 0;
@@ -1692,14 +1693,14 @@ static void diagnose_invalid_oid_path(struct repository *r,
 		prefix = "";
 
 	if (file_exists(filename))
-		die("Path '%s' exists on disk, but not in '%.*s'.",
+		die(_("path '%s' exists on disk, but not in '%.*s'"),
 		    filename, object_name_len, object_name);
 	if (is_missing_file_error(errno)) {
 		char *fullname = xstrfmt("%s%s", prefix, filename);
 
 		if (!get_tree_entry(r, tree_oid, fullname, &oid, &mode)) {
-			die("Path '%s' exists, but not '%s'.\n"
-			    "Did you mean '%.*s:%s' aka '%.*s:./%s'?",
+			die(_("path '%s' exists, but not '%s'\n"
+			    "hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"),
 			    fullname,
 			    filename,
 			    object_name_len, object_name,
@@ -1707,7 +1708,7 @@ static void diagnose_invalid_oid_path(struct repository *r,
 			    object_name_len, object_name,
 			    filename);
 		}
-		die("Path '%s' does not exist in '%.*s'",
+		die(_("path '%s' does not exist in '%.*s'"),
 		    filename, object_name_len, object_name);
 	}
 }
@@ -1735,8 +1736,8 @@ static void diagnose_invalid_index_path(struct repository *r,
 		ce = istate->cache[pos];
 		if (ce_namelen(ce) == namelen &&
 		    !memcmp(ce->name, filename, namelen))
-			die("Path '%s' is in the index, but not at stage %d.\n"
-			    "Did you mean ':%d:%s'?",
+			die(_("path '%s' is in the index, but not at stage %d\n"
+			    "hint: Did you mean ':%d:%s'?"),
 			    filename, stage,
 			    ce_stage(ce), filename);
 	}
@@ -1751,17 +1752,17 @@ static void diagnose_invalid_index_path(struct repository *r,
 		ce = istate->cache[pos];
 		if (ce_namelen(ce) == fullname.len &&
 		    !memcmp(ce->name, fullname.buf, fullname.len))
-			die("Path '%s' is in the index, but not '%s'.\n"
-			    "Did you mean ':%d:%s' aka ':%d:./%s'?",
+			die(_("path '%s' is in the index, but not '%s'\n"
+			    "hint: Did you mean ':%d:%s' aka ':%d:./%s'?"),
 			    fullname.buf, filename,
 			    ce_stage(ce), fullname.buf,
 			    ce_stage(ce), filename);
 	}
 
 	if (repo_file_exists(r, filename))
-		die("Path '%s' exists on disk, but not in the index.", filename);
+		die(_("path '%s' exists on disk, but not in the index"), filename);
 	if (is_missing_file_error(errno))
-		die("Path '%s' does not exist (neither on disk nor in the index).",
+		die(_("path '%s' does not exist (neither on disk nor in the index)"),
 		    filename);
 
 	strbuf_release(&fullname);
@@ -1774,7 +1775,7 @@ static char *resolve_relative_path(struct repository *r, const char *rel)
 		return NULL;
 
 	if (r != the_repository || !is_inside_work_tree())
-		die("relative path syntax can't be used outside working tree.");
+		die(_("relative path syntax can't be used outside working tree"));
 
 	/* die() inside prefix_path() if resolved path is outside worktree */
 	return prefix_path(startup_info->prefix,
@@ -1804,7 +1805,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
 	if (!ret)
 		return ret;
 	/*
-	 * sha1:path --> object name of path in ent sha1
+	 * tree:path --> object name of path in tree
 	 * :path -> object name of absolute path in index
 	 * :./path -> object name of path relative to cwd in index
 	 * :[0-3]:path -> object name of path in index at stage
@@ -1821,8 +1822,8 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
 
 			cb.repo = repo;
 			cb.list = &list;
-			refs_for_each_ref(repo->refs, handle_one_ref, &cb);
-			refs_head_ref(repo->refs, handle_one_ref, &cb);
+			refs_for_each_ref(get_main_ref_store(repo), handle_one_ref, &cb);
+			refs_head_ref(get_main_ref_store(repo), handle_one_ref, &cb);
 			commit_list_sort_by_date(&list);
 			return get_oid_oneline(repo, name + 2, oid, list);
 		}
@@ -1912,7 +1913,7 @@ static enum get_oid_result get_oid_with_context_1(struct repository *repo,
 			return ret;
 		} else {
 			if (only_to_die)
-				die("Invalid object name '%.*s'.", len, name);
+				die(_("invalid object name '%.*s'."), len, name);
 		}
 	}
 	return ret;
@@ -1942,6 +1943,6 @@ enum get_oid_result get_oid_with_context(struct repository *repo,
 					 struct object_context *oc)
 {
 	if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
-		BUG("incompatible flags for get_sha1_with_context");
+		BUG("incompatible flags for get_oid_with_context");
 	return get_oid_with_context_1(repo, str, flags, NULL, oid, oc);
 }
diff --git a/object-store.h b/object-store.h
index 7f7b3cdd80..b4dc6668aa 100644
--- a/object-store.h
+++ b/object-store.h
@@ -4,8 +4,12 @@
 #include "cache.h"
 #include "oidmap.h"
 #include "list.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "strbuf.h"
+#include "thread-utils.h"
+#include "khash.h"
+#include "dir.h"
+#include "oidtree.h"
 
 struct object_directory {
 	struct object_directory *next;
@@ -19,8 +23,8 @@ 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;
 
 	/*
 	 * Path to the alternative object store. If this is a relative path,
@@ -29,6 +33,9 @@ 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);
 typedef int alt_odb_fn(struct object_directory *, void *);
@@ -53,13 +60,14 @@ void add_to_alternates_memory(const char *dir);
  * 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);
 
 struct packed_git {
+	struct hashmap_entry packmap_ent;
 	struct packed_git *next;
 	struct list_head mru;
 	struct pack_window *windows;
@@ -68,6 +76,7 @@ struct packed_git {
 	size_t index_size;
 	uint32_t num_objects;
 	uint32_t num_bad_objects;
+	uint32_t crc_offset;
 	unsigned char *bad_object_sha1;
 	int index_version;
 	time_t mtime;
@@ -82,12 +91,29 @@ struct packed_git {
 		 multi_pack_index:1;
 	unsigned char hash[GIT_MAX_RAWSZ];
 	struct revindex_entry *revindex;
+	const uint32_t *revindex_data;
+	const uint32_t *revindex_map;
+	size_t revindex_size;
 	/* something like ".git/objects/pack/xxxxx.pack" */
 	char pack_name[FLEX_ARRAY]; /* more */
 };
 
 struct multi_pack_index;
 
+static inline int pack_map_entry_cmp(const void *unused_cmp_data,
+				     const struct hashmap_entry *entry,
+				     const struct hashmap_entry *entry2,
+				     const void *keydata)
+{
+	const char *key = keydata;
+	const struct packed_git *pg1, *pg2;
+
+	pg1 = container_of(entry, const struct packed_git, packmap_ent);
+	pg2 = container_of(entry2, const struct packed_git, packmap_ent);
+
+	return strcmp(pg1->pack_name, key ? key : pg2->pack_name);
+}
+
 struct raw_object_store {
 	/*
 	 * Set of all object directories; the main directory is first (and
@@ -96,6 +122,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;
 
 	/*
@@ -110,6 +138,8 @@ struct raw_object_store {
 	 * (see git-replace(1)).
 	 */
 	struct oidmap *replace_map;
+	unsigned replace_map_initialized : 1;
+	pthread_mutex_t replace_mutex; /* protect object replace functions */
 
 	struct commit_graph *commit_graph;
 	unsigned commit_graph_attempted : 1; /* if loading has been attempted */
@@ -131,6 +161,17 @@ struct raw_object_store {
 	/* A most-recently-used ordered version of the packed_git list. */
 	struct list_head packed_git_mru;
 
+	struct {
+		struct packed_git **packs;
+		unsigned flags;
+	} kept_pack_cache;
+
+	/*
+	 * A map of packfiles to packed_git structs for tracking which
+	 * packs have been loaded already.
+	 */
+	struct hashmap pack_map;
+
 	/*
 	 * A fast, rough count of the number of objects in the repository.
 	 * These two fields are not meant for direct access. Use
@@ -177,8 +218,9 @@ static inline void *repo_read_object_file(struct repository *r,
 /* Read and unpack an object file into memory, write memory to an object file */
 int oid_object_info(struct repository *r, const struct object_id *, unsigned long *);
 
-int hash_object_file(const void *buf, unsigned long len,
-		     const char *type, struct object_id *oid);
+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);
@@ -187,6 +229,14 @@ int hash_object_file_literally(const void *buf, unsigned long len,
 			       const char *type, struct object_id *oid,
 			       unsigned flags);
 
+/*
+ * Add an object file to the in-memory object store, without writing it
+ * to disk.
+ *
+ * Callers are responsible for calling write_object_file to record the
+ * object in persistent storage before writing any other new objects
+ * that reference it.
+ */
 int pretend_object_file(void *, unsigned long, enum object_type,
 			struct object_id *oid);
 
@@ -205,12 +255,33 @@ int read_loose_object(const char *path,
 		      unsigned long *size,
 		      void **contents);
 
+/* Retry packed storage after checking packed and loose storage */
+#define HAS_OBJECT_RECHECK_PACKED 1
+
+/*
+ * Returns 1 if the object exists. This function will not lazily fetch objects
+ * in a partial clone.
+ */
+int has_object(struct repository *r, const struct object_id *oid,
+	       unsigned flags);
+
+/*
+ * These macros and functions are deprecated. If checking existence for an
+ * object that is likely to be missing and/or whose absence is relatively
+ * inconsequential (or is consequential but the caller is prepared to handle
+ * it), use has_object(), which has better defaults (no lazy fetch in a partial
+ * clone and no rechecking of packed storage). In the unlikely event that a
+ * caller needs to assert existence of an object that it fully expects to
+ * exist, and wants to trigger a lazy fetch in a partial clone, use
+ * oid_object_info_extended() with a NULL struct object_info.
+ *
+ * These functions can be removed once all callers have migrated to
+ * has_object() and/or oid_object_info_extended().
+ */
 #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
 #define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags)
 #define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1)
 #endif
-
-/* Same as the above, except for struct object_id. */
 int repo_has_object_file(struct repository *r, const struct object_id *oid);
 int repo_has_object_file_with_flags(struct repository *r,
 				    const struct object_id *oid, int flags);
@@ -228,12 +299,46 @@ int has_loose_object_nonlocal(const struct object_id *);
 
 void assert_oid_type(const struct object_id *oid, enum object_type expect);
 
+/*
+ * Enabling the object read lock allows multiple threads to safely call the
+ * following functions in parallel: repo_read_object_file(), read_object_file(),
+ * read_object_file_extended(), read_object_with_reference(), read_object(),
+ * oid_object_info() and oid_object_info_extended().
+ *
+ * obj_read_lock() and obj_read_unlock() may also be used to protect other
+ * section which cannot execute in parallel with object reading. Since the used
+ * lock is a recursive mutex, these sections can even contain calls to object
+ * reading functions. However, beware that in these cases zlib inflation won't
+ * be performed in parallel, losing performance.
+ *
+ * TODO: oid_object_info_extended()'s call stack has a recursive behavior. If
+ * any of its callees end up calling it, this recursive call won't benefit from
+ * parallel inflation.
+ */
+void enable_obj_read_lock(void);
+void disable_obj_read_lock(void);
+
+extern int obj_read_use_lock;
+extern pthread_mutex_t obj_read_mutex;
+
+static inline void obj_read_lock(void)
+{
+	if(obj_read_use_lock)
+		pthread_mutex_lock(&obj_read_mutex);
+}
+
+static inline void obj_read_unlock(void)
+{
+	if(obj_read_use_lock)
+		pthread_mutex_unlock(&obj_read_mutex);
+}
+
 struct object_info {
 	/* Request */
 	enum object_type *typep;
 	unsigned long *sizep;
 	off_t *disk_sizep;
-	unsigned char *delta_base_sha1;
+	struct object_id *delta_base_oid;
 	struct strbuf *type_name;
 	void **contentp;
 
@@ -271,8 +376,6 @@ struct object_info {
 #define OBJECT_INFO_LOOKUP_REPLACE 1
 /* Allow reading from a loose object file of unknown/bogus type */
 #define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2
-/* Do not check cached storage */
-#define OBJECT_INFO_SKIP_CACHED 4
 /* Do not retry packed storage after checking packed and loose storage */
 #define OBJECT_INFO_QUICK 8
 /* Do not check loose object */
@@ -352,6 +455,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 3b8b8c55c9..4e85955a94 100644
--- a/object.c
+++ b/object.c
@@ -127,7 +127,7 @@ static void grow_object_hash(struct repository *r)
 	int new_hash_size = r->parsed_objects->obj_hash_size < 32 ? 32 : 2 * r->parsed_objects->obj_hash_size;
 	struct object **new_hash;
 
-	new_hash = xcalloc(new_hash_size, sizeof(struct object *));
+	CALLOC_ARRAY(new_hash, new_hash_size);
 	for (i = 0; i < r->parsed_objects->obj_hash_size; i++) {
 		struct object *obj = r->parsed_objects->obj_hash[i];
 
@@ -157,13 +157,13 @@ void *create_object(struct repository *r, const struct object_id *oid, void *o)
 	return obj;
 }
 
-void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet)
+void *object_as_type(struct object *obj, enum object_type type, int quiet)
 {
 	if (obj->type == type)
 		return obj;
 	else if (obj->type == OBJ_NONE) {
 		if (type == OBJ_COMMIT)
-			init_commit_node(r, (struct commit *) obj);
+			init_commit_node((struct commit *) obj);
 		else
 			obj->type = type;
 		return obj;
@@ -177,15 +177,32 @@ void *object_as_type(struct repository *r, struct object *obj, enum object_type
 	}
 }
 
-struct object *lookup_unknown_object(const struct object_id *oid)
+struct object *lookup_unknown_object(struct repository *r, const struct object_id *oid)
 {
-	struct object *obj = lookup_object(the_repository, oid);
+	struct object *obj = lookup_object(r, oid);
 	if (!obj)
-		obj = create_object(the_repository, oid,
-				    alloc_object_node(the_repository));
+		obj = create_object(r, oid, alloc_object_node(r));
 	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:
+		die("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;
@@ -262,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(repl, NULL, 0, NULL) < 0) {
+		if (check_object_signature(r, repl, NULL, 0, NULL) < 0) {
 			error(_("hash mismatch %s"), oid_to_hex(oid));
 			return NULL;
 		}
@@ -272,7 +289,8 @@ 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(repl, buffer, size, type_name(type)) < 0) {
+		if (check_object_signature(r, repl, buffer, size,
+					   type_name(type)) < 0) {
 			free(buffer);
 			error(_("hash mismatch %s"), oid_to_hex(repl));
 			return NULL;
@@ -307,6 +325,15 @@ int object_list_contains(struct object_list *list, struct object *obj)
 	return 0;
 }
 
+void object_list_free(struct object_list **list)
+{
+	while (*list) {
+		struct object_list *p = *list;
+		*list = p->next;
+		free(p);
+	}
+}
+
 /*
  * A zero-length string to which object_array_entry::name can be
  * initialized without requiring a malloc/free.
@@ -402,15 +429,16 @@ void object_array_clear(struct object_array *array)
 }
 
 /*
- * Return true iff array already contains an entry with name.
+ * Return true if array already contains an entry.
  */
-static int contains_name(struct object_array *array, const char *name)
+static int contains_object(struct object_array *array,
+			   const struct object *item, const char *name)
 {
 	unsigned nr = array->nr, i;
 	struct object_array_entry *object = array->objects;
 
 	for (i = 0; i < nr; i++, object++)
-		if (!strcmp(object->name, name))
+		if (item == object->item && !strcmp(object->name, name))
 			return 1;
 	return 0;
 }
@@ -422,7 +450,8 @@ void object_array_remove_duplicates(struct object_array *array)
 
 	array->nr = 0;
 	for (src = 0; src < nr; src++) {
-		if (!contains_name(array, objects[src].name)) {
+		if (!contains_object(array, objects[src].item,
+				     objects[src].name)) {
 			if (src != array->nr)
 				objects[array->nr] = objects[src];
 			array->nr++;
@@ -443,12 +472,12 @@ void clear_object_flags(unsigned flags)
 	}
 }
 
-void clear_commit_marks_all(unsigned int flags)
+void repo_clear_commit_marks(struct repository *r, unsigned int flags)
 {
 	int i;
 
-	for (i = 0; i < the_repository->parsed_objects->obj_hash_size; i++) {
-		struct object *obj = the_repository->parsed_objects->obj_hash[i];
+	for (i = 0; i < r->parsed_objects->obj_hash_size; i++) {
+		struct object *obj = r->parsed_objects->obj_hash[i];
 		if (obj && obj->type == OBJ_COMMIT)
 			obj->flags &= ~flags;
 	}
@@ -466,7 +495,7 @@ struct parsed_object_pool *parsed_object_pool_new(void)
 	o->object_state = allocate_alloc_state();
 
 	o->is_shallow = -1;
-	o->shallow_stat = xcalloc(1, sizeof(*o->shallow_stat));
+	CALLOC_ARRAY(o->shallow_stat, 1);
 
 	o->buffer_slab = allocate_commit_buffer_slab();
 
@@ -479,6 +508,8 @@ struct raw_object_store *raw_object_store_new(void)
 
 	memset(o, 0, sizeof(*o));
 	INIT_LIST_HEAD(&o->packed_git_mru);
+	hashmap_init(&o->pack_map, pack_map_entry_cmp, NULL, 0);
+	pthread_mutex_init(&o->replace_mutex, NULL);
 	return o;
 }
 
@@ -498,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)
@@ -506,6 +539,7 @@ void raw_object_store_clear(struct raw_object_store *o)
 
 	oidmap_free(o->replace_map, 1);
 	FREE_AND_NULL(o->replace_map);
+	pthread_mutex_destroy(&o->replace_mutex);
 
 	free_commit_graph(o->commit_graph);
 	o->commit_graph = NULL;
@@ -518,6 +552,8 @@ void raw_object_store_clear(struct raw_object_store *o)
 	INIT_LIST_HEAD(&o->packed_git_mru);
 	close_object_store(o);
 	o->packed_git = NULL;
+
+	hashmap_clear(&o->pack_map);
 }
 
 void parsed_object_pool_clear(struct parsed_object_pool *o)
diff --git a/object.h b/object.h
index 25f5ab3d54..549f2d256b 100644
--- a/object.h
+++ b/object.h
@@ -15,7 +15,6 @@ struct parsed_object_pool {
 	struct alloc_state *commit_state;
 	struct alloc_state *tag_state;
 	struct alloc_state *object_state;
-	unsigned commit_count;
 
 	/* parent substitutions from .git/info/grafts and .git/shallow */
 	struct commit_graft **grafts;
@@ -26,6 +25,7 @@ struct parsed_object_pool {
 	char *alternate_shallow_file;
 
 	int commit_graft_prepared;
+	int substituted_parent;
 
 	struct buffer_slab *buffer_slab;
 };
@@ -59,27 +59,27 @@ struct object_array {
 
 /*
  * object flag allocation:
- * revision.h:               0---------10                              25----28
- * fetch-pack.c:             01
+ * revision.h:               0---------10         15             23------26
+ * fetch-pack.c:             01    67
  * negotiator/default.c:       2--5
  * walker.c:                 0-2
  * upload-pack.c:                4       11-----14  16-----19
  * builtin/blame.c:                        12-13
  * bisect.c:                                        16
  * bundle.c:                                        16
- * http-push.c:                                     16-----19
+ * http-push.c:                          11-----14
  * commit-graph.c:                                15
  * commit-reach.c:                                  16-----19
  * sha1-name.c:                                              20
  * list-objects-filter.c:                                      21
  * 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
  */
-#define FLAG_BITS  29
+#define FLAG_BITS  28
 
 /*
  * The object type is stored in 3 bits.
@@ -121,7 +121,7 @@ struct object *lookup_object(struct repository *r, const struct object_id *oid);
 
 void *create_object(struct repository *r, const struct object_id *oid, void *obj);
 
-void *object_as_type(struct repository *r, struct object *obj, enum object_type type, int quiet);
+void *object_as_type(struct object *obj, enum object_type type, int quiet);
 
 /*
  * Returns the object, having parsed it to find out what it is.
@@ -143,14 +143,34 @@ 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. **/
-struct object *lookup_unknown_object(const struct object_id *oid);
+/*
+ * 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);
 
 int object_list_contains(struct object_list *list, struct object *obj);
 
+void object_list_free(struct object_list **list);
+
 /* Object array handling .. */
 void add_object_array(struct object *obj, const char *name, struct object_array *array);
 void add_object_array_with_path(struct object *obj, const char *name, struct object_array *array, unsigned mode, const char *path);
@@ -188,8 +208,9 @@ void object_array_clear(struct object_array *array);
 void clear_object_flags(unsigned flags);
 
 /*
- * Clear the specified object flags from all in-core commit objects.
+ * Clear the specified object flags from all in-core commit objects from
+ * the specified repository.
  */
-void clear_commit_marks_all(unsigned int flags);
+void repo_clear_commit_marks(struct repository *r, unsigned int flags);
 
 #endif /* OBJECT_H */
diff --git a/sha1-array.c b/oid-array.c
index d922e94e3f..73ba76e9e9 100644
--- a/sha1-array.c
+++ b/oid-array.c
@@ -1,6 +1,6 @@
 #include "cache.h"
-#include "sha1-array.h"
-#include "sha1-lookup.h"
+#include "oid-array.h"
+#include "hash-lookup.h"
 
 void oid_array_append(struct oid_array *array, const struct object_id *oid)
 {
@@ -14,23 +14,24 @@ static int void_hashcmp(const void *a, const void *b)
 	return oidcmp(a, b);
 }
 
-static void oid_array_sort(struct oid_array *array)
+void oid_array_sort(struct oid_array *array)
 {
+	if (array->sorted)
+		return;
 	QSORT(array->oid, array->nr, void_hashcmp);
 	array->sorted = 1;
 }
 
-static const unsigned char *sha1_access(size_t index, void *table)
+static const struct object_id *oid_access(size_t index, const void *table)
 {
-	struct object_id *array = table;
-	return array[index].hash;
+	const struct object_id *array = table;
+	return &array[index];
 }
 
 int oid_array_lookup(struct oid_array *array, const struct object_id *oid)
 {
-	if (!array->sorted)
-		oid_array_sort(array);
-	return sha1_pos(oid->hash, array->oid, array->nr, sha1_access);
+	oid_array_sort(array);
+	return oid_pos(oid, array->oid, array->nr, oid_access);
 }
 
 void oid_array_clear(struct oid_array *array)
@@ -46,9 +47,9 @@ int oid_array_for_each(struct oid_array *array,
 		       for_each_oid_fn fn,
 		       void *data)
 {
-	int i;
+	size_t i;
 
-	/* No oid_array_sort() here! See the api-oid-array.txt docs! */
+	/* No oid_array_sort() here! See oid-array.h */
 
 	for (i = 0; i < array->nr; i++) {
 		int ret = fn(array->oid + i, data);
@@ -62,16 +63,12 @@ int oid_array_for_each_unique(struct oid_array *array,
 			      for_each_oid_fn fn,
 			      void *data)
 {
-	int i;
+	size_t i;
 
-	if (!array->sorted)
-		oid_array_sort(array);
+	oid_array_sort(array);
 
-	for (i = 0; i < array->nr; i++) {
-		int ret;
-		if (i > 0 && oideq(array->oid + i, array->oid + i - 1))
-			continue;
-		ret = fn(array->oid + i, data);
+	for (i = 0; i < array->nr; i = oid_array_next_unique(array, i)) {
+		int ret = fn(array->oid + i, data);
 		if (ret)
 			return ret;
 	}
@@ -82,7 +79,7 @@ void oid_array_filter(struct oid_array *array,
 		      for_each_oid_fn want,
 		      void *cb_data)
 {
-	unsigned nr = array->nr, src, dst;
+	size_t nr = array->nr, src, dst;
 	struct object_id *oids = array->oid;
 
 	for (src = dst = 0; src < nr; src++) {
diff --git a/oid-array.h b/oid-array.h
new file mode 100644
index 0000000000..72bca78b7d
--- /dev/null
+++ b/oid-array.h
@@ -0,0 +1,137 @@
+#ifndef OID_ARRAY_H
+#define OID_ARRAY_H
+
+#include "hash.h"
+
+/**
+ * The API provides storage and manipulation of sets of object identifiers.
+ * The emphasis is on storage and processing efficiency, making them suitable
+ * for large lists. Note that the ordering of items is not preserved over some
+ * operations.
+ *
+ * Examples
+ * --------
+ * -----------------------------------------
+ * int print_callback(const struct object_id *oid,
+ * 		    void *data)
+ * {
+ * 	printf("%s\n", oid_to_hex(oid));
+ * 	return 0; // always continue
+ * }
+ *
+ * void some_func(void)
+ * {
+ *     struct oid_array hashes = OID_ARRAY_INIT;
+ *     struct object_id oid;
+ *
+ *     // Read objects into our set
+ *     while (read_object_from_stdin(oid.hash))
+ *         oid_array_append(&hashes, &oid);
+ *
+ *     // Check if some objects are in our set
+ *     while (read_object_from_stdin(oid.hash)) {
+ *         if (oid_array_lookup(&hashes, &oid) >= 0)
+ *             printf("it's in there!\n");
+ *
+ *          // Print the unique set of objects. We could also have
+ *          // avoided adding duplicate objects in the first place,
+ *          // but we would end up re-sorting the array repeatedly.
+ *          // Instead, this will sort once and then skip duplicates
+ *          // in linear time.
+ *
+ *         oid_array_for_each_unique(&hashes, print_callback, NULL);
+ *     }
+ */
+
+/**
+ * A single array of object IDs. This should be initialized by assignment from
+ * `OID_ARRAY_INIT`. The `oid` member contains the actual data. The `nr` member
+ * contains the number of items in the set. The `alloc` and `sorted` members
+ * are used internally, and should not be needed by API callers.
+ */
+struct oid_array {
+	struct object_id *oid;
+	size_t nr;
+	size_t alloc;
+	int sorted;
+};
+
+#define OID_ARRAY_INIT { NULL, 0, 0, 0 }
+
+/**
+ * Add an item to the set. The object ID will be placed at the end of the array
+ * (but note that some operations below may lose this ordering).
+ */
+void oid_array_append(struct oid_array *array, const struct object_id *oid);
+
+/**
+ * Perform a binary search of the array for a specific object ID. If found,
+ * returns the offset (in number of elements) of the object ID. If not found,
+ * returns a negative integer. If the array is not sorted, this function has
+ * the side effect of sorting it.
+ */
+int oid_array_lookup(struct oid_array *array, const struct object_id *oid);
+
+/**
+ * Free all memory associated with the array and return it to the initial,
+ * empty state.
+ */
+void oid_array_clear(struct oid_array *array);
+
+typedef int (*for_each_oid_fn)(const struct object_id *oid,
+			       void *data);
+/**
+ * Iterate over each element of the list, executing the callback function for
+ * each one. Does not sort the list, so any custom hash order is retained.
+ * If the callback returns a non-zero value, the iteration ends immediately
+ * and the callback's return is propagated; otherwise, 0 is returned.
+ */
+int oid_array_for_each(struct oid_array *array,
+		       for_each_oid_fn fn,
+		       void *data);
+
+/**
+ * Iterate over each unique element of the list in sorted order, but otherwise
+ * behave like `oid_array_for_each`. If the array is not sorted, this function
+ * has the side effect of sorting it.
+ */
+int oid_array_for_each_unique(struct oid_array *array,
+			      for_each_oid_fn fn,
+			      void *data);
+
+/**
+ * Apply the callback function `want` to each entry in the array, retaining
+ * only the entries for which the function returns true. Preserve the order
+ * of the entries that are retained.
+ */
+void oid_array_filter(struct oid_array *array,
+		      for_each_oid_fn want,
+		      void *cbdata);
+
+/**
+ * Sort the array in order of ascending object id.
+ */
+void oid_array_sort(struct oid_array *array);
+
+/**
+ * Find the next unique oid in the array after position "cur".
+ * The array must be sorted for this to work. You can iterate
+ * over unique elements like this:
+ *
+ *   size_t i;
+ *   oid_array_sort(array);
+ *   for (i = 0; i < array->nr; i = oid_array_next_unique(array, i))
+ *	printf("%s", oid_to_hex(array->oids[i]);
+ *
+ * Non-unique iteration can just increment with "i++" to visit each element.
+ */
+static inline size_t oid_array_next_unique(struct oid_array *array, size_t cur)
+{
+	do {
+		cur++;
+	} while (cur < array->nr &&
+		 oideq(array->oid + cur, array->oid + cur - 1));
+	return cur;
+}
+
+#endif /* OID_ARRAY_H */
diff --git a/oidmap.c b/oidmap.c
index 423aa014a3..286a04a53c 100644
--- a/oidmap.c
+++ b/oidmap.c
@@ -27,7 +27,7 @@ void oidmap_free(struct oidmap *map, int free_entries)
 		return;
 
 	/* TODO: make oidmap itself not depend on struct layouts */
-	hashmap_free_(&map->map, free_entries ? 0 : -1);
+	hashmap_clear_(&map->map, free_entries ? 0 : -1);
 }
 
 void *oidmap_get(const struct oidmap *map, const struct object_id *key)
diff --git a/oidset.c b/oidset.c
index f63ce818f6..5aac633c1f 100644
--- a/oidset.c
+++ b/oidset.c
@@ -36,8 +36,19 @@ 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);
+}
+
+void oidset_parse_file_carefully(struct oidset *set, const char *path,
+				 oidset_parse_tweak_fn fn, void *cbdata)
+{
 	FILE *fp;
 	struct strbuf sb = STRBUF_INIT;
 	struct object_id oid;
@@ -63,6 +74,8 @@ void oidset_parse_file(struct oidset *set, const char *path)
 
 		if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0')
 			die("invalid object name: %s", sb.buf);
+		if (fn && fn(&oid, cbdata))
+			continue;
 		oidset_insert(set, &oid);
 	}
 	if (ferror(fp))
diff --git a/oidset.h b/oidset.h
index 5346563b0b..01f6560283 100644
--- a/oidset.h
+++ b/oidset.h
@@ -1,11 +1,10 @@
 #ifndef OIDSET_H
 #define OIDSET_H
 
-#include "hashmap.h"
 #include "khash.h"
 
 /**
- * This API is similar to sha1-array, in that it maintains a set of object ids
+ * This API is similar to oid-array, in that it maintains a set of object ids
  * in a memory-efficient way. The major differences are:
  *
  *   1. It uses a hash, so we can do online duplicate removal, rather than
@@ -56,6 +55,11 @@ int oidset_insert(struct oidset *set, const struct object_id *oid);
 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);
+
+/**
  * Remove all entries from the oidset, freeing any resources associated with
  * it.
  */
@@ -69,6 +73,15 @@ void oidset_clear(struct oidset *set);
  */
 void oidset_parse_file(struct oidset *set, const char *path);
 
+/*
+ * Similar to the above, but with a callback which can (1) return non-zero to
+ * signal displeasure with the object and (2) replace object ID with something
+ * else (meant to be used to "peel").
+ */
+typedef int (*oidset_parse_tweak_fn)(struct object_id *, void *);
+void oidset_parse_file_carefully(struct oidset *set, const char *path,
+				 oidset_parse_tweak_fn fn, void *cbdata);
+
 struct oidset_iter {
 	kh_oid_set_t *set;
 	khiter_t iter;
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 a7a4964b50..88d9e696a5 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -9,9 +9,10 @@
 #include "pack-revindex.h"
 #include "pack.h"
 #include "pack-bitmap.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 #include "pack-objects.h"
 #include "commit-reach.h"
+#include "prio-queue.h"
 
 struct bitmapped_commit {
 	struct commit *commit;
@@ -29,7 +30,6 @@ struct bitmap_writer {
 	struct ewah_bitmap *tags;
 
 	kh_oid_map_t *bitmaps;
-	kh_oid_map_t *reused;
 	struct packing_data *to_pack;
 
 	struct bitmapped_commit *selected;
@@ -110,10 +110,8 @@ void bitmap_writer_build_type_index(struct packing_data *to_pack,
 /**
  * Compute the actual bitmaps
  */
-static struct object **seen_objects;
-static unsigned int seen_objects_nr, seen_objects_alloc;
 
-static inline void push_bitmapped_commit(struct commit *commit, struct ewah_bitmap *reused)
+static inline void push_bitmapped_commit(struct commit *commit)
 {
 	if (writer.selected_nr >= writer.selected_alloc) {
 		writer.selected_alloc = (writer.selected_alloc + 32) * 2;
@@ -121,27 +119,12 @@ static inline void push_bitmapped_commit(struct commit *commit, struct ewah_bitm
 	}
 
 	writer.selected[writer.selected_nr].commit = commit;
-	writer.selected[writer.selected_nr].bitmap = reused;
+	writer.selected[writer.selected_nr].bitmap = NULL;
 	writer.selected[writer.selected_nr].flags = 0;
 
 	writer.selected_nr++;
 }
 
-static inline void mark_as_seen(struct object *object)
-{
-	ALLOC_GROW(seen_objects, seen_objects_nr + 1, seen_objects_alloc);
-	seen_objects[seen_objects_nr++] = object;
-}
-
-static inline void reset_all_seen(void)
-{
-	unsigned int i;
-	for (i = 0; i < seen_objects_nr; ++i) {
-		seen_objects[i]->flags &= ~(SEEN | ADDED | SHOWN);
-	}
-	seen_objects_nr = 0;
-}
-
 static uint32_t find_object_pos(const struct object_id *oid)
 {
 	struct object_entry *entry = packlist_find(writer.to_pack, oid);
@@ -154,60 +137,6 @@ static uint32_t find_object_pos(const struct object_id *oid)
 	return oe_in_pack_pos(writer.to_pack, entry);
 }
 
-static void show_object(struct object *object, const char *name, void *data)
-{
-	struct bitmap *base = data;
-	bitmap_set(base, find_object_pos(&object->oid));
-	mark_as_seen(object);
-}
-
-static void show_commit(struct commit *commit, void *data)
-{
-	mark_as_seen((struct object *)commit);
-}
-
-static int
-add_to_include_set(struct bitmap *base, struct commit *commit)
-{
-	khiter_t hash_pos;
-	uint32_t bitmap_pos = find_object_pos(&commit->object.oid);
-
-	if (bitmap_get(base, bitmap_pos))
-		return 0;
-
-	hash_pos = kh_get_oid_map(writer.bitmaps, commit->object.oid);
-	if (hash_pos < kh_end(writer.bitmaps)) {
-		struct bitmapped_commit *bc = kh_value(writer.bitmaps, hash_pos);
-		bitmap_or_ewah(base, bc->bitmap);
-		return 0;
-	}
-
-	bitmap_set(base, bitmap_pos);
-	return 1;
-}
-
-static int
-should_include(struct commit *commit, void *_data)
-{
-	struct bitmap *base = _data;
-
-	if (!add_to_include_set(base, commit)) {
-		struct commit_list *parent = commit->parents;
-
-		mark_as_seen((struct object *)commit);
-
-		while (parent) {
-			parent->item->object.flags |= SEEN;
-			mark_as_seen((struct object *)parent->item);
-			parent = parent->next;
-		}
-
-		return 0;
-	}
-
-	return 1;
-}
-
 static void compute_xor_offsets(void)
 {
 	static const int MAX_XOR_OFFSET_SEARCH = 10;
@@ -248,79 +177,326 @@ static void compute_xor_offsets(void)
 	}
 }
 
-void bitmap_writer_build(struct packing_data *to_pack)
-{
-	static const double REUSE_BITMAP_THRESHOLD = 0.2;
+struct bb_commit {
+	struct commit_list *reverse_edges;
+	struct bitmap *commit_mask;
+	struct bitmap *bitmap;
+	unsigned selected:1,
+		 maximal:1;
+	unsigned idx; /* within selected array */
+};
 
-	int i, reuse_after, need_reset;
-	struct bitmap *base = bitmap_new();
-	struct rev_info revs;
+define_commit_slab(bb_data, struct bb_commit);
 
-	writer.bitmaps = kh_init_oid_map();
-	writer.to_pack = to_pack;
+struct bitmap_builder {
+	struct bb_data data;
+	struct commit **commits;
+	size_t commits_nr, commits_alloc;
+};
 
-	if (writer.show_progress)
-		writer.progress = start_progress("Building bitmaps", writer.selected_nr);
+static void bitmap_builder_init(struct bitmap_builder *bb,
+				struct bitmap_writer *writer,
+				struct bitmap_index *old_bitmap)
+{
+	struct rev_info revs;
+	struct commit *commit;
+	struct commit_list *reusable = NULL;
+	struct commit_list *r;
+	unsigned int i, num_maximal = 0;
 
-	repo_init_revisions(to_pack->repo, &revs, NULL);
-	revs.tag_objects = 1;
-	revs.tree_objects = 1;
-	revs.blob_objects = 1;
-	revs.no_walk = 0;
+	memset(bb, 0, sizeof(*bb));
+	init_bb_data(&bb->data);
 
-	revs.include_check = should_include;
 	reset_revision_walk();
+	repo_init_revisions(writer->to_pack->repo, &revs, NULL);
+	revs.topo_order = 1;
+	revs.first_parent_only = 1;
+
+	for (i = 0; i < writer->selected_nr; i++) {
+		struct commit *c = writer->selected[i].commit;
+		struct bb_commit *ent = bb_data_at(&bb->data, c);
+
+		ent->selected = 1;
+		ent->maximal = 1;
+		ent->idx = i;
+
+		ent->commit_mask = bitmap_new();
+		bitmap_set(ent->commit_mask, i);
+
+		add_pending_object(&revs, &c->object, "");
+	}
+
+	if (prepare_revision_walk(&revs))
+		die("revision walk setup failed");
+
+	while ((commit = get_revision(&revs))) {
+		struct commit_list *p = commit->parents;
+		struct bb_commit *c_ent;
+
+		parse_commit_or_die(commit);
+
+		c_ent = bb_data_at(&bb->data, commit);
+
+		/*
+		 * If there is no commit_mask, there is no reason to iterate
+		 * over this commit; it is not selected (if it were, it would
+		 * not have a blank commit mask) and all its children have
+		 * existing bitmaps (see the comment starting with "This commit
+		 * has an existing bitmap" below), so it does not contribute
+		 * anything to the final bitmap file or its descendants.
+		 */
+		if (!c_ent->commit_mask)
+			continue;
+
+		if (old_bitmap && bitmap_for_commit(old_bitmap, commit)) {
+			/*
+			 * This commit has an existing bitmap, so we can
+			 * get its bits immediately without an object
+			 * walk. That is, it is reusable as-is and there is no
+			 * need to continue walking beyond it.
+			 *
+			 * Mark it as such and add it to bb->commits separately
+			 * to avoid allocating a position in the commit mask.
+			 */
+			commit_list_insert(commit, &reusable);
+			goto next;
+		}
+
+		if (c_ent->maximal) {
+			num_maximal++;
+			ALLOC_GROW(bb->commits, bb->commits_nr + 1, bb->commits_alloc);
+			bb->commits[bb->commits_nr++] = commit;
+		}
+
+		if (p) {
+			struct bb_commit *p_ent = bb_data_at(&bb->data, p->item);
+			int c_not_p, p_not_c;
+
+			if (!p_ent->commit_mask) {
+				p_ent->commit_mask = bitmap_new();
+				c_not_p = 1;
+				p_not_c = 0;
+			} else {
+				c_not_p = bitmap_is_subset(c_ent->commit_mask, p_ent->commit_mask);
+				p_not_c = bitmap_is_subset(p_ent->commit_mask, c_ent->commit_mask);
+			}
+
+			if (!c_not_p)
+				continue;
+
+			bitmap_or(p_ent->commit_mask, c_ent->commit_mask);
+
+			if (p_not_c)
+				p_ent->maximal = 1;
+			else {
+				p_ent->maximal = 0;
+				free_commit_list(p_ent->reverse_edges);
+				p_ent->reverse_edges = NULL;
+			}
 
-	reuse_after = writer.selected_nr * REUSE_BITMAP_THRESHOLD;
-	need_reset = 0;
+			if (c_ent->maximal) {
+				commit_list_insert(commit, &p_ent->reverse_edges);
+			} else {
+				struct commit_list *cc = c_ent->reverse_edges;
+
+				for (; cc; cc = cc->next) {
+					if (!commit_list_contains(cc->item, p_ent->reverse_edges))
+						commit_list_insert(cc->item, &p_ent->reverse_edges);
+				}
+			}
+		}
+
+next:
+		bitmap_free(c_ent->commit_mask);
+		c_ent->commit_mask = NULL;
+	}
+
+	for (r = reusable; r; r = r->next) {
+		ALLOC_GROW(bb->commits, bb->commits_nr + 1, bb->commits_alloc);
+		bb->commits[bb->commits_nr++] = r->item;
+	}
+
+	trace2_data_intmax("pack-bitmap-write", the_repository,
+			   "num_selected_commits", writer->selected_nr);
+	trace2_data_intmax("pack-bitmap-write", the_repository,
+			   "num_maximal_commits", num_maximal);
+
+	free_commit_list(reusable);
+}
+
+static void bitmap_builder_clear(struct bitmap_builder *bb)
+{
+	clear_bb_data(&bb->data);
+	free(bb->commits);
+	bb->commits_nr = bb->commits_alloc = 0;
+}
+
+static void fill_bitmap_tree(struct bitmap *bitmap,
+			     struct tree *tree)
+{
+	uint32_t pos;
+	struct tree_desc desc;
+	struct name_entry entry;
+
+	/*
+	 * 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);
+	if (bitmap_get(bitmap, pos))
+		return;
+	bitmap_set(bitmap, pos);
 
-	for (i = writer.selected_nr - 1; i >= 0; --i) {
-		struct bitmapped_commit *stored;
-		struct object *object;
+	if (parse_tree(tree) < 0)
+		die("unable to load tree object %s",
+		    oid_to_hex(&tree->object.oid));
+	init_tree_desc(&desc, tree->buffer, tree->size);
 
-		khiter_t hash_pos;
-		int hash_ret;
+	while (tree_entry(&desc, &entry)) {
+		switch (object_type(entry.mode)) {
+		case OBJ_TREE:
+			fill_bitmap_tree(bitmap,
+					 lookup_tree(the_repository, &entry.oid));
+			break;
+		case OBJ_BLOB:
+			bitmap_set(bitmap, find_object_pos(&entry.oid));
+			break;
+		default:
+			/* Gitlink, etc; not reachable */
+			break;
+		}
+	}
 
-		stored = &writer.selected[i];
-		object = (struct object *)stored->commit;
+	free_tree_buffer(tree);
+}
 
-		if (stored->bitmap == NULL) {
-			if (i < writer.selected_nr - 1 &&
-			    (need_reset ||
-			     !in_merge_bases(writer.selected[i + 1].commit,
-					     stored->commit))) {
-			    bitmap_reset(base);
-			    reset_all_seen();
+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)
+{
+	if (!ent->bitmap)
+		ent->bitmap = bitmap_new();
+
+	prio_queue_put(queue, commit);
+
+	while (queue->nr) {
+		struct commit_list *p;
+		struct commit *c = prio_queue_get(queue);
+
+		if (old_bitmap && mapping) {
+			struct ewah_bitmap *old = bitmap_for_commit(old_bitmap, c);
+			/*
+			 * If this commit has an old bitmap, then translate that
+			 * bitmap and add its bits to this one. No need to walk
+			 * parents or the tree for this commit.
+			 */
+			if (old && !rebuild_bitmap(mapping, old, ent->bitmap))
+				continue;
+		}
+
+		/*
+		 * Mark ourselves and queue our tree. The commit
+		 * walk ensures we cover all parents.
+		 */
+		bitmap_set(ent->bitmap, find_object_pos(&c->object.oid));
+		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);
+			if (!bitmap_get(ent->bitmap, pos)) {
+				bitmap_set(ent->bitmap, pos);
+				prio_queue_put(queue, p->item);
 			}
+		}
+	}
 
-			add_pending_object(&revs, object, "");
-			revs.include_check_data = base;
+	while (tree_queue->nr)
+		fill_bitmap_tree(ent->bitmap, prio_queue_get(tree_queue));
+}
 
-			if (prepare_revision_walk(&revs))
-				die("revision walk setup failed");
+static void store_selected(struct bb_commit *ent, struct commit *commit)
+{
+	struct bitmapped_commit *stored = &writer.selected[ent->idx];
+	khiter_t hash_pos;
+	int hash_ret;
 
-			traverse_commit_list(&revs, show_commit, show_object, base);
+	stored->bitmap = bitmap_to_ewah(ent->bitmap);
 
-			object_array_clear(&revs.pending);
+	hash_pos = kh_put_oid_map(writer.bitmaps, commit->object.oid, &hash_ret);
+	if (hash_ret == 0)
+		die("Duplicate entry when writing index: %s",
+		    oid_to_hex(&commit->object.oid));
+	kh_value(writer.bitmaps, hash_pos) = stored;
+}
 
-			stored->bitmap = bitmap_to_ewah(base);
-			need_reset = 0;
-		} else
-			need_reset = 1;
+void bitmap_writer_build(struct packing_data *to_pack)
+{
+	struct bitmap_builder bb;
+	size_t i;
+	int nr_stored = 0; /* for progress */
+	struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
+	struct prio_queue tree_queue = { NULL };
+	struct bitmap_index *old_bitmap;
+	uint32_t *mapping;
 
-		if (i >= reuse_after)
-			stored->flags |= BITMAP_FLAG_REUSE;
+	writer.bitmaps = kh_init_oid_map();
+	writer.to_pack = to_pack;
 
-		hash_pos = kh_put_oid_map(writer.bitmaps, object->oid, &hash_ret);
-		if (hash_ret == 0)
-			die("Duplicate entry when writing index: %s",
-			    oid_to_hex(&object->oid));
+	if (writer.show_progress)
+		writer.progress = start_progress("Building bitmaps", writer.selected_nr);
+	trace2_region_enter("pack-bitmap-write", "building_bitmaps_total",
+			    the_repository);
+
+	old_bitmap = prepare_bitmap_git(to_pack->repo);
+	if (old_bitmap)
+		mapping = create_bitmap_mapping(old_bitmap, to_pack);
+	else
+		mapping = NULL;
+
+	bitmap_builder_init(&bb, &writer, old_bitmap);
+	for (i = bb.commits_nr; i > 0; i--) {
+		struct commit *commit = bb.commits[i-1];
+		struct bb_commit *ent = bb_data_at(&bb.data, commit);
+		struct commit *child;
+		int reused = 0;
+
+		fill_bitmap_commit(ent, commit, &queue, &tree_queue,
+				   old_bitmap, mapping);
+
+		if (ent->selected) {
+			store_selected(ent, commit);
+			nr_stored++;
+			display_progress(writer.progress, nr_stored);
+		}
 
-		kh_value(writer.bitmaps, hash_pos) = stored;
-		display_progress(writer.progress, writer.selected_nr - i);
+		while ((child = pop_commit(&ent->reverse_edges))) {
+			struct bb_commit *child_ent =
+				bb_data_at(&bb.data, child);
+
+			if (child_ent->bitmap)
+				bitmap_or(child_ent->bitmap, ent->bitmap);
+			else if (reused)
+				child_ent->bitmap = bitmap_dup(ent->bitmap);
+			else {
+				child_ent->bitmap = ent->bitmap;
+				reused = 1;
+			}
+		}
+		if (!reused)
+			bitmap_free(ent->bitmap);
+		ent->bitmap = NULL;
 	}
+	clear_prio_queue(&queue);
+	clear_prio_queue(&tree_queue);
+	bitmap_builder_clear(&bb);
+	free(mapping);
+
+	trace2_region_leave("pack-bitmap-write", "building_bitmaps_total",
+			    the_repository);
 
-	bitmap_free(base);
 	stop_progress(&writer.progress);
 
 	compute_xor_offsets();
@@ -360,35 +536,6 @@ static int date_compare(const void *_a, const void *_b)
 	return (long)b->date - (long)a->date;
 }
 
-void bitmap_writer_reuse_bitmaps(struct packing_data *to_pack)
-{
-	struct bitmap_index *bitmap_git;
-	if (!(bitmap_git = prepare_bitmap_git(to_pack->repo)))
-		return;
-
-	writer.reused = kh_init_oid_map();
-	rebuild_existing_bitmaps(bitmap_git, to_pack, writer.reused,
-				 writer.show_progress);
-	/*
-	 * NEEDSWORK: rebuild_existing_bitmaps() makes writer.reused reference
-	 * some bitmaps in bitmap_git, so we can't free the latter.
-	 */
-}
-
-static struct ewah_bitmap *find_reused_bitmap(const struct object_id *oid)
-{
-	khiter_t hash_pos;
-
-	if (!writer.reused)
-		return NULL;
-
-	hash_pos = kh_get_oid_map(writer.reused, *oid);
-	if (hash_pos >= kh_end(writer.reused))
-		return NULL;
-
-	return kh_value(writer.reused, hash_pos);
-}
-
 void bitmap_writer_select_commits(struct commit **indexed_commits,
 				  unsigned int indexed_commits_nr,
 				  int max_bitmaps)
@@ -402,12 +549,11 @@ void bitmap_writer_select_commits(struct commit **indexed_commits,
 
 	if (indexed_commits_nr < 100) {
 		for (i = 0; i < indexed_commits_nr; ++i)
-			push_bitmapped_commit(indexed_commits[i], NULL);
+			push_bitmapped_commit(indexed_commits[i]);
 		return;
 	}
 
 	for (;;) {
-		struct ewah_bitmap *reused_bitmap = NULL;
 		struct commit *chosen = NULL;
 
 		next = next_commit_index(i);
@@ -422,15 +568,13 @@ void bitmap_writer_select_commits(struct commit **indexed_commits,
 
 		if (next == 0) {
 			chosen = indexed_commits[i];
-			reused_bitmap = find_reused_bitmap(&chosen->object.oid);
 		} else {
 			chosen = indexed_commits[i + next];
 
 			for (j = 0; j <= next; ++j) {
 				struct commit *cm = indexed_commits[i + j];
 
-				reused_bitmap = find_reused_bitmap(&cm->object.oid);
-				if (reused_bitmap || (cm->object.flags & NEEDS_BITMAP) != 0) {
+				if ((cm->object.flags & NEEDS_BITMAP) != 0) {
 					chosen = cm;
 					break;
 				}
@@ -440,7 +584,7 @@ void bitmap_writer_select_commits(struct commit **indexed_commits,
 			}
 		}
 
-		push_bitmapped_commit(chosen, reused_bitmap);
+		push_bitmapped_commit(chosen);
 
 		i += next + 1;
 		display_progress(writer.progress, i);
@@ -466,10 +610,10 @@ static inline void dump_bitmap(struct hashfile *f, struct ewah_bitmap *bitmap)
 		die("Failed to write bitmap index");
 }
 
-static const unsigned char *sha1_access(size_t pos, void *table)
+static const struct object_id *oid_access(size_t pos, const void *table)
 {
-	struct pack_idx_entry **index = table;
-	return index[pos]->oid.hash;
+	const struct pack_idx_entry * const *index = table;
+	return &index[pos]->oid;
 }
 
 static void write_selected_commits_v1(struct hashfile *f,
@@ -482,7 +626,7 @@ static void write_selected_commits_v1(struct hashfile *f,
 		struct bitmapped_commit *stored = &writer.selected[i];
 
 		int commit_pos =
-			sha1_pos(stored->commit->object.oid.hash, index, index_nr, sha1_access);
+			oid_pos(&stored->commit->object.oid, index, index_nr, oid_access);
 
 		if (commit_pos < 0)
 			BUG("trying to write commit not in index");
@@ -503,8 +647,7 @@ static void write_hash_cache(struct hashfile *f,
 
 	for (i = 0; i < index_nr; ++i) {
 		struct object_entry *entry = (struct object_entry *)index[i];
-		uint32_t hash_value = htonl(entry->hash);
-		hashwrite(f, &hash_value, sizeof(hash_value));
+		hashwrite_be32(f, entry->hash);
 	}
 }
 
diff --git a/pack-bitmap.c b/pack-bitmap.c
index e07c798879..d999616c9e 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -12,6 +12,8 @@
 #include "packfile.h"
 #include "repository.h"
 #include "object-store.h"
+#include "list-objects-filter-options.h"
+#include "config.h"
 
 /*
  * An entry on the bitmap index, representing the bitmap for a given
@@ -137,9 +139,10 @@ static struct ewah_bitmap *read_bitmap_1(struct bitmap_index *index)
 static int load_bitmap_header(struct bitmap_index *index)
 {
 	struct bitmap_disk_header *header = (void *)index->map;
+	size_t header_size = sizeof(*header) - GIT_MAX_RAWSZ + the_hash_algo->rawsz;
 
-	if (index->map_size < sizeof(*header) + the_hash_algo->rawsz)
-		return error("Corrupted bitmap index (missing header data)");
+	if (index->map_size < header_size + the_hash_algo->rawsz)
+		return error("Corrupted bitmap index (too small)");
 
 	if (memcmp(header->magic, BITMAP_IDX_SIGNATURE, sizeof(BITMAP_IDX_SIGNATURE)) != 0)
 		return error("Corrupted bitmap index file (wrong header)");
@@ -151,25 +154,29 @@ 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));
+		unsigned char *index_end = index->map + index->map_size - the_hash_algo->rawsz;
 
 		if ((flags & BITMAP_OPT_FULL_DAG) == 0)
 			return error("Unsupported options for bitmap index file "
 				"(Git requires BITMAP_OPT_FULL_DAG)");
 
 		if (flags & BITMAP_OPT_HASH_CACHE) {
-			unsigned char *end = index->map + index->map_size - the_hash_algo->rawsz;
-			index->hashes = ((uint32_t *)end) - index->pack->num_objects;
+			if (cache_size > index_end - index->map - header_size)
+				return error("corrupted bitmap index file (too short to fit hash cache)");
+			index->hashes = (void *)(index_end - cache_size);
+			index_end -= cache_size;
 		}
 	}
 
 	index->entry_count = ntohl(header->entry_count);
-	index->map_pos += sizeof(*header) - GIT_MAX_RAWSZ + the_hash_algo->rawsz;
+	index->map_pos += header_size;
 	return 0;
 }
 
 static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
 					  struct ewah_bitmap *root,
-					  const unsigned char *hash,
+					  const struct object_id *oid,
 					  struct stored_bitmap *xor_with,
 					  int flags)
 {
@@ -181,7 +188,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
 	stored->root = root;
 	stored->xor = xor_with;
 	stored->flags = flags;
-	oidread(&stored->oid, hash);
+	oidcpy(&stored->oid, oid);
 
 	hash_pos = kh_put_oid_map(index->bitmaps, stored->oid, &ret);
 
@@ -189,7 +196,7 @@ static struct stored_bitmap *store_bitmap(struct bitmap_index *index,
 	 * because the SHA1 already existed on the map. this is bad, there
 	 * shouldn't be duplicated commits in the index */
 	if (ret == 0) {
-		error("Duplicate entry in bitmap index: %s", hash_to_hex(hash));
+		error("Duplicate entry in bitmap index: %s", oid_to_hex(oid));
 		return NULL;
 	}
 
@@ -221,13 +228,18 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
 		struct ewah_bitmap *bitmap = NULL;
 		struct stored_bitmap *xor_bitmap = NULL;
 		uint32_t commit_idx_pos;
-		const unsigned char *sha1;
+		struct object_id oid;
+
+		if (index->map_size - index->map_pos < 6)
+			return error("corrupt ewah bitmap: truncated header for entry %d", i);
 
 		commit_idx_pos = read_be32(index->map, &index->map_pos);
 		xor_offset = read_u8(index->map, &index->map_pos);
 		flags = read_u8(index->map, &index->map_pos);
 
-		sha1 = nth_packed_object_sha1(index->pack, commit_idx_pos);
+		if (nth_packed_object_id(&oid, index->pack, commit_idx_pos) < 0)
+			return error("corrupt ewah bitmap: commit index %u out of range",
+				     (unsigned)commit_idx_pos);
 
 		bitmap = read_bitmap_1(index);
 		if (!bitmap)
@@ -244,7 +256,7 @@ static int load_bitmap_entries_v1(struct bitmap_index *index)
 		}
 
 		recent_bitmaps[i % MAX_XOR_OFFSET] = store_bitmap(
-			index, bitmap, sha1, xor_bitmap, flags);
+			index, bitmap, &oid, xor_bitmap, flags);
 	}
 
 	return 0;
@@ -286,6 +298,11 @@ static int open_pack_bitmap_1(struct bitmap_index *bitmap_git, struct packed_git
 		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);
@@ -326,6 +343,13 @@ failed:
 	munmap(bitmap_git->map, bitmap_git->map_size);
 	bitmap_git->map = NULL;
 	bitmap_git->map_size = 0;
+
+	kh_destroy_oid_map(bitmap_git->bitmaps);
+	bitmap_git->bitmaps = NULL;
+
+	kh_destroy_oid_pos(bitmap_git->ext_index.positions);
+	bitmap_git->ext_index.positions = NULL;
+
 	return -1;
 }
 
@@ -362,6 +386,16 @@ struct include_data {
 	struct bitmap *seen;
 };
 
+struct ewah_bitmap *bitmap_for_commit(struct bitmap_index *bitmap_git,
+				      struct commit *commit)
+{
+	khiter_t hash_pos = kh_get_oid_map(bitmap_git->bitmaps,
+					   commit->object.oid);
+	if (hash_pos >= kh_end(bitmap_git->bitmaps))
+		return NULL;
+	return lookup_stored_bitmap(kh_value(bitmap_git->bitmaps, hash_pos));
+}
+
 static inline int bitmap_position_extended(struct bitmap_index *bitmap_git,
 					   const struct object_id *oid)
 {
@@ -379,11 +413,14 @@ static inline int bitmap_position_extended(struct bitmap_index *bitmap_git,
 static inline int bitmap_position_packfile(struct bitmap_index *bitmap_git,
 					   const struct object_id *oid)
 {
+	uint32_t pos;
 	off_t offset = find_pack_entry_one(oid->hash, bitmap_git->pack);
 	if (!offset)
 		return -1;
 
-	return find_revindex_position(bitmap_git->pack, offset);
+	if (offset_to_pack_pos(bitmap_git->pack, offset, &pos) < 0)
+		return -1;
+	return pos;
 }
 
 static int bitmap_position(struct bitmap_index *bitmap_git,
@@ -447,10 +484,10 @@ static void show_commit(struct commit *commit, void *data)
 
 static int add_to_include_set(struct bitmap_index *bitmap_git,
 			      struct include_data *data,
-			      const struct object_id *oid,
+			      struct commit *commit,
 			      int bitmap_pos)
 {
-	khiter_t hash_pos;
+	struct ewah_bitmap *partial;
 
 	if (data->seen && bitmap_get(data->seen, bitmap_pos))
 		return 0;
@@ -458,10 +495,9 @@ static int add_to_include_set(struct bitmap_index *bitmap_git,
 	if (bitmap_get(data->base, bitmap_pos))
 		return 0;
 
-	hash_pos = kh_get_oid_map(bitmap_git->bitmaps, *oid);
-	if (hash_pos < kh_end(bitmap_git->bitmaps)) {
-		struct stored_bitmap *st = kh_value(bitmap_git->bitmaps, hash_pos);
-		bitmap_or_ewah(data->base, lookup_stored_bitmap(st));
+	partial = bitmap_for_commit(bitmap_git, commit);
+	if (partial) {
+		bitmap_or_ewah(data->base, partial);
 		return 0;
 	}
 
@@ -480,8 +516,7 @@ static int should_include(struct commit *commit, void *_data)
 						  (struct object *)commit,
 						  NULL);
 
-	if (!add_to_include_set(data->bitmap_git, data, &commit->object.oid,
-				bitmap_pos)) {
+	if (!add_to_include_set(data->bitmap_git, data, commit, bitmap_pos)) {
 		struct commit_list *parent = commit->parents;
 
 		while (parent) {
@@ -495,10 +530,44 @@ static int should_include(struct commit *commit, void *_data)
 	return 1;
 }
 
+static int should_include_obj(struct object *obj, void *_data)
+{
+	struct include_data *data = _data;
+	int bitmap_pos;
+
+	bitmap_pos = bitmap_position(data->bitmap_git, &obj->oid);
+	if (bitmap_pos < 0)
+		return 1;
+	if ((data->seen && bitmap_get(data->seen, bitmap_pos)) ||
+	     bitmap_get(data->base, bitmap_pos)) {
+		obj->flags |= SEEN;
+		return 0;
+	}
+	return 1;
+}
+
+static int add_commit_to_bitmap(struct bitmap_index *bitmap_git,
+				struct bitmap **base,
+				struct commit *commit)
+{
+	struct ewah_bitmap *or_with = bitmap_for_commit(bitmap_git, commit);
+
+	if (!or_with)
+		return 0;
+
+	if (*base == NULL)
+		*base = ewah_to_bitmap(or_with);
+	else
+		bitmap_or_ewah(*base, or_with);
+
+	return 1;
+}
+
 static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
 				   struct rev_info *revs,
 				   struct object_list *roots,
-				   struct bitmap *seen)
+				   struct bitmap *seen,
+				   struct list_objects_filter_options *filter)
 {
 	struct bitmap *base = NULL;
 	int needs_walk = 0;
@@ -517,21 +586,10 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
 		struct object *object = roots->item;
 		roots = roots->next;
 
-		if (object->type == OBJ_COMMIT) {
-			khiter_t pos = kh_get_oid_map(bitmap_git->bitmaps, object->oid);
-
-			if (pos < kh_end(bitmap_git->bitmaps)) {
-				struct stored_bitmap *st = kh_value(bitmap_git->bitmaps, pos);
-				struct ewah_bitmap *or_with = lookup_stored_bitmap(st);
-
-				if (base == NULL)
-					base = ewah_to_bitmap(or_with);
-				else
-					bitmap_or_ewah(base, or_with);
-
-				object->flags |= SEEN;
-				continue;
-			}
+		if (object->type == OBJ_COMMIT &&
+		    add_commit_to_bitmap(bitmap_git, &base, (struct commit *)object)) {
+			object->flags |= SEEN;
+			continue;
 		}
 
 		object_list_insert(object, &not_mapped);
@@ -583,6 +641,7 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
 		incdata.seen = seen;
 
 		revs->include_check = should_include;
+		revs->include_check_obj = should_include_obj;
 		revs->include_check_data = &incdata;
 
 		if (prepare_revision_walk(revs))
@@ -591,14 +650,20 @@ static struct bitmap *find_objects(struct bitmap_index *bitmap_git,
 		show_data.bitmap_git = bitmap_git;
 		show_data.base = base;
 
-		traverse_commit_list(revs, show_commit, show_object,
-				     &show_data);
+		traverse_commit_list_filtered(filter, revs,
+					      show_commit, show_object,
+					      &show_data, NULL);
+
+		revs->include_check = NULL;
+		revs->include_check_obj = NULL;
+		revs->include_check_data = NULL;
 	}
 
 	return base;
 }
 
 static void show_extended_objects(struct bitmap_index *bitmap_git,
+				  struct rev_info *revs,
 				  show_reachable_fn show_reach)
 {
 	struct bitmap *objects = bitmap_git->result;
@@ -612,17 +677,48 @@ static void show_extended_objects(struct bitmap_index *bitmap_git,
 			continue;
 
 		obj = eindex->objects[i];
+		if ((obj->type == OBJ_BLOB && !revs->blob_objects) ||
+		    (obj->type == OBJ_TREE && !revs->tree_objects) ||
+		    (obj->type == OBJ_TAG && !revs->tag_objects))
+			continue;
+
 		show_reach(&obj->oid, obj->type, 0, eindex->hashes[i], NULL, 0);
 	}
 }
 
+static void init_type_iterator(struct ewah_iterator *it,
+			       struct bitmap_index *bitmap_git,
+			       enum object_type type)
+{
+	switch (type) {
+	case OBJ_COMMIT:
+		ewah_iterator_init(it, bitmap_git->commits);
+		break;
+
+	case OBJ_TREE:
+		ewah_iterator_init(it, bitmap_git->trees);
+		break;
+
+	case OBJ_BLOB:
+		ewah_iterator_init(it, bitmap_git->blobs);
+		break;
+
+	case OBJ_TAG:
+		ewah_iterator_init(it, bitmap_git->tags);
+		break;
+
+	default:
+		BUG("object type %d not stored by bitmap type index", type);
+		break;
+	}
+}
+
 static void show_objects_for_type(
 	struct bitmap_index *bitmap_git,
-	struct ewah_bitmap *type_filter,
 	enum object_type object_type,
 	show_reachable_fn show_reach)
 {
-	size_t pos = 0, i = 0;
+	size_t i = 0;
 	uint32_t offset;
 
 	struct ewah_iterator it;
@@ -630,38 +726,35 @@ static void show_objects_for_type(
 
 	struct bitmap *objects = bitmap_git->result;
 
-	if (bitmap_git->reuse_objects == bitmap_git->pack->num_objects)
-		return;
-
-	ewah_iterator_init(&it, type_filter);
+	init_type_iterator(&it, bitmap_git, object_type);
 
-	while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) {
+	for (i = 0; i < objects->word_alloc &&
+			ewah_iterator_next(&filter, &it); i++) {
 		eword_t word = objects->words[i] & filter;
+		size_t pos = (i * BITS_IN_EWORD);
+
+		if (!word)
+			continue;
 
 		for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
 			struct object_id oid;
-			struct revindex_entry *entry;
-			uint32_t hash = 0;
+			uint32_t hash = 0, index_pos;
+			off_t ofs;
 
 			if ((word >> offset) == 0)
 				break;
 
 			offset += ewah_bit_ctz64(word >> offset);
 
-			if (pos + offset < bitmap_git->reuse_objects)
-				continue;
-
-			entry = &bitmap_git->pack->revindex[pos + offset];
-			nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr);
+			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_git->hashes)
-				hash = get_be32(bitmap_git->hashes + entry->nr);
+				hash = get_be32(bitmap_git->hashes + index_pos);
 
-			show_reach(&oid, object_type, 0, hash, bitmap_git->pack, entry->offset);
+			show_reach(&oid, object_type, 0, hash, bitmap_git->pack, ofs);
 		}
-
-		pos += BITS_IN_EWORD;
-		i++;
 	}
 }
 
@@ -679,7 +772,250 @@ static int in_bitmapped_pack(struct bitmap_index *bitmap_git,
 	return 0;
 }
 
-struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
+static struct bitmap *find_tip_objects(struct bitmap_index *bitmap_git,
+				       struct object_list *tip_objects,
+				       enum object_type type)
+{
+	struct bitmap *result = bitmap_new();
+	struct object_list *p;
+
+	for (p = tip_objects; p; p = p->next) {
+		int pos;
+
+		if (p->item->type != type)
+			continue;
+
+		pos = bitmap_position(bitmap_git, &p->item->oid);
+		if (pos < 0)
+			continue;
+
+		bitmap_set(result, pos);
+	}
+
+	return result;
+}
+
+static void filter_bitmap_exclude_type(struct bitmap_index *bitmap_git,
+				       struct object_list *tip_objects,
+				       struct bitmap *to_filter,
+				       enum object_type type)
+{
+	struct eindex *eindex = &bitmap_git->ext_index;
+	struct bitmap *tips;
+	struct ewah_iterator it;
+	eword_t mask;
+	uint32_t i;
+
+	/*
+	 * The non-bitmap version of this filter never removes
+	 * objects which the other side specifically asked for,
+	 * so we must match that behavior.
+	 */
+	tips = find_tip_objects(bitmap_git, tip_objects, type);
+
+	/*
+	 * 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);
+	     i++) {
+		if (i < tips->word_alloc)
+			mask &= ~tips->words[i];
+		to_filter->words[i] &= ~mask;
+	}
+
+	/*
+	 * 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;
+		if (eindex->objects[i]->type == type &&
+		    bitmap_get(to_filter, pos) &&
+		    !bitmap_get(tips, pos))
+			bitmap_unset(to_filter, pos);
+	}
+
+	bitmap_free(tips);
+}
+
+static void filter_bitmap_blob_none(struct bitmap_index *bitmap_git,
+				    struct object_list *tip_objects,
+				    struct bitmap *to_filter)
+{
+	filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter,
+				   OBJ_BLOB);
+}
+
+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 (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));
+			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];
+		if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)
+			die(_("unable to get size of %s"), oid_to_hex(&obj->oid));
+	}
+
+	return size;
+}
+
+static void filter_bitmap_blob_limit(struct bitmap_index *bitmap_git,
+				     struct object_list *tip_objects,
+				     struct bitmap *to_filter,
+				     unsigned long limit)
+{
+	struct eindex *eindex = &bitmap_git->ext_index;
+	struct bitmap *tips;
+	struct ewah_iterator it;
+	eword_t mask;
+	uint32_t i;
+
+	tips = find_tip_objects(bitmap_git, tip_objects, OBJ_BLOB);
+
+	for (i = 0, init_type_iterator(&it, bitmap_git, OBJ_BLOB);
+	     i < to_filter->word_alloc && ewah_iterator_next(&mask, &it);
+	     i++) {
+		eword_t word = to_filter->words[i] & mask;
+		unsigned offset;
+
+		for (offset = 0; offset < BITS_IN_EWORD; offset++) {
+			uint32_t pos;
+
+			if ((word >> offset) == 0)
+				break;
+			offset += ewah_bit_ctz64(word >> offset);
+			pos = i * BITS_IN_EWORD + offset;
+
+			if (!bitmap_get(tips, pos) &&
+			    get_size_by_pos(bitmap_git, pos) >= limit)
+				bitmap_unset(to_filter, pos);
+		}
+	}
+
+	for (i = 0; i < eindex->count; i++) {
+		uint32_t pos = i + bitmap_git->pack->num_objects;
+		if (eindex->objects[i]->type == OBJ_BLOB &&
+		    bitmap_get(to_filter, pos) &&
+		    !bitmap_get(tips, pos) &&
+		    get_size_by_pos(bitmap_git, pos) >= limit)
+			bitmap_unset(to_filter, pos);
+	}
+
+	bitmap_free(tips);
+}
+
+static void filter_bitmap_tree_depth(struct bitmap_index *bitmap_git,
+				     struct object_list *tip_objects,
+				     struct bitmap *to_filter,
+				     unsigned long limit)
+{
+	if (limit)
+		BUG("filter_bitmap_tree_depth given non-zero limit");
+
+	filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter,
+				   OBJ_TREE);
+	filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter,
+				   OBJ_BLOB);
+}
+
+static void filter_bitmap_object_type(struct bitmap_index *bitmap_git,
+				      struct object_list *tip_objects,
+				      struct bitmap *to_filter,
+				      enum object_type object_type)
+{
+	if (object_type < OBJ_COMMIT || object_type > OBJ_TAG)
+		BUG("filter_bitmap_object_type given invalid object");
+
+	if (object_type != OBJ_TAG)
+		filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, OBJ_TAG);
+	if (object_type != OBJ_COMMIT)
+		filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, OBJ_COMMIT);
+	if (object_type != OBJ_TREE)
+		filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, OBJ_TREE);
+	if (object_type != OBJ_BLOB)
+		filter_bitmap_exclude_type(bitmap_git, tip_objects, to_filter, OBJ_BLOB);
+}
+
+static int filter_bitmap(struct bitmap_index *bitmap_git,
+			 struct object_list *tip_objects,
+			 struct bitmap *to_filter,
+			 struct list_objects_filter_options *filter)
+{
+	if (!filter || filter->choice == LOFC_DISABLED)
+		return 0;
+
+	if (filter->choice == LOFC_BLOB_NONE) {
+		if (bitmap_git)
+			filter_bitmap_blob_none(bitmap_git, tip_objects,
+						to_filter);
+		return 0;
+	}
+
+	if (filter->choice == LOFC_BLOB_LIMIT) {
+		if (bitmap_git)
+			filter_bitmap_blob_limit(bitmap_git, tip_objects,
+						 to_filter,
+						 filter->blob_limit_value);
+		return 0;
+	}
+
+	if (filter->choice == LOFC_TREE_DEPTH &&
+	    filter->tree_exclude_depth == 0) {
+		if (bitmap_git)
+			filter_bitmap_tree_depth(bitmap_git, tip_objects,
+						 to_filter,
+						 filter->tree_exclude_depth);
+		return 0;
+	}
+
+	if (filter->choice == LOFC_OBJECT_TYPE) {
+		if (bitmap_git)
+			filter_bitmap_object_type(bitmap_git, tip_objects,
+						  to_filter,
+						  filter->object_type);
+		return 0;
+	}
+
+	if (filter->choice == LOFC_COMBINE) {
+		int i;
+		for (i = 0; i < filter->sub_nr; i++) {
+			if (filter_bitmap(bitmap_git, tip_objects, to_filter,
+					  &filter->sub[i]) < 0)
+				return -1;
+		}
+		return 0;
+	}
+
+	/* filter choice not handled */
+	return -1;
+}
+
+static int can_filter_bitmap(struct list_objects_filter_options *filter)
+{
+	return !filter_bitmap(NULL, NULL, NULL, filter);
+}
+
+struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
+					 struct list_objects_filter_options *filter,
+					 int filter_provided_objects)
 {
 	unsigned int i;
 
@@ -689,9 +1025,22 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
 	struct bitmap *wants_bitmap = NULL;
 	struct bitmap *haves_bitmap = NULL;
 
-	struct bitmap_index *bitmap_git = xcalloc(1, sizeof(*bitmap_git));
+	struct bitmap_index *bitmap_git;
+
+	/*
+	 * We can't do pathspec limiting with bitmaps, because we don't know
+	 * which commits are associated with which object changes (let alone
+	 * even which objects are associated with which paths).
+	 */
+	if (revs->prune)
+		return NULL;
+
+	if (!can_filter_bitmap(filter))
+		return NULL;
+
 	/* 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)
 		goto cleanup;
 
@@ -710,6 +1059,7 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
 				object_list_insert(object, &wants);
 
 			object = parse_object_or_die(get_tagged_oid(tag), NULL);
+			object->flags |= (tag->object.flags & UNINTERESTING);
 		}
 
 		if (object->flags & UNINTERESTING)
@@ -742,7 +1092,8 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
 
 	if (haves) {
 		revs->ignore_missing_links = 1;
-		haves_bitmap = find_objects(bitmap_git, revs, haves, NULL);
+		haves_bitmap = find_objects(bitmap_git, revs, haves, NULL,
+					    filter);
 		reset_revision_walk();
 		revs->ignore_missing_links = 0;
 
@@ -750,7 +1101,8 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
 			BUG("failed to perform bitmap walk");
 	}
 
-	wants_bitmap = find_objects(bitmap_git, revs, wants, haves_bitmap);
+	wants_bitmap = find_objects(bitmap_git, revs, wants, haves_bitmap,
+				    filter);
 
 	if (!wants_bitmap)
 		BUG("failed to perform bitmap walk");
@@ -758,93 +1110,171 @@ struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs)
 	if (haves_bitmap)
 		bitmap_and_not(wants_bitmap, haves_bitmap);
 
+	filter_bitmap(bitmap_git, (filter && filter_provided_objects) ? NULL : wants,
+		      wants_bitmap, filter);
+
 	bitmap_git->result = wants_bitmap;
 	bitmap_git->haves = haves_bitmap;
 
+	object_list_free(&wants);
+	object_list_free(&haves);
+
 	return bitmap_git;
 
 cleanup:
 	free_bitmap_index(bitmap_git);
+	object_list_free(&wants);
+	object_list_free(&haves);
 	return NULL;
 }
 
-int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
-				       struct packed_git **packfile,
-				       uint32_t *entries,
-				       off_t *up_to)
+static void try_partial_reuse(struct bitmap_index *bitmap_git,
+			      size_t pos,
+			      struct bitmap *reuse,
+			      struct pack_window **w_curs)
 {
+	off_t offset, header;
+	enum object_type type;
+	unsigned long size;
+
+	if (pos >= bitmap_git->pack->num_objects)
+		return; /* not actually in the pack */
+
+	offset = header = pack_pos_to_offset(bitmap_git->pack, pos);
+	type = unpack_object_header(bitmap_git->pack, w_curs, &offset, &size);
+	if (type < 0)
+		return; /* broken packfile, punt */
+
+	if (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA) {
+		off_t base_offset;
+		uint32_t base_pos;
+
+		/*
+		 * Find the position of the base object so we can look it up
+		 * in our bitmaps. If we can't come up with an offset, or if
+		 * that offset is not in the revidx, the pack is corrupt.
+		 * There's nothing we can do, so just punt on this object,
+		 * 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);
+		if (!base_offset)
+			return;
+		if (offset_to_pack_pos(bitmap_git->pack, base_offset, &base_pos) < 0)
+			return;
+
+		/*
+		 * We assume delta dependencies always point backwards. This
+		 * lets us do a single pass, and is basically always true
+		 * due to the way OFS_DELTAs work. You would not typically
+		 * find REF_DELTA in a bitmapped pack, since we only bitmap
+		 * packs we write fresh, and OFS_DELTA is the default). But
+		 * let's double check to make sure the pack wasn't written with
+		 * odd parameters.
+		 */
+		if (base_pos >= pos)
+			return;
+
+		/*
+		 * And finally, if we're not sending the base as part of our
+		 * reuse chunk, then don't send this object either. The base
+		 * would come after us, along with other objects not
+		 * necessarily in the pack, which means we'd need to convert
+		 * to REF_DELTA on the fly. Better to just let the normal
+		 * object_entry code path handle it.
+		 */
+		if (!bitmap_get(reuse, base_pos))
+			return;
+	}
+
 	/*
-	 * Reuse the packfile content if we need more than
-	 * 90% of its objects
+	 * If we got here, then the object is OK to reuse. Mark it.
 	 */
-	static const double REUSE_PERCENT = 0.9;
+	bitmap_set(reuse, pos);
+}
 
+int reuse_partial_packfile_from_bitmap(struct bitmap_index *bitmap_git,
+				       struct packed_git **packfile_out,
+				       uint32_t *entries,
+				       struct bitmap **reuse_out)
+{
 	struct bitmap *result = bitmap_git->result;
-	uint32_t reuse_threshold;
-	uint32_t i, reuse_objects = 0;
+	struct bitmap *reuse;
+	struct pack_window *w_curs = NULL;
+	size_t i = 0;
+	uint32_t offset;
 
 	assert(result);
 
-	for (i = 0; i < result->word_alloc; ++i) {
-		if (result->words[i] != (eword_t)~0) {
-			reuse_objects += ewah_bit_ctz64(~result->words[i]);
-			break;
-		}
+	while (i < result->word_alloc && result->words[i] == (eword_t)~0)
+		i++;
 
-		reuse_objects += BITS_IN_EWORD;
-	}
+	/* 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;
 
-#ifdef GIT_BITMAP_DEBUG
-	{
-		const unsigned char *sha1;
-		struct revindex_entry *entry;
+	reuse = bitmap_word_alloc(i);
+	memset(reuse->words, 0xFF, i * sizeof(eword_t));
 
-		entry = &bitmap_git->reverse_index->revindex[reuse_objects];
-		sha1 = nth_packed_object_sha1(bitmap_git->pack, entry->nr);
+	for (; i < result->word_alloc; ++i) {
+		eword_t word = result->words[i];
+		size_t pos = (i * BITS_IN_EWORD);
 
-		fprintf(stderr, "Failed to reuse at %d (%016llx)\n",
-			reuse_objects, result->words[i]);
-		fprintf(stderr, " %s\n", hash_to_hex(sha1));
+		for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
+			if ((word >> offset) == 0)
+				break;
+
+			offset += ewah_bit_ctz64(word >> offset);
+			try_partial_reuse(bitmap_git, pos + offset, reuse, &w_curs);
+		}
 	}
-#endif
 
-	if (!reuse_objects)
-		return -1;
+	unuse_pack(&w_curs);
 
-	if (reuse_objects >= bitmap_git->pack->num_objects) {
-		bitmap_git->reuse_objects = *entries = bitmap_git->pack->num_objects;
-		*up_to = -1; /* reuse the full pack */
-		*packfile = bitmap_git->pack;
-		return 0;
+	*entries = bitmap_popcount(reuse);
+	if (!*entries) {
+		bitmap_free(reuse);
+		return -1;
 	}
 
-	reuse_threshold = bitmap_popcount(bitmap_git->result) * REUSE_PERCENT;
+	/*
+	 * Drop any reused objects from the result, since they will not
+	 * need to be handled separately.
+	 */
+	bitmap_and_not(result, reuse);
+	*packfile_out = bitmap_git->pack;
+	*reuse_out = reuse;
+	return 0;
+}
 
-	if (reuse_objects < reuse_threshold)
-		return -1;
+int bitmap_walk_contains(struct bitmap_index *bitmap_git,
+			 struct bitmap *bitmap, const struct object_id *oid)
+{
+	int idx;
 
-	bitmap_git->reuse_objects = *entries = reuse_objects;
-	*up_to = bitmap_git->pack->revindex[reuse_objects].offset;
-	*packfile = bitmap_git->pack;
+	if (!bitmap)
+		return 0;
 
-	return 0;
+	idx = bitmap_position(bitmap_git, oid);
+	return idx >= 0 && bitmap_get(bitmap, idx);
 }
 
 void traverse_bitmap_commit_list(struct bitmap_index *bitmap_git,
+				 struct rev_info *revs,
 				 show_reachable_fn show_reachable)
 {
 	assert(bitmap_git->result);
 
-	show_objects_for_type(bitmap_git, bitmap_git->commits,
-		OBJ_COMMIT, show_reachable);
-	show_objects_for_type(bitmap_git, bitmap_git->trees,
-		OBJ_TREE, show_reachable);
-	show_objects_for_type(bitmap_git, bitmap_git->blobs,
-		OBJ_BLOB, show_reachable);
-	show_objects_for_type(bitmap_git, bitmap_git->tags,
-		OBJ_TAG, show_reachable);
+	show_objects_for_type(bitmap_git, OBJ_COMMIT, show_reachable);
+	if (revs->tree_objects)
+		show_objects_for_type(bitmap_git, OBJ_TREE, show_reachable);
+	if (revs->blob_objects)
+		show_objects_for_type(bitmap_git, OBJ_BLOB, show_reachable);
+	if (revs->tag_objects)
+		show_objects_for_type(bitmap_git, OBJ_TAG, show_reachable);
 
-	show_extended_objects(bitmap_git, show_reachable);
+	show_extended_objects(bitmap_git, revs, show_reachable);
 }
 
 static uint32_t count_object_type(struct bitmap_index *bitmap_git,
@@ -857,26 +1287,7 @@ static uint32_t count_object_type(struct bitmap_index *bitmap_git,
 	struct ewah_iterator it;
 	eword_t filter;
 
-	switch (type) {
-	case OBJ_COMMIT:
-		ewah_iterator_init(&it, bitmap_git->commits);
-		break;
-
-	case OBJ_TREE:
-		ewah_iterator_init(&it, bitmap_git->trees);
-		break;
-
-	case OBJ_BLOB:
-		ewah_iterator_init(&it, bitmap_git->blobs);
-		break;
-
-	case OBJ_TAG:
-		ewah_iterator_init(&it, bitmap_git->tags);
-		break;
-
-	default:
-		return 0;
-	}
+	init_type_iterator(&it, bitmap_git, type);
 
 	while (i < objects->word_alloc && ewah_iterator_next(&filter, &it)) {
 		eword_t word = objects->words[i++] & filter;
@@ -950,10 +1361,10 @@ void test_bitmap_walk(struct rev_info *revs)
 {
 	struct object *root;
 	struct bitmap *result = NULL;
-	khiter_t pos;
 	size_t result_popcnt;
 	struct bitmap_test_data tdata;
 	struct bitmap_index *bitmap_git;
+	struct ewah_bitmap *bm;
 
 	if (!(bitmap_git = prepare_bitmap_git(revs->repo)))
 		die("failed to load bitmap indexes");
@@ -965,12 +1376,9 @@ void test_bitmap_walk(struct rev_info *revs)
 		bitmap_git->version, bitmap_git->entry_count);
 
 	root = revs->pending.objects[0].item;
-	pos = kh_get_oid_map(bitmap_git->bitmaps, root->oid);
-
-	if (pos < kh_end(bitmap_git->bitmaps)) {
-		struct stored_bitmap *st = kh_value(bitmap_git->bitmaps, pos);
-		struct ewah_bitmap *bm = lookup_stored_bitmap(st);
+	bm = bitmap_for_commit(bitmap_git, (struct commit *)root);
 
+	if (bm) {
 		fprintf(stderr, "Found bitmap for %s. %d bits / %08x checksum\n",
 			oid_to_hex(&root->oid), (int)bm->bit_size, ewah_checksum(bm));
 
@@ -1001,14 +1409,32 @@ void test_bitmap_walk(struct rev_info *revs)
 	if (bitmap_equals(result, tdata.base))
 		fprintf(stderr, "OK!\n");
 	else
-		fprintf(stderr, "Mismatch!\n");
+		die("mismatch in bitmap results");
+
+	free_bitmap_index(bitmap_git);
+}
+
+int test_bitmap_commits(struct repository *r)
+{
+	struct bitmap_index *bitmap_git = prepare_bitmap_git(r);
+	struct object_id oid;
+	MAYBE_UNUSED void *value;
+
+	if (!bitmap_git)
+		die("failed to load bitmap indexes");
+
+	kh_foreach(bitmap_git->bitmaps, oid, value, {
+		printf("%s\n", oid_to_hex(&oid));
+	});
 
 	free_bitmap_index(bitmap_git);
+
+	return 0;
 }
 
-static int rebuild_bitmap(uint32_t *reposition,
-			  struct ewah_bitmap *source,
-			  struct bitmap *dest)
+int rebuild_bitmap(const uint32_t *reposition,
+		   struct ewah_bitmap *source,
+		   struct bitmap *dest)
 {
 	uint32_t pos = 0;
 	struct ewah_iterator it;
@@ -1037,63 +1463,28 @@ static int rebuild_bitmap(uint32_t *reposition,
 	return 0;
 }
 
-int rebuild_existing_bitmaps(struct bitmap_index *bitmap_git,
-			     struct packing_data *mapping,
-			     kh_oid_map_t *reused_bitmaps,
-			     int show_progress)
+uint32_t *create_bitmap_mapping(struct bitmap_index *bitmap_git,
+				struct packing_data *mapping)
 {
 	uint32_t i, num_objects;
 	uint32_t *reposition;
-	struct bitmap *rebuild;
-	struct stored_bitmap *stored;
-	struct progress *progress = NULL;
-
-	khiter_t hash_pos;
-	int hash_ret;
 
 	num_objects = bitmap_git->pack->num_objects;
-	reposition = xcalloc(num_objects, sizeof(uint32_t));
+	CALLOC_ARRAY(reposition, num_objects);
 
 	for (i = 0; i < num_objects; ++i) {
 		struct object_id oid;
-		struct revindex_entry *entry;
 		struct object_entry *oe;
 
-		entry = &bitmap_git->pack->revindex[i];
-		nth_packed_object_oid(&oid, bitmap_git->pack, entry->nr);
+		nth_packed_object_id(&oid, bitmap_git->pack,
+				     pack_pos_to_index(bitmap_git->pack, i));
 		oe = packlist_find(mapping, &oid);
 
 		if (oe)
 			reposition[i] = oe_in_pack_pos(mapping, oe) + 1;
 	}
 
-	rebuild = bitmap_new();
-	i = 0;
-
-	if (show_progress)
-		progress = start_progress("Reusing bitmaps", 0);
-
-	kh_foreach_value(bitmap_git->bitmaps, stored, {
-		if (stored->flags & BITMAP_FLAG_REUSE) {
-			if (!rebuild_bitmap(reposition,
-					    lookup_stored_bitmap(stored),
-					    rebuild)) {
-				hash_pos = kh_put_oid_map(reused_bitmaps,
-							  stored->oid,
-							  &hash_ret);
-				kh_value(reused_bitmaps, hash_pos) =
-					bitmap_to_ewah(rebuild);
-			}
-			bitmap_reset(rebuild);
-			display_progress(progress, ++i);
-		}
-	});
-
-	stop_progress(&progress);
-
-	free(reposition);
-	bitmap_free(rebuild);
-	return 0;
+	return reposition;
 }
 
 void free_bitmap_index(struct bitmap_index *b)
@@ -1118,16 +1509,92 @@ void free_bitmap_index(struct bitmap_index *b)
 int bitmap_has_oid_in_uninteresting(struct bitmap_index *bitmap_git,
 				    const struct object_id *oid)
 {
-	int pos;
+	return bitmap_git &&
+		bitmap_walk_contains(bitmap_git, bitmap_git->haves, oid);
+}
 
-	if (!bitmap_git)
-		return 0; /* no bitmap loaded */
-	if (!bitmap_git->haves)
-		return 0; /* walk had no "haves" */
+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;
+	size_t i;
 
-	pos = bitmap_position_packfile(bitmap_git, oid);
-	if (pos < 0)
-		return 0;
+	init_type_iterator(&it, bitmap_git, object_type);
+	for (i = 0; i < result->word_alloc &&
+			ewah_iterator_next(&filter, &it); i++) {
+		eword_t word = result->words[i] & filter;
+		size_t base = (i * BITS_IN_EWORD);
+		unsigned offset;
+
+		if (!word)
+			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);
+		}
+	}
 
-	return bitmap_get(bitmap_git->haves, pos);
+	return total;
+}
+
+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;
+	off_t object_size;
+	size_t i;
+
+	oi.disk_sizep = &object_size;
+
+	for (i = 0; i < eindex->count; i++) {
+		struct object *obj = eindex->objects[i];
+
+		if (!bitmap_get(result, pack->num_objects + i))
+			continue;
+
+		if (oid_object_info_extended(the_repository, &obj->oid, &oi, 0) < 0)
+			die(_("unable to get disk usage of %s"),
+			    oid_to_hex(&obj->oid));
+
+		total += object_size;
+	}
+	return total;
+}
+
+off_t get_disk_usage_from_bitmap(struct bitmap_index *bitmap_git,
+				 struct rev_info *revs)
+{
+	off_t total = 0;
+
+	total += get_disk_usage_for_type(bitmap_git, OBJ_COMMIT);
+	if (revs->tree_objects)
+		total += get_disk_usage_for_type(bitmap_git, OBJ_TREE);
+	if (revs->blob_objects)
+		total += get_disk_usage_for_type(bitmap_git, OBJ_BLOB);
+	if (revs->tag_objects)
+		total += get_disk_usage_for_type(bitmap_git, OBJ_TAG);
+
+	total += get_disk_usage_for_extended(bitmap_git);
+
+	return total;
+}
+
+const struct string_list *bitmap_preferred_tips(struct repository *r)
+{
+	return repo_config_get_value_multi(r, "pack.preferbitmaptips");
 }
diff --git a/pack-bitmap.h b/pack-bitmap.h
index 466c5afa09..99d733eb26 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -3,11 +3,14 @@
 
 #include "ewah/ewok.h"
 #include "khash.h"
+#include "pack.h"
 #include "pack-objects.h"
+#include "string-list.h"
 
 struct commit;
 struct repository;
 struct rev_info;
+struct list_objects_filter_options;
 
 static const char BITMAP_IDX_SIGNATURE[] = {'B', 'I', 'T', 'M'};
 
@@ -44,15 +47,22 @@ struct bitmap_index *prepare_bitmap_git(struct repository *r);
 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 *,
+				 struct rev_info *revs,
 				 show_reachable_fn show_reachable);
 void test_bitmap_walk(struct rev_info *revs);
-struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs);
+int test_bitmap_commits(struct repository *r);
+struct bitmap_index *prepare_bitmap_walk(struct rev_info *revs,
+					 struct list_objects_filter_options *filter,
+					 int filter_provided_objects);
 int reuse_partial_packfile_from_bitmap(struct bitmap_index *,
 				       struct packed_git **packfile,
-				       uint32_t *entries, off_t *up_to);
+				       uint32_t *entries,
+				       struct bitmap **reuse_out);
 int rebuild_existing_bitmaps(struct bitmap_index *, struct packing_data *mapping,
 			     kh_oid_map_t *reused_bitmaps, int show_progress);
 void free_bitmap_index(struct bitmap_index *);
+int bitmap_walk_contains(struct bitmap_index *,
+			 struct bitmap *bitmap, const struct object_id *oid);
 
 /*
  * After a traversal has been performed by prepare_bitmap_walk(), this can be
@@ -61,12 +71,20 @@ void free_bitmap_index(struct bitmap_index *);
  */
 int bitmap_has_oid_in_uninteresting(struct bitmap_index *, const struct object_id *oid);
 
+off_t get_disk_usage_from_bitmap(struct bitmap_index *, struct rev_info *);
+
 void bitmap_writer_show_progress(int show);
 void bitmap_writer_set_checksum(unsigned char *sha1);
 void bitmap_writer_build_type_index(struct packing_data *to_pack,
 				    struct pack_idx_entry **index,
 				    uint32_t index_nr);
-void bitmap_writer_reuse_bitmaps(struct packing_data *to_pack);
+uint32_t *create_bitmap_mapping(struct bitmap_index *bitmap_git,
+				struct packing_data *mapping);
+int rebuild_bitmap(const uint32_t *reposition,
+		   struct ewah_bitmap *source,
+		   struct bitmap *dest);
+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);
@@ -75,4 +93,6 @@ void bitmap_writer_finish(struct pack_idx_entry **index,
 			  const char *filename,
 			  uint16_t options);
 
+const struct string_list *bitmap_preferred_tips(struct repository *r);
+
 #endif
diff --git a/pack-check.c b/pack-check.c
index 2cc3603189..c8e560d71a 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -8,10 +8,6 @@
 
 struct idx_entry {
 	off_t                offset;
-	union idx_entry_object {
-		const unsigned char *hash;
-		struct object_id *oid;
-	} oid;
 	unsigned int nr;
 };
 
@@ -43,7 +39,7 @@ int check_pack_crc(struct packed_git *p, struct pack_window **w_curs,
 	} while (len);
 
 	index_crc = p->index_data;
-	index_crc += 2 + 256 + p->num_objects * (the_hash_algo->rawsz/4) + nr;
+	index_crc += 2 + 256 + (size_t)p->num_objects * (the_hash_algo->rawsz/4) + nr;
 
 	return data_crc != ntohl(*index_crc);
 }
@@ -67,23 +63,23 @@ static int verify_packfile(struct repository *r,
 	if (!is_pack_valid(p))
 		return error("packfile %s cannot be accessed", p->pack_name);
 
-	the_hash_algo->init_fn(&ctx);
+	r->hash_algo->init_fn(&ctx);
 	do {
 		unsigned long remaining;
 		unsigned char *in = use_pack(p, w_curs, offset, &remaining);
 		offset += remaining;
 		if (!pack_sig_ofs)
-			pack_sig_ofs = p->pack_size - the_hash_algo->rawsz;
+			pack_sig_ofs = p->pack_size - r->hash_algo->rawsz;
 		if (offset > pack_sig_ofs)
 			remaining -= (unsigned int)(offset - pack_sig_ofs);
-		the_hash_algo->update_fn(&ctx, in, remaining);
+		r->hash_algo->update_fn(&ctx, in, remaining);
 	} while (offset < pack_sig_ofs);
-	the_hash_algo->final_fn(hash, &ctx);
+	r->hash_algo->final_fn(hash, &ctx);
 	pack_sig = use_pack(p, w_curs, pack_sig_ofs, NULL);
 	if (!hasheq(hash, pack_sig))
 		err = error("%s pack checksum mismatch",
 			    p->pack_name);
-	if (!hasheq(index_base + index_size - the_hash_algo->hexsz, pack_sig))
+	if (!hasheq(index_base + index_size - r->hash_algo->hexsz, pack_sig))
 		err = error("%s pack checksum does not match its index",
 			    p->pack_name);
 	unuse_pack(w_curs);
@@ -97,9 +93,6 @@ static int verify_packfile(struct repository *r,
 	entries[nr_objects].offset = pack_sig_ofs;
 	/* first sort entries by pack offset, since unpacking them is more efficient that way */
 	for (i = 0; i < nr_objects; i++) {
-		entries[i].oid.hash = nth_packed_object_sha1(p, i);
-		if (!entries[i].oid.hash)
-			die("internal error pack-check nth-packed-object");
 		entries[i].offset = nth_packed_object_offset(p, i);
 		entries[i].nr = i;
 	}
@@ -107,11 +100,16 @@ static int verify_packfile(struct repository *r,
 
 	for (i = 0; i < nr_objects; i++) {
 		void *data;
+		struct object_id oid;
 		enum object_type type;
 		unsigned long size;
 		off_t curpos;
 		int data_valid;
 
+		if (nth_packed_object_id(&oid, p, entries[i].nr) < 0)
+			BUG("unable to get oid of object %lu from %s",
+			    (unsigned long)entries[i].nr, p->pack_name);
+
 		if (p->index_version > 1) {
 			off_t offset = entries[i].offset;
 			off_t len = entries[i+1].offset - offset;
@@ -119,7 +117,7 @@ static int verify_packfile(struct repository *r,
 			if (check_pack_crc(p, w_curs, offset, len, nr))
 				err = error("index CRC mismatch for object %s "
 					    "from %s at offset %"PRIuMAX"",
-					    oid_to_hex(entries[i].oid.oid),
+					    oid_to_hex(&oid),
 					    p->pack_name, (uintmax_t)offset);
 		}
 
@@ -142,14 +140,14 @@ static int verify_packfile(struct repository *r,
 
 		if (data_valid && !data)
 			err = error("cannot unpack %s from %s at offset %"PRIuMAX"",
-				    oid_to_hex(entries[i].oid.oid), p->pack_name,
+				    oid_to_hex(&oid), p->pack_name,
 				    (uintmax_t)entries[i].offset);
-		else if (check_object_signature(entries[i].oid.oid, data, size, type_name(type)))
+		else if (check_object_signature(r, &oid, data, size, type_name(type)))
 			err = error("packed %s from %s is corrupt",
-				    oid_to_hex(entries[i].oid.oid), p->pack_name);
+				    oid_to_hex(&oid), p->pack_name);
 		else if (fn) {
 			int eaten = 0;
-			err |= fn(entries[i].oid.oid, type, size, data, &eaten);
+			err |= fn(&oid, type, size, data, &eaten);
 			if (eaten)
 				data = NULL;
 		}
@@ -166,22 +164,13 @@ static int verify_packfile(struct repository *r,
 
 int verify_pack_index(struct packed_git *p)
 {
-	off_t index_size;
-	const unsigned char *index_base;
-	git_hash_ctx ctx;
-	unsigned char hash[GIT_MAX_RAWSZ];
 	int err = 0;
 
 	if (open_pack_index(p))
 		return error("packfile %s index not opened", p->pack_name);
-	index_size = p->index_size;
-	index_base = p->index_data;
 
 	/* Verify SHA1 sum of the index file */
-	the_hash_algo->init_fn(&ctx);
-	the_hash_algo->update_fn(&ctx, index_base, (unsigned int)(index_size - the_hash_algo->rawsz));
-	the_hash_algo->final_fn(hash, &ctx);
-	if (!hasheq(hash, index_base + index_size - the_hash_algo->rawsz))
+	if (!hashfile_checksum_valid(p->index_data, p->index_size))
 		err = error("Packfile index for %s hash mismatch",
 			    p->pack_name);
 	return err;
diff --git a/pack-objects.c b/pack-objects.c
index c6250d77f4..fe2a4eace9 100644
--- a/pack-objects.c
+++ b/pack-objects.c
@@ -49,7 +49,7 @@ static void rehash_objects(struct packing_data *pdata)
 		pdata->index_size = 1024;
 
 	free(pdata->index);
-	pdata->index = xcalloc(pdata->index_size, sizeof(*pdata->index));
+	CALLOC_ARRAY(pdata->index, pdata->index_size);
 
 	entry = pdata->objects;
 
@@ -119,7 +119,10 @@ void oe_map_new_pack(struct packing_data *pack)
 {
 	uint32_t i;
 
-	REALLOC_ARRAY(pack->in_pack, pack->nr_alloc);
+	if (pack->in_pack)
+		BUG("packing_data has already been converted to pack array");
+
+	ALLOC_ARRAY(pack->in_pack, pack->nr_alloc);
 
 	for (i = 0; i < pack->nr_objects; i++)
 		pack->in_pack[i] = oe_in_pack(pack, pack->objects + i);
@@ -200,14 +203,14 @@ struct object_entry *packlist_alloc(struct packing_data *pdata,
 
 void oe_set_delta_ext(struct packing_data *pdata,
 		      struct object_entry *delta,
-		      const unsigned char *sha1)
+		      const struct object_id *oid)
 {
 	struct object_entry *base;
 
 	ALLOC_GROW(pdata->ext_bases, pdata->nr_ext + 1, pdata->alloc_ext);
 	base = &pdata->ext_bases[pdata->nr_ext++];
 	memset(base, 0, sizeof(*base));
-	hashcpy(base->idx.oid.hash, sha1);
+	oidcpy(&base->idx.oid, oid);
 
 	/* These flags mark that we are not part of the actual pack output. */
 	base->preferred_base = 1;
diff --git a/pack-objects.h b/pack-objects.h
index 6fe6ae5ee8..dca2351ef9 100644
--- a/pack-objects.h
+++ b/pack-objects.h
@@ -251,159 +251,26 @@ static inline void oe_set_in_pack(struct packing_data *pack,
 				  struct object_entry *e,
 				  struct packed_git *p)
 {
-	if (!p->index)
+	if (pack->in_pack_by_idx) {
+		if (p->index) {
+			e->in_pack_idx = p->index;
+			return;
+		}
+		/*
+		 * We're accessing packs by index, but this pack doesn't have
+		 * an index (e.g., because it was added since we created the
+		 * in_pack_by_idx array). Bail to oe_map_new_pack(), which
+		 * will convert us to using the full in_pack array, and then
+		 * fall through to our in_pack handling.
+		 */
 		oe_map_new_pack(pack);
-	if (pack->in_pack_by_idx)
-		e->in_pack_idx = p->index;
-	else
-		pack->in_pack[e - pack->objects] = p;
-}
-
-static inline struct object_entry *oe_delta(
-		const struct packing_data *pack,
-		const struct object_entry *e)
-{
-	if (!e->delta_idx)
-		return NULL;
-	if (e->ext_base)
-		return &pack->ext_bases[e->delta_idx - 1];
-	else
-		return &pack->objects[e->delta_idx - 1];
-}
-
-static inline void oe_set_delta(struct packing_data *pack,
-				struct object_entry *e,
-				struct object_entry *delta)
-{
-	if (delta)
-		e->delta_idx = (delta - pack->objects) + 1;
-	else
-		e->delta_idx = 0;
+	}
+	pack->in_pack[e - pack->objects] = p;
 }
 
 void oe_set_delta_ext(struct packing_data *pack,
 		      struct object_entry *e,
-		      const unsigned char *sha1);
-
-static inline struct object_entry *oe_delta_child(
-		const struct packing_data *pack,
-		const struct object_entry *e)
-{
-	if (e->delta_child_idx)
-		return &pack->objects[e->delta_child_idx - 1];
-	return NULL;
-}
-
-static inline void oe_set_delta_child(struct packing_data *pack,
-				      struct object_entry *e,
-				      struct object_entry *delta)
-{
-	if (delta)
-		e->delta_child_idx = (delta - pack->objects) + 1;
-	else
-		e->delta_child_idx = 0;
-}
-
-static inline struct object_entry *oe_delta_sibling(
-		const struct packing_data *pack,
-		const struct object_entry *e)
-{
-	if (e->delta_sibling_idx)
-		return &pack->objects[e->delta_sibling_idx - 1];
-	return NULL;
-}
-
-static inline void oe_set_delta_sibling(struct packing_data *pack,
-					struct object_entry *e,
-					struct object_entry *delta)
-{
-	if (delta)
-		e->delta_sibling_idx = (delta - pack->objects) + 1;
-	else
-		e->delta_sibling_idx = 0;
-}
-
-unsigned long oe_get_size_slow(struct packing_data *pack,
-			       const struct object_entry *e);
-static inline unsigned long oe_size(struct packing_data *pack,
-				    const struct object_entry *e)
-{
-	if (e->size_valid)
-		return e->size_;
-
-	return oe_get_size_slow(pack, e);
-}
-
-static inline int oe_size_less_than(struct packing_data *pack,
-				    const struct object_entry *lhs,
-				    unsigned long rhs)
-{
-	if (lhs->size_valid)
-		return lhs->size_ < rhs;
-	if (rhs < pack->oe_size_limit) /* rhs < 2^x <= lhs ? */
-		return 0;
-	return oe_get_size_slow(pack, lhs) < rhs;
-}
-
-static inline int oe_size_greater_than(struct packing_data *pack,
-				       const struct object_entry *lhs,
-				       unsigned long rhs)
-{
-	if (lhs->size_valid)
-		return lhs->size_ > rhs;
-	if (rhs < pack->oe_size_limit) /* rhs < 2^x <= lhs ? */
-		return 1;
-	return oe_get_size_slow(pack, lhs) > rhs;
-}
-
-static inline void oe_set_size(struct packing_data *pack,
-			       struct object_entry *e,
-			       unsigned long size)
-{
-	if (size < pack->oe_size_limit) {
-		e->size_ = size;
-		e->size_valid = 1;
-	} else {
-		e->size_valid = 0;
-		if (oe_get_size_slow(pack, e) != size)
-			BUG("'size' is supposed to be the object size!");
-	}
-}
-
-static inline unsigned long oe_delta_size(struct packing_data *pack,
-					  const struct object_entry *e)
-{
-	if (e->delta_size_valid)
-		return e->delta_size_;
-
-	/*
-	 * pack->delta_size[] can't be NULL because oe_set_delta_size()
-	 * must have been called when a new delta is saved with
-	 * oe_set_delta().
-	 * If oe_delta() returns NULL (i.e. default state, which means
-	 * delta_size_valid is also false), then the caller must never
-	 * call oe_delta_size().
-	 */
-	return pack->delta_size[e - pack->objects];
-}
-
-static inline void oe_set_delta_size(struct packing_data *pack,
-				     struct object_entry *e,
-				     unsigned long size)
-{
-	if (size < pack->oe_delta_size_limit) {
-		e->delta_size_ = size;
-		e->delta_size_valid = 1;
-	} else {
-		packing_data_lock(pack);
-		if (!pack->delta_size)
-			ALLOC_ARRAY(pack->delta_size, pack->nr_alloc);
-		packing_data_unlock(pack);
-
-		pack->delta_size[e - pack->objects] = size;
-		e->delta_size_valid = 0;
-	}
-}
+		      const struct object_id *oid);
 
 static inline unsigned int oe_tree_depth(struct packing_data *pack,
 					 struct object_entry *e)
@@ -413,23 +280,6 @@ static inline unsigned int oe_tree_depth(struct packing_data *pack,
 	return pack->tree_depth[e - pack->objects];
 }
 
-static inline void oe_set_tree_depth(struct packing_data *pack,
-				     struct object_entry *e,
-				     unsigned int tree_depth)
-{
-	if (!pack->tree_depth)
-		CALLOC_ARRAY(pack->tree_depth, pack->nr_alloc);
-	pack->tree_depth[e - pack->objects] = tree_depth;
-}
-
-static inline unsigned char oe_layer(struct packing_data *pack,
-				     struct object_entry *e)
-{
-	if (!pack->layer)
-		return 0;
-	return pack->layer[e - pack->objects];
-}
-
 static inline void oe_set_layer(struct packing_data *pack,
 				struct object_entry *e,
 				unsigned char layer)
diff --git a/pack-revindex.c b/pack-revindex.c
index d28a7e43d0..0e4a31d9db 100644
--- a/pack-revindex.c
+++ b/pack-revindex.c
@@ -2,6 +2,13 @@
 #include "pack-revindex.h"
 #include "object-store.h"
 #include "packfile.h"
+#include "config.h"
+#include "midx.h"
+
+struct revindex_entry {
+	off_t offset;
+	unsigned int nr;
+};
 
 /*
  * Pack index for existing packs give us easy access to the offsets into
@@ -130,7 +137,7 @@ static void create_pack_revindex(struct packed_git *p)
 
 	if (p->index_version > 1) {
 		const uint32_t *off_32 =
-			(uint32_t *)(index + 8 + p->num_objects * (hashsz + 4));
+			(uint32_t *)(index + 8 + (size_t)p->num_objects * (hashsz + 4));
 		const uint32_t *off_64 = off_32 + p->num_objects;
 		for (i = 0; i < num_ent; i++) {
 			const uint32_t off = ntohl(*off_32++);
@@ -159,27 +166,189 @@ static void create_pack_revindex(struct packed_git *p)
 	sort_revindex(p->revindex, num_ent, p->pack_size);
 }
 
-int load_pack_revindex(struct packed_git *p)
+static int create_pack_revindex_in_memory(struct packed_git *p)
+{
+	if (git_env_bool(GIT_TEST_REV_INDEX_DIE_IN_MEMORY, 0))
+		die("dying as requested by '%s'",
+		    GIT_TEST_REV_INDEX_DIE_IN_MEMORY);
+	if (open_pack_index(p))
+		return -1;
+	create_pack_revindex(p);
+	return 0;
+}
+
+static char *pack_revindex_filename(struct packed_git *p)
+{
+	size_t len;
+	if (!strip_suffix(p->pack_name, ".pack", &len))
+		BUG("pack_name does not end in .pack");
+	return xstrfmt("%.*s.rev", (int)len, p->pack_name);
+}
+
+#define RIDX_HEADER_SIZE (12)
+#define RIDX_MIN_SIZE (RIDX_HEADER_SIZE + (2 * the_hash_algo->rawsz))
+
+struct revindex_header {
+	uint32_t signature;
+	uint32_t version;
+	uint32_t hash_id;
+};
+
+static int load_revindex_from_disk(char *revindex_name,
+				   uint32_t num_objects,
+				   const uint32_t **data_p, size_t *len_p)
 {
-	if (!p->revindex) {
-		if (open_pack_index(p))
-			return -1;
-		create_pack_revindex(p);
+	int fd, ret = 0;
+	struct stat st;
+	void *data = NULL;
+	size_t revindex_size;
+	struct revindex_header *hdr;
+
+	fd = git_open(revindex_name);
+
+	if (fd < 0) {
+		ret = -1;
+		goto cleanup;
+	}
+	if (fstat(fd, &st)) {
+		ret = error_errno(_("failed to read %s"), revindex_name);
+		goto cleanup;
+	}
+
+	revindex_size = xsize_t(st.st_size);
+
+	if (revindex_size < RIDX_MIN_SIZE) {
+		ret = error(_("reverse-index file %s is too small"), revindex_name);
+		goto cleanup;
+	}
+
+	if (revindex_size - RIDX_MIN_SIZE != st_mult(sizeof(uint32_t), num_objects)) {
+		ret = error(_("reverse-index file %s is corrupt"), revindex_name);
+		goto cleanup;
+	}
+
+	data = xmmap(NULL, revindex_size, PROT_READ, MAP_PRIVATE, fd, 0);
+	hdr = data;
+
+	if (ntohl(hdr->signature) != RIDX_SIGNATURE) {
+		ret = error(_("reverse-index file %s has unknown signature"), revindex_name);
+		goto cleanup;
 	}
+	if (ntohl(hdr->version) != 1) {
+		ret = error(_("reverse-index file %s has unsupported version %"PRIu32),
+			    revindex_name, ntohl(hdr->version));
+		goto cleanup;
+	}
+	if (!(ntohl(hdr->hash_id) == 1 || ntohl(hdr->hash_id) == 2)) {
+		ret = error(_("reverse-index file %s has unsupported hash id %"PRIu32),
+			    revindex_name, ntohl(hdr->hash_id));
+		goto cleanup;
+	}
+
+cleanup:
+	if (ret) {
+		if (data)
+			munmap(data, revindex_size);
+	} else {
+		*len_p = revindex_size;
+		*data_p = (const uint32_t *)data;
+	}
+
+	if (fd >= 0)
+		close(fd);
+	return ret;
+}
+
+static int load_pack_revindex_from_disk(struct packed_git *p)
+{
+	char *revindex_name;
+	int ret;
+	if (open_pack_index(p))
+		return -1;
+
+	revindex_name = pack_revindex_filename(p);
+
+	ret = load_revindex_from_disk(revindex_name,
+				      p->num_objects,
+				      &p->revindex_map,
+				      &p->revindex_size);
+	if (ret)
+		goto cleanup;
+
+	p->revindex_data = (const uint32_t *)((const char *)p->revindex_map + RIDX_HEADER_SIZE);
+
+cleanup:
+	free(revindex_name);
+	return ret;
+}
+
+int load_pack_revindex(struct packed_git *p)
+{
+	if (p->revindex || p->revindex_data)
+		return 0;
+
+	if (!load_pack_revindex_from_disk(p))
+		return 0;
+	else if (!create_pack_revindex_in_memory(p))
+		return 0;
+	return -1;
+}
+
+int load_midx_revindex(struct multi_pack_index *m)
+{
+	char *revindex_name;
+	int ret;
+	if (m->revindex_data)
+		return 0;
+
+	revindex_name = get_midx_rev_filename(m);
+
+	ret = load_revindex_from_disk(revindex_name,
+				      m->num_objects,
+				      &m->revindex_map,
+				      &m->revindex_len);
+	if (ret)
+		goto cleanup;
+
+	m->revindex_data = (const uint32_t *)((const char *)m->revindex_map + RIDX_HEADER_SIZE);
+
+cleanup:
+	free(revindex_name);
+	return ret;
+}
+
+int close_midx_revindex(struct multi_pack_index *m)
+{
+	if (!m || !m->revindex_map)
+		return 0;
+
+	munmap((void*)m->revindex_map, m->revindex_len);
+
+	m->revindex_map = NULL;
+	m->revindex_data = NULL;
+	m->revindex_len = 0;
+
 	return 0;
 }
 
-int find_revindex_position(struct packed_git *p, off_t ofs)
+int offset_to_pack_pos(struct packed_git *p, off_t ofs, uint32_t *pos)
 {
-	int lo = 0;
-	int hi = p->num_objects + 1;
-	const struct revindex_entry *revindex = p->revindex;
+	unsigned lo, hi;
+
+	if (load_pack_revindex(p) < 0)
+		return -1;
+
+	lo = 0;
+	hi = p->num_objects + 1;
 
 	do {
 		const unsigned mi = lo + (hi - lo) / 2;
-		if (revindex[mi].offset == ofs) {
-			return mi;
-		} else if (ofs < revindex[mi].offset)
+		off_t got = pack_pos_to_offset(p, mi);
+
+		if (got == ofs) {
+			*pos = mi;
+			return 0;
+		} else if (ofs < got)
 			hi = mi;
 		else
 			lo = mi + 1;
@@ -189,17 +358,118 @@ int find_revindex_position(struct packed_git *p, off_t ofs)
 	return -1;
 }
 
-struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs)
+uint32_t pack_pos_to_index(struct packed_git *p, uint32_t pos)
 {
-	int pos;
+	if (!(p->revindex || p->revindex_data))
+		BUG("pack_pos_to_index: reverse index not yet loaded");
+	if (p->num_objects <= pos)
+		BUG("pack_pos_to_index: out-of-bounds object at %"PRIu32, pos);
 
-	if (load_pack_revindex(p))
-		return NULL;
+	if (p->revindex)
+		return p->revindex[pos].nr;
+	else
+		return get_be32(p->revindex_data + pos);
+}
+
+off_t pack_pos_to_offset(struct packed_git *p, uint32_t pos)
+{
+	if (!(p->revindex || p->revindex_data))
+		BUG("pack_pos_to_index: reverse index not yet loaded");
+	if (p->num_objects < pos)
+		BUG("pack_pos_to_offset: out-of-bounds object at %"PRIu32, pos);
+
+	if (p->revindex)
+		return p->revindex[pos].offset;
+	else if (pos == p->num_objects)
+		return p->pack_size - the_hash_algo->rawsz;
+	else
+		return nth_packed_object_offset(p, pack_pos_to_index(p, pos));
+}
+
+uint32_t pack_pos_to_midx(struct multi_pack_index *m, uint32_t pos)
+{
+	if (!m->revindex_data)
+		BUG("pack_pos_to_midx: reverse index not yet loaded");
+	if (m->num_objects <= pos)
+		BUG("pack_pos_to_midx: out-of-bounds object at %"PRIu32, pos);
+	return get_be32(m->revindex_data + pos);
+}
 
-	pos = find_revindex_position(p, ofs);
+struct midx_pack_key {
+	uint32_t pack;
+	off_t offset;
 
-	if (pos < 0)
-		return NULL;
+	uint32_t preferred_pack;
+	struct multi_pack_index *midx;
+};
 
-	return p->revindex + pos;
+static int midx_pack_order_cmp(const void *va, const void *vb)
+{
+	const struct midx_pack_key *key = va;
+	struct multi_pack_index *midx = key->midx;
+
+	uint32_t versus = pack_pos_to_midx(midx, (uint32_t*)vb - (const uint32_t *)midx->revindex_data);
+	uint32_t versus_pack = nth_midxed_pack_int_id(midx, versus);
+	off_t versus_offset;
+
+	uint32_t key_preferred = key->pack == key->preferred_pack;
+	uint32_t versus_preferred = versus_pack == key->preferred_pack;
+
+	/*
+	 * First, compare the preferred-ness, noting that the preferred pack
+	 * comes first.
+	 */
+	if (key_preferred && !versus_preferred)
+		return -1;
+	else if (!key_preferred && versus_preferred)
+		return 1;
+
+	/* Then, break ties first by comparing the pack IDs. */
+	if (key->pack < versus_pack)
+		return -1;
+	else if (key->pack > versus_pack)
+		return 1;
+
+	/* Finally, break ties by comparing offsets within a pack. */
+	versus_offset = nth_midxed_offset(midx, versus);
+	if (key->offset < versus_offset)
+		return -1;
+	else if (key->offset > versus_offset)
+		return 1;
+
+	return 0;
+}
+
+int midx_to_pack_pos(struct multi_pack_index *m, uint32_t at, uint32_t *pos)
+{
+	struct midx_pack_key key;
+	uint32_t *found;
+
+	if (!m->revindex_data)
+		BUG("midx_to_pack_pos: reverse index not yet loaded");
+	if (m->num_objects <= at)
+		BUG("midx_to_pack_pos: out-of-bounds object at %"PRIu32, at);
+
+	key.pack = nth_midxed_pack_int_id(m, at);
+	key.offset = nth_midxed_offset(m, at);
+	key.midx = m;
+	/*
+	 * The preferred pack sorts first, so determine its identifier by
+	 * looking at the first object in pseudo-pack order.
+	 *
+	 * Note that if no --preferred-pack is explicitly given when writing a
+	 * multi-pack index, then whichever pack has the lowest identifier
+	 * implicitly is preferred (and includes all its objects, since ties are
+	 * broken first by pack identifier).
+	 */
+	key.preferred_pack = nth_midxed_pack_int_id(m, pack_pos_to_midx(m, 0));
+
+	found = bsearch(&key, m->revindex_data, m->num_objects,
+			sizeof(*m->revindex_data), midx_pack_order_cmp);
+
+	if (!found)
+		return error("bad offset for revindex");
+
+	*pos = found - m->revindex_data;
+	return 0;
 }
diff --git a/pack-revindex.h b/pack-revindex.h
index 848331d5d6..479b8f2f9c 100644
--- a/pack-revindex.h
+++ b/pack-revindex.h
@@ -1,16 +1,127 @@
 #ifndef PACK_REVINDEX_H
 #define PACK_REVINDEX_H
 
-struct packed_git;
+/**
+ * A revindex allows converting efficiently between three properties
+ * of an object within a pack:
+ *
+ * - index position: the numeric position within the list of sorted object ids
+ *   found in the .idx file
+ *
+ * - pack position: the numeric position within the list of objects in their
+ *   order within the actual .pack file (i.e., 0 is the first object in the
+ *   .pack, 1 is the second, and so on)
+ *
+ * - offset: the byte offset within the .pack file at which the object contents
+ *   can be found
+ *
+ * The revindex can also be used with a multi-pack index (MIDX). In this
+ * setting:
+ *
+ *   - index position refers to an object's numeric position within the MIDX
+ *
+ *   - pack position refers to an object's position within a non-existent pack
+ *     described by the MIDX. The pack structure is described in
+ *     Documentation/technical/pack-format.txt.
+ *
+ *     It is effectively a concatanation of all packs in the MIDX (ordered by
+ *     their numeric ID within the MIDX) in their original order within each
+ *     pack), removing duplicates, and placing the preferred pack (if any)
+ *     first.
+ */
+
+
+#define RIDX_SIGNATURE 0x52494458 /* "RIDX" */
+#define RIDX_VERSION 1
 
-struct revindex_entry {
-	off_t offset;
-	unsigned int nr;
-};
+#define GIT_TEST_WRITE_REV_INDEX "GIT_TEST_WRITE_REV_INDEX"
+#define GIT_TEST_REV_INDEX_DIE_IN_MEMORY "GIT_TEST_REV_INDEX_DIE_IN_MEMORY"
 
+struct packed_git;
+struct multi_pack_index;
+
+/*
+ * load_pack_revindex populates the revindex's internal data-structures for the
+ * given pack, returning zero on success and a negative value otherwise.
+ *
+ * If a '.rev' file is present it is mmap'd, and pointers are assigned into it
+ * (instead of using the in-memory variant).
+ */
 int load_pack_revindex(struct packed_git *p);
-int find_revindex_position(struct packed_git *p, off_t ofs);
 
-struct revindex_entry *find_pack_revindex(struct packed_git *p, off_t ofs);
+/*
+ * load_midx_revindex loads the '.rev' file corresponding to the given
+ * multi-pack index by mmap-ing it and assigning pointers in the
+ * multi_pack_index to point at it.
+ *
+ * A negative number is returned on error.
+ */
+int load_midx_revindex(struct multi_pack_index *m);
+
+/*
+ * Frees resources associated with a multi-pack reverse index.
+ *
+ * A negative number is returned on error.
+ */
+int close_midx_revindex(struct multi_pack_index *m);
+
+/*
+ * offset_to_pack_pos converts an object offset to a pack position. This
+ * function returns zero on success, and a negative number otherwise. The
+ * parameter 'pos' is usable only on success.
+ *
+ * If the reverse index has not yet been loaded, this function loads it lazily,
+ * and returns an negative number if an error was encountered.
+ *
+ * This function runs in time O(log N) with the number of objects in the pack.
+ */
+int offset_to_pack_pos(struct packed_git *p, off_t ofs, uint32_t *pos);
+
+/*
+ * pack_pos_to_index converts the given pack-relative position 'pos' by
+ * returning an index-relative position.
+ *
+ * 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.
+ */
+uint32_t pack_pos_to_index(struct packed_git *p, uint32_t pos);
+
+/*
+ * pack_pos_to_offset converts the given pack-relative position 'pos' into a
+ * pack offset. For a pack with 'N' objects, asking for position 'N' will return
+ * the total size (in bytes) of the pack.
+ *
+ * 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 under both in-memory and on-disk reverse
+ * indexes, but an additional step is taken to consult the corresponding .idx
+ * file when using the on-disk format.
+ */
+off_t pack_pos_to_offset(struct packed_git *p, uint32_t pos);
+
+/*
+ * pack_pos_to_midx converts the object at position "pos" within the MIDX
+ * pseudo-pack into a MIDX position.
+ *
+ * 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.
+ */
+uint32_t pack_pos_to_midx(struct multi_pack_index *m, uint32_t pos);
+
+/*
+ * midx_to_pack_pos converts from the MIDX-relative position at "at" to the
+ * corresponding pack position.
+ *
+ * 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.
+ */
+int midx_to_pack_pos(struct multi_pack_index *midx, uint32_t at, uint32_t *pos);
 
 #endif
diff --git a/pack-write.c b/pack-write.c
index f0017beb9d..2767b78619 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "pack.h"
 #include "csum-file.h"
+#include "remote.h"
 
 void reset_pack_idx_option(struct pack_idx_option *opts)
 {
@@ -38,9 +39,8 @@ static int need_large_offset(off_t offset, const struct pack_idx_option *opts)
 }
 
 /*
- * On entry *sha1 contains the pack content SHA1 hash, on exit it is
- * the SHA1 hash of sorted object names. The objects array passed in
- * will be sorted by SHA1 on exit.
+ * The *sha1 contains the pack content SHA1 hash.
+ * The objects array passed in will be sorted by SHA1 on exit.
  */
 const char *write_idx_file(const char *index_name, struct pack_idx_entry **objects,
 			   int nr_objects, const struct pack_idx_option *opts,
@@ -49,7 +49,6 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 	struct hashfile *f;
 	struct pack_idx_entry **sorted_by_sha, **list, **last;
 	off_t last_obj_offset = 0;
-	uint32_t array[256];
 	int i, fd;
 	uint32_t index_version;
 
@@ -76,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);
 	}
@@ -107,10 +104,9 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 				break;
 			next++;
 		}
-		array[i] = htonl(next - sorted_by_sha);
+		hashwrite_be32(f, next - sorted_by_sha);
 		list = next;
 	}
-	hashwrite(f, array, 256 * 4);
 
 	/*
 	 * Write the actual SHA1 entries..
@@ -118,10 +114,8 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 	list = sorted_by_sha;
 	for (i = 0; i < nr_objects; i++) {
 		struct pack_idx_entry *obj = *list++;
-		if (index_version < 2) {
-			uint32_t offset = htonl(obj->offset);
-			hashwrite(f, &offset, 4);
-		}
+		if (index_version < 2)
+			hashwrite_be32(f, obj->offset);
 		hashwrite(f, obj->oid.hash, the_hash_algo->rawsz);
 		if ((opts->flags & WRITE_IDX_STRICT) &&
 		    (i && oideq(&list[-2]->oid, &obj->oid)))
@@ -136,8 +130,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 		list = sorted_by_sha;
 		for (i = 0; i < nr_objects; i++) {
 			struct pack_idx_entry *obj = *list++;
-			uint32_t crc32_val = htonl(obj->crc32);
-			hashwrite(f, &crc32_val, 4);
+			hashwrite_be32(f, obj->crc32);
 		}
 
 		/* write the 32-bit offset table */
@@ -149,8 +142,7 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 			offset = (need_large_offset(obj->offset, opts)
 				  ? (0x80000000 | nr_large_offset++)
 				  : obj->offset);
-			offset = htonl(offset);
-			hashwrite(f, &offset, 4);
+			hashwrite_be32(f, offset);
 		}
 
 		/* write the large offset table */
@@ -158,13 +150,10 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 		while (nr_large_offset) {
 			struct pack_idx_entry *obj = *list++;
 			uint64_t offset = obj->offset;
-			uint32_t split[2];
 
 			if (!need_large_offset(offset, opts))
 				continue;
-			split[0] = htonl(offset >> 32);
-			split[1] = htonl(offset & 0xffffffff);
-			hashwrite(f, split, 8);
+			hashwrite_be64(f, offset);
 			nr_large_offset--;
 		}
 	}
@@ -176,6 +165,125 @@ const char *write_idx_file(const char *index_name, struct pack_idx_entry **objec
 	return index_name;
 }
 
+static int pack_order_cmp(const void *va, const void *vb, void *ctx)
+{
+	struct pack_idx_entry **objects = ctx;
+
+	off_t oa = objects[*(uint32_t*)va]->offset;
+	off_t ob = objects[*(uint32_t*)vb]->offset;
+
+	if (oa < ob)
+		return -1;
+	if (oa > ob)
+		return 1;
+	return 0;
+}
+
+static void write_rev_header(struct hashfile *f)
+{
+	uint32_t oid_version;
+	switch (hash_algo_by_ptr(the_hash_algo)) {
+	case GIT_HASH_SHA1:
+		oid_version = 1;
+		break;
+	case GIT_HASH_SHA256:
+		oid_version = 2;
+		break;
+	default:
+		die("write_rev_header: unknown hash version");
+	}
+
+	hashwrite_be32(f, RIDX_SIGNATURE);
+	hashwrite_be32(f, RIDX_VERSION);
+	hashwrite_be32(f, oid_version);
+}
+
+static void write_rev_index_positions(struct hashfile *f,
+				      uint32_t *pack_order,
+				      uint32_t nr_objects)
+{
+	uint32_t i;
+	for (i = 0; i < nr_objects; i++)
+		hashwrite_be32(f, pack_order[i]);
+}
+
+static void write_rev_trailer(struct hashfile *f, const unsigned char *hash)
+{
+	hashwrite(f, hash, the_hash_algo->rawsz);
+}
+
+const char *write_rev_file(const char *rev_name,
+			   struct pack_idx_entry **objects,
+			   uint32_t nr_objects,
+			   const unsigned char *hash,
+			   unsigned flags)
+{
+	uint32_t *pack_order;
+	uint32_t i;
+	const char *ret;
+
+	ALLOC_ARRAY(pack_order, nr_objects);
+	for (i = 0; i < nr_objects; i++)
+		pack_order[i] = i;
+	QSORT_S(pack_order, nr_objects, pack_order_cmp, objects);
+
+	ret = write_rev_file_order(rev_name, pack_order, nr_objects, hash,
+				   flags);
+
+	free(pack_order);
+
+	return ret;
+}
+
+const char *write_rev_file_order(const char *rev_name,
+				 uint32_t *pack_order,
+				 uint32_t nr_objects,
+				 const unsigned char *hash,
+				 unsigned flags)
+{
+	struct hashfile *f;
+	int fd;
+
+	if ((flags & WRITE_REV) && (flags & WRITE_REV_VERIFY))
+		die(_("cannot both write and verify reverse index"));
+
+	if (flags & WRITE_REV) {
+		if (!rev_name) {
+			struct strbuf tmp_file = STRBUF_INIT;
+			fd = odb_mkstemp(&tmp_file, "pack/tmp_rev_XXXXXX");
+			rev_name = strbuf_detach(&tmp_file, NULL);
+		} else {
+			unlink(rev_name);
+			fd = xopen(rev_name, O_CREAT|O_EXCL|O_WRONLY, 0600);
+		}
+		f = hashfd(fd, rev_name);
+	} else if (flags & WRITE_REV_VERIFY) {
+		struct stat statbuf;
+		if (stat(rev_name, &statbuf)) {
+			if (errno == ENOENT) {
+				/* .rev files are optional */
+				return NULL;
+			} else
+				die_errno(_("could not stat: %s"), rev_name);
+		}
+		f = hashfd_check(rev_name);
+	} else
+		return NULL;
+
+	write_rev_header(f);
+
+	write_rev_index_positions(f, pack_order, nr_objects);
+	write_rev_trailer(f, hash);
+
+	if (rev_name && adjust_shared_perm(rev_name) < 0)
+		die(_("failed to make %s readable"), rev_name);
+
+	finalize_hashfile(f, NULL, CSUM_HASH_IN_STREAM | CSUM_CLOSE |
+				    ((flags & WRITE_IDX_VERIFY) ? 0 : CSUM_FSYNC));
+
+	return rev_name;
+}
+
 off_t write_pack_header(struct hashfile *f, uint32_t nr_entries)
 {
 	struct pack_header hdr;
@@ -282,7 +390,7 @@ void fixup_pack_header_footer(int pack_fd,
 	fsync_or_die(pack_fd, pack_name);
 }
 
-char *index_pack_lockfile(int ip_out)
+char *index_pack_lockfile(int ip_out, int *is_well_formed)
 {
 	char packname[GIT_MAX_HEXSZ + 6];
 	const int len = the_hash_algo->hexsz + 6;
@@ -296,11 +404,17 @@ char *index_pack_lockfile(int ip_out)
 	 */
 	if (read_in_full(ip_out, packname, len) == len && packname[len-1] == '\n') {
 		const char *name;
+
+		if (is_well_formed)
+			*is_well_formed = 1;
 		packname[len-1] = 0;
 		if (skip_prefix(packname, "keep\t", &name))
 			return xstrfmt("%s/pack/pack-%s.keep",
 				       get_object_directory(), name);
+		return NULL;
 	}
+	if (is_well_formed)
+		*is_well_formed = 0;
 	return NULL;
 }
 
@@ -351,7 +465,7 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
 			 struct pack_idx_option *pack_idx_opts,
 			 unsigned char hash[])
 {
-	const char *idx_tmp_name;
+	const char *idx_tmp_name, *rev_tmp_name = NULL;
 	int basename_len = name_buffer->len;
 
 	if (adjust_shared_perm(pack_tmp_name))
@@ -362,6 +476,9 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
 	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))
@@ -375,5 +492,28 @@ void finish_tmp_packfile(struct strbuf *name_buffer,
 
 	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);
 }
+
+void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought)
+{
+	int i, err;
+	FILE *output = xfopen(promisor_name, "w");
+
+	for (i = 0; i < nr_sought; i++)
+		fprintf(output, "%s %s\n", oid_to_hex(&sought[i]->old_oid),
+			sought[i]->name);
+
+	err = ferror(output);
+	err |= fclose(output);
+	if (err)
+		die(_("could not write '%s' promisor file"), promisor_name);
+}
diff --git a/pack.h b/pack.h
index 9fc0945ac9..fa13954526 100644
--- a/pack.h
+++ b/pack.h
@@ -42,6 +42,8 @@ struct pack_idx_option {
 	/* flag bits */
 #define WRITE_IDX_VERIFY 01 /* verify only, do not write the idx file */
 #define WRITE_IDX_STRICT 02
+#define WRITE_REV 04
+#define WRITE_REV_VERIFY 010
 
 	uint32_t version;
 	uint32_t off32_limit;
@@ -85,7 +87,14 @@ int verify_pack_index(struct packed_git *);
 int verify_pack(struct repository *, struct packed_git *, verify_fn fn, struct progress *, uint32_t);
 off_t write_pack_header(struct hashfile *f, uint32_t);
 void fixup_pack_header_footer(int, unsigned char *, const char *, uint32_t, unsigned char *, off_t);
-char *index_pack_lockfile(int fd);
+char *index_pack_lockfile(int fd, int *is_well_formed);
+
+struct ref;
+
+void write_promisor_file(const char *promisor_name, struct ref **sought, int nr_sought);
+
+const char *write_rev_file(const char *rev_name, struct pack_idx_entry **objects, uint32_t nr_objects, const unsigned char *hash, unsigned flags);
+const char *write_rev_file_order(const char *rev_name, uint32_t *pack_order, uint32_t nr_objects, const unsigned char *hash, unsigned flags);
 
 /*
  * The "hdr" output buffer should be at least this big, which will handle sizes
diff --git a/packfile.c b/packfile.c
index 355066de17..4d0d625238 100644
--- a/packfile.c
+++ b/packfile.c
@@ -7,7 +7,7 @@
 #include "packfile.h"
 #include "delta.h"
 #include "streaming.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 #include "commit.h"
 #include "object.h"
 #include "tag.h"
@@ -148,7 +148,7 @@ int load_idx(const char *path, const unsigned int hashsz, void *idx_map,
 		 *  - hash of the packfile
 		 *  - file checksum
 		 */
-		if (idx_size != 4 * 256 + nr * (hashsz + 4) + hashsz + hashsz)
+		if (idx_size != st_add(4 * 256 + hashsz + hashsz, st_mult(nr, hashsz + 4)))
 			return error("wrong index v1 file size in %s", path);
 	} else if (version == 2) {
 		/*
@@ -164,10 +164,10 @@ int load_idx(const char *path, const unsigned int hashsz, void *idx_map,
 		 * variable sized table containing 8-byte entries
 		 * for offsets larger than 2^31.
 		 */
-		unsigned long min_size = 8 + 4*256 + nr*(hashsz + 4 + 4) + hashsz + hashsz;
-		unsigned long max_size = min_size;
+		size_t min_size = st_add(8 + 4*256 + hashsz + hashsz, st_mult(nr, hashsz + 4 + 4));
+		size_t max_size = min_size;
 		if (nr)
-			max_size += (nr - 1)*8;
+			max_size = st_add(max_size, st_mult(nr - 1, 8));
 		if (idx_size < min_size || idx_size > max_size)
 			return error("wrong index v2 file size in %s", path);
 		if (idx_size != min_size &&
@@ -178,6 +178,7 @@ int load_idx(const char *path, const unsigned int hashsz, void *idx_map,
 		     */
 		    (sizeof(off_t) <= 4))
 			return error("pack too large for current definition of off_t in %s", path);
+		p->crc_offset = 8 + 4 * 256 + nr * hashsz;
 	}
 
 	p->index_version = version;
@@ -323,11 +324,21 @@ void close_pack_index(struct packed_git *p)
 	}
 }
 
+void close_pack_revindex(struct packed_git *p) {
+	if (!p->revindex_map)
+		return;
+
+	munmap((void *)p->revindex_map, p->revindex_size);
+	p->revindex_map = NULL;
+	p->revindex_data = NULL;
+}
+
 void close_pack(struct packed_git *p)
 {
 	close_pack_windows(p);
 	close_pack_fd(p);
 	close_pack_index(p);
+	close_pack_revindex(p);
 }
 
 void close_object_store(struct raw_object_store *o)
@@ -350,7 +361,7 @@ void close_object_store(struct raw_object_store *o)
 
 void unlink_pack_path(const char *pack_name, int force_delete)
 {
-	static const char *exts[] = {".pack", ".idx", ".keep", ".bitmap", ".promisor"};
+	static const char *exts[] = {".pack", ".idx", ".rev", ".keep", ".bitmap", ".promisor"};
 	int i;
 	struct strbuf buf = STRBUF_INIT;
 	size_t plen;
@@ -510,23 +521,11 @@ static int open_packed_git_1(struct packed_git *p)
 	struct pack_header hdr;
 	unsigned char hash[GIT_MAX_RAWSZ];
 	unsigned char *idx_hash;
-	long fd_flag;
 	ssize_t read_result;
 	const unsigned hashsz = the_hash_algo->rawsz;
 
-	if (!p->index_data) {
-		struct multi_pack_index *m;
-		const char *pack_name = pack_basename(p);
-
-		for (m = the_repository->objects->multi_pack_index;
-		     m; m = m->next) {
-			if (midx_contains_pack(m, pack_name))
-				break;
-		}
-
-		if (!m && open_pack_index(p))
-			return error("packfile %s index unavailable", p->pack_name);
-	}
+	if (open_pack_index(p))
+		return error("packfile %s index unavailable", p->pack_name);
 
 	if (!pack_max_fds) {
 		unsigned int max_fds = get_max_fd_limit();
@@ -554,16 +553,6 @@ static int open_packed_git_1(struct packed_git *p)
 	} else if (p->pack_size != st.st_size)
 		return error("packfile %s size changed", p->pack_name);
 
-	/* We leave these file descriptors open with sliding mmap;
-	 * there is no point keeping them open across exec(), though.
-	 */
-	fd_flag = fcntl(p->pack_fd, F_GETFD, 0);
-	if (fd_flag < 0)
-		return error("cannot determine file descriptor flags");
-	fd_flag |= FD_CLOEXEC;
-	if (fcntl(p->pack_fd, F_SETFD, fd_flag) == -1)
-		return error("cannot set FD_CLOEXEC");
-
 	/* Verify we recognize this pack file format. */
 	read_result = read_in_full(p->pack_fd, &hdr, sizeof(hdr));
 	if (read_result < 0)
@@ -577,19 +566,14 @@ static int open_packed_git_1(struct packed_git *p)
 			" supported (try upgrading GIT to a newer version)",
 			p->pack_name, ntohl(hdr.hdr_version));
 
-	/* Skip index checking if in multi-pack-index */
-	if (!p->index_data)
-		return 0;
-
 	/* Verify the pack matches its index. */
 	if (p->num_objects != ntohl(hdr.hdr_entries))
 		return error("packfile %s claims to have %"PRIu32" objects"
 			     " while index indicates %"PRIu32" objects",
 			     p->pack_name, ntohl(hdr.hdr_entries),
 			     p->num_objects);
-	if (lseek(p->pack_fd, p->pack_size - hashsz, SEEK_SET) == -1)
-		return error("end of packfile %s is unavailable", p->pack_name);
-	read_result = read_in_full(p->pack_fd, hash, hashsz);
+	read_result = pread_in_full(p->pack_fd, hash, hashsz,
+					p->pack_size - hashsz);
 	if (read_result < 0)
 		return error_errno("error reading from %s", p->pack_name);
 	if (read_result != hashsz)
@@ -654,7 +638,7 @@ unsigned char *use_pack(struct packed_git *p,
 			if (p->pack_fd == -1 && open_packed_git(p))
 				die("packfile %s cannot be accessed", p->pack_name);
 
-			win = xcalloc(1, sizeof(*win));
+			CALLOC_ARRAY(win, 1);
 			win->offset = (offset / window_align) * window_align;
 			len = p->pack_size - win->offset;
 			if (len > packed_git_window_size)
@@ -668,8 +652,8 @@ unsigned char *use_pack(struct packed_git *p,
 				PROT_READ, MAP_PRIVATE,
 				p->pack_fd, win->offset);
 			if (win->base == MAP_FAILED)
-				die_errno("packfile %s cannot be mapped",
-					  p->pack_name);
+				die_errno(_("packfile %s cannot be mapped%s"),
+					  p->pack_name, mmap_os_err());
 			if (!win->offset && win->len == p->pack_size
 				&& !p->do_not_close)
 				close_pack_fd(p);
@@ -757,6 +741,9 @@ void install_packed_git(struct repository *r, struct packed_git *pack)
 
 	pack->next = r->objects->packed_git;
 	r->objects->packed_git = pack;
+
+	hashmap_entry_init(&pack->packmap_ent, strhash(pack->pack_name));
+	hashmap_add(&r->objects->pack_map, &pack->packmap_ent);
 }
 
 void (*report_garbage)(unsigned seen_bits, const char *path);
@@ -826,10 +813,7 @@ void for_each_file_in_pack_dir(const char *objdir,
 	}
 	strbuf_addch(&path, '/');
 	dirnamelen = path.len;
-	while ((de = readdir(dir)) != NULL) {
-		if (is_dot_or_dotdot(de->d_name))
-			continue;
-
+	while ((de = readdir_skip_dot_and_dotdot(dir)) != NULL) {
 		strbuf_setlen(&path, dirnamelen);
 		strbuf_addstr(&path, de->d_name);
 
@@ -856,20 +840,18 @@ static void prepare_pack(const char *full_name, size_t full_name_len,
 
 	if (strip_suffix_mem(full_name, &base_len, ".idx") &&
 	    !(data->m && midx_contains_pack(data->m, file_name))) {
-		/* Don't reopen a pack we already have. */
-		for (p = data->r->objects->packed_git; p; p = p->next) {
-			size_t len;
-			if (strip_suffix(p->pack_name, ".pack", &len) &&
-			    len == base_len &&
-			    !memcmp(p->pack_name, full_name, len))
-				break;
-		}
+		struct hashmap_entry hent;
+		char *pack_name = xstrfmt("%.*s.pack", (int)base_len, full_name);
+		unsigned int hash = strhash(pack_name);
+		hashmap_entry_init(&hent, hash);
 
-		if (!p) {
+		/* Don't reopen a pack we already have. */
+		if (!hashmap_get(&data->r->objects->pack_map, &hent, pack_name)) {
 			p = add_packed_git(full_name, full_name_len, data->local);
 			if (p)
 				install_packed_git(data->r, p);
 		}
+		free(pack_name);
 	}
 
 	if (!report_garbage)
@@ -877,7 +859,11 @@ 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"))
+		return;
 	if (ends_with(file_name, ".idx") ||
+	    ends_with(file_name, ".rev") ||
 	    ends_with(file_name, ".pack") ||
 	    ends_with(file_name, ".bitmap") ||
 	    ends_with(file_name, ".keep") ||
@@ -933,6 +919,7 @@ unsigned long repo_approximate_object_count(struct repository *r)
 			count += p->num_objects;
 		}
 		r->objects->approximate_object_count = count;
+		r->objects->approximate_object_count_valid = 1;
 	}
 	return r->objects->approximate_object_count;
 }
@@ -1015,12 +1002,14 @@ void reprepare_packed_git(struct repository *r)
 {
 	struct object_directory *odb;
 
+	obj_read_lock();
 	for (odb = r->objects->odb; odb; odb = odb->next)
 		odb_clear_loose_cache(odb);
 
 	r->objects->approximate_object_count_valid = 0;
 	r->objects->packed_git_initialized = 0;
 	prepare_packed_git(r);
+	obj_read_unlock();
 }
 
 struct packed_git *get_packed_git(struct repository *r)
@@ -1035,6 +1024,17 @@ struct multi_pack_index *get_multi_pack_index(struct repository *r)
 	return r->objects->multi_pack_index;
 }
 
+struct multi_pack_index *get_local_multi_pack_index(struct repository *r)
+{
+	struct multi_pack_index *m = get_multi_pack_index(r);
+
+	/* no need to iterate; we always put the local one first (if any) */
+	if (m && m->local)
+		return m;
+
+	return NULL;
+}
+
 struct packed_git *get_all_packs(struct repository *r)
 {
 	struct multi_pack_index *m;
@@ -1097,7 +1097,23 @@ unsigned long get_size_from_delta(struct packed_git *p,
 	do {
 		in = use_pack(p, w_curs, curpos, &stream.avail_in);
 		stream.next_in = in;
+		/*
+		 * Note: the window section returned by use_pack() must be
+		 * available throughout git_inflate()'s unlocked execution. To
+		 * ensure no other thread will modify the window in the
+		 * meantime, we rely on the packed_window.inuse_cnt. This
+		 * counter is incremented before window reading and checked
+		 * before window disposal.
+		 *
+		 * Other worrying sections could be the call to close_pack_fd(),
+		 * which can close packs even with in-use windows, and to
+		 * reprepare_packed_git(). Regarding the former, mmap doc says:
+		 * "closing the file descriptor does not unmap the region". And
+		 * for the latter, it won't re-open already available packs.
+		 */
+		obj_read_unlock();
 		st = git_inflate(&stream, Z_FINISH);
+		obj_read_lock();
 		curpos += stream.next_in - in;
 	} while ((st == Z_OK || st == Z_BUF_ERROR) &&
 		 stream.total_out < sizeof(delta_head));
@@ -1173,11 +1189,11 @@ const struct packed_git *has_packed_and_bad(struct repository *r,
 	return NULL;
 }
 
-static off_t get_delta_base(struct packed_git *p,
-				    struct pack_window **w_curs,
-				    off_t *curpos,
-				    enum object_type type,
-				    off_t delta_obj_offset)
+off_t get_delta_base(struct packed_git *p,
+		     struct pack_window **w_curs,
+		     off_t *curpos,
+		     enum object_type type,
+		     off_t delta_obj_offset)
 {
 	unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL);
 	off_t base_offset;
@@ -1218,30 +1234,32 @@ static off_t get_delta_base(struct packed_git *p,
  * the final object lookup), but more expensive for OFS deltas (we
  * have to load the revidx to convert the offset back into a sha1).
  */
-static const unsigned char *get_delta_base_sha1(struct packed_git *p,
-						struct pack_window **w_curs,
-						off_t curpos,
-						enum object_type type,
-						off_t delta_obj_offset)
+static int get_delta_base_oid(struct packed_git *p,
+			      struct pack_window **w_curs,
+			      off_t curpos,
+			      struct object_id *oid,
+			      enum object_type type,
+			      off_t delta_obj_offset)
 {
 	if (type == OBJ_REF_DELTA) {
 		unsigned char *base = use_pack(p, w_curs, curpos, NULL);
-		return base;
+		oidread(oid, base);
+		return 0;
 	} else if (type == OBJ_OFS_DELTA) {
-		struct revindex_entry *revidx;
+		uint32_t base_pos;
 		off_t base_offset = get_delta_base(p, w_curs, &curpos,
 						   type, delta_obj_offset);
 
 		if (!base_offset)
-			return NULL;
+			return -1;
 
-		revidx = find_pack_revindex(p, base_offset);
-		if (!revidx)
-			return NULL;
+		if (offset_to_pack_pos(p, base_offset, &base_pos) < 0)
+			return -1;
 
-		return nth_packed_object_sha1(p, revidx->nr);
+		return nth_packed_object_id(oid, p,
+					    pack_pos_to_index(p, base_pos));
 	} else
-		return NULL;
+		return -1;
 }
 
 static int retry_bad_packed_offset(struct repository *r,
@@ -1249,12 +1267,11 @@ static int retry_bad_packed_offset(struct repository *r,
 				   off_t obj_offset)
 {
 	int type;
-	struct revindex_entry *revidx;
+	uint32_t pos;
 	struct object_id oid;
-	revidx = find_pack_revindex(p, obj_offset);
-	if (!revidx)
+	if (offset_to_pack_pos(p, obj_offset, &pos) < 0)
 		return OBJ_BAD;
-	nth_packed_object_oid(&oid, p, revidx->nr);
+	nth_packed_object_id(&oid, p, pack_pos_to_index(p, pos));
 	mark_bad_packed_object(p, oid.hash);
 	type = oid_object_info(r, &oid, NULL);
 	if (type <= OBJ_NONE)
@@ -1453,9 +1470,19 @@ void clear_delta_base_cache(void)
 static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
 	void *base, unsigned long base_size, enum object_type type)
 {
-	struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent));
+	struct delta_base_cache_entry *ent;
 	struct list_head *lru, *tmp;
 
+	/*
+	 * Check required to avoid redundant entries when more than one thread
+	 * is unpacking the same object, in unpack_entry() (since its phases I
+	 * and III might run concurrently across multiple threads).
+	 */
+	if (in_delta_base_cache(p, base_offset)) {
+		free(base);
+		return;
+	}
+
 	delta_base_cached += base_size;
 
 	list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
@@ -1466,6 +1493,7 @@ static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
 		release_delta_base_cache(f);
 	}
 
+	ent = xmalloc(sizeof(*ent));
 	ent->key.p = p;
 	ent->key.base_offset = base_offset;
 	ent->type = type;
@@ -1520,8 +1548,15 @@ int packed_object_info(struct repository *r, struct packed_git *p,
 	}
 
 	if (oi->disk_sizep) {
-		struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
-		*oi->disk_sizep = revidx[1].offset - obj_offset;
+		uint32_t pos;
+		if (offset_to_pack_pos(p, obj_offset, &pos) < 0) {
+			error("could not find object at offset %"PRIuMAX" "
+			      "in pack %s", (uintmax_t)obj_offset, p->pack_name);
+			type = OBJ_BAD;
+			goto out;
+		}
+
+		*oi->disk_sizep = pack_pos_to_offset(p, pos + 1) - obj_offset;
 	}
 
 	if (oi->typep || oi->type_name) {
@@ -1541,20 +1576,16 @@ int packed_object_info(struct repository *r, struct packed_git *p,
 		}
 	}
 
-	if (oi->delta_base_sha1) {
+	if (oi->delta_base_oid) {
 		if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
-			const unsigned char *base;
-
-			base = get_delta_base_sha1(p, &w_curs, curpos,
-						   type, obj_offset);
-			if (!base) {
+			if (get_delta_base_oid(p, &w_curs, curpos,
+					       oi->delta_base_oid,
+					       type, obj_offset) < 0) {
 				type = OBJ_BAD;
 				goto out;
 			}
-
-			hashcpy(oi->delta_base_sha1, base);
 		} else
-			hashclr(oi->delta_base_sha1);
+			oidclr(oi->delta_base_oid);
 	}
 
 	oi->whence = in_delta_base_cache(p, obj_offset) ? OI_DBCACHED :
@@ -1585,7 +1616,15 @@ static void *unpack_compressed_entry(struct packed_git *p,
 	do {
 		in = use_pack(p, w_curs, curpos, &stream.avail_in);
 		stream.next_in = in;
+		/*
+		 * Note: we must ensure the window section returned by
+		 * use_pack() will be available throughout git_inflate()'s
+		 * unlocked execution. Please refer to the comment at
+		 * get_size_from_delta() to see how this is done.
+		 */
+		obj_read_unlock();
 		st = git_inflate(&stream, Z_FINISH);
+		obj_read_lock();
 		if (!stream.avail_out)
 			break; /* the payload is larger than it should be */
 		curpos += stream.next_in - in;
@@ -1666,11 +1705,21 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
 		}
 
 		if (do_check_packed_object_crc && p->index_version > 1) {
-			struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
-			off_t len = revidx[1].offset - obj_offset;
-			if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) {
+			uint32_t pack_pos, index_pos;
+			off_t len;
+
+			if (offset_to_pack_pos(p, obj_offset, &pack_pos) < 0) {
+				error("could not find object at offset %"PRIuMAX" in pack %s",
+				      (uintmax_t)obj_offset, p->pack_name);
+				data = NULL;
+				goto out;
+			}
+
+			len = pack_pos_to_offset(p, pack_pos + 1) - obj_offset;
+			index_pos = pack_pos_to_index(p, pack_pos);
+			if (check_pack_crc(p, &w_curs, obj_offset, len, index_pos)) {
 				struct object_id oid;
-				nth_packed_object_oid(&oid, p, revidx->nr);
+				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);
@@ -1742,12 +1791,10 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
 		void *external_base = NULL;
 		unsigned long delta_size, base_size = size;
 		int i;
+		off_t base_obj_offset = obj_offset;
 
 		data = NULL;
 
-		if (base)
-			add_delta_base_cache(p, obj_offset, base, base_size, type);
-
 		if (!base) {
 			/*
 			 * We're probably in deep shit, but let's try to fetch
@@ -1755,11 +1802,11 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
 			 * This is costly but should happen only in the presence
 			 * of a corrupted pack, and is better than failing outright.
 			 */
-			struct revindex_entry *revidx;
+			uint32_t pos;
 			struct object_id base_oid;
-			revidx = find_pack_revindex(p, obj_offset);
-			if (revidx) {
-				nth_packed_object_oid(&base_oid, p, revidx->nr);
+			if (!(offset_to_pack_pos(p, obj_offset, &pos))) {
+				nth_packed_object_id(&base_oid, p,
+						     pack_pos_to_index(p, pos));
 				error("failed to read delta base object %s"
 				      " at offset %"PRIuMAX" from %s",
 				      oid_to_hex(&base_oid), (uintmax_t)obj_offset,
@@ -1785,24 +1832,33 @@ void *unpack_entry(struct repository *r, struct packed_git *p, off_t obj_offset,
 			      "at offset %"PRIuMAX" from %s",
 			      (uintmax_t)curpos, p->pack_name);
 			data = NULL;
-			free(external_base);
-			continue;
-		}
+		} else {
+			data = patch_delta(base, base_size, delta_data,
+					   delta_size, &size);
 
-		data = patch_delta(base, base_size,
-				   delta_data, delta_size,
-				   &size);
+			/*
+			 * We could not apply the delta; warn the user, but
+			 * keep going. Our failure will be noticed either in
+			 * the next iteration of the loop, or if this is the
+			 * final delta, in the caller when we return NULL.
+			 * Those code paths will take care of making a more
+			 * explicit warning and retrying with another copy of
+			 * the object.
+			 */
+			if (!data)
+				error("failed to apply delta");
+		}
 
 		/*
-		 * We could not apply the delta; warn the user, but keep going.
-		 * Our failure will be noticed either in the next iteration of
-		 * the loop, or if this is the final delta, in the caller when
-		 * we return NULL. Those code paths will take care of making
-		 * a more explicit warning and retrying with another copy of
-		 * the object.
+		 * We delay adding `base` to the cache until the end of the loop
+		 * because unpack_compressed_entry() momentarily releases the
+		 * obj_read_mutex, giving another thread the chance to access
+		 * the cache. Therefore, if `base` was already there, this other
+		 * thread could free() it (e.g. to make space for another entry)
+		 * before we are done using it.
 		 */
-		if (!data)
-			error("failed to apply delta");
+		if (!external_base)
+			add_delta_base_cache(p, base_obj_offset, base, base_size, type);
 
 		free(delta_data);
 		free(external_base);
@@ -1846,36 +1902,27 @@ int bsearch_pack(const struct object_id *oid, const struct packed_git *p, uint32
 			    index_lookup, index_lookup_width, result);
 }
 
-const unsigned char *nth_packed_object_sha1(struct packed_git *p,
-					    uint32_t n)
+int nth_packed_object_id(struct object_id *oid,
+			 struct packed_git *p,
+			 uint32_t n)
 {
 	const unsigned char *index = p->index_data;
 	const unsigned int hashsz = the_hash_algo->rawsz;
 	if (!index) {
 		if (open_pack_index(p))
-			return NULL;
+			return -1;
 		index = p->index_data;
 	}
 	if (n >= p->num_objects)
-		return NULL;
+		return -1;
 	index += 4 * 256;
 	if (p->index_version == 1) {
-		return index + (hashsz + 4) * n + 4;
+		oidread(oid, index + (hashsz + 4) * n + 4);
 	} else {
 		index += 8;
-		return index + hashsz * n;
+		oidread(oid, index + hashsz * n);
 	}
-}
-
-const struct object_id *nth_packed_object_oid(struct object_id *oid,
-					      struct packed_git *p,
-					      uint32_t n)
-{
-	const unsigned char *hash = nth_packed_object_sha1(p, n);
-	if (!hash)
-		return NULL;
-	hashcpy(oid->hash, hash);
-	return oid;
+	return 0;
 }
 
 void check_pack_index_ptr(const struct packed_git *p, const void *vptr)
@@ -1898,14 +1945,14 @@ off_t nth_packed_object_offset(const struct packed_git *p, uint32_t n)
 	const unsigned int hashsz = the_hash_algo->rawsz;
 	index += 4 * 256;
 	if (p->index_version == 1) {
-		return ntohl(*((uint32_t *)(index + (hashsz + 4) * n)));
+		return ntohl(*((uint32_t *)(index + (hashsz + 4) * (size_t)n)));
 	} else {
 		uint32_t off;
-		index += 8 + p->num_objects * (hashsz + 4);
+		index += 8 + (size_t)p->num_objects * (hashsz + 4);
 		off = ntohl(*((uint32_t *)(index + 4 * n)));
 		if (!(off & 0x80000000))
 			return off;
-		index += p->num_objects * 4 + (off & 0x7fffffff) * 8;
+		index += (size_t)p->num_objects * 4 + (off & 0x7fffffff) * 8;
 		check_pack_index_ptr(p, index);
 		return get_be64(index);
 	}
@@ -2019,12 +2066,79 @@ int find_pack_entry(struct repository *r, const struct object_id *oid, struct pa
 	return 0;
 }
 
+static void maybe_invalidate_kept_pack_cache(struct repository *r,
+					     unsigned flags)
+{
+	if (!r->objects->kept_pack_cache.packs)
+		return;
+	if (r->objects->kept_pack_cache.flags == flags)
+		return;
+	FREE_AND_NULL(r->objects->kept_pack_cache.packs);
+	r->objects->kept_pack_cache.flags = 0;
+}
+
+static struct packed_git **kept_pack_cache(struct repository *r, unsigned flags)
+{
+	maybe_invalidate_kept_pack_cache(r, flags);
+
+	if (!r->objects->kept_pack_cache.packs) {
+		struct packed_git **packs = NULL;
+		size_t nr = 0, alloc = 0;
+		struct packed_git *p;
+
+		/*
+		 * We want "all" packs here, because we need to cover ones that
+		 * are used by a midx, as well. We need to look in every one of
+		 * them (instead of the midx itself) to cover duplicates. It's
+		 * possible that an object is found in two packs that the midx
+		 * covers, one kept and one not kept, but the midx returns only
+		 * the non-kept version.
+		 */
+		for (p = get_all_packs(r); p; p = p->next) {
+			if ((p->pack_keep && (flags & ON_DISK_KEEP_PACKS)) ||
+			    (p->pack_keep_in_core && (flags & IN_CORE_KEEP_PACKS))) {
+				ALLOC_GROW(packs, nr + 1, alloc);
+				packs[nr++] = p;
+			}
+		}
+		ALLOC_GROW(packs, nr + 1, alloc);
+		packs[nr] = NULL;
+
+		r->objects->kept_pack_cache.packs = packs;
+		r->objects->kept_pack_cache.flags = flags;
+	}
+
+	return r->objects->kept_pack_cache.packs;
+}
+
+int find_kept_pack_entry(struct repository *r,
+			 const struct object_id *oid,
+			 unsigned flags,
+			 struct pack_entry *e)
+{
+	struct packed_git **cache;
+
+	for (cache = kept_pack_cache(r, flags); *cache; cache++) {
+		struct packed_git *p = *cache;
+		if (fill_pack_entry(oid, e, p))
+			return 1;
+	}
+
+	return 0;
+}
+
 int has_object_pack(const struct object_id *oid)
 {
 	struct pack_entry e;
 	return find_pack_entry(the_repository, oid, &e);
 }
 
+int has_object_kept_pack(const struct object_id *oid, unsigned flags)
+{
+	struct pack_entry e;
+	return find_kept_pack_entry(the_repository, oid, flags, &e);
+}
+
 int has_pack_index(const unsigned char *sha1)
 {
 	struct stat st;
@@ -2046,19 +2160,31 @@ int for_each_object_in_pack(struct packed_git *p,
 	}
 
 	for (i = 0; i < p->num_objects; i++) {
-		uint32_t pos;
+		uint32_t index_pos;
 		struct object_id oid;
 
+		/*
+		 * We are iterating "i" from 0 up to num_objects, but its
+		 * meaning may be different, depending on the requested output
+		 * order:
+		 *
+		 *   - in object-name order, it is the same as the index order
+		 *     used by nth_packed_object_id(), so we can pass it
+		 *     directly
+		 *
+		 *   - in pack-order, it is pack position, which we must
+		 *     convert to an index position in order to get the oid.
+		 */
 		if (flags & FOR_EACH_OBJECT_PACK_ORDER)
-			pos = p->revindex[i].nr;
+			index_pos = pack_pos_to_index(p, i);
 		else
-			pos = i;
+			index_pos = i;
 
-		if (!nth_packed_object_oid(&oid, p, pos))
+		if (nth_packed_object_id(&oid, p, index_pos) < 0)
 			return error("unable to get sha1 of object %u in %s",
-				     pos, p->pack_name);
+				     index_pos, p->pack_name);
 
-		r = cb(&oid, p, pos, data);
+		r = cb(&oid, p, index_pos, data);
 		if (r)
 			break;
 	}
@@ -2079,6 +2205,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;
@@ -2118,6 +2250,7 @@ static int add_promisor_object(const struct object_id *oid,
 			return 0;
 		while (tree_entry_gently(&desc, &entry))
 			oidset_insert(set, &entry.oid);
+		free_tree_buffer(tree);
 	} else if (obj->type == OBJ_COMMIT) {
 		struct commit *commit = (struct commit *) obj;
 		struct commit_list *parents = commit->parents;
diff --git a/packfile.h b/packfile.h
index fc7904ec81..3ae117a8ae 100644
--- a/packfile.h
+++ b/packfile.h
@@ -57,6 +57,7 @@ void install_packed_git(struct repository *r, struct packed_git *pack);
 struct packed_git *get_packed_git(struct repository *r);
 struct list_head *get_packed_git_mru(struct repository *r);
 struct multi_pack_index *get_multi_pack_index(struct repository *r);
+struct multi_pack_index *get_local_multi_pack_index(struct repository *r);
 struct packed_git *get_all_packs(struct repository *r);
 
 /*
@@ -89,6 +90,7 @@ 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 **);
@@ -121,18 +123,11 @@ void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
 int bsearch_pack(const struct object_id *oid, const struct packed_git *p, uint32_t *result);
 
 /*
- * Return the SHA-1 of the nth object within the specified packfile.
- * Open the index if it is not already open.  The return value points
- * at the SHA-1 within the mmapped index.  Return NULL if there is an
- * error.
+ * Write the oid of the nth object within the specified packfile into the first
+ * parameter. Open the index if it is not already open.  Returns 0 on success,
+ * negative otherwise.
  */
-const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
-/*
- * Like nth_packed_object_sha1, but write the data into the object specified by
- * the the first argument.  Returns the first argument on success, and NULL on
- * error.
- */
-const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
+int nth_packed_object_id(struct object_id *, struct packed_git *, uint32_t n);
 
 /*
  * Return the offset of the nth object within the specified packfile.
@@ -151,6 +146,9 @@ void *unpack_entry(struct repository *r, struct packed_git *, off_t, enum object
 unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
 unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
 int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
+off_t get_delta_base(struct packed_git *p, struct pack_window **w_curs,
+		     off_t *curpos, enum object_type type,
+		     off_t delta_obj_offset);
 
 void release_pack_memory(size_t);
 
@@ -164,13 +162,18 @@ int packed_object_info(struct repository *r,
 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);
 
+#define ON_DISK_KEEP_PACKS 1
+#define IN_CORE_KEEP_PACKS 2
+
 /*
  * Iff a pack file in the given repository contains the object named by sha1,
  * return true and store its location to e.
  */
 int find_pack_entry(struct repository *r, const struct object_id *oid, struct pack_entry *e);
+int find_kept_pack_entry(struct repository *r, const struct object_id *oid, unsigned flags, struct pack_entry *e);
 
 int has_object_pack(const struct object_id *oid);
+int has_object_kept_pack(const struct object_id *oid, unsigned flags);
 
 int has_pack_index(const unsigned char *sha1);
 
diff --git a/pager.c b/pager.c
index 41446d4f05..52f27a6765 100644
--- a/pager.c
+++ b/pager.c
@@ -11,29 +11,29 @@
 static struct child_process pager_process = CHILD_PROCESS_INIT;
 static const char *pager_program;
 
-static void wait_for_pager(int in_signal)
+/* Is the value coming back from term_columns() just a guess? */
+static int term_columns_guessed;
+
+
+static void close_pager_fds(void)
 {
-	if (!in_signal) {
-		fflush(stdout);
-		fflush(stderr);
-	}
 	/* signal EOF to pager */
 	close(1);
 	close(2);
-	if (in_signal)
-		finish_command_in_signal(&pager_process);
-	else
-		finish_command(&pager_process);
 }
 
 static void wait_for_pager_atexit(void)
 {
-	wait_for_pager(0);
+	fflush(stdout);
+	fflush(stderr);
+	close_pager_fds();
+	finish_command(&pager_process);
 }
 
 static void wait_for_pager_signal(int signo)
 {
-	wait_for_pager(1);
+	close_pager_fds();
+	finish_command_in_signal(&pager_process);
 	sigchain_pop(signo);
 	raise(signo);
 }
@@ -68,7 +68,7 @@ const char *git_pager(int stdout_is_tty)
 	return pager;
 }
 
-static void setup_pager_env(struct argv_array *env)
+static void setup_pager_env(struct strvec *env)
 {
 	const char **argv;
 	int i;
@@ -88,7 +88,7 @@ static void setup_pager_env(struct argv_array *env)
 		*cp = '\0';
 		if (!getenv(argv[i])) {
 			*cp = '=';
-			argv_array_push(env, argv[i]);
+			strvec_push(env, argv[i]);
 		}
 	}
 	free(pager_env);
@@ -97,7 +97,7 @@ static void setup_pager_env(struct argv_array *env)
 
 void prepare_pager_args(struct child_process *pager_process, const char *pager)
 {
-	argv_array_push(&pager_process->args, pager);
+	strvec_push(&pager_process->args, pager);
 	pager_process->use_shell = 1;
 	setup_pager_env(&pager_process->env_array);
 	pager_process->trace2_child_class = "pager";
@@ -118,7 +118,8 @@ void setup_pager(void)
 	{
 		char buf[64];
 		xsnprintf(buf, sizeof(buf), "%d", term_columns());
-		setenv("COLUMNS", buf, 0);
+		if (!term_columns_guessed)
+			setenv("COLUMNS", buf, 0);
 	}
 
 	setenv("GIT_PAGER_IN_USE", "true", 1);
@@ -126,7 +127,7 @@ void setup_pager(void)
 	/* spawn the pager */
 	prepare_pager_args(&pager_process, pager);
 	pager_process.in = -1;
-	argv_array_push(&pager_process.env_array, "GIT_PAGER_IN_USE");
+	strvec_push(&pager_process.env_array, "GIT_PAGER_IN_USE");
 	if (start_command(&pager_process))
 		return;
 
@@ -162,15 +163,20 @@ int term_columns(void)
 		return term_columns_at_startup;
 
 	term_columns_at_startup = 80;
+	term_columns_guessed = 1;
 
 	col_string = getenv("COLUMNS");
-	if (col_string && (n_cols = atoi(col_string)) > 0)
+	if (col_string && (n_cols = atoi(col_string)) > 0) {
 		term_columns_at_startup = n_cols;
+		term_columns_guessed = 0;
+	}
 #ifdef TIOCGWINSZ
 	else {
 		struct winsize ws;
-		if (!ioctl(1, TIOCGWINSZ, &ws) && ws.ws_col)
+		if (!ioctl(1, TIOCGWINSZ, &ws) && ws.ws_col) {
 			term_columns_at_startup = ws.ws_col;
+			term_columns_guessed = 0;
+		}
 	}
 #endif
 
diff --git a/parallel-checkout.c b/parallel-checkout.c
new file mode 100644
index 0000000000..ddc0ff3c06
--- /dev/null
+++ b/parallel-checkout.c
@@ -0,0 +1,672 @@
+#include "cache.h"
+#include "config.h"
+#include "entry.h"
+#include "parallel-checkout.h"
+#include "pkt-line.h"
+#include "progress.h"
+#include "run-command.h"
+#include "sigchain.h"
+#include "streaming.h"
+#include "thread-utils.h"
+#include "trace2.h"
+
+struct pc_worker {
+	struct child_process cp;
+	size_t next_item_to_complete, nr_items_to_complete;
+};
+
+struct parallel_checkout {
+	enum pc_status status;
+	struct parallel_checkout_item *items; /* The parallel checkout queue. */
+	size_t nr, alloc;
+	struct progress *progress;
+	unsigned int *progress_cnt;
+};
+
+static struct parallel_checkout parallel_checkout;
+
+enum pc_status parallel_checkout_status(void)
+{
+	return parallel_checkout.status;
+}
+
+static const int DEFAULT_THRESHOLD_FOR_PARALLELISM = 100;
+static const int DEFAULT_NUM_WORKERS = 1;
+
+void get_parallel_checkout_configs(int *num_workers, int *threshold)
+{
+	char *env_workers = getenv("GIT_TEST_CHECKOUT_WORKERS");
+
+	if (env_workers && *env_workers) {
+		if (strtol_i(env_workers, 10, num_workers)) {
+			die("invalid value for GIT_TEST_CHECKOUT_WORKERS: '%s'",
+			    env_workers);
+		}
+		if (*num_workers < 1)
+			*num_workers = online_cpus();
+
+		*threshold = 0;
+		return;
+	}
+
+	if (git_config_get_int("checkout.workers", num_workers))
+		*num_workers = DEFAULT_NUM_WORKERS;
+	else if (*num_workers < 1)
+		*num_workers = online_cpus();
+
+	if (git_config_get_int("checkout.thresholdForParallelism", threshold))
+		*threshold = DEFAULT_THRESHOLD_FOR_PARALLELISM;
+}
+
+void init_parallel_checkout(void)
+{
+	if (parallel_checkout.status != PC_UNINITIALIZED)
+		BUG("parallel checkout already initialized");
+
+	parallel_checkout.status = PC_ACCEPTING_ENTRIES;
+}
+
+static void finish_parallel_checkout(void)
+{
+	if (parallel_checkout.status == PC_UNINITIALIZED)
+		BUG("cannot finish parallel checkout: not initialized yet");
+
+	free(parallel_checkout.items);
+	memset(&parallel_checkout, 0, sizeof(parallel_checkout));
+}
+
+static int is_eligible_for_parallel_checkout(const struct cache_entry *ce,
+					     const struct conv_attrs *ca)
+{
+	enum conv_attrs_classification c;
+	size_t packed_item_size;
+
+	/*
+	 * Symlinks cannot be checked out in parallel as, in case of path
+	 * collision, they could racily replace leading directories of other
+	 * entries being checked out. Submodules are checked out in child
+	 * processes, which have their own parallel checkout queues.
+	 */
+	if (!S_ISREG(ce->ce_mode))
+		return 0;
+
+	packed_item_size = sizeof(struct pc_item_fixed_portion) + ce->ce_namelen +
+		(ca->working_tree_encoding ? strlen(ca->working_tree_encoding) : 0);
+
+	/*
+	 * The amount of data we send to the workers per checkout item is
+	 * typically small (75~300B). So unless we find an insanely huge path
+	 * of 64KB, we should never reach the 65KB limit of one pkt-line. If
+	 * that does happen, we let the sequential code handle the item.
+	 */
+	if (packed_item_size > LARGE_PACKET_DATA_MAX)
+		return 0;
+
+	c = classify_conv_attrs(ca);
+	switch (c) {
+	case CA_CLASS_INCORE:
+		return 1;
+
+	case CA_CLASS_INCORE_FILTER:
+		/*
+		 * It would be safe to allow concurrent instances of
+		 * single-file smudge filters, like rot13, but we should not
+		 * assume that all filters are parallel-process safe. So we
+		 * don't allow this.
+		 */
+		return 0;
+
+	case CA_CLASS_INCORE_PROCESS:
+		/*
+		 * The parallel queue and the delayed queue are not compatible,
+		 * so they must be kept completely separated. And we can't tell
+		 * if a long-running process will delay its response without
+		 * actually asking it to perform the filtering. Therefore, this
+		 * type of filter is not allowed in parallel checkout.
+		 *
+		 * Furthermore, there should only be one instance of the
+		 * long-running process filter as we don't know how it is
+		 * managing its own concurrency. So, spreading the entries that
+		 * requisite such a filter among the parallel workers would
+		 * require a lot more inter-process communication. We would
+		 * probably have to designate a single process to interact with
+		 * the filter and send all the necessary data to it, for each
+		 * entry.
+		 */
+		return 0;
+
+	case CA_CLASS_STREAMABLE:
+		return 1;
+
+	default:
+		BUG("unsupported conv_attrs classification '%d'", c);
+	}
+}
+
+int enqueue_checkout(struct cache_entry *ce, struct conv_attrs *ca)
+{
+	struct parallel_checkout_item *pc_item;
+
+	if (parallel_checkout.status != PC_ACCEPTING_ENTRIES ||
+	    !is_eligible_for_parallel_checkout(ce, ca))
+		return -1;
+
+	ALLOC_GROW(parallel_checkout.items, parallel_checkout.nr + 1,
+		   parallel_checkout.alloc);
+
+	pc_item = &parallel_checkout.items[parallel_checkout.nr];
+	pc_item->ce = ce;
+	memcpy(&pc_item->ca, ca, sizeof(pc_item->ca));
+	pc_item->status = PC_ITEM_PENDING;
+	pc_item->id = parallel_checkout.nr;
+	parallel_checkout.nr++;
+
+	return 0;
+}
+
+size_t pc_queue_size(void)
+{
+	return parallel_checkout.nr;
+}
+
+static void advance_progress_meter(void)
+{
+	if (parallel_checkout.progress) {
+		(*parallel_checkout.progress_cnt)++;
+		display_progress(parallel_checkout.progress,
+				 *parallel_checkout.progress_cnt);
+	}
+}
+
+static int handle_results(struct checkout *state)
+{
+	int ret = 0;
+	size_t i;
+	int have_pending = 0;
+
+	/*
+	 * We first update the successfully written entries with the collected
+	 * stat() data, so that they can be found by mark_colliding_entries(),
+	 * in the next loop, when necessary.
+	 */
+	for (i = 0; i < parallel_checkout.nr; i++) {
+		struct parallel_checkout_item *pc_item = &parallel_checkout.items[i];
+		if (pc_item->status == PC_ITEM_WRITTEN)
+			update_ce_after_write(state, pc_item->ce, &pc_item->st);
+	}
+
+	for (i = 0; i < parallel_checkout.nr; i++) {
+		struct parallel_checkout_item *pc_item = &parallel_checkout.items[i];
+
+		switch(pc_item->status) {
+		case PC_ITEM_WRITTEN:
+			/* Already handled */
+			break;
+		case PC_ITEM_COLLIDED:
+			/*
+			 * The entry could not be checked out due to a path
+			 * collision with another entry. Since there can only
+			 * be one entry of each colliding group on the disk, we
+			 * could skip trying to check out this one and move on.
+			 * However, this would leave the unwritten entries with
+			 * null stat() fields on the index, which could
+			 * potentially slow down subsequent operations that
+			 * require refreshing it: git would not be able to
+			 * trust st_size and would have to go to the filesystem
+			 * to see if the contents match (see ie_modified()).
+			 *
+			 * Instead, let's pay the overhead only once, now, and
+			 * call checkout_entry_ca() again for this file, to
+			 * have its stat() data stored in the index. This also
+			 * has the benefit of adding this entry and its
+			 * colliding pair to the collision report message.
+			 * Additionally, this overwriting behavior is consistent
+			 * with what the sequential checkout does, so it doesn't
+			 * add any extra overhead.
+			 */
+			ret |= checkout_entry_ca(pc_item->ce, &pc_item->ca,
+						 state, NULL, NULL);
+			advance_progress_meter();
+			break;
+		case PC_ITEM_PENDING:
+			have_pending = 1;
+			/* fall through */
+		case PC_ITEM_FAILED:
+			ret = -1;
+			break;
+		default:
+			BUG("unknown checkout item status in parallel checkout");
+		}
+	}
+
+	if (have_pending)
+		error("parallel checkout finished with pending entries");
+
+	return ret;
+}
+
+static int reset_fd(int fd, const char *path)
+{
+	if (lseek(fd, 0, SEEK_SET) != 0)
+		return error_errno("failed to rewind descriptor of '%s'", path);
+	if (ftruncate(fd, 0))
+		return error_errno("failed to truncate file '%s'", path);
+	return 0;
+}
+
+static int write_pc_item_to_fd(struct parallel_checkout_item *pc_item, int fd,
+			       const char *path)
+{
+	int ret;
+	struct stream_filter *filter;
+	struct strbuf buf = STRBUF_INIT;
+	char *blob;
+	unsigned long size;
+	ssize_t wrote;
+
+	/* Sanity check */
+	assert(is_eligible_for_parallel_checkout(pc_item->ce, &pc_item->ca));
+
+	filter = get_stream_filter_ca(&pc_item->ca, &pc_item->ce->oid);
+	if (filter) {
+		if (stream_blob_to_fd(fd, &pc_item->ce->oid, filter, 1)) {
+			/* On error, reset fd to try writing without streaming */
+			if (reset_fd(fd, path))
+				return -1;
+		} else {
+			return 0;
+		}
+	}
+
+	blob = read_blob_entry(pc_item->ce, &size);
+	if (!blob)
+		return error("cannot read object %s '%s'",
+			     oid_to_hex(&pc_item->ce->oid), pc_item->ce->name);
+
+	/*
+	 * checkout metadata is used to give context for external process
+	 * filters. Files requiring such filters are not eligible for parallel
+	 * checkout, so pass NULL. Note: if that changes, the metadata must also
+	 * be passed from the main process to the workers.
+	 */
+	ret = convert_to_working_tree_ca(&pc_item->ca, pc_item->ce->name,
+					 blob, size, &buf, NULL);
+
+	if (ret) {
+		size_t newsize;
+		free(blob);
+		blob = strbuf_detach(&buf, &newsize);
+		size = newsize;
+	}
+
+	wrote = write_in_full(fd, blob, size);
+	free(blob);
+	if (wrote < 0)
+		return error("unable to write file '%s'", path);
+
+	return 0;
+}
+
+static int close_and_clear(int *fd)
+{
+	int ret = 0;
+
+	if (*fd >= 0) {
+		ret = close(*fd);
+		*fd = -1;
+	}
+
+	return ret;
+}
+
+void write_pc_item(struct parallel_checkout_item *pc_item,
+		   struct checkout *state)
+{
+	unsigned int mode = (pc_item->ce->ce_mode & 0100) ? 0777 : 0666;
+	int fd = -1, fstat_done = 0;
+	struct strbuf path = STRBUF_INIT;
+	const char *dir_sep;
+
+	strbuf_add(&path, state->base_dir, state->base_dir_len);
+	strbuf_add(&path, pc_item->ce->name, pc_item->ce->ce_namelen);
+
+	dir_sep = find_last_dir_sep(path.buf);
+
+	/*
+	 * The leading dirs should have been already created by now. But, in
+	 * case of path collisions, one of the dirs could have been replaced by
+	 * a symlink (checked out after we enqueued this entry for parallel
+	 * checkout). Thus, we must check the leading dirs again.
+	 */
+	if (dir_sep && !has_dirs_only_path(path.buf, dir_sep - path.buf,
+					   state->base_dir_len)) {
+		pc_item->status = PC_ITEM_COLLIDED;
+		trace2_data_string("pcheckout", NULL, "collision/dirname", path.buf);
+		goto out;
+	}
+
+	fd = open(path.buf, O_WRONLY | O_CREAT | O_EXCL, mode);
+
+	if (fd < 0) {
+		if (errno == EEXIST || errno == EISDIR) {
+			/*
+			 * Errors which probably represent a path collision.
+			 * Suppress the error message and mark the item to be
+			 * retried later, sequentially. ENOTDIR and ENOENT are
+			 * also interesting, but the above has_dirs_only_path()
+			 * call should have already caught these cases.
+			 */
+			pc_item->status = PC_ITEM_COLLIDED;
+			trace2_data_string("pcheckout", NULL,
+					   "collision/basename", path.buf);
+		} else {
+			error_errno("failed to open file '%s'", path.buf);
+			pc_item->status = PC_ITEM_FAILED;
+		}
+		goto out;
+	}
+
+	if (write_pc_item_to_fd(pc_item, fd, path.buf)) {
+		/* Error was already reported. */
+		pc_item->status = PC_ITEM_FAILED;
+		close_and_clear(&fd);
+		unlink(path.buf);
+		goto out;
+	}
+
+	fstat_done = fstat_checkout_output(fd, state, &pc_item->st);
+
+	if (close_and_clear(&fd)) {
+		error_errno("unable to close file '%s'", path.buf);
+		pc_item->status = PC_ITEM_FAILED;
+		goto out;
+	}
+
+	if (state->refresh_cache && !fstat_done && lstat(path.buf, &pc_item->st) < 0) {
+		error_errno("unable to stat just-written file '%s'",  path.buf);
+		pc_item->status = PC_ITEM_FAILED;
+		goto out;
+	}
+
+	pc_item->status = PC_ITEM_WRITTEN;
+
+out:
+	strbuf_release(&path);
+}
+
+static void send_one_item(int fd, struct parallel_checkout_item *pc_item)
+{
+	size_t len_data;
+	char *data, *variant;
+	struct pc_item_fixed_portion *fixed_portion;
+	const char *working_tree_encoding = pc_item->ca.working_tree_encoding;
+	size_t name_len = pc_item->ce->ce_namelen;
+	size_t working_tree_encoding_len = working_tree_encoding ?
+					   strlen(working_tree_encoding) : 0;
+
+	/*
+	 * Any changes in the calculation of the message size must also be made
+	 * in is_eligible_for_parallel_checkout().
+	 */
+	len_data = sizeof(struct pc_item_fixed_portion) + name_len +
+		   working_tree_encoding_len;
+
+	data = xmalloc(len_data);
+
+	fixed_portion = (struct pc_item_fixed_portion *)data;
+	fixed_portion->id = pc_item->id;
+	fixed_portion->ce_mode = pc_item->ce->ce_mode;
+	fixed_portion->crlf_action = pc_item->ca.crlf_action;
+	fixed_portion->ident = pc_item->ca.ident;
+	fixed_portion->name_len = name_len;
+	fixed_portion->working_tree_encoding_len = working_tree_encoding_len;
+	/*
+	 * We pad the unused bytes in the hash array because, otherwise,
+	 * Valgrind would complain about passing uninitialized bytes to a
+	 * write() syscall. The warning doesn't represent any real risk here,
+	 * but it could hinder the detection of actual errors.
+	 */
+	oidcpy_with_padding(&fixed_portion->oid, &pc_item->ce->oid);
+
+	variant = data + sizeof(*fixed_portion);
+	if (working_tree_encoding_len) {
+		memcpy(variant, working_tree_encoding, working_tree_encoding_len);
+		variant += working_tree_encoding_len;
+	}
+	memcpy(variant, pc_item->ce->name, name_len);
+
+	packet_write(fd, data, len_data);
+
+	free(data);
+}
+
+static void send_batch(int fd, size_t start, size_t nr)
+{
+	size_t i;
+	sigchain_push(SIGPIPE, SIG_IGN);
+	for (i = 0; i < nr; i++)
+		send_one_item(fd, &parallel_checkout.items[start + i]);
+	packet_flush(fd);
+	sigchain_pop(SIGPIPE);
+}
+
+static struct pc_worker *setup_workers(struct checkout *state, int num_workers)
+{
+	struct pc_worker *workers;
+	int i, workers_with_one_extra_item;
+	size_t base_batch_size, batch_beginning = 0;
+
+	ALLOC_ARRAY(workers, num_workers);
+
+	for (i = 0; i < num_workers; i++) {
+		struct child_process *cp = &workers[i].cp;
+
+		child_process_init(cp);
+		cp->git_cmd = 1;
+		cp->in = -1;
+		cp->out = -1;
+		cp->clean_on_exit = 1;
+		strvec_push(&cp->args, "checkout--worker");
+		if (state->base_dir_len)
+			strvec_pushf(&cp->args, "--prefix=%s", state->base_dir);
+		if (start_command(cp))
+			die("failed to spawn checkout worker");
+	}
+
+	base_batch_size = parallel_checkout.nr / num_workers;
+	workers_with_one_extra_item = parallel_checkout.nr % num_workers;
+
+	for (i = 0; i < num_workers; i++) {
+		struct pc_worker *worker = &workers[i];
+		size_t batch_size = base_batch_size;
+
+		/* distribute the extra work evenly */
+		if (i < workers_with_one_extra_item)
+			batch_size++;
+
+		send_batch(worker->cp.in, batch_beginning, batch_size);
+		worker->next_item_to_complete = batch_beginning;
+		worker->nr_items_to_complete = batch_size;
+
+		batch_beginning += batch_size;
+	}
+
+	return workers;
+}
+
+static void finish_workers(struct pc_worker *workers, int num_workers)
+{
+	int i;
+
+	/*
+	 * Close pipes before calling finish_command() to let the workers
+	 * exit asynchronously and avoid spending extra time on wait().
+	 */
+	for (i = 0; i < num_workers; i++) {
+		struct child_process *cp = &workers[i].cp;
+		if (cp->in >= 0)
+			close(cp->in);
+		if (cp->out >= 0)
+			close(cp->out);
+	}
+
+	for (i = 0; i < num_workers; i++) {
+		int rc = finish_command(&workers[i].cp);
+		if (rc > 128) {
+			/*
+			 * For a normal non-zero exit, the worker should have
+			 * already printed something useful to stderr. But a
+			 * death by signal should be mentioned to the user.
+			 */
+			error("checkout worker %d died of signal %d", i, rc - 128);
+		}
+	}
+
+	free(workers);
+}
+
+static inline void assert_pc_item_result_size(int got, int exp)
+{
+	if (got != exp)
+		BUG("wrong result size from checkout worker (got %dB, exp %dB)",
+		    got, exp);
+}
+
+static void parse_and_save_result(const char *buffer, int len,
+				  struct pc_worker *worker)
+{
+	struct pc_item_result *res;
+	struct parallel_checkout_item *pc_item;
+	struct stat *st = NULL;
+
+	if (len < PC_ITEM_RESULT_BASE_SIZE)
+		BUG("too short result from checkout worker (got %dB, exp >=%dB)",
+		    len, (int)PC_ITEM_RESULT_BASE_SIZE);
+
+	res = (struct pc_item_result *)buffer;
+
+	/*
+	 * Worker should send either the full result struct on success, or
+	 * just the base (i.e. no stat data), otherwise.
+	 */
+	if (res->status == PC_ITEM_WRITTEN) {
+		assert_pc_item_result_size(len, (int)sizeof(struct pc_item_result));
+		st = &res->st;
+	} else {
+		assert_pc_item_result_size(len, (int)PC_ITEM_RESULT_BASE_SIZE);
+	}
+
+	if (!worker->nr_items_to_complete)
+		BUG("received result from supposedly finished checkout worker");
+	if (res->id != worker->next_item_to_complete)
+		BUG("unexpected item id from checkout worker (got %"PRIuMAX", exp %"PRIuMAX")",
+		    (uintmax_t)res->id, (uintmax_t)worker->next_item_to_complete);
+
+	worker->next_item_to_complete++;
+	worker->nr_items_to_complete--;
+
+	pc_item = &parallel_checkout.items[res->id];
+	pc_item->status = res->status;
+	if (st)
+		pc_item->st = *st;
+
+	if (res->status != PC_ITEM_COLLIDED)
+		advance_progress_meter();
+}
+
+static void gather_results_from_workers(struct pc_worker *workers,
+					int num_workers)
+{
+	int i, active_workers = num_workers;
+	struct pollfd *pfds;
+
+	CALLOC_ARRAY(pfds, num_workers);
+	for (i = 0; i < num_workers; i++) {
+		pfds[i].fd = workers[i].cp.out;
+		pfds[i].events = POLLIN;
+	}
+
+	while (active_workers) {
+		int nr = poll(pfds, num_workers, -1);
+
+		if (nr < 0) {
+			if (errno == EINTR)
+				continue;
+			die_errno("failed to poll checkout workers");
+		}
+
+		for (i = 0; i < num_workers && nr > 0; i++) {
+			struct pc_worker *worker = &workers[i];
+			struct pollfd *pfd = &pfds[i];
+
+			if (!pfd->revents)
+				continue;
+
+			if (pfd->revents & POLLIN) {
+				int len = packet_read(pfd->fd, NULL, NULL,
+						      packet_buffer,
+						      sizeof(packet_buffer), 0);
+
+				if (len < 0) {
+					BUG("packet_read() returned negative value");
+				} else if (!len) {
+					pfd->fd = -1;
+					active_workers--;
+				} else {
+					parse_and_save_result(packet_buffer,
+							      len, worker);
+				}
+			} else if (pfd->revents & POLLHUP) {
+				pfd->fd = -1;
+				active_workers--;
+			} else if (pfd->revents & (POLLNVAL | POLLERR)) {
+				die("error polling from checkout worker");
+			}
+
+			nr--;
+		}
+	}
+
+	free(pfds);
+}
+
+static void write_items_sequentially(struct checkout *state)
+{
+	size_t i;
+
+	for (i = 0; i < parallel_checkout.nr; i++) {
+		struct parallel_checkout_item *pc_item = &parallel_checkout.items[i];
+		write_pc_item(pc_item, state);
+		if (pc_item->status != PC_ITEM_COLLIDED)
+			advance_progress_meter();
+	}
+}
+
+int run_parallel_checkout(struct checkout *state, int num_workers, int threshold,
+			  struct progress *progress, unsigned int *progress_cnt)
+{
+	int ret;
+
+	if (parallel_checkout.status != PC_ACCEPTING_ENTRIES)
+		BUG("cannot run parallel checkout: uninitialized or already running");
+
+	parallel_checkout.status = PC_RUNNING;
+	parallel_checkout.progress = progress;
+	parallel_checkout.progress_cnt = progress_cnt;
+
+	if (parallel_checkout.nr < num_workers)
+		num_workers = parallel_checkout.nr;
+
+	if (num_workers <= 1 || parallel_checkout.nr < threshold) {
+		write_items_sequentially(state);
+	} else {
+		struct pc_worker *workers = setup_workers(state, num_workers);
+		gather_results_from_workers(workers, num_workers);
+		finish_workers(workers, num_workers);
+	}
+
+	ret = handle_results(state);
+
+	finish_parallel_checkout();
+	return ret;
+}
diff --git a/parallel-checkout.h b/parallel-checkout.h
new file mode 100644
index 0000000000..80f539bcb7
--- /dev/null
+++ b/parallel-checkout.h
@@ -0,0 +1,111 @@
+#ifndef PARALLEL_CHECKOUT_H
+#define PARALLEL_CHECKOUT_H
+
+#include "convert.h"
+
+struct cache_entry;
+struct checkout;
+struct progress;
+
+/****************************************************************
+ * Users of parallel checkout
+ ****************************************************************/
+
+enum pc_status {
+	PC_UNINITIALIZED = 0,
+	PC_ACCEPTING_ENTRIES,
+	PC_RUNNING,
+};
+
+enum pc_status parallel_checkout_status(void);
+void get_parallel_checkout_configs(int *num_workers, int *threshold);
+
+/*
+ * Put parallel checkout into the PC_ACCEPTING_ENTRIES state. Should be used
+ * only when in the PC_UNINITIALIZED state.
+ */
+void init_parallel_checkout(void);
+
+/*
+ * Return -1 if parallel checkout is currently not accepting entries or if the
+ * entry is not eligible for parallel checkout. Otherwise, enqueue the entry
+ * for later write and return 0.
+ */
+int enqueue_checkout(struct cache_entry *ce, struct conv_attrs *ca);
+size_t pc_queue_size(void);
+
+/*
+ * Write all the queued entries, returning 0 on success. If the number of
+ * entries is smaller than the specified threshold, the operation is performed
+ * sequentially.
+ */
+int run_parallel_checkout(struct checkout *state, int num_workers, int threshold,
+			  struct progress *progress, unsigned int *progress_cnt);
+
+/****************************************************************
+ * Interface with checkout--worker
+ ****************************************************************/
+
+enum pc_item_status {
+	PC_ITEM_PENDING = 0,
+	PC_ITEM_WRITTEN,
+	/*
+	 * The entry could not be written because there was another file
+	 * already present in its path or leading directories. Since
+	 * checkout_entry_ca() removes such files from the working tree before
+	 * enqueueing the entry for parallel checkout, it means that there was
+	 * a path collision among the entries being written.
+	 */
+	PC_ITEM_COLLIDED,
+	PC_ITEM_FAILED,
+};
+
+struct parallel_checkout_item {
+	/*
+	 * In main process ce points to a istate->cache[] entry. Thus, it's not
+	 * owned by us. In workers they own the memory, which *must be* released.
+	 */
+	struct cache_entry *ce;
+	struct conv_attrs ca;
+	size_t id; /* position in parallel_checkout.items[] of main process */
+
+	/* Output fields, sent from workers. */
+	enum pc_item_status status;
+	struct stat st;
+};
+
+/*
+ * The fixed-size portion of `struct parallel_checkout_item` that is sent to the
+ * workers. Following this will be 2 strings: ca.working_tree_encoding and
+ * ce.name; These are NOT null terminated, since we have the size in the fixed
+ * portion.
+ *
+ * Note that not all fields of conv_attrs and cache_entry are passed, only the
+ * ones that will be required by the workers to smudge and write the entry.
+ */
+struct pc_item_fixed_portion {
+	size_t id;
+	struct object_id oid;
+	unsigned int ce_mode;
+	enum convert_crlf_action crlf_action;
+	int ident;
+	size_t working_tree_encoding_len;
+	size_t name_len;
+};
+
+/*
+ * The fields of `struct parallel_checkout_item` that are returned by the
+ * workers. Note: `st` must be the last one, as it is omitted on error.
+ */
+struct pc_item_result {
+	size_t id;
+	enum pc_item_status status;
+	struct stat st;
+};
+
+#define PC_ITEM_RESULT_BASE_SIZE offsetof(struct pc_item_result, st)
+
+void write_pc_item(struct parallel_checkout_item *pc_item,
+		   struct checkout *state);
+
+#endif /* PARALLEL_CHECKOUT_H */
diff --git a/parse-options-cb.c b/parse-options-cb.c
index 1240a8514e..3c811e1e4a 100644
--- a/parse-options-cb.c
+++ b/parse-options-cb.c
@@ -4,8 +4,8 @@
 #include "commit.h"
 #include "color.h"
 #include "string-list.h"
-#include "argv-array.h"
-#include "sha1-array.h"
+#include "strvec.h"
+#include "oid-array.h"
 
 /*----- some often used options -----*/
 
@@ -105,6 +105,8 @@ int parse_opt_commit(const struct option *opt, const char *arg, int unset)
 	struct commit *commit;
 	struct commit **target = opt->value;
 
+	BUG_ON_OPT_NEG(unset);
+
 	if (!arg)
 		return -1;
 	if (get_oid(arg, &oid))
@@ -138,7 +140,7 @@ int parse_opt_object_id(const struct option *opt, const char *arg, int unset)
 	struct object_id *target = opt->value;
 
 	if (unset) {
-		*target = null_oid;
+		oidcpy(target, null_oid());
 		return 0;
 	}
 	if (!arg)
@@ -159,39 +161,32 @@ int parse_opt_tertiary(const struct option *opt, const char *arg, int unset)
 	return 0;
 }
 
-struct option *parse_options_dup(const struct option *o)
+static size_t parse_options_count(const struct option *opt)
 {
-	struct option *opts;
-	int nr = 0;
+	size_t n = 0;
 
-	while (o && o->type != OPTION_END) {
-		nr++;
-		o++;
-	}
+	for (; opt && opt->type != OPTION_END; opt++)
+		n++;
+	return n;
+}
 
-	ALLOC_ARRAY(opts, nr + 1);
-	memcpy(opts, o - nr, sizeof(*o) * nr);
-	memset(opts + nr, 0, sizeof(*opts));
-	opts[nr].type = OPTION_END;
-	return opts;
+struct option *parse_options_dup(const struct option *o)
+{
+	struct option no_options[] = { OPT_END() };
+
+	return parse_options_concat(o, no_options);
 }
 
-struct option *parse_options_concat(struct option *a, struct option *b)
+struct option *parse_options_concat(const struct option *a,
+				    const struct option *b)
 {
 	struct option *ret;
-	size_t i, a_len = 0, b_len = 0;
-
-	for (i = 0; a[i].type != OPTION_END; i++)
-		a_len++;
-	for (i = 0; b[i].type != OPTION_END; i++)
-		b_len++;
+	size_t a_len = parse_options_count(a);
+	size_t b_len = parse_options_count(b);
 
 	ALLOC_ARRAY(ret, st_add3(a_len, b_len, 1));
-	for (i = 0; i < a_len; i++)
-		ret[i] = a[i];
-	for (i = 0; i < b_len; i++)
-		ret[a_len + i] = b[i];
-	ret[a_len + b_len] = b[b_len]; /* final OPTION_END */
+	COPY_ARRAY(ret, a, a_len);
+	COPY_ARRAY(ret + a_len, b, b_len + 1); /* + 1 for final OPTION_END */
 
 	return ret;
 }
@@ -282,19 +277,19 @@ int parse_opt_passthru(const struct option *opt, const char *arg, int unset)
 
 /**
  * For an option opt, recreate the command-line option, appending it to
- * opt->value which must be a argv_array. This is useful when we need to pass
+ * opt->value which must be a strvec. This is useful when we need to pass
  * the command-line option, which can be specified multiple times, to another
  * command.
  */
 int parse_opt_passthru_argv(const struct option *opt, const char *arg, int unset)
 {
 	static struct strbuf sb = STRBUF_INIT;
-	struct argv_array *opt_value = opt->value;
+	struct strvec *opt_value = opt->value;
 
 	if (recreate_opt(&sb, opt, arg, unset) < 0)
 		return -1;
 
-	argv_array_push(opt_value, sb.buf);
+	strvec_push(opt_value, sb.buf);
 
 	return 0;
 }
diff --git a/parse-options.c b/parse-options.c
index b42f54d48b..2abff136a1 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -61,7 +61,7 @@ static enum parse_opt_result opt_command_mode_error(
 	 */
 	for (that = all_opts; that->type != OPTION_END; that++) {
 		if (that == opt ||
-		    that->type != OPTION_CMDMODE ||
+		    !(that->flags & PARSE_OPT_CMDMODE) ||
 		    that->value != opt->value ||
 		    that->defval != *(int *)opt->value)
 			continue;
@@ -95,6 +95,14 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
 	if (!(flags & OPT_SHORT) && p->opt && (opt->flags & PARSE_OPT_NOARG))
 		return error(_("%s takes no value"), optname(opt, flags));
 
+	/*
+	 * Giving the same mode option twice, although unnecessary,
+	 * is not a grave error, so let it pass.
+	 */
+	if ((opt->flags & PARSE_OPT_CMDMODE) &&
+	    *(int *)opt->value && *(int *)opt->value != opt->defval)
+		return opt_command_mode_error(opt, all_opts, flags);
+
 	switch (opt->type) {
 	case OPTION_LOWLEVEL_CALLBACK:
 		return opt->ll_callback(p, opt, NULL, unset);
@@ -130,16 +138,6 @@ static enum parse_opt_result get_value(struct parse_opt_ctx_t *p,
 		*(int *)opt->value = unset ? 0 : opt->defval;
 		return 0;
 
-	case OPTION_CMDMODE:
-		/*
-		 * Giving the same mode option twice, although is unnecessary,
-		 * is not a grave error, so let it pass.
-		 */
-		if (*(int *)opt->value && *(int *)opt->value != opt->defval)
-			return opt_command_mode_error(opt, all_opts, flags);
-		*(int *)opt->value = opt->defval;
-		return 0;
-
 	case OPTION_STRING:
 		if (unset)
 			*(const char **)opt->value = NULL;
@@ -357,8 +355,7 @@ is_abbreviated:
 			}
 			/* negated? */
 			if (!starts_with(arg, "no-")) {
-				if (starts_with(long_name, "no-")) {
-					long_name += 3;
+				if (skip_prefix(long_name, "no-", &long_name)) {
 					opt_flags |= OPT_UNSET;
 					goto again;
 				}
@@ -420,7 +417,7 @@ static void check_typos(const char *arg, const struct option *options)
 		return;
 
 	if (starts_with(arg, "no-")) {
-		error(_("did you mean `--%s` (with two dashes ?)"), arg);
+		error(_("did you mean `--%s` (with two dashes)?"), arg);
 		exit(129);
 	}
 
@@ -428,7 +425,7 @@ static void check_typos(const char *arg, const struct option *options)
 		if (!options->long_name)
 			continue;
 		if (starts_with(options->long_name, arg)) {
-			error(_("did you mean `--%s` (with two dashes ?)"), arg);
+			error(_("did you mean `--%s` (with two dashes)?"), arg);
 			exit(129);
 		}
 	}
@@ -528,7 +525,8 @@ void parse_options_start(struct parse_opt_ctx_t *ctx,
 	parse_options_start_1(ctx, argc, argv, prefix, options, flags);
 }
 
-static void show_negated_gitcomp(const struct option *opts, int nr_noopts)
+static void show_negated_gitcomp(const struct option *opts, int show_all,
+				 int nr_noopts)
 {
 	int printed_dashdash = 0;
 
@@ -538,7 +536,8 @@ static void show_negated_gitcomp(const struct option *opts, int nr_noopts)
 
 		if (!opts->long_name)
 			continue;
-		if (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE))
+		if (!show_all &&
+			(opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE)))
 			continue;
 		if (opts->flags & PARSE_OPT_NONEG)
 			continue;
@@ -575,7 +574,7 @@ static void show_negated_gitcomp(const struct option *opts, int nr_noopts)
 	}
 }
 
-static int show_gitcomp(const struct option *opts)
+static int show_gitcomp(const struct option *opts, int show_all)
 {
 	const struct option *original_opts = opts;
 	int nr_noopts = 0;
@@ -585,7 +584,8 @@ static int show_gitcomp(const struct option *opts)
 
 		if (!opts->long_name)
 			continue;
-		if (opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE))
+		if (!show_all &&
+			(opts->flags & (PARSE_OPT_HIDDEN | PARSE_OPT_NOCOMPLETE | PARSE_OPT_FROM_ALIAS)))
 			continue;
 
 		switch (opts->type) {
@@ -613,8 +613,8 @@ static int show_gitcomp(const struct option *opts)
 			nr_noopts++;
 		printf(" --%s%s", opts->long_name, suffix);
 	}
-	show_negated_gitcomp(original_opts, -1);
-	show_negated_gitcomp(original_opts, nr_noopts);
+	show_negated_gitcomp(original_opts, show_all, -1);
+	show_negated_gitcomp(original_opts, show_all, nr_noopts);
 	fputc('\n', stdout);
 	return PARSE_OPT_COMPLETE;
 }
@@ -623,8 +623,10 @@ static int show_gitcomp(const struct option *opts)
  * Scan and may produce a new option[] array, which should be used
  * instead of the original 'options'.
  *
- * Right now this is only used to preprocess and substitue
+ * Right now this is only used to preprocess and substitute
  * OPTION_ALIAS.
+ *
+ * The returned options should be freed using free_preprocessed_options.
  */
 static struct option *preprocess_options(struct parse_opt_ctx_t *ctx,
 					 const struct option *options)
@@ -651,6 +653,7 @@ static struct option *preprocess_options(struct parse_opt_ctx_t *ctx,
 		int short_name;
 		const char *long_name;
 		const char *source;
+		struct strbuf help = STRBUF_INIT;
 		int j;
 
 		if (newopt[i].type != OPTION_ALIAS)
@@ -662,6 +665,7 @@ static struct option *preprocess_options(struct parse_opt_ctx_t *ctx,
 
 		if (!long_name)
 			BUG("An alias must have long option name");
+		strbuf_addf(&help, _("alias of --%s"), source);
 
 		for (j = 0; j < nr; j++) {
 			const char *name = options[j].long_name;
@@ -672,15 +676,11 @@ static struct option *preprocess_options(struct parse_opt_ctx_t *ctx,
 			if (options[j].type == OPTION_ALIAS)
 				BUG("No please. Nested aliases are not supported.");
 
-			/*
-			 * NEEDSWORK: this is a bit inconsistent because
-			 * usage_with_options() on the original options[] will print
-			 * help string as "alias of %s" but "git cmd -h" will
-			 * print the original help string.
-			 */
 			memcpy(newopt + i, options + j, sizeof(*newopt));
 			newopt[i].short_name = short_name;
 			newopt[i].long_name = long_name;
+			newopt[i].help = strbuf_detach(&help, NULL);
+			newopt[i].flags |= PARSE_OPT_FROM_ALIAS;
 			break;
 		}
 
@@ -696,6 +696,20 @@ static struct option *preprocess_options(struct parse_opt_ctx_t *ctx,
 	return newopt;
 }
 
+static void free_preprocessed_options(struct option *options)
+{
+	int i;
+
+	if (!options)
+		return;
+
+	for (i = 0; options[i].type != OPTION_END; i++) {
+		if (options[i].flags & PARSE_OPT_FROM_ALIAS)
+			free((void *)options[i].help);
+	}
+	free(options);
+}
+
 static int usage_with_options_internal(struct parse_opt_ctx_t *,
 				       const char * const *,
 				       const struct option *, int, int);
@@ -729,9 +743,14 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 		if (internal_help && ctx->total == 1 && !strcmp(arg + 1, "h"))
 			goto show_usage;
 
-		/* lone --git-completion-helper is asked by git-completion.bash */
-		if (ctx->total == 1 && !strcmp(arg + 1, "-git-completion-helper"))
-			return show_gitcomp(options);
+		/*
+		 * lone --git-completion-helper and --git-completion-helper-all
+		 * are asked by git-completion.bash
+		 */
+		if (ctx->total == 1 && !strcmp(arg, "--git-completion-helper"))
+			return show_gitcomp(options, 0);
+		if (ctx->total == 1 && !strcmp(arg, "--git-completion-helper-all"))
+			return show_gitcomp(options, 1);
 
 		if (arg[1] != '-') {
 			ctx->opt = arg + 1;
@@ -867,8 +886,8 @@ int parse_options(int argc, const char **argv, const char *prefix,
 		usage_with_options(usagestr, options);
 	}
 
-	precompose_argv(argc, argv);
-	free(real_options);
+	precompose_argv_prefix(argc, argv, NULL);
+	free_preprocessed_options(real_options);
 	free(ctx.alias_groups);
 	return parse_options_end(&ctx);
 }
diff --git a/parse-options.h b/parse-options.h
index 38a33a087e..a845a9d952 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -1,6 +1,10 @@
 #ifndef PARSE_OPTIONS_H
 #define PARSE_OPTIONS_H
 
+/**
+ * Refer to Documentation/technical/api-parse-options.txt for the API doc.
+ */
+
 enum parse_opt_type {
 	/* special types */
 	OPTION_END,
@@ -14,7 +18,6 @@ enum parse_opt_type {
 	OPTION_BITOP,
 	OPTION_COUNTUP,
 	OPTION_SET_INT,
-	OPTION_CMDMODE,
 	/* options with arguments (usually) */
 	OPTION_STRING,
 	OPTION_INTEGER,
@@ -25,25 +28,27 @@ enum parse_opt_type {
 };
 
 enum parse_opt_flags {
-	PARSE_OPT_KEEP_DASHDASH = 1,
-	PARSE_OPT_STOP_AT_NON_OPTION = 2,
-	PARSE_OPT_KEEP_ARGV0 = 4,
-	PARSE_OPT_KEEP_UNKNOWN = 8,
-	PARSE_OPT_NO_INTERNAL_HELP = 16,
-	PARSE_OPT_ONE_SHOT = 32
+	PARSE_OPT_KEEP_DASHDASH = 1 << 0,
+	PARSE_OPT_STOP_AT_NON_OPTION = 1 << 1,
+	PARSE_OPT_KEEP_ARGV0 = 1 << 2,
+	PARSE_OPT_KEEP_UNKNOWN = 1 << 3,
+	PARSE_OPT_NO_INTERNAL_HELP = 1 << 4,
+	PARSE_OPT_ONE_SHOT = 1 << 5,
 };
 
 enum parse_opt_option_flags {
-	PARSE_OPT_OPTARG  = 1,
-	PARSE_OPT_NOARG   = 2,
-	PARSE_OPT_NONEG   = 4,
-	PARSE_OPT_HIDDEN  = 8,
-	PARSE_OPT_LASTARG_DEFAULT = 16,
-	PARSE_OPT_NODASH = 32,
-	PARSE_OPT_LITERAL_ARGHELP = 64,
-	PARSE_OPT_SHELL_EVAL = 256,
-	PARSE_OPT_NOCOMPLETE = 512,
-	PARSE_OPT_COMP_ARG = 1024
+	PARSE_OPT_OPTARG  = 1 << 0,
+	PARSE_OPT_NOARG   = 1 << 1,
+	PARSE_OPT_NONEG   = 1 << 2,
+	PARSE_OPT_HIDDEN  = 1 << 3,
+	PARSE_OPT_LASTARG_DEFAULT = 1 << 4,
+	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,
 };
 
 enum parse_opt_result {
@@ -78,9 +83,9 @@ typedef enum parse_opt_result parse_opt_ll_cb(struct parse_opt_ctx_t *ctx,
  *   stores pointers to the values to be filled.
  *
  * `argh`::
- *   token to explain the kind of argument this option wants. Keep it
- *   homogeneous across the repository. Should be wrapped by N_() for
- *   translation.
+ *   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.
  *
  * `help`::
  *   the short help associated to what the option does.
@@ -164,8 +169,8 @@ 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_CMDMODE, (s), (l), (v), NULL, \
-				      (h), PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) }
+#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_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 }
@@ -277,7 +282,7 @@ int parse_options_step(struct parse_opt_ctx_t *ctx,
 int parse_options_end(struct parse_opt_ctx_t *ctx);
 
 struct option *parse_options_dup(const struct option *a);
-struct option *parse_options_concat(struct option *a, struct option *b);
+struct option *parse_options_concat(const struct option *a, const struct option *b);
 
 /*----- some often used options -----*/
 int parse_opt_abbrev_cb(const struct option *, const char *, int);
@@ -310,7 +315,7 @@ int parse_opt_passthru_argv(const struct option *, const char *, int);
 #define OPT__FORCE(var, h, f) OPT_COUNTUP_F('f', "force",   (var), (h), (f))
 #define OPT__ABBREV(var)  \
 	{ OPTION_CALLBACK, 0, "abbrev", (var), N_("n"),	\
-	  N_("use <n> digits to display SHA-1s"),	\
+	  N_("use <n> digits to display object names"),	\
 	  PARSE_OPT_OPTARG, &parse_opt_abbrev_cb, 0 }
 #define OPT__COLOR(var, h) \
 	OPT_COLOR_FLAG(0, "color", (var), (h))
@@ -330,5 +335,8 @@ int parse_opt_passthru_argv(const struct option *, const char *, int);
 #define OPT_WITH(v, h) _OPT_CONTAINS_OR_WITH("with", v, h, PARSE_OPT_HIDDEN | PARSE_OPT_NONEG)
 #define OPT_WITHOUT(v, h) _OPT_CONTAINS_OR_WITH("without", v, h, PARSE_OPT_HIDDEN | PARSE_OPT_NONEG)
 #define OPT_CLEANUP(v) OPT_STRING(0, "cleanup", v, N_("mode"), N_("how to strip spaces and #comments from message"))
+#define OPT_PATHSPEC_FROM_FILE(v) OPT_FILENAME(0, "pathspec-from-file", v, N_("read pathspec from file"))
+#define OPT_PATHSPEC_FILE_NUL(v)  OPT_BOOL(0, "pathspec-file-nul", v, N_("with --pathspec-from-file, pathspec elements are separated with NUL character"))
+#define OPT_AUTOSTASH(v) OPT_BOOL(0, "autostash", v, N_("automatically stash/stash pop before and after"))
 
 #endif
diff --git a/patch-ids.c b/patch-ids.c
index 12aa6d494b..8bf425555d 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -1,7 +1,7 @@
 #include "cache.h"
 #include "diff.h"
 #include "commit.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
 #include "patch-ids.h"
 
 static int patch_id_defined(struct commit *commit)
@@ -71,7 +71,7 @@ int init_patch_ids(struct repository *r, struct patch_ids *ids)
 
 int free_patch_ids(struct patch_ids *ids)
 {
-	hashmap_free_entries(&ids->patches, struct patch_id, ent);
+	hashmap_clear_and_free(&ids->patches, struct patch_id, ent);
 	return 0;
 }
 
@@ -89,7 +89,7 @@ static int init_patch_id_entry(struct patch_id *patch,
 	return 0;
 }
 
-struct patch_id *has_commit_patch_id(struct commit *commit,
+struct patch_id *patch_id_iter_first(struct commit *commit,
 				     struct patch_ids *ids)
 {
 	struct patch_id patch;
@@ -104,6 +104,18 @@ struct patch_id *has_commit_patch_id(struct commit *commit,
 	return hashmap_get_entry(&ids->patches, &patch, ent, NULL);
 }
 
+struct patch_id *patch_id_iter_next(struct patch_id *cur,
+				    struct patch_ids *ids)
+{
+	return hashmap_get_next_entry(&ids->patches, cur, ent);
+}
+
+int has_commit_patch_id(struct commit *commit,
+			struct patch_ids *ids)
+{
+	return !!patch_id_iter_first(commit, ids);
+}
+
 struct patch_id *add_commit_patch_id(struct commit *commit,
 				     struct patch_ids *ids)
 {
@@ -112,7 +124,7 @@ struct patch_id *add_commit_patch_id(struct commit *commit,
 	if (!patch_id_defined(commit))
 		return NULL;
 
-	key = xcalloc(1, sizeof(*key));
+	CALLOC_ARRAY(key, 1);
 	if (init_patch_id_entry(key, commit, ids)) {
 		free(key);
 		return NULL;
diff --git a/patch-ids.h b/patch-ids.h
index 03bb04e707..ab6c6a6804 100644
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -23,7 +23,25 @@ int commit_patch_id(struct commit *commit, struct diff_options *options,
 		    struct object_id *oid, int, int);
 int init_patch_ids(struct repository *, struct patch_ids *);
 int free_patch_ids(struct patch_ids *);
+
+/* Add a patch_id for a single commit to the set. */
 struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);
-struct patch_id *has_commit_patch_id(struct commit *, struct patch_ids *);
+
+/* Returns true if the patch-id of "commit" is present in the set. */
+int has_commit_patch_id(struct commit *commit, struct patch_ids *);
+
+/*
+ * Iterate over all commits in the set whose patch id matches that of
+ * "commit", like:
+ *
+ *   struct patch_id *cur;
+ *   for (cur = patch_id_iter_first(commit, ids);
+ *        cur;
+ *        cur = patch_id_iter_next(cur, ids) {
+ *           ... look at cur->commit
+ *   }
+ */
+struct patch_id *patch_id_iter_first(struct commit *commit, struct patch_ids *);
+struct patch_id *patch_id_iter_next(struct patch_id *cur, struct patch_ids *);
 
 #endif /* PATCH_IDS_H */
diff --git a/path.c b/path.c
index e3da1f3c4e..0bc788ea40 100644
--- a/path.c
+++ b/path.c
@@ -11,6 +11,8 @@
 #include "path.h"
 #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)
 {
@@ -101,36 +103,36 @@ struct common_dir {
 	/* Not considered garbage for report_linked_checkout_garbage */
 	unsigned ignore_garbage:1;
 	unsigned is_dir:1;
-	/* Not common even though its parent is */
-	unsigned exclude:1;
-	const char *dirname;
+	/* Belongs to the common dir, though it may contain paths that don't */
+	unsigned is_common:1;
+	const char *path;
 };
 
 static struct common_dir common_list[] = {
-	{ 0, 1, 0, "branches" },
-	{ 0, 1, 0, "common" },
-	{ 0, 1, 0, "hooks" },
-	{ 0, 1, 0, "info" },
-	{ 0, 0, 1, "info/sparse-checkout" },
-	{ 1, 1, 0, "logs" },
-	{ 1, 1, 1, "logs/HEAD" },
-	{ 0, 1, 1, "logs/refs/bisect" },
-	{ 0, 1, 1, "logs/refs/rewritten" },
-	{ 0, 1, 1, "logs/refs/worktree" },
-	{ 0, 1, 0, "lost-found" },
-	{ 0, 1, 0, "objects" },
-	{ 0, 1, 0, "refs" },
-	{ 0, 1, 1, "refs/bisect" },
-	{ 0, 1, 1, "refs/rewritten" },
-	{ 0, 1, 1, "refs/worktree" },
-	{ 0, 1, 0, "remotes" },
-	{ 0, 1, 0, "worktrees" },
-	{ 0, 1, 0, "rr-cache" },
-	{ 0, 1, 0, "svn" },
-	{ 0, 0, 0, "config" },
-	{ 1, 0, 0, "gc.pid" },
-	{ 0, 0, 0, "packed-refs" },
-	{ 0, 0, 0, "shallow" },
+	{ 0, 1, 1, "branches" },
+	{ 0, 1, 1, "common" },
+	{ 0, 1, 1, "hooks" },
+	{ 0, 1, 1, "info" },
+	{ 0, 0, 0, "info/sparse-checkout" },
+	{ 1, 1, 1, "logs" },
+	{ 1, 0, 0, "logs/HEAD" },
+	{ 0, 1, 0, "logs/refs/bisect" },
+	{ 0, 1, 0, "logs/refs/rewritten" },
+	{ 0, 1, 0, "logs/refs/worktree" },
+	{ 0, 1, 1, "lost-found" },
+	{ 0, 1, 1, "objects" },
+	{ 0, 1, 1, "refs" },
+	{ 0, 1, 0, "refs/bisect" },
+	{ 0, 1, 0, "refs/rewritten" },
+	{ 0, 1, 0, "refs/worktree" },
+	{ 0, 1, 1, "remotes" },
+	{ 0, 1, 1, "worktrees" },
+	{ 0, 1, 1, "rr-cache" },
+	{ 0, 1, 1, "svn" },
+	{ 0, 0, 1, "config" },
+	{ 1, 0, 1, "gc.pid" },
+	{ 0, 0, 1, "packed-refs" },
+	{ 0, 0, 1, "shallow" },
 	{ 0, 0, 0, NULL }
 };
 
@@ -236,30 +238,41 @@ static void *add_to_trie(struct trie *root, const char *key, void *value)
 	return old;
 }
 
-typedef int (*match_fn)(const char *unmatched, void *data, void *baton);
+typedef int (*match_fn)(const char *unmatched, void *value, void *baton);
 
 /*
  * Search a trie for some key.  Find the longest /-or-\0-terminated
- * prefix of the key for which the trie contains a value.  Call fn
- * with the unmatched portion of the key and the found value, and
- * return its return value.  If there is no such prefix, return -1.
+ * prefix of the key for which the trie contains a value.  If there is
+ * no such prefix, return -1.  Otherwise call fn with the unmatched
+ * portion of the key and the found value.  If fn returns 0 or
+ * positive, then return its return value.  If fn returns negative,
+ * then call fn with the next-longest /-terminated prefix of the key
+ * (i.e. a parent directory) for which the trie contains a value, and
+ * handle its return value the same way.  If there is no shorter
+ * /-terminated prefix with a value left, then return the negative
+ * return value of the most recent fn invocation.
  *
  * The key is partially normalized: consecutive slashes are skipped.
  *
- * For example, consider the trie containing only [refs,
- * refs/worktree] (both with values).
- *
- * | key             | unmatched  | val from node | return value |
- * |-----------------|------------|---------------|--------------|
- * | a               | not called | n/a           | -1           |
- * | refs            | \0         | refs          | as per fn    |
- * | refs/           | /          | refs          | as per fn    |
- * | refs/w          | /w         | refs          | as per fn    |
- * | refs/worktree   | \0         | refs/worktree | as per fn    |
- * | refs/worktree/  | /          | refs/worktree | as per fn    |
- * | refs/worktree/a | /a         | refs/worktree | as per fn    |
- * |-----------------|------------|---------------|--------------|
+ * For example, consider the trie containing only [logs,
+ * logs/refs/bisect], both with values, but not logs/refs.
  *
+ * | key                | unmatched      | prefix to node   | return value |
+ * |--------------------|----------------|------------------|--------------|
+ * | a                  | not called     | n/a              | -1           |
+ * | logstore           | not called     | n/a              | -1           |
+ * | logs               | \0             | logs             | as per fn    |
+ * | logs/              | /              | logs             | as per fn    |
+ * | logs/refs          | /refs          | logs             | as per fn    |
+ * | logs/refs/         | /refs/         | logs             | as per fn    |
+ * | logs/refs/b        | /refs/b        | logs             | as per fn    |
+ * | logs/refs/bisected | /refs/bisected | logs             | as per fn    |
+ * | logs/refs/bisect   | \0             | logs/refs/bisect | as per fn    |
+ * | logs/refs/bisect/  | /              | logs/refs/bisect | as per fn    |
+ * | logs/refs/bisect/a | /a             | logs/refs/bisect | as per fn    |
+ * | (If fn in the previous line returns -1, then fn is called once more:) |
+ * | logs/refs/bisect/a | /refs/bisect/a | logs             | as per fn    |
+ * |--------------------|----------------|------------------|--------------|
  */
 static int trie_find(struct trie *root, const char *key, match_fn fn,
 		     void *baton)
@@ -288,9 +301,13 @@ static int trie_find(struct trie *root, const char *key, match_fn fn,
 
 	/* Matched the entire compressed section */
 	key += i;
-	if (!*key)
+	if (!*key) {
 		/* End of key */
-		return fn(key, root->value, baton);
+		if (root->value)
+			return fn(key, root->value, baton);
+		else
+			return -1;
+	}
 
 	/* Partial path normalization: skip consecutive slashes */
 	while (key[0] == '/' && key[1] == '/')
@@ -320,8 +337,8 @@ static void init_common_trie(void)
 	if (common_trie_done_setup)
 		return;
 
-	for (p = common_list; p->dirname; p++)
-		add_to_trie(&common_trie, p->dirname, p);
+	for (p = common_list; p->path; p++)
+		add_to_trie(&common_trie, p->path, p);
 
 	common_trie_done_setup = 1;
 }
@@ -334,14 +351,11 @@ static int check_common(const char *unmatched, void *value, void *baton)
 {
 	struct common_dir *dir = value;
 
-	if (!dir)
-		return 0;
-
 	if (dir->is_dir && (unmatched[0] == 0 || unmatched[0] == '/'))
-		return !dir->exclude;
+		return dir->is_common;
 
 	if (!dir->is_dir && unmatched[0] == 0)
-		return !dir->exclude;
+		return dir->is_common;
 
 	return 0;
 }
@@ -350,9 +364,14 @@ static void update_common_dir(struct strbuf *buf, int git_dir_len,
 			      const char *common_dir)
 {
 	char *base = buf->buf + git_dir_len;
+	int has_lock_suffix = strbuf_strip_suffix(buf, LOCK_SUFFIX);
+
 	init_common_trie();
 	if (trie_find(&common_trie, base, check_common, NULL) > 0)
 		replace_dir(buf, git_dir_len, common_dir);
+
+	if (has_lock_suffix)
+		strbuf_addstr(buf, LOCK_SUFFIX);
 }
 
 void report_linked_checkout_garbage(void)
@@ -365,8 +384,8 @@ void report_linked_checkout_garbage(void)
 		return;
 	strbuf_addf(&sb, "%s/", get_git_dir());
 	len = sb.len;
-	for (p = common_list; p->dirname; p++) {
-		const char *path = p->dirname;
+	for (p = common_list; p->path; p++) {
+		const char *path = p->path;
 		if (p->ignore_garbage)
 			continue;
 		strbuf_setlen(&sb, len);
@@ -701,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, real_path($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;
@@ -794,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),
@@ -832,8 +857,8 @@ const char *enter_repo(const char *path, int strict)
 	}
 
 	if (is_git_directory(".")) {
-		set_git_dir(".");
-		check_repository_format();
+		set_git_dir(".", 0);
+		check_repository_format(NULL);
 		return path;
 	}
 
@@ -1059,6 +1084,8 @@ const char *remove_leading_path(const char *in, const char *prefix)
 
 /*
  * It is okay if dst == src, but they should not overlap otherwise.
+ * The "dst" buffer must be at least as long as "src"; normalizing may shrink
+ * the size of the path, but will never grow it.
  *
  * Performs the following normalizations on src, storing the result in dst:
  * - Ensures that components are separated by '/' (Windows only)
@@ -1316,37 +1343,77 @@ int daemon_avoid_alias(const char *p)
 	}
 }
 
-static int only_spaces_and_periods(const char *path, size_t len, size_t skip)
+/*
+ * On NTFS, we need to be careful to disallow certain synonyms of the `.git/`
+ * directory:
+ *
+ * - For historical reasons, file names that end in spaces or periods are
+ *   automatically trimmed. Therefore, `.git . . ./` is a valid way to refer
+ *   to `.git/`.
+ *
+ * - For other historical reasons, file names that do not conform to the 8.3
+ *   format (up to eight characters for the basename, three for the file
+ *   extension, certain characters not allowed such as `+`, etc) are associated
+ *   with a so-called "short name", at least on the `C:` drive by default.
+ *   Which means that `git~1/` is a valid way to refer to `.git/`.
+ *
+ *   Note: Technically, `.git/` could receive the short name `git~2` if the
+ *   short name `git~1` were already used. In Git, however, we guarantee that
+ *   `.git` is the first item in a directory, therefore it will be associated
+ *   with the short name `git~1` (unless short names are disabled).
+ *
+ * - For yet other historical reasons, NTFS supports so-called "Alternate Data
+ *   Streams", i.e. metadata associated with a given file, referred to via
+ *   `<filename>:<stream-name>:<stream-type>`. There exists a default stream
+ *   type for directories, allowing `.git/` to be accessed via
+ *   `.git::$INDEX_ALLOCATION/`.
+ *
+ * When this function returns 1, it indicates that the specified file/directory
+ * name refers to a `.git` file or directory, or to any of these synonyms, and
+ * Git should therefore not track it.
+ *
+ * For performance reasons, _all_ Alternate Data Streams of `.git/` are
+ * forbidden, not just `::$INDEX_ALLOCATION`.
+ *
+ * This function is intended to be used by `git fsck` even on platforms where
+ * the backslash is a regular filename character, therefore it needs to handle
+ * backlash characters in the provided `name` specially: they are interpreted
+ * as directory separators.
+ */
+int is_ntfs_dotgit(const char *name)
 {
-	if (len < skip)
+	char c;
+
+	/*
+	 * Note that when we don't find `.git` or `git~1` we end up with `name`
+	 * advanced partway through the string. That's okay, though, as we
+	 * return immediately in those cases, without looking at `name` any
+	 * further.
+	 */
+	c = *(name++);
+	if (c == '.') {
+		/* .git */
+		if (((c = *(name++)) != 'g' && c != 'G') ||
+		    ((c = *(name++)) != 'i' && c != 'I') ||
+		    ((c = *(name++)) != 't' && c != 'T'))
+			return 0;
+	} else if (c == 'g' || c == 'G') {
+		/* git ~1 */
+		if (((c = *(name++)) != 'i' && c != 'I') ||
+		    ((c = *(name++)) != 't' && c != 'T') ||
+		    *(name++) != '~' ||
+		    *(name++) != '1')
+			return 0;
+	} else
 		return 0;
-	len -= skip;
-	path += skip;
-	while (len-- > 0) {
-		char c = *(path++);
-		if (c != ' ' && c != '.')
+
+	for (;;) {
+		c = *(name++);
+		if (!c || c == '\\' || c == '/' || c == ':')
+			return 1;
+		if (c != '.' && c != ' ')
 			return 0;
 	}
-	return 1;
-}
-
-int is_ntfs_dotgit(const char *name)
-{
-	size_t len;
-
-	for (len = 0; ; len++)
-		if (!name[len] || name[len] == '\\' || is_dir_sep(name[len])) {
-			if (only_spaces_and_periods(name, len, 4) &&
-					!strncasecmp(name, ".git", 4))
-				return 1;
-			if (only_spaces_and_periods(name, len, 5) &&
-					!strncasecmp(name, "git~1", 5))
-				return 1;
-			if (name[len] != '\\')
-				return 0;
-			name += len + 1;
-			len = -1;
-		}
 }
 
 static int is_ntfs_dot_generic(const char *name,
@@ -1362,7 +1429,7 @@ static int is_ntfs_dot_generic(const char *name,
 only_spaces_and_periods:
 		for (;;) {
 			char c = name[i++];
-			if (!c)
+			if (!c || c == ':')
 				return 1;
 			if (c != ' ' && c != '.')
 				return 0;
@@ -1433,6 +1500,11 @@ int is_ntfs_dotgitattributes(const char *name)
 	return is_ntfs_dot_str(name, "gitattributes", "gi7d29");
 }
 
+int is_ntfs_dotmailmap(const char *name)
+{
+	return is_ntfs_dot_str(name, "mailmap", "maba30");
+}
+
 int looks_like_command_line_option(const char *str)
 {
 	return str && str[0] == '-';
@@ -1468,12 +1540,12 @@ char *xdg_cache_home(const char *filename)
 	return NULL;
 }
 
-REPO_GIT_PATH_FUNC(cherry_pick_head, "CHERRY_PICK_HEAD")
-REPO_GIT_PATH_FUNC(revert_head, "REVERT_HEAD")
 REPO_GIT_PATH_FUNC(squash_msg, "SQUASH_MSG")
 REPO_GIT_PATH_FUNC(merge_msg, "MERGE_MSG")
 REPO_GIT_PATH_FUNC(merge_rr, "MERGE_RR")
 REPO_GIT_PATH_FUNC(merge_mode, "MERGE_MODE")
 REPO_GIT_PATH_FUNC(merge_head, "MERGE_HEAD")
+REPO_GIT_PATH_FUNC(merge_autostash, "MERGE_AUTOSTASH")
+REPO_GIT_PATH_FUNC(auto_merge, "AUTO_MERGE")
 REPO_GIT_PATH_FUNC(fetch_head, "FETCH_HEAD")
 REPO_GIT_PATH_FUNC(shallow, "shallow")
diff --git a/path.h b/path.h
index 14d6dcad16..251c78d980 100644
--- a/path.h
+++ b/path.h
@@ -170,26 +170,29 @@ void report_linked_checkout_garbage(void);
 	}
 
 struct path_cache {
-	const char *cherry_pick_head;
-	const char *revert_head;
 	const char *squash_msg;
 	const char *merge_msg;
 	const char *merge_rr;
 	const char *merge_mode;
 	const char *merge_head;
+	const char *merge_autostash;
+	const char *auto_merge;
 	const char *fetch_head;
 	const char *shallow;
 };
 
-#define PATH_CACHE_INIT { NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
+#define PATH_CACHE_INIT                                        \
+	{                                                      \
+		NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL \
+	}
 
-const char *git_path_cherry_pick_head(struct repository *r);
-const char *git_path_revert_head(struct repository *r);
 const char *git_path_squash_msg(struct repository *r);
 const char *git_path_merge_msg(struct repository *r);
 const char *git_path_merge_rr(struct repository *r);
 const char *git_path_merge_mode(struct repository *r);
 const char *git_path_merge_head(struct repository *r);
+const char *git_path_merge_autostash(struct repository *r);
+const char *git_path_auto_merge(struct repository *r);
 const char *git_path_fetch_head(struct repository *r);
 const char *git_path_shallow(struct repository *r);
 
diff --git a/pathspec.c b/pathspec.c
index 12c2b322b3..44306fdaca 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -3,6 +3,8 @@
 #include "dir.h"
 #include "pathspec.h"
 #include "attr.h"
+#include "strvec.h"
+#include "quote.h"
 
 /*
  * Finds which of the given pathspecs match items in the index.
@@ -18,8 +20,9 @@
  * to use find_pathspecs_matching_against_index() instead.
  */
 void add_pathspec_matches_against_index(const struct pathspec *pathspec,
-					const struct index_state *istate,
-					char *seen)
+					struct index_state *istate,
+					char *seen,
+					enum ps_skip_worktree_action sw_action)
 {
 	int num_unmatched = 0, i;
 
@@ -36,6 +39,8 @@ void add_pathspec_matches_against_index(const struct pathspec *pathspec,
 		return;
 	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))
+			continue;
 		ce_path_match(istate, ce, pathspec, seen);
 	}
 }
@@ -49,10 +54,26 @@ void add_pathspec_matches_against_index(const struct pathspec *pathspec,
  * given pathspecs achieves against all items in the index.
  */
 char *find_pathspecs_matching_against_index(const struct pathspec *pathspec,
-					    const struct index_state *istate)
+					    struct index_state *istate,
+					    enum ps_skip_worktree_action sw_action)
+{
+	char *seen = xcalloc(pathspec->nr, 1);
+	add_pathspec_matches_against_index(pathspec, istate, seen, sw_action);
+	return seen;
+}
+
+char *find_pathspecs_matching_skip_worktree(const struct pathspec *pathspec)
 {
+	struct index_state *istate = the_repository->index;
 	char *seen = xcalloc(pathspec->nr, 1);
-	add_pathspec_matches_against_index(pathspec, istate, seen);
+	int i;
+
+	for (i = 0; i < istate->cache_nr; i++) {
+		struct cache_entry *ce = istate->cache[i];
+		if (ce_skip_worktree(ce))
+		    ce_path_match(istate, ce, pathspec, seen);
+	}
+
 	return seen;
 }
 
@@ -152,7 +173,7 @@ static void parse_pathspec_attr_match(struct pathspec_item *item, const char *va
 	string_list_remove_empty_items(&list, 0);
 
 	item->attr_check = attr_check_alloc();
-	item->attr_match = xcalloc(list.nr, sizeof(struct attr_match));
+	CALLOC_ARRAY(item->attr_match, list.nr);
 
 	for_each_string_list_item(si, &list) {
 		size_t attr_len;
@@ -436,8 +457,13 @@ static void init_pathspec_item(struct pathspec_item *item, unsigned flags,
 	} else {
 		match = prefix_path_gently(prefix, prefixlen,
 					   &prefixlen, copyfrom);
-		if (!match)
-			die(_("%s: '%s' is outside repository"), elt, copyfrom);
+		if (!match) {
+			const char *hint_path = get_git_work_tree();
+			if (!hint_path)
+				hint_path = get_git_dir();
+			die(_("%s: '%s' is outside repository at '%s'"), elt,
+			    copyfrom, absolute_path(hint_path));
+		}
 	}
 
 	item->match = match;
@@ -554,7 +580,7 @@ void parse_pathspec(struct pathspec *pathspec,
 		if (!(flags & PATHSPEC_PREFER_CWD))
 			BUG("PATHSPEC_PREFER_CWD requires arguments");
 
-		pathspec->items = item = xcalloc(1, sizeof(*item));
+		pathspec->items = CALLOC_ARRAY(item, 1);
 		item->match = xstrdup(prefix);
 		item->original = xstrdup(prefix);
 		item->nowildcard_len = item->len = strlen(prefix);
@@ -613,6 +639,42 @@ void parse_pathspec(struct pathspec *pathspec,
 	}
 }
 
+void parse_pathspec_file(struct pathspec *pathspec, unsigned magic_mask,
+			 unsigned flags, const char *prefix,
+			 const char *file, int nul_term_line)
+{
+	struct strvec parsed_file = STRVEC_INIT;
+	strbuf_getline_fn getline_fn = nul_term_line ? strbuf_getline_nul :
+						       strbuf_getline;
+	struct strbuf buf = STRBUF_INIT;
+	struct strbuf unquoted = STRBUF_INIT;
+	FILE *in;
+
+	if (!strcmp(file, "-"))
+		in = stdin;
+	else
+		in = xfopen(file, "r");
+
+	while (getline_fn(&buf, in) != EOF) {
+		if (!nul_term_line && buf.buf[0] == '"') {
+			strbuf_reset(&unquoted);
+			if (unquote_c_style(&unquoted, buf.buf, NULL))
+				die(_("line is badly quoted: %s"), buf.buf);
+			strbuf_swap(&buf, &unquoted);
+		}
+		strvec_push(&parsed_file, buf.buf);
+		strbuf_reset(&buf);
+	}
+
+	strbuf_release(&unquoted);
+	strbuf_release(&buf);
+	if (in != stdin)
+		fclose(in);
+
+	parse_pathspec(pathspec, magic_mask, flags, prefix, parsed_file.v);
+	strvec_clear(&parsed_file);
+}
+
 void copy_pathspec(struct pathspec *dst, const struct pathspec *src)
 {
 	int i, j;
@@ -659,7 +721,7 @@ void clear_pathspec(struct pathspec *pathspec)
 	pathspec->nr = 0;
 }
 
-int match_pathspec_attrs(const struct index_state *istate,
+int match_pathspec_attrs(struct index_state *istate,
 			 const char *name, int namelen,
 			 const struct pathspec_item *item)
 {
diff --git a/pathspec.h b/pathspec.h
index 1c18a2c90c..2341dc9901 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -22,6 +22,11 @@ struct index_state;
 
 #define PATHSPEC_ONESTAR 1	/* the pathspec pattern satisfies GFNM_ONESTAR */
 
+/**
+ * See glossary-context.txt for the syntax of pathspec.
+ * In memory, a pathspec set is represented by "struct pathspec" and is
+ * prepared by parse_pathspec().
+ */
 struct pathspec {
 	int nr;
 	unsigned int has_wildcard:1;
@@ -73,18 +78,56 @@ struct pathspec {
  */
 #define PATHSPEC_LITERAL_PATH (1<<6)
 
-/*
+/**
  * Given command line arguments and a prefix, convert the input to
  * pathspec. die() if any magic in magic_mask is used.
  *
  * Any arguments used are copied. It is safe for the caller to modify
  * or free 'prefix' and 'args' after calling this function.
+ *
+ * - magic_mask specifies what features that are NOT supported by the following
+ * code. If a user attempts to use such a feature, parse_pathspec() can reject
+ * it early.
+ *
+ * - flags specifies other things that the caller wants parse_pathspec to
+ * perform.
+ *
+ * - prefix and args come from cmd_* functions
+ *
+ * parse_pathspec() helps catch unsupported features and reject them politely.
+ * At a lower level, different pathspec-related functions may not support the
+ * same set of features. Such pathspec-sensitive functions are guarded with
+ * GUARD_PATHSPEC(), which will die in an unfriendly way when an unsupported
+ * feature is requested.
+ *
+ * The command designers are supposed to make sure that GUARD_PATHSPEC() never
+ * dies. They have to make sure all unsupported features are caught by
+ * parse_pathspec(), not by GUARD_PATHSPEC. grepping GUARD_PATHSPEC() should
+ * give the designers all pathspec-sensitive codepaths and what features they
+ * support.
+ *
+ * A similar process is applied when a new pathspec magic is added. The designer
+ * lifts the GUARD_PATHSPEC restriction in the functions that support the new
+ * magic while at the same time making sure this new feature will be
+ * caught at parse_pathspec() in commands that cannot handle the new magic in
+ * some cases. grepping parse_pathspec() should help.
  */
 void parse_pathspec(struct pathspec *pathspec,
 		    unsigned magic_mask,
 		    unsigned flags,
 		    const char *prefix,
 		    const char **args);
+/*
+ * Same as parse_pathspec() but uses file as input.
+ * When 'file' is exactly "-" it uses 'stdin' instead.
+ */
+void parse_pathspec_file(struct pathspec *pathspec,
+			 unsigned magic_mask,
+			 unsigned flags,
+			 const char *prefix,
+			 const char *file,
+			 int nul_term_line);
+
 void copy_pathspec(struct pathspec *dst, const struct pathspec *src);
 void clear_pathspec(struct pathspec *);
 
@@ -106,12 +149,26 @@ static inline int ps_strcmp(const struct pathspec_item *item,
 		return strcmp(s1, s2);
 }
 
+enum ps_skip_worktree_action {
+  PS_HEED_SKIP_WORKTREE = 0,
+  PS_IGNORE_SKIP_WORKTREE = 1
+};
 void add_pathspec_matches_against_index(const struct pathspec *pathspec,
-					const struct index_state *istate,
-					char *seen);
+					struct index_state *istate,
+					char *seen,
+					enum ps_skip_worktree_action sw_action);
 char *find_pathspecs_matching_against_index(const struct pathspec *pathspec,
-					    const struct index_state *istate);
-int match_pathspec_attrs(const struct index_state *istate,
+					    struct index_state *istate,
+					    enum ps_skip_worktree_action sw_action);
+char *find_pathspecs_matching_skip_worktree(const struct pathspec *pathspec);
+static inline int matches_skip_worktree(const struct pathspec *pathspec,
+					int item, char **seen_ptr)
+{
+	if (!*seen_ptr)
+		*seen_ptr = find_pathspecs_matching_skip_worktree(pathspec);
+	return (*seen_ptr)[item];
+}
+int match_pathspec_attrs(struct index_state *istate,
 			 const char *name, int namelen,
 			 const struct pathspec_item *item);
 
diff --git a/perl/FromCPAN/Error.pm b/perl/FromCPAN/Error.pm
index 8b95e2d73d..d82b71325c 100644
--- a/perl/FromCPAN/Error.pm
+++ b/perl/FromCPAN/Error.pm
@@ -12,7 +12,7 @@
 package Error;
 
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 
 use vars qw($VERSION);
 use 5.004;
diff --git a/perl/Git.pm b/perl/Git.pm
index 62c472e0ce..090a7df63f 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -9,10 +9,7 @@ package Git;
 
 use 5.008;
 use strict;
-use warnings;
-
-use File::Temp ();
-use File::Spec ();
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 
 BEGIN {
 
@@ -103,12 +100,9 @@ increase notwithstanding).
 =cut
 
 
-use Carp qw(carp croak); # but croak is bad - throw instead
+sub carp { require Carp; goto &Carp::carp }
+sub croak { require Carp; goto &Carp::croak }
 use Git::LoadCPAN::Error qw(:try);
-use Cwd qw(abs_path cwd);
-use IPC::Open2 qw(open2);
-use Fcntl qw(SEEK_SET SEEK_CUR);
-use Time::Local qw(timegm);
 }
 
 
@@ -191,13 +185,15 @@ sub repository {
 			$dir = undef;
 		};
 
+		require Cwd;
 		if ($dir) {
+			require File::Spec;
 			File::Spec->file_name_is_absolute($dir) or $dir = $opts{Directory} . '/' . $dir;
-			$opts{Repository} = abs_path($dir);
+			$opts{Repository} = Cwd::abs_path($dir);
 
 			# If --git-dir went ok, this shouldn't die either.
 			my $prefix = $search->command_oneline('rev-parse', '--show-prefix');
-			$dir = abs_path($opts{Directory}) . '/';
+			$dir = Cwd::abs_path($opts{Directory}) . '/';
 			if ($prefix) {
 				if (substr($dir, -length($prefix)) ne $prefix) {
 					throw Error::Simple("rev-parse confused me - $dir does not have trailing $prefix");
@@ -223,7 +219,7 @@ sub repository {
 				throw Error::Simple("fatal: Not a git repository: $dir");
 			}
 
-			$opts{Repository} = abs_path($dir);
+			$opts{Repository} = Cwd::abs_path($dir);
 		}
 
 		delete $opts{Directory};
@@ -408,10 +404,12 @@ sub command_bidi_pipe {
 	my $cwd_save = undef;
 	if ($self) {
 		shift;
-		$cwd_save = cwd();
+		require Cwd;
+		$cwd_save = Cwd::getcwd();
 		_setup_git_cmd_env($self);
 	}
-	$pid = open2($in, $out, 'git', @_);
+	require IPC::Open2;
+	$pid = IPC::Open2::open2($in, $out, 'git', @_);
 	chdir($cwd_save) if $cwd_save;
 	return ($pid, $in, $out, join(' ', @_));
 }
@@ -538,7 +536,8 @@ sub get_tz_offset {
 	my $t = shift || time;
 	my @t = localtime($t);
 	$t[5] += 1900;
-	my $gm = timegm(@t);
+	require Time::Local;
+	my $gm = Time::Local::timegm(@t);
 	my $sign = qw( + + - )[ $gm <=> $t ];
 	return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]);
 }
@@ -563,7 +562,7 @@ sub get_record {
 Query user C<PROMPT> and return answer from user.
 
 Honours GIT_ASKPASS and SSH_ASKPASS environment variables for querying
-the user. If no *_ASKPASS variable is set or an error occoured,
+the user. If no *_ASKPASS variable is set or an error occurred,
 the terminal is tried as a fallback.
 If C<ISPASSWORD> is set and true, the terminal disables echo.
 
@@ -723,6 +722,32 @@ sub config_int {
 	return scalar _config_common({'kind' => '--int'}, @_);
 }
 
+=item config_regexp ( RE )
+
+Retrieve the list of configuration key names matching the regular
+expression C<RE>. The return value is a list of strings matching
+this regex.
+
+=cut
+
+sub config_regexp {
+	my ($self, $regex) = _maybe_self(@_);
+	try {
+		my @cmd = ('config', '--name-only', '--get-regexp', $regex);
+		unshift @cmd, $self if $self;
+		my @matches = command(@cmd);
+		return @matches;
+	} catch Git::Error::Command with {
+		my $E = shift;
+		if ($E->value() == 1) {
+			my @matches = ();
+			return @matches;
+		} else {
+			throw $E;
+		}
+	};
+}
+
 # Common subroutine to implement bulk of what the config* family of methods
 # do. This currently wraps command('config') so it is not so fast.
 sub _config_common {
@@ -1314,6 +1339,7 @@ sub _temp_cache {
 		my $n = $name;
 		$n =~ s/\W/_/g; # no strange chars
 
+		require File::Temp;
 		($$temp_fd, $fname) = File::Temp::tempfile(
 			"Git_${n}_XXXXXX", UNLINK => 1, DIR => $tmpdir,
 			) or throw Error::Simple("couldn't open new temp file");
@@ -1336,9 +1362,9 @@ sub temp_reset {
 
 	truncate $temp_fd, 0
 		or throw Error::Simple("couldn't truncate file");
-	sysseek($temp_fd, 0, SEEK_SET) and seek($temp_fd, 0, SEEK_SET)
+	sysseek($temp_fd, 0, Fcntl::SEEK_SET()) and seek($temp_fd, 0, Fcntl::SEEK_SET())
 		or throw Error::Simple("couldn't seek to beginning of file");
-	sysseek($temp_fd, 0, SEEK_CUR) == 0 and tell($temp_fd) == 0
+	sysseek($temp_fd, 0, Fcntl::SEEK_CUR()) == 0 and tell($temp_fd) == 0
 		or throw Error::Simple("expected file position to be reset");
 }
 
diff --git a/perl/Git/I18N.pm b/perl/Git/I18N.pm
index bfb4fb67a1..895e759c57 100644
--- a/perl/Git/I18N.pm
+++ b/perl/Git/I18N.pm
@@ -1,7 +1,7 @@
 package Git::I18N;
 use 5.008;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 BEGIN {
 	require Exporter;
 	if ($] < 5.008003) {
@@ -16,9 +16,19 @@ BEGIN {
 our @EXPORT = qw(__ __n N__);
 our @EXPORT_OK = @EXPORT;
 
+# See Git::LoadCPAN's NO_PERL_CPAN_FALLBACKS_STR for a description of
+# this "'@@' [...] '@@'" pattern.
+use constant NO_GETTEXT_STR => '@@' . 'NO_GETTEXT' . '@@';
+use constant NO_GETTEXT => (
+	q[@@NO_GETTEXT@@] ne ''
+	and
+	q[@@NO_GETTEXT@@] ne NO_GETTEXT_STR
+);
+
 sub __bootstrap_locale_messages {
 	our $TEXTDOMAIN = 'git';
 	our $TEXTDOMAINDIR ||= $ENV{GIT_TEXTDOMAINDIR} || '@@LOCALEDIR@@';
+	die "NO_GETTEXT=" . NO_GETTEXT_STR if NO_GETTEXT;
 
 	require POSIX;
 	POSIX->import(qw(setlocale));
diff --git a/perl/Git/IndexInfo.pm b/perl/Git/IndexInfo.pm
index a43108c985..9ee054f854 100644
--- a/perl/Git/IndexInfo.pm
+++ b/perl/Git/IndexInfo.pm
@@ -1,17 +1,19 @@
 package Git::IndexInfo;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use Git qw/command_input_pipe command_close_pipe/;
 
 sub new {
 	my ($class) = @_;
+	my $hash_algo = Git::config('extensions.objectformat') || 'sha1';
 	my ($gui, $ctx) = command_input_pipe(qw/update-index -z --index-info/);
-	bless { gui => $gui, ctx => $ctx, nr => 0}, $class;
+	bless { gui => $gui, ctx => $ctx, nr => 0, hash_algo => $hash_algo}, $class;
 }
 
 sub remove {
 	my ($self, $path) = @_;
-	if (print { $self->{gui} } '0 ', 0 x 40, "\t", $path, "\0") {
+	my $length = $self->{hash_algo} eq 'sha256' ? 64 : 40;
+	if (print { $self->{gui} } '0 ', 0 x $length, "\t", $path, "\0") {
 		return ++$self->{nr};
 	}
 	undef;
diff --git a/perl/Git/LoadCPAN.pm b/perl/Git/LoadCPAN.pm
index e5585e75e8..0c360bc799 100644
--- a/perl/Git/LoadCPAN.pm
+++ b/perl/Git/LoadCPAN.pm
@@ -1,7 +1,7 @@
 package Git::LoadCPAN;
 use 5.008;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 
 =head1 NAME
 
diff --git a/perl/Git/LoadCPAN/Error.pm b/perl/Git/LoadCPAN/Error.pm
index c6d2c45d80..5d84c20288 100644
--- a/perl/Git/LoadCPAN/Error.pm
+++ b/perl/Git/LoadCPAN/Error.pm
@@ -1,7 +1,7 @@
 package Git::LoadCPAN::Error;
 use 5.008;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use Git::LoadCPAN (
 	module => 'Error',
 	import => 1,
diff --git a/perl/Git/LoadCPAN/Mail/Address.pm b/perl/Git/LoadCPAN/Mail/Address.pm
index f70a4f064c..340e88a7a5 100644
--- a/perl/Git/LoadCPAN/Mail/Address.pm
+++ b/perl/Git/LoadCPAN/Mail/Address.pm
@@ -1,7 +1,7 @@
 package Git::LoadCPAN::Mail::Address;
 use 5.008;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use Git::LoadCPAN (
 	module => 'Mail::Address',
 	import => 0,
diff --git a/perl/Git/Packet.pm b/perl/Git/Packet.pm
index b75738bed4..d144f5168f 100644
--- a/perl/Git/Packet.pm
+++ b/perl/Git/Packet.pm
@@ -1,7 +1,7 @@
 package Git::Packet;
 use 5.008;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 BEGIN {
 	require Exporter;
 	if ($] < 5.008003) {
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 4b28b87784..35ff5a6896 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1,8 +1,8 @@
 package Git::SVN;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use Fcntl qw/:DEFAULT :seek/;
-use constant rev_map_fmt => 'NH40';
+use constant rev_map_fmt => 'NH*';
 use vars qw/$_no_metadata
             $_repack $_repack_flags $_use_svm_props $_head
             $_use_svnsync_props $no_reuse_existing
@@ -874,7 +874,7 @@ sub assert_index_clean {
 		command_noisy('read-tree', $treeish) unless -e $self->{index};
 		my $x = command_oneline('write-tree');
 		my ($y) = (command(qw/cat-file commit/, $treeish) =~
-		           /^tree ($::sha1)/mo);
+		           /^tree ($::oid)/mo);
 		return if $y eq $x;
 
 		warn "Index mismatch: $y != $x\nrereading $treeish\n";
@@ -1020,7 +1020,7 @@ sub do_git_commit {
 		$tree = $self->tmp_index_do(sub {
 		                            command_oneline('write-tree') });
 	}
-	die "Tree is not a valid sha1: $tree\n" if $tree !~ /^$::sha1$/o;
+	die "Tree is not a valid oid $tree\n" if $tree !~ /^$::oid$/o;
 
 	my @exec = ('git', 'commit-tree', $tree);
 	foreach ($self->get_commit_parents($log_entry)) {
@@ -1048,8 +1048,8 @@ sub do_git_commit {
 	close $out_fh or croak $!;
 	waitpid $pid, 0;
 	croak $? if $?;
-	if ($commit !~ /^$::sha1$/o) {
-		die "Failed to commit, invalid sha1: $commit\n";
+	if ($commit !~ /^$::oid$/o) {
+		die "Failed to commit, invalid oid: $commit\n";
 	}
 
 	$self->rev_map_set($log_entry->{revision}, $commit, 1);
@@ -1636,7 +1636,7 @@ sub has_no_changes {
 	my $commit = shift;
 
 	my @revs = split / /, command_oneline(
-		qw(rev-list --parents -1 -m), $commit);
+		qw(rev-list --parents -1), $commit);
 
 	# Commits with no parents, e.g. the start of a partial branch,
 	# have changes by definition.
@@ -2087,10 +2087,10 @@ sub rebuild_from_rev_db {
 	open my $fh, '<', $path or croak "open: $!";
 	binmode $fh or croak "binmode: $!";
 	while (<$fh>) {
-		length($_) == 41 or croak "inconsistent size in ($_) != 41";
+		length($_) == $::oid_length + 1 or croak "inconsistent size in ($_)";
 		chomp($_);
 		++$r;
-		next if $_ eq ('0' x 40);
+		next if $_ eq ('0' x $::oid_length);
 		$self->rev_map_set($r, $_);
 		print "r$r = $_\n";
 	}
@@ -2150,7 +2150,7 @@ sub rebuild {
 	my $svn_uuid = $self->rewrite_uuid || $self->ra_uuid;
 	my $c;
 	while (<$log>) {
-		if ( m{^commit ($::sha1)$} ) {
+		if ( m{^commit ($::oid)$} ) {
 			$c = $1;
 			next;
 		}
@@ -2196,9 +2196,9 @@ sub rebuild {
 # (mainly tags)
 #
 # The format is this:
-#   - 24 bytes for every record,
+#   - 24 or 36 bytes for every record,
 #     * 4 bytes for the integer representing an SVN revision number
-#     * 20 bytes representing the sha1 of a git commit
+#     * 20 or 32 bytes representing the oid of a git commit
 #   - No empty padding records like the old format
 #     (except the last record, which can be overwritten)
 #   - new records are written append-only since SVN revision numbers
@@ -2207,7 +2207,7 @@ sub rebuild {
 #   - Piping the file to xxd -c24 is a good way of dumping it for
 #     viewing or editing (piped back through xxd -r), should the need
 #     ever arise.
-#   - The last record can be padding revision with an all-zero sha1
+#   - The last record can be padding revision with an all-zero oid
 #     This is used to optimize fetch performance when using multiple
 #     "fetch" directives in .git/config
 #
@@ -2215,38 +2215,39 @@ sub rebuild {
 
 sub _rev_map_set {
 	my ($fh, $rev, $commit) = @_;
+	my $record_size = ($::oid_length / 2) + 4;
 
 	binmode $fh or croak "binmode: $!";
 	my $size = (stat($fh))[7];
-	($size % 24) == 0 or croak "inconsistent size: $size";
+	($size % $record_size) == 0 or croak "inconsistent size: $size";
 
 	my $wr_offset = 0;
 	if ($size > 0) {
-		sysseek($fh, -24, SEEK_END) or croak "seek: $!";
-		my $read = sysread($fh, my $buf, 24) or croak "read: $!";
-		$read == 24 or croak "read only $read bytes (!= 24)";
+		sysseek($fh, -$record_size, SEEK_END) or croak "seek: $!";
+		my $read = sysread($fh, my $buf, $record_size) or croak "read: $!";
+		$read == $record_size or croak "read only $read bytes (!= $record_size)";
 		my ($last_rev, $last_commit) = unpack(rev_map_fmt, $buf);
-		if ($last_commit eq ('0' x40)) {
-			if ($size >= 48) {
-				sysseek($fh, -48, SEEK_END) or croak "seek: $!";
-				$read = sysread($fh, $buf, 24) or
+		if ($last_commit eq ('0' x $::oid_length)) {
+			if ($size >= ($record_size * 2)) {
+				sysseek($fh, -($record_size * 2), SEEK_END) or croak "seek: $!";
+				$read = sysread($fh, $buf, $record_size) or
 				    croak "read: $!";
-				$read == 24 or
-				    croak "read only $read bytes (!= 24)";
+				$read == $record_size or
+				    croak "read only $read bytes (!= $record_size)";
 				($last_rev, $last_commit) =
 				    unpack(rev_map_fmt, $buf);
-				if ($last_commit eq ('0' x40)) {
+				if ($last_commit eq ('0' x $::oid_length)) {
 					croak "inconsistent .rev_map\n";
 				}
 			}
 			if ($last_rev >= $rev) {
 				croak "last_rev is higher!: $last_rev >= $rev";
 			}
-			$wr_offset = -24;
+			$wr_offset = -$record_size;
 		}
 	}
 	sysseek($fh, $wr_offset, SEEK_END) or croak "seek: $!";
-	syswrite($fh, pack(rev_map_fmt, $rev, $commit), 24) == 24 or
+	syswrite($fh, pack(rev_map_fmt, $rev, $commit), $record_size) == $record_size or
 	  croak "write: $!";
 }
 
@@ -2271,7 +2272,7 @@ sub mkfile {
 sub rev_map_set {
 	my ($self, $rev, $commit, $update_ref, $uuid) = @_;
 	defined $commit or die "missing arg3\n";
-	length $commit == 40 or die "arg3 must be a full SHA1 hexsum\n";
+	$commit =~ /^$::oid$/ or die "arg3 must be a full hex object ID\n";
 	my $db = $self->map_path($uuid);
 	my $db_lock = "$db.lock";
 	my $sigmask;
@@ -2344,29 +2345,30 @@ sub rev_map_max {
 
 sub rev_map_max_norebuild {
 	my ($self, $want_commit) = @_;
+	my $record_size = ($::oid_length / 2) + 4;
 	my $map_path = $self->map_path;
 	stat $map_path or return $want_commit ? (0, undef) : 0;
 	sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
 	binmode $fh or croak "binmode: $!";
 	my $size = (stat($fh))[7];
-	($size % 24) == 0 or croak "inconsistent size: $size";
+	($size % $record_size) == 0 or croak "inconsistent size: $size";
 
 	if ($size == 0) {
 		close $fh or croak "close: $!";
 		return $want_commit ? (0, undef) : 0;
 	}
 
-	sysseek($fh, -24, SEEK_END) or croak "seek: $!";
-	sysread($fh, my $buf, 24) == 24 or croak "read: $!";
+	sysseek($fh, -$record_size, SEEK_END) or croak "seek: $!";
+	sysread($fh, my $buf, $record_size) == $record_size or croak "read: $!";
 	my ($r, $c) = unpack(rev_map_fmt, $buf);
-	if ($want_commit && $c eq ('0' x40)) {
-		if ($size < 48) {
+	if ($want_commit && $c eq ('0' x $::oid_length)) {
+		if ($size < $record_size * 2) {
 			return $want_commit ? (0, undef) : 0;
 		}
-		sysseek($fh, -48, SEEK_END) or croak "seek: $!";
-		sysread($fh, $buf, 24) == 24 or croak "read: $!";
+		sysseek($fh, -($record_size * 2), SEEK_END) or croak "seek: $!";
+		sysread($fh, $buf, $record_size) == $record_size or croak "read: $!";
 		($r, $c) = unpack(rev_map_fmt, $buf);
-		if ($c eq ('0'x40)) {
+		if ($c eq ('0' x $::oid_length)) {
 			croak "Penultimate record is all-zeroes in $map_path";
 		}
 	}
@@ -2387,30 +2389,31 @@ sub rev_map_get {
 
 sub _rev_map_get {
 	my ($fh, $rev) = @_;
+	my $record_size = ($::oid_length / 2) + 4;
 
 	binmode $fh or croak "binmode: $!";
 	my $size = (stat($fh))[7];
-	($size % 24) == 0 or croak "inconsistent size: $size";
+	($size % $record_size) == 0 or croak "inconsistent size: $size";
 
 	if ($size == 0) {
 		return undef;
 	}
 
-	my ($l, $u) = (0, $size - 24);
+	my ($l, $u) = (0, $size - $record_size);
 	my ($r, $c, $buf);
 
 	while ($l <= $u) {
-		my $i = int(($l/24 + $u/24) / 2) * 24;
+		my $i = int(($l/$record_size + $u/$record_size) / 2) * $record_size;
 		sysseek($fh, $i, SEEK_SET) or croak "seek: $!";
-		sysread($fh, my $buf, 24) == 24 or croak "read: $!";
+		sysread($fh, my $buf, $record_size) == $record_size or croak "read: $!";
 		my ($r, $c) = unpack(rev_map_fmt, $buf);
 
 		if ($r < $rev) {
-			$l = $i + 24;
+			$l = $i + $record_size;
 		} elsif ($r > $rev) {
-			$u = $i - 24;
+			$u = $i - $record_size;
 		} else { # $r == $rev
-			return $c eq ('0' x 40) ? undef : $c;
+			return $c eq ('0' x $::oid_length) ? undef : $c;
 		}
 	}
 	undef;
diff --git a/perl/Git/SVN/Editor.pm b/perl/Git/SVN/Editor.pm
index 0df16ed726..47fd048bf2 100644
--- a/perl/Git/SVN/Editor.pm
+++ b/perl/Git/SVN/Editor.pm
@@ -1,7 +1,7 @@
 package Git::SVN::Editor;
 use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use SVN::Core;
 use SVN::Delta;
 use Carp qw/croak/;
@@ -63,7 +63,7 @@ sub generate_diff {
 	my @mods;
 	while (defined($_ = get_record($diff_fh, "\0"))) {
 		if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
-					($::sha1)\s($::sha1)\s
+					($::oid)\s($::oid)\s
 					([MTCRAD])\d*$/xo) {
 			push @mods, {	mode_a => $1, mode_b => $2,
 					sha1_a => $3, sha1_b => $4,
@@ -400,12 +400,12 @@ sub T {
 	    ($m->{mode_b} !~ /^120/ && $m->{mode_a} =~ /^120/)) {
 		$self->D({
 			mode_a => $m->{mode_a}, mode_b => '000000',
-			sha1_a => $m->{sha1_a}, sha1_b => '0' x 40,
+			sha1_a => $m->{sha1_a}, sha1_b => '0' x $::oid_length,
 			chg => 'D', file_b => $m->{file_b}
 		}, $deletions);
 		$self->A({
 			mode_a => '000000', mode_b => $m->{mode_b},
-			sha1_a => '0' x 40, sha1_b => $m->{sha1_b},
+			sha1_a => '0' x $::oid_length, sha1_b => $m->{sha1_b},
 			chg => 'A', file_b => $m->{file_b}
 		}, $deletions);
 		return;
@@ -434,7 +434,7 @@ sub _chg_file_get_blob ($$$$) {
 		$self->change_file_prop($fbat,'svn:special',undef);
 	}
 	my $blob = $m->{"sha1_$which"};
-	return ($fh,) if ($blob =~ /^0{40}$/);
+	return ($fh,) if ($blob =~ /^0+$/);
 	my $size = $::_repository->cat_blob($blob, $fh);
 	croak "Failed to read object $blob" if ($size < 0);
 	$fh->flush == 0 or croak $!;
diff --git a/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm
index 64e900a0e9..968309e6d6 100644
--- a/perl/Git/SVN/Fetcher.pm
+++ b/perl/Git/SVN/Fetcher.pm
@@ -3,7 +3,7 @@ use vars qw/@ISA $_ignore_regex $_include_regex $_preserve_empty_dirs
             $_placeholder_filename @deleted_gpath %added_placeholder
             $repo_id/;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use SVN::Delta;
 use Carp qw/croak/;
 use File::Basename qw/dirname/;
@@ -173,7 +173,7 @@ sub delete_entry {
 
 	# remove entire directories.
 	my ($tree) = (command('ls-tree', '-z', $self->{c}, "./$gpath")
-	                 =~ /\A040000 tree ([a-f\d]{40})\t\Q$gpath\E\0/);
+	                 =~ /\A040000 tree ($::oid)\t\Q$gpath\E\0/);
 	if ($tree) {
 		my ($ls, $ctx) = command_output_pipe(qw/ls-tree
 		                                     -r --name-only -z/,
@@ -203,7 +203,7 @@ sub open_file {
 
 	my $gpath = $self->git_path($path);
 	($mode, $blob) = (command('ls-tree', '-z', $self->{c}, "./$gpath")
-	                     =~ /\A(\d{6}) blob ([a-f\d]{40})\t\Q$gpath\E\0/);
+	                     =~ /\A(\d{6}) blob ($::oid)\t\Q$gpath\E\0/);
 	unless (defined $mode && defined $blob) {
 		die "$path was not found in commit $self->{c} (r$rev)\n";
 	}
@@ -413,7 +413,7 @@ sub close_file {
 
 		$hash = $::_repository->hash_and_insert_object(
 				Git::temp_path($fh));
-		$hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n";
+		$hash =~ /^$::oid$/ or die "not an object ID: $hash\n";
 
 		Git::temp_release($fb->{base}, 1);
 		Git::temp_release($fh, 1);
diff --git a/perl/Git/SVN/GlobSpec.pm b/perl/Git/SVN/GlobSpec.pm
index a0a8d17621..f2c1e1f6fb 100644
--- a/perl/Git/SVN/GlobSpec.pm
+++ b/perl/Git/SVN/GlobSpec.pm
@@ -1,6 +1,6 @@
 package Git::SVN::GlobSpec;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 
 sub new {
 	my ($class, $glob, $pattern_ok) = @_;
diff --git a/perl/Git/SVN/Log.pm b/perl/Git/SVN/Log.pm
index 664105357c..cc8b484f84 100644
--- a/perl/Git/SVN/Log.pm
+++ b/perl/Git/SVN/Log.pm
@@ -1,6 +1,6 @@
 package Git::SVN::Log;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use Git::SVN::Utils qw(fatal);
 use Git qw(command
            command_oneline
@@ -285,7 +285,7 @@ sub cmd_show_log {
 	my (@k, $c, $d, $stat);
 	my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
 	while (<$log>) {
-		if (/^${esc_color}commit (?:- )?($::sha1_short)/o) {
+		if (/^${esc_color}commit (?:- )?($::oid_short)/o) {
 			my $cmt = $1;
 			if ($c && cmt_showable($c) && $c->{r} != $r_last) {
 				$r_last = $c->{r};
@@ -298,7 +298,7 @@ sub cmd_show_log {
 			get_author_info($c, $1, $2, $3);
 		} elsif (/^${esc_color}(?:tree|parent|committer) /o) {
 			# ignore
-		} elsif (/^${esc_color}:\d{6} \d{6} $::sha1_short/o) {
+		} elsif (/^${esc_color}:\d{6} \d{6} $::oid_short/o) {
 			push @{$c->{raw}}, $_;
 		} elsif (/^${esc_color}[ACRMDT]\t/) {
 			# we could add $SVN->{svn_path} here, but that requires
diff --git a/perl/Git/SVN/Memoize/YAML.pm b/perl/Git/SVN/Memoize/YAML.pm
index 9676b8f2f7..8fcf6644a1 100644
--- a/perl/Git/SVN/Memoize/YAML.pm
+++ b/perl/Git/SVN/Memoize/YAML.pm
@@ -1,5 +1,5 @@
 package Git::SVN::Memoize::YAML;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use strict;
 use YAML::Any ();
 
diff --git a/perl/Git/SVN/Migration.pm b/perl/Git/SVN/Migration.pm
index dc90f6a621..ed96ac593e 100644
--- a/perl/Git/SVN/Migration.pm
+++ b/perl/Git/SVN/Migration.pm
@@ -33,7 +33,7 @@ package Git::SVN::Migration;
 #              possible if noMetadata or useSvmProps are set; but should
 #              be no problem for users that use the (sensible) defaults.
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use Carp qw/croak/;
 use File::Path qw/mkpath/;
 use File::Basename qw/dirname basename/;
diff --git a/perl/Git/SVN/Prompt.pm b/perl/Git/SVN/Prompt.pm
index e940b08505..de158e848f 100644
--- a/perl/Git/SVN/Prompt.pm
+++ b/perl/Git/SVN/Prompt.pm
@@ -1,6 +1,6 @@
 package Git::SVN::Prompt;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 require SVN::Core;
 use vars qw/$_no_auth_cache $_username/;
 
diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm
index 56ad9870bc..912e035040 100644
--- a/perl/Git/SVN/Ra.pm
+++ b/perl/Git/SVN/Ra.pm
@@ -1,7 +1,7 @@
 package Git::SVN::Ra;
 use vars qw/@ISA $config_dir $_ignore_refs_regex $_log_window_size/;
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 use Memoize;
 use Git::SVN::Utils qw(
 	canonicalize_url
@@ -486,11 +486,11 @@ sub gs_fetch_loop_common {
 			$reload_ra->() if $ra_invalid;
 		}
 		# pre-fill the .rev_db since it'll eventually get filled in
-		# with '0' x40 if something new gets committed
+		# with '0' x $oid_length if something new gets committed
 		foreach my $gs (@$gsv) {
 			next if $gs->rev_map_max >= $max;
 			next if defined $gs->rev_map_get($max);
-			$gs->rev_map_set($max, 0 x40);
+			$gs->rev_map_set($max, 0 x $::oid_length);
 		}
 		foreach my $g (@$globs) {
 			my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev";
diff --git a/perl/Git/SVN/Utils.pm b/perl/Git/SVN/Utils.pm
index 3d1a0933a2..5ca09ab448 100644
--- a/perl/Git/SVN/Utils.pm
+++ b/perl/Git/SVN/Utils.pm
@@ -1,7 +1,7 @@
 package Git::SVN::Utils;
 
 use strict;
-use warnings;
+use warnings $ENV{GIT_PERL_FATAL_WARNINGS} ? qw(FATAL all) : ();
 
 use SVN::Core;
 
diff --git a/pkt-line.c b/pkt-line.c
index a0e87b1e81..9f63eae2e6 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -99,6 +99,13 @@ void packet_delim(int fd)
 		die_errno(_("unable to write delim packet"));
 }
 
+void packet_response_end(int fd)
+{
+	packet_trace("0002", 4, 1);
+	if (write_in_full(fd, "0002", 4) < 0)
+		die_errno(_("unable to write response end packet"));
+}
+
 int packet_flush_gently(int fd)
 {
 	packet_trace("0000", 4, 1);
@@ -187,27 +194,53 @@ int packet_write_fmt_gently(int fd, const char *fmt, ...)
 	return status;
 }
 
-static int packet_write_gently(const int fd_out, const char *buf, size_t size)
+static int do_packet_write(const int fd_out, const char *buf, size_t size,
+			   struct strbuf *err)
 {
-	static char packet_write_buffer[LARGE_PACKET_MAX];
+	char header[4];
 	size_t packet_size;
 
-	if (size > sizeof(packet_write_buffer) - 4)
-		return error(_("packet write failed - data exceeds max packet size"));
+	if (size > LARGE_PACKET_DATA_MAX) {
+		strbuf_addstr(err, _("packet write failed - data exceeds max packet size"));
+		return -1;
+	}
 
 	packet_trace(buf, size, 1);
 	packet_size = size + 4;
-	set_packet_header(packet_write_buffer, packet_size);
-	memcpy(packet_write_buffer + 4, buf, size);
-	if (write_in_full(fd_out, packet_write_buffer, packet_size) < 0)
-		return error(_("packet write failed"));
+
+	set_packet_header(header, packet_size);
+
+	/*
+	 * Write the header and the buffer in 2 parts so that we do
+	 * not need to allocate a buffer or rely on a static buffer.
+	 * This also avoids putting a large buffer on the stack which
+	 * might have multi-threading issues.
+	 */
+
+	if (write_in_full(fd_out, header, 4) < 0 ||
+	    write_in_full(fd_out, buf, size) < 0) {
+		strbuf_addf(err, _("packet write failed: %s"), strerror(errno));
+		return -1;
+	}
+	return 0;
+}
+
+static int packet_write_gently(const int fd_out, const char *buf, size_t size)
+{
+	struct strbuf err = STRBUF_INIT;
+	if (do_packet_write(fd_out, buf, size, &err)) {
+		error("%s", err.buf);
+		strbuf_release(&err);
+		return -1;
+	}
 	return 0;
 }
 
 void packet_write(int fd_out, const char *buf, size_t size)
 {
-	if (packet_write_gently(fd_out, buf, size))
-		die_errno(_("packet write failed"));
+	struct strbuf err = STRBUF_INIT;
+	if (do_packet_write(fd_out, buf, size, &err))
+		die("%s", err.buf);
 }
 
 void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
@@ -235,26 +268,27 @@ void packet_buf_write_len(struct strbuf *buf, const char *data, size_t len)
 	packet_trace(data, len, 1);
 }
 
-int write_packetized_from_fd(int fd_in, int fd_out)
+int write_packetized_from_fd_no_flush(int fd_in, int fd_out)
 {
-	static char buf[LARGE_PACKET_DATA_MAX];
+	char *buf = xmalloc(LARGE_PACKET_DATA_MAX);
 	int err = 0;
 	ssize_t bytes_to_write;
 
 	while (!err) {
-		bytes_to_write = xread(fd_in, buf, sizeof(buf));
-		if (bytes_to_write < 0)
+		bytes_to_write = xread(fd_in, buf, LARGE_PACKET_DATA_MAX);
+		if (bytes_to_write < 0) {
+			free(buf);
 			return COPY_READ_ERROR;
+		}
 		if (bytes_to_write == 0)
 			break;
 		err = packet_write_gently(fd_out, buf, bytes_to_write);
 	}
-	if (!err)
-		err = packet_flush_gently(fd_out);
+	free(buf);
 	return err;
 }
 
-int write_packetized_from_buf(const char *src_in, size_t len, int fd_out)
+int write_packetized_from_buf_no_flush(const char *src_in, size_t len, int fd_out)
 {
 	int err = 0;
 	size_t bytes_written = 0;
@@ -270,8 +304,6 @@ int write_packetized_from_buf(const char *src_in, size_t len, int fd_out)
 		err = packet_write_gently(fd_out, src_in + bytes_written, bytes_to_write);
 		bytes_written += bytes_to_write;
 	}
-	if (!err)
-		err = packet_flush_gently(fd_out);
 	return err;
 }
 
@@ -291,8 +323,11 @@ static int get_packet_data(int fd, char **src_buf, size_t *src_size,
 		*src_size -= ret;
 	} else {
 		ret = read_in_full(fd, dst, size);
-		if (ret < 0)
+		if (ret < 0) {
+			if (options & PACKET_READ_GENTLE_ON_READ_ERROR)
+				return error_errno(_("read error"));
 			die_errno(_("read error"));
+		}
 	}
 
 	/* And complain if we didn't get enough bytes to satisfy the read. */
@@ -300,16 +335,18 @@ static int get_packet_data(int fd, char **src_buf, size_t *src_size,
 		if (options & PACKET_READ_GENTLE_ON_EOF)
 			return -1;
 
+		if (options & PACKET_READ_GENTLE_ON_READ_ERROR)
+			return error(_("the remote end hung up unexpectedly"));
 		die(_("the remote end hung up unexpectedly"));
 	}
 
 	return ret;
 }
 
-static int packet_length(const char *linelen)
+int packet_length(const char lenbuf_hex[4])
 {
-	int val = hex2chr(linelen);
-	return (val < 0) ? val : (val << 8) | hex2chr(linelen + 2);
+	int val = hex2chr(lenbuf_hex);
+	return (val < 0) ? val : (val << 8) | hex2chr(lenbuf_hex + 2);
 }
 
 enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
@@ -328,6 +365,9 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
 	len = packet_length(linelen);
 
 	if (len < 0) {
+		if (options & PACKET_READ_GENTLE_ON_READ_ERROR)
+			return error(_("protocol error: bad line length "
+				       "character: %.4s"), linelen);
 		die(_("protocol error: bad line length character: %.4s"), linelen);
 	} else if (!len) {
 		packet_trace("0000", 4, 0);
@@ -337,13 +377,24 @@ enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
 		packet_trace("0001", 4, 0);
 		*pktlen = 0;
 		return PACKET_READ_DELIM;
+	} else if (len == 2) {
+		packet_trace("0002", 4, 0);
+		*pktlen = 0;
+		return PACKET_READ_RESPONSE_END;
 	} else if (len < 4) {
+		if (options & PACKET_READ_GENTLE_ON_READ_ERROR)
+			return error(_("protocol error: bad line length %d"),
+				     len);
 		die(_("protocol error: bad line length %d"), len);
 	}
 
 	len -= 4;
-	if ((unsigned)len >= size)
+	if ((unsigned)len >= size) {
+		if (options & PACKET_READ_GENTLE_ON_READ_ERROR)
+			return error(_("protocol error: bad line length %d"),
+				     len);
 		die(_("protocol error: bad line length %d"), len);
+	}
 
 	if (get_packet_data(fd, src_buffer, src_len, buffer, len, options) < 0) {
 		*pktlen = -1;
@@ -410,7 +461,7 @@ 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)
+ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options)
 {
 	int packet_len;
 
@@ -426,7 +477,7 @@ ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out)
 			 * that there is already room for the extra byte.
 			 */
 			sb_out->buf + sb_out->len, LARGE_PACKET_DATA_MAX+1,
-			PACKET_READ_GENTLE_ON_EOF);
+			options);
 		if (packet_len <= 0)
 			break;
 		sb_out->len += packet_len;
@@ -450,9 +501,11 @@ int recv_sideband(const char *me, int in_stream, int out)
 	enum sideband_type sideband_type;
 
 	while (1) {
-		len = packet_read(in_stream, NULL, NULL, buf, LARGE_PACKET_MAX,
-				  0);
-		if (!demultiplex_sideband(me, buf, len, 0, &scratch,
+		int status = packet_read_with_status(in_stream, NULL, NULL,
+						     buf, LARGE_PACKET_MAX,
+						     &len,
+						     PACKET_READ_GENTLE_ON_EOF);
+		if (!demultiplex_sideband(me, status, buf, len, 0, &scratch,
 					  &sideband_type))
 			continue;
 		switch (sideband_type) {
@@ -460,6 +513,9 @@ int recv_sideband(const char *me, int in_stream, int out)
 			write_or_die(out, buf + 1, len - 1);
 			break;
 		default: /* errors: message already written */
+			if (scratch.len > 0)
+				BUG("unhandled incomplete sideband: '%s'",
+				    scratch.buf);
 			return sideband_type;
 		}
 	}
@@ -479,6 +535,7 @@ void packet_reader_init(struct packet_reader *reader, int fd,
 	reader->buffer_size = sizeof(packet_buffer);
 	reader->options = options;
 	reader->me = "git";
+	reader->hash_algo = &hash_algos[GIT_HASH_SHA1];
 }
 
 enum packet_read_status packet_reader_read(struct packet_reader *reader)
@@ -505,9 +562,9 @@ enum packet_read_status packet_reader_read(struct packet_reader *reader)
 							 reader->options);
 		if (!reader->use_sideband)
 			break;
-		if (demultiplex_sideband(reader->me, reader->buffer,
-					 reader->pktlen, 1, &scratch,
-					 &sideband_type))
+		if (demultiplex_sideband(reader->me, reader->status,
+					 reader->buffer, reader->pktlen, 1,
+					 &scratch, &sideband_type))
 			break;
 	}
 
diff --git a/pkt-line.h b/pkt-line.h
index 5c62015db4..5af5f45687 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -22,6 +22,7 @@
  */
 void packet_flush(int fd);
 void packet_delim(int fd);
+void packet_response_end(int fd);
 void packet_write_fmt(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
 void packet_buf_flush(struct strbuf *buf);
 void packet_buf_delim(struct strbuf *buf);
@@ -31,8 +32,8 @@ void packet_buf_write(struct strbuf *buf, const char *fmt, ...) __attribute__((f
 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(int fd_in, int fd_out);
-int write_packetized_from_buf(const char *src_in, size_t len, int fd_out);
+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);
 
 /*
  * Read a packetized line into the buffer, which must be at least size bytes
@@ -67,17 +68,31 @@ int write_packetized_from_buf(const char *src_in, size_t len, int fd_out);
  *
  * If options contains PACKET_READ_DIE_ON_ERR_PACKET, it dies when it sees an
  * ERR packet.
+ *
+ * If options contains PACKET_READ_GENTLE_ON_READ_ERROR, we will not die
+ * on read errors, but instead return -1.  However, we may still die on an
+ * ERR packet (if requested).
  */
-#define PACKET_READ_GENTLE_ON_EOF     (1u<<0)
-#define PACKET_READ_CHOMP_NEWLINE     (1u<<1)
-#define PACKET_READ_DIE_ON_ERR_PACKET (1u<<2)
+#define PACKET_READ_GENTLE_ON_EOF        (1u<<0)
+#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);
 
 /*
+ * Convert a four hex digit packet line length header into its numeric
+ * representation.
+ *
+ * If lenbuf_hex contains non-hex characters, return -1. Otherwise, return the
+ * numeric value of the length header.
+ */
+int packet_length(const char lenbuf_hex[4]);
+
+/*
  * Read a packetized line into a buffer like the 'packet_read()' function but
  * returns an 'enum packet_read_status' which indicates the status of the read.
- * The number of bytes read will be assigined to *pktlen if the status of the
+ * The number of bytes read will be assigned to *pktlen if the status of the
  * read was 'PACKET_READ_NORMAL'.
  */
 enum packet_read_status {
@@ -85,6 +100,7 @@ enum packet_read_status {
 	PACKET_READ_NORMAL,
 	PACKET_READ_FLUSH,
 	PACKET_READ_DELIM,
+	PACKET_READ_RESPONSE_END,
 };
 enum packet_read_status packet_read_with_status(int fd, char **src_buffer,
 						size_t *src_len, char *buffer,
@@ -120,7 +136,7 @@ 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);
+ssize_t read_packetized_to_strbuf(int fd_in, struct strbuf *sb_out, int options);
 
 /*
  * Receive multiplexed output stream over git native protocol.
@@ -166,6 +182,9 @@ struct packet_reader {
 
 	unsigned use_sideband : 1;
 	const char *me;
+
+	/* hash algorithm in use */
+	const struct git_hash_algo *hash_algo;
 };
 
 /*
diff --git a/po/README b/po/README
deleted file mode 100644
index 07595d369b..0000000000
--- a/po/README
+++ /dev/null
@@ -1,306 +0,0 @@
-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
-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/
-
-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
----------------------------------------
-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.
-
-Sometime, contributors may find that the translations of their Git
-distributions are quite different with the translations of the
-corresponding version from Git official. This is because some Git
-distributions (such as from Ubuntu, etc.) have their own l10n workflow.
-For this case, wrong translations should be reported and fixed through
-their workflows.
-
-
-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
-(described later), and ask the l10n coordinator to pull your work.
-
-If there are multiple contributors for the same language, please first
-coordinate among yourselves and nominate the team leader for your
-language, so that the l10n coordinator only needs to interact with one
-person per language.
-
-
-Translation Process Flow
-------------------------
-The overall data-flow looks like this:
-
-    +-------------------+            +------------------+
-    | Git source code   | ---(1)---> | L10n coordinator |
-    | repository        | <---(4)--- | repository       |
-    +-------------------+            +------------------+
-                                          |      ^
-                                         (2)    (3)
-                                          V      |
-                                     +------------------+
-                                     | 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).
-
-
-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
-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
-expected to pull from the main git repository at strategic point in
-history (e.g. when a major release and release candidates are tagged),
-and then run "make pot" at the top-level directory.
-
-Language contributors use this file to prepare translations for their
-language, but they are not expected to modify it.
-
-
-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,
-you add a translation for the first time by running:
-
-    msginit --locale=XX
-
-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
-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.
-
-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
-
-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
----------------------
-
-(This is done by the language teams).
-
-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
-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
-
-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.
-
-
-Testing your changes
---------------------
-
-(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
-
-On systems with GNU gettext (i.e. not Solaris) this will compile your
-changed PO file with `msgfmt --check`, the --check option flags many
-common errors, e.g. missing printf format strings, or translated
-messages that deviate from the originals in whether they begin/end
-with a newline or not.
-
-
-Marking strings for translation
--------------------------------
-
-(This is done by the core developers).
-
-Before strings can be translated they first have to be marked for
-translation.
-
-Git uses an internationalization interface that wraps the system's
-gettext library, so most of the advice in your gettext documentation
-(on GNU systems `info gettext` in a terminal) applies.
-
-General advice:
-
- - 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.
-
- - Adjust the strings so that they're easy to translate. Most of the
-   advice in `info '(gettext)Preparing Strings'` applies here.
-
- - 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 "
-
-   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));
-
-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.
-
- - The C interface is a subset of the normal GNU gettext
-   interface. We currently export these functions:
-
-   - _()
-
-    Mark and translate a string. E.g.:
-
-        printf(_("HEAD is now at %s"), hex);
-
-   - Q_()
-
-    Mark and translate a plural string. E.g.:
-
-        printf(Q_("%d commit", "%d commits", number_of_commits));
-
-    This is just a wrapper for the ngettext() function.
-
-   - N_()
-
-    A no-op pass-through macro for marking strings inside static
-    initializations, e.g.:
-
-        static const char *reset_type_names[] = {
-            N_("mixed"), N_("soft"), N_("hard"), N_("merge"), N_("keep"), NULL
-        };
-
-    And then, later:
-
-        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.
-
-Shell:
-
- - 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
-
-   And then use the gettext or eval_gettext functions:
-
-       # For constant interface messages:
-       gettext "A message for the user"; 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:
-
-       # For constant interface messages:
-       gettextln "A message for the user"
-
-       # 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:
-
-       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.:
-
-       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
-----------------------
-
-Even if you've correctly marked porcelain strings for translation
-something in the test suite might still depend on the US English
-version of the strings, e.g. to grep some error message or other
-output.
-
-To smoke out issues like these, Git tested with a translation mode that
-emits gibberish on every call to gettext. To use it run the test suite
-with it, e.g.:
-
-    cd t && GIT_TEST_GETTEXT_POISON=true prove -j 9 ./t[0-9]*.sh
-
-If tests break with it you should inspect them manually and see if
-what you're translating is sane, i.e. that you're not translating
-plumbing output.
-
-If not you should replace calls to grep with test_i18ngrep, or
-test_cmp calls with test_i18ncmp. If that's not enough you can skip
-the whole test by making it depend on the C_LOCALE_OUTPUT
-prerequisite. See existing test files with this prerequisite for
-examples.
diff --git a/po/README.md b/po/README.md
new file mode 100644
index 0000000000..dcd8436c25
--- /dev/null
+++ b/po/README.md
@@ -0,0 +1,452 @@
+# 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
+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/
+
+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
+
+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.
+
+Sometime, contributors may find that the translations of their Git
+distributions are quite different with the translations of the
+corresponding version from Git official. This is because some Git
+distributions (such as from Ubuntu, etc.) have their own l10n workflow.
+For this case, wrong translations should be reported and fixed through
+their workflows.
+
+
+## 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"
+(described later), and ask the l10n coordinator to pull your work.
+
+If there are multiple contributors for the same language, please first
+coordinate among yourselves and nominate the team leader for your
+language, so that the l10n coordinator only needs to interact with one
+person per language.
+
+
+## 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,
+this is not a piece of cake for the contributor for a new language.
+
+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).
+
+```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:
+
+```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
+
+The overall data-flow looks like this:
+
+    +-------------------+            +------------------+
+    | Git source code   | ---(1)---> | L10n coordinator |
+    | repository        | <---(4)--- | repository       |
+    +-------------------+            +------------------+
+                                          |      ^
+                                         (2)    (3)
+                                          V      |
+                                     +------------------+
+                                     | 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).
+
+
+## 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
+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
+expected to pull from the main git repository at strategic point in
+history (e.g. when a major release and release candidates are tagged),
+and then run "make pot" at the top-level directory.
+
+Language contributors use this file to prepare translations for their
+language, but they are not expected to modify it.
+
+
+## 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,
+you add a translation for the first time by running:
+
+```shell
+msginit --locale=XX
+```
+
+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"
+to be correct, e.g. for Icelandic:
+
+```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":
+
+```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
+
+(This is done by the language teams).
+
+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
+pull from the l10n coordinator (see the beginning of this document for its
+URL), and then update the existing translation by running:
+
+```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.
+
+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 is a translation marked by comment "fuzzy" to let you
+know that the translation is out of date because the "msgid" has been
+changed. A fuzzy translation will be ignored when compiling using "msgfmt".
+Fuzzy translation can be marked by hands, but for most cases they are
+marked automatically when running "msgmerge" to update your "XX.po" file.
+
+After fixing the corresponding translation, you must remove the "fuzzy"
+tag in the comment.
+
+
+## Testing your changes
+
+(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:
+
+```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
+common errors, e.g. missing printf format strings, or translated
+messages that deviate from the originals in whether they begin/end
+with a newline or not.
+
+
+## Marking strings for translation
+
+(This is done by the core developers).
+
+Before strings can be translated they first have to be marked for
+translation.
+
+Git uses an internationalization interface that wraps the system's
+gettext library, so most of the advice in your gettext documentation
+(on GNU systems `info gettext` in a terminal) applies.
+
+General advice:
+
+- 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.
+
+- Adjust the strings so that they're easy to translate. Most of the
+  advice in `info '(gettext)Preparing Strings'` applies here.
+
+- 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:
+
+  ```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:
+
+  ```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.
+
+The C interface is a subset of the normal GNU gettext
+interface. We currently export these functions:
+
+- \_()
+
+  Mark and translate a string. E.g.:
+
+  ```c
+  printf(_("HEAD is now at %s"), hex);
+  ```
+
+- Q\_()
+
+  Mark and translate a plural string. E.g.:
+
+  ```c
+  printf(Q_("%d commit", "%d commits", number_of_commits));
+  ```
+
+  This is just a wrapper for the ngettext() function.
+
+- N\_()
+
+  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
+  };
+  ```
+
+  And then, later:
+
+  ```c
+  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.
+
+
+### Shell
+
+The Git gettext shell interface is just a wrapper for
+gettext.sh. Import it right after git-sh-setup like this:
+
+```shell
+. git-sh-setup
+. git-sh-i18n
+```
+
+And then use the `gettext` or `eval_gettext` functions:
+
+```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
+```
+
+In addition we have wrappers for messages that end with a trailing
+newline. I.e. you could write the above as:
+
+```shell
+# For constant interface messages:
+gettextln "A message for the user"
+
+# 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:
+
+```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;
+```
+
+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
+changed to account for translations as they're added.
+
+
+## PO helper
+
+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.
+
+To build and install the helper program from source, see
+[git-po-helper/README][].
+
+Usage for git-po-helper:
+
+- To start a new language translation:
+
+  ```shell
+  git-po-helper init XX.po
+  ```
+
+- To update your "XX.po" file:
+
+  ```shell
+  git-po-helper update XX.po
+  ```
+
+- To check commit log and syntax of "XX.po":
+
+  ```shell
+  git-po-helper check-po XX.po
+  git-po-helper check-commits
+  ```
+
+Run "git-po-helper" without arguments to show usage.
+
+
+## Conventions
+
+There are some conventions that l10n contributors must follow:
+
+- 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:
+
+  ```shell
+  git commit -s
+  ```
+
+- Check syntax with "msgfmt" or the following command before creating
+  your commit:
+
+  ```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.
+
+
+To contribute for a new l10n language, contributor should follow
+additional conventions:
+
+- 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:
+
+  ```shell
+  git-po-helper init --core <your-language>
+  ```
+
+- Add a new entry in the "po/TEAMS" file with proper format, and check
+  the syntax of "po/TEAMS" by running the following command:
+
+  ```shell
+  git-po-helper team --check
+  ```
+
+
+[git-po-helper/README]: https://github.com/git-l10n/git-po-helper#readme
+[Documentation/SubmittingPatches]: Documentation/SubmittingPatches
diff --git a/po/TEAMS b/po/TEAMS
index 00472a4713..66ad06bf96 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -29,6 +29,10 @@ Repository:	https://github.com/jnavila/git
 Leader:		Jean-Noël Avila <jn.avila@free.fr>
 Members:	Sébastien Helleu <flashcode@flashtux.org>
 
+Language:	id (Indonesian)
+Repository:	https://github.com/bagasme/git-po
+Leader:		Bagas Sanjaya <bagasdotme@gmail.com>
+
 Language:	is (Icelandic)
 Leader:		Ævar Arnfjörð Bjarmason <avarab@gmail.com>
 
@@ -42,10 +46,13 @@ Leader:		Gwan-gyeong Mun <elongbug@gmail.com>
 Members:	Changwoo Ryu <cwryu@debian.org>
 		Sihyeon Jang <uneedsihyeon@gmail.com>
 
+Language:	pl (Polish)
+Repository:	https://github.com/Arusekk/git-po
+Leader:		Arusekk <arek_koz@o2.pl>
+
 Language:	pt_PT (Portuguese - Portugal)
-Repository:	https://github.com/vascool/git-po-pt/
-Leader:		Vasco Almeida <vascomalmeida@sapo.pt>
-Members:	Marco Sousa <marcomsousa AT gmail.com>
+Repository:	https://github.com/git-l10n-pt-PT/git-po/
+Leader:		Daniel Santos <hello@brighterdan.com>
 
 Language:	ru (Russian)
 Repository:	https://github.com/DJm00n/git-po-ru/
@@ -56,14 +63,23 @@ Language:	sv (Swedish)
 Repository:	https://github.com/nafmo/git-l10n-sv/
 Leader:		Peter Krefting <peter@softwolves.pp.se>
 
+Language:	tr (Turkish)
+Repository:	https://github.com/bitigchi/git-po/
+Leader:		Emir SARI <bitigchi@me.com>
+
 Language:	vi (Vietnamese)
 Repository:	https://github.com/vnwildman/git/
 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
+Leader:		Yi-Jyun Pan <pan93412 AT gmail.com>
+Members:	Franklin Weng <franklin AT goodhorse.idv.tw>
diff --git a/po/bg.po b/po/bg.po
index e446c76d99..905eb8ebd6 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 Alexander Shopov <ash@kambanaria.org>.
+# 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.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
 #
 # ========================
 # DICTIONARY TO MERGE IN GIT GUI
@@ -32,12 +32,14 @@
 # working directory/tree — винаги работно дърво, git �леди ц�лото дърво, а не директории, работна директори� за cwd
 # switch to branch преминавам към клон
 # sparse entry/blob ча�тично изтеглена директори�/път/обект-BLOB
+# sparse index ча�тичен индек�
 # revision range диапазон на вер�иите
 # cover letter придружаващо пи�мо
 # reference repository еталонно хранилище
 # graft при�адка
 # grafted repository хранилище � при�аждане
 # replace refs заме�тващи указатели
+# replace objects заме�тващи обекти
 # embedded repository вградено/вътрешно хранилище (добав�нето му е грешка)
 # thin pack �ъкратен пакет
 # pack file пакетен файл
@@ -133,12 +135,30 @@
 # hash контролна �ума, изчи�л�ване на контролна �ума
 # fanout откъ� (разперване???)
 # idx - index of pack file, 1 index per 1 packfile
-# midx - multi-pack index, for objects across multiple packfiles
+# midx, multi-pack index - файл � индек�а за множе�тво пакети
 # overlay mode - припокриващ режим (при изтегл�нe)
 # incremental file нара�тващ файл
 # split (commit-graphr) раздробен (граф � подавани�)
 # clobber (a tag) презапи�вам (етикет)
 # blame извеждане на автор�тво
+# refname име на указател
+# cone pattern matching пътеводно напа�ване
+# negative pattern отрицателен шаблон
+# colored hunk/diff оцветено парче/разлика
+# up to date обновен, о�вен като �амо�тотелва дума - актуален или completely up to date - напълно актуален
+# stateless без запазване на �ъ�то�нието
+# end packet пакет за край
+# identity �амолично�т, информаци� за
+# boundary commit гранично подаване
+# integrate (changes) вна��не (на промени)
+# overflow data данни за отме�тването
+# reverse index обратен индек� (а не обърнат, за да не �е бърка � reverse key index)
+# preferred предпочитан
+# expired о�тар�л
+# reroll-count номер на редакци�
+# Nth re-roll N-та поредна редакци�
+# fetch до�тавам
+# prefetch предварително до�тав�не
 # ------------------------
 # „$var“ - може да не �работва за shell има gettext и eval_gettext - проверка - намират �е ле�но по „$
 # ------------------------
@@ -155,10 +175,10 @@
 # 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.24\n"
+"Project-Id-Version: git 2.31\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-10-28 13:19+0800\n"
-"PO-Revision-Date: 2019-10-29 11:35+0100\n"
+"POT-Creation-Date: 2021-08-03 17:06+0800\n"
+"PO-Revision-Date: 2021-08-06 13:38+0300\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -167,37 +187,787 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: advice.c:109
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "�еу�пешен анализ — „%s“."
+
+#: add-interactive.c:529 add-interactive.c:830 reset.c:65 sequencer.c:3493
+#: sequencer.c:3964 sequencer.c:4119 builtin/rebase.c:1528
+#: builtin/rebase.c:1953
+msgid "could not read index"
+msgstr "индек�ът не може да бъде прочетен"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "двоично"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "нищо"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "н�ма промени"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Обнов�ване"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr "неу�пешно добав�не в индек�а на „%s“"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3707
+msgid "could not write index"
+msgstr "индек�ът не може да бъде запи�ан"
+
+#: add-interactive.c:706 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
+#, 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
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "неу�пешно �ъздаване на запи� в кеша чрез „make_cache_entry“ за „%s“"
+
+#: add-interactive.c:759 git-add--interactive.perl:653
+msgid "Revert"
+msgstr "Отм�на"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "Указател�т „HEAD^{tree}“ не може да бъде анализиран"
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "��ма не�ледени файлове.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Добав�не на не�ледени"
+
+#: add-interactive.c:895 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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "пренебрегване на не�л�тото: „%s“"
+
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Само двоични файлове �а променени.\n"
+
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "��ма промени.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Обнов�ване на кръпка"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Преглед на разликата"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "извеждане на пътищата � промени"
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr "добав�не на �ъ�то�нието на работното дърво към промените в индек�а"
+
+#: add-interactive.c:1014
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "връщане на �ъ�то�нието на индек�а към �оченото от „HEAD“"
+
+#: add-interactive.c:1016
+msgid "pick hunks and update selectively"
+msgstr "интерактивни избор и пром�на на парчета код"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "разлика между �оченото от „HEAD“ и индек�а"
+
+#: add-interactive.c:1020
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "добав�не на �ъдържанието на не�ледените файлове към индек�а"
+
+#: add-interactive.c:1028 add-interactive.c:1077
+msgid "Prompt help:"
+msgstr "Помощ:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "избор на eдин елемент"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "избор на поредица от елементи"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "избор на н�колко поредици от елементи"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "избор на базата на уникален префик�"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "изваждане на указаното от избора"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "избор на в�ички елементи"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(празно) приключване на избирането"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "избор на номериран елемент"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(празно) без избор на нищо"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "��� Команди ���"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Избор на �ледващо дей�твие"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "в индек�а"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "извън индек�а"
+
+#: 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:408 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
+#: git-add--interactive.perl:213
+msgid "path"
+msgstr "път"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "индек�ът не може да бъде обновен"
+
+#
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "Изход.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Добав�не на това парче [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 ""
+"�ко кръпката може да �е приложи чи�то, редактираното парче ще бъде незабавно "
+"добавено към индек�а."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y — добав�не на парчето в индек�а\n"
+"n — без добав�не на парчето в индек�а\n"
+"q — изход, без добав�не на това и в�ички о�таващи парчета от файла\n"
+"a — добав�не на това и в�ички �ледващи парчета от файла в индек�а\n"
+"d — без добав�не на това и в�ички �ледващи парчета от файла в индек�а\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 "Скатаване на пром�ната на правата за до�тъп [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 "Скатаване на изтриването [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Скатаване на това парче [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 ""
+"�ко кръпката може да �е приложи чи�то, редактираното парче ще бъде незабавно "
+"�кътано."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y — �катаване на парчето\n"
+"n — без �катаване на парчето\n"
+"q — изход, без �катаване на това и в�ички о�таващи парчета\n"
+"a — �катаване на това и в�ички �ледващи парчета от файла\n"
+"d — без �катаване на това и в�ички �ледващи парчета от файла\n"
+
+#: add-patch.c:80 git-add--interactive.perl:1443
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Изваждане на това парче [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 ""
+"�ко кръпката може да �е приложи чи�то, редактираното парче ще бъде незабавно "
+"извадено от индек�а."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y — изваждане на парчето от индек�а\n"
+"n — без изваждане на парчето от индек�а\n"
+"q — изход, без изваждане на това и в�ички о�таващи парчета от индек�а\n"
+"a — изваждане на това и в�ички �ледващи парчета от файла от индек�а\n"
+"d — без изваждане на това и в�ички �ледващи парчета от файла от индек�а\n"
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Прилагане на това парче към индек�а [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 ""
+"�ко кръпката може да �е приложи чи�то, редактираното парче ще бъде незабавно "
+"набел�зано за прилагане."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y — прилагане на парчето към индек�а\n"
+"n — без прилагане на парчето към индек�а\n"
+"q — изход, без прилагане на това и в�ички о�таващи парчета към индек�а\n"
+"a — прилагане на това и в�ички �ледващи парчета от файла към индек�а\n"
+"d — без прилагане на това и в�ички �ледващи парчета от файла към индек�а\n"
+
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Премахване на парчето от работното дърво [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 ""
+"�ко кръпката може да �е приложи чи�то, редактираното парче ще бъде незабавно "
+"набел�зано за занул�ване."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y — премахване на парчето от работното дърво\n"
+"n — без премахване на парчето от работното дърво\n"
+"q — изход, без премахване на това и в�ички о�таващи парчета от работното "
+"дърво\n"
+"a — премахване на това и в�ички �ледващи парчета от файла от работното "
+"дърво\n"
+"d — без премахване на това и в�ички �ледващи парчета от файла от работното "
+"дърво\n"
+
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y — премахване на парчето от индек�а и работното дърво\n"
+"n — без премахване на парчето от индек�а и работното дърво\n"
+"q — изход, без премахване на това и в�ички о�таващи парчета от индек�а и "
+"работното дърво\n"
+"a — премахване на това и в�ички �ледващи парчета от файла от индек�а и "
+"работното дърво\n"
+"d — без премахване на това и в�ички �ледващи парчета от файла от индек�а и "
+"работното дърво\n"
+
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y — прилагане на парчето от индек�а и работното дърво\n"
+"n — без прилагане на парчето от индек�а и работното дърво\n"
+"q — изход, без прилагане на това и в�ички о�таващи парчета от индек�а и "
+"работното дърво\n"
+"a — прилагане на това и в�ички �ледващи парчета от файла от индек�а и "
+"работното дърво\n"
+"d — без прилагане на това и в�ички �ледващи парчета от файла от индек�а и "
+"работното дърво\n"
+
+#: add-patch.c:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y — прилагане на парчето към работното дърво\n"
+"n — без прилагане на парчето към работното дърво\n"
+"q — изход, без прилагане на това и в�ички о�таващи парчета\n"
+"a — прилагане на това и в�ички �ледващи парчета от файла\n"
+"d — без прилагане на това и в�ички �ледващи парчета от файла\n"
+
+#: add-patch.c:343
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "заглавната ча�т на парчето „%.*s“ не може да �е анализира"
+
+#: add-patch.c:362 add-patch.c:366
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "заглавната ча�т на оцветеното парче „%.*s“ не може да �е анализира"
+
+#: add-patch.c:420
+msgid "could not parse diff"
+msgstr "разликата не може да �е анализира"
+
+#: add-patch.c:439
+msgid "could not parse colored diff"
+msgstr "оцветената разлика не може да �е анализира"
+
+#: add-patch.c:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr "неу�пешно изпълнение на „%s“"
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "изходът от „interactive.diffFilter“ не напа�ва"
+
+#: add-patch.c:613
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Обработените редове на изхода на ползвани� филтър, тр�бва\n"
+"да �е отна��т едно към едно �пр�мо редовете на входа."
+
+#: add-patch.c:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"очаква �е ред №%d от контек�та в\n"
+"%.*s"
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"парчетата код не �е припокриват:\n"
+"%.*s\n"
+"    не завършва �:\n"
+"%.*s"
+
+#: 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:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"———\n"
+"За да пропу�нете редовете, започващи � „%c“: заменете знака � „ “ (�тават "
+"контек�т)\n"
+"За да пропу�нете редовете, започващи � „%c“: изтрийте ги.\n"
+"Редовете, които започват � „%c“ ще бъдат пропу�нати.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: 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"
+
+#: add-patch.c:1133
+msgid "could not parse hunk header"
+msgstr "заглавната ча�т парчето не може да �е анализира"
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr "неу�пешно изпълнение на „git apply --cached“"
+
+#. 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.
+#.
+#. 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:1247 git-add--interactive.perl:1242
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Редактираното парче не може да �е приложи.  Да �е продължи ли � "
+"редактирането? (текущите редакции ще �е отмен�т при отказ!): „y“ (да)/ "
+"„n“ (не)? "
+
+#: add-patch.c:1290
+msgid "The selected hunks do not apply to the index!"
+msgstr "Избраните парчета не може да �е добав�т в индек�а!"
+
+#: add-patch.c:1291 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Да �е приложат ли към работното дърво? "
+
+#: add-patch.c:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "�ищо не е приложено.\n"
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j — без решение за парчето, към �ледващото парче без решение\n"
+"J — без решение за парчето, към �ледващото парче\n"
+"k — без решение за парчето, към предишното парче без решение\n"
+"K — без решение за парчето, към предишното парче\n"
+"g — избор към кое парче да �е премине\n"
+"/ — тър�ене на парче, напа�ващо към даден регул�рен израз\n"
+"s — раздел�не на текущото парче на по-малки\n"
+"e — ръчно редактиране на текущото парче\n"
+"? — извеждане не помощта\n"
+
+#: add-patch.c:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr "��ма друго парче преди това"
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr "��ма друго парче �лед това"
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr "��ма други парчета"
+
+#: add-patch.c:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "към кое парче да �е придвижи (за повече варианти нати�нете „enter“)? "
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "към кое парче да �е придвижи? "
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "�еправилен номер: „%s“"
+
+#: 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:1575
+msgid "No other hunks to search"
+msgstr "��ма други парчета за тър�ене"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "да �е тър�и � регул�рен израз? "
+
+#: add-patch.c:1596
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Сгрешен регул�рен израз „%s“: %s"
+
+#: add-patch.c:1613
+msgid "No hunk matches the given pattern"
+msgstr "�икое парче не напа�ва на регул�рни� израз"
+
+#: add-patch.c:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "Това парче не може да бъде разделено"
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Раздел�не на %d парчета."
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr "Това парче не може да бъде редактирано"
+
+#: add-patch.c:1680
+msgid "'git apply' failed"
+msgstr "неу�пешно изпълнение на „git apply“"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"За да изключите това предупреждение, изпълнете:\n"
+"    git config advice.%s false"
+
+#: advice.c:161
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sпод�казка: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:252
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "Отбирането на подавани� е блокирано от не�лети файлове."
 
-#: advice.c:164
+#: advice.c:254
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Подаването е блокирано от не�лети файлове."
 
-#: advice.c:166
+#: advice.c:256
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Сливането е блокирано от не�лети файлове."
 
-#: advice.c:168
+#: advice.c:258
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Издърпването е блокирано от не�лети файлове."
 
-#: advice.c:170
+#: advice.c:260
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Отм�ната е блокирана от не�лети файлове."
 
-#: advice.c:172
+#: advice.c:262
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "Дей�твието „%s“ е блокирано от не�лети файлове."
 
-#: advice.c:180
+#: 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."
@@ -205,23 +975,40 @@ msgstr ""
 "Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm Ф�ЙЛ“,\n"
 "за да отбележите коригирането им.  След това извършете подаването."
 
-#: advice.c:188
+#: advice.c:278
 msgid "Exiting because of an unresolved conflict."
 msgstr "Изход от програмата заради некоригиран конфликт."
 
-#: advice.c:193 builtin/merge.c:1332
+#: advice.c:283 builtin/merge.c:1374
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "�е �те завършили �ливане.  (Указател�т „MERGE_HEAD“ �ъще�твува)."
 
-#: advice.c:195
+#: advice.c:285
 msgid "Please, commit your changes before merging."
 msgstr "Промените тр�бва да �е подадат преди �ливане."
 
-#: advice.c:196
+#: advice.c:286
 msgid "Exiting because of unfinished merge."
 msgstr "Изход от програмата заради незавършено �ливане."
 
-#: advice.c:202
+#: 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 ""
+"Следните пътища не �ъвпадат � никой от на�троените, но �ъвпадат � обекти\n"
+"в индек�а, които �а извън текущото ча�тично изтегл�не:\n"
+
+#: 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"
@@ -250,7 +1037,7 @@ msgstr ""
 "бъдат\n"
 "забравени и никой клон н�ма да �е промени.\n"
 "\n"
-"�ко и�кате да �ъздадете нов клон, за да запазите подавани�та �и, можете да\n"
+"�ко и�кате да �ъздадете нов клон, за да запазите подавани�та �и, може да\n"
 "направите това като зададете име на клон към опци�та „-c“ на командата\n"
 "„switch“.  �апример:\n"
 "\n"
@@ -262,7 +1049,7 @@ msgstr ""
 "\n"
 "Може да �прете това �ъобщение �ъ� задаване на на�тройката „advice."
 "detachedHead“\n"
-"да е „false“.\n"
+"да е „false“ (лъжа̀).\n"
 
 #: alias.c:50
 msgid "cmdline ends with \\"
@@ -272,90 +1059,86 @@ msgstr "командни�т ред завършва � „/“"
 msgid "unclosed quote"
 msgstr "кавичка без еш"
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "непозната опци� за знаците за интервали „%s“"
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "непозната опци� за игнориране на знаците за интервали „%s“"
 
-#: apply.c:135
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
 msgstr "опциите „--reject“ и „--3way“ �а не�ъвме�тими"
 
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "опциите „--cached“ и „--3way“ �а не�ъвме�тими"
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
 msgstr "като „--3way“, но извън хранилище"
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
 msgstr "като „--index“, но извън хранилище"
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
 msgstr "като „--cached“, но извън хранилище"
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Регул�рни�т израз за времето „%s“ не може за бъде компилиран"
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "Регул�рни�т израз върна %d при подадена по�ледователно�т „%s“ на входа"
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "Лип�ва име на файл на ред %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“ — на ред %2$d �е очакваше „/dev/"
 "null“, а бе получен „%1$s“"
 
-#: 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“ — на ред %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“ — на ред %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“ — на ред %d �е очакваше „/dev/"
 "null“"
 
-#: apply.c:963
+#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "грешен режим на ред №%d: %s"
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "не�ъвме�тими заглавни ча�ти на редове №%d и №%d"
 
-#: apply.c:1372
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -370,81 +1153,81 @@ msgstr[1] ""
 "След �ъкращаването на първите %d ча�ти от компонентите на път�, в заглавната "
 "ча�т на „git diff“ лип�ва информаци� за име на файл (ред: %d)"
 
-#: apply.c:1385
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "в заглавната ча�т на „git diff“ лип�ва информаци� за име на файл (ред: %d)"
 
-#: apply.c:1481
+#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "при повторното пребро�ване бе получен неочакван ред: „%.*s“"
 
-#: apply.c:1550
+#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "ча�т от кръпка без заглавна ча�т на ред %d: %.*s"
 
-#: apply.c:1753
+#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "нови�т файл зави�и от �тарото �ъдържание на файла"
 
-#: apply.c:1755
+#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "изтрити�т файл не е празен"
 
-#: apply.c:1789
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "грешка в кръпката на ред %d"
 
-#: apply.c:1826
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "нови�т файл „%s“ зави�и от �тарото �ъдържание на файла"
 
-#: apply.c:1828
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "изтрити�т файл „%s“ не е празен"
 
-#: apply.c:1831
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "� предупреждение: файлът „%s“ вече е празен, но не е изтрит"
 
-#: apply.c:1978
+#: apply.c:1977
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "грешка в двоичната кръпка на ред %d: %.*s"
 
-#: apply.c:2015
+#: apply.c:2014
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "неразпозната двоичната кръпка на ред %d"
 
-#: apply.c:2177
+#: apply.c:2176
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "кръпката е � изц�ло повредени данни на ред %d"
 
-#: apply.c:2263
+#: apply.c:2262
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "�имволната връзка „%s“ не може да бъде прочетена"
 
-#: apply.c:2267
+#: apply.c:2266
 #, c-format
 msgid "unable to open or read %s"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
 
-#: apply.c:2926
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "неправилно начало на ред: „%c“"
 
-#: apply.c:3047
+#: apply.c:3056
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -453,13 +1236,13 @@ msgstr[0] ""
 msgstr[1] ""
 "%d-то парче код бе у�пешно приложено на ред %d (отме�тване от %d реда)."
 
-#: apply.c:3059
+#: apply.c:3068
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 "Контек�тът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
 
-#: apply.c:3065
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -468,317 +1251,316 @@ msgstr ""
 "при тър�ене за:\n"
 "%.*s"
 
-#: apply.c:3087
+#: apply.c:3096
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "лип�ват данните за двоичната кръпка за „%s“"
 
-#: apply.c:3095
+#: apply.c:3104
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "двоичната кръпка не може да �е приложи в обратна по�ока, когато обратното "
 "парче за „%s“ лип�ва"
 
-#: apply.c:3142
+#: apply.c:3151
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "към „%s“ не може да �е приложи двоична кръпка без пълен индек�"
 
-#: apply.c:3152
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "кръпката �ъответ�тва на „%s“ (%s), който не �ъвпада по �ъдържание."
 
-#: apply.c:3160
+#: apply.c:3170
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "кръпката �ъответ�тва на „%s“, който тр�бва да е празен, но не е"
 
-#: apply.c:3178
+#: apply.c:3188
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 "необходими�т резултат �лед операци�та  — „%s“ за „%s“ не може да бъде "
 "прочетен"
 
-#: apply.c:3191
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
 
-#: apply.c:3197
+#: apply.c:3208
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "двоичната кръпка за „%s“ води до неправилни резултати (очакваше �е: „%s“, а "
 "бе получено: „%s“)"
 
-#: apply.c:3218
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "неу�пешно прилагане на кръпка: „%s:%ld“"
 
-#: apply.c:3341
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
 msgstr "„%s“ не може да �е изтегли"
 
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
+#: 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 "файлът „%s“ не може да бъде прочетен"
 
-#: apply.c:3401
+#: apply.c:3412
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "изчитане на „%s“ �лед про�лед�ване на �имволна връзка"
 
-#: apply.c:3430 apply.c:3673
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "обектът � път „%s“ е преименуван или изтрит"
 
-#: apply.c:3516 apply.c:3688
+#: apply.c:3527 apply.c:3702
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "„%s“ не �ъще�твува в индек�а"
 
-#: apply.c:3525 apply.c:3696
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
 msgstr "„%s“ не �ъответ�тва на индек�а"
 
-#: apply.c:3560
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr ""
-"в хранилището лип�ват необходимите обекти-BLOB, за да �е премине към тройно "
-"�ливане."
+#: apply.c:3571
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr "в хранилището лип�ват необходимите обекти-BLOB, за тройно �ливане."
 
-#: apply.c:3563
+#: apply.c:3574
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "Преминаване към тройно �ливане…\n"
+msgid "Performing three-way merge...\n"
+msgstr "Тройно �ливане…\n"
 
-#: apply.c:3579 apply.c:3583
+#: apply.c:3590 apply.c:3594
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "текущото �ъдържание на „%s“ не може да бъде прочетено"
 
-#: apply.c:3595
+#: apply.c:3606
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "�еу�пешно преминаване към тройно �ливане…\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "�еу�пешно тройно �ливане…\n"
 
-#: apply.c:3609
+#: apply.c:3620
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
 
-#: apply.c:3614
+#: apply.c:3625
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Кръпката бе приложена чи�то към „%s“.\n"
 
-#: apply.c:3640
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Преминаване към пр�ко прилагане…\n"
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr "изтриващата кръпка о�тав� файла непразен"
 
-#: apply.c:3713
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr "„%s“: неправилен вид"
 
-#: apply.c:3715
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "„%s“ е от вид „%o“, а �е очакваше „%o“"
 
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: 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 "неправилен път: „%s“"
 
-#: apply.c:3924
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
 msgstr "„%s“: вече �ъще�твува в индек�а"
 
-#: apply.c:3927
+#: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "„%s“: вече �ъще�твува в работното дърво"
 
-#: apply.c:3947
+#: apply.c:3976
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "новите права за до�тъп (%o) на „%s“ не �ъвпадат �ъ� �тарите (%o)"
 
-#: apply.c:3952
+#: apply.c:3981
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "новите права за до�тъп (%o) на „%s“ не �ъвпадат �ъ� �тарите (%o) на „%s“"
 
-#: apply.c:3972
+#: apply.c:4001
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "за�егнати�т файл „%s“ е �лед �имволна връзка"
 
-#: apply.c:3976
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: apply.c:3991
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Провер�ване на кръпката „%s“…"
 
-#: apply.c:4083
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 "информаци�та за �умата по SHA1 за подмодула лип�ва или не е до�татъчна (%s)."
 
-#: apply.c:4090
+#: apply.c:4119
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "�м�на на режима на до�тъпа на „%s“, който не е в текущи� връх „HEAD“"
 
-#: apply.c:4093
+#: apply.c:4122
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "информаци�та за �умата по SHA1 лип�ва или не е до�татъчна (%s)."
 
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "неу�пешно �ъздаване на запи� в кеша чрез „make_cache_entry“ за „%s“"
-
-#: apply.c:4102
+#: apply.c:4131
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "„%s“ не може да �е добави към временни� индек�"
 
-#: apply.c:4112
+#: apply.c:4141
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "временни�т индек� не може да �е запази в „%s“"
 
-#: apply.c:4250
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "„%s“ не може да �е извади от индек�а"
 
-#: apply.c:4284
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "повредена кръпка за модула „%s“"
 
-#: apply.c:4290
+#: apply.c:4319
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 "не може да �е получи информаци� чрез „stat“ за ново�ъздадени� файл „%s“"
 
-#: apply.c:4298
+#: apply.c:4327
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "не може да �е за �ъздаде м��тото за �ъхранение на ново�ъздадени� файл „%s“"
 
-#: apply.c:4304 apply.c:4449
+#: apply.c:4333 apply.c:4478
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не може да �е добави запи� в кеша за „%s“"
 
-#: apply.c:4347
+#: apply.c:4376 builtin/bisect--helper.c:525
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "в „%s“ не може да �е пише"
 
-#: apply.c:4351
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
 msgstr "затвар�не на файла „%s“"
 
-#: apply.c:4421
+#: apply.c:4450
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "файлът „%s“ не може да �е запише � режим на до�тъп „%o“"
 
-#: apply.c:4519
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Кръпката „%s“ бе приложена чи�то."
 
-#: apply.c:4527
+#: apply.c:4556
 msgid "internal error"
 msgstr "вътрешна грешка"
 
-#: apply.c:4530
+#: apply.c:4559
 #, 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:4541
+#: apply.c:4570
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "�ъкращаване на името на файла � отхвърлените парчета на „ %.*s.rej“"
 
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
 msgstr "„%s“ не може да бъде отворен"
 
-#: apply.c:4563
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "%d-то парче бе у�пешно приложено."
 
-#: apply.c:4567
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "%d-то парче бе отхвърлено."
 
-#: apply.c:4686
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Пропу�ната кръпка: „%s“"
 
-#: apply.c:4694
+#: apply.c:4733
 msgid "unrecognized input"
 msgstr "непознат вход"
 
-#: apply.c:4714
+#: apply.c:4753
 msgid "unable to read index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: apply.c:4871
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "кръпката „%s“ не може да бъде отворена: %s"
 
-#: apply.c:4898
+#: apply.c:4937
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
 msgstr[1] "пренебрегнати �а %d грешки в знаците за интервали"
 
-#: apply.c:4904 apply.c:4919
+#: apply.c:4943 apply.c:4958
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d ред добав� грешки в знаците за интервали."
 msgstr[1] "%d реда добав�т грешки в знаците за интервали."
 
-#: apply.c:4912
+#: apply.c:4951
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -787,147 +1569,185 @@ msgstr[0] ""
 msgstr[1] ""
 "Добавени �а %d реда �лед корекци�та на грешките в знаците за интервали."
 
-#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
 msgid "Unable to write new index file"
 msgstr "�ови�т индек� не може да бъде запи�ан"
 
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "път"
-
-#: apply.c:4956
+#: apply.c:4995
 msgid "don't apply changes matching the given path"
 msgstr "без прилагане на промените напа�ващи на дадени� път"
 
-#: apply.c:4959
+#: apply.c:4998
 msgid "apply changes matching the given path"
 msgstr "прилагане на промените напа�ващи на дадени� път"
 
-#: apply.c:4961 builtin/am.c:2206
+#: apply.c:5000 builtin/am.c:2318
 msgid "num"
 msgstr "БРОЙ"
 
-#: apply.c:4962
+#: apply.c:5001
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "премахване на този БРОЙ водещи елементи от пътищата в разликата"
 
-#: apply.c:4965
+#: apply.c:5004
 msgid "ignore additions made by the patch"
 msgstr "игнориране на редовете добавени от тази кръпка"
 
-#: apply.c:4967
+#: apply.c:5006
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "извеждане на �тати�тика на промените без прилагане на кръпката"
 
-#: apply.c:4971
+#: apply.c:5010
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "извеждане на бро� на добавените и изтритите редове"
 
-#: apply.c:4973
+#: apply.c:5012
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "извеждане на �тати�тика на входните данни без прилагане на кръпката"
 
-#: apply.c:4975
+#: apply.c:5014
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "проверка дали кръпката може да �е приложи, без дей�твително прилагане"
 
-#: apply.c:4977
+#: apply.c:5016
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверка дали кръпката може да бъде приложена към текущи� индек�"
 
-#: apply.c:4979
+#: apply.c:5018
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "отбел�зване на новите файлове � „git add --intent-to-add“"
 
-#: apply.c:4981
+#: apply.c:5020
 msgid "apply a patch without touching the working tree"
 msgstr "прилагане на кръпката без пром�на на работното дърво"
 
-#: apply.c:4983
+#: apply.c:5022
 msgid "accept a patch that touches outside the working area"
 msgstr "прилагане на кръпка, ко�то промен� и файлове извън работното дърво"
 
-#: apply.c:4986
+#: apply.c:5025
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 "кръпката да бъде приложена.  Опци�та �е комбинира � „--check“/„--stat“/„--"
 "summary“"
 
-#: apply.c:4988
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "пробване � тройно �ливане, ако кръпката не може да �е приложи директно"
+#: apply.c:5027
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr ""
+"пробване � тройно �ливане, ако това не �работи — �тандартно прилагане на "
+"кръпка"
 
-#: apply.c:4990
+#: apply.c:5029
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "�ъздаване на временен индек� на база на включената информаци� за индек�а"
 
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
 msgid "paths are separated with NUL character"
 msgstr "раздел�не на пътищата � нулеви� знак „NUL“"
 
-#: apply.c:4995
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
 msgstr "да �е о�игури контек�т от поне такъв БРОЙ �ъвпадащи редове"
 
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
+#: 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 "дей�твие"
 
-#: apply.c:4997
+#: apply.c:5036
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "за�ичане на нови или променени редове � грешки в знаците за интервали"
 
-#: apply.c:5000 apply.c:5003
+#: apply.c:5039 apply.c:5042
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "игнориране на промените в знаците за интервали при откриване на контек�та"
 
-#: apply.c:5006
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr "прилагане на кръпката в обратна по�ока"
 
-#: apply.c:5008
+#: apply.c:5047
 msgid "don't expect at least one line of context"
 msgstr "без изи�кване на дори и един ред контек�т"
 
-#: apply.c:5010
+#: apply.c:5049
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "о�тав�не на отхвърлените парчета във файлове � разширение „.rej“"
 
-#: apply.c:5012
+#: apply.c:5051
 msgid "allow overlapping hunks"
 msgstr "позвол�ване на за�тъпващи �е парчета"
 
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 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 "повече подробно�ти"
 
-#: apply.c:5015
+#: apply.c:5054
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "пренебрегване на неправилно лип�ващ знак за нов ред в кра� на файл"
 
-#: apply.c:5018
+#: apply.c:5057
 msgid "do not trust the line counts in the hunk headers"
 msgstr "без довер�ване на номерата на редовете в заглавните ча�ти на парчетата"
 
-#: apply.c:5020 builtin/am.c:2194
+#: apply.c:5059 builtin/am.c:2306
 msgid "root"
 msgstr "��Ч�Л��_ДИРЕКТОРИЯ"
 
-#: apply.c:5021
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr "добав�не на тази ��Ч�Л��_ДИРЕКТОРИЯ към имената на в�ички файлове"
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "обектът-BLOB „%s“ не може да бъде обработен"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "неподдържани права за до�тъп до файл: 0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "филтърът „%s“ не може да бъде �тартиран"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "де�крипторът не може да бъде прена�очен"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "филтърът „%s“ върна грешка"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "път�т не е правилно кодиран в UTF-8: %s"
+
+#: archive-zip.c:322
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "твърде дълъг път (%d знака, SHA1: %s): %s"
+
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#, c-format
+msgid "deflate error (%d)"
+msgstr "грешка при декомпре�иране � „deflate“ (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "времевата �тойно�т е твърде гол�ма за тази �и�тема: %<PRIuMAX>"
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [ОПЦИЯ…] УК�З�ТЕЛ_КЪМ_ДЪРВО [ПЪТ…]"
@@ -947,183 +1767,156 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote ХР��ИЛИЩЕ [--exec КОМ��Д�] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: 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:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
+#: builtin/merge.c:1143
+#, c-format
+msgid "could not read '%s'"
+msgstr "файлът „%s“ не може да бъде прочетен"
+
+#: 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 "път�т „%s“ не �ъвпада � никой файл"
 
-#: archive.c:396
+#: archive.c:451
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "такъв указател н�ма: %.*s"
 
-#: archive.c:401
+#: archive.c:457
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "неправилно име на обект: „%s“"
 
-#: archive.c:414
+#: archive.c:470
 #, c-format
 msgid "not a tree object: %s"
 msgstr "не е обект-дърво: %s"
 
-#: archive.c:426
+#: archive.c:482
 msgid "current working directory is untracked"
 msgstr "текущата работна директори� не е �ледена"
 
-#: archive.c:457
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "Файлът „%s“ лип�ва"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "„%s“ не е обикновен файл"
+
+#: archive.c:552
 msgid "fmt"
 msgstr "ФОРМ�Т"
 
-#: archive.c:457
+#: archive.c:552
 msgid "archive format"
 msgstr "ФОРМ�Т на архива"
 
-#: archive.c:458 builtin/log.c:1581
+#: archive.c:553 builtin/log.c:1775
 msgid "prefix"
 msgstr "ПРЕФИКС"
 
-#: archive.c:459
+#: archive.c:554
 msgid "prepend prefix to each pathname in the archive"
 msgstr "добав�не на този ПРЕФИКС към в�еки път в архива"
 
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:186
+#: 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 "Ф�ЙЛ"
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr "добав�не на не�ледените файлове към архива"
+
+#: archive.c:559 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr "запазване на архива в този Ф�ЙЛ"
 
-#: archive.c:463
+#: archive.c:561
 msgid "read .gitattributes in working directory"
 msgstr "изчитане на „.gitattributes“ в работната директори�"
 
-#: archive.c:464
+#: archive.c:562
 msgid "report archived files on stderr"
 msgstr "извеждане на архивираните файлове на �тандартната грешка"
 
-#: archive.c:465
-msgid "store only"
-msgstr "�амо �ъхранение без компре�иране"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "бързо компре�иране"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "добро компре�иране"
+#: archive.c:564
+msgid "set compression level"
+msgstr "задаване на нивото на компре�иране"
 
-#: archive.c:477
+#: archive.c:567
 msgid "list supported archive formats"
 msgstr "извеждане на �пи�ъка � поддържаните формати"
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: archive.c:569 builtin/archive.c:91 builtin/clone.c:118 builtin/clone.c:121
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
 msgid "repo"
 msgstr "хранилище"
 
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
-msgstr "изтегл�не на архива от отдалеченото ХР��ИЛИЩЕ"
+msgstr "получаване на архива от отдалеченото ХР��ИЛИЩЕ"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
 #: builtin/notes.c:498
 msgid "command"
 msgstr "команда"
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "път към отдалечената команда „git-upload-archive“"
 
-#: archive.c:489
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr "�еочаквана опци� „--remote“"
 
-#: archive.c:491
+#: archive.c:581
 msgid "Option --exec can only be used together with --remote"
-msgstr "Опци�та „--exec“ изи�ква „--remote“"
+msgstr "опци�та „--exec“ изи�ква „--remote“"
 
-#: archive.c:493
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr "�еочаквана опци� „--output“"
 
-#: archive.c:515
+#: archive.c:585
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "опциите „--add-file“ и „--remote“ �а не�ъвме�тими"
+
+#: archive.c:607
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "�епознат формат на архив: „%s“"
 
-#: archive.c:522
+#: archive.c:616
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "�ргументът не �е поддържа за форма̀та „%s“: -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "обектът-BLOB „%s“ не може да бъде обработен"
-
-#: archive-tar.c:266 archive-zip.c:363
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "неподдържани права за до�тъп до файл: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr "обектът „%s“ не може да бъде прочетен"
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "филтърът „%s“ не може да бъде �тартиран"
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "де�крипторът не може да бъде прена�очен"
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "филтърът „%s“ върна грешка"
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "път�т не е правилно кодиран в UTF-8: %s"
-
-#: archive-zip.c:318
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "твърде дълъг път (%d знака, SHA1: %s): %s"
-
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
-#, c-format
-msgid "deflate error (%d)"
-msgstr "грешка при декомпре�иране � „deflate“ (%d)"
-
-#: archive-zip.c:609
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "времевата �тойно�т е твърде гол�ма за тази �и�тема: %<PRIuMAX>"
-
-#: attr.c:213
+#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "„%.*s“ е неправилно име за атрибут"
 
-#: attr.c:370
+#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s: командата не е позволена: „%s:%d“"
 
-#: attr.c:410
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1131,22 +1924,22 @@ msgstr ""
 "Отрицателните шаблони �е игнорират в атрибутите на git.\n"
 "�ко ви тр�бва начална удивителна, ползвайте „\\!“."
 
-#: bisect.c:468
+#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "�еправилно цитирано �ъдържание във файла „%s“: %s"
 
-#: bisect.c:678
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Повече не може да �е тър�и двоично!\n"
 
-#: bisect.c:733
+#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "�еправилно име на подаване „%s“"
 
-#: bisect.c:758
+#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1155,7 +1948,7 @@ msgstr ""
 "�еправилна база за �ливане: %s.\n"
 "Следователно грешката е коригирана между „%s“ и [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1164,7 +1957,7 @@ msgstr ""
 "�ова база за �ливане: %s.\n"
 "Свой�твото е променено между „%s“ и [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:801
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1173,7 +1966,7 @@ msgstr ""
 "Базата за �ливане „%s“ е %s.\n"
 "Следователно първото %s подаване е между „%s“ и [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1184,7 +1977,7 @@ msgstr ""
 "Двоичното тър�ене � git bisect н�ма да работи правилно.\n"
 "Дали не �те объркали указателите „%s“ и „%s“?\n"
 
-#: bisect.c:789
+#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1195,45 +1988,45 @@ msgstr ""
 "�е може да �ме �игурни, че първото %s подаване е между „%s“ и „%s“.\n"
 "Двоичното тър�ене продължава."
 
-#: bisect.c:822
+#: bisect.c:861
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Двоично тър�ене: тр�бва да �е провери база за �ливане\n"
 
-#: bisect.c:865
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr "необходима е вер�и� „%s“"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
 msgstr "файлът „%s“ не може да бъде �ъздаден"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: bisect.c:958
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "неу�пешно прочитане на указателите за двоично тър�ене"
 
-#: bisect.c:977
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "„%s“ e както „%s“, така и „%s“\n"
 
-#: bisect.c:985
+#: bisect.c:1066
 #, 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 ""
 "Лип�ва подход�що за те�тване подаване.\n"
 "Проверете параметрите за пътищата.\n"
 
-#: bisect.c:1004
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1243,48 +2036,48 @@ msgstr[1] "(приблизително %d �тъпки)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1101
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Двоично тър�ене: о�тава %d вер�и� �лед тази %s\n"
 msgstr[1] "Двоично тър�ене: о�тават %d вер�ии �лед тази %s\n"
 
-#: blame.c:2700
+#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
-msgstr "Опциите „--contents“ и „--reverse“ �а не�ъвме�тими"
+msgstr "опциите „--contents“ и „--reverse“ �а не�ъвме�тими"
 
-#: blame.c:2714
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
-msgstr "Опци�та „--contents“ е не�ъвме�тима � име на обект от крайно подаване"
+msgstr "опци�та „--contents“ е не�ъвме�тима � име на обект от крайно подаване"
 
-#: blame.c:2735
+#: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изи�ква "
 "указването на крайно подаване"
 
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
-#: builtin/shortlog.c:192
+#: blame.c:2820 bundle.c:224 ref-filter.c:2274 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 "неу�пешно на�тройване на обхождането на вер�иите"
 
-#: blame.c:2762
+#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "Едновременното задаване на опциите „--reverse“ и „--first-parent“ изи�ква "
 "указването на диапазон по веригата на първите на�ледници"
 
-#: blame.c:2773
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "н�ма път на име „%s“ в „%s“"
 
-#: blame.c:2784
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "обектът-BLOB „%s“ в път� %s не може да бъде прочетен"
@@ -1298,7 +2091,7 @@ msgid ""
 "\"git branch --set-upstream-to=%s%s%s\"."
 msgstr ""
 "\n"
-"След корекци� на грешката, можете да обновите\n"
+"След корекци� на грешката, може да обновите\n"
 "информаци�та за �ледени� клон чрез:\n"
 "git branch --set-upstream-to=%s%s%s"
 
@@ -1352,7 +2145,7 @@ msgstr "Клонът „%s“ ще �леди локални� указател
 
 #: branch.c:119
 msgid "Unable to write upstream branch configuration"
-msgstr "�а�тройките за �ледени� клон не могат да бъдат запи�ани"
+msgstr "�а�тройките за �ледени� клон не може да бъдат запи�ани"
 
 #: branch.c:156
 #, c-format
@@ -1417,415 +2210,375 @@ msgstr "Името на обект не е еднозначно: „%s“"
 msgid "Not a valid branch point: '%s'."
 msgstr "�еправилно м��то за начало на клон: „%s“"
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "„%s“ вече е изтеглен в „%s“"
 
-#: branch.c:387
+#: branch.c:389
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "Указател�т „HEAD“ на работното дърво „%s“ не е обновен"
 
-#: bundle.c:36
+#: bundle.c:44
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "Файлът „%s“ не изглежда да е пратка на git вер�и� 2"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "непознат алгоритъм за контролни �уми за пратки „%s“"
 
-#: bundle.c:64
+#: bundle.c:48
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "непозната възможно�т „%s“"
+
+#: bundle.c:74
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "Файлът „%s“ не изглежда да е пратка на git вер�и� 2 или 3"
+
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "непозната заглавна ча�т: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
-#: builtin/commit.c:791
+#: 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 "„%s“ не може да �е отвори"
 
-#: bundle.c:143
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "В хранилището лип�ват �ледните необходими подавани�:"
 
-#: bundle.c:146
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "за проверката на пратка е необходимо хранилище"
 
-#: bundle.c:197
+#: 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:204
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "Пратката �ъдържа пълна и�тори�."
 
-#: bundle.c:206
+#: 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:272
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "неу�пешно дублиране на де�криптора на пратката � „dup“"
 
-#: bundle.c:279
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Командата „git pack-objects“ не може да бъде �тартирана"
 
-#: bundle.c:290
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "Командата „git pack-objects“ не завърши у�пешно"
 
-#: bundle.c:332
-msgid "rev-list died"
-msgstr "Командата „git rev-list“ не завърши у�пешно"
-
-#: bundle.c:381
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 "указател�т „%s“ не е бил включен поради опциите зададени на „git rev-list“"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
+#: bundle.c:504
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "неподдържана вер�и� на индек�а %d"
+
+#: bundle.c:506
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "пратка %d не може да �е запише � алгоритъм %s"
+
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "непознат аргумент: %s"
 
-#: bundle.c:468
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Създаването на празна пратка е невъзможно."
 
-#: bundle.c:478
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
-msgstr "Файлът „%s“ не може да бъде �ъздаден"
+msgstr "файлът „%s“ не може да бъде �ъздаден"
 
-#: bundle.c:503
+#: bundle.c:588
 msgid "index-pack died"
-msgstr "Командата „git index-pack“ не завърши у�пешно"
+msgstr "командата „git index-pack“ не завърши у�пешно"
 
-#: color.c:296
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "неправилна �тойно�т за цв�т: %.*s"
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
+msgstr "идентификаторът за краен откъ� �е �в�ва по-рано от очакваното"
 
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
+#: chunk-format.c:126
 #, c-format
-msgid "could not parse %s"
-msgstr "„%s“ не може да �е анализира"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "неправилно отме�тване на откъ�/и %<PRIx64> и %<PRIx64>"
 
-#: commit.c:52
+#: chunk-format.c:133
 #, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s не е подаване!"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "повтар�щ �е идентификатор на откъ� %<PRIx32>"
 
-#: commit.c:192
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Поддръжката на „<GIT_DIR>/info/grafts“ е о�тар�ла.\n"
-"В бъдеща вер�и� на Git ще бъде премахната.\n"
-"\n"
-"Може да преобразувате при�адките в заме�тващи\n"
-"указатели � командата:\n"
-"\n"
-"    git replace --convert-graft-file\n"
-"\n"
-"За да изключите това �ъобщение, ползвайте командата:\n"
-"\n"
-"    git config advice.graftFileDeprecated false"
-
-#: commit.c:1128
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr ""
-"Подаването „%s“ е � недоверен подпи� от GPG, който твърди, че е на „%s“."
-
-#: commit.c:1131
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr ""
-"Подаването „%s“ е � неправилен подпи� от GPG, който твърди, че е на „%s“."
-
-#: commit.c:1134
+#: chunk-format.c:147
 #, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Подаването „%s“ е без подпи� от GPG."
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "ненулев идентификатор за краен откъ� %<PRIx32>"
 
-#: commit.c:1137
+#: color.c:329
 #, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "Подаването „%s“ е � коректен подпи� от GPG на „%s“.\n"
+msgid "invalid color value: %.*s"
+msgstr "неправилна �тойно�т за цв�т: %.*s"
 
-#: commit.c:1391
-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 ""
-"ПРЕДУПРЕЖДЕ�ИЕ: �ъобщението при подаване не е кодирано � UTF-8.\n"
-"Може да поправите подаването заедно �ъ� �ъобщението или може да\n"
-"зададете ползваното кодиране в на�тройката „i18n.commitencoding“.\n"
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr "неправилна вер�и� на контролна �ума"
 
-#: commit-graph.c:127
+#: commit-graph.c:262
 msgid "commit-graph file is too small"
-msgstr "файлът � гра̀фа на подавани�та е твърде малък"
+msgstr "файлът за гра̀фа � подавани�та е твърде малък"
 
-#: commit-graph.c:192
+#: commit-graph.c:355
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "отпечатъкът на гра̀фа � подавани�та %X не �ъвпада � %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:362
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "вер�и�та на гра̀фа � подавани�та %X не �ъвпада � %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "вер�и�та на контролната �ума на гра̀фа � подавани�та %X не �ъвпада � %X"
 
-#: commit-graph.c:229
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"запи�ът в таблицата за откъ�и лип�ва, файлът за гра̀фа може да е непълен"
-
-#: commit-graph.c:240
+#: commit-graph.c:386
 #, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "неправилно отме�тване на откъ�: %08x%08x"
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "файлът � гра̀фа на подавани�та е твърде малък, за да �ъдържа %u откъ�и"
 
-#: commit-graph.c:283
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "откъ�ът %08x �е �в�ва многократно"
-
-#: commit-graph.c:347
+#: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
 msgstr "базови�т откъ� лип�ва в гра̀фа � подавани�та"
 
-#: commit-graph.c:357
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr "веригата на гра̀фа � подавани�та не �ъвпада"
 
-#: commit-graph.c:404
+#: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr ""
 "грешка във веригата на гра̀фа � подавани�та: ред „%s“ не е контролна �ума"
 
-#: commit-graph.c:430
+#: commit-graph.c:564
 msgid "unable to find all commit-graph files"
-msgstr "н�кои файлове на гра̀фа � подавани�та не могат да бъдат открити"
+msgstr "н�кои файлове на гра̀фа � подавани�та не може да бъдат открити"
 
-#: commit-graph.c:561 commit-graph.c:621
+#: commit-graph.c:745 commit-graph.c:782
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "неправилна позици� на подаването.  Веро�тно графът � подавани�та е повреден"
 
-#: commit-graph.c:582
+#: commit-graph.c:766
 #, c-format
 msgid "could not find commit %s"
 msgstr "подаването „%s“ не може да бъде открито"
 
-#: commit-graph.c:855 builtin/am.c:1287
+#: 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 "подаването не може да бъде анализирано: %s"
 
-#: commit-graph.c:859
-#, c-format
-msgid "unable to get tree for %s"
-msgstr "дървото на „%s“ не може да бъде получено"
-
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "видът на обекта „%s“ не може да бъде определен"
 
-#: commit-graph.c:1049
+#: commit-graph.c:1368
 msgid "Loading known commits in commit graph"
 msgstr "Зареждане на познатите подавани� в гра̀фа � подавани�та"
 
-#: commit-graph.c:1066
+#: commit-graph.c:1385
 msgid "Expanding reachable commits in commit graph"
 msgstr "Разшир�ване на до�тижимите подавани� в гра̀фа"
 
-#: commit-graph.c:1085
+#: commit-graph.c:1405
 msgid "Clearing commit marks in commit graph"
 msgstr "Изчи�тване на отбел�звани�та на подавани�та в гра̀фа � подавани�та"
 
-#: commit-graph.c:1104
+#: 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:1179
+#: commit-graph.c:1558
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Изчи�л�ване на филтрите на Блум на пътищата � пром�на при подаването"
+
+#: commit-graph.c:1635
+msgid "Collecting referenced commits"
+msgstr "Събиране на �вързаните подавани�"
+
+#: 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] "Откриване на подавани�та в гра̀фа в %d пакетен файл"
 msgstr[1] "Откриване на подавани�та в гра̀фа в %d пакетни файла"
 
-#: commit-graph.c:1192
+#: commit-graph.c:1673
 #, c-format
 msgid "error adding pack %s"
 msgstr "грешка при добав�не на пакетен файл „%s“"
 
-#: commit-graph.c:1196
+#: commit-graph.c:1677
 #, c-format
 msgid "error opening index for %s"
 msgstr "грешка при отвар�не на индек�а на „%s“"
 
-#: commit-graph.c:1220
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Откриване на подавани�та в гра̀фа измежду %d указател"
-msgstr[1] "Откриване на подавани�та в гра̀фа измежду %d указатели"
-
-#: commit-graph.c:1240
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "неправилен идентификатор на обект-подаване: „%s“"
-
-#: commit-graph.c:1255
+#: commit-graph.c:1714
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Откриване на подавани�та в гра̀фа измежду пакетираните обекти"
 
-#: commit-graph.c:1270
-msgid "Counting distinct commits in commit graph"
-msgstr "Пребро�ване на различните подавани� в гра̀фа"
-
-#: commit-graph.c:1300
+#: commit-graph.c:1732
 msgid "Finding extra edges in commit graph"
 msgstr "Откриване на още върхове в гра̀фа � подавани�та"
 
-#: commit-graph.c:1346
+#: commit-graph.c:1781
 msgid "failed to write correct number of base graph ids"
 msgstr "правилни�т брой на базовите идентификатори не може да �е запише"
 
-#: commit-graph.c:1379 midx.c:810
+#: commit-graph.c:1812 midx.c:911
 #, c-format
 msgid "unable to create leading directories of %s"
-msgstr "родител�ките директории на „%s“ не могат да бъдат �ъздадени"
+msgstr "родител�ките директории на „%s“ не може да бъдат �ъздадени"
 
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr "не може да бъде �ъздаден временен �лой за гра̀фа � подавани�та"
+
+#: commit-graph.c:1830
 #, c-format
-msgid "unable to create '%s'"
-msgstr "пакетни�т файл „%s“ не може да бъде �ъздаден"
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "правата за �поделен до�тъп до „%s“ не може да бъдат зададени"
 
-#: commit-graph.c:1451
+#: 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] "Запазване на гра̀фа � подавани�та в %d па�"
 msgstr[1] "Запазване на гра̀фа � подавани�та в %d па�а"
 
-#: commit-graph.c:1492
+#: commit-graph.c:1923
 msgid "unable to open commit-graph chain file"
 msgstr "файлът � веригата на гра̀фа � подавани�та не може да �е отвори"
 
-#: commit-graph.c:1504
+#: commit-graph.c:1939
 msgid "failed to rename base commit-graph file"
 msgstr "о�новни�т файл на гра̀фа � подавани�та не може да бъде преименуван"
 
-#: commit-graph.c:1524
+#: commit-graph.c:1959
 msgid "failed to rename temporary commit-graph file"
 msgstr "временни�т файл на гра̀фа � подавани�та не може да бъде преименуван"
 
-#: commit-graph.c:1635
+#: commit-graph.c:2092
 msgid "Scanning merged commits"
 msgstr "Тър�ене на подавани�та �ъ� �ливани�"
 
-#: commit-graph.c:1646
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "неочакван, повтар�щ �е идентификатор на подаване: %s"
-
-#: commit-graph.c:1670
+#: commit-graph.c:2136
 msgid "Merging commit-graph"
 msgstr "Сливане на гра̀фа � подавани�та"
 
-#: commit-graph.c:1860
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "форматът на гра̀фа � подавани�та не може да запише %d подавани�"
+#: commit-graph.c:2244
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"опит за запи� на гра̀фа � подавани�та, но на�тройката „core.commitGraph“ е "
+"изключена"
 
-#: commit-graph.c:1871
+#: commit-graph.c:2351
 msgid "too many commits to write graph"
 msgstr "прекалено много подавани� за запи�ване на гра̀фа"
 
-#: commit-graph.c:1961
+#: commit-graph.c:2449
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "графът � подавани�та е � грешна �ума за проверка — веро�тно е повреден"
 
-#: commit-graph.c:1971
+#: commit-graph.c:2459
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 "неправилна подредба на обектите по идентификатор в гра̀фа � подавани�та: „%s“ "
 "е преди „%s“, а не тр�бва"
 
-#: commit-graph.c:1981 commit-graph.c:1996
+#: commit-graph.c:2469 commit-graph.c:2484
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "неправилна �тойно�т за откъ� в гра̀фа � подавани�та: fanout[%d] = %u, а "
 "тр�бва да е %u"
 
-#: commit-graph.c:1988
+#: commit-graph.c:2476
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "подаване „%s“ в гра̀фа � подавани�та не може да �е анализира"
 
-#: commit-graph.c:2006
+#: commit-graph.c:2494
 msgid "Verifying commits in commit graph"
 msgstr "Проверка на подавани�та в гра̀фа"
 
-#: commit-graph.c:2020
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "подаване „%s“ в базата от данни към гра̀фа � подавани�та не може да �е "
 "анализира"
 
-#: commit-graph.c:2027
+#: commit-graph.c:2516
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "идентификаторът на обект за кореновото дърво за подаване „%s“ в гра̀фа � "
 "подавани�та е „%s“, а тр�бва да е „%s“"
 
-#: commit-graph.c:2037
+#: commit-graph.c:2526
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "�пи�ъкът � родители на „%s“ в гра̀фа � подавани�та е прекалено дълъг"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2535
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "родител�т на „%s“ в гра̀фа � подавани�та е „%s“, а тр�бва да е „%s“"
 
-#: commit-graph.c:2059
+#: commit-graph.c:2549
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "�пи�ъкът � родители на „%s“ в гра̀фа � подавани�та е прекалено къ�"
 
-#: commit-graph.c:2064
+#: commit-graph.c:2554
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1833,7 +2586,7 @@ msgstr ""
 "номерът на поколението на подаване „%s“ в гра̀фа � подавани�та е 0, а другаде "
 "не е"
 
-#: commit-graph.c:2068
+#: commit-graph.c:2558
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1841,25 +2594,91 @@ msgstr ""
 "номерът на поколението на подаване „%s“ в гра̀фа � подавани�та не е 0, а "
 "другаде е"
 
-#: commit-graph.c:2083
+#: 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 ""
-"номерът на поколението на подаване „%s“ в гра̀фа � подавани�та е %u, а "
-"другаде е %u"
+"номерът на поколението на подаване „%s“ в гра̀фа � подавани�та е %<PRIuMAX> < "
+"%<PRIuMAX>"
 
-#: commit-graph.c:2089
+#: commit-graph.c:2581
 #, 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: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 "„%s“ не може да �е анализира"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s не е подаване!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Поддръжката на „<GIT_DIR>/info/grafts“ е о�тар�ла.\n"
+"В бъдеща вер�и� на Git ще бъде премахната.\n"
+"\n"
+"Може да преобразувате при�адките в заме�тващи\n"
+"указатели � командата:\n"
+"\n"
+"    git replace --convert-graft-file\n"
+"\n"
+"За да изключите това �ъобщение, изпълнете:\n"
+"\n"
+"    git config advice.graftFileDeprecated false"
+
+#: commit.c:1237
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+"Подаването „%s“ е � недоверен подпи� от GPG, който твърди, че е на „%s“."
+
+#: commit.c:1241
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+"Подаването „%s“ е � неправилен подпи� от GPG, който твърди, че е на „%s“."
+
+#: commit.c:1244
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Подаването „%s“ е без подпи� от GPG."
+
+#: commit.c:1247
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Подаването „%s“ е � коректен подпи� от GPG на „%s“.\n"
+
+#: 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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"ПРЕДУПРЕЖДЕ�ИЕ: �ъобщението при подаване не е кодирано � UTF-8.\n"
+"Може да поправите подаването заедно �ъ� �ъобщението или може да\n"
+"зададете ползваното кодиране в на�тройката „i18n.commitencoding“.\n"
+
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "паметта �върши"
 
-#: config.c:124
+#: config.c:126
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1874,162 +2693,206 @@ msgstr ""
 "    %s\n"
 "Това може да �е дължи на зацикл�не при вмъкването."
 
-#: config.c:140
+#: config.c:142
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "път�т за вмъкване „%s“не може да бъде разширен"
 
-#: config.c:151
+#: config.c:153
 msgid "relative config includes must come from files"
 msgstr "отно�ителните вмъквани� на конфигурации тр�бва да идват от файлове"
 
-#: config.c:197
+#: config.c:199
 msgid "relative config include conditionals must come from files"
 msgstr "отно�ителните у�ловни изрази за вмъкване тр�бва да идват от файлове"
 
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "неправилен формат на на�тройка: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "лип�ва име на променлива на �редата за на�тройката „%.*s“"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "лип�ва променлива на �редата „%s“ за на�тройката „%.*s“"
+
+#: config.c:442
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "ключът не �ъдържа раздел: „%s“"
 
-#: config.c:382
+#: config.c:448
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "ключът не �ъдържа име на променлива: „%s“"
 
-#: config.c:406 sequencer.c:2401
+#: config.c:472 sequencer.c:2785
 #, c-format
 msgid "invalid key: %s"
 msgstr "неправилен ключ: „%s“"
 
-#: config.c:412
+#: config.c:478
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "неправилен ключ (нов ред): „%s“"
 
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "празен ключ за на�тройка"
+
+#: config.c:529 config.c:541
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "неправилен конфигурационен параметър: „%s“"
 
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
 #, c-format
 msgid "bogus format in %s"
 msgstr "неправилен формат в „%s“"
 
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "неправилен брой в „%s“"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "прекалено много запи�и в „%s“"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "ключът за на�тройка „%s“ лип�ва"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "�тойно�тта за на�тройка „%s“ лип�ва"
+
+#: config.c:995
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "неправилен ред за на�тройки %d в BLOB „%s“"
 
-#: config.c:825
+#: config.c:999
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "неправилен ред за на�тройки %d във файла „%s“"
 
-#: config.c:829
+#: config.c:1003
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "неправилен ред за на�тройки %d на �тандартни� вход"
 
-#: config.c:833
+#: config.c:1007
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "неправилен ред за на�тройки %d в BLOB за подмодул „%s“"
 
-#: config.c:837
+#: config.c:1011
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "неправилен ред за на�тройки %d на командни� ред „%s“"
 
-#: config.c:841
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "неправилен ред за на�тройки %d в „%s“"
 
-#: config.c:978
+#: config.c:1152
 msgid "out of range"
 msgstr "извън диапазона"
 
-#: config.c:978
+#: config.c:1152
 msgid "invalid unit"
 msgstr "неправилна мерна единица"
 
-#: config.c:979
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“: %s"
 
-#: config.c:998
+#: config.c:1163
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ в BLOB „%s“: %s"
 
-#: config.c:1001
+#: config.c:1166
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ във файла „%s“: %s"
 
-#: config.c:1004
+#: config.c:1169
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ на �тандартни� вход: %s"
 
-#: config.c:1007
+#: config.c:1172
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ в BLOB от подмодул „%s“: %s"
 
-#: config.c:1010
+#: config.c:1175
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ на командни� ред „%s“: %s"
 
-#: config.c:1013
+#: config.c:1178
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "неправилна чи�лова �тойно�т „%s“ за „%s“ в %s: %s"
 
-#: config.c:1108
+#: config.c:1257
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "неправилна булева �тойно�т „%s“ за „%s“"
+
+#: config.c:1275
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "домашната папка на потребител� не може да бъде открита: „%s“"
 
-#: config.c:1117
+#: config.c:1284
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "„%s“ не е правилна �тойно�т за време за „%s“"
 
-#: config.c:1208
+#: config.c:1377
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "дължината на �ъкращаване е извън интервала ([4; 40]): %d"
 
-#: config.c:1222 config.c:1233
+#: config.c:1391 config.c:1402
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "неправилно ниво на компре�иране: %d"
 
-#: config.c:1325
+#: config.c:1494
 msgid "core.commentChar should only be one character"
 msgstr "на�тройката „core.commentChar“ тр�бва да е �амо един знак"
 
-#: config.c:1358
+#: config.c:1527
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "неправилен режим за �ъздаването на обекти: %s"
 
-#: config.c:1425
+#: config.c:1599
 #, c-format
 msgid "malformed value for %s"
 msgstr "неправилна �тойно�т за „%s“"
 
-#: config.c:1451
+#: config.c:1625
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "неправилна �тойно�т за „%s“: „%s“"
 
-#: config.c:1452
+#: config.c:1626
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 "тр�бва да е една от �ледните �тойно�ти: „nothing“ (без изтла�кване при лип�а "
@@ -2037,132 +2900,132 @@ msgstr ""
 "„simple“ (клонът �ъ� �ъщото име, от който �е издърпва), „upstream“ (клонът, "
 "от който �е издърпва) или „current“ (клонът �ъ� �ъщото име)"
 
-#: config.c:1513 builtin/pack-objects.c:3394
+#: config.c:1687 builtin/pack-objects.c:4084
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "неправилно ниво на компре�иране при пакетиране: %d"
 
-#: config.c:1634
+#: config.c:1809
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "обектът-BLOB „%s“ � конфигурации не може да �е зареди"
 
-#: config.c:1637
+#: config.c:1812
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "указател�т „%s“ не �очи към обект-BLOB"
 
-#: config.c:1654
+#: config.c:1829
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "обектът-BLOB „%s“ � конфигурации не може да бъде открит"
 
-#: config.c:1684
+#: config.c:1874
 #, c-format
 msgid "failed to parse %s"
 msgstr "„%s“ не може да бъде анализиран"
 
-#: config.c:1740
+#: config.c:1930
 msgid "unable to parse command-line config"
 msgstr "неправилни на�тройки от командни� ред"
 
-#: config.c:2091
+#: config.c:2294
 msgid "unknown error occurred while reading the configuration files"
 msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
 
-#: config.c:2261
+#: config.c:2468
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "�еправилен %s: „%s“"
 
-#: config.c:2306
+#: config.c:2513
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "�тойно�тта на „splitIndex.maxPercentChange“ тр�бва да е между 1 и 100, а не "
 "%d"
 
-#: config.c:2352
+#: config.c:2559
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "неразпозната �тойно�т „%s“ от командни� ред"
 
-#: config.c:2354
+#: config.c:2561
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "неправилна на�тройка „%s“ във файла „%s“ на ред №%d"
 
-#: config.c:2435
+#: config.c:2645
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "неправилно име на раздел: „%s“"
 
-#: config.c:2467
+#: config.c:2677
 #, c-format
 msgid "%s has multiple values"
 msgstr "зададени �а н�колко �тойно�ти за „%s“"
 
-#: config.c:2496
+#: config.c:2706
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "нови�т конфигурационен файл „%s“ не може да бъде запазен"
 
-#: config.c:2748 config.c:3072
+#: config.c:2958 config.c:3285
 #, c-format
 msgid "could not lock config file %s"
 msgstr "конфигурационни�т файл „%s“ не може да бъде заключен"
 
-#: config.c:2759
+#: config.c:2969
 #, c-format
 msgid "opening %s"
 msgstr "отвар�не на „%s“"
 
-#: config.c:2794 builtin/config.c:328
+#: config.c:3006 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "неправилен шаблон: %s"
 
-#: config.c:2819
+#: config.c:3031
 #, c-format
 msgid "invalid config file %s"
 msgstr "неправилен конфигурационен файл: „%s“"
 
-#: config.c:2832 config.c:3085
+#: config.c:3044 config.c:3298
 #, c-format
 msgid "fstat on %s failed"
 msgstr "неу�пешно изпълнение на „fstat“ върху „%s“"
 
-#: config.c:2843
+#: config.c:3055
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "неу�пешно изпълнение на „mmap“ върху „%s“"
+msgid "unable to mmap '%s'%s"
+msgstr "неу�пешно изпълнение на „mmap“ върху „%s“%s"
 
-#: config.c:2852 config.c:3090
+#: config.c:3065 config.c:3303
 #, c-format
 msgid "chmod on %s failed"
 msgstr "неу�пешна �м�на на права � „chmod“ върху „%s“"
 
-#: config.c:2937 config.c:3187
+#: config.c:3150 config.c:3400
 #, c-format
 msgid "could not write config file %s"
 msgstr "конфигурационни�т файл „%s“ не може да бъде запи�ан"
 
-#: config.c:2971
+#: config.c:3184
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "„%s“ не може да �е зададе да е „%s“"
 
-#: config.c:2973 builtin/remote.c:782
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr "„%s“ не може да �е премахне"
 
-#: config.c:3063
+#: config.c:3276
 #, c-format
 msgid "invalid section name: %s"
 msgstr "неправилно име на раздел: %s"
 
-#: config.c:3230
+#: config.c:3443
 #, c-format
 msgid "missing value for '%s'"
 msgstr "лип�ва �тойно�т за „%s“"
@@ -2188,73 +3051,82 @@ msgstr ""
 msgid "server doesn't support '%s'"
 msgstr "�ървърът не поддържа „%s“"
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "�ървърът не поддържа „%s“"
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
 msgstr ""
 "�лед първоначалната об�ва на възможно�тите �е очаква изчи�тване на буферите"
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "пропу�кане на възможно�тите �лед първи� ред „%s“"
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "протоколна грешка: неочаквани възможно�ти^{}"
 
-#: connect.c:273
+#: connect.c:306
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "протоколна грешка: очаква �е SHA1 на плитък обект, а бе получено: „%s“"
 
-#: connect.c:275
+#: connect.c:308
 msgid "repository on the other end cannot be shallow"
 msgstr "от�рещното хранилище не може да е плитко"
 
-#: connect.c:313
+#: connect.c:347
 msgid "invalid packet"
 msgstr "неправилен пакет"
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "протоколна грешка: неочаквано „%s“"
 
-#: connect.c:441
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "�ървърът указа непознат формат на обект: „%s“"
+
+#: connect.c:526
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "неправилен отговор на „ls-refs“: „%s“"
 
-#: connect.c:445
+#: connect.c:530
 msgid "expected flush after ref listing"
-msgstr "очакваше �е изчи�тване на буферите �лед избро�ването на указателите"
+msgstr "�лед избро�ването на указателите �е очаква изчи�тване на буферите"
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "�лед избро�ването на указателите �е очаква пакет за край"
 
-#: connect.c:544
+#: connect.c:666
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "протокол „%s“ не �е поддържа"
 
-#: connect.c:595
+#: connect.c:717
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "неу�пешно задаване на „SO_KEEPALIVE“ на гнездо"
 
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Тър�ене на „%s“… "
 
-#: connect.c:639
+#: connect.c:761
 #, 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:643 connect.c:714
+#: connect.c:765 connect.c:836
 #, c-format
 msgid ""
 "done.\n"
@@ -2263,7 +3135,7 @@ msgstr ""
 "готово.\n"
 "Свързване към „%s“ (порт %s)…"
 
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2273,91 +3145,97 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
 msgid "done."
 msgstr "дей�твието завърши."
 
-#: connect.c:702
+#: connect.c:824
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "„%s“ не може да �е открие (%s)"
 
-#: connect.c:708
+#: connect.c:830
 #, c-format
 msgid "unknown port %s"
 msgstr "непознат порт „%s“"
 
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "необичайното име на хо�т „%s“ е блокирано"
 
-#: connect.c:847
+#: connect.c:969
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "необичайни�т порт „%s“ е блокиран"
 
-#: connect.c:857
+#: connect.c:979
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "по�редникът „%s“ не може да �е �тартира"
 
-#: connect.c:928
+#: connect.c:1050
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "не е указан път. Проверете �интак�и�а � командата:\n"
 "\n"
 "    git help pull"
 
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
+"знакът за нов ред не е позволен в адре�ите и в пътищата до хранилищата "
+"„git://“"
+
+#: connect.c:1247
 msgid "ssh variant 'simple' does not support -4"
 msgstr "вариантът за „ssh“ — „simple“ (опро�тен), не поддържа опци�та „-4“"
 
-#: connect.c:1135
+#: connect.c:1259
 msgid "ssh variant 'simple' does not support -6"
 msgstr "вариантът за „ssh“ — „simple“ (опро�тен), не поддържа опци�та „-6“"
 
-#: connect.c:1152
+#: connect.c:1276
 msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 "вариантът за „ssh“ — „simple“ (опро�тен), не поддържа задаването на порт"
 
-#: connect.c:1264
+#: connect.c:1388
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "необичайни�т път „%s“ е блокиран"
 
-#: connect.c:1311
+#: connect.c:1436
 msgid "unable to fork"
 msgstr "неу�пешно �ъздаване на проце�"
 
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "Проверка на �вързано�тта"
 
-#: connected.c:100
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
 msgstr "Командата „git rev-list“ не може да бъде изпълнена."
 
-#: connected.c:120
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr "неу�пешен запи� на �пи�ъка � вер�иите"
 
-#: connected.c:127
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "�тандартни�т вход на �пи�ъка � вер�иите не може да бъде затворен"
 
-#: convert.c:194
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "неправилно дей�твие за край на ред: %d"
 
-#: convert.c:207
+#: convert.c:196
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "В��ка по�ледователно�т от знаци „CRLF“ ще бъдe заменена � „LF“ в „%s“."
 
-#: convert.c:209
+#: convert.c:198
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2367,13 +3245,13 @@ msgstr ""
 "Файлът ще о�тане � първоначалните знаци за край на ред в работната ви "
 "директори�."
 
-#: convert.c:217
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr ""
 "В�еки знак „LF“ ще бъдe заменен � по�ледователно�тта от знаци „CRLF“ в „%s“."
 
-#: convert.c:219
+#: convert.c:208
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2384,30 +3262,30 @@ msgstr ""
 "Файлът ще о�тане � първоначалните знаци за край на ред в работната ви "
 "директори�."
 
-#: convert.c:280
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr ""
 "„%s“ не тр�бва да �ъдържа маркер за поредно�тта на байтовете (BOM) при "
 "кодиране „%s“"
 
-#: convert.c:287
+#: convert.c:280
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
 "Файлът „%s“ �ъдържа маркер за поредно�тта на байтовете (BOM).  Използвайте "
-"„UTF-%s“ като кодиране за работното дърво."
+"„UTF-%.*s“ като кодиране за работното дърво."
 
-#: convert.c:305
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr ""
 "„%s“ тр�бва да �ъдържа маркер за поредно�тта на байтовете (BOM) при кодиране "
 "„%s“"
 
-#: convert.c:307
+#: convert.c:295
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2417,50 +3295,50 @@ msgstr ""
 "на работното дърво използвайте UTF-%sBE или UTF-%sLE (в зави�имо�т от "
 "поредно�тта на байтовете)."
 
-#: convert.c:425 convert.c:496
+#: convert.c:408 convert.c:479
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "неу�пешно прекодиране на „%s“ от „%s“ към „%s“"
 
-#: convert.c:468
+#: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "Прекодирането на „%s“ от „%s“ към „%s“ и обратно промен� файла"
 
-#: convert.c:674
+#: convert.c:654
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "неу�пешно �ъздаване на проце� за външен филтър „%s“"
 
-#: convert.c:694
+#: convert.c:674
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "входът не може да бъде подаден на външни� филтър „%s“"
 
-#: convert.c:701
+#: convert.c:681
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "неу�пешно изпълнение на външни� филтър „%s“: %d"
 
-#: convert.c:736 convert.c:739
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "неу�пешно четене от външни� филтър „%s“"
 
-#: convert.c:742 convert.c:797
+#: convert.c:722 convert.c:777
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "неу�пешно изпълнение на външни� филтър „%s“"
 
-#: convert.c:845
+#: convert.c:826
 msgid "unexpected filter type"
 msgstr "неочакван вид филтър"
 
-#: convert.c:856
+#: convert.c:837
 msgid "path name too long for external filter"
 msgstr "път�т е прекалено дълъг за външен филтър"
 
-#: convert.c:930
+#: convert.c:934
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2469,20 +3347,49 @@ msgstr ""
 "външни�т филтър „%s“ вече не е наличен, въпреки че не в�ички пътища �а "
 "филтрирани"
 
-#: convert.c:1229
+#: convert.c:1234
 msgid "true/false are no valid working-tree-encodings"
-msgstr "„true“/„false“ не може да �а кодирани� на работното дърво"
+msgstr ""
+"„true“/„false“ (и�тина/лъжа̀) не може да �а кодирани� на работното дърво"
 
-#: convert.c:1417 convert.c:1451
+#: convert.c:1414 convert.c:1447
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: неу�пешно изпълнение на декодиращ филтър „%s“"
 
-#: convert.c:1495
+#: convert.c:1490
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: неу�пешно изпълнение на кодиращ филтър „%s“"
 
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "пре�качане на тър�енето на идентификаци� �поред ключа: „credential.%s“"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "адре�ът тр�бва задължително да �ъдържа хо�т"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr "адре�ът тр�бва задължително да �ъдържа протокол"
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "адре�ът �ъдържа нов ред в ча�тта за %s: %s"
+
+#: credential.c:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "адре�ът е без �хема: %s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "адре�ът за идентификаци� не може да �е анализира: „%s“"
+
 #: date.c:138
 msgid "in the future"
 msgstr "в бъдещето"
@@ -2577,20 +3484,36 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr "Отбел�зани �а %d групи, работата приключи.\n"
 
-#: diffcore-order.c:24
+#: diff-merges.c:70
 #, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "файлът � подредбата на �ъответ�тви�та „%s“ не може да бъде прочетен"
+msgid "unknown value for --diff-merges: %s"
+msgstr "непозната �тойно�т за опци�та „--diff-merges“: „%s“"
 
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Тър�ене на преименувани� на обекти �ъчетани � промени"
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
+msgstr "опци�та „--merge-base“ не работи � диапазони"
 
-#: diff-no-index.c:238
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr "опци�та „--merge-base“ работи �амо � подавани�"
+
+#: diff-lib.c:576
+msgid "unable to get HEAD"
+msgstr "Указател�т „HEAD“ не може да бъде получен"
+
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr "лип�ва база за �ливане"
+
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr "много бази за �ливане"
+
+#: 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"
@@ -2598,19 +3521,19 @@ msgstr ""
 "�е е хранилище на git.  Ползвайте опци�та „--no-index“, за да �равните "
 "пътища извън работно дърво"
 
-#: diff.c:155
+#: diff.c:156
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  �еу�пешно разпознаване на „%s“ като процент-праг за �тати�тиката по "
 "директории\n"
 
-#: diff.c:160
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  �епознат параметър „%s“ за �тати�тиката по директории'\n"
 
-#: diff.c:296
+#: diff.c:297
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -2619,7 +3542,7 @@ msgstr ""
 "„default“ (�тандартно), „blocks“ (парчета), „zebra“ (райе), "
 "„dimmed_zebra“ (тъмно райе), „plain“ (обикновено)"
 
-#: diff.c:324
+#: diff.c:325
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -2632,7 +3555,7 @@ msgstr ""
 "„allow-indentation-change“ (позвол�ване на промените в празните знаци за "
 "форматиране)"
 
-#: diff.c:332
+#: diff.c:333
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -2640,12 +3563,12 @@ msgstr ""
 "„color-moved-ws“: „allow-indentation-change“ е не�ъвме�тима � другите режими "
 "за празни знаци"
 
-#: diff.c:405
+#: diff.c:410
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�епозната �тойно�т „%s“ за на�тройката „diff.submodule“"
 
-#: diff.c:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -2654,38 +3577,53 @@ msgstr ""
 "Грешки в на�тройката „diff.dirstat“:\n"
 "%s"
 
-#: diff.c:4218
+#: diff.c:4282
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 "външната програма за разлики завърши неу�пешно.  Спиране на работата при „%s“"
 
-#: diff.c:4563
+#: diff.c:4634
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
-"Опциите „--name-only“, „--name-status“, „--check“ и „-s“ �а не�ъвме�тими "
+"опциите „--name-only“, „--name-status“, „--check“ и „-s“ �а не�ъвме�тими "
 "една � друга"
 
-#: diff.c:4566
+#: diff.c:4637
 msgid "-G, -S and --find-object are mutually exclusive"
-msgstr "Опциите „-G“, „-S“ и „--find-object“ �а не�ъвме�тими една � друга"
+msgstr "опциите „-G“, „-S“ и „--find-object“ �а не�ъвме�тими една � друга"
+
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+"опциите „-G“ и „--pickaxe-regex“ �а не�ъвме�тими една � друга.  Пробвайте „--"
+"pickaxe-regex“ �ъ� „-S“"
+
+#: diff.c:4643
+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“"
 
-#: diff.c:4644
+#: diff.c:4722
 msgid "--follow requires exactly one pathspec"
-msgstr "Опци�та „--follow“ изи�ква точно един път"
+msgstr "опци�та „--follow“ изи�ква точно един път"
 
-#: diff.c:4692
+#: diff.c:4770
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "неправилна �тойно�т за „--stat“: %s"
 
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
-#: parse-options.c:199 parse-options.c:203
+#: 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
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "опци�та „%s“ очаква чи�ло за аргумент"
 
-#: diff.c:4729
+#: diff.c:4807
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2694,44 +3632,44 @@ msgstr ""
 "�еразпознат параметър към опци�та „--dirstat/-X“:\n"
 "%s"
 
-#: diff.c:4814
+#: diff.c:4892
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "непознат вид пром�на: „%c“ в „--diff-filter=%s“"
 
-#: diff.c:4838
+#: diff.c:4916
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "непозната �тойно�т �лед „ws-error-highlight=%.*s“"
 
-#: diff.c:4852
+#: diff.c:4930
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "„%s“ не може да �е открие"
 
-#: diff.c:4902 diff.c:4908
+#: diff.c:4980 diff.c:4986
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 "опци�та „%s“ изи�ква �тойно�ти за МИ�ИМ�ЛЕ�_%%_ПРОМЯ��_З�_ИЗТОЧ�ИК_/"
 "М�КСИМ�ЛЕ�_%%_ПРОМЯ��_З�_З�МЯ�� от"
 
-#: diff.c:4920
+#: diff.c:4998
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "опци�та „%s“ изи�ква знак, а не: „%s“"
 
-#: diff.c:4941
+#: diff.c:5019
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "неправилен аргумент за „--color-moved“: „%s“"
 
-#: diff.c:4960
+#: diff.c:5038
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "неправилен режим „%s“ за „ --color-moved-ws“"
 
-#: diff.c:5000
+#: diff.c:5078
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2740,153 +3678,158 @@ msgstr ""
 "Майер�), „minimal“ (минимизиране на разликите), „patience“ (па�иан�) и "
 "„histogram“ (хи�тограмен)"
 
-#: diff.c:5036 diff.c:5056
+#: diff.c:5114 diff.c:5134
 #, c-format
 msgid "invalid argument to %s"
 msgstr "неправилен аргумент към „%s“"
 
-#: diff.c:5194
+#: diff.c:5238
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "неправилен регул�рен израз подаден към „-I“: „%s“"
+
+#: diff.c:5287
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "неразпознат параметър към опци�та „--submodule“: „%s“"
 
-#: diff.c:5250
+#: diff.c:5343
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "неправилен аргумент към „--word-diff“: „%s“"
 
-#: diff.c:5273
+#: diff.c:5379
 msgid "Diff output format options"
 msgstr "Формат на изхода за разликите"
 
-#: diff.c:5275 diff.c:5281
+#: diff.c:5381 diff.c:5387
 msgid "generate patch"
 msgstr "�ъздаване на кръпки"
 
-#: diff.c:5278 builtin/log.c:172
+#: diff.c:5384 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "без извеждане на разликите"
 
-#: diff.c:5283 diff.c:5397 diff.c:5404
+#: diff.c:5389 diff.c:5503 diff.c:5510
 msgid "<n>"
 msgstr "БРОЙ"
 
-#: diff.c:5284 diff.c:5287
+#: diff.c:5390 diff.c:5393
 msgid "generate diffs with <n> lines context"
 msgstr "файловете � разлики да �а � контек�т � такъв БРОЙ редове"
 
-#: diff.c:5289
+#: diff.c:5395
 msgid "generate the diff in raw format"
 msgstr "файловете � разлики да �а в �уров формат"
 
-#: diff.c:5292
+#: diff.c:5398
 msgid "synonym for '-p --raw'"
 msgstr "п�евдоним на „-p --stat“"
 
-#: diff.c:5296
+#: diff.c:5402
 msgid "synonym for '-p --stat'"
 msgstr "п�евдоним на „-p --stat“"
 
-#: diff.c:5300
+#: diff.c:5406
 msgid "machine friendly --stat"
 msgstr "„--stat“ във формат за четене от програма"
 
-#: diff.c:5303
+#: diff.c:5409
 msgid "output only the last line of --stat"
 msgstr "извеждане �амо на по�ледни� ред на „--stat“"
 
-#: diff.c:5305 diff.c:5313
+#: diff.c:5411 diff.c:5419
 msgid "<param1,param2>..."
 msgstr "П�Р�МЕТЪР_1, П�Р�МЕТЪР_2, …"
 
-#: diff.c:5306
+#: diff.c:5412
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "извеждане на разпределението на промените за в��ка поддиректори�"
 
-#: diff.c:5310
+#: diff.c:5416
 msgid "synonym for --dirstat=cumulative"
 msgstr "п�евдоним на „--dirstat=cumulative“"
 
-#: diff.c:5314
+#: diff.c:5420
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "п�евдоним на „--dirstat=Ф�ЙЛОВЕ,П�Р�МЕТЪР_1,П�Р�МЕТЪР_2,…“"
 
-#: diff.c:5318
+#: diff.c:5424
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "предупреждаване, ако промените вод�т до маркери за конфликт или грешки в "
 "празните знаци"
 
-#: diff.c:5321
+#: diff.c:5427
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "�ъкратено резюме на �ъздадените, преименуваните и файловете � пром�на на "
 "режима на до�тъп"
 
-#: diff.c:5324
+#: diff.c:5430
 msgid "show only names of changed files"
 msgstr "извеждане �амо на имената на променените файлове"
 
-#: diff.c:5327
+#: diff.c:5433
 msgid "show only names and status of changed files"
 msgstr "извеждане �амо на имената и �тати�тиката за променените файлове"
 
-#: diff.c:5329
+#: diff.c:5435
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "ШИРОЧИ��[,ИМЕ-ШИРОЧИ��[,БРОЙ]]"
 
-#: diff.c:5330
+#: diff.c:5436
 msgid "generate diffstat"
 msgstr "извеждане на �тати�тика за промените"
 
-#: diff.c:5332 diff.c:5335 diff.c:5338
+#: diff.c:5438 diff.c:5441 diff.c:5444
 msgid "<width>"
 msgstr "ШИРОЧИ��"
 
-#: diff.c:5333
+#: diff.c:5439
 msgid "generate diffstat with a given width"
 msgstr "�тати�тика � такава ШИРОЧИ�� за промените"
 
-#: diff.c:5336
+#: diff.c:5442
 msgid "generate diffstat with a given name width"
 msgstr "�тати�тика за промените � такава ШИРОЧИ�� на имената"
 
-#: diff.c:5339
+#: diff.c:5445
 msgid "generate diffstat with a given graph width"
 msgstr "�тати�тика за промените � такава ШИРОЧИ�� на гра̀фа"
 
-#: diff.c:5341
+#: diff.c:5447
 msgid "<count>"
 msgstr "БРОЙ"
 
-#: diff.c:5342
+#: diff.c:5448
 msgid "generate diffstat with limited lines"
 msgstr "ограничаване на БРО� на редовете в �тати�тиката за промените"
 
-#: diff.c:5345
+#: diff.c:5451
 msgid "generate compact summary in diffstat"
 msgstr "кратко резюме в �тати�тиката за промените"
 
-#: diff.c:5348
+#: diff.c:5454
 msgid "output a binary diff that can be applied"
 msgstr "извеждане на двоична разлика във вид за прилагане"
 
-#: diff.c:5351
+#: diff.c:5457
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "показване на пълните имена на обекти в редовете за индек�а при вариантите "
 "преди и �лед пром�ната"
 
-#: diff.c:5353
+#: diff.c:5459
 msgid "show colored diff"
 msgstr "разлики в цв�т"
 
-#: diff.c:5354
+#: diff.c:5460
 msgid "<kind>"
 msgstr "ВИД"
 
-#: diff.c:5355
+#: diff.c:5461
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2894,7 +3837,7 @@ msgstr ""
 "грешките в празните знаци да �е указват в редовете за контек�та, вариантите "
 "преди и �лед разликата,"
 
-#: diff.c:5358
+#: diff.c:5464
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2902,257 +3845,261 @@ msgstr ""
 "без преименуване на пътищата.  Да �е използват нулеви байтове за разделители "
 "на полета в изхода при ползване на опци�та „--raw“ или „--numstat“"
 
-#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
 msgid "<prefix>"
 msgstr "ПРЕФИКС"
 
-#: diff.c:5362
+#: diff.c:5468
 msgid "show the given source prefix instead of \"a/\""
 msgstr "префик� вме�то „a/“ за източник"
 
-#: diff.c:5365
+#: diff.c:5471
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "префик� вме�то „b/“ за цел"
 
-#: diff.c:5368
+#: diff.c:5474
 msgid "prepend an additional prefix to every line of output"
 msgstr "добав�не на допълнителен префик� за в�еки ред на изхода"
 
-#: diff.c:5371
+#: diff.c:5477
 msgid "do not show any source or destination prefix"
 msgstr "без префик� за източника и целта"
 
-#: diff.c:5374
+#: diff.c:5480
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "извеждане на контек�т между по�ледователните парчета � разлики от указани� "
 "БРОЙ редове"
 
-#: diff.c:5378 diff.c:5383 diff.c:5388
+#: diff.c:5484 diff.c:5489 diff.c:5494
 msgid "<char>"
 msgstr "З��К"
 
-#: diff.c:5379
+#: diff.c:5485
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "знак вме�то „+“ за нов вариант на ред"
 
-#: diff.c:5384
+#: diff.c:5490
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "знак вме�то „-“ за �тар вариант на ред"
 
-#: diff.c:5389
+#: diff.c:5495
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "знак вме�то „ “ за контек�т"
 
-#: diff.c:5392
+#: diff.c:5498
 msgid "Diff rename options"
 msgstr "�а�тройки за разлики � преименуване"
 
-#: diff.c:5393
+#: diff.c:5499
 msgid "<n>[/<m>]"
 msgstr "МИ�ИМ�ЛЕ�_%_ПРОМЯ��_З�_ИЗТОЧ�ИК[/М�КСИМ�ЛE�_%_ПРОМЯ��_З�_З�МЯ��]"
 
-#: diff.c:5394
+#: diff.c:5500
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "заме�тване на пълните промени � по�ледователно�т от изтриване и �ъздаване"
 
-#: diff.c:5398
+#: diff.c:5504
 msgid "detect renames"
 msgstr "за�ичане на преименувани�та"
 
-#: diff.c:5402
+#: diff.c:5508
 msgid "omit the preimage for deletes"
 msgstr "без предварителен вариант при изтриване"
 
-#: diff.c:5405
+#: diff.c:5511
 msgid "detect copies"
 msgstr "за�ичане на копирани�та"
 
-#: diff.c:5409
+#: diff.c:5515
 msgid "use unmodified files as source to find copies"
 msgstr "тър�ене на копирано и от непроменените файлове"
 
-#: diff.c:5411
+#: diff.c:5517
 msgid "disable rename detection"
 msgstr "без тър�ене на преименувани�"
 
-#: diff.c:5414
+#: diff.c:5520
 msgid "use empty blobs as rename source"
 msgstr "празни обекти като източник при преименувани�"
 
-#: diff.c:5416
+#: diff.c:5522
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 "продължаване на извеждането на и�тори�та — без отр�зването при преименувани� "
 "на файл"
 
-#: diff.c:5419
+#: diff.c:5525
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 "без за�ичане на преименувани�/копирани�, ако бро�т им надвишава тази �тойно�т"
 
-#: diff.c:5421
+#: diff.c:5527
 msgid "Diff algorithm options"
 msgstr "Опции към алгоритъма за разлики"
 
-#: diff.c:5423
+#: diff.c:5529
 msgid "produce the smallest possible diff"
 msgstr "тър�ене на възможно най-малка разлика"
 
-#: diff.c:5426
+#: diff.c:5532
 msgid "ignore whitespace when comparing lines"
 msgstr "без промени в празните знаци при �равн�ване на редове"
 
-#: diff.c:5429
+#: diff.c:5535
 msgid "ignore changes in amount of whitespace"
 msgstr "без промени в празните знаци"
 
-#: diff.c:5432
+#: diff.c:5538
 msgid "ignore changes in whitespace at EOL"
 msgstr "без промени в празните знаци в кра� на редовете"
 
-#: diff.c:5435
+#: diff.c:5541
 msgid "ignore carrier-return at the end of line"
 msgstr "без промени в знаците за край на ред"
 
-#: diff.c:5438
+#: diff.c:5544
 msgid "ignore changes whose lines are all blank"
 msgstr "без промени в редовете, които �а изц�ло от празни знаци"
 
-#: diff.c:5441
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr "РЕГУЛЯРЕ�_ИЗР�З"
+
+#: diff.c:5547
+msgid "ignore changes whose all lines match <regex>"
+msgstr "без промени в редовете, които напа�ват РЕГУЛЯР�и�_ИЗР�З"
+
+#: diff.c:5550
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "еври�тика за преме�тване на границите на парчетата за уле�н�ване на четенето"
 
-#: diff.c:5444
+#: diff.c:5553
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "разлика чрез алгоритъм за подредба като па�иан�"
 
-#: diff.c:5448
+#: diff.c:5557
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "разлика по хи�тограмни� алгоритъм"
 
-#: diff.c:5450
+#: diff.c:5559
 msgid "<algorithm>"
 msgstr "�ЛГОРИТЪМ"
 
-#: diff.c:5451
+#: diff.c:5560
 msgid "choose a diff algorithm"
 msgstr "избор на �ЛГОРИТЪМа за разлики"
 
-#: diff.c:5453
+#: diff.c:5562
 msgid "<text>"
 msgstr "ТЕКСТ"
 
-#: diff.c:5454
+#: diff.c:5563
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "разлика чрез алгоритъма �ъ� закотв�не"
 
-#: diff.c:5456 diff.c:5465 diff.c:5468
+#: diff.c:5565 diff.c:5574 diff.c:5577
 msgid "<mode>"
 msgstr "РЕЖИМ"
 
-#: diff.c:5457
+#: diff.c:5566
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "разлика по думи, като �е ползва този РЕЖИМ за отдел�нето на променените думи"
 
-#: diff.c:5459 diff.c:5462 diff.c:5507
-msgid "<regex>"
-msgstr "РЕГУЛЯРЕ�_ИЗР�З"
-
-#: diff.c:5460
+#: diff.c:5569
 msgid "use <regex> to decide what a word is"
 msgstr "РЕГУЛЯРЕ�_ИЗР�З за раздел�не по думи"
 
-#: diff.c:5463
+#: diff.c:5572
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "п�евдоним на „--word-diff=color --word-diff-regex=РЕГУЛЯРЕ�_ИЗР�З“"
 
-#: diff.c:5466
+#: diff.c:5575
 msgid "moved lines of code are colored differently"
 msgstr "различен цв�т за извеждане на преме�тените редове"
 
-#: diff.c:5469
+#: diff.c:5578
 msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 "режим за пре�качането на празните знаци при задаването на „--color-moved“"
 
-#: diff.c:5472
+#: diff.c:5581
 msgid "Other diff options"
 msgstr "Други опции за разлики"
 
-#: diff.c:5474
+#: diff.c:5583
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "при изпълнение от поддиректори� да �е пренебрегват разликите извън не� и да "
 "�е ползват отно�ителни пътища"
 
-#: diff.c:5478
+#: diff.c:5587
 msgid "treat all files as text"
 msgstr "обработка на в�ички файлове като тек�тови"
 
-#: diff.c:5480
+#: diff.c:5589
 msgid "swap two inputs, reverse the diff"
 msgstr "разм�на на двата входа — обръщане на разликата"
 
-#: diff.c:5482
+#: diff.c:5591
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 "завършване � код за �ъ�то�ние 1 при наличието на разлики, а в противен "
 "�лучай — � 0"
 
-#: diff.c:5484
+#: diff.c:5593
 msgid "disable all output of the program"
 msgstr "без в��какъв изход от програмата"
 
-#: diff.c:5486
+#: diff.c:5595
 msgid "allow an external diff helper to be executed"
 msgstr "позвол�ване на изпълнение на външна помощна програма за разлики"
 
-#: diff.c:5488
+#: diff.c:5597
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "изпълнение на външни програми-филтри при �равнението на двоични файлове"
 
-#: diff.c:5490
+#: diff.c:5599
 msgid "<when>"
 msgstr "КОГ�"
 
-#: diff.c:5491
+#: diff.c:5600
 msgid "ignore changes to submodules in the diff generation"
 msgstr "игнориране на промените в подмодулите при извеждането на разликите"
 
-#: diff.c:5494
+#: diff.c:5603
 msgid "<format>"
 msgstr "ФОРМ�Т"
 
-#: diff.c:5495
+#: diff.c:5604
 msgid "specify how differences in submodules are shown"
 msgstr "начин за извеждане на промените в подмодулите"
 
-#: diff.c:5499
+#: diff.c:5608
 msgid "hide 'git add -N' entries from the index"
 msgstr "без включване в индек�а на запи�ите, добавени � „git add -N“"
 
-#: diff.c:5502
+#: diff.c:5611
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "включване в индек�а на запи�ите, добавени � „git add -N“"
 
-#: diff.c:5504
+#: diff.c:5613
 msgid "<string>"
 msgstr "�ИЗ"
 
-#: diff.c:5505
+#: diff.c:5614
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "тър�ене на разлики, които промен�т бро� на по�ва на указаните низове"
 
-#: diff.c:5508
+#: diff.c:5617
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3160,121 +4107,168 @@ msgstr ""
 "тър�ене на разлики, които промен�т бро� на по�ва на низовете, които напа�ват "
 "на регул�рни� израз"
 
-#: diff.c:5511
+#: diff.c:5620
 msgid "show all changes in the changeset with -S or -G"
 msgstr "извеждане на в�ички промени � „-G“/„-S“"
 
-#: diff.c:5514
+#: diff.c:5623
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "�ИЗът към „-S“ да �е тълкува като разширен регул�рен израз по POSIX"
 
-#: diff.c:5517
+#: diff.c:5626
 msgid "control the order in which files appear in the output"
 msgstr "управление на подредбата на файловете в изхода"
 
-#: diff.c:5518
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr "ПЪТ"
+
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr "първо извеждане на пром�ната в указани� път"
+
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr "пре�качане на изхода към указани� път"
+
+#: diff.c:5633
 msgid "<object-id>"
 msgstr "ИДЕ�ТИФИК�ТОР_��_ОБЕКТ"
 
-#: diff.c:5519
+#: diff.c:5634
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "тър�ене на разлики, които промен�т бро� на по�ва на указани� обект"
 
-#: diff.c:5521
+#: diff.c:5636
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
 
-#: diff.c:5522
+#: diff.c:5637
 msgid "select files by diff type"
 msgstr "избор на файловете по вид разлика"
 
-#: diff.c:5524
+#: diff.c:5639
 msgid "<file>"
 msgstr "Ф�ЙЛ"
 
-#: diff.c:5525
+#: diff.c:5640
 msgid "Output to a specific file"
 msgstr "Изход към указани� файл"
 
-#: diff.c:6180
-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 ""
-"тър�енето на преименувани� на обекти �ъчетани � промени �е пре�кача поради "
-"многото файлове."
+"пълното тър�ене на преименувани� на обекти �е пре�кача поради многото "
+"файлове."
 
-#: diff.c:6183
+#: diff.c:6301
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "у�тановени �а �амо точните копи� на променените пътища поради многото "
 "файлове."
 
-#: diff.c:6186
+#: diff.c:6304
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата."
 
-#: dir.c:549
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "файлът � подредбата на �ъответ�тви�та „%s“ не може да бъде прочетен"
+
+#: diffcore-rename.c:1510
+msgid "Performing inexact rename detection"
+msgstr "Тър�ене на преименувани� на обекти �ъчетани � промени"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "��ма път на име „%s“ в разликата"
+
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "път�т „%s“ не �ъвпада � никой файл в git"
 
-#: dir.c:938
+#: dir.c:733 dir.c:762 dir.c:775
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "непознат шаблон: „%s“"
+
+#: dir.c:792 dir.c:806
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "непознат отрицателен шаблон: „%s“"
+
+#: dir.c:824
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"файлът определ�щ ча�тично�тта на изтегленото хранилище може да има проблем: "
+"шаблонът „%s“ �е повтар�"
+
+#: dir.c:834
+msgid "disabling cone pattern matching"
+msgstr "изключване на пътеводното напа�ване"
+
+#: dir.c:1221
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "„%s“ не може да �е ползва за игнорираните файлове (като gitignore)"
 
-#: dir.c:1877
+#: dir.c:2358
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "директори�та „%s“ не може да бъде отворена"
 
-#: dir.c:2128
+#: dir.c:2660
 msgid "failed to get kernel name and information"
 msgstr "името и вер�и�та на �дрото не б�ха получени"
 
-#: dir.c:2252
+#: dir.c:2784
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 "кешът за не�ледените файлове е изключен на тази �и�тема или ме�тоположение"
 
-#: dir.c:3056
+#: dir.c:3617
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "файлът � индек�а е повреден в хранилището „%s“"
 
-#: dir.c:3101 dir.c:3106
+#: dir.c:3664 dir.c:3669
 #, c-format
 msgid "could not create directories for %s"
 msgstr "директориите за „%s“ не може да бъдат �ъздадени"
 
-#: dir.c:3135
+#: dir.c:3698
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "директори�та на git не може да �е мигрира от „%s“ до „%s“"
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "Под�казка: чака �е редакторът ви да затвори файла …%c"
 
-#: entry.c:178
+#: entry.c:176
 msgid "Filtering content"
 msgstr "Филтриране на �ъдържанието"
 
-#: entry.c:476
+#: entry.c:497
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "неу�пешно изпълнение на „stat“ върху файла „%s“"
 
-#: environment.c:148
+#: environment.c:152
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "неправилен път към про�тран�тва от имена „%s“"
 
-#: environment.c:330
+#: environment.c:335
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "GIT_DIR не може да �е зададе да е „%s“"
@@ -3284,254 +4278,284 @@ msgstr "GIT_DIR не може да �е зададе да е „%s“"
 msgid "too many args to run %s"
 msgstr "прекалено много аргументи за изпълнение „%s“"
 
-#: fetch-pack.c:150
+#: fetch-pack.c:182
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: очаква �е плитък �пи�ък"
 
-#: fetch-pack.c:153
+#: fetch-pack.c:185
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: �лед плитък �пи�ък �е очаква изчи�тващ пакет „flush“"
 
-#: fetch-pack.c:164
+#: fetch-pack.c:196
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 "git fetch-pack: очаква �е „ACK“/„NAK“, а бе получен изчи�тващ пакет „flush“"
 
-#: fetch-pack.c:184
+#: fetch-pack.c:216
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: очаква �е „ACK“/„NAK“, а бе получено „%s“"
 
-#: fetch-pack.c:195
+#: fetch-pack.c:227
 msgid "unable to write to remote"
 msgstr "невъзможно пи�ане към отдалечено хранилище"
 
-#: fetch-pack.c:257
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "опци�та „--stateless-rpc“ изи�ква  „multi_ack_detailed“"
 
-#: fetch-pack.c:356 fetch-pack.c:1280
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "неправилен плитък ред: „%s“"
 
-#: fetch-pack.c:362 fetch-pack.c:1286
+#: fetch-pack.c:389 fetch-pack.c:1429
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "неправилен неплитък ред: „%s“"
 
-#: fetch-pack.c:364 fetch-pack.c:1288
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
 msgstr "обектът „%s“ лип�ва"
 
-#: fetch-pack.c:367 fetch-pack.c:1291
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
 msgstr "грешка в обекта: „%s“"
 
-#: fetch-pack.c:369 fetch-pack.c:1293
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
 msgstr "не е открит плитък обект: %s"
 
-#: fetch-pack.c:372 fetch-pack.c:1297
+#: fetch-pack.c:399 fetch-pack.c:1440
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "очаква �е плитък или не обект, а бе получено: „%s“"
 
-#: fetch-pack.c:414
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr "получено бе %s %d %s"
 
-#: fetch-pack.c:431
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
 msgstr "неправилно подаване: „%s“"
 
-#: fetch-pack.c:462
+#: fetch-pack.c:487
 msgid "giving up"
 msgstr "преу�танов�ване"
 
-#: fetch-pack.c:475 progress.c:312
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
 msgstr "дей�твието завърши"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "получено бе %s (%d) %s"
 
-#: fetch-pack.c:533
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Отбел�зване на „%s“ като пълно"
 
-#: fetch-pack.c:742
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr "вече има „%s“ (%s)"
 
-#: fetch-pack.c:781
+#: fetch-pack.c:849
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: не може да �е �ъздаде проце� за демултиплек�ора"
 
-#: fetch-pack.c:789
+#: fetch-pack.c:857
 msgid "protocol error: bad pack header"
 msgstr "протоколна грешка: неправилна заглавна ча�т на пакет"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:951
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: не може да �е �ъздаде проце� за „%s“"
 
-#: fetch-pack.c:873
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: неправилен изход от командата „index-pack“"
+
+#: fetch-pack.c:974
 #, c-format
 msgid "%s failed"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
 msgstr "грешка в демултиплек�ора"
 
-#: fetch-pack.c:907
+#: fetch-pack.c:1019
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Вер�и�та на �ървъра е: %.*s"
 
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
+#: 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 "Сървърът поддържа „%s“"
 
-#: fetch-pack.c:914
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
 msgstr "Сървърът не поддържа плитки клиенти"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:1089
 msgid "Server does not support --shallow-since"
 msgstr "Сървърът не поддържа опци�та „--shallow-since“"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1094
 msgid "Server does not support --shallow-exclude"
 msgstr "Сървърът не поддържа опци�та „--shallow-exclude“"
 
-#: fetch-pack.c:983
+#: fetch-pack.c:1098
 msgid "Server does not support --deepen"
 msgstr "Сървърът не поддържа опци�та „--deepen“"
 
-#: fetch-pack.c:1000
+#: fetch-pack.c:1100
+msgid "Server does not support this repository's object format"
+msgstr "Сървърът не поддържа форма̀та на обектите на това хранилище"
+
+#: fetch-pack.c:1113
 msgid "no common commits"
 msgstr "н�ма общи подавани�"
 
-#: fetch-pack.c:1012 fetch-pack.c:1468
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr "клонираното хранилище е плитко, затова н�ма да �е клонира."
+
+#: fetch-pack.c:1128 fetch-pack.c:1660
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: неу�пешно до�тав�не."
 
-#: fetch-pack.c:1150
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "различни алгоритми — на клиента: „%s“, на �ървъра: „%s“"
+
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "�ървърът не поддържа алгоритъм „%s“"
+
+#: fetch-pack.c:1279
 msgid "Server does not support shallow requests"
 msgstr "Сървърът не поддържа плитки за�вки"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1286
 msgid "Server supports filter"
 msgstr "Сървърът поддържа филтри"
 
-#: fetch-pack.c:1180
+#: fetch-pack.c:1329 fetch-pack.c:2043
 msgid "unable to write request to remote"
 msgstr "невъзможно пи�ане към отдалечено хранилище"
 
-#: fetch-pack.c:1198
+#: fetch-pack.c:1347
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "грешка при прочитане на заглавната ча�т на раздел „%s“"
 
-#: fetch-pack.c:1204
+#: fetch-pack.c:1353
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "очаква �е „%s“, а бе получено „%s“"
 
-#: fetch-pack.c:1243
+#: fetch-pack.c:1387
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "неочакван ред за потвърждение: „%s“"
 
-#: fetch-pack.c:1248
+#: fetch-pack.c:1392
 #, c-format
 msgid "error processing acks: %d"
 msgstr "грешка при обработка на потвърждени�та: %d"
 
-#: fetch-pack.c:1258
+#: fetch-pack.c:1402
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 "очакваше �е пакетни�т файл да бъде изпратен �лед отговор за готовно�т (ready)"
 
-#: fetch-pack.c:1260
+#: fetch-pack.c:1404
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 "очакваше �е �лед лип�а на отговор за готовно�т (ready) да не �е �е пращат "
 "други раздели"
 
-#: fetch-pack.c:1302
+#: fetch-pack.c:1445
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "грешка при обработка на информаци� за дълбочината/плитко�тта: %d"
 
-#: fetch-pack.c:1349
+#: fetch-pack.c:1494
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "очаква �е и�кан указател, а бе получено: „%s“"
 
-#: fetch-pack.c:1354
+#: fetch-pack.c:1499
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "неочакван и�кан указател: „%s“"
 
-#: fetch-pack.c:1359
+#: fetch-pack.c:1504
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "грешка при обработката на и�каните указатели: %d"
 
-#: fetch-pack.c:1693
+#: fetch-pack.c:1534
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: очаква �е пакет за край на отговора"
+
+#: fetch-pack.c:1939
 msgid "no matching remote head"
 msgstr "не може да бъде открит подход�щ връх от отдалеченото хранилище"
 
-#: fetch-pack.c:1716 builtin/clone.c:685
+#: fetch-pack.c:1962 builtin/clone.c:697
 msgid "remote did not send all necessary objects"
 msgstr "отдалеченото хранилище не изпрати в�ички необходими обекти."
 
-#: fetch-pack.c:1743
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr "неочаквано �ъ�то�ние за готовно�т от отдалечено хранилище"
+
+#: fetch-pack.c:2088
 #, c-format
 msgid "no such remote ref %s"
 msgstr "такъв отдалечен указател н�ма: %s"
 
-#: fetch-pack.c:1746
+#: fetch-pack.c:2091
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Сървърът не позвол�ва за�вка за необ�вен обект „%s“"
 
-#: gpg-interface.c:321
-msgid "gpg failed to sign the data"
-msgstr "Програмата „gpg“ не подпи�а данните."
-
-#: gpg-interface.c:347
+#: gpg-interface.c:273
 msgid "could not create temporary file"
 msgstr "не може да �е �ъздаде временен файл"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "Програмата не у�п� да запише �амо�то�телни� подпи� в „%s“"
 
-#: graph.c:97
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "Програмата „gpg“ не подпи�а данните."
+
+#: 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:668
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -3539,18 +4563,18 @@ msgstr ""
 "зададени�т шаблон �ъдържа нулев знак (идва от -f „Ф�ЙЛ“).  Това �е поддържа "
 "в комбинаци� � „-P“ �амо при ползването на „PCRE v2“"
 
-#: grep.c:2124
+#: grep.c:1895
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "„%s“: файлът �очен от „%s“ не може да бъде прочетен"
 
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
-#: 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 "не може да бъде получена информаци� чрез „stat“ за „%s“"
 
-#: grep.c:2152
+#: grep.c:1923
 #, c-format
 msgid "'%s': short read"
 msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
@@ -3581,11 +4605,11 @@ msgstr "О�новни команди от потребител�ко ниво"
 
 #: help.c:32
 msgid "Ancillary Commands / Manipulators"
-msgstr "Помощни команди/Промен�щи"
+msgstr "Помощни команди / Промен�щи"
 
 #: help.c:33
 msgid "Ancillary Commands / Interrogators"
-msgstr "Помощни команди/Запитващи"
+msgstr "Помощни команди / Запитващи"
 
 #: help.c:34
 msgid "Interacting with Others"
@@ -3593,55 +4617,55 @@ msgstr "Съвме�тна работа � други хора"
 
 #: help.c:35
 msgid "Low-level Commands / Manipulators"
-msgstr "Команди от ни�ко ниво/Промен�щи"
+msgstr "Команди от ни�ко ниво / Промен�щи"
 
 #: help.c:36
 msgid "Low-level Commands / Interrogators"
-msgstr "Команди от ни�ко ниво/Запитващи"
+msgstr "Команди от ни�ко ниво / Запитващи"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
-msgstr "Команди от ни�ко ниво/Синхронизаци� на хранилища"
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Команди от ни�ко ниво / Синхронизаци� на хранилища"
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
-msgstr "Команди от ни�ко ниво/Допълнителни ин�трументи"
+msgstr "Команди от ни�ко ниво / Допълнителни ин�трументи"
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "налични команди на git от „%s“"
 
-#: help.c:305
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "команди на git от други директории от „$PATH“"
 
-#: help.c:314
+#: help.c:316
 msgid "These are common Git commands used in various situations:"
 msgstr "Това �а най-че�то използваните команди на Git:"
 
-#: help.c:363 git.c:98
+#: help.c:365 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "неподдържан �пи�ък от команди „%s“"
 
-#: help.c:403
-msgid "The common Git guides are:"
-msgstr "Попул�рните въведени� в Git �а:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Ръковод�твата за концепциите в Git �а:"
 
-#: help.c:512
+#: help.c:429
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "За повече информаци� за КОМ��Д� изпълнете „git help КОМ��Д�“"
 
-#: help.c:517
+#: help.c:434
 msgid "External commands"
 msgstr "Външни команди"
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr "П�евдоними на командите"
 
-#: help.c:596
+#: help.c:527
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -3650,36 +4674,36 @@ msgstr ""
 "Изглежда, че „%s“ е команда на git, но т� не може да\n"
 "бъде изпълнена.  Веро�тно пакетът „git-%s“ е повреден."
 
-#: help.c:655
+#: help.c:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: „%s“ не е команда на git.  Погледнете изхода от „git --help“."
+
+#: help.c:591
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Странно, изглежда, че на �и�темата ви н�ма нито една команда на git."
 
-#: help.c:677
+#: help.c:613
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: Пробвахте да изпълните команда на Git на име „%s“, а такава "
 "не �ъще�твува."
 
-#: help.c:682
+#: help.c:618
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr ""
 "Изпълнението автоматично продължава, като �е �чита, че имате предвид „%s“."
 
-#: help.c:687
+#: help.c:623
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
 "Изпълнението автоматично ще продължи �лед %0.1f �ек., като �е �чита, че "
 "имате предвид „%s“."
 
-#: help.c:695
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: „%s“ не е команда на git.  Погледнете изхода от „git --help“."
-
-#: help.c:699
+#: help.c:635
 msgid ""
 "\n"
 "The most similar command is"
@@ -3693,16 +4717,16 @@ msgstr[1] ""
 "\n"
 "�ай-близките команди �а"
 
-#: help.c:714
+#: help.c:675
 msgid "git version [<options>]"
 msgstr "git version [ОПЦИЯ…]"
 
-#: help.c:783
+#: help.c:730
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s — %s"
 
-#: help.c:787
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3716,7 +4740,15 @@ msgstr[1] ""
 "\n"
 "Команди � подобно име �а:"
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Лип�ва информаци� за автора\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Лип�ва информаци� за подали�\n"
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3743,94 +4775,105 @@ msgstr ""
 "хранилище.\n"
 "\n"
 
-#: ident.c:379
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
 msgstr "лип�ва адре� за е-поща, а автоматичното отгатване е изключено"
 
-#: ident.c:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr ""
 "адре�ът за е-поща не може да бъде отгатнат (най-доброто предположение бе "
 "„%s“)"
 
-#: ident.c:401
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
 msgstr "лип�ва име, а автоматичното отгатване е изключено"
 
-#: ident.c:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "името не може да бъде отгатнато (най-доброто предположение бе „%s“)"
 
-#: ident.c:415
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "не може да �е ползва празно име като идентификатор (за <%s>)"
 
-#: ident.c:421
+#: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "името �ъдържа �амо непозволени знаци: „%s“"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:454 builtin/commit.c:647
 #, c-format
 msgid "invalid date format: %s"
 msgstr "неправилен формат на дата: %s"
 
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "обект „%s“ в дървото „%s“ е отбел�зан като дърво, но не е"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "обект „%s“ в дървото „%s“ е отбел�зан като BLOB, но не е"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "кореновото дърво за подаване „%s“ не може да �е зареди"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "н�ма до�тъп до ча�тично изтеглени� обект-BLOB в „%s“"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr ""
-"данните от филтъра за ча�тични изтеглани� в „%s“ не може да бъдат анализирани"
-
-#: list-objects-filter-options.c:58
+#: list-objects-filter-options.c:83
 msgid "expected 'tree:<depth>'"
 msgstr "очаква �е „tree:ДЪЛБОЧИ��“"
 
-#: list-objects-filter-options.c:73
+#: list-objects-filter-options.c:98
 msgid "sparse:path filters support has been dropped"
 msgstr "поддръжката на филтри �ъ� „sparse:path“ е премахната"
 
-#: list-objects-filter-options.c:86
+#: list-objects-filter-options.c:105
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr "„%s“ не е правилна �тойно�т за вид на обект в „object:type=ВИД“"
+
+#: list-objects-filter-options.c:124
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "неправилен филтър: „%s“"
 
-#: list-objects-filter-options.c:102
+#: list-objects-filter-options.c:140
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
 msgstr "знак за екраниране в подфилтър: „%c“"
 
-#: list-objects-filter-options.c:144
+#: list-objects-filter-options.c:182
 msgid "expected something after combine:"
 msgstr "добавете нещо �лед комбинирането:"
 
-#: list-objects-filter-options.c:226
+#: list-objects-filter-options.c:264
 msgid "multiple filter-specs cannot be combined"
 msgstr "не може да комбинирате множе�тво филтри"
 
-#: lockfile.c:151
+#: list-objects-filter-options.c:376
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"не може да �е извърши ча�тично клониране, защото форматът на хранилището не "
+"може да �е обнови"
+
+#: list-objects-filter.c:532
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "н�ма до�тъп до ча�тично изтеглени� обект-BLOB в „%s“"
+
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr ""
+"данните от филтъра за ча�тични изтегл�ни� в „%s“ не може да бъдат анализирани"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "обект „%s“ в дървото „%s“ е отбел�зан като дърво, но не е"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "обект „%s“ в дървото „%s“ е отбел�зан като BLOB, но не е"
+
+#: list-objects.c:398
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "кореновото дърво за подаване „%s“ не може да �е зареди"
+
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3849,171 +4892,400 @@ msgstr ""
 "причина е, че н�кой проце� на git в това хранилище е забил.  За да\n"
 "продължите работа, ще тр�бва ръчно да изтриете файла:"
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Файлът-ключалка „%s.lock“ не може да бъде �ъздаден: %s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "кешът не може да бъде прочетен"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "неправилна �тойно�т „%s“ за „lsrefs.unborn“"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "неу�пешно запи�ване на нови� индек�"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "�лед аргументите към „ls-refs“ �е очаква изчи�тване на буферите"
+
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "цитирани знаци CRLF"
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "неправилно дей�твие „%s“ за „%s“"
+
+#: merge-ort.c:1228 merge-recursive.c:1206
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "�еу�пешно �ливане на подмодула „%s“ (не е изтеглен)"
+
+#: merge-ort.c:1237 merge-recursive.c:1213
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "�еу�пешно �ливане на подмодула „%s“ (н�ма подавани�)"
+
+#: merge-ort.c:1246 merge-recursive.c:1220
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr ""
+"Подмодулът „%s“ не може да бъде �л�т (базата за �ливане не предше�тва "
+"подавани�та)"
+
+#: merge-ort.c:1256 merge-ort.c:1263
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Бележка: Превъртане на подмодула „%s“ към „%s“"
+
+#: merge-ort.c:1284
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "�еу�пешно �ливане на подмодула „%s“"
+
+#: merge-ort.c:1291
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"�еу�пешно �ливане на подмодула „%s“, но е открито възможно решение:\n"
+"%s\n"
+
+#: merge-ort.c:1295 merge-recursive.c:1274
+#, 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 ""
+"�ко това е така, добавете го към индек�а � команда като �ледната:\n"
+"\n"
+"    git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"Това приема предложеното.\n"
+
+#: merge-ort.c:1308
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"�еу�пешно �ливане на подмодула „%s“, но �а открити множе�тво решени�:\n"
+"%s"
+
+#: merge-ort.c:1527 merge-recursive.c:1363
+msgid "Failed to execute internal merge"
+msgstr "�еу�пешно вътрешно �ливане"
+
+#: merge-ort.c:1532 merge-recursive.c:1368
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "„%s“ не може да �е добави в базата � данни"
 
-#: merge-recursive.c:367
+#: merge-ort.c:1539 merge-recursive.c:1401
+#, c-format
+msgid "Auto-merging %s"
+msgstr "�втоматично �ливане на „%s“"
+
+#: merge-ort.c:1678 merge-recursive.c:2123
+#, 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 ""
+"КО�ФЛИКТ (ко�вено преименуване на директори�): �ледни�т файл или директори� "
+"„%s“ не позвол�ват ко�веното преименуване на �ледни� път/ища: %s."
+
+#: merge-ort.c:1688 merge-recursive.c:2133
+#, 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 ""
+"КО�ФЛИКТ (ко�вено преименуване на директори�): повече от един път "
+"�ъответ�тва на „%s“.  Ко�вено преименуване на директори� води до по�тав�нето "
+"на тези пътища там: %s."
+
+#: merge-ort.c:1746
+#, 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“, защото е преме�тен в н�колко нови директории, без "
+"нико� от т�х да е по-че�та цел."
+
+#: merge-ort.c:1900 merge-recursive.c:2469
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"ПРЕДУПРЕЖДЕ�ИЕ: пре�качане на преименуването на „%s“ на „%s“ в „%s“, защото "
+"„%s“ �ъщо е � променено име."
+
+#: merge-ort.c:2044 merge-recursive.c:3252
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"Обновен път: „%s“ е добавен в „%s“ в директори�, ко�то е преименувана в "
+"„%s“.  Обектът �е ме�ти в „%s“."
+
+#: merge-ort.c:2051 merge-recursive.c:3259
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директори�, ко�то е "
+"преименувана в „%s“.  Обектът �е ме�ти в „%s“."
+
+#: merge-ort.c:2064 merge-recursive.c:3255
+#, 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 ""
+"КО�ФЛИКТ (ме�та на файлове): „%s“ е добавен в „%s“ в директори�, ко�то е "
+"преименувана в „%s“.  Предложението е да преме�тите обекта в „%s“."
+
+#: merge-ort.c:2072 merge-recursive.c:3262
+#, 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 ""
+"КО�ФЛИКТ (ме�та на файлове): „%s“ е преименуван на „%s“ в „%s“ в директори�, "
+"ко�то е преименувана в „%s“.  Предложението е да преме�тите обекта в „%s“."
+
+#: merge-ort.c:2228
+#, 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:2323
+#, 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 ""
+"КО�ФЛИКТ (има и преименуване в промените): „%s“ е преименуван на „%s“, но "
+"има и промени в �ъдържанието, а и има �ъвпадение на път�.  Може да �е "
+"получат вложени маркери за конфликт."
+
+#: merge-ort.c:2342 merge-ort.c:2366
+#, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"КО�ФЛИКТ (преименуване/добав�не): „%s“ е преименуван на „%s“ в клон „%s“, а "
+"е изтрит в „%s“."
+
+#: merge-ort.c:2819 merge-recursive.c:3013
+#, c-format
+msgid "cannot read object %s"
+msgstr "обектът „%s“ не може да �е прочете"
+
+#: merge-ort.c:2822 merge-recursive.c:3016
+#, c-format
+msgid "object %s is not a blob"
+msgstr "обектът „%s“ не е BLOB"
+
+#: merge-ort.c:3250
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"КО�ФЛИКТ (файл/директори�): директори� на м��тото на „%s“ от „%s“, вме�то "
+"това �е извършва преме�тване в „%s“."
+
+#: merge-ort.c:3326
+#, 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“ е различен вид обект в двата варианта.  И "
+"двата �е преименуват, за да може в�ичко да е отразено."
+
+#: merge-ort.c:3333
+#, 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“ е различен вид обект в двата варианта.  "
+"Извършва �е преименуване в едини�, за да може в�ичко да е отразено."
+
+#: merge-ort.c:3433 merge-recursive.c:3092
+msgid "content"
+msgstr "�ъдържание"
+
+#: merge-ort.c:3435 merge-recursive.c:3096
+msgid "add/add"
+msgstr "добав�не/добав�не"
+
+#: merge-ort.c:3437 merge-recursive.c:3141
+msgid "submodule"
+msgstr "ПОДМОДУЛ"
+
+#: merge-ort.c:3439 merge-recursive.c:3142
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "КО�ФЛИКТ (%s): Конфликт при �ливане на „%s“"
+
+#: merge-ort.c:3470
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"КО�ФЛИКТ (пром�на/изтриване): „%s“ е изтрит в %s, а е променен в %s.  Вер�и� "
+"%s на „%s“ е о�тавена в дървото."
+
+#: merge-ort.c:3757
+#, 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“"
+
+#. 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:4116
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "неу�пешно �ъбиране на информаци�та за �ливането на „%s“, „%s“ и „%s“"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3707
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Сливането ще презапише локалните промени на тези файлове:\n"
+"    %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3473 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "Вече е обновено."
+
+#: merge-recursive.c:357
 msgid "(bad commit)\n"
 msgstr "(лошо подаване)\n"
 
-#: merge-recursive.c:390
+#: merge-recursive.c:380
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 "неу�пешно изпълнение на „add_cacheinfo“ за път� „%s“.  Сливането е "
 "преу�тановено."
 
-#: merge-recursive.c:399
+#: merge-recursive.c:389
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "неу�пешно изпълнение на „add_cacheinfo“ за обнов�ването на път� „%s“.  "
 "Сливането е преу�тановено."
 
-#: merge-recursive.c:885
+#: merge-recursive.c:877
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "грешка при �ъздаването на път� „%s“%s"
 
-#: merge-recursive.c:896
+#: merge-recursive.c:888
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Изтриване на „%s“, за да �е о�вободи м��то за поддиректори�\n"
 
-#: merge-recursive.c:910 merge-recursive.c:929
+#: merge-recursive.c:902 merge-recursive.c:921
 msgid ": perhaps a D/F conflict?"
 msgstr ": възможно е да има конфликт директори�/файл."
 
-#: merge-recursive.c:919
+#: merge-recursive.c:911
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 "преу�танов�ване на дей�твието, за да не �е изтрие не�ледени�т файл „%s“"
 
-#: merge-recursive.c:960 builtin/cat-file.c:41
+#: merge-recursive.c:952 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "обектът „%s“ (%s) не може да бъде прочетен"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:957
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "обектът „%s“ (%s) �е очакваше да е BLOB, а не е"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:982
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "„%s“ не може да �е отвори: %s"
 
-#: merge-recursive.c:1001
+#: merge-recursive.c:993
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "неу�пешно �ъздаване на �имволната връзка „%s“: %s"
 
-#: merge-recursive.c:1006
+#: merge-recursive.c:998
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 "не е ��но какво да �е прави � обекта „%2$s“ (%3$s) � права за до�тъп „%1$06o“"
 
-#: merge-recursive.c:1199
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "�еу�пешно �ливане на подмодула „%s“ (не е изтеглен)"
-
-#: merge-recursive.c:1206
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "�еу�пешно �ливане на подмодула „%s“ (н�ма подавани�)"
-
-#: merge-recursive.c:1213
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr ""
-"Подмодулът „%s“ не може да бъде �л�т (базата за �ливане не предше�тва "
-"подавани�та)"
-
-#: merge-recursive.c:1221 merge-recursive.c:1233
+#: merge-recursive.c:1228 merge-recursive.c:1240
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Превъртане на подмодула „%s“ до �ледното подаване:"
 
-#: merge-recursive.c:1224 merge-recursive.c:1236
+#: merge-recursive.c:1231 merge-recursive.c:1243
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Превъртане на подмодула „%s“"
 
-#: merge-recursive.c:1259
+#: merge-recursive.c:1266
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "�еу�пешно �ливане на подмодула „%s“ (лип�ва �ливането, което �е предше�тва "
 "от подавани�та)"
 
-#: merge-recursive.c:1263
+#: merge-recursive.c:1270
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "�еу�пешно �ливане на подмодула „%s“ (не е превъртане)"
 
-#: merge-recursive.c:1264
+#: merge-recursive.c:1271
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr ""
 "Открито е �ливане, което може да решава проблема �ъ� �ливането на "
 "подмодула:\n"
 
-#: merge-recursive.c:1267
-#, 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 ""
-"�ко това е така, добавете го към индек�а � команда като �ледната:\n"
-"\n"
-"    git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"Това приема предложеното.\n"
-
-#: merge-recursive.c:1276
+#: merge-recursive.c:1283
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "�еу�пешно �ливане на подмодула „%s“ (открити �а множе�тво �ливани�)"
 
-#: merge-recursive.c:1349
-msgid "Failed to execute internal merge"
-msgstr "�еу�пешно вътрешно �ливане"
-
-#: merge-recursive.c:1354
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "„%s“ не може да �е добави в базата � данни"
-
-#: merge-recursive.c:1386
-#, c-format
-msgid "Auto-merging %s"
-msgstr "�втоматично �ливане на „%s“"
-
-#: merge-recursive.c:1410
+#: merge-recursive.c:1425
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "Грешка: за да не �е изтрие не�ледени�т файл „%s“, �е запи�ва в „%s“."
 
-#: merge-recursive.c:1482
+#: merge-recursive.c:1497
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4022,7 +5294,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Вер�и� %s на „%s“ "
 "е о�тавена в дървото."
 
-#: merge-recursive.c:1487
+#: merge-recursive.c:1502
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4031,7 +5303,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
 "%s.  Вер�и� %s на „%s“ е о�тавена в дървото."
 
-#: merge-recursive.c:1494
+#: merge-recursive.c:1509
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -4040,7 +5312,7 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s.  Вер�и� %s на „%s“ "
 "е о�тавена в дървото: %s."
 
-#: merge-recursive.c:1499
+#: merge-recursive.c:1514
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -4049,45 +5321,45 @@ msgstr ""
 "КО�ФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
 "%s.  Вер�и� %s на „%s“ е о�тавена в дървото: %s."
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1549
 msgid "rename"
 msgstr "преименуване"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1549
 msgid "renamed"
 msgstr "преименуван"
 
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1600 merge-recursive.c:2506 merge-recursive.c:3169
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Преу�танов�ване на дей�твието, за да не �е изгуби променени�т „%s“"
 
-#: merge-recursive.c:1624
+#: merge-recursive.c:1610
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Отказ да �е загуби не�ледени�т файл „%s“, защото е на м��то, където пречи."
 
-#: merge-recursive.c:1682
+#: merge-recursive.c:1668
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "КО�ФЛИКТ (преименуване/добав�не): „%s“ е преименуван на „%s“ в клон „%s“, а "
 "„%s“ е добавен в „%s“"
 
-#: merge-recursive.c:1713
+#: merge-recursive.c:1699
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "„%s“ е директори� в „%s“, затова �е добав� като „%s“"
 
-#: merge-recursive.c:1718
+#: merge-recursive.c:1704
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 "Преу�танов�ване на дей�твието, за да не �е изгуби не�ледени�т файл „%s“.  "
 "Вме�то него �е добав� „%s“"
 
-#: merge-recursive.c:1737
+#: merge-recursive.c:1731
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -4096,18 +5368,18 @@ msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
 "„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
 
-#: merge-recursive.c:1742
+#: merge-recursive.c:1736
 msgid " (left unresolved)"
 msgstr " (некоригиран конфликт)"
 
-#: merge-recursive.c:1851
+#: merge-recursive.c:1828
 #, 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:2056
+#: merge-recursive.c:2091
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4118,26 +5390,7 @@ msgstr ""
 "по�тави „%s“, защото н�колко нови директории подел�т �ъдържанието на "
 "директори� „%s“, като нико� не �ъдържа мнозин�тво от файловете �."
 
-#: merge-recursive.c:2088
-#, 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 ""
-"КО�ФЛИКТ (ко�вено преименуване на директори�): �ледни�т файл или директори� "
-"„%s“ не позвол�ват ко�веното преименуване на �ледни� път/ища: %s."
-
-#: merge-recursive.c:2098
-#, 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 ""
-"КО�ФЛИКТ (ко�вено преименуване на директори�): повече от един път "
-"�ъответ�тва на „%s“.  Ко�вено преименуване на директори� води до по�тав�нето "
-"на тези пътища там: %s."
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2225
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4146,269 +5399,225 @@ msgstr ""
 "КО�ФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
 "„%s“, а „%s“ е преименуван на „%s“ в „%s“"
 
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"ПРЕДУПРЕЖДЕ�ИЕ: пре�качане на преименуването на „%s“ на „%s“ в „%s“, защото "
-"„%s“ �ъщо е � променено име."
-
-#: merge-recursive.c:2961
-#, c-format
-msgid "cannot read object %s"
-msgstr "обектът „%s“ не може да �е прочете"
-
-#: merge-recursive.c:2964
-#, c-format
-msgid "object %s is not a blob"
-msgstr "обектът „%s“ не е BLOB"
-
-#: merge-recursive.c:3028
+#: merge-recursive.c:3080
 msgid "modify"
 msgstr "пром�на"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3080
 msgid "modified"
 msgstr "променен"
 
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "�ъдържание"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "добав�не/добав�не"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3119
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Пре�качане на „%s“ (�лети�т резултат е идентичен �ъ� �егашни�)"
 
-#: merge-recursive.c:3089 git-submodule.sh:937
-msgid "submodule"
-msgstr "ПОДМОДУЛ"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "КО�ФЛИКТ (%s): Конфликт при �ливане на „%s“"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3172
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Добав�не като „%s“"
 
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Обновен път: „%s“ е добавен в „%s“ в директори�, ко�то е преименувана в "
-"„%s“.  Обектът �е ме�ти в „%s“."
-
-#: merge-recursive.c:3206
-#, 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 ""
-"КО�ФЛИКТ (ме�та на файлове): „%s“ е добавен в „%s“ в директори�, ко�то е "
-"преименувана в „%s“.  Предложението е да преме�тите обекта в „%s“."
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Обновен път: „%s“ е преименуван на „%s“ в „%s“ в директори�, ко�то е "
-"преименувана в „%s“.  Обектът �е ме�ти в „%s“."
-
-#: merge-recursive.c:3213
-#, 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 ""
-"КО�ФЛИКТ (ме�та на файлове): „%s“ е преименуван на „%s“ в „%s“ в директори�, "
-"ко�то е преименувана в „%s“.  Предложението е да преме�тите обекта в „%s“."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3376
 #, c-format
 msgid "Removing %s"
 msgstr "Изтриване на „%s“"
 
-#: merge-recursive.c:3350
+#: merge-recursive.c:3399
 msgid "file/directory"
 msgstr "файл/директори�"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3404
 msgid "directory/file"
 msgstr "директори�/файл"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3411
 #, 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:3371
+#: merge-recursive.c:3420
 #, c-format
 msgid "Adding %s"
 msgstr "Добав�не на „%s“"
 
-#: merge-recursive.c:3380
+#: merge-recursive.c:3429
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "КО�ФЛИКТ (добав�не/добав�не): Конфликт при �ливане на „%s“"
 
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr "Вече е обновено!"
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3482
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "неу�пешно �ливане на дърветата „%s“ и „%s“"
 
-#: merge-recursive.c:3537
+#: merge-recursive.c:3576
 msgid "Merging:"
 msgstr "Сливане:"
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3589
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "открит е %u общ предше�твеник:"
 msgstr[1] "открити �а %u общи предше�твеници:"
 
-#: merge-recursive.c:3600
+#: merge-recursive.c:3639
 msgid "merge returned no commit"
 msgstr "�ливането не върна подаване"
 
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Сливането ще презапише локалните промени на тези файлове:\n"
-"    %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3804
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�еу�пешен анализ на обекта „%s“"
 
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3822 builtin/merge.c:716 builtin/merge.c:900
+#: builtin/stash.c:473
 msgid "Unable to write index."
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "кешът не може да бъде прочетен"
+
+#: merge.c:108 rerere.c:704 builtin/am.c:1932 builtin/am.c:1966
+#: builtin/checkout.c:595 builtin/checkout.c:849 builtin/clone.c:821
+#: builtin/stash.c:267
+msgid "unable to write new index file"
+msgstr "неу�пешно запи�ване на нови� индек�"
+
+#: midx.c:74
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "неправилен размер на откъ� (OID fanout) на индек�а за множе�тво пакети"
+
+#: midx.c:105
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "файлът � индек�а за множе�тво пакети „%s“ е твърде малък"
 
-#: midx.c:84
+#: midx.c:121
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "отпечатъкът на индек�а за множе�тво пакети 0x%08x не �ъвпада � 0x%08x"
 
-#: midx.c:89
+#: midx.c:126
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "непозната вер�и� на индек� за множе�тво пакети — %d"
 
-#: midx.c:94
+#: midx.c:131
 #, c-format
-msgid "hash version %u does not match"
-msgstr "вер�и�та на отпечатъка %u не �ъвпада"
-
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr "неправилно (прекалено гол�мо) отме�тване на откъ�"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
-"идентификаторът за краен откъ� на индек� за множе�тво пакети �е �в�ва по-"
-"рано от очакваното"
+"вер�и�та на контролната �ума на индек�а за множе�тво пакети %u не �ъвпада � "
+"%u"
 
-#: midx.c:145
+#: midx.c:148
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "лип�ва откъ� (pack-name) от индек� за множе�тво пакети"
 
-#: midx.c:147
+#: midx.c:150
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "лип�ва откъ� (OID fanout) от индек� за множе�тво пакети"
 
-#: midx.c:149
+#: midx.c:152
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "лип�ва откъ� (OID lookup) от индек� за множе�тво пакети"
 
-#: midx.c:151
+#: midx.c:154
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "лип�ва откъ� за отме�твани�та на обекти от индек� за множе�тво пакети"
 
-#: midx.c:165
+#: midx.c:170
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 "неправилна подредба на имената в индек� за множе�тво пакети: „%s“ �е по�ви "
 "преди „%s“"
 
-#: midx.c:210
+#: midx.c:214
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 "неправилен идентификатор на пакет (pack-int-id): %u (от общо %u пакети)"
 
-#: midx.c:260
+#: midx.c:264
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "индек�ът за множе�тво пакети �ъдържа 64-битови отме�твани�, но размерът на "
 "„off_t“ е недо�татъчен"
 
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr ""
-"грешка при �ъздаването на пакетен файл на базата на индек� за множе�тво "
-"пакети"
-
-#: midx.c:469
+#: midx.c:490
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "пакетни�т файл „%s“ не може да бъде добавен"
 
-#: midx.c:475
+#: midx.c:496
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "индек�ът за пакети „%s“ не може да бъде отворен"
 
-#: midx.c:535
+#: midx.c:564
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "обект %d в пакетни� файл лип�ва"
 
-#: midx.c:864
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr "файлът за индек�а не може да бъде �ъхранен"
+
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"индек�ът за множе�тво пакети �е пре�кача, защото контролната �ума не �ъвпада"
+
+#: midx.c:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Добав�не на пакетни файлове към индек� за множе�тво пакети"
+
+#: midx.c:989
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "пакетни�т файл за триене „%s“ не може да �е открие"
 
-#: midx.c:1035
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "непознат предпочитан пакет: %s"
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "предпочитани�т пакет „%s“ е о�тар�л"
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr "н�ма пакетни файлове за индек�иране"
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "файлът „%s“ не може да бъде изтрит"
+
+#: midx.c:1166
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "индек�ът за множе�тво пакети не може да бъде изчи�тен при „%s“"
 
-#: midx.c:1090
+#: midx.c:1225
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "файлът � индек�а за множе�тво пакети, но не може да бъде анализиран"
+
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr "неправилна контролна �ума"
+
+#: midx.c:1236
 msgid "Looking for referenced packfiles"
 msgstr "Тър�ене на указаните пакетни файлове"
 
-#: midx.c:1105
+#: midx.c:1251
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -4416,60 +5625,72 @@ msgstr ""
 "неправилна подредба на откъ�и (OID fanout): fanout[%d] = %<PRIx32> > "
 "%<PRIx32> = fanout[%d]"
 
-#: midx.c:1109
-msgid "Verifying OID order in MIDX"
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr "във файла � индек�а за множе�тво пакети н�ма идентификатори на обекти"
+
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
 msgstr ""
-"Проверка на подредбата на идентификатори на обекти в MIDX (файл � индек� към "
-"множе�тво пакетни файлове)"
+"Проверка на подредбата на идентификатори на обекти във файл � индек� към "
+"множе�тво пакетни файлове"
 
-#: midx.c:1118
+#: midx.c:1274
 #, 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:1137
+#: midx.c:1294
 msgid "Sorting objects by packfile"
 msgstr "Подредба на обектите по пакетни файлове"
 
-#: midx.c:1143
+#: midx.c:1301
 msgid "Verifying object offsets"
 msgstr "Проверка на отме�тването на обекти"
 
-#: midx.c:1159
+#: midx.c:1317
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "запи�ът в пакета за обекта oid[%d] = %s не може да бъде зареден"
 
-#: midx.c:1165
+#: midx.c:1323
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "индек�ът на пакета „%s“ не може да бъде зареден"
 
-#: midx.c:1174
+#: midx.c:1332
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "неправилно отме�тване на обект за oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1349
+#: midx.c:1357
+msgid "Counting referenced objects"
+msgstr "Пребро�ване на �вързаните обекти"
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Тър�ене и изтриване на не�вързаните пакетни файлове"
+
+#: midx.c:1558
 msgid "could not start pack-objects"
 msgstr "командата „pack-objects“ не може да бъде �тартирана"
 
-#: midx.c:1368
+#: midx.c:1578
 msgid "could not finish pack-objects"
 msgstr "командата „pack-objects“ не може да бъде завършена"
 
-#: name-hash.c:537
+#: name-hash.c:542
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "не може да �е �ъздаде нишка за директории: %s"
 
-#: name-hash.c:559
+#: name-hash.c:564
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "не може да �е �ъздаде нишка за имена: %s"
 
-#: name-hash.c:565
+#: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "не може да �е изчака нишка за имена: %s"
@@ -4522,6 +5743,369 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr "Зададена е лоша �тойно�т на променливата „%s“: „%s“"
 
+#: object-file.c:526
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+"директори�та за обекти „%s“ не �ъще�твува, проверете „.git/objects/info/"
+"alternates“"
+
+#: object-file.c:584
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "алтернативни�т път към обекти не може да бъде нормализиран: „%s“"
+
+#: object-file.c:658
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+"%s: алтернативните хранилища за обекти �е пренебрегват поради прекалено "
+"дълбоко влагане"
+
+#: object-file.c:665
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "директори�та за обекти „%s“ не може да бъде нормализирана"
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr "заключващи�т файл за алтернативите не може да �е отвори � „fdopen“"
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr "файлът � алтернативите не може да бъде прочетен"
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr "нови�т файл � алтернативите не може да бъде преме�тен на м��тото му"
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "път�т „%s“ не �ъще�твува."
+
+#: object-file.c:789
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "в�е още не �е поддържа еталонно хранилище „%s“ като �вързано."
+
+#: object-file.c:795
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "еталонното хранилище „%s“ не е локално"
+
+#: object-file.c:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "еталонното хранилище „%s“ е плитко"
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "еталонното хранилище „%s“ е � при�аждане"
+
+#: object-file.c:869
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
+
+#: object-file.c:1019
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr ""
+"неу�пешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
+
+#: object-file.c:1054
+#, c-format
+msgid "mmap failed%s"
+msgstr "неу�пешно изпълнение на „mmap“%s"
+
+#: object-file.c:1218
+#, c-format
+msgid "object file %s is empty"
+msgstr "файлът � обектите „%s“ е празен"
+
+#: object-file.c:1353 object-file.c:2548
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "непакетирани�т обект „%s“ е повреден"
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "грешни данни в кра� на непакетирани� обект „%s“"
+
+#: object-file.c:1397
+msgid "invalid object type"
+msgstr "неправилен вид обект"
+
+#: object-file.c:1481
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+"заглавната ча�т „%s“ не може да �е разпакетира � опци�та „--allow-unknown-"
+"type“"
+
+#: object-file.c:1484
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "заглавната ча�т на „%s“ не може да бъде разпакетирана"
+
+#: object-file.c:1490
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr ""
+"заглавната ча�т „%s“ не може да �е анализира � опци�та „--allow-unknown-type“"
+
+#: object-file.c:1493
+#, c-format
+msgid "unable to parse %s header"
+msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr "обектът „%s“ не може да бъде прочетен"
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "заме�тител�т „%s“ на „%s“ не може да бъде открит"
+
+#: object-file.c:1725
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "непакетирани�т обект „%s“ (в „%s“) е повреден"
+
+#: object-file.c:1729
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "пакетирани�т обект „%s“ (в „%s“) е повреден"
+
+#: object-file.c:1834
+#, c-format
+msgid "unable to write file %s"
+msgstr "файлът „%s“ не може да бъде запи�ан"
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "правата за до�тъп до „%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 ""
+"н�ма права за добав�не на обект към базата от данни на хранилището „%s“"
+
+#: object-file.c:1935
+msgid "unable to create temporary file"
+msgstr "не може да бъде �ъздаден временен файл"
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr "грешка при запи�а на файла � непакетиран обект"
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "нови�т обект „%s“ не може да �е компре�ира � „deflate“: %d"
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "неу�пешно приключване на „deflate“ върху „%s“: %d"
+
+#: object-file.c:1973
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "грешка поради не�табилни� източник данни за обектите „%s“"
+
+#: object-file.c:1983 builtin/pack-objects.c:1237
+#, c-format
+msgid "failed utime() on %s"
+msgstr "неу�пешно задаване на време на до�тъп/�ъздаване чрез „utime“ на „%s“"
+
+#: object-file.c:2060
+#, c-format
+msgid "cannot read object for %s"
+msgstr "обектът за „%s“ не може да �е прочете"
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr "повредено подаване"
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr "повреден етикет"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr "грешка при четене по време на индек�иране на „%s“"
+
+#: object-file.c:2222
+#, c-format
+msgid "short read while indexing %s"
+msgstr "непълно прочитане по време на индек�иране на „%s“"
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "„%s“ не може да �е вмъкне в базата от данни"
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "неподдържан вид файл: „%s“"
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr "„%s“ е неправилен обект"
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "„%s“ е неправилен обект от вид „%s“"
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "обектът „%s“ не може да бъде отворен"
+
+#: object-file.c:2559 object-file.c:2612
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "неправилна контролна �ума за „%s“ (тр�бва да е %s)"
+
+#: object-file.c:2583
+#, c-format
+msgid "unable to mmap %s"
+msgstr "неу�пешно изпълнение на „mmap“ върху „%s“"
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "заглавната ча�т на „%s“ не може да бъде разпакетирана"
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "�ъдържанието на „%s“ не може да бъде разпакетирано"
+
+#: object-name.c:480
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "къ�и�т идентификатор на обект „%s“ не е еднозначен"
+
+#: object-name.c:491
+msgid "The candidates are:"
+msgstr "Възможно�тите �а:"
+
+#: 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 ""
+"При нормална работа Git никога не �ъздава указатели, които завършват\n"
+"� 40 ше�тнаде�етични знака, защото �тандартно те ще бъдат пре�качани.\n"
+"Възможно е такива указатели да �а �ъздадени �лучайно.  �апример:\n"
+"\n"
+"    git switch -c $BRANCH $(git rev-parse …)\n"
+"\n"
+"където �тойно�тта на променливата на �редата BRANCH е празна, при което\n"
+"�е �ъздава подобен указател.  Прегледайте тези указатели и ги изтрийте.\n"
+"За да изключите това �ъобщение, изпълнете:\n"
+"\n"
+"    git config advice.objectNameWarning false"
+
+#: object-name.c:910
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "журналът за „%.*s“ �тига �амо до „%s“"
+
+#: object-name.c:918
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "журналът за „%.*s“ �ъдържа �амо %d запи�а"
+
+#: object-name.c:1696
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "път�т „%s“ �ъще�твува на ди�ка, но не и в „%.*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 ""
+"път�т „%s“ �ъще�твува на ди�ка, но не е в „%s“\n"
+"Пробвайте � „%.*s:%s“, което е �ъщото като „%.*s:./%s“."
+
+#: object-name.c:1711
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "път�т „%s“ не �ъще�твува в „%.*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 ""
+"път�т „%s“ е в индек�а, но не вер�и� %d\n"
+"Пробвайте � „%d:%s“."
+
+#: 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 ""
+"път�т „%s“ е в индек�а, но не в „%s“\n"
+"Пробвайте � „%d:%s“, което е �ъщото като „%d:./%s“."
+
+#: object-name.c:1763
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "път�т „%s“ �ъще�твува на ди�ка, но не е в индек�а"
+
+#: object-name.c:1765
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "път�т „%s“ не �ъще�твува нито на ди�ка, нито в индек�а"
+
+#: object-name.c:1778
+msgid "relative path syntax can't be used outside working tree"
+msgstr "отно�ителен път не може да �е ползва извън работното дърво"
+
+#: object-name.c:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "неправилно име на обект: „%.*s“"
+
 #: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
@@ -4532,40 +6116,123 @@ msgstr "неправилен вид обект: „%s“"
 msgid "object %s is a %s, not a %s"
 msgstr "обектът „%s“ е %s, а не %s"
 
-#: object.c:233
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "обектът „%s“ е непознат вид: %d"
 
-#: object.c:246
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "обектът „%s“ не може да бъде анализиран"
 
-#: object.c:266 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "разлика в контролната �ума: „%s“"
 
-#: packfile.c:641
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr "размерът на „%s“ не може да бъде получен"
+
+#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "използваното м��то за „%s“ не може да бъде получено"
+
+#: pack-revindex.c:221
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "файлът � обратни� индек� „%s“ е твърде малък"
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "файлът � обратни� индек� „%s“ е повреден"
+
+#: pack-revindex.c:234
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "непознат подпи� за файла на обратни� индек� „%s“"
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "вер�и� %2$<PRIu32> на файла � обратен индек� „%1$s“ не �е поддържа"
+
+#: pack-revindex.c:243
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr ""
+"идентификатор на контролна �ума %2$<PRIu32> на файла � обратен индек� „%1$s“ "
+"не �е поддържа"
+
+#: pack-write.c:250
+msgid "cannot both write and verify reverse index"
+msgstr "обратни�т индек� не може едновременно да �е запи�ва и да �е провер�ва"
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr "не може да �е получи информаци� чрез „stat“ за „%s“"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "не може да �е дадат права за четене на „%s“"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "гарантиращи�т файл „%s“ не може да �е запише"
+
+#: packfile.c:625
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 "отме�тване преди кра� на пакетни� файл (възможно е индек�ът да е повреден)"
 
-#: packfile.c:1887
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "не може да �е изпълни „mmap“ върху пакетни� файл „%s“%s"
+
+#: packfile.c:1934
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 "отме�тване преди началото на индек�а на пакетни� файл „%s“ (възможно е "
 "индек�ът да е повреден)"
 
-#: packfile.c:1891
+#: packfile.c:1938
 #, 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
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "опци�та „%s“ очаква чи�ло за аргумент"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "неправилна дата на �рок: „%s“"
+
+#: parse-options-cb.c:54
+#, 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
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "неправилно име на обект „%s“"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4581,7 +6248,7 @@ msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими"
 msgid "%s : incompatible with something else"
 msgstr "опци�та „%s“ е не�ъвме�тима � нещо"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "опци�та „%s“ не приема аргументи"
@@ -4591,42 +6258,47 @@ msgstr "опци�та „%s“ не приема аргументи"
 msgid "%s isn't available"
 msgstr "опци�та „%s“ не е налична"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, 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:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "нееднозначна опци�: „%s“ (може да е „--%s%s“ или „--%s%s“)"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr "„--%s“ (� 2 тирета) ли имахте предвид?"
 
-#: parse-options.c:860
+#: parse-options.c:668 parse-options.c:988
+#, c-format
+msgid "alias of --%s"
+msgstr "п�евдоним на „--%s“"
+
+#: parse-options.c:879
 #, c-format
 msgid "unknown option `%s'"
 msgstr "непозната опци�: „%s“"
 
-#: parse-options.c:862
+#: parse-options.c:881
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "непознат флаг „%c“"
 
-#: parse-options.c:864
+#: parse-options.c:883
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "непозната �тойно�т извън „ascii“ в низа: „%s“"
 
-#: parse-options.c:888
+#: parse-options.c:907
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:907
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr "употреба: %s"
@@ -4634,75 +6306,48 @@ msgstr "употреба: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:913
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
 msgstr "     или: %s"
 
-#: parse-options.c:916
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:955
+#: parse-options.c:974
 msgid "-NUM"
 msgstr "-ЧИСЛО"
 
-#: parse-options.c:969
-#, c-format
-msgid "alias of --%s"
-msgstr "п�евдоним на „--%s“"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "опци�та „%s“ очаква чи�ло за аргумент"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "неправилна дата на �рок: „%s“"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-"опци�та „%s“ изи�ква н�ко� от �тойно�тите: „always“ (винаги), "
-"„auto“ (автоматично) или „never“ (никога)"
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "неправилно име на обект „%s“"
-
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
-msgstr "�е могат да �е дадат права за запи� в директори�та „%s“ на групата"
+msgstr "�е може да �е дадат права за запи� в директори�та „%s“ на групата"
 
-#: pathspec.c:128
+#: pathspec.c:151
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Екраниращи�т знак „\\“не може да е по�леден знак в �тойно�тта на атрибут"
 
-#: pathspec.c:146
+#: pathspec.c:169
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Позволено е �амо едно указване на „attr:“."
 
-#: pathspec.c:149
+#: pathspec.c:172
 msgid "attr spec must not be empty"
 msgstr "„attr:“ тр�бва да указва �тойно�т"
 
-#: pathspec.c:192
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "неправилно име на атрибут: „%s“"
 
-#: pathspec.c:257
+#: pathspec.c:280
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "глобалните на�тройки за пътища „glob“ и „noglob“ �а не�ъвме�тими"
 
-#: pathspec.c:264
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4710,50 +6355,55 @@ msgstr ""
 "глобалната на�тройка за до�ловни пътища „literal“ е не�ъвме�тима � в�ички "
 "други глобални на�тройки за пътища"
 
-#: pathspec.c:304
+#: pathspec.c:327
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "неправилен параметър за опци�та за магиче�ки пътища „prefix“"
 
-#: pathspec.c:325
+#: pathspec.c:348
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "�еправилна �тойно�т за опци�та за магиче�ки пътища „%.*s“ в „%s“"
 
-#: pathspec.c:330
+#: pathspec.c:353
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Знакът „)“ лип�ва в опци�та за магиче�ки пътища в „%s“"
 
-#: pathspec.c:368
+#: pathspec.c:391
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Магиче�ките пътища „%c“ �а без реализаци� за „%s“"
 
-#: pathspec.c:427
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: опциите „literal“ и „glob“ �а не�ъвме�тими"
 
-#: pathspec.c:440
+#: pathspec.c:466
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: „%s“ е извън хранилището"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: „%s“ е извън хранилището при „%s“"
 
-#: pathspec.c:514
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "„%s“ (клавиш: „%c“)"
 
-#: pathspec.c:524
+#: pathspec.c:552
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: магиче�ките пътища не �е поддържат от командата „%s“"
 
-#: pathspec.c:591
+#: pathspec.c:619
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "път�т „%s“ е �лед �имволна връзка"
 
+#: pathspec.c:664
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "неправилно цитиран ред: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "пакетът за изчи�тване на буферите не може да �е запише"
@@ -4763,148 +6413,184 @@ msgid "unable to write delim packet"
 msgstr "раздел�щи�т пакет не може да �е запише"
 
 #: pkt-line.c:106
+msgid "unable to write response end packet"
+msgstr "пакетът за край на отговора не може да �е запише"
+
+#: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "неу�пешно изчи�тване на буферите при запи� на пакет"
 
-#: pkt-line.c:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:265
 msgid "protocol error: impossibly long line"
 msgstr "протоколна грешка: прекалено дълъг ред"
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr "неу�пешен запи� на пакет � формат"
 
-#: pkt-line.c:196
+#: pkt-line.c:204
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 "неу�пешен запи� на пакетен файл — данните надвишават мак�имални�т размер на "
 "пакет"
 
-#: pkt-line.c:203 pkt-line.c:210
-msgid "packet write failed"
-msgstr "неу�пешен запи� на пакет"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "неу�пешен запи� на пакет: %s"
 
-#: pkt-line.c:295
+#: pkt-line.c:328 pkt-line.c:329
 msgid "read error"
 msgstr "грешка при четене"
 
-#: pkt-line.c:303
+#: pkt-line.c:339 pkt-line.c:340
 msgid "the remote end hung up unexpectedly"
 msgstr "отдалеченото хранилище неочаквано прекъ�на връзката"
 
-#: pkt-line.c:331
+#: pkt-line.c:369 pkt-line.c:371
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "протоколна грешка: неправилeн знак за дължина на ред: %.4s"
 
-#: pkt-line.c:341 pkt-line.c:346
+#: 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 "протоколна грешка: неправилна дължина на ред: %d"
 
-#: pkt-line.c:362
+#: pkt-line.c:413 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "отдалечена грешка: %s"
 
-#: preload-index.c:119
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr "Обнов�ване на индек�а"
 
-#: preload-index.c:138
+#: preload-index.c:144
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "не може да �е �ъздаде нишка за изпълнението на „lstat“: %s"
 
-#: pretty.c:966
+#: pretty.c:988
 msgid "unable to parse --pretty format"
 msgstr "аргументът към опци�та „--pretty“ не може да �е анализира"
 
-#: promisor-remote.c:25
-msgid "Remote with no URL"
-msgstr "Лип�ва адре� за отдалеченото хранилище"
+#: promisor-remote.c:31
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "хранилище-гарант: неу�пешно �ъздаване на проце� за до�тав�не"
+
+#: promisor-remote.c:38 promisor-remote.c:40
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "хранилище-гарант: не може да �е пише към проце�а за до�тав�не"
+
+#: promisor-remote.c:44
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+"хранилище-гарант: �тандартни�т вход на проце�а за до�тав�не не може да �е "
+"затвори"
 
-#: promisor-remote.c:61
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr ""
 "името отдалеченото хранилище-гарант не може за започва �ъ� знака „/“: %s"
 
-#: range-diff.c:71
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: �лед аргументите �е очаква изчи�тване на буферите"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Изтриване на повтар�щите �е обекти"
+
+#: range-diff.c:78
 msgid "could not start `log`"
 msgstr "командата за журнала � подавани� „log“ не може да �е �тартира"
 
-#: range-diff.c:73
+#: range-diff.c:80
 msgid "could not read `log` output"
 msgstr ""
 "изходът от командата за журнала � подавани� „log“ не може да �е прочете"
 
-#: range-diff.c:92 sequencer.c:4985
+#: range-diff.c:101 sequencer.c:5550
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "подаването „%s“ не може да бъде анализирано"
 
-#: range-diff.c:118
+#: range-diff.c:115
+#, 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
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "заглавната ча�т на git „%.*s“ не може да �е анализира"
 
-#: range-diff.c:275
+#: range-diff.c:307
 msgid "failed to generate diff"
 msgstr "неу�пешно тър�ене на разлика"
 
-#: range-diff.c:507 range-diff.c:509
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "опциите „--left-only“ и „--right-only“ �а не�ъвме�тими"
+
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "журналът � подавани�та на „%s“ не може да бъде анализиран"
 
-#: read-cache.c:680
+#: read-cache.c:710
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 "н�ма да бъде добавен п�евдоним за файл „%s“ („%s“ вече �ъще�твува в индек�а)"
 
-#: read-cache.c:696
+#: read-cache.c:726
 msgid "cannot create an empty blob in the object database"
 msgstr "в базата от данни за обектите не може да �е �ъздаде празен обект-BLOB"
 
-#: read-cache.c:718
+#: read-cache.c:748
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s: може да добав�те �амо обикновени файлове, �имволни връзки и директории "
 "на git"
 
-#: read-cache.c:723
+#: read-cache.c:753
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "не е изтеглено подаване в „%s“"
 
-#: read-cache.c:775
+#: read-cache.c:805
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "файлът „%s“ не може да бъде индек�иран"
 
-#: read-cache.c:794
+#: read-cache.c:824
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "„%s“ не може да �е добави в индек�а"
 
-#: read-cache.c:805
+#: read-cache.c:835
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "„stat“ не може да �е изпълни върху „%s“"
 
-#: read-cache.c:1314
+#: read-cache.c:1358
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "„%s“ �ъще�твува и като файл, и като директори�"
 
-#: read-cache.c:1520
+#: read-cache.c:1573
 msgid "Refresh index"
 msgstr "Обнов�ване на индек�а"
 
-#: read-cache.c:1635
+#: read-cache.c:1705
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4913,7 +6599,7 @@ msgstr ""
 "Зададена е неправилна �тойно�т на на�тройката „index.version“.\n"
 "Ще �е ползва вер�и� %i"
 
-#: read-cache.c:1645
+#: read-cache.c:1715
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4923,146 +6609,161 @@ msgstr ""
 "„GIT_INDEX_VERSION“.\n"
 "Ще �е ползва вер�и� %i"
 
-#: read-cache.c:1701
+#: read-cache.c:1771
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "неправилен подпи�: „0x%08x“"
 
-#: read-cache.c:1704
+#: read-cache.c:1774
 #, c-format
 msgid "bad index version %d"
 msgstr "неправилна вер�и� на индек�а %d"
 
-#: read-cache.c:1713
+#: read-cache.c:1783
 msgid "bad index file sha1 signature"
 msgstr "неправилен подпи� за контролна �ума по SHA1 на файла на индек�а"
 
-#: read-cache.c:1743
+#: read-cache.c:1817
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 "индек�ът ползва разширение „%.4s“, което не �е поддържа от тази вер�и� на git"
 
-#: read-cache.c:1745
+#: read-cache.c:1819
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "игнориране на разширението „%.4s“"
 
-#: read-cache.c:1782
+#: read-cache.c:1856
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "непознат формат на запи� в индек�а: „0x%08x“"
 
-#: read-cache.c:1798
+#: read-cache.c:1872
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "неправилно име на поле в индек�а близо до път� „%s“"
 
-#: read-cache.c:1855
+#: read-cache.c:1929
 msgid "unordered stage entries in index"
 msgstr "неподредени запи�и в индек�а"
 
-#: read-cache.c:1858
+#: read-cache.c:1932
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "множе�тво запи�и за �лети� файл „%s“"
 
-#: read-cache.c:1861
+#: read-cache.c:1935
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "неподредени запи�и за „%s“"
 
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: 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:522 builtin/checkout.c:711 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:331
 msgid "index file corrupt"
 msgstr "файлът � индек�а е повреден"
 
-#: read-cache.c:2108
+#: read-cache.c:2185
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "не може да �е �ъздаде нишка за зареждане на обектите от кеша: %s"
 
-#: read-cache.c:2121
+#: read-cache.c:2198
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "не може да �е изчака нишка за зареждане на обектите от кеша: %s"
 
-#: read-cache.c:2154
+#: read-cache.c:2231
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: неу�пешно отвар�не на файла на индек�а"
 
-#: read-cache.c:2158
+#: read-cache.c:2235
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: не може да �е получи информаци� за отворени� индек� �ъ� „stat“"
 
-#: read-cache.c:2162
+#: read-cache.c:2239
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: файлът на индек�а е по-малък от очакваното"
 
-#: read-cache.c:2166
+#: read-cache.c:2243
 #, 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:2208
+#: read-cache.c:2286
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 "не може да �е �ъздаде нишка за зареждане на разширени�та на индек�а: %s"
 
-#: read-cache.c:2235
+#: read-cache.c:2313
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 "не може да �е �ъздаде нишка за зареждане на разширени�та на индек�а: %s"
 
-#: read-cache.c:2267
+#: read-cache.c:2351
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "�поделени�т индек� „%s“ не може да �е обнови"
 
-#: read-cache.c:2314
+#: read-cache.c:2398
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "грешки в индек�а — в „%2$s“ �е очаква „%1$s“, а бе получено „%3$s“"
 
-#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3031 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
 #, c-format
 msgid "could not close '%s'"
 msgstr "„%s“ не може да �е затвори"
 
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
+#: read-cache.c:3074
+msgid "failed to convert to a sparse-index"
+msgstr "индек�ът не може да бъде превърнат в ча�тичен"
+
+#: read-cache.c:3145 sequencer.c:2684 sequencer.c:4440
 #, c-format
 msgid "could not stat '%s'"
 msgstr "неу�пешно изпълнение на „stat“ върху „%s“"
 
-#: read-cache.c:3126
+#: read-cache.c:3158
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "не може да �е отвори директори�та на git: %s"
 
-#: read-cache.c:3138
+#: read-cache.c:3170
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: read-cache.c:3163
+#: read-cache.c:3199
 #, c-format
 msgid "cannot fix permission bits on '%s'"
-msgstr "правата за до�тъп до „%s“ не могат да бъдат поправени"
+msgstr "правата за до�тъп до „%s“ не може да бъдат поправени"
 
-#: read-cache.c:3312
+#: read-cache.c:3348
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: не може да �е премине към етап №0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Може да промените това � командите „git rebase --edit-todo“ и „git rebase --"
+"continue“ �лед това.\n"
+"Може и да преу�тановите пребазирането � командата „git rebase --abort“.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
@@ -5070,7 +6771,7 @@ msgstr ""
 "�епозната �тойно�т „%s“ за на�тройката „rebase.missingCommitsCheck“.  "
 "�а�тройката �е пре�кача."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -5078,7 +6779,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"
@@ -5087,19 +6791,21 @@ 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"
 "Команди:\n"
 " p, pick ПОД�В��Е   — прилагане на подаването\n"
-" r, reword ПОД�В��Е — прилагане на подаването, но �м�на на �ъобщението му\n"
+" r, reword ПОД�В��Е — прилагане на подаването, но пром�на на �ъобщението му\n"
 " e, edit ПОД�В��Е   — прилагане на подаването и �пиране при него за още "
 "промени\n"
 " s, squash ПОД�В��Е — вкарване на подаването в предходното му\n"
-" f, fixup ПОД�В��Е  — вкарване на подаването в предходното му, без �м�на на\n"
-"                      �ъобщението\n"
+" f, fixup [-C | -c] ПОД�В��Е\n"
+"                    — вкарване на подаването в предходното му, без �м�на на\n"
+"                      �ъобщението.  С „-C“ �е използва �амо �ъобщението на\n"
+"                      на�то�щото, а � „-c“ о�вен това �е отвар� редакторът\n"
 " x, exec ПОД�В��Е   — изпълнение на команда към обвивката: о�таналата ча�т "
 "на\n"
 "                      реда\n"
@@ -5117,23 +6823,22 @@ msgstr ""
 "Може да промен�те по�ледователно�тта на редовете — те �е изпълн�ват\n"
 "по�ледователно отгоре-надолу.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:66
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Пребазиране на „%s“ върху „%s“ (%d команди)"
 msgstr[1] "Пребазиране на „%s“ върху „%s“ (%d команда)"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: 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"
 msgstr ""
 "\n"
-"�е изтривайте редове.  Подавани�та могат да �е пре�качат � командата "
-"„drop“.\n"
+"�е изтривайте редове.  Подавани�та може да �е пре�качат � командата „drop“.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5141,7 +6846,7 @@ msgstr ""
 "\n"
 "�ко изтриете ред, �ъответ�тващото му подаване ще бъде ИЗТРИТО.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5156,7 +6861,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -5166,22 +6871,19 @@ msgstr ""
 "�ко изтриете в�ичко, пребазирането ще бъде преу�тановено.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Празните подавани� �а коментирани"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
+#: 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 "„%s“ не може да �е запише"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "„%s“ не може да �е копира като „%s“."
+msgid "could not write '%s'."
+msgstr "„%s“ не може да �е запише."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:196
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -5190,7 +6892,7 @@ msgstr ""
 "Предупреждение: н�кои подавани� може да �а пропу�нати.\n"
 "Пропу�нати подавани� (новите �а най-отгоре):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:203
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -5207,124 +6909,14 @@ msgstr ""
 "предупреждение)\n"
 "или „error“ (�читане за грешка).\n"
 
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "„%s“ не �очи към позволен обект!"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "игнориране на указател на обект извън клон „%s“"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "игнориране на повредени� указател „%s“"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "„%s“ не може да бъде отворен за запи�: %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "указател�т „%s“ не може да �е прочете"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "указател�т „%s“ вече �ъще�твува"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "неочакван идентификатор на обект при запи�ването на „%s“"
-
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
+#: 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 write to '%s'"
-msgstr "в „%s“ не може да �е пише"
-
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1004
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "„%s“ не може да бъде отворен за запи�"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "неочакван идентификатор на обект при изтриването на „%s“"
-
-#: refs.c:998
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "има пропу�ки в журнала � подавани�та за указател� „%s“ �лед „%s“"
-
-#: refs.c:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "журналът � подавани�та за указател� „%s“ �вършва неочаквано �лед „%s“"
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "журналът � подавани�та за указател� „%s“ е празен"
-
-#: refs.c:1155
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "указател не може да �е обнови � грешно име „%s“"
-
-#: refs.c:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "неу�пешно обнов�ване на указател� „%s“: %s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "не �а позволени повече от една промени на указател� „%s“"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "обнов�вани�та на указатели �а забранени в �реди под карантина"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "„%s“ �ъще�твува, не може да �е �ъздаде „%s“"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "невъзможно е едновременно да �е обработват „%s“ и „%s“"
-
-#: refs/files-backend.c:1234
-#, c-format
-msgid "could not remove reference %s"
-msgstr "Указател�т „%s“ не може да бъде изтрит"
-
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Указател�т „%s“ не може да бъде изтрит: %s"
-
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "Указателите не може да бъдат изтрити: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "неправилен указател: „%s“"
+msgid "could not read '%s'."
+msgstr "от „%s“ не може да �е чете."
 
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
 msgstr "изтрит"
 
@@ -5343,281 +6935,410 @@ msgstr "назад � %d"
 msgid "ahead %d, behind %d"
 msgstr "напред � %d, назад � %d"
 
-#: ref-filter.c:165
+#: ref-filter.c:230
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "очакван формат: %%(color:ЦВЯТ)"
 
-#: ref-filter.c:167
+#: ref-filter.c:232
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "непознат цв�т: %%(color:%s)"
 
-#: ref-filter.c:189
+#: ref-filter.c:254
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "очаква �е ц�ло чи�ло за „refname:lstrip=%s“"
 
-#: ref-filter.c:193
+#: ref-filter.c:258
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "очаква �е ц�ло чи�ло за „refname:rstrip=%s“"
 
-#: ref-filter.c:195
+#: ref-filter.c:260
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "непознат аргумент за „%%(%s)“: %s"
 
-#: ref-filter.c:250
+#: ref-filter.c:315
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) не приема аргументи"
 
-#: ref-filter.c:272
+#: ref-filter.c:339
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "непознат аргумент за %%(objectsize): %s"
 
-#: ref-filter.c:280
+#: ref-filter.c:347
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) не приема аргументи"
 
-#: ref-filter.c:292
+#: ref-filter.c:359
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) не приема аргументи"
 
-#: ref-filter.c:301
+#: ref-filter.c:372
+#, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "непознат аргумент за %%(subject): %s"
+
+#: ref-filter.c:391
 #, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) не приема аргументи"
+msgid "expected %%(trailers:key=<value>)"
+msgstr "очаква �е %%(trailers:КЛЮЧ=СТОЙ�ОСТ)"
 
-#: ref-filter.c:323
+#: ref-filter.c:393
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "непознат аргумент „%%(trailers)“: %s"
 
-#: ref-filter.c:352
+#: ref-filter.c:424
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "очаква �е положителна �тойно�т за „contents:lines=%s“"
 
-#: ref-filter.c:354
+#: ref-filter.c:426
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "непознат аргумент за %%(contents): %s"
 
-#: ref-filter.c:369
+#: ref-filter.c:441
 #, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "очаква �е положителна �тойно�т за „objectname:short=%s“"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "очаква �е положителна �тойно�т за „%s“ в %%(%s)"
 
-#: ref-filter.c:373
+#: ref-filter.c:445
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "непознат аргумент за %%(objectname): %s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "непознат аргумент „%s“ в %%(%s)"
 
-#: ref-filter.c:403
+#: ref-filter.c:459
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "непозната опци� за е-поща: %s"
+
+#: ref-filter.c:489
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "очакван формат: %%(align:ШИРОЧИ��,ПОЗИЦИЯ)"
 
-#: ref-filter.c:415
+#: ref-filter.c:501
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "непозната позици�: %s"
 
-#: ref-filter.c:422
+#: ref-filter.c:508
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "непозната широчина: %s"
 
-#: ref-filter.c:431
+#: ref-filter.c:517
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "непознат аргумент за %%(align): %s"
 
-#: ref-filter.c:439
+#: ref-filter.c:525
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "очаква �е положителна широчина � лек�емата „%%(align)“"
 
-#: ref-filter.c:457
+#: ref-filter.c:543
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "непознат аргумент за „%%(if)“: %s"
 
-#: ref-filter.c:559
+#: ref-filter.c:645
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "неправилно име на обект: „%.*s“"
 
-#: ref-filter.c:586
+#: ref-filter.c:672
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "непознато име на обект: „%.*s“"
 
-#: ref-filter.c:590
+#: ref-filter.c:676
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr "не е хранилище на git, а полето „%.*s“ изи�ква до�тъп данни на обектни"
 
-#: ref-filter.c:714
+#: ref-filter.c:801
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "формат: лек�емата %%(if) е използвана без �ъответната � %%(then)"
 
-#: ref-filter.c:777
+#: ref-filter.c:865
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "формат: лек�емата %%(then) е използвана без �ъответната � %%(if)"
 
-#: ref-filter.c:779
+#: ref-filter.c:867
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "формат: лек�емата %%(then) е използвана повече от един път"
 
-#: ref-filter.c:781
+#: ref-filter.c:869
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "формат: лек�емата %%(then) е използвана �лед %%(else)"
 
-#: ref-filter.c:809
+#: ref-filter.c:897
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "формат: лек�емата %%(else) е използвана без �ъответната � %%(if)"
 
-#: ref-filter.c:811
+#: ref-filter.c:899
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "формат: лек�емата %%(else) е използвана без �ъответната � %%(then)"
 
-#: ref-filter.c:813
+#: ref-filter.c:901
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "формат: лек�емата %%(else) е използвана повече от един път"
 
-#: ref-filter.c:828
+#: ref-filter.c:916
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "формат: лек�емата %%(end) е използвана без �ъответната �"
 
-#: ref-filter.c:885
+#: ref-filter.c:973
 #, c-format
 msgid "malformed format string %s"
 msgstr "неправилен форматиращ низ „%s“"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1621
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(извън клон, пребазиране на „%s“)"
+
+#: ref-filter.c:1624
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(извън клон, пребазиране на не�вързан указател „HEAD“ при „%s“)"
+
+#: ref-filter.c:1627
 #, c-format
-msgid "no branch, rebasing %s"
-msgstr "извън клон, пребазиране на „%s“"
+msgid "(no branch, bisect started on %s)"
+msgstr "(извън клон, двоично тър�ене от „%s“)"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1631
 #, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "извън клон, пребазиране на не�вързан указател „HEAD“ при „%s“"
+msgid "(HEAD detached at %s)"
+msgstr "(указател�т „HEAD“ не е �вързан и е при „%s“)"
 
-#: ref-filter.c:1494
+#: ref-filter.c:1634
 #, c-format
-msgid "no branch, bisect started on %s"
-msgstr "извън клон, двоично тър�ене от „%s“"
+msgid "(HEAD detached from %s)"
+msgstr "(указател�т „HEAD“ не е �вързан и е отделѐн от „%s“)"
 
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "извън клон"
+#: ref-filter.c:1637
+msgid "(no branch)"
+msgstr "(извън клон)"
 
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1669 ref-filter.c:1880
 #, c-format
 msgid "missing object %s for %s"
 msgstr "обектът „%s“ лип�ва за „%s“"
 
-#: ref-filter.c:1550
+#: ref-filter.c:1679
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "неу�пешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
 
-#: ref-filter.c:2004
+#: ref-filter.c:2064
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "обект �ъ� �грешен формат при „%s“"
 
-#: ref-filter.c:2093
+#: ref-filter.c:2153
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "игнориране на указател� � грешно име „%s“"
 
-#: ref-filter.c:2389
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "грешка във форма̀та: лип�ва лек�емата %%(end)"
-
-#: ref-filter.c:2489
+#: ref-filter.c:2158 refs.c:676
 #, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "опциите „%s“ и „--merged“ �а не�ъвме�тими"
+msgid "ignoring broken ref %s"
+msgstr "игнориране на повредени� указател „%s“"
 
-#: ref-filter.c:2492
+#: ref-filter.c:2498
 #, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "опциите „%s“ и „--no-merged“ �а не�ъвме�тими"
+msgid "format: %%(end) atom missing"
+msgstr "грешка във форма̀та: лип�ва лек�емата %%(end)"
 
-#: ref-filter.c:2502
+#: ref-filter.c:2592
 #, c-format
 msgid "malformed object name %s"
 msgstr "неправилно име на обект „%s“"
 
-#: ref-filter.c:2507
+#: ref-filter.c:2597
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "опци�та „%s“ не �очи към подаване"
 
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "„%s“ не �очи към позволен обект!"
+
+#: 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 ""
+"Първоначални�т клон ще �е казва „%s“.  Това може да �е промени.  Може да "
+"зададете\n"
+"на�тройката и да �прете това �ъобщение.  За това изпълнете:\n"
+"\n"
+"    git config --global init.defaultBranch ИМЕ\n"
+"\n"
+"Че�то ползвани варианти вме�то „master“ �а „main“, „trunk“ и „development“.\n"
+"За да преименувата току що �ъздаден клон, изпълнете:\n"
+"\n"
+"    git branch -m ИМЕ\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "„%s“ не може да бъде получен"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "неправилно име на клон: „%s = %s“"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "игнориране на указател на обект извън клон „%s“"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "има пропу�ки в журнала � подавани�та за указател� „%s“ �лед „%s“"
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "журналът � подавани�та за указател� „%s“ �вършва неочаквано �лед „%s“"
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "журналът � подавани�та за указател� „%s“ е празен"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "указател не може да �е обнови � грешно име „%s“"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "неу�пешно обнов�ване на указател� „%s“: %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "не �а позволени повече от една промени на указател� „%s“"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "обнов�вани�та на указатели �а забранени в �реди под карантина"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "обнов�вани�та на указатели �а преу�тановени от кука"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "„%s“ �ъще�твува, не може да �е �ъздаде „%s“"
+
+#: refs.c:2248 refs.c:2283
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "невъзможно е едновременно да �е обработват „%s“ и „%s“"
+
+#: refs/files-backend.c:1228
+#, 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
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "Указател�т „%s“ не може да бъде изтрит: %s"
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr "Указателите не може да бъдат изтрити: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "неправилен указател: „%s“"
+
+#: remote.c:351
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "�ъкращението за отдалечено хранилище не може за започва �ъ� знака „/“: %s"
 
-#: remote.c:413
+#: remote.c:399
 msgid "more than one receivepack given, using the first"
 msgstr "зададен е повече от един пакет за получаване, ще �е ползва първи�т"
 
-#: remote.c:421
+#: remote.c:407
 msgid "more than one uploadpack given, using the first"
 msgstr "зададен е повече от един пакет за изпращане, ще �е ползва първи�т"
 
-#: remote.c:611
+#: remote.c:590
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�евъзможно е да �е до�тав�т едновременно и „%s“, и „%s“ към „%s“"
 
-#: remote.c:615
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "„%s“ обикновено �леди „%s“, а не „%s“"
 
-#: remote.c:619
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "„%s“ �леди както „%s“, така и „%s“"
 
-#: remote.c:687
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "ключ „%s“ на шаблона не �ъдържа „*“"
 
-#: remote.c:697
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "�тойно�т „%s“ на шаблона не �ъдържа „*“"
 
-#: remote.c:1003
+#: remote.c:1083
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "указател�т на вер�и�-източник „%s“ не �ъвпада � никой обект"
 
-#: remote.c:1008
+#: remote.c:1088
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "указател�т на вер�и�-източник „%s“ �ъвпада � повече от един обект"
@@ -5626,7 +7347,7 @@ msgstr "указателÑ�Ñ‚ на верÑ�иÑ�-източник „%s“ Ñ�ъвÐ
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1023
+#: remote.c:1103
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5639,7 +7360,7 @@ msgid ""
 "\n"
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
-"Зададената цел не е пълен указател (не започва � „refs/“).\n"
+"Зададената цел не е пълно име на указател (не започва � „refs/“).\n"
 "Б�ха пробвани �ледните варианти:\n"
 "\n"
 "  � указател от отдалеченото хранилище, който да �ъответ�тва на „%s“;\n"
@@ -5650,7 +7371,7 @@ msgstr ""
 "�икой от вариантите не �работи.  Тр�бва �ами да укажете пълното име на\n"
 "указател�."
 
-#: remote.c:1043
+#: remote.c:1123
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5661,7 +7382,7 @@ msgstr ""
 "като\n"
 "изтла�кате към „%s:refs/heads/%s“?"
 
-#: remote.c:1048
+#: remote.c:1128
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5672,7 +7393,7 @@ msgstr ""
 "като\n"
 "изтла�кате към „%s:refs/tags/%s“?"
 
-#: remote.c:1053
+#: remote.c:1133
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5682,7 +7403,7 @@ msgstr ""
 "ИЗТОЧ�ИКът е обект-дърво.  �е целите ли в�ъщно�т да �ъздадете нов клон като\n"
 "изтла�кате към „%s:refs/tags/%s“?"
 
-#: remote.c:1058
+#: remote.c:1138
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5692,118 +7413,118 @@ msgstr ""
 "ИЗТОЧ�ИКът е обект-BLOB.  �е целите ли в�ъщно�т да �ъздадете нов клон като\n"
 "изтла�кате към „%s:refs/tags/%s“?"
 
-#: remote.c:1094
+#: remote.c:1174
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "не е открит клон �ъответ�тващ на „%s“"
 
-#: remote.c:1105
+#: remote.c:1185
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "„%s“ не може да �е изтрие: отдалечени� указател не �ъще�твува"
 
-#: remote.c:1117
+#: remote.c:1197
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "указател�т на вер�и�-цел „%s“ �ъвпада � повече от един обект"
 
-#: remote.c:1124
+#: remote.c:1204
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 "указател�т на вер�и�-цел „%s“ �ъответ�тва и ще получава от повече от един "
 "източник"
 
-#: remote.c:1627 remote.c:1728
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
 msgstr "Указател�т „HEAD“ не �очи към клон"
 
-#: remote.c:1636
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "н�ма клон на име „%s“"
 
-#: remote.c:1639
+#: remote.c:1736
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "не е зададен клон-източник за клона „%s“"
 
-#: remote.c:1645
+#: remote.c:1742
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "клонът-източник „%s“ не е �ъхранен като �лед�щ клон"
 
-#: remote.c:1660
+#: remote.c:1757
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "лип�ва локален �лед�щ клон за ме�тоположението за изтла�кване „%s“ в "
 "хранилището „%s“"
 
-#: remote.c:1672
+#: remote.c:1769
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "н�ма информаци� клонът „%s“ да �леди н�кой друг"
 
-#: remote.c:1682
+#: remote.c:1779
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "указател�т за изтла�кване на „%s“ не включва „%s“"
 
-#: remote.c:1695
+#: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "указател�т за изтла�кване не включва цел („push.default“ е „nothing“)"
 
-#: remote.c:1717
+#: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "про�тото (simple) изтла�кване не �ъответ�тва на една цел"
 
-#: remote.c:1843
+#: remote.c:1943
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "отдалечени�т указател „%s“ не може да бъде открит"
 
-#: remote.c:1856
+#: remote.c:1956
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "• пре�качане на неочаквани� локален указател „%s“"
 
-#: remote.c:2019
+#: remote.c:2119
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Този клон �леди „%s“, но �ледени�т клон е изтрит.\n"
 
-#: remote.c:2023
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
 
-#: remote.c:2026
+#: remote.c:2126
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
-msgstr "Клонът е актуализиран към „%s“.\n"
+msgstr "Клонът е обновен към „%s“.\n"
 
-#: remote.c:2030
+#: remote.c:2130
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Клонът ви и „%s“ �очат към различни подавани�.\n"
 
-#: remote.c:2033
+#: remote.c:2133
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (за повече информаци� ползвайте „%s“)\n"
 
-#: remote.c:2037
+#: 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] "Клонът ви е � %2$d подаване пред „%1$s“.\n"
 msgstr[1] "Клонът ви е � %2$d подавани� пред „%1$s“.\n"
 
-#: remote.c:2043
+#: remote.c:2143
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (публикувайте локалните �и промени чрез „git push“)\n"
 
-#: remote.c:2046
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5811,11 +7532,11 @@ msgid_plural ""
 msgstr[0] "Клонът ви е � %2$d подаване зад „%1$s“ и може да бъде превърт�н.\n"
 msgstr[1] "Клонът ви е � %2$d подавани� зад „%1$s“ и може да бъде превърт�н.\n"
 
-#: remote.c:2054
+#: remote.c:2154
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (обновете локални� �и клон чрез „git pull“)\n"
 
-#: remote.c:2057
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5830,11 +7551,11 @@ msgstr[1] ""
 "Текущи�т клон �е е отделил от „%s“,\n"
 "двата имат �ъответно по %d и %d не�ъвпадащи подавани�.\n"
 
-#: remote.c:2067
+#: remote.c:2167
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (�лейте отдалечени� клон в локални� чрез „git pull“)\n"
 
-#: remote.c:2250
+#: remote.c:2359
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "очакваното име на обект „%s“ не може да бъде анализирано"
@@ -5849,136 +7570,145 @@ msgstr "неправилно име на указател за зам�на: „
 msgid "duplicate replace ref: %s"
 msgstr "повтар�щ �е указател за зам�на: „%s“"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "дълбочината на зам�на е прекалено гол�ма за обекта: „%s“"
 
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
 msgid "corrupt MERGE_RR"
 msgstr "повреден „MERGE_RR“ (запи� за коригиране на конфликт)"
 
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
 msgstr "приложеното коригиране на конфликт не може да бъде запи�ано"
 
-#: rerere.c:495
+#: rerere.c:479
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
 msgstr "грешки при запи�ването на „%s“ (%s)"
 
-#: rerere.c:498
+#: rerere.c:482
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "грешка при изчи�тването на буферите при запи�ването на „%s“"
 
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
 #, c-format
 msgid "could not parse conflict hunks in '%s'"
 msgstr "парчетата � конфликти в „%s“ не може да �е анализират"
 
-#: rerere.c:684
+#: rerere.c:668
 #, c-format
 msgid "failed utime() on '%s'"
 msgstr "неу�пешно задаване на време на до�тъп/�ъздаване чрез „utime“ на „%s“"
 
-#: rerere.c:694
+#: rerere.c:678
 #, c-format
 msgid "writing '%s' failed"
 msgstr "неу�пешен запи� на „%s“"
 
-#: rerere.c:714
+#: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
 msgstr ""
 "„%s“ е добавен към индек�а � преизползване на запазена корекци� при �ливане"
 
-#: rerere.c:753
+#: rerere.c:737
 #, c-format
 msgid "Recorded resolution for '%s'."
 msgstr "Корекци�та на конфликта при �ливане на „%s“ е запазена."
 
-#: rerere.c:788
+#: rerere.c:772
 #, c-format
 msgid "Resolved '%s' using previous resolution."
 msgstr ""
 "Конфликтът при �ливане на „%s“ е коригиран � преизползване на предишна "
 "корекци�."
 
-#: rerere.c:803
+#: rerere.c:787
 #, c-format
 msgid "cannot unlink stray '%s'"
 msgstr "излишни�т обект „%s“ не може да �е изтрие"
 
-#: rerere.c:807
+#: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
 msgstr "Предварителни�т вариант на „%s“ е запазен"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:865 submodule.c:2076 builtin/log.c:2002
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "Директори�та „%s“ не може да бъде �ъздадена"
 
-#: rerere.c:1057
+#: rerere.c:1041
 #, c-format
 msgid "failed to update conflicted state in '%s'"
 msgstr "конфликтът в „%s“ не може да �е обнови"
 
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
 #, c-format
 msgid "no remembered resolution for '%s'"
 msgstr "лип�ва запазена корекци� на конфликт при „%s“"
 
-#: rerere.c:1077
+#: rerere.c:1061
 #, c-format
 msgid "cannot unlink '%s'"
 msgstr "„%s“ не може да �е изтрие"
 
-#: rerere.c:1087
+#: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
 msgstr "Предварителни�т вариант на „%s“ е обновен"
 
-#: rerere.c:1096
+#: rerere.c:1080
 #, c-format
 msgid "Forgot resolution for '%s'\n"
 msgstr "Запазената корекци� на конфликт при „%s“ е премахната\n"
 
-#: rerere.c:1199
+#: rerere.c:1191
 msgid "unable to open rr-cache directory"
 msgstr "директори�та „rr-cache“ не може да �е отвори"
 
-#: revision.c:2509
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "не може да �е определи към какво да �очи указател�т „HEAD“"
+
+#: reset.c:70 reset.c:76 sequencer.c:3689
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "дървото, �очено от „%s“, не може да бъде открито"
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "опци�та „--unpacked=П�КЕТЕ�_Ф�ЙЛ“ вече не �е поддържа"
+
+#: revision.c:2684
 msgid "your current branch appears to be broken"
 msgstr "Текущи�т клон е повреден"
 
-#: revision.c:2512
+#: revision.c:2687
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Текущи�т клон „%s“ е без подавани� "
 
-#: revision.c:2720
-msgid "--first-parent is incompatible with --bisect"
-msgstr "опциите „--first-parent“ и „--bisect“ �а не�ъвме�тими"
-
-#: revision.c:2724
+#: revision.c:2893
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 "опци�та „-L“ поддържа един�твено форматирането на разликите �поред опциите „-"
 "p“ и „-s“"
 
-#: run-command.c:763
+#: run-command.c:766
 msgid "open /dev/null failed"
 msgstr "неу�пешно отвар�не на „/dev/null“"
 
-#: run-command.c:1269
+#: run-command.c:1274
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "не може да �е �ъздаде а�инхронна нишка: %s"
 
-#: run-command.c:1333
+#: run-command.c:1344
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -5988,32 +7718,45 @@ msgstr ""
 "За да изключите това предупреждение, изпълнете:\n"
 "    git config advice.ignoredHook false"
 
-#: send-pack.c:142
+#: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "неочакван изчи�тващ пакет „flush“ при изчитане на �ъ�то�нието от "
 "отдалеченото разпакетиране"
 
-#: send-pack.c:144
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr ""
 "�ъ�то�нието от отдалеченото разпакетиране не може да бъде анализирано: %s"
 
-#: send-pack.c:146
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "неу�пешно отдалечено разпакетиране: %s"
 
-#: send-pack.c:307
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "�ертификатът за изтла�кване не може да бъде подпи�ан"
 
-#: send-pack.c:421
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: неу�пешно �ъздаване на проце�"
+
+#: 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 ""
+"от�рещната �трана не поддържа алгоритъма за контролни �уми на това хранилище"
+
+#: send-pack.c:535
 msgid "the receiving end does not support --signed push"
 msgstr "от�рещната �трана не поддържа изтла�кване � опци�та „--signed“"
 
-#: send-pack.c:423
+#: send-pack.c:537
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -6021,47 +7764,47 @@ msgstr ""
 "от�рещната �трана не поддържа изтла�кване � опци�та „--signed“, затова не �е "
 "използва �ертификат"
 
-#: send-pack.c:435
+#: send-pack.c:544
 msgid "the receiving end does not support --atomic push"
 msgstr "получаващата �трана не поддържа изтла�кване � опци�та „--atomic“"
 
-#: send-pack.c:440
+#: send-pack.c:549
 msgid "the receiving end does not support push options"
 msgstr "от�рещната �трана не поддържа опции при изтла�кване"
 
-#: sequencer.c:187
+#: sequencer.c:196
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "не�ъще�твуващ режим на изчи�тване „%s“ на �ъобщение при подаване"
 
-#: sequencer.c:292
+#: sequencer.c:324
 #, c-format
 msgid "could not delete '%s'"
 msgstr "„%s“ не може да бъде изтрит"
 
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
 #, c-format
 msgid "could not remove '%s'"
 msgstr "„%s“ не може да бъде изтрит"
 
-#: sequencer.c:321
+#: sequencer.c:354
 msgid "revert"
 msgstr "отм�на"
 
-#: sequencer.c:323
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr "отбиране"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:358
+msgid "rebase"
+msgstr "пребазиране"
 
-#: sequencer.c:327
+#: sequencer.c:360
 #, c-format
 msgid "unknown action: %d"
 msgstr "неизве�тно дей�твие: %d"
 
-#: sequencer.c:385
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -6069,7 +7812,7 @@ msgstr ""
 "�лед коригирането на конфликтите, отбележете �ъответните\n"
 "пътища � „git add ПЪТ…“ или „git rm ПЪТ…“."
 
-#: sequencer.c:388
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -6079,110 +7822,109 @@ msgstr ""
 "пътища � „git add ПЪТ…“ или „git rm ПЪТ…“, �лед което\n"
 "подайте резултата � командата „git commit'“."
 
-#: sequencer.c:401 sequencer.c:2847
+#: sequencer.c:435 sequencer.c:3271
 #, c-format
 msgid "could not lock '%s'"
 msgstr "„%s“ не може да �е заключи"
 
-#: sequencer.c:408
+#: 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 "в „%s“ не може да �е пише"
+
+#: sequencer.c:442
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "кра�т на ред не може да �е запише в „%s“"
 
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
-#: sequencer.c:3130
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "„%s“ не може да �е завърши"
 
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
-#: builtin/rebase.c:568
-#, c-format
-msgid "could not read '%s'"
-msgstr "файлът „%s“ не може да бъде прочетен"
-
-#: sequencer.c:462
+#: sequencer.c:486
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "локалните ви промени ще бъдат презапи�ани при %s."
 
-#: sequencer.c:466
+#: sequencer.c:490
 msgid "commit your changes or stash them to proceed."
 msgstr "подайте или �катайте промените, за да продължите"
 
-#: sequencer.c:498
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: превъртане"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:561 builtin/tag.c:609
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "�е�ъще�твуващ режим на изчи�тване „%s“"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:631
+#: sequencer.c:671
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: нови�т индек� не може да бъде запазен"
 
-#: sequencer.c:648
+#: sequencer.c:685
 msgid "unable to update cache tree"
 msgstr "дървото на кеша не може да бъде обновено"
 
-#: sequencer.c:662
+#: sequencer.c:699
 msgid "could not resolve HEAD commit"
 msgstr "подаването, �очено от указател� „HEAD“, не може да бъде открито"
 
-#: sequencer.c:742
+#: sequencer.c:779
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "в „%.*s“ н�ма ключове"
 
-#: sequencer.c:753
+#: sequencer.c:790
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "цитирането на �тойно�тта на „%s“ не може да бъде изчи�тено"
 
-#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
+#: sequencer.c:827 wrapper.c:201 wrapper.c:371 builtin/am.c:729
+#: builtin/am.c:821 builtin/merge.c:1140 builtin/rebase.c:910
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "файлът не може да бъде прочетен: „%s“"
 
-#: sequencer.c:800
+#: sequencer.c:837
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "на�тройката за автор „GIT_AUTHOR_NAME“ вече е зададена"
 
-#: sequencer.c:805
+#: sequencer.c:842
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "на�тройката за е-поща „GIT_AUTHOR_EMAIL“ вече е зададена"
 
-#: sequencer.c:810
+#: sequencer.c:847
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "на�тройката за дата „GIT_AUTHOR_DATE“ вече е зададена"
 
-#: sequencer.c:814
+#: sequencer.c:851
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "непозната променлива „%s“"
 
-#: sequencer.c:819
+#: sequencer.c:856
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "на�тройката за автор „GIT_AUTHOR_NAME“ лип�ва"
 
-#: sequencer.c:821
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "на�тройката за е-поща „GIT_AUTHOR_EMAIL“ лип�ва"
 
-#: sequencer.c:823
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "на�тройката за дата „GIT_AUTHOR_DATE“ лип�ва"
 
-#: sequencer.c:872
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -6211,13 +7953,13 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:1146
+#: sequencer.c:1212
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 "неу�пешно изпълнение на куката при пром�на на �ъобщението при подаване "
 "(prepare-commit-msg)"
 
-#: sequencer.c:1153
+#: 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"
@@ -6232,8 +7974,7 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 "Името и адре�ът за е-поща �а на�троени автоматично на базата на името на\n"
-"потребител� и името на машината.  Проверете дали �а верни.  Можете да "
-"�прете\n"
+"потребител� и името на машината.  Проверете дали �а верни.  Може да �прете\n"
 "това �ъобщение като изрично зададете �тойно�тите.  Изпълнете �ледната "
 "команда\n"
 "и �ледвайте ин�трукциите в тек�тови� ви редактор, за да редактирате\n"
@@ -6241,12 +7982,12 @@ msgstr ""
 "\n"
 "    git config --global --edit\n"
 "\n"
-"След като направите това, можете да коригирате информаци�та за автора на\n"
+"След като направите това, може да коригирате информаци�та за автора на\n"
 "текущото подаване чрез:\n"
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1166
+#: 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"
@@ -6260,350 +8001,367 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 "Името и адре�ът за е-поща �а на�троени автоматично на базата на името на\n"
-"потребител� и името на машината.  Проверете дали �а верни.  Можете да "
-"�прете\n"
+"потребител� и името на машината.  Проверете дали �а верни.  Може да �прете\n"
 "това �ъобщение като изрично зададете �тойно�тите:\n"
 "\n"
 "    git config --global user.name \"Вашето Име\"\n"
 "    git config --global user.email пенчо@example.com\n"
 "\n"
-"След като направите това, можете да коригирате информаци�та за автора на\n"
+"След като направите това, може да коригирате информаци�та за автора на\n"
 "текущото подаване чрез:\n"
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1208
+#: sequencer.c:1273
 msgid "couldn't look up newly created commit"
 msgstr "току що �ъздаденото подаване не може да бъде открито"
 
-#: sequencer.c:1210
+#: sequencer.c:1275
 msgid "could not parse newly created commit"
 msgstr "току що �ъздаденото подаване не може да бъде анализирано"
 
-#: sequencer.c:1256
+#: sequencer.c:1321
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 "�ъ�то�нието �очено от указател� „HEAD“ не може да бъде открито �лед "
 "подаването"
 
-#: sequencer.c:1258
+#: sequencer.c:1323
 msgid "detached HEAD"
 msgstr "не�вързан връх „HEAD“"
 
-#: sequencer.c:1262
+#: sequencer.c:1327
 msgid " (root-commit)"
 msgstr " (начално подаване)"
 
-#: sequencer.c:1283
+#: sequencer.c:1348
 msgid "could not parse HEAD"
 msgstr "указател�т „HEAD“ не може да бъде анализиран"
 
-#: sequencer.c:1285
+#: sequencer.c:1350
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "указател�т „HEAD“ „%s“ �очи към нещо, което не е подаване!"
 
-#: sequencer.c:1289 builtin/commit.c:1571
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1702
 msgid "could not parse HEAD commit"
 msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
 
-#: sequencer.c:1341 sequencer.c:1933
+#: sequencer.c:1410 sequencer.c:2295
 msgid "unable to parse commit author"
 msgstr "авторът на подаването не може да бъде анализиран"
 
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:706
 msgid "git write-tree failed to write a tree"
 msgstr "Командата „git write-tree“ не у�п� да запише обект-дърво"
 
-#: sequencer.c:1369 sequencer.c:1429
+#: sequencer.c:1454 sequencer.c:1574
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "�ъобщението за подаване не може да бъде прочетено от „%s“"
 
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "неправилна �амолично�т за автор: „%s“"
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr "повредена информаци� за автор: лип�ва дата"
+
+#: sequencer.c:1530 builtin/am.c:1642 builtin/commit.c:1816 builtin/merge.c:909
+#: builtin/merge.c:934 t/helper/test-fast-rebase.c:78
 msgid "failed to write commit object"
 msgstr "обектът за подаването не може да бъде запи�ан"
 
-#: sequencer.c:1456
+#: 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 "„%s“ не може да �е обнови"
+
+#: sequencer.c:1606
 #, c-format
 msgid "could not parse commit %s"
 msgstr "подаването „%s“ не може да бъде анализирано"
 
-#: sequencer.c:1461
+#: sequencer.c:1611
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "родител�кото подаване „%s“ не може да бъде анализирано"
 
-#: sequencer.c:1535 sequencer.c:1645
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
 msgid "unknown command: %d"
 msgstr "непозната команда: %d"
 
-#: sequencer.c:1592 sequencer.c:1617
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "Това е 1-то �ъобщение при подаване:"
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Това е �ъобщение при подаване №%d:"
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "Съобщението при подаване №1 ще бъде пре�кочено:"
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Съобщението при подаване №%d ще бъде пре�кочено:"
+
+#: sequencer.c:1740
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Това е обединение от %d подавани�"
 
-#: sequencer.c:1602
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "„%s“ не може да �е запази"
+
+#: sequencer.c:1934
 msgid "need a HEAD to fixup"
 msgstr "За вкарване в предходното подаване ви тр�бва указател „HEAD“"
 
-#: sequencer.c:1604 sequencer.c:3157
+#: sequencer.c:1936 sequencer.c:3582
 msgid "could not read HEAD"
 msgstr "указател�т „HEAD“ не може да �е прочете"
 
-#: sequencer.c:1606
+#: sequencer.c:1938
 msgid "could not read HEAD's commit message"
 msgstr ""
 "�ъобщението за подаване към указател� „HEAD“ не може да бъде прочетено: %s"
 
-#: sequencer.c:1612
-#, c-format
-msgid "cannot write '%s'"
-msgstr "„%s“ не може да �е запази"
-
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
-msgid "This is the 1st commit message:"
-msgstr "Това е 1-то �ъобщение при подаване:"
-
-#: sequencer.c:1627
+#: sequencer.c:1962
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�ъобщението за подаване към „%s“ не може да бъде прочетено"
 
-#: sequencer.c:1634
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Това е �ъобщение при подаване №%d:"
-
-#: sequencer.c:1640
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Съобщение при подаване №%d ще бъде пре�кочено:"
-
-#: sequencer.c:1728
+#: sequencer.c:2072
 msgid "your index file is unmerged."
 msgstr "индек�ът не е �л�т."
 
-#: sequencer.c:1735
+#: sequencer.c:2079
 msgid "cannot fixup root commit"
 msgstr "началното подаване не може да �е вкара в предходното му"
 
-#: sequencer.c:1754
+#: sequencer.c:2098
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "подаването „%s“ е �ливане, но не е дадена опци�та „-m“"
 
-#: sequencer.c:1762 sequencer.c:1770
+#: sequencer.c:2106 sequencer.c:2114
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "подаването „%s“ н�ма родител %d"
 
-#: sequencer.c:1776
+#: sequencer.c:2120
 #, 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:1795
+#: sequencer.c:2139
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: неразпозната �тойно�т за родител�кото подаване „%s“"
 
-#: sequencer.c:1860
+#: sequencer.c:2205
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "„%s“ не може да �е преименува на „%s“"
 
-#: sequencer.c:1915
+#: sequencer.c:2265
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "подаването „%s“… не може да бъде отменено: „%s“"
 
-#: sequencer.c:1916
+#: sequencer.c:2266
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "подаването „%s“… не може да бъде приложено: „%s“"
 
-#: sequencer.c:1983
+#: sequencer.c:2287
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "пре�качане на %s %s — кръпката вече е приложена\n"
+
+#: sequencer.c:2345
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: неу�пешно изчитане на индек�а"
 
-#: sequencer.c:1990
+#: sequencer.c:2352
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: неу�пешно обнов�ване на индек�а"
 
-#: sequencer.c:2066
+#: sequencer.c:2425
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "„%s“ не приема аргументи: „%s“"
 
-#: sequencer.c:2075
+#: sequencer.c:2434
 #, c-format
 msgid "missing arguments for %s"
 msgstr "„%s“ изи�ква аргументи"
 
-#: sequencer.c:2112
+#: sequencer.c:2477
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "„%.*s“ не може да �е анализира"
+msgid "could not parse '%s'"
+msgstr "„%s“ не може да �е анализира"
 
-#: sequencer.c:2166
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "неправилен ред %d: %.*s"
 
-#: sequencer.c:2177
+#: sequencer.c:2549
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Без предишно подаване не може да �е изпълни „%s“"
 
-#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "от „%s“ не може да �е чете."
-
-#: sequencer.c:2261
+#: sequencer.c:2635
 msgid "cancelling a cherry picking in progress"
 msgstr "преу�танов�ване на извършваното в момента отбиране на подавани�"
 
-#: sequencer.c:2268
+#: sequencer.c:2644
 msgid "cancelling a revert in progress"
 msgstr "преу�танов�ване на извършваното в момента отм�на на подаване"
 
-#: sequencer.c:2302
+#: sequencer.c:2690
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "коригирайте това чрез „git rebase --edit-todo“."
 
-#: sequencer.c:2304
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "неизползваем файл � опи�ание на пред�то�щите дей�тви�: „%s“"
 
-#: sequencer.c:2309
+#: sequencer.c:2697
 msgid "no commits parsed."
 msgstr "никое от подавани�та не може да �е разпознае."
 
-#: sequencer.c:2320
+#: sequencer.c:2708
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 "по време на отм�на на подаване не може да �е извърши отбиране на подаване."
 
-#: sequencer.c:2322
+#: sequencer.c:2710
 msgid "cannot revert during a cherry-pick."
 msgstr "по време на отбиране не може да �е извърши отм�на на подаване."
 
-#: sequencer.c:2404
+#: sequencer.c:2788
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "неправилна �тойно�т за „%s“: „%s“"
 
-#: sequencer.c:2491
+#: sequencer.c:2897
 msgid "unusable squash-onto"
 msgstr "подаването, в което другите да �е вкарат, не може да �е използва"
 
-#: sequencer.c:2507
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "неправилен файл � опции: „%s“"
 
-#: sequencer.c:2590 sequencer.c:4308
+#: sequencer.c:3012 sequencer.c:4868
 msgid "empty commit set passed"
 msgstr "зададено е празно множе�тво от подавани�"
 
-#: sequencer.c:2606
+#: sequencer.c:3029
 msgid "revert is already in progress"
 msgstr "в момента вече �е извършва отм�на на подавани�"
 
-#: sequencer.c:2608
+#: sequencer.c:3031
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
 
-#: sequencer.c:2611
+#: sequencer.c:3034
 msgid "cherry-pick is already in progress"
 msgstr "в момента вече �е извършва отбиране на подавани�"
 
-#: sequencer.c:2613
+#: sequencer.c:3036
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "използвайте „git cherry-pick (--continue | %s--abort | --quit)“"
 
-#: sequencer.c:2627
+#: sequencer.c:3050
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 "директори�та за определ�нето на по�ледователно�тта „%s“ не може да бъде "
 "�ъздадена"
 
-#: sequencer.c:2642
+#: sequencer.c:3065
 msgid "could not lock HEAD"
 msgstr "указател�т „HEAD“ не може да �е заключи"
 
-#: sequencer.c:2702 sequencer.c:4057
+#: sequencer.c:3125 sequencer.c:4581
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 "в момента не �е извършва отбиране на подавани� или пребазиране на клона"
 
-#: sequencer.c:2704 sequencer.c:2715
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
 msgstr "Подаването �очено от указател� „HEAD“ не може да бъде открито"
 
-#: sequencer.c:2706 sequencer.c:2750
+#: sequencer.c:3129 sequencer.c:3173
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 "дей�твието не може да бъде преу�тановено, когато �те на клон, който тепърва "
 "пред�тои да бъде �ъздаден"
 
-#: sequencer.c:2736 builtin/grep.c:736
+#: sequencer.c:3159 builtin/grep.c:758
 #, c-format
 msgid "cannot open '%s'"
 msgstr "„%s“ не може да бъде отворен"
 
-#: sequencer.c:2738
+#: sequencer.c:3161
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "„%s“ не може да бъде прочетен: %s"
 
-#: sequencer.c:2739
+#: sequencer.c:3162
 msgid "unexpected end of file"
 msgstr "неочакван край на файл"
 
-#: sequencer.c:2745
+#: sequencer.c:3168
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 "запазени�т преди започването на отбирането файл за указател� „HEAD“ — „%s“ е "
 "повреден"
 
-#: sequencer.c:2756
+#: sequencer.c:3179
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Изглежда указател�т „HEAD“ е променен.  Проверете към какво �очи.\n"
 "�е �е прав�т промени."
 
-#: sequencer.c:2797
+#: sequencer.c:3220
 msgid "no revert in progress"
 msgstr "в момента не тече пребазиране"
 
-#: sequencer.c:2805
+#: sequencer.c:3229
 msgid "no cherry-pick in progress"
 msgstr "в момента не �е извършва отбиране на подавани�"
 
-#: sequencer.c:2815
+#: sequencer.c:3239
 msgid "failed to skip the commit"
 msgstr "неу�пешно пре�качане на подаването"
 
-#: sequencer.c:2822
+#: sequencer.c:3246
 msgid "there is nothing to skip"
 msgstr "н�ма какво да �е пре�кочи"
 
-#: sequencer.c:2825
+#: sequencer.c:3249
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6613,21 +8371,16 @@ msgstr ""
 "\n"
 "    git %s --continue"
 
-#: sequencer.c:2949 sequencer.c:3969
-#, c-format
-msgid "could not update %s"
-msgstr "„%s“ не може да �е обнови"
-
-#: sequencer.c:2987 sequencer.c:3949
+#: sequencer.c:3411 sequencer.c:4472
 msgid "cannot read HEAD"
 msgstr "указател�т „HEAD“ не може да бъде прочетен"
 
-#: sequencer.c:3004
+#: sequencer.c:3428
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "„%s“ не може да �е копира като „%s“"
 
-#: sequencer.c:3012
+#: sequencer.c:3436
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6646,27 +8399,27 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3022
+#: sequencer.c:3446
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Подаването „%s“… не може да бъде приложено: „%.*s“"
 
-#: sequencer.c:3029
+#: sequencer.c:3453
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "�евъзможно �ливане на „%.*s“"
 
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "„%s“ не може да �е копира като „%s“"
 
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
-msgid "could not read index"
-msgstr "индек�ът не може да бъде прочетен"
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr "В момента �е изпълн�ва: %s\n"
 
-#: sequencer.c:3074
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6681,11 +8434,11 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3080
+#: sequencer.c:3504
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "и промен� индек�а и/или работното дърво\n"
 
-#: sequencer.c:3086
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6702,111 +8455,124 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3147
+#: sequencer.c:3572
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "неправилно име на етикет: „%.*s“"
 
-#: sequencer.c:3201
+#: sequencer.c:3645
 msgid "writing fake root commit"
 msgstr "запазване на фалшиво начално подаване"
 
-#: sequencer.c:3206
+#: sequencer.c:3650
 msgid "writing squash-onto"
 msgstr "запазване на подаването, в което другите да �е вкарат"
 
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "дървото, �очено от „%s“, не може да бъде открито"
-
-#: sequencer.c:3262 builtin/rebase.c:874
-msgid "could not write index"
-msgstr "индек�ът не може да бъде запи�ан"
-
-#: sequencer.c:3289
+#: sequencer.c:3734
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "„%s“ не може да бъде открит"
 
-#: sequencer.c:3320
+#: sequencer.c:3767
 msgid "cannot merge without a current revision"
 msgstr "без текущо подаване не може да �е �лива"
 
-#: sequencer.c:3342
+#: sequencer.c:3789
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "„%.*s“ не може да �е анализира"
 
-#: sequencer.c:3351
+#: sequencer.c:3798
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "н�ма нищо за �ливане: „%.*s“"
 
-#: sequencer.c:3363
+#: sequencer.c:3810
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "върху начално подаване не може да �е извърши множе�твено �ливане"
 
-#: sequencer.c:3378
+#: sequencer.c:3826
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "�ъобщението за подаване към „%s“ не може да бъде получено"
 
-#: sequencer.c:3538
+#: sequencer.c:4009
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "�ливането на „%.*s“ не може даже да започне"
 
-#: sequencer.c:3554
+#: sequencer.c:4025
 msgid "merge: Unable to write new index file"
 msgstr "�ливане: нови�т индек� не може да бъде запазен"
 
-#: sequencer.c:3623 builtin/rebase.c:712
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr "�е може да �е �катае автоматично"
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "�еочакван резултат при �катаване: „%s“"
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Директори�та за „%s“ не може да бъде �ъздадена"
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "�втоматично �катано: „%s“\n"
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr "неу�пешно изпълнение на „git reset --hard“"
+
+#: sequencer.c:4140
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�втоматично �катаното е приложено.\n"
 
-#: sequencer.c:3635
+#: sequencer.c:4152
 #, c-format
 msgid "cannot store %s"
 msgstr "„%s“ не може да бъде запазен"
 
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
+#: sequencer.c:4155
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
-"Прилагането на автоматично �катаното доведе до конфликти.  Промените ви �а\n"
-"надеждно �катани.  Можете да пробвате да ги приложите чрез „git stash pop“\n"
-"или да ги изхвърлите чрез „git stash drop“, когато пои�кате.\n"
+"%s\n"
+"Промените ви �а надеждно �катани.  Може да пробвате да ги приложите чрез\n"
+"„git stash pop“ или да ги изхвърлите чрез „git stash drop“, когато "
+"пои�кате.\n"
 
-#: sequencer.c:3699
-#, c-format
-msgid "could not checkout %s"
-msgstr "„%s“ не може да �е изтегли"
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
+msgstr "Конфликти при прилагането на автоматично �катаното."
 
-#: sequencer.c:3713
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "„%s“ е неправилен идентификатор на обект"
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Вече има запи� за автоматично �катано, затова �е �ъздава нов запи�."
 
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
 msgstr "указател�т „HEAD“ не може да �е отдели"
 
-#: sequencer.c:3733
+#: sequencer.c:4248
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Бе �пр�но при „HEAD“\n"
 
-#: sequencer.c:3735
+#: sequencer.c:4250
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Бе �пр�но при „%s“\n"
 
-#: sequencer.c:3743
+#: sequencer.c:4258
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6829,48 +8595,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3827
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Пребазиране (%d/%d)%s"
+
+#: sequencer.c:4350
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Спиране при „%s“…  %.*s\n"
 
-#: sequencer.c:3898
+#: sequencer.c:4421
 #, c-format
 msgid "unknown command %d"
 msgstr "непозната команда %d"
 
-#: sequencer.c:3957
+#: sequencer.c:4480
 msgid "could not read orig-head"
 msgstr "указател�т за „orig-head“ не може да �е прочете"
 
-#: sequencer.c:3962
+#: sequencer.c:4485
 msgid "could not read 'onto'"
 msgstr "указател�т за „onto“ не може да �е прочете"
 
-#: sequencer.c:3976
+#: sequencer.c:4499
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "„HEAD“ не може да бъде обновен до „%s“"
 
-#: sequencer.c:4069
+#: sequencer.c:4559
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "У�пешно пребазиране и обнов�ване на „%s“.\n"
+
+#: sequencer.c:4611
 msgid "cannot rebase: You have unstaged changes."
 msgstr "не може да пребазирате, защото има промени, които не �а в индек�а."
 
-#: sequencer.c:4078
+#: sequencer.c:4620
 msgid "cannot amend non-existing commit"
 msgstr "не�ъще�твуващо подаване не може да �е поправи"
 
-#: sequencer.c:4080
+#: sequencer.c:4622
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "неправилен файл: „%s“"
 
-#: sequencer.c:4082
+#: sequencer.c:4624
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "неправилно �ъдържание: „%s“"
 
-#: sequencer.c:4085
+#: sequencer.c:4627
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6880,69 +8656,59 @@ msgstr ""
 "В работното дърво има неподадени промени.  Първо ги подайте, а �лед това\n"
 "отново изпълнете „git rebase --continue“."
 
-#: sequencer.c:4121 sequencer.c:4159
+#: sequencer.c:4663 sequencer.c:4702
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "файлът „%s“ не може да бъде запи�ан"
 
-#: sequencer.c:4174
+#: sequencer.c:4718
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "указател�т „CHERRY_PICK_HEAD“ не може да бъде изтрит"
 
-#: sequencer.c:4181
+#: sequencer.c:4725
 msgid "could not commit staged changes."
-msgstr "промените в индек�а не могат да бъдат подадени."
+msgstr "промените в индек�а не може да бъдат подадени."
 
-#: sequencer.c:4285
+#: sequencer.c:4845
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: не може да �е отбере „%s“"
 
-#: sequencer.c:4289
+#: sequencer.c:4849
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: неправилна вер�и�"
 
-#: sequencer.c:4324
+#: sequencer.c:4884
 msgid "can't revert as initial commit"
 msgstr "първоначалното подаване не може да бъде отменено"
 
-#: sequencer.c:4774
+#: sequencer.c:5361
 msgid "make_script: unhandled options"
 msgstr "make_script: неподдържани опции"
 
-#: sequencer.c:4777
+#: sequencer.c:5364
 msgid "make_script: error preparing revisions"
 msgstr "make_script: грешка при подготовката на вер�ии"
 
-#: sequencer.c:4935
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Може да промените това � командите „git rebase --edit-todo“ и „git rebase --"
-"continue“ �лед това.\n"
-"Може и да преу�тановите пребазирането � командата „git rebase --abort“.\n"
-
-#: sequencer.c:5047 sequencer.c:5064
+#: sequencer.c:5614 sequencer.c:5631
 msgid "nothing to do"
 msgstr "н�ма какво да �е прави"
 
-#: sequencer.c:5078
+#: sequencer.c:5650
 msgid "could not skip unnecessary pick commands"
 msgstr "излишните команди за отбиране не б�ха пре�кочени"
 
-#: sequencer.c:5166
+#: sequencer.c:5750
 msgid "the script was already rearranged."
 msgstr "�криптът вече е преподреден."
 
-#: setup.c:124
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "„%s“ е извън хранилището"
+msgid "'%s' is outside repository at '%s'"
+msgstr "„%s“ е извън хранилището при „%s“"
 
-#: setup.c:174
+#: setup.c:185
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6953,7 +8719,7 @@ msgstr ""
 "\n"
 "    git КОМ��Д� -- ПЪТ…"
 
-#: setup.c:187
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6966,12 +8732,12 @@ msgstr ""
 "\n"
 "    git КОМ��Д� [ВЕРСИЯ…] -- [Ф�ЙЛ…]"
 
-#: setup.c:236
+#: setup.c:264
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "опци�та „%s“ тр�бва да е преди първи� аргумент, който не е опци�"
 
-#: setup.c:255
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6983,95 +8749,103 @@ msgstr ""
 "\n"
 "    git КОМ��Д� [ВЕРСИЯ…] -- [Ф�ЙЛ…]"
 
-#: setup.c:391
+#: setup.c:419
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "не може да �е зададе текуща работна директори� при неправилни на�тройки"
 
-#: setup.c:395
+#: setup.c:423 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "тази команда тр�бва да �е изпълни в работно дърво"
 
-#: setup.c:541
+#: setup.c:658
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Очаква �е вер�и� на хранилището на git <= %d, а не %d"
 
-#: setup.c:549
-msgid "unknown repository extensions found:"
-msgstr "открити �а непознати разширени� в хранилището:"
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "открито е непознато разширение в хранилището:"
+msgstr[1] "открити �а непознати разширени� в хранилището:"
 
-#: setup.c:568
+#: 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] "вер�и�та на хранилището е 0, но е открито разширение за вер�и� 1:"
+msgstr[1] "вер�и�та на хранилището е 0, но �а открити разширени� за вер�и� 1:"
+
+#: setup.c:701
 #, c-format
 msgid "error opening '%s'"
 msgstr "„%s“ не може да �е отвори"
 
-#: setup.c:570
+#: setup.c:703
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "прекалено гол�м файл „.git“: „%s“"
 
-#: setup.c:572
+#: setup.c:705
 #, c-format
 msgid "error reading %s"
 msgstr "грешка при прочитане на „%s“"
 
-#: setup.c:574
+#: setup.c:707
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "неправилен формат на gitfile: %s"
 
-#: setup.c:576
+#: setup.c:709
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "лип�ва път в gitfile: „%s“"
 
-#: setup.c:578
+#: setup.c:711
 #, c-format
 msgid "not a git repository: %s"
 msgstr "не е хранилище на Git: %s"
 
-#: setup.c:677
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
 msgstr "„%s“ е прекалено гол�м"
 
-#: setup.c:691
+#: setup.c:827
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "не е хранилище на git: „%s“"
 
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c:856 setup.c:858 setup.c:889
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "не може да �е влезе в директори�та „%s“"
 
-#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
 msgid "cannot come back to cwd"
 msgstr "проце�ът не може да �е върне към предишната работна директори�"
 
-#: setup.c:852
+#: setup.c:988
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%*s%s%s“"
 
-#: setup.c:1090
+#: setup.c:1231
 msgid "Unable to read current working directory"
 msgstr "Текущата работна директори� не може да бъде прочетена"
 
-#: setup.c:1099 setup.c:1105
+#: setup.c:1240 setup.c:1246
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "не може да �е влезе в директори�та „%s“"
 
-#: setup.c:1110
+#: setup.c:1251
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 "нито тази, нито ко�то и да е от по-горните директории, не е хранилище на "
 "git: %s"
 
-#: setup.c:1116
+#: setup.c:1257
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -7082,7 +8856,7 @@ msgstr ""
 "Git работи в рамките на една файлова �и�тема, защото променливата на �редата "
 "„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
 
-#: setup.c:1227
+#: setup.c:1381
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -7092,353 +8866,69 @@ msgstr ""
 "(0%.3o).\n"
 "Соб�твеникът на файла тр�бва да има права за пи�ане и четене."
 
-#: setup.c:1271
+#: setup.c:1430
 msgid "open /dev/null or dup failed"
 msgstr "неу�пешно изпълнение на „open“ или „dup“ върху „/dev/null“"
 
-#: setup.c:1286
+#: setup.c:1445
 msgid "fork failed"
 msgstr "неу�пешно �ъздаване на проце� чрез „fork“"
 
-#: setup.c:1291
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
 msgid "setsid failed"
 msgstr "неу�пешно изпълнение на „setsid“"
 
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-"директори�та за обекти „%s“ не �ъще�твува, проверете „.git/objects/info/"
-"alternates“"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "алтернативни�т път към обекти не може да бъде нормализиран: „%s“"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-"%s: алтернативните хранилища за обекти �е пренебрегват поради прекалено "
-"дълбоко влагане"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "директори�та за обекти „%s“ не може да бъде нормализирана"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "заключващи�т файл за алтернативите не може да �е отвори � „fdopen“"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "файлът � алтернативите не може да бъде прочетен"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "нови�т файл � алтернативите не може да бъде преме�тен на м��тото му"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "път�т „%s“ не �ъще�твува."
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "в�е още не �е поддържа еталонно хранилище „%s“ като �вързано."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "еталонното хранилище „%s“ не е локално"
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "еталонното хранилище „%s“ е плитко"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "еталонното хранилище „%s“ е � при�аждане"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "неправилен ред при анализа на алтернативните указатели: „%s“"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-"неу�пешен опит за „mmap“ %<PRIuMAX>, което е над позволеното %<PRIuMAX>"
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
+msgstr "опит за ползване на ча�тичен индек� без пътеводен режим"
 
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "неу�пешно изпълнение на „mmap“"
+#: sparse-index.c:174
+msgid "unable to update cache-tree, staying full"
+msgstr "дървото на кеша не може да бъде обновено и о�тава пълно"
 
-#: sha1-file.c:1128
+#: sparse-index.c:261
 #, c-format
-msgid "object file %s is empty"
-msgstr "файлът � обектите „%s“ е празен"
-
-#: sha1-file.c:1252 sha1-file.c:2392
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "непакетирани�т обект „%s“ е повреден"
-
-#: sha1-file.c:1254 sha1-file.c:2396
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "грешни данни в кра� на непакетирани� обект „%s“"
-
-#: sha1-file.c:1296
-msgid "invalid object type"
-msgstr "неправилен вид обект"
-
-#: sha1-file.c:1380
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-"заглавната ча�т „%s“ не може да �е разпакетира � опци�та „--allow-unknown-"
-"type“"
-
-#: sha1-file.c:1383
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "заглавната ча�т на „%s“ не може да бъде разпакетирана"
-
-#: sha1-file.c:1389
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-"заглавната ча�т „%s“ не може да �е анализира � опци�та „--allow-unknown-type“"
-
-#: sha1-file.c:1392
-#, c-format
-msgid "unable to parse %s header"
-msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
-
-#: sha1-file.c:1584
-#, c-format
-msgid "failed to read object %s"
-msgstr "обектът „%s“ не може да бъде прочетен"
-
-#: sha1-file.c:1588
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "заме�тител�т „%s“ на „%s“ не може да бъде открит"
-
-#: sha1-file.c:1592
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "непакетирани�т обект „%s“ (в „%s“) е повреден"
-
-#: sha1-file.c:1596
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "пакетирани�т обект „%s“ (в „%s“) е повреден"
-
-#: sha1-file.c:1699
-#, c-format
-msgid "unable to write file %s"
-msgstr "файлът „%s“ не може да бъде запи�ан"
-
-#: sha1-file.c:1706
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "правата за до�тъп до „%s“ не могат да бъдат зададени"
-
-#: sha1-file.c:1713
-msgid "file write error"
-msgstr "грешка при запи� на файл"
-
-#: sha1-file.c:1732
-msgid "error when closing loose object file"
-msgstr "грешка при затвар�нето на файла � непакетиран обект"
-
-#: sha1-file.c:1797
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-"н�ма права за добав�не на обект към базата от данни на хранилището „%s“"
-
-#: sha1-file.c:1799
-msgid "unable to create temporary file"
-msgstr "не може да бъде �ъздаден временен файл"
-
-#: sha1-file.c:1823
-msgid "unable to write loose object file"
-msgstr "грешка при запи�а на файла � непакетиран обект"
-
-#: sha1-file.c:1829
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "нови�т обект „%s“ не може да �е компре�ира � „deflate“: %d"
-
-#: sha1-file.c:1833
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "неу�пешно приключване на „deflate“ върху „%s“: %d"
-
-#: sha1-file.c:1837
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "грешка поради не�табилни� източник данни за обектите „%s“"
-
-#: sha1-file.c:1847 builtin/pack-objects.c:925
-#, c-format
-msgid "failed utime() on %s"
-msgstr "неу�пешно задаване на време на до�тъп/�ъздаване чрез „utime“ на „%s“"
-
-#: sha1-file.c:1922
-#, c-format
-msgid "cannot read object for %s"
-msgstr "обектът за „%s“ не може да �е прочете"
-
-#: sha1-file.c:1962
-msgid "corrupt commit"
-msgstr "повредено подаване"
-
-#: sha1-file.c:1970
-msgid "corrupt tag"
-msgstr "повреден етикет"
-
-#: sha1-file.c:2069
-#, c-format
-msgid "read error while indexing %s"
-msgstr "грешка при четене по време на индек�иране на „%s“"
-
-#: sha1-file.c:2072
-#, c-format
-msgid "short read while indexing %s"
-msgstr "непълно прочитане по време на индек�иране на „%s“"
-
-#: sha1-file.c:2145 sha1-file.c:2154
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "„%s“ не може да �е вмъкне в базата от данни"
-
-#: sha1-file.c:2160
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "неподдържан вид файл: „%s“"
-
-#: sha1-file.c:2184
-#, c-format
-msgid "%s is not a valid object"
-msgstr "„%s“ е неправилен обект"
-
-#: sha1-file.c:2186
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "„%s“ е неправилен обект от вид „%s“"
-
-#: sha1-file.c:2213 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "обектът „%s“ не може да бъде отворен"
-
-#: sha1-file.c:2403 sha1-file.c:2455
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "неправилна контролна �ума за „%s“ (тр�бва да е %s)"
-
-#: sha1-file.c:2427
-#, c-format
-msgid "unable to mmap %s"
-msgstr "неу�пешно изпълнение на „mmap“ върху „%s“"
-
-#: sha1-file.c:2432
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "заглавната ча�т на „%s“ не може да бъде разпакетирана"
-
-#: sha1-file.c:2438
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
-
-#: sha1-file.c:2449
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "�ъдържанието на „%s“ не може да бъде разпакетирано"
-
-#: sha1-name.c:487
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "къ�и�т SHA1 „%s“ не е еднозначен"
-
-#: sha1-name.c:498
-msgid "The candidates are:"
-msgstr "Възможно�тите �а:"
-
-#: sha1-name.c:797
-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 ""
-"При нормална работа Git никога не �ъздава указатели, които завършват � 40\n"
-"ше�тнаде�етични знака, защото �тандартно те ще бъдат пре�качани.\n"
-"Възможно е такива указатели да �а �ъздадени �лучайно.  �апример:\n"
-"\n"
-"    git switch -c $BRANCH $(git rev-parse …)\n"
-"\n"
-"където �тойно�тта на променливата на �редата BRANCH е празна, при което �е\n"
-"�ъздава подобен указател.  Прегледайте тези указатели и ги изтрийте.  Може "
-"да\n"
-"�прете това �ъобщение като изпълните командата:\n"
-"\n"
-"    git config advice.objectNameWarning false"
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "обектът в индек�а е директори�, но не ча�тично изтеглена (%08x)"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:822
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
+#: 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:832
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: 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:841
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
+#: 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:849
+#: strbuf.c:877
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7446,17 +8936,54 @@ msgstr[0] "%u байт"
 msgstr[1] "%u байта"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
+#: strbuf.c:879
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u байт/�ек."
 msgstr[1] "%u байта/�ек."
 
+#: 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 "„%s“ не може да бъде отворен за запи�"
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr "„%s“ не може да �е редактира"
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "игнориране на подозрително име на подмодул: „%s“"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "на�тройката „submodule.fetchjobs“ не приема отрицателни �тойно�ти"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"„%s“ �е пре�кача, защото е възможно да �е тълкува като опци� за командни� "
+"ред: %s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "�еправилна �тойно�т за „%s“"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Запи�ът „%s“ във файла „.gitmodules“ не може да бъде променен"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
-"�е�летите файлове „.gitmodules“ не могат да бъдат промен�ни.  Първо "
+"�е�летите файлове „.gitmodules“ не може да бъдат промен�ни.  Първо "
 "коригирайте конфликтите"
 
 #: submodule.c:118 submodule.c:147
@@ -7473,61 +9000,139 @@ msgstr "ЗапиÑ�ÑŠÑ‚ „%s“ във файла „.gitmodules“ не можÐ
 msgid "staging updated .gitmodules failed"
 msgstr "неу�пешно добав�не на променени� файл „.gitmodules“ в индек�а"
 
-#: submodule.c:327
+#: submodule.c:328
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "в неподготвени� подмодул „%s“"
 
-#: submodule.c:358
+#: submodule.c:359
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Път�т „%s“ е в подмодула „%.*s“"
 
-#: submodule.c:910
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "неправилен аргумент за „--ignore-submodules“: „%s“"
+
+#: submodule.c:805
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Подмодулът при подаване %s на път� „%s“ е различен от други� модул �ъ� "
+"�ъщото име, затова първи�т �е пре�кача."
+
+#: submodule.c:908
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "запи�ът за подмодула „%s“ (%s) е %s, а не подаване!"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:993
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Командата „git rev-list ПОД�В��ИЯ --not --remotes -n 1“ не може да �е "
+"изпълни в подмодула „%s“"
+
+#: submodule.c:1116
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "проце�ът за подмодула „%s“ завърши неу�пешно"
+
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2469
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "�е може да �е открие към какво �очи указател�т „HEAD“"
 
-#: submodule.c:1481
+#: submodule.c:1156
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Изтла�кване на подмодула „%s“\n"
+
+#: submodule.c:1159
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Подмодулът „%s“ не може да бъде изтла�кан\n"
+
+#: submodule.c:1451
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "До�тав�не на подмодула „%s%s“\n"
+
+#: submodule.c:1485
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "Подмодулът „%s“ не може да бъде до�тъпен"
+msgid "Could not access submodule '%s'\n"
+msgstr "Подмодулът „%s“ не може да бъде до�тъпен\n"
 
-#: submodule.c:1651
+#: submodule.c:1640
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Грешки при до�тав�не на подмодул:\n"
+"%s"
+
+#: submodule.c:1665
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "„%s“ не е хранилище на git"
 
-#: submodule.c:1789
+#: submodule.c:1682
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr ""
+"Командата „git status --porcelain=2“ не може да �е изпълни в подмодула „%s“"
+
+#: submodule.c:1723
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr ""
+"командата „git status --porcelain=2“ не може да �е изпълни в подмодула „%s“"
+
+#: submodule.c:1798
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "командата „git status“ не може да �е изпълни в подмодула „%s“"
 
-#: submodule.c:1802
+#: submodule.c:1811
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "командата „git status“ не може да �е изпълни в подмодула „%s“"
 
-#: submodule.c:1817
+#: submodule.c:1826
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "�а�тройката „core.worktree“ не може да �е изтрие в подмодула „%s“"
 
-#: submodule.c:1907
+#: submodule.c:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "неу�пешна обработка на поддиректориите в подмодула „%s“"
+
+#: submodule.c:1874
+msgid "could not reset submodule index"
+msgstr "неу�пешно занул�ване на индек�а на подмодула"
+
+#: submodule.c:1916
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "индек�ът на подмодула „%s“ не е чи�т"
 
-#: submodule.c:1959
+#: submodule.c:1968
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Подмодулът „%s“ не може да �е обнови."
 
-#: submodule.c:2007
+#: submodule.c:2036
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "„%s“ (директори� на подмодул) е в директори�та на git: „%.*s“"
+
+#: submodule.c:2057
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7535,12 +9140,17 @@ msgstr ""
 "не �е поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
 "работно дърво"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2069 submodule.c:2128
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "името на подмодула „%s“ не може да бъде намерено"
 
-#: submodule.c:2026
+#: submodule.c:2073
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "„%s“ не може да �е преме�ти в �ъще�твуваща директори� на git"
+
+#: submodule.c:2080
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7551,208 +9161,91 @@ msgstr ""
 "„%s“ към\n"
 "„%s“\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "неу�пешна обработка на поддиректориите в подмодула „%s“"
-
-#: submodule.c:2153
+#: submodule.c:2208
 msgid "could not start ls-files in .."
 msgstr "„ls-stat“ не може да �е �тартира в „..“"
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "„ls-tree“ завърши � неочакван изходен код: %d"
 
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "игнориране на подозрително име на подмодул: „%s“"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "на�тройката „submodule.fetchjobs“ не приема отрицателни �тойно�ти"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"„%s“ �е пре�кача, защото е възможно да �е тълкува като опци� за командни� "
-"ред: %s"
-
-#: submodule-config.c:490
+#: symlinks.c:244
 #, c-format
-msgid "invalid value for %s"
-msgstr "�еправилна �тойно�т за „%s“"
+msgid "failed to lstat '%s'"
+msgstr "не може да бъде получена информаци� чрез „lstat“ за „%s“"
 
-#: submodule-config.c:761
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Запи�ът „%s“ във файла „.gitmodules“ не може да бъде променен"
-
-#: trailer.c:238
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "неу�пешно изпълнение на завършващата команда „%s“"
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: 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 "непозната �тойно�т „%s“ за на�тройката „%s“"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: 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 "�тойно�тта „%s“ �е повтар� в на�тройките"
 
-#: trailer.c:730
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "празна завършваща лек�ема в епилога „%.*s“"
 
-#: trailer.c:750
+#: trailer.c:763
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "входни�т файл „%s“ не може да бъде прочетен"
 
-#: trailer.c:753
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
 msgid "could not read from stdin"
 msgstr "от �тандартни� вход не може да �е чете"
 
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1024 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
 msgstr "�е може да �е получи информаци� чрез „stat“ за „%s“"
 
-#: trailer.c:1013
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "„%s“ не е обикновен файл"
 
-#: trailer.c:1015
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "„%s“: н�ма права за запи�ване на файла"
 
-#: trailer.c:1027
+#: trailer.c:1040
 msgid "could not open temporary file"
 msgstr "временни�т файл не може да �е отвори"
 
-#: trailer.c:1067
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "временни�т файл не може да �е преименува на „%s“"
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Клонът „%s“ ще �леди „%s“ от „%s“\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "пратката на git „%s“ не може да бъде прочетена"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: неправилна опци� за дълбочина: %s"
-
-#: transport.c:266
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-"За повече информаци� вижте раздела „protocol.version“ в „git help config“"
-
-#: transport.c:267
-msgid "server options require protocol version 2 or later"
-msgstr "опциите на �ървъра изи�кват поне вер�и� 2 на протокола"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "�тойно�тта на на�тройката „transport.color.*“ не може да �е разпознае"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "протокол вер�и� 2 в�е още не �е поддържа"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "непозната �тойно�т за на�тройката „%s“: „%s“"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "прено�ът по „%s“ не е позволен"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "командата „git-over-rsync“ вече не �е поддържа"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Следните пътища за подмодули �ъдържат промени,\n"
-"които лип�ват от в�ички отдалечени хранилища:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Пробвайте да ги изтла�кате чрез командата:\n"
-"\n"
-"    git push --recurse-submodules=on-demand\n"
-"\n"
-"или отидете в �ъответната директори� и изпълнете:\n"
-"\n"
-"    git push\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Преу�танов�ване на дей�твието."
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "неу�пешно изтла�кване на в�ички необходими подмодули"
-
-#: transport.c:1345 transport-helper.c:655
-msgid "operation not supported by protocol"
-msgstr "опци�та не �е поддържа от протокола"
-
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
 msgstr "неу�пешен пълен запи� към на�рещната помощна програма"
 
-#: transport-helper.c:144
+#: transport-helper.c:145
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "на�рещната помощна програма за „%s“ не може да бъде открита"
 
-#: transport-helper.c:160 transport-helper.c:569
+#: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
 msgstr ""
 "файлови�т де�криптор от на�рещната помощна програма не може да �е дублира � "
 "„dup“"
 
-#: transport-helper.c:211
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7761,163 +9254,277 @@ msgstr ""
 "непозната задължителна �по�обно�т „%s“.  �а�рещната помощна програма "
 "веро�тно изи�ква нова вер�и� на Git"
 
-#: transport-helper.c:217
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
 msgstr ""
 "на�рещната помощна програма тр�бва да поддържа �по�обно�т за избро�ване на "
 "указатели"
 
-#: transport-helper.c:284 transport-helper.c:424
+#: transport-helper.c:287 transport-helper.c:429
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "„%s“ неочаквано върна: „%s“"
 
-#: transport-helper.c:413
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
 msgstr "„%s“ заключи и „%s“"
 
-#: transport-helper.c:491
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
 msgstr "неу�пешно изпълнение на бързо вна��не"
 
-#: transport-helper.c:514
+#: transport-helper.c:520
 msgid "error while running fast-import"
 msgstr "грешка при изпълнението на бързо вна��не"
 
-#: transport-helper.c:543 transport-helper.c:1132
+#: transport-helper.c:549 transport-helper.c:1247
 #, c-format
 msgid "could not read ref %s"
 msgstr "указател�т „%s“ не може да �е прочете"
 
-#: transport-helper.c:588
+#: transport-helper.c:594
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "неочакван отговор при �вързване: „%s“"
 
-#: transport-helper.c:610
+#: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
 msgstr "протоколът не поддържа задаването на път на отдалечената у�луга"
 
-#: transport-helper.c:612
+#: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr "неправилен път на отдалечената у�луга"
 
-#: transport-helper.c:658
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr "опци�та не �е поддържа от протокола"
+
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "неу�пешно �вързване към поду�лугата „%s“"
 
-#: transport-helper.c:734
+#: transport-helper.c:693 transport.c:400
+msgid "--negotiate-only requires protocol v2"
+msgstr "опци�та „--negotiate-only“ изи�ква вер�и� 2 на протокола"
+
+#: transport-helper.c:755
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "опци� без �ъответ�тваща директива за у�пех или грешка"
+
+#: transport-helper.c:798
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr ""
 "очаква �е или у�пех, или грешка, но на�рещната помощна програма върна „%s“"
 
-#: transport-helper.c:787
+#: transport-helper.c:855
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "на�рещната помощна програма завърши � неочакван изходен код: „%s“"
 
-#: transport-helper.c:848
+#: transport-helper.c:938
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "на�рещната помощна програма „%s“ не поддържа проби „dry-run“"
 
-#: transport-helper.c:851
+#: transport-helper.c:941
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "на�рещната помощна програма „%s“ не поддържа опци�та „--signed“"
 
-#: transport-helper.c:854
+#: transport-helper.c:944
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 "на�рещната помощна програма „%s“ не поддържа опци�та „--signed=if-asked“"
 
-#: transport-helper.c:859
+#: transport-helper.c:949
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "на�рещната помощна програма „%s“ не поддържа опци�та „--atomic“"
 
-#: transport-helper.c:865
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "на�рещната помощна програма „%s“ не поддържа опци�та „%s“"
+
+#: transport-helper.c:960
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "на�рещната помощна програма „%s“ не поддържа опции за изтла�кване"
 
-#: transport-helper.c:963
+#: transport-helper.c:1060
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 "на�рещната помощна програма не поддържа изтла�кване.  �еобходимо е "
 "избро�ване на указателите"
 
-#: transport-helper.c:968
+#: transport-helper.c:1065
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr ""
 "на�рещната помощна програма не поддържа „%s“ поддържа опци�та „--force“"
 
-#: transport-helper.c:1015
+#: transport-helper.c:1112
 msgid "couldn't run fast-export"
 msgstr "не може да �е извърши бързо изна��не"
 
-#: transport-helper.c:1020
+#: transport-helper.c:1117
 msgid "error while running fast-export"
 msgstr "грешка при изпълнението на командата за бързо изна��не"
 
-#: transport-helper.c:1045
+#: transport-helper.c:1142
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
-"��ма общи указатели, не �а указани никакви указатели — нищо н�ма да бъде\n"
-"направено.  Пробвайте да укажете клон, напр. “master“.\n"
+"��ма общи указатели, не �а указани никакви указатели —\n"
+"нищо н�ма да бъде направено.  Пробвайте да укажете клон.\n"
+
+#: transport-helper.c:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "обект � неподдържан формат „%s“"
 
-#: transport-helper.c:1118
+#: transport-helper.c:1233
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "неправилен отговор в �пи�ъка � указатели: „%s“"
 
-#: transport-helper.c:1270
+#: transport-helper.c:1385
 #, c-format
 msgid "read(%s) failed"
 msgstr "неу�пешно четене на „%s“"
 
-#: transport-helper.c:1297
+#: transport-helper.c:1412
 #, c-format
 msgid "write(%s) failed"
 msgstr "неу�пешен запи� в „%s“"
 
-#: transport-helper.c:1346
+#: transport-helper.c:1461
 #, c-format
 msgid "%s thread failed"
 msgstr "неу�пешно изпълнение на нишката „%s“"
 
-#: transport-helper.c:1350
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "завършването на нишката „%s“ не може да �е изчака: „%s“"
 
-#: transport-helper.c:1369 transport-helper.c:1373
+#: transport-helper.c:1484 transport-helper.c:1488
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "неу�пешно �тартиране на нишка за копиране на данните: „%s“"
 
-#: transport-helper.c:1410
+#: transport-helper.c:1525
 #, c-format
 msgid "%s process failed to wait"
 msgstr "проце�ът на „%s“ не у�п� да изчака чрез „waitpid“"
 
-#: transport-helper.c:1414
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: transport-helper.c:1432 transport-helper.c:1441
+#: transport-helper.c:1547 transport-helper.c:1556
 msgid "can't start thread for copying data"
 msgstr "неу�пешно �тартиране на нишка за копиране на данните"
 
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Клонът „%s“ ще �леди „%s“ от „%s“\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "пратката на git „%s“ не може да бъде прочетена"
+
+#: transport.c:223
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: неправилна опци� за дълбочина: %s"
+
+#: transport.c:275
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+"За повече информаци� вижте раздела „protocol.version“ в „git help config“"
+
+#: transport.c:276
+msgid "server options require protocol version 2 or later"
+msgstr "опциите на �ървъра изи�кват поне вер�и� 2 на протокола"
+
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr "�ървърът не поддържа „wait-for-done“"
+
+#: transport.c:755
+msgid "could not parse transport.color.* config"
+msgstr "�тойно�тта на на�тройката „transport.color.*“ не може да �е разпознае"
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr "протокол вер�и� 2 в�е още не �е поддържа"
+
+#: transport.c:965
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "непозната �тойно�т за на�тройката „%s“: „%s“"
+
+#: transport.c:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "прено�ът по „%s“ не е позволен"
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr "командата „git-over-rsync“ вече не �е поддържа"
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Следните пътища за подмодули �ъдържат промени,\n"
+"които лип�ват от в�ички отдалечени хранилища:\n"
+
+#: transport.c:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Пробвайте да ги изтла�кате чрез командата:\n"
+"\n"
+"    git push --recurse-submodules=on-demand\n"
+"\n"
+"или отидете в �ъответната директори� и изпълнете:\n"
+"\n"
+"    git push\n"
+"\n"
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr "Преу�танов�ване на дей�твието."
+
+#: transport.c:1346
+msgid "failed to push all needed submodules"
+msgstr "неу�пешно изтла�кване на в�ички необходими подмодули"
+
 #: tree-walk.c:33
 msgid "too-short tree object"
 msgstr "прекалено кратък обект-дърво"
@@ -7934,7 +9541,7 @@ msgstr "празно име на файл в запи� в дърво"
 msgid "too-short tree file"
 msgstr "прекалено кратък файл-дърво"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7943,7 +9550,7 @@ msgstr ""
 "Изтегл�нето ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да преминете към нов клон."
 
-#: unpack-trees.c:112
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7952,7 +9559,7 @@ msgstr ""
 "Изтегл�нето ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7961,7 +9568,7 @@ msgstr ""
 "Сливането ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да �леете."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7970,7 +9577,7 @@ msgstr ""
 "Сливането ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7979,7 +9586,7 @@ msgstr ""
 "„%s“ ще презапише локалните промени на тези файлове:\n"
 "%%sПодайте или �катайте промените, за да извършите „%s“."
 
-#: unpack-trees.c:122
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7988,7 +9595,7 @@ msgstr ""
 "„%s“ ще презапише локалните промени на тези файлове:\n"
 "%%s"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7997,7 +9604,7 @@ msgstr ""
 "Обнов�ването на �ледните директории ще изтрие не�ледените файлове в т�х:\n"
 "%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -8006,7 +9613,7 @@ msgstr ""
 "Изтегл�нето ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да преминете на друг клон."
 
-#: unpack-trees.c:133
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -8015,7 +9622,7 @@ msgstr ""
 "Изтегл�нето ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -8024,7 +9631,7 @@ msgstr ""
 "Сливането ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да �леете."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -8033,7 +9640,7 @@ msgstr ""
 "Сливането ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -8042,7 +9649,7 @@ msgstr ""
 "„%s“ ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да извършите „%s“."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -8051,7 +9658,7 @@ msgstr ""
 "„%s“ ще изтрие тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:149
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -8061,7 +9668,7 @@ msgstr ""
 "Изтегл�нето ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да �мените клон."
 
-#: unpack-trees.c:151
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -8071,7 +9678,7 @@ msgstr ""
 "Изтегл�нето ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -8080,7 +9687,7 @@ msgstr ""
 "Сливането ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да �леете."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -8089,7 +9696,7 @@ msgstr ""
 "Сливането ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -8098,7 +9705,7 @@ msgstr ""
 "„%s“ ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%sПреме�тете ги или ги изтрийте, за да извършите „%s“."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -8107,62 +9714,73 @@ msgstr ""
 "„%s“ ще презапише тези не�ледени файлове в работното дърво:\n"
 "%%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Запи�ът за „%s“ �ъвпада � този за „%s“.  �е може да �е при�вои."
 
-#: unpack-trees.c:172
+#: unpack-trees.c:177
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
 "%s"
 msgstr ""
-"Ча�тичното изтегл�не не може да бъде обновено: �ледните запи�и не �а "
-"актуални:\n"
-"%s"
+"Подмодулът не може да бъде обновен:\n"
+"„%s“"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Обнов�ването на ча�тичното изтегл�не ще презапише тези файлове в работното "
-"дърво:\n"
+"Следните пътища не обновени и �а о�тавени въпреки шаблоните за ча�тично "
+"изтегл�не:\n"
 "%s"
 
-#: unpack-trees.c:176
+#: unpack-trees.c:182
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
-"Обнов�ването на ча�тичното изтегл�не ще изтрие тези файлове в работното "
-"дърво:\n"
+"Следните пътища не �а �лети и �а о�тавени въпреки шаблоните за ча�тично "
+"изтегл�не:\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:184
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Подмодулът не може да бъде обновен:\n"
-"„%s“"
+"Следните пътища вече �ъще�твуваха и �а о�тавени въпреки шаблоните за "
+"ча�тично изтегл�не:\n"
+"%s"
 
-#: unpack-trees.c:255
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "Преу�танов�ване на дей�твието\n"
 
-#: unpack-trees.c:317
+#: unpack-trees.c:291
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"След корекци�та на грешките в пътищата по-горе, веро�тно ще тр�бва\n"
+"да изпълните командата:\n"
+"\n"
+"    git sparse-checkout reapply\n"
+
+#: unpack-trees.c:352
 msgid "Updating files"
 msgstr "Обнов�ване на файлове"
 
-#: unpack-trees.c:349
+#: 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"
@@ -8172,6 +9790,20 @@ msgstr ""
 "във файлови �и�теми, които не различават главни от малки букви)\n"
 "и �амо един от уча�тниците в конфликта е в работното дърво:\n"
 
+#: unpack-trees.c:1618
+msgid "Updating index flags"
+msgstr "Обнов�ване на флаговете на индек�а"
+
+#: unpack-trees.c:2707
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+"работното дърво и не�леденото подаване �ъдържат повтар�щи �е обекти: %s"
+
+#: upload-pack.c:1548
+msgid "expected flush after fetch arguments"
+msgstr "�лед аргументите на „fetch“ �е очаква изчи�тване на буферите"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "неправилна �хема за адре� или �уфик�ът „://“ лип�ва"
@@ -8187,7 +9819,7 @@ msgstr "не е указана машина, а Ñ�хемата не е „file:â
 
 #: urlmatch.c:232
 msgid "a 'file:' URL may not have a port number"
-msgstr "при �хема „file:“ не можете да указвате номер на порт"
+msgstr "при �хема „file:“ не може да указвате номер на порт"
 
 #: urlmatch.c:247
 msgid "invalid characters in host name"
@@ -8201,28 +9833,32 @@ msgstr "неправилен номер на порт"
 msgid "invalid '..' path segment"
 msgstr "неправилна ча�т от път� „..“"
 
-#: worktree.c:258 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "До�тав�не на обектите"
+
+#: worktree.c:236 builtin/am.c:2152
 #, c-format
 msgid "failed to read '%s'"
 msgstr "„%s“ не може да бъде прочетен"
 
-#: worktree.c:304
+#: worktree.c:303
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "„%s“ в о�новното работно дърво не е директори�та на хранилището"
 
-#: worktree.c:315
+#: worktree.c:314
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "файлът „%s“ не �ъдържа аб�олютни� път към ме�тоположението на работното дърво"
 
-#: worktree.c:327
+#: worktree.c:326
 #, c-format
 msgid "'%s' does not exist"
 msgstr "„%s“ не �ъще�твува."
 
-#: worktree.c:333
+#: worktree.c:332
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "„%s“ не е файл на .git, код за грешка: %d"
@@ -8232,17 +9868,85 @@ msgstr "„%s“ не е файл на .git, код за грешка: %d"
 msgid "'%s' does not point back to '%s'"
 msgstr "„%s“ не �очи към обратно към „%s“"
 
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:603
+msgid "not a directory"
+msgstr "не е директори�"
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr "„.git“ не е файл"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr "„.git“ е повреден"
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr "„.git“ е неправилен"
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr "неправилен път"
+
+#: worktree.c:728
+msgid "unable to locate repository; .git is not a file"
+msgstr "не може да �е открие хранилище: „.git“ не е файл"
+
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "не може да �е открие хранилище: файлът „.git“ не �очи към хранилище"
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr "не може да �е открие хранилище: „.git“ е повреден"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr "директори�та „gitdir“ не може да �е прочете"
+
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr "неправилна директори� „gitdir“"
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr "не е валидна директори�"
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "файлът „gitdir“ не �ъще�твува"
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "файлът „gitdir“ не може да бъде прочетен (%s)"
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+"изчитането върна по-малко байтове от очакваното (очаквани: %<PRIuMAX> байта, "
+"получени: %<PRIuMAX>)"
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "неправилен файл „gitdir“"
+
+#: worktree.c:817
+msgid "gitdir file points to non-existent location"
+msgstr "файлът „gitdir“ �очи не�ъще�твуващо ме�тоположение"
+
+#: wrapper.c:197 wrapper.c:367
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "„%s“ не може да бъде отворен и за четене, и за запи�"
 
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr "н�ма до�тъп до „%s“"
 
-#: wrapper.c:596
+#: wrapper.c:607
 msgid "unable to get current working directory"
 msgstr "текущата работна директори� е недо�тъпна"
 
@@ -8283,11 +9987,11 @@ msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (използвайте „git rm Ф�ЙЛ…“, за да укажете разрешаването на конфликта)"
 
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr "Промени, които ще бъдат подадени:"
 
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
 msgstr "Промени, които не �а в индек�а за подаване:"
 
@@ -8320,94 +10024,94 @@ msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (използвайте „git %s Ф�ЙЛ…“, за да определите какво включвате в подаването)"
 
-#: wt-status.c:268
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr "изтрити в двата �луча�:"
 
-#: wt-status.c:270
+#: wt-status.c:268
 msgid "added by us:"
 msgstr "добавени от ва�:"
 
-#: wt-status.c:272
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "изтрити от т�х:"
 
-#: wt-status.c:274
+#: wt-status.c:272
 msgid "added by them:"
 msgstr "добавени от т�х:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr "изтрити от ва�:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "both added:"
 msgstr "добавени и в двата �луча�:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "both modified:"
 msgstr "променени и в двата �луча�:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "new file:"
 msgstr "нов файл:"
 
-#: wt-status.c:292
+#: wt-status.c:290
 msgid "copied:"
 msgstr "копиран:"
 
-#: wt-status.c:294
+#: wt-status.c:292
 msgid "deleted:"
 msgstr "изтрит:"
 
-#: wt-status.c:296
+#: wt-status.c:294
 msgid "modified:"
 msgstr "променен:"
 
-#: wt-status.c:298
+#: wt-status.c:296
 msgid "renamed:"
 msgstr "преименуван:"
 
-#: wt-status.c:300
+#: wt-status.c:298
 msgid "typechange:"
 msgstr "�м�на на вида:"
 
-#: wt-status.c:302
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "непозната пром�на:"
 
-#: wt-status.c:304
+#: wt-status.c:302
 msgid "unmerged:"
 msgstr "не�л�т:"
 
-#: wt-status.c:384
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "нови подавани�, "
 
-#: wt-status.c:386
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "променено �ъдържание, "
 
-#: wt-status.c:388
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr "не�ледено �ъдържание, "
 
-#: wt-status.c:906
+#: wt-status.c:958
 #, 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:938
+#: wt-status.c:989
 msgid "Submodules changed but not updated:"
 msgstr "Подмодулите �а променени, но не �а обновени:"
 
-#: wt-status.c:940
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr "Промени в подмодулите за подаване:"
 
-#: wt-status.c:1022
+#: wt-status.c:1073
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -8415,7 +10119,7 @@ msgstr ""
 "�е промен�йте и не изтривайте горни� ред.\n"
 "В�ичко отдолу ще бъде изтрито."
 
-#: wt-status.c:1114
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -8426,257 +10130,275 @@ msgstr ""
 "Изчи�л�ването на бро� различаващи �е подавани� отне %.2f �ек.\n"
 "За да избегнете това, ползвайте „--no-ahead-behind“.\n"
 
-#: wt-status.c:1144
+#: wt-status.c:1195
 msgid "You have unmerged paths."
 msgstr "��кои пътища не �а �лети."
 
-#: wt-status.c:1147
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git commit“)"
 
-#: wt-status.c:1149
+#: wt-status.c:1200
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (използвайте „git merge --abort“, за да преу�тановите �ливането)"
 
-#: wt-status.c:1153
+#: wt-status.c:1204
 msgid "All conflicts fixed but you are still merging."
 msgstr "В�ички конфликти �а решени, но продължавате �ливането."
 
-#: wt-status.c:1156
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (използвайте „git commit“, за да завършите �ливането)"
 
-#: wt-status.c:1165
+#: wt-status.c:1216
 msgid "You are in the middle of an am session."
 msgstr "В момента прилагате поредица от кръпки чрез „git am“."
 
-#: wt-status.c:1168
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr "Текущата кръпка е празна."
 
-#: wt-status.c:1172
+#: wt-status.c:1223
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git am --continue“)"
 
-#: wt-status.c:1174
+#: wt-status.c:1225
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (използвайте „git am --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1176
+#: wt-status.c:1227
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 "  (използвайте „git am --abort“, за да въз�тановите първоначални� клон)"
 
-#: wt-status.c:1309
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
 msgstr "„git-rebase-todo“ лип�ва."
 
-#: wt-status.c:1311
+#: wt-status.c:1362
 msgid "No commands done."
 msgstr "�е �а изпълнени команди."
 
-#: wt-status.c:1314
+#: wt-status.c:1365
 #, 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:1325
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (повече информаци� има във файла „%s“)"
 
-#: wt-status.c:1330
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "�е о�тават повече команди."
 
-#: wt-status.c:1333
+#: 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] "Следваща команда за изпълнение (о�тава още %d команда):"
 msgstr[1] "Следващи команди за изпълнение (о�тават още %d команди):"
 
-#: wt-status.c:1341
+#: wt-status.c:1392
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 "  (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
 
-#: wt-status.c:1353
+#: wt-status.c:1404
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "В момента пребазирате клона „%s“ върху „%s“."
 
-#: wt-status.c:1358
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr "В момента пребазирате."
 
-#: wt-status.c:1371
+#: wt-status.c:1422
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (коригирайте конфликтите и използвайте „git rebase --continue“)"
 
-#: wt-status.c:1373
+#: wt-status.c:1424
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (използвайте „git rebase --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1375
+#: wt-status.c:1426
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 "  (използвайте „git rebase --abort“, за да въз�тановите първоначални� клон)"
 
-#: wt-status.c:1382
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (в�ички конфликти �а коригирани: изпълнете „git rebase --continue“)"
 
-#: wt-status.c:1386
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "В момента раздел�те подаване докато пребазирате клона „%s“ върху „%s“."
 
-#: wt-status.c:1391
+#: wt-status.c:1442
 msgid "You are currently splitting a commit during a rebase."
 msgstr "В момента раздел�те подаване докато пребазирате."
 
-#: wt-status.c:1394
+#: wt-status.c:1445
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (След като работното ви дърво �тане чи�то, използвайте „git rebase --"
 "continue“)"
 
-#: wt-status.c:1398
+#: wt-status.c:1449
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
 
-#: wt-status.c:1403
+#: wt-status.c:1454
 msgid "You are currently editing a commit during a rebase."
 msgstr "В момента редактирате подаване докато пребазирате."
 
-#: wt-status.c:1406
+#: wt-status.c:1457
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 "  (използвайте „git commit --amend“, за да редактирате текущото подаване)"
 
-#: wt-status.c:1408
+#: wt-status.c:1459
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (използвайте „git rebase --continue“, �лед като завършите промените �и)"
 
-#: wt-status.c:1419
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr "В момента �е извършва отбиране на подавани�."
 
-#: wt-status.c:1422
+#: wt-status.c:1473
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "В момента отбирате подаването „%s“."
 
-#: wt-status.c:1429
+#: wt-status.c:1480
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1432
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (за да продължите, изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1435
+#: wt-status.c:1486
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (в�ички конфликти �а коригирани, изпълнете „git cherry-pick --continue“)"
 
-#: wt-status.c:1437
+#: wt-status.c:1488
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (използвайте „git cherry-pick --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1439
+#: wt-status.c:1490
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (използвайте „git cherry-pick --abort“, за да отмените в�ички дей�тви� � "
 "отбиране)"
 
-#: wt-status.c:1449
+#: wt-status.c:1500
 msgid "Revert currently in progress."
 msgstr "В момента тече отм�на на подаване."
 
-#: wt-status.c:1452
+#: wt-status.c:1503
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "В момента отмен�те подаване „%s“."
 
-#: wt-status.c:1458
+#: wt-status.c:1509
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (коригирайте конфликтите и изпълнете „git revert --continue“)"
 
-#: wt-status.c:1461
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (за да продължите, изпълнете „git revert --continue“)"
 
-#: wt-status.c:1464
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (в�ички конфликти �а коригирани, изпълнете „git revert --continue“)"
 
-#: wt-status.c:1466
+#: wt-status.c:1517
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (използвайте „git revert --skip“, за да пропу�нете тази кръпка)"
 
-#: wt-status.c:1468
+#: wt-status.c:1519
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (използвайте „git revert --abort“, за да преу�тановите отм�ната на "
 "подаване)"
 
-#: wt-status.c:1478
+#: wt-status.c:1529
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "В момента тър�ите двоично, като �те �тартирали от клон „%s“."
 
-#: wt-status.c:1482
+#: wt-status.c:1533
 msgid "You are currently bisecting."
 msgstr "В момента тър�ите двоично."
 
-#: wt-status.c:1485
+#: wt-status.c:1536
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 "  (използвайте „git bisect reset“, за да �е върнете към първоначалното "
 "�ъ�то�ние и клон)"
 
-#: wt-status.c:1694
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Вие �те в ча�тично изтегл�не."
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"�амирате �е в ча�тично изтеглено хранилище � %d%% налични, �ледени файла."
+
+#: wt-status.c:1794
 msgid "On branch "
 msgstr "�а клон "
 
-#: wt-status.c:1701
+#: wt-status.c:1801
 msgid "interactive rebase in progress; onto "
 msgstr "извършвате интерактивно пребазиране върху "
 
-#: wt-status.c:1703
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
 msgstr "извършвате пребазиране върху "
 
-#: wt-status.c:1713
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr "Указател�т „HEAD“ не е �вързан и е при "
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr "Указател�т „HEAD“ не е �вързан и е отделѐн от "
+
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr "Извън в�ички клони."
 
-#: wt-status.c:1730
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr "Първоначално подаване"
 
-#: wt-status.c:1731
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr "В�е още лип�ват подавани�"
 
-#: wt-status.c:1745
+#: wt-status.c:1845
 msgid "Untracked files"
 msgstr "�е�ледени файлове"
 
-#: wt-status.c:1747
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "Игнорирани файлове"
 
-#: wt-status.c:1751
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8684,36 +10406,36 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 "Б�ха необходими %.2f �екунди за избро�ването на не�ледените файлове.\n"
-"Добав�нето на опци�та „-uno“ към командата „git status“, ще у�кори\n"
+"Добав�нето на опци�та „-uno“ към командата „git status“ ще у�кори\n"
 "изпълнението, но ще тр�бва да добав�те новите файлове ръчно.\n"
 "За повече подробно�ти погледнете „git status help“."
 
-#: wt-status.c:1757
+#: wt-status.c:1857
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "�е�ледените файлове не �а изведени%s"
 
-#: wt-status.c:1759
+#: wt-status.c:1859
 msgid " (use -u option to show untracked files)"
 msgstr " (използвайте опци�та „-u“, за да изведете не�ледените файлове)"
 
-#: wt-status.c:1765
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "��ма промени"
 
-#: wt-status.c:1770
+#: wt-status.c:1870
 #, 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:1773
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "към индек�а за подаване не �а добавени промени\n"
 
-#: wt-status.c:1776
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8722,201 +10444,227 @@ msgstr ""
 "към индек�а за подаване не �а добавени промени, но има нови файлове "
 "(използвайте „git add“, за да започне т�хното �ледене)\n"
 
-#: wt-status.c:1779
+#: wt-status.c:1882
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "към индек�а за подаване не �а добавени промени, но има нови файлове\n"
 
-#: wt-status.c:1782
+#: wt-status.c:1886
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "лип�ват каквито и да е промени (�ъздайте или копирайте файлове и използвайте "
 "„git add“, за да започне т�хното �ледене)\n"
 
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr "лип�ват каквито и да е промени\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1893
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "лип�ват каквито и да е промени (използвайте опци�та „-u“, за да �е изведат и "
 "не�ледените файлове)\n"
 
-#: wt-status.c:1792
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "лип�ват каквито и да е промени, работното дърво е чи�то\n"
 
-#: wt-status.c:1905
+#: wt-status.c:2003
 msgid "No commits yet on "
 msgstr "В�е още лип�ват подавани� в "
 
-#: wt-status.c:1909
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr "HEAD (извън клон)"
 
-#: wt-status.c:1940
+#: wt-status.c:2038
 msgid "different"
 msgstr "различен"
 
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "назад � "
 
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "напред � "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2569
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "не може да извършите „%s“, защото има промени, които не �а в индек�а."
 
-#: wt-status.c:2476
+#: wt-status.c:2575
 msgid "additionally, your index contains uncommitted changes."
 msgstr "о�вен това в индек�а има неподадени промени."
 
-#: wt-status.c:2478
+#: wt-status.c:2577
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "не може да извършите „%s“, защото в индек�а има неподадени промени."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#: compat/simple-ipc/ipc-unix-socket.c:182
+msgid "could not send IPC command"
+msgstr "командата за комуникаци� между проце�и не може да бъде пратена"
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr "отговорът за комуникаци�та между проце�и не може да бъде прочетен"
+
+#: compat/simple-ipc/ipc-unix-socket.c:866
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "неу�пешно изпълнение на „accept_thread“ върху нишката „%s“"
+
+#: compat/simple-ipc/ipc-unix-socket.c:878
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "не може да �е �тартира нишката worker[0] за „%s“"
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:461
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: builtin/add.c:25
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
 
-#: builtin/add.c:84
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "правата на „%2$s“ не може да �е зададат да �а %1$cx"
+
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "неочакван изходен код при генериране на разлика: %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
 msgstr "неу�пешно обнов�ване на файловете"
 
-#: builtin/add.c:99
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
 msgstr "изтриване на „%s“\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:198
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Промени, които и �лед обнов�ването на индек�а не �а добавени към него:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:897
+#: builtin/add.c:307 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: builtin/add.c:245
+#: builtin/add.c:318
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Файлът „%s“ не може да бъде отворен за запи�."
 
-#: builtin/add.c:249
+#: builtin/add.c:322
 msgid "Could not write patch"
 msgstr "Кръпката не може да бъде запи�ана"
 
-#: builtin/add.c:252
+#: builtin/add.c:325
 msgid "editing patch failed"
 msgstr "неу�пешно редактиране на кръпка"
 
-#: builtin/add.c:255
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�е може да �е получи информаци� чрез „stat“ за файла „%s“"
 
-#: builtin/add.c:257
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr "Празна кръпка, преу�танов�ване на дей�твието."
 
-#: builtin/add.c:262
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Кръпката „%s“ не може да бъде приложена"
 
-#: builtin/add.c:270
+#: builtin/add.c:343
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Следните пътища ще бъдат игнорирани �поред н�кой от файловете „.gitignore“:\n"
 
-#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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 "пробно изпълнение"
 
-#: builtin/add.c:293
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr "интерактивно отбиране на промени"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "интерактивен избор на парчета код"
 
-#: builtin/add.c:295
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr "редактиране на текущата разлика и прилагане"
 
-#: builtin/add.c:296
+#: builtin/add.c:369
 msgid "allow adding otherwise ignored files"
 msgstr "добав�не и на иначе игнорираните файлове"
 
-#: builtin/add.c:297
+#: builtin/add.c:370
 msgid "update tracked files"
 msgstr "обнов�ване на �ледените файлове"
 
-#: builtin/add.c:298
+#: builtin/add.c:371
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "уеднакв�ване на знаците за край на файл (включва опци�та „-u“)"
 
-#: builtin/add.c:299
+#: builtin/add.c:372
 msgid "record only the fact that the path will be added later"
 msgstr "отбел�зване �амо на факта, че път�т ще бъде добавен по-къ�но"
 
-#: builtin/add.c:300
+#: builtin/add.c:373
 msgid "add changes from all tracked and untracked files"
 msgstr "добав�не на в�ички промени в �ледените и не�ледените файлове"
 
-#: builtin/add.c:303
+#: builtin/add.c:376
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "игнориране на пътищата, които �а изтрити от работното дърво (�ъщото като „--"
 "no-all“)"
 
-#: builtin/add.c:305
+#: builtin/add.c:378
 msgid "don't add, only refresh the index"
 msgstr "без добав�не на нови файлове, �амо обнов�ване на индек�а"
 
-#: builtin/add.c:306
+#: builtin/add.c:379
 msgid "just skip files which cannot be added because of errors"
-msgstr ""
-"пре�качане на файловете, които не могат да бъдат добавени поради грешки"
+msgstr "пре�качане на файловете, които не може да бъдат добавени поради грешки"
 
-#: builtin/add.c:307
+#: builtin/add.c:380
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "проверка, че при пробно изпълнение в�ички файлове, дори и изтритите, �е "
 "игнорират"
 
-#: builtin/add.c:309 builtin/update-index.c:1002
+#: builtin/add.c:382 builtin/update-index.c:1006
 msgid "override the executable bit of the listed files"
 msgstr "изрично задаване на �тойно�тта на флага дали файлът е изпълним"
 
-#: builtin/add.c:311
+#: builtin/add.c:384
 msgid "warn when adding an embedded repository"
 msgstr "предупреждаване при добав�не на вградено хранилище"
 
-#: builtin/add.c:326
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr "реализаци� на „git stash -p“"
+
+#: builtin/add.c:404
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8947,147 +10695,186 @@ msgstr ""
 "\n"
 "За повече информаци� погледнете „git help submodule“."
 
-#: builtin/add.c:354
+#: builtin/add.c:432
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "добав�не на вградено хранилище: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Използвайте опци�та „-f“, за да ги добавите наи�тина.\n"
+#: 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 ""
+"Ползвайте опци�та „-f“, ако наи�тина и�кате да ги добавите.\n"
+"За да изключите това �ъобщение, изпълнете:\n"
+"\n"
+"    git config advice.addIgnoredFile false"
 
-#: builtin/add.c:379
+#: builtin/add.c:460
 msgid "adding files failed"
 msgstr "неу�пешно добав�не на файлове"
 
-#: builtin/add.c:419
+#: 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:426
+#: builtin/add.c:522
 msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "Опци�та „--ignore-missing“ е �ъвме�тима �амо � „--dry-run“"
+msgstr "опци�та „--ignore-missing“ изи�ква „--dry-run“"
 
-#: builtin/add.c:430
+#: builtin/add.c:526
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
 
-#: builtin/add.c:445
+#: builtin/add.c:544 builtin/checkout.c:1735 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 ""
+"опци�та „--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:1639
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "опци�та „--pathspec-file-nul“ изи�ква опци� „--pathspec-from-file“"
+
+#: builtin/add.c:555
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "�ищо не е зададено и нищо не е добавено.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Веро�тно и�кахте да използвате „git add .“?\n"
+#: 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 ""
+"„git add .“ ли и�кахте да изпълните?\n"
+"За да изключите това �ъобщение, изпълнете:\n"
+"\n"
+"    git config advice.addEmptyPathspec false"
 
-#: builtin/am.c:347
+#: builtin/am.c:365
 msgid "could not parse author script"
 msgstr "�криптът за автор не може да �е анализира"
 
-#: builtin/am.c:431
+#: builtin/am.c:455
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
 
-#: builtin/am.c:473
+#: builtin/am.c:497
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Дадени�т входен ред е � неправилен формат: „%s“."
 
-#: builtin/am.c:511
+#: builtin/am.c:535
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Бележката не може да �е копира от „%s“ към „%s“"
 
-#: builtin/am.c:537
+#: builtin/am.c:561
 msgid "fseek failed"
 msgstr "неу�пешно изпълнение на „fseek“"
 
-#: builtin/am.c:725
+#: builtin/am.c:749
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "кръпката „%s“ не може да �е анализира"
 
-#: builtin/am.c:790
+#: builtin/am.c:814
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 "Само една поредица от кръпки от „StGIT“ може да бъде прилагана в даден момент"
 
-#: builtin/am.c:838
+#: builtin/am.c:862
 msgid "invalid timestamp"
 msgstr "неправилна �тойно�т за време"
 
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:867 builtin/am.c:879
 msgid "invalid Date line"
 msgstr "неправилен ред за дата „Date“"
 
-#: builtin/am.c:850
+#: builtin/am.c:874
 msgid "invalid timezone offset"
 msgstr "неправилно отме�тване на ча�ови� по��"
 
-#: builtin/am.c:943
+#: builtin/am.c:967
 msgid "Patch format detection failed."
 msgstr "Форматът на кръпката не може да бъде определен."
 
-#: builtin/am.c:948 builtin/clone.c:406
+#: builtin/am.c:972 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/am.c:953
+#: builtin/am.c:977
 msgid "Failed to split patches."
-msgstr "Кръпките не могат да бъдат разделени."
+msgstr "Кръпките не може да бъдат разделени."
 
-#: builtin/am.c:1084
+#: builtin/am.c:1126
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "След коригирането на този проблем изпълнете „%s --continue“."
 
-#: builtin/am.c:1085
+#: builtin/am.c:1127
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "�ко предпочитате да пре�кочите тази кръпка, изпълнете „%s --skip“."
 
-#: builtin/am.c:1086
+#: builtin/am.c:1128
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "За да �е върнете към първоначалното �ъ�то�ние, изпълнете „%s --abort“."
 
-#: builtin/am.c:1169
+#: builtin/am.c:1223
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Кръпката е пратена � форматиране „format=flowed“.  Празните знаци в кра� на "
 "редовете може да �е загуб�т."
 
-#: builtin/am.c:1197
+#: builtin/am.c:1251
 msgid "Patch is empty."
 msgstr "Кръпката е празна."
 
-#: builtin/am.c:1262
+#: builtin/am.c:1316
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "лип�ва ред за автор�тво в подаването „%s“"
 
-#: builtin/am.c:1265
+#: builtin/am.c:1319
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "грешен ред � идентично�т: %.*s"
 
-#: builtin/am.c:1484
+#: builtin/am.c:1538
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "В хранилището лип�ват необходимите обекти-BLOB, за да �е премине към тройно "
 "�ливане."
 
-#: builtin/am.c:1486
+#: builtin/am.c:1540
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Базовото дърво �е рекон�труира от информаци�та в индек�а…"
 
-#: builtin/am.c:1505
+#: builtin/am.c:1559
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -9095,24 +10882,24 @@ msgstr ""
 "Кръпката не може да �е приложи към обектите-BLOB в индек�а.\n"
 "Да не би да �те � редактирали на ръка?"
 
-#: builtin/am.c:1511
+#: builtin/am.c:1565
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Преминаване към прилагане на кръпка към базата и тройно �ливане…"
 
-#: builtin/am.c:1537
+#: builtin/am.c:1591
 msgid "Failed to merge in the changes."
 msgstr "�еу�пешно �ливане на промените."
 
-#: builtin/am.c:1569
+#: builtin/am.c:1623
 msgid "applying to an empty history"
 msgstr "прилагане върху празна и�тори�"
 
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1675 builtin/am.c:1679
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "не може да �е продължи — „%s“ не �ъще�твува."
 
-#: builtin/am.c:1638
+#: builtin/am.c:1697
 msgid "Commit Body is:"
 msgstr "Т�лото на кръпката за прилагане е:"
 
@@ -9120,44 +10907,45 @@ msgstr "Т�лото на кръпката за прилагане е:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1648
+#: builtin/am.c:1707
 #, 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:1695 builtin/commit.c:374
+#: builtin/am.c:1753 builtin/commit.c:408
 msgid "unable to write index file"
 msgstr "индек�ът не може да бъде запи�ан"
 
-#: builtin/am.c:1699
+#: builtin/am.c:1757
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
-"Индек�ът не е чи�т: кръпките не могат да бъдат приложени (замър�ени �а: %s)"
+"Индек�ът не е чи�т: кръпките не може да бъдат приложени (замър�ени �а: %s)"
 
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1797 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Прилагане: %.*s"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1814
 msgid "No changes -- Patch already applied."
 msgstr "Без промени — кръпката вече е приложена."
 
-#: builtin/am.c:1762
+#: builtin/am.c:1820
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "�еу�пешно прилагане на кръпка при %s %.*s“"
 
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1824
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
-"За да видите неу�пешно приложени кръпки, използвайте опци�та „git am --show-"
-"current-patch“ to see the failed patch"
+"За да видите неу�пешно приложени кръпки, използвайте:\n"
+"\n"
+"    git am --show-current-patch=diff"
 
-#: builtin/am.c:1810
+#: 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"
@@ -9167,7 +10955,7 @@ msgstr ""
 "�ко н�ма друга пром�на за включване в индек�а, най-веро�тно н�ко� друга\n"
 "кръпка е довела до �ъщите промени и в такъв �лучай про�то пропу�нете тази."
 
-#: builtin/am.c:1817
+#: 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 "
@@ -9178,17 +10966,17 @@ msgstr ""
 "След корекци� на конфликтите изпълнете „git add“ върху поправените файлове.\n"
 "За да приемете „изтрити от т�х“, изпълнете „git rm“ върху изтритите файлове."
 
-#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
-#: builtin/reset.c:337
+#: 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 "„%s“ не е разпознат като обект."
 
-#: builtin/am.c:1976
+#: builtin/am.c:2034
 msgid "failed to clean index"
 msgstr "индек�ът не може да бъде изчи�тен"
 
-#: builtin/am.c:2020
+#: builtin/am.c:2078
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -9199,149 +10987,166 @@ msgstr ""
 "�очи към\n"
 "„ORIG_HEAD“"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2185
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "�еправилна �тойно�т за „--patch-format“: „%s“"
 
-#: builtin/am.c:2153
+#: builtin/am.c:2227
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "�еправилна �тойно�т за „--show-current-patch“: „%s“"
+
+#: builtin/am.c:2231
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr ""
+"опциите „--show-current-patch=%s“ и „--show-current-patch=%s“ �а не�ъвме�тими"
+
+#: builtin/am.c:2262
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [ОПЦИЯ…] [(Ф�ЙЛ_С_ПОЩ�|ДИРЕКТОРИЯ_С_ПОЩ�)…]"
 
-#: builtin/am.c:2154
+#: builtin/am.c:2263
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
 
-#: builtin/am.c:2160
+#: builtin/am.c:2269
 msgid "run interactively"
 msgstr "интерактивна работа"
 
-#: builtin/am.c:2162
+#: builtin/am.c:2271
 msgid "historical option -- no-op"
 msgstr "изо�тавена опци�, �ъще�твува по и�ториче�ки причини, нищо не прави"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2273
 msgid "allow fall back on 3way merging if needed"
 msgstr "да �е преминава към тройно �ливане при нужда."
 
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:297 builtin/stash.c:812
+#: 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 "без извеждане на информаци�"
 
-#: builtin/am.c:2167
-msgid "add a Signed-off-by line to the commit message"
-msgstr "добав�не на ред за подпи� „Signed-off-by“ в �ъобщението за подаване"
+#: builtin/am.c:2276
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "добав�не на епилог за подпи� „Signed-off-by“ в �ъобщението за подаване"
 
-#: builtin/am.c:2170
+#: builtin/am.c:2279
 msgid "recode into utf8 (default)"
 msgstr "прекодиране в UTF-8 (�тандартно)"
 
-#: builtin/am.c:2172
+#: builtin/am.c:2281
 msgid "pass -k flag to git-mailinfo"
 msgstr "подаване на опци�та „-k“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2174
+#: builtin/am.c:2283
 msgid "pass -b flag to git-mailinfo"
 msgstr "подаване на опци�та „-b“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2285
 msgid "pass -m flag to git-mailinfo"
 msgstr "подаване на опци�та „-m“ на командата „git-mailinfo“"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2287
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 "подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2290
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "без подаване на опци�та „--keep-cr“ на командата „git-mailsplit“ незави�имо "
 "от „am.keepcr“"
 
-#: builtin/am.c:2184
+#: builtin/am.c:2293
 msgid "strip everything before a scissors line"
 msgstr "пропу�кане на в�ичко преди реда за отр�зване"
 
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr "прекарване през „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 "прекарване през „git-apply“"
 
-#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
-#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:150 parse-options.h:171 parse-options.h:312
+#: 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: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 "БРОЙ"
 
-#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: 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 "ФОРМ�Т"
 
-#: builtin/am.c:2210
+#: builtin/am.c:2322
 msgid "format the patch(es) are in"
 msgstr "формат на кръпките"
 
-#: builtin/am.c:2216
+#: builtin/am.c:2328
 msgid "override error message when patch failure occurs"
 msgstr "избрано от ва� �ъобщение за грешка при прилагане на кръпки"
 
-#: builtin/am.c:2218
+#: builtin/am.c:2330
 msgid "continue applying patches after resolving a conflict"
 msgstr "продължаване на прилагането на кръпки �лед коригирането на конфликт"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2333
 msgid "synonyms for --continue"
 msgstr "п�евдоними на „--continue“"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2336
 msgid "skip the current patch"
 msgstr "пре�качане на текущата кръпка"
 
-#: builtin/am.c:2227
-msgid "restore the original branch and abort the patching operation."
+#: builtin/am.c:2339
+msgid "restore the original branch and abort the patching operation"
 msgstr ""
 "въз�танов�ване на първоначалното �ъ�то�ние на клона и преу�танов�ване на "
-"прилагането на кръпката."
+"прилагането на кръпката"
 
-#: builtin/am.c:2230
-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 ""
-"преу�танов�ване на прилагането на кръпката без пром�на към кое �очи „HEAD“."
+"преу�танов�ване на прилагането на кръпката без пром�на към кое �очи „HEAD“"
 
-#: builtin/am.c:2233
-msgid "show the patch being applied."
-msgstr "показване на прилаганата кръпка."
+#: builtin/am.c:2346
+msgid "show the patch being applied"
+msgstr "показване на прилаганата кръпка"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2351
 msgid "lie about committer date"
 msgstr "дата за подаване различна от първоначалната"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2353
 msgid "use current timestamp for author date"
 msgstr "използване на текущото време като това за автор"
 
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
-#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
+#: 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 "ИДЕ�ТИФИК�ТОР_��_КЛЮЧ"
 
-#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
 msgstr "подпи�ване на подавани�та � GPG"
 
-#: builtin/am.c:2245
+#: builtin/am.c:2359
 msgid "(internal use for git-rebase)"
 msgstr "(ползва �е вътрешно за „git-rebase“)"
 
-#: builtin/am.c:2263
+#: 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."
@@ -9349,31 +11154,31 @@ msgstr ""
 "Опциите „-b“/„--binary“ отдавна не прав�т нищо и\n"
 "ще бъдат премахнати в бъдеще.  �е ги ползвайте."
 
-#: builtin/am.c:2270
+#: builtin/am.c:2384
 msgid "failed to read the index"
 msgstr "неу�пешно изчитане на индек�а"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2399
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "предишната директори� за пребазиране „%s“ в�е още �ъще�твува, а е зададен "
 "файл „mbox“."
 
-#: builtin/am.c:2309
+#: builtin/am.c:2423
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 "Открита е излишна директори� „%s“.\n"
-"Можете да � изтриете � командата „git am --abort“."
+"Може да � изтриете � командата „git am --abort“."
 
-#: builtin/am.c:2315
+#: builtin/am.c:2429
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "В момента не тече операци� по коригиране и н�ма как да �е продължи."
 
-#: builtin/am.c:2325
+#: builtin/am.c:2439
 msgid "interactive mode requires patches on the command line"
 msgstr "интерактивни�т режим изи�ква кръпки на командни� ред"
 
@@ -9412,40 +11217,15 @@ msgstr "git archive: протоколна грешка"
 msgid "git archive: expected a flush"
 msgstr "git archive: очакваше �е изчи�тване на буферите чрез „flush“"
 
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
 #: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms ЛОШО ДОБРО"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [ПОД�В��Е]"
 
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] СЪСТОЯ�ИЕ ВЕРСИЯ ДОБРО ЛОШО"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr "git bisect--helper --bisect-check-and-set-terms КОМ��Д� ДОБРО"
-
-#: builtin/bisect--helper.c:28
+#: 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:29
+#: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
@@ -9453,48 +11233,75 @@ msgstr ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:26
 msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<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>...]"
 msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [ЛОШО [ДОБРО…]] [--] [ПЪТ…]"
+"git bisect--helper --bisect-start [--term-{new,bad}=ЛОШО --term-{old,good}"
+"=ДОБРО] [--no-checkout] [--first-parent] [ЛОШО [ДОБРО…]] [--] [ПЪТ…]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-reset (ЛОШО) [ВЕРСИЯ]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-reset (ДОБРО) [ВЕРСИЯ…]"
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-next ИМЕ_��_Ф�ЙЛ"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-reset [(ВЕРСИЯ|ДИ�П�ЗО�)…]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "файлът „%s“ не може да �е отвори в режим „%s“"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "във файла „%s“ не може да �е пише"
+
+#: builtin/bisect--helper.c:155
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "„%s“ е неправилна управл�ваща дума"
 
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:159
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "„%s“ е вградена команда и не може да �е използва като управл�ваща дума"
 
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:169
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "не може да �мените значението на управл�ващата дума „%s“"
 
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:179
 msgid "please use two different terms"
 msgstr "използвайте две различни управл�ващи думи"
 
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "файлът „BISECT_TERMS“ не може да �е отвори"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:195
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "В момента не �е извършва двоично тър�ене.\n"
 
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:203
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "„%s“ не е подаване"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:212
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9502,27 +11309,27 @@ msgstr ""
 "първоначално указаното „%s“ в указател� „HEAD“ не може да бъде\n"
 "изтеглено.  Пробвайте да изпълните командата „git bisect reset ПОД�В��Е“."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:256
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "�еправилен аргумент на функци�та „bisect_write“: „%s“"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:261
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "идентификаторът на обект на вер�и� „%s“ не може да бъде получен"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:273
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "файлът „%s“ не може да бъде отворен"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:299
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "�еправилна команда: в момента �е изпълн�ва двоично тър�ене по %s/%s."
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:326
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9531,7 +11338,7 @@ msgstr ""
 "Тр�бва да зададете поне една „%s“ и една „%s“ вер�и�.  (Това може да �е\n"
 "направи �ъответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:330
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9542,7 +11349,7 @@ msgstr ""
 "Тр�бва да зададете поне една „%s“ и една „%s“ вер�и�.  (Това може да �е\n"
 "направи �ъответно и чрез командите „git bisect %s“ и „git bisect %s“.)"
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:350
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "двоично тър�ене �амо по „%s“ подаване."
@@ -9551,15 +11358,15 @@ msgstr "двоично тър�ене �амо по „%s“ подаване."
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:358
 msgid "Are you sure [Y/n]? "
 msgstr "Да �е продължи ли? „Y“ —  Д�, „n“ — не"
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:419
 msgid "no terms defined"
 msgstr "не �а указани управл�ващи думи"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:422
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9568,7 +11375,7 @@ msgstr ""
 "Текущите управл�ващи думи �а: %s за �тарото �ъ�то�ние\n"
 "и %s за новото �ъ�то�ние.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:432
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9577,291 +11384,337 @@ msgstr ""
 "на „git bisect terms“ е подаден неправилен аргумент „%s“\n"
 "Поддържат �е опциите „--term-good“/„--term-old“ и „--term-bad„/„--term-new“."
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+msgid "revision walk setup failed\n"
+msgstr "неу�пешно на�тройване на обхождането на вер�иите\n"
+
+#: builtin/bisect--helper.c:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "файлът „%s“ не може да �е отвори за добав�не"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr "„“ е неправилна управл�ваща дума"
+
+#: builtin/bisect--helper.c:663
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "непозната опци�: %s"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:667
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "„%s“ не изглежда като указател към вер�и�"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:698
 msgid "bad HEAD - I need a HEAD"
 msgstr "�еправилен указател „HEAD“"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:713
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "�еу�пешно преминаване към „%s“.  Изпълнете командата „git bisect start "
 "СЪЩЕСТВУВ�Щ_КЛО�“."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:734
 msgid "won't bisect on cg-seek'ed tree"
 msgstr ""
 "не може да �е тър�и двоично, когато е изпълнена командата „cg-seek“ от "
 "„cogito“"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:737
 msgid "bad HEAD - strange symbolic ref"
 msgstr "�еправилен указател „HEAD“ — необичаен �имволен указател"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:757
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "неправилен указател: „%s“"
 
-#: builtin/bisect--helper.c:630
-msgid "perform 'git bisect next'"
-msgstr "извършване на „git bisect next“"
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Започнете като изпълните командата „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:826
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "Да �е извърши ли автоматично? „Y“ —  Д�, „n“ — не"
+
+#: builtin/bisect--helper.c:844
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "опци�та „--bisect-state“ изи�ква поне един аргумент"
 
-#: builtin/bisect--helper.c:632
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "запазване на управл�ващите думи в „“.git/BISECT_TERMS„“"
+#: builtin/bisect--helper.c:857
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "Командата „git bisect %s“ приема �амо един аргумент."
 
-#: builtin/bisect--helper.c:634
-msgid "cleanup the bisection state"
-msgstr "изчи�тване на �ъ�то�нието на двоичното тър�ене"
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "�еправилна вер�и�: „%s“"
 
-#: builtin/bisect--helper.c:636
-msgid "check for expected revs"
-msgstr "проверка за очакваните вер�ии"
+#: builtin/bisect--helper.c:889
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "�еправилна вер�и� (не е подаване): „%s“"
 
-#: builtin/bisect--helper.c:638
-msgid "reset the bisection state"
-msgstr "изчи�тване на �ъ�то�нието на двоичното тър�ене"
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr "В момента не �е извършва двоично тър�ене."
 
-#: builtin/bisect--helper.c:640
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "запи� на �ъ�то�нието на двоичното тър�ене в „BISECT_LOG“"
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr ""
+"�епозната команда „%s“.  Възможно�тите �а: „start“, „skip“, „good“, „bad“ (и "
+"вариантите им)"
 
-#: builtin/bisect--helper.c:642
-msgid "check and set terms in a bisection state"
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
 msgstr ""
-"проверка и задаване на управл�ващи думи към �ъ�то�нието на двоичното тър�ене"
+"файлът „%s“ не може да бъде прочетен, за да �е изпълн�т командите от него "
+"наново"
+
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr "изчи�тване на �ъ�то�нието на двоичното тър�ене"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:1058
 msgid "check whether bad or good terms exist"
 msgstr "проверка дали �ъще�твуват одобр�ващи/отхвърл�щи управл�ващи думи"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:1060
 msgid "print out the bisect terms"
 msgstr "извеждане на управл�ващите думи"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:1062
 msgid "start the bisect session"
 msgstr "начало на двоично тър�ене"
 
-#: builtin/bisect--helper.c:650
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr ""
-"обнов�ване на указател� „BISECT_HEAD“ вме�то да �е използва текущото подаване"
+#: builtin/bisect--helper.c:1064
+msgid "find the next bisection commit"
+msgstr "откриване на �ледващото подаване при двоично тър�ене"
 
-#: builtin/bisect--helper.c:652
-msgid "no log for BISECT_WRITE"
-msgstr "лип�ва запи� за „BISECT_WRITE“"
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr "задаване на �ъ�то�нието на указател�/ите"
 
-#: builtin/bisect--helper.c:669
-msgid "--write-terms requires two arguments"
-msgstr "опци�та „--write-terms“ изи�ква точно 2 аргумента"
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr "извеждане на �тъпките на двоичното тър�ене до�ега"
 
-#: builtin/bisect--helper.c:673
-msgid "--bisect-clean-state requires no arguments"
-msgstr "опци�та „--bisect-clean-state“ не приема аргументи"
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
+msgstr "наново изпълнение на двоичното тър�ене чрез дадени� файл"
 
-#: builtin/bisect--helper.c:680
-msgid "--bisect-reset requires either no argument or a commit"
-msgstr "опци�та „--bisect-reset“ изи�ква или 0 аргументи, или 1 — подаване"
+#: builtin/bisect--helper.c:1072
+msgid "skip some commits for checkout"
+msgstr "пре�качане на н�кои подавани� при изтегл�не"
 
-#: builtin/bisect--helper.c:684
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "опци�та „--bisect-write“ изи�ква 4 или 5 аргумента"
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "лип�ва запи� за „BISECT_WRITE“"
 
-#: builtin/bisect--helper.c:690
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "опци�та „--check-and-set-terms“ изи�ква 3 аргумента"
+#: builtin/bisect--helper.c:1089
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "опци�та „--bisect-reset“ изи�ква или 0 аргументи, или 1 — подаване"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:1094
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "опци�та „--bisect-next-check“ изи�ква 2 или 3 аргумента"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:1100
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "опци�та „--bisect-terms“ изи�ква 0 или 1 аргумента"
 
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr "опци�та „--bisect-next“ не приема аргументи"
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "опци�та „--bisect-log“ не приема аргументи"
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr "не е зададен журнален файл"
+
+#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_З�_ВЕРСИЯТ�…] [ВЕРСИЯ] [--] Ф�ЙЛ"
 
-#: builtin/blame.c:36
+#: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "ОПЦИИте_З�_ВЕРСИЯТ� �а документирани в ръковод�твото git-rev-list(1)"
 
-#: builtin/blame.c:409
+#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
 msgstr "тр�бва да е цв�т: %s"
 
-#: builtin/blame.c:416
+#: builtin/blame.c:417
 msgid "must end with a color"
 msgstr "тр�бва да завършва � цв�т"
 
-#: builtin/blame.c:729
+#: builtin/blame.c:728
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "неправилен цв�т „%s“ в „color.blame.repeatedLines“"
 
-#: builtin/blame.c:747
+#: builtin/blame.c:746
 msgid "invalid value for blame.coloring"
 msgstr "неправилна �тойно�т за „blame.coloring“"
 
-#: builtin/blame.c:822
+#: builtin/blame.c:845
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "вер�и�та за пре�качане „%s“ не може да бъде открита"
 
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
-msgstr "Извеждане на автор�твото � намирането му, по�ледователно"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "извеждане на автор�твото � намирането му, по�ледователно"
 
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
-"Извеждане на празни �уми по SHA1 за граничните подавани� (�тандартно опци�та "
-"е изключена)"
+"без извеждане на имената на обектите за граничните подавани� (�тандартно "
+"опци�та е изключена)"
 
-#: builtin/blame.c:846
-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 ""
-"�ачалните подавани� да не �е �читат за гранични (�тандартно опци�та е "
+"началните подавани� да не �е �читат за гранични (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "Извеждане на �тати�тика за извършените дей�тви�"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "извеждане на �тати�тика за извършените дей�тви�"
 
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-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:566 builtin/send-pack.c:198
+msgid "force progress reporting"
+msgstr "извеждане на напредъка"
 
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr "Извеждане на допълнителна информаци� за определ�нето на автор�твото"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "извеждане на допълнителна информаци� за определ�нето на автор�твото"
 
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
 msgstr ""
-"Извеждане на първоначалното име на файл (�тандартно това е автоматично)"
+"извеждане на първоначалното име на файл (�тандартно това е автоматично)"
 
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
 msgstr ""
-"Извеждане на първоначални�т номер на ред (�тандартно опци�та е изключена)"
+"извеждане на първоначални� номер на ред (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
-msgstr "Извеждане във формат за по-нататъшна обработка"
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
+msgstr "извеждане във формат за по-нататъшна обработка"
 
-#: builtin/blame.c:853
-msgid "Show porcelain format with per-line commit information"
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
 msgstr ""
-"Извеждане във формат за команди от потребител�ко ниво � информаци� на в�еки "
+"извеждане във формат за команди от потребител�ко ниво � информаци� на в�еки "
 "ред"
 
-#: builtin/blame.c:854
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
 msgstr ""
-"Използване на �ъщи� формат като „git-annotate“ (�тандартно опци�та е "
+"използване на �ъщи� формат като „git-annotate“ (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
-msgstr "Извеждане на неформатирани времена (�тандартно опци�та е изключена)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "извеждане на неформатирани времена (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Извеждане на пълните �уми по SHA1 (�тандартно опци�та е изключена)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "извеждане на пълните �уми по SHA1 (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "Без име на автор и време на пром�на (�тандартно опци�та е изключена)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "без име на автор и време на пром�на (�тандартно опци�та е изключена)"
 
-#: builtin/blame.c:858
-msgid "Show author email instead of name (Default: off)"
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
 msgstr ""
-"Извеждане на е-пощата на автора, а не името му (�тандартно опци�та е "
+"извеждане на е-пощата на автора, а не името му (�тандартно опци�та е "
 "изключена)"
 
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
-msgstr "Без разлики в знаците за интервали"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "без разлики в знаците за интервали"
 
-#: builtin/blame.c:860 builtin/log.c:1630
+#: builtin/blame.c:883 builtin/log.c:1823
 msgid "rev"
 msgstr "ВЕРС"
 
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "Пре�качане на ВЕРСи�та при извеждане на автор�твото"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "пре�качане на ВЕРСи�та при извеждане на автор�твото"
 
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr "Пре�качане на вер�иите указани във Ф�ЙЛа при извеждане на автор�твото"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "пре�качане на вер�иите указани във Ф�ЙЛа"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:885
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 "оцвет�ване на повтар�щите �е метаданни от предишни� ред в различен цв�т"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:886
 msgid "color lines by age"
 msgstr "оцвет�ване на редовете по възра�т"
 
-#: builtin/blame.c:870
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Подобр�ване на разликите чрез ек�периментална еври�тика"
-
-#: builtin/blame.c:872
-msgid "Spend extra cycles to find better match"
-msgstr "Допълнителни изчи�лени� за по-добри резултати"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr "допълнителни изчи�лени� за по-добри резултати"
 
-#: builtin/blame.c:873
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "Изчитане на вер�иите от Ф�ЙЛ, а не чрез изпълнение на „git-rev-list“"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "изчитане на вер�иите от Ф�ЙЛа, а не чрез изпълнение на „git-rev-list“"
 
-#: builtin/blame.c:874
-msgid "Use <file>'s contents as the final image"
-msgstr "Използване на �ъдържанието на Ф�ЙЛа като крайно положение"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "използване на �ъдържанието на Ф�ЙЛа като крайно положение"
 
-#: builtin/blame.c:875 builtin/blame.c:876
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "напа�ване на редовете"
 
-#: builtin/blame.c:875
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
 msgstr ""
-"Тър�ене на копирани редове както в рамките на един файл, така и от един файл "
+"тър�ене на копирани редове както в рамките на един файл, така и от един файл "
 "към друг"
 
-#: builtin/blame.c:876
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
 msgstr ""
-"Тър�ене на преме�тени редове както в рамките на един файл, така и от един "
+"тър�ене на преме�тени редове както в рамките на един файл, така и от един "
 "файл към друг"
 
-#: builtin/blame.c:877
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "диапазон"
 
-#: builtin/blame.c:877
-msgid "Process only line range n,m, counting from 1"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
-"Информаци� �амо за редовете в диапазона от n до m включително.  Броенето "
-"започва от 1"
+"информаци� �амо за редовете в диапазона ��Ч�ЛО,КР�Й или �амо на :ФУ�КЦИЯта"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:945
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "опци�та „--progress“ е не�ъвме�тима � „--incremental“ и форма̀та на командите "
@@ -9875,24 +11728,24 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr "преди 4 години и 11 ме�еца"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1112
 #, 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:1133
+#: builtin/blame.c:1157
 msgid "Blaming lines"
 msgstr "Редове � автор�тво"
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [ОПЦИЯ…] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [ОПЦИЯ…] [-r | -a] [--merged] [--no-merged]"
 
 #: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -9954,118 +11807,108 @@ msgstr ""
 msgid "Update of config-file failed"
 msgstr "�еу�пешно обнов�ване на конфигурационни� файл"
 
-#: builtin/branch.c:220
+#: builtin/branch.c:223
 msgid "cannot use -a with -d"
-msgstr "Опци�та „-a“ е не�ъвме�тима � опци�та „-d“"
+msgstr "опциите „-a“ и „-d“ �а не�ъвме�тими"
 
-#: builtin/branch.c:226
+#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Обектът-подаване, �очен от указател� „HEAD“, не може да бъде открит"
 
-#: builtin/branch.c:240
+#: builtin/branch.c:244
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "�е можете да изтриете клона „%s“, който е изтеглен в път� „%s“"
+msgstr "�е може да изтриете клона „%s“, който е изтеглен в път� „%s“"
 
-#: builtin/branch.c:255
+#: builtin/branch.c:259
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "�лед�щи�т клон „%s“ не може да бъде открит."
 
-#: builtin/branch.c:256
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
 msgstr "клонът „%s“ не може да бъде открит."
 
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Грешка при изтриването на �лед�щи� клон „%s“"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Грешка при изтриването на клона „%s“"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Изтрит �лед�щ клон „%s“ (той �очеше към „%s“).\n"
 
-#: builtin/branch.c:280
+#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Изтрит клон „%s“ (той �очеше към „%s“).\n"
 
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:440 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "форматиращи�т низ не може да бъде анализиран: %s"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:471
 msgid "could not resolve HEAD"
 msgstr "подаването, �очено от указател� „HEAD“, не може да �е у�танови"
 
-#: builtin/branch.c:466
+#: builtin/branch.c:477
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "„HEAD“ (%s) �очи извън директори�та „refs/heads“"
 
-#: builtin/branch.c:481
+#: builtin/branch.c:492
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Клонът „%s“ �е пребазира върху „%s“"
 
-#: builtin/branch.c:485
+#: builtin/branch.c:496
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Тър�и �е двоично в клона „%s“ при „%s“"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:513
 msgid "cannot copy the current branch while not on any."
-msgstr "не можете да копирате текущи� клон, защото �те извън който и да е клон"
+msgstr "не може да копирате текущи� клон, защото �те извън който и да е клон"
 
-#: builtin/branch.c:504
+#: builtin/branch.c:515
 msgid "cannot rename the current branch while not on any."
 msgstr ""
-"не можете да преименувате текущи� клон, защото �те извън който и да е клон"
+"не може да преименувате текущи� клон, защото �те извън който и да е клон"
 
-#: builtin/branch.c:515
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "�еправилно име на клон: „%s“"
 
-#: builtin/branch.c:542
+#: builtin/branch.c:555
 msgid "Branch rename failed"
 msgstr "�еу�пешно преименуване на клон"
 
-#: builtin/branch.c:544
+#: builtin/branch.c:557
 msgid "Branch copy failed"
 msgstr "�еу�пешно копиране на клон"
 
-#: builtin/branch.c:548
+#: builtin/branch.c:561
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Клонът � неправилно име „%s“ е копиран"
 
-#: builtin/branch.c:551
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Клонът � неправилно име „%s“ е преименуван"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:570
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Клонът е преименуван на „%s“, но указател�т „HEAD“ не е обновен"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:579
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Клонът е преименуван, но конфигурационни�т файл не е обновен"
 
-#: builtin/branch.c:568
+#: builtin/branch.c:581
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Клонът е копиран, но конфигурационни�т файл не е обновен"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -10076,183 +11919,183 @@ msgstr ""
 "    %s\n"
 "Редовете, които започват � „%c“, ще бъдат пропу�нати.\n"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr "Общи на�тройки"
 
-#: builtin/branch.c:620
+#: builtin/branch.c:633
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 "извеждане на контролната �ума и темата.  Повтар�нето на опци�та прибав� "
 "отдалечените клони"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr "без информационни �ъобщени�"
 
-#: builtin/branch.c:622
+#: builtin/branch.c:635
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "задаване на режима на �ледене (виж git-pull(1))"
 
-#: builtin/branch.c:624
+#: builtin/branch.c:637
 msgid "do not use"
 msgstr "да не �е ползва"
 
-#: builtin/branch.c:626 builtin/rebase.c:486
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr "клон-източник"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr "�м�на на клона-източник"
 
-#: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "без клон-източник"
+#: builtin/branch.c:640
+msgid "unset the upstream info"
+msgstr "изчи�тване на информаци�та за клон-източник"
 
-#: builtin/branch.c:628
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr "цветен изход"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
 msgstr "дей�твие върху �лед�щите клони"
 
-#: 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 "извеждане �амо на клоните, които �ъдържат това ПОД�В��Е"
 
-#: 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 "извеждане �амо на клоните, които не �ъдържат това ПОД�В��Е"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
 msgstr "Специални дей�тви� на „git-branch“:"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:651
 msgid "list both remote-tracking and local branches"
 msgstr "извеждане както на �лед�щите, така и на локалните клони"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr "изтриване на клони, които �а напълно �лети"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:654
 msgid "delete branch (even if not merged)"
 msgstr "изтриване и на клони, които не �а напълно �лети"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:655
 msgid "move/rename a branch and its reflog"
 msgstr ""
 "преме�тване/преименуване на клон и принадлежащи�т му журнал на указателите"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:656
 msgid "move/rename a branch, even if target exists"
 msgstr "преме�тване/преименуване на клон, дори ако има вече клон � такова име"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:657
 msgid "copy a branch and its reflog"
 msgstr "копиране на клон и принадлежащи� му журнал на указателите"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:658
 msgid "copy a branch, even if target exists"
 msgstr "копиране на клон, дори ако има вече клон � такова име"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr "извеждане на имената на клоните"
 
-#: builtin/branch.c:647
+#: builtin/branch.c:660
 msgid "show current branch name"
 msgstr "извеждане на името на текущи� клон"
 
-#: builtin/branch.c:648
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr "�ъздаване на журнала на указателите на клона"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr "редактиране на опи�анието на клона"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:664
 msgid "force creation, move/rename, deletion"
 msgstr "принудително �ъздаване, преме�тване, преименуване, изтриване"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:665
 msgid "print only branches that are merged"
 msgstr "извеждане �амо на �летите клони"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:666
 msgid "print only branches that are not merged"
 msgstr "извеждане �амо на не�летите клони"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:667
 msgid "list branches in columns"
 msgstr "извеждане по колони"
 
-#: builtin/branch.c:657 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:433
+#: builtin/tag.c:477
 msgid "object"
 msgstr "ОБЕКТ"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:670
 msgid "print only branches of the object"
 msgstr "извеждане �амо на клоните на ОБЕКТ�"
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
 msgid "sorting and filtering are case insensitive"
 msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
 
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: 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 "ФОРМ�Т за изхода"
 
-#: builtin/branch.c:684 builtin/clone.c:760
+#: builtin/branch.c:695 builtin/clone.c:794
 msgid "HEAD not found below refs/heads!"
 msgstr "В директори�та „refs/heads“ лип�ва файл „HEAD“"
 
-#: builtin/branch.c:708
+#: builtin/branch.c:719
 msgid "--column and --verbose are incompatible"
-msgstr "Опциите „--column“ и „--verbose“ �а не�ъвме�тими"
+msgstr "опциите „--column“ и „--verbose“ �а не�ъвме�тими"
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
 msgid "branch name required"
 msgstr "�еобходимо е име на клон"
 
-#: builtin/branch.c:753
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
 msgstr "�е може да зададете опи�ание на не�вързан „HEAD“"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:771
 msgid "cannot edit description of more than one branch"
 msgstr "�е може да редактирате опи�анието на повече от един клон едновременно"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:778
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "В клона „%s“ в�е още н�ма подавани�."
 
-#: builtin/branch.c:768
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Лип�ва клон на име „%s“."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:796
 msgid "too many branches for a copy operation"
 msgstr "прекалено много клони за копиране"
 
-#: builtin/branch.c:792
+#: builtin/branch.c:805
 msgid "too many arguments for a rename operation"
 msgstr "прекалено много аргументи към командата за преименуване"
 
-#: builtin/branch.c:797
+#: builtin/branch.c:810
 msgid "too many arguments to set new upstream"
 msgstr "прекалено много аргументи към командата за �ледене"
 
-#: builtin/branch.c:801
+#: builtin/branch.c:814
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -10260,60 +12103,207 @@ msgstr ""
 "Следеното от „HEAD“ не може да �е зададе да е „%s“, защото то не �очи към "
 "никой клон."
 
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:817 builtin/branch.c:840
 #, c-format
 msgid "no such branch '%s'"
 msgstr "��ма клон на име „%s“."
 
-#: builtin/branch.c:808
+#: builtin/branch.c:821
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "�е �ъще�твува клон на име „%s“."
 
-#: builtin/branch.c:821
+#: builtin/branch.c:834
 msgid "too many arguments to unset upstream"
 msgstr "прекалено много аргументи към командата за �пиране на �ледене"
 
-#: builtin/branch.c:825
+#: builtin/branch.c:838
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "Следеното от „HEAD“ не може да махне, защото то не �очи към никой клон."
 
-#: builtin/branch.c:831
+#: builtin/branch.c:844
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "��ма информаци� клонът „%s“ да �леди н�кой друг"
 
-#: builtin/branch.c:841
+#: 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>?"
 msgstr ""
-"Опциите „-a“ и „-r“ на „git branch“ �а не�ъвме�тими � име на клон.\n"
+"опциите „-a“ и „-r“ на „git branch“ �а не�ъвме�тими � име на клон.\n"
 "Пробвайте �: „-a|-r --list Ш�БЛО�“"
 
-#: builtin/branch.c:845
+#: builtin/branch.c:858
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgstr ""
-"Опци�та „--set-upstream“ вече не �е поддържа.  Използвайте „--track“ или „--"
+"опци�та „--set-upstream“ вече не �е поддържа.  Използвайте „--track“ или „--"
 "set-upstream-to“"
 
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "вер�и� на git:\n"
+
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
-msgstr "Пратката „%s“ е наред\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "грешка при изпълнението на „uname()“ — „%s“ (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "компилатор: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "библиотека на C: "
+
+#: builtin/bugreport.c:80
+msgid "not run from a git repository - no hooks to show\n"
+msgstr "командата е �тартирана извън хранилище на Git, затова н�ма куки\n"
+
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory Ф�ЙЛ] [-s|--suffix ФОРМ�Т]"
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"Благодарим, че попълнихте доклад за грешка в Git!\n"
+"Молим да отговорите на �ледните въпро�и, за да разберем е�те�твото на "
+"проблема.\n"
+"\n"
+"Какво правехте, преди проблемът да възникне? (Стъпки за повтар�не на "
+"проблема)\n"
+"\n"
+"Какво очаквахте да �е �лучи? (Очаквано поведение)\n"
+"\n"
+"Какво �е �лучи вме�то това? (Реално поведение)\n"
+"\n"
+"Каква е разликата между очакваното и дей�твително �лучилото �е?\n"
+"\n"
+"Допълнителна информаци�, ко�то и�кате да добавите:\n"
+"\n"
+"Разгледайте о�таналата ча�т от доклада за грешка по-долу.\n"
+"Може да изтриете редовете, които не и�кате да �поделите.\n"
+
+#: builtin/bugreport.c:136
+msgid "specify a destination for the bugreport file"
+msgstr "укажете файла, в който да �е запази докладът за грешка"
+
+#: builtin/bugreport.c:138
+msgid "specify a strftime format suffix for the filename"
+msgstr "укажете �уфик�а на файла във формат за „strftime“"
+
+#: builtin/bugreport.c:160
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "родител�ките директории на „%s“ не може да бъдат �ъздадени"
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr "Информаци� за �и�темата"
+
+#: builtin/bugreport.c:170
+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
+#, c-format
+msgid "unable to write to %s"
+msgstr "в „%s“ не може да �е пише"
+
+#: builtin/bugreport.c:190
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "�ови�т доклад е �ъздаден в „%s“.\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [ОПЦИЯ…] Ф�ЙЛ �РГУМЕ�Т_З�_git_rev-list…"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [ОПЦИЯ…] Ф�ЙЛ…"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads Ф�ЙЛ [ИМЕ_��_УК�З�ТЕЛ…]"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle Ф�ЙЛ [ИМЕ_��_УК�З�ТЕЛ…]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr "без извеждане на напредъка"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+msgid "show progress meter"
+msgstr "извеждане на напредъка"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+msgid "show progress meter during object writing phase"
+msgstr "извеждане на напредъка във фазата на запазване на обектите"
+
+#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+"�ъщото дей�твие като опци�та „--all-progress“ при извеждането на напредъка"
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr "вер�и� на пратката"
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr "За �ъздаването на пратка е необходимо хранилище."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr "без подробна информаци� за пратките"
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr "Пратката „%s“ е наред\n"
+
+#: builtin/bundle.c:179
 msgid "Need a repository to unbundle."
 msgstr "За приемането на пратка е необходимо хранилище."
 
-#: builtin/cat-file.c:595
+#: builtin/bundle.c:191 builtin/remote.c:1700
+msgid "be verbose; must be placed before a subcommand"
+msgstr "повече подробно�ти.  По�тав� �е пред подкоманда"
+
+#: builtin/bundle.c:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "�епозната подкоманда: %s"
+
+#: 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>"
@@ -10321,87 +12311,87 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
 
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:597
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"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[=ФОРМ�Т] | --batch-check[=ФОРМ�Т]) [--follow-symlinks] "
+"[--textconv | --filters]"
 
-#: builtin/cat-file.c:617
+#: builtin/cat-file.c:618
 msgid "only one batch option may be specified"
 msgstr "може да укажете �амо една пакетна опци�"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 "ВИДът може да е: „blob“ (BLOB), „tree“ (дърво), „commit“ (подаване), "
 "„tag“ (етикет)"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object type"
 msgstr "извеждане на вида на обект"
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
 msgid "show object size"
 msgstr "извеждане на размера на обект"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "exit with zero when there's no error"
 msgstr "изход � 0, когато н�ма грешка"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
 msgid "pretty-print object's content"
 msgstr "форматирано извеждане на �ъдържанието на обекта"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 "да �е �тартира програмата зададена в на�тройката „textconv“ за преобразуване "
 "на �ъдържанието на обекта-BLOB"
 
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 "да �е �тартират програмите за преобразуване на �ъдържанието на обектите-BLOB"
 
-#: builtin/cat-file.c:645 git-submodule.sh:936
+#: builtin/cat-file.c:646
 msgid "blob"
 msgstr "обект-BLOB"
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
 msgid "use a specific path for --textconv/--filters"
 msgstr "опциите „--textconv“/„--filters“ изи�кват път"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "позвол�ване на опциите „-s“ и „-t“ да работ�т � повредени обекти"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
 msgid "buffer --batch output"
 msgstr "буфериране на изхода от „--batch“"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:652
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "извеждане на информаци� и �ъдържание на обектите подадени на �тандартни� вход"
 
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:656
 msgid "show info about objects fed from the standard input"
 msgstr "извеждане на информаци� за обектите подадени на �тандартни� вход"
 
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "�ледване на �имволните връзки �очещи в дървото (ползва �е � „--batch“ или „--"
 "batch-check“)"
 
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
 msgid "show all objects with --batch or --batch-check"
 msgstr "извеждане на в�ички обекти � „--batch“ или „--batch-check“"
 
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:664
 msgid "do not order --batch-all-objects output"
 msgstr "без подреждане на изхода от „--batch-all-objects“"
 
@@ -10429,8 +12419,8 @@ msgstr "изчитане на имената на файловете от �та
 msgid "terminate input and output records by a NUL character"
 msgstr "раздел�не на входните и изходните запи�и � нулеви� знак „NUL“"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "без показване на напредъка"
 
@@ -10442,27 +12432,27 @@ msgstr "извеждане на не�ъвпадащите пътища"
 msgid "ignore index when checking"
 msgstr "пре�качане на индек�а при проверката"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "опци�та „--stdin“ е не�ъвме�тима � имена на пътища"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "опци�та „-z“ изи�ква „--stdin“"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "не е зададен път"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "опци�та „--quiet“ изи�ква да е подаден точно един път"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "опциите „--quiet“ и „--verbose“ �а не�ъвме�тими"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "опци�та „--non-matching“ изи�ква „--verbose“"
 
@@ -10483,166 +12473,171 @@ msgstr "контактът не може да бъде анализиран: %s"
 msgid "no contacts specified"
 msgstr "не �а указани контакти"
 
-#: builtin/checkout-index.c:131
+#: builtin/checkout--worker.c:110
+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:1824
+#: builtin/submodule--helper.c:1827 builtin/submodule--helper.c:1835
+#: builtin/submodule--helper.c:2333 builtin/worktree.c:491
+#: builtin/worktree.c:728
+msgid "string"
+msgstr "�ИЗ"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "при �ъздаването на нови файлове да �е добав� префик�а �ИЗ"
+
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [ОПЦИЯ…] [--] [Ф�ЙЛ…]"
 
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr "етапът тр�бва да е „1“, „2“, „3“ или „all“ (в�ички)"
 
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "изтегл�не на в�ички файлове в индек�а"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "презапи�ване на файловете, дори и да �ъще�твуват"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr "без предупреждени� при лип�ващи файлове и файлове не в индек�а"
 
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "без изтегл�не на нови файлове"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "обнов�ване на информаци�та получена чрез „stat“ за файловете в индек�а"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "изчитане на пътищата от �тандартни� вход"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "запи�ване на �ъдържанието във временни файлове"
 
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:679
-msgid "string"
-msgstr "�ИЗ"
-
-#: builtin/checkout-index.c:179
-msgid "when creating files, prepend <string>"
-msgstr "при �ъздаването на нови файлове да �е добав� префик�а �ИЗ"
-
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "копиране на файловете от това �ъ�то�ние на �ливане"
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [ОПЦИЯ…] КЛО�"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [ОПЦИЯ…] [КЛО�] -- Ф�ЙЛ…"
 
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [ОПЦИЯ…] КЛО�"
 
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [ОПЦИЯ…] [--source=КЛО�] Ф�ЙЛ…"
 
-#: builtin/checkout.c:173 builtin/checkout.c:212
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "вашата вер�и� лип�ва в път� „%s“"
 
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "чуждата вер�и� лип�ва в път� „%s“"
 
-#: builtin/checkout.c:191
+#: builtin/checkout.c:208
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "н�ко� от необходимите вер�ии лип�ва в път� „%s“"
 
-#: builtin/checkout.c:241
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "н�ко� от необходимите вер�ии лип�ва в път� „%s“"
 
-#: builtin/checkout.c:259
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "път�т „%s“ не може да бъде �л�н"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Резултатът за „%s“ не може да бъде �л�н"
 
-#: builtin/checkout.c:375
+#: builtin/checkout.c:414
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Пре�ъздаден е %d конфликт при �ливане"
 msgstr[1] "Пре�ъздадени �а %d конфликта при �ливане"
 
-#: builtin/checkout.c:380
+#: builtin/checkout.c:419
 #, 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:387
+#: builtin/checkout.c:426
 #, 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:410 builtin/checkout.c:413 builtin/checkout.c:416
-#: builtin/checkout.c:420
+#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
+#: builtin/checkout.c:459
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "опци�та „%s“ е не�ъвме�тима � обнов�ването на пътища"
 
-#: builtin/checkout.c:423 builtin/checkout.c:426
+#: builtin/checkout.c:462 builtin/checkout.c:465
 #, c-format
 msgid "'%s' cannot be used with %s"
-msgstr "опци�та „%s“ е не�ъвме�тима � „%s“"
+msgstr "опциите „%s“ и „%s“ �а не�ъвме�тими"
 
-#: builtin/checkout.c:430
+#: builtin/checkout.c:469
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "�евъзможно е едновременно да обнов�вате пътища и да преминете към клона „%s“."
 
-#: builtin/checkout.c:434
+#: builtin/checkout.c:473
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "не е указано нито „%s“, нито „%s“"
 
-#: builtin/checkout.c:438
+#: builtin/checkout.c:477
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "опци�та „%s“ е задължителна, когато „%s“ не е зададена"
 
-#: builtin/checkout.c:443 builtin/checkout.c:448
+#: builtin/checkout.c:482 builtin/checkout.c:487
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "опци�та „%3$s“ е не�ъвме�тима както � „%1$s“, така и � „%2$s“"
 
-#: builtin/checkout.c:507 builtin/checkout.c:514
+#: builtin/checkout.c:563 builtin/checkout.c:570
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "път�т „%s“ не е �л�т"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:739
 msgid "you need to resolve your current index first"
 msgstr "първо тр�бва да коригирате индек�а �и"
 
-#: builtin/checkout.c:730
+#: builtin/checkout.c:793
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10652,50 +12647,50 @@ msgstr ""
 "индек�а:\n"
 "%s"
 
-#: builtin/checkout.c:833
+#: builtin/checkout.c:886
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Журналът на указателите за „%s“ не може да �е про�леди: %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:928
 msgid "HEAD is now at"
 msgstr "Указател�т „HEAD“ в момента �очи към"
 
-#: builtin/checkout.c:879 builtin/clone.c:713
+#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "Указател�т „HEAD“ не може да бъде обновен"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:936
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Занул�ване на клона „%s“\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:939
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Вече �те на „%s“\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:943
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Преминаване към клона „%s“ и занул�ване на промените\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:945 builtin/checkout.c:1376
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Преминахте към нови� клон „%s“\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:947
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Преминахте към клона „%s“\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:998
 #, c-format
 msgid " ... and %d more.\n"
 msgstr "… и още %d.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:1004
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10717,7 +12712,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:1023
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10744,28 +12739,19 @@ msgstr[1] ""
 "    git branch ИМЕ_��_�ОВИЯ_КЛО� %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1058
 msgid "internal error in revision walk"
 msgstr "вътрешна грешка при обхождането на вер�иите"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1062
 msgid "Previous HEAD position was"
 msgstr "Преди това „HEAD“ �очеше към"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1102 builtin/checkout.c:1371
 msgid "You are on a branch yet to be born"
 msgstr "В момента �те на клон, който в�е още не е �ъздаден"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "очаква �е �амо един указател"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "очаква �е един указател, а �те подали %d."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1184
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10774,37 +12760,73 @@ msgstr ""
 "„%s“ може да е както локален файл, така и �лед�щ клон.  За уточн�ване\n"
 "ползвайте разделител� „--“ (и евентуално опци�та „--no-guess“)"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455
+#: builtin/checkout.c:1191
+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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"�ко и�кате да изтеглите клона от конкретно хранилище, напр. „origin“,\n"
+"изрично го укажете към опци�та „--track“:\n"
+"\n"
+"    git checkout --track origin/ИМЕ_��_КЛО�\n"
+"\n"
+"�ко и�кате винаги да �е предпочита конкретно хранилище при нееднозначно\n"
+"ИМЕ_��_КЛО�, напр. „origin“, задайте �ледната на�тройка в конфигурационни�\n"
+"файл:\n"
+"\n"
+"    checkout.defaultRemote=origin"
+
+#: builtin/checkout.c:1201
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "„%s“ напа�ва � множе�тво (%d) отдалечени клони"
+
+#: builtin/checkout.c:1267
+msgid "only one reference expected"
+msgstr "очаква �е �амо един указател"
+
+#: builtin/checkout.c:1284
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "очаква �е един указател, а �те подали %d."
+
+#: builtin/checkout.c:1330 builtin/worktree.c:268 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправилен указател: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1343 builtin/checkout.c:1709
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "указател�т не �очи към обект-дърво: %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1390
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "очаква �е клон, а не етикет — „%s“"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1392
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "очаква �е локален, а не отдалечен клон — „%s“"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1393 builtin/checkout.c:1401
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "очаква �е клон, а не „%s“"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1396
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "очаква �е клон, а не подаване — „%s“"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1412
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10812,7 +12834,7 @@ msgstr ""
 "по време на �ливане не може да преминете към друг клон.\n"
 "Пробвайте � „git merge --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1416
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10821,7 +12843,7 @@ msgstr ""
 "клон.\n"
 "Пробвайте � „git am --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1420
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10829,7 +12851,7 @@ msgstr ""
 "по време на пребазиране не може да преминете към друг клон.\n"
 "Пробвайте � „git rebase --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1424
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10837,7 +12859,7 @@ msgstr ""
 "по време на отбиране на подавани� не може да преминете към друг клон.\n"
 "Пробвайте � „git cherry-pick --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10845,139 +12867,139 @@ msgstr ""
 "по време на отм�на на подавани� не може да преминете към друг клон.\n"
 "Пробвайте � „git revert --quit“ или „git worktree add“."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1432
 msgid "you are switching branch while bisecting"
 msgstr "преминаване към друг клон по време на двоично тър�ене"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1439
 msgid "paths cannot be used with switching branches"
 msgstr "задаването на път е не�ъвме�тимо � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "опци�та „%s“ е не�ъвме�тима � преминаването от един клон към друг"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
+#: builtin/checkout.c:1465 builtin/checkout.c:1470
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "опци�та „%s“ е не�ъвме�тима � „%s“"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1467
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "опци�та „%s“ е не�ъвме�тима �ъ� задаването на ��Ч�ЛО"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1475
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 "За да преминете към клон, подайте указател, който �очи към подаване.  „%s“ "
 "не е такъв"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1482
 msgid "missing branch or commit argument"
 msgstr "лип�ва аргумент — клон или подаване"
 
-#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
-#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
-#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "извеждане на напредъка"
-
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1525
 msgid "perform a 3-way merge with the new branch"
 msgstr "извършване на тройно �ливане � нови� клон"
 
-#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318
+#: builtin/checkout.c:1526 builtin/log.c:1810 parse-options.h:323
 msgid "style"
 msgstr "СТИЛ"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1527
 msgid "conflict style (merge or diff3)"
 msgstr "дей�твие при конфликт (�ливане или тройна разлика)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:503
+#: builtin/checkout.c:1539 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "отдел�не на указател� „HEAD“ към указаното подаване"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1540
 msgid "set upstream info for new branch"
 msgstr "задаване на кой клон бива �леден при �ъздаването на нови� клон"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1542
 msgid "force checkout (throw away local modifications)"
 msgstr "принудително изтегл�не (вашите промени ще бъдат занулени)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1544
 msgid "new-branch"
 msgstr "�ОВ_КЛО�"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1544
 msgid "new unparented branch"
 msgstr "нов клон без родител"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1546 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr "обнов�ване на игнорираните файлове (�тандартно)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1549
 msgid "do not check if another worktree is holding the given ref"
 msgstr "без проверка дали друго работно дърво държи указател�"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1562
 msgid "checkout our version for unmerged files"
 msgstr "изтегл�не на вашата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1565
 msgid "checkout their version for unmerged files"
 msgstr "изтегл�не на чуждата вер�и� на не�летите файлове"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1569
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "без ограничаване на изброените пътища �амо до ча�тично изтеглените"
 
-#: builtin/checkout.c:1533
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "Опциите „-b“, „-B“ и „--orphan“ �а не�ъвме�тими една � друга"
+#: builtin/checkout.c:1624
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "опциите „-%c“, „-%c“ и „--orphan“ �а не�ъвме�тими една � друга"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1628
 msgid "-p and --overlay are mutually exclusive"
 msgstr "опциите „-p“ и „--overlay“ �а не�ъвме�тими"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1665
 msgid "--track needs a branch name"
 msgstr "опци�та „--track“ изи�ква име на клон"
 
-#: builtin/checkout.c:1578
-msgid "missing branch name; try -b"
-msgstr "лип�ва име на клон, използвайте опци�та „-b“"
+#: builtin/checkout.c:1670
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "лип�ва име на клон, използвайте опци�та „-%c“"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1702
 #, c-format
 msgid "could not resolve %s"
 msgstr "„%s“ не може да бъде открит"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "тр�бва да укажете поне един път за въз�танов�ване"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1718
 msgid "invalid path specification"
 msgstr "указан е неправилен път"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1725
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "„%s“ не е подаване, затова от него не може да �е �ъздаде клон „%s“"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1729
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: опци�та „--detach“ не приема аргумент-път „%s“"
 
-#: builtin/checkout.c:1646
+#: 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:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "опциите „--pathspec-from-file“ и „--patch“ �а не�ъвме�тими"
+
+#: builtin/checkout.c:1754
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10985,138 +13007,108 @@ msgstr ""
 "git checkout: опциите „--ours“/„--theirs“, „--force“ и „--merge“\n"
 "�а не�ъвме�тими � изтегл�не от индек�а."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"„%s“ �ъвпада � повече от един отдалечен клон — открити �а %d възможно�ти.\n"
-"Пробата аргументът да �е тълкува като път �ъщо бе неу�пешна.\n"
-"\n"
-"�ко и�кате да изтеглите клона от конкретно хранилище, напр. „origin“,\n"
-"изрично го укажете към опци�та „--track“:\n"
-"\n"
-"    git checkout --track origin/ИМЕ_��_КЛО�\n"
-"\n"
-"�ко и�кате винаги да �е предпочита конкретно хранилище при нееднозначно\n"
-"ИМЕ_��_КЛО�, напр. „origin“, задайте �ледната на�тройка в конфигурационни�\n"
-"файл:\n"
-"\n"
-"    checkout.defaultRemote=origin"
+#: builtin/checkout.c:1759
+msgid "you must specify path(s) to restore"
+msgstr "тр�бва да укажете поне един път за въз�танов�ване"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
-#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: 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:2719 builtin/worktree.c:484
+#: builtin/worktree.c:486
 msgid "branch"
 msgstr "клон"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1786
 msgid "create and checkout a new branch"
 msgstr "�ъздаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1788
 msgid "create/reset and checkout a branch"
 msgstr "�ъздаване/занул�ване на клон и преминаване към него"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1789
 msgid "create reflog for new branch"
 msgstr "�ъздаване на журнал на указателите за нов клон"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1791
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 "опит за отгатване на име на клон �лед неу�пешен опит � „git checkout "
 "�ЕСЪЩЕСТВУВ�Щ_КЛО�“ (�тандартно)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1792
 msgid "use overlay mode (default)"
 msgstr "използване на припокриващ режим (�тандартно)"
 
-#: builtin/checkout.c:1743
+#: builtin/checkout.c:1837
 msgid "create and switch to a new branch"
 msgstr "�ъздаване и преминаване към нов клон"
 
-#: builtin/checkout.c:1745
+#: builtin/checkout.c:1839
 msgid "create/reset and switch to a branch"
 msgstr "�ъздаване/занул�ване на клон и преминаване към него"
 
-#: builtin/checkout.c:1747
+#: builtin/checkout.c:1841
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr ""
 "опит за отгатване на име на клон �лед неу�пешен опит � „git switch "
 "�ЕСЪЩЕСТВУВ�Щ_КЛО�“"
 
-#: builtin/checkout.c:1749
+#: builtin/checkout.c:1843
 msgid "throw away local modifications"
 msgstr "занул�ване на локалните промени"
 
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1877
 msgid "which tree-ish to checkout from"
 msgstr "към кой указател към дърво да �е премине"
 
-#: builtin/checkout.c:1783
+#: builtin/checkout.c:1879
 msgid "restore the index"
 msgstr "въз�танов�ване на индек�а"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1881
 msgid "restore the working tree (default)"
 msgstr "въз�танов�ване на работното дърво (�тандартно)"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1883
 msgid "ignore unmerged entries"
 msgstr "пренебрегване на не�летите елементи"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1884
 msgid "use overlay mode"
 msgstr "използване на припокриващ режим"
 
-#: builtin/clean.c:28
+#: 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 Ш�БЛО�] [-x | -X] [--] ПЪТ…"
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Изтриване на „%s“\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Файлът „%s“ ще бъде изтрит\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Пре�качане на хранилището „%s“\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Хранилището „%s“ ще бъде пре�кочено\n"
 
-#: builtin/clean.c:36
-#, c-format
-msgid "failed to remove %s"
-msgstr "файлът „%s“ не може да бъде изтрит"
-
-#: builtin/clean.c:37
+#: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "не може да �е получи информаци� чрез „lstat“ за „%s“\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -11129,7 +13121,7 @@ msgstr ""
 "ПРЕФИКС    — избор на един�твен обект по този уникален префик�\n"
 "           — (празно) нищо да не �е избира\n"
 
-#: builtin/clean.c:305 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -11150,39 +13142,33 @@ msgstr ""
 "*          — избиране на в�ички обекти\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 "�еправилен избор (%s).\n"
 
-#: builtin/clean.c:663
+#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Шаблони за игнорирани елементи≫ "
 
-#: builtin/clean.c:700
+#: builtin/clean.c:693
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: �икой обект не напа�ва на „%s“"
 
-#: builtin/clean.c:721
+#: builtin/clean.c:714
 msgid "Select items to delete"
 msgstr "Избиране на обекти за изтриване"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Да �е изтрие ли „%s“? „y“ —  да, „N“ — �Е"
 
-#
-#: builtin/clean.c:787 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Изход.\n"
-
-#: builtin/clean.c:795
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -11200,64 +13186,52 @@ msgstr ""
 "help                — този край\n"
 "?                   — под�казка за шаблоните"
 
-#: builtin/clean.c:822 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "��� Команди ���"
-
-#: builtin/clean.c:823 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Избор на �ледващо дей�твие"
-
-#: builtin/clean.c:831
+#: builtin/clean.c:822
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Следни�т обект ще бъде изтрит:"
 msgstr[1] "Следните обекти ще бъдат изтрити:"
 
-#: builtin/clean.c:847
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "Файловете за изчи�тване �вършиха.  Изход от програмата."
 
-#: builtin/clean.c:909
+#: builtin/clean.c:900
 msgid "do not print names of files removed"
 msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:902
 msgid "force"
 msgstr "принудително изтриване"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "интерактивно изтриване"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "изтриване на цели директории"
 
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: 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 "Ш�БЛО�"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr "добав�не на Ш�БЛО� от файлове, които да не �е три�т"
 
-#: builtin/clean.c:917
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "изтриване и на игнорираните файлове"
 
-#: builtin/clean.c:919
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "изтриване �амо на игнорирани файлове"
 
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "опциите „-x“ и „-X“ �а не�ъвме�тими"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -11265,7 +13239,7 @@ msgstr ""
 "�а�тройката „clean.requireForce“ е зададена като и�тина, което изи�ква н�ко� "
 "от опциите „-i“, „-n“ или „-f“.  ��ма да �е извърши изчи�тване"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -11274,164 +13248,181 @@ msgstr ""
 "което изи�ква н�ко� от опциите „-i“, „-n“ или „-f“.  ��ма да �е извърши "
 "изчи�тване"
 
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+msgstr "опциите „-x“ и „-X“ �а не�ъвме�тими"
+
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [ОПЦИЯ…] [--] ХР��ИЛИЩЕ [ДИРЕКТОРИЯ]"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "без клониране на плитко хранилище"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "без �ъздаване на работно дърво"
 
-#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "�ъздаване на голо хранилище"
 
-#: builtin/clone.c:97
+#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 "�ъздаване на хранилище-огледало (включва опци�та „--bare“ за голо хранилище)"
 
-#: builtin/clone.c:99
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "клониране от локално хранилище"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "без твърди връзки, файловете винаги да �е копират"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "на�тройване за �поделено хранилище"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "път"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "инициализиране на подмодулите при това клониране"
 
-#: builtin/clone.c:109
+#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr "брой подмодули, клонирани паралелно"
 
-#: builtin/clone.c:110 builtin/init-db.c:486
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "директори� � шаблони"
 
-#: builtin/clone.c:111 builtin/init-db.c:487
+#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "директори�, ко�то �ъдържа шаблоните, които да �е ползват"
 
-#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
 msgid "reference repository"
 msgstr "еталонно хранилище"
 
-#: builtin/clone.c:117 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:123 builtin/submodule--helper.c:1833
+#: builtin/submodule--helper.c:2338
 msgid "use --reference only while cloning"
 msgstr "опци�та „--reference“ може да �е използва �амо при клониране"
 
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:320
+#: 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 "ИМЕ"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "използване на това ИМЕ вме�то „origin“ при про�лед�ване на клони"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "изтегл�не на този КЛО�, а не �очени�т от отдалечени� указател „HEAD“"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
 
-#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "ДЪЛБОЧИ��"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr "плитко клониране до тази ДЪЛБОЧИ��"
 
-#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/pull.c:211
 msgid "time"
 msgstr "ВРЕМЕ"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr "плитко клониране до момент във времето"
 
-#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
-#: builtin/rebase.c:1417
+#: 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 "ВЕРСИЯ"
 
-#: builtin/clone.c:129 builtin/fetch.c:172
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "задълбочаване на и�тори�та на плитко хранилище до изключващ указател"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:137 builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c:2352
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 "клониране �амо на един клон — или �очени� от отдалечени� „HEAD“, или изрично "
 "зададени� � „--branch“"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "без клониране на етикети, като по�ледващите до�тав�ни� н�ма да ги �лед�т"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "в�ички клонирани подмодули ще �а плитки"
 
-#: builtin/clone.c:136 builtin/init-db.c:495
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "СЛУЖЕБ��_ДИРЕКТОРИЯ"
 
-#: builtin/clone.c:137 builtin/init-db.c:496
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "отделна СЛУЖЕБ��_ДИРЕКТОРИЯ за git извън работното дърво"
 
-#: builtin/clone.c:138
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "КЛЮЧ=СТОЙ�ОСТ"
 
-#: builtin/clone.c:139
+#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr "задаване на на�тройките на новото хранилище"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:172
+#: 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 "�пецифични за �ървъра"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:173
+#: 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 "опци� за прено�"
 
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
-#: builtin/push.c:573
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "�амо адре�и IPv4"
 
-#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
-#: builtin/push.c:575
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "�амо адре�и IPv6"
 
-#: builtin/clone.c:148
+#: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "в�ички клонирани подмодули ще ползват �лед�щите �и клони"
 
-#: builtin/clone.c:284
+#: builtin/clone.c:156
+msgid "initialize sparse-checkout file to include only files at root"
+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"
@@ -11439,193 +13430,211 @@ msgstr ""
 "Името на директори�та не може да бъде отгатнато.\n"
 "Задайте директори�та изрично на командни� ред"
 
-#: builtin/clone.c:337
+#: builtin/clone.c:345
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: не може да �е добави алтернативен източник на „%s“: %s\n"
 
-#: builtin/clone.c:410
+#: builtin/clone.c:418
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "„%s“ �ъще�твува и не е директори�"
 
-#: builtin/clone.c:427
+#: builtin/clone.c:436
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "неу�пешно итериране по „%s“"
 
-#: builtin/clone.c:457
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "връзката „%s“ не може да бъде �ъздадена"
 
-#: builtin/clone.c:461
+#: builtin/clone.c:471
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "файлът не може да бъде копиран като „%s“"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:476
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "неу�пешно итериране по „%s“"
 
-#: builtin/clone.c:491
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr "дей�твието завърши.\n"
 
-#: builtin/clone.c:505
+#: 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 ""
 "Клонирането бе у�пешно за разлика от подготовката на работното дърво\n"
-"за определен клон.  В�е пак можете да проверите кои файлове и от кой\n"
-"клон в момента �а изтеглени � командата „git status“.  Можете да\n"
+"за определен клон.  В�е пак може да проверите кои файлове и от кой\n"
+"клон в момента �а изтеглени � командата „git status“.  Може да\n"
 "завършите изтегл�нето на клона � командата:\n"
 "\n"
 "    git restore --source=HEAD :/\n"
 
-#: builtin/clone.c:582
+#: builtin/clone.c:594
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 "Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
 "и който �ледва да бъде изтеглен, не �ъще�твува."
 
-#: builtin/clone.c:701
+#: builtin/clone.c:713
 #, c-format
 msgid "unable to update %s"
 msgstr "обектът „%s“ не може да бъде обновен"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "ча�тичното изтегл�не не може да �е инициализира"
+
+#: builtin/clone.c:784
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "указател�т „HEAD“ от отдалеченото хранилище �очи към нещо,\n"
 "което не �ъще�твува.  �е може да �е изтегли определен клон.\n"
 
-#: builtin/clone.c:782
+#: builtin/clone.c:816
 msgid "unable to checkout working tree"
 msgstr "работното дърво не може да бъде подготвено"
 
-#: builtin/clone.c:832
+#: builtin/clone.c:894
 msgid "unable to write parameters to config file"
-msgstr "на�тройките не могат да бъдат запи�ани в конфигурационни� файл"
+msgstr "на�тройките не може да бъдат запи�ани в конфигурационни� файл"
 
-#: builtin/clone.c:895
+#: builtin/clone.c:957
 msgid "cannot repack to clean up"
 msgstr "не може да �е извърши пакетиране за изчи�тване на файловете"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:959
 msgid "cannot unlink temporary alternates file"
 msgstr "временни�т файл за алтернативни обекти не може да бъде изтрит"
 
-#: builtin/clone.c:937 builtin/receive-pack.c:1948
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
 msgid "Too many arguments."
 msgstr "Прекалено много аргументи."
 
-#: builtin/clone.c:941
+#: builtin/clone.c:1005
 msgid "You must specify a repository to clone."
 msgstr "Тр�бва да укажете кое хранилище и�кате да клонирате."
 
-#: builtin/clone.c:954
+#: builtin/clone.c:1018
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "опциите „--bare“ и „--origin %s“ �а не�ъвме�тими."
 
-#: builtin/clone.c:957
+#: builtin/clone.c:1021
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "опциите „--bare“ и „--separate-git-dir“ �а не�ъвме�тими."
 
-#: builtin/clone.c:970
+#: builtin/clone.c:1035
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "не �ъще�твува хранилище „%s“"
 
-#: builtin/clone.c:976 builtin/fetch.c:1790
+#: builtin/clone.c:1039 builtin/fetch.c:2014
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "дълбочината тр�бва да е положително ц�ло чи�ло, а не „%s“"
 
-#: builtin/clone.c:986
+#: builtin/clone.c:1049
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целеви�т път „%s“ �ъще�твува и не е празна директори�."
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1055
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "път�т в хранилището „%s“ �ъще�твува и не е празна директори�."
+
+#: builtin/clone.c:1069
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "в „%s“ вече �ъще�твува работно дърво."
 
-#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
-#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
+#: 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 "родител�ките директории на „%s“ не могат да бъдат �ъздадени"
+msgstr "родител�ките директории на „%s“ не може да бъдат �ъздадени"
 
-#: builtin/clone.c:1016
+#: builtin/clone.c:1089
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "работното дърво в „%s“ не може да бъде �ъздадено."
 
-#: builtin/clone.c:1036
+#: builtin/clone.c:1109
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Клониране и �ъздаване на голо хранилище в „%s“…\n"
 
-#: builtin/clone.c:1038
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Клониране и �ъздаване на хранилище в „%s“…\n"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1135
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
-"Опци�та „--recursive“ е не�ъвме�тима � опциите „--reference“ и „--reference-"
+"опци�та „--recursive“ е не�ъвме�тима � опциите „--reference“ и „--reference-"
 "if-able“"
 
-#: builtin/clone.c:1123
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "„%s“ е неправилно име за отдалечено хранилище"
+
+#: builtin/clone.c:1229
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--depth“ �е пре�кача.  Ползвайте �хемата "
 "„file://“."
 
-#: builtin/clone.c:1125
+#: builtin/clone.c:1231
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--shallow-since“ �е пре�кача.  Ползвайте "
 "�хемата „file://“."
 
-#: builtin/clone.c:1127
+#: builtin/clone.c:1233
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--shallow-exclude“ �е пре�кача.  Ползвайте "
 "�хемата „file://“."
 
-#: builtin/clone.c:1129
+#: builtin/clone.c:1235
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 "При локално клониране опци�та „--filter“ �е пре�кача.  Ползвайте �хемата "
 "„file://“."
 
-#: builtin/clone.c:1132
+#: builtin/clone.c:1240
 msgid "source repository is shallow, ignoring --local"
 msgstr "клонираното хранилище е плитко, затова опци�та „--local“ �е пре�кача"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr "опци�та „--local“ �е пре�кача"
 
-#: builtin/clone.c:1212 builtin/clone.c:1220
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "отдалечени�т тран�порт върна грешка"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Отдалечени�т клон „%s“ лип�ва в клонираното хранилище „%s“"
 
-#: builtin/clone.c:1223
+#: builtin/clone.c:1347
 msgid "You appear to have cloned an empty repository."
 msgstr "Изглежда клонирахте празно хранилище."
 
@@ -11642,25 +13651,135 @@ msgid "layout to use"
 msgstr "как да �е подреди резултата"
 
 #: builtin/column.c:30
-msgid "Maximum width"
-msgstr "Мак�имална широчина"
+msgid "maximum width"
+msgstr "мак�имална широчина"
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "Поле в знаци отл�во"
+msgid "padding space on left border"
+msgstr "поле в знаци отл�во"
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "Поле в знаци отд��но"
+msgid "padding space on right border"
+msgstr "поле в знаци отд��но"
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "Поле в знаци между колоните"
+msgid "padding space between columns"
+msgstr "поле в знаци между колоните"
 
 #: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "опци�та „--command“ тр�бва да е първи�т аргумент"
 
+#: 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 ДИР_ОБЕКТИ] [--shallow] [--"
+"[no-]progress]"
+
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+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 ДИР_ОБЕКТИ] [--append] [--"
+"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:1779
+msgid "dir"
+msgstr "директори�"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr "ДИРектори�та_�_ОБЕКТИ за запазване на гра̀фа"
+
+#: builtin/commit-graph.c:83
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+"ако гра̀фа � подавани�та е раздробен, да �е провер�ва �амо файлът на върха"
+
+#: builtin/commit-graph.c:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Графът � подавани�та не може да �е отвори: „%s“"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "непознат аргумент към „--split“: %s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "неочакван, неше�тнай�етичен идентификатор на обект:  %s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "неправилен обект: „%s“"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "обхождането да започне от в�ички указатели"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+"проверка на подавани�та за индек�ите на пакетите изброени на командни� ред"
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr "започване на обхождането при подавани�та подадени на �тандартни� вход"
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+"включване на в�ички подавани�, които вече �а във файла � гра̀фа на подавани�та"
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr "включване на изчи�лени�та за променените пътища"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "позвол�ване на запи� на нара�тващ файл � гра̀фа на подавани�та"
+
+#: builtin/commit-graph.c:228
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "мак�имален брой подавани� в небазово ниво на раздробен граф"
+
+#: builtin/commit-graph.c:230
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+"мак�имално отношение на бро� подавани� в две по�ледователни нива в раздробен "
+"граф"
+
+#: builtin/commit-graph.c:232
+msgid "only expire files older than a given date-time"
+msgstr "об�в�ване за о�тарели �амо на файловете по-�тари от това ВРЕМЕ"
+
+#: builtin/commit-graph.c:234
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr "мак�имален брой промени в пътищата �ледени от филтрите на Блум"
+
+#: builtin/commit-graph.c:255
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+"опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ �а не�ъвме�тими"
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr "Получаване на подавани�та от входа"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -11674,7 +13793,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "пре�качане на повтар�щ �е родител: „%s“"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: 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“"
@@ -11702,13 +13821,13 @@ msgstr "родител"
 msgid "id of a parent commit object"
 msgstr "ИДЕ�ТИФИК�ТОР на обекта за подаването-родител"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: 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 "СЪОБЩЕ�ИЕ"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
 msgid "commit message"
 msgstr "СЪОБЩЕ�ИЕ при подаване"
 
@@ -11716,8 +13835,8 @@ msgstr "СЪОБЩЕ�ИЕ при подаване"
 msgid "read commit log message from file"
 msgstr "изчитане на �ъобщението за подаване от Ф�ЙЛ"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: 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 "подпи�ване на подаването � GPG"
 
@@ -11744,7 +13863,7 @@ msgid ""
 "remove the commit entirely with \"git reset HEAD^\".\n"
 msgstr ""
 "Пои�кахте да поправите по�ледното �и подаване.  Това дей�твие ще превърне\n"
-"подаването в празно.  Можете или да го повторите като разрешите такива "
+"подаването в празно.  Може или да го повторите като разрешите такива "
 "подавани�\n"
 "� опци�та „--allow-empty“, или да го изтриете от и�тори�та � командата:\n"
 "„git reset HEAD^“.\n"
@@ -11765,13 +13884,20 @@ msgstr ""
 "\n"
 
 #: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr ""
+"В противен �лучай използвайте командата:\n"
+"\n"
+"    git rebase --skip\n"
+
+#: builtin/commit.c:66
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr ""
 "В противен �лучай използвайте командата:\n"
 "\n"
 "    git cherry-pick --skip\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:69
 msgid ""
 "and then use:\n"
 "\n"
@@ -11793,61 +13919,73 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:315
+#: builtin/commit.c:324
 msgid "failed to unpack HEAD tree object"
 msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:360
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "опциите „-a“ и „--pathspec-from-file“ �а не�ъвме�тими"
+
+#: builtin/commit.c:374
+msgid "No paths with --include/--only does not make sense."
+msgstr "опциите „--include“ и „--only“ изи�кват аргументи."
+
+#: builtin/commit.c:386
 msgid "unable to create temporary index"
 msgstr "временни�т индек� не може да бъде �ъздаден"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr "неу�пешно интерактивно добав�не"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:410
 msgid "unable to update temporary index"
 msgstr "временни�т индек� не може да бъде обновен"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:412
 msgid "Failed to update main cache tree"
 msgstr "Дървото на о�новни� кеш не може да бъде обновено"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
 msgid "unable to write new_index file"
 msgstr "нови�т индек� не може да бъде запи�ан"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:489
 msgid "cannot do a partial commit during a merge."
 msgstr "по време на �ливане не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:491
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "по време на отбиране не може да �е извърши ча�тично подаване."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:493
+msgid "cannot do a partial commit during a rebase."
+msgstr "по време на пребазиране не може да �е извърши ча�тично подаване."
+
+#: builtin/commit.c:501
 msgid "cannot read the index"
 msgstr "индек�ът не може да бъде прочетен"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:520
 msgid "unable to write temporary index file"
 msgstr "временни�т индек� не може да бъде запи�ан"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:618
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "заглавната ча�т за автор в подаването „%s“ лип�ва"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "заглавната ча�т за автор в подаването „%s“ е неправилна"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr "неправилен параметър към опци�та „--author“"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:692
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11855,78 +13993,70 @@ msgstr ""
 "не може да �е избере знак за коментар — в текущото �ъобщение за подаване �а "
 "използвани в�ички подобни знаци"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�ледното подаване не може да бъде открито: %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:758 builtin/shortlog.c:413
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(изчитане на �ъобщението за подаване от �тандартни� вход)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:760
 msgid "could not read log from standard input"
 msgstr "�ъобщението за подаване не бе прочетено �тандартни� вход"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:764
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "файлът �ъ� �ъобщението за подаване „%s“ не може да бъде прочетен"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "опциите „-m“ и „--fixup“ �а не�ъвме�тими:%s"
+
+#: builtin/commit.c:813 builtin/commit.c:829
 msgid "could not read SQUASH_MSG"
 msgstr "�ъобщението за вкарване SQUASH_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:820
 msgid "could not read MERGE_MSG"
 msgstr "�ъобщението за �ливане MERGE_MSG не може да бъде прочетено"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:880
 msgid "could not write commit template"
 msgstr "шаблонът за подаване не може да бъде запазен"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:893
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
 msgstr ""
-"\n"
-"Изглежда, че подавате �ливане.  �ко това не е така, изтрийте файла:\n"
-"\n"
-"    %s\n"
-"и опитайте отново.\n"
+"Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
+"� „%c“, ще бъдат пропу�нати.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:895
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"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"
-"Изглежда, че извършвате отбрано подаване.  �ко това не е така, изтрийте "
-"файла:\n"
-"\n"
-"    %s\n"
-"и опитайте отново.\n"
+"Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
+"� „%c“, ще бъдат пропу�нати, а празно �ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:899
 #, 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 ""
 "Въведете �ъобщението за подаване на промените.  Редовете, които започват\n"
-"� „%c“, ще бъдат пропу�нати, а празно �ъобщение преу�танов�ва подаването.\n"
+"� „%c“, �ъщо ще бъдат включени — може да ги изтриете вие.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11937,151 +14067,216 @@ msgstr ""
 "� „%c“, �ъщо ще бъдат включени — може да ги изтриете вие.  Празно \n"
 "�ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/commit.c:872
+#: 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"
+"Изглежда, че подавате �ливане.\n"
+"�ко това не е така, изпълнете:\n"
+"\n"
+"    git update-ref -d MERGE_HEAD\n"
+"и опитайте отново.\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"
+"Изглежда, че отбирате подаване.\n"
+"�ко това не е така, изпълнете:\n"
+"\n"
+"    git update-ref -d CHERRY_PICK_HEAD\n"
+"и опитайте отново.\n"
+
+#: builtin/commit.c:947
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s�втор:   %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:955
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:    %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:962
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sПодаващ: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:980
 msgid "Cannot read index"
 msgstr "Индек�ът не може да бъде прочетен"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "епилогът не може да �е подаде на „--trailers“"
+
+#: builtin/commit.c:1065
 msgid "Error building trees"
 msgstr "Грешка при изграждане на дърветата"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1079 builtin/tag.c:319
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Подайте �ъобщението � н�ко� от опциите „-m“ или „-F“.\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1123
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
-"Опци�та „--author '%s'“ не отговар� на форма̀та „Име <е-поща>“ и не �ъвпада � "
+"опци�та „--author '%s'“ не отговар� на форма̀та „Име <е-поща>“ и не �ъвпада � "
 "никой автор"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1137
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "�еправилен режим за игнорираните файлове: „%s“"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1155 builtin/commit.c:1448
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "�еправилен режим за не�ледените файлове: „%s“"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1195
 msgid "--long and -z are incompatible"
-msgstr "Опциите „--long“ и „-z“ �а не�ъвме�тими."
+msgstr "опциите „--long“ и „-z“ �а не�ъвме�тими."
+
+#: builtin/commit.c:1226
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr ""
+"В момента �е извършва �ливане, не може да промените �ъобщение при подаване."
+
+#: builtin/commit.c:1228
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr ""
+"В момента �е извършва отбиране на подаване, не може да промените �ъобщение "
+"при подаване."
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1231
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr ""
+"опци�та за пром�на на �ъобщението на „--fixup“ и указването на път „%s“ �а "
+"не�ъвме�тими"
+
+#: builtin/commit.c:1233
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+"опци�та за пром�на на �ъобщението на „--fixup“ и „--patch“/„--interactive“/"
+"„--all“/„--include“/„--only“ �а не�ъвме�тими"
+
+#: builtin/commit.c:1252
 msgid "Using both --reset-author and --author does not make sense"
-msgstr "Опциите „--reset-author“ и „--author“ �а не�ъвме�тими."
+msgstr "опциите „--reset-author“ и „--author“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "��ма какво да бъде поправено."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
-msgstr "В момента �е извършва �ливане, не можете да поправ�те."
+msgstr "В момента �е извършва �ливане, не може да поправ�те."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
-msgstr "В момента �е извършва отбиране на подаване, не можете да поправ�те."
+msgstr "В момента �е извършва отбиране на подаване, не може да поправ�те."
+
+#: builtin/commit.c:1268
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "В момента �е извършва пребазиране, не може да поправ�те."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
-msgstr "Опциите „--squash“ и „--fixup“ �а не�ъвме�тими."
+msgstr "опциите „--squash“ и „--fixup“ �а не�ъвме�тими."
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
-msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ �а не�ъвме�тими."
+msgstr "опциите „-c“, „-C“, „-F“ и „--fixup““ �а не�ъвме�тими."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
-msgstr "Опци�та „-m“ е не�ъвме�тима � „-c“, „-C“ и „-F“."
+msgstr "опци�та „-m“ е не�ъвме�тима � „-c“, „-C“ и „-F“."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
-"Опци�та „--reset-author“ може да �е използва �амо заедно � „-C“, „-c“ или\n"
+"опци�та „--reset-author“ може да �е използва �амо заедно � „-C“, „-c“ или\n"
 "„--amend“."
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
-"Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ �а\n"
+"опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ �а\n"
 "не�ъвме�тими."
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "Опциите „--include“ и „--only“ изи�кват аргументи."
+#: builtin/commit.c:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "непозната опци�: --fixup=%s:%s"
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1352
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "опци�та „-a“ е не�ъвме�тима �ъ� задаването на пътища: „%s…“"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1483 builtin/commit.c:1652
 msgid "show status concisely"
 msgstr "кратка информаци� за �ъ�то�нието"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show branch information"
 msgstr "информаци� за клоните"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1487
 msgid "show stash information"
 msgstr "информаци� за �катаното"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1489 builtin/commit.c:1656
 msgid "compute full ahead/behind values"
 msgstr "изчи�л�ване на точните �тойно�ти напред/назад"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1491
 msgid "version"
 msgstr "вер�и�"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
-#: builtin/worktree.c:650
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "формат на изхода за четене от програма"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1494 builtin/commit.c:1660
 msgid "show status in long format (default)"
 msgstr "подробна информаци� за �ъ�то�нието (�тандартно)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "terminate entries with NUL"
 msgstr "раздел�не на елементите � нулеви� знак „NUL“"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
+#: 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 "РЕЖИМ"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "извеждане на не�ледените файлове.  Възможните РЕЖИМи �а „all“ (подробна "
 "информаци�), „normal“ (кратка информаци�), „no“ (без не�ледените файлове).  "
 "Стандартни�т РЕЖИМ е: „all“."
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1504
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -12090,11 +14285,11 @@ msgstr ""
 "„traditional“ (традиционен), „matching“ (напа�ващи), „no“ (без игнорираните "
 "файлове).  Стандартни�т РЕЖИМ е: „traditional“."
 
-#: builtin/commit.c:1362 parse-options.h:188
+#: builtin/commit.c:1506 parse-options.h:193
 msgid "when"
 msgstr "КОГ�"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1507
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -12103,176 +14298,197 @@ msgstr ""
 "една от „all“ (в�ички), „dirty“ (тези � неподадени промени), "
 "„untracked“ (не�ледени)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1509
 msgid "list untracked files in columns"
 msgstr "извеждане на не�ледените файлове в колони"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1510
 msgid "do not detect renames"
 msgstr "без за�ичане на преименувани�та"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1512
 msgid "detect renames, optionally set similarity index"
 msgstr "за�ичане на преименувани�та, може да �е зададе коефициент на прилика"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1535
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�еподдържана комбинаци� от аргументи за игнорирани и не�ледени файлове"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1617
 msgid "suppress summary after successful commit"
 msgstr "без информаци� �лед у�пешно подаване"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1618
 msgid "show diff in commit message template"
 msgstr "добав�не на разликата към шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1620
 msgid "Commit message options"
 msgstr "Опции за �ъобщението при подаване"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
 msgid "read message from file"
 msgstr "взимане на �ъобщението от Ф�ЙЛ"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "author"
 msgstr "�ВТОР"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "override author for commit"
 msgstr "задаване на �ВТОР за подаването"
 
-#: builtin/commit.c:1499 builtin/gc.c:538
+#: builtin/commit.c:1623 builtin/gc.c:550
 msgid "date"
 msgstr "Д�Т�"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1623
 msgid "override date for commit"
 msgstr "задаване на Д�Т� за подаването"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
 msgstr "ПОД�В��Е"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1625
 msgid "reuse and edit message from specified commit"
 msgstr "преизползване и редактиране на �ъобщението от указаното ПОД�В��Е"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1626
 msgid "reuse message from specified commit"
 msgstr "преизползване на �ъобщението от указаното ПОД�В��Е"
 
-#: builtin/commit.c:1503
-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):]подаване"
+
+#: builtin/commit.c:1631
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение за вкарване на указаното ПОД�В��Е в "
-"предходното без �леда"
+"предходното без �леда или за пром�на на подаването или �ъобщението"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1632
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "използване на автоматичното �ъобщение за вкарване на указаното ПОД�В��Е в "
 "предното"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1633
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "�м�на на автора да �ъвпада � подаващи� (използва �е � „-C“/„-c“/„--amend“)"
 
-#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "добав�не на поле за подпи� — „Signed-off-by:“"
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "епилог"
 
-#: builtin/commit.c:1507
+#: 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
+msgid "add a Signed-off-by trailer"
+msgstr "добав�не на епилог за подпи� „Signed-off-by“"
+
+#: builtin/commit.c:1636
 msgid "use specified template file"
 msgstr "използване на указани� шаблонен Ф�ЙЛ"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1637
 msgid "force edit of commit"
 msgstr "редактиране на подаване"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1639
 msgid "include status in commit message template"
 msgstr "вмъкване на �ъ�то�нието в шаблона за �ъобщението при подаване"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1644
 msgid "Commit contents options"
 msgstr "Опции за избор на файлове при подаване"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1645
 msgid "commit all changed files"
 msgstr "подаване на в�ички променени файлове"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1646
 msgid "add specified files to index for commit"
 msgstr "добав�не на указаните файлове към индек�а за подаване"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1647
 msgid "interactively add files"
 msgstr "интерактивно добав�не на файлове"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1648
 msgid "interactively add changes"
 msgstr "интерактивно добав�не на промени"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1649
 msgid "commit only specified files"
 msgstr "подаване �амо на указаните файлове"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1650
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 "без изпълнение на куките преди подаване и при пром�на на �ъобщението за "
 "подаване (pre-commit и commit-msg)"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1651
 msgid "show what would be committed"
 msgstr "отпечатване на това, което би било подадено"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1664
 msgid "amend previous commit"
 msgstr "поправ�не на предишното подаване"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1665
 msgid "bypass post-rewrite hook"
 msgstr "без изпълнение на куката �лед презапи�ване (post-rewrite)"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1672
 msgid "ok to record an empty change"
 msgstr "позвол�ване на празни подавани�"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1674
 msgid "ok to record a change with an empty message"
 msgstr "позвол�ване на подавани� � празни �ъобщени�"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1747
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Повреден файл за върха за �ливането „MERGE_HEAD“ (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1754
 msgid "could not read MERGE_MODE"
 msgstr "режимът на �ливане „MERGE_MODE“ не може да бъде прочетен"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1775
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�ъобщението за подаване не може да бъде прочетено: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1782
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "�еизвършване на подаване поради празно �ъобщение.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1787
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "�еизвършване на подаване поради нередактирано �ъобщение.\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1798
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "�еизвършване на подаване поради празно �ъобщение.\n"
+
+#: builtin/commit.c:1834
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -12284,297 +14500,230 @@ msgstr ""
 "\n"
 "    git restore --staged :/"
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir ДИР_ОБЕКТИ]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir ДИР_ОБЕКТИ]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-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:29
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir ДИР_ОБЕКТИ] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] ОПЦИИ_З�_Р�ЗДЕЛЯ�Е"
-
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
-#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
-#: builtin/log.c:1585
-msgid "dir"
-msgstr "директори�"
-
-#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
-#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
-msgid "The object directory to store the graph"
-msgstr "ДИРектори�та_�_ОБЕКТИ за запазване на гра̀фа"
-
-#: builtin/commit-graph.c:58
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-"ако гра̀фа � подавани�та е раздробен, да �е провер�ва �амо файлът на върха"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:125
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Графът � подавани�та не може да �е отвори: „%s“"
-
-#: builtin/commit-graph.c:173
-msgid "start walk at all refs"
-msgstr "обхождането да започне от в�ички указатели"
-
-#: builtin/commit-graph.c:175
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-"проверка на подавани�та за индек�ите на пакетите изброени на командни� ред"
-
-#: builtin/commit-graph.c:177
-msgid "start walk at commits listed by stdin"
-msgstr "започване на обхождането при подавани�та подадени на �тандартни� вход"
-
-#: builtin/commit-graph.c:179
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-"включване на в�ички подавани�, които вече �а във файла � гра̀фа на подавани�та"
-
-#: builtin/commit-graph.c:182
-msgid "allow writing an incremental commit-graph file"
-msgstr "позвол�ване на запи� на нара�тващ файл � гра̀фа на подавани�та"
-
-#: builtin/commit-graph.c:184 builtin/commit-graph.c:188
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "мак�имален брой подавани� в небазово ниво на раздробен граф"
-
-#: builtin/commit-graph.c:186
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr ""
-"мак�имално отношение на бро� подавани� в две по�ледователни нива в раздробен "
-"граф"
-
-#: builtin/commit-graph.c:204
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr ""
-"опциите „--reachable“, „--stdin-commits“ и „--stdin-packs“ �а не�ъвме�тими"
-
 #: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [ОПЦИЯ…]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
-msgstr "непознат аргумент „--type“: %s"
+msgstr "непознат аргумент към „--type“: %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "�амо по един вид"
 
-#: builtin/config.c:124
+#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Ме�тоположение на конфигурационни� файл"
 
-#: builtin/config.c:125
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr "използване на глобални� конфигурационен файл"
 
-#: builtin/config.c:126
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr "използване на �и�темни� конфигурационен файл"
 
-#: builtin/config.c:127
+#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "използване на конфигурационни� файл на хранилището"
 
-#: builtin/config.c:128
+#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "използване на конфигурационни� файл на работното копие"
 
-#: builtin/config.c:129
+#: builtin/config.c:135
 msgid "use given config file"
 msgstr "използване на зададени� конфигурационен Ф�ЙЛ"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr "ИДЕ�ТИФИК�ТОР"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr ""
 "изчитане на конфигураци�та от BLOB � този ИДЕ�ТИФИК�ТОР на �ъдържанието"
 
-#: builtin/config.c:131
+#: builtin/config.c:137
 msgid "Action"
 msgstr "Дей�твие"
 
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "извеждане на �тойно�т: ИМЕ [РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "извеждане на �тойно�т: ИМЕ [Ш�БЛО�_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "извеждане на в�ички �тойно�ти: ключ [РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "извеждане на в�ички �тойно�ти: ключ [Ш�БЛО�_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
 msgstr ""
 "извеждане на �тойно�тите за РЕГУЛЯР�и�_ИЗР�З: РЕГУЛЯРЕ�_ИЗР�З_З�_ИМЕТО "
-"[РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
+"[Ш�БЛО�_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:135
+#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "извеждане на �тойно�тта за указани� адре�: Р�ЗДЕЛ[.ПРОМЕ�ЛИВ�] �ДРЕС"
 
-#: builtin/config.c:136
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
-"зам�на на в�ички �ъвпадащи променливи: ИМЕ СТОЙ�ОСТ "
-"[РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
+"зам�на на в�ички �ъвпадащи променливи: ИМЕ СТОЙ�ОСТ [Ш�БЛО�_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:137
+#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "добав�не на нова променлива: ИМЕ СТОЙ�ОСТ"
 
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "изтриване на променлива: ИМЕ [Ш�БЛО�_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "изтриване на в�ички �ъвпадащи: ИМЕ [РЕГУЛЯРЕ�_ИЗР�З_З�_СТОЙ�ОСТТ�]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "изтриване на в�ички �ъвпадащи: ИМЕ [Ш�БЛО�_З�_СТОЙ�ОСТТ�]"
 
-#: builtin/config.c:140
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "преименуване на раздел: СТ�РО_ИМЕ �ОВО_ИМЕ"
 
-#: builtin/config.c:141
+#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "изтриване на раздел: ИМЕ"
 
-#: builtin/config.c:142
+#: builtin/config.c:148
 msgid "list all"
 msgstr "избро�ване на в�ички"
 
-#: builtin/config.c:143
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "до�ловно равен�тво при �равн�ване �ъ� Ш�БЛО�_З�_СТОЙ�ОСТ"
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr "отвар�не на редактор"
 
-#: builtin/config.c:144
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "извеждане на зададени� цв�т: номер [�тандартно]"
 
-#: builtin/config.c:145
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "извеждане на зададени� цв�т: номер (�тандартни�т изход е терминал)"
 
-#: builtin/config.c:146
+#: builtin/config.c:153
 msgid "Type"
 msgstr "Вид"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "�тойно�тта е от този вид"
 
-#: builtin/config.c:148
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
-msgstr "СТОЙ�ОСТТ� е „true“ (и�тина) или „false“ (лъжа)"
+msgstr "СТОЙ�ОСТТ� е „true“ (и�тина) или „false“ (лъжа̀)"
 
-#: builtin/config.c:149
+#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "СТОЙ�ОСТТ� е ц�ло, де�етично чи�ло"
 
-#: builtin/config.c:150
+#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "СТОЙ�ОСТТ� е „--bool“ (булева) или „--int“ (де�етично ц�ло чи�ло)"
 
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "СТОЙ�ОСТТ� е „--bool“ (булева) или низ"
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "СТОЙ�ОСТТ� е път (до файл или директори�)"
 
-#: builtin/config.c:152
+#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "�тойно�тта е период на валидно�т/запазване"
 
-#: builtin/config.c:153
+#: builtin/config.c:161
 msgid "Other"
 msgstr "Други"
 
-#: builtin/config.c:154
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "раздел�не на �тойно�тите � нулеви� знак „NUL“"
 
-#: builtin/config.c:155
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "извеждане на имената на променливите"
 
-#: builtin/config.c:156
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "при тър�ене да �е уважат и директивите за включване"
 
-#: builtin/config.c:157
+#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "извеждане на м��тото на задаване на на�тройката (файл, �тандартен вход, "
 "обект-BLOB, команден ред)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"извеждане на обхвата на на�тройката „worktree“ (работно дърво), "
+"„local“ (хранилище), „global“ (потребител), „system“ (�и�тема), "
+"„command“ (команда)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "СТОЙ�ОСТ"
 
-#: builtin/config.c:158
+#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "� „--get“ �е използва �тандартна СТОЙ�ОСТ при лип�ваща"
 
-#: builtin/config.c:172
+#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "неправилен брой аргументи, тр�бва да е точно %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "неправилен брой аргументи, тр�бва да е от %d до %d включително"
 
-#: builtin/config.c:308
+#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "неправилен шаблон за ключ: „%s“"
 
-#: builtin/config.c:344
+#: builtin/config.c:377
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "неу�пешно форматиране на �тандартната �тойно�т на на�тройка: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "„%s“ не може да �е анализира като цв�т"
 
-#: builtin/config.c:443
+#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "неразпозната �тойно�т на �тандартни� цв�т"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "не е в директори� под Git"
 
-#: builtin/config.c:499
+#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "не �е поддържа запи�ване в �тандартни� вход"
 
-#: builtin/config.c:502
+#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "обекти-BLOB в на�тройките не �е поддържат"
 
-#: builtin/config.c:587
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12589,23 +14738,27 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "�амо по един конфигурационен файл"
 
-#: builtin/config.c:616
+#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "„--local“ може да �е използва �амо в хранилище"
 
-#: builtin/config.c:619
+#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "„--blob“ може да �е използва �амо в хранилище"
 
-#: builtin/config.c:638
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "„--worktree“ може да �е използва �амо в хранилище"
+
+#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "променливата „HOME“ не е зададена"
 
-#: builtin/config.c:658
+#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12616,20 +14769,20 @@ msgstr ""
 "повече информаци� вижте раздела „CONFIGURATION FILE“ в\n"
 "„git help worktree“"
 
-#: builtin/config.c:688
+#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "опци�та „--get-color“ не �ъответ�тва на вида на променливата"
 
-#: builtin/config.c:693
+#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "�амо по едно дей�твие"
 
-#: builtin/config.c:706
+#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr ""
 "опци�та „--name-only“ е приложима �амо към опциите „--list“ и „--get-regexp“"
 
-#: builtin/config.c:712
+#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -12637,43 +14790,47 @@ msgstr ""
 "опци�та „--show-origin“ е приложима �амо към опциите „--get“, „--get-all“, "
 "„--get-regexp“ и „--list“"
 
-#: builtin/config.c:718
+#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "опци�та „--default“ е приложима �амо към опци�та „--get“"
 
-#: builtin/config.c:731
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "опци�та „--fixed-value“ е приложима �амо �ъ� Ш�БЛО�_З�_СТОЙ�ОСТ"
+
+#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "конфигурационни�т файл „%s“ не може да бъде прочетен"
 
-#: builtin/config.c:734
+#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "грешка при обработката на конфигурационен файл"
 
-#: builtin/config.c:744
+#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "не �е поддържа редактиране на �тандартни� вход"
 
-#: builtin/config.c:746
+#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "не �е поддържа редактиране на обекти-BLOB"
 
-#: builtin/config.c:760
+#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "конфигурационни�т файл „%s“ не може да бъде �ъздаден"
 
-#: builtin/config.c:773
+#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
-"множе�тво �тойно�ти не могат да �е замен�т � една.\n"
+"множе�тво �тойно�ти не може да �е замени � една.\n"
 "За да промените „%s“, ползвайте регул�рен израз или опциите „--add“ и „--"
 "replace-all“."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "такъв раззел н�ма: %s"
@@ -12686,6 +14843,43 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "извеждане на размерите на обектите във формат ле�но четим от хора"
 
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Правата за до�тъп до директори�та за програмните гнезда �а прекалено "
+"�вободни —\n"
+"другите потребители може да получат до�тъп до кешираните ви пароли.  За да\n"
+"коригирате това, изпълнете:\n"
+"\n"
+"    chmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+msgstr "извеждане на �ъобщени�та за тра�иране на �тандартната грешка"
+
+#: builtin/credential-cache--daemon.c:316
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr ""
+"демонът за кеша � идентификациите е недо�тъпен — лип�ва поддръжка на гнезда "
+"на unix"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr ""
+"кешът � идентификациите е недо�тъпен — лип�ва поддръжка на гнезда на unix"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+"ключалката на хранилището на идентификациите не бе получена в рамките на %d "
+"ms"
+
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [ОПЦИЯ…] [УК�З�ТЕЛ_КЪМ_ПОД�В��Е…]"
@@ -12694,49 +14888,44 @@ msgstr "git describe [ОПЦИЯ…] [УКÐ�ЗÐ�ТЕЛ_КЪМ_ПОДÐ�Ð’Ð�Ð�Еâ€
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [ОПЦИЯ…] --dirty"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "head"
 msgstr "о�новно"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "кратко"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr "анотирано"
 
-#: builtin/describe.c:275
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "не �ъще�твува анотиран етикет „%s“"
 
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "в анотирани� етикет „%s“ лип�ва вградено име"
-
 #: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "етикетът „%s“ тук е в�ъщно�т „%s“"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "етикетът „%s“ е изве�тен другаде като „%s“"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "никой етикет не напа�ва точно „%s“"
 
-#: builtin/describe.c:327
+#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "�ико� вер�и� и етикет не напа�ват точно.  Тър�и �е по опи�ание\n"
 
-#: builtin/describe.c:381
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "тър�енето приключи при „%s“\n"
 
-#: builtin/describe.c:407
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12745,7 +14934,7 @@ msgstr ""
 "�икой анотиран етикет не опи�ва „%s“.\n"
 "Съще�твуват и неанотирани етикети.  Пробвайте � опци�та „--tags“."
 
-#: builtin/describe.c:411
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12754,12 +14943,12 @@ msgstr ""
 "�икой етикет не опи�ва „%s“.\n"
 "Пробвайте � опци�та „--always“ или �ъздайте етикети."
 
-#: builtin/describe.c:441
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "претър�ени �а %lu подавани�\n"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12768,145 +14957,163 @@ msgstr ""
 "открити �а над %i етикета, изведени �а по�ледните %i,\n"
 "тър�енето бе прекратено при „%s“.\n"
 
-#: builtin/describe.c:512
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "опи�ание на „%s“\n"
 
-#: builtin/describe.c:515
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�еправилно име на обект „%s“"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "„%s“ не е нито подаване, нито обект-BLOB"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "откриване на етикета, който �ледва подаване"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr ""
 "извеждане на информаци� за тра�иране на �тратеги�та за тър�ене на "
 "�тандартната грешка"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "използване на произволен указател"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "използване на в�еки етикет — включително и неанотираните"
 
-#: builtin/describe.c:541
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "винаги да �е ползва дълги�т формат"
 
-#: builtin/describe.c:542
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "про�лед�ване �амо на първи� родител"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "извеждане �амо на точните �ъвпадени�"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "да �е тър�и �амо в този БРОЙ по�ледни етикети (�тандартно: 10)"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "да �е тър�и �амо измежду етикетите напа�ващи този Ш�БЛО�"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "да не �е тър�и измежду етикетите напа�ващи този Ш�БЛО�"
 
-#: builtin/describe.c:553 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "извеждане на �ъкратено име на обект като резервен вариант"
 
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "М�РКЕР"
 
-#: builtin/describe.c:555
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "добав�не на такъв М�РКЕР на работното дърво (�тандартно е „-dirty“)"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "добав�не на такъв М�РКЕР на �чупеното работно дърво (�тандартно е „-broken“)"
 
-#: builtin/describe.c:576
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
-msgstr "Опциите „--long“ и „--abbrev=0“ �а не�ъвме�тими"
+msgstr "опциите „--long“ и „--abbrev=0“ �а не�ъвме�тими"
 
-#: builtin/describe.c:605
+#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "�е �а открити имена — нищо не може да бъде опи�ано."
 
-#: builtin/describe.c:656
+#: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "опци�та „--dirty“ е не�ъвме�тима � указател към подаване"
 
-#: builtin/describe.c:658
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "опци�та „--broken“ е не�ъвме�тима � указател към подаване"
 
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "опциите „-stdin“ и „--merge-base“ �а не�ъвме�тими"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "опци�та „--merge-base“ изи�ква точно две подавани�"
+
+#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "„%s“: не е нито обикновен файл, нито �имволна връзка"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "неправилна опци�: %s"
 
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "„%s..%s“: лип�ва база за �ливане"
+
+#: builtin/diff.c:486
 msgid "Not a git repository"
 msgstr "�е е хранилище на Git"
 
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "зададен е неправилен обект „%s“."
 
-#: builtin/diff.c:403
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "зададени �а повече от 2 обекта-BLOB: „%s“"
 
-#: builtin/diff.c:408
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "зададен е неподдържан обект „%s“."
 
-#: builtin/difftool.c:30
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: много бази за �ливане, ще �е ползва „%s“"
+
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [ОПЦИЯ…] [ПОД�В��Е [ПОД�В��Е]] [[--] ПЪТ…]"
 
-#: builtin/difftool.c:260
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
 msgstr "неу�пешно дей�твие � изходен код: %d"
 
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink %s"
 msgstr "�имволната връзка „%s“ не може да бъде прочетена"
 
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "файлът, �очен от �имволната връзка „%s“, не може да бъде прочетен"
 
-#: builtin/difftool.c:312
+#: builtin/difftool.c:313
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "обектът „%s“ за �имволната връзка „%s“ не може да бъде прочетен"
@@ -12919,55 +15126,55 @@ msgstr ""
 "комбинираните формати на разликите („-c“ и „--cc“) не �е поддържат\n"
 "в режима за разлики върху директории („-d“ и „--dir-diff“)."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "и двата файла �а променени: „%s“ и „%s“."
 
-#: builtin/difftool.c:636
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "работното дърво е изо�тавено."
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "в „%s“ има временни файлове."
 
-#: builtin/difftool.c:648
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr "възможно е да ги изчи�тите или въз�тановите"
 
-#: builtin/difftool.c:697
+#: builtin/difftool.c:699
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "използвайте „diff.guitool“ вме�то „diff.tool“"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:701
 msgid "perform a full-directory diff"
 msgstr "разлика по директории"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:703
 msgid "do not prompt before launching a diff tool"
 msgstr "�тартиране на ПРОГР�М�та за разлики без предупреждение"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:708
 msgid "use symlinks in dir-diff mode"
 msgstr "�ледване на �имволните връзки при разлика по директории"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:709
 msgid "tool"
 msgstr "ПРОГР�М�"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:710
 msgid "use the specified diff tool"
 msgstr "използване на указаната ПРОГР�М�"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:712
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "извеждане на �пи�ък � в�ички ПРОГР�Ми, които може да �е ползват � опци�та „--"
 "tool“"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:715
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12975,31 +15182,31 @@ msgstr ""
 "„git-difftool“ да �пре работа, когато �тартираната ПРОГР�М� завърши � "
 "ненулев код"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:718
 msgid "specify a custom command for viewing diffs"
 msgstr "команда за разглеждане на разлики"
 
-#: builtin/difftool.c:717
+#: builtin/difftool.c:719
 msgid "passed to `diff`"
 msgstr "подава �е към „diff“"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:734
 msgid "difftool requires worktree or --no-index"
 msgstr "„git-difftool“ изи�ква работно дърво или опци�та „--no-index“"
 
-#: builtin/difftool.c:739
+#: builtin/difftool.c:741
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "опциите „--dir-diff“ и „--no-index“ �а не�ъвме�тими"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:744
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "опциите „--gui“, „--tool“ и „--extcmd“ �а не�ъвме�тими една � друга"
 
-#: builtin/difftool.c:750
+#: builtin/difftool.c:752
 msgid "no <tool> given for --tool=<tool>"
 msgstr "не е зададена програма за „--tool=ПРОГР�М�“"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:759
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "не е зададена команда за „--extcmd=КОМ��Д�“"
 
@@ -13007,26 +15214,26 @@ msgstr "не е зададена команда за „--extcmd=КОМÐ�Ð�ДÐ�â
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] ОПЦИИ ПРОМЕ�ЛИВИ"
 
-#: builtin/env--helper.c:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
 msgid "type"
 msgstr "ВИД"
 
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "�тандартна, резервна �тойно�т за „git_env_*(…)“"
 
-#: builtin/env--helper.c:43
+#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr ""
 "без извеждане на информаци� — �тойно�тта на „git_env_*()“ да е изходен код"
 
-#: builtin/env--helper.c:62
+#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
 "опци�та „--default“ изи�ква булева �тойно�т при „--type=bool“, а не „%s“"
 
-#: builtin/env--helper.c:77
+#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -13039,185 +15246,251 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [ОПЦИИ_З�_СПИСЪК�_С_ВЕРСИИ]"
 
-#: builtin/fast-export.c:852
+#: builtin/fast-export.c:868
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Грешка: непреките етикети не �е изна��т, о�вен ако не зададете „--mark-tags“."
 
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "опци�та „--anonymize-map“ изи�ква аргумент"
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "Съобщение за напредъка на в�еки такъв БРОЙ обекта"
 
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "Как да �е обработват подпи�аните етикети"
 
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
 msgid "select handling of tags that tag filtered objects"
 msgstr "Как да �е обработват етикетите на филтрираните обекти"
 
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "как да �е обработват �ъобщени�та за подаване, които �а в друго кодиране"
 
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
-msgstr "Запазване на маркерите в този Ф�ЙЛ"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "запазване на маркерите в този Ф�ЙЛ"
 
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
-msgstr "Вна��не на маркерите от този Ф�ЙЛ"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "вна��не на маркерите от този Ф�ЙЛ"
 
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
-msgstr "Вна��не на маркерите от този Ф�ЙЛ, ако �ъще�твува"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "вна��не на маркерите от този Ф�ЙЛ, ако �ъще�твува"
 
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "Да �е използва изку�твено име на човек при лип�а на задаващ етикета"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr ""
+"да �е използва изку�твено име на човек при лип�а на �ъздател на етикета"
 
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
-msgstr "Извеждане на ц�лото дърво за в��ко подаване"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "извеждане на ц�лото дърво за в��ко подаване"
 
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
-msgstr "Използване на маркер за завършване на потока"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "използване на маркер за завършване на потока"
 
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr "Без извеждане на �ъдържанието на обектите-BLOB"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "без извеждане на �ъдържанието на обектите-BLOB"
 
-#: builtin/fast-export.c:1177 builtin/log.c:1633
+#: builtin/fast-export.c:1222 builtin/log.c:1826
 msgid "refspec"
 msgstr "УК�З�ТЕЛ_��_ВЕРСИЯ"
 
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr "Прилагане на УК�З�ТЕЛ�_��_ВЕРСИЯ към изне�ените указатели"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "прилагане на УК�З�ТЕЛ�_��_ВЕРСИЯ към изне�ените указатели"
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "анонимизиране на извежданата информаци�"
 
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "ОТ:КЪМ"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "заме�тване ОТ �ъ� КЪМ в анонимизирани� изход"
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
-"Указване на родителите, които не �а в потока на бързо изна��не, � "
+"указване на родителите, които не �а в потока на бързо изна��не, � "
 "идентификатор на обект"
 
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "Извеждане на първоначалните идентификатори на обектите BLOB/подав�ни�"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "извеждане на първоначалните идентификатори на обектите BLOB/подав�ни�"
 
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
-msgstr "Задаване на идентификатори на маркери на етикетите"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "задаване на идентификатори на маркери на етикетите"
 
-#: builtin/fast-export.c:1220
+#: 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/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Лип�ват маркери „от“ за подмодула „%s“"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Лип�ват маркери „до“ за подмодула „%s“"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Очаква �е команда „mark“, а бе получена: „%s“"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Очаква �е команда „to“, а бе получена: „%s“"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "опци�та за презапи� на подмодул изи�ква формат: име:име_на_файл"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "„%s“ изи�ква изричното задаване на опци�та „--allow-unsafe-features“"
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "Заключващи�т файл е �ъздаден, но не е докладван: „%s“"
+
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [ОПЦИЯ…] [ХР��ИЛИЩЕ [УК�З�ТЕЛ…]]"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [ОПЦИЯ…] ГРУП�"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [ОПЦИЯ…] [(ХР��ИЛИЩЕ | ГРУП�)…]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [ОПЦИЯ…]"
 
-#: builtin/fetch.c:115
+#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr "опци�та „fetch.parallel“ тр�бва да е неотрицателна"
 
-#: builtin/fetch.c:138 builtin/pull.c:204
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "до�тав�не от в�ички отдалечени хранилища"
 
-#: builtin/fetch.c:140 builtin/pull.c:248
+#: builtin/fetch.c:147 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
 msgstr "задаване на клон за �ледене за издърпване/до�тав�не"
 
-#: builtin/fetch.c:142 builtin/pull.c:207
+#: builtin/fetch.c:149 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "добав�не към „.git/FETCH_HEAD“ вме�то зам�на"
 
-#: builtin/fetch.c:144 builtin/pull.c:210
+#: builtin/fetch.c:151
+msgid "use atomic transaction to update references"
+msgstr "изи�кване на атомарни операции за обнов�ване на указателите"
+
+#: builtin/fetch.c:153 builtin/pull.c:191
 msgid "path to upload pack on remote end"
 msgstr "отдалечен път, където да �е качи пакетът"
 
-#: builtin/fetch.c:145
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr "принудително презапи�ване на локален указател"
 
-#: builtin/fetch.c:147
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "до�тав�не от множе�тво отдалечени хранилища"
 
-#: builtin/fetch.c:149 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "до�тав�не на в�ички етикети и принадлежащи обекти"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr "без до�тав�нето на в�ички етикети „--no-tags“"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "брой подмодули до�тавени паралелно"
 
-#: builtin/fetch.c:155 builtin/pull.c:217
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+"пром�на на указател�, така че и той, както о�таналите, да бъде в „refs/"
+"prefetch/“"
+
+#: builtin/fetch.c:166 builtin/pull.c:198
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "ока�тр�не на клоните �лед�щи вече не�ъще�твуващи отдалечени клони"
 
-#: builtin/fetch.c:157
+#: builtin/fetch.c:168
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "ока�тр�не на локалните етикети, които вече не �ъще�твуват в отдалеченото "
 "хранилище и презапи�ване на променените"
 
-#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "ПРИ �УЖД�"
 
-#: builtin/fetch.c:159
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
 msgstr "управление на рекур�ивното до�тав�не на подмодулите"
 
-#: builtin/fetch.c:163 builtin/pull.c:225
+#: builtin/fetch.c:175
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "запазване на до�тавените указатели във файла „FETCH_HEAD“"
+
+#: builtin/fetch.c:176 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "запазване на изтеглените пакети � обекти"
 
-#: builtin/fetch.c:165
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "позвол�ване на обнов�ването на указател� „HEAD“"
 
-#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "задълбочаване на и�тори�та на плитко хранилище"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:183 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr "задълбочаване на и�тори�та на плитко хранилище до определено време"
 
-#: builtin/fetch.c:176 builtin/pull.c:231
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "превръщане в пълно хранилище"
 
-#: builtin/fetch.c:179
+#: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
 msgstr "добав�не на това пред път� на подмодула"
 
-#: builtin/fetch.c:182
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -13225,90 +15498,104 @@ msgstr ""
 "�тандартно рекур�ивно изтегл�не на подмодулите (файловете � на�тройки �а � "
 "приоритет)"
 
-#: builtin/fetch.c:186 builtin/pull.c:234
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "приемане на указатели, които обнов�ват „.git/shallow“"
 
-#: builtin/fetch.c:187 builtin/pull.c:236
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr "К�РТ�_С_УК�З�ТЕЛИ"
 
-#: builtin/fetch.c:188 builtin/pull.c:237
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "указване на К�РТ�та_С_УК�З�ТЕЛИ за до�тав�не"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:208 builtin/pull.c:240
 msgid "report that we have only objects reachable from this object"
-msgstr "докладване, че в�ички обекти могат �а до�тижими при започване от този"
+msgstr "докладване, че в�ички обекти може �а до�тижими при започване от този"
+
+#: builtin/fetch.c:210
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+"без до�тав�не на пакетни файлове, вме�то това да �е извеждат предше�твеници "
+"на договорните върхове"
 
-#: builtin/fetch.c:198
-msgid "run 'gc --auto' after fetching"
-msgstr "изпълн�ване на „gc --auto“ �лед до�тав�не"
+#: builtin/fetch.c:213 builtin/fetch.c:215
+msgid "run 'maintenance --auto' after fetching"
+msgstr "изпълн�ване на „maintenance --auto“ �лед до�тав�не"
 
-#: builtin/fetch.c:200 builtin/pull.c:246
+#: builtin/fetch.c:217 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr "проверка за принудителни обнов�вани� на в�ички клони"
 
-#: builtin/fetch.c:510
+#: builtin/fetch.c:219
+msgid "write the commit-graph after fetching"
+msgstr "запазване на гра̀фа � подавани�та �лед до�тав�не"
+
+#: builtin/fetch.c:221
+msgid "accept refspecs from stdin"
+msgstr "четене на указателите от �тандартни� вход"
+
+#: builtin/fetch.c:586
 msgid "Couldn't find remote ref HEAD"
 msgstr "Указател�т „HEAD“ в отдалеченото хранилище не може да бъде открит"
 
-#: builtin/fetch.c:650
+#: builtin/fetch.c:757
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "на�тройката „fetch.output“ е � неправилна �тойно�т „%s“"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:856
 #, c-format
 msgid "object %s not found"
 msgstr "обектът „%s“ лип�ва"
 
-#: builtin/fetch.c:752
+#: builtin/fetch.c:860
 msgid "[up to date]"
-msgstr "[актуализиран]"
+msgstr "[актуален]"
 
-#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr "[отхвърлен]"
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:874
 msgid "can't fetch in current branch"
 msgstr "в текущи� клон не може да �е до�тав�"
 
-#: builtin/fetch.c:776
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr "[обнов�ване на етикетите]"
 
-#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
-#: builtin/fetch.c:848
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
 msgid "unable to update local ref"
 msgstr "локален указател не може да бъде обновен"
 
-#: builtin/fetch.c:781
+#: builtin/fetch.c:889
 msgid "would clobber existing tag"
 msgstr "�ъще�твуващ етикет ще бъде презапи�ан"
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr "[нов етикет]"
 
-#: builtin/fetch.c:806
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr "[нов клон]"
 
-#: builtin/fetch.c:809
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr "[нов указател]"
 
-#: builtin/fetch.c:848
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr "принудително обнов�ване"
 
-#: builtin/fetch.c:853
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
 msgstr "�ъщин�ко �ливане"
 
-#: builtin/fetch.c:874
+#: 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"
@@ -13319,7 +15606,7 @@ msgstr ""
 "\n"
 "    git config fetch.showForcedUpdates true"
 
-#: builtin/fetch.c:878
+#: builtin/fetch.c:1069
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -13328,89 +15615,88 @@ msgid ""
 " to avoid this check.\n"
 msgstr ""
 "Проверката за принудителни изтла�квани� отне %.2f �ек.  Може да � пре�кочите "
-"еднократно � опци�та „--no-show-forced-updates“, а за да � извключите за "
+"еднократно � опци�та „--no-show-forced-updates“, а за да � изключите за "
 "по�то�нно, изпълнете:\n"
 "\n"
 "    git config fetch.showForcedUpdates false\n"
 
-#: builtin/fetch.c:908
+#: builtin/fetch.c:1101
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "хранилището „%s“ не изпрати в�ички необходими обекти\n"
 
-#: builtin/fetch.c:929
+#: builtin/fetch.c:1129
 #, 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:1020 builtin/fetch.c:1157
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr "От %.*s\n"
 
-#: builtin/fetch.c:1031
+#: 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 ""
-"н�кои локални указатели не могат да бъдат обновени.  Изпълнете командата\n"
+"н�кои локални указатели не може да бъдат обновени.  Изпълнете командата\n"
 "„git remote prune %s“, за да премахнете о�тарелите клони, които\n"
 "предизвикват конфликта"
 
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1327
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (обектът „%s“ ще �е окаже извън клон)"
 
-#: builtin/fetch.c:1128
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (обектът „%s“ вече е извън клон)"
 
-#: builtin/fetch.c:1160
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr "[изтрит]"
 
-#: builtin/fetch.c:1161 builtin/remote.c:1036
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(нищо)"
 
-#: builtin/fetch.c:1184
+#: builtin/fetch.c:1384
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "�е може да до�тавите в текущи� клон „%s“ на хранилище, което не е голо"
 
-#: builtin/fetch.c:1203
+#: builtin/fetch.c:1403
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Стойно�тта „%2$s“ за опци�та „%1$s“ не е �ъвме�тима � „%3$s“"
 
-#: builtin/fetch.c:1206
+#: builtin/fetch.c:1406
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
-msgstr "Опци�та „%s“ �е пре�кача при „%s“\n"
+msgstr "опци�та „%s“ �е пре�кача при „%s“\n"
 
-#: builtin/fetch.c:1414
-msgid "multiple branch detected, incompatible with --set-upstream"
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr ""
 "за�ечени �а множе�тво клони, това е не�ъвме�тимо � опци�та „--set-upstream“"
 
-#: builtin/fetch.c:1429
+#: builtin/fetch.c:1633
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "не може да указвате клон за �ледене на отдалечен етикет"
 
-#: builtin/fetch.c:1431
+#: builtin/fetch.c:1635
 msgid "not setting upstream for a remote tag"
 msgstr "не може да указвате клон за �ледене на отдалечен етикет"
 
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1637
 msgid "unknown branch type"
 msgstr "непознат вид клон"
 
-#: builtin/fetch.c:1435
+#: builtin/fetch.c:1639
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
@@ -13418,22 +15704,22 @@ msgstr ""
 "не е открит клон за �ледене.\n"
 "Тр�бва изрично да зададете един клон � опци�та „--set-upstream option“."
 
-#: builtin/fetch.c:1561 builtin/fetch.c:1623
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr "До�тав�не на „%s“\n"
 
-#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "„%s“ не може да �е до�тави"
 
-#: builtin/fetch.c:1583
+#: builtin/fetch.c:1790
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "„%s“ не може да �е до�тави (изходни�т код е: %d)\n"
 
-#: builtin/fetch.c:1685
+#: 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."
@@ -13441,45 +15727,57 @@ msgstr ""
 "�е �те указали отдалечено хранилище.  Задайте или адре�, или име\n"
 "на отдалечено хранилище, откъдето да �е до�тав�т новите вер�ии."
 
-#: builtin/fetch.c:1722
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr "Тр�бва да укажете име на етикет."
 
-#: builtin/fetch.c:1774
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr ""
+"Опци�та „--negotiate-only“ изи�ква една или повече опции „--negotiate-tip=*“"
+
+#: builtin/fetch.c:1998
 msgid "Negative depth in --deepen is not supported"
 msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не �е поддържа"
 
-#: builtin/fetch.c:1776
+#: builtin/fetch.c:2000
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "опциите „--deepen“ и „--depth“ �а не�ъвме�тими"
 
-#: builtin/fetch.c:1781
+#: builtin/fetch.c:2005
 msgid "--depth and --unshallow cannot be used together"
 msgstr "опциите „--depth“ и „--unshallow“ �а не�ъвме�тими"
 
-#: builtin/fetch.c:1783
+#: builtin/fetch.c:2007
 msgid "--unshallow on a complete repository does not make sense"
-msgstr "не можете да използвате опци�та „--unshallow“ върху пълно хранилище"
+msgstr "не може да използвате опци�та „--unshallow“ върху пълно хранилище"
 
-#: builtin/fetch.c:1799
+#: builtin/fetch.c:2024
 msgid "fetch --all does not take a repository argument"
-msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
+msgstr "към „git fetch --all“ не може да добавите аргумент-хранилище"
 
-#: builtin/fetch.c:1801
+#: builtin/fetch.c:2026
 msgid "fetch --all does not make sense with refspecs"
-msgstr ""
-"към „git fetch --all“ не можете да добавите аргумент — указател на вер�и�"
+msgstr "към „git fetch --all“ не може да добавите аргумент-указател на вер�и�"
 
-#: builtin/fetch.c:1810
+#: builtin/fetch.c:2035
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "��ма нито отдалечено хранилище, нито група от хранилища на име „%s“"
 
-#: builtin/fetch.c:1817
+#: builtin/fetch.c:2042
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Указването на група и указването на вер�и� �а не�ъвме�тими"
 
-#: builtin/fetch.c:1835
+#: builtin/fetch.c:2058
+msgid "must supply remote when using --negotiate-only"
+msgstr "опци�та „--negotiate-only“ изи�ква хранилище"
+
+#: builtin/fetch.c:2063
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "Протоколът не поддържа опци�та „--negotiate-only“, изход от прогамата."
+
+#: builtin/fetch.c:2082
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -13487,31 +15785,40 @@ msgstr ""
 "опци�та „--filter“ може да �е ползва �амо � отдалеченото хранилище указано в "
 "на�тройката „extensions.partialClone“"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2086
+msgid "--atomic can only be used when fetching from one remote"
+msgstr ""
+"опци�та „--atomic“ поддържа до�тав�не �амо от едно отдалечено хранилище"
+
+#: builtin/fetch.c:2090
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "опци�та „--stdin“ поддържа до�тав�не �амо от едно отдалечено хранилище"
+
+#: 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 СЪОБЩЕ�ИЕ] [--log[=БРОЙ] | --no-log] [--file Ф�ЙЛ]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 "вмъкване на журнал �ъ�то�щ �е от не повече от БРОЙ запи�а от �ъкратени� "
 "журнал"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
-msgstr "п�евдоним на „--log“ (о�тар�ло)"
+msgstr "п�евдоним на „--log“ (ОСТ�РЯЛО)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "ТЕКСТ"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "за начало на �ъобщението да �е ползва ТЕКСТ"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "файл, от който да �е чете"
 
@@ -13524,83 +15831,99 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points ОБЕКТ]"
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref[(--merged | --no-merged) [ПОД�В��Е]]"
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr "git for-each-ref [--merged [ПОД�В��Е]] [--no-merged [ПОД�В��Е]]"
 
 #: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [ПОД�В��Е]] [--no-contains [ПОД�В��Е]]"
 
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
 msgstr "цитиране подход�що за командни интерпретатори на обвивката"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr "цитиране подход�що за perl"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr "цитиране подход�що за python"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr "цитиране подход�що за tcl"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "извеждане �амо на този БРОЙ напа�нати указатели"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
 msgid "respect format colors"
 msgstr "�пазване на цветовете на форма̀та"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "извеждане �амо на указателите, �очещи към ОБЕКТ�"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "извеждане �амо на �летите указатели"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
 msgstr "извеждане �амо на не�летите указатели"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
 msgstr "извеждане �амо на указателите, които �ъдържат това ПОД�В��Е"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
 msgstr "извеждане �амо на указателите, които не �ъдържат това ПОД�В��Е"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=��СТРОЙК� �РГУМЕ�Т…"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "на�тройка"
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr "на�тройка, ко�то �ъдържа �пи�ък � пътища към хранилища"
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr "лип�ва --config=��СТРОЙК�"
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "непознат"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "грешка в %s „%s“: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "предупреждение за %s „%s“: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "�къ�ана връзка от %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "неправилен вид обект във връзката"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13609,241 +15932,241 @@ msgstr ""
 "�къ�ана връзка от %7s %s\n"
 "              към %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "лип�ващ обект: %s „%s“"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "недо�тижим обект: %s „%s“"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "извън клон: %s „%s“"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "„lost-found“ не може да �е �ъздаде"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "„%s“ не може да �е завърши"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Проверка на „%s“"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Проверка на �вързано�тта (%d обекта)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Провер�ване на %s „%s“"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "�къ�ани връзки"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "начална директори� „%s“"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "приложен етикет „%s“ върху „%s“ (%s) в „%s“"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: лип�ващ или повреден обект"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: неправилен запи� в журнала за указатели „%s“"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Проверка на журнала на указателите: „%s“ до „%s“"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "„%s“: неправилен указател за SHA1: „%s“"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: не е подаване!"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "внимание: н�ма указатели по подразбиране"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:606
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "„%s“: лип�ващ обект: „%s“"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:619
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "„%s“: не може да �е анализира: „%s“"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:639
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "неправилен ред � контролна �ума по SHA1: „%s“"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:654
 msgid "Checking object directory"
 msgstr "Проверка на директори� � обекти"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:657
 msgid "Checking object directories"
 msgstr "Проверка на директориите � обекти"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:672
 #, c-format
 msgid "Checking %s link"
 msgstr "Проверка на връзките на „%s“"
 
 #
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:677 builtin/index-pack.c:864
 #, c-format
 msgid "invalid %s"
 msgstr "неправилен указател „%s“"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:684
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "„%s“ �очи към нещо необичайно (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:690
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: не�вързани�т връх „HEAD“ не �очи към нищо"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:694
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "предупреждение: „%s“ �очи към в�е още не�ъще�твуващ клон (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:706
 msgid "Checking cache tree"
 msgstr "Проверка на дървото на кеша"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:711
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "„%s“: неправилен указател за SHA1 в дървото на кеша"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:720
 msgid "non-tree in cache-tree"
 msgstr "в дървото на кеша има нещо, което не е дърво"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:751
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:757
 msgid "show unreachable objects"
 msgstr "показване на недо�тижимите обекти"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:758
 msgid "show dangling objects"
 msgstr "показване на обектите извън клоните"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:759
 msgid "report tags"
 msgstr "показване на етикетите"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:760
 msgid "report root nodes"
 msgstr "показване на кореновите възли"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:761
 msgid "make index objects head nodes"
 msgstr "задаване на обекти от индек�а да �а коренови"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:762
 msgid "make reflogs head nodes (default)"
 msgstr "про�лед�ване и на указателите от журнала � указателите (�тандартно)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:763
 msgid "also consider packs and alternate objects"
 msgstr "допълнително да �е провер�ват пакетите и алтернативните обекти"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:764
 msgid "check only connectivity"
 msgstr "проверка �амо на връзката"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:765 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "по-�троги проверки"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:767
 msgid "write dangling objects in .git/lost-found"
 msgstr "запазване на обектите извън клоните в директори�та „.git/lost-found“"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:768 builtin/prune.c:134
 msgid "show progress"
 msgstr "показване на напредъка"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:769
 msgid "show verbose names for reachable objects"
 msgstr "показване на подробни имена на до�тижимите обекти"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:828 builtin/index-pack.c:262
 msgid "Checking objects"
 msgstr "Проверка на обектите"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:856
 #, c-format
 msgid "%s: object missing"
 msgstr "„%s“: лип�ващ обект"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:867
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "неправилен параметър: очаква �е SHA1, а бе получено: „%s“"
 
-#: builtin/gc.c:35
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [ОПЦИЯ…]"
 
-#: builtin/gc.c:90
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "�еу�пешно изпълнение на „fstat“ върху „%s“: %s"
 
-#: builtin/gc.c:126
+#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "�тойно�тта на „%s“ — „%s“ не може да �е анализира"
 
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "не може да �е получи информаци� чрез „stat“ за директори�та „%s“"
 
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
 #, c-format
 msgid "cannot read '%s'"
 msgstr "файлът „%s“ не може да бъде прочетен"
 
-#: builtin/gc.c:491
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13860,58 +16183,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:539
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
 msgstr "ока�тр�не на обектите, към които нищо не �очи"
 
-#: builtin/gc.c:541
+#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr "изчерпателно тър�ене на боклука (за �метка на повече време работа)"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "включване на автоматичното �ъбиране на боклука (auto-gc)"
 
-#: builtin/gc.c:545
+#: builtin/gc.c:557
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "изрично �тартиране на �ъбирането на боклука, дори и ако вече работи друго "
 "�ъбиране"
 
-#: builtin/gc.c:548
+#: builtin/gc.c:560
 msgid "repack all other packs except the largest pack"
 msgstr "препакетиране на в�ичко без най-големи� пакет"
 
-#: builtin/gc.c:565
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "неразпозната �тойно�т на „gc.logexpiry“ %s"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:587
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "неразпозната �тойно�т на периода за ока�тр�не: %s"
 
-#: builtin/gc.c:596
+#: builtin/gc.c:607
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "�втоматично пакетиране на заден фон на хранилището за по-добра "
 "производително�т.\n"
 
-#: builtin/gc.c:598
+#: builtin/gc.c:609
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "�втоматично пакетиране на хранилището за по-добра производително�т.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:610
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 "Погледнете ръковод�твото за повече информаци� как да изпълните „git help "
 "gc“.\n"
 
-#: builtin/gc.c:639
+#: builtin/gc.c:650
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13920,23 +16243,189 @@ msgstr ""
 "проце�а: %<PRIuMAX> (ако �те �игурни, че това не е в�рно, това използвайте\n"
 "опци�та „--force“)"
 
-#: builtin/gc.c:694
+#: builtin/gc.c:705
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Има прекалено много недо�тижими, непакетирани обекти.\n"
 "Използвайте „git prune“, за да ги ока�трите."
 
-#: builtin/grep.c:29
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=З�Д�Ч�] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "опци�та „--no-schedule“ не е позволена"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "непознат аргумент към „--schedule“: %s"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "графът � подавани�та не може да бъде запи�ан"
+
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr "неу�пешно предварително до�тав�не на отдалечените клони"
+
+#: builtin/gc.c:1022
+msgid "failed to start 'git pack-objects' process"
+msgstr "проце�ът за командата „git pack-objects“ не може да бъде �тартиран"
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr "проце�ът за командата „git pack-objects“ не може да завърши"
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr "индек�ът за множе�тво пакети не може да бъде запи�ан"
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr "неу�пешно изпълнение на „git multi-pack-index expire“"
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr "неу�пешно изпълнение на „git multi-pack-index repack“"
+
+#: builtin/gc.c:1179
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"задачата „incremental-repack“ �е пре�кача, защото на�тройката „core."
+"multiPackIndex“ е изключена"
+
+#: builtin/gc.c:1283
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "заключващи�т файл „%s“ �ъще�твува.  Дей�твието �е пре�кача"
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr "неу�пешно изпълнение на задачата „%s“"
+
+#: builtin/gc.c:1395
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "„%s“ не е правилна задача"
+
+#: builtin/gc.c:1400
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "задачата „%s“ не може да �е избере повече от веднъж"
+
+#: builtin/gc.c:1415
+msgid "run tasks based on the state of the repository"
+msgstr "изпълн�ване на задачи �поред �ъ�то�нието на хранилището"
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr "че�тота"
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr "изпълн�ване на задачи по график"
+
+#: builtin/gc.c:1420
+msgid "do not report progress or other information over stderr"
+msgstr "без извеждане на напредъка и друга информаци� на �тандартни� изход"
+
+#: builtin/gc.c:1421
+msgid "task"
+msgstr "задача"
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr "изпълнение на определена задача"
+
+#: builtin/gc.c:1439
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+"може да �е указва мак�имум една от опциите „--auto“ и „--schedule=ЧЕСТОТ�“"
+
+#: builtin/gc.c:1482
+msgid "failed to run 'git config'"
+msgstr "неу�пешно изпълнение на „git config“"
+
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "грешка при заме�тването на път� „%s“"
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr "неу�пешно �тартиране на „launchctl“."
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "директориите за „%s“ не може да бъдат �ъздадени"
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "у�лугата „%s“ не може �е на�трои първоначално"
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
+msgstr "неу�пешно �ъздаване на временен файл за xml"
+
+#: 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 ""
+"неу�пешно изпълнение на „crontab -l“.  Си�темата ви може да не поддържа "
+"„cron“"
+
+#: builtin/gc.c:1896
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+"неу�пешно изпълнение на „crontab“.  Си�темата ви може да не поддържа „cron“"
+
+#: builtin/gc.c:1900
+msgid "failed to open stdin of 'crontab'"
+msgstr "�тандартни�т вход на „crontab“ не може да �е отвори"
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr "проце�ът на „crontab“ умр�"
+
+#: 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 "неу�пешно добав�не на хранилище към файла � глобални на�тройки"
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance ПОДКОМ��Д� [ОПЦИЯ…]"
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "неправилна подкоманда: „%s“"
+
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [ОПЦИЯ…] [-e] Ш�БЛО� [ВЕРСИЯ…] [[--] ПЪТ…]"
 
-#: builtin/grep.c:225
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: неу�пешно �ъздаване на нишка: %s"
 
-#: builtin/grep.c:279
+#: builtin/grep.c:277
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "зададен е неправилен брой нишки (%d) за %s"
@@ -13945,272 +16434,271 @@ msgstr "зададен е неправилен брой нишки (%d) за %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: 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 "лип�ва поддръжка за нишки.  „%s“ ще �е пренебрегне"
 
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "дървото не може да бъде прочетено (%s)"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:658
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "не може да �е изпълни „grep“ от обект от вида %s"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:738
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "опци�та „%c“ очаква чи�ло за аргумент"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:837
 msgid "search in index instead of in the work tree"
 msgstr "тър�ене в индек�а, а не в работното дърво"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:839
 msgid "find in contents not managed by git"
 msgstr "тър�ене и във файловете, които не �а под управлението на git"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:841
 msgid "search in both tracked and untracked files"
 msgstr "тър�ене и в �ледените, и в не�ледените файлове"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:843
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнориране на файловете указани в „.gitignore“"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:845
 msgid "recursively search in each submodule"
 msgstr "рекур�ивно тър�ене във в�ички подмодули"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:848
 msgid "show non-matching lines"
 msgstr "извеждане на редовете, които не �ъвпадат"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:850
 msgid "case insensitive matching"
 msgstr "без значение на реги�търа на буквите (главни/малки)"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:852
 msgid "match patterns only at word boundaries"
 msgstr "напа�ване на шаблоните �амо по границите на думите"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:854
 msgid "process binary files as text"
 msgstr "обработване на двоичните файлове като тек�тови"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:856
 msgid "don't match patterns in binary files"
 msgstr "пре�качане на двоичните файлове"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:859
 msgid "process binary files with textconv filters"
 msgstr ""
 "обработване на двоичните файлове чрез филтри за преобразуване към тек�т"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:861
 msgid "search in subdirectories (default)"
 msgstr "тър�ене в поддиректориите (�тандартно)"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:863
 msgid "descend at most <depth> levels"
 msgstr "навлизане мак�имално на тази ДЪЛБОЧИ�� в дървото"
 
-#: builtin/grep.c:845
+#: builtin/grep.c:867
 msgid "use extended POSIX regular expressions"
 msgstr "разширени регул�рни изрази по POSIX"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:870
 msgid "use basic POSIX regular expressions (default)"
 msgstr "о�новни регул�рни изрази по POSIX (�тандартно)"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:873
 msgid "interpret patterns as fixed strings"
 msgstr "шаблоните �а до�ловни низове"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:876
 msgid "use Perl-compatible regular expressions"
 msgstr "регул�рни изрази на Perl"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:879
 msgid "show line numbers"
 msgstr "извеждане на номерата на редовете"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:880
 msgid "show column number of first match"
 msgstr "извеждане на номера на колоната на първото напа�ване"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:881
 msgid "don't show filenames"
 msgstr "без извеждане на имената на файловете"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:882
 msgid "show filenames"
 msgstr "извеждане на имената на файловете"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:884
 msgid "show filenames relative to top directory"
 msgstr ""
 "извеждане на отно�ителните имена на файловете �пр�мо о�новната директори� на "
 "хранилището"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:886
 msgid "show only filenames instead of matching lines"
 msgstr "извеждане �амо на имената на файловете без напа�ващите редове"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:888
 msgid "synonym for --files-with-matches"
 msgstr "п�евдоним на „--files-with-matches“"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:891
 msgid "show only the names of files without match"
 msgstr ""
 "извеждане �амо на имената на файловете, които не �ъдържат ред, напа�ващ на "
 "шаблона"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:893
 msgid "print NUL after filenames"
 msgstr "извеждане на нулеви� знак „NUL“ �лед в��ко име на файл"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:896
 msgid "show only matching parts of a line"
 msgstr "извеждане �амо на ча�тите на редовете, които �ъвпадат"
 
-#: builtin/grep.c:876
+#: builtin/grep.c:898
 msgid "show the number of matches instead of matching lines"
 msgstr "извеждане на бро� на �ъвпадени�та вме�то напа�ващите редове"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:899
 msgid "highlight matches"
 msgstr "оцвет�ване на напа�вани�та"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:901
 msgid "print empty line between matches from different files"
 msgstr "извеждане на празен ред между напа�вани�та от различни файлове"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:903
 msgid "show filename only once above matches from same file"
 msgstr ""
 "извеждане на името на файла �амо веднъж за в�ички напа�вани� от този файл"
 
-#: builtin/grep.c:884
+#: builtin/grep.c:906
 msgid "show <n> context lines before and after matches"
 msgstr "извеждане на такъв БРОЙ редове преди и �лед напа�вани�та"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:909
 msgid "show <n> context lines before matches"
 msgstr "извеждане на такъв БРОЙ редове преди напа�вани�та"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:911
 msgid "show <n> context lines after matches"
 msgstr "извеждане на такъв БРОЙ редове �лед напа�вани�та"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:913
 msgid "use <n> worker threads"
 msgstr "използване на такъв БРОЙ работещи нишки"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:914
 msgid "shortcut for -C NUM"
 msgstr "п�евдоним на „-C БРОЙ“"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:917
 msgid "show a line with the function name before matches"
 msgstr "извеждане на ред � името на функци�та, в ко�то е напа�нат шаблона"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:919
 msgid "show the surrounding function"
 msgstr "извеждане на обхващащата функци�"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:922
 msgid "read patterns from file"
 msgstr "изчитане на шаблоните от Ф�ЙЛ"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:924
 msgid "match <pattern>"
 msgstr "напа�ване на Ш�БЛО�"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:926
 msgid "combine patterns specified with -e"
 msgstr "комбиниране на шаблоните указани � опци�та „-e“"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:938
 msgid "indicate hit with exit status without output"
 msgstr ""
 "без извеждане на �тандартни� изход.  Изходни�т код указва наличието на "
 "напа�ване"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:940
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "извеждане на редове �амо от файловете, които напа�ват на в�ички шаблони"
 
-#: builtin/grep.c:920
-msgid "show parse tree for grep expression"
-msgstr "извеждане на дървото за анализ на регул�рни� израз"
-
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "pager"
 msgstr "програма за преглед по �траници"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "show matching files in the pager"
 msgstr "извеждане на �ъвпадащите файлове в програма за преглед по �траници"
 
-#: builtin/grep.c:928
+#: builtin/grep.c:947
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 "позвол�ване на �тартирането на grep(1) (текущи�т компилат пренебрегва тази "
 "опци�)"
 
-#: builtin/grep.c:992
+#: builtin/grep.c:1013
 msgid "no pattern given"
 msgstr "не �те задали шаблон"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1049
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "опциите „--cached“ и „--untracked“ �а не�ъвме�тими � вер�ии."
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1057
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "вер�и�та „%s“ не може бъде открита"
 
-#: builtin/grep.c:1067
+#: builtin/grep.c:1087
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "опциите „--untracked“ и „--recurse-submodules“ �а не�ъвме�тими"
+
+#: builtin/grep.c:1091
 msgid "invalid option combination, ignoring --threads"
 msgstr "неправилна комбинаци� от опции, „--threads“ ще �е пренебрегне"
 
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
 msgid "no threads support, ignoring --threads"
 msgstr "лип�ва поддръжка за нишки.  „--threads“ ще �е пренебрегне"
 
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "зададен е неправилен брой нишки: %d"
 
-#: builtin/grep.c:1096
+#: builtin/grep.c:1131
 msgid "--open-files-in-pager only works on the worktree"
-msgstr ""
-"опци�та „--open-files-in-pager“ е �ъвме�тима �амо � тър�ене в работното дърво"
+msgstr "опци�та „--open-files-in-pager“ изи�ква тър�ене в работното дърво"
 
-#: builtin/grep.c:1119
-msgid "option not supported with --recurse-submodules"
-msgstr "опци�та е не�ъвме�тима � „--recurse-submodules“"
-
-#: builtin/grep.c:1125
+#: builtin/grep.c:1157
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "опциите „--cached“ и „--untracked“ �а не�ъвме�тими � „--no-index“"
 
-#: builtin/grep.c:1131
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
+msgstr "опциите „--untracked“ и „--cached“ �а не�ъвме�тими"
+
+#: builtin/grep.c:1166
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 "опциите „--(no-)exclude-standard“ �а не�ъвме�тими � тър�ене по �ледени "
 "файлове"
 
-#: builtin/grep.c:1139
+#: builtin/grep.c:1174
 msgid "both --cached and trees are given"
 msgstr "опци�та „--cached“ е не�ъвме�тима �ъ� задаване на дърво"
 
@@ -14253,66 +16741,66 @@ msgstr ""
 msgid "process file as it were from this path"
 msgstr "обработване на Ф�ЙЛа в�е едно е � този път"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "показване на в�ички налични команди"
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "без въведени�"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr "показване на �пи�ък � въведени�"
 
-#: builtin/help.c:49
+#: builtin/help.c:50
 msgid "print all configuration variable names"
 msgstr "показване на имената на в�ички конфигуриращи променливи"
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr "показване на �траница от ръковод�твото"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr "показване на �траница от ръковод�твото в уеб браузър"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "показване на информационна �траница"
 
-#: builtin/help.c:56
+#: builtin/help.c:57
 msgid "print command description"
 msgstr "извеждане на опи�анието на команда"
 
-#: builtin/help.c:61
+#: builtin/help.c:62
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [КОМ��Д�]"
 
-#: builtin/help.c:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "непознат формат на помощта „%s“"
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "�еу�пешно �тартиране на „emacsclient“."
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "Вер�и�та на „emacsclient“ не може да �е анализира."
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "Прекалено �тара вер�и� на „emacsclient“ — %d (< 22)."
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "неу�пешно изпълнение на „%s“"
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -14321,7 +16809,7 @@ msgstr ""
 "„%s“: път към неподдържана програма за преглед на\n"
 " ръковод�твото.  Вме�то не� пробвайте „man.<tool>.cmd“."
 
-#: builtin/help.c:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -14330,408 +16818,438 @@ msgstr ""
 "„%s“: команда за поддържана програма за преглед на\n"
 " ръковод�твото.  Вме�то не� пробвайте „man.<tool>.path“."
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "„%s“: непозната програма за преглед на ръковод�твото."
 
-#: builtin/help.c:367
+#: builtin/help.c:452
 msgid "no man viewer handled the request"
 msgstr "нико� програма за преглед на ръковод�тво не у�п� да обработи за�вката"
 
-#: builtin/help.c:375
+#: builtin/help.c:459
 msgid "no info viewer handled the request"
 msgstr ""
 "нико� програма за преглед на информационните �траници не у�п� да обработи "
 "за�вката"
 
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "„%s“ е п�евдоним на „%s“"
 
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:531 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "неправилен низ за на�тройката „alias.%s“: „%s“"
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:561 builtin/help.c:591
 #, c-format
 msgid "usage: %s%s"
 msgstr "употреба: %s%s"
 
-#: builtin/help.c:491
+#: builtin/help.c:575
 msgid "'git help config' for more information"
 msgstr "За повече информаци� изпълнете „git help config“"
 
-#: builtin/index-pack.c:185
+#: builtin/index-pack.c:222
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "неправилен вид на обекта „%s“"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:242
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "очаквани�т обект „%s“ не бе получен"
 
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:245
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "неправилен вид на обекта „%s“: очакваше �е „%s“, а бе получен „%s“"
 
-#: builtin/index-pack.c:258
+#: builtin/index-pack.c:295
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "не може да �е запълни %d байт"
 msgstr[1] "не може да �е запълн�т %d байта"
 
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:305
 msgid "early EOF"
 msgstr "неочакван край на файл"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:306
 msgid "read error on input"
 msgstr "грешка при четене на входните данни"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:318
 msgid "used more bytes than were available"
 msgstr "използвани �а повече от наличните байтове"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:325 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "пакетни�т файл е прекалено гол�м за текущата �тойно�т на типа „off_t“"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "пакетни�т файл надвишава мак�имални� възможен размер"
 
-#: builtin/index-pack.c:312
+#: 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:326
+#: builtin/index-pack.c:363
 msgid "pack signature mismatch"
 msgstr "не�ъответ�твие в подпи�а към пакетни� файл"
 
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:365
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "не �е поддържа пакетиране вeр�и� „%<PRIu32>“"
 
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:381
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "повреден обект в пакетни� файл при отме�тване %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:487
 #, c-format
 msgid "inflate returned %d"
 msgstr "декомпре�ирането � „inflate“ върна %d"
 
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:536
 msgid "offset value overflow for delta base object"
 msgstr "�тойно�тта на отме�тването за обекта-разлика води до препълване"
 
-#: builtin/index-pack.c:523
+#: builtin/index-pack.c:544
 msgid "delta base offset is out of bound"
 msgstr "�тойно�тта на отме�тването за обекта-разлика е извън диапазона"
 
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:552
 #, c-format
 msgid "unknown object type %d"
 msgstr "непознат вид обект %d"
 
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:583
 msgid "cannot pread pack file"
 msgstr "пакетни�т файл не може да бъде прочетен"
 
-#: builtin/index-pack.c:564
+#: 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] "неочакван край на файл, лип�ва %<PRIuMAX> байт"
 msgstr[1] "неочакван край на файл, лип�ват %<PRIuMAX> байта"
 
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:611
 msgid "serious inflate inconsistency"
 msgstr "�ериозна грешка при декомпре�иране � „inflate“"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: 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 ""
 "СЪВП�ДЕ�ИЕ �� СТОЙ�ОСТИТЕ З� СУМИТЕ З� SHA1: „%s“ �� ДВ� Р�ЗЛИЧ�И ОБЕКТ�!"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: 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 "обектът „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "�ъще�твуващи�т обект в „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:831
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "�ъще�твуващи�т обект „%s“ не може да бъде прочетен"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:845
 #, c-format
 msgid "invalid blob object %s"
 msgstr "неправилен обект-BLOB „%s“"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
 msgid "fsck error in packed object"
 msgstr "грешка при проверката на пакетирани обекти"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:869
 #, c-format
 msgid "Not all child objects of %s are reachable"
-msgstr "��кои обекти, на�ледници на „%s“, не могат да бъдат до�тигнати"
+msgstr "��кои обекти, на�ледници на „%s“, не може да бъдат до�тигнати"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
 msgid "failed to apply delta"
 msgstr "разликата не може да бъде приложена"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Receiving objects"
 msgstr "Получаване на обекти"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Indexing objects"
 msgstr "Индек�иране на обекти"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1194
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "пакетни�т файл е повреден (нееднакви �уми по SHA1)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1199
 msgid "cannot fstat packfile"
 msgstr "не може да �е получи информаци� за пакетни� файл � „fstat“"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1202
 msgid "pack has junk at the end"
 msgstr "в кра� на пакетни� файл има повредени данни"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1214
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 "фатална грешка във функци�та „parse_pack_objects“.  Това е грешка в Git, "
 "докладвайте � на разработчиците, като пратите е-пи�мо на адре�: „git@vger."
 "kernel.org“."
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1237
 msgid "Resolving deltas"
 msgstr "Откриване на �ъответните разлики"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "не може да �е �ъздаде нишка: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1281
 msgid "confusion beyond insanity"
 msgstr ""
 "фатална грешка във функци�та „conclude_pack“.  Това е грешка в Git, "
 "докладвайте � на разработчиците, като пратите е-пи�мо на адре�: „git@vger."
 "kernel.org“."
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1287
 #, 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:1264
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "�еочаквана по�ледваща �ума за грешки за „%s“ (причината може да е грешка в "
 "ди�ка)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1303
 #, 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:1292
+#: builtin/index-pack.c:1327
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "добавени�т обект не може да �е компре�ира � „deflate“: %d"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "локални�т обект „%s“ е повреден"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1444
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "името на пакетни� файл „%s“ не завършва на „.pack“"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "името на пакетни� файл „%s“ не завършва � „%s“"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1468
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "грешка при запи� на файла „%s“ „%s“"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1476
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "грешка при затвар�нето на запи�ани� файл „%s“ „%s“"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1502
 msgid "error while closing pack file"
 msgstr "грешка при затвар�нето на пакетни� файл"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1516
 msgid "cannot store pack file"
 msgstr "пакетни�т файл не може да бъде запазен"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1524
 msgid "cannot store index file"
 msgstr "файлът за индек�а не може да бъде �ъхранен"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "зададена е неправилна вер�и� пакетиране: „pack.indexversion=%<PRIu32>“"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1649
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Съще�твуващи�т пакетен файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1651
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Съще�твуващи�т индек� за пакетни� файл „%s“ не може да бъде отворен"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1699
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "%d обект не е разлика"
 msgstr[1] "%d обекта не �а разлика"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1706
 #, 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:1689
+#: builtin/index-pack.c:1748
 msgid "Cannot come back to cwd"
 msgstr "Проце�ът не може да �е върне към предишната работна директори�"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: 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 "неправилна �тойно�т „%s“"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "непознат алгоритъм за контролни �уми „%s“"
+
+#: builtin/index-pack.c:1850
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "опци�та „--fix-thin“ изи�ква „--stdin“"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1852
 msgid "--stdin requires a git repository"
 msgstr "„--stdin“ изи�ква хранилище на git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr "опци�та „--object-format“ и „--stdin“ �а не�ъвме�тими"
+
+#: builtin/index-pack.c:1869
 msgid "--verify with no packfile name given"
 msgstr "опци�та „--verify“ изи�ква име на пакетен файл"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "грешка при проверка � „fsck“ на пакетните обекти"
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "не може да �е получи информаци� чрез „stat“ за шаблона „%s“"
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "директори�та „%s“ не може да бъде отворена"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "връзката „%s“ не може да бъде прочетена"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "не може да �е �ъздаде �имволна връзка „%s“ в „%s“"
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "„%s“ не може да �е копира в „%s“"
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "игнориране на шаблона „%s“"
 
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "н�ма шаблони в „%s“"
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "шаблоните н�ма да бъдат копирани от „%s“: „%s“"
 
-#: builtin/init-db.c:334
+#: builtin/init-db.c:263
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "неправилно име на първоначални� клон: „%s“"
+
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "файлове от вид %d не �е поддържат"
 
-#: builtin/init-db.c:337
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "„%s“ не може да �е преме�ти в „%s“"
 
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:373
+msgid "attempt to reinitialize repository with different hash"
+msgstr ""
+"опит за повторно задаване на първото подаване в хранилището � различна "
+"контролна �ума"
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "Директори�та „%s“ вече �ъще�твува"
 
-#: builtin/init-db.c:413
+#: builtin/init-db.c:432
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: „--initial-branch=%s“ �е пропу�ка"
+
+#: 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:414
+#: 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:418
+#: 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:419
+#: 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:468
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -14739,27 +17257,43 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=ДИРЕКТОРИЯ_С_Ш�БЛО�И] [--"
 "shared[=ПР�В�]] [ДИРЕКТОРИЯ]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "права"
 
-#: builtin/init-db.c:492
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 "указване, че хранилището на Git ще бъде �поделено от повече от един "
 "потребител"
 
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: builtin/init-db.c:551
+msgid "override the name of the initial branch"
+msgstr "задаване на името на първоначални� клон"
+
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "алгоритъм"
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "опциите „--separate-git-dir“ и „--bare“ �а не�ъвме�тими"
+
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/init-db.c:538
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "не може да �е влезе в директори�та „%s“"
 
-#: builtin/init-db.c:559
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -14768,11 +17302,15 @@ msgstr ""
 "%s (или --work-tree=ДИРЕКТОРИЯ) изи�ква указването на %s (или --git-"
 "dir=ДИРЕКТОРИЯ)"
 
-#: builtin/init-db.c:587
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Работното дърво в „%s“ е недо�тъпно"
 
+#: builtin/init-db.c:684
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "опци�та „--separate-git-dir“ е не�ъвме�тима � голо хранилище"
+
 #: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -14821,10 +17359,6 @@ msgstr "опции при анализ"
 msgid "do not treat --- specially"
 msgstr "„---“ н�ма �пециално значение"
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "епилог"
-
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "епилози за добав�не"
@@ -14837,125 +17371,132 @@ msgstr "опци�та „--trailer“ е не�ъвме�тима � „--name-
 msgid "no input file given for in-place editing"
 msgstr "не е зададен входен файл за редактиране на м��то"
 
-#: builtin/log.c:55
+#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [ОПЦИЯ…] [ДИ�П�ЗО�_��_ВЕРСИИТЕ] [[--] ПЪТ…]"
 
-#: builtin/log.c:56
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
 
-#: builtin/log.c:109
+#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "неправилна опци� „--decorate“: %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:180
 msgid "show source"
 msgstr "извеждане на изходни� код"
 
-#: builtin/log.c:174
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
 msgstr ""
-"Използване на файл за �ъответ�тви�та на имената и адре�ите на е-поща („."
+"използване на файл за �ъответ�тви�та на имената и адре�ите на е-поща („."
 "mailmap“)"
 
-#: builtin/log.c:176
+#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr "�пециален формат �амо на указателите напа�ващи на Ш�БЛО�а"
 
-#: builtin/log.c:178
+#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr "без �пециален формат на указателите напа�ващи на Ш�БЛО�а"
 
-#: builtin/log.c:179
+#: builtin/log.c:187
 msgid "decorate options"
 msgstr "на�тройки на форма̀та на извежданата информаци�"
 
-#: builtin/log.c:182
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
 msgstr ""
-"Обработване �амо на редовете във файла в диапазона от n до m включително.  "
-"Броенето започва от 1"
+"про�лед�ване на еволюци�та на диапазона от редове ��Ч�ЛО,КР�Й или :ФУ�КЦИЯта "
+"във Ф�ЙЛа"
 
-#: builtin/log.c:280
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "опци�та „-LДИ�П�ЗО�:Ф�ЙЛ“ не може да �е ползва � път"
+
+#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Резултат: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: повреден файл"
 
-#: builtin/log.c:549 builtin/log.c:644
+#: builtin/log.c:586 builtin/log.c:676
 #, c-format
 msgid "could not read object %s"
 msgstr "обектът не може да бъде прочетен: %s"
 
-#: builtin/log.c:669
+#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr "неизве�тен вид: %d"
 
-#: builtin/log.c:792
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: неправилно придружаващо пи�мо от режима на опи�ание"
+
+#: builtin/log.c:853
 msgid "format.headers without value"
 msgstr "не е зададена �тойно�т на „format.headers“"
 
-#: builtin/log.c:909
-msgid "name of output directory is too long"
-msgstr "прекалено дълго име на директори�та за изходната информаци�"
-
-#: builtin/log.c:925
+#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "файлът-кръпка „%s“ не може да бъде отворен"
 
-#: builtin/log.c:942
+#: builtin/log.c:999
 msgid "need exactly one range"
 msgstr "тр�бва да зададете точно един диапазон"
 
-#: builtin/log.c:952
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr "не е диапазон"
 
-#: builtin/log.c:1075
+#: builtin/log.c:1173
 msgid "cover letter needs email format"
 msgstr "придружаващото пи�мо тр�бва да е форматирано като е-пи�мо"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
 msgstr "неу�пешно �ъздаване на придружаващо пи�мо"
 
-#: builtin/log.c:1160
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "неправилен формат на заглавната ча�т за отговор „in-reply-to“: %s"
 
-#: builtin/log.c:1187
+#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИ�П�ЗО�_��_ВЕРСИИТЕ]"
 
-#: builtin/log.c:1245
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "може да укажете мак�имум една директори� за изход"
 
-#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
 #, c-format
 msgid "unknown commit %s"
 msgstr "непознато подаване: „%s“"
 
-#: builtin/log.c:1366 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 "„%s“ не е указател или не �очи към нищо"
 
-#: builtin/log.c:1371
+#: builtin/log.c:1522
 msgid "could not find exact merge base"
 msgstr "точната база за �ливане не може да бъде открита"
 
-#: builtin/log.c:1375
+#: 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"
@@ -14963,283 +17504,310 @@ msgid ""
 msgstr ""
 "�ледени�т клон не може да бъде у�тановен.  �ко и�кате ръчно да го\n"
 "зададете, използвайте „git branch --set-upstream-to“.\n"
-"Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“."
+"Може ръчно да зададете базово подаване чрез „--"
+"base=<ИДЕ�ТИФИК�ТОР_��_Б�ЗОВО_ПОД�В��Е>“."
 
-#: builtin/log.c:1395
+#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr "точната база при �ливане не може да бъде открита"
 
-#: builtin/log.c:1406
+#: builtin/log.c:1572
 msgid "base commit should be the ancestor of revision list"
 msgstr "базовото подаване тр�бва да е предше�твеникът на �пи�ъка � вер�иите"
 
-#: builtin/log.c:1410
+#: builtin/log.c:1582
 msgid "base commit shouldn't be in revision list"
 msgstr "базовото подаване не може да е в �пи�ъка � вер�иите"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr "идентификаторът на кръпката не може да бъде получен"
 
-#: builtin/log.c:1515
-msgid "failed to infer range-diff ranges"
-msgstr "неу�пешно определ�не на диапазоните за разлика"
+#: builtin/log.c:1703
+msgid "failed to infer range-diff origin of current series"
+msgstr ""
+"неу�пешно определ�не на началото на диапазонната разлика на текущата поредица"
+
+#: builtin/log.c:1705
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr ""
+"„%s“ �е ползва като началото на диапазонната разлика на текущата поредица"
 
-#: builtin/log.c:1560
+#: builtin/log.c:1749
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "номераци� „[PATCH n/m]“ дори и при един�твена кръпка"
 
-#: builtin/log.c:1563
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr "номераци� „[PATCH]“ дори и при множе�тво кръпки"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "извеждане на кръпките на �тандартни� изход"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr "�ъздаване на придружаващо пи�мо"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1760
 msgid "use simple number sequence for output file names"
 msgstr "про�та чи�лова по�ледователно�т за имената на файловете-кръпки"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "З��ЦИ"
 
-#: builtin/log.c:1573
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr "използване на тези З��ЦИ за �уфик� вме�то „.patch“"
 
-#: builtin/log.c:1575
+#: builtin/log.c:1764
 msgid "start numbering patches at <n> instead of 1"
 msgstr "номерирането на кръпките да започва от този БРОЙ, а не � 1"
 
-#: builtin/log.c:1577
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "номер на редакци�"
+
+#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr "отбел�зване, че това е N-тата поредна редакци� на поредицата от кръпки"
 
-#: builtin/log.c:1579
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Използване на „[RFC PATCH]“ вме�то „[PATCH]“"
+#: builtin/log.c:1768
+msgid "max length of output filename"
+msgstr "мак�имална дължина на име на в�еки пакетен файл"
 
-#: builtin/log.c:1582
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Използване на този „[ПРЕФИКС]“ вме�то „[PATCH]“"
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "използване на „[RFC PATCH]“ вме�то „[PATCH]“"
+
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr "режим-придружаващо-пи�мо-по-опи�ание"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"генериране на ча�тите на придружаващото пи�мо на базата на опи�анието на "
+"клона"
+
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "използване на този „[ПРЕФИКС]“ вме�то „[PATCH]“"
+
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr "без добав�не/махане на префик�а „[PATCH]“"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1785
 msgid "don't output binary diffs"
 msgstr "без извеждане на разлики между двоични файлове"
 
-#: builtin/log.c:1593
+#: builtin/log.c:1787
 msgid "output all-zero hash in From header"
 msgstr "в заглавната ча�т „From:“ (от) контролната �ума да е �амо от нули"
 
-#: builtin/log.c:1595
+#: builtin/log.c:1789
 msgid "don't include a patch matching a commit upstream"
 msgstr "без кръпки, които при�ъ�тват в �ледени� клон"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1791
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "извеждане във формат за кръпки, а на в �тандартни� (кръпка и �тати�тика)"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1793
 msgid "Messaging"
 msgstr "Опции при изпращане"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1794
 msgid "header"
 msgstr "З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "добав�не на тази З�ГЛ�В��_Ч�СТ"
 
-#: builtin/log.c:1602 builtin/log.c:1604
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "Е-ПОЩ�"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "добав�не на заглавна ча�т „To:“ (до)"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "добав�не на заглавна ча�т „Cc:“ (и до)"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "ИДЕ�ТИЧ�ОСТ"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1799
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "задаване на адре�а в заглавната ча�т „From“ (от) да е тази ИДЕ�ТИЧ�ОСТ.  �ко "
 "не е зададена такава, �е взима адре�а на подаващи�"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1610
+#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 "първото �ъобщение да е в отговор на е-пи�мото � този "
 "ИДЕ�ТИФИК�ТОР_��_СЪОБЩЕ�ИЕ"
 
-#: builtin/log.c:1611 builtin/log.c:1614
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "граница"
 
-#: builtin/log.c:1612
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "прикреп�не на кръпката"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "включване на кръпката в тек�та на пи�мата"
 
-#: builtin/log.c:1619
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "използване на нишки за �ъобщени�та.  СТИЛът е „shallow“ (плитък) или "
 "„deep“ (дълбок)"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "подпи�"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "добав�не на поле за подпи�"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "Б�ЗОВО_ПОД�В��Е"
 
-#: builtin/log.c:1624
+#: builtin/log.c:1816
 msgid "add prerequisite tree info to the patch series"
 msgstr "добав�не на необходимото Б�Зово дърво към поредицата от кръпки"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "добав�не на подпи� от файл"
 
-#: builtin/log.c:1627
+#: builtin/log.c:1820
 msgid "don't print the patch filenames"
 msgstr "без извеждане на имената на кръпките"
 
-#: builtin/log.c:1629
+#: builtin/log.c:1822
 msgid "show progress while generating patches"
 msgstr "извеждане на напредъка във фазата на �ъздаване на кръпките"
 
-#: builtin/log.c:1631
+#: builtin/log.c:1824
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "показване на промените �пр�мо ВЕРСи�та в придружаващото пи�мо или един�твена "
 "кръпка"
 
-#: builtin/log.c:1634
+#: builtin/log.c:1827
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "показване на промените �пр�мо указател� на ВЕРСи�та в придружаващото пи�мо "
 "или един�твена кръпка"
 
-#: builtin/log.c:1636
+#: builtin/log.c:1829 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "процент за претегл�не при оценка на �ъздаването"
 
-#: builtin/log.c:1711
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "грешна идентично�т: %s"
 
-#: builtin/log.c:1726
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
 msgstr "опциите „-n“ и „-k“ �а не�ъвме�тими"
 
-#: builtin/log.c:1728
+#: builtin/log.c:1933
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ �а не�ъвме�тими"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
 msgstr "опци�та „--name-only“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1738
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
 msgstr "опци�та „--name-status“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1740
+#: builtin/log.c:1945
 msgid "--check does not make sense"
 msgstr "опци�та „--check“ е не�ъвме�тима � генерирането на кръпки"
 
-#: builtin/log.c:1773
-msgid "standard output, or directory, which one?"
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
 msgstr ""
-"изходът може да или �тандартни�т, или да е в директори�, но не и двете."
+"опциите „--stdout“, „--output“ и „--output-directory“ �а не�ъвме�тими една � "
+"друга"
 
-#: builtin/log.c:1877
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 "опци�та „--interdiff“ изи�ква опци� „--cover-letter“ или един�твена кръпка"
 
-#: builtin/log.c:1881
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr "Разлика в разликите:"
 
-#: builtin/log.c:1882
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Разлика в разликите �пр�мо v%d:"
 
-#: builtin/log.c:1888
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr "опци�та „--creation-factor“ изи�ква опци� „--range-diff“"
 
-#: builtin/log.c:1892
+#: builtin/log.c:2104
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 "опци�та „--range-diff“ изи�ква опци� „--cover-letter“ или един�твена кръпка"
 
-#: builtin/log.c:1900
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr "Диапазонна разлика:"
 
-#: builtin/log.c:1901
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Диапазонна разлика �пр�мо v%d:"
 
-#: builtin/log.c:1912
+#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "файлът „%s“ � подпи� не може да бъде прочетен"
 
-#: builtin/log.c:1948
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "Създаване на кръпки"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2204
 msgid "failed to create output files"
 msgstr "неу�пешно �ъздаване на изходни файлове"
 
-#: builtin/log.c:2051
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [ОТД�ЛЕЧЕ�_КЛО� [ВРЪХ [ПРЕДЕЛ]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15247,112 +17815,116 @@ msgstr ""
 "Следени�т отдалечен клон не бе открит, затова изрично задайте "
 "ОТД�ЛЕЧЕ�_КЛО�.\n"
 
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [ОПЦИЯ…] [Ф�ЙЛ…]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:619
 msgid "identify the file status with tags"
 msgstr "извеждане на �ъ�то�нието на файловете � еднобуквени флагове"
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:621
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "малки букви за файловете, които да �е �четат за непроменени"
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:623
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "малки букви за файловете за командата „fsmonitor clean“"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:625
 msgid "show cached files in the output (default)"
 msgstr "извеждане на кешираните файлове (�тандартно)"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:627
 msgid "show deleted files in the output"
 msgstr "извеждане на изтритите файлове"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:629
 msgid "show modified files in the output"
 msgstr "извеждане на променените файлове"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:631
 msgid "show other files in the output"
 msgstr "извеждане на другите файлове"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:633
 msgid "show ignored files in the output"
 msgstr "извеждане на игнорираните файлове"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:636
 msgid "show staged contents' object name in the output"
 msgstr "извеждане на името на обекта за �ъдържанието на индек�а"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:638
 msgid "show files on the filesystem that need to be removed"
 msgstr "извеждане на файловете, които тр�бва да бъдат изтрити"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:640
 msgid "show 'other' directories' names only"
 msgstr "извеждане �амо на името на другите (не�ледените) директории"
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:642
 msgid "show line endings of files"
 msgstr "извеждане на знаците за край на ред във файловете"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:644
 msgid "don't show empty directories"
 msgstr "без извеждане на празните директории"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:647
 msgid "show unmerged files in the output"
 msgstr "извеждане на не�летите файлове"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr "извеждане на информаци�та за отм�на на разрешените подавани�"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:651
 msgid "skip files matching pattern"
 msgstr "пре�качане на файловете напа�ващи Ш�БЛО�а"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:654
 msgid "exclude patterns are read from <file>"
 msgstr "шаблоните за игнориране да �е прочетат от този Ф�ЙЛ"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:657
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 "изчитане на допълнителните шаблони за игнориране по директори� от този Ф�ЙЛ"
 
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
 msgstr "добав�не на �тандартно игнорираните от Git файлове"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:663
 msgid "make the output relative to the project top directory"
 msgstr "пътищата да �а отно�ителни �пр�мо о�новната директори� на проекта"
 
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
 msgstr "рекур�ивно обхождане подмодулите"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:668
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "грешка, ако н�кой от тези Ф�ЙЛове не е в индек�а"
 
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:669
 msgid "tree-ish"
 msgstr "УК�З�ТЕЛ_КЪМ_ДЪРВО"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:670
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "�читане, че пътищата изтрити �лед УК�З�ТЕЛ�_КЪМ_ДЪРВО в�е още �ъще�твуват"
 
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr "извеждане на информаци�та за изчи�тване на грешки"
 
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+msgstr "без повтар�не на запи�ите"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -15363,39 +17935,39 @@ msgstr ""
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [ХР��ИЛИЩЕ [УК�З�ТЕЛ…]]"
 
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "без извеждане на адре�ите на отдалечените хранилища"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
 msgid "exec"
 msgstr "КОМ��Д�"
 
-#: 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 "път към командата „git-upload-pack“ на отдалечената машина"
 
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "�амо етикетите"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "�амо върховете"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "без про�лед�ване на непреките етикети"
 
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "взимане предвид на „url.Б�З�.insteadOf“"
 
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "изход � код 2, ако не �е откри�т �ъвпадащи указатели"
 
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "извеждане на указател� заедно � обекта �очен от него"
 
@@ -15437,201 +18009,359 @@ msgstr ""
 "извеждане на ц�лото дърво, не �амо на текущата директори� (включва опци�та "
 "„--full-name“)"
 
+#. 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  ПЪТ ПЪТ"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "запазване на темата"
+
+#: 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 ""
+"копиране на идентификатора на �ъобщение „Message-ID“ в кра� на �ъобщението "
+"при подаване"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr ""
+"прекодиране на метаданните към зададеното в „i18n.commitEncoding“ кодиране"
+
+#: 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 "ДЕЙСТВИЕ"
+
+#: 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
 msgid "empty mbox: '%s'"
 msgstr "празна пощен�ка кути� mbox: „%s“"
 
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [ОПЦИЯ…] [ПОД�В��Е…]"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] ПОД�В��Е ПОД�В��Е…"
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus ПОД�В��Е…"
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent ПОД�В��Е…"
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor ПОД�В��Е_1 ПОД�В��Е_2"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point УК�З�ТЕЛ [ПОД�В��Е]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "извеждане на в�ички общи предше�твеници"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr ""
+"откриване на предше�твениците за еднократно �ливане на множе�тво и�тории"
 
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "извеждане на недо�тижимите от другите указатели"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "ПОД�В��Е_1 предше�твеник ли е на ПОД�В��Е_2?"
 
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "откриване къде ПОД�В��Ето �е е отклонило от и�тори�та на УК�З�ТЕЛ�"
 
-#: builtin/merge.c:118
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [ОПЦИЯ…] [-L ИМЕ_1 [-L ОРИГИ��Л [-L ИМЕ_2]]] Ф�ЙЛ_1 ОРИГ_Ф�ЙЛ "
+"Ф�ЙЛ_2"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "извеждане на резултатите на �тандартни� изход"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "�ливане на базата на „diff3“"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "при конфликти да �е ползва локалната вер�и�"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "при конфликти да �е ползва чуждата вер�и�"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "при конфликти да �е ползва обединена вер�и�"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "при конфликти да �е ползва маркер � такъв БРОЙ знаци"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "без предупреждени� при конфликти"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "задаване на етикети за Ф�ЙЛ_1/ОРИГИ��Л/Ф�ЙЛ_2"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "непозната опци�: „%s“"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "неу�пешен анализ на обекта „%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] "не �е поддържа повече от %d база.  „%s“ �е пре�кача."
+msgstr[1] "не �е поддържат повече от %d бази.  „%s“ �е пре�кача."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "поддържа �е �амо �ливане на точно две и�тории."
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "указател�т „%s“ не може да бъде изтрит"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Сливане на „%s“ � „%s“\n"
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [ОПЦИЯ…] [ПОД�В��Е…]"
+
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
 msgstr "опци�та „-m“ изи�ква �тойно�т"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:146
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "опци�та „%s“ изи�ква �тойно�т"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:199
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "��ма такава �тратеги� за �ливане: „%s“.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr "�аличните �тратегии �а:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:205
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Допълнителните �тратегии �а:"
 
-#: builtin/merge.c:244 builtin/pull.c:152
+#: builtin/merge.c:256 builtin/pull.c:133
 msgid "do not show a diffstat at the end of the merge"
 msgstr "без извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:247 builtin/pull.c:155
+#: builtin/merge.c:259 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr "извеждане на �тати�тиката �лед завършване на �ливане"
 
-#: builtin/merge.c:248 builtin/pull.c:158
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(п�евдоним на „--stat“)"
 
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:262 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "добав�не (на мак�имум такъв БРОЙ) запи�и от �ъкратени� журнал в �ъобщението "
 "за подаване"
 
-#: builtin/merge.c:253 builtin/pull.c:167
+#: builtin/merge.c:265 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr "�ъздаване на едно подаване вме�то извършване на �ливане"
 
-#: builtin/merge.c:255 builtin/pull.c:170
+#: builtin/merge.c:267 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "извършване на подаване при у�пешно �ливане (�тандартно дей�твие)"
 
-#: builtin/merge.c:257 builtin/pull.c:173
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "редактиране на �ъобщението преди подаване"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
 msgstr "позвол�ване на превъртане (�тандартно дей�твие)"
 
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:273 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "преу�танов�ване, ако превъртането е невъзможно"
 
-#: builtin/merge.c:265 builtin/pull.c:183
+#: builtin/merge.c:277 builtin/pull.c:164
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверка, че указаното подаване е � правилен подпи� на GPG"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:493 builtin/rebase.c:1501 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 "СТР�ТЕГИЯ"
 
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "СТР�ТЕГИЯ за �ливане, ко�то да �е ползва"
 
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr "ОПЦИЯ=СТОЙ�ОСТ"
 
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "ОПЦИЯ за избраната �тратеги� за �ливане"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:283
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "СЪОБЩЕ�ИЕ при подаването �ъ� �ливане (при �ъщин�ки �ливани�)"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:290
 msgid "abort the current in-progress merge"
 msgstr "преу�танов�ване на текущото �ливане"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:292
 msgid "--abort but leave index and working tree alone"
 msgstr "преу�танов�ване без пром�на на индек�а и работното дърво"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:294
 msgid "continue the current in-progress merge"
 msgstr "продължаване на текущото �ливане"
 
-#: builtin/merge.c:284 builtin/pull.c:199
+#: builtin/merge.c:296 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "позвол�ване на �ливане на незави�ими и�тории"
 
-#: builtin/merge.c:290
+#: builtin/merge.c:303
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr ""
 "без изпълнение на куките преди подаване и �ливане и при пром�на на "
 "�ъобщението за подаване (pre-merge-commit и commit-msg)"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:320
 msgid "could not run stash."
 msgstr "не може да �е извърши �катаване"
 
-#: builtin/merge.c:312
+#: builtin/merge.c:325
 msgid "stash failed"
 msgstr "неу�пешно �катаване"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:330
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправилен обект: „%s“"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr "неу�пешно прочитане на обект-дърво"
 
-#: builtin/merge.c:386
-msgid " (nothing to squash)"
-msgstr " (н�ма какво да �е вкара)"
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
+msgstr "Вече е обновено (н�ма какво да �е вкара)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Вкарано подаване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:464
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 "Лип�ва �ъобщение при подаване — указател�т „HEAD“ н�ма да бъде обновен\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "„%s“ не �очи към подаване"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:602
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�еправилен низ за на�тройката „branch.%s.mergeoptions“: „%s“"
 
-#: builtin/merge.c:705
+#: builtin/merge.c:728
 msgid "Not handling anything other than two heads merge."
 msgstr "Поддържа �е �амо �ливане на точно две и�тории."
 
-#: builtin/merge.c:719
+#: builtin/merge.c:741
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "�епозната опци� за рекур�ивното �ливане „merge-recursive“: „-X%s“"
 
-#: builtin/merge.c:734
+#: builtin/merge.c:760 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "„%s“ не може да бъде запи�ан"
 
-#: builtin/merge.c:786
+#: builtin/merge.c:812
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "От „%s“ не може да �е чете"
 
-#: builtin/merge.c:795
+#: builtin/merge.c:821
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Сливането н�ма да бъде подадено.  За завършването му и подаването му "
 "използвайте командата „git commit“.\n"
 
-#: builtin/merge.c:801
+#: builtin/merge.c:827
 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"
@@ -15640,11 +18370,11 @@ msgstr ""
 "В �ъобщението при подаване добавете информаци� за причината за\n"
 "�ливането, о�обено ако �ливате обновен отдалечен клон в тематичен клон.\n"
 
-#: builtin/merge.c:806
+#: builtin/merge.c:832
 msgid "An empty message aborts the commit.\n"
 msgstr "Празно �ъобщение предотврат�ва подаването.\n"
 
-#: builtin/merge.c:809
+#: builtin/merge.c:835
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -15653,76 +18383,76 @@ msgstr ""
 "Редовете, които започват � „%c“, ще бъдат пропу�нати, а празно\n"
 "�ъобщение преу�танов�ва подаването.\n"
 
-#: builtin/merge.c:862
+#: builtin/merge.c:888
 msgid "Empty commit message."
 msgstr "Празно �ъобщение при подаване."
 
-#: builtin/merge.c:877
+#: builtin/merge.c:903
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Първи�т етап на �ливането завърши.\n"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:964
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "�еу�пешно автоматично �ливане — коригирайте конфликтите и подайте "
 "резултата.\n"
 
-#: builtin/merge.c:977
+#: builtin/merge.c:1003
 msgid "No current branch."
 msgstr "��ма текущ клон."
 
-#: builtin/merge.c:979
+#: builtin/merge.c:1005
 msgid "No remote for the current branch."
 msgstr "Текущи�т клон не �леди никой."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:1007
 msgid "No default upstream defined for the current branch."
 msgstr "Текущи�т клон не �леди никой клон."
 
-#: builtin/merge.c:986
+#: builtin/merge.c:1012
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�икой клон не �леди клона „%s“ от хранилището „%s“"
 
-#: builtin/merge.c:1043
+#: builtin/merge.c:1069
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "�еправилна �тойно�т „%s“ в �редата „%s“"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1172
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "не може да �е �лее в „%s“: %s"
 
-#: builtin/merge.c:1180
+#: builtin/merge.c:1206
 msgid "not something we can merge"
 msgstr "не може да �е �лее"
 
-#: builtin/merge.c:1283
+#: builtin/merge.c:1316
 msgid "--abort expects no arguments"
 msgstr "опци�та „--abort“ не приема аргументи"
 
-#: builtin/merge.c:1287
+#: builtin/merge.c:1320
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 "�е може да преу�тановите �ливане, защото в момента не �е извършва такова "
 "(лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1296
+#: builtin/merge.c:1338
 msgid "--quit expects no arguments"
 msgstr "опци�та „--quit“ не приема аргументи"
 
-#: builtin/merge.c:1309
+#: builtin/merge.c:1351
 msgid "--continue expects no arguments"
 msgstr "опци�та „--continue“ не приема аргументи"
 
-#: builtin/merge.c:1313
+#: builtin/merge.c:1355
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "В момента не �е извършва �ливане (лип�ва указател „MERGE_HEAD“)."
 
-#: builtin/merge.c:1329
+#: builtin/merge.c:1371
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15730,7 +18460,7 @@ msgstr ""
 "�е �те завършили �ливане.  (Указател�т „MERGE_HEAD“ �ъще�твува).\n"
 "Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1336
+#: builtin/merge.c:1378
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15738,220 +18468,141 @@ msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува).  Подайте промените �и, преди да започнете ново �ливане."
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1381
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 "�е �те завършили отбиране на подаване (указател�т „CHERRY_PICK_HEAD“\n"
 "�ъще�твува)."
 
-#: builtin/merge.c:1353
+#: builtin/merge.c:1395
 msgid "You cannot combine --squash with --no-ff."
-msgstr "Опци�та „--squash“ е не�ъвме�тима � „--no-ff“."
+msgstr "опциите „--squash“ и „--no-ff“ �а не�ъвме�тими."
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1397
 msgid "You cannot combine --squash with --commit."
-msgstr "Опци�та „--squash“ е не�ъвме�тима � „--commit“."
+msgstr "опциите „--squash“ и „--commit“ �а не�ъвме�тими."
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1413
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "�е е указано подаване и на�тройката „merge.defaultToUpstream“ не е зададена."
 
-#: builtin/merge.c:1388
+#: builtin/merge.c:1430
 msgid "Squash commit into empty head not supported yet"
 msgstr "Вкарване на подаване във връх без и�тори� в�е още не �е поддържа"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1432
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 "Понеже върхът е без и�тори�, в�ички �ливани� �а превъртани�, не може да �е "
 "извърши �ъщин�ко �ливане изи�квано от опци�та „--no-ff“"
 
-#: builtin/merge.c:1395
+#: builtin/merge.c:1437
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "„%s“ — не е нещо, което може да �е �лее"
 
-#: builtin/merge.c:1397
+#: builtin/merge.c:1439
 msgid "Can merge only exactly one commit into empty head"
-msgstr "Можете да �леете точно едно подаване във връх без и�тори�"
+msgstr "Може да �леете точно едно подаване във връх без и�тори�"
 
-#: builtin/merge.c:1476
+#: builtin/merge.c:1520
 msgid "refusing to merge unrelated histories"
 msgstr "незави�ими и�тории не може да �е �ле�т"
 
-#: builtin/merge.c:1485
-msgid "Already up to date."
-msgstr "Вече е обновено."
-
-#: builtin/merge.c:1495
+#: builtin/merge.c:1539
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обнов�ване „%s..%s“\n"
 
-#: builtin/merge.c:1537
+#: builtin/merge.c:1585
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Проба �ъ� �ливане в рамките на индек�а…\n"
 
-#: builtin/merge.c:1544
+#: builtin/merge.c:1592
 #, c-format
 msgid "Nope.\n"
 msgstr "�еу�пешно �ливане.\n"
 
-#: builtin/merge.c:1569
-msgid "Already up to date. Yeeah!"
-msgstr "Вече е обновено!"
-
-#: builtin/merge.c:1575
+#: builtin/merge.c:1623
 msgid "Not possible to fast-forward, aborting."
 msgstr "�е може да �е извърши превъртане, преу�танов�ване на дей�твието."
 
-#: builtin/merge.c:1598 builtin/merge.c:1663
+#: builtin/merge.c:1651 builtin/merge.c:1716
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Привеждане на дървото към първоначалното…\n"
 
-#: builtin/merge.c:1602
+#: builtin/merge.c:1655
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Пробване �ъ� �тратеги�та за �ливане „%s“…\n"
 
-#: builtin/merge.c:1654
+#: builtin/merge.c:1707
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "�ико� �тратеги� за �ливане не може да извърши �ливането.\n"
 
-#: builtin/merge.c:1656
+#: builtin/merge.c:1709
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "�еу�пешно �ливане �ъ� �тратеги� „%s“.\n"
 
-#: builtin/merge.c:1665
+#: builtin/merge.c:1718
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr ""
 "Ползва �е �тратеги�та „%s“, ко�то ще подготви дървото за коригиране на "
 "ръка.\n"
 
-#: builtin/merge.c:1677
+#: builtin/merge.c:1732
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "�втоматичното �ливане завърши у�пешно.  Самото подаване не е извършено, "
 "защото бе зададена опци�та „--no-commit“.\n"
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] ПОД�В��Е ПОД�В��Е…"
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus ПОД�В��Е…"
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent ПОД�В��Е…"
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor ПОД�В��Е_1 ПОД�В��Е_2"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point УК�З�ТЕЛ [ПОД�В��Е]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "извеждане на в�ички общи предше�твеници"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr ""
-"откриване на предше�твениците за еднократно �ливане на множе�тво и�тории"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "извеждане на недо�тижимите от другите указатели"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "ПОД�В��Е_1 предше�твеник ли е на ПОД�В��Е_2?"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "откриване къде ПОД�В��Ето �е е отклонило от и�тори�та на УК�З�ТЕЛ�"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-"git merge-file [ОПЦИЯ…] [-L ИМЕ_1 [-L ОРИГИ��Л [-L ИМЕ_2]]] Ф�ЙЛ_1 ОРИГ_Ф�ЙЛ "
-"Ф�ЙЛ_2"
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr "извеждане на резултатите на �тандартни� изход"
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "�ливане на базата на „diff3“"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "при конфликти да �е ползва локалната вер�и�"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "при конфликти да �е ползва чуждата вер�и�"
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr "при конфликти да �е ползва обединена вер�и�"
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr "при конфликти да �е ползва маркер � такъв БРОЙ знаци"
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
 
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "без предупреждени� при конфликти"
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "ПРЕДУПРЕЖДЕ�ИЕ: аргументът-етикет не минава проверка � „fsck“: %s"
 
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "задаване на етикети за Ф�ЙЛ_1/ОРИГИ��Л/Ф�ЙЛ_2"
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "ГРЕШК�: аргументът-етикет не минава проверка � „fsck“: %s"
 
-#: builtin/merge-recursive.c:47
+#: builtin/mktag.c:41
 #, c-format
-msgid "unknown option %s"
-msgstr "непозната опци�: „%s“"
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) никога не тр�бва да задей�тва тази функци�"
 
-#: builtin/merge-recursive.c:53
+#: builtin/mktag.c:56
 #, c-format
-msgid "could not parse object '%s'"
-msgstr "неу�пешен анализ на обекта „%s“"
+msgid "could not read tagged object '%s'"
+msgstr "обектът � етикет не може да бъде прочетен: %s"
 
-#: builtin/merge-recursive.c:57
+#: builtin/mktag.c:59
 #, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "не �е поддържа повече от %d база.  „%s“ �е пре�кача."
-msgstr[1] "не �е поддържат повече от %d бази.  „%s“ �е пре�кача."
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "обектът „%s“ е � етикет за %s, но е %s"
 
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr "поддържа �е �амо �ливане на точно две и�тории."
+#: builtin/mktag.c:97
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "етикетът на �тандартни� вход не преминава �трогата проверка � „fsck“"
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "указател�т „%s“ не може да бъде изтрит"
+#: builtin/mktag.c:100
+msgid "tag on stdin did not refer to a valid object"
+msgstr "етикетът на �тандартни� вход не �очи към правилен обект"
 
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "Сливане на „%s“ � „%s“\n"
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "файлът за етикета не може да бъде запазен"
 
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
@@ -15969,21 +18620,38 @@ msgstr "разрешаване на лип�ващи обекти"
 msgid "allow creation of more than one tree"
 msgstr "разрешаване на �ъздаването на повече от едно дърво"
 
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
-msgstr ""
-"git multi-pack-index [--object-dir=ДИР_ОБЕКТ] (write|verify|expire|repack --"
-"batch-size=Р�ЗМЕР)"
+#: builtin/multi-pack-index.c:10
+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 multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [ОПЦИЯ…] verify"
+
+#: builtin/multi-pack-index.c:16
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [ОПЦИЯ…] expire"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:19
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [ОПЦИЯ…] repack [--batch-size=Р�ЗМЕР]"
+
+#: builtin/multi-pack-index.c:54
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 "ДИРектори�та_�_ОБЕКТи �ъдържа множе�тво двойки пакетни файлове �ъ� "
 "�ъответни� им индек�"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr "предпочитан_пакет"
+
+#: builtin/multi-pack-index.c:70
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr ""
+"пакет, който да �е преизползва при изчи�л�ване на многопакетна битовата ма�ка"
+
+#: builtin/multi-pack-index.c:128
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15991,15 +18659,7 @@ msgstr ""
 "при препакетиране пакетните файлове, които �а � по-малък от този размер, да "
 "�е обедин�ват в пакети � по-гол�м от този размер"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
-msgid "too many arguments"
-msgstr "прекалено много аргументи"
-
-#: builtin/multi-pack-index.c:52
-msgid "--batch-size option is only for 'repack' subcommand"
-msgstr "опци�та „--batch-size“ изи�ква подкомандата „repack“"
-
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:179
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "непозната подкоманда: %s"
@@ -16032,115 +18692,119 @@ msgstr "принудително преме�тване/преименуване
 msgid "skip move/rename errors"
 msgstr "пре�качане на грешките при преме�тване/преименуване"
 
-#: builtin/mv.c:169
+#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "целта „%s“ �ъще�твува и не е директори�"
 
-#: builtin/mv.c:180
+#: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
 
-#: builtin/mv.c:184
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr "неправилен обект"
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 msgid "can not move directory into itself"
 msgstr "директори� не може да �е преме�ти в �ебе �и"
 
-#: builtin/mv.c:190
+#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr "директори� не може да �е преме�ти върху файл"
 
-#: builtin/mv.c:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr "първоначалната директори� е празна"
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 msgid "not under version control"
 msgstr "не е под контрола на Git"
 
 #: builtin/mv.c:227
+msgid "conflicted"
+msgstr "конфликт"
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "целта �ъще�твува"
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "презапи�ване на „%s“"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "Презапи�ването е невъзможно"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr "множе�тво източници за една цел"
 
-#: builtin/mv.c:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "целевата директори� не �ъще�твува"
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, обект: „%s“, цел: „%s“"
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Преименуване на „%s“ на „%s“\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "неу�пешно преименуване на „%s“"
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [ОПЦИЯ…] ПОД�В��Е…"
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [ОПЦИЯ…] --all"
 
-#: builtin/name-rev.c:358
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [ОПЦИЯ…] --stdin"
 
-#: builtin/name-rev.c:415
-msgid "print only names (no SHA-1)"
-msgstr "извеждане �амо на имената (без �умите по SHA1)"
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr "извеждане �амо на имена на базата на указатели (а не имена на обекти)"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "използване �амо на етикетите за именуване на подавани�та"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "използване �амо на указателите напа�ващи на Ш�БЛО�а"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "игнориране на указателите напа�ващи на Ш�БЛО�а"
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr ""
-"извеждане на в�ички подавани�, които могат да бъдат до�тигнати от в�ички "
+"извеждане на в�ички подавани�, които може да бъдат до�тигнати от в�ички "
 "указатели"
 
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "четене от �тандартни� вход"
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "да �е извеждат и недефинираните имена (�тандартна �тойно�т на опци�та)"
 
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "извеждане на идентификаторите на обекти-етикети (за вътрешни нужди)"
 
@@ -16287,7 +18951,7 @@ msgstr "обектът-бележка не може да бъде запи�ан
 msgid "the note contents have been left in %s"
 msgstr "�ъдържанието на бележката е във файла „%s“"
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:576
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "файлът „%s“ не може да бъде отворен или прочетен"
@@ -16333,8 +18997,9 @@ 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
-msgid "too many parameters"
-msgstr "прекалено много параметри"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
+msgstr "прекалено много аргументи"
 
 #: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
@@ -16395,8 +19060,8 @@ msgstr ""
 "опци�та „--stdin“)"
 
 #: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "прекалено малко параметри"
+msgid "too few arguments"
+msgstr "прекалено малко аргументи"
 
 #: builtin/notes.c:538
 #, c-format
@@ -16528,7 +19193,7 @@ msgstr ""
 "резултата � „git notes merge --commit“ или преу�тановете �ливането � "
 "командата „git notes merge --abort“.\n"
 
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:589
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "�е може да �е открие към какво �очи „%s“."
@@ -16546,7 +19211,7 @@ msgstr "опитът за изтриването на не�ъще�твуващ
 msgid "read object names from the standard input"
 msgstr "изчитане на имената на обектите от �тандартни� вход"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "�амо извеждане без дей�твително ока�тр�не"
 
@@ -16562,148 +19227,166 @@ msgstr "УК�З�ТЕЛ_З�_БЕЛЕЖК�"
 msgid "use notes from <notes-ref>"
 msgstr "да �е използва бележката �очена от този УК�З�ТЕЛ_З�_БЕЛЕЖК�"
 
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1735
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "непозната подкоманда: %s"
 
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УК�З�ТЕЛИ | < СПИСЪК_С_ОБЕКТИ]"
 
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [ОПЦИЯ…] ПРЕФИКС_��_ИМЕТО [< СПИСЪК_С_УК�З�ТЕЛИ | < "
 "СПИСЪК_С_ОБЕКТИ]"
 
-#: builtin/pack-objects.c:428
+#: 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: „%s“ не може да �е открие, а �е очакваше при отме�тване "
+"%<PRIuMAX> в пакетни� файл „%s“"
+
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "лоша контролна �ума за пакетирани� обект „%s“"
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "пакетиран обект � грешки за „%s“"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "рекур�ивна разлика за обект „%s“"
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "подредени б�ха %u обекта, а �е очакваха %<PRIu32>"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "неправилен пакетен файл: „%s“"
-
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:1036
 #, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "пакетни�т файл „%s“ не може да бъде повторно отворен"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "неу�пешно тър�ене в преизползван пакетен файл"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "неу�пешно четене от преизползван пакетен файл"
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "очаква �е обект при отме�тване %<PRIuMAX> в пакетни� файл „%s“"
 
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:1155
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "изключване на запи�ването на битовата ма�ка, пакетите �а разделени поради "
 "�тойно�тта на „pack.packSizeLimit“"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:1168
 msgid "Writing objects"
 msgstr "Запи�ване на обектите"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "не може да бъде получена информаци� чрез „stat“ за „%s“"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1281
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "б�ха запи�ани %<PRIu32> обекти, а �е очакваха %<PRIu32>"
 
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1523
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "изключване на запи�ването на битовата ма�ка, защото н�кои обекти н�ма да �е "
 "пакетират"
 
-#: builtin/pack-objects.c:1592
+#: builtin/pack-objects.c:1971
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "прекалено далечно начало на отме�тването за обектите-разлика за „%s“"
 
-#: builtin/pack-objects.c:1601
+#: builtin/pack-objects.c:1980
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "недо�тижимо начало на отме�тването за обектите-разлика за „%s“"
 
-#: builtin/pack-objects.c:1870
+#: builtin/pack-objects.c:2261
 msgid "Counting objects"
 msgstr "Пребро�ване на обектите"
 
-#: builtin/pack-objects.c:2000
-#, c-format
-msgid "unable to get size of %s"
-msgstr "размерът на „%s“ не може да бъде получен"
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c:2426
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "заглавната ча�т на „%s“ не може да бъде анализирана"
 
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
 #, c-format
 msgid "object %s cannot be read"
 msgstr "обектът „%s“ не може да �е прочете"
 
-#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "обектът „%s“ е � неправилна дължина (%<PRIuMAX>, а не %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2125
+#: builtin/pack-objects.c:2536
 msgid "suboptimal pack - out of memory"
 msgstr "неоптимизиран пакет — паметта �върши"
 
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2851
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Делта компре�и�та ще използва до %d нишки"
 
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2990
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
-"обектите, които могат да бъдат до�тигнати от етикета „%s“, не може да бъдат "
+"обектите, които може да бъдат до�тигнати от етикета „%s“, не може да бъдат "
 "пакетирани"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:3076
 msgid "Compressing objects"
 msgstr "Компре�иране на обектите"
 
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:3082
 msgid "inconsistency with delta count"
 msgstr "неправилен брой разлики"
 
-#: builtin/pack-objects.c:2742
+#: 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 ""
+"�тойно�тта на „uploadpack.blobpackfileuri“ тр�бва да е във формат "
+"„СУМ�_��_ОБЕКТ СУМ�_��_П�КЕТ �ДРЕС“ (получена е „%s“)"
+
+#: builtin/pack-objects.c:3164
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"вече има на�тройка за обекта в друг ред „uploadpack."
+"blobpackfileuri“ (получена е „%s“)"
+
+#: builtin/pack-objects.c:3199
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "видът на обекта „%s“ в пакет „%s“ не може да бъде определен"
+
+#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "пакетът „%s“ не може да �е открие"
+
+#: builtin/pack-objects.c:3378
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16712,7 +19395,7 @@ msgstr ""
 "очаква �е идентификатор на краен обект, а не:\n"
 " %s"
 
-#: builtin/pack-objects.c:2748
+#: builtin/pack-objects.c:3384
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16721,267 +19404,285 @@ msgstr ""
 "очаква �е идентификатор на обект, а не:\n"
 " %s"
 
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:3482
 msgid "invalid value for --missing"
 msgstr "неправилна �тойно�т за „--missing“"
 
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
 msgid "cannot open pack index"
 msgstr "индек�ът на пакетни� файл не може да бъде отворен"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3572
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "непакетирани�т обект в „%s“ не може да бъде анализиран"
 
-#: builtin/pack-objects.c:3021
+#: builtin/pack-objects.c:3658
 msgid "unable to force loose object"
 msgstr "о�таването на обекта непакетиран не може да бъде наложено"
 
-#: builtin/pack-objects.c:3113
+#: builtin/pack-objects.c:3788
 #, c-format
 msgid "not a rev '%s'"
 msgstr "„%s“ не е вер�и�"
 
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "неправилна вер�и� „%s“"
 
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3819
 msgid "unable to add recent objects"
-msgstr "�корошните обекти не могат да бъдат добавени"
+msgstr "�корошните обекти не може да бъдат добавени"
 
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3872
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдържана вер�и� на индек�а „%s“"
 
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3876
 #, c-format
 msgid "bad index version '%s'"
 msgstr "неправилна вер�и� на индек�а „%s“"
 
-#: builtin/pack-objects.c:3228
-msgid "do not show progress meter"
-msgstr "без извеждане на напредъка"
-
-#: builtin/pack-objects.c:3230
-msgid "show progress meter"
-msgstr "извеждане на напредъка"
-
-#: builtin/pack-objects.c:3232
-msgid "show progress meter during object writing phase"
-msgstr "извеждане на напредъка във фазата на запазване на обектите"
-
-#: builtin/pack-objects.c:3235
-msgid "similar to --all-progress when progress meter is shown"
-msgstr ""
-"�ъщото дей�твие като опци�та „--all-progress“ при извеждането на напредъка"
-
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3915
 msgid "<version>[,<offset>]"
 msgstr "ВЕРСИЯ[,ОТМЕСТВ��Е]"
 
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3916
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "запазване на индек�а на пакетните файлове във форма̀та � указаната вер�и�"
 
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3919
 msgid "maximum size of each output pack file"
 msgstr "мак�имален размер на в�еки пакетен файл"
 
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3921
 msgid "ignore borrowed objects from alternate object store"
 msgstr "игнориране на обектите заети от други хранилища на обекти"
 
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3923
 msgid "ignore packed objects"
 msgstr "игнориране на пакетираните обекти"
 
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3925
 msgid "limit pack window by objects"
 msgstr "ограничаване на прозореца за пакетиране по брой обекти"
 
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3927
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "ограничаване на прозореца за пакетиране и по памет о�вен по брой обекти"
 
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3929
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "мак�имална дължина на веригата от разлики, ко�то е позволена в пакетни� файл"
 
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3931
 msgid "reuse existing deltas"
 msgstr "преизползване на �ъще�твуващите разлики"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3933
 msgid "reuse existing objects"
 msgstr "преизползване на �ъще�твуващите обекти"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3935
 msgid "use OFS_DELTA objects"
 msgstr "използване на обекти „OFS_DELTA“"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3937
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "�тартиране на нишки за претър�ване на най-добрите �ъвпадени� на разликите"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3939
 msgid "do not create an empty pack output"
 msgstr "без �ъздаване на празен пакетен файл"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3941
 msgid "read revision arguments from standard input"
 msgstr "изчитане на вер�иите от �тандартни� вход"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3943
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничаване до в�е още непакетираните обекти"
 
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3946
 msgid "include objects reachable from any reference"
 msgstr ""
-"включване на в�ички обекти, които могат да �е до�тигнат от произволен "
-"указател"
+"включване на в�ички обекти, които може да �е до�тигнат от произволен указател"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3949
 msgid "include objects referred by reflog entries"
 msgstr "включване и на обектите �очени от запи�ите в журнала на указателите"
 
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3952
 msgid "include objects referred to by the index"
 msgstr "включване и на обектите �очени от индек�а"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr "изчитане на пакетите от �тандартни� вход"
+
+#: builtin/pack-objects.c:3957
 msgid "output pack to stdout"
 msgstr "извеждане на пакета на �тандартни� изход"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3959
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "включване и на обектите-етикети, които �очат към обектите, които ще бъдат "
 "пакетирани"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3961
 msgid "keep unreachable objects"
 msgstr "запазване на недо�тижимите обекти"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3963
 msgid "pack loose unreachable objects"
 msgstr "пакетиране и на недо�тижимите обекти"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3965
 msgid "unpack unreachable objects newer than <time>"
 msgstr "разпакетиране на недо�тижимите обекти, които �а по-нови от това ВРЕМЕ"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3968
 msgid "use the sparse reachability algorithm"
 msgstr "използване на алгоритъм за ча�тична до�тижимо�т"
 
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3970
 msgid "create thin packs"
 msgstr "�ъздаване на �ъкратени пакети"
 
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3972
 msgid "create packs suitable for shallow fetches"
 msgstr "пакетиране подход�що за плитко до�тав�не"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3974
 msgid "ignore packs that have companion .keep file"
 msgstr "игнориране на пакетите, които �а придружени от файл „.keep“"
 
-#: builtin/pack-objects.c:3295
+#: builtin/pack-objects.c:3976
 msgid "ignore this pack"
 msgstr "пропу�кане на този пакет"
 
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3978
 msgid "pack compression level"
 msgstr "ниво на компре�иране при пакетиране"
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3980
 msgid "do not hide commits by grafts"
 msgstr ""
 "извеждане на в�ички родители — дори и тези, които нормално �а �крити при "
 "при�аждани�та"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3982
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "използване на �ъще�твуващи индек�и на база битови ма�ки за у�кор�ване на "
 "пребро�ването на обектите"
 
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3984
 msgid "write a bitmap index together with the pack index"
-msgstr ""
-"запазване и на индек� на база побитова ма�ка, заедно � индек�а за пакета"
+msgstr "запазване и на индек� на база битова ма�ка, заедно � индек�а за пакета"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3988
 msgid "write a bitmap index if possible"
 msgstr "запи�ване на индек�и на база битови ма�ки при възможно�т"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3992
 msgid "handling for missing objects"
 msgstr "как да �е обработват лип�ващите обекти"
 
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3995
 msgid "do not pack objects in promisor packfiles"
 msgstr "без пакетиране на обекти в гарантиращи пакети"
 
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3997
 msgid "respect islands during delta compression"
 msgstr "без пром�на на групите при делта компре�и�"
 
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr "протокол"
+
+#: builtin/pack-objects.c:4000
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "без ползване на на�тройки „uploadpack.blobpackfileuri“ � този протокол"
+
+#: builtin/pack-objects.c:4033
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "веригата � разлики е прекалено дълбока — %d, ще �е ползва %d"
 
-#: builtin/pack-objects.c:3350
+#: builtin/pack-objects.c:4038
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 "Стойно�тта на на�тройката „pack.deltaCacheLimit“ е прекалено гол�ма.  Ще �е "
 "ползва %d"
 
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:4094
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "опци�та „--max-pack-size“ не може да �е използва за �ъздаване на пакетни "
 "файлове за прено�"
 
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:4096
 msgid "minimum pack size limit is 1 MiB"
 msgstr "минимални�т размер на пакетите е 1 MiB"
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:4101
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 "опци�та „--thin“не може да �е използва за �ъздаване на пакетни файлове � "
 "индек�"
 
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:4104
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "опциите „--keep-unreachable“ и „--unpack-unreachable“ �а не�ъвме�тими"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:4110
 msgid "cannot use --filter without --stdout"
 msgstr "опци�та „-filter“ изи�ква „-stdout“"
 
-#: builtin/pack-objects.c:3481
+#: builtin/pack-objects.c:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr "опциите „-filter“ и „--stdin-packs“ �а не�ъвме�тими"
+
+#: builtin/pack-objects.c:4116
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr ""
+"вътрешни�т �пи�ък на указатели и опци�та „--stdin-packs“ �а не�ъвме�тими"
+
+#: builtin/pack-objects.c:4175
 msgid "Enumerating objects"
 msgstr "Избро�ване на обектите"
 
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:4212
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Общо: %<PRIu32> (разлики: %<PRIu32>), преизползвани: %<PRIu32> (разлики: "
+"%<PRIu32>), преизползвани при пакетиране: %<PRIu32>"
+
+#: 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 ""
-"Общо %<PRIu32> (разлики %<PRIu32>), преизползвани %<PRIu32> (разлики "
-"%<PRIu32>)"
+"Командата „git pack-redundant“ е о�тар�ла и пред�тои\n"
+"пълното � премахване.  �ко в�е още � ползвате, добавете\n"
+"опци�та „--i-still-use-this“ на командни� ред и молим да\n"
+"ни изве�тите � е-пи�мо до пощен�ки� �пи�ък:\n"
+"<git@vger.kernel.org>.\n"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16995,81 +19696,77 @@ msgstr "пакетиране на в�ичко"
 msgid "prune loose refs (default)"
 msgstr "ока�тр�не на недо�тижимите указатели (�тандартно)"
 
-#: builtin/prune-packed.c:9
+#: 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-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "Изтриване на повтар�щите �е обекти"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "информаци� за ока�трените обекти"
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
-msgstr "ока�тр�не на обектите по-�тари от това ВРЕМЕ"
+msgstr "об�в�ване на обектите по-�тари от това ВРЕМЕ за о�тарели"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "ограничаване на обхождането до обекти извън гарантиращи пакети"
 
-#: builtin/prune.c:150
+#: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
 msgstr "хранилище � важни обекти не може да �е ока�тр�"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "�еправилна �тойно�т за „%s“: „%s“"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [ОПЦИЯ…] [ХР��ИЛИЩЕ [УК�З�ТЕЛ_��_ВЕРСИЯ…]]"
 
-#: builtin/pull.c:142
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "управление на рекур�ивното до�тав�не на подмодулите"
 
-#: builtin/pull.c:146
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Опции при �ливане"
 
-#: builtin/pull.c:149
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "вна��не на промените чрез пребазиране, а не чрез �ливане"
 
-#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "позвол�ване на превъртани�"
 
-#: builtin/pull.c:186
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/pull.c:167 parse-options.h:340
+msgid "automatically stash/stash pop before and after"
 msgstr "автоматично �катаване/прилагане на �катаното преди и �лед пребазиране"
 
-#: builtin/pull.c:202
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Опции при до�тав�не"
 
-#: builtin/pull.c:212
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "принудително презапи�ване на локални� клон"
 
-#: builtin/pull.c:220
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "брой подмодули издърпани паралелно"
 
-#: builtin/pull.c:320
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "�еправилна �тойно�т за „pull.ff“: „%s“"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -17077,14 +19774,14 @@ msgstr ""
 "Между указателите, които току що до�тавихте, н�ма подход�щ кандидат, върху "
 "който да пребазирате."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:447
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Между указателите, които току що до�тавихте, н�ма подход�щ кандидат, който "
 "да �леете."
 
-#: builtin/pull.c:440
+#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -17092,7 +19789,7 @@ msgstr ""
 "�ай веро�тно �те подали шаблон за указатели, който не е напа�нал � нищо в "
 "отдалеченото хранилище."
 
-#: builtin/pull.c:443
+#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -17103,44 +19800,43 @@ msgstr ""
 "Понеже това не е хранилището по подразбиране на текущи� клон, тр�бва\n"
 "да укажете отдалечени� клон на командни� ред."
 
-#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1248
 msgid "You are not currently on a branch."
 msgstr "Извън в�ички клони."
 
-#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
 msgid "Please specify which branch you want to rebase against."
 msgstr "Укажете върху кой клон и�кате да пребазирате."
 
-#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
 msgid "Please specify which branch you want to merge with."
 msgstr "Укажете кой клон и�кате да �леете."
 
-#: builtin/pull.c:453 builtin/pull.c:468
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
 msgstr "За повече информаци� погледнете ръковод�твото „git-pull(1)“"
 
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1353 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr "ОТД�ЛЕЧЕ�О_ХР��ИЛИЩЕ"
 
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "КЛО�"
 
-#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1246
 msgid "There is no tracking information for the current branch."
 msgstr "Текущи�т клон не �леди никой."
 
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: builtin/pull.c:480
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
-"�ко и�кате да зададете информаци� за �леден клон, можете да направите това � "
+"�ко и�кате да зададете информаци� за �леден клон, може да направите това � "
 "командата:"
 
-#: builtin/pull.c:477
+#: builtin/pull.c:485
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -17149,32 +19845,57 @@ msgstr ""
 "За �ливане е указан отдалечени�т указател „%s“,\n"
 "но такъв не е до�тавен."
 
-#: builtin/pull.c:587
+#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr "недо�тъпно подаване: %s"
 
-#: builtin/pull.c:867
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "без „--verify-signatures“ при пребазиране"
 
-#: builtin/pull.c:922
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "опци�та „--[no-]autostash“ изи�ква „--rebase“"
-
 #: 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 ""
+"�е �е на�ърчава издърпване без указване на �тратеги�та за �ъгла�уване на\n"
+"клоните.  За да заглушите това �ъобщение, изпълнете н�ко� от �ледните\n"
+"команди преди �ледващото издърпване:\n"
+"\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:990
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Обнов�ване на в�е още не�ъздаден клон � промените от индек�а"
 
-#: builtin/pull.c:934
+#: builtin/pull.c:994
 msgid "pull with rebase"
 msgstr "издърпване � пребазиране"
 
-#: builtin/pull.c:935
+#: builtin/pull.c:995
 msgid "please commit or stash them."
 msgstr "тр�бва да подадете или �катаете промените."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:1020
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -17184,7 +19905,7 @@ msgstr ""
 "до�тав�нето обнови върха на текущи� клон.  Работното\n"
 "ви копие бе превърт�но от подаване „%s“."
 
-#: builtin/pull.c:966
+#: builtin/pull.c:1026
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -17201,15 +19922,15 @@ msgstr ""
 "    git reset --hard\n"
 "за връщане към нормално �ъ�то�ние."
 
-#: builtin/pull.c:981
+#: builtin/pull.c:1041
 msgid "Cannot merge multiple branches into empty head."
 msgstr "�е може да �ливате множе�тво клони в празен върхов указател."
 
-#: builtin/pull.c:985
+#: builtin/pull.c:1045
 msgid "Cannot rebase onto multiple branches."
 msgstr "�е може да пребазирате върху повече от един клон."
 
-#: builtin/pull.c:992
+#: builtin/pull.c:1065
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "пребазирането е невъзможно заради локално запи�аните промени по подмодулите"
@@ -17222,11 +19943,11 @@ msgstr "git push [ОПЦИЯ…] [ХР��ИЛИЩЕ [УК�З�ТЕЛ_��_ВЕ
 msgid "tag shorthand without <tag>"
 msgstr "�ъкращение за етикет без ЕТИКЕТ"
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "опци�та „--delete“ приема за цел �амо про�ти имена на указатели"
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -17235,7 +19956,7 @@ msgstr ""
 "За да включите тази опци� за по�то�нно, погледнете документаци�та за "
 "на�тройката „push.default“ в „git help config“."
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -17260,7 +19981,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -17274,7 +19995,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:ИМЕ_��_ОТД�ЛЕЧЕ�ИЯ_КЛО�\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -17288,14 +20009,21 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
-"Текущи�т клон „%s“ �леди н�колко отдалечени клона, не можете про�то да "
+"Текущи�т клон „%s“ �леди н�колко отдалечени клона, не може про�то да "
 "изтла�кате."
 
-#: builtin/push.c:210
+#: 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"
@@ -17307,14 +20035,7 @@ msgstr ""
 "Тр�бва да укажете ко� вер�и� да �е изтла�ка, за обнов�ване на отдалечени� "
 "клон."
 
-#: builtin/push.c:269
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"�е �те указали вер�и� за подаване, а на�тройката „push.default“ е "
-"„nothing“ (нищо без изрично указана вер�и� да не �е изтла�ква)"
-
-#: builtin/push.c:276
+#: 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"
@@ -17328,7 +20049,7 @@ msgstr ""
 "преди отново да изтла�кате промените.  За повече информаци� вижте раздела\n"
 "„Note about fast-forwards“ в �траницата от ръковод�твото „git push --help“."
 
-#: builtin/push.c:282
+#: 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"
@@ -17342,7 +20063,7 @@ msgstr ""
 "информаци� погледнете раздела „Note about fast-forwards“ в �траницата от\n"
 "ръковод�твото „git push --help“."
 
-#: builtin/push.c:288
+#: 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"
@@ -17361,14 +20082,14 @@ msgstr ""
 "�траницата\n"
 "от ръковод�твото „git push --help“."
 
-#: builtin/push.c:295
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Изтла�кването е отхвърлено, защото в отдалеченото хранилище �ъще�твува "
 "етикет,\n"
 "който ще припокриете � етикет от вашето хранилище."
 
-#: builtin/push.c:298
+#: 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"
@@ -17378,102 +20099,118 @@ msgstr ""
 "указател, който вече �очи към обект, който не е подаване, както и тепърва\n"
 "да го промените да �очи към подобен обект.\n"
 
-#: builtin/push.c:359
+#: 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 ""
+"Обнов�ването е отхвърлено, защото върхът на �лед�щи� клон е обнов�ван �лед\n"
+"по�ледното изтегл�не.  Вне�ете отдалечените промени (напр. � командата\n"
+"„git pull…“), преди отново принудително да изтла�кате промените.\n"
+
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Изтла�кване към „%s“\n"
 
-#: builtin/push.c:366
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "ча�т от указателите не б�ха изтла�кани към „%s“"
 
-#: builtin/push.c:541
+#: builtin/push.c:544
 msgid "repository"
 msgstr "хранилище"
 
-#: builtin/push.c:542 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "изтла�кване на в�ички указатели"
 
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "огледално копие на в�ички указатели"
 
-#: builtin/push.c:545
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "изтриване на указателите"
 
-#: builtin/push.c:546
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "изтла�кване на етикетите (не�ъвме�тимо � опциите „--all“ и „--mirror“)"
 
-#: builtin/push.c:549 builtin/send-pack.c:167
+#: builtin/push.c:552 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "принудително обнов�ване"
 
-#: builtin/push.c:551 builtin/send-pack.c:181
+#: builtin/push.c:553 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
-msgstr "УК�З�ТЕЛ:ОЧ�КВ���_СТОЙ�ОСТ"
+msgstr "ИМЕ_��_УК�З�ТЕЛ:ОЧ�КВ���_СТОЙ�ОСТ"
 
-#: builtin/push.c:552 builtin/send-pack.c:182
+#: builtin/push.c:554 builtin/send-pack.c:205
 msgid "require old value of ref to be at this value"
 msgstr "УК�З�ТЕЛ�т тр�бва първоначално да е � тази ОЧ�КВ���_СТОЙ�ОСТ"
 
-#: builtin/push.c:555
+#: builtin/push.c:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr ""
+"изи�кване обнов�вани�та в отдалечените хранилища да �е вна��т и в локалното"
+
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "управление на рекур�ивното изтла�кване на подмодулите"
 
-#: builtin/push.c:557 builtin/send-pack.c:175
+#: builtin/push.c:561 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "използване на �ъкратени пакети"
 
-#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr "програма за получаването на пакети"
 
-#: builtin/push.c:560
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
 
-#: builtin/push.c:563
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "ока�тр�не на указателите, които �а премахнати от локалното хранилище"
 
-#: builtin/push.c:565
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "без изпълнение на куката преди изтла�кване (pre-push)"
 
-#: builtin/push.c:566
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr ""
 "изтла�кване на лип�ващите в отдалеченото хранилище, но �вързани � текущото "
 "изтла�кване, етикети"
 
-#: builtin/push.c:569 builtin/send-pack.c:169
+#: builtin/push.c:572 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "подпи�ване на изтла�кването � GPG"
 
-#: builtin/push.c:571 builtin/send-pack.c:176
+#: builtin/push.c:574 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
 msgstr "изи�кване на атомарни операции от от�рещната �трана"
 
-#: builtin/push.c:589
+#: builtin/push.c:592
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 "опци�та „--delete“ е не�ъвме�тима � опциите  „--all“, „--mirror“ и „--tags“"
 
-#: builtin/push.c:591
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "опци�та „--delete“ изи�ква поне един указател на вер�и�"
 
-#: builtin/push.c:611
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "неправилно указано хранилище „%s“"
 
-#: builtin/push.c:612
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -17495,60 +20232,72 @@ msgstr ""
 "\n"
 "    git push ИМЕ\n"
 
-#: builtin/push.c:627
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
 msgstr "опциите „--all“ и „--tags“ �а не�ъвме�тими"
 
-#: builtin/push.c:629
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "опци�та „--all“ е не�ъвме�тима � указването на вер�и�"
 
-#: builtin/push.c:633
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
 msgstr "опциите „--mirror“ и „--tags“ �а не�ъвме�тими"
 
-#: builtin/push.c:635
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "опци�та „--mirror“ е не�ъвме�тима � указването на вер�и�"
 
-#: builtin/push.c:638
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
 msgstr "опциите „--all“ и „--mirror“ �а не�ъвме�тими"
 
-#: builtin/push.c:642
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "опциите за изтла�кване не тр�бва да �ъдържат знак за нов ред"
 
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr "git range-diff [ОПЦИЯ…] СТ�Р�_Б�З�..СТ�Р_ВРЪХ �ОВ�_Б�З�..�ОВ_ВРЪХ"
 
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [ОПЦИЯ…] СТ�Р_ВРЪХ...�ОВ_ВРЪХ"
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [ОПЦИЯ…] Б�З� СТ�Р_ВРЪХ �ОВ_ВРЪХ"
 
-#: builtin/range-diff.c:21
-msgid "Percentage by which creation is weighted"
-msgstr "Процент за оценка на �ъздаването"
-
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "използване на про�ти цветове за разликите"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "бележки"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "подава �е на командата „git log“"
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "извеждане �амо на информаци�та за първи� диапазон"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "извеждане �амо на информаци�та за втори� диапазон"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
-msgid "no .. in range: '%s'"
-msgstr "„..“ лип�ва в диапазона „%s“"
+msgid "not a commit range: '%s'"
+msgstr "не е диапазон � подавани�: „%s“"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "вариантът � един�твен аргумент изи�ква �иметричен диапазон"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "необходими �а два диапазона � подавани�"
 
@@ -17631,7 +20380,11 @@ msgstr "изчи�тване на грешки в командата „unpack-t
 msgid "suppress feedback messages"
 msgstr "без информационни �ъобщени�"
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Първо тр�бва да коригирате индек�а �и"
+
+#: builtin/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -17639,230 +20392,207 @@ msgstr ""
 "git rebase [-i] [ОПЦИЯ…] [--exec КОМ��Д�] [--onto �ОВ�_Б�З� | --keep-base] "
 "[КЛО�_ИЗТОЧ�ИК [КЛО�]]"
 
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [ОПЦИЯ…] [--exec КОМ��Д�] [--onto �ОВ�_Б�З�] --root [КЛО�]"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "неу�пешно изтриване на �пи�ъка за изпълнение: „%s“"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "„%s“ не може да �е запише."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "Лип�ва указател „HEAD“"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:311
 #, c-format
 msgid "could not create temporary %s"
 msgstr "не може да �е �ъздаде временна директори� „%s“"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:317
 msgid "could not mark as interactive"
 msgstr "невъзможно задаване на интерактивна работа"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:370
 msgid "could not generate todo list"
 msgstr "файлът � командите не може да �е генерира"
 
-#: builtin/rebase.c:383
+#: builtin/rebase.c:412
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "опциите „--upstream“ и „--onto“ изи�кват базово подаване"
 
-#: builtin/rebase.c:438
+#: builtin/rebase.c:481
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [ОПЦИЯ…]"
 
-#: builtin/rebase.c:450
-msgid "keep empty commits"
-msgstr "запазване на празните подавани�"
+#: builtin/rebase.c:494 builtin/rebase.c:1389
+msgid "keep commits which start empty"
+msgstr "запазванe на първоначално празните подавани�"
 
-#: builtin/rebase.c:452 builtin/revert.c:128
+#: builtin/rebase.c:498 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "позвол�ване на празни �ъобщени� при подаване"
 
-#: builtin/rebase.c:453
+#: builtin/rebase.c:500
 msgid "rebase merge commits"
 msgstr "пребазиране на подавани�та �ъ� �ливани�"
 
-#: builtin/rebase.c:455
+#: builtin/rebase.c:502
 msgid "keep original branch points of cousins"
 msgstr ""
 "запазване на първоначалните точки на разклон�ване на �е�трин�ките клони"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:504
 msgid "move commits that begin with squash!/fixup!"
 msgstr "преме�тване на подавани�та, които започват �ъ� „squash!“/“fixup!“"
 
-#: builtin/rebase.c:458
+#: builtin/rebase.c:505
 msgid "sign commits"
 msgstr "подпи�ване на подавани�та"
 
-#: builtin/rebase.c:460 builtin/rebase.c:1427
+#: builtin/rebase.c:507 builtin/rebase.c:1328
 msgid "display a diffstat of what changed upstream"
 msgstr "извеждане на �тати�тика � промените в �ледени� клон"
 
-#: builtin/rebase.c:462
+#: builtin/rebase.c:509
 msgid "continue rebase"
 msgstr "продължаване на пребазирането"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:511
 msgid "skip commit"
 msgstr "пре�качане на подаване"
 
-#: builtin/rebase.c:465
+#: builtin/rebase.c:512
 msgid "edit the todo list"
 msgstr "редактиране на �пи�ъка � команди за изпълнение"
 
-#: builtin/rebase.c:467
+#: builtin/rebase.c:514
 msgid "show the current patch"
 msgstr "извеждане на текущата кръпка"
 
-#: builtin/rebase.c:470
+#: builtin/rebase.c:517
 msgid "shorten commit ids in the todo list"
 msgstr "�ъкратени идентификатори в �пи�ъка за изпълнение"
 
-#: builtin/rebase.c:472
+#: builtin/rebase.c:519
 msgid "expand commit ids in the todo list"
 msgstr "пълни идентификатори в �пи�ъка за изпълнение"
 
-#: builtin/rebase.c:474
+#: builtin/rebase.c:521
 msgid "check the todo list"
 msgstr "проверка на �пи�ъка за изпълнение"
 
-#: builtin/rebase.c:476
+#: builtin/rebase.c:523
 msgid "rearrange fixup/squash lines"
 msgstr ""
 "преподреждане на редовете за вкарване на подавани�та подавани�та в "
 "предходните им �ъ� и без �мени на �ъобщението"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:525
 msgid "insert exec commands in todo list"
 msgstr "вмъкване на командите за изпълнение в �пи�ъка за изпълнение"
 
-#: builtin/rebase.c:479
+#: builtin/rebase.c:526
 msgid "onto"
 msgstr "върху"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict-revision"
 msgstr "ограничена вер�и�"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict revision"
 msgstr "ограничена вер�и�"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:531
 msgid "squash-onto"
 msgstr "подаване, в което другите да �е вкарат"
 
-#: builtin/rebase.c:485
+#: builtin/rebase.c:532
 msgid "squash onto"
 msgstr "подаване, в което другите да �е вкарат"
 
-#: builtin/rebase.c:487
+#: builtin/rebase.c:534
 msgid "the upstream commit"
 msgstr "подаване на източника"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head-name"
 msgstr "име на върха"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head name"
 msgstr "име на върха"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:541
 msgid "rebase strategy"
 msgstr "�тратеги� на пребазиране"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:542
 msgid "strategy-opts"
 msgstr "опции на �тратеги�та"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:543
 msgid "strategy options"
 msgstr "опции на �тратеги�та"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:544
 msgid "switch-to"
 msgstr "преминаване към"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
 msgid "the branch or commit to checkout"
 msgstr "клонът, към който да �е премине"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto-name"
 msgstr "име на база"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto name"
 msgstr "име на база"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "cmd"
 msgstr "команда"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "the command to run"
 msgstr "команда за изпълнение"
 
-#: builtin/rebase.c:503 builtin/rebase.c:1510
+#: builtin/rebase.c:550 builtin/rebase.c:1422
 msgid "automatically re-schedule any `exec` that fails"
 msgstr ""
 "автоматично подаване за повторно изпълнение на командите завършили � неу�пех"
 
-#: builtin/rebase.c:519
+#: builtin/rebase.c:566
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "опциите „--[no-]rebase-cousins“ изи�кват опци�та „--rebase-merges“"
 
-#: builtin/rebase.c:535
+#: builtin/rebase.c:582
 #, c-format
-msgid "%s requires an interactive rebase"
-msgstr "„%s“ изи�ква интерактивно пребазиране"
+msgid "%s requires the merge backend"
+msgstr "„%s“ изи�ква пребазиране"
 
-#: builtin/rebase.c:587
+#: builtin/rebase.c:625
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "не може да �е премине към новата база, зададена � „onto“: „%s“"
 
-#: builtin/rebase.c:602
+#: builtin/rebase.c:642
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "неправилен указател към първоначален връх „orig-head“: „%s“"
 
-#: builtin/rebase.c:627
+#: builtin/rebase.c:667
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "неправилната �тойно�т на „allow_rerere_autoupdate“ �е пре�кача: „%s“"
 
-#: builtin/rebase.c:703
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Път�т „%s“ не може да бъде прочетен"
-
-#: builtin/rebase.c:721
-#, c-format
-msgid "Cannot store %s"
-msgstr "„%s“ не може да бъде запазен"
-
-#: builtin/rebase.c:828
-msgid "could not determine HEAD revision"
-msgstr "не може да �е определи към какво да �очи указател�т „HEAD“"
-
-#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
+#: 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"
@@ -17876,7 +20606,7 @@ msgstr ""
 "За да откажете пребазирането и да �е върнете към първоначалното �ъ�то�ние,\n"
 "изпълнете „git rebase --abort“."
 
-#: builtin/rebase.c:1032
+#: builtin/rebase.c:896
 #, c-format
 msgid ""
 "\n"
@@ -17892,9 +20622,18 @@ msgstr ""
 "\n"
 "    %s\n"
 "\n"
-"В резултат те не могат да �е пребазират."
+"В резултат те не може да �е пребазират."
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1222
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"неправилна �тойно�т „%s“: вариантите �а „drop“ (пре�качане), "
+"„keep“ (запазване) и „ask“ (питане)"
+
+#: builtin/rebase.c:1240
 #, c-format
 msgid ""
 "%s\n"
@@ -17911,7 +20650,7 @@ msgstr ""
 "    git rebase КЛО�\n"
 "\n"
 
-#: builtin/rebase.c:1355
+#: builtin/rebase.c:1256
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17919,186 +20658,197 @@ msgid ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 msgstr ""
-"�ко и�кате да зададете информаци� за �леден клон, можете да направите това � "
+"�ко и�кате да зададете информаци� за �леден клон, може да направите това � "
 "командата:\n"
 "\n"
 "    git branch --set-upstream-to=%s/КЛО� %s\n"
 
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1286
 msgid "exec commands cannot contain newlines"
 msgstr "командите за изпълнение не може да �ъдържат нови редове"
 
-#: builtin/rebase.c:1389
+#: builtin/rebase.c:1290
 msgid "empty exec command"
 msgstr "празна команда за изпълнение"
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1319
 msgid "rebase onto given branch instead of upstream"
 msgstr "пребазиране върху зададени�, а не �ледени� клон"
 
-#: builtin/rebase.c:1420
+#: builtin/rebase.c:1321
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "за текуща база да �е ползва базата за �ливане на клона и �леденото"
 
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1323
 msgid "allow pre-rebase hook to run"
 msgstr "позвол�ване на куката преди пребазиране да �е изпълни"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1325
 msgid "be quiet. implies --no-stat"
 msgstr "без извеждане на информаци�.  Включва опци�та „--no-stat“"
 
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1331
 msgid "do not show diffstat of what changed upstream"
 msgstr "без извеждане на �тати�тика � промените в �ледени� клон"
 
-#: builtin/rebase.c:1433
-msgid "add a Signed-off-by: line to each commit"
-msgstr ""
-"добав�не на ред за подпи� „Signed-off-by“ в �ъобщението на в��ко подаване"
+#: builtin/rebase.c:1334
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "добав�не на епилог за подпи� „Signed-off-by“ към в��ко подаване"
+
+#: builtin/rebase.c:1337
+msgid "make committer date match author date"
+msgstr "датата на подаващи� да отговар� на датата на автора"
+
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr "да �е ползва днешна дата, а не тази на автора"
 
-#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
-msgid "passed to 'git am'"
-msgstr "подава �е на командата „git am“"
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr "п�евдоним на „--reset-author-date“"
 
-#: builtin/rebase.c:1443 builtin/rebase.c:1445
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
 msgid "passed to 'git apply'"
 msgstr "подава �е на командата „git apply“"
 
-#: builtin/rebase.c:1447 builtin/rebase.c:1450
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr "без промени в празните знаци"
+
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "отбиране на в�ички подавани� дори да н�ма промени"
 
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1354
 msgid "continue"
 msgstr "продължаване"
 
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1357
 msgid "skip current patch and continue"
 msgstr "пре�качане на текущата кръпка и продължаване"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1359
 msgid "abort and check out the original branch"
 msgstr "преу�танов�ване и въз�танов�ване на първоначални� клон"
 
-#: builtin/rebase.c:1460
+#: builtin/rebase.c:1362
 msgid "abort but keep HEAD where it is"
 msgstr "преу�танов�ване без пром�на към какво �очи „HEAD“"
 
-#: builtin/rebase.c:1461
+#: builtin/rebase.c:1363
 msgid "edit the todo list during an interactive rebase"
 msgstr "редактиране на файла � команди при интерактивно пребазиране"
 
-#: builtin/rebase.c:1464
+#: builtin/rebase.c:1366
 msgid "show the patch file being applied or merged"
 msgstr "показване на кръпката, ко�то �е прилага или �лива"
 
-#: builtin/rebase.c:1467
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "при пребазиране да �е ползва �тратеги� � прилагане"
+
+#: builtin/rebase.c:1373
 msgid "use merging strategies to rebase"
-msgstr "при пребазиране да �е ползва �тратеги� за �ливане"
+msgstr "при пребазиране да �е ползва �тратеги� �ъ� �ливане"
 
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1377
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 "позвол�ване на потребител� да редактира �пи�ъка � подавани� за пребазиране"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1381
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr "(о�тар�ло) пре�ъздаване на �ливани�та вме�то да �е пре�качат"
+msgstr "(ОСТ�РЯЛО) пре�ъздаване на �ливани�та вме�то да �е пре�качат"
 
-#: builtin/rebase.c:1479
-msgid "preserve empty commits during rebase"
-msgstr "запазване на празните подавани� при пребазиране"
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
+msgstr "как да �е обработват оказалите �е празни подавани�"
 
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1393
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 "преме�тване на подавани�та, които започват �ъ� „squash!“/“fixup!“ при „-i“"
 
-#: builtin/rebase.c:1487
-msgid "automatically stash/stash pop before and after"
-msgstr "автоматично �катаване/прилагане на �катаното преди и �лед пребазиране"
-
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1400
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 "добав�не на редове � команди за изпълнение �лед в��ко подаване в "
 "редактирани� �пи�ък"
 
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1404
 msgid "allow rebasing commits with empty messages"
 msgstr "позвол�ване на пребазиране на подавани� � празни �ъобщени�"
 
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1408
 msgid "try to rebase merges instead of skipping them"
 msgstr "опит за пребазиране на �ливани�та вме�то те да �е пре�качат"
 
-#: builtin/rebase.c:1499
+#: builtin/rebase.c:1411
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 "за доуточн�ването на �ледени� клон, използвайте:\n"
 "\n"
 "    git merge-base --fork-point"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1413
 msgid "use the given merge strategy"
 msgstr "използване на зададената �тратеги�та на �ливане"
 
-#: builtin/rebase.c:1503 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
 msgid "option"
 msgstr "опци�"
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1416
 msgid "pass the argument through to the merge strategy"
 msgstr "аргументът да �е подаде на �тратеги�та за �ливане"
 
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1419
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "пребазиране на в�ички до�тижими подавани� до началното им подаване"
 
-#: builtin/rebase.c:1524
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"поддръжката на „rebase.useBuiltin“ е премахната.\n"
-"За повече информаци� вижте „git help config“."
+#: builtin/rebase.c:1424
+msgid "apply all changes, even those already present upstream"
+msgstr "прилагане на в�ички промени, дори и наличните вече в �леденото"
 
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1442
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 "Изглежда, че �ега �е прилагат кръпки чрез командата „git-am“.  �е може да "
 "пребазирате в момента."
 
-#: builtin/rebase.c:1571
+#: builtin/rebase.c:1483
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 "Опци�та „--preserve-merges“ е о�тар�ла.  Ползвайте „--rebase-merges“ вме�то "
 "не�."
 
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1488
 msgid "cannot combine '--keep-base' with '--onto'"
 msgstr "опциите „--keep-base“ и „--onto“ �а не�ъвме�тими"
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1490
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr "опциите „--keep-base“ и „--root“ �а не�ъвме�тими"
 
-#: builtin/rebase.c:1582
+#: builtin/rebase.c:1494
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "опциите „--root“ и „--fork-point“ �а не�ъвме�тими"
+
+#: builtin/rebase.c:1497
 msgid "No rebase in progress?"
 msgstr "Изглежда в момента не тече пребазиране"
 
-#: builtin/rebase.c:1586
+#: builtin/rebase.c:1501
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "Опци�та „--edit-todo“ е до�тъпна �амо по време на интерактивно пребазиране."
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Указател�т „HEAD“ не може да бъде прочетен"
 
-#: builtin/rebase.c:1621
+#: builtin/rebase.c:1536
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -18106,16 +20856,16 @@ msgstr ""
 "Тр�бва да редактирате в�ички конфликти при �ливането.  След това\n"
 "отбележете коригирането им чрез командата „git add“"
 
-#: builtin/rebase.c:1640
+#: builtin/rebase.c:1555
 msgid "could not discard worktree changes"
-msgstr "промените в работното дърво не могат да бъдат занулени"
+msgstr "промените в работното дърво не може да бъдат занулени"
 
-#: builtin/rebase.c:1659
+#: builtin/rebase.c:1574
 #, c-format
 msgid "could not move back to %s"
 msgstr "връщането към „%s“ е невъзможно"
 
-#: builtin/rebase.c:1704
+#: builtin/rebase.c:1620
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -18136,172 +20886,147 @@ msgstr ""
 "за\n"
 "да не загубите �лучайно промени.\n"
 
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1648
 msgid "switch `C' expects a numerical value"
 msgstr "опци�та „C“ очаква чи�ло за аргумент"
 
-#: builtin/rebase.c:1766
+#: builtin/rebase.c:1690
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "�еизве�тна �тратеги�: „%s“"
 
-#: builtin/rebase.c:1788
+#: builtin/rebase.c:1729
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 "опци�та „--strategy“ изи�ква н�ко� от опциите „--merge“ или „--interactive“"
 
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1759
+msgid "cannot combine apply options with merge options"
+msgstr "опциите за „apply“ �а не�ъвме�тими � опциите за �ливане"
+
+#: builtin/rebase.c:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "�епозната реализаци� на пребазиране: %s"
+
+#: builtin/rebase.c:1802
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr ""
 "опци�та „--reschedule-failed-exec“ изи�ква н�ко� от опциите „--exec“ или „--"
 "interactive“"
 
-#: builtin/rebase.c:1840
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"опциите за „am“ �а не�ъвме�тими � опциите за �ливане или за интерактивна "
-"работа"
-
-#: builtin/rebase.c:1859
+#: builtin/rebase.c:1822
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "опциите „--preserve-merges“ и „--rebase-merges“ �а не�ъвме�тими"
 
-#: builtin/rebase.c:1863
+#: builtin/rebase.c:1826
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 "ГРЕШК�: опциите „--preserve-merges“ и „--reschedule-failed-exec“ �а "
 "не�ъвме�тими"
 
-#: builtin/rebase.c:1887
+#: builtin/rebase.c:1850
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "неправилен �леден клон: „%s“"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1856
 msgid "Could not create new root commit"
 msgstr "�е може да �е �ъздаде ново начално подаване"
 
-#: builtin/rebase.c:1919
+#: builtin/rebase.c:1882
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "„%s“: изи�ква �е точно една база за �ливане � клона"
 
-#: builtin/rebase.c:1922
+#: builtin/rebase.c:1885
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "„%s“: изи�ква �е точно една база за пребазиране"
 
-#: builtin/rebase.c:1930
+#: builtin/rebase.c:1893
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Указател�т „%s“ не �очи към подаване"
 
-#: builtin/rebase.c:1955
+#: builtin/rebase.c:1921
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "Ф�Т�Л�� ГРЕШК�: не �ъще�твува клон „%s“"
 
-#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2414
 #, c-format
 msgid "No such ref: %s"
 msgstr "Такъв указател н�ма: %s"
 
-#: builtin/rebase.c:1974
+#: builtin/rebase.c:1940
 msgid "Could not resolve HEAD to a revision"
 msgstr "Подаването, �очено от указател� „HEAD“, не може да бъде открито"
 
-#: builtin/rebase.c:2012
-msgid "Cannot autostash"
-msgstr "�е може да �е �катае автоматично"
-
-#: builtin/rebase.c:2015
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "�еочакван резултат при �катаване: „%s“"
-
-#: builtin/rebase.c:2021
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Директори�та за „%s“ не може да бъде �ъздадена"
-
-#: builtin/rebase.c:2024
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "�втоматично �катано: „%s“\n"
-
-#: builtin/rebase.c:2027
-msgid "could not reset --hard"
-msgstr "неу�пешно изпълнение на „git reset --hard“"
-
-#: builtin/rebase.c:2036
+#: builtin/rebase.c:1961
 msgid "Please commit or stash them."
 msgstr "Промените тр�бва или да �е подадат, или да �е �ката�т."
 
-#: builtin/rebase.c:2063
-#, c-format
-msgid "could not parse '%s'"
-msgstr "„%s“ не може да �е анализира"
-
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:1997
 #, c-format
 msgid "could not switch to %s"
 msgstr "не може да �е премине към „%s“"
 
-#: builtin/rebase.c:2087
+#: builtin/rebase.c:2008
 msgid "HEAD is up to date."
 msgstr "Указател�т „HEAD“ е напълно актуален."
 
-#: builtin/rebase.c:2089
+#: builtin/rebase.c:2010
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Текущи�т клон „%s“ е напълно актуален.\n"
 
-#: builtin/rebase.c:2097
+#: builtin/rebase.c:2018
 msgid "HEAD is up to date, rebase forced."
 msgstr "Указател�т „HEAD“ е напълно актуален — принудително пребазиране"
 
-#: builtin/rebase.c:2099
+#: builtin/rebase.c:2020
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Текущи�т клон „%s“ е напълно актуален — принудително пребазиране\n"
 
-#: builtin/rebase.c:2107
+#: builtin/rebase.c:2028
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
 
-#: builtin/rebase.c:2114
+#: builtin/rebase.c:2035
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Промените в „%s“:\n"
 
-#: builtin/rebase.c:2117
+#: builtin/rebase.c:2038
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Промените от „%s“ към „%s“:\n"
 
-#: builtin/rebase.c:2142
+#: builtin/rebase.c:2063
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Първо, указател�т „HEAD“ започва да �очи към базата, върху ко�то "
 "пребазирате…\n"
 
-#: builtin/rebase.c:2151
+#: builtin/rebase.c:2072
 msgid "Could not detach HEAD"
 msgstr "Указател�т „HEAD“ не може да �е отдел�"
 
-#: builtin/rebase.c:2160
+#: builtin/rebase.c:2081
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Превъртане на „%s“ към „%s“.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack ДИРЕКТОРИЯ_��_GIT"
 
-#: builtin/receive-pack.c:830
+#: 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"
@@ -18334,7 +21059,7 @@ msgstr ""
 "За да заглушите това �ъобщение, като запазите �тандартното поведение,\n"
 "задайте на�тройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:850
+#: 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"
@@ -18355,11 +21080,11 @@ msgstr ""
 "За да заглушите това �ъобщение, задайте на�тройката\n"
 "„receive.denyDeleteCurrent“ да е „refuse“ (отказ)."
 
-#: builtin/receive-pack.c:1936
+#: builtin/receive-pack.c:2478
 msgid "quiet"
 msgstr "без извеждане на информаци�"
 
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:2492
 msgid "You must specify a directory."
 msgstr "Тр�бва да укажете директори�."
 
@@ -18384,49 +21109,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists УК�З�ТЕЛ"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "„%s“ не е правилна �тойно�т за време"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:609
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Отбел�зване на до�тижимите обекти…"
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:647
 #, c-format
 msgid "%s points nowhere!"
 msgstr "„%s“ не �очи наникъде!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:699
 msgid "no reflog specified to delete"
 msgstr "не е указан журнал � подавани� за изтриване"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:708
 #, c-format
 msgid "not a reflog: %s"
 msgstr "„%s“ не е журнал � подавани�"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:713
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "лип�ва журнал � подавани�та за „%s“"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:759
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "неправилен формат на указател: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:768
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -18434,83 +21159,83 @@ msgstr ""
 "git remote add [-t КЛО�] [-m ОС�ОВЕ�_КЛО�] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] ИМЕ �ДРЕС"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename СТ�РО_ИМЕ �ОВО_ИМЕ"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove ИМЕ"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head ИМЕ (-a | --auto | -d | --delete | КЛО�)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] ИМЕ"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] ИМЕ"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(ГРУП� | "
 "ОТД�ЛЕЧЕ�О_ХР��ИЛИЩЕ)…]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] ИМЕ КЛО�…"
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] ИМЕ"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] ИМЕ �ОВ_�ДРЕС [СТ�Р_�ДРЕС]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add ИМЕ �ОВ_�ДРЕС"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete ИМЕ �ДРЕС"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [ОПЦИЯ…] ИМЕ �ДРЕС"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches ИМЕ КЛО�…"
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add ИМЕ КЛО�…"
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [ОПЦИЯ…] ИМЕ"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [ОПЦИЯ…] ИМЕ"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [ОПЦИЯ…] [ГРУП� | ОТД�ЛЕЧЕ�О_ХР��ИЛИЩЕ…]"
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Обнов�ване на „%s“"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -18518,86 +21243,97 @@ msgstr ""
 "Използването �амо на „--mirror“ е опа�но.  Вме�то това\n"
 "ползвайте „--mirror=fetch“ или „--mirror=push“"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "неправилна �тойно�т за „--mirror“: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
-msgstr "отдалечените клони не могат да бъдат до�тавени"
+msgstr "отдалечените клони не може да бъдат до�тавени"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "вна��не на в�ички етикети и принадлежащите им обекти при до�тав�не"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "може и да не �е до�тав�т никакви етикети (чрез опци�та „--no-tags“)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "клон/и за �ледене"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "о�новен клон"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "на�тройване на отдалечено хранилище, от което да �е издърпва или до�тав�"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 "н�ма �ми�ъл да �е указва о�новен клон при използване на опци�та „--mirror“"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "указването на �ледени клони е �ми�лено �амо за отдалечени хранилища, от "
 "които �е до�тав�"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr "вече �ъще�твува отдалечено хранилище � име „%s“."
 
-#: builtin/remote.c:198 builtin/remote.c:640
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "„%s“ е неправилно име за отдалечено хранилище"
-
-#: builtin/remote.c:238
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "О�новни�т клон „%s“ не може да бъде на�троен"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:355
 #, c-format
 msgid "Could not get fetch map for refspec %s"
-msgstr "Обектите за до�тав�не за указател� „%s“ не могат да бъдат получени"
+msgstr "Обектите за до�тав�не за указател� „%s“ не може да бъдат получени"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr "(�ъвпадащи)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:466
 msgid "(delete)"
 msgstr "(за изтриване)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "„%s“ не може да �е зададе"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"�а�тройката „remote.pushDefault“ � обхват „%s“ в:\n"
+"    %s:%d\n"
+"използва отдалечено хранилище, което вече не �ъще�твува: „%s“"
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "��ма отдалечено хранилище на име „%s“"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:710
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Разделът „%s“ в на�тройките не може да бъде преименуван на „%s“"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18608,17 +21344,17 @@ msgstr ""
 "    %s\n"
 "  Променете на�тройките ръчно, ако е необходимо."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
 msgstr "неу�пешно �ъздаване на „%s“"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18632,121 +21368,121 @@ msgstr[1] ""
 "Бележка: ��колко клона извън йерархи�та „refs/remotes/“ не б�ха изтрити.\n"
 "Изтрийте ги чрез командата:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Разделът „%s“ в на�тройките не може да бъде изтрит"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:999
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " нов (�ледващото до�тав�не ще го разположи в „remotes/%s“)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " �леден"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " �тар (изтрийте чрез „git remote prune“)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr " не��но �ъ�то�ние"
 
 # CHECK
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 "неправилен клон за �ливане „%s“.  �евъзможно е да пребазирате върху повече "
 "от 1 клон"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "интерактивно пребазиране върху отдалечени� клон „%s“"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1058
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "интерактивно пребазиране (�ъ� �ливани�) върху отдалечени� клон „%s“"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "пребазиране върху отдалечени� клон „%s“"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr " �ливане � отдалечени� клон „%s“"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "�ливане � отдалечени� клон „%s“"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    и � отдалечени� клон „%s“\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
 msgid "create"
 msgstr "�ъздаден"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr "изтрит"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "актуален"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
 msgstr "може да �е превърти"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "локални�т е изо�танал"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s принудително изтла�ква към %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s изтла�ква към %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s принудително изтла�ква към %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s изтла�ква към %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr "без за�вки към отдалечените хранилища"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "� отдалечено хранилище „%s“"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  �дре� за до�тав�не: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr "(без адре�)"
 
@@ -18754,25 +21490,25 @@ msgstr "(без адре�)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  �дре� за изтла�кване: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  клон �очен от HEAD: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr "(без проверка)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "(непознат)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -18781,170 +21517,161 @@ msgstr ""
 "хранилище\n"
 "  не е еднозначен и е н�кой от �ледните):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Отдалечен клон:%s"
 msgstr[1] "  Отдалечени клони:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr " (�ъ�то�нието не бе проверено)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
 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:1215
+#: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Локалните указатели ще бъдат прене�ени чрез „ push“"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1303
 #, 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:1242
+#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "задаване на refs/remotes/ИМЕ/HEAD �поред отдалеченото хранилище"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr "�е може да �е у�танови отдалечени�т връх"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Множе�тво клони � върхове.  Изберете изрично н�кой от т�х чрез командата:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr "„%s“ не може да бъде изтрит"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�еправилен указател: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr "„%s“ не може да �е на�трои"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
 msgstr "„%s“ ще �е превърне в обект извън клоните!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr "„%s“ �е превърна в обект извън клоните!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "Ока�тр�не на „%s“"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "адре�: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr " � [ще бъде ока�трено] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr " � [ока�трено] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr "ока�тр�не на огледалата на отдалечените хранилища �лед до�тав�не"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr "��ма отдалечено хранилище на име „%s“"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "добав�не на клон"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr "не е указано отдалечено хранилище"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
 msgid "query push URLs rather than fetch URLs"
 msgstr "запитване към адре�ите за изтла�кване, а не за до�тав�не"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "извеждане на в�ички адре�и"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "не е зададен адре� за отдалеченото хранилище „%s“"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "пром�на на адре�ите за изтла�кване"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "добав�не на адре�и"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "изтриване на адре�и"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
 msgstr "опциите „--add“ и „--delete“ �а не�ъвме�тими"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "�еправилен (�тар) формат за адре�: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Такъв адре� не е открит: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
 msgstr "�икой от адре�ите, които не �а за изтла�кване, н�ма да �е изтрие"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "повече подробно�ти.  По�тав� �е пред подкоманда"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "�епозната подкоманда: %s"
-
-#: builtin/repack.c:23
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr "git repack [ОПЦИЯ…]"
 
-#: builtin/repack.c:28
+#: builtin/repack.c:31
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18953,147 +21680,157 @@ msgstr ""
 "Ползвайте опци�та --no-write-bitmap-index или изключете на�тройката\n"
 "„pack.writebitmaps“."
 
-#: builtin/repack.c:191
+#: builtin/repack.c:198
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "командата „pack-objects“ не може да �е �тартира за препакетирането на "
 "гарантиращите обекти"
 
-#: builtin/repack.c:230 builtin/repack.c:409
+#: builtin/repack.c:270 builtin/repack.c:630
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
-"repack: от „pack-objects“ �е очакват редове �амо � пълни ше�тнай�етични "
+"repack: от „pack-objects“ �е изи�кват редове �амо � пълни ше�тнай�етични "
 "указатели."
 
-#: builtin/repack.c:247
+#: builtin/repack.c:294
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "командата „pack-objects“ не може да завърши за препакетирането на "
 "гарантиращите обекти"
 
-#: builtin/repack.c:285
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr "грешка при отвар�не на индек�а за „%s“"
+
+#: builtin/repack.c:368
+#, 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
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "пакет „%s“ е твърде гол�м за �виване"
+
+#: builtin/repack.c:460
 msgid "pack everything in a single pack"
 msgstr "пакетиране на в�ичко в пакет"
 
-#: builtin/repack.c:287
+#: builtin/repack.c:462
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 "�ъщото като опци�та „-a“.  Допълнително — недо�тижимите обекти да �танат "
 "непакетирани"
 
-#: builtin/repack.c:290
+#: builtin/repack.c:465
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 "премахване на ненужните пакетирани файлове и изпълнение на командата „git-"
 "prune-packed“"
 
-#: builtin/repack.c:292
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "подаване на опци�та „--no-reuse-delta“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:294
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 "подаване на опци�та „--no-reuse-object“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:296
+#: builtin/repack.c:471
 msgid "do not run git-update-server-info"
 msgstr "без изпълнение на командата „git-update-server-info“"
 
-#: builtin/repack.c:299
+#: builtin/repack.c:474
 msgid "pass --local to git-pack-objects"
 msgstr "подаване на опци�та „--local“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:301
+#: builtin/repack.c:476
 msgid "write bitmap index"
 msgstr "�ъздаване и запи�ване на индек�и на база битови ма�ки"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:478
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "подаване на опци�та „--delta-islands“ на командата „git-pack-objects“"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:479
 msgid "approxidate"
 msgstr "еври�тична дата"
 
-#: builtin/repack.c:305
+#: builtin/repack.c:480
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 "при комбинирането � опци�та „-A“ — без разпакетиране на обектите по �тари от "
 "това"
 
-#: builtin/repack.c:307
+#: builtin/repack.c:482
 msgid "with -a, repack unreachable objects"
 msgstr "� „-a“ — препакетиране на недо�тижимите обекти"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:484
 msgid "size of the window used for delta compression"
 msgstr "размер на прозореца за делта компре�и�та"
 
-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr "байтове"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:486
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "�ъщото като горната опци�, но ограничението да е по размер на паметта, а не "
 "по бро� на обектите"
 
-#: builtin/repack.c:313
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr "ограничаване на мак�ималната дълбочина на делтата"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:490
 msgid "limits the maximum number of threads"
 msgstr "ограничаване на мак�имални� брой нишки"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:492
 msgid "maximum size of each packfile"
 msgstr "мак�имален размер на в�еки пакет"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:494
 msgid "repack objects in packs marked with .keep"
 msgstr "препакетиране на обектите в пакети бел�зани � „.keep“"
 
-#: builtin/repack.c:321
+#: builtin/repack.c:496
 msgid "do not repack this pack"
 msgstr "без препакетиране на този пакет"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr "откриване на геометрична прогре�и� � ча�тно <N>"
+
+#: builtin/repack.c:508
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "пакетите в хранилище � важни обекти не може да �е три�т"
 
-#: builtin/repack.c:335
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
-msgstr "Опциите „--keep-unreachable“ и „-A“ �а не�ъвме�тими"
+msgstr "опциите „--keep-unreachable“ и „-A“ �а не�ъвме�тими"
+
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr "опциите „--geometric“ и „-A“/„-a“ �а не�ъвме�тими"
 
-#: builtin/repack.c:418
+#: builtin/repack.c:639
 msgid "Nothing new to pack."
 msgstr "�ищо ново за пакетиране"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:669
 #, 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 ""
-"ПРЕДУПРЕЖДЕ�ИЕ: За да бъдат заменени � нови вер�ии, н�кои\n"
-"ПРЕДУПРЕЖДЕ�ИЕ: пакетни файлове б�ха преименувани, като към\n"
-"ПРЕДУПРЕЖДЕ�ИЕ: имената им бе добавен префик�ът „old-“.\n"
-"ПРЕДУПРЕЖДЕ�ИЕ: Тази операци� бе неу�пешна, както и обратната\n"
-"ПРЕДУПРЕЖДЕ�ИЕ: ѝ — за връщането на първоначалните имена.\n"
-"ПРЕДУПРЕЖДЕ�ИЕ: Преименувайте файловете в „%s“ ръчно:\n"
+msgid "missing required file: %s"
+msgstr "лип�ва задължителни� файл „%s“"
 
-#: builtin/repack.c:527
+#: builtin/repack.c:671
 #, c-format
-msgid "failed to remove '%s'"
-msgstr "директори�та „%s“ не може да бъде изтрита"
+msgid "could not unlink: %s"
+msgstr "неу�пешно изтриване на „%s“"
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
@@ -19198,8 +21935,8 @@ msgstr "„fstat“ не може да �е изпълни върху „%s“"
 msgid "unable to write object to database"
 msgstr "обектът не може да бъде запи�ан в базата от данни"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
-#: builtin/replace.c:453
+#: 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“"
@@ -19223,17 +21960,17 @@ msgstr "нови�т и �тари�т обект �а един и �ъщ: „%s
 msgid "could not parse %s as a commit"
 msgstr "„%s“ не може да �е анализира като подаване"
 
-#: builtin/replace.c:415
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "етикетът при �ливане в подаването „%s“ e неправилен"
 
-#: builtin/replace.c:417
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "етикетът при �ливане в подаването „%s“ e неправилен"
 
-#: builtin/replace.c:429
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -19242,104 +21979,104 @@ msgstr ""
 "Първоначалното подаване „%s“ �ъдържа етикета при �ливане „%s“, който е "
 "изхвърлен, затова използвайте опци�та „--edit“, а не „--graft“."
 
-#: builtin/replace.c:468
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "първоначалното подаване „%s“ е � подпи� на GPG"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "Подпи�ът ще бъде премахнат в замен�щото подаване!"
 
-#: builtin/replace.c:479
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "замен�щото подаване за „%s“ не може да бъде запи�ано"
 
-#: builtin/replace.c:487
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "при�адката за „%s“ е излишна"
 
-#: builtin/replace.c:491
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "новото и �тарото подаване �а едно и �ъщо: „%s“"
 
-#: builtin/replace.c:526
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
 msgstr ""
-"�ледните при�адки не могат да �е преобразуват:\n"
+"�ледните при�адки не може да �е преобразуват:\n"
 "%s"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "извеждане на �пи�ъка � указателите за зам�на"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "изтриване на указателите за зам�на"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "редактиране на �ъще�твуващ обект"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "�м�на на родителите на подаване"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "преобразуване на файла за при�адките"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "зам�на на указател�, ако �ъще�твува"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "без форматирано извеждане на �ъдържанието — за опци�та „--edit“"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "използване на този ФОРМ�Т"
 
-#: builtin/replace.c:568
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "опци�та „--format“ изи�ква извеждане на �пи�ък"
 
-#: builtin/replace.c:576
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "опци�та „-f“ изи�ква запазването на заме�тител"
 
-#: builtin/replace.c:580
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "опци�та „--raw“ изи�ква „--edit“"
 
-#: builtin/replace.c:586
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "опци�та „-d“ изи�ква поне един аргумент"
 
-#: builtin/replace.c:592
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "неправилен брой аргументи"
 
-#: builtin/replace.c:598
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "опци�та „-e“ изи�ква поне един аргумент"
 
-#: builtin/replace.c:604
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "опци�та „-g“ изи�ква поне един аргумент"
 
-#: builtin/replace.c:610
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "опци�та „--convert-graft-file“ не приема аргументи"
 
-#: builtin/replace.c:616
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "опци�та „-l“ приема точно един шаблон"
 
@@ -19347,15 +22084,15 @@ 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“"
@@ -19367,122 +22104,130 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [ПОД�В��Е]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] УК�З�ТЕЛ_КЪМ_ДЪРВО [--] ПЪТИЩ�…"
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [УК�З�ТЕЛ_КЪМ_ДЪРВО] [--] ПЪТИЩ�…"
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+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
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [УК�З�ТЕЛ_КЪМ_ДЪРВО] [--] [ПЪТИЩ�…]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "�ме�ено (mixed)"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "меко (soft)"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "пълно (hard)"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "�л�то (merge)"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "запазващо (keep)"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "Указател�т „HEAD“ е повреден."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "Дървото, �очено от указател� „HEAD“, не може да бъде открито."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Дървото, �очено от „%s“, не може да бъде открито."
 
-#: builtin/reset.c:114
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "Указател�т „HEAD“ �очи към „%s“"
 
-#: builtin/reset.c:193
+#: builtin/reset.c:195
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "�е може да �е извърши %s занул�ване по време на �ливане."
 
-#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
 msgid "be quiet, only report errors"
 msgstr "по-малко подробно�ти, да �е извеждат �амо грешките"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "индек�а и указател� „HEAD“, без работното дърво"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "�амо указател� „HEAD“, без индек�а и работното дърво"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "указател� „HEAD“, индек�а и работното дърво"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "занул�ване на указател� „HEAD“, но запазване на локалните промени"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "отбел�зване �амо на факта, че изтритите пътища ще бъдат добавени по-къ�но"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:344
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Стойно�тта „%s“ не е разпозната като �ъще�твуваща вер�и�."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:352
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "„%s“ не е разпознат като дърво."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
-"опци�та „--patch“ е не�ъвме�тима � в��ка от опциите „--hard/--mixed/--soft“"
+"опци�та „--patch“ е не�ъвме�тима � в��ка от опциите „--hard“/„--mixed“/„--"
+"soft“"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "опци�та „--mixed“ не бива да �е използва заедно � пътища.  Вме�то това "
 "изпълнете „git reset -- ПЪТ…“."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�е може да извършите %s занул�ване, когато �те задали ПЪТ."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "В голо хранилище не може да извършите %s занул�ване"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
-msgstr "Опци�та „-N“ е �ъвме�тима �амо � „--mixed“"
+msgstr "опци�та „-N“ изи�ква опци�та „--mixed“"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "Промени извън индек�а �лед занул�ването:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:416
 #, c-format
 msgid ""
 "\n"
@@ -19495,48 +22240,60 @@ msgstr ""
 "Опци�та „--quiet“ заглушава това �ъобщение еднократно.  За по�то�нно\n"
 "заглушаване задайте на�тройката „reset.quiet“ да е „true“ (и�тина).\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Индек�ът не може да бъде занулен към вер�и� „%s“."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "�ови�т индек� не може да бъде запи�ан."
 
-#: builtin/rev-list.c:411
+#: builtin/rev-list.c:541
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "опциите „--exclude-promisor-objects“ и „--missing“ и �а не�ъвме�тими"
 
-#: builtin/rev-list.c:472
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "филтрирането на обекти изи�ква опци�та „--objects“"
 
-#: builtin/rev-list.c:522
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "командата „rev-list“ не поддържа извеждането на бележки"
 
-#: builtin/rev-list.c:525
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "опци�та „--use-bitmap-index“ е не�ъвме�тима � филтриране на обектите"
+#: builtin/rev-list.c:679
+msgid "marked counting is incompatible with --objects"
+msgstr "опци�та „--objects“ е не�ъвме�тима � избро�ването"
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [�РГУМЕ�Т…]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "зададени�т низ „--“ да �е тълкува като аргумент"
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "�пиране на анализа �лед първи� аргумент, който не е опци�"
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "изход в дълги� формат"
 
-#: builtin/rev-parse.c:551
+#: 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"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -19551,6 +22308,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 [ОПЦИЯ…] УК�З�ТЕЛ_КЪМ_ПОД�В��Е…"
@@ -19629,19 +22430,19 @@ msgstr "запазване на първоначално празните под
 msgid "keep redundant, empty commits"
 msgstr "запазване на излишните, празни подавани�"
 
-#: builtin/revert.c:232
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr "неу�пешна отм�на"
 
-#: builtin/revert.c:245
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr "неу�пешно отбиране"
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [ОПЦИЯ…] [--] Ф�ЙЛ…"
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -19657,7 +22458,7 @@ msgstr[1] ""
 "�ъдържание и\n"
 "различно от �ъответ�тващото на HEAD:"
 
-#: builtin/rm.c:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -19665,13 +22466,13 @@ msgstr ""
 "\n"
 "(за принудително изтриване използвайте опци�та „-f“)"
 
-#: 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] "�ледни�т файл е � променено �ъдържание в индек�а:"
 msgstr[1] "�ледните файлове �а � променено �ъдържание в индек�а:"
 
-#: 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)"
@@ -19680,46 +22481,50 @@ msgstr ""
 "(за запазване на файла използвайте опци�та „--cached“, а за принудително\n"
 "изтриване — „-f“)"
 
-#: 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] "�ледни�т файл е � променено �ъдържание"
 msgstr[1] "�ледните файлове �а � променено �ъдържание"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:244
 msgid "do not list removed files"
 msgstr "да не �е извеждат изтритите файлове"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr "изтриване �амо от индек�а"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
 msgstr "въпреки проверката за актуално�тта на �ъдържанието"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr "рекур�ивно изтриване"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:249
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 "изходни�т код да е 0, дори ако никой файл нe e напа�нал � шаблона за "
 "изтриване"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:283
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "�е �а зададени пътища.  Кои файлове да �е изтри�т?"
+
+#: builtin/rm.c:310
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "за да продължите, или вкарайте промените по файла „.gitmodules“ в индек�а,\n"
 "или ги �катайте"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:331
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "без използването на опци�та „-r“ „%s“ н�ма да �е изтрие рекур�ивно"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: „%s“ не може да �е изтрие"
@@ -19735,57 +22540,76 @@ msgstr ""
 "pack=П�КЕТ] [--verbose] [--thin] [--atomic] [ХОСТ:]ДИРЕКТОРИЯ [УК�З�ТЕЛ…]\n"
 "  опци�та „--all“ и изричното по�очване на УК�З�ТЕЛ �а взаимно не�ъвме�тими."
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr "име на отдалечено хранилище"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "използване на протокол без запазване на �ъ�то�нието за RPC"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "четене на указателите от �тандартни� вход"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr "извеждане на �ъ�то�нието от отдалечената помощна функци�"
 
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [ОПЦИЯ…] [ДИ�П�ЗО�_��_ВЕРСИИТЕ] [[--] [ПЪТ…]]"
 
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [ОПЦИЯ…]"
 
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "Групиране по подаващ, а не по автор"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "повече от една опции „--group“ �а не�ъвме�тими �ъ� �тандартни� вход"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "опци�та „--group=trailer“ е не�ъвме�тима �ъ� �тандартни� вход"
 
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "неизве�тен вид група: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "групиране по подаващ, а не по автор"
+
+#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "подредба на подавани�та по бро� подавани� от автор"
 
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "Без опи�ани� на подавани�та — да �е показва �амо бро� подавани�"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "без опи�ани� на подавани�та — да �е показва �амо бро� подавани�"
 
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "Извеждане на адре�а на е-поща за в�еки автор"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "извеждане на адре�а на е-поща за в�еки автор"
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<ШИРОЧИ��>[,<ОТСТЪП_1>[,<ОТСТЪП_2>]]"
 
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr ""
-"Прена��не на редовете до тази обща ШИРОЧИ�� (76), � ОТСТЪП_1 (6) за първи� "
-"ред и ОТСТЪП_2 (9) за о�таналите"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "прена��не на редовете"
+
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "поле"
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "групиране по поле"
+
+#: builtin/shortlog.c:391
 msgid "too many arguments given outside repository"
 msgstr "прекалено много аргументи извън хранилище"
 
@@ -19867,7 +22691,7 @@ msgstr "извеждане �амо на подавани�та, които не
 
 #: builtin/show-branch.c:669
 msgid "show merges reachable from only one tip"
-msgstr "извеждане на �ливани�та, които могат да �е до�тигнат �амо от един връх"
+msgstr "извеждане на �ливани�та, които може да �е до�тигнат �амо от един връх"
 
 #: builtin/show-branch.c:671
 msgid "topologically sort, maintaining date order where possible"
@@ -19927,6 +22751,14 @@ msgstr "„%s“ е неправилен указател."
 msgid "cannot find commit %s (%s)"
 msgstr "подаването „%s“ (%s) лип�ва"
 
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "алгоритъм"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "�епознат алгоритъм за контролни �уми"
+
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -19975,41 +22807,121 @@ msgstr ""
 "извеждане на указателите приети от �тандартни� вход, които лип�ват в "
 "локалното хранилище"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: 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) ОПЦИЯ…"
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:72
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"това не е ча�тично работно дърво (веро�тно лип�ва файл „sparse-checkout“)"
+
+#: builtin/sparse-checkout.c:227
+msgid "failed to create directory for sparse-checkout file"
+msgstr "директори�та за ча�тично изтегл�не „%s“ не може да бъде �ъздадена"
+
+#: builtin/sparse-checkout.c:268
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+"на�тройката „worktreeConfig“ не може да �е включи, защото форматът на "
+"хранилището не може да �е обнови"
+
+#: builtin/sparse-checkout.c:270
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "неу�пешно задаване на на�тройката „extensions.worktreeConfig“"
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "инициализиране на ча�тичното изтегл�не в пътеводен режим"
+
+#: 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 "„%s“ не може да �е отвори"
+
+#: builtin/sparse-checkout.c:419
+#, 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
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "цитирането на низ, форматиран за C — „%s“ не може да бъде изчи�тено"
+
+#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "шаблоните за ча�тично изтегл�не не може да �е заред�т"
+
+#: builtin/sparse-checkout.c:579
+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:613
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:644
+msgid "error while refreshing working directory"
+msgstr "грешка при обнов�ване на работната директори�"
+
+#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [ОПЦИЯ…]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [ОПЦИЯ…] [СК�Т��О]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [СК�Т��О]"
 
-#: 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] [СК�Т��О]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch КЛО� [СК�Т��О]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28 builtin/stash.c:77
+#: 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"
+"          [--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 СЪОБЩЕ�ИЕ]\n"
+"          [--pathspec-from-file=Ф�ЙЛ [--pathspec-file-nul]]\n"
 "          [--] [ПЪТ…]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: 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>]"
@@ -20017,191 +22929,230 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [СЪОБЩЕ�ИЕ]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [СК�Т��О]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [СК�Т��О]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message СЪОБЩЕ�ИЕ] [-q|--quiet] ПОД�В��Е"
 
-#: builtin/stash.c:127
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message СЪОБЩЕ�ИЕ]\n"
+"          [--] [ПЪТ…]]"
+
+#: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "„%s“ не е подаване, приличащо на нещо �катано"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Указани �а прекалено много вер�ии:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "�е е открито нищо �катано."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "„%s“ е неправилно име за указател"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
 msgstr "командата „git stash clear“ не поддържа аргументи"
 
-#: builtin/stash.c:403
+#: 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 ""
+"ПРЕДУПРЕЖДЕ�ИЕ: �е�леден файл на м��тото на �леден!  Преименуване\n"
+"            „%s“ на „%s“\n"
+"         за да �е направи м��то.\n"
+
+#: builtin/stash.c:492
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "по време на �ливане не може да приложите нещо �катано"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:503
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "файлът � разликите „%s^!“ не може да �е генерира"
 
-#: builtin/stash.c:421
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:510
+msgid "conflicts in index. Try without --index."
 msgstr ""
 "в индек�а има конфликти.  Пробвайте да изпълните командата без опци�та „--"
 "index“."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:516
 msgid "could not save index tree"
 msgstr "дървото �очено от индек�а не може да бъде запазено"
 
-#: builtin/stash.c:436
+#: builtin/stash.c:525
 msgid "could not restore untracked files from stash"
-msgstr "не�ледени файлове не могат да �е въз�танов�т от �катаното"
+msgstr "не�ледени файлове не може да �е въз�танов�т от �катаното"
 
-#: builtin/stash.c:450
+#: builtin/stash.c:539
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Сливане на „%s“ � „%s“"
 
-#: builtin/stash.c:460 git-legacy-stash.sh:680
+#: builtin/stash.c:549
 msgid "Index was not unstashed."
 msgstr "Индек�ът не е изваден от �катаното."
 
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:591 builtin/stash.c:689
 msgid "attempt to recreate the index"
 msgstr "опит за повторно �ъздаване на индек�а"
 
-#: builtin/stash.c:555
+#: builtin/stash.c:635
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Изтрито: „%s“ (%s)"
 
-#: builtin/stash.c:558
+#: builtin/stash.c:638
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "Скатаното „%s“ не може да бъде изтрито"
 
-#: builtin/stash.c:583
+#: builtin/stash.c:651
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "„%s“ не е указател към нещо �катано"
 
-#: builtin/stash.c:633 git-legacy-stash.sh:694
+#: builtin/stash.c:701
 msgid "The stash entry is kept in case you need it again."
 msgstr "Скатаното е запазено в �лучай, че ви потр�бва отново."
 
-#: builtin/stash.c:656 git-legacy-stash.sh:712
+#: builtin/stash.c:724
 msgid "No branch name specified"
 msgstr "�е е указано име на клон"
 
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "дървото не може да бъде анализирано"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "дървото не може да бъде разпакетирано"
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr "�катаване и на не�ледените файлове"
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr "извеждане �амо на не�ледените файлове в �катаното"
+
+#: builtin/stash.c:929 builtin/stash.c:966
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Указател�т „%s“ не може да бъде обновен да �очи към „%s“"
 
-#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
 msgid "stash message"
 msgstr "�ъобщение при �катаване"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:957
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "командата „git stash store“ изи�ква точно един аргумент-ПОД�В��Е"
 
-#: builtin/stash.c:1046 git-legacy-stash.sh:217
+#: builtin/stash.c:1171
 msgid "No changes selected"
 msgstr "�е �а избрани никакви промени"
 
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1271
 msgid "You do not have the initial commit yet"
 msgstr "В�е още лип�ва първоначално подаване"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1298
 msgid "Cannot save the current index state"
 msgstr "Съ�то�нието на текущи� индек� не може да бъде запазено"
 
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1307
 msgid "Cannot save the untracked files"
-msgstr "�е�ледените файлове не могат да �е запаз�т"
+msgstr "�е�ледените файлове не може да �е запаз�т"
 
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1318 builtin/stash.c:1327
 msgid "Cannot save the current worktree state"
 msgstr "Съ�то�нието на работното дърво не може да бъде запазено"
 
-#: builtin/stash.c:1229 git-legacy-stash.sh:233
+#: builtin/stash.c:1355
 msgid "Cannot record working tree state"
 msgstr "Съ�то�нието на работното дърво не може да бъде запазено"
 
-#: builtin/stash.c:1278 git-legacy-stash.sh:337
+#: builtin/stash.c:1404
 msgid "Can't use --patch and --include-untracked or --all at the same time"
-msgstr "Опци�та „--patch“ е не�ъвме�тима � „--include-untracked“ и „--all“"
+msgstr "опци�та „--patch“ е не�ъвме�тима � „--include-untracked“ и „--all“"
 
-#: builtin/stash.c:1294
+#: builtin/stash.c:1422
 msgid "Did you forget to 'git add'?"
 msgstr "Пробвайте да използвате „git add“"
 
-#: builtin/stash.c:1309 git-legacy-stash.sh:345
+#: builtin/stash.c:1437
 msgid "No local changes to save"
 msgstr "��ма никакви локални промени за �катаване"
 
-#: builtin/stash.c:1316 git-legacy-stash.sh:350
+#: builtin/stash.c:1444
 msgid "Cannot initialize stash"
 msgstr "Скатаването не може да �тартира"
 
-#: builtin/stash.c:1331 git-legacy-stash.sh:354
+#: builtin/stash.c:1459
 msgid "Cannot save the current status"
 msgstr "Текущото �ъ�то�ние не може да бъде запазено"
 
-#: builtin/stash.c:1336
+#: builtin/stash.c:1464
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Съ�то�нието на работната директори� и индек�а e запазено: „%s“"
 
-#: builtin/stash.c:1426 git-legacy-stash.sh:384
+#: builtin/stash.c:1554
 msgid "Cannot remove worktree changes"
-msgstr "Промените в работното дърво не могат да бъдат занулени"
+msgstr "Промените в работното дърво не може да бъдат занулени"
 
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1593 builtin/stash.c:1658
 msgid "keep index"
 msgstr "запазване на индек�а"
 
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1595 builtin/stash.c:1660
 msgid "stash in patch mode"
 msgstr "�катаване в режим за кръпки"
 
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1596 builtin/stash.c:1661
 msgid "quiet mode"
 msgstr "без извеждане на информаци�"
 
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1598 builtin/stash.c:1663
 msgid "include untracked files in stash"
 msgstr "�катаване и на не�ледените файлове"
 
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1600 builtin/stash.c:1665
 msgid "include ignore files"
 msgstr "�катаване и на игнорираните файлове"
 
-#: builtin/stash.c:1564
-#, c-format
-msgid "could not exec %s"
-msgstr "„%s“ не може да �е изпълни"
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"поддръжката на „stash.useBuiltin“ е премахната.\n"
+"За повече информаци� вижте „git help config“."
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -20219,41 +23170,41 @@ msgstr "пропу�кане на в�ички редове, които запо
 msgid "prepend comment character and space to each line"
 msgstr "добав�не на „# “ в началото на в�еки ред"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2423
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Очаква �е пълно име на указател, а не „%s“"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 "командата „print-default-remote“ на „submodule--helper“ не приема аргументи"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "не може да �е махне компонент от адре�а „%s“"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:409 builtin/submodule--helper.c:1819
 msgid "alternative anchor for relative paths"
 msgstr "директори� за определ�нето на отно�ителните пътища"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:414
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:652
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Във файла „.gitmodules“ не е открит адре� за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Влизане в „%s“\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -20262,7 +23213,7 @@ msgstr ""
 "изпълнената команда завърши � ненулев изход за „%s“\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -20273,19 +23224,20 @@ msgstr ""
 "вложени в „%s“\n"
 "."
 
-#: builtin/submodule--helper.c:563
-msgid "Suppress output of entering each submodule command"
-msgstr "Без извеждане на изход при въвеждането на в��ка команда за подмодули"
+#: builtin/submodule--helper.c:565
+msgid "suppress output of entering each submodule command"
+msgstr "без извеждане на изход при въвеждането на в��ка команда за подмодули"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
-msgid "Recurse into nested submodules"
-msgstr "Рекур�ивно обхождане на подмодулите"
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
+msgstr "рекур�ивно обхождане на подмодулите"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] КОМ��Д�"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -20294,103 +23246,156 @@ msgstr ""
 "на�тройката „%s“ лип�ва.  Приема �е, че това хранилище е правилни�т източник "
 "за �ебе �и."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:666
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "�еу�пешно реги�триране на адре� за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:670
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Реги�триран е подмодул „%s“ (%s) за път� към подмодул „%s“\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:680
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: препоръчва �е режим на обнов�ване за подмодула „%s“\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:687
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "�еу�пешно реги�триране на режима на обнов�ване за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:708
-msgid "Suppress output for initializing a submodule"
-msgstr "Без извеждане на информаци� при инициализирането на подмодул"
+#: builtin/submodule--helper.c:709
+msgid "suppress output for initializing a submodule"
+msgstr "без извеждане на информаци� при инициализирането на подмодул"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:714
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [ОПЦИЯ…] [ПЪТ]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "Във файла „.gitmodules“ лип�ва информаци� за път� „%s“"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:835
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "указател�т �очен от „HEAD“ в подмодула „%s“ не може да бъде открит"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "неу�пешно рекур�ивно обхождане на подмодула „%s“"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
-msgid "Suppress submodule status output"
-msgstr "Заглушаване на изхода за �ъ�то�нието на подмодула"
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+msgid "suppress submodule status output"
+msgstr "без изход за �ъ�то�нието на подмодула"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:887
 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 ""
-"Използване на подаването указано в индек�а, а не това от указател� „HEAD“ на "
+"използване на подаването указано в индек�а, а не това от указател� „HEAD“ на "
 "подмодула"
 
-#: builtin/submodule--helper.c:877
-msgid "recurse into nested submodules"
-msgstr "рекур�ивно обхождане на подмодулите"
-
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:893
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:917
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name ПЪТ"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "� %s %s(обект-BLOB)→%s(подмодул)"
+
+#: builtin/submodule--helper.c:992
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "� %s %s(подмодул)→%s(обект-BLOB)"
+
+#: builtin/submodule--helper.c:1005
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1055
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "неу�пешно изчи�л�ване на контролната �ума на обект от „%s“"
+
+#: builtin/submodule--helper.c:1059
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "неочакван режим „%o“\n"
+
+#: builtin/submodule--helper.c:1300
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr ""
+"използване на подаването указано в индек�а, а не това от указател� „HEAD“ на "
+"подмодула"
+
+#: builtin/submodule--helper.c:1302
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr ""
+"�равнение на подаването указано в индек�а � това от указател� „HEAD“ на "
+"подмодула"
+
+#: builtin/submodule--helper.c:1304
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "пре�качане на подмодули, чи�то на�тройка „ignore_config“ е „all“"
+
+#: builtin/submodule--helper.c:1306
+msgid "limit the summary size"
+msgstr "ограничаване на размера на обобщението"
+
+#: builtin/submodule--helper.c:1311
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [ОПЦИЯ…] [ПОД�В��Е] -- [ПЪТ]"
+
+#: builtin/submodule--helper.c:1335
+msgid "could not fetch a revision for HEAD"
+msgstr "не може да �е до�тави вер�и� за „HEAD“"
+
+#: builtin/submodule--helper.c:1340
+msgid "--cached and --files are mutually exclusive"
+msgstr "опциите „--cached“ и „--files“ �а не�ъвме�тими"
+
+#: builtin/submodule--helper.c:1407
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Синхронизиране на адре�а на подмодул за „%s“\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:1413
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "неу�пешно реги�триране на адре� за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1427
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "отдалечени�т адре� на подмодула „%s“ не може да бъде получен"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1438
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "отдалечени�т адре� на подмодула „%s“ не може да бъде променен"
 
-#: builtin/submodule--helper.c:1048
-msgid "Suppress output of synchronizing submodule url"
-msgstr "Без извеждане на информаци� при �инхронизирането на подмодул"
+#: builtin/submodule--helper.c:1485
+msgid "suppress output of synchronizing submodule url"
+msgstr "без извеждане на информаци� при �инхронизирането на подмодул"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1492
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [ПЪТ]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20399,189 +23404,218 @@ msgstr ""
 "Работното дърво на подмодул „%s“ �ъдържа директори� „.git“.\n"
 "(ако и�кате да ги изтриете заедно � ц�лата им и�тори�, използвайте „rm -rf“)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1558
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
-"Работното дърво на подмодул „%s“ �ъдържа локални промени.  Можете да ги "
+"Работното дърво на подмодул „%s“ �ъдържа локални промени.  Може да ги "
 "отхвърлите � опци�та „-f“"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1566
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Директори�та „%s“ е изчи�тена\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 "Директори�та към работното дърво на подмодула „%s“ не може да бъде изтрита\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1579
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "празната директори� за подмодула „%s“ не може да бъде �ъздадена"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1595
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Реги�траци�та на подмодула „%s“ (%s) за път� „%s“ е премахната\n"
 
-#: builtin/submodule--helper.c:1187
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/submodule--helper.c:1624
+msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
-"Изтриване на работните дървета на подмодулите, дори когато те �ъдържат "
+"изтриване на работните дървета на подмодулите, дори когато те �ъдържат "
 "локални промени"
 
-#: builtin/submodule--helper.c:1188
-msgid "Unregister all submodules"
-msgstr "Премахване на реги�трациите на в�ички подмодули"
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
+msgstr "премахване на реги�трациите на в�ички подмодули"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1630
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [ПЪТ…]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1644
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Използвайте „--all“, за да премахнете в�ички подмодули"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1713
+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 ""
+"�лтернативни�т източник, определен от обхващащи� проект е неправилен.\n"
+"За да позволите на git да клонира без алтернативен източник в този �лучай,\n"
+"задайте на�тройката „submodule.alternateErrorStrategy“ да е „info“ или\n"
+"при клониране ползвайте опци�та „--reference-if-able“ вме�то „--reference“."
+
+#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "към подмодула „%s“ не може да �е добави алтернативен източник: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1791
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "�епозната �тойно�т „%s“ за на�тройката „submodule.alternateErrorStrategy“"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1798
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "�епозната �тойно�т „%s“ за на�тройката „submodule.alternateLocation“"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1822
 msgid "where the new submodule will be cloned to"
 msgstr "къде да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1825
 msgid "name of the new submodule"
 msgstr "име на нови� подмодул"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1828
 msgid "url where to clone the submodule from"
 msgstr "адре�, от който да �е клонира нови�т подмодул"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1836
 msgid "depth for shallow clones"
 msgstr "дълбочина на плитките хранилища"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
 msgid "force cloning progress"
 msgstr "извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+msgid "disallow cloning into non-empty directory"
+msgstr "предотврат�ване на клониране в непразна и�тори�"
+
+#: builtin/submodule--helper.c:1848
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХР��ИЛИЩЕ] "
-"[--name ИМЕ] [--depth ДЪЛБОЧИ��] --url �ДРЕС --path ПЪТ…"
+"[--name ИМЕ] [--depth ДЪЛБОЧИ��] [--single-branch] --url �ДРЕС --path ПЪТ"
+
+#: builtin/submodule--helper.c:1873
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+"„%s“ не може нито да �е �ъздаде, нито да �е ползва в директори�та на git на "
+"друг подмодул"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1884
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "�еу�пешно клониране на адре�а „%s“ в път� „%s“ като подмодул"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1888
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "директори�та не е празна: „%s“"
+
+#: builtin/submodule--helper.c:1900
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "директори�та на подмодула „%s“ не може да бъде получена"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1936
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "�еправилен режим на обнов�ване „%s“ за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1940
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "�а�троен е неправилен режим на обнов�ване „%s“ за път� към подмодул „%s“"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:2041
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Път�т на подмодула „%s“ не е инициализиран"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:2045
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Веро�тно и�кахте да използвате „update --init“?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:2075
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Пре�качане на не�лети� подмодул „%s“"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:2104
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Пре�качане на подмодула „%s“"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:2254
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "�еу�пешен опит за клониране на „%s“.  �а�рочен е втори опит"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:2265
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 "Втори неу�пешен опит за клониране на „%s“.  Дей�твието �е преу�танов�ва"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
 msgid "path into the working tree"
 msgstr "път към работното дърво"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:2330
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "път към работното дърво, през границите на вложените подмодули"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:2334
 msgid "rebase, merge, checkout or none"
 msgstr ""
 "„rebase“ (пребазиране), „merge“ (�ливане), „checkout“ (изтегл�не) или "
 "„none“ (нищо да не �е прави)"
 
-#: builtin/submodule--helper.c:1864
-msgid "Create a shallow clone truncated to the specified number of revisions"
-msgstr "Плитко клониране, отр�зано до указани� брой вер�ии"
+#: builtin/submodule--helper.c:2340
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "извършване на плитко клониране, отр�зано до указани� брой вер�ии"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:2343
 msgid "parallel jobs"
 msgstr "брой паралелни проце�и"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2345
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "дали първоначалното клониране да е плитко, както �е препоръчва"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2346
 msgid "don't print cloning progress"
 msgstr "без извеждане на напредъка на клонирането"
 
-#: builtin/submodule--helper.c:1877
+#: builtin/submodule--helper.c:2357
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=ПЪТ] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:2370
 msgid "bad value for update parameter"
 msgstr "неправилен параметър към опци�та „--update“"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:2418
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20590,50 +23624,83 @@ msgstr ""
 "Клонът на подмодула „%s“ е на�троен да на�лед�ва клона от обхващащи� проект, "
 "но той не е на никой клон"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2541
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "не може да �е получи връзка към хранилище за подмодула „%s“"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2574
 msgid "recurse into submodules"
 msgstr "рекур�ивно обхождане подмодулите"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2580
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [ОПЦИЯ…] [ПЪТ…]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2636
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "проверка дали пи�ането във файла „.gitmodules“ е безопа�но"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2639
 msgid "unset the config in the .gitmodules file"
 msgstr "изтриване на на�тройка във файла „.gitmodules“"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2644
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config ИМЕ [СТОЙ�ОСТ]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2645
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset ИМЕ"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2646
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "файлът „.gitmodules“ тр�бва да е в работното дърво"
 
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
+#: builtin/submodule--helper.c:2681
+msgid "suppress output for setting url of a submodule"
+msgstr "без извеждане на информаци� при задаването на адре�а на подмодул"
+
+#: builtin/submodule--helper.c:2685
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] [ПЪТ] [�ОВ_ПЪТ]"
+
+#: builtin/submodule--helper.c:2718
+msgid "set the default tracking branch to master"
+msgstr "задаване на �тандартни� �лед�щ клон да е „master“"
+
+#: builtin/submodule--helper.c:2720
+msgid "set the default tracking branch"
+msgstr "задаване на �тандартни� �лед�щ клон"
+
+#: builtin/submodule--helper.c:2724
+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:2725
+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:2732
+msgid "--branch or --default required"
+msgstr "необходимо е една от опциите „--branch“ и „--default“"
+
+#: builtin/submodule--helper.c:2735
+msgid "--branch and --default are mutually exclusive"
+msgstr "опциите „--branch“ и „--default“ �а не�ъвме�тими"
+
+#: builtin/submodule--helper.c:2792 git.c:449 git.c:724
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "„%s“ не поддържа опци�та „--super-prefix“"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2798
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -20646,23 +23713,23 @@ msgstr "git symbolic-ref [ОПЦИЯ…] ИМЕ [УК�З�ТЕЛ]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] ИМЕ"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "без извеждане на грешка за не�вързани (не�имволни) указатели"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "изтриване на �имволен указател"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "кратка информаци� за указател�"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr "причина"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "причина за обнов�ването"
 
@@ -20682,26 +23749,28 @@ msgstr "git tag -d ЕТИКЕТ…"
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"[<pattern>...]"
 msgstr ""
-"git tag -l [-n[БРОЙ]] [--contains ПОД�В��Е] [--points-at ОБЕКТ]\n"
-"           [--format=ФОРМ�Т] [--[no-]merged [ПОД�В��Е]] [Ш�БЛО�…]"
+"git tag -l [-n[БРОЙ]] [--contains ПОД�В��Е] [--no-contains ПОД�В��Е]\n"
+"           [--points-at ОБЕКТ] [--format=ФОРМ�Т] [--merged ПОД�В��Е]\n"
+"           [--no-merged ПОД�В��Е] [Ш�БЛО�…]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=ФОРМ�Т] ЕТИКЕТ…"
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "етикетът „%s“ не е открит."
 
-#: builtin/tag.c:105
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
 
-#: builtin/tag.c:135
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -20714,7 +23783,7 @@ msgstr ""
 "    %s\n"
 "Редовете, които започват � „%c“, ще бъдат пропу�нати.\n"
 
-#: builtin/tag.c:139
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -20729,15 +23798,11 @@ msgstr ""
 "Редовете, които започват � „%c“, �ъщо ще бъдат включени — може да ги "
 "изтриете вие.\n"
 
-#: builtin/tag.c:198
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "етикетът не може да бъде подпи�ан"
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "файлът за етикета не може да бъде запазен"
-
-#: 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"
@@ -20751,366 +23816,366 @@ msgstr ""
 "\n"
 "    git tag -f %s %s^{}"
 
-#: builtin/tag.c:232
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "неправилен вид обект."
 
-#: builtin/tag.c:284
+#: builtin/tag.c:328
 msgid "no tag message?"
 msgstr "лип�ва �ъобщение за етикета"
 
-#: builtin/tag.c:291
+#: builtin/tag.c:335
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Съобщението за етикета е запазено във файла „%s“\n"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr "извеждане на имената на етикетите"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr "извеждане на този БРОЙ редове от в��ко �ъобщение за етикет"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr "изтриване на етикети"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr "проверка на етикети"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr "Опции при �ъздаването на етикети"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr "анотирането на етикети изи�ква �ъобщение"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:457
 msgid "tag message"
 msgstr "СЪОБЩЕ�ИЕ за етикет"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:459
 msgid "force edit of tag message"
 msgstr "принудително редактиране на �ъобщение за етикет"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr "анотиран етикет � подпи� по GPG"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr "използване на друг ключ за подпи�ването на етикет"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
 msgstr "зам�на на етикета, ако �ъще�твува"
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "�ъздаване на журнал на указателите"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr "Опции за извеждането на етикети"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr "извеждане на �пи�ъка на етикетите по колони"
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that contain the commit"
 msgstr "извеждане �амо на етикетите, които �ъдържат подаването"
 
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:470 builtin/tag.c:472
 msgid "print only tags that don't contain the commit"
 msgstr "извеждане �амо на етикетите, които не �ъдържат подаването"
 
-#: builtin/tag.c:429
+#: builtin/tag.c:473
 msgid "print only tags that are merged"
 msgstr "извеждане �амо на �летите етикети"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:474
 msgid "print only tags that are not merged"
 msgstr "извеждане �амо на не�летите етикети"
 
-#: builtin/tag.c:434
+#: builtin/tag.c:478
 msgid "print only tags of the object"
 msgstr "извеждане �амо на етикетите на ОБЕКТ�"
 
-#: builtin/tag.c:482
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
-msgstr "Опциите „--column“ и „-n“ �а не�ъвме�тими"
+msgstr "опциите „--column“ и „-n“ �а не�ъвме�тими"
 
-#: builtin/tag.c:504
+#: builtin/tag.c:548
 msgid "-n option is only allowed in list mode"
-msgstr "Опци�та „-n“ изи�ква режим на �пи�ък."
+msgstr "опци�та „-n“ изи�ква режим на �пи�ък."
 
-#: builtin/tag.c:506
+#: builtin/tag.c:550
 msgid "--contains option is only allowed in list mode"
-msgstr "Опци�та „-contains“ изи�ква режим на �пи�ък."
+msgstr "опци�та „-contains“ изи�ква режим на �пи�ък."
 
-#: builtin/tag.c:508
+#: builtin/tag.c:552
 msgid "--no-contains option is only allowed in list mode"
-msgstr "Опци�та „-contains“ изи�ква  режим на �пи�ък."
+msgstr "опци�та „-contains“ изи�ква  режим на �пи�ък."
 
-#: builtin/tag.c:510
+#: builtin/tag.c:554
 msgid "--points-at option is only allowed in list mode"
-msgstr "Опци�та „-points-at“ изи�ква режим на �пи�ък."
+msgstr "опци�та „-points-at“ изи�ква режим на �пи�ък."
 
-#: builtin/tag.c:512
+#: builtin/tag.c:556
 msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "Опциите „--merged“ и „--no-merged“ изи�кват режим на �пи�ък."
+msgstr "опциите „--merged“ и „--no-merged“ изи�кват режим на �пи�ък."
 
-#: builtin/tag.c:523
+#: builtin/tag.c:567
 msgid "only one -F or -m option is allowed."
-msgstr "Опциите „-F“ и „-m“ �а не�ъвме�тими."
+msgstr "опциите „-F“ и „-m“ �а не�ъвме�тими."
 
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "Прекалено много аргументи"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:592
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "„%s“ е неправилно име за етикет."
 
-#: builtin/tag.c:553
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "етикетът „%s“ вече �ъще�твува"
 
-#: builtin/tag.c:584
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Обновен етикет „%s“ (бе „%s“)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Разпакетиране на обектите"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "файлът „%s“ не може да бъде �ъздаден"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "файлът „%s“ не може да бъде изтрит"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "директори�та „%s“ не може да бъде изтрита"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Проверка на времето на пром�на (mtime) на файла „%s“"
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "добав�нето на нов файл"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "добав�нето на нова директори�"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та �е промен� �лед "
 "обнов�ването на нов файл"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та �е промен� �лед добав�нето "
 "на файл в поддиректори�"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "изтриването на файл"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "информаци�та получена чрез „stat“ за директори�та не �е промен� �лед "
 "изтриването на директори�"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " Добре"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [ОПЦИЯ…] [--] [Ф�ЙЛ…]"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:976
 msgid "continue refresh even when index needs update"
 msgstr ""
 "продължаване � обнов�ването, дори когато индек�ът тр�бва да бъде обновен"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr "подмодулите да �е игнорират при обнов�ването"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
 msgid "do not ignore new files"
 msgstr "новите файлове да не �е игнорират"
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:984
 msgid "let files replace directories and vice-versa"
-msgstr "файлове да могат да замен�т директории и обратно"
+msgstr "файлове да може да замен�т директории и обратно"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
 msgid "notice files missing from worktree"
 msgstr "предупреждаване при лип�ващи в работното дърво файлове"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:988
 msgid "refresh even if index contains unmerged entries"
 msgstr "обнов�ване дори и индек�ът да �ъдържа не�лети обекти"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:991
 msgid "refresh stat information"
 msgstr "обнов�ване на информаци�та от функци�та „stat“"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 "като опци�та „--refresh“, но да �е провер�т и обектите, които �а били приети "
 "за непроменени"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1000
 msgid "add the specified entry to the index"
 msgstr "добав�не на изброените обекти към индек�а"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1010
 msgid "mark files as \"not changing\""
 msgstr "задаване на флаг, че файлът не �е промен�"
 
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
 msgstr "изчи�тване на флага, че файлът не �е промен�"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
 msgstr "задаване на флаг, че файловете �а �амо за индек�а"
 
-#: builtin/update-index.c:1015
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
-msgstr "изчи�тване на флага,  че файловете �а �амо за индек�а"
+msgstr "изчи�тване на флага, че файловете �а �амо за индек�а"
 
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr "без пром�на на файловете �амо за индек�а"
+
+#: builtin/update-index.c:1024
 msgid "add to index only; do not add content to object database"
 msgstr "добав�не �амо към индек�а без добав�не към базата от данни за обектите"
 
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1026
 msgid "remove named paths even if present in worktree"
 msgstr "изтриване на указаните пътища, дори и да �ъще�твуват в работното дърво"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1028
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 "при комбиниране � опци�та „--stdin“ — входните редове �а разделени � нулеви� "
 "байт"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1030
 msgid "read list of paths to be updated from standard input"
 msgstr "изчитане на �пи�ъка � пътища за обнов�ване от �тандартни� вход"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1034
 msgid "add entries from standard input to the index"
 msgstr "добав�не на елементите от �тандартни� вход към индек�а"
 
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1038
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 "въз�танов�ване на �ъ�то�нието преди �ливане или нужда от обнов�ване за "
 "изброените пътища"
 
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1042
 msgid "only update entries that differ from HEAD"
 msgstr "добав�не �амо на �ъдържанието, което �е различава от това в „HEAD“"
 
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1046
 msgid "ignore files missing from worktree"
 msgstr "игнориране на файловете, които лип�ват в работното дърво"
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1049
 msgid "report actions to standard output"
 msgstr "извеждане на дей�тви�та на �тандартни� изход"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1051
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 "забрав�не на запи�аната информаци� за неразрешени конфликти — за командите "
 "от потребител�ко ниво"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr "запи�ване на индек�а в този формат"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
 msgstr "включване или изключване на раздел�нето на индек�а"
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1059
 msgid "enable/disable untracked cache"
 msgstr "включване/изключване на кеша за не�ледените файлове"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1061
 msgid "test if the filesystem supports untracked cache"
 msgstr "проверка дали файловата �и�тема поддържа кеш за не�ледени файлове"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1063
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "включване на кеша за не�ледените файлове без проверка на файловата �и�тема"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1065
 msgid "write out the index even if is not flagged as changed"
 msgstr "запи� на индек�а, дори да не е отбел�зан като променен"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1067
 msgid "enable or disable file system monitor"
 msgstr "включване или изключване на наблюдението на файловата �и�тема"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1069
 msgid "mark files as fsmonitor valid"
-msgstr "отбел�зване на файловете, че могат да �е �лед�т чрез файловата �и�тема"
+msgstr "отбел�зване на файловете, че може да �е �лед�т чрез файловата �и�тема"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c:1072
 msgid "clear fsmonitor valid bit"
 msgstr "изчи�тване на флага за �леденето чрез файловата �и�тема"
 
-#: builtin/update-index.c:1169
+#: 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“ е зададена на „false“ (лъжа).  Сменете � или � "
+"�а�тройката „core.splitIndex“ е зададена на „false“ (лъжа̀).  Сменете � или � "
 "изтрийте, за да включите раздел�нето на индек�а"
 
-#: builtin/update-index.c:1178
+#: builtin/update-index.c:1184
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -21118,7 +24183,7 @@ msgstr ""
 "�а�тройката „core.splitIndex“ е зададена на „true“ (и�тина).  Сменете � или "
 "� изтрийте, за да изключите раздел�нето на индек�а."
 
-#: builtin/update-index.c:1190
+#: 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"
@@ -21126,41 +24191,41 @@ msgstr ""
 "�а�тройката „core.untrackedCache“ е зададена на „true“ (и�тина).  Сменете � "
 "или � изтрийте, за да изключите кеша за не�ледените файлове"
 
-#: builtin/update-index.c:1194
+#: builtin/update-index.c:1200
 msgid "Untracked cache disabled"
 msgstr "Кешът за не�ледените файлове е изключен"
 
-#: builtin/update-index.c:1202
+#: 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“ е зададена на „false“ (лъжа).  Сменете � "
+"�а�тройката „core.untrackedCache“ е зададена на „false“ (лъжа̀).  Сменете � "
 "или � изтрийте, за да включите кеша за не�ледените файлове"
 
-#: builtin/update-index.c:1206
+#: builtin/update-index.c:1212
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Кешът за не�ледените файлове е включен за „%s“"
 
-#: builtin/update-index.c:1214
+#: builtin/update-index.c:1220
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "�а�тройката „core.fsmonitor“ не е зададена.  Задайте �, за да включите "
 "�леденето чрез файловата �и�тема."
 
-#: builtin/update-index.c:1218
+#: builtin/update-index.c:1224
 msgid "fsmonitor enabled"
 msgstr "�леденето чрез файловата �и�тема е включено"
 
-#: builtin/update-index.c:1221
+#: builtin/update-index.c:1227
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "�а�тройката „core.fsmonitor“ е зададена.  Изтрийте �, за да изключите "
 "�леденето чрез файловата �и�тема."
 
-#: builtin/update-index.c:1225
+#: builtin/update-index.c:1231
 msgid "fsmonitor disabled"
 msgstr "�леденето чрез файловата �и�тема е изключено"
 
@@ -21176,21 +24241,21 @@ msgstr "git update-ref [ОПЦИЯ…] ИМЕ_Ð�Ð�_УКÐ�ЗÐ�ТЕЛ Ð�ОВÐ�_СÐ
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "изтриване на указател�"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
 msgstr "обнов�ване на ИМЕто_��_УК�З�ТЕЛ�, а не това, към което �очи"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 "н�кои от елементите подадени на �тандартни� вход завършват � нулеви� знак "
 "„NUL“"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr "изчитане на указателите от �тандартни� вход"
 
@@ -21235,15 +24300,15 @@ msgstr "извеждане на �ъдържанието на подаванет
 msgid "print raw gpg status output"
 msgstr "извеждане на необработени� изход от �ъ�то�нието на „gpg“"
 
-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] П�КЕТ…"
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "извеждане на подробна информаци�"
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "извеждане �амо на �тати�тиката"
 
@@ -21255,233 +24320,221 @@ msgstr "git verify-tag [-v | --verbose] [--format=ФОРМ�Т] ЕТИКЕТ…"
 msgid "print tag contents"
 msgstr "извеждане на �ъдържанието на ЕТИКЕТи"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [ОПЦИЯ…] ПЪТ [УК�З�ТЕЛ_КЪМ_ПОД�В��Е]"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [ОПЦИЯ…]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move [ДЪРВО] [�ОВ_ПЪТ]"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [ОПЦИЯ…]"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [ОПЦИЯ…] [ДЪРВО]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock [ПЪТ]"
 
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:61 builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "неу�пешно изтриване на „%s“"
 
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
 #, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректори�"
+msgid "Removing %s/%s: %s"
+msgstr "Изтриване на „%s/%s“: %s"
 
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не �ъще�твува"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr ""
-"Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното "
-"(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-"Изтриване на „worktrees/%s“: файлът „gitdir“ �очи не�ъще�твуващо "
-"ме�тоположение"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "докладване на ока�трените работни дървета"
 
-#: builtin/worktree.c:167
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "об�в�ване на работните копи� по-�тари от това ВРЕМЕ за о�тарели"
 
-#: builtin/worktree.c:234
+#: builtin/worktree.c:219
 #, c-format
 msgid "'%s' already exists"
 msgstr "„%s“ вече �ъще�твува"
 
-#: builtin/worktree.c:251
+#: builtin/worktree.c:228
 #, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "дървото „%s“ не може да бъде добавено наново"
+msgid "unusable worktree destination '%s'"
+msgstr "целта не може да �е ползва за работно дърво: „%s“"
 
-#: builtin/worktree.c:256
+#: builtin/worktree.c:233
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 "„%s“ лип�ва, но е заключено работно дърво.\n"
-"За изрично задаване ползвайте „add -f“, а за изчи�тване — „prune“ или "
-"„remove“"
+"За изрично задаване ползвайте „%s -f -f“, а за изчи�тване —\n"
+"„unlock“, „prune“ или „remove“"
 
-#: builtin/worktree.c:258
+#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 "„%s“ лип�ва, но е реги�трирано като работно дърво.\n"
-"За изрично задаване ползвайте „add -f“, а за изчи�тване — „prune“ или "
-"„remove“"
+"За изрично задаване ползвайте „%s -f“, а за изчи�тване —\n"
+"„prune“ или „remove“"
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:286
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "директори�та „%s“ не може да бъде �ъздадена"
 
-#: builtin/worktree.c:439 builtin/worktree.c:445
+#: builtin/worktree.c:308
+msgid "initializing"
+msgstr "инициализаци�"
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Приготв�не на работното дърво (нов клон „%s“)"
 
-#: builtin/worktree.c:441
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "Приготв�не на работното дърво (занул�ване на клона „%s“, който �очеше към "
 "„%s“)"
 
-#: builtin/worktree.c:450
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Приготв�не на работното дърво (изтегл�не на „%s“)"
 
-#: builtin/worktree.c:456
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Подготв�не на работно дърво (указател�т „HEAD“ не �вързан: %s)"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "Изтегл�не КЛО�а, дори и да е изтеглен в друго работно дърво"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "�ъздаване на нов клон"
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "�ъздаване или занул�ване на клони"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "подготв�не на новото работно дърво"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "новото работно дърво да о�тане заключено"
 
-#: builtin/worktree.c:508
+#: 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:511
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "опит за напа�ване на името на нови� клон � това на �лед�щ клон"
 
-#: builtin/worktree.c:519
+#: builtin/worktree.c:506
 msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "Опциите „-b“, „-B“ и „--detach“ �а не�ъвме�тими една � друга"
+msgstr "опциите „-b“, „-B“ и „--detach“ �а не�ъвме�тими една � друга"
+
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr "опци�та „--reason“ изи�ква „--lock“"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "добавена � „--lock“"
 
-#: builtin/worktree.c:580
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "„--[no-]track“ може да �е използва �амо при �ъздаването на нов клон"
 
-#: builtin/worktree.c:680
-msgid "reason for locking"
-msgstr "причина за заключване"
+#: builtin/worktree.c:691
+msgid "show extended annotations and reasons, if available"
+msgstr "извеждане на подробни анотации и об��нени�, ако такива �а налични"
+
+#: builtin/worktree.c:693
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+"добав�не на анотаци� за ока�тр�не на работните копи� по-�тари от това ВРЕМЕ"
+
+#: builtin/worktree.c:702
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "опциите „--verbose“ и „--porcelain“ �а не�ъвме�тими"
 
-#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: 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:694 builtin/worktree.c:727
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "О�новното дърво не може да �е отключи или заключи"
 
-#: builtin/worktree.c:699
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "„%s“ вече е заключено, защото „%s“"
 
-#: builtin/worktree.c:701
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "„%s“ вече е заключено"
 
-#: builtin/worktree.c:729
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "„%s“ не е заключено"
 
-#: builtin/worktree.c:770
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "не може да ме�тите или изтривате работни дървета, в които има подмодули"
 
-#: builtin/worktree.c:778
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "принудително преме�тване, дори работното дърво да не е чи�то или да е "
 "заключено"
 
-#: builtin/worktree.c:801 builtin/worktree.c:928
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "„%s“ е о�новно работно дърво"
 
-#: builtin/worktree.c:806
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "името на целта не може да �е определи от „%s“"
 
-#: builtin/worktree.c:812
-#, c-format
-msgid "target '%s' already exists"
-msgstr "целта „%s“ вече �ъще�твува"
-
-#: builtin/worktree.c:820
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -21490,7 +24543,7 @@ msgstr ""
 "не може да преме�тите заключено работно дърво, причина за заключването: %s\n"
 "или го отключете, или го преме�тете принудително � „move -f -f“"
 
-#: builtin/worktree.c:822
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -21498,41 +24551,41 @@ msgstr ""
 "не може да преме�тите заключено работно дърво:\n"
 "или го отключете, или го преме�тете принудително � „move -f -f“"
 
-#: builtin/worktree.c:825
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 "проверките �а неу�пешни, работното дърво не може да бъде преме�тено: %s"
 
-#: builtin/worktree.c:830
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "„%s“ не може да �е преме�ти в „%s“"
 
-#: builtin/worktree.c:878
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
-msgstr "не може да изпълни „git status“ върху „%s“"
+msgstr "неу�пешно изпълнение на „git status“ върху „%s“"
 
-#: builtin/worktree.c:882
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
-"„%s“ �ъдържа провенени или нови файлове, за принудително изтриване е "
+"„%s“ �ъдържа променени или нови файлове, за принудително изтриване е "
 "необходима опци�та „--force“"
 
-#: builtin/worktree.c:887
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 "командата „git status“ не може да �е изпълни за „%s“, код за грешка: %d"
 
-#: builtin/worktree.c:910
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "принудително изтриване, дори работното дърво да не е чи�то или да е заключено"
 
-#: builtin/worktree.c:933
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -21541,7 +24594,7 @@ msgstr ""
 "не може да изтриете заключено работно дърво, причина за заключването: %s\n"
 "или го отключете, или го изтрийте принудително � „remove -f -f“"
 
-#: builtin/worktree.c:935
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -21549,11 +24602,21 @@ msgstr ""
 "не може да изтриете заключено работно дърво:\n"
 "или го отключете, или го изтрийте принудително � „remove -f -f“"
 
-#: builtin/worktree.c:938
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "проверките �а неу�пешни, работното дърво не може да бъде изтрито: %s"
 
+#: builtin/worktree.c:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr "поправ�не: %s: „%s“"
+
+#: builtin/worktree.c:1011
+#, c-format
+msgid "error: %s: %s"
+msgstr "грешка: %s: „%s“"
+
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=ПРЕФИКС/]"
@@ -21570,68 +24633,25 @@ msgstr "запиÑ� на обект-дърво за поддиректориÑ�Ñ‚Ð
 msgid "only useful for debugging"
 msgstr "�амо за изчи�тване на грешки"
 
-#: fast-import.c:3118
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "очаква �е команда „mark“, а бе получена: „%s“"
-
-#: fast-import.c:3123
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "очаква �е команда „to“, а бе получена: „%s“"
-
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"Правата за до�тъп до директори�та за програмните гнезда �а прекалено "
-"�вободни —\n"
-"другите потребители могат да получат до�тъп до кешираните ви пароли.  За да\n"
-"коригирате това, изпълнете:\n"
-"\n"
-"    chmod 0700 %s"
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "извеждане на �ъобщени�та за тра�иране на �тандартната грешка"
-
-#: t/helper/test-reach.c:152
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "подаването „%s“ не е отбел�зано като до�тижимо"
-
-#: t/helper/test-reach.c:162
-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 [ОПЦИЯ…]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "изход �лед първоначалната об�ва на възможно�тите"
-
-#: git.c:27
+#: git.c:28
 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"
 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "           <command> [<args>]"
 msgstr ""
 "git [--version] [--help] [-C ПЪТ] [-c ИМЕ=СТОЙ�ОСТ]\n"
 "           [--exec-path[=ПЪТ]] [--html-path] [--man-path] [--info-path]\n"
-"           [-p | --paginate | --no-pager] [--no-replace-objects] [--bare]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
 "           [--git-dir=ПЪТ] [--work-tree=ПЪТ] [--namespace=ИМЕ]\n"
+"           [--super-prefix=ПЪТ] [--config-env=ИМЕ=ПРОМЕ�ЛИВ�_��_СРЕД�Т�]\n"
 "           КОМ��Д� [�РГ…]"
 
-#: git.c:34
+#: 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"
@@ -21643,52 +24663,54 @@ msgstr ""
 "въведени�.  За помощ за �пецифична КОМ��Д� ползвайте „git help КОМ��Д�“, а "
 "за\n"
 "н�кое определено ПО�ЯТИЕ използвайте „git help ПО�ЯТИЕ“.  За преглед на\n"
-"�и�темата за помощ използвайте „git help git“.\n"
-"\n"
-"Българ�ки превод на книгата „Pro Git“ от Чакън и Страуб:\n"
-"http://i-can.eu/progit2-bg/progit.html"
+"�и�темата за помощ използвайте „git help git“."
 
-#: git.c:186
+#: git.c:188
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "опци�та „--git-dir“ изи�ква директори�\n"
 
-#: git.c:200
+#: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "опци�та „--namespace“ изи�ква име\n"
 
-#: git.c:214
+#: git.c:216
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "опци�та „--work-tree“ изи�ква директори�\n"
 
-#: git.c:228
+#: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "опци�та „--super-prefix“ изи�ква префик�\n"
 
-#: git.c:250
+#: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "опци�та „-c“ изи�ква низ за на�тройка\n"
 
-#: git.c:288
+#: git.c:260
+#, c-format
+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:314
+#: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "непозната опци�: „%s“\n"
 
-#: git.c:360
+#: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr "при заме�тването на п�евдоним „%s“: „%s“"
 
-#: git.c:369
+#: git.c:384
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -21697,39 +24719,39 @@ msgstr ""
 "п�евдонимът „%s“ промен� променливи на �редата.\n"
 "За това може да ползвате „!git“ в п�евдонима"
 
-#: git.c:376
+#: git.c:391
 #, c-format
 msgid "empty alias for %s"
 msgstr "празен п�евдоним за „%s“"
 
-#: git.c:379
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr "зациклен п�евдоним: „%s“"
 
-#: git.c:459
+#: git.c:476
 msgid "write failure on standard output"
 msgstr "грешка при запи� на �тандартни� изход"
 
-#: git.c:461
+#: git.c:478
 msgid "unknown write failure on standard output"
 msgstr "неизве�тна грешка при запи� на �тандартни� изход"
 
-#: git.c:463
+#: git.c:480
 msgid "close failed on standard output"
 msgstr "грешка при затвар�не на �тандартни� изход"
 
-#: git.c:792
+#: git.c:833
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "зацикл�не в п�евдонимите: заме�твани�та на „%s“ не приключват:%s"
 
-#: git.c:842
+#: git.c:883
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "„%s“ не може да �е обработи като вградена команда"
 
-#: git.c:855
+#: git.c:896
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -21738,60 +24760,208 @@ msgstr ""
 "употреба: %s\n"
 "\n"
 
-#: git.c:875
+#: git.c:916
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 "неу�пешно заме�тване на п�евдонима „%s“ — резултатът „%s“ не е команда на "
 "git\n"
 
-#: git.c:887
+#: git.c:928
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "командата „%s“ не може да �е изпълни: %s\n"
 
-#: http.c:378
+#: http-fetch.c:118
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "опци�та „--packfile“ изи�ква валидна контролна �ума (а не „%s“)"
+
+#: http-fetch.c:128
+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 "неподдържани опции"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "грешка при подготовката на вер�ии"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "подаването „%s“ не е отбел�зано като до�тижимо"
+
+#: 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 [ОПЦИЯ…]"
+
+#: 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“"
+
+#: 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
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [ИМЕ] [ОПЦИЯ…]"
+
+#: t/helper/test-simple-ipc.c:683
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [ИМЕ] [�ИШКИ]"
+
+#: t/helper/test-simple-ipc.c:684
+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
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [ИМЕ] [ИЗЧ�КВ��Е]"
+
+#: t/helper/test-simple-ipc.c:686
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [ИМЕ] [ЛЕКСЕМ�]"
+
+#: t/helper/test-simple-ipc.c:687
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [ИМЕ] [БРОЙ_Б�ЙТОВЕ] [Р�ЗМЕР]"
+
+#: t/helper/test-simple-ipc.c:688
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [ИМЕ] [�ИШКИ] [БРОЙ_Б�ЙТОВЕ] "
+"[Р�ЗМЕР_��_П�КЕТ�]"
+
+#: t/helper/test-simple-ipc.c:696
+msgid "name or pathname of unix domain socket"
+msgstr "име или път за гнездото на Unix"
+
+#: 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 "брой за�вки на нишка"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr "байта"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr "знаци за пращане"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr "лек�ема"
+
+#: 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"
 msgstr ""
 "отрицателна �тойно�т за „http.postbuffer“.  Ще �е ползва �тандартната: %d"
 
-#: http.c:399
+#: http.c:420
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Управлението на делегирането не �е поддържа от cURL < 7.22.0"
 
-#: http.c:408
+#: http.c:429
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Задаването на по�то�нен публичен ключ не �е поддържа от cURL < 7.44.0"
 
-#: http.c:878
+#: http.c:910
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "„CURLSSLOPT_NO_REVOKE“ не �е поддържа от cURL < 7.44.0"
 
-#: http.c:951
+#: http.c:989
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Ограничаването на протоколите не �е поддържа от cURL < 7.44.0"
 
-#: http.c:1088
+#: http.c:1132
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "�еподдържана реализаци� на SSL „%s“. Поддържат �е:"
 
-#: http.c:1095
+#: http.c:1139
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "Реализаци�та на SSL не може да �е зададе да е „%s“: cURL е компилиран без "
 "поддръжка на SSL"
 
-#: http.c:1099
+#: http.c:1143
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 "Реализаци�та на SSL не може да �е зададе да е „%s“, защото вече е зададена "
 "друга"
 
-#: http.c:1968
+#: http.c:2034
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21802,161 +24972,203 @@ msgstr ""
 "    � за�вен адре�: %s\n"
 "    � прена�очване: %s"
 
-#: remote-curl.c:166
+#: remote-curl.c:183
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr ""
 "неправилно екраниране или цитиране в �тойно�тта към опци� за изтла�кване: "
 "„%s“"
 
-#: remote-curl.c:263
+#: remote-curl.c:307
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "„%sinfo/refs“ е неизползваемо, проверете дали е хранилище на git"
 
-#: remote-curl.c:364
+#: remote-curl.c:408
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 "неправилен отговор от �ървъра: очакваше �е у�луга, а бе получен изчи�тващ "
 "пакет „flush“"
 
-#: remote-curl.c:395
+#: remote-curl.c:439
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "неправилен отговор от �ървъра, бе получено: „%s“"
 
-#: remote-curl.c:455
+#: remote-curl.c:499
 #, c-format
 msgid "repository '%s' not found"
 msgstr "хранилището „%s“ лип�ва"
 
-#: remote-curl.c:459
+#: remote-curl.c:503
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "�еу�пешна идентификаци� към „%s“"
 
-#: remote-curl.c:463
+#: remote-curl.c:507
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "н�ма до�тъп до „%s“: %s"
 
-#: remote-curl.c:469
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
 msgstr "прена�очване към „%s“"
 
-#: remote-curl.c:593
+#: remote-curl.c:644
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "получен е EOF, в режим без поддръжка за това"
 
-#: remote-curl.c:673
+#: remote-curl.c:656
+msgid "remote server sent unexpected response end packet"
+msgstr "отдалечени�т �ървър прати неочакван пакет за край на отговор"
+
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
-"данните за POST не могат да �е прочетат наново, пробвайте да увеличите "
+"данните за POST не може да �е прочетат наново, пробвайте да увеличите "
 "на�тройката „http.postBuffer“"
 
-#: remote-curl.c:733
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: неправилeн знак за дължина на ред: %.4s"
+
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: неочакван пакет за край на отговор"
+
+#: remote-curl.c:834
 #, c-format
 msgid "RPC failed; %s"
 msgstr "�еу�пешно отдалечено извикване.  %s"
 
-#: remote-curl.c:773
+#: remote-curl.c:874
 msgid "cannot handle pushes this big"
 msgstr "толкова големи изтла�квани� не може да �е изпълн�т"
 
-#: remote-curl.c:888
+#: remote-curl.c:989
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 "за�вката не може да бъде декомпре�ирана, грешка от „zlib“ при "
 "декомпре�иране: %d"
 
-#: remote-curl.c:892
+#: remote-curl.c:993
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr ""
 "за�вката не може да бъде декомпре�ирана; грешка от „zlib“ при завършване: %d<"
 
-#: remote-curl.c:1023
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "получени �а %d байта от заглавна ча�т"
+
+#: remote-curl.c:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "очакват �е още %d байта от т�лото на отговора"
+
+#: remote-curl.c:1134
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "опро�тени�т тран�порт по http не поддържа плитки клиенти"
 
-#: remote-curl.c:1037
+#: remote-curl.c:1149
 msgid "fetch failed."
 msgstr "неу�пешно до�тав�не."
 
-#: remote-curl.c:1085
+#: remote-curl.c:1195
 msgid "cannot fetch by sha1 over smart http"
 msgstr "умни�т вариант на http не може да до�тав� по SHA1"
 
-#: remote-curl.c:1129 remote-curl.c:1135
+#: remote-curl.c:1239 remote-curl.c:1245
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "протоколна грешка: очаква �е SHA1 или указател, а бе получено: „%s“"
 
-#: remote-curl.c:1147 remote-curl.c:1261
+#: remote-curl.c:1257 remote-curl.c:1375
 #, c-format
 msgid "http transport does not support %s"
 msgstr "тран�портът по http не поддържа „%s“"
 
-#: remote-curl.c:1183
+#: remote-curl.c:1293
 msgid "git-http-push failed"
 msgstr "неу�пешно изпълнение на „git-http-push“"
 
-#: remote-curl.c:1367
+#: remote-curl.c:1481
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: употреба: git remote-curl ХР��ИЛИЩЕ [�ДРЕС]"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1513
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: грешка при изчитането на потока команди от git"
 
-#: remote-curl.c:1406
+#: remote-curl.c:1520
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: опит за до�тав�не без локално хранилище"
 
-#: remote-curl.c:1446
+#: remote-curl.c:1561
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: непозната команда „%s“ от git"
 
-#: list-objects-filter-options.h:85
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "лип�ва информаци� за компилатора\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "лип�ва информаци� за библиотеката на C\n"
+
+#: list-objects-filter-options.h:94
 msgid "args"
 msgstr "�РГУМЕ�ТИ"
 
-#: list-objects-filter-options.h:86
+#: list-objects-filter-options.h:95
 msgid "object filtering"
 msgstr "филтриране по вид на обекта"
 
-#: parse-options.h:179
+#: parse-options.h:184
 msgid "expiry-date"
 msgstr "период на валидно�т/запазване"
 
-#: parse-options.h:193
+#: parse-options.h:198
 msgid "no-op (backward compatibility)"
 msgstr "нулева операци� (за �ъвме�тимо�т � предишни вер�ии)"
 
-#: parse-options.h:305
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "повече подробно�ти"
 
-#: parse-options.h:307
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "по-малко подробно�ти"
 
-#: parse-options.h:313
-msgid "use <n> digits to display SHA-1s"
-msgstr "да �е показват такъв БРОЙ цифри от �умите по SHA1"
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
+msgstr "да �е показват такъв БРОЙ цифри от имената на обектите"
 
-#: parse-options.h:332
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "кои празни знаци и #коментари да �е махат от �ъобщени�та"
 
-#: ref-filter.h:101
+#: parse-options.h:338
+msgid "read pathspec from file"
+msgstr "изчитане на пътищата от Ф�ЙЛ"
+
+#: parse-options.h:339
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"при ползването на „--pathspec-from-file“, пътищата �а разделени � нулеви� "
+"знак „NUL“"
+
+#: ref-filter.h:99
 msgid "key"
 msgstr "КЛЮЧ"
 
-#: ref-filter.h:101
+#: ref-filter.h:99
 msgid "field name to sort on"
 msgstr "име на полето, по което да е подредбата"
 
@@ -21966,14 +25178,6 @@ msgstr ""
 "при възможно�т преизползване на решението на конфликта за обнов�ване на "
 "индек�а"
 
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "Указател�т „HEAD“ не е �вързан и е при "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "Указател�т „HEAD“ не е �вързан и е отделѐн от "
-
 #: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Добав�не на �ъдържанието на файла към индек�а"
@@ -22013,686 +25217,670 @@ msgid "List, create, or delete branches"
 msgstr "Извеждане, �ъздаване, изтриване на клони"
 
 #: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "Събиране на информаци� за потребител� за доклад за грешка"
+
+#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Ме�тене на обекти и указатели по архиви"
 
-#: command-list.h:60
+#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
 "Предо�тав�не на �ъдържанието или вида и размерите на обекти от хранилище"
 
-#: command-list.h:61
+#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Извеждане на информаци�та за атрибутите на git (gitattributes)"
 
-#: command-list.h:62
+#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Изчи�тване на грешки в игнорираните файлове (gitignore)"
 
-#: command-list.h:63
+#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Извеждане на каноничните име и адре� на е-поща на контактите"
 
-#: command-list.h:64
+#: command-list.h:65
 msgid "Switch branches or restore working tree files"
 msgstr ""
 "Преминаване към друг клон или въз�танов�ване на файловете в работното дърво"
 
-#: command-list.h:65
+#: command-list.h:66
 msgid "Copy files from the index to the working tree"
 msgstr "Копиране на файлове от индек�а към работното дърво"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Ensures that a reference name is well formed"
 msgstr "Проверка дали името на указател� е по правилата"
 
-#: command-list.h:67
+#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr ""
 "Откриване на подавани�, които още не �а подадени към отдалеченото хранилище"
 
-#: command-list.h:68
+#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Прилагане на промените от �ъще�твуващи подавани�"
 
-#: command-list.h:69
+#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Графична алтернатива на „git-commit“"
 
-#: command-list.h:70
+#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Изтриване на не�ледените файлове от работното дърво"
 
-#: command-list.h:71
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Клониране на хранилище в нова директори�"
 
-#: command-list.h:72
+#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Извеждане по колони"
 
-#: command-list.h:73
+#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Подаване на промени в хранилището"
 
-#: command-list.h:74
+#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Запи� и проверка на файловете � гра̀фа на подавани�та на Git"
 
-#: command-list.h:75
+#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Създаване на нов обект-подаване"
 
-#: command-list.h:76
+#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr ""
 "Извеждане и задаване на глобални на�тройки или на�тройки на определено "
 "хранилище"
 
-#: command-list.h:77
+#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr ""
 "Пребро�ване на непакетираните обекти и колко ди�ково про�тран�тво заемат"
 
-#: command-list.h:78
+#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Получаване и запазване на идентификаци�та на потребител"
 
-#: command-list.h:79
+#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Помощна програма за временно запазване на пароли в паметта"
 
-#: command-list.h:80
+#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr ""
 "Помощна програма за запазване на идентификаци�та на потребител на ди�ка"
 
-#: command-list.h:81
+#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Изна��не на едно подаване като изтегл�не в CVS"
 
-#: command-list.h:82
+#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Изна��не на данните ви от друга �и�тема за контрол на вер�иите"
 
-#: command-list.h:83
+#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Емулаци� на �ървър за CVS за Git"
 
-#: command-list.h:84
+#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Силно опро�тен �ървър за хранилища на Git"
 
-#: command-list.h:85
+#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "Задаване на име удобно за потребителите на обект въз о�нова на наличен "
 "указател"
 
-#: command-list.h:86
+#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "Извеждане на разликите между подавани�та, вер�иите, работното дърво"
 
-#: command-list.h:87
+#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Сравн�ване на файлове от работното дърво и индек�а"
 
-#: command-list.h:88
+#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Сравн�ване на обекти-дърво � работното дърво и индек�а"
 
-#: command-list.h:89
+#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 "Сравн�ване на �ъдържанието и правата за до�тъп на обектите-BLOB чрез два "
 "обекта-дърво"
 
-#: command-list.h:90
+#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Извеждане на промените чрез �тандартните ин�трументи за това"
 
-#: command-list.h:91
+#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Разглеждане на данните от Git"
 
-#: command-list.h:92
+#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Ядро за бързо вна��не на данни в Git"
 
-#: command-list.h:93
+#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Изтегл�не на обекти и указатели от друго хранилище"
 
-#: command-list.h:94
+#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Получаване на лип�ващи обекти от друго хранилище"
 
-#: command-list.h:95
+#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Презапи�ване на клони"
 
-#: command-list.h:96
+#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Създаване на �ъобщение при подаване �ъ� �ливане"
 
-#: command-list.h:97
+#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Извеждане на информаци�та за в�еки указател"
 
-#: command-list.h:98
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "Изпълн�ване на команда на git за в��ко хранилище от �пи�ъка"
+
+#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Подготв�не на кръпки за изпращане по е-поща"
 
-#: command-list.h:99
+#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "Проверка на обектите и връзките т�х в базата от данни за обектите"
 
-#: command-list.h:100
+#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Изчи�тване на ненужните файлове и оптимизиране на локалното хранилище"
 
-#: command-list.h:101
+#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "Извеждане на идентификатора на подаване от архив на „git-archive“"
 
-#: command-list.h:102
+#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Извеждане на редовете напа�ващи на шаблон"
 
-#: command-list.h:103
+#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Графичен интерфей� към Git"
 
-#: command-list.h:104
+#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr ""
 "Изчи�л�ване на идентификатор на обект и евентуално �ъздаване на обект-BLOB "
 "от файл"
 
-#: command-list.h:105
+#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Извеждане на помощта за Git"
 
-#: command-list.h:106
+#: command-list.h:108
 msgid "Server side implementation of Git over HTTP"
 msgstr "Сървърна реализаци� на Git по HTTP"
 
-#: command-list.h:107
+#: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Изтегл�не на отдалечено хранилище по HTTP"
 
-#: command-list.h:108
+#: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Изтла�кване на обекти по HTTP/DAV към друго хранилище"
 
-#: command-list.h:109
+#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "Изпращане на поредица от кръпки на �тандартни� вход към папка по IMAP"
 
-#: command-list.h:110
+#: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
 msgstr "Създаване на пакетен индек� за �ъще�твуващ пакетиран архив"
 
-#: command-list.h:111
+#: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Създаване на празно хранилище на Git или занул�ване на �ъще�твуващо"
 
-#: command-list.h:112
+#: command-list.h:114
 msgid "Instantly browse your working repository in gitweb"
 msgstr "�езабавно разглеждане на работното ви хранилище чрез „gitweb“"
 
-#: command-list.h:113
+#: command-list.h:115
 msgid "Add or parse structured information in commit messages"
 msgstr ""
 "Добав�не или обработка на �труктурирана информаци� в �ъобщени�та при подаване"
 
-#: command-list.h:114
+#: command-list.h:116
 msgid "The Git repository browser"
 msgstr "Разглеждане на хранилище на Git"
 
-#: command-list.h:115
+#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Извеждане на журнала � подавани�та"
 
-#: command-list.h:116
+#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr "Извеждане на информаци� за файловете в индек�а и работното дърво"
 
-#: command-list.h:117
+#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Извеждане на указателите в отдалечено хранилище"
 
-#: command-list.h:118
+#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Извеждане на �ъдържанието на обект-дърво"
 
-#: command-list.h:119
+#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Изваждане на кръпка и автор�твото от е-пи�мо"
 
-#: command-list.h:120
+#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Про�та програма за раздел�не на файлове във формат UNIX mbox"
 
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Изпълнение на задачи за оптимизиране на хранилището на Git"
+
+#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "Сливане на две или повече поредици/и�тории от промени"
 
-#: command-list.h:122
+#: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Откриване на най-подход�щите общи предше�твеници за �ливане"
 
-#: command-list.h:123
+#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Изпълнение на тройно �ливане"
 
-#: command-list.h:124
+#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "Сливане на файловете, които �е нужда�т от това"
 
-#: command-list.h:125
+#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Стандартната помощна програма за „git-merge-index“"
 
-#: command-list.h:126
+#: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Изпълнение на програмите за коригиране на конфликтите при �ливане"
 
-#: command-list.h:127
+#: command-list.h:130
 msgid "Show three-way merge without touching index"
 msgstr "Извеждане на тройно �ливане без пром�на на индек�а"
 
-#: command-list.h:128
+#: command-list.h:131
 msgid "Write and verify multi-pack-indexes"
 msgstr "Запи� и проверка на индек�ите за множе�тво пакети"
 
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "Създаване на обект-етикет"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Създаване на обект-етикет � допълнителни проверки"
 
-#: command-list.h:130
+#: command-list.h:133
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Създаване на обект-дърво от тек�т във формат „ls-tree“"
 
-#: command-list.h:131
+#: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Преме�тване или преименуване на файл, директори� или �имволна връзка"
 
-#: command-list.h:132
+#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Откриване на имената дадени на вер�и�"
 
-#: command-list.h:133
+#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Добав�не или преглед на бележки към обект"
 
-#: command-list.h:134
+#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Вна��не и подаване към хранилища на Perforce"
 
-#: command-list.h:135
+#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Създаване на пакетиран архив от обекти"
 
-#: command-list.h:136
+#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "�амиране на повтар�щи �е пакетни файлове"
 
-#: command-list.h:137
+#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Пакетиране на върховете и етикетите за бърз до�тъп до хранилище"
 
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr ""
-"Помощни програми за анализа на параметрите за до�тъп до отдалечено хранилище"
-
-#: command-list.h:139
+#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Генериране на уникален идентификатор на кръпка"
 
-#: command-list.h:140
+#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "Ока�тр�не на в�ички недо�тижими обекти в базата от данни за обектите"
 
-#: command-list.h:141
+#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr "Изтриване на допълнителните обекти, които вече �а в пакетни файлове"
 
-#: command-list.h:142
+#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "До�тав�не и вна��не на промените от друго хранилище или клон"
 
-#: command-list.h:143
+#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Обнов�ване на отдалечените указатели и �вързаните � т�х обекти"
 
-#: command-list.h:144
+#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Прилагане на поредица от кръпки от quilt към текущи� клон"
 
-#: command-list.h:145
+#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Сравн�ване на два диапазона от подавани� (напр. две вер�ии на клон)"
 
-#: command-list.h:146
+#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Изчитане на информаци� за обект-дърво в индек�а"
 
-#: command-list.h:147
+#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Прилагане на подавани�та върху друг връх"
 
-#: command-list.h:148
+#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Получаване на изтла�каното в хранилището"
 
-#: command-list.h:149
+#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Управление на информаци�та в журнала на указателите"
 
-#: command-list.h:150
+#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Управление на набор от �ледени хранилища"
 
-#: command-list.h:151
+#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Пакетиране на непакетираните обекти в хранилище"
 
-#: command-list.h:152
+#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Създаване, извеждане, изтриване на указатели за зам�на на обекти"
 
-#: command-list.h:153
+#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Обобщение на пред�то�щите промени"
 
-#: command-list.h:154
+#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Преизползване на вече запазено коригиране на конфликт при �ливане"
 
-#: command-list.h:155
+#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Привеждане на указател� „HEAD“ към зададеното �ъ�то�ние"
 
-#: command-list.h:156
+#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Въз�танов�ване на файловете в работното дърво"
 
-#: command-list.h:157
+#: command-list.h:159
 msgid "Revert some existing commits"
 msgstr "Отмен�не на �ъще�твуващи подавани�"
 
-#: command-list.h:158
+#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Извеждане на подавани�та в обратна хронологиче�ка подредба"
 
-#: command-list.h:159
+#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "Избор и пром�на на параметри"
 
-#: command-list.h:160
+#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "Изтриване на файлове от работното дърво и индек�а"
 
-#: command-list.h:161
+#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Изпращане на поредица от кръпки по е-поща"
 
-#: command-list.h:162
+#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Изтла�кване на обекти по протокола на Git към друго хранилище"
 
-#: command-list.h:163
+#: command-list.h:165
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Ограничена входна обвивка за до�тъп през SSH �амо до Git"
 
-#: command-list.h:164
+#: command-list.h:166
 msgid "Summarize 'git log' output"
 msgstr "Обобщен изход от „git log“"
 
-#: command-list.h:165
+#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "Извеждане на различните видове обекти в Git"
 
-#: command-list.h:166
+#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "Извеждане на клоните и подавани�та в т�х"
 
-#: command-list.h:167
+#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "Извеждане на индек�а на пакетирани� архив"
 
-#: command-list.h:168
+#: command-list.h:170
 msgid "List references in a local repository"
 msgstr "Извеждане на указателите в локално хранилище"
 
-#: command-list.h:169
+#: command-list.h:171
 msgid "Git's i18n setup code for shell scripts"
 msgstr "�а�тройки на Git за интернационализаци� на �криптовете на обвивката"
 
-#: command-list.h:170
+#: command-list.h:172
 msgid "Common Git shell script setup code"
 msgstr "�а�тройки на Git за �криптовете на обвивката"
 
-#: command-list.h:171
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Инициализиране и пром�на на ча�тичното изтегл�не"
+
+#: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Скатаване на неподадените промени в работното дърво"
 
-#: command-list.h:172
+#: command-list.h:175
 msgid "Add file contents to the staging area"
 msgstr "Добав�не на �ъдържанието на файла към индек�а"
 
-#: command-list.h:173
+#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Извеждане на �ъ�то�нието на работното дърво"
 
-#: command-list.h:174
+#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Премахване на излишните знаци за интервали"
 
-#: command-list.h:175
+#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Инициализиране, обнов�ване или разглеждане на подмодули"
 
-#: command-list.h:176
+#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Двупо�очна работа между хранилища под Subversion и Git"
 
-#: command-list.h:177
+#: command-list.h:180
 msgid "Switch branches"
 msgstr "Преминаване към друг клон"
 
-#: command-list.h:178
+#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Извеждане, пром�на и изтриване на �имволни указатели"
 
-#: command-list.h:179
+#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Извеждане, �ъздаване, изтриване, проверка на етикети подпи�ани � GPG"
 
-#: command-list.h:180
+#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Създаване на временен файл �ъ� �ъщото �ъдържание като обектът-BLOB"
 
-#: command-list.h:181
+#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Разпакетиране на обекти от пакетиран архив"
 
-#: command-list.h:182
+#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Реги�триране на �ъдържанието на файловете от работното дърво в индек�а"
 
-#: command-list.h:183
+#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr "Безопа�но обнов�ване на името на обект в указател"
 
-#: command-list.h:184
+#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Обнов�ване на файла � допълнителна информаци� в помощ на опро�тените �ървъри"
 
-#: command-list.h:185
+#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Изпращане на архива обратно към „git-archive“"
 
-#: command-list.h:186
+#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Изпращане на пакетираните обекти обратно към „git-fetch-pack“"
 
-#: command-list.h:187
+#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Извеждане на логиче�ка променлива на Git"
 
-#: command-list.h:188
+#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Проверка на подпи�ите GPG върху подавани�та"
 
-#: command-list.h:189
+#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Проверка на пакетираните архивни файлове на Git"
 
-#: command-list.h:190
+#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Проверка на подпи�ите GPG върху етикетите"
 
-#: command-list.h:191
+#: command-list.h:194
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Уеб интерфей� на Git"
 
-#: command-list.h:192
+#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr "Извеждане на журнал � разликите, въведени � в��ко подаване"
 
-#: command-list.h:193
+#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "Управление на множе�тво работни дървета"
 
-#: command-list.h:194
+#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "Създаване на обект-дърво от текущи� индек�"
 
-#: command-list.h:195
+#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "Указване на атрибути към път"
 
-#: command-list.h:196
+#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Команден ред и конвенции на Git"
 
-#: command-list.h:197
+#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "Въвеждащ урок в Git за разработчици"
 
-#: command-list.h:198
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Въвеждане на имена и пароли към Git"
+
+#: command-list.h:202
 msgid "Git for CVS users"
 msgstr "Git за потребители на CVS"
 
-#: command-list.h:199
+#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "�а�тройване на изгледа на разликите"
 
-#: command-list.h:200
+#: command-list.h:204
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Полезен минимален набор от команди за ежедневната работа � Git"
 
-#: command-list.h:201
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Че�то задавани въпро�и за употребата на Git"
+
+#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "Речник � термините на Git"
 
-#: command-list.h:202
+#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Куки на Git"
 
-#: command-list.h:203
+#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Указване на не�ледени файлове, които да бъдат нарочно пренебрегвани"
 
-#: command-list.h:204
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "Съответ�тви� на имена на автор/подаващ и/или адре�и на е-поща"
+
+#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Дефиниране на �вой�твата на подмодулите"
 
-#: command-list.h:205
+#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Про�тран�тва от имена на Git"
 
-#: command-list.h:206
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Помощни програми за работа � отдалечените хранилища"
+
+#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "У�трой�тво на хранилището на Git"
 
-#: command-list.h:207
+#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Указване на вер�ии и диапазони в Git"
 
-#: command-list.h:208
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "Монтиране на едно хранилище в друго"
+
+#: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Въвеждащ урок за Git: втора ча�т"
 
-#: command-list.h:209
+#: command-list.h:217
 msgid "A tutorial introduction to Git"
 msgstr "Въвеждащ урок за Git"
 
-#: command-list.h:210
+#: command-list.h:218
 msgid "An overview of recommended workflows with Git"
 msgstr "Общ преглед на препоръчваните начини за работа � Git"
 
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Започнете като изпълните командата „git bisect start“"
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Да �е извърши ли автоматично? „Y“ —  Д�, „n“ — не"
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "�еправилна вер�и�: „${arg}“"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "�еправилна вер�и�: „$bisected_head“"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "�еправилна вер�и�: „${rev}“"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "Командата „git bisect ${TERM_BAD}“ приема �амо един аргумент."
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "�е е зададен журнален файл"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr ""
-"Журнални�т файл „${file}“ не може да бъде прочетен, за да �е изпълн�т "
-"командите от него наново"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr ""
-"�епозната команда.  Възможните варианти �а: „start“, „good“, „bad“, „skip“"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
 msgid "bisect run failed: no command provided."
 msgstr "неу�пешно двоично тър�ене, не е зададена команда."
 
-#: git-bisect.sh:246
+#: git-bisect.sh:73
 #, sh-format
 msgid "running $command"
 msgstr "изпълнение на командата „${command}“"
 
-#: git-bisect.sh:253
+#: git-bisect.sh:80
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -22702,27 +25890,23 @@ msgstr ""
 "изходни�т код от командата „${command}“ е ${res} — това е извън интервала "
 "[0, 128)"
 
-#: git-bisect.sh:279
+#: git-bisect.sh:105
 msgid "bisect run cannot continue any more"
 msgstr "двоичното тър�ене не може да продължи"
 
-#: git-bisect.sh:285
+#: git-bisect.sh:111
 #, sh-format
 msgid ""
 "bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
 msgstr ""
 "неу�пешно двоично тър�ене:\n"
-"функци�та „bisect_state ${state}“ завърши � код за грешка ${res}"
+"функци�та „bisect-state ${state}“ завърши � код за грешка ${res}"
 
-#: git-bisect.sh:292
+#: git-bisect.sh:118
 msgid "bisect run success"
 msgstr "у�пешно двоично тър�ене"
 
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "В момента не �е извършва двоично тър�ене."
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -22761,149 +25945,52 @@ msgstr "Опит за про�то �ливане � „$pretty_name“"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Про�тото �ливане не �работи, пробва �е автоматично �ливане."
 
-#: git-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Временни�т индек� не може да бъде изтрит"
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr ""
-"Указател�т „${ref_stash}“ не може да бъде обновен да �очи към „${w_commit}“"
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "ГРЕШК�: командата „stash push“ не приема опци�та „$option“"
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr ""
-"Съ�то�нието на работната директори� и индек�а �а запазени: „$stash_msg“"
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "непозната опци�: ${opt}"
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Указани �а прекалено много вер�ии: „${REV}“"
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "Указател�т „${reference}“ е грешен"
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "„${args}“ не е подаване, приличащо на нещо �катано"
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "„${args}“ не е указател към нещо �катано"
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr "индек�ът не може да бъде обновен"
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "По време на �ливане не може да приложите нещо �катано"
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr ""
-"В индек�а има конфликти.  Пробвайте да изпълните командата без опци�та „--"
-"index“."
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr "Дървото �очено от индек�а не може да бъде запазено"
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr "�е�ледени файлове не могат да �е въз�танов�т от �катаното"
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr "Променените файлове не могат да бъдат извадени от индек�а"
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "Изтрито е �катаното „${REV}“ ($s)"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "Скатаното „${REV}“ не може да бъде изтрито"
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(За да ги въз�тановите, изпълнете командата „git stash apply“)"
-
-#: git-submodule.sh:200
+#: git-submodule.sh:179
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Отно�ителен път може да �е ползва �амо от о�новната директори� на работното "
 "дърво"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:189
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 "адре� на хранилище: „${repo}“ тр�бва или да е аб�олютен, или да започва � "
 "„./“ или „../“"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:208
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "„${sm_path}“ вече �ъще�твува в индек�а"
 
-#: git-submodule.sh:232
+#: 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:239
+#: git-submodule.sh:218
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "в „${sm_path}“ не е изтеглено подаване"
 
-#: git-submodule.sh:245
-#, 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 ""
-"Следни�т път �е игнорира поради н�кой от файловете „.gitignore“:\n"
-"${sm_path}\n"
-"Използвайте опци�та „-f“, ако за да го добавите наи�тина."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:249
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Добав�не на �ъще�твуващото хранилище в „${sm_path}“ към индек�а"
 
-#: git-submodule.sh:270
+#: 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:278
+#: 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:280
+#: git-submodule.sh:261
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22920,37 +26007,37 @@ msgstr ""
 "правилното хранилище или ако не знаете какво означава това, използвайте\n"
 "друго име като аргумент към опци�та „--name“."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:267
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "�ктивиране на локалното хранилище за подмодула „${sm_name}“ наново."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:279
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Подмодулът „${sm_path}“ не може да бъде изтеглен"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:284
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "�еу�пешно добав�не на подмодула „${sm_path}“"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:293
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "�еу�пешно реги�триране на подмодула „${sm_path}“"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:568
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "Текущата вер�и� за подмодула в „${displaypath}“ лип�ва"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:578
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "�еу�пешно до�тав�не в път� към подмодул „${sm_path}“"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:583
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22959,7 +26046,7 @@ msgstr ""
 "Текущата вер�и� „${remote_name}/${branch}“ в път� към подмодул „${sm_path}“ "
 "лип�ва"
 
-#: git-submodule.sh:606
+#: git-submodule.sh:601
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22968,7 +26055,7 @@ msgstr ""
 "�еу�пешно до�тав�не в път� към подмодул „${displaypath}“, опит за директно "
 "до�тав�не на „${sha1}“"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:607
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22977,91 +26064,58 @@ msgstr ""
 "Подмодулът в път� „$displaypath“ е до�тавен, но не �ъдържа обекта �ъ� �ума\n"
 "„${sha1}“.  Директното до�тав�не на това подаване е неу�пешно."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:614
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно изтегл�не на вер�и� „${sha1}“ в път� към подмодул „${displaypath}“'"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:615
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: изтеглена е вер�и� „${sha1}“"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:619
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно пребазиране на вер�и� „${sha1}“ в път� към подмодул "
 "„${displaypath}“"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:620
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: пребазиране върху вер�и� „${sha1}“"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:625
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно �ливане на вер�и� „${sha1}“ в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:626
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Път към подмодул „${displaypath}“: �ливане � вер�и� „${sha1}“"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:631
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "�еу�пешно изпълнение на командата „${command} ${sha1}“ в път� към подмодул "
 "„${displaypath}“"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:632
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:663
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 "�еу�пешна обработка на поддиректориите в път� към подмодул „${displaypath}“"
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr "Опциите „--cached“ и „--files“ �а не�ъвме�тими"
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "неочакван режим „${mod_dst}“"
-
-#: git-submodule.sh:902
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr ""
-"  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа подаването „${sha1_src}“"
-
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr ""
-"  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа подаването „${sha1_dst}“"
-
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr ""
-"  ПРЕДУПРЕЖДЕ�ИЕ: „${display_name}“ не �ъдържа никое от подавани�та "
-"„${sha1_src}“ и „${sha1_dst}“"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "За повече информаци� погледнете ръковод�твото на „git-${cmd}(1)“"
-
 #: git-rebase--preserve-merges.sh:109
 msgid "Applied autostash."
 msgstr "�втоматично �катаното е приложено."
@@ -23071,12 +26125,22 @@ msgstr "�втоматично �катаното е приложено."
 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:207
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -23099,7 +26163,7 @@ msgstr ""
 "\n"
 "Команди:\n"
 " p, pick ПОД�В��Е   — прилагане на подаването\n"
-" r, reword ПОД�В��Е — прилагане на подаването, но �м�на на �ъобщението му\n"
+" r, reword ПОД�В��Е — прилагане на подаването, но пром�на на �ъобщението му\n"
 " e, edit ПОД�В��Е   — прилагане на подаването и �пиране при него за още "
 "промени\n"
 " s, squash ПОД�В��Е — вкарване на подаването в предходното му\n"
@@ -23120,7 +26184,7 @@ msgstr ""
 "Може да промен�те по�ледователно�тта на редовете — те �е изпълн�ват\n"
 "по�ледователно отгоре-надолу.\n"
 
-#: git-rebase--preserve-merges.sh:270
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -23139,84 +26203,84 @@ msgstr ""
 "\n"
 "    git rebase --continue"
 
-#: git-rebase--preserve-merges.sh:295
+#: git-rebase--preserve-merges.sh:285
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: това не е подаване, което може да бъде отбрано"
 
-#: git-rebase--preserve-merges.sh:334
+#: git-rebase--preserve-merges.sh:324
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "�еправилно име на подаване: „$sha1“"
 
-#: git-rebase--preserve-merges.sh:364
+#: git-rebase--preserve-merges.sh:354
 msgid "Cannot write current commit's replacement sha1"
 msgstr ""
 "Заме�тващата �ума по SHA1 за текущото подаване не може да бъде запазена"
 
-#: git-rebase--preserve-merges.sh:415
+#: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Превъртане до „$sha1“"
 
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:407
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "�е може да �е превърти до „$sha1“"
 
-#: git-rebase--preserve-merges.sh:426
+#: git-rebase--preserve-merges.sh:416
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "Указател�т „HEAD“ не може да �е на�очи към „$first_parent“"
 
-#: git-rebase--preserve-merges.sh:431
+#: git-rebase--preserve-merges.sh:421
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Подаването не може да �е �мачка: „$sha1“"
 
-#: git-rebase--preserve-merges.sh:449
+#: git-rebase--preserve-merges.sh:439
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Грешка при повтар�нето на �ливането на „$sha1“"
 
-#: git-rebase--preserve-merges.sh:458
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "„$sha1“ не може да �е отбере."
 
-#: git-rebase--preserve-merges.sh:467
+#: git-rebase--preserve-merges.sh:457
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Това е �ъобщение при подаване №${n}:"
 
-#: git-rebase--preserve-merges.sh:472
+#: git-rebase--preserve-merges.sh:462
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Съобщение при подаване №${n} ще бъде пре�кочено."
 
-#: git-rebase--preserve-merges.sh:483
+#: 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:492
+#: git-rebase--preserve-merges.sh:482
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "�овото �ъобщение при подаване „$fixup_msg“ не може да бъде запазено"
 
-#: git-rebase--preserve-merges.sh:495
+#: git-rebase--preserve-merges.sh:485
 msgid "This is a combination of 2 commits."
 msgstr "Това е обединение от 2 подавани�"
 
-#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
-#: git-rebase--preserve-merges.sh:582
+#: 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:611
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -23230,33 +26294,33 @@ msgstr ""
 "изпълнение\n"
 "на куката преди подаване.  �ко имате проблем � куката, ще тр�бва да го "
 "коригирате,\n"
-"преди да можете да промените подаването."
+"преди да може да промените �ъобщението на подаването."
 
-#: git-rebase--preserve-merges.sh:626
+#: git-rebase--preserve-merges.sh:616
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Спиране при „$sha1_abbrev…“ $rest"
 
-#: git-rebase--preserve-merges.sh:641
+#: git-rebase--preserve-merges.sh:631
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "Без предходно подаване не може да �е изпълни „$squash_style“"
 
-#: git-rebase--preserve-merges.sh:683
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr "В момента �е изпълн�ва: $rest"
 
-#: git-rebase--preserve-merges.sh:691
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "�еу�пешно изпълнение: $rest"
 
-#: git-rebase--preserve-merges.sh:693
+#: git-rebase--preserve-merges.sh:683
 msgid "and made changes to the index and/or the working tree"
 msgstr "и промени индек�а и/или работното дърво"
 
-#: git-rebase--preserve-merges.sh:695
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -23267,7 +26331,7 @@ msgstr ""
 "    git rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:708
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -23282,25 +26346,25 @@ msgstr ""
 "\n"
 "    git rebase --continue"
 
-#: git-rebase--preserve-merges.sh:719
+#: git-rebase--preserve-merges.sh:709
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "�епозната команда: $command $sha1 $rest"
 
-#: git-rebase--preserve-merges.sh:720
+#: 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:755
+#: git-rebase--preserve-merges.sh:745
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "У�пешно пребазиране и обнов�ване на „$head_name“."
 
-#: git-rebase--preserve-merges.sh:812
+#: git-rebase--preserve-merges.sh:802
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "Указател�т „CHERRY_PICK_HEAD“ не може да бъде изтрит"
 
-#: git-rebase--preserve-merges.sh:817
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -23330,11 +26394,11 @@ msgstr ""
 "\n"
 "    git rebase --continue\n"
 
-#: git-rebase--preserve-merges.sh:834
+#: git-rebase--preserve-merges.sh:824
 msgid "Error trying to find the author identity to amend commit"
 msgstr "�е може да бъде открит автор за поправ�нето на подаването"
 
-#: git-rebase--preserve-merges.sh:839
+#: 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."
@@ -23342,33 +26406,33 @@ msgstr ""
 "В работното дърво има неподадени промени.  Първо ги подайте, а �лед това\n"
 "отново изпълнете „git rebase --continue“."
 
-#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
+#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
 msgid "Could not commit staged changes."
-msgstr "Промените в индек�а не могат да бъдат подадени."
+msgstr "Промените в индек�а не може да бъдат подадени."
 
-#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
+#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
 msgid "Could not execute editor"
 msgstr "Тек�тови�т редактор не може да бъде �тартиран"
 
-#: git-rebase--preserve-merges.sh:900
+#: git-rebase--preserve-merges.sh:890
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "„$switch_to“ не може да �е изтегли"
 
-#: git-rebase--preserve-merges.sh:907
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr "Лип�ва указател „HEAD“"
 
-#: git-rebase--preserve-merges.sh:908
+#: git-rebase--preserve-merges.sh:898
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Временната директори� „$state_dir“ не може да бъде �ъздадена"
 
-#: git-rebase--preserve-merges.sh:911
+#: git-rebase--preserve-merges.sh:901
 msgid "Could not mark as interactive"
 msgstr "Пребазирането не е интерактивно"
 
-#: git-rebase--preserve-merges.sh:943
+#: git-rebase--preserve-merges.sh:933
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -23377,7 +26441,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
 
-#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
+#: 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 "Спи�ъкът � презапи�аните подавани� не може да бъде �ъздаден"
 
@@ -23410,14 +26478,14 @@ msgstr ""
 #: git-sh-setup.sh:227
 msgid "Cannot pull with rebase: You have unstaged changes."
 msgstr ""
-"�е можете да издърпвате при това пребазиране, защото има промени, които не "
-"�а в индек�а."
+"�е може да издърпвате при това пребазиране, защото има промени, които не �а "
+"в индек�а."
 
 #: git-sh-setup.sh:230
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
 msgstr ""
-"�е можете да изпълните „$action“, защото има промени, които не �а в индек�а."
+"�е може да изпълните „$action“, защото има промени, които не �а в индек�а."
 
 #: git-sh-setup.sh:243
 msgid "Cannot rebase: Your index contains uncommitted changes."
@@ -23426,14 +26494,14 @@ msgstr "Ð�е може да пребазирате, защото в индекÑ�Ð
 #: git-sh-setup.sh:246
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
 msgstr ""
-"�е можете да издърпвате при това пребазиране, защото в индек�а има "
-"неподадени промени."
+"�е може да издърпвате при това пребазиране, защото в индек�а има неподадени "
+"промени."
 
 #: git-sh-setup.sh:249
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
 msgstr ""
-"�е можете да изпълните „$action“, защото в индек�а има неподадени промени."
+"�е може да изпълните „$action“, защото в индек�а има неподадени промени."
 
 #: git-sh-setup.sh:253
 msgid "Additionally, your index contains uncommitted changes."
@@ -23449,52 +26517,11 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "�б�олютни�т път на работното дърво не може да �е определи"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%14s %14s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "в индек�а"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "извън индек�а"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "двоично"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "нищо"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "н�ма промени"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "%d файл добавен\n"
-msgstr[1] "%d файла добавени\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "%d файл обновен\n"
-msgstr[1] "%d файла обновени\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "%d файл � отменени промени\n"
-msgstr[1] "%d файла � отменени промени\n"
-
 #: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
@@ -23502,28 +26529,7 @@ msgid_plural "touched %d paths\n"
 msgstr[0] "%d файл за�егнат\n"
 msgstr[1] "%d файла за�егнати\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Обнов�ване"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Отм�на"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "БЕЛЕЖК�: „%s“ вече не �е �леди.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Добав�не на не�ледени"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "��ма не�ледени файлове.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -23532,7 +26538,7 @@ msgstr ""
 "незабавно\n"
 "добавено към индек�а"
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -23541,7 +26547,7 @@ msgstr ""
 "незабавно\n"
 "�кътано"
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -23550,8 +26556,8 @@ msgstr ""
 "незабавно\n"
 "извадено от индек�а."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: 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."
@@ -23560,8 +26566,8 @@ msgstr ""
 "незабавно\n"
 "набел�зано за прилагане."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: 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."
@@ -23570,16 +26576,12 @@ msgstr ""
 "незабавно\n"
 "набел�зано за занул�ване."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "файлът за редактиране на парчето код не може да бъде отворен: „%s“"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Ръчно редактиране на парчета код — отдолу има под�казка.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -23593,38 +26595,13 @@ msgstr ""
 "За да пропу�нете редовете започващи � „%s“ — изтрийте ги.\n"
 "Редовете, които започват � „%s“ ще бъдат пропу�нати.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-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"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 "файлът за редактиране на парчето код не може да бъде отворен за четене: „%s“"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Редактираното парче не може да �е приложи.  Да �е продължи ли � "
-"редактирането? (текущите редакции ще �е отмен�т при отказ!): „y“ (да)/ "
-"„n“ (не)? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -23638,7 +26615,7 @@ msgstr ""
 "a — добав�не на това и в�ички �ледващи парчета от файла в индек�а\n"
 "d — без добав�не на това и в�ички �ледващи парчета от файла в индек�а"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -23652,7 +26629,7 @@ msgstr ""
 "a — �катаване на това и в�ички �ледващи парчета от файла\n"
 "d — без �катаване на това и в�ички �ледващи парчета от файла"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -23666,7 +26643,7 @@ msgstr ""
 "a — изваждане на това и в�ички �ледващи парчета от файла от индек�а\n"
 "d — без изваждане на това и в�ички �ледващи парчета от файла от индек�а"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23680,7 +26657,7 @@ msgstr ""
 "a — прилагане на това и в�ички �ледващи парчета от файла към индек�а\n"
 "d — без прилагане на това и в�ички �ледващи парчета от файла към индек�а"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23697,7 +26674,7 @@ msgstr ""
 "d — без премахване на това и в�ички �ледващи парчета от файла от работното "
 "дърво"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23714,7 +26691,7 @@ msgstr ""
 "d — без премахване на това и в�ички �ледващи парчета от файла от индек�а и "
 "работното дърво"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23731,7 +26708,7 @@ msgstr ""
 "d — без прилагане на това и в�ички �ледващи парчета от файла от индек�а и "
 "работното дърво"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23745,7 +26722,7 @@ msgstr ""
 "a — прилагане на това и в�ички �ледващи парчета от файла\n"
 "d — без прилагане на това и в�ички �ледващи парчета от файла"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23767,237 +26744,92 @@ msgstr ""
 "e — ръчно редактиране на текущото парче\n"
 "? — извеждане не помощта\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1345
 msgid "The selected hunks do not apply to the index!\n"
-msgstr "Избраните парчета не могат да �е добав�т в индек�а!\n"
-
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Да �е приложат ли към работното дърво? "
+msgstr "Избраните парчета не може да �е добав�т в индек�а!\n"
 
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "�ищо не е приложено.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "пренебрегване на не�л�тото: „%s“\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Само двоични файлове �а променени.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "��ма промени.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Обнов�ване на кръпка"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Добав�не на пром�ната на правата за до�тъп [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Добав�не на изтриването [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Добав�не на това парче [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Скатаване на пром�ната на правата за до�тъп [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Скатаване на изтриването [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Скатаване на това парче [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Изваждане на пром�ната на правата за до�тъп [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Изваждане на изтриването [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Изваждане на това парче [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr ""
-"Прилагане на пром�ната на правата за до�тъп към индек�а [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Прилагане на изтриването към индек�а [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Прилагане на това парче към индек�а [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Премахване на пром�ната в правата за до�тъп от работното дърво [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Премахване на изтриването от работното дърво [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Премахване на парчето от работното дърво [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Премахване на пром�ната в правата за до�тъп от индек�а и работното дърво [y,"
-"n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Премахване на изтриването от индек�а и работното дърво [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Премахване на парчето от индек�а и работното дърво [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Прилагане на пром�ната в правата за до�тъп от индек�а и работното дърво [y,n,"
-"q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Прилагане на изтриването от индек�а и работното дърво [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Прилагане на парчето от индек�а и работното дърво [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1479
 #, 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:1467
+#: git-add--interactive.perl:1480
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Прилагане на изтриването към работното дърво [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1481
+#, 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
 #, 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:1568
+#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
 msgstr "��ма други парчета\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "към кое парче да �е придвижи (за повече варианти нати�нете „enter“)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "към кое парче да �е придвижи? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "�еправилен номер: „%s“\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1622
 #, 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:1617
+#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
 msgstr "��ма други парчета за тър�ене\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "да �е тър�и � регул�рен израз? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Сгрешен регул�рен израз „%s“: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
 msgstr "�икое парче не напа�ва на регул�рни� израз\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr "��ма друго парче преди това\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr "��ма друго парче �лед това\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Това парче не може да бъде разделено\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1736
 #, 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:1706
+#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Това парче не може да бъде редактирано\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Преглед на разликата"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -24018,58 +26850,74 @@ msgstr ""
 "                и индек�а\n"
 "add untracked — добав�не на не�ледените файлове към промените в индек�а\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: 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
 msgid "missing --"
 msgstr "„--“ лип�ва"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "неизве�тна �тратеги� за прилагане на кръпка: „%s“"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "указан е неправилен аргумент „%s“, а �е очаква „--“."
 
-#: git-send-email.perl:138
+#: git-send-email.perl:129
 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:136 git-send-email.perl:142
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "разликата между ме�тни� ча�ови� по�� и GMT е 24 ча�а или повече\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 "Ф�Т�Л�� ГРЕШК�: „%s“ не завърши у�пешно, а � код %d"
+
+#: git-send-email.perl:227
 msgid "the editor exited uncleanly, aborting everything"
 msgstr ""
 "тек�тови�т редактор приключи работата � грешка, в�ичко �е преу�танов�ва"
 
-#: git-send-email.perl:310
+#: git-send-email.perl:316
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "„%s“ �ъдържа временна вер�и� на подготв�ното е-пи�мо.\n"
 
-#: git-send-email.perl:315
+#: git-send-email.perl:321
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "„%s.final“ �ъдържа подготвеното е-пи�мо.\n"
 
-#: git-send-email.perl:408
+#: git-send-email.perl:450
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "опци�та „--dump-aliases“ е не�ъвме�тима � другите опции\n"
 
-#: git-send-email.perl:481 git-send-email.perl:683
+#: 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 ""
+"Ф�Т�Л�� ГРЕШК�: открити �а на�тройки на „sendmail“\n"
+"„git-send-email“ е конфигуриран � на�тройки „sendemail.*“ —\n"
+"забележете знака „e“.  За да изключите тази проверка, задайте\n"
+"на�тройката „sendemail.forbidSendmailVariables“ да е „false“ (лъжа̀).\n"
+
+#: git-send-email.perl:530 git-send-email.perl:746
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Командата „git format-patch“ не може да �е изпълни извън хранилище\n"
 
-#: git-send-email.perl:484
+#: git-send-email.perl:533
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -24077,40 +26925,40 @@ msgstr ""
 "„batch-size“ и „relogin“ тр�бва да �е указват заедно (или чрез командни� "
 "ред, или чрез на�тройките)\n"
 
-#: git-send-email.perl:497
+#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "�епознато поле за опци�та „--suppress-cc“: „%s“\n"
 
-#: git-send-email.perl:528
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "�епозната �тойно�т за „--confirm“: %s\n"
 
-#: git-send-email.perl:556
+#: git-send-email.perl:617
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: п�евдоними за sendmail �ъдържащи кавички („\"“) не �е "
 "поддържат: %s\n"
 
-#: git-send-email.perl:558
+#: git-send-email.perl:619
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: „:include:“ не �е поддържа: %s\n"
 
-#: git-send-email.perl:560
+#: git-send-email.perl:621
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 "ПРЕДУПРЕЖДЕ�ИЕ: прена�очвани� „/file“ или „|pipe“ не �е поддържат: %s\n"
 
-#: git-send-email.perl:565
+#: git-send-email.perl:626
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: редът за „sendmail“ не е разпознат: %s\n"
 
-#: git-send-email.perl:649
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -24125,21 +26973,12 @@ msgstr ""
 "    � укажете „./%s“ за файл;\n"
 "    � използвате опци�та „--format-patch“ за диапазон.\n"
 
-#: git-send-email.perl:670
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Директори�та „%s“ не може да �е отвори: %s"
 
-#: git-send-email.perl:694
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"Ф�Т�Л�� ГРЕШК�: %s: %s\n"
-"ПРЕДУПРЕЖДЕ�ИЕ: не �а пратени никакви кръпки\n"
-
-#: git-send-email.perl:705
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -24149,17 +26988,17 @@ msgstr ""
 "�е �а указани кръпки!\n"
 "\n"
 
-#: git-send-email.perl:718
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "В „%s“ лип�ва тема"
 
-#: git-send-email.perl:728
+#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "„%s“ не може да �е отвори за запи�: %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -24174,27 +27013,27 @@ msgstr ""
 "\n"
 "Изтрийте в�ичко, ако не и�кате да изпратите обобщаващо пи�мо.\n"
 
-#: git-send-email.perl:763
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "„%s“ не може да �е отвори: %s"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "„%s.final“ не може да �е отвори: %s"
 
-#: git-send-email.perl:823
+#: git-send-email.perl:886
 msgid "Summary email is empty, skipping it\n"
 msgstr "Обобщаващото пи�мо е празно и �е пре�кача\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:858
+#: git-send-email.perl:935
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Сигурни ли �те, че и�кате да ползвате „%s“ [y/N]? "
 
-#: git-send-email.perl:913
+#: git-send-email.perl:990
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -24202,11 +27041,11 @@ msgstr ""
 "Следните файлове �а 8 битови, но не �а � об�вена заглавна ча�т „Content-"
 "Transfer-Encoding“.\n"
 
-#: git-send-email.perl:918
+#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Кое 8 битово кодиране �е ползва [�тандартно: UTF-8]? "
 
-#: git-send-email.perl:926
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -24219,22 +27058,22 @@ msgstr ""
 "в�е още е � шаблонното заглавие „*** SUBJECT HERE ***“.  Ползвайте опци�та\n"
 "„--force“, ако �те �игурни, че точно това и�кате да изпратите.\n"
 
-#: git-send-email.perl:945
+#: git-send-email.perl:1022
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "�а кой да �е прат�т е-пи�мата (незадължително поле)"
 
-#: git-send-email.perl:963
+#: git-send-email.perl:1040
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "Ф�Т�Л�� ГРЕШК�: „%s“ е п�евдоним на �ебе �и\n"
 
-#: git-send-email.perl:975
+#: git-send-email.perl:1052
 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:1033 git-send-email.perl:1041
+#: git-send-email.perl:1114 git-send-email.perl:1122
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "ГРЕШК�: не може да �е извлече адре� от „%s“\n"
@@ -24242,18 +27081,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:1045
+#: git-send-email.perl:1126
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 "Какво да �е направи � този адре�? „q“ (�пиране), „d“ (изтриване), "
 "„e“ (редактиране): "
 
-#: git-send-email.perl:1362
+#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Път�т към �ертификат „%s“ не �ъще�твува."
 
-#: git-send-email.perl:1445
+#: 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"
@@ -24269,7 +27108,7 @@ msgstr ""
 "    Към �пи�ъка � получателите („Cc“) �а добавени и другите\n"
 "    адре�и на е-поща, които �а упоменати в �ъобщението за\n"
 "    подаване на кръпката.  Стандартно командата „send-email“\n"
-"    пита за това преди изпращане.  Можете да премените това\n"
+"    пита за това преди изпращане.  Може да премените това\n"
 "    поведение чрез на�тройката „sendemail.confirm“.\n"
 "\n"
 "    Командата „git send-email --help“ предо�тав� още\n"
@@ -24281,132 +27120,147 @@ 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:1460
+#: git-send-email.perl:1544
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 "Изпращане на е-пи�мото? „y“ (да), „n“ (не), „e“ (редактиране), „q“ (изход), "
 "„a“ (в�ичко): "
 
-#: git-send-email.perl:1463
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr "Изи�кване на отговор към това е-пи�мо"
 
-#: git-send-email.perl:1491
+#: git-send-email.perl:1581
 msgid "The required SMTP server is not properly defined."
 msgstr "Сървърът за SMTP не е на�троен правилно."
 
-#: git-send-email.perl:1538
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Сървърът не поддържа „STARTTLS“! %s"
 
-#: git-send-email.perl:1543 git-send-email.perl:1547
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "�еу�пешно изпълнение на STARTTLS! %s"
 
-#: git-send-email.perl:1556
+#: git-send-email.perl:1646
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Под�и�темата за SMTP не може да �е инициализира.  Проверете на�тройките и "
 "използвайте опци�та: „--smtp-debug“."
 
-#: git-send-email.perl:1574
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "„%s“ не може да бъде изпратен\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Проба за изпращане на „%s“\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Изпращане на „%s“\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "У�пех при пробата.  От журнала:\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "У�пех.  От журнала:\n"
 
-#: git-send-email.perl:1591
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Резултат: "
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Резултат: у�пех\n"
 
-#: git-send-email.perl:1612
+#: git-send-email.perl:1709
 #, perl-format
 msgid "can't open file %s"
 msgstr "файлът „%s“ не може да бъде отворен"
 
-#: git-send-email.perl:1659 git-send-email.perl:1679
+#: git-send-email.perl:1756 git-send-email.perl:1776
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1665
+#: git-send-email.perl:1762
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Добав�не на „до: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1819
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(не-mbox) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1753
+#: git-send-email.perl:1854
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(т�ло) Добав�не на „�к: %s“ от ред „%s“\n"
 
-#: git-send-email.perl:1864
+#: git-send-email.perl:1965
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �е може да бъде �е изпълни „%s“"
 
-#: git-send-email.perl:1871
+#: git-send-email.perl:1972
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Добав�не на „%s: %s“ от: „%s“\n"
 
-#: git-send-email.perl:1875
+#: git-send-email.perl:1976
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) програмни�т канал не може да �е затвори за изпълнението на „%s“"
 
-#: git-send-email.perl:1905
+#: git-send-email.perl:2006
 msgid "cannot send message as 7bit"
 msgstr "�ъобщението не може да �е изпрати чрез 7 битови знаци"
 
-#: git-send-email.perl:1913
+#: git-send-email.perl:2014
 msgid "invalid transfer encoding"
 msgstr "неправилно кодиране за прено�"
 
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: 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 ""
+"Ф�Т�Л�� ГРЕШК�: %s: отхвърлено от куката „sendemail-validate“\n"
+"%s\n"
+"ПРЕДУПРЕЖДЕ�ИЕ: не �а пратени никакви кръпки\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 "„%s“ не може да �е отвори: %s\n"
 
-#: git-send-email.perl:1957
+#: git-send-email.perl:2064
 #, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
-msgstr "„%s“: кръпката �ъдържа ред � над 988 знака"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"Ф�Т�Л�� ГРЕШК�: %s: %d е повече от 998 знака\n"
+"ПРЕДУПРЕЖДЕ�ИЕ: не �а пратени никакви кръпки\n"
 
-#: git-send-email.perl:1974
+#: git-send-email.perl:2082
 #, 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:1978
+#: git-send-email.perl:2086
 #, 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 3c878cec73..e6e77f3fb1 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-2019
+# Jordi Mas i Hernàndez <jmas@softcatala.org>, 2016-2021
 #
 # Terminologia i criteris utilitzats
 #
@@ -11,17 +11,23 @@
 #   amend            |  esmenar
 #   bundle           |  farcell
 #   broken           |  malmès
+#   chunk            |  fragment
 #   delta            |  diferència
 #   deprecated       |  en desús
-#   dry              |  simulació
+#   detached         |  separat
+#   dry-run          |  fer una prova
 #   fatal            |  fatal
+#   flush            |  buidar / buidatge
+#   hint             |  consell
 #   hook             |  lligam
 #   hunk             |  tros
 #   not supported    |  no està admès
-#   repository       |  dipòsit
+#   repository       |  repositori
 #   setting          |  paràmetre
+#   shallow          |  superficial
 #   skip             |  ometre
 #   squelch          |  silenciar
+#   sparse-index     |  índex dispers
 #   token            |  testimoni
 #   unset            |  desassignar
 #   upstream         |  font
@@ -37,8 +43,9 @@
 #   Anglès           |  Català
 #   -----------------+---------------------------------
 #   blame            |  «blame»
-#   HEAD             |  HEAD (f, la branca)
+#   HEAD             |  HEAD (f, la branca) - (no s'apostrofa)
 #   cherry pick      |  «cherry pick»
+#   promisor         |  «promisor»
 #   rebase           |  «rebase»
 #   stage            |  «stage»
 #   stash            |  «stash»
@@ -49,74 +56,820 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-07-30 09:59+0800\n"
-"PO-Revision-Date: 2019-07-30 08:23+0200\n"
-"Last-Translator: Jordi Mas <jmas@softcatala.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"
 "Language-Team: Catalan\n"
 "Language: ca\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.2.1\n"
+"X-Generator: Poedit 2.3.1\n"
 
-#: advice.c:109
+#: add-interactive.c:376
+#, 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
+msgid "could not read index"
+msgstr "no s'ha pogut llegir l'índex"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binari"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "res"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "sense canvis"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Actualitza"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, 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
+msgid "could not write index"
+msgstr "no s'ha pogut escriure l'índex"
+
+#: add-interactive.c:706 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
+#, 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
+#, 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
+msgid "Revert"
+msgstr "Reverteix"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "No s'ha pogut analitzar HEAD^{tree}"
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Sense fitxers no seguits.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Afegeix sense seguiment"
+
+#: add-interactive.c:895 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
+#, 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
+#, 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
+#, c-format
+msgid "No changes.\n"
+msgstr "Sense canvis.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Actualització del pedaç"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Reviseu les diferències"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "mostra els camins amb canvis"
+
+#: add-interactive.c:1012
+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
+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
+msgid "pick hunks and update selectively"
+msgstr "selecciona els trossos i actualitza selectivament"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "visualitza les diferències entre HEAD i l'índex"
+
+#: add-interactive.c:1020
+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
+msgid "Prompt help:"
+msgstr "Mostra ajuda:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "seleccioneu un únic ítem"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "seleccioneu un rang d'ítems"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "seleccioneu rangs múltiples"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "seleccioneu un ítem basant-se en un prefix únic"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "desselecciona els ítems especificats"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "trieu tots els ítems"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(buit) finalitza la selecció"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "seleccioneu un ítem numerat"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(buit) no seleccionis res"
+
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Ordres ***"
+
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "I ara què"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "staged"
+
+#: add-interactive.c:1144 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
+#: git-add--interactive.perl:213
+msgid "path"
+msgstr "camí"
+
+#: add-interactive.c:1151
+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
+#, c-format
+msgid "Bye.\n"
+msgstr "Adeu.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, 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."
+msgstr ""
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
+"«staging»."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - fes «stage» d'aquest tros\n"
+"n - no facis «stage» d'aquest tros\n"
+"q - surt; no facis «stage» d'aquest tros ni de cap altre restant\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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."
+msgstr ""
+"Si el pedaç s'aplica de forma neta, el tros editat es marcarà immediatament "
+"per a «stashing»."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - fes «stash» d'aquest tros\n"
+"n - no facis «stash» d'aquest tros\n"
+"q - surt; no facis «stash» d'aquest tros ni de cap altre restant\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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."
+msgstr ""
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per a "
+"«unstaging»."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - fes «unstage» d'aquest tros\n"
+"n - no facis «unstage» d'aquest tros\n"
+"q - surt; no facis «unstage» d'aquest tros ni de cap altre restant\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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."
+msgstr ""
+"Si el pedaç s'aplica netament, el tros editat es marcarà immediatament per "
+"aplicar-lo."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - aplica aquest tros a l'índex\n"
+"n - no apliquis aquest tros a l'índex\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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."
+msgstr ""
+"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 ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - descarta aquest tros de l'arbre de treball\n"
+"n - no descartis aquest tros de l'arbre de treball\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"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
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Descarta el canvi de mode de l'índex i de l'arbre de treball [y,n,q,a,d"
+"%s,?]? "
+
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Descarta suprimir de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, 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
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Descarta aquest tros de l'índex i de l'arbre de treball [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - descarta aquest tros de l'índex i de l'arbre de treball\n"
+"n - no descartis aquest tros de l'índex ni de l'arbre de treball\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"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
+#, 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
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Aplica la supressió a l'índex i a l'arbre de treball [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - aplica aquest tros a l'índex i a l'arbre de treball\n"
+"n - no apliquis aquest tros a l'índex ni a l'arbre de treball\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"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:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - aplica aquest tros a l'arbre de treball\n"
+"n - no apliquis aquest tros a l'arbre de treball\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"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
+#, 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
+#, 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
+msgid "could not parse diff"
+msgstr "no s'ha pogut analitzar el diff"
+
+#: add-patch.c:438
+msgid "could not parse colored diff"
+msgstr "no s'ha pogut analitzar el diff acolorit"
+
+#: add-patch.c:452
+#, c-format
+msgid "failed to run '%s'"
+msgstr "no s'ha pogut executar «%s»"
+
+#: add-patch.c:611
+msgid "mismatched output from interactive.diffFilter"
+msgstr "sortida no coincident des d'interactive.diffFilter"
+
+#: add-patch.c:612
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+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
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"s'esperava la línia amb contingut #%d a\n"
+"%.*s"
+
+#: add-patch.c:805
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"els trossos no se superposen:\n"
+"%.*s\n"
+"\tno acaben amb:\n"
+"%.*s"
+
+#: add-patch.c:1081 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
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Per a eliminar les línies «%c», convertiu-les en línies ' ' (context).\n"
+"Per a eliminar les línies «%c», suprimiu-les.\n"
+"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
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again.  If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n"
+"de nou. Si 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
+msgid "could not parse hunk header"
+msgstr "no s'ha pogut analitzar la capçalera del tros"
+
+#: add-patch.c:1177
+msgid "'git apply --cached' failed"
+msgstr "«git apply --cached» ha fallat"
+
+#. 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.
+#.
+#. 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
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"El tros editat no s'aplica. Editeu-lo de nou (si responeu «no» es "
+"descartarà) [y/n]? "
+
+#: add-patch.c:1289
+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
+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
+msgid "Nothing was applied.\n"
+msgstr "No s'ha aplicat res.\n"
+
+#: add-patch.c:1354
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - deixa aquest tros sense decidir, veure el tros sense decidir següent\n"
+"J - deixa aquest tros sense decidir, veure el tros següent\n"
+"k - deixa aquest tros sense decidir, veure el tros sense decidir anterior\n"
+"K - deixa aquest tros sense decidir, veure el tros anterior\n"
+"g - selecciona el tros on voleu anar\n"
+"/ - cerca un tros que coincideixi amb l'expressió regular donada\n"
+"s - divideix el tros actual en trossos més petits\n"
+"e - edita manualment el tros actual\n"
+"? - mostra l'ajuda\n"
+
+#: add-patch.c:1516 add-patch.c:1526
+msgid "No previous hunk"
+msgstr "Sense tros previ"
+
+#: add-patch.c:1521 add-patch.c:1531
+msgid "No next hunk"
+msgstr "No hi ha tros següent"
+
+#: add-patch.c:1537
+msgid "No other hunks to goto"
+msgstr "No hi ha altres trossos on anar-hi"
+
+#: add-patch.c:1548 git-add--interactive.perl:1606
+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
+msgid "go to which hunk? "
+msgstr "ves a quin tros? "
+
+#: add-patch.c:1560
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Número no vàlid: «%s»"
+
+#: add-patch.c:1565
+#, 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
+msgid "No other hunks to search"
+msgstr "No hi ha cap altre tros a cercar"
+
+#: add-patch.c:1580 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "cerca per expressió regular? "
+
+#: add-patch.c:1595
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Expressió regular de cerca mal formada %s: %s"
+
+#: add-patch.c:1612
+msgid "No hunk matches the given pattern"
+msgstr "No hi ha trossos que coincideixin amb el patró donat"
+
+#: add-patch.c:1619
+msgid "Sorry, cannot split this hunk"
+msgstr "No es pot dividir aquest tros"
+
+#: add-patch.c:1623
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Divideix en %d trossos."
+
+#: add-patch.c:1627
+msgid "Sorry, cannot edit this hunk"
+msgstr "No es pot editar aquest tros"
+
+#: add-patch.c:1679
+msgid "'git apply' failed"
+msgstr "«git apply» ha fallat"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Desactiva aquest missatge amb «git config advice.%s false»"
+
+#: advice.c:161
 #, c-format
 msgid "%shint: %.*s%s\n"
-msgstr "%spista: %.*s%s\n"
+msgstr "%sconsell: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:252
 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:164
+#: advice.c:254
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Cometre no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:166
+#: advice.c:256
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Fusionar no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:168
+#: advice.c:258
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Baixar no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:170
+#: advice.c:260
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Revertir no és possible perquè teniu fitxers sense fusionar."
 
-#: advice.c:172
+#: advice.c:262
 #, 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:180
+#: 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."
 msgstr ""
 "Arregleu-los en l'arbre de treball, i després useu\n"
-"'git add/rm <fitxer>' segons sigui apropiat per a marcar la\n"
+"«git add/rm <fitxer>» segons sigui apropiat per a marcar la\n"
 "resolució i feu una comissió."
 
-#: advice.c:188
+#: advice.c:278
 msgid "Exiting because of an unresolved conflict."
 msgstr "S'està sortint a causa d'un conflicte no resolt."
 
-#: advice.c:193 builtin/merge.c:1327
+#: advice.c:283 builtin/merge.c:1374
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
 
-#: advice.c:195
+#: advice.c:285
 msgid "Please, commit your changes before merging."
 msgstr "Cometeu els vostres canvis abans de fusionar."
 
-#: advice.c:196
+#: advice.c:286
 msgid "Exiting because of unfinished merge."
 msgstr "S'està sortint a causa d'una fusió no terminada."
 
-#: advice.c:202
-#, 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"
@@ -137,17 +890,24 @@ msgid ""
 "false\n"
 "\n"
 msgstr ""
-"Avís: s'està agafant «%s».\n"
+"Avís: s'està canviant a «%s».\n"
 "\n"
-"Esteu en un estat de «HEAD separat». Podeu mirar al voltant, fer canvis\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 cap branca realitzant un altre agafament.\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 -b de nou amb l'ordre checkout.\n"
-"Exemple:\n"
+"poder fer-ho (ara o més tard) usant -c amb l'ordre switch. Exemple:\n"
+"\n"
+"  git switch -c <nom-de-branca-nova>\n"
+"\n"
+"O desfer aquesta operació amb:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Desactiveu aquest consell configurant la variable advice.detachedHead a "
+"«false»\n"
 "\n"
-"  git checkout -b <nom-de-branca-nova>\n"
 
 #: alias.c:50
 msgid "cmdline ends with \\"
@@ -155,100 +915,86 @@ msgstr "la línia d'ordres acaba amb \\"
 
 #: alias.c:51
 msgid "unclosed quote"
-msgstr ""
+msgstr "cita no tancada"
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "opció d'espai en blanc «%s» no reconeguda"
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opció ignora l'espai en blanc «%s» no reconeguda"
 
-#: apply.c:135
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject i --3way no es poden usar junts."
 
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached i --3way no es poden usar junts."
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
-msgstr "--3way fora d'un dipòsit"
+msgstr "--3way fora d'un repositori"
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
-msgstr "--index fora d'un dipòsit"
+msgstr "--index fora d'un repositori"
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
-msgstr "--cached fora d'un dipòsit"
+msgstr "--cached fora d'un repositori"
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "No es pot preparar l'expressió regular de marca de temps %s"
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec ha retornat %d per l'entrada: %s"
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "no s'ha pogut trobar el nom de fitxer en el pedaç a la línia %d"
 
-#: apply.c: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 incorrecte - s'esperava /dev/null, s'ha rebut %s en la "
 "línia %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 incorrecte - nom de fitxer nou inconsistent en la línia "
 "%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 incorrecte - nom de fitxer antic inconsistent en la "
 "línia %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 incorrecte - s'esperava /dev/null en la línia %d"
 
-#: apply.c:963
+#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "mode no vàlid en la línia %d: %s"
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "línies de capçalera %d i %d inconsistents"
 
-#: apply.c:1460
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recompte: línia inesperada: %.*s"
-
-#: apply.c:1529
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
-
-#: apply.c:1551
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -263,12 +1009,22 @@ msgstr[1] ""
 "a la capçalera de git diff li manca informació de nom de fitxer en eliminar "
 "%d components de nom de camí inicial (línia %d)"
 
-#: apply.c:1564
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "a la capçalera de git diff li manca informació de nom de fitxer (línia %d)"
 
+#: apply.c:1480
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recompte: línia inesperada: %.*s"
+
+#: apply.c:1549
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragment de pedaç sense capçalera a la línia %d: %.*s"
+
 #: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "el fitxer nou depèn dels continguts antics"
@@ -322,24 +1078,24 @@ msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 msgid "unable to open or read %s"
 msgstr "no s'ha pogut obrir o llegir %s"
 
-#: apply.c:2925
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "inici de línia no vàlid: «%c»"
 
-#: apply.c:3046
+#: 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] "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:3058
+#: apply.c:3068
 #, 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:3064
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -348,23 +1104,23 @@ msgstr ""
 "tot cercant:\n"
 "%.*s"
 
-#: apply.c:3086
+#: apply.c:3096
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "manquen les dades de pedaç binari de «%s»"
 
-#: apply.c:3094
+#: apply.c:3104
 #, 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:3141
+#: apply.c:3151
 #, 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:3151
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -372,289 +1128,290 @@ msgstr ""
 "el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
 "actuals."
 
-#: apply.c:3159
+#: apply.c:3170
 #, 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:3177
+#: apply.c:3188
 #, 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:3190
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el pedaç binari no s'aplica a «%s»"
 
-#: apply.c:3196
+#: apply.c:3208
 #, 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:3217
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el pedaç ha fallat: %s:%ld"
 
-#: apply.c:3340
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no es pot agafar %s"
 
-#: apply.c:3392 apply.c:3403 apply.c:3449 midx.c:62 setup.c:279
+#: 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 "s'ha produït un error en llegir %s"
 
-#: apply.c:3400
+#: apply.c:3412
 #, 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:3429 apply.c:3672
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
 
-#: apply.c:3515 apply.c:3687
+#: apply.c:3527 apply.c:3702
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existeix en l'índex"
 
-#: apply.c:3524 apply.c:3695
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no coincideix amb l'índex"
 
-#: apply.c:3559
-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 ""
-"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:3562
+#: apply.c:3574
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "S'està retrocedint a una fusió de 3 vies...\n"
+msgid "Performing three-way merge...\n"
+msgstr "S'està fent una fusió de 3 vies...\n"
 
-#: apply.c:3578 apply.c:3582
+#: apply.c:3590 apply.c:3594
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no es poden llegir els continguts actuals de «%s»"
 
-#: apply.c:3594
+#: apply.c:3606
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "S'ha produït un error en fer una fusió de tres vies...\n"
 
-#: apply.c:3608
+#: apply.c:3620
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
 
-#: apply.c:3613
+#: apply.c:3625
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
 
-#: apply.c:3639
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "S'està usant alternativament l'aplicació directa...\n"
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
 
-#: apply.c:3712
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipus erroni"
 
-#: apply.c:3714
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s és del tipus %o, s'esperava %o"
 
-#: apply.c:3865 apply.c:3867 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3894 apply.c:3896 read-cache.c:861 read-cache.c:890
+#: read-cache.c:1351
 #, c-format
 msgid "invalid path '%s'"
 msgstr "camí no vàlid: «%s»"
 
-#: apply.c:3923
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ja existeix en l'índex"
 
-#: apply.c:3926
+#: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ja existeix en el directori de treball"
 
-#: apply.c:3946
+#: apply.c:3976
 #, 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:3951
+#: apply.c:3981
 #, 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:3971
+#: apply.c:4001
 #, 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:3975
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el pedaç no s'aplica"
 
-#: apply.c:3990
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
 msgstr "S'està comprovant el pedaç %s..."
 
-#: apply.c:4082
+#: apply.c:4112
 #, 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:4089
+#: apply.c:4119
 #, 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:4092
+#: apply.c:4122
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta informació sha1 o és inútil (%s)."
 
-#: apply.c:4097 builtin/checkout.c:278 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry ha fallat per al camí «%s»"
-
-#: apply.c:4101
+#: apply.c:4131
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no s'ha pogut afegir %s a l'índex temporal"
 
-#: apply.c:4111
+#: apply.c:4141
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no s'ha pogut escriure l'índex temporal a %s"
 
-#: apply.c:4249
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no s'ha pogut eliminar %s de l'índex"
 
-#: apply.c:4283
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "pedaç malmès per al submòdul %s"
 
-#: apply.c:4289
+#: apply.c:4319
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
 
-#: apply.c:4297
+#: apply.c:4327
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
-"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
+"no s'ha pogut crear un magatzem de suport per al fitxer novament creat "
 "%s"
 
-#: apply.c:4303 apply.c:4448
+#: apply.c:4333 apply.c:4478
 #, 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:4346
+#: apply.c:4376 builtin/bisect--helper.c:523
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "no s'ha pogut escriure a «%s»"
 
-#: apply.c:4350
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
 msgstr "s'està tancant el fitxer «%s»"
 
-#: apply.c:4420
+#: apply.c:4450
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
 
-#: apply.c:4518
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "El pedaç %s s'ha aplicat netament."
 
-#: apply.c:4526
+#: apply.c:4556
 msgid "internal error"
 msgstr "error intern"
 
-#: apply.c:4529
+#: apply.c:4559
 #, 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:4540
+#: apply.c:4570
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
 
-#: apply.c:4548 builtin/fetch.c:869 builtin/fetch.c:1161
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
 msgstr "no es pot obrir %s"
 
-#: apply.c:4562
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "El tros #%d s'ha aplicat netament."
 
-#: apply.c:4566
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "S'ha rebutjat el tros #%d."
 
-#: apply.c:4676
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "S'ha omès el pedaç «%s»."
 
-#: apply.c:4684
+#: apply.c:4733
 msgid "unrecognized input"
 msgstr "entrada no reconeguda"
 
-#: apply.c:4704
+#: apply.c:4753
 msgid "unable to read index file"
 msgstr "no es pot llegir el fitxer d'índex"
 
-#: apply.c:4859
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no es pot obrir el pedaç «%s»: %s"
 
-#: apply.c:4886
+#: apply.c:4937
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "s'ha silenciat %d error d'espai en blanc"
 msgstr[1] "s'han silenciat %d errors d'espai en blanc"
 
-#: apply.c:4892 apply.c:4907
+#: apply.c:4943 apply.c:4958
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d línia afegeix errors d'espai en blanc."
 msgstr[1] "%d línies afegeixen errors d'espai en blanc."
 
-#: apply.c:4900
+#: apply.c:4951
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -663,147 +1420,183 @@ msgstr[0] ""
 msgstr[1] ""
 "S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
 
-#: apply.c:4916 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4967 builtin/add.c:679 builtin/mv.c:304 builtin/rm.c:423
 msgid "Unable to write new index file"
 msgstr "No s'ha pogut escriure un fitxer d'índex nou"
 
-#: apply.c:4943 apply.c:4946 builtin/am.c:2208 builtin/am.c:2211
-#: builtin/clone.c:123 builtin/fetch.c:128 builtin/merge.c:273
-#: builtin/pull.c:208 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "camí"
-
-#: apply.c:4944
+#: apply.c:4995
 msgid "don't apply changes matching the given path"
 msgstr "no apliquis els canvis que coincideixin amb el camí donat"
 
-#: apply.c:4947
+#: apply.c:4998
 msgid "apply changes matching the given path"
 msgstr "aplica els canvis que coincideixin amb el camí donat"
 
-#: apply.c:4949 builtin/am.c:2217
+#: apply.c:5000 builtin/am.c:2317
 msgid "num"
 msgstr "número"
 
-#: apply.c:4950
+#: apply.c:5001
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "elimina <nombre> barres obliqües inicials dels camins de diferència "
 "tradicionals"
 
-#: apply.c:4953
+#: apply.c:5004
 msgid "ignore additions made by the patch"
 msgstr "ignora afegiments fets pel pedaç"
 
-#: apply.c:4955
+#: apply.c:5006
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
 
-#: apply.c:4959
+#: apply.c:5010
 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:4961
+#: apply.c:5012
 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:4963
+#: apply.c:5014
 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:4965
+#: apply.c:5016
 msgid "make sure the patch is applicable to the current index"
 msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
 
-#: apply.c:4967
+#: apply.c:5018
 msgid "mark new files with `git add --intent-to-add`"
-msgstr ""
+msgstr "marca els fitxers nous amb «git add --intent-to-add»"
 
-#: apply.c:4969
+#: apply.c:5020
 msgid "apply a patch without touching the working tree"
 msgstr "aplica un pedaç sense tocar l'arbre de treball"
 
-#: apply.c:4971
+#: apply.c:5022
 msgid "accept a patch that touches outside the working area"
 msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
 
-#: apply.c:4974
+#: apply.c:5025
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
 
-#: apply.c:4976
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
+#: apply.c:5027
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr "intenta una fusió de tres vies, si falla intenta llavors un pedaç normal"
 
-#: apply.c:4978
+#: apply.c:5029
 msgid "build a temporary index based on embedded index information"
 msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
 
-#: apply.c:4981 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
 msgid "paths are separated with NUL character"
 msgstr "els camins se separen amb el caràcter NUL"
 
-#: apply.c:4983
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
 msgstr "assegura't que almenys <n> línies de context coincideixin"
 
-#: apply.c:4984 builtin/am.c:2196 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3319 builtin/rebase.c:1421
+#: 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
 msgid "action"
 msgstr "acció"
 
-#: apply.c:4985
+#: apply.c:5036
 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:4988 apply.c:4991
+#: apply.c:5039 apply.c:5042
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignora els canvis d'espai en blanc en cercar context"
 
-#: apply.c:4994
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr "aplica el pedaç al revés"
 
-#: apply.c:4996
+#: apply.c:5047
 msgid "don't expect at least one line of context"
 msgstr "no esperis almenys una línia de context"
 
-#: apply.c:4998
+#: apply.c:5049
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
 
-#: apply.c:5000
+#: apply.c:5051
 msgid "allow overlapping hunks"
 msgstr "permet trossos encavalcants"
 
-#: apply.c:5001 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
+#: 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:5003
+#: apply.c:5054
 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:5006
+#: apply.c:5057
 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:5008 builtin/am.c:2205
+#: apply.c:5059 builtin/am.c:2305
 msgid "root"
 msgstr "arrel"
 
-#: apply.c:5009
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr "anteposa <arrel> a tots els noms de fitxer"
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "no es pot transmetre el blob %s"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "no s'ha pogut iniciar el filtre «%s»"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "no s'ha pogut redirigir el descriptor"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "«%s» error reportat pel filtre"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "el camí no és vàlid en UTF-8: %s"
+
+#: archive-zip.c:322
+#, c-format
+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
+#, c-format
+msgid "deflate error (%d)"
+msgstr "error de deflació (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>"
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<opcions>] <arbre> [<camí>...]"
@@ -816,212 +1609,186 @@ msgstr "git archive --list"
 msgid ""
 "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:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:188
+#, c-format
+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
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
 
-#: archive.c:396
+#: archive.c:451
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "no existeix la referència: %.*s"
 
-#: archive.c:401
+#: archive.c:457
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "no és un nom d'objecte vàlid: %s"
 
-#: archive.c:414
+#: archive.c:470
 #, c-format
 msgid "not a tree object: %s"
 msgstr "no és un objecte d'arbre: %s"
 
-#: archive.c:426
+#: archive.c:482
 msgid "current working directory is untracked"
-msgstr "no es segueix el directori de treball actual"
+msgstr "no se segueix el directori de treball actual"
 
-#: archive.c:457
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "Fitxer no trobat: %s"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "No és un fitxer normal: %s"
+
+#: archive.c:552
 msgid "fmt"
 msgstr "format"
 
-#: archive.c:457
+#: archive.c:552
 msgid "archive format"
 msgstr "format d'arxiu"
 
-#: archive.c:458 builtin/log.c:1597
+#: archive.c:553 builtin/log.c:1772
 msgid "prefix"
 msgstr "prefix"
 
-#: archive.c:459
+#: archive.c:554
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
 
-#: archive.c:460 builtin/blame.c:862 builtin/blame.c:874 builtin/blame.c:875
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1134
-#: builtin/fast-export.c:1136 builtin/grep.c:897 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: 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
 msgid "file"
 msgstr "fitxer"
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr "inclou els fitxers no seguits a l'arxiu"
+
+#: archive.c:559 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr "escriu l'arxiu a aquest fitxer"
 
-#: archive.c:463
+#: archive.c:561
 msgid "read .gitattributes in working directory"
 msgstr "llegeix .gitattributes en el directori de treball"
 
-#: archive.c:464
+#: archive.c:562
 msgid "report archived files on stderr"
 msgstr "informa de fitxers arxivats en stderr"
 
-#: archive.c:465
-msgid "store only"
-msgstr "només emmagatzema"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "comprimeix més ràpidament"
+#: archive.c:564
+msgid "set compression level"
+msgstr "estableix el nivell de compressió"
 
-#: archive.c:474
-msgid "compress better"
-msgstr "comprimeix millor"
-
-#: archive.c:477
+#: archive.c:567
 msgid "list supported archive formats"
 msgstr "llista els formats d'arxiu admesos"
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: 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
 msgid "repo"
-msgstr "dipòsit"
+msgstr "repositori"
 
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
 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:481 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:718
 #: builtin/notes.c:498
 msgid "command"
 msgstr "ordre"
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "camí a l'ordre git-upload-archive remota"
 
-#: archive.c:489
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr "Opció inesperada --remote"
 
-#: archive.c:491
+#: 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:493
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr "Opció inesperada --output"
 
-#: archive.c:515
+#: 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
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format d'arxiu desconegut «%s»"
 
-#: archive.c:522
+#: archive.c:616
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
-msgstr "Paràmetre no admès per al format «%s»: -%d"
-
-#: archive-tar.c:125 archive-zip.c:345
-#, fuzzy, c-format
-msgid "cannot stream blob %s"
-msgstr "no es pot emmagatzemar %s"
-
-#: archive-tar.c:260 archive-zip.c:363
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "mode de fitxer no compatible: 0%o (SHA1: %s)"
-
-#: archive-tar.c:287 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr "no es pot llegir «%s»"
+msgstr "Argument no admès per al format «%s»: -%d"
 
-#: archive-tar.c:459
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "no s'ha pogut iniciar el filtre «%s»"
-
-#: archive-tar.c:462
-msgid "unable to redirect descriptor"
-msgstr "no s'ha pogut redirigir el descriptor"
-
-#: archive-tar.c:469
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "«%s» error reportat pel filtre"
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "el camí no és vàlid en UTF-8: %s"
-
-#: archive-zip.c:318
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "el camí és massa llarg (%d caràcters, SHA1: %s): %s"
-
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
-#, c-format
-msgid "deflate error (%d)"
-msgstr "error de deflació (%d)"
-
-#: archive-zip.c:609
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "marca de temps massa gran per a aquest sistema: %<PRIuMAX>"
-
-#: attr.c:211
+#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no és un nom d'atribut vàlid"
 
-#: attr.c:368
+#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s no està permès: %s:%d"
 
-#: attr.c:408
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
 msgstr ""
 "Els patrons negatius s'ignoren en els atributs de git\n"
-"Useu '\\!' per exclamació capdavantera literal."
+"Useu «\\!» per exclamació capdavantera literal."
 
-#: bisect.c:468
+#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s"
 
-#: bisect.c:678
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "No podem bisecar més!\n"
 
-#: bisect.c:733
+#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No és un nom de comissió vàlid %s"
 
-#: bisect.c:758
+#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1030,7 +1797,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:763
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1039,7 +1806,7 @@ msgstr ""
 "La base de fusió %s és nova.\n"
 "La propietat s'ha canviat entre %s i [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:801
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1048,7 +1815,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:776
+#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1059,7 +1826,7 @@ msgstr ""
 "git bisect no pot funcionar correctament en aquest cas.\n"
 "Potser heu confós les revisions %s i %s?\n"
 
-#: bisect.c:789
+#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1071,45 +1838,45 @@ msgstr ""
 "%s.\n"
 "Continuem de totes maneres."
 
-#: bisect.c:822
+#: bisect.c:861
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisecant: s'ha de provar una base de fusió\n"
 
-#: bisect.c:865
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr "es necessita una revisió %s"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no s'ha pogut crear el fitxer «%s»"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no s'ha pogut llegir el fitxer «%s»"
 
-#: bisect.c:958
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "la lectura de les referències de bisecció ha fallat"
 
-#: bisect.c:977
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s era ambdós %s i %s\n"
 
-#: bisect.c:985
+#: bisect.c:1066
 #, 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 ""
 "No s'ha trobat cap comissió comprovable.\n"
 "Potser heu començat amb paràmetres de camí incorrectes?\n"
 
-#: bisect.c:1004
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1119,48 +1886,48 @@ msgstr[1] "(aproximadament %d passos)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1101
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisecant: manca %d revisió a provar després d'aquesta %s\n"
 msgstr[1] "Bisecant: manquen %d revisions a provar després d'aquesta %s\n"
 
-#: blame.c:2697
+#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents i --reverse no funcionen bé juntes."
 
-#: blame.c:2711
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr "no es pot usar --contents amb el nom d'objecte de la comissió final"
 
-#: blame.c:2732
+#: 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:2741 bundle.c:167 ref-filter.c:2196 remote.c:1938 sequencer.c:2033
-#: sequencer.c:4348 builtin/commit.c:1020 builtin/log.c:404 builtin/log.c:980
-#: builtin/log.c:1468 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3142 builtin/pack-objects.c:3157
-#: builtin/shortlog.c:192
+#: 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
 msgid "revision walk setup failed"
 msgstr "la configuració del passeig per revisions ha fallat"
 
-#: blame.c:2759
+#: 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"
 
-#: blame.c:2770
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "no hi ha tal camí %s en %s"
 
-#: blame.c:2781
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "no es pot llegir el blob %s per al camí %s"
@@ -1176,7 +1943,7 @@ 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\"."
+"invocant «git branch --set-upstream-to=%s%s%s»."
 
 #: branch.c:67
 #, c-format
@@ -1304,404 +2071,479 @@ msgstr "Nom d'objecte ambigu: «%s»."
 msgid "Not a valid branch point: '%s'."
 msgstr "No és un punt de ramificació vàlid: «%s»."
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "«%s» ja s'ha agafat a «%s»"
 
-#: branch.c:387
+#: branch.c:389
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD de l'arbre de treball %s no està actualitzat"
 
-#: bundle.c:36
+#: bundle.c:41
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "«%s» no sembla un fitxer de farcell v2"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "Algoritme de hash del farcell desconegut: %s"
 
-#: bundle.c:64
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "funcionalitat «%s» desconeguda"
+
+#: bundle.c:71
+#, 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
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "capçalera no reconeguda: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2283 sequencer.c:3024
-#: builtin/commit.c:791
+#: bundle.c:136 rerere.c:464 rerere.c:674 sequencer.c:2593 sequencer.c:3385
+#: builtin/commit.c:861
 #, c-format
 msgid "could not open '%s'"
 msgstr "no s'ha pogut obrir «%s»"
 
-#: bundle.c:143
+#: bundle.c:189
 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:146
+#: bundle.c:192
 msgid "need a repository to verify a bundle"
-msgstr "cal un dipòsit per verificar un farcell"
+msgstr "cal un repositori per verificar un farcell"
 
-#: bundle.c:197
+#: bundle.c:243
 #, 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:204
+#: bundle.c:250
 msgid "The bundle records a complete history."
 msgstr "El farcell registra una història completa."
 
-#: bundle.c:206
+#: bundle.c:252
 #, 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:272
+#: bundle.c:319
 msgid "unable to dup bundle descriptor"
 msgstr "no s'ha pogut duplicar el descriptor del farcell"
 
-#: bundle.c:279
+#: bundle.c:326
 msgid "Could not spawn pack-objects"
-msgstr "No s'ha pogut executar el pack-objects"
+msgstr "No s'ha pogut generar el pack-objects"
 
-#: bundle.c:290
+#: bundle.c:337
 msgid "pack-objects died"
 msgstr "El pack-objects s'ha mort"
 
-#: bundle.c:332
-msgid "rev-list died"
-msgstr "El rev-list s'ha mort"
-
-#: bundle.c:381
+#: bundle.c:386
 #, 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:460 builtin/log.c:212 builtin/log.c:1749 builtin/shortlog.c:306
+#: bundle.c:490
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "versió del farcell no compatible %d"
+
+#: bundle.c:492
+#, 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
 #, c-format
 msgid "unrecognized argument: %s"
-msgstr "paràmetre no reconegut: %s"
+msgstr "argument no reconegut: %s"
 
-#: bundle.c:468
+#: bundle.c:539
 msgid "Refusing to create empty bundle."
 msgstr "S'està refusant crear un farcell buit."
 
-#: bundle.c:478
+#: bundle.c:549
 #, c-format
 msgid "cannot create '%s'"
 msgstr "no es pot crear «%s»"
 
-#: bundle.c:503
+#: bundle.c:574
 msgid "index-pack died"
 msgstr "L'index-pack s'ha mort"
 
-#: color.c:296
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "valor de color no vàlid: %.*s"
-
-#: commit.c:50 sequencer.c:2727 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1378 builtin/am.c:2020 builtin/replace.c:455
-#, c-format
-msgid "could not parse %s"
-msgstr "no s'ha pogut analitzar %s"
-
-#: commit.c:52
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s no és una comissió!"
-
-#: commit.c:192
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
+#: chunk-format.c:113
+msgid "terminating chunk id appears earlier than expected"
 msgstr ""
+"l'identificador de fragment de finalització apareix abans del que "
+"s'esperava"
 
-#: commit.c:1127
+#: chunk-format.c:122
 #, 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."
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr ""
+"desplaçament incorrecte del fragment %<PRIx64> and %<PRIx64>"
 
-#: commit.c:1130
+#: chunk-format.c:129
 #, 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."
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "S'ha trobat un ID del fragment %<PRIx32> duplicat"
 
-#: commit.c:1133
+#: chunk-format.c:143
 #, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "La comissió %s no té signatura GPG."
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "El fragment final té un id %<PRIx32> que no és zero"
 
-#: commit.c:1136
+#: color.c:329
 #, 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"
+msgid "invalid color value: %.*s"
+msgstr "valor de color no vàlid: %.*s"
 
-#: commit.c:1390
-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 ""
-"Advertència: el missatge de comissió no és compatible amb UTF-8.\n"
-"Potser voleu esmenar-lo després de corregir el missatge, o establir\n"
-"la variable de configuració i18n.commitencoding a la codificació que\n"
-"usi el vostre projecte.\n"
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr "especificació de hash no vàlida"
 
-#: commit-graph.c:127
+#: commit-graph.c:262
 msgid "commit-graph file is too small"
-msgstr ""
+msgstr "el fitxer del graf de comissions és massa petit"
 
-#: commit-graph.c:192
+#: commit-graph.c:355
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
-msgstr "la signatura del graf de comissions %X no coincideix amb la signatura %X"
+msgstr ""
+"la signatura del graf de comissions %X no coincideix amb la signatura %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:362
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "la versió del graf de comissions %X no coincideix amb la versió %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
-msgstr "la versió del hash del graf de comissions %X no coincideix amb la versió %X"
-
-#: commit-graph.c:229
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-
-#: commit-graph.c:240
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
 msgstr ""
+"la versió del hash del graf de comissions %X no coincideix amb la versió %X"
 
-#: commit-graph.c:283
+#: commit-graph.c:386
 #, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
+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"
 
-#: commit-graph.c:347
+#: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
-msgstr ""
+msgstr "el fragment del graf de comissions no té grafs de base"
 
-#: commit-graph.c:357
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr "la cadena del graf de comissions no coincideix"
 
-#: commit-graph.c:404
+#: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr ""
+"la cadena del graf de comissions no és vàlida: la línia «%s» no és un hash"
 
-#: commit-graph.c:430
+#: commit-graph.c:564
 msgid "unable to find all commit-graph files"
 msgstr "no es poden trobar tots els fitxers del graf de comissions"
 
-#: commit-graph.c:553 commit-graph.c:613
+#: commit-graph.c:745 commit-graph.c:782
 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"
+msgstr ""
+"posició de la comissió no vàlida. Probablement el graf de comissions està "
+"malmès"
 
-#: commit-graph.c:574
+#: commit-graph.c:766
 #, c-format
 msgid "could not find commit %s"
 msgstr "no s'ha pogut trobar la comissió %s"
 
-#: commit-graph.c:1001 builtin/pack-objects.c:2651
+#: commit-graph.c:799
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+
+#: commit-graph.c:1075 builtin/am.c:1340
+#, 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
 #, 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:1033
+#: commit-graph.c:1368
 msgid "Loading known commits in commit graph"
 msgstr "S'estan carregant comissions conegudes al graf de comissions"
 
-#: commit-graph.c:1050
+#: commit-graph.c:1385
 msgid "Expanding reachable commits in commit graph"
 msgstr "S'estan expandint les comissions abastables al graf de comissions"
 
-#: commit-graph.c:1069
+#: commit-graph.c:1405
 msgid "Clearing commit marks in commit graph"
-msgstr "S'estan netejant les marques de comissions al graf de comissions"
+msgstr "S'estan esborrant les marques de comissions al graf de comissions"
 
-#: commit-graph.c:1088
+#: commit-graph.c:1424
+msgid "Computing commit graph topological levels"
+msgstr "S'estan calculant els nivells topològics del graf de comissions"
+
+#: commit-graph.c:1477
 msgid "Computing commit graph generation numbers"
 msgstr "S'estan calculant els nombres de generació del graf de comissions"
 
-#: commit-graph.c:1162
+#: commit-graph.c:1558
+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
+msgid "Collecting referenced commits"
+msgstr "S'estan recollint els objectes referenciats"
+
+#: 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] "S'estan cercant les comissions pel graf de comissions en %d paquet"
 msgstr[1] "S'estan cercant les comissions pel graf de comissions en %d paquets"
 
-#: commit-graph.c:1175
+#: commit-graph.c:1673
 #, c-format
 msgid "error adding pack %s"
 msgstr "error en afegir paquet %s"
 
-#: commit-graph.c:1179
+#: commit-graph.c:1677
 #, c-format
 msgid "error opening index for %s"
 msgstr "s'ha produït un error en obrir l'índex per «%s»"
 
-#: commit-graph.c:1203
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "S'estan cercant les comissions pel graf de comissions des de %d referència"
-msgstr[1] "S'estan cercant les comissions pel graf de comissions des de %d referències"
-
-#: commit-graph.c:1237
+#: commit-graph.c:1714
 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:1252
-msgid "Counting distinct commits in commit graph"
-msgstr "S'estant comptant les comissions diferents al graf de comissions"
+msgstr ""
+"S'estan cercant les comissions pel graf de comissions entre els objectes "
+"empaquetats"
 
-#: commit-graph.c:1283
+#: commit-graph.c:1732
 msgid "Finding extra edges in commit graph"
 msgstr "S'estan cercant les vores addicionals al graf de comissions"
 
-#: commit-graph.c:1331
+#: commit-graph.c:1781
 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"
+msgstr ""
+"s'ha produït un error en escriure el nombre correcte d'ids base del graf"
 
-#: commit-graph.c:1364 midx.c:811
+#: commit-graph.c:1812 midx.c:906
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "no s'han pogut crear els directoris inicials de «%s»"
 
-#: commit-graph.c:1376 builtin/index-pack.c:306 builtin/repack.c:251
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr "no s'ha pogut crear una capa de graf temporal"
+
+#: commit-graph.c:1830
 #, c-format
-msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear «%s»"
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "no s'han pogut ajustar els permisos compartits per a «%s»"
 
-#: commit-graph.c:1436
+#: 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] "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:1477
+#: commit-graph.c:1923
 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:1489
+#: commit-graph.c:1939
 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:1509
+#: commit-graph.c:1959
 msgid "failed to rename temporary commit-graph file"
-msgstr "no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
+msgstr ""
+"no s'ha pogut canviar el nom del fitxer temporal del graf de comissions"
 
-#: commit-graph.c:1620
+#: commit-graph.c:2092
 msgid "Scanning merged commits"
 msgstr "S'estan escanejant les comissions fusionades"
 
-#: commit-graph.c:1631
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "id de comissió duplicat %s no esperat"
-
-#: commit-graph.c:1656
+#: commit-graph.c:2136
 msgid "Merging commit-graph"
 msgstr "S'està fusionant el graf de comissions"
 
-#: commit-graph.c:1842
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "el format del graf de comissions no pot escriure %d comissions"
+#: commit-graph.c:2244
+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:1853
+#: commit-graph.c:2351
 msgid "too many commits to write graph"
 msgstr "massa comissions per escriure un graf"
 
-#: commit-graph.c:1943
+#: commit-graph.c:2450
 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:1953
+#: commit-graph.c:2460
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
-msgstr ""
+msgstr "el gràfic de comissions té una ordre OID incorrecta; %s llavors %s"
 
-#: commit-graph.c:1963 commit-graph.c:1978
+#: commit-graph.c:2470 commit-graph.c:2485
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
+"el graf de comissions té un valor de «fanout» incorrecte: fanout[%d] = %u != "
+"%u"
 
-#: commit-graph.c:1970
+#: commit-graph.c:2477
 #, 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"
+msgstr ""
+"s'ha produït un error en analitzar la comissió %s del graf de comissions"
 
-#: commit-graph.c:1987
+#: commit-graph.c:2495
 msgid "Verifying commits in commit graph"
 msgstr "S'estan verificant les comissions al graf de comissions"
 
-#: commit-graph.c:2000
+#: commit-graph.c:2510
 #, 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:2007
+#: commit-graph.c:2517
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
+"OID de l'arbre arrel per a comissions %s en el graf de comissions és %s != %s"
 
-#: commit-graph.c:2017
+#: commit-graph.c:2527
 #, 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:2026
+#: commit-graph.c:2536
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
-msgstr ""
+msgstr "el pare pel graf de comissions %s és %s != %s"
 
-#: commit-graph.c:2039
+#: commit-graph.c:2550
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
-msgstr ""
+msgstr "la llista pare del graf de comissions per %s acaba aviat"
 
-#: commit-graph.c:2044
+#: commit-graph.c:2555
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
+"El graf de comissions té nombre de generació zero per a la comissió %s, però "
+"té no zero en altres llocs"
 
-#: commit-graph.c:2048
+#: commit-graph.c:2559
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
+"El graf de comissions té un nombre de generació diferent de zero per a "
+"comissió %s però té zero en altres llocs"
 
-#: commit-graph.c:2063
+#: commit-graph.c:2576
 #, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr ""
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "generació del graf de comissions per a la comissió %s és %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c:2069
+#: commit-graph.c:2582
 #, 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 "
+"%<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
+#, c-format
+msgid "could not parse %s"
+msgstr "no s'ha pogut analitzar %s"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s no és una comissió!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+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"
+"«git config advice.graftFileDeprecated false»"
+
+#: commit.c:1237
+#, 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
+#, 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
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "La comissió %s no té signatura GPG."
+
+#: commit.c:1247
+#, 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
+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 ""
+"Advertència: el missatge de comissió no és compatible amb UTF-8.\n"
+"Potser voleu esmenar-lo després de corregir el missatge, o establir\n"
+"la variable de configuració i18n.commitencoding a la codificació que\n"
+"usi el vostre projecte.\n"
 
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "memòria esgotada"
 
-#: config.c:124
+#: config.c:126
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1710,303 +2552,347 @@ msgid ""
 "\t%s\n"
 "This might be due to circular includes."
 msgstr ""
+"s'ha superat la profunditat màxima d'inclusió (%d) mentre s'incloïen\n"
+"\t%s\n"
+"des de\n"
+"\t%s\n"
+"Això pot ser degut a inclusions circulars."
 
-#: config.c:140
+#: config.c:142
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "no s'ha pogut expandir el camí d'inclusió «%s»"
 
-#: config.c:151
+#: config.c:153
 msgid "relative config includes must come from files"
 msgstr "les inclusions de configuració relatives han de venir de fitxers"
 
-#: config.c:197
+#: config.c:199
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "els condicionals d'inclusió de configuració relatius han de venir de fitxers"
 
-#: config.c:375
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "format de configuració no vàlid: %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 "la clau no conté una secció: «%s»"
 
-#: config.c:381
+#: config.c:448
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "la clau no conté un nom de variable: «%s»"
 
-#: config.c:405 sequencer.c:2463
+#: config.c:472 sequencer.c:2785
 #, c-format
 msgid "invalid key: %s"
 msgstr "clau no vàlida: %s"
 
-#: config.c:411
+#: config.c:478
 #, c-format
 msgid "invalid key (newline): %s"
-msgstr "clau no vàlida (línea nova): %s"
+msgstr "clau no vàlida (línia nova): %s"
+
+#: config.c:511
+msgid "empty config key"
+msgstr "clau de configuració buida"
 
-#: config.c:447 config.c:459
+#: config.c:529 config.c:541
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "paràmetre de configuració erroni: %s"
 
-#: config.c:494
+#: config.c:555 config.c:572 config.c:579 config.c:588
 #, c-format
 msgid "bogus format in %s"
 msgstr "format erroni a %s"
 
-#: config.c:820
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "comptatge erroni a %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "hi ha massa arguments a %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "falta la clau de configuració %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "falta el valor de configuració %s"
+
+#: config.c:995
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "línia de configuració %d errònia en el blob %s"
 
-#: config.c:824
+#: config.c:999
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "línia de configuració %d errònia en el fitxer %s"
 
-#: config.c:828
+#: config.c:1003
 #, 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:832
+#: config.c:1007
 #, 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:836
+#: config.c:1011
 #, 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:840
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "línia de configuració %d errònia en %s"
 
-#: config.c:977
+#: config.c:1152
 msgid "out of range"
 msgstr "fora de rang"
 
-#: config.c:977
+#: config.c:1152
 msgid "invalid unit"
 msgstr "unitat no vàlida"
 
-#: config.c:978
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
 
-#: config.c:997
+#: config.c:1163
 #, 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:1000
+#: config.c:1166
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "valor de configuració numèric «%s» erroni per «%s» en el fitxer %s: %s"
 
-#: config.c:1003
+#: config.c:1169
 #, 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"
 
-#: config.c:1006
+#: config.c:1172
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
-"valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul "
+"valor de configuració numèric «%s» erroni per «%s» en el blob de submòdul "
 "%s: %s"
 
-#: config.c:1009
+#: config.c:1175
 #, 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:1012
+#: config.c:1178
 #, 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:1107
+#: config.c:1257
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "valor de configuració booleà erroni «%s» per a «%s»"
+
+#: config.c:1275
 #, 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:1116
+#: config.c:1284
 #, 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:1207
+#: config.c:1377
 #, c-format
 msgid "abbrev length out of range: %d"
-msgstr ""
+msgstr "la longitud d'«abbrev» està fora de rang: %d"
 
-#: config.c:1221 config.c:1232
+#: config.c:1391 config.c:1402
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "nivell de compressió de zlib incorrecte %d"
 
-#: config.c:1324
+#: config.c:1494
 msgid "core.commentChar should only be one character"
-msgstr ""
+msgstr "core.commentChar només hauria de ser un caràcter"
 
-#: config.c:1357
+#: config.c:1527
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode de creació d'objecte no vàlid: %s"
 
-#: config.c:1429
+#: config.c:1599
 #, c-format
 msgid "malformed value for %s"
 msgstr "valor no vàlid per a %s"
 
-#: config.c:1455
+#: config.c:1625
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "valor no vàlid per a %s: %s"
 
-#: config.c:1456
+#: config.c:1626
 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:1517 builtin/pack-objects.c:3399
+#: config.c:1687 builtin/pack-objects.c:3924
 #, c-format
 msgid "bad pack compression level %d"
-msgstr "nivell de compressió de paquet %d Erroni"
+msgstr "nivell de compressió de paquet %d erroni"
 
-#: config.c:1638
+#: config.c:1809
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "no s'ha pogut carregar l'objecte blob de configuració «%s»"
 
-#: config.c:1641
+#: config.c:1812
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "la referència «%s» no assenyala a un blob"
 
-#: config.c:1658
+#: config.c:1829
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "no s'ha pogut resoldre el blob de configuració: «%s»"
 
-#: config.c:1688
+#: config.c:1873
 #, c-format
 msgid "failed to parse %s"
 msgstr "s'ha produït un error en analitzar %s"
 
-#: config.c:1744
+#: config.c:1929
 msgid "unable to parse command-line config"
 msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
 
-#: config.c:2093
+#: config.c:2293
 msgid "unknown error occurred while reading the configuration files"
 msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
 
-#: config.c:2263
+#: config.c:2467
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s no vàlid: «%s»"
 
-#: config.c:2306
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
-"valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte "
-"«keep»"
-
-#: config.c:2332
+#: config.c:2512
 #, 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:2378
+#: config.c:2558
 #, 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:2380
+#: config.c:2560
 #, 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:2461
+#: config.c:2644
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nom de secció no vàlid «%s»"
 
-#: config.c:2493
+#: config.c:2676
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s té múltiples valors"
 
-#: config.c:2522
+#: config.c:2705
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "no es pot escriure un nou fitxer de configuració %s"
 
-#: config.c:2774 config.c:3098
+#: config.c:2957 config.c:3283
 #, c-format
 msgid "could not lock config file %s"
 msgstr "no s'ha pogut blocar el fitxer de configuració %s"
 
-#: config.c:2785
+#: config.c:2968
 #, c-format
 msgid "opening %s"
 msgstr "s'està obrint %s"
 
-#: config.c:2820 builtin/config.c:328
+#: config.c:3005 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "patró no vàlid: %s"
 
-#: config.c:2845
+#: config.c:3030
 #, c-format
 msgid "invalid config file %s"
 msgstr "fitxer de configuració no vàlid %s"
 
-#: config.c:2858 config.c:3111
+#: config.c:3043 config.c:3296
 #, c-format
 msgid "fstat on %s failed"
 msgstr "ha fallat «fstat» a %s"
 
-#: config.c:2869
+#: config.c:3054
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "no s'ha pogut fer «mmap» «%s»"
 
-#: config.c:2878 config.c:3116
+#: config.c:3063 config.c:3301
 #, c-format
 msgid "chmod on %s failed"
 msgstr "ha fallat chmod a %s"
 
-#: config.c:2963 config.c:3213
+#: config.c:3148 config.c:3398
 #, c-format
 msgid "could not write config file %s"
 msgstr "no s'ha pogut escriure el fitxer de configuració «%s»"
 
-#: config.c:2997
+#: config.c:3182
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no s'ha pogut establir «%s» a «%s»"
 
-#: config.c:2999 builtin/remote.c:782
+#: config.c:3184 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr "no s'ha pogut desassignar «%s»"
 
-#: config.c:3089
+#: config.c:3274
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nom de secció no vàlida: %s"
 
-#: config.c:3256
+#: config.c:3441
 #, c-format
 msgid "missing value for '%s'"
 msgstr "falta el valor per «%s»"
@@ -2022,83 +2908,92 @@ 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
 msgid "server doesn't support '%s'"
 msgstr "el servidor no és compatible amb «%s»"
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "el servidor no és compatible amb la característica «%s»"
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
-msgstr ""
+msgstr "s'esperava un buidatge després de les capacitats"
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
-msgstr ""
+msgstr "ignora les capacitats després de la primera línia «%s»"
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
-msgstr ""
+msgstr "error de protocol: unexpected capabilities^{}"
 
-#: connect.c:273
+#: connect.c:306
 #, 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:275
+#: connect.c:308
 msgid "repository on the other end cannot be shallow"
-msgstr ""
+msgstr "el repositori de l'altre extrem no pot ser shallow"
 
-#: connect.c:313
+#: connect.c:347
 msgid "invalid packet"
 msgstr "paquet no vàlid"
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "s'ha produït un error de protocol: no s'esperava «%s»"
 
-#: connect.c:441
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "format d'objecte «%s» especificat pel servidor desconegut"
+
+#: connect.c:526
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "resposta de ls-refs no vàlida: %s"
 
-#: connect.c:445
+#: connect.c:530
 msgid "expected flush after ref listing"
-msgstr ""
+msgstr "s'esperava una neteja després del llistat de referències"
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "s'esperava un final de resposta després del llistat de referències"
 
-#: connect.c:544
+#: connect.c:666
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "el protocol «%s» no és compatible"
 
-#: connect.c:595
+#: connect.c:717
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "no s'ha pogut establir SO_KEEPALIVE al sòcol"
 
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
 #, c-format
 msgid "Looking up %s ... "
 msgstr "S'està cercant %s..."
 
-#: connect.c:639
+#: connect.c:761
 #, 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:643 connect.c:714
+#: connect.c:765 connect.c:836
 #, c-format
 msgid ""
 "done.\n"
@@ -2107,7 +3002,7 @@ msgstr ""
 "fet.\n"
 "S'està connectant a %s (port %s) ... "
 
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2117,87 +3012,93 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
 msgid "done."
 msgstr "fet."
 
-#: connect.c:702
+#: connect.c:824
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "no s'ha pogut trobar %s (%s)"
 
-#: connect.c:708
+#: connect.c:830
 #, c-format
 msgid "unknown port %s"
 msgstr "port desconegut %s"
 
-#: connect.c:845 connect.c:1171
+#: connect.c:967 connect.c:1299
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "s'ha bloquejat el nom estrany d'amfitrió «%s»"
 
-#: connect.c:847
+#: connect.c:969
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "s'ha bloquejat el port estrany «%s»"
 
-#: connect.c:857
+#: connect.c:979
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "no s'ha pogut iniciar servidor intermediari «%s»"
 
-#: connect.c:924
+#: connect.c:1050
 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 sintaxis vàlida per URL"
+msgstr ""
+"no s'ha especificat un camí; vegeu «git help pull» per la sintaxi vàlida per "
+"URL"
+
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
 
-#: connect.c:1119
+#: connect.c:1247
 msgid "ssh variant 'simple' does not support -4"
-msgstr "la variant «simple» d'ssh no és compatible amb -4"
+msgstr "la variant «simple» de ssh no és compatible amb -4"
 
-#: connect.c:1131
+#: connect.c:1259
 msgid "ssh variant 'simple' does not support -6"
-msgstr "la variant «simple» d'ssh no és compatible amb -6"
+msgstr "la variant «simple» de ssh no és compatible amb -6"
 
-#: connect.c:1148
+#: connect.c:1276
 msgid "ssh variant 'simple' does not support setting port"
-msgstr "la variant «simple» d'ssh no permet definir el port"
+msgstr "la variant «simple» de ssh no permet definir el port"
 
-#: connect.c:1260
+#: connect.c:1388
 #, c-format
 msgid "strange pathname '%s' blocked"
-msgstr "s'ha bloquejat el nom de fitxer extrany «%s»"
+msgstr "s'ha bloquejat el nom de fitxer estrany «%s»"
 
-#: connect.c:1307
+#: connect.c:1436
 msgid "unable to fork"
 msgstr "no s'ha pogut bifurcar"
 
-#: connected.c:86 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:188 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "S'està comprovant la connectivitat"
 
-#: connected.c:98
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
-msgstr "No s'ha pogut executar 'git rev-list'"
+msgstr "No s'ha pogut executar «git rev-list»"
 
-#: connected.c:118
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr "escriptura fallada al rev-list"
 
-#: connected.c:125
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "s'ha produït un error en tancar l'stdin del rev-list"
 
-#: convert.c:193
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
-msgstr ""
+msgstr "crlf_action %d il·legal"
 
-#: convert.c:206
+#: convert.c:196
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
-msgstr "CRLF es reemplaçà per LF en %s."
+msgstr "CRLF es reemplaçà per LF en %s"
 
-#: convert.c:208
+#: convert.c:198
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2205,14 +3106,14 @@ msgid ""
 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."
+"directori de treball"
 
-#: convert.c:216
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
-msgstr "LF es reemplaçà per LF en %s"
+msgstr "LF es reemplaçà per CRLF en %s"
 
-#: convert.c:218
+#: convert.c:208
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2220,143 +3121,179 @@ msgid ""
 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."
+"directori de treball"
 
-#: convert.c:279
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr ""
+msgstr "BOM està prohibida a «%s» si està codificada com a %s"
 
-#: convert.c:286
+#: convert.c:280
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"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."
 
-#: convert.c:304
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
-msgstr ""
+msgstr "La BOM és necessària en «%s» si està codificada com a %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-"
 "%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."
 
-#: convert.c:424 convert.c:495
+#: convert.c:408 convert.c:479
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "s'ha produït un error en codificar «%s» des de %s a %s"
 
-#: convert.c:467
+#: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "codificar «%s» des de %s a %s i cap enrere no és el mateix"
 
-#: convert.c:673
+#: convert.c:654
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "no es pot bifurcar per a executar el filtre extern «%s»"
 
-#: convert.c:693
+#: convert.c:674
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "no es pot alimentar l'entrada al filtre extern «%s»"
 
-#: convert.c:700
+#: convert.c:681
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "el filtre extern «%s» ha fallat %d"
 
-#: convert.c:735 convert.c:738
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "la lectura del filtre extern «%s» ha fallat"
 
-#: convert.c:741 convert.c:796
+#: convert.c:722 convert.c:777
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "el filtre extern «%s» ha fallat"
 
-#: convert.c:844
+#: convert.c:826
 msgid "unexpected filter type"
 msgstr "tipus de filtre inesperat"
 
-#: convert.c:855
+#: convert.c:837
 msgid "path name too long for external filter"
-msgstr ""
+msgstr "el nom del camí és massa gran per al filtre extern"
 
-#: convert.c:929
+#: convert.c:934
 #, 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"
 
-#: convert.c:1228
+#: convert.c:1234
 msgid "true/false are no valid working-tree-encodings"
-msgstr ""
+msgstr "cert/fals no són codificacions d'arbre de treball vàlides"
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1414 convert.c:1447
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: el filtre de netejat «%s» ha fallat"
 
-#: convert.c:1476
-#, fuzzy, c-format
+#: convert.c:1490
+#, c-format
 msgid "%s: smudge filter %s failed"
-msgstr "s'ha produït un error en actualitzar els fitxers"
+msgstr "%s: ha fallat el filtre smudge %s"
+
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "s'està ometent la cerca de credencials per una clau: credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr ""
+"s'ha rebutjat treballar amb credencials que no tenen el camp d'amfitrió"
+
+#: credential.c:114
+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
+#, 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
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "l'url no té esquema: %s"
 
-#: date.c:137
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "no s'ha pogut analitzar l'URL de credencials: %s"
+
+#: date.c:138
 msgid "in the future"
 msgstr "en el futur"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "fa %<PRIuMAX> segon"
 msgstr[1] "fa %<PRIuMAX> segons"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "fa %<PRIuMAX> minut"
 msgstr[1] "fa %<PRIuMAX> minuts"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "fa %<PRIuMAX> hora"
 msgstr[1] "fa %<PRIuMAX> hores"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "fa %<PRIuMAX> dia"
 msgstr[1] "fa %<PRIuMAX> dies"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "fa %<PRIuMAX> setmana"
 msgstr[1] "fa %<PRIuMAX> setmanes"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "fa %<PRIuMAX> mes"
 msgstr[1] "fa %<PRIuMAX> mesos"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2364,14 +3301,14 @@ msgstr[0] "%<PRIuMAX> any"
 msgstr[1] "%<PRIuMAX> anys"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
 msgstr[0] "fa %s i %<PRIuMAX> mes"
 msgstr[1] "fa %s i %<PRIuMAX> mesos"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2405,14 +3342,30 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr "Marcades %d illes, fet.\n"
 
-#: diffcore-order.c:24
+#: diff-merges.c:80
 #, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
+msgid "unknown value for --diff-merges: %s"
+msgstr "valor desconegut per a --diff-merges: %s"
 
-#: diffcore-rename.c:544
-msgid "Performing inexact rename detection"
-msgstr "S'està realitzant una detecció inexacta de canvis de nom"
+#: diff-lib.c:538
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base no funciona amb intervals"
+
+#: diff-lib.c:540
+msgid "--merge-base only works with commits"
+msgstr "--merge-base només funciona amb comissions"
+
+#: diff-lib.c:557
+msgid "unable to get HEAD"
+msgstr "no s'ha pogut obtenir HEAD"
+
+#: diff-lib.c:564
+msgid "no merge base found"
+msgstr "no s'ha trobat una base de fusió"
+
+#: diff-lib.c:566
+msgid "multiple merge bases found"
+msgstr "s'han trobat múltiples bases de fusió"
 
 #: diff-no-index.c:238
 msgid "git diff --no-index [<options>] <path> <path>"
@@ -2423,23 +3376,22 @@ 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:155
+#: diff.c:156
 #, 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:160
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Paràmetre de dirstat desconegut «%s»\n"
 
-#: diff.c:296
+#: diff.c:297
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -2447,63 +3399,68 @@ msgstr ""
 "el paràmetre de color en moviment ha de ser «no», «default», «blocks», "
 "«zebra», «dimmed-zebra» o «plain»"
 
-#: diff.c:324
+#: diff.c:325
 #, 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 ""
+"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»"
 
-#: diff.c:332
+#: diff.c:333
 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"
 
-#: diff.c:405
+#: diff.c:410
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
-"Valor desconegut de la variable de configuració de 'diff.submodule': «%s»"
+"Valor desconegut de la variable de configuració de «diff.submodule»: «%s»"
 
-#: diff.c:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
-"S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
+"S'han trobat errors en la variable de configuració «diff.dirstat»:\n"
 "%s"
 
-#: diff.c:4215
+#: diff.c:4278
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "el diff external s'ha mort, s'està aturant a %s"
 
-#: diff.c:4560
+#: 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:4563
+#: 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:4641
+#: diff.c:4712
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requereix exactament una especificació de camí"
 
-#: diff.c:4689
-#,  c-format
+#: diff.c:4760
+#, c-format
 msgid "invalid --stat value: %s"
 msgstr "valor --stat no vàlid: %s"
 
-#: diff.c:4694 diff.c:4699 diff.c:4704 diff.c:4709 diff.c:5222
-#: parse-options.c:199 parse-options.c:203
+#: 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
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s espera un valor numèric"
 
-#: diff.c:4726
+#: diff.c:4797
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2512,499 +3469,542 @@ msgstr ""
 "S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4811
+#: diff.c:4882
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "classe de canvi «%c» desconeguda a --diff-filter=%s"
 
-#: diff.c:4835
+#: diff.c:4906
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valor desconegut després de ws-error-highlight=%.*s"
 
-#: diff.c:4849
+#: diff.c:4920
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "no s'ha pogut resoldre «%s»"
 
-#: diff.c:4899 diff.c:4905
+#: diff.c:4970 diff.c:4976
 #, c-format
 msgid "%s expects <n>/<m> form"
-msgstr ""
+msgstr "%s espera una forma <n>/<m>"
 
-#: diff.c:4917
+#: diff.c:4988
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s esperava un caràcter, s'ha rebut «%s»"
 
-#: diff.c:4938
+#: diff.c:5009
 #, c-format
 msgid "bad --color-moved argument: %s"
-msgstr "paràmetre --color-moved incorrecte: %s"
+msgstr "argument --color-moved incorrecte: %s"
 
-#: diff.c:4957
+#: diff.c:5028
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "mode «%s» no vàlid en -color-moved-ws"
+msgstr "mode «%s» no vàlid en --color-moved-ws"
 
-#: diff.c:4997
+#: diff.c:5068
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
-"l'opció diff-algorithm accepta «myers», «minimal», «patience» i "
-"«histogram»"
+"l'opció diff-algorithm accepta «myers», «minimal», «patience» i «histogram»"
 
-#: diff.c:5033 diff.c:5053
+#: diff.c:5104 diff.c:5124
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argument no vàlid a %s"
 
-#: diff.c:5191
+#: diff.c:5228
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "expressió regular donada a -I: no vàlida: «%s»"
+
+#: diff.c:5277
 #, 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:5247
+#: diff.c:5333
 #, c-format
 msgid "bad --word-diff argument: %s"
-msgstr "paràmetre --word-diff incorrecte: %s"
+msgstr "argument --word-diff incorrecte: %s"
 
-#: diff.c:5270
+#: diff.c:5369
 msgid "Diff output format options"
 msgstr "Opcions del format de sortida del diff"
 
-#: diff.c:5272 diff.c:5278
+#: diff.c:5371 diff.c:5377
 msgid "generate patch"
 msgstr "generant pedaç"
 
-#: diff.c:5275 builtin/log.c:182
+#: diff.c:5374 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "omet la sortida de diferències"
 
-#: diff.c:5280 diff.c:5394 diff.c:5401
+#: diff.c:5379 diff.c:5493 diff.c:5500
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5281 diff.c:5284
+#: diff.c:5380 diff.c:5383
 msgid "generate diffs with <n> lines context"
 msgstr "genera diffs amb <n> línies de context"
 
-#: diff.c:5286
+#: diff.c:5385
 msgid "generate the diff in raw format"
 msgstr "genera el diff en format cru"
 
-#: diff.c:5289
+#: diff.c:5388
 msgid "synonym for '-p --raw'"
-msgstr "sinònim de per a «-p --raw»"
+msgstr "sinònim de «-p --raw»"
 
-#: diff.c:5293
+#: diff.c:5392
 msgid "synonym for '-p --stat'"
-msgstr "sinònim de per a «-p --stat»"
+msgstr "sinònim de «-p --stat»"
 
-#: diff.c:5297
+#: diff.c:5396
 msgid "machine friendly --stat"
 msgstr "llegible per màquina --stat"
 
-#: diff.c:5300
+#: diff.c:5399
 msgid "output only the last line of --stat"
 msgstr "mostra només l'última línia de --stat"
 
-#: diff.c:5302 diff.c:5310
+#: diff.c:5401 diff.c:5409
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5303
+#: diff.c:5402
 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:5307
+#: diff.c:5406
 msgid "synonym for --dirstat=cumulative"
-msgstr "sinònim per -dirstat=cumulative"
+msgstr "sinònim de --dirstat=cumulative"
 
-#: diff.c:5311
+#: diff.c:5410
 msgid "synonym for --dirstat=files,param1,param2..."
-msgstr "sinònim per --dirstat=files,param1,param2..."
+msgstr "sinònim de --dirstat=files,param1,param2..."
 
-#: diff.c:5315
+#: diff.c:5414
 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:5318
+#: diff.c:5417
 msgid "condensed summary such as creations, renames and mode changes"
-msgstr ""
+msgstr "resum condensat com ara creacions, canvis de nom i mode"
 
-#: diff.c:5321
+#: diff.c:5420
 msgid "show only names of changed files"
 msgstr "mostra només els noms de fitxers canviats"
 
-#: diff.c:5324
+#: diff.c:5423
 msgid "show only names and status of changed files"
 msgstr "mostra només els noms i l'estat dels fitxers canviats"
 
-#: diff.c:5326
+#: diff.c:5425
 msgid "<width>[,<name-width>[,<count>]]"
-msgstr ""
+msgstr "<amplada>[<amplada-nom>[,<recompte>]]"
 
-#: diff.c:5327
+#: diff.c:5426
 msgid "generate diffstat"
 msgstr "genera diffstat"
 
-#: diff.c:5329 diff.c:5332 diff.c:5335
+#: diff.c:5428 diff.c:5431 diff.c:5434
 msgid "<width>"
 msgstr "<amplada>"
 
-#: diff.c:5330
+#: diff.c:5429
 msgid "generate diffstat with a given width"
 msgstr "genera diffstat amb una amplada donada"
 
-#: diff.c:5333
+#: diff.c:5432
 msgid "generate diffstat with a given name width"
 msgstr "genera diffstat amb un nom d'amplada donat"
 
-#: diff.c:5336
+#: diff.c:5435
 msgid "generate diffstat with a given graph width"
 msgstr "genera diffstat amb una amplada de graf donada"
 
-#: diff.c:5338
+#: diff.c:5437
 msgid "<count>"
 msgstr "<comptador>"
 
-#: diff.c:5339
+#: diff.c:5438
 msgid "generate diffstat with limited lines"
 msgstr "genera diffstat amb línies limitades"
 
-#: diff.c:5342
+#: diff.c:5441
 msgid "generate compact summary in diffstat"
 msgstr "genera un resum compacte a diffstat"
 
-#: diff.c:5345
+#: diff.c:5444
 msgid "output a binary diff that can be applied"
-msgstr "diff amb sortida binaria que pot ser aplicada"
+msgstr "diff amb sortida binària que pot ser aplicada"
 
-#: diff.c:5348
+#: diff.c:5447
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
+"mostra els noms complets dels objectes pre i post-imatge a les línies «index»"
 
-#: diff.c:5350
+#: diff.c:5449
 msgid "show colored diff"
 msgstr "mostra un diff amb colors"
 
-#: diff.c:5351
+#: diff.c:5450
 msgid "<kind>"
-msgstr ""
+msgstr "<kind>"
 
-#: diff.c:5352
+#: diff.c:5451
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
+"ressalta els errors d'espai en blanc a les línies «context», «old» o «new» "
+"al diff"
 
-#: diff.c:5355
+#: diff.c:5454
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgstr ""
+"no consolidis els noms de camí i utilitza NULs com a terminadors de camp de "
+"sortida en --raw o --numstat"
 
-#: diff.c:5358 diff.c:5361 diff.c:5364 diff.c:5470
+#: diff.c:5457 diff.c:5460 diff.c:5463 diff.c:5572
 msgid "<prefix>"
 msgstr "<prefix>"
 
-#: diff.c:5359
+#: diff.c:5458
 msgid "show the given source prefix instead of \"a/\""
-msgstr ""
+msgstr "mostra el prefix d'origen donat en lloc de «a/»"
 
-#: diff.c:5362
+#: diff.c:5461
 msgid "show the given destination prefix instead of \"b/\""
-msgstr ""
+msgstr "mostra el prefix de destinació indicat en lloc de «b/»"
 
-#: diff.c:5365
+#: diff.c:5464
 msgid "prepend an additional prefix to every line of output"
 msgstr "afegir un prefix addicional per a cada línia de sortida"
 
-#: diff.c:5368
+#: diff.c:5467
 msgid "do not show any source or destination prefix"
 msgstr "no mostris cap prefix d'origen o destí"
 
-#: diff.c:5371
-#, fuzzy
+#: diff.c:5470
 msgid "show context between diff hunks up to the specified number of lines"
-msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
+msgstr ""
+"mostra el context entre trossos de diferència fins al nombre especificat de "
+"línies"
 
-#: diff.c:5375 diff.c:5380 diff.c:5385
+#: diff.c:5474 diff.c:5479 diff.c:5484
 msgid "<char>"
 msgstr "<char>"
 
-#: diff.c:5376
+#: diff.c:5475
 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 «+»"
+msgstr ""
+"especifiqueu el caràcter per a indicar una línia nova en comptes de «+»"
 
-#: diff.c:5381
+#: diff.c:5480
 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 «-»"
+msgstr ""
+"especifiqueu el caràcter per a indicar una línia antiga en comptes de «-»"
 
-#: diff.c:5386
+#: diff.c:5485
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "especifiqueu el caràcter per a indicar context en comptes de « »"
 
-#: diff.c:5389
+#: diff.c:5488
 msgid "Diff rename options"
 msgstr "Opcions de canvi de nom del diff"
 
-#: diff.c:5390
+#: diff.c:5489
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5391
+#: diff.c:5490
 msgid "break complete rewrite changes into pairs of delete and create"
-msgstr "divideix els canvis de reescriptura completa en parells de suprimir i crear"
+msgstr ""
+"divideix els canvis de reescriptura completa en parells de suprimir i crear"
 
-#: diff.c:5395
+#: diff.c:5494
 msgid "detect renames"
 msgstr "detecta els canvis de noms"
 
-#: diff.c:5399
+#: diff.c:5498
 msgid "omit the preimage for deletes"
 msgstr "omet les preimatges per les supressions"
 
-#: diff.c:5402
+#: diff.c:5501
 msgid "detect copies"
 msgstr "detecta còpies"
 
-#: diff.c:5406
+#: diff.c:5505
 msgid "use unmodified files as source to find copies"
 msgstr "usa els fitxers no modificats com a font per trobar còpies"
 
-#: diff.c:5408
+#: diff.c:5507
 msgid "disable rename detection"
 msgstr "inhabilita la detecció de canvis de nom"
 
-#: diff.c:5411
+#: diff.c:5510
 msgid "use empty blobs as rename source"
 msgstr "usa els blobs buits com a font de canvi de nom"
 
-#: diff.c:5413
+#: diff.c:5512
 msgid "continue listing the history of a file beyond renames"
-msgstr "continua llistant l'històric d'un un fitxer més enllà dels canvis de nom"
+msgstr "continua llistant l'històric d'un fitxer més enllà dels canvis de nom"
 
-#: diff.c:5416
+#: diff.c:5515
 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"
 
-#: diff.c:5418
+#: diff.c:5517
 msgid "Diff algorithm options"
-msgstr "Opcions d'algorisme Diff"
+msgstr "Opcions de l'algorisme Diff"
 
-#: diff.c:5420
+#: diff.c:5519
 msgid "produce the smallest possible diff"
 msgstr "produeix el diff més petit possible"
 
-#: diff.c:5423
+#: diff.c:5522
 msgid "ignore whitespace when comparing lines"
-msgstr "ignora els espai en blanc en comparar línies"
+msgstr "ignora els espais en blanc en comparar línies"
 
-#: diff.c:5426
+#: diff.c:5525
 msgid "ignore changes in amount of whitespace"
 msgstr "ignora els canvis en la quantitat d'espai en blanc"
 
-#: diff.c:5429
+#: diff.c:5528
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignora els canvis d'espai en blanc al final de la línia"
 
-#: diff.c:5432
+#: diff.c:5531
 msgid "ignore carrier-return at the end of line"
 msgstr "ignora els retorns de línia al final de la línia"
 
-#: diff.c:5435
+#: diff.c:5534
 msgid "ignore changes whose lines are all blank"
 msgstr "ignora els canvis en línies que estan en blanc"
 
-#: diff.c:5438
+#: diff.c:5536 diff.c:5558 diff.c:5561 diff.c:5606
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5537
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignora els canvis en les línies que coincideixen amb <regex>"
+
+#: diff.c:5540
 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:5441
+#: diff.c:5543
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "genera diff usant l'algorisme «patience diff»"
 
-#: diff.c:5445
+#: diff.c:5547
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "genera diff usant l'algorisme «histogram diff»"
 
-#: diff.c:5447
+#: diff.c:5549
 msgid "<algorithm>"
 msgstr "<algorisme>"
 
-#: diff.c:5448
+#: diff.c:5550
 msgid "choose a diff algorithm"
-msgstr "escolliu un algorisme pel diff"
+msgstr "trieu un algorisme per al diff"
 
-#: diff.c:5450
+#: diff.c:5552
 msgid "<text>"
 msgstr "<text>"
 
-#: diff.c:5451
+#: diff.c:5553
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "genera diff usant l'algorisme «anchored diff»"
 
-#: diff.c:5453 diff.c:5462 diff.c:5465
+#: diff.c:5555 diff.c:5564 diff.c:5567
 msgid "<mode>"
 msgstr "<mode>"
 
-#: diff.c:5454
+#: diff.c:5556
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
+"mostra el diff de paraules usant <mode> per delimitar les paraules "
+"modificades"
 
-#: diff.c:5456 diff.c:5459 diff.c:5504
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5457
+#: diff.c:5559
 msgid "use <regex> to decide what a word is"
-msgstr ""
+msgstr "utilitza <regex> per a decidir què és una paraula"
 
-#: diff.c:5460
+#: diff.c:5562
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "equivalent a --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5463
+#: diff.c:5565
 msgid "moved lines of code are colored differently"
-msgstr ""
+msgstr "les línies de codi que s'ha mogut s'acoloreixen diferent"
 
-#: diff.c:5466
+#: diff.c:5568
 msgid "how white spaces are ignored in --color-moved"
-msgstr ""
+msgstr "com s'ignoren els espais en blanc a --color-moved"
 
-#: diff.c:5469
-#, fuzzy
+#: diff.c:5571
 msgid "Other diff options"
-msgstr "Opcions genèriques"
+msgstr "Altres opcions diff"
 
-#: diff.c:5471
+#: diff.c:5573
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
+"quan s'executa des d'un subdirectori, exclou els canvis de fora i mostra els "
+"camins relatius"
 
-#: diff.c:5475
+#: diff.c:5577
 msgid "treat all files as text"
 msgstr "tracta tots els fitxers com a text"
 
-#: diff.c:5477
+#: diff.c:5579
 msgid "swap two inputs, reverse the diff"
-msgstr ""
+msgstr "intercanvia les dues entrades, inverteix el diff"
 
-#: diff.c:5479
+#: diff.c:5581
 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:5481
+#: diff.c:5583
 msgid "disable all output of the program"
 msgstr "inhabilita totes les sortides del programa"
 
-#: diff.c:5483
+#: diff.c:5585
 msgid "allow an external diff helper to be executed"
-msgstr ""
+msgstr "permet executar un ajudant de diff extern"
 
-#: diff.c:5485
+#: diff.c:5587
 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:5487
+#: diff.c:5589
 msgid "<when>"
 msgstr "<quan>"
 
-#: diff.c:5488
+#: diff.c:5590
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignora els canvis als submòduls en la generació del diff"
 
-#: diff.c:5491
+#: diff.c:5593
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5492
+#: diff.c:5594
 msgid "specify how differences in submodules are shown"
 msgstr "especifiqueu com es mostren els canvis als submòduls"
 
-#: diff.c:5496
-#, fuzzy
+#: diff.c:5598
 msgid "hide 'git add -N' entries from the index"
-msgstr "usa .gitattributes només des de l'índex"
+msgstr "amaga les entrades «git add -N» de l'índex"
 
-#: diff.c:5499
+#: diff.c:5601
 msgid "treat 'git add -N' entries as real in the index"
-msgstr ""
+msgstr "tracta les entrades «git add -N» com a reals a l'índex"
 
-#: diff.c:5501
+#: diff.c:5603
 msgid "<string>"
 msgstr "<cadena>"
 
-#: diff.c:5502
+#: diff.c:5604
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr ""
+"cerca les diferències que canvien el nombre d'ocurrències de la cadena "
+"especificada"
 
-#: diff.c:5505
+#: diff.c:5607
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr ""
+"cerca les diferències que canvien el nombre d'ocurrències de l'expressió "
+"regular especificada"
 
-#: diff.c:5508
-#, fuzzy
+#: diff.c:5610
 msgid "show all changes in the changeset with -S or -G"
-msgstr "mostra els fitxers coincidents en el paginador"
+msgstr "mostra tots els canvis amb el conjunt de canvis amb -S o -G"
 
-#: diff.c:5511
-#, fuzzy
+#: diff.c:5613
 msgid "treat <string> in -S as extended POSIX regular expression"
-msgstr "usa les expressions regulars POSIX ampliades"
+msgstr "tracta <cadena> a -S com a expressió regular POSIX ampliada"
 
-#: diff.c:5514
-#, fuzzy
+#: diff.c:5616
 msgid "control the order in which files appear in the output"
-msgstr "mostra en la sortida els altres fitxers"
+msgstr "controla l'ordre amb el qual els fitxers apareixen en la sortida"
 
-#: diff.c:5515
-#, fuzzy
+#: diff.c:5617 diff.c:5620
+msgid "<path>"
+msgstr "<camí>"
+
+#: diff.c:5618
+msgid "show the change in the specified path first"
+msgstr "mostra el canvi primer al camí especificat"
+
+#: diff.c:5621
+msgid "skip the output to the specified path"
+msgstr "omet la sortida al camí especificat"
+
+#: diff.c:5623
 msgid "<object-id>"
-msgstr "objecte"
+msgstr "<id de l'objecte>"
 
-#: diff.c:5516
+#: diff.c:5624
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr ""
+"cerca les diferències que canvien el nombre d'ocurrències de l'objecte "
+"especificat"
 
-#: diff.c:5518
+#: diff.c:5626
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5519
+#: diff.c:5627
 msgid "select files by diff type"
-msgstr "seleccioneu els fitxer per tipus de diff"
+msgstr "seleccioneu els fitxers per tipus de diff"
 
-#: diff.c:5521
+#: diff.c:5629
 msgid "<file>"
 msgstr "<fitxer>"
 
-#: diff.c:5522
+#: diff.c:5630
 msgid "Output to a specific file"
 msgstr "Sortida a un fitxer específic"
 
-#: diff.c:6177
+#: diff.c:6287
 msgid "inexact 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."
+msgstr ""
+"s'ha omès la detecció de canvi de nom inexacta a causa de massa fitxers."
 
-#: diff.c:6180
+#: diff.c:6290
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "només s'han trobat còpies des de camins modificats a causa de massa fitxers."
 
-#: diff.c:6183
+#: diff.c:6293
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3012,66 +4012,101 @@ msgstr ""
 "potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
 "l'ordre."
 
-#: dir.c:537
+#: 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
+msgid "Performing inexact rename detection"
+msgstr "S'està realitzant una detecció inexacta de canvis de nom"
+
+#: diffcore-rotate.c:29
+#,  c-format
+msgid "No such path '%s' in the diff"
+msgstr "No existeix el camí «%s» al diff"
+
+#: dir.c:578
 #, 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:926
+#: dir.c:718 dir.c:747 dir.c:760
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "patró no reconegut: «%s»"
+
+#: dir.c:777 dir.c:791
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "patró negatiu no reconegut: «%s»"
+
+#: dir.c:809
+#, 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
+msgid "disabling cone pattern matching"
+msgstr "inhabilita la coincidència de patrons «cone»"
+
+#: dir.c:1206
 #, c-format
 msgid "cannot use %s as an exclude file"
-msgstr "no es pot usar  %s com a fitxer d'exclusió"
+msgstr "no es pot usar %s com a fitxer d'exclusió"
 
-#: dir.c:1843
+#: dir.c:2314
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "no s'ha pogut obrir el directori «%s»"
 
-#: dir.c:2085
+#: dir.c:2614
 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:2209
+#: dir.c:2738
 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:3013
+#: dir.c:3543
 #, 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:3058 dir.c:3063
+#: dir.c:3590 dir.c:3595
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no s'han pogut crear directoris per %s"
 
-#: dir.c:3092
+#: dir.c:3624
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
-msgstr ""
+msgstr "consell: s'està esperant que el vostre editor tanqui el fitxer...%c"
 
-#: entry.c:178
+#: entry.c:179
 msgid "Filtering content"
 msgstr "S'està filtrant el contingut"
 
-#: entry.c:476
+#: entry.c:500
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
 
-#: environment.c:150
+#: environment.c:152
 #, c-format
 msgid "bad git namespace path \"%s\""
-msgstr ""
+msgstr "camí d'espai de noms git incorrecte «%s»"
 
-#: environment.c:332
+#: environment.c:335
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "no s'ha pogut establir GIT_DIR a «%s»"
@@ -3081,266 +4116,300 @@ msgstr "no s'ha pogut establir GIT_DIR a «%s»"
 msgid "too many args to run %s"
 msgstr "hi ha massa arguments per a executar %s"
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Remot sense URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:182
 msgid "git fetch-pack: expected shallow list"
-msgstr "git fetch-pack: llista superficial esperada"
+msgstr "git fetch-pack: llista shallow esperada"
 
-#: fetch-pack.c:154
-#, fuzzy
+#: fetch-pack.c:185
 msgid "git fetch-pack: expected a flush packet after shallow list"
-msgstr "git fetch-pack: llista superficial esperada"
+msgstr ""
+"git fetch-pack: s'esperava un paquet de buidatge després d'una llista shallow"
 
-#: fetch-pack.c:165
+#: fetch-pack.c:196
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
-msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
+msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:216
 #, 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:196
+#: fetch-pack.c:227
 msgid "unable to write to remote"
 msgstr "no s'ha pogut escriure al remot"
 
-#: fetch-pack.c:258
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requereix multi_ack_detailed"
 
-#: fetch-pack.c:360 fetch-pack.c:1284
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "línia de shallow no vàlida: %s"
 
-#: fetch-pack.c:366 fetch-pack.c:1290
+#: fetch-pack.c:389 fetch-pack.c:1429
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "línia d'unshallow no vàlida: %s"
 
-#: fetch-pack.c:368 fetch-pack.c:1292
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
 msgstr "objecte no trobat: %s"
 
-#: fetch-pack.c:371 fetch-pack.c:1295
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objecte: %s"
 
-#: fetch-pack.c:373 fetch-pack.c:1297
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
 msgstr "no s'ha trobat cap shallow: %s"
 
-#: fetch-pack.c:376 fetch-pack.c:1301
+#: fetch-pack.c:399 fetch-pack.c:1440
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr "s'ha rebut %s %d %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
 msgstr "comissió no vàlida %s"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:487
 msgid "giving up"
 msgstr "s'abandona"
 
-#: fetch-pack.c:477 progress.c:277
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
 msgstr "fet"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "s'ha rebut %s (%d) %s"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr "S'està marcant %s com a complet"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ja es té %s (%s)"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:849
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:857
 msgid "protocol error: bad pack header"
 msgstr "error de protocol: capçalera de paquet errònia"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:951
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: no es pot bifurcar de %s"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr ""
+
+#: fetch-pack.c:974
 #, c-format
 msgid "%s failed"
 msgstr "%s ha fallat"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
 msgstr "error en desmultiplexor de banda lateral"
 
-#: fetch-pack.c:908
+#: fetch-pack.c:1019
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La versió del servidor és %.*s"
 
-#: fetch-pack.c:913 fetch-pack.c:919 fetch-pack.c:922 fetch-pack.c:928
-#: fetch-pack.c:932 fetch-pack.c:936 fetch-pack.c:940 fetch-pack.c:944
-#: fetch-pack.c:948 fetch-pack.c:952 fetch-pack.c:956 fetch-pack.c:960
-#: fetch-pack.c:966 fetch-pack.c:972 fetch-pack.c:977 fetch-pack.c:982
+#: 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 "El servidor accepta %s"
 
-#: fetch-pack.c:915
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
 msgstr "El servidor no permet clients superficials"
 
-#: fetch-pack.c:975
+#: fetch-pack.c:1089
 msgid "Server does not support --shallow-since"
 msgstr "El servidor no admet --shallow-since"
 
-#: fetch-pack.c:980
+#: fetch-pack.c:1094
 msgid "Server does not support --shallow-exclude"
 msgstr "El servidor no admet --shallow-exclude"
 
-#: fetch-pack.c:984
+#: fetch-pack.c:1098
 msgid "Server does not support --deepen"
 msgstr "El servidor no admet --deepen"
 
-#: fetch-pack.c:1001
+#: fetch-pack.c:1100
+msgid "Server does not support this repository's object format"
+msgstr "El servidor no és compatible amb el format d'objecte d'aquest repositori"
+
+#: fetch-pack.c:1113
 msgid "no common commits"
 msgstr "cap comissió en comú"
 
-#: fetch-pack.c:1013 fetch-pack.c:1462
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr "el repositori font és superficial, es rebutja clonar-ho."
+
+#: fetch-pack.c:1128 fetch-pack.c:1651
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: l'obtenció ha fallat."
 
-#: fetch-pack.c:1151
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmes no coincidents: client %s; servidor %s"
+
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "el servidor no és compatible amb l'algorisme «%s»"
+
+#: fetch-pack.c:1279
 msgid "Server does not support shallow requests"
-msgstr "El servidor no permet peticions superficials"
+msgstr "El servidor no permet sol·licituds superficials"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1286
 msgid "Server supports filter"
 msgstr "El servidor accepta filtratge"
 
-#: fetch-pack.c:1184
+#: fetch-pack.c:1329 fetch-pack.c:2034
 msgid "unable to write request to remote"
-msgstr "no s'ha pogut escriure la petició al remot"
+msgstr "no s'ha pogut escriure la sol·licitud al remot"
 
-#: fetch-pack.c:1202
+#: fetch-pack.c:1347
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "error en llegir la capçalera de la secció «%s»"
 
-#: fetch-pack.c:1208
+#: fetch-pack.c:1353
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "s'esperava «%s», s'ha rebut «%s»"
 
-#: fetch-pack.c:1247
+#: fetch-pack.c:1387
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "línia de confirmació inesperada: «%s»"
 
-#: fetch-pack.c:1252
-#, fuzzy, c-format
+#: fetch-pack.c:1392
+#, c-format
 msgid "error processing acks: %d"
-msgstr "error en llegir %s"
+msgstr "s'ha produït un error en processar els acks: %d"
 
-#: fetch-pack.c:1262
+#: fetch-pack.c:1402
 msgid "expected packfile to be sent after 'ready'"
-msgstr "s'espera l'enviament del fitxer de paquet després de «ready»"
+msgstr "s'esperava l'enviament del fitxer de paquet després de «ready»"
 
-#: fetch-pack.c:1264
+#: fetch-pack.c:1404
 msgid "expected no other sections to be sent after no 'ready'"
-msgstr "s'espera que cap altra seccions s'enviï després de no «ready»"
+msgstr "s'esperava que no s'enviés cap altra secció després de no «ready»"
 
-#: fetch-pack.c:1306
+#: fetch-pack.c:1445
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "s'ha produït un error en processar la informació superficial: %d"
 
-#: fetch-pack.c:1353
+#: fetch-pack.c:1494
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "s'esperava wanted-ref, s'ha rebut «%s»"
 
-#: fetch-pack.c:1358
+#: fetch-pack.c:1499
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inesperat: «%s»"
 
-#: fetch-pack.c:1363
+#: fetch-pack.c:1504
 #, 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:1689
+#: fetch-pack.c:1534
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: s'esperava un paquet de final de resposta"
+
+#: fetch-pack.c:1930
 msgid "no matching remote head"
 msgstr "no hi ha cap HEAD remot coincident"
 
-#: fetch-pack.c:1712 builtin/clone.c:686
+#: fetch-pack.c:1953 builtin/clone.c:697
 msgid "remote did not send all necessary objects"
 msgstr "el remot no ha enviat tots els objectes necessaris"
 
-#: fetch-pack.c:1739
+#: fetch-pack.c:2056
+msgid "unexpected 'ready' from remote"
+msgstr "«ready» no esperat des del remot"
+
+#: fetch-pack.c:2079
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existeix la referència remota %s"
 
-#: fetch-pack.c:1742
+#: fetch-pack.c:2082
 #, 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:321
-msgid "gpg failed to sign the data"
-msgstr "gpg ha fallat en signar les dades"
-
-#: gpg-interface.c:347
+#: gpg-interface.c:273
 msgid "could not create temporary file"
 msgstr "no s'ha pogut crear el fitxer temporal"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "s'ha produït un error en escriure la signatura separada a «%s»"
 
-#: graph.c:97
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg ha fallat en signar les dades"
+
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
 
-#: grep.c:2117
+#: 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"
+
+#: grep.c:1893
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "«%s»: no s'ha pogut llegir %s"
 
-#: grep.c:2134 setup.c:164 builtin/clone.c:409 builtin/diff.c:82
-#: builtin/rm.c:135
+#: grep.c:1910 setup.c:176 builtin/clone.c:416 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:2145
+#: grep.c:1921
 #, c-format
 msgid "'%s': short read"
 msgstr "«%s»: lectura curta"
@@ -3367,15 +4436,15 @@ msgstr "col·laborar (vegeu també: git help workflow)"
 
 #: help.c:31
 msgid "Main Porcelain Commands"
-msgstr ""
+msgstr "Ordres principals de porcellana"
 
 #: help.c:32
 msgid "Ancillary Commands / Manipulators"
-msgstr ""
+msgstr "Ordres auxiliars / manipuladors"
 
 #: help.c:33
 msgid "Ancillary Commands / Interrogators"
-msgstr ""
+msgstr "Ordres auxiliars / interrogadors"
 
 #: help.c:34
 msgid "Interacting with Others"
@@ -3390,84 +4459,84 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Ordres de baix nivell / Interrogadors"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
-msgstr "Ordres de baix nivell / Sincronització de dipòsits"
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Ordres de baix nivell / Sincronització de repositoris"
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Ordres de baix nivell / Ajudants interns"
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "ordres de git disponibles en «%s»"
 
-#: help.c:305
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "ordres de git disponibles d'altres llocs en el vostre $PATH"
 
-#: help.c:314
+#: help.c:316
 msgid "These are common Git commands used in various situations:"
 msgstr ""
-"Aquestes són ordres del Git habitualment usades en diverses situacions:"
+"Aquestes són ordres habituals del Git usades en diverses situacions:"
 
-#: help.c:363 git.c:98
+#: help.c:365 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "tipus de llistat de l'ordre no compatible «%s»"
 
-#: help.c:403
-msgid "The common Git guides are:"
-msgstr "Les guies de Git comunes són:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Les guies de Git de conceptes són:"
 
-#: help.c:512
+#: help.c:429
 msgid "See 'git help <command>' to read about a specific subcommand"
-msgstr "Vegeu «git help <ordre>» per llegir sobre un subordre específic"
+msgstr "Vegeu «git help <ordre>» per llegir sobre una subordre específica"
 
-#: help.c:517
+#: help.c:434
 msgid "External commands"
 msgstr "Ordres externes"
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr "Àlies d'ordres"
 
-#: help.c:596
+#: help.c:527
 #, 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» sembla un ordre de git, però no hem pogut\n"
+"«%s» sembla una ordre de git, però no hem pogut\n"
 "executar-la. Pot ser que git-%s estigui malmès?"
 
-#: help.c:655
+#: help.c:543 help.c:631
+#, 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
 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:677
+#: help.c:613
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
-"ADVERTÈNCIA: Heu invocat un ordre de Git amb nom «%s», la qual no existeix."
+"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix."
 
-#: help.c:682
+#: help.c:618
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
 
-#: help.c:687
+#: help.c:623
 #, 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:695
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: «%s» no és un ordre de git. Vegeu «git --help»."
-
-#: help.c:699
+#: help.c:635
 msgid ""
 "\n"
 "The most similar command is"
@@ -3481,16 +4550,16 @@ msgstr[1] ""
 "\n"
 "Les ordres més similars són"
 
-#: help.c:714
+#: help.c:675
 msgid "git version [<options>]"
 msgstr "git version [<opcions>]"
 
-#: help.c:782
+#: help.c:730
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:786
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3504,7 +4573,15 @@ msgstr[1] ""
 "\n"
 "Volíeu dir un d'aquests?"
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Identitat de l'autor desconeguda\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Es desconeix la identitat del comitent\n"
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3523,87 +4600,113 @@ 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:379
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
 msgstr ""
 "no s'ha proporcionat cap adreça electrònica i la detecció automàtica està "
 "inhabilitada"
 
-#: ident.c:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr ""
 "no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha "
 "rebut «%s»)"
 
-#: ident.c:401
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
 msgstr ""
 "no s'ha proporcionat cap nom i la detecció automàtica està inhabilitada"
 
-#: ident.c:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "no s'ha pogut detectar automàticament el nom (s'ha rebut «%s»)"
 
-#: ident.c:415
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "nom d'identitat buit (per <%s>) no és permès"
 
-#: ident.c:421
+#: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "el nom conté només caràcters no permesos: %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:454 builtin/commit.c:647
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de data no vàlid: %s"
 
-#: list-objects.c:129
+#: list-objects-filter-options.c:83
+msgid "expected 'tree:<depth>'"
+msgstr "s'esperava «tree:<profunditat>»"
+
+#: list-objects-filter-options.c:98
+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
 #, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre"
+msgid "'%s' for 'object:type=<type>' isnot a valid object type"
+msgstr "«%s» per a «object:type=<type>» no és un tipus d'objecte vàlid"
 
-#: list-objects.c:142
+#: list-objects-filter-options.c:124
 #, c-format
-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"
+msgid "invalid filter-spec '%s'"
+msgstr "filtre d'especificació no vàlid: «%s»"
 
-#: list-objects.c:378
+#: list-objects-filter-options.c:140
 #, 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"
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "cal escapar el caràcter en el sub-filter-spec «%c»"
+
+#: list-objects-filter-options.c:182
+msgid "expected something after combine:"
+msgstr "s'esperava alguna cosa després de combinar:"
 
-#: list-objects-filter-options.c:36
+#: list-objects-filter-options.c:264
 msgid "multiple filter-specs cannot be combined"
 msgstr "no es poden combinar múltiples especificacions de filtratge"
 
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
-msgstr "s'esperava «tree:<profunditat>»"
-
-#: list-objects-filter-options.c:84
-msgid "sparse:path filters support has been dropped"
+#: 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 repositori perquè sigui compatible amb "
+"un clonatge parcial"
 
-#: list-objects-filter-options.c:94
+#: list-objects-filter.c:532
 #, c-format
-msgid "invalid filter-spec '%s'"
-msgstr "filtre d'especificació no vàlid: «%s»"
+msgid "unable to access sparse blob in '%s'"
+msgstr "no s'ha pogut accedir a un blob dispers en «%s»"
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr ""
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "no s'han pogut analitzar les dades disperses filtrades %s"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "l'entrada «%s» a l'arbre %s té mode d'arbre, però no és un arbre"
+
+#: list-objects.c:140
+#, c-format
+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"
 
-#: lockfile.c:151
+#: list-objects.c:395
+#, 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"
+
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3614,172 +4717,397 @@ msgid ""
 "may have crashed in this repository earlier:\n"
 "remove the file manually to continue."
 msgstr ""
-"No s'ha pogut crear '%s.lock': %s.\n"
+"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"
 "elimineu el fitxer manualment per a continuar."
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "No s'ha pogut crear «%s.lock»: %s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "s'ha produït un error en llegir la memòria cau"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "valor «%s» no vàlid per a «lsrefs.unborn»"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1885 builtin/am.c:1919
-#: builtin/checkout.c:536 builtin/checkout.c:796 builtin/clone.c:786
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "no s'ha pogut escriure un fitxer d'índex nou"
+#: ls-refs.c:167
+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 "CRLF citat detectat"
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "acció «%s» incorrecta per a «%s»"
+
+#: merge-ort.c:1116 merge-recursive.c:1205
+#, 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-recursive.c:322
+#: merge-ort.c:1125 merge-recursive.c:1212
+#, 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)"
+
+#: merge-ort.c:1134 merge-recursive.c:1219
+#, 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
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Nota: avançament ràpid del submòdul %s a %s"
+
+#: merge-ort.c:1172
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "s'ha produït un error en fusionar recursivament el submòdul «%s»"
+
+#: merge-ort.c:1179
+#, 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, però existeix una solució possible:\n"
+"%s\n"
+
+#: merge-ort.c:1183 merge-recursive.c:1273
+#, 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 ""
+"Si això és correcte simplement afegiu-ho a l'índex per exemple\n"
+"utilitzant:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s «%s»\n"
+"\n"
+"que acceptarà aquest suggeriment.\n"
+
+#: merge-ort.c:1196
+#, 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, però existeixen múltiples solucions possibles:\n"
+"%s"
+
+#: merge-ort.c:1415 merge-recursive.c:1362
+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
+#, 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
+#, c-format
+msgid "Auto-merging %s"
+msgstr "S'està autofusionant %s"
+
+#: merge-ort.c:1566 merge-recursive.c:2122
+#, 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 ""
+"CONFLICTE (canvi del nom del directori implícit): el fitxer o directori "
+"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
+#, 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 ""
+"CONFLICT (canvi del nom del directori implícit) no es pot assignar més d'un "
+"camí a %s; els canvis del nom del directori implícits han intentat posar "
+"aquests camins a: %s segons"
+
+#: merge-ort.c:1634
+#, 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; 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
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+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
+#, c-format
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
+msgstr ""
+"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
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+msgstr ""
+"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
+#, 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 ""
+"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
+#, 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 ""
+"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
+#, 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."
+
+#: merge-ort.c:2198
+#, 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:2217 merge-ort.c:2241
+#, 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."
+
+#: merge-ort.c:2550 merge-recursive.c:3002
+#, c-format
+msgid "cannot read object %s"
+msgstr "no es pot llegir l'objecte %s"
+
+#: merge-ort.c:2553 merge-recursive.c:3005
+#, c-format
+msgid "object %s is not a blob"
+msgstr "l'objecte %s no és un blob"
+
+#: merge-ort.c:2981
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+
+#: merge-ort.c:3055
+#, 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
+#, 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
+msgid "content"
+msgstr "contingut"
+
+#: merge-ort.c:3164 merge-recursive.c:3085
+msgid "add/add"
+msgstr "afegiment/afegiment"
+
+#: merge-ort.c:3166 merge-recursive.c:3130
+msgid "submodule"
+msgstr "submòdul"
+
+#: merge-ort.c:3168 merge-recursive.c:3131
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
+
+#: merge-ort.c:3198
+#, 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."
+
+#: merge-ort.c:3433
+#, 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:3730
+#, 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"
+
+#: merge-ort-wrappers.c:13 merge-recursive.c:3699
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+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
+msgid "Already up to date."
+msgstr "Ja està al dia."
+
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "(comissió errònia)\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, 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:354
+#: merge-recursive.c:388
 #, 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ó."
-
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "error en construir arbres"
+msgstr ""
+"add_cacheinfo ha fallat al refrescar el camí «%s»; interrompent la fusió."
 
-#: merge-recursive.c:863
+#: merge-recursive.c:876
 #, 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:874
+#: merge-recursive.c:887
 #, 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:888 merge-recursive.c:907
+#: merge-recursive.c:901 merge-recursive.c:920
 msgid ": perhaps a D/F conflict?"
 msgstr ": potser un conflicte D/F?"
 
-#: merge-recursive.c:897
+#: merge-recursive.c:910
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
 
-#: merge-recursive.c:938 builtin/cat-file.c:40
+#: merge-recursive.c:951 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:941
+#: merge-recursive.c:956
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob esperat per a %s «%s»"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:981
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "s'ha produït un error en obrir «%s»: %s"
 
-#: merge-recursive.c:976
+#: merge-recursive.c:992
 #, 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:981
+#: merge-recursive.c:997
 #, 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:1177
-#, 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-recursive.c:1184
-#, 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)"
-
-#: merge-recursive.c:1191
-#, 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-recursive.c:1199 merge-recursive.c:1211
+#: merge-recursive.c:1227 merge-recursive.c:1239
 #, 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:1202 merge-recursive.c:1214
+#: merge-recursive.c:1230 merge-recursive.c:1242
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avançament ràpid al submòdul %s"
 
-#: merge-recursive.c:1237
+#: merge-recursive.c:1265
 #, 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)"
 
-#: merge-recursive.c:1241
+#: merge-recursive.c:1269
 #, 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:1242
+#: merge-recursive.c:1270
 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:1245
-#, 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-recursive.c:1254
+#: merge-recursive.c:1282
 #, 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:1327
-msgid "Failed to execute internal merge"
-msgstr "S'ha produït un error en executar la fusió interna"
-
-#: merge-recursive.c:1332
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "No s'ha pogut afegir %s a la base de dades"
-
-#: merge-recursive.c:1364
-#, c-format
-msgid "Auto-merging %s"
-msgstr "S'està autofusionant %s"
-
-#: merge-recursive.c:1387
+#: merge-recursive.c:1424
 #, 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."
+msgstr ""
+"Error: s'està refusant perdre el fitxer no seguit a %s; en comptes s'ha "
+"escrit a %s."
 
-#: merge-recursive.c:1459
+#: merge-recursive.c:1496
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3788,7 +5116,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:1464
+#: merge-recursive.c:1501
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3797,7 +5125,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:1471
+#: merge-recursive.c:1508
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3806,7 +5134,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:1476
+#: merge-recursive.c:1513
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3815,398 +5143,365 @@ 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:1511
+#: merge-recursive.c:1548
 msgid "rename"
 msgstr "canvi de nom"
 
-#: merge-recursive.c:1511
+#: merge-recursive.c:1548
 msgid "renamed"
 msgstr "canviat de nom"
 
-#: merge-recursive.c:1591 merge-recursive.c:2450 merge-recursive.c:3093
+#: merge-recursive.c:1599 merge-recursive.c:2505 merge-recursive.c:3158
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "S'està refusant a perdre el fitxer brut a %s"
 
-#: merge-recursive.c:1601
+#: merge-recursive.c:1609
 #, 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ó."
+msgstr ""
+"S'està refusant perdre el fitxer no seguit a «%s», malgrat que està en mig "
+"de l'operació."
 
-#: merge-recursive.c:1659
+#: merge-recursive.c:1667
 #, 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"
+"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s a %s.  S'ha afegit "
+"%s a %s"
 
-#: merge-recursive.c:1690
+#: merge-recursive.c:1698
 #, 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:1695
+#: merge-recursive.c:1703
 #, 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 "
+"S'està refusant perdre el fitxer no seguit a %s; en comptes, s'està afegint "
 "com a %s"
 
-#: merge-recursive.c:1714
+#: merge-recursive.c:1730
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
 "\"->\"%s\" in \"%s\"%s"
 msgstr ""
-"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la "
-"branca «%s» canvi de nom «%s»->«%s» en «%s»%s"
+"CONFLICTE (canvi de nom/canvi de nom): Canvi de nom «%s»->«%s» en la branca "
+"«%s» canvi de nom «%s»->«%s» en «%s»%s"
 
-#: merge-recursive.c:1719
+#: merge-recursive.c:1735
 msgid " (left unresolved)"
 msgstr " (deixat sense resolució)"
 
-#: merge-recursive.c:1828
+#: merge-recursive.c:1827
 #, 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:2035
+#: merge-recursive.c:2090
 #, 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."
 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."
 
-#: merge-recursive.c:2067
-#, 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:2077
+#: merge-recursive.c:2224
 #, 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:2169
-#, fuzzy, c-format
-msgid ""
 "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 %s->%s en %s"
+"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:2413
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-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-recursive.c:2937
-#, c-format
-msgid "cannot read object %s"
-msgstr "no es pot llegir l'objecte %s"
-
-#: merge-recursive.c:2940
-#, c-format
-msgid "object %s is not a blob"
-msgstr "l'objecte %s no és un blob"
-
-#: merge-recursive.c:3004
+#: merge-recursive.c:3069
 msgid "modify"
 msgstr "modificació"
 
-#: merge-recursive.c:3004
+#: merge-recursive.c:3069
 msgid "modified"
 msgstr "modificat"
 
-#: merge-recursive.c:3016
-msgid "content"
-msgstr "contingut"
-
-#: merge-recursive.c:3020
-msgid "add/add"
-msgstr "afegiment/afegiment"
-
-#: merge-recursive.c:3043
+#: merge-recursive.c:3108
 #, 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:3065 git-submodule.sh:937
-msgid "submodule"
-msgstr "submòdul"
-
-#: merge-recursive.c:3066
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-
-#: merge-recursive.c:3096
+#: merge-recursive.c:3161
 #, c-format
 msgid "Adding as %s instead"
 msgstr "S'està afegint com a %s en lloc d'això"
 
-#: merge-recursive.c:3178
-#, 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:3181
-#, 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:3185
-#, 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:3188
-#, 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:3302
+#: merge-recursive.c:3368
 #, c-format
 msgid "Removing %s"
 msgstr "S'està eliminant %s"
 
-#: merge-recursive.c:3325
+#: merge-recursive.c:3391
 msgid "file/directory"
 msgstr "fitxer/directori"
 
-#: merge-recursive.c:3330
+#: merge-recursive.c:3396
 msgid "directory/file"
 msgstr "directori/fitxer"
 
-#: merge-recursive.c:3337
+#: merge-recursive.c:3403
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
 "%s"
 
-#: merge-recursive.c:3346
+#: merge-recursive.c:3412
 #, c-format
 msgid "Adding %s"
 msgstr "S'està afegint %s"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3421
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLICTE (afegiment/afegiment): Conflicte de fusió en %s"
 
-#: merge-recursive.c:3393
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Els canvis locals als fitxers següents se sobreescriuran per la fusió:\n"
-"  %s"
-
-#: merge-recursive.c:3404
-msgid "Already up to date!"
-msgstr "Ja està al dia!"
-
-#: merge-recursive.c:3413
+#: merge-recursive.c:3474
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "la fusió dels arbres %s i %s ha fallat"
 
-#: merge-recursive.c:3512
+#: merge-recursive.c:3568
 msgid "Merging:"
 msgstr "S'està fusionant:"
 
-#: merge-recursive.c:3525
+#: merge-recursive.c:3581
 #, 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:3564
+#: merge-recursive.c:3631
 msgid "merge returned no commit"
 msgstr "la fusió no ha retornat cap comissió"
 
-#: merge-recursive.c:3630
+#: merge-recursive.c:3796
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No s'ha pogut analitzar l'objecte «%s»"
 
-#: merge-recursive.c:3646 builtin/merge.c:698 builtin/merge.c:869
+#: merge-recursive.c:3814 builtin/merge.c:716 builtin/merge.c:900
+#: builtin/stash.c:473
 msgid "Unable to write index."
 msgstr "No s'ha pogut escriure l'índex."
 
-#: midx.c:69
+#: merge.c:41
+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
+msgid "unable to write new index file"
+msgstr "no s'ha pogut escriure un fitxer d'índex nou"
+
+#: midx.c:74
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "l'OID de l'índex multipaquet és d'una mida incorrecta"
+
+#: midx.c:105
 #, c-format
 msgid "multi-pack-index file %s is too small"
-msgstr ""
+msgstr "el fitxer de l'índex multipaquet %s és massa petit"
 
-#: midx.c:85
+#: midx.c:121
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
+"la signatura de l'índex multipaquet 0x%08x no coincideix amb la signatura 0x%08x"
 
-#: midx.c:90
+#: midx.c:126
 #, c-format
 msgid "multi-pack-index version %d not recognized"
-msgstr ""
+msgstr "no es reconeix la versió %d de l'índex multipaquet"
 
-#: midx.c:95
-#, fuzzy, c-format
-msgid "hash version %u does not match"
-msgstr "el camí «%s» no té la seva versió"
-
-#: midx.c:109
-msgid "invalid chunk offset (too large)"
-msgstr ""
-
-#: midx.c:133
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
+#: midx.c:131
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
+"la versió del hash índex multipaquet %u no coincideix amb la versió %u"
 
-#: midx.c:146
+#: midx.c:148
 msgid "multi-pack-index missing required pack-name chunk"
-msgstr ""
+msgstr "falta un fragment de nom de paquet necessari al multi-index"
 
-#: midx.c:148
+#: midx.c:150
 msgid "multi-pack-index missing required OID fanout chunk"
-msgstr ""
+msgstr "falta un fragment «fanout» OID necessari al multi-pack-index"
 
-#: midx.c:150
+#: midx.c:152
 msgid "multi-pack-index missing required OID lookup chunk"
-msgstr ""
+msgstr "falta un fragment de cerca «fanout» OID necessari al multi-pack-index"
 
-#: midx.c:152
+#: midx.c:154
 msgid "multi-pack-index missing required object offsets chunk"
-msgstr ""
+msgstr "falta un fragment necessari dels desplaçaments al multi-pack-index"
 
-#: midx.c:166
+#: midx.c:170
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
-msgstr ""
+msgstr "els noms de paquet de l'índex multipaquet estan desordenats «%s» abans de «%s»"
 
-#: midx.c:211
+#: midx.c:214
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
-msgstr ""
+msgstr "pack-int-id: %u incorrecte (%u paquets en total)"
 
-#: midx.c:261
+#: midx.c:264
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
+"l'índex multipaquet emmagatzema un desplaçament de 64 bits, però off_t és massa petit"
 
-#: midx.c:289
-msgid "error preparing packfile from multi-pack-index"
-msgstr ""
-
-#: midx.c:470
-#, fuzzy, c-format
+#: midx.c:490
+#, c-format
 msgid "failed to add packfile '%s'"
-msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
+msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
 
-#: midx.c:476
-#, fuzzy, c-format
+#: midx.c:496
+#, c-format
 msgid "failed to open pack-index '%s'"
-msgstr "s'ha produït un error en obrir «%s»"
+msgstr "no s'ha pogut obrir l'índex del paquet «%s»"
 
-#: midx.c:536
-#, fuzzy, c-format
+#: midx.c:564
+#, c-format
 msgid "failed to locate object %d in packfile"
-msgstr "s'ha produït un error en llegir l'objecte «%s»."
+msgstr "no s'ha pogut localitzar l'objecte %d en el fitxer de paquet"
+
+#: midx.c:880 builtin/index-pack.c:1535
+msgid "cannot store reverse index file"
+msgstr "no es pot emmagatzemar el fitxer d'índex invers"
+
+#: midx.c:933
+msgid "Adding packfiles to multi-pack-index"
+msgstr "S'estan afegint fitxers empaquetats a l'índex multipaquet"
 
-#: midx.c:865
+#: midx.c:979
 #, c-format
 msgid "did not see pack-file %s to drop"
-msgstr ""
+msgstr "no s'ha vist caure el fitxer empaquetat %s"
 
-#: midx.c:1036
-#, fuzzy, c-format
+#: midx.c:1024
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "paquet preferit desconegut: «%s»"
+
+#: midx.c:1029
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "el paquet preferit «%s» ha caducat"
+
+#: midx.c:1045
+msgid "no pack files to index."
+msgstr "no hi ha fitxers empaquetats a indexar."
+
+#: midx.c:1125 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "s'ha produït un error en eliminar %s"
+
+#: midx.c:1156
+#, c-format
 msgid "failed to clear multi-pack-index at %s"
-msgstr "s'ha produït un error en netejar l'índex"
+msgstr "no s'ha pogut netejar l'índex multipaquet a %s"
+
+#: midx.c:1214
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "el fitxer de l'índex multipaquet existeix, però no s'ha pogut analitzar"
 
-#: midx.c:1091
+#: midx.c:1222
 msgid "Looking for referenced packfiles"
-msgstr "S'estan cercant fitxers de paquets referenciats"
+msgstr "S'estan cercant fitxers empaquetats referenciats"
 
-#: midx.c:1106
+#: midx.c:1237
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
+"oid fanout desordenat: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1110
-msgid "Verifying OID order in MIDX"
-msgstr ""
+#: midx.c:1242
+msgid "the midx contains no oid"
+msgstr "el midx no conté cap oid"
 
-#: midx.c:1119
+#: midx.c:1251
+msgid "Verifying OID order in multi-pack-index"
+msgstr "S'està verificant l'ordre OID a l'índex multipaquet"
+
+#: midx.c:1260
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
-msgstr ""
+msgstr "oid lookup desordenat: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1138
+#: midx.c:1280
 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:1144
+#: midx.c:1287
 msgid "Verifying object offsets"
 msgstr "S'estan verificant els desplaçaments dels objectes"
 
-#: midx.c:1160
-#, fuzzy, c-format
+#: midx.c:1303
+#, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
-msgstr "no s'ha pogut afegir una entrada de cau per a %s"
+msgstr ""
+"no s'ha pogut carregar l'entrada del paquet per a oid[%d] = %s"
 
-#: midx.c:1166
-#, fuzzy, c-format
+#: midx.c:1309
+#, c-format
 msgid "failed to load pack-index for packfile %s"
-msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
+msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer empaquetat %s"
 
-#: midx.c:1175
+#: midx.c:1318
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
+"desplaçament incorrecte de l'objecte per a oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1350
+#: midx.c:1343
+msgid "Counting referenced objects"
+msgstr "S'estan comptant els objectes referenciats"
+
+#: midx.c:1353
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "S'estan cercant i suprimint els fitxers de paquets no referenciats"
+
+#: midx.c:1544
 msgid "could not start pack-objects"
-msgstr "no s'ha pogut executar el pack-objects"
+msgstr "no s'ha pogut iniciar el pack-objects"
 
-#: midx.c:1369
+#: midx.c:1564
 msgid "could not finish pack-objects"
 msgstr "no s'ha pogut finalitzar el pack-objects"
 
-#: name-hash.c:532
-#, fuzzy, c-format
+#: name-hash.c:542
+#, c-format
 msgid "unable to create lazy_dir thread: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'ha pogut crear el fil «lazy_dir» :%s"
 
-#: name-hash.c:554
-#, fuzzy, c-format
+#: name-hash.c:564
+#, c-format
 msgid "unable to create lazy_name thread: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'ha pogut crear un fil «lazy_name»: %s"
 
-#: name-hash.c:560
-#, fuzzy, c-format
+#: name-hash.c:570
+#, c-format
 msgid "unable to join lazy_name thread: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'ha pogut unir el fil «lazy_name»: %s"
 
 #: notes-merge.c:277
 #, c-format
@@ -4247,47 +5542,482 @@ msgstr "S'està refusant reescriure les notes en %s (fora de refs/notes/)"
 msgid "Bad %s value: '%s'"
 msgstr "Valor erroni de %s: «%s»"
 
-#: object.c:54
+#: object-file.c:526
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+"no existeix el directori d'objecte %s; comproveu .git/objects/info/alternates"
+
+#: object-file.c:577
+#, 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
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr ""
+"%s: s'estan ignorant els emmagatzematges alternatius d'objectes, imbricació massa "
+"profunda"
+
+#: object-file.c:656
+#, 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
+msgid "unable to fdopen alternates lockfile"
+msgstr "no s'ha pogut fer «fdopen» al fitxer de bloqueig alternatiu"
+
+#: object-file.c:717
+msgid "unable to read alternates file"
+msgstr "no es pot llegir el fitxer «alternates»"
+
+#: object-file.c:724
+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
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "el camí «%s» no existeix"
+
+#: object-file.c:780
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"encara no s'admet el repositori de referència «%s» com a agafament enllaçat."
+
+#: object-file.c:786
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "el repositori de referència «%s» no és un repositori local."
+
+#: object-file.c:792
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "el repositori de referència «%s» és superficial"
+
+#: object-file.c:800
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "el repositori de referència «%s» és empeltat"
+
+#: object-file.c:860
+#, 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
+#, 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:1195
+#, c-format
+msgid "object file %s is empty"
+msgstr "el tipus d'objecte %s és buit"
+
+#: object-file.c:1330 object-file.c:2524
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objecte solt corrupte «%s»"
+
+#: object-file.c:1332 object-file.c:2528
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "brossa al final de l'objecte solt «%s»"
+
+#: object-file.c:1374
+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
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "no s'ha pogut desempaquetar la capçalera %s"
+
+#: object-file.c:1467
+#, 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"
+
+#: object-file.c:1697
+#, c-format
+msgid "failed to read object %s"
+msgstr "s'ha produït un error en llegir l'objecte %s"
+
+#: object-file.c:1701
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "unable to write file %s"
+msgstr "no s'ha pogut escriure al fitxer %s"
+
+#: object-file.c:1821
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "no s'ha pogut establir el permís a «%s»"
+
+#: object-file.c:1828
+msgid "file write error"
+msgstr "s'ha produït un error en escriure al fitxer"
+
+#: object-file.c:1848
+msgid "error when closing loose object file"
+msgstr "error en tancar el fitxer d'objecte solt"
+
+#: object-file.c:1913
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"permisos insuficients per a afegir un objecte a la base de dades del repositori "
+"%s"
+
+#: object-file.c:1915
+msgid "unable to create temporary file"
+msgstr "no s'ha pogut crear un fitxer temporal"
+
+#: object-file.c:1939
+msgid "unable to write loose object file"
+msgstr "no s'ha pogut escriure el fitxer d'objecte solt"
+
+#: object-file.c:1945
+#, 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
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "ha fallat deflateEnd a l'objecte %s(%d)"
+
+#: object-file.c:1953
+#, 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
+#, c-format
+msgid "failed utime() on %s"
+msgstr "ha fallat utime() a %s"
+
+#: object-file.c:2040
+#, c-format
+msgid "cannot read object for %s"
+msgstr "no es pot llegir l'objecte per a %s"
+
+#: object-file.c:2091
+msgid "corrupt commit"
+msgstr "comissió corrupta"
+
+#: object-file.c:2099
+msgid "corrupt tag"
+msgstr "etiqueta corrupta"
+
+#: object-file.c:2199
+#, c-format
+msgid "read error while indexing %s"
+msgstr "error de lectura mentre s'indexava %s"
+
+#: object-file.c:2202
+#, c-format
+msgid "short read while indexing %s"
+msgstr "lectura curta mentre s'indexa %s"
+
+#: object-file.c:2275 object-file.c:2285
+#, 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
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipus de fitxer no suportat"
+
+#: object-file.c:2315
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s no és un objecte vàlid"
+
+#: object-file.c:2317
+#, 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
+#, c-format
+msgid "unable to open %s"
+msgstr "no s'ha pogut obrir %s"
+
+#: object-file.c:2535 object-file.c:2588
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "no coincideix la suma per a %s (s'esperava %s)"
+
+#: object-file.c:2559
+#, c-format
+msgid "unable to mmap %s"
+msgstr "no s'ha pogut fer «mmap» %s"
+
+#: object-file.c:2564
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "no s'ha pogut desempaquetar la capçalera de %s"
+
+#: object-file.c:2570
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "no s'ha pogut analitzar la capçalera de %s"
+
+#: object-file.c:2581
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "no s'han pogut desempaquetar els continguts de %s"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "l'id d'objecte curt %s és ambigu"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Els candidats són:"
+
+#: object-name.c:796
+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 ""
+"Git normalment mai crea una referència que acabi amb 40 caràcters\n"
+"hexadecimals perquè s'ignorarà quan només especifiqueu 40 caràcters\n"
+"hexadecimals. Aquestes referències es poden crear per error. Per\n"
+"exemple,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"on «$br» és buida per algun motiu i es crea una referència de 40 caràcters\n"
+"hexadecimals. Examineu aquestes referències i potser\n"
+"suprimiu-les. Desactiveu aquest missatge executant\n"
+"«git config advice.objectNameWarning false»"
+
+#: object-name.c:916
+#, 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
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "registre per a «%.*s» només té %d entrades"
+
+#: object-name.c:1702
+#, 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
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"el camí «%s» existeix, però no «%s»\n"
+"consell: volíeu dir «%.*s:%s» conegut com a «%.*s:./%s»?"
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "el camí «%s» no existeix en «%.*s»"
+
+#: object-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 ""
+"el camí «%s» està a l'índex, però no a «stage» %d\n."
+"consell: volíeu dir «:%d:%s»?"
+
+#: object-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 ""
+"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
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "el camí «%s» existeix al disc, però no a l'índex"
+
+#: object-name.c:1771
+#,  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
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"la sintaxi de camí relatiu no es pot utilitzar fora de l'arbre de treball"
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nom d'objecte no vàlid «%.*s»."
+
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr "tipus d'objecte «%s» no vàlid"
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr "l'objecte %s és %s, no pas %s"
 
-#: object.c:234
+#: object.c:232
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "l'objecte %s té un identificador de tipus %d desconegut"
 
-#: object.c:247
+#: object.c:245
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "no s'ha pogut analitzar l'objecte: %s"
 
-#: object.c:267 object.c:278
+#: object.c:265 object.c:277
 #, 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
+#, 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
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "no s'ha pogut obtenir l'ús del disc de %s"
+
+#: pack-revindex.c:221
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "el fitxer d'índex invers %s és massa petit"
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "el fitxer d'índex invers %s està malmès"
+
+#: pack-revindex.c:234
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+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 ""
+
+#: pack-revindex.c:243
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
 msgstr ""
 
-#: packfile.c:648
+#: pack-write.c:250
+msgid "cannot both write and verify reverse index"
+msgstr "no es pot escriure i verificar l'índex invers"
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr "no s'ha pogut fer stat a: %s"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "s'ha produït un error en fer %s llegible"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "no s'ha pogut escriure «%s» al fitxer «promisor»"
+
+#: packfile.c:625
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
 
-#: packfile.c:1899
+#: packfile.c:1937
 #, 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:1903
+#: packfile.c:1941
 #, 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
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "l'opció «%s» espera un valor numèric"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "data de venciment «%s» mal formada"
+
+#: parse-options-cb.c:54
+#, 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
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nom d'objecte «%s» mal format"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4303,7 +6033,7 @@ msgstr "%s és incompatible amb %s"
 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:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s no accepta cap valor"
@@ -4313,41 +6043,46 @@ msgstr "%s no accepta cap valor"
 msgid "%s isn't available"
 msgstr "%s no és disponible"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
-msgstr ""
+msgstr "%s espera un valor enter no negatiu amb un sufix opcional k/m/g"
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
-msgstr ""
+msgstr "opció ambigua: %s (pot ser --%s%s o --%s%s)"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr ""
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "voleu dir «--%s» (amb dos traços)?"
+
+#: parse-options.c:668 parse-options.c:988
+#, c-format
+msgid "alias of --%s"
+msgstr "àlies de --%s"
 
-#: parse-options.c:859
+#: parse-options.c:879
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opció desconeguda «%s»"
 
-#: parse-options.c:861
+#: parse-options.c:881
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "«switch» «%c» desconegut"
 
-#: parse-options.c:863
+#: parse-options.c:883
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "opció no ascii desconeguda en la cadena: «%s»"
 
-#: parse-options.c:887
+#: parse-options.c:907
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:906
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr "ús: %s"
@@ -4355,76 +6090,51 @@ msgstr "ús: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:912
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
-msgstr " o: %s"
+msgstr "   o: %s"
 
-#: parse-options.c:915
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:954
+#: parse-options.c:974
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options.c:968
-#, c-format
-msgid "alias of --%s"
-msgstr "àlies de --%s"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "l'opció «%s» espera un valor numèric"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "data de venciment «%s» mal formada"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "l'opció «%s» espera «always», «auto» o «never»"
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nom d'objecte «%s» mal format"
-
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "No s'ha pogut fer %s escrivible pel grup"
 
-#: pathspec.c:128
+#: pathspec.c:151
 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:146
+#: pathspec.c:169
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Només es permet una especificació «attr:»."
 
-#: pathspec.c:149
+#: pathspec.c:172
 msgid "attr spec must not be empty"
 msgstr "una especificació d'atribut no pot estar buida"
 
-#: pathspec.c:192
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nom d'atribut no vàlid %s"
 
-#: pathspec.c:257
+#: pathspec.c:280
 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:264
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4432,51 +6142,56 @@ 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:304
+#: pathspec.c:327
 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:325
+#: pathspec.c:348
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Màgia d'especificació de camí no vàlida '%.*s' en «%s»"
+msgstr "Màgia d'especificació de camí no vàlida «%.*s» en «%s»"
 
-#: pathspec.c:330
+#: pathspec.c:353
 #, 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:368
+#: pathspec.c:391
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Màgia d'especificació de camí no implementada «%c» en «%s»"
 
-#: pathspec.c:427
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: «literal» i «glob» són incompatibles"
 
-#: pathspec.c:440
+#: pathspec.c:466
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: «%s» és fora del dipòsit"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: «%s» està fora del repositori en «%s»"
 
-#: pathspec.c:514
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "«%s» (mnemònic: «%c»)"
 
-#: pathspec.c:524
+#: pathspec.c:552
 #, 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:591
+#: pathspec.c:619
 #, 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
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "la línia està mal citada: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "no s'ha pogut escriure el paquet de buidatge"
@@ -4486,134 +6201,179 @@ msgid "unable to write delim packet"
 msgstr "no s'ha pogut escriure el paquet delim"
 
 #: pkt-line.c:106
+msgid "unable to write stateless separator packet"
+msgstr "no s'ha pogut escriure el paquet de separació sense estat"
+
+#: 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:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:265
 msgid "protocol error: impossibly long line"
 msgstr "error de protocol: longitud de línia impossible"
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr "ha fallat l'escriptura del paquet amb format"
 
-#: pkt-line.c:196
+#: pkt-line.c:204
 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 "
 "paquet"
 
-#: pkt-line.c:203 pkt-line.c:210
-msgid "packet write failed"
-msgstr "no s'ha pogut escriure el paquet"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "no s'ha pogut escriure el paquet: %s"
 
-#: pkt-line.c:295
+#: pkt-line.c:328 pkt-line.c:329
 msgid "read error"
 msgstr "error de lectura"
 
-#: pkt-line.c:303
+#: pkt-line.c:339 pkt-line.c:340
 msgid "the remote end hung up unexpectedly"
 msgstr "el remot ha penjat inesperadament"
 
-#: pkt-line.c:331
+#: pkt-line.c:369 pkt-line.c:371
 #, 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:341 pkt-line.c:346
+#: 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 "error de protocol: longitud de línia errònia %d"
 
-#: pkt-line.c:362
+#: pkt-line.c:413 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "error remot: %s"
 
-#: preload-index.c:119
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr "S'està actualitzant l'índex"
 
-#: preload-index.c:138
-#, fuzzy, c-format
+#: preload-index.c:144
+#, c-format
 msgid "unable to create threaded lstat: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'han pogut crear lstat amb fils %s"
 
-#: pretty.c:966
+#: pretty.c:988
 msgid "unable to parse --pretty format"
 msgstr "no s'ha pogut analitzar el format --pretty"
 
-#: range-diff.c:70
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote no es pot bifurcar obtenint el subprocés"
+
+#: promisor-remote.c:35 promisor-remote.c:37
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote no s'ha pogut escriure per obtenir el subprocés"
+
+#: promisor-remote.c:41
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote no s'ha pogut tancar stdin per obtenir el subprocés"
+
+#: promisor-remote.c:53
+#, 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
+msgid "object-info: expected flush after arguments"
+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"
+
+#: range-diff.c:78
 msgid "could not start `log`"
 msgstr "no s'ha pogut iniciar «log»"
 
-#: range-diff.c:72
+#: range-diff.c:80
 msgid "could not read `log` output"
 msgstr "no s'ha pogut llegir la sortida de «log»"
 
-#: range-diff.c:91 sequencer.c:5021
+#: range-diff.c:101 sequencer.c:5551
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "no s'ha pogut analitzar la comissió «%s»"
 
-#: range-diff.c:117
+#: range-diff.c:115
+#, 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 començava "
+"amb «commit»: «%s»"
+
+#: range-diff.c:140
 #, 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:274
+#: range-diff.c:306
 msgid "failed to generate diff"
 msgstr "s'ha produït un error en generar el diff"
 
-#: range-diff.c:506 range-diff.c:508
+#: range-diff.c:558
+#
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only i --right-only són mútuament excloents"
+
+#: range-diff.c:561 range-diff.c:563
 #, c-format
 msgid "could not parse log for '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre per «%s»"
+msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»"
 
-#: read-cache.c:680
+#: read-cache.c:708
 #, 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:696
+#: read-cache.c:724
 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:718
+#: read-cache.c:746
 #, 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"
+msgstr ""
+"%s: només pot afegir fitxers normals, enllaços simbòlics o directoris git"
 
-#: read-cache.c:723
-#, fuzzy, c-format
+#: read-cache.c:751
+#, c-format
 msgid "'%s' does not have a commit checked out"
-msgstr "«%s» no assenyala una comissió"
+msgstr "«%s» no té una comissió comprovada"
 
-#: read-cache.c:775
+#: read-cache.c:803
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "no es pot llegir indexar el fitxer «%s»"
 
-#: read-cache.c:794
+#: read-cache.c:822
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "no s'ha pogut afegir «%s» a l'índex"
 
-#: read-cache.c:805
-#, fuzzy, c-format
+#: read-cache.c:833
+#, c-format
 msgid "unable to stat '%s'"
-msgstr "no s'ha pogut actualitzar %s"
+msgstr "no s'ha pogut fer «stat» a «%s»"
 
-#: read-cache.c:1314
-#, fuzzy, c-format
+#: read-cache.c:1356
+#, c-format
 msgid "'%s' appears as both a file and as a directory"
-msgstr "%s existeix i no és directori"
+msgstr "«%s» apareix com a fitxer i com a directori"
 
-#: read-cache.c:1499
+#: read-cache.c:1571
 msgid "Refresh index"
 msgstr "Actualitza l'índex"
 
-#: read-cache.c:1613
+#: read-cache.c:1700
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4622,7 +6382,7 @@ msgstr ""
 "index.version està establerta, però el valor no és vàlid.\n"
 "S'està usant la versió %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1710
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4631,152 +6391,166 @@ msgstr ""
 "GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
 "S'està usant la versió %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1766
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "signatura malmesa 0x%08x"
 
-#: read-cache.c:1682
+#: read-cache.c:1769
 #, c-format
 msgid "bad index version %d"
 msgstr "versió d'índex incorrecta %d"
 
-#: read-cache.c:1691
+#: read-cache.c:1778
 msgid "bad index file sha1 signature"
 msgstr "signatura sha1 malmesa al fitxer d'índex"
 
-#: read-cache.c:1721
+#: read-cache.c:1812
 #, 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:1723
+#: read-cache.c:1814
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "s'està ignorant l'extensió %.4s"
 
-#: read-cache.c:1760
+#: read-cache.c:1851
 #, c-format
 msgid "unknown index entry format 0x%08x"
-msgstr "Format d'entrada d'índex desconeguda «0x%08x»"
+msgstr "format d'entrada d'índex desconeguda «0x%08x»"
 
-#: read-cache.c:1776
+#: read-cache.c:1867
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
-msgstr "camp del nom mal formatat l'index, camí a prop «%s»"
+msgstr "camp del nom mal formatat l'índex, camí a prop «%s»"
 
-#: read-cache.c:1833
+#: read-cache.c:1924
 msgid "unordered stage entries in index"
-msgstr ""
+msgstr "entrades «stage» no ordenades en l'índex"
 
-#: read-cache.c:1836
-#, fuzzy, c-format
+#: read-cache.c:1927
+#, c-format
 msgid "multiple stage entries for merged file '%s'"
-msgstr "nom d'identitat buit (per <%s>) no és permès"
+msgstr "múltiples entrades «stage» per al fitxer fusionat «%s»"
 
-#: read-cache.c:1839
-#, fuzzy, c-format
+#: read-cache.c:1930
+#, c-format
 msgid "unordered stage entries for '%s'"
-msgstr "no s'han pogut crear directoris per %s"
-
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:467
-#: builtin/checkout.c:651 builtin/clean.c:956 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+msgstr "entrades «stage» no ordenades per a «%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
 msgid "index file corrupt"
 msgstr "fitxer d'índex malmès"
 
-#: read-cache.c:2087
-#, fuzzy, c-format
+#: read-cache.c:2180
+#, c-format
 msgid "unable to create load_cache_entries thread: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'ha pogut crear fil «load_cache_entries»: %s"
 
-#: read-cache.c:2100
-#, fuzzy, c-format
+#: read-cache.c:2193
+#, c-format
 msgid "unable to join load_cache_entries thread: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'ha pogut unir al fil «load_cache_entries»: %s"
 
-#: read-cache.c:2133
-#, fuzzy, c-format
+#: read-cache.c:2226
+#, c-format
 msgid "%s: index file open failed"
-msgstr "s'ha produït un error en actualitzar els fitxers"
+msgstr "%s: ha fallat l'obertura del fitxer d'índex"
 
-#: read-cache.c:2137
-#, fuzzy, c-format
+#: read-cache.c:2230
+#, c-format
 msgid "%s: cannot stat the open index"
-msgstr "no es pot llegir l'índex"
+msgstr "%s: no es pot fer «stat» a l'índex obert"
 
-#: read-cache.c:2141
+#: read-cache.c:2234
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: fitxer d'índex més petit que s'esperava"
 
-#: read-cache.c:2145
+#: read-cache.c:2238
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%s: no es pot mapar el fitxer d'índex"
 
-#: read-cache.c:2187
-#, fuzzy, c-format
+#: read-cache.c:2280
+#, c-format
 msgid "unable to create load_index_extensions thread: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'ha pogut crear un fil «load_index_extensions»: %s"
 
-#: read-cache.c:2214
-#, fuzzy, c-format
+#: read-cache.c:2307
+#, c-format
 msgid "unable to join load_index_extensions thread: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'ha pogut unir un fil «load_index_extensions»: %s"
 
-#: read-cache.c:2246
-#, fuzzy, c-format
+#: read-cache.c:2345
+#, c-format
 msgid "could not freshen shared index '%s'"
-msgstr "no s'ha pogut llegir el fitxer «%s»"
+msgstr "no s'ha pogut refrescar l'índex compartit «%s»"
 
-#: read-cache.c:2293
+#: read-cache.c:2392
 #, 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:2989 wrapper.c:658 builtin/merge.c:1114
+#: read-cache.c:3095 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1145
 #, c-format
 msgid "could not close '%s'"
 msgstr "no s'ha pogut tancar «%s»"
 
-#: read-cache.c:3092 sequencer.c:2358 sequencer.c:3928
+#: read-cache.c:3138
+msgid "failed to convert to a sparse-index"
+msgstr "s'ha produït un error en convertir a un índex dispers"
+
+#: read-cache.c:3209 sequencer.c:2684 sequencer.c:4441
 #, c-format
 msgid "could not stat '%s'"
 msgstr "no s'ha pogut fer stat a «%s»"
 
-#: read-cache.c:3105
+#: read-cache.c:3222
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no s'ha pogut obrir el directori git: %s"
 
-#: read-cache.c:3117
+#: read-cache.c:3234
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no s'ha pogut desenllaçar: %s"
 
-#: read-cache.c:3142
-#, fuzzy, c-format
+#: read-cache.c:3263
+#, c-format
 msgid "cannot fix permission bits on '%s'"
-msgstr "no s'ha pogut resoldre la revisió: %s"
+msgstr "no s'han pogut corregir els bits de permisos en «%s»"
 
-#: read-cache.c:3291
-#, fuzzy, c-format
+#: read-cache.c:3412
+#, c-format
 msgid "%s: cannot drop to stage #0"
-msgstr "no es pot canviar de directori a %s"
+msgstr "%s: no es pot baixar fins al «stage» #0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Podeu arreglar-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
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
-"No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està "
+"no s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. S'està "
 "ignorant."
 
-#: rebase-interactive.c:35
-#, fuzzy
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4784,7 +6558,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"
@@ -4793,32 +6570,45 @@ 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"
 "Ordres:\n"
-" p, pick = usa la comissió\n"
-" r, reword = usa la comissió, però edita el missatge de comissió\n"
-" e, edit = usa la comissió, però atura't per a esmenar\n"
-" s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n"
-" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta "
-"comissió\n"
-" x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret "
-"d'ordres\n"
-" d, drop = elimina la comissió\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-la\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"
+"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"
 "\n"
 "Es pot canviar l'ordre d'aquestes línies; s'executen de dalt a baix.\n"
 
-#: rebase-interactive.c:56
-#, 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] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
-msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
+msgstr[0] "Fes «rebase» de %s a %s (%d ordre)"
+msgstr[1] "Fes «rebase» de %s a %s (%d ordres)"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: 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"
@@ -4827,7 +6617,7 @@ msgstr ""
 "No elimineu cap línia. Useu «drop» explícitament per a eliminar una "
 "comissió.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4835,7 +6625,7 @@ msgstr ""
 "\n"
 "Si elimineu una línia aquí, ES PERDRÀ AQUELLA COMISSIÓ.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4849,7 +6639,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4859,22 +6649,19 @@ msgstr ""
 "No obstant, si elimineu tot, s'avortarà el «rebase».\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Tingueu en compte que les comissions buides estan comentades"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3447
-#: sequencer.c:3473 sequencer.c:5120 builtin/fsck.c:356 builtin/rebase.c:235
+#: 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
 #, c-format
 msgid "could not write '%s'"
 msgstr "no s'ha pogut escriure «%s»"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "no s'ha pogut copiar «%s» a «%s»."
+msgid "could not write '%s'."
+msgstr "no s'ha pogut escriure a «%s»."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:196
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -4884,7 +6671,7 @@ msgstr ""
 "accidentalment.\n"
 "Les comissions descartades (més nova a més vella):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:203
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4894,131 +6681,21 @@ msgid ""
 "The possible behaviours are: ignore, warn, error.\n"
 "\n"
 msgstr ""
-"Per a evitar aquest missatge, useu \"drop\" per a eliminar explícitament una "
+"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 "
+"Useu «git config rebase.missingCommitsCheck» per a canviar el nivell "
 "d'advertències.\n"
 "Els comportaments possibles són: ignore, warn, error.\n"
 
-#: refs.c:262
+#: 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 "%s does not point to a valid object!"
-msgstr "%s no apunta a un objecte vàlid"
-
-#: refs.c:667
-#, fuzzy, c-format
-msgid "ignoring dangling symref %s"
-msgstr "s'està ignorant la referència trencada %s"
-
-#: refs.c:669 ref-filter.c:2092
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "s'està ignorant la referència trencada %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "no s'ha pogut obrir «%s» per a escriptura: %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "no s'ha pogut llegir la referència «%s»"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "la referència «%s» ja existeix"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "ID d'objecte no esperat en escriure «%s»"
-
-#: refs.c:833 sequencer.c:403 sequencer.c:2709 sequencer.c:2913
-#: sequencer.c:2927 sequencer.c:3184 sequencer.c:5037 wrapper.c:656
-#, c-format
-msgid "could not write to '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
-
-#: refs.c:860 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:1003
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "no s'ha pogut obrir «%s» per a escriptura"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "ID d'objecte no esperat en suprimir «%s»"
-
-#: refs.c:998
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr ""
-
-#: refs.c:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr ""
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr ""
-
-#: refs.c:1155
-#, 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:1231
-#, fuzzy, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "s'ha produït un error en obrir «%s»: %s"
-
-#: refs.c:2012
-#, fuzzy, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "nom d'identitat buit (per <%s>) no és permès"
-
-#: refs.c:2044
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "no està permès actualitzar les referències en un entorn de quarantena"
-
-#: refs.c:2140 refs.c:2170
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "«%s» existeix; no es pot crear «%s»"
-
-#: refs.c:2146 refs.c:2181
-#, 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:1234
-#, c-format
-msgid "could not remove reference %s"
-msgstr "no s'ha pogut eliminar la referència %s"
-
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "no s'ha pogut suprimir la referència %s: %s"
-
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
-#, c-format
-msgid "could not delete references: %s"
-msgstr "no s'han pogut suprimir les referències: %s"
-
-#: refspec.c:137
-#, fuzzy, c-format
-msgid "invalid refspec '%s'"
-msgstr "fitxer no vàlid: «%s»"
+msgid "could not read '%s'."
+msgstr "no s'ha pogut llegir «%s»."
 
-#: ref-filter.c:42 wt-status.c:1934
+#: ref-filter.c:42 wt-status.c:1978
 msgid "gone"
 msgstr "no hi és"
 
@@ -5037,290 +6714,411 @@ msgstr "darrere per %d"
 msgid "ahead %d, behind %d"
 msgstr "davant per %d, darrere per %d"
 
-#: ref-filter.c:162
+#: ref-filter.c:175
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "format esperat: %%(color:<color>)"
 
-#: ref-filter.c:164
+#: ref-filter.c:177
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconegut: %%(color:%s)"
 
-#: ref-filter.c:186
+#: ref-filter.c:199
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
-msgstr "valor enter esperat pel nom de referència:lstrip=%s"
+msgstr "Valor enter esperat pel nom de referència:lstrip=%s"
 
-#: ref-filter.c:190
+#: ref-filter.c:203
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
-msgstr "valor enter esperat pel nom de referència:rstrip=%s"
+msgstr "Valor enter esperat pel nom de referència:rstrip=%s"
 
-#: ref-filter.c:192
+#: ref-filter.c:205
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
-msgstr "paràmetre %%(%s) desconegut: %s"
+msgstr "argument %%(%s) desconegut: %s"
 
-#: ref-filter.c:247
+#: ref-filter.c:260
 #, c-format
 msgid "%%(objecttype) does not take arguments"
-msgstr "%%(subject) no accepta paràmetres"
+msgstr "%%(objecttype) no accepta arguments"
 
-#: ref-filter.c:269
-#, fuzzy, c-format
+#: ref-filter.c:282
+#, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "paràmetre %%(objectname) no reconegut: %s"
+msgstr "argument %%(objectsize) no reconegut: %s"
 
-#: ref-filter.c:277
-#, fuzzy, c-format
+#: ref-filter.c:290
+#, c-format
 msgid "%%(deltabase) does not take arguments"
-msgstr "%%(objectsize) no accepta paràmetres"
+msgstr "%%(deltabase) no accepta arguments"
 
-#: ref-filter.c:289
+#: ref-filter.c:302
 #, c-format
 msgid "%%(body) does not take arguments"
-msgstr "%%(body) no accepta paràmetres"
+msgstr "%%(body) no accepta arguments"
 
-#: ref-filter.c:298
+#: ref-filter.c:315
 #, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) no accepta paràmetres"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "argument %%(subject) no reconegut: %s"
 
-#: ref-filter.c:320
+#: ref-filter.c:334
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr ""
+
+#: ref-filter.c:336
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
-msgstr "paràmetre %%(trailers) desconegut: %s"
+msgstr "argument %%(trailers) desconegut: %s"
 
-#: ref-filter.c:349
+#: ref-filter.c:367
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positiu esperat conté:lines=%s"
 
-#: ref-filter.c:351
+#: ref-filter.c:369
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
-msgstr "paràmetre %%(contents) no reconegut: %s"
+msgstr "argument %%(contents) no reconegut: %s"
 
-#: ref-filter.c:366
+#: ref-filter.c:384
 #, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "valor positiu esperat nom d'objecte:curt=%s"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "valor positiu esperat «%s» a %%(%s)"
 
-#: ref-filter.c:370
+#: ref-filter.c:388
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "paràmetre %%(objectname) no reconegut: %s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "argument no reconegut «%s» a %%(%s)"
 
-#: ref-filter.c:400
+#: ref-filter.c:402
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "opció del correu electrònic no reconeguda: «%s»"
+
+#: ref-filter.c:432
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format esperat: %%(align:<amplada>,<posició>)"
 
-#: ref-filter.c:412
+#: ref-filter.c:444
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posició no reconeguda:%s"
 
-#: ref-filter.c:419
+#: ref-filter.c:451
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "amplada no reconeguda:%s"
 
-#: ref-filter.c:428
+#: ref-filter.c:460
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
-msgstr "paràmetre %%(align) no reconegut: %s"
+msgstr "argument %%(align) no reconegut: %s"
 
-#: ref-filter.c:436
+#: ref-filter.c:468
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "amplada positiva esperada amb l'àtom %%(align)"
 
-#: ref-filter.c:454
+#: ref-filter.c:486
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
-msgstr "paràmetre %%(if) no reconegut: %s"
+msgstr "argument %%(if) no reconegut: %s"
 
-#: ref-filter.c:556
+#: ref-filter.c:588
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de camp mal format: %.*s"
 
-#: ref-filter.c:583
+#: ref-filter.c:615
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de camp desconegut: %.*s"
 
-#: ref-filter.c:587
+#: ref-filter.c:619
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
+"no és un repositori, git però el camp «%.*s» requereix accés a les dades de "
+"l'objecte"
 
-#: ref-filter.c:711
+#: ref-filter.c:743
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)"
 
-#: ref-filter.c:774
+#: 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:776
+#: ref-filter.c:809
 #, 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:778
+#: ref-filter.c:811
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
 
-#: ref-filter.c:806
+#: 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:808
+#: 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:810
+#: ref-filter.c:843
 #, 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:825
+#: ref-filter.c:858
 #, 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:882
+#: ref-filter.c:915
 #, c-format
 msgid "malformed format string %s"
 msgstr "cadena de format mal format %s"
 
-#: ref-filter.c:1485
-#, fuzzy, c-format
-msgid "no branch, rebasing %s"
-msgstr "(cap branca, s'està fent «rebase» %s)"
+#: ref-filter.c:1556
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(sense branca, s'està fent «rebase» %s)"
 
-#: ref-filter.c:1488
-#, fuzzy, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "(cap branca, s'està fent «rebase» d'un «HEAD» %s no adjuntat)"
+#: ref-filter.c:1559
+#,  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
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(sense branca, bisecció començada en %s)"
+
+#: ref-filter.c:1566
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD separat a %s)"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1569
 #, c-format
-msgid "no branch, bisect started on %s"
-msgstr "(cap branca, bisecció començada en %s)"
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD separat des de %s)"
 
-#: ref-filter.c:1501
-msgid "no branch"
-msgstr "sense branca"
+#: ref-filter.c:1572
+msgid "(no branch)"
+msgstr "(sense branca)"
 
-#: ref-filter.c:1537 ref-filter.c:1743
+#: ref-filter.c:1604 ref-filter.c:1813
 #, c-format
 msgid "missing object %s for %s"
 msgstr "manca l'objecte %s per a %s"
 
-#: ref-filter.c:1547
+#: ref-filter.c:1614
 #, 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:1998
+#: ref-filter.c:1997
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objecte mal format a «%s»"
 
-#: ref-filter.c:2087
+#: ref-filter.c:2086
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "s'està ignorant la referència amb nom malmès %s"
 
-#: ref-filter.c:2382
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: manca l'àtom %%(end)"
-
-#: ref-filter.c:2482
+#: ref-filter.c:2091 refs.c:676
 #, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "l'opció «%s» és incompatible amb --merged"
+msgid "ignoring broken ref %s"
+msgstr "s'està ignorant la referència trencada %s"
 
-#: ref-filter.c:2485
+#: ref-filter.c:2431
 #, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "l'opció «%s» és incompatible amb --no-merged"
+msgid "format: %%(end) atom missing"
+msgstr "format: manca l'àtom %%(end)"
 
-#: ref-filter.c:2495
+#: ref-filter.c:2525
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objecte %s mal format"
 
-#: ref-filter.c:2500
+#: ref-filter.c:2530
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "l'opció «%s» ha d'apuntar a una comissió"
 
-#: remote.c:363
+#: refs.c:264
 #, c-format
-msgid "config remote shorthand cannot begin with '/': %s"
+msgid "%s does not point to a valid object!"
+msgstr "%s no apunta a un objecte vàlid"
+
+#: 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 ""
 
-#: remote.c:410
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "no s'ha pogut recuperar «%s»"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nom de branca no vàlida: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "s'està ignorant symref penjant %s"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "registre per a ref %s té un buit després de %s"
+
+#: refs.c:929
+#, , c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "registre per als ref %s ha acabat inesperadament a %s"
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "el registre per a %s és buit"
+
+#: refs.c:1086
+#, 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
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "ha fallat update_ref per a la ref «%s»: %s"
+
+#: refs.c:2051
+#, 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
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "no està permès actualitzar les referències en un entorn de quarantena"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "les actualitzacions de referències s'han avortat per un lligam"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "«%s» existeix; no es pot crear «%s»"
+
+#: refs.c:2248 refs.c:2283
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "could not delete references: %s"
+msgstr "no s'han pogut suprimir les referències: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec no vàlida: «%s»"
+
+#: remote.c:351
+#, fuzzy, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "config remote abreviation no pot començar amb «/»: %s"
+
+#: remote.c:399
 msgid "more than one receivepack given, using the first"
-msgstr ""
+msgstr "més d'un paquet de recepció donat, usant el primer"
 
-#: remote.c:418
+#: remote.c:407
 msgid "more than one uploadpack given, using the first"
-msgstr ""
+msgstr "més d'un paquet de càrrega donat, usant el primer"
 
-#: remote.c:608
+#: remote.c:590
 #, 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:612
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s generalment segueix %s, no %s"
 
-#: remote.c:616
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s segueix ambdós %s i %s"
 
-#: remote.c:684
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
-msgstr ""
+msgstr "la clau «%s» del patró no té «*»"
 
-#: remote.c:694
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
-msgstr ""
+msgstr "el valor «%s» del patró no té «*»"
 
-#: remote.c:1000
-#, fuzzy, c-format
+#: remote.c:1083
+#, c-format
 msgid "src refspec %s does not match any"
-msgstr "%s: no coincideix amb l'índex"
+msgstr "l'especificació de referència src %s no coincideix amb cap referència"
 
-#: remote.c:1005
+#: remote.c:1088
 #, c-format
 msgid "src refspec %s matches more than one"
-msgstr ""
+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:1020
-#, c-format
+#: remote.c:1103
+#, fuzzy, 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"
@@ -5332,148 +7130,163 @@ 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."
 
-#: remote.c:1040
+#: remote.c:1123
 #, 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 la referència és un objecte de comissió.\n"
+"Voleu crear una branca nova empenyent a\n"
+"«%s:refs/heads/%s»?"
 
-#: remote.c:1045
+#: remote.c:1128
 #, 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 la referència és un objecte d'etiqueta.\n"
+"Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?"
 
-#: remote.c:1050
+#: remote.c:1133
 #, 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 la referència és un objecte d'arbre.\n"
+"Voleu crear una etiqueta pujant-la a «%srefs/tags/%s»?"
 
-#: remote.c:1055
+#: remote.c:1138
 #, 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 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:1091
-#,  c-format
+#: remote.c:1174
+#, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "«%s» no es pot resoldre a una branca"
 
-#: remote.c:1102
+#: remote.c:1185
 #, 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:1114
+#: remote.c:1197
 #, c-format
 msgid "dst refspec %s matches more than one"
-msgstr ""
+msgstr "l'especificació de la referència dst %s coincideixen amb més d'una referència"
 
-#: remote.c:1121
+#: remote.c:1204
 #, c-format
 msgid "dst ref %s receives from more than one src"
-msgstr ""
+msgstr "l'especificació de la referència dst %s rep més d'una referència src"
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
 msgstr "HEAD no assenyala cap branca"
 
-#: remote.c:1633
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "no existeix la branca: «%s»"
 
-#: remote.c:1636
+#: remote.c:1736
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "cap font configurada per a la branca «%s»"
 
-#: remote.c:1642
+#: remote.c:1742
 #, 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:1657
+#: remote.c:1757
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "el destí de pujada «%s» en el remot «%s» no té cap branca amb seguiment remot"
 
-#: remote.c:1669
+#: remote.c:1769
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branca «%s» no té cap remot al qual pujar"
 
-#: remote.c:1679
+#: remote.c:1779
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "les especificacions de referència de «%s» no inclouen «%s»"
 
-#: remote.c:1692
+#: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
-msgstr "push no té destí (push.default és «nothing)"
+msgstr "push no té destí (push.default és «nothing»)"
 
-#: remote.c:1714
+#: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
-msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
+msgstr "no es pot resoldre una pujada «simple» a un sol destí"
 
-#: remote.c:1840
+#: remote.c:1943
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "no s'ha pogut trobar la referència remota %s"
 
-#: remote.c:1853
+#: remote.c:1956
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
-msgstr ""
+msgstr "* S'estan ignorant les referències «%s» localment"
 
-#: remote.c:2016
+#: remote.c:2119
 #, 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:2020
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "  (useu \"git branch --unset-upstream\" per a arreglar)\n"
+msgstr "  (useu «git branch --unset-upstream» per a arreglar-ho)\n"
 
-#: remote.c:2023
+#: remote.c:2126
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "La vostra branca està al dia amb «%s».\n"
 
-#: remote.c:2027
+#: remote.c:2130
 #, 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:2030
+#: remote.c:2133
 #, c-format
 msgid "  (use \"%s\" for details)\n"
-msgstr ""
+msgstr "  (useu «%s» per a detalls)\n"
 
-#: remote.c:2034
+#: 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] "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:2040
+#: remote.c:2143
 msgid "  (use \"git push\" to publish your local commits)\n"
-msgstr "  (useu \"git push\" per a publicar les vostres comissions locals)\n"
+msgstr "  (useu «git push» per a publicar les vostres comissions locals)\n"
 
-#: remote.c:2043
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5485,11 +7298,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:2051
+#: remote.c:2154
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (useu «git pull» per a actualitzar la vostra branca local)\n"
 
-#: remote.c:2054
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5504,183 +7317,204 @@ msgstr[1] ""
 "La vostra branca i «%s» han divergit,\n"
 "i tenen %d i %d comissions distintes cada una, respectivament.\n"
 
-#: remote.c:2064
+#: remote.c:2167
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
-msgstr "  (useu «git pull» per a fusionar la branca remota a la vostra)\n"
+msgstr "  (useu «git pull» per a fusionar la branca remota amb la vostra)\n"
 
-#: remote.c:2247
+#: remote.c:2359
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "no es pot analitzar el nom de l'objecte esperat «%s»"
 
 #: replace-object.c:21
-#, fuzzy, c-format
+#, c-format
 msgid "bad replace ref name: %s"
-msgstr "suprimeix les referències reemplaçades"
+msgstr "nom de la referència reemplaçada incorrecte: %s"
 
 #: replace-object.c:30
-#, fuzzy, c-format
+#, c-format
 msgid "duplicate replace ref: %s"
-msgstr "suprimeix les referències reemplaçades"
+msgstr "duplica les referències reemplaçades: %s"
 
-#: replace-object.c:73
-#, fuzzy, c-format
+#: replace-object.c:82
+#, c-format
 msgid "replace depth too high for object %s"
-msgstr "reemplaça l'etiqueta si existeix"
+msgstr "la profunditat de reemplaçament és massa alta per l'objecte %s"
 
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
 msgid "corrupt MERGE_RR"
-msgstr ""
+msgstr "MERGE_RR corrupte"
 
-#: rerere.c:264 rerere.c:269
-#, fuzzy
+#: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
-msgstr "no s'ha pogut escriure l'objecte de nota"
+msgstr "no s'ha pogut escriure el registre «rerere»"
 
-#: rerere.c:495
-#, fuzzy, c-format
+#: rerere.c:479
+#, c-format
 msgid "there were errors while writing '%s' (%s)"
-msgstr "error en llegir %s"
+msgstr "s'han produït errors en escriure «%s» (%s)"
 
-#: rerere.c:498
-#, fuzzy, c-format
+#: rerere.c:482
+#, c-format
 msgid "failed to flush '%s'"
-msgstr "s'ha produït un error en fer stat a «%s»"
+msgstr "no s'ha pogut buidar «%s»"
 
-#: 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 "no s'ha pogut analitzar la comissió «%s»"
+msgstr "no s'han pogut analitzar els pedaços en conflicte a «%s»"
 
-#: rerere.c:684
-#, fuzzy, c-format
+#: rerere.c:668
+#, c-format
 msgid "failed utime() on '%s'"
-msgstr "s'ha produït un error en obrir «%s»"
+msgstr "s'ha produït un error en fer «failed utime()» a «%s»"
 
-#: rerere.c:694
-#, fuzzy, c-format
+#: rerere.c:678
+#, c-format
 msgid "writing '%s' failed"
-msgstr "la creació de «%s» ha fallat"
+msgstr "s'ha produït un error en escriure «%s»"
 
-#: rerere.c:714
+#: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
-msgstr ""
+msgstr "«Staged» «%s» utilitzant una resolució anterior."
 
-#: rerere.c:753
+#: rerere.c:737
 #, c-format
 msgid "Recorded resolution for '%s'."
-msgstr ""
+msgstr "Es recorda la resolució per a «%s»."
 
-#: rerere.c:788
+#: rerere.c:772
 #, c-format
 msgid "Resolved '%s' using previous resolution."
-msgstr ""
+msgstr "S'ha resolt «%s» usant una resolució anterior."
 
-#: rerere.c:803
-#, fuzzy, c-format
+#: rerere.c:787
+#, c-format
 msgid "cannot unlink stray '%s'"
-msgstr "no es pot fer symlink en «%s» «%s»"
+msgstr "no es pot desenllaçar «%s» (extraviat)"
 
-#: rerere.c:807
-#, fuzzy, c-format
+#: rerere.c:791
+#, c-format
 msgid "Recorded preimage for '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
+msgstr "Imatge prèvia registrada per a «%s»"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:865 submodule.c:2089 builtin/log.c:2000
+#: builtin/submodule--helper.c:1879 builtin/submodule--helper.c:1891
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "no s'ha pogut crear el directori «%s»"
 
-#: rerere.c:1057
-#, fuzzy, c-format
+#: rerere.c:1041
+#, c-format
 msgid "failed to update conflicted state in '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
+msgstr "ha fallat en actualitzar l'estat en conflicte a «%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 "No s'ha pogut afegir el resultat de fusió per a «%s»"
+msgstr "no hi ha cap resolució recordada per a «%s»"
 
-#: rerere.c:1077
-#, fuzzy, c-format
+#: rerere.c:1061
+#, c-format
 msgid "cannot unlink '%s'"
-msgstr "no es pot fer readlink en «%s»"
+msgstr "no es pot fer «unlink» de «%s»"
 
-#: rerere.c:1087
-#, fuzzy, c-format
+#: rerere.c:1071
+#, c-format
 msgid "Updated preimage for '%s'"
-msgstr "suprimeix les referències reemplaçades"
+msgstr "Imatge prèvia actualitzada per a «%s»"
 
-#: rerere.c:1096
-#, fuzzy, c-format
+#: rerere.c:1080
+#, c-format
 msgid "Forgot resolution for '%s'\n"
-msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
+msgstr "S'ha oblidat la resolució per a «%s»\n"
 
-#: rerere.c:1199
-#, fuzzy
+#: rerere.c:1191
 msgid "unable to open rr-cache directory"
-msgstr "no s'ha pogut actualitzar l'arbre cau"
+msgstr "no s'ha pogut obrir el directori rr-cache"
+
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "no s'ha pogut determinar la revisió de HEAD"
 
-#: revision.c:2507
+#: reset.c:70 reset.c:76 sequencer.c:3669
+#, 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
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> ja no s'ha admet"
+
+#: revision.c:2683
 msgid "your current branch appears to be broken"
 msgstr "la vostra branca actual sembla malmesa"
 
-#: revision.c:2510
+#: revision.c:2686
 #, 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:2710
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent és incompatible amb --bisect"
-
-#: revision.c:2714
+#: revision.c:2892
 msgid "-L does not yet support diff formats besides -p and -s"
-msgstr ""
+msgstr "-L no és encara compatible amb formats que no siguin «-p» o «-s»"
 
-#: run-command.c:763
+#: run-command.c:767
 msgid "open /dev/null failed"
 msgstr "s'ha produït un error en obrir /dev/null"
 
-#: run-command.c:1269
-#, fuzzy, c-format
+#: run-command.c:1275
+#, c-format
 msgid "cannot create async thread: %s"
-msgstr "no s'ha pogut crear fil: %s"
+msgstr "no s'ha pogut crear fil «async»: %s"
 
-#: run-command.c:1333
+#: 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 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»." 
 
-#: send-pack.c:141
+#: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
-"paquet de neteja no esperat quan estava llegint l'estat del desempaquetament "
-"remot"
+"paquet de buidatge no esperat quan estava llegint l'estat del "
+"desempaquetament remot"
 
-#: send-pack.c:143
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "no s'ha pogut analitzar l'estat del desempaquetament remot: %s"
 
-#: send-pack.c:145
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "s'ha produït un error en el desempaquetament remot: %s"
 
-#: send-pack.c:306
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "s'ha produït un error en signar el certificat de pujada"
 
-#: send-pack.c:420
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: no es pot bifurcar obtenint un subprocés"
+
+#: send-pack.c:455
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr ""
+
+#: send-pack.c:52
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "el receptor de destí no admet l'algorisme d'hash del repositori"
+
+#: send-pack.c:529
 msgid "the receiving end does not support --signed push"
 msgstr "el destí receptor no admet pujar --signed"
 
-#: send-pack.c:422
+#: send-pack.c:531
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5688,173 +7522,167 @@ msgstr ""
 "no s'està enviant una certificació de pujada perquè el destí receptor no "
 "admet pujar --signed"
 
-#: send-pack.c:434
+#: send-pack.c:543
 msgid "the receiving end does not support --atomic push"
 msgstr "el destí receptor no admet pujar --atomic"
 
-#: send-pack.c:439
+#: send-pack.c:548
 msgid "the receiving end does not support push options"
 msgstr "el destí receptor no admet opcions de pujada"
 
-#: sequencer.c:187
+#: sequencer.c:196
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mode de neteja «%s» no vàlid en la comissió del missatge"
 
-#: sequencer.c:292
-#, fuzzy, c-format
+#: sequencer.c:324
+#, c-format
 msgid "could not delete '%s'"
-msgstr "No s'ha pogut suprimir %s"
+msgstr "no s'ha pogut suprimir «%s»"
 
-#: sequencer.c:311 builtin/rebase.c:759 builtin/rebase.c:1645 builtin/rm.c:369
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
 #, c-format
 msgid "could not remove '%s'"
-msgstr "no s'ha pogut suprimir «%s»"
+msgstr "no s'ha pogut eliminar «%s»"
 
-#: sequencer.c:321
+#: sequencer.c:354
 msgid "revert"
 msgstr "revertir"
 
-#: sequencer.c:323
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:358
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
-#, fuzzy, c-format
+#: sequencer.c:360
+#, c-format
 msgid "unknown action: %d"
-msgstr "Acció desconeguda: %d"
+msgstr "acció desconeguda: %d"
 
-#: sequencer.c:385
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
 "després de resoldre els conflictes, marqueu els camins\n"
-"corregits amb 'git add <camins>' o 'git rm <camins>'"
+"corregits amb «git add <camins>» o «git rm <camins>»"
 
-#: sequencer.c:388
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
 "and commit the result with 'git commit'"
 msgstr ""
 "després de resoldre els conflictes, marqueu els camins\n"
-"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
-"i cometeu el resultat amb 'git commit'"
+"corregits amb «git add <camins>» o «git rm <camins>»\n"
+"i cometeu el resultat amb «git commit»"
 
-#: sequencer.c:401 sequencer.c:2909
+#: sequencer.c:435 sequencer.c:3271
 #, c-format
 msgid "could not lock '%s'"
 msgstr "no s'ha pogut bloquejar «%s»"
 
-#: sequencer.c:408
+#: sequencer.c:437 sequencer.c:3070 sequencer.c:3275 sequencer.c:3289
+#: sequencer.c:3546 sequencer.c:5567 strbuf.c:1170 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
+
+#: sequencer.c:442
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
 
-#: sequencer.c:413 sequencer.c:2714 sequencer.c:2915 sequencer.c:2929
-#: sequencer.c:3192
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3554
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "s'ha produït un error en finalitzar «%s»"
 
-#: sequencer.c:436 sequencer.c:981 sequencer.c:1655 sequencer.c:2734
-#: sequencer.c:3174 sequencer.c:3283 builtin/am.c:245 builtin/commit.c:763
-#: builtin/merge.c:1112 builtin/rebase.c:567
-#, c-format
-msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir «%s»"
-
-#: sequencer.c:462
+#: sequencer.c:486
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "els vostres canvis locals se sobreescriurien per %s."
 
-#: sequencer.c:466
+#: sequencer.c:490
 msgid "commit your changes or stash them to proceed."
 msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
 
-#: sequencer.c:498
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avanç ràpid"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:561 builtin/tag.c:609
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de neteja no vàlid %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:632
+#: sequencer.c:671
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
 
-#: sequencer.c:649
+#: sequencer.c:685
 msgid "unable to update cache tree"
 msgstr "no s'ha pogut actualitzar l'arbre cau"
 
-#: sequencer.c:663
+#: sequencer.c:699
 msgid "could not resolve HEAD commit"
 msgstr "no s'ha pogut resoldre la comissió HEAD"
 
-#: sequencer.c:743
-#, fuzzy, c-format
+#: sequencer.c:779
+#, c-format
 msgid "no key present in '%.*s'"
-msgstr "no s'ha pogut analitzar «%.*s»"
+msgstr "no hi ha una clau a «%.*s»"
 
-#: sequencer.c:754
-#, fuzzy, c-format
+#: sequencer.c:790
+#, c-format
 msgid "unable to dequote value of '%s'"
-msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
+msgstr "no s'han pogut treure les cometes del valor de «%s»"
 
-#: sequencer.c:791 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1109 builtin/rebase.c:1045
+#: 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
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "no s'ha pogut obrir «%s» per a lectura"
 
-#: sequencer.c:801
+#: sequencer.c:837
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "Ja s'ha donat «GIT_AUTHOR_NAME»"
 
-#: sequencer.c:806
+#: sequencer.c:842
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "Ja s'ha donat «GIT_AUTHOR_EMAIL»"
 
-#: sequencer.c:811
+#: sequencer.c:847
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "Ja s'ha donat «GIT_AUTHOR_DATE»"
 
-#: sequencer.c:815
+#: sequencer.c:851
 #, c-format
 msgid "unknown variable '%s'"
-msgstr "variable  «%s» desconeguda"
+msgstr "variable «%s» desconeguda"
 
-#: sequencer.c:820
+#: sequencer.c:856
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "falta «GIT_AUTHOR_NAME»"
 
-#: sequencer.c:822
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "falta «GIT_AUTHOR_EMAIL»"
 
-#: sequencer.c:824
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "falta «GIT_AUTHOR_DATE»"
 
-#: sequencer.c:884
-#, fuzzy, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr "format de data no vàlid: %s"
-
-#: sequencer.c:901
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5884,16 +7712,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:995
-#, fuzzy
-msgid "writing root commit"
-msgstr "no hi ha res a cometre\n"
-
-#: sequencer.c:1216
+#: sequencer.c:1212
 msgid "'prepare-commit-msg' hook failed"
 msgstr "el lligam «prepare-commit-msg» ha fallat"
 
-#: sequencer.c:1223
+#: 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"
@@ -5920,7 +7743,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1236
+#: 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"
@@ -5938,363 +7761,370 @@ msgstr ""
 "Comproveu que siguin correctes. Podeu suprimir aquest\n"
 "missatge establint-los explícitament:\n"
 "\n"
-"    git config --global user.name \"El Vostre Nom\"\n"
-"    git config --global user.email tu@example.com\n"
+"    git config --global user.name \"El vostre nom\"\n"
+"    git config --global user.email usuari@example.com\n"
 "\n"
 "Després de fer això, podeu arreglar la identitat usada per a aquesta\n"
 "comissió amb:\n"
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1278
+#: sequencer.c:1273
 msgid "couldn't look up newly created commit"
 msgstr "no s'ha pogut trobar la comissió novament creada"
 
-#: sequencer.c:1280
+#: sequencer.c:1275
 msgid "could not parse newly created commit"
 msgstr "no s'ha pogut analitzar la comissió novament creada"
 
-#: sequencer.c:1326
+#: sequencer.c:1321
 msgid "unable to resolve HEAD after creating commit"
 msgstr "no s'ha pogut resoldre HEAD després de crear la comissió"
 
-#: sequencer.c:1328
+#: sequencer.c:1323
 msgid "detached HEAD"
 msgstr "HEAD separat"
 
-#: sequencer.c:1332
+#: sequencer.c:1327
 msgid " (root-commit)"
-msgstr " (comissió d'arrel)"
+msgstr " (comissió arrel)"
 
-#: sequencer.c:1353
+#: sequencer.c:1348
 msgid "could not parse HEAD"
 msgstr "no s'ha pogut analitzar HEAD"
 
-#: sequencer.c:1355
+#: sequencer.c:1350
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s no és una comissió!"
 
-#: sequencer.c:1359 builtin/commit.c:1571
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1692
 msgid "could not parse HEAD commit"
 msgstr "no s'ha pogut analitzar la comissió HEAD"
 
-#: sequencer.c:1411 sequencer.c:2004
+#: sequencer.c:1410 sequencer.c:2295
 msgid "unable to parse commit author"
 msgstr "no s'ha pogut analitzar l'autor de la comissió"
 
-#: sequencer.c:1421 builtin/am.c:1573 builtin/merge.c:684
+#: sequencer.c:1421 builtin/am.c:1614 builtin/merge.c:706
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree ha fallat en escriure un arbre"
 
-#: sequencer.c:1438 sequencer.c:1499
+#: sequencer.c:1454 sequencer.c:1574
 #, 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:1465 builtin/am.c:1595 builtin/commit.c:1670 builtin/merge.c:878
-#: builtin/merge.c:903
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identitat d'autor no vàlida: «%s»"
+
+#: sequencer.c:1491
+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
 msgid "failed to write commit object"
 msgstr "s'ha produït un error en escriure l'objecte de comissió"
 
-#: sequencer.c:1526
+#: sequencer.c:1557 sequencer.c:4493 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "no s'ha pogut actualitzar %s"
+
+#: sequencer.c:1606
 #, c-format
 msgid "could not parse commit %s"
 msgstr "no s'ha pogut analitzar la comissió %s"
 
-#: sequencer.c:1531
+#: sequencer.c:1611
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "no s'ha pogut analitzar la comissió pare %s"
 
-#: sequencer.c:1605 sequencer.c:1715
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
 msgid "unknown command: %d"
 msgstr "ordre desconeguda: %d"
 
-#: sequencer.c:1662 sequencer.c:1687
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "Aquest és el 1r missatge de comissió:"
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Aquest és el missatge de comissió #%d:"
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "El primer missatge de comissió s'ometrà:"
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "El missatge de comissió núm. #%d s'ometrà:"
+
+#: sequencer.c:1740
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Això és una combinació de %d comissions."
 
-#: sequencer.c:1672
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "no es pot escriure «%s»"
+
+#: sequencer.c:1934
 msgid "need a HEAD to fixup"
 msgstr "cal un HEAD per reparar-ho"
 
-#: sequencer.c:1674 sequencer.c:3219
+#: sequencer.c:1936 sequencer.c:3581
 msgid "could not read HEAD"
 msgstr "no s'ha pogut llegir HEAD"
 
-#: sequencer.c:1676
+#: sequencer.c:1938
 msgid "could not read HEAD's commit message"
 msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
 
-#: sequencer.c:1682
-#, c-format
-msgid "cannot write '%s'"
-msgstr "no es pot escriure «%s»"
-
-#: sequencer.c:1689 git-rebase--preserve-merges.sh:496
-msgid "This is the 1st commit message:"
-msgstr "Aquest és el 1r missatge de comissió:"
-
-#: sequencer.c:1697
+#: sequencer.c:1962
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no s'ha pogut llegir el missatge de comissió: %s"
 
-#: sequencer.c:1704
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Aquest és el missatge de comissió #%d:"
-
-#: sequencer.c:1710
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "El missatge de comissió núm. #%d s'ometrà:"
-
-#: sequencer.c:1798
+#: sequencer.c:2072
 msgid "your index file is unmerged."
 msgstr "el vostre fitxer d'índex està sense fusionar."
 
-#: sequencer.c:1805
-#, fuzzy
+#: sequencer.c:2079
 msgid "cannot fixup root commit"
-msgstr "no es pot trobar la comissió %s (%s)"
+msgstr "no es pot arreglar la comissió arrel"
 
-#: sequencer.c:1824
+#: sequencer.c:2098
 #, 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:1832 sequencer.c:1840
+#: sequencer.c:2106 sequencer.c:2114
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "la comissió %s no té pare %d"
 
-#: sequencer.c:1846
+#: sequencer.c:2120
 #, 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:1865
+#: sequencer.c:2139
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no es pot analitzar la comissió pare %s"
 
-#: sequencer.c:1930
+#: sequencer.c:2205
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
 
-#: sequencer.c:1985
+#: sequencer.c:2265
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no s'ha pogut revertir %s... %s"
 
-#: sequencer.c:1986
+#: sequencer.c:2266
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no s'ha pogut aplicar %s... %s"
 
-#: sequencer.c:2045
+#: sequencer.c:2287
+#, fuzzy, 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"
+
+#: sequencer.c:2345
 #, 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:2052
+#: sequencer.c:2352
 #, 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:2128
+#: sequencer.c:2425
 #, c-format
 msgid "%s does not accept arguments: '%s'"
-msgstr "%s no accepta paràmetres: «%s»"
+msgstr "%s no accepta arguments: «%s»"
 
-#: sequencer.c:2137
+#: sequencer.c:2434
 #, c-format
 msgid "missing arguments for %s"
-msgstr "falten els arguments per %s"
+msgstr "falten els arguments per a %s"
 
-#: sequencer.c:2174
-#, fuzzy, c-format
-msgid "could not parse '%.*s'"
+#: sequencer.c:2477
+#, c-format
+msgid "could not parse '%s'"
 msgstr "no s'ha pogut analitzar «%s»"
 
-#: sequencer.c:2228
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línia no vàlida %d: %.*s"
 
-#: sequencer.c:2239
+#: sequencer.c:2549
 #, c-format
 msgid "cannot '%s' without a previous commit"
-msgstr "No es pot «%s» sense una comissió prèvia"
-
-#: sequencer.c:2287 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "no s'ha pogut llegir «%s»."
+msgstr "no es pot «%s» sense una comissió prèvia"
 
-#: sequencer.c:2323
-#, fuzzy
+#: sequencer.c:2635
 msgid "cancelling a cherry picking in progress"
-msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+msgstr "s'està cancel·lant un «cherry pick» en curs"
 
-#: sequencer.c:2330
-#, fuzzy
+#: sequencer.c:2644
 msgid "cancelling a revert in progress"
-msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+msgstr "s'està cancel·lant la reversió en curs"
 
-#: sequencer.c:2364
+#: sequencer.c:2690
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "corregiu-ho usant «git rebase --edit-todo»."
 
-#: sequencer.c:2366
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "full d'instruccions inusable: «%s»"
 
-#: sequencer.c:2371
+#: sequencer.c:2697
 msgid "no commits parsed."
 msgstr "no s'ha analitzat cap comissió."
 
-#: sequencer.c:2382
+#: sequencer.c:2708
 msgid "cannot cherry-pick during a revert."
 msgstr "no es pot fer «cherry pick» durant una reversió."
 
-#: sequencer.c:2384
+#: sequencer.c:2710
 msgid "cannot revert during a cherry-pick."
 msgstr "no es pot revertir durant un «cherry pick»."
 
-#: sequencer.c:2466
+#: sequencer.c:2788
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor no vàlid per a %s: %s"
 
-#: sequencer.c:2553
+#: sequencer.c:2897
 msgid "unusable squash-onto"
-msgstr ""
+msgstr "«squash-onto» no usable"
 
-#: sequencer.c:2569
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "full d'opcions mal format: «%s»"
 
-#: sequencer.c:2652 sequencer.c:4351
+#: sequencer.c:3012 sequencer.c:4869
 msgid "empty commit set passed"
 msgstr "conjunt de comissions buit passat"
 
-#: sequencer.c:2668
-#, fuzzy
+#: sequencer.c:3029
 msgid "revert is already in progress"
-msgstr "un «cherry pick» o una reversió ja està en curs"
+msgstr "una reversió ja està en curs"
 
-#: sequencer.c:2670
-#, fuzzy, c-format
+#: sequencer.c:3031
+#, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "intenteu «git revert (--continue | %s--abort | --quit)»"
 
-#: sequencer.c:2673
-#, fuzzy
+#: sequencer.c:3034
 msgid "cherry-pick is already in progress"
-msgstr "un «cherry pick» o una reversió ja està en curs"
+msgstr "un «cherry pick» ja està en curs"
 
-#: sequencer.c:2675
-#, fuzzy, c-format
+#: sequencer.c:3036
+#, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "intenteu «git cherry-pick (--continue | %s--abort | --quit)»"
 
-#: sequencer.c:2689
+#: sequencer.c:3050
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
 
-#: sequencer.c:2704
+#: sequencer.c:3065
 msgid "could not lock HEAD"
 msgstr "no s'ha pogut bloquejar HEAD"
 
-#: sequencer.c:2764 sequencer.c:4103
+#: sequencer.c:3125 sequencer.c:4582
 msgid "no cherry-pick or revert in progress"
 msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
 
-#: sequencer.c:2766 sequencer.c:2777
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
 msgstr "no es pot resoldre HEAD"
 
-#: sequencer.c:2768 sequencer.c:2812
+#: sequencer.c:3129 sequencer.c:3173
 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:2798 builtin/grep.c:734
+#: sequencer.c:3159 builtin/grep.c:759
 #, c-format
 msgid "cannot open '%s'"
 msgstr "no es pot obrir «%s»"
 
-#: sequencer.c:2800
+#: sequencer.c:3161
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no es pot llegir «%s»: %s"
 
-#: sequencer.c:2801
+#: sequencer.c:3162
 msgid "unexpected end of file"
 msgstr "final de fitxer inesperat"
 
-#: sequencer.c:2807
+#: sequencer.c:3168
 #, 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:2818
+#: sequencer.c:3179
 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:2859
-#, fuzzy
+#: sequencer.c:3220
 msgid "no revert in progress"
-msgstr "No hi ha un «rebase» en curs?"
+msgstr "no hi ha cap reversió en curs"
 
-#: sequencer.c:2867
-#, fuzzy
+#: sequencer.c:3229
 msgid "no cherry-pick in progress"
-msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+msgstr "ni hi ha cap «cherry pick» en curs"
 
-#: sequencer.c:2877
-#, fuzzy
+#: sequencer.c:3239
 msgid "failed to skip the commit"
-msgstr "s'ha produït un error en escriure l'objecte de comissió"
+msgstr "s'ha produït un error en ometre la comissió"
 
-#: sequencer.c:2884
+#: sequencer.c:3246
 msgid "there is nothing to skip"
-msgstr ""
+msgstr "no hi ha res a ometre"
 
-#: sequencer.c:2887
+#: sequencer.c:3249
 #, c-format
 msgid ""
 "have you committed already?\n"
 "try \"git %s --continue\""
 msgstr ""
+"heu fet ja una comissió?\n"
+"proveu «git %s --continue»"
 
-#: sequencer.c:3011 sequencer.c:4015
-#, c-format
-msgid "could not update %s"
-msgstr "no s'ha pogut actualitzar %s"
-
-#: sequencer.c:3049 sequencer.c:3995
+#: sequencer.c:3411 sequencer.c:4473
 msgid "cannot read HEAD"
-msgstr "No es pot llegir HEAD"
+msgstr "no es pot llegir HEAD"
 
-#: sequencer.c:3066
+#: sequencer.c:3428
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "no s'ha pogut copiar «%s» a «%s»"
 
-#: sequencer.c:3074
-#, fuzzy, c-format
+#: sequencer.c:3436
+#, c-format
 msgid ""
 "You can amend the commit now, with\n"
 "\n"
@@ -6306,33 +8136,33 @@ msgid ""
 msgstr ""
 "Podeu esmenar la comissió ara, amb\n"
 "\n"
-"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"  git commit --amend %s\n"
 "\n"
 "Una vegada que estigueu satisfet amb els vostres canvis, executeu\n"
 "\n"
-"\tgit rebase --continue"
+"  git rebase --continue\n"
 
-#: sequencer.c:3084
+#: sequencer.c:3446
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "No s'ha pogut aplicar %s... %.*s"
 
-#: sequencer.c:3091
+#: sequencer.c:3453
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "No s'ha pogut fusionar %.*s"
 
-#: sequencer.c:3105 sequencer.c:3109 builtin/difftool.c:633
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no s'ha pogut copiar «%s» a «%s»"
 
-#: sequencer.c:3131 sequencer.c:3558 builtin/rebase.c:849 builtin/rebase.c:1582
-#: builtin/rebase.c:1953 builtin/rebase.c:2008
-msgid "could not read index"
-msgstr "no s'ha pogut llegir l'índex"
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr "S'està executant: %s\n"
 
-#: sequencer.c:3136
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6347,11 +8177,11 @@ msgstr ""
 " git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3142
+#: sequencer.c:3504
 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:3148
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6367,114 +8197,126 @@ msgstr ""
 "\n"
 " git rebase --continue\n"
 
-#: sequencer.c:3209
+#: sequencer.c:3571
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nom d'etiqueta no permès: «%.*s»"
 
-#: sequencer.c:3263
-#, fuzzy
+#: sequencer.c:3625
 msgid "writing fake root commit"
-msgstr "no hi ha res a cometre\n"
+msgstr "s'està escrivint una comissió arrel falsa"
 
-#: sequencer.c:3268
+#: sequencer.c:3630
 msgid "writing squash-onto"
-msgstr ""
+msgstr "s'està escrivint «squash-onto»"
 
-#: sequencer.c:3306 builtin/rebase.c:854 builtin/rebase.c:860
-#, fuzzy, c-format
-msgid "failed to find tree of %s"
-msgstr "S'ha produït un error en cercar l'arbre de %s."
-
-#: sequencer.c:3324 builtin/rebase.c:873
-msgid "could not write index"
-msgstr "no s'ha pogut escriure l'índex"
-
-#: sequencer.c:3351
+#: sequencer.c:3714
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "no s'ha pogut resoldre «%s»"
 
-#: sequencer.c:3379
-#, fuzzy
+#: sequencer.c:3747
 msgid "cannot merge without a current revision"
-msgstr "No es pot «%s» sense una comissió prèvia"
+msgstr "no es pot fusionar sense una revisió actual"
 
-#: sequencer.c:3401
+#: sequencer.c:3769
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "no s'ha pogut analitzar «%.*s»"
 
-#: sequencer.c:3410
+#: sequencer.c:3778
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "no hi ha res per fusionar «%.*s»"
 
-#: sequencer.c:3422
+#: sequencer.c:3790
+#, fuzzy
 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]"
 
-#: sequencer.c:3437
-#, fuzzy, c-format
+#: sequencer.c:3806
+#, c-format
 msgid "could not get commit message of '%s'"
-msgstr "no s'ha pogut llegir el missatge de comissió: %s"
+msgstr "no s'ha pogut llegir el missatge de comissió de «%s»"
 
-#: sequencer.c:3590
+#: sequencer.c:3989
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "no s'ha pogut fusionar «%.*s»"
 
-#: sequencer.c:3606
-#, fuzzy
+#: sequencer.c:4005
 msgid "merge: Unable to write new index file"
-msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
+msgstr "fusió: no s'ha pogut escriure un fitxer d'índex nou"
+
+#: sequencer.c:4079
+msgid "Cannot autostash"
+msgstr "no es pot fer un «stash» automàticament"
+
+#: sequencer.c:4082
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Resposta de «stash» inesperada: «%s»"
+
+#: sequencer.c:4088
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "No s'ha pogut crear el directori per a «%s»"
 
-#: sequencer.c:3675 builtin/rebase.c:711
+#: sequencer.c:4091
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "S'ha creat un «stash» automàticament: %s\n"
+
+#: sequencer.c:4095
+msgid "could not reset --hard"
+msgstr "no s'ha pogut fer reset --hard"
+
+#: sequencer.c:4120
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "S'ha aplicat el «stash» automàticament.\n"
 
-#: sequencer.c:3687
+#: sequencer.c:4132
 #, c-format
 msgid "cannot store %s"
 msgstr "no es pot emmagatzemar %s"
 
-#: sequencer.c:3690 builtin/rebase.c:727 git-rebase--preserve-merges.sh:113
+#: sequencer.c:4135
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
-"L'aplicació del «stash» automàtic ha resultat en conflictes.\n"
+"%s\n"
 "Els vostres canvis estan segurs en el «stash».\n"
-"Podeu executar \"git stash pop\" o \"git stash drop\" en qualsevol moment.\n"
+"Podeu executar «git stash pop» o «git stash drop» en qualsevol moment.\n"
 
-#: sequencer.c:3751
-#, fuzzy, c-format
-msgid "could not checkout %s"
-msgstr "no es pot agafar %s"
+#: sequencer.c:4140
+msgid "Applying autostash resulted in conflicts."
+msgstr "L'aplicació del «stash» automàticament ha donat conflictes."
 
-#: sequencer.c:3765
-#, fuzzy, c-format
-msgid "%s: not a valid OID"
-msgstr "«%s» no és un terme vàlid"
+#: sequencer.c:4141
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+"El «stash» automàtic ja existeix; s'està creant una entrada «stash» nova."
 
-#: sequencer.c:3770 git-rebase--preserve-merges.sh:779
+#: sequencer.c:4234 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
 msgstr "no s'ha pogut separar HEAD"
 
-#: sequencer.c:3785
-#, fuzzy, c-format
+#: sequencer.c:4249
+#, c-format
 msgid "Stopped at HEAD\n"
-msgstr "Aturat a %s...  %.*s\n"
+msgstr "Aturat a HEAD\n"
 
-#: sequencer.c:3787
-#, fuzzy, c-format
+#: sequencer.c:4251
+#, c-format
 msgid "Stopped at %s\n"
-msgstr "Aturat a %s...  %.*s\n"
+msgstr "Aturat a %s\n"
 
-#: sequencer.c:3795
+#: sequencer.c:4259
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6486,49 +8328,67 @@ msgid ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 msgstr ""
+"No s'ha pogut executar l'ordre «todo»\n"
+"\n"
+"    %.*s\n"
+"S'ha reprogramat; per editar l'ordre abans de continuar, editeu primer\n"
+"la llista de tasques pendents:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#: sequencer.c:4305
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "S'està fent «rebase» (%d/%d)%s"
 
-#: sequencer.c:3877
+#: sequencer.c:4351
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Aturat a %s...  %.*s\n"
 
-#: sequencer.c:3958
+#: sequencer.c:4422
 #, c-format
 msgid "unknown command %d"
 msgstr "ordre %d desconeguda"
 
-#: sequencer.c:4003
+#: sequencer.c:4481
 msgid "could not read orig-head"
-msgstr "No s'ha pogut llegir orig-head"
+msgstr "no s'ha pogut llegir orig-head"
 
-#: sequencer.c:4008
+#: sequencer.c:4486
 msgid "could not read 'onto'"
-msgstr "no s'ha pogut llegir 'onto'"
+msgstr "no s'ha pogut llegir «onto»"
 
-#: sequencer.c:4022
+#: sequencer.c:4500
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "no s'ha pogut actualitzar HEAD a %s"
 
-#: sequencer.c:4115
+#: sequencer.c:4560
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "S'ha fet «rebase» i actualitzat %s amb èxit.\n"
+
+#: sequencer.c:4612
 msgid "cannot rebase: You have unstaged changes."
 msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
 
-#: sequencer.c:4124
+#: sequencer.c:4621
 msgid "cannot amend non-existing commit"
 msgstr "no es pot esmenar una comissió no existent"
 
-#: sequencer.c:4126
+#: sequencer.c:4623
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fitxer no vàlid: «%s»"
 
-#: sequencer.c:4128
+#: sequencer.c:4625
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contingut no vàlid: «%s»"
 
-#: sequencer.c:4131
+#: sequencer.c:4628
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6536,70 +8396,61 @@ msgid ""
 msgstr ""
 "\n"
 "Teniu canvis no comesos en el vostre arbre de treball. \n"
-"Primer cometeu-los i després executeu 'git rebase --continue' de nou."
+"Cometeu-los primer i després executeu «git rebase --continue» de nou."
 
-#: sequencer.c:4167 sequencer.c:4205
-#, fuzzy, c-format
+#: sequencer.c:4664 sequencer.c:4703
+#, c-format
 msgid "could not write file: '%s'"
-msgstr "no s'ha pogut crear el fitxer «%s»"
+msgstr "no s'ha pogut escriure el fitxer: «%s»"
 
-#: sequencer.c:4220
+#: sequencer.c:4719
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
 
-#: sequencer.c:4227
+#: sequencer.c:4726
 msgid "could not commit staged changes."
-msgstr "No s'han pogut cometre els canvis «staged»."
+msgstr "no s'han pogut cometre els canvis «staged»."
 
-#: sequencer.c:4328
+#: sequencer.c:4846
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no es pot fer «cherry pick» a %s"
 
-#: sequencer.c:4332
+#: sequencer.c:4850
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisió incorrecta"
 
-#: sequencer.c:4367
+#: sequencer.c:4885
 msgid "can't revert as initial commit"
 msgstr "no es pot revertir com a comissió inicial"
 
-#: sequencer.c:4810
+#: sequencer.c:5362
 msgid "make_script: unhandled options"
 msgstr "make_script: opcions no gestionades"
 
-#: sequencer.c:4813
+#: sequencer.c:5365
 msgid "make_script: error preparing revisions"
 msgstr "make_script: s'ha produït un error en preparar les revisions"
 
-#: sequencer.c:4971
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --"
-"continue'.\n"
-
-#: sequencer.c:5083 sequencer.c:5100
+#: sequencer.c:5615 sequencer.c:5632
 msgid "nothing to do"
 msgstr "res a fer"
 
-#: sequencer.c:5114
+#: sequencer.c:5651
 msgid "could not skip unnecessary pick commands"
 msgstr "no s'han pogut ometre les ordres «picks» no necessàries"
 
-#: sequencer.c:5197
+#: sequencer.c:5751
 msgid "the script was already rearranged."
 msgstr "l'script ja estava endreçat."
 
-#: setup.c:123
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "«%s» és fora del dipòsit"
+msgid "'%s' is outside repository at '%s'"
+msgstr "«%s» està fora del repositori a «%s»"
 
-#: setup.c:173
+#: setup.c:185
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6609,132 +8460,136 @@ msgstr ""
 "Useu «git <ordre> -- <camí>...» per a especificar camins que no existeixin "
 "localment."
 
-#: setup.c:186
+#: setup.c:198
 #, 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 ""
-"paràmetre ambigu «%s»: revisió no coneguda o el camí no és en l'arbre de "
+"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>...]'"
+"«git <ordre> [<revisió>...] -- [<fitxer>...]»"
 
-#: setup.c:235
+#: setup.c:264
 #, c-format
 msgid "option '%s' must come before non-option arguments"
-msgstr "l'opció «%s» ha de venir abans dels arguments opcionals"
+msgstr "l'opció «%s» ha d'aparèixer abans que els arguments opcionals"
 
-#: setup.c:254
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
 "Use '--' to separate paths from revisions, like this:\n"
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
-"paràmetre ambigu «%s»: ambdós una revisió i un nom de fitxer\n"
-"Useu '--' per a separar els camins de les revisions:\n"
-"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
+"argument ambigu «%s»: ambdós una revisió i un nom de fitxer\n"
+"Useu «--» per a separar els camins de les revisions:\n"
+"«git <ordre> [<revisió>...] -- [<fitxer>...]»"
 
-#: setup.c:390
+#: setup.c:419
 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:394
+#: setup.c:423
 msgid "this operation must be run in a work tree"
 msgstr "aquesta operació s'ha d'executar en un arbre de treball"
 
-#: setup.c:540
+#: setup.c:661
 #, 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:548
+#: setup.c:669
 msgid "unknown repository extensions found:"
-msgstr "s'han trobat extensions de dipòsit desconegudes:"
+msgstr "s'han trobat extensions de repositori desconegudes:"
 
-#: setup.c:567
+#: setup.c:681
+msgid "repo version is 0, but v1-only extensions found:"
+msgstr "el repositori és versió 0, però només s'han trobat extensions v1:"
+
+#: setup.c:700
 #, c-format
 msgid "error opening '%s'"
 msgstr "s'ha produït un error en obrir «%s»"
 
-#: setup.c:569
+#: setup.c:702
 #, c-format
 msgid "too large to be a .git file: '%s'"
-msgstr "massa larg per a ser un fitxer .git: «%s»"
+msgstr "massa gran per a ser un fitxer .git: «%s»"
 
-#: setup.c:571
+#: setup.c:704
 #, c-format
 msgid "error reading %s"
 msgstr "error en llegir %s"
 
-#: setup.c:573
+#: setup.c:706
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "format gitfile no vàlid: %s"
 
-#: setup.c:575
+#: setup.c:708
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "sense camí al gitfile: %s"
 
-#: setup.c:577
+#: setup.c:710
 #, 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:676
+#: setup.c:812
 #, c-format
 msgid "'$%s' too big"
 msgstr "«$%s» massa gran"
 
-#: setup.c:690
+#: setup.c:826
 #, 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:719 setup.c:721 setup.c:752
+#: setup.c:855 setup.c:857 setup.c:888
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "no es pot canviar de directori a «%s»"
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
 msgid "cannot come back to cwd"
 msgstr "no es pot tornar al directori de treball actual"
 
-#: setup.c:851
+#: setup.c:987
 #, 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:1083
+#: setup.c:1225
 msgid "Unable to read current working directory"
 msgstr "No s'ha pogut llegir el directori de treball actual"
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1234 setup.c:1240
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no es pot canviar a «%s»"
 
-#: setup.c:1103
+#: setup.c:1245
 #, 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:1109
+#: setup.c:1251
 #, 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 un dipòsit de git (ni cap pare fins al punt de muntatge %s)\n"
+"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:1220
+#: setup.c:1370
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6745,368 +8600,119 @@ msgstr ""
 "El propietari dels fitxers sempre ha de tenir permisos de lectura i "
 "escriptura."
 
-#: setup.c:1264
+#: setup.c:1417
 msgid "open /dev/null or dup failed"
 msgstr "s'ha produït un error en obrir /dev/null o dup"
 
-#: setup.c:1279
+#: setup.c:1432
 msgid "fork failed"
 msgstr "el «fork» ha fallat"
 
-#: setup.c:1284
+#: setup.c:1437 t/helper/test-simple-ipc.c:285
 msgid "setsid failed"
-msgstr "l'«stash» ha fallat"
-
-#: sha1-file.c:453
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr ""
-
-#: sha1-file.c:504
-#, fuzzy, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "no s'ha pogut analitzar l'objecte: %s"
-
-#: sha1-file.c:576
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-
-#: sha1-file.c:583
-#, fuzzy, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "no s'ha pogut analitzar l'objecte: %s"
-
-#: sha1-file.c:626
-#, fuzzy
-msgid "unable to fdopen alternates lockfile"
-msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
-
-#: sha1-file.c:644
-#, fuzzy
-msgid "unable to read alternates file"
-msgstr "no es pot llegir el fitxer d'índex"
-
-#: sha1-file.c:651
-#, fuzzy
-msgid "unable to move new alternates file into place"
-msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-
-#: sha1-file.c:686
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "el camí «%s» no existeix"
-
-#: sha1-file.c:712
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat."
-
-#: sha1-file.c:718
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "el dipòsit de referència «%s» no és un dipòsit local."
-
-#: sha1-file.c:724
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "el dipòsit de referència «%s» és superficial"
-
-#: sha1-file.c:732
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "el dipòsit de referència «%s» és empeltat"
-
-#: sha1-file.c:792
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-
-#: sha1-file.c:968
-msgid "mmap failed"
-msgstr "mmap ha fallat"
-
-#: sha1-file.c:1132
-#, c-format
-msgid "object file %s is empty"
-msgstr "el tipus d'objecte %s és buit"
-
-#: sha1-file.c:1256 sha1-file.c:2395
-#, fuzzy, c-format
-msgid "corrupt loose object '%s'"
-msgstr "no s'ha pogut analitzar l'objecte «%s»"
-
-#: sha1-file.c:1258 sha1-file.c:2399
-#, fuzzy, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "no s'ha pogut analitzar l'objecte: %s"
-
-#: sha1-file.c:1300
-#, fuzzy
-msgid "invalid object type"
-msgstr "el tipus d'objecte és incorrecte."
-
-#: sha1-file.c:1384
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-
-#: sha1-file.c:1387
-#, fuzzy, c-format
-msgid "unable to unpack %s header"
-msgstr "no s'ha pogut actualitzar %s"
-
-#: sha1-file.c:1393
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-
-#: sha1-file.c:1396
-#, fuzzy, c-format
-msgid "unable to parse %s header"
-msgstr "no s'ha pogut actualitzar %s"
-
-#: sha1-file.c:1587
-#, fuzzy, c-format
-msgid "failed to read object %s"
-msgstr "s'ha produït un error en llegir l'objecte «%s»."
-
-#: sha1-file.c:1591
-#, fuzzy, c-format
-msgid "replacement %s not found for %s"
-msgstr "no s'han trobat les plantilles %s"
-
-#: sha1-file.c:1595
-#, fuzzy, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "l'objecte local %s és malmès"
-
-#: sha1-file.c:1599
-#, fuzzy, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "l'objecte local %s és malmès"
-
-#: sha1-file.c:1702
-#, fuzzy, c-format
-msgid "unable to write file %s"
-msgstr "no s'ha pogut escriure %s"
-
-#: sha1-file.c:1709
-#, fuzzy, c-format
-msgid "unable to set permission to '%s'"
-msgstr "no s'ha pogut resoldre la revisió: %s"
+msgstr "«setsid» ha fallat"
 
-#: sha1-file.c:1716
-#, fuzzy
-msgid "file write error"
-msgstr "escriptura fallada al rev-list"
-
-#: sha1-file.c:1735
-#, fuzzy
-msgid "error when closing loose object file"
-msgstr "error en tancar el fitxer de paquet"
-
-#: sha1-file.c:1800
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
+#: sparse-index.c:151
+msgid "attempting to use sparse-index without cone mode"
 msgstr ""
 
-#: sha1-file.c:1802
-#, fuzzy
-msgid "unable to create temporary file"
-msgstr "no s'ha pogut crear un índex temporal"
-
-#: sha1-file.c:1826
+#: sparse-index.c:156
 #, fuzzy
-msgid "unable to write loose object file"
-msgstr "no s'ha pogut escriure l'objecte de nota"
-
-#: sha1-file.c:1832
-#, fuzzy, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-
-#: sha1-file.c:1836
-#, fuzzy, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "ha fallat fstat a %s"
-
-#: sha1-file.c:1840
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr ""
-
-#: sha1-file.c:1850 builtin/pack-objects.c:920
-#, fuzzy, c-format
-msgid "failed utime() on %s"
-msgstr "s'ha produït un error en obrir «%s»"
-
-#: sha1-file.c:1925
-#, fuzzy, c-format
-msgid "cannot read object for %s"
-msgstr "no es pot llegir l'objecte %s"
-
-#: sha1-file.c:1965
-#, fuzzy
-msgid "corrupt commit"
-msgstr "autor corregit de la comissió"
-
-#: sha1-file.c:1973
-#, fuzzy
-msgid "corrupt tag"
-msgstr "informa de les etiquetes"
-
-#: sha1-file.c:2072
-#, fuzzy, c-format
-msgid "read error while indexing %s"
-msgstr "error en llegir %s"
-
-#: sha1-file.c:2075
-#, fuzzy, c-format
-msgid "short read while indexing %s"
-msgstr "no es pot llegir l'índex"
-
-#: sha1-file.c:2148 sha1-file.c:2157
-#, fuzzy, c-format
-msgid "%s: failed to insert into database"
-msgstr "gpg ha fallat en signar les dades"
-
-#: sha1-file.c:2163
-#, fuzzy, c-format
-msgid "%s: unsupported file type"
-msgstr "versió d'índex no compatible %s"
-
-#: sha1-file.c:2187
-#, fuzzy, c-format
-msgid "%s is not a valid object"
-msgstr "«%s» no és una terme vàlid"
-
-#: sha1-file.c:2189
-#, fuzzy, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s no és un objecte de «%s» vàlid"
-
-#: sha1-file.c:2216 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "no s'ha pogut obrir %s"
-
-#: sha1-file.c:2406 sha1-file.c:2458
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr ""
-
-#: sha1-file.c:2430
-#, fuzzy, c-format
-msgid "unable to mmap %s"
-msgstr "no s'ha pogut obrir %s"
-
-#: sha1-file.c:2435
-#, fuzzy, c-format
-msgid "unable to unpack header of %s"
-msgstr "no s'ha pogut actualitzar %s"
-
-#: sha1-file.c:2441
-#, fuzzy, c-format
-msgid "unable to parse header of %s"
-msgstr "no s'ha pogut llegir %s"
-
-#: sha1-file.c:2452
-#, fuzzy, c-format
-msgid "unable to unpack contents of %s"
-msgstr "no s'ha pogut analitzar el contacte: %s"
+msgid "unable to update cache-tree, staying full"
+msgstr "no s'ha pogut actualitzar l'arbre cau"
 
-#: sha1-name.c:490
+#: sparse-index.c:239
 #, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "l'SHA1 %s curt és ambigu"
-
-#: sha1-name.c:501
-msgid "The candidates are:"
-msgstr "Els candidats són:"
-
-#: sha1-name.c:800
-#, 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\""
+msgid "index entry is a directory, but not sparse (%08x)"
 msgstr ""
-"Git normalment mai crea una referència que acabi amb 40 caràcters\n"
-"hexadecimals perquè s'ignorarà quan només especifiqueu 40 caràcters\n"
-"hexadecimals. Aquestes referències es poden crear per error. Per\n"
-"exemple,\n"
-"\n"
-"  git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"on «$br» és d'alguna manera buida i una referència de 40 caràcters\n"
-"hexadecimals. Examineu aquestes referències i potser\n"
-"suprimiu-les. Desactiveu aquest missatge executant\n"
-"«git config advice.objectNameWarning false»"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:821
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB"
-msgstr ""
+msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:823
+#: strbuf.c:852
 #, c-format
 msgid "%u.%2.2u GiB/s"
-msgstr ""
+msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:831
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB"
-msgstr ""
+msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:833
+#: strbuf.c:862
 #, c-format
 msgid "%u.%2.2u MiB/s"
-msgstr ""
+msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:840
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB"
-msgstr ""
+msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:842
+#: strbuf.c:871
 #, c-format
 msgid "%u.%2.2u KiB/s"
-msgstr ""
+msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:848
-#, fuzzy, c-format
+#: strbuf.c:877
+#, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:850
-#, fuzzy, c-format
+#: strbuf.c:879
+#, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
-msgstr[0] "octets"
-msgstr[1] "octets"
+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
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no s'ha pogut obrir «%s» per a escriptura"
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr "no s'ha pogut editar «%s»"
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "s'està ignorant el nom de submòdul sospitós %s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "no es permeten els valors negatius a submodule.fetchjobs"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"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
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
 
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
@@ -7128,61 +8734,137 @@ 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:327
+#: submodule.c:328
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "al submòdul sense popular «%s»"
 
-#: submodule.c:358
+#: submodule.c:359
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "L'especificació «%s» és en el submòdul «%.*s»"
 
-#: submodule.c:910
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "argument incorrecte --ignore-submodules: %s"
+
+#: submodule.c:818
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"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
 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:1006
+#, 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"
+
+#: submodule.c:1129
+#, 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
 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:1481
-#, fuzzy, c-format
-msgid "Could not access submodule '%s'"
-msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
+#: submodule.c:1169
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "S'està pujant el submòdul «%s»\n"
 
-#: submodule.c:1651
+#: submodule.c:1172
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "No s'ha pogut pujar el submòdul «%s»\n"
+
+#: submodule.c:1464
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "S'està obtenint el submòdul %s%s\n"
+
+#: submodule.c:1498
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "No s'ha pogut accedir al submòdul «%s»\n"
+
+#: submodule.c:1653
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Errors durant l'obtenció de submòduls:\n"
+"%s"
+
+#: submodule.c:1678
 #, 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:1789
+#: submodule.c:1695
+#, 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
+#, 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
 #, 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:1802
+#: submodule.c:1824
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
-msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
+msgstr "no s'ha pogut executar «git status» al submòdul «%s»"
 
-#: submodule.c:1817
-#, fuzzy, c-format
+#: submodule.c:1839
+#, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
-msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
+msgstr "No s'ha pogut desassignar el paràmetre «core.worktree» al submòdul «%s»"
 
-#: submodule.c:1907
+#: submodule.c:1866 submodule.c:2176
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "s'ha produït un error en cercar recursivament al camí del submòdul «%s»"
+
+#: submodule.c:1887
+msgid "could not reset submodule index"
+msgstr "no s'ha pogut restablir l'índex del submòdul"
+
+#: submodule.c:1929
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "el submòdul «%s» té l'índex brut"
 
-#: submodule.c:1959
-#, fuzzy, c-format
+#: submodule.c:1981
+#, c-format
 msgid "Submodule '%s' could not be updated."
-msgstr "Submòduls canviats però no actualitzats:"
+msgstr "No s'ha pogut actualitzar el submòdul «%s»."
+
+#: submodule.c:2049
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "submodule git dir «%s» està dins git dir «%.*s»"
 
-#: submodule.c:2007
+#: submodule.c:2070
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7190,12 +8872,17 @@ msgstr ""
 "no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
 "treball"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2082 submodule.c:2141
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no s'ha trobat el nom pel submòdul «%s»"
 
-#: submodule.c:2026
+#: submodule.c:2086
+#, 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
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7206,361 +8893,371 @@ msgstr ""
 "«%s» a\n"
 "«%s»\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
-
-#: submodule.c:2153
+#: submodule.c:2221
 msgid "could not start ls-files in .."
 msgstr "no s'ha pogut iniciar ls-files a .."
 
-#: submodule.c:2192
+#: submodule.c:2261
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
 
-#: submodule-config.c:232
-#, fuzzy, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "s'està ignorant la referència amb nom malmès %s"
-
-#: submodule-config.c:299
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "no es permeten els valors negatius a submodule.fetchjobs"
-
-#: submodule-config.c:397
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-
-#: submodule-config.c:486
+#: symlinks.c:244
 #, c-format
-msgid "invalid value for %s"
-msgstr "valor no vàlid per a %s"
-
-#: submodule-config.c:755
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
+msgid "failed to lstat '%s'"
+msgstr "s'ha produït un error en fer lstat a «%s»"
 
-#: trailer.c:238
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "l'execució de l'ordre de remolc «%s» ha fallat"
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: trailer.c: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 desconegut «%s» per a la clau «%s»"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: 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 "més d'un %s"
 
-#: trailer.c:730
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
-msgstr "testimoni de remolc buit en el remolc '%.*s'"
+msgstr "testimoni de remolc buit en el remolc «%.*s»"
 
-#: trailer.c:750
+#: 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:753
+#: trailer.c:766 builtin/mktag.c:88
 msgid "could not read from stdin"
 msgstr "no s'ha pogut llegir des de stdin"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1024 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
 msgstr "no s'ha pogut fer stat a %s"
 
-#: trailer.c:1013
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "el fitxer %s no és un fitxer regular"
 
-#: trailer.c:1015
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "el fitxer %s no és gravable per l'usuari"
 
-#: trailer.c:1027
+#: trailer.c:1040
 msgid "could not open temporary file"
 msgstr "no s'ha pogut obrir el fitxer temporal"
 
-#: trailer.c:1067
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
-
-#: transport.c:142
-#, fuzzy, c-format
-msgid "could not read bundle '%s'"
-msgstr "no s'ha pogut llegir el fitxer «%s»"
-
-#: transport.c:208
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: opció de profunditat no vàlida «%s»"
-
-#: transport.c:259
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-
-#: transport.c:260
-msgid "server options require protocol version 2 or later"
-msgstr ""
-
-#: transport.c:625
-#, fuzzy
-msgid "could not parse transport.color.* config"
-msgstr "no s'ha pogut analitzar l'script d'autor"
-
-#: transport.c:698
-msgid "support for protocol v2 not implemented yet"
-msgstr ""
-
-#: transport.c:825
-#, fuzzy, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "valor desconegut «%s» per a la clau «%s»"
-
-#: transport.c:891
-#, fuzzy, c-format
-msgid "transport '%s' not allowed"
-msgstr "no s'ha trobat la branca «%s»."
-
-#: transport.c:945
-msgid "git-over-rsync is no longer supported"
-msgstr ""
-
-#: transport.c:1040
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Els camins de submòdul següents contenen canvis que no\n"
-"es poden trobar en cap remot:\n"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Intenteu\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"o canviar de directori al camí i useu\n"
-"\n"
-"\tgit push\n"
-"\n"
-"per a pujar-los a un remot.\n"
-
-#: transport.c:1052
-msgid "Aborting."
-msgstr "S'està avortant."
-
-#: transport.c:1193
-#, fuzzy
-msgid "failed to push all needed submodules"
-msgstr "s'ha produït un error en cercar recursivament al submòdul «%s»"
-
-#: transport.c:1340 transport-helper.c:645
-#, fuzzy
-msgid "operation not supported by protocol"
-msgstr "opció no admesa amb --recurse-submodules."
-
-#: transport-helper.c:51 transport-helper.c:80
-#, fuzzy
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
-msgstr "imprimeix l'estat des de l'ajudant remot"
+msgstr "l'escriptura completa a l'ajudant remot ha fallat"
 
-#: transport-helper.c:134
-#, fuzzy, c-format
+#: transport-helper.c:145
+#, c-format
 msgid "unable to find remote helper for '%s'"
-msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
+msgstr "no s'ha pogut trobar l'ajudant remot per a «%s»"
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
-msgstr ""
+msgstr "no es pot duplicar la sortida de l'ajudant «fd»"
 
-#: transport-helper.c:201
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr ""
+"funcionalitat obligatòria %s desconeguda; aquest ajudant remot probablement "
+"necessita una versió més nova del Git"
 
-#: transport-helper.c:207
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
-msgstr ""
+msgstr "aquest ajudant remot ha d'implementar la funcionalitat de refspec"
 
-#: transport-helper.c:274 transport-helper.c:414
-#, fuzzy, c-format
+#: transport-helper.c:287 transport-helper.c:429
+#, c-format
 msgid "%s unexpectedly said: '%s'"
-msgstr "blob esperat per a %s «%s»"
+msgstr "%s ha dit inesperadament «%s»"
 
-#: transport-helper.c:403
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
-msgstr "%s també ha bloquejat %s"
+msgstr "%s també està bloquejat %s"
 
-#: transport-helper.c:481
-#, fuzzy
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
-msgstr "no s'ha pogut executar «stash»."
+msgstr "no s'ha pogut executar «fast-import»"
 
-#: transport-helper.c:504
-#, fuzzy
+#: transport-helper.c:520
 msgid "error while running fast-import"
-msgstr "error en tancar el fitxer de paquet"
+msgstr "error en executar la importació ràpida"
 
-#: transport-helper.c:533 transport-helper.c:1105
-#, fuzzy, c-format
+#: transport-helper.c:549 transport-helper.c:1247
+#, c-format
 msgid "could not read ref %s"
-msgstr "No s'ha pogut llegir la referència %s"
+msgstr "no s'ha pogut llegir la referència %s"
 
-#: transport-helper.c:578
-#, fuzzy, c-format
+#: transport-helper.c:594
+#, c-format
 msgid "unknown response to connect: %s"
-msgstr "opció desconeguda: %s\n"
+msgstr "resposta desconeguda en connectar: %s"
 
-#: transport-helper.c:600
+#: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
-msgstr ""
+msgstr "el protocol no permet establir el camí del servei remot"
 
-#: transport-helper.c:602
-#, fuzzy
+#: transport-helper.c:618
 msgid "invalid remote service path"
-msgstr "referència no vàlida: %s"
+msgstr "el camí del servei remot no és vàlid"
+
+#: transport-helper.c:661 transport.c:1471
+msgid "operation not supported by protocol"
+msgstr "opció no admesa pel protocol"
 
-#: transport-helper.c:648
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
+msgstr "no es pot connectar al subservei %s"
+
+#: transport-helper.c:693 transport.c:397
+msgid "--negotiate-only requires protocol v2"
 msgstr ""
 
-#: transport-helper.c:720
+#: transport-helper.c:755
+#, fuzzy
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' sense una directiva 'ok/error' coincident"
+
+#: transport-helper.c:798
 #, fuzzy, c-format
 msgid "expected ok/error, helper said '%s'"
-msgstr "blob esperat per a %s «%s»"
+msgstr "s'esperava un ajudant d'error/OK ha dit \"%s\""
 
-#: transport-helper.c:773
+#: transport-helper.c:855
 #, fuzzy, c-format
 msgid "helper reported unexpected status of %s"
-msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
+msgstr "l'ajudant ha informat d'un estat inesperat dels percentatges"
 
-#: transport-helper.c:834
+#: transport-helper.c:938
 #, fuzzy, c-format
 msgid "helper %s does not support dry-run"
-msgstr "El servidor no admet --deepen"
+msgstr "els ajudants no donen suport a l'execució seca"
 
-#: transport-helper.c:837
+#: transport-helper.c:941
 #, fuzzy, c-format
 msgid "helper %s does not support --signed"
-msgstr "El servidor no admet --shallow-since"
+msgstr "els ajudants per cents no són compatibles --signed"
 
-#: transport-helper.c:840
+#: transport-helper.c:944
 #, fuzzy, c-format
 msgid "helper %s does not support --signed=if-asked"
-msgstr "el destí receptor no admet pujar --signed"
+msgstr "l'ajudant per cents no admet --signed=if-asked"
+
+#: transport-helper.c:949
+#, fuzzy, c-format
+msgid "helper %s does not support --atomic"
+msgstr "els ajudants no admeten --atomic"
+
+#: transport-helper.c:953
+#, fuzzy, c-format
+msgid "helper %s does not support --%s"
+msgstr "els ajudants per cents no són compatibles --signed"
 
-#: transport-helper.c:847
+#: transport-helper.c:960
 #, fuzzy, c-format
 msgid "helper %s does not support 'push-option'"
-msgstr "el destí receptor no admet opcions de pujada"
+msgstr "els ajudants no donen suport a «push-option»"
 
-#: transport-helper.c:945
+#: transport-helper.c:1060
+#, fuzzy
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
+"remot-helper no permet prémer; es necessiten especificacions de referència"
 
-#: transport-helper.c:950
+#: transport-helper.c:1065
 #, fuzzy, c-format
 msgid "helper %s does not support 'force'"
-msgstr "El servidor no admet --deepen"
+msgstr "els ajudants no donen suport a «force»"
 
-#: transport-helper.c:997
+#: transport-helper.c:1112
 #, fuzzy
 msgid "couldn't run fast-export"
-msgstr "no s'ha pogut executar «stash»."
+msgstr "no s'ha pogut executar «fast-export»"
 
-#: transport-helper.c:1002
+#: transport-helper.c:1117
 #, fuzzy
 msgid "error while running fast-export"
-msgstr "error en tancar el fitxer de paquet"
+msgstr "error en executar l'exportació ràpida"
 
-#: transport-helper.c:1027
-#, c-format
+#: transport-helper.c:1142
+#, fuzzy, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\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»."
+
+#: transport-helper.c:1224
+#, fuzzy, c-format
+msgid "unsupported object format '%s'"
+msgstr "objecte mal format a «%s»"
 
-#: transport-helper.c:1091
+#: transport-helper.c:1233
 #, fuzzy, c-format
 msgid "malformed response in ref list: %s"
-msgstr "full d'opcions mal format: «%s»"
+msgstr "resposta mal formada en la llista de referències"
 
-#: transport-helper.c:1244
+#: transport-helper.c:1385
 #, fuzzy, c-format
 msgid "read(%s) failed"
-msgstr "%s ha fallat"
+msgstr "ha fallat read(%)"
 
-#: transport-helper.c:1271
+#: transport-helper.c:1412
 #, fuzzy, c-format
 msgid "write(%s) failed"
-msgstr "%s ha fallat"
+msgstr "ha fallat l(%)"
 
-#: transport-helper.c:1320
-#, fuzzy, c-format
+#: transport-helper.c:1461
+#, c-format
 msgid "%s thread failed"
-msgstr "%s ha fallat"
+msgstr "%s ha fallat el fil"
 
-#: transport-helper.c:1324
+#: transport-helper.c:1465
 #, fuzzy, c-format
 msgid "%s thread failed to join: %s"
-msgstr "s'ha produït un error en obrir «%s»"
+msgstr "el fil per cents no s'ha pogut unir als percentatges"
 
-#: transport-helper.c:1343 transport-helper.c:1347
+#: transport-helper.c:1484 transport-helper.c:1488
 #, c-format
 msgid "can't start thread for copying data: %s"
-msgstr ""
+msgstr "no es pot iniciar el fil per copiar les dades: %s"
 
-#: transport-helper.c:1384
+#: transport-helper.c:1525
 #, c-format
 msgid "%s process failed to wait"
-msgstr ""
+msgstr "el procés %s no ha pogut esperar"
 
-#: transport-helper.c:1388
-#, fuzzy, c-format
+#: transport-helper.c:1529
+#, c-format
 msgid "%s process failed"
-msgstr "%s ha fallat"
+msgstr "el procés %s ha fallat"
 
-#: transport-helper.c:1406 transport-helper.c:1415
+#: transport-helper.c:1547 transport-helper.c:1556
 msgid "can't start thread for copying data"
+msgstr "no es pot iniciar el fil per copiar dades"
+
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "no s'ha pogut llegir el paquet «%s»"
+
+#: transport.c:220
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: opció de profunditat no vàlida «%s»"
+
+#: transport.c:272
+#, fuzzy
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "vegeu protocol.version a «git help config» per a més detalls"
+
+#: transport.c:273
+#, fuzzy
+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
+msgid "server does not support wait-for-done"
+msgstr "El servidor no admet --deepen"
+
+#: transport.c:751
+#, fuzzy
+msgid "could not parse transport.color.* config"
+msgstr "no s'ha pogut analitzar la configuració de transport.color.*"
+
+#: transport.c:826
+#, fuzzy
+msgid "support for protocol v2 not implemented yet"
+msgstr "encara no s'ha implementat la implementació del protocol v2"
+
+#: transport.c:960
+#, fuzzy, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valor desconegut per config «%s»%s"
+
+#: transport.c:1026
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "no es permet el transport «%s»"
+
+#: transport.c:1079
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync ja no s'admet"
+
+#: transport.c:1181
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
 msgstr ""
+"Els camins de submòdul següents contenen canvis que no\n"
+"es poden trobar en cap remot:\n"
+
+#: transport.c:1185
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Intenteu\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o canviar de directori al camí i useu\n"
+"\n"
+"\tgit push\n"
+"\n"
+"per a pujar-los a un remot.\n"
+
+#: transport.c:1193
+msgid "Aborting."
+msgstr "S'està avortant."
+
+#: transport.c:1340
+#, fuzzy
+msgid "failed to push all needed submodules"
+msgstr "no s'ha pogut prémer tots els submòduls necessaris"
 
 #: tree-walk.c:33
 msgid "too-short tree object"
@@ -7578,7 +9275,7 @@ msgstr "nom de fitxer buit en una entrada d'arbre"
 msgid "too-short tree file"
 msgstr "fitxer d'arbre massa curt"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7588,7 +9285,7 @@ msgstr ""
 "agafar:\n"
 "%%sCometeu els vostres canvis o feu «stash» abans de canviar de branca."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7598,7 +9295,7 @@ msgstr ""
 "agafar:\n"
 "%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7608,7 +9305,7 @@ msgstr ""
 "fusionar:\n"
 "%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7618,7 +9315,7 @@ msgstr ""
 "fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7627,7 +9324,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:123
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7636,7 +9333,7 @@ msgstr ""
 "Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7645,7 +9342,7 @@ msgstr ""
 "En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
 "%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7655,7 +9352,7 @@ msgstr ""
 "agafar:\n"
 "%%sMoveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7665,7 +9362,7 @@ msgstr ""
 "agafar:\n"
 "%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7675,7 +9372,7 @@ msgstr ""
 "fusionar:\n"
 "%%sMoveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7685,7 +9382,7 @@ msgstr ""
 "fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7694,7 +9391,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:144
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7703,7 +9400,7 @@ msgstr ""
 "Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
 "%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7714,7 +9411,7 @@ msgstr ""
 "agafar:\n"
 "%%sMoveu-los o elimineu-los abans de canviar de branca."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7725,7 +9422,7 @@ msgstr ""
 "agafar:\n"
 "%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7735,7 +9432,7 @@ msgstr ""
 "fusionar:\n"
 "%%sMoveu-los o elimineu-los abans de fusionar."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7745,7 +9442,7 @@ msgstr ""
 "fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7755,7 +9452,7 @@ msgstr ""
 "%s:\n"
 "%%sMoveu-los o elimineu-los abans de %s."
 
-#: unpack-trees.c:162
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7765,71 +9462,96 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrada «%s» encavalca amb «%s».  No es pot vincular."
 
-#: unpack-trees.c:173
+#: unpack-trees.c:177
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
 "%s"
 msgstr ""
-"No es pot actualitzar l'agafament parcial: les entrades següents no estan al "
-"dia:\n"
+"No es pot actualitzar el submòdul:\n"
 "%s"
 
-#: unpack-trees.c:175
-#, c-format
+#: unpack-trees.c:180
+#, fuzzy, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Els fitxers següents en l'arbre de treball se sobreescriurien per "
-"actualitzar l'agafament parcial:\n"
-"%s"
+"Els camins següents no estan actualitzats i es van deixar a pesar que s'han "
+"dispersat els percentatges"
 
-#: unpack-trees.c:177
-#, c-format
+#: unpack-trees.c:182
+#, fuzzy, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
-"Els fitxers següents en l'arbre de treball s'eliminarien per actualitzar "
-"l'agafament parcial:\n"
-"%s"
+"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
 
-#: unpack-trees.c:179
-#, c-format
+#: unpack-trees.c:184
+#, fuzzy, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"No es pot actualitzar el submòdul:\n"
-"%s"
+"Els camins següents ja estaven presents i, per tant, no s'han actualitzat "
+"malgrat els patrons escassos."
 
-#: unpack-trees.c:256
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "S'està avortant\n"
 
-#: unpack-trees.c:318
+#: unpack-trees.c:291
+#, fuzzy, 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`."
+
+#: unpack-trees.c:352
 msgid "Updating files"
 msgstr "S'estan actualitzant els fitxers"
 
-#: unpack-trees.c:350
+#: unpack-trees.c:384
+#, fuzzy
 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"
+
+#: unpack-trees.c:1519
+#, fuzzy
+msgid "Updating index flags"
+msgstr "Actualitzant els indicadors d’índex"
+
+#: unpack-trees.c:2608
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+
+#: upload-pack.c:1548
+#, fuzzy
+msgid "expected flush after fetch arguments"
+msgstr "s'esperava una neteja després de les capacitats"
 
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
-msgstr "l'esquema d'URL no és vàlid o li manca el sufix '://'"
+msgstr "l'esquema d'URL no és vàlid o li manca el sufix «://»"
 
 #: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
 #, c-format
@@ -7838,11 +9560,11 @@ msgstr "seqüència d'escapament %XX no vàlida"
 
 #: urlmatch.c:215
 msgid "missing host and scheme is not 'file:'"
-msgstr "manca la màquina i l'esquema no és 'file:'"
+msgstr "manca la màquina i l'esquema no és «file:»"
 
 #: urlmatch.c:232
 msgid "a 'file:' URL may not have a port number"
-msgstr "un URL 'file:' no pot tenir número de port"
+msgstr "un URL «file:» no pot tenir número de port"
 
 #: urlmatch.c:247
 msgid "invalid characters in host name"
@@ -7854,9 +9576,13 @@ msgstr "número de port no vàlid"
 
 #: urlmatch.c:371
 msgid "invalid '..' path segment"
-msgstr "segment de camí '..' no vàlid"
+msgstr "segment de camí «..» no vàlid"
 
-#: worktree.c:258 builtin/am.c:2095
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "S'estan obtenint objectes"
+
+#: worktree.c:238 builtin/am.c:2151
 #, c-format
 msgid "failed to read '%s'"
 msgstr "s'ha produït un error en llegir «%s»"
@@ -7864,12 +9590,13 @@ msgstr "s'ha produït un error en llegir «%s»"
 #: worktree.c:304
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
-msgstr ""
+msgstr "«%s» a l'arbre de treball principal no és al directori del repositori"
 
 #: worktree.c:315
 #, 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
 #, c-format
@@ -7881,22 +9608,88 @@ msgstr "«%s» no existeix"
 msgid "'%s' is not a .git file, error code %d"
 msgstr "«%s» no és un fitxer .git, codi d'error %d"
 
-#: worktree.c:341
+#: worktree.c:342
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "«%s» no assenyala de tornada a «%s»"
 
-#: wrapper.c:223 wrapper.c:393
+#: worktree.c:608
+msgid "not a directory"
+msgstr "no és en un directori"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git no és un fitxer"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr "fitxer .git malmès"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr "fitxer .git malmès"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "no és un camí vàlid"
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr "no s'ha pogut trobar el repositori; .git no és un fitxer"
+
+#: worktree.c:737
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "no s'ha pogut trobar el repositori; el fitxer .git no fa referència a un repositori"
+
+#: worktree.c:741
+msgid "unable to locate repository; .git file broken"
+msgstr "no s'ha pogut trobar el repositori; el fitxer .git està malmès"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "gitdir illegible"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "gitdir incorrecte"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "no és en un directori vàlid"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "el fitxer gitdir no existeix"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "no s'ha pogut llegir el fitxer gitdir (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "lectura curta (s'esperaven %<PRIuMAX> bytes, llegits %<PRIuMAX>)"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "fitxer gitdir no vàlid"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "el fitxer gitdir indica una ubicació no existent"
+
+#: wrapper.c:197 wrapper.c:367
 #, 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:424 wrapper.c:624
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr "no s'ha pogut accedir a «%s»"
 
-#: wrapper.c:632
+#: wrapper.c:607
 msgid "unable to get current working directory"
 msgstr "no s'ha pogut obtenir el directori de treball actual"
 
@@ -7905,56 +9698,53 @@ 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 reset %s <fitxer>...\" per a fer «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 reset %s <fitxer>...\" per a fer «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)"
-msgstr "  (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)"
+msgstr "  (useu «git rm --cached <fitxer>...» per a fer «unstage»)"
 
 #: wt-status.c:197
 msgid "  (use \"git add <file>...\" to mark resolution)"
-msgstr "  (useu \"git add <fitxer>...\" per a senyalar resolució)"
+msgstr "  (useu «git add <fitxer>...» per a senyalar resolució)"
 
 #: wt-status.c:199 wt-status.c:203
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr ""
-"  (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
+"  (useu «git add/rm <fitxer>...» segons sigui apropiat per a senyalar "
 "resolució)"
 
 #: wt-status.c:201
 msgid "  (use \"git rm <file>...\" to mark resolution)"
-msgstr "  (useu \"git rm <fitxer>...\" per a senyalar resolució)"
+msgstr "  (useu «git rm <fitxer>...» per a senyalar resolució)"
 
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1075
 msgid "Changes to be committed:"
 msgstr "Canvis a cometre:"
 
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1084
 msgid "Changes not staged for commit:"
 msgstr "Canvis no «staged» per a cometre:"
 
 #: wt-status.c:238
 msgid "  (use \"git add <file>...\" to update what will be committed)"
-msgstr "  (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
+msgstr "  (useu «git add <fitxer>...» per a actualitzar què es cometrà)"
 
 #: wt-status.c:240
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
-msgstr "  (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
+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)"
 msgstr ""
-"  (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
-"directori de treball)"
+"  (useu «git restore <file>...» per a descartar els canvis en el directori de treball)"
 
 #: wt-status.c:243
 msgid "  (commit or discard the untracked or modified content in submodules)"
@@ -7964,214 +9754,216 @@ msgstr ""
 #: wt-status.c:254
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr "  (useu \"git %s <fitxer>...\" per a incloure-ho en el que es cometrà)"
+msgstr "  (useu «git %s <fitxer>...» per a incloure-ho en la comissió)"
 
-#: wt-status.c:268
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr "suprimit per ambdós:"
 
-#: wt-status.c:270
+#: wt-status.c:268
 msgid "added by us:"
 msgstr "afegit per nosaltres:"
 
-#: wt-status.c:272
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "suprimit per ells:"
 
-#: wt-status.c:274
+#: wt-status.c:272
 msgid "added by them:"
 msgstr "afegit per ells:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr "suprimit per nosaltres:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "both added:"
 msgstr "afegit per ambdós:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "both modified:"
 msgstr "modificat per ambdós:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "new file:"
 msgstr "fitxer nou:"
 
-#: wt-status.c:292
+#: wt-status.c:290
 msgid "copied:"
 msgstr "copiat:"
 
-#: wt-status.c:294
+#: wt-status.c:292
 msgid "deleted:"
 msgstr "suprimit:"
 
-#: wt-status.c:296
+#: wt-status.c:294
 msgid "modified:"
 msgstr "modificat:"
 
-#: wt-status.c:298
+#: wt-status.c:296
 msgid "renamed:"
 msgstr "canviat de nom:"
 
-#: wt-status.c:300
+#: wt-status.c:298
 msgid "typechange:"
 msgstr "canviat de tipus:"
 
-#: wt-status.c:302
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "desconegut:"
 
-#: wt-status.c:304
+#: wt-status.c:302
 msgid "unmerged:"
 msgstr "sense fusionar:"
 
-#: wt-status.c:384
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "comissions noves, "
 
-#: wt-status.c:386
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "contingut modificat, "
 
-#: wt-status.c:388
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr "contingut no seguit, "
 
-#: wt-status.c:906
+#: wt-status.c:908
 #, 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:938
+#: wt-status.c:939
 msgid "Submodules changed but not updated:"
 msgstr "Submòduls canviats però no actualitzats:"
 
-#: wt-status.c:940
+#: wt-status.c:941
 msgid "Submodule changes to be committed:"
 msgstr "Canvis de submòdul a cometre:"
 
-#: wt-status.c:1022
+#: wt-status.c:1023
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr ""
-"No modifiqueu o suprimiu la línia de dalt.\n"
+"No modifiqueu ni elimineu la línia de dalt.\n"
 "Tot el que hi ha a sota s'ignorarà."
 
-#: wt-status.c:1114
+#: wt-status.c:1115
 #, 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 ""
+"\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:1144
+#: wt-status.c:1145
 msgid "You have unmerged paths."
 msgstr "Teniu camins sense fusionar."
 
-#: wt-status.c:1147
+#: wt-status.c:1148
 msgid "  (fix conflicts and run \"git commit\")"
-msgstr "  (arregleu els conflictes i executeu \"git commit\")"
+msgstr "  (arregleu els conflictes i executeu «git commit»)"
 
-#: wt-status.c:1149
+#: wt-status.c:1150
 msgid "  (use \"git merge --abort\" to abort the merge)"
-msgstr "  (useu \"git merge --abort\" per a avortar la fusió)"
+msgstr "  (useu «git merge --abort» per a avortar la fusió)"
 
-#: wt-status.c:1153
+#: wt-status.c:1154
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
 
-#: wt-status.c:1156
+#: wt-status.c:1157
 msgid "  (use \"git commit\" to conclude merge)"
-msgstr "  (useu \"git commit\" per a concloure la fusió)"
+msgstr "  (useu «git commit» per a concloure la fusió)"
 
-#: wt-status.c:1165
+#: wt-status.c:1166
 msgid "You are in the middle of an am session."
 msgstr "Esteu enmig d'una sessió am."
 
-#: wt-status.c:1168
+#: wt-status.c:1169
 msgid "The current patch is empty."
 msgstr "El pedaç actual està buit."
 
-#: wt-status.c:1172
+#: wt-status.c:1173
 msgid "  (fix conflicts and then run \"git am --continue\")"
-msgstr "  (arregleu els conflictes i després executeu \"git am --continue\")"
+msgstr "  (arregleu els conflictes i després executeu «git am --continue»)"
 
-#: wt-status.c:1174
+#: wt-status.c:1175
 msgid "  (use \"git am --skip\" to skip this patch)"
-msgstr "  (useu \"git am --skip\" per a ometre aquest pedaç)"
+msgstr "  (useu «git am --skip» per a ometre aquest pedaç)"
 
-#: wt-status.c:1176
+#: wt-status.c:1177
 msgid "  (use \"git am --abort\" to restore the original branch)"
-msgstr "  (useu \"git am --abort\" per a restaurar la branca original)"
+msgstr "  (useu «git am --abort» per a restaurar la branca original)"
 
-#: wt-status.c:1309
+#: wt-status.c:1310
 msgid "git-rebase-todo is missing."
 msgstr "Manca git-rebase-todo."
 
-#: wt-status.c:1311
+#: wt-status.c:1312
 msgid "No commands done."
 msgstr "No s'ha fet cap ordre."
 
-#: wt-status.c:1314
+#: wt-status.c:1315
 #, 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:1325
+#: wt-status.c:1326
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (vegeu més en el fitxer %s)"
 
-#: wt-status.c:1330
+#: wt-status.c:1331
 msgid "No commands remaining."
 msgstr "No manca cap ordre."
 
-#: wt-status.c:1333
+#: wt-status.c:1334
 #, 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:1341
+#: wt-status.c:1342
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (useu \"git rebase --edit-todo\" per a veure i editar)"
+msgstr "  (useu «git rebase --edit-todo» per a veure i editar)"
 
-#: wt-status.c:1353
+#: wt-status.c:1354
 #, 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:1358
+#: wt-status.c:1359
 msgid "You are currently rebasing."
 msgstr "Actualment esteu fent «rebase»."
 
-#: wt-status.c:1371
+#: wt-status.c:1372
 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:1373
+#: wt-status.c:1374
 msgid "  (use \"git rebase --skip\" to skip this patch)"
-msgstr "  (useu \"git rebase --skip\" per a ometre aquest pedaç)"
+msgstr "  (useu «git rebase --skip» per a ometre aquest pedaç)"
 
-#: wt-status.c:1375
+#: wt-status.c:1376
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
-msgstr "  (useu \"git rebase --abort\" per a agafar la branca original)"
+msgstr "  (useu «git rebase --abort» per a agafar la branca original)"
 
-#: wt-status.c:1382
+#: wt-status.c:1383
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
-"  (tots els conflictes estan arreglats: executeu \"git rebase --continue\")"
+"  (tots els conflictes estan arreglats: executeu «git rebase --continue»)"
 
-#: wt-status.c:1386
+#: wt-status.c:1387
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -8179,374 +9971,424 @@ msgstr ""
 "Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
 "«%s» en «%s»."
 
-#: wt-status.c:1391
+#: wt-status.c:1392
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Actualment esteu dividint una comissió durant un «rebase»."
 
-#: wt-status.c:1394
+#: wt-status.c:1395
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
-"  (Una vegada que el vostre directori de treball sigui net, executeu \"git "
-"rebase --continue\")"
+"  (Una vegada que el vostre directori de treball sigui net, executeu «git "
+"rebase --continue»)"
 
-#: wt-status.c:1398
+#: wt-status.c:1399
 #, 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:1403
+#: wt-status.c:1404
 msgid "You are currently editing a commit during a rebase."
 msgstr "Actualment esteu editant una comissió durant un «rebase»."
 
-#: wt-status.c:1406
+#: wt-status.c:1407
 msgid "  (use \"git commit --amend\" to amend the current commit)"
-msgstr "  (useu \"git commit --amend\" per a esmenar la comissió actual)"
+msgstr "  (useu «git commit --amend» per a esmenar la comissió actual)"
 
-#: wt-status.c:1408
+#: wt-status.c:1409
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
-"  (useu \"git rebase --continue\" una vegada que estigueu satisfet amb els "
+"  (useu «git rebase --continue» una vegada que estigueu satisfet amb els "
 "vostres canvis)"
 
-#: wt-status.c:1419
-#, fuzzy
+#: wt-status.c:1420
 msgid "Cherry-pick currently in progress."
-msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
+msgstr "Hi ha «cherry pick» actualment en curs."
 
-#: wt-status.c:1422
+#: wt-status.c:1423
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Actualment esteu fent «cherry pick» a la comissió %s."
 
-#: wt-status.c:1429
+#: wt-status.c:1430
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
-msgstr "  (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
+msgstr "  (arregleu els conflictes i executeu «git cherry-pick --continue»)"
 
-#: wt-status.c:1432
-#, fuzzy
+#: wt-status.c:1433
 msgid "  (run \"git cherry-pick --continue\" to continue)"
-msgstr "  (arregleu els conflictes i executeu \"git cherry-pick --continue\")"
+msgstr "  (executeu «git cherry-pick --continue» per a continuar)"
 
-#: wt-status.c:1435
+#: wt-status.c:1436
 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
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (useu «git cherry-pick --skip» per a ometre aquest pedaç)"
 
-#: wt-status.c:1437
+#: wt-status.c:1440
 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 "
+"  (useu «git cherry-pick --abort» per a cancel·lar l'operació de «cherry "
 "pick»)"
 
-#: wt-status.c:1447
-#, fuzzy
+#: wt-status.c:1450
 msgid "Revert currently in progress."
-msgstr "avorta la fusió en curs actual"
+msgstr "Una reversió està actualment en curs."
 
-#: wt-status.c:1450
+#: wt-status.c:1453
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Actualment esteu revertint la comissió %s."
 
-#: wt-status.c:1456
+#: wt-status.c:1459
 msgid "  (fix conflicts and run \"git revert --continue\")"
-msgstr "  (arregleu els conflictes i executeu \"git revert --continue\")"
+msgstr "  (arregleu els conflictes i executeu «git revert --continue»)"
 
-#: wt-status.c:1459
-#, fuzzy
+#: wt-status.c:1462
 msgid "  (run \"git revert --continue\" to continue)"
-msgstr "  (arregleu els conflictes i executeu \"git revert --continue\")"
+msgstr "  (executeu «git revert --continue» per a continuar)"
 
-#: wt-status.c:1462
+#: wt-status.c:1465
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
-"  (tots els conflictes estan arreglats: executeu \"git revert --continue\")"
+"  (tots els conflictes estan arreglats: executeu «git revert --continue»)"
+
+#: wt-status.c:1467
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (useu «git revert --skip» per a ometre aquest pedaç)"
 
-#: wt-status.c:1464
+#: wt-status.c:1469
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
-msgstr ""
-"  (useu \"git revert --abort\" per a cancel·lar l'operació de reversió)"
+msgstr "  (useu «git revert --abort» per a cancel·lar l'operació de reversió)"
 
-#: wt-status.c:1474
+#: wt-status.c:1479
 #, 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:1478
+#: wt-status.c:1483
 msgid "You are currently bisecting."
 msgstr "Actualment esteu bisecant."
 
-#: wt-status.c:1481
+#: wt-status.c:1486
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
-msgstr "  (useu \"git bisect reset\" per a tornar a la branca original)"
+msgstr "  (useu «git bisect reset» per a tornar a la branca original)"
+
+#: wt-status.c:1497
+#, fuzzy, 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."
 
-#: wt-status.c:1690
+#: wt-status.c:1736
 msgid "On branch "
 msgstr "En la branca "
 
-#: wt-status.c:1697
+#: wt-status.c:1743
 msgid "interactive rebase in progress; onto "
 msgstr "«rebase» interactiu en curs; sobre "
 
-#: wt-status.c:1699
+#: wt-status.c:1745
 msgid "rebase in progress; onto "
 msgstr "«rebase» en curs; sobre "
 
-#: wt-status.c:1709
+#: wt-status.c:1750
+msgid "HEAD detached at "
+msgstr "HEAD separat a "
+
+#: wt-status.c:1752
+msgid "HEAD detached from "
+msgstr "HEAD separat des de "
+
+#: wt-status.c:1755
 msgid "Not currently on any branch."
 msgstr "Actualment no s'és en cap branca."
 
-#: wt-status.c:1726
+#: wt-status.c:1772
 msgid "Initial commit"
 msgstr "Comissió inicial"
 
-#: wt-status.c:1727
+#: wt-status.c:1773
 msgid "No commits yet"
 msgstr "No s'ha fet cap comissió encara"
 
-#: wt-status.c:1741
+#: wt-status.c:1787
 msgid "Untracked files"
 msgstr "Fitxers no seguits"
 
-#: wt-status.c:1743
+#: wt-status.c:1789
 msgid "Ignored files"
 msgstr "Fitxers ignorats"
 
-#: wt-status.c:1747
+#: wt-status.c:1793
 #, 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 ""
-"Ha trigat %.2f segons enumerar els fitxers no seguits.\n"
-"'status -uno' pot accelerar-ho, però heu d'anar amb compte de no\n"
+"S'ha trigat %.2f segons enumerar els fitxers no seguits.\n"
+"«status -uno» pot accelerar-ho, però heu d'anar amb compte de no\n"
 "oblidar-vos d'afegir fitxers nous vosaltres mateixos (vegeu\n"
-"'git help status')."
+"«git help status»)."
 
-#: wt-status.c:1753
+#: wt-status.c:1799
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Els fitxers no seguits no estan llistats%s"
 
-#: wt-status.c:1755
+#: wt-status.c:1801
 msgid " (use -u option to show untracked files)"
 msgstr " (useu l'opció -u per a mostrar els fitxers no seguits)"
 
-#: wt-status.c:1761
+#: wt-status.c:1807
 msgid "No changes"
 msgstr "Sense canvis"
 
-#: wt-status.c:1766
+#: wt-status.c:1812
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
-msgstr ""
-"no hi ha canvis afegits a cometre (useu \"git add\" o \"git commit -a\")\n"
+msgstr "no hi ha canvis afegits a cometre (useu «git add» o «git commit -a»)\n"
 
-#: wt-status.c:1769
+#: wt-status.c:1816
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no hi ha canvis afegits a cometre\n"
 
-#: wt-status.c:1772
+#: wt-status.c:1820
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
-"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add"
-"\" per a seguir-los)\n"
+"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu «git add» "
+"per a seguir-los)\n"
 
-#: wt-status.c:1775
+#: wt-status.c:1824
 #, 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:1778
+#: wt-status.c:1828
 #, 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-"
+"no hi ha res a cometre (creeu/copieu fitxers i useu «git add» per a seguir-"
 "los)\n"
 
-#: wt-status.c:1781 wt-status.c:1786
+#: wt-status.c:1832 wt-status.c:1838
 #, c-format
 msgid "nothing to commit\n"
 msgstr "no hi ha res a cometre\n"
 
-#: wt-status.c:1784
+#: wt-status.c:1835
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "no hi ha res a cometre (useu -u per a mostrar els fitxers no seguits)\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1840
 #, 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:1901
+#: wt-status.c:1945
 msgid "No commits yet on "
 msgstr "No s'ha fet cap comissió encara a "
 
-#: wt-status.c:1905
+#: wt-status.c:1949
 msgid "HEAD (no branch)"
 msgstr "HEAD (sense branca)"
 
-#: wt-status.c:1936
+#: wt-status.c:1980
 msgid "different"
 msgstr "diferent"
 
-#: wt-status.c:1938 wt-status.c:1946
+#: wt-status.c:1982 wt-status.c:1990
 msgid "behind "
 msgstr "darrere "
 
-#: wt-status.c:1941 wt-status.c:1944
+#: wt-status.c:1985 wt-status.c:1988
 msgid "ahead "
 msgstr "davant per "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2466
+#: wt-status.c:2511
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "no es pot %s: Teniu canvis «unstaged»."
 
-#: wt-status.c:2472
+#: wt-status.c:2517
 msgid "additionally, your index contains uncommitted changes."
 msgstr "addicionalment, el vostre índex conté canvis sense cometre."
 
-#: wt-status.c:2474
+#: wt-status.c:2519
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
 
-#: builtin/add.c:25
+#: compat/simple-ipc/ipc-unix-socket.c:178
+msgid "could not send IPC command"
+msgstr "no s'ha pogut enviar l'ordre IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:185
+msgid "could not read IPC response"
+msgstr "no s'ha pogut llegir la resposta IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:862
+#, 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
+msgid "could not start worker[0] for '%s'"
+msgstr "no s'ha pogut llegir el fitxer de registre per a «%s»"
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "s'ha produït un error en desenllaçar «%s»"
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opcions>] [--] <especificació-de-camí>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:61
+#, fuzzy, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "no es pot canviar de directori a «%s»"
+
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "estat de diff inesperat %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
 msgstr "s'ha produït un error en actualitzar els fitxers"
 
-#: builtin/add.c:99
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
 msgstr "elimina «%s»\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:198
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:307 builtin/rev-parse.c:991
 msgid "Could not read the index"
 msgstr "No s'ha pogut llegir l'índex"
 
-#: builtin/add.c:245
+#: 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:249
+#: builtin/add.c:322
 msgid "Could not write patch"
 msgstr "No s'ha pogut escriure el pedaç"
 
-#: builtin/add.c:252
+#: builtin/add.c:325
 msgid "editing patch failed"
 msgstr "l'edició del pedaç ha fallat"
 
-#: builtin/add.c:255
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "No s'ha pogut fer stat a «%s»"
 
-#: builtin/add.c:257
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr "El pedaç és buit. S'ha avortat."
 
-#: builtin/add.c:262
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No s'ha pogut aplicar «%s»"
 
-#: builtin/add.c:270
+#: builtin/add.c:343
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
 
-#: builtin/add.c:290 builtin/clean.c:909 builtin/fetch.c:147 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:222 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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
 msgid "dry run"
-msgstr "marxa en sec"
+msgstr "fer una prova"
 
-#: builtin/add.c:293
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr "recull interactiu"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:367 builtin/checkout.c:1567 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "selecciona els trossos interactivament"
 
-#: builtin/add.c:295
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr "edita la diferència actual i aplica-la"
 
-#: builtin/add.c:296
+#: builtin/add.c:369
 msgid "allow adding otherwise ignored files"
 msgstr "permet afegir fitxers que d'altra manera s'ignoren"
 
-#: builtin/add.c:297
+#: builtin/add.c:370
 msgid "update tracked files"
 msgstr "actualitza els fitxers seguits"
 
-#: builtin/add.c:298
+#: builtin/add.c:371
+#, fuzzy
 msgid "renormalize EOL of tracked files (implies -u)"
-msgstr ""
+msgstr "torna a normalitzar EOL dels fitxers seguits (implica -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:372
 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:300
+#: builtin/add.c:373
 msgid "add changes from all tracked and untracked files"
 msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
 
-#: builtin/add.c:303
+#: builtin/add.c:376
 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:305
+#: builtin/add.c:378
 msgid "don't add, only refresh the index"
 msgstr "no afegeixis, només actualitza l'índex"
 
-#: builtin/add.c:306
+#: builtin/add.c:379
 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:307
+#: builtin/add.c:380
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
-"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
+"comproveu si els fitxers, fins i tot els absents, s'ignoren en fer una "
+"prova"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:382 builtin/update-index.c:1006
 msgid "override the executable bit of the listed files"
 msgstr "passa per alt el bit executable dels fitxers llistats"
 
-#: builtin/add.c:311
+#: builtin/add.c:384
 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
+msgid "backend for `git stash -p`"
+msgstr "backend per a «git stash -p»"
 
-#: builtin/add.c:326
+#: builtin/add.c:404
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8563,165 +10405,194 @@ 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 de\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"
 "\n"
-"Si heu afegit aquest camí per error, podeu suprimir-lo de\n"
+"Si heu afegit aquest camí per error, podeu eliminar-lo de\n"
 "l'índex amb:\n"
 "\n"
 "\tgit rm --cached %s\n"
 "\n"
-"Vegeu \"git help submodule\" per a més informació."
+"Vegeu «git help submodule» per a més informació."
 
-#: builtin/add.c:354
+#: builtin/add.c:432
 #, 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:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Useu -f si realment els voleu afegir.\n"
+#: builtin/add.c: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 ""
+"Utilitzeu -f si realment voleu afegir-los.\n"
+"Desactiveu aquest missatge executant\n"
+"«git config advice.addIgnoredFile false»"
 
-#: builtin/add.c:379
+#: builtin/add.c:460
 msgid "adding files failed"
 msgstr "l'afegiment de fitxers ha fallat"
 
-#: builtin/add.c:419
+#: 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:426
+#: 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:430
+#: builtin/add.c:526
 #, 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:445
+#: 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:555
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "No s'ha especificat res, no s'ha afegit res.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Potser volíeu dir «git add .»?\n"
+#: 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 ""
+"Potser voleu dir «git add .»?\n"
+"Desactiveu aquest missatge executant\n"
+"«git config advice.addEmptyPathspec false»"
 
-#: builtin/am.c:348
+#: builtin/am.c:364
 msgid "could not parse author script"
 msgstr "no s'ha pogut analitzar l'script d'autor"
 
-#: builtin/am.c:432
+#: builtin/am.c:454
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "s'ha suprimit «%s» pel lligam applypatch-msg"
 
-#: builtin/am.c:474
+#: builtin/am.c:496
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Línia d'entrada mal formada: «%s»."
 
-#: builtin/am.c:512
+#: builtin/am.c:534
 #, 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:538
+#: builtin/am.c:560
 msgid "fseek failed"
 msgstr "fseek ha fallat"
 
-#: builtin/am.c:726
+#: builtin/am.c:748
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no s'ha pogut analitzar el pedaç «%s»"
 
-#: builtin/am.c:791
+#: builtin/am.c:813
 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:839
+#: builtin/am.c:861
 msgid "invalid timestamp"
 msgstr "marca de temps no vàlida"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:866 builtin/am.c:878
 msgid "invalid Date line"
 msgstr "línia Date no vàlida"
 
-#: builtin/am.c:851
+#: builtin/am.c:873
 msgid "invalid timezone offset"
-msgstr "desplaçament de zona de temps no vàlid"
+msgstr "desplaçament del fus horari no vàlid"
 
-#: builtin/am.c:944
+#: builtin/am.c:966
 msgid "Patch format detection failed."
 msgstr "La detecció de format de pedaç ha fallat."
 
-#: builtin/am.c:949 builtin/clone.c:407
+#: builtin/am.c:971 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "s'ha produït un error en crear el directori «%s»"
 
-#: builtin/am.c:954
+#: builtin/am.c:976
 msgid "Failed to split patches."
 msgstr "S'ha produït un error en dividir els pedaços."
 
-#: builtin/am.c:1084 builtin/commit.c:374
-msgid "unable to write index file"
-msgstr "no s'ha pogut escriure el fitxer d'índex"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1125
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Quan hàgiu resolt aquest problema, executeu \"%s --continue\"."
+msgstr "Quan hàgiu resolt aquest problema, executeu «%s --continue»."
 
-#: builtin/am.c:1099
+#: builtin/am.c:1126
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
-msgstr ""
-"Si preferiu ometre aquest pedaç, executeu \"%s --skip\" en lloc d'això."
+msgstr "Si preferiu ometre aquest pedaç, executeu «%s --skip» en lloc d'això."
 
-#: builtin/am.c:1100
+#: builtin/am.c:1127
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
-"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort"
-"\"."
+"Per a restaurar la branca original i deixar d'apedaçar, executeu «%s --"
+"abort»."
 
-#: builtin/am.c:1183
+#: builtin/am.c:1222
+#, fuzzy
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
+"Pedaç enviat amb format=flux; es pot perdre espai al final de les línies."
 
-#: builtin/am.c:1211
+#: builtin/am.c:1250
 msgid "Patch is empty."
 msgstr "El pedaç està buit."
 
-#: builtin/am.c:1277
+#: builtin/am.c:1315
 #, c-format
-msgid "invalid ident line: %.*s"
-msgstr "línia d'identitat no vàlida: %.*s"
+msgid "missing author line in commit %s"
+msgstr "manca la línia d'autor en la comissió %s"
 
-#: builtin/am.c:1299
+#: builtin/am.c:1318
 #, c-format
-msgid "unable to parse commit %s"
-msgstr "no s'ha pogut analitzar la comissió %s"
+msgid "invalid ident line: %.*s"
+msgstr "línia d'identitat no vàlida: %.*s"
 
-#: builtin/am.c:1496
+#: builtin/am.c:1537
 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 "
+"Al repositori li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
 "vies."
 
-#: builtin/am.c:1498
+#: builtin/am.c:1539
 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:1517
+#: builtin/am.c:1558
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8729,24 +10600,24 @@ msgstr ""
 "Heu editat el vostre pedaç a mà?\n"
 "No s'aplica als blobs recordats en el seu índex."
 
-#: builtin/am.c:1523
+#: builtin/am.c:1564
 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:1549
+#: builtin/am.c:1590
 msgid "Failed to merge in the changes."
 msgstr "S'ha produït un error en fusionar els canvis."
 
-#: builtin/am.c:1581
+#: builtin/am.c:1622
 msgid "applying to an empty history"
 msgstr "s'està aplicant a una història buida"
 
-#: builtin/am.c:1628 builtin/am.c:1632
+#: builtin/am.c:1674 builtin/am.c:1678
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no es pot reprendre: %s no existeix."
 
-#: builtin/am.c:1650
+#: builtin/am.c:1696
 msgid "Commit Body is:"
 msgstr "El cos de la comissió és:"
 
@@ -8754,47 +10625,52 @@ msgstr "El cos de la comissió és:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1660
+#: builtin/am.c:1706
 #, 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:1710
+#: builtin/am.c:1752 builtin/commit.c:408
+msgid "unable to write index file"
+msgstr "no s'ha pogut escriure el fitxer d'índex"
+
+#: builtin/am.c:1756
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�ndex brut: no es poden aplicar pedaços (bruts: %s)"
 
-#: builtin/am.c:1750 builtin/am.c:1818
+#: builtin/am.c:1796 builtin/am.c:1864
 #, c-format
 msgid "Applying: %.*s"
 msgstr "S'està aplicant: %.*s"
 
-#: builtin/am.c:1767
+#: builtin/am.c:1813
 msgid "No changes -- Patch already applied."
 msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
 
-#: builtin/am.c:1773
+#: builtin/am.c:1819
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El pedaç ha fallat a %s %.*s"
 
-#: builtin/am.c:1777
-msgid "Use 'git am --show-current-patch' to see the failed patch"
-msgstr ""
+#: builtin/am.c:1823
+#, fuzzy
+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"
 
-#: builtin/am.c:1821
+#: builtin/am.c:1867
 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"
+"Cap canvi - heu oblidat d'usar «git add»?\n"
 "Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n"
 "introduït els mateixos canvis; potser voleu ometre aquest pedaç."
 
-#: builtin/am.c:1828
+#: builtin/am.c:1874
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -8802,167 +10678,188 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 "Encara teniu camins sense fusionar a l'índex.\n"
-"Heu de fer 'git add' a cada fitxer amb conflictes resolts per marcar-los com "
-"a tal.\n"
-"Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel "
+"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:1935 builtin/am.c:1939 builtin/am.c:1951 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1981 builtin/am.c:1985 builtin/am.c:1997 builtin/reset.c:347
+#: builtin/reset.c:355
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "No s'ha pogut analitzar l'objecte «%s»."
 
-#: builtin/am.c:1987
+#: builtin/am.c:2033
 msgid "failed to clean index"
 msgstr "s'ha produït un error en netejar l'índex"
 
-#: builtin/am.c:2031
+#: builtin/am.c:2077
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
-"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
+"Sembla que heu mogut HEAD després de l'última fallada de «am».\n"
 "No s'està rebobinant a ORIG_HEAD"
 
-#: builtin/am.c:2128
+#: builtin/am.c:2184
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor no vàlid per a --patch-format: %s"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2226
+#, fuzzy, c-format
+msgid "Invalid value for --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:2261
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
 
-#: builtin/am.c:2165
+#: builtin/am.c:2262
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opcions>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2171
+#: builtin/am.c:2268
 msgid "run interactively"
 msgstr "executa interactivament"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2270
 msgid "historical option -- no-op"
 msgstr "opció històrica -- no-op"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2272
 msgid "allow fall back on 3way merging if needed"
 msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
 
-#: builtin/am.c:2176 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:307 builtin/stash.c:806
+#: builtin/am.c:2273 builtin/init-db.c:546 builtin/prune-packed.c:16
+#: builtin/repack.c:472 builtin/stash.c:948
 msgid "be quiet"
 msgstr "silenciós"
 
-#: builtin/am.c:2178
-msgid "add a Signed-off-by line to the commit message"
+#: builtin/am.c:2275
+#, fuzzy
+msgid "add a Signed-off-by trailer to the commit message"
 msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2278
 msgid "recode into utf8 (default)"
 msgstr "recodifica en utf8 (per defecte)"
 
-#: builtin/am.c:2183
+#: builtin/am.c:2280
 msgid "pass -k flag to git-mailinfo"
 msgstr "passa l'indicador -k a git-mailinfo"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2282
 msgid "pass -b flag to git-mailinfo"
 msgstr "passa l'indicador -b a git-mailinfo"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2284
 msgid "pass -m flag to git-mailinfo"
 msgstr "passa l'indicador -m a git-mailinfo"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2286
 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:2192
+#: builtin/am.c:2289
 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"
 
-#: builtin/am.c:2195
+#: builtin/am.c:2292
 msgid "strip everything before a scissors line"
 msgstr "elimina tot abans d'una línia de tisores"
 
-#: builtin/am.c:2197 builtin/am.c:2200 builtin/am.c:2203 builtin/am.c:2206
-#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
-#: builtin/am.c:2224
+#: builtin/am.c:2294
+#, fuzzy
+msgid "pass it through git-mailinfo"
+msgstr "passa-ho a través de git-apply"
+
+#: 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
 msgid "pass it through git-apply"
 msgstr "passa-ho a través de git-apply"
 
-#: builtin/am.c:2214 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:881 builtin/merge.c:249
-#: builtin/pull.c:159 builtin/pull.c:218 builtin/rebase.c:1418
-#: builtin/repack.c:318 builtin/repack.c:322 builtin/repack.c:324
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:141 parse-options.h:162 parse-options.h:312
+#: 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
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2220 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:437 builtin/verify-tag.c:39
+#: 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
 msgid "format"
 msgstr "format"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2321
 msgid "format the patch(es) are in"
 msgstr "el format en el qual estan els pedaços"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2327
 msgid "override error message when patch failure occurs"
 msgstr "passa per alt el missatge d'error si falla l'aplicació del pedaç"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2329
 msgid "continue applying patches after resolving a conflict"
 msgstr "segueix aplicant pedaços després de resoldre un conflicte"
 
-#: builtin/am.c:2232
+#: builtin/am.c:2332
 msgid "synonyms for --continue"
 msgstr "sinònims de --continue"
 
-#: builtin/am.c:2235
+#: builtin/am.c:2335
 msgid "skip the current patch"
 msgstr "omet el pedaç actual"
 
-#: builtin/am.c:2238
-msgid "restore the original branch and abort the patching operation."
+#: builtin/am.c:2338
+#, fuzzy
+msgid "restore the original branch and abort the patching operation"
 msgstr "restaura la branca original i avorta l'operació d'apedaçament."
 
-#: builtin/am.c:2241
-msgid "abort the patching operation but keep HEAD where it is."
-msgstr ""
+#: builtin/am.c:2341
+#, fuzzy
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "avorta l'operació de pedaç però manté HEAD on és."
 
-#: builtin/am.c:2244
-msgid "show the patch being applied."
-msgstr "mostra el pedaç que s'està aplicant."
+#: builtin/am.c:2345
+#, fuzzy
+msgid "show the patch being applied"
+msgstr "mostra el pedaç que s'està aplicant"
 
-#: builtin/am.c:2248
+#: builtin/am.c:2350
 msgid "lie about committer date"
 msgstr "menteix sobre la data del comitent"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2352
 msgid "use current timestamp for author date"
 msgstr "usa el marc de temps actual per la data d'autor"
 
-#: builtin/am.c:2252 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:193 builtin/rebase.c:489
-#: builtin/rebase.c:1459 builtin/revert.c:117 builtin/tag.c:418
+#: 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
 msgid "key-id"
 msgstr "ID de clau"
 
-#: builtin/am.c:2253 builtin/rebase.c:490 builtin/rebase.c:1460
+#: builtin/am.c:2355 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
 msgstr "signa les comissions amb GPG"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2358
 msgid "(internal use for git-rebase)"
 msgstr "(ús intern per a git-rebase)"
 
-#: builtin/am.c:2274
+#: builtin/am.c:2376
 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."
@@ -8970,33 +10867,34 @@ msgstr ""
 "Fa molt que l'opció -b/--binary no ha fet res, i\n"
 "s'eliminarà. No l'useu més."
 
-#: builtin/am.c:2281
+#: builtin/am.c:2383
 msgid "failed to read the index"
 msgstr "S'ha produït un error en llegir l'índex"
 
-#: builtin/am.c:2296
+#: builtin/am.c:2398
 #, 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:2320
+#: builtin/am.c:2422
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 "S'ha trobat un directori %s extraviat.\n"
-"Useu \"git am --abort\" per a eliminar-lo."
+"Useu «git am --abort» per a eliminar-lo."
 
-#: builtin/am.c:2326
+#: builtin/am.c:2428
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Una operació de resolució no està en curs; no reprenem."
 
-#: builtin/am.c:2336
+#: builtin/am.c:2438
+#, fuzzy
 msgid "interactive mode requires patches on the command line"
-msgstr ""
+msgstr "el mode interactiu requereix pedaços a la línia d'ordres"
 
 #: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
@@ -9017,7 +10915,7 @@ msgstr "git archive: Remot sense URL"
 
 #: builtin/archive.c:61
 msgid "git archive: expected ACK/NAK, got a flush packet"
-msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
+msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de buidatge"
 
 #: builtin/archive.c:64
 #, c-format
@@ -9032,292 +10930,352 @@ msgstr "git archive: error de protocol"
 msgid "git archive: expected a flush"
 msgstr "git archive: s'esperava una neteja"
 
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
 #: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<comissió>]"
 
 #: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
 #, fuzzy
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr "git bisect--helper --bisect-clean-state"
+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:26
+#: builtin/bisect--helper.c:25
 #, fuzzy
 msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
+"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]"
 
-#: builtin/bisect--helper.c:27
+#: builtin/bisect--helper.c:26
 #, fuzzy
 msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
+"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>]"
 
 #: builtin/bisect--helper.c:28
 #, fuzzy
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
-msgstr "git bisect--helper --write-terms <mal_terme> <bon_terme>"
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-clean-state"
 
 #: builtin/bisect--helper.c:29
 #, fuzzy
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
-msgstr ""
-"paràmetre no vàlid $arg per a 'git bisect terms'.\n"
-"Les opcions admeses són: --term-good|--term-old i --term-bad|--term-new."
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr "git bisect--helper --bisect-reset [<comissió>]"
 
 #: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
-msgstr ""
+#, fuzzy
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-reset [<comissió>]"
+
+#: builtin/bisect--helper.c:31
+#, fuzzy
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-clean-state"
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:32
+#, fuzzy
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-reset [<comissió>]"
+
+#: builtin/bisect--helper.c:107
+#, fuzzy, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "no es pot copiar «%s» a «%s»"
+
+#: builtin/bisect--helper.c:114
+#, fuzzy, c-format
+msgid "could not write to file '%s'"
+msgstr "no s'ha pogut escriure el fitxer: «%s»"
+
+#: builtin/bisect--helper.c:153
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "«%s» no és un terme vàlid"
 
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:157
 #, 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:100
+#: builtin/bisect--helper.c:167
 #, 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:111
+#: builtin/bisect--helper.c:177
 msgid "please use two different terms"
 msgstr "useu dos termes distintes"
 
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "no s'ha pogut obrir el BISECT_TERMS"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:193
 #, fuzzy, c-format
 msgid "We are not bisecting.\n"
 msgstr "No estem bisecant."
 
-#: builtin/bisect--helper.c:163
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:201
+#, c-format
 msgid "'%s' is not a valid commit"
-msgstr "«%s» no és un terme vàlid"
+msgstr "«%s» no és una comissió vàlida"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:210
 #, fuzzy, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
-"No s'ha pogut agafar la HEAD original '$branch'.\n"
-"Proveu 'git bisect reset <comissió>'."
+"no s'ha pogut comprovar l'original HEAD «%s». Proveu «git bisect reset "
+"<commit>»."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:254
 #, fuzzy, c-format
 msgid "Bad bisect_write argument: %s"
-msgstr "Paràmetre bisect_write incorrecte: $state"
+msgstr "Arguments de bisectriu incorrectes"
 
-#: builtin/bisect--helper.c:220
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:259
+#, c-format
 msgid "couldn't get the oid of the rev '%s'"
-msgstr "no es pot canviar el significat del terme «%s»"
+msgstr "no s'ha pogut obtenir l'oid de la revisió «%s»"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:271
 #, fuzzy, c-format
 msgid "couldn't open the file '%s'"
-msgstr "no s'ha pogut crear el fitxer «%s»"
+msgstr "no s'ha pogut obrir el fitxer «%s»"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:297
 #, fuzzy, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr ""
-"Ordre no vàlida: actualment esteu en una bisecció $TERM_BAD/$TERM_GOOD."
+msgstr "Ordre no vàlida esteu actualment en un percentatge/%s bisect"
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:324
 #, fuzzy, 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 ""
-"Cal donar-me almenys una revisió $bad_syn i una $good_syn.\n"
-"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
+"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ò."
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:328
 #, fuzzy, 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 ""
-"Cal començar amb \"git bisect start\".\n"
-"Després cal donar-me almenys una revisió $good_syn i una $bad_syn.\n"
-"(Podeu usar \"git bisect $bad_syn\" i \"git bisect $good_syn\" per això.)"
+"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ò."
 
-#: builtin/bisect--helper.c:321
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:348
+#, c-format
 msgid "bisecting only with a %s commit"
-msgstr "Advertència: bisecant amb només comissió $TERM_BAD."
+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:329
+#: builtin/bisect--helper.c:356
 msgid "Are you sure [Y/n]? "
 msgstr "N'esteu segur [Y/n]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:417
 msgid "no terms defined"
 msgstr "cap terme definit"
 
-#: builtin/bisect--helper.c:379
-#, c-format
+#: builtin/bisect--helper.c:420
+#, fuzzy, 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."
 
-#: builtin/bisect--helper.c:389
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:430
+#, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
 "Supported options are: --term-good|--term-old and --term-bad|--term-new."
 msgstr ""
-"paràmetre no vàlid $arg per a 'git bisect terms'.\n"
+"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:475
+#: builtin/bisect--helper.c:497 builtin/bisect--helper.c:1021
+#, fuzzy
+msgid "revision walk setup failed\n"
+msgstr "la configuració del passeig per revisions ha fallat"
+
+#: builtin/bisect--helper.c:519
 #, fuzzy, c-format
+msgid "could not open '%s' for appending"
+msgstr "no s'ha pogut obrir «%s» per a lectura"
+
+#: builtin/bisect--helper.c:638 builtin/bisect--helper.c:651
+#, fuzzy
+msgid "'' is not a valid term"
+msgstr "«%s» no és un terme vàlid"
+
+#: builtin/bisect--helper.c:661
+#, c-format
 msgid "unrecognized option: '%s'"
-msgstr "posició no reconeguda:%s"
+msgstr "opció no reconeguda: «%s»"
 
-#: builtin/bisect--helper.c:479
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:665
+#, c-format
 msgid "'%s' does not appear to be a valid revision"
-msgstr "'$arg' no sembla una revisió vàlida"
+msgstr "«%s» no sembla ser una revisió vàlida"
 
-#: builtin/bisect--helper.c:511
-#, fuzzy
+#: builtin/bisect--helper.c:696
 msgid "bad HEAD - I need a HEAD"
 msgstr "HEAD incorrecte - Cal un HEAD"
 
-#: builtin/bisect--helper.c:526
-#, fuzzy, c-format
+#: builtin/bisect--helper.c:711
+#, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
-"L'agafament de '$start_head' ha fallat. Proveu 'git bisect reset <branca-"
-"vàlida>'."
+"l'agafament de «%s» ha fallat. Proveu «git bisect start <branca-vàlida>»."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:732
 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:550
+#: builtin/bisect--helper.c:735
 #, fuzzy
 msgid "bad HEAD - strange symbolic ref"
 msgstr "HEAD incorrecte - referència simbòlica estranya"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:755
 #, fuzzy, c-format
 msgid "invalid ref: '%s'"
-msgstr "fitxer no vàlid: «%s»"
+msgstr "ref '%s' no és vàlid"
 
-#: builtin/bisect--helper.c:630
-msgid "perform 'git bisect next'"
-msgstr "realitza 'git bisect next'"
+#: builtin/bisect--helper.c:813
+#, fuzzy
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Cal començar per «git bisect start»"
 
-#: builtin/bisect--helper.c:632
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "escriu els termes a .git/BISECT_TERMS"
+#. 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
+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:634
-msgid "cleanup the bisection state"
-msgstr "neteja l'estat de la bisecció"
+#: builtin/bisect--helper.c:842
+#, fuzzy
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Si us plau crideu `--bisect-state` amb almenys un argument"
 
-#: builtin/bisect--helper.c:636
-msgid "check for expected revs"
-msgstr "comprova les revisions esperades"
+#: builtin/bisect--helper.c:855
+#, fuzzy, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "«git bisect $TERM_BAD» pot acceptar només un argument."
 
-#: builtin/bisect--helper.c:638
-#, fuzzy
-msgid "reset the bisection state"
-msgstr "neteja l'estat de la bisecció"
+#: builtin/bisect--helper.c:867 builtin/bisect--helper.c:880
+#, fuzzy, c-format
+msgid "Bad rev input: %s"
+msgstr "Introducció de revisió errònia: $arg"
 
-#: builtin/bisect--helper.c:640
-#, fuzzy
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "neteja l'estat de la bisecció"
+#: builtin/bisect--helper.c:887
+#, fuzzy, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Introducció de revisió errònia: $arg"
+
+#: builtin/bisect--helper.c:919
+msgid "We are not bisecting."
+msgstr "No estem bisecant."
+
+#: builtin/bisect--helper.c:969
+#, fuzzy, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "?? de què parleu?"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:981
+#, fuzzy, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "no es pot llegir $file per a reproducció"
+
+#: builtin/bisect--helper.c:1054
 #, fuzzy
-msgid "check and set terms in a bisection state"
-msgstr "neteja l'estat de la bisecció"
+msgid "reset the bisection state"
+msgstr "restableix l'estat de la bisecció"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:1056
+#, fuzzy
 msgid "check whether bad or good terms exist"
-msgstr ""
+msgstr "comprova si existeixen termes incorrectes o bons"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:1058
 #, fuzzy
 msgid "print out the bisect terms"
-msgstr "imprimeix només les etiquetes de l'objecte"
+msgstr "imprimeix els termes de la bisectriu"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:1060
+#, fuzzy
 msgid "start the bisect session"
-msgstr ""
+msgstr "inicia la sessió bisect"
 
-#: builtin/bisect--helper.c:650
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "actualitza BISECT_HEAD en lloc d'agafar la comissió actual"
+#: builtin/bisect--helper.c:1062
+#, fuzzy
+msgid "find the next bisection commit"
+msgstr "no es pot esmenar una comissió no existent"
 
-#: builtin/bisect--helper.c:652
-msgid "no log for BISECT_WRITE"
+#: builtin/bisect--helper.c:1064
+#, fuzzy
+msgid "mark the state of ref (or refs)"
+msgstr "marca l'estat de ref (o refs)"
+
+#: builtin/bisect--helper.c:1066
+#, fuzzy
+msgid "list the bisection steps so far"
+msgstr "restableix l'estat de la bisecció"
+
+#: builtin/bisect--helper.c:1068
+msgid "replay the bisection process from the given file"
 msgstr ""
 
-#: builtin/bisect--helper.c:669
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms requereix dos paràmetres"
+#: builtin/bisect--helper.c:1070
+#, fuzzy
+msgid "skip some commits for checkout"
+msgstr "la branca o entrega a agafar"
 
-#: builtin/bisect--helper.c:673
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state no accepta paràmetres"
+#: builtin/bisect--helper.c:1072
+msgid "no log for BISECT_WRITE"
+msgstr "no hi ha registre per a BISECT_WRITE"
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:1087
 #, fuzzy
 msgid "--bisect-reset requires either no argument or a commit"
-msgstr "--bisect-clean-state no accepta paràmetres"
+msgstr "--bisect-reset no requereix cap argument ni una comissió"
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:1092
 #, fuzzy
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-clean-state no accepta paràmetres"
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check requereix 2 o 3 arguments"
 
-#: builtin/bisect--helper.c:690
-#, fuzzy
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--bisect-clean-state no accepta paràmetres"
+#: builtin/bisect--helper.c:1098
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms requereix 0 o 1 argument"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:1107
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next no requereix cap argument"
+
+#: builtin/bisect--helper.c:1118
 #, fuzzy
-msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-clean-state no accepta paràmetres"
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-next no requereix cap argument"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:1123
 #, fuzzy
-msgid "--bisect-terms requires 0 or 1 argument"
-msgstr "--write-terms requereix dos paràmetres"
+msgid "no logfile given"
+msgstr "Cap fitxer de registre donat"
 
 #: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
@@ -9328,158 +11286,179 @@ 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
-#, fuzzy, c-format
+#, c-format
 msgid "expecting a color: %s"
-msgstr "respecta els colors del format"
+msgstr "s'esperava un color: %s"
 
 #: builtin/blame.c:417
 msgid "must end with a color"
-msgstr ""
+msgstr "ha d'acabar amb un color"
 
-#: builtin/blame.c:730
-#, fuzzy, c-format
+#: builtin/blame.c:728
+#, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
+msgstr "color «%s» no vàlid en «color.blame.repeatedLines»"
 
-#: builtin/blame.c:748
-#, fuzzy
+#: builtin/blame.c:746
 msgid "invalid value for blame.coloring"
-msgstr "valor no vàlid per a --missing"
+msgstr "valor no vàlid per a «blame.coloring»"
 
-#: builtin/blame.c:823
-#, fuzzy, c-format
+#: builtin/blame.c:845
+#, c-format
 msgid "cannot find revision %s to ignore"
-msgstr "no s'ha pogut resoldre la revisió: %s"
+msgstr "no s'ha pogut trobar la revisió %s per ignorar"
 
-#: builtin/blame.c:845
-msgid "Show blame entries as we find them, incrementally"
+#: builtin/blame.c:867
+#, fuzzy
+msgid "show blame entries as we find them, incrementally"
 msgstr "Mostra les entrades «blame» mentre les trobem, incrementalment"
 
-#: builtin/blame.c:846
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: builtin/blame.c:868
+#, fuzzy
+msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
 "Mostra un SHA-1 en blanc per les comissions de frontera (Per defecte: "
 "desactivat)"
 
-#: builtin/blame.c:847
-msgid "Do not treat root commits as boundaries (Default: off)"
+#: builtin/blame.c:869
+#, fuzzy
+msgid "do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "No tractis les comissions d'arrel com a límits (Per defecte: desactivat)"
 
-#: builtin/blame.c:848
-msgid "Show work cost statistics"
+#: builtin/blame.c:870
+#, fuzzy
+msgid "show work cost statistics"
 msgstr "Mostra les estadístiques de preu de treball"
 
-#: builtin/blame.c:849
-msgid "Force progress reporting"
-msgstr "Força l'informe de progrés"
+#: 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
+msgid "force progress reporting"
+msgstr "força l'informe de progrés"
 
-#: builtin/blame.c:850
-msgid "Show output score for blame entries"
+#: builtin/blame.c:872
+#, fuzzy
+msgid "show output score for blame entries"
 msgstr "Mostra la puntuació de sortida de les entrades «blame»"
 
-#: builtin/blame.c:851
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+#, fuzzy
+msgid "show original filename (Default: auto)"
 msgstr "Mostra el nom de fitxer original (Per defecte: automàtic)"
 
-#: builtin/blame.c:852
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+#, fuzzy
+msgid "show original linenumber (Default: off)"
 msgstr "Mostra el número de línia original (Per defecte: desactivat)"
 
-#: builtin/blame.c:853
-msgid "Show in a format designed for machine consumption"
+#: builtin/blame.c:875
+#, fuzzy
+msgid "show in a format designed for machine consumption"
 msgstr "Presenta en un format dissenyat per consumpció per màquina"
 
-#: builtin/blame.c:854
-msgid "Show porcelain format with per-line commit information"
+#: builtin/blame.c:876
+#, fuzzy
+msgid "show porcelain format with per-line commit information"
 msgstr "Mostra el format de porcellana amb informació de comissió per línia"
 
-#: builtin/blame.c:855
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/blame.c:877
+#, fuzzy
+msgid "use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "Usa el mateix mode de sortida que git-annotate (Per defecte: desactivat)"
 
-#: builtin/blame.c:856
-msgid "Show raw timestamp (Default: off)"
+#: builtin/blame.c:878
+#, fuzzy
+msgid "show raw timestamp (Default: off)"
 msgstr "Mostra la marca de temps crua (Per defecte: desactivat)"
 
-#: builtin/blame.c:857
-msgid "Show long commit SHA1 (Default: off)"
+#: builtin/blame.c:879
+#, fuzzy
+msgid "show long commit SHA1 (Default: off)"
 msgstr "Mostra l'SHA1 de comissió llarg (Per defecte: desactivat)"
 
-#: builtin/blame.c:858
-msgid "Suppress author name and timestamp (Default: off)"
+#: builtin/blame.c:880
+#, fuzzy
+msgid "suppress author name and timestamp (Default: off)"
 msgstr "Omet el nom d'autor i la marca de temps (Per defecte: desactivat)"
 
-#: builtin/blame.c:859
-msgid "Show author email instead of name (Default: off)"
+#: builtin/blame.c:881
+#, fuzzy
+msgid "show author email instead of name (Default: off)"
 msgstr ""
 "Mostra l'adreça electrònica de l'autor en lloc del nom (Per defecte: "
 "desactivat)"
 
-#: builtin/blame.c:860
-msgid "Ignore whitespace differences"
+#: builtin/blame.c:882
+#, fuzzy
+msgid "ignore whitespace differences"
 msgstr "Ignora les diferències d'espai en blanc"
 
-#: builtin/blame.c:861 builtin/log.c:1646
+#: builtin/blame.c:883 builtin/log.c:1820
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:883
 #, fuzzy
-msgid "Ignore <rev> when blaming"
-msgstr "ignora l'índex en comprovar"
+msgid "ignore <rev> when blaming"
+msgstr "Ignora <rev> en culpar"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:884
 #, fuzzy
-msgid "Ignore revisions from <file>"
-msgstr "llegiu el missatge des d'un fitxer"
+msgid "ignore revisions from <file>"
+msgstr "Ignora les revisions de <file>"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:885
+#, fuzzy
 msgid "color redundant metadata from previous line differently"
-msgstr ""
+msgstr "color les metadades redundants de la línia anterior de manera diferent"
 
-#: builtin/blame.c:864
+#: builtin/blame.c:886
+#, fuzzy
 msgid "color lines by age"
-msgstr ""
+msgstr "coloreja les línies per edat"
 
-#: builtin/blame.c:871
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Usa un heurístic experimental per a millorar les diferències"
-
-#: builtin/blame.c:873
-msgid "Spend extra cycles to find better match"
+#: builtin/blame.c:887
+#, fuzzy
+msgid "spend extra cycles to find better match"
 msgstr "Gasta cicles extres per a trobar una coincidència millor"
 
-#: builtin/blame.c:874
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/blame.c:888
+#, fuzzy
+msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "Usa les revisions de <fitxer> en lloc d'invocar git-rev-list"
 
-#: builtin/blame.c:875
-msgid "Use <file>'s contents as the final image"
+#: builtin/blame.c:889
+#, fuzzy
+msgid "use <file>'s contents as the final image"
 msgstr "Usa els continguts de <fitxer> com a la imatge final"
 
-#: builtin/blame.c:876 builtin/blame.c:877
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "puntuació"
 
-#: builtin/blame.c:876
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+#, fuzzy
+msgid "find line copies within and across files"
 msgstr "Troba còpies de línia dins i a través dels fitxers"
 
-#: builtin/blame.c:877
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+#, fuzzy
+msgid "find line movements within and across files"
 msgstr "Troba moviments de línia dins i a través dels fitxers"
 
-#: builtin/blame.c:878
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "rang"
 
-#: builtin/blame.c:878
-msgid "Process only line range n,m, counting from 1"
+#: builtin/blame.c:893
+#, fuzzy
+msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr "Processa només el rang de línies n,m, comptant des d'1"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:945
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "no es pot usar --progress amb els formats --incremental o de porcellana"
@@ -9492,23 +11471,23 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr "fa 4 anys i 11 mesos"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1112
 #, 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:1133
+#: builtin/blame.c:1157
 msgid "Blaming lines"
 msgstr "S'està fent un «blame»"
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<opcions>] [-r | -a] [--merged | --no-merged]"
 
 #: builtin/branch.c:30
@@ -9567,128 +11546,117 @@ msgid ""
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr ""
 "La branca «%s» no està totalment fusionada.\n"
-"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
+"Si esteu segur que la voleu suprimir, executeu «git branch -D %s»."
 
 #: builtin/branch.c:189
 msgid "Update of config-file failed"
 msgstr "L'actualització del fitxer de configuració ha fallat"
 
-#: builtin/branch.c:220
+#: builtin/branch.c:223
 msgid "cannot use -a with -d"
 msgstr "no es pot usar -a amb -d"
 
-#: builtin/branch.c:226
+#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
 
-#: builtin/branch.c:240
+#: builtin/branch.c:244
 #, 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:255
+#: builtin/branch.c:259
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "no s'ha trobat la branca amb seguiment remot «%s»."
 
-#: builtin/branch.c:256
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
 msgstr "no s'ha trobat la branca «%s»."
 
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Error en suprimir la branca amb seguiment remot «%s»"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Error en suprimir la branca «%s»"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
 #, 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:280
+#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "S'ha suprimit la branca %s (era %s).\n"
 
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:440 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "no s'ha pogut analitzar la cadena de format"
 
-#: builtin/branch.c:460
-#, fuzzy
+#: builtin/branch.c:471
 msgid "could not resolve HEAD"
-msgstr "no s'ha pogut resoldre la comissió HEAD"
+msgstr "no s'ha pogut resoldre HEAD"
 
-#: builtin/branch.c:466
-#, fuzzy, c-format
+#: builtin/branch.c:477
+#, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
-msgstr "HEAD no trobat sota refs/heads!"
+msgstr "HEAD (%s) apunta fora de refs/heads/"
 
-#: builtin/branch.c:481
+#: builtin/branch.c:492
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "S'està fent «rebase» en la branca %s a %s"
 
-#: builtin/branch.c:485
+#: builtin/branch.c:496
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "La branca %s s'està bisecant a %s"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:513
 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:504
+#: builtin/branch.c:515
 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:515
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branca no vàlid: «%s»"
 
-#: builtin/branch.c:542
+#: builtin/branch.c:555
 msgid "Branch rename failed"
 msgstr "El canvi de nom de branca ha fallat"
 
-#: builtin/branch.c:544
+#: builtin/branch.c:557
 msgid "Branch copy failed"
 msgstr "La còpia de la branca ha fallat"
 
-#: builtin/branch.c:548
+#: builtin/branch.c:561
 #, 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:551
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:570
 #, 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:566
+#: builtin/branch.c:579
 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:568
+#: builtin/branch.c:581
 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:584
+#: builtin/branch.c:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -9699,241 +11667,388 @@ msgstr ""
 "  %s\n"
 "S'eliminaran les línies que comencin amb «%c».\n"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr "Opcions genèriques"
 
-#: builtin/branch.c:620
+#: builtin/branch.c:633
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr "omet els missatges informatius"
 
-#: builtin/branch.c:622
+#: 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:624
+#: builtin/branch.c:637
 msgid "do not use"
 msgstr "no usar"
 
-#: builtin/branch.c:626 builtin/rebase.c:485
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr "font"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr "canvia la informació de font"
 
-#: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "Desassigna la informació de font"
+#: builtin/branch.c:640
+#, fuzzy
+msgid "unset the upstream info"
+msgstr "treu la informació de la font"
 
-#: builtin/branch.c:628
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr "usa sortida colorada"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
 msgstr "actua en branques amb seguiment remot"
 
-#: 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 "imprimeix només les branques que continguin la comissió"
 
-#: 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 "imprimeix només les branques que no continguin la comissió"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
 msgstr "Accions de git-branch específiques:"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:651
 msgid "list both remote-tracking and local branches"
 msgstr "llista les branques amb seguiment remot i les locals"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr "suprimeix la branca si està completament fusionada"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:654
 msgid "delete branch (even if not merged)"
 msgstr "suprimeix la branca (encara que no estigui fusionada)"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:655
 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:643
+#: builtin/branch.c:656
 msgid "move/rename a branch, even if target exists"
 msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:657
 msgid "copy a branch and its reflog"
 msgstr "copia una branca i el seu registre de referència"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:658
 msgid "copy a branch, even if target exists"
 msgstr "copia una branca, encara que el destí existeixi"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr "llista els noms de branca"
 
-#: builtin/branch.c:647
-#, fuzzy
+#: builtin/branch.c:660
 msgid "show current branch name"
-msgstr "No hi ha cap branca actual."
+msgstr "mostra el nom de la branca actual"
 
-#: builtin/branch.c:648
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr "crea el registre de referència de la branca"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr "edita la descripció de la branca"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:664
 msgid "force creation, move/rename, deletion"
 msgstr "força creació, moviment/canvi de nom, supressió"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:665
 msgid "print only branches that are merged"
 msgstr "imprimeix només les branques que s'han fusionat"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:666
 msgid "print only branches that are not merged"
 msgstr "imprimeix només les branques que no s'han fusionat"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:667
 msgid "list branches in columns"
 msgstr "llista les branques en columnes"
 
-#: builtin/branch.c:657 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:433
+#: builtin/tag.c:477
 msgid "object"
 msgstr "objecte"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:670
 msgid "print only branches of the object"
 msgstr "imprimeix només les branques de l'objecte"
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
 msgid "sorting and filtering are case insensitive"
 msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
 
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
-#: builtin/verify-tag.c:39
+#: 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 "format a usar en la sortida"
 
-#: builtin/branch.c:684 builtin/clone.c:761
+#: builtin/branch.c:695 builtin/clone.c:794
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD no trobat sota refs/heads!"
 
-#: builtin/branch.c:708
+#: builtin/branch.c:719
 msgid "--column and --verbose are incompatible"
 msgstr "--column i --verbose són incompatibles"
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
 msgid "branch name required"
 msgstr "cal el nom de branca"
 
-#: builtin/branch.c:753
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
 msgstr "No es pot donar descripció a un HEAD separat"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:771
 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:765
+#: builtin/branch.c:778
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Encara no hi ha cap comissió en la branca «%s»."
 
-#: builtin/branch.c:768
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hi ha cap branca amb nom «%s»."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:796
 msgid "too many branches for a copy operation"
 msgstr "hi ha massa branques per a una operació de còpia"
 
-#: builtin/branch.c:792
+#: builtin/branch.c:805
 msgid "too many arguments for a rename operation"
-msgstr "hi ha massa arguments per a una operació remota"
+msgstr "hi ha massa arguments per a una operació de canvi de nom"
 
-#: builtin/branch.c:797
+#: builtin/branch.c:810
 msgid "too many arguments to set new upstream"
 msgstr "hi ha massa arguments per a establir una nova font"
 
-#: builtin/branch.c:801
+#: builtin/branch.c:814
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 "no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
 
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:817 builtin/branch.c:840
 #, c-format
 msgid "no such branch '%s'"
 msgstr "no existeix la branca «%s»"
 
-#: builtin/branch.c:808
+#: builtin/branch.c:821
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branca «%s» no existeix"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:834
 msgid "too many arguments to unset upstream"
 msgstr "hi ha massa arguments per a desassignar la font"
 
-#: builtin/branch.c:825
+#: builtin/branch.c:838
 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:831
+#: builtin/branch.c:844
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branca «%s» no té informació de font"
 
-#: builtin/branch.c:841
+#: builtin/branch.c:854
 #, fuzzy
 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 tenen sentit amb un nom de branca"
+"Les opcions -a i -r a «git branch» no prenen un nom de branca. Voleu usar -"
+"a|-r --list <pattern>?"
 
-#: builtin/branch.c:845
+#: builtin/branch.c:858
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgstr ""
-"L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-"
-"upstream-to."
+"L'opció --set-upstream ja no s'admet. En lloc seu, useu «--track» o «--set-"
+"upstream-to»."
+
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "versió de git:\n"
 
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
-msgstr "%s està bé\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() ha fallat amb l'error «%s» (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "informació del compilador: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "Informació de la libc: "
+
+#: builtin/bugreport.c:80
+#, fuzzy
+msgid "not run from a git repository - no hooks to show\n"
+msgstr "no és un repositori de git: %s"
+
+#: builtin/bugreport.c:90
+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
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"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."
+
+#: builtin/bugreport.c:136
+msgid "specify a destination for the bugreport file"
+msgstr "especifiqueu una destinació per al fitxer d'informe d'error"
+
+#: builtin/bugreport.c:138
+#, fuzzy
+msgid "specify a strftime format suffix for the filename"
+msgstr "especifiqueu un sufix de format strftime per al nom de fitxer"
+
+#: builtin/bugreport.c:160
+#, fuzzy, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "no s'han pogut crear els directoris inicials de «%s»"
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr "Informació del sistema"
+
+#: builtin/bugreport.c:170
+#, fuzzy
+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»"
+
+#: builtin/bugreport.c:180
+#, c-format
+msgid "unable to write to %s"
+msgstr "no s'ha pogut escriure a %s"
+
+#: builtin/bugreport.c:190
+#, fuzzy, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "S'ha netejat el directori «%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>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+#, fuzzy
+msgid "git bundle verify [<options>] <file>"
+msgstr "git pack verify [<opcions>] <file>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+#, fuzzy
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git pack list-heads <file> [<refname>]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+#, fuzzy
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle <file> [<refname>]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3747
+msgid "do not show progress meter"
+msgstr "no mostris l'indicador de progrés"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3749
+msgid "show progress meter"
+msgstr "mostra l'indicador de progrés"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3751
+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:58
+#: builtin/bundle.c:74 builtin/pack-objects.c:3754
+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
+msgid "specify bundle format version"
+msgstr "especifica la versió del format del paquet"
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
-msgstr "Cal un dipòsit per a fer un farcell."
+msgstr "Cal un repositori per a fer un farcell."
+
+#: builtin/bundle.c:107
+#, fuzzy
+msgid "do not show bundle details"
+msgstr "no mostris els detalls del paquet"
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:122
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s està bé\n"
+
+#: builtin/bundle.c:163
 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/cat-file.c:594
+#: builtin/bundle.c:193 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Subordre desconeguda: %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>"
@@ -9941,85 +12056,87 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:599
+#, fuzzy
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
 msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:616
+#: builtin/cat-file.c:620
 #, fuzzy
 msgid "only one batch option may be specified"
-msgstr "Cap nom de branca especificat"
+msgstr "només es pot especificar una opció per lots"
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:638
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:639
 msgid "show object type"
 msgstr "mostra el tipus de l'objecte"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:640
 msgid "show object size"
 msgstr "mostra la mida de l'objecte"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:642
 msgid "exit with zero when there's no error"
 msgstr "surt amb zero quan no hi ha error"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:643
 msgid "pretty-print object's content"
 msgstr "imprimeix bellament el contingut de l'objecte"
 
-#: builtin/cat-file.c:641
+#: builtin/cat-file.c:645
 msgid "for blob objects, run textconv on object's content"
 msgstr "en els objectes de blob, executa textconv en el contingut de l'objecte"
 
-#: builtin/cat-file.c:643
+#: builtin/cat-file.c:647
 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:644 git-submodule.sh:936
+#: builtin/cat-file.c:648
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:645
+#: builtin/cat-file.c:649
 msgid "use a specific path for --textconv/--filters"
 msgstr "usa un camí específic per a --textconv/--filters"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:651
 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:648
+#: builtin/cat-file.c:652
 msgid "buffer --batch output"
 msgstr "posa la sortida de --batch en memòria intermèdia"
 
-#: builtin/cat-file.c:650
+#: builtin/cat-file.c:654
 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:654
+#: builtin/cat-file.c:658
 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:658
+#: builtin/cat-file.c:662
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "segueix els enllaços simbòlics en l'arbre (s'usa amb --batch o --batch-check)"
 
-#: builtin/cat-file.c:660
+#: builtin/cat-file.c:664
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostra tots els objectes amb --batch o --batch-check"
 
-#: builtin/cat-file.c:662
+#: builtin/cat-file.c:666
+#, fuzzy
 msgid "do not order --batch-all-objects output"
-msgstr ""
+msgstr "no ordenar la sortida --batch-all-objects"
 
 #: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -10045,8 +12162,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:1433 builtin/gc.c:538
-#: builtin/worktree.c:507
+#: builtin/check-ignore.c:21 builtin/checkout.c:1520 builtin/gc.c:549
+#: builtin/worktree.c:491
 msgid "suppress progress reporting"
 msgstr "omet els informes de progrés"
 
@@ -10058,27 +12175,27 @@ msgstr "mostra els camins d'entrada que no coincideixin"
 msgid "ignore index when checking"
 msgstr "ignora l'índex en comprovar"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "no es poden especificar noms de camí amb --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z només té sentit amb --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "cap camí especificat"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet només és vàlid amb un sol nom de camí"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "no es poden especificar --quiet i --verbose alhora"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching és vàlid només amb --verbose"
 
@@ -10099,226 +12216,224 @@ msgstr "no s'ha pogut analitzar el contacte: %s"
 msgid "no contacts specified"
 msgstr "no hi ha contactes especificats"
 
-#: builtin/checkout-index.c:131
+#: builtin/checkout--worker.c:110
+#, fuzzy
+msgid "git checkout--worker [<options>]"
+msgstr "git checkout [<opcions>] <branca>"
+
+#: 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
+msgid "string"
+msgstr "cadena"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "en crear fitxers, anteposa <cadena>"
+
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr "«stage» ha de ser entre 1 i 3 o all"
 
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "agafa tots els fitxers en l'índex"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "força la sobreescriptura de fitxers existents"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "cap advertència per a fitxers existents i fitxers que no siguin a l'índex"
 
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "no agafis fitxers nous"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "llegeix la llista de camins des de l'entrada estàndard"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "escriu el contingut a fitxers temporals"
 
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:680
-msgid "string"
-msgstr "cadena"
-
-#: builtin/checkout-index.c:179
-msgid "when creating files, prepend <string>"
-msgstr "en crear fitxers, anteposa <cadena>"
-
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "copia els fitxers des de «stage» amb nom"
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opcions>] <branca>"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
 
-#: builtin/checkout.c:37
-#, fuzzy
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
-msgstr "git checkout [<opcions>] <branca>"
+msgstr "git switch [<options>] [<branch>]"
 
-#: builtin/checkout.c:42
-#, fuzzy
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
-msgstr "git checkout [<opcions>] [<branca>] -- <fitxer>..."
+msgstr "git restore [<opcions>] [--source=<branca>] <fitxer>..."
 
-#: builtin/checkout.c:172 builtin/checkout.c:211
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "el camí «%s» no té la nostra versió"
 
-#: builtin/checkout.c:174 builtin/checkout.c:213
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "el camí «%s» no té la seva versió"
 
-#: builtin/checkout.c:190
+#: builtin/checkout.c:208
 #, 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:240
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "el camí «%s» no té les versions necessàries"
 
-#: builtin/checkout.c:258
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "camí «%s»: no es pot fusionar"
 
-#: builtin/checkout.c:274
+#: builtin/checkout.c:294
 #, 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:374
+#: builtin/checkout.c:414
 #, fuzzy, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
-msgstr[0] "etiqueta de fusió incorrecta en la comissió «%s»"
-msgstr[1] "etiqueta de fusió incorrecta en la comissió «%s»"
+msgstr[0] "Conflicte de fusió recreat en un 1%"
+msgstr[1] "Conflictes de fusió recreats en un 1%"
 
-#: builtin/checkout.c:379
+#: builtin/checkout.c:419
 #, fuzzy, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
-msgstr[0] "actualitzat %d camí\n"
-msgstr[1] "actualitzats %d camins\n"
+msgstr[0] "Camí actualitzat d'un 1% des d'un 1%"
+msgstr[1] "Camins actualitzats a un 1% des d'un 1%"
 
-#: builtin/checkout.c:386
+#: builtin/checkout.c:426
 #, 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:409 builtin/checkout.c:412 builtin/checkout.c:415
-#: builtin/checkout.c:419
+#: builtin/checkout.c:449 builtin/checkout.c:452 builtin/checkout.c:455
+#: builtin/checkout.c:459
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "«%s» no es pot usar amb actualització de camins"
 
-#: builtin/checkout.c:422 builtin/checkout.c:425
+#: 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:429
+#: builtin/checkout.c:469
 #, 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:433
+#: builtin/checkout.c:473
 #, c-format
 msgid "neither '%s' or '%s' is specified"
-msgstr ""
+msgstr "no s'ha especificat ni «%s» ni «%s»"
 
-#: builtin/checkout.c:437
+#: builtin/checkout.c:477
 #, fuzzy, c-format
 msgid "'%s' must be used when '%s' is not specified"
-msgstr "«%s» no es pot usar amb «%s»"
+msgstr "«%s» s'ha d'utilitzar quan no s'especifica «%s»"
 
-#: builtin/checkout.c:442 builtin/checkout.c:447
-#, fuzzy, c-format
+#: builtin/checkout.c:482 builtin/checkout.c:487
+#, c-format
 msgid "'%s' or '%s' cannot be used with %s"
-msgstr "%s: %s no es pot usar amb %s"
+msgstr "«%s» o «%s» no poden utilitzar-se amb %s"
 
-#: builtin/checkout.c:506 builtin/checkout.c:513
+#: builtin/checkout.c:563 builtin/checkout.c:570
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "el camí «%s» està sense fusionar"
 
-#: builtin/checkout.c:679
+#: builtin/checkout.c:739
 msgid "you need to resolve your current index first"
 msgstr "heu de primer resoldre el vostre índex actual"
 
-#: builtin/checkout.c:729
-#, c-format
+#: builtin/checkout.c:793
+#, fuzzy, 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"
 
-#: builtin/checkout.c:736
-#, fuzzy, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr ""
-"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
-"%%s"
-
-#: builtin/checkout.c:833
+#: builtin/checkout.c:886
 #, 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:875
+#: builtin/checkout.c:928
 msgid "HEAD is now at"
 msgstr "HEAD ara és a"
 
-#: builtin/checkout.c:879 builtin/clone.c:714
+#: builtin/checkout.c:932 builtin/clone.c:725 t/helper/test-fast-rebase.c:202
 msgid "unable to update HEAD"
 msgstr "no s'ha pogut actualitzar HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:936
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Restableix la branca «%s»\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:939
 #, c-format
 msgid "Already on '%s'\n"
-msgstr "Ja en «%s»\n"
+msgstr "Ja esteu en «%s»\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:943
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "S'ha canviat i restablert a la branca «%s»\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:945 builtin/checkout.c:1376
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "S'ha canviat a la branca nova «%s»\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:947
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "S'ha canviat a la branca «%s»\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:998
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... i %d més.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:1004
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10341,7 +12456,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:1023
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10368,234 +12483,267 @@ msgstr[1] ""
 " git branch <nom-de-branca-nova> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1058
 msgid "internal error in revision walk"
 msgstr "error intern en el passeig per revisions"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1062
 msgid "Previous HEAD position was"
 msgstr "La posició de HEAD anterior era"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1102 builtin/checkout.c:1371
 msgid "You are on a branch yet to be born"
 msgstr "Sou en una branca que encara ha de néixer"
 
-#: builtin/checkout.c:1176
+#: builtin/checkout.c:1184
+#, fuzzy, 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"
+
+#: builtin/checkout.c:1191
 #, fuzzy
+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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"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ó."
+
+#: builtin/checkout.c:1201
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "«%s» coincideixen múltiples (%d) branques de seguiment remotes"
+
+#: builtin/checkout.c:1267
 msgid "only one reference expected"
-msgstr "s'esperava només una referència, s'han donat %d."
+msgstr "només s'esperava una referència"
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1284
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "s'esperava només una referència, s'han donat %d."
 
-#: builtin/checkout.c:1230
-#, 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:1243 builtin/worktree.c:291 builtin/worktree.c:456
+#: builtin/checkout.c:1330 builtin/worktree.c:270 builtin/worktree.c:438
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referència no vàlida: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1343 builtin/checkout.c:1709
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la referència no és un arbre: %s"
 
-#: builtin/checkout.c:1303
-#, fuzzy, c-format
+#: builtin/checkout.c:1390
+#, c-format
 msgid "a branch is expected, got tag '%s'"
-msgstr "no es pot llegir l'objecte %s «%s»"
+msgstr "s'espera una branca, s'ha obtingut l'etiqueta «%s»"
 
-#: builtin/checkout.c:1305
-#, fuzzy, c-format
+#: builtin/checkout.c:1392
+#, c-format
 msgid "a branch is expected, got remote branch '%s'"
-msgstr ""
-"La branca «%s» està configurada per a seguir la branca remota «%s» de «%s»."
+msgstr "s'espera una branca, s'ha obtingut la branca remota «%s»"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
-#, fuzzy, c-format
+#: builtin/checkout.c:1393 builtin/checkout.c:1401
+#, c-format
 msgid "a branch is expected, got '%s'"
-msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
+msgstr "s'espera una branca, s'ha obtingut «%s»"
 
-#: builtin/checkout.c:1309
-#, fuzzy, c-format
+#: builtin/checkout.c:1396
+#, c-format
 msgid "a branch is expected, got commit '%s'"
-msgstr "La vostra branca està al dia amb «%s».\n"
+msgstr "s'espera una branca, s'ha obtingut la comissió «%s»"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1412
+#, fuzzy
 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»."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1416
+#, fuzzy
 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\"."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1420
+#, fuzzy
 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»."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1424
+#, fuzzy
 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»."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1428
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgstr ""
+"no es pot canviar de branca mentre s'està revertint\n"
+"Considereu «git revert --quit» o «git worktree add»."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1432
 #, fuzzy
 msgid "you are switching branch while bisecting"
-msgstr "Actualment esteu bisecant."
+msgstr "s'està canviant la branca mentre es bisect"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1439
 msgid "paths cannot be used with switching branches"
 msgstr "els camins no es poden usar amb canvi de branca"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1442 builtin/checkout.c:1446 builtin/checkout.c:1450
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "«%s» no es pot usar amb canvi de branca"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1454 builtin/checkout.c:1457 builtin/checkout.c:1460
+#: builtin/checkout.c:1465 builtin/checkout.c:1470
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "«%s» no es pot usar amb «%s»"
 
-#: builtin/checkout.c:1380
-#, fuzzy, c-format
+#: builtin/checkout.c:1467
+#, c-format
 msgid "'%s' cannot take <start-point>"
-msgstr "«%s» no es pot usar amb actualització de camins"
+msgstr "«%s» no pot prendre <start-point>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1475
 #, 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:1395
-#, fuzzy
+#: builtin/checkout.c:1482
 msgid "missing branch or commit argument"
-msgstr "Manca el nom de branca; proveu -b"
-
-#: builtin/checkout.c:1437 builtin/clone.c:91 builtin/fetch.c:151
-#: builtin/merge.c:285 builtin/pull.c:137 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "força l'informe de progrés"
+msgstr "manca branca o argument de comissió"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1525
 msgid "perform a 3-way merge with the new branch"
 msgstr "realitza una fusió de 3 vies amb la branca nova"
 
-#: builtin/checkout.c:1439 builtin/log.c:1634 parse-options.h:318
+#: builtin/checkout.c:1526 builtin/log.c:1807 parse-options.h:323
 msgid "style"
 msgstr "estil"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1527
 msgid "conflict style (merge or diff3)"
 msgstr "estil de conflicte (fusió o diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:504
+#: builtin/checkout.c:1539 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "separa HEAD a la comissió anomenada"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1540
 msgid "set upstream info for new branch"
 msgstr "estableix la informació de font de la branca nova"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1542
 msgid "force checkout (throw away local modifications)"
 msgstr "agafa a la força (descarta qualsevol modificació local)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1544
 msgid "new-branch"
 msgstr "branca-nova"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1544
 msgid "new unparented branch"
 msgstr "branca òrfena nova"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1546 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr "actualitza els fitxers ignorats (per defecte)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1549
 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:1475
+#: builtin/checkout.c:1562
 msgid "checkout our version for unmerged files"
 msgstr "agafa la versió nostra dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1565
 msgid "checkout their version for unmerged files"
 msgstr "agafa la versió seva dels fitxers sense fusionar"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1569
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "no limitis les especificacions de camí només a entrades disperses"
 
-#: builtin/checkout.c:1533
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B i --orphan són mútuament excloents"
+#: builtin/checkout.c:1624
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c i --orphan són mútuament excloents"
 
-#: builtin/checkout.c:1536
-#, fuzzy
+#: builtin/checkout.c:1628
 msgid "-p and --overlay are mutually exclusive"
-msgstr "-n i -k són mútuament excloents."
+msgstr "-p i --overlay són mútuament excloents"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1665
 msgid "--track needs a branch name"
 msgstr "--track necessita un nom de branca"
 
-#: builtin/checkout.c:1578
-#, fuzzy
-msgid "missing branch name; try -b"
-msgstr "Manca el nom de branca; proveu -b"
+#: builtin/checkout.c:1670
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "falta el nom de la branca; proveu -%c"
 
-#: builtin/checkout.c:1611
-#, fuzzy, c-format
+#: builtin/checkout.c:1702
+#, c-format
 msgid "could not resolve %s"
-msgstr "no s'ha pogut resoldre «%s»"
+msgstr "no es pot resoldre %s"
 
-#: builtin/checkout.c:1623
-#, fuzzy
-msgid "you must specify path(s) to restore"
-msgstr "Heu d'especificar un directori."
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1718
 msgid "invalid path specification"
 msgstr "especificació de camí no vàlida"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1725
 #, 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:1642
+#: builtin/checkout.c:1729
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»"
+msgstr "git checkout: --detach no accepta un 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:1646
+#: builtin/checkout.c:1754
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10603,132 +12751,108 @@ msgstr ""
 "git checkout: --ours/--theirs, --force i --merge són incompatibles en\n"
 "agafar de l'índex."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
+#: builtin/checkout.c:1759
+msgid "you must specify path(s) to restore"
+msgstr "heu d'especificar el camí o camins a restaurar"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1733
-#: builtin/checkout.c:1735 builtin/clone.c:121 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:500 builtin/worktree.c:502
+#: 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
 msgid "branch"
 msgstr "branca"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1786
 msgid "create and checkout a new branch"
 msgstr "crea i agafa una branca nova"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1788
 msgid "create/reset and checkout a branch"
 msgstr "crea/restableix i agafa una branca"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1789
 msgid "create reflog for new branch"
 msgstr "crea un registre de referència per a la branca nova"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1791
 #, fuzzy
 msgid "second guess 'git checkout <no-such-branch>' (default)"
-msgstr "dubta 'git checkout <cap-branca-així>'"
+msgstr "segon conjectura «git checkout <no-such-branch>» (per defecte)"
 
-#: builtin/checkout.c:1698
-#, fuzzy
+#: builtin/checkout.c:1792
 msgid "use overlay mode (default)"
-msgstr "poda les referències soltes (per defecte)"
+msgstr "utilitza el mode de superposició (per defecte)"
 
-#: builtin/checkout.c:1734
-#, fuzzy
+#: builtin/checkout.c:1837
 msgid "create and switch to a new branch"
-msgstr "crea i agafa una branca nova"
+msgstr "crea i canvia a una branca nova"
 
-#: builtin/checkout.c:1736
-#, fuzzy
+#: builtin/checkout.c:1839
 msgid "create/reset and switch to a branch"
-msgstr "crea/restableix i agafa una branca"
+msgstr "crea/restableix i canvia a una branca"
 
-#: builtin/checkout.c:1738
+#: builtin/checkout.c:1841
 #, fuzzy
 msgid "second guess 'git switch <no-such-branch>'"
-msgstr "dubta 'git checkout <cap-branca-així>'"
+msgstr "segon conjectura «git switch <no-such-branch>»"
 
-#: builtin/checkout.c:1740
-#, fuzzy
+#: builtin/checkout.c:1843
 msgid "throw away local modifications"
-msgstr "agafa a la força (descarta qualsevol modificació local)"
+msgstr "descarta les modificacions locals"
 
-#: builtin/checkout.c:1772
+#: builtin/checkout.c:1877
 #, fuzzy
-msgid "where the checkout from"
-msgstr "llegeix l'objecte des de stdin"
+msgid "which tree-ish to checkout from"
+msgstr "de quin arbre agafar"
 
-#: builtin/checkout.c:1774
-#, fuzzy
+#: builtin/checkout.c:1879
 msgid "restore the index"
-msgstr "S'ha produït un error en llegir l'índex"
+msgstr "restaura l'índex"
 
-#: builtin/checkout.c:1776
-#, fuzzy
+#: builtin/checkout.c:1881
 msgid "restore the working tree (default)"
-msgstr "Mostra l'estat de l'arbre de treball"
+msgstr "restaura l'arbre de treball (per defecte)"
 
-#: builtin/checkout.c:1778
-#, fuzzy
+#: builtin/checkout.c:1883
 msgid "ignore unmerged entries"
-msgstr "s'està ignorant %s no fusionat\n"
+msgstr "ignora les entrades sense fusionar"
 
-#: builtin/checkout.c:1779
+#: builtin/checkout.c:1884
 msgid "use overlay mode"
-msgstr ""
+msgstr "utilitza el mode de superposició"
 
-#: builtin/clean.c:28
+#: 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 <patró>] [-x | -X] [--] <camins>..."
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "S'està eliminant %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Eliminaria %s\n"
 
-#: builtin/clean.c:34
+#: 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:35
+#: 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:36
+#: builtin/clean.c:38
 #, c-format
-msgid "failed to remove %s"
-msgstr "s'ha produït un error en eliminar %s"
-
-#: builtin/clean.c:37
-#, fuzzy, c-format
 msgid "could not lstat %s\n"
-msgstr "no s'ha pogut fer stat a %s"
+msgstr "no s'ha pogut fer lstat %s\n"
 
-#: builtin/clean.c:300 git-add--interactive.perl:593
+#: builtin/clean.c:302 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10741,7 +12865,7 @@ msgstr ""
 "foo        - selecciona un ítem basat en un prefix únic\n"
 "           - (buit) no seleccionis res\n"
 
-#: builtin/clean.c:304 git-add--interactive.perl:602
+#: builtin/clean.c:306 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10762,38 +12886,33 @@ msgstr ""
 "*          - tria tots els ítems\n"
 "           - (buit) finalitza la selecció\n"
 
-#: builtin/clean.c:520 git-add--interactive.perl:568
+#: builtin/clean.c:521 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:662
+#: builtin/clean.c:661
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Introduïu els patrons a ignorar>> "
 
-#: builtin/clean.c:699
+#: builtin/clean.c:696
 #, 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:720
+#: builtin/clean.c:717
 msgid "Select items to delete"
 msgstr "Selecciona els ítems a suprimir"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:761
+#: builtin/clean.c:758
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Voleu eliminar %s [y/N]? "
 
-#: builtin/clean.c:786 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Adéu.\n"
-
-#: builtin/clean.c:794
+#: builtin/clean.c:789
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10804,71 +12923,59 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 "clean               - comença a netejar\n"
-"filter by pattern   - exclou ítems de supressió\n"
+"filter by pattern   - exclou ítems de la supressió\n"
 "select by numbers   - selecciona ítems a suprimir per números\n"
-"ask each            - confirma cada supressió (com \"rm -i\")\n"
+"ask each            - confirma cada supressió (com «rm -i»)\n"
 "quit                - deixa de netejar\n"
 "help                - aquesta pantalla\n"
 "?                   - ajuda de selecció de l'avís"
 
-#: builtin/clean.c:821 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Ordres ***"
-
-#: builtin/clean.c:822 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "I ara què"
-
-#: builtin/clean.c:830
+#: builtin/clean.c:825
 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:846
+#: builtin/clean.c:841
 msgid "No more files to clean, exiting."
 msgstr "No hi ha més fitxers a netejar; s'està sortint."
 
-#: builtin/clean.c:908
+#: builtin/clean.c:903
 msgid "do not print names of files removed"
 msgstr "no imprimeixis els noms dels fitxers eliminats"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:905
 msgid "force"
 msgstr "força"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:906
 msgid "interactive cleaning"
 msgstr "neteja interactiva"
 
-#: builtin/clean.c:913
+#: builtin/clean.c:908
 msgid "remove whole directories"
 msgstr "elimina directoris sencers"
 
-#: builtin/clean.c:914 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:899 builtin/log.c:186 builtin/log.c:188
-#: builtin/ls-files.c:557 builtin/name-rev.c:413 builtin/name-rev.c:415
+#: 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
 msgid "pattern"
 msgstr "patró"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:910
 msgid "add <pattern> to ignore rules"
 msgstr "afegiu <patró> per a ignorar les regles"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:911
 msgid "remove ignored files, too"
 msgstr "elimina els fitxers ignorats, també"
 
-#: builtin/clean.c:918
+#: builtin/clean.c:913
 msgid "remove only ignored files"
 msgstr "elimina només els fitxers ignorats"
 
-#: builtin/clean.c:936
-msgid "-x and -X cannot be used together"
-msgstr "-x i -X no es poden usar junts"
-
-#: builtin/clean.c:940
+#: builtin/clean.c:929
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -10876,7 +12983,7 @@ msgstr ""
 "clean.requireForce està establerta en cert i ni -i, -n ni -f s'han indicat; "
 "refusant netejar"
 
-#: builtin/clean.c:943
+#: builtin/clean.c:932
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -10884,162 +12991,179 @@ msgstr ""
 "clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
 "refusant netejar"
 
-#: builtin/clone.c:46
+#: builtin/clean.c:944
+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:93
+#: builtin/clone.c:96
+#, fuzzy
+msgid "don't clone shallow repository"
+msgstr "per a clonar des d'un repositori local"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "no facis cap agafament"
 
-#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:489
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:541
 msgid "create a bare repository"
-msgstr "crea un dipòsit nu"
+msgstr "crea un repositori nu"
 
-#: builtin/clone.c:98
+#: 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:100
+#: 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:102
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "no usis enllaços durs locals, sempre copia"
 
-#: builtin/clone.c:104
+#: 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:107
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "especificació de camí"
 
-#: builtin/clone.c:107
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "inicialitza els submòduls en el clon"
 
-#: builtin/clone.c:110
+#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de submòduls clonats en paral·lel"
 
-#: builtin/clone.c:111 builtin/init-db.c:486
+#: builtin/clone.c:116 builtin/init-db.c:538
 msgid "template-directory"
 msgstr "directori-de-plantilla"
 
-#: builtin/clone.c:112 builtin/init-db.c:487
+#: builtin/clone.c:117 builtin/init-db.c:539
 msgid "directory from which templates will be used"
 msgstr "directori des del qual s'usaran les plantilles"
 
-#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:119 builtin/clone.c:121 builtin/submodule--helper.c:1832
+#: builtin/submodule--helper.c:2337
 msgid "reference repository"
-msgstr "dipòsit de referència"
+msgstr "repositori de referència"
 
-#: builtin/clone.c:118 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:123 builtin/submodule--helper.c:1834
+#: builtin/submodule--helper.c:2339
 msgid "use --reference only while cloning"
 msgstr "usa --reference només en clonar"
 
-#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3308 builtin/repack.c:330
+#: 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
 msgid "name"
 msgstr "nom"
 
-#: builtin/clone.c:120
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
-msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
+msgstr "usa <nom> en lloc d'«origin» per a seguir la font"
 
-#: builtin/clone.c:122
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "agafa <branca> en lloc de la HEAD del remot"
 
-#: builtin/clone.c:124
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "camí a git-upload-pack en el remot"
 
-#: builtin/clone.c:125 builtin/fetch.c:152 builtin/grep.c:838
-#: builtin/pull.c:226
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:863
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "profunditat"
 
-#: builtin/clone.c:126
+#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr "crea un clon superficial de tal profunditat"
 
-#: builtin/clone.c:127 builtin/fetch.c:154 builtin/pack-objects.c:3297
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3804
+#: builtin/pull.c:211
 msgid "time"
 msgstr "hora"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr "crea un clon superficial des d'una hora específica"
 
-#: builtin/clone.c:129 builtin/fetch.c:156 builtin/fetch.c:179
-#: builtin/rebase.c:1395
+#: 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 "revisió"
 
-#: builtin/clone.c:130 builtin/fetch.c:157
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
 
-#: builtin/clone.c:132
+#: builtin/clone.c:137 builtin/submodule--helper.c:1844
+#: builtin/submodule--helper.c:2353
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clona només una branca, HEAD o --branch"
 
-#: builtin/clone.c:134
+#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen"
 
-#: builtin/clone.c:136
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "qualsevol submòdul clonat serà superficial"
 
-#: builtin/clone.c:137 builtin/init-db.c:495
+#: builtin/clone.c:142 builtin/init-db.c:547
 msgid "gitdir"
 msgstr "directori de git"
 
-#: builtin/clone.c:138 builtin/init-db.c:496
+#: builtin/clone.c:143 builtin/init-db.c:548
 msgid "separate git dir from working tree"
 msgstr "separa el directori de git de l'arbre de treball"
 
-#: builtin/clone.c:139
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "clau=valor"
 
-#: builtin/clone.c:140
+#: 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:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: 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
 msgid "server-specific"
 msgstr "específic al servidor"
 
-#: builtin/clone.c:142 builtin/fetch.c:174 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: 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
 msgid "option to transmit"
 msgstr "opció a transmetre"
 
-#: builtin/clone.c:143 builtin/fetch.c:175 builtin/pull.c:239
-#: builtin/push.c:586
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/push.c:585
 msgid "use IPv4 addresses only"
 msgstr "usa només adreces IPv4"
 
-#: builtin/clone.c:145 builtin/fetch.c:177 builtin/pull.c:242
-#: builtin/push.c:588
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/push.c:587
 msgid "use IPv6 addresses only"
 msgstr "usa només adreces IPv6"
 
-#: builtin/clone.c:149
-#, fuzzy
+#: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
-msgstr "qualsevol submòdul clonat serà superficial"
+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"
+msgstr ""
+"inicialitza el fitxer «sparse-checkout» per a incloure només els fitxers a "
+"l'arrel"
 
-#: builtin/clone.c:285
+#: builtin/clone.c:292
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11047,149 +13171,152 @@ msgstr ""
 "No s'ha pogut endevinar cap nom de directori.\n"
 "Especifiqueu un directori en la línia d'ordres"
 
-#: builtin/clone.c:338
+#: builtin/clone.c:345
 #, 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:411
+#: builtin/clone.c:418
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existeix i no és directori"
 
-#: builtin/clone.c:428
+#: builtin/clone.c:436
 #, fuzzy, c-format
 msgid "failed to start iterator over '%s'"
-msgstr "no s'ha pogut escriure a «%s»"
-
-#: builtin/clone.c:453
-#, c-format
-msgid "failed to unlink '%s'"
-msgstr "s'ha produït un error en desenllaçar «%s»"
+msgstr "no s'ha pogut iniciar l'iterador per sobre de «%s»"
 
-#: builtin/clone.c:458
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "s'ha produït un error en crear l'enllaç «%s»"
 
-#: builtin/clone.c:462
+#: builtin/clone.c:471
 #, 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:467
-#, fuzzy, c-format
+#: builtin/clone.c:476
+#, c-format
 msgid "failed to iterate over '%s'"
-msgstr "s'ha produït un error en eliminar «%s»"
+msgstr "no s'ha pogut iterar sobre «%s»"
 
-#: builtin/clone.c:492
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr "fet.\n"
 
-#: builtin/clone.c:506
+#: builtin/clone.c:517
 #, fuzzy
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
 "and retry with 'git restore --source=HEAD :/'\n"
 msgstr ""
-"El clonatge ha tingut èxit, però l'agafament ha\n"
-"fallat. Podeu inspeccionar què s'ha agafat amb\n"
-"'git status' i tornar a intentar l'agafament amb\n"
-"'git checkout -f HEAD'\n"
+"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 /»"
 
-#: builtin/clone.c:583
+#: builtin/clone.c:594
 #, 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:702
+#: builtin/clone.c:713
 #, c-format
 msgid "unable to update %s"
 msgstr "no s'ha pogut actualitzar %s"
 
-#: builtin/clone.c:752
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "no s'ha pogut inicialitzar «sparse-checkout»"
+
+#: builtin/clone.c:784
 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:783
+#: builtin/clone.c:816
 msgid "unable to checkout working tree"
 msgstr "no s'ha pogut agafar l'arbre de treball"
 
-#: builtin/clone.c:833
+#: builtin/clone.c:894
 msgid "unable to write parameters to config file"
 msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
 
-#: builtin/clone.c:896
+#: builtin/clone.c:957
 msgid "cannot repack to clean up"
 msgstr "no es pot reempaquetar per a netejar"
 
-#: builtin/clone.c:898
+#: builtin/clone.c:959
 msgid "cannot unlink temporary alternates file"
 msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
 
-#: builtin/clone.c:938 builtin/receive-pack.c:1950
+#: builtin/clone.c:1001 builtin/receive-pack.c:2491
 msgid "Too many arguments."
-msgstr "Hi ha massa paràmetres."
+msgstr "Hi ha massa arguments."
 
-#: builtin/clone.c:942
+#: builtin/clone.c:1005
 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:955
+#: builtin/clone.c:1018
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les opcions --bare i --origin %s són incompatibles."
 
-#: builtin/clone.c:958
+#: builtin/clone.c:1021
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare i --separate-git-dir són incompatibles."
 
-#: builtin/clone.c:971
+#: builtin/clone.c:1035
 #, c-format
 msgid "repository '%s' does not exist"
-msgstr "el dipòsit «%s» no existeix"
+msgstr "el repositori «%s» no existeix"
 
-#: builtin/clone.c:977 builtin/fetch.c:1653
+#: builtin/clone.c:1039 builtin/fetch.c:2011
 #, c-format
 msgid "depth %s is not a positive number"
-msgstr "la profunditat %s no és nombre positiu"
+msgstr "la profunditat %s no és un nombre positiu"
 
-#: builtin/clone.c:987
+#: builtin/clone.c:1049
 #, 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:997
+#: builtin/clone.c:1055
+#, 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
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "l'arbre de treball «%s» ja existeix."
 
-#: builtin/clone.c:1012 builtin/clone.c:1033 builtin/difftool.c:264
-#: builtin/worktree.c:303 builtin/worktree.c:335
+#: builtin/clone.c:1084 builtin/clone.c:1105 builtin/difftool.c:272
+#: builtin/log.c:1995 builtin/worktree.c:282 builtin/worktree.c:314
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "no s'han pogut crear els directoris inicials de «%s»"
 
-#: builtin/clone.c:1017
+#: builtin/clone.c:1089
 #, 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:1037
+#: builtin/clone.c:1109
 #, 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:1039
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "S'està clonant a «%s»...\n"
 
-#: builtin/clone.c:1063
+#: builtin/clone.c:1135
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11197,40 +13324,45 @@ msgstr ""
 "clone --recursive no és compatible amb ambdós --reference i --reference-if-"
 "able"
 
-#: builtin/clone.c:1124
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "«%s» no és un nom de remot vàlid"
+
+#: builtin/clone.c:1229
 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:1126
+#: builtin/clone.c:1231
 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:1128
+#: builtin/clone.c:1233
 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:1130
+#: builtin/clone.c:1235
 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:1133
+#: builtin/clone.c:1240
 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:1138
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr "--local s'ignora"
 
-#: builtin/clone.c:1215 builtin/clone.c:1223
+#: builtin/clone.c:1337 builtin/clone.c:1345
 #, 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:1226
+#: builtin/clone.c:1348
 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>]"
@@ -11245,95 +13377,208 @@ msgid "layout to use"
 msgstr "disposició a usar"
 
 #: builtin/column.c:30
-msgid "Maximum width"
+#, fuzzy
+msgid "maximum width"
 msgstr "Amplada màxima"
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
+#, fuzzy
+msgid "padding space on left border"
 msgstr "Espai d'encoixinada en el marge esquerre"
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
+#, fuzzy
+msgid "padding space on right border"
 msgstr "Espai d'encoixinada en el marge dret"
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
+#, fuzzy
+msgid "padding space between columns"
 msgstr "Espai d'encoixinada entre columnes"
 
 #: builtin/column.c:51
 msgid "--command must be the first argument"
-msgstr "--command ha de ser el primer paràmetre"
+msgstr "--command ha de ser el primer 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
+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 <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"
+
+#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
+#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1776
+msgid "dir"
+msgstr "directori"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+#, fuzzy
+msgid "the object directory to store the graph"
+msgstr "El directori d'objectes per a emmagatzemar el gràfic"
+
+#: builtin/commit-graph.c:83
+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
+#, 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
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "argument --split no reconegut, %s"
+
+#: builtin/commit-graph.c:155
+#, fuzzy, 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"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "no és un objecte vàlid: %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "comença a caminar en totes les referències"
+
+#: builtin/commit-graph.c:215
+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
+msgid "start walk at commits listed by stdin"
+msgstr "comença a caminar a les comissions llistades per a stdin"
+
+#: builtin/commit-graph.c:219
+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
+msgid "enable computation for changed paths"
+msgstr "habilita la computació per als camins canviats"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "permet escriure un fitxer de graf de comissions incrementals"
+
+#: builtin/commit-graph.c:228
+#, fuzzy
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "nombre màxim de comissions en un graf de comissions no basat"
+
+#: builtin/commit-graph.c:230
+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
+msgid "only expire files older than a given date-time"
+msgstr "fes caducar els objectes més antics que l'hora i data donades"
+
+#: builtin/commit-graph.c:234
+#, fuzzy
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr ""
+"S'estan calculant els canvis les rutes de la comissió en els filtres Bloom"
+
+#: builtin/commit-graph.c:255
+#, fuzzy
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "usa com a màxim un dels --reachable --stdin-commits o --stdin-packs"
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr "S'estan recollint les comissions de l'entrada"
 
 #: 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[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
 
 #: builtin/commit-tree.c:31
-#, fuzzy, c-format
+#, c-format
 msgid "duplicate parent %s ignored"
-msgstr "suprimeix les referències reemplaçades"
+msgstr "s'han ignorat el pare %s duplicat"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:542
-#, fuzzy, c-format
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:559
+#, c-format
 msgid "not a valid object name %s"
-msgstr "no és un nom d'objecte vàlid: %s"
+msgstr "no és un nom d'objecte vàlid %s"
 
 #: builtin/commit-tree.c:93
-#, fuzzy, c-format
+#, c-format
 msgid "git commit-tree: failed to open '%s'"
-msgstr "s'ha produït un error en obrir «%s»"
+msgstr "git commit-tree: ha fallat en obrir «%s»"
 
 #: builtin/commit-tree.c:96
-#, fuzzy, c-format
+#, c-format
 msgid "git commit-tree: failed to read '%s'"
-msgstr "git write-tree ha fallat en escriure un arbre"
+msgstr "git commit-tree: ha fallat en llegir «%s»"
 
 #: builtin/commit-tree.c:98
-#, fuzzy, c-format
+#, c-format
 msgid "git commit-tree: failed to close '%s'"
-msgstr "git write-tree ha fallat en escriure un arbre"
+msgstr "git commit-tree: ha fallat en tancar «%s»"
 
 #: builtin/commit-tree.c:111
-#, fuzzy
 msgid "parent"
 msgstr "pare"
 
 #: builtin/commit-tree.c:112
-#, fuzzy
 msgid "id of a parent commit object"
-msgstr "s'ha produït un error en escriure l'objecte de comissió"
+msgstr "id d'un objecte de comissió pare"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1460
-#: builtin/tag.c:412
+#: 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
 msgid "message"
 msgstr "missatge"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1614
 msgid "commit message"
 msgstr "missatge de comissió"
 
 #: builtin/commit-tree.c:118
-#, fuzzy
 msgid "read commit log message from file"
-msgstr "llegiu el missatge des d'un fitxer"
+msgstr "llegeix el missatge de registre de comissió des d'un fitxer"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:194 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1631 builtin/merge.c:299
+#: builtin/pull.c:176 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "signa la comissió amb GPG"
 
 #: builtin/commit-tree.c:133
-#, fuzzy
 msgid "must give exactly one tree"
-msgstr "Cal exactament un rang."
+msgstr "ha de donar exactament un arbre"
 
 #: builtin/commit-tree.c:140
-#, fuzzy
 msgid "git commit-tree: failed to read"
-msgstr "git write-tree ha fallat en escriure un arbre"
+msgstr "git commit-tree: ha fallat en llegir"
 
 #: builtin/commit.c:41
 msgid "git commit [<options>] [--] <pathspec>..."
@@ -11351,7 +13596,7 @@ msgid ""
 msgstr ""
 "Heu demanat esmenar la comissió més recent, però fer això la\n"
 "deixaria buida. Podeu repetir la vostra ordre amb --allow-empty, o\n"
-"podeu eliminar la comissió per complet amb \"git reset HEAD^\".\n"
+"podeu eliminar la comissió per complet amb «git reset HEAD^».\n"
 
 #: builtin/commit.c:56
 msgid ""
@@ -11361,19 +13606,23 @@ msgid ""
 "    git commit --allow-empty\n"
 "\n"
 msgstr ""
-"El «cherry pick» previ ja està buit, possiblement a causa de resolució de "
-"conflicte.\n"
+"El «cherry pick» previ 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
-#, fuzzy
-msgid "Otherwise, please use 'git cherry-pick --skip'\n"
-msgstr "D'altra manera, useu «git reset»\n"
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Altrament si us plau useu «git rebase --skip»\n"
 
 #: builtin/commit.c:66
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Altrament si us plau useu «git cherry-pick --skip»\n"
+
+#: builtin/commit.c:69
+#, fuzzy
 msgid ""
 "and then use:\n"
 "\n"
@@ -11385,62 +13634,77 @@ 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"
 
-#: builtin/commit.c:315
+#: builtin/commit.c:324
 msgid "failed to unpack HEAD tree object"
 msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
 
-#: builtin/commit.c:356
+#: 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
+msgid "No paths with --include/--only does not make sense."
+msgstr "--include/--only no té sentit sense camí."
+
+#: builtin/commit.c:386
 msgid "unable to create temporary index"
 msgstr "no s'ha pogut crear un índex temporal"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr "l'afegiment interactiu ha fallat"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:410
 msgid "unable to update temporary index"
 msgstr "no s'ha pogut actualitzar l'índex temporal"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:412
 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:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
 msgid "unable to write new_index file"
 msgstr "no s'ha pogut escriure el fitxer new_index"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:489
 msgid "cannot do a partial commit during a merge."
 msgstr "no es pot fer una comissió parcial durant una fusió."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:491
 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:465
+#: builtin/commit.c:493
+msgid "cannot do a partial commit during a rebase."
+msgstr "no es pot fer una comissió parcial durant un «rebase»."
+
+#: builtin/commit.c:501
 msgid "cannot read the index"
 msgstr "no es pot llegir l'índex"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:520
 msgid "unable to write temporary index file"
 msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:618
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "a la comissió «%s» li manca la capçalera d'autor"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "la comissió «%s» té una línia d'autor mal formada"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr "paràmetre --author mal format"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:692
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11448,78 +13712,81 @@ msgstr ""
 "no es pot seleccionar un caràcter de comentari que\n"
 "no sigui usat en el missatge de comissió actual"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1158
 #, c-format
 msgid "could not lookup commit %s"
-msgstr "no s'ha pogut trobar la comissió %s"
+msgstr "no s'ha pogut cercar la comissió %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:758 builtin/shortlog.c:413
 #, 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:708
+#: builtin/commit.c:760
 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:712
+#: builtin/commit.c:764
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: 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:813 builtin/commit.c:829
 msgid "could not read SQUASH_MSG"
 msgstr "no s'ha pogut llegir SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:820
 msgid "could not read MERGE_MSG"
 msgstr "no s'ha pogut llegir MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:880
 msgid "could not write commit template"
 msgstr "no s'ha pogut escriure la plantilla de comissió"
 
-#: builtin/commit.c:829
-#, c-format
+#: builtin/commit.c:900
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d MERGE_HEAD\n"
 "and try again.\n"
 msgstr ""
 "\n"
 "Sembla que podeu estar cometent una fusió.\n"
-"Si això no és correcte, elimineu el fitxer\n"
-"\t%s\n"
+"Si això no és correcte, executeu\n"
+"\tgit update-ref -d MERGE_HEAD\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:834
-#, c-format
+#: builtin/commit.c:905
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "and try again.\n"
 msgstr ""
 "\n"
 "Sembla que podeu estar cometent un «cherry pick».\n"
-"Si això no és correcte, elimineu el fitxer\n"
-"\t%s\n"
+"Si això no és correcte, executeu\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "i intenteu-ho de nou.\n"
 
-#: builtin/commit.c:847
+#: 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», i un missatge de\n"
+"S'ignoraran les línies que comencin amb «%c». Un missatge de\n"
 "comissió buit avorta la comissió.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:923
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11531,146 +13798,178 @@ msgstr ""
 "vosaltres\n"
 "mateixos si voleu. Un missatge buit avorta la comissió.\n"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:940
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:    %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:948
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:955
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sComitent: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:973
 msgid "Cannot read index"
 msgstr "No es pot llegir l'índex"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:1018
+#, fuzzy
+msgid "unable to pass trailers to --trailers"
+msgstr "no s'ha pogut analitzar la capçalera de %s"
+
+#: builtin/commit.c:1058
 msgid "Error building trees"
 msgstr "Error en construir arbres"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1072 builtin/tag.c:319
 #, 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:1030
+#: builtin/commit.c:1116
 #, 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:1044
+#: builtin/commit.c:1130
 #, c-format
 msgid "Invalid ignored mode '%s'"
-msgstr "mode ignorat no vàlid «%s»"
+msgstr "Mode d'ignorància no vàlid «%s»"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1148 builtin/commit.c:1441
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fitxers no seguits no vàlid «%s»"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1188
 msgid "--long and -z are incompatible"
 msgstr "--long i -z són incompatibles"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1219
+#, fuzzy
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
+
+#: builtin/commit.c:1221
+#, fuzzy
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Esteu enmig d'un «cherry pick» -- no es pot esmenar."
+
+#: 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:1226
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+
+#: builtin/commit.c:1245
 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:1155
+#: builtin/commit.c:1254
 msgid "You have nothing to amend."
 msgstr "No teniu res a esmenar."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1257
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1259
 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:1163
+#: builtin/commit.c:1261
+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
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Les opcions --squash i --fixup no es poden usar juntes"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1274
 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:1175
+#: builtin/commit.c:1276
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "L'opció -m no es pot combinar amb -c/-C/-F/."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1285
 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:1200
+#: builtin/commit.c:1303
 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:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "--include/--only no té sentit sense camí."
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1331
 #, fuzzy, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "opció desconeguda: %s\n"
+
+#: builtin/commit.c:1345
+#, c-format
 msgid "paths '%s ...' with -a does not make sense"
-msgstr "-a no té sentit amb camins."
+msgstr "els camins «%s ...» amb -a no tenen sentit"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1476 builtin/commit.c:1642
 msgid "show status concisely"
 msgstr "mostra l'estat concisament"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1478 builtin/commit.c:1644
 msgid "show branch information"
 msgstr "mostra la informació de branca"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1480
 msgid "show stash information"
 msgstr "mostra la informació de «stash»"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1482 builtin/commit.c:1646
+#, fuzzy
 msgid "compute full ahead/behind values"
-msgstr ""
+msgstr "calcula els valors complets endavant/darrere"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1484
 msgid "version"
 msgstr "versió"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:561
-#: builtin/worktree.c:651
+#: builtin/commit.c:1484 builtin/commit.c:1648 builtin/push.c:560
+#: builtin/worktree.c:681
 msgid "machine-readable output"
 msgstr "sortida llegible per màquina"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1487 builtin/commit.c:1650
 msgid "show status in long format (default)"
 msgstr "mostra l'estat en format llarg (per defecte)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1490 builtin/commit.c:1653
 msgid "terminate entries with NUL"
 msgstr "acaba les entrades amb NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1125 builtin/fast-export.c:1128
-#: builtin/fast-export.c:1131 builtin/rebase.c:1471 parse-options.h:332
+#: 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
 msgid "mode"
 msgstr "mode"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1493 builtin/commit.c:1656
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
 "defecte: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1497
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11678,11 +13977,11 @@ msgstr ""
 "mostra els fitxers ignorats, modes opcionals: traditional, matching, no. "
 "(Per defecte: traditional, matching, no.)"
 
-#: builtin/commit.c:1362 parse-options.h:179
+#: builtin/commit.c:1499 parse-options.h:193
 msgid "when"
 msgstr "quan"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1500
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11690,463 +13989,434 @@ msgstr ""
 "ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
 "defecte: all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1502
 msgid "list untracked files in columns"
 msgstr "mostra els fitxers no seguits en columnes"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1503
 msgid "do not detect renames"
 msgstr "no detectis canvis de noms"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1505
 msgid "detect renames, optionally set similarity index"
 msgstr "detecta canvis de noms, i opcionalment estableix un índex de semblança"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1525
 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:1493
+#: builtin/commit.c:1607
 msgid "suppress summary after successful commit"
 msgstr "omet el resum després d'una comissió reeixida"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1608
 msgid "show diff in commit message template"
 msgstr "mostra la diferència en la plantilla de missatge de comissió"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1610
 msgid "Commit message options"
 msgstr "Opcions de missatge de comissió"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1611 builtin/merge.c:286 builtin/tag.c:458
 msgid "read message from file"
 msgstr "llegiu el missatge des d'un fitxer"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1612
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1612
 msgid "override author for commit"
 msgstr "autor corregit de la comissió"
 
-#: builtin/commit.c:1499 builtin/gc.c:539
+#: builtin/commit.c:1613 builtin/gc.c:550
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1613
 msgid "override date for commit"
 msgstr "data corregida de la comissió"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1615 builtin/commit.c:1616 builtin/commit.c:1622
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
 msgstr "comissió"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1615
 msgid "reuse and edit message from specified commit"
 msgstr "reusa i edita el missatge de la comissió especificada"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1616
 msgid "reuse message from specified commit"
 msgstr "reusa el missatge de la comissió especificada"
 
-#: builtin/commit.c:1503
-msgid "use autosquash formatted message to fixup specified commit"
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+#: builtin/commit.c:1621
+#, fuzzy
+msgid "[(amend|reword):]commit"
+msgstr "esmena la comissió anterior"
+
+#: builtin/commit.c:1621
+#, fuzzy
+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ó "
 "especificada"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1622
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usa el missatge formatat de «squash» automàtic per a «squash» a la comissió "
 "especificada"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1623
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
+msgstr "l'autor de la comissió soc jo ara (s'usa amb -C/-c/--amend)"
+
+#: builtin/commit.c:1624 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "remolc"
+
+#: builtin/commit.c:1624
+msgid "add custom trailer(s)"
+msgstr ""
 
-#: builtin/commit.c:1506 builtin/log.c:1581 builtin/merge.c:289
-#: builtin/pull.c:163 builtin/revert.c:110
-msgid "add Signed-off-by:"
+#: builtin/commit.c:1625 builtin/log.c:1751 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+#, fuzzy
+msgid "add a Signed-off-by trailer"
 msgstr "afegeix Signed-off-by:"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1626
 msgid "use specified template file"
 msgstr "usa el fitxer de plantilla especificat"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1627
 msgid "force edit of commit"
 msgstr "força l'edició de la comissió"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1629
 msgid "include status in commit message template"
 msgstr "inclou l'estat en la plantilla de missatge de comissió"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1634
 msgid "Commit contents options"
 msgstr "Opcions dels continguts de les comissions"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1635
 msgid "commit all changed files"
 msgstr "comet tots els fitxers canviats"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1636
 msgid "add specified files to index for commit"
 msgstr "afegeix els fitxers especificats a l'índex per a cometre"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1637
 msgid "interactively add files"
 msgstr "afegeix els fitxers interactivament"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1638
 msgid "interactively add changes"
 msgstr "afegeix els canvis interactivament"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1639
 msgid "commit only specified files"
 msgstr "comet només els fitxers especificats"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1640
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evita els lligams de precomissió i missatge de comissió"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1641
 msgid "show what would be committed"
 msgstr "mostra què es cometria"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1654
 msgid "amend previous commit"
 msgstr "esmena la comissió anterior"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1655
 msgid "bypass post-rewrite hook"
 msgstr "evita el lligam de post escriptura"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1662
 msgid "ok to record an empty change"
 msgstr "està bé registrar un canvi buit"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1664
 msgid "ok to record a change with an empty message"
 msgstr "està bé registrar un canvi amb missatge buit"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1737
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fitxer MERGE_HEAD malmès (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1744
 msgid "could not read MERGE_MODE"
 msgstr "no s'ha pogut llegir MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1765
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no s'ha pogut llegir el missatge de comissió: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1772
 #, 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:1654
+#: builtin/commit.c:1777
 #, 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:1688
+#: builtin/commit.c:1788
+#, fuzzy, 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"
+
+#: builtin/commit.c:1824
 #, fuzzy
 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 dipòsit, però no es pot escriure el\n"
-"fitxer new_index. Comproveu que el disc no estigui ple i\n"
-"que no s'hagi excedit la quota, i després feu \n"
-"«git reset HEAD» per a recuperar-ho."
-
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr ""
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr ""
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid "git commit-graph verify [--object-dir <objdir>] [--shallow]"
-msgstr ""
-
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] <split options>"
-msgstr ""
-
-#: builtin/commit-graph.c:54 builtin/commit-graph.c:100
-#: builtin/commit-graph.c:161 builtin/commit-graph.c:237 builtin/fetch.c:163
-#: builtin/log.c:1601
-msgid "dir"
-msgstr "directori"
-
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:101
-#: builtin/commit-graph.c:162 builtin/commit-graph.c:238
-msgid "The object directory to store the graph"
-msgstr ""
-
-#: builtin/commit-graph.c:57
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-
-#: builtin/commit-graph.c:73 builtin/commit-graph.c:116
-#, fuzzy, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "no s'ha pogut analitzar la comissió «%s»"
-
-#: builtin/commit-graph.c:164
-msgid "start walk at all refs"
-msgstr ""
-
-#: builtin/commit-graph.c:166
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-
-#: builtin/commit-graph.c:168
-msgid "start walk at commits listed by stdin"
-msgstr ""
-
-#: builtin/commit-graph.c:170
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-
-#: builtin/commit-graph.c:172
-#, fuzzy
-msgid "allow writing an incremental commit-graph file"
-msgstr "Escriu i verifica els fitxers commit-graph de Git"
-
-#: builtin/commit-graph.c:174 builtin/commit-graph.c:178
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:176
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:191
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-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."
 
 #: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<opcions>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
-msgstr "paràmetre --type no reconegut, %s"
+msgstr "argument --type no reconegut, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "només un tipus cada cop"
 
-#: builtin/config.c:124
+#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Ubicació del fitxer de configuració"
 
-#: builtin/config.c:125
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr "usa el fitxer de configuració global"
 
-#: builtin/config.c:126
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr "usa el fitxer de configuració del sistema"
 
-#: builtin/config.c:127
+#: 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:128
+#: 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:129
+#: builtin/config.c:135
 msgid "use given config file"
 msgstr "usa el fitxer de configuració donat"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr "ID de blob"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "llegeix la configuració de l'objecte de blob donat"
 
-#: builtin/config.c:131
+#: builtin/config.c:137
 msgid "Action"
 msgstr "Acció"
 
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "obtén valor: nom [regex-de-valors]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "obtén valor: nom [value-pattern]"
 
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "obtén tots els valors: clau [regex-de-valors]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "obtén tots els valors: clau [value-pattern]"
 
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "obtén valors de regexp: regex-de-noms [regex-de-valors]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "obtén valors de regexp: name-regex [value-pattern]"
 
-#: builtin/config.c:135
+#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtén el valor específic per a l'URL: secció[.variable] URL"
 
-#: builtin/config.c:136
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
-"reemplaça totes les variables que coincideixen: nom valor [regex_de_valors]"
+"reemplaça totes les variables que coincideixen: nom valor [value-pattern]"
 
-#: builtin/config.c:137
+#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "afegeix una variable nova: nom valor"
 
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "elimina una variable: nom [regex-de-valors]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "elimina una variable: nom [value-pattern]"
 
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "elimina totes les coincidències: nom [regex-de-valors]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "elimina totes les coincidències: nom [value-pattern]"
 
-#: builtin/config.c:140
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "canvia el nom de secció: nom-antic nom-nou"
 
-#: builtin/config.c:141
+#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "elimina una secció: nom"
 
-#: builtin/config.c:142
+#: builtin/config.c:148
 msgid "list all"
 msgstr "llista tots"
 
-#: builtin/config.c:143
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+"usa la igualtat de les cadenes quan es comparen els valors amb «value-"
+"pattern»"
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr "obre un editor"
 
-#: builtin/config.c:144
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "troba el color configurat: ranura [per defecte]"
 
-#: builtin/config.c:145
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "troba el paràmetre de color: ranura [stdout-és-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:153
 msgid "Type"
 msgstr "Tipus"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "el valor té donat aquest tipus"
 
-#: builtin/config.c:148
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
-msgstr "el valor és \"true\" o \"false\""
+msgstr "el valor és «true» o «false»"
 
-#: builtin/config.c:149
+#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "el valor és un nombre decimal"
 
-#: builtin/config.c:150
+#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "el valor és --bool o --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "el valor és --bool o string"
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "el valor és un camí (nom de fitxer o directori)"
 
-#: builtin/config.c:152
+#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "el valor és una data de venciment"
 
-#: builtin/config.c:153
+#: builtin/config.c:161
 msgid "Other"
 msgstr "Altre"
 
-#: builtin/config.c:154
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "acaba els valors amb un octet NUL"
 
-#: builtin/config.c:155
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "mostra només els noms de variable"
 
-#: builtin/config.c:156
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "respecta les directives d'inclusió en cercar"
 
-#: builtin/config.c:157
+#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "mostra l'origen de la configuració (fitxer, entrada estàndard, blob, línia "
 "d'ordres)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: 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)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "valor"
 
-#: builtin/config.c:158
+#: builtin/config.c:167
+#, fuzzy
 msgid "with --get, use default value when missing entry"
-msgstr ""
+msgstr "amb --get utilitza el valor per defecte quan falta una entrada"
 
-#: builtin/config.c:172
-#, c-format
+#: builtin/config.c:181
+#, fuzzy, c-format
 msgid "wrong number of arguments, should be %d"
-msgstr ""
+msgstr "el nombre d'arguments és erroni"
 
-#: builtin/config.c:174
-#, c-format
+#: builtin/config.c:183
+#, fuzzy, c-format
 msgid "wrong number of arguments, should be from %d to %d"
-msgstr ""
+msgstr "el nombre d'arguments hauria de passar d'un percentatge a un altre."
 
-#: builtin/config.c:308
+#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "patró de la clau no vàlid: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:377
 #, 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"
 
-#: builtin/config.c:401
+#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "no es pot analitzar el color «%s»"
 
-#: builtin/config.c:443
+#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "no s'ha pogut analitzar el valor de color per defecte"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "no és en un directori git"
 
-#: builtin/config.c:499
+#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "no s'admet escriure a stdin"
 
-#: builtin/config.c:502
+#: builtin/config.c:542
 #, fuzzy
 msgid "writing config blobs is not supported"
-msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n"
+msgstr "no es poden escriure els blobs de configuració"
 
-#: builtin/config.c:587
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12161,75 +14431,89 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "només un fitxer de configuració cada cop"
 
-#: builtin/config.c:616
+#: 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:619
+#: 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 repositori git"
 
-#: builtin/config.c:638
+#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME no està establerta"
 
-#: builtin/config.c:658
+#: 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"
 
-#: builtin/config.c:688
+#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color i el tipus de variable són incoherents"
 
-#: builtin/config.c:693
+#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "només una acció cada cop"
 
-#: builtin/config.c:706
+#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only només és aplicable a --list o --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:767
 msgid ""
 "--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"
 
-#: builtin/config.c:718
+#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default només és aplicable a --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:806
+#, fuzzy
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value només s'aplica amb 'value-pattern'"
+
+#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de configuració «%s»"
 
-#: builtin/config.c:734
+#: builtin/config.c:825
 msgid "error processing config file(s)"
-msgstr "s'ha produït un error processant els fitxers de configuració"
+msgstr "s'ha produït un error en processar els fitxers de configuració"
 
-#: builtin/config.c:744
+#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "no hi ha compatibilitat per a l'edició a stdin"
 
-#: builtin/config.c:746
+#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "no hi ha compatibilitat per l'edició de blobs"
 
-#: builtin/config.c:760
+#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "no es pot crear el fitxer de configuració %s"
 
-#: builtin/config.c:773
+#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12238,7 +14522,7 @@ msgstr ""
 "no es poden sobreescriure múltiples valors amb un sol valor\n"
 "       Useu una expressió regular, --add o --replace-all per a canviar %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "no existeix la secció: %s"
@@ -12251,11 +14535,46 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "imprimeix les mides en un format llegible pels humans"
 
-#: builtin/describe.c:27
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Els permisos en el vostre directori de sòcol són massa liberals;\n"
+"pot ser que altres usuaris poden llegir les vostres credencials.\n"
+"Considereu executar:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:276
+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"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr ""
+"credencial-cache no disponible; no hi ha compatibilitat amb els sòcols d'unix"
+
+#: builtin/credential-store.c:66
+#, fuzzy, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "no s'ha pogut obtenir el directori de treball actual"
+
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opcions>] [<comissió>...]"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opcions>] --dirty"
 
@@ -12271,37 +14590,34 @@ msgstr "lleuger"
 msgid "annotated"
 msgstr "anotat"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'etiqueta anotada %s no és disponible"
 
-#: builtin/describe.c:277
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "l'etiqueta anotada %s no té nom incrustat"
-
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "l'etiqueta «%s» realment és «%s» aquí"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "l'etiqueta «%s» es coneix externament com a «%s»"
 
-#: builtin/describe.c:323
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "cap etiqueta coincideix exactament amb «%s»"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
+"No hi ha cap coincidència exacta en la cerca de referències o etiquetes per "
+"a descriure\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "s'ha finalitzat la cerca a %s\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12310,7 +14626,7 @@ msgstr ""
 "Cap etiqueta anotada pot descriure «%s».\n"
 "No obstant, hi havia etiquetes no anotades: proveu --tags."
 
-#: builtin/describe.c:409
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12319,12 +14635,12 @@ msgstr ""
 "Cap etiqueta pot descriure «%s».\n"
 "Proveu --always, o creeu algunes etiquetes."
 
-#: builtin/describe.c:439
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu comissions travessades\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12333,419 +14649,561 @@ msgstr ""
 "s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
 "s'ha renunciat la cerca a %s\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "descriu %s\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s no és un nom d'objecte vàlid"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s no és una comissió o un blob"
 
-#: builtin/describe.c:535
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "troba l'etiqueta que vingui després de la comissió"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "estratègia de cerca de depuració en stderr"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "usa qualsevol referència"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "sempre usa el format llarg"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "només segueix la primera mare"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "emet només coincidències exactes"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "només considera les etiquetes que coincideixen amb <patró>"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
 
-#: builtin/describe.c:551 builtin/name-rev.c:422
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:553
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
-msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
+msgstr "annexa <marca> en l'arbre de treball brut (per defecte: «-dirty»)"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
-msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")"
+msgstr "annexa <marca> en l'arbre de treball brut (per defecte: «-broken»)"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long és incompatible amb --abbrev=0"
 
-#: builtin/describe.c:603
+#: 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:654
+#: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty és incompatible amb les comissions"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken és incompatible amb les comissions"
 
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+#, fuzzy
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "-p i --overlay són mútuament excloents"
+
+#: builtin/diff-tree.c:157
+#, fuzzy
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base només funciona amb dues comissions"
+
+#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "opció no vàlida: %s"
 
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: sense una base de fusió"
+
+#: builtin/diff.c:486
 msgid "Not a git repository"
-msgstr "No és un dipòsit de git"
+msgstr "No és un repositori de git"
 
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "s'ha donat un objecte no vàlid «%s»."
 
-#: builtin/diff.c:403
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "s'ha donat més de dos blobs: «%s»"
 
-#: builtin/diff.c:408
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "s'ha donat l'objecte no gestionat «%s»."
 
-#: builtin/difftool.c:30
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: múltiples bases de fusió, utilitzant %s"
+
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
 msgstr "ha fallat: %d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:305
 #, 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:305
+#: builtin/difftool.c:313
 #, 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"
+msgstr "no es pot llegir l'objecte %s per l'enllaç simbòlic %s"
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:413
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr ""
-"els formats de diff combinats ('-c' and '--cc') no són admesos \n"
-"en el mode diff per directoris ('-d' and '--dir-diff')."
+"els formats de diff combinats («-c» i «--cc») no s'admeten\n"
+"en el mode diff per directoris («-d» i «--dir-diff»)."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "s'ha deixat un fitxer de l'arbre de treball."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "existeix un fitxer temporal a «%s»."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr "podeu netejar o recuperar-los."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:700
 msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
+msgstr "usa «diff.guitool» en lloc de «diff.tool»"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:702
 msgid "perform a full-directory diff"
 msgstr "fes un diff de tot el directori"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:704
 msgid "do not prompt before launching a diff tool"
 msgstr "no preguntis abans d'executar l'eina diff"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:709
 msgid "use symlinks in dir-diff mode"
 msgstr "utilitza enllaços simbòlics en mode dir-diff"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:710
 msgid "tool"
 msgstr "eina"
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:711
 msgid "use the specified diff tool"
 msgstr "utilitza l'eina de diff especificada"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:713
 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`"
+"imprimeix una llista de totes les eines diff que podeu usar amb «--tool»"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:716
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr ""
-"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de "
+"fes que «git-difftool» surti quan l'eina de diff invocada torna un codi de "
 "sortida diferent de zero"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:719
 msgid "specify a custom command for viewing diffs"
-msgstr "especifiqueu un ordre personalitzat per veure diffs"
+msgstr "especifiqueu una ordre personalitzada per veure diffs"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:720
 msgid "passed to `diff`"
 msgstr "passa-ho a «diff»"
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:735
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool requereix worktree o --no-index"
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:742
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff és incompatible amb --no-index"
 
-#: builtin/difftool.c:734
+#: 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:742
+#: builtin/difftool.c:753
 msgid "no <tool> given for --tool=<tool>"
-msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
+msgstr "no s'ha proporcionat l'<eina> per a --tool=<eina>"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:760
 msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
+msgstr "no s'ha proporcionat l'<ordre> per a --extcmd=<ordre>"
 
 #: builtin/env--helper.c:6
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <opcions> <env-var>"
 
-#: builtin/env--helper.c:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
 msgid "type"
 msgstr "tipus"
 
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
+#, fuzzy
 msgid "default for git_env_*(...) to fall back on"
-msgstr ""
+msgstr "per defecte per a gitenv*() per tornar-hi"
 
-#: builtin/env--helper.c:43
+#: builtin/env--helper.c:48
+#, fuzzy
 msgid "be quiet only use git_env_*() value as exit code"
-msgstr ""
+msgstr "silenciós només utilitza el valor gitenv*() com a codi de sortida"
 
-#: builtin/env--helper.c:62
-#, c-format
+#: builtin/env--helper.c:67
+#, fuzzy, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
-msgstr ""
+msgstr "`--default' espera un valor booleà amb `-type=bool` no `%s`"
 
-#: builtin/env--helper.c:77
-#, c-format
+#: builtin/env--helper.c:82
+#, fuzzy, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
 "%s`"
 msgstr ""
+"`--default' espera un valor llarg sense signe amb `-type=ulong` no `%s`"
 
 #: 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:1124
+#: builtin/fast-export.c:868
+#, fuzzy
+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."
+
+#: builtin/fast-export.c:1177
+#, fuzzy
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map token no pot estar buit"
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "mostra el progrés després de <n> objectes"
 
-#: builtin/fast-export.c:1126
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "selecciona la gestió de les etiquetes signades"
 
-#: builtin/fast-export.c:1129
+#: builtin/fast-export.c:1202
 msgid "select handling of tags that tag filtered objects"
 msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
 
-#: builtin/fast-export.c:1132
+#: builtin/fast-export.c:1205
 #, fuzzy
 msgid "select handling of commit messages in an alternate encoding"
-msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
+msgstr ""
+"selecciona la gestió dels missatges de publicació en una codificació "
+"alternativa"
 
-#: builtin/fast-export.c:1135
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1208
+#, fuzzy
+msgid "dump marks to this file"
 msgstr "Bolca les marques a aquest fitxer"
 
-#: builtin/fast-export.c:1137
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+#, fuzzy
+msgid "import marks from this file"
 msgstr "Importa les marques d'aquest fitxer"
 
-#: builtin/fast-export.c:1139
-msgid "Fake a tagger when tags lack one"
+#: builtin/fast-export.c:1214
+#, fuzzy
+msgid "import marks from this file if it exists"
+msgstr "Importa marques d'aquest fitxer si existeix"
+
+#: builtin/fast-export.c:1216
+#, fuzzy
+msgid "fake a tagger when tags lack one"
 msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
 
-#: builtin/fast-export.c:1141
-msgid "Output full tree for each commit"
+#: builtin/fast-export.c:1218
+#, fuzzy
+msgid "output full tree for each commit"
 msgstr "Imprimeix l'arbre complet de cada comissió"
 
-#: builtin/fast-export.c:1143
-msgid "Use the done feature to terminate the stream"
+#: builtin/fast-export.c:1220
+#, fuzzy
+msgid "use the done feature to terminate the stream"
 msgstr "Usa la característica done per a acabar el corrent"
 
-#: builtin/fast-export.c:1144
-msgid "Skip output of blob data"
+#: builtin/fast-export.c:1221
+#, fuzzy
+msgid "skip output of blob data"
 msgstr "Omet l'emissió de dades de blob"
 
-#: builtin/fast-export.c:1145 builtin/log.c:1649
+#: builtin/fast-export.c:1222 builtin/log.c:1823
 msgid "refspec"
 msgstr "especificació de referència"
 
-#: builtin/fast-export.c:1146
-msgid "Apply refspec to exported refs"
+#: builtin/fast-export.c:1223
+#, fuzzy
+msgid "apply refspec to exported refs"
 msgstr "Aplica l'especificació de referència a les referències exportades"
 
-#: builtin/fast-export.c:1147
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "anonimitza la sortida"
 
-#: builtin/fast-export.c:1149
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+#, fuzzy
+msgid "from:to"
+msgstr "des de"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "converteix <from> a <to> en una sortida anònima"
+
+#: builtin/fast-export.c:1229
+#, fuzzy
+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"
+
+#: builtin/fast-export.c:1231
+#, fuzzy
+msgid "show original object ids of blobs/commits"
+msgstr "Mostra els ID dels objectes originals dels blobs/commits"
+
+#: builtin/fast-export.c:1233
+#, fuzzy
+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"
+
+#: 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
+msgid "Missing from marks for submodule '%s'"
+msgstr "Subjecting submodule '%s'"
+
+#: builtin/fast-import.c:3090
+#, fuzzy, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "s'ha produït un error en actualitzar el remot pel submòdul «%s»"
 
-#: builtin/fast-export.c:1151
-msgid "Show original object ids of blobs/commits"
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "S'esperava l'ordre «mark», s'ha rebut %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "S'esperava l'ordre «to», s'ha rebut «%s»"
+
+#: builtin/fast-import.c:3322
+#, fuzzy
+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 "
+"submòdul"
 
-#: builtin/fetch.c:30
+#: builtin/fast-import.c:3377
+#, fuzzy, 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
+msgid "Lockfile created but not reported: %s"
+msgstr "Submòduls canviats però no actualitzats:"
+
+#: builtin/fetch.c:35
 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:31
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opcions>] <grup>"
 
-#: builtin/fetch.c:32
+#: builtin/fetch.c:37
 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:33
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opcions>]"
 
-#: builtin/fetch.c:125 builtin/pull.c:203
+#: builtin/fetch.c:122
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel no pot ser negatiu"
+
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "obtén de tots els remots"
 
-#: builtin/fetch.c:127 builtin/pull.c:206
+#: builtin/fetch.c:147 builtin/pull.c:245
+#, fuzzy
+msgid "set upstream for git pull/fetch"
+msgstr "estableix la font per a git pull/fetch"
+
+#: builtin/fetch.c:149 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
 
-#: builtin/fetch.c:129 builtin/pull.c:209
+#: builtin/fetch.c:151
+#, fuzzy
+msgid "use atomic transaction to update references"
+msgstr "demana una transacció atòmica al costat remot"
+
+#: builtin/fetch.c:153 builtin/pull.c:191
 msgid "path to upload pack on remote end"
 msgstr "camí al qual pujar el paquet al costat remot"
 
-#: builtin/fetch.c:130
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr "força la sobreescriptura de la referència local"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "obtén de múltiples remots"
 
-#: builtin/fetch.c:134 builtin/pull.c:213
+#: builtin/fetch.c:158 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "obtén totes les etiquetes i tots els objectes associats"
 
-#: builtin/fetch.c:136
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no obtinguis les etiquetes (--no-tags)"
 
-#: builtin/fetch.c:138
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de submòduls obtinguts en paral·lel"
 
-#: builtin/fetch.c:140 builtin/pull.c:216
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+
+#: builtin/fetch.c:166 builtin/pull.c:198
 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:142
+#: builtin/fetch.c:168
+#, fuzzy
 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"
 
-#: builtin/fetch.c:143 builtin/fetch.c:166 builtin/pull.c:140
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "sota demanda"
 
-#: builtin/fetch.c:144
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
-#: builtin/fetch.c:148 builtin/pull.c:224
+#: builtin/fetch.c:175
+#, fuzzy
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "escriu l'arxiu a aquest fitxer"
+
+#: builtin/fetch.c:176 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "retén el paquet baixat"
 
-#: builtin/fetch.c:150
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "permet l'actualització de la referència HEAD"
 
-#: builtin/fetch.c:153 builtin/fetch.c:159 builtin/pull.c:227
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "aprofundeix la història d'un clon superficial"
 
-#: builtin/fetch.c:155
+#: builtin/fetch.c:183 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr "aprofundeix la història d'un clon superficial basat en temps"
 
-#: builtin/fetch.c:161 builtin/pull.c:230
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
-msgstr "converteix en un dipòsit complet"
+msgstr "converteix en un repositori complet"
 
-#: builtin/fetch.c:164
+#: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
 msgstr "anteposa això a la sortida de camí del submòdul"
 
-#: builtin/fetch.c:167
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -12753,263 +15211,323 @@ msgstr ""
 "per defecte per a l'obtenció recursiva de submòduls (prioritat més baixa que "
 "els fitxers de configuració)"
 
-#: builtin/fetch.c:171 builtin/pull.c:233
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "accepta les referències que actualitzin .git/shallow"
 
-#: builtin/fetch.c:172 builtin/pull.c:235
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr "mapa de referències"
 
-#: builtin/fetch.c:173 builtin/pull.c:236
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
-msgstr "mostra el mapa de referències d'obtenció"
+msgstr "específica l'obtenció del mapa de referències"
 
-#: builtin/fetch.c:180
+#: builtin/fetch.c:208 builtin/pull.c:240
+#, fuzzy
 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
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
 msgstr ""
 
-#: builtin/fetch.c:183
+#: builtin/fetch.c:213 builtin/fetch.c:215
 #, fuzzy
-msgid "run 'gc --auto' after fetching"
-msgstr "poda els remots després d'obtenir-los"
+msgid "run 'maintenance --auto' after fetching"
+msgstr "executa «gc --auto» després d'obtenir"
 
-#: builtin/fetch.c:185 builtin/pull.c:245
+#: builtin/fetch.c:217 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr ""
+"comprova si hi ha actualitzacions forçades a totes les branques actualitzades"
+
+#: builtin/fetch.c:219
+msgid "write the commit-graph after fetching"
+msgstr "escriu el graf de comissions després de recollir"
+
+#: builtin/fetch.c:221
+#, fuzzy
+msgid "accept refspecs from stdin"
+msgstr "llegeix les referències des de stdin"
 
-#: builtin/fetch.c:491
+#: 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:630
+#: builtin/fetch.c:757
 #, 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:728
+#: builtin/fetch.c:856
 #, c-format
 msgid "object %s not found"
 msgstr "objecte %s no trobat"
 
-#: builtin/fetch.c:732
+#: builtin/fetch.c:860
 msgid "[up to date]"
 msgstr "[al dia]"
 
-#: builtin/fetch.c:745 builtin/fetch.c:761 builtin/fetch.c:833
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr "[rebutjat]"
 
-#: builtin/fetch.c:746
+#: builtin/fetch.c:874
 msgid "can't fetch in current branch"
 msgstr "no es pot obtenir en la branca actual"
 
-#: builtin/fetch.c:756
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr "[actualització d'etiqueta]"
 
-#: builtin/fetch.c:757 builtin/fetch.c:794 builtin/fetch.c:816
-#: builtin/fetch.c:828
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
 msgid "unable to update local ref"
 msgstr "no s'ha pogut actualitzar la referència local"
 
-#: builtin/fetch.c:761
+#: builtin/fetch.c:889
+#, fuzzy
 msgid "would clobber existing tag"
-msgstr ""
+msgstr "es tancaria l'etiqueta existent"
 
-#: builtin/fetch.c:783
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr "[etiqueta nova]"
 
-#: builtin/fetch.c:786
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr "[branca nova]"
 
-#: builtin/fetch.c:789
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr "[referència nova]"
 
-#: builtin/fetch.c:828
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr "actualització forçada"
 
-#: builtin/fetch.c:833
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
 msgstr "sense avanç ràpid"
 
-#: builtin/fetch.c:879
+#: builtin/fetch.c:1065
+#, fuzzy
+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 ""
+"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»."
+
+#: builtin/fetch.c:1069
+#, fuzzy, 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"
+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ó."
+
+#: builtin/fetch.c:1101
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no ha enviat tots els objectes necessaris\n"
 
-#: builtin/fetch.c:900
+#: builtin/fetch.c:1129
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr ""
 "rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
 
-#: builtin/fetch.c:991 builtin/fetch.c:1124
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr "De %.*s\n"
 
-#: builtin/fetch.c:1002
+#: 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 ""
 "algunes referències locals no s'han pogut actualitzar;\n"
-" intenteu executar 'git remote prune %s' per a eliminar\n"
+" intenteu executar «git remote prune %s» per a eliminar\n"
 " qualsevol branca antiga o conflictiva"
 
-#: builtin/fetch.c:1008
-msgid ""
-"Fetch normally indicates which branches had a forced update, but that check "
-"has been disabled."
-msgstr ""
-
-#: builtin/fetch.c:1009
-msgid ""
-"To re-enable, use '--show-forced-updates' flag or run 'git config fetch."
-"showForcedUpdates true'."
-msgstr ""
-
-#: builtin/fetch.c:1011
-#, c-format
-msgid ""
-"It took %.2f seconds to check forced updates. You can use '--no-show-forced-"
-"updates'\n"
-msgstr ""
-
-#: builtin/fetch.c:1013
-msgid ""
-"or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
-msgstr ""
-
-#: builtin/fetch.c:1094
+#: builtin/fetch.c:1327
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s es tornarà penjant)"
 
-#: builtin/fetch.c:1095
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s s'ha tornat penjant)"
 
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr "[suprimit]"
 
-#: builtin/fetch.c:1128 builtin/remote.c:1036
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(cap)"
 
-#: builtin/fetch.c:1151
+#: builtin/fetch.c:1384
 #, 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"
+msgstr "S'està refusant obtenir en la branca actual %s d'un repositori no nu"
 
-#: builtin/fetch.c:1170
+#: builtin/fetch.c:1403
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "L'opció «%s» amb valor «%s» no és vàlida per a %s"
 
-#: builtin/fetch.c:1173
+#: builtin/fetch.c:1406
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "S'ignora l'opció «%s» per a %s\n"
 
-#: builtin/fetch.c:1477
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "s'han detectat múltiples branques, incompatible amb --set-upstream"
+
+#: builtin/fetch.c:1633
+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
+msgid "not setting upstream for a remote tag"
+msgstr "no s'està configurant la font d'una etiqueta remota"
+
+#: builtin/fetch.c:1637
+msgid "unknown branch type"
+msgstr "tipus de branca desconegut"
+
+#: builtin/fetch.c:1639
+msgid ""
+"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."
+
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr "S'està obtenint %s\n"
 
-#: builtin/fetch.c:1479 builtin/remote.c:100
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No s'ha pogut obtenir %s"
 
-#: builtin/fetch.c:1525
-msgid ""
-"--filter can only be used with the remote configured in extensions."
-"partialClone"
-msgstr ""
+#: builtin/fetch.c:1790
+#, 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:1549
+#: 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 ""
-"Cap dipòsit remot especificat. Especifiqueu un URL o\n"
+"Cap repositori remot especificat. Especifiqueu un URL o\n"
 "un nom remot del qual es deuen obtenir les revisions noves."
 
-#: builtin/fetch.c:1586
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr "Necessiteu especificar un nom d'etiqueta."
 
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1995
 msgid "Negative depth in --deepen is not supported"
 msgstr "No s'admet una profunditat negativa en --deepen"
 
-#: builtin/fetch.c:1639
+#: builtin/fetch.c:1997
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen i --depth són mútuament excloents"
 
-#: builtin/fetch.c:1644
+#: builtin/fetch.c:2002
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth i --unshallow no es poden usar junts"
 
-#: builtin/fetch.c:1646
+#: builtin/fetch.c:2004
 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:1662
+#: builtin/fetch.c:2021
 msgid "fetch --all does not take a repository argument"
-msgstr "fetch --all no accepta un paràmetre de dipòsit"
+msgstr "fetch --all no accepta un argument de repositori"
 
-#: builtin/fetch.c:1664
+#: builtin/fetch.c:2023
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no té sentit amb especificacions de referència"
 
-#: builtin/fetch.c:1673
+#: builtin/fetch.c:2032
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No existeix un remot ni un grup remot: %s"
 
-#: builtin/fetch.c:1680
+#: 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:1696
+#: builtin/fetch.c:2055
+msgid "must supply remote when using --negotiate-only"
+msgstr ""
+
+#: builtin/fetch.c:2060
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr ""
+
+#: builtin/fetch.c:2079
 msgid ""
 "--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"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2083
+#, fuzzy
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "L'opció --exec només es pot usar juntament amb --remote"
+
+#: builtin/fetch.c:2087
+#, fuzzy
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "L'opció --exec només es pot usar juntament amb --remote"
+
+#: 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 <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 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:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "àlies per --log (en desús)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "usa <text> com a inici de missatge"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "fitxer del qual llegir"
 
@@ -13022,7 +15540,8 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objecte>]"
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#, fuzzy
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr "git for-each-ref [(--merged | --no-merged) [<comissió>]]"
 
 #: builtin/for-each-ref.c:13
@@ -13030,318 +15549,336 @@ 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:28
+#: builtin/for-each-ref.c:30
 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:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr "posa els marcadors de posició entre cometes adequades per al perl"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr "posa els marcadors de posició entre cometes adequades per al python"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr "posa els marcadors de posició entre cometes adequades per al Tcl"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "mostra només <n> referències coincidents"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
 msgid "respect format colors"
 msgstr "respecta els colors del format"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "imprimeix només les referències que assenyalin l'objecte donat"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "imprimeix només les referències que s'han fusionat"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
 msgstr "imprimeix només les referències que no s'han fusionat"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
 msgstr "imprimeix només les referències que continguin la comissió"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
 msgstr "imprimeix només les referències que no continguin la comissió"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<config> <command-args>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "config"
+
+#: builtin/for-each-repo.c:38
+#, fuzzy
+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
+msgid "missing --config=<config>"
+msgstr "falta --config=<config>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:127 builtin/fsck.c:128
 msgid "unknown"
 msgstr "desconegut"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "error en %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
-msgstr ""
+msgstr "avís en %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:123 builtin/fsck.c:126
 #, c-format
 msgid "broken link from %7s %s"
-msgstr ""
+msgstr "enllaç trencat de %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:135
 msgid "wrong object type in link"
 msgstr "tipus d'objecte incorrecte en l'enllaç"
 
-#: builtin/fsck.c:184
-#, c-format
+#: builtin/fsck.c:151
+#, fuzzy, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
-msgstr ""
+msgstr "enllaç trencat del 7% al 7%"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:263
 #, c-format
 msgid "missing %s %s"
 msgstr "manca %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:290
 #, c-format
 msgid "unreachable %s %s"
 msgstr "inabastable %s %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:310
 #, fuzzy, c-format
 msgid "dangling %s %s"
-msgstr "S'estan actualitzant %s..%s\n"
+msgstr "per cent"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:320
 #, fuzzy
 msgid "could not create lost-found"
-msgstr "no s'ha pogut crear el fitxer «%s»"
+msgstr "no s'ha pogut crear el trobat perdut"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:331
 #, c-format
 msgid "could not finish '%s'"
 msgstr "no s'ha pogut finalitzar «%s»"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:348
 #, c-format
 msgid "Checking %s"
 msgstr "S'està comprovant %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:386
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "S'està comprovant la connectivitat (%d objectes)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:405
 #, c-format
 msgid "Checking %s %s"
 msgstr "S'està comprovant %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:410
 msgid "broken links"
 msgstr "enllaços trencats"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:419
 #, c-format
 msgid "root %s"
 msgstr "arrel %s"
 
-#: builtin/fsck.c:455
-#, c-format
+#: builtin/fsck.c:427
+#, fuzzy, c-format
 msgid "tagged %s %s (%s) in %s"
-msgstr ""
+msgstr "percentatges marcats"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:456
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objecte corrupte o no trobat"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:481
 #, c-format
 msgid "%s: invalid reflog entry %s"
-msgstr " %s: entrada de referència no vàlida %s"
+msgstr "%s: entrada de referència no vàlida %s"
 
-#: builtin/fsck.c:523
-#, fuzzy, c-format
+#: builtin/fsck.c:495
+#, c-format
 msgid "Checking reflog %s->%s"
-msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
+msgstr "S'està comprovant reflog %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:529
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
-msgstr "%s: punter sha1 no vàlid: %s"
+msgstr "%s: punter %s sha1 no vàlid"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:536
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: no és una comissió"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:590
 msgid "notice: No default references"
 msgstr "avís: no hi ha referències per defecte"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:605
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objecte corrupte o no trobat: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:618
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: no s'ha pogut analitzar l'objecte: %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:638
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "fitxer sha1 malmès: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:653
 msgid "Checking object directory"
 msgstr "S'està comprovant el directori d'objecte"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:656
 msgid "Checking object directories"
 msgstr "S'estan comprovant els directoris d'objecte"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:671
 #, c-format
 msgid "Checking %s link"
 msgstr "S'està comprovant l'enllaç %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:676 builtin/index-pack.c:866
 #, c-format
 msgid "invalid %s"
 msgstr "%s no vàlid"
 
-#: builtin/fsck.c:712
-#, fuzzy, c-format
+#: builtin/fsck.c:683
+#, c-format
 msgid "%s points to something strange (%s)"
-msgstr "%s - no és una cosa que puguem fusionar"
+msgstr "%s apunta a una cosa estranya (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:689
 #, c-format
 msgid "%s: detached HEAD points at nothing"
-msgstr ""
+msgstr "%s: el HEAD separat no apunta a res"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:693
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
-msgstr ""
+msgstr "avís: %s apunta a una branca no nascuda (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:705
 msgid "Checking cache tree"
 msgstr "S'està comprovant l'arbre de la memòria cau"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:710
 #, fuzzy, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
-msgstr "S'ha produït un error en actualitzar l'arbre principal de memòria cau"
+msgstr "percentatges d'apuntador sha1 no vàlid a l'arbre de la memòria cau"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:719
+#, fuzzy
 msgid "non-tree in cache-tree"
-msgstr ""
+msgstr "no arbre en l'arbre de la memòria cau"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:750
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opcions>] [<objecte>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:756
 msgid "show unreachable objects"
 msgstr "mostra els objectes inabastables"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:757
 msgid "show dangling objects"
 msgstr "mostra els objectes penjants"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:758
 msgid "report tags"
 msgstr "informa de les etiquetes"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:759
 msgid "report root nodes"
 msgstr "informa dels nodes d'arrel"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:760
 msgid "make index objects head nodes"
 msgstr "fes els objectes d'índex nodes de cap"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:761
 msgid "make reflogs head nodes (default)"
 msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:762
 msgid "also consider packs and alternate objects"
 msgstr "també considera els paquets i els objectes alternatius"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:763
 msgid "check only connectivity"
 msgstr "comprova només la connectivitat"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:764 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "habilita la comprovació més estricta"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:766
 msgid "write dangling objects in .git/lost-found"
 msgstr "escriu objectes penjants a .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:767 builtin/prune.c:134
 msgid "show progress"
 msgstr "mostra el progrés"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:768
 msgid "show verbose names for reachable objects"
 msgstr "mostra els noms detallats dels objectes abastables"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:827 builtin/index-pack.c:262
 msgid "Checking objects"
 msgstr "S'estan comprovant els objectes"
 
-#: builtin/fsck.c:887
-#, fuzzy, c-format
+#: builtin/fsck.c:855
+#, c-format
 msgid "%s: object missing"
-msgstr "mostra la mida de l'objecte"
+msgstr "%s: falta l'objecte"
 
-#: builtin/fsck.c:899
-#, fuzzy, c-format
+#: builtin/fsck.c:866
+#, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
-msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
+msgstr "paràmetre no vàlid: s'esperava sha1, s'ha obtingut «%s»"
 
-#: builtin/gc.c:34
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<opcions>]"
 
-#: builtin/gc.c:90
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "S'ha produït un error en fer fstat %s: %s"
 
-#: builtin/gc.c:126
-#, fuzzy, c-format
+#: builtin/gc.c:129
+#, c-format
 msgid "failed to parse '%s' value '%s'"
-msgstr "s'ha produït un error en moure «%s» a «%s»"
+msgstr "no s'ha pogut analitzar «%s» valor «%s»"
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "no es pot fer stat en «%s»"
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:529
+#: 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:492
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13356,78 +15893,264 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
 msgstr "poda objectes sense referència"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "habilita el mode de recollida d'escombraries automàtica"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:557
 msgid "force running gc even if there may be another gc running"
 msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:560
+#, fuzzy
 msgid "repack all other packs except the largest pack"
-msgstr ""
+msgstr "reempaqueta tots els altres paquets excepte el paquet més gran"
 
-#: builtin/gc.c:566
+#: builtin/gc.c:576
 #, fuzzy, c-format
 msgid "failed to parse gc.logexpiry value %s"
-msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
+msgstr "no s'ha pogut analitzar el valor de gc.logexpiry dels percentatges"
 
-#: builtin/gc.c:577
+#: builtin/gc.c:587
 #, fuzzy, c-format
 msgid "failed to parse prune expiry value %s"
-msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
+msgstr "no s'ha pogut analitzar el valor de venciment de la poda per cent"
 
-#: builtin/gc.c:597
+#: builtin/gc.c:607
 #, 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:599
+#: builtin/gc.c:609
 #, 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:600
+#: builtin/gc.c:610
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vegeu «git help gc» per a neteja manual.\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:650
 #, 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)"
 
-#: builtin/gc.c:695
+#: builtin/gc.c:705
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
-"Hi ha massa objectes solts inabastables; executeu 'git prune' per a eliminar-"
+"Hi ha massa objectes solts inabastables; executeu «git prune» per a eliminar-"
 "los."
 
-#: builtin/grep.c:29
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule no està permès"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "argument --schedule no reconegut, «%s»"
+
+#: builtin/gc.c:869
+#, fuzzy
+msgid "failed to write commit-graph"
+msgstr "s'ha produït un error en escriure l'objecte de comissió"
+
+#: builtin/gc.c:905
+#, fuzzy
+msgid "failed to prefetch remotes"
+msgstr "s'ha produït un error en omplir els remots"
+
+#: builtin/gc.c:1022
+#, fuzzy
+msgid "failed to start 'git pack-objects' process"
+msgstr "no s'ha pogut iniciar el pack-objects"
+
+#: builtin/gc.c:1039
+#, fuzzy
+msgid "failed to finish 'git pack-objects' process"
+msgstr "no s'ha pogut finalitzar el pack-objects"
+
+#: builtin/gc.c:1091
+#, fuzzy
+msgid "failed to write multi-pack-index"
+msgstr "no s'han pogut netejar els percentatges multi-paquet"
+
+#: builtin/gc.c:1109
+#, fuzzy
+msgid "'git multi-pack-index expire' failed"
+msgstr "l'índex múltiple és massa petit"
+
+#: builtin/gc.c:1170
+#, fuzzy
+msgid "'git multi-pack-index repack' failed"
+msgstr "no s'ha pogut carregar l'índex del paquet per al fitxer de paquet %s"
+
+#: builtin/gc.c:1179
+#, fuzzy
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+"s'està ometent la tasca de reempaquetar incremental perquè core."
+"multiPackIndex està desactivat"
+
+#: builtin/gc.c:1283
+#, fuzzy, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "el fitxer de bloqueig «%s» existeix s'omet el manteniment"
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr "la tasca «%s» ha fallat"
+
+#: builtin/gc.c:1395
+#, fuzzy, c-format
+msgid "'%s' is not a valid task"
+msgstr "«%s» no és un terme vàlid"
+
+#: builtin/gc.c:1400
+#, fuzzy, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "«%s» no es pot usar amb %s"
+
+#: builtin/gc.c:1415
+#, fuzzy
+msgid "run tasks based on the state of the repository"
+msgstr "executa les tasques basades en l'estat del repositori"
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr "freqüència"
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr "executa les tasques basant-se en freqüència"
+
+#: builtin/gc.c:1420
+#, fuzzy
+msgid "do not report progress or other information over stderr"
+msgstr "no informeu sobre el progrés o altra informació sobre stderr"
+
+#: builtin/gc.c:1421
+msgid "task"
+msgstr "tasca"
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr "executa una tasca específica"
+
+#: builtin/gc.c:1439
+#, fuzzy
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "usa com a màxim un de --auto i --schedule=<frequency>"
+
+#: builtin/gc.c:1482
+#, fuzzy
+msgid "failed to run 'git config'"
+msgstr "no s'ha pogut executar «git status» a «%s»"
+
+#: builtin/gc.c:1547
+#, fuzzy, c-format
+msgid "failed to expand path '%s'"
+msgstr "s'ha produït un error en crear el camí «%s»%s"
+
+#: builtin/gc.c:1576
+#, fuzzy
+msgid "failed to start launchctl"
+msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
+
+#: builtin/gc.c:1613
+#, fuzzy, c-format
+msgid "failed to create directories for '%s'"
+msgstr "s'ha produït un error en crear el directori «%s»"
+
+#: builtin/gc.c:1674
+#, fuzzy, c-format
+msgid "failed to bootstrap service %s"
+msgstr "s'ha produït un error en eliminar %s"
+
+#: builtin/gc.c:1745
+#, fuzzy
+msgid "failed to create temp xml file"
+msgstr "no s'han pogut crear els fitxers de sortida"
+
+#: builtin/gc.c:1835
+#, fuzzy
+msgid "failed to start schtasks"
+msgstr "s'ha produït un error en fer stat a %s"
+
+#: builtin/gc.c:1879
+#, fuzzy
+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
+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
+msgid "failed to open stdin of 'crontab'"
+msgstr "s'ha produït un error en obrir «%s»"
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr "«crontab» ha mort"
+
+#: builtin/gc.c:1976
+#, fuzzy
+msgid "another process is scheduling background maintenance"
+msgstr "un altre procés és planificar el manteniment en segon pla"
+
+#: builtin/gc.c:2000
+#, fuzzy
+msgid "failed to add repo to global config"
+msgstr "no s'ha pogut afegir el fitxer de paquet «%s»"
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <subcommand> [<options>]"
+
+#: builtin/gc.c:2029
+#, fuzzy, c-format
+msgid "invalid subcommand: %s"
+msgstr "comissió 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:225
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: s'ha produït un error en crear fil: %s"
 
-#: builtin/grep.c:279
+#: builtin/grep.c:277
 #, 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"
@@ -13436,266 +16159,267 @@ msgstr "s'ha especificat un nombre de fils no vàlid (%d) per a %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2722
+#: builtin/grep.c:285 builtin/index-pack.c:1590 builtin/index-pack.c:1793
+#: builtin/pack-objects.c:2969
 #, c-format
 msgid "no threads support, ignoring %s"
-msgstr "no hi ha suport de fils, s'està ignorant %s"
+msgstr "no s'admeten fils, s'ignorarà %s"
 
-#: builtin/grep.c:467 builtin/grep.c:591 builtin/grep.c:633
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "no s'ha pogut llegir l'arbre (%s)"
 
-#: builtin/grep.c:648
+#: builtin/grep.c:658
 #, 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:714
+#: builtin/grep.c:739
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'opció «%c» espera un valor numèric"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:838
 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:815
+#: builtin/grep.c:840
 msgid "find in contents not managed by git"
 msgstr "cerca en continguts no gestionats per git"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:842
 msgid "search in both tracked and untracked files"
 msgstr "cerca tant en fitxers seguits com en no seguits"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:844
 msgid "ignore files specified via '.gitignore'"
-msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
+msgstr "ignora els fitxers especificats mitjançant «.gitignore»"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:846
 msgid "recursively search in each submodule"
 msgstr "cerca recursivament a cada submòdul"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:849
 msgid "show non-matching lines"
 msgstr "mostra les línies no coincidents"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:851
 msgid "case insensitive matching"
 msgstr "coincidència insensible a majúscula i minúscula"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:853
 msgid "match patterns only at word boundaries"
 msgstr "coincideix amb els patrons només als límits de paraula"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:855
 msgid "process binary files as text"
 msgstr "processa els fitxers binaris com a text"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:857
 msgid "don't match patterns in binary files"
 msgstr "no coincideixis amb els patrons en els fitxers binaris"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:860
 msgid "process binary files with textconv filters"
 msgstr "processa els fitxers binaris amb filtres de textconv"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:862
 msgid "search in subdirectories (default)"
-msgstr "cerca als subdirectories (per defecte)"
+msgstr "cerca als subdirectoris (per defecte)"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:864
 msgid "descend at most <depth> levels"
 msgstr "descendeix com a màxim <profunditat> nivells"
 
-#: builtin/grep.c:843
+#: builtin/grep.c:868
 msgid "use extended POSIX regular expressions"
 msgstr "usa les expressions regulars POSIX ampliades"
 
-#: builtin/grep.c:846
+#: builtin/grep.c:871
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
 
-#: builtin/grep.c:849
+#: builtin/grep.c:874
 msgid "interpret patterns as fixed strings"
 msgstr "interpreta els patrons com a cadenes fixes"
 
-#: builtin/grep.c:852
+#: builtin/grep.c:877
 msgid "use Perl-compatible regular expressions"
 msgstr "usa les expressions regulars compatibles amb Perl"
 
-#: builtin/grep.c:855
+#: builtin/grep.c:880
 msgid "show line numbers"
 msgstr "mostra els números de línia"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:881
 msgid "show column number of first match"
 msgstr "mostra el nombre de columna de la primera coincidència"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:882
 msgid "don't show filenames"
 msgstr "no mostris els noms de fitxer"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:883
 msgid "show filenames"
 msgstr "mostra els noms de fitxer"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:885
 msgid "show filenames relative to top directory"
 msgstr "mostra els noms de fitxer relatius al directori superior"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:887
 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:864
+#: builtin/grep.c:889
 msgid "synonym for --files-with-matches"
 msgstr "sinònim de --files-with-matches"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:892
 msgid "show only the names of files without match"
 msgstr "mostra només els noms dels fitxers sense coincidència"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:894
 msgid "print NUL after filenames"
 msgstr "imprimeix NUL després dels noms de fitxer"
 
-#: builtin/grep.c:872
+#: builtin/grep.c:897
 msgid "show only matching parts of a line"
 msgstr "mostra només les parts de coincidents de la línia"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:899
 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:875
+#: builtin/grep.c:900
 msgid "highlight matches"
 msgstr "ressalta les coincidències"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:902
 msgid "print empty line between matches from different files"
 msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:904
 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:882
+#: builtin/grep.c:907
 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:885
+#: builtin/grep.c:910
 msgid "show <n> context lines before matches"
 msgstr "mostra <n> línies de context abans d'una coincidència"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:912
 msgid "show <n> context lines after matches"
 msgstr "mostra <n> línies de context després d'una coincidència"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:914
 msgid "use <n> worker threads"
 msgstr "usa <n> fils de treball"
 
-#: builtin/grep.c:890
+#: builtin/grep.c:915
 msgid "shortcut for -C NUM"
 msgstr "drecera per -C NUM"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:918
 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:895
+#: builtin/grep.c:920
 msgid "show the surrounding function"
 msgstr "mostra la funció circumdant"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:923
 msgid "read patterns from file"
 msgstr "llegeix els patrons des d'un fitxer"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:925
 msgid "match <pattern>"
 msgstr "coincideix amb <patró>"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:927
 msgid "combine patterns specified with -e"
 msgstr "combina els patrons especificats amb -e"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:939
 msgid "indicate hit with exit status without output"
 msgstr "indica coincidència amb estat de sortida sense sortida textual"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:941
 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:918
-msgid "show parse tree for grep expression"
-msgstr "mostra l'arbre d'anàlisi de l'expressió grep"
-
-#: builtin/grep.c:922
+#: builtin/grep.c:944
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:922
+#: builtin/grep.c:944
 msgid "show matching files in the pager"
 msgstr "mostra els fitxers coincidents en el paginador"
 
-#: builtin/grep.c:926
+#: builtin/grep.c:948
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
 
-#: builtin/grep.c:990
+#: builtin/grep.c:1014
 msgid "no pattern given"
 msgstr "no s'ha donat cap patró"
 
-#: builtin/grep.c:1026
+#: builtin/grep.c:1050
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no es pot usar amb revisions"
 
-#: builtin/grep.c:1034
+#: builtin/grep.c:1058
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "no s'ha pogut resoldre la revisió: %s"
 
-#: builtin/grep.c:1065
+#: builtin/grep.c:1088
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked no s'admet amb --recurse-submodules"
+
+#: builtin/grep.c:1092
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinació d'opcions no vàlida, s'està ignorant --threads"
 
-#: builtin/grep.c:1068 builtin/pack-objects.c:3405
+#: builtin/grep.c:1095 builtin/pack-objects.c:3930
 msgid "no threads support, ignoring --threads"
-msgstr "no hi ha suport de fils, s'està ignorant --threads"
+msgstr "no s'admeten fils, s'ignorarà --threads"
 
-#: builtin/grep.c:1071 builtin/index-pack.c:1531 builtin/pack-objects.c:2719
+#: builtin/grep.c:1098 builtin/index-pack.c:1587 builtin/pack-objects.c:2966
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:1132
 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:1117
-msgid "option not supported with --recurse-submodules"
-msgstr "opció no admesa amb --recurse-submodules."
-
-#: builtin/grep.c:1123
+#: builtin/grep.c:1158
 msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached o --untracked no es pot usar amb --no-index."
+msgstr "--cached o --untracked no es pot usar amb --no-index"
+
+#: builtin/grep.c:1161
+#, fuzzy
+msgid "--untracked cannot be used with --cached"
+msgstr "--cached o --untracked no es pot usar amb --no-index"
 
-#: builtin/grep.c:1129
+#: builtin/grep.c:1167
 #, fuzzy
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
-msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
+msgstr "--[no-]exclude-standard no es pot utilitzar per als continguts seguits"
 
-#: builtin/grep.c:1137
+#: builtin/grep.c:1175
 #, fuzzy
 msgid "both --cached and trees are given"
-msgstr "s'han donat ambdós --caches i arbres."
+msgstr "es donen ambdós --cached i arbres"
 
 #: builtin/hash-object.c:85
 msgid ""
@@ -13736,202 +16460,206 @@ msgstr ""
 msgid "process file as it were from this path"
 msgstr "processa el fitxer com si fos d'aquest camí"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "imprimeix totes les ordres disponibles"
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "exclou guies"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr "imprimeix la llista de guies útils"
 
-#: builtin/help.c:49
-#, fuzzy
+#: builtin/help.c:50
 msgid "print all configuration variable names"
-msgstr "no es pot crear el fitxer de configuració %s"
+msgstr "imprimeix tots els noms de les variables de configuració"
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr "mostra la pàgina de manual"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr "mostra la pàgina de manual en el navegador web"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "mostra la pàgina d'informació"
 
-#: builtin/help.c:56
-#, fuzzy
+#: builtin/help.c:57
 msgid "print command description"
-msgstr "imprimeix els continguts de la comissió"
+msgstr "imprimeix la descripció de l'ordre"
 
-#: builtin/help.c:61
+#: 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:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "format d'ajuda no reconegut «%s»"
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "S'ha produït un error'ha produït un error en iniciar emacsclient."
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "S'ha produït un error en analitzar la versió d'emacsclient."
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "s'ha produït un error en executar «%s»"
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
 "«%s»: camí a un visualitzador de manuals no compatible.\n"
-"Considereu usar 'man.<eina>.cmd' en lloc d'això."
+"Considereu usar «man.<eina>.cmd» en lloc d'això."
 
-#: builtin/help.c:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr ""
 "«%s»: ordre per a un visualitzador de manuals compatible.\n"
-"Considereu usar 'man.<eina>.path' en lloc d'això."
+"Considereu usar «man.<eina>.path» en lloc d'això."
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "«%s»: visualitzador de manuals desconegut."
 
-#: builtin/help.c:367
+#: builtin/help.c:453
 msgid "no man viewer handled the request"
 msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
 
-#: builtin/help.c:375
+#: builtin/help.c:461
 msgid "no info viewer handled the request"
 msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
 
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:520 builtin/help.c:531 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "«%s» és un àlies de «%s»"
 
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:380
 #, fuzzy, c-format
 msgid "bad alias.%s string: %s"
-msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
+msgstr "àlies incorrecte.%s string%s"
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:563 builtin/help.c:593
 #, c-format
 msgid "usage: %s%s"
 msgstr "ús: %s%s"
 
-#: builtin/help.c:491
+#: builtin/help.c:577
+#, fuzzy
 msgid "'git help config' for more information"
-msgstr ""
+msgstr "'git help config' per a més informació"
 
-#: builtin/index-pack.c:185
+#: builtin/index-pack.c:222
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "hi ha una discordança de tipus d'objecte a %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:242
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no s'ha rebut l'objecte esperat %s"
 
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:245
 #, 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:258
+#: builtin/index-pack.c:295
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "no es pot omplir %d octet"
 msgstr[1] "no es pot omplir %d octets"
 
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:305
 msgid "early EOF"
 msgstr "EOF prematur"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:306
 msgid "read error on input"
 msgstr "error de lectura d'entrada"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:318
 msgid "used more bytes than were available"
 msgstr "s'han usat més octets que hi havia disponibles"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:600
+#: builtin/index-pack.c:325 builtin/pack-objects.c:624
 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:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "el paquet supera la mida màxima permesa"
 
-#: builtin/index-pack.c:312
+#: 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:326
+#: builtin/index-pack.c:363
 msgid "pack signature mismatch"
 msgstr "hi ha una discordança de signatura de paquet"
 
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:365
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la versió de paquet %<PRIu32> no és compatible"
 
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:383
 #, 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:466
+#: builtin/index-pack.c:489
 #, c-format
 msgid "inflate returned %d"
 msgstr "la inflació ha retornat %d"
 
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:538
 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:523
+#: builtin/index-pack.c:546
 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:531
+#: builtin/index-pack.c:554
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipus d'objecte desconegut %d"
 
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:585
 msgid "cannot pread pack file"
 msgstr "no es pot fer pread en el fitxer empaquetat"
 
-#: builtin/index-pack.c:564
+#: builtin/index-pack.c:587
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -13939,276 +16667,298 @@ 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:590
+#: builtin/index-pack.c:613
 msgid "serious inflate inconsistency"
 msgstr "hi ha una inconsistència seriosa d'inflació"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:761 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
 #, c-format
 msgid "unable to read %s"
 msgstr "no s'ha pogut llegir %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:825
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "no es pot llegir la informació d'objecte existent %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:833
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "no es pot llegir l'objecte existent %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:847
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objecte de blob no vàlid %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
-#, fuzzy
+#: builtin/index-pack.c:850 builtin/index-pack.c:869
 msgid "fsck error in packed object"
-msgstr "ignora els objectes empaquetats"
+msgstr "fsck error en un objecte empaquetat"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:871
 #, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:932 builtin/index-pack.c:979
 msgid "failed to apply delta"
 msgstr "s'ha produït un error en aplicar la diferència"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1162
 msgid "Receiving objects"
 msgstr "S'estan rebent objectes"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1162
 msgid "Indexing objects"
 msgstr "S'estan indexant objectes"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1196
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "el paquet és malmès (discordança SHA1)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1201
 msgid "cannot fstat packfile"
 msgstr "no es pot fer fstat en el fitxer de paquet"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1204
 msgid "pack has junk at the end"
 msgstr "el paquet té brossa al seu final"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1216
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1239
 msgid "Resolving deltas"
 msgstr "S'estan resolent les diferències"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2491
+#: builtin/index-pack.c:1250 builtin/pack-objects.c:2732
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no s'ha pogut crear fil: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1283
 msgid "confusion beyond insanity"
 msgstr "confusió més enllà de la bogeria"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1289
 #, 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:1264
+#: builtin/index-pack.c:1301
 #, 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:1268
+#: builtin/index-pack.c:1305
 #, 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:1292
+#: builtin/index-pack.c:1329
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1425
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objecte local %s és malmès"
 
-#: builtin/index-pack.c:1402
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'"
+#: builtin/index-pack.c:1446
+#, fuzzy, c-format
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "el nom del fitxer de paquet «%s» no acaba amb «.pack»"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1470
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "no es pot escriure «%s» al fitxer «%s»"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1478
 #, fuzzy, c-format
 msgid "cannot close written %s file '%s'"
-msgstr "no es pot tancar el fitxer escrit a mantenir «%s»"
+msgstr "no s'ha pogut tancar l'arxiu «%s» per escrit"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1504
 msgid "error while closing pack file"
 msgstr "error en tancar el fitxer empaquetat"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1518
 msgid "cannot store pack file"
 msgstr "no es pot emmagatzemar el fitxer empaquetat"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1526
 msgid "cannot store index file"
 msgstr "no es pot emmagatzemar el fitxer d'índex"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2730
+#: builtin/index-pack.c:1581 builtin/pack-objects.c:2977
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> incorrecte"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1651
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No es pot obrir el fitxer empaquetat existent «%s»"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1653
 #, 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:1643
+#: builtin/index-pack.c:1701
 #, 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:1650
+#: builtin/index-pack.c:1708
 #, 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:1689
+#: builtin/index-pack.c:1750
 msgid "Cannot come back to cwd"
 msgstr "No es pot tornar al directori de treball actual"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1804 builtin/index-pack.c:1807
+#: builtin/index-pack.c:1823 builtin/index-pack.c:1827
 #, c-format
 msgid "bad %s"
 msgstr "%s incorrecte"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1833 builtin/init-db.c:378 builtin/init-db.c:613
+#, 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:1779
+#: builtin/index-pack.c:1854
 msgid "--stdin requires a git repository"
-msgstr "--stdin requereix un dipòsit git"
+msgstr "--stdin requereix un repositori git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1856
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format no es pot usar sense --stdin"
+
+#: builtin/index-pack.c:1871
 msgid "--verify with no packfile name given"
 msgstr "s'ha donat --verify sense nom de fitxer de paquet"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
-#, fuzzy
+#: builtin/index-pack.c:1937 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
-msgstr "error en objecte: %s"
+msgstr "error fsck als objectes del paquet"
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "no es pot fer stat en la plantilla «%s»"
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "no es pot fer opendir en el directori «%s»"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "no es pot fer readlink en «%s»"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "no es pot fer symlink en «%s» «%s»"
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "no es pot copiar «%s» a «%s»"
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "s'està ignorant la plantilla %s"
 
-#: builtin/init-db.c:121
-#, fuzzy, c-format
+#: builtin/init-db.c:123
+#, c-format
 msgid "templates not found in %s"
-msgstr "no s'han trobat les plantilles %s"
+msgstr "plantilles no trobades a %s"
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "no s'estan copiant plantilles de «%s»: %s"
 
-#: builtin/init-db.c:334
+#: builtin/init-db.c:262
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nom de branca inicial no vàlid: «%s»"
+
+#: builtin/init-db.c:353
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "no s'ha pogut gestionar el tipus de fitxer %d"
 
-#: builtin/init-db.c:337
+#: builtin/init-db.c:356
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "no s'ha pogut moure %s a %s"
 
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:372
+#, fuzzy
+msgid "attempt to reinitialize repository with different hash"
+msgstr "s'ha intentat reinicialitzar el repositori amb un hash diferent"
+
+#: builtin/init-db.c:396 builtin/init-db.c:399
 #, c-format
 msgid "%s already exists"
 msgstr "%s ja existeix"
 
-#: builtin/init-db.c:413
+#: builtin/init-db.c:431
+#, fuzzy, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "reinicialització ignorada --initial-branch=%"
+
+#: builtin/init-db.c:462
 #, 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:414
+#: builtin/init-db.c:463
 #, 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:418
+#: builtin/init-db.c:467
 #, 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:419
+#: builtin/init-db.c:468
 #, 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:468
+#: builtin/init-db.c:517
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -14216,25 +16966,42 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<directori-de-plantilla>] [--"
 "shared[=<permisos>]] [<directori>]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:543
 msgid "permissions"
 msgstr "permisos"
 
-#: builtin/init-db.c:492
+#: builtin/init-db.c:544
 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
+msgid "override the name of the initial branch"
+msgstr "passa per alt el bit executable dels fitxers llistats"
 
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: builtin/init-db.c:551 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "hash"
+
+#: builtin/init-db.c:552 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
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "no es pot mkdir %s"
 
-#: builtin/init-db.c:538
+#: builtin/init-db.c:599 builtin/init-db.c:654
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "no es pot canviar de directori a %s"
 
-#: builtin/init-db.c:559
+#: builtin/init-db.c:626
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -14243,11 +17010,16 @@ msgstr ""
 "no es permet %s (o --work-tree=<directori>) sense especificar %s (o --git-"
 "dir=<directori>)"
 
-#: builtin/init-db.c:587
+#: builtin/init-db.c:678
 #, 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
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir és incompatible amb --bisect"
+
 #: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -14266,7 +17038,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"
@@ -14294,11 +17066,7 @@ msgstr "estableix les opcions d'anàlisi"
 
 #: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
-msgstr ""
-
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "remolc"
+msgstr "no tractis --- especialment"
 
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
@@ -14312,419 +17080,438 @@ msgstr "--trailer amb --only-input no té sentit"
 msgid "no input file given for in-place editing"
 msgstr "no s'ha donat cap fitxer d'entrada per a edició in situ"
 
-#: builtin/log.c:55
+#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opcions>] <objecte>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opció --decorate no vàlida: %s"
 
-#: builtin/log.c:160
-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 ""
-
-#: builtin/log.c:183
+#: builtin/log.c:180
 msgid "show source"
 msgstr "mostra la font"
 
-#: builtin/log.c:184
-msgid "Use mail map file"
+#: builtin/log.c:181
+#, fuzzy
+msgid "use mail map file"
 msgstr "Usa el fitxer de mapa de correu"
 
-#: builtin/log.c:186
+#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr "només decora les referències que coincideixin amb <patró>"
 
-#: builtin/log.c:188
+#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr "no decoris les referències que coincideixen amb <patró>"
 
-#: builtin/log.c:189
+#: builtin/log.c:187
 msgid "decorate options"
 msgstr "opcions de decoració"
 
-#: builtin/log.c:192
-msgid "Process line range n,m in file, counting from 1"
-msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1"
+#: builtin/log.c: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"
+
+#: builtin/log.c:213
+#, fuzzy
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "%s: %s no es pot usar amb %s"
 
-#: builtin/log.c:297
+#: builtin/log.c:303
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortida final: %d %s\n"
 
-#: builtin/log.c:551
+#: builtin/log.c:568
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: fitxer incorrecte"
 
-#: builtin/log.c:566 builtin/log.c:660
-#, fuzzy, c-format
+#: builtin/log.c:583 builtin/log.c:673
+#, c-format
 msgid "could not read object %s"
-msgstr "No es pot llegir l'objecte %s"
+msgstr "no s'ha pogut llegir l'objecte %s"
 
-#: builtin/log.c:685
-#, fuzzy, c-format
+#: builtin/log.c:698
+#, c-format
 msgid "unknown type: %d"
-msgstr "Tipus desconegut: %d"
+msgstr "tipus desconegut: %d"
+
+#: builtin/log.c:843
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: cobertura no vàlida des del mode descripció"
 
-#: builtin/log.c:808
+#: builtin/log.c:850
 msgid "format.headers without value"
 msgstr "format.headers sense valor"
 
-#: builtin/log.c:925
-msgid "name of output directory is too long"
-msgstr "el nom del directori de sortida és massa llarg"
-
-#: builtin/log.c:941
-#, fuzzy, c-format
+#: builtin/log.c:979
+#, c-format
 msgid "cannot open patch file %s"
-msgstr "No es pot obrir el fitxer de pedaç %s"
+msgstr "no s'ha pogut obrir el fitxer de pedaç %s"
 
-#: builtin/log.c:958
-#, fuzzy
+#: builtin/log.c:996
 msgid "need exactly one range"
-msgstr "Cal exactament un rang."
+msgstr "necessita exactament un interval"
 
-#: builtin/log.c:968
-#, fuzzy
+#: builtin/log.c:1006
 msgid "not a range"
-msgstr "No és un rang."
+msgstr "no és un interval"
 
-#: builtin/log.c:1091
+#: builtin/log.c:1170
 #, fuzzy
 msgid "cover letter needs email format"
-msgstr "La carta de presentació necessita el format de correu electrònic"
+msgstr "la lletra de la portada necessita un format de correu electrònic"
 
-#: builtin/log.c:1097
+#: builtin/log.c:1176
 #, fuzzy
 msgid "failed to create cover-letter file"
-msgstr "S'ha produït un error en crear els fitxers de sortida"
+msgstr "no s'ha pogut crear el fitxer de portada"
 
-#: builtin/log.c:1176
+#: builtin/log.c:1263
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to boig: %s"
 
-#: builtin/log.c:1203
+#: builtin/log.c:1290
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
 
-#: builtin/log.c:1261
-#, fuzzy
+#: builtin/log.c:1348
 msgid "two output directories?"
-msgstr "Hi ha dos directoris de sortida?"
+msgstr "dos directoris de sortida?"
 
-#: builtin/log.c:1372 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
-#, fuzzy, c-format
+#: builtin/log.c:1499 builtin/log.c:2326 builtin/log.c:2328 builtin/log.c:2340
+#, c-format
 msgid "unknown commit %s"
-msgstr "Comissió desconeguda %s"
+msgstr "comissió desconeguda %s"
 
-#: builtin/log.c:1382 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1510 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:1387
-#, fuzzy
+#: builtin/log.c:1519
 msgid "could not find exact merge base"
-msgstr "No s'ha pogut trobar la base exacta de fusió."
+msgstr "no s'ha pogut trobar la base exacta de la fusió"
 
-#: builtin/log.c:1391
+#: builtin/log.c:1529
 #, fuzzy
 msgid ""
 "failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
 "Or you could specify base commit by --base=<base-commit-id> manually"
 msgstr ""
-"S'ha produït un error en obtenir la font. Si voleu registrar la comissió "
-"base\n"
-"automàticament, useu git branch --set-upstream-to per a\n"
-"seguir una branca remota. O podeu especificar la comissió base manualment\n"
-"amb --base=<id-de-comissió-base>."
+"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"
 
-#: builtin/log.c:1411
-#, fuzzy
+#: builtin/log.c:1552
 msgid "failed to find exact merge base"
-msgstr "S'ha produït un error en trobar la base exacta de fusió."
+msgstr "no s'ha pogut trobar la base exacta de la fusió"
 
-#: builtin/log.c:1422
+#: builtin/log.c:1569
 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:1426
+#: builtin/log.c:1579
 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:1479
+#: builtin/log.c:1637
 msgid "cannot get patch id"
 msgstr "no es pot obtenir l'id del pedaç"
 
-#: builtin/log.c:1531
+#: builtin/log.c:1700
 #, fuzzy
-msgid "failed to infer range-diff ranges"
-msgstr "s'ha produït un error en executar «%s»"
+msgid "failed to infer range-diff origin of current series"
+msgstr "no s'ha pogut inferir l'interval-diferències"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1702
+#, fuzzy, 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"
+
+#: builtin/log.c:1746
 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:1579
+#: builtin/log.c:1749
 msgid "use [PATCH] even with multiple patches"
 msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
 
-#: builtin/log.c:1583
+#: builtin/log.c:1753
 msgid "print patches to standard out"
 msgstr "imprimeix els pedaços a la sortida estàndard"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1755
 msgid "generate a cover letter"
 msgstr "genera una carta de presentació"
 
-#: builtin/log.c:1587
+#: builtin/log.c:1757
 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:1588
+#: builtin/log.c:1758
 msgid "sfx"
 msgstr "sufix"
 
-#: builtin/log.c:1589
+#: builtin/log.c:1759
 msgid "use <sfx> instead of '.patch'"
-msgstr "usa <sufix> en lloc de '.patch'"
+msgstr "usa <sufix> en lloc de «.patch»"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1761
 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:1593
+#: builtin/log.c:1762
+msgid "reroll-count"
+msgstr ""
+
+#: builtin/log.c:1763
 msgid "mark the series as Nth re-roll"
 msgstr "marca la sèrie com a l'enèsima llançada"
 
-#: builtin/log.c:1595
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
+#: builtin/log.c:1765
+msgid "max length of output filename"
+msgstr "mida màxima del nom del fitxer de sortida"
+
+#: builtin/log.c:1767
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "useu [RFC PATCH] en comptes de [PATCH]"
 
-#: builtin/log.c:1598
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Usa [<prefix>] en lloc de [PATCH]"
+#: builtin/log.c:1770
+msgid "cover-from-description-mode"
+msgstr "cover-from-description-mode"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1771
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"genera parts d'una carta de presentació basant-se en la descripció d'una branca"
+
+#: builtin/log.c:1773
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "useu [<prefix>] en comptes de [PATCH]"
+
+#: builtin/log.c:1776
 msgid "store resulting files in <dir>"
 msgstr "emmagatzema els fitxers resultants a <directori>"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1779
 msgid "don't strip/add [PATCH]"
 msgstr "no despullis/afegeixis [PATCH]"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1782
 msgid "don't output binary diffs"
 msgstr "no emetis diferències binàries"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1784
 msgid "output all-zero hash in From header"
 msgstr "emet un hash de tots zeros en la capçalera From"
 
-#: builtin/log.c:1611
+#: builtin/log.c:1786
 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:1613
+#: builtin/log.c:1788
 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:1615
+#: builtin/log.c:1790
 msgid "Messaging"
 msgstr "Missatgeria"
 
-#: builtin/log.c:1616
+#: builtin/log.c:1791
 msgid "header"
 msgstr "capçalera"
 
-#: builtin/log.c:1617
+#: builtin/log.c:1792
 msgid "add email header"
 msgstr "afegeix una capçalera de correu electrònic"
 
-#: builtin/log.c:1618 builtin/log.c:1620
+#: builtin/log.c:1793 builtin/log.c:1794
 msgid "email"
 msgstr "correu electrònic"
 
-#: builtin/log.c:1618
+#: builtin/log.c:1793
 msgid "add To: header"
 msgstr "afegeix la capçalera To:"
 
-#: builtin/log.c:1620
+#: builtin/log.c:1794
 msgid "add Cc: header"
 msgstr "afegeix la capçalera Cc:"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1795
 msgid "ident"
 msgstr "identitat"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1796
 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:1625
+#: builtin/log.c:1798
 msgid "message-id"
 msgstr "ID de missatge"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1799
 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:1627 builtin/log.c:1630
+#: builtin/log.c:1800 builtin/log.c:1803
 msgid "boundary"
 msgstr "límit"
 
-#: builtin/log.c:1628
+#: builtin/log.c:1801
 msgid "attach the patch"
 msgstr "adjunta el pedaç"
 
-#: builtin/log.c:1631
+#: builtin/log.c:1804
 msgid "inline the patch"
 msgstr "posa el pedaç en el cos"
 
-#: builtin/log.c:1635
+#: builtin/log.c:1808
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
 
-#: builtin/log.c:1637
+#: builtin/log.c:1810
 msgid "signature"
 msgstr "signatura"
 
-#: builtin/log.c:1638
+#: builtin/log.c:1811
 msgid "add a signature"
 msgstr "afegeix una signatura"
 
-#: builtin/log.c:1639
+#: builtin/log.c:1812
 msgid "base-commit"
 msgstr "comissió base"
 
-#: builtin/log.c:1640
+#: builtin/log.c:1813
 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:1642
+#: builtin/log.c:1816
 msgid "add a signature from a file"
 msgstr "afegeix una signatura des d'un fitxer"
 
-#: builtin/log.c:1643
+#: builtin/log.c:1817
 msgid "don't print the patch filenames"
 msgstr "no imprimeixis els noms de fitxer del pedaç"
 
-#: builtin/log.c:1645
+#: builtin/log.c:1819
 msgid "show progress while generating patches"
 msgstr "mostra el progrés durant la generació de pedaços"
 
-#: builtin/log.c:1647
+#: builtin/log.c:1821
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
+"mostra els canvis contra <rev> a la carta de presentació o a un sol pedaç"
 
-#: builtin/log.c:1650
+#: builtin/log.c:1824
+#, fuzzy
 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ç"
 
-#: builtin/log.c:1652
+#: builtin/log.c:1826 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
-msgstr ""
+msgstr "percentatge pel qual la creació és ponderada"
 
-#: builtin/log.c:1727
+#: builtin/log.c:1913
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línia d'identitat no vàlida: %s"
 
-#: builtin/log.c:1742
-#, fuzzy
+#: builtin/log.c:1928
 msgid "-n and -k are mutually exclusive"
-msgstr "-n i -k són mútuament excloents."
+msgstr "-n i -k són mútuament excloents"
 
-#: builtin/log.c:1744
-#, fuzzy
+#: builtin/log.c:1930
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc i -k són mútuament excloents."
+msgstr "--subject-prefix/--rfc i -k són mútuament excloents"
 
-#: builtin/log.c:1752
+#: builtin/log.c:1938
 msgid "--name-only does not make sense"
 msgstr "--name-only no té sentit"
 
-#: builtin/log.c:1754
+#: builtin/log.c:1940
 msgid "--name-status does not make sense"
 msgstr "--name-status no té sentit"
 
-#: builtin/log.c:1756
+#: builtin/log.c:1942
 msgid "--check does not make sense"
 msgstr "--check no té sentit"
 
-#: builtin/log.c:1788
-msgid "standard output, or directory, which one?"
-msgstr "sortida estàndard o directori, quin dels dos?"
+#: 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:1877
+#: builtin/log.c:2087
 msgid "--interdiff requires --cover-letter or single patch"
-msgstr ""
+msgstr "--interdiff requereix --cover-letter o un sol pedaç"
 
-#: builtin/log.c:1881
+#: builtin/log.c:2091
 msgid "Interdiff:"
-msgstr ""
+msgstr "Interdiff:"
 
-#: builtin/log.c:1882
+#: builtin/log.c:2092
 #, c-format
 msgid "Interdiff against v%d:"
-msgstr ""
+msgstr "Interdiff contra v%d:"
 
-#: builtin/log.c:1888
+#: builtin/log.c:2098
 msgid "--creation-factor requires --range-diff"
-msgstr ""
+msgstr "--creation-factor requereix --range-diff"
 
-#: builtin/log.c:1892
+#: builtin/log.c:2102
 msgid "--range-diff requires --cover-letter or single patch"
-msgstr ""
+msgstr "--range-diff requereix --cover-letter o un sol pedaç"
 
-#: builtin/log.c:1900
+#: builtin/log.c:2110
+#, fuzzy
 msgid "Range-diff:"
-msgstr ""
+msgstr "Diferència-interval"
 
-#: builtin/log.c:1901
-#, c-format
+#: builtin/log.c:2111
+#, fuzzy, c-format
 msgid "Range-diff against v%d:"
-msgstr ""
+msgstr "Diferència de l'interval contra el v%d"
 
-#: builtin/log.c:1912
+#: builtin/log.c:2122
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
 
-#: builtin/log.c:1948
+#: builtin/log.c:2158
 msgid "Generating patches"
 msgstr "S'estan generant els pedaços"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2202
 #, fuzzy
 msgid "failed to create output files"
-msgstr "S'ha produït un error en crear els fitxers de sortida"
+msgstr "no s'han pogut crear els fitxers de sortida"
 
-#: builtin/log.c:2051
+#: builtin/log.c:2261
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2315
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -14732,112 +17519,116 @@ msgstr ""
 "No s'ha pogut trobar una branca remota seguida. Especifiqueu <font> "
 "manualment.\n"
 
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opcions>] [<fitxer>...]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:619
 msgid "identify the file status with tags"
 msgstr "identifica l'estat de fitxer amb etiquetes"
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:621
 msgid "use lowercase letters for 'assume unchanged' files"
-msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
+msgstr "usa lletres minúscules per als fitxers «assume unchanged»"
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:623
 msgid "use lowercase letters for 'fsmonitor clean' files"
-msgstr "usa lletres minúscules per als fitxers 'fsmonitor clean'"
+msgstr "usa lletres minúscules per als fitxers «fsmonitor clean»"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:625
 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:534
+#: builtin/ls-files.c:627
 msgid "show deleted files in the output"
 msgstr "mostra en la sortida els fitxers suprimits"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:629
 msgid "show modified files in the output"
 msgstr "mostra en la sortida els fitxers modificats"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:631
 msgid "show other files in the output"
 msgstr "mostra en la sortida els altres fitxers"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:633
 msgid "show ignored files in the output"
 msgstr "mostra en la sortida els fitxers ignorats"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:636
 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:545
+#: builtin/ls-files.c:638
 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:547
+#: builtin/ls-files.c:640
 msgid "show 'other' directories' names only"
-msgstr "mostra només els noms dels directoris 'other'"
+msgstr "mostra només els noms dels directoris «other»"
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:642
 msgid "show line endings of files"
 msgstr "mostra els terminadors de línia dels fitxers"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:644
 msgid "don't show empty directories"
 msgstr "no mostris els directoris buits"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:647
 msgid "show unmerged files in the output"
 msgstr "mostra en la sortida els fitxers sense fusionar"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr "mostra la informació de resolució de desfet"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:651
 msgid "skip files matching pattern"
 msgstr "omet els fitxers coincidents amb el patró"
 
-#: builtin/ls-files.c:561
+#: 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:564
+#: builtin/ls-files.c:657
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
 
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
 msgstr "afegeix les exclusions estàndards de git"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:663
 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:573
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:668
 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:576
+#: builtin/ls-files.c:669
 msgid "tree-ish"
 msgstr "arbre"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:670
 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:579
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr "mostra les dades de depuració"
 
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+msgstr "suprimeix les entrades duplicades"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -14847,43 +17638,43 @@ msgstr ""
 "git ls-remote [--heads] [--tags] [--refs]\n"
 "                     [--upload-pack=<executable>] [-q | --quiet]\n"
 "                     [--exit-code] [--get-url] [--symref]\n"
-"                     [<dipòsit> [<referències>...]]"
+"                     [<repositori> [<referències>...]]"
 
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "no imprimeixis l'URL remot"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1464
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
 msgid "exec"
 msgstr "executable"
 
-#: 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 "camí a git-upload-pack en la màquina remota"
 
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "limita a etiquetes"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "limita a caps"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "no mostris les etiquetes pelades"
 
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "tingues en compte url.<base>.insteadOf"
 
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "surt amb codi de sortida 2 si no es troba cap referència coincident"
 
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
-msgstr "mostra la referència subjacent a més de l'objecte que senyali"
+msgstr "mostra la referència subjacent a més de l'objecte que assenyali"
 
 #: builtin/ls-tree.c:30
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
@@ -14922,295 +17713,455 @@ msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "llista l'arbre sencer; no només el directori actual (implica --full-name)"
 
+#. 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í>"
+
+#: builtin/mailinfo.c:58
+#, fuzzy
+msgid "keep subject"
+msgstr "retén els objectes inabastables"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr ""
+
+#: builtin/mailinfo.c:62
+#, fuzzy
+msgid "copy Message-ID to the end of commit message"
+msgstr "edita el missatge de comissió"
+
+#: 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
+#, fuzzy
+msgid "<action>"
+msgstr "acció"
+
+#: 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
 msgid "empty mbox: '%s'"
 msgstr "mbox buit: «%s»"
 
-#: builtin/merge.c:55
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <comissió> <comissió>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <comissió>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <comissió>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <comissió> <comissió>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <referència> [<comissió>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "emet tots els avantpassats comuns"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "troba els avantpassats per a una sola fusió d'n vies"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "llista les revisions no abastables d'altres"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+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>"
+
+#: 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>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "envia els resultats a la sortida estàndard"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "usa una fusió basada en diff3"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "en conflictes, usa la nostra versió"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "en conflictes, usa la seva versió"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "en conflictes, usa una versió d'unió"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "en conflictes, usa aquesta mida de marcador"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "no avisis de conflictes"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "opció desconeguda %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "no s'ha pogut analitzar l'objecte «%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] "no es pot gestionar més d'%d base. S'està ignorant %s."
+msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s."
+
+#: builtin/merge-recursive.c:65
+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-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "no s'ha pogut resoldre la referència «%s»"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "S'està fusionant %s amb %s\n"
+
+#: builtin/merge.c:58
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opcions>] [<comissió>...]"
 
-#: builtin/merge.c:56
+#: builtin/merge.c:59
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:57
+#: builtin/merge.c:60
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
 msgstr "l'opció «m» requereix un valor"
 
-#: builtin/merge.c:141
-#, fuzzy, c-format
+#: builtin/merge.c:146
+#, c-format
 msgid "option `%s' requires a value"
 msgstr "l'opció «%s» requereix un valor"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:199
 #, 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:188
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les estratègies disponibles són:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:205
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les estratègies personalitzades disponibles són:"
 
-#: builtin/merge.c:244 builtin/pull.c:151
+#: builtin/merge.c:256 builtin/pull.c:133
 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:247 builtin/pull.c:154
+#: builtin/merge.c:259 builtin/pull.c:136
 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:248 builtin/pull.c:157
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(sinònim de --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:160
+#: builtin/merge.c:262 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "afegeix (com a màxim <n>) entrades del registre curt al missatge de comissió "
 "de fusió"
 
-#: builtin/merge.c:253 builtin/pull.c:166
+#: builtin/merge.c:265 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr "crea una única comissió en lloc de fusionar"
 
-#: builtin/merge.c:255 builtin/pull.c:169
+#: builtin/merge.c:267 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "realitza una comissió si la fusió té èxit (per defecte)"
 
-#: builtin/merge.c:257 builtin/pull.c:172
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "edita el missatge abans de cometre"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
 msgstr "permet l'avanç ràpid (per defecte)"
 
-#: builtin/merge.c:261 builtin/pull.c:179
+#: builtin/merge.c:273 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "avorta si l'avanç ràpid no és possible"
 
-#: builtin/merge.c:265 builtin/pull.c:182
+#: builtin/merge.c:277 builtin/pull.c:164
 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:266 builtin/notes.c:787 builtin/pull.c:186
-#: builtin/rebase.c:492 builtin/rebase.c:1477 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:267 builtin/pull.c:187
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "estratègia de fusió a usar"
 
-#: builtin/merge.c:268 builtin/pull.c:190
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr "opció=valor"
 
-#: builtin/merge.c:269 builtin/pull.c:191
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "opció per a l'estratègia de fusió seleccionada"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:283
 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:278
+#: builtin/merge.c:290
 msgid "abort the current in-progress merge"
 msgstr "avorta la fusió en curs actual"
 
-#: builtin/merge.c:280
-#, fuzzy
+#: builtin/merge.c:292
 msgid "--abort but leave index and working tree alone"
-msgstr "restableix HEAD, l'índex i l'arbre de treball"
+msgstr "--abort però deixa l'índex i l'arbre de treball intactes"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:294
 msgid "continue the current in-progress merge"
 msgstr "continua la fusió en curs actual"
 
-#: builtin/merge.c:284 builtin/pull.c:198
+#: builtin/merge.c:296 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "permet fusionar històries no relacionades"
 
-#: builtin/merge.c:290
-msgid "verify commit-msg hook"
-msgstr "verifica el lligam de missatge de comissió"
+#: builtin/merge.c:303
+#, fuzzy
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "evita els ganxos pre-combinació i missatge de comissió"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:320
 msgid "could not run stash."
 msgstr "no s'ha pogut executar «stash»."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:325
 msgid "stash failed"
 msgstr "l'«stash» ha fallat"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:330
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no és un objecte vàlid: %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr "read-tree ha fallat"
 
-#: builtin/merge.c:386
-msgid " (nothing to squash)"
+#: builtin/merge.c:400
+#, fuzzy
+msgid "Already up to date. (nothing to squash)"
 msgstr " (res a fer «squash»)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:464
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "«%s» no assenyala una comissió"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:602
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
 
-#: builtin/merge.c:708
+#: builtin/merge.c:728
 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:722
+#: builtin/merge.c:741
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opció desconeguda de merge-recursive: -X%s"
 
-#: builtin/merge.c:737
+#: builtin/merge.c:760 t/helper/test-fast-rebase.c:209
 #, c-format
 msgid "unable to write %s"
 msgstr "no s'ha pogut escriure %s"
 
-#: builtin/merge.c:789
+#: builtin/merge.c:812
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "No s'ha pogut llegir de «%s»"
 
-#: builtin/merge.c:798
+#: builtin/merge.c:821
 #, 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"
+"No s'està cometent la fusió; useu «git commit» per a completar la fusió.\n"
 
-#: builtin/merge.c:804
+#: builtin/merge.c:827
 #, fuzzy
 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 a explicar per què\n"
-"aquesta fusió és necessària, especialment si fusiona una font\n"
-"actualitzada a una branca temàtica.\n"
-"\n"
-"S'ignoraran les línies que comencin amb «%c», i un missatge buit\n"
-"avorta la comissió.\n"
+"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."
 
-#: builtin/merge.c:809
-#, fuzzy
+#: builtin/merge.c:832
 msgid "An empty message aborts the commit.\n"
-msgstr "edita el missatge abans de cometre"
+msgstr "Un missatge buit interromp la comissió.\n"
 
-#: builtin/merge.c:812
-#, fuzzy, c-format
+#: builtin/merge.c:835
+#, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr ""
-"Introduïu el missatge de comissió dels vostres canvis.\n"
-"S'ignoraran les línies que comencin amb «%c», i un missatge de\n"
-"comissió buit avorta la comissió.\n"
+"Les línies que comencen amb «%c» seran ignorades i un missatge buit "
+"interromp la comissió.\n"
 
-#: builtin/merge.c:853
+#: builtin/merge.c:888
 msgid "Empty commit message."
 msgstr "El missatge de comissió és buit."
 
-#: builtin/merge.c:872
+#: builtin/merge.c:903
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Meravellós.\n"
 
-#: builtin/merge.c:933
+#: builtin/merge.c:964
 #, 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:972
+#: builtin/merge.c:1003
 msgid "No current branch."
 msgstr "No hi ha cap branca actual."
 
-#: builtin/merge.c:974
+#: builtin/merge.c:1005
 msgid "No remote for the current branch."
 msgstr "No hi ha cap remot per a la branca actual."
 
-#: builtin/merge.c:976
+#: builtin/merge.c:1007
 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:981
+#: builtin/merge.c:1012
 #, 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:1038
+#: builtin/merge.c:1069
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor incorrecte «%s» en l'entorn «%s»"
 
-#: builtin/merge.c:1141
+#: builtin/merge.c:1172
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "no és quelcom que puguem fusionar en %s: %s"
 
-#: builtin/merge.c:1175
+#: builtin/merge.c:1206
 msgid "not something we can merge"
 msgstr "no és quelcom que puguem fusionar"
 
-#: builtin/merge.c:1278
+#: builtin/merge.c:1316
 msgid "--abort expects no arguments"
-msgstr "--abort no accepta paràmetres"
+msgstr "--abort no espera cap argument"
 
-#: builtin/merge.c:1282
+#: builtin/merge.c:1320
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1291
-#, fuzzy
+#: builtin/merge.c:1338
 msgid "--quit expects no arguments"
-msgstr "--abort no accepta paràmetres"
+msgstr "--quit no espera cap argument"
 
-#: builtin/merge.c:1304
+#: builtin/merge.c:1351
 msgid "--continue expects no arguments"
-msgstr "--continue no accepta paràmetres"
+msgstr "--continue no espera cap argument"
 
-#: builtin/merge.c:1308
+#: builtin/merge.c:1355
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1371
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15218,7 +18169,7 @@ msgstr ""
 "No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
 "Cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1331
+#: builtin/merge.c:1378
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15226,216 +18177,137 @@ msgstr ""
 "No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
 "Cometeu els vostres canvis abans de fusionar."
 
-#: builtin/merge.c:1334
+#: builtin/merge.c:1381
 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:1348
+#: builtin/merge.c:1395
 msgid "You cannot combine --squash with --no-ff."
 msgstr "No podeu combinar --squash amb --no-ff."
 
-#: builtin/merge.c:1350
-#, fuzzy
+#: builtin/merge.c:1397
 msgid "You cannot combine --squash with --commit."
-msgstr "No podeu combinar --squash amb --no-ff."
+msgstr "No podeu combinar --squash amb --commit."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1413
 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:1383
+#: builtin/merge.c:1430
 msgid "Squash commit into empty head not supported yet"
 msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
 
-#: builtin/merge.c:1385
+#: builtin/merge.c:1432
 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:1390
+#: builtin/merge.c:1437
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - no és una cosa que puguem fusionar"
 
-#: builtin/merge.c:1392
+#: builtin/merge.c:1439
 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:1471
+#: builtin/merge.c:1520
 msgid "refusing to merge unrelated histories"
 msgstr "s'està refusant fusionar històries no relacionades"
 
-#: builtin/merge.c:1480
-msgid "Already up to date."
-msgstr "Ja està al dia."
-
-#: builtin/merge.c:1490
+#: builtin/merge.c:1539
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "S'estan actualitzant %s..%s\n"
 
-#: builtin/merge.c:1532
+#: builtin/merge.c:1585
 #, 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:1539
+#: builtin/merge.c:1592
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: builtin/merge.c:1564
-msgid "Already up to date. Yeeah!"
-msgstr "Ja està al dia. Estupend!"
-
-#: builtin/merge.c:1570
+#: 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:1593 builtin/merge.c:1658
+#: builtin/merge.c:1651 builtin/merge.c:1716
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "S'està rebobinant l'arbre a la pristina...\n"
 
-#: builtin/merge.c:1597
+#: builtin/merge.c:1655
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "S'està intentant l'estratègia de fusió %s...\n"
 
-#: builtin/merge.c:1649
+#: builtin/merge.c:1707
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
 
-#: builtin/merge.c:1651
+#: builtin/merge.c:1709
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "L'estratègia de fusió %s ha fallat.\n"
 
-#: builtin/merge.c:1660
+#: builtin/merge.c:1718
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
 
-#: builtin/merge.c:1672
+#: builtin/merge.c:1732
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "La fusió automàtica ha sortit bé; s'ha aturat abans de cometre com s'havia "
 "demanat\n"
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <comissió> <comissió>..."
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <comissió>..."
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <comissió>..."
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <comissió> <comissió>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <referència> [<comissió>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "emet tots els avantpassats comuns"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "troba els avantpassats per a una sola fusió d'n vies"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "llista les revisions no abastables d'altres"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "és la primera un avantpassat de l'altre?"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr ""
-"troba on <comissió> s'ha bifurcat del registre de referències de <referència>"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+#: builtin/mktag.c:10
+msgid "git mktag"
 msgstr ""
-"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"
-msgstr "envia els resultats a la sortida estàndard"
 
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "usa una fusió basada en diff3"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "en conflictes, usa la nostra versió"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "en conflictes, usa la seva versió"
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr "en conflictes, usa una versió d'unió"
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr "en conflictes, usa aquesta mida de marcador"
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "no avisis de conflictes"
-
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "estableix les etiquetes per a fitxer1/fitxer-original/fitxer2"
+#: builtin/mktag.c:27
+#, fuzzy, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "avís: «:include:» no s'admet: %s\n"
 
-#: builtin/merge-recursive.c:46
+#: builtin/mktag.c:38
 #, c-format
-msgid "unknown option %s"
-msgstr "opció desconeguda %s"
+msgid "error: tag input does not pass fsck: %s"
+msgstr ""
 
-#: builtin/merge-recursive.c:52
+#: builtin/mktag.c:41
 #, c-format
-msgid "could not parse object '%s'"
-msgstr "no s'ha pogut analitzar l'objecte «%s»"
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr ""
 
-#: builtin/merge-recursive.c:56
-#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "no es pot gestionar més d'%d base. S'està ignorant %s."
-msgstr[1] "no es poden gestionar més de %d bases. S'està ignorant %s."
+#: builtin/mktag.c:56
+#, fuzzy, c-format
+msgid "could not read tagged object '%s'"
+msgstr "no s'ha pogut llegir l'objecte %s"
 
-#: builtin/merge-recursive.c:64
-msgid "not handling anything other than two heads merge."
-msgstr "no s'està gestionant res a part de la fusió de dos caps."
+#: builtin/mktag.c:59
+#, fuzzy, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "l'objecte %s és %s, no pas %s"
 
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "no s'ha pogut resoldre la referència «%s»"
+#: builtin/mktag.c:97
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
 
-#: builtin/merge-recursive.c:78
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "S'està fusionant %s amb %s\n"
+#: builtin/mktag.c:100
+#, fuzzy
+msgid "tag on stdin did not refer to a valid object"
+msgstr "%s no apunta a un objecte vàlid"
+
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
 
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
@@ -15453,38 +18325,61 @@ msgstr "permet els objectes absents"
 msgid "allow creation of more than one tree"
 msgstr "permet la creació de més d'un arbre"
 
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+#: builtin/multi-pack-index.c:10
+#, fuzzy
+msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
 msgstr ""
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
+
+#: builtin/multi-pack-index.c:13
+#, fuzzy
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git upload-pack [<opcions>] <directori>"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:16
+#, fuzzy
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git upload-pack [<opcions>] <directori>"
+
+#: builtin/multi-pack-index.c:19
+#, fuzzy
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr ""
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
+
+#: builtin/multi-pack-index.c:54
+#, fuzzy
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
+"directori de l'objecte que conté el conjunt de parells packfile i pack-index"
 
-#: builtin/multi-pack-index.c:25
-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:43 builtin/prune-packed.c:67
-msgid "too many arguments"
-msgstr "hi ha massa paràmetres"
+#: builtin/multi-pack-index.c:70
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr ""
 
-#: builtin/multi-pack-index.c:52
-msgid "--batch-size option is only for 'repack' subcommand"
+#: builtin/multi-pack-index.c:128
+#, fuzzy
+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 "
+"petita en un lot que és més gran que aquesta mida"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:180
 #, fuzzy, c-format
 msgid "unrecognized subcommand: %s"
-msgstr "subordre desconeguda: %s"
+msgstr "subcomandes no reconeguts"
 
 #: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
-msgstr "git mv [<opcions>] <font>... <destí>"
+msgstr "git mv [<opcions>] <origen>... <destí>"
 
 #: builtin/mv.c:83
 #, c-format
@@ -15510,113 +18405,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:169
+#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "el destí «%s» no és un directori"
 
-#: builtin/mv.c:180
+#: builtin/mv.c:181
 #, 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:184
+#: builtin/mv.c:185
 msgid "bad source"
-msgstr "font incorrecta"
+msgstr "origen incorrecte"
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 msgid "can not move directory into itself"
 msgstr "no es pot moure un directori a dins d'ell mateix"
 
-#: builtin/mv.c:190
+#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr "no es pot moure un directori sobre un fitxer"
 
-#: builtin/mv.c:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
-msgstr "el directori font està buit"
+msgstr "el directori d'origen està buit"
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 msgid "not under version control"
 msgstr "no està sota control de versions"
 
 #: builtin/mv.c:227
+msgid "conflicted"
+msgstr "en conflicte"
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "el destí existeix"
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "s'està sobreescrivint «%s»"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "No es pot sobreescriure"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
-msgstr "múltiples fonts per al mateix destí"
+msgstr "múltiples orígens per al mateix destí"
 
-#: builtin/mv.c:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "el directori destí no existeix"
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, origen=%s, destí=%s"
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "S'està canviant el nom de %s a %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:520
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "el canvi del nom de «%s» ha fallat"
 
-#: builtin/name-rev.c:352
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opcions>] <comissió>..."
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opcions>] --all"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opcions>] --stdin"
 
-#: builtin/name-rev.c:411
-msgid "print only names (no SHA-1)"
-msgstr "imprimeix només els noms (sense SHA-1)"
+#: builtin/name-rev.c:524
+#, fuzzy
+msgid "print only ref-based names (no object names)"
+msgstr "imprimeix només les branques de l'objecte"
 
-#: builtin/name-rev.c:412
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "només usa les etiquetes per a anomenar les comissions"
 
-#: builtin/name-rev.c:414
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "només usa les referències que coincideixin amb <patró>"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignora les referències que coincideixin amb <patró>"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "llista totes les comissions abastables de totes les referències"
 
-#: builtin/name-rev.c:419
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "llegeix de stdin"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
-msgstr "permet imprimir els noms `undefined` (per defecte)"
+msgstr "permet imprimir els noms «undefined» (per defecte)"
 
-#: builtin/name-rev.c:426
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "desreferencia les etiquetes en l'entrada (ús intern)"
 
@@ -15740,16 +18640,16 @@ msgstr "Escriviu/editeu les notes per l'objecte següent:"
 #: builtin/notes.c:150
 #, c-format
 msgid "unable to start 'show' for object '%s'"
-msgstr "no s'ha pogut iniciar 'show' per a l'objecte «%s»"
+msgstr "no s'ha pogut iniciar «show» per a l'objecte «%s»"
 
 #: builtin/notes.c:154
 msgid "could not read 'show' output"
-msgstr "no s'ha pogut llegir la sortida de 'show'"
+msgstr "no s'ha pogut llegir la sortida de «show»"
 
 #: builtin/notes.c:162
 #, 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
 msgid "please supply the note contents using either -m or -F option"
@@ -15765,7 +18665,7 @@ msgstr "no s'ha pogut escriure l'objecte de nota"
 msgid "the note contents have been left in %s"
 msgstr "s'han deixat els continguts de la nota en %s"
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:576
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "no s'ha pogut obrir o llegir «%s»"
@@ -15808,8 +18708,9 @@ 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
-msgid "too many parameters"
-msgstr "massa paràmetres"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
+msgstr "hi ha massa arguments"
 
 #: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
@@ -15847,7 +18748,7 @@ msgid ""
 "existing notes"
 msgstr ""
 "No es poden afegir les notes. S'han trobat notes existents de l'objecte %s. "
-"Useu '-f' per a sobreescriure les notes existents"
+"Useu «-f» per a sobreescriure les notes existents"
 
 #: builtin/notes.c:463 builtin/notes.c:544
 #, c-format
@@ -15869,8 +18770,9 @@ msgstr ""
 "carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
 
 #: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "hi ha massa pocs paràmetres"
+#, fuzzy
+msgid "too few arguments"
+msgstr "hi ha massa arguments"
 
 #: builtin/notes.c:538
 #, c-format
@@ -15879,7 +18781,7 @@ msgid ""
 "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."
+"Useu «-f» per a sobreescriure les notes existents"
 
 #: builtin/notes.c:550
 #, c-format
@@ -15892,7 +18794,7 @@ 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 ""
-"Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n"
+"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
@@ -15906,7 +18808,7 @@ msgstr "s'ha produït un error en suprimir la referència NOTES_MERGE_REF"
 #: builtin/notes.c:702
 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'"
+"s'ha produït un error en eliminar l'arbre de treball de «git notes merge»"
 
 #: builtin/notes.c:722
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
@@ -15998,10 +18900,10 @@ msgid ""
 "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"
+"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:545
+#: builtin/notes.c:897 builtin/tag.c:589
 #, 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."
@@ -16019,7 +18921,7 @@ msgstr "l'intent d'eliminar una nota no existent no és un error"
 msgid "read object names from the standard input"
 msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:148
 msgid "do not remove, show only"
 msgstr "no eliminis, només mostra"
 
@@ -16035,415 +18937,467 @@ msgstr "referència de notes"
 msgid "use notes from <notes-ref>"
 msgstr "usa les notes de <referència-de-notes>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1598
+#: builtin/notes.c:1034 builtin/stash.c:1739
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subordre desconeguda: %s"
 
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:54
 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:53
+#: builtin/pack-objects.c:55
 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:424
+#: builtin/pack-objects.c:440
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:448
 #, fuzzy, c-format
 msgid "bad packed object CRC for %s"
-msgstr "ignora els objectes empaquetats"
+msgstr "objecte CRC mal empaquetat per a percentatges"
 
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:459
 #, fuzzy, c-format
 msgid "corrupt packed object for %s"
-msgstr "ignora els objectes empaquetats"
+msgstr "objecte empaquetat corrupte durant els percentatges"
 
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:590
 #, fuzzy, c-format
 msgid "recursive delta detected for object %s"
-msgstr "no s'ha rebut l'objecte esperat %s"
+msgstr "delta recursiu detectat per a objectes percentuals"
 
-#: builtin/pack-objects.c:777
-#, c-format
-msgid "ordered %u objects, expected %<PRIu32>"
-msgstr ""
-
-#: builtin/pack-objects.c:790
+#: builtin/pack-objects.c:801
 #, fuzzy, c-format
-msgid "packfile is invalid: %s"
-msgstr "%s no vàlid"
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "s'esperava un objecte d'un 1% <PRIu32>"
 
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:896
 #, fuzzy, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "no s'ha pogut obrir o llegir %s"
-
-#: builtin/pack-objects.c:798
-#, fuzzy
-msgid "unable to seek in reused packfile"
-msgstr "no es pot llegir el fitxer d'índex"
-
-#: builtin/pack-objects.c:809
-#, fuzzy
-msgid "unable to read from reused packfile"
-msgstr "no es pot llegir el fitxer d'índex"
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
 
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:1015
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
 "a causa de pack.packSizeLimit"
 
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:1028
 msgid "Writing objects"
 msgstr "S'estan escrivint els objectes"
 
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:1089 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:965
-#, c-format
+#: builtin/pack-objects.c:1141
+#, fuzzy, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
-msgstr ""
+msgstr "va escriure%<PRIu32> objectes mentre s'esperava un percentatge<PRIu32>"
 
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1383
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
 "s'empaqueten"
 
-#: builtin/pack-objects.c:1591
+#: builtin/pack-objects.c:1831
 #, fuzzy, c-format
 msgid "delta base offset overflow in pack for %s"
-msgstr "el desplaçament de base de diferències està fora de límits"
+msgstr "desplaçament de base delta desbordament en paquet de percentatges"
 
-#: builtin/pack-objects.c:1600
+#: builtin/pack-objects.c:1840
 #, fuzzy, c-format
 msgid "delta base offset out of bound for %s"
-msgstr "el desplaçament de base de diferències està fora de límits"
+msgstr "decalatge de base de delta fora d'enllaç per un percentatge"
 
-#: builtin/pack-objects.c:1869
+#: builtin/pack-objects.c:2121
 msgid "Counting objects"
 msgstr "S'estan comptant els objectes"
 
-#: builtin/pack-objects.c:1999
-#, fuzzy, c-format
-msgid "unable to get size of %s"
-msgstr "no s'ha pogut moure %s a %s"
-
-#: builtin/pack-objects.c:2014
+#: builtin/pack-objects.c:2266
 #, fuzzy, c-format
 msgid "unable to parse object header of %s"
-msgstr "no s'ha pogut analitzar l'objecte: %s"
+msgstr "no s'ha pogut analitzar la capçalera de l'objecte dels percentatges"
 
-#: builtin/pack-objects.c:2084 builtin/pack-objects.c:2100
-#: builtin/pack-objects.c:2110
+#: builtin/pack-objects.c:2336 builtin/pack-objects.c:2352
+#: builtin/pack-objects.c:2362
 #, fuzzy, c-format
 msgid "object %s cannot be read"
-msgstr "objecte %s no trobat"
+msgstr "no es poden llegir els objectes percentuals"
 
-#: builtin/pack-objects.c:2087 builtin/pack-objects.c:2114
-#, c-format
+#: builtin/pack-objects.c:2339 builtin/pack-objects.c:2366
+#, fuzzy, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
-msgstr ""
+msgstr "objecte%s longitud d'objecte inconsistent (%<PRIuMAX> vs%<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2124
+#: builtin/pack-objects.c:2376
+#, fuzzy
 msgid "suboptimal pack - out of memory"
-msgstr ""
+msgstr "paquet subòptim - sense memòria"
 
-#: builtin/pack-objects.c:2450
+#: builtin/pack-objects.c:2691
 #, c-format
 msgid "Delta compression using up to %d threads"
-msgstr ""
+msgstr "Compressió de diferències usant fins a %d fils"
 
-#: builtin/pack-objects.c:2582
-#, fuzzy, c-format
+#: builtin/pack-objects.c:2830
+#, c-format
 msgid "unable to pack objects reachable from tag %s"
-msgstr "inclou els objectes abastables de qualsevol referència"
+msgstr "no s'han pogut empaquetar els objectes abastables des de l'etiqueta %s"
 
-#: builtin/pack-objects.c:2669
+#: builtin/pack-objects.c:2916
 msgid "Compressing objects"
 msgstr "S'estan comprimint els objectes"
 
-#: builtin/pack-objects.c:2675
+#: builtin/pack-objects.c:2922
+#, fuzzy
 msgid "inconsistency with delta count"
+msgstr "inconsistència amb el comptador de diferències"
+
+#: builtin/pack-objects.c:3001
+#, fuzzy, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
 msgstr ""
+"el valor de uppack.blobpackfileuri ha de ser de la forma '<object-hash> "
+"<pack-hash> <uri>' (gotat '%s')"
 
-#: builtin/pack-objects.c:2756
-#, c-format
+#: builtin/pack-objects.c:3004
+#, fuzzy, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"l'objecte ja està configurat en un altre uploadpack.blobpackfileuri (gotat "
+"'%')"
+
+#: builtin/pack-objects.c:3039
+#, fuzzy, 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"
+
+#: builtin/pack-objects.c:3161 builtin/pack-objects.c:3175
+#, fuzzy, c-format
+msgid "could not find pack '%s'"
+msgstr "no s'ha pogut finalitzar «%s»"
+
+#: builtin/pack-objects.c:3218
+#, fuzzy, 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"
 
-#: builtin/pack-objects.c:2762
+#: builtin/pack-objects.c:3224
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
+"s'esperava un ID d'objecte, s'ha rebut brossa:\n"
+" %s"
 
-#: builtin/pack-objects.c:2860
+#: builtin/pack-objects.c:3322
 msgid "invalid value for --missing"
 msgstr "valor no vàlid per a --missing"
 
-#: builtin/pack-objects.c:2919 builtin/pack-objects.c:3027
+#: builtin/pack-objects.c:3381 builtin/pack-objects.c:3490
 #, fuzzy
 msgid "cannot open pack index"
-msgstr "no es pot fer pread en el fitxer de paquet"
+msgstr "no s'ha pogut obrir l'índex del paquet"
 
-#: builtin/pack-objects.c:2950
-#, c-format
+#: builtin/pack-objects.c:3412
+#, fuzzy, c-format
 msgid "loose object at %s could not be examined"
-msgstr ""
+msgstr "no s'han pogut examinar els objectes solts"
 
-#: builtin/pack-objects.c:3035
+#: builtin/pack-objects.c:3498
 #, fuzzy
 msgid "unable to force loose object"
-msgstr "no s'ha pogut escriure l'objecte de nota"
+msgstr "no s'ha pogut forçar l'objecte solt"
 
-#: builtin/pack-objects.c:3127
+#: builtin/pack-objects.c:3628
 #, fuzzy, c-format
 msgid "not a rev '%s'"
-msgstr "no es pot llegir «%s»"
+msgstr "no és una revisió \"%s\""
 
-#: builtin/pack-objects.c:3130
+#: builtin/pack-objects.c:3631
 #, c-format
 msgid "bad revision '%s'"
 msgstr "revisió incorrecte «%s»"
 
-#: builtin/pack-objects.c:3155
+#: builtin/pack-objects.c:3659
 msgid "unable to add recent objects"
 msgstr "no s'han pogut afegir els objectes recents"
 
-#: builtin/pack-objects.c:3208
+#: builtin/pack-objects.c:3712
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versió d'índex no compatible %s"
 
-#: builtin/pack-objects.c:3212
+#: builtin/pack-objects.c:3716
 #, c-format
 msgid "bad index version '%s'"
 msgstr "versió d'índex incorrecta «%s»"
 
-#: builtin/pack-objects.c:3242
-msgid "do not show progress meter"
-msgstr "no mostris l'indicador de progrés"
-
-#: builtin/pack-objects.c:3244
-msgid "show progress meter"
-msgstr "mostra l'indicador de progrés"
-
-#: builtin/pack-objects.c:3246
-msgid "show progress meter during object writing phase"
-msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
-
-#: builtin/pack-objects.c:3249
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
-
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3755
 msgid "<version>[,<offset>]"
 msgstr "<versió>[,<desplaçament>]"
 
-#: builtin/pack-objects.c:3251
+#: builtin/pack-objects.c:3756
 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:3254
+#: builtin/pack-objects.c:3759
 msgid "maximum size of each output pack file"
 msgstr "mida màxima de cada fitxer empaquetat de sortida"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3761
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3763
 msgid "ignore packed objects"
 msgstr "ignora els objectes empaquetats"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3765
 msgid "limit pack window by objects"
 msgstr "limita la finestra d'empaquetament per objectes"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3767
 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:3264
+#: builtin/pack-objects.c:3769
 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:3266
+#: builtin/pack-objects.c:3771
 msgid "reuse existing deltas"
 msgstr "reusa les diferències existents"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3773
 msgid "reuse existing objects"
 msgstr "reusa els objectes existents"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3775
 msgid "use OFS_DELTA objects"
 msgstr "usa objectes OFS_DELTA"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3777
 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:3274
+#: builtin/pack-objects.c:3779
 msgid "do not create an empty pack output"
 msgstr "no creïs una emissió de paquet buida"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3781
 msgid "read revision arguments from standard input"
-msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
+msgstr "llegeix els arguments de revisió des de l'entrada estàndard"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3783
 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:3281
+#: builtin/pack-objects.c:3786
 msgid "include objects reachable from any reference"
 msgstr "inclou els objectes abastables de qualsevol referència"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3789
 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:3287
+#: builtin/pack-objects.c:3792
 msgid "include objects referred to by the index"
 msgstr "inclou els objectes als quals faci referència l'índex"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3795
+#, fuzzy
+msgid "read packs from stdin"
+msgstr "llegeix les actualitzacions des de stdin"
+
+#: builtin/pack-objects.c:3797
 msgid "output pack to stdout"
 msgstr "emet el paquet a stdout"
 
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3799
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
 
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3801
 msgid "keep unreachable objects"
 msgstr "retén els objectes inabastables"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3803
 msgid "pack loose unreachable objects"
 msgstr "empaqueta els objectes inabastables solts"
 
-#: builtin/pack-objects.c:3298
+#: builtin/pack-objects.c:3805
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaqueta els objectes inabastables més nous que <hora>"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3808
+#, fuzzy
 msgid "use the sparse reachability algorithm"
-msgstr ""
+msgstr "utilitza l'algorisme d'accessibilitat dispers"
 
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3810
 msgid "create thin packs"
 msgstr "crea paquets prims"
 
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3812
 msgid "create packs suitable for shallow fetches"
 msgstr "crea paquets adequats per a les obtencions superficials"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3814
 msgid "ignore packs that have companion .keep file"
 msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3816
 #, fuzzy
 msgid "ignore this pack"
-msgstr "usa el paquet prim"
+msgstr "ignora aquest paquet"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3818
 msgid "pack compression level"
 msgstr "nivell de compressió de paquet"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3820
 msgid "do not hide commits by grafts"
 msgstr "no amaguis les comissions per empelt"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3822
 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:3317
+#: builtin/pack-objects.c:3824
 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:3320
+#: builtin/pack-objects.c:3828
+#, fuzzy
+msgid "write a bitmap index if possible"
+msgstr "escriu un índex de mapa de bits si és possible"
+
+#: builtin/pack-objects.c:3832
 msgid "handling for missing objects"
 msgstr "gestió dels objectes absents"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3835
+#, fuzzy
 msgid "do not pack objects in promisor packfiles"
-msgstr ""
+msgstr "no empaqueta els objectes als fitxers del paquet promisor"
 
-#: builtin/pack-objects.c:3325
+#: builtin/pack-objects.c:3837
 #, fuzzy
 msgid "respect islands during delta compression"
-msgstr "mida de la finestra que s'usa per a compressió de diferències"
+msgstr "respecta les illes durant la compressió delta"
 
-#: builtin/pack-objects.c:3350
-#, c-format
+#: builtin/pack-objects.c:3839
+#, fuzzy
+msgid "protocol"
+msgstr "protocol"
+
+#: builtin/pack-objects.c:3840
+#, fuzzy
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "exclou qualsevol uppack.blobpackfileuri configurat amb aquest protocol"
+
+#: builtin/pack-objects.c:3873
+#, fuzzy, 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"
 
-#: builtin/pack-objects.c:3355
-#, c-format
+#: builtin/pack-objects.c:3878
+#, fuzzy, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
-msgstr ""
+msgstr "pack.deltaCacheLimit és massa alt forçant un percentatge"
 
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3934
+#, fuzzy
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
+"--max-pack-size no es pot utilitzar per construir un paquet per a la "
+"transferència"
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3936
+#, fuzzy
 msgid "minimum pack size limit is 1 MiB"
-msgstr ""
+msgstr "el límit mínim de mida del paquet és 1 MiB"
 
-#: builtin/pack-objects.c:3416
+#: builtin/pack-objects.c:3941
 #, fuzzy
 msgid "--thin cannot be used to build an indexable pack"
-msgstr "--fix-thin no es pot usar sense --stdin"
+msgstr "--thin no es pot utilitzar per construir un paquet indexable"
 
-#: builtin/pack-objects.c:3419
+#: builtin/pack-objects.c:3944
 #, fuzzy
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable i -A són incompatibles"
+msgstr "--keep-unreachable i --unpack-unreachable són incompatibles"
 
-#: builtin/pack-objects.c:3425
+#: builtin/pack-objects.c:3950
 #, fuzzy
 msgid "cannot use --filter without --stdout"
-msgstr "no es pot usar -a amb -d"
+msgstr "no es pot utilitzar --filter sense --stdout"
 
-#: builtin/pack-objects.c:3486
+#: builtin/pack-objects.c:3952
+#, fuzzy
+msgid "cannot use --filter with --stdin-packs"
+msgstr "no es pot utilitzar --filter sense --stdout"
+
+#: builtin/pack-objects.c:3956
+#, fuzzy
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "no es poden especificar noms de camí amb --stdin"
+
+#: builtin/pack-objects.c:4015
 msgid "Enumerating objects"
 msgstr "S'estan enumerant els objectes"
 
-#: builtin/pack-objects.c:3516
+#: builtin/pack-objects.c:4052
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Total %<PRIu32> (%<PRIu32> diferències), reusats %<PRIu32> (%<PRIu32> diferències), paquets "
+"reusats %<PRIu32>"
+
+#: 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 ""
-"Total %<PRIu32> (diferències %<PRIu32>), reusat %<PRIu32> (diferències "
-"%<PRIu32>)"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16457,82 +19411,79 @@ msgstr "empaqueta-ho tot"
 msgid "prune loose refs (default)"
 msgstr "poda les referències soltes (per defecte)"
 
-#: builtin/prune-packed.c:9
+#: 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-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "S'estan eliminant objectes duplicats"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <hora>] [--] [<head>...]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "informa d'objectes podats"
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "fes caducar els objectes més vells que <hora>"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:138
+#, fuzzy
 msgid "limit traversal to objects outside promisor packfiles"
-msgstr ""
+msgstr "limita el trànsit d'objectes fora dels fitxers del paquet promisor"
 
-#: builtin/prune.c:150
+#: builtin/prune.c:152
 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:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valor no vàlid per a %s: %s"
 
-#: builtin/pull.c:88
+#: 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:141
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "controla l'obtenció recursiva de submòduls"
 
-#: builtin/pull.c:145
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Opcions relacionades amb fusionar"
 
-#: builtin/pull.c:148
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
 
-#: builtin/pull.c:176 builtin/rebase.c:447 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "permet l'avanç ràpid"
 
-#: builtin/pull.c:185
-msgid "automatically stash/stash pop before and after rebase"
-msgstr ""
-"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
+#: builtin/pull.c:167 parse-options.h:340
+#, fuzzy
+msgid "automatically stash/stash pop before and after"
+msgstr "«stash»/«stash» automàticament abans i després"
 
-#: builtin/pull.c:201
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Opcions relacionades amb obtenir"
 
-#: builtin/pull.c:211
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "força la sobreescriptura de la branca local"
 
-#: builtin/pull.c:219
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de submòduls baixats en paral·lel"
 
-#: builtin/pull.c:316
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor no vàlid per a pull.ff: %s"
 
-#: builtin/pull.c:433
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16540,13 +19491,13 @@ msgstr ""
 "No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
 "acabeu d'obtenir."
 
-#: builtin/pull.c:435
+#: builtin/pull.c:447
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16554,7 +19505,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:439
+#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16565,44 +19516,43 @@ 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:444 builtin/rebase.c:1326 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1248
 msgid "You are not currently on a branch."
 msgstr "Actualment no sou en cap branca."
 
-#: builtin/pull.c:446 builtin/pull.c:461 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
 msgid "Please specify which branch you want to rebase against."
-msgstr "Especifiqueu sobre què branca voleu fer «rebase»."
+msgstr "Especifiqueu sobre quina branca voleu fer «rebase»."
 
-#: builtin/pull.c:448 builtin/pull.c:463 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
 msgid "Please specify which branch you want to merge with."
 msgstr "Especifiqueu amb quina branca voleu fusionar."
 
-#: builtin/pull.c:449 builtin/pull.c:464
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
-msgstr "Vegeu git-pull(1) per detalls."
+msgstr "Vegeu git-pull(1) per a més informació."
 
-#: builtin/pull.c:451 builtin/pull.c:457 builtin/pull.c:466
-#: builtin/rebase.c:1332 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr "<remot>"
 
-#: builtin/pull.c:451 builtin/pull.c:466 builtin/pull.c:471
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "<branca>"
 
-#: builtin/pull.c:459 builtin/rebase.c:1324 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1246
 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:468 git-parse-remote.sh:95
+#: builtin/pull.c:480
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
 "amb:"
 
-#: builtin/pull.c:473
+#: builtin/pull.c:485
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16611,33 +19561,58 @@ 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:581
+#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr "no s'ha pogut accedir a la comissió %s"
 
-#: builtin/pull.c:861
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "s'està ignorant --verify-signatures en fer «rebase»"
 
-#: builtin/pull.c:916
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
+#: 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 ""
+"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"
+"\n"
+"  git config pull.rebase false  # merge (estratègia per defecte)\n"
+"  git config pull.rebase true   # rebase\n"
+"  git config pull.ff only       # només fast-forward\n"
+"\n"
+"Podeu reemplaçar «git config» per «git config --global» per a establir una\n"
+"preferència per defecte per a tots els repositoris. Podeu també usar --rebase,\n"
+"--no-rebase o --ff-only en la línia d'ordres per sobreescriure el valor\n"
+"per defecte configuració en aquesta execució.\n"
 
-#: builtin/pull.c:924
+#: builtin/pull.c:991
 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:928
+#: builtin/pull.c:995
 msgid "pull with rebase"
 msgstr "baixar fent «rebase»"
 
-#: builtin/pull.c:929
+#: builtin/pull.c:996
 msgid "please commit or stash them."
 msgstr "cometeu-los o emmagatzemeu-los."
 
-#: builtin/pull.c:954
+#: builtin/pull.c:1021
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16648,7 +19623,7 @@ msgstr ""
 "s'està avançant ràpidament el vostre arbre de treball des de\n"
 "la comissió %s."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:1027
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16666,15 +19641,15 @@ msgstr ""
 "$ git reset --hard\n"
 "per a recuperar."
 
-#: builtin/pull.c:975
+#: builtin/pull.c:1042
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No es poden fusionar múltiples branques a un HEAD buit."
 
-#: builtin/pull.c:979
+#: builtin/pull.c:1046
 msgid "Cannot rebase onto multiple branches."
 msgstr "No es pot fer «rebase» sobre múltiples branques."
 
-#: builtin/pull.c:986
+#: builtin/pull.c:1067
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no es pot fer «rebase» amb modificacions als submòduls enregistrades "
@@ -16682,26 +19657,26 @@ 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>"
 msgstr "abreviatura d'etiqueta sense <tag>"
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete només accepta noms de referència de destí senzills"
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 "\n"
-"Per a triar qualsevol opció permanentment, vegeu push.default a 'git help "
-"config'."
+"Per a triar qualsevol opció permanentment, vegeu push.default a «git help "
+"config»."
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16726,7 +19701,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16741,7 +19716,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-branca-remota>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:194
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16754,13 +19729,13 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:202
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "La branca actual %s té múltiples branques fonts, s'està refusant pujar."
 
-#: builtin/push.c:210
+#: builtin/push.c:205
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -16771,14 +19746,14 @@ msgstr ""
 "branca actual «%s», sense dir-me què pujar per a actualitzar\n"
 "quina branca remota."
 
-#: builtin/push.c:269
+#: 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\"."
+"és «nothing»."
 
-#: builtin/push.c:276
+#: builtin/push.c:267
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -16787,10 +19762,11 @@ msgid ""
 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 detalls."
+"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ó."
 
-#: builtin/push.c:282
+#: builtin/push.c:273
 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"
@@ -16799,11 +19775,12 @@ msgid ""
 msgstr ""
 "S'han rebutjat les actualitzacions perquè un punt de branca pujada\n"
 "està darrere de la seva branca remota corresponent. Agafeu aquesta\n"
-"branca i integreu els canvis remots (per exemple, 'git pull ...')\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 detalls."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
+"informació."
 
-#: builtin/push.c:288
+#: builtin/push.c:279
 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"
@@ -16812,18 +19789,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"
+"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 detalls."
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
+"informació."
 
-#: builtin/push.c:295
+#: builtin/push.c:286
 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."
 
-#: builtin/push.c:298
+#: builtin/push.c:289
 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"
@@ -16832,87 +19810,78 @@ 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"
-"'--force'.\n"
+"«--force».\n"
+
+#: builtin/push.c:294
+#, fuzzy
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"S'han rebutjat les actualitzacions perquè el punt de la vostra branca\n"
+"actual està darrere de la seva branca remota corresponent. Integreu\n"
+"els canvis remots (per exemple, «git pull ...») abans de pujar de nou.\n"
+"Vegeu la «Nota sobre avanços ràpids» a «git push --help» per a més "
+"informació."
 
-#: builtin/push.c:359
+#: builtin/push.c:364
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "S'està pujant a %s\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:371
 #, 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:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "dipòsit incorrecte «%s»"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"No 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"
-"\n"
-"    git remote add <nom> <url>\n"
-"\n"
-"i després pugeu fent servir el nom remot\n"
-"\n"
-"    git push <nom>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:553
 msgid "repository"
-msgstr "dipòsit"
+msgstr "repositori"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "puja totes les referències"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "reflecteix totes les referències"
 
-#: builtin/push.c:558
+#: builtin/push.c:557
 msgid "delete refs"
 msgstr "suprimeix les referències"
 
-#: builtin/push.c:559
+#: builtin/push.c:558
 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:562 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "força les actualitzacions"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
 msgstr "<nom-de-referència>:<esperat>"
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
 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:568
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "requereix que les actualitzacions remotes s'integrin localment"
+
+#: builtin/push.c:569
 msgid "control recursive pushing of submodules"
 msgstr "controla la pujada recursiva dels submòduls"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "usa el paquet prim"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr "programa que rep els paquets"
 
@@ -16932,78 +19901,122 @@ msgstr "evita el lligam de prepujada"
 msgid "push missing but relevant tags"
 msgstr "puja les etiquetes absents però rellevants"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "signa la pujada amb GPG"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
 msgstr "demana una transacció atòmica al costat remot"
 
-#: builtin/push.c:602
+#: 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:604
+#: builtin/push.c:603
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no té sentit sense referències"
 
-#: builtin/push.c:607
+#: builtin/push.c:623
+#, c-format
+msgid "bad repository '%s'"
+msgstr "repositori incorrecte «%s»"
+
+#: builtin/push.c:624
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"No hi ha cap destí de pujada configurat.\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"
+"i després pugeu fent servir el nom remot\n"
+"\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:609
+#: builtin/push.c:641
 msgid "--all can't be combined with refspecs"
 msgstr "--all no es pot combinar amb especificacions de referència"
 
-#: builtin/push.c:613
+#: builtin/push.c:645
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror i --tags són incompatibles"
 
-#: builtin/push.c:615
+#: builtin/push.c:647
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no es pot combinar amb especificacions de referència"
 
-#: builtin/push.c:618
+#: builtin/push.c:650
 msgid "--all and --mirror are incompatible"
 msgstr "--all i --mirror són incompatibles"
 
-#: builtin/push.c:637
+#: builtin/push.c:657
 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:8
+#: 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>."
 
-#: builtin/range-diff.c:9
-#, fuzzy
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
-msgstr "git merge [<opcions>] [<comissió>...]"
+msgstr "git range-diff [<opcions>] <old-tip>...<new-tip>"
 
-#: builtin/range-diff.c:10
-#, fuzzy
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
-msgstr "git mv [<opcions>] <font>... <destí>"
+msgstr "git range-diff [<opcions>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c:21
-msgid "Percentage by which creation is weighted"
-msgstr ""
-
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "utilitza colors simples de diff"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
-#, c-format
-msgid "no .. in range: '%s'"
+#: 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'"
+
+#: 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"
+
+#: 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"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, fuzzy, c-format
+msgid "not a commit range: '%s'"
 msgstr "cap .. en rang: «%s»"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "el format de l'argument únic ha de ser de rang simètric"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "calen dos rangs de comissió"
 
@@ -17084,247 +20097,241 @@ msgstr "depura unpack-trees"
 #: builtin/read-tree.c:157
 #, fuzzy
 msgid "suppress feedback messages"
-msgstr "omet els missatges informatius"
+msgstr "suprimeix els missatges de retroacció"
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Primer heu de resoldre l'índex actual"
+
+#: builtin/rebase.c:35
 #, fuzzy
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
-"git archive --remote <dipòsit> [--exec <ordre>] [<opcions>] <arbre> "
-"[<camí>...]"
+"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
+#, fuzzy
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
+"git rebase [-i] [opcions] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: 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:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "no s'ha pogut escriure a «%s»."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "no hi ha cap HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:311
 #, c-format
 msgid "could not create temporary %s"
 msgstr "no s'ha pogut crear el fitxer temporal %s"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:317
 msgid "could not mark as interactive"
 msgstr "no s'ha pogut marcar com a interactiu"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:370
 msgid "could not generate todo list"
 msgstr "no s'ha pogut generar la llista per a fer"
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:412
+#, fuzzy
 msgid "a base commit must be provided with --upstream or --onto"
-msgstr ""
+msgstr "s'ha de proporcionar una comissió base amb --upstream o --onto"
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:481
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<opcions>]"
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "mantén les comissions buides"
+#: 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:451 builtin/revert.c:128
+#: builtin/rebase.c:498 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "permet les comissions amb missatges buits"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:500
 msgid "rebase merge commits"
 msgstr "fes «rebase» de les comissions de fusió"
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:502
+#, fuzzy
 msgid "keep original branch points of cousins"
-msgstr ""
+msgstr "mantén els punts de branca originals dels cosins"
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:504
+#, fuzzy
 msgid "move commits that begin with squash!/fixup!"
-msgstr ""
+msgstr "mou les comissions que comencen amb squash!/fixup!"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:505
 msgid "sign commits"
 msgstr "signa les comissions"
 
-#: builtin/rebase.c:459 builtin/rebase.c:1403
+#: builtin/rebase.c:507 builtin/rebase.c:1328
 msgid "display a diffstat of what changed upstream"
-msgstr ""
+msgstr "mostra un «diffstat» del que ha canviat a la font"
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:509
 msgid "continue rebase"
 msgstr "continua el «rebase»"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:511
 msgid "skip commit"
 msgstr "omet la comissió"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:512
 msgid "edit the todo list"
 msgstr "edita la llista a fer"
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:514
 msgid "show the current patch"
 msgstr "mostra el pedaç actual"
 
-#: builtin/rebase.c:469
+#: 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:471
+#: 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:473
+#: builtin/rebase.c:521
 msgid "check the todo list"
 msgstr "comprova la llista a fer"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:523
 msgid "rearrange fixup/squash lines"
 msgstr "reorganitza les línies «fixup/pick»"
 
-#: builtin/rebase.c:477
+#: 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:478
+#: builtin/rebase.c:526
+#, fuzzy
 msgid "onto"
-msgstr ""
+msgstr "sobre"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:529
 #, fuzzy
 msgid "restrict-revision"
-msgstr "revisió"
+msgstr "revisió restringida"
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:529
 #, fuzzy
 msgid "restrict revision"
-msgstr "revisió"
+msgstr "restringeix la revisió"
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:531
+#, fuzzy
 msgid "squash-onto"
-msgstr ""
+msgstr "squash-onto"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:532
+#, fuzzy
 msgid "squash onto"
-msgstr ""
+msgstr "carabassa a"
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:534
 #, fuzzy
 msgid "the upstream commit"
-msgstr "Desassigna la informació de font"
+msgstr "la comissió principal"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:536
 #, fuzzy
 msgid "head-name"
-msgstr "canvi de nom"
+msgstr "nom-cap"
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:536
 #, fuzzy
 msgid "head name"
-msgstr "davant per "
+msgstr "nom del cap"
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:541
 #, fuzzy
 msgid "rebase strategy"
-msgstr "estratègia de fusió"
+msgstr "estratègia de rebase"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:542
 #, fuzzy
 msgid "strategy-opts"
-msgstr "estratègia"
+msgstr "opcions estratègiques"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:543
 #, fuzzy
 msgid "strategy options"
-msgstr "opcions de decoració"
+msgstr "opcions d'estratègia"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:544
+#, fuzzy
 msgid "switch-to"
-msgstr ""
+msgstr "canvia a"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:545
+#, fuzzy
 msgid "the branch or commit to checkout"
-msgstr ""
+msgstr "la branca o entrega a agafar"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:546
 #, fuzzy
 msgid "onto-name"
-msgstr "nom"
+msgstr "ont-name"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:546
 #, fuzzy
 msgid "onto name"
-msgstr "nom del remot"
+msgstr "al nom"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:547
 #, fuzzy
 msgid "cmd"
-msgstr "ordre"
+msgstr "cmd"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:547
 msgid "the command to run"
 msgstr "l'ordre a executar"
 
-#: builtin/rebase.c:502 builtin/rebase.c:1486
+#: builtin/rebase.c:550 builtin/rebase.c:1422
+#, fuzzy
 msgid "automatically re-schedule any `exec` that fails"
-msgstr ""
+msgstr "torna a planificar automàticament qualsevol `exec` que falli"
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:566
+#, fuzzy
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
-msgstr ""
+msgstr "--[no-]rebase-cosins no té cap efecte sense --rebase-merges"
 
-#: builtin/rebase.c:534
-#, c-format
-msgid "%s requires an interactive rebase"
+#: builtin/rebase.c:582
+#, fuzzy, c-format
+msgid "%s requires the merge backend"
 msgstr "%s requereix un «rebase» interactiu"
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:625
 #, fuzzy, c-format
 msgid "could not get 'onto': '%s'"
-msgstr "no s'ha pogut establir «%s» a «%s»"
+msgstr "no s'ha pogut obtenir «onto» «%s»"
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:642
 #, fuzzy, c-format
 msgid "invalid orig-head: '%s'"
-msgstr "fitxer no vàlid: «%s»"
+msgstr "orig-head '%s' no és vàlid"
 
-#: builtin/rebase.c:626
-#, c-format
+#: builtin/rebase.c:667
+#, fuzzy, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
-msgstr ""
+msgstr "s'ignorarà allowrerereautoupdate «%s» no vàlid"
 
-#: builtin/rebase.c:702
-#, c-format
-msgid "Could not read '%s'"
-msgstr "No s'ha pogut llegir «%s»"
-
-#: builtin/rebase.c:720
-#, c-format
-msgid "Cannot store %s"
-msgstr "No es pot emmagatzemar %s"
-
-#: builtin/rebase.c:827
-msgid "could not determine HEAD revision"
-msgstr "no s'ha pogut determinar la revisió de HEAD"
-
-#: builtin/rebase.c:950 git-rebase--preserve-merges.sh:81
+#: 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"
@@ -17333,14 +20340,14 @@ msgid ""
 "abort\"."
 msgstr ""
 "Resoleu tots els conflictes manualment, marqueu-los com a resolts amb\n"
-"«git add/rm <fitxers amb conflicte>», llavors executeu «git rebase --"
+"«git add/rm <fitxers_amb_conflicte>», llavors executeu «git rebase --"
 "continue».\n"
-"Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\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:1031
-#, c-format
+#: builtin/rebase.c:896
+#, fuzzy, c-format
 msgid ""
 "\n"
 "git encountered an error while preparing the patches to replay\n"
@@ -17350,8 +20357,19 @@ msgid ""
 "\n"
 "As a result, git cannot rebase them."
 msgstr ""
+"git va trobar un error en preparar els pedaços per a tornar a reproduir "
+"aquests revisions per cent. Com a resultat git no pot refer-los."
 
-#: builtin/rebase.c:1318
+#: builtin/rebase.c:1222
+#, fuzzy, 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»."
+
+#: builtin/rebase.c:1240
 #, c-format
 msgid ""
 "%s\n"
@@ -17362,13 +20380,13 @@ msgid ""
 "\n"
 msgstr ""
 "%s\n"
-"Especifiqueu sobre què branca voleu fer «rebase».\n"
-"Vegeu git-rebase(1) per detalls.\n"
+"Especifiqueu sobre quina branca voleu fer «rebase».\n"
+"Vegeu git-rebase(1) per a més informació.\n"
 "\n"
 "    git rebase '<branca>'\n"
 "\n"
 
-#: builtin/rebase.c:1334
+#: builtin/rebase.c:1256
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17379,168 +20397,199 @@ msgstr ""
 "Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
 "amb:\n"
 "\n"
-"    git branch --set-upstream-to=%s/<branch> %s\n"
+"    git branch --set-upstream-to=%s/<branca> %s\n"
 "\n"
 
-#: builtin/rebase.c:1364
+#: builtin/rebase.c:1286
 #, fuzzy
 msgid "exec commands cannot contain newlines"
-msgstr "expandeix les ordres exec en la llista per a fer"
+msgstr "les ordres exec no poden contenir línies noves"
 
-#: builtin/rebase.c:1368
+#: builtin/rebase.c:1290
 msgid "empty exec command"
-msgstr ""
+msgstr "ordre exec buida"
 
-#: builtin/rebase.c:1396
+#: builtin/rebase.c:1319
 msgid "rebase onto given branch instead of upstream"
 msgstr "fes un «rebase» en la branca donada en comptes de la font"
 
-#: builtin/rebase.c:1398
+#: builtin/rebase.c:1321
+#, fuzzy
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "utilitza la base de fusió de la font i la branca com a base actual"
+
+#: builtin/rebase.c:1323
 msgid "allow pre-rebase hook to run"
 msgstr "permet al lligam pre-rebase executar-se"
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1325
 msgid "be quiet. implies --no-stat"
 msgstr "silenciós. Implica --no-stat"
 
-#: builtin/rebase.c:1406
+#: builtin/rebase.c:1331
 #, fuzzy
 msgid "do not show diffstat of what changed upstream"
-msgstr "no mostris les estadístiques de diferència al final de la fusió"
+msgstr "no mostris «diffstat» de quina font ha canviat"
 
-#: builtin/rebase.c:1409
+#: builtin/rebase.c:1334
 #, fuzzy
-msgid "add a Signed-off-by: line to each commit"
-msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "afegeix una línia signada per cada entrega"
+
+#: builtin/rebase.c:1337
+#, fuzzy
+msgid "make committer date match author date"
+msgstr "Agrupa per «comitter» en comptes de per autor"
 
-#: builtin/rebase.c:1411 builtin/rebase.c:1415 builtin/rebase.c:1417
-msgid "passed to 'git am'"
-msgstr "passa-ho a «git am»"
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr "ignora la data de l'autor i utilitza la data actual"
 
-#: builtin/rebase.c:1419 builtin/rebase.c:1421
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr "sinònim de --reset-author-date"
+
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
 msgid "passed to 'git apply'"
-msgstr "passa-ho a «git-apply»"
+msgstr "passa-ho a «git apply»"
+
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr "ignora els canvis d'espais en blanc"
 
-#: builtin/rebase.c:1423 builtin/rebase.c:1426
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "«cherry pick» totes les comissions, inclús les no canviades"
 
-#: builtin/rebase.c:1428
+#: builtin/rebase.c:1354
 msgid "continue"
 msgstr "continua"
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1357
 msgid "skip current patch and continue"
 msgstr "omet el pedaç actual i continua"
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1359
 msgid "abort and check out the original branch"
 msgstr "interromp i agafa la branca original"
 
-#: builtin/rebase.c:1436
+#: builtin/rebase.c:1362
 msgid "abort but keep HEAD where it is"
 msgstr "interromp però manté HEAD on és"
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1363
 msgid "edit the todo list during an interactive rebase"
 msgstr "edita la llista de coses a fer durant un «rebase» interactiu"
 
-#: builtin/rebase.c:1440
+#: builtin/rebase.c:1366
 msgid "show the patch file being applied or merged"
 msgstr "mostra el pedaç que s'està aplicant o fusionant"
 
-#: builtin/rebase.c:1443
-#, fuzzy
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "utilitza estratègies d'aplicació per fer «rebase»"
+
+#: builtin/rebase.c:1373
 msgid "use merging strategies to rebase"
-msgstr "estratègia de fusió a usar"
+msgstr "utilitza estratègies de fusió per fer «rebase»"
 
-#: builtin/rebase.c:1447
+#: builtin/rebase.c:1377
 msgid "let the user edit the list of commits to rebase"
-msgstr ""
+msgstr "permet a l'usuari editar la llista de comissions a fer «rebase»"
 
-#: builtin/rebase.c:1451
-#, fuzzy
+#: builtin/rebase.c:1381
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr "intenta recrear les "
+msgstr "(EN DESÚS) intenta recrear fusions en lloc d'ignorar-les"
 
-#: builtin/rebase.c:1455
-#, fuzzy
-msgid "preserve empty commits during rebase"
-msgstr "preserva les comissions inicialment buides"
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
+msgstr "com gestionar les comissions que queden buides"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1393
+#, fuzzy
 msgid "move commits that begin with squash!/fixup! under -i"
-msgstr ""
+msgstr "mou les comissions que comencen amb squash!/fixup! sota -i"
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1400
 #, fuzzy
-msgid "automatically stash/stash pop before and after"
-msgstr ""
-"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
-
-#: builtin/rebase.c:1465
 msgid "add exec lines after each commit of the editable list"
-msgstr ""
+msgstr "afegeix línies d'exec després de cada publicació de la llista editable"
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1404
 #, fuzzy
 msgid "allow rebasing commits with empty messages"
-msgstr "permet les comissions amb missatges buits"
+msgstr "permet tornar a basar les comissions amb missatges buits"
 
-#: builtin/rebase.c:1472
+#: builtin/rebase.c:1408
+#, fuzzy
 msgid "try to rebase merges instead of skipping them"
-msgstr ""
+msgstr "intenta fer «rebase» de les fusions en lloc d'omissió"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1411
 #, fuzzy
 msgid "use 'merge-base --fork-point' to refine upstream"
-msgstr "git merge-base --fork-point <referència> [<comissió>]"
+msgstr "usa «merge-base --fork-point» per refinar la font"
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1413
 msgid "use the given merge strategy"
 msgstr "utilitza l'estratègia de fusió donada"
 
-#: builtin/rebase.c:1479 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
 msgid "option"
 msgstr "opció"
 
-#: builtin/rebase.c:1480
+#: builtin/rebase.c:1416
 msgid "pass the argument through to the merge strategy"
 msgstr "passa l'argument a l'estratègia de fusió"
 
-#: builtin/rebase.c:1483
+#: builtin/rebase.c:1419
 msgid "rebase all reachable commits up to the root(s)"
-msgstr "fes «rebase» de totes les comissions accessibles fins l'arrel"
+msgstr "fes «rebase» de totes les comissions accessibles fins a l'arrel"
 
-#: builtin/rebase.c:1500
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
+#: builtin/rebase.c:1424
+#, fuzzy
+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"
 
-#: builtin/rebase.c:1506
+#: builtin/rebase.c:1442
 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:1547
-#, fuzzy
+#: builtin/rebase.c:1483
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
-msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
+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: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 «--root» amb «--root»"
 
-#: builtin/rebase.c:1551
+#: builtin/rebase.c:1497
 msgid "No rebase in progress?"
 msgstr "No hi ha un «rebase» en curs?"
 
-#: builtin/rebase.c:1555
+#: builtin/rebase.c:1501
 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:1578
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:123
 msgid "Cannot read HEAD"
 msgstr "No es pot llegir HEAD"
 
-#: builtin/rebase.c:1590
+#: builtin/rebase.c:1536
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17548,16 +20597,16 @@ 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:1609
+#: builtin/rebase.c:1555
 msgid "could not discard worktree changes"
 msgstr "no s'han pogut descartar els canvis de l'arbre de treball"
 
-#: builtin/rebase.c:1628
+#: builtin/rebase.c:1574
 #, c-format
 msgid "could not move back to %s"
 msgstr "no s'ha pogut tornar a %s"
 
-#: builtin/rebase.c:1673
+#: builtin/rebase.c:1620
 #, fuzzy, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17569,84 +20618,81 @@ 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 $state_dir_base, i\n"
-"em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n"
-"cas, proveu\n"
-"\t$cmd_live_rebase\n"
-"Si no és el cas, \n"
-"\t$cmd_clear_stale_rebase\n"
-"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
-"de valor."
+"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."
 
-#: builtin/rebase.c:1694
+#: builtin/rebase.c:1648
 msgid "switch `C' expects a numerical value"
 msgstr "«switch» «c» espera un valor numèric"
 
-#: builtin/rebase.c:1735
+#: builtin/rebase.c:1690
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Mode desconegut: %s"
 
-#: builtin/rebase.c:1757
+#: builtin/rebase.c:1729
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requereix --merge o --interactive"
 
-#: builtin/rebase.c:1797
+#: builtin/rebase.c:1759
 #, fuzzy
-msgid "--reschedule-failed-exec requires --exec or --interactive"
-msgstr "--strategy requereix --merge o --interactive"
+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:1809
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
+#: builtin/rebase.c:1772
+#, fuzzy, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Rebase de system%s desconegut"
+
+#: builtin/rebase.c:1802
+#, fuzzy
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr "--reschedulo-failed-exec requereix --exec o --interactive"
 
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1822
 #, fuzzy
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
-msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
+msgstr "no es poden combinar «--preserve-merges» amb «--rebase-merges»"
 
-#: builtin/rebase.c:1832
+#: builtin/rebase.c:1826
 #, fuzzy
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
-msgstr "error: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
-
-#: builtin/rebase.c:1838
-#, fuzzy
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy-option»"
-
-#: builtin/rebase.c:1841
-#, fuzzy
-msgid "cannot combine '--rebase-merges' with '--strategy'"
-msgstr "error: no es pot combinar «--rebase-merges» amb «--strategy»"
+msgstr ""
+"error no es pot combinar «--preserve-merges» amb «--reschedule-failed-exec»"
 
-#: builtin/rebase.c:1865
+#: builtin/rebase.c:1850
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "font no vàlida: «%s»"
 
-#: builtin/rebase.c:1871
+#: builtin/rebase.c:1856
 msgid "Could not create new root commit"
-msgstr "no s'ha pogut crear una comissió arrel nova"
+msgstr "No s'ha pogut crear una comissió arrel nova"
+
+#: builtin/rebase.c:1882
+#, fuzzy, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s' necessita exactament una base de fusió amb branca"
 
-#: builtin/rebase.c:1889
+#: builtin/rebase.c:1885
 #, fuzzy, c-format
 msgid "'%s': need exactly one merge base"
-msgstr "Cal exactament un rang."
+msgstr "'%s' necessita exactament una base de fusió"
 
-#: builtin/rebase.c:1896
+#: builtin/rebase.c:1893
 #, fuzzy, c-format
 msgid "Does not point to a valid commit '%s'"
-msgstr "No assenyala una comissió vàlida: $onto_name"
+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 hi ha tal branca: $branch_name"
+msgstr "fatal no existeix aquesta branca/commit «%s»"
 
-#: builtin/rebase.c:1929 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2415
 #, c-format
 msgid "No such ref: %s"
 msgstr "No hi ha tal referència: %s"
@@ -17654,104 +20700,70 @@ msgstr "No hi ha tal referència: %s"
 #: builtin/rebase.c:1940
 #, fuzzy
 msgid "Could not resolve HEAD to a revision"
-msgstr "no s'ha pogut resoldre la comissió HEAD"
-
-#: builtin/rebase.c:1981
-msgid "Cannot autostash"
-msgstr "No es pot emmagatzemar automàticament"
-
-#: builtin/rebase.c:1984
-#, fuzzy, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "final de fitxer inesperat"
-
-#: builtin/rebase.c:1990
-#, fuzzy, c-format
-msgid "Could not create directory for '%s'"
-msgstr "No s'ha pogut crear el directori «%s»"
+msgstr "No s'ha pogut resoldre HEAD a una revisió"
 
-#: builtin/rebase.c:1993
-#, fuzzy, c-format
-msgid "Created autostash: %s\n"
-msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-
-#: builtin/rebase.c:1996
-#, fuzzy
-msgid "could not reset --hard"
-msgstr "No s'ha pogut llegir orig-head"
-
-#: builtin/rebase.c:1997 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD ara és a %s"
-
-#: builtin/rebase.c:2013
+#: builtin/rebase.c:1961
 msgid "Please commit or stash them."
 msgstr "Cometeu-los o emmagatzemeu-los."
 
-#: builtin/rebase.c:2040
-#, c-format
-msgid "could not parse '%s'"
-msgstr "no s'ha pogut analitzar «%s»"
-
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:1997
 #, c-format
 msgid "could not switch to %s"
 msgstr "no s'ha pogut commutar a %s"
 
-#: builtin/rebase.c:2064
+#: builtin/rebase.c:2008
 msgid "HEAD is up to date."
 msgstr "HEAD està al dia."
 
-#: builtin/rebase.c:2066
+#: builtin/rebase.c:2010
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La branca actual %s està al dia.\n"
 
-#: builtin/rebase.c:2074
+#: builtin/rebase.c:2018
 msgid "HEAD is up to date, rebase forced."
 msgstr "La branca actual està al dia, «rebase» forçat."
 
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:2020
 #, 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:2084
+#: builtin/rebase.c:2028
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
 
-#: builtin/rebase.c:2091
+#: builtin/rebase.c:2035
 #, c-format
 msgid "Changes to %s:\n"
-msgstr "Canvis a  %s:\n"
+msgstr "Canvis a %s:\n"
 
-#: builtin/rebase.c:2094
+#: builtin/rebase.c:2038
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Canvis de %s a %s:\n"
 
-#: builtin/rebase.c:2119
+#: builtin/rebase.c:2063
 #, 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:2128
+#: builtin/rebase.c:2072
 msgid "Could not detach HEAD"
 msgstr "No s'ha pogut separar HEAD"
 
-#: builtin/rebase.c:2137
+#: builtin/rebase.c:2081
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avanç ràpid %s a %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:832
+#: builtin/receive-pack.c:1276
 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"
@@ -17767,22 +20779,22 @@ 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"
-"nu, perquè faria l'índex i l'arbre de treball inconsistents amb el\n"
-"que hàgiu pujat, i requeriria 'git reset --hard' per a fer que\n"
-"l'arbre de treball coincideixi amb HEAD.\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"
-"per a permetre pujar a la seva branca actual; no obstant, no es\n"
-"recomana això a menys que hàgiu decidit actualitzar el seu arbre en\n"
-"alguna altra manera per a coincidir amb el que hàgiu pujat.\n"
+"«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"
 "\n"
 "Per a silenciar aquest missatge i mantenir el comportament\n"
-"predeterminat, establiu la variable de configuració\n"
-"'receive.denyCurrentBranch' a 'refuse'."
+"per defecte, establiu la variable de configuració\n"
+"«receive.denyCurrentBranch» a «refuse»."
 
-#: builtin/receive-pack.c:852
+#: builtin/receive-pack.c:1296
 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"
@@ -17794,21 +20806,21 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 "Per defecte, es denega suprimir la branca actual, perquè el\n"
-"'git clone' següent no resultarà en cap fitxer agafat, causant\n"
+"«git clone» següent no resultarà en cap fitxer agafat, causant\n"
 "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'."
+"Per a silenciar aquest missatge, podeu establir-la a «refuse»."
 
-#: builtin/receive-pack.c:1938
+#: builtin/receive-pack.c:2479
 msgid "quiet"
 msgstr "silenciós"
 
-#: builtin/receive-pack.c:1952
+#: builtin/receive-pack.c:2493
 msgid "You must specify a directory."
 msgstr "Heu d'especificar un directori."
 
@@ -17818,61 +20830,66 @@ msgid ""
 "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>..."
 
 #: 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] "
+"<referències>..."
 
 #: builtin/reflog.c:25
 msgid "git reflog exists <ref>"
-msgstr ""
+msgstr "git reflog exists <referència>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "«%s» no és una marca de temps vàlida"
 
-#: builtin/reflog.c:605
-#, fuzzy, c-format
+#: builtin/reflog.c:609
+#, c-format
 msgid "Marking reachable objects..."
-msgstr "retén els objectes inabastables"
+msgstr "S'estan marcant els objectes abastables..."
 
-#: builtin/reflog.c:643
-#, c-format
+#: builtin/reflog.c:647
+#, fuzzy, c-format
 msgid "%s points nowhere!"
-msgstr ""
+msgstr "els percentatges no apunten enlloc!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:699
 #, fuzzy
 msgid "no reflog specified to delete"
-msgstr "cap remot especificat"
+msgstr "no s'ha especificat cap registre de referència per suprimir"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:708
 #, fuzzy, c-format
 msgid "not a reflog: %s"
-msgstr "no es pot llegir «%s»"
+msgstr "no és un registre de referència"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:713
 #, fuzzy, c-format
 msgid "no reflog for '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre per «%s»"
+msgstr "cap registre de referència per a «%s»"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:759
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "format de referència no vàlid: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:768
 msgid "git reflog [ show | expire | delete | exists ]"
-msgstr ""
+msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -17880,82 +20897,82 @@ msgstr ""
 "git remote add [-t <branca>] [-m <mestra>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nom> <url>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <antic> <nou>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <nom>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branca>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nom>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nom>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remot>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nom> <branca>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nom>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nom> <url-nou> [<url-antic>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nom> <url-nou>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nom> <url>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opcions>] <nom> <url>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nom> <branca>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nom> <branca>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opcions>] <nom>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opcions>] <nom>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opcions>] [<grup> | <remot>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "S'està actualitzant %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -17964,84 +20981,94 @@ msgstr ""
 "\t useu --mirror=fetch o\n"
 "\t --mirror=push en lloc d'això"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
-msgstr "paràmetre de reflexió desconegut: %s"
+msgstr "argument de «mirror» desconegut: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "obtén les branques remotes"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "en obtenir, importa totes les etiquetes i tots els objectes"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "o no obtinguis cap etiqueta (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "branques a seguir"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "branca mestra"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "estableix el remot com a mirall al qual pujar o del qual obtenir"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "especificar una branca mestra no té sentit amb --mirror"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 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:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr "el remot %s ja existeix."
 
-#: builtin/remote.c:198 builtin/remote.c:640
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "«%s» no és un nom de remot vàlid"
-
-#: builtin/remote.c:238
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "No s'ha pogut configurar la mestra «%s»"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:355
 #, 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:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr "(coincident)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:466
 msgid "(delete)"
 msgstr "(suprimir)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, fuzzy, c-format
+msgid "could not set '%s'"
+msgstr "no s'ha pogut establir «%s»"
+
+#: builtin/remote.c:660
+#, fuzzy, 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"
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "No existeix el remot «%s»"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:710
 #, 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:666
+#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18053,17 +21080,17 @@ msgstr ""
 "\t%s\n"
 "\tActualitzeu la configuració manualment si és necessari."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "la supressió de «%s» ha fallat"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
 msgstr "la creació de «%s» ha fallat"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18078,118 +21105,118 @@ msgstr[1] ""
 "eliminat;\n"
 "per a suprimir-les, useu:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "No s'ha pogut eliminar la secció de configuració «%s»"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:999
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " seguit"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
-msgstr " estancat (useu 'git remote prune' per a eliminar)"
+msgstr " estancat (useu «git remote prune» per a eliminar)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
 #, 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:974
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "es fa «rebase» interactivament sobre el remot %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1058
 #, fuzzy, c-format
 msgid "rebases interactively (with merges) onto remote %s"
-msgstr "es fa «rebase» interactivament sobre el remot %s"
+msgstr "rebases interactivament (amb fusions) en percentatges remots"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "es fa «rebase» sobre el remot %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
-msgstr "es fusiona amb el remot %s"
+msgstr " es fusiona amb el remot %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "es fusiona amb el remot %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    i amb el remot %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
 msgid "create"
 msgstr "crea"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr "suprimeix"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "al dia"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
 msgstr "avanç ràpid possible"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "local no actualitzat"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s força a %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s puja a %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s força a %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s puja a %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr "no consultis els remots"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "* remot %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL d'obtenció: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr "(sense URL)"
 
@@ -18197,328 +21224,345 @@ msgstr "(sense URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL de pujada: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branca de HEAD: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr "(no consultat)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "(desconegut)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
 #, c-format
 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:1195
+#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branca remota:%s"
 msgstr[1] "  Branques remotes:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr " (estat no consultat)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
 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:1215
+#: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  «git push» reflectirà les referències locals"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1303
 #, 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:1242
+#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
-msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
+msgstr "estableix refs/remotes/<nom>/HEAD segons el remot"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
-msgstr "suprimeix refs/remotes/<name>/HEAD"
+msgstr "suprimeix refs/remotes/<nom>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr "No es pot determinar la HEAD remota"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
 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:1271
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr "No s'ha pogut suprimir %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No és una referència vàlida: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr "No s'ha pogut configurar %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s es tornarà penjant!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s s'ha tornat penjant!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "S'està podant %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [podaria] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [podat] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr "poda els remots després d'obtenir-los"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr "No hi ha tal remot «%s»"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "afegeix branca"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr "cap remot especificat"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
 msgid "query push URLs rather than fetch URLs"
 msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "retorna tots els URL"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "cap URL configurat per al remot «%s»"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "manipula els URL de pujada"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "afegeix URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "suprimeix els URL"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no té sentit"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patró d'URL antic no vàlid: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No s'ha trobat tal URL: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
 msgstr "No se suprimiran tots els URL no de pujada"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "sigues detallat; s'ha de col·locar abans d'un subordre"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Subordre desconeguda: %s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr "git repack [<opcions>]"
 
-#: builtin/repack.c:27
+#: 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 ""
-"Els reempaquetaments incrementals són incompatibles amb els índexs de "
-"bitmaps.  Useu\n"
+"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:201
+#: builtin/repack.c:198
+#, fuzzy
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
+"no s'han pogut iniciar pack-objects per tornar a empaquetar els objectes "
+"«promissor»"
 
-#: builtin/repack.c:240 builtin/repack.c:418
+#: builtin/repack.c:270 builtin/repack.c:630
+#, fuzzy
 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 "
+"des de pack-objects."
 
-#: builtin/repack.c:257
+#: builtin/repack.c:294
+#, fuzzy
 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"
+
+#: builtin/repack.c:309
+#, fuzzy, c-format
+msgid "cannot open index for %s"
+msgstr "s'ha produït un error en obrir l'índex per «%s»"
+
+#: builtin/repack.c:368
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr ""
 
-#: builtin/repack.c:295
+#: 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 "empaqueta-ho tot en un únic paquet"
 
-#: builtin/repack.c:297
+#: builtin/repack.c:462
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "el mateix que -a, i solta els objectes inabastables"
 
-#: builtin/repack.c:300
+#: builtin/repack.c:465
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "elimina els paquets redundants, i executeu git-prune-packed"
 
-#: builtin/repack.c:302
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passa --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passa --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:306
+#: builtin/repack.c:471
 msgid "do not run git-update-server-info"
 msgstr "no executis git-update-server-info"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:474
 msgid "pass --local to git-pack-objects"
 msgstr "passa --local a git-pack-objects"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:476
 msgid "write bitmap index"
 msgstr "escriu índex de mapa de bits"
 
-#: builtin/repack.c:313
+#: builtin/repack.c:478
 #, fuzzy
 msgid "pass --delta-islands to git-pack-objects"
-msgstr "passa --local a git-pack-objects"
+msgstr "passa --delta-illes a git-pack-objects"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:479
 msgid "approxidate"
 msgstr "data aproximada"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:480
 msgid "with -A, do not loosen objects older than this"
 msgstr "amb -A, no soltis els objectes més vells que aquest"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:482
 msgid "with -a, repack unreachable objects"
 msgstr "amb -a, reempaqueta els objectes inabastables"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:484
 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:320 builtin/repack.c:326
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:321
+#: builtin/repack.c:486
 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:323
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr "limita la profunditat màxima de les diferències"
 
-#: builtin/repack.c:325
+#: builtin/repack.c:490
 msgid "limits the maximum number of threads"
 msgstr "limita el nombre màxim de fils"
 
-#: builtin/repack.c:327
+#: builtin/repack.c:492
 msgid "maximum size of each packfile"
 msgstr "mida màxima de cada fitxer de paquet"
 
-#: builtin/repack.c:329
+#: builtin/repack.c:494
 msgid "repack objects in packs marked with .keep"
 msgstr "reempaqueta els objectes en paquets marcats amb .keep"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:496
 #, fuzzy
 msgid "do not repack this pack"
-msgstr "crea paquets prims"
+msgstr "no reempaqueta aquest paquet"
+
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr ""
 
-#: builtin/repack.c:341
+#: 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"
+msgstr "no es poden suprimir paquets en un repositori d'objectes preciosos"
 
-#: builtin/repack.c:345
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable i -A són incompatibles"
 
-#: builtin/repack.c:427
+#: builtin/repack.c:527
+#, fuzzy
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--long és incompatible amb --abbrev=0"
+
+#: builtin/repack.c:639
 #, fuzzy
 msgid "Nothing new to pack."
-msgstr "usa el paquet prim"
+msgstr "Res nou per empaquetar."
 
-#: builtin/repack.c:488
-#, 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 ""
+#: builtin/repack.c:669
+#, fuzzy, c-format
+msgid "missing required file: %s"
+msgstr "falten els arguments per a %s"
 
-#: builtin/repack.c:536
-#, c-format
-msgid "failed to remove '%s'"
-msgstr "s'ha produït un error en eliminar «%s»"
+#: builtin/repack.c:671
+#, fuzzy, c-format
+msgid "could not unlink: %s"
+msgstr "no s'ha pogut bloquejar «%s»"
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
@@ -18545,121 +21589,127 @@ msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<format>] [-l [<patró>]]"
 
 #: builtin/replace.c:90
-#, c-format
+#, fuzzy, 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»"
 
 #: builtin/replace.c:125
 #, fuzzy, c-format
 msgid "replace ref '%s' not found"
-msgstr "no s'ha trobat la branca «%s»."
+msgstr "no s'ha trobat la ref '%s'"
 
 #: builtin/replace.c:141
 #, fuzzy, c-format
 msgid "Deleted replace ref '%s'"
-msgstr "suprimeix les referències reemplaçades"
+msgstr "S'ha suprimit la referència «%s»"
 
 #: builtin/replace.c:153
 #, fuzzy, c-format
 msgid "'%s' is not a valid ref name"
-msgstr "«%s» no és un nom de remot vàlid"
+msgstr "'%s' no és un nom de referència vàlid"
 
 #: builtin/replace.c:158
 #, fuzzy, c-format
 msgid "replace ref '%s' already exists"
-msgstr "el destí «%s» ja existeix"
+msgstr "reemplaça la referència «%s» ja existeix"
 
 #: builtin/replace.c:178
-#, c-format
+#, fuzzy, 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»."
 
 #: builtin/replace.c:229
 #, fuzzy, c-format
 msgid "unable to open %s for writing"
-msgstr "No s'ha pogut obrir «%s» per a escriptura"
+msgstr "no s'han pogut obrir els percentatges per escriure"
 
 #: builtin/replace.c:242
+#, fuzzy
 msgid "cat-file reported failure"
-msgstr ""
+msgstr "error en el fitxer de gat"
 
 #: builtin/replace.c:258
 #, fuzzy, c-format
 msgid "unable to open %s for reading"
-msgstr "no s'ha pogut obrir o llegir %s"
+msgstr "no s'han pogut obrir els percentatges de lectura"
 
 #: builtin/replace.c:272
 #, fuzzy
 msgid "unable to spawn mktree"
-msgstr "no s'ha pogut llegir l'arbre (%s)"
+msgstr "no s'ha pogut engendrar el mktree"
 
 #: builtin/replace.c:276
 #, fuzzy
 msgid "unable to read from mktree"
-msgstr "no s'ha pogut llegir l'arbre (%s)"
+msgstr "no s'ha pogut llegir des de mktree"
 
 #: builtin/replace.c:285
 #, fuzzy
 msgid "mktree reported failure"
-msgstr "la reversió ha fallat"
+msgstr "mktree ha fallat"
 
 #: builtin/replace.c:289
 #, fuzzy
 msgid "mktree did not return an object name"
-msgstr "el remot no ha enviat tots els objectes necessaris"
+msgstr "mktree no ha retornat un nom d'objecte"
 
 #: builtin/replace.c:298
 #, fuzzy, c-format
 msgid "unable to fstat %s"
-msgstr "no s'ha pogut actualitzar %s"
+msgstr "no s'han pogut fer fstat%s"
 
 #: builtin/replace.c:303
 #, fuzzy
 msgid "unable to write object to database"
-msgstr "no s'ha pogut escriure l'objecte de nota"
+msgstr "no s'ha pogut escriure l'objecte a la base de dades"
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: 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»"
+msgstr "no és un nom d'objecte vàlid «%s»"
 
 #: builtin/replace.c:326
 #, fuzzy, c-format
 msgid "unable to get object type for %s"
-msgstr "no es pot fer grep des d'un objecte de tipus %s"
+msgstr "no s'ha pogut obtenir el tipus d'objecte per un percentatge"
 
 #: builtin/replace.c:342
 #, fuzzy
 msgid "editing object file failed"
-msgstr "la lectura de les referències de bisecció ha fallat"
+msgstr "l'edició del fitxer d'objecte ha fallat"
 
 #: builtin/replace.c:351
-#, c-format
+#, fuzzy, c-format
 msgid "new object is the same as the old one: '%s'"
-msgstr ""
+msgstr "l'objecte nou és el mateix que l'antic «%s»"
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, fuzzy, c-format
 msgid "could not parse %s as a commit"
-msgstr "no s'ha pogut analitzar la comissió HEAD"
+msgstr "no s'han pogut analitzar els percentatges com a comissió"
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "etiqueta de fusió mal formada en la comissió «%s»"
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18668,105 +21718,106 @@ msgstr ""
 "la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; "
 "useu --edit en lloc de --graft"
 
-#: builtin/replace.c:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "la comissió original «%s» té una signatura gpg"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "s'eliminarà la signatura en la comissió de reemplaçament!"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, 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:486
-#, c-format
+#: builtin/replace.c:488
+#, fuzzy, c-format
 msgid "graft for '%s' unnecessary"
-msgstr ""
+msgstr "empelt per '%s' innecessari"
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, 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:525
+#: builtin/replace.c:527
 #, fuzzy, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
-msgstr "Eliminaria l'ítem següent:"
+msgstr "no s'han pogut convertir els següents percentatges d'empelt"
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "llista les referències reemplaçades"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "suprimeix les referències reemplaçades"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "edita un objecte existent"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "canvia les mares d'una comissió"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 #, fuzzy
 msgid "convert existing graft file"
-msgstr "força la sobreescriptura de fitxers existents"
+msgstr "converteix el fitxer d'empelt existent"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "reemplaça la referència si existeix"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "no imprimeixis bellament els continguts per a --edit"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "usa aquest format"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 #, fuzzy
 msgid "--format cannot be used when not listing"
-msgstr "--fix-thin no es pot usar sense --stdin"
+msgstr "no es pot utilitzar «--format» en no llistar"
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 #, fuzzy
 msgid "-f only makes sense when writing a replacement"
-msgstr "-z només té sentit amb --stdin"
+msgstr "-f només té sentit quan s'escriu un reemplaçament"
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw només té sentit amb --edit"
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
+#, fuzzy
 msgid "-d needs at least one argument"
-msgstr ""
+msgstr "-d necessita almenys un argument"
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "nombre incorrecte d'arguments"
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e necessita exactament un argument"
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g necessita almenys un argument"
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file arguments"
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "només es pot especificar un patró amb -l"
 
@@ -18779,8 +21830,9 @@ msgid "register clean resolutions in index"
 msgstr "registra les resolucions netes en l'índex"
 
 #: builtin/rerere.c:79
+#, fuzzy
 msgid "'git rerere forget' without paths is deprecated"
-msgstr ""
+msgstr "'git rererere oblid' sense camins està en desús"
 
 #: builtin/rerere.c:113
 #, c-format
@@ -18794,170 +21846,183 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<comissió>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<arbre>] [--] <camins>..."
+#, fuzzy
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<tree-ish>] [--] <pathspec>"
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<arbre>] [--] [<camins>...]"
+#, fuzzy
+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
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<tree-ish>] [--] [<pathspec>]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "mixt"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "suau"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "dur"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "fusió"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "reteniment"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "No teniu un HEAD vàlid."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "S'ha produït un error en trobar l'arbre de HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, 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:193
+#: builtin/reset.c:116
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD ara és a %s"
+
+#: builtin/reset.c:195
 #, 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:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
 msgid "be quiet, only report errors"
 msgstr "sigues silenciós, només informa d'errors"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "restableix HEAD i l'índex"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "restableix només HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "restableix HEAD, l'índex i l'arbre de treball"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "restableix HEAD però retén els canvis locals"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 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:326
+#: builtin/reset.c:344
 #, 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:334
+#: builtin/reset.c:352
 #, 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:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch és incompatible amb --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 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 "
+"--mixed amb camins està en desús; useu «git reset -- <camins>» en lloc "
 "d'això."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No es pot restablir de %s amb camins."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, 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"
+msgstr "el restabliment de %s no es permet en un repositori nu"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
 msgstr "-N només es pot usar amb --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "Canvis «unstaged» després del restabliment:"
 
-#: builtin/reset.c:398
-#, c-format
+#: builtin/reset.c:416
+#, fuzzy, 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."
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, 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:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "No s'ha pogut escriure el fitxer d'índex nou."
 
-#: builtin/rev-list.c:412
+#: 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:473
+#: builtin/rev-list.c:599
 msgid "object filtering requires --objects"
 msgstr "el filtratge d'objectes requereix --objects"
 
-#: builtin/rev-list.c:476
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "valor parcial no vàlid: «%s»"
-
-#: builtin/rev-list.c:527
+#: builtin/rev-list.c:659
 msgid "rev-list does not support display of notes"
 msgstr "el rev-list no permet mostrar notes"
 
-#: builtin/rev-list.c:530
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "no es pot combinar --use-bitmap-index amb el filtratge d'objectes"
+#: builtin/rev-list.c:664
+#, fuzzy
+msgid "marked counting is incompatible with --objects"
+msgstr "el recompte marcat és incompatible amb --objects"
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
-msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
+msgstr "git rev-parse --parseopt [<opcions>] -- [<arguments>...]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
-msgstr "retén el «--» passat com a paràmetre"
+msgstr "retén el «--» passat com a argument"
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
-msgstr "deixa d'analitzar després del primer paràmetre no d'opció"
+msgstr "deixa d'analitzar després del primer argument que no sigui d'opció"
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "emet en forma llarga enganxada"
 
-#: builtin/rev-parse.c:551
+#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -18965,12 +22030,12 @@ msgid ""
 "\n"
 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
 msgstr ""
-"git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]\n"
-"   or: git rev-parse --sq-quote [<paràmetre>...]\n"
-"   or: git rev-parse [<opcions>] [<paràmetre>...]\n"
+"git rev-parse --parseopt [<opcions>] -- [<arguments>...]\n"
+"   o bé: git rev-parse --sq-quote [<argument>...]\n"
+"   o bé: git rev-parse [<opcions>] [<argument>...]\n"
 "\n"
-"Executeu \"git rev-parse --parseopt -h\" per més informació sobre l'ús "
-"inicial."
+"Executeu «git rev-parse --parseopt -h» per a més informació sobre el primer "
+"ús."
 
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
@@ -19050,19 +22115,19 @@ msgstr "preserva les comissions inicialment buides"
 msgid "keep redundant, empty commits"
 msgstr "retén les comissions redundants i buides"
 
-#: builtin/revert.c:232
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr "la reversió ha fallat"
 
-#: builtin/revert.c:245
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr "el «cherry pick» ha fallat"
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opcions>] [--] <fitxer>..."
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -19076,7 +22141,7 @@ msgstr[1] ""
 "els fitxers següents tenen contingut «stage» diferent d'ambdós\n"
 "el fitxer i la HEAD:"
 
-#: builtin/rm.c:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -19084,13 +22149,13 @@ msgstr ""
 "\n"
 "(useu -f per a forçar l'eliminació)"
 
-#: 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] "el fitxer següent té canvis «staged» en l'índex:"
 msgstr[1] "els fitxers següents tenen canvis «staged» en l'índex:"
 
-#: 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)"
@@ -19098,45 +22163,50 @@ msgstr ""
 "\n"
 "(useu --cached per a mantenir el fitxer, o -f per a forçar l'eliminació)"
 
-#: 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] "el fitxer següent té modificacions locals:"
 msgstr[1] "els fitxers següents tenen modificacions locals:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:244
 msgid "do not list removed files"
 msgstr "no llistis els fitxers eliminats"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr "només elimina de l'índex"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
 msgstr "passa per alt la comprovació d'actualitat"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr "permet l'eliminació recursiva"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:249
 msgid "exit with a zero status even if nothing matched"
 msgstr "surt amb estat zero encara que res hagi coincidit"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:283
+#, fuzzy
+msgid "No pathspec was given. Which files should I remove?"
+msgstr ""
+"No s'ha indicat cap especificació de camí. Quins fitxers haig de suprimir?"
+
+#: builtin/rm.c:310
 #, fuzzy
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
-"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
-"per a procedir"
+"si us plau astaqueu els canvis a .gitmodules o feu un «stash» per continuar"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:331
 #, c-format
 msgid "not removing '%s' recursively without -r"
-msgstr "no s'està eliminant «%s» recursivament sense -r"
+msgstr "no s'eliminarà «%s» recursivament sense -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: no s'ha pogut eliminar %s"
@@ -19153,61 +22223,87 @@ msgstr ""
 "[<màquina>:]<directori> [<referència>...]\n"
 "  --all i especificació <referència> explícita són mútuament excloents."
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr "nom del remot"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "usa el protocol RPC sense estat"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "llegeix les referències des de stdin"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr "imprimeix l'estat des de l'ajudant remot"
 
-#: builtin/shortlog.c:14
-#, fuzzy
+#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
-msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]"
+msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
 
-#: builtin/shortlog.c:15
-#, fuzzy
+#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
-msgstr "git worktree list [<opcions>]"
+msgstr "git log --pretty=short | git shortlog [<opcions>]"
 
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
+#: builtin/shortlog.c:123
+#, fuzzy
+msgid "using multiple --group options with stdin is not supported"
+msgstr "no s'admet escriure a stdin"
+
+#: builtin/shortlog.c:133
+#, fuzzy
+msgid "using --group=trailer with stdin is not supported"
+msgstr "no s'admet escriure a stdin"
+
+#: builtin/shortlog.c:323
+#, fuzzy, c-format
+msgid "unknown group type: %s"
+msgstr "tipus desconegut"
+
+#: builtin/shortlog.c:351
+#, fuzzy
+msgid "group by committer rather than author"
 msgstr "Agrupa per «comitter» en comptes de per autor"
 
-#: builtin/shortlog.c:266
+#: 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:268
-msgid "Suppress commit descriptions, only provides commit count"
+#: 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"
 
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
+#: builtin/shortlog.c:358
+#, fuzzy
+msgid "show the email address of each author"
 msgstr "Mostra l'adreça electrònica de cada autor"
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
-msgstr ""
+msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+#, fuzzy
+msgid "linewrap output"
 msgstr "Ajusta les línies de la sortida"
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+#, fuzzy
+msgid "field"
+msgstr "camp"
+
+#: builtin/shortlog.c:363
 #, fuzzy
+msgid "group by field"
+msgstr "Agrupa per camp"
+
+#: builtin/shortlog.c:391
 msgid "too many arguments given outside repository"
-msgstr "hi ha massa arguments per a desassignar la font"
+msgstr "hi ha massa arguments donats fora del repositori"
 
 #: builtin/show-branch.c:13
 msgid ""
@@ -19247,7 +22343,7 @@ msgstr "mostra les branques amb seguiment remot"
 
 #: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
-msgstr "colora '*!+-' corresponent a la branca"
+msgstr "colora «*!+-» corresponent a la branca"
 
 #: builtin/show-branch.c:651
 msgid "show <n> more commits after the common ancestor"
@@ -19344,6 +22440,16 @@ msgstr "«%s» no és una referència vàlida."
 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>"
+
+#: builtin/show-index.c:31
+#, fuzzy
+msgid "Unknown hash algorithm"
+msgstr "variable  «%s» desconeguda"
+
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -19388,243 +22494,376 @@ 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/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:22
 #, fuzzy
-msgid "git stash list [<options>]"
-msgstr "git worktree list [<opcions>]"
+msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|disable) <opcions>"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/sparse-checkout.c:46
 #, fuzzy
-msgid "git stash show [<options>] [<stash>]"
-msgstr "git remote show [<opcions>] <nom>"
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout init [--cone]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
-msgid "git stash drop [-q|--quiet] [<stash>]"
+#: builtin/sparse-checkout.c:72
+#, fuzzy
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
 msgstr ""
+"aquest arbre de treball no és dispers (pot ser que el fitxer sparse-checkout "
+"no existeixi)"
 
-#: builtin/stash.c:25
-msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+#: builtin/sparse-checkout.c:227
+#, fuzzy
+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
+msgid "unable to upgrade repository format to enable worktreeConfig"
 msgstr ""
+"no s'ha pogut actualitzar el format del repositori per habilitar worktreeConfig"
+
+#: builtin/sparse-checkout.c:270
+#, fuzzy
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "no s'ha pogut establir el paràmetre extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:290
+#, fuzzy
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/sparse-checkout.c:310
 #, fuzzy
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "inicialitza el «sparse-checkout» en mode con"
+
+#: builtin/sparse-checkout.c:312
+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"
+
+#: builtin/sparse-checkout.c:361
+#, 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
+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>)"
+
+#: builtin/sparse-checkout.c:456
+#, fuzzy, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "no s'ha pogut treure la cadena de l'estil C «%s»"
+
+#: builtin/sparse-checkout.c:510 builtin/sparse-checkout.c:534
+#, fuzzy
+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
+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:613
+#, fuzzy
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:644
+msgid "error while refreshing working directory"
+msgstr "s'ha produït un error en actualitzar el directori de treball"
+
+#: builtin/stash.c:24 builtin/stash.c:40
+msgid "git stash list [<options>]"
+msgstr "git stash list [<opcions>]"
+
+#: builtin/stash.c:25 builtin/stash.c:45
+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>]"
+
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
-msgstr "git branch [<opcions>] [-l] [-f] <nom-de-branca> [<punt-inicial>]"
+msgstr "git stash branch <nom-de-branca> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:29 builtin/stash.c:70
 msgid "git stash clear"
-msgstr ""
+msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:30
+#, fuzzy
 msgid ""
 "git stash [push [-p|--patch] [-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]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: 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 ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [<missatge>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
-msgstr ""
+msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <missatge>] [-q|--quiet] <commit>"
+
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <missatge>]\n"
+"          [--] [<pathspec>...]]"
 
-#: builtin/stash.c:127
-#, fuzzy, c-format
+#: builtin/stash.c:130
+#, c-format
 msgid "'%s' is not a stash-like commit"
-msgstr "'$args' no és una comissió de tipus magatzem"
+msgstr "«%s» no és una comissió de tipus «stash»"
 
-#: builtin/stash.c:147
-#, fuzzy, c-format
+#: builtin/stash.c:150
+#, c-format
 msgid "Too many revisions specified:%s"
-msgstr "S'han especificat massa revisions: $REV"
+msgstr "S'han especificat massa revisions:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "No s'ha trobat cap «stash»."
 
-#: builtin/stash.c:175
-#, fuzzy, c-format
+#: builtin/stash.c:178
+#, c-format
 msgid "%s is not a valid reference"
-msgstr "«%s» no és un nom de remot vàlid"
+msgstr "«%s» no és una referència vàlida"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: 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:403
-#, fuzzy
+#: 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:492
 msgid "cannot apply a stash in the middle of a merge"
-msgstr "No es pot aplicar un magatzem enmig d'una fusió"
+msgstr "no es pot aplicar un «stash» enmig d'una fusió"
 
-#: builtin/stash.c:414
-#, fuzzy, c-format
+#: builtin/stash.c:503
+#, c-format
 msgid "could not generate diff %s^!."
-msgstr "no s'ha pogut generar la llista per a fer"
+msgstr "no s'ha pogut generar diff %s^!."
 
-#: builtin/stash.c:421
+#: builtin/stash.c:510
 #, fuzzy
-msgid "conflicts in index.Try without --index."
-msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
+msgid "conflicts in index. Try without --index."
+msgstr "hi ha conflictes en l'índex. Proveu-ho sense --index."
 
-#: builtin/stash.c:427
-#, fuzzy
+#: builtin/stash.c:516
 msgid "could not save index tree"
-msgstr "No s'ha pogut desar l'arbre d'índex"
+msgstr "no s'ha pogut desar l'arbre d'índex"
 
-#: builtin/stash.c:434
-#, fuzzy
+#: 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»"
+msgstr "no s'han pogut restaurar els fitxers no seguits des del «stash»"
 
-#: builtin/stash.c:448
-#, fuzzy, c-format
+#: builtin/stash.c:539
+#, c-format
 msgid "Merging %s with %s"
-msgstr "S'està fusionant %s amb %s\n"
+msgstr "S'està fusionant %s amb %s"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:549
 msgid "Index was not unstashed."
-msgstr "L'índex no estava sense emmagatzemar."
+msgstr "L'índex no estava «unstashed»."
 
-#: builtin/stash.c:516 builtin/stash.c:615
-#, fuzzy
+#: builtin/stash.c:591 builtin/stash.c:689
 msgid "attempt to recreate the index"
-msgstr "S'ha produït un error en llegir l'índex"
+msgstr "intenta tornar a crear l'índex"
 
-#: builtin/stash.c:549
-#, fuzzy, c-format
+#: builtin/stash.c:635
+#, c-format
 msgid "Dropped %s (%s)"
-msgstr "${REV} ($s) descartada"
+msgstr "Descartat %s (%s)"
 
-#: builtin/stash.c:552
-#, fuzzy, c-format
+#: builtin/stash.c:638
+#, c-format
 msgid "%s: Could not drop stash entry"
-msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
+msgstr "%s: no s'ha pogut descartar l'entrada «stash»"
 
-#: builtin/stash.c:577
-#, fuzzy, c-format
+#: builtin/stash.c:651
+#, c-format
 msgid "'%s' is not a stash reference"
-msgstr "'$args' no és una referència de magatzem"
+msgstr "«%s» no és una referència «stash»"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:701
 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:650 git-legacy-stash.sh:712
+#: builtin/stash.c:724
 msgid "No branch name specified"
 msgstr "Cap nom de branca especificat"
 
-#: builtin/stash.c:790 builtin/stash.c:827
-#, fuzzy, c-format
-msgid "Cannot update %s with %s"
-msgstr "No es pot actualitzar $ref_stash amb $w_commit"
+#: builtin/stash.c:808
+#, fuzzy
+msgid "failed to parse tree"
+msgstr "s'ha produït un error en analitzar %s"
 
-#: builtin/stash.c:808 builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:819
 #, fuzzy
-msgid "stash message"
-msgstr "missatge d'etiqueta"
+msgid "failed to unpack trees"
+msgstr "s'ha produït un error en desempaquetar l'objecte d'arbre HEAD"
 
-#: builtin/stash.c:818
+#: builtin/stash.c:839
 #, fuzzy
+msgid "include untracked files in the stash"
+msgstr "inclou els fitxers no seguits a «stash»"
+
+#: builtin/stash.c:842
+#, fuzzy
+msgid "only show untracked files in the stash"
+msgstr "inclou els fitxers no seguits a «stash»"
+
+#: builtin/stash.c:932 builtin/stash.c:969
+#, 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
+msgid "stash message"
+msgstr "missatge «stash»"
+
+#: builtin/stash.c:960
 msgid "\"git stash store\" requires one <commit> argument"
-msgstr "--bisect-clean-state no accepta paràmetres"
+msgstr "«git stash store» requereix un argument <comissió>"
 
-#: builtin/stash.c:1040 git-legacy-stash.sh:217
+#: builtin/stash.c:1175
 msgid "No changes selected"
 msgstr "No hi ha canvis seleccionats"
 
-#: builtin/stash.c:1136 git-legacy-stash.sh:150
+#: builtin/stash.c:1275
 msgid "You do not have the initial commit yet"
 msgstr "Encara no teniu la comissió inicial"
 
-#: builtin/stash.c:1163 git-legacy-stash.sh:165
+#: builtin/stash.c:1302
 msgid "Cannot save the current index state"
 msgstr "No es pot desar l'estat d'índex actual"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:180
+#: builtin/stash.c:1311
 msgid "Cannot save the untracked files"
 msgstr "No es poden desar els fitxers no seguits"
 
-#: builtin/stash.c:1183 builtin/stash.c:1192 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1322 builtin/stash.c:1331
 msgid "Cannot save the current worktree state"
 msgstr "No es pot desar l'estat d'arbre de treball actual"
 
-#: builtin/stash.c:1220 git-legacy-stash.sh:233
+#: builtin/stash.c:1359
 msgid "Cannot record working tree state"
 msgstr "No es pot registrar l'estat de l'arbre de treball"
 
-#: builtin/stash.c:1269 git-legacy-stash.sh:337
+#: builtin/stash.c:1408
 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:1285
-#, fuzzy
+#: builtin/stash.c:1426
 msgid "Did you forget to 'git add'?"
-msgstr "Potser volíeu dir «git add .»?\n"
+msgstr "Heu oblidat de fer «git add»?"
 
-#: builtin/stash.c:1300 git-legacy-stash.sh:345
+#: builtin/stash.c:1441
 msgid "No local changes to save"
 msgstr "No hi ha canvis locals a desar"
 
-#: builtin/stash.c:1307 git-legacy-stash.sh:350
+#: builtin/stash.c:1448
 msgid "Cannot initialize stash"
 msgstr "No es pot inicialitzar el magatzem"
 
-#: builtin/stash.c:1322 git-legacy-stash.sh:354
+#: builtin/stash.c:1463
 msgid "Cannot save the current status"
 msgstr "No es pot desar l'estat actual"
 
-#: builtin/stash.c:1327
-#, fuzzy, c-format
+#: builtin/stash.c:1468
+#, c-format
 msgid "Saved working directory and index state %s"
-msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
+msgstr "S'han desat el directori de treball i l'estat d'índex %s"
 
-#: builtin/stash.c:1417 git-legacy-stash.sh:384
+#: builtin/stash.c:1558
 msgid "Cannot remove worktree changes"
 msgstr "No es poden eliminar els canvis de l'arbre de treball"
 
-#: builtin/stash.c:1452 builtin/stash.c:1488
-#, fuzzy
+#: builtin/stash.c:1597 builtin/stash.c:1662
 msgid "keep index"
-msgstr "Actualitza l'índex"
+msgstr "mantén l'índex"
 
-#: builtin/stash.c:1454 builtin/stash.c:1490
+#: builtin/stash.c:1599 builtin/stash.c:1664
+#, fuzzy
 msgid "stash in patch mode"
-msgstr ""
+msgstr "stash en mode pedaç"
 
-#: builtin/stash.c:1455 builtin/stash.c:1491
-#, fuzzy
+#: builtin/stash.c:1600 builtin/stash.c:1665
 msgid "quiet mode"
-msgstr "silenciós"
+msgstr "mode silenciós"
 
-#: builtin/stash.c:1457 builtin/stash.c:1493
-#, fuzzy
+#: builtin/stash.c:1602 builtin/stash.c:1667
 msgid "include untracked files in stash"
-msgstr "mostra els fitxers no seguits en columnes"
+msgstr "inclou els fitxers no seguits a «stash»"
 
-#: builtin/stash.c:1459 builtin/stash.c:1495
-#, fuzzy
+#: builtin/stash.c:1604 builtin/stash.c:1669
 msgid "include ignore files"
-msgstr "elimina només els fitxers ignorats"
+msgstr "inclou els fitxers ignorats"
 
-#: builtin/stash.c:1555
-#, c-format
-msgid "could not exec %s"
-msgstr "no s'ha pogut executar %s"
+#: builtin/stash.c:1704
+#, fuzzy
+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»."
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -19643,363 +22882,465 @@ 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:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2424
 #, 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:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
-msgstr ""
+msgstr "submodule--helper print-default-remote no pren cap argument"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, 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:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1820
 msgid "alternative anchor for relative paths"
 msgstr "àncora alternativa per als camins relatius"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:473 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, 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:522
+#: builtin/submodule--helper.c:525
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "S'està entrant a «%s»\n"
 
-#: builtin/submodule--helper.c:525
-#, c-format
+#: builtin/submodule--helper.c:528
+#, fuzzy, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
+"runcommand ha retornat un estat diferent de zero per als percentatges ."
 
-#: builtin/submodule--helper.c:547
-#, c-format
+#: builtin/submodule--helper.c:550
+#, fuzzy, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
 "submodules of %s\n"
 "."
 msgstr ""
+"runcommand ha retornat un estat diferent de zero mentre es repeteix als "
+"submòduls niats de percentatges ."
 
-#: builtin/submodule--helper.c:563
-msgid "Suppress output of entering each submodule command"
+#: builtin/submodule--helper.c:566
+#, fuzzy
+msgid "suppress output of entering each submodule command"
 msgstr "Omet la sortida en entrar l'ordre de cada submòdul"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
-msgid "Recurse into nested submodules"
-msgstr "Inclou recursivament els submòduls imbricats"
+#: builtin/submodule--helper.c:568 builtin/submodule--helper.c:889
+#: builtin/submodule--helper.c:1488
+msgid "recurse into nested submodules"
+msgstr "inclou recursivament els submòduls imbricats"
 
-#: builtin/submodule--helper.c:570
-#, fuzzy
+#: builtin/submodule--helper.c:573
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
-msgstr "git submodule--helper foreach [--quiet] [--recursive] [<ordre>]"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <ordre>"
 
-#: builtin/submodule--helper.c:597
+#: 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."
+"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest repositori és "
+"el seu repositori font autoritzat."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, 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:669
+#: builtin/submodule--helper.c:671
 #, 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:679
+#: builtin/submodule--helper.c:681
 #, 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:686
+#: builtin/submodule--helper.c:688
 #, 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:708
-msgid "Suppress output for initializing a submodule"
+#: builtin/submodule--helper.c:710
+#, fuzzy
+msgid "suppress output for initializing a submodule"
 msgstr "Omet la sortida d'inicialitzar un submòdul"
 
-#: builtin/submodule--helper.c:713
-#, fuzzy
+#: builtin/submodule--helper.c:715
 msgid "git submodule--helper init [<options>] [<path>]"
-msgstr "git submodule--helper init [<camí>]"
+msgstr "git submodule--helper init [<opcions>] [<camí>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:788 builtin/submodule--helper.c:923
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "No s'ha trobat cap mapatge de submòdul a .gitmodules per al camí «%s»"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:836
 #, 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:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1458
 #, 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:875 builtin/submodule--helper.c:1186
-msgid "Suppress submodule status output"
+#: builtin/submodule--helper.c:887 builtin/submodule--helper.c:1624
+#, fuzzy
+msgid "suppress submodule status output"
 msgstr "Suprimeix la sortida de l'estat del submòdul"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:888
+#, fuzzy
 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 ""
+"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
+"submòdul HEAD"
 
-#: builtin/submodule--helper.c:877
-msgid "recurse into nested submodules"
-msgstr "inclou recursivament els submòduls imbrincats"
-
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:894
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<camí>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:918
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <camí>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:990
+#, fuzzy, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* el %s(blob)->%s(submòdul)"
+
+#: builtin/submodule--helper.c:993
+#, fuzzy, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* un %s per cents(submòdul)->%s(blob)"
+
+#: builtin/submodule--helper.c:1006
+#, fuzzy, c-format
+msgid "%s"
+msgstr "percentatges"
+
+#: builtin/submodule--helper.c:1056
+#, fuzzy, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "no s'ha pogut analitzar l'objecte «%s»"
+
+#: builtin/submodule--helper.c:1060
+#, fuzzy, c-format
+msgid "unexpected mode %o\n"
+msgstr "mode inesperat $mod_dst"
+
+#: builtin/submodule--helper.c:1301
+#, fuzzy
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr ""
+"Utilitza la comissió emmagatzemada a l'índex en lloc de la emmagatzemada al "
+"submòdul HEAD"
+
+#: builtin/submodule--helper.c:1303
+#, fuzzy
+msgid "to 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"
+
+#: builtin/submodule--helper.c:1305
+#, fuzzy
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "omet els submòduls amb el valor «ignoreconfig» establert a «all»"
+
+#: builtin/submodule--helper.c:1307
+#, fuzzy
+msgid "limit the summary size"
+msgstr "limita a caps"
+
+#: builtin/submodule--helper.c:1312
+#, fuzzy
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper init [<opcions>] [<camí>]"
+
+#: builtin/submodule--helper.c:1336
+#, fuzzy
+msgid "could not fetch a revision for HEAD"
+msgstr "no s'ha pogut separar 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
 #, 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:976
+#: builtin/submodule--helper.c:1414
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "s'ha produït un error en registrar l'url per al camí del submòdul «%s»"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1428
 #, 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:1001
+#: builtin/submodule--helper.c:1439
 #, 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:1048
-msgid "Suppress output of synchronizing submodule url"
+#: builtin/submodule--helper.c:1486
+#, fuzzy
+msgid "suppress output of synchronizing submodule url"
 msgstr "Omet la sortida de la sincronització de l'url del submòdul"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1493
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1547
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
 "really want to remove it including all of its history)"
 msgstr ""
 "L'arbre de treball de submòdul «%s» conté un directori .git\n"
-"(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva història)"
+"(useu «rm -rf» si realment voleu eliminar-lo, incloent tota la seva història)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1559
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
-"L'arbre de treball del submòdul «%s» conté modificacions locals; useu '-f' "
+"L'arbre de treball del submòdul «%s» conté modificacions locals; useu «-f» "
 "per a descartar-les"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1567
 #, c-format
 msgid "Cleared directory '%s'\n"
-msgstr "S'ha netejat el directori «%s»\n"
+msgstr "S'ha esborrat el directori «%s»\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1569
 #, 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:1142
+#: builtin/submodule--helper.c:1580
 #, 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:1158
+#: builtin/submodule--helper.c:1596
 #, 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:1187
-msgid "Remove submodule working trees even if they contain local changes"
+#: builtin/submodule--helper.c:1625
+#, fuzzy
+msgid "remove submodule working trees even if they contain local changes"
 msgstr ""
-"Suprimeix els arbres de treball dels submòduls fins i tot si contenen canvis "
+"Elimina els arbres de treball dels submòduls fins i tot si contenen canvis "
 "locals"
 
-#: builtin/submodule--helper.c:1188
-msgid "Unregister all submodules"
+#: builtin/submodule--helper.c:1626
+#, fuzzy
+msgid "unregister all submodules"
 msgstr "Desregistra recursivament tots els submòduls"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1631
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<camí>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1645
 msgid "Use '--all' if you really want to deinitialize all submodules"
-msgstr "Useu '--all' si realment voleu desinicialitzar tots els submòduls"
+msgstr "Useu «--all» si realment voleu desinicialitzar tots els submòduls"
+
+#: builtin/submodule--helper.c:1714
+#, fuzzy
+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»."
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1753 builtin/submodule--helper.c:1756
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1792
 #, 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:1348
+#: builtin/submodule--helper.c:1799
 #, 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:1371
+#: builtin/submodule--helper.c:1823
 msgid "where the new submodule will be cloned to"
 msgstr "a on es clonarà el submòdul nou"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1826
 msgid "name of the new submodule"
 msgstr "nom del submòdul nou"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1829
 msgid "url where to clone the submodule from"
 msgstr "url del qual clonar el submòdul"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1837
 msgid "depth for shallow clones"
 msgstr "profunditat dels clons superficials"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1840 builtin/submodule--helper.c:2349
 msgid "force cloning progress"
 msgstr "força el progrés del clonatge"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1842 builtin/submodule--helper.c:2351
+msgid "disallow cloning into non-empty directory"
+msgstr "no permetis clonar en un directori no buit"
+
+#: builtin/submodule--helper.c:1849
+#, fuzzy
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
-"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
-"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
+"git submodule--helper clone [--prefix=<path>] [--quiet] [---reference "
+"<repository>] [--name <name>] [--depth <] [---single-branch] --url <url> --"
+"path <path>"
 
-#: builtin/submodule--helper.c:1424
+#: 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:1438
+#: 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»"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1937
 #, 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:1478
+#: builtin/submodule--helper.c:1941
 #, 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:1571
+#: builtin/submodule--helper.c:2042
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "El camí de submòdul «%s» no està inicialitzat"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:2046
 msgid "Maybe you want to use 'update --init'?"
-msgstr "Potser voleu usar 'update --init'?"
+msgstr "Potser voleu usar «update --init»?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:2076
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "S'està ometent el submòdul no fusionat %s"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:2105
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "S'està ometent el submòdul «%s»"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:2255
 #, 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:1789
+#: builtin/submodule--helper.c:2266
 #, 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:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2328 builtin/submodule--helper.c:2574
 msgid "path into the working tree"
 msgstr "camí a l'arbre de treball"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:2331
 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:1858
+#: builtin/submodule--helper.c:2335
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:1864
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2341
+#, fuzzy
+msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "Crea un clon superficial truncat al nombre de revisions especificat"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:2344
 msgid "parallel jobs"
 msgstr "tasques paral·leles"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2346
 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:1870
+#: builtin/submodule--helper.c:2347
 msgid "don't print cloning progress"
 msgstr "no imprimeixis el progrés del clonatge"
 
-#: builtin/submodule--helper.c:1877
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
+#: builtin/submodule--helper.c:2358
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<camí>] [<camí>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:2371
 msgid "bad value for update parameter"
 msgstr "valor incorrecte per al paràmetre update"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:2419
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20008,59 +23349,97 @@ 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:2061
+#: builtin/submodule--helper.c:2542
 #, 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:2094
+#: builtin/submodule--helper.c:2575
 msgid "recurse into submodules"
 msgstr "inclou recursivament als submòduls"
 
-#: builtin/submodule--helper.c:2100
-#, fuzzy
+#: builtin/submodule--helper.c:2581
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<camí>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opcions>] [<camí>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2637
 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:2159
+#: builtin/submodule--helper.c:2640
 #, fuzzy
 msgid "unset the config in the .gitmodules file"
-msgstr "l'allistament del .gitmodules actualitzat ha fallat"
+msgstr "no s'ha definit la configuració al fitxer .gitmodules"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2645
 #, fuzzy
 msgid "git submodule--helper config <name> [<value>]"
-msgstr "git submodule--helper config name [valor]"
+msgstr "git submodule--helper config <name> [<value>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2646
 #, fuzzy
 msgid "git submodule--helper config --unset <name>"
-msgstr "git submodule--helper config name [valor]"
+msgstr "git submodule--helper config --unset <name>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2647
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2666 git-submodule.sh:150
 #, fuzzy, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
-msgstr ""
-"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels mateixos "
-"per a procedir"
+msgstr "Assegureu-vos que el fitxer .gitmodules és a l'arbre de treball"
+
+#: builtin/submodule--helper.c:2682
+#, fuzzy
+msgid "suppress output for setting url of a submodule"
+msgstr "Omet la sortida d'inicialitzar un submòdul"
+
+#: builtin/submodule--helper.c:2686
+#, fuzzy
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
+
+#: builtin/submodule--helper.c:2719
+#, fuzzy
+msgid "set the default tracking branch to master"
+msgstr "mostra les branques amb seguiment remot"
+
+#: builtin/submodule--helper.c:2721
+#, fuzzy
+msgid "set the default tracking branch"
+msgstr "mostra les branques amb seguiment remot"
+
+#: builtin/submodule--helper.c:2725
+#, fuzzy
+msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
 
-#: builtin/submodule--helper.c:2235 git.c:434 git.c:684
+#: builtin/submodule--helper.c:2726
+#, fuzzy
+msgid ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<camí>]"
+
+#: builtin/submodule--helper.c:2733
+#, fuzzy
+msgid "--branch or --default required"
+msgstr "cal el nom de branca"
+
+#: 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:2793 git.c:449 git.c:724
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no admet --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2799
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "«%s» no és un subordre vàlid de submodule--helper"
+msgstr "«%s» no és una subordre vàlida de submodule--helper"
 
 #: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -20070,23 +23449,23 @@ msgstr "git symbolic-ref [<opcions>] <nom> [<referència>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nom>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "omet el missatge d'error de referències no simbòliques (separades)"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "suprimeix la referència simbòlica"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "escurça la sortida de referències"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr "raó"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "raó de l'actualització"
 
@@ -20096,18 +23475,20 @@ msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>]\n"
 "\t\t<tagname> [<head>]"
 msgstr ""
-"git tag [-a | -s | -u <id-de-clau>] [-f] [-m <missatge> | -F <fitxer>] <nom-"
-"d'etiqueta> [<cap>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <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>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<nombre>]] [--contains <comissió>] [--no-contains <comissió>] "
 "[--points-at <objecte>]\n"
@@ -20117,17 +23498,17 @@ msgstr ""
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "no s'ha trobat l'etiqueta «%s»."
 
-#: builtin/tag.c:105
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "S'ha suprimit l'etiqueta «%s» (era %s)\n"
 
-#: builtin/tag.c:135
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -20140,7 +23521,7 @@ msgstr ""
 "  %s\n"
 "Les línies que comencin amb «%c» s'ignoraran.\n"
 
-#: builtin/tag.c:139
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -20155,365 +23536,367 @@ msgstr ""
 "Les línies que comencin amb «%c» es retindran; podeu eliminar-les per vós "
 "mateix si voleu.\n"
 
-#: builtin/tag.c:198
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "no s'ha pogut signar l'etiqueta"
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
-
-#: builtin/tag.c:216
-#, c-format
+#: builtin/tag.c:259
+#, fuzzy, 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^{}"
 
-#: builtin/tag.c:232
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "el tipus d'objecte és incorrecte."
 
-#: builtin/tag.c:284
+#: builtin/tag.c:328
 msgid "no tag message?"
 msgstr "no hi ha cap missatge d'etiqueta?"
 
-#: builtin/tag.c:291
+#: builtin/tag.c:335
 #, 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:402
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr "llista els noms d'etiqueta"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr "suprimeix les etiquetes"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr "verifica les etiquetes"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr "Opcions de creació d'etiquetes"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr "etiqueta anotada, necessita un missatge"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:457
 msgid "tag message"
 msgstr "missatge d'etiqueta"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:459
 msgid "force edit of tag message"
 msgstr "força l'edició del missatge de l'etiqueta"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr "etiqueta anotada i signada per GPG"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr "usa una altra clau per a signar l'etiqueta"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
 msgstr "reemplaça l'etiqueta si existeix"
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "crea un registre de referències"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr "Opcions de llistat d'etiquetes"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr "mostra la llista d'etiquetes en columnes"
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that contain the commit"
 msgstr "imprimeix només les etiquetes que continguin la comissió"
 
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:470 builtin/tag.c:472
 msgid "print only tags that don't contain the commit"
 msgstr "imprimeix només les etiquetes que no continguin la comissió"
 
-#: builtin/tag.c:429
+#: builtin/tag.c:473
 msgid "print only tags that are merged"
 msgstr "imprimeix només les etiquetes que s'han fusionat"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:474
 msgid "print only tags that are not merged"
 msgstr "imprimeix només les etiquetes que no s'han fusionat"
 
-#: builtin/tag.c:434
+#: builtin/tag.c:478
 msgid "print only tags of the object"
 msgstr "imprimeix només les etiquetes de l'objecte"
 
-#: builtin/tag.c:482
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
 msgstr "--column i -n són incompatibles"
 
-#: builtin/tag.c:504
+#: 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:506
+#: 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:508
+#: 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:510
+#: 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:512
+#: 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:523
+#: 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:542
-msgid "too many params"
-msgstr "massa paràmetres"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:592
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "«%s» no és un nom d'etiqueta vàlid."
 
-#: builtin/tag.c:553
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'etiqueta «%s» ja existeix"
 
-#: builtin/tag.c:584
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta «%s» actualitzada (era %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "S'estan desempaquetant els objectes"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "s'ha produït un error en crear el directori %s"
 
-#: builtin/update-index.c:99
+#: 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:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "s'ha produït un error en suprimir el fitxer %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "s'ha produït un error en suprimir el directori %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "S'està provant mtime en «%s» "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
-"la informació d'stat de directori no canvia després d'afegir un fitxer nou"
+"la informació de stat de directori no canvia després d'afegir un fitxer nou"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
-"la informació d'stat de directori no canvia després d'afegir un directori nou"
+"la informació de stat de directori no canvia després d'afegir un directori "
+"nou"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
-"la informació d'stat de directori canvia després d'actualitzar un fitxer"
+"la informació de stat de directori canvia després d'actualitzar un fitxer"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
-"la informació d'stat de directori canvia després d'afegir un fitxer dins "
+"la informació de stat de directori canvia després d'afegir un fitxer dins "
 "d'un subdirectori"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
-"la informació d'stat de directori no canvia després de suprimir un fitxer"
+"la informació de stat de directori no canvia després de suprimir un fitxer"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
-"la informació d'stat de directori no canvia després de suprimir un directori"
+"la informació de stat de directori no canvia després de suprimir un directori"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " D'acord"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:976
 msgid "continue refresh even when index needs update"
 msgstr ""
 "continua l'actualització encara que l'índex necessiti una actualització"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr "actualitza: ignora els submòduls"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:982
 msgid "do not ignore new files"
 msgstr "no ignoris els fitxers nous"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:984
 msgid "let files replace directories and vice-versa"
 msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:986
 msgid "notice files missing from worktree"
 msgstr "tingues en compte els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:988
 msgid "refresh even if index contains unmerged entries"
 msgstr "actualitza encara que l'índex contingui entrades no fusionades"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:991
 msgid "refresh stat information"
 msgstr "actualitza la informació d'estadístiques"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:995
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>,<objecte>,<camí>"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:1000
 msgid "add the specified entry to the index"
 msgstr "afegeix l'entrada especificada a l'índex"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1010
 msgid "mark files as \"not changing\""
-msgstr "marca els fitxers com a \"no canviant\""
+msgstr "marca els fitxers com a «no canviant»"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
-msgstr "neteja el bit assumed-unchanged"
+msgstr "esborra el bit assumed-unchanged"
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
-msgstr "marca els fitxers com a \"només índex\""
+msgstr "marca els fitxers com a «només índex»"
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
-msgstr "neteja el bit skip-worktree"
+msgstr "esborra el bit skip-worktree"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1022
+#, fuzzy
+msgid "do not touch index-only entries"
+msgstr "no toquis entrades de només índex"
+
+#: builtin/update-index.c:1024
 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:1019
+#: builtin/update-index.c:1026
 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:1021
+#: builtin/update-index.c:1028
 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:1023
+#: builtin/update-index.c:1030
 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:1027
+#: builtin/update-index.c:1034
 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:1031
+#: builtin/update-index.c:1038
 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:1035
+#: builtin/update-index.c:1042
 msgid "only update entries that differ from HEAD"
 msgstr "només actualitza les entrades que difereixin de HEAD"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1046
 msgid "ignore files missing from worktree"
 msgstr "ignora els fitxers absents de l'arbre de treball"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1049
 msgid "report actions to standard output"
 msgstr "informa de les accions en la sortida estàndard"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1051
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr "escriu l'índex en aquest format"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
 msgstr "habilita o inhabilita l'índex dividit"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1059
 msgid "enable/disable untracked cache"
 msgstr "habilita/inhabilita la memòria cau no seguida"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1061
 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:1056
+#: builtin/update-index.c:1063
 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:1058
+#: builtin/update-index.c:1065
+#, fuzzy
 msgid "write out the index even if is not flagged as changed"
-msgstr ""
+msgstr "escriu l'índex encara que no estigui marcat com a canviat"
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1067
 msgid "enable or disable file system monitor"
 msgstr "habilita o inhabilita el monitor del sistema de fitxers"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1069
 msgid "mark files as fsmonitor valid"
 msgstr "marca els fitxers com a vàlids pel fsmonitor"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1072
 msgid "clear fsmonitor valid bit"
-msgstr "neteja el bit de validesa del fsmonitor"
+msgstr "esborra el bit de validesa del fsmonitor"
 
-#: builtin/update-index.c:1168
+#: builtin/update-index.c:1175
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20521,7 +23904,7 @@ msgstr ""
 "core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
 "voleu habilitar l'índex dividit"
 
-#: builtin/update-index.c:1177
+#: builtin/update-index.c:1184
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20529,7 +23912,7 @@ msgstr ""
 "core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
 "voleu inhabilitar l'índex dividit"
 
-#: builtin/update-index.c:1188
+#: 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"
@@ -20537,11 +23920,11 @@ msgstr ""
 "core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
 "realment voleu inhabilitar el cau no seguit"
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1200
 msgid "Untracked cache disabled"
 msgstr "La memòria cau no seguida està inhabilitada"
 
-#: builtin/update-index.c:1200
+#: 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"
@@ -20549,29 +23932,29 @@ msgstr ""
 "core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
 "realment voleu habilitar el cau no seguit"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1212
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "La memòria cau no seguida està habilitada per a «%s»"
 
-#: builtin/update-index.c:1212
+#: builtin/update-index.c:1220
 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:1216
+#: builtin/update-index.c:1224
 msgid "fsmonitor enabled"
 msgstr "fsmonitor habilitat"
 
-#: builtin/update-index.c:1219
+#: builtin/update-index.c:1227
 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:1223
+#: builtin/update-index.c:1231
 msgid "fsmonitor disabled"
 msgstr "fsmonitor inhabilitat"
 
@@ -20588,19 +23971,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opcions>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "suprimeix la referència"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
 msgstr "actualitza <nom de referència>, no la que apunti"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
-msgstr "stdin té paràmetres acabats amb NUL"
+msgstr "stdin té arguments acabats amb NUL"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr "llegeix les actualitzacions des de stdin"
 
@@ -20633,41 +24016,41 @@ msgstr ""
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "interromp la transferència després de <n> segons d'inactivitat"
 
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <comissió>..."
 
-#: builtin/verify-commit.c:69
+#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "imprimeix els continguts de la comissió"
 
-#: builtin/verify-commit.c:70 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "imprimeix la sortida crua de l'estat gpg"
 
-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquet>..."
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "detallat"
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "mostra només estadístiques"
 
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<format>] <etiqueta>..."
 
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "imprimeix els continguts de l'etiqueta"
 
 #: builtin/worktree.c:18
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
-msgstr "git worktree add [<opcions>] <camí> [<commit-ish>"
+msgstr "git worktree add [<opcions>] <camí> [<commit-ish>]"
 
 #: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
@@ -20687,263 +24070,269 @@ msgstr "git worktree prune [<opcions>]"
 
 #: builtin/worktree.c:23
 msgid "git worktree remove [<options>] <worktree>"
-msgstr "git worktree lock [<opcions>] <arbre de treball>"
+msgstr "git worktree remove [<opcions>] <arbre de treball>"
 
 #: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <camí>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:899
+#: builtin/worktree.c:61 builtin/worktree.c:935
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "s'ha produït un error en suprimir «%s»"
 
-#: builtin/worktree.c:80
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
-
-#: builtin/worktree.c:86
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
-
-#: builtin/worktree.c:91 builtin/worktree.c:100
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
-
-#: builtin/worktree.c:110
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven "
-"%<PRIuMAX> bytes, llegits %<PRIuMAX>)"
-
-#: builtin/worktree.c:118
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
-
-#: builtin/worktree.c:127
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
-"existent"
+#: builtin/worktree.c:74
+#, fuzzy, c-format
+msgid "Removing %s/%s: %s"
+msgstr "S'està eliminant %s"
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:149
 msgid "report pruned working trees"
 msgstr "informa dels arbres de treball podats"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:151
 msgid "expire working trees older than <time>"
 msgstr "fes caducar els arbres de treball més vells que <hora>"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:221
 #, c-format
 msgid "'%s' already exists"
 msgstr "«%s» ja existeix"
 
-#: builtin/worktree.c:252
-#, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "no s'ha pogut tornar a afegir a l'arbre de treball «%s»"
+#: builtin/worktree.c:230
+#, fuzzy, c-format
+msgid "unusable worktree destination '%s'"
+msgstr "no s'ha pogut fer «stat» a «%s»"
 
-#: builtin/worktree.c:257
-#, c-format
+#: builtin/worktree.c:235
+#, fuzzy, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"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"
 
-#: builtin/worktree.c:259
-#, c-format
+#: builtin/worktree.c:237
+#, fuzzy, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"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"
 
-#: builtin/worktree.c:309
+#: builtin/worktree.c:288
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no s'ha pogut crear directori de «%s»"
 
-#: builtin/worktree.c:440 builtin/worktree.c:446
+#: builtin/worktree.c:422 builtin/worktree.c:428
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "S'està preparant l'arbre de treball (branca nova «%s»)"
 
-#: builtin/worktree.c:442
-#, c-format
+#: builtin/worktree.c:424
+#, fuzzy, 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)"
 
-#: builtin/worktree.c:451
+#: builtin/worktree.c:433
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "S'està preparant l'arbre de treball (s'està agafant «%s»)"
 
-#: builtin/worktree.c:457
+#: builtin/worktree.c:439
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "S'està preparant l'arbre de treball (HEAD %s separat)"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "agafa <branca> encara que sigui agafada en altre arbre de treball"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "crea una branca nova"
 
-#: builtin/worktree.c:503
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "crea o restableix una branca"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "emplena l'arbre de treball nou"
 
-#: builtin/worktree.c:506
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "mantén l'arbre de treball nou bloquejat"
 
-#: builtin/worktree.c:509
+#: builtin/worktree.c:493
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configura el mode de seguiment (vegeu git-branch(1))"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:496
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "prova de fer coincidir el nom de la branca nova amb una branca amb seguiment "
 "remot"
 
-#: builtin/worktree.c:520
+#: 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:581
+#: builtin/worktree.c:565
 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:681
+#: builtin/worktree.c:682
+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>"
+
+#: 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"
 
-#: builtin/worktree.c:693 builtin/worktree.c:726 builtin/worktree.c:800
-#: builtin/worktree.c:927
+#: builtin/worktree.c:732 builtin/worktree.c:765 builtin/worktree.c:839
+#: builtin/worktree.c:963
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "«%s» no és un arbre de treball"
 
-#: builtin/worktree.c:695 builtin/worktree.c:728
+#: builtin/worktree.c:734 builtin/worktree.c:767
 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:700
+#: builtin/worktree.c:739
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "«%s» ja està bloquejat, raó: «%s»"
 
-#: builtin/worktree.c:702
+#: builtin/worktree.c:741
 #, c-format
 msgid "'%s' is already locked"
 msgstr "«%s» ja està bloquejat"
 
-#: builtin/worktree.c:730
+#: builtin/worktree.c:769
 #, c-format
 msgid "'%s' is not locked"
 msgstr "«%s» no està bloquejat"
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:810
 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:779
-#, fuzzy
+#: builtin/worktree.c:818
 msgid "force move even if worktree is dirty or locked"
-msgstr "força el moviment / canvi de nom encara que el destí existeixi"
+msgstr ""
+"força el moviment encara que l'arbre de treball estigui brut o bloquejat"
 
-#: builtin/worktree.c:802 builtin/worktree.c:929
+#: builtin/worktree.c:841 builtin/worktree.c:965
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "«%s» és un arbre de treball principal"
 
-#: builtin/worktree.c:807
+#: builtin/worktree.c:846
 #, 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:813
-#, c-format
-msgid "target '%s' already exists"
-msgstr "el destí «%s» ja existeix"
-
-#: builtin/worktree.c:821
+#: builtin/worktree.c:859
 #, fuzzy, 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 poden eliminar els canvis de l'arbre de treball"
+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"
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:861
 #, fuzzy
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
-msgstr "No es poden eliminar els canvis de l'arbre de treball"
+msgstr ""
+"no es pot moure un arbre de treball bloquejat; useu primer «move -f -f» per "
+"sobreescriure o desbloquejar"
 
-#: builtin/worktree.c:826
+#: builtin/worktree.c:864
 #, 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:831
+#: builtin/worktree.c:869
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "s'ha produït un error en moure «%s» a «%s»"
 
-#: builtin/worktree.c:879
+#: builtin/worktree.c:915
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "no s'ha pogut executar «git status» a «%s»"
 
-#: builtin/worktree.c:883
-#, c-format
-msgid "'%s' is dirty, use --force to delete it"
+#: builtin/worktree.c:919
+#, fuzzy, 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"
 
-#: builtin/worktree.c:888
+#: builtin/worktree.c:924
 #, 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:911
-#, fuzzy
+#: builtin/worktree.c:947
 msgid "force removal even if worktree is dirty or locked"
-msgstr "força el moviment / canvi de nom encara que el destí existeixi"
+msgstr ""
+"força l'eliminació encara que l'arbre de treball estigui brut o bloquejat"
 
-#: builtin/worktree.c:934
+#: builtin/worktree.c:970
 #, fuzzy, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
 "use 'remove -f -f' to override or unlock first"
-msgstr "No es poden eliminar els canvis de l'arbre de treball"
+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"
 
-#: builtin/worktree.c:936
+#: builtin/worktree.c:972
 #, fuzzy
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
-msgstr "No es poden eliminar els canvis de l'arbre de treball"
+msgstr ""
+"no es pot eliminar un arbre de treball bloquejat; useu primer «remove -f -f» "
+"per sobreescriure o desbloquejar"
 
-#: builtin/worktree.c:939
-#, c-format
+#: builtin/worktree.c:975
+#, fuzzy, 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"
+
+#: builtin/worktree.c:999
+#, fuzzy, c-format
+msgid "repair: %s: %s"
+msgstr "%s no vàlid: «%s»"
+
+#: builtin/worktree.c:1002
+#, fuzzy, c-format
+msgid "error: %s: %s"
+msgstr "error en %s %s: %s"
 
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -20961,145 +24350,120 @@ msgstr "escriu l'objecte d'arbre per a un subdirectori <prefix>"
 msgid "only useful for debugging"
 msgstr "només útil per a la depuració"
 
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"Els permisos en el vostre directori de sòcol són massa liberals;\n"
-"pot ser que altres usuaris poden llegir les vostres credencials.\n"
-"Considereu executar:\n"
-"\n"
-"\tchmod 0700 %s"
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "imprimeix els missatges de depuració a stderr"
-
-#: t/helper/test-reach.c:152
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "la comissió %s no està marcada com abastable"
-
-#: t/helper/test-reach.c:162
-msgid "too many commits marked reachable"
-msgstr "masses comission marcades com abastable"
-
-#: t/helper/test-serve-v2.c:7
+#: git.c:28
 #, fuzzy
-msgid "test-tool serve-v2 [<options>]"
-msgstr "git serve [<opcions>]"
-
-#: t/helper/test-serve-v2.c:19
-#, fuzzy
-msgid "exit immediately after advertising capabilities"
-msgstr "surt immediatament després de l'anunci inicial de referència"
-
-#: git.c:27
 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"
 "           [--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.c:34
+#: 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"
 "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 un 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:186
+#: git.c:188
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "no s'ha especificat un directori per --git-dir\n"
 
-#: git.c:200
+#: 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:214
+#: 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:228
-#, fuzzy, c-format
+#: git.c:230
+#, c-format
 msgid "no prefix given for --super-prefix\n"
-msgstr "%s no admet --super-prefix"
+msgstr "no s'ha especificat cap prefix per a --super-prefix\n"
 
-#: git.c:250
+#: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c espera una cadena de configuració\n"
 
-#: git.c:288
+#: 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"
 
-#: git.c:314
+#: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "opció desconeguda: %s\n"
 
-#: git.c:360
-#, c-format
+#: git.c:375
+#, fuzzy, c-format
 msgid "while expanding alias '%s': '%s'"
-msgstr ""
+msgstr "en expandir l'àlies '%s' '%s'"
 
-#: git.c:369
+#: git.c:384
 #, c-format
 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"
 
-#: git.c:377
-#, c-format
+#: git.c:391
+#, fuzzy, c-format
 msgid "empty alias for %s"
-msgstr ""
+msgstr "àlies buit per a percentatges"
 
-#: git.c:380
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr "àlies recursiu: %s"
 
-#: git.c:460
+#: git.c:476
 msgid "write failure on standard output"
 msgstr "fallada d'escriptura en la sortida estàndard"
 
-#: git.c:462
+#: git.c:478
 msgid "unknown write failure on standard output"
 msgstr "fallada d'escriptura desconeguda en la sortida estàndard"
 
-#: git.c:464
+#: git.c:480
 msgid "close failed on standard output"
 msgstr "ha fallat el tancament en la sortida estàndard"
 
-#: git.c:796
-#, c-format
+#: git.c:833
+#, fuzzy, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
-msgstr ""
+msgstr "bucle d'àlies detectat expansió de «%s» no acaba%"
 
-#: git.c:846
+#: git.c:883
 #, fuzzy, c-format
 msgid "cannot handle %s as a builtin"
-msgstr "no es pot usar  %s com a fitxer d'exclusió"
+msgstr "no es poden gestionar els percentatges com a integrat"
 
-#: git.c:859
+#: git.c:896
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -21108,55 +24472,213 @@ msgstr ""
 "ús: %s\n"
 "\n"
 
-#: git.c:879
-#, c-format
+#: git.c:916
+#, fuzzy, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
-msgstr ""
+msgstr "ha fallat l'expansió de l'àlies '%s'; '%s' no és una ordre git"
 
-#: git.c:891
+#: git.c:928
 #, 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.c:378
+#: http-fetch.c:118
+#, fuzzy, 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é '%')"
+
+#: http-fetch.c:128
+#, fuzzy
+msgid "not a git repository"
+msgstr "No és un repositori de git"
+
+#: http-fetch.c:134
+#, fuzzy
+msgid "--packfile requires --index-pack-args"
+msgstr "--pathspec-file-nul requereix --pathspec-from-file"
+
+#: http-fetch.c:143
+#, fuzzy
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "-N només es pot usar amb --mixed"
+
+#: t/helper/test-fast-rebase.c:141
+#, fuzzy
+msgid "unhandled options"
+msgstr "make_script: 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"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "la comissió %s no està marcada com abastable"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "hi ha massa comissions marcades com abastables"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opcions>]"
+
+#: t/helper/test-serve-v2.c:19
+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
+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
+#, fuzzy
+msgid "number of bytes"
+msgstr "nombre incorrecte d'arguments"
+
+#: t/helper/test-simple-ipc.c:704
+#, fuzzy
+msgid "number of requests per thread"
+msgstr "no s'ha pogut crear fil: %s"
+
+#: t/helper/test-simple-ipc.c:706
+#, fuzzy
+msgid "byte"
+msgstr "octets"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr ""
+
+#: 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"
 msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d"
 
-#: http.c:399
+#: http.c:420
 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:408
+#: http.c:429
 msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
+msgstr "No s'admet la fixació de clau pública amb cURL < 7.44.0"
 
-#: http.c:876
+#: http.c:910
 #, fuzzy
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
+msgstr "CURLSSLOPTNOREVOKE no està suportat amb cURL < 7.44.0"
 
-#: http.c:949
+#: http.c:989
 #, fuzzy
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
-msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
+msgstr "Restriccions de protocol no compatibles amb cURL < 7.19.4"
 
-#: http.c:1085
-#, c-format
+#: http.c:1132
+#, fuzzy, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
-msgstr ""
+msgstr "El dorsal SSL «%s» no està implementat. Els dorsals SSL compatibles"
 
-#: http.c:1092
-#, c-format
+#: http.c:1139
+#, fuzzy, 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"
 
-#: http.c:1096
+#: http.c:1143
 #, fuzzy, c-format
 msgid "Could not set SSL backend to '%s': already set"
-msgstr "No s'ha pogut tornar a $head_name"
+msgstr "No s'ha pogut establir el dorsal SSL a «%s» ja establert"
 
-#: http.c:1965
+#: http.c:2035
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21167,173 +24689,222 @@ msgstr ""
 "  petició: %s\n"
 "   redirecció: %s"
 
-#: remote-curl.c:157
+#: remote-curl.c:183
 #, fuzzy, c-format
 msgid "invalid quoting in push-option value: '%s'"
-msgstr "valor parcial no vàlid: «%s»"
+msgstr "cita no vàlida en el valor de l'opció d'empenta «%s»"
 
-#: remote-curl.c:254
+#: remote-curl.c:307
 #, fuzzy, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "«%s» no reconegut com un dipòsit git"
+msgstr "oversinfo/refs no és vàlid és un repositori git?"
 
-#: remote-curl.c:355
+#: remote-curl.c:408
 #, fuzzy
 msgid "invalid server response; expected service, got flush packet"
-msgstr "git archive: s'esperava ACK/NAK, s'ha rebut un paquet de neteja"
+msgstr ""
+"la resposta del servidor no és vàlida; el servei esperat ha rebut el paquet "
+"de neteja"
 
-#: remote-curl.c:386
+#: remote-curl.c:439
 #, fuzzy, c-format
 msgid "invalid server response; got '%s'"
-msgstr "referència no vàlida: %s"
+msgstr "resposta del servidor no vàlida; s'ha obtingut «%s»"
 
-#: remote-curl.c:446
-#, fuzzy, c-format
+#: remote-curl.c:499
+#, c-format
 msgid "repository '%s' not found"
-msgstr "no s'ha trobat la branca «%s»."
+msgstr "no s'ha trobat el repositori «%s»"
 
-#: remote-curl.c:450
-#, fuzzy, c-format
+#: remote-curl.c:503
+#, c-format
 msgid "Authentication failed for '%s'"
-msgstr "falta el valor per «%s»"
+msgstr "S'ha produït un error en autenticar per «%s»"
 
-#: remote-curl.c:454
-#, fuzzy, c-format
+#: remote-curl.c:507
+#, c-format
 msgid "unable to access '%s': %s"
-msgstr "no s'ha pogut accedir a '%s': %s"
+msgstr "no s'ha pogut accedir a «%s»: %s"
 
-#: remote-curl.c:460
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
 msgstr "s'està redirigint a %s"
 
-#: remote-curl.c:584
+#: remote-curl.c:642
+#, fuzzy
 msgid "shouldn't have EOF when not gentle on EOF"
-msgstr ""
+msgstr "No hauria de tenir EOF quan no sigui suau al EOF"
+
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
+msgstr "el servidor remot ha enviat un separador sense estat"
 
-#: remote-curl.c:664
+#: remote-curl.c:724
+#, fuzzy
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
+"no s'han pogut rebobinar les dades de publicació rpc - proveu d'augmentar "
+"http.postBuffer"
 
-#: remote-curl.c:724
+#: remote-curl.c:754
 #, fuzzy, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "error de protocol: caràcter de longitud de línia erroni: %.4s"
+
+#: remote-curl.c:756
+#, fuzzy
+msgid "remote-curl: unexpected response end packet"
+msgstr "paquet final de resposta inesperat del remot"
+
+#: remote-curl.c:832
+#, c-format
 msgid "RPC failed; %s"
-msgstr "STARTTLS ha fallat! %s"
+msgstr "RPC ha fallat; %s"
 
-#: remote-curl.c:764
+#: remote-curl.c:872
 #, fuzzy
 msgid "cannot handle pushes this big"
-msgstr "no es pot usar  %s com a fitxer d'exclusió"
+msgstr "no es pot gestionar empènyer aquest gran"
 
-#: remote-curl.c:879
-#, c-format
+#: remote-curl.c:987
+#, fuzzy, c-format
 msgid "cannot deflate request; zlib deflate error %d"
-msgstr ""
+msgstr "no es pot desinflar la sol·licitud; zlib deflate error%d"
 
-#: remote-curl.c:883
-#, c-format
+#: remote-curl.c:991
+#, fuzzy, c-format
 msgid "cannot deflate request; zlib end error %d"
-msgstr ""
+msgstr "no es pot desinflar la sol·licitud; error final zlib percentatged"
+
+#: remote-curl.c:1041
+#, fuzzy, c-format
+msgid "%d bytes of length header were received"
+msgstr "s'han rebut bytes percentuals de la capçalera de longitud"
+
+#: remote-curl.c:1043
+#, fuzzy, c-format
+msgid "%d bytes of body are still expected"
+msgstr "encara s'esperen bytes de cos per cent"
 
-#: remote-curl.c:1014
+#: remote-curl.c:1132
 #, fuzzy
 msgid "dumb http transport does not support shallow capabilities"
-msgstr "El servidor no permet clients superficials"
+msgstr "el transport ximple http no admet capacitats superficials"
 
-#: remote-curl.c:1028
+#: remote-curl.c:1147
 #, fuzzy
 msgid "fetch failed."
-msgstr "l'«stash» ha fallat"
+msgstr "el fetch ha fallat."
 
-#: remote-curl.c:1076
+#: remote-curl.c:1193
+#, fuzzy
 msgid "cannot fetch by sha1 over smart http"
-msgstr ""
+msgstr "no s’ha pogut obtenir per la sha1 a través de l’intel·ligent http"
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1237 remote-curl.c:1243
 #, fuzzy, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
-msgstr ""
-"s'ha produït un error de protocol: s'esperava shallow sha-1, s'ha rebut «%s»"
+msgstr "error de protocol esperat sha/ref s'ha obtingut «%s»"
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1255 remote-curl.c:1373
 #, fuzzy, c-format
 msgid "http transport does not support %s"
-msgstr "la variant «simple» d'ssh no és compatible amb -4"
+msgstr "El transport http no dóna suport als percentatges"
 
-#: remote-curl.c:1174
+#: remote-curl.c:1291
 #, fuzzy
 msgid "git-http-push failed"
-msgstr "l'«stash» ha fallat"
+msgstr "git-http-push ha fallat"
 
-#: remote-curl.c:1360
+#: remote-curl.c:1479
+#, fuzzy
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
-msgstr ""
+msgstr "ús remot de curl git remote-curl <remote> [<url>]"
 
-#: remote-curl.c:1392
+#: remote-curl.c:1511
+#, fuzzy
 msgid "remote-curl: error reading command stream from git"
-msgstr ""
+msgstr "error remot en llegir el flux d'ordres des de git"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1518
+#, fuzzy
 msgid "remote-curl: fetch attempted without a local repo"
-msgstr ""
+msgstr "s'ha intentat recuperar el valor remot sense un repositori local"
 
-#: remote-curl.c:1439
-#, c-format
+#: remote-curl.c:1559
+#, fuzzy, c-format
 msgid "remote-curl: unknown command '%s' from git"
-msgstr ""
+msgstr "comandament desconegut «%s» del git"
 
-#: list-objects-filter-options.h:61
+#: compat/compiler.h:26
+#, fuzzy
+msgid "no compiler information available\n"
+msgstr "no hi ha informació disponible del compilador"
+
+#: compat/compiler.h:38
+#, fuzzy
+msgid "no libc information available\n"
+msgstr "mostra la informació de branca"
+
+#: list-objects-filter-options.h:94
 msgid "args"
-msgstr "args"
+msgstr "arguments"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:95
 msgid "object filtering"
 msgstr "filtratge d'objecte"
 
-#: parse-options.h:170
+#: parse-options.h:184
 msgid "expiry-date"
 msgstr "data-de-caducitat"
 
-#: parse-options.h:184
+#: parse-options.h:198
 msgid "no-op (backward compatibility)"
 msgstr "operació nul·la (per a compatibilitat amb versions anteriors)"
 
-#: parse-options.h:305
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "sigues més detallat"
 
-#: parse-options.h:307
+#: parse-options.h:312
 msgid "be more quiet"
-msgstr "sigues més callat"
+msgstr "sigues més discret"
 
-#: parse-options.h:313
-msgid "use <n> digits to display SHA-1s"
+#: parse-options.h:318
+#, fuzzy
+msgid "use <n> digits to display object names"
 msgstr "usa <n> xifres per presentar els SHA-1"
 
-#: parse-options.h:332
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "com suprimir els espais i #comentaris del missatge"
 
-#: ref-filter.h:101
+#: 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"
+msgstr ""
+"amb --pathspec-from-file els elements d'especificació del camí estan "
+"separats amb caràcter NUL"
+
+#: ref-filter.h:99
 msgid "key"
 msgstr "clau"
 
-#: ref-filter.h:101
+#: ref-filter.h:99
 msgid "field name to sort on"
 msgstr "nom del camp en el qual ordenar"
 
 #: rerere.h:44
 msgid "update the index with reused conflict resolution if possible"
 msgstr ""
-"actualitza l'índex amb la resolució de conflicte reusada si és possible"
-
-#: wt-status.h:68
-msgid "HEAD detached at "
-msgstr "HEAD separat a "
-
-#: wt-status.h:69
-msgid "HEAD detached from "
-msgstr "HEAD separat de "
+"actualitza l'índex amb la resolució de conflictes reusada si és possible"
 
 #: command-list.h:50
 msgid "Add file contents to the index"
@@ -21353,7 +24924,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"
@@ -21374,717 +24945,726 @@ msgid "List, create, or delete branches"
 msgstr "Llista, crea o suprimeix branques"
 
 #: command-list.h:59
-msgid "Move objects and refs by archive"
-msgstr ""
+#, 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"
 
 #: 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:61
+#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Mostra la informació de .gitattributes"
 
-#: command-list.h:62
+#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Depura gitignore / fitxers d'exclusió"
 
-#: command-list.h:63
+#: command-list.h:64
 #, fuzzy
 msgid "Show canonical names and email addresses of contacts"
-msgstr "Mostra l'adreça electrònica de cada autor"
+msgstr "Mostra els noms canònics i les adreces electròniques dels contactes"
 
-#: command-list.h:64
+#: command-list.h:65
 msgid "Switch branches or restore working tree files"
 msgstr "Canvia de branca o restaura els fitxers de l'arbre de treball"
 
-#: command-list.h:65
+#: command-list.h:66
 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:66
+#: 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:67
+#: 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"
 
-#: command-list.h:68
+#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Aplica els canvis introduïts per algunes comissions existents"
 
-#: command-list.h:69
+#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Alternativa gràfica a git-commit"
 
-#: command-list.h:70
+#: command-list.h:71
 msgid "Remove untracked files from the working tree"
-msgstr "Suprimeix els fitxers no seguits de l'arbre de treball"
+msgstr "Elimina els fitxers no seguits de l'arbre de treball"
 
-#: command-list.h:71
+#: 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:72
+#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Mostra les dades en columnes"
 
-#: command-list.h:73
+#: 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:74
+#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Escriu i verifica els fitxers commit-graph de Git"
 
-#: command-list.h:75
+#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Crea un objecte de comissió nou"
 
-#: command-list.h:76
+#: 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:77
+#: command-list.h:78
+#, fuzzy
 msgid "Count unpacked number of objects and their disk consumption"
-msgstr ""
+msgstr "Compta el nombre d'objectes desempaquetats i el seu consum de disc"
 
-#: command-list.h:78
+#: command-list.h:79
+#, fuzzy
 msgid "Retrieve and store user credentials"
-msgstr ""
+msgstr "Recupera i desa les credencials d'usuari"
 
-#: command-list.h:79
+#: command-list.h:80
+#, fuzzy
 msgid "Helper to temporarily store passwords in memory"
-msgstr ""
+msgstr "Ajudant per emmagatzemar temporalment les contrasenyes a la memòria"
 
-#: command-list.h:80
+#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Ajudant per a emmagatzemar credencials a disc"
 
-#: command-list.h:81
+#: command-list.h:82
+#, fuzzy
 msgid "Export a single commit to a CVS checkout"
-msgstr ""
+msgstr "Exporta una sola entrega a una versió de CVS"
 
-#: command-list.h:82
+#: command-list.h:83
+#, fuzzy
 msgid "Salvage your data out of another SCM people love to hate"
-msgstr ""
+msgstr "Estalvia les teves dades d'una altra gent de SCM que li agrada odiar"
 
-#: command-list.h:83
+#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Un emulador de servidor CVS per al Git"
 
-#: command-list.h:84
+#: 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:85
+#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
-msgstr "Dóna un nom llegible per humans basant-se en les referències disponibles"
+msgstr ""
+"Dona un nom llegible per humans basant-se en les referències disponibles"
 
-#: command-list.h:86
+#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 "Mostra els canvis entre comissions, la comissió i l'arbre de treball, etc"
 
-#: command-list.h:87
+#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Compara fitxers en l'arbre de treball i l'índex"
 
-#: command-list.h:88
+#: command-list.h:89
 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:89
+#: 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 "
+"d'arbre"
 
-#: command-list.h:90
+#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Mostra els canvis usant eines diff comunes"
 
-#: command-list.h:91
+#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Explorador de dades del Git"
 
-#: command-list.h:92
+#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Rerefons per a importadors ràpids de dades de Git"
 
-#: command-list.h:93
+#: 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:94
+#: 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:95
+#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Torna a escriure les branques"
 
-#: command-list.h:96
+#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Produeix un missatge de comissió de fusió"
 
-#: command-list.h:97
+#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Mostra la informació en cada referència"
 
-#: command-list.h:98
+#: command-list.h:99
+#, fuzzy
+msgid "Run a Git command on a list of repositories"
+msgstr "executa les tasques basades en l'estat del repositori"
+
+#: 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:99
+#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
-msgstr "Verifica la connectivitat i validesa del objectes a la base de dades"
+msgstr "Verifica la connectivitat i validesa dels objectes a la base de dades"
 
-#: command-list.h:100
+#: 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:101
+#: command-list.h:103
+#, fuzzy
 msgid "Extract commit ID from an archive created using git-archive"
-msgstr ""
+msgstr "Extreu l'ID de la comissió d'un arxiu creat amb el git-archive"
 
-#: command-list.h:102
+#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Imprimeix les línies coincidents amb un patró"
 
-#: command-list.h:103
+#: 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:104
+#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "Calcula l'ID de l'objecte i opcionalment crea un blob des del fitxer"
 
-#: command-list.h:105
+#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Mostra informació d'ajuda del Git"
 
-#: command-list.h:106
+#: command-list.h:108
 msgid "Server side implementation of Git over HTTP"
-msgstr ""
+msgstr "Implementació al servidor del Git sobre HTTP"
 
-#: command-list.h:107
+#: 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:108
+#: command-list.h:110
 #, fuzzy
 msgid "Push objects over HTTP/DAV to another repository"
-msgstr "Baixa objectes i referències d'un altre dipòsit"
+msgstr "Empeny objectes sobre HTTP/DAV a un altre repositori"
 
-#: command-list.h:109
+#: command-list.h:111
+#, fuzzy
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
+"Envia una col·lecció de pedaços des de l'entrada estàndard a una carpeta IMAP"
 
-#: command-list.h:110
+#: 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:111
+#: 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:112
+#: command-list.h:114
+#, fuzzy
 msgid "Instantly browse your working repository in gitweb"
-msgstr ""
+msgstr "Navegueu instantàniament pel vostre repositori de treball a gitweb"
 
-#: command-list.h:113
+#: command-list.h:115
+#, fuzzy
 msgid "Add or parse structured information in commit messages"
-msgstr ""
+msgstr "Afegir o analitzar informació estructurada en missatges de publicació"
 
-#: command-list.h:114
+#: command-list.h:116
 msgid "The Git repository browser"
-msgstr "El navegador de dipòsits Git"
+msgstr "El navegador de repositoris Git"
 
-#: command-list.h:115
+#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Mostra els registres de comissió"
 
-#: command-list.h:116
+#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
-msgstr "Mostra informació sobre els fitxer a l'índex i a l'arbre de treball"
+msgstr "Mostra informació sobre els fitxers a l'índex i a l'arbre de treball"
 
-#: command-list.h:117
+#: command-list.h:119
 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:118
+#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Mostra els continguts d'un objecte de l'arbre"
 
-#: command-list.h:119
+#: command-list.h:121
+#, fuzzy
 msgid "Extracts patch and authorship from a single e-mail message"
-msgstr ""
+msgstr "Extreu pedaç i autoria d'un sol missatge de correu electrònic"
 
-#: command-list.h:120
+#: command-list.h:122
+#, fuzzy
 msgid "Simple UNIX mbox splitter program"
-msgstr ""
+msgstr "Programa de divisor mbox simple per a UNIX"
 
-#: command-list.h:121
+#: command-list.h:123
+#, fuzzy
+msgid "Run tasks to optimize Git repository data"
+msgstr "Executa les tasques per optimitzar les dades del repositori Git"
+
+#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "Uneix dues o més històries de desenvolupament"
 
-#: command-list.h:122
+#: command-list.h:125
 #, fuzzy
 msgid "Find as good common ancestors as possible for a merge"
-msgstr "troba els avantpassats per a una sola fusió d'n vies"
+msgstr "Troba els millors avantpassats comuns possibles per a una fusió"
 
-#: command-list.h:123
+#: command-list.h:126
 #, fuzzy
 msgid "Run a three-way file merge"
-msgstr "S'està retrocedint a una fusió de 3 vies...\n"
+msgstr "Executa una fusió de fitxers de tres vies"
 
-#: command-list.h:124
+#: command-list.h:127
 #, fuzzy
 msgid "Run a merge for files needing merging"
-msgstr "fusió de 3 vies si no cal fusió a nivell de fitxers"
+msgstr "Executa una fusió per als fitxers que cal fusionar"
 
-#: command-list.h:125
+#: command-list.h:128
+#, fuzzy
 msgid "The standard helper program to use with git-merge-index"
-msgstr ""
+msgstr "El programa d'ajuda estàndard a utilitzar amb git-merge-index"
 
-#: command-list.h:126
+#: 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 fussió"
+msgstr ""
+"Executa eines de resolució de conflictes per a resoldre conflictes de fusió"
 
-#: command-list.h:127
+#: command-list.h:130
+#, fuzzy
 msgid "Show three-way merge without touching index"
-msgstr ""
+msgstr "Mostra la fusió de tres vies sense l'índex tàctil"
 
-#: command-list.h:128
+#: command-list.h:131
+#, fuzzy
 msgid "Write and verify multi-pack-indexes"
-msgstr ""
+msgstr "Escriu i verifica els multi-índexs"
 
-#: command-list.h:129
-msgid "Creates a tag object"
+#: command-list.h:132
+#, fuzzy
+msgid "Creates a tag object with extra validation"
 msgstr "Crea un objecte etiqueta"
 
-#: command-list.h:130
+#: command-list.h:133
+#, fuzzy
 msgid "Build a tree-object from ls-tree formatted text"
-msgstr ""
+msgstr "Construeix un objecte en arbre a partir de text formatat amb ls-tree"
 
-#: command-list.h:131
+#: 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:132
+#: command-list.h:135
+#, fuzzy
 msgid "Find symbolic names for given revs"
-msgstr ""
+msgstr "Cerca noms simbòlics per a les revisions donades"
 
-#: command-list.h:133
+#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Afegeix o inspecciona notes de l'objecte"
 
-#: command-list.h:134
+#: command-list.h:137
 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:135
+#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Crea un arxiu empaquetat d'objectes"
 
-#: command-list.h:136
+#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Troba fitxers empaquetats redundants"
 
-#: command-list.h:137
+#: command-list.h:140
+#, fuzzy
 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:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr ""
-
-#: command-list.h:139
+#: command-list.h:141
 msgid "Compute unique ID for a patch"
-msgstr "Calcula un identificador única per a cada pedaç"
+msgstr "Calcula un identificador únic per a cada pedaç"
 
-#: command-list.h:140
+#: command-list.h:142
 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:141
+#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
-msgstr ""
+msgstr "Elimina els objectes extres que ja estan en fitxers empaquetats"
 
-#: command-list.h:142
+#: command-list.h:144
 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:143
+#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr ""
 "Actualitza les referències remotes juntament amb els objectes associats"
 
-#: command-list.h:144
+#: command-list.h:146
 #, fuzzy
 msgid "Applies a quilt patchset onto the current branch"
-msgstr "No hi ha cap font per defecte definida per a la branca actual."
+msgstr "Aplica un conjunt de pedaços cobert a la branca actual"
 
-#: command-list.h:145
+#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
+"Compara dos rangs de comissions (p. ex. dues versions d'una branca)"
 
-#: command-list.h:146
-#, fuzzy
+#: command-list.h:148
 msgid "Reads tree information into the index"
-msgstr "actualitza la informació d'estadístiques en el fitxer d'índex"
+msgstr "Llegeix la informació de l'arbre a l'índex"
 
-#: command-list.h:147
+#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Torna a aplicar les comissions sobre un altre punt de basament"
 
-#: command-list.h:148
-#, fuzzy
+#: command-list.h:150
 msgid "Receive what is pushed into the repository"
-msgstr "Registra els canvis al dipòsit"
+msgstr "Rep el que s'envia al repositori"
 
-#: command-list.h:149
-#, fuzzy
+#: command-list.h:151
 msgid "Manage reflog information"
-msgstr "mostra la informació de resolució de desfet"
+msgstr "Gestiona la informació del registre de referències"
 
-#: command-list.h:150
-#, fuzzy
+#: command-list.h:152
 msgid "Manage set of tracked repositories"
-msgstr "Registra els canvis al dipòsit"
+msgstr "Gestiona el conjunt de repositoris seguits"
 
-#: command-list.h:151
-#, fuzzy
+#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
-msgstr "--cached fora d'un dipòsit"
+msgstr "Empaqueta els objectes desempaquetats en un repositori"
 
-#: command-list.h:152
+#: command-list.h:154
 #, fuzzy
 msgid "Create, list, delete refs to replace objects"
-msgstr ""
-"Crea, llista, suprimeix o verifica un objecte d'etiqueta signat amb GPG"
+msgstr "Crea una llista suprimeix les referències per substituir els objectes"
 
-#: command-list.h:153
+#: command-list.h:155
 msgid "Generates a summary of pending changes"
-msgstr ""
+msgstr "Genera un resum dels canvis pendents"
 
-#: command-list.h:154
+#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
-msgstr ""
+msgstr "Reutilitza la resolució registrada dels conflictes de fusió"
 
-#: command-list.h:155
+#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Restableix la HEAD actual a l'estat especificat"
 
-#: command-list.h:156
+#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Restaura els fitxers de l'arbre de treball"
 
-#: command-list.h:157
+#: command-list.h:159
 msgid "Revert some existing commits"
 msgstr "Reverteix comissions existents"
 
-#: command-list.h:158
+#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Mostra les comissions en ordre topològic invers"
 
-#: command-list.h:159
+#: command-list.h:161
 msgid "Pick out and massage parameters"
-msgstr "Escolleix i personalitza els paràmetres"
+msgstr "Trieu i personalitzeu els paràmetres"
 
-#: command-list.h:160
+#: command-list.h:162
 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:161
+#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Envia una col·lecció de pedaços com a correus electrònics"
 
-#: command-list.h:162
+#: command-list.h:164
 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:163
+#: command-list.h:165
 msgid "Restricted login shell for Git-only SSH access"
-msgstr ""
+msgstr "Intèrpret d'ordres d'entrada restringit només per a accés SSH al Git"
 
-#: command-list.h:164
+#: command-list.h:166
 msgid "Summarize 'git log' output"
-msgstr ""
+msgstr "Resumeix la sortida «git log»"
 
-#: command-list.h:165
+#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "Mostra diversos tipus d'objectes"
 
-#: command-list.h:166
+#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "Mostra les branques i les seves comissions"
 
-#: command-list.h:167
+#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "Mostra l'índex d'arxius empaquetat"
 
-#: command-list.h:168
+#: command-list.h:170
 msgid "List references in a local repository"
-msgstr "Llista les referències en un dipòsit local"
+msgstr "Llista les referències en un repositori local"
 
-#: command-list.h:169
+#: command-list.h:171
 msgid "Git's i18n setup code for shell scripts"
 msgstr ""
+"Codi de configuració i18n del Git per als scripts de l'intèrpret d'ordres"
 
-#: command-list.h:170
+#: command-list.h:172
 msgid "Common Git shell script setup code"
 msgstr "Codi de scripts de configuració comuns pel Git shell"
 
-#: command-list.h:171
-#, fuzzy
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Inicialitza i modifica el «sparse-checkout»"
+
+#: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
-msgstr "%s: ja existeix en el directori de treball"
+msgstr "Fes «stash» dels canvis en un directori de treball brut"
 
-#: command-list.h:172
-#, fuzzy
+#: command-list.h:175
 msgid "Add file contents to the staging area"
-msgstr "Afegeix els continguts dels fitxers a l'índex"
+msgstr "Afegeix el contingut del fitxer a l'àrea de «staging»"
 
-#: command-list.h:173
+#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Mostra l'estat de l'arbre de treball"
 
-#: command-list.h:174
+#: command-list.h:177
 msgid "Remove unnecessary whitespace"
-msgstr "Suprimeix l'espai en blanc innecessari"
+msgstr "Elimina l'espai en blanc innecessari"
 
-#: command-list.h:175
+#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Inicialitza, actualitza o inspecciona submòduls"
 
-#: command-list.h:176
+#: command-list.h:179
 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:177
+#: command-list.h:180
 msgid "Switch branches"
-msgstr "Commuta branques"
+msgstr "Commuta entre branques"
 
-#: command-list.h:178
+#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Llegeix, modifica i suprimeix referències simbòliques"
 
-#: command-list.h:179
+#: command-list.h:182
 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:180
+#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crea un fitxer temporal amb els continguts dels blobs"
 
-#: command-list.h:181
+#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Desempaqueta objectes d'un arxiu empaquetat"
 
-#: command-list.h:182
+#: command-list.h:185
 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:183
+#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr ""
-"Actualitza el nom de l'objecte emmagatzema en una referència de forma segura"
+"Actualitza el nom de l'objecte emmagatzemat en una referència de forma segura"
 
-#: command-list.h:184
+#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
+"Actualitza el fitxer d'informació auxiliar per a ajudar als servidors ximples"
 
-#: command-list.h:185
+#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Envia l'arxiu de tornada al git-archive"
 
-#: command-list.h:186
+#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Envia els objectes empaquetats de tornada al git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Mostra una variable lògica del Git"
 
-#: command-list.h:188
+#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Verifica la signatura GPG de les comissions"
 
-#: command-list.h:189
+#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Valida els fitxers d'arxius Git empaquetats"
 
-#: command-list.h:190
+#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Verifica la signatura GPG de les etiquetes"
 
-#: command-list.h:191
+#: 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)"
+msgstr "Interfície web del Git (interfície web pels repositoris Git)"
 
-#: command-list.h:192
+#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr "Mostra registres amb la diferència introduïda per cada comissió"
 
-#: command-list.h:193
+#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "Gestiona múltiples arbres de treball"
 
-#: command-list.h:194
+#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "Crea un objecte arbre des de l'índex actual"
 
-#: command-list.h:195
+#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "La definició d'atributs per camí"
 
-#: command-list.h:196
+#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Interfície i convencions de la línia d'ordres del Git"
 
-#: command-list.h:197
+#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial bàsic del Git per a desenvolupadors"
 
-#: command-list.h:198
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Proporcionar noms d'usuari i contrasenyes a Git"
+
+#: command-list.h:202
 msgid "Git for CVS users"
 msgstr "Git per a usuaris del CVS"
 
-#: command-list.h:199
-#, fuzzy
+#: command-list.h:203
 msgid "Tweaking diff output"
-msgstr "omet la sortida de diferències"
+msgstr "Ajustament de la sortida de diferències"
 
-#: command-list.h:200
+#: command-list.h:204
 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:201
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Preguntes freqüents sobre l'ús del Git"
+
+#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "Un glossari de Git"
 
-#: command-list.h:202
+#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Lligams utilitzats pel Git"
 
-#: command-list.h:203
+#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
 
-#: command-list.h:204
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+
+#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "La definició de les propietats de submòduls"
 
-#: command-list.h:205
+#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Espais de noms del Git"
 
-#: command-list.h:206
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Programes d'ajuda per a interactuar amb repositoris remots"
+
+#: command-list.h:213
 msgid "Git Repository Layout"
-msgstr "Disposició del dipòsit del Git"
+msgstr "Disposició del repositori del Git"
 
-#: command-list.h:207
+#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "L'especificació de revisions i rangs per al Git"
 
-#: command-list.h:208
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "Muntant un repositori dins un altre"
+
+#: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial d'introducció al Git: segona part"
 
-#: command-list.h:209
+#: command-list.h:217
 msgid "A tutorial introduction to Git"
 msgstr "Un tutorial d'introducció al Git"
 
-#: command-list.h:210
+#: 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:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Cal començar per \"git bisect start\""
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Voleu que ho faci per vostè [Y/n]? "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Introducció de revisió errònia: $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Entrada de revisió errònia: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Introducció de revisió errònia: $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' pot acceptar només un paràmetre."
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "Cap fitxer de registre donat"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "no es pot llegir $file per a reproducció"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? de què parleu?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
 msgid "bisect run failed: no command provided."
-msgstr ""
+msgstr "ha fallat l'execució de bisect: no s'ha proporcionat cap ordre."
 
-#: git-bisect.sh:246
+#: git-bisect.sh:73
 #, sh-format
 msgid "running $command"
 msgstr "s'està executant $command"
 
-#: git-bisect.sh:253
+#: 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 >= 128"
+"el codi de sortida $res de «$command» és < 0 o bé >= 128"
 
-#: git-bisect.sh:279
+#: git-bisect.sh:105
 msgid "bisect run cannot continue any more"
 msgstr "el pas de bisecció no pot continuar més"
 
-#: git-bisect.sh:285
-#, sh-format
+#: git-bisect.sh:111
+#, fuzzy, sh-format
 msgid ""
 "bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'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"
+"«bisect_state $state» ha sortit amb el codi d'error $res"
 
-#: git-bisect.sh:292
+#: git-bisect.sh:118
 msgid "bisect run success"
 msgstr "pas de bisecció reeixit"
 
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "No estem bisecant."
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -22126,142 +25706,49 @@ msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 "La fusió simple no ha funcionat, s'està intentant una fusió automàtica."
 
-#: git-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "No es pot actualitzar $ref_stash amb $w_commit"
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr ""
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "opció desconeguda: $opt"
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "S'han especificat massa revisions: $REV"
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference no és una referència vàlida"
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' no és una comissió de tipus magatzem"
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' no és una referència de magatzem"
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr "no s'ha pogut actualitzar l'índex"
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "No es pot aplicar un magatzem enmig d'una fusió"
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr "No s'ha pogut desar l'arbre d'índex"
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»"
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr "No es pot fer «unstage» dels fitxers modificats"
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "${REV} ($s) descartada"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
-
-#: git-submodule.sh:200
+#: 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:210
+#: 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 ./|../"
+msgstr "URL de repositori: «$repo» ha de ser absolut o començar amb ./|../"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:208
 #, sh-format
 msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' ja existeix en l'índex"
+msgstr "«$sm_path» ja existeix en l'índex"
 
-#: git-submodule.sh:232
+#: 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:239
-#, fuzzy, sh-format
-msgid "'$sm_path' does not have a commit checked out"
-msgstr "el camí «%s» no té la seva versió"
+msgstr "«$sm_path» ja existeix en l'índex i no és submòdul"
 
-#: git-submodule.sh:245
+#: git-submodule.sh:218
 #, 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 ""
-"El camí següent s'ignora per un dels vostres fitxers .gitignore:\n"
-"$sm_path\n"
-"Useu -f si realment voleu afegir-lo."
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "«$sm_path» no té una comissió agafada"
 
-#: git-submodule.sh:268
+#: 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"
+msgstr "S'està afegint el repositori existent a «$sm_path» a l'índex"
 
-#: git-submodule.sh:270
+#: 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"
+msgstr "«$sm_path» ja existeix i no és un repositori de git vàlid"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:259
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
-"Es troba un directori de git per a '$sm_name' localment amb els remots:"
+"S'ha trobat un directori de git per a «$sm_name» localment amb els remots:"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:261
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22273,61 +25760,62 @@ msgid ""
 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 "
+"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'."
+"o no esteu segur de què vol dir això, trieu un altre nom amb l'opció «--"
+"name»."
 
-#: git-submodule.sh:286
+#: 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'."
+"S'està reactivant el directori de git local per al submòdul «$sm_name»."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:279
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
-msgstr "No s'ha pogut agafar el submòdul '$sm_path'"
+msgstr "No s'ha pogut agafar el submòdul «$sm_path»"
 
-#: git-submodule.sh:303
+#: 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'"
+msgstr "S'ha produït un error en afegir el submòdul «$sm_path»"
 
-#: git-submodule.sh:312
+#: 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'"
+msgstr "S'ha produït un error en registrar el submòdul «$sm_path»"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:568
 #, 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'"
+"No s'ha pogut trobar la revisió actual en el camí de submòdul «$displaypath»"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:578
 #, 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'"
+msgstr "No s'ha pogut obtenir en el camí de submòdul «$sm_path»"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:583
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 "No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
-"camí de submòdul '$sm_path'"
+"camí de submòdul «$sm_path»"
 
-#: git-submodule.sh:606
+#: 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:"
+msgstr ""
+"No s'ha pogut obtenir en el camí de submòdul «$displaypath»; s'està "
+"intentant obtenir directament $sha1:"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:607
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22336,102 +25824,81 @@ 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:619
+#: 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:620
+#: 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:624
+#: 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»"
+"No s'ha pogut fer «rebase» «$sha1» en el camí de submòdul «$displaypath»"
 
-#: git-submodule.sh:625
+#: 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:630
+#: 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:631
+#: 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:636
+#: 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:637
+#: git-submodule.sh:632
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Camí de submòdul «$displaypath»: «$command $sha1»"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:663
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
-"S'ha produït un error en recorre recursivament dins del camí de submòdul "
+"S'ha produït un error en recórrer recursivament dins del camí de submòdul "
 "«$displaypath»"
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr "L'opció --cached no es pot usar amb l'opció --files"
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "mode inesperat $mod_dst"
-
-#: git-submodule.sh:902
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr "  Avís: $display_name no conté la comissió $sha1_src"
-
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr "  Avís: $display_name no conté la comissió $sha1_dst"
-
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr "  Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Vegeu git-${cmd}(1) per detalls."
-
 #: git-rebase--preserve-merges.sh:109
-#, fuzzy
 msgid "Applied autostash."
-msgstr "S'ha aplicat el magatzem automàtic."
+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:207
-#, fuzzy
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -22453,19 +25920,28 @@ msgid ""
 msgstr ""
 "\n"
 "Ordres:\n"
-" p, pick = usa la comissió\n"
-" r, reword = usa la comissió, però edita el missatge de comissió\n"
-" e, edit = usa la comissió, però atura't per a esmenar\n"
-" s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n"
-" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta "
-"comissió\n"
-" x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret "
-"d'ordres\n"
-" d, drop = elimina la comissió\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:270
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -22484,83 +25960,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:295
+#: 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 escollir"
+msgstr "$sha1: no és una comissió que es pugui triar"
 
-#: git-rebase--preserve-merges.sh:334
+#: 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:364
+#: 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:415
+#: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Avanç ràpid a $sha1"
 
-#: git-rebase--preserve-merges.sh:417
+#: 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:426
+#: 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:431
+#: 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:449
+#: 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:458
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
-msgstr "No s'ha pogut escollir $sha1"
+msgstr "No s'ha pogut triar $sha1"
 
-#: git-rebase--preserve-merges.sh:467
+#: 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:472
+#: 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:483
+#: 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ó de $count comissió."
+msgstr[0] "Això és una combinació d'$count comissió."
 msgstr[1] "Això és una combinació de $count comissions."
 
-#: git-rebase--preserve-merges.sh:492
+#: 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:495
+#: 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:536 git-rebase--preserve-merges.sh:579
-#: git-rebase--preserve-merges.sh:582
+#: 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:611
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -22569,38 +26045,38 @@ msgid ""
 "before\n"
 "you are able to reword the commit."
 msgstr ""
-"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... "
+"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:626
+#: 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:641
+#: git-rebase--preserve-merges.sh:631
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
-msgstr "No es pot '$squash_style' sense una comissió prèvia"
+msgstr "No es pot fer «$squash_style» sense una comissió prèvia"
 
-#: git-rebase--preserve-merges.sh:683
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr "S'està executant: $rest"
 
-#: git-rebase--preserve-merges.sh:691
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "L'execució ha fallat: $rest"
 
-#: git-rebase--preserve-merges.sh:693
+#: 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:695
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -22611,7 +26087,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:708
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -22626,25 +26102,25 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:719
+#: 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:720
+#: 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:755
+#: 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:812
+#: 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:817
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -22675,13 +26151,13 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--preserve-merges.sh:834
+#: 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:839
+#: 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."
@@ -22689,40 +26165,44 @@ 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:844 git-rebase--preserve-merges.sh:848
+#: 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:879 git-rebase--preserve-merges.sh:965
+#: 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:900
+#: 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:907
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr "No hi ha cap HEAD?"
 
-#: git-rebase--preserve-merges.sh:908
+#: 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:911
+#: 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:943
+#: 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:997 git-rebase--preserve-merges.sh:1002
+#: 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"
 
@@ -22788,52 +26268,11 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "No s'ha pogut determinar el camí absolut del directori de git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "staged"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "unstaged"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "binari"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "res"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "sense canvis"
-
-#: git-add--interactive.perl:623
-#, 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"
-
-#: git-add--interactive.perl:626
-#, 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"
-
-#: git-add--interactive.perl:629
-#, 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"
-
 #: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
@@ -22841,28 +26280,7 @@ msgid_plural "touched %d paths\n"
 msgstr[0] "modificat %d camí\n"
 msgstr[1] "modificat %d camins\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Actualitza"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Reverteix"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "nota: %s està ara sense seguiment.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Afegeix sense seguiment"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Sense fitxers no seguits.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -22870,7 +26288,7 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «staging»."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -22878,7 +26296,7 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «stashing»."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -22886,8 +26304,8 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per «unstaging»."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: 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."
@@ -22895,8 +26313,8 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per aplicar-se."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: 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."
@@ -22904,17 +26322,12 @@ msgstr ""
 "Si el pedaç s'aplica correctament, el tros editat es marcarà immediatament\n"
 "per descartar-se."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "s'ha produït un error en escriure al fitxer d'edició del tros: %s"
 
-#: git-add--interactive.perl:1110
-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"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -22923,41 +26336,16 @@ msgid ""
 "Lines starting with %s will be removed.\n"
 msgstr ""
 "---\n"
-"Per suprimir «%s» línies, feu-les línies ' ' (context).\n"
-"Per suprimir «%s» línies, suprimiu-les.\n"
-"Les línies que comencin per %s seran suprimides.\n"
-
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-"Si no s'aplica correctament, tindreu una oportunitat per editar-lo\n"
-"de nou. Si totes les línies del tros se suprimeixen, llavors l'edició "
-"s'avorta\n"
-"i el tros es deixa sense cap canvi.\n"
+"Per a eliminar les línies «%s», convertiu-les en línies ' ' (context).\n"
+"Per a eliminar les línies «%s», suprimiu-les.\n"
+"Les línies que comencin per %s s'eliminaran.\n"
 
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "s'ha produït un error en llegir al fitxer d'edició del tros: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"El tros editat no s'aplica. Editeu-lo de nou (si responeu \"no\" es "
-"descartarà) [y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -22971,7 +26359,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:1252
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -22985,7 +26373,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:1258
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -22999,7 +26387,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:1264
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23013,7 +26401,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:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23027,7 +26415,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:1276
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23041,7 +26429,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:1282
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23055,8 +26443,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:1294
-#, fuzzy
+#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23064,13 +26451,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 - aplica aquest tros a l'índex i l'arbre de treball\n"
-"n - no apliquis aquest tros des de l'índex i de l'arbre de treball\n"
+"y - aplica aquest tros a l'arbre de treball\n"
+"n - no apliquis aquest tros a l'arbre de treball\n"
 "q - surt; no apliquis aquest tros ni cap dels pendents\n"
 "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:1309
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23092,232 +26479,90 @@ msgstr ""
 "e - edita manualment el tros actual\n"
 "? - mostra l'ajuda\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1345
 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:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "No s'ha aplicat res.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "s'està ignorant %s no fusionat\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Només s'han canviat els fitxers binaris.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Sense canvis.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Actualització del pedaç"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Canvia el mode de «stage» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Suprimeix «stage» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, 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,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Canvia el mode de «stash» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Suprimeix «stash» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, 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,?]? "
-
-#: git-add--interactive.perl:1436
+#: git-add--interactive.perl:1479
 #, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Canvia el mode de «unstage» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Suprimeix «Unstage» [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, 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,?]? "
-
-#: git-add--interactive.perl:1441
-#, 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,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Aplica l'esborrat a l'índex [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, 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,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descarta el canvi de mode des de l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descarta l'esborrat des de l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Descarta aquest tros des de l'arbre de treball  [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Descarta el canvi de mode des de l'índex i l'arbre de treball [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Descarta la supressió des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Descarta aquest tros des de l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
+msgid "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:1456
+#: git-add--interactive.perl:1480
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
+msgid "Apply 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:1457
+#: git-add--interactive.perl:1481
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
+msgid "Apply 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:1458
+#: git-add--interactive.perl:1482
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1466
-#, fuzzy, perl-format
-msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Aplica el canvi de mode a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1467
-#, fuzzy, perl-format
-msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplica la supressió a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1468
-#, fuzzy, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
-msgstr "Aplica aquest tros a l'índex i l'arbre de treball [y,n,q,a,d%s,?]? "
+msgstr "Aplica aquest tros a l'arbre de treball [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
 msgstr "No hi ha altres trossos on anar-hi\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "vés a quin tros (<ret> per veure'n més)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "vés a quin tros? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Número no vàlid: «%s»\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1622
 #, 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:1617
+#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
 msgstr "No hi ha cap altre tros a cercar\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "Cerca per expressió regular? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Expressió regular de cerca mal formada %s: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
 msgstr "No hi ha trossos que coincideixin amb el patró donat\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr "Sense tros previ\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr "No hi ha tros següent\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr "No es pot dividir aquest tros\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1736
 #, 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:1706
+#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "No es pot editar aquest tros\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Reviseu les diferències"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23336,19 +26581,19 @@ msgstr ""
 "add untracked - afegeix el contingut dels fitxers no seguits al conjunt de "
 "canvis «staged»\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: 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
 msgid "missing --"
 msgstr "manca --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "desconegut --patch mode: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument %s no vàlid, s'esperava --"
@@ -23361,66 +26606,85 @@ msgstr "la zona local difereix de GMT per un interval que no és de minuts\n"
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "el desplaçament de la zona local és més gran o igual a 24 hores\n"
 
-#: git-send-email.perl:223 git-send-email.perl:229
+#: git-send-email.perl:222
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr ""
+
+#: git-send-email.perl:235
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'editor no ha sortit correctament, avortant-ho tot"
 
-#: git-send-email.perl:310
+#: git-send-email.perl:321
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n"
 
-#: git-send-email.perl:315
+#: git-send-email.perl:326
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
-msgstr "'%s.final' conté el correu redactat.\n"
+msgstr "«%s.final» conté el correu redactat.\n"
 
-#: git-send-email.perl:408
+#: git-send-email.perl:419
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases és incompatible amb altres opcions\n"
 
-#: git-send-email.perl:481 git-send-email.perl:683
+#: git-send-email.perl:493
+#, fuzzy
+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ó."
+
+#: git-send-email.perl:498 git-send-email.perl:700
 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:484
+#: git-send-email.perl:501
+#, fuzzy
 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ó)"
 
-#: git-send-email.perl:497
+#: git-send-email.perl:514
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Camp --suppress-cc desconegut: «%s»\n"
 
-#: git-send-email.perl:528
+#: git-send-email.perl:545
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
-msgstr "--confirm setting desconegut: «%s»\n"
+msgstr "Paràmetre --confirm desconegut: «%s»\n"
 
-#: git-send-email.perl:556
+#: git-send-email.perl:573
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
-msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n"
+msgstr "avís: no s'admet l'àlies de sendmail amb cometes: %s\n"
 
-#: git-send-email.perl:558
+#: git-send-email.perl:575
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
-msgstr "avís: `:include:` no està suportat: %s\n"
+msgstr "avís: «:include:» no s'admet: %s\n"
 
-#: git-send-email.perl:560
+#: git-send-email.perl:577
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
-msgstr "avís: les redireccions `/file` or `|pipe no són admeses: %s\n"
+msgstr "avís: les redireccions «/file» ni «|pipe» no s'admeten: %s\n"
 
-#: git-send-email.perl:565
+#: git-send-email.perl:582
 #, 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:649
+#: git-send-email.perl:666
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -23429,27 +26693,18 @@ msgid ""
 "    * Saying \"./%s\" if you mean a file; or\n"
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
-"El fitxer «%s» existeix però també pot ser un rang de comissions\n"
-"per produir pedaços. Desambigüeu...\n"
+"El fitxer «%s» existeix, però també pot ser un rang de comissions\n"
+"per produir pedaços. Desambigüeu-ho...\n"
 "\n"
-"    * Dient \"./%s\" si volíeu especificar aquest fitxer; o\n"
-"    * Proporcionant l'opció --format-patch si volíeu especificar un rang.\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:670
+#: git-send-email.perl:687
 #, 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:694
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"fatal: %s: %s\n"
-"avís: no s'han enviat pedaços\n"
-
-#: git-send-email.perl:705
+#: git-send-email.perl:720
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -23459,17 +26714,17 @@ msgstr ""
 "No s'han especificat fitxers de pedaç\n"
 "\n"
 
-#: git-send-email.perl:718
+#: git-send-email.perl:733
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Sense assumpte a %s?"
 
-#: git-send-email.perl:728
+#: git-send-email.perl:743
 #, 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:739
+#: git-send-email.perl:754
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -23477,33 +26732,33 @@ msgid ""
 "\n"
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
-"Se suprimiran les línies que comencen amb \"GIT:\".\n"
+"S'eliminaran les línies que comencen amb «GIT:».\n"
 "Considereu incloure un diffstat global o una taula de continguts\n"
-"per cada pedaç que esteu escrivint.\n"
+"per al pedaç que esteu escrivint.\n"
 "\n"
-"Netegeu el contingut del cos si no voleu enviar un resum.\n"
+"Esborreu el contingut del cos si no voleu enviar cap resum.\n"
 
-#: git-send-email.perl:763
+#: git-send-email.perl:778
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "S'ha produït un error en obrir %s: %s"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:795
 #, 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:823
+#: git-send-email.perl:838
 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:858
+#: git-send-email.perl:873
 #, 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:913
+#: git-send-email.perl:928
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -23511,11 +26766,11 @@ msgstr ""
 "Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:918
+#: git-send-email.perl:933
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
 
-#: git-send-email.perl:926
+#: git-send-email.perl:941
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -23525,26 +26780,26 @@ msgid ""
 msgstr ""
 "S'ha refusat a enviar perquè el pedaç\n"
 "\t%s\n"
-"perquè la plantilla té l'assumpte '*** SUBJECT HERE ***'. Passeu --force si "
-"realment voleu enviar-lo.\n"
+"perquè la plantilla té l'assumpte «*** SUBJECT HERE ***». Passeu --force si "
+"realment voleu enviar-ho.\n"
 
-#: git-send-email.perl:945
+#: git-send-email.perl:960
 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:963
+#: git-send-email.perl:978
 #, 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:975
+#: git-send-email.perl:990
 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:1033 git-send-email.perl:1041
+#: git-send-email.perl:1048 git-send-email.perl:1056
 #, 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"
@@ -23552,16 +26807,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:1045
+#: git-send-email.perl:1060
 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:1362
+#: git-send-email.perl:1377
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "el camí CA «%s» no existeix"
 
-#: git-send-email.perl:1445
+#: git-send-email.perl:1460
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -23580,290 +26835,155 @@ msgstr ""
 "    Aquest comportament està controlat pel paràmetre de configuració\n"
 "    sendemail.confirm.\n"
 "\n"
-"    Per a informació addicional, executeu 'git send-email --help'.\n"
+"    Per a informació addicional, executeu «git send-email --help».\n"
 "    Per mantenir el comportament actual, però silenciar aquest\n"
-"    missatge, executeu 'git config --global sendemail.confirm auto'.\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:1460
+#: git-send-email.perl:1475
 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:1463
+#: git-send-email.perl:1478
 msgid "Send this email reply required"
 msgstr "Requereix resposta en enviar el correu"
 
-#: git-send-email.perl:1491
+#: git-send-email.perl:1506
 msgid "The required SMTP server is not properly defined."
 msgstr "El servidor SMTP requerit no està correctament definit."
 
-#: git-send-email.perl:1538
+#: git-send-email.perl:1553
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "El servidor no admet STARTTLS! %s"
 
-#: git-send-email.perl:1543 git-send-email.perl:1547
+#: git-send-email.perl:1558 git-send-email.perl:1562
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS ha fallat! %s"
 
-#: git-send-email.perl:1556
+#: git-send-email.perl:1571
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
 "useu --smtp-debug."
 
-#: git-send-email.perl:1574
+#: git-send-email.perl:1589
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "S'ha produït un error en enviar %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1592
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Simulació d'enviament %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1592
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviat %s\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1594
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulació de correcte. El registre diu:\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1594
 msgid "OK. Log says:\n"
 msgstr "Correcte. El registre diu: \n"
 
-#: git-send-email.perl:1591
+#: git-send-email.perl:1606
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1609
 msgid "Result: OK\n"
 msgstr "Resultat: correcte\n"
 
-#: git-send-email.perl:1612
+#: git-send-email.perl:1627
 #, perl-format
 msgid "can't open file %s"
 msgstr "no es pot obrir el fitxer %s"
 
-#: git-send-email.perl:1659 git-send-email.perl:1679
+#: git-send-email.perl:1674 git-send-email.perl:1694
 #, 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:1665
+#: git-send-email.perl:1680
 #, 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:1718
+#: git-send-email.perl:1737
 #, 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:1753
+#: git-send-email.perl:1772
 #, 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:1864
+#: git-send-email.perl:1883
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no s'ha pogut executar «%s»"
 
-#: git-send-email.perl:1871
+#: git-send-email.perl:1890
 #, 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:1875
+#: git-send-email.perl:1894
 #, 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:1905
+#: git-send-email.perl:1924
 msgid "cannot send message as 7bit"
 msgstr "no es pot enviar el missatge en 7 bits"
 
-#: git-send-email.perl:1913
+#: git-send-email.perl:1932
 msgid "invalid transfer encoding"
 msgstr "codificació de transferència no vàlida"
 
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: git-send-email.perl:1966
+#, fuzzy, 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"
+
+#: git-send-email.perl:1976 git-send-email.perl:2029 git-send-email.perl:2039
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "no s'ha pogut obrir %s: %s\n"
 
-#: git-send-email.perl:1957
-#, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s: el pedaç conté una línia més gran de 998 caràcters"
+#: git-send-email.perl:1979
+#, fuzzy, 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"
 
-#: git-send-email.perl:1974
+#: git-send-email.perl:1997
 #, 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:1978
+#: git-send-email.perl:2001
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Esteu segur que voleu enviar %s? [y|N]: "
 
-#, fuzzy
-#~ msgid "hash version %X does not match version %X"
-#~ msgstr "el camí «%s» no té la seva versió"
-
-#~ msgid "option '%s' requires a value"
-#~ msgstr "l'opció «%s» requereix un valor"
-
-#~ msgid "Server supports multi_ack_detailed"
-#~ msgstr "El servidor accepta multi_ack_detailed"
-
-#~ msgid "Server supports no-done"
-#~ msgstr "El servidor accepta no-done"
-
-#~ msgid "Server supports multi_ack"
-#~ msgstr "El servidor accepta multi_ack"
-
-#~ msgid "Server supports side-band-64k"
-#~ msgstr "El servidor accepta side-band-64k"
-
-#~ msgid "Server supports side-band"
-#~ msgstr "El servidor accepta banda lateral"
-
-#~ msgid "Server supports allow-tip-sha1-in-want"
-#~ msgstr "El servidor accepta allow-tip-sha1-in-want"
-
-#~ msgid "Server supports allow-reachable-sha1-in-want"
-#~ msgstr "El servidor accepta allow-reachable-sha1-in-want"
-
-#~ msgid "Server supports ofs-delta"
-#~ msgstr "El servidor accepta ofs-delta"
-
-#~ msgid "(HEAD detached at %s)"
-#~ msgstr "(HEAD separat a %s)"
-
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD separat de %s)"
-
-#~ msgid "could not transform the todo list"
-#~ msgstr "no s'ha pogut transformar la llista per a fer"
-
-#~ msgid "Checking out files"
-#~ msgstr "S'estan agafant fitxers"
-
-#~ msgid "cannot be interactive without stdin connected to a terminal."
-#~ msgstr ""
-#~ "no es pot ser interactiu sense que stdin estigui connectada a un terminal."
-
-#~ msgid "failed to stat %s\n"
-#~ msgstr "s'ha produït un error en fer stat a '%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 ""
-#~ "Si voleu ometre aquesta comissió, useu:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "Llavors \"git cherry-pick --continue\" reprendrà\n"
-#~ "com a «cherry pick» les comissions restants.\n"
-
-#~ msgid "default"
-#~ msgstr "per defecte"
-
-#~ msgid "Could not create directory '%s'"
-#~ msgstr "No s'ha pogut crear el directori «%s»"
-
-#~ msgid "unrecognized verb: %s"
-#~ msgstr "paràmetre no reconegut: %s"
-
-#~ msgid "could not open %s"
-#~ msgstr "no s'ha pogut obrir «%s»"
-
-#~ msgid "Could not move back to $head_name"
-#~ msgstr "No s'ha pogut tornar 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 ""
-#~ "Sembla que ja hi ha un directori $state_dir_base, i\n"
-#~ "em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n"
-#~ "cas, proveu\n"
-#~ "\t$cmd_live_rebase\n"
-#~ "Si no és el cas, \n"
-#~ "\t$cmd_clear_stale_rebase\n"
-#~ "i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
-#~ "de valor."
-
-#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
-#~ msgstr "fatal: no es pot combinar «--signoff» amb «--preserve-merges»"
-
-#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr "fatal: no es pot combinar «--preserve-merges» amb «--rebase-merges»"
-
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy-option»"
-
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
-#~ msgstr "fatal: no es pot combinar «--rebase-merges» amb «--strategy»"
-
-#, fuzzy
-#~ msgid "invalid upstream '$upstream_name'"
-#~ msgstr "font no vàlida $upstream_name"
-
-#~ msgid "$onto_name: there are more than one merge bases"
-#~ msgstr "$onto_name: ja hi ha més d'una base de fusió"
-
-#~ msgid "$onto_name: there is no merge base"
-#~ msgstr "$onto_name: no hi ha cap base de fusió"
-
-#~ msgid "Does not point to a valid commit: $onto_name"
-#~ msgstr "No assenyala una comissió vàlida: $onto_name"
-
-#, fuzzy
-#~ msgid "fatal: no such branch/commit '$branch_name'"
-#~ msgstr "fatal: no hi ha tal branca: $branch_name"
-
-#~ msgid "Created autostash: $stash_abbrev"
-#~ msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-
-#~ msgid "Current branch $branch_name is up to date."
-#~ msgstr "La branca actual $branch_name està al dia."
-
-#~ msgid "Current branch $branch_name is up to date, rebase forced."
-#~ msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
-
-#~ msgid "Changes to $onto:"
-#~ msgstr "Canvis a $onto:"
-
-#~ msgid "Changes from $mb to $onto:"
-#~ msgstr "Canvis de $mb a $onto:"
-
-#~ msgid "Fast-forwarded $branch_name to $onto_name."
-#~ msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
 
-#~ msgid "First, rewinding head to replay your work on top of it..."
-#~ msgstr ""
-#~ "Primer, s'està rebobinant HEAD per a reproduir el vostre treball al "
-#~ "damunt..."
diff --git a/po/de.po b/po/de.po
index 066326a687..cad96a005e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1,15 +1,15 @@
 # German translations for Git.
 # Copyright (C) 2019 Matthias Rüster <matthias.ruester@gmail.com>
 # This file is distributed under the same license as the Git package.
-# Matthias Rüster <matthias.ruester@gmail.com>, 2019.
+# Matthias Rüster <matthias.ruester@gmail.com>, 2019-2020.
 # Ralf Thielow <ralf.thielow@gmail.com>, 2010-2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-10-28 13:19+0800\n"
-"PO-Revision-Date: 2016-11-28 18:10+0100\n"
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"PO-Revision-Date: 2021-05-23 18:32+0200\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,44 +17,797 @@ 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"
 
-#: advice.c:109
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Wie bitte (%s)?"
+
+#: 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 "Index konnte nicht gelesen werden"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "Binär"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "Nichts"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "unverändert"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr "Konnte '%s' nicht zum Commit vormerken."
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+msgid "could not write index"
+msgstr "konnte Index nicht schreiben"
+
+#: add-interactive.c:706 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
+#, 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
+#, 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
+msgid "Revert"
+msgstr "Revert"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "Konnte HEAD^{tree} nicht parsen."
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Keine unversionierten Dateien.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Unversionierte Dateien hinzufügen"
+
+#: add-interactive.c:895 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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "Ignoriere nicht zusammengeführte Datei: %s"
+
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Nur Binärdateien geändert.\n"
+
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "Keine Änderungen.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Patch Aktualisierung"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Diff überprüfen"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "Zeige Pfade mit Änderungen"
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr "Zustand des Arbeitsverzeichnisses zum Commit vormerken"
+
+#: add-interactive.c:1014
+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
+msgid "pick hunks and update selectively"
+msgstr "Blöcke und Änderung gezielt auswählen"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "Differenz zwischen HEAD und Index ansehen"
+
+#: add-interactive.c:1020
+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
+msgid "Prompt help:"
+msgstr "Hilfe für Eingaben:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "Ein einzelnes Element auswählen"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "Eine Reihe von Elementen auswählen"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "Mehrere Reihen auswählen"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "Element basierend auf eindeutigen Präfix auswählen"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "Angegebene Elemente abwählen"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "Alle Elemente auswählen"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(leer) Auswählen beenden"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "Ein nummeriertes Element auswählen"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(leer) nichts auswählen"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Befehle ***"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Was nun"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "zur Staging-Area hinzugefügt"
+
+#: add-interactive.c:1144 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: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 "Pfad"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "Index konnte nicht aktualisiert werden"
+
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "Tschüss.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:39
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block direkt für die Staging-Area markiert."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block zum Commit vormerken\n"
+"n - diesen Patch-Block nicht zum Commit vormerken\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht zum Commit "
+"vormerken\n"
+"a - diesen und alle weiteren Patch-Blöcke dieser Datei zum Commit vormerken\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:61
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block direkt zum Stashen markiert."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block stashen\n"
+"n - diesen Patch-Block nicht stashen\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht stashen\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:85
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block direkt zum Entfernen aus der Staging-Area markiert."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block aus Staging-Area entfernen\n"
+"n - diesen Patch-Block nicht aus Staging-Area entfernen\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht aus Staging-"
+"Area entfernen\n"
+"a - diesen und alle weiteren Patch-Blöcke dieser Datei aus Staging-Area "
+"entfernen\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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 ""
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block direkt zum Anwenden markiert."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block auf den Index anwenden\n"
+"n - diesen Patch-Block nicht auf den Index anwenden\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht auf den Index "
+"anwenden\n"
+"a - diesen und alle weiteren Patch-Blöcke dieser Datei auf den Index "
+"anwenden\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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 ""
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
+"Block direkt zum Verwerfen markiert."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block im Arbeitsverzeichnis verwerfen\n"
+"n - diesen Patch-Block im Arbeitsverzeichnis nicht verwerfen\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht im "
+"Arbeitsverzeichnis verwerfen\n"
+"a - diesen und alle weiteren Patch-Blöcke dieser Datei im Arbeitsverzeichnis "
+"verwerfen\n"
+"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
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d"
+"%s,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block im Index und Arbeitsverzeichnis verwerfen\n"
+"n - diesen Patch-Block nicht im Index und Arbeitsverzeichnis verwerfen\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht verwerfen\n"
+"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
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d"
+"%s,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block im Index und auf das Arbeitsverzeichnis anwenden\n"
+"n - diesen Patch-Block nicht im Index und auf das Arbeitsverzeichnis "
+"anwenden\n"
+"q - Beenden; diesen oder alle verbleibenden Patch-Blöcke nicht anwenden\n"
+"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\n"
+
+#: add-patch.c:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - diesen Patch-Block auf das Arbeitsverzeichnis anwenden\n"
+"n - diesen Patch-Block nicht auf das Arbeitsverzeichnis anwenden\n"
+"q - Beenden; diesen und alle verbleibenden Patch-Blöcke nicht anwenden\n"
+"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:343
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "Konnte Block-Header '%.*s' nicht parsen."
+
+#: 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:420
+msgid "could not parse diff"
+msgstr "Konnte Differenz nicht parsen."
+
+#: add-patch.c:439
+msgid "could not parse colored diff"
+msgstr "Konnte farbige Differenz nicht parsen."
+
+#: add-patch.c:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr "'%s' konnte nicht ausgeführt werden"
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "nicht übereinstimmende Ausgabe von interactive.diffFilter"
+
+#: add-patch.c:613
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Der Filter muss eine Eins-zu-Eins-Beziehung\n"
+"zwischen den Ein- und Ausgabe-Zeilen einhalten."
+
+#: add-patch.c:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"Erwartete Kontextzeile #%d in\n"
+"%.*s"
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"Patch-Blöcke überlappen sich nicht:\n"
+"%.*s\n"
+"\tendet nicht mit:\n"
+"%.*s"
+
+#: 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:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Um '%c' Zeilen zu entfernen, machen Sie aus diesen ' ' Zeilen (Kontext).\n"
+"Um '%c' Zeilen zu entfernen, löschen Sie diese.\n"
+"Zeilen, die mit %c beginnen, werden entfernt.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: 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 ""
+"Wenn das nicht sauber angewendet werden kann, haben Sie die Möglichkeit\n"
+"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt "
+"werden,\n"
+"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
+
+#: add-patch.c:1133
+msgid "could not parse hunk header"
+msgstr "Konnte Block-Header nicht parsen."
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' schlug fehl."
+
+#. 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.
+#.
+#. 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:1247 git-add--interactive.perl:1242
+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: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:1291 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
+
+#: add-patch.c:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Nichts angewendet.\n"
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - diesen Patch-Block unbestimmt lassen, nächsten unbestimmten Patch-Block "
+"anzeigen\n"
+"J - diesen Patch-Block unbestimmt lassen, nächsten Patch-Block anzeigen\n"
+"k - diesen Patch-Block unbestimmt lassen, vorherigen unbestimmten Patch-"
+"Block anzeigen\n"
+"K - diesen Patch-Block unbestimmt lassen, vorherigen Patch-Block anzeigen\n"
+"g - Patch-Block zum Hinspringen auswählen\n"
+"/ - nach Patch-Block suchen, der gegebenem regulärem Ausdruck entspricht\n"
+"s - aktuellen Patch-Block in kleinere Patch-Blöcke aufteilen\n"
+"e - aktuellen Patch-Block manuell editieren\n"
+"? - Hilfe anzeigen\n"
+
+#: add-patch.c:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr "Kein vorheriger Patch-Block"
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr "Kein folgender Patch-Block"
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr "Keine anderen Patch-Blöcke verbleibend"
+
+#: add-patch.c:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "zu welchem Patch-Block springen? "
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Ungültige Nummer: '%s'"
+
+#: 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:1575
+msgid "No other hunks to search"
+msgstr "Keine anderen Patch-Blöcke zum Durchsuchen"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "Suche nach regulärem Ausdruck? "
+
+#: 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:1613
+msgid "No hunk matches the given pattern"
+msgstr "Kein Patch-Block entspricht dem angegebenen Muster"
+
+#: add-patch.c:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen"
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr "In %d Patch-Block aufgeteilt."
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten"
+
+#: add-patch.c:1680
+msgid "'git apply' failed"
+msgstr "'git apply' schlug fehl"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Deaktivieren Sie diese Nachricht mit \"git config advice.%s false\""
+
+#: advice.c:161
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sHinweis: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:252
 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:164
+#: advice.c:254
 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:166
+#: advice.c:256
 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:168
+#: advice.c:258
 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:170
+#: advice.c:260
 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:172
+#: advice.c:262
 #, 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:180
+#: 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."
@@ -63,23 +816,40 @@ msgstr ""
 "dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
 "und zu committen."
 
-#: advice.c:188
+#: advice.c:278
 msgid "Exiting because of an unresolved conflict."
 msgstr "Beende wegen unaufgelöstem Konflikt."
 
-#: advice.c:193 builtin/merge.c:1332
+#: advice.c:283 builtin/merge.c:1375
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
 
-#: advice.c:195
+#: advice.c:285
 msgid "Please, commit your changes before merging."
 msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
 
-#: advice.c:196
+#: advice.c:286
 msgid "Exiting because of unfinished merge."
 msgstr "Beende wegen nicht abgeschlossenem Merge."
 
-#: advice.c:202
+#: 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 ""
+"Die folgenden Pfadspezifikationen entsprachen keinem geeigneten Pfad, aber\n"
+"entsprechen Index-Einträgen außerhalb des aktuellen partiellen Checkouts:\n"
+
+#: advice.c:303
+msgid ""
+"Disable or modify the sparsity rules if you intend to update such entries."
+msgstr ""
+"Deaktivieren oder verändern Sie die Regeln für partielle Checkouts, wenn Sie "
+"solche Einträge aktualisieren möchten."
+
+#: advice.c:310
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -130,89 +900,82 @@ msgstr "Befehlszeile endet mit \\"
 msgid "unclosed quote"
 msgstr "Nicht geschlossene Anführungszeichen."
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "Nicht erkannte Whitespace-Option: '%s'"
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
 
-#: apply.c:135
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject und --3way können nicht gemeinsam verwendet werden."
 
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached und --3way können nicht gemeinsam verwendet werden."
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
-msgstr ""
-"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
+msgstr "--3way kann nicht außerhalb eines Repositories verwendet werden"
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
-msgstr ""
-"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
+msgstr "--index kann nicht außerhalb eines Repositories verwendet werden"
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
-msgstr ""
-"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
+msgstr "--cached kann nicht außerhalb eines Repositories verwendet werden"
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
-msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
+msgstr "konnte keinen Dateinamen in Zeile %d des Patches finden"
 
-#: 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: ungültiges 'git-diff' - erwartete /dev/null, erhielt %s in Zeile "
 "%d"
 
-#: apply.c:928
+#: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - Inkonsistenter neuer Dateiname in Zeile %d"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 "git apply: ungültiges 'git-diff' - Inkonsistenter alter Dateiname in Zeile %d"
 
-#: apply.c:934
+#: apply.c:933
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: ungültiges 'git-diff' - erwartete /dev/null in Zeile %d"
 
-#: apply.c:963
+#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "Ungültiger Modus in Zeile %d: %s"
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "Inkonsistente Kopfzeilen %d und %d."
 
-#: apply.c:1372
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -227,82 +990,82 @@ msgstr[1] ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
 "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
 
-#: apply.c:1385
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen (Zeile "
 "%d)"
 
-#: apply.c:1481
+#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: unerwartete Zeile: %.*s"
 
-#: apply.c:1550
+#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
 
-#: apply.c:1753
+#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "neue Datei hängt von alten Inhalten ab"
 
-#: apply.c:1755
+#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "entfernte Datei hat noch Inhalte"
 
-#: apply.c:1789
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "fehlerhafter Patch bei Zeile %d"
 
-#: apply.c:1826
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "neue Datei %s hängt von alten Inhalten ab"
 
-#: apply.c:1828
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "entfernte Datei %s hat noch Inhalte"
 
-#: apply.c:1831
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
 
-#: apply.c:1978
+#: apply.c:1977
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
 
-#: apply.c:2015
+#: apply.c:2014
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "nicht erkannter Binär-Patch bei Zeile %d"
 
-#: apply.c:2177
+#: apply.c:2176
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
 
-#: apply.c:2263
+#: apply.c:2262
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: apply.c:2267
+#: apply.c:2266
 #, c-format
 msgid "unable to open or read %s"
 msgstr "konnte %s nicht öffnen oder lesen"
 
-#: apply.c:2926
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "Ungültiger Zeilenanfang: '%c'"
 
-#: apply.c:3047
+#: apply.c:3056
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -310,12 +1073,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:3059
+#: apply.c:3068
 #, 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:3065
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -324,25 +1087,25 @@ msgstr ""
 "bei der Suche nach:\n"
 "%.*s"
 
-#: apply.c:3087
+#: apply.c:3096
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "keine Daten in Binär-Patch für '%s'"
 
-#: apply.c:3095
+#: apply.c:3104
 #, 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:3142
+#: apply.c:3151
 #, 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:3152
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -350,444 +1113,480 @@ msgstr ""
 "der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
 "entspricht"
 
-#: apply.c:3160
+#: apply.c:3170
 #, 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:3178
+#: apply.c:3188
 #, 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:3191
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
 
-#: apply.c:3197
+#: apply.c:3208
 #, 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:3218
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
 
-#: apply.c:3341
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kann %s nicht auschecken"
 
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
+#: 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 "Fehler beim Lesen von %s"
 
-#: apply.c:3401
+#: apply.c:3412
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:3430 apply.c:3673
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "Pfad %s wurde umbenannt/gelöscht"
 
-#: apply.c:3516 apply.c:3688
+#: apply.c:3527 apply.c:3702
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s ist nicht im Index"
 
-#: apply.c:3525 apply.c:3696
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s entspricht nicht der Version im Index"
 
-#: apply.c:3560
-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 ""
-"Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n"
-"zurückzufallen."
+"Dem Repository fehlt der notwendige Blob, um einen 3-Wege-Merge "
+"durchzuführen."
 
-#: apply.c:3563
+#: apply.c:3574
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "Falle zurück auf 3-Wege-Merge ...\n"
+msgid "Performing three-way merge...\n"
+msgstr "Führe 3-Wege-Merge durch...\n"
 
-#: apply.c:3579 apply.c:3583
+#: apply.c:3590 apply.c:3594
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
 
-#: apply.c:3595
+#: apply.c:3606
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "Fehler beim Durchführen des 3-Wege-Merges...\n"
 
-#: apply.c:3609
+#: apply.c:3620
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
 
-#: apply.c:3614
+#: apply.c:3625
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch auf '%s' sauber angewendet.\n"
 
-#: apply.c:3640
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Ausweichen auf direkte Anwendung...\n"
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr "Lösch-Patch hinterlässt Dateiinhalte"
 
-#: apply.c:3713
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: falscher Typ"
 
-#: apply.c:3715
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ist vom Typ %o, erwartete %o"
 
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: 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 "Ungültiger Pfad '%s'"
 
-#: apply.c:3924
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s ist bereits bereitgestellt"
 
-#: apply.c:3927
+#: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s existiert bereits im Arbeitsverzeichnis"
 
-#: apply.c:3947
+#: apply.c:3976
 #, 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:3952
+#: apply.c:3981
 #, 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:3972
+#: apply.c:4001
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
 
-#: apply.c:3976
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: Patch konnte nicht angewendet werden"
 
-#: apply.c:3991
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Prüfe Patch %s ..."
 
-#: apply.c:4083
+#: apply.c:4112
 #, 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:4090
+#: apply.c:4119
 #, 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:4093
+#: apply.c:4122
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
 
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
-
-#: apply.c:4102
+#: apply.c:4131
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "konnte %s nicht zum temporären Index hinzufügen"
 
-#: apply.c:4112
+#: apply.c:4141
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "konnte temporären Index nicht nach %s schreiben"
 
-#: apply.c:4250
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "konnte %s nicht aus dem Index entfernen"
 
-#: apply.c:4284
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "fehlerhafter Patch für Submodul %s"
 
-#: apply.c:4290
+#: apply.c:4319
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "konnte neu erstellte Datei '%s' nicht lesen"
 
-#: apply.c:4298
+#: apply.c:4327
 #, 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:4304 apply.c:4449
+#: apply.c:4333 apply.c:4478
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
 
-#: apply.c:4347
+#: apply.c:4376 builtin/bisect--helper.c:525
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "Fehler beim Schreiben nach '%s'"
 
-#: apply.c:4351
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
 msgstr "schließe Datei '%s'"
 
-#: apply.c:4421
+#: apply.c:4450
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
 
-#: apply.c:4519
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s sauber angewendet"
 
-#: apply.c:4527
+#: apply.c:4556
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: apply.c:4530
+#: apply.c:4559
 #, 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:4541
+#: apply.c:4570
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
 
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
 msgstr "kann '%s' nicht öffnen"
 
-#: apply.c:4563
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Patch-Bereich #%d sauber angewendet."
 
-#: apply.c:4567
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Patch-Block #%d zurückgewiesen."
 
-#: apply.c:4686
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ausgelassen."
 
-#: apply.c:4694
+#: apply.c:4733
 msgid "unrecognized input"
 msgstr "nicht erkannte Eingabe"
 
-#: apply.c:4714
+#: apply.c:4753
 msgid "unable to read index file"
 msgstr "Konnte Index-Datei nicht lesen"
 
-#: apply.c:4871
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kann Patch '%s' nicht öffnen: %s"
 
-#: apply.c:4898
+#: apply.c:4937
 #, 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:4904 apply.c:4919
+#: apply.c:4943 apply.c:4958
 #, 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:4912
+#: 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 Zeile nach Behebung von Whitespace-Fehlern angewendet."
 msgstr[1] "%d Zeilen nach Behebung von Whitespace-Fehlern angewendet."
 
-#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
 msgid "Unable to write new index file"
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "Pfad"
-
-#: apply.c:4956
+#: apply.c:4995
 msgid "don't apply changes matching the given path"
 msgstr "keine Änderungen im angegebenen Pfad anwenden"
 
-#: apply.c:4959
+#: apply.c:4998
 msgid "apply changes matching the given path"
 msgstr "Änderungen nur im angegebenen Pfad anwenden"
 
-#: apply.c:4961 builtin/am.c:2206
+#: apply.c:5000 builtin/am.c:2318
 msgid "num"
 msgstr "Anzahl"
 
-#: apply.c:4962
+#: apply.c:5001
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 "<Anzahl> vorangestellte Schrägstriche von herkömmlichen Differenzpfaden "
 "entfernen"
 
-#: apply.c:4965
+#: apply.c:5004
 msgid "ignore additions made by the patch"
 msgstr "hinzugefügte Zeilen des Patches ignorieren"
 
-#: apply.c:4967
+#: apply.c:5006
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
-"anstatt der Anwendung des Patches, den \"diffstat\" für die Eingabe "
-"ausgegeben"
+"statt den Patch anzuwenden, den \"diffstat\" für die Eingabe ausgegeben"
 
-#: apply.c:4971
+#: apply.c:5010
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation anzeigen"
 
-#: apply.c:4973
+#: apply.c:5012
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
-"anstatt der Anwendung des Patches, eine Zusammenfassung für die Eingabe "
-"ausgeben"
+"statt den Patch anzuwenden, eine Zusammenfassung für die Eingabe ausgeben"
 
-#: apply.c:4975
+#: apply.c:5014
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
-"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann"
+"statt den Patch anzuwenden, anzeigen ob der Patch angewendet werden kann"
 
-#: apply.c:4977
+#: apply.c:5016
 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:4979
+#: apply.c:5018
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "neue Dateien mit `git add --intent-to-add` markieren"
 
-#: apply.c:4981
+#: apply.c:5020
 msgid "apply a patch without touching the working tree"
 msgstr "Patch anwenden, ohne Änderungen im Arbeitsverzeichnis vorzunehmen"
 
-#: apply.c:4983
+#: apply.c:5022
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 "Patch anwenden, der Änderungen außerhalb des Arbeitsverzeichnisses vornimmt"
 
-#: apply.c:4986
+#: apply.c:5025
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "Patch anwenden (Benutzung mit --stat/--summary/--check)"
 
-#: apply.c:4988
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "versuche 3-Wege-Merge, wenn der Patch nicht angewendet werden konnte"
+#: apply.c:5027
+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:4990
+#: apply.c:5029
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "einen temporären Index, basierend auf den integrierten Index-Informationen, "
 "erstellen"
 
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
 msgid "paths are separated with NUL character"
 msgstr "Pfade sind getrennt durch NUL Zeichen"
 
-#: apply.c:4995
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 "sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
 
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
+#: 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 "Aktion"
 
-#: apply.c:4997
+#: apply.c:5036
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "neue oder geänderte Zeilen, die Whitespace-Fehler haben, ermitteln"
 
-#: apply.c:5000 apply.c:5003
+#: apply.c:5039 apply.c:5042
 msgid "ignore changes in whitespace when finding context"
 msgstr "Änderungen im Whitespace bei der Suche des Kontextes ignorieren"
 
-#: apply.c:5006
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr "den Patch in umgekehrter Reihenfolge anwenden"
 
-#: apply.c:5008
+#: apply.c:5047
 msgid "don't expect at least one line of context"
 msgstr "keinen Kontext erwarten"
 
-#: apply.c:5010
+#: apply.c:5049
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 "zurückgewiesene Patch-Blöcke in entsprechenden *.rej Dateien hinterlassen"
 
-#: apply.c:5012
+#: apply.c:5051
 msgid "allow overlapping hunks"
 msgstr "sich überlappende Patch-Blöcke erlauben"
 
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 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 "erweiterte Ausgaben"
 
-#: apply.c:5015
+#: apply.c:5054
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende tolerieren"
 
-#: apply.c:5018
+#: apply.c:5057
 msgid "do not trust the line counts in the hunk headers"
 msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
 
-#: apply.c:5020 builtin/am.c:2194
+#: apply.c:5059 builtin/am.c:2306
 msgid "root"
 msgstr "Wurzelverzeichnis"
 
-#: apply.c:5021
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr "<Wurzelverzeichnis> vor alle Dateinamen stellen"
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "Kann Blob %s nicht streamen."
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "Konnte '%s' Filter nicht starten."
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "Konnte Descriptor nicht umleiten."
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "'%s' Filter meldete Fehler."
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "Pfad ist kein gültiges UTF-8: %s"
+
+#: archive-zip.c:322
+#, c-format
+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:365 builtin/pack-objects.c:368
+#, c-format
+msgid "deflate error (%d)"
+msgstr "Fehler beim Komprimieren (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "Timestamp zu groß für dieses System: %<PRIuMAX>"
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<Optionen>] <Commit-Referenz> [<Pfad>...]"
@@ -807,183 +1606,158 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:188
+#, 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:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
+#: builtin/merge.c:1144
+#, c-format
+msgid "could not read '%s'"
+msgstr "Konnte '%s' nicht lesen"
+
+#: 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 "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
 
-#: archive.c:396
+#: archive.c:451
 #, c-format
 msgid "no such ref: %.*s"
-msgstr "Keine solche Referenz: %.*s"
+msgstr "Referenz nicht gefunden: %.*s"
 
-#: archive.c:401
+#: archive.c:457
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "Kein gültiger Objektname: %s"
 
-#: archive.c:414
+#: archive.c:470
 #, c-format
 msgid "not a tree object: %s"
 msgstr "Kein Tree-Objekt: %s"
 
-#: archive.c:426
+#: archive.c:482
 msgid "current working directory is untracked"
 msgstr "Aktuelles Arbeitsverzeichnis ist unversioniert."
 
-#: archive.c:457
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "Datei nicht gefunden: %s"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Keine reguläre Datei: %s"
+
+#: archive.c:552
 msgid "fmt"
 msgstr "Format"
 
-#: archive.c:457
+#: archive.c:552
 msgid "archive format"
 msgstr "Archivformat"
 
-#: archive.c:458 builtin/log.c:1581
+#: archive.c:553 builtin/log.c:1775
 msgid "prefix"
 msgstr "Präfix"
 
-#: archive.c:459
+#: archive.c:554
 msgid "prepend prefix to each pathname in the archive"
 msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
 
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:186
+#: 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 "Datei"
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr "unversionierte Datei zum Archiv hinzufügen"
+
+#: archive.c:559 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr "das Archiv in diese Datei schreiben"
 
-#: archive.c:463
+#: archive.c:561
 msgid "read .gitattributes in working directory"
 msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
 
-#: archive.c:464
+#: archive.c:562
 msgid "report archived files on stderr"
 msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
 
-#: archive.c:465
-msgid "store only"
-msgstr "nur speichern"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "schneller komprimieren"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "besser komprimieren"
+#: archive.c:564
+msgid "set compression level"
+msgstr "Komprimierungsgrad setzen"
 
-#: archive.c:477
+#: archive.c:567
 msgid "list supported archive formats"
 msgstr "unterstützte Archivformate auflisten"
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: 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 "Repository"
 
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "Archiv vom Remote-Repository <Repository> abrufen"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
 #: builtin/notes.c:498
 msgid "command"
 msgstr "Programm"
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
 
-#: archive.c:489
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr "Unerwartete Option --remote"
 
-#: archive.c:491
+#: archive.c:581
 msgid "Option --exec can only be used together with --remote"
-msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
+msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden"
 
-#: archive.c:493
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr "Unerwartete Option --output"
 
-#: archive.c:515
+#: 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
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Unbekanntes Archivformat '%s'"
 
-#: archive.c:522
+#: archive.c:616
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument für Format '%s' nicht unterstützt: -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "Kann Blob %s nicht streamen."
-
-#: archive-tar.c:266 archive-zip.c:363
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "Nicht unterstützter Dateimodus: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr "Kann %s nicht lesen."
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "Konnte '%s' Filter nicht starten."
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "Konnte Descriptor nicht umleiten."
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "'%s' Filter meldete Fehler."
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "Pfad ist kein gültiges UTF-8: %s"
-
-#: archive-zip.c:318
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "Pfad zu lang (%d Zeichen, SHA1: %s): %s"
-
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
-#, c-format
-msgid "deflate error (%d)"
-msgstr "Fehler beim Komprimieren (%d)"
-
-#: archive-zip.c:609
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "Timestamp zu groß für dieses System: %<PRIuMAX>"
-
-#: attr.c:213
+#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s ist kein gültiger Attributname"
 
-#: attr.c:370
+#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s nicht erlaubt: %s:%d"
 
-#: attr.c:410
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -991,22 +1765,22 @@ msgstr ""
 "Verneinende Muster werden in Git-Attributen ignoriert.\n"
 "Benutzen Sie '\\!' für führende Ausrufezeichen."
 
-#: bisect.c:468
+#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Ungültiger Inhalt bzgl. Anführungszeichen in Datei '%s': %s"
 
-#: bisect.c:678
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Keine binäre Suche mehr möglich!\n"
 
-#: bisect.c:733
+#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s ist kein gültiger Commit-Name"
 
-#: bisect.c:758
+#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1015,7 +1789,7 @@ msgstr ""
 "Die Merge-Basis %s ist fehlerhaft.\n"
 "Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
 
-#: bisect.c:763
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1024,7 +1798,7 @@ msgstr ""
 "Die Merge-Basis %s ist neu.\n"
 "Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
 
-#: bisect.c:768
+#: bisect.c:801
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1033,7 +1807,7 @@ msgstr ""
 "Die Merge-Basis %s ist %s.\n"
 "Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1044,7 +1818,7 @@ msgstr ""
 "git bisect kann in diesem Fall nicht richtig arbeiten.\n"
 "Vielleicht verwechselten Sie %s und %s Commits?\n"
 
-#: bisect.c:789
+#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1056,45 +1830,45 @@ msgstr ""
 "erste %s Commit zwischen %s und %s befindet.\n"
 "Es wird dennoch fortgesetzt."
 
-#: bisect.c:822
+#: bisect.c:861
 #, 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:865
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr "ein %s Commit wird benötigt"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
 msgstr "konnte Datei '%s' nicht erstellen"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
 msgstr "Konnte Datei '%s' nicht lesen"
 
-#: bisect.c:958
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
 
-#: bisect.c:977
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s war sowohl %s als auch %s\n"
 
-#: bisect.c:985
+#: bisect.c:1066
 #, 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 ""
 "Kein testbarer Commit gefunden.\n"
-"Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
+"Vielleicht starteten Sie mit schlechten Pfad-Argumenten?\n"
 
-#: bisect.c:1004
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1104,50 +1878,50 @@ msgstr[1] "(ungefähr %d Schritte)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1101
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "binäre Suche: danach noch %d Commit zum Testen übrig %s\n"
 msgstr[1] "binäre Suche: danach noch %d Commits zum Testen übrig %s\n"
 
-#: blame.c:2700
+#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents und --reverse funktionieren gemeinsam nicht."
 
-#: blame.c:2714
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr ""
 "kann --contents nicht mit endgültigem Namen des Commit-Objektes benutzen"
 
-#: blame.c:2735
+#: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse und --first-parent zusammen erfordern die Angabe eines "
 "endgültigen\n"
 "Commits"
 
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
-#: builtin/shortlog.c:192
+#: 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 "Einrichtung des Revisionsgangs fehlgeschlagen"
 
-#: blame.c:2762
+#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse und --first-parent zusammen erfordern einen Bereich entlang der\n"
 "\"first-parent\"-Kette"
 
-#: blame.c:2773
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
-msgstr "Pfad %s nicht in %s"
+msgstr "Pfad %s nicht in %s gefunden"
 
-#: blame.c:2784
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "kann Blob %s für Pfad '%s' nicht lesen"
@@ -1284,408 +2058,366 @@ msgstr "mehrdeutiger Objekt-Name: '%s'"
 msgid "Not a valid branch point: '%s'."
 msgstr "Ungültiger Branchpunkt: '%s'"
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' ist bereits in '%s' ausgecheckt"
 
-#: branch.c:387
+#: branch.c:389
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
 
-#: bundle.c:36
+#: bundle.c:44
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "unbekannter Paket-Hash-Algorithmus: %s"
+
+#: bundle.c:48
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "unbekannte Fähigkeit '%s'"
+
+#: bundle.c:74
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus"
+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:64
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
-#: builtin/commit.c:791
+#: 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 "Konnte '%s' nicht öffnen"
 
-#: bundle.c:143
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
 
-#: bundle.c:146
+#: 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:197
+#: 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:204
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "Das Paket speichert eine komplette Historie."
 
-#: bundle.c:206
+#: 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:272
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "Konnte dup für Descriptor des Pakets nicht ausführen."
 
-#: bundle.c:279
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Konnte Paketobjekte nicht erstellen"
 
-#: bundle.c:290
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "Erstellung der Paketobjekte abgebrochen"
 
-#: bundle.c:332
-msgid "rev-list died"
-msgstr "\"rev-list\" abgebrochen"
-
-#: bundle.c:381
+#: 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:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
+#: bundle.c:504
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "nicht unterstützte Paket-Version %d"
+
+#: 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:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "nicht erkanntes Argument: %s"
 
-#: bundle.c:468
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Erstellung eines leeren Pakets zurückgewiesen."
 
-#: bundle.c:478
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kann '%s' nicht erstellen"
 
-#: bundle.c:503
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "Erstellung der Paketindexdatei abgebrochen"
 
-#: color.c:296
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "Ungültiger Farbwert: %.*s"
-
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "konnte %s nicht parsen"
-
-#: commit.c:52
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s ist kein Commit!"
-
-#: commit.c:192
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Die Unterstützung für <GIT_DIR>/info/grafts ist veraltet\n"
-"und wird in zukünftigen Git Versionen entfernt.\n"
-"\n"
-"Bitte benutzen Sie \"git replace --convert-graft-file\"\n"
-"zum Konvertieren der künstlichen Vorgänger (\"grafts\")\n"
-"in ersetzende Referenzen.<\n"
-"\n"
-"Sie können diese Meldung unterdrücken, indem Sie\n"
-"\"git config advice.graftFileDeprecated false\" ausführen."
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
+msgstr "abschließende Chunk-ID erscheint eher als erwartet"
 
-#: commit.c:1128
+#: chunk-format.c:126
 #, 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."
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "unzulässige(r) Chunk-Offset(s) %<PRIx64> und %<PRIx64>"
 
-#: commit.c:1131
+#: chunk-format.c:133
 #, 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."
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "doppelte Chunk-ID %<PRIx32> gefunden"
 
-#: commit.c:1134
+#: chunk-format.c:147
 #, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Commit %s hat keine GPG-Signatur."
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "letzter Chunk hat nicht-Null ID %<PRIx32>"
 
-#: commit.c:1137
+#: color.c:329
 #, 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"
+msgid "invalid color value: %.*s"
+msgstr "Ungültiger Farbwert: %.*s"
 
-#: commit.c:1391
-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 ""
-"Warnung: Die Commit-Beschreibung ist nicht UTF-8 konform.\n"
-"Sie können das nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n"
-"oder Sie setzen die Konfigurationsvariable i18n.commitencoding auf das "
-"Encoding,\n"
-"welches von ihrem Projekt verwendet wird.\n"
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr "ungültige Hash-Version"
 
-#: commit-graph.c:127
+#: commit-graph.c:262
 msgid "commit-graph file is too small"
-msgstr "Commit-Graph-Datei ist zu klein."
+msgstr "Commit-Graph-Datei ist zu klein"
 
-#: commit-graph.c:192
+#: commit-graph.c:355
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "Commit-Graph-Signatur %X stimmt nicht mit Signatur %X überein."
 
-#: commit-graph.c:199
+#: commit-graph.c:362
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "Commit-Graph-Version %X stimmt nicht mit Version %X überein."
 
-#: commit-graph.c:206
+#: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "Hash-Version des Commit-Graph %X stimmt nicht mit Version %X überein."
 
-#: commit-graph.c:229
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"fehlender Tabelleneintrag für Commit-Graph Chunk-Lookup; Datei "
-"möglicherweise unvollständig"
-
-#: commit-graph.c:240
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "Unzulässiger Commit-Graph Chunk-Offset %08x%08x"
-
-#: commit-graph.c:283
+#: commit-graph.c:386
 #, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "Commit-Graph Chunk-Id %08x kommt mehrfach vor."
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "Commit-Graph-Datei ist zu klein, um %u Chunks zu enthalten"
 
-#: commit-graph.c:347
+#: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
 msgstr "Commit-Graph hat keinen Basis-Graph-Chunk"
 
-#: commit-graph.c:357
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr "Commit-Graph Verkettung stimmt nicht überein."
 
-#: commit-graph.c:404
+#: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "Ungültige Commit-Graph Verkettung: Zeile '%s' ist kein Hash"
 
-#: commit-graph.c:430
+#: commit-graph.c:564
 msgid "unable to find all commit-graph files"
 msgstr "Konnte nicht alle Commit-Graph-Dateien finden."
 
-#: commit-graph.c:561 commit-graph.c:621
+#: commit-graph.c:745 commit-graph.c:782
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "Ungültige Commit-Position. Commit-Graph ist wahrscheinlich beschädigt."
 
-#: commit-graph.c:582
+#: commit-graph.c:766
 #, c-format
 msgid "could not find commit %s"
 msgstr "Konnte Commit %s nicht finden."
 
-#: commit-graph.c:855 builtin/am.c:1287
+#: commit-graph.c:799
+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:1341
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "Konnte Commit '%s' nicht parsen."
 
-#: commit-graph.c:859
-#, c-format
-msgid "unable to get tree for %s"
-msgstr "Konnte Verzeichnis für %s nicht bestimmen."
-
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "Konnte Art von Objekt '%s' nicht bestimmen."
 
-#: commit-graph.c:1049
+#: commit-graph.c:1368
 msgid "Loading known commits in commit graph"
 msgstr "Lade bekannte Commits in Commit-Graph"
 
-#: commit-graph.c:1066
+#: commit-graph.c:1385
 msgid "Expanding reachable commits in commit graph"
 msgstr "Erweitere erreichbare Commits in Commit-Graph"
 
-#: commit-graph.c:1085
+#: commit-graph.c:1405
 msgid "Clearing commit marks in commit graph"
 msgstr "Lösche Commit-Markierungen in Commit-Graph"
 
-#: commit-graph.c:1104
+#: commit-graph.c:1424
+msgid "Computing commit graph topological levels"
+msgstr "Topologische Ebenen des Commit-Graph werden berechnet"
+
+#: commit-graph.c:1477
 msgid "Computing commit graph generation numbers"
-msgstr "Commit-Graph Generierungsnummern berechnen"
+msgstr "Commit-Graph Generationsnummern berechnen"
+
+#: commit-graph.c:1558
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Berechnung der Bloom-Filter für veränderte Pfade des Commits"
+
+#: commit-graph.c:1635
+msgid "Collecting referenced commits"
+msgstr "Sammle referenzierte Commits"
 
-#: commit-graph.c:1179
+#: 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] "Suche Commits für Commit-Graph in %d Paket"
 msgstr[1] "Suche Commits für Commit-Graph in %d Paketen"
 
-#: commit-graph.c:1192
+#: commit-graph.c:1673
 #, c-format
 msgid "error adding pack %s"
 msgstr "Fehler beim Hinzufügen von Paket %s."
 
-#: commit-graph.c:1196
+#: commit-graph.c:1677
 #, c-format
 msgid "error opening index for %s"
 msgstr "Fehler beim Öffnen des Index für %s."
 
-#: commit-graph.c:1220
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Suche Commits für Commit-Graph in %d Referenz"
-msgstr[1] "Suche Commits für Commit-Graph in %d Referenzen"
-
-#: commit-graph.c:1240
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "ungültige Commit-Objekt-ID: %s"
-
-#: commit-graph.c:1255
+#: commit-graph.c:1714
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Suche Commits für Commit-Graph in gepackten Objekten"
 
-#: commit-graph.c:1270
-msgid "Counting distinct commits in commit graph"
-msgstr "Zähle Commits in Commit-Graph"
-
-#: commit-graph.c:1300
+#: commit-graph.c:1732
 msgid "Finding extra edges in commit graph"
 msgstr "Suche zusätzliche Ränder in Commit-Graph"
 
-#: commit-graph.c:1346
+#: commit-graph.c:1781
 msgid "failed to write correct number of base graph ids"
 msgstr "Fehler beim Schreiben der korrekten Anzahl von Basis-Graph-IDs."
 
-#: commit-graph.c:1379 midx.c:810
+#: commit-graph.c:1812 midx.c:911
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
 
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr "konnte temporäre Graphen-Schicht nicht erstellen"
+
+#: commit-graph.c:1830
 #, c-format
-msgid "unable to create '%s'"
-msgstr "konnte '%s' nicht erstellen"
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "konnte geteilte Zugriffsberechtigungen für '%s' nicht ändern"
 
-#: commit-graph.c:1451
+#: 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] "Schreibe Commit-Graph in %d Durchgang"
 msgstr[1] "Schreibe Commit-Graph in %d Durchgängen"
 
-#: commit-graph.c:1492
+#: commit-graph.c:1923
 msgid "unable to open commit-graph chain file"
-msgstr "Konnte Commit-Graph Chain-Datei nicht öffnen."
+msgstr "konnte Commit-Graph Chain-Datei nicht öffnen"
 
-#: commit-graph.c:1504
+#: commit-graph.c:1939
 msgid "failed to rename base commit-graph file"
-msgstr "Konnte Basis-Commit-Graph-Datei nicht umbenennen."
+msgstr "konnte Basis-Commit-Graph-Datei nicht umbenennen"
 
-#: commit-graph.c:1524
+#: commit-graph.c:1959
 msgid "failed to rename temporary commit-graph file"
-msgstr "Konnte temporäre Commit-Graph-Datei nicht umbenennen."
+msgstr "konnte temporäre Commit-Graph-Datei nicht umbenennen"
 
-#: commit-graph.c:1635
+#: commit-graph.c:2092
 msgid "Scanning merged commits"
 msgstr "Durchsuche zusammengeführte Commits"
 
-#: commit-graph.c:1646
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "Unerwartete doppelte Commit-ID %s"
-
-#: commit-graph.c:1670
+#: commit-graph.c:2136
 msgid "Merging commit-graph"
 msgstr "Zusammenführen von Commit-Graph"
 
-#: commit-graph.c:1860
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "Das Commit-Graph Format kann nicht %d Commits schreiben."
+#: commit-graph.c:2244
+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:1871
+#: commit-graph.c:2351
 msgid "too many commits to write graph"
-msgstr "Zu viele Commits zum Schreiben des Graphen."
+msgstr "zu viele Commits zum Schreiben des Graphen"
 
-#: commit-graph.c:1961
+#: commit-graph.c:2449
 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."
+"die Commit-Graph-Datei hat eine falsche Prüfsumme und ist wahrscheinlich "
+"beschädigt"
 
-#: commit-graph.c:1971
+#: commit-graph.c:2459
 #, 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:1981 commit-graph.c:1996
+#: commit-graph.c:2469 commit-graph.c:2484
 #, 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:1988
+#: commit-graph.c:2476
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
-msgstr "Konnte Commit %s von Commit-Graph nicht parsen."
+msgstr "konnte Commit %s von Commit-Graph nicht parsen"
 
-#: commit-graph.c:2006
+#: commit-graph.c:2494
 msgid "Verifying commits in commit graph"
 msgstr "Commit in Commit-Graph überprüfen"
 
-#: commit-graph.c:2020
+#: commit-graph.c:2509
 #, 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:2027
+#: commit-graph.c:2516
 #, 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:2037
+#: commit-graph.c:2526
 #, 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:2046
+#: commit-graph.c:2535
 #, 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:2059
+#: commit-graph.c:2549
 #, 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:2064
+#: commit-graph.c:2554
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1693,7 +2425,7 @@ msgstr ""
 "Commit-Graph hat Generationsnummer null für Commit %s, aber sonst ungleich "
 "null"
 
-#: commit-graph.c:2068
+#: commit-graph.c:2558
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1701,22 +2433,87 @@ msgstr ""
 "Commit-Graph hat Generationsnummer ungleich null für Commit %s, aber sonst "
 "null"
 
-#: commit-graph.c:2083
+#: commit-graph.c:2575
 #, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "Commit-Graph Erstellung für Commit %s ist %u != %u"
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "Commit-Graph Erstellung für Commit %s ist %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c:2089
+#: commit-graph.c:2581
 #, 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: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 "konnte %s nicht parsen"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s ist kein Commit!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Die Unterstützung für <GIT_DIR>/info/grafts ist veraltet\n"
+"und wird in zukünftigen Git Versionen entfernt.\n"
+"\n"
+"Bitte benutzen Sie \"git replace --convert-graft-file\"\n"
+"zum Konvertieren der künstlichen Vorgänger (\"grafts\")\n"
+"in ersetzende Referenzen.<\n"
+"\n"
+"Sie können diese Meldung unterdrücken, indem Sie\n"
+"\"git config advice.graftFileDeprecated false\" ausführen."
+
+#: commit.c:1237
+#, 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
+#, 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
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Commit %s hat keine GPG-Signatur."
+
+#: commit.c:1247
+#, 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
+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 ""
+"Warnung: Die Commit-Beschreibung ist nicht UTF-8 konform.\n"
+"Sie können das nachbessern, nachdem Sie die Beschreibung korrigiert haben,\n"
+"oder Sie setzen die Konfigurationsvariable i18n.commitencoding auf das "
+"Encoding,\n"
+"welches von ihrem Projekt verwendet wird.\n"
+
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "Speicher verbraucht"
 
-#: config.c:124
+#: config.c:126
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1732,306 +2529,350 @@ msgstr ""
 "überschritten.\n"
 "Das könnte durch zirkulare Includes entstanden sein."
 
-#: config.c:140
+#: config.c:142
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "Konnte Include-Pfad '%s' nicht erweitern."
 
-#: config.c:151
+#: config.c:153
 msgid "relative config includes must come from files"
 msgstr "Relative Includes von Konfigurationen müssen aus Dateien kommen."
 
-#: config.c:197
+#: config.c:199
 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:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "ungültiges Konfigurationsformat: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "fehlender Name der Umgebungsvariable für Konfiguration '%.*s'"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "fehlende Umgebungsvariable '%s' für Konfiguration '%.*s'"
+
+#: config.c:442
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "Schlüssel enthält keine Sektion: %s"
 
-#: config.c:382
+#: config.c:448
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "Schlüssel enthält keinen Variablennamen: %s"
 
-#: config.c:406 sequencer.c:2401
+#: config.c:472 sequencer.c:2785
 #, c-format
 msgid "invalid key: %s"
 msgstr "Ungültiger Schlüssel: %s"
 
-#: config.c:412
+#: config.c:478
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "Ungültiger Schlüssel (neue Zeile): %s"
 
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "leerer Konfigurationsschlüssel"
+
+#: config.c:529 config.c:541
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "Fehlerhafter Konfigurationsparameter: %s"
 
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
 #, c-format
 msgid "bogus format in %s"
 msgstr "Fehlerhaftes Format in %s"
 
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "falsche Zählung in %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "zu viele Einträge in %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "fehlender Konfigurationsschlüssel %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "fehlender Konfigurationswert %s"
+
+#: config.c:995
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "Ungültige Konfigurationszeile %d in Blob %s"
 
-#: config.c:825
+#: config.c:999
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "Ungültige Konfigurationszeile %d in Datei %s"
 
-#: config.c:829
+#: config.c:1003
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "Ungültige Konfigurationszeile %d in Standard-Eingabe"
 
-#: config.c:833
+#: config.c:1007
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "Ungültige Konfigurationszeile %d in Submodul-Blob %s"
 
-#: config.c:837
+#: config.c:1011
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "Ungültige Konfigurationszeile %d in Kommandozeile %s"
 
-#: config.c:841
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "Ungültige Konfigurationszeile %d in %s"
 
-#: config.c:978
+#: config.c:1152
 msgid "out of range"
 msgstr "Außerhalb des Bereichs"
 
-#: config.c:978
+#: config.c:1152
 msgid "invalid unit"
 msgstr "Ungültige Einheit"
 
-#: config.c:979
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "Ungültiger numerischer Wert '%s' für Konfiguration '%s': %s"
 
-#: config.c:998
+#: config.c:1163
 #, 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:1001
+#: config.c:1166
 #, 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:1004
+#: config.c:1169
 #, 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:1007
+#: config.c:1172
 #, 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:1010
+#: config.c:1175
 #, 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:1013
+#: config.c:1178
 #, 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:1108
+#: config.c:1257
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "ungültiger boolescher Konfigurationswert '%s' für '%s'"
+
+#: config.c:1275
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
 
-#: config.c:1117
+#: config.c:1284
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
 
-#: config.c:1208
+#: config.c:1377
 #, 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:1222 config.c:1233
+#: config.c:1391 config.c:1402
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "ungültiger zlib Komprimierungsgrad %d"
 
-#: config.c:1325
+#: config.c:1494
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar sollte nur ein Zeichen sein"
 
-#: config.c:1358
+#: config.c:1527
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "Ungültiger Modus für Objekterstellung: %s"
 
-#: config.c:1425
+#: config.c:1599
 #, c-format
 msgid "malformed value for %s"
 msgstr "Ungültiger Wert für %s."
 
-#: config.c:1451
+#: config.c:1625
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "Ungültiger Wert für %s: %s"
 
-#: config.c:1452
+#: config.c:1626
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 "Muss einer von diesen sein: nothing, matching, simple, upstream, current"
 
-#: config.c:1513 builtin/pack-objects.c:3394
+#: config.c:1687 builtin/pack-objects.c:4084
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
 
-#: config.c:1634
+#: config.c:1809
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "Konnte Blob-Objekt '%s' für Konfiguration nicht laden."
 
-#: config.c:1637
+#: config.c:1812
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "Referenz '%s' zeigt auf keinen Blob."
 
-#: config.c:1654
+#: config.c:1829
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "Konnte Blob '%s' für Konfiguration nicht auflösen."
 
-#: config.c:1684
+#: config.c:1874
 #, c-format
 msgid "failed to parse %s"
 msgstr "Fehler beim Parsen von %s."
 
-#: config.c:1740
+#: config.c:1930
 msgid "unable to parse command-line config"
 msgstr ""
 "Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
 
-#: config.c:2091
+#: config.c:2294
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
 
-#: config.c:2261
+#: config.c:2468
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Ungültiger %s: '%s'"
 
-#: config.c:2306
+#: config.c:2513
 #, 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:2352
+#: config.c:2559
 #, 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:2354
+#: config.c:2561
 #, 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:2435
+#: config.c:2645
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "Ungültiger Sektionsname '%s'"
 
-#: config.c:2467
+#: config.c:2677
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s hat mehrere Werte"
 
-#: config.c:2496
+#: config.c:2706
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "Konnte neue Konfigurationsdatei '%s' nicht schreiben."
 
-#: config.c:2748 config.c:3072
+#: config.c:2958 config.c:3285
 #, c-format
 msgid "could not lock config file %s"
 msgstr "Konnte Konfigurationsdatei '%s' nicht sperren."
 
-#: config.c:2759
+#: config.c:2969
 #, c-format
 msgid "opening %s"
 msgstr "Öffne %s"
 
-#: config.c:2794 builtin/config.c:328
+#: config.c:3006 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "Ungültiges Muster: %s"
 
-#: config.c:2819
+#: config.c:3031
 #, c-format
 msgid "invalid config file %s"
 msgstr "Ungültige Konfigurationsdatei %s"
 
-#: config.c:2832 config.c:3085
+#: config.c:3044 config.c:3298
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat auf %s fehlgeschlagen"
 
-#: config.c:2843
+#: config.c:3055
 #, 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:2852 config.c:3090
+#: config.c:3065 config.c:3303
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod auf %s fehlgeschlagen"
 
-#: config.c:2937 config.c:3187
+#: config.c:3150 config.c:3400
 #, c-format
 msgid "could not write config file %s"
 msgstr "Konnte Konfigurationsdatei %s nicht schreiben."
 
-#: config.c:2971
+#: config.c:3184
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' setzen."
 
-#: config.c:2973 builtin/remote.c:782
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr "Konnte '%s' nicht aufheben."
 
-#: config.c:3063
+#: config.c:3276
 #, c-format
 msgid "invalid section name: %s"
 msgstr "Ungültiger Sektionsname: %s"
 
-#: config.c:3230
+#: config.c:3443
 #, c-format
 msgid "missing value for '%s'"
 msgstr "Fehlender Wert für '%s'"
@@ -2058,74 +2899,83 @@ msgstr ""
 msgid "server doesn't support '%s'"
 msgstr "Der Server unterstützt kein '%s'."
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "Der Server unterstützt das Feature '%s' nicht."
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
 msgstr "Erwartete Flush nach Fähigkeiten."
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "Ignoriere Fähigkeiten nach der ersten Zeile '%s'."
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "Protokollfehler: unerwartetes capabilities^{}"
 
-#: connect.c:273
+#: connect.c:306
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "Protokollfehler: shallow SHA-1 erwartet, '%s' bekommen"
 
-#: connect.c:275
+#: connect.c:308
 msgid "repository on the other end cannot be shallow"
 msgstr ""
 "Repository auf der Gegenseite kann keine unvollständige Historie (shallow) "
 "enthalten"
 
-#: connect.c:313
+#: connect.c:347
 msgid "invalid packet"
-msgstr "Ungültiges Paket."
+msgstr "ungültiges Paket"
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "Protokollfehler: unerwartetes '%s'"
 
-#: connect.c:441
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "unbekanntes Objekt-Format '%s' vom Server angegeben"
+
+#: connect.c:526
 #, c-format
 msgid "invalid ls-refs response: %s"
-msgstr "Ungültige ls-refs Antwort: %s"
+msgstr "ungültige ls-refs Antwort: %s"
 
-#: connect.c:445
+#: connect.c:530
 msgid "expected flush after ref listing"
-msgstr "Erwartete Flush nach Auflistung der Referenzen."
+msgstr "Flush nach Auflistung der Referenzen erwartet"
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "Antwort-Endpaket nach Auflistung der Referenzen erwartet"
 
-#: connect.c:544
+#: connect.c:666
 #, c-format
 msgid "protocol '%s' is not supported"
-msgstr "Protokoll '%s' wird nicht unterstützt."
+msgstr "Protokoll '%s' wird nicht unterstützt"
 
-#: connect.c:595
+#: connect.c:717
 msgid "unable to set SO_KEEPALIVE on socket"
-msgstr "Kann SO_KEEPALIVE bei Socket nicht setzen."
+msgstr "kann SO_KEEPALIVE bei Socket nicht setzen"
 
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Suche nach %s ..."
 
-#: connect.c:639
+#: connect.c:761
 #, 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:643 connect.c:714
+#: connect.c:765 connect.c:836
 #, c-format
 msgid ""
 "done.\n"
@@ -2134,7 +2984,7 @@ msgstr ""
 "Fertig.\n"
 "Verbinde nach %s (Port %s) ... "
 
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2144,88 +2994,91 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
 msgid "done."
 msgstr "Fertig."
 
-#: connect.c:702
+#: connect.c:824
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "Fehler bei der Suche nach %s (%s)"
 
-#: connect.c:708
+#: connect.c:830
 #, c-format
 msgid "unknown port %s"
 msgstr "Unbekannter Port %s"
 
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "Merkwürdigen Hostnamen '%s' blockiert."
 
-#: connect.c:847
+#: connect.c:969
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "Merkwürdigen Port '%s' blockiert."
 
-#: connect.c:857
+#: connect.c:979
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "Kann Proxy %s nicht starten."
 
-#: connect.c:928
+#: connect.c:1050
 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."
+msgstr "kein Pfad angegeben; siehe 'git help pull' für eine gültige URL-Syntax"
+
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "Zeilenumbruch ist in git:// Hosts und Repository-Pfaden verboten"
 
-#: connect.c:1123
+#: connect.c:1247
 msgid "ssh variant 'simple' does not support -4"
-msgstr "SSH-Variante 'simple' unterstützt kein -4."
+msgstr "SSH-Variante 'simple' unterstützt kein -4"
 
-#: connect.c:1135
+#: connect.c:1259
 msgid "ssh variant 'simple' does not support -6"
-msgstr "SSH-Variante 'simple' unterstützt kein -6."
+msgstr "SSH-Variante 'simple' unterstützt kein -6"
 
-#: connect.c:1152
+#: connect.c:1276
 msgid "ssh variant 'simple' does not support setting port"
-msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports."
+msgstr "SSH-Variante 'simple' unterstützt nicht das Setzen eines Ports"
 
-#: connect.c:1264
+#: connect.c:1388
 #, c-format
 msgid "strange pathname '%s' blocked"
-msgstr "Merkwürdigen Pfadnamen '%s' blockiert."
+msgstr "Merkwürdigen Pfadnamen '%s' blockiert"
 
-#: connect.c:1311
+#: connect.c:1436
 msgid "unable to fork"
-msgstr "Kann Prozess nicht starten."
+msgstr "kann Prozess nicht starten"
 
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "Prüfe Konnektivität"
 
-#: connected.c:100
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
 msgstr "Konnte 'git rev-list' nicht ausführen"
 
-#: connected.c:120
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr "Fehler beim Schreiben nach rev-list"
 
-#: connected.c:127
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
-msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
+msgstr "Fehler beim Schließen von rev-lists Standard-Eingabe"
 
-#: convert.c:194
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "Unerlaubte crlf_action %d"
 
-#: convert.c:207
+#: convert.c:196
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
-msgstr "CRLF würde in %s durch LF ersetzt werden."
+msgstr "CRLF würde in %s durch LF ersetzt werden"
 
-#: convert.c:209
+#: convert.c:198
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2235,12 +3088,12 @@ msgstr ""
 "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
 "behalten."
 
-#: convert.c:217
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
-msgstr "LF würde in %s durch CRLF ersetzt werden."
+msgstr "LF würde in %s durch CRLF ersetzt werden"
 
-#: convert.c:219
+#: convert.c:208
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2250,26 +3103,26 @@ msgstr ""
 "Die Datei wird ihre ursprünglichen Zeilenenden im Arbeitsverzeichnis "
 "behalten."
 
-#: convert.c:280
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
-msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert."
+msgstr "BOM ist in '%s' unzulässig, wenn als %s codiert"
 
-#: convert.c:287
+#: convert.c:280
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
-"Die Datei '%s' enthält ein Byte-Order-Mark (BOM). Bitte benutzen Sie UTF-%s\n"
-"als Codierung im Arbeitsverzeichnis."
+"Die Datei '%s' enthält ein Byte-Order-Mark (BOM). Bitte benutzen Sie\n"
+"UTF-%.*s als Codierung im Arbeitsverzeichnis."
 
-#: convert.c:305
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
-msgstr "BOM ist erforderlich in '%s', wenn als %s codiert."
+msgstr "BOM ist erforderlich in '%s', wenn als %s codiert"
 
-#: convert.c:307
+#: convert.c:295
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2279,70 +3132,99 @@ msgstr ""
 "oder UTF-%sLE (abhängig von der Byte-Reihenfolge) als Codierung im\n"
 "Arbeitsverzeichnis."
 
-#: convert.c:425 convert.c:496
+#: convert.c:408 convert.c:479
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
-msgstr "Fehler beim Codieren von '%s' von %s nach %s."
+msgstr "Fehler beim Codieren von '%s' von %s nach %s"
 
-#: convert.c:468
+#: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
-msgstr "Die Codierung '%s' von %s nach %s und zurück ist nicht dasselbe."
+msgstr "Codierung von '%s' von %s nach %s und zurück ist nicht dasselbe"
 
-#: convert.c:674
+#: convert.c:654
 #, c-format
 msgid "cannot fork to run external filter '%s'"
-msgstr "Kann externen Filter '%s' nicht starten."
+msgstr "kann externen Filter '%s' nicht starten"
 
-#: convert.c:694
+#: convert.c:674
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
-msgstr "Kann Eingaben nicht an externen Filter '%s' übergeben."
+msgstr "kann Eingaben nicht an externen Filter '%s' übergeben"
 
-#: convert.c:701
+#: convert.c:681
 #, c-format
 msgid "external filter '%s' failed %d"
-msgstr "Externer Filter '%s' fehlgeschlagen %d"
+msgstr "externer Filter '%s' fehlgeschlagen %d"
 
-#: convert.c:736 convert.c:739
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
-msgstr "Lesen von externem Filter '%s' fehlgeschlagen."
+msgstr "Lesen von externem Filter '%s' fehlgeschlagen"
 
-#: convert.c:742 convert.c:797
+#: convert.c:722 convert.c:777
 #, c-format
 msgid "external filter '%s' failed"
-msgstr "Externer Filter '%s' fehlgeschlagen."
+msgstr "externer Filter '%s' fehlgeschlagen"
 
-#: convert.c:845
+#: convert.c:826
 msgid "unexpected filter type"
-msgstr "Unerwartete Filterart."
+msgstr "unerwartete Filterart"
 
-#: convert.c:856
+#: convert.c:837
 msgid "path name too long for external filter"
-msgstr "Pfadname zu lang für externen Filter."
+msgstr "Pfadname zu lang für externen Filter"
 
-#: convert.c:930
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr ""
-"Externer Filter '%s' nicht mehr verfügbar. Nicht alle Pfade wurden gefiltert."
+"externer Filter '%s' nicht mehr verfügbar, obwohl nicht alle Pfade gefiltert "
+"wurden"
 
-#: convert.c:1229
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
-msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis."
+msgstr "true/false sind keine gültigen Codierungen im Arbeitsverzeichnis"
 
-#: convert.c:1417 convert.c:1451
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
-msgstr "%s: clean-Filter '%s' fehlgeschlagen."
+msgstr "%s: clean-Filter '%s' fehlgeschlagen"
 
-#: convert.c:1495
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
-msgstr "%s: smudge-Filter '%s' fehlgeschlagen."
+msgstr "%s: smudge-Filter '%s' fehlgeschlagen"
+
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "überspringe Suche nach Zugangsdaten für Schlüssel: credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "Weigerung, mit fehlendem Hostnamen in Zugangsdaten zu arbeiten"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr "Weigerung, mit fehlendem Protokoll in Zugangsdaten zu arbeiten"
+
+#: credential.c:394
+#, 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
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "URL hat kein Schema: %s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "URL mit Zugangsdaten konnte nicht geparst werden: %s"
 
 #: date.c:138
 msgid "in the future"
@@ -2431,28 +3313,44 @@ msgstr ""
 #, c-format
 msgid "island regex from config has too many capture groups (max=%d)"
 msgstr ""
-"Regulärer Ausdruck des Delta-Island aus Konfiguration hat zu\n"
-"viele Capture-Gruppen (maximal %d)."
+"regulärer Ausdruck des Delta-Island aus Konfiguration hat zu\n"
+"viele Capture-Gruppen (maximal %d)"
 
 #: delta-islands.c:467
 #, c-format
 msgid "Marked %d islands, done.\n"
 msgstr "%d Delta-Islands markiert, fertig.\n"
 
-#: diffcore-order.c:24
+#: diff-merges.c:70
 #, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
+msgid "unknown value for --diff-merges: %s"
+msgstr "unbekannter Wert für --diff-merges: %s"
 
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Führe Erkennung für ungenaue Umbenennung aus"
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base funktioniert nicht mit Bereichen"
 
-#: diff-no-index.c:238
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr "--merge-base funktioniert nur mit Commits"
+
+#: diff-lib.c:576
+msgid "unable to get HEAD"
+msgstr "konnte HEAD nicht bekommen"
+
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr "keine Merge-Basis gefunden"
+
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr "mehrere Merge-Basen gefunden"
+
+#: 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"
@@ -2460,26 +3358,26 @@ msgstr ""
 "Kein Git-Repository. Nutzen Sie --no-index, um zwei Pfade außerhalb des "
 "Arbeitsverzeichnisses zu vergleichen."
 
-#: diff.c:155
+#: diff.c:156
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
 
-#: diff.c:160
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Unbekannter \"dirstat\" Parameter '%s'\n"
 
-#: diff.c:296
+#: diff.c:297
 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:324
+#: diff.c:325
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -2488,7 +3386,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:332
+#: diff.c:333
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -2496,12 +3394,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change kann nicht mit anderen\n"
 "Whitespace-Modi kombiniert werden."
 
-#: diff.c:405
+#: diff.c:410
 #, 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:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -2510,36 +3408,51 @@ msgstr ""
 "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
 "%s"
 
-#: diff.c:4218
+#: diff.c:4282
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
 
-#: diff.c:4563
+#: diff.c:4634
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
 
-#: diff.c:4566
+#: diff.c:4637
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S und --find-object schließen sich gegenseitig aus"
 
-#: diff.c:4644
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+"-G und --pickaxe-regex schließen sich gegenseitig aus. Benutzen Sie\n"
+"--pickaxe-regex mit -S."
+
+#: diff.c:4643
+msgid ""
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr ""
+"--pickaxe-all und --find-object schließen sich gegenseitig aus. Benutzen\n"
+"Sie --pickaxe-all mit -G und -S."
+
+#: diff.c:4722
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow erfordert genau eine Pfadspezifikation"
 
-#: diff.c:4692
+#: diff.c:4770
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "Ungültiger --stat Wert: %s"
 
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
-#: parse-options.c:199 parse-options.c:203
+#: 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
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s erwartet einen numerischen Wert."
 
-#: diff.c:4729
+#: diff.c:4807
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2548,42 +3461,42 @@ msgstr ""
 "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
 "%s"
 
-#: diff.c:4814
+#: diff.c:4892
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
-msgstr "Unbekannte Änderungsklasse '%c' in --diff-filter=%s"
+msgstr "unbekannte Änderungsklasse '%c' in --diff-filter=%s"
 
-#: diff.c:4838
+#: diff.c:4916
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
-msgstr "Unbekannter Wert nach ws-error-highlight=%.*s"
+msgstr "unbekannter Wert nach ws-error-highlight=%.*s"
 
-#: diff.c:4852
+#: diff.c:4930
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "konnte '%s' nicht auflösen"
 
-#: diff.c:4902 diff.c:4908
+#: diff.c:4980 diff.c:4986
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s erwartet die Form <n>/<m>"
 
-#: diff.c:4920
+#: diff.c:4998
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s erwartet ein Zeichen, '%s' bekommen"
 
-#: diff.c:4941
+#: diff.c:5019
 #, c-format
 msgid "bad --color-moved argument: %s"
-msgstr "Ungültiges --color-moved Argument: %s"
+msgstr "ungültiges --color-moved Argument: %s"
 
-#: diff.c:4960
+#: diff.c:5038
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
-msgstr "Ungültiger Modus '%s' in --color-moved-ws"
+msgstr "ungültiger Modus '%s' in --color-moved-ws"
 
-#: diff.c:5000
+#: diff.c:5078
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2591,480 +3504,502 @@ msgstr ""
 "Option diff-algorithm akzeptiert: \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 
-#: diff.c:5036 diff.c:5056
+#: diff.c:5114 diff.c:5134
 #, c-format
 msgid "invalid argument to %s"
-msgstr "Ungültiges Argument für %s"
+msgstr "ungültiges Argument für %s"
+
+#: diff.c:5238
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "ungültiger regulärer Ausdruck für -I gegeben: '%s'"
 
-#: diff.c:5194
+#: diff.c:5287
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
 
-#: diff.c:5250
+#: diff.c:5343
 #, c-format
 msgid "bad --word-diff argument: %s"
-msgstr "Ungültiges --word-diff Argument: %s"
+msgstr "ungültiges --word-diff Argument: %s"
 
-#: diff.c:5273
+#: diff.c:5379
 msgid "Diff output format options"
 msgstr "Diff-Optionen zu Ausgabeformaten"
 
-#: diff.c:5275 diff.c:5281
+#: diff.c:5381 diff.c:5387
 msgid "generate patch"
-msgstr "Erzeuge Patch"
+msgstr "Patch erzeugen"
 
-#: diff.c:5278 builtin/log.c:172
+#: diff.c:5384 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "Ausgabe der Unterschiede unterdrücken"
 
-#: diff.c:5283 diff.c:5397 diff.c:5404
+#: diff.c:5389 diff.c:5503 diff.c:5510
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5284 diff.c:5287
+#: diff.c:5390 diff.c:5393
 msgid "generate diffs with <n> lines context"
-msgstr "Erstelle Unterschiede mit <n> Zeilen des Kontextes"
+msgstr "Unterschiede mit <n> Zeilen des Kontextes erstellen"
 
-#: diff.c:5289
+#: diff.c:5395
 msgid "generate the diff in raw format"
-msgstr "Erstelle Unterschiede im Rohformat"
+msgstr "Unterschiede im Rohformat erstellen"
 
-#: diff.c:5292
+#: diff.c:5398
 msgid "synonym for '-p --raw'"
 msgstr "Synonym für '-p --raw'"
 
-#: diff.c:5296
+#: diff.c:5402
 msgid "synonym for '-p --stat'"
 msgstr "Synonym für '-p --stat'"
 
-#: diff.c:5300
+#: diff.c:5406
 msgid "machine friendly --stat"
 msgstr "maschinenlesbare Ausgabe von --stat"
 
-#: diff.c:5303
+#: diff.c:5409
 msgid "output only the last line of --stat"
 msgstr "nur die letzte Zeile von --stat ausgeben"
 
-#: diff.c:5305 diff.c:5313
+#: diff.c:5411 diff.c:5419
 msgid "<param1,param2>..."
 msgstr "<Parameter1,Parameter2>..."
 
-#: diff.c:5306
+#: diff.c:5412
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
-"Gebe die Verteilung des relativen Umfangs der Änderungen für jedes "
-"Unterverzeichnis aus"
+"die Verteilung des relativen Umfangs der Änderungen für jedes "
+"Unterverzeichnis ausgeben"
 
-#: diff.c:5310
+#: diff.c:5416
 msgid "synonym for --dirstat=cumulative"
 msgstr "Synonym für --dirstat=cumulative"
 
-#: diff.c:5314
+#: diff.c:5420
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "Synonym für --dirstat=files,Parameter1,Parameter2..."
 
-#: diff.c:5318
+#: diff.c:5424
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
-"Warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
+"warnen, wenn Änderungen Konfliktmarker oder Whitespace-Fehler einbringen"
 
-#: diff.c:5321
+#: diff.c:5427
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
-"Gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
+"gekürzte Zusammenfassung, wie z.B. Erstellungen, Umbenennungen und "
 "Änderungen der Datei-Rechte"
 
-#: diff.c:5324
+#: diff.c:5430
 msgid "show only names of changed files"
 msgstr "nur Dateinamen der geänderten Dateien anzeigen"
 
-#: diff.c:5327
+#: diff.c:5433
 msgid "show only names and status of changed files"
 msgstr "nur Dateinamen und Status der geänderten Dateien anzeigen"
 
-#: diff.c:5329
+#: diff.c:5435
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<Breite>[,<Namens-Breite>[,<Anzahl>]]"
 
-#: diff.c:5330
+#: diff.c:5436
 msgid "generate diffstat"
-msgstr "Generiere Zusammenfassung der Unterschiede"
+msgstr "Zusammenfassung der Unterschiede erzeugen"
 
-#: diff.c:5332 diff.c:5335 diff.c:5338
+#: diff.c:5438 diff.c:5441 diff.c:5444
 msgid "<width>"
 msgstr "<Breite>"
 
-#: diff.c:5333
+#: diff.c:5439
 msgid "generate diffstat with a given width"
-msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Breite"
+msgstr "Zusammenfassung der Unterschiede mit gegebener Breite erzeugen"
 
-#: diff.c:5336
+#: diff.c:5442
 msgid "generate diffstat with a given name width"
-msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Namens-Breite"
+msgstr "Zusammenfassung der Unterschiede mit gegebener Namens-Breite erzeugen"
 
-#: diff.c:5339
+#: diff.c:5445
 msgid "generate diffstat with a given graph width"
-msgstr "Erzeuge Zusammenfassung der Unterschiede mit gegebener Graph-Breite"
+msgstr "Zusammenfassung der Unterschiede mit gegebener Graph-Breite erzeugen"
 
-#: diff.c:5341
+#: diff.c:5447
 msgid "<count>"
 msgstr "<Anzahl>"
 
-#: diff.c:5342
+#: diff.c:5448
 msgid "generate diffstat with limited lines"
-msgstr "Erzeuge Zusammenfassung der Unterschiede mit begrenzten Zeilen"
+msgstr "Zusammenfassung der Unterschiede mit begrenzten Zeilen erzeugen"
 
-#: diff.c:5345
+#: diff.c:5451
 msgid "generate compact summary in diffstat"
-msgstr "Erzeuge kompakte Zusammenstellung in Zusammenfassung der Unterschiede"
+msgstr "kompakte Zusammenstellung in Zusammenfassung der Unterschiede erzeugen"
 
-#: diff.c:5348
+#: diff.c:5454
 msgid "output a binary diff that can be applied"
-msgstr "Gebe eine binäre Differenz aus, dass angewendet werden kann"
+msgstr "eine binäre Differenz ausgeben, dass angewendet werden kann"
 
-#: diff.c:5351
+#: diff.c:5457
 msgid "show full pre- and post-image object names on the \"index\" lines"
-msgstr "Zeige vollständige Objekt-Namen in den \"index\"-Zeilen"
+msgstr "vollständige Objekt-Namen in den \"index\"-Zeilen anzeigen"
 
-#: diff.c:5353
+#: diff.c:5459
 msgid "show colored diff"
-msgstr "Zeige farbige Unterschiede"
+msgstr "farbige Unterschiede anzeigen"
 
-#: diff.c:5354
+#: diff.c:5460
 msgid "<kind>"
 msgstr "<Art>"
 
-#: diff.c:5355
+#: diff.c:5461
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
-"Hebe Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
-"Unterschieden hervor"
+"Whitespace-Fehler in den Zeilen 'context', 'old' oder 'new' bei den "
+"Unterschieden hervorheben"
 
-#: diff.c:5358
+#: diff.c:5464
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgstr ""
-"Verschleiere nicht die Pfadnamen und nutze NUL-Zeichen als Schlusszeichen in "
-"Ausgabefeldern bei --raw oder --numstat"
+"die Pfadnamen nicht verschleiern und NUL-Zeichen als Schlusszeichen in "
+"Ausgabefeldern bei --raw oder --numstat nutzen"
 
-#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
 msgid "<prefix>"
 msgstr "<Präfix>"
 
-#: diff.c:5362
+#: diff.c:5468
 msgid "show the given source prefix instead of \"a/\""
-msgstr "Zeige den gegebenen Quell-Präfix statt \"a/\""
+msgstr "den gegebenen Quell-Präfix statt \"a/\" anzeigen"
 
-#: diff.c:5365
+#: diff.c:5471
 msgid "show the given destination prefix instead of \"b/\""
-msgstr "Zeige den gegebenen Ziel-Präfix statt \"b/\""
+msgstr "den gegebenen Ziel-Präfix statt \"b/\" anzeigen"
 
-#: diff.c:5368
+#: diff.c:5474
 msgid "prepend an additional prefix to every line of output"
-msgstr "Stelle einen zusätzlichen Präfix bei jeder Ausgabezeile voran"
+msgstr "einen zusätzlichen Präfix bei jeder Ausgabezeile voranstellen"
 
-#: diff.c:5371
+#: diff.c:5477
 msgid "do not show any source or destination prefix"
-msgstr "Zeige keine Quell- oder Ziel-Präfixe an"
+msgstr "keine Quell- oder Ziel-Präfixe anzeigen"
 
-#: diff.c:5374
+#: diff.c:5480
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
-"Zeige Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von "
-"Zeilen."
+"Kontext zwischen Unterschied-Blöcken bis zur angegebenen Anzahl von Zeilen "
+"anzeigen"
 
-#: diff.c:5378 diff.c:5383 diff.c:5388
+#: diff.c:5484 diff.c:5489 diff.c:5494
 msgid "<char>"
 msgstr "<Zeichen>"
 
-#: diff.c:5379
+#: diff.c:5485
 msgid "specify the character to indicate a new line instead of '+'"
-msgstr "Das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
+msgstr "das Zeichen festlegen, das eine neue Zeile kennzeichnet (statt '+')"
 
-#: diff.c:5384
+#: diff.c:5490
 msgid "specify the character to indicate an old line instead of '-'"
-msgstr "Das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
+msgstr "das Zeichen festlegen, das eine alte Zeile kennzeichnet (statt '-')"
 
-#: diff.c:5389
+#: diff.c:5495
 msgid "specify the character to indicate a context instead of ' '"
-msgstr "Das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
+msgstr "das Zeichen festlegen, das den Kontext kennzeichnet (statt ' ')"
 
-#: diff.c:5392
+#: diff.c:5498
 msgid "Diff rename options"
 msgstr "Diff-Optionen zur Umbenennung"
 
-#: diff.c:5393
+#: diff.c:5499
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5394
+#: diff.c:5500
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
-"Teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
+"teile komplette Rewrite-Änderungen in Änderungen mit \"löschen\" und "
 "\"erstellen\""
 
-#: diff.c:5398
+#: diff.c:5504
 msgid "detect renames"
 msgstr "Umbenennungen erkennen"
 
-#: diff.c:5402
+#: diff.c:5508
 msgid "omit the preimage for deletes"
-msgstr "Preimage für Löschungen weglassen."
+msgstr "Preimage für Löschungen weglassen"
 
-#: diff.c:5405
+#: diff.c:5511
 msgid "detect copies"
 msgstr "Kopien erkennen"
 
-#: diff.c:5409
+#: diff.c:5515
 msgid "use unmodified files as source to find copies"
-msgstr "Nutze ungeänderte Dateien als Quelle zum Finden von Kopien"
+msgstr "ungeänderte Dateien als Quelle zum Finden von Kopien nutzen"
 
-#: diff.c:5411
+#: diff.c:5517
 msgid "disable rename detection"
 msgstr "Erkennung von Umbenennungen deaktivieren"
 
-#: diff.c:5414
+#: diff.c:5520
 msgid "use empty blobs as rename source"
-msgstr "Nutze leere Blobs als Quelle von Umbennungen"
+msgstr "leere Blobs als Quelle von Umbenennungen nutzen"
 
-#: diff.c:5416
+#: diff.c:5522
 msgid "continue listing the history of a file beyond renames"
-msgstr "Fortführen der Auflistung der Historie einer Datei nach Umbennung"
+msgstr "Auflistung der Historie einer Datei nach Umbenennung fortführen"
 
-#: diff.c:5419
+#: diff.c:5525
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
-"Verhindere die Erkennung von Umbennungen und Kopien, wenn die Anzahl der "
-"Ziele für Umbennungen und Kopien das gegebene Limit überschreitet"
+"Erkennung von Umbenennungen und Kopien verhindern, wenn die Anzahl der Ziele "
+"für Umbenennungen und Kopien das gegebene Limit überschreitet"
 
-#: diff.c:5421
+#: diff.c:5527
 msgid "Diff algorithm options"
 msgstr "Diff Algorithmus-Optionen"
 
-#: diff.c:5423
+#: diff.c:5529
 msgid "produce the smallest possible diff"
-msgstr "Erzeuge die kleinstmöglichen Änderungen"
+msgstr "die kleinstmöglichen Änderungen erzeugen"
 
-#: diff.c:5426
+#: diff.c:5532
 msgid "ignore whitespace when comparing lines"
 msgstr "Whitespace-Änderungen beim Vergleich von Zeilen ignorieren"
 
-#: diff.c:5429
+#: diff.c:5535
 msgid "ignore changes in amount of whitespace"
 msgstr "Änderungen bei der Anzahl von Whitespace ignorieren"
 
-#: diff.c:5432
+#: diff.c:5538
 msgid "ignore changes in whitespace at EOL"
 msgstr "Whitespace-Änderungen am Zeilenende ignorieren"
 
-#: diff.c:5435
+#: diff.c:5541
 msgid "ignore carrier-return at the end of line"
-msgstr "Ignoriere den Zeilenumbruch am Ende der Zeile"
+msgstr "den Zeilenumbruch am Ende der Zeile ignorieren"
 
-#: diff.c:5438
+#: diff.c:5544
 msgid "ignore changes whose lines are all blank"
-msgstr "Ignoriere Änderungen in leeren Zeilen"
+msgstr "Änderungen in leeren Zeilen ignorieren"
+
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr "<Regex>"
 
-#: diff.c:5441
+#: diff.c:5547
+msgid "ignore changes whose all lines match <regex>"
+msgstr ""
+"Änderungen ignorieren, bei denen alle Zeilen mit <Regex> übereinstimmen"
+
+#: diff.c:5550
 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:5444
+#: diff.c:5553
 msgid "generate diff using the \"patience diff\" algorithm"
-msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Patience Diff\""
+msgstr "Änderungen durch Nutzung des Algorithmus \"Patience Diff\" erzeugen"
 
-#: diff.c:5448
+#: diff.c:5557
 msgid "generate diff using the \"histogram diff\" algorithm"
-msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Histogram Diff\""
+msgstr "Änderungen durch Nutzung des Algorithmus \"Histogram Diff\" erzeugen"
 
-#: diff.c:5450
+#: diff.c:5559
 msgid "<algorithm>"
 msgstr "<Algorithmus>"
 
-#: diff.c:5451
+#: diff.c:5560
 msgid "choose a diff algorithm"
-msgstr "Ein Algorithmus für Änderungen wählen"
+msgstr "einen Algorithmus für Änderungen wählen"
 
-#: diff.c:5453
+#: diff.c:5562
 msgid "<text>"
 msgstr "<Text>"
 
-#: diff.c:5454
+#: diff.c:5563
 msgid "generate diff using the \"anchored diff\" algorithm"
-msgstr "Erzeuge Änderungen durch Nutzung des Algorithmus \"Anchored Diff\""
+msgstr "Änderungen durch Nutzung des Algorithmus \"Anchored Diff\" erzeugen"
 
-#: diff.c:5456 diff.c:5465 diff.c:5468
+#: diff.c:5565 diff.c:5574 diff.c:5577
 msgid "<mode>"
 msgstr "<Modus>"
 
-#: diff.c:5457
+#: diff.c:5566
 msgid "show word diff, using <mode> to delimit changed words"
-msgstr "Zeige Wort-Änderungen, nutze <Modus>, um Wörter abzugrenzen"
+msgstr "Wort-Änderungen zeigen, nutze <Modus>, um Wörter abzugrenzen"
 
-#: diff.c:5459 diff.c:5462 diff.c:5507
-msgid "<regex>"
-msgstr "<Regex>"
-
-#: diff.c:5460
+#: diff.c:5569
 msgid "use <regex> to decide what a word is"
-msgstr "Nutze <Regex>, um zu entscheiden, was ein Wort ist"
+msgstr "<Regex> nutzen, um zu entscheiden, was ein Wort ist"
 
-#: diff.c:5463
+#: diff.c:5572
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
-msgstr "Entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
+msgstr "entsprechend wie --word-diff=color --word-diff-regex=<Regex>"
 
-#: diff.c:5466
+#: diff.c:5575
 msgid "moved lines of code are colored differently"
-msgstr "Verschobene Codezeilen sind andersfarbig"
+msgstr "verschobene Codezeilen sind andersfarbig"
 
-#: diff.c:5469
+#: diff.c:5578
 msgid "how white spaces are ignored in --color-moved"
-msgstr "Wie Whitespaces in --color-moved ignoriert werden"
+msgstr "wie Whitespaces in --color-moved ignoriert werden"
 
-#: diff.c:5472
+#: diff.c:5581
 msgid "Other diff options"
 msgstr "Andere Diff-Optionen"
 
-#: diff.c:5474
+#: diff.c:5583
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
-"Wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und "
+"wenn vom Unterverzeichnis aufgerufen, schließe Änderungen außerhalb aus und "
 "zeige relative Pfade an"
 
-#: diff.c:5478
+#: diff.c:5587
 msgid "treat all files as text"
 msgstr "alle Dateien als Text behandeln"
 
-#: diff.c:5480
+#: diff.c:5589
 msgid "swap two inputs, reverse the diff"
-msgstr "Vertausche die beiden Eingaben und drehe die Änderungen um"
+msgstr "die beiden Eingaben vertauschen und die Änderungen umkehren"
 
-#: diff.c:5482
+#: diff.c:5591
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
-"Beende mit Exit-Status 1, wenn Änderungen vorhanden sind, andernfalls mit 0"
+"mit Exit-Status 1 beenden, wenn Änderungen vorhanden sind, andernfalls mit 0"
 
-#: diff.c:5484
+#: diff.c:5593
 msgid "disable all output of the program"
-msgstr "Keine Ausgaben vom Programm"
+msgstr "alle Ausgaben vom Programm deaktivieren"
 
-#: diff.c:5486
+#: diff.c:5595
 msgid "allow an external diff helper to be executed"
-msgstr "Erlaube die Ausführung eines externes Programms für Änderungen"
+msgstr "erlaube die Ausführung eines externes Programms für Änderungen"
 
-#: diff.c:5488
+#: diff.c:5597
 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:5490
+#: diff.c:5599
 msgid "<when>"
 msgstr "<wann>"
 
-#: diff.c:5491
+#: diff.c:5600
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 "Änderungen in Submodulen während der Erstellung der Unterschiede ignorieren"
 
-#: diff.c:5494
+#: diff.c:5603
 msgid "<format>"
 msgstr "<Format>"
 
-#: diff.c:5495
+#: diff.c:5604
 msgid "specify how differences in submodules are shown"
-msgstr "Angeben, wie Unterschiede in Submodulen gezeigt werden"
+msgstr "angeben, wie Unterschiede in Submodulen gezeigt werden"
 
-#: diff.c:5499
+#: diff.c:5608
 msgid "hide 'git add -N' entries from the index"
-msgstr "verstecke 'git add -N' Einträge vom Index"
+msgstr "'git add -N' Einträge vom Index verstecken"
 
-#: diff.c:5502
+#: diff.c:5611
 msgid "treat 'git add -N' entries as real in the index"
-msgstr "Behandle 'git add -N' Einträge im Index als echt"
+msgstr "'git add -N' Einträge im Index als echt behandeln"
 
-#: diff.c:5504
+#: diff.c:5613
 msgid "<string>"
 msgstr "<Zeichenkette>"
 
-#: diff.c:5505
+#: diff.c:5614
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr ""
-"Suche nach Unterschieden, welche die Anzahl des Vorkommens der angegebenen "
+"nach Unterschieden suchen, welche die Anzahl des Vorkommens der angegebenen "
 "Zeichenkette verändern"
 
-#: diff.c:5508
+#: diff.c:5617
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr ""
-"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
+"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
 "regulären Ausdrucks verändern"
 
-#: diff.c:5511
+#: diff.c:5620
 msgid "show all changes in the changeset with -S or -G"
-msgstr "zeige alle Änderungen im Changeset mit -S oder -G"
+msgstr "alle Änderungen im Changeset mit -S oder -G anzeigen"
 
-#: diff.c:5514
+#: diff.c:5623
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
-"behandle <Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck"
+"<Zeichenkette> bei -S als erweiterten POSIX regulären Ausdruck behandeln"
 
-#: diff.c:5517
+#: diff.c:5626
 msgid "control the order in which files appear in the output"
 msgstr ""
-"kontrolliere die Reihenfolge, in der die Dateien in der Ausgabe erscheinen"
+"die Reihenfolge kontrollieren, in der die Dateien in der Ausgabe erscheinen"
+
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr "<Pfad>"
 
-#: diff.c:5518
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr "die Änderung des angegebenen Pfades zuerst anzeigen"
+
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr "überspringe die Ausgabe bis zum angegebenen Pfad"
+
+#: diff.c:5633
 msgid "<object-id>"
 msgstr "<Objekt-ID>"
 
-#: diff.c:5519
+#: diff.c:5634
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr ""
-"Suche nach Unterschieden, welche die Anzahl des Vorkommens des angegebenen "
+"nach Unterschieden suchen, welche die Anzahl des Vorkommens des angegebenen "
 "Objektes verändern"
 
-#: diff.c:5521
+#: diff.c:5636
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5522
+#: diff.c:5637
 msgid "select files by diff type"
-msgstr "Wähle Dateien anhand der Art der Änderung"
+msgstr "Dateien anhand der Art der Änderung wählen"
 
-#: diff.c:5524
+#: diff.c:5639
 msgid "<file>"
 msgstr "<Datei>"
 
-#: diff.c:5525
+#: diff.c:5640
 msgid "Output to a specific file"
 msgstr "Ausgabe zu einer bestimmten Datei"
 
-#: diff.c:6180
-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 ""
-"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:6183
+#: diff.c:6301
 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:6186
+#: diff.c:6304
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3072,339 +4007,405 @@ msgstr ""
 "Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
 "erneut versuchen."
 
-#: dir.c:549
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'"
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr "Führe Erkennung für ungenaue Umbenennung aus"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Pfad '%s' nicht im Diff gefunden"
+
+#: 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"
+
+#: dir.c:733 dir.c:762 dir.c:775
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "unbekanntes Muster: '%s'"
+
+#: dir.c:790 dir.c:804
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "unbekanntes verneinendes Muster: '%s'"
+
+#: dir.c:820
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
-"Pfadspezifikation '%s' stimmt mit keinen git-bekannten Dateien überein."
+"Ihre Datei für den partiellen Checkout hat eventuell Probleme:\n"
+"Muster '%s' wiederholt sich."
+
+#: dir.c:830
+msgid "disabling cone pattern matching"
+msgstr "deaktiviere Cone-Muster-Ãœbereinstimmung"
 
-#: dir.c:938
+#: dir.c:1214
 #, c-format
 msgid "cannot use %s as an exclude file"
-msgstr "Kann %s nicht als exclude-Filter benutzen."
+msgstr "kann %s nicht als exclude-Filter benutzen"
 
-#: dir.c:1877
+#: dir.c:2351
 #, c-format
 msgid "could not open directory '%s'"
-msgstr "Konnte Verzeichnis '%s' nicht öffnen."
+msgstr "konnte Verzeichnis '%s' nicht öffnen"
 
-#: dir.c:2128
+#: dir.c:2653
 msgid "failed to get kernel name and information"
 msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
 
-#: dir.c:2252
+#: dir.c:2777
 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."
+"für dieses Verzeichnis deaktiviert"
 
-#: dir.c:3056
+#: dir.c:3610
 #, c-format
 msgid "index file corrupt in repo %s"
-msgstr "Index-Datei in Repository %s beschädigt."
+msgstr "Index-Datei in Repository %s beschädigt"
 
-#: dir.c:3101 dir.c:3106
+#: dir.c:3657 dir.c:3662
 #, c-format
 msgid "could not create directories for %s"
-msgstr "Konnte Verzeichnisse für '%s' nicht erstellen."
+msgstr "Konnte Verzeichnisse für '%s' nicht erstellen"
 
-#: dir.c:3135
+#: dir.c:3691
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren."
+msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren"
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "Hinweis: Warte auf das Schließen der Datei durch Ihren Editor...%c"
 
-#: entry.c:178
+#: entry.c:176
 msgid "Filtering content"
 msgstr "Filtere Inhalt"
 
-#: entry.c:476
+#: entry.c:497
 #, c-format
 msgid "could not stat file '%s'"
-msgstr "Konnte Datei '%s' nicht lesen."
+msgstr "konnte Datei '%s' nicht lesen"
 
-#: environment.c:148
+#: environment.c:152
 #, c-format
 msgid "bad git namespace path \"%s\""
-msgstr "Ungültiger Git-Namespace-Pfad \"%s\""
+msgstr "ungültiger Git-Namespace-Pfad \"%s\""
 
-#: environment.c:330
+#: environment.c:334
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
-msgstr "Konnte GIT_DIR nicht zu '%s' setzen."
+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."
+msgstr "zu viele Argumente angegeben, um %s auszuführen"
 
-#: fetch-pack.c:150
+#: fetch-pack.c:182
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: erwartete shallow-Liste"
 
-#: fetch-pack.c:153
+#: fetch-pack.c:185
 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:164
+#: fetch-pack.c:196
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: ACK/NAK erwartet, Flush-Paket bekommen"
 
-#: fetch-pack.c:184
+#: fetch-pack.c:216
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
 
-#: fetch-pack.c:195
+#: fetch-pack.c:227
 msgid "unable to write to remote"
 msgstr "konnte nicht zum Remote schreiben"
 
-#: fetch-pack.c:257
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc benötigt multi_ack_detailed"
 
-#: fetch-pack.c:356 fetch-pack.c:1280
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, c-format
 msgid "invalid shallow line: %s"
-msgstr "Ungültige shallow-Zeile: %s"
+msgstr "ungültige shallow-Zeile: %s"
 
-#: fetch-pack.c:362 fetch-pack.c:1286
+#: fetch-pack.c:389 fetch-pack.c:1429
 #, c-format
 msgid "invalid unshallow line: %s"
-msgstr "Ungültige unshallow-Zeile: %s"
+msgstr "ungültige unshallow-Zeile: %s"
 
-#: fetch-pack.c:364 fetch-pack.c:1288
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
 msgstr "Objekt nicht gefunden: %s"
 
-#: fetch-pack.c:367 fetch-pack.c:1291
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
 msgstr "Fehler in Objekt: %s"
 
-#: fetch-pack.c:369 fetch-pack.c:1293
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
-msgstr "Kein shallow-Objekt gefunden: %s"
+msgstr "kein shallow-Objekt gefunden: %s"
 
-#: fetch-pack.c:372 fetch-pack.c:1297
+#: fetch-pack.c:399 fetch-pack.c:1440
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "shallow/unshallow erwartet, %s bekommen"
 
-#: fetch-pack.c:414
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr "%s %d %s bekommen"
 
-#: fetch-pack.c:431
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
-msgstr "Ungültiger Commit %s"
+msgstr "ungültiger Commit %s"
 
-#: fetch-pack.c:462
+#: fetch-pack.c:487
 msgid "giving up"
-msgstr "Gebe auf"
+msgstr "gebe auf"
 
-#: fetch-pack.c:475 progress.c:312
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
-msgstr "Fertig"
+msgstr "fertig"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s (%d) %s bekommen"
 
-#: fetch-pack.c:533
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markiere %s als vollständig"
 
-#: fetch-pack.c:742
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr "habe %s (%s) bereits"
 
-#: fetch-pack.c:781
+#: fetch-pack.c:849
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
 
-#: fetch-pack.c:789
+#: fetch-pack.c:857
 msgid "protocol error: bad pack header"
 msgstr "Protokollfehler: ungültiger Pack-Header"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:951
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: konnte %s nicht starten"
 
-#: fetch-pack.c:873
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: ungültige index-pack Ausgabe"
+
+#: fetch-pack.c:974
 #, c-format
 msgid "%s failed"
 msgstr "%s fehlgeschlagen"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
 msgstr "Fehler in sideband demultiplexer"
 
-#: fetch-pack.c:907
+#: fetch-pack.c:1019
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Server-Version ist %.*s"
 
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
+#: 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 "Server unterstützt %s"
 
-#: fetch-pack.c:914
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
 msgstr "Server unterstützt keine shallow-Clients"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:1089
 msgid "Server does not support --shallow-since"
 msgstr "Server unterstützt kein --shallow-since"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1094
 msgid "Server does not support --shallow-exclude"
 msgstr "Server unterstützt kein --shallow-exclude"
 
-#: fetch-pack.c:983
+#: fetch-pack.c:1098
 msgid "Server does not support --deepen"
 msgstr "Server unterstützt kein --deepen"
 
-#: fetch-pack.c:1000
+#: fetch-pack.c:1100
+msgid "Server does not support this repository's object format"
+msgstr "Server unterstützt das Objekt-Format dieses Repositories nicht"
+
+#: fetch-pack.c:1113
 msgid "no common commits"
 msgstr "keine gemeinsamen Commits"
 
-#: fetch-pack.c:1012 fetch-pack.c:1468
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+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:1660
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: Abholen fehlgeschlagen."
 
-#: fetch-pack.c:1150
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "Algorithmen stimmen nicht überein: Client %s; Server %s"
+
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "der Server unterstützt Algorithmus '%s' nicht"
+
+#: fetch-pack.c:1279
 msgid "Server does not support shallow requests"
-msgstr "Server unterstützt keine shallow-Anfragen."
+msgstr "Server unterstützt keine shallow-Anfragen"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1286
 msgid "Server supports filter"
 msgstr "Server unterstützt Filter"
 
-#: fetch-pack.c:1180
+#: fetch-pack.c:1329 fetch-pack.c:2043
 msgid "unable to write request to remote"
 msgstr "konnte Anfrage nicht zum Remote schreiben"
 
-#: fetch-pack.c:1198
+#: fetch-pack.c:1347
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "Fehler beim Lesen von Sektionskopf '%s'."
 
-#: fetch-pack.c:1204
+#: fetch-pack.c:1353
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' erwartet, '%s' empfangen"
 
-#: fetch-pack.c:1243
+#: fetch-pack.c:1387
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "Unerwartete Acknowledgment-Zeile: '%s'"
 
-#: fetch-pack.c:1248
+#: fetch-pack.c:1392
 #, c-format
 msgid "error processing acks: %d"
 msgstr "Fehler beim Verarbeiten von ACKS: %d"
 
-#: fetch-pack.c:1258
+#: fetch-pack.c:1402
 msgid "expected packfile to be sent after 'ready'"
 msgstr "Erwartete Versand einer Packdatei nach 'ready'."
 
-#: fetch-pack.c:1260
+#: fetch-pack.c:1404
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "Erwartete keinen Versand einer anderen Sektion ohne 'ready'."
 
-#: fetch-pack.c:1302
+#: fetch-pack.c:1445
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "Fehler beim Verarbeiten von Shallow-Informationen: %d"
 
-#: fetch-pack.c:1349
+#: fetch-pack.c:1494
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref erwartet, '%s' bekommen"
 
-#: fetch-pack.c:1354
+#: fetch-pack.c:1499
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
-msgstr "Unerwartetes wanted-ref: '%s'"
+msgstr "unerwartetes wanted-ref: '%s'"
 
-#: fetch-pack.c:1359
+#: fetch-pack.c:1504
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "Fehler beim Verarbeiten von wanted-refs: %d"
 
-#: fetch-pack.c:1693
+#: fetch-pack.c:1534
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: Antwort-Endpaket erwartet"
+
+#: fetch-pack.c:1939
 msgid "no matching remote head"
 msgstr "kein übereinstimmender Remote-Branch"
 
-#: fetch-pack.c:1716 builtin/clone.c:685
+#: fetch-pack.c:1962 builtin/clone.c:697
 msgid "remote did not send all necessary objects"
-msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
+msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet"
+
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr "unerwartetes 'ready' von Remote-Repository"
 
-#: fetch-pack.c:1743
+#: fetch-pack.c:2088
 #, c-format
 msgid "no such remote ref %s"
-msgstr "keine solche Remote-Referenz %s"
+msgstr "Remote-Referenz %s nicht gefunden"
 
-#: fetch-pack.c:1746
+#: fetch-pack.c:2091
 #, 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:321
-msgid "gpg failed to sign the data"
-msgstr "gpg beim Signieren der Daten fehlgeschlagen"
-
-#: gpg-interface.c:347
+#: gpg-interface.c:273
 msgid "could not create temporary file"
 msgstr "konnte temporäre Datei nicht erstellen"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
 
-#: graph.c:97
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg beim Signieren der Daten fehlgeschlagen"
+
+#: 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:668
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
 msgstr ""
-"Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -P"
-"unter PCRE v2 unterstützt."
+"Angegebenes Muster enthält NULL Byte (über -f <Datei>). Das wird nur mit -"
+"Punter PCRE v2 unterstützt."
 
-#: grep.c:2124
+#: grep.c:1895
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': konnte %s nicht lesen"
 
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
-#: 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 "Konnte '%s' nicht lesen"
 
-#: grep.c:2152
+#: grep.c:1923
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': read() zu kurz"
@@ -3454,50 +4455,50 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Systembefehle / Abfragen"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Systembefehle / Repositories synchronisieren"
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Systembefehle / Interne Hilfsbefehle"
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "Vorhandene Git-Befehle in '%s'"
 
-#: help.c:305
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "Vorhandene Git-Befehle anderswo in Ihrem $PATH"
 
-#: help.c:314
+#: help.c:316
 msgid "These are common Git commands used in various situations:"
 msgstr "Allgemeine Git-Befehle, verwendet in verschiedenen Situationen:"
 
-#: help.c:363 git.c:98
+#: help.c:365 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "Nicht unterstützte Art zur Befehlsauflistung '%s'."
 
-#: help.c:403
-msgid "The common Git guides are:"
-msgstr "Die allgemeinen Git-Anleitungen sind:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Die Git-Konzeptanleitungen sind:"
 
-#: help.c:512
+#: help.c:429
 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:517
+#: help.c:434
 msgid "External commands"
 msgstr "Externe Befehle"
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr "Alias-Befehle"
 
-#: help.c:596
+#: help.c:527
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -3506,32 +4507,32 @@ msgstr ""
 "'%s' scheint ein git-Befehl zu sein, konnte aber\n"
 "nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?"
 
-#: help.c:655
+#: help.c:543 help.c:631
+#, 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
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Uh oh. Keine Git-Befehle auf Ihrem System vorhanden."
 
-#: help.c:677
+#: help.c:613
 #, 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:682
+#: help.c:618
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Setze fort unter der Annahme, dass Sie '%s' meinten."
 
-#: help.c:687
+#: help.c:623
 #, 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:695
-#, 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:699
+#: help.c:635
 msgid ""
 "\n"
 "The most similar command is"
@@ -3545,16 +4546,16 @@ msgstr[1] ""
 "\n"
 "Die ähnlichsten Befehle sind"
 
-#: help.c:714
+#: help.c:675
 msgid "git version [<options>]"
 msgstr "git version [<Optionen>]"
 
-#: help.c:783
+#: help.c:730
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:787
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3568,7 +4569,15 @@ msgstr[1] ""
 "\n"
 "Haben Sie eines von diesen gemeint?"
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Identität des Autors unbekannt\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Identität des Commit-Erstellers unbekannt\n"
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3594,92 +4603,103 @@ msgstr ""
 "Lassen Sie die Option \"--global\" weg, um die Identität nur\n"
 "für dieses Repository zu setzen.\n"
 
-#: ident.c:379
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
 msgstr "keine E-Mail angegeben und automatische Erkennung ist deaktiviert"
 
-#: ident.c:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "Konnte die E-Mail-Adresse nicht automatisch erkennen ('%s' erhalten)"
 
-#: ident.c:401
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
 msgstr "kein Name angegeben und automatische Erkennung ist deaktiviert"
 
-#: ident.c:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "konnte Namen nicht automatisch erkennen ('%s' erhalten)"
 
-#: ident.c:415
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "Leerer Name in Identifikation (für <%s>) nicht erlaubt."
 
-#: ident.c:421
+#: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:454 builtin/commit.c:647
 #, c-format
 msgid "invalid date format: %s"
 msgstr "Ungültiges Datumsformat: %s"
 
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr ""
-"Eintrag '%s' im Tree-Objekt %s hat Tree-Modus, aber ist kein Tree-Objekt"
-
-#: list-objects.c:140
-#, c-format
-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:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden."
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "konnte nicht auf partiellen Blob '%s' zugreifen"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "Konnte partielle Filter-Daten in %s nicht parsen."
-
-#: list-objects-filter-options.c:58
+#: list-objects-filter-options.c:83
 msgid "expected 'tree:<depth>'"
 msgstr "'tree:<Tiefe>' erwartet"
 
-#: list-objects-filter-options.c:73
+#: list-objects-filter-options.c:98
 msgid "sparse:path filters support has been dropped"
 msgstr "Keine Unterstützung für sparse:path Filter mehr"
 
-#: list-objects-filter-options.c:86
+#: list-objects-filter-options.c:105
+#, c-format
+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
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "Ungültige filter-spec '%s'"
 
-#: list-objects-filter-options.c:102
+#: list-objects-filter-options.c:140
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
 msgstr "Zeichen in sub-filter-spec muss maskiert werden: '%c'"
 
-#: list-objects-filter-options.c:144
+#: list-objects-filter-options.c:182
 msgid "expected something after combine:"
 msgstr "erwartete etwas nach 'combine:'"
 
-#: list-objects-filter-options.c:226
+#: list-objects-filter-options.c:264
 msgid "multiple filter-specs cannot be combined"
-msgstr "Mehrere filter-specs können nicht kombiniert werden."
+msgstr "mehrere filter-specs können nicht kombiniert werden"
+
+#: list-objects-filter-options.c:376
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"Repository-Format konnte nicht erweitert werden, um partielles Klonen zu "
+"unterstützen"
 
-#: lockfile.c:151
+#: list-objects-filter.c:532
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "konnte nicht auf partiellen Blob '%s' zugreifen"
+
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "konnte partielle Filter-Daten in %s nicht parsen"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+"Eintrag '%s' im Tree-Objekt %s hat Tree-Modus, aber ist kein Tree-Objekt"
+
+#: list-objects.c:140
+#, c-format
+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:398
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "Konnte Root-Tree-Objekt für Commit %s nicht laden."
+
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3699,166 +4719,403 @@ msgstr ""
 "ein früherer Git-Prozess in diesem Repository abgestürzt sein:\n"
 "Löschen Sie die Datei manuell um fortzufahren."
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Konnte '%s.lock' nicht erstellen: %s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "ungültiger Wert '%s' für lsrefs.unborn"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "Konnte neue Index-Datei nicht schreiben."
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "erwartete Flush nach Argumenten für die Auflistung der Referenzen"
+
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "angeführtes CRLF entdeckt"
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "ungültige Aktion '%s' für '%s'"
+
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
+
+#: merge-ort.c:1578 merge-recursive.c:1208
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
+
+#: merge-ort.c:1587 merge-recursive.c:1215
+#, 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:1597 merge-ort.c:1604
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Hinweis: Spule Submodul %s vor zu %s"
+
+#: merge-ort.c:1625
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Fehler beim Zusammenführen von Submodul %s"
+
+#: merge-ort.c:1632
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Fehler beim Zusammenführen von Submodul %s, aber es ist eine mögliche "
+"Auflösung des Merges vorhanden:\n"
+"%s\n"
 
-#: merge-recursive.c:367
+#: 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 ""
+"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel "
+"mit:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"hinzu, um diesen Vorschlag zu akzeptieren.\n"
+
+#: merge-ort.c:1649
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Fehler beim Zusammenführen von Submodul %s, aber mehrere mögliche Merges "
+"sind vorhanden:\n"
+"%s"
+
+#: merge-ort.c:1868 merge-recursive.c:1358
+msgid "Failed to execute internal merge"
+msgstr "Fehler bei Ausführung des internen Merges"
+
+#: merge-ort.c:1873 merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Konnte %s nicht zur Datenbank hinzufügen"
+
+#: merge-ort.c:1880 merge-recursive.c:1396
+#, c-format
+msgid "Auto-merging %s"
+msgstr "automatischer Merge von %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 ""
+"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s "
+"im\n"
+"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
+"Pfade dahin zu setzen: %s."
+
+#: 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 ""
+"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad "
+"zu\n"
+"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
+"zu setzen: %s"
+
+#: 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 ""
+"KONFLIKT (Aufteilung Verzeichnisumbenennung): Unklar, wo %s zu platzieren "
+"ist; es wurde zu mehreren anderen Verzeichnissen umbenannt, ohne dass ein "
+"Ziel die Mehrheit der Dateien erhält."
+
+#: 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 ""
+"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
+"wurde."
+
+#: 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 ""
+"Pfad aktualisiert: %s hinzugefügt in %s innerhalb eines Verzeichnisses, das "
+"umbenannt wurde in %s; Verschiebe es nach %s."
+
+#: 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 ""
+"Pfad aktualisiert: %s umbenannt nach %s in %s, innerhalb eines "
+"Verzeichnisses, das umbenannt wurde in %s; Verschiebe es nach %s."
+
+#: 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 ""
+"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: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 ""
+"KONFLIKT (Speicherort): %s umbenannt nach %s in %s, innerhalb eines "
+"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
+"verschoben werden."
+
+#: merge-ort.c:2569
+#, 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: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 ""
+"KONFLIKT (Umbenennung in Kollision beteiligt): Umbenennung von %s -> %s hat "
+"Inhaltskonflikte UND kollidiert mit einem anderen Pfad; dies kann zu "
+"verschachtelten Konfliktmarkierungen führen."
+
+#: 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 ""
+"KONFLIKT (umbenennen/löschen): %s zu %s in %s umbenannt, aber in %s gelöscht."
+
+#: merge-ort.c:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
+msgstr "kann Objekt %s nicht lesen"
+
+#: merge-ort.c:3185 merge-recursive.c:3011
+#, c-format
+msgid "object %s is not a blob"
+msgstr "Objekt %s ist kein Blob"
+
+#: merge-ort.c:3613
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"KONFLIKT (Datei/Verzeichnis): Verzeichnis im Weg von %s aus %s; stattdessen "
+"nach %s verschieben."
+
+#: 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 ""
+"KONFLIKT (verschiedene Typen): %s hatte unterschiedliche Typen auf jeder "
+"Seite; beide wurden umbenannt, damit jeder irgendwo aufgezeichnet werden "
+"kann."
+
+#: 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 ""
+"KONFLIKT (verschiedene Typen): %s hatte unterschiedliche Typen auf jeder "
+"Seite; eines der beiden wurde umbenannt, damit jeder irgendwo aufgezeichnet "
+"werden kann."
+
+#: merge-ort.c:3796 merge-recursive.c:3087
+msgid "content"
+msgstr "Inhalt"
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr "hinzufügen/hinzufügen"
+
+#: merge-ort.c:3800 merge-recursive.c:3136
+msgid "submodule"
+msgstr "Submodul"
+
+#: merge-ort.c:3802 merge-recursive.c:3137
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIKT (%s): Merge-Konflikt in %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 ""
+"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:4120
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Hinweis: %s nicht aktuell und konfliktbehaftete Version während des "
+"Auscheckens; alte Kopie zu %s umbenannt"
+
+#. 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 ""
+"Sammeln von Merge-Informationen für die Referenzen %s, %s, %s fehlgeschlagen"
+
+#: 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 ""
+"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
+"überschrieben werden:\n"
+"  %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "Bereits aktuell."
+
+#: merge-recursive.c:352
 msgid "(bad commit)\n"
 msgstr "(ungültiger Commit)\n"
 
-#: merge-recursive.c:390
+#: merge-recursive.c:375
 #, 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:399
+#: merge-recursive.c:384
 #, 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:885
+#: merge-recursive.c:872
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "Fehler beim Erstellen des Pfades '%s'%s"
 
-#: merge-recursive.c:896
+#: merge-recursive.c:883
 #, 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:910 merge-recursive.c:929
+#: merge-recursive.c:897 merge-recursive.c:916
 msgid ": perhaps a D/F conflict?"
 msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
 
-#: merge-recursive.c:919
+#: merge-recursive.c:906
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
 
-#: merge-recursive.c:960 builtin/cat-file.c:41
+#: merge-recursive.c:947 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kann Objekt %s '%s' nicht lesen"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:952
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "Blob erwartet für %s '%s'"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:977
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "Fehler beim Öffnen von '%s': %s"
 
-#: merge-recursive.c:1001
+#: merge-recursive.c:988
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
 
-#: merge-recursive.c:1006
+#: merge-recursive.c:993
 #, 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:1199
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Fehler beim Merge von Submodul %s (nicht ausgecheckt)."
-
-#: merge-recursive.c:1206
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Fehler beim Merge von Submodul %s (Commits nicht vorhanden)."
-
-#: merge-recursive.c:1213
-#, 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-recursive.c:1221 merge-recursive.c:1233
+#: merge-recursive.c:1223 merge-recursive.c:1235
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Spule Submodul %s zu dem folgenden Commit vor:"
 
-#: merge-recursive.c:1224 merge-recursive.c:1236
+#: merge-recursive.c:1226 merge-recursive.c:1238
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Spule Submodul %s vor"
 
-#: merge-recursive.c:1259
+#: merge-recursive.c:1261
 #, 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:1263
+#: merge-recursive.c:1265
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Fehler beim Merge von Submodul %s (kein Vorspulen)"
 
-#: merge-recursive.c:1264
+#: merge-recursive.c:1266
 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:1267
-#, 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 ""
-"Falls das korrekt ist, fügen Sie es einfach der Staging-Area, zum Beispiel "
-"mit:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"hinzu, um diesen Vorschlag zu akzeptieren.\n"
-
-#: merge-recursive.c:1276
+#: merge-recursive.c:1278
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Fehler beim Merge von Submodul %s (mehrere Merges gefunden)"
 
-#: merge-recursive.c:1349
-msgid "Failed to execute internal merge"
-msgstr "Fehler bei Ausführung des internen Merges"
-
-#: merge-recursive.c:1354
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-
-#: merge-recursive.c:1386
-#, c-format
-msgid "Auto-merging %s"
-msgstr "automatischer Merge von %s"
-
-#: merge-recursive.c:1410
+#: merge-recursive.c:1420
 #, 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:1482
+#: merge-recursive.c:1492
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3867,7 +5124,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:1487
+#: merge-recursive.c:1497
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3876,7 +5133,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:1494
+#: merge-recursive.c:1504
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3885,7 +5142,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:1499
+#: merge-recursive.c:1509
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3894,46 +5151,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:1534
+#: merge-recursive.c:1544
 msgid "rename"
 msgstr "umbenennen"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1544
 msgid "renamed"
 msgstr "umbenannt"
 
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Verweigere geänderte Datei bei %s zu verlieren."
 
-#: merge-recursive.c:1624
+#: merge-recursive.c:1605
 #, 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:1682
+#: merge-recursive.c:1663
 #, 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:1713
+#: merge-recursive.c:1694
 #, 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:1718
+#: merge-recursive.c:1699
 #, 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:1737
+#: merge-recursive.c:1726
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3942,18 +5199,18 @@ msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
 "und \"%s\"->\"%s\" in Branch \"%s\"%s"
 
-#: merge-recursive.c:1742
+#: merge-recursive.c:1731
 msgid " (left unresolved)"
 msgstr " (bleibt unaufgelöst)"
 
-#: merge-recursive.c:1851
+#: merge-recursive.c:1823
 #, 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:2056
+#: merge-recursive.c:2086
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3966,29 +5223,7 @@ msgstr ""
 "wobei\n"
 "keines dieser Ziele die Mehrheit der Dateien erhielt."
 
-#: merge-recursive.c:2088
-#, 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 ""
-"KONFLIKT (implizite Verzeichnisumbenennung): Existierende Datei/Pfad bei %s "
-"im\n"
-"Weg von impliziter Verzeichnisumbenennung, die versucht, einen oder mehrere\n"
-"Pfade dahin zu setzen: %s."
-
-#: merge-recursive.c:2098
-#, 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 ""
-"KONFLIKT (implizite Verzeichnisumbenennung): Kann nicht mehr als ein Pfad "
-"zu\n"
-"%s mappen; implizite Verzeichnisumbenennungen versuchten diese Pfade dahin\n"
-"zu setzen: %s"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2220
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3997,264 +5232,220 @@ msgstr ""
 "KONFLIKT (umbenennen/umbenennen): Benenne Verzeichnis um %s->%s in %s.\n"
 "Benenne Verzeichnis um %s->%s in %s"
 
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"WARNUNG: Vermeide Umbenennung %s -> %s von %s, weil %s selbst umbenannt "
-"wurde."
-
-#: merge-recursive.c:2961
-#, c-format
-msgid "cannot read object %s"
-msgstr "kann Objekt %s nicht lesen"
-
-#: merge-recursive.c:2964
-#, c-format
-msgid "object %s is not a blob"
-msgstr "Objekt %s ist kein Blob"
-
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modify"
 msgstr "ändern"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modified"
 msgstr "geändert"
 
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "Inhalt"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "hinzufügen/hinzufügen"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3114
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
 
-#: merge-recursive.c:3089 git-submodule.sh:937
-msgid "submodule"
-msgstr "Submodul"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3167
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Füge stattdessen als %s hinzu"
 
-#: merge-recursive.c:3203
-#, 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."
-
-#: merge-recursive.c:3206
-#, 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 ""
-"KONFLIKT (Speicherort): %s hinzugefügt in %s innerhalb eines Verzeichnisses, "
-"das umbenannt wurde in %s, es sollte vielleicht nach %s verschoben werden."
-
-#: merge-recursive.c:3210
-#, 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."
-
-#: merge-recursive.c:3213
-#, 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 ""
-"KONFLIKT (Speicherort): %s umbenannt nach %s in %s, innerhalb eines "
-"Verzeichnisses, das umbenannt wurde in %s, es sollte vielleicht nach %s "
-"verschoben werden."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3371
 #, c-format
 msgid "Removing %s"
 msgstr "Entferne %s"
 
-#: merge-recursive.c:3350
+#: merge-recursive.c:3394
 msgid "file/directory"
 msgstr "Datei/Verzeichnis"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3399
 msgid "directory/file"
 msgstr "Verzeichnis/Datei"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3406
 #, 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:3371
+#: merge-recursive.c:3415
 #, c-format
 msgid "Adding %s"
 msgstr "Füge %s hinzu"
 
-#: merge-recursive.c:3380
+#: merge-recursive.c:3424
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "KONFLIKT (hinzufügen/hinzufügen): Merge-Konflikt in %s"
 
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr "Bereits aktuell!"
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3477
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
 
-#: merge-recursive.c:3537
+#: merge-recursive.c:3571
 msgid "Merging:"
 msgstr "Merge:"
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3584
 #, 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:3600
+#: merge-recursive.c:3634
 msgid "merge returned no commit"
 msgstr "Merge hat keinen Commit zurückgegeben"
 
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Ihre lokalen Änderungen in den folgenden Dateien würden durch den Merge\n"
-"überschrieben werden:\n"
-"  %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3799
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
 msgid "Unable to write index."
 msgstr "Konnte Index nicht schreiben."
 
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
+
+#: 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 "Konnte neue Index-Datei nicht schreiben."
+
+#: midx.c:74
+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
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "multi-pack-index-Datei %s ist zu klein."
 
-#: midx.c:84
+#: midx.c:121
 #, 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:89
+#: midx.c:126
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index-Version %d nicht erkannt."
 
-#: midx.c:94
+#: midx.c:131
 #, c-format
-msgid "hash version %u does not match"
-msgstr "Hash-Version %u stimmt nicht überein."
+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:108
-msgid "invalid chunk offset (too large)"
-msgstr "Ungültiger Chunk-Offset (zu groß)"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "Abschließende multi-pack-index Chunk-Id erscheint eher als erwartet."
-
-#: midx.c:145
+#: midx.c:148
 msgid "multi-pack-index missing required pack-name chunk"
-msgstr "multi-pack-index fehlt erforderlicher pack-name Chunk."
+msgstr "multi-pack-index fehlt erforderlicher Pack-Namen Chunk"
 
-#: midx.c:147
+#: midx.c:150
 msgid "multi-pack-index missing required OID fanout chunk"
-msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk."
+msgstr "multi-pack-index fehlt erforderlicher OID fanout Chunk"
 
-#: midx.c:149
+#: midx.c:152
 msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk."
+msgstr "multi-pack-index fehlt erforderlicher OID lookup Chunk"
 
-#: midx.c:151
+#: midx.c:154
 msgid "multi-pack-index missing required object offsets chunk"
-msgstr "multi-pack-index fehlt erforderlicher object offset Chunk."
+msgstr "multi-pack-index fehlt erforderlicher Objekt offset Chunk"
 
-#: midx.c:165
+#: midx.c:170
 #, 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:210
+#: midx.c:214
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "Ungültige pack-int-id: %u (%u Pakete insgesamt)"
 
-#: midx.c:260
+#: midx.c:264
 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:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "Fehler bei Vorbereitung der Packdatei aus multi-pack-index."
+"multi-pack-index speichert einen 64-Bit Offset, aber off_t ist zu klein"
 
-#: midx.c:469
+#: midx.c:490
 #, c-format
 msgid "failed to add packfile '%s'"
-msgstr "Fehler beim Hinzufügen von Packdatei '%s'."
+msgstr "Fehler beim Hinzufügen von Packdatei '%s'"
 
-#: midx.c:475
+#: midx.c:496
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "Fehler beim Öffnen von pack-index '%s'"
 
-#: midx.c:535
+#: midx.c:564
 #, c-format
 msgid "failed to locate object %d in packfile"
-msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei."
+msgstr "Fehler beim Lokalisieren von Objekt %d in Packdatei"
+
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr "kann Reverse-Index-Datei nicht speichern"
+
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"ignoriere existierenden multi-pack-index; Prüfsumme stimmt nicht überein"
+
+#: midx.c:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Packdateien zum multi-pack-index hinzufügen"
 
-#: midx.c:864
+#: midx.c:989
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "Pack-Datei %s zum Weglassen nicht gefunden"
 
-#: midx.c:1035
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "unbekanntes bevorzugtes Paket: '%s'"
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "bevorzugtes Paket '%s' ist abgelaufen"
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr "keine Packdateien zum Indizieren."
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "Fehler beim Löschen von %s"
+
+#: midx.c:1166
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "Fehler beim Löschen des multi-pack-index bei %s"
 
-#: midx.c:1090
+#: midx.c:1225
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "multi-pack-index-Datei existiert, aber das Parsen schlug fehl"
+
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr "Prüfsumme nicht korrekt"
+
+#: midx.c:1236
 msgid "Looking for referenced packfiles"
 msgstr "Suche nach referenzierten Pack-Dateien"
 
-#: midx.c:1105
+#: midx.c:1251
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -4262,57 +5453,69 @@ msgstr ""
 "Ungültige oid fanout Reihenfolge: fanout[%d] = %<PRIx32> > %<PRIx32> = "
 "fanout[%d]"
 
-#: midx.c:1109
-msgid "Verifying OID order in MIDX"
-msgstr "Verifiziere OID-Reihenfolge in MIDX"
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr "das midx enthält keine oid"
 
-#: midx.c:1118
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Verifiziere OID-Reihenfolge im multi-pack-index"
+
+#: midx.c:1274
 #, 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:1137
+#: midx.c:1294
 msgid "Sorting objects by packfile"
 msgstr "Sortiere Objekte nach Pack-Datei"
 
-#: midx.c:1143
+#: midx.c:1301
 msgid "Verifying object offsets"
 msgstr "Überprüfe Objekt-Offsets"
 
-#: midx.c:1159
+#: midx.c:1317
 #, 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:1165
+#: midx.c:1323
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "Fehler beim Laden des Pack-Index für Packdatei %s"
 
-#: midx.c:1174
+#: midx.c:1332
 #, 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:1349
+#: midx.c:1357
+msgid "Counting referenced objects"
+msgstr "Referenzierte Objekte zählen"
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Suchen und Löschen von unreferenzierten Pack-Dateien"
+
+#: midx.c:1558
 msgid "could not start pack-objects"
 msgstr "Konnte 'pack-objects' nicht ausführen"
 
-#: midx.c:1368
+#: midx.c:1578
 msgid "could not finish pack-objects"
 msgstr "Konnte 'pack-objects' nicht beenden"
 
-#: name-hash.c:537
+#: name-hash.c:542
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "Kann lazy_dir Thread nicht erzeugen: %s"
 
-#: name-hash.c:559
+#: name-hash.c:564
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "Kann lazy_name Thread nicht erzeugen: %s"
 
-#: name-hash.c:565
+#: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "Kann lazy_name Thread nicht beitreten: %s"
@@ -4362,6 +5565,371 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr "Ungültiger %s Wert: '%s'"
 
+#: object-file.c:526
+#, 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:584
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
+
+#: object-file.c:658
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
+
+#: object-file.c:665
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr "Konnte \"alternates\"-Datei nicht lesen."
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "Pfad '%s' existiert nicht"
+
+#: object-file.c:789
+#, 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:795
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
+
+#: object-file.c:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
+"eingehängt."
+
+#: object-file.c:869
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
+
+#: object-file.c:1019
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
+
+#: object-file.c:1054
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap fehlgeschlagen%s"
+
+#: object-file.c:1218
+#, c-format
+msgid "object file %s is empty"
+msgstr "Objektdatei %s ist leer."
+
+#: object-file.c:1353 object-file.c:2548
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "Fehlerhaftes loses Objekt '%s'."
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
+
+#: object-file.c:1397
+msgid "invalid object type"
+msgstr "ungültiger Objekt-Typ"
+
+#: object-file.c:1481
+#, 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:1484
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "Konnte %s Kopfbereich nicht entpacken."
+
+#: object-file.c:1490
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
+
+#: object-file.c:1493
+#, c-format
+msgid "unable to parse %s header"
+msgstr "Konnte %s Kopfbereich nicht parsen."
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr "Konnte Objekt %s nicht lesen."
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "Ersetzung %s für %s nicht gefunden."
+
+#: object-file.c:1725
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
+
+#: object-file.c:1729
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
+
+#: object-file.c:1834
+#, c-format
+msgid "unable to write file %s"
+msgstr "Konnte Datei %s nicht schreiben."
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
+
+#: object-file.c:1848
+msgid "file write error"
+msgstr "Fehler beim Schreiben einer Datei."
+
+#: object-file.c:1868
+msgid "error when closing loose object file"
+msgstr "Fehler beim Schließen der Datei für lose Objekte."
+
+#: object-file.c:1933
+#, 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:1935
+msgid "unable to create temporary file"
+msgstr "Konnte temporäre Datei nicht erstellen."
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr "Fehler beim Schreiben der Datei für lose Objekte."
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
+
+#: object-file.c:1973
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "Fehler wegen instabilen Objektquelldaten für %s"
+
+#: object-file.c:1983 builtin/pack-objects.c:1237
+#, c-format
+msgid "failed utime() on %s"
+msgstr "Fehler beim Aufruf von utime() auf '%s'."
+
+#: object-file.c:2060
+#, c-format
+msgid "cannot read object for %s"
+msgstr "Kann Objekt für %s nicht lesen."
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr "fehlerhafter Commit"
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr "fehlerhaftes Tag"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr "Lesefehler beim Indizieren von '%s'."
+
+#: object-file.c:2222
+#, c-format
+msgid "short read while indexing %s"
+msgstr "read() zu kurz beim Indizieren von '%s'."
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: Fehler beim Einfügen in die Datenbank"
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: nicht unterstützte Dateiart"
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s ist kein gültiges Objekt"
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s ist kein gültiges '%s' Objekt"
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "kann %s nicht öffnen"
+
+#: object-file.c:2559 object-file.c:2612
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
+
+#: object-file.c:2583
+#, c-format
+msgid "unable to mmap %s"
+msgstr "Konnte mmap nicht auf %s ausführen."
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "Konnte Kopfbereich von %s nicht entpacken."
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "Konnte Kopfbereich von %s nicht parsen."
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "Konnte Inhalt von %s nicht entpacken."
+
+#: object-name.c:480
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "kurze Objekt-ID %s ist mehrdeutig"
+
+#: object-name.c:491
+msgid "The candidates are:"
+msgstr "Die Kandidaten sind:"
+
+#: 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 ""
+"Git erzeugt normalerweise keine Referenzen die mit\n"
+"40 Hex-Zeichen enden, da diese ignoriert werden wenn\n"
+"Sie diese angeben. Diese Referenzen könnten aus Versehen\n"
+"erzeugt worden sein. Zum Beispiel,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
+"wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
+"Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n"
+"indem Sie \"git config advice.objectNameWarning false\"\n"
+"ausführen."
+
+#: 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:918
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "Log für '%.*s' hat nur %d Einträge"
+
+#: 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:1702
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"Pfad '%s' existiert, aber nicht '%s'\n"
+"Hinweis: Meinten Sie '%.*s:%s' auch bekannt als '%.*s:./%s'?"
+
+#: object-name.c:1711
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "Pfad '%s' existiert nicht in '%.*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 ""
+"Pfad '%s' ist im Index, aber nicht in Stufe %d\n"
+"Hinweis: Meinten Sie ':%d:%s'?"
+
+#: 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 ""
+"Pfad '%s' ist im Index, aber nicht '%s'\n"
+"Hinweis: Meinten Sie ':%d:%s' auch bekannt als ':%d:./%s'?"
+
+#: 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: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: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:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "ungültiger Objektname '%.*s'."
+
 #: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
@@ -4372,35 +5940,115 @@ msgstr "Ungültiger Objekttyp \"%s\""
 msgid "object %s is a %s, not a %s"
 msgstr "Objekt %s ist ein %s, kein %s"
 
-#: object.c:233
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "Objekt %s hat eine unbekannte Typ-Identifikation %d"
 
-#: object.c:246
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "Konnte Objekt '%s' nicht parsen."
 
-#: object.c:266 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "Hash stimmt nicht mit %s überein."
 
-#: packfile.c:641
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr "Konnte Größe von %s nicht bestimmen."
+
+#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "konnte Festplattennutzung von %s nicht bekommen"
+
+#: pack-revindex.c:221
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "Reverse-Index-Datei %s ist zu klein"
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "Reverse-Index-Datei %s ist beschädigt"
+
+#: pack-revindex.c:234
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "Reverse-Index-Datei %s hat eine unbekannte Signatur"
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "Reverse-Index-Datei %s hat nicht unterstützte Version %<PRIu32>"
+
+#: pack-revindex.c:243
+#, c-format
+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
+msgid "cannot both write and verify reverse index"
+msgstr ""
+"Reverse-Index kann nicht gleichzeitig geschrieben und verifiziert werden"
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr "konnte nicht lesen: %s"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "Fehler beim lesbar machen von %s"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "konnte Promisor-Datei '%s' nicht schreiben"
+
+#: packfile.c:625
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
 
-#: packfile.c:1887
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "Packdatei %s kann nicht gemappt werden%s"
+
+#: packfile.c:1934
 #, 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:1891
+#: packfile.c:1938
 #, 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
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "Option `%s' erwartet einen numerischen Wert."
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "Fehlerhaftes Ablaufdatum '%s'"
+
+#: parse-options-cb.c:54
+#, 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
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "fehlerhafter Objekt-Name '%s'"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4416,7 +6064,7 @@ msgstr "%s ist inkompatibel mit %s."
 msgid "%s : incompatible with something else"
 msgstr "%s: inkompatibel mit etwas anderem"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s erwartet keinen Wert"
@@ -4426,43 +6074,48 @@ msgstr "%s erwartet keinen Wert"
 msgid "%s isn't available"
 msgstr "%s ist nicht verfügbar."
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, 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:389
+#: parse-options.c:386
 #, 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:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
+#, 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
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr "Meinten Sie `--%s` (mit zwei Strichen?)"
+msgid "alias of --%s"
+msgstr "Alias für --%s"
 
-#: parse-options.c:860
+#: parse-options.c:879
 #, c-format
 msgid "unknown option `%s'"
 msgstr "Unbekannte Option: `%s'"
 
-#: parse-options.c:862
+#: parse-options.c:881
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "Unbekannter Schalter `%c'"
 
-#: parse-options.c:864
+#: parse-options.c:883
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "Unbekannte nicht-Ascii Option in String: `%s'"
 
-#: parse-options.c:888
+#: parse-options.c:907
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:907
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr "Verwendung: %s"
@@ -4470,74 +6123,49 @@ msgstr "Verwendung: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:913
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
 msgstr "      oder: %s"
 
-#: parse-options.c:916
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:955
+#: parse-options.c:974
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options.c:969
-#, c-format
-msgid "alias of --%s"
-msgstr "Alias für --%s"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "Option `%s' erwartet einen numerischen Wert."
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "Fehlerhaftes Ablaufdatum '%s'"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "Option `%s' erwartet \"always\", \"auto\" oder \"never\"."
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "fehlerhafter Objekt-Name '%s'"
-
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
 
-#: pathspec.c:128
+#: pathspec.c:151
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Escape-Zeichen '\\' als letztes Zeichen in Attributwert nicht erlaubt"
 
-#: pathspec.c:146
+#: pathspec.c:169
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Es ist nur eine Angabe von 'attr:' erlaubt."
 
-#: pathspec.c:149
+#: pathspec.c:172
 msgid "attr spec must not be empty"
 msgstr "Angabe von 'attr:' darf nicht leer sein"
 
-#: pathspec.c:192
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "Ungültiger Attributname %s"
 
-#: pathspec.c:257
+#: pathspec.c:280
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "Globale Einstellungen zur Pfadspezifikation 'glob' und 'noglob' sind "
 "inkompatibel."
 
-#: pathspec.c:264
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4545,199 +6173,240 @@ msgstr ""
 "Globale Einstellung zur Pfadspezifikation 'literal' ist inkompatibel\n"
 "mit allen anderen Optionen."
 
-#: pathspec.c:304
+#: pathspec.c:327
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "ungültiger Parameter für Pfadspezifikationsangabe 'prefix'"
 
-#: pathspec.c:325
+#: pathspec.c:348
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "ungültige Pfadspezifikationsangabe '%.*s' in '%s'"
 
-#: pathspec.c:330
+#: pathspec.c:353
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Fehlendes ')' am Ende der Pfadspezifikationsangabe in '%s'"
 
-#: pathspec.c:368
+#: pathspec.c:391
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "nicht unterstützte Pfadspezifikationsangabe '%c' in '%s'"
 
-#: pathspec.c:427
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' und 'glob' sind inkompatibel"
 
-#: pathspec.c:440
+#: pathspec.c:466
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' liegt außerhalb des Repositories"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' liegt außerhalb des Repositories von '%s'"
 
-#: pathspec.c:514
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (Kürzel: '%c')"
 
-#: pathspec.c:524
+#: pathspec.c:552
 #, 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:591
+#: pathspec.c:619
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
 
+#: pathspec.c:664
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "Zeile enthält falsche Anführungszeichen: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
-msgstr "Konnte Flush-Paket nicht schreiben."
+msgstr "konnte Flush-Paket nicht schreiben"
 
 #: pkt-line.c:99
 msgid "unable to write delim packet"
-msgstr "Konnte Delim-Paket nicht schreiben."
+msgstr "konnte Delim-Paket nicht schreiben"
 
 #: pkt-line.c:106
+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:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:265
 msgid "protocol error: impossibly long line"
 msgstr "Protokollfehler: unmöglich lange Zeile"
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr "Schreiben des Pakets mit Format fehlgeschlagen."
 
-#: pkt-line.c:196
+#: pkt-line.c:204
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 "Schreiben des Pakets fehlgeschlagen - Daten überschreiten maximale Paketgröße"
 
-#: pkt-line.c:203 pkt-line.c:210
-msgid "packet write failed"
-msgstr "Schreiben des Pakets fehlgeschlagen."
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "Schreiben des Pakets fehlgeschlagen: %s"
 
-#: pkt-line.c:295
+#: pkt-line.c:328 pkt-line.c:329
 msgid "read error"
 msgstr "Lesefehler"
 
-#: pkt-line.c:303
+#: pkt-line.c:339 pkt-line.c:340
 msgid "the remote end hung up unexpectedly"
 msgstr "Die Gegenseite hat unerwartet abgebrochen."
 
-#: pkt-line.c:331
+#: pkt-line.c:369 pkt-line.c:371
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "Protokollfehler: ungültiges Zeichen für Zeilenlänge: %.4s"
 
-#: pkt-line.c:341 pkt-line.c:346
+#: 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 "Protokollfehler: ungültige Zeilenlänge %d"
 
-#: pkt-line.c:362
+#: pkt-line.c:413 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "Fehler am anderen Ende: %s"
 
-#: preload-index.c:119
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr "Aktualisiere Index"
 
-#: preload-index.c:138
+#: preload-index.c:144
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "Kann Thread für lstat nicht erzeugen: %s"
 
-#: pretty.c:966
+#: pretty.c:988
 msgid "unable to parse --pretty format"
 msgstr "Konnte --pretty Format nicht parsen."
 
-#: promisor-remote.c:25
-msgid "Remote with no URL"
-msgstr "Remote-Repository ohne URL"
+#: promisor-remote.c:31
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "Promisor-Remote: konnte Fetch-Subprozess nicht abspalten"
+
+#: 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: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:61
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "Promisor-Remote-Name kann nicht mit '/' beginnen: %s"
 
-#: range-diff.c:71
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: erwartete Flush nach Argumenten"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Lösche doppelte Objekte"
+
+#: range-diff.c:78
 msgid "could not start `log`"
 msgstr "Konnte `log` nicht starten."
 
-#: range-diff.c:73
+#: range-diff.c:80
 msgid "could not read `log` output"
 msgstr "Konnte Ausgabe von `log` nicht lesen."
 
-#: range-diff.c:92 sequencer.c:4985
+#: range-diff.c:101 sequencer.c:5550
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "Konnte Commit '%s' nicht parsen."
 
-#: range-diff.c:118
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"konnte erste Zeile der Ausgabe von `log` nicht parsen: fängt nicht mit "
+"'commit ' an: '%s'"
+
+#: range-diff.c:140
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "Konnte Git-Header '%.*s' nicht parsen."
 
-#: range-diff.c:275
+#: range-diff.c:307
 msgid "failed to generate diff"
 msgstr "Fehler beim Generieren des Diffs."
 
-#: range-diff.c:507 range-diff.c:509
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only und --right-only schließen sich gegenseitig aus"
+
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "Konnte Log für '%s' nicht parsen."
 
-#: read-cache.c:680
+#: read-cache.c:710
 #, 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:696
+#: read-cache.c:726
 msgid "cannot create an empty blob in the object database"
 msgstr "Kann keinen leeren Blob in die Objektdatenbank schreiben."
 
-#: read-cache.c:718
+#: read-cache.c:748
 #, 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:723
+#: read-cache.c:753
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' hat keinen Commit ausgecheckt"
 
-#: read-cache.c:775
+#: read-cache.c:805
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "Konnte Datei '%s' nicht indizieren."
 
-#: read-cache.c:794
+#: read-cache.c:824
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "Konnte '%s' nicht dem Index hinzufügen."
 
-#: read-cache.c:805
+#: read-cache.c:835
 #, c-format
 msgid "unable to stat '%s'"
-msgstr "Konnte '%s' nicht lesen."
+msgstr "konnte '%s' nicht lesen"
 
-#: read-cache.c:1314
+#: read-cache.c:1358
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
-msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein."
+msgstr "'%s' scheint eine Datei und ein Verzeichnis zu sein"
 
-#: read-cache.c:1520
+#: read-cache.c:1573
 msgid "Refresh index"
 msgstr "Aktualisiere Index"
 
-#: read-cache.c:1635
+#: read-cache.c:1705
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4746,7 +6415,7 @@ msgstr ""
 "index.version gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:1645
+#: read-cache.c:1715
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4755,143 +6424,158 @@ msgstr ""
 "GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
 "Verwende Version %i"
 
-#: read-cache.c:1701
+#: read-cache.c:1771
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "Ungültige Signatur 0x%08x"
 
-#: read-cache.c:1704
+#: read-cache.c:1774
 #, c-format
 msgid "bad index version %d"
 msgstr "Ungültige Index-Version %d"
 
-#: read-cache.c:1713
+#: read-cache.c:1783
 msgid "bad index file sha1 signature"
 msgstr "Ungültige SHA1-Signatur der Index-Datei."
 
-#: read-cache.c:1743
+#: read-cache.c:1817
 #, 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:1745
+#: read-cache.c:1819
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "Ignoriere Erweiterung %.4s"
 
-#: read-cache.c:1782
+#: read-cache.c:1856
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "Unbekanntes Format für Index-Eintrag 0x%08x"
 
-#: read-cache.c:1798
+#: read-cache.c:1872
 #, 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:1855
+#: read-cache.c:1929
 msgid "unordered stage entries in index"
 msgstr "Ungeordnete Stage-Einträge im Index."
 
-#: read-cache.c:1858
+#: read-cache.c:1932
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "Mehrere Stage-Einträge für zusammengeführte Datei '%s'."
 
-#: read-cache.c:1861
+#: read-cache.c:1935
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "Ungeordnete Stage-Einträge für '%s'."
 
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: 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 "Index-Datei beschädigt"
 
-#: read-cache.c:2108
+#: read-cache.c:2185
 #, 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:2121
+#: read-cache.c:2198
 #, 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:2154
+#: read-cache.c:2231
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: Öffnen der Index-Datei fehlgeschlagen."
 
-#: read-cache.c:2158
+#: read-cache.c:2235
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: Kann geöffneten Index nicht lesen."
 
-#: read-cache.c:2162
+#: read-cache.c:2239
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: Index-Datei ist kleiner als erwartet."
 
-#: read-cache.c:2166
+#: read-cache.c:2243
 #, 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:2208
+#: read-cache.c:2286
 #, 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:2235
+#: read-cache.c:2313
 #, 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:2267
+#: read-cache.c:2351
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "Konnte geteilten Index '%s' nicht aktualisieren."
 
-#: read-cache.c:2314
+#: read-cache.c:2398
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "Fehlerhafter Index. Erwartete %s in %s, erhielt %s."
 
-#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
 #, c-format
 msgid "could not close '%s'"
 msgstr "Konnte '%s' nicht schließen."
 
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
+#: read-cache.c:3075
+msgid "failed to convert to a sparse-index"
+msgstr "Konvertierung zu einem Sparse-Index fehlgeschlagen"
+
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
 #, c-format
 msgid "could not stat '%s'"
 msgstr "Konnte '%s' nicht lesen."
 
-#: read-cache.c:3126
+#: read-cache.c:3159
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
 
-#: read-cache.c:3138
+#: read-cache.c:3171
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "Konnte '%s' nicht entfernen."
 
-#: read-cache.c:3163
+#: read-cache.c:3200
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
 
-#: read-cache.c:3312
+#: read-cache.c:3349
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: Kann nicht auf Stufe #0 wechseln."
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n"
+"'git rebase --continue' aus.\n"
+"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
@@ -4899,7 +6583,7 @@ msgstr ""
 "Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. "
 "Ignoriere."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4907,7 +6591,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"
@@ -4916,7 +6603,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 ""
@@ -4926,8 +6613,11 @@ msgstr ""
 "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"
+"f, fixup [-C | -c] <Commit> = wie \"squash\", aber nur die vorherige\n"
+"                   Commit-Beschreibung behalten, außer -C wird verwendet,\n"
+"                   in diesem Fall wird nur diese Commit-Beschreibung "
+"behalten;\n"
+"                   -c ist das Gleiche wie -C, aber ein Editor wird geöffnet\n"
 "x, exec <Commit> = Befehl (Rest der Zeile) mittels Shell ausführen\n"
 "b, break = hier anhalten (Rebase später mit 'git rebase --continue' "
 "fortsetzen)\n"
@@ -4944,14 +6634,14 @@ msgstr ""
 "Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
 "ausgeführt.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:66
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 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:65 git-rebase--preserve-merges.sh:228
+#: 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"
@@ -4960,7 +6650,7 @@ msgstr ""
 "Keine Zeile entfernen. Benutzen Sie 'drop', um explizit einen Commit zu\n"
 "entfernen.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4968,7 +6658,7 @@ msgstr ""
 "\n"
 "Wenn Sie hier eine Zeile entfernen, wird DIESER COMMIT VERLOREN GEHEN.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4982,7 +6672,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4992,22 +6682,19 @@ msgstr ""
 "Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Leere Commits sind auskommentiert."
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
+#: 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 "Konnte '%s' nicht schreiben."
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "Konnte '%s' nicht nach '%s' kopieren."
+msgid "could not write '%s'."
+msgstr "Konnte '%s' nicht schreiben."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:196
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -5016,7 +6703,7 @@ msgstr ""
 "Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
 "Entfernte Commits (neu zu alt):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:203
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -5033,126 +6720,14 @@ msgstr ""
 "Warnungen zu ändern.\n"
 "Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
 
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s zeigt auf kein gültiges Objekt!"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "Ignoriere fehlerhafte Referenz %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen: %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "Konnte Referenz '%s' nicht lesen."
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "Referenz '%s' existiert bereits."
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "Unerwartete Objekt-ID beim Schreiben von '%s'."
-
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "Konnte nicht nach '%s' schreiben."
-
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1004
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "Unerwartete Objekt-ID beim Löschen von '%s'."
-
-#: refs.c:998
-#, 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:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "Log für Referenz %s unerwartet bei %s beendet."
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "Log für %s ist leer."
-
-#: refs.c:1155
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "Verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'."
-
-#: refs.c:1231
+#: 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 "update_ref failed for ref '%s': %s"
-msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "Mehrere Aktualisierungen für Referenz '%s' nicht erlaubt."
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr ""
-"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
-"verboten."
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' existiert; kann '%s' nicht erstellen"
-
-#: refs.c:2157 refs.c:2192
-#, 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:1234
-#, c-format
-msgid "could not remove reference %s"
-msgstr "Konnte Referenz %s nicht löschen"
-
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Konnte Referenz %s nicht entfernen: %s"
-
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "Konnte Referenzen nicht entfernen: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "Ungültige Refspec '%s'"
+msgid "could not read '%s'."
+msgstr "Konnte '%s' nicht lesen."
 
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
 msgstr "entfernt"
 
@@ -5171,283 +6746,416 @@ msgstr "%d hinterher"
 msgid "ahead %d, behind %d"
 msgstr "%d voraus, %d hinterher"
 
-#: ref-filter.c:165
+#: ref-filter.c:230
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "Erwartetes Format: %%(color:<Farbe>)"
 
-#: ref-filter.c:167
+#: ref-filter.c:232
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "nicht erkannte Farbe: %%(color:%s)"
 
-#: ref-filter.c:189
+#: ref-filter.c:254
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Positiver Wert erwartet refname:lstrip=%s"
 
-#: ref-filter.c:193
+#: ref-filter.c:258
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Positiver Wert erwartet refname:rstrip=%s"
 
-#: ref-filter.c:195
+#: ref-filter.c:260
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "nicht erkanntes %%(%s) Argument: %s"
 
-#: ref-filter.c:250
+#: ref-filter.c:315
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) akzeptiert keine Argumente"
 
-#: ref-filter.c:272
+#: ref-filter.c:339
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "nicht erkanntes %%(objectsize) Argument: %s"
 
-#: ref-filter.c:280
+#: ref-filter.c:347
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) akzeptiert keine Argumente"
 
-#: ref-filter.c:292
+#: ref-filter.c:359
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) akzeptiert keine Argumente"
 
-#: ref-filter.c:301
+#: ref-filter.c:372
 #, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) akzeptiert keine Argumente"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "nicht erkanntes %%(subject) Argument: %s"
 
-#: ref-filter.c:323
+#: ref-filter.c:391
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "%%(trailers:key=<Wert>) erwartet"
+
+#: ref-filter.c:393
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "unbekanntes %%(trailers) Argument: %s"
 
-#: ref-filter.c:352
+#: ref-filter.c:424
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "Positiver Wert erwartet contents:lines=%s"
 
-#: ref-filter.c:354
+#: ref-filter.c:426
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "nicht erkanntes %%(contents) Argument: %s"
 
-#: ref-filter.c:369
+#: ref-filter.c:441
 #, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "Positiver Wert erwartet objectname:short=%s"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "positiver Wert erwartet '%s' in %%(%s)"
 
-#: ref-filter.c:373
+#: ref-filter.c:445
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "nicht erkanntes %%(objectname) Argument: %s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "nicht erkanntes Argument '%s' in %%(%s)"
 
-#: ref-filter.c:403
+#: ref-filter.c:459
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "nicht erkannte E-Mail Option: %s"
+
+#: ref-filter.c:489
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
-msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
+msgstr "erwartetes Format: %%(align:<Breite>,<Position>)"
 
-#: ref-filter.c:415
+#: ref-filter.c:501
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "nicht erkannte Position:%s"
 
-#: ref-filter.c:422
+#: ref-filter.c:508
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "nicht erkannte Breite:%s"
 
-#: ref-filter.c:431
+#: ref-filter.c:517
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "nicht erkanntes %%(align) Argument: %s"
 
-#: ref-filter.c:439
+#: ref-filter.c:525
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "Positive Breitenangabe für %%(align) erwartet"
 
-#: ref-filter.c:457
+#: ref-filter.c:543
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "nicht erkanntes %%(if) Argument: %s"
 
-#: ref-filter.c:559
+#: ref-filter.c:645
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "Fehlerhafter Feldname: %.*s"
 
-#: ref-filter.c:586
+#: ref-filter.c:672
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "Unbekannter Feldname: %.*s"
 
-#: ref-filter.c:590
+#: ref-filter.c:676
 #, 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:714
+#: ref-filter.c:801
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
 
-#: ref-filter.c:777
+#: ref-filter.c:865
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
 
-#: ref-filter.c:779
+#: ref-filter.c:867
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: %%(then) Atom mehr als einmal verwendet"
 
-#: ref-filter.c:781
+#: ref-filter.c:869
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: %%(then) Atom nach %%(else) verwendet"
 
-#: ref-filter.c:809
+#: ref-filter.c:897
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
 
-#: ref-filter.c:811
+#: ref-filter.c:899
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
 
-#: ref-filter.c:813
+#: ref-filter.c:901
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "Format: %%(end) Atom mehr als einmal verwendet"
 
-#: ref-filter.c:828
+#: ref-filter.c:916
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
 
-#: ref-filter.c:885
+#: ref-filter.c:973
 #, c-format
 msgid "malformed format string %s"
 msgstr "Fehlerhafter Formatierungsstring %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1621
 #, c-format
-msgid "no branch, rebasing %s"
-msgstr "kein Branch, Rebase von %s"
+msgid "(no branch, rebasing %s)"
+msgstr "(kein Branch, Rebase von %s)"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1624
 #, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "kein Branch, Rebase von losgelöstem HEAD %s"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(kein Branch, Rebase von losgelöstem HEAD %s)"
 
-#: ref-filter.c:1494
+#: ref-filter.c:1627
 #, c-format
-msgid "no branch, bisect started on %s"
-msgstr "kein Branch, binäre Suche begonnen bei %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(kein Branch, binäre Suche begonnen bei %s)"
 
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "kein Branch"
+#: ref-filter.c:1631
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD losgelöst bei %s)"
 
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1634
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD losgelöst von %s)"
+
+#: ref-filter.c:1637
+msgid "(no branch)"
+msgstr "(kein Branch)"
+
+#: ref-filter.c:1669 ref-filter.c:1880
 #, c-format
 msgid "missing object %s for %s"
 msgstr "Objekt %s fehlt für %s"
 
-#: ref-filter.c:1550
+#: ref-filter.c:1679
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
 
-#: ref-filter.c:2004
+#: ref-filter.c:2064
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "fehlerhaftes Objekt bei '%s'"
 
-#: ref-filter.c:2093
+#: ref-filter.c:2153
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
 
-#: ref-filter.c:2389
+#: ref-filter.c:2158 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "Ignoriere fehlerhafte Referenz %s"
+
+#: ref-filter.c:2502
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "Format: %%(end) Atom fehlt"
 
-#: ref-filter.c:2489
+#: ref-filter.c:2596
 #, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "Die Option `%s' ist inkompatibel mit --merged."
+msgid "malformed object name %s"
+msgstr "missgebildeter Objektname %s"
 
-#: ref-filter.c:2492
+#: ref-filter.c:2601
 #, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "Die Option `%s' ist inkompatibel mit --no-merged."
+msgid "option `%s' must point to a commit"
+msgstr "die Option `%s' muss auf einen Commit zeigen"
 
-#: ref-filter.c:2502
+#: refs.c:264
 #, c-format
-msgid "malformed object name %s"
-msgstr "Missgebildeter Objektname %s"
+msgid "%s does not point to a valid object!"
+msgstr "%s zeigt auf kein gültiges Objekt!"
 
-#: ref-filter.c:2507
+#: refs.c:566
 #, c-format
-msgid "option `%s' must point to a commit"
-msgstr "Die Option `%s' muss auf einen Commit zeigen."
+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 ""
+"Als Name für den initialen Branch wurde '%s' benutzt. Dieser\n"
+"Standard-Branchname kann sich ändern. Um den Namen des initialen Branches\n"
+"zu konfigurieren, der in allen neuen Repositories verwendet werden soll und\n"
+"um diese Warnung zu unterdrücken, führen Sie aus:\n"
+"\n"
+"\tgit config --global init.defaultBranch <Name>\n"
+"\n"
+"Häufig gewählte Namen statt 'master' sind 'main', 'trunk' und\n"
+"'development'. Der gerade erstellte Branch kann mit diesem Befehl\n"
+"umbenannt werden:\n"
+"\n"
+"\tgit branch -m <Name>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "konnte `%s` nicht abrufen"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "ungültiger Branchname: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "Ignoriere unreferenzierte symbolische Referenz %s"
+
+#: refs.c:922
+#, 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
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "Log für Referenz %s unerwartet bei %s beendet."
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "Log für %s ist leer."
 
-#: remote.c:366
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "verweigere Aktualisierung einer Referenz mit fehlerhaftem Namen '%s'"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref für Referenz '%s' fehlgeschlagen: %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "mehrere Aktualisierungen für Referenz '%s' nicht erlaubt"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
+"verboten"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "Aktualisierungen von Referenzen durch Hook abgebrochen"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existiert; kann '%s' nicht erstellen"
+
+#: refs.c:2248 refs.c:2283
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "could not delete references: %s"
+msgstr "konnte Referenzen nicht entfernen: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "ungültige Refspec '%s'"
+
+#: remote.c:351
 #, 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:413
+#: remote.c:399
 msgid "more than one receivepack given, using the first"
 msgstr "Mehr als ein receivepack-Befehl angegeben, benutze den ersten."
 
-#: remote.c:421
+#: remote.c:407
 msgid "more than one uploadpack given, using the first"
 msgstr "Mehr als ein uploadpack-Befehl angegeben, benutze den ersten."
 
-#: remote.c:611
+#: remote.c:590
 #, 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:615
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s folgt üblicherweise %s, nicht %s"
 
-#: remote.c:619
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s folgt sowohl %s als auch %s"
 
-#: remote.c:687
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "Schlüssel '%s' des Musters hatte kein '*'."
 
-#: remote.c:697
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "Wert '%s' des Musters hat kein '*'."
 
-#: remote.c:1003
+#: remote.c:1083
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "Src-Refspec %s entspricht keiner Referenz."
 
-#: remote.c:1008
+#: remote.c:1088
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
@@ -5456,7 +7164,7 @@ msgstr "Src-Refspec %s entspricht mehr als einer Referenz."
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1023
+#: remote.c:1103
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5483,7 +7191,7 @@ msgstr ""
 "Keines hat funktioniert, sodass wir aufgegeben haben. Sie müssen die\n"
 "Referenz mit vollqualifizierten Namen angeben."
 
-#: remote.c:1043
+#: remote.c:1123
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5494,7 +7202,7 @@ msgstr ""
 "Meinten Sie, einen neuen Branch mittels Push nach\n"
 "'%s:refs/heads/%s' zu erstellen?"
 
-#: remote.c:1048
+#: remote.c:1128
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5505,7 +7213,7 @@ msgstr ""
 "Meinten Sie, einen neuen Tag mittels Push nach\n"
 "'%s:refs/tags/%s' zu erstellen?"
 
-#: remote.c:1053
+#: remote.c:1133
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5516,7 +7224,7 @@ msgstr ""
 "Meinten Sie, einen Tag für ein neues Tree-Objekt\n"
 "mittels Push nach '%s:refs/tags/'%s' zu erstellen?"
 
-#: remote.c:1058
+#: remote.c:1138
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5527,117 +7235,117 @@ msgstr ""
 "Meinten Sie, einen Tag für ein neues Blob-Objekt\n"
 "mittels Push nach '%s:refs/tags/%s' zu erstellen?"
 
-#: remote.c:1094
+#: remote.c:1174
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s kann nicht zu Branch aufgelöst werden."
 
-#: remote.c:1105
+#: remote.c:1185
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "Konnte '%s' nicht löschen: Remote-Referenz existiert nicht."
 
-#: remote.c:1117
+#: remote.c:1197
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "Dst-Refspec %s entspricht mehr als einer Referenz."
 
-#: remote.c:1124
+#: remote.c:1204
 #, 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:1627 remote.c:1728
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
 msgstr "HEAD zeigt auf keinen Branch"
 
-#: remote.c:1636
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
-msgstr "Kein solcher Branch: '%s'"
+msgstr "Branch nicht gefunden: '%s'"
 
-#: remote.c:1639
+#: remote.c:1736
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
 
-#: remote.c:1645
+#: remote.c:1742
 #, 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:1660
+#: remote.c:1757
 #, 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:1672
+#: remote.c:1769
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: remote.c:1682
+#: remote.c:1779
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
 
-#: remote.c:1695
+#: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
 
-#: remote.c:1717
+#: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
 
-#: remote.c:1843
+#: remote.c:1943
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "Konnte Remote-Referenz %s nicht finden."
 
-#: remote.c:1856
+#: remote.c:1956
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Ignoriere sonderbare Referenz '%s' lokal"
 
-#: remote.c:2019
+#: remote.c:2119
 #, 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:2023
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
 
-#: remote.c:2026
+#: remote.c:2126
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
 
-#: remote.c:2030
+#: remote.c:2130
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Ihr Branch und '%s' zeigen auf unterschiedliche Commits.\n"
 
-#: remote.c:2033
+#: remote.c:2133
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (benutzen Sie \"%s\" für Details)\n"
 
-#: remote.c:2037
+#: 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] "Ihr Branch ist %2$d Commit vor '%1$s'.\n"
 msgstr[1] "Ihr Branch ist %2$d Commits vor '%1$s'.\n"
 
-#: remote.c:2043
+#: remote.c:2143
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
 
-#: remote.c:2046
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5647,12 +7355,12 @@ msgstr[0] ""
 msgstr[1] ""
 "Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
 
-#: remote.c:2054
+#: remote.c:2154
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 "  (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
 
-#: remote.c:2057
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5667,13 +7375,13 @@ msgstr[1] ""
 "Ihr Branch und '%s' sind divergiert,\n"
 "und haben jeweils %d und %d unterschiedliche Commits.\n"
 
-#: remote.c:2067
+#: remote.c:2167
 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:2250
+#: remote.c:2359
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "Kann erwarteten Objektnamen '%s' nicht parsen."
@@ -5688,131 +7396,140 @@ msgstr "ungültiger Name für ersetzende Referenz: %s"
 msgid "duplicate replace ref: %s"
 msgstr "doppelte ersetzende Referenz: %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "Ersetzungstiefe zu hoch für Objekt %s"
 
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
 msgid "corrupt MERGE_RR"
 msgstr "Fehlerhaftes MERGE_RR"
 
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
 msgstr "Konnte Rerere-Eintrag nicht schreiben."
 
-#: rerere.c:495
+#: rerere.c:479
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
 msgstr "Fehler beim Schreiben von '%s' (%s)."
 
-#: rerere.c:498
+#: rerere.c:482
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "Flush bei '%s' fehlgeschlagen."
 
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
 #, c-format
 msgid "could not parse conflict hunks in '%s'"
 msgstr "Konnte Konflikt-Blöcke in '%s' nicht parsen."
 
-#: rerere.c:684
+#: rerere.c:668
 #, c-format
 msgid "failed utime() on '%s'"
 msgstr "Fehler beim Aufruf von utime() auf '%s'."
 
-#: rerere.c:694
+#: rerere.c:678
 #, c-format
 msgid "writing '%s' failed"
 msgstr "Schreiben von '%s' fehlgeschlagen."
 
-#: rerere.c:714
+#: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
 msgstr "'%s' mit vorheriger Konfliktauflösung zum Commit vorgemerkt."
 
-#: rerere.c:753
+#: rerere.c:737
 #, c-format
 msgid "Recorded resolution for '%s'."
 msgstr "Konfliktauflösung für '%s' aufgezeichnet."
 
-#: rerere.c:788
+#: rerere.c:772
 #, c-format
 msgid "Resolved '%s' using previous resolution."
 msgstr "Konflikte in '%s' mit vorheriger Konfliktauflösung beseitigt."
 
-#: rerere.c:803
+#: rerere.c:787
 #, c-format
 msgid "cannot unlink stray '%s'"
 msgstr "Kann '%s' nicht löschen."
 
-#: rerere.c:807
+#: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
 msgstr "Preimage für '%s' aufgezeichnet."
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: 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 "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: rerere.c:1057
+#: rerere.c:1041
 #, c-format
 msgid "failed to update conflicted state in '%s'"
 msgstr "Fehler beim Aktualisieren des Konflikt-Status in '%s'."
 
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
 #, c-format
 msgid "no remembered resolution for '%s'"
 msgstr "Keine aufgezeichnete Konfliktauflösung für '%s'."
 
-#: rerere.c:1077
+#: rerere.c:1061
 #, c-format
 msgid "cannot unlink '%s'"
 msgstr "Kann '%s' nicht löschen."
 
-#: rerere.c:1087
+#: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
 msgstr "Preimage für '%s' aktualisiert."
 
-#: rerere.c:1096
+#: rerere.c:1080
 #, c-format
 msgid "Forgot resolution for '%s'\n"
 msgstr "Aufgezeichnete Konfliktauflösung für '%s' gelöscht.\n"
 
-#: rerere.c:1199
+#: rerere.c:1191
 msgid "unable to open rr-cache directory"
 msgstr "Konnte rr-cache Verzeichnis nicht öffnen."
 
-#: revision.c:2509
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "Konnte HEAD-Commit nicht bestimmen."
+
+#: reset.c:69 reset.c:75 sequencer.c:3689
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<Pack-Datei> wird nicht länger unterstützt"
+
+#: revision.c:2684
 msgid "your current branch appears to be broken"
 msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
 
-#: revision.c:2512
+#: revision.c:2687
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
 
-#: revision.c:2720
-msgid "--first-parent is incompatible with --bisect"
-msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
-
-#: revision.c:2724
+#: revision.c:2893
 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:763
+#: run-command.c:766
 msgid "open /dev/null failed"
 msgstr "Öffnen von /dev/null fehlgeschlagen"
 
-#: run-command.c:1269
+#: run-command.c:1274
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "Konnte Thread für async nicht erzeugen: %s"
 
-#: run-command.c:1333
+#: run-command.c:1344
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -5822,30 +7539,43 @@ msgstr ""
 "Sie können diese Warnung mit `git config advice.ignoredHook false` "
 "deaktivieren."
 
-#: send-pack.c:142
+#: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "Unerwartetes Flush-Paket beim Lesen des Remote-Unpack-Status."
 
-#: send-pack.c:144
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
 
-#: send-pack.c:146
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
 
-#: send-pack.c:307
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
 
-#: send-pack.c:421
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: konnte Fetch-Subprozess nicht abspalten"
+
+#: send-pack.c:455
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "Push-Verhandlung fehlgeschlagen; fahre trotzdem mit dem Push fort"
+
+#: send-pack.c:526
+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:535
 msgid "the receiving end does not support --signed push"
 msgstr ""
 "die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
 
-#: send-pack.c:423
+#: send-pack.c:537
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5853,47 +7583,47 @@ msgstr ""
 "kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
 "Versand (\"--signed push\") unterstützt"
 
-#: send-pack.c:435
+#: send-pack.c:544
 msgid "the receiving end does not support --atomic push"
 msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
 
-#: send-pack.c:440
+#: send-pack.c:549
 msgid "the receiving end does not support push options"
 msgstr "die Gegenseite unterstützt keine Push-Optionen"
 
-#: sequencer.c:187
+#: sequencer.c:196
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "Ungültiger \"cleanup\"-Modus '%s' für Commit-Beschreibungen."
 
-#: sequencer.c:292
+#: sequencer.c:324
 #, c-format
 msgid "could not delete '%s'"
 msgstr "Konnte '%s' nicht löschen."
 
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
 #, c-format
 msgid "could not remove '%s'"
 msgstr "Konnte '%s' nicht löschen"
 
-#: sequencer.c:321
+#: sequencer.c:354
 msgid "revert"
 msgstr "Revert"
 
-#: sequencer.c:323
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr "Cherry-Pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "interaktives Rebase"
+#: sequencer.c:358
+msgid "rebase"
+msgstr "Rebase"
 
-#: sequencer.c:327
+#: sequencer.c:360
 #, c-format
 msgid "unknown action: %d"
 msgstr "Unbekannte Aktion: %d"
 
-#: sequencer.c:385
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5901,7 +7631,7 @@ msgstr ""
 "nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
 "mit 'git add <Pfade>' oder 'git rm <Pfade>'"
 
-#: sequencer.c:388
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5911,111 +7641,110 @@ msgstr ""
 "mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
 "'git commit' ein"
 
-#: sequencer.c:401 sequencer.c:2847
+#: sequencer.c:435 sequencer.c:3271
 #, c-format
 msgid "could not lock '%s'"
 msgstr "Konnte '%s' nicht sperren"
 
-#: sequencer.c:408
+#: 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 "Konnte nicht nach '%s' schreiben."
+
+#: sequencer.c:442
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "Konnte EOL nicht nach '%s' schreiben."
 
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
-#: sequencer.c:3130
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "Fehler beim Fertigstellen von '%s'."
 
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
-#: builtin/rebase.c:568
-#, c-format
-msgid "could not read '%s'"
-msgstr "Konnte '%s' nicht lesen"
-
-#: sequencer.c:462
+#: sequencer.c:486
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
 
-#: sequencer.c:466
+#: sequencer.c:490
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 "Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
 
-#: sequencer.c:498
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: Vorspulen"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:561 builtin/tag.c:609
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Ungültiger \"cleanup\" Modus %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:631
+#: sequencer.c:671
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Konnte neue Index-Datei nicht schreiben"
 
-#: sequencer.c:648
+#: sequencer.c:685
 msgid "unable to update cache tree"
 msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
 
-#: sequencer.c:662
+#: sequencer.c:699
 msgid "could not resolve HEAD commit"
 msgstr "Konnte HEAD-Commit nicht auflösen."
 
-#: sequencer.c:742
+#: sequencer.c:779
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "Kein Schlüssel in '%.*s' vorhanden."
 
-#: sequencer.c:753
+#: sequencer.c:790
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "Konnte Anführungszeichen von '%s' nicht entfernen."
 
-#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
+#: 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 "Konnte '%s' nicht zum Lesen öffnen."
 
-#: sequencer.c:800
+#: sequencer.c:837
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' bereits angegeben."
 
-#: sequencer.c:805
+#: sequencer.c:842
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' bereits angegeben."
 
-#: sequencer.c:810
+#: sequencer.c:847
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' bereits angegeben."
 
-#: sequencer.c:814
+#: sequencer.c:851
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "Unbekannte Variable '%s'"
 
-#: sequencer.c:819
+#: sequencer.c:856
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "'GIT_AUTHOR_NAME' fehlt."
 
-#: sequencer.c:821
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "'GIT_AUTHOR_EMAIL' fehlt."
 
-#: sequencer.c:823
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "'GIT_AUTHOR_DATE' fehlt."
 
-#: sequencer.c:872
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -6046,11 +7775,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1146
+#: sequencer.c:1212
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' Hook fehlgeschlagen."
 
-#: sequencer.c:1153
+#: 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"
@@ -6078,7 +7807,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1166
+#: 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"
@@ -6104,327 +7833,345 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1208
+#: sequencer.c:1273
 msgid "couldn't look up newly created commit"
 msgstr "Konnte neu erstellten Commit nicht nachschlagen."
 
-#: sequencer.c:1210
+#: sequencer.c:1275
 msgid "could not parse newly created commit"
 msgstr "Konnte neu erstellten Commit nicht analysieren."
 
-#: sequencer.c:1256
+#: sequencer.c:1321
 msgid "unable to resolve HEAD after creating commit"
 msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
 
-#: sequencer.c:1258
+#: sequencer.c:1323
 msgid "detached HEAD"
 msgstr "losgelöster HEAD"
 
-#: sequencer.c:1262
+#: sequencer.c:1327
 msgid " (root-commit)"
 msgstr " (Root-Commit)"
 
-#: sequencer.c:1283
+#: sequencer.c:1348
 msgid "could not parse HEAD"
 msgstr "Konnte HEAD nicht parsen."
 
-#: sequencer.c:1285
+#: sequencer.c:1350
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s ist kein Commit!"
 
-#: sequencer.c:1289 builtin/commit.c:1571
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
 msgid "could not parse HEAD commit"
 msgstr "Konnte Commit von HEAD nicht analysieren."
 
-#: sequencer.c:1341 sequencer.c:1933
+#: sequencer.c:1410 sequencer.c:2295
 msgid "unable to parse commit author"
 msgstr "Konnte Commit-Autor nicht parsen."
 
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
 msgid "git write-tree failed to write a tree"
 msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
 
-#: sequencer.c:1369 sequencer.c:1429
+#: sequencer.c:1454 sequencer.c:1574
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "Konnte Commit-Beschreibung von '%s' nicht lesen."
 
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "ungültige Autor-Identität '%s'"
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr "unbrauchbarer Autor: Datumsinformationen fehlen"
+
+#: 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 "Fehler beim Schreiben des Commit-Objektes."
 
-#: sequencer.c:1456
+#: 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 "Konnte %s nicht aktualisieren."
+
+#: sequencer.c:1606
 #, c-format
 msgid "could not parse commit %s"
 msgstr "Konnte Commit %s nicht parsen."
 
-#: sequencer.c:1461
+#: sequencer.c:1611
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "Konnte Eltern-Commit %s nicht parsen."
 
-#: sequencer.c:1535 sequencer.c:1645
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
 msgid "unknown command: %d"
 msgstr "Unbekannter Befehl: %d"
 
-#: sequencer.c:1592 sequencer.c:1617
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "Das ist die erste Commit-Beschreibung:"
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Das ist Commit-Beschreibung #%d:"
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "Die erste Commit-Beschreibung wird übersprungen:"
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
+
+#: sequencer.c:1740
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Das ist eine Kombination aus %d Commits."
 
-#: sequencer.c:1602
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "kann '%s' nicht schreiben"
+
+#: sequencer.c:1934
 msgid "need a HEAD to fixup"
 msgstr "benötige HEAD für fixup"
 
-#: sequencer.c:1604 sequencer.c:3157
+#: sequencer.c:1936 sequencer.c:3582
 msgid "could not read HEAD"
 msgstr "Konnte HEAD nicht lesen"
 
-#: sequencer.c:1606
+#: sequencer.c:1938
 msgid "could not read HEAD's commit message"
 msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
 
-#: sequencer.c:1612
-#, c-format
-msgid "cannot write '%s'"
-msgstr "kann '%s' nicht schreiben"
-
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
-msgid "This is the 1st commit message:"
-msgstr "Das ist die erste Commit-Beschreibung:"
-
-#: sequencer.c:1627
+#: sequencer.c:1962
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
 
-#: sequencer.c:1634
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Das ist Commit-Beschreibung #%d:"
-
-#: sequencer.c:1640
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
-
-#: sequencer.c:1728
+#: sequencer.c:2072
 msgid "your index file is unmerged."
 msgstr "Ihre Index-Datei ist nicht zusammengeführt."
 
-#: sequencer.c:1735
+#: sequencer.c:2079
 msgid "cannot fixup root commit"
 msgstr "kann fixup nicht auf Root-Commit anwenden"
 
-#: sequencer.c:1754
+#: sequencer.c:2098
 #, 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:1762 sequencer.c:1770
+#: sequencer.c:2106 sequencer.c:2114
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "Commit %s hat keinen Eltern-Commit %d"
 
-#: sequencer.c:1776
+#: sequencer.c:2120
 #, 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:1795
+#: sequencer.c:2139
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kann Eltern-Commit %s nicht parsen"
 
-#: sequencer.c:1860
+#: sequencer.c:2205
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "Konnte '%s' nicht zu '%s' umbenennen."
 
-#: sequencer.c:1915
+#: sequencer.c:2265
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
 
-#: sequencer.c:1916
+#: sequencer.c:2266
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "Konnte %s... (%s) nicht anwenden"
 
-#: sequencer.c:1983
+#: sequencer.c:2287
+#, 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
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: Fehler beim Lesen des Index"
 
-#: sequencer.c:1990
+#: sequencer.c:2352
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: Fehler beim Aktualisieren des Index"
 
-#: sequencer.c:2066
+#: sequencer.c:2425
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s akzeptiert keine Argumente: '%s'"
 
-#: sequencer.c:2075
+#: sequencer.c:2434
 #, c-format
 msgid "missing arguments for %s"
 msgstr "Fehlende Argumente für %s."
 
-#: sequencer.c:2112
+#: sequencer.c:2477
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "Konnte '%.*s' nicht parsen."
+msgid "could not parse '%s'"
+msgstr "Konnte '%s' nicht parsen."
 
-#: sequencer.c:2166
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "Ungültige Zeile %d: %.*s"
 
-#: sequencer.c:2177
+#: sequencer.c:2549
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
 
-#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "Konnte '%s' nicht lesen."
-
-#: sequencer.c:2261
+#: sequencer.c:2635
 msgid "cancelling a cherry picking in progress"
 msgstr "Abbrechen eines laufenden \"cherry-pick\""
 
-#: sequencer.c:2268
+#: sequencer.c:2644
 msgid "cancelling a revert in progress"
 msgstr "Abbrechen eines laufenden \"revert\""
 
-#: sequencer.c:2302
+#: sequencer.c:2690
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 "Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
 
-#: sequencer.c:2304
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "Unbenutzbares Instruktionsblatt: '%s'"
 
-#: sequencer.c:2309
+#: sequencer.c:2697
 msgid "no commits parsed."
 msgstr "Keine Commits geparst."
 
-#: sequencer.c:2320
+#: sequencer.c:2708
 msgid "cannot cherry-pick during a revert."
 msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
 
-#: sequencer.c:2322
+#: sequencer.c:2710
 msgid "cannot revert during a cherry-pick."
 msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
 
-#: sequencer.c:2404
+#: sequencer.c:2788
 #, c-format
 msgid "invalid value for %s: %s"
-msgstr "Ungültiger Wert für %s: %s"
+msgstr "ungültiger Wert für %s: %s"
 
-#: sequencer.c:2491
+#: sequencer.c:2897
 msgid "unusable squash-onto"
-msgstr "Unbenutzbares squash-onto."
+msgstr "unbenutzbares squash-onto"
 
-#: sequencer.c:2507
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
-msgstr "Fehlerhaftes Optionsblatt: '%s'"
+msgstr "fehlerhaftes Optionsblatt: '%s'"
 
-#: sequencer.c:2590 sequencer.c:4308
+#: sequencer.c:3012 sequencer.c:4868
 msgid "empty commit set passed"
 msgstr "leere Menge von Commits übergeben"
 
-#: sequencer.c:2606
+#: sequencer.c:3029
 msgid "revert is already in progress"
 msgstr "\"revert\" ist bereits im Gange"
 
-#: sequencer.c:2608
+#: sequencer.c:3031
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
-msgstr "Versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
+msgstr "versuchen Sie \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2611
+#: sequencer.c:3034
 msgid "cherry-pick is already in progress"
 msgstr "\"cherry-pick\" wird bereits durchgeführt"
 
-#: sequencer.c:2613
+#: sequencer.c:3036
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
-msgstr "Versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "versuchen Sie \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2627
+#: sequencer.c:3050
 #, c-format
 msgid "could not create sequencer directory '%s'"
-msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
+msgstr "konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen"
 
-#: sequencer.c:2642
+#: sequencer.c:3065
 msgid "could not lock HEAD"
-msgstr "Konnte HEAD nicht sperren"
+msgstr "konnte HEAD nicht sperren"
 
-#: sequencer.c:2702 sequencer.c:4057
+#: sequencer.c:3125 sequencer.c:4581
 msgid "no cherry-pick or revert in progress"
 msgstr "kein \"cherry-pick\" oder \"revert\" im Gange"
 
-#: sequencer.c:2704 sequencer.c:2715
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
 msgstr "kann HEAD nicht auflösen"
 
-#: sequencer.c:2706 sequencer.c:2750
+#: sequencer.c:3129 sequencer.c:3173
 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:2736 builtin/grep.c:736
+#: sequencer.c:3159 builtin/grep.c:758
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kann '%s' nicht öffnen"
 
-#: sequencer.c:2738
+#: sequencer.c:3161
 #, c-format
 msgid "cannot read '%s': %s"
-msgstr "Kann '%s' nicht lesen: %s"
+msgstr "kann '%s' nicht lesen: %s"
 
-#: sequencer.c:2739
+#: sequencer.c:3162
 msgid "unexpected end of file"
-msgstr "Unerwartetes Dateiende"
+msgstr "unerwartetes Dateiende"
 
-#: sequencer.c:2745
+#: sequencer.c:3168
 #, 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:2756
+#: sequencer.c:3179
 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:2797
+#: sequencer.c:3220
 msgid "no revert in progress"
-msgstr "Kein Revert im Gange"
+msgstr "kein Revert im Gange"
 
-#: sequencer.c:2805
+#: sequencer.c:3229
 msgid "no cherry-pick in progress"
 msgstr "kein \"cherry-pick\" im Gange"
 
-#: sequencer.c:2815
+#: sequencer.c:3239
 msgid "failed to skip the commit"
 msgstr "Ãœberspringen des Commits fehlgeschlagen"
 
-#: sequencer.c:2822
+#: sequencer.c:3246
 msgid "there is nothing to skip"
-msgstr "Nichts zum Ãœberspringen vorhanden"
+msgstr "nichts zum Ãœberspringen vorhanden"
 
-#: sequencer.c:2825
+#: sequencer.c:3249
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6433,21 +8180,16 @@ msgstr ""
 "Haben Sie bereits committet?\n"
 "Versuchen Sie \"git %s --continue\""
 
-#: sequencer.c:2949 sequencer.c:3969
-#, c-format
-msgid "could not update %s"
-msgstr "Konnte %s nicht aktualisieren."
-
-#: sequencer.c:2987 sequencer.c:3949
+#: sequencer.c:3411 sequencer.c:4472
 msgid "cannot read HEAD"
-msgstr "Kann HEAD nicht lesen"
+msgstr "kann HEAD nicht lesen"
 
-#: sequencer.c:3004
+#: sequencer.c:3428
 #, c-format
 msgid "unable to copy '%s' to '%s'"
-msgstr "Konnte '%s' nicht nach '%s' kopieren."
+msgstr "konnte '%s' nicht nach '%s' kopieren"
 
-#: sequencer.c:3012
+#: sequencer.c:3436
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6466,27 +8208,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3022
+#: sequencer.c:3446
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Konnte %s... (%.*s) nicht anwenden"
 
-#: sequencer.c:3029
+#: sequencer.c:3453
 #, c-format
 msgid "Could not merge %.*s"
-msgstr "Konnte \"%.*s\" nicht zusammenführen."
+msgstr "Konnte \"%.*s\" nicht zusammenführen"
 
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
 #, c-format
 msgid "could not copy '%s' to '%s'"
-msgstr "Konnte '%s' nicht nach '%s' kopieren."
+msgstr "konnte '%s' nicht nach '%s' kopieren"
 
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
-msgid "could not read index"
-msgstr "Konnte den Index nicht lesen."
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Führe aus: %s\n"
 
-#: sequencer.c:3074
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6502,11 +8244,11 @@ msgstr ""
 "\n"
 "ausführen.\n"
 
-#: sequencer.c:3080
+#: sequencer.c:3504
 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:3086
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6524,112 +8266,124 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3147
+#: sequencer.c:3572
 #, c-format
 msgid "illegal label name: '%.*s'"
-msgstr "Unerlaubter Beschriftungsname: '%.*s'"
+msgstr "unerlaubter Beschriftungsname: '%.*s'"
 
-#: sequencer.c:3201
+#: sequencer.c:3645
 msgid "writing fake root commit"
 msgstr "unechten Root-Commit schreiben"
 
-#: sequencer.c:3206
+#: sequencer.c:3650
 msgid "writing squash-onto"
 msgstr "squash-onto schreiben"
 
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-
-#: sequencer.c:3262 builtin/rebase.c:874
-msgid "could not write index"
-msgstr "Konnte Index nicht schreiben."
-
-#: sequencer.c:3289
+#: sequencer.c:3734
 #, c-format
 msgid "could not resolve '%s'"
-msgstr "Konnte '%s' nicht auflösen."
+msgstr "konnte '%s' nicht auflösen"
 
-#: sequencer.c:3320
+#: sequencer.c:3767
 msgid "cannot merge without a current revision"
-msgstr "Kann nicht ohne einen aktuellen Commit mergen."
+msgstr "kann nicht ohne einen aktuellen Commit mergen"
 
-#: sequencer.c:3342
+#: sequencer.c:3789
 #, c-format
 msgid "unable to parse '%.*s'"
-msgstr "Konnte '%.*s' nicht parsen."
+msgstr "konnte '%.*s' nicht parsen"
 
-#: sequencer.c:3351
+#: sequencer.c:3798
 #, c-format
 msgid "nothing to merge: '%.*s'"
-msgstr "Nichts zum Zusammenführen: '%.*s'"
+msgstr "nichts zum Zusammenführen: '%.*s'"
 
-#: sequencer.c:3363
+#: sequencer.c:3810
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
-"Octupus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden."
+"Oktopus-Merge kann nicht auf Basis von [neuem Root-Commit] ausgeführt werden"
 
-#: sequencer.c:3378
+#: sequencer.c:3826
 #, c-format
 msgid "could not get commit message of '%s'"
-msgstr "Konnte keine Commit-Beschreibung von '%s' bekommen."
+msgstr "konnte keine Commit-Beschreibung von '%s' bekommen"
 
-#: sequencer.c:3538
+#: sequencer.c:4009
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
-msgstr "Konnte nicht einmal versuchen '%.*s' zu mergen."
+msgstr "konnte nicht einmal versuchen '%.*s' zu mergen"
 
-#: sequencer.c:3554
+#: sequencer.c:4025
 msgid "merge: Unable to write new index file"
 msgstr "merge: Konnte neue Index-Datei nicht schreiben."
 
-#: sequencer.c:3623 builtin/rebase.c:712
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr "Kann automatischen Stash nicht erzeugen"
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Unerwartete 'stash'-Antwort: '%s'"
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Konnte Verzeichnis für '%s' nicht erstellen"
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Automatischen Stash erzeugt: %s\n"
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr "konnte 'reset --hard' nicht ausführen"
+
+#: sequencer.c:4140
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Automatischen Stash angewendet.\n"
 
-#: sequencer.c:3635
+#: sequencer.c:4152
 #, c-format
 msgid "cannot store %s"
 msgstr "kann %s nicht speichern"
 
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
+#: sequencer.c:4155
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
-"Anwendung des automatischen Stash resultierte in Konflikten.\n"
+"%s\n"
 "Ihre Änderungen sind im Stash sicher.\n"
 "Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
 
-#: sequencer.c:3699
-#, c-format
-msgid "could not checkout %s"
-msgstr "Konnte %s nicht auschecken."
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
+msgstr "Beim Anwenden des automatischen Stash traten Konflikte auf."
 
-#: sequencer.c:3713
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s: keine gültige OID"
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Automatischer Stash existiert; ein neuer Stash-Eintrag wird erstellt."
 
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
-msgstr "Konnte HEAD nicht loslösen"
+msgstr "konnte HEAD nicht loslösen"
 
-#: sequencer.c:3733
+#: sequencer.c:4248
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Angehalten bei HEAD\n"
 
-#: sequencer.c:3735
+#: sequencer.c:4250
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Angehalten bei %s\n"
 
-#: sequencer.c:3743
+#: sequencer.c:4258
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6651,50 +8405,60 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3827
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Rebase (%d/%d)%s"
+
+#: sequencer.c:4350
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Angehalten bei %s... %.*s\n"
 
-#: sequencer.c:3898
+#: sequencer.c:4421
 #, c-format
 msgid "unknown command %d"
 msgstr "Unbekannter Befehl %d"
 
-#: sequencer.c:3957
+#: sequencer.c:4480
 msgid "could not read orig-head"
 msgstr "Konnte orig-head nicht lesen."
 
-#: sequencer.c:3962
+#: sequencer.c:4485
 msgid "could not read 'onto'"
 msgstr "Konnte 'onto' nicht lesen."
 
-#: sequencer.c:3976
+#: sequencer.c:4499
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "Konnte HEAD nicht auf %s aktualisieren."
 
-#: sequencer.c:4069
+#: sequencer.c:4559
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Erfolgreich Rebase ausgeführt und %s aktualisiert.\n"
+
+#: sequencer.c:4611
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 "Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
 "vorgemerkt sind."
 
-#: sequencer.c:4078
+#: sequencer.c:4620
 msgid "cannot amend non-existing commit"
 msgstr "Kann nicht existierenden Commit nicht nachbessern."
 
-#: sequencer.c:4080
+#: sequencer.c:4622
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "Ungültige Datei: '%s'"
 
-#: sequencer.c:4082
+#: sequencer.c:4624
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "Ungültige Inhalte: '%s'"
 
-#: sequencer.c:4085
+#: sequencer.c:4627
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6705,79 +8469,69 @@ msgstr ""
 "committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
 "erneut aus."
 
-#: sequencer.c:4121 sequencer.c:4159
+#: sequencer.c:4663 sequencer.c:4702
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "Konnte Datei nicht schreiben: '%s'"
 
-#: sequencer.c:4174
+#: sequencer.c:4718
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
 
-#: sequencer.c:4181
+#: sequencer.c:4725
 msgid "could not commit staged changes."
 msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
 
-#: sequencer.c:4285
+#: sequencer.c:4845
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
 
-#: sequencer.c:4289
+#: sequencer.c:4849
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: ungültiger Commit"
 
-#: sequencer.c:4324
+#: sequencer.c:4884
 msgid "can't revert as initial commit"
 msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
 
-#: sequencer.c:4774
+#: sequencer.c:5361
 msgid "make_script: unhandled options"
 msgstr "make_script: unbehandelte Optionen"
 
-#: sequencer.c:4777
+#: sequencer.c:5364
 msgid "make_script: error preparing revisions"
 msgstr "make_script: Fehler beim Vorbereiten der Commits"
 
-#: sequencer.c:4935
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n"
-"'git rebase --continue' aus.\n"
-"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n"
-
-#: sequencer.c:5047 sequencer.c:5064
+#: sequencer.c:5614 sequencer.c:5631
 msgid "nothing to do"
 msgstr "Nichts zu tun."
 
-#: sequencer.c:5078
+#: sequencer.c:5650
 msgid "could not skip unnecessary pick commands"
 msgstr "Konnte unnötige \"pick\"-Befehle nicht auslassen."
 
-#: sequencer.c:5166
+#: sequencer.c:5750
 msgid "the script was already rearranged."
 msgstr "Das Script wurde bereits umgeordnet."
 
-#: setup.c:124
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' liegt außerhalb des Repositories."
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' liegt außerhalb des Repositories von '%s'"
 
-#: setup.c:174
+#: setup.c:185
 #, 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: kein solcher Pfad im Arbeitsverzeichnis.\n"
+"%s: Pfad nicht im Arbeitsverzeichnis gefunden.\n"
 "Benutzen Sie 'git <Befehl> -- <Pfad>...' zur Angabe von Pfaden, die lokal\n"
 "nicht existieren."
 
-#: setup.c:187
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6789,13 +8543,13 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
-#: setup.c:236
+#: setup.c:264
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 "Die Option '%s' muss vor den Argumenten kommen, die keine Optionen sind."
 
-#: setup.c:255
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6806,93 +8560,101 @@ msgstr ""
 "Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
 "'git <Befehl> [<Commit>...] -- [<Datei>...]'"
 
-#: setup.c:391
+#: setup.c:419
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "Konnte Arbeitsverzeichnis mit ungültiger Konfiguration nicht einrichten."
 
-#: setup.c:395
+#: setup.c:423 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:541
+#: setup.c:658
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
 
-#: setup.c:549
-msgid "unknown repository extensions found:"
-msgstr "Unbekannte Repository-Erweiterungen gefunden:"
+#: setup.c:666
+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:568
+#: 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] "Repository-Version ist 0, aber Erweiterung nur für v1 gefunden:"
+msgstr[1] "Repository-Version ist 0, aber Erweiterungen nur für v1 gefunden:"
+
+#: setup.c:701
 #, c-format
 msgid "error opening '%s'"
 msgstr "Fehler beim Öffnen von '%s'."
 
-#: setup.c:570
+#: setup.c:703
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "Zu groß, um eine .git-Datei zu sein: '%s'"
 
-#: setup.c:572
+#: setup.c:705
 #, c-format
 msgid "error reading %s"
 msgstr "Fehler beim Lesen von '%s'."
 
-#: setup.c:574
+#: setup.c:707
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "Ungültiges gitfile-Format: %s"
 
-#: setup.c:576
+#: setup.c:709
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "Kein Pfad in gitfile: %s"
 
-#: setup.c:578
+#: setup.c:711
 #, c-format
 msgid "not a git repository: %s"
 msgstr "Kein Git-Repository: %s"
 
-#: setup.c:677
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' zu groß"
 
-#: setup.c:691
+#: setup.c:827
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "Kein Git-Repository: '%s'"
 
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c:856 setup.c:858 setup.c:889
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "Kann nicht in Verzeichnis '%s' wechseln."
 
-#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
 msgid "cannot come back to cwd"
 msgstr "Kann nicht zum aktuellen Arbeitsverzeichnis zurückwechseln."
 
-#: setup.c:852
+#: setup.c:988
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "Konnte '%*s%s%s' nicht lesen."
 
-#: setup.c:1090
+#: setup.c:1231
 msgid "Unable to read current working directory"
 msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
 
-#: setup.c:1099 setup.c:1105
+#: setup.c:1240 setup.c:1246
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "Kann nicht nach '%s' wechseln."
 
-#: setup.c:1110
+#: setup.c:1251
 #, 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:1116
+#: setup.c:1257
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6902,7 +8664,7 @@ msgstr ""
 "%s)\n"
 "Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
 
-#: setup.c:1227
+#: setup.c:1381
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6911,352 +8673,69 @@ 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:1271
+#: setup.c:1430
 msgid "open /dev/null or dup failed"
 msgstr "Öffnen von /dev/null oder dup fehlgeschlagen."
 
-#: setup.c:1286
+#: setup.c:1445
 msgid "fork failed"
 msgstr "fork fehlgeschlagen"
 
-#: setup.c:1291
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
 msgid "setsid failed"
 msgstr "setsid fehlgeschlagen"
 
-#: sha1-file.c:452
-#, 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"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "Konnte alternativen Objektpfad '%s' nicht normalisieren."
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignoriere alternative Objektspeicher - Verschachtelung zu tief"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "Konnte Objektverzeichnis '%s' nicht normalisieren."
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "Konnte fdopen nicht auf Lock-Datei für \"alternates\" aufrufen."
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "Konnte \"alternates\"-Datei nicht lesen."
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "Konnte neue \"alternates\"-Datei nicht übernehmen."
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "Pfad '%s' existiert nicht"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
-"Arbeitsverzeichnis unterstützt."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr ""
-"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
-"eingehängt."
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
+msgstr "versuche partiellen Index ohne Cone-Modus zu benutzen"
 
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "Ungültige Zeile beim Parsen alternativer Referenzen: %s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "Versuche mmap %<PRIuMAX> über Limit %<PRIuMAX>."
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap fehlgeschlagen"
+#: sparse-index.c:176
+msgid "unable to update cache-tree, staying full"
+msgstr "konnte Cache-Verzeichnis nicht aktualisieren, bleibt voll"
 
-#: sha1-file.c:1128
+#: sparse-index.c:263
 #, c-format
-msgid "object file %s is empty"
-msgstr "Objektdatei %s ist leer."
-
-#: sha1-file.c:1252 sha1-file.c:2392
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "Fehlerhaftes loses Objekt '%s'."
-
-#: sha1-file.c:1254 sha1-file.c:2396
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "Nutzlose Daten am Ende von losem Objekt '%s'."
-
-#: sha1-file.c:1296
-msgid "invalid object type"
-msgstr "ungültiger Objekt-Typ"
-
-#: sha1-file.c:1380
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "Konnte %s Kopfbereich nicht mit --allow-unknown-type entpacken."
-
-#: sha1-file.c:1383
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "Konnte %s Kopfbereich nicht entpacken."
-
-#: sha1-file.c:1389
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "Konnte %s Kopfbereich mit --allow-unknown-type nicht parsen."
-
-#: sha1-file.c:1392
-#, c-format
-msgid "unable to parse %s header"
-msgstr "Konnte %s Kopfbereich nicht parsen."
-
-#: sha1-file.c:1584
-#, c-format
-msgid "failed to read object %s"
-msgstr "Konnte Objekt %s nicht lesen."
-
-#: sha1-file.c:1588
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "Ersetzung %s für %s nicht gefunden."
-
-#: sha1-file.c:1592
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "Loses Objekt %s (gespeichert in %s) ist beschädigt."
-
-#: sha1-file.c:1596
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "Gepacktes Objekt %s (gespeichert in %s) ist beschädigt."
-
-#: sha1-file.c:1699
-#, c-format
-msgid "unable to write file %s"
-msgstr "Konnte Datei %s nicht schreiben."
-
-#: sha1-file.c:1706
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "Konnte Zugriffsberechtigung auf '%s' nicht setzen."
-
-#: sha1-file.c:1713
-msgid "file write error"
-msgstr "Fehler beim Schreiben einer Datei."
-
-#: sha1-file.c:1732
-msgid "error when closing loose object file"
-msgstr "Fehler beim Schließen der Datei für lose Objekte."
-
-#: sha1-file.c:1797
-#, 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"
-
-#: sha1-file.c:1799
-msgid "unable to create temporary file"
-msgstr "Konnte temporäre Datei nicht erstellen."
-
-#: sha1-file.c:1823
-msgid "unable to write loose object file"
-msgstr "Fehler beim Schreiben der Datei für lose Objekte."
-
-#: sha1-file.c:1829
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "Konnte neues Objekt %s (%d) nicht komprimieren."
-
-#: sha1-file.c:1833
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "deflateEnd auf Objekt %s fehlgeschlagen (%d)"
-
-#: sha1-file.c:1837
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "Fehler wegen instabilen Objektquelldaten für %s"
-
-#: sha1-file.c:1847 builtin/pack-objects.c:925
-#, c-format
-msgid "failed utime() on %s"
-msgstr "Fehler beim Aufruf von utime() auf '%s'."
-
-#: sha1-file.c:1922
-#, c-format
-msgid "cannot read object for %s"
-msgstr "Kann Objekt für %s nicht lesen."
-
-#: sha1-file.c:1962
-msgid "corrupt commit"
-msgstr "fehlerhafter Commit"
-
-#: sha1-file.c:1970
-msgid "corrupt tag"
-msgstr "fehlerhaftes Tag"
-
-#: sha1-file.c:2069
-#, c-format
-msgid "read error while indexing %s"
-msgstr "Lesefehler beim Indizieren von '%s'."
-
-#: sha1-file.c:2072
-#, c-format
-msgid "short read while indexing %s"
-msgstr "read() zu kurz beim Indizieren von '%s'."
-
-#: sha1-file.c:2145 sha1-file.c:2154
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: Fehler beim Einfügen in die Datenbank"
-
-#: sha1-file.c:2160
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: nicht unterstützte Dateiart"
-
-#: sha1-file.c:2184
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s ist kein gültiges Objekt"
-
-#: sha1-file.c:2186
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s ist kein gültiges '%s' Objekt"
-
-#: sha1-file.c:2213 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "kann %s nicht öffnen"
-
-#: sha1-file.c:2403 sha1-file.c:2455
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "Hash für %s stimmt nicht überein (%s erwartet)."
-
-#: sha1-file.c:2427
-#, c-format
-msgid "unable to mmap %s"
-msgstr "Konnte mmap nicht auf %s ausführen."
-
-#: sha1-file.c:2432
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "Konnte Kopfbereich von %s nicht entpacken."
-
-#: sha1-file.c:2438
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "Konnte Kopfbereich von %s nicht parsen."
-
-#: sha1-file.c:2449
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "Konnte Inhalt von %s nicht entpacken."
-
-#: sha1-name.c:487
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "Kurzer SHA-1 %s ist mehrdeutig."
-
-#: sha1-name.c:498
-msgid "The candidates are:"
-msgstr "Die Kandidaten sind:"
-
-#: sha1-name.c:797
-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 ""
-"Git erzeugt normalerweise keine Referenzen die mit\n"
-"40 Hex-Zeichen enden, da diese ignoriert werden wenn\n"
-"Sie diese angeben. Diese Referenzen könnten aus Versehen\n"
-"erzeugt worden sein. Zum Beispiel,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"wobei \"$br\" leer ist und eine 40-Hex-Referenz erzeugt\n"
-"wurde. Bitte prüfen Sie diese Referenzen und löschen\n"
-"Sie sie gegebenenfalls. Unterdrücken Sie diese Meldung\n"
-"indem Sie \"git config advice.objectNameWarning false\"\n"
-"ausführen."
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "Index-Eintrag ist ein Verzeichnis, aber nicht partiell (%08x)"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:822
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
+#: 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:832
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: 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:841
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
+#: 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:849
+#: strbuf.c:877
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7264,13 +8743,50 @@ msgstr[0] "%u Byte"
 msgstr[1] "%u Bytes"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
+#: strbuf.c:879
 #, c-format
 msgid "%u byte/s"
 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:738
+#: builtin/rebase.c:866
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr "Konnte '%s' nicht editieren."
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "Ignoriere verdächtigen Submodulnamen: %s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt."
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden "
+"würde."
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "Ungültiger Wert für %s"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7291,61 +8807,138 @@ msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
 msgid "staging updated .gitmodules failed"
 msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
 
-#: submodule.c:327
+#: submodule.c:328
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "In nicht ausgechecktem Submodul '%s'."
 
-#: submodule.c:358
+#: submodule.c:359
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
 
-#: submodule.c:910
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "ungültiges --ignore-submodules Argument: %s"
+
+#: submodule.c:805
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Submodul in Commit %s beim Pfad: '%s' hat den gleichen Namen wie ein "
+"Submodul. Wird übersprungen."
+
+#: submodule.c:908
 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:993
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Konnte 'git rev-list <Commits> --not --remotes -n 1' nicht in Submodul '%s' "
+"ausführen."
+
+#: submodule.c:1116
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "Prozess für Submodul '%s' fehlgeschlagen"
+
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
 
-#: submodule.c:1481
+#: submodule.c:1156
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "Konnte nicht auf Submodul '%s' zugreifen."
+msgid "Pushing submodule '%s'\n"
+msgstr "Pushe Submodul '%s'\n"
 
-#: submodule.c:1651
+#: submodule.c:1159
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Kann Push für Submodul '%s' nicht ausführen\n"
+
+#: submodule.c:1451
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Anfordern des Submoduls %s%s\n"
+
+#: submodule.c:1485
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Konnte nicht auf Submodul '%s' zugreifen\n"
+
+#: submodule.c:1640
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Fehler während des Anforderns der Submodule:\n"
+"%s"
+
+#: submodule.c:1665
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' nicht als Git-Repository erkannt"
 
-#: submodule.c:1789
+#: submodule.c:1682
+#, 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:1723
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' ist in Submodul %s fehlgeschlagen"
+
+#: submodule.c:1798
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
 
-#: submodule.c:1802
+#: submodule.c:1811
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
 
-#: submodule.c:1817
+#: submodule.c:1826
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "Konnte core.worktree Einstellung in Submodul '%s' nicht aufheben."
 
-#: submodule.c:1907
+#: submodule.c:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
+
+#: submodule.c:1874
+msgid "could not reset submodule index"
+msgstr "konnte Index des Submoduls nicht zurücksetzen"
+
+#: submodule.c:1916
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "Submodul '%s' hat einen geänderten Index."
 
-#: submodule.c:1959
+#: submodule.c:1968
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Submodule '%s' konnte nicht aktualisiert werden."
 
-#: submodule.c:2007
+#: submodule.c:2036
+#, 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:2057
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7353,12 +8946,17 @@ msgstr ""
 "relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
 "wird nicht unterstützt"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2069 submodule.c:2128
 #, c-format
 msgid "could not lookup name for submodule '%s'"
-msgstr "konnte Name für Submodul '%s' nicht nachschlagen"
+msgstr "Konnte Name für Submodul '%s' nicht nachschlagen."
+
+#: submodule.c:2073
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "Verschieben von '%s' in ein existierendes Git-Verzeichnis verweigert."
 
-#: submodule.c:2026
+#: submodule.c:2080
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7369,209 +8967,91 @@ msgstr ""
 "'%s' nach\n"
 "'%s'\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
-
-#: submodule.c:2153
+#: submodule.c:2208
 msgid "could not start ls-files in .."
 msgstr "Konnte 'ls-files' nicht in .. starten"
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
 
-#: submodule-config.c:236
+#: symlinks.c:244
 #, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "Ignoriere verdächtigen Submodulnamen: %s"
+msgid "failed to lstat '%s'"
+msgstr "'lstat' für '%s' fehlgeschlagen"
 
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt."
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"Ignoriere '%s', was als eine Befehlszeilenoption '%s' interpretiert werden "
-"würde."
-
-#: submodule-config.c:490
-#, c-format
-msgid "invalid value for %s"
-msgstr "Ungültiger Wert für %s"
-
-#: submodule-config.c:761
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
-
-#: trailer.c:238
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen"
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: 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 "unbekannter Wert '%s' für Schlüssel %s"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: 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 "mehr als ein %s"
 
-#: trailer.c:730
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "leerer Anhang-Token in Anhang '%.*s'"
 
-#: trailer.c:750
+#: trailer.c:763
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
 
-#: trailer.c:753
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
 msgid "could not read from stdin"
 msgstr "konnte nicht von der Standard-Eingabe lesen"
 
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1024 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
 msgstr "Konnte '%s' nicht lesen"
 
-#: trailer.c:1013
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "Datei '%s' ist keine reguläre Datei"
 
-#: trailer.c:1015
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "Datei %s ist vom Benutzer nicht beschreibbar."
 
-#: trailer.c:1027
+#: trailer.c:1040
 msgid "could not open temporary file"
 msgstr "konnte temporäre Datei '%s' nicht öffnen"
 
-#: trailer.c:1067
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "konnte temporäre Datei nicht zu %s umbenennen"
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "Konnte Paket '%s' nicht lesen."
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: ungültige --depth Option '%s'"
-
-#: transport.c:266
-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:267
-msgid "server options require protocol version 2 or later"
-msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "Konnte transport.color.* Konfiguration nicht parsen."
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "Unterstützung für Protokoll v2 noch nicht implementiert."
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "Unbekannter Wert für Konfiguration '%s': %s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "Ãœbertragungsart '%s' nicht erlaubt."
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync wird nicht länger unterstützt."
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
-"Remote-Repository gefunden wurden:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Bitte versuchen Sie\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"oder wechseln Sie in das Verzeichnis und benutzen Sie\n"
-"\n"
-"\tgit push\n"
-"\n"
-"zum Versenden zu einem Remote-Repository.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Abbruch."
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "Fehler beim Versand aller erforderlichen Submodule."
-
-#: transport.c:1345 transport-helper.c:655
-msgid "operation not supported by protocol"
-msgstr "Die Operation wird von dem Protokoll nicht unterstützt."
-
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
 msgstr "Vollständiges Schreiben zu Remote-Helper fehlgeschlagen."
 
-#: transport-helper.c:144
+#: transport-helper.c:145
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "Konnte Remote-Helper für '%s' nicht finden."
 
-#: transport-helper.c:160 transport-helper.c:569
+#: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
 msgstr ""
 "Konnte dup() auf Dateideskriptor für Ausgaben des Remote-Helpers nicht "
 "ausführen."
 
-#: transport-helper.c:211
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7580,157 +9060,272 @@ msgstr ""
 "Unbekannte erforderliche Fähigkeit %s; dieser Remote-Helper benötigt\n"
 "wahrscheinlich eine neuere Version von Git."
 
-#: transport-helper.c:217
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
 msgstr "Dieser Remote-Helper sollte die \"refspec\"-Fähigkeit implementieren."
 
-#: transport-helper.c:284 transport-helper.c:424
+#: transport-helper.c:287 transport-helper.c:429
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "unerwartete Ausgabe von %s: '%s'"
 
-#: transport-helper.c:413
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s sperrte auch %s"
 
-#: transport-helper.c:491
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
-msgstr "Konnte \"fast-import\" nicht ausführen."
+msgstr "konnte \"fast-import\" nicht ausführen"
 
-#: transport-helper.c:514
+#: transport-helper.c:520
 msgid "error while running fast-import"
 msgstr "Fehler beim Ausführen von 'fast-import'."
 
-#: transport-helper.c:543 transport-helper.c:1132
+#: transport-helper.c:549 transport-helper.c:1247
 #, c-format
 msgid "could not read ref %s"
-msgstr "Konnte Referenz %s nicht lesen."
+msgstr "konnte Referenz %s nicht lesen"
 
-#: transport-helper.c:588
+#: transport-helper.c:594
 #, c-format
 msgid "unknown response to connect: %s"
-msgstr "Unbekannte Antwort auf 'connect': %s"
+msgstr "unbekannte Antwort auf 'connect': %s"
 
-#: transport-helper.c:610
+#: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
 msgstr ""
-"Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstützt."
+"Setzen des Remote-Service Pfads wird von dem Protokoll nicht unterstützt"
 
-#: transport-helper.c:612
+#: transport-helper.c:618
 msgid "invalid remote service path"
-msgstr "Ungültiger Remote-Service Pfad."
+msgstr "ungültiger Remote-Service Pfad."
 
-#: transport-helper.c:658
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr "die Operation wird von dem Protokoll nicht unterstützt"
+
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
-msgstr "Kann keine Verbindung zu Subservice %s herstellen."
+msgstr "kann keine Verbindung zu Subservice %s herstellen"
+
+#: transport-helper.c:693 transport.c:400
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only benötigt Protokoll v2"
 
-#: transport-helper.c:734
+#: transport-helper.c:755
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' ohne passende 'ok/error' Direktive"
+
+#: transport-helper.c:798
 #, c-format
 msgid "expected ok/error, helper said '%s'"
-msgstr "Erwartete ok/error, Remote-Helper gab '%s' aus."
+msgstr "erwartete ok/error, Remote-Helper gab '%s' aus"
 
-#: transport-helper.c:787
+#: transport-helper.c:855
 #, c-format
 msgid "helper reported unexpected status of %s"
-msgstr "Remote-Helper meldete unerwarteten Status von %s."
+msgstr "Remote-Helper meldete unerwarteten Status von %s"
 
-#: transport-helper.c:848
+#: transport-helper.c:938
 #, c-format
 msgid "helper %s does not support dry-run"
-msgstr "Remote-Helper %s unterstützt kein Trockenlauf."
+msgstr "Remote-Helper %s unterstützt kein Trockenlauf"
 
-#: transport-helper.c:851
+#: transport-helper.c:941
 #, c-format
 msgid "helper %s does not support --signed"
-msgstr "Remote-Helper %s unterstützt kein --signed."
+msgstr "Remote-Helper %s unterstützt kein --signed"
 
-#: transport-helper.c:854
+#: transport-helper.c:944
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
-msgstr "Remote-Helper %s unterstützt kein --signed=if-asked."
+msgstr "Remote-Helper %s unterstützt kein --signed=if-asked"
 
-#: transport-helper.c:859
+#: transport-helper.c:949
 #, c-format
 msgid "helper %s does not support --atomic"
-msgstr "Remote-Helper %s unterstützt kein --atomic."
+msgstr "Remote-Helper %s unterstützt kein --atomic"
+
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "Remote-Helper %s unterstützt kein --%s"
 
-#: transport-helper.c:865
+#: transport-helper.c:960
 #, c-format
 msgid "helper %s does not support 'push-option'"
-msgstr "Remote-Helper %s unterstützt nicht 'push-option'."
+msgstr "Remote-Helper %s unterstützt nicht 'push-option'"
 
-#: transport-helper.c:963
+#: transport-helper.c:1060
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "Remote-Helper unterstützt kein Push; Refspec benötigt"
 
-#: transport-helper.c:968
+#: transport-helper.c:1065
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "Remote-Helper %s unterstützt kein 'force'."
 
-#: transport-helper.c:1015
+#: transport-helper.c:1112
 msgid "couldn't run fast-export"
 msgstr "Konnte \"fast-export\" nicht ausführen."
 
-#: transport-helper.c:1020
+#: transport-helper.c:1117
 msgid "error while running fast-export"
 msgstr "Fehler beim Ausführen von \"fast-export\"."
 
-#: transport-helper.c:1045
+#: transport-helper.c:1142
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 "Keine gemeinsamen Referenzen und nichts spezifiziert; keine Ausführung.\n"
-"Vielleicht sollten Sie einen Branch wie 'master' angeben.\n"
+"Vielleicht sollten Sie einen Branch angeben.\n"
+
+#: transport-helper.c:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "nicht unterstütztes Objekt-Format '%s'"
 
-#: transport-helper.c:1118
+#: transport-helper.c:1233
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "Ungültige Antwort in Referenzliste: %s"
 
-#: transport-helper.c:1270
+#: transport-helper.c:1385
 #, c-format
 msgid "read(%s) failed"
 msgstr "Lesen von %s fehlgeschlagen."
 
-#: transport-helper.c:1297
+#: transport-helper.c:1412
 #, c-format
 msgid "write(%s) failed"
 msgstr "Schreiben von %s fehlgeschlagen."
 
-#: transport-helper.c:1346
+#: transport-helper.c:1461
 #, c-format
 msgid "%s thread failed"
 msgstr "Thread %s fehlgeschlagen."
 
-#: transport-helper.c:1350
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "Fehler beim Beitreten zu Thread %s: %s"
 
-#: transport-helper.c:1369 transport-helper.c:1373
+#: transport-helper.c:1484 transport-helper.c:1488
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "Kann Thread zum Kopieren von Daten nicht starten: %s"
 
-#: transport-helper.c:1410
+#: transport-helper.c:1525
 #, c-format
 msgid "%s process failed to wait"
 msgstr "Fehler beim Warten von Prozess %s."
 
-#: transport-helper.c:1414
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed"
 msgstr "Prozess %s fehlgeschlagen"
 
-#: transport-helper.c:1432 transport-helper.c:1441
+#: transport-helper.c:1547 transport-helper.c:1556
 msgid "can't start thread for copying data"
 msgstr "Kann Thread zum Kopieren von Daten nicht starten."
 
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Würde Upstream-Branch von '%s' zu '%s' von '%s' setzen\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "Konnte Paket '%s' nicht lesen."
+
+#: transport.c:223
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ungültige depth Option '%s'"
+
+#: transport.c:275
+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:276
+msgid "server options require protocol version 2 or later"
+msgstr "Server-Optionen benötigen Protokoll-Version 2 oder höher"
+
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr "Server unterstützt nicht 'wait-for-done'"
+
+#: transport.c:755
+msgid "could not parse transport.color.* config"
+msgstr "Konnte transport.color.* Konfiguration nicht parsen."
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr "Unterstützung für Protokoll v2 noch nicht implementiert."
+
+#: transport.c:965
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "Unbekannter Wert für Konfiguration '%s': %s"
+
+#: transport.c:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "Ãœbertragungsart '%s' nicht erlaubt."
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync wird nicht länger unterstützt."
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
+"Remote-Repository gefunden wurden:\n"
+
+#: transport.c:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Bitte versuchen Sie\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"oder wechseln Sie in das Verzeichnis und benutzen Sie\n"
+"\n"
+"\tgit push\n"
+"\n"
+"zum Versenden zu einem Remote-Repository.\n"
+"\n"
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr "Abbruch."
+
+#: transport.c:1346
+msgid "failed to push all needed submodules"
+msgstr "Fehler beim Versand aller erforderlichen Submodule."
+
 #: tree-walk.c:33
 msgid "too-short tree object"
 msgstr "zu kurzes Tree-Objekt"
@@ -7747,7 +9342,7 @@ msgstr "leerer Dateiname in Tree-Eintrag"
 msgid "too-short tree file"
 msgstr "zu kurze Tree-Datei"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7758,7 +9353,7 @@ msgstr ""
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
 "wechseln."
 
-#: unpack-trees.c:112
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7768,7 +9363,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7778,7 +9373,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7788,7 +9383,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7798,7 +9393,7 @@ msgstr ""
 "überschrieben werden:\n"
 "%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
 
-#: unpack-trees.c:122
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7807,7 +9402,7 @@ msgstr ""
 "Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
 "%%s"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7817,7 +9412,7 @@ msgstr ""
 "Dateien in diesen Verzeichnissen verloren gehen:\n"
 "%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7827,7 +9422,7 @@ msgstr ""
 "den Checkout entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:133
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7838,7 +9433,7 @@ msgstr ""
 "Checkout entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7848,7 +9443,7 @@ msgstr ""
 "den Merge entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7859,7 +9454,7 @@ msgstr ""
 "Merge entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7869,7 +9464,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7879,7 +9474,7 @@ msgstr ""
 "den %s entfernt werden:\n"
 "%%s"
 
-#: unpack-trees.c:149
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7890,7 +9485,7 @@ msgstr ""
 "den Checkout überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
 
-#: unpack-trees.c:151
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7902,7 +9497,7 @@ msgstr ""
 "Checkout überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7912,7 +9507,7 @@ msgstr ""
 "den Merge überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7922,7 +9517,7 @@ msgstr ""
 "den Merge überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7932,7 +9527,7 @@ msgstr ""
 "den %s überschrieben werden:\n"
 "%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7943,62 +9538,71 @@ msgstr ""
 "%s überschrieben werden:\n"
 "%%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
 
-#: unpack-trees.c:172
+#: unpack-trees.c:177
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
 "%s"
 msgstr ""
-"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge\n"
-"sind nicht aktuell:\n"
+"Kann Submodul nicht aktualisieren:\n"
 "%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Die folgenden Dateien im Arbeitsverzeichnis würden durch die Aktualisierung\n"
-"über einen partiellen Checkout überschrieben werden:\n"
+"Die folgenden Pfade sind nicht aktuell und wurden trotz partieller Muster\n"
+"übrig gelassen:\n"
 "%s"
 
-#: unpack-trees.c:176
+#: unpack-trees.c:182
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
-"Die folgenden Dateien im Arbeitsverzeichnis würden durch die Aktualisierung\n"
-"über einen partiellen Checkout entfernt werden:\n"
+"Die folgenden Pfade sind nicht zusammengeführt und wurden trotz\n"
+"partieller Muster übrig gelassen:\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:184
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Kann Submodul nicht aktualisieren:\n"
+"Die folgenden Pfade waren bereits vorhanden und wurden deshalb trotz\n"
+"partieller Muster nicht aktualisiert:\n"
 "%s"
 
-#: unpack-trees.c:255
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "Abbruch\n"
 
-#: unpack-trees.c:317
+#: unpack-trees.c:291
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Nachdem die obigen Pfade behoben sind, können Sie `git sparse-checkout "
+"reapply` ausführen.\n"
+
+#: unpack-trees.c:352
 msgid "Updating files"
 msgstr "Aktualisiere Dateien"
 
-#: unpack-trees.c:349
+#: 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"
@@ -8008,6 +9612,20 @@ msgstr ""
 "auf einem case-insensitiven Dateisystem) und nur einer von der\n"
 "selben Kollissionsgruppe ist im Arbeitsverzeichnis:\n"
 
+#: unpack-trees.c:1618
+msgid "Updating index flags"
+msgstr "Aktualisiere Index-Markierungen"
+
+#: unpack-trees.c:2718
+#, 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
+msgid "expected flush after fetch arguments"
+msgstr "erwartete Flush nach Abrufen der Argumente"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "Ungültiges URL-Schema oder Suffix '://' fehlt"
@@ -8037,27 +9655,31 @@ msgstr "ungültige Portnummer"
 msgid "invalid '..' path segment"
 msgstr "ungültiges '..' Pfadsegment"
 
-#: worktree.c:258 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Anfordern der Objekte"
+
+#: worktree.c:236 builtin/am.c:2152
 #, c-format
 msgid "failed to read '%s'"
 msgstr "Fehler beim Lesen von '%s'"
 
-#: worktree.c:304
+#: worktree.c:303
 #, 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:314
 #, 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:326
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' existiert nicht."
 
-#: worktree.c:333
+#: worktree.c:332
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
@@ -8067,19 +9689,86 @@ msgstr "'%s' ist keine .git-Datei, Fehlercode %d"
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' zeigt nicht zurück auf '%s'"
 
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:603
+msgid "not a directory"
+msgstr "kein Verzeichnis"
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr ".git ist keine Datei"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr ".git-Datei kaputt"
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr ".git-Datei fehlerhaft"
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr "kein gültiger Pfad"
+
+#: worktree.c:728
+msgid "unable to locate repository; .git is not a file"
+msgstr "Konnte Repository nicht finden; .git ist keine Datei"
+
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+"konnte Repository nicht finden; .git-Datei referenziert kein Repository"
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr "Konnte Repository nicht finden; .git-Datei ist kaputt"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr "gitdir nicht lesbar"
+
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr "gitdir fehlerhaft"
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr "kein gültiges Verzeichnis"
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "gitdir-Datei existiert nicht"
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "konnte gitdir-Datei nicht lesen (%s)"
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> gelesen)"
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "ungültige gitdir-Datei"
+
+#: worktree.c:817
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir-Datei verweist auf nicht existierenden Ort"
+
+#: wrapper.c:197 wrapper.c:367
 #, c-format
 msgid "could not open '%s' for reading and writing"
-msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
+msgstr "konnte '%s' nicht zum Lesen und Schreiben öffnen"
 
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr "konnte nicht auf '%s' zugreifen"
 
-#: wrapper.c:596
+#: wrapper.c:607
 msgid "unable to get current working directory"
-msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
+msgstr "konnte aktuelles Arbeitsverzeichnis nicht bekommen"
 
 #: wt-status.c:158
 msgid "Unmerged paths:"
@@ -8120,11 +9809,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:1074
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr "Zum Commit vorgemerkte Änderungen:"
 
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
 msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
 
@@ -8160,94 +9849,94 @@ msgstr ""
 "  (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
 "vorzumerken)"
 
-#: wt-status.c:268
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr "beide gelöscht:"
 
-#: wt-status.c:270
+#: wt-status.c:268
 msgid "added by us:"
 msgstr "von uns hinzugefügt:"
 
-#: wt-status.c:272
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "von denen gelöscht:"
 
-#: wt-status.c:274
+#: wt-status.c:272
 msgid "added by them:"
 msgstr "von denen hinzugefügt:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr "von uns gelöscht:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "both added:"
 msgstr "von beiden hinzugefügt:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "both modified:"
 msgstr "von beiden geändert:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "new file:"
 msgstr "neue Datei:"
 
-#: wt-status.c:292
+#: wt-status.c:290
 msgid "copied:"
 msgstr "kopiert:"
 
-#: wt-status.c:294
+#: wt-status.c:292
 msgid "deleted:"
 msgstr "gelöscht:"
 
-#: wt-status.c:296
+#: wt-status.c:294
 msgid "modified:"
 msgstr "geändert:"
 
-#: wt-status.c:298
+#: wt-status.c:296
 msgid "renamed:"
 msgstr "umbenannt:"
 
-#: wt-status.c:300
+#: wt-status.c:298
 msgid "typechange:"
 msgstr "Typänderung:"
 
-#: wt-status.c:302
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "unbekannt:"
 
-#: wt-status.c:304
+#: wt-status.c:302
 msgid "unmerged:"
 msgstr "nicht gemerged:"
 
-#: wt-status.c:384
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "neue Commits, "
 
-#: wt-status.c:386
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "geänderter Inhalt, "
 
-#: wt-status.c:388
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr "unversionierter Inhalt, "
 
-#: wt-status.c:906
+#: wt-status.c:958
 #, 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:938
+#: wt-status.c:989
 msgid "Submodules changed but not updated:"
 msgstr "Submodule geändert, aber nicht aktualisiert:"
 
-#: wt-status.c:940
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr "Änderungen in Submodul zum Committen:"
 
-#: wt-status.c:1022
+#: wt-status.c:1073
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -8255,7 +9944,7 @@ msgstr ""
 "Ändern oder entfernen Sie nicht die obige Zeile.\n"
 "Alles unterhalb von ihr wird ignoriert."
 
-#: wt-status.c:1114
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -8267,114 +9956,114 @@ msgstr ""
 "berechnen.\n"
 "Sie können '--no-ahead-behind' benutzen, um das zu verhindern.\n"
 
-#: wt-status.c:1144
+#: wt-status.c:1195
 msgid "You have unmerged paths."
 msgstr "Sie haben nicht zusammengeführte Pfade."
 
-#: wt-status.c:1147
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
-msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
+msgstr "  (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
 
-#: wt-status.c:1149
+#: wt-status.c:1200
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
 
-#: wt-status.c:1153
+#: wt-status.c:1204
 msgid "All conflicts fixed but you are still merging."
 msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
 
-#: wt-status.c:1156
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (benutzen Sie \"git commit\", um den Merge abzuschließen)"
 
-#: wt-status.c:1165
+#: wt-status.c:1216
 msgid "You are in the middle of an am session."
 msgstr "Eine \"am\"-Sitzung ist im Gange."
 
-#: wt-status.c:1168
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr "Der aktuelle Patch ist leer."
 
-#: wt-status.c:1172
+#: wt-status.c:1223
 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:1174
+#: wt-status.c:1225
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1176
+#: wt-status.c:1227
 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:1309
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo fehlt."
 
-#: wt-status.c:1311
+#: wt-status.c:1362
 msgid "No commands done."
 msgstr "Keine Befehle ausgeführt."
 
-#: wt-status.c:1314
+#: wt-status.c:1365
 #, 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:1325
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (mehr Informationen in Datei %s)"
 
-#: wt-status.c:1330
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "Keine Befehle verbleibend."
 
-#: wt-status.c:1333
+#: 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] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
 msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
 
-#: wt-status.c:1341
+#: wt-status.c:1392
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
 
-#: wt-status.c:1353
+#: wt-status.c:1404
 #, 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:1358
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr "Sie sind gerade beim Rebase."
 
-#: wt-status.c:1371
+#: wt-status.c:1422
 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:1373
+#: wt-status.c:1424
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1375
+#: wt-status.c:1426
 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:1382
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
 
-#: wt-status.c:1386
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -8382,155 +10071,174 @@ msgstr ""
 "Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
 "'%s' im Gange ist."
 
-#: wt-status.c:1391
+#: wt-status.c:1442
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
 
-#: wt-status.c:1394
+#: wt-status.c:1445
 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:1398
+#: wt-status.c:1449
 #, 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:1403
+#: wt-status.c:1454
 msgid "You are currently editing a commit during a rebase."
 msgstr "Sie editieren gerade einen Commit während eines Rebase."
 
-#: wt-status.c:1406
+#: wt-status.c:1457
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 "  (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
 "nachzubessern)"
 
-#: wt-status.c:1408
+#: wt-status.c:1459
 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:1419
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick zurzeit im Gange."
 
-#: wt-status.c:1422
+#: wt-status.c:1473
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
 
-#: wt-status.c:1429
+#: wt-status.c:1480
 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:1432
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (Führen Sie \"git cherry-pick --continue\" aus, um weiterzumachen)"
 
-#: wt-status.c:1435
+#: wt-status.c:1486
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
 
-#: wt-status.c:1437
+#: wt-status.c:1488
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr ""
 "  (benutzen Sie \"git cherry-pick --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1439
+#: wt-status.c:1490
 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:1449
+#: wt-status.c:1500
 msgid "Revert currently in progress."
 msgstr "Revert zurzeit im Gange."
 
-#: wt-status.c:1452
+#: wt-status.c:1503
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Sie sind gerade beim Revert von Commit '%s'."
 
-#: wt-status.c:1458
+#: wt-status.c:1509
 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:1461
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (Führen Sie \"git revert --continue\", um weiterzumachen)"
 
-#: wt-status.c:1464
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
 
-#: wt-status.c:1466
+#: wt-status.c:1517
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (benutzen Sie \"git revert --skip\", um diesen Patch auszulassen)"
 
-#: wt-status.c:1468
+#: wt-status.c:1519
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 "  (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
 
-#: wt-status.c:1478
+#: wt-status.c:1529
 #, 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:1482
+#: wt-status.c:1533
 msgid "You are currently bisecting."
 msgstr "Sie sind gerade bei einer binären Suche."
 
-#: wt-status.c:1485
+#: wt-status.c:1536
 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:1694
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Sie befinden sich in einem partiellen Checkout."
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Sie sind in einem partiellen Checkout mit %d%% vorhandenen versionierten "
+"Dateien."
+
+#: wt-status.c:1794
 msgid "On branch "
 msgstr "Auf Branch "
 
-#: wt-status.c:1701
+#: wt-status.c:1801
 msgid "interactive rebase in progress; onto "
 msgstr "interaktives Rebase im Gange; auf "
 
-#: wt-status.c:1703
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
 msgstr "Rebase im Gange; auf "
 
-#: wt-status.c:1713
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr "HEAD losgelöst bei "
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr "HEAD losgelöst von "
+
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: wt-status.c:1730
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr "Initialer Commit"
 
-#: wt-status.c:1731
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr "Noch keine Commits"
 
-#: wt-status.c:1745
+#: wt-status.c:1845
 msgid "Untracked files"
 msgstr "Unversionierte Dateien"
 
-#: wt-status.c:1747
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "Ignorierte Dateien"
 
-#: wt-status.c:1751
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8541,32 +10249,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:1757
+#: wt-status.c:1857
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Unversionierte Dateien nicht aufgelistet%s"
 
-#: wt-status.c:1759
+#: wt-status.c:1859
 msgid " (use -u option to show untracked files)"
 msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
 
-#: wt-status.c:1765
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "Keine Änderungen"
 
-#: wt-status.c:1770
+#: wt-status.c:1870
 #, 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:1773
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "keine Änderungen zum Commit vorgemerkt\n"
 
-#: wt-status.c:1776
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8575,205 +10283,232 @@ msgstr ""
 "nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
 "(benutzen Sie \"git add\" zum Versionieren)\n"
 
-#: wt-status.c:1779
+#: wt-status.c:1882
 #, 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:1782
+#: wt-status.c:1886
 #, 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:1785 wt-status.c:1790
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nichts zu committen\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1893
 #, 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:1792
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
 
-#: wt-status.c:1905
+#: wt-status.c:2003
 msgid "No commits yet on "
 msgstr "Noch keine Commits in "
 
-#: wt-status.c:1909
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr "HEAD (kein Branch)"
 
-#: wt-status.c:1940
+#: wt-status.c:2038
 msgid "different"
 msgstr "unterschiedlich"
 
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "hinterher "
 
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "voraus "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2569
 #, 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:2476
+#: wt-status.c:2575
 msgid "additionally, your index contains uncommitted changes."
 msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
 
-#: wt-status.c:2478
+#: wt-status.c:2577
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#: compat/simple-ipc/ipc-unix-socket.c:182
+msgid "could not send IPC command"
+msgstr "konnte IPC-Befehl nicht senden"
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr "konnte IPC-Antwort nicht lesen"
+
+#: compat/simple-ipc/ipc-unix-socket.c:866
+#, 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:878
+#, 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
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "Konnte '%s' nicht entfernen."
 
-#: builtin/add.c:25
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "kann chmod %cx '%s' nicht ausführen"
+
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "unerwarteter Differenz-Status %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
 msgstr "Aktualisierung der Dateien fehlgeschlagen"
 
-#: builtin/add.c:99
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
 msgstr "lösche '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:198
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 "Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:897
+#: builtin/add.c:307 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Konnte den Index nicht lesen"
 
-#: builtin/add.c:245
+#: builtin/add.c:318
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Konnte '%s' nicht zum Schreiben öffnen."
 
-#: builtin/add.c:249
+#: builtin/add.c:322
 msgid "Could not write patch"
 msgstr "Konnte Patch nicht schreiben"
 
-#: builtin/add.c:252
+#: builtin/add.c:325
 msgid "editing patch failed"
 msgstr "Bearbeitung des Patches fehlgeschlagen"
 
-#: builtin/add.c:255
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht lesen"
 
-#: builtin/add.c:257
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr "Leerer Patch. Abgebrochen."
 
-#: builtin/add.c:262
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Konnte '%s' nicht anwenden."
 
-#: builtin/add.c:270
+#: builtin/add.c:343
 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:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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 "Probelauf"
 
-#: builtin/add.c:293
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr "interaktives Auswählen"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "Blöcke interaktiv auswählen"
 
-#: builtin/add.c:295
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr "aktuelle Unterschiede editieren und anwenden"
 
-#: builtin/add.c:296
+#: builtin/add.c:369
 msgid "allow adding otherwise ignored files"
 msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
 
-#: builtin/add.c:297
+#: builtin/add.c:370
 msgid "update tracked files"
 msgstr "versionierte Dateien aktualisieren"
 
-#: builtin/add.c:298
+#: builtin/add.c:371
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 "erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert "
 "-u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:372
 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:300
+#: builtin/add.c:373
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 "Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
 
-#: builtin/add.c:303
+#: builtin/add.c:376
 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:305
+#: builtin/add.c:378
 msgid "don't add, only refresh the index"
 msgstr "nichts hinzufügen, nur den Index aktualisieren"
 
-#: builtin/add.c:306
+#: builtin/add.c:379
 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:307
+#: builtin/add.c:380
 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:309 builtin/update-index.c:1002
+#: builtin/add.c:382 builtin/update-index.c:1006
 msgid "override the executable bit of the listed files"
 msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
 
-#: builtin/add.c:311
+#: builtin/add.c:384
 msgid "warn when adding an embedded repository"
 msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
 
-#: builtin/add.c:326
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr "Backend für `git stash -p`"
+
+#: builtin/add.c:404
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8807,154 +10542,186 @@ msgstr ""
 "\n"
 "Siehe \"git help submodule\" für weitere Informationen."
 
-#: builtin/add.c:354
+#: builtin/add.c:432
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "Füge eingebettetes Repository hinzu: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n"
+#: builtin/add.c: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 ""
+"Nutzen Sie die Option -f, wenn sie wirklich hinzugefügt werden sollen.\n"
+"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:460
 msgid "adding files failed"
 msgstr "Hinzufügen von Dateien fehlgeschlagen"
 
-#: builtin/add.c:419
+#: 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 "Die Optionen -A und -u sind zueinander inkompatibel."
+msgstr "-A und -u sind zueinander inkompatibel"
 
-#: builtin/add.c:426
+#: 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."
+"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden"
 
-#: builtin/add.c:430
+#: builtin/add.c:526
 #, 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:445
+#: 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 "--pathspec-from-file ist inkompatibel mit Pfadspezifikation-Argumenten"
+
+#: 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 "--pathspec-file-nul benötigt --pathspec-from-file"
+
+#: builtin/add.c:555
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Meinten Sie vielleicht 'git add .'?\n"
+#: 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 ""
+"Eventuell meinten Sie 'git add .'?\n"
+"Um diese Meldung abzuschalten, führen Sie folgenden Befehl aus:\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:347
+#: builtin/am.c:365
 msgid "could not parse author script"
 msgstr "konnte Autor-Skript nicht parsen"
 
-#: builtin/am.c:431
+#: builtin/am.c:455
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
 
-#: builtin/am.c:473
+#: builtin/am.c:497
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Fehlerhafte Eingabezeile: '%s'."
 
-#: builtin/am.c:511
+#: builtin/am.c:535
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
 
-#: builtin/am.c:537
+#: builtin/am.c:561
 msgid "fseek failed"
 msgstr "\"fseek\" fehlgeschlagen"
 
-#: builtin/am.c:725
+#: builtin/am.c:749
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "konnte Patch '%s' nicht parsen"
 
-#: builtin/am.c:790
+#: builtin/am.c:814
 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:838
+#: builtin/am.c:862
 msgid "invalid timestamp"
 msgstr "ungültiger Zeitstempel"
 
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:867 builtin/am.c:879
 msgid "invalid Date line"
 msgstr "Ungültige \"Date\"-Zeile"
 
-#: builtin/am.c:850
+#: builtin/am.c:874
 msgid "invalid timezone offset"
 msgstr "Ungültiger Offset in der Zeitzone"
 
-#: builtin/am.c:943
+#: builtin/am.c:967
 msgid "Patch format detection failed."
 msgstr "Patch-Formaterkennung fehlgeschlagen."
 
-#: builtin/am.c:948 builtin/clone.c:406
+#: builtin/am.c:972 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/am.c:953
+#: builtin/am.c:977
 msgid "Failed to split patches."
 msgstr "Fehler beim Aufteilen der Patches."
 
-#: builtin/am.c:1084
+#: builtin/am.c:1126
 #, 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:1085
+#: builtin/am.c:1127
 #, 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:1086
+#: builtin/am.c:1128
 #, 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:1169
+#: builtin/am.c:1223
 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:1197
+#: builtin/am.c:1251
 msgid "Patch is empty."
 msgstr "Patch ist leer."
 
-#: builtin/am.c:1262
+#: builtin/am.c:1316
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "Autor-Zeile fehlt in Commit %s"
 
-#: builtin/am.c:1265
+#: builtin/am.c:1319
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "Ungültige Identifikationszeile: %.*s"
 
-#: builtin/am.c:1484
+#: builtin/am.c:1538
 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:1486
+#: builtin/am.c:1540
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
 "nachzustellen ..."
 
-#: builtin/am.c:1505
+#: builtin/am.c:1559
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8962,24 +10729,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:1511
+#: builtin/am.c:1565
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
 
-#: builtin/am.c:1537
+#: builtin/am.c:1591
 msgid "Failed to merge in the changes."
 msgstr "Merge der Änderungen fehlgeschlagen."
 
-#: builtin/am.c:1569
+#: builtin/am.c:1623
 msgid "applying to an empty history"
 msgstr "auf leere Historie anwenden"
 
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1675 builtin/am.c:1679
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "Kann nicht fortsetzen: %s existiert nicht"
 
-#: builtin/am.c:1638
+#: builtin/am.c:1697
 msgid "Commit Body is:"
 msgstr "Commit-Beschreibung ist:"
 
@@ -8987,41 +10754,41 @@ msgstr "Commit-Beschreibung ist:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1648
+#: builtin/am.c:1707
 #, 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:1695 builtin/commit.c:374
+#: builtin/am.c:1753 builtin/commit.c:408
 msgid "unable to write index file"
 msgstr "Konnte Index-Datei nicht schreiben."
 
-#: builtin/am.c:1699
+#: builtin/am.c:1757
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
 
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1797 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Wende an: %.*s"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1814
 msgid "No changes -- Patch already applied."
 msgstr "Keine Änderungen -- Patches bereits angewendet."
 
-#: builtin/am.c:1762
+#: builtin/am.c:1820
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
 
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1824
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
-"Benutzen Sie 'git am --show-current-patch', um den\n"
-"fehlgeschlagenen Patch zu sehen."
+"Benutzen Sie 'git am --show-current-patch=diff', um den\n"
+"fehlgeschlagenen Patch zu sehen"
 
-#: builtin/am.c:1810
+#: 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"
@@ -9032,7 +10799,7 @@ msgstr ""
 "diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
 "auslassen."
 
-#: builtin/am.c:1817
+#: 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 "
@@ -9045,17 +10812,17 @@ msgstr ""
 "Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
 "diese zu akzeptieren."
 
-#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
-#: builtin/reset.c:337
+#: 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 "Konnte Objekt '%s' nicht parsen."
 
-#: builtin/am.c:1976
+#: builtin/am.c:2034
 msgid "failed to clean index"
 msgstr "Fehler beim Bereinigen des Index"
 
-#: builtin/am.c:2020
+#: builtin/am.c:2078
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -9063,144 +10830,160 @@ msgstr ""
 "Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
 "Keine Zurücksetzung zu ORIG_HEAD."
 
-#: builtin/am.c:2117
+#: builtin/am.c:2185
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Ungültiger Wert für --patch-format: %s"
 
-#: builtin/am.c:2153
+#: builtin/am.c:2227
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Ungültiger Wert für --show-current-patch: %s"
+
+#: builtin/am.c:2231
+#, 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"
+
+#: builtin/am.c:2262
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
 
-#: builtin/am.c:2154
+#: builtin/am.c:2263
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2160
+#: builtin/am.c:2269
 msgid "run interactively"
 msgstr "interaktiv ausführen"
 
-#: builtin/am.c:2162
+#: builtin/am.c:2271
 msgid "historical option -- no-op"
 msgstr "historische Option -- kein Effekt"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2273
 msgid "allow fall back on 3way merging if needed"
 msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
 
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:297 builtin/stash.c:812
+#: 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 "weniger Ausgaben"
 
-#: builtin/am.c:2167
-msgid "add a Signed-off-by line to the commit message"
-msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
+#: builtin/am.c:2276
+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:2170
+#: builtin/am.c:2279
 msgid "recode into utf8 (default)"
 msgstr "nach UTF-8 umkodieren (Standard)"
 
-#: builtin/am.c:2172
+#: builtin/am.c:2281
 msgid "pass -k flag to git-mailinfo"
 msgstr "-k an git-mailinfo übergeben"
 
-#: builtin/am.c:2174
+#: builtin/am.c:2283
 msgid "pass -b flag to git-mailinfo"
 msgstr "-b an git-mailinfo übergeben"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2285
 msgid "pass -m flag to git-mailinfo"
 msgstr "-m an git-mailinfo übergeben"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2287
 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:2181
+#: builtin/am.c:2290
 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:2184
+#: builtin/am.c:2293
 msgid "strip everything before a scissors line"
 msgstr "alles vor einer Scheren-Zeile entfernen"
 
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr "an git-mailinfo weitergeben"
+
+#: 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 "an git-apply übergeben"
 
-#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
-#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:150 parse-options.h:171 parse-options.h:312
+#: 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: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 "Anzahl"
 
-#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: 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 "Format"
 
-#: builtin/am.c:2210
+#: builtin/am.c:2322
 msgid "format the patch(es) are in"
 msgstr "Patch-Format"
 
-#: builtin/am.c:2216
+#: builtin/am.c:2328
 msgid "override error message when patch failure occurs"
 msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
 
-#: builtin/am.c:2218
+#: builtin/am.c:2330
 msgid "continue applying patches after resolving a conflict"
 msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2333
 msgid "synonyms for --continue"
 msgstr "Synonyme für --continue"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2336
 msgid "skip the current patch"
 msgstr "den aktuellen Patch auslassen"
 
-#: builtin/am.c:2227
-msgid "restore the original branch and abort the patching operation."
+#: builtin/am.c:2339
+msgid "restore the original branch and abort the patching operation"
 msgstr ""
 "ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
 
-#: builtin/am.c:2230
-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 "Patch-Operation abbrechen, aber HEAD an aktueller Stelle belassen"
 
-#: builtin/am.c:2233
-msgid "show the patch being applied."
+#: builtin/am.c:2346
+msgid "show the patch being applied"
 msgstr "den Patch, der gerade angewendet wird, anzeigen"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2351
 msgid "lie about committer date"
 msgstr "Autor-Datum als Commit-Datum verwenden"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2353
 msgid "use current timestamp for author date"
 msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
 
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
-#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
+#: 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 "GPG-Schlüsselkennung"
 
-#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
 msgstr "Commits mit GPG signieren"
 
-#: builtin/am.c:2245
+#: builtin/am.c:2359
 msgid "(internal use for git-rebase)"
 msgstr "(intern für git-rebase verwendet)"
 
-#: builtin/am.c:2263
+#: 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."
@@ -9208,16 +10991,16 @@ msgstr ""
 "Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
 "entfernt. Bitte verwenden Sie diese nicht mehr."
 
-#: builtin/am.c:2270
+#: builtin/am.c:2384
 msgid "failed to read the index"
 msgstr "Fehler beim Lesen des Index"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2399
 #, 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:2309
+#: builtin/am.c:2423
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9226,11 +11009,11 @@ msgstr ""
 "Stray %s Verzeichnis gefunden.\n"
 "Benutzen Sie \"git am --abort\", um es zu entfernen."
 
-#: builtin/am.c:2315
+#: builtin/am.c:2429
 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:2325
+#: builtin/am.c:2439
 msgid "interactive mode requires patches on the command line"
 msgstr "Interaktiver Modus benötigt Patches über die Kommandozeile"
 
@@ -9268,45 +11051,17 @@ msgstr "git archive: Protokollfehler"
 msgid "git archive: expected a flush"
 msgstr "git archive: erwartete eine Spülung (flush)"
 
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
 #: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<Commit>]"
 
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <Zustand> <Revision> "
-"<Begriff_gut> <Begriff_schlecht>"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <Befehl> <Begriff_gut> "
-"<Begriff_schlecht>"
-
-#: builtin/bisect--helper.c:28
+#: 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:29
+#: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
@@ -9314,48 +11069,76 @@ msgstr ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:26
 msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<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>...]"
 msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<Begriff> --term-{new,"
-"bad}=<Begriff>][--no-checkout] [<schlecht> [<gut>...]] [--] [<Pfade>...]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<Begriff> --term-{old,"
+"good}=<Begriff>] [--no-checkout] [--first-parent] [<schlecht> [<gut>...]] "
+"[--] [<Pfade>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+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-state (bad|new) [<Commit>]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<Commit>...]"
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <Dateiname>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<Commit>|<Bereich>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "kann Datei '%s' nicht im Modus '%s' öffnen"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "konnte nicht in Datei '%s' schreiben"
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:155
 #, c-format
 msgid "'%s' is not a valid term"
-msgstr "'%s' ist kein gültiger Begriff."
+msgstr "'%s' ist kein gültiger Begriff"
 
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:159
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
-msgstr "Kann den eingebauten Befehl '%s' nicht als Begriff verwenden."
+msgstr "kann den eingebauten Befehl '%s' nicht als Begriff verwenden"
 
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:169
 #, c-format
 msgid "can't change the meaning of the term '%s'"
-msgstr "Kann die Bedeutung von dem Begriff '%s' nicht ändern."
+msgstr "kann die Bedeutung von dem Begriff '%s' nicht ändern"
 
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:179
 msgid "please use two different terms"
-msgstr "Bitte verwenden Sie zwei verschiedene Begriffe."
-
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "Konnte die Datei BISECT_TERMS nicht öffnen."
+msgstr "bitte verwenden Sie zwei verschiedene Begriffe"
 
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:195
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Keine binäre Suche im Gange.\n"
 
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:203
 #, c-format
 msgid "'%s' is not a valid commit"
-msgstr "'%s' ist kein gültiger Commit."
+msgstr "'%s' ist kein gültiger Commit"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:212
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9363,27 +11146,27 @@ msgstr ""
 "Konnte den ursprünglichen HEAD '%s' nicht auschecken.\n"
 "Versuchen Sie 'git bisect reset <Commit>'."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:256
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Ungültiges \"bisect_write\" Argument: %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:261
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
-msgstr "Konnte die OID der Revision '%s' nicht erhalten."
+msgstr "konnte die OID der Revision '%s' nicht erhalten"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:273
 #, c-format
 msgid "couldn't open the file '%s'"
-msgstr "Konnte die Datei '%s' nicht öffnen."
+msgstr "konnte die Datei '%s' nicht öffnen"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:299
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
-msgstr "Ungültiger Befehl: Sie sind gerade bei einer binären %s/%s Suche."
+msgstr "Ungültiger Befehl: Sie sind gerade innerhalb einer binären %s/%s Suche"
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:326
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9392,7 +11175,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:289
+#: builtin/bisect--helper.c:330
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9403,24 +11186,24 @@ 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:321
+#: builtin/bisect--helper.c:350
 #, c-format
 msgid "bisecting only with a %s commit"
-msgstr "Binäre Suche nur mit einem %s Commit."
+msgstr "binäre Suche nur mit einem %s Commit"
 
 #. 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:329
+#: builtin/bisect--helper.c:358
 msgid "Are you sure [Y/n]? "
 msgstr "Sind Sie sicher [Y/n]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:419
 msgid "no terms defined"
-msgstr "Keine Begriffe definiert."
+msgstr "keine Begriffe definiert"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:422
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9429,7 +11212,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:389
+#: builtin/bisect--helper.c:432
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9438,274 +11221,320 @@ 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:475
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+msgid "revision walk setup failed\n"
+msgstr "Einrichtung des Revisionsgangs fehlgeschlagen\n"
+
+#: builtin/bisect--helper.c:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "konnte '%s' nicht zum Anhängen öffnen"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr "'' ist kein gültiger Begriff"
+
+#: builtin/bisect--helper.c:663
 #, c-format
 msgid "unrecognized option: '%s'"
-msgstr "Nicht erkannte Position: '%s'"
+msgstr "nicht erkannte Option: '%s'"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:667
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
-msgstr "'%s' scheint kein gültiger Commit zu sein."
+msgstr "'%s' scheint kein gültiger Commit zu sein"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:698
 msgid "bad HEAD - I need a HEAD"
-msgstr "Ungültiger HEAD - HEAD wird benötigt."
+msgstr "ungültiger HEAD - HEAD wird benötigt"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:713
 #, 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:547
+#: builtin/bisect--helper.c:734
 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:550
+#: builtin/bisect--helper.c:737
 msgid "bad HEAD - strange symbolic ref"
-msgstr "Ungültiger HEAD - merkwürdige symbolische Referenz."
+msgstr "ungültiger HEAD - merkwürdige symbolische Referenz"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:757
 #, c-format
 msgid "invalid ref: '%s'"
-msgstr "Ungültige Referenz: '%s'"
+msgstr "ungültige Referenz: '%s'"
 
-#: builtin/bisect--helper.c:630
-msgid "perform 'git bisect next'"
-msgstr "'git bisect next' ausführen"
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Sie müssen mit \"git bisect start\" beginnen\n"
 
-#: builtin/bisect--helper.c:632
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "die Begriffe nach .git/BISECT_TERMS schreiben"
+#. 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:826
+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:634
-msgid "cleanup the bisection state"
-msgstr "den Zustand der binären Suche aufräumen"
+#: builtin/bisect--helper.c:844
+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:636
-msgid "check for expected revs"
-msgstr "auf erwartete Commits prüfen"
+#: builtin/bisect--helper.c:857
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' kann nur ein Argument entgegennehmen."
 
-#: builtin/bisect--helper.c:638
-msgid "reset the bisection state"
-msgstr "den Zustand der binären Suche zurücksetzen"
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Ungültige Referenz-Eingabe: %s"
 
-#: builtin/bisect--helper.c:640
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "den Zustand der binären Suche nach BISECT_LOG schreiben"
+#: builtin/bisect--helper.c:889
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Ungültige Referenz-Eingabe (kein Commit): %s"
 
-#: builtin/bisect--helper.c:642
-msgid "check and set terms in a bisection state"
-msgstr "Begriffe innerhalb einer binären Suche prüfen und setzen"
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr "Keine binäre Suche im Gange."
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? Was reden Sie da?"
+
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "kann Datei '%s' nicht für die Wiederholung lesen"
+
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr "den Zustand der binären Suche zurücksetzen"
+
+#: builtin/bisect--helper.c:1058
 msgid "check whether bad or good terms exist"
 msgstr "prüfen, ob Begriffe für gute und schlechte Commits existieren"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:1060
 msgid "print out the bisect terms"
 msgstr "die Begriffe für die binäre Suche ausgeben"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:1062
 msgid "start the bisect session"
 msgstr "Sitzung für binäre Suche starten"
 
-#: builtin/bisect--helper.c:650
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken"
+#: builtin/bisect--helper.c:1064
+msgid "find the next bisection commit"
+msgstr "nächsten Commit für die binäre Suche finden"
 
-#: builtin/bisect--helper.c:652
-msgid "no log for BISECT_WRITE"
-msgstr "kein Log für BISECT_WRITE"
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr "den Status der Referenz(en) markieren"
 
-#: builtin/bisect--helper.c:669
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms benötigt zwei Argumente."
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr "die bisherigen Schritte der binären Suche auflisten"
 
-#: builtin/bisect--helper.c:673
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state erwartet keine Argumente."
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
+msgstr "binäre Suche aus der angegebenen Datei wiederholen"
 
-#: builtin/bisect--helper.c:680
-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:1072
+msgid "skip some commits for checkout"
+msgstr "einige Commits für das Auschecken überspringen"
 
-#: builtin/bisect--helper.c:684
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write benötigt entweder 4 oder 5 Argumente."
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "kein Log für BISECT_WRITE"
 
-#: builtin/bisect--helper.c:690
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms benötigt 3 Argumente."
+#: builtin/bisect--helper.c:1089
+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:696
+#: builtin/bisect--helper.c:1094
 msgid "--bisect-next-check requires 2 or 3 arguments"
-msgstr "--bisect-next-check benötigt 2 oder 3 Argumente."
+msgstr "--bisect-next-check benötigt 2 oder 3 Argumente"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:1100
 msgid "--bisect-terms requires 0 or 1 argument"
-msgstr "--bisect-terms benötigt 0 oder 1 Argument."
+msgstr "--bisect-terms benötigt 0 oder 1 Argument"
+
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next benötigt 0 Argumente"
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log benötigt 0 Argumente"
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr "keine Log-Datei angegeben"
 
-#: builtin/blame.c:31
+#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
 
-#: builtin/blame.c:36
+#: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-opts> sind dokumentiert in git-rev-list(1)"
 
-#: builtin/blame.c:409
+#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
-msgstr "Erwarte eine Farbe: %s"
+msgstr "erwarte eine Farbe: %s"
 
-#: builtin/blame.c:416
+#: builtin/blame.c:417
 msgid "must end with a color"
-msgstr "Muss mit einer Farbe enden."
+msgstr "muss mit einer Farbe enden"
 
-#: builtin/blame.c:729
+#: builtin/blame.c:728
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
-msgstr "Ungültige Farbe '%s' in color.blame.repeatedLines."
+msgstr "ungültige Farbe '%s' in color.blame.repeatedLines"
 
-#: builtin/blame.c:747
+#: builtin/blame.c:746
 msgid "invalid value for blame.coloring"
-msgstr "Ungültiger Wert für blame.coloring."
+msgstr "ungültiger Wert für blame.coloring"
 
-#: builtin/blame.c:822
+#: builtin/blame.c:845
 #, c-format
 msgid "cannot find revision %s to ignore"
-msgstr "Konnte Commit %s zum Ignorieren nicht finden"
+msgstr "konnte Commit %s zum Ignorieren nicht finden"
 
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
-msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie generieren"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "\"blame\"-Einträge schrittweise anzeigen, während wir sie finden"
 
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "leere SHA-1 für Grenz-Commits anzeigen (Standard: aus)"
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "keine Objektnamen für Grenz-Commits anzeigen (Standard: aus)"
 
-#: builtin/blame.c:846
-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 "Root-Commits nicht als Grenzen behandeln (Standard: aus)"
 
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
 msgstr "Statistiken zum Arbeitsaufwand anzeigen"
 
-#: builtin/blame.c:848
-msgid "Force progress reporting"
+#: 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 "Fortschrittsanzeige erzwingen"
 
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
 msgstr "Ausgabebewertung für \"blame\"-Einträge anzeigen"
 
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
 msgstr "ursprünglichen Dateinamen anzeigen (Standard: auto)"
 
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
 msgstr "ursprüngliche Zeilennummer anzeigen (Standard: aus)"
 
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
 msgstr "Anzeige in einem Format für maschinelle Auswertung"
 
-#: builtin/blame.c:853
-msgid "Show porcelain format with per-line commit information"
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
 msgstr ""
 "Anzeige in Format für Fremdprogramme mit Commit-Informationen pro Zeile"
 
-#: builtin/blame.c:854
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
 msgstr ""
-"Den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
+"den gleichen Ausgabemodus benutzen wie \"git-annotate\" (Standard: aus)"
 
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
-msgstr "Unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "unbearbeiteten Zeitstempel anzeigen (Standard: aus)"
 
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Langen Commit-SHA1 anzeigen (Standard: aus)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "langen Commit-SHA1 anzeigen (Standard: aus)"
 
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "Den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "den Namen des Autors und den Zeitstempel unterdrücken (Standard: aus)"
 
-#: builtin/blame.c:858
-msgid "Show author email instead of name (Default: off)"
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
 msgstr ""
-"Anstatt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
+"statt des Namens die E-Mail-Adresse des Autors anzeigen (Standard: aus)"
 
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
-msgstr "Unterschiede im Whitespace ignorieren"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "Whitespace-Unterschiede ignorieren"
 
-#: builtin/blame.c:860 builtin/log.c:1630
+#: builtin/blame.c:883 builtin/log.c:1823
 msgid "rev"
 msgstr "Commit"
 
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "Ignoriere <rev> beim Ausführen von 'blame'"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "ignoriere <Commit> beim Ausführen von 'blame'"
 
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr "Ignoriere Commits aus <Datei>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "ignoriere Commits aus <Datei>"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:885
 msgid "color redundant metadata from previous line differently"
 msgstr "redundante Metadaten der vorherigen Zeile unterschiedlich einfärben"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:886
 msgid "color lines by age"
 msgstr "Zeilen nach Alter einfärben"
 
-#: builtin/blame.c:870
-msgid "Use an experimental heuristic to improve diffs"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
 msgstr ""
-"eine experimentelle Heuristik zur Verbesserung der Darstellung\n"
-"von Unterschieden verwenden"
+"mehr Arbeitsschritte ausführen, um eine bessere Übereinstimmung zu finden"
 
-#: builtin/blame.c:872
-msgid "Spend extra cycles to find better match"
-msgstr "Länger arbeiten, um bessere Übereinstimmungen zu finden"
-
-#: builtin/blame.c:873
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "Commits von <Datei> benutzen, anstatt \"git-rev-list\" aufzurufen"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "Commits von <Datei> benutzen, statt \"git-rev-list\" aufzurufen"
 
-#: builtin/blame.c:874
-msgid "Use <file>'s contents as the final image"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
 msgstr "Inhalte der <Datei>en als endgültiges Abbild benutzen"
 
-#: builtin/blame.c:875 builtin/blame.c:876
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "Bewertung"
 
-#: builtin/blame.c:875
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
 msgstr "kopierte Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:876
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
 msgstr "verschobene Zeilen innerhalb oder zwischen Dateien finden"
 
-#: builtin/blame.c:877
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "Bereich"
 
-#: builtin/blame.c:877
-msgid "Process only line range n,m, counting from 1"
-msgstr "nur Zeilen im Bereich n,m verarbeiten, gezählt von 1"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr ""
+"nur Zeilen im Bereich <Start>,<Ende> oder Funktion :<Funktionsname> "
+"verarbeiten"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:945
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress kann nicht mit --incremental oder Formaten für Fremdprogramme\n"
@@ -9719,24 +11548,24 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr "vor 4 Jahren und 11 Monaten"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1112
 #, 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:1133
+#: builtin/blame.c:1157
 msgid "Blaming lines"
 msgstr "Verarbeite Zeilen"
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<Optionen>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<Optionen>] [-r | -a] [--merged] [--no-merged]"
 
 #: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -9799,124 +11628,114 @@ msgstr ""
 msgid "Update of config-file failed"
 msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
 
-#: builtin/branch.c:220
+#: builtin/branch.c:223
 msgid "cannot use -a with -d"
 msgstr "kann -a nicht mit -d benutzen"
 
-#: builtin/branch.c:226
+#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
 
-#: builtin/branch.c:240
+#: builtin/branch.c:244
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
 
-#: builtin/branch.c:255
+#: builtin/branch.c:259
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
 
-#: builtin/branch.c:256
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
 msgstr "Branch '%s' nicht gefunden."
 
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Fehler beim Entfernen des Branches '%s'"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:280
+#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branch %s entfernt (war %s).\n"
 
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:440 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "Konnte Formatierungsstring nicht parsen."
 
-#: builtin/branch.c:460
+#: builtin/branch.c:471
 msgid "could not resolve HEAD"
 msgstr "Konnte HEAD-Commit nicht auflösen."
 
-#: builtin/branch.c:466
+#: builtin/branch.c:477
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) wurde nicht unter \"refs/heads/\" gefunden!"
 
-#: builtin/branch.c:481
+#: builtin/branch.c:492
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Branch %s wird auf %s umgesetzt"
 
-#: builtin/branch.c:485
+#: builtin/branch.c:496
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Binäre Suche von Branch %s zu %s im Gange"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:513
 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:504
+#: builtin/branch.c:515
 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:515
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Ungültiger Branchname: '%s'"
 
-#: builtin/branch.c:542
+#: builtin/branch.c:555
 msgid "Branch rename failed"
 msgstr "Umbenennung des Branches fehlgeschlagen"
 
-#: builtin/branch.c:544
+#: builtin/branch.c:557
 msgid "Branch copy failed"
 msgstr "Kopie des Branches fehlgeschlagen"
 
-#: builtin/branch.c:548
+#: builtin/branch.c:561
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Kopie eines falsch benannten Branches '%s' erstellt."
 
-#: builtin/branch.c:551
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "falsch benannten Branch '%s' umbenannt"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:570
 #, 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:566
+#: builtin/branch.c:579
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
 "fehlgeschlagen."
 
-#: builtin/branch.c:568
+#: builtin/branch.c:581
 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:584
+#: builtin/branch.c:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -9927,181 +11746,181 @@ msgstr ""
 "  %s\n"
 "Zeilen, die mit '%c' beginnen, werden entfernt.\n"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr "Allgemeine Optionen"
 
-#: builtin/branch.c:620
+#: builtin/branch.c:633
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr "Informationsmeldungen unterdrücken"
 
-#: builtin/branch.c:622
+#: 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:624
+#: builtin/branch.c:637
 msgid "do not use"
 msgstr "nicht verwenden"
 
-#: builtin/branch.c:626 builtin/rebase.c:486
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr "Upstream"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr "Informationen zum Upstream-Branch ändern"
 
-#: builtin/branch.c:627
-msgid "Unset the upstream info"
+#: builtin/branch.c:640
+msgid "unset the upstream info"
 msgstr "Informationen zum Upstream-Branch entfernen"
 
-#: builtin/branch.c:628
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr "farbige Ausgaben verwenden"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
 msgstr "auf Remote-Tracking-Branches wirken"
 
-#: 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 "nur Branches ausgeben, die diesen Commit enthalten"
 
-#: 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 "nur Branches ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
 msgstr "spezifische Aktionen für \"git-branch\":"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:651
 msgid "list both remote-tracking and local branches"
 msgstr "Remote-Tracking und lokale Branches auflisten"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr "vollständig zusammengeführten Branch entfernen"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:654
 msgid "delete branch (even if not merged)"
 msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:655
 msgid "move/rename a branch and its reflog"
 msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:656
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 "einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:657
 msgid "copy a branch and its reflog"
 msgstr "einen Branch und dessen Reflog kopieren"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:658
 msgid "copy a branch, even if target exists"
 msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr "Branchnamen auflisten"
 
-#: builtin/branch.c:647
+#: builtin/branch.c:660
 msgid "show current branch name"
 msgstr "Zeige aktuellen Branch-Namen."
 
-#: builtin/branch.c:648
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr "das Reflog des Branches erzeugen"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr "die Beschreibung für den Branch bearbeiten"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:664
 msgid "force creation, move/rename, deletion"
 msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:665
 msgid "print only branches that are merged"
 msgstr "nur zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:666
 msgid "print only branches that are not merged"
 msgstr "nur nicht zusammengeführte Branches ausgeben"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:667
 msgid "list branches in columns"
 msgstr "Branches in Spalten auflisten"
 
-#: builtin/branch.c:657 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:433
+#: builtin/tag.c:477
 msgid "object"
 msgstr "Objekt"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:670
 msgid "print only branches of the object"
 msgstr "nur Branches von diesem Objekt ausgeben"
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
 msgid "sorting and filtering are case insensitive"
 msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
 
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: 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 "für die Ausgabe zu verwendendes Format"
 
-#: builtin/branch.c:684 builtin/clone.c:760
+#: builtin/branch.c:695 builtin/clone.c:794
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
 
-#: builtin/branch.c:708
+#: builtin/branch.c:719
 msgid "--column and --verbose are incompatible"
-msgstr "Die Optionen --column und --verbose sind inkompatibel."
+msgstr "--column und --verbose sind inkompatibel"
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
 msgid "branch name required"
 msgstr "Branchname erforderlich"
 
-#: builtin/branch.c:753
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
 msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:771
 msgid "cannot edit description of more than one branch"
 msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:778
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Noch kein Commit in Branch '%s'."
 
-#: builtin/branch.c:768
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Branch '%s' nicht vorhanden."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:796
 msgid "too many branches for a copy operation"
 msgstr "zu viele Branches für eine Kopieroperation angegeben"
 
-#: builtin/branch.c:792
+#: builtin/branch.c:805
 msgid "too many arguments for a rename operation"
 msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben"
 
-#: builtin/branch.c:797
+#: builtin/branch.c:810
 msgid "too many arguments to set new upstream"
 msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen"
 
-#: builtin/branch.c:801
+#: builtin/branch.c:814
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -10109,34 +11928,34 @@ msgstr ""
 "Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
 "keinen Branch zeigt."
 
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:817 builtin/branch.c:840
 #, c-format
 msgid "no such branch '%s'"
-msgstr "Kein solcher Branch '%s'"
+msgstr "Branch '%s' nicht gefunden"
 
-#: builtin/branch.c:808
+#: builtin/branch.c:821
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "Branch '%s' existiert nicht"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:834
 msgid "too many arguments to unset upstream"
 msgstr ""
 "zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu "
 "entfernen"
 
-#: builtin/branch.c:825
+#: builtin/branch.c:838
 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:831
+#: builtin/branch.c:844
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
 
-#: builtin/branch.c:841
+#: 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>?"
@@ -10145,7 +11964,7 @@ msgstr ""
 "verwendet werden.\n"
 "Wollten Sie -a|-r --list <Muster> benutzen?"
 
-#: builtin/branch.c:845
+#: builtin/branch.c:858
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -10153,20 +11972,167 @@ msgstr ""
 "Die '--set-upstream' Option wird nicht länger unterstützt.\n"
 "Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'."
 
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "git Version:\n"
+
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
-msgstr "%s ist in Ordnung\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() ist fehlgeschlagen mit Fehler '%s' (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "Compiler Info: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "libc Info: "
+
+#: builtin/bugreport.c:80
+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
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <Datei>] [-s|--suffix <Format>]"
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"Vielen Dank für das Ausfüllen eines Git-Fehlerberichts!\n"
+"Bitte antworten Sie auf die folgenden Fragen, um uns dabei zu helfen, Ihr\n"
+"Problem zu verstehen.\n"
+"\n"
+"Was haben Sie gemacht, bevor der Fehler auftrat? (Schritte, um Ihr Fehler\n"
+"zu reproduzieren)\n"
+"\n"
+"Was haben Sie erwartet, was passieren soll? (Erwartetes Verhalten)\n"
+"\n"
+"Was ist stattdessen passiert? (Wirkliches Verhalten)\n"
+"\n"
+"Was ist der Unterschied zwischen dem, was Sie erwartet haben und was\n"
+"wirklich passiert ist?\n"
+"\n"
+"Sonstige Anmerkungen, die Sie hinzufügen möchten:\n"
+"\n"
+"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
+msgid "specify a destination for the bugreport file"
+msgstr "Speicherort für die Datei des Fehlerberichts angeben"
+
+#: builtin/bugreport.c:138
+msgid "specify a strftime format suffix for the filename"
+msgstr "Dateiendung im strftime-Format für den Dateinamen angeben"
+
+#: builtin/bugreport.c:160
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "konnte vorangehende Verzeichnisse für '%s' nicht erstellen"
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr "System Info"
+
+#: builtin/bugreport.c:170
+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
+#, c-format
+msgid "unable to write to %s"
+msgstr "konnte nicht nach %s schreiben"
+
+#: builtin/bugreport.c:190
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Neuer Bericht unter '%s' erstellt.\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<Optionen>] <Datei> <git-rev-list Argumente>"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<Optionen>] <Datei>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <Datei> [<Referenzname>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <Datei> [<Referenzname>...]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr "keine Fortschrittsanzeige anzeigen"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+msgid "show progress meter"
+msgstr "Fortschrittsanzeige anzeigen"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+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:3914
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr "Version des Paket-Formats angeben"
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr "Um ein Paket zu erstellen wird ein Repository benötigt."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr "Keine Bundle-Details anzeigen"
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s ist in Ordnung\n"
+
+#: builtin/bundle.c:179
 msgid "Need a repository to unbundle."
 msgstr "Zum Entpacken wird ein Repository benötigt."
 
-#: builtin/cat-file.c:595
+#: builtin/bundle.c:191 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:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Unbekannter Unterbefehl: %s"
+
+#: 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>"
@@ -10174,84 +12140,84 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
 
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:597
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"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:617
+#: builtin/cat-file.c:618
 msgid "only one batch option may be specified"
 msgstr "Nur eine Batch-Option erlaubt."
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<Art> kann sein: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object type"
 msgstr "Objektart anzeigen"
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
 msgid "show object size"
 msgstr "Objektgröße anzeigen"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "exit with zero when there's no error"
 msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
 msgid "pretty-print object's content"
 msgstr "ansprechende Anzeige des Objektinhaltes"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
 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:644
+#: builtin/cat-file.c:645
 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:645 git-submodule.sh:936
+#: builtin/cat-file.c:646
 msgid "blob"
 msgstr "Blob"
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
 msgid "use a specific path for --textconv/--filters"
 msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "-s und -t mit beschädigten Objekten erlauben"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
 msgid "buffer --batch output"
 msgstr "Ausgabe von --batch puffern"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:652
 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:655
+#: builtin/cat-file.c:656
 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:659
+#: builtin/cat-file.c:660
 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:661
+#: builtin/cat-file.c:662
 msgid "show all objects with --batch or --batch-check"
 msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
 
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:664
 msgid "do not order --batch-all-objects output"
 msgstr "Ausgabe von --batch-all-objects nicht ordnen"
 
@@ -10279,8 +12245,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:1433 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "Fortschrittsanzeige unterdrücken"
 
@@ -10292,28 +12258,27 @@ msgstr "Eingabe-Pfade ohne Ãœbereinstimmungen anzeigen"
 msgid "ignore index when checking"
 msgstr "Index bei der Prüfung ignorieren"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
-msgstr "Die Option -z kann nur mit --stdin verwendet werden."
+msgstr "-z kann nur mit --stdin verwendet werden"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "kein Pfad angegeben"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
-msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gültig."
+msgstr "--quiet ist nur mit einem einzelnen Pfadnamen gültig"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
-msgstr ""
-"Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden."
+msgstr "--quiet und --verbose können nicht gemeinsam verwendet werden"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching ist nur mit --verbose zulässig"
 
@@ -10334,169 +12299,175 @@ msgstr "Konnte Kontakt '%s' nicht parsen."
 msgid "no contacts specified"
 msgstr "keine Kontakte angegeben"
 
-#: builtin/checkout-index.c:131
+#: builtin/checkout--worker.c:110
+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: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 "Zeichenkette"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr ""
+"wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran"
+
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]"
 
-#: builtin/checkout-index.c:148
+#: 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:164
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "alle Dateien im Index auschecken"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "das Ãœberschreiben bereits existierender Dateien erzwingen"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "keine Warnung für existierende Dateien, und Dateien, die sich nicht im Index "
 "befinden"
 
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "keine neuen Dateien auschecken"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "Dateiinformationen in der Index-Datei aktualisieren"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "den Inhalt in temporäre Dateien schreiben"
 
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:679
-msgid "string"
-msgstr "Zeichenkette"
-
-#: builtin/checkout-index.c:179
-msgid "when creating files, prepend <string>"
-msgstr ""
-"wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran"
-
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "Dateien von dem benannten Stand kopieren"
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<Optionen>] <Branch>"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
 
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<Optionen>] [<Branch>]"
 
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<Optionen>] [--source=<Branch>] <Datei>..."
 
-#: builtin/checkout.c:173 builtin/checkout.c:212
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "Pfad '%s' hat nicht unsere Version."
 
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "Pfad '%s' hat nicht deren Version."
 
-#: builtin/checkout.c:191
+#: builtin/checkout.c:208
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
 
-#: builtin/checkout.c:241
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
 
-#: builtin/checkout.c:259
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "Pfad '%s': kann nicht zusammenführen"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
 
-#: builtin/checkout.c:375
+#: builtin/checkout.c:411
 #, 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:380
+#: builtin/checkout.c:416
 #, 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:387
+#: builtin/checkout.c:423
 #, 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:410 builtin/checkout.c:413 builtin/checkout.c:416
-#: builtin/checkout.c:420
+#: 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' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
 
-#: builtin/checkout.c:423 builtin/checkout.c:426
+#: builtin/checkout.c:459 builtin/checkout.c:462
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:430
+#: builtin/checkout.c:466
 #, 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:434
+#: builtin/checkout.c:470
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "Weder '%s' noch '%s' ist angegeben"
 
-#: builtin/checkout.c:438
+#: builtin/checkout.c:474
 #, 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:443 builtin/checkout.c:448
+#: builtin/checkout.c:479 builtin/checkout.c:484
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' oder '%s' kann nicht mit %s verwendet werden"
 
-#: builtin/checkout.c:507 builtin/checkout.c:514
+#: builtin/checkout.c:558 builtin/checkout.c:565
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "Pfad '%s' ist nicht zusammengeführt."
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:734
 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:730
+#: builtin/checkout.c:788
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10505,50 +12476,50 @@ msgstr ""
 "Kann nicht mit vorgemerkten Änderungen in folgenden Dateien fortsetzen:\n"
 "%s"
 
-#: builtin/checkout.c:833
+#: builtin/checkout.c:881
 #, 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:875
+#: builtin/checkout.c:923
 msgid "HEAD is now at"
 msgstr "HEAD ist jetzt bei"
 
-#: builtin/checkout.c:879 builtin/clone.c:713
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "Konnte HEAD nicht aktualisieren."
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:931
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Setze Branch '%s' neu\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:934
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Bereits auf '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:938
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:940 builtin/checkout.c:1371
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Zu neuem Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:942
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Zu Branch '%s' gewechselt\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:993
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... und %d weitere.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:999
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10571,7 +12542,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: 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"
@@ -10598,28 +12569,19 @@ msgstr[1] ""
 " git branch <neuer-Branchname> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1053
 msgid "internal error in revision walk"
 msgstr "interner Fehler im Revisionsgang"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1057
 msgid "Previous HEAD position was"
 msgstr "Vorherige Position von HEAD war"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
 msgid "You are on a branch yet to be born"
 msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "nur eine Referenz erwartet"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "nur eine Referenz erwartet, %d gegeben."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1179
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10629,37 +12591,74 @@ msgstr ""
 "Bitte benutzen Sie -- (und optional --no-guess), um diese\n"
 "eindeutig voneinander zu unterscheiden."
 
-#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455
+#: 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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Falls Sie einen Remote-Tracking-Branch, z.B. von 'origin', auschecken "
+"wollten,\n"
+"können Sie das tun, indem Sie den vollständig qualifizierten Namen mit der\n"
+"--track Option angeben:\n"
+"\n"
+"    git checkout --track origin/<Name>\n"
+"\n"
+"Falls Sie beim Auschecken mit mehrdeutigen <Namen> immer ein Remote-"
+"Repository\n"
+"bevorzugen möchten, z.B. 'origin', können Sie die Einstellung\n"
+"checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
+
+#: builtin/checkout.c:1196
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' entspricht mehreren (%d) Remote-Tracking-Branches"
+
+#: builtin/checkout.c:1262
+msgid "only one reference expected"
+msgstr "nur eine Referenz erwartet"
+
+#: builtin/checkout.c:1279
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "nur eine Referenz erwartet, %d gegeben."
+
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "Ungültige Referenz: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1385
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "Ein Branch wird erwartet, Tag '%s' bekommen"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1387
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "Ein Branch wird erwartet, Remote-Branch '%s' bekommen"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "Ein Branch wird erwartet, '%s' bekommen"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1391
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "Ein Branch wird erwartet, Commit '%s' bekommen"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1407
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10667,7 +12666,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:1329
+#: builtin/checkout.c:1411
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10676,7 +12675,7 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git am --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1415
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10685,7 +12684,7 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git rebase --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1419
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10694,7 +12693,7 @@ msgstr ""
 "gewechselt werden.\n"
 "Ziehen Sie \"git cherry-pick --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1423
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10703,140 +12702,140 @@ msgstr ""
 "werden.\n"
 "Ziehen Sie \"git revert --quit\" oder \"git worktree add\" in Betracht."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1427
 msgid "you are switching branch while bisecting"
 msgstr "Sie wechseln den Branch während einer binären Suche"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1434
 msgid "paths cannot be used with switching branches"
 msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: 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' kann nicht mit '%s' verwendet werden"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' kann nicht <Startpunkt> bekommen"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1470
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1477
 msgid "missing branch or commit argument"
 msgstr "Branch- oder Commit-Argument fehlt"
 
-#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
-#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
-#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "Fortschrittsanzeige erzwingen"
-
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1520
 msgid "perform a 3-way merge with the new branch"
 msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
 
-#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
 msgid "style"
 msgstr "Stil"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1522
 msgid "conflict style (merge or diff3)"
 msgstr "Konfliktstil (merge oder diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:503
+#: builtin/checkout.c:1534 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "HEAD bei benanntem Commit loslösen"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1535
 msgid "set upstream info for new branch"
 msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1537
 msgid "force checkout (throw away local modifications)"
 msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new-branch"
 msgstr "neuer Branch"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new unparented branch"
 msgstr "neuer Branch ohne Eltern-Commit"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1541 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr "ignorierte Dateien aktualisieren (Standard)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1544
 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:1475
+#: builtin/checkout.c:1557
 msgid "checkout our version for unmerged files"
 msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1560
 msgid "checkout their version for unmerged files"
 msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1564
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
 
-#: builtin/checkout.c:1533
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c und --orphan schließen sich gegenseitig aus"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1626
 msgid "-p and --overlay are mutually exclusive"
-msgstr "-p und --overlay schließen sich gegenseitig aus."
+msgstr "-p und --overlay schließen sich gegenseitig aus"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1663
 msgid "--track needs a branch name"
-msgstr "Bei der Option --track muss ein Branchname angegeben werden."
+msgstr "--track benötigt ein Branchname"
 
-#: builtin/checkout.c:1578
-msgid "missing branch name; try -b"
-msgstr "Kein Branchname; versuchen Sie -b."
+#: builtin/checkout.c:1668
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "kein Branchname; versuchen Sie -%c"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1700
 #, c-format
 msgid "could not resolve %s"
-msgstr "Konnte %s nicht auflösen."
-
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
+msgstr "konnte %s nicht auflösen"
 
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1716
 msgid "invalid path specification"
 msgstr "ungültige Pfadspezifikation"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1723
 #, 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:1642
+#: builtin/checkout.c:1727
 #, 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:1646
+#: builtin/checkout.c:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file und --detach sind inkompatibel"
+
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file und --patch sind inkompatibel"
+
+#: builtin/checkout.c:1752
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10844,137 +12843,106 @@ msgstr ""
 "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n"
 "Sie aus dem Index auschecken."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' entspricht mehr als einem Remote-Tracking-Branch.\n"
-"Wir fanden %d Remote-Repositories mit einer entsprechenden Referenz, also\n"
-"haben wir versucht, das Argument als Pfad aufzulösen, was auch schief ging!\n"
-"\n"
-"Falls Sie einen Remote-Tracking-Branch, z.B. von 'origin', auschecken "
-"wollten,\n"
-"können Sie das tun, indem Sie den vollständig qualifizierten Namen mit der\n"
-"--track Option angeben:\n"
-"\n"
-"    git checkout --track origin/<Name>\n"
-"\n"
-"Falls Sie beim Auschecken mit mehrdeutigen <Namen> immer ein Remote-"
-"Repository\n"
-"bevorzugen möchten, z.B. 'origin', könnten Sie die Einstellung\n"
-"checkout.defaultRemote=origin in Ihrer Konfiguration setzen."
+#: builtin/checkout.c:1757
+msgid "you must specify path(s) to restore"
+msgstr "Sie müssen Pfad(e) zur Wiederherstellung angeben."
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
-#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: 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 "Branch"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1784
 msgid "create and checkout a new branch"
 msgstr "einen neuen Branch erzeugen und auschecken"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1786
 msgid "create/reset and checkout a branch"
 msgstr "einen Branch erstellen/umsetzen und auschecken"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1787
 msgid "create reflog for new branch"
 msgstr "das Reflog für den neuen Branch erzeugen"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1789
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "Zweite Vermutung 'git checkout <kein-solcher-Branch>' (Standard)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1790
 msgid "use overlay mode (default)"
 msgstr "benutze Overlay-Modus (Standard)"
 
-#: builtin/checkout.c:1743
+#: builtin/checkout.c:1835
 msgid "create and switch to a new branch"
 msgstr "einen neuen Branch erzeugen und dahin wechseln"
 
-#: builtin/checkout.c:1745
+#: builtin/checkout.c:1837
 msgid "create/reset and switch to a branch"
 msgstr "einen Branch erstellen/umsetzen und dahin wechseln"
 
-#: builtin/checkout.c:1747
+#: builtin/checkout.c:1839
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "Zweite Vermutung 'git switch <kein-solcher-Branch>'"
 
-#: builtin/checkout.c:1749
+#: builtin/checkout.c:1841
 msgid "throw away local modifications"
 msgstr "lokale Änderungen verwerfen"
 
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1875
 msgid "which tree-ish to checkout from"
 msgstr "Von welcher Commit-Referenz ausgecheckt werden soll"
 
-#: builtin/checkout.c:1783
+#: builtin/checkout.c:1877
 msgid "restore the index"
 msgstr "Index wiederherstellen"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1879
 msgid "restore the working tree (default)"
 msgstr "das Arbeitsverzeichnis wiederherstellen (Standard)"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1881
 msgid "ignore unmerged entries"
 msgstr "ignoriere nicht zusammengeführte Einträge"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1882
 msgid "use overlay mode"
 msgstr "benutze Overlay-Modus"
 
-#: builtin/clean.c:28
+#: 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 <Muster>] [-x | -X] [--] <Pfade>..."
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Lösche %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Würde %s löschen\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Ãœberspringe Repository %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Würde Repository %s überspringen\n"
 
-#: builtin/clean.c:36
-#, c-format
-msgid "failed to remove %s"
-msgstr "Fehler beim Löschen von %s"
-
-#: builtin/clean.c:37
+#: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "Konnte 'lstat' nicht für %s ausführen\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10987,7 +12955,7 @@ msgstr ""
 "foo        - Element anhand eines eindeutigen Präfix auswählen\n"
 "           - (leer) nichts auswählen\n"
 
-#: builtin/clean.c:305 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -11008,38 +12976,33 @@ msgstr ""
 "*          - alle Elemente auswählen\n"
 "           - (leer) Auswahl beenden\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 "Wie bitte (%s)?\n"
 
-#: builtin/clean.c:663
+#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ignorier-Muster eingeben>> "
 
-#: builtin/clean.c:700
+#: builtin/clean.c:693
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
 
-#: builtin/clean.c:721
+#: builtin/clean.c:714
 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:762
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "'%s' löschen [y/N]? "
 
-#: builtin/clean.c:787 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Tschüss.\n"
-
-#: builtin/clean.c:795
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -11057,64 +13020,52 @@ msgstr ""
 "help                - diese Meldung anzeigen\n"
 "?                   - Hilfe zur Auswahl mittels Eingabe anzeigen"
 
-#: builtin/clean.c:822 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Befehle ***"
-
-#: builtin/clean.c:823 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Was nun"
-
-#: builtin/clean.c:831
+#: builtin/clean.c:822
 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:847
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "Keine Dateien mehr zum Löschen, beende."
 
-#: builtin/clean.c:909
+#: builtin/clean.c:900
 msgid "do not print names of files removed"
 msgstr "keine Namen von gelöschten Dateien ausgeben"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:902
 msgid "force"
 msgstr "Aktion erzwingen"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "interaktives Clean"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "ganze Verzeichnisse löschen"
 
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: 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 "Muster"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
 
-#: builtin/clean.c:917
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "auch ignorierte Dateien löschen"
 
-#: builtin/clean.c:919
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "nur ignorierte Dateien löschen"
 
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden."
-
-#: builtin/clean.c:941
+#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -11122,7 +13073,7 @@ msgstr ""
 "clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
 "\"clean\" verweigert"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -11130,166 +13081,183 @@ msgstr ""
 "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
 "f gegeben; \"clean\" verweigert"
 
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+msgstr "-x und -X können nicht gemeinsam verwendet werden"
+
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "Repository mit unvollständiger Historie nicht klonen"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "kein Auschecken"
 
-#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
+#: 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:97
+#: 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:99
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "von einem lokalen Repository klonen"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "lokal keine harten Verweise verwenden, immer Kopien"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "als verteiltes Repository einrichten"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "Pfadspezifikation"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "Submodule im Klon initialisieren"
 
-#: builtin/clone.c:109
+#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr "Anzahl der parallel zu klonenden Submodule"
 
-#: builtin/clone.c:110 builtin/init-db.c:486
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "Vorlagenverzeichnis"
 
-#: builtin/clone.c:111 builtin/init-db.c:487
+#: 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:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: 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 "Repository referenzieren"
 
-#: builtin/clone.c:117 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: 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 "--reference nur während des Klonens benutzen"
 
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:320
+#: 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 "Name"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
 
-#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "Tiefe"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
 
-#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/pull.c:211
 msgid "time"
 msgstr "Zeit"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr ""
 "einen Klon mit unvollständiger Historie (shallow) seit einer bestimmten "
 "Zeit\n"
 "erstellen"
 
-#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
-#: builtin/rebase.c:1417
+#: 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 "Commit"
 
-#: builtin/clone.c:129 builtin/fetch.c:172
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 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:131
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
 msgid "clone only one branch, HEAD or --branch"
 msgstr "nur einen Branch klonen, HEAD oder --branch"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "keine Tags klonen, und auch bei späteren Abrufen nicht beachten"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
 
-#: builtin/clone.c:136 builtin/init-db.c:495
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr ".git-Verzeichnis"
 
-#: builtin/clone.c:137 builtin/init-db.c:496
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
 
-#: builtin/clone.c:138
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "Schlüssel=Wert"
 
-#: builtin/clone.c:139
+#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr "Konfiguration innerhalb des neuen Repositories setzen"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:172
+#: 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 "serverspezifisch"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:173
+#: 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 "Option übertragen"
 
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
-#: builtin/push.c:573
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "nur IPv4-Adressen benutzen"
 
-#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
-#: builtin/push.c:575
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "nur IPv6-Adressen benutzen"
 
-#: builtin/clone.c:148
+#: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "jedes geklonte Submodul nutzt seinen Remote-Tracking-Branch"
 
-#: builtin/clone.c:284
+#: builtin/clone.c:156
+msgid "initialize sparse-checkout file to include only files at root"
+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"
@@ -11297,42 +13265,42 @@ msgstr ""
 "Konnte keinen Verzeichnisnamen erraten.\n"
 "Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
 
-#: builtin/clone.c:337
+#: builtin/clone.c:345
 #, 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:410
+#: builtin/clone.c:418
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existiert und ist kein Verzeichnis"
 
-#: builtin/clone.c:427
+#: builtin/clone.c:436
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "Fehler beim Starten der Iteration über '%s'"
 
-#: builtin/clone.c:457
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "Konnte Verweis '%s' nicht erstellen"
 
-#: builtin/clone.c:461
+#: builtin/clone.c:471
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "Konnte Datei nicht nach '%s' kopieren"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:476
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "Fehler beim Iterieren über '%s'"
 
-#: builtin/clone.c:491
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr "Fertig.\n"
 
-#: builtin/clone.c:505
+#: builtin/clone.c:517
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11342,97 +13310,107 @@ 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:582
+#: builtin/clone.c:594
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
 
-#: builtin/clone.c:701
+#: builtin/clone.c:713
 #, c-format
 msgid "unable to update %s"
 msgstr "kann %s nicht aktualisieren"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "Fehler beim Initialisieren vom partiellen Checkout."
+
+#: builtin/clone.c:784
 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:782
+#: builtin/clone.c:816
 msgid "unable to checkout working tree"
 msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
 
-#: builtin/clone.c:832
+#: builtin/clone.c:894
 msgid "unable to write parameters to config file"
 msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
 
-#: builtin/clone.c:895
+#: builtin/clone.c:957
 msgid "cannot repack to clean up"
 msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:959
 msgid "cannot unlink temporary alternates file"
 msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
 
-#: builtin/clone.c:937 builtin/receive-pack.c:1948
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
 msgid "Too many arguments."
 msgstr "Zu viele Argumente."
 
-#: builtin/clone.c:941
+#: builtin/clone.c:1005
 msgid "You must specify a repository to clone."
 msgstr "Sie müssen ein Repository zum Klonen angeben."
 
-#: builtin/clone.c:954
+#: builtin/clone.c:1018
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
-msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
+msgstr "--bare und --origin %s sind inkompatibel."
 
-#: builtin/clone.c:957
+#: builtin/clone.c:1021
 msgid "--bare and --separate-git-dir are incompatible."
-msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
+msgstr "--bare und --separate-git-dir sind inkompatibel."
 
-#: builtin/clone.c:970
+#: builtin/clone.c:1035
 #, c-format
 msgid "repository '%s' does not exist"
-msgstr "Repository '%s' existiert nicht."
+msgstr "Repository '%s' existiert nicht"
 
-#: builtin/clone.c:976 builtin/fetch.c:1790
+#: builtin/clone.c:1039 builtin/fetch.c:2014
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "Tiefe %s ist keine positive Zahl"
 
-#: builtin/clone.c:986
+#: builtin/clone.c:1049
 #, 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:996
+#: builtin/clone.c:1055
+#, 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
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "Arbeitsverzeichnis '%s' existiert bereits."
 
-#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
-#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
+#: 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 "Konnte führende Verzeichnisse von '%s' nicht erstellen."
 
-#: builtin/clone.c:1016
+#: builtin/clone.c:1089
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
 
-#: builtin/clone.c:1036
+#: builtin/clone.c:1109
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klone in Bare-Repository '%s' ...\n"
 
-#: builtin/clone.c:1038
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klone nach '%s' ...\n"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1135
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11440,45 +13418,55 @@ msgstr ""
 "'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
 "able"
 
-#: builtin/clone.c:1123
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#, 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
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
-"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
-"stattdessen file://"
+"--depth wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
+"\"."
 
-#: builtin/clone.c:1125
+#: builtin/clone.c:1231
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
-"file://"
+"\"file://\"."
 
-#: builtin/clone.c:1127
+#: builtin/clone.c:1233
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude wird in lokalen Klonen ignoriert; benutzen Sie stattdessen "
-"file://"
+"\"file://\"."
 
-#: builtin/clone.c:1129
+#: builtin/clone.c:1235
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
-"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://"
+"--filter wird in lokalen Klonen ignoriert; benutzen Sie stattdessen \"file://"
+"\"."
 
-#: builtin/clone.c:1132
+#: builtin/clone.c:1240
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 "Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
 "ignoriere --local"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr "--local wird ignoriert"
 
-#: builtin/clone.c:1212 builtin/clone.c:1220
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "Remoteübertragung meldete Fehler"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
 
-#: builtin/clone.c:1223
+#: builtin/clone.c:1347
 msgid "You appear to have cloned an empty repository."
 msgstr "Sie scheinen ein leeres Repository geklont zu haben."
 
@@ -11495,24 +13483,135 @@ msgid "layout to use"
 msgstr "zu verwendende Anordnung"
 
 #: builtin/column.c:30
-msgid "Maximum width"
+msgid "maximum width"
 msgstr "maximale Breite"
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "Abstand zum linken Rand"
+msgid "padding space on left border"
+msgstr "Abstand zum linken Rand auffüllen"
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "Abstand zum rechten Rand"
+msgid "padding space on right border"
+msgstr "Abstand zum rechten Rand auffüllen"
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "Abstand zwischen Spalten"
+msgid "padding space between columns"
+msgstr "Abstand zwischen Spalten auffüllen"
 
 #: builtin/column.c:51
 msgid "--command must be the first argument"
-msgstr "Die Option --command muss an erster Stelle stehen."
+msgstr "--command muss an erster Stelle stehen"
+
+#: 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 <Objektverzeichnis>] [--shallow] [--"
+"[no-]progress]"
+
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+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 <Objektverzeichnis>] [--append] [--"
+"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:1779
+msgid "dir"
+msgstr "Verzeichnis"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr "das Objektverzeichnis zum Speichern des Graphen"
+
+#: builtin/commit-graph.c:83
+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
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Konnte Commit-Graph '%s' nicht öffnen."
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "nicht erkanntes --split Argument, %s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "unerwartete nicht-hexadezimale Objekt-ID: %s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "ungültiges Objekt: %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "Durchlauf auf allen Referenzen beginnen"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen"
+
+#: builtin/commit-graph.c:217
+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
+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
+msgid "enable computation for changed paths"
+msgstr "Berechnung für veränderte Pfade aktivieren"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "erlaube das Schreiben einer inkrementellen Commit-Graph-Datei"
+
+#: builtin/commit-graph.c:228
+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
+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
+msgid "only expire files older than a given date-time"
+msgstr "nur Objekte älter als angegebene Zeit verfallen lassen"
+
+#: builtin/commit-graph.c:234
+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
+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
+msgid "Collecting commits from input"
+msgstr "Sammle Commits von der Standard-Eingabe"
 
 #: builtin/commit-tree.c:18
 msgid ""
@@ -11527,7 +13626,7 @@ 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:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
 #, c-format
 msgid "not a valid object name %s"
 msgstr "Kein gültiger Objektname: %s"
@@ -11555,13 +13654,13 @@ msgstr "Eltern-Commit"
 msgid "id of a parent commit object"
 msgstr "ID eines Eltern-Commit-Objektes."
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: 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 "Beschreibung"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
 msgid "commit message"
 msgstr "Commit-Beschreibung"
 
@@ -11569,8 +13668,8 @@ msgstr "Commit-Beschreibung"
 msgid "read commit log message from file"
 msgstr "Commit-Beschreibung von Datei lesen"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: 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 "Commit mit GPG signieren"
 
@@ -11616,10 +13715,14 @@ msgstr ""
 "\n"
 
 #: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Andernfalls benutzen Sie bitte 'git rebase --skip'\n"
+
+#: builtin/commit.c:66
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Andernfalls benutzen Sie bitte 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:69
 msgid ""
 "and then use:\n"
 "\n"
@@ -11641,62 +13744,74 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:315
+#: builtin/commit.c:324
 msgid "failed to unpack HEAD tree object"
 msgstr "Fehler beim Entpacken des Tree-Objektes von HEAD."
 
-#: builtin/commit.c:356
+#: 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
+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
 msgid "unable to create temporary index"
 msgstr "Konnte temporären Index nicht erstellen."
 
-#: builtin/commit.c:362
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr "interaktives Hinzufügen fehlgeschlagen"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:410
 msgid "unable to update temporary index"
 msgstr "Konnte temporären Index nicht aktualisieren."
 
-#: builtin/commit.c:378
+#: builtin/commit.c:412
 msgid "Failed to update main cache tree"
 msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
 msgid "unable to write new_index file"
 msgstr "Konnte new_index Datei nicht schreiben"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:489
 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:457
+#: builtin/commit.c:491
 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:465
+#: builtin/commit.c:493
+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
 msgid "cannot read the index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:520
 msgid "unable to write temporary index file"
 msgstr "Konnte temporäre Index-Datei nicht schreiben."
 
-#: builtin/commit.c:582
+#: builtin/commit.c:618
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "Commit '%s' fehlt Autor-Kopfbereich"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr "Fehlerhafter --author Parameter"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:692
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11704,78 +13819,72 @@ msgstr ""
 "Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
 "der aktuellen Commit-Beschreibung verwendet wird."
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "Konnte Commit %s nicht nachschlagen"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:758 builtin/shortlog.c:413
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:760
 msgid "could not read log from standard input"
 msgstr "Konnte Log nicht von Standard-Eingabe lesen."
 
-#: builtin/commit.c:712
+#: builtin/commit.c:764
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "Konnte Log-Datei '%s' nicht lesen"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "-m kann nicht mit --fixup:%s kombiniert werden"
+
+#: builtin/commit.c:813 builtin/commit.c:829
 msgid "could not read SQUASH_MSG"
 msgstr "Konnte SQUASH_MSG nicht lesen"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:820
 msgid "could not read MERGE_MSG"
 msgstr "Konnte MERGE_MSG nicht lesen"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:880
 msgid "could not write commit template"
 msgstr "Konnte Commit-Vorlage nicht schreiben"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:893
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
 msgstr ""
-"\n"
-"Es sieht so aus, als committen Sie einen Merge.\n"
-"Falls das nicht korrekt ist, löschen Sie bitte die Datei\n"
-"\t%s\n"
-"und versuchen Sie es erneut.\n"
+"Bitte geben Sie eine Commit-Beschreibung für Ihre Änderungen ein. Zeilen,\n"
+"die mit '%c' beginnen, werden ignoriert.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:895
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"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"
-"Es sieht so aus, als committen Sie einen \"cherry-pick\".\n"
-"Falls das nicht korrekt ist, löschen Sie bitte die Datei\n"
-"\t%s\n"
-"und versuchen Sie es erneut.\n"
+"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:847
+#: builtin/commit.c:899
 #, 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 ""
 "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"
+"die mit '%c' beginnen, werden beibehalten; wenn Sie möchten, können Sie\n"
+"diese entfernen.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11788,155 +13897,210 @@ msgstr ""
 "entfernen.\n"
 "Eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/commit.c:872
+#: 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"
+"Es sieht so aus, als committen Sie einen Merge.\n"
+"Falls das nicht korrekt ist, führen Sie bitte\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"aus und versuchen Sie es erneut.\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"
+"Es sieht so aus, als committen Sie einen \"cherry-pick\".\n"
+"Falls das nicht korrekt ist, führen Sie bitte\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"aus und versuchen Sie es erneut.\n"
+
+#: builtin/commit.c:947
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:           %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:955
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:            %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:962
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommit-Ersteller: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:980
 msgid "Cannot read index"
 msgstr "Kann Index nicht lesen"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "konnte Anhänge nicht an --trailers weitergeben"
+
+#: builtin/commit.c:1065
 msgid "Error building trees"
 msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1079 builtin/tag.c:319
 #, 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:1030
+#: builtin/commit.c:1123
 #, 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:1044
+#: builtin/commit.c:1137
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Ungültiger ignored-Modus '%s'."
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1155 builtin/commit.c:1448
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1195
 msgid "--long and -z are incompatible"
-msgstr "Die Optionen --long und -z sind inkompatibel."
+msgstr "--long und -z sind inkompatibel"
 
-#: builtin/commit.c:1146
-msgid "Using both --reset-author and --author does not make sense"
+#: builtin/commit.c:1226
+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:1228
+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:1231
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
 msgstr ""
-"Die Optionen --reset-author und --author können nicht gemeinsam verwendet "
-"werden."
+"Option für Umformulierung bei --fixup kann nicht mit Pfad '%s' kombiniert "
+"werden"
+
+#: builtin/commit.c:1233
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+"Umformulierungsoption von --fixup und --patch/--interactive/--all/--"
+"include/--only schließen sich gegenseitig aus"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1252
+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:1261
 msgid "You have nothing to amend."
-msgstr "Sie haben nichts für \"--amend\"."
+msgstr "Sie haben nichts zum Nachbessern."
 
-#: builtin/commit.c:1158
+#: 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:1160
+#: 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:1268
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Ein Rebase ist im Gange -- Nachbesserung nicht möglich."
 
-#: builtin/commit.c:1163
+#: 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:1173
+#: 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:1175
+#: 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:1183
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
-msgstr ""
-"Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
+msgstr "--reset-author kann nur mit -C, -c oder --amend verwendet werden"
 
-#: builtin/commit.c:1200
+#: 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:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr ""
-"Die Optionen --include und --only können nur mit der Angabe von Pfaden "
-"verwendet werden."
+#: builtin/commit.c:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "unbekannte Option: --fixup=%s:%s"
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1352
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "Pfade '%s ...' mit -a sind nicht sinnvoll"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1483 builtin/commit.c:1652
 msgid "show status concisely"
 msgstr "Status im Kurzformat anzeigen"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show branch information"
 msgstr "Branchinformationen anzeigen"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1487
 msgid "show stash information"
 msgstr "Stashinformationen anzeigen"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1489 builtin/commit.c:1656
 msgid "compute full ahead/behind values"
 msgstr "voraus/hinterher-Werte berechnen"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1491
 msgid "version"
 msgstr "Version"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
-#: builtin/worktree.c:650
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "maschinenlesbare Ausgabe"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1494 builtin/commit.c:1660
 msgid "show status in long format (default)"
 msgstr "Status im Langformat anzeigen (Standard)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "terminate entries with NUL"
 msgstr "Einträge mit NUL-Zeichen abschließen"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
+#: 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 "Modus"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
 "all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1504
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11944,11 +14108,11 @@ msgstr ""
 "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. "
 "(Standard: traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:188
+#: builtin/commit.c:1506 parse-options.h:193
 msgid "when"
 msgstr "wann"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1507
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11956,174 +14120,195 @@ msgstr ""
 "Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
 "(Standard: all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1509
 msgid "list untracked files in columns"
 msgstr "unversionierte Dateien in Spalten auflisten"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1510
 msgid "do not detect renames"
 msgstr "keine Umbenennungen ermitteln"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1512
 msgid "detect renames, optionally set similarity index"
 msgstr "Umbenennungen erkennen, optional Index für Gleichheit setzen"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1535
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Nicht unterstützte Kombination von ignored und untracked-files Argumenten."
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1617
 msgid "suppress summary after successful commit"
 msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1618
 msgid "show diff in commit message template"
 msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1620
 msgid "Commit message options"
 msgstr "Optionen für Commit-Beschreibung"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
 msgid "read message from file"
 msgstr "Beschreibung von Datei lesen"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "author"
 msgstr "Autor"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "override author for commit"
 msgstr "Autor eines Commits überschreiben"
 
-#: builtin/commit.c:1499 builtin/gc.c:538
+#: builtin/commit.c:1623 builtin/gc.c:550
 msgid "date"
 msgstr "Datum"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1623
 msgid "override date for commit"
 msgstr "Datum eines Commits überschreiben"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
 msgstr "Commit"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1625
 msgid "reuse and edit message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1626
 msgid "reuse message from specified commit"
 msgstr "Beschreibung des angegebenen Commits wiederverwenden"
 
-#: builtin/commit.c:1503
-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):]Commit"
+
+#: builtin/commit.c:1631
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
-"eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
+"eine autosquash-formatierte Beschreibung zum Nachbessern/Umformulieren des "
 "angegebenen Commits verwenden"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1632
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
-"eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
-"angegebenen Commits verwenden"
+"eine autosquash-formatierte Beschreibung beim \"squash\" des angegebenen "
+"Commits verwenden"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1633
 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:1506 builtin/log.c:1565 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "'Signed-off-by:'-Zeile hinzufügen"
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "Anhang"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1634
+msgid "add custom trailer(s)"
+msgstr "benutzerdefinierte Anhänge hinzufügen"
+
+#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "eine Signed-off-by Zeile hinzufügen"
+
+#: builtin/commit.c:1636
 msgid "use specified template file"
 msgstr "angegebene Vorlagendatei verwenden"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1637
 msgid "force edit of commit"
 msgstr "Bearbeitung des Commits erzwingen"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1639
 msgid "include status in commit message template"
 msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1644
 msgid "Commit contents options"
 msgstr "Optionen für Commit-Inhalt"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1645
 msgid "commit all changed files"
 msgstr "alle geänderten Dateien committen"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1646
 msgid "add specified files to index for commit"
 msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1647
 msgid "interactively add files"
 msgstr "interaktives Hinzufügen von Dateien"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1648
 msgid "interactively add changes"
 msgstr "interaktives Hinzufügen von Änderungen"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1649
 msgid "commit only specified files"
 msgstr "nur die angegebenen Dateien committen"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1650
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "Hooks pre-commit und commit-msg umgehen"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1651
 msgid "show what would be committed"
 msgstr "anzeigen, was committet werden würde"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1664
 msgid "amend previous commit"
 msgstr "vorherigen Commit ändern"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1665
 msgid "bypass post-rewrite hook"
 msgstr "\"post-rewrite hook\" umgehen"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1672
 msgid "ok to record an empty change"
 msgstr "Aufzeichnung einer leeren Änderung erlauben"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1674
 msgid "ok to record a change with an empty message"
 msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1750
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1757
 msgid "could not read MERGE_MODE"
 msgstr "Konnte MERGE_MODE nicht lesen"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1778
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1785
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1790
 #, 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:1688
+#: builtin/commit.c:1801
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "Commit aufgrund leerer Commit-Beschreibung abgebrochen.\n"
+
+#: 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"
@@ -12134,295 +14319,227 @@ msgstr ""
 "voll und Ihr Kontingent nicht aufgebraucht ist und führen Sie\n"
 "anschließend \"git restore HEAD --staged :/\" zur Wiederherstellung aus."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <Objektverzeichnis>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <Objektverzeichnis>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-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:29
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <Objektverzeichnis>] [--append|split] "
-"[--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <Split-"
-"Optionen>"
-
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
-#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
-#: builtin/log.c:1585
-msgid "dir"
-msgstr "Verzeichnis"
-
-#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
-#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
-msgid "The object directory to store the graph"
-msgstr "Das Objektverzeichnis zum Speichern des Graphen."
-
-#: builtin/commit-graph.c:58
-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:80 builtin/commit-graph.c:125
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Konnte Commit-Graph '%s' nicht öffnen."
-
-#: builtin/commit-graph.c:173
-msgid "start walk at all refs"
-msgstr "Durchlauf auf allen Referenzen beginnen"
-
-#: builtin/commit-graph.c:175
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "durch Standard-Eingabe gelistete Pack-Indexe nach Commits scannen"
-
-#: builtin/commit-graph.c:177
-msgid "start walk at commits listed by stdin"
-msgstr "Lauf bei Commits beginnen, die über die Standard-Eingabe gelistet sind"
-
-#: builtin/commit-graph.c:179
-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:182
-msgid "allow writing an incremental commit-graph file"
-msgstr "Erlaube das Schreiben einer inkrementellen Commit-Graph-Datei"
-
-#: builtin/commit-graph.c:184 builtin/commit-graph.c:188
-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:186
-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:204
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr ""
-"Benutzen Sie mindestens eins von --reachable, --stdin-commits, oder --stdin-"
-"packs."
-
 #: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<Optionen>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "nicht erkanntes --type Argument, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "nur ein Typ erlaubt"
 
-#: builtin/config.c:124
+#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Ort der Konfigurationsdatei"
 
-#: builtin/config.c:125
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr "globale Konfigurationsdatei verwenden"
 
-#: builtin/config.c:126
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr "systemweite Konfigurationsdatei verwenden"
 
-#: builtin/config.c:127
+#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "Konfigurationsdatei des Repositories verwenden"
 
-#: builtin/config.c:128
+#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "Konfigurationsdatei pro Arbeitsverzeichnis verwenden"
 
-#: builtin/config.c:129
+#: builtin/config.c:135
 msgid "use given config file"
 msgstr "die angegebene Konfigurationsdatei verwenden"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr "Blob-Id"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "Konfiguration von angegebenem Blob-Objekt lesen"
 
-#: builtin/config.c:131
+#: builtin/config.c:137
 msgid "Action"
 msgstr "Aktion"
 
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "Wert zurückgeben: Name [Wert-regex]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "Wert zurückgeben: Name [Wert-Muster]"
 
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "alle Werte zurückgeben: Schlüssel [Wert-Muster]"
 
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "Werte für den regulären Ausdruck zurückgeben: Name-Regex [Wert-Muster]"
 
-#: builtin/config.c:135
+#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL"
 
-#: builtin/config.c:136
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] "
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-Muster] "
 
-#: builtin/config.c:137
+#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "neue Variable hinzufügen: Name Wert"
 
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "eine Variable entfernen: Name [Wert-regex]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "eine Variable entfernen: Name [Wert-Muster]"
 
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "alle Ãœbereinstimmungen entfernen: Name [Wert-regex]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "alle Ãœbereinstimmungen entfernen: Name [Wert-Muster]"
 
-#: builtin/config.c:140
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "eine Sektion umbenennen: alter-Name neuer-Name"
 
-#: builtin/config.c:141
+#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "eine Sektion entfernen: Name"
 
-#: builtin/config.c:142
+#: builtin/config.c:148
 msgid "list all"
 msgstr "alles auflisten"
 
-#: builtin/config.c:143
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+"nutze String-Gleichheit beim Vergleich von Werten mit dem 'Wert-Muster'"
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr "einen Editor öffnen"
 
-#: builtin/config.c:144
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "die konfigurierte Farbe finden: Slot [Standard]"
 
-#: builtin/config.c:145
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]"
 
-#: builtin/config.c:146
+#: builtin/config.c:153
 msgid "Type"
 msgstr "Typ"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "Wert ist mit diesem Typ angegeben"
 
-#: builtin/config.c:148
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "Wert ist \"true\" oder \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "Wert ist eine Dezimalzahl"
 
-#: builtin/config.c:150
+#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "Wert ist --bool oder --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "Wert ist --bool oder string"
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)"
 
-#: builtin/config.c:152
+#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "Wert ist ein Verfallsdatum"
 
-#: builtin/config.c:153
+#: builtin/config.c:161
 msgid "Other"
 msgstr "Sonstiges"
 
-#: builtin/config.c:154
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "schließt Werte mit NUL-Byte ab"
 
-#: builtin/config.c:155
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "nur Variablennamen anzeigen"
 
-#: builtin/config.c:156
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
 
-#: builtin/config.c:157
+#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
 "Befehlszeile)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"Zeige Geltungsbereich der Konfiguration (Arbeitsverzeichnis, lokal, global, "
+"systemweit, Befehl)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "Wert"
 
-#: builtin/config.c:158
+#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "mit --get, benutze den Standardwert, wenn der Eintrag fehlt"
 
-#: builtin/config.c:172
+#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "Falsche Anzahl von Argumenten - sollte %d sein."
 
-#: builtin/config.c:174
+#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
-msgstr "Falsche Anzahl von Argumenten - sollte zwischen %d und %d sein."
+msgstr "falsche Anzahl von Argumenten - sollte zwischen %d und %d sein"
 
-#: builtin/config.c:308
+#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "Ungültiges Schlüsselmuster: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:377
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "Fehler beim Formatieren des Standardkonfigurationswertes: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
-msgstr "Kann Farbe '%s' nicht parsen."
+msgstr "kann Farbe '%s' nicht parsen"
 
-#: builtin/config.c:443
+#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "konnte Standard-Farbwert nicht parsen"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
-msgstr "Nicht in einem Git-Repository."
+msgstr "nicht in einem Git-Repository"
 
-#: builtin/config.c:499
+#: builtin/config.c:539
 msgid "writing to stdin is not supported"
-msgstr "Das Schreiben in die Standard-Eingabe wird nicht unterstützt."
+msgstr "das Schreiben in die Standard-Eingabe wird nicht unterstützt"
 
-#: builtin/config.c:502
+#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr ""
-"Das Schreiben von Blob-Objekten für Konfigurationen wird nicht unterstützt."
+"das Schreiben von Blob-Objekten für Konfigurationen wird nicht unterstützt"
 
-#: builtin/config.c:587
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12431,29 +14548,33 @@ msgid ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 msgstr ""
-"# Das ist Git's benutzerspezifische Konfigurationsdatei.\n"
+"# Das ist Gits benutzerspezifische Konfigurationsdatei.\n"
 "[user]\n"
 "# Bitte passen Sie die folgenden Zeilen an und kommentieren Sie diese aus:\n"
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:652
 msgid "only one config file at a time"
-msgstr "Nur eine Konfigurationsdatei zu einer Zeit möglich."
+msgstr "nur eine Konfigurationsdatei zu einer Zeit möglich"
 
-#: builtin/config.c:616
+#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
-msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden."
+msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden"
 
-#: builtin/config.c:619
+#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
-msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden."
+msgstr "--blob kann nur innerhalb eines Git-Repositories verwendet werden"
+
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree kann nur innerhalb eines Git-Repositories verwendet werden"
 
-#: builtin/config.c:638
+#: builtin/config.c:684
 msgid "$HOME not set"
-msgstr "$HOME nicht gesetzt."
+msgstr "$HOME nicht gesetzt"
 
-#: builtin/config.c:658
+#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12461,68 +14582,72 @@ 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:688
+#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "Angabe von --get-color und Variablentyp sind ungültig."
 
-#: builtin/config.c:693
+#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "Nur eine Aktion erlaubt."
 
-#: builtin/config.c:706
+#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only ist nur anwendbar auf --list oder --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin ist nur anwendbar auf --get, --get-all, --get-regexp und --list"
 
-#: builtin/config.c:718
+#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default ist nur anwendbar auf --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value wird nur zusammen mit 'Wert-Muster' angewendet"
+
+#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "Konnte Konfigurationsdatei '%s' nicht lesen."
 
-#: builtin/config.c:734
+#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "Fehler beim Verarbeiten der Konfigurationsdatei(en)."
 
-#: builtin/config.c:744
+#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "Das Bearbeiten der Standard-Eingabe wird nicht unterstützt."
 
-#: builtin/config.c:746
+#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "Das Bearbeiten von Blobs wird nicht unterstützt."
 
-#: builtin/config.c:760
+#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
 
-#: builtin/config.c:773
+#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       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:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
-msgstr "Keine solche Sektion: %s"
+msgstr "Sektion nicht gefunden: %s"
 
 #: builtin/count-objects.c:90
 msgid "git count-objects [-v] [-H | --human-readable]"
@@ -12532,6 +14657,40 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "gibt Größenangaben in menschenlesbaren Format aus"
 
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Die Berechtigungen auf Ihr Socket-Verzeichnis sind zu schwach; andere\n"
+"Nutzer könnten Ihre zwischengespeicherten Anmeldeinformationen lesen.\n"
+"Ziehen Sie in Betracht\n"
+"\n"
+"\tchmod 0700 %s\n"
+"\n"
+"auszuführen."
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
+
+#: builtin/credential-cache--daemon.c:316
+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
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache nicht verfügbar; Unix-Socket wird nicht unterstützt"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "konnte Sperre für Zugangsdatenspeicher nicht in %d ms bekommen"
+
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
@@ -12540,51 +14699,46 @@ msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<Optionen>] --dirty"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "head"
 msgstr "Branch"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "nicht-annotiert"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr "annotiert"
 
-#: builtin/describe.c:275
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "annotiertes Tag %s ist nicht verfügbar"
 
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
-
 #: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "Tag '%s' ist eigentlich '%s' hier"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "Tag '%s' ist extern bekannt als '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "kein Tag entspricht exakt '%s'"
 
-#: builtin/describe.c:327
+#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Keine exakte Ãœbereinstimmung bei Referenzen oder Tags, Suche zum "
 "Beschreiben\n"
 
-#: builtin/describe.c:381
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "beendete Suche bei %s\n"
 
-#: builtin/describe.c:407
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12593,7 +14747,7 @@ msgstr ""
 "Keine annotierten Tags können '%s' beschreiben.\n"
 "Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
 
-#: builtin/describe.c:411
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12602,12 +14756,12 @@ msgstr ""
 "Keine Tags können '%s' beschreiben.\n"
 "Versuchen Sie --always oder erstellen Sie einige Tags."
 
-#: builtin/describe.c:441
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu Commits durchlaufen\n"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12616,145 +14770,163 @@ msgstr ""
 "mehr als %i Tags gefunden; führe die ersten %i auf\n"
 "Suche bei %s aufgegeben\n"
 
-#: builtin/describe.c:512
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "Beschreibe %s\n"
 
-#: builtin/describe.c:515
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s ist kein gültiger Objekt-Name"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s ist weder ein Commit, noch ein Blob."
 
-#: builtin/describe.c:537
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "das Tag finden, das nach dem Commit kommt"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "alle Referenzen verwenden"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "jedes Tag verwenden, auch nicht-annotierte"
 
-#: builtin/describe.c:541
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "immer langes Format verwenden"
 
-#: builtin/describe.c:542
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "nur erstem Elternteil folgen"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "nur exakte Ãœbereinstimmungen ausgeben"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "nur Tags, die <Muster> entsprechen, betrachten"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "keine Tags betrachten, die <Muster> entsprechen"
 
-#: builtin/describe.c:553 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
 
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "Markierung"
 
-#: builtin/describe.c:555
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 "<Markierung> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty"
 "\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "<Markierung> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken\")"
 
-#: builtin/describe.c:576
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
-msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel."
+msgstr "--long und --abbrev=0 sind inkompatibel"
 
-#: builtin/describe.c:605
+#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Keine Namen gefunden, kann nichts beschreiben."
 
-#: builtin/describe.c:656
+#: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
-msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
+msgstr "--dirty kann nicht mit Commits verwendet werden"
 
-#: builtin/describe.c:658
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
-msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
+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/diff.c:84
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base funktioniert nur mit zwei Commits"
+
+#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "Ungültige Option: %s"
 
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: keine Merge-Basis"
+
+#: builtin/diff.c:486
 msgid "Not a git repository"
 msgstr "Kein Git-Repository"
 
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "Objekt '%s' ist ungültig."
 
-#: builtin/diff.c:403
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "Mehr als zwei Blobs angegeben: '%s'"
 
-#: builtin/diff.c:408
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "unbehandeltes Objekt '%s' angegeben"
 
-#: builtin/difftool.c:30
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: mehrere Merge-Basen, nutze %s"
+
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
 
-#: builtin/difftool.c:260
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
 msgstr "fehlgeschlagen: %d"
 
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink %s"
 msgstr "konnte symbolische Verknüpfung %s nicht lesen"
 
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
 
-#: builtin/difftool.c:312
+#: builtin/difftool.c:313
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "Konnte Objekt '%s' für symbolische Verknüpfung '%s' nicht lesen."
@@ -12767,54 +14939,54 @@ msgstr ""
 "Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
 "Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "beide Dateien geändert: '%s' und '%s'."
 
-#: builtin/difftool.c:636
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "Datei im Arbeitsverzeichnis belassen."
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "Es existieren temporäre Dateien in '%s'."
 
-#: builtin/difftool.c:648
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr "Sie könnten diese aufräumen oder wiederherstellen."
 
-#: builtin/difftool.c:697
+#: builtin/difftool.c:699
 msgid "use `diff.guitool` instead of `diff.tool`"
-msgstr "`diff.guitool` anstatt `diff.tool` benutzen"
+msgstr "`diff.guitool` statt `diff.tool` benutzen"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:701
 msgid "perform a full-directory diff"
 msgstr "Diff über ganzes Verzeichnis ausführen"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:703
 msgid "do not prompt before launching a diff tool"
 msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:708
 msgid "use symlinks in dir-diff mode"
 msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:709
 msgid "tool"
 msgstr "Tool"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:710
 msgid "use the specified diff tool"
 msgstr "das angegebene Diff-Tool benutzen"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:712
 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:713
+#: builtin/difftool.c:715
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12823,31 +14995,31 @@ msgstr ""
 "Rückkehrwert\n"
 "verschieden 0 ausgeführt wurde"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:718
 msgid "specify a custom command for viewing diffs"
 msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
 
-#: builtin/difftool.c:717
+#: builtin/difftool.c:719
 msgid "passed to `diff`"
 msgstr "an 'diff' übergeben"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:734
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool benötigt Arbeitsverzeichnis oder --no-index"
 
-#: builtin/difftool.c:739
+#: builtin/difftool.c:741
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff kann nicht mit --no-index verwendet werden"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:744
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool und --extcmd schließen sich gegenseitig aus"
 
-#: builtin/difftool.c:750
+#: builtin/difftool.c:752
 msgid "no <tool> given for --tool=<tool>"
 msgstr "kein <Tool> für --tool=<Tool> angegeben"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:759
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
 
@@ -12855,26 +15027,26 @@ 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:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
 msgid "type"
 msgstr "Art"
 
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "Standard für git_env_*(...), um darauf zurückzugreifen"
 
-#: builtin/env--helper.c:43
+#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "Ausgaben unterdrücken; nur git_env_*() Werte als Exit-Code verwenden"
 
-#: builtin/env--helper.c:62
+#: builtin/env--helper.c:67
 #, 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 `"
 "%s`"
 
-#: builtin/env--helper.c:77
+#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -12887,194 +15059,259 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:852
+#: builtin/fast-export.c:868
 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:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "Token für --anonymize-map kann nicht leer sein"
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "Fortschritt nach <n> Objekten anzeigen"
 
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "Behandlung von signierten Tags wählen"
 
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
 msgid "select handling of tags that tag filtered objects"
 msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
 
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
 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:1163
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
 msgstr "Markierungen in diese Datei schreiben"
 
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
 msgstr "Markierungen von dieser Datei importieren"
 
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
 msgstr "Markierungen von dieser Datei importieren, wenn diese existiert"
 
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "einen Tag-Ersteller vortäuschen, wenn das Tag keinen hat"
 
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
 msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
 
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
 msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
 
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
 msgstr "Ausgabe von Blob-Daten überspringen"
 
-#: builtin/fast-export.c:1177 builtin/log.c:1633
+#: builtin/fast-export.c:1222 builtin/log.c:1826
 msgid "refspec"
 msgstr "Refspec"
 
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
 msgstr "Refspec auf exportierte Referenzen anwenden"
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "Ausgabe anonymisieren"
 
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "von:nach"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "konvertiere <von> zu <nach> in anonymisierter Ausgabe"
+
+#: builtin/fast-export.c:1229
+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:1183
-msgid "Show original object ids of blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
 msgstr "originale Objekt-IDs von Blobs/Commits anzeigen"
 
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
 msgstr "Tags mit Markierungs-IDs beschriften"
 
-#: builtin/fast-export.c:1220
+#: 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/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Fehlende 'from'-Markierungen für Submodul '%s'"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Fehlende 'to'-Markierungen für Submodul '%s'"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "'mark' Befehl erwartet, '%s' bekommen"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "'to' Befehl erwartet, '%s' bekommen"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "Format 'Name:Dateiname' für Submodul-Rewrite-Option erwartet"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "Feature '%s' verboten in Eingabe ohne Option --allow-unsafe-features"
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "Lock-Datei erstellt, aber nicht gemeldet: %s"
+
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<Optionen>] <Gruppe>"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<Optionen>]"
 
-#: builtin/fetch.c:115
+#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel kann nicht negativ sein"
 
-#: builtin/fetch.c:138 builtin/pull.c:204
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "fordert von allen Remote-Repositories an"
 
-#: builtin/fetch.c:140 builtin/pull.c:248
+#: builtin/fetch.c:147 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
 msgstr "Upstream für \"git pull/fetch\" setzen"
 
-#: builtin/fetch.c:142 builtin/pull.c:207
+#: builtin/fetch.c:149 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
-msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
+msgstr "an .git/FETCH_HEAD anhängen statt zu überschreiben"
+
+#: builtin/fetch.c:151
+msgid "use atomic transaction to update references"
+msgstr "atomare Transaktionen nutzen, um Referenzen zu aktualisieren"
 
-#: builtin/fetch.c:144 builtin/pull.c:210
+#: builtin/fetch.c:153 builtin/pull.c:191
 msgid "path to upload pack on remote end"
 msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
 
-#: builtin/fetch.c:145
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr "das Ãœberschreiben einer lokalen Referenz erzwingen"
 
-#: builtin/fetch.c:147
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "von mehreren Remote-Repositories anfordern"
 
-#: builtin/fetch.c:149 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "alle Tags und verbundene Objekte anfordern"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr "nicht alle Tags anfordern (--no-tags)"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "Anzahl der parallel anzufordernden Submodule"
 
-#: builtin/fetch.c:155 builtin/pull.c:217
+#: builtin/fetch.c:164
+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
 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:157
+#: builtin/fetch.c:168
 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:158 builtin/fetch.c:181 builtin/pull.c:141
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "bei-Bedarf"
 
-#: builtin/fetch.c:159
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/fetch.c:163 builtin/pull.c:225
+#: builtin/fetch.c:175
+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
 msgid "keep downloaded pack"
 msgstr "heruntergeladenes Paket behalten"
 
-#: builtin/fetch.c:165
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
 
-#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr ""
 "die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:183 builtin/pull.c:212
 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:176 builtin/pull.c:231
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "zu einem vollständigen Repository konvertieren"
 
-#: builtin/fetch.c:179
+#: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
 msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
 
-#: builtin/fetch.c:182
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -13082,92 +15319,106 @@ msgstr ""
 "Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
 "als Konfigurationsdateien)"
 
-#: builtin/fetch.c:186 builtin/pull.c:234
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
 
-#: builtin/fetch.c:187 builtin/pull.c:236
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr "Refmap"
 
-#: builtin/fetch.c:188 builtin/pull.c:237
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "Refmap für 'fetch' angeben"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:208 builtin/pull.c:240
 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:198
-msgid "run 'gc --auto' after fetching"
-msgstr "Führe 'gc --auto' nach \"fetch\" aus"
+#: builtin/fetch.c:210
+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
+msgid "run 'maintenance --auto' after fetching"
+msgstr "führe 'maintenance --auto' nach \"fetch\" aus"
 
-#: builtin/fetch.c:200 builtin/pull.c:246
+#: builtin/fetch.c:217 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr "Prüfe auf erzwungene Aktualisierungen in allen aktualisierten Branches"
 
-#: builtin/fetch.c:510
+#: builtin/fetch.c:219
+msgid "write the commit-graph after fetching"
+msgstr "Schreibe den Commit-Graph nach \"fetch\""
+
+#: builtin/fetch.c:221
+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:650
+#: builtin/fetch.c:757
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:856
 #, c-format
 msgid "object %s not found"
 msgstr "Objekt %s nicht gefunden"
 
-#: builtin/fetch.c:752
+#: builtin/fetch.c:860
 msgid "[up to date]"
 msgstr "[aktuell]"
 
-#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr "[zurückgewiesen]"
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:874
 msgid "can't fetch in current branch"
 msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
 
-#: builtin/fetch.c:776
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr "[Tag Aktualisierung]"
 
-#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
-#: builtin/fetch.c:848
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
 msgid "unable to update local ref"
 msgstr "kann lokale Referenz nicht aktualisieren"
 
-#: builtin/fetch.c:781
+#: builtin/fetch.c:889
 msgid "would clobber existing tag"
 msgstr "würde bestehende Tags verändern"
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr "[neues Tag]"
 
-#: builtin/fetch.c:806
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr "[neuer Branch]"
 
-#: builtin/fetch.c:809
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr "[neue Referenz]"
 
-#: builtin/fetch.c:848
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr "Aktualisierung erzwungen"
 
-#: builtin/fetch.c:853
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
 msgstr "kein Vorspulen"
 
-#: builtin/fetch.c:874
+#: 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"
@@ -13175,10 +15426,10 @@ msgid ""
 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:878
+#: builtin/fetch.c:1069
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -13191,25 +15442,24 @@ msgstr ""
 "'git config fetch.showForcedUpdates false' ausführen, um diese Überprüfung\n"
 "zu umgehen.\n"
 
-#: builtin/fetch.c:908
+#: builtin/fetch.c:1101
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
 
-#: builtin/fetch.c:929
+#: builtin/fetch.c:1129
 #, 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:1020 builtin/fetch.c:1157
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr "Von %.*s\n"
 
-#: builtin/fetch.c:1031
+#: builtin/fetch.c:1228
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -13218,58 +15468,58 @@ 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:1127
+#: builtin/fetch.c:1327
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s wird unreferenziert)"
 
-#: builtin/fetch.c:1128
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s wurde unreferenziert)"
 
-#: builtin/fetch.c:1160
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr "[gelöscht]"
 
-#: builtin/fetch.c:1161 builtin/remote.c:1036
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(nichts)"
 
-#: builtin/fetch.c:1184
+#: builtin/fetch.c:1384
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 "Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository "
 "wurde verweigert."
 
-#: builtin/fetch.c:1203
+#: builtin/fetch.c:1403
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
 
-#: builtin/fetch.c:1206
+#: builtin/fetch.c:1406
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Option \"%s\" wird ignoriert für %s\n"
 
-#: builtin/fetch.c:1414
-msgid "multiple branch detected, incompatible with --set-upstream"
-msgstr "mehrere Branches erkannt, inkompatibel mit --set-upstream"
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "Mehrere Branches erkannt, inkompatibel mit --set-upstream"
 
-#: builtin/fetch.c:1429
+#: builtin/fetch.c:1633
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "Setze keinen Upstream für einen entfernten Remote-Tracking-Branch."
 
-#: builtin/fetch.c:1431
+#: builtin/fetch.c:1635
 msgid "not setting upstream for a remote tag"
 msgstr "Setze keinen Upstream für einen Tag eines Remote-Repositories."
 
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1637
 msgid "unknown branch type"
 msgstr "Unbekannter Branch-Typ"
 
-#: builtin/fetch.c:1435
+#: builtin/fetch.c:1639
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
@@ -13277,22 +15527,22 @@ msgstr ""
 "Keinen Quell-Branch gefunden.\n"
 "Sie müssen bei der Option --set-upstream genau einen Branch angeben."
 
-#: builtin/fetch.c:1561 builtin/fetch.c:1623
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Fordere an von %s\n"
 
-#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Konnte nicht von %s anfordern"
 
-#: builtin/fetch.c:1583
+#: builtin/fetch.c:1790
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "Konnte '%s' nicht anfordern (Exit-Code: %d)\n"
 
-#: builtin/fetch.c:1685
+#: 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."
@@ -13301,80 +15551,103 @@ msgstr ""
 "oder den Namen des Remote-Repositories an, von welchem neue\n"
 "Commits angefordert werden sollen."
 
-#: builtin/fetch.c:1722
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr "Sie müssen den Namen des Tags angeben."
 
-#: builtin/fetch.c:1774
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only benötigt einen oder mehrere --negotiate-tip=*"
+
+#: builtin/fetch.c:1998
 msgid "Negative depth in --deepen is not supported"
 msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
 
-#: builtin/fetch.c:1776
+#: builtin/fetch.c:2000
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen und --depth schließen sich gegenseitig aus"
 
-#: builtin/fetch.c:1781
+#: builtin/fetch.c:2005
 msgid "--depth and --unshallow cannot be used together"
-msgstr ""
-"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
+msgstr "--depth und --unshallow können nicht gemeinsam verwendet werden"
 
-#: builtin/fetch.c:1783
+#: builtin/fetch.c:2007
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
-"Die Option --unshallow kann nicht in einem Repository mit vollständiger "
-"Historie verwendet werden."
+"--unshallow kann nicht in einem Repository mit vollständiger Historie "
+"verwendet werden"
 
-#: builtin/fetch.c:1799
+#: builtin/fetch.c:2024
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all akzeptiert kein Repository als Argument"
 
-#: builtin/fetch.c:1801
+#: builtin/fetch.c:2026
 msgid "fetch --all does not make sense with refspecs"
-msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
+msgstr "fetch --all kann nicht mit Refspecs verwendet werden"
 
-#: builtin/fetch.c:1810
+#: builtin/fetch.c:2035
 #, c-format
 msgid "No such remote or remote group: %s"
-msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
+msgstr "Remote-Repository (einzeln oder Gruppe) nicht gefunden: %s"
 
-#: builtin/fetch.c:1817
+#: builtin/fetch.c:2042
 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."
 
-#: builtin/fetch.c:1835
+#: builtin/fetch.c:2058
+msgid "must supply remote when using --negotiate-only"
+msgstr "Remote wird benötigt, wenn --negotiate-only benutzt wird"
+
+#: builtin/fetch.c:2063
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "Protokoll unterstützt --negotiate-only nicht, beende."
+
+#: builtin/fetch.c:2082
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
 msgstr ""
 "--filter kann nur mit den Remote-Repositories verwendet werden,\n"
-"die in core.partialClone konfiguriert sind."
+"die in extensions.partialclone konfiguriert sind"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2086
+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:2090
+msgid "--stdin can only be used when fetching from one remote"
+msgstr ""
+"--stdin kann nur verwendet werden, wenn nur von einem Remote-Repository "
+"abgefragt wird"
+
+#: 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 <Beschreibung>] [--log[=<n>] | --no-log] [--file "
 "<Datei>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 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:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "Alias für --log (veraltet)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "Text"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "<Text> als Beschreibungsanfang verwenden"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "Datei zum Einlesen"
 
@@ -13387,325 +15660,341 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <Objekt>]"
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<Commit>]]"
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+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 [<Objekt>]] [--no-contains [<Commit>]]"
 
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
 msgstr "Platzhalter als Shell-String formatieren"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr "Platzhalter als Perl-String formatieren"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr "Platzhalter als Python-String formatieren"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr "Platzhalter als Tcl-String formatieren"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "nur <n> passende Referenzen anzeigen"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
 msgid "respect format colors"
 msgstr "Formatfarben beachten"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "nur zusammengeführte Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
 msgstr "nur nicht zusammengeführte Referenzen ausgeben"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
 msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<Konfiguration> <Befehlsargumente>"
+
+#: builtin/for-each-repo.c:34
+msgid "config"
+msgstr "Konfiguration"
+
+#: 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:43
+msgid "missing --config=<config>"
+msgstr "Option --config=<Konfiguration> fehlt"
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "unbekannt"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "Fehler in %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "Warnung in %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
-msgstr "Fehlerhafte Verknüpfung von %7s %s"
+msgstr "fehlerhafte Verknüpfung von %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
-msgstr "Falscher Objekttyp in Verknüpfung."
+msgstr "falscher Objekttyp in Verknüpfung"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
 msgstr ""
-"Fehlerhafte Verknüpfung von %7s %s\n"
+"fehlerhafte Verknüpfung von %7s %s\n"
 "                       nach %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "%s %s fehlt"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "%s %s nicht erreichbar"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "%s %s unreferenziert"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "Konnte lost-found nicht erstellen."
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "Konnte '%s' nicht abschließen."
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Prüfe %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Prüfe Konnektivität (%d Objekte)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Prüfe %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "Fehlerhafte Verknüpfungen"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "Wurzel %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "%s %s (%s) in %s getaggt"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: Objekt fehlerhaft oder nicht vorhanden"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: Ungültiger Reflog-Eintrag %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Prüfe Reflog %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: Ungültiger SHA1-Zeiger %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: kein Commit"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "Notiz: Keine Standardreferenzen"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:606
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: Objekt fehlerhaft oder nicht vorhanden: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:619
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: Objekt konnte nicht geparst werden: %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:639
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "Ungültige SHA1-Datei: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:654
 msgid "Checking object directory"
 msgstr "Prüfe Objekt-Verzeichnis"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:657
 msgid "Checking object directories"
 msgstr "Prüfe Objekt-Verzeichnisse"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:672
 #, c-format
 msgid "Checking %s link"
 msgstr "Prüfe %s Verknüpfung"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:677 builtin/index-pack.c:864
 #, c-format
 msgid "invalid %s"
 msgstr "Ungültiger Objekt-Typ %s"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:684
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s zeigt auf etwas seltsames (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:690
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: losgelöster HEAD zeigt auf nichts"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:694
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "Notiz: %s zeigt auf einen ungeborenen Branch (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:706
 msgid "Checking cache tree"
 msgstr "Prüfe Cache-Verzeichnis"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:711
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: Ungültiger SHA1-Zeiger in Cache-Verzeichnis"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:720
 msgid "non-tree in cache-tree"
 msgstr "non-tree in Cache-Verzeichnis"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:751
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<Optionen>] [<Objekt>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:757
 msgid "show unreachable objects"
 msgstr "unerreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:758
 msgid "show dangling objects"
 msgstr "unreferenzierte Objekte anzeigen"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:759
 msgid "report tags"
 msgstr "Tags melden"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:760
 msgid "report root nodes"
 msgstr "Hauptwurzeln melden"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:761
 msgid "make index objects head nodes"
 msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:762
 msgid "make reflogs head nodes (default)"
 msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:763
 msgid "also consider packs and alternate objects"
 msgstr "ebenso Pakete und alternative Objekte betrachten"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:764
 msgid "check only connectivity"
 msgstr "nur Konnektivität prüfen"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:765 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "genauere Prüfung aktivieren"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:767
 msgid "write dangling objects in .git/lost-found"
 msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:768 builtin/prune.c:134
 msgid "show progress"
 msgstr "Fortschrittsanzeige anzeigen"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:769
 msgid "show verbose names for reachable objects"
 msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:828 builtin/index-pack.c:262
 msgid "Checking objects"
 msgstr "Prüfe Objekte"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:856
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: Objekt nicht vorhanden"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:867
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "Ungültiger Parameter: SHA-1 erwartet, '%s' bekommen"
 
-#: builtin/gc.c:35
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<Optionen>]"
 
-#: builtin/gc.c:90
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Konnte '%s' nicht lesen: %s"
 
-#: builtin/gc.c:126
+#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "Fehler beim Parsen von '%s' mit dem Wert '%s'"
 
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "Kann '%s' nicht lesen"
 
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: 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:491
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13721,58 +16010,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:539
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
 msgstr "unreferenzierte Objekte entfernen"
 
-#: builtin/gc.c:541
+#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "\"auto-gc\" Modus aktivieren"
 
-#: builtin/gc.c:545
+#: builtin/gc.c:557
 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:548
+#: builtin/gc.c:560
 msgid "repack all other packs except the largest pack"
 msgstr "alle anderen Pakete, außer das größte Paket, neu packen"
 
-#: builtin/gc.c:565
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry."
 
-#: builtin/gc.c:576
+#: builtin/gc.c:587
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "Fehler beim Parsen des \"prune expiry\" Wertes %s"
 
-#: builtin/gc.c:596
+#: builtin/gc.c:607
 #, 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:598
+#: builtin/gc.c:609
 #, 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:599
+#: builtin/gc.c:610
 #, 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:639
+#: builtin/gc.c:650
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13780,23 +16069,190 @@ msgstr ""
 "\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
 "(benutzen Sie --force falls nicht)"
 
-#: builtin/gc.c:694
+#: builtin/gc.c:705
 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/grep.c:29
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<Aufgabe>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule ist nicht erlaubt"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "nicht erkanntes --schedule Argument '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "Fehler beim Schreiben des Commit-Graph"
+
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr "Vorabruf der Remote-Repositories fehlgeschlagen"
+
+#: builtin/gc.c:1022
+msgid "failed to start 'git pack-objects' process"
+msgstr "konnte 'git pack-objects' Prozess nicht starten"
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr "konnte 'git pack-objects' Prozess nicht beenden"
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr "Fehler beim Schreiben des multi-pack-index"
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr "Fehler beim Ausführen von 'git multi-pack-index expire'"
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr "Fehler beim Ausführen von 'git multi-pack-index repack'"
+
+#: builtin/gc.c:1179
+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
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "Sperrdatei '%s' existiert, Wartung wird übersprungen"
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr "Aufgabe '%s' fehlgeschlagen"
+
+#: builtin/gc.c:1395
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' ist keine gültige Aufgabe"
+
+#: builtin/gc.c:1400
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "Aufgabe '%s' kann nicht mehrfach ausgewählt werden"
+
+#: builtin/gc.c:1415
+msgid "run tasks based on the state of the repository"
+msgstr "Aufgaben abhängig vom Zustand des Repositories ausführen"
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr "Häufigkeit"
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr "Aufgaben abhängig von der Häufigkeit ausführen"
+
+#: builtin/gc.c:1420
+msgid "do not report progress or other information over stderr"
+msgstr "zeige keinen Fortschritt oder andere Informationen über stderr"
+
+#: builtin/gc.c:1421
+msgid "task"
+msgstr "Aufgabe"
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr "eine bestimmte Aufgabe ausführen"
+
+#: builtin/gc.c:1439
+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
+msgid "failed to run 'git config'"
+msgstr "Fehler beim Ausführen von 'git config'"
+
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "Fehler beim Erweitern des Pfades '%s'"
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr "konnte launchctl nicht starten"
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "Fehler beim Erstellen von Verzeichnissen für '%s'"
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "Fehler beim Laden des Services %s"
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
+msgstr "Fehler beim Erstellen der temporären XML-Datei"
+
+#: builtin/gc.c:1835
+msgid "failed to start schtasks"
+msgstr "Fehler beim Starten von schtasks"
+
+#: builtin/gc.c:1879
+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
+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
+msgid "failed to open stdin of 'crontab'"
+msgstr "Fehler beim Öffnen der Standard-Eingabe von 'crontab'"
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr "'crontab' abgebrochen"
+
+#: builtin/gc.c:1976
+msgid "another process is scheduling background maintenance"
+msgstr "ein anderer Prozess plant die Hintergrundwartung"
+
+#: builtin/gc.c:2000
+msgid "failed to add repo to global config"
+msgstr "Repository konnte nicht zur globalen Konfiguration hinzugefügt werden"
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <Unterbefehl> [<Optionen>]"
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "ungültiger Unterbefehl: %s"
+
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
 
-#: builtin/grep.c:225
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
 
-#: builtin/grep.c:279
+#: builtin/grep.c:277
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
@@ -13805,266 +16261,266 @@ msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: 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 "keine Unterstützung von Threads, '%s' wird ignoriert"
 
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:658
 #, 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:716
+#: builtin/grep.c:738
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "Schalter '%c' erwartet einen numerischen Wert"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:837
 msgid "search in index instead of in the work tree"
-msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
+msgstr "im Index statt im Arbeitsverzeichnis suchen"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:839
 msgid "find in contents not managed by git"
 msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:841
 msgid "search in both tracked and untracked files"
 msgstr "in versionierten und unversionierten Dateien suchen"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:843
 msgid "ignore files specified via '.gitignore'"
 msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:845
 msgid "recursively search in each submodule"
 msgstr "rekursive Suche in jedem Submodul"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:848
 msgid "show non-matching lines"
 msgstr "Zeilen ohne Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:850
 msgid "case insensitive matching"
 msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:852
 msgid "match patterns only at word boundaries"
 msgstr "nur ganze Wörter suchen"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:854
 msgid "process binary files as text"
 msgstr "binäre Dateien als Text verarbeiten"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:856
 msgid "don't match patterns in binary files"
 msgstr "keine Muster in Binärdateien finden"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:859
 msgid "process binary files with textconv filters"
 msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:861
 msgid "search in subdirectories (default)"
 msgstr "in Unterverzeichnissen suchen (Standard)"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:863
 msgid "descend at most <depth> levels"
 msgstr "höchstens <Tiefe> Ebenen durchlaufen"
 
-#: builtin/grep.c:845
+#: builtin/grep.c:867
 msgid "use extended POSIX regular expressions"
 msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:870
 msgid "use basic POSIX regular expressions (default)"
 msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:873
 msgid "interpret patterns as fixed strings"
 msgstr "Muster als feste Zeichenketten interpretieren"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:876
 msgid "use Perl-compatible regular expressions"
 msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:879
 msgid "show line numbers"
 msgstr "Zeilennummern anzeigen"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:880
 msgid "show column number of first match"
 msgstr "Nummer der Spalte des ersten Treffers anzeigen"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:881
 msgid "don't show filenames"
 msgstr "keine Dateinamen anzeigen"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:882
 msgid "show filenames"
 msgstr "Dateinamen anzeigen"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:884
 msgid "show filenames relative to top directory"
 msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:886
 msgid "show only filenames instead of matching lines"
 msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:888
 msgid "synonym for --files-with-matches"
 msgstr "Synonym für --files-with-matches"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:891
 msgid "show only the names of files without match"
 msgstr "nur die Dateinamen ohne Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:893
 msgid "print NUL after filenames"
 msgstr "NUL-Zeichen nach Dateinamen ausgeben"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:896
 msgid "show only matching parts of a line"
 msgstr "nur übereinstimmende Teile der Zeile anzeigen"
 
-#: builtin/grep.c:876
+#: builtin/grep.c:898
 msgid "show the number of matches instead of matching lines"
 msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:899
 msgid "highlight matches"
 msgstr "Ãœbereinstimmungen hervorheben"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:901
 msgid "print empty line between matches from different files"
 msgstr ""
 "eine Leerzeile zwischen Ãœbereinstimmungen in verschiedenen Dateien ausgeben"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:903
 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:884
+#: builtin/grep.c:906
 msgid "show <n> context lines before and after matches"
 msgstr "<n> Zeilen vor und nach den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:909
 msgid "show <n> context lines before matches"
 msgstr "<n> Zeilen vor den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:911
 msgid "show <n> context lines after matches"
 msgstr "<n> Zeilen nach den Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:913
 msgid "use <n> worker threads"
 msgstr "<n> Threads benutzen"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:914
 msgid "shortcut for -C NUM"
 msgstr "Kurzform für -C NUM"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:917
 msgid "show a line with the function name before matches"
 msgstr "eine Zeile mit dem Funktionsnamen vor Ãœbereinstimmungen anzeigen"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:919
 msgid "show the surrounding function"
 msgstr "die umgebende Funktion anzeigen"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:922
 msgid "read patterns from file"
 msgstr "Muster von einer Datei lesen"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:924
 msgid "match <pattern>"
 msgstr "<Muster> finden"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:926
 msgid "combine patterns specified with -e"
 msgstr "Muster kombinieren, die mit -e angegeben wurden"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:938
 msgid "indicate hit with exit status without output"
 msgstr "Ãœbereinstimmungen nur durch Beendigungsstatus anzeigen"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:940
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "nur Ãœbereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
 
-#: builtin/grep.c:920
-msgid "show parse tree for grep expression"
-msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
-
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "pager"
 msgstr "Anzeigeprogramm"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "show matching files in the pager"
 msgstr "Dateien mit Ãœbereinstimmungen im Anzeigeprogramm anzeigen"
 
-#: builtin/grep.c:928
+#: builtin/grep.c:947
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
 
-#: builtin/grep.c:992
+#: builtin/grep.c:1013
 msgid "no pattern given"
 msgstr "Kein Muster angegeben."
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1049
 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:1036
+#: builtin/grep.c:1057
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "Konnte Commit nicht auflösen: %s"
 
-#: builtin/grep.c:1067
+#: builtin/grep.c:1087
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked zusammen mit --recurse-submodules wird nicht unterstützt"
+
+#: builtin/grep.c:1091
 msgid "invalid option combination, ignoring --threads"
 msgstr "Ungültige Kombination von Optionen, --threads wird ignoriert."
 
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
 msgid "no threads support, ignoring --threads"
 msgstr "Keine Unterstützung für Threads, --threads wird ignoriert."
 
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "ungültige Anzahl von Threads angegeben (%d)"
 
-#: builtin/grep.c:1096
+#: builtin/grep.c:1131
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
-"Die Option --open-files-in-pager kann nur innerhalb des "
-"Arbeitsverzeichnisses verwendet werden."
-
-#: builtin/grep.c:1119
-msgid "option not supported with --recurse-submodules"
-msgstr "Die Option wird mit --recurse-submodules nicht unterstützt."
+"--open-files-in-pager kann nur innerhalb des Arbeitsverzeichnisses verwendet "
+"werden"
 
-#: builtin/grep.c:1125
+#: builtin/grep.c:1157
 msgid "--cached or --untracked cannot be used with --no-index"
-msgstr "--cached und --untracked können nicht mit --no-index verwendet werden."
+msgstr "--cached und --untracked können nicht mit --no-index verwendet werden"
 
-#: builtin/grep.c:1131
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked kann nicht mit --cached verwendet werden"
+
+#: builtin/grep.c:1166
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 "--[no-]exclude-standard kann nicht mit versionierten Inhalten verwendet "
-"werden."
+"werden"
 
-#: builtin/grep.c:1139
+#: builtin/grep.c:1174
 msgid "both --cached and trees are given"
 msgstr "--cached und \"Tree\"-Objekte angegeben"
 
@@ -14107,66 +16563,66 @@ msgstr ""
 msgid "process file as it were from this path"
 msgstr "Datei verarbeiten, als ob sie von diesem Pfad wäre"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "alle vorhandenen Befehle anzeigen"
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "Anleitungen ausschließen"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr "Liste von allgemein verwendeten Anleitungen anzeigen"
 
-#: builtin/help.c:49
+#: builtin/help.c:50
 msgid "print all configuration variable names"
 msgstr "alle Namen der Konfigurationsvariablen ausgeben"
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr "Handbuch anzeigen"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr "Handbuch in einem Webbrowser anzeigen"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "Info-Seite anzeigen"
 
-#: builtin/help.c:56
+#: builtin/help.c:57
 msgid "print command description"
 msgstr "Beschreibung des Befehls ausgeben"
 
-#: builtin/help.c:61
+#: 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:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "nicht erkanntes Hilfeformat: %s"
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "Konnte emacsclient nicht starten."
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "Konnte Version des emacsclient nicht parsen."
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "Fehler beim Ausführen von '%s'"
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -14175,7 +16631,7 @@ msgstr ""
 "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
 
-#: builtin/help.c:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -14184,397 +16640,425 @@ msgstr ""
 "'%s': Programm für unterstützten Handbuchbetrachter.\n"
 "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': unbekannter Handbuch-Betrachter."
 
-#: builtin/help.c:367
+#: builtin/help.c:452
 msgid "no man viewer handled the request"
 msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:375
+#: builtin/help.c:459
 msgid "no info viewer handled the request"
 msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
 
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "Für '%s' wurde der Alias '%s' angelegt."
 
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:531 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "Ungültiger alias.%s String: %s"
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:561 builtin/help.c:591
 #, c-format
 msgid "usage: %s%s"
 msgstr "Verwendung: %s%s"
 
-#: builtin/help.c:491
+#: builtin/help.c:575
 msgid "'git help config' for more information"
 msgstr "'git help config' für weitere Informationen"
 
-#: builtin/index-pack.c:185
+#: builtin/index-pack.c:222
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "Objekt-Typen passen bei %s nicht zusammen"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:242
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "konnte erwartetes Objekt %s nicht empfangen"
 
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:245
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
 
-#: builtin/index-pack.c:258
+#: builtin/index-pack.c:295
 #, 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:268
+#: builtin/index-pack.c:305
 msgid "early EOF"
 msgstr "zu frühes Dateiende"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:306
 msgid "read error on input"
 msgstr "Fehler beim Lesen der Eingabe"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:318
 msgid "used more bytes than were available"
 msgstr "verwendete mehr Bytes als verfügbar waren"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:325 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:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "Paket überschreitet die maximal erlaubte Größe"
 
-#: builtin/index-pack.c:312
+#: 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:326
+#: builtin/index-pack.c:363
 msgid "pack signature mismatch"
 msgstr "Paketsignatur stimmt nicht überein"
 
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:365
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "Paketversion %<PRIu32> nicht unterstützt"
 
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:381
 #, 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:466
+#: builtin/index-pack.c:487
 #, c-format
 msgid "inflate returned %d"
 msgstr "Dekomprimierung gab %d zurück"
 
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:536
 msgid "offset value overflow for delta base object"
 msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
 
-#: builtin/index-pack.c:523
+#: builtin/index-pack.c:544
 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:531
+#: builtin/index-pack.c:552
 #, c-format
 msgid "unknown object type %d"
 msgstr "Unbekannter Objekt-Typ %d"
 
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:583
 msgid "cannot pread pack file"
 msgstr "Kann Paketdatei %s nicht lesen"
 
-#: builtin/index-pack.c:564
+#: 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] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Byte"
 msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %<PRIuMAX> Bytes"
 
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:611
 msgid "serious inflate inconsistency"
 msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: 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 "SHA1 KOLLISION MIT %s GEFUNDEN !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: 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 "kann %s nicht lesen"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:831
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "Kann existierendes Objekt %s nicht lesen."
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:845
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ungültiges Blob-Objekt %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
 msgid "fsck error in packed object"
 msgstr "fsck Fehler in gepacktem Objekt"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:869
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
 msgid "failed to apply delta"
 msgstr "Konnte Dateiunterschied nicht anwenden"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Receiving objects"
 msgstr "Empfange Objekte"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Indexing objects"
 msgstr "Indiziere Objekte"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1194
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1199
 msgid "cannot fstat packfile"
 msgstr "kann Paketdatei nicht lesen"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1202
 msgid "pack has junk at the end"
 msgstr "Paketende enthält nicht verwendbaren Inhalt"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1214
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1237
 msgid "Resolving deltas"
 msgstr "Löse Unterschiede auf"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kann Thread nicht erzeugen: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1281
 msgid "confusion beyond insanity"
 msgstr "Fehler beim Auflösen der Unterschiede"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1287
 #, 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:1264
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
-msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
+msgstr "unerwartete Prüfsumme für %s (Festplattenfehler?)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1303
 #, 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:1292
+#: builtin/index-pack.c:1327
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokales Objekt %s ist beschädigt"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1444
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "Name der Paketdatei '%s' endet nicht mit '.%s'"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1468
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "Kann %s Datei '%s' nicht schreiben."
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1476
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "Kann eben geschriebene %s Datei '%s' nicht schließen."
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1502
 msgid "error while closing pack file"
 msgstr "Fehler beim Schließen der Paketdatei"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1516
 msgid "cannot store pack file"
 msgstr "Kann Paketdatei nicht speichern"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1524
 msgid "cannot store index file"
 msgstr "Kann Indexdatei nicht speichern"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1649
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1651
 #, 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:1643
+#: builtin/index-pack.c:1699
 #, 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:1650
+#: builtin/index-pack.c:1706
 #, 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:1689
+#: builtin/index-pack.c:1748
 msgid "Cannot come back to cwd"
 msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: 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 "%s ist ungültig"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1831 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:1850
 msgid "--fix-thin cannot be used without --stdin"
-msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
+msgstr "--fix-thin kann nicht ohne --stdin verwendet werden"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1852
 msgid "--stdin requires a git repository"
 msgstr "--stdin erfordert ein Git-Repository"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format kann nicht mit --stdin verwendet werden"
+
+#: builtin/index-pack.c:1869
 msgid "--verify with no packfile name given"
-msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
+msgstr "--verify wurde ohne Namen der Paketdatei angegeben"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "fsck Fehler beim Packen von Objekten"
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "kann Vorlage '%s' nicht lesen"
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "kann Verzeichnis '%s' nicht öffnen"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "kann Verweis '%s' nicht lesen"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "kann symbolische Verknüpfung '%s' auf '%s' nicht erstellen"
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "kann '%s' nicht nach '%s' kopieren"
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "ignoriere Vorlage %s"
 
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "Keine Vorlagen in %s gefunden."
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "kopiere keine Vorlagen von '%s': %s"
 
-#: builtin/init-db.c:334
+#: builtin/init-db.c:263
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "ungültiger initialer Branchname: '%s'"
+
+#: 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:337
+#: 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:354 builtin/init-db.c:357
+#: 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:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s existiert bereits"
 
-#: builtin/init-db.c:413
+#: 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: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:414
+#: 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:418
+#: 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:419
+#: 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:468
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -14582,25 +17066,41 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<Vorlagenverzeichnis>] [--"
 "shared[=<Berechtigungen>]] [<Verzeichnis>]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "Berechtigungen"
 
-#: builtin/init-db.c:492
+#: 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:529 builtin/init-db.c:534
+#: builtin/init-db.c:551
+msgid "override the name of the initial branch"
+msgstr "den Namen des initialen Branches überschreiben"
+
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "Hash"
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir und --bare schließen sich gegenseitig aus"
+
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "kann Verzeichnis %s nicht erstellen"
 
-#: builtin/init-db.c:538
+#: 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:559
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -14609,11 +17109,15 @@ msgstr ""
 "%s (oder --work-tree=<Verzeichnis>) nicht erlaubt ohne Spezifizierung von %s "
 "(oder --git-dir=<Verzeichnis>)"
 
-#: builtin/init-db.c:587
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Kann nicht auf Arbeitsverzeichnis '%s' zugreifen."
 
+#: builtin/init-db.c:684
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir nicht kompatibel mit Bare-Repository"
+
 #: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -14662,139 +17166,143 @@ msgstr "Optionen für das Parsen setzen"
 msgid "do not treat --- specially"
 msgstr "--- nicht speziell behandeln"
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "Anhang"
-
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "Anhang/Anhänge hinzufügen"
 
 #: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
-msgstr ""
-"Die Optionen --trailer und --only-input können nicht gemeinsam verwendet "
-"werden."
+msgstr "--trailer und --only-input können nicht gemeinsam verwendet werden"
 
 #: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "keine Datei zur direkten Bearbeitung angegeben"
 
-#: builtin/log.c:55
+#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [<Optionen>] <Objekt>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "Ungültige Option für --decorate: %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:180
 msgid "show source"
 msgstr "Quelle anzeigen"
 
-#: builtin/log.c:174
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
 msgstr "\"mailmap\"-Datei verwenden"
 
-#: builtin/log.c:176
+#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen"
 
-#: builtin/log.c:178
+#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen"
 
-#: builtin/log.c:179
+#: builtin/log.c:187
 msgid "decorate options"
 msgstr "decorate-Optionen"
 
-#: builtin/log.c:182
-msgid "Process line range n,m in file, counting from 1"
-msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"Entwicklung der Zeilen vom Bereich <Start>,<Ende> oder Funktion :"
+"<Funktionsname> in <Datei> verfolgen"
+
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<Bereich>:<Datei> kann nicht mit Pfadspezifikation verwendet werden"
 
-#: builtin/log.c:280
+#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "letzte Ausgabe: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ungültige Datei"
 
-#: builtin/log.c:549 builtin/log.c:644
+#: builtin/log.c:586 builtin/log.c:676
 #, c-format
 msgid "could not read object %s"
 msgstr "Konnte Objekt %s nicht lesen."
 
-#: builtin/log.c:669
+#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr "Unbekannter Typ: %d"
 
-#: builtin/log.c:792
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr ""
+"%s: Ungültiger Modus für Erstellung des Deckblattes aus der Beschreibung"
+
+#: builtin/log.c:853
 msgid "format.headers without value"
 msgstr "format.headers ohne Wert"
 
-#: builtin/log.c:909
-msgid "name of output directory is too long"
-msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-
-#: builtin/log.c:925
+#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "Kann Patch-Datei %s nicht öffnen"
 
-#: builtin/log.c:942
+#: builtin/log.c:999
 msgid "need exactly one range"
 msgstr "Brauche genau einen Commit-Bereich."
 
-#: builtin/log.c:952
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr "Kein Commit-Bereich."
 
-#: builtin/log.c:1075
+#: builtin/log.c:1173
 msgid "cover letter needs email format"
 msgstr "Anschreiben benötigt E-Mail-Format"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
 msgstr "Fehler beim Erstellen der Datei für das Anschreiben."
 
-#: builtin/log.c:1160
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ungültiges in-reply-to: %s"
 
-#: builtin/log.c:1187
+#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
 
-#: builtin/log.c:1245
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "Zwei Ausgabeverzeichnisse?"
 
-#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
 #, c-format
 msgid "unknown commit %s"
 msgstr "Unbekannter Commit %s"
 
-#: builtin/log.c:1366 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 "Konnte '%s' nicht als gültige Referenz auflösen."
 
-#: builtin/log.c:1371
+#: builtin/log.c:1522
 msgid "could not find exact merge base"
 msgstr "Konnte keine exakte Merge-Basis finden."
 
-#: builtin/log.c:1375
+#: 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"
@@ -14805,272 +17313,295 @@ 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:1395
+#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr "Fehler beim Finden einer exakten Merge-Basis."
 
-#: builtin/log.c:1406
+#: builtin/log.c:1572
 msgid "base commit should be the ancestor of revision list"
 msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
 
-#: builtin/log.c:1410
+#: builtin/log.c:1582
 msgid "base commit shouldn't be in revision list"
 msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
 
-#: builtin/log.c:1463
+#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr "kann Patch-Id nicht lesen"
 
-#: builtin/log.c:1515
-msgid "failed to infer range-diff ranges"
-msgstr "Fehler beim Ableiten des range-diff-Bereichs."
+#: builtin/log.c:1703
+msgid "failed to infer range-diff origin of current series"
+msgstr "Fehler beim Ableiten des range-diff Ursprungs der aktuellen Serie"
 
-#: builtin/log.c:1560
+#: builtin/log.c:1705
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "nutze '%s' als range-diff Ursprung der aktuellen Serie"
+
+#: builtin/log.c:1749
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
 
-#: builtin/log.c:1563
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr "[PATCH] auch mit mehreren Patches verwenden"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "Ausgabe der Patches in Standard-Ausgabe"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr "ein Deckblatt erzeugen"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1760
 msgid "use simple number sequence for output file names"
 msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "Dateiendung"
 
-#: builtin/log.c:1573
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
-msgstr "<Dateiendung> anstatt '.patch' verwenden"
+msgstr "<Dateiendung> statt '.patch' verwenden"
 
-#: builtin/log.c:1575
+#: builtin/log.c:1764
 msgid "start numbering patches at <n> instead of 1"
-msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
+msgstr "die Nummerierung der Patches bei <n> statt bei 1 beginnen"
 
-#: builtin/log.c:1577
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "Reroll-Anzahl"
+
+#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr "die Serie als n-te Fassung kennzeichnen"
 
-#: builtin/log.c:1579
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
+#: builtin/log.c:1768
+msgid "max length of output filename"
+msgstr "maximale Länge des Dateinamens für die Ausgabe"
 
-#: builtin/log.c:1582
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "[<Präfix>] anstatt [PATCH] verwenden"
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "[RFC PATCH] statt [PATCH] verwenden"
+
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr "Modus für Erstellung des Deckblattes aus der Beschreibung"
+
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"Erzeuge Teile des Deckblattes basierend auf der Beschreibung des Branches"
+
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "nutze [<Präfix>] statt [PATCH]"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "erzeugte Dateien in <Verzeichnis> speichern"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr "[PATCH] nicht entfernen/hinzufügen"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1785
 msgid "don't output binary diffs"
 msgstr "keine binären Unterschiede ausgeben"
 
-#: builtin/log.c:1593
+#: builtin/log.c:1787
 msgid "output all-zero hash in From header"
 msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
 
-#: builtin/log.c:1595
+#: builtin/log.c:1789
 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:1597
+#: builtin/log.c:1791
 msgid "show patch format instead of default (patch + stat)"
 msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1793
 msgid "Messaging"
 msgstr "E-Mail-Einstellungen"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1794
 msgid "header"
 msgstr "Header"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "E-Mail-Header hinzufügen"
 
-#: builtin/log.c:1602 builtin/log.c:1604
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "E-Mail"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "\"To:\"-Header hinzufügen"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "\"Cc:\"-Header hinzufügen"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "Ident"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1799
 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:1609
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1610
+#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
 
-#: builtin/log.c:1611 builtin/log.c:1614
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "Grenze"
 
-#: builtin/log.c:1612
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "den Patch anhängen"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "den Patch direkt in die Nachricht einfügen"
 
-#: builtin/log.c:1619
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "Signatur"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "eine Signatur hinzufügen"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "Basis-Commit"
 
-#: builtin/log.c:1624
+#: builtin/log.c:1816
 msgid "add prerequisite tree info to the patch series"
 msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "eine Signatur aus einer Datei hinzufügen"
 
-#: builtin/log.c:1627
+#: builtin/log.c:1820
 msgid "don't print the patch filenames"
 msgstr "keine Dateinamen der Patches anzeigen"
 
-#: builtin/log.c:1629
+#: builtin/log.c:1822
 msgid "show progress while generating patches"
 msgstr "Forschrittsanzeige während der Erzeugung der Patches"
 
-#: builtin/log.c:1631
+#: builtin/log.c:1824
 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:1634
+#: builtin/log.c:1827
 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:1636
+#: builtin/log.c:1829 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
 
-#: builtin/log.c:1711
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "Ungültige Identifikationszeile: %s"
 
-#: builtin/log.c:1726
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
-msgstr "-n und -k schließen sich gegenseitig aus."
+msgstr "-n und -k schließen sich gegenseitig aus"
 
-#: builtin/log.c:1728
+#: builtin/log.c:1933
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
-msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
+msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
-msgstr "Die Option --name-only kann nicht verwendet werden."
+msgstr "--name-only kann nicht verwendet werden"
 
-#: builtin/log.c:1738
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
-msgstr "Die Option --name-status kann nicht verwendet werden."
+msgstr "--name-status kann nicht verwendet werden"
 
-#: builtin/log.c:1740
+#: builtin/log.c:1945
 msgid "--check does not make sense"
-msgstr "Die Option --check kann nicht verwendet werden."
+msgstr "--check kann nicht verwendet werden"
 
-#: builtin/log.c:1773
-msgid "standard output, or directory, which one?"
-msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr ""
+"--stdout, --output und --output-directory schließen sich gegenseitig aus"
 
-#: builtin/log.c:1877
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
-msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch."
+msgstr "--interdiff erfordert --cover-letter oder einzelnen Patch"
 
-#: builtin/log.c:1881
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:1882
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff gegen v%d:"
 
-#: builtin/log.c:1888
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor erfordert --range-diff"
 
-#: builtin/log.c:1892
+#: builtin/log.c:2104
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff erfordert --cover-letter oder einzelnen Patch."
 
-#: builtin/log.c:1900
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr "Range-Diff:"
 
-#: builtin/log.c:1901
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-Diff gegen v%d:"
 
-#: builtin/log.c:1912
+#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "Konnte Signatur-Datei '%s' nicht lesen"
 
-#: builtin/log.c:1948
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "Erzeuge Patches"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2204
 msgid "failed to create output files"
 msgstr "Fehler beim Erstellen der Ausgabedateien."
 
-#: builtin/log.c:2051
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15078,115 +17609,119 @@ msgstr ""
 "Konnte gefolgten Remote-Branch nicht finden, bitte geben Sie <Upstream> "
 "manuell an.\n"
 
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<Optionen>] [<Datei>...]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:619
 msgid "identify the file status with tags"
 msgstr "den Dateistatus mit Tags anzeigen"
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:621
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 "Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:623
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "Kleinbuchstaben für 'fsmonitor clean' Dateien verwenden"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:625
 msgid "show cached files in the output (default)"
 msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:627
 msgid "show deleted files in the output"
 msgstr "entfernte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:629
 msgid "show modified files in the output"
 msgstr "geänderte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:631
 msgid "show other files in the output"
 msgstr "sonstige Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:633
 msgid "show ignored files in the output"
 msgstr "ignorierte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:636
 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:545
+#: builtin/ls-files.c:638
 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:547
+#: builtin/ls-files.c:640
 msgid "show 'other' directories' names only"
 msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:642
 msgid "show line endings of files"
 msgstr "Zeilenenden von Dateien anzeigen"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:644
 msgid "don't show empty directories"
 msgstr "keine leeren Verzeichnisse anzeigen"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:647
 msgid "show unmerged files in the output"
 msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr "'resolve-undo' Informationen anzeigen"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:651
 msgid "skip files matching pattern"
 msgstr "Dateien auslassen, die einem Muster entsprechen"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:654
 msgid "exclude patterns are read from <file>"
 msgstr "Muster, gelesen von <Datei>, ausschließen"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:657
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
 
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
 msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:663
 msgid "make the output relative to the project top directory"
 msgstr "Ausgabe relativ zum Projektverzeichnis"
 
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
 msgstr "Rekursion in Submodulen durchführen"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:668
 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:576
+#: builtin/ls-files.c:669
 msgid "tree-ish"
 msgstr "Commit-Referenz"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:670
 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:579
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr "Ausgaben zur Fehlersuche anzeigen"
 
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+msgstr "doppelte Einträge unterdrücken"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -15197,41 +17732,41 @@ msgstr ""
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<Repository> [<Referenzen>...]]"
 
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "URL des Remote-Repositories nicht ausgeben"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
 msgid "exec"
 msgstr "Programm"
 
-#: 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 "Pfad zu \"git-upload-pack\" auf der Gegenseite"
 
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "auf Tags einschränken"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "auf Branches einschränken"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "keine Tags anzeigen, die andere Tags enthalten"
 
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "url.<Basis>.insteadOf berücksichtigen"
 
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr ""
 "mit Exit-Code 2 beenden, wenn keine übereinstimmenden Referenzen\n"
 "gefunden wurden"
 
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "zusätzlich zum Objekt die darauf verweisenden Referenzen anzeigen"
 
@@ -15273,199 +17808,351 @@ msgstr ""
 "das gesamte Verzeichnis auflisten; nicht nur das aktuelle Verzeichnis "
 "(impliziert --full-name)"
 
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<Optionen>] <Nachricht> <Patch> < mail >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "Betreff beibehalten"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr "behalte Klammern im Betreff, die nicht zum Patch gehören"
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr "Message-ID an das Ende der Commit-Beschreibung kopieren"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "Neukodierung der Metadaten nach 'i18n.commitEncoding'"
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr "Zeichen-Neukodierung der Metadaten deaktivieren"
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr "Encoding"
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr "Neukodierung der Metadaten zu diesem Encoding"
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr "nutze Scherenmarkierungen"
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr "<Aktion>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "Aktion, wenn ein angeführtes CR gefunden wird"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "nutze Header im Inhalt der Nachricht"
+
 #: builtin/mailsplit.c:241
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "Leere mbox: '%s'"
 
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<Optionen>] [<Commit>...]"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <Commit> <Commit>..."
 
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <Commit>..."
 
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <Commit>..."
 
-#: builtin/merge.c:118
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <Commit> <Commit>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <Referenz> [<Commit>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "Vorgänger-Commits für einen einzelnen n-Wege-Merge finden"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "Commits auflisten, die nicht durch Andere erreichbar sind"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "ist der Erste ein Vorgänger-Commit des Anderen?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> "
+"<orig-Datei> <Datei2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "Ergebnisse zur Standard-Ausgabe senden"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "einen diff3 basierten Merge verwenden"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "bei Konflikten unsere Variante verwenden"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "bei Konflikten ihre Variante verwenden"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "bei Konflikten eine gemeinsame Variante verwenden"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "bei Konflikten diese Kennzeichnungslänge verwenden"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "keine Warnung bei Konflikten"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "unbekannte Option: %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "Konnte Objekt '%s' nicht parsen."
+
+#: 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] "kann nicht mit mehr als %d Merge-Basis umgehen. Ignoriere %s."
+msgstr[1] "kann nicht mit mehr als %d Merge-Basen umgehen. Ignoriere %s."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "Es wird nur der Merge von zwei Branches behandelt."
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "Konnte Referenz '%s' nicht auflösen"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Führe %s mit %s zusammen\n"
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<Optionen>] [<Commit>...]"
+
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
 msgstr "Schalter 'm' erfordert einen Wert."
 
-#: builtin/merge.c:141
+#: builtin/merge.c:146
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "Option `%s' erfordert einen Wert."
 
-#: builtin/merge.c:187
+#: builtin/merge.c:199
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr "Verfügbare Strategien sind:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:205
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Verfügbare benutzerdefinierte Strategien sind:"
 
-#: builtin/merge.c:244 builtin/pull.c:152
+#: builtin/merge.c:256 builtin/pull.c:133
 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:247 builtin/pull.c:155
+#: builtin/merge.c:259 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
 
-#: builtin/merge.c:248 builtin/pull.c:158
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(Synonym für --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:262 builtin/pull.c:142
 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:253 builtin/pull.c:167
+#: builtin/merge.c:265 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
-msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
+msgstr "einen einzelnen Commit erzeugen statt einen Merge durchzuführen"
 
-#: builtin/merge.c:255 builtin/pull.c:170
+#: builtin/merge.c:267 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
 
-#: builtin/merge.c:257 builtin/pull.c:173
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "Bearbeitung der Beschreibung vor dem Commit"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
 msgstr "Vorspulen erlauben (Standard)"
 
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:273 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "abbrechen, wenn kein Vorspulen möglich ist"
 
-#: builtin/merge.c:265 builtin/pull.c:183
+#: builtin/merge.c:277 builtin/pull.c:164
 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:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:493 builtin/rebase.c:1501 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 "Strategie"
 
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "zu verwendende Merge-Strategie"
 
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr "Option=Wert"
 
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "Option für ausgewählte Merge-Strategie"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:283
 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:278
+#: builtin/merge.c:290
 msgid "abort the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge abbrechen"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:292
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort, aber Index und Arbeitsverzeichnis unverändert lassen"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:294
 msgid "continue the current in-progress merge"
 msgstr "den sich im Gange befindlichen Merge fortsetzen"
 
-#: builtin/merge.c:284 builtin/pull.c:199
+#: builtin/merge.c:296 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
 
-#: builtin/merge.c:290
+#: builtin/merge.c:303
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "Hooks pre-merge-commit und commit-msg umgehen"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:320
 msgid "could not run stash."
 msgstr "Konnte \"stash\" nicht ausführen."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:325
 msgid "stash failed"
 msgstr "\"stash\" fehlgeschlagen"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:330
 #, c-format
 msgid "not a valid object: %s"
 msgstr "kein gültiges Objekt: %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr "read-tree fehlgeschlagen"
 
-#: builtin/merge.c:386
-msgid " (nothing to squash)"
-msgstr " (nichts zu quetschen)"
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
+msgstr "Bereits auf dem neuesten Stand. (nichts für Squash-Merge vorhanden)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
-msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
+msgstr "Squash Commit -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:464
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' zeigt auf keinen Commit"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Ungültiger branch.%s.mergeoptions String: %s"
 
-#: builtin/merge.c:705
+#: builtin/merge.c:729
 msgid "Not handling anything other than two heads merge."
 msgstr "Es wird nur der Merge von zwei Branches behandelt."
 
-#: builtin/merge.c:719
+#: builtin/merge.c:742
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Unbekannte Option für merge-recursive: -X%s"
 
-#: builtin/merge.c:734
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "konnte %s nicht schreiben"
 
-#: builtin/merge.c:786
+#: builtin/merge.c:813
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "konnte nicht von '%s' lesen"
 
-#: builtin/merge.c:795
+#: builtin/merge.c:822
 #, 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:801
+#: 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"
@@ -15476,11 +18163,11 @@ msgstr ""
 "Upstream-Branch mit einem Thema-Branch zusammenführt.\n"
 "\n"
 
-#: builtin/merge.c:806
+#: builtin/merge.c:833
 msgid "An empty message aborts the commit.\n"
 msgstr "Eine leere Commit-Beschreibung bricht den Commit ab.\n"
 
-#: builtin/merge.c:809
+#: builtin/merge.c:836
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -15489,75 +18176,75 @@ msgstr ""
 "Zeilen, die mit '%c' beginnen, werden ignoriert,\n"
 "und eine leere Beschreibung bricht den Commit ab.\n"
 
-#: builtin/merge.c:862
+#: builtin/merge.c:889
 msgid "Empty commit message."
 msgstr "Leere Commit-Beschreibung"
 
-#: builtin/merge.c:877
+#: builtin/merge.c:904
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Wunderbar.\n"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:965
 #, 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:977
+#: builtin/merge.c:1004
 msgid "No current branch."
 msgstr "Sie befinden sich auf keinem Branch."
 
-#: builtin/merge.c:979
+#: builtin/merge.c:1006
 msgid "No remote for the current branch."
 msgstr "Kein Remote-Repository für den aktuellen Branch."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:1008
 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:986
+#: builtin/merge.c:1013
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Kein Remote-Tracking-Branch für %s von %s"
 
-#: builtin/merge.c:1043
+#: builtin/merge.c:1070
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1173
 #, 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:1180
+#: builtin/merge.c:1207
 msgid "not something we can merge"
 msgstr "nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1283
+#: builtin/merge.c:1317
 msgid "--abort expects no arguments"
 msgstr "--abort akzeptiert keine Argumente"
 
-#: builtin/merge.c:1287
+#: builtin/merge.c:1321
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
 
-#: builtin/merge.c:1296
+#: builtin/merge.c:1339
 msgid "--quit expects no arguments"
 msgstr "--quit erwartet keine Argumente"
 
-#: builtin/merge.c:1309
+#: builtin/merge.c:1352
 msgid "--continue expects no arguments"
 msgstr "--continue erwartet keine Argumente"
 
-#: builtin/merge.c:1313
+#: builtin/merge.c:1356
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
 
-#: builtin/merge.c:1329
+#: builtin/merge.c:1372
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15565,7 +18252,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:1336
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15573,215 +18260,137 @@ 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:1339
+#: builtin/merge.c:1382
 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:1353
+#: builtin/merge.c:1396
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Sie können --squash nicht mit --no-ff kombinieren."
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1398
 msgid "You cannot combine --squash with --commit."
 msgstr "Sie können --squash nicht mit --commit kombinieren."
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1414
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
 
-#: builtin/merge.c:1388
+#: builtin/merge.c:1431
 msgid "Squash commit into empty head not supported yet"
-msgstr ""
-"Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen."
+msgstr "Squash-Merge auf einen leeren Branch wird noch nicht unterstützt"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1433
 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:1395
+#: builtin/merge.c:1438
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nichts was wir zusammenführen können"
 
-#: builtin/merge.c:1397
+#: builtin/merge.c:1440
 msgid "Can merge only exactly one commit into empty head"
-msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen."
+msgstr "Kann nur exakt einen Commit in einem leeren Branch zusammenführen"
 
-#: builtin/merge.c:1476
+#: builtin/merge.c:1521
 msgid "refusing to merge unrelated histories"
-msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
-
-#: builtin/merge.c:1485
-msgid "Already up to date."
-msgstr "Bereits aktuell."
+msgstr "verweigere den Merge von nicht zusammenhängenden Historien"
 
-#: builtin/merge.c:1495
+#: builtin/merge.c:1540
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aktualisiere %s..%s\n"
 
-#: builtin/merge.c:1537
+#: builtin/merge.c:1587
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
 
-#: builtin/merge.c:1544
+#: builtin/merge.c:1594
 #, c-format
 msgid "Nope.\n"
 msgstr "Nein.\n"
 
-#: builtin/merge.c:1569
-msgid "Already up to date. Yeeah!"
-msgstr "Bereits aktuell."
-
-#: builtin/merge.c:1575
+#: builtin/merge.c:1625
 msgid "Not possible to fast-forward, aborting."
 msgstr "Vorspulen nicht möglich, breche ab."
 
-#: builtin/merge.c:1598 builtin/merge.c:1663
+#: builtin/merge.c:1653 builtin/merge.c:1719
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
 
-#: builtin/merge.c:1602
+#: builtin/merge.c:1657
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Probiere Merge-Strategie %s ...\n"
 
-#: builtin/merge.c:1654
+#: builtin/merge.c:1709
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
 
-#: builtin/merge.c:1656
+#: builtin/merge.c:1711
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
 
-#: builtin/merge.c:1665
+#: builtin/merge.c:1721
 #, 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:1677
+#: builtin/merge.c:1735
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Automatischer Merge abgeschlossen; halte, wie gewünscht, vor dem Commit an\n"
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <Commit> <Commit>..."
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <Commit>..."
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <Commit>..."
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <Commit> <Commit>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <Referenz> [<Commit>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "Vorgänger-Commits für einen einzelnen n-Wege-Merge finden"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "Commits auflisten, die nicht durch Andere erreichbar sind"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "ist der Erste ein Vorgänger-Commit des Anderen?"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-"git merge-file [<Optionen>] [-L <Name1> [-L <orig> [-L <Name2>]]] <Datei1> "
-"<orig-Datei> <Datei2>"
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr "Ergebnisse zur Standard-Ausgabe senden"
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "einen diff3 basierten Merge verwenden"
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
 
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "bei Konflikten unsere Variante verwenden"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "bei Konflikten ihre Variante verwenden"
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr "bei Konflikten eine gemeinsame Variante verwenden"
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr "bei Konflikten diese Kennzeichnungslänge verwenden"
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "keine Warnung bei Konflikten"
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "Warnung: Tag-Eingabe ungültig für fsck: %s"
 
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "Beschriftung für Datei1/orig-Datei/Datei2 setzen"
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "Fehler: Tag-Eingabe ungültig für fsck: %s"
 
-#: builtin/merge-recursive.c:47
+#: builtin/mktag.c:41
 #, c-format
-msgid "unknown option %s"
-msgstr "unbekannte Option: %s"
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) sollte diesen Aufruf niemals auslösen"
 
-#: builtin/merge-recursive.c:53
+#: builtin/mktag.c:56
 #, c-format
-msgid "could not parse object '%s'"
-msgstr "Konnte Objekt '%s' nicht parsen."
+msgid "could not read tagged object '%s'"
+msgstr "konnte getaggtes Objekt '%s' nicht lesen"
 
-#: builtin/merge-recursive.c:57
+#: builtin/mktag.c:59
 #, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "kann nicht mit mehr als %d Merge-Basis umgehen. Ignoriere %s."
-msgstr[1] "kann nicht mit mehr als %d Merge-Basen umgehen. Ignoriere %s."
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "Objekt '%s' als '%s' getaggt, aber ist ein '%s' Typ"
 
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr "Es wird nur der Merge von zwei Branches behandelt."
+#: builtin/mktag.c:97
+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/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "Konnte Referenz '%s' nicht auflösen"
+#: builtin/mktag.c:100
+msgid "tag on stdin did not refer to a valid object"
+msgstr "Tag von der Standard-Eingabe verweiste nicht auf gültiges Objekt"
 
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "Führe %s mit %s zusammen\n"
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "konnte Tag-Datei nicht schreiben"
 
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
@@ -15799,20 +18408,37 @@ msgstr "fehlende Objekte erlauben"
 msgid "allow creation of more than one tree"
 msgstr "die Erstellung von mehr als einem \"Tree\"-Objekt erlauben"
 
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
-msgstr ""
-"git multi-pack-index [--object-dir=<Verzeichnis>] (write|verify|expire|"
-"repack --batch-size=<Größe>)"
+#: 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>]"
+
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<Optionen>] verify"
+
+#: builtin/multi-pack-index.c:16
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<Optionen>] expire"
+
+#: builtin/multi-pack-index.c:19
+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:23
+#: builtin/multi-pack-index.c:54
 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:25
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr "bevorzugtes Paket"
+
+#: builtin/multi-pack-index.c:70
+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
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15820,15 +18446,7 @@ 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:43 builtin/prune-packed.c:67
-msgid "too many arguments"
-msgstr "Zu viele Argumente."
-
-#: builtin/multi-pack-index.c:52
-msgid "--batch-size option is only for 'repack' subcommand"
-msgstr "Option --batch-size ist nur für den Unterbefehl 'repack'"
-
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:179
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "Nicht erkannter Unterbefehl: %s"
@@ -15862,113 +18480,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:169
+#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "Ziel '%s' ist kein Verzeichnis"
 
-#: builtin/mv.c:180
+#: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
 
-#: builtin/mv.c:184
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr "ungültige Quelle"
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 msgid "can not move directory into itself"
 msgstr "kann Verzeichnis nicht in sich selbst verschieben"
 
-#: builtin/mv.c:190
+#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr "kann Verzeichnis nicht über Datei verschieben"
 
-#: builtin/mv.c:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr "Quellverzeichnis ist leer"
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 msgid "not under version control"
 msgstr "nicht unter Versionskontrolle"
 
 #: builtin/mv.c:227
+msgid "conflicted"
+msgstr "in Konflikt"
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "Ziel existiert bereits"
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "überschreibe '%s'"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "Kann nicht überschreiben"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr "mehrere Quellen für dasselbe Ziel"
 
-#: builtin/mv.c:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "Zielverzeichnis existiert nicht"
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, Quelle=%s, Ziel=%s"
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Benenne %s nach %s um\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "Umbenennung von '%s' fehlgeschlagen"
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<Optionen>] <Commit>..."
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<Optionen>] --all"
 
-#: builtin/name-rev.c:358
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<Optionen>] --stdin"
 
-#: builtin/name-rev.c:415
-msgid "print only names (no SHA-1)"
-msgstr "nur Namen anzeigen (keine SHA-1)"
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr "nur Referenzen-basierte Namen ausgeben (keine Objektnamen)"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "nur Tags verwenden, um die Commits zu benennen"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "nur Referenzen verwenden, die <Muster> entsprechen"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignoriere Referenzen die <Muster> entsprechen"
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "alle Commits auflisten, die von allen Referenzen erreichbar sind"
 
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "von der Standard-Eingabe lesen"
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "Ausgabe von `undefinierten` Namen erlauben (Standard)"
 
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "Tags in der Eingabe dereferenzieren (interne Verwendung)"
 
@@ -16116,7 +18738,7 @@ msgstr "Konnte Notiz-Objekt nicht schreiben"
 msgid "the note contents have been left in %s"
 msgstr "Die Notiz-Inhalte wurden in %s belassen."
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:576
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "konnte '%s' nicht öffnen oder lesen"
@@ -16161,8 +18783,9 @@ 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
-msgid "too many parameters"
-msgstr "zu viele Parameter"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
+msgstr "Zu viele Argumente."
 
 #: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
@@ -16223,8 +18846,8 @@ msgstr ""
 "stdin)"
 
 #: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "zu wenig Parameter"
+msgid "too few arguments"
+msgstr "zu wenige Argumente"
 
 #: builtin/notes.c:538
 #, c-format
@@ -16356,7 +18979,7 @@ msgstr ""
 "commit',\n"
 "oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
 
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:589
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
@@ -16374,7 +18997,7 @@ msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler"
 msgid "read object names from the standard input"
 msgstr "Objektnamen von der Standard-Eingabe lesen"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "nicht löschen, nur anzeigen"
 
@@ -16390,420 +19013,462 @@ msgstr "Notiz-Referenz"
 msgid "use notes from <notes-ref>"
 msgstr "Notizen von <Notiz-Referenz> verwenden"
 
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1735
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "Unbekannter Unterbefehl: %s"
 
-#: builtin/pack-objects.c:52
+#: 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:53
+#: 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:428
+#: 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: konnte %s nicht finden, erwartet bei Offset %<PRIuMAX> "
+"in Paket %s"
+
+#: 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:439
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "Fehlerhaftes gepacktes Objekt für %s."
 
-#: builtin/pack-objects.c:570
+#: 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:781
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u Objekte geordnet, %<PRIu32> erwartet."
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "Packdatei ist ungültig: %s"
-
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:1036
 #, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "Konnte Packdatei nicht zur Wiederverwendung öffnen: %s"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "Konnte \"seek\" nicht in wiederverwendeter Packdatei ausführen."
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "Konnte nicht von wiederverwendeter Packdatei lesen."
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "Objekt beim Offset %<PRIuMAX> in Paket %s erwartet"
 
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:1155
 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:854
+#: builtin/pack-objects.c:1168
 msgid "Writing objects"
 msgstr "Schreibe Objekte"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "Konnte '%s' nicht lesen"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1281
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "Schrieb %<PRIu32> Objekte während %<PRIu32> erwartet waren."
 
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1523
 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:1592
+#: builtin/pack-objects.c:1971
 #, 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:1601
+#: builtin/pack-objects.c:1980
 #, 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:1870
+#: builtin/pack-objects.c:2261
 msgid "Counting objects"
 msgstr "Zähle Objekte"
 
-#: builtin/pack-objects.c:2000
-#, c-format
-msgid "unable to get size of %s"
-msgstr "Konnte Größe von %s nicht bestimmen."
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c:2426
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "Konnte Kopfbereich von Objekt '%s' nicht parsen."
 
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
 #, c-format
 msgid "object %s cannot be read"
 msgstr "Objekt %s kann nicht gelesen werden."
 
-#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
 #, 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:2125
+#: builtin/pack-objects.c:2536
 msgid "suboptimal pack - out of memory"
 msgstr "ungünstiges Packet - Speicher voll"
 
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2851
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Delta-Kompression verwendet bis zu %d Threads."
 
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2990
 #, 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:2659
+#: builtin/pack-objects.c:3076
 msgid "Compressing objects"
 msgstr "Komprimiere Objekte"
 
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:3082
 msgid "inconsistency with delta count"
 msgstr "Inkonsistenz mit der Anzahl von Deltas"
 
-#: builtin/pack-objects.c:2742
+#: 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 ""
+"Wert für uploadpack.blobpackfileuri muss in der Form '<Objekt-Hash> <Pack-"
+"Hash> <URI>' vorliegen ('%s' erhalten)"
+
+#: builtin/pack-objects.c:3164
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"Objekt bereits in einem anderen uploadpack.blobpackfileuri konfiguriert "
+"('%s' erhalten)"
+
+#: builtin/pack-objects.c:3199
+#, 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:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "Konnte Paket '%s' nicht finden"
+
+#: builtin/pack-objects.c:3378
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
-"Erwartete Randobjekt-ID, erhielt nutzlose Daten:\n"
+"erwartete Randobjekt-ID, erhielt nutzlose Daten:\n"
 " %s"
 
-#: builtin/pack-objects.c:2748
+#: builtin/pack-objects.c:3384
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
-"Erwartete Objekt-ID, erhielt nutzlose Daten:\n"
+"erwartete Objekt-ID, erhielt nutzlose Daten:\n"
 " %s"
 
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:3482
 msgid "invalid value for --missing"
-msgstr "Ungültiger Wert für --missing."
+msgstr "ungültiger Wert für --missing"
 
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
 msgid "cannot open pack index"
-msgstr "Kann Paketindex nicht öffnen."
+msgstr "kann Paketindex nicht öffnen"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3572
 #, c-format
 msgid "loose object at %s could not be examined"
-msgstr "Loses Objekt bei %s konnte nicht untersucht werden."
+msgstr "loses Objekt bei %s konnte nicht untersucht werden"
 
-#: builtin/pack-objects.c:3021
+#: builtin/pack-objects.c:3658
 msgid "unable to force loose object"
-msgstr "Konnte loses Objekt nicht erzwingen."
+msgstr "konnte loses Objekt nicht erzwingen"
 
-#: builtin/pack-objects.c:3113
+#: builtin/pack-objects.c:3788
 #, c-format
 msgid "not a rev '%s'"
-msgstr "'%s' ist kein Commit."
+msgstr "'%s' ist kein Commit"
 
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
-msgstr "Ungültiger Commit '%s'."
+msgstr "ungültiger Commit '%s'"
 
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3819
 msgid "unable to add recent objects"
-msgstr "Konnte jüngste Objekte nicht hinzufügen."
+msgstr "konnte neuere Objekte nicht hinzufügen"
 
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3872
 #, c-format
 msgid "unsupported index version %s"
-msgstr "Nicht unterstützte Index-Version %s"
+msgstr "nicht unterstützte Index-Version %s"
 
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3876
 #, c-format
 msgid "bad index version '%s'"
-msgstr "Ungültige Index-Version '%s'"
+msgstr "ungültige Index-Version '%s'"
 
-#: builtin/pack-objects.c:3228
-msgid "do not show progress meter"
-msgstr "keine Fortschrittsanzeige anzeigen"
-
-#: builtin/pack-objects.c:3230
-msgid "show progress meter"
-msgstr "Fortschrittsanzeige anzeigen"
-
-#: builtin/pack-objects.c:3232
-msgid "show progress meter during object writing phase"
-msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
-
-#: builtin/pack-objects.c:3235
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3915
 msgid "<version>[,<offset>]"
 msgstr "<Version>[,<Offset>]"
 
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3916
 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:3240
+#: builtin/pack-objects.c:3919
 msgid "maximum size of each output pack file"
 msgstr "maximale Größe für jede ausgegebene Paketdatei"
 
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3921
 msgid "ignore borrowed objects from alternate object store"
 msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
 
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3923
 msgid "ignore packed objects"
 msgstr "gepackte Objekte ignorieren"
 
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3925
 msgid "limit pack window by objects"
 msgstr "Paketfenster durch Objekte begrenzen"
 
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3927
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
 
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3929
 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:3252
+#: builtin/pack-objects.c:3931
 msgid "reuse existing deltas"
 msgstr "existierende Unterschiede wiederverwenden"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3933
 msgid "reuse existing objects"
 msgstr "existierende Objekte wiederverwenden"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3935
 msgid "use OFS_DELTA objects"
 msgstr "OFS_DELTA Objekte verwenden"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3937
 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:3260
+#: builtin/pack-objects.c:3939
 msgid "do not create an empty pack output"
 msgstr "keine leeren Pakete erzeugen"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3941
 msgid "read revision arguments from standard input"
 msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3943
 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:3267
+#: builtin/pack-objects.c:3946
 msgid "include objects reachable from any reference"
 msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3949
 msgid "include objects referred by reflog entries"
 msgstr ""
 "Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
 
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3952
 msgid "include objects referred to by the index"
 msgstr "Objekte einschließen, die vom Index referenziert werden"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr "Pakete von der Standard-Eingabe lesen"
+
+#: builtin/pack-objects.c:3957
 msgid "output pack to stdout"
 msgstr "Paket in die Standard-Ausgabe schreiben"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3959
 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:3280
+#: builtin/pack-objects.c:3961
 msgid "keep unreachable objects"
 msgstr "nicht erreichbare Objekte behalten"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3963
 msgid "pack loose unreachable objects"
 msgstr "nicht erreichbare lose Objekte packen"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3965
 msgid "unpack unreachable objects newer than <time>"
 msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3968
 msgid "use the sparse reachability algorithm"
 msgstr "den \"sparse\" Algorithmus zur Bestimmung der Erreichbarkeit benutzen"
 
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3970
 msgid "create thin packs"
 msgstr "dünnere Pakete erzeugen"
 
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3972
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 "Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3974
 msgid "ignore packs that have companion .keep file"
 msgstr "Pakete ignorieren, die .keep Dateien haben"
 
-#: builtin/pack-objects.c:3295
+#: builtin/pack-objects.c:3976
 msgid "ignore this pack"
 msgstr "dieses Paket ignorieren"
 
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3978
 msgid "pack compression level"
 msgstr "Komprimierungsgrad für Paketierung"
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3980
 msgid "do not hide commits by grafts"
 msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3982
 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:3303
+#: builtin/pack-objects.c:3984
 msgid "write a bitmap index together with the pack index"
 msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3988
 msgid "write a bitmap index if possible"
 msgstr "Bitmap-Index schreiben, wenn möglich"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3992
 msgid "handling for missing objects"
 msgstr "Behandlung für fehlende Objekte"
 
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3995
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 "keine Objekte aus Packdateien von partiell geklonten Remote-Repositories "
 "packen"
 
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3997
 msgid "respect islands during delta compression"
 msgstr "Delta-Islands bei Delta-Kompression beachten"
 
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr "Protokoll"
+
+#: builtin/pack-objects.c:4000
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"jegliche konfigurierte uploadpack.blobpackfileuri für dieses Protkoll "
+"ausschließen"
+
+#: builtin/pack-objects.c:4033
 #, 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:3350
+#: builtin/pack-objects.c:4038
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit ist zu hoch, erzwinge %d"
 
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:4094
 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:3406
+#: builtin/pack-objects.c:4096
 msgid "minimum pack size limit is 1 MiB"
 msgstr "Minimales Limit für die Paketgröße ist 1 MiB."
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:4101
 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:3414
+#: builtin/pack-objects.c:4104
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable und --unpack-unreachable sind inkompatibel"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:4110
 msgid "cannot use --filter without --stdout"
 msgstr "Kann --filter nicht ohne --stdout benutzen."
 
-#: builtin/pack-objects.c:3481
+#: builtin/pack-objects.c:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr "kann --filter nicht mit --stdin-packs benutzen"
+
+#: builtin/pack-objects.c:4116
+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:4175
 msgid "Enumerating objects"
 msgstr "Objekte aufzählen"
 
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:4212
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
 msgstr ""
 "Gesamt %<PRIu32> (Delta %<PRIu32>), Wiederverwendet %<PRIu32> (Delta "
-"%<PRIu32>)"
+"%<PRIu32>), Pack wiederverwendet %<PRIu32>"
+
+#: 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 ""
+"'git pack-redundant' ist für die Entfernung vorgesehen.\n"
+"Wenn Sie diesen Befehl weiterhin verwenden, fügen Sie\n"
+"bitte eine zusätzliche Option '--i-still-use-this' in\n"
+"der Befehlszeile hinzu und lassen Sie uns wissen, dass\n"
+"Sie es immer noch verwenden, indem Sie eine E-Mail an\n"
+"<git@vger.kernel.org> senden. Danke.\n"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16817,83 +19482,79 @@ msgstr "alles packen"
 msgid "prune loose refs (default)"
 msgstr "lose Referenzen entfernen (Standard)"
 
-#: builtin/prune-packed.c:9
+#: 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-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "Lösche doppelte Objekte"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "gelöschte Objekte melden"
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "Objekte älter als <Zeit> verfallen lassen"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:138
 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:150
+#: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
 msgstr "kann \"prune\" in precious-objects Repository nicht ausführen"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Ungültiger Wert für %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
 
-#: builtin/pull.c:142
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "rekursive Anforderungen von Submodulen kontrollieren"
 
-#: builtin/pull.c:146
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Optionen bezogen auf Merge"
 
-#: builtin/pull.c:149
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "Integration von Änderungen durch Rebase statt Merge"
 
-#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "Vorspulen erlauben"
 
-#: builtin/pull.c:186
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase"
+#: builtin/pull.c:167 parse-options.h:340
+msgid "automatically stash/stash pop before and after"
+msgstr "automatischer Stash/Stash-Pop davor und danach"
 
-#: builtin/pull.c:202
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Optionen bezogen auf Fetch"
 
-#: builtin/pull.c:212
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "das Ãœberschreiben von lokalen Branches erzwingen"
 
-#: builtin/pull.c:220
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
 
-#: builtin/pull.c:320
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Ungültiger Wert für pull.ff: %s"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16901,14 +19562,14 @@ msgstr ""
 "Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
 "angefordert wurden."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:447
 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:440
+#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16916,7 +19577,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:443
+#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16928,39 +19589,38 @@ msgstr ""
 "Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
 "der Befehlszeile angeben."
 
-#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1248
 msgid "You are not currently on a branch."
 msgstr "Im Moment auf keinem Branch."
 
-#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
 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:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
 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:453 builtin/pull.c:468
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
 msgstr "Siehe git-pull(1) für weitere Details."
 
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1353 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr "<Remote-Repository>"
 
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "<Branch>"
 
-#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1246
 msgid "There is no tracking information for the current branch."
 msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
 
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: builtin/pull.c:480
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
@@ -16968,7 +19628,7 @@ msgstr ""
 "Sie\n"
 "dies tun mit:"
 
-#: builtin/pull.c:477
+#: builtin/pull.c:485
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16978,34 +19638,60 @@ msgstr ""
 "des Remote-Repositories durchzuführen, aber diese Referenz\n"
 "wurde nicht angefordert."
 
-#: builtin/pull.c:587
+#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr "Konnte nicht auf Commit '%s' zugreifen."
 
-#: builtin/pull.c:867
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "Ignoriere --verify-signatures für Rebase"
 
-#: builtin/pull.c:922
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash ist nur mit --rebase zulässig."
-
 #: 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 ""
+"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"
+"\n"
+"  git config pull.rebase false  # Merge (Standard-Strategie)\n"
+"  git config pull.rebase true   # Rebase\n"
+"  git config pull.ff only       # ausschließlich Vorspulen\n"
+"\n"
+"Sie können statt \"git config\" auch \"git config --global\" nutzen, um\n"
+"einen Standard für alle Repositories festzulegen. Sie können auch die\n"
+"Option --rebase, --no-rebase oder --ff-only auf der Kommandozeile nutzen,\n"
+"um das konfigurierte Standardverhalten pro Aufruf zu überschreiben.\n"
+
+#: builtin/pull.c:990
 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:934
+#: builtin/pull.c:994
 msgid "pull with rebase"
 msgstr "Pull mit Rebase"
 
-#: builtin/pull.c:935
+#: builtin/pull.c:995
 msgid "please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:1020
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -17015,7 +19701,7 @@ msgstr ""
 "\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
 "Spule Ihr Arbeitsverzeichnis von Commit %s vor."
 
-#: builtin/pull.c:966
+#: builtin/pull.c:1026
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -17032,15 +19718,15 @@ msgstr ""
 "$ git reset --hard\n"
 "zur Wiederherstellung aus."
 
-#: builtin/pull.c:981
+#: builtin/pull.c:1041
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
 
-#: builtin/pull.c:985
+#: builtin/pull.c:1045
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
 
-#: builtin/pull.c:992
+#: builtin/pull.c:1065
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
@@ -17054,11 +19740,11 @@ msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]"
 msgid "tag shorthand without <tag>"
 msgstr "Kurzschrift für Tag ohne <Tag>"
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
-msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel."
+msgstr "--delete akzeptiert nur reine Referenznamen als Ziel"
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -17067,7 +19753,7 @@ msgstr ""
 "Um eine Variante permanent zu verwenden, siehe push.default in 'git help "
 "config'."
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -17093,7 +19779,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -17108,7 +19794,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<Name-des-Remote-Branches>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -17122,13 +19808,20 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: 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:210
+#: 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"
@@ -17139,14 +19832,7 @@ msgstr ""
 "Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
 "Remote-Branch zu aktualisieren."
 
-#: builtin/push.c:269
-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:276
+#: 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"
@@ -17160,7 +19846,7 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: builtin/push.c:282
+#: 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"
@@ -17174,7 +19860,7 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: builtin/push.c:288
+#: 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"
@@ -17193,13 +19879,13 @@ msgstr ""
 "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
 "für weitere Details."
 
-#: builtin/push.c:295
+#: 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:298
+#: 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"
@@ -17209,99 +19895,115 @@ msgstr ""
 "das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
 "die Option '--force' zu verwenden.\n"
 
-#: builtin/push.c:359
+#: 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 ""
+"Aktualisierungen wurden zurückgewiesen, weil die Spitze des Remote-\n"
+"Tracking-Branches seit dem letzen Checkout aktualisiert wurde. Sie möchten\n"
+"diese Änderungen vielleicht lokal integrieren (z. B. 'git pull ...') bevor\n"
+"Sie die Änderungen erzwingen.\n"
+
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
-msgstr "Versende nach %s\n"
+msgstr "Push nach %s\n"
 
-#: builtin/push.c:366
+#: 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:541
+#: builtin/push.c:544
 msgid "repository"
 msgstr "Repository"
 
-#: builtin/push.c:542 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "alle Referenzen versenden"
 
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "alle Referenzen spiegeln"
 
-#: builtin/push.c:545
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "Referenzen löschen"
 
-#: builtin/push.c:546
+#: 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:549 builtin/send-pack.c:167
+#: builtin/push.c:552 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "Aktualisierung erzwingen"
 
-#: builtin/push.c:551 builtin/send-pack.c:181
+#: builtin/push.c:553 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
 msgstr "<Referenzname>:<Erwartungswert>"
 
-#: builtin/push.c:552 builtin/send-pack.c:182
+#: builtin/push.c:554 builtin/send-pack.c:205
 msgid "require old value of ref to be at this value"
 msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
 
-#: builtin/push.c:555
+#: builtin/push.c:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "Aktualisierungen des Remote müssen lokal integriert werden"
+
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "rekursiven \"push\" von Submodulen steuern"
 
-#: builtin/push.c:557 builtin/send-pack.c:175
+#: builtin/push.c:561 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "kleinere Pakete verwenden"
 
-#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr "'receive pack' Programm"
 
-#: builtin/push.c:560
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "Upstream für \"git pull/status\" setzen"
 
-#: builtin/push.c:563
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "lokal gelöschte Referenzen entfernen"
 
-#: builtin/push.c:565
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "\"pre-push hook\" umgehen"
 
-#: builtin/push.c:566
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "fehlende, aber relevante Tags versenden"
 
-#: builtin/push.c:569 builtin/send-pack.c:169
+#: builtin/push.c:572 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "signiert \"push\" mit GPG"
 
-#: builtin/push.c:571 builtin/send-pack.c:176
+#: builtin/push.c:574 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
 msgstr "Referenzen atomar versenden"
 
-#: builtin/push.c:589
+#: builtin/push.c:592
 msgid "--delete is incompatible with --all, --mirror and --tags"
-msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags."
+msgstr "--delete ist inkompatibel mit --all, --mirror und --tags"
 
-#: builtin/push.c:591
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
-msgstr "Die Option --delete kann nur mit Referenzen verwendet werden."
+msgstr "--delete kann nur mit Referenzen verwendet werden"
 
-#: builtin/push.c:611
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "ungültiges Repository '%s'"
 
-#: builtin/push.c:612
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -17323,62 +20025,74 @@ msgstr ""
 "\n"
 "    git push <Name>\n"
 
-#: builtin/push.c:627
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
-msgstr "Die Optionen --all und --tags sind inkompatibel."
+msgstr "--all und --tags sind inkompatibel"
 
-#: builtin/push.c:629
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
-msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden."
+msgstr "--all kann nicht mit Refspecs kombiniert werden"
 
-#: builtin/push.c:633
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
-msgstr "Die Optionen --mirror und --tags sind inkompatibel."
+msgstr "--mirror und --tags sind inkompatibel"
 
-#: builtin/push.c:635
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
-msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden."
+msgstr "--mirror kann nicht mit Refspecs kombiniert werden"
 
-#: builtin/push.c:638
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
-msgstr "Die Optionen --all und --mirror sind inkompatibel."
+msgstr "--all und --mirror sind inkompatibel"
 
-#: builtin/push.c:642
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
 
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 "git range-diff [<Optionen>] <alte-Basis>..<alte-Spitze> <neue-Basis>..<neue-"
 "Spitze>"
 
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<Optionen>] <alte-Spitze>...<neue-Spitze>"
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<Optionen>] <Basis> <alte-Spitze> <neue-Spitze>"
 
-#: builtin/range-diff.c:21
-msgid "Percentage by which creation is weighted"
-msgstr "Prozentsatz mit welchem Erzeugung gewichtet wird"
-
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "einfache Diff-Farben benutzen"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "Notizen"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "an 'git log' übergeben"
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "nur Ausgaben anzeigen, die sich auf den ersten Bereich beziehen"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "nur Ausgaben anzeigen, die sich auf den zweiten Bereich beziehen"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
-msgid "no .. in range: '%s'"
-msgstr "Kein .. im Bereich: '%s'"
+msgid "not a commit range: '%s'"
+msgstr "kein Commit-Bereich: '%s'"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "Format mit einfachem Argument muss symmetrischer Bereich sein."
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "Benötige zwei Commit-Bereiche."
 
@@ -17461,7 +20175,11 @@ msgstr "unpack-trees protokollieren"
 msgid "suppress feedback messages"
 msgstr "Rückmeldungen unterdrücken"
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Sie müssen zuerst die Konflikte in Ihrem aktuellen Index auflösen."
+
+#: builtin/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -17469,228 +20187,205 @@ msgstr ""
 "git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis> | --"
 "keep-base] [<Upstream> [<Branch>]]"
 
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [<Optionen>] [--exec <Programm>] [--onto <neue-Basis>] --"
 "root [<Branch>]"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: 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:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "Konnte '%s' nicht schreiben."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "Kein HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:311
 #, c-format
 msgid "could not create temporary %s"
 msgstr "Konnte temporäres Verzeichnis '%s' nicht erstellen."
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:317
 msgid "could not mark as interactive"
 msgstr "Markierung auf interaktiven Rebase fehlgeschlagen."
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:370
 msgid "could not generate todo list"
 msgstr "Konnte TODO-Liste nicht erzeugen."
 
-#: builtin/rebase.c:383
+#: builtin/rebase.c:412
 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:438
+#: builtin/rebase.c:481
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<Optionen>]"
 
-#: builtin/rebase.c:450
-msgid "keep empty commits"
-msgstr "leere Commits behalten"
+#: builtin/rebase.c:494 builtin/rebase.c:1389
+msgid "keep commits which start empty"
+msgstr "behalte Commits, die leer beginnen"
 
-#: builtin/rebase.c:452 builtin/revert.c:128
+#: builtin/rebase.c:498 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "Commits mit leerer Beschreibung erlauben"
 
-#: builtin/rebase.c:453
+#: builtin/rebase.c:500
 msgid "rebase merge commits"
 msgstr "Rebase auf Merge-Commits ausführen"
 
-#: builtin/rebase.c:455
+#: builtin/rebase.c:502
 msgid "keep original branch points of cousins"
 msgstr "originale Branch-Punkte der Cousins behalten"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:504
 msgid "move commits that begin with squash!/fixup!"
 msgstr "Commits verschieben, die mit squash!/fixup! beginnen"
 
-#: builtin/rebase.c:458
+#: builtin/rebase.c:505
 msgid "sign commits"
 msgstr "Commits signieren"
 
-#: builtin/rebase.c:460 builtin/rebase.c:1427
+#: 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:462
+#: builtin/rebase.c:509
 msgid "continue rebase"
 msgstr "Rebase fortsetzen"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:511
 msgid "skip commit"
 msgstr "Commit auslassen"
 
-#: builtin/rebase.c:465
+#: builtin/rebase.c:512
 msgid "edit the todo list"
 msgstr "die TODO-Liste bearbeiten"
 
-#: builtin/rebase.c:467
+#: builtin/rebase.c:514
 msgid "show the current patch"
 msgstr "den aktuellen Patch anzeigen"
 
-#: builtin/rebase.c:470
+#: builtin/rebase.c:517
 msgid "shorten commit ids in the todo list"
 msgstr "Commit-IDs in der TODO-Liste verkürzen"
 
-#: builtin/rebase.c:472
+#: builtin/rebase.c:519
 msgid "expand commit ids in the todo list"
 msgstr "Commit-IDs in der TODO-Liste erweitern"
 
-#: builtin/rebase.c:474
+#: builtin/rebase.c:521
 msgid "check the todo list"
 msgstr "die TODO-Liste prüfen"
 
-#: builtin/rebase.c:476
+#: builtin/rebase.c:523
 msgid "rearrange fixup/squash lines"
 msgstr "fixup/squash-Zeilen umordnen"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:525
 msgid "insert exec commands in todo list"
 msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
 
-#: builtin/rebase.c:479
+#: builtin/rebase.c:526
 msgid "onto"
 msgstr "auf"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict-revision"
 msgstr "Begrenzungscommit"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict revision"
 msgstr "Begrenzungscommit"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:531
 msgid "squash-onto"
 msgstr "squash-onto"
 
-#: builtin/rebase.c:485
+#: builtin/rebase.c:532
 msgid "squash onto"
 msgstr "squash onto"
 
-#: builtin/rebase.c:487
+#: builtin/rebase.c:534
 msgid "the upstream commit"
 msgstr "der Upstream-Commit"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head-name"
 msgstr "head-Name"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head name"
 msgstr "head-Name"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:541
 msgid "rebase strategy"
 msgstr "Rebase-Strategie"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:542
 msgid "strategy-opts"
 msgstr "Strategie-Optionen"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:543
 msgid "strategy options"
 msgstr "Strategie-Optionen"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:544
 msgid "switch-to"
 msgstr "wechseln zu"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
 msgid "the branch or commit to checkout"
 msgstr "der Branch oder Commit zum Auschecken"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto-name"
 msgstr "onto-Name"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto name"
 msgstr "onto-Name"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "cmd"
 msgstr "Befehl"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "the command to run"
 msgstr "auszuführender Befehl"
 
-#: builtin/rebase.c:503 builtin/rebase.c:1510
+#: 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:519
+#: 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:535
+#: builtin/rebase.c:582
 #, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s erfordert ein interaktives Rebase"
+msgid "%s requires the merge backend"
+msgstr "%s erfordert das Merge-Backend"
 
-#: builtin/rebase.c:587
+#: builtin/rebase.c:625
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "Konnte 'onto' nicht bestimmen: '%s'"
 
-#: builtin/rebase.c:602
+#: builtin/rebase.c:642
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "Ungültiges orig-head: '%s'"
 
-#: builtin/rebase.c:627
+#: builtin/rebase.c:667
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "Ignoriere ungültiges allow_rerere_autoupdate: '%s'"
 
-#: builtin/rebase.c:703
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Konnte '%s' nicht lesen."
-
-#: builtin/rebase.c:721
-#, c-format
-msgid "Cannot store %s"
-msgstr "Kann %s nicht speichern."
-
-#: builtin/rebase.c:828
-msgid "could not determine HEAD revision"
-msgstr "Konnte HEAD-Commit nicht bestimmen."
-
-#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
+#: 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"
@@ -17706,7 +20401,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:1032
+#: builtin/rebase.c:896
 #, c-format
 msgid ""
 "\n"
@@ -17726,7 +20421,16 @@ msgstr ""
 "Infolge dessen kann Git auf diesen Revisionen Rebase nicht\n"
 "ausführen."
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1222
+#, 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 "
+"\"ask\"."
+
+#: builtin/rebase.c:1240
 #, c-format
 msgid ""
 "%s\n"
@@ -17744,7 +20448,7 @@ msgstr ""
 "    git rebase '<Branch>'\n"
 "\n"
 
-#: builtin/rebase.c:1355
+#: builtin/rebase.c:1256
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17758,177 +20462,188 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<Branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1286
 msgid "exec commands cannot contain newlines"
 msgstr "\"exec\"-Befehle können keine neuen Zeilen enthalten"
 
-#: builtin/rebase.c:1389
+#: builtin/rebase.c:1290
 msgid "empty exec command"
 msgstr "Leerer \"exec\"-Befehl."
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1319
 msgid "rebase onto given branch instead of upstream"
 msgstr "Rebase auf angegebenen Branch anstelle des Upstream-Branches ausführen"
 
-#: builtin/rebase.c:1420
+#: builtin/rebase.c:1321
 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:1422
+#: builtin/rebase.c:1323
 msgid "allow pre-rebase hook to run"
 msgstr "Ausführung des pre-rebase-Hooks erlauben"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1325
 msgid "be quiet. implies --no-stat"
 msgstr "weniger Ausgaben (impliziert --no-stat)"
 
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1331
 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 "Zusammenfassung der Unterschiede gegenüber dem Upstream-Branch verbergen"
 
-#: builtin/rebase.c:1433
-msgid "add a Signed-off-by: line to each commit"
-msgstr "eine \"Signed-off-by:\"-Zeile zu jedem Commit hinzufügen"
+#: builtin/rebase.c:1334
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "eine Signed-off-by Zeile zu jedem Commit hinzufügen"
 
-#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
-msgid "passed to 'git am'"
-msgstr "an 'git am' übergeben"
+#: builtin/rebase.c:1337
+msgid "make committer date match author date"
+msgstr "Datum des Commit-Erstellers soll mit Datum des Autors übereinstimmen"
 
-#: builtin/rebase.c:1443 builtin/rebase.c:1445
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr "ignoriere Autor-Datum und nutze aktuelles Datum"
+
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr "Synonym für --reset-author-date"
+
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
 msgid "passed to 'git apply'"
 msgstr "an 'git apply' übergeben"
 
-#: builtin/rebase.c:1447 builtin/rebase.c:1450
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr "Whitespace-Änderungen ignorieren"
+
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
 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:1452
+#: builtin/rebase.c:1354
 msgid "continue"
 msgstr "fortsetzen"
 
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1357
 msgid "skip current patch and continue"
 msgstr "den aktuellen Patch auslassen und fortfahren"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1359
 msgid "abort and check out the original branch"
 msgstr "abbrechen und den ursprünglichen Branch auschecken"
 
-#: builtin/rebase.c:1460
+#: builtin/rebase.c:1362
 msgid "abort but keep HEAD where it is"
 msgstr "abbrechen, aber HEAD an aktueller Stelle belassen"
 
-#: builtin/rebase.c:1461
+#: builtin/rebase.c:1363
 msgid "edit the todo list during an interactive rebase"
 msgstr "TODO-Liste während eines interaktiven Rebase bearbeiten"
 
-#: builtin/rebase.c:1464
+#: builtin/rebase.c:1366
 msgid "show the patch file being applied or merged"
 msgstr "den Patch, der gerade angewendet oder zusammengeführt wird, anzeigen"
 
-#: builtin/rebase.c:1467
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "Strategien von 'git am' bei Rebase verwenden"
+
+#: builtin/rebase.c:1373
 msgid "use merging strategies to rebase"
 msgstr "Merge-Strategien beim Rebase verwenden"
 
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1377
 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:1475
+#: builtin/rebase.c:1381
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
-msgstr ""
-"(VERALTET) Versuche, Merges wiederherzustellen anstatt sie zu ignorieren"
+msgstr "(VERALTET) Versuche, Merges wiederherzustellen statt sie zu ignorieren"
 
-#: builtin/rebase.c:1479
-msgid "preserve empty commits during rebase"
-msgstr "leere Commits während des Rebase erhalten"
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
+msgstr "wie sollen Commits behandelt werden, die leer werden"
 
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1393
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "bei -i Commits verschieben, die mit squash!/fixup! beginnen"
 
-#: builtin/rebase.c:1487
-msgid "automatically stash/stash pop before and after"
-msgstr "automatischer Stash/Stash-Pop davor und danach"
-
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1400
 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:1493
+#: builtin/rebase.c:1404
 msgid "allow rebasing commits with empty messages"
 msgstr "Rebase von Commits mit leerer Beschreibung erlauben"
 
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1408
 msgid "try to rebase merges instead of skipping them"
-msgstr ""
-"versuchen, Rebase mit Merges auszuführen, anstatt diese zu überspringen"
+msgstr "versuchen, Rebase mit Merges auszuführen, statt diese zu überspringen"
 
-#: builtin/rebase.c:1499
+#: builtin/rebase.c:1411
 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:1501
+#: builtin/rebase.c:1413
 msgid "use the given merge strategy"
 msgstr "angegebene Merge-Strategie verwenden"
 
-#: builtin/rebase.c:1503 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
 msgid "option"
 msgstr "Option"
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1416
 msgid "pass the argument through to the merge strategy"
 msgstr "Argument zur Merge-Strategie durchreichen"
 
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1419
 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:1524
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
+#: builtin/rebase.c:1424
+msgid "apply all changes, even those already present upstream"
 msgstr ""
-"Die Unterstützung für rebase.useBuiltin wurde entfernt!\n"
-"Siehe dessen Eintrag in 'git help config' für Details."
+"alle Änderungen anwenden, auch jene, die bereits im Upstream-Branch "
+"vorhanden sind"
 
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1442
 msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
+msgstr "'git am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
 
-#: builtin/rebase.c:1571
+#: 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'."
 
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1488
 msgid "cannot combine '--keep-base' with '--onto'"
 msgstr "'--keep-base' kann nicht mit '--onto' kombiniert werden"
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1490
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr "'--keep-base' kann nicht mit '--root' kombiniert werden"
 
-#: builtin/rebase.c:1582
+#: builtin/rebase.c:1494
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "'--root' kann nicht mit '--fork-point' kombiniert werden"
+
+#: builtin/rebase.c:1497
 msgid "No rebase in progress?"
 msgstr "Kein Rebase im Gange?"
 
-#: builtin/rebase.c:1586
+#: builtin/rebase.c:1501
 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:1609
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Kann HEAD nicht lesen"
 
-#: builtin/rebase.c:1621
+#: builtin/rebase.c:1536
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17936,16 +20651,16 @@ msgstr ""
 "Sie müssen alle Merge-Konflikte editieren und diese dann\n"
 "mittels \"git add\" als aufgelöst markieren"
 
-#: builtin/rebase.c:1640
+#: builtin/rebase.c:1555
 msgid "could not discard worktree changes"
 msgstr "Konnte Änderungen im Arbeitsverzeichnis nicht verwerfen."
 
-#: builtin/rebase.c:1659
+#: builtin/rebase.c:1574
 #, c-format
 msgid "could not move back to %s"
 msgstr "Konnte nicht zu %s zurückgehen."
 
-#: builtin/rebase.c:1704
+#: builtin/rebase.c:1620
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17966,170 +20681,147 @@ msgstr ""
 "und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
 "etwas Schützenswertes vorhanden ist.\n"
 
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1648
 msgid "switch `C' expects a numerical value"
 msgstr "Schalter `C' erwartet einen numerischen Wert."
 
-#: builtin/rebase.c:1766
+#: builtin/rebase.c:1690
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Unbekannter Modus: %s"
 
-#: builtin/rebase.c:1788
+#: builtin/rebase.c:1729
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy erfordert --merge oder --interactive"
 
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1759
+msgid "cannot combine apply options with merge options"
+msgstr ""
+"Optionen für \"am\" können nicht mit Optionen für \"merge\" kombiniert "
+"werden."
+
+#: builtin/rebase.c:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Unbekanntes Rebase-Backend: %s"
+
+#: builtin/rebase.c:1802
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec erfordert --exec oder --interactive"
 
-#: builtin/rebase.c:1840
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"Optionen für \"am\" können nicht mit Optionen für \"interactive\" oder "
-"\"merge\" kombiniert werden."
-
-#: builtin/rebase.c:1859
+#: 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:1863
+#: 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:1887
+#: builtin/rebase.c:1850
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "Ungültiger Upstream '%s'"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1856
 msgid "Could not create new root commit"
 msgstr "Konnte neuen Root-Commit nicht erstellen."
 
-#: builtin/rebase.c:1919
+#: builtin/rebase.c:1882
 #, 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:1922
+#: builtin/rebase.c:1885
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': benötige genau eine Merge-Basis"
 
-#: builtin/rebase.c:1930
+#: builtin/rebase.c:1893
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "'%s' zeigt auf keinen gültigen Commit."
 
-#: builtin/rebase.c:1955
+#: builtin/rebase.c:1921
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "fatal: Branch/Commit '%s' nicht gefunden"
 
-#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
 #, c-format
 msgid "No such ref: %s"
 msgstr "Referenz nicht gefunden: %s"
 
-#: builtin/rebase.c:1974
+#: builtin/rebase.c:1940
 msgid "Could not resolve HEAD to a revision"
 msgstr "Konnte HEAD zu keinem Commit auflösen."
 
-#: builtin/rebase.c:2012
-msgid "Cannot autostash"
-msgstr "Kann automatischen Stash nicht erzeugen."
-
-#: builtin/rebase.c:2015
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Unerwartete 'stash'-Antwort: '%s'"
-
-#: builtin/rebase.c:2021
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Konnte Verzeichnis für '%s' nicht erstellen."
-
-#: builtin/rebase.c:2024
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Automatischen Stash erzeugt: %s\n"
-
-#: builtin/rebase.c:2027
-msgid "could not reset --hard"
-msgstr "Konnte 'reset --hard' nicht ausführen."
-
-#: builtin/rebase.c:2036
+#: builtin/rebase.c:1961
 msgid "Please commit or stash them."
 msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
 
-#: builtin/rebase.c:2063
-#, c-format
-msgid "could not parse '%s'"
-msgstr "Konnte '%s' nicht parsen."
-
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:1997
 #, c-format
 msgid "could not switch to %s"
 msgstr "Konnte nicht zu %s wechseln."
 
-#: builtin/rebase.c:2087
+#: builtin/rebase.c:2008
 msgid "HEAD is up to date."
 msgstr "HEAD ist aktuell."
 
-#: builtin/rebase.c:2089
+#: builtin/rebase.c:2010
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Aktueller Branch %s ist auf dem neuesten Stand.\n"
 
-#: builtin/rebase.c:2097
+#: builtin/rebase.c:2018
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD ist aktuell, Rebase erzwungen."
 
-#: builtin/rebase.c:2099
+#: builtin/rebase.c:2020
 #, 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:2107
+#: builtin/rebase.c:2028
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
 
-#: builtin/rebase.c:2114
+#: builtin/rebase.c:2035
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Änderungen zu %s:\n"
 
-#: builtin/rebase.c:2117
+#: builtin/rebase.c:2038
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Änderungen von %s zu %s:\n"
 
-#: builtin/rebase.c:2142
+#: builtin/rebase.c:2063
 #, 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:2151
+#: builtin/rebase.c:2072
 msgid "Could not detach HEAD"
 msgstr "Konnte HEAD nicht loslösen."
 
-#: builtin/rebase.c:2160
+#: builtin/rebase.c:2081
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Spule %s vor zu %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <Git-Verzeichnis>"
 
-#: builtin/receive-pack.c:830
+#: 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"
@@ -18161,7 +20853,7 @@ msgstr ""
 "setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
 "'refuse'."
 
-#: builtin/receive-pack.c:850
+#: 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"
@@ -18182,11 +20874,11 @@ msgstr ""
 "\n"
 "Um diese Meldung zu unterdrücken, setzen Sie die Variable auf 'refuse'."
 
-#: builtin/receive-pack.c:1936
+#: builtin/receive-pack.c:2478
 msgid "quiet"
 msgstr "weniger Ausgaben"
 
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:2492
 msgid "You must specify a directory."
 msgstr "Sie müssen ein Repository angeben."
 
@@ -18212,49 +20904,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <Referenz>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' ist kein gültiger Zeitstempel"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:609
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Markiere nicht erreichbare Objekte..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:647
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s zeigt auf nichts!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:699
 msgid "no reflog specified to delete"
 msgstr "Kein Reflog zum Löschen angegeben."
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:708
 #, c-format
 msgid "not a reflog: %s"
 msgstr "Kein Reflog: %s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:713
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "Kein Reflog für '%s'."
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:759
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "Ungültiges Format für Referenzen: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:768
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -18262,82 +20954,82 @@ msgstr ""
 "git remote add [-t <Branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <Name> <URL>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <alt> <neu>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <Name>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <Name> (-a | --auto | -d | --delete | <Branch>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <Name>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <Name>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<Gruppe> | <Remote>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <Name> <Branch>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <Name>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <Name> <neueURL> [<alteURL>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <Name> <neueURL>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <Name> <URL>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<Optionen>] <Name> <URL>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <Name> <Branch>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <Name> <Branch>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<Optionen>] <Name>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<Optionen>] <Name>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<Optionen>] [<Gruppe> | <externesRepository>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Aktualisiere %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -18345,88 +21037,98 @@ msgstr ""
 "--mirror ist gefährlich und veraltet; bitte\n"
 "\t benutzen Sie stattdessen --mirror=fetch oder --mirror=push"
 
-#: builtin/remote.c:147
+#: 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:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "die Remote-Branches anfordern"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "alle Tags und verbundene Objekte beim Anfordern importieren"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "oder fordere gar keine Tags an (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "Branch(es) zur Ãœbernahme"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "Hauptbranch"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "Aufsetzen des Remote-Repositories als Spiegel-Repository für \"push\" und "
 "\"fetch\""
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
-"Die Option --mirror kann nicht mit der Angabe eines Hauptbranches verwendet "
-"werden."
+"--mirror kann nicht mit der Angabe eines Hauptbranches verwendet werden"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
-"Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
-"Spiegelarchiven verwendet werden."
+"die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
+"Spiegelarchiven verwendet werden"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
-msgstr "externes Repository %s existiert bereits"
-
-#: builtin/remote.c:198 builtin/remote.c:640
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
+msgstr "externes Repository %s existiert bereits."
 
-#: builtin/remote.c:238
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Konnte symbolische Referenz für Hauptbranch von '%s' nicht einrichten"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:355
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Konnte Fetch-Map für Refspec %s nicht bekommen"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr "(übereinstimmend)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:466
 msgid "(delete)"
 msgstr "(lösche)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "konnte '%s' nicht setzen"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Die %s Konfiguration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"benennt jetzt das nicht existierende Remote-Repository '%s'"
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
 #, c-format
 msgid "No such remote: '%s'"
-msgstr "Kein solches Remote-Repository: '%s'"
+msgstr "Remote-Repository nicht gefunden: '%s'"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:710
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18437,17 +21139,17 @@ msgstr ""
 "\t%s\n"
 "\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "Konnte '%s' nicht löschen"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
 msgstr "Konnte '%s' nicht erstellen"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18463,118 +21165,118 @@ msgstr[1] ""
 "entfernt;\n"
 "um diese zu entfernen, benutzen Sie:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:999
 #, 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:920
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " gefolgt"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
 #, 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:974
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "interaktiver Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1058
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "interaktiver Rebase (mit Merges) auf Remote-Branch %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "Rebase auf Remote-Branch %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr " führt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "führt mit Remote-Branch %s zusammen"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    und mit Remote-Branch %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
 msgid "create"
 msgstr "erstellt"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr "gelöscht"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "aktuell"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
 msgstr "vorspulbar"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "lokal nicht aktuell"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s erzwingt Versandt nach %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s versendet nach %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s erzwingt Versand nach %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s versendet nach %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr "keine Abfrage von Remote-Repositories"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "* Remote-Repository %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL zum Abholen: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr "(keine URL)"
 
@@ -18582,25 +21284,25 @@ msgstr "(keine URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL zum Versenden: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Hauptbranch: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr "(nicht abgefragt)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "(unbekannt)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -18608,172 +21310,162 @@ msgstr ""
 "  Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
 "sein):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Remote-Branch:%s"
 msgstr[1] "  Remote-Branches:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr " (Zustand nicht abgefragt)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
 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:1215
+#: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokale Referenzen werden von 'git push' gespiegelt"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1303
 #, 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:1242
+#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "entfernt refs/remotes/<Name>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
 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:1271
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr "Konnte %s nicht entfernen"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "keine gültige Referenz: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr "Konnte %s nicht einrichten"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s wird unreferenziert!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s wurde unreferenziert!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "entferne veraltete Branches von %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [würde veralteten Branch entfernen] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr "* [veralteten Branch entfernt] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
-msgstr "Kein solches Remote-Repository '%s'"
+msgstr "Remote-Repository '%s' nicht gefunden"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "Branch hinzufügen"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr "kein Remote-Repository angegeben"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
 msgid "query push URLs rather than fetch URLs"
 msgstr "nur URLs für Push ausgeben"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "alle URLs ausgeben"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "URLs für \"push\" manipulieren"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "URL hinzufügen"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "URLs löschen"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
-msgstr ""
-"Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
+msgstr "--add und --delete können nicht gemeinsam verwendet werden"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "ungültiges altes URL Format: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
-msgstr "Keine solche URL gefunden: %s"
+msgstr "URL nicht gefunden: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
 msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Unbekannter Unterbefehl: %s"
-
-#: builtin/repack.c:23
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr "git repack [<Optionen>]"
 
-#: builtin/repack.c:28
+#: builtin/repack.c:31
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18782,141 +21474,151 @@ msgstr ""
 "--no-write-bitmap-index oder deaktivieren Sie die pack.writebitmaps\n"
 "Konfiguration."
 
-#: builtin/repack.c:191
+#: builtin/repack.c:198
 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:230 builtin/repack.c:409
+#: builtin/repack.c:270 builtin/repack.c:630
 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:247
+#: builtin/repack.c:294
 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:285
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr "konnte Index für %s nicht öffnen"
+
+#: builtin/repack.c:368
+#, 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
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "Paket %s zu groß zum Aufrollen"
+
+#: builtin/repack.c:460
 msgid "pack everything in a single pack"
 msgstr "alles in eine einzige Pack-Datei packen"
 
-#: builtin/repack.c:287
+#: builtin/repack.c:462
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "genau wie -a, unerreichbare Objekte werden aber nicht gelöscht"
 
-#: builtin/repack.c:290
+#: builtin/repack.c:465
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "redundante Pakete entfernen und \"git-prune-packed\" ausführen"
 
-#: builtin/repack.c:292
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "--no-reuse-delta an git-pack-objects übergeben"
 
-#: builtin/repack.c:294
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "--no-reuse-object an git-pack-objects übergeben"
 
-#: builtin/repack.c:296
+#: builtin/repack.c:471
 msgid "do not run git-update-server-info"
 msgstr "git-update-server-info nicht ausführen"
 
-#: builtin/repack.c:299
+#: builtin/repack.c:474
 msgid "pass --local to git-pack-objects"
 msgstr "--local an git-pack-objects übergeben"
 
-#: builtin/repack.c:301
+#: builtin/repack.c:476
 msgid "write bitmap index"
 msgstr "Bitmap-Index schreiben"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:478
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "--delta-islands an git-pack-objects übergeben"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:479
 msgid "approxidate"
 msgstr "Datumsangabe"
 
-#: builtin/repack.c:305
+#: builtin/repack.c:480
 msgid "with -A, do not loosen objects older than this"
 msgstr "mit -A, keine Objekte älter als dieses Datum löschen"
 
-#: builtin/repack.c:307
+#: builtin/repack.c:482
 msgid "with -a, repack unreachable objects"
 msgstr "mit -a, nicht erreichbare Objekte neu packen"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:484
 msgid "size of the window used for delta compression"
 msgstr "Größe des Fensters für die Delta-Kompression"
 
-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr "Bytes"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:486
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
-"gleiches wie oben, aber die Speichergröße anstatt der\n"
-"Anzahl der Einträge limitieren"
+"gleiches wie oben, aber die Speichergröße statt der Anzahl der Einträge "
+"limitieren"
 
-#: builtin/repack.c:313
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr "die maximale Delta-Tiefe limitieren"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:490
 msgid "limits the maximum number of threads"
 msgstr "maximale Anzahl von Threads limitieren"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:492
 msgid "maximum size of each packfile"
 msgstr "maximale Größe für jede Paketdatei"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:494
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 "Objekte umpacken, die sich in mit .keep markierten Pack-Dateien befinden"
 
-#: builtin/repack.c:321
+#: builtin/repack.c:496
 msgid "do not repack this pack"
 msgstr "dieses Paket nicht neu packen"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr "eine geometrische Progression mit Faktor <N> finden"
+
+#: builtin/repack.c:508
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kann Pack-Dateien in precious-objects Repository nicht löschen"
 
-#: builtin/repack.c:335
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable und -A sind inkompatibel"
 
-#: builtin/repack.c:418
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric ist inkompatibel mit -A, -a"
+
+#: builtin/repack.c:639
 msgid "Nothing new to pack."
 msgstr "Nichts Neues zum Packen."
 
-#: builtin/repack.c:479
+#: builtin/repack.c:669
 #, 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 ""
-"WARNUNG: Einige in Verwendung befindliche Pakete wurden\n"
-"WARNUNG: umbenannt, indem 'old-' an deren Namen vorrangestellt\n"
-"WARNUNG: wurde, um diese mit der neuen Dateiversion zu ersetzen.\n"
-"WARNUNG: Diese Operation ist fehlgeschlagen. Der Versuch, die\n"
-"WARNUNG: Datei zu ihrem ursprünglichen Namen umzubenennen, schlug\n"
-"WARNUNG: ebenfalls fehl.\n"
-"WARNUNG: Bitte benennen Sie diese manuell nach %s um:\n"
+msgid "missing required file: %s"
+msgstr "benötigte Datei fehlt: %s"
 
-#: builtin/repack.c:527
+#: builtin/repack.c:671
 #, c-format
-msgid "failed to remove '%s'"
-msgstr "Fehler beim Löschen von '%s'"
+msgid "could not unlink: %s"
+msgstr "konnte nicht löschen: %s"
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
@@ -18986,203 +21688,203 @@ msgstr ""
 #: builtin/replace.c:229
 #, c-format
 msgid "unable to open %s for writing"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+msgstr "konnte '%s' nicht zum Schreiben öffnen"
 
 #: builtin/replace.c:242
 msgid "cat-file reported failure"
-msgstr "cat-file meldete Fehler."
+msgstr "cat-file meldete Fehler"
 
 #: builtin/replace.c:258
 #, c-format
 msgid "unable to open %s for reading"
-msgstr "Konnte '%s' nicht zum Lesen öffnen."
+msgstr "konnte '%s' nicht zum Lesen öffnen"
 
 #: builtin/replace.c:272
 msgid "unable to spawn mktree"
-msgstr "Konnte mktree nicht ausführen."
+msgstr "konnte mktree nicht ausführen"
 
 #: builtin/replace.c:276
 msgid "unable to read from mktree"
-msgstr "Konnte nicht von mktree lesen."
+msgstr "konnte nicht von mktree lesen"
 
 #: builtin/replace.c:285
 msgid "mktree reported failure"
-msgstr "mktree meldete Fehler."
+msgstr "mktree meldete Fehler"
 
 #: builtin/replace.c:289
 msgid "mktree did not return an object name"
-msgstr "mktree lieferte keinen Objektnamen zurück."
+msgstr "mktree lieferte keinen Objektnamen zurück"
 
 #: builtin/replace.c:298
 #, c-format
 msgid "unable to fstat %s"
-msgstr "Kann fstat auf %s nicht ausführen."
+msgstr "kann fstat auf %s nicht ausführen"
 
 #: builtin/replace.c:303
 msgid "unable to write object to database"
-msgstr "Konnte Objekt nicht in Datenbank schreiben."
+msgstr "konnte Objekt nicht in Datenbank schreiben"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
-#: builtin/replace.c:453
+#: 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'"
+msgstr "kein gültiger Objektname: '%s'"
 
 #: builtin/replace.c:326
 #, c-format
 msgid "unable to get object type for %s"
-msgstr "Konnte Objektart von %s nicht bestimmten."
+msgstr "konnte Objektart von %s nicht bestimmten"
 
 #: builtin/replace.c:342
 msgid "editing object file failed"
-msgstr "Bearbeiten von Objektdatei fehlgeschlagen."
+msgstr "bearbeiten von Objektdatei fehlgeschlagen"
 
 #: builtin/replace.c:351
 #, c-format
 msgid "new object is the same as the old one: '%s'"
-msgstr "Neues Objekt ist dasselbe wie das alte: '%s'"
+msgstr "neues Objekt ist dasselbe wie das alte: '%s'"
 
 #: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
-msgstr "Konnte nicht %s als Commit parsen."
+msgstr "konnte %s nicht als Commit parsen"
 
-#: builtin/replace.c:415
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "ungültiger Merge-Tag in Commit '%s'"
 
-#: builtin/replace.c:417
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "fehlerhafter Merge-Tag in Commit '%s'"
 
-#: builtin/replace.c:429
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
 "Der ursprüngliche Commit '%s' enthält Merge-Tag '%s', der verworfen\n"
-"wird; benutzen Sie --edit anstatt --graft"
+"wird; benutzen Sie --edit statt --graft"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
-msgstr "Der originale Commit '%s' hat eine GPG-Signatur."
+msgstr "der originale Commit '%s' hat eine GPG-Signatur"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
-msgstr "Die Signatur wird in dem Ersetzungs-Commit entfernt!"
+msgstr "die Signatur wird in dem Ersetzungs-Commit entfernt!"
 
-#: builtin/replace.c:479
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
-msgstr "Konnte Ersetzungs-Commit für '%s' nicht schreiben"
+msgstr "konnte Ersetzungs-Commit für '%s' nicht schreiben"
 
-#: builtin/replace.c:487
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
-msgstr "Künstlicher Vorgänger (\"graft\") für '%s' nicht notwendig."
+msgstr "künstlicher Vorgänger (\"graft\") für '%s' nicht notwendig"
 
-#: builtin/replace.c:491
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
-msgstr "Neuer Commit ist derselbe wie der alte: '%s'"
+msgstr "neuer Commit ist derselbe wie der alte: '%s'"
 
-#: builtin/replace.c:526
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
 msgstr ""
-"Konnte die folgenden künstlichen Vorgänger (\"grafts\") nicht konvertieren:\n"
+"konnte die folgenden künstlichen Vorgänger (\"grafts\") nicht konvertieren:\n"
 "%s"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "ersetzende Referenzen auflisten"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "ersetzende Referenzen löschen"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "existierendes Objekt bearbeiten"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "Eltern-Commits eines Commits ändern"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "existierende Datei des künstlichen Vorgängers (\"graft\") konvertieren"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "die Referenz ersetzen, wenn sie existiert"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "keine ansprechende Anzeige des Objektinhaltes für --edit"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "das angegebene Format benutzen"
 
-#: builtin/replace.c:568
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
-msgstr "--format kann nicht beim Auflisten verwendet werden."
+msgstr "--format kann nicht beim Auflisten verwendet werden"
 
-#: builtin/replace.c:576
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
-msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn."
+msgstr "-f macht nur beim Schreiben einer Ersetzung Sinn"
 
-#: builtin/replace.c:580
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
-msgstr "--raw macht nur mit --edit Sinn."
+msgstr "--raw macht nur mit --edit Sinn"
 
-#: builtin/replace.c:586
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
-msgstr "-d benötigt mindestens ein Argument."
+msgstr "-d benötigt mindestens ein Argument"
 
-#: builtin/replace.c:592
+#: builtin/replace.c:593
 msgid "bad number of arguments"
-msgstr "Ungültige Anzahl von Argumenten."
+msgstr "Ungültige Anzahl von Argumenten"
 
-#: builtin/replace.c:598
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
-msgstr "-e benötigt genau ein Argument."
+msgstr "-e benötigt genau ein Argument"
 
-#: builtin/replace.c:604
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
-msgstr "-g benötigt mindestens ein Argument."
+msgstr "-g benötigt mindestens ein Argument"
 
-#: builtin/replace.c:610
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file erwartet keine Argumente"
 
-#: builtin/replace.c:616
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
-msgstr "Mit -l kann nur ein Muster angegeben werden."
+msgstr "Mit -l kann nur ein Muster angegeben werden"
 
 #: builtin/rerere.c:13
 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."
+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."
+msgstr "konnte kein Diff für '%s' generieren"
 
 #: builtin/reset.c:32
 msgid ""
@@ -19191,120 +21893,127 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Commit>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfade>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<Commit-Referenz>] [--] <Pfadspezifikation>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfade>...]"
+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:40
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<Commit-Referenz>] [--] [<Pfadspezifikation>...]"
+
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "mixed"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "zusammenführen"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "Sie haben keinen gültigen HEAD."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
 
-#: builtin/reset.c:114
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ist jetzt bei %s"
 
-#: builtin/reset.c:193
+#: builtin/reset.c:195
 #, 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:293 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
 msgid "be quiet, only report errors"
 msgstr "weniger Ausgaben, nur Fehler melden"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "HEAD und Index umsetzen"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "nur HEAD umsetzen"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 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:326
+#: builtin/reset.c:344
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:352
 #, 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:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 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:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, 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:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
-msgstr "-N kann nur mit -mixed benutzt werden"
+msgstr "-N kann nur mit --mixed benutzt werden"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:416
 #, c-format
 msgid ""
 "\n"
@@ -19318,51 +22027,62 @@ msgstr ""
 "das zu verhindern. Setzen Sie die Konfigurationseinstellung reset.quiet\n"
 "auf \"true\", um das zum Standard zu machen.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "Konnte neue Index-Datei nicht schreiben."
 
-#: builtin/rev-list.c:411
+#: builtin/rev-list.c:541
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr ""
 "--exclude-promisor-objects und --missing können nicht kombiniert werden."
 
-#: builtin/rev-list.c:472
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "Das Filtern von Objekten erfordert --objects."
 
-#: builtin/rev-list.c:522
+#: 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:525
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr ""
-"--use-bitmap-index kann nicht mit dem Filtern von Objekten kombiniert werden."
+#: builtin/rev-list.c:679
+msgid "marked counting is incompatible with --objects"
+msgstr "markiertes Zählen ist inkompatibel mit der Option --objects"
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "`--` als Argument lassen"
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen"
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr ""
 "Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
 
-#: builtin/rev-parse.c:551
+#: 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"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -19377,6 +22097,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>..."
@@ -19455,19 +22219,19 @@ msgstr "ursprüngliche, leere Commits erhalten"
 msgid "keep redundant, empty commits"
 msgstr "redundante, leere Commits behalten"
 
-#: builtin/revert.c:232
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr "\"revert\" fehlgeschlagen"
 
-#: builtin/revert.c:245
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr "\"cherry-pick\" fehlgeschlagen"
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<Optionen>] [--] <Datei>..."
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -19482,7 +22246,7 @@ msgstr[1] ""
 "unterschiedlich\n"
 "zu der Datei und HEAD:"
 
-#: builtin/rm.c:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -19490,13 +22254,13 @@ msgstr ""
 "\n"
 "(benutzen Sie -f, um die Löschung zu erzwingen)"
 
-#: 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] "die folgende Datei hat zum Commit vorgemerkte Änderungen:"
 msgstr[1] "die folgenden Dateien haben zum Commit vorgemerkte Änderungen:"
 
-#: 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)"
@@ -19505,44 +22269,50 @@ msgstr ""
 "(benutzen Sie --cached, um die Datei zu behalten, oder -f, um das Entfernen "
 "zu erzwingen)"
 
-#: 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] "die folgende Datei hat lokale Änderungen:"
 msgstr[1] "die folgenden Dateien haben lokale Änderungen:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:244
 msgid "do not list removed files"
 msgstr "keine gelöschten Dateien auflisten"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr "nur aus dem Index entfernen"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
 msgstr "die \"up-to-date\" Prüfung überschreiben"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr "rekursives Entfernen erlauben"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:249
 msgid "exit with a zero status even if nothing matched"
 msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:283
+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
 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:307
+#: builtin/rm.c:331
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: konnte %s nicht löschen"
@@ -19560,55 +22330,77 @@ msgstr ""
 "  --all und die explizite Angabe einer <Referenz> schließen sich gegenseitig "
 "aus."
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr "Name des Remote-Repositories"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "zustandsloses RPC-Protokoll verwenden"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "Referenzen von der Standard-Eingabe lesen"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr "Status des Remote-Helpers ausgeben"
 
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
 
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<Optionen>]"
 
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "über Commit-Ersteller anstatt Autor gruppieren"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "mehrere Optionen --group mit Standard-Eingabe wird nicht unterstützt"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr ""
+"Nutzung von --group=trailer mit Standard-Eingabe wird nicht unterstützt"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "unbekannter Gruppen-Typ: %s"
 
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "nach Commit-Ersteller statt Autor gruppieren"
+
+#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren"
 
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
 msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern"
 
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "die E-Mail-Adresse von jedem Autor anzeigen"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "die E-Mail-Adresse jedes Autors anzeigen"
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
 msgstr "Ausgabe mit Zeilenumbrüchen"
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "Feld"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "Gruppieren nach Feld"
+
+#: builtin/shortlog.c:391
 msgid "too many arguments given outside repository"
 msgstr "zu viele Argumente außerhalb des Repositories angegeben"
 
@@ -19718,14 +22510,14 @@ msgstr "keine Branches angegeben, und HEAD ist ungültig"
 
 #: builtin/show-branch.c:738
 msgid "--reflog option needs one branch name"
-msgstr "Die Option --reflog benötigt einen Branchnamen."
+msgstr "die Option --reflog benötigt einen Branchnamen"
 
 #: builtin/show-branch.c:741
 #, 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"
+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
 #, c-format
@@ -19749,6 +22541,14 @@ msgstr "'%s' ist keine gültige Referenz."
 msgid "cannot find commit %s (%s)"
 msgstr "kann Commit %s (%s) nicht finden"
 
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "Hash-Algorithmus"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "Unbekannter Hash-Algorithmus"
+
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -19797,41 +22597,124 @@ msgstr ""
 "Referenzen von der Standard-Eingabe anzeigen, die sich nicht im lokalen "
 "Repository befinden"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: 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) <Optionen>"
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:72
+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
+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
+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
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "Einstellung für extensions.worktreeConfig konnte nicht gesetzt werden"
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "initialisiere den partiellen Checkout im Cone-Modus"
+
+#: builtin/sparse-checkout.c:312
+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
+#, c-format
+msgid "failed to open '%s'"
+msgstr "Fehler beim Öffnen von '%s'"
+
+#: builtin/sparse-checkout.c:413
+#, c-format
+msgid "could not normalize path %s"
+msgstr "konnte Pfad '%s' nicht normalisieren"
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <Muster>)"
+
+#: builtin/sparse-checkout.c:450
+#, 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:504 builtin/sparse-checkout.c:528
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "konnte die existierenden Muster des partiellen Checkouts nicht laden"
+
+#: builtin/sparse-checkout.c:573
+msgid "read patterns from standard in"
+msgstr "Muster von der Standard-Eingabe lesen"
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:607
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:638
+msgid "error while refreshing working directory"
+msgstr "Fehler während der Aktualisierung des Arbeitsverzeichnisses."
+
+#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<Optionen>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<Optionen>] [<Stash>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<Stash>]"
 
-#: 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] [<Stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <Branch> [<Stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28 builtin/stash.c:77
+#: 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"
+"          [--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 <Nachricht>]\n"
+"          [--pathspec-from-file=<Datei> [--pathspec-file-nul]]\n"
 "          [--] [<Pfadspezifikation>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: 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>]"
@@ -19839,192 +22722,232 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<Nachricht>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<Stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<Stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <Nachricht>] [-q|--quiet] <Commit>"
 
-#: builtin/stash.c:127
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <Nachricht>]\n"
+"          [--] [<Pfadspezifikation>...]]"
+
+#: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' ist kein \"stash\"-artiger Commit"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Zu viele Commits angegeben:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Keine Stash-Einträge gefunden."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "'%s' ist kein gültiger Referenzname."
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear mit Parametern ist nicht implementiert"
 
-#: builtin/stash.c:403
+#: 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 ""
+"WARNUNG: Nicht versionierte Datei im Weg von versionierter Datei! "
+"Umbenennung\n"
+"            %s -> %s\n"
+"         um Platz zu schaffen.\n"
+
+#: builtin/stash.c:492
 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:414
+#: builtin/stash.c:503
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "Konnte keinen Diff erzeugen %s^!."
 
-#: builtin/stash.c:421
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:510
+msgid "conflicts in index. Try without --index."
 msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:516
 msgid "could not save index tree"
 msgstr "Konnte Index-Verzeichnis nicht speichern"
 
-#: builtin/stash.c:436
+#: builtin/stash.c:525
 msgid "could not restore untracked files from stash"
 msgstr "Konnte unversionierte Dateien vom Stash nicht wiederherstellen."
 
-#: builtin/stash.c:450
+#: builtin/stash.c:539
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Führe %s mit %s zusammen"
 
-#: builtin/stash.c:460 git-legacy-stash.sh:680
+#: builtin/stash.c:549
 msgid "Index was not unstashed."
 msgstr "Index wurde nicht aus dem Stash zurückgeladen."
 
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:591 builtin/stash.c:689
 msgid "attempt to recreate the index"
 msgstr "Versuche Index wiederherzustellen."
 
-#: builtin/stash.c:555
+#: builtin/stash.c:635
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s (%s) gelöscht"
 
-#: builtin/stash.c:558
+#: builtin/stash.c:638
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Konnte Stash-Eintrag nicht löschen"
 
-#: builtin/stash.c:583
+#: builtin/stash.c:651
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' ist keine Stash-Referenz"
 
-#: builtin/stash.c:633 git-legacy-stash.sh:694
+#: builtin/stash.c:701
 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:656 git-legacy-stash.sh:712
+#: builtin/stash.c:724
 msgid "No branch name specified"
 msgstr "Kein Branchname spezifiziert"
 
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "Parsen der Tree-Objekte fehlgeschlagen"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "Entpacken der Tree-Objekte fehlgeschlagen"
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr "unversionierte Dateien in Stash einbeziehen"
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr "nur unversionierte Dateien im Stash anzeigen"
+
+#: builtin/stash.c:929 builtin/stash.c:966
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Kann nicht %s mit %s aktualisieren."
 
-#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
 msgid "stash message"
 msgstr "Stash-Beschreibung"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:957
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" erwartet ein Argument <Commit>"
 
-#: builtin/stash.c:1046 git-legacy-stash.sh:217
+#: builtin/stash.c:1171
 msgid "No changes selected"
 msgstr "Keine Änderungen ausgewählt"
 
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1271
 msgid "You do not have the initial commit yet"
 msgstr "Sie haben bisher noch keinen initialen Commit"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1298
 msgid "Cannot save the current index state"
 msgstr "Kann den aktuellen Zustand des Index nicht speichern"
 
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1307
 msgid "Cannot save the untracked files"
 msgstr "Kann die unversionierten Dateien nicht speichern"
 
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1318 builtin/stash.c:1327
 msgid "Cannot save the current worktree state"
 msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
 
-#: builtin/stash.c:1229 git-legacy-stash.sh:233
+#: builtin/stash.c:1355
 msgid "Cannot record working tree state"
 msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
 
-#: builtin/stash.c:1278 git-legacy-stash.sh:337
+#: builtin/stash.c:1404
 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:1294
+#: builtin/stash.c:1422
 msgid "Did you forget to 'git add'?"
 msgstr "Haben Sie vielleicht 'git add' vergessen?"
 
-#: builtin/stash.c:1309 git-legacy-stash.sh:345
+#: builtin/stash.c:1437
 msgid "No local changes to save"
 msgstr "Keine lokalen Änderungen zum Speichern"
 
-#: builtin/stash.c:1316 git-legacy-stash.sh:350
+#: builtin/stash.c:1444
 msgid "Cannot initialize stash"
 msgstr "Kann \"stash\" nicht initialisieren"
 
-#: builtin/stash.c:1331 git-legacy-stash.sh:354
+#: builtin/stash.c:1459
 msgid "Cannot save the current status"
 msgstr "Kann den aktuellen Status nicht speichern"
 
-#: builtin/stash.c:1336
+#: builtin/stash.c:1464
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Arbeitsverzeichnis und Index-Status %s gespeichert."
 
-#: builtin/stash.c:1426 git-legacy-stash.sh:384
+#: builtin/stash.c:1554
 msgid "Cannot remove worktree changes"
 msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
 
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1593 builtin/stash.c:1658
 msgid "keep index"
 msgstr "behalte Index"
 
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1595 builtin/stash.c:1660
 msgid "stash in patch mode"
 msgstr "Stash in Patch-Modus"
 
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1596 builtin/stash.c:1661
 msgid "quiet mode"
 msgstr "weniger Ausgaben"
 
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1598 builtin/stash.c:1663
 msgid "include untracked files in stash"
 msgstr "unversionierte Dateien in Stash einbeziehen"
 
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1600 builtin/stash.c:1665
 msgid "include ignore files"
 msgstr "ignorierte Dateien einbeziehen"
 
-#: builtin/stash.c:1564
-#, c-format
-msgid "could not exec %s"
-msgstr "Konnte 'exec %s' nicht ausführen."
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"Die Unterstützung für stash.useBuiltin wurde entfernt!\n"
+"Siehe dessen Eintrag in 'git help config' für Details."
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -20044,40 +22967,41 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Vollständiger Referenzname erwartet, %s erhalten"
 
-#: builtin/submodule--helper.c:62
+#: 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:100
+#: 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:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
 msgid "alternative anchor for relative paths"
 msgstr "Alternativer Anker für relative Pfade"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:416
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: 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 "Keine URL für Submodul-Pfad '%s' in .gitmodules gefunden"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:526
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Betrete '%s'\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:529
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -20086,7 +23010,7 @@ msgstr ""
 "run_command gab nicht-Null Status für '%s' zurück.\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:551
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -20098,21 +23022,20 @@ msgstr ""
 "nicht-Null Status zurück.\n"
 "."
 
-#: builtin/submodule--helper.c:563
-msgid "Suppress output of entering each submodule command"
-msgstr ""
-"Ausgaben beim Betreten und der Befehlsausführung in einem Submodul "
-"unterdrücken"
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
+msgstr "Ausgaben beim Betreten eines Submodul-Befehls unterdrücken"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
-msgid "Recurse into nested submodules"
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
 msgstr "Rekursion in verschachtelte Submodule durchführen"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:574
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <Befehl>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:601
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -20121,104 +23044,155 @@ msgstr ""
 "Konnte Konfiguration '%s' nicht nachschlagen. Nehme an, dass dieses\n"
 "Repository sein eigenes verbindliches Upstream-Repository ist."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:668
 #, 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:669
+#: builtin/submodule--helper.c:672
 #, 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:679
+#: builtin/submodule--helper.c:682
 #, 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:686
+#: builtin/submodule--helper.c:689
 #, 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:708
-msgid "Suppress output for initializing a submodule"
+#: builtin/submodule--helper.c:711
+msgid "suppress output for initializing a submodule"
 msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:716
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<Optionen>] [<Pfad>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, 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:824
+#: builtin/submodule--helper.c:837
 #, 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:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "Fehler bei Rekursion in Submodul '%s'."
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
-msgid "Suppress submodule status output"
-msgstr "Ausgabe über Submodul-Status unterdrücken"
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
+msgstr "Ausgabe des Submodul-Status unterdrücken"
 
-#: builtin/submodule--helper.c:876
+#: 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 ""
-"Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD"
+"den Commit benutzen, der im Index gespeichert ist, statt den im Submodul HEAD"
 
-#: builtin/submodule--helper.c:877
-msgid "recurse into nested submodules"
-msgstr "Rekursion in verschachtelte Submodule durchführen"
-
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <Pfad>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(submodule)"
+
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(submodule)->%s(blob)"
+
+#: builtin/submodule--helper.c:1007
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "Hash eines Objektes von '%s' konnte nicht erzeugt werden"
+
+#: builtin/submodule--helper.c:1061
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "unerwarteter Modus %o\n"
+
+#: builtin/submodule--helper.c:1302
+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:1304
+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:1306
+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:1308
+msgid "limit the summary size"
+msgstr "Größe der Zusammenfassung begrenzen"
+
+#: builtin/submodule--helper.c:1313
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<Optionen>] [<Commit>] [--] [<Pfad>]"
+
+#: builtin/submodule--helper.c:1337
+msgid "could not fetch a revision for HEAD"
+msgstr "konnte keinen Commit für HEAD holen"
+
+#: builtin/submodule--helper.c:1342
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached und --files schließen sich gegenseitig aus"
+
+#: builtin/submodule--helper.c:1409
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synchronisiere Submodul-URL für '%s'\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:1415
 #, c-format
 msgid "failed to register url for submodule path '%s'"
-msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'."
+msgstr "Fehler beim Registrieren der URL für Submodul-Pfad '%s'"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1429
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
-msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'."
+msgstr "Fehler beim Lesen des Standard-Remote-Repositories für Submodul '%s'"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1440
 #, c-format
 msgid "failed to update remote for submodule '%s'"
-msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'."
+msgstr "Fehler beim Aktualisieren des Remote-Repositories für Submodul '%s'"
 
-#: builtin/submodule--helper.c:1048
-msgid "Suppress output of synchronizing submodule url"
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
 msgstr "Ausgaben bei der Synchronisierung der Submodul-URLs unterdrücken"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1494
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<Pfad>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1548
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20228,7 +23202,7 @@ msgstr ""
 "(benutzen Sie 'rm -rf', wenn Sie dieses wirklich mitsamt seiner Historie\n"
 "löschen möchten)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1560
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20237,185 +23211,215 @@ msgstr ""
 "Arbeitsverzeichnis von Submodul in '%s' enthält lokale Änderungen;\n"
 "verwenden Sie '-f', um diese zu verwerfen."
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Verzeichnis '%s' bereinigt.\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1570
 #, 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:1142
+#: builtin/submodule--helper.c:1581
 #, 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:1158
+#: builtin/submodule--helper.c:1597
 #, 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:1187
-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 ""
 "Arbeitsverzeichnisse von Submodulen löschen, auch wenn lokale Änderungen "
 "vorliegen"
 
-#: builtin/submodule--helper.c:1188
-msgid "Unregister all submodules"
+#: builtin/submodule--helper.c:1627
+msgid "unregister all submodules"
 msgstr "alle Submodule austragen"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1632
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<Pfad>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1646
 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:1302 builtin/submodule--helper.c:1305
+#: 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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Eine Alternative, die von einer übergeordneten Projekt-Alternative\n"
+"berechnet wurde, ist ungültig.\n"
+"Um Git das Klonen ohne Alternative in solch einem Fall zu erlauben, setze\n"
+"submodule.alternateErrorStrategy auf 'info' oder klone mit der Option\n"
+"'--reference-if-able' statt '--reference'."
+
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1768
 #, 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:1348
+#: builtin/submodule--helper.c:1775
 #, 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:1371
+#: builtin/submodule--helper.c:1800
+#, 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:1841
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen."
+
+#: builtin/submodule--helper.c:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "Verzeichnis ist nicht leer: '%s'"
+
+#: builtin/submodule--helper.c:1858
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
+
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
 msgid "where the new submodule will be cloned to"
 msgstr "Pfad für neues Submodul"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
 msgid "name of the new submodule"
 msgstr "Name des neuen Submoduls"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
 msgid "url where to clone the submodule from"
 msgstr "URL von der das Submodul geklont wird"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
 msgid "depth for shallow clones"
 msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
 msgid "force cloning progress"
 msgstr "Fortschrittsanzeige beim Klonen erzwingen"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+msgid "disallow cloning into non-empty directory"
+msgstr "Klonen in ein nicht leeres Verzeichnis verbieten"
+
+#: builtin/submodule--helper.c:1916
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<Pfad>] [--quiet] [--reference "
-"<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth "
-"<Tiefe>] --url <URL> --path <Pfad>"
+"<Repository>] [--name <Name>] [--depth <Tiefe>] [--single-branch] --url "
+"<URL> --path <Pfad>"
 
-#: builtin/submodule--helper.c:1424
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
-
-#: builtin/submodule--helper.c:1438
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1953
 #, 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:1478
+#: builtin/submodule--helper.c:1957
 #, 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:1571
+#: builtin/submodule--helper.c:2058
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Submodul-Pfad '%s' nicht initialisiert"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:2062
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Meinten Sie vielleicht 'update --init'?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:2092
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Überspringe nicht zusammengeführtes Submodul %s"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:2121
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Ãœberspringe Submodul '%s'"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:2271
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:2282
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
 msgid "path into the working tree"
 msgstr "Pfad zum Arbeitsverzeichnis"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:2347
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:2351
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout oder none"
 
-#: builtin/submodule--helper.c:1864
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2357
+msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr ""
-"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten "
-"bei\n"
-"der angegebenen Anzahl von Commits."
+"einen Klon mit unvollständiger Historie (shallow) erstellen, abgeschnitten "
+"bei der angegebenen Anzahl von Commits"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:2360
 msgid "parallel jobs"
 msgstr "Parallele Ausführungen"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2362
 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:1870
+#: builtin/submodule--helper.c:2363
 msgid "don't print cloning progress"
 msgstr "keine Fortschrittsanzeige beim Klonen"
 
-#: builtin/submodule--helper.c:1877
+#: builtin/submodule--helper.c:2374
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<Pfad>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:2387
 msgid "bad value for update parameter"
-msgstr "Fehlerhafter Wert für --update Parameter"
+msgstr "Fehlerhafter Wert für update Parameter"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:2435
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20424,52 +23428,147 @@ 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:2061
+#: builtin/submodule--helper.c:2558
 #, 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:2094
+#: builtin/submodule--helper.c:2591
 msgid "recurse into submodules"
 msgstr "Rekursion in Submodule durchführen"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2597
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<Optionen>] [<Pfad>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2653
 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:2159
+#: builtin/submodule--helper.c:2656
 msgid "unset the config in the .gitmodules file"
 msgstr "Konfiguration in der .gitmodules-Datei entfernen"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2661
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <name> [<Wert>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2662
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <Name>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2663
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: 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 ""
 "Bitte stellen Sie sicher, dass sich die Datei .gitmodules im "
 "Arbeitsverzeichnis befindet."
 
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
+#: builtin/submodule--helper.c:2698
+msgid "suppress output for setting url of a submodule"
+msgstr "Ausgaben beim Setzen der URL eines Submoduls unterdrücken"
+
+#: builtin/submodule--helper.c:2702
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <Pfad> <neue URL>"
+
+#: builtin/submodule--helper.c:2735
+msgid "set the default tracking branch to master"
+msgstr "Standard-Tracking-Branch auf master setzen"
+
+#: builtin/submodule--helper.c:2737
+msgid "set the default tracking branch"
+msgstr "Standard-Tracking-Branch setzen"
+
+#: builtin/submodule--helper.c:2741
+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:2742
+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:2749
+msgid "--branch or --default required"
+msgstr "Option --branch oder --default erforderlich"
+
+#: builtin/submodule--helper.c:2752
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch und --default schließen sich gegenseitig aus"
+
+#: builtin/submodule--helper.c:2815
+#, 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:2818
+#, 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:2828
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr ""
+"Ein Git-Verzeichnis für '%s' wurde lokal gefunden mit den Remote-"
+"Repositories:"
+
+#: 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 ""
+"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'.\n"
+
+#: builtin/submodule--helper.c:2842
+#, 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:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Kann Submodul '%s' nicht auschecken"
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr "Branch des Repositories zum Auschecken beim Klonen"
+
+#: builtin/submodule--helper.c:2910
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "das Hinzufügen eines andernfalls ignorierten Submodul-Pfads erlauben"
+
+#: builtin/submodule--helper.c:2917
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr ""
+"git submodule--helper add-clone [<Optionen>...] --url <URL> --path <Pfad> --"
+"name <Name>"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s unterstützt kein --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2991
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -20482,24 +23581,24 @@ msgstr "git symbolic-ref [<Optionen>] <Name> [<Referenz>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <Name>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 "Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen unterdrücken"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "symbolische Referenzen löschen"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "verkürzte Ausgabe der Referenzen"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr "Grund"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "Grund für die Aktualisierung"
 
@@ -20519,27 +23618,29 @@ msgstr "git tag -d <Tagname>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--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=<Muster>] [--[no-]merged [<Commit>]] [<Muster>...]"
+"\t\t[--format=<format>] [--merged <Commit>] [--no-merged <Commit>] "
+"[<Muster>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<Format>] <Tagname>..."
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "Tag '%s' nicht gefunden."
 
-#: builtin/tag.c:105
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tag '%s' gelöscht (war %s)\n"
 
-#: builtin/tag.c:135
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -20552,7 +23653,7 @@ msgstr ""
 "  %s\n"
 "ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
 
-#: builtin/tag.c:139
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -20567,15 +23668,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:198
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "konnte Tag nicht signieren"
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "konnte Tag-Datei nicht schreiben"
-
-#: 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"
@@ -20589,416 +23686,416 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:232
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "ungültiger Objekt-Typ"
 
-#: builtin/tag.c:284
+#: builtin/tag.c:328
 msgid "no tag message?"
 msgstr "keine Tag-Beschreibung?"
 
-#: builtin/tag.c:291
+#: builtin/tag.c:335
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Die Tag-Beschreibung wurde in %s gelassen\n"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr "Tagnamen auflisten"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr "Tags löschen"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr "Tags überprüfen"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr "Optionen für Erstellung von Tags"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr "annotiertes Tag, benötigt eine Beschreibung"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:457
 msgid "tag message"
 msgstr "Tag-Beschreibung"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:459
 msgid "force edit of tag message"
 msgstr "Bearbeitung der Tag-Beschreibung erzwingen"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr "annotiertes und GPG-signiertes Tag"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
 msgstr "das Tag ersetzen, wenn es existiert"
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "Reflog erstellen"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr "Optionen für Auflistung der Tags"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr "Liste der Tags in Spalten anzeigen"
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
 
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:470 builtin/tag.c:472
 msgid "print only tags that don't contain the commit"
 msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
 
-#: builtin/tag.c:429
+#: builtin/tag.c:473
 msgid "print only tags that are merged"
 msgstr "nur Tags ausgeben, die gemerged wurden"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:474
 msgid "print only tags that are not merged"
 msgstr "nur Tags ausgeben, die nicht gemerged wurden"
 
-#: builtin/tag.c:434
+#: builtin/tag.c:478
 msgid "print only tags of the object"
 msgstr "nur Tags von dem Objekt ausgeben"
 
-#: builtin/tag.c:482
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
 msgstr "--column und -n sind inkompatibel"
 
-#: builtin/tag.c:504
+#: builtin/tag.c:548
 msgid "-n option is only allowed in list mode"
-msgstr "Die Option -n ist nur im Listenmodus erlaubt."
+msgstr "die Option -n ist nur im Listenmodus erlaubt"
 
-#: builtin/tag.c:506
+#: builtin/tag.c:550
 msgid "--contains option is only allowed in list mode"
-msgstr "Die Option --contains ist nur im Listenmodus erlaubt."
+msgstr "--contains ist nur im Listenmodus erlaubt"
 
-#: builtin/tag.c:508
+#: builtin/tag.c:552
 msgid "--no-contains option is only allowed in list mode"
-msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt."
+msgstr "--no-contains ist nur im Listenmodus erlaubt"
 
-#: builtin/tag.c:510
+#: builtin/tag.c:554
 msgid "--points-at option is only allowed in list mode"
-msgstr "Die Option --points-at ist nur im Listenmodus erlaubt."
+msgstr "--points-at ist nur im Listenmodus erlaubt"
 
-#: builtin/tag.c:512
+#: builtin/tag.c:556
 msgid "--merged and --no-merged options are only allowed in list mode"
-msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt."
+msgstr "--merged und --no-merged sind nur im Listenmodus erlaubt"
 
-#: builtin/tag.c:523
+#: 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:542
-msgid "too many params"
-msgstr "zu viele Parameter"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:592
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' ist kein gültiger Tagname."
 
-#: builtin/tag.c:553
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "Tag '%s' existiert bereits"
 
-#: builtin/tag.c:584
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aktualisiert (war %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Entpacke Objekte"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "Konnte Datei '%s' nicht erstellen"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "Konnte Datei '%s' nicht löschen"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "Konnte Verzeichnis '%s' nicht löschen"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Prüfe mtime in '%s' "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 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:166
+#: builtin/update-index.c:167
 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:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "Verzeichnisinformationen haben sich nach Aktualisierung einer Datei geändert"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 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:201
+#: builtin/update-index.c:202
 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:214
+#: builtin/update-index.c:215
 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:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:976
 msgid "continue refresh even when index needs update"
 msgstr ""
 "Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr "Aktualisierung: ignoriert Submodule"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
 msgid "do not ignore new files"
 msgstr "keine neuen Dateien ignorieren"
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:984
 msgid "let files replace directories and vice-versa"
 msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
 msgid "notice files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:988
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:991
 msgid "refresh stat information"
 msgstr "Dateiinformationen aktualisieren"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr "<Modus>,<Objekt>,<Pfad>"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1000
 msgid "add the specified entry to the index"
 msgstr "den angegebenen Eintrag zum Commit vormerken"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1010
 msgid "mark files as \"not changing\""
 msgstr "diese Datei immer als unverändert betrachten"
 
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
 msgstr "\"assumed-unchanged\"-Bit löschen"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
 msgstr "Dateien als \"index-only\" markieren"
 
-#: builtin/update-index.c:1015
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
 msgstr "\"skip-worktree\"-Bit löschen"
 
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr "\"index-only\" Einträge überspringen"
+
+#: builtin/update-index.c:1024
 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:1020
+#: builtin/update-index.c:1026
 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:1022
+#: builtin/update-index.c:1028
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1030
 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:1028
+#: builtin/update-index.c:1034
 msgid "add entries from standard input to the index"
 msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
 
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1038
 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:1036
+#: builtin/update-index.c:1042
 msgid "only update entries that differ from HEAD"
 msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
 
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1046
 msgid "ignore files missing from worktree"
 msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1049
 msgid "report actions to standard output"
 msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1051
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr "Index-Datei in diesem Format schreiben"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
 msgstr "Splitting des Index aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1059
 msgid "enable/disable untracked cache"
 msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1061
 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:1057
+#: builtin/update-index.c:1063
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 "Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1065
 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:1061
+#: builtin/update-index.c:1067
 msgid "enable or disable file system monitor"
 msgstr "Dateisystem-Monitor aktivieren oder deaktivieren"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1069
 msgid "mark files as fsmonitor valid"
 msgstr "Dateien als \"fsmonitor valid\" markieren"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c:1072
 msgid "clear fsmonitor valid bit"
 msgstr "\"fsmonitor valid\"-Bit löschen"
 
-#: builtin/update-index.c:1169
+#: 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 ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n"
-"wenn sie wirklich das Splitting des Index aktivieren möchten."
+"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:1178
+#: 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 ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
-"wenn Sie wirklich das Splitting des Index deaktivieren möchten."
+"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:1190
+#: 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 ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
-"wenn Sie wirklich den Cache für unversionierte Dateien deaktivieren möchten."
+"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:1194
+#: builtin/update-index.c:1200
 msgid "Untracked cache disabled"
 msgstr "Cache für unversionierte Dateien deaktiviert"
 
-#: builtin/update-index.c:1202
+#: 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 ist auf 'false' gesetzt. Entfernen oder ändern Sie "
+"core.untrackedCache ist auf 'false' gesetzt; entfernen oder ändern Sie "
 "dies,\n"
-"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten."
+"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten"
 
-#: builtin/update-index.c:1206
+#: builtin/update-index.c:1212
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
 
-#: builtin/update-index.c:1214
+#: builtin/update-index.c:1220
 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-"
+"core.fsmonitor nicht gesetzt; setzen Sie es, wenn Sie den Dateisystem-"
 "Monitor\n"
-"wirklich aktivieren möchten."
+"wirklich aktivieren möchten"
 
-#: builtin/update-index.c:1218
+#: builtin/update-index.c:1224
 msgid "fsmonitor enabled"
 msgstr "Dateisystem-Monitor aktiviert"
 
-#: builtin/update-index.c:1221
+#: builtin/update-index.c:1227
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
-"core.fsmonitor ist gesetzt. Löschen Sie es, wenn Sie den Dateisystem-"
+"core.fsmonitor ist gesetzt; löschen Sie es, wenn Sie den Dateisystem-"
 "Monitor\n"
 "wirklich deaktivieren möchten."
 
-#: builtin/update-index.c:1225
+#: builtin/update-index.c:1231
 msgid "fsmonitor disabled"
 msgstr "Dateisystem-Monitor deaktiviert"
 
@@ -21015,19 +24112,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<Optionen>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "diese Referenz löschen"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
 msgstr "<Referenzname> aktualisieren, nicht den Verweis"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr "Aktualisierungen von der Standard-Eingabe lesen"
 
@@ -21073,15 +24170,15 @@ msgstr "Commit-Inhalte ausgeben"
 msgid "print raw gpg status output"
 msgstr "unbearbeitete Ausgabe des Status von gpg ausgeben"
 
-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <Paket>..."
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "erweiterte Ausgaben"
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "nur Statistiken anzeigen"
 
@@ -21093,234 +24190,225 @@ msgstr "git verify-tag [-v | --verbose] [--format=<Format>] <Tag>..."
 msgid "print tag contents"
 msgstr "Tag-Inhalte ausgeben"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<Optionen>] <Pfad> [<Commit-Angabe>]"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<Optionen>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<Optionen>] <Pfad>"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <Arbeitsverzeichnis> <neuer-Pfad>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<Optionen>]"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<Optionen>] <Arbeitsverzeichnis>"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <Pfad>"
 
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:61 builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "Fehler beim Löschen von '%s'"
 
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
 #, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
+msgid "Removing %s/%s: %s"
+msgstr "Entferne %s/%s: %s"
 
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"Lösche worktrees/%s: read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> "
-"gelesen)"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "entfernte Arbeitsverzeichnisse ausgeben"
 
-#: builtin/worktree.c:167
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
 
-#: builtin/worktree.c:234
+#: builtin/worktree.c:219
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existiert bereits"
 
-#: builtin/worktree.c:251
+#: builtin/worktree.c:228
 #, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "Konnte Arbeitsverzeichnis '%s' nicht neu hinzufügen."
+msgid "unusable worktree destination '%s'"
+msgstr "nicht nutzbares Ziel des Arbeitsverzeichnisses '%s'"
 
-#: builtin/worktree.c:256
+#: builtin/worktree.c:233
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"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 'add -f -f' zum Ãœberschrieben, oder 'unlock' und 'prune'\n"
+"Benutzen Sie '%s -f -f' zum Ãœberschreiben, oder 'unlock' und 'prune'\n"
 "oder 'remove' zum Löschen."
 
-#: builtin/worktree.c:258
+#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 "'%s' ist ein fehlendes, aber bereits registriertes Arbeitsverzeichnis;\n"
-"Benutzen Sie 'add -f' zum Ãœberschreiben, oder 'prune' oder 'remove' zum\n"
+"Benutzen Sie '%s -f' zum Ãœberschreiben, oder 'prune' oder 'remove' zum\n"
 "Löschen."
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:286
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "Konnte Verzeichnis '%s' nicht erstellen."
 
-#: builtin/worktree.c:439 builtin/worktree.c:445
+#: builtin/worktree.c:308
+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:441
+#: 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:450
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Bereite Arbeitsverzeichnis vor (checke '%s' aus)"
 
-#: builtin/worktree.c:456
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Bereite Arbeitsverzeichnis vor (losgelöster HEAD %s)"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "<Branch> auschecken, auch wenn dieser bereits in einem anderen "
 "Arbeitsverzeichnis ausgecheckt ist"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "neuen Branch erstellen"
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "Branch erstellen oder umsetzen"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "das neue Arbeitsverzeichnis auschecken"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
 
-#: builtin/worktree.c:508
+#: 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:511
+#: 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"
 "Remote-Tracking-Branch herzustellen"
 
-#: builtin/worktree.c:519
+#: builtin/worktree.c:506
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B und --detach schließen sich gegenseitig aus"
 
-#: builtin/worktree.c:580
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr "--reason benötigt --lock"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "mit --lock hinzugefügt"
+
+#: 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:680
-msgid "reason for locking"
-msgstr "Sperrgrund"
+#: builtin/worktree.c:691
+msgid "show extended annotations and reasons, if available"
+msgstr "erweiterte Anmerkungen und Gründe anzeigen, falls vorhanden"
+
+#: 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:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: builtin/worktree.c:702
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose und --porcelain schließen sich gegenseitig aus"
+
+#: 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:694 builtin/worktree.c:727
+#: 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:699
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ist bereits gesperrt, Grund: %s"
 
-#: builtin/worktree.c:701
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ist bereits gesperrt"
 
-#: builtin/worktree.c:729
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' ist nicht gesperrt"
 
-#: builtin/worktree.c:770
+#: 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:778
+#: 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:801 builtin/worktree.c:928
+#: 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:806
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "Konnte Zielname aus '%s' nicht bestimmen."
 
-#: builtin/worktree.c:812
-#, c-format
-msgid "target '%s' already exists"
-msgstr "Ziel '%s' existiert bereits."
-
-#: builtin/worktree.c:820
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -21330,7 +24418,7 @@ msgstr ""
 "Benutzen Sie 'move -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:822
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -21339,40 +24427,40 @@ msgstr ""
 "Benutzen Sie 'move -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:825
+#: 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:830
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "Fehler beim Verschieben von '%s' nach '%s'"
 
-#: builtin/worktree.c:878
+#: 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:882
+#: 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:887
+#: 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:910
+#: 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:933
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -21382,7 +24470,7 @@ msgstr ""
 "Benutzen Sie 'remove -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:935
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -21391,11 +24479,21 @@ msgstr ""
 "Benutzen Sie 'remove -f -f' zum Ãœberschreiben oder entsperren Sie zuerst\n"
 "das Arbeitsverzeichnis."
 
-#: builtin/worktree.c:938
+#: 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:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr "repariere: %s: %s"
+
+#: builtin/worktree.c:1011
+#, c-format
+msgid "error: %s: %s"
+msgstr "Fehler: %s: %s"
+
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<Präfix>/]"
@@ -21412,60 +24510,14 @@ msgstr "das Tree-Objekt für ein Unterverzeichnis <Präfix> schreiben"
 msgid "only useful for debugging"
 msgstr "nur nützlich für Fehlersuche"
 
-#: fast-import.c:3118
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "'mark' Befehl erwartet, '%s' bekommen"
-
-#: fast-import.c:3123
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "'to' Befehl erwartet, '%s' bekommen"
-
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"Die Berechtigungen auf Ihr Socket-Verzeichnis sind zu schwach; andere\n"
-"Nutzer könnten Ihre zwischengespeicherten Anmeldeinformationen lesen.\n"
-"Ziehen Sie in Betracht\n"
-"\n"
-"\tchmod 0700 %s\n"
-"\n"
-"auszuführen."
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
-
-#: t/helper/test-reach.c:152
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "Commit %s ist nicht als erreichbar gekennzeichnet."
-
-#: t/helper/test-reach.c:162
-msgid "too many commits marked reachable"
-msgstr "Zu viele Commits als erreichbar gekennzeichnet."
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<Optionen>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "direkt nach Anzeige der angebotenen Fähigkeiten beenden"
-
-#: git.c:27
+#: git.c:28
 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"
 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "           <command> [<args>]"
 msgstr ""
 "git [--version] [--help] [-C <Pfad>] [-c <Name>=<Wert>]\n"
@@ -21473,9 +24525,10 @@ msgstr ""
 "           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
 "bare]\n"
 "           [--git-dir=<Pfad>] [--work-tree=<Pfad>] [--namespace=<Name>]\n"
+"           [--super-prefix=<Pfad>] [--config-env=<Name>=<Variable>]\n"
 "           <Befehl> [<Argumente>]"
 
-#: git.c:34
+#: 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"
@@ -21488,47 +24541,52 @@ msgstr ""
 "Konzept zu erfahren.\n"
 "Benutzen Sie 'git help git' für einen Überblick des Systems."
 
-#: git.c:186
+#: git.c:188
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "Kein Verzeichnis für --git-dir angegeben.\n"
 
-#: git.c:200
+#: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "Kein Namespace für --namespace angegeben.\n"
 
-#: git.c:214
+#: git.c:216
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "Kein Verzeichnis für --work-tree angegeben.\n"
 
-#: git.c:228
+#: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "Kein Präfix für --super-prefix angegeben.\n"
 
-#: git.c:250
+#: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c erwartet einen Konfigurationsstring.\n"
 
-#: git.c:288
+#: git.c:260
+#, c-format
+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:314
+#: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "Unbekannte Option: %s\n"
 
-#: git.c:360
+#: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr "beim Erweitern von Alias '%s': '%s'"
 
-#: git.c:369
+#: git.c:384
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -21537,39 +24595,39 @@ msgstr ""
 "Alias '%s' ändert Umgebungsvariablen.\n"
 "Sie können '!git' im Alias benutzen, um dies zu tun."
 
-#: git.c:376
+#: git.c:391
 #, c-format
 msgid "empty alias for %s"
 msgstr "leerer Alias für %s"
 
-#: git.c:379
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr "rekursiver Alias: %s"
 
-#: git.c:459
+#: git.c:476
 msgid "write failure on standard output"
 msgstr "Fehler beim Schreiben in die Standard-Ausgabe."
 
-#: git.c:461
+#: git.c:478
 msgid "unknown write failure on standard output"
 msgstr "Unbekannter Fehler beim Schreiben in die Standard-Ausgabe."
 
-#: git.c:463
+#: git.c:480
 msgid "close failed on standard output"
 msgstr "Fehler beim Schließen der Standard-Ausgabe."
 
-#: git.c:792
+#: git.c:833
 #, 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:842
+#: git.c:883
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "Kann %s nicht als eingebauten Befehl behandeln."
 
-#: git.c:855
+#: git.c:896
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -21578,56 +24636,204 @@ msgstr ""
 "Verwendung: %s\n"
 "\n"
 
-#: git.c:875
+#: git.c:916
 #, 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"
+msgstr "Erweiterung von Alias '%s' fehlgeschlagen; '%s' ist kein Git-Befehl\n"
 
-#: git.c:887
+#: git.c:928
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "Fehler beim Ausführen von Befehl '%s': %s\n"
 
-#: http.c:378
+#: http-fetch.c:118
+#, 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
+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"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "Fehler beim Vorbereiten der Commits"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "Commit %s ist nicht als erreichbar gekennzeichnet."
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "Zu viele Commits als erreichbar gekennzeichnet."
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<Optionen>]"
+
+#: t/helper/test-serve-v2.c:19
+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
+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
+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
+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
+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
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<Name>] [<Token>]"
+
+#: t/helper/test-simple-ipc.c:687
+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
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<Name>] [<Threads>] [<bytecount>] "
+"[<batchsize>]"
+
+#: t/helper/test-simple-ipc.c:696
+msgid "name or pathname of unix domain socket"
+msgstr "Name oder Pfadname des UNIX-Domain-Sockets"
+
+#: t/helper/test-simple-ipc.c:698
+msgid "named-pipe name"
+msgstr "Name der benannten Pipe"
+
+#: t/helper/test-simple-ipc.c:700
+msgid "number of threads in server thread pool"
+msgstr "Anzahl der Threads im Thread-Pool des Servers"
+
+#: t/helper/test-simple-ipc.c:701
+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
+msgid "number of bytes"
+msgstr "Anzahl von Bytes"
+
+#: t/helper/test-simple-ipc.c:704
+msgid "number of requests per thread"
+msgstr "Anzahl der Anfragen pro Thread"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr "Byte"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr "Ballast-Zeichen"
+
+#: 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 "Befehlstoken, der an den Server gesendet werden soll"
+
+#: http.c:399
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
 
-#: http.c:399
+#: http.c:420
 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:408
+#: http.c:429
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 "Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
 "nicht unterstützt."
 
-#: http.c:878
+#: http.c:910
 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:951
+#: 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:1088
+#: http.c:1132
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Nicht unterstütztes SSL-Backend '%s'. Unterstützte SSL-Backends:"
 
-#: http.c:1095
+#: http.c:1139
 #, 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:1099
+#: http.c:1143
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Konnte SSL-Backend nicht zu '%s' setzen: bereits gesetzt"
 
-#: http.c:1968
+#: http.c:2034
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21638,155 +24844,196 @@ msgstr ""
 "  gefragt nach: %s\n"
 "    umgeleitet: %s"
 
-#: remote-curl.c:166
+#: remote-curl.c:183
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "Ungültiges Quoting beim \"push-option\"-Wert: '%s'"
 
-#: remote-curl.c:263
+#: remote-curl.c:307
 #, 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:364
+#: remote-curl.c:408
 msgid "invalid server response; expected service, got flush packet"
-msgstr "Ungültige Antwort des Servers. Service erwartet, Flush-Paket bekommen"
+msgstr "ungültige Antwort des Servers; Service erwartet, Flush-Paket bekommen"
 
-#: remote-curl.c:395
+#: remote-curl.c:439
 #, c-format
 msgid "invalid server response; got '%s'"
-msgstr "Ungültige Serverantwort; '%s' bekommen"
+msgstr "ungültige Serverantwort; '%s' bekommen"
 
-#: remote-curl.c:455
+#: remote-curl.c:499
 #, c-format
 msgid "repository '%s' not found"
-msgstr "Repository '%s' nicht gefunden."
+msgstr "Repository '%s' nicht gefunden"
 
-#: remote-curl.c:459
+#: remote-curl.c:503
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Authentifizierung fehlgeschlagen für '%s'"
 
-#: remote-curl.c:463
+#: remote-curl.c:507
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "konnte nicht auf '%s' zugreifen: %s"
 
-#: remote-curl.c:469
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
-msgstr "Leite nach %s um"
+msgstr "Umleitung nach %s"
 
-#: remote-curl.c:593
+#: remote-curl.c:644
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "sollte kein EOF haben, wenn nicht behutsam mit EOF"
 
-#: remote-curl.c:673
+#: remote-curl.c:656
+msgid "remote server sent unexpected response end packet"
+msgstr "Remote Server sendete unerwartetes Antwort-Endpaket"
+
+#: 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 "
+"konnte nicht RPC-POST-Daten zurückspulen - Versuchen Sie http.postBuffer zu "
 "erhöhen"
 
-#: remote-curl.c:733
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: ungültiges Zeichen für Zeilenlänge: %.4s"
+
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: unerwartetes Antwort-Endpaket"
+
+#: remote-curl.c:834
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC fehlgeschlagen; %s"
 
-#: remote-curl.c:773
+#: remote-curl.c:874
 msgid "cannot handle pushes this big"
 msgstr "Kann solche großen Übertragungen nicht verarbeiten."
 
-#: remote-curl.c:888
+#: remote-curl.c:989
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "Kann Request nicht komprimieren; \"zlib deflate\"-Fehler %d"
 
-#: remote-curl.c:892
+#: remote-curl.c:993
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "Kann Request nicht komprimieren; \"zlib end\"-Fehler %d"
 
-#: remote-curl.c:1023
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d Bytes des Längen-Headers wurden empfangen"
+
+#: remote-curl.c:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d Bytes des Bodys werden noch erwartet"
+
+#: remote-curl.c:1134
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "Dumb HTTP-Transport unterstützt keine shallow-Funktionen"
 
-#: remote-curl.c:1037
+#: remote-curl.c:1149
 msgid "fetch failed."
 msgstr "\"fetch\" fehlgeschlagen."
 
-#: remote-curl.c:1085
+#: remote-curl.c:1195
 msgid "cannot fetch by sha1 over smart http"
 msgstr "Kann SHA-1 nicht über Smart-HTTP anfordern"
 
-#: remote-curl.c:1129 remote-curl.c:1135
+#: remote-curl.c:1239 remote-curl.c:1245
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "Protokollfehler: SHA-1/Referenz erwartet, '%s' bekommen"
 
-#: remote-curl.c:1147 remote-curl.c:1261
+#: remote-curl.c:1257 remote-curl.c:1375
 #, c-format
 msgid "http transport does not support %s"
 msgstr "HTTP-Transport unterstützt nicht %s"
 
-#: remote-curl.c:1183
+#: remote-curl.c:1293
 msgid "git-http-push failed"
 msgstr "\"git-http-push\" fehlgeschlagen"
 
-#: remote-curl.c:1367
+#: remote-curl.c:1481
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: Verwendung: git remote-curl <Remote-Repository> [<URL>]"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1513
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: Fehler beim Lesen des Kommando-Streams von Git"
 
-#: remote-curl.c:1406
+#: remote-curl.c:1520
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: \"fetch\" ohne lokales Repository versucht"
 
-#: remote-curl.c:1446
+#: remote-curl.c:1561
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: Unbekannter Befehl '%s' von Git"
 
-#: list-objects-filter-options.h:85
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "keine Compiler-Information verfügbar\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "keine libc Informationen verfügbar\n"
+
+#: list-objects-filter-options.h:94
 msgid "args"
 msgstr "Argumente"
 
-#: list-objects-filter-options.h:86
+#: list-objects-filter-options.h:95
 msgid "object filtering"
 msgstr "Filtern nach Objekten"
 
-#: parse-options.h:179
+#: parse-options.h:184
 msgid "expiry-date"
 msgstr "Verfallsdatum"
 
-#: parse-options.h:193
+#: parse-options.h:198
 msgid "no-op (backward compatibility)"
 msgstr "Kein Effekt (Rückwärtskompatibilität)"
 
-#: parse-options.h:305
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "erweiterte Ausgaben"
 
-#: parse-options.h:307
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "weniger Ausgaben"
 
-#: parse-options.h:313
-msgid "use <n> digits to display SHA-1s"
-msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s"
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
+msgstr "benutze <Anzahl> Ziffern zur Anzeige von Objektnamen"
 
-#: parse-options.h:332
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
 
-#: ref-filter.h:101
+#: parse-options.h:338
+msgid "read pathspec from file"
+msgstr "Pfadspezifikation aus einer Datei lesen"
+
+#: parse-options.h:339
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"Mit der Option --pathspec-from-file sind Pfade durch NUL-Zeichen getrennt"
+
+#: ref-filter.h:99
 msgid "key"
 msgstr "Schüssel"
 
-#: ref-filter.h:101
+#: ref-filter.h:99
 msgid "field name to sort on"
 msgstr "sortiere nach diesem Feld"
 
@@ -21795,14 +25042,6 @@ msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 "Index, wenn möglich, mit wiederverwendeter Konfliktauflösung aktualisieren"
 
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "HEAD losgelöst bei "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD losgelöst von "
-
 #: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Dateiinhalte zum Commit vormerken"
@@ -21844,696 +25083,684 @@ msgid "List, create, or delete branches"
 msgstr "Branches anzeigen, erstellen oder entfernen"
 
 #: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr ""
+"Informationen für den Benutzer zum Einreichen eines Fehlerberichts sammeln"
+
+#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Objekte und Referenzen über ein Archiv verteilen"
 
-#: command-list.h:60
+#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
 "Inhalt oder Informationen zu Typ und Größe für Repository-Objekte "
 "bereitstellen"
 
-#: command-list.h:61
+#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "gitattributes Informationen darstellen"
 
-#: command-list.h:62
+#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Fehlersuche in gitignore / exclude Dateien"
 
-#: command-list.h:63
+#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Name und E-Mail-Adresse von Kontakten anzeigen"
 
-#: command-list.h:64
+#: command-list.h:65
 msgid "Switch branches or restore working tree files"
 msgstr "Branches wechseln oder Dateien im Arbeitsverzeichnis wiederherstellen"
 
-#: command-list.h:65
+#: command-list.h:66
 msgid "Copy files from the index to the working tree"
 msgstr "Dateien von dem Index ins Arbeitsverzeichnis kopieren"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Ensures that a reference name is well formed"
 msgstr "Sicherstellen, dass ein Referenzname wohlgeformt ist"
 
-#: command-list.h:67
+#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr ""
 "Commits finden, die noch auf dem Upstream-Branch angewendet werden müssen"
 
-#: command-list.h:68
+#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Änderungen eines existierenden Commits anwenden"
 
-#: command-list.h:69
+#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "grafische Alternative zu git-commit"
 
-#: command-list.h:70
+#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "unversionierte Dateien vom Arbeitsverzeichnis entfernen"
 
-#: command-list.h:71
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "ein Repository in einem neuen Verzeichnis klonen"
 
-#: command-list.h:72
+#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Daten in Spalten anzeigen"
 
-#: command-list.h:73
+#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Änderungen in das Repository eintragen"
 
-#: command-list.h:74
+#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Git Commit-Graph-Dateien schreiben und überprüfen"
 
-#: command-list.h:75
+#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "ein neues Commit-Objekt erstellen"
 
-#: command-list.h:76
+#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "repositoryweite oder globale Optionen lesen oder setzen"
 
-#: command-list.h:77
+#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Anzahl und Speicherverbrauch ungepackter Objekte zählen"
 
-#: command-list.h:78
+#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Zugangsdaten des Benutzers empfangen und speichern"
 
-#: command-list.h:79
+#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr ""
 "Hilfsprogramm zum temporären Speichern von Zugangsdaten im Hauptspeicher"
 
-#: command-list.h:80
+#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Hilfsprogramm zum Speichern von Zugangsdaten auf der Festplatte"
 
-#: command-list.h:81
+#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "einzelnen Commit zu einem ausgecheckten CSV-Repository exportieren"
 
-#: command-list.h:82
+#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Ihre Daten aus einem anderen SCM übernehmen"
 
-#: command-list.h:83
+#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "ein CSV Server Emulator für Git"
 
-#: command-list.h:84
+#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "ein wirklich einfacher Server für Git Repositories"
 
-#: command-list.h:85
+#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "einem Objekt einen für Menschen lesbaren Namen basierend auf\n"
 "einer verfügbaren Referenz geben"
 
-#: command-list.h:86
+#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 "Änderungen zwischen Commits, Commit und Arbeitsverzeichnis, etc. anzeigen"
 
-#: command-list.h:87
+#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Dateien von dem Arbeitsverzeichnis und dem Index vergleichen"
 
-#: command-list.h:88
+#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "ein Verzeichnis von dem Arbeitsverzeichnis und dem Index vergleichen"
 
-#: command-list.h:89
+#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 "den Inhalt und Modus von Blobs aus zwei Verzeichnisobjekten vergleichen"
 
-#: command-list.h:90
+#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Änderungen mittels den allgemeinen Diff-Tools anzeigen"
 
-#: command-list.h:91
+#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Export Tool für Git Daten"
 
-#: command-list.h:92
+#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Backend für schnelle Git Daten Import Tools"
 
-#: command-list.h:93
+#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Objekte und Referenzen von einem anderen Repository herunterladen"
 
-#: command-list.h:94
+#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "fehlende Objekte von einem anderen Repository empfangen"
 
-#: command-list.h:95
+#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Branches umschreiben"
 
-#: command-list.h:96
+#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Beschreibung eines Merge-Commits erzeugen"
 
-#: command-list.h:97
+#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Informationen für jede Referenz ausgeben"
 
-#: command-list.h:98
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "Einen Git-Befehl für mehrere Repositories ausführen"
+
+#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Patches für E-Mail-Versand vorbereiten"
 
-#: command-list.h:99
+#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 "stellt die Verbundenheit und Gültigkeit der Objekte in der Datenbank sicher"
 
-#: command-list.h:100
+#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "nicht benötigte Dateien entfernen und das lokale Repository optimieren"
 
-#: command-list.h:101
+#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr ""
 "Commit-ID eines Archivs extrahieren, welches mit git-archive erstellt wurde"
 
-#: command-list.h:102
+#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Zeilen darstellen, die einem Muster entsprechen"
 
-#: command-list.h:103
+#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "eine portable grafische Schnittstelle zu Git"
 
-#: command-list.h:104
+#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr ""
 "von einer Datei die Objekt-ID berechnen und optional ein Blob erstellen"
 
-#: command-list.h:105
+#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Hilfsinformationen über Git anzeigen"
 
-#: command-list.h:106
+#: command-list.h:108
 msgid "Server side implementation of Git over HTTP"
 msgstr "serverseitige Implementierung von Git über HTTP"
 
-#: command-list.h:107
+#: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
 msgstr "von einem Remote-Git-Repository über HTTP herunterladen"
 
-#: command-list.h:108
+#: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Objekte über HTTP/DAV zu einem anderen Repository übertragen"
 
-#: command-list.h:109
+#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 "eine Sammlung von Patches von der Standard-Eingabe zu einem IMAP-Ordner "
 "senden"
 
-#: command-list.h:110
+#: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
 msgstr "Pack-Index-Datei für ein existierendes gepacktes Archiv erzeugen"
 
-#: command-list.h:111
+#: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 "ein leeres Git-Repository erstellen oder ein bestehendes neuinitialisieren"
 
-#: command-list.h:112
+#: command-list.h:114
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Ihr aktuelles Repository sofort in gitweb betrachten"
 
-#: command-list.h:113
+#: command-list.h:115
 msgid "Add or parse structured information in commit messages"
 msgstr ""
 "Strukturierte Informationen in Commit-Beschreibungen hinzufügen oder parsen"
 
-#: command-list.h:114
+#: command-list.h:116
 msgid "The Git repository browser"
 msgstr "der Git-Repository-Browser"
 
-#: command-list.h:115
+#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Commit-Historie anzeigen"
 
-#: command-list.h:116
+#: command-list.h:118
 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:117
+#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Referenzen in einem Remote-Repository auflisten"
 
-#: command-list.h:118
+#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Inhalte eines Tree-Objektes auflisten"
 
-#: command-list.h:119
+#: command-list.h:121
 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:120
+#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "einfaches UNIX mbox Splitter-Programm"
 
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Aufgaben ausführen, um Git-Repository-Daten zu optimieren"
+
+#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "zwei oder mehr Entwicklungszweige zusammenführen"
 
-#: command-list.h:122
+#: command-list.h:125
 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:123
+#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "einen 3-Wege-Datei-Merge ausführen"
 
-#: command-list.h:124
+#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "einen Merge für zusammenzuführende Dateien ausführen"
 
-#: command-list.h:125
+#: command-list.h:128
 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:126
+#: 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:127
+#: 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:128
+#: command-list.h:131
 msgid "Write and verify multi-pack-indexes"
 msgstr "multi-pack-indexes schreiben und überprüfen"
 
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "ein Tag-Objekt erstellen"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Erstellt ein Tag-Objekt mit zusätzlicher Validierung"
 
-#: command-list.h:130
+#: command-list.h:133
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Tree-Objekt aus ls-tree formattiertem Text erzeugen"
 
-#: command-list.h:131
+#: command-list.h:134
 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:132
+#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "symbolische Namen für die gegebenen Commits finden"
 
-#: command-list.h:133
+#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Objekt-Notizen hinzufügen oder überprüfen"
 
-#: command-list.h:134
+#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "von Perforce Repositories importieren und nach diese senden"
 
-#: command-list.h:135
+#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "ein gepacktes Archiv von Objekten erstellen"
 
-#: command-list.h:136
+#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "redundante Paketdateien finden"
 
-#: command-list.h:137
+#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Branches und Tags für effizienten Zugriff auf das Repository packen"
 
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr ""
-"Routinen als Hilfe zum Parsen von Zugriffsparametern von Remote-Repositories"
-
-#: command-list.h:139
+#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "eindeutige ID für einen Patch berechnen"
 
-#: command-list.h:140
+#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "alle nicht erreichbaren Objekte von der Objektdatenbank entfernen"
 
-#: command-list.h:141
+#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr ""
 "zusätzliche Objekte, die sich bereits in Paketdateien befinden, entfernen"
 
-#: command-list.h:142
+#: command-list.h:144
 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:143
+#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Remote-Referenzen mitsamt den verbundenen Objekten aktualisieren"
 
-#: command-list.h:144
+#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Patches aus quilt auf aktuellen Branch anwenden"
 
-#: command-list.h:145
+#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "zwei Commit-Bereiche vergleichen (zwei Versionen eines Branches)"
 
-#: command-list.h:146
+#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Verzeichnisinformationen in den Index einlesen"
 
-#: command-list.h:147
+#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Wiederholtes Anwenden von Commits auf anderem Basis-Commit"
 
-#: command-list.h:148
+#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Empfangen was in das Repository übertragen wurde"
 
-#: command-list.h:149
+#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Reflog Informationen verwalten"
 
-#: command-list.h:150
+#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Menge von hinterlegten Repositories verwalten"
 
-#: command-list.h:151
+#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "ungepackte Objekte in einem Repository packen"
 
-#: command-list.h:152
+#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Referenzen für ersetzende Objekte erstellen, auflisten, löschen"
 
-#: command-list.h:153
+#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "eine Übersicht über ausstehende Änderungen generieren"
 
-#: command-list.h:154
+#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "aufgezeichnete Auflösung von Merge-Konflikten wiederverwenden"
 
-#: command-list.h:155
+#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "aktuellen HEAD zu einem spezifizierten Zustand setzen"
 
-#: command-list.h:156
+#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Dateien im Arbeitsverzeichnis wiederherstellen"
 
-#: command-list.h:157
+#: command-list.h:159
 msgid "Revert some existing commits"
 msgstr "einige bestehende Commits rückgängig machen"
 
-#: command-list.h:158
+#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Commit-Objekte in umgekehrter chronologischer Ordnung auflisten"
 
-#: command-list.h:159
+#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "Parameter herauspicken und ändern"
 
-#: command-list.h:160
+#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "Dateien im Arbeitsverzeichnis und vom Index löschen"
 
-#: command-list.h:161
+#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "eine Sammlung von Patches als E-Mails versenden"
 
-#: command-list.h:162
+#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Objekte über das Git Protokoll zu einem anderen Repository übertragen"
 
-#: command-list.h:163
+#: command-list.h:165
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Login-Shell beschränkt für Nur-Git SSH-Zugriff"
 
-#: command-list.h:164
+#: command-list.h:166
 msgid "Summarize 'git log' output"
 msgstr "Ausgabe von 'git log' zusammenfassen"
 
-#: command-list.h:165
+#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "verschiedene Arten von Objekten anzeigen"
 
-#: command-list.h:166
+#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "Branches und ihre Commits ausgeben"
 
-#: command-list.h:167
+#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "gepackten Archiv-Index anzeigen"
 
-#: command-list.h:168
+#: command-list.h:170
 msgid "List references in a local repository"
 msgstr "Referenzen in einem lokales Repository auflisten"
 
-#: command-list.h:169
+#: command-list.h:171
 msgid "Git's i18n setup code for shell scripts"
-msgstr "Git's i18n-Konfigurationscode für Shell-Skripte"
+msgstr "Gits i18n-Konfigurationscode für Shell-Skripte"
 
-#: command-list.h:170
+#: command-list.h:172
 msgid "Common Git shell script setup code"
 msgstr "allgemeiner Git Shell-Skript Konfigurationscode"
 
-#: command-list.h:171
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Initialisiere und verändere den partiellen Checkout"
+
+#: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Änderungen in einem Arbeitsverzeichnis aufbewahren"
 
-#: command-list.h:172
+#: command-list.h:175
 msgid "Add file contents to the staging area"
 msgstr "Dateiinhalte der Staging-Area hinzufügen"
 
-#: command-list.h:173
+#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "den Zustand des Arbeitsverzeichnisses anzeigen"
 
-#: command-list.h:174
+#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "nicht erforderlichen Whitespace entfernen"
 
-#: command-list.h:175
+#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Submodule initialisieren, aktualisieren oder inspizieren"
 
-#: command-list.h:176
+#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 "Bidirektionale Operationen zwischen einem Subversion Repository und Git"
 
-#: command-list.h:177
+#: command-list.h:180
 msgid "Switch branches"
 msgstr "Branches wechseln"
 
-#: command-list.h:178
+#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "symbolische Referenzen lesen, ändern und löschen"
 
-#: command-list.h:179
+#: command-list.h:182
 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:180
+#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "eine temporäre Datei mit den Inhalten eines Blobs erstellen"
 
-#: command-list.h:181
+#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Objekte von einem gepackten Archiv entpacken"
 
-#: command-list.h:182
+#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Dateiinhalte aus dem Arbeitsverzeichnis im Index registrieren"
 
-#: command-list.h:183
+#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "den Objektnamen, der in einer Referenz gespeichert ist, sicher aktualisieren"
 
-#: command-list.h:184
+#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Hilfsinformationsdatei zur Hilfe von einfachen Servern aktualisieren"
 
-#: command-list.h:185
+#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Archiv zurück zu git-archive senden"
 
-#: command-list.h:186
+#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Objekte gepackt zurück an git-fetch-pack senden"
 
-#: command-list.h:187
+#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "eine logische Variable von Git anzeigen"
 
-#: command-list.h:188
+#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "die GPG-Signatur von Commits prüfen"
 
-#: command-list.h:189
+#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "gepackte Git-Archivdateien validieren"
 
-#: command-list.h:190
+#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "die GPG-Signatur von Tags prüfen"
 
-#: command-list.h:191
+#: 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:192
+#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr "Logs mit dem Unterschied, den jeder Commit einführt, anzeigen"
 
-#: command-list.h:193
+#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "mehrere Arbeitsverzeichnisse verwalten"
 
-#: command-list.h:194
+#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "Tree-Objekt vom aktuellen Index erstellen"
 
-#: command-list.h:195
+#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "Definition von Attributen pro Pfad"
 
-#: command-list.h:196
+#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Git Kommandozeilenschnittstelle und Konventionen"
 
-#: command-list.h:197
+#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "eine Git Anleitung für Entwickler"
 
-#: command-list.h:198
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Bereitstellung von Benutzernamen und Passwörtern für Git"
+
+#: command-list.h:202
 msgid "Git for CVS users"
 msgstr "Git für CVS Benutzer"
 
-#: command-list.h:199
+#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "Diff-Ausgabe optimieren"
 
-#: command-list.h:200
+#: command-list.h:204
 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:201
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Häufig gestellte Fragen über die Nutzung von Git"
+
+#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "ein Git-Glossar"
 
-#: command-list.h:202
+#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "von Git verwendete Hooks"
 
-#: command-list.h:203
+#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
 
-#: command-list.h:204
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "Autor/Commit-Ersteller und/oder E-Mail-Adressen zuordnen"
+
+#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Definition von Submodul-Eigenschaften"
 
-#: command-list.h:205
+#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Git Namensbereiche"
 
-#: command-list.h:206
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Hilfsprogramme zur Interaktion mit Remote-Repositories"
+
+#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Git Repository Aufbau"
 
-#: command-list.h:207
+#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spezifikation von Commits und Bereichen für Git"
 
-#: command-list.h:208
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "Einbinden eines Repositories in ein anderes"
+
+#: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "eine einführende Anleitung zu Git: Teil zwei"
 
-#: command-list.h:209
+#: command-list.h:217
 msgid "A tutorial introduction to Git"
 msgstr "eine einführende Anleitung zu Git"
 
-#: command-list.h:210
+#: command-list.h:218
 msgid "An overview of recommended workflows with Git"
 msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
 
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Sie müssen mit \"git bisect start\" beginnen."
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Wollen Sie, dass ich es für Sie mache [Y/n]? "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Ungültige Referenz-Eingabe: $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Ungültige Referenz-Eingabe: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Ungültige Referenz-Eingabe: $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' kann nur ein Argument entgegennehmen."
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "Keine Log-Datei gegeben"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "kann $file nicht für das Abspielen lesen"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? Was reden Sie da?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
 msgid "bisect run failed: no command provided."
 msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
 
-#: git-bisect.sh:246
+#: git-bisect.sh:73
 #, sh-format
 msgid "running $command"
 msgstr "führe $command aus"
 
-#: git-bisect.sh:253
+#: git-bisect.sh:80
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -22542,27 +25769,23 @@ msgstr ""
 "'bisect run' fehlgeschlagen:\n"
 "Exit-Code $res von '$command' ist < 0 oder >= 128"
 
-#: git-bisect.sh:279
+#: git-bisect.sh:105
 msgid "bisect run cannot continue any more"
 msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
 
-#: git-bisect.sh:285
+#: git-bisect.sh:111
 #, sh-format
 msgid ""
 "bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
 msgstr ""
 "'bisect run' fehlgeschlagen:\n"
-"'bisect_state $state' wurde mit Fehlerwert $res beendet"
+"'bisect-state $state' wurde mit Fehlerwert $res beendet"
 
-#: git-bisect.sh:292
+#: git-bisect.sh:118
 msgid "bisect run success"
 msgstr "'bisect run' erfolgreich ausgeführt"
 
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "keine binäre Suche im Gange"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -22578,7 +25801,7 @@ msgstr "Automatischer Merge hat nicht funktioniert."
 
 #: git-merge-octopus.sh:62
 msgid "Should not be doing an octopus."
-msgstr "Sollte keinen Octopus-Merge ausführen."
+msgstr "Sollte keinen Oktopus-Merge ausführen."
 
 #: git-merge-octopus.sh:73
 #, sh-format
@@ -22604,192 +25827,53 @@ 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-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Kann temporären Index nicht löschen (kann nicht passieren)"
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "Fehler: unbekannte Option für 'stash push': $option"
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg"
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "unbekannte Option: $opt"
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Zu viele Commits angegeben: $REV"
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference ist keine gültige Referenz"
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' ist kein \"stash\"-artiger Commit"
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' ist keine \"stash\"-Referenz"
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr "Konnte den Index nicht aktualisieren."
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Kann \"stash\" nicht anwenden, solange ein Merge im Gange ist"
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr "Konnte Index-Verzeichnis nicht speichern"
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr ""
-"Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen."
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "${REV} ($s) gelöscht"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
-
-#: git-submodule.sh:200
+#: 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:210
+#: 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:229
+#: 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:232
+#: 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:239
+#: 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:245
-#, 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 ""
-"Der folgende Pfad wird durch eine Ihrer \".gitignore\" Dateien ignoriert:\n"
-"$sm_path\n"
-"Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten."
-
-#: git-submodule.sh:268
-#, 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:270
-#, 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:278
-#, 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:280
-#, 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:286
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "Reaktiviere lokales Git-Verzeichnis für Submodul '$sm_name'."
-
-#: git-submodule.sh:298
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Kann Submodul '$sm_path' nicht auschecken"
-
-#: git-submodule.sh:303
+#: git-submodule.sh:248
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Hinzufügen von Submodul '$sm_path' fehlgeschlagen"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:257
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Fehler beim Eintragen von Submodul '$sm_path' in die Konfiguration."
 
-#: git-submodule.sh:573
+#: git-submodule.sh:532
 #, 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:583
+#: git-submodule.sh:542
 #, 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:588
+#: git-submodule.sh:547
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22798,7 +25882,7 @@ msgstr ""
 "Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
 "'$sm_path' nicht finden."
 
-#: git-submodule.sh:606
+#: git-submodule.sh:565
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22807,7 +25891,7 @@ msgstr ""
 "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen. Versuche "
 "$sha1 direkt anzufordern:"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:571
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22816,84 +25900,53 @@ msgstr ""
 "\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
 "enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:578
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
 
-#: git-submodule.sh:620
+#: git-submodule.sh:579
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:583
 #, 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:625
+#: git-submodule.sh:584
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:589
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:590
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:595
 #, 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:637
+#: git-submodule.sh:596
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:627
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr ""
-"Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "unerwarteter Modus $mod_dst"
-
-#: git-submodule.sh:902
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_src"
-
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr "  Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
-
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr ""
-"  Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Siehe git-${cmd}(1) für weitere Details."
-
 #: git-rebase--preserve-merges.sh:109
 msgid "Applied autostash."
 msgstr "Automatischen Stash angewendet."
@@ -22903,12 +25956,22 @@ msgstr "Automatischen Stash angewendet."
 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:207
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -22950,7 +26013,7 @@ msgstr ""
 "Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
 "ausgeführt.\n"
 
-#: git-rebase--preserve-merges.sh:270
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -22969,83 +26032,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:295
+#: 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:334
+#: git-rebase--preserve-merges.sh:324
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Ungültiger Commit-Name: $sha1"
 
-#: git-rebase--preserve-merges.sh:364
+#: 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:415
+#: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Spule vor zu $sha1"
 
-#: git-rebase--preserve-merges.sh:417
+#: 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:426
+#: 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:431
+#: 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:449
+#: 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:458
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Konnte $sha1 nicht picken"
 
-#: git-rebase--preserve-merges.sh:467
+#: 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:472
+#: 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:483
+#: 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:492
+#: git-rebase--preserve-merges.sh:482
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Kann $fixup_msg nicht schreiben"
 
-#: git-rebase--preserve-merges.sh:495
+#: 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:536 git-rebase--preserve-merges.sh:579
-#: git-rebase--preserve-merges.sh:582
+#: 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:611
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -23062,31 +26125,31 @@ msgstr ""
 "sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
 "können."
 
-#: git-rebase--preserve-merges.sh:626
+#: 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:641
+#: 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:683
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Führe aus: $rest"
 
-#: git-rebase--preserve-merges.sh:691
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Ausführung fehlgeschlagen: $rest"
 
-#: git-rebase--preserve-merges.sh:693
+#: 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:695
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -23099,7 +26162,7 @@ msgstr ""
 "ausführen."
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:708
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -23115,25 +26178,25 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:719
+#: 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:720
+#: 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:755
+#: 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:812
+#: 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:817
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -23165,13 +26228,13 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--preserve-merges.sh:834
+#: 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:839
+#: 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."
@@ -23181,40 +26244,44 @@ msgstr ""
 "erneut\n"
 "aus."
 
-#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
+#: 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:879 git-rebase--preserve-merges.sh:965
+#: 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:900
+#: 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:907
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr "Kein HEAD?"
 
-#: git-rebase--preserve-merges.sh:908
+#: 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:911
+#: git-rebase--preserve-merges.sh:901
 msgid "Could not mark as interactive"
 msgstr "Konnte nicht als interaktiven Rebase markieren."
 
-#: git-rebase--preserve-merges.sh:943
+#: 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:997 git-rebase--preserve-merges.sh:1002
+#: 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."
 
@@ -23296,52 +26363,11 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Konnte absoluten Pfad des Git-Verzeichnisses nicht bestimmen."
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%28s %25s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "zur Staging-Area hinzugefügt"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "aus Staging-Area entfernt"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "Binär"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "Nichts"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "unverändert"
-
-#: git-add--interactive.perl:623
-#, 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"
-
-#: git-add--interactive.perl:626
-#, 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"
-
-#: git-add--interactive.perl:629
-#, 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"
-
 #: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
@@ -23349,87 +26375,55 @@ msgid_plural "touched %d paths\n"
 msgstr[0] "%d Pfad angefasst\n"
 msgstr[1] "%d Pfade angefasst\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Aktualisieren"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Revert"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "Hinweis: %s ist nun unversioniert.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "unversionierte Dateien hinzufügen"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Keine unversionierten Dateien.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-"Block\n"
-"direkt als zum Hinzufügen zur Staging-Area markiert."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
+"Patch-Block direkt zum Hinzufügen zur Staging-Area markiert."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-"Block\n"
-"direkt als zum Hinzufügen zum Stash markiert."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
+"Patch-Block direkt zum Hinzufügen zum Stash markiert."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-"Block\n"
-"direkt als zum Entfernen aus der Staging-Area markiert."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
+"Patch-Block direkt zum Entfernen aus der Staging-Area markiert."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: 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."
 msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-"Block\n"
-"direkt als zum Anwenden markiert."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
+"Patch-Block direkt zum Anwenden markiert."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: 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."
 msgstr ""
-"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete Patch-"
-"Block\n"
-"direkt als zum Verwerfen markiert."
+"Wenn der Patch sauber angewendet werden kann, wird der bearbeitete\n"
+"Patch-Block direkt zum Verwerfen markiert."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Schreiben: %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-"Manueller Editiermodus für Patch-Blöcke -- siehe nach unten für eine\n"
-"Kurzanleitung.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -23442,37 +26436,12 @@ msgstr ""
 "Um '%s' Zeilen zu entfernen, löschen Sie diese.\n"
 "Zeilen, die mit %s beginnen, werden entfernt.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-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 ""
-"Wenn das nicht sauber angewendet werden kann, haben Sie die Möglichkeit\n"
-"einer erneuten Bearbeitung. Wenn alle Zeilen des Patch-Blocks entfernt "
-"werden,\n"
-"wird die Bearbeitung abgebrochen und der Patch-Block bleibt unverändert.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "Fehler beim Öffnen von Editier-Datei eines Patch-Blocks zum Lesen: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Ihr bearbeiteter Patch-Block kann nicht angewendet werden.\n"
-"Erneut bearbeiten? (\"n\" verwirft Bearbeitung!) [y/n]?"
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -23488,7 +26457,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke in dieser Datei nicht zum Commit "
 "vormerken"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -23502,7 +26471,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:1258
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -23516,7 +26485,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:1264
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23533,7 +26502,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht auf den Index "
 "anwenden"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23550,7 +26519,7 @@ msgstr ""
 "d - diesen oder alle weiteren Patch-Blöcke dieser Datei nicht im "
 "Arbeitsverzeichnis verwerfen"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23565,7 +26534,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:1282
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23579,7 +26548,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:1294
+#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23593,7 +26562,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:1309
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23617,234 +26586,92 @@ msgstr ""
 "e - aktuellen Patch-Block manuell editieren\n"
 "? - Hilfe anzeigen\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1345
 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:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Trotzdem auf Arbeitsverzeichnis anwenden? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "Nichts angewendet.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignoriere nicht zusammengeführte Datei: %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Nur Binärdateien geändert.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Keine Änderungen.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Patch Aktualisierung"
-
-#: git-add--interactive.perl:1426
-#, 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,?]? "
-
-#: git-add--interactive.perl:1427
-#, 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,?]? "
-
-#: git-add--interactive.perl:1428
-#, 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,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Modusänderung stashen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Löschung stashen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Diesen Patch-Block stashen [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, 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,?]? "
-
-#: git-add--interactive.perl:1437
-#, 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,?]? "
-
-#: git-add--interactive.perl:1438
-#, 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,?]? "
-
-#: git-add--interactive.perl:1441
-#, 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,?]? "
-
-#: git-add--interactive.perl:1442
-#, 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,?]? "
-
-#: git-add--interactive.perl:1443
-#, 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,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, 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,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, 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,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, 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,?]? "
-
-#: git-add--interactive.perl:1451
-#, 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,?]? "
-
-#: git-add--interactive.perl:1452
-#, 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,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Diesen Patch-Block vom Index und Arbeitsverzeichnis verwerfen [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, 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,?]? "
-
-#: git-add--interactive.perl:1457
-#, 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,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Diesen Patch-Block auf Index und Arbeitsverzeichnis anwenden [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1479
 #, 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:1467
+#: git-add--interactive.perl:1480
 #, 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:1468
+#: git-add--interactive.perl:1481
+#, 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
 #, 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:1568
+#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
 msgstr "Keine anderen Patch-Blöcke verbleibend\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "zu welchem Patch-Block springen (<Enter> für mehr Informationen)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "zu welchem Patch-Block springen? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Ungültige Nummer: '%s'\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1622
 #, 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:1617
+#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
 msgstr "Keine anderen Patch-Blöcke zum Durchsuchen\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "Suche nach regulärem Ausdruck? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Fehlerhafter regulärer Ausdruck für Suche %s: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
 msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr "Kein vorheriger Patch-Block\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr "Kein folgender Patch-Block\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht aufteilen.\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1736
 #, 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:1706
+#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Entschuldigung, kann diesen Patch-Block nicht bearbeiten.\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Diff überprüfen"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23863,58 +26690,75 @@ msgstr ""
 "diff          - Unterschiede zwischen HEAD und Index anzeigen\n"
 "add untracked - Inhalte von unversionierten Dateien zum Commit vormerken\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: 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
 msgid "missing --"
 msgstr "-- fehlt"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "Unbekannter --patch Modus: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "ungültiges Argument %s, erwarte --"
 
-#: git-send-email.perl:138
+#: git-send-email.perl:129
 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:136 git-send-email.perl:142
 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:223 git-send-email.perl:229
+#: git-send-email.perl:214
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "fatal: Befehl '%s' mit Exit-Code %d beendet"
+
+#: git-send-email.perl:227
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "Der Editor wurde unsauber beendet, breche alles ab."
 
-#: git-send-email.perl:310
+#: git-send-email.perl:316
 #, 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:315
+#: git-send-email.perl:321
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' enthält die verfasste E-Mail.\n"
 
-#: git-send-email.perl:408
+#: git-send-email.perl:450
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
 
-#: git-send-email.perl:481 git-send-email.perl:683
+#: 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: Konfigurations-Optionen für 'sendmail' gefunden\n"
+"git-send-email wird über die Optionen sendemail.* konfiguriert - beachten "
+"Sie das 'e'.\n"
+"Setzen Sie sendemail.forbidSendmailVariables auf 'false', um diese Prüfung "
+"zu deaktivieren.\n"
+
+#: git-send-email.perl:530 git-send-email.perl:746
 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:484
+#: git-send-email.perl:533
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -23923,38 +26767,38 @@ msgstr ""
 "Kommandozeile\n"
 "oder Konfigurationsoption)\n"
 
-#: git-send-email.perl:497
+#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
 
-#: git-send-email.perl:528
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Unbekannte --confirm Einstellung: '%s'\n"
 
-#: git-send-email.perl:556
+#: git-send-email.perl:617
 #, 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:558
+#: git-send-email.perl:619
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
 
-#: git-send-email.perl:560
+#: git-send-email.perl:621
 #, 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:565
+#: git-send-email.perl:626
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
 
-#: git-send-email.perl:649
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -23969,43 +26813,34 @@ msgstr ""
 "\n"
 "    * \"./%s\" angeben, wenn Sie eine Datei meinen, oder\n"
 "    * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
-"meinen\n"
+"meinen.\n"
 
-#: git-send-email.perl:670
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:694
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"fatal: %s: %s\n"
-"Warnung: Es wurden keine Patches versendet.\n"
-
-#: git-send-email.perl:705
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 "\n"
-"keine Patch-Dateien angegeben!\n"
+"Keine Patch-Dateien angegeben!\n"
 "\n"
 
-#: git-send-email.perl:718
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Keine Betreffzeile in %s?"
 
-#: git-send-email.perl:728
+#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -24020,27 +26855,27 @@ msgstr ""
 "Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
 "möchten.\n"
 
-#: git-send-email.perl:763
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Fehler beim Öffnen von %s: %s"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Fehler beim Öffnen von %s.final: %s"
 
-#: git-send-email.perl:823
+#: git-send-email.perl:886
 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:858
+#: git-send-email.perl:935
 #, 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:913
+#: git-send-email.perl:990
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -24048,11 +26883,11 @@ msgstr ""
 "Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
 "Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:918
+#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
 
-#: git-send-email.perl:926
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -24066,22 +26901,22 @@ msgstr ""
 "an,\n"
 "wenn Sie den Patch wirklich versenden wollen.\n"
 
-#: git-send-email.perl:945
+#: git-send-email.perl:1022
 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:963
+#: git-send-email.perl:1040
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
 
-#: git-send-email.perl:975
+#: git-send-email.perl:1052
 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:1033 git-send-email.perl:1041
+#: git-send-email.perl:1114 git-send-email.perl:1122
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
@@ -24089,18 +26924,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:1045
+#: git-send-email.perl:1126
 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:1362
+#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA Pfad \"%s\" existiert nicht"
 
-#: git-send-email.perl:1445
+#: 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"
@@ -24129,270 +26964,148 @@ 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:1460
+#: git-send-email.perl:1544
 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:1463
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich."
 
-#: git-send-email.perl:1491
+#: git-send-email.perl:1581
 msgid "The required SMTP server is not properly defined."
 msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
 
-#: git-send-email.perl:1538
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Server unterstützt kein STARTTLS! %s"
 
-#: git-send-email.perl:1543 git-send-email.perl:1547
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS fehlgeschlagen! %s"
 
-#: git-send-email.perl:1556
+#: git-send-email.perl:1646
 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:1574
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Fehler beim Senden %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Probeversand %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s gesendet\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "Probeversand OK. Log enthält:\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK. Log enthält:\n"
 
-#: git-send-email.perl:1591
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Ergebnis: "
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Ergebnis: OK\n"
 
-#: git-send-email.perl:1612
+#: git-send-email.perl:1709
 #, perl-format
 msgid "can't open file %s"
 msgstr "Kann Datei %s nicht öffnen"
 
-#: git-send-email.perl:1659 git-send-email.perl:1679
+#: git-send-email.perl:1756 git-send-email.perl:1776
 #, 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:1665
+#: git-send-email.perl:1762
 #, 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:1718
+#: git-send-email.perl:1819
 #, 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:1753
+#: git-send-email.perl:1854
 #, 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:1864
+#: git-send-email.perl:1965
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Konnte '%s' nicht ausführen"
 
-#: git-send-email.perl:1871
+#: git-send-email.perl:1972
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
 
-#: git-send-email.perl:1875
+#: git-send-email.perl:1976
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
 
-#: git-send-email.perl:1905
+#: git-send-email.perl:2006
 msgid "cannot send message as 7bit"
 msgstr "Kann Nachricht nicht als 7bit versenden."
 
-#: git-send-email.perl:1913
+#: git-send-email.perl:2014
 msgid "invalid transfer encoding"
 msgstr "Ungültiges Transfer-Encoding"
 
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: 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: zurückgewiesen durch 'sendemail-validate' Hook\n"
+"%s\n"
+"Warnung: Es wurden keine Patches gesendet\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 "konnte %s nicht öffnen: %s\n"
 
-#: git-send-email.perl:1957
+#: git-send-email.perl:2064
 #, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s: Patch enthält eine Zeile, die länger als 998 Zeichen ist"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal: %s:%d ist länger als 998 Zeichen\n"
+"Warnung: Es wurden keine Patches gesendet\n"
 
-#: git-send-email.perl:1974
+#: git-send-email.perl:2082
 #, 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:1978
+#: git-send-email.perl:2086
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
-
-#~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-#~ msgstr ""
-#~ "Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'"
-
-#~ msgid "cannot change partial clone promisor remote"
-#~ msgstr "Kann Remote-Repository für partielles Klonen nicht ändern."
-
-#~ msgid "error building trees"
-#~ msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
-
-#~ msgid "invalid date format '%s' in '%s'"
-#~ msgstr "Ungültiges Datumsformat '%s' in '%s'"
-
-#~ msgid "writing root commit"
-#~ msgstr "Root-Commit schreiben"
-
-#~ msgid "staged changes in the following files may be lost: %s"
-#~ msgstr ""
-#~ "Zum Commit vorgemerkte Änderungen in den folgenden Dateien gehen "
-#~ "eventuell verloren: %s"
-
-#~ msgid ""
-#~ "--filter can only be used with the remote configured in extensions."
-#~ "partialClone"
-#~ msgstr ""
-#~ "--filter kann nur mit den Remote-Repositories verwendet werden,\n"
-#~ "die in core.partialClone konfiguriert sind."
-
-#~ msgid "verify commit-msg hook"
-#~ msgstr "commit-msg Hook überprüfen"
-
-#~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr ""
-#~ "'--rebase-merges' kann nicht mit '--strategy-option' kombiniert werden."
-
-#~ msgid "invalid sparse value '%s'"
-#~ msgstr "Ungültiger \"sparse\"-Wert '%s'."
-
-#~ msgid ""
-#~ "Fetch normally indicates which branches had a forced update, but that "
-#~ "check has been disabled."
-#~ msgstr ""
-#~ "'fetch' zeigt normalerweise, welche Branches eine erzwungene "
-#~ "Aktualisierung hatten, aber diese Überprüfung wurde deaktiviert."
-
-#~ msgid ""
-#~ "or run 'git config fetch.showForcedUpdates false' to avoid this check.\n"
-#~ msgstr ""
-#~ "oder führen Sie 'git config fetch.showForcedUpdates false' aus, um diese "
-#~ "Überprüfung zu umgehen.\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' ist nicht gesetzt; der implizite Wert wird sich in einem\n"
-#~ "kommenden Release ändern. Um diese Meldung zu unterdrücken und das "
-#~ "aktuelle\n"
-#~ "Verhalten beizubehalten, setzen Sie den Konfigurationswert von'log."
-#~ "mailmap' auf 'false'.\n"
-#~ "\n"
-#~ "Um diese Meldung zu unterdrücken und jetzt das neue Verhalten zu\n"
-#~ "übernehmen, setzen Sie den Konfigurationswert von 'log.mailmap' auf "
-#~ "'true'.\n"
-#~ "\n"
-#~ "Führen Sie 'git help config' aus und suchen Sie nach 'log.mailmap', um\n"
-#~ "weitere Informationen zu erhalten."
-
-#~ msgid "Server supports multi_ack_detailed"
-#~ msgstr "Server unterstützt multi_ack_detailed"
-
-#~ msgid "Server supports no-done"
-#~ msgstr "Server unterstützt no-done"
-
-#~ msgid "Server supports multi_ack"
-#~ msgstr "Server unterstützt multi_ack"
-
-#~ msgid "Server supports side-band-64k"
-#~ msgstr "Server unterstützt side-band-64k"
-
-#~ msgid "Server supports side-band"
-#~ msgstr "Server unterstützt side-band"
-
-#~ msgid "Server supports allow-tip-sha1-in-want"
-#~ msgstr "Server unterstützt allow-tip-sha1-in-want"
-
-#~ msgid "Server supports allow-reachable-sha1-in-want"
-#~ msgstr "Server unterstützt allow-reachable-sha1-in-want"
-
-#~ msgid "Server supports ofs-delta"
-#~ msgstr "Server unterstützt ofs-delta"
-
-#~ msgid "(HEAD detached at %s)"
-#~ msgstr "(HEAD losgelöst bei %s)"
-
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD losgelöst von %s)"
-
-#~ msgid "Checking out files"
-#~ msgstr "Checke Dateien aus"
-
-#~ msgid "cannot be interactive without stdin connected to a terminal."
-#~ msgstr ""
-#~ "Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
-#~ "Terminal verbunden ist."
-
-#~ msgid "failed to open '%s'"
-#~ msgstr "Fehler beim Öffnen von '%s'"
-
-#~ msgid "failed to stat %s\n"
-#~ msgstr "Konnte %s nicht lesen\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 ""
-#~ "Wenn Sie diesen Commit auslassen möchten, benutzen Sie:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
-#~ "Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
-
-#~ msgid "unrecognized verb: %s"
-#~ msgstr "Nicht erkanntes Verb: %s"
diff --git a/po/es.po b/po/es.po
index a0063f0393..d7c555eab8 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,49 +7,784 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-10-28 13:19+0800\n"
-"PO-Revision-Date: 2019-10-28 19:20-0500\n"
-"Last-Translator: christopher.diaz.riv@gmail.com\n"
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"PO-Revision-Date: 2021-08-14 11:37-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.2\n"
+"X-Generator: Poedit 3.0\n"
 
-#: advice.c:109
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "¿Ahh (%s)?"
+
+#: 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 "no se pudo leer índice"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binario"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "nada"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "sin cambios"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Actualizar"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, 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:88 sequencer.c:3707
+msgid "could not write index"
+msgstr "no se pudo escribir índice"
+
+#: add-interactive.c:706 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
+#, 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
+#, 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
+msgid "Revert"
+msgstr "Revertir"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "No se pudo analizar HEAD^{tree}"
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "No hay archivos sin rastrear.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Agregar no rastreados"
+
+#: add-interactive.c:895 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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ignorando lo no fusionado: %s"
+
+#: add-interactive.c:937 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: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
+msgid "Patch update"
+msgstr "Actualización del parche"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Revisión de diff"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "mostrar rutas con cambios"
+
+#: add-interactive.c:1012
+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
+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
+msgid "pick hunks and update selectively"
+msgstr "elegir fragmentos y actualizar de forma selectiva"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "ver diff entre HEAD e index"
+
+#: add-interactive.c:1020
+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
+msgid "Prompt help:"
+msgstr "Mostrar ayuda:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "selecciona un único objeto"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "selecciona un rango de objetos"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "selecciona múltiples rangos"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "seleccionar objeto basado en prefijo único"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "quitar objetos especificados"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "escoger todos los objetos"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(vacío) finalizar selección"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "selecciona un objeto numerado"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(vacío) selecciona nada"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Comandos ***"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Ahora qué"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "rastreado"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "no rastreado"
+
+#: 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 "ruta"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "no se pudo refrescar el índice"
+
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "Adiós.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1432
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+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 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 fragmento editado será marcado inmediatamente "
+"para el área de stage."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"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 "¿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 "¿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
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+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 "¿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 fragmento editado será marcado inmediatamente "
+"para hacer stash."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"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
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+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 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 fragmento editado será marcado inmediatamente "
+"para sacar del área de stage."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - sacar desde hunk 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\n"
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:104 git-add--interactive.perl:1450
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, c-format, perl-format
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
+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 fragmetno 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 fragmento editado será marcado "
+"inmediatamente para aplicar."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"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
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Descartar adición del árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:129 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [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 fragmento editado será marcado "
+"inmediatamente para descarte."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"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
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Descartar adición del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"¿Descartar este fragmento del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"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
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d"
+"%s,?]? "
+
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, c-format, perl-format
+msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
+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 fragmento al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"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 ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"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:343
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "no se puede analizar hunk header '%.*s'"
+
+#: 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:420
+msgid "could not parse diff"
+msgstr "no se puede analizar diff"
+
+#: add-patch.c:439
+msgid "could not parse colored diff"
+msgstr "no se pudo analizar diff a colores"
+
+#: add-patch.c:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr "falló al ejecutar '%s'"
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "salida de interactive.diffFilter no concuerda"
+
+#: add-patch.c:613
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Tu filtro tiene que mantener correspondencia de uno a uno\n"
+"entre las líneas de entrada y salida."
+
+#: add-patch.c:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"se esperaba línea de contexto #%d en\n"
+"%.*s"
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"hunks no se superponen:\n"
+"%.*s\n"
+"\tno acaba con:\n"
+"%.*s"
+
+#: 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"
+
+#: add-patch.c:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Para eliminar '%c' líneas, haga de ellas líneas  ' '  (contexto).\n"
+"Para eliminar '%c' líneas, bórrelas.\n"
+"Líneas comenzando con %c serán eliminadas.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: 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 fragmento son eliminadas, entonces\n"
+"la edición es abortada y el fragmento queda sin cambios.\n"
+
+#: add-patch.c:1133
+msgid "could not parse hunk header"
+msgstr "no se puede analizar hunk header"
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr "falló 'git apply --cached'"
+
+#. 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.
+#.
+#. 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: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:1290
+msgid "The selected hunks do not apply to the index!"
+msgstr "¡Los hunks seleccionados no aplican al índice!"
+
+#: 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:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Nada fue aplicado.\n"
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - deja este fragmento sin decidir, ver el siguiente fragmento sin decisión\n"
+"J - deja este fragmento sin decidir, ver siguiente fragmento \n"
+"k - deja este fragmento sin decidir, ver fragmento previo sin decidir\n"
+"K - deja este fragmento sin decidir, ver fragmento anterior\n"
+"g - selecciona 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:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr "No hay fragmento anterior"
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr "No hay fragmento siguiente"
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr "No hay más fragmentos a que ir"
+
+#: add-patch.c:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "¿a qué fragmento ir (<enter> para ver más)? "
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "¿a qué fragmento ir? "
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Número inválido: '%s'"
+
+#: 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 fragmento disponible."
+msgstr[1] "Lo siento, solo %d fragmentos disponibles."
+
+#: add-patch.c:1575
+msgid "No other hunks to search"
+msgstr "No hay más fragmentos para buscar"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "¿buscar para regexp? "
+
+#: 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:1613
+msgid "No hunk matches the given pattern"
+msgstr "No hay fragmentos que concuerden con el patrón entregado"
+
+#: add-patch.c:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "Perdón, no se puede dividir este pedazo"
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Cortar en %d fragmentos."
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr "Perdón, no se puede editar este pedazo"
+
+#: add-patch.c:1680
+msgid "'git apply' failed"
+msgstr "falló 'git apply'"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Desactivar este mensaje con \"git config advice.%s false\""
+
+#: advice.c:161
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sayuda: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:252
 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:164
+#: advice.c:254
 msgid "Committing is not possible because you have unmerged files."
 msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
 
-#: advice.c:166
+#: advice.c:256
 msgid "Merging is not possible because you have unmerged files."
 msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
 
-#: advice.c:168
+#: advice.c:258
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
 
-#: advice.c:170
+#: advice.c:260
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "No es posible revertir porque tienes archivos sin fusionar."
 
-#: advice.c:172
+#: advice.c:262
 #, 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:180
+#: 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."
@@ -57,23 +792,41 @@ 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:188
+#: advice.c:278
 msgid "Exiting because of an unresolved conflict."
 msgstr "Saliendo porque existe un conflicto sin resolver."
 
-#: advice.c:193 builtin/merge.c:1332
+#: advice.c:283 builtin/merge.c:1375
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
 
-#: advice.c:195
+#: advice.c:285
 msgid "Please, commit your changes before merging."
 msgstr "Por favor, realiza un commit antes de fusionar."
 
-#: advice.c:196
+#: advice.c:286
 msgid "Exiting because of unfinished merge."
 msgstr "Saliendo por una fusión inconclusa."
 
-#: advice.c:202
+#: 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 ""
+"El siguiente pathspecs no concuerda con ninguna ruta elegible, pero "
+"concuerda con\n"
+"entradas del índice fuera del checkout sparse actual:\n"
+
+#: advice.c:303
+msgid ""
+"Disable or modify the sparsity rules if you intend to update such entries."
+msgstr ""
+"Deshabilitar  o modificar las reglas de escasez si intenta actualizar dichas "
+"entradas."
+
+#: advice.c:310
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -112,7 +865,7 @@ msgstr ""
 "\n"
 "  git switch -\n"
 "\n"
-"Apaga este aviso mediante la variable de config advice.detachedHead en "
+"Desactiva este aviso poniendo la variable de config advice.detachedHead en "
 "false\n"
 "\n"
 
@@ -124,89 +877,85 @@ msgstr "cmdline termina en \\"
 msgid "unclosed quote"
 msgstr "comillas incompletas"
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "opción de espacios en blanco no reconocida '%s'"
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "opción de ignorar espacios en blanco no reconocida '%s'"
 
-#: apply.c:135
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject y --3way no se pueden utilizar juntas."
 
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached y --3way no se pueden utilizar juntas."
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
 msgstr "--3way está fuera de un repositorio"
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
 msgstr "--index está fuera de un repositorio"
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
 msgstr "--cached está fuera de un repositorio"
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "No se puede preparar una marca de tiempo para la expresión regular %s"
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec devolvió %d para la entrada: %s"
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr ""
 "no se puede encontrar el nombre del archivo en el parche en la línea %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 erróneo - se esperaba /dev/null, se encontró %s en "
-"lalínea %d"
+"git apply: git-diff erróneo - se esperaba /dev/null, se encontró %s en la "
+"línea %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 erróneo - nuevo nombre de archivo inconsistente en "
-"lalínea %d"
+"git apply: git-diff erróneo - nuevo nombre de archivo inconsistente en la "
+"línea %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 erróneo - viejo nombre de archivo inconsistente en "
-"lalínea %d"
+"git apply: git-diff erróneo - viejo nombre de archivo inconsistente en la "
+"línea %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 erróneo - se esperaba /dev/null en la línea %d"
 
-#: apply.c:963
+#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "modo inválido en la línea %d: %s"
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "header inconsistente en las líneas %d y %d"
 
-#: apply.c:1372
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -215,124 +964,125 @@ msgid_plural ""
 "git diff header lacks filename information when removing %d leading pathname "
 "components (line %d)"
 msgstr[0] ""
-"al header de git diff carece de información del nombre del archivo %d cuando "
-"lo elimina de la ruta principal componente (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 de los nombres de los "
-"archivos %d cuando los eliminan de la ruta principal componentes (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:1385
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
-"el header de git diff carece de información del nombre del archivo (línea %d)"
+"la cabecera de git diff carece de información del nombre del archivo (línea "
+"%d)"
 
-#: apply.c:1481
+#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount: línea inesperada: %.*s"
 
-#: apply.c:1550
+#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragmento de parche sin header en la línea %d: %.*s"
 
-#: apply.c:1753
+#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "el nuevo archivo depende de contenidos viejos"
 
-#: apply.c:1755
+#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "el archivo eliminado todavía tiene contenido"
 
-#: apply.c:1789
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "parche corrupto en la línea %d"
 
-#: apply.c:1826
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nuevo archivo %s depende en contenidos viejos"
 
-#: apply.c:1828
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "el archivo borrado %s todavía tiene contenido"
 
-#: apply.c:1831
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** peligro: el archivo %s está vacío pero no es borrado"
 
-#: apply.c:1978
+#: apply.c:1977
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "parche binario corrupto en la línea %d: %.*s"
 
-#: apply.c:2015
+#: apply.c:2014
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "parche binario no reconocido en la línea %d"
 
-#: apply.c:2177
+#: apply.c:2176
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "parche que solo contiene basura en la línea %d"
 
-#: apply.c:2263
+#: apply.c:2262
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "no es posible leer el enlace simbólico %s"
 
-#: apply.c:2267
+#: apply.c:2266
 #, c-format
 msgid "unable to open or read %s"
 msgstr "no es posible abrir o leer %s"
 
-#: apply.c:2926
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "comienzo inválido de línea: '%c'"
 
-#: apply.c:3047
+#: 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] "Hunk #%d tuvo éxito en %d (%d línea compensada)."
 msgstr[1] "Hunk #%d tuvo éxito en %d (%d líneas compensadas)."
 
-#: apply.c:3059
+#: apply.c:3068
 #, 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:3065
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
-"mientras se busca:\n"
+"mientras se buscaba:\n"
 "%.*s"
 
-#: apply.c:3087
+#: apply.c:3096
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "data perdida en parche binario para '%s'"
 
-#: apply.c:3095
+#: apply.c:3104
 #, 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:3142
+#: apply.c:3151
 #, 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:3152
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -340,289 +1090,289 @@ msgstr ""
 "el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
 "actuales."
 
-#: apply.c:3160
+#: apply.c:3170
 #, 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:3178
+#: apply.c:3188
 #, 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:3191
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "el parche binario no aplica para '%s'"
 
-#: apply.c:3197
+#: apply.c:3208
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
-"el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se "
+"el parche binario para '%s' crea un resultado incorrecto (esperando %s, se "
 "obtuvo %s)"
 
-#: apply.c:3218
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "el parche falló: %s:%ld"
 
-#: apply.c:3341
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
 msgstr "no se puede hacer checkout a %s"
 
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
+#: 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 "no se pudo leer %s"
 
-#: apply.c:3401
+#: apply.c:3412
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "leyendo de '%s' tras un enlace simbólico"
 
-#: apply.c:3430 apply.c:3673
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "la ruta %s ha sido renombrada/suprimida"
 
-#: apply.c:3516 apply.c:3688
+#: apply.c:3527 apply.c:3702
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: no existe en el índice"
 
-#: apply.c:3525 apply.c:3696
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: no concuerda con el índice"
 
-#: apply.c:3560
-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 ""
-"el repositorio carece del blob necesario para regresar en un merge de tres-"
-"vías."
+"el repositorio carece del blob necesario para realizar un merge de tres vías."
 
-#: apply.c:3563
+#: apply.c:3574
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "Retrocediendo en un merge de tres-vías...\n"
+msgid "Performing three-way merge...\n"
+msgstr "Realizando un merge de tres vías...\n"
 
-#: apply.c:3579 apply.c:3583
+#: apply.c:3590 apply.c:3594
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "no se pueden leer los contenidos actuales de '%s'"
 
-#: apply.c:3595
+#: apply.c:3606
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "Falló el merge en retroceso de tres-vías...\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "Falló en realizar fusión de tres vías...\n"
 
-#: apply.c:3609
+#: apply.c:3620
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Parche aplicado a '%s' con conflictos.\n"
 
-#: apply.c:3614
+#: apply.c:3625
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Parche aplicado a '%s' limpiamente\n"
 
-#: apply.c:3640
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Retrocediendo a la aplicación...\n"
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr "parche de eliminación deja contenidos en el archivo"
 
-#: apply.c:3713
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo incorrecto"
 
-#: apply.c:3715
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s tiene tipo %o, se esperaba %o"
 
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: 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 "ruta inválida '%s'"
 
-#: apply.c:3924
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: ya existe en el índice"
 
-#: apply.c:3927
+#: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: ya existe en el directorio de trabajo"
 
-#: apply.c:3947
+#: apply.c:3976
 #, 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:3952
+#: apply.c:3981
 #, 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:3972
+#: apply.c:4001
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "archivo afectado '%s' está tras un enlace simbólico"
 
-#: apply.c:3976
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: el parche no aplica"
 
-#: apply.c:3991
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Revisando el parche %s..."
 
-#: apply.c:4083
+#: apply.c:4112
 #, 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:4090
+#: apply.c:4119
 #, 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:4093
+#: apply.c:4122
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "falta información sha1 o es inútil (%s)."
 
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry falló para la ruta '%s'"
-
-#: apply.c:4102
+#: apply.c:4131
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "no se pudo añadir %s al índice temporal"
 
-#: apply.c:4112
+#: apply.c:4141
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "no se pudo escribir un índice temporal para %s"
 
-#: apply.c:4250
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "no se puede eliminar %s del índice"
 
-#: apply.c:4284
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "parche corrupto para el submódulo %s"
 
-#: apply.c:4290
+#: apply.c:4319
 #, c-format
 msgid "unable to stat newly created file '%s'"
-msgstr "no es posible establecer el archivo recién creado '%s'"
+msgstr "no es posible hacer stat en el archivo recién creado '%s'"
 
-#: apply.c:4298
+#: apply.c:4327
 #, 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:4304 apply.c:4449
+#: apply.c:4333 apply.c:4478
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "no es posible agregar una entrada en el cache para %s"
 
-#: apply.c:4347
+#: apply.c:4376 builtin/bisect--helper.c:525
 #, c-format
 msgid "failed to write to '%s'"
-msgstr "falló escribir para '%s'"
+msgstr "falló escribir a '%s'"
 
-#: apply.c:4351
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
 msgstr "cerrando archivo '%s'"
 
-#: apply.c:4421
+#: apply.c:4450
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "no es posible escribir el archivo '%s' modo %o"
 
-#: apply.c:4519
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Parche %s aplicado limpiamente."
 
-#: apply.c:4527
+#: apply.c:4556
 msgid "internal error"
 msgstr "error interno"
 
-#: apply.c:4530
+#: apply.c:4559
 #, 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:4541
+#: apply.c:4570
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "truncando el nombre de archivo .rej a %.*s.rej"
 
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
 msgstr "no se puede abrir %s"
 
-#: apply.c:4563
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Hunk #%d aplicado limpiamente."
 
-#: apply.c:4567
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Hunk #%d rechazado."
 
-#: apply.c:4686
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Parche '%s' saltado."
 
-#: apply.c:4694
+#: apply.c:4733
 msgid "unrecognized input"
 msgstr "input no reconocido"
 
-#: apply.c:4714
+#: apply.c:4753
 msgid "unable to read index file"
 msgstr "no es posible leer el archivo índice"
 
-#: apply.c:4871
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "no se puede abrir el parche '%s': %s"
 
-#: apply.c:4898
+#: apply.c:4937
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
-msgstr[0] "%d error de espacios en blanco aplastado"
-msgstr[1] "%d errores de espacios en blanco aplastados"
+msgstr[0] "%d error de espacios en blanco silenciado"
+msgstr[1] "%d errores de espacios en blanco silenciados"
 
-#: apply.c:4904 apply.c:4919
+#: apply.c:4943 apply.c:4958
 #, 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:4912
+#: apply.c:4951
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -631,149 +1381,186 @@ msgstr[0] ""
 msgstr[1] ""
 "%d líneas aplicadas después de arreglar los errores de espacios en blanco."
 
-#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
 msgid "Unable to write new index file"
 msgstr "No es posible escribir el archivo índice"
 
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "ruta"
-
-#: apply.c:4956
+#: apply.c:4995
 msgid "don't apply changes matching the given path"
 msgstr "no aplicar cambios que concuerden con la ruta suministrada"
 
-#: apply.c:4959
+#: apply.c:4998
 msgid "apply changes matching the given path"
 msgstr "aplicar cambios que concuerden con la ruta suministrada"
 
-#: apply.c:4961 builtin/am.c:2206
+#: apply.c:5000 builtin/am.c:2318
 msgid "num"
 msgstr "num"
 
-#: apply.c:4962
+#: apply.c:5001
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "eliminar <num> slashes iniciales de las rutas diff tradicionales"
 
-#: apply.c:4965
+#: apply.c:5004
 msgid "ignore additions made by the patch"
 msgstr "ignorar adiciones hechas por el parche"
 
-#: apply.c:4967
+#: apply.c:5006
 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:4971
+#: apply.c:5010
 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:4973
+#: apply.c:5012
 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:4975
+#: apply.c:5014
 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:4977
+#: apply.c:5016
 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:4979
+#: apply.c:5018
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marca los nuevos archivos con `git add --intent-to-add`"
 
-#: apply.c:4981
+#: apply.c:5020
 msgid "apply a patch without touching the working tree"
 msgstr "aplicar un parche sin tocar el árbol de trabajo"
 
-#: apply.c:4983
+#: apply.c:5022
 msgid "accept a patch that touches outside the working area"
-msgstr "aceptar un parche que toca fuera del área de trabajo"
+msgstr "aceptar un parche que toque fuera del área de trabajo"
 
-#: apply.c:4986
+#: apply.c:5025
 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:4988
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "intentar merge de tres-vías si el parche no aplica"
+#: apply.c:5027
+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:4990
+#: apply.c:5029
 msgid "build a temporary index based on embedded index information"
 msgstr ""
-"construir un índice temporal basado en la información del índice incrustado"
+"construir un índice temporal basado en la información de índice incrustada"
 
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
 msgid "paths are separated with NUL character"
 msgstr "rutas están separadas con un carácter NULL"
 
-#: apply.c:4995
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
-msgstr "asegure que por lo menos <n> líneas del contexto concuerden"
+msgstr "asegurar que al menos <n> líneas del contexto concuerden"
 
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
+#: 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 "acción"
 
-#: apply.c:4997
+#: apply.c:5036
 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:5000 apply.c:5003
+#: apply.c:5039 apply.c:5042
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 "ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
 
-#: apply.c:5006
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr "aplicar el parche en reversa"
 
-#: apply.c:5008
+#: apply.c:5047
 msgid "don't expect at least one line of context"
 msgstr "no espera al menos una línea del contexto"
 
-#: apply.c:5010
+#: apply.c:5049
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
 
-#: apply.c:5012
+#: apply.c:5051
 msgid "allow overlapping hunks"
 msgstr "permitir solapamiento de hunks"
 
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 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:5015
+#: apply.c:5054
 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:5018
+#: apply.c:5057
 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:5020 builtin/am.c:2194
+#: apply.c:5059 builtin/am.c:2306
 msgid "root"
 msgstr "raíz"
 
-#: apply.c:5021
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr "anteponer <root> a todos los nombres de archivos"
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "no se puede transmitir el blob %s"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "no se puede comenzar filtro '%s'"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "incapaz de redirigir descriptor"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "filtro '%s' reportó un error"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+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 demasiada larga (%d chars, SHA1: %s): %s"
+
+#: 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)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "timestamp demasiado grande para este sistema: %<PRIuMAX>"
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<opciones>] <parte-del-árbol> [<ruta>...]"
@@ -793,183 +1580,157 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <comando>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:188
+#, c-format
+msgid "cannot read %s"
+msgstr "no se puede leer %s"
+
+#: 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 "no se pudo leer '%s'"
+
+#: 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 "ruta especificada '%s' no concordó con ninguna carpeta"
+msgstr "ruta especificada '%s' no concordó con ningún archivo"
 
-#: archive.c:396
+#: archive.c:451
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "no existe el ref: %.*s"
 
-#: archive.c:401
+#: archive.c:457
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "nombre de objeto no válido: %s"
 
-#: archive.c:414
+#: archive.c:470
 #, c-format
 msgid "not a tree object: %s"
 msgstr "no es un objeto tree: %s"
 
-#: archive.c:426
+#: archive.c:482
 msgid "current working directory is untracked"
 msgstr "directorio de trabajo actual no rastreado"
 
-#: archive.c:457
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "Archivo no encontrado: %s"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "No es un archivo regular: %s"
+
+#: archive.c:552
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:457
+#: archive.c:552
 msgid "archive format"
-msgstr "formato del archivo"
+msgstr "formato de crónica"
 
-#: archive.c:458 builtin/log.c:1581
+#: archive.c:553 builtin/log.c:1775
 msgid "prefix"
 msgstr "prefijo"
 
-#: archive.c:459
+#: archive.c:554
 msgid "prepend prefix to each pathname in the archive"
-msgstr "anteponer prefijo a cada ruta en el archivo"
-
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:186
+msgstr "anteponer prefijo a cada ruta en la 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: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 "carpeta"
+msgstr "archivo"
+
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr "incluir archivos sin seguimiento a la crónica"
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:559 builtin/archive.c:90
 msgid "write the archive to this file"
-msgstr "escribe el archivo en esta carpeta"
+msgstr "escribe la crónica en este archivo"
 
-#: archive.c:463
+#: archive.c:561
 msgid "read .gitattributes in working directory"
 msgstr "leer .gitattributes en el directorio de trabajo"
 
-#: archive.c:464
+#: archive.c:562
 msgid "report archived files on stderr"
-msgstr "reportar archivos archivados por stderr"
+msgstr "reportar archivos en la crónica por stderr"
 
-#: archive.c:465
-msgid "store only"
-msgstr "solo guardar"
+#: archive.c:564
+msgid "set compression level"
+msgstr "configurar nivel de compresión"
 
-#: archive.c:466
-msgid "compress faster"
-msgstr "comprimir más rápido"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "comprimir mejor"
-
-#: archive.c:477
+#: archive.c:567
 msgid "list supported archive formats"
-msgstr "listar los formatos de carpeta soportados"
+msgstr "listar los formatos de crónica soportados"
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: 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:480 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
-msgstr "obtener la carpeta del repositorio remoto <repo>"
+msgstr "obtener la crónica del repositorio remoto <repo>"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
 #: builtin/notes.c:498
 msgid "command"
 msgstr "comando"
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
-msgstr "ruta para el comando git-upload-archivo remoto"
+msgstr "ruta para el comando git-upload-archive remoto"
 
-#: archive.c:489
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr "Opción inesperada --remote"
 
-#: archive.c:491
+#: archive.c:581
 msgid "Option --exec can only be used together with --remote"
 msgstr "Opción --exec solo puede ser utilizada con --remote"
 
-#: archive.c:493
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr "Opción inesperada --output"
 
-#: archive.c:515
+#: archive.c:585
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "Opciones --add-file y --remote no pueden ser usadas juntas"
+
+#: archive.c:607
 #, c-format
 msgid "Unknown archive format '%s'"
-msgstr "Formato de carpeta desconocido '%s'"
+msgstr "Formato de crónica desconocido '%s'"
 
-#: archive.c:522
+#: archive.c:616
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumento no soportado para formato '%s': -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "no se puede transmitir el blob %s"
-
-#: archive-tar.c:266 archive-zip.c:363
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "modo de archivo no soportado: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr "no se puede leer %s"
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "no se puede comenzar filtro '%s'"
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "incapaz de redirigir descriptor"
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "filtro '%s' reportó un error"
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "ruta no válida UTF-8: %s"
-
-#: archive-zip.c:318
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "ruta muy larga (%d chars, SHA1: %s): %s"
-
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
-#, c-format
-msgid "deflate error (%d)"
-msgstr "error al desinflar (%d)"
-
-#: archive-zip.c:609
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "timestamp muy largo para este sistema: %<PRIuMAX>"
-
-#: attr.c:213
+#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s no es un nombre de atributo válido"
 
-#: attr.c:370
+#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s no permitido: %s:%d"
 
-#: attr.c:410
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -977,49 +1738,49 @@ msgstr ""
 "Los patrones negativos son ignorados en los atributos de git\n"
 "Usa '\\!' para comenzar literalmente con exclamación."
 
-#: bisect.c:468
+#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Revisa las comillas en el archivo '%s': %s"
 
-#: bisect.c:678
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "¡No podemos biseccionar más!\n"
 
-#: bisect.c:733
+#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "No es un nombre de commit válido %s"
 
-#: bisect.c:758
+#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr ""
-"La base de fisión %s está mal.\n"
-"Esto quiere decir que el bug ha sido arreglado entre %s y [%s].\n"
+"La base de fusión %s está mal.\n"
+"Esto quiere decir que el bug ha sido corregido entre %s y [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
 msgstr ""
-"La base de fisión %s es nueva.\n"
+"La base de fusión %s es nueva.\n"
 "Esta propiedad ha cambiado entre %s y [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:801
 #, 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:776
+#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1028,9 +1789,9 @@ msgid ""
 msgstr ""
 "Algunas %s revisiones no son ancestros de la revisión %s.\n"
 "git bisect no puede trabajar bien en este caso.\n"
-"¿Tal vez confundiste la revisión %s y %s?\n"
+"¿Tal vez confundiste las revisiones %s y %s?\n"
 
-#: bisect.c:789
+#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1038,48 +1799,49 @@ 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:822
+#: bisect.c:861
 #, 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:865
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
-msgstr "una %s revisión es necesaria"
+msgstr "una revisión %s es necesaria"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
 msgstr "no se pudo crear el archivo '%s'"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
 msgstr "no se pudo leer el archivo '%s'"
 
-#: bisect.c:958
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "falló leer las refs de bisect"
 
-#: bisect.c:977
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s fue tanto %s como %s\n"
 
-#: bisect.c:985
+#: bisect.c:1066
 #, 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 ""
 "No se encontró commit que se pueda probar.\n"
 "¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
 
-#: bisect.c:1004
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1089,47 +1851,47 @@ msgstr[1] "(aproximadamente %d pasos)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1101
 #, 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:2700
+#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents y --reverse no se mezclan bien."
 
-#: blame.c:2714
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr "no se puede usar --contents con el nombre de objeto commit final"
 
-#: blame.c:2735
+#: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse y --first-parent juntos requieren especificar el último commit"
 
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
-#: builtin/shortlog.c:192
+#: 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 "falló la configuración del camino de revisión"
+msgstr "falló la configuración del recorrido de revisiones"
 
-#: blame.c:2762
+#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent juntos requieren un rango a lo largo de la cadena "
 "del primer padre"
 
-#: blame.c:2773
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "no hay una ruta %s en %s"
 
-#: blame.c:2784
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "no se puede leer el blob %s para la ruta %s"
@@ -1144,7 +1906,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
@@ -1255,7 +2017,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
@@ -1273,434 +2035,461 @@ msgstr "Nombre de objeto ambiguo: '%s'."
 msgid "Not a valid branch point: '%s'."
 msgstr "Punto de rama no válido: '%s'."
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' ya ha sido marcado en '%s'"
 
-#: branch.c:387
+#: branch.c:389
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD del árbol de trabajo %s no está actualizada"
 
-#: bundle.c:36
+#: bundle.c:44
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algoritmo bundle hash desconocido %s"
+
+#: bundle.c:48
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "capacidad desconocida '%s'"
+
+#: bundle.c:74
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' no se ve como un archivo bundle v2"
+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:64
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "header no reconocido %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
-#: builtin/commit.c:791
+#: 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 "no se pudo abrir '%s'"
 
-#: bundle.c:143
+#: 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:146
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "se necesita un repositorio para verificar un bundle"
 
-#: bundle.c:197
+#: 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:204
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "El bundle registra una historia completa."
 
-#: bundle.c:206
+#: 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:272
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "incapaz de duplicar bundle descriptor"
 
-#: bundle.c:279
+#: 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:290
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "pack-objects murió"
 
-#: bundle.c:332
-msgid "rev-list died"
-msgstr "rev-list murió"
-
-#: bundle.c:381
+#: 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:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
+#: bundle.c:504
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "versión de bundle no soportada %d"
+
+#: 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:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argumento no reconocido: %s"
 
-#: bundle.c:468
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Rechazando crear un bundle vacío."
 
-#: bundle.c:478
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "no se puede crear '%s'"
 
-#: bundle.c:503
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack murió"
 
-#: color.c:296
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "color inválido: %.*s"
-
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "no se puede analizar %s"
-
-#: commit.c:52
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "¡%s %s no es un commit!"
-
-#: commit.c:192
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-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"
-"para convertir los grafts en refs.\n"
-"\n"
-"Apapa este mensaje ejecutando\n"
-"\"git config advice.graftFileDeprecated false\""
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
+msgstr "terminando porque el id del chunk aparece antes de lo esperado"
 
-#: commit.c:1128
+#: chunk-format.c:126
 #, 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."
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "offset para chunk incorrecto %<PRIx64> y %<PRIx64>"
 
-#: commit.c:1131
+#: chunk-format.c:133
 #, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "se encontró ID de chuck %<PRIx32> duplicado"
 
-#: commit.c:1134
+#: chunk-format.c:147
 #, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Commit %s no tiene una firma GPG."
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "chunk final tiene un id distinto de cero %<PRIx32>"
 
-#: commit.c:1137
+#: color.c:329
 #, 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"
+msgid "invalid color value: %.*s"
+msgstr "color inválido: %.*s"
 
-#: commit.c:1391
-msgid ""
-"Warning: commit message did not conform to UTF-8.\n"
-"You may want to amend it after fixing the message, or set the config\n"
-"variable i18n.commitencoding to the encoding your project uses.\n"
-msgstr ""
-"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"
-"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"
-"variable de configuración i18n.commitencoding para la codificación que usa "
-"tu proyecto.\n"
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr "versión de hash inválida"
 
-#: commit-graph.c:127
+#: 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:192
+#: commit-graph.c:355
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "firma %X en commit-graph no concuerda con firma %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:362
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "versión de commit-graph %X no concuerda con versión %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "versión de hash de commit-graph %X no concuerda con versión %X"
 
-#: commit-graph.c:229
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"falta tabla de lookup del chunk en commit-graph; el archivo puede estar "
-"incompleto"
-
-#: commit-graph.c:240
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "offset del chunk de commit-graph inapropiado %08x%08x"
-
-#: commit-graph.c:283
+#: commit-graph.c:386
 #, 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 "commit-graph file is too small to hold %u chunks"
+msgstr "commit-graph file es demasiado pequeño para almacenar %u chunks"
 
-#: commit-graph.c:347
+#: 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:357
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr "cadena commit-graph no concuerda"
 
-#: commit-graph.c:404
+#: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "cadena de commit-graph inválida: línea '%s' no es un hash"
 
-#: commit-graph.c:430
+#: commit-graph.c:564
 msgid "unable to find all commit-graph files"
 msgstr "no es posible encontrar los archivos commit-graph"
 
-#: commit-graph.c:561 commit-graph.c:621
+#: commit-graph.c:745 commit-graph.c:782
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "posición de commit inválida. commit-graph está probablemente corrupto"
 
-#: commit-graph.c:582
+#: commit-graph.c:766
 #, c-format
 msgid "could not find commit %s"
 msgstr "no se pudo encontrar commit %s"
 
-#: commit-graph.c:855 builtin/am.c:1287
+#: commit-graph.c:799
+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:1341
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "no es posible analizar el commit %s"
 
-#: commit-graph.c:859
-#, c-format
-msgid "unable to get tree for %s"
-msgstr "no se pudo obtener árbol para %s"
-
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "incapaz de obtener el tipo de objeto: %s"
 
-#: commit-graph.c:1049
+#: commit-graph.c:1368
 msgid "Loading known commits in commit graph"
 msgstr "Cargando commits conocidos en commit graph"
 
-#: commit-graph.c:1066
+#: commit-graph.c:1385
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expandiendo commits alcanzables en commit graph"
 
-#: commit-graph.c:1085
+#: commit-graph.c:1405
 msgid "Clearing commit marks in commit graph"
 msgstr "Limpiando marcas de commits en commit graph"
 
-#: commit-graph.c:1104
+#: commit-graph.c:1424
+msgid "Computing commit graph topological levels"
+msgstr "Calculando niveles topológicos de commit graph"
+
+#: commit-graph.c:1477
 msgid "Computing commit graph generation numbers"
 msgstr "Calculando números de generación de commit graph"
 
-#: commit-graph.c:1179
+#: commit-graph.c:1558
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Calculando números de generación de commit graph"
+
+#: commit-graph.c:1635
+msgid "Collecting referenced commits"
+msgstr "Recolectando commits referenciados"
+
+#: 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] "Encontrando commits para commit graph en %d pack"
 msgstr[1] "Encontrando commits para commit graph en %d packs"
 
-#: commit-graph.c:1192
+#: commit-graph.c:1673
 #, c-format
 msgid "error adding pack %s"
-msgstr "error agregando pack %s"
+msgstr "error al agregar pack %s"
 
-#: commit-graph.c:1196
+#: commit-graph.c:1677
 #, c-format
 msgid "error opening index for %s"
-msgstr "error abriendo index para %s"
+msgstr "error al abrir index para %s"
 
-#: commit-graph.c:1220
-#, 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"
-
-#: commit-graph.c:1240
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "id de objeto commit: %s inválido"
-
-#: commit-graph.c:1255
+#: commit-graph.c:1714
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Encontrando commits para commit graph entre los objetos empaquetados"
 
-#: commit-graph.c:1270
-msgid "Counting distinct commits in commit graph"
-msgstr "Contando commits distintos en commit graph"
-
-#: commit-graph.c:1300
+#: commit-graph.c:1732
 msgid "Finding extra edges in commit graph"
 msgstr "Encontrando esquinas extra en commit graph"
 
-#: commit-graph.c:1346
+#: commit-graph.c:1781
 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:1379 midx.c:810
+#: commit-graph.c:1812 midx.c:911
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "no se pudo crear directorios principales para %s"
 
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr "no es posible crear una capa de gráfico temporal"
+
+#: commit-graph.c:1830
 #, c-format
-msgid "unable to create '%s'"
-msgstr "no se puede crear '%s'"
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "no se pudo poner permisos compartidos a '%s'"
 
-#: commit-graph.c:1451
+#: 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] "Escribiendo commit graph en %d paso"
 msgstr[1] "Escribiendo commit graph en %d pasos"
 
-#: commit-graph.c:1492
+#: commit-graph.c:1923
 msgid "unable to open commit-graph chain file"
 msgstr "no se pudo abrir la cadena de archivos commit-graph"
 
-#: commit-graph.c:1504
+#: commit-graph.c:1939
 msgid "failed to rename base commit-graph file"
 msgstr "no se pudo renombrar el archivo base commit-graph"
 
-#: commit-graph.c:1524
+#: commit-graph.c:1959
 msgid "failed to rename temporary commit-graph file"
 msgstr "falló al renombrar el archivo temporal commit-graph"
 
-#: commit-graph.c:1635
+#: commit-graph.c:2092
 msgid "Scanning merged commits"
 msgstr "Escaneando commits fusionados"
 
-#: commit-graph.c:1646
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "id de commit duplicado inesperado %s"
-
-#: commit-graph.c:1670
+#: commit-graph.c:2136
 msgid "Merging commit-graph"
 msgstr "Fusionando commit-graph"
 
-#: commit-graph.c:1860
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "el formato de gráficos de commit no pudede escribir %d commits"
+#: commit-graph.c:2244
+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:1871
+#: commit-graph.c:2351
 msgid "too many commits to write graph"
 msgstr "demasiados commits para escribir el gráfico"
 
-#: commit-graph.c:1961
+#: commit-graph.c:2449
 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:1971
+#: commit-graph.c:2459
 #, 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:1981 commit-graph.c:1996
+#: commit-graph.c:2469 commit-graph.c:2484
 #, 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:1988
+#: commit-graph.c:2476
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "falló al analizar commit %s para commit-graph"
 
-#: commit-graph.c:2006
+#: commit-graph.c:2494
 msgid "Verifying commits in commit graph"
 msgstr "Verificando commits en commit graph"
 
-#: commit-graph.c:2020
+#: commit-graph.c:2509
 #, 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:2027
+#: commit-graph.c:2516
 #, 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:2037
+#: commit-graph.c:2526
 #, 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:2046
+#: commit-graph.c:2535
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "padre de commit-graph para %s es %s != %s"
 
-#: commit-graph.c:2059
+#: commit-graph.c:2549
 #, 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:2064
+#: commit-graph.c:2554
 #, 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:2068
+#: commit-graph.c:2558
 #, 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:2083
+#: commit-graph.c:2575
 #, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "generación commit-graph para commit %s es %u != %u"
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "generación commit-graph para commit %s es %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c:2089
+#: commit-graph.c:2581
 #, 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: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 "no se puede analizar %s"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "¡%s %s no es un commit!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+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"
+"para convertir los grafts en refs.\n"
+"\n"
+"Apapa este mensaje ejecutando\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#: commit.c:1237
+#, 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
+#, 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
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Commit %s no tiene una firma GPG."
+
+#: commit.c:1247
+#, 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"
+
+#: 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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"
+"Tal vez quieras enmendarlo después de arreglar el mensaje, o arreglar la\n"
+"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:124
+#: config.c:126
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1715,293 +2504,337 @@ msgstr ""
 "\t%s\n"
 "Esto puede ser causado por inclusiones circulares."
 
-#: config.c:140
+#: config.c:142
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "no se pudo expandir rutas de inclusión '%s'"
 
-#: config.c:151
+#: config.c:153
 msgid "relative config includes must come from files"
 msgstr "inclusiones de configuración relativas tienen que venir de archivos"
 
-#: config.c:197
+#: config.c:199
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "la configuración relativa incluye condicionales que deben venir de archivos"
 
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "formato config inválido: %s"
+
+#: config.c:400
+#, 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
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "falta la variable de entorno '%s' para la configuración '%.*s'"
+
+#: config.c:442
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "llave no contiene una sección: %s"
 
-#: config.c:382
+#: config.c:448
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "llave no contiene el nombre de variable: %s"
 
-#: config.c:406 sequencer.c:2401
+#: config.c:472 sequencer.c:2785
 #, c-format
 msgid "invalid key: %s"
 msgstr "llave inválida: %s"
 
-#: config.c:412
+#: config.c:478
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "llave inválida (nueva línea): %s"
 
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "clave de config vacía"
+
+#: config.c:529 config.c:541
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "parámetro de configuración malogrado: %s"
 
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
 #, c-format
 msgid "bogus format in %s"
 msgstr "formato malogrado en %s"
 
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "conteo malogrado en %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "demasiadas entradas en %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "llave de configuración faltante %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "valor de config faltante para %s"
+
+#: config.c:995
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "mala línea de config %d en el blob %s"
 
-#: config.c:825
+#: config.c:999
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "mala línea de config %d en el archivo %s"
 
-#: config.c:829
+#: config.c:1003
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "mala línea de config %d en la entrada standard"
 
-#: config.c:833
+#: config.c:1007
 #, 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:837
+#: config.c:1011
 #, 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:841
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "mala línea de config %d en %s"
 
-#: config.c:978
+#: config.c:1152
 msgid "out of range"
 msgstr "fuera de rango"
 
-#: config.c:978
+#: config.c:1152
 msgid "invalid unit"
 msgstr "unidad inválida"
 
-#: config.c:979
+#: config.c:1153
 #, 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:998
+#: config.c:1163
 #, 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:1001
+#: config.c:1166
 #, 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:1004
+#: config.c:1169
 #, 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:1007
+#: config.c:1172
 #, 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:1010
+#: config.c:1175
 #, 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:1013
+#: config.c:1178
 #, 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
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "mal valor de config booleano '%s' para '%s'"
 
-#: config.c:1108
+#: config.c:1275
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "falló al expandir el directorio de usuario en: '%s'"
 
-#: config.c:1117
+#: config.c:1284
 #, 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:1208
+#: config.c:1377
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "largo de abreviatura fuera de rango: %d"
 
-#: config.c:1222 config.c:1233
+#: config.c:1391 config.c:1402
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "nivel de compresión de zlib erróneo %d"
 
-#: config.c:1325
+#: config.c:1494
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar debería tener solo un caracter"
 
-#: config.c:1358
+#: config.c:1527
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "modo inválido de creación de objetos: %s"
 
-#: config.c:1425
+#: config.c:1599
 #, c-format
 msgid "malformed value for %s"
 msgstr "valor malformado para %s"
 
-#: config.c:1451
+#: config.c:1625
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "valor malformado para %s: %s"
 
-#: config.c:1452
+#: config.c:1626
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "debe ser uno de nothing, matching, simple, upstream o current"
 
-#: config.c:1513 builtin/pack-objects.c:3394
+#: config.c:1687 builtin/pack-objects.c:4084
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "nivel de compresión de pack erróneo %d"
 
-#: config.c:1634
+#: config.c:1809
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "incapaz de cargar configuración de objeto blob '%s'"
 
-#: config.c:1637
+#: config.c:1812
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "referencia '%s' no apunta a un blob"
 
-#: config.c:1654
+#: config.c:1829
 #, 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:1684
+#: config.c:1874
 #, c-format
 msgid "failed to parse %s"
 msgstr "no se pudo analizar %s"
 
-#: config.c:1740
+#: config.c:1930
 msgid "unable to parse command-line config"
 msgstr "no es posible analizar la configuración de la línea de comando"
 
-#: config.c:2091
+#: config.c:2294
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "error desconocido ocurrió mientras se leían los archivos de configuración"
 
-#: config.c:2261
+#: config.c:2468
 #, c-format
 msgid "Invalid %s: '%s'"
-msgstr "Inválido %s: '%s'"
+msgstr "%s inválido: '%s'"
 
-#: config.c:2306
+#: config.c:2513
 #, 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:2352
+#: config.c:2559
 #, 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:2354
+#: config.c:2561
 #, 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:2435
+#: config.c:2645
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nombre de sección inválido '%s'"
 
-#: config.c:2467
+#: config.c:2677
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s tiene múltiples valores"
 
-#: config.c:2496
+#: config.c:2706
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "falló al escribir nuevo archivo de configuración %s"
 
-#: config.c:2748 config.c:3072
+#: config.c:2958 config.c:3285
 #, c-format
 msgid "could not lock config file %s"
 msgstr "no se pudo bloquear archivo de configuración %s"
 
-#: config.c:2759
+#: config.c:2969
 #, c-format
 msgid "opening %s"
 msgstr "abriendo %s"
 
-#: config.c:2794 builtin/config.c:328
+#: config.c:3006 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "patrón inválido: %s"
 
-#: config.c:2819
+#: config.c:3031
 #, c-format
 msgid "invalid config file %s"
 msgstr "archivo de configuración inválido: %s"
 
-#: config.c:2832 config.c:3085
+#: config.c:3044 config.c:3298
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat en %s falló"
 
-#: config.c:2843
+#: config.c:3055
 #, 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:2852 config.c:3090
+#: config.c:3065 config.c:3303
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod en %s falló"
 
-#: config.c:2937 config.c:3187
+#: config.c:3150 config.c:3400
 #, c-format
 msgid "could not write config file %s"
 msgstr "no se pudo escribir el archivo de configuración %s"
 
-#: config.c:2971
+#: config.c:3184
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "no se pudo configurar '%s' a '%s'"
 
-#: config.c:2973 builtin/remote.c:782
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr "no se pudo desactivar '%s'"
 
-#: config.c:3063
+#: config.c:3276
 #, 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:3230
+#: config.c:3443
 #, c-format
 msgid "missing value for '%s'"
 msgstr "valor faltante para '%s'"
@@ -2019,80 +2852,89 @@ 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
 msgid "server doesn't support '%s'"
 msgstr "servidor no soporta '%s'"
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "servidor no soporta feature '%s'"
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
 msgstr "se espera flush tras capacidades"
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "ignorando capacidades tras primera línea '%s'"
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "error de protocolo: capacidades imprevistas^{}"
 
-#: connect.c:273
+#: connect.c:306
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "error de protocolo: sha-1 superficial esperado, se obtuvo '%s'"
 
-#: connect.c:275
+#: connect.c:308
 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:313
+#: connect.c:347
 msgid "invalid packet"
 msgstr "paquete inválido"
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "error de protocolo: '%s' inesperado"
 
-#: connect.c:441
+#: connect.c:497
+#, 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
 #, 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:445
+#: connect.c:530
 msgid "expected flush after ref listing"
 msgstr "flush esperado tras listado de refs"
 
-#: connect.c:544
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "se esperaba un paquete final luego del ref listing"
+
+#: connect.c:666
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "protocolo '%s' no es soportado"
 
-#: connect.c:595
+#: connect.c:717
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "no es posible configurar SO_KEEPALIVE en el socket"
 
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Revisando %s... "
 
-#: connect.c:639
+#: connect.c:761
 #, 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:643 connect.c:714
+#: connect.c:765 connect.c:836
 #, c-format
 msgid ""
 "done.\n"
@@ -2101,7 +2943,7 @@ msgstr ""
 "hecho.\n"
 "Conectando a %s (puerto %s) ... "
 
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2111,88 +2953,92 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
 msgid "done."
 msgstr "hecho."
 
-#: connect.c:702
+#: connect.c:824
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "no es posible revisar %s (%s)"
 
-#: connect.c:708
+#: connect.c:830
 #, c-format
 msgid "unknown port %s"
 msgstr "puerto desconocido %s"
 
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "hostname extraño '%s' bloqueado"
 
-#: connect.c:847
+#: connect.c:969
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "puerto extraño '%s' bloqueado"
 
-#: connect.c:857
+#: connect.c:979
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "no se puede comenzar proxy %s"
 
-#: connect.c:928
+#: connect.c:1050
 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; vea 'git help pull' para sintaxis válida de url"
+
+#: connect.c:1190
+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:1123
+#: connect.c:1247
 msgid "ssh variant 'simple' does not support -4"
 msgstr "variante 'simple' de ssh no soporta -4"
 
-#: connect.c:1135
+#: connect.c:1259
 msgid "ssh variant 'simple' does not support -6"
 msgstr "variante 'simple' de ssh no soporta -6"
 
-#: connect.c:1152
+#: connect.c:1276
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "variante ssh 'simple' no soporta configurar puerto"
 
-#: connect.c:1264
+#: connect.c:1388
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "ruta extraña '%s' bloqueada"
 
-#: connect.c:1311
+#: connect.c:1436
 msgid "unable to fork"
 msgstr "no es posible hacer fork"
 
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "Verificando conectividad"
 
-#: connected.c:100
+#: connected.c:120
 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:120
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr "falló escribir a rev-list"
 
-#: connected.c:127
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "falló al cerrar la entrada standard de rev-list"
 
-#: convert.c:194
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "crlf_action %d ilegal"
 
-#: convert.c:207
+#: convert.c:196
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF será reemplazado por LF en %s"
 
-#: convert.c:209
+#: convert.c:198
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2201,12 +3047,12 @@ msgstr ""
 "CRLF será remplazado por LF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de trabajo"
 
-#: convert.c:217
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF será reemplazado por CRLF en %s"
 
-#: convert.c:219
+#: convert.c:208
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2215,78 +3061,79 @@ msgstr ""
 "LF será reemplazado por CRLF en %s.\n"
 "El archivo tendrá sus finales de línea originales en tu directorio de trabajo"
 
-#: convert.c:280
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "BOM está prohibido en '%s' si es codificado como %s"
 
-#: convert.c:287
+#: convert.c:280
 #, c-format
 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 "
+"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 orden de bytes (BOM). Por favor usa "
+"UTF-%.*s como working-tree-encoding."
 
-#: convert.c:305
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr "BOM es requerido en '%s' si es codificado como %s"
 
-#: convert.c:307
+#: 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 ""
-"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:425 convert.c:496
+#: convert.c:408 convert.c:479
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "falló al codificar '%s' de %s a %s"
 
-#: convert.c:468
+#: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "codificación '%s' de %s a %s y de vuelta no son iguales"
 
-#: convert.c:674
+#: convert.c:654
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "no se puede hacer fork para ejecutar filtros externos '%s'"
 
-#: convert.c:694
+#: convert.c:674
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "no se pueden alimentar de input a los filtros externos '%s'"
 
-#: convert.c:701
+#: convert.c:681
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "filtro externo '%s' falló %d"
 
-#: convert.c:736 convert.c:739
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "lectura de filtro externo '%s' falló"
 
-#: convert.c:742 convert.c:797
+#: convert.c:722 convert.c:777
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "filtro externo '%s' falló"
 
-#: convert.c:845
+#: convert.c:826
 msgid "unexpected filter type"
 msgstr "tipo de filtro inesperado"
 
-#: convert.c:856
+#: 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:930
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2295,20 +3142,48 @@ msgstr ""
 "filtro externo '%s' ya no está disponible aunque no todas las rutas han sido "
 "filtradas"
 
-#: convert.c:1229
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false no son working-tree-encodings válidos"
 
-#: convert.c:1417 convert.c:1451
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: falló al limpiar filtro '%s'"
 
-#: convert.c:1495
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 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: credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+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 campo protocolo faltante en la credencial"
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "url contiene una nueva línea en su componente %s: %s"
+
+#: credential.c:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url no tiene scheme: %s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "url de credencial no puede ser analizada: %s"
+
 #: date.c:138
 msgid "in the future"
 msgstr "en el futuro"
@@ -2389,32 +3264,48 @@ 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"
 
-#: diffcore-order.c:24
+#: diff-merges.c:70
 #, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "falló al leer orden de archivos '%s'"
+msgid "unknown value for --diff-merges: %s"
+msgstr "valor desconocido para --diff-merges: %s"
 
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Realizando una detección de cambios de nombre inexacta"
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base no funciona con rangos"
+
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr "--merge-base solo funciona con confirmaciones"
+
+#: diff-lib.c:576
+msgid "unable to get HEAD"
+msgstr "no es posible obtener HEAD"
 
-#: diff-no-index.c:238
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr "no se encontró base de fusión"
+
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr "múltiples bases de fusión encontradas"
+
+#: 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"
@@ -2422,25 +3313,25 @@ msgstr ""
 "No es un repositorio git. Use --no-index para comparar dos paths fuera del "
 "árbol de trabajo"
 
-#: diff.c:155
+#: diff.c:156
 #, 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:160
+#: diff.c:161
 #, 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:296
+#: diff.c:297
 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:324
+#: diff.c:325
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -2450,7 +3341,7 @@ msgstr ""
 "change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
 "change'"
 
-#: diff.c:332
+#: diff.c:333
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -2458,13 +3349,13 @@ msgstr ""
 "color-moved-ws: allow-indentation-change no puede ser combinado con otros "
 "modos de espacios en blanco"
 
-#: diff.c:405
+#: diff.c:410
 #, 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:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -2473,35 +3364,49 @@ msgstr ""
 "Errores en la variable de config 'diff.dirstat' encontrados:\n"
 "%s"
 
-#: diff.c:4218
+#: diff.c:4282
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "diff externo murió, deteniendo en %s"
 
-#: diff.c:4563
+#: diff.c:4634
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
 
-#: diff.c:4566
+#: diff.c:4637
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S y --find-object son mutuamente exclusivas"
 
-#: diff.c:4644
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+"-G y --pickaxe-regex son mutuamente exclusivos, use --pickaxe-regex con -S"
+
+#: diff.c:4643
+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, use --pickaxe-all "
+"con -G y -S"
+
+#: diff.c:4722
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requiere exactamente un pathspec"
 
-#: diff.c:4692
+#: diff.c:4770
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valor --stat inválido: %s"
 
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
-#: parse-options.c:199 parse-options.c:203
+#: 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
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s espera un valor numérico"
 
-#: diff.c:4729
+#: diff.c:4807
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2510,42 +3415,42 @@ msgstr ""
 "Falló al analizar parámetro de opción --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4814
+#: diff.c:4892
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "cambio de clase desconocido '%c' en --diff-filter=%s"
 
-#: diff.c:4838
+#: diff.c:4916
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valor desconocido luego de ws-error-highlight=%.*s"
 
-#: diff.c:4852
+#: diff.c:4930
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "no se puede resolver '%s'"
 
-#: diff.c:4902 diff.c:4908
+#: diff.c:4980 diff.c:4986
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s espera forma <n>/<m>"
 
-#: diff.c:4920
+#: diff.c:4998
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s esperaba un char, se obtuvo '%s'"
 
-#: diff.c:4941
+#: diff.c:5019
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "mal argumento --color-moved: %s"
 
-#: diff.c:4960
+#: diff.c:5038
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "modo inválido '%s' en --color-moved-ws"
 
-#: diff.c:5000
+#: diff.c:5078
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2553,154 +3458,159 @@ msgstr ""
 "opción diff-algorithm acepta \"myers\", \"minimal\", \"patience\" e "
 "\"histogram\""
 
-#: diff.c:5036 diff.c:5056
+#: diff.c:5114 diff.c:5134
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argumento inválido para %s"
 
-#: diff.c:5194
+#: diff.c:5238
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "regex inválido para -I: '%s'"
+
+#: diff.c:5287
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "falló al analizar parámetro de opción --submodule: '%s'"
 
-#: diff.c:5250
+#: diff.c:5343
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "mal argumento --word-diff: %s"
 
-#: diff.c:5273
+#: diff.c:5379
 msgid "Diff output format options"
 msgstr "Opciones de formato de salida para diff"
 
-#: diff.c:5275 diff.c:5281
+#: diff.c:5381 diff.c:5387
 msgid "generate patch"
 msgstr "generar parche"
 
-#: diff.c:5278 builtin/log.c:172
+#: diff.c:5384 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "suprimir salida de diff"
 
-#: diff.c:5283 diff.c:5397 diff.c:5404
+#: diff.c:5389 diff.c:5503 diff.c:5510
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5284 diff.c:5287
+#: diff.c:5390 diff.c:5393
 msgid "generate diffs with <n> lines context"
 msgstr "genera diffs con <n> líneas de contexto"
 
-#: diff.c:5289
+#: diff.c:5395
 msgid "generate the diff in raw format"
 msgstr "genera el diff en formato raw"
 
-#: diff.c:5292
+#: diff.c:5398
 msgid "synonym for '-p --raw'"
-msgstr "sinónimo para '-p --stat'"
+msgstr "sinónimo para '-p --raw'"
 
-#: diff.c:5296
+#: diff.c:5402
 msgid "synonym for '-p --stat'"
 msgstr "sinónimo para '-p --stat'"
 
-#: diff.c:5300
+#: diff.c:5406
 msgid "machine friendly --stat"
 msgstr "--stat amigable para máquina"
 
-#: diff.c:5303
+#: diff.c:5409
 msgid "output only the last line of --stat"
 msgstr "mostrar solo la última línea para --stat"
 
-#: diff.c:5305 diff.c:5313
+#: diff.c:5411 diff.c:5419
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5306
+#: diff.c:5412
 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 "
+"muestra la distribución de cantidades de cambios relativas para cada "
 "subdirectorio"
 
-#: diff.c:5310
+#: diff.c:5416
 msgid "synonym for --dirstat=cumulative"
 msgstr "sinónimo para --dirstat=cumulative"
 
-#: diff.c:5314
+#: diff.c:5420
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "sinonimo para --dirstat=archivos,param1,param2..."
 
-#: diff.c:5318
+#: diff.c:5424
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "advierte si cambios introducen conflictos de markers o errores de espacios "
 "en blanco"
 
-#: diff.c:5321
+#: diff.c:5427
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "resumen condensado de creaciones, cambios de nombres y cambios de modos"
 
-#: diff.c:5324
+#: diff.c:5430
 msgid "show only names of changed files"
 msgstr "mostrar solo nombres de archivos cambiados"
 
-#: diff.c:5327
+#: diff.c:5433
 msgid "show only names and status of changed files"
 msgstr "mostrar solo nombres y estados de archivos cambiados"
 
-#: diff.c:5329
+#: diff.c:5435
 msgid "<width>[,<name-width>[,<count>]]"
-msgstr "<ancho>[,<nombre-ancho>[,<cantidad>]]"
+msgstr "<ancho>[,<ancho-de-nombre>[,<cantidad>]]"
 
-#: diff.c:5330
+#: diff.c:5436
 msgid "generate diffstat"
 msgstr "generar diffstat"
 
-#: diff.c:5332 diff.c:5335 diff.c:5338
+#: diff.c:5438 diff.c:5441 diff.c:5444
 msgid "<width>"
 msgstr "<ancho>"
 
-#: diff.c:5333
+#: diff.c:5439
 msgid "generate diffstat with a given width"
 msgstr "genera diffstat con un ancho dado"
 
-#: diff.c:5336
+#: diff.c:5442
 msgid "generate diffstat with a given name width"
-msgstr "genera diffstat con un nombre de ancho dado"
+msgstr "genera diffstat con un ancho de nombre dado"
 
-#: diff.c:5339
+#: diff.c:5445
 msgid "generate diffstat with a given graph width"
 msgstr "genera diffstat con un ancho de graph dado"
 
-#: diff.c:5341
+#: diff.c:5447
 msgid "<count>"
 msgstr "<cantidad>"
 
-#: diff.c:5342
+#: diff.c:5448
 msgid "generate diffstat with limited lines"
 msgstr "genera diffstat con líneas limitadas"
 
-#: diff.c:5345
+#: diff.c:5451
 msgid "generate compact summary in diffstat"
 msgstr "genera un resumen compacto de diffstat"
 
-#: diff.c:5348
+#: diff.c:5454
 msgid "output a binary diff that can be applied"
 msgstr "muestra un diff binario que puede ser aplicado"
 
-#: diff.c:5351
+#: diff.c:5457
 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:5353
+#: diff.c:5459
 msgid "show colored diff"
 msgstr "mostrar diff colorido"
 
-#: diff.c:5354
+#: diff.c:5460
 msgid "<kind>"
 msgstr "<tipo>"
 
-#: diff.c:5355
+#: diff.c:5461
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2708,7 +3618,7 @@ msgstr ""
 "resaltar errores de espacios en blanco en las líneas 'context', 'old' o "
 "'new' del diff"
 
-#: diff.c:5358
+#: diff.c:5464
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2716,311 +3626,330 @@ msgstr ""
 "no consolidar los pathnames y usar NULs como terminadores de campos en --raw "
 "o --numstat"
 
-#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
 msgid "<prefix>"
 msgstr "<prefijo>"
 
-#: diff.c:5362
+#: diff.c:5468
 msgid "show the given source prefix instead of \"a/\""
 msgstr "mostrar el prefijo de fuente dado en lugar de \"a/\""
 
-#: diff.c:5365
+#: diff.c:5471
 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:5368
+#: diff.c:5474
 msgid "prepend an additional prefix to every line of output"
 msgstr "anteponer un prefijo adicional a cada línea mostrada"
 
-#: diff.c:5371
+#: diff.c:5477
 msgid "do not show any source or destination prefix"
 msgstr "no mostrar ningún prefijo de fuente o destino"
 
-#: diff.c:5374
+#: diff.c:5480
 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 "
 "líneas"
 
-#: diff.c:5378 diff.c:5383 diff.c:5388
+#: diff.c:5484 diff.c:5489 diff.c:5494
 msgid "<char>"
 msgstr "<char>"
 
-#: diff.c:5379
+#: diff.c:5485
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "especifica el char para indicar una nueva línea en lugar de '+'"
 
-#: diff.c:5384
+#: diff.c:5490
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "especifica el char para indicar una línea vieja en lugar de '-'"
 
-#: diff.c:5389
+#: diff.c:5495
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "especifica el char para indicar un contexto en lugar de ' '"
 
-#: diff.c:5392
+#: diff.c:5498
 msgid "Diff rename options"
 msgstr "Opciones de diff rename"
 
-#: diff.c:5393
+#: diff.c:5499
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5394
+#: diff.c:5500
 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:5398
+#: diff.c:5504
 msgid "detect renames"
 msgstr "detectar renombrados"
 
-#: diff.c:5402
+#: diff.c:5508
 msgid "omit the preimage for deletes"
 msgstr "omite la preimage para borrados"
 
-#: diff.c:5405
+#: diff.c:5511
 msgid "detect copies"
 msgstr "detectar copias"
 
-#: diff.c:5409
+#: diff.c:5515
 msgid "use unmodified files as source to find copies"
 msgstr "usa archivos no modificados como fuente para encontrar copias"
 
-#: diff.c:5411
+#: diff.c:5517
 msgid "disable rename detection"
-msgstr "deshabilita detección de renombres"
+msgstr "deshabilita detección de renombrados"
 
-#: diff.c:5414
+#: diff.c:5520
 msgid "use empty blobs as rename source"
-msgstr "usa blobs vacíos como fuente de renombre"
+msgstr "usa blobs vacíos como fuente de renombramiento"
 
-#: diff.c:5416
+#: diff.c:5522
 msgid "continue listing the history of a file beyond renames"
-msgstr "continua listando el historial de un archivo más allá de renombres"
+msgstr ""
+"continua listando el historial de un archivo más allá de renombramientos"
 
-#: diff.c:5419
+#: diff.c:5525
 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"
+"previene detección de renombramientos/copias si el número de destinos para "
+"renombramientos/copias excede el límite dado"
 
-#: diff.c:5421
+#: diff.c:5527
 msgid "Diff algorithm options"
 msgstr "Opciones de algoritmos de diff"
 
-#: diff.c:5423
+#: diff.c:5529
 msgid "produce the smallest possible diff"
 msgstr "produce el diff más pequeño posible"
 
-#: diff.c:5426
+#: diff.c:5532
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorar espacios en blanco cuando comparando líneas"
 
-#: diff.c:5429
+#: diff.c:5535
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorar cambios en la cantidad de líneas en blanco"
 
-#: diff.c:5432
+#: diff.c:5538
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorar cambios en espacios en blanco en EOL"
 
-#: diff.c:5435
+#: diff.c:5541
 msgid "ignore carrier-return at the end of line"
 msgstr "ignora carrier-return al final de la línea"
 
-#: diff.c:5438
+#: diff.c:5544
 msgid "ignore changes whose lines are all blank"
 msgstr "ignora cambios cuyas líneas son todas en blanco"
 
-#: diff.c:5441
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5547
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignora cambios cuyas líneas concuerdan con <regex>"
+
+#: diff.c:5550
 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:5444
+#: diff.c:5553
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "genera un diff usando algoritmo \"patience diff\""
 
-#: diff.c:5448
+#: diff.c:5557
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "genera un diff usando algoritmo \"histogram diff\""
 
-#: diff.c:5450
+#: diff.c:5559
 msgid "<algorithm>"
 msgstr "<algoritmo>"
 
-#: diff.c:5451
+#: diff.c:5560
 msgid "choose a diff algorithm"
 msgstr "escoge un algoritmo para diff"
 
-#: diff.c:5453
+#: diff.c:5562
 msgid "<text>"
 msgstr "<texto>"
 
-#: diff.c:5454
+#: diff.c:5563
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "genera un diff usando algoritmo \"anchored diff\""
 
-#: diff.c:5456 diff.c:5465 diff.c:5468
+#: diff.c:5565 diff.c:5574 diff.c:5577
 msgid "<mode>"
 msgstr "<modo>"
 
-#: diff.c:5457
+#: diff.c:5566
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "muestra diff por palabras usando <modo> para delimitar las palabras cambiadas"
 
-#: diff.c:5459 diff.c:5462 diff.c:5507
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5460
+#: diff.c:5569
 msgid "use <regex> to decide what a word is"
-msgstr "usa <regex> para decidir que palabra es"
+msgstr "usa <regex> para decidir qué es una palabra"
 
-#: diff.c:5463
+#: diff.c:5572
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "equivalente a --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5466
+#: diff.c:5575
 msgid "moved lines of code are colored differently"
 msgstr "líneas movidas de código están coloreadas diferente"
 
-#: diff.c:5469
+#: diff.c:5578
 msgid "how white spaces are ignored in --color-moved"
 msgstr "como espacios en blanco son ignorados en --color-moved"
 
-#: diff.c:5472
+#: diff.c:5581
 msgid "Other diff options"
 msgstr "Otras opciones de diff"
 
-#: diff.c:5474
+#: diff.c:5583
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "cuando ejecutado desde un subdir, excluye cambios del exterior y muestra "
 "paths relativos"
 
-#: diff.c:5478
+#: diff.c:5587
 msgid "treat all files as text"
 msgstr "tratar todos los archivos como texto"
 
-#: diff.c:5480
+#: diff.c:5589
 msgid "swap two inputs, reverse the diff"
 msgstr "cambia dos inputs, invierte el diff"
 
-#: diff.c:5482
+#: diff.c:5591
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "termina con 1 si hubieron diferencias, de lo contrario con 0"
 
-#: diff.c:5484
+#: diff.c:5593
 msgid "disable all output of the program"
-msgstr "deshabilita todo el output del programa"
+msgstr "deshabilita todo el salida del programa"
 
-#: diff.c:5486
+#: diff.c:5595
 msgid "allow an external diff helper to be executed"
 msgstr "permite la ejecución de un diff helper externo"
 
-#: diff.c:5488
+#: diff.c:5597
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "ejecuta filtros de conversión de texto externos cuando comparando binarios"
 
-#: diff.c:5490
+#: diff.c:5599
 msgid "<when>"
 msgstr "<cuando>"
 
-#: diff.c:5491
+#: diff.c:5600
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignorar cambios a submódulos en la generación de diff"
 
-#: diff.c:5494
+#: diff.c:5603
 msgid "<format>"
 msgstr "<formato>"
 
-#: diff.c:5495
+#: diff.c:5604
 msgid "specify how differences in submodules are shown"
 msgstr "especifica como son mostradas las diferencias en submódulos"
 
-#: diff.c:5499
+#: diff.c:5608
 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:5502
+#: diff.c:5611
 msgid "treat 'git add -N' entries as real in the index"
-msgstr "trata entradas 'git add -N' como reales en el index"
+msgstr "trata entradas 'git add -N' como reales en el índice"
 
-#: diff.c:5504
+#: diff.c:5613
 msgid "<string>"
 msgstr "<string>"
 
-#: diff.c:5505
+#: diff.c:5614
 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 "
+"busca diferencias que cambien el número de ocurrencias del string "
 "especificado"
 
-#: diff.c:5508
+#: diff.c:5617
 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 "
+"busca por diferencias que cambien el número de ocurrencias del regex "
 "especificado"
 
-#: diff.c:5511
+#: diff.c:5620
 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:5514
+#: diff.c:5623
 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:5517
+#: diff.c:5626
 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:5518
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr "<ruta>"
+
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr "mostrar el cambio en la ruta especificada primero"
+
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr "saltar el salida de la ruta especificada"
+
+#: diff.c:5633
 msgid "<object-id>"
-msgstr "<id-objeto>"
+msgstr "<id-de-objeto>"
 
-#: diff.c:5519
+#: diff.c:5634
 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 "
+"busca diferencias que cambien el número de ocurrencias para el objeto "
 "especificado"
 
-#: diff.c:5521
+#: diff.c:5636
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5522
+#: diff.c:5637
 msgid "select files by diff type"
 msgstr "selecciona archivos por tipo de diff"
 
-#: diff.c:5524
+#: diff.c:5639
 msgid "<file>"
 msgstr "<archivo>"
 
-#: diff.c:5525
+#: diff.c:5640
 msgid "Output to a specific file"
 msgstr "Output a un archivo específico"
 
-#: diff.c:6180
-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 ""
-"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:6183
+#: diff.c:6301
 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:6186
+#: diff.c:6304
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3028,65 +3957,98 @@ msgstr ""
 "tal vez quieras configurar la variable %s para por lo menos %d y volver a "
 "intentar el comando."
 
-#: dir.c:549
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "falló al leer archivo de orden '%s'"
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr "Realizando una detección de cambios de nombre inexacta"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "No hay ruta '%s' en el diff"
+
+#: 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 conocido por git"
+
+#: dir.c:733 dir.c:762 dir.c:775
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "patrón desconocido: '%s'"
+
+#: dir.c:790 dir.c:804
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "patrón negativo no reconocido: '%s'"
+
+#: dir.c:820
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
 msgstr ""
-"ruta especificada '%s' no concordó con ningún archivo(s) conocido por git"
+"tu archivo sparse-checkout tal vez tenga errores: patrón '%s' está repetido"
+
+#: dir.c:830
+msgid "disabling cone pattern matching"
+msgstr "deshabilitar coincidencia de patrónes cónica"
 
-#: dir.c:938
+#: 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:1877
+#: dir.c:2351
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "no se pudo abrir el directorio '%s'"
 
-#: dir.c:2128
+#: dir.c:2653
 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:2252
+#: dir.c:2777
 msgid "untracked cache is disabled on this system or location"
 msgstr "untracked cache está desactivado en este sistema o ubicación"
 
-#: dir.c:3056
+#: dir.c:3610
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "archivo índice corrompido en repositorio %s"
 
-#: dir.c:3101 dir.c:3106
+#: dir.c:3657 dir.c:3662
 #, c-format
 msgid "could not create directories for %s"
 msgstr "no se pudo crear directorios para %s"
 
-#: dir.c:3135
+#: dir.c:3691
 #, 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:73
+#: editor.c:74
 #, 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:178
+#: entry.c:176
 msgid "Filtering content"
 msgstr "Filtrando contenido"
 
-#: entry.c:476
+#: entry.c:497
 #, 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:148
+#: environment.c:152
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "ruta de namespace de git mala \"%s\""
 
-#: environment.c:330
+#: environment.c:334
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "no se pudo configurar GIT_DIR a '%s'"
@@ -3094,272 +4056,303 @@ 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:150
+#: fetch-pack.c:182
 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:153
+#: fetch-pack.c:185
 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:164
+#: fetch-pack.c:196
 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:184
+#: fetch-pack.c:216
 #, 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:195
+#: fetch-pack.c:227
 msgid "unable to write to remote"
 msgstr "no se puede escribir al remoto"
 
-#: fetch-pack.c:257
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requiere multi_ack_detailed"
 
-#: fetch-pack.c:356 fetch-pack.c:1280
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, 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:362 fetch-pack.c:1286
+#: fetch-pack.c:389 fetch-pack.c:1429
 #, c-format
 msgid "invalid unshallow line: %s"
-msgstr "línea superficial inválida: %s"
+msgstr "línea unshallow inválida: %s"
 
-#: fetch-pack.c:364 fetch-pack.c:1288
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
 msgstr "objeto no encontrado: %s"
 
-#: fetch-pack.c:367 fetch-pack.c:1291
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
 msgstr "error en objeto: %s"
 
-#: fetch-pack.c:369 fetch-pack.c:1293
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
-msgstr "superficie no encontrada: %s"
+msgstr "shallow no encontrado: %s"
 
-#: fetch-pack.c:372 fetch-pack.c:1297
+#: fetch-pack.c:399 fetch-pack.c:1440
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "se esperaba shallow/unshallow, se obtuvo %s"
 
-#: fetch-pack.c:414
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr "se obtuvo %s %d %s"
 
-#: fetch-pack.c:431
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit inválido %s"
 
-#: fetch-pack.c:462
+#: fetch-pack.c:487
 msgid "giving up"
 msgstr "rindiéndose"
 
-#: fetch-pack.c:475 progress.c:312
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
 msgstr "listo"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "se obtuvo %s (%d) %s"
 
-#: fetch-pack.c:533
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marcando %s como completa"
 
-#: fetch-pack.c:742
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ya se tiene %s (%s)"
 
-#: fetch-pack.c:781
+#: fetch-pack.c:849
 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:789
+#: fetch-pack.c:857
 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:857
+#: fetch-pack.c:951
 #, 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
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: salida de index-pack no válida"
 
-#: fetch-pack.c:873
+#: fetch-pack.c:974
 #, c-format
 msgid "%s failed"
 msgstr "%s falló"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
 msgstr "error en demultiplexor de banda lateral"
 
-#: fetch-pack.c:907
+#: fetch-pack.c:1019
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Versión de servidor es %.*s"
 
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
+#: 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 "El servidor soporta %s"
 
-#: fetch-pack.c:914
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
 msgstr "El servidor no soporta clientes superficiales"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:1089
 msgid "Server does not support --shallow-since"
-msgstr "El servidor no soporta --shalow-since"
+msgstr "El servidor no soporta --shallow-since"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1094
 msgid "Server does not support --shallow-exclude"
-msgstr "El servidor no soporta --shalow-exclude"
+msgstr "El servidor no soporta --shallow-exclude"
 
-#: fetch-pack.c:983
+#: fetch-pack.c:1098
 msgid "Server does not support --deepen"
 msgstr "El servidor no soporta --deepen"
 
-#: fetch-pack.c:1000
+#: fetch-pack.c:1100
+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
 msgid "no common commits"
 msgstr "no hay commits comunes"
 
-#: fetch-pack.c:1012 fetch-pack.c:1468
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr "el repositorio fuente es superficial, rechazando clonado."
+
+#: fetch-pack.c:1128 fetch-pack.c:1660
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: fetch falló."
 
-#: fetch-pack.c:1150
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmos no compatibles: cliente %s; servidor %s"
+
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "el servidor no soporta el algoritmo '%s'"
+
+#: fetch-pack.c:1279
 msgid "Server does not support shallow requests"
 msgstr "El servidor no soporta peticiones superficiales"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1286
 msgid "Server supports filter"
-msgstr "El servidor soporta filtro"
+msgstr "El servidor soporta filtración"
 
-#: fetch-pack.c:1180
+#: fetch-pack.c:1329 fetch-pack.c:2043
 msgid "unable to write request to remote"
 msgstr "no se puede escribir request al remoto"
 
-#: fetch-pack.c:1198
+#: fetch-pack.c:1347
 #, 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:1204
+#: fetch-pack.c:1353
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "se esperaba '%s', se recibió '%s'"
 
-#: fetch-pack.c:1243
+#: fetch-pack.c:1387
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "línea de confirmación inesperada: '%s'"
 
-#: fetch-pack.c:1248
+#: fetch-pack.c:1392
 #, c-format
 msgid "error processing acks: %d"
-msgstr "error procesando acks: %d"
+msgstr "error al procesar acks: %d"
 
-#: fetch-pack.c:1258
+#: fetch-pack.c:1402
 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:1260
+#: fetch-pack.c:1404
 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:1302
+#: fetch-pack.c:1445
 #, 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:1349
+#: fetch-pack.c:1494
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "se esperaba wanted-ref, se obtuvo '%s'"
 
-#: fetch-pack.c:1354
+#: fetch-pack.c:1499
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inesperado: '%s'"
 
-#: fetch-pack.c:1359
+#: fetch-pack.c:1504
 #, 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
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: se esperaba un paquete final de respuesta"
 
-#: fetch-pack.c:1693
+#: fetch-pack.c:1939
 msgid "no matching remote head"
 msgstr "no concuerda el head remoto"
 
-#: fetch-pack.c:1716 builtin/clone.c:685
+#: fetch-pack.c:1962 builtin/clone.c:697
 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:2065
+msgid "unexpected 'ready' from remote"
+msgstr "'listo' inesperado del remoto"
 
-#: fetch-pack.c:1743
+#: fetch-pack.c:2088
 #, c-format
 msgid "no such remote ref %s"
 msgstr "no existe ref remota %s"
 
-#: fetch-pack.c:1746
+#: fetch-pack.c:2091
 #, 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:321
-msgid "gpg failed to sign the data"
-msgstr "gpg falló al firmar la data"
-
-#: gpg-interface.c:347
+#: gpg-interface.c:273
 msgid "could not create temporary file"
 msgstr "no se pudo crear archivo temporal"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "falló al escribir la firma separada para '%s'"
 
-#: graph.c:97
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg falló al firmar los datos"
+
+#: 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:668
+#: grep.c:531
 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:2124
+#: grep.c:1895
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': no es posible leer %s"
 
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
-#: 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 "falló al marcar '%s'"
+msgstr "falló al hacer stat en '%s'"
 
-#: grep.c:2152
+#: grep.c:1923
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': lectura corta"
@@ -3409,48 +4402,48 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Comandos de bajo nivel / Interrogadores"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Comandos de bajo nivel / Sincronización de repositorios"
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Comandos de bajo nivel / Auxiliares internos"
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "comandos disponibles de git en '%s'"
 
-#: help.c:305
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
 
-#: help.c:314
+#: help.c:316
 msgid "These are common Git commands used in various situations:"
 msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
 
-#: help.c:363 git.c:98
+#: help.c:365 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:403
-msgid "The common Git guides are:"
-msgstr "Las guías comunes de Git son:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Las guías de conceptos de Git son:"
 
-#: help.c:512
+#: help.c:429
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "Vea 'git help <comando>' para leer sobre los subcomandos específicos"
 
-#: help.c:517
+#: help.c:434
 msgid "External commands"
 msgstr "Comandos externos"
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr "Aliases de comando"
 
-#: help.c:596
+#: help.c:527
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -3459,31 +4452,31 @@ msgstr ""
 "'%s' parece ser un comando de git, pero no hemos\n"
 "podido ejecutarlo. ¿Tal vez git-%s se ha roto?"
 
-#: help.c:655
+#: help.c:543 help.c:631
+#, 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'."
+
+#: help.c:591
 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:677
+#: help.c:613
 #, 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:682
+#: help.c:618
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Continuando asumiendo que quisiste decir '%s'."
 
-#: help.c:687
+#: help.c:623
 #, 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:695
-#, 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'."
-
-#: help.c:699
+#: help.c:635
 msgid ""
 "\n"
 "The most similar command is"
@@ -3497,16 +4490,16 @@ msgstr[1] ""
 "\n"
 "Los comandos más similares son"
 
-#: help.c:714
+#: help.c:675
 msgid "git version [<options>]"
-msgstr "git versión [<opciones>]"
+msgstr "git version [<opciones>]"
 
-#: help.c:783
+#: help.c:730
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:787
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3520,7 +4513,15 @@ msgstr[1] ""
 "\n"
 "¿Quisiste decir alguno de estos?"
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Identidad del autor desconocido\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Se desconoce la identidad del autor\n"
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3535,9 +4536,9 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"*** Por favor cuéntame quien eres.\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"
@@ -3546,91 +4547,102 @@ msgstr ""
 "Omite --global para configurar tu identidad solo en este repositorio.\n"
 "\n"
 
-#: ident.c:379
+#: 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:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')"
 
-#: ident.c:401
+#: 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:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')"
 
-#: ident.c:415
+#: 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:421
+#: 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:436 builtin/commit.c:611
+#: ident.c:454 builtin/commit.c:647
 #, c-format
 msgid "invalid date format: %s"
 msgstr "formato de fecha inválido: %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"
-
-#: 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"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "no se puede cargar árbol raíz para commit %s"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "no es posible acceder al blob en '%s'"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "incapaz de analizar filtro de data en %s"
-
-#: list-objects-filter-options.c:58
+#: list-objects-filter-options.c:83
 msgid "expected 'tree:<depth>'"
 msgstr "se esperaba 'tree:<depth>'"
 
-#: list-objects-filter-options.c:73
+#: list-objects-filter-options.c:98
 msgid "sparse:path filters support has been dropped"
 msgstr "soporte para filtros sparse:path ha sido discontinuado"
 
-#: list-objects-filter-options.c:86
+#: 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>' 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:102
+#: list-objects-filter-options.c:140
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
 msgstr "tienes que escapar el caracter en sub-filter-spec: '%c'"
 
-#: list-objects-filter-options.c:144
+#: list-objects-filter-options.c:182
 msgid "expected something after combine:"
 msgstr "se espera algo luego de combine:"
 
-#: list-objects-filter-options.c:226
+#: list-objects-filter-options.c:264
 msgid "multiple filter-specs cannot be combined"
 msgstr "no se pueden combinar múltiples tipos de especificaciones de filtro"
 
-#: lockfile.c:151
+#: 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 clonación "
+"parcial"
+
+#: list-objects-filter.c:532
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "no es posible acceder al blob en '%s'"
+
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+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 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 lo es"
+
+#: 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"
+
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3643,179 +4655,413 @@ msgid ""
 msgstr ""
 "No se puede crear '%s.lock': %s.\n"
 "\n"
-"Otro proceso git parece estar corriendo en el repositorio, es decir\n"
+"Otro proceso git parece estar ejecutando en el repositorio, es decir\n"
 "un editor abierto con 'git commit'. Por favor asegúrese 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."
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "No se pudo crear '%s.lock': %s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "falló al leer la cache"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "valor inválido '%s' para lsrefs.unborn"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "no es posible escribir el archivo índice"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "se esperaba un flush luego de argumentos ls-refs"
+
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "CRLF con comillas detectado"
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "mala acción '%s' para '%s'"
+
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Falló al fusionar el submódulo %s (no revisado)"
+
+#: merge-ort.c:1578 merge-recursive.c:1208
+#, 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:1587 merge-recursive.c:1215
+#, 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 base de fusión)"
+
+#: merge-ort.c:1597 merge-ort.c:1604
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Nota: Fast-forward de submódulo %s a %s"
+
+#: merge-ort.c:1625
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Falló al fusionar el submódulo %s"
+
+#: merge-ort.c:1632
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Falló al fusionar el submódulo %s, pero existen posibles soluciones de "
+"fusión:\n"
+"%s\n"
+
+#: 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 ""
+"Si esto es correcto simplemente agrégalo al índice por ejemplo\n"
+"usando:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"el cual aceptará esta sugerencia.\n"
+
+#: merge-ort.c:1649
+#, 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"
+"%s"
+
+#: merge-ort.c:1868 merge-recursive.c:1358
+msgid "Failed to execute internal merge"
+msgstr "Falló al ejecutar la fusión interna"
+
+#: merge-ort.c:1873 merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "No es posible agregar %s a la base de datos"
+
+#: merge-ort.c:1880 merge-recursive.c:1396
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Auto-fusionando %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 ""
+"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio "
+"existente en %s se interpone con el cambio de nombres implícito, poniendo "
+"la(s) siguiente(s) ruta(s) aquí: %s."
+
+#: 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 ""
+"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: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 ""
+"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 obtuviera la mayoría de los archivos."
+
+#: 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 ""
+"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
+"renombrado."
+
+#: 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 ""
+"Path actualizado: %s agregado en %s dentro de un directorio que fue "
+"renombrado en %s; moviéndolo a %s."
+
+#: 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 ""
+"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
+"renombrado en %s; moviéndolo a %s."
+
+#: 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 ""
+"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: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 ""
+"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un "
+"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
+"movido a %s."
+
+#: merge-ort.c:2569
+#, 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: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 ""
+"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:2683 merge-ort.c:2707
+#, 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:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
+msgstr "no se pudo leer el objeto %s"
+
+#: merge-ort.c:3185 merge-recursive.c:3011
+#, c-format
+msgid "object %s is not a blob"
+msgstr "objeto %s no es un blob"
 
-#: merge-recursive.c:367
+#: merge-ort.c:3613
+#, 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."
+
+#: 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 ""
+"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: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 ""
+"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:3796 merge-recursive.c:3087
+msgid "content"
+msgstr "contenido"
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr "agregar/agregar"
+
+#: 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 "CONFLICTO (%s): Conflicto de fusión en %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 ""
+"CONFLICTO (modificar / eliminar): %s eliminado en %s y modificado en %s. "
+"Versión %s de %s restante en el árbol."
+
+#: 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 ""
+"Nota: %s no está actualizado y en conflicto con la versión; la copia antigua "
+"fue renombrada 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:4487
+#, 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"
+
+#: 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 ""
+"Los cambios locales de los siguientes archivos serán sobreescritos por "
+"merge:\n"
+"  %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "Ya está actualizado."
+
+#: merge-recursive.c:352
 msgid "(bad commit)\n"
 msgstr "(commit erróneo)\n"
 
-#: merge-recursive.c:390
+#: merge-recursive.c:375
 #, 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:399
+#: merge-recursive.c:384
 #, 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:885
+#: merge-recursive.c:872
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "falló al crear la ruta '%s'%s"
 
-#: merge-recursive.c:896
+#: merge-recursive.c:883
 #, 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:910 merge-recursive.c:929
+#: merge-recursive.c:897 merge-recursive.c:916
 msgid ": perhaps a D/F conflict?"
 msgstr ": ¿tal vez un conflicto D/F?"
 
-#: merge-recursive.c:919
+#: merge-recursive.c:906
 #, 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:960 builtin/cat-file.c:41
+#: merge-recursive.c:947 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:965
+#: merge-recursive.c:952
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "se esperaba blob para %s '%s'"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:977
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "falló al abrir '%s': %s"
 
-#: merge-recursive.c:1001
+#: merge-recursive.c:988
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "falló al crear el enlace simbólico '%s': %s"
 
-#: merge-recursive.c:1006
+#: merge-recursive.c:993
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
-msgstr "no se que hacer con %06o %s '%s'"
-
-#: merge-recursive.c:1199
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Falló al fusionar el submódulo %s (no revisado)"
-
-#: merge-recursive.c:1206
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Falló al fusionar el submódulo %s (commits no presentes)"
+msgstr "no sé qué hacer con %06o %s '%s'"
 
-#: merge-recursive.c:1213
-#, 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)"
-
-#: merge-recursive.c:1221 merge-recursive.c:1233
+#: merge-recursive.c:1223 merge-recursive.c:1235
 #, 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:1224 merge-recursive.c:1236
+#: merge-recursive.c:1226 merge-recursive.c:1238
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avance rápido en submódulo %s"
 
-#: merge-recursive.c:1259
+#: merge-recursive.c:1261
 #, 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:1263
+#: merge-recursive.c:1265
 #, 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:1264
+#: merge-recursive.c:1266
 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:1267
-#, 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 ""
-"Si esto es correcto simplemente agrégalo al índice por ejemplo\n"
-"usando:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"el cual aceptará esta sugerencia.\n"
-
-#: merge-recursive.c:1276
+#: merge-recursive.c:1278
 #, 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:1349
-msgid "Failed to execute internal merge"
-msgstr "Falló al ejecutar la fusión interna"
-
-#: merge-recursive.c:1354
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "No es posible agregar %s a la base de datos"
-
-#: merge-recursive.c:1386
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Auto-fusionando %s"
-
-#: merge-recursive.c:1410
+#: merge-recursive.c:1420
 #, 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:1482
+#: merge-recursive.c:1492
 #, 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:1487
+#: merge-recursive.c:1497
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3824,7 +5070,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:1494
+#: merge-recursive.c:1504
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3833,7 +5079,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:1499
+#: merge-recursive.c:1509
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3842,44 +5088,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:1534
+#: merge-recursive.c:1544
 msgid "rename"
 msgstr "renombrar"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1544
 msgid "renamed"
 msgstr "renombrado"
 
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Rehusando perder el archivo sucio en %s"
 
-#: merge-recursive.c:1624
+#: merge-recursive.c:1605
 #, 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:1682
+#: merge-recursive.c:1663
 #, 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:1713
+#: merge-recursive.c:1694
 #, 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:1718
+#: merge-recursive.c:1699
 #, 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:1737
+#: merge-recursive.c:1726
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3888,18 +5134,18 @@ msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
 "renombrar \"%s\"->\"%s\" en \"%s\"%s"
 
-#: merge-recursive.c:1742
+#: merge-recursive.c:1731
 msgid " (left unresolved)"
 msgstr " (dejado sin resolver)"
 
-#: merge-recursive.c:1851
+#: merge-recursive.c:1823
 #, 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:2056
+#: merge-recursive.c:2086
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3907,29 +5153,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:2088
-#, 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 ""
-"CONFLICTO (cambio de nombre de directorio implícito): Archivo/directorio "
-"existente en %s se interpone con el cambio de nombres implícito, poniendo "
-"la(s) siguiente(s) ruta(s) aquí: %s."
-
-#: merge-recursive.c:2098
-#, 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"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2220
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3938,321 +5165,292 @@ msgstr ""
 "CONFLICTO (renombrar/renombrar): Renombrar directorio %s->%s en %s. "
 "Renombrar directorio %s->%s en %s"
 
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"PELIGRO: Evitando aplicar %s -> %s renombrado a %s, porque %s mismo fue "
-"renombrado."
-
-#: merge-recursive.c:2961
-#, c-format
-msgid "cannot read object %s"
-msgstr "no se pudo leer el objeto %s"
-
-#: merge-recursive.c:2964
-#, c-format
-msgid "object %s is not a blob"
-msgstr "objeto %s no es un blob"
-
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modify"
 msgstr "modificar"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modified"
 msgstr "modificado"
 
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "contenido"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "agregar/agregar"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3114
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Saltado %s (fusionado como existente)"
 
-#: merge-recursive.c:3089 git-submodule.sh:937
-msgid "submodule"
-msgstr "submódulo"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3167
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Agregando más bien como %s"
 
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Path actualizado: %s agregado en %s dentro de un directorio que fue "
-"renombrado en %s; moviéndolo a %s."
-
-#: merge-recursive.c:3206
-#, 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 ""
-"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-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"Path actualizado: %s renombrado a %s en %s, dentro de un directorio que fue "
-"renombrado en %s; moviéndolo a %s."
-
-#: merge-recursive.c:3213
-#, 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 ""
-"CONFLICTO (ubicación de archivo): %s renombrado a %s en %s, dentro de un "
-"directorio que fue renombrado en %s, sugiriendo que tal vez debería ser "
-"movido a %s."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3371
 #, c-format
 msgid "Removing %s"
 msgstr "Eliminando %s"
 
-#: merge-recursive.c:3350
+#: merge-recursive.c:3394
 msgid "file/directory"
 msgstr "archivo/directorio"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3399
 msgid "directory/file"
 msgstr "directorio/archivo"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3406
 #, 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:3371
+#: merge-recursive.c:3415
 #, c-format
 msgid "Adding %s"
 msgstr "Agregando %s"
 
-#: merge-recursive.c:3380
+#: merge-recursive.c:3424
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLICTO (add/add): Conflicto de merge en %s"
 
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr "¡Ya está actualizado!"
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3477
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "falló la fusión de los árboles %s y %s"
 
-#: merge-recursive.c:3537
+#: merge-recursive.c:3571
 msgid "Merging:"
 msgstr "Fusionando:"
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3584
 #, 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:3600
+#: merge-recursive.c:3634
 msgid "merge returned no commit"
 msgstr "la fusión no devolvió ningún commit"
 
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Los cambios locales de los siguientes archivos serán sobreescritos por "
-"merge:\n"
-"  %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3799
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "No se pudo analizar el objeto '%s'"
 
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
 msgid "Unable to write index."
 msgstr "Incapaz de escribir el índice."
 
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "falló al leer la cache"
+
+#: 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 "no es posible escribir el archivo índice"
+
+#: midx.c:74
+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"
+
+#: midx.c:105
 #, 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:84
+#: midx.c:121
 #, 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:89
+#: midx.c:126
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "versión %d de multi-pack-index no reconocida"
 
-#: midx.c:94
+#: midx.c:131
 #, c-format
-msgid "hash version %u does not match"
-msgstr "versión de hash %u no concuerda"
-
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr "offset inválido del conjunto (muy grande)"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
-"terminando multi-pack-index porque el id del conjunto aparece antes de lo "
-"esperado"
+"la versión de hash de índice de paquetes múltiples %u no coincide con la "
+"versión %u"
 
-#: midx.c:145
+#: midx.c:148
 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:147
+#: midx.c:150
 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:149
+#: midx.c:152
 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:151
+#: midx.c:154
 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:165
+#: midx.c:170
 #, 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:210
+#: midx.c:214
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "mal pack-int-id: %u (%u paquetes totales)"
 
-#: midx.c:260
+#: midx.c:264
 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"
-
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "error preparando packfile de multi-pack-index"
+msgstr ""
+"multi-pack-index guarda un offset de 64-bit, pero off_t es demasiado pequeño"
 
-#: midx.c:469
+#: midx.c:490
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "falló al agregar packfile '%s'"
 
-#: midx.c:475
+#: midx.c:496
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "falló al abrir pack-index '%s'"
 
-#: midx.c:535
+#: midx.c:564
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "falló al ubicar objeto %d en packfile"
 
-#: midx.c:864
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr "no se puede almacenar el archivo de índice inverso"
+
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "ignorando el actual multi-pack-index; checksum no concuerda"
+
+#: midx.c:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Agregando packfiles a multi-pack-index"
+
+#: midx.c:989
 #, c-format
 msgid "did not see pack-file %s to drop"
-msgstr "no se vió pack-file %s caer"
+msgstr "no se vió el pack-file que abandonar %s"
+
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "pack preferido desconocido: '%s'"
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "pack de referencia '% s' ha expirado"
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr "no hay archivos pack para indexar."
 
-#: midx.c:1035
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "falló al borrar %s"
+
+#: midx.c:1166
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "falló al limpiar multi-pack-index en %s"
 
-#: midx.c:1090
+#: midx.c:1225
+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"
+
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr "checksum incorrecto"
+
+#: midx.c:1236
 msgid "Looking for referenced packfiles"
-msgstr "Buscando por packfiles referidos"
+msgstr "Buscando packfiles referidos"
 
-#: midx.c:1105
+#: midx.c:1251
 #, 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:1109
-msgid "Verifying OID order in MIDX"
-msgstr "Verificando orden de OID en MIDX"
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr "el midx no contiene oid"
 
-#: midx.c:1118
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Verificando orden de OID en multi-pack-index"
+
+#: midx.c:1274
 #, 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:1137
+#: midx.c:1294
 msgid "Sorting objects by packfile"
 msgstr "Ordenando objetos por packfile"
 
-#: midx.c:1143
+#: midx.c:1301
 msgid "Verifying object offsets"
 msgstr "Verificando offsets de objetos"
 
-#: midx.c:1159
+#: midx.c:1317
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "fallo al cargar entrada pack para oid[%d] = %s"
 
-#: midx.c:1165
+#: midx.c:1323
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "falló al cargar el pack-index para packfile %s"
 
-#: midx.c:1174
+#: midx.c:1332
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "offset para objeto incorrecto oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1349
+#: midx.c:1357
+msgid "Counting referenced objects"
+msgstr "Contando objetos no referenciados"
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Encontrando y borrando packfiles sin referencias"
+
+#: midx.c:1558
 msgid "could not start pack-objects"
-msgstr "no se pudo empezar los pack-objetcts"
+msgstr "no se pudo iniciar pack-objects"
 
-#: midx.c:1368
+#: midx.c:1578
 msgid "could not finish pack-objects"
-msgstr "no se pudo finalizar pack-objetcts"
+msgstr "no se pudo finalizar pack-objects"
 
-#: name-hash.c:537
+#: name-hash.c:542
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "no es posible crear hilo lazy_dir: %s"
 
-#: name-hash.c:559
+#: name-hash.c:564
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "no es posible crear hilo lazy_name: %s"
 
-#: name-hash.c:565
+#: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "no es posible unir hilo lazy_name: %s"
@@ -4264,21 +5462,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 preia 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
@@ -4299,6 +5496,365 @@ 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
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+"directorio de objetos %s no existe; revisa .git/objects/info/alternates"
+
+#: object-file.c:584
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
+
+#: object-file.c:658
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignorando espacios de objetos alternos, anidado demasiado profundo"
+
+#: object-file.c:665
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "incapaz de normalizar directorio de objetos: %s"
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr "no es posible hacer fdopen en lockfile alternos"
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr "no es posible leer el archivo de alternativos"
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr "no es posible mover el nuevo archivo de alternativos al lugar"
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "ruta '%s' no existe"
+
+#: object-file.c:789
+#, 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:795
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "repositorio de referencia '%s' no es un repositorio local."
+
+#: object-file.c:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "repositorio de referencia '%s' es superficial (shallow)"
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "repositorio de referencia '% s' está injertado"
+
+#: object-file.c:869
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "línea inválida mientras se analizaban refs alternas: %s"
+
+#: object-file.c:1019
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
+
+#: object-file.c:1054
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap falló %s"
+
+#: object-file.c:1218
+#, c-format
+msgid "object file %s is empty"
+msgstr "archivo de objeto %s está vacío"
+
+#: object-file.c:1353 object-file.c:2548
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objeto suelto corrupto '%s'"
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "basura al final del objeto suelto '%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 "no es posible desempacar header %s con --allow-unknown-type"
+
+#: object-file.c:1484
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "incapaz de desempaquetar header %s"
+
+#: object-file.c:1490
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "no es posible analizar header %s con --allow-unknown-type"
+
+#: object-file.c:1493
+#, c-format
+msgid "unable to parse %s header"
+msgstr "incapaz de analizar header %s"
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr "falló al leer objeto %s"
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "reemplazo %s no encontrado para %s"
+
+#: object-file.c:1725
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "objeto suelto %s (guardado en %s) está corrompido"
+
+#: object-file.c:1729
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "objeto empaquetado %s (guardado en %s) está corrompido"
+
+#: object-file.c:1834
+#, c-format
+msgid "unable to write file %s"
+msgstr "no es posible escribir archivo %s"
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "no se pudo poner permisos a '%s'"
+
+#: object-file.c:1848
+msgid "file write error"
+msgstr "falló de escritura"
+
+#: object-file.c:1868
+msgid "error when closing loose object file"
+msgstr "error al cerrar el archivo de objeto suelto"
+
+#: object-file.c:1933
+#, 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:1935
+msgid "unable to create temporary file"
+msgstr "no es posible crear un archivo temporal"
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr "no es posible escribir el archivo de objeto suelto"
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "no es posible desinflar el objeto nuevo %s (%d)"
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd en objeto %s falló (%d)"
+
+#: object-file.c:1973
+#, 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:1983 builtin/pack-objects.c:1237
+#, c-format
+msgid "failed utime() on %s"
+msgstr "falló utime() en %s"
+
+#: object-file.c:2060
+#, c-format
+msgid "cannot read object for %s"
+msgstr "no se pudo leer el objeto para %s"
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr "commit corrupto"
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr "tag corrupto"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr "error de lectura al indexar %s"
+
+#: object-file.c:2222
+#, c-format
+msgid "short read while indexing %s"
+msgstr "lectura corta al indexar %s"
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: falló al insertar en la base de datos"
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipo de archivo no soportado"
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s no es objeto válido"
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s no es un objeto '%s' válido"
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "no es posible abrir %s"
+
+#: object-file.c:2559 object-file.c:2612
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash no concuerda para %s (se esperaba %s)"
+
+#: object-file.c:2583
+#, c-format
+msgid "unable to mmap %s"
+msgstr "no es posible hacer mmap a %s"
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "incapaz de desempaquetar header de %s"
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "incapaz de analizar header de %s"
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "no es posible desempaquetar contenidos de %s"
+
+#: object-name.c:480
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "el ID de objeto corto %s es ambiguo"
+
+#: object-name.c:491
+msgid "The candidates are:"
+msgstr "Los candidatos son:"
+
+#: 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 ""
+"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n"
+"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n"
+"tal vez sean creadas por error. Por ejemplo,\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por "
+"favor\n"
+"examina estas refs y tal vez bórralas. Silencia este mensaje\n"
+"ejecutando \"git config advice.objectNameWarning false\""
+
+#: 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:918
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "log para '%.*s' solo tiene %d entradas"
+
+#: 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:1702
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"ruta '%s' existe, pero no '%s'\n"
+"ayuda: ¿Quisiste decir '%.*s:%s' o '%.*s:./%s'?"
+
+#: object-name.c:1711
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "ruta '%s' no existe en '%.*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 ""
+"ruta '%s' está en el índice, pero no en stage %d\n"
+"ayuda: ¿Quisiste decir: '%d:%s'?"
+
+#: 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 índice, pero no '%s'\n"
+"ayuda: ¿Quisiste decir ':%d:%s' o ':%d:./%s'?"
+
+#: 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 índice"
+
+#: 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 índice)"
+
+#: 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:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nombre de objeto no válido: '%.*s'."
+
 #: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
@@ -4309,37 +5865,116 @@ 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:233
+#: 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:246
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "incapaz de analizar objeto: %s"
 
-#: object.c:266 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "hash no concuerda %s"
 
-#: packfile.c:641
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr "no se pudo obtener el tamaño de %s"
+
+#: pack-bitmap.c:1571 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"
+
+#: 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"
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+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"
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "archivo reverse-index %s tiene una versión no soportada %<PRIu32>"
+
+#: pack-revindex.c:243
+#, c-format
+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
+msgid "cannot both write and verify reverse index"
+msgstr "no puede escribir y verificar el índice inverso"
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr "no se pudo hacer stat: %s"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "no pudo hacer %s legible"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "no se pudo escribir el archivo promisor '%s'"
+
+#: packfile.c:625
 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:1887
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "objeto %s no puede ser mapeado %s"
+
+#: packfile.c:1934
 #, 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:1891
+#: packfile.c:1938
 #, 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
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "opción `%s' espera un valor numérico"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "fecha de caducidad mal formada: '%s'"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
+
+#: parse-options-cb.c:132 parse-options-cb.c:149
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nombre de objeto mal formado '%s'"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4355,7 +5990,7 @@ msgstr "%s es incompatible con %s"
 msgid "%s : incompatible with something else"
 msgstr "%s : incompatible con otra cosa"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s no toma valores"
@@ -4365,41 +6000,46 @@ msgstr "%s no toma valores"
 msgid "%s isn't available"
 msgstr "%s no está disponible"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, 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:389
+#: parse-options.c:386
 #, 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:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr "¿quisiste decir `--%s` (con dos guiones)?"
 
-#: parse-options.c:860
+#: parse-options.c:668 parse-options.c:988
+#, c-format
+msgid "alias of --%s"
+msgstr "alias de --%s"
+
+#: parse-options.c:879
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opción `%s' desconocida"
 
-#: parse-options.c:862
+#: parse-options.c:881
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "switch desconocido `%c'"
 
-#: parse-options.c:864
+#: parse-options.c:883
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "opción desconocida en string no ascii: `%s'"
 
-#: parse-options.c:888
+#: parse-options.c:907
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:907
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
@@ -4407,74 +6047,49 @@ msgstr "uso: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:913
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
 msgstr "   o: %s"
 
-#: parse-options.c:916
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:955
+#: parse-options.c:974
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options.c:969
-#, c-format
-msgid "alias of --%s"
-msgstr "alias de --%s"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-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'"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "opción `%s' puede usar \"always\", \"auto\", o \"never\""
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nombre de objeto mal formado '%s'"
-
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "No se pudo hacer que %s fuera escribible por el grupo"
 
-#: pathspec.c:128
+#: pathspec.c:151
 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:146
+#: pathspec.c:169
 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:149
+#: pathspec.c:172
 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:192
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nombre de atributo %s inválido"
 
-#: pathspec.c:257
+#: pathspec.c:280
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles"
 
-#: pathspec.c:264
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4482,50 +6097,55 @@ 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:304
+#: pathspec.c:327
 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:325
+#: pathspec.c:348
 #, 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:330
+#: pathspec.c:353
 #, 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:368
+#: pathspec.c:391
 #, 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:427
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' y 'glob' son incompatibles"
 
-#: pathspec.c:440
+#: pathspec.c:466
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' está fuera del repositorio"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' está fuera del repositorio en '%s'"
 
-#: pathspec.c:514
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (nemotécnico: '%c')"
 
-#: pathspec.c:524
+#: pathspec.c:552
 #, 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:591
+#: pathspec.c:619
 #, 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
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "la línea está mál entrecomillada: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "no es posible escribir flush packet"
@@ -4535,142 +6155,177 @@ msgid "unable to write delim packet"
 msgstr "no es posible escribir delim packet"
 
 #: pkt-line.c:106
+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:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:265
 msgid "protocol error: impossibly long line"
 msgstr "error de protocolo: línea imposiblemente larga"
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr "escritura de paquetes con formato falló"
 
-#: pkt-line.c:196
+#: pkt-line.c:204
 msgid "packet write failed - data exceeds max packet size"
 msgstr "fallo al escribir paquete - la data excede al tamaño máximo de paquete"
 
-#: pkt-line.c:203 pkt-line.c:210
-msgid "packet write failed"
-msgstr "escritura de paquetes falló"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "escritura de paquetes falló: %s"
 
-#: pkt-line.c:295
+#: pkt-line.c:328 pkt-line.c:329
 msgid "read error"
 msgstr "error de lectura"
 
-#: pkt-line.c:303
+#: pkt-line.c:339 pkt-line.c:340
 msgid "the remote end hung up unexpectedly"
 msgstr "el remoto se colgó de manera inesperada"
 
-#: pkt-line.c:331
+#: pkt-line.c:369 pkt-line.c:371
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "error de protocolo: mal caracter de largo de línea: %.4s"
 
-#: pkt-line.c:341 pkt-line.c:346
+#: 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 "error de protocolo: mal largo de línea %d"
 
-#: pkt-line.c:362
+#: pkt-line.c:413 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "error remoto: %s"
 
-#: preload-index.c:119
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr "Refrescando index"
 
-#: preload-index.c:138
+#: preload-index.c:144
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "no es posible crear lstat hilado: %s"
 
-#: pretty.c:966
+#: pretty.c:988
 msgid "unable to parse --pretty format"
-msgstr "incapaz de analizar el formato --pretty"
+msgstr "incapaz de analizar el formato de --pretty"
 
-#: promisor-remote.c:25
-msgid "Remote with no URL"
-msgstr "Remoto sin URL"
+#: 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"
 
-#: promisor-remote.c:61
+#: 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"
+
+#: 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"
+
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "nombre remoto promisor no puede comenzar con '/': %s"
 
-#: range-diff.c:71
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "info de objeto: se espera flush tras argumentos"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Quitando objetos duplicados"
+
+#: range-diff.c:78
 msgid "could not start `log`"
 msgstr "no se pudo comenzar `log`"
 
-#: range-diff.c:73
+#: range-diff.c:80
 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:92 sequencer.c:4985
+#: range-diff.c:101 sequencer.c:5550
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "no se pudo analizar commit '%s'"
 
-#: range-diff.c:118
+#: range-diff.c:115
+#, 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 de `log`: no comienza con 'commit "
+"': '%s'"
+
+#: range-diff.c:140
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "no se puede analizar git header '%.*s'"
 
-#: range-diff.c:275
+#: range-diff.c:307
 msgid "failed to generate diff"
 msgstr "falló al generar diff"
 
-#: range-diff.c:507 range-diff.c:509
+#: 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: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:680
+#: 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:696
+#: 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:718
+#: 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:723
+#: read-cache.c:753
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' no tiene un commit checked out"
 
-#: read-cache.c:775
+#: read-cache.c:805
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "no es posible indexar archivo '%s'"
 
-#: read-cache.c:794
+#: read-cache.c:824
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "no es posible agregar '%s' al index"
 
-#: read-cache.c:805
+#: 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:1314
+#: read-cache.c:1358
 #, 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:1520
+#: read-cache.c:1573
 msgid "Refresh index"
 msgstr "Refrescar index"
 
-#: read-cache.c:1635
+#: read-cache.c:1705
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4679,7 +6334,7 @@ msgstr ""
 "index.version configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 
-#: read-cache.c:1645
+#: read-cache.c:1715
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4688,150 +6343,165 @@ msgstr ""
 "GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
 "Usando versión %i"
 
-#: read-cache.c:1701
+#: read-cache.c:1771
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "mala firma 0x%08x"
 
-#: read-cache.c:1704
+#: read-cache.c:1774
 #, c-format
 msgid "bad index version %d"
-msgstr "mala versión del índice %d"
+msgstr "mala versión de índice %d"
 
-#: read-cache.c:1713
+#: read-cache.c:1783
 msgid "bad index file sha1 signature"
 msgstr "mala firma sha1 del archivo index"
 
-#: read-cache.c:1743
+#: read-cache.c:1817
 #, 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:1745
+#: read-cache.c:1819
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "ignorando extensión %.4s"
 
-#: read-cache.c:1782
+#: read-cache.c:1856
 #, 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:1798
+#: read-cache.c:1872
 #, 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:1855
+#: read-cache.c:1929
 msgid "unordered stage entries in index"
 msgstr "entradas en stage desordenadas en index"
 
-#: read-cache.c:1858
+#: read-cache.c:1932
 #, 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:1861
+#: read-cache.c:1935
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "entradas de stage desordenadas para '%s'"
 
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: 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 "archivo índice corrompido"
 
-#: read-cache.c:2108
+#: read-cache.c:2185
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "no es posible crear hilo load_cache_entries: %s"
 
-#: read-cache.c:2121
+#: read-cache.c:2198
 #, 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:2154
+#: read-cache.c:2231
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: falló al abrir el archivo index"
 
-#: read-cache.c:2158
+#: read-cache.c:2235
 #, 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:2162
+#: read-cache.c:2239
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: archivo index más pequeño de lo esperado"
 
-#: read-cache.c:2166
+#: read-cache.c:2243
 #, 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:2208
+#: read-cache.c:2286
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "no es posible crear hilo load_index_extensions: %s"
 
-#: read-cache.c:2235
+#: read-cache.c:2313
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "no es posible unir hilo load_index_extensions: %s"
 
-#: read-cache.c:2267
+#: read-cache.c:2351
 #, 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:2314
+#: read-cache.c:2398
 #, 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:3010 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
 #, c-format
 msgid "could not close '%s'"
 msgstr "no se pudo cerrar '%s'"
 
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
+#: read-cache.c:3075
+msgid "failed to convert to a sparse-index"
+msgstr "falló al convertir a un índice sparse"
+
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
 #, c-format
 msgid "could not stat '%s'"
-msgstr "no se pudo definir '%s'"
+msgstr "no se pudo hacer stat en '%s'"
 
-#: read-cache.c:3126
+#: read-cache.c:3159
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "no es posible abrir el directorio de git: %s"
 
-#: read-cache.c:3138
+#: read-cache.c:3171
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "no es posible eliminar el vinculo: %s"
 
-#: read-cache.c:3163
+#: read-cache.c:3200
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "no se pudo arreglar bits de permisos en '%s'"
 
-#: read-cache.c:3312
+#: read-cache.c:3349
 #, 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:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git "
+"rebase --continue'.\n"
+"O se puede abortar el rebase con 'git rebase --abort'.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4839,7 +6509,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"
@@ -4848,7 +6521,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 ""
@@ -4860,11 +6533,14 @@ msgstr ""
 "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"
+"\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"
 "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 a el label\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"
@@ -4873,22 +6549,22 @@ msgstr ""
 "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
 "abajo.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:66
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 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:65 git-rebase--preserve-merges.sh:228
+#: 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"
 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:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4896,7 +6572,7 @@ msgstr ""
 "\n"
 "Si eliminas una línea aquí EL COMMIT SE PERDER�.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4910,7 +6586,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4920,31 +6596,28 @@ msgstr ""
 "Como sea, si quieres borrar todo, el rebase será abortado.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Tenga en cuenta que los commits vacíos están comentados"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
+#: 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 "no se pudo escribir '%s'"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "no se pudo copiar '%s' a '%s'."
+msgid "could not write '%s'."
+msgstr "no se pudo escribir '%s'."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:196
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
-"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
-"Commits botados (empezando con el 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:180
+#: rebase-interactive.c:203
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4959,127 +6632,17 @@ msgstr ""
 "\n"
 "Use '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"
 
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "¡%s no apunta a ningún objeto válido!"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "ignorando referencia rota %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "ignorando referencia rota %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "no se pudo abrir '%s' para escritura: %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "no se pudo leer la referencia '%s'"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "ref '%s' ya existe"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "ID de objecto inesperado cuando se escribía '%s'"
-
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "no se pudo escribir en '%s'"
-
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1004
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "no se pudo abrir '%s' para escritura"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "ID de objecto inesperado cuando se borraba '%s'"
-
-#: refs.c:998
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "log de ref %s tiene un vacío tras %s"
-
-#: refs.c:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "log de ref %s finalizado inesperadamente en %s"
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "log de %s está vacío"
-
-#: refs.c:1155
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "rehusando actualizar ref con mal nombre '%s'"
-
-#: refs.c:1231
+#: 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 "update_ref failed for ref '%s': %s"
-msgstr "update_ref falló para ref '%s': %s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "múltiples actualizaciones para ref '%s' no permitidas"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' existe; no se puede crear '%s'"
-
-#: refs.c:2157 refs.c:2192
-#, 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:1234
-#, c-format
-msgid "could not remove reference %s"
-msgstr "no se pudo eliminar la referencia %s"
-
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "no se pudo eliminar la referencia %s: %s"
-
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "no se pudo eliminar la referencia: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "refspec inválido: '%s'"
+msgid "could not read '%s'."
+msgstr "no se puede leer '%s'."
 
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
 msgstr "desaparecido"
 
@@ -5098,281 +6661,414 @@ msgstr "detrás %d"
 msgid "ahead %d, behind %d"
 msgstr "delante %d, detrás %d"
 
-#: ref-filter.c:165
+#: ref-filter.c:230
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "formato esperado: %%(color:<color>)"
 
-#: ref-filter.c:167
+#: ref-filter.c:232
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "color no reconocido: %%(color:%s)"
 
-#: ref-filter.c:189
+#: ref-filter.c:254
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valor entero esperado refname:lstrip=%s"
 
-#: ref-filter.c:193
+#: ref-filter.c:258
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valor entero esperado refname:rstrip=%s"
 
-#: ref-filter.c:195
+#: ref-filter.c:260
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
-msgstr "argumento: %s no reconocido %%(%s)"
+msgstr "argumento %%(%s) no reconocido: %s"
 
-#: ref-filter.c:250
+#: ref-filter.c:315
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) no toma ningún argumento"
 
-#: ref-filter.c:272
+#: ref-filter.c:339
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
-msgstr "%%(objectsize) no reconocido argumento: %s"
+msgstr "argumento %%(objectsize) no reconocido: %s"
 
-#: ref-filter.c:280
+#: ref-filter.c:347
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) no toma argumentos"
 
-#: ref-filter.c:292
+#: ref-filter.c:359
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) no toma ningún argumento"
 
-#: ref-filter.c:301
+#: ref-filter.c:372
 #, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) no toma ningún argumento"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "argumento %%(subject) no reconocido: %s"
 
-#: ref-filter.c:323
+#: ref-filter.c:391
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "se esperaba %%(trailers:key=<value>)"
+
+#: ref-filter.c:393
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
-msgstr "%%(trailers) desconocidos, argumento: %s"
+msgstr "argumento %%(trailers) desconocido: %s"
 
-#: ref-filter.c:352
+#: ref-filter.c:424
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positivo esperado contents:lines=%s"
 
-#: ref-filter.c:354
+#: ref-filter.c:426
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
-msgstr "argumento %s no reconocido %%(contents)"
+msgstr "argumento %%(contents) no reconocido: %s"
+
+#: ref-filter.c:441
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "valor positivo esperado '%s' en %%(%s)"
 
-#: ref-filter.c:369
+#: ref-filter.c:445
 #, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "valor positivo esperado objectname:short=%s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "argumento '%s' no reconocido en %%(%s)"
 
-#: ref-filter.c:373
+#: ref-filter.c:459
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "argumento: %s no reconocido %%(objectname)"
+msgid "unrecognized email option: %s"
+msgstr "opción de email desconocida: %s"
 
-#: ref-filter.c:403
+#: ref-filter.c:489
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "formato esperado: %%(align:<ancho>,<posición>)"
 
-#: ref-filter.c:415
+#: ref-filter.c:501
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "posición desconocida: %s"
 
-#: ref-filter.c:422
+#: ref-filter.c:508
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "ancho desconocido: %s"
 
-#: ref-filter.c:431
+#: ref-filter.c:517
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argumento no reconocido para %%(align): %s"
 
-#: ref-filter.c:439
+#: ref-filter.c:525
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "se esperaba un ancho positivo con el átomo %%(align)"
 
-#: ref-filter.c:457
+#: ref-filter.c:543
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
-msgstr "argumento: %s no reconocido %%(if)"
+msgstr "argumento %%(if) no reconocido: %s"
 
-#: ref-filter.c:559
+#: ref-filter.c:645
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nombre mal formado de campo: %.*s"
 
-#: ref-filter.c:586
+#: ref-filter.c:672
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nombre de campo desconocido: %.*s"
 
-#: ref-filter.c:590
+#: ref-filter.c:676
 #, 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:714
+#: ref-filter.c:801
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"
 
-#: ref-filter.c:777
+#: ref-filter.c:865
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
 
-#: ref-filter.c:779
+#: ref-filter.c:867
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "formato: átomo %%(then) usado más de una vez"
 
-#: ref-filter.c:781
+#: ref-filter.c:869
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "formato: átomo %%(then) usado después de %%(else)"
 
-#: ref-filter.c:809
+#: ref-filter.c:897
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
 
-#: ref-filter.c:811
+#: ref-filter.c:899
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "formato: átomo %%(else) usado sin un átomo %%(then)"
 
-#: ref-filter.c:813
+#: ref-filter.c:901
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "formato: átomo %%(else) usado más de una vez"
 
-#: ref-filter.c:828
+#: ref-filter.c:916
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
 
-#: ref-filter.c:885
+#: ref-filter.c:973
 #, c-format
 msgid "malformed format string %s"
 msgstr "formato de cadena mal formado %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1621
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(no hay rama, rebasando %s)"
+
+#: ref-filter.c:1624
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(no hay rama, rebasando con HEAD desacoplado %s)"
+
+#: ref-filter.c:1627
 #, c-format
-msgid "no branch, rebasing %s"
-msgstr "no hay rama, rebasando %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(no hay rama, comenzando biseccón en %s)"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1631
 #, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "(o hay rama, rebasando con HEAD desacoplado %s"
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD desacoplado en %s)"
 
-#: ref-filter.c:1494
+#: ref-filter.c:1634
 #, c-format
-msgid "no branch, bisect started on %s"
-msgstr "no hay rama, comenzando biseccón en  %s"
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD desacoplado de %s)"
 
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "sin rama"
+#: ref-filter.c:1637
+msgid "(no branch)"
+msgstr "(sin rama)"
 
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1669 ref-filter.c:1880
 #, c-format
 msgid "missing object %s for %s"
 msgstr "falta objeto %s para %s"
 
-#: ref-filter.c:1550
+#: ref-filter.c:1679
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer falló en %s para %s"
 
-#: ref-filter.c:2004
+#: ref-filter.c:2064
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objeto mal formado en '%s'"
 
-#: ref-filter.c:2093
+#: ref-filter.c:2153
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorando referencia con nombre roto %s"
 
-#: ref-filter.c:2389
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "formato: falta átomo %%(end)"
-
-#: ref-filter.c:2489
+#: ref-filter.c:2158 refs.c:676
 #, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "opción `%s' es incompatible con --merged"
+msgid "ignoring broken ref %s"
+msgstr "ignorando referencia rota %s"
 
-#: ref-filter.c:2492
+#: ref-filter.c:2502
 #, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "opción `%s' es incompatible con --no-merged"
+msgid "format: %%(end) atom missing"
+msgstr "formato: falta átomo %%(end)"
 
-#: ref-filter.c:2502
+#: ref-filter.c:2596
 #, c-format
 msgid "malformed object name %s"
 msgstr "nombre de objeto mal formado %s"
 
-#: ref-filter.c:2507
+#: ref-filter.c:2601
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "opción '%s' debe apuntar a un commit"
 
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "¡%s no apunta a ningún objeto válido!"
+
+#: 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 ""
+"Usando '%s' como el nombre de la rama inicial. Este nombre de rama "
+"predeterminado\n"
+"está sujeto a cambios. Para configurar el nombre de la rama inicial para "
+"usar en todos\n"
+"de sus nuevos repositorios, reprimiendo esta advertencia, llame a:\n"
+"\n"
+"\tgit config --global init.defaultBranch <nombre>\n"
+"\n"
+"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
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "no se pudo recibir `%s`"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nombre de rama inválido: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorando referencia symbólica rota %s"
+
+#: refs.c:922
+#, 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
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "log de ref %s finalizado inesperadamente en %s"
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "log de %s está vacío"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "rehusando actualizar ref con mal nombre '%s'"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref falló para ref '%s': %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "no se permiten múltiples actualizaciones para ref '%s'"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "ref updates abortados por el hook"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe; no se puede crear '%s'"
+
+#: refs.c:2248 refs.c:2283
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "could not delete references: %s"
+msgstr "no se pudo eliminar las referencias: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec inválido: '%s'"
+
+#: remote.c:351
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "config remote shorthand no puede comenzar con '/': %s"
 
-#: remote.c:413
+#: remote.c:399
 msgid "more than one receivepack given, using the first"
 msgstr "más de un receivepack dado, usando el primero"
 
-#: remote.c:421
+#: remote.c:407
 msgid "more than one uploadpack given, using the first"
 msgstr "más de un uploadpack dado, usando el primero"
 
-#: remote.c:611
+#: remote.c:590
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "No se pueden traer ambos %s y %s a %s"
 
-#: remote.c:615
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s por lo general hace seguimiento a %s, no a %s"
 
-#: remote.c:619
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s hace seguimiento tanto a %s como a %s"
 
-#: remote.c:687
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "llave '%s' de patrón no tuvo '*'"
 
-#: remote.c:697
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "valor '%s' del patrón no tiene '*'"
 
-#: remote.c:1003
+#: 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:1008
+#: remote.c:1088
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "src refspec %s concuerda con más de uno"
@@ -5381,7 +7077,7 @@ msgstr "src refspec %s concuerda con más de uno"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1023
+#: remote.c:1103
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5394,8 +7090,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"
@@ -5405,7 +7101,7 @@ msgstr ""
 "Ninguno funcionó así que nos dimos por vencidos. Tienes que especificar el "
 "full ref."
 
-#: remote.c:1043
+#: remote.c:1123
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5416,18 +7112,18 @@ msgstr ""
 "¿Quisiste crear un branch nuevo mediante un push a\n"
 "'%s:refs/heads/%s'?"
 
-#: remote.c:1048
+#: remote.c:1128
 #, 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 ""
-"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:1053
+#: remote.c:1133
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5436,9 +7132,9 @@ 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:1058
+#: remote.c:1138
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5447,117 +7143,117 @@ 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:1094
+#: 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:1105
+#: remote.c:1185
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "no es posible borrar '%s': ref remoto no existe"
 
-#: remote.c:1117
+#: remote.c:1197
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "dst refspec %s concuerda con más de uno"
 
-#: remote.c:1124
+#: remote.c:1204
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "dst ref %s recibe de más de un src"
 
-#: remote.c:1627 remote.c:1728
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
 msgstr "HEAD no apunta a ninguna rama"
 
-#: remote.c:1636
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "no existe tal rama: '%s'"
 
-#: remote.c:1639
+#: remote.c:1736
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "no se ha configurado upstream para la rama '%s'"
 
-#: remote.c:1645
+#: 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:1660
+#: remote.c:1757
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"
 
-#: remote.c:1672
+#: remote.c:1769
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la rama '%s' no tiene remoto para enviar"
 
-#: remote.c:1682
+#: remote.c:1779
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "refspecs del push para '%s' no incluyen '%s'"
 
-#: remote.c:1695
+#: 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:1717
+#: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "no se puede resolver push 'simple' para un destino único"
 
-#: remote.c:1843
+#: 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:1856
+#: 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:2019
+#: remote.c:2119
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Tu rama está basada en '%s', pero upstream ha desaparecido.\n"
 
-#: remote.c:2023
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (usa \"git branch --unset-upstream\" para arreglar)\n"
 
-#: remote.c:2026
+#: remote.c:2126
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Tu rama está actualizada con '%s'.\n"
 
-#: remote.c:2030
+#: remote.c:2130
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Tu rama y '%s' refieren a commits diferentes.\n"
 
-#: remote.c:2033
+#: remote.c:2133
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (usa \"%s\" para detalles)\n"
 
-#: remote.c:2037
+#: 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] "Tu rama está adelantada a '%s' por %d commit.\n"
 msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"
 
-#: remote.c:2043
+#: remote.c:2143
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (usa \"git push\" para publicar tus commits locales)\n"
 
-#: remote.c:2046
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5567,11 +7263,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"
 
-#: remote.c:2054
+#: remote.c:2154
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (usa \"git pull\" para actualizar tu rama local)\n"
 
-#: remote.c:2057
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5581,16 +7277,16 @@ 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"
 
-#: remote.c:2067
+#: remote.c:2167
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
 
-#: remote.c:2250
+#: remote.c:2359
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "no se puede leer el nombre de objeto '%s'"
@@ -5605,212 +7301,233 @@ msgstr "mal nombre de ref de reemplazo: %s"
 msgid "duplicate replace ref: %s"
 msgstr "duplicar ref de reemplazo: %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
-msgstr "remplazar profundiad muy elevada para objeto %s"
+msgstr "profundiad de reemplazo demasiada 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 "MERGE_RR corrupto"
 
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
 msgstr "incapaz de escribir entrada rerere"
 
-#: rerere.c:495
+#: rerere.c:479
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
 msgstr "hubieron errores mientras se escribía '%s' (%s)"
 
-#: rerere.c:498
+#: rerere.c:482
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "falló al hacer flush '%s'"
 
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
 #, c-format
 msgid "could not parse conflict hunks in '%s'"
 msgstr "no se pudo analizar hunks en conflicto en '%s'"
 
-#: rerere.c:684
+#: rerere.c:668
 #, c-format
 msgid "failed utime() on '%s'"
 msgstr "falló utime() en '%s'"
 
-#: rerere.c:694
+#: rerere.c:678
 #, c-format
 msgid "writing '%s' failed"
 msgstr "escribiendo '%s' falló"
 
-#: rerere.c:714
+#: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
 msgstr "'%s' puesto en stage usando resolución previa."
 
-#: rerere.c:753
+#: rerere.c:737
 #, c-format
 msgid "Recorded resolution for '%s'."
 msgstr "Resolución guardada para '%s'."
 
-#: rerere.c:788
+#: rerere.c:772
 #, c-format
 msgid "Resolved '%s' using previous resolution."
 msgstr "'%s' resuelto usando resolución previa."
 
-#: rerere.c:803
+#: rerere.c:787
 #, c-format
 msgid "cannot unlink stray '%s'"
 msgstr "no se puede desvincular stray '%s'"
 
-#: rerere.c:807
+#: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
-msgstr "Resolución precargada para '%s'"
+msgstr "Preimagen grabada para '%s'"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: 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 "no se pudo crear el directorio '%s'"
 
-#: rerere.c:1057
+#: rerere.c:1041
 #, c-format
 msgid "failed to update conflicted state in '%s'"
 msgstr "falló al actualizar estado conflictivo en '%s'"
 
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
 #, c-format
 msgid "no remembered resolution for '%s'"
 msgstr "resolución para '%s' no recordada"
 
-#: rerere.c:1077
+#: rerere.c:1061
 #, c-format
 msgid "cannot unlink '%s'"
 msgstr "no se puede desvincular '%s'"
 
-#: rerere.c:1087
+#: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
-msgstr "Actualizada preimagen para '%s'"
+msgstr "Preimagen actualizada para '%s'"
 
-#: rerere.c:1096
+#: rerere.c:1080
 #, c-format
 msgid "Forgot resolution for '%s'\n"
 msgstr "Se olvidó resolución para '%s'\n"
 
-#: rerere.c:1199
+#: rerere.c:1191
 msgid "unable to open rr-cache directory"
 msgstr "no es posible abrir directorio rr-cache"
 
-#: revision.c:2509
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "no se pudo determinar revisión HEAD"
+
+#: reset.c:69 reset.c:75 sequencer.c:3689
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "falló al encontrar árbol de %s"
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> ya no es soportado"
+
+#: revision.c:2684
 msgid "your current branch appears to be broken"
 msgstr "tu rama actual parece estar rota"
 
-#: revision.c:2512
+#: revision.c:2687
 #, 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:2720
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent es incompatible con --bisect"
-
-#: revision.c:2724
+#: revision.c:2893
 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:763
+#: run-command.c:766
 msgid "open /dev/null failed"
 msgstr "falló al abrir /dev/null"
 
-#: run-command.c:1269
+#: run-command.c:1274
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "no es posible crear hilo async: %s"
 
-#: run-command.c:1333
+#: 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 ""
 "El hook '%s' fue ignorado porque no ha sido configurado como ejecutable.\n"
-"Puedes desactivar esta advertencias con `git config advice.ignoredHook "
-"false`."
+"Puedes desactivar esta advertencia con `git config advice.ignoredHook false`."
 
-#: send-pack.c:142
+#: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "flush packet inesperado mientras se leía estatus de desempaquetado remoto"
 
-#: send-pack.c:144
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
 
-#: send-pack.c:146
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "desempaquetado remoto falló: %s"
 
-#: send-pack.c:307
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "falló al firmar el certificado de push"
 
-#: send-pack.c:421
+#: send-pack.c:433
+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
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "negociación push falló; procediendo con el push de todas formas"
+
+#: send-pack.c:526
+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:535
 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:423
+#: send-pack.c:537
 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:435
+#: send-pack.c:544
 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:440
+#: send-pack.c:549
 msgid "the receiving end does not support push options"
 msgstr "el destino no soporta opciones de push"
 
-#: sequencer.c:187
+#: sequencer.c:196
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mensaje de commit inválido, modo cleanup '%s'"
 
-#: sequencer.c:292
+#: sequencer.c:324
 #, c-format
 msgid "could not delete '%s'"
 msgstr "no se pudo borrar '%s'"
 
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
 #, c-format
 msgid "could not remove '%s'"
-msgstr "no se pudo eliminar'%s'"
+msgstr "no se pudo eliminar '%s'"
 
-#: sequencer.c:321
+#: sequencer.c:354
 msgid "revert"
 msgstr "revertir"
 
-#: sequencer.c:323
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:358
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
+#: sequencer.c:360
 #, c-format
 msgid "unknown action: %d"
 msgstr "acción desconocida: %d"
 
-#: sequencer.c:385
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5818,7 +7535,7 @@ msgstr ""
 "después de resolver los conflictos, marca las rutas corregidas\n"
 "con 'git add <rutas>' o 'git rm <rutas>'"
 
-#: sequencer.c:388
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5828,110 +7545,109 @@ msgstr ""
 "con 'git add <rutas>' o 'git rm <rutas>'\n"
 "y haz un commit del resultado con 'git commit'"
 
-#: sequencer.c:401 sequencer.c:2847
+#: sequencer.c:435 sequencer.c:3271
 #, c-format
 msgid "could not lock '%s'"
 msgstr "no se pudo bloquear '%s'"
 
-#: sequencer.c:408
+#: 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 "no se pudo escribir en '%s'"
+
+#: sequencer.c:442
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "no se pudo escribir EOL en '%s'"
 
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
-#: sequencer.c:3130
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "falló al finalizar '%s'"
 
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
-#: builtin/rebase.c:568
-#, c-format
-msgid "could not read '%s'"
-msgstr "no se pudo leer '%s'"
-
-#: sequencer.c:462
+#: sequencer.c:486
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "tus cambios locales serán sobreescritos por %s."
 
-#: sequencer.c:466
+#: sequencer.c:490
 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:498
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avance rápido"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:561 builtin/tag.c:609
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modo cleanup inválido %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:631
+#: sequencer.c:671
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Incapaz de escribir el nuevo archivo índice"
 
-#: sequencer.c:648
+#: sequencer.c:685
 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:662
+#: sequencer.c:699
 msgid "could not resolve HEAD commit"
 msgstr "no se pudo resolver el commit de HEAD"
 
-#: sequencer.c:742
+#: sequencer.c:779
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "no hay llave presente en '%.*s'"
 
-#: sequencer.c:753
+#: sequencer.c:790
 #, 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:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
+#: 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 "no se pudo abrir '%s' para lectura"
 
-#: sequencer.c:800
+#: sequencer.c:837
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' ya proporcionado"
 
-#: sequencer.c:805
+#: sequencer.c:842
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' ya proporcionado"
 
-#: sequencer.c:810
+#: sequencer.c:847
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' ya proporcionado"
 
-#: sequencer.c:814
+#: sequencer.c:851
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variable desconocida '%s'"
 
-#: sequencer.c:819
+#: sequencer.c:856
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "falta 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:821
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "falta 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:823
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "falta 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:872
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5961,11 +7677,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1146
+#: sequencer.c:1212
 msgid "'prepare-commit-msg' hook failed"
 msgstr "hook 'prepare-commit-msg' falló"
 
-#: sequencer.c:1153
+#: 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"
@@ -5980,9 +7696,9 @@ 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 "
-"el \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. Ejecuta "
+"el\n"
 "siguiente comando y sigue las instrucciones de tu editor\n"
 " para modificar tu archivo de configuración:\n"
 "\n"
@@ -5992,7 +7708,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1166
+#: 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"
@@ -6006,8 +7722,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"
@@ -6016,325 +7732,343 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1208
+#: sequencer.c:1273
 msgid "couldn't look up newly created commit"
 msgstr "no se pudo revisar el commit recién creado"
 
-#: sequencer.c:1210
+#: sequencer.c:1275
 msgid "could not parse newly created commit"
 msgstr "no se pudo analizar el commit recién creado"
 
-#: sequencer.c:1256
+#: sequencer.c:1321
 msgid "unable to resolve HEAD after creating commit"
 msgstr "no se pudo resolver HEAD tras crear el commit"
 
-#: sequencer.c:1258
+#: sequencer.c:1323
 msgid "detached HEAD"
 msgstr "HEAD desacoplado"
 
-#: sequencer.c:1262
+#: sequencer.c:1327
 msgid " (root-commit)"
 msgstr " (commit-raíz)"
 
-#: sequencer.c:1283
+#: sequencer.c:1348
 msgid "could not parse HEAD"
 msgstr "no se pudo analizar HEAD"
 
-#: sequencer.c:1285
+#: sequencer.c:1350
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "¡HEAD %s no es un commit!"
 
-#: sequencer.c:1289 builtin/commit.c:1571
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
 msgid "could not parse HEAD commit"
 msgstr "no se pudo analizar el commit de HEAD"
 
-#: sequencer.c:1341 sequencer.c:1933
+#: sequencer.c:1410 sequencer.c:2295
 msgid "unable to parse commit author"
 msgstr "no es posible analizar el autor del commit"
 
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree falló al escribir el árbol"
 
-#: sequencer.c:1369 sequencer.c:1429
+#: sequencer.c:1454 sequencer.c:1574
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "no se puede leer el mensaje del commit de '%s'"
 
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identidad de autor inválida '%s'"
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr "autor corrupto: falta información de fecha"
+
+#: 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 "falló al escribir el objeto commit"
 
-#: sequencer.c:1456
+#: 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 "no se puede actualizar %s"
+
+#: sequencer.c:1606
 #, c-format
 msgid "could not parse commit %s"
 msgstr "no se pudo analizar commit %s"
 
-#: sequencer.c:1461
+#: sequencer.c:1611
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "no se pudo analizar el commit padre %s"
 
-#: sequencer.c:1535 sequencer.c:1645
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
 msgid "unknown command: %d"
 msgstr "comando desconocido: %d"
 
-#: sequencer.c:1592 sequencer.c:1617
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "Este es el mensaje del 1er commit:"
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Este es el mensaje del commit #%d:"
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "El mensaje del 1er commit será saltado:"
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "El mensaje del commit #%d será saltado:"
+
+#: sequencer.c:1740
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Esta es una combinación de %d commits."
 
-#: sequencer.c:1602
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "no se puede escribir '%s'"
+
+#: sequencer.c:1934
 msgid "need a HEAD to fixup"
 msgstr "se necesita un HEAD para arreglar"
 
-#: sequencer.c:1604 sequencer.c:3157
+#: sequencer.c:1936 sequencer.c:3582
 msgid "could not read HEAD"
 msgstr "no se pudo leer HEAD"
 
-#: sequencer.c:1606
+#: sequencer.c:1938
 msgid "could not read HEAD's commit message"
 msgstr "no se pudo leer el mensaje de commit de HEAD"
 
-#: sequencer.c:1612
-#, c-format
-msgid "cannot write '%s'"
-msgstr "no se puede escribir '%s'"
-
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
-msgid "This is the 1st commit message:"
-msgstr "Este es el mensaje del 1er commit:"
-
-#: sequencer.c:1627
+#: sequencer.c:1962
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "no se puede leer el mensaje del commit de %s"
 
-#: sequencer.c:1634
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Este es el mensaje del commit #%d:"
-
-#: sequencer.c:1640
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "El mensaje del commit #%d será saltado:"
-
-#: sequencer.c:1728
+#: sequencer.c:2072
 msgid "your index file is unmerged."
 msgstr "tu archivo índice no está fusionado."
 
-#: sequencer.c:1735
+#: sequencer.c:2079
 msgid "cannot fixup root commit"
 msgstr "no se puede arreglar el commit raíz"
 
-#: sequencer.c:1754
+#: sequencer.c:2098
 #, 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:1762 sequencer.c:1770
+#: sequencer.c:2106 sequencer.c:2114
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "el commit %s no tiene un padre %d"
 
-#: sequencer.c:1776
+#: sequencer.c:2120
 #, 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:1795
+#: sequencer.c:2139
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: no se puede analizar el commit padre %s"
 
-#: sequencer.c:1860
+#: sequencer.c:2205
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "no se puede renombrar '%s' a '%s'"
 
-#: sequencer.c:1915
+#: sequencer.c:2265
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "no se pudo revertir %s... %s"
 
-#: sequencer.c:1916
+#: sequencer.c:2266
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "no se pudo aplicar %s... %s"
 
-#: sequencer.c:1983
+#: sequencer.c:2287
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "descartando $%s %s -- contenidos del parche ya están en upstream\n"
+
+#: sequencer.c:2345
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: falló al leer el índice"
 
-#: sequencer.c:1990
+#: sequencer.c:2352
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: falló al refrescar el índice"
 
-#: sequencer.c:2066
+#: sequencer.c:2425
 #, c-format
 msgid "%s does not accept arguments: '%s'"
-msgstr "%s no acepta los argumentos: '%s'"
+msgstr "%s no acepta argumentos: '%s'"
 
-#: sequencer.c:2075
+#: sequencer.c:2434
 #, c-format
 msgid "missing arguments for %s"
-msgstr "faltan argumentos para para %s"
+msgstr "faltan argumentos para %s"
 
-#: sequencer.c:2112
+#: sequencer.c:2477
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "no se puede analizar '%.*s'"
+msgid "could not parse '%s'"
+msgstr "no se puede analizar '%s'"
 
-#: sequencer.c:2166
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "línea inválida %d: %.*s"
 
-#: sequencer.c:2177
+#: sequencer.c:2549
 #, 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:2225 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "no se puede leer '%s'."
-
-#: sequencer.c:2261
+#: sequencer.c:2635
 msgid "cancelling a cherry picking in progress"
 msgstr "cancelando cherry-pick en progreso"
 
-#: sequencer.c:2268
+#: sequencer.c:2644
 msgid "cancelling a revert in progress"
 msgstr "cancelando revert en progreso"
 
-#: sequencer.c:2302
+#: sequencer.c:2690
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
 
-#: sequencer.c:2304
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "hoja de instrucciones inutilizable: '%s'"
 
-#: sequencer.c:2309
+#: sequencer.c:2697
 msgid "no commits parsed."
 msgstr "ningún commit analizado."
 
-#: sequencer.c:2320
+#: sequencer.c:2708
 msgid "cannot cherry-pick during a revert."
 msgstr "no se puede realizar cherry-pick durante un revert."
 
-#: sequencer.c:2322
+#: sequencer.c:2710
 msgid "cannot revert during a cherry-pick."
 msgstr "no se puede realizar un revert durante un cherry-pick."
 
-#: sequencer.c:2404
+#: sequencer.c:2788
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valor inválido para %s: %s"
 
-#: sequencer.c:2491
+#: sequencer.c:2897
 msgid "unusable squash-onto"
 msgstr "squash-onto inservible"
 
-#: sequencer.c:2507
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "hoja de opciones mal formada: '%s'"
 
-#: sequencer.c:2590 sequencer.c:4308
+#: sequencer.c:3012 sequencer.c:4868
 msgid "empty commit set passed"
 msgstr "conjunto de commits vacío entregado"
 
-#: sequencer.c:2606
+#: sequencer.c:3029
 msgid "revert is already in progress"
 msgstr "revert ya está en progreso"
 
-#: sequencer.c:2608
+#: sequencer.c:3031
 #, 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:2611
+#: sequencer.c:3034
 msgid "cherry-pick is already in progress"
 msgstr "cherry-pick ya está en progreso"
 
-#: sequencer.c:2613
+#: sequencer.c:3036
 #, 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:2627
+#: sequencer.c:3050
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "no se pudo crear un directorio secuenciador '%s'"
 
-#: sequencer.c:2642
+#: sequencer.c:3065
 msgid "could not lock HEAD"
 msgstr "no se pudo bloquear HEAD"
 
-#: sequencer.c:2702 sequencer.c:4057
+#: sequencer.c:3125 sequencer.c:4581
 msgid "no cherry-pick or revert in progress"
 msgstr "ningún cherry-pick o revert en progreso"
 
-#: sequencer.c:2704 sequencer.c:2715
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
 msgstr "no se puede resolver HEAD"
 
-#: sequencer.c:2706 sequencer.c:2750
+#: sequencer.c:3129 sequencer.c:3173
 msgid "cannot abort from a branch yet to be born"
 msgstr "no se puede abortar de una rama por nacer"
 
-#: sequencer.c:2736 builtin/grep.c:736
+#: sequencer.c:3159 builtin/grep.c:758
 #, c-format
 msgid "cannot open '%s'"
 msgstr "no se puede abrir '%s'"
 
-#: sequencer.c:2738
+#: sequencer.c:3161
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "no se puede leer '%s': %s"
 
-#: sequencer.c:2739
+#: sequencer.c:3162
 msgid "unexpected end of file"
 msgstr "final de archivo inesperado"
 
-#: sequencer.c:2745
+#: sequencer.c:3168
 #, 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:2756
+#: sequencer.c:3179
 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:2797
+#: sequencer.c:3220
 msgid "no revert in progress"
 msgstr "no hay revert en progreso"
 
-#: sequencer.c:2805
+#: sequencer.c:3229
 msgid "no cherry-pick in progress"
 msgstr "ningún cherry-pick en progreso"
 
-#: sequencer.c:2815
+#: sequencer.c:3239
 msgid "failed to skip the commit"
 msgstr "falló al escribir el commit"
 
-#: sequencer.c:2822
+#: sequencer.c:3246
 msgid "there is nothing to skip"
 msgstr "no hay nada que saltar"
 
-#: sequencer.c:2825
+#: sequencer.c:3249
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6343,21 +8077,16 @@ msgstr ""
 "¿ya has hecho el commit?\n"
 "intenta \"git %s --continue\""
 
-#: sequencer.c:2949 sequencer.c:3969
-#, c-format
-msgid "could not update %s"
-msgstr "no se puede actualizar %s"
-
-#: sequencer.c:2987 sequencer.c:3949
+#: sequencer.c:3411 sequencer.c:4472
 msgid "cannot read HEAD"
 msgstr "no se puede leer HEAD"
 
-#: sequencer.c:3004
+#: sequencer.c:3428
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 
-#: sequencer.c:3012
+#: sequencer.c:3436
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6370,33 +8099,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:3022
+#: sequencer.c:3446
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "No se pudo aplicar %s... %.*s"
 
-#: sequencer.c:3029
+#: sequencer.c:3453
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "No se pudo fusionar %.*s"
 
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "no se pudo copiar '%s' a '%s'"
 
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
-msgid "could not read index"
-msgstr "no se pudo leer índice"
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Ejecutando: %s\n"
 
-#: sequencer.c:3074
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6411,11 +8140,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3080
+#: sequencer.c:3504
 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:3086
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6432,112 +8161,124 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3147
+#: sequencer.c:3572
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nombre de label ilegal: '%.*s'"
 
-#: sequencer.c:3201
+#: sequencer.c:3645
 msgid "writing fake root commit"
 msgstr "escribiendo commit raíz falso"
 
-#: sequencer.c:3206
+#: sequencer.c:3650
 msgid "writing squash-onto"
 msgstr "escribiendo squash-onto"
 
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "falló al encontrar árbol de %s"
-
-#: sequencer.c:3262 builtin/rebase.c:874
-msgid "could not write index"
-msgstr "no se pudo escribir índice"
-
-#: sequencer.c:3289
+#: sequencer.c:3734
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "no se pudo resolver '%s'"
 
-#: sequencer.c:3320
+#: sequencer.c:3767
 msgid "cannot merge without a current revision"
 msgstr "no se puede fusionar sin una versión actual"
 
-#: sequencer.c:3342
+#: sequencer.c:3789
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "no se puede analizar '%.*s'"
 
-#: sequencer.c:3351
+#: sequencer.c:3798
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "nada para fusionar: '%.*s'"
 
-#: sequencer.c:3363
+#: sequencer.c:3810
 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:3378
+#: sequencer.c:3826
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "no se puede leer el mensaje del commit '%s'"
 
-#: sequencer.c:3538
+#: sequencer.c:4009
 #, 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:3554
+#: sequencer.c:4025
 msgid "merge: Unable to write new index file"
 msgstr "fusión: No se puede escribir el nuevo archivo índice"
 
-#: sequencer.c:3623 builtin/rebase.c:712
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr "No se puede ejecutar autostash"
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Respuesta de stash inesperada: '%s'"
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "No se pudo crear el directorio para '%s'"
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Autostash creado: %s\n"
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr "no se pudo reset --hard"
+
+#: sequencer.c:4140
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autostash aplicado.\n"
 
-#: sequencer.c:3635
+#: sequencer.c:4152
 #, c-format
 msgid "cannot store %s"
 msgstr "no se puede guardar %s"
 
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
+#: sequencer.c:4155
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
-"Aplicando autostash resultó en conflictos.\n"
+"%s\n"
 "Tus cambios están seguros en el stash.\n"
 "Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
 "momento.\n"
 
-#: sequencer.c:3699
-#, c-format
-msgid "could not checkout %s"
-msgstr "no se puede hacer checkout a %s"
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
+msgstr "Aplicar autostash resultó en conflictos."
 
-#: sequencer.c:3713
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s no es OID válido"
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Autostash existe; creando una nueva entrada stash."
 
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
-msgstr "no se puede desacoplar HEAD"
+msgstr "no se pudo desacoplar HEAD"
 
-#: sequencer.c:3733
+#: sequencer.c:4248
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Detenido en HEAD\n"
 
-#: sequencer.c:3735
+#: sequencer.c:4250
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Detenido en %s\n"
 
-#: sequencer.c:3743
+#: sequencer.c:4258
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6558,48 +8299,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3827
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Aplicando rebase (%d/%d)%s"
+
+#: sequencer.c:4350
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Detenido en %s...  %.*s\n"
 
-#: sequencer.c:3898
+#: sequencer.c:4421
 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconocido %d"
 
-#: sequencer.c:3957
+#: sequencer.c:4480
 msgid "could not read orig-head"
-msgstr "no se puede leer orig-head"
+msgstr "no se pudo leer orig-head"
 
-#: sequencer.c:3962
+#: sequencer.c:4485
 msgid "could not read 'onto'"
-msgstr "no se puede leer 'onto'"
+msgstr "no se pudo leer 'onto'"
 
-#: sequencer.c:3976
+#: sequencer.c:4499
 #, 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:4069
+#: sequencer.c:4559
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebase aplicado satisfactoriamente y actualizado %s.\n"
+
+#: sequencer.c:4611
 msgid "cannot rebase: You have unstaged changes."
 msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
 
-#: sequencer.c:4078
+#: sequencer.c:4620
 msgid "cannot amend non-existing commit"
 msgstr "no se puede arreglar un commit no existente"
 
-#: sequencer.c:4080
+#: sequencer.c:4622
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "archivo inválido: '%s'"
 
-#: sequencer.c:4082
+#: sequencer.c:4624
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenido inválido: '%s'"
 
-#: sequencer.c:4085
+#: sequencer.c:4627
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6610,69 +8361,59 @@ msgstr ""
 "un commit con estos\n"
 "primero y luego ejecuta 'git rebase --continue' de nuevo."
 
-#: sequencer.c:4121 sequencer.c:4159
+#: sequencer.c:4663 sequencer.c:4702
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "no se pudo escribir el archivo: '%s'"
 
-#: sequencer.c:4174
+#: sequencer.c:4718
 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:4181
+#: sequencer.c:4725
 msgid "could not commit staged changes."
 msgstr "no se pudo realizar el commit con los cambios en el área de stage."
 
-#: sequencer.c:4285
+#: sequencer.c:4845
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: no se puede aplicar cherry-pick a un %s"
 
-#: sequencer.c:4289
+#: sequencer.c:4849
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisión errónea"
 
-#: sequencer.c:4324
+#: sequencer.c:4884
 msgid "can't revert as initial commit"
 msgstr "no se puede revertir como commit inicial"
 
-#: sequencer.c:4774
+#: sequencer.c:5361
 msgid "make_script: unhandled options"
 msgstr "make_script: opciones desconocidas"
 
-#: sequencer.c:4777
+#: sequencer.c:5364
 msgid "make_script: error preparing revisions"
-msgstr "make_script: error preparando revisiones"
+msgstr "make_script: error al preparar revisiones"
 
-#: sequencer.c:4935
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecuta 'git "
-"rebase --continue'.\n"
-"O se puede abortar el rebase con 'git rebase --abort'.\n"
-
-#: sequencer.c:5047 sequencer.c:5064
+#: sequencer.c:5614 sequencer.c:5631
 msgid "nothing to do"
 msgstr "nada que hacer"
 
-#: sequencer.c:5078
+#: sequencer.c:5650
 msgid "could not skip unnecessary pick commands"
 msgstr "no se pudo saltar los comandos pick innecesarios"
 
-#: sequencer.c:5166
+#: sequencer.c:5750
 msgid "the script was already rearranged."
 msgstr "este script ya fue reorganizado."
 
-#: setup.c:124
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' está fuera del repositorio"
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' está fuera del repositorio en '%s'"
 
-#: setup.c:174
+#: setup.c:185
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6682,7 +8423,7 @@ msgstr ""
 "Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
 "localmente."
 
-#: setup.c:187
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6694,12 +8435,12 @@ msgstr ""
 "Use '--' para separar las rutas de las revisiones, de esta manera:\n"
 "'git <comando> [<revisión>...] -- [<archivo>...]'"
 
-#: setup.c:236
+#: setup.c:264
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "opción '%s' debe venir antes de argumentos no opcionales"
 
-#: setup.c:255
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6710,105 +8451,113 @@ msgstr ""
 "Use '--' para separar rutas de revisiones, de esta manera:\n"
 "'git <comando> [<revisión>...] -- [<archivo>...]'"
 
-#: setup.c:391
+#: setup.c:419
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "no es posible configurar el directorio de trabajo usando una configuración "
 "inválida"
 
-#: setup.c:395
+#: 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:541
+#: 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: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:549
-msgid "unknown repository extensions found:"
-msgstr "se encontró extensión de repositorio desconocida:"
+#: 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:568
+#: setup.c:701
 #, c-format
 msgid "error opening '%s'"
-msgstr "error abriendo '%s'"
+msgstr "error al abrir '%s'"
 
-#: setup.c:570
+#: 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:572
+#: setup.c:705
 #, c-format
 msgid "error reading %s"
-msgstr "error leyendo %s"
+msgstr "error al leer %s"
 
-#: setup.c:574
+#: setup.c:707
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "formato gitfile inválido: %s"
 
-#: setup.c:576
+#: setup.c:709
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "no hay ruta en gitfile: %s"
 
-#: setup.c:578
+#: setup.c:711
 #, c-format
 msgid "not a git repository: %s"
 msgstr "no es un repositorio git: %s"
 
-#: setup.c:677
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
-msgstr "'$%s' muy grande"
+msgstr "'$%s' demasiado grande"
 
-#: setup.c:691
+#: setup.c:827
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "no es un repositorio git: '%s'"
 
-#: setup.c:720 setup.c:722 setup.c:753
+#: 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:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: 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:852
+#: setup.c:988
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "falló al determinar '%*s%s%s'"
 
-#: setup.c:1090
+#: setup.c:1231
 msgid "Unable to read current working directory"
 msgstr "Incapaz de leer el directorio de trabajo actual"
 
-#: setup.c:1099 setup.c:1105
+#: setup.c:1240 setup.c:1246
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "no se puede cambiar a '%s'"
 
-#: setup.c:1110
+#: 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:1116
+#: 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:1227
+#: setup.c:1381
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6817,346 +8566,69 @@ 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:1271
+#: setup.c:1430
 msgid "open /dev/null or dup failed"
-msgstr "falló al abrir /dev/null o dup"
+msgstr "falló al abrir /dev/null o hacer dup"
 
-#: setup.c:1286
+#: setup.c:1445
 msgid "fork failed"
 msgstr "falló fork"
 
-#: setup.c:1291
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
 msgid "setsid failed"
 msgstr "falló setsid"
 
-#: sha1-file.c:452
-#, 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"
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
+msgstr "intentando usar sparse-index sin modo cono"
 
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "incapaz de normalizar la ruta de objeto alterno: %s"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignorando espacios de objetos alternos, anidado muy profundo"
+#: sparse-index.c:176
+msgid "unable to update cache-tree, staying full"
+msgstr "no es posible actualizar el cache del árbol, manteniendo full"
 
-#: sha1-file.c:582
+#: sparse-index.c:263
 #, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "incapaz de normalizar directorio de objeto: %s"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "no es posible hacer fdopen en lockfile alternos"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "no es posible leer archivos alternos"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "no es posible mover archivos alternos en el lugar"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "ruta '%s' no existe"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"repositorio de referencia '%s' como un checkout vinculado no es soportado "
-"todavía."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "repositorio de referencia '%s' no es un repositorio local."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "repositorio de referencia '%s' es superficial (shallow)"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "repositorio de referencia '% s' está injertado"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "línea inválida mientras se analizaban refs alternas: %s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "intentando usar mmap %<PRIuMAX> sobre límite %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap falló"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "archivo de objeto %s está vacío"
-
-#: sha1-file.c:1252 sha1-file.c:2392
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "objeto perdido corrupto '%s'"
-
-#: sha1-file.c:1254 sha1-file.c:2396
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "basura al final del objeto perdido '%s'"
-
-#: sha1-file.c:1296
-msgid "invalid object type"
-msgstr "tipo de objeto inválido"
-
-#: sha1-file.c:1380
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "no es posible desempacar header %s con --allow-unknown-type"
-
-#: sha1-file.c:1383
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "incapaz de desempaquetar header %s"
-
-#: sha1-file.c:1389
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "no es posible analizar header %s con --allow-unknown-type"
-
-#: sha1-file.c:1392
-#, c-format
-msgid "unable to parse %s header"
-msgstr "incapaz de analizar header %s"
-
-#: sha1-file.c:1584
-#, c-format
-msgid "failed to read object %s"
-msgstr "falló al leer objeto %s"
-
-#: sha1-file.c:1588
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "reemplazo %s no encontrado para %s"
-
-#: sha1-file.c:1592
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "objeto perdido %s (guardado en %s) está corrompido"
-
-#: sha1-file.c:1596
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "paquete de objeto %s (guardado en %s) está corrompido"
-
-#: sha1-file.c:1699
-#, c-format
-msgid "unable to write file %s"
-msgstr "no es posible escribir archivo %s"
-
-#: sha1-file.c:1706
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "no se pudo poner permisos a '%s'"
-
-#: sha1-file.c:1713
-msgid "file write error"
-msgstr "falló de escritura"
-
-#: sha1-file.c:1732
-msgid "error when closing loose object file"
-msgstr "error cerrando el archivo de objeto suelto"
-
-#: sha1-file.c:1797
-#, 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"
-
-#: sha1-file.c:1799
-msgid "unable to create temporary file"
-msgstr "no es posible crear un archivo temporal"
-
-#: sha1-file.c:1823
-msgid "unable to write loose object file"
-msgstr "no es posible escribir el archivo de objeto suelto"
-
-#: sha1-file.c:1829
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "no es posible desinflar el objeto nuevo %s (%d)"
-
-#: sha1-file.c:1833
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "deflateEnd en objeto %s falló (%d)"
-
-#: sha1-file.c:1837
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "confundido por fuente de data de objetos inestable para %s"
-
-#: sha1-file.c:1847 builtin/pack-objects.c:925
-#, c-format
-msgid "failed utime() on %s"
-msgstr "falló utime() en %s"
-
-#: sha1-file.c:1922
-#, c-format
-msgid "cannot read object for %s"
-msgstr "no se pudo leer el objeto para %s"
-
-#: sha1-file.c:1962
-msgid "corrupt commit"
-msgstr "commit corrupto"
-
-#: sha1-file.c:1970
-msgid "corrupt tag"
-msgstr "tag corrupto"
-
-#: sha1-file.c:2069
-#, c-format
-msgid "read error while indexing %s"
-msgstr "error leyendo al indexar %s"
-
-#: sha1-file.c:2072
-#, c-format
-msgid "short read while indexing %s"
-msgstr "lectura corta al indexar %s"
-
-#: sha1-file.c:2145 sha1-file.c:2154
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: falló al insertar en la base de datos"
-
-#: sha1-file.c:2160
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: tipo de archivo no soportado"
-
-#: sha1-file.c:2184
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s no es objeto válido"
-
-#: sha1-file.c:2186
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s no es un objeto '%s' válido"
-
-#: sha1-file.c:2213 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "no es posible abrir %s"
-
-#: sha1-file.c:2403 sha1-file.c:2455
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "hash no concuerda para %s (se esperaba %s)"
-
-#: sha1-file.c:2427
-#, c-format
-msgid "unable to mmap %s"
-msgstr "no es posible hacer mmap a %s"
-
-#: sha1-file.c:2432
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "incapaz de desempaquetar header de %s"
-
-#: sha1-file.c:2438
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "incapaz de analizar header de %s"
-
-#: sha1-file.c:2449
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "no es posible desempaquetar contenidos de %s"
-
-#: sha1-name.c:487
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "SHA1 %s corto es ambiguo"
-
-#: sha1-name.c:498
-msgid "The candidates are:"
-msgstr "Los candidatos son:"
-
-#: sha1-name.c:797
-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 ""
-"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n"
-"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n"
-"tal vez sean creadas por error. Por ejemplo,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por "
-"favor\n"
-"examina estas refs y tal vez bórralas. Silencia este mensaje \n"
-"ejecutando \"git config advice.objectNameWarning false\""
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "la entrada de índice es un directorio, pero no escazo (%08x)"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:822
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
+#: 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:832
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: 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:841
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
+#: 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:849
+#: strbuf.c:877
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7164,17 +8636,55 @@ msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
+#: strbuf.c:879
 #, c-format
 msgid "%u byte/s"
 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:738
+#: builtin/rebase.c:866
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no se pudo abrir '%s' para escritura"
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr "no se pudo editar '%s'"
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignorando nombre de submódulo sospechoso: %s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "no se permiten valores negativos para submodule.fetchjobs"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"ignorando '%s' ya que puede ser interpretado como una opción de línea de "
+"comando: %s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "valor inválido para %s"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+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 resuelva los "
+"conflictos de fusión"
 
 #: submodule.c:118 submodule.c:147
 #, c-format
@@ -7190,61 +8700,138 @@ 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:327
+#: submodule.c:328
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "en el submódulo no poblado '%s'"
 
-#: submodule.c:358
+#: submodule.c:359
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
 
-#: submodule.c:910
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "mal argumento --ignore-submodules: %s"
+
+#: submodule.c:805
+#, 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 la ruta: '%s' colisiona con un submódulo "
+"llamado igual. Saltándolo."
+
+#: submodule.c:908
 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:993
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"No se pudo ejecutar comando 'git rev-list <commits> --not --remotes -n 1' en "
+"el submódulo %s"
+
+#: submodule.c:1116
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "proceso para submódulo '%s' falló"
+
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Falló al resolver HEAD como un ref válido."
 
-#: submodule.c:1481
+#: submodule.c:1156
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Empujando submódulo '%s'\n"
+
+#: submodule.c:1159
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "No es posible hacer push al submódulo '%s'\n"
+
+#: submodule.c:1451
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Haciendo fetch al submódulo %s%s\n"
+
+#: submodule.c:1485
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "no pudo acceder al submódulo '%s'"
+msgid "Could not access submodule '%s'\n"
+msgstr "No se pudo acceder al submódulo '%s'\n"
 
-#: submodule.c:1651
+#: submodule.c:1640
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Errores durante el fetch del submódulo:\n"
+"%s"
+
+#: submodule.c:1665
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' no reconocido como un repositorio git"
 
-#: submodule.c:1789
+#: submodule.c:1682
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "No se pudo ejecutar 'git status --porcelain=2' en el submódulo %s"
+
+#: submodule.c:1723
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' falló en el submódulo %s"
+
+#: submodule.c:1798
 #, 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:1802
+#: submodule.c:1811
 #, 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:1817
+#: submodule.c:1826
 #, 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:1907
+#: submodule.c:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "no se pudo recursar en el submódulo '%s'"
+
+#: submodule.c:1874
+msgid "could not reset submodule index"
+msgstr "no se pudo reiniciar el índice del submódulo"
+
+#: submodule.c:1916
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "submódulo '%s' tiene un índice corrupto"
 
-#: submodule.c:1959
+#: submodule.c:1968
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Submódulo '%s' no pudo ser actualizado."
 
-#: submodule.c:2007
+#: submodule.c:2036
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+"directorio de git del submódulo '%s' está dentro del directorio de git '%.*s'"
+
+#: submodule.c:2057
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7252,12 +8839,17 @@ msgstr ""
 "relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
 "soportado"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2069 submodule.c:2128
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "no se pudo resolver el nombre para el submódulo '%s'"
 
-#: submodule.c:2026
+#: submodule.c:2073
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "rechazando mover '%s' dentro de un directorio git existente"
+
+#: submodule.c:2080
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7268,207 +8860,89 @@ msgstr ""
 "'%s' hacia\n"
 "'%s'\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "no pudo recursar en el submódulo '%s'"
-
-#: submodule.c:2153
+#: submodule.c:2208
 msgid "could not start ls-files in .."
 msgstr "no se pudo comenzar ls-files en .."
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree devolvió un código %d inesperado"
 
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorando submódulo sospechoso: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "no se permiten valores negativos para submodule.fetchjobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"ignorando '%s' ya que puede ser interpretado como una opción de línea de "
-"comando: %s"
-
-#: submodule-config.c:490
+#: symlinks.c:244
 #, c-format
-msgid "invalid value for %s"
-msgstr "valor inválido para %s"
+msgid "failed to lstat '%s'"
+msgstr "falló al hacer lstat '%s'"
 
-#: submodule-config.c:761
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "No se pudo actualizar la entrada %s de .gitmodules"
-
-#: trailer.c:238
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "ejecución del comando de remolque '%s' falló"
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: 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 '%s' desconocido para la clave '%s'"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: 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 "más de un %s"
 
-#: trailer.c:730
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "token de remolque vacío en el trailer '%.*s'"
 
-#: trailer.c:750
+#: trailer.c:763
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "no se pudo leer el archivo de entrada '%s'"
 
-#: trailer.c:753
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
 msgid "could not read from stdin"
 msgstr "no se pudo leer desde stdin"
 
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1024 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
-msgstr "no se pudo definir %s"
+msgstr "no se pudo hacer stat en %s"
 
-#: trailer.c:1013
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "el archivo %s no es un archivo regular"
 
-#: trailer.c:1015
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "el archivo %s no puede ser escrito por el usuario"
 
-#: trailer.c:1027
+#: trailer.c:1040
 msgid "could not open temporary file"
 msgstr "no se pudo abrir el archivo temporal"
 
-#: trailer.c:1067
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "no se pudo renombrar el archivo temporal a %s"
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "no se pudo leer el conjunto '%s'"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: opción inválida '%s'"
-
-#: transport.c:266
-msgid "see protocol.version in 'git help config' for more details"
-msgstr "ver protocol.version en 'git help config' para más información"
-
-#: transport.c:267
-msgid "server options require protocol version 2 or later"
-msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "no se pudo analizar valor de configuración transport.color.*"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "soporte para protocolo v2 no implementado todavía"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "valor desconocido para configuración '%s': %s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "transporte '%s' no permitido"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync ya no es soportado"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"La siguiente ruta de submódulo contiene cambios que no\n"
-"pueden ser encontrados en ningún remoto:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Por favor intenta\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"o cd a la ruta y usa\n"
-"\n"
-"\tgit push\n"
-"\n"
-"para hacer un push al remoto.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Abortando."
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "falló al hacer push a todos los submódulos necesarios"
-
-#: transport.c:1345 transport-helper.c:655
-msgid "operation not supported by protocol"
-msgstr "operación no soportada por protocolo"
-
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
 msgstr "escritura total al helper remoto falló"
 
-#: transport-helper.c:144
+#: transport-helper.c:145
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "no es posible encontrar helper remoto para '%s'"
 
-#: transport-helper.c:160 transport-helper.c:569
+#: 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:211
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7477,159 +8951,274 @@ msgstr ""
 "capacidad mandatoria desconocida %s; este helper remoto probablemente "
 "necesita una nueva versión de Git"
 
-#: transport-helper.c:217
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
 msgstr "este helper remoto debería implementar capacidad refspec"
 
-#: transport-helper.c:284 transport-helper.c:424
+#: transport-helper.c:287 transport-helper.c:429
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s dijo inesperadamente: '%s'"
 
-#: transport-helper.c:413
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s también bloqueó %s"
 
-#: transport-helper.c:491
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
 msgstr "no se pudo ejecutar fast-import"
 
-#: transport-helper.c:514
+#: transport-helper.c:520
 msgid "error while running fast-import"
 msgstr "error al ejecutar fast-import"
 
-#: transport-helper.c:543 transport-helper.c:1132
+#: transport-helper.c:549 transport-helper.c:1247
 #, c-format
 msgid "could not read ref %s"
 msgstr "no se pudo leer la referencia %s"
 
-#: transport-helper.c:588
+#: 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:610
+#: 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:612
+#: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr "ruta de servicio remoto inválida"
 
-#: transport-helper.c:658
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr "operación no soportada por protocolo"
+
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "no se puede conectar al subservicio %s"
 
-#: transport-helper.c:734
+#: transport-helper.c:693 transport.c:400
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only requiere protocolo v2"
+
+#: transport-helper.c:755
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'opción' sin una directiva correspondiente 'ok/error'"
+
+#: transport-helper.c:798
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "se esperaba ok/error, helper dijo '%s'"
 
-#: transport-helper.c:787
+#: transport-helper.c:855
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "helper reportó estado inesperado de %s"
 
-#: transport-helper.c:848
+#: transport-helper.c:938
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "helper %s no soporta dry-run"
 
-#: transport-helper.c:851
+#: transport-helper.c:941
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "helper %s no soporta --signed"
 
-#: transport-helper.c:854
+#: transport-helper.c:944
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "helper %s no soporta --signed=if-asked"
 
-#: transport-helper.c:859
+#: transport-helper.c:949
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "helper %s no soporta --atomic"
 
-#: transport-helper.c:865
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "helper %s no soporta --%s"
+
+#: transport-helper.c:960
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "helper %s no soporta 'push-option'"
 
-#: transport-helper.c:963
+#: transport-helper.c:1060
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "remote-helper no soporta push; se necesita refspec"
 
-#: transport-helper.c:968
+#: transport-helper.c:1065
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "helper %s no soporta 'force'"
 
-#: transport-helper.c:1015
+#: transport-helper.c:1112
 msgid "couldn't run fast-export"
 msgstr "no se pudo ejecutar fast-export"
 
-#: transport-helper.c:1020
+#: transport-helper.c:1117
 msgid "error while running fast-export"
 msgstr "error al ejecutar fast-export"
 
-#: transport-helper.c:1045
+#: transport-helper.c:1142
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 "No hay refs comunes y ninguno especificado; no se hace nada.\n"
-"Tal vez deberías especificar un branch como 'master'.\n"
+"Tal vez deberías especificar un branch.\n"
+
+#: transport-helper.c:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "formato de objeto no soportado '%s'"
 
-#: transport-helper.c:1118
+#: transport-helper.c:1233
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "respuesta malformada en lista de refs: %s"
 
-#: transport-helper.c:1270
+#: transport-helper.c:1385
 #, c-format
 msgid "read(%s) failed"
-msgstr "leer(%s) falló"
+msgstr "read(%s) falló"
 
-#: transport-helper.c:1297
+#: transport-helper.c:1412
 #, c-format
 msgid "write(%s) failed"
-msgstr "escribir(%s) falló"
+msgstr "write(%s) falló"
 
-#: transport-helper.c:1346
+#: transport-helper.c:1461
 #, c-format
 msgid "%s thread failed"
 msgstr "hilo %s falló"
 
-#: transport-helper.c:1350
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "hilo %s falló al unirse: %s"
 
-#: transport-helper.c:1369 transport-helper.c:1373
+#: transport-helper.c:1484 transport-helper.c:1488
 #, 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:1410
+#: transport-helper.c:1525
 #, c-format
 msgid "%s process failed to wait"
 msgstr "proceso %s falló al esperar"
 
-#: transport-helper.c:1414
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed"
 msgstr "proceso %s falló"
 
-#: transport-helper.c:1432 transport-helper.c:1441
+#: transport-helper.c:1547 transport-helper.c:1556
 msgid "can't start thread for copying data"
 msgstr "no se puede iniciar hilo para copiar data"
 
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "no se pudo leer el conjunto '%s'"
+
+#: transport.c:223
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: opción de profundidad inválida '%s'"
+
+#: transport.c:275
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "ver protocol.version en 'git help config' para más información"
+
+#: transport.c:276
+msgid "server options require protocol version 2 or later"
+msgstr "opciones del servidor requieren protocolo versión 2 o posterior"
+
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr "el servidor no soporta wait-for-done"
+
+#: transport.c:755
+msgid "could not parse transport.color.* config"
+msgstr "no se pudo analizar valor de configuración transport.color.*"
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr "soporte para protocolo v2 no implementado todavía"
+
+#: transport.c:965
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valor desconocido para configuración '%s': %s"
+
+#: transport.c:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transporte '%s' no permitido"
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync ya no es soportado"
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"La siguiente ruta de submódulo contiene cambios que no\n"
+"pueden ser encontrados en ningún remoto:\n"
+
+#: transport.c:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Por favor intenta\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o cd a la ruta y usa\n"
+"\n"
+"\tgit push\n"
+"\n"
+"para hacer un push al remoto.\n"
+"\n"
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr "Abortando."
+
+#: transport.c:1346
+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"
@@ -7641,9 +9230,9 @@ 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:110
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7652,9 +9241,9 @@ 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:112
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7664,7 +9253,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7674,7 +9263,7 @@ msgstr ""
 "fusionar:\n"
 "%%sPor favor, confirma tus cambios o aguárdalos antes de fusionar."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7684,7 +9273,7 @@ msgstr ""
 "merge:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7693,7 +9282,7 @@ msgstr ""
 "Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
 "%%sPor favor, confirma tus cambios o guárdalos antes de %s."
 
-#: unpack-trees.c:122
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7702,7 +9291,7 @@ msgstr ""
 "Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"
 "%%s"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7712,7 +9301,7 @@ msgstr ""
 "seguimiento en ellos:\n"
 "%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7720,19 +9309,19 @@ 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:133
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 "Los siguientes archivos sin seguimiento del árbol de trabajo serán "
-"eliminadosal actualizar el árbol de trabajo:\n"
+"eliminados al actualizar el árbol de trabajo:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7742,17 +9331,17 @@ msgstr ""
 "eliminados al fusionar:\n"
 "%%sPor favor, muévelos o elimínalos antes de fusionar."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
-"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
-"eliminadosal fusionar:\n"
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán eliminados "
+"al fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7762,7 +9351,7 @@ msgstr ""
 "eliminados al %s:\n"
 "%%sPor favor, muévelos o elimínalos antes de %s."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7772,7 +9361,7 @@ msgstr ""
 "eliminados al ejecutar %s:\n"
 "%%s"
 
-#: unpack-trees.c:149
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7781,9 +9370,9 @@ 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:151
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7794,7 +9383,7 @@ msgstr ""
 "sobrescritos al actualizar el árbol de trabajo:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7804,7 +9393,7 @@ msgstr ""
 "sobrescritos al fusionar:\n"
 "%%sPor favor, muévelos o elimínalos antes de fusionar."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7814,7 +9403,7 @@ msgstr ""
 "sobrescritos al fusionar:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7824,81 +9413,104 @@ msgstr ""
 "sobrescritos al %s:\n"
 "%%sPor favor, muévelos o elimínalos antes de %s."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%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:169
+#: 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:172
+#: unpack-trees.c:177
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
 "%s"
 msgstr ""
-"No se puede actualizar el sparse checkout: las siguientes entradas no están "
-"actualizadas:\n"
+"No se puede actualizar el submódulo:\n"
 "%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Los siguientes archivos del árbol de trabajo serán sobrescritos por la "
-"actualización sparse checkout:\n"
+"Las siguientes rutas no están actualizadas y fueron dejadas a pesar de los "
+"patrones sparse:\n"
 "%s"
 
-#: unpack-trees.c:176
+#: unpack-trees.c:182
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
-"Los siguientes archivos del árbol de trabajo serán eliminados por la "
-"actualización sparse checkout:\n"
+"Las siguientes rutas son ignoradas y fueron dejadas a pesar de los patrones "
+"sparse:\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:184
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"No se puede actualizar le submódulo:\n"
+"Las siguientes rutas ya estaban presentes y por eso no fueron actualizadas a "
+"pesar de los patrones sparse:\n"
 "%s"
 
-#: unpack-trees.c:255
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "Abortando\n"
 
-#: unpack-trees.c:317
+#: unpack-trees.c:291
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Luego de arreglar las rutas mostradas, puede que quieras ejecutar `git "
+"sparse-checkout reapply`.\n"
+
+#: unpack-trees.c:352
 msgid "Updating files"
 msgstr "Actualizando archivos"
 
-#: unpack-trees.c:349
+#: 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 ""
-"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:1618
+msgid "Updating index flags"
+msgstr "Actualizando flags del índice"
+
+#: unpack-trees.c:2718
+#, 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
+msgid "expected flush after fetch arguments"
+msgstr "se espera flush tras argumentos fetch"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "nombre de URL inválido o sufijo '://' faltante"
@@ -7914,7 +9526,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"
@@ -7922,36 +9534,40 @@ 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"
 msgstr "segmento de ruta '..' inválido"
 
-#: worktree.c:258 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Haciendo fetch a objetos"
+
+#: worktree.c:236 builtin/am.c:2152
 #, 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"
@@ -7961,17 +9577,85 @@ msgstr "'%s' no es un archivo .git, código de error %d"
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' no apunta de vuelta a '%s'"
 
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:603
+msgid "not a directory"
+msgstr "no es un directorio"
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr ".git no es un archivo"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr "archivo .git roto"
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr "archivo .git incorrecto"
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr "no es una ruta válida"
+
+#: 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: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 "
+"repositorio"
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr "no es posible ubicar el repositorio; archivo .git roto"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr "gitdir ilegible"
+
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr "gitdir incorrecto"
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr "no en un directorio válido"
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "archivo gitdir no existe"
+
+#: 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:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "lectura corta (se esperaba %<PRIuMAX> bytes, se leyó %<PRIuMAX>)"
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "archivo gitdir inválido"
+
+#: 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
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "no se pudo abrir '%s' para lectura y escritura"
 
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr "no es posible acceder '%s'"
 
-#: wrapper.c:596
+#: wrapper.c:607
 msgid "unable to get current working directory"
 msgstr "no es posible obtener el directorio de trabajo actual"
 
@@ -8002,18 +9686,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:1074
+#: 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:1083
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
 msgstr "Cambios no rastreados para el commit:"
 
@@ -8047,102 +9731,102 @@ msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
 
-#: wt-status.c:268
+#: wt-status.c:266
 msgid "both deleted:"
-msgstr "ambos borrados:"
+msgstr "borrados por ambos:"
 
-#: wt-status.c:270
+#: wt-status.c:268
 msgid "added by us:"
-msgstr "agregado por nosotros:"
+msgstr "agregados por nosotros:"
 
-#: wt-status.c:272
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "borrados por ellos:"
 
-#: wt-status.c:274
+#: wt-status.c:272
 msgid "added by them:"
-msgstr "agregado por ellos:"
+msgstr "agregados por ellos:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "deleted by us:"
-msgstr "borrado por nosotros:"
+msgstr "borrados por nosotros:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "both added:"
-msgstr "ambos agregados:"
+msgstr "agregados por ambos:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "both modified:"
-msgstr "ambos modificados:"
+msgstr "modificados por ambos:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "new file:"
-msgstr "nuevo archivo:"
+msgstr "nuevos archivos:"
 
-#: wt-status.c:292
+#: wt-status.c:290
 msgid "copied:"
-msgstr "copiado:"
+msgstr "copiados:"
 
-#: wt-status.c:294
+#: wt-status.c:292
 msgid "deleted:"
-msgstr "borrado:"
+msgstr "borrados:"
 
-#: wt-status.c:296
+#: wt-status.c:294
 msgid "modified:"
-msgstr "modificado:"
+msgstr "modificados:"
 
-#: wt-status.c:298
+#: wt-status.c:296
 msgid "renamed:"
-msgstr "renombrado:"
+msgstr "renombrados:"
 
-#: wt-status.c:300
+#: wt-status.c:298
 msgid "typechange:"
-msgstr "cambio de tipo:"
+msgstr "cambios de tipo:"
 
-#: wt-status.c:302
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "desconocido:"
 
-#: wt-status.c:304
+#: wt-status.c:302
 msgid "unmerged:"
-msgstr "des-fusionado:"
+msgstr "sin fusión:"
 
-#: wt-status.c:384
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "nuevos commits, "
 
-#: wt-status.c:386
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "contenido modificado, "
 
-#: wt-status.c:388
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr "contenido no rastreado, "
 
-#: wt-status.c:906
+#: 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:938
+#: wt-status.c:989
 msgid "Submodules changed but not updated:"
 msgstr "Submódulos cambiados pero no actualizados:"
 
-#: wt-status.c:940
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr "Submódulos cambiados listos para realizar commit:"
 
-#: wt-status.c:1022
+#: 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 modifique ni borre la línea de encima.\n"
+"Todo lo que esté por abajo será ignorado."
 
-#: wt-status.c:1114
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -8153,107 +9837,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:1144
+#: wt-status.c:1195
 msgid "You have unmerged paths."
 msgstr "Tienes rutas no fusionadas."
 
-#: wt-status.c:1147
+#: 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:1149
+#: 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:1153
+#: wt-status.c:1204
 msgid "All conflicts fixed but you are still merging."
 msgstr "Todos los conflictos resueltos pero sigues fusionando."
 
-#: wt-status.c:1156
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (usa \"git commit\" para concluir la fusión)"
 
-#: wt-status.c:1165
+#: 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:1168
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr "El parche actual está vacío."
 
-#: wt-status.c:1172
+#: 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:1174
+#: 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:1176
+#: 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:1309
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo no está presente."
 
-#: wt-status.c:1311
+#: wt-status.c:1362
 msgid "No commands done."
 msgstr "No se realizaron los comandos."
 
-#: wt-status.c:1314
+#: 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:1325
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (ver más en el archivo %s)"
 
-#: wt-status.c:1330
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "No quedan más comandos."
 
-#: wt-status.c:1333
+#: 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:1341
+#: 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:1353
+#: 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:1358
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr "Estás aplicando un rebase."
 
-#: wt-status.c:1371
+#: 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:1373
+#: 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:1375
+#: 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:1382
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
 
-#: wt-status.c:1386
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -8261,144 +9945,161 @@ msgstr ""
 "Estás dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
 "'%s'."
 
-#: wt-status.c:1391
+#: 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:1394
+#: 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:1398
+#: 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:1403
+#: 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:1406
+#: 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:1408
+#: 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:1419
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick en progreso actualmente."
 
-#: wt-status.c:1422
+#: 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:1429
+#: 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:1432
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (ejecuta \"git cherry-pick --continue\" para continuar)"
 
-#: wt-status.c:1435
+#: 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:1437
+#: 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:1439
+#: 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)"
 
-#: wt-status.c:1449
+#: 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:1452
+#: wt-status.c:1503
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Estás revirtiendo el commit %s."
 
-#: wt-status.c:1458
+#: wt-status.c:1509
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (corrige los conflictos y ejecuta \"git revert --continue\")"
 
-#: wt-status.c:1461
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (ejecuta \"git revert --continue\" para continuar)"
 
-#: wt-status.c:1464
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
 
-#: wt-status.c:1466
+#: 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:1468
+#: 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:1478
+#: 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:1482
+#: wt-status.c:1533
 msgid "You are currently bisecting."
 msgstr "Estás aplicando un bisect."
 
-#: wt-status.c:1485
+#: 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:1694
+#: 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."
+
+#: wt-status.c:1794
 msgid "On branch "
 msgstr "En la rama "
 
-#: wt-status.c:1701
+#: 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:1703
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
-msgstr "rebase en progreso; en "
+msgstr "rebase en progreso; sobre "
+
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr "HEAD desacoplada en "
 
-#: wt-status.c:1713
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr "HEAD desacoplada de "
+
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr "Actualmente no estás en ninguna rama."
 
-#: wt-status.c:1730
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr "Confirmación inicial"
 
-#: wt-status.c:1731
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr "No hay commits todavía"
 
-#: wt-status.c:1745
+#: wt-status.c:1845
 msgid "Untracked files"
 msgstr "Archivos sin seguimiento"
 
-#: wt-status.c:1747
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "Archivos ignorados"
 
-#: wt-status.c:1751
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8409,31 +10110,31 @@ msgstr ""
 "puede acelerarlo, pero tienes que ser cuidadoso de no olvidar agregar\n"
 "nuevos archivos tú mismo (vea 'git help status')."
 
-#: wt-status.c:1757
+#: 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:1759
+#: 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:1765
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "Sin cambios"
 
-#: wt-status.c:1770
+#: 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:1773
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "no se agregaron cambios al commit\n"
 
-#: wt-status.c:1776
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8442,198 +10143,226 @@ msgstr ""
 "no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
 "(usa \"git add\" para hacerles seguimiento)\n"
 
-#: wt-status.c:1779
+#: 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:1782
+#: 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:1785 wt-status.c:1790
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr "nada para hacer commit\n"
 
-#: wt-status.c:1788
+#: 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:1792
+#: 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:1905
+#: wt-status.c:2003
 msgid "No commits yet on "
 msgstr "No hay commits todavía en "
 
-#: wt-status.c:1909
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr "HEAD (sin rama)"
 
-#: wt-status.c:1940
+#: wt-status.c:2038
 msgid "different"
 msgstr "diferente"
 
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "detrás "
 
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "adelante "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: 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:2476
+#: 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:2478
+#: 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/precompose_utf8.c:58 builtin/clone.c:452
+#: compat/simple-ipc/ipc-unix-socket.c:182
+msgid "could not send IPC command"
+msgstr "no se pudo enviar el comando IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr "no se pudo leer la respuesta IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:866
+#, 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:878
+#, 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
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "falló al desvincular '%s'"
 
-#: builtin/add.c:25
+#: 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:84
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "no se puede aplicar chmod %cx '%s'"
+
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
-msgstr "falló la actualización de carpetas"
+msgstr "falló la actualización de archivos"
 
-#: builtin/add.c:99
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
 msgstr "eliminar '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:198
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Cambios fuera del área de stage tras refrescar el índice:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:897
+#: builtin/add.c:307 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "No se pudo leer el índice"
 
-#: builtin/add.c:245
+#: builtin/add.c:318
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "No se pudo abrir '%s' para escritura."
 
-#: builtin/add.c:249
+#: builtin/add.c:322
 msgid "Could not write patch"
 msgstr "No se puede escribir el parche"
 
-#: builtin/add.c:252
+#: builtin/add.c:325
 msgid "editing patch failed"
 msgstr "falló la edición del parche"
 
-#: builtin/add.c:255
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
-msgstr "No se pudo definir '%s'"
+msgstr "No se pudo hacer stat en '%s'"
 
-#: builtin/add.c:257
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr "Parche vacío. Abortado."
 
-#: builtin/add.c:262
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "No se pudo aplicar '%s'"
 
-#: builtin/add.c:270
+#: builtin/add.c:343
 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:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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 "dry run ( ejecución en seco)"
+msgstr "dry run (ejecución en seco)"
 
-#: builtin/add.c:293
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr "selección interactiva"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
 msgid "select hunks interactively"
-msgstr "elegir hunks de forma interactiva"
+msgstr "elegir fragmentos de forma interactiva"
 
-#: builtin/add.c:295
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr "editar diff actual y aplicar"
 
-#: builtin/add.c:296
+#: builtin/add.c:369
 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:297
+#: builtin/add.c:370
 msgid "update tracked files"
-msgstr "actualizado las carpetas rastreadas"
+msgstr "actualizar los archivos rastreados"
 
-#: builtin/add.c:298
+#: builtin/add.c:371
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:372
 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:300
+#: builtin/add.c:373
 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:303
+#: builtin/add.c:376
 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:305
+#: builtin/add.c:378
 msgid "don't add, only refresh the index"
 msgstr "no agregar, solo actualizar el índice"
 
-#: builtin/add.c:306
+#: builtin/add.c:379
 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:307
+#: builtin/add.c:380
 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:309 builtin/update-index.c:1002
+#: builtin/add.c:382 builtin/update-index.c:1006
 msgid "override the executable bit of the listed files"
 msgstr "sobrescribir el bit ejecutable de los archivos listados"
 
-#: builtin/add.c:311
+#: builtin/add.c:384
 msgid "warn when adding an embedded repository"
 msgstr "avisar cuando se agrega un repositorio incrustado"
 
-#: builtin/add.c:326
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr "backend para `git stash -p`"
+
+#: builtin/add.c:404
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8651,186 +10380,218 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 "Se ha agregado otro repositorio de git dentro del repositorio actual.\n"
-"Clones del repositorio exterior no tendrán el contenido del \n"
-"repositorio embebido y no sabrán como obtenerla.\n"
+"Clones del repositorio exterior no tendrán el contenido del\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."
 
-#: builtin/add.c:354
+#: builtin/add.c:432
 #, c-format
 msgid "adding embedded git repository: %s"
-msgstr "agregando repositorio embebido: %s"
+msgstr "agregando repositorio de git embebido: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Usa -f si realmente quieres agregarlos.\n"
+#: 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 ""
+"Usa -f si realmente quieres agregarlos.\n"
+"Desactiva este mensaje ejecutando\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:460
 msgid "adding files failed"
 msgstr "falló al agregar archivos"
 
-#: builtin/add.c:419
+#: builtin/add.c:488
+msgid "--dry-run is incompatible with --interactive/--patch"
+msgstr "--dry-run es incompatible con --interactive/--patch"
+
+#: builtin/add.c:490 builtin/commit.c:357
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file es incompatible con --interactive/--patch"
+
+#: builtin/add.c:507
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file es incompatible con --edit"
+
+#: builtin/add.c:519
 msgid "-A and -u are mutually incompatible"
 msgstr "-A y -u son mutuamente incompatibles"
 
-#: builtin/add.c:426
+#: builtin/add.c:522
 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:430
+#: builtin/add.c:526
 #, 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: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 "--pathspec-from-file es incompatible con argumentos de pathspec"
 
-#: builtin/add.c:445
+#: 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 "--pathspec-file-nul requiere --pathspec-from-file"
+
+#: builtin/add.c:555
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Nada especificado, nada agregado.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "¿Tal vez quiso decir 'git add .'?\n"
+#: 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 ""
+"¿Tal vez quisiste decir 'git add .'?\n"
+"Desactiva este mensage ejecutando\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:347
+#: builtin/am.c:365
 msgid "could not parse author script"
 msgstr "no se pudo analizar el script del autor"
 
-#: builtin/am.c:431
+#: builtin/am.c:455
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' fue borrado por el hook de applypatch-msg"
 
-#: builtin/am.c:473
+#: builtin/am.c:497
 #, c-format
 msgid "Malformed input line: '%s'."
-msgstr "Línea mal formada: '%s'."
+msgstr "Línea de entrada mal formada: '%s'."
 
-#: builtin/am.c:511
+#: builtin/am.c:535
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Falló al copiar notas de '%s' a '%s'"
 
-#: builtin/am.c:537
+#: builtin/am.c:561
 msgid "fseek failed"
-msgstr "fall de fseek"
+msgstr "fallo de fseek"
 
-#: builtin/am.c:725
+#: builtin/am.c:749
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "no se pudo analizar el parche '%s'"
 
-#: builtin/am.c:790
+#: builtin/am.c:814
 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:838
+#: builtin/am.c:862
 msgid "invalid timestamp"
 msgstr "timestamp inválido"
 
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:867 builtin/am.c:879
 msgid "invalid Date line"
 msgstr "línea Date inválida"
 
-#: builtin/am.c:850
+#: builtin/am.c:874
 msgid "invalid timezone offset"
 msgstr "offset de zona horaria inválido"
 
-#: builtin/am.c:943
+#: builtin/am.c:967
 msgid "Patch format detection failed."
 msgstr "Falló al detectar el formato del parche."
 
-#: builtin/am.c:948 builtin/clone.c:406
+#: builtin/am.c:972 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "falló al crear el directorio '%s'"
 
-#: builtin/am.c:953
+#: builtin/am.c:977
 msgid "Failed to split patches."
 msgstr "Falló al dividir parches."
 
-#: builtin/am.c:1084
+#: builtin/am.c:1126
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Cuando hayas resuelto este problema, ejecuta \"%s --continue\"."
 
-#: builtin/am.c:1085
+#: builtin/am.c:1127
 #, 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:1086
+#: builtin/am.c:1128
 #, 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, ejecutar \"%s --abort"
 "\"."
 
-#: builtin/am.c:1169
+#: builtin/am.c:1223
 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:1197
+#: builtin/am.c:1251
 msgid "Patch is empty."
 msgstr "El parche está vacío."
 
-#: builtin/am.c:1262
+#: builtin/am.c:1316
 #, 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:1265
+#: builtin/am.c:1319
 #, 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:1484
+#: builtin/am.c:1538
 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:1486
+#: builtin/am.c:1540
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Usando la información del índice para reconstruir un árbol base..."
 
-#: builtin/am.c:1505
+#: builtin/am.c:1559
 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:1511
+#: builtin/am.c:1565
 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:1537
+#: builtin/am.c:1591
 msgid "Failed to merge in the changes."
-msgstr "Falló al fusionar en los cambios."
+msgstr "Falló al fusionar los cambios."
 
-#: builtin/am.c:1569
+#: builtin/am.c:1623
 msgid "applying to an empty history"
 msgstr "aplicando a un historial vacío"
 
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1675 builtin/am.c:1679
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "no se puede continuar: %s no existe."
 
-#: builtin/am.c:1638
+#: builtin/am.c:1697
 msgid "Commit Body is:"
 msgstr "Cuerpo de commit es:"
 
@@ -8838,49 +10599,49 @@ msgstr "Cuerpo de commit es:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1648
+#: builtin/am.c:1707
 #, 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:1695 builtin/commit.c:374
+#: builtin/am.c:1753 builtin/commit.c:408
 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:1699
+#: builtin/am.c:1757
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�ndice sucio: no se puede aplicar parches (sucio: %s)"
 
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1797 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Aplicando: %.*s"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1814
 msgid "No changes -- Patch already applied."
-msgstr "Sin cambios -- parche ya aplicado."
+msgstr "Sin cambios -- Parche ya aplicado."
 
-#: builtin/am.c:1762
+#: builtin/am.c:1820
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "El parche falló en %s %.*s"
 
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
-msgstr "Use 'git am --show-current-patch' para ver el parche fallido"
+#: builtin/am.c:1824
+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"
 
-#: builtin/am.c:1810
+#: 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:1817
+#: 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 "
@@ -8888,22 +10649,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:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
-#: builtin/reset.c:337
+#: 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 "No se pudo analizar el objeto '%s'."
 
-#: builtin/am.c:1976
+#: builtin/am.c:2034
 msgid "failed to clean index"
 msgstr "falló al limpiar el índice"
 
-#: builtin/am.c:2020
+#: builtin/am.c:2078
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -8911,144 +10672,160 @@ msgstr ""
 "Parece haber movido HEAD desde el último falló 'am'.\n"
 "No rebobinando a ORIG_HEAD"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2185
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor inválido para --patch-format: %s"
 
-#: builtin/am.c:2153
+#: builtin/am.c:2227
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Valor inválido para --show-current-patch: %s"
+
+#: builtin/am.c:2231
+#, 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:2262
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
 
-#: builtin/am.c:2154
+#: builtin/am.c:2263
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opciones>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2160
+#: builtin/am.c:2269
 msgid "run interactively"
 msgstr "ejecutar de manera interactiva"
 
-#: builtin/am.c:2162
+#: builtin/am.c:2271
 msgid "historical option -- no-op"
 msgstr "opción histórica -- no-op"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2273
 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:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:297 builtin/stash.c:812
+#: 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 "ser silencioso"
 
-#: builtin/am.c:2167
-msgid "add a Signed-off-by line to the commit message"
-msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"
+#: builtin/am.c:2276
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "agregar una línea \"Signed-off-by\" al mensaje del commit"
 
-#: builtin/am.c:2170
+#: builtin/am.c:2279
 msgid "recode into utf8 (default)"
 msgstr "recodificar en utf8 (default)"
 
-#: builtin/am.c:2172
+#: builtin/am.c:2281
 msgid "pass -k flag to git-mailinfo"
 msgstr "pasar flag -k a git-mailinfo"
 
-#: builtin/am.c:2174
+#: builtin/am.c:2283
 msgid "pass -b flag to git-mailinfo"
 msgstr "pasar flag -b a git-mailinfo"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2285
 msgid "pass -m flag to git-mailinfo"
 msgstr "pasar flag -m a git-mailinfo"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2287
 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:2181
+#: builtin/am.c:2290
 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:2184
+#: builtin/am.c:2293
 msgid "strip everything before a scissors line"
 msgstr "descubrir todo antes de una línea de tijeras"
 
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr "pasarlo a través de 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 "pasarlo a través de git-apply"
 
-#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
-#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:150 parse-options.h:171 parse-options.h:312
+#: 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: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:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: 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:2210
+#: builtin/am.c:2322
 msgid "format the patch(es) are in"
-msgstr "formatear el parche(s)"
+msgstr "formato de los parches"
 
-#: builtin/am.c:2216
+#: builtin/am.c:2328
 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:2218
+#: builtin/am.c:2330
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuar aplicando los parches tras resolver conflictos"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2333
 msgid "synonyms for --continue"
 msgstr "sinónimos para --continue"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2336
 msgid "skip the current patch"
 msgstr "saltar el parche actual"
 
-#: builtin/am.c:2227
-msgid "restore the original branch and abort the patching operation."
-msgstr "restaurar la rama original y abortar la operación de parchado."
+#: builtin/am.c:2339
+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:2230
-msgid "abort the patching operation but keep HEAD where it is."
-msgstr "abortar la operación de parchado pero mantener HEAD donde está."
+#: builtin/am.c:2342
+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:2233
-msgid "show the patch being applied."
-msgstr "muestra el parche siendo aplicado."
+#: builtin/am.c:2346
+msgid "show the patch being applied"
+msgstr "muestra el parche siendo aplicado"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2351
 msgid "lie about committer date"
 msgstr "mentir sobre la fecha del committer"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2353
 msgid "use current timestamp for author date"
 msgstr "usar el timestamp actual para la fecha del autor"
 
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
-#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
+#: 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 "key-id"
 
-#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
-msgstr "Commits con firma GPG"
+msgstr "firmar los commits con GPG"
 
-#: builtin/am.c:2245
+#: builtin/am.c:2359
 msgid "(internal use for git-rebase)"
 msgstr "(uso interno para git-rebase)"
 
-#: builtin/am.c:2263
+#: 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."
@@ -9056,16 +10833,16 @@ msgstr ""
 "La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
 "será eliminada. Por favor no la use más."
 
-#: builtin/am.c:2270
+#: builtin/am.c:2384
 msgid "failed to read the index"
 msgstr "falló al leer el índice"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2399
 #, 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:2309
+#: builtin/am.c:2423
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9074,11 +10851,11 @@ msgstr ""
 "Directorio extraviado %s encontrado.\n"
 "Use \"git am --abort\" para borrarlo."
 
-#: builtin/am.c:2315
+#: builtin/am.c:2429
 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:2325
+#: builtin/am.c:2439
 msgid "interactive mode requires patches on the command line"
 msgstr "modo interactivo requiere parches en la línea de comando"
 
@@ -9089,11 +10866,11 @@ 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'"
+msgstr "no se pudo crear el archivo de crónica '%s'"
 
 #: builtin/archive.c:20
 msgid "could not redirect output"
-msgstr "no se pudo direccionar la salida"
+msgstr "no se pudo redirigir la salida"
 
 #: builtin/archive.c:37
 msgid "git archive: Remote with no URL"
@@ -9116,43 +10893,15 @@ msgstr "git archive: error de protocolo"
 msgid "git archive: expected a flush"
 msgstr "git archive: se esperaba un flush"
 
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
 #: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <mal_término> <buen_término>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<commit>]"
 
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <estado> <revision> <buen_term> "
-"<mal_term>"
-
-#: builtin/bisect--helper.c:27
-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>"
-
-#: builtin/bisect--helper.c:28
+#: 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:29
+#: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
@@ -9160,48 +10909,76 @@ msgstr ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:26
 msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<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>...]"
 msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<término> --term-{new,"
-"bad}=<término>][--no-checkout] [<malo> [<bueno>...]] [--] [<rutas>...]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<término> --term-{old,"
+"good}=<término>] [--no-checkout] [--first-parent] [<malo> [<bueno>...]] [--] "
+"[<rutas>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+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-state (bad|new) [<rev>]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<rev>...]"
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+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
+#, 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
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "no se pudo escribir al archivo '%s'"
+
+#: builtin/bisect--helper.c:155
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' no es un término válido"
 
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:159
 #, 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:100
+#: builtin/bisect--helper.c:169
 #, 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:111
+#: builtin/bisect--helper.c:179
 msgid "please use two different terms"
 msgstr "por favor use dos términos diferentes"
 
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "no se pudo abrir el archivo BISECT_TERMS"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:195
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "No estamos bisecando.\n"
 
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:203
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' no es un commit válido"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:212
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9209,36 +10986,36 @@ msgstr ""
 "no se pudo hacer check out al HEAD original '%s'. Intenta 'git bisect reset "
 "<commit>'."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:256
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Mal argumento bisect_write: %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:261
 #, 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:232
+#: builtin/bisect--helper.c:273
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "no se pudo abrir el archivo '%s'"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:299
 #, 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:285
+#: 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 ""
-"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:289
+#: builtin/bisect--helper.c:330
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9246,10 +11023,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:321
+#: builtin/bisect--helper.c:350
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "haciendo bisect solo con un commit %s"
@@ -9258,15 +11035,15 @@ msgstr "haciendo bisect solo con un commit %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:358
 msgid "Are you sure [Y/n]? "
 msgstr "¿Estás seguro [Y/n]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:419
 msgid "no terms defined"
 msgstr "no hay términos definidos"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:422
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9275,7 +11052,7 @@ msgstr ""
 "Tus términos actuales son %s para el estado viejo\n"
 "y %s para el estado nuevo.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:432
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9284,269 +11061,317 @@ 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:475
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+msgid "revision walk setup failed\n"
+msgstr "la configuración del recorrido de revisiones falló\n"
+
+#: builtin/bisect--helper.c:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "no se pudo abrir '%s' en modo append"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr "'' no es un término válido"
+
+#: builtin/bisect--helper.c:663
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "opción desconocida: '%s'"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:667
 #, 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:511
+#: builtin/bisect--helper.c:698
 msgid "bad HEAD - I need a HEAD"
 msgstr "mal HEAD - Necesito un HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:713
 #, 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>'."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:734
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "no se bisecará en un árbol con cg-seek"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:737
 msgid "bad HEAD - strange symbolic ref"
 msgstr "mal HEAD - ref simbólico extraño"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:757
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ref inválido: '%s'"
 
-#: builtin/bisect--helper.c:630
-msgid "perform 'git bisect next'"
-msgstr "realiza 'git bisect next'"
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Debes iniciar con \"git bisect start\"\n"
 
-#: builtin/bisect--helper.c:632
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "escribe los términos a .git/BISECT_TERMS"
+#. 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:826
+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:634
-msgid "cleanup the bisection state"
-msgstr "limpiar el estado de bisección"
+#: builtin/bisect--helper.c:844
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Llame a `--bisect-state` con al menos un argumento"
 
-#: builtin/bisect--helper.c:636
-msgid "check for expected revs"
-msgstr "revisar por revs esperados"
+#: builtin/bisect--helper.c:857
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' solo puede tomar un argumento."
 
-#: builtin/bisect--helper.c:638
-msgid "reset the bisection state"
-msgstr "reiniciar el estado de bisect"
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Mala entrada rev: %s"
+
+#: builtin/bisect--helper.c:889
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Mala entrada rev (no es un commit): %s"
 
-#: builtin/bisect--helper.c:640
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "escribir el estado de bisect en BISECT_LOG"
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr "No estamos bisecando."
 
-#: builtin/bisect--helper.c:642
-msgid "check and set terms in a bisection state"
-msgstr "revisar y configurar los terms en el estado de bisect"
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "¿¿'%s'?? ¿De qué estás hablando?"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "no se puede leer '%s' para reproducir"
+
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr "reiniciar el estado de bisect"
+
+#: builtin/bisect--helper.c:1058
 msgid "check whether bad or good terms exist"
 msgstr "revisar si existen términos malos o buenos"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:1060
 msgid "print out the bisect terms"
 msgstr "imprimir los terms del bisect"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:1062
 msgid "start the bisect session"
 msgstr "comenzar la sesión de bisect"
 
-#: builtin/bisect--helper.c:650
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"
+#: builtin/bisect--helper.c:1064
+msgid "find the next bisection commit"
+msgstr "encontrar el siguiente commit de bisección"
 
-#: builtin/bisect--helper.c:652
-msgid "no log for BISECT_WRITE"
-msgstr "no hay log para BISECT_WRITE"
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr "marcar el estado de ref (o refs)"
 
-#: builtin/bisect--helper.c:669
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms requiere dos argumentos"
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr "listar los pasos de bisección hasta ahora"
 
-#: builtin/bisect--helper.c:673
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state no requiere argumentos"
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
+msgstr "reproducir el proceso de bisección del archivo dado"
 
-#: builtin/bisect--helper.c:680
-msgid "--bisect-reset requires either no argument or a commit"
-msgstr "--bisect-reset requiere un commit o ningún argumento"
+#: builtin/bisect--helper.c:1072
+msgid "skip some commits for checkout"
+msgstr "saltar algunos commits para checkout"
 
-#: builtin/bisect--helper.c:684
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write requiere entre 4 o 5 argumentos"
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "no hay log para BISECT_WRITE"
 
-#: builtin/bisect--helper.c:690
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--bisect-clean-state no requiere argumentos"
+#: builtin/bisect--helper.c:1089
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset requiere o un commit o ningún argumento"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:1094
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check requiere 2 o 3 argumentos"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:1100
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms requiere 0 o 1 argumentos"
 
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next requiere 0 argumentos"
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log requiere 0 argumentos"
+
+#: builtin/bisect--helper.c:1125
+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:36
+#: 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:409
+#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
 msgstr "esperando un color: %s"
 
-#: builtin/blame.c:416
+#: builtin/blame.c:417
 msgid "must end with a color"
 msgstr "tiene que terminar con un color"
 
-#: builtin/blame.c:729
+#: builtin/blame.c:728
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "color inválido '%s' en color.blame.repeatedLines"
 
-#: builtin/blame.c:747
+#: builtin/blame.c:746
 msgid "invalid value for blame.coloring"
 msgstr "valor inválido para blame.coloring"
 
-#: builtin/blame.c:822
+#: builtin/blame.c:845
 #, 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:844
-msgid "Show blame entries as we find them, incrementally"
-msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "mostrar las entradas blame como las encontramos, incrementalmente"
 
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)"
+#: builtin/blame.c:868
+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:846
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "No tratar commits raíces como extremos (Default: off)"
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "no tratar commits raíces como extremos (Default: off)"
 
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "Mostrar estadísticas de costo de trabajo"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "mostrar estadísticas de costo de trabajo"
 
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "Forzar el reporte de progreso"
+#: 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 "forzar el reporte de progreso"
 
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr "Mostrar la puntuación de salida de las entradas de blame"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "mostrar la puntuación de salida de las entradas de blame"
 
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
-msgstr "Mostrar nombre original del archivo (Default: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "mostrar nombre original del archivo (Default: auto)"
 
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
-msgstr "Mostrar número de línea original (Default: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "mostrar número de línea original (Default: off)"
 
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
-msgstr "Mostrar en un formato diseñado para consumo de máquina"
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
+msgstr "mostrar en un formato diseñado para consumo de máquina"
 
-#: builtin/blame.c:853
-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:876
+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:854
-msgid "Use the same output mode as git-annotate (Default: off)"
-msgstr "Usar el mismo modo salida como git-annotate (Default: off)"
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr "usar el mismo modo de salida como git-annotate (Default: off)"
 
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
-msgstr "Mostrar timestamp en formato raw (Default: off)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "mostrar timestamp en formato raw (Default: off)"
 
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "mostrar SHA1 del commit en formato largo (Default: off)"
 
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "Suprimir nombre del autor y timestamp (Default: off)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "suprimir nombre del autor y timestamp (Default: off)"
 
-#: builtin/blame.c:858
-msgid "Show author email instead of name (Default: off)"
-msgstr "Mostrar en cambio el email del autor (Default: off)"
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
+msgstr "mostrar el email del autor en cambio de su nombre (Default: off)"
 
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
-msgstr "Ignorar diferencias de espacios en blanco"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "ignorar diferencias de espacios en blanco"
 
-#: builtin/blame.c:860 builtin/log.c:1630
+#: builtin/blame.c:883 builtin/log.c:1823
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
 msgstr "ignorar <rev> durante el blame"
 
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
 msgstr "ignorar revisiones de <archivo>"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:885
 msgid "color redundant metadata from previous line differently"
 msgstr "colorear metadata redundante de líneas previas de manera diferente"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:886
 msgid "color lines by age"
 msgstr "colorear líneas por edad"
 
-#: builtin/blame.c:870
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Usar un heurístico experimental para mejorar los diffs"
-
-#: builtin/blame.c:872
-msgid "Spend extra cycles to find better match"
-msgstr "Ocupo más ciclos para encontrar mejoras resultados"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr "ocupar más ciclos para encontrar mejores resultados"
 
-#: builtin/blame.c:873
-msgid "Use revisions from <file> instead of calling git-rev-list"
-msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "use revisiones en <archivo> en lugar de llamar git-rev-list"
 
-#: builtin/blame.c:874
-msgid "Use <file>'s contents as the final image"
-msgstr "Usar contenido de <archivo> como imagen final"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "usar contenido de <archivo> como imagen final"
 
-#: builtin/blame.c:875 builtin/blame.c:876
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "puntaje"
 
-#: builtin/blame.c:875
-msgid "Find line copies within and across files"
-msgstr "Encontrar copias de líneas entre y a través de archivos"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
+msgstr "encontrar copias de líneas entre y a través de archivos"
 
-#: builtin/blame.c:876
-msgid "Find line movements within and across files"
-msgstr "Encontrar movimientos de líneas entre y a través de archivos"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "encontrar movimientos de líneas entre y a través de archivos"
 
-#: builtin/blame.c:877
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "rango"
 
-#: builtin/blame.c:877
-msgid "Process only line range n,m, counting from 1"
-msgstr "Procesar solo el rango de líneas n,m, contando desde 1"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr ""
+"procesar solo el rango de líneas <inicio>,<fin> o función :<nombre-de-"
+"función>"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:945
 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
@@ -9556,24 +11381,24 @@ msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr "hace 4 años, 11 meses"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1112
 #, 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:1133
+#: builtin/blame.c:1157
 msgid "Blaming lines"
 msgstr "Blaming a líneas"
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<opciones>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<opciones>] [-r | -a] [--merged] [--no-merged]"
 
 #: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -9614,8 +11439,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
@@ -9635,121 +11460,111 @@ msgstr ""
 msgid "Update of config-file failed"
 msgstr "Falló de actualización de config-file"
 
-#: builtin/branch.c:220
+#: 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:226
+#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr "No se pudo revisar el objeto commit para HEAD"
 
-#: builtin/branch.c:240
+#: builtin/branch.c:244
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
 
-#: builtin/branch.c:255
+#: builtin/branch.c:259
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "rama de rastreo remoto '%s' no encontrada."
 
-#: builtin/branch.c:256
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
 msgstr "rama '%s' no encontrada."
 
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Error al eliminar la rama de rastreo remota '%s'"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Error al eliminar la rama '%s'"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
 
-#: builtin/branch.c:280
+#: 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:429 builtin/tag.c:61
+#: builtin/branch.c:440 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "no es posible analizar el string de formato"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:471
 msgid "could not resolve HEAD"
 msgstr "no se pudo resolver HEAD"
 
-#: builtin/branch.c:466
+#: builtin/branch.c:477
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) apunta fuera de refs/heads/"
 
-#: builtin/branch.c:481
+#: builtin/branch.c:492
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Rama %s está siendo rebasada en %s"
 
-#: builtin/branch.c:485
+#: builtin/branch.c:496
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Rama %s está siendo bisecada en %s"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:513
 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:504
+#: builtin/branch.c:515
 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:515
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nombre de rama inválido: '%s'"
 
-#: builtin/branch.c:542
+#: builtin/branch.c:555
 msgid "Branch rename failed"
 msgstr "Cambio de nombre de rama fallido"
 
-#: builtin/branch.c:544
+#: builtin/branch.c:557
 msgid "Branch copy failed"
-msgstr "Copiado de rama fallido"
+msgstr "Duplicación de rama fallida"
 
-#: builtin/branch.c:548
+#: builtin/branch.c:561
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Copia creada de la rama malnombrada '%s'"
 
-#: builtin/branch.c:551
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Rama mal llamada '%s' renombrada"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:570
 #, 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:566
+#: builtin/branch.c:579
 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:568
+#: builtin/branch.c:581
 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:584
+#: builtin/branch.c:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -9760,180 +11575,180 @@ msgstr ""
 "%s\n"
 "Las líneas que comiencen con '%c' serán eliminadas.\n"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr "Opciones genéricas"
 
-#: builtin/branch.c:620
+#: builtin/branch.c:633
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "mostrar hash y tema, dar dos veces para rama upstream"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr "suprimir mensajes informativos"
 
-#: builtin/branch.c:622
+#: builtin/branch.c:635
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "configurando modo tracking (mirar git-pull(1))"
 
-#: builtin/branch.c:624
+#: builtin/branch.c:637
 msgid "do not use"
 msgstr "no usar"
 
-#: builtin/branch.c:626 builtin/rebase.c:486
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr "upstream"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr "cambiar info de upstream"
 
-#: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "Desconfigurando la info de upstream"
+#: builtin/branch.c:640
+msgid "unset the upstream info"
+msgstr "desconfigurando la info de upstream"
 
-#: builtin/branch.c:628
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr "usar salida con colores"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
-msgstr "actuar en ramas de traqueo remoto"
+msgstr "actuar en ramas de rastreo remoto"
 
-#: 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 "mostrar solo ramas que contienen el commit"
+msgstr "mostrar solo ramas que contengan el commit"
 
-#: 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 "mostrar solo ramas que no contienen el commit"
+msgstr "mostrar solo ramas que no contengan el commit"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
 msgstr "Acciones específicas de git-branch:"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:651
 msgid "list both remote-tracking and local branches"
 msgstr "listar ramas de remote-tracking y locales"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr "borrar ramas totalmente fusionadas"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:654
 msgid "delete branch (even if not merged)"
 msgstr "borrar rama (incluso si no está fusionada)"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:655
 msgid "move/rename a branch and its reflog"
 msgstr "mover/renombrar una rama y su reflog"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:656
 msgid "move/rename a branch, even if target exists"
 msgstr "mover/renombrar una rama, incluso si el destino existe"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:657
 msgid "copy a branch and its reflog"
 msgstr "copiar una rama y su reflog"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:658
 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:646
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr "listar nombres de ramas"
 
-#: builtin/branch.c:647
+#: builtin/branch.c:660
 msgid "show current branch name"
 msgstr "muestra el nombre de branch actual"
 
-#: builtin/branch.c:648
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr "crea el reflog de la rama"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr "edita la descripción de la rama"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:664
 msgid "force creation, move/rename, deletion"
-msgstr "fuerza la creación,movimiento/renombrado,borrado"
+msgstr "fuerza la creación, movimiento/renombramiento, eliminación"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:665
 msgid "print only branches that are merged"
-msgstr "muestra solo ramas que han sido fusionadas"
+msgstr "muestra solo ramas que hayan sido fusionadas"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:666
 msgid "print only branches that are not merged"
 msgstr "muestra solo ramas que no han sido fusionadas"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:667
 msgid "list branches in columns"
 msgstr "muestra las ramas en columnas"
 
-#: builtin/branch.c:657 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:433
+#: builtin/tag.c:477
 msgid "object"
 msgstr "objeto"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:670
 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:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
 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:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: 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 para usar para el output"
 
-#: builtin/branch.c:684 builtin/clone.c:760
+#: builtin/branch.c:695 builtin/clone.c:794
 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:708
+#: builtin/branch.c:719
 msgid "--column and --verbose are incompatible"
 msgstr "--column y --verbose son incompatibles"
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
 msgid "branch name required"
 msgstr "se necesita el nombre de la rama"
 
-#: builtin/branch.c:753
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
 msgstr "No se puede dar descripción al HEAD desacoplado"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:771
 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:765
+#: builtin/branch.c:778
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aún no hay commits en la rama '%s'."
 
-#: builtin/branch.c:768
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
 msgstr "No hay ninguna rama llamada '%s'."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:796
 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:792
+#: builtin/branch.c:805
 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:797
+#: builtin/branch.c:810
 msgid "too many arguments to set new upstream"
 msgstr "demasiados argumentos para configurar un nuevo upstream"
 
-#: builtin/branch.c:801
+#: builtin/branch.c:814
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -9941,32 +11756,32 @@ msgstr ""
 "no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
 "rama."
 
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:817 builtin/branch.c:840
 #, c-format
 msgid "no such branch '%s'"
 msgstr "no hay tal rama '%s'"
 
-#: builtin/branch.c:808
+#: builtin/branch.c:821
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la rama '%s' no existe"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:834
 msgid "too many arguments to unset upstream"
 msgstr "demasiados argumentos para desconfigurar upstream"
 
-#: builtin/branch.c:825
+#: builtin/branch.c:838
 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:831
+#: builtin/branch.c:844
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Rama '%s' no tiene información de upstream"
 
-#: builtin/branch.c:841
+#: 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>?"
@@ -9974,7 +11789,7 @@ 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:845
+#: builtin/branch.c:858
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -9982,20 +11797,168 @@ msgstr ""
 "la opción '--set-upstream' ya no es soportada. Considere usar '--track' o '--"
 "set-upstream-to' en cambio."
 
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "versión de git:\n"
+
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
-msgstr "%s está bien\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() falló con error '%s' (%d)\n"
 
-#: builtin/bundle.c:58
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "información del compilador: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "información de libc: "
+
+#: builtin/bugreport.c:80
+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
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr ""
+"git bugreport [-o|--output-directory <archivo>] [-s|--suffix <formato>]"
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"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 conteste las siguientes preguntas para ayudarnos a entender el "
+"problema.\n"
+"\n"
+"¿Qué hiciste antes de que sucediera el bug? (Pasos para reproducir el "
+"problema)\n"
+"\n"
+"¿Qué esperabas que sucediera? (Comportamiento esperado)\n"
+"\n"
+"¿Qué sucedio en lugar de eso? (Comportamiento real)\n"
+"\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
+msgid "specify a destination for the bugreport file"
+msgstr "especificar el destino para el archivo de reporte de bug"
+
+#: builtin/bugreport.c:138
+msgid "specify a strftime format suffix for the filename"
+msgstr ""
+"especificar el sufijo de formato de strftime para el nombre del archivo"
+
+#: builtin/bugreport.c:160
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "no se pudo crear directorios principales para '%s'"
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr "Información del sistema"
+
+#: builtin/bugreport.c:170
+msgid "Enabled Hooks"
+msgstr "Hooks habilitados"
+
+#: builtin/bugreport.c:177
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "no se pudo crear un archivo nuevo en '%s'"
+
+#: builtin/bugreport.c:180
+#, c-format
+msgid "unable to write to %s"
+msgstr "no es posible escribir en %s"
+
+#: builtin/bugreport.c:190
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Crear un nuevo reporte en '%s'.\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<opciones>] <file> <git-rev-list args>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<opciones>] <archivo>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <archivo> [<nombre-de-ref>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <archivo> [<nombre-de-ref>...]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr "no mostrar medidor de progreso"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+msgid "show progress meter"
+msgstr "mostrar medidor de progreso"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+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:3914
+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
+msgid "specify bundle format version"
+msgstr "especificar la versión del formato del paquete"
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr "Se necesita un repositorio para agrupar."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr "no mostrar detalles del bundle"
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s está bien\n"
+
+#: builtin/bundle.c:179
 msgid "Need a repository to unbundle."
 msgstr "Se necesita un repositorio para desagrupar."
 
-#: builtin/cat-file.c:595
+#: builtin/bundle.c:191 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:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sub-comando desconocido: %s"
+
+#: 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>"
@@ -10003,82 +11966,82 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
 
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:597
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"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[=<formato>] | --batch-check[=<formato>]) [--follow-"
+"symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:617
+#: builtin/cat-file.c:618
 msgid "only one batch option may be specified"
 msgstr "solo se puede especificar una opción batch"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipo> puede ser: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object type"
 msgstr "mostrar el tipo del objeto"
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
 msgid "show object size"
 msgstr "mostrar el tamaño del objeto"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "exit with zero when there's no error"
 msgstr "salir con cero cuando no haya error"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
 msgid "pretty-print object's content"
 msgstr "realizar pretty-print del contenido del objeto"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
 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:644
+#: builtin/cat-file.c:645
 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:645 git-submodule.sh:936
+#: builtin/cat-file.c:646
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
 msgid "use a specific path for --textconv/--filters"
 msgstr "use una ruta específica para --textconv/--filters"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 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:649
+#: builtin/cat-file.c:650
 msgid "buffer --batch output"
 msgstr "salida buffer --batch"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:652
 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:655
+#: builtin/cat-file.c:656
 msgid "show info about objects fed from the standard input"
 msgstr "mostrar info de los objetos alimentados por standard input"
 
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
 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:661
+#: builtin/cat-file.c:662
 msgid "show all objects with --batch or --batch-check"
 msgstr "mostrar todos los objetos con --batch o --batch-check"
 
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:664
 msgid "do not order --batch-all-objects output"
-msgstr "no ordenar el output de --batch-all-objects"
+msgstr "no ordenar el salida de --batch-all-objects"
 
 #: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
@@ -10104,42 +12067,42 @@ 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:1433 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
 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"
 msgstr "ignorar el índice cuando se revise"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "no se puede especificar los nombres de rutas con --stdin"
 
-#: builtin/check-ignore.c:163
+#: 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:165
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "ruta no especificada"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet solo es válido con un nombre de ruta único"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "no se puede tener ambos --quiet y --verbose"
 
-#: builtin/check-ignore.c:174
+#: 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>..."
@@ -10158,167 +12121,173 @@ msgstr "no es posible analizar el contacto: %s"
 msgid "no contacts specified"
 msgstr "contactos no especificados"
 
-#: builtin/checkout-index.c:131
+#: builtin/checkout--worker.c:110
+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: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 "cuando cree archivos, anteponer <string>"
+
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opciones>] [--] [<archivo>...]"
 
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage tiene que estar entre 1 y 3 o all"
 
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "revisar todos los archivos en el índice"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "forzar sobreescritura de los archivos existentes"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "no hay advertencias para los archivos existentes y los archivos no están en "
 "el índice"
 
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "no revisar archivos nuevos"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "actualizar información de estado en el archivo índice"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "leer lista de rutas desde standard input"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "escribir el contenido en un archivo temporal"
 
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:679
-msgid "string"
-msgstr "string"
-
-#: builtin/checkout-index.c:179
-msgid "when creating files, prepend <string>"
-msgstr "cuando cree archivos, anteponer <string>"
-
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "copiar los archivos del stage nombrado"
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opciones>]  <rama>"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..."
 
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<opciones>] [<rama>]"
 
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<opciones>] [--source=<rama>] -- <archivo>..."
 
-#: builtin/checkout.c:173 builtin/checkout.c:212
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "ruta '%s' no tiene nuestra versión"
 
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "ruta '%s' no tiene su versión"
 
-#: builtin/checkout.c:191
+#: builtin/checkout.c:208
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "ruta '%s' no tiene todas las versiones necesarias"
 
-#: builtin/checkout.c:241
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "ruta '%s' no tiene versiones necesarias"
 
-#: builtin/checkout.c:259
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "ruta '%s': no se puede fusionar"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Incapaz de agregar resultados de fusión a '%s'"
 
-#: builtin/checkout.c:375
+#: 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:380
+#: 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:387
+#: 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:410 builtin/checkout.c:413 builtin/checkout.c:416
-#: builtin/checkout.c:420
+#: 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:423 builtin/checkout.c:426
+#: 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:430
+#: 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:434
+#: 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:438
+#: 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:443 builtin/checkout.c:448
+#: 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:507 builtin/checkout.c:514
+#: 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:680
+#: builtin/checkout.c:734
 msgid "you need to resolve your current index first"
 msgstr "necesitas resolver tu índice actual primero"
 
-#: builtin/checkout.c:730
+#: builtin/checkout.c:788
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10327,50 +12296,50 @@ msgstr ""
 "no se puede continuar con los cambios en stage en los siguientes archivos:\n"
 "%s"
 
-#: builtin/checkout.c:833
+#: builtin/checkout.c:881
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "No se puede hacer reflog para '%s': %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:923
 msgid "HEAD is now at"
 msgstr "HEAD está ahora en"
 
-#: builtin/checkout.c:879 builtin/clone.c:713
+#: builtin/checkout.c:927 builtin/clone.c:725 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:883
+#: builtin/checkout.c:931
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Reiniciar rama '%s'\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:934
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Ya en '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:938
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Rama reiniciada y cambiada a '%s'\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:940 builtin/checkout.c:1371
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Cambiado a nueva rama '%s'\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:942
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Cambiado a rama '%s'\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:993
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... y %d más.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:999
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10383,17 +12352,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:970
+#: 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"
@@ -10420,28 +12389,19 @@ msgstr[1] ""
 " git branch <nombre-de-rama> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1053
 msgid "internal error in revision walk"
-msgstr "error interno en camino de revisión"
+msgstr "error interno en recorrido de revisiones"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1057
 msgid "Previous HEAD position was"
 msgstr "La posición previa de HEAD era"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
 msgid "You are on a branch yet to be born"
 msgstr "Estás en una rama por nacer"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "solo una referencia esperada"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "solo una referencia esperada, %d entregadas."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1179
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10450,37 +12410,71 @@ msgstr ""
 "'%s' puede ser tanto un archivo local como una rama de rastreo.\n"
 "Por favor use -- (y opcionalmente --no-guess) para desambiguar"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455
+#: 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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n"
+"puedes hacerlo proporcionando el nombre completo con la opción --track:\n"
+"\n"
+"    git checkout --track origin/<nombre>\n"
+"\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:1196
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' concordó con múltiples (%d) ramas de rastreo remoto"
+
+#: builtin/checkout.c:1262
+msgid "only one reference expected"
+msgstr "solo una referencia esperada"
+
+#: builtin/checkout.c:1279
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "solo una referencia esperada, %d entregadas."
+
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "referencia inválida: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
 #, 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:1303
+#: builtin/checkout.c:1385
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "se esperaba un branch, se obtuvo tag '%s'"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1387
 #, 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:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
 #, 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:1309
+#: builtin/checkout.c:1391
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "se espera una rama, se obtuvo commit '%s'"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1407
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10488,7 +12482,7 @@ msgstr ""
 "no se puede cambiar de branch durante un merge\n"
 "Considera \"git merge --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1411
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10496,7 +12490,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:1333
+#: builtin/checkout.c:1415
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10504,7 +12498,7 @@ msgstr ""
 "no se puede cambiar de branch durante un rebase\n"
 "Considera \"git rebase --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1419
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10512,7 +12506,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:1341
+#: builtin/checkout.c:1423
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10520,137 +12514,137 @@ msgstr ""
 "no se puede cambiar de branch durante un revert\n"
 "Considera \"git revert --quit\" o \"git worktree add\"."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1427
 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:1352
+#: builtin/checkout.c:1434
 msgid "paths cannot be used with switching branches"
 msgstr "rutas no pueden ser usadas con cambios de rama"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' no puede ser usado con cambios de ramas"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: 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' no puede ser usado con '%s'"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' no puede tomar <punto de partida>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1470
 #, 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:1395
+#: builtin/checkout.c:1477
 msgid "missing branch or commit argument"
 msgstr "falta branch o commit como argumento"
 
-#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
-#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
-#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "forzar el reporte de progreso"
-
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1520
 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:1439 builtin/log.c:1618 parse-options.h:318
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
 msgid "style"
 msgstr "estilo"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1522
 msgid "conflict style (merge or diff3)"
-msgstr "conflicto de estilos (merge o diff3)"
+msgstr "estilo de conflictos (merge o diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:503
+#: builtin/checkout.c:1534 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "desacoplar HEAD en el commit nombrado"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1535
 msgid "set upstream info for new branch"
 msgstr "configurar info de upstream para una rama nueva"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1537
 msgid "force checkout (throw away local modifications)"
 msgstr "forzar el checkout (descartar modificaciones locales)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new-branch"
 msgstr "nueva-rama"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new unparented branch"
 msgstr "nueva rama no emparentada"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1541 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr "actualizar archivos ignorados (default)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1544
 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:1475
+#: builtin/checkout.c:1557
 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:1478
+#: builtin/checkout.c:1560
 msgid "checkout their version for unmerged files"
 msgstr "hacer checkout a su versión para los archivos sin fusionar"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1564
 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:1533
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B y --orphan son mutuamente exclusivas"
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c y --orphan son mutuamente exclusivas"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1626
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p y --overlay son mutuamente exclusivas"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1663
 msgid "--track needs a branch name"
 msgstr "--track necesita el nombre de una rama"
 
-#: builtin/checkout.c:1578
-msgid "missing branch name; try -b"
-msgstr "falta nombre de rama; prueba -b"
+#: builtin/checkout.c:1668
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "falta nombre de rama; prueba -%c"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1700
 #, c-format
 msgid "could not resolve %s"
 msgstr "no se pudo resolver %s"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "debes especificar path(s) para restaurar"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1716
 msgid "invalid path specification"
 msgstr "especificación de ruta inválida"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1723
 #, 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:1642
+#: builtin/checkout.c:1727
 #, 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:1646
+#: builtin/checkout.c:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file es incompatible con --detach"
+
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file es incompatible con --patch"
+
+#: builtin/checkout.c:1752
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10658,135 +12652,106 @@ msgstr ""
 "git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
 "se revisa fuera del índice."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' acertó más de una rama remota rastreada.\n"
-"Encontramos %d remotos con una referencia que concuerda. Así que volvemos\n"
-"a intentar resolver el argumento como una ruta, ¡pero eso también falló!\n"
-"\n"
-"Si querías hacer un check out a una rama rastreada remota, como 'origin',\n"
-"puedes hacerlo proporcionando el nombre completo con la opción --track:\n"
-"\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"
-"checkout.defaultRemote=origin en tu configuración."
+#: builtin/checkout.c:1757
+msgid "you must specify path(s) to restore"
+msgstr "debes especificar path(s) para restaurar"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
-#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: 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 "rama"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1784
 msgid "create and checkout a new branch"
 msgstr "crear y hacer checkout a una nueva rama"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1786
 msgid "create/reset and checkout a branch"
 msgstr "crear/reiniciar y hacer checkout a una rama"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1787
 msgid "create reflog for new branch"
 msgstr "crear un reflog para una nueva rama"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1789
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>' (default)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1790
 msgid "use overlay mode (default)"
 msgstr "usar modo overlay (default)"
 
-#: builtin/checkout.c:1743
+#: builtin/checkout.c:1835
 msgid "create and switch to a new branch"
 msgstr "crear y hacer switch a una nueva rama"
 
-#: builtin/checkout.c:1745
+#: builtin/checkout.c:1837
 msgid "create/reset and switch to a branch"
 msgstr "crear/reiniciar y hacer switch a una rama"
 
-#: builtin/checkout.c:1747
+#: builtin/checkout.c:1839
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "adivinar segunda opción 'git checkout <no-hay-tal-rama>'"
 
-#: builtin/checkout.c:1749
+#: builtin/checkout.c:1841
 msgid "throw away local modifications"
 msgstr "descartar modificaciones locales"
 
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1875
 msgid "which tree-ish to checkout from"
 msgstr "de qué árbol hacer el checkout"
 
-#: builtin/checkout.c:1783
+#: builtin/checkout.c:1877
 msgid "restore the index"
-msgstr "restaurar el index"
+msgstr "restaurar el índice"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1879
 msgid "restore the working tree (default)"
 msgstr "restaurar el árbol de trabajo (default)"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1881
 msgid "ignore unmerged entries"
 msgstr "ignorar entradas no fusionadas"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1882
 msgid "use overlay mode"
 msgstr "usar modo overlay"
 
-#: builtin/clean.c:28
+#: 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 <patrón>] [-x | -X] [--] <rutas>..."
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Borrando %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
-msgstr "Sera borrado %s\n"
+msgstr "Será borrado %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Saltando repositorio %s\n"
 
-#: builtin/clean.c:35
-#, c-format
-msgid "Would skip repository %s\n"
-msgstr "Se saltara repositorio %s\n"
-
 #: builtin/clean.c:36
 #, c-format
-msgid "failed to remove %s"
-msgstr "falló al borrar %s"
+msgid "Would skip repository %s\n"
+msgstr "Se saltará repositorio %s\n"
 
-#: builtin/clean.c:37
+#: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "no se pudo lstat %s\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10794,12 +12759,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"
+"Ayuda de comandos:\n"
+"1          - selecciona un objeto por número\n"
 "foo        - selecciona un objeto basado en un prefijo único\n"
 "           - (vacío) no elegir nada\n"
 
-#: builtin/clean.c:305 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10811,7 +12776,7 @@ msgid ""
 "*          - choose all items\n"
 "           - (empty) finish selecting\n"
 msgstr ""
-"Ayuda rápida:\n"
+"Ayuda de comandos:\n"
 "1          - selecciona un objeto único\n"
 "3-5        - selecciona un rango de objetos\n"
 "2-3,6-9    - selecciona múltiples rangos\n"
@@ -10820,38 +12785,33 @@ msgstr ""
 "*          - 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:663
+#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
-msgstr "Input ignora los patrones >> "
+msgstr "Ingresa los patrones que ignorar>> "
 
-#: builtin/clean.c:700
+#: 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:721
+#: 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:762
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "¿Borrar %s [y/N]? "
 
-#: builtin/clean.c:787 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Adiós.\n"
-
-#: builtin/clean.c:795
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10862,240 +12822,244 @@ 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   - excluye objetos de la eliminación\n"
+"select by numbers   - selecciona 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:822 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Comandos ***"
-
-#: builtin/clean.c:823 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Ahora que"
-
-#: builtin/clean.c:831
+#: 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:847
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "No hay más archivos para limpiar, saliendo."
 
-#: builtin/clean.c:909
+#: builtin/clean.c:900
 msgid "do not print names of files removed"
 msgstr "no imprimir nombres de archivos borrados"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:902
 msgid "force"
 msgstr "forzar"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "limpieza interactiva"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "borrar directorios completos"
 
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: 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 "patrón"
 
-#: builtin/clean.c:916
+#: 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:917
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "borrar archivos ignorados, también"
 
-#: builtin/clean.c:919
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "borrar solo archivos ignorados"
 
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x y -X no pueden ser usadas juntas"
-
-#: builtin/clean.c:941
+#: 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:944
+#: 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:940
+msgid "-x and -X cannot be used together"
+msgstr "-x y -X no pueden ser usadas juntas"
+
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "no clonar repositorios superficiales"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "no crear checkout"
 
-#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
+#: 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:97
+#: 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:99
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "clonar de un repositorio local"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "no usar hardlinks, siempre copiar"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "configurar como repositorio compartido"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "pathspec"
 
-#: builtin/clone.c:106
+#: 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:109
+#: 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:110 builtin/init-db.c:486
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "directorio-template"
 
-#: builtin/clone.c:111 builtin/init-db.c:487
+#: 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:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: 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 "repositorio de referencia"
 
-#: builtin/clone.c:117 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: 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 "usa--reference  solamente si estás clonado"
+msgstr "usa --reference solamente si estás clonando"
 
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:320
+#: 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 "nombre"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checkout <rama> en lugar de HEAD remota"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "ruta para git-upload-pack en el remoto"
 
-#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "profundidad"
 
-#: builtin/clone.c:125
+#: 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:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/pull.c:211
 msgid "time"
 msgstr "tiempo"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr "crear un clon superficial desde el tiempo específico"
 
-#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
-#: builtin/rebase.c:1417
+#: 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 "revision"
+msgstr "revisión"
 
-#: builtin/clone.c:129 builtin/fetch.c:172
+#: 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:131
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
 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:133
+#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "no clonar ningún tag, y hacer que los subsiguientes fetch no los sigan"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "cualquier submódulo clonado será superficial"
 
-#: builtin/clone.c:136 builtin/init-db.c:495
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:137 builtin/init-db.c:496
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "separa git dir del árbol de trabajo"
 
-#: builtin/clone.c:138
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "llave=valor"
 
-#: builtin/clone.c:139
+#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr "configurar config dentro del nuevo repositorio"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:172
+#: 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 "especifico-de-servidor"
+msgstr "específico-al-servidor"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:173
+#: 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 "opción para trasmitir"
 
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
-#: builtin/push.c:573
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "solo usar direcciones IPv4"
 
-#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
-#: builtin/push.c:575
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "solo usar direcciones IPv6"
 
-#: builtin/clone.c:148
+#: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "cualquier submódulo clonado usará su branch de rastreo remoto"
 
-#: builtin/clone.c:284
+#: builtin/clone.c:156
+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"
@@ -11103,141 +13067,150 @@ 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:337
+#: builtin/clone.c:345
 #, 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:410
+#: builtin/clone.c:418
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe pero no es un directorio"
 
-#: builtin/clone.c:427
+#: builtin/clone.c:436
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "falló al iniciar el iterador sobre '%s'"
 
-#: builtin/clone.c:457
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "falló al crear link '%s'"
 
-#: builtin/clone.c:461
+#: builtin/clone.c:471
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "falló al copiar archivo a '%s'"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:476
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "falló al iterar sobre '%s'"
 
-#: builtin/clone.c:491
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: builtin/clone.c:505
+#: 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 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:582
+#: builtin/clone.c:594
 #, 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:701
+#: builtin/clone.c:713
 #, c-format
 msgid "unable to update %s"
 msgstr "incapaz de actualizar %s"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "falló al inicializar sparse-checkout"
+
+#: builtin/clone.c:784
 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:782
+#: builtin/clone.c:816
 msgid "unable to checkout working tree"
 msgstr "no es posible realizar checkout en el árbol de trabajo"
 
-#: builtin/clone.c:832
+#: builtin/clone.c:894
 msgid "unable to write parameters to config file"
 msgstr "no es posible escribir parámetros al archivo config"
 
-#: builtin/clone.c:895
+#: builtin/clone.c:957
 msgid "cannot repack to clean up"
 msgstr "no se puede reempaquetar para limpiar"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:959
 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:937 builtin/receive-pack.c:1948
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
 msgid "Too many arguments."
-msgstr "Muchos argumentos."
+msgstr "Demasiados argumentos."
 
-#: builtin/clone.c:941
+#: builtin/clone.c:1005
 msgid "You must specify a repository to clone."
 msgstr "Tienes que especificar un repositorio para clonar."
 
-#: builtin/clone.c:954
+#: builtin/clone.c:1018
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "Las opciones --bare y --origin %s son incompatibles."
 
-#: builtin/clone.c:957
+#: builtin/clone.c:1021
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare y --separate-git-dir son incompatibles."
 
-#: builtin/clone.c:970
+#: builtin/clone.c:1035
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "repositorio '%s' no existe"
 
-#: builtin/clone.c:976 builtin/fetch.c:1790
+#: builtin/clone.c:1039 builtin/fetch.c:2014
 #, 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:986
+#: builtin/clone.c:1049
 #, 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:996
+#: builtin/clone.c:1055
+#, 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."
+
+#: builtin/clone.c:1069
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "directorio de trabajo '%s' ya existe."
 
-#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
-#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
+#: 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 "no se pudo crear directorios principales de '%s'"
 
-#: builtin/clone.c:1016
+#: builtin/clone.c:1089
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "no se pudo crear un árbol de trabajo '%s'"
 
-#: builtin/clone.c:1036
+#: builtin/clone.c:1109
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonando en un repositorio vacío '%s'...\n"
 
-#: builtin/clone.c:1038
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonando en '%s'...\n"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1135
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11245,36 +13218,48 @@ msgstr ""
 "clone --recursive no es compatible con --reference y --reference-if-able al "
 "mismo tiempo"
 
-#: builtin/clone.c:1123
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' no es un nombre remoto válido"
+
+#: builtin/clone.c:1229
 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:1125
+#: builtin/clone.c:1231
 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; use file:// en su lugar."
 
-#: builtin/clone.c:1127
+#: builtin/clone.c:1233
 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; use file:// en su "
+"lugar."
 
-#: builtin/clone.c:1129
+#: builtin/clone.c:1235
 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:1132
+#: builtin/clone.c:1240
 msgid "source repository is shallow, ignoring --local"
 msgstr "repositorio fuente es superficial, ignorando --local"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr "--local es ignorado"
 
-#: builtin/clone.c:1212 builtin/clone.c:1220
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "transporte remoto reportó error"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Rama remota %s no encontrada en upstream %s"
 
-#: builtin/clone.c:1223
+#: builtin/clone.c:1347
 msgid "You appear to have cloned an empty repository."
 msgstr "Pareces haber clonado un repositorio sin contenido."
 
@@ -11284,32 +13269,135 @@ 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"
-msgstr "Ancho máximo"
+msgid "maximum width"
+msgstr "ancho máximo"
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "Realizando padding en el borde izquierdo"
+msgid "padding space on left border"
+msgstr "espacio padding en el borde izquierdo"
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "Realizando padding en el borde derecho"
+msgid "padding space on right border"
+msgstr "espacio padding en el borde derecho"
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "Realizando padding entre columnas"
+msgid "padding space between columns"
+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
+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
+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 <objdir>] [--append] [--"
+"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 encontrar el directorio de objetos 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: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"
+msgstr "el directorio de objetos en que guardar el gráfico"
+
+#: builtin/commit-graph.c:83
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "si el commit-graph está cortado, solo verifica el archivo tope"
+
+#: builtin/commit-graph.c:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "No se pudo abrir commit-graph '%s'"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "argumento --split no reconocido, %s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "ID de objeto no hex inesperado: %s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "no es un objeto válido: %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "comenzar recorrido en todas las refs"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "escanear paquete de índices por stdin por commits"
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr "comenzar recorrido a los commits listados por stdin"
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr "incluye todos los commits que ya están en el archivo commit-graph"
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr "habilitar computación para rutas cambiadas"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "permitir escribir un archivo commit-graph incremental"
+
+#: builtin/commit-graph.c:228
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "número máximo de commits en un commit-graph sin base cortada"
+
+#: builtin/commit-graph.c:230
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "razón máxima entre dos niveles de corte de commit-graph"
+
+#: builtin/commit-graph.c:232
+msgid "only expire files older than a given date-time"
+msgstr "solo caducar objetos más viejos a una fecha dada"
+
+#: builtin/commit-graph.c:234
+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
+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"
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr "Recolectando commits del input"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -11323,7 +13411,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "padre duplicado %s ignorado"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
 #, c-format
 msgid "not a valid object name %s"
 msgstr "no es un nombre de objeto válido %s"
@@ -11351,13 +13439,13 @@ msgstr "padre"
 msgid "id of a parent commit object"
 msgstr "id del objeto commit padre"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: 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 "mensaje"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
 msgid "commit message"
 msgstr "mensaje del commit"
 
@@ -11365,8 +13453,8 @@ msgstr "mensaje del commit"
 msgid "read commit log message from file"
 msgstr "leer mensaje de commit desde un archivo"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: 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 "Firmar commit con GPG"
 
@@ -11392,8 +13480,8 @@ msgid ""
 "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"
+"Has solicitado un amend en tu commit más reciente, pero hacerlo lo\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
@@ -11412,10 +13500,14 @@ msgstr ""
 "\n"
 
 #: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Caso contrario, por favor usa 'git rebase --skip'\n"
+
+#: builtin/commit.c:66
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Caso contrario, por favor usa 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:69
 msgid ""
 "and then use:\n"
 "\n"
@@ -11437,140 +13529,146 @@ msgstr ""
 "     git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:315
+#: builtin/commit.c:324
 msgid "failed to unpack HEAD tree object"
 msgstr "falló al desempaquetar objeto del árbol HEAD"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:360
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file con -a no tiene sentido"
+
+#: builtin/commit.c:374
+msgid "No paths with --include/--only does not make sense."
+msgstr "--include/--only sin ruta no tiene sentido."
+
+#: builtin/commit.c:386
 msgid "unable to create temporary index"
 msgstr "no es posible crear un índice temporal"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr "adición interactiva fallida"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:410
 msgid "unable to update temporary index"
 msgstr "no es posible actualizar el índice temporal"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:412
 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:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
 msgid "unable to write new_index file"
 msgstr "no es posible escribir archivo new_index"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:489
 msgid "cannot do a partial commit during a merge."
 msgstr "no se puede realizar un commit parcial durante una fusión."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:491
 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:465
+#: builtin/commit.c:493
+msgid "cannot do a partial commit during a rebase."
+msgstr "no se puede realizar un commit parcial durante un rebase."
+
+#: builtin/commit.c:501
 msgid "cannot read the index"
 msgstr "no se puede leer el índice"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:520
 msgid "unable to write temporary index file"
 msgstr "no es posible escribir el índice temporal"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:618
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "commit '%s' requiere cabecera de autor"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "el commit '%s' tiene una línea de autor mal formada"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr "parámetro --author mal formado"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:692
 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:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "no se pudo revisar el commit %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:758 builtin/shortlog.c:413
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(leyendo mensajes de logs desde standard input)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:760
 msgid "could not read log from standard input"
 msgstr "no se pudo leer log desde standard input"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:764
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "no se pudo leer el log '%s'"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:801
+#, 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
 msgid "could not read SQUASH_MSG"
 msgstr "no se pudo leer SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:820
 msgid "could not read MERGE_MSG"
 msgstr "no se pudo leer MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:880
 msgid "could not write commit template"
 msgstr "no se pudo escribir el template del commit"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:893
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
 msgstr ""
-"\n"
-"Parece que estás haciendo un commit con una fusión dentro.\n"
-"Si esto no es correcto, por favor elimina el archivo\n"
-"\t%s\n"
-"y vuelve a intentar.\n"
+"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:834
+#: builtin/commit.c:895
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"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"
-"Parece que puedes estar haciendo un commit a un cherry-pick.\n"
-"Si esto no es correcto, por favor elimina el archivo\n"
-"\t%s\n"
-"y vuelve a intentar.\n"
+"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:847
+#: builtin/commit.c:899
 #, 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 ""
 "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"
+" líneas que comiencen con '%c' serán guardadas; puede eliminarlas\n"
+" usted mismo si lo desea.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11582,147 +13680,205 @@ msgstr ""
 " usted mismo si lo desea.\n"
 "Un mensaje vacío aborta el commit.\n"
 
-#: builtin/commit.c:872
+#: 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á realizando una fusión.\n"
+"Si esto no es correcto, ejecute\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"e intenta de nuevo.\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 puede estar cometiendo una selección de cerezas.\n"
+"Si esto no es correcto, ejecute\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"e intenta de nuevo.\n"
+
+#: builtin/commit.c:947
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutor:     %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:955
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sFecha:     %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:962
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:980
 msgid "Cannot read index"
 msgstr "No se puede leer el índice"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "no se puede pasar trailers a --trailers"
+
+#: builtin/commit.c:1065
 msgid "Error building trees"
 msgstr "Error al construir los árboles"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1079 builtin/tag.c:319
 #, 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:1030
+#: builtin/commit.c:1123
 #, 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:1044
+#: builtin/commit.c:1137
 #, c-format
 msgid "Invalid ignored mode '%s'"
-msgstr "Modo ignorado inválido '%s'"
+msgstr "Modo de ignorancia inválido '%s'"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1155 builtin/commit.c:1448
 #, 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:1102
+#: builtin/commit.c:1195
 msgid "--long and -z are incompatible"
 msgstr "--long y -z son incompatibles"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1226
+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:1228
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Está en medio de un cherry-pick -- no se puede renombrar."
+
+#: builtin/commit.c:1231
+#, 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:1233
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+"opción de refraseado de --fixup es mutuamente exclusiva con --patch/--"
+"interactive/--all/--include/--only"
+
+#: builtin/commit.c:1252
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Usar ambos --reset-author y --author no tiene sentido"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "No tienes nada que enmendar."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1264
 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:1160
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1268
+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:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1281
 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:1175
+#: builtin/commit.c:1283
 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:1183
+#: builtin/commit.c:1292
 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:1200
+#: builtin/commit.c:1310
 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:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "No hay rutas con --include/--only no tiene sentido."
+#: builtin/commit.c:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "opción desconocida: --fixup=%s:%s"
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1352
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "paths '%s ...' con -a no tiene sentido"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1483 builtin/commit.c:1652
 msgid "show status concisely"
 msgstr "mostrar status de manera concisa"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show branch information"
 msgstr "mostrar información de la rama"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1487
 msgid "show stash information"
 msgstr "mostrar información del stash"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1489 builtin/commit.c:1656
 msgid "compute full ahead/behind values"
 msgstr "calcular todos los valores delante/atrás"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1491
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
-#: builtin/worktree.c:650
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
-msgstr "output formato-maquina"
+msgstr "output en formato de máquina"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1494 builtin/commit.c:1660
 msgid "show status in long format (default)"
 msgstr "mostrar status en formato largo (default)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "terminate entries with NUL"
 msgstr "terminar entradas con NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
+#: 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:1356 builtin/commit.c:1537
+#: builtin/commit.c:1500 builtin/commit.c:1666
 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:1360
+#: builtin/commit.c:1504
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11730,473 +13886,435 @@ msgstr ""
 "mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
 "(Predeterminado: traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:188
+#: builtin/commit.c:1506 parse-options.h:193
 msgid "when"
 msgstr "cuando"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1507
 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:1365
+#: builtin/commit.c:1509
 msgid "list untracked files in columns"
 msgstr "listar en columnas los archivos sin seguimiento"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1510
 msgid "do not detect renames"
 msgstr "no detectar renombrados"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1512
 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:1388
+#: builtin/commit.c:1535
 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:1493
+#: builtin/commit.c:1617
 msgid "suppress summary after successful commit"
 msgstr "suprime summary tras un commit exitoso"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1618
 msgid "show diff in commit message template"
 msgstr "mostrar diff en el template del mensaje de commit"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1620
 msgid "Commit message options"
 msgstr "Opciones para el mensaje del commit"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
 msgid "read message from file"
 msgstr "leer mensaje desde un archivo"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "override author for commit"
 msgstr "sobrescribe el autor del commit"
 
-#: builtin/commit.c:1499 builtin/gc.c:538
+#: builtin/commit.c:1623 builtin/gc.c:550
 msgid "date"
 msgstr "fecha"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1623
 msgid "override date for commit"
 msgstr "sobrescribe la fecha del commit"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
 msgstr "confirmar"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1625
 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:1502
+#: builtin/commit.c:1626
 msgid "reuse message from specified commit"
-msgstr "reusar el mensaje de un commit especifico"
+msgstr "reusar el mensaje de un commit específico"
 
-#: builtin/commit.c:1503
-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):]commit"
+
+#: builtin/commit.c:1631
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
-"usar mensaje de formato autosquash para arreglar el commit especificado"
+"usar mensaje de formato autosquash para arreglar el amend/renombrado del "
+"commit especificado"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1632
 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:1505
+#: builtin/commit.c:1633
 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:1506 builtin/log.c:1565 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "agregar Signed-off-by: (firmado por)"
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "trailer"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1634
+msgid "add custom trailer(s)"
+msgstr "agregando trailer(s) personalizados"
+
+#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "agregar una línea Signed-off-by al final"
+
+#: builtin/commit.c:1636
 msgid "use specified template file"
 msgstr "usar archivo de template especificado"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1637
 msgid "force edit of commit"
 msgstr "forzar la edición del commit"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1639
 msgid "include status in commit message template"
 msgstr "incluir status en el template del mensaje de commit"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1644
 msgid "Commit contents options"
 msgstr "Opciones para el contenido del commit"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1645
 msgid "commit all changed files"
 msgstr "confirmar todos los archivos cambiados"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1646
 msgid "add specified files to index for commit"
 msgstr "agregar archivos específicos al índice para confirmar"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1647
 msgid "interactively add files"
 msgstr "agregar archivos interactivamente"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1648
 msgid "interactively add changes"
 msgstr "agregar cambios interactivamente"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1649
 msgid "commit only specified files"
-msgstr "sólo confirmar archivos específicos"
+msgstr "solo confirmar archivos específicos"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1650
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1651
 msgid "show what would be committed"
 msgstr "mostrar lo que sería incluido en el commit"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1664
 msgid "amend previous commit"
 msgstr "enmendar commit previo"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1665
 msgid "bypass post-rewrite hook"
-msgstr "gancho bypass post reescritura"
+msgstr "salta el gancho de postreescritura"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1672
 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:1543
+#: builtin/commit.c:1674
 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:1616
+#: builtin/commit.c:1750
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Archivo MERGE_HEAD (%s) corrupto"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1757
 msgid "could not read MERGE_MODE"
 msgstr "no se pudo leer MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1778
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "no se pudo leer el mensaje de commit: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1785
 #, 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:1654
+#: builtin/commit.c:1790
 #, 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:1688
+#: builtin/commit.c:1801
+#, 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: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 ""
 "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."
-
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-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:29
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <dir objeto>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opciones de "
-"split>"
-
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
-#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
-#: builtin/log.c:1585
-msgid "dir"
-msgstr "dir"
-
-#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
-#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
-msgid "The object directory to store the graph"
-msgstr "El directorio de objetos para guardar el gráfico"
-
-#: builtin/commit-graph.c:58
-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"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:125
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "No se pudo abrir commit-graph '%s'"
-
-#: builtin/commit-graph.c:173
-msgid "start walk at all refs"
-msgstr "comenzar caminata en todas las refs"
-
-#: builtin/commit-graph.c:175
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "escanear paquete de índices por stdin por commits"
-
-#: builtin/commit-graph.c:177
-msgid "start walk at commits listed by stdin"
-msgstr "comenzar a caminar a los commits listados por stdin"
-
-#: builtin/commit-graph.c:179
-msgid "include all commits already in the commit-graph file"
-msgstr "inclye todos los commits que ya están en el archivo commit-graph"
-
-#: builtin/commit-graph.c:182
-msgid "allow writing an incremental commit-graph file"
-msgstr "permitir escribir un archivo commit-graph incremental"
-
-#: builtin/commit-graph.c:184 builtin/commit-graph.c:188
-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"
-
-#: builtin/commit-graph.c:186
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "radio máximo entre dos niveles de corte de commit-graph"
-
-#: builtin/commit-graph.c:204
-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"
+"new_index. Verifique 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>]"
 msgstr "git config [<opciones>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "argumento --type no reconocido, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "solo un tipo a la vez"
 
-#: builtin/config.c:124
+#: 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:125
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr "usar archivo de config global"
 
-#: builtin/config.c:126
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr "usar archivo de config del sistema"
 
-#: builtin/config.c:127
+#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "usar archivo de config del repositorio"
 
-#: builtin/config.c:128
+#: 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:129
+#: builtin/config.c:135
 msgid "use given config file"
-msgstr "usar archivo config especificado"
+msgstr "usar archivo de config especificado"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "leer config del objeto blob suministrado"
 
-#: builtin/config.c:131
+#: builtin/config.c:137
 msgid "Action"
 msgstr "Acción"
 
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "obtener valor: nombre [valor-regex]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "obtener valor: nombre [patrón de valor]"
 
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "obtener todos los valores: llave [valores-regex]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "obtener todos los valores: clave [patrón de valor]"
 
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "obtener valores para una regexp: nombre-regex [valor-regex]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "obtener valores para regexp: name-regex [value-pattern]"
 
-#: builtin/config.c:135
+#: 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:136
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
-"remplazar todas las variables que concuerden: nombre valor [valor_regex]"
+"reemplazar todas las variables coincidentes: nombre valor [valor-patrón]"
 
-#: builtin/config.c:137
+#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "agregar nueva variable: nombre valor"
 
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "borrar una variable. nombre [valor-regex]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "eliminar una variable: nombre [patrón de valor]"
 
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "borrar todas las concurrencias: nombre [valor-regex]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "eliminar todas las coincidencias: nombre [patrón de valor]"
 
-#: builtin/config.c:140
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "renombrar sección: nombre-viejo nombre-nuevo"
 
-#: builtin/config.c:141
+#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "borrar una sección: nombre"
 
-#: builtin/config.c:142
+#: builtin/config.c:148
 msgid "list all"
 msgstr "listar todo"
 
-#: builtin/config.c:143
+#: 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'"
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr "abrir el editor"
 
-#: builtin/config.c:144
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "encontrar el color configurado: slot [default]"
 
-#: builtin/config.c:145
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "encontrar las opciones del color: slot [stdout-es-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:153
 msgid "Type"
 msgstr "Tipo"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "al valor se ha dado este tipo"
 
-#: builtin/config.c:148
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "valor es \"true\" o \"false\""
 
-#: builtin/config.c:149
+#: 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:150
+#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "valor es --bool o --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "el valor es --bool o cadena"
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "valor es una ruta (archivo o nombre de directorio)"
 
-#: builtin/config.c:152
+#: 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:153
+#: builtin/config.c:161
 msgid "Other"
 msgstr "Otro"
 
-#: builtin/config.c:154
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "terminar valores con un byte NULL"
 
-#: builtin/config.c:155
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "mostrar solo nombres de variables"
 
-#: builtin/config.c:156
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "respetar directivas include en la búsqueda"
 
-#: builtin/config.c:157
+#: 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)"
+msgstr ""
+"mostrar el scope de la configuración (worktree, local, global, system, "
+"command)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "valor"
 
-#: builtin/config.c:158
+#: 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"
 
-#: builtin/config.c:172
+#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "número de argumentos inválidos, deberían ser %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "número de argumentos inválidos, deberían ser de %d a %d"
 
-#: builtin/config.c:308
+#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "patrón de llave inválido: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:377
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "falló al formatear el valor por defecto de configuración: %s"
 
-#: builtin/config.c:401
+#: 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:443
+#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "no es posible analizar el valor por defecto de color"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "no en un directorio git"
 
-#: builtin/config.c:499
+#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "escribir en stdin no está soportado"
 
-#: builtin/config.c:502
+#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "escribir blobs de configuración no está soportado"
 
-#: builtin/config.c:587
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12211,89 +14329,97 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "solo un archivo de configuración a la vez"
 
-#: builtin/config.c:616
+#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local solo puedo ser usado dentro de un repositorio"
 
-#: builtin/config.c:619
+#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob solo puede ser usado dentro de un repositorio"
 
-#: builtin/config.c:638
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree solo se puede usar dentro de un repositorio de git"
+
+#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME no está configurado"
 
-#: builtin/config.c:658
+#: builtin/config.c:708
 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 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"
 "\"\n"
 "en \"git help worktree\" para más detalles"
 
-#: builtin/config.c:688
+#: 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:693
+#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "solo una acción a la vez"
 
-#: builtin/config.c:706
+#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only solo es aplicable para --list o --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin solo es aplicable para --get, --get-all, --get-regexp, y --list"
 
-#: builtin/config.c:718
+#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default solo es aplicable para --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value solo se aplica con 'value-pattern'"
+
+#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "no se puede leer el archivo de configuración '%s'"
 
-#: builtin/config.c:734
+#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "error al procesar archivo(s) de configuración"
 
-#: builtin/config.c:744
+#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "editar stdin no está soportado"
 
-#: builtin/config.c:746
+#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "editar blobs no está soportado"
 
-#: builtin/config.c:760
+#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "no se puede crear el archivo de configuración %s"
 
-#: builtin/config.c:773
+#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 "no se puede sobrescribir múltiples valores con un único valor\n"
-"\tUse una regexp, --add o --replace-all para cambiar %s."
+"       Use una regexp, --add o --replace-all para cambiar %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "no existe la sección: %s"
@@ -12306,6 +14432,38 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "mostrar tamaños en formato legible para humano"
 
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Los permisos en tu directorio de socket son demasiado flojos; otros\n"
+"usuarios pueden leer sus credenciales almacenadas en caché. Considera "
+"ejecutar:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+msgstr "mostrar mensajes de debug en stderr"
+
+#: builtin/credential-cache--daemon.c:316
+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
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache no disponible; sin soporte de socket Unix"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+"no se puede obtener el bloqueo de almacenamiento de credenciales en %d ms"
+
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opciones>] [<commit-ish>...]"
@@ -12314,49 +14472,44 @@ msgstr "git describe [<opciones>] [<commit-ish>...]"
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opciones>] --dirty"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "head"
 msgstr "head"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "ligero"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr "anotado"
 
-#: builtin/describe.c:275
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "tag anotado %s no disponible"
 
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "tag anotado %s no tiene nombre embebido"
-
 #: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "tag '%s' es realmente '%s' aquí"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "tag '%s' es externamente conocida como '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "no hay tag que concuerde exactamente con '%s'"
 
-#: builtin/describe.c:327
+#: 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:381
+#: 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:407
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12365,165 +14518,183 @@ msgstr ""
 "No hay tags anotados que puedan describir '%s'.\n"
 "Sin embargo, hubieron tags no anotados: intente --tags."
 
-#: builtin/describe.c:411
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
-"Ningún tag puede describit '%s'.\n"
+"Ningún tag puede describir '%s'.\n"
 "Intente --always, o cree algunos tags."
 
-#: builtin/describe.c:441
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits cruzados\n"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
-"se encontró más de %i tags; se mostró %i más reciente\n"
+"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:512
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "describe %s\n"
 
-#: builtin/describe.c:515
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Nombre de objeto %s no válido"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s no es un commit ni un blob"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "encontrar el tag que viene después del commit"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "hacer debug a la estrategia de búsqueda en stderr"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "use cualquier ref"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "use cualquier tag, incluso los no anotados"
 
-#: builtin/describe.c:541
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "siempre usar formato largo"
 
-#: builtin/describe.c:542
+#: 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:545
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "solo mostrar concordancias exactas"
 
-#: builtin/describe.c:547
+#: 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:549
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "solo considerar tags que concuerden con <patrón>"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "no considerar tags que concuerden con <patrón>"
 
-#: builtin/describe.c:553 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "mostrar el objeto commit abreviado como fallback"
 
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:555
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "adjuntar <marca> en un árbol de trabajo roto (default: \"-broken\")"
 
-#: builtin/describe.c:576
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long es incompatible con --abbrev=0"
 
-#: builtin/describe.c:605
+#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "No se encontraron nombres, no se puede describir nada."
 
-#: builtin/describe.c:656
+#: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty es incompatible con commit-ismos"
 
-#: builtin/describe.c:658
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken es incompatible con commit-ismos"
 
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin and --merge-base son mutuamente exclusivas"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base solo funciona con dos commits"
+
+#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': no es un archivo regular o un enlace simbólico"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "opción inválida: %s"
 
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: se neceista una base de fusión"
+
+#: builtin/diff.c:486
 msgid "Not a git repository"
 msgstr "No es un repositorio git"
 
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objeto '%s' entregado no es válido."
 
-#: builtin/diff.c:403
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "más de dos blobs entregados: '%s'"
 
-#: builtin/diff.c:408
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objeto no manejado '%s' entregado."
 
-#: builtin/difftool.c:30
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: múltiples bases de fusión, usando %s"
+
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
 
-#: builtin/difftool.c:260
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
 msgstr "falló: %d"
 
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink %s"
 msgstr "no se pudo leer el symlink %s"
 
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "no se pudo leer el archivo symlink %s"
 
-#: builtin/difftool.c:312
+#: builtin/difftool.c:313
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "no se pudo leer el objeto %s para el symlink %s"
@@ -12536,54 +14707,54 @@ msgstr ""
 "formatos combinados de diff ('-c' y '--cc') no soportados en\n"
 "modo diff para directorio('-d' y '--dir-diff')."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "ambos archivos modificados: '%s' y '%s'."
 
-#: builtin/difftool.c:636
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "archivo del árbol de trabajo ha sido dejado."
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "archivo temporal existe en '%s'."
 
-#: builtin/difftool.c:648
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr "tal vez desees limpiar o recuperar estos."
 
-#: builtin/difftool.c:697
+#: builtin/difftool.c:699
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "use `diff.guitool` en lugar de `diff.tool`"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:701
 msgid "perform a full-directory diff"
 msgstr "realizar un diff de todo el directorio"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:703
 msgid "do not prompt before launching a diff tool"
 msgstr "no mostrar antes de lanzar una herramienta de diff"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:708
 msgid "use symlinks in dir-diff mode"
 msgstr "usar enlaces simbólicos en modo dir-diff"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:709
 msgid "tool"
 msgstr "herramienta"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:710
 msgid "use the specified diff tool"
 msgstr "usar la herramienta de diff especificada"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:712
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 "mostrar una lista de herramientas de diff que pueden ser usadas con `--tool`"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:715
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12591,31 +14762,31 @@ msgstr ""
 "hacer que 'git-difftool' salga cuando una herramienta de diff retorne un "
 "código de salida distinto de cero"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:718
 msgid "specify a custom command for viewing diffs"
 msgstr "especificar un comando personalizado para ver diffs"
 
-#: builtin/difftool.c:717
+#: builtin/difftool.c:719
 msgid "passed to `diff`"
 msgstr "pasado a `diff`"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:734
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool requiere un árbol de trabajo o --no-index"
 
-#: builtin/difftool.c:739
+#: builtin/difftool.c:741
 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:742
+#: builtin/difftool.c:744
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool y --extcmd son mutuamente exclusivas"
 
-#: builtin/difftool.c:750
+#: builtin/difftool.c:752
 msgid "no <tool> given for --tool=<tool>"
 msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:759
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "no se ha entregado <comando> para --extcmd=<comando>"
 
@@ -12623,24 +14794,24 @@ 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:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
 msgid "type"
 msgstr "tipo"
 
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "default para git_env_*(...) es hacer fallback en"
 
-#: builtin/env--helper.c:43
+#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "ser silencioso solo usar valor git_env_*() como código de salida"
 
-#: builtin/env--helper.c:62
+#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr "opción `--default' espera un valor boolean con `--type=bool`, no `%s`"
 
-#: builtin/env--helper.c:77
+#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -12652,184 +14823,250 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:852
+#: builtin/fast-export.c:868
 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:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "token --anonymize-map no puede estar vacío"
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "mostrar progreso después de <n> objetos"
 
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "seleccionar el manejo de tags firmados"
 
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
 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:1160
+#: builtin/fast-export.c:1205
 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:1163
-msgid "Dump marks to this file"
-msgstr "Volcar marcas a este archivo"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "volcar marcas a este archivo"
 
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
-msgstr "Importar marcas de este archivo"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "importar marcas de este archivo"
 
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
-msgstr "Importar marcas de este archivo si existe"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "importar marcas de este archivo si existe"
 
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "Falsificar un tagger cuando les falta uno"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "falsificar un tagger cuando les falta uno"
 
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
-msgstr "Mostrar todo el árbol para cada commit"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "mostrar todo el árbol para cada commit"
 
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
-msgstr "Use el feature done para terminar el stream"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "use el feature done para terminar el stream"
 
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr "Saltar el output de data blob"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "saltar el salida de data blob"
 
-#: builtin/fast-export.c:1177 builtin/log.c:1633
+#: builtin/fast-export.c:1222 builtin/log.c:1826
 msgid "refspec"
 msgstr "refspec"
 
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr "Aplicar refspec para los refs exportados"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "aplicar refspec para los refs exportados"
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "anonimizar la salida"
 
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "de:para"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "convertir <de> a <para> en output anonimizado"
+
+#: builtin/fast-export.c:1229
+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:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "Mostrar ids de objetos originales para blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "mostrar ids de objetos originales para blobs/commits"
 
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
-msgstr "Marcar tags con ids de mark"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "marcar tags con ids de mark"
 
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize-map sin --anonymize no tiene sentido"
+
+#: builtin/fast-export.c:1271
 msgid "Cannot pass both --import-marks and --import-marks-if-exists"
 msgstr "No se puede pasar ambos --import-marks y --import-marks-if-exists"
 
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Faltan marcas from para el submódulo '%s'"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Faltan marcas to para el submódulo '%s'"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Se esperaba comando 'mark', se obtuvo %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+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 "
+"submódulo"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "característica '%s' prohibida en input sin --allow-unsafe-features"
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "Lockfile creado pero no reportado: %s"
+
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opciones>] <grupo>"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opciones>]"
 
-#: builtin/fetch.c:115
+#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel no puede ser negativo"
 
-#: builtin/fetch.c:138 builtin/pull.c:204
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "extraer de todos los remotos"
 
-#: builtin/fetch.c:140 builtin/pull.c:248
+#: 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:142 builtin/pull.c:207
+#: builtin/fetch.c:149 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
 
-#: builtin/fetch.c:144 builtin/pull.c:210
+#: builtin/fetch.c:151
+msgid "use atomic transaction to update references"
+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:145
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr "forzar sobrescritura de referencia local"
 
-#: builtin/fetch.c:147
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "extraer de múltiples remotos"
 
-#: builtin/fetch.c:149 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "extraer todos los tags y objetos asociados"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr "no extraer todos los tags (--no-tags)"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "número de submódulos extraídos en paralelo"
 
-#: builtin/fetch.c:155 builtin/pull.c:217
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+"modificar el refspec para colocar todas las referencias en refs/preferch/"
+
+#: builtin/fetch.c:166 builtin/pull.c:198
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "limpiar ramas remotas rastreadas que ya no están en el remoto"
 
-#: builtin/fetch.c:157
+#: 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:158 builtin/fetch.c:181 builtin/pull.c:141
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "en demanda"
 
-#: builtin/fetch.c:159
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
 msgstr "controlar extracción recursiva de submódulos"
 
-#: builtin/fetch.c:163 builtin/pull.c:225
+#: builtin/fetch.c:175
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "escribir referencias obtenidas en el archivo FETCH_HEAD"
+
+#: builtin/fetch.c:176 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "mantener el paquete descargado"
 
-#: builtin/fetch.c:165
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "permitir actualizar la ref HEAD"
 
-#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
+#: 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:170
+#: 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:176 builtin/pull.c:231
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "convertir a un repositorio completo"
 
-#: builtin/fetch.c:179
+#: 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:182
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -12837,90 +15074,104 @@ msgstr ""
 "default para extracción recursiva de submódulos (menor prioridad que "
 "archivos de configuración)"
 
-#: builtin/fetch.c:186 builtin/pull.c:234
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "aceptar refs que actualicen .git/shallow"
 
-#: builtin/fetch.c:187 builtin/pull.c:236
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:188 builtin/pull.c:237
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "especificar extracción de refmap"
 
-#: builtin/fetch.c:195
+#: 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"
 
-#: builtin/fetch.c:198
-msgid "run 'gc --auto' after fetching"
-msgstr "ejecutar 'gc --auto' tras el fetch"
+#: 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 "
+"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"
 
-#: builtin/fetch.c:200 builtin/pull.c:246
+#: builtin/fetch.c:217 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr "verificar updates forzados en todos los branch actualizados"
 
-#: builtin/fetch.c:510
+#: builtin/fetch.c:219
+msgid "write the commit-graph after fetching"
+msgstr "escribir commit-graph luego del fetch"
+
+#: builtin/fetch.c:221
+msgid "accept refspecs from stdin"
+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:650
+#: builtin/fetch.c:757
 #, 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:748
+#: builtin/fetch.c:856
 #, c-format
 msgid "object %s not found"
 msgstr "objeto %s no encontrado"
 
-#: builtin/fetch.c:752
+#: builtin/fetch.c:860
 msgid "[up to date]"
 msgstr "[actualizado]"
 
-#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr "[rechazado]"
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:874
 msgid "can't fetch in current branch"
 msgstr "no se puede traer en la rama actual"
 
-#: builtin/fetch.c:776
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr "[actualización de tag]"
 
-#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
-#: builtin/fetch.c:848
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
 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:781
+#: builtin/fetch.c:889
 msgid "would clobber existing tag"
-msgstr "podría golpear tag existente"
+msgstr "sobrescribiría tag existente"
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr "[nuevo tag]"
 
-#: builtin/fetch.c:806
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr "[nueva rama]"
 
-#: builtin/fetch.c:809
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr "[nueva referencia]"
 
-#: builtin/fetch.c:848
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr "actualización forzada"
 
-#: builtin/fetch.c:853
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
-msgstr "avance lento"
+msgstr "avance no rápido"
 
-#: builtin/fetch.c:874
+#: 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"
@@ -12931,7 +15182,7 @@ msgstr ""
 "show-forced-updates'\n"
 "o ejecute 'git config fetch.showForcedUpdates true'."
 
-#: builtin/fetch.c:878
+#: builtin/fetch.c:1069
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -12944,22 +15195,22 @@ msgstr ""
 "false'\n"
 "para evitar esta validación.\n"
 
-#: builtin/fetch.c:908
+#: builtin/fetch.c:1101
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s no envió todos los objetos necesarios\n"
 
-#: builtin/fetch.c:929
+#: builtin/fetch.c:1129
 #, 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:1020 builtin/fetch.c:1157
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr "Desde %.*s\n"
 
-#: builtin/fetch.c:1031
+#: builtin/fetch.c:1228
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -12968,56 +15219,56 @@ msgstr ""
 "algunos refs locales no pudieron ser actualizados; intente ejecutar\n"
 " 'git remote prune %s' para eliminar cualquier rama vieja o conflictiva"
 
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1327
 #, c-format
 msgid "   (%s will become dangling)"
-msgstr "   (%s se pondrá colgado)"
+msgstr "   (%s se volverá colgante)"
 
-#: builtin/fetch.c:1128
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
-msgstr "   (%s se ha colgado)"
+msgstr "   (%s se ha vuelto colgante)"
 
-#: builtin/fetch.c:1160
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr "[eliminado]"
 
-#: builtin/fetch.c:1161 builtin/remote.c:1036
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(nada)"
 
-#: builtin/fetch.c:1184
+#: builtin/fetch.c:1384
 #, 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:1203
+#: builtin/fetch.c:1403
 #, 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:1206
+#: builtin/fetch.c:1406
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Opción \"%s\" es ignorada por %s\n"
 
-#: builtin/fetch.c:1414
-msgid "multiple branch detected, incompatible with --set-upstream"
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "múltiples ramas detectadas, incompatible con --set-upstream"
 
-#: builtin/fetch.c:1429
+#: builtin/fetch.c:1633
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "no configurar upstream para una rama de rastreo remoto"
 
-#: builtin/fetch.c:1431
+#: builtin/fetch.c:1635
 msgid "not setting upstream for a remote tag"
 msgstr "no configurar upstream para un tag remoto"
 
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1637
 msgid "unknown branch type"
 msgstr "tipo de branch desconocido"
 
-#: builtin/fetch.c:1435
+#: builtin/fetch.c:1639
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
@@ -13025,22 +15276,22 @@ msgstr ""
 "no se encontró rama fuente.\n"
 "tienes que especificar exactamente una rama con la opción --set-upstream."
 
-#: builtin/fetch.c:1561 builtin/fetch.c:1623
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Extrayendo %s\n"
 
-#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "No se pudo extraer %s"
 
-#: builtin/fetch.c:1583
+#: builtin/fetch.c:1790
 #, 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:1685
+#: 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."
@@ -13048,74 +15299,94 @@ msgstr ""
 "No hay repositorio remoto especificado. Por favor, especifique un URL o un\n"
 "nombre remoto del cual las nuevas revisiones deben ser extraídas."
 
-#: builtin/fetch.c:1722
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr "Tienes que especificar un nombre de tag."
 
-#: builtin/fetch.c:1774
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only necesita uno o más --negotiate-tip=*"
+
+#: builtin/fetch.c:1998
 msgid "Negative depth in --deepen is not supported"
 msgstr "Profundidad negativa en --deepen no soportada"
 
-#: builtin/fetch.c:1776
+#: builtin/fetch.c:2000
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen y --depth son mutuamente exclusivas"
 
-#: builtin/fetch.c:1781
+#: builtin/fetch.c:2005
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth y --unshallow no pueden ser usadas juntas"
 
-#: builtin/fetch.c:1783
+#: builtin/fetch.c:2007
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow no tiene sentido en un repositorio completo"
 
-#: builtin/fetch.c:1799
+#: builtin/fetch.c:2024
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all no toma un argumento de repositorio"
 
-#: builtin/fetch.c:1801
+#: builtin/fetch.c:2026
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all no tiene sentido con refspecs"
 
-#: builtin/fetch.c:1810
+#: builtin/fetch.c:2035
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "No existe el remoto o grupo remoto: %s"
 
-#: builtin/fetch.c:1817
+#: builtin/fetch.c:2042
 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:2058
+msgid "must supply remote when using --negotiate-only"
+msgstr "tiene que proveer un remoto cuando usa --negotiate-only"
 
-#: builtin/fetch.c:1835
+#: builtin/fetch.c:2063
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "Protocolo no soporta --negotiate-only, saliendo."
+
+#: builtin/fetch.c:2082
 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/fmt-merge-msg.c:18
+#: builtin/fetch.c:2086
+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:2090
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "--stdin solo se puede usar cuando se busca desde un control remoto"
+
+#: 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 <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "poblar el log con máximo <n> entradas del shorlog"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "alias para --log (deprecado)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "texto"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "use <text> como comienzo de mensaje"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "archivo del cual leer"
 
@@ -13128,83 +15399,99 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objeto>]"
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+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 [<commit>]] [--no-contains [<commit>]]"
 
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
 msgstr "cite los marcadores de posición adecuadamente para los shells"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr "cite los marcadores de posición adecuadamente para perl"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr "cite los marcadores de posición adecuadamente para python"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr "cite los marcadores de posición adecuadamente para Tcl"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "mostrar solo <n> refs encontradas"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
 msgid "respect format colors"
-msgstr "respetar el formato de colores"
+msgstr "respetar los colores de formato"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "mostrar solo refs que apunten al objeto dado"
 
-#: builtin/for-each-ref.c:44
+#: 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:45
+#: 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:46
+#: 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:47
+#: 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:34
+msgid "config"
+msgstr "config"
+
+#: 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/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:43
+msgid "missing --config=<config>"
+msgstr "falta --config=<config>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "desconocido"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "error en %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "peligro en %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: 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:168
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "tipo de objeto equivocado en link"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13213,240 +15500,240 @@ msgstr ""
 "link roto de %7s %s\n"
 "              a %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
-msgstr "faltan %s %s"
+msgstr "falta %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "inalcanzable %s %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "actualizando %s %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "no se pudo crear lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "no se pudo finalizar '%s'"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Revisando %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Verificando conectividad (%d objetos)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Revisando %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "links rotos"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "raíz %s"
 
-#: builtin/fsck.c:455
+#: 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:484
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objecto corrupto o faltante"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: referencia inválida %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Revisando reflog %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: puntero sha1 inválido %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: no es un commit"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "aviso: No hay referencias por defecto"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:606
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objeto corrupto o no encontrado: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:619
 #, 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:667
+#: builtin/fsck.c:639
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "mal sha1 de archivo: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:654
 msgid "Checking object directory"
 msgstr "Revisando directorio de objetos"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:657
 msgid "Checking object directories"
 msgstr "Revisando objetos directorios"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:672
 #, c-format
 msgid "Checking %s link"
 msgstr "Revisando link %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:677 builtin/index-pack.c:864
 #, c-format
 msgid "invalid %s"
 msgstr "%s inválido"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:684
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s apunta a algo extraño (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:690
 #, 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:722
+#: builtin/fsck.c:694
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "aviso: %s apunta a un branch no nacido (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:706
 msgid "Checking cache tree"
-msgstr "Revisando el cache tree"
+msgstr "Revisando el tree caché"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:711
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: puntero inválido sha1 en cache-tree"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:720
 msgid "non-tree in cache-tree"
 msgstr "non-tree en cache-tree"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:751
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opciones>] [<objeto>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:757
 msgid "show unreachable objects"
-msgstr "mostrar objetos ilegibles"
+msgstr "mostrar objetos inalcanzables"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:758
 msgid "show dangling objects"
-msgstr "mostrar objetos colgados"
+msgstr "mostrar objetos colgantes"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:759
 msgid "report tags"
 msgstr "reportar tags"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:760
 msgid "report root nodes"
 msgstr "reportar nodos raíz"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:761
 msgid "make index objects head nodes"
 msgstr "hacer objetos índices cabezas de nodos"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:762
 msgid "make reflogs head nodes (default)"
 msgstr "hacer reflogs cabeza de nodos (default)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:763
 msgid "also consider packs and alternate objects"
 msgstr "también considerar paquetes y objetos alternos"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:764
 msgid "check only connectivity"
 msgstr "revisar solo conectividad"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:765 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "habilitar revisión más estricta"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:767
 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:798 builtin/prune.c:132
+#: builtin/fsck.c:768 builtin/prune.c:134
 msgid "show progress"
 msgstr "mostrar progreso"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:769
 msgid "show verbose names for reachable objects"
-msgstr "mostrar nombres verboso para objetos alcanzables"
+msgstr "mostrar nombres verbosos de objetos alcanzables"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:828 builtin/index-pack.c:262
 msgid "Checking objects"
 msgstr "Revisando objetos"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:856
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objeto faltante"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:867
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "parámetro inválido: sha1 esperado, se obtuvo '%s'"
 
-#: builtin/gc.c:35
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<opciones>]"
 
-#: builtin/gc.c:90
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Falló el fstat %s: %s"
 
-#: builtin/gc.c:126
+#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "falló al analizar '%s' valor '%s'"
 
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: 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:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
 #, c-format
 msgid "cannot read '%s'"
 msgstr "no se puede leer '%s'"
 
-#: builtin/gc.c:491
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13461,78 +15748,242 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:539
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
 msgstr "limpiar objetos no referenciados"
 
-#: builtin/gc.c:541
+#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr "ser más exhaustivo (aumentar runtime)"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "habilitar modo auto-gc"
 
-#: builtin/gc.c:545
+#: builtin/gc.c:557
 msgid "force running gc even if there may be another gc running"
 msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose"
 
-#: builtin/gc.c:548
+#: builtin/gc.c:560
 msgid "repack all other packs except the largest pack"
 msgstr "reempaquetar todos los otros paquetes excepto el paquete más grande"
 
-#: builtin/gc.c:565
+#: 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:576
+#: builtin/gc.c:587
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "falló al analizar valor %s de prune expiry"
 
-#: builtin/gc.c:596
+#: builtin/gc.c:607
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Auto empaquetado del repositorio en segundo plano para un performance "
 "óptimo.\n"
 
-#: builtin/gc.c:598
+#: builtin/gc.c:609
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:610
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vea \"git help gc\" para limpieza manual.\n"
 
-#: builtin/gc.c:639
+#: 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> (use --force si no "
 "es así)"
 
-#: builtin/gc.c:694
+#: 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/grep.c:29
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule no está permitido"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "argumento --schedule no reconocido, '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "no se pudo escribir el commit-graph"
+
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr "falló al hacer prefetch a los remotos"
+
+#: builtin/gc.c:1022
+msgid "failed to start 'git pack-objects' process"
+msgstr "no se pudo iniciar el proceso 'git pack-objects'"
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr "no se pudo finalizar el proceso 'git pack-objects'"
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr "no se pudo escribir el índice de paquetes múltiples"
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' falló"
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' falló"
+
+#: builtin/gc.c:1179
+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
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "el archivo de bloqueo '%s' existe, omitiendo el mantenimiento"
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr "tarea '%s' falló"
+
+#: builtin/gc.c:1395
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' no es una tarea válida"
+
+#: builtin/gc.c:1400
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "tarea '%s' no puede ser seleccionada múltipes veces"
+
+#: builtin/gc.c:1415
+msgid "run tasks based on the state of the repository"
+msgstr "ejecutar tareas basadas en el estado del repositorio"
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr "frecuencia"
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr "ejecutar tareas basado en frecuencia"
+
+#: builtin/gc.c:1420
+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
+msgid "task"
+msgstr "tarea"
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr "ejecutar una tarea específica"
+
+#: builtin/gc.c:1439
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "usar como máximo una de --auto y --schedule=<frecuencia>"
+
+#: builtin/gc.c:1482
+msgid "failed to run 'git config'"
+msgstr "no pudo ejecutar 'git config'"
+
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "falló al expandir la ruta '%s'"
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr "falló al iniciar launchctl"
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "falló al crear directorios para '%s'"
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "falló al generar el servicio %s"
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
+msgstr "no se pudo crear el archivo temp xml"
+
+#: builtin/gc.c:1835
+msgid "failed to start schtasks"
+msgstr "no se pudo iniciar schtasks"
+
+#: builtin/gc.c:1879
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+"no se pudo ejecutar 'crontab -l'; es posible que su sistema no soporte 'cron'"
+
+#: builtin/gc.c:1896
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+"no se pudo ejecutar 'crontab'; es posible que su sistema no soporte 'cron'"
+
+#: builtin/gc.c:1900
+msgid "failed to open stdin of 'crontab'"
+msgstr "no se pudo abrir stdin de 'crontab'"
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr "'crontab' murió"
+
+#: builtin/gc.c:1976
+msgid "another process is scheduling background maintenance"
+msgstr "otro proceso está programando el mantenimiento en segundo plano"
+
+#: builtin/gc.c:2000
+msgid "failed to add repo to global config"
+msgstr "no se pudo agregar el repositorio a la configuración global"
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <subcomando> [<opciones>]"
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "subcomando no válido: %s"
+
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
 
-#: builtin/grep.c:225
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: falló al crear el hilo: %s"
 
-#: builtin/grep.c:279
+#: builtin/grep.c:277
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "número inválido de hilos especificado (%d) para %s"
@@ -13541,264 +15992,264 @@ msgstr "número inválido de hilos especificado (%d) para %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: 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 "no hay soporte para hilos, ignorando %s"
 
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
 #, 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:650
+#: builtin/grep.c:658
 #, 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:716
+#: builtin/grep.c:738
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "switch `%c' espera un valor numérico"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:837
 msgid "search in index instead of in the work tree"
 msgstr "buscar en el índice en lugar del árbol de trabajo"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:839
 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:819
+#: builtin/grep.c:841
 msgid "search in both tracked and untracked files"
 msgstr "buscar en archivos rastreados y no rastreados"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:843
 msgid "ignore files specified via '.gitignore'"
-msgstr "ignorar archivos especificados via '.gitignore'"
+msgstr "ignorar archivos especificados vía '.gitignore'"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:845
 msgid "recursively search in each submodule"
 msgstr "búsqueda recursiva en cada submódulo"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:848
 msgid "show non-matching lines"
-msgstr "mostrar líneas que no concuerdan"
+msgstr "mostrar líneas que no concuerden"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:850
 msgid "case insensitive matching"
 msgstr "búsqueda insensible a mayúsculas"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:852
 msgid "match patterns only at word boundaries"
 msgstr "concordar patrón solo a los límites de las palabras"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:854
 msgid "process binary files as text"
 msgstr "procesar archivos binarios como texto"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:856
 msgid "don't match patterns in binary files"
 msgstr "no concordar patrones en archivos binarios"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:859
 msgid "process binary files with textconv filters"
 msgstr "procesar archivos binarios con filtros textconv"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:861
 msgid "search in subdirectories (default)"
 msgstr "buscar en subdirectorios (default)"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:863
 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:845
+#: builtin/grep.c:867
 msgid "use extended POSIX regular expressions"
 msgstr "usar expresiones regulares POSIX extendidas"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:870
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usar expresiones regulares POSIX (default)"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:873
 msgid "interpret patterns as fixed strings"
-msgstr "interpretar patrones como strings arreglados"
+msgstr "interpretar patrones como strings fijos"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:876
 msgid "use Perl-compatible regular expressions"
 msgstr "usar expresiones regulares compatibles con Perl"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:879
 msgid "show line numbers"
 msgstr "mostrar números de línea"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:880
 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:859
+#: builtin/grep.c:881
 msgid "don't show filenames"
 msgstr "no mostrar nombres de archivo"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:882
 msgid "show filenames"
 msgstr "mostrar nombres de archivo"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:884
 msgid "show filenames relative to top directory"
 msgstr "mostrar nombres de archivo relativos al directorio superior"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:886
 msgid "show only filenames instead of matching lines"
 msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:888
 msgid "synonym for --files-with-matches"
 msgstr "sinónimo para --files-with-matches"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:891
 msgid "show only the names of files without match"
 msgstr "mostrar solo los nombres de archivos sin coincidencias"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:893
 msgid "print NUL after filenames"
 msgstr "imprimir NUL después del nombre de archivo"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:896
 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:876
+#: builtin/grep.c:898
 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:877
+#: builtin/grep.c:899
 msgid "highlight matches"
 msgstr "resaltar concordancias"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:901
 msgid "print empty line between matches from different files"
 msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:903
 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:884
+#: builtin/grep.c:906
 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:887
+#: builtin/grep.c:909
 msgid "show <n> context lines before matches"
 msgstr "mostrar <n> líneas de contexto antes de las concordancias"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:911
 msgid "show <n> context lines after matches"
 msgstr "mostrar <n> líneas de context después de las concordancias"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:913
 msgid "use <n> worker threads"
 msgstr "usar <n> hilos de trabajo"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:914
 msgid "shortcut for -C NUM"
 msgstr "atajo para -C NUM"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:917
 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:897
+#: builtin/grep.c:919
 msgid "show the surrounding function"
 msgstr "mostrar la función circundante"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:922
 msgid "read patterns from file"
 msgstr "leer patrones del archivo"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:924
 msgid "match <pattern>"
 msgstr "concordar <patrón>"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:926
 msgid "combine patterns specified with -e"
 msgstr "combinar patrones especificados con -e"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:938
 msgid "indicate hit with exit status without output"
 msgstr "indicar concordancia con exit status sin output"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:940
 msgid "show only matches from files that match all patterns"
 msgstr ""
-"mostrar solo concordancias con archivos que concuerdan todos los patrones"
-
-#: builtin/grep.c:920
-msgid "show parse tree for grep expression"
-msgstr "mostrar árbol analizado para la expresión grep"
+"mostrar solo concordancias con archivos que concuerdan con todos los patrones"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "show matching files in the pager"
 msgstr "mostrar archivos concordantes en el paginador"
 
-#: builtin/grep.c:928
+#: builtin/grep.c:947
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
 
-#: builtin/grep.c:992
+#: builtin/grep.c:1013
 msgid "no pattern given"
-msgstr "no se ha entregado patrón"
+msgstr "no se ha entregado ningún patrón"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1049
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked no se puede usar con revs"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1057
 #, 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:1087
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked no es soportada con --recurse-submodules"
 
-#: builtin/grep.c:1067
+#: builtin/grep.c:1091
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinación de opciones inválida, ignorando --threads"
 
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
 msgid "no threads support, ignoring --threads"
 msgstr "no se soportan hilos, ignorando --threads"
 
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: 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 inválido de hilos especificado (%d)"
 
-#: builtin/grep.c:1096
+#: builtin/grep.c:1131
 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:1119
-msgid "option not supported with --recurse-submodules"
-msgstr "opción no soportada con --recurse-submodules"
-
-#: builtin/grep.c:1125
+#: builtin/grep.c:1157
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached o --untracked no pueden ser usadas con --no-index"
 
-#: builtin/grep.c:1131
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked no se puede usar con --cached"
+
+#: builtin/grep.c:1166
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado"
 
-#: builtin/grep.c:1139
+#: builtin/grep.c:1174
 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
 msgid ""
@@ -13826,486 +16277,514 @@ msgstr "leer el objeto de stdin"
 
 #: builtin/hash-object.c:103
 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
 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
 msgid "process file as it were from this path"
 msgstr "procesar el archivo como si fuera de esta ruta"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "mostrar todos los comandos disponibles"
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "excluir las guias"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
-msgstr "mostrar una lista de nociones utiles"
+msgstr "mostrar una lista de guías útiles"
 
-#: builtin/help.c:49
+#: builtin/help.c:50
 msgid "print all configuration variable names"
 msgstr "imprimir todos los nombres de variables de configuración"
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
-msgstr "mostrar la pagina del manual"
+msgstr "mostrar la página del manual"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 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:54
+#: builtin/help.c:55
 msgid "show info page"
-msgstr "mostrar la pagina de info"
+msgstr "mostrar la página de info"
 
-#: builtin/help.c:56
+#: builtin/help.c:57
 msgid "print command description"
 msgstr "imprimir descripción del comando"
 
-#: builtin/help.c:61
+#: 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:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "formato help no reconocido '%s'"
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "Falló al iniciar emacsclient."
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "Falló al analizar la versión de emacsclient."
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, 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:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "falló al ejecutar '%s'"
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, 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 considere usar 'man.<herramienta>.cmd'."
 
-#: builtin/help.c:233
+#: builtin/help.c:319
 #, 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"
+"'%s': comando para man viewer soportado.\n"
 "Por favor considere usar 'man.<herramienta>.path."
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualizador de man desconocido."
 
-#: builtin/help.c:367
+#: builtin/help.c:452
 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:375
+#: builtin/help.c:459
 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:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' tiene el alias '%s'"
 
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:531 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "mal alias.%s string: %s"
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:561 builtin/help.c:591
 #, c-format
 msgid "usage: %s%s"
 msgstr "uso: %s%s"
 
-#: builtin/help.c:491
+#: builtin/help.c:575
 msgid "'git help config' for more information"
 msgstr "'git help config' para más información"
 
-#: builtin/index-pack.c:185
+#: builtin/index-pack.c:222
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "el tipo del objeto no concuerda en %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:242
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "no se recibió el objeto esperado %s"
 
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:245
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objeto %s: tipo esperado %s, encontrado %s"
 
-#: builtin/index-pack.c:258
+#: builtin/index-pack.c:295
 #, 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:268
+#: builtin/index-pack.c:305
 msgid "early EOF"
 msgstr "EOF temprano"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:306
 msgid "read error on input"
-msgstr "leer error en input"
+msgstr "error al leer en input"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:318
 msgid "used more bytes than were available"
 msgstr "se usaron más bytes de los disponibles"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:325 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:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "paquete excede el máximo tamaño permitido"
 
-#: builtin/index-pack.c:312
+#: 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:326
+#: builtin/index-pack.c:363
 msgid "pack signature mismatch"
 msgstr "firma del paquete no concuerda"
 
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:365
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "versión de paquete %<PRIu32> no soportada"
 
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:381
 #, 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:466
+#: builtin/index-pack.c:487
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate devolvió %d"
 
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:536
 msgid "offset value overflow for delta base object"
 msgstr "valor de offset desbordado para el objeto base delta"
 
-#: builtin/index-pack.c:523
+#: builtin/index-pack.c:544
 msgid "delta base offset is out of bound"
 msgstr "offset de base delta está fuera de límites"
 
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:552
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipo de objeto %d desconocido"
 
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:583
 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:564
+#: 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] "final prematuro de archivo de paquete, %<PRIuMAX> byte faltante"
 msgstr[1] "final prematuro de archivo de paquete, %<PRIuMAX> bytes faltantes"
 
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:611
 msgid "serious inflate inconsistency"
 msgstr "inconsistencia seria en inflate"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: 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 "¡COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
+msgstr "¡ COLISIÓN DE SHA1 ENCONTRADA CON %s !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: 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 "no se posible leer %s"
+msgstr "no es posible leer %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:823
 #, 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:809
+#: builtin/index-pack.c:831
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "no se puede leer el objeto existente %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:845
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objeto blob %s inválido"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
 msgid "fsck error in packed object"
 msgstr "error de fsck en el objeto empaquetado"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:869
 #, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
 msgid "failed to apply delta"
 msgstr "falló al aplicar delta"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Receiving objects"
 msgstr "Recibiendo objetos"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Indexing objects"
 msgstr "Indexando objetos"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1194
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paquete está corrompido (SHA1 no concuerda)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1199
 msgid "cannot fstat packfile"
 msgstr "no se puede fstat al archivo de paquete"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1202
 msgid "pack has junk at the end"
 msgstr "el paquete tiene basura al final"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1214
 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:1195
+#: builtin/index-pack.c:1237
 msgid "Resolving deltas"
 msgstr "Resolviendo deltas"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "no es posible crear hilo: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1281
 msgid "confusion beyond insanity"
 msgstr "confusión más allá de la locura"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1287
 #, 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:1264
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Tail checksum para %s inesperada (¿corrupción de disco?)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1303
 #, 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:1292
+#: builtin/index-pack.c:1327
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "no es posible desinflar el objeto adjunto (%d)"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "objeto local %s está corrompido"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1444
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
+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:1427
+#: builtin/index-pack.c:1468
 #, 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:1435
+#: builtin/index-pack.c:1476
 #, c-format
 msgid "cannot close written %s file '%s'"
-msgstr "no se puede cerrar escrito %s en archivo '%s'"
+msgstr "no se puede cerrar el archivo escrito '%2$s' de %1$s"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1502
 msgid "error while closing pack file"
-msgstr "error mientras se cierra el archivo paquete"
+msgstr "error mientras se cerraba el archivo paquete"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1516
 msgid "cannot store pack file"
 msgstr "no se puede guardar el archivo paquete"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1524
 msgid "cannot store index file"
 msgstr "no se puede guardar el archivo índice"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mal pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1649
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "No se puede abrir el archivo paquete existente '%s'"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1651
 #, 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:1643
+#: builtin/index-pack.c:1699
 #, 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:1650
+#: builtin/index-pack.c:1706
 #, 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:1689
+#: builtin/index-pack.c:1748
 msgid "Cannot come back to cwd"
 msgstr "No se puede regresar a cwd"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: 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 "mal %s"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1831 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:1850
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin no puede ser usada sin --stdin"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1852
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiere un repositorio git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format no se puede usar con --stdin"
+
+#: builtin/index-pack.c:1869
 msgid "--verify with no packfile name given"
 msgstr "--verify no recibió ningún nombre de archivo de paquete"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "error de fsck en objetos paquete"
 
-#: builtin/init-db.c:61
+#: 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:66
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "no se puede abrir directorio '%s'"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "no se puede leer link '%s'"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "no se puede crear symlink '%s' '%s'"
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "no se puede copiar '%s' a '%s'"
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "ignorando template %s"
 
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "template no encontrado en %s"
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "no se copian templates de '%s': %s"
 
-#: builtin/init-db.c:334
+#: 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:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "no es posible manejar el tipo de archivo %d"
 
-#: builtin/init-db.c:337
+#: 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:354 builtin/init-db.c:357
+#: builtin/init-db.c:373
+msgid "attempt to reinitialize repository with different hash"
+msgstr "intento de reinicializar el repositorio con un hash diferente"
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s ya existe"
 
-#: builtin/init-db.c:413
+#: 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: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:414
+#: 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:418
+#: 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:419
+#: 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:468
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -14313,26 +16792,42 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
 "shared[=<permisos>]] [<directorio>]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "permisos"
 
-#: builtin/init-db.c:492
+#: 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"
 
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: 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:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "hash"
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir y --bare son mutuamente excluyentes"
+
+#: 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:538
+#: 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:559
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -14341,11 +16836,15 @@ msgstr ""
 "%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
 "dir=<directorio>)"
 
-#: builtin/init-db.c:587
+#: 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:684
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir incompatible con el repositorio desnudo"
+
 #: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -14356,7 +16855,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"
@@ -14368,7 +16867,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"
@@ -14394,10 +16893,6 @@ msgstr "configurar opciones de análisis"
 msgid "do not treat --- specially"
 msgstr "no tratar --- especialmente"
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "trailer"
-
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "trailer(s) para agregar"
@@ -14410,121 +16905,130 @@ msgstr "--trailer con --only-input no tiene sentido"
 msgid "no input file given for in-place editing"
 msgstr "no se entregó archivo de entrada para edición en lugar"
 
-#: builtin/log.c:55
+#: 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:56
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opciones>] <objeto>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opción --decorate inválida: %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:180
 msgid "show source"
 msgstr "mostrar fuente"
 
-#: builtin/log.c:174
-msgid "Use mail map file"
-msgstr "Usar archivo de mapa de mail"
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "usar archivo de mapa de mail"
 
-#: builtin/log.c:176
+#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr "solo decorar refs que concuerden con <patrón>"
 
-#: builtin/log.c:178
+#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr "no decorar refs que concuerden con <patrón>"
 
-#: builtin/log.c:179
+#: builtin/log.c:187
 msgid "decorate options"
-msgstr "opciones de decorado"
+msgstr "opciones de decoración"
 
-#: builtin/log.c:182
-msgid "Process line range n,m in file, counting from 1"
-msgstr "Procesar rango de líneas n,m en archivo, contando desde 1"
+#: builtin/log.c: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-"
+"funcion> en <archivo>"
 
-#: builtin/log.c:280
+#: 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:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Salida final: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: mal archivo"
 
-#: builtin/log.c:549 builtin/log.c:644
+#: 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:669
+#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipo desconocido: %d"
 
-#: builtin/log.c:792
-msgid "format.headers without value"
-msgstr "formate.headers. sin valor"
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: modo cover from description inválido"
 
-#: builtin/log.c:909
-msgid "name of output directory is too long"
-msgstr "nombre del directorio de salida es muy largo"
+#: builtin/log.c:853
+msgid "format.headers without value"
+msgstr "format.headers sin valor"
 
-#: builtin/log.c:925
+#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "no se puede abrir archivo patch %s"
 
-#: builtin/log.c:942
+#: builtin/log.c:999
 msgid "need exactly one range"
-msgstr "necesita exactamente un rango"
+msgstr "se necesita exactamente un rango"
 
-#: builtin/log.c:952
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr "no es un rango"
 
-#: builtin/log.c:1075
+#: 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:1081
+#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
 msgstr "falló al crear los archivos cover-letter"
 
-#: builtin/log.c:1160
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "insano in-reply-to: %s"
 
-#: builtin/log.c:1187
+#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
 
-#: builtin/log.c:1245
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "¿dos directorios de salida?"
 
-#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: 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:1366 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:1371
+#: 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:1375
+#: 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"
@@ -14536,271 +17040,294 @@ msgstr ""
 "O puedes especificar un commit base mediante --base=<id-commit-base> "
 "manualmente"
 
-#: builtin/log.c:1395
+#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr "falló al encontrar una base de fusión exacta"
 
-#: builtin/log.c:1406
+#: 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:1410
+#: 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:1463
+#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr "no se puede obtener id de patch"
 
-#: builtin/log.c:1515
-msgid "failed to infer range-diff ranges"
-msgstr "falló al inferir rangos range-diff"
+#: 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:1560
+#: 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:1749
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "use [PATCH n/m] incluso con un único parche"
 
-#: builtin/log.c:1563
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr "use [PATCH] incluso con múltiples parches"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "mostrar parches en standard out"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1758
 msgid "generate a cover letter"
-msgstr "generar letra de cover"
+msgstr "generar carta de cover"
 
-#: builtin/log.c:1571
+#: 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:1572
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1573
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr "use <sfx> en lugar de '.patch'"
 
-#: builtin/log.c:1575
+#: 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:1577
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "reroll-count"
+
+#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr "marcar las series como Nth re-roll"
 
-#: builtin/log.c:1579
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Use [RFC PATCH] en lugar de [PATCH]"
+#: builtin/log.c:1768
+msgid "max length of output filename"
+msgstr "tamaño máximo de nombre de archivo resultante"
 
-#: builtin/log.c:1582
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Use [<prefijo>] en lugar de [PATCH]"
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "use [RFC PATCH] en lugar de [PATCH]"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr "modo-cover-from-description"
+
+#: 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 "
+"rama"
+
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "use [<prefijo>] en lugar de [PATCH]"
+
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "guardar archivos resultantes en <dir>"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr "no cortar/agregar [PATCH]"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1785
 msgid "don't output binary diffs"
 msgstr "no mostrar diffs binarios"
 
-#: builtin/log.c:1593
+#: 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:1595
+#: 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"
 
-#: builtin/log.c:1597
+#: 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:1599
+#: builtin/log.c:1793
 msgid "Messaging"
-msgstr "Mensajeando"
+msgstr "Mensajería"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1794
 msgid "header"
 msgstr "cabezal"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "agregar cabecera email"
 
-#: builtin/log.c:1602 builtin/log.c:1604
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "email"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "agregar cabecera To:"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "agregar cabecera Cc:"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1607
+#: 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:1609
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "id de mensaje"
 
-#: builtin/log.c:1610
+#: 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:1611 builtin/log.c:1614
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "límite"
 
-#: builtin/log.c:1612
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "adjuntar el parche"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "poner el parche en línea"
 
-#: builtin/log.c:1619
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "firma"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "agregar una firma"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "commit-base"
 
-#: builtin/log.c:1624
+#: 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:1626
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "agregar una firma de un archivo"
 
-#: builtin/log.c:1627
+#: builtin/log.c:1820
 msgid "don't print the patch filenames"
 msgstr "no mostrar los nombres de archivos de los parches"
 
-#: builtin/log.c:1629
+#: builtin/log.c:1822
 msgid "show progress while generating patches"
 msgstr "mostrar medidor de progreso mientras se generan los parches"
 
-#: builtin/log.c:1631
+#: 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"
 
-#: builtin/log.c:1634
+#: 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"
 
-#: builtin/log.c:1636
+#: 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:1711
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "línea de identificación inválida: %s"
 
-#: builtin/log.c:1726
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
 msgstr "-n y -k son mutuamente exclusivas"
 
-#: builtin/log.c:1728
+#: 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:1736
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
 msgstr "--name-only no tiene sentido"
 
-#: builtin/log.c:1738
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
 msgstr "--name-status no tiene sentido"
 
-#: builtin/log.c:1740
+#: builtin/log.c:1945
 msgid "--check does not make sense"
 msgstr "--check no tiene sentido"
 
-#: builtin/log.c:1773
-msgid "standard output, or directory, which one?"
-msgstr "¿salida standard, o directorio, cual?"
+#: 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:1877
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiere --cover-letter o un parche único"
 
-#: builtin/log.c:1881
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:1882
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contra v%d:"
 
-#: builtin/log.c:1888
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor requiere --range-diff"
 
-#: builtin/log.c:1892
+#: 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:1900
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:1901
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff contra v%d:"
 
-#: builtin/log.c:1912
+#: 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:1948
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "Generando parches"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2204
 msgid "failed to create output files"
 msgstr "falló al crear los archivos de salida"
 
-#: builtin/log.c:2051
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -14808,114 +17335,116 @@ msgstr ""
 "No se pudo encontrar una rama remota rastreada, por favor especifique "
 "<upstream> manualmente.\n"
 
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opciones>] [<archivo>...]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:619
 msgid "identify the file status with tags"
 msgstr "identifique el estado del archivo con tags"
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:621
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:623
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:625
 msgid "show cached files in the output (default)"
 msgstr "mostrar archivos en caché en la salida (default)"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:627
 msgid "show deleted files in the output"
 msgstr "mostrar archivos borrados en la salida"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:629
 msgid "show modified files in the output"
 msgstr "mostrar archivos modificados en la salida"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:631
 msgid "show other files in the output"
 msgstr "mostrar otros archivos en la salida"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:633
 msgid "show ignored files in the output"
 msgstr "mostrar archivos ignorados en la salida"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:636
 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:545
+#: builtin/ls-files.c:638
 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:547
+#: builtin/ls-files.c:640
 msgid "show 'other' directories' names only"
-msgstr "mostrar solo nombres de 'directorios otros'"
+msgstr "mostrar solo nombres de 'otros' directorios"
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:642
 msgid "show line endings of files"
 msgstr "mostrar finales de línea de archivos"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:644
 msgid "don't show empty directories"
 msgstr "no mostrar directorios vacíos"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:647
 msgid "show unmerged files in the output"
 msgstr "mostrar archivos no fusionados en la salida"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr "mostrar información resolver-deshacer"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:651
 msgid "skip files matching pattern"
 msgstr "saltar archivos que concuerden con el patrón"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:654
 msgid "exclude patterns are read from <file>"
 msgstr "excluir patrones leídos de <archivo>"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:657
 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:566
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
 msgstr "agregar las exclusiones standard de git"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:663
 msgid "make the output relative to the project top directory"
 msgstr "hacer la salida relativa al directorio principal del proyecto"
 
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
 msgstr "recurrir a través de submódulos"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:668
 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:576
+#: builtin/ls-files.c:669
 msgid "tree-ish"
 msgstr "árbol-ismo"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:670
 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:579
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr "mostrar data de debug"
 
+#: 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"
@@ -14926,39 +17455,39 @@ msgstr ""
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<repositorio> [<refs>...]]"
 
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "no mostrar el URL remoto"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
 msgid "exec"
 msgstr "ejecutar"
 
-#: 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 "ruta de git-upload-pack en el host remoto"
 
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "limitar a tags"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "limitar a heads"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "no mostrar tags pelados"
 
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "tomar url.<base>.insteadOf en cuenta"
 
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "salir con código de salida 2 si no se encuentran refs que concuerden"
 
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "mostrar ref subyacente en adición al objeto apuntado por él"
 
@@ -14999,198 +17528,349 @@ msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 "mostrar todo el árbol; no solo el directorio actual (implica --full-name)"
 
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<opciones>] <msg> <patch> < mail >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "mantener sujeto"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr "mantener parche sin brackets en el sujeto"
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr "copiar Message-ID al final del mensaje del commit"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "re-codificar metadata en i18n.commitEncoding"
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr "deshabilitar charset re-coding de metadata"
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr "codificación"
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr "re-codificar metadata en esta codificación"
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr "usar tijeras"
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr "<acción>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "actión cuando se encuentra un CR citado"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "usar cabeceras en el cuerpo del mensaje"
+
 #: builtin/mailsplit.c:241
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox vacío: '%s'"
 
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<opciones>] [<commit>...]"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <commit> <commit>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <commit>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <commit>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <commit> <commit>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <ref> [<commit>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+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"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+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?"
 
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "encontrar donde <commit> bifurcó del reflog de <ref>"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] "
+"<archivo1> <archivo-origen> <archivo2>"
 
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "mandar resultados a standard output"
 
-#: builtin/merge.c:118
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "usar una fusión basada en diff3"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "por conflictos, usar nuestra versión"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "por conflictos, usar la versión de ellos"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+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 este tamaño de marcador"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "no advertir sobre conflictos"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "configurar labels para archivo1/orig-archivo/archivo2"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "opción %s desconocida"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "no se pudo analizar el 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] "no se puede manejar más de %d base. Ignorando %s."
+msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "no manejando nada distinto a fusión de dos heads."
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "no se pudo resolver ref '%s'"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Fusionando %s con %s\n"
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opciones>] [<commit>...]"
+
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
-msgstr "cambiar `m' requiere un valor"
+msgstr "opción `m' requiere un valor"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:146
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "opción `%s' requiere un valor"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:199
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estrategias disponibles son:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:205
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Estrategias personalizadas disponibles son:"
 
-#: builtin/merge.c:244 builtin/pull.c:152
+#: builtin/merge.c:256 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:247 builtin/pull.c:155
+#: builtin/merge.c:259 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:248 builtin/pull.c:158
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(sinónimo para --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:262 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:253 builtin/pull.c:167
+#: builtin/merge.c:265 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:255 builtin/pull.c:170
+#: builtin/merge.c:267 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:257 builtin/pull.c:173
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "editar mensaje antes de realizar commit"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
-msgstr "permitir fast-forwars (default)"
+msgstr "permitir fast-forward (default)"
 
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:273 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "abortar si fast-forward no es posible"
 
-#: builtin/merge.c:265 builtin/pull.c:183
+#: builtin/merge.c:277 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:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:493 builtin/rebase.c:1501 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 "estrategia"
 
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "estrategia de fusión para usar"
 
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr "opción=valor"
 
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "opción para la estrategia de fusión seleccionada"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:283
 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:278
+#: builtin/merge.c:290
 msgid "abort the current in-progress merge"
 msgstr "abortar la fusión en progreso actual"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:292
 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:282
+#: builtin/merge.c:294
 msgid "continue the current in-progress merge"
 msgstr "continuar la fusión en progreso actual"
 
-#: builtin/merge.c:284 builtin/pull.c:199
+#: builtin/merge.c:296 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "permitir fusionar historias no relacionadas"
 
-#: builtin/merge.c:290
+#: builtin/merge.c:303
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "hacer un bypass a hooks pre-merge-commit y commit-msg"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:320
 msgid "could not run stash."
 msgstr "no se pudo ejecutar stash."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:325
 msgid "stash failed"
 msgstr "stash falló"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:330
 #, c-format
 msgid "not a valid object: %s"
 msgstr "no es un objeto válido: %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr "lectura de árbol falló"
 
-#: builtin/merge.c:386
-msgid " (nothing to squash)"
-msgstr " (nada para hacer squash)"
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
+msgstr "Ya está actualizado. (nada para hacer squash)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Commit de squash -- no actualizando HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:464
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' no apunta a ningún commit"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mal string branch.%s.mergeoptions: %s"
 
-#: builtin/merge.c:705
+#: builtin/merge.c:729
 msgid "Not handling anything other than two heads merge."
 msgstr "No manejando nada más que fusión de dos heads."
 
-#: builtin/merge.c:719
+#: builtin/merge.c:742
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opción desconocida para merge-recursive: -X%s"
 
-#: builtin/merge.c:734
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "no es posible escribir %s"
 
-#: builtin/merge.c:786
+#: builtin/merge.c:813
 #, 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:795
+#: builtin/merge.c:822
 #, 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; use 'git commit' para completar la fusión.\n"
 
-#: builtin/merge.c:801
+#: 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"
@@ -15202,87 +17882,87 @@ msgstr ""
 "tópico.\n"
 "\n"
 
-#: builtin/merge.c:806
+#: builtin/merge.c:833
 msgid "An empty message aborts the commit.\n"
 msgstr "Un mensaje vacío aborta el commit.\n"
 
-#: builtin/merge.c:809
+#: builtin/merge.c:836
 #, 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:862
+#: builtin/merge.c:889
 msgid "Empty commit message."
 msgstr "Mensaje de commit vacío."
 
-#: builtin/merge.c:877
+#: builtin/merge.c:904
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilloso.\n"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:965
 #, 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:977
+#: builtin/merge.c:1004
 msgid "No current branch."
 msgstr "No rama actual."
 
-#: builtin/merge.c:979
+#: builtin/merge.c:1006
 msgid "No remote for the current branch."
 msgstr "No hay remoto para la rama actual."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:1008
 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:986
+#: builtin/merge.c:1013
 #, 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:1043
+#: builtin/merge.c:1070
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor erróneo '%s' en el entorno '%s'"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1173
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "nada que podamos fusionar en %s: %s"
 
-#: builtin/merge.c:1180
+#: builtin/merge.c:1207
 msgid "not something we can merge"
 msgstr "nada que podamos fusionar"
 
-#: builtin/merge.c:1283
+#: builtin/merge.c:1317
 msgid "--abort expects no arguments"
 msgstr "--abort no espera argumentos"
 
-#: builtin/merge.c:1287
+#: builtin/merge.c:1321
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
 
-#: builtin/merge.c:1296
+#: builtin/merge.c:1339
 msgid "--quit expects no arguments"
 msgstr "--quit no espera argumentos"
 
-#: builtin/merge.c:1309
+#: builtin/merge.c:1352
 msgid "--continue expects no arguments"
 msgstr "--continue no espera argumentos"
 
-#: builtin/merge.c:1313
+#: builtin/merge.c:1356
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
 
-#: builtin/merge.c:1329
+#: builtin/merge.c:1372
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15290,7 +17970,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:1336
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15298,212 +17978,134 @@ 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:1339
+#: builtin/merge.c:1382
 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:1353
+#: builtin/merge.c:1396
 msgid "You cannot combine --squash with --no-ff."
 msgstr "No se puede combinar --squash con --no-ff."
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1398
 msgid "You cannot combine --squash with --commit."
 msgstr "No se puede combinar --squash con --commit."
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1414
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "No hay commit especificado y merge.defaultToUpstream no está configurado."
 
-#: builtin/merge.c:1388
+#: builtin/merge.c:1431
 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:1390
+#: builtin/merge.c:1433
 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:1395
+#: builtin/merge.c:1438
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - nada que podamos fusionar"
 
-#: builtin/merge.c:1397
+#: builtin/merge.c:1440
 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:1476
+#: builtin/merge.c:1521
 msgid "refusing to merge unrelated histories"
 msgstr "rehusando fusionar historias no relacionadas"
 
-#: builtin/merge.c:1485
-msgid "Already up to date."
-msgstr "Ya está actualizado."
-
-#: builtin/merge.c:1495
+#: builtin/merge.c:1540
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Actualizando %s..%s\n"
 
-#: builtin/merge.c:1537
+#: builtin/merge.c:1587
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Intentando fusión en índice realmente trivial...\n"
 
-#: builtin/merge.c:1544
+#: builtin/merge.c:1594
 #, c-format
 msgid "Nope.\n"
-msgstr "Nop.\n"
+msgstr "No.\n"
 
-#: builtin/merge.c:1569
-msgid "Already up to date. Yeeah!"
-msgstr "Ya está actualizado. ¡Oh, yeaahh!"
-
-#: builtin/merge.c:1575
+#: builtin/merge.c:1625
 msgid "Not possible to fast-forward, aborting."
 msgstr "No es posible hacer fast-forward, abortando."
 
-#: builtin/merge.c:1598 builtin/merge.c:1663
+#: builtin/merge.c:1653 builtin/merge.c:1719
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Rebobinando el árbol a original...\n"
 
-#: builtin/merge.c:1602
+#: builtin/merge.c:1657
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Intentando estrategia de fusión %s...\n"
 
-#: builtin/merge.c:1654
+#: builtin/merge.c:1709
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
 
-#: builtin/merge.c:1656
+#: builtin/merge.c:1711
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Fusionar con estrategia %s falló.\n"
 
-#: builtin/merge.c:1665
+#: builtin/merge.c:1721
 #, 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:1677
+#: builtin/merge.c:1735
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Fusión automática fue bien; detenida antes del commit como se solicitó\n"
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <commit> <commit>..."
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <commit>..."
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <commit>..."
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <commit> <commit>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <ref> [<commit>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "mostrar todos los ancestros comunes"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "encontrar ancestros para una única fusión de n-vías"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "listar revs no alcanzables desde otros"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "¿es el primer ancestro del otro?"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "encontrar donde <commit> forjó del reflog de <ref>"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-"git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] "
-"<archivo1> <archivo-origen> <archivo2>"
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-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"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "por conflictos, usar nuestra versión"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "por conflictos, usar la versión de ellos"
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
 
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-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"
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "no advertir sobre conflictos"
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "peligro: información de tag no pasa fsck: %s"
 
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "configurar labels para archivo1/orig-archivo/archivo2"
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "error: valor de tag no pasa fsck: %s"
 
-#: builtin/merge-recursive.c:47
+#: builtin/mktag.c:41
 #, c-format
-msgid "unknown option %s"
-msgstr "opción %s desconocida"
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) nunca debería activar esta devolución de llamada"
 
-#: builtin/merge-recursive.c:53
+#: builtin/mktag.c:56
 #, c-format
-msgid "could not parse object '%s'"
-msgstr "no se pudo analizar el objeto '%s'"
+msgid "could not read tagged object '%s'"
+msgstr "no se pudo leer objeto etiquetado '%s'"
 
-#: builtin/merge-recursive.c:57
+#: builtin/mktag.c:59
 #, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "no se puede manejar más de %d base. Ignorando %s."
-msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "objeto '%s' es etiquetado como '%s', pero es de tipo '%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."
+#: builtin/mktag.c:97
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "etiqueta en stdin no pasó nuestro estricto control fsck"
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "no se pudo resolver ref '%s'"
+#: builtin/mktag.c:100
+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/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "Fusionando %s con %s\n"
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "incapaz de escribir el archivo de tag"
 
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
@@ -15521,35 +18123,44 @@ msgstr "permitir objetos faltantes"
 msgid "allow creation of more than one tree"
 msgstr "permitir la creación de más de un árbol"
 
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
-msgstr ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<tamaño>)"
+#: 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>]"
+
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<opciones>] verify"
+
+#: builtin/multi-pack-index.c:16
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<opciones>] expire"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:19
+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
 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:25
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr "pack preferido"
+
+#: builtin/multi-pack-index.c:70
+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
 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:43 builtin/prune-packed.c:67
-msgid "too many arguments"
-msgstr "muchos argumentos"
-
-#: builtin/multi-pack-index.c:52
-msgid "--batch-size option is only for 'repack' subcommand"
-msgstr "opción --batch-size es solo para el subcomando 'repack'"
+"sea más grande que este tamaño"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:179
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "subcomando desconocido: %s"
@@ -15566,8 +18177,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
@@ -15576,119 +18187,123 @@ 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:169
+#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destino '%s' no es un directorio"
 
-#: builtin/mv.c:180
+#: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
 
-#: builtin/mv.c:184
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr "mala fuente"
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 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:190
+#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr "no se puede mover un directorio dentro de un archivo"
 
-#: builtin/mv.c:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr "directorio de fuente está vacío"
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 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
+msgid "conflicted"
+msgstr "en conflicto"
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "destino existe"
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "sobrescribiendo '%s'"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "No se puede sobrescribir"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 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:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "el directorio de destino no existe"
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, fuente=%s, destino=%s"
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renombrando %s a %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
 #, c-format
 msgid "renaming '%s' failed"
-msgstr "renombrando '%s' falló"
+msgstr "renombrar '%s' falló"
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opciones>] <commit>..."
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opciones>] --all"
 
-#: builtin/name-rev.c:358
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opciones>] --stdin"
 
-#: builtin/name-rev.c:415
-msgid "print only names (no SHA-1)"
-msgstr "imprimir sólo nombres (sin SHA-1)"
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr "imprimir solo nombres basados en referencias (sin nombres de objetos)"
 
-#: builtin/name-rev.c:416
+#: 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:418
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "solo usar refs que concuerden con <patrón>"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignorar refs que concuerden con <patrón>"
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "listar todos los commits alcanzables desde todas las referencias"
 
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "leer desde stdin"
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "permitir imprimir nombres `undefined` (predeterminado)"
 
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "desreferenciar tags en la entrada (uso interno)"
 
@@ -15837,7 +18452,7 @@ msgstr "incapaz de escribir el objeto de nota"
 msgid "the note contents have been left in %s"
 msgstr "los contenidos de nota han sido dejados en %s"
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:576
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "no se pudo abrir o leer '%s'"
@@ -15857,7 +18472,7 @@ msgstr "falló al leer objeto '%s'."
 #: builtin/notes.c:268
 #, 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
 #, c-format
@@ -15880,8 +18495,9 @@ 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
-msgid "too many parameters"
-msgstr "demasiados parámetros"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
+msgstr "muchos argumentos"
 
 #: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
@@ -15898,7 +18514,7 @@ msgstr "contenidos de la nota en un archivo"
 
 #: builtin/notes.c:416 builtin/notes.c:582
 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
 msgid "reuse specified note object"
@@ -15929,7 +18545,7 @@ msgstr "Sobrescribiendo notas existentes para objeto %s\n"
 #: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
 #, 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
 msgid "read objects from stdin"
@@ -15940,8 +18556,8 @@ msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
 
 #: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "muy pocos parámetros"
+msgid "too few arguments"
+msgstr "demasiados pocos argumentos"
 
 #: builtin/notes.c:538
 #, c-format
@@ -15950,12 +18566,12 @@ msgid ""
 "existing notes"
 msgstr ""
 "No se puede copiar notas. Se encontró notas existentes para el objeto %s. "
-"Use '-f' para sobrescribir las notes existentes"
+"Use '-f' para sobrescribir las notas existentes"
 
 #: builtin/notes.c:550
 #, 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
 #, c-format
@@ -15996,7 +18612,7 @@ msgstr "falló al resolver NOTES_MERGE_REF"
 
 #: builtin/notes.c:742
 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
 #, c-format
@@ -16016,7 +18632,7 @@ 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
@@ -16030,19 +18646,19 @@ msgstr ""
 
 #: builtin/notes.c:794
 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
 msgid "abort notes merge"
-msgstr "abortar notas de fusión"
+msgstr "abortar fusión de notas"
 
 #: builtin/notes.c:807
 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
 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
 #, c-format
@@ -16070,7 +18686,7 @@ msgstr ""
 "commit con el resultado 'git notes merge --commit', o aborte la fusión con "
 "'git notes merge --abort'.\n"
 
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:589
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Falló al resolver '%s' como una ref válida."
@@ -16088,7 +18704,7 @@ msgstr "intentar eliminar una nota no existente no es un error"
 msgid "read object names from the standard input"
 msgstr "leer nombres de objetos de standard input"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "no eliminar, solo mostrar"
 
@@ -16104,157 +18720,175 @@ msgstr "referencia-de-notas"
 msgid "use notes from <notes-ref>"
 msgstr "usar notas desde <referencia-de-notas>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1735
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconocido: %s"
 
-#: builtin/pack-objects.c:52
+#: 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:53
+#: 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:428
+#: 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 se pudo localizar %s, se esperaba en el "
+"desplazamiento %<PRIuMAX> en el paquete %s"
+
+#: 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:439
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objeto empaquetado corrupto para %s"
 
-#: builtin/pack-objects.c:570
+#: 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:781
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u objetos ordenados, esperados %<PRIu32>"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "packfile es inválido: %s"
-
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:1036
 #, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "no es posible abrir packfile para reusar: %s"
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "objeto esperado en el desplazamiento %<PRIuMAX> en el paquete %s"
 
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "no es posible buscar en los packfile reusados"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "no es posible leer de packfile reusado"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:1155
 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:854
+#: builtin/pack-objects.c:1168
 msgid "Writing objects"
 msgstr "Escribiendo objetos"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "falló al iniciar %s"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1281
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> objetos escritos mientras se esperaban %<PRIu32>"
 
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1523
 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:1592
+#: builtin/pack-objects.c:1971
 #, 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:1601
+#: builtin/pack-objects.c:1980
 #, 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:1870
+#: builtin/pack-objects.c:2261
 msgid "Counting objects"
 msgstr "Contando objetos"
 
-#: builtin/pack-objects.c:2000
-#, c-format
-msgid "unable to get size of %s"
-msgstr "no se pudo obtener el tamaño de %s"
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c:2426
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "incapaz de analizar header del objeto %s"
 
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: 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 no puede ser leído"
 
-#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
 #, 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:2125
+#: builtin/pack-objects.c:2536
 msgid "suboptimal pack - out of memory"
 msgstr "suboptimal pack - fuera de memoria"
 
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2851
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Compresión delta usando hasta %d hilos"
 
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2990
 #, 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:2659
+#: builtin/pack-objects.c:3076
 msgid "Compressing objects"
 msgstr "Comprimiendo objetos"
 
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:3082
 msgid "inconsistency with delta count"
 msgstr "inconsistencia con la cuenta de delta"
 
-#: builtin/pack-objects.c:2742
+#: 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 ""
+"valor para uploadpack.blobpackfileuri tiene que ser de la forma '<hash-de-"
+"objeto> <hash-de-pack> <uri>' (se tuvo '%s')"
+
+#: builtin/pack-objects.c:3164
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"objeto ya está configurado en otro uploadpack.blobpackfileuri (se obtuvo "
+"'%s')"
+
+#: builtin/pack-objects.c:3199
+#, 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:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "no se pudo encontrar pack '%s'"
+
+#: builtin/pack-objects.c:3378
 #, 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:2748
+#: builtin/pack-objects.c:3384
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16263,249 +18897,273 @@ msgstr ""
 "se esperaba ID de objeto, se obtuvo basuta:\n"
 "%s"
 
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:3482
 msgid "invalid value for --missing"
 msgstr "valor inválido para --missing"
 
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
 msgid "cannot open pack index"
 msgstr "no se puede abrir índice de paquetes"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3572
 #, 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:3021
+#: builtin/pack-objects.c:3658
 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:3113
+#: builtin/pack-objects.c:3788
 #, c-format
 msgid "not a rev '%s'"
 msgstr "no es una rev '%s'"
 
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "mala revisión '%s'"
 
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3819
 msgid "unable to add recent objects"
 msgstr "incapaz de añadir objetos recientes"
 
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3872
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versión de índice no soportada %s"
 
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3876
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mala versión del índice '%s'"
 
-#: builtin/pack-objects.c:3228
-msgid "do not show progress meter"
-msgstr "no mostrar medidor de progreso"
-
-#: builtin/pack-objects.c:3230
-msgid "show progress meter"
-msgstr "mostrar medidor de progreso"
-
-#: builtin/pack-objects.c:3232
-msgid "show progress meter during object writing phase"
-msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
-
-#: builtin/pack-objects.c:3235
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
-
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3915
 msgid "<version>[,<offset>]"
 msgstr "<versión>[,<offset>]"
 
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3916
 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:3240
+#: builtin/pack-objects.c:3919
 msgid "maximum size of each output pack file"
 msgstr "tamaño máximo de cada paquete resultante"
 
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3921
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorar objetos prestados de otros almacenes de objetos"
 
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3923
 msgid "ignore packed objects"
-msgstr "ignorar objetos paquete"
+msgstr "ignorar objetos empaquetados"
 
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3925
 msgid "limit pack window by objects"
 msgstr "limitar ventana de paquete por objetos"
 
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3927
 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:3250
+#: builtin/pack-objects.c:3929
 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:3252
+#: builtin/pack-objects.c:3931
 msgid "reuse existing deltas"
 msgstr "reusar deltas existentes"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3933
 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3935
 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3937
 msgid "use threads when searching for best delta matches"
 msgstr "usar hilos cuando se busque para mejores concordancias de delta"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3939
 msgid "do not create an empty pack output"
 msgstr "no crear un paquete resultante vacío"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3941
 msgid "read revision arguments from standard input"
 msgstr "leer argumentos de revisión de standard input"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3943
 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:3267
+#: builtin/pack-objects.c:3946
 msgid "include objects reachable from any reference"
 msgstr "incluir objetos alcanzables por cualquier referencia"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3949
 msgid "include objects referred by reflog entries"
 msgstr "incluir objetos referidos por entradas de reflog"
 
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3952
 msgid "include objects referred to by the index"
 msgstr "incluir objetos referidos por el índice"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr "leer packs de stdin"
+
+#: builtin/pack-objects.c:3957
 msgid "output pack to stdout"
 msgstr "mostrar paquete en stdout"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3959
 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:3280
+#: builtin/pack-objects.c:3961
 msgid "keep unreachable objects"
 msgstr "mantener objetos inalcanzables"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3963
 msgid "pack loose unreachable objects"
 msgstr "empaquetar objetos sueltos inalcanzables"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3965
 msgid "unpack unreachable objects newer than <time>"
 msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3968
 msgid "use the sparse reachability algorithm"
 msgstr "usar el algoritmo sparse reachability"
 
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3970
 msgid "create thin packs"
 msgstr "crear paquetes delgados"
 
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3972
 msgid "create packs suitable for shallow fetches"
 msgstr "crear paquetes adecuados para fetches superficiales"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3974
 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:3295
+#: builtin/pack-objects.c:3976
 msgid "ignore this pack"
 msgstr "ignorar este paquete"
 
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3978
 msgid "pack compression level"
 msgstr "nivel de compresión del paquete"
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3980
 msgid "do not hide commits by grafts"
 msgstr "no ocultar commits por injertos"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3982
 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:3303
+#: builtin/pack-objects.c:3984
 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:3307
+#: builtin/pack-objects.c:3988
 msgid "write a bitmap index if possible"
 msgstr "escribir un índice de bitmap si es posible"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3992
 msgid "handling for missing objects"
 msgstr "manejo de objetos perdidos"
 
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3995
 msgid "do not pack objects in promisor packfiles"
 msgstr "no se puede empaquetar objetos en packfiles promisores"
 
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3997
 msgid "respect islands during delta compression"
 msgstr "respetar islas durante la compresión delta"
 
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr "protocolo"
+
+#: builtin/pack-objects.c:4000
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"excluyendo cualquier uploadpack.blobpackfileuri configurado con este "
+"protocolo"
+
+#: builtin/pack-objects.c:4033
 #, 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:3350
+#: builtin/pack-objects.c:4038
 #, 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:3404
+#: builtin/pack-objects.c:4094
 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:3406
+#: builtin/pack-objects.c:4096
 msgid "minimum pack size limit is 1 MiB"
 msgstr "tamaño mínimo del paquete es 1 MiB"
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:4101
 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:3414
+#: builtin/pack-objects.c:4104
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable y --unpack-unreachable son incompatibles"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:4110
 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:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr "no se puede usar --filter con --stdin-packs"
+
+#: builtin/pack-objects.c:4116
+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:3481
+#: builtin/pack-objects.c:4175
 msgid "Enumerating objects"
 msgstr "Enumerando objetos"
 
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:4212
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
-msgstr "Total %<PRIu32> (delta %<PRIu32>), reusado %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Total %<PRIu32> (delta %<PRIu32>), reusados %<PRIu32> (delta %<PRIu32>), "
+"pack-reusados %<PRIu32>"
+
+#: 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 ""
+"'git pack-redundant' está nominado para su eliminación.\n"
+"Si todavía usa este comando, agregue 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"
+"a <git@vger.kernel.org>. Gracias.\n"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16519,103 +19177,99 @@ msgstr "empaquetar todo"
 msgid "prune loose refs (default)"
 msgstr "recortar refs perdidos (default)"
 
-#: builtin/prune-packed.c:9
+#: 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-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "Removiendo objetos duplicados"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "reportar objetos recortados"
 
-#: builtin/prune.c:134
+#: 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:136
+#: 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:150
+#: builtin/prune.c:152
 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:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valor inválido para %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 "git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
 
-#: builtin/pull.c:142
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "control de fetch recursivo en submódulos"
 
-#: builtin/pull.c:146
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Opciones relacionadas a fusión"
 
-#: builtin/pull.c:149
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporar cambios por rebase en lugar de fusión"
 
-#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "permitir fast-forward"
 
-#: builtin/pull.c:186
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase"
+#: builtin/pull.c:167 parse-options.h:340
+msgid "automatically stash/stash pop before and after"
+msgstr "ejecutar automáticamente stash/stash pop antes y después"
 
-#: builtin/pull.c:202
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Opciones relacionadas a fetch"
 
-#: builtin/pull.c:212
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "forzar sobrescritura de la rama local"
 
-#: builtin/pull.c:220
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "número de submódulos que realizan pull en paralelo"
 
-#: builtin/pull.c:320
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor inválido para pull.ff: %s"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:447
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "No hay candidatos para fusionar entre las refs que has bajado con fetch."
 
-#: builtin/pull.c:440
+#: builtin/pull.c:448
 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:443
+#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16626,78 +19280,103 @@ 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:448 builtin/rebase.c:1347 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1248
 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:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
 msgid "Please specify which branch you want to rebase against."
 msgstr "Por favor especifica a qué rama quieres rebasar."
 
-#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
 msgid "Please specify which branch you want to merge with."
 msgstr "Por favor especifica a qué rama quieres fusionar."
 
-#: builtin/pull.c:453 builtin/pull.c:468
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
 msgstr "Ver git-pull(1) para detalles."
 
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1353 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr "<remoto>"
 
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "<rama>"
 
-#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1246
 msgid "There is no tracking information for the current branch."
 msgstr "No hay información de rastreo para la rama actual."
 
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: builtin/pull.c:480
 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:477
+#: 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 ""
 "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:587
+#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr "no es posible acceder al commit %s"
 
-#: builtin/pull.c:867
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorando --verify-signatures para rebase"
 
-#: builtin/pull.c:922
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "La opción --[no-]autostash sólo es válida con --rebase."
-
 #: builtin/pull.c: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 ""
+"Hacer un pull sin especificar cómo reconciliar las ramas es poco\n"
+"recomendable. Puedes eliminar este mensaje usando uno de los\n"
+"siguientes comandos antes de tu siguiente pull:\n"
+"\n"
+"  git config pull.rebase false  # hacer merge (estrategia por defecto)\n"
+"  git config pull.rebase true   # aplicar rebase\n"
+"  git config pull.ff only       # aplicar solo fast-forward\n"
+"\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 sobrescribir la configuración\n"
+"por defecto en cada invocación.\n"
+"\n"
+
+#: builtin/pull.c:990
 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:934
+#: builtin/pull.c:994
 msgid "pull with rebase"
 msgstr "pull con rebase"
 
-#: builtin/pull.c:935
+#: builtin/pull.c:995
 msgid "please commit or stash them."
 msgstr "por favor realiza un commit o un stash con ellos."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:1020
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16708,7 +19387,7 @@ msgstr ""
 "realizando fast-forward al árbol de trabajo\n"
 "desde commit %s."
 
-#: builtin/pull.c:966
+#: builtin/pull.c:1026
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16719,21 +19398,21 @@ 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 asegurarse que haya guardado todo lo preciado de la salida de\n"
 "$ git diff %s\n"
 ",ejecute\n"
 "$ git reset --hard\n"
 "para recuperar."
 
-#: builtin/pull.c:981
+#: builtin/pull.c:1041
 msgid "Cannot merge multiple branches into empty head."
 msgstr "No se puede fusionar múltiples ramas en un head vacío."
 
-#: builtin/pull.c:985
+#: builtin/pull.c:1045
 msgid "Cannot rebase onto multiple branches."
 msgstr "No se puede rebasar en múltiples ramas."
 
-#: builtin/pull.c:992
+#: builtin/pull.c:1065
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "no se puede rebasar con modificaciones de submódulos grabadas localmente"
@@ -16741,17 +19420,17 @@ 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>"
 msgstr "taquigrafía de tag sin <tag>"
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete solo acepta como objetivos nombres de ref planos"
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16760,7 +19439,7 @@ msgstr ""
 "Para elegir si la opción es permanente, mira push.default en 'git help "
 "config'."
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16785,7 +19464,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16800,7 +19479,7 @@ msgstr ""
 "\n"
 "\tgit push %s HEAD:<nombre-de-rama-remota>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16814,12 +19493,19 @@ msgstr ""
 "\n"
 "\tgit push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: 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:210
+#: 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"
@@ -16830,13 +19516,7 @@ msgstr ""
 "la rama actual '%s', sin decirme qué poner en el push\n"
 "para actualizar en qué rama de remoto."
 
-#: builtin/push.c:269
-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:276
+#: 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"
@@ -16848,20 +19528,20 @@ 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:282
+#: 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 ""
-"Actualizaciones fueron rechazadas porque una punta de rama en el push está \n"
+"Actualizaciones fueron rechazadas porque una punta de rama en el push está\n"
 "detrás de su contraparte remota. Verifique esta rama e integre los cambios "
 "remotos\n"
 "(ejem. 'git pull ...') antes de volver a hacer push.\n"
 "Vea las 'Notes about fast-forwards' en 'git push --help' para más detalles."
 
-#: builtin/push.c:288
+#: 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"
@@ -16870,119 +19550,136 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 "Actualizaciones fueron rechazadas porque el remoto contiene trabajo que\n"
-"no existe localmente. Esto es causado usualmente por otro repositorio \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"
 "remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
-"Vea 'Notes about fast-forwards0 en 'git push --help' para detalles."
+"Vea 'Notes about fast-forwards' en 'git push --help' para detalles."
 
-#: builtin/push.c:295
+#: 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:298
+#: 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:359
+#: 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 punta de la rama de seguimiento\n"
+"remoto se ha actualizado desde la última vez que se realizó checkout. Es "
+"posible que desee\n"
+"integrar esos cambios localmente (por ejemplo, 'git pull ...')\n"
+"antes de forzar una actualización.\n"
+
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Haciendo push a %s\n"
 
-#: builtin/push.c:366
+#: 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:541
+#: builtin/push.c:544
 msgid "repository"
 msgstr "repositorio"
 
-#: builtin/push.c:542 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "realizar push a todas las refs"
 
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "realizar mirror a todas las refs"
 
-#: builtin/push.c:545
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "borrar refs"
 
-#: builtin/push.c:546
+#: 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:549 builtin/send-pack.c:167
+#: builtin/push.c:552 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "forzar actualizaciones"
 
-#: builtin/push.c:551 builtin/send-pack.c:181
+#: builtin/push.c:553 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
 msgstr "<refname>:<expect>"
 
-#: builtin/push.c:552 builtin/send-pack.c:182
+#: builtin/push.c:554 builtin/send-pack.c:205
 msgid "require old value of ref to be at this value"
-msgstr "requiere haber valor viejo de ref en este valor"
+msgstr "requiere que el valor viejo de ref sea este valor"
+
+#: builtin/push.c:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "requieren que las actualizaciones remotas se integren localmente"
 
-#: builtin/push.c:555
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "controlar push recursivo de submódulos"
 
-#: builtin/push.c:557 builtin/send-pack.c:175
+#: builtin/push.c:561 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "usar empaquetado delgado"
 
-#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
 msgid "receive pack program"
-msgstr "recibir programa de paquete"
+msgstr "programa de recepción de paquetes"
 
-#: builtin/push.c:560
+#: 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:563
+#: builtin/push.c:567
 msgid "prune locally removed refs"
-msgstr "recortando refs eliminadas localmente"
+msgstr "recortar refs eliminadas localmente"
 
-#: builtin/push.c:565
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "hacer un bypass al hook pre-push"
 
-#: builtin/push.c:566
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "realizar push de tags faltantes pero relevantes"
 
-#: builtin/push.c:569 builtin/send-pack.c:169
+#: builtin/push.c:572 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "Firmar con GPG el push"
 
-#: builtin/push.c:571 builtin/send-pack.c:176
+#: builtin/push.c:574 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
 msgstr "solicitar transacción atómica en el lado remoto"
 
-#: builtin/push.c:589
+#: 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:591
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete no tiene sentido sin ninguna referencia"
 
-#: builtin/push.c:611
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "mal repositorio '%s'"
 
-#: builtin/push.c:612
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -17000,66 +19697,78 @@ 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:627
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
 msgstr "--all y --tags son incompatibles"
 
-#: builtin/push.c:629
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all no puede ser combinada con refspecs"
 
-#: builtin/push.c:633
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror y --tags son incompatibles"
 
-#: builtin/push.c:635
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror no puede ser combinado con refspecs"
 
-#: builtin/push.c:638
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
 msgstr "--all y --mirror son incompatibles"
 
-#: builtin/push.c:642
+#: 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:8
+#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 "git range-diff [<opciones>] <base-vieja>..<punta-vieja> <base-nueva>..<punta-"
 "nueva>"
 
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<opciones>] <punta-vieja>...<punta-nueva>"
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<opciones>] <base> <punta-vieja> <punta-nueva>"
 
-#: builtin/range-diff.c:21
-msgid "Percentage by which creation is weighted"
-msgstr "Porcentaje por el cual la creación es pesada"
-
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "usar colores simples de diff"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "notas"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "pasado a 'git log'"
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "solo emite salida relacionada con el primer rango"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "solo emite salida relacionada con el segundo rango"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
-msgid "no .. in range: '%s'"
-msgstr "no .. en rango: '%s'"
+msgid "not a commit range: '%s'"
+msgstr "no es un rango de commit: '%s'"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "argumento único de formato debe ser un rango simétrico"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "se necesitan dos rangos de commits"
 
@@ -17092,11 +19801,11 @@ msgstr "realizar un merge en adición a una lectura"
 
 #: builtin/read-tree.c:133
 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
 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
 msgid "same as -m, but discard unmerged entries"
@@ -17132,17 +19841,21 @@ msgstr "no actualizar el índice o el árbol de trabajo"
 
 #: builtin/read-tree.c:151
 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
 msgid "debug unpack-trees"
-msgstr "debug de árboles-desempacados"
+msgstr "debug unpack-trees"
 
 #: builtin/read-tree.c:157
 msgid "suppress feedback messages"
 msgstr "suprimir mensajes de feedback"
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Necesitas resolver tu índice actual primero"
+
+#: builtin/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -17150,226 +19863,203 @@ msgstr ""
 "git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
 
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [opciones] [--exec <cmd>] [--onto <newbase>] --root[<rama>]"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: 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:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "no se pudo escribir '%s'."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "¿Sin HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:311
 #, c-format
 msgid "could not create temporary %s"
 msgstr "no se pudo crear archivo temporal %s"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:317
 msgid "could not mark as interactive"
 msgstr "no se pudo marcar como interactivo"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:370
 msgid "could not generate todo list"
 msgstr "no se pudo generar lista de pendientes"
 
-#: builtin/rebase.c:383
+#: builtin/rebase.c:412
 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:438
+#: builtin/rebase.c:481
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<opciones>]"
 
-#: builtin/rebase.c:450
-msgid "keep empty commits"
-msgstr "mantener commits vacíos"
+#: builtin/rebase.c:494 builtin/rebase.c:1389
+msgid "keep commits which start empty"
+msgstr "mantener commits que comiencen con vacío"
 
-#: builtin/rebase.c:452 builtin/revert.c:128
+#: builtin/rebase.c:498 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "permitir commits con mensajes vacíos"
 
-#: builtin/rebase.c:453
+#: builtin/rebase.c:500
 msgid "rebase merge commits"
-msgstr "rebasando commits de fusión"
+msgstr "rebasar commits de fusión"
 
-#: builtin/rebase.c:455
+#: builtin/rebase.c:502
 msgid "keep original branch points of cousins"
-msgstr "mantener puntos originales de la rama de sus primos"
+msgstr "mantener puntas de bifurcación originales de los primos"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:504
 msgid "move commits that begin with squash!/fixup!"
-msgstr "mover commits que comienzan con squash!/fixup!"
+msgstr "mover commits que comiencen con squash!/fixup!"
 
-#: builtin/rebase.c:458
+#: builtin/rebase.c:505
 msgid "sign commits"
 msgstr "firmar commits"
 
-#: builtin/rebase.c:460 builtin/rebase.c:1427
+#: 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:462
+#: builtin/rebase.c:509
 msgid "continue rebase"
 msgstr "continuar rebase"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:511
 msgid "skip commit"
 msgstr "saltar commit"
 
-#: builtin/rebase.c:465
+#: builtin/rebase.c:512
 msgid "edit the todo list"
 msgstr "editar la lista de pendientes"
 
-#: builtin/rebase.c:467
+#: builtin/rebase.c:514
 msgid "show the current patch"
 msgstr "mostrar el parche actual"
 
-#: builtin/rebase.c:470
+#: 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:472
+#: 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:474
+#: builtin/rebase.c:521
 msgid "check the todo list"
 msgstr "revisar la lista de pendientes"
 
-#: builtin/rebase.c:476
+#: builtin/rebase.c:523
 msgid "rearrange fixup/squash lines"
-msgstr "reorganizar líneas fixup/squash"
+msgstr "reordenar líneas fixup/squash"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:525
 msgid "insert exec commands in todo list"
 msgstr "insertar comando exec en la lista de pendientes"
 
-#: builtin/rebase.c:479
+#: builtin/rebase.c:526
 msgid "onto"
-msgstr "hacia"
+msgstr "sobre"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict-revision"
 msgstr "restrict-revision"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict revision"
 msgstr "restringir revision"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:531
 msgid "squash-onto"
 msgstr "squash-onto"
 
-#: builtin/rebase.c:485
+#: builtin/rebase.c:532
 msgid "squash onto"
-msgstr "squash hacia"
+msgstr "squash a"
 
-#: builtin/rebase.c:487
+#: builtin/rebase.c:534
 msgid "the upstream commit"
 msgstr "el commit de upstream"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head-name"
 msgstr "head-name"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head name"
 msgstr "nombre de head"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:541
 msgid "rebase strategy"
 msgstr "estrategia de rebase"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:542
 msgid "strategy-opts"
 msgstr "strategy-opts"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:543
 msgid "strategy options"
 msgstr "opciones de estrategia"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:544
 msgid "switch-to"
 msgstr "cambiar a"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
 msgid "the branch or commit to checkout"
 msgstr "la rama o commit para hacer checkout"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto-name"
-msgstr "hacia-nombre"
+msgstr "sobre-nombre"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto name"
-msgstr "hacia nombre"
+msgstr "sobre nombre"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "cmd"
 msgstr "cmd"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "the command to run"
 msgstr "el comando para ejecutar"
 
-#: builtin/rebase.c:503 builtin/rebase.c:1510
+#: 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:519
+#: 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:535
+#: builtin/rebase.c:582
 #, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s requiere un rebase interactivo"
+msgid "%s requires the merge backend"
+msgstr "%s requiere un backend de fusión"
 
-#: builtin/rebase.c:587
+#: builtin/rebase.c:625
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "no se pudo conseguir 'onto': '%s'"
 
-#: builtin/rebase.c:602
+#: builtin/rebase.c:642
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head inválido: '%s'"
 
-#: builtin/rebase.c:627
+#: builtin/rebase.c:667
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignorando inválido allow_rerere_autoupdate: '%s'"
 
-#: builtin/rebase.c:703
-#, c-format
-msgid "Could not read '%s'"
-msgstr "No se pudo leer '%s'"
-
-#: builtin/rebase.c:721
-#, c-format
-msgid "Cannot store %s"
-msgstr "No se puede guardar %s"
-
-#: builtin/rebase.c:828
-msgid "could not determine HEAD revision"
-msgstr "no se pudo determinar revisión HEAD"
-
-#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
+#: 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"
@@ -17377,14 +20067,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"
+"Resuelva todos los conflictos manualmente ya sea con\n"
 "\"git add/rm <archivo_conflictivo>\", luego ejecute \"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:1032
+#: builtin/rebase.c:896
 #, c-format
 msgid ""
 "\n"
@@ -17403,7 +20093,16 @@ msgstr ""
 "\n"
 "Como resultado, git no puede hacer rebase con ellos."
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1222
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"tipo '%s' vacío y desconocido; valores válidos son \"drop\", \"keep\", y "
+"\"ask\"."
+
+#: builtin/rebase.c:1240
 #, c-format
 msgid ""
 "%s\n"
@@ -17420,7 +20119,7 @@ msgstr ""
 "    git rebase '<rama>'\n"
 "\n"
 
-#: builtin/rebase.c:1355
+#: builtin/rebase.c:1256
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17433,170 +20132,184 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<rama> %s\n"
 "\n"
 
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1286
 msgid "exec commands cannot contain newlines"
 msgstr "comandos exec no pueden contener newlines"
 
-#: builtin/rebase.c:1389
+#: builtin/rebase.c:1290
 msgid "empty exec command"
 msgstr "comando exec vacío"
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1319
 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:1420
+#: builtin/rebase.c:1321
 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:1422
+#: builtin/rebase.c:1323
 msgid "allow pre-rebase hook to run"
 msgstr "permitir ejecutar hook pre-rebase"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1325
 msgid "be quiet. implies --no-stat"
-msgstr "ser silencioso implica --no-stat"
+msgstr "ser silencioso. implica --no-stat"
 
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1331
 msgid "do not show diffstat of what changed upstream"
 msgstr "no mostrar un diffstat de lo que cambió en upstream"
 
-#: builtin/rebase.c:1433
-msgid "add a Signed-off-by: line to each commit"
-msgstr "agregar una línea \"Firmado-por\" al mensaje de cada commit"
+#: builtin/rebase.c:1334
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "agregar una línea \"Signed-off-by\" al mensaje de cada commit"
+
+#: builtin/rebase.c:1337
+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
+msgid "ignore author date and use current date"
+msgstr "ignorar la fecha del autor y usar la fecha actual"
 
-#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
-msgid "passed to 'git am'"
-msgstr "pasado a 'git am'"
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr "sinónimo para --reset-author-date"
 
-#: builtin/rebase.c:1443 builtin/rebase.c:1445
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
 msgid "passed to 'git apply'"
-msgstr "pasado a 'git-apply'"
+msgstr "pasado a 'git apply'"
+
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr "ignorar cambios en espacios en blanco"
 
-#: builtin/rebase.c:1447 builtin/rebase.c:1450
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "cherry-pick todos los commits, incluso si no han cambiado"
 
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1354
 msgid "continue"
 msgstr "continuar"
 
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1357
 msgid "skip current patch and continue"
 msgstr "saltar el parche y continuar"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1359
 msgid "abort and check out the original branch"
 msgstr "aborta y revisa la rama original"
 
-#: builtin/rebase.c:1460
+#: builtin/rebase.c:1362
 msgid "abort but keep HEAD where it is"
 msgstr "aborta pero mantiene HEAD donde está"
 
-#: builtin/rebase.c:1461
+#: builtin/rebase.c:1363
 msgid "edit the todo list during an interactive rebase"
 msgstr "editar la lista de pendientes durante el rebase interactivo"
 
-#: builtin/rebase.c:1464
+#: builtin/rebase.c:1366
 msgid "show the patch file being applied or merged"
 msgstr "muestra el archivo parche siendo aplicado o fusionado"
 
-#: builtin/rebase.c:1467
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "usar estrategias de apply para el rebase"
+
+#: builtin/rebase.c:1373
 msgid "use merging strategies to rebase"
 msgstr "usar estrategias de fusión para el rebase"
 
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1377
 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:1475
+#: builtin/rebase.c:1381
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(DEPRECADO) intentar recrear merges en lugar de ignorarlos"
 
-#: builtin/rebase.c:1479
-msgid "preserve empty commits during rebase"
-msgstr "preservar commits vacíos durante el rebase"
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
+msgstr "como manejar commits que se vuelven vacíos"
 
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1393
 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:1487
-msgid "automatically stash/stash pop before and after"
-msgstr "ejecutar automáticamente stash/stash pop antes y después"
-
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1400
 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:1493
+#: builtin/rebase.c:1404
 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:1496
+#: builtin/rebase.c:1408
 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:1499
+#: builtin/rebase.c:1411
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "use 'merge-base --fork-point' para refinar upstream"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1413
 msgid "use the given merge strategy"
 msgstr "usar la estrategia de merge dada"
 
-#: builtin/rebase.c:1503 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
 msgid "option"
 msgstr "opción"
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1416
 msgid "pass the argument through to the merge strategy"
 msgstr "pasar el argumento para la estrategia de fusión"
 
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1419
 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:1524
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
+#: builtin/rebase.c:1424
+msgid "apply all changes, even those already present upstream"
 msgstr ""
-"el soporte para rebase.useBuiltin ha sido eliminado!\n"
-"Vea su entrada en 'git help config' para detalles."
+"aplicar todos los cambios, incluso aquellos que ya están presentes en "
+"upstream"
 
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1442
 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:1571
+#: 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:1576
+#: builtin/rebase.c:1488
 msgid "cannot combine '--keep-base' with '--onto'"
 msgstr "no se puede combinar '--keep-base' con '--onto'"
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1490
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr "no se puede combinar '--keep-base' con '--root'"
 
-#: builtin/rebase.c:1582
+#: builtin/rebase.c:1494
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "no se puede combinar '--root' con '--fork-point'"
+
+#: builtin/rebase.c:1497
 msgid "No rebase in progress?"
 msgstr "¿No hay rebase en progreso?"
 
-#: builtin/rebase.c:1586
+#: builtin/rebase.c:1501
 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:1609
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "No se puede leer el HEAD"
 
-#: builtin/rebase.c:1621
+#: builtin/rebase.c:1536
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17604,16 +20317,16 @@ msgstr ""
 "Tienes que editar todos los conflictos de fusión y luego\n"
 "marcarlos como resueltos usando git add"
 
-#: builtin/rebase.c:1640
+#: builtin/rebase.c:1555
 msgid "could not discard worktree changes"
 msgstr "no se pudo descartar los cambios del árbol de trabajo"
 
-#: builtin/rebase.c:1659
+#: builtin/rebase.c:1574
 #, c-format
 msgid "could not move back to %s"
 msgstr "no se puede regresar a %s"
 
-#: builtin/rebase.c:1704
+#: builtin/rebase.c:1620
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17626,7 +20339,7 @@ msgid ""
 "valuable there.\n"
 msgstr ""
 "Parece que ya hay un directorio %s, y\n"
-"me pregunto si estás en medio de otro rebase. Si ese es el \n"
+"me pregunto si estás en medio de otro rebase. Si ese es el\n"
 "caso, por favor intenta\n"
 "\t%s\n"
 "Si no es el caso, por favor\n"
@@ -17634,168 +20347,144 @@ msgstr ""
 "y ejecútame nuevamente. Me estoy deteniendo en caso de que tengas\n"
 "algo de valor ahí.\n"
 
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1648
 msgid "switch `C' expects a numerical value"
 msgstr "switch `C' espera un valor numérico"
 
-#: builtin/rebase.c:1766
+#: builtin/rebase.c:1690
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Modo desconocido: %s"
 
-#: builtin/rebase.c:1788
+#: builtin/rebase.c:1729
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiere --merge o --interactive"
 
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1759
+msgid "cannot combine apply options with merge options"
+msgstr "no se pueden combinar opciones de apply con opciones de merge"
+
+#: builtin/rebase.c:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Backend de rebase desconocido: %s"
+
+#: builtin/rebase.c:1802
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec requiere --exec o --interactive"
 
-#: builtin/rebase.c:1840
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"no se pueden combinar opciones de am con opciones interactivas o de merge"
-
-#: builtin/rebase.c:1859
+#: 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:1863
+#: 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:1887
+#: builtin/rebase.c:1850
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "upstream inválido '%s'"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1856
 msgid "Could not create new root commit"
 msgstr "No se pudo crear commit raíz nuevo"
 
-#: builtin/rebase.c:1919
+#: builtin/rebase.c:1882
 #, 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:1922
+#: builtin/rebase.c:1885
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': necesita exactamente una base de fusión"
 
-#: builtin/rebase.c:1930
+#: builtin/rebase.c:1893
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "No apunta a un commit válido '%s'"
 
-#: builtin/rebase.c:1955
+#: builtin/rebase.c:1921
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "fatal: no existe la rama/commit: '%s'"
 
-#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
 #, c-format
 msgid "No such ref: %s"
 msgstr "No existe ref: %s"
 
-#: builtin/rebase.c:1974
+#: builtin/rebase.c:1940
 msgid "Could not resolve HEAD to a revision"
 msgstr "No se pudo resolver HEAD a una revisión"
 
-#: builtin/rebase.c:2012
-msgid "Cannot autostash"
-msgstr "No se puede ejecutar autostash"
-
-#: builtin/rebase.c:2015
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Respuesta de stash inesperada: '%s'"
-
-#: builtin/rebase.c:2021
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "No se pudo crear el directorio para '%s'"
-
-#: builtin/rebase.c:2024
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Autostash creado: %s\n"
-
-#: builtin/rebase.c:2027
-msgid "could not reset --hard"
-msgstr "no se pudo reset --hard"
-
-#: builtin/rebase.c:2036
+#: builtin/rebase.c:1961
 msgid "Please commit or stash them."
 msgstr "Por favor, confírmalos o guárdalos."
 
-#: builtin/rebase.c:2063
-#, c-format
-msgid "could not parse '%s'"
-msgstr "no se puede analizar '%s'"
-
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:1997
 #, c-format
 msgid "could not switch to %s"
 msgstr "no se pudo cambiar a %s"
 
-#: builtin/rebase.c:2087
+#: builtin/rebase.c:2008
 msgid "HEAD is up to date."
 msgstr "HEAD está actualizado."
 
-#: builtin/rebase.c:2089
+#: builtin/rebase.c:2010
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La rama actual %s está actualizada.\n"
 
-#: builtin/rebase.c:2097
+#: builtin/rebase.c:2018
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD está actualizado, rebase forzado."
 
-#: builtin/rebase.c:2099
+#: builtin/rebase.c:2020
 #, 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:2107
+#: builtin/rebase.c:2028
 msgid "The pre-rebase hook refused to rebase."
 msgstr "El hook pre-rebase rechazó el rebase."
 
-#: builtin/rebase.c:2114
+#: builtin/rebase.c:2035
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Cambios a %s:\n"
 
-#: builtin/rebase.c:2117
+#: builtin/rebase.c:2038
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Cambios desde %s a %s:\n"
 
-#: builtin/rebase.c:2142
+#: builtin/rebase.c:2063
 #, 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:2151
+#: builtin/rebase.c:2072
 msgid "Could not detach HEAD"
 msgstr "No se puede desacoplar HEAD"
 
-#: builtin/rebase.c:2160
+#: builtin/rebase.c:2081
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avance rápido de %s a %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:830
+#: 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"
@@ -17828,7 +20517,7 @@ msgstr ""
 "Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
 "configura 'receive.denyCurrentBranch' a 'refuse'."
 
-#: builtin/receive-pack.c:850
+#: 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"
@@ -17840,20 +20529,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:1936
+#: builtin/receive-pack.c:2478
 msgid "quiet"
-msgstr "tranquilo"
+msgstr "silencioso"
 
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:2492
 msgid "You must specify a directory."
 msgstr "Se tiene que especificar un directorio."
 
@@ -17879,49 +20568,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog existe <ref>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' no es una marca de tiempo válida"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:609
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Marcando objectos alcanzables..."
 
-#: builtin/reflog.c:643
+#: 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:695
+#: builtin/reflog.c:699
 msgid "no reflog specified to delete"
 msgstr "no reflog especificado para borrar"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:708
 #, c-format
 msgid "not a reflog: %s"
 msgstr "no es una reflog: %s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:713
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "no reflog para '%s'"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:759
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "formato inválido: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:768
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -17929,82 +20618,82 @@ msgstr ""
 "git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nombre> <url>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <viejo> <nuevo>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <nombre>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nombre>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nombre>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nombre> <rama>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nombre>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nombre> <nuevo-url>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nombre> <url>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opciones>] <nombre> <url>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nombre> <rama>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nombre> <rama>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opciones>] <nombre>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opciones>] <nombre>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Actualizando %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -18012,105 +20701,116 @@ msgstr ""
 "Usar --mirror es peligroso y está desaprobado;\n"
 "\t usa más bien --mirror=fetch o --mirror=push"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argumento mirror desconocido: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "realizar fetch a las ramas remotas"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "importar todos los tags y objetos asociados cuando realiza el fetch"
 
-#: builtin/remote.c:168
+#: 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:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "rama(s) para rastrear"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "rama master"
 
-#: builtin/remote.c:173
+#: 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:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "especificar una rama master no tiene sentido con --mirror"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 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:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr "remoto %s ya existe."
 
-#: builtin/remote.c:198 builtin/remote.c:640
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' no es un nombre remoto válido"
-
-#: builtin/remote.c:238
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "No se pudo configurar master '%s'"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:355
 #, 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:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr "(concordando)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:466
 msgid "(delete)"
 msgstr "(eliminar)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "no se pudo configurar '%s'"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"La configuración %s remote.pushDefault en:\n"
+"\t%s:%d\n"
+"ahora nombra al remoto inexistente '%s'"
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "No existe el remoto '%s'"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:710
 #, 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:666
+#: builtin/remote.c:730
 #, 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."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
-msgstr "borrando '%s' falló"
+msgstr "borrar '%s' falló"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
-msgstr "creando '%s' falló"
+msgstr "crear '%s' falló"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18125,118 +20825,118 @@ msgstr[1] ""
 "eliminadas;\n"
 "para borrarlas, use:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "No se pudo borrar la sección de configuración '%s'"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:999
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " rastreada"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
-msgstr " viejo ( use 'git remote prune' para eliminar)"
+msgstr " viejo (use 'git remote prune' para eliminar)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
 #, 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:974
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebasa interactivamente en remoto %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1058
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "rebasa interactivamente (con fusiones) en remoto %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebasa sobre el remoto %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr " se fusiona con remoto %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusiona con remoto %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s y con el remoto %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
 msgid "create"
 msgstr "crear"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr "borrar"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "actualizado"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
-msgstr "puede realizar fast-forward"
+msgstr "se puede realizar fast-forward"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "desactualizado local"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s fuerza a %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s publica a %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s fuerza a %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s publica a %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr "no consultar remotos"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL  para obtener: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr "(sin URL)"
 
@@ -18244,336 +20944,337 @@ msgstr "(sin URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL para publicar: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Rama HEAD: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr "(no consultado)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "(desconocido)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
 #, 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:1195
+#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Rama remota:%s"
 msgstr[1] "  Ramas remotas:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr " (estado no consultado)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
 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:1215
+#: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Las referencias locales serán reflejadas por 'git push'"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1303
 #, 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:1242
+#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "borrar refs/remotos/<nombre>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr "No se puede determinar el HEAD remoto"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
 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:1271
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr "No se pudo borrar %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "No es un ref válido: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr "No se pudo configurar %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
-msgstr " ¡%s será colgado!"
+msgstr " ¡%s se volverá colgante!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
-msgstr " ¡%s ha sido colgado!"
+msgstr " ¡%s se ha vuelto colgante!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "Recortando %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
-msgstr " * [ejecutará prune] %s"
+msgstr " * [se acortará] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [prune realizado] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr "recortar remotos tras realizar fetch"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr "No existe el remoto '%s'"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "agregar rama"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr "no hay remotos especificados"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
 msgid "query push URLs rather than fetch URLs"
 msgstr "consultar URLs de push en lugar de URLs de fetch"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "retornar todos los URLs"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "no hay URLs configurados para remoto '%s'"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "manipular URLs de push"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "agregar URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "borrar URLs"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete no tiene sentido"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Patrón de URL viejo inválido: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
 msgstr "No se encontró URL: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
-msgstr "No borrará todos los URLs de no-push"
-
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Sub-comando desconocido: %s"
+msgstr "No borrará todos los URLs no de push"
 
-#: builtin/repack.c:23
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr "git repack [<opciones>]"
 
-#: builtin/repack.c:28
+#: 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 ""
-"Re empaquetados incrementales son incompatibles con índices bitmap. Use \n"
+"Reempaquetados incrementales son incompatibles con índices bitmap. Use\n"
 "--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
 
-#: builtin/repack.c:191
+#: builtin/repack.c:198
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "no se puede iniciar pack-objects para reempaquetar objetos promisores"
 
-#: builtin/repack.c:230 builtin/repack.c:409
+#: builtin/repack.c:270 builtin/repack.c:630
 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:247
+#: builtin/repack.c:294
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "no se puede finalizar pack-objects para reempaquetar objetos promisores"
 
-#: builtin/repack.c:285
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr "no se puede abrir index para %s"
+
+#: builtin/repack.c:368
+#, 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"
+
+#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "pack %s es muy grande para hacer un roll up"
+
+#: builtin/repack.c:460
 msgid "pack everything in a single pack"
 msgstr "empaquetar todo en un único paquete"
 
-#: builtin/repack.c:287
+#: builtin/repack.c:462
 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:290
+#: builtin/repack.c:465
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "eliminar paquetes redundantes, y ejecutar git-prune-packed"
 
-#: builtin/repack.c:292
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "pasar --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:294
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "pasar --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:296
+#: builtin/repack.c:471
 msgid "do not run git-update-server-info"
 msgstr "no ejecutar git-update-server-info"
 
-#: builtin/repack.c:299
+#: builtin/repack.c:474
 msgid "pass --local to git-pack-objects"
 msgstr "pasar --local a git-pack-objects"
 
-#: builtin/repack.c:301
+#: builtin/repack.c:476
 msgid "write bitmap index"
 msgstr "escribir un índice de bitmap"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:478
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "pasar --delta-islands a git-pack-objects"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:479
 msgid "approxidate"
-msgstr "aproxime"
+msgstr "approxidate"
 
-#: builtin/repack.c:305
+#: builtin/repack.c:480
 msgid "with -A, do not loosen objects older than this"
 msgstr "con -A, no perder objetos más antiguos que este"
 
-#: builtin/repack.c:307
+#: builtin/repack.c:482
 msgid "with -a, repack unreachable objects"
-msgstr "con -a, re empaquetar objetos inalcanzables"
+msgstr "con -a, reempaquetar objetos inalcanzables"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:484
 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:310 builtin/repack.c:316
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr "bytes"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:486
 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:313
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr "limita la profundidad máxima del delta"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:490
 msgid "limits the maximum number of threads"
 msgstr "limita el número máximo de hilos"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:492
 msgid "maximum size of each packfile"
 msgstr "tamaño máximo de cada paquete"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:494
 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:321
+#: builtin/repack.c:496
 msgid "do not repack this pack"
 msgstr "no reempaquetar este paquete"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr "encontrar una progresión geométrica con factor <N>"
+
+#: builtin/repack.c:508
 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:335
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable y -A son incompatibles"
 
-#: builtin/repack.c:418
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric es incompatible con -A, -a"
+
+#: builtin/repack.c:639
 msgid "Nothing new to pack."
 msgstr "Nada nuevo para empaquetar."
 
-#: builtin/repack.c:479
+#: builtin/repack.c:669
 #, 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 "missing required file: %s"
+msgstr "falta archivo requerido: %s"
 
-#: builtin/repack.c:527
+#: builtin/repack.c:671
 #, c-format
-msgid "failed to remove '%s'"
-msgstr "falló al eliminar'%s'"
+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>"
@@ -18607,12 +21308,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
@@ -18632,8 +21333,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
@@ -18668,14 +21369,14 @@ 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"
 msgstr "incapaz de escribir el objeto en la base de datos"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
-#: builtin/replace.c:453
+#: 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 "nombre de objeto no válido: '%s'"
@@ -18683,7 +21384,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"
@@ -18699,17 +21400,17 @@ msgstr "nuevo objeto es igual al antiguo: '%s'"
 msgid "could not parse %s as a commit"
 msgstr "no se pudo analizar %s como un commit"
 
-#: builtin/replace.c:415
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mal mergetag en commit '%s'"
 
-#: builtin/replace.c:417
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "mergetag mal formado en commit '%s'"
 
-#: builtin/replace.c:429
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18718,31 +21419,31 @@ msgstr ""
 "commit original '%s' contiene un mergetag '%s' que es descartado; use --edit "
 "en lugar de --graft"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "el commit original '%s' tiene una firma gpg"
 
-#: builtin/replace.c:469
+#: 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:479
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "no se pudo escribir el commit de reemplazo: '%s'"
 
-#: builtin/replace.c:487
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft para '%s' innecesario"
 
-#: builtin/replace.c:491
+#: 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:526
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -18751,71 +21452,71 @@ msgstr ""
 "no se pudo convertir el siguiente graft(s):\n"
 "%s"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "listar replace refs"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "borrar replace refs"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "editar objeto existente"
 
-#: builtin/replace.c:550
+#: 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:551
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "convertir archivo graft existente"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "reemplazar el ref si este existe"
 
-#: builtin/replace.c:554
+#: 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:555
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "usar este formato"
 
-#: builtin/replace.c:568
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format no puede ser usado cuando no se hace listing"
 
-#: builtin/replace.c:576
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f solo tiene sentido cuando se escribe un reemplazo"
 
-#: builtin/replace.c:580
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw solo tiene sentido con --edit"
 
-#: builtin/replace.c:586
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d necesita al menos un argumento"
 
-#: builtin/replace.c:592
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "mal número de argumentos"
 
-#: builtin/replace.c:598
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e necesita exactamente un argumento"
 
-#: builtin/replace.c:604
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g necesita al menos un argumento"
 
-#: builtin/replace.c:610
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file no toma argumentos"
 
-#: builtin/replace.c:616
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "solo se puede dar un patrón con -l"
 
@@ -18823,15 +21524,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'"
@@ -18843,120 +21544,125 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<árbol-ismo>] [--] <rutas>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<árbol-ismo>] [--] <pathspec>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<árbol-ismo>] [--] [<rutas>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<árbol-ismo>]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<árbol-ismo>] [--] [<pathspec>...]"
+
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "mezclado"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "suave"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "duro"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "fusionar"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "mantener"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "No hay un HEAD válido."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 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:89
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Falló al encontrar árbol de %s."
 
-#: builtin/reset.c:114
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD está ahora en %s"
 
-#: builtin/reset.c:193
+#: builtin/reset.c:195
 #, 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:293 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
 msgid "be quiet, only report errors"
 msgstr "ser silencioso, solo reportar errores"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
-msgstr "reiniciar HEAD e index"
+msgstr "reiniciar HEAD e índice"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "reiniciar solo HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "reiniciar HEAD, índice y árbol de trabajo"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "reiniciar HEAD pero mantener cambios locales"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 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:326
+#: builtin/reset.c:344
 #, 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:334
+#: builtin/reset.c:352
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Falló al resolver '%s' como un árbol válido."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch es incompatible con --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "No se puede hacer un reset %s con rutas."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, 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:374
+#: builtin/reset.c:392
 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:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "Cambios fuera del área de stage tras el reset:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:416
 #, c-format
 msgid ""
 "\n"
@@ -18970,48 +21676,60 @@ msgstr ""
 "usar '--quiet' para evitar esto.  Configura la opción reset.quiet a true\n"
 "para volverlo en el default.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, 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:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "No se puede escribir un nuevo archivo índice."
 
-#: builtin/rev-list.c:411
+#: 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:472
+#: 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:522
+#: 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:525
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
+#: builtin/rev-list.c:679
+msgid "marked counting is incompatible with --objects"
+msgstr "conteo de marcas es incompatible con --objects"
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "mantener el `--` pasado como un arg"
 
-#: builtin/rev-parse.c:415
+#: 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:418
+#: 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:551
+#: builtin/rev-parse.c:548
+msgid "Needed a single revision"
+msgstr "Se necesitó una revisión singular"
+
+#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -19026,6 +21744,50 @@ msgstr ""
 "Ejecute \"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 desconocidopara --show-object-format: %s"
+
 #: builtin/revert.c:24
 msgid "git revert [<options>] <commit-ish>..."
 msgstr "git revert [<opciones>] <commit-ish>..."
@@ -19104,19 +21866,19 @@ msgstr "preservar commits iniciales vacíos"
 msgid "keep redundant, empty commits"
 msgstr "mantener commits redundantes, vacíos"
 
-#: builtin/revert.c:232
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr "falló al revertir"
 
-#: builtin/revert.c:245
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr "cherry-pick falló"
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opciones>] [--] <archivo>..."
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -19127,10 +21889,10 @@ 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:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -19138,13 +21900,13 @@ msgstr ""
 "\n"
 "(usa -f para forzar su eliminación)"
 
-#: 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] "el siguiente archivo tiene cambios en stage en el índice:"
 msgstr[1] "los siguientes archivos tienen cambios en stage en el índice:"
 
-#: builtin/rm.c: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)"
@@ -19152,44 +21914,48 @@ msgstr ""
 "\n"
 "(usa --cached para conservar el archivo, o -f para forzar su eliminación)"
 
-#: 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] "el siguiente archivo tiene modificaciones locales:"
 msgstr[1] "los siguientes archivos tienen modificaciones locales:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:244
 msgid "do not list removed files"
-msgstr "no listar archivos eliminado"
+msgstr "no listar archivos eliminados"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr "solo eliminar del índice"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
-msgstr "sobrescribir el check de actualizado"
+msgstr "salta el check de actualización"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr "permitir eliminar de forma recursiva"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:249
 msgid "exit with a zero status even if nothing matched"
 msgstr "salir con estado cero incluso si nada coincide"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:283
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "No se entregó un pathspec. ¿Qué archivos se deberían eliminar?"
+
+#: builtin/rm.c:310
 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:307
+#: builtin/rm.c:331
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "no eliminando '%s' de manera recursiva sin -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: no es posible eliminar %s"
@@ -19206,55 +21972,76 @@ msgstr ""
 "[<ref>...]\n"
 "  --all y especificaciones <ref> explícitas son mutuamente exclusivas."
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr "nombre remoto"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "usar protocolo RPC sin estado"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "leer refs de stdin"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr "mostrar status del remote helper"
 
-#: builtin/shortlog.c:14
+#: 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:15
+#: 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"
+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"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "tipo de grupo desconocido: %s"
 
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "Agrupar por committer en lugar de autor"
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "agrupar por committer en lugar de autor"
 
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "ordenar salida de acuerdo al número de commits por autor"
 
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "Suprimir descripción de commits, solo proveer cuenta de commits"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "suprimir descripción de commits, solo proveer cuenta de commits"
 
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "Mostrar la dirección de correo de cada autor"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "mostrar la dirección de correo de cada autor"
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr "Salida de línea"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "ajustar las líneas de salida"
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "campo"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "agrupar por campo"
+
+#: builtin/shortlog.c:391
 msgid "too many arguments given outside repository"
 msgstr "demasiados argumentos dados fuera del repositorio"
 
@@ -19296,7 +22083,7 @@ msgstr "mostrar ramas de rastreo remoto"
 
 #: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
-msgstr "color '*!+-' correspondiendo a la rama"
+msgstr "colorear '*!+-' correspondiendo a la rama"
 
 #: builtin/show-branch.c:651
 msgid "show <n> more commits after the common ancestor"
@@ -19332,11 +22119,11 @@ msgstr "mostrar commits en orden topológico"
 
 #: builtin/show-branch.c:667
 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
 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
 msgid "topologically sort, maintaining date order where possible"
@@ -19393,6 +22180,14 @@ msgstr "'%s' no es una ref válida."
 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"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "Algoritmo hash desconocido"
+
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -19423,11 +22218,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)"
@@ -19435,43 +22230,124 @@ 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>"
+msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opciones>"
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+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 es sparse (archivo sparse-checkout tal vez no "
+"existe)"
+
+#: builtin/sparse-checkout.c:227
+msgid "failed to create directory for sparse-checkout file"
+msgstr "falló al crear directorio para el archivo sparse-checkout"
+
+#: builtin/sparse-checkout.c:268
+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
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "falló al configurar opción extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "inicializa el sparse-checkout en modo cono"
+
+#: builtin/sparse-checkout.c:312
+msgid "toggle the use of a sparse index"
+msgstr "activar el uso de un índice sparse"
+
+#: builtin/sparse-checkout.c:340
+msgid "failed to modify sparse-index config"
+msgstr "falló al modificar la configuración del índice sparse"
+
+#: builtin/sparse-checkout.c:361
+#, c-format
+msgid "failed to open '%s'"
+msgstr "falló al abrir '%s'"
+
+#: builtin/sparse-checkout.c:413
+#, c-format
+msgid "could not normalize path %s"
+msgstr "no se pudo normalizar la ruta %s"
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <patrones>)"
+
+#: builtin/sparse-checkout.c:450
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "no es posible dequote la cadena de estilo C '%s'"
+
+#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "no se pudo cargar patrones de sparse-checkout existentes"
+
+#: builtin/sparse-checkout.c:573
+msgid "read patterns from standard in"
+msgstr "leer patrones de standard in"
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:607
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:638
+msgid "error while refreshing working directory"
+msgstr "error al refrescar directorio de trabajo"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<opciones>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<opciones>] [<stash>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
-#: 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] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
-msgstr "git stash branch <nombre-rama> [<stash>]"
+msgstr "git stash branch <nombre-de-rama> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28 builtin/stash.c:77
+#: 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"
+"          [--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 <mensaje>]\n"
+"          [--pathspec-from-file=<archivo> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: 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>]"
@@ -19479,189 +22355,229 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<mensaje>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <mensaje>] [-q|--quiet] <commit>"
 
-#: builtin/stash.c:127
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <mensaje>]\n"
+"          [--] [<pathspec>...]]"
+
+#: 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:147
+#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Se especificaron demasiadas revisiones: %s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "No se encontraron entradas de stash."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s no es una referencia válida"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear con parámetros no está implementado"
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
+msgstr "git stash clear con argumentos no está implementado"
 
-#: builtin/stash.c:403
+#: 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 ""
+"ADVERTENCIA: Archivo sin seguimiento en el camino de archivo con "
+"seguimiento. Renombrando\n"
+"             %s ->%s\n"
+"          Para hacer espacio.\n"
+
+#: builtin/stash.c:492
 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:414
+#: builtin/stash.c:503
 #, 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:421
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:510
+msgid "conflicts in index. Try without --index."
 msgstr "conflictos en índice. Intente sin --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:516
 msgid "could not save index tree"
-msgstr "no se puede guardar el índice del árbol"
+msgstr "no se pudo guardar el árbol de índice"
 
-#: builtin/stash.c:436
+#: 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 restaurar archivos no rastreados de la entrada stash"
 
-#: builtin/stash.c:450
+#: builtin/stash.c:539
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Fusionando %s con %s"
 
-#: builtin/stash.c:460 git-legacy-stash.sh:680
+#: builtin/stash.c:549
 msgid "Index was not unstashed."
 msgstr "El índice no fue sacado de stash."
 
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:591 builtin/stash.c:689
 msgid "attempt to recreate the index"
-msgstr "intento de recrear el index"
+msgstr "intento de recrear el índice"
 
-#: builtin/stash.c:555
+#: builtin/stash.c:635
 #, c-format
 msgid "Dropped %s (%s)"
-msgstr "Botado %s (%s)"
+msgstr "Descartado %s (%s)"
 
-#: builtin/stash.c:558
+#: builtin/stash.c:638
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: No se pudo borrar entrada stash"
 
-#: builtin/stash.c:583
+#: builtin/stash.c:651
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' no es una referencia stash"
 
-#: builtin/stash.c:633 git-legacy-stash.sh:694
+#: builtin/stash.c:701
 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:656 git-legacy-stash.sh:712
+#: builtin/stash.c:724
 msgid "No branch name specified"
 msgstr "No se especificó el nombre de la rama"
 
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "falló al analizar el árbol"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "falló al desempaquetar árboles"
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr "incluir archivos no rastreados en el stash"
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr "solo mostrar archivos no rastreados en el stash"
+
+#: builtin/stash.c:929 builtin/stash.c:966
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "No se puede actualizar %s con %s"
 
-#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
 msgid "stash message"
 msgstr "mensaje de stash"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:957
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" requiere un argumento <commit>"
 
-#: builtin/stash.c:1046 git-legacy-stash.sh:217
+#: builtin/stash.c:1171
 msgid "No changes selected"
 msgstr "Sin cambios seleccionados"
 
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1271
 msgid "You do not have the initial commit yet"
 msgstr "Aún no tienes un commit inicial"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1298
 msgid "Cannot save the current index state"
 msgstr "No se puede guardar el estado actual del índice"
 
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1307
 msgid "Cannot save the untracked files"
 msgstr "No se pueden guardar los archivos no rastreados"
 
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1318 builtin/stash.c:1327
 msgid "Cannot save the current worktree state"
 msgstr "No se puede guardar el estado actual del árbol de trabajo"
 
-#: builtin/stash.c:1229 git-legacy-stash.sh:233
+#: builtin/stash.c:1355
 msgid "Cannot record working tree state"
 msgstr "No se puede grabar el estado del árbol de trabajo"
 
-#: builtin/stash.c:1278 git-legacy-stash.sh:337
+#: builtin/stash.c:1404
 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:1294
+#: builtin/stash.c:1422
 msgid "Did you forget to 'git add'?"
 msgstr "¿Olvidaste 'git add'?"
 
-#: builtin/stash.c:1309 git-legacy-stash.sh:345
+#: builtin/stash.c:1437
 msgid "No local changes to save"
 msgstr "No hay cambios locales para guardar"
 
-#: builtin/stash.c:1316 git-legacy-stash.sh:350
+#: builtin/stash.c:1444
 msgid "Cannot initialize stash"
 msgstr "No se puede inicializar stash"
 
-#: builtin/stash.c:1331 git-legacy-stash.sh:354
+#: builtin/stash.c:1459
 msgid "Cannot save the current status"
 msgstr "No se puede guardar el estado actual"
 
-#: builtin/stash.c:1336
+#: builtin/stash.c:1464
 #, 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:1426 git-legacy-stash.sh:384
+#: builtin/stash.c:1554
 msgid "Cannot remove worktree changes"
 msgstr "No se pueden eliminar cambios del árbol de trabajo"
 
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1593 builtin/stash.c:1658
 msgid "keep index"
 msgstr "mantener index"
 
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1595 builtin/stash.c:1660
 msgid "stash in patch mode"
 msgstr "stash en modo patch"
 
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1596 builtin/stash.c:1661
 msgid "quiet mode"
 msgstr "modo tranquilo"
 
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1598 builtin/stash.c:1663
 msgid "include untracked files in stash"
 msgstr "incluir archivos sin seguimiento en stash"
 
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1600 builtin/stash.c:1665
 msgid "include ignore files"
 msgstr "incluir archivos ignorados"
 
-#: builtin/stash.c:1564
-#, c-format
-msgid "could not exec %s"
-msgstr "no se pudo ejecutar %s"
+#: builtin/stash.c:1700
+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."
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -19674,78 +22590,80 @@ 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:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
 #, 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:62
+#: 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:100
+#: 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:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
 msgid "alternative anchor for relative paths"
 msgstr "ancho alternativo para rutas relativas"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:416
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: 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 "No se encontró url para la ruta del submódulo '%s' en .gitmodules"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:526
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrando '%s'\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:529
 #, 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:547
+#: builtin/submodule--helper.c:551
 #, 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:563
-msgid "Suppress output of entering each submodule command"
-msgstr "Suprime la salida al inicializar cada comando de submódulo"
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
+msgstr "suprime la salida de inicializar cada comando de submódulo"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
-msgid "Recurse into nested submodules"
-msgstr "Recursar en submódulos anidados"
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
+msgstr "recursar en submódulos anidados"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:574
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:601
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -19754,293 +22672,375 @@ msgstr ""
 "no se pudo encontrar configuración '%s'. Asumiendo que este repositorio es "
 "su propio upstream autoritativo."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:668
 #, 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:669
+#: builtin/submodule--helper.c:672
 #, 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:679
+#: builtin/submodule--helper.c:682
 #, 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:686
+#: builtin/submodule--helper.c:689
 #, 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:708
-msgid "Suppress output for initializing a submodule"
-msgstr "Suprime la salida para inicializar un submódulo"
+#: builtin/submodule--helper.c:711
+msgid "suppress output for initializing a submodule"
+msgstr "suprime la salida de inicializar un submódulo"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:716
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opciones>] [<path>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, 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:824
+#: builtin/submodule--helper.c:837
 #, 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:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "falló al recursar en el submódulo '%s'"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
-msgid "Suppress submodule status output"
-msgstr "Suprimir output del estado del submódulo"
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
+msgstr "suprimir salida del estado del submódulo"
 
-#: builtin/submodule--helper.c:876
+#: 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 ""
-"Usar el commit guardado en el índice en lugar del guardado en el submódulo "
+"usar el commit guardado en el índice en lugar del guardado en el submódulo "
 "HEAD"
 
-#: builtin/submodule--helper.c:877
-msgid "recurse into nested submodules"
-msgstr "recursar en submódulos anidados"
-
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <ruta>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(submodule)"
+
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(submodule)->%s(blob)"
+
+#: builtin/submodule--helper.c:1007
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "no se pudo realizar hash del objeto '%s'"
+
+#: builtin/submodule--helper.c:1061
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "modo %o inesperado\n"
+
+#: builtin/submodule--helper.c:1302
+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:1304
+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:1306
+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:1308
+msgid "limit the summary size"
+msgstr "limitar el tamaño de resumen"
+
+#: builtin/submodule--helper.c:1313
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+
+#: builtin/submodule--helper.c:1337
+msgid "could not fetch a revision for HEAD"
+msgstr "no se puede obtener la revisión para HEAD"
+
+#: builtin/submodule--helper.c:1342
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached y --files son mutuamente exclusivos"
+
+#: builtin/submodule--helper.c:1409
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Sincronizando url del submódulo para '%s'\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:1415
 #, 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:990
+#: builtin/submodule--helper.c:1429
 #, 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:1001
+#: builtin/submodule--helper.c:1440
 #, 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:1048
-msgid "Suppress output of synchronizing submodule url"
-msgstr "Suprime la salida del url del submódulo que se sincroniza"
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
+msgstr "suprime la salida de sincronizar el url del submódulo"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1494
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<ruta>]"
 
-#: builtin/submodule--helper.c:1109
+#: 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)"
 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 (use 'rm -"
 "rf' si realmente quieres eliminarlo incluyendo todo en su historia)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1560
 #, 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:1129
+#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Directorio '%s' limpiado\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1570
 #, 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:1142
+#: builtin/submodule--helper.c:1581
 #, 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:1158
+#: builtin/submodule--helper.c:1597
 #, 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:1187
-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 ""
-"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:1188
-msgid "Unregister all submodules"
-msgstr "Quitar todos los submódulos"
+#: builtin/submodule--helper.c:1627
+msgid "unregister all submodules"
+msgstr "quitar todos los submódulos"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1632
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ruta>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1646
 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:1302 builtin/submodule--helper.c:1305
+#: 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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+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 "
+"con\n"
+"'--reference-if-able' en lugar de '--reference'."
+
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "submódulo '%s' no puede agregar alterno: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1768
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1775
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1800
+#, 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:1841
+#, 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:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "directorio no está vacío: '%s'"
+
+#: builtin/submodule--helper.c:1858
+#, 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:1890 builtin/submodule--helper.c:2894
 msgid "where the new submodule will be cloned to"
 msgstr "a donde el nuevo submódulo será clonado"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
 msgid "name of the new submodule"
 msgstr "nombre del nuevo submódulo"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
 msgid "url where to clone the submodule from"
 msgstr "url de dónde clonar el submódulo"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
 msgid "depth for shallow clones"
 msgstr "profundidad para clones superficiales"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
 msgid "force cloning progress"
-msgstr "forzar el proceso de clonado"
+msgstr "forzar el proceso de clonación"
+
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+msgid "disallow cloning into non-empty directory"
+msgstr "no permitir clonar en directorios no vacíos"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1916
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference "
-"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
-"<ruta>"
-
-#: builtin/submodule--helper.c:1424
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "clon de '%s' en la ruta de submódulo '%s' falló"
+"<repositorio>] [--name <nombre>] [--depth <profundidad>] [--single-branch] --"
+"url <url> --path <ruta>"
 
-#: builtin/submodule--helper.c:1438
-#, 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:1474
+#: builtin/submodule--helper.c:1953
 #, 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:1478
+#: builtin/submodule--helper.c:1957
 #, 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:1571
+#: builtin/submodule--helper.c:2058
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Ruta de submódulo '%s' no inicializada"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:2062
 msgid "Maybe you want to use 'update --init'?"
 msgstr "¿Tal vez quieres usar 'update --init'?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:2092
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Saltando submódulo %s no fusionado"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:2121
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Saltando submódulo '%s'"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:2271
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Falló al clonar '%s'. Reintento programado"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:2282
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "Falló al clonar '%s' una segunda vez, abortando"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
 msgid "path into the working tree"
-msgstr "ruta hacia el árbol de trabajo"
+msgstr "ruta al árbol de trabajo"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:2347
 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:1858
+#: builtin/submodule--helper.c:2351
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:1864
-msgid "Create a shallow clone truncated to the specified number of revisions"
-msgstr "Crea un clon superficial truncado al número especificado de revisión"
+#: builtin/submodule--helper.c:2357
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "crea un clon superficial truncado al número especificado de revisiones"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:2360
 msgid "parallel jobs"
-msgstr "trabajos paralelos"
+msgstr "tareas paralelas"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2362
 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:1870
+#: builtin/submodule--helper.c:2363
 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:1877
+#: builtin/submodule--helper.c:2374
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<ruta>] [<ruta>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:2387
 msgid "bad value for update parameter"
 msgstr "mal valor para parámetro update"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:2435
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20049,51 +23049,144 @@ msgstr ""
 "Rama de submódulo (%s) configurada para heredar rama del superproyecto, pero "
 "el superproyecto no está en ninguna rama"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2558
 #, 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:2094
+#: builtin/submodule--helper.c:2591
 msgid "recurse into submodules"
 msgstr "recurrir a submódulos"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2597
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<opciones>] [<path>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2653
 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:2159
+#: builtin/submodule--helper.c:2656
 msgid "unset the config in the .gitmodules file"
-msgstr "desconfigura la opción en elarchivo .gitmodules"
+msgstr "desconfigura la opción en el archivo .gitmodules"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2661
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nombre> [<valor>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2662
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nombre>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2663
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: 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 ""
-"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:2698
+msgid "suppress output for setting url of a submodule"
+msgstr "suprime la salida de inicializar la url de un submódulo"
+
+#: builtin/submodule--helper.c:2702
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <ruta> <nueva url>"
+
+#: builtin/submodule--helper.c:2735
+msgid "set the default tracking branch to master"
+msgstr "configurar la rama de rastreo por defecto a master"
+
+#: builtin/submodule--helper.c:2737
+msgid "set the default tracking branch"
+msgstr "configurar la rama de rastreo por defecto"
+
+#: builtin/submodule--helper.c:2741
+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:2742
+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:2749
+msgid "--branch or --default required"
+msgstr "--branch o --default requerido"
+
+#: builtin/submodule--helper.c:2752
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch y --default son mutuamente exclusivos"
+
+#: builtin/submodule--helper.c:2815
+#, 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:2818
+#, 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:2828
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr ""
+"Se encontró localmente un directorio git para '%s' con el(los) 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 ""
+"Si quiere 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'.\n"
+
+#: builtin/submodule--helper.c:2842
+#, 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:2235 git.c:433 git.c:683
+#: builtin/submodule--helper.c:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "no es posible hacer checkout al submódulo '%s'"
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr "la rama del repositorio para hacer checkout durante clonado"
+
+#: builtin/submodule--helper.c:2910
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "permitir agregar una ruta de submódulo sino ignorada"
+
+#: builtin/submodule--helper.c:2917
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <ruta> --"
+"name <nombre>"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s no soporta --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2991
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' no es un comando submodule--helper válido"
@@ -20106,23 +23199,23 @@ msgstr "git symbolic-ref [<opciones>] <nombre> [<referencia>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nombre>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "suprimir mensajes de error para refs no simbólicos (desacoplados)"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "eliminar referencia simbólica"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "salida de referencia más corta"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr "razón"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "razón de la actualización"
 
@@ -20142,27 +23235,29 @@ 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>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--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>] [--[no-]merged [<commit>]] [<patrón>...]"
+"\t\t[--format=<formato>] [--merged <commit>] [--no-merged <commit>] "
+"[<patrón>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..."
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "tag '%s' no encontrado."
 
-#: builtin/tag.c:105
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' eliminada (era %s)\n"
 
-#: builtin/tag.c:135
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -20175,7 +23270,7 @@ msgstr ""
 "  %s\n"
 "Las líneas que comienzan con '%c' serán ignoradas.\n"
 
-#: builtin/tag.c:139
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -20190,15 +23285,11 @@ msgstr ""
 "Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por "
 "ti mismo si quieres hacerlo.\n"
 
-#: builtin/tag.c:198
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "incapaz de firmar tag"
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "incapaz de escribir el archivo de 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"
@@ -20211,401 +23302,401 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:232
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "tipo de objeto erróneo."
 
-#: builtin/tag.c:284
+#: builtin/tag.c:328
 msgid "no tag message?"
-msgstr "¿Sin mensaje de tag?"
+msgstr "¿sin mensaje de tag?"
 
-#: builtin/tag.c:291
+#: builtin/tag.c:335
 #, 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:402
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr "listar nombres de tags"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr "imprimir <n> líneas de cada mensaje de tag"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr "eliminar tags"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr "verificar tags"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr "Opciones de creación de tags"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr "tags anotadas necesitan un mensaje"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:457
 msgid "tag message"
 msgstr "mensaje de tag"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:459
 msgid "force edit of tag message"
 msgstr "forzar la edición del mensaje de tag"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr "tag anotado y firmado con GPG"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr "usar otra clave para firmar el tag"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
 msgstr "remplazar tag si existe"
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "crear un reflog"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr "Opciones de listado de tag"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr "mostrar lista de tags en columnas"
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:469 builtin/tag.c:471
 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:426 builtin/tag.c:428
+#: builtin/tag.c:470 builtin/tag.c:472
 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:429
+#: builtin/tag.c:473
 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:430
+#: builtin/tag.c:474
 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:434
+#: builtin/tag.c:478
 msgid "print only tags of the object"
-msgstr "sólo imprimir tags de el objeto"
+msgstr "solo imprimir tags del objeto"
 
-#: builtin/tag.c:482
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
 msgstr "--column y -n son incompatibles"
 
-#: builtin/tag.c:504
+#: builtin/tag.c:548
 msgid "-n option is only allowed in list mode"
 msgstr "opción -n solo es permitida en modo lista"
 
-#: builtin/tag.c:506
+#: builtin/tag.c:550
 msgid "--contains option is only allowed in list mode"
 msgstr "opción --contains solo es permitido en modo lista"
 
-#: builtin/tag.c:508
+#: builtin/tag.c:552
 msgid "--no-contains option is only allowed in list mode"
 msgstr "opción --no-contains solo es permitida en modo lista"
 
-#: builtin/tag.c:510
+#: builtin/tag.c:554
 msgid "--points-at option is only allowed in list mode"
 msgstr "opción --points-at solo es permitida en modo lista"
 
-#: builtin/tag.c:512
+#: builtin/tag.c:556
 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:523
+#: builtin/tag.c:567
 msgid "only one -F or -m option is allowed."
-msgstr "sólo se permite una de las opciones, -m ó -F."
-
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "demasiados parámetros"
+msgstr "solo se permite una de las opciones, -m o -F."
 
-#: builtin/tag.c:548
+#: builtin/tag.c:592
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' no es un nombre de tag válido."
 
-#: builtin/tag.c:553
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "el tag '%s' ya existe"
 
-#: builtin/tag.c:584
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Etiqueta '%s' actualizada (era %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Desempaquetando objetos"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "falló al crear directorio %s"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "falló al crear el archivo %s"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "falló al eliminar el archivo %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "falló al eliminar directorio %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Probando mtime en '%s' "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 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:166
+#: builtin/update-index.c:167
 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:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr "info de estado del directorio cambia tras actualizar un archivo"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 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:201
+#: builtin/update-index.c:202
 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:214
+#: builtin/update-index.c:215
 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:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opciones>] [--] [<archivo>...]"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:976
 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:975
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignora submódulos"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
 msgid "do not ignore new files"
 msgstr "no ignorar archivos nuevos"
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:984
 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:982
+#: builtin/update-index.c:986
 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:984
+#: builtin/update-index.c:988
 msgid "refresh even if index contains unmerged entries"
 msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:991
 msgid "refresh stat information"
-msgstr "refresh información de estado"
+msgstr "refrescar información de estado"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "como --refresh, pero ignora configuración assume-unchanged"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<ruta>"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1000
 msgid "add the specified entry to the index"
 msgstr "agregar la entrada especificada al índice"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1010
 msgid "mark files as \"not changing\""
 msgstr "marcar archivos como \"not changing\""
 
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
 msgstr "limpiar bit assumed-unchanged"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
 msgstr "marcar archivos como \"index-only\""
 
-#: builtin/update-index.c:1015
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
 msgstr "limpiar bit skip-worktree"
 
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr "no tocar entradas index-only"
+
+#: builtin/update-index.c:1024
 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:1020
+#: builtin/update-index.c:1026
 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:1022
+#: builtin/update-index.c:1028
 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:1024
+#: builtin/update-index.c:1030
 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:1028
+#: builtin/update-index.c:1034
 msgid "add entries from standard input to the index"
 msgstr "agregar entradas de standard input al índice"
 
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1038
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "repoblar stages #2 y #3 para las rutas listadas"
 
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1042
 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:1040
+#: builtin/update-index.c:1046
 msgid "ignore files missing from worktree"
 msgstr "ignorar archivos faltantes en el árbol de trabajo"
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1049
 msgid "report actions to standard output"
 msgstr "reportar acciones por standard output"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1051
 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:1049
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr "escribir índice en este formato"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
 msgstr "activar o desactivar índice dividido"
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1059
 msgid "enable/disable untracked cache"
 msgstr "habilitar o deshabilitar caché no rastreado"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1061
 msgid "test if the filesystem supports untracked cache"
 msgstr "probar si el filesystem soporta caché no rastreado"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1063
 msgid "enable untracked cache without testing the filesystem"
 msgstr "habilitar caché no rastreado sin probar el filesystem"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1065
 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:1061
+#: builtin/update-index.c:1067
 msgid "enable or disable file system monitor"
 msgstr "activar o desactivar monitor de sistema de archivos"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1069
 msgid "mark files as fsmonitor valid"
 msgstr "marcar archivos como válidos para fsmonitor"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c:1072
 msgid "clear fsmonitor valid bit"
 msgstr "limpia el bit de validación fsmonitor"
 
-#: builtin/update-index.c:1169
+#: 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á 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:1178
+#: 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á 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:1190
+#: 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á 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:1194
+#: builtin/update-index.c:1200
 msgid "Untracked cache disabled"
 msgstr "Caché no rastreado deshabilitado"
 
-#: builtin/update-index.c:1202
+#: 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á 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:1206
+#: builtin/update-index.c:1212
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Caché no rastreado habilitado para '%s'"
 
-#: builtin/update-index.c:1214
+#: builtin/update-index.c:1220
 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:1218
+#: builtin/update-index.c:1224
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activado"
 
-#: builtin/update-index.c:1221
+#: builtin/update-index.c:1227
 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:1225
+#: builtin/update-index.c:1231
 msgid "fsmonitor disabled"
 msgstr "fsmonitor desactivado"
 
@@ -20623,19 +23714,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opciones>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "eliminar la referencia"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
-msgstr "actualiza <refname> no a lo que apunta"
+msgstr "actualiza <refname> no la a que apunta"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr "stdin tiene argumentos terminados en NUL"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr "lee actualizaciones de stdin"
 
@@ -20653,7 +23744,7 @@ msgstr "git upload-pack [<opciones>] <directorio>"
 
 #: builtin/upload-pack.c:23 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 "sale después de un solo intercambio petición/respuesta"
 
 #: builtin/upload-pack.c:25
 msgid "exit immediately after initial ref advertisement"
@@ -20679,15 +23770,15 @@ msgstr "imprimir contenido del commit"
 msgid "print raw gpg status output"
 msgstr "muestra la salida de status gpg en formato raw"
 
-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquete>..."
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "verboso"
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "solo mostrar estadísticas"
 
@@ -20699,297 +23790,298 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
 msgid "print tag contents"
 msgstr "imprimir contenido del tag"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<opciones>] <ruta> [<commit-ish>]"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opciones>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opciones>] <ruta>"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <worktree> <nueva-ruta>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opciones>]"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<opciones>] <worktree>"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <ruta>"
 
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:61 builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "falló al borrar '%s'"
 
-#: builtin/worktree.c:79
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Removiendo el worktrees/%s: no es un directorio válido"
-
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> "
-"bytes, %<PRIuMAX> leídos)"
-
-#: builtin/worktree.c:117
+#: builtin/worktree.c:74
 #, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
+msgid "Removing %s/%s: %s"
+msgstr "Eliminando %s/%s: %s"
 
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-"Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "reporta árboles de trabajo recortados"
 
-#: builtin/worktree.c:167
+#: builtin/worktree.c:149
 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:234
+#: builtin/worktree.c:219
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' ya existe"
 
-#: builtin/worktree.c:251
+#: builtin/worktree.c:228
 #, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "no es posible volver a agregar el árbol '%s'"
+msgid "unusable worktree destination '%s'"
+msgstr "destino de worktree inutilizable '%s'"
 
-#: builtin/worktree.c:256
+#: builtin/worktree.c:233
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 "'%s' es un árbol de trabajo faltante pero bloqueado;\n"
-"usa 'add -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
+"usa '%s -f -f' para sobreescribir, o 'unlock' y 'prune' o 'remove' para "
 "limpiar"
 
-#: builtin/worktree.c:258
+#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 "'%s' es un árbol de trabajo faltante pero ya registrado;\n"
-"usa 'add -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
+"usa '%s -f' para sobreescribir, o 'prune' o 'remove' para limpiar"
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:286
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "no se pudo crear directorio de '%s'"
 
-#: builtin/worktree.c:439 builtin/worktree.c:445
+#: builtin/worktree.c:308
+msgid "initializing"
+msgstr "inicializando"
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Preparando árbol de trabajo (nueva rama '%s')"
 
-#: builtin/worktree.c:441
+#: builtin/worktree.c:422
 #, 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:450
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Preparando árbol de trabajo (haciendo checkout a '%s')"
 
-#: builtin/worktree.c:456
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Preparando árbol de trabajo (HEAD desacoplado %s)"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:482
 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:500
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "crear una nueva rama"
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "crear o restablecer una rama"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "popular el nuevo árbol de trabajo"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "mantener el nuevo árbol de trabajo bloqueado"
 
-#: builtin/worktree.c:508
+#: builtin/worktree.c:492 builtin/worktree.c:729
+msgid "reason for locking"
+msgstr "razón para bloquear"
+
+#: builtin/worktree.c:495
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "configurando modo tracking (mirar git-branch(1))"
 
-#: builtin/worktree.c:511
+#: builtin/worktree.c:498
 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:519
+#: builtin/worktree.c:506
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B, y --detach son mutuamente exclusivas"
 
-#: builtin/worktree.c:580
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr "--reason requiere --lock"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "agregado con --lock"
+
+#: builtin/worktree.c:574
 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:680
-msgid "reason for locking"
-msgstr "razón para bloquear"
+#: builtin/worktree.c:691
+msgid "show extended annotations and reasons, if available"
+msgstr "mostrar anotaciones ampliadas y motivos, si están disponibles"
+
+#: builtin/worktree.c:693
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+"agregue la anotación 'podable' a los árboles de trabajo anteriores a <tiempo>"
 
-#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: builtin/worktree.c:702
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose and --porcelain son mutuamente exclusivas"
+
+#: 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 es un árbol de trabajo"
 
-#: builtin/worktree.c:694 builtin/worktree.c:727
+#: builtin/worktree.c:743 builtin/worktree.c:776
 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:699
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' ya está bloqueado; razón: %s"
 
-#: builtin/worktree.c:701
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' ya está bloqueado"
 
-#: builtin/worktree.c:729
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' no está bloqueado"
 
-#: builtin/worktree.c:770
+#: builtin/worktree.c:819
 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:778
+#: builtin/worktree.c:827
 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:801 builtin/worktree.c:928
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' es un árbol de trabajo principal"
 
-#: builtin/worktree.c:806
+#: builtin/worktree.c:855
 #, 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:812
-#, c-format
-msgid "target '%s' already exists"
-msgstr "el objetivo '%s' ya existe"
-
-#: builtin/worktree.c:820
+#: 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 se puede mover un árbol de trabajo bloqueado, motivo del bloqueo: %s\n"
-"use 'move -f -f' para sobreescribir o desbloquear primero"
+"use 'move -f -f' para forzar o desbloquear primero"
 
-#: builtin/worktree.c:822
+#: builtin/worktree.c:870
 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"
+"use 'move -f -f' para forzar o desbloquear primero"
 
-#: builtin/worktree.c:825
+#: builtin/worktree.c:873
 #, 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:830
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "falló al mover '%s' a '%s'"
 
-#: builtin/worktree.c:878
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "falló al ejecutar 'git status' en '%s'"
 
-#: builtin/worktree.c:882
+#: builtin/worktree.c:928
 #, 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, use --force para borrarlo"
 
-#: builtin/worktree.c:887
+#: builtin/worktree.c:933
 #, 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:910
+#: builtin/worktree.c:956
 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:933
+#: 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 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"
+"use 'remove -f -f' para forzar o desbloquear primero"
 
-#: builtin/worktree.c:935
+#: builtin/worktree.c:981
 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"
+"use 'remove -f -f' para forzar o desbloquear primero"
 
-#: builtin/worktree.c:938
+#: builtin/worktree.c:984
 #, 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:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr "reparar: %s: %s"
+
+#: builtin/worktree.c:1011
+#, c-format
+msgid "error: %s: %s"
+msgstr "error: %s: %s"
+
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]"
@@ -21000,74 +24092,32 @@ 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"
-
-#: fast-import.c:3118
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "se esperaba comando 'mark', se obtuvo %s"
-
-#: fast-import.c:3123
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "se esperaba comando 'to', se obtuvo %s"
-
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"Los permisos en tu directorio de socket son demasiado flojos; otros\n"
-"usuarios pueden leer sus credenciales almacenadas en caché. Considera "
-"ejecutar:\n"
-"\n"
-"\tchmod 0700 %s"
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "mostrar mensajes de debug en stderr"
-
-#: t/helper/test-reach.c:152
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "commit %s no está marcado como alcanzable"
-
-#: t/helper/test-reach.c:162
-msgid "too many commits marked reachable"
-msgstr "demasiados commits marcados como alcanzables"
+msgstr "solo útil para depurar"
 
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<opciones>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "salir inmediatamente tras anunciar capacidades"
-
-#: git.c:27
+#: git.c:28
 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"
 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "           <command> [<args>]"
 msgstr ""
 "git [--version] [--help] [-C <ruta>] [-c <nombre>=<valor>]\n"
-"           [--exec-path[=<ruta>]] [--html-path] [--man-path] [--info-path]\n"
-"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"            [--exec-path [= <path>]] [--html-path] [--man-path] [--info-"
+"path]\n"
+"            [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
 "bare]\n"
-"           [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
-"           <comando> [<args>]"
+"            [--git-dir=<ruta>] [--work-tree=<ruta>] [--namespace=<nombre>]\n"
+"            [--super-prefix=<ruta>] [--config-env=<nombre>=<envvar>]\n"
+"            <comando> [<args>]"
 
-#: git.c:34
+#: 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"
@@ -21079,47 +24129,52 @@ msgstr ""
 "para leer sobre un subcomando o concepto específico.\n"
 "Mira 'git help git' para una vista general del sistema."
 
-#: git.c:186
+#: git.c:188
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "no se entregó directorio para --git-dir\n"
 
-#: git.c:200
+#: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "no se entregó namespace para --namespace\n"
 
-#: git.c:214
+#: git.c:216
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "no se entregó directorio para --work-tree\n"
 
-#: git.c:228
+#: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "no se entregó prefijo para --super-prefix\n"
 
-#: git.c:250
+#: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c espera un string de configuración\n"
 
-#: git.c:288
+#: git.c:260
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "no se entregó una llave de config para --config-env\n"
+
+#: git.c:300
 #, c-format
 msgid "no directory given for -C\n"
 msgstr "no se entregó directorio para -C\n"
 
-#: git.c:314
+#: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "opción %s desconocida\n"
 
-#: git.c:360
+#: 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:369
+#: git.c:384
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -21128,39 +24183,39 @@ msgstr ""
 "alias '%s' cambia las variables de entorno.\n"
 "Puedes usar '!git' en el alias para hacer esto"
 
-#: git.c:376
+#: git.c:391
 #, c-format
 msgid "empty alias for %s"
 msgstr "alias vacío para %s"
 
-#: git.c:379
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr "alias recursivo: %s"
 
-#: git.c:459
+#: git.c:476
 msgid "write failure on standard output"
 msgstr "error de escritura en standard output"
 
-#: git.c:461
+#: git.c:478
 msgid "unknown write failure on standard output"
 msgstr "error desconocido de escritura en standard output"
 
-#: git.c:463
+#: git.c:480
 msgid "close failed on standard output"
 msgstr "cierre falló en standard output"
 
-#: git.c:792
+#: git.c:833
 #, 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:842
+#: git.c:883
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "no se puede manejar %s como un builtin"
 
-#: git.c:855
+#: git.c:896
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -21171,214 +24226,406 @@ msgstr ""
 "\n"
 "\n"
 
-#: git.c:875
+#: git.c:916
 #, 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:887
+#: git.c:928
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "falló al ejecutar comando '%s': %s\n"
 
-#: http.c:378
+#: http-fetch.c:118
 #, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "argumento para --packfile tiene que se un hash válido (se obtuvo '%s')"
+
+#: http-fetch.c:128
+msgid "not a git repository"
+msgstr "no es un repositorio git"
+
+#: http-fetch.c:134
+msgid "--packfile requires --index-pack-args"
+msgstr "--packfile requiere --index-pack-args"
+
+#: http-fetch.c:143
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "--index-pack-args solo se puede usar con --packfile"
+
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr "opciones no manejadas"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "error al preparar revisiones"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "commit %s no está marcado como alcanzable"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "demasiados commits marcados como alcanzables"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<opciones>]"
+
+#: t/helper/test-serve-v2.c:19
+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
+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
+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
+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
+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
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<nombre>] [<token>]"
+
+#: t/helper/test-simple-ipc.c:687
+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
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<nombre>] [<hilos>] [<cuenta de bytes>] "
+"[<tamaño de batch>]"
+
+#: t/helper/test-simple-ipc.c:696
+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
+msgid "named-pipe name"
+msgstr "nombre de named-pipe"
+
+#: t/helper/test-simple-ipc.c:700
+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
+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
+msgid "number of bytes"
+msgstr "número de bytes"
+
+#: t/helper/test-simple-ipc.c:704
+msgid "number of requests per thread"
+msgstr "númeor de peticiones por hilo"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr "byte"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr "caracter lastre"
+
+#: 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 "comando token para enviar al servidor"
 
 #: http.c:399
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "valor negativo para http.postbuffer; poniendo el default %d"
+
+#: http.c:420
 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:408
+#: 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:878
+#: http.c:910
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE no soportado con cURL < 7.44.0"
 
-#: http.c:951
+#: 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:1088
+#: http.c:1132
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Backend SSL no soportado '%s'. Backends SSL soportados:"
 
-#: http.c:1095
+#: http.c:1139
 #, 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:1099
+#: http.c:1143
 #, 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:1968
+#: http.c:2034
 #, 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:166
+#: 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:263
+#: remote-curl.c:307
 #, 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:364
+#: remote-curl.c:408
 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:395
+#: remote-curl.c:439
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "respuesta de servidor inválida; se obtuvo '%s'"
 
-#: remote-curl.c:455
+#: remote-curl.c:499
 #, c-format
 msgid "repository '%s' not found"
 msgstr "repositorio '%s' no encontrado"
 
-#: remote-curl.c:459
+#: remote-curl.c:503
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Autenticación falló para '%s'"
 
-#: remote-curl.c:463
+#: remote-curl.c:507
 #, 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:469
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirigiendo a %s"
 
-#: remote-curl.c:593
+#: remote-curl.c:644
 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:656
+msgid "remote server sent unexpected response end packet"
+msgstr "el servidor remoto envió una respuesta de fin de paquete inesperada"
 
-#: remote-curl.c:673
+#: 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:733
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: mal carácter de largo de línea: %.4s"
+
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: packet de respuesta final inesperado"
+
+#: remote-curl.c:834
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC falló; %s"
 
-#: remote-curl.c:773
+#: remote-curl.c:874
 msgid "cannot handle pushes this big"
 msgstr "no se puede manejar pushes tan grandes"
 
-#: remote-curl.c:888
+#: remote-curl.c:989
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "no se puede desinflar el request; zlib deflate error %d"
 
-#: remote-curl.c:892
+#: remote-curl.c:993
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "no se puede desinflar el request; zlib end error %d"
 
-#: remote-curl.c:1023
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d bytes de header de longitud fueron recibidos"
+
+#: remote-curl.c:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d bytes de cuerpo se siguen esperando"
+
+#: remote-curl.c:1134
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "dump http transport no soporta capacidades superficiales"
 
-#: remote-curl.c:1037
+#: remote-curl.c:1149
 msgid "fetch failed."
 msgstr "fetch falló."
 
-#: remote-curl.c:1085
+#: remote-curl.c:1195
 msgid "cannot fetch by sha1 over smart http"
 msgstr "no se puede hacer fetch por sha1 sobre smart http"
 
-#: remote-curl.c:1129 remote-curl.c:1135
+#: remote-curl.c:1239 remote-curl.c:1245
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "error de protocolo: se esperaba sha/ref, se obtuvo '%s'"
 
-#: remote-curl.c:1147 remote-curl.c:1261
+#: remote-curl.c:1257 remote-curl.c:1375
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http transport no soporta %s"
 
-#: remote-curl.c:1183
+#: remote-curl.c:1293
 msgid "git-http-push failed"
 msgstr "git-http-push falló"
 
-#: remote-curl.c:1367
+#: remote-curl.c:1481
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: uso: git remote-curl <remote> [<url>]"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1513
 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:1406
+#: remote-curl.c:1520
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: fetch intentado sin un repositorio local"
 
-#: remote-curl.c:1446
+#: remote-curl.c:1561
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: comando '%s' desconocido de git"
 
-#: list-objects-filter-options.h:85
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "no hay información disponible del compilador\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "no hay información disponible de libc\n"
+
+#: list-objects-filter-options.h:94
 msgid "args"
 msgstr "args"
 
-#: list-objects-filter-options.h:86
+#: list-objects-filter-options.h:95
 msgid "object filtering"
 msgstr "filtrado de objeto"
 
-#: parse-options.h:179
+#: parse-options.h:184
 msgid "expiry-date"
-msgstr "fecha de expiración"
+msgstr "fecha de caducidad"
 
-#: parse-options.h:193
+#: parse-options.h:198
 msgid "no-op (backward compatibility)"
 msgstr "no-op (compatibilidad con versiones anteriores)"
 
-#: parse-options.h:305
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "ser más verboso"
 
-#: parse-options.h:307
+#: parse-options.h:312
 msgid "be more quiet"
-msgstr "ser más discreto"
+msgstr "ser más callado"
 
-#: parse-options.h:313
-msgid "use <n> digits to display SHA-1s"
-msgstr "usa <n> dígitos para mostrar SHA-1s"
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
+msgstr "use <n> cifras para mostrar los nombres de los objetos"
 
-#: parse-options.h:332
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "cómo quitar espacios y #comentarios de mensajes"
 
-#: ref-filter.h:101
+#: parse-options.h:338
+msgid "read pathspec from file"
+msgstr "leer pathspec de archivo"
+
+#: parse-options.h:339
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"con --pathspec-from-file, elementos de pathspec son separados con caracter "
+"NUL"
+
+#: ref-filter.h:99
 msgid "key"
 msgstr "clave"
 
-#: ref-filter.h:101
+#: ref-filter.h:99
 msgid "field name to sort on"
 msgstr "nombre del campo por el cuál ordenar"
 
@@ -21388,17 +24635,9 @@ msgstr ""
 "actualizar el índice con la resolución de conflictos reutilizada si es "
 "posible"
 
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "HEAD desacoplada en "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD desacoplada de "
-
 #: command-list.h:50
 msgid "Add file contents to the index"
-msgstr "Agrega contenido de carpetas al índice"
+msgstr "Agrega contenido de archivos al índice"
 
 #: command-list.h:51
 msgid "Apply a series of patches from a mailbox"
@@ -21410,7 +24649,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"
@@ -21418,7 +24657,7 @@ 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"
@@ -21434,682 +24673,670 @@ msgid "List, create, or delete branches"
 msgstr "Lista, crea, o borra ramas"
 
 #: command-list.h:59
-msgid "Move objects and refs by archive"
-msgstr "Mover objetos y referencias por archivo"
+msgid "Collect information for user to file a bug report"
+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 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:61
+#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Mostrar información de gitattributes"
 
-#: command-list.h:62
+#: 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:63
+#: 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:64
+#: 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 "Cambia de rama o restaura archivos del árbol de trabajo"
 
-#: command-list.h:65
+#: command-list.h:66
 msgid "Copy files from the index to the working tree"
 msgstr "Copiar archivos del índice al árbol de trabajo"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Ensures that a reference name is well formed"
 msgstr "Asegura que un nombre de referencia esté bien formado"
 
-#: command-list.h:67
+#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
-msgstr "Encuentra commits que faltan aplicar en upstream"
+msgstr "Encuentra commits que falten aplicar en upstream"
 
-#: command-list.h:68
+#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Aplica los cambios introducidos por algunos commits existentes"
 
-#: command-list.h:69
+#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Opción gráfica a git-commit"
 
-#: command-list.h:70
+#: 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:71
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Clona un repositorio dentro de un nuevo directorio"
 
-#: command-list.h:72
+#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Mostrar data en columnas"
 
-#: command-list.h:73
+#: command-list.h:74
 msgid "Record changes to the repository"
-msgstr "Graba los cambios en tu repositorio"
+msgstr "Graba los cambios al repositorio"
 
-#: command-list.h:74
+#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
-msgstr "Escribe y verifica los archivos de Git commit-graph"
+msgstr "Escribe y verifica los archivos commit-graph de Git"
 
-#: command-list.h:75
+#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Crea un nuevo objeto commit"
 
-#: command-list.h:76
+#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Configurar repositorio u opciones globales"
 
-#: command-list.h:77
+#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Contar número de objetos no empaquetados y su consumo en disco"
 
-#: command-list.h:78
+#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Obtener y guardar credenciales de usuario"
 
-#: command-list.h:79
+#: 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:80
+#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Auxiliar para guardar credenciales en disco"
 
-#: command-list.h:81
+#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Exporta un commit único a CVS checkout"
 
-#: command-list.h:82
+#: 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"
 
-#: command-list.h:83
+#: 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:84
+#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Un servidor realmente simple para repositorios Git"
 
-#: command-list.h:85
+#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "Dar a un objeto un nombre legible por humanos basado en una referencia "
 "disponible"
 
-#: command-list.h:86
+#: 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"
 
-#: command-list.h:87
+#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Compara archivos del árbol de trabajo y del índice"
 
-#: command-list.h:88
+#: 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"
 
-#: command-list.h:89
+#: 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 "
 "de árbol"
 
-#: command-list.h:90
+#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Mostrar cambios usando herramientas de diff comunes"
 
-#: command-list.h:91
+#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Exportador de data Git"
 
-#: command-list.h:92
+#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Backend para importadores de data de Git rápidos"
 
-#: command-list.h:93
+#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Descarga objetos y referencias de otro repositorio"
 
-#: command-list.h:94
+#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Descarga objetos faltantes de otro repositorio"
 
-#: command-list.h:95
+#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Reescribir ramas"
 
-#: command-list.h:96
+#: command-list.h:97
 msgid "Produce a merge commit message"
-msgstr "Produce un mensaje de commit para fusión"
+msgstr "Produce un mensaje de commit de fusión"
 
-#: command-list.h:97
+#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Información de output en cada ref"
 
-#: command-list.h:98
+#: 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"
+
+#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Prepara parches para ser enviados por e-mail"
 
-#: command-list.h:99
+#: 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"
 
-#: command-list.h:100
+#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Limpia archivos innecesarios y optimiza el repositorio local"
 
-#: command-list.h:101
+#: 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 "Extrae el ID de commit de una crónica creada usando git-archive"
 
-#: command-list.h:102
+#: command-list.h:104
 msgid "Print lines matching a pattern"
-msgstr "Imprime las líneas que concuerdan con el patron"
+msgstr "Imprime las líneas que concuerden con el patrón"
 
-#: command-list.h:103
+#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Una interfaz gráfica portátil para Git"
 
-#: command-list.h:104
+#: 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"
 
-#: command-list.h:105
+#: 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:106
+#: command-list.h:108
 msgid "Server side implementation of Git over HTTP"
 msgstr "Implementación de lado de servidor de Git por HTTP"
 
-#: command-list.h:107
+#: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Descarga de un repositorio Git remoto vía HTTP"
 
-#: command-list.h:108
+#: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Empuja objetos por HTTP/DAV a otro repositorio"
 
-#: command-list.h:109
+#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "Enviar una colección de parches de stdin a una carpeta IMAP"
 
-#: command-list.h:110
+#: 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 "Construye un archivo de índice para una crónica empaquetada existente"
 
-#: command-list.h:111
+#: 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"
 
-#: command-list.h:112
+#: 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:113
+#: command-list.h:115
 msgid "Add or parse structured information in commit messages"
 msgstr "Agregar o analizar información estructurada en mensajes de commit"
 
-#: command-list.h:114
+#: command-list.h:116
 msgid "The Git repository browser"
 msgstr "El navegador de repositorio Git"
 
-#: command-list.h:115
+#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Muestra los logs de los commits"
 
-#: command-list.h:116
+#: 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 "Muestra información sobre archivos en el índice y el árbol de trabajo"
 
-#: command-list.h:117
+#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Lista referencias en un repositorio remoto"
 
-#: command-list.h:118
+#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Lista los contenidos de un objeto árbol"
 
-#: command-list.h:119
+#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Extraer parche y autoría de un único mensaje de e-mail"
 
-#: command-list.h:120
+#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Programa divisor de mbox simple de UNIX"
 
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Ejecute 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"
 
-#: command-list.h:122
+#: 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 "Encuentra ancestros tan buenos como posible para una fusión"
 
-#: command-list.h:123
+#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Ejecuta una fusión de tres vías en un archivo"
 
-#: command-list.h:124
+#: command-list.h:127
 msgid "Run a merge for files needing merging"
-msgstr "Ejecuta una fusión para archivos que la necesitan"
+msgstr "Ejecuta una fusión para archivos que la necesiten"
 
-#: command-list.h:125
+#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "El programa de ayuda estándar para usar con git-merge-index"
 
-#: command-list.h:126
+#: 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"
 
-#: command-list.h:127
+#: command-list.h:130
 msgid "Show three-way merge without touching index"
 msgstr "Mostrar fusión de tres vías sin tocar el índice"
 
-#: command-list.h:128
+#: command-list.h:131
 msgid "Write and verify multi-pack-indexes"
 msgstr "Escribe y verifica archivos multi-pack-index"
 
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "Crea un objeto tag"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Crea un objeto de etiqueta con validación adicional"
 
-#: command-list.h:130
+#: command-list.h:133
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Construir un objeto árbol de un texto en formato ls-tree"
 
-#: command-list.h:131
+#: 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"
 
-#: command-list.h:132
+#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Encontrar nombres simbólicos para revs dados"
 
-#: command-list.h:133
+#: command-list.h:136
 msgid "Add or inspect object notes"
-msgstr "Agrega o inspecciona objetos nota"
+msgstr "Agrega o inspecciona notas de objeto"
 
-#: command-list.h:134
+#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importar desde y enviar a repositorios Perforce"
 
-#: command-list.h:135
+#: command-list.h:138
 msgid "Create a packed archive of objects"
-msgstr "Crea un archivo de objetos empaquetados"
+msgstr "Crea una crónica de objetos empaquetada"
 
-#: command-list.h:136
+#: command-list.h:139
 msgid "Find redundant pack files"
-msgstr "Encuentra archivos empaquetados de manera redundante"
+msgstr "Encuentra archivos de paquete redundantes"
 
-#: command-list.h:137
+#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Empaqueta heads y tags para un acceso eficiente al repositorio"
 
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr ""
-"Rutinas para ayudar a analizar los parámetros de acceso del repositorio "
-"remoto"
-
-#: command-list.h:139
+#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Calcular ID único para un parche"
 
-#: command-list.h:140
+#: 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"
 
-#: command-list.h:141
+#: 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:142
+#: 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"
 
-#: command-list.h:143
+#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Actualiza referencias remotas junto con sus objetos asociados"
 
-#: command-list.h:144
+#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Aplica un parche quilt en la rama actual"
 
-#: command-list.h:145
+#: 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)"
 
-#: command-list.h:146
+#: command-list.h:148
 msgid "Reads tree information into the index"
-msgstr "Lee información del ábol en el índice"
+msgstr "Lee información del árbol al índice"
 
-#: command-list.h:147
+#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Vuelve a aplicar commits en la punta de otra rama"
 
-#: command-list.h:148
+#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Recibir lo que es empujado en el respositorio"
 
-#: command-list.h:149
+#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Gestionar información de reflog"
 
-#: command-list.h:150
+#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Gestiona un conjunto de repositorios rastreados"
 
-#: command-list.h:151
+#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Empaquetar objetos no empaquetados en un repositorio"
 
-#: command-list.h:152
+#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Crea, lista, borra referencias para reemplazar objetos"
 
-#: command-list.h:153
+#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Genera un resumen de cambios pendientes"
 
-#: command-list.h:154
+#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Reutilizar la resolución registrada de fusiones conflictivas"
 
-#: command-list.h:155
+#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
-msgstr "Reinicia el HEAD actual a un estado especifico"
+msgstr "Reinicia el HEAD actual a un estado específico"
 
-#: command-list.h:156
+#: 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:157
+#: command-list.h:159
 msgid "Revert some existing commits"
 msgstr "Revierte algunos commits existentes"
 
-#: command-list.h:158
+#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Lista objetos commit en orden cronológico inverso"
 
-#: command-list.h:159
+#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "Seleccionar y masajear los parámetros"
 
-#: command-list.h:160
+#: 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"
 
-#: command-list.h:161
+#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Envía una colección de parches como e-mails"
 
-#: command-list.h:162
+#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Empujar objetos por protocolo Git a otro repositorio"
 
-#: command-list.h:163
+#: command-list.h:165
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Shell de inicio de sesión restringido para acceso SSH exclusivo de Git"
 
-#: command-list.h:164
+#: 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:165
+#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "Muestra varios tipos de objetos"
 
-#: command-list.h:166
+#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "Mostrar ramas y sus commits"
 
-#: command-list.h:167
+#: 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:168
+#: command-list.h:170
 msgid "List references in a local repository"
 msgstr "Listar referencias en el repositorio local"
 
-#: command-list.h:169
+#: command-list.h:171
 msgid "Git's i18n setup code for shell scripts"
 msgstr "El código de configuración i18n de Git para scripts de shell"
 
-#: command-list.h:170
+#: 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:171
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Inicializa y modifica 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:172
+#: command-list.h:175
 msgid "Add file contents to the staging area"
 msgstr "Agrega contenidos de un archivo al área de staging"
 
-#: command-list.h:173
+#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Muestra el estado del árbol de trabajo"
 
-#: command-list.h:174
+#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Eliminar el espacio en blanco innecesario"
 
-#: command-list.h:175
+#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Inicializa, actualiza o inspecciona submódulos"
 
-#: command-list.h:176
+#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Operación bidireccional entre un repositorio Subversion y Git"
 
-#: command-list.h:177
+#: command-list.h:180
 msgid "Switch branches"
-msgstr "Cambiar branches"
+msgstr "Cambiar de branch"
 
-#: command-list.h:178
+#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Lee, modifica y borra referencias simbólicas"
 
-#: command-list.h:179
+#: 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 "Crea, lista, borra o verifica un objeto de tag firmado con GPG"
 
-#: command-list.h:180
+#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crea un archivo temporal con contenidos de un blob"
 
-#: command-list.h:181
+#: command-list.h:184
 msgid "Unpack objects from a packed archive"
-msgstr "Desempaqueta objetos de un archivo empaquetado"
+msgstr "Desempaqueta objetos de una crónica empaquetada"
 
-#: command-list.h:182
+#: 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"
 
-#: command-list.h:183
+#: 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"
 
-#: command-list.h:184
+#: 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 "
 "dumb"
 
-#: command-list.h:185
+#: 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:186
+#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Enviar objetos empaquetados a git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Mostrar una variable lógica de Git"
 
-#: command-list.h:188
+#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Verificar firma GPG de commits"
 
-#: command-list.h:189
+#: command-list.h:192
 msgid "Validate packed Git archive files"
-msgstr "Valida archivos Git empaquetados"
+msgstr "Valida crónicas Git empaquetadas"
 
-#: command-list.h:190
+#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Verifica la firma GPG de etiquetas"
 
-#: command-list.h:191
+#: command-list.h:194
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interfaz web Git (interfaz web para repositorios Git)"
 
-#: command-list.h:192
+#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr "Muestra logs con las diferencias que cada commit introduce"
 
-#: command-list.h:193
+#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "Gestiona múltiples árboles de trabajo"
 
-#: command-list.h:194
+#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "Crea un objeto árbol del índice actual"
 
-#: command-list.h:195
+#: command-list.h:198
 msgid "Defining attributes per path"
-msgstr "Definiendo atributos por ruta"
+msgstr "Definir atributos por ruta"
 
-#: command-list.h:196
+#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Interfaz y convenciones de línea de comandos de Git"
 
-#: command-list.h:197
+#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial básico de Git para desarrolladores"
 
-#: command-list.h:198
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+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:199
+#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "Afinar la salida de diff"
 
-#: command-list.h:200
+#: 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:201
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Preguntas frecuentes sobre el uso de Git"
+
+#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "Un Glosario de Git"
 
-#: command-list.h:202
+#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Hooks utilizados por Git"
 
-#: command-list.h:203
+#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
 
-#: command-list.h:204
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+"Mapear nombres de autor/ nombre de commiter y/o direcciones de correo "
+"electrónico"
+
+#: 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:205
+#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Namespaces de Git"
 
-#: command-list.h:206
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Programas de ayuda para interactuar con repositorios remotos"
+
+#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Disposición del repositorio Git"
 
-#: command-list.h:207
+#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
-msgstr "Especificando revisiones y rangos para Git"
+msgstr "Especificar revisiones y rangos para Git"
 
-#: command-list.h:208
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "Montar un repositorio dentro de otro"
+
+#: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial de introducción a Git: parte dos"
 
-#: command-list.h:209
+#: command-list.h:217
 msgid "A tutorial introduction to Git"
-msgstr "Un tutorial de introducción para Git"
+msgstr "Un tutorial de introducción a Git"
 
-#: command-list.h:210
+#: command-list.h:218
 msgid "An overview of recommended workflows with Git"
 msgstr "Una visión general de flujos de trabajo recomendados con Git"
 
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Debes iniciar con \"git bisect start\""
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "¿Quieres que lo haga por ti [Y/n]? "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Mala entrada rev: $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Mala entrada rev: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Mala entrada rev: $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento."
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "Ningún logfile proporcionado"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "no se puede leer $file para reproducir"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? ¿De qué estás hablando?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
 msgid "bisect run failed: no command provided."
 msgstr "bisect falló: no se proveyó comando."
 
-#: git-bisect.sh:246
+#: git-bisect.sh:73
 #, sh-format
 msgid "running $command"
 msgstr "ejecutando $command"
 
-#: git-bisect.sh:253
+#: git-bisect.sh:80
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -22118,27 +25345,23 @@ msgstr ""
 "bisect falló:\n"
 "código de salida $res de '$command' es <0 o >=128"
 
-#: git-bisect.sh:279
+#: git-bisect.sh:105
 msgid "bisect run cannot continue any more"
 msgstr "bisect no puede seguir continuando"
 
-#: git-bisect.sh:285
+#: git-bisect.sh:111
 #, sh-format
 msgid ""
 "bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
 msgstr ""
-"bisect falló:\n"
-"'bisect_state $state' salió con código de error $res"
+"bisect run falló:\n"
+"'bisect-state $state' salió con el código de error $res"
 
-#: git-bisect.sh:292
+#: git-bisect.sh:118
 msgid "bisect run success"
 msgstr "bisect exitoso"
 
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "No estamos bisecando."
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -22153,7 +25376,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
@@ -22179,297 +25402,129 @@ 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-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "No se puede eliminar el índice temporal (no puede suceder)"
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "No se puede actualizar $ref_stash con $w_commit"
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "error: opción desconocida para 'stash pus': $option"
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "opción desconocida: $opt"
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Se especificaron demasiadas revisiones: $REV"
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference no es una referencia válida"
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' no es un commit estilo stash"
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' no es una referencia stash"
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr "incapaz de refrescar el índice"
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "No se puede aplicar un stash en medio de una fusión"
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr "Conflictos en índice. Intente sin --index."
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr "No se puede guardar el índice del árbol"
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr "No se puede sacar de stage archivos modificados"
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "Botado ${REV} ($s)"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: No se pudo borrar entrada stash"
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Para restaurarlos, escribe \"git stash apply\")"
-
-#: git-submodule.sh:200
+#: 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 "
+"La ruta relativa solo se puede usar desde el nivel superior del árbol de "
 "trabajo"
 
-#: git-submodule.sh:210
+#: 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:229
+#: 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:232
+#: 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:239
+#: 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:245
-#, sh-format
-msgid ""
-"The following path is ignored by one of your .gitignore files:\n"
-"$sm_path\n"
-"Use -f if you really want to add it."
-msgstr ""
-"La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n"
-"$sm_path\n"
-"Usa -f si en verdad quieres agregarlo."
-
-#: git-submodule.sh:268
-#, 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:270
-#, 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:278
-#, 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:280
-#, 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:286
-#, 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:298
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "No es posible hacer checkout al submódulo '$sm_path'"
-
-#: git-submodule.sh:303
+#: git-submodule.sh:248
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Falló al agregar el submódulo '$sm_path'"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:257
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Falló al registrar el submódulo '$sm_path'"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:532
 #, 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:583
+#: git-submodule.sh:542
 #, 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:588
+#: git-submodule.sh:547
 #, 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:606
+#: git-submodule.sh:565
 #, 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:"
+"intentando hacer un fetch directo de $sha1:"
 
-#: git-submodule.sh:612
+#: 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 ""
-"Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
-"Fetch directo del commit falló."
+"Fetch realizado en la ruta de submódulo '$displaypath', pero no contenía "
+"$sha1. Fetch directo del commit falló."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:578
 #, 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:620
+#: git-submodule.sh:579
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:583
 #, 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 "
+"No es posible ejecutar rebase a '$sha1' en la ruta de submódulo "
 "'$displaypath'"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:584
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
+msgstr "Ruta de submódulo '$displaypath': rebasado a '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:589
 #, 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:631
+#: git-submodule.sh:590
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
-msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
+msgstr "Ruta de submódulo '$displaypath': fusionado en '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:595
 #, 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'"
+"Falló la ejecución de '$command $sha1' en la ruta de submódulo '$displaypath'"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:596
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:627
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr "La opción --cached no puede ser usada con la opción --files"
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "modo $mod_dst inesperado"
-
-#: git-submodule.sh:902
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr "  Advertencia: $display_name no contiene el commit $sha1_src"
-
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr "  Advertencia: $display_name no contiene el commit $sha1_dst"
-
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr ""
-"  Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Véase git-${cmd}(1) para más detalles."
-
 #: git-rebase--preserve-merges.sh:109
 msgid "Applied autostash."
 msgstr "Autostash aplicado."
@@ -22479,12 +25534,23 @@ msgstr "Autostash aplicado."
 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:207
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -22512,10 +25578,10 @@ msgstr ""
 "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"
+"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 a el label\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"
@@ -22524,7 +25590,7 @@ msgstr ""
 "Estas líneas pueden ser reordenadas; son ejecutadas desde arriba hacia "
 "abajo.\n"
 
-#: git-rebase--preserve-merges.sh:270
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -22543,83 +25609,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:295
+#: 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:334
+#: 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:364
+#: 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:415
+#: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Avance rápido a $sha1"
 
-#: git-rebase--preserve-merges.sh:417
+#: 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:426
+#: 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:431
+#: git-rebase--preserve-merges.sh:421
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
-msgstr "Rehusando a ejecutar squash en fusión: $sha1"
+msgstr "Rehusando ejecutar squash en fusión: $sha1"
 
-#: git-rebase--preserve-merges.sh:449
+#: git-rebase--preserve-merges.sh:439
 #, sh-format
 msgid "Error redoing merge $sha1"
-msgstr "Error rehaciendo fusión $sha1"
+msgstr "Error al rehacer fusión $sha1"
 
-#: git-rebase--preserve-merges.sh:458
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "No se pudo coger $sha1"
 
-#: git-rebase--preserve-merges.sh:467
+#: 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:472
+#: 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:483
+#: 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:492
+#: 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:495
+#: 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:536 git-rebase--preserve-merges.sh:579
-#: git-rebase--preserve-merges.sh:582
+#: 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"
+msgstr "No se pudo aplicar $sha1... $rest"
 
-#: git-rebase--preserve-merges.sh:611
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -22636,31 +25702,31 @@ msgstr ""
 "problema antes\n"
 "de que sea capaz de reformular el commit."
 
-#: git-rebase--preserve-merges.sh:626
+#: 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:641
+#: 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:683
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Ejecutando: $rest"
 
-#: git-rebase--preserve-merges.sh:691
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Ejecución fallida: $rest"
 
-#: git-rebase--preserve-merges.sh:693
+#: 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:695
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -22671,7 +25737,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:708
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -22686,25 +25752,25 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:719
+#: 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:720
+#: 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:755
+#: 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:812
+#: 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:817
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -22722,7 +25788,7 @@ msgid ""
 "  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"
+"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"
@@ -22735,12 +25801,12 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--preserve-merges.sh:834
+#: 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"
+"Error al tratar de encontrar la identidad del autor para remediar el commit"
 
-#: git-rebase--preserve-merges.sh:839
+#: 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."
@@ -22748,42 +25814,46 @@ 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:844 git-rebase--preserve-merges.sh:848
+#: 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:879 git-rebase--preserve-merges.sh:965
+#: 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:900
+#: 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:907
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr "¿Sin HEAD?"
 
-#: git-rebase--preserve-merges.sh:908
+#: 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:911
+#: git-rebase--preserve-merges.sh:901
 msgid "Could not mark as interactive"
 msgstr "No se pudo marcar como interactivo"
 
-#: git-rebase--preserve-merges.sh:943
+#: 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:997 git-rebase--preserve-merges.sh:1002
+#: 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"
+msgstr "No se pudo inicializar los commits reescritos"
 
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
@@ -22855,52 +25925,11 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Incapaz de determinar la ruta absoluta del directorio git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "rastreado"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "no rastreado"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "binario"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "nada"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "sin cambios"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "agregada %d ruta\n"
-msgstr[1] "agregadas %d rutas\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "actualizada %d ruta\n"
-msgstr[1] "actualizadas %d rutas\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "revertida %d ruta\n"
-msgstr[1] "revertidas %d rutas\n"
-
 #: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
@@ -22908,79 +25937,54 @@ msgid_plural "touched %d paths\n"
 msgstr[0] "touch hecho a %d ruta\n"
 msgstr[1] "touch hecho a %d rutas\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Actualizar"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Revertir"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "nota: %s no es rastreado ahora.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Agregar no rastreados"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "No hay archivos sin rastrear.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
-"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
+"Si el parche aplica limpiamente, el fragmento editado será marcado\n"
 "inmediatamente para el área de stage."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
-"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
-"inmediatamente para aplicar stash."
+"Si el parche aplica limpiamente, el fragmento editado será marcado\n"
+"inmediatamente para hacer stash."
 
-#: git-add--interactive.perl:1057
+#: 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 sera marcado\n"
+"Si el parche aplica limpiamente, el fragmento editado será marcado\n"
 "inmediatamente para sacar del área de stage."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: 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."
 msgstr ""
-"Si el parche aplica de forma limpia, el hunk editado sera marcado \n"
+"Si el parche aplica de forma limpia, el fragmento editado será marcado\n"
 "inmediatamente para aplicar."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: 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."
 msgstr ""
-"Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
+"Si el parche aplica de forma limpia, el fragmento editado será marcado\n"
 "inmediatamente para descarte."
 
-#: git-add--interactive.perl:1109
+#: 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:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -22989,40 +25993,16 @@ 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, haga de ellas líneas ' ' (contexto).\n"
 "Para eliminar '%s' líneas, bórrelas.\n"
-"Lineas comenzando con  %s serán eliminadas.\n"
-
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-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"
+"Líneas comenzando con %s serán eliminadas.\n"
 
-#: git-add--interactive.perl:1138
+#: 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"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Tu hunk editado no aplica. ¿Editar nuevamente (¡decir \"no\" descarta!) [y/"
-"n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -23030,14 +26010,14 @@ 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 o ninguno de los restantes\n"
-"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n"
-"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
+"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:1252
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -23045,13 +26025,13 @@ 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 o 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:1258
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -23059,14 +26039,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 o ninguno de los restantes\n"
-"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n"
-"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
+"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:1264
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23074,13 +26054,13 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este hunk al índice\n"
-"n - no aplicar este hunk al índice\n"
-"q - quit; no aplicar este hunk o ninguno de los restantes\n"
-"a - aplicar este hunk y todos los posteriores en el archivo\n"
-"d - no aplicar este hunko ninguno de los posteriores en el archivo"
+"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:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23088,13 +26068,13 @@ 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 o ninguno de los que restantes\n"
-"a - descartar este hunk y todos los posteriores en este archivo\n"
-"d - no descartar este hunk o ninguno de los posteriores en el archivo"
+"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:1276
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23102,13 +26082,13 @@ 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 o ninguno de los que quedan\n"
-"a - descartar este hunk y todos los posteriores en este archivo\n"
-"d - no descartar este hunk o ninguno posterior en el archivo"
+"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:1282
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23116,13 +26096,13 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este hunk al índice y al árbol de trabajo\n"
-"n - no aplicar este hunk al índice y al árbol de trabajo\n"
-"q - quit;  no aplicar este hunk o ninguno de los restantes\n"
-"a - aplicar este hunk y todos los posteriores en el archivo\n"
-"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
+"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:1294
+#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23130,13 +26110,13 @@ msgid ""
 "a - apply this hunk and all later hunks in the file\n"
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
-"y - aplicar este hunk al índice y al árbol de trabajo\n"
-"n - no aplicar este hunk al índice y al árbol de trabajo\n"
-"q - quit;  no aplicar este hunk o ninguno de los restantes\n"
-"a - aplicar este hunk y todos los posteriores en el archivo\n"
-"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
+"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:1309
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23149,239 +26129,99 @@ 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:1340
+#: git-add--interactive.perl:1345
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "¡Los hunks seleccionados no aplican al índice!\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "¿Aplicarlos al árbol de trabajo de todas maneras? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "Nada fue aplicado.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignorando lo no fusionado: %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Solo cambiaron archivos binarios.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Sin cambios.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Actualización del parche"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "¿Cambio de modo de stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar stage al borrado [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar stage a este hunk [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar stash al cambio de modo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar stash al borrado [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar stash a este hunk [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "¿Sacar cambio de modo del stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "¿Sacar borrado del stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "¿Sacar este hunk del stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar cambio de modo al índice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar borrado al índice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, 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,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Descartar cambio de modo del árbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Descartar borrado del árbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, 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,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"¿Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, 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,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"¿Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "¿Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, 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,?]? "
-
-#: git-add--interactive.perl:1466
+#: 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:1467
+#: 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
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "¿Aplicar adición al árbol de trabajo [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: 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:1568
+#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
-msgstr "No hay más pedazos para el ir\n"
-
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "¿a que hunk ir (<enter> para ver más)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "¿a que hunk ir? "
+msgstr "No hay más fragmentos a que ir\n"
 
-#: git-add--interactive.perl:1586
+#: 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:1591
+#: git-add--interactive.perl:1622
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Lo siento, solo %d hunk disponible.\n"
 msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
-msgstr "No hay más pedazos para buscar\n"
-
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "¿buscar para regexp? "
+msgstr "No hay más fragmentos para buscar\n"
 
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regexp para la búsqueda mal formado %s: %s\n"
 
-#: git-add--interactive.perl:1644
+#: 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:1656 git-add--interactive.perl:1678
+#: 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:1665 git-add--interactive.perl:1684
+#: 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:1690
+#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Perdón, no se puede dividir este pedazo\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1736
 #, 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:1706
+#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Perdón, no se puede editar este pedazo\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Revisión de  diff"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23401,94 +26241,111 @@ msgstr ""
 "add untracked - agrega contenidos de archivos no rastreados al grupo de "
 "cambios del area de stage\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: 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
 msgid "missing --"
 msgstr "falta --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "modo --patch desconocido: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 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:223 git-send-email.perl:229
+#: 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:227
 msgid "the editor exited uncleanly, aborting everything"
-msgstr "el editor se cerro inapropiadamente, abortando todo"
+msgstr "el editor se cerró inapropiadamente, abortando todo"
 
-#: git-send-email.perl:310
+#: 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:315
+#: 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:408
+#: 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:481 git-send-email.perl:683
+#: 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 "
+"verificación.\n"
+
+#: 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:484
+#: 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:497
+#: 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:528
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Configuración --confirm desconocida: '%s'\n"
 
-#: git-send-email.perl:556
+#: 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:558
+#: 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:560
+#: 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"
+msgstr "advertencia: redirección `/file` o `|pipe` no soportada: %s\n"
 
-#: git-send-email.perl:565
+#: 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:649
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -23497,47 +26354,38 @@ msgid ""
 "    * Saying \"./%s\" if you mean a file; or\n"
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
-"Archivo '%s' existe pero podría ser el rango de commits \n"
+"Archivo '%s' existe pero podría ser el rango de commits\n"
 "para producir los parches.  Por favor elimina la ambigüedad...\n"
 "\n"
 "    * 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:670
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Falló al abrir directorio %s: %s"
 
-#: git-send-email.perl:694
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"fatal: %s: %s\n"
-"peligro: no se mandaron parches\n"
-
-#: git-send-email.perl:705
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 "\n"
-"No se especificaron parches!\n"
+"¡No se especificaron parches!\n"
 "\n"
 
-#: git-send-email.perl:718
+#: 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:728
+#: 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:739
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -23545,33 +26393,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"
+"Líneas que comienzan en \"GIT:\" serán eliminadas.\n"
 "Considere 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"
 
-#: git-send-email.perl:763
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Falló al abrir %s: %s"
 
-#: git-send-email.perl:780
+#: 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:823
+#: 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:858
+#: 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:913
+#: git-send-email.perl:990
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -23579,11 +26427,11 @@ msgstr ""
 "Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-"
 "Encoding.\n"
 
-#: git-send-email.perl:918
+#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "¿Que 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:926
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -23593,25 +26441,25 @@ msgid ""
 msgstr ""
 "Rehusando mandar el parche porque\n"
 "\t%s\n"
-"tiene el template  '*** SUBJECT HERE ***'. Agrega --force si realmente lo "
-"deseas mandar.\n"
+"tiene el asunto de template '*** SUBJECT HERE ***'. Agrega --force si "
+"realmente lo deseas mandar.\n"
 
-#: git-send-email.perl:945
+#: git-send-email.perl:1022
 msgid "To whom should the emails be sent (if anyone)?"
-msgstr "¿A quien se deben mandar los correos (si existe)?"
+msgstr "¿A quién se deben mandar los correos (si alguien hay)?"
 
-#: git-send-email.perl:963
+#: 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:975
+#: 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 En-Respuesta-Para 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:1033 git-send-email.perl:1041
+#: 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"
@@ -23619,16 +26467,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:1045
+#: git-send-email.perl:1126
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr "¿Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar): "
+msgstr "¿Qué hacer con esta dirección? ([q]salir|[d]descartar|[e]ditar): "
 
-#: git-send-email.perl:1362
+#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Ruta CA \"%s\" no existe"
 
-#: git-send-email.perl:1445
+#: 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"
@@ -23642,10 +26490,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"
@@ -23656,560 +26503,160 @@ 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:1460
+#: 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:1463
+#: 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:1491
+#: 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:1538
+#: 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:1543 git-send-email.perl:1547
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "¡Falló STARTTLS! %s"
 
-#: git-send-email.perl:1556
+#: 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:1574
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Falló al enviar %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Dry-Sent %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviado %s\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Log dice:\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK. Log dice:\n"
 
-#: git-send-email.perl:1591
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Resultado: "
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Resultado: OK\n"
 
-#: git-send-email.perl:1612
+#: git-send-email.perl:1709
 #, perl-format
 msgid "can't open file %s"
 msgstr "no se puede abrir el archivo %s"
 
-#: git-send-email.perl:1659 git-send-email.perl:1679
+#: 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 línea '%s'\n"
+msgstr "(mbox) Agregando cc: %s de la línea '%s'\n"
 
-#: git-send-email.perl:1665
+#: 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:1718
+#: 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:1753
+#: 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:1864
+#: git-send-email.perl:1965
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) no se pudo ejecutar '%s'"
 
-#: git-send-email.perl:1871
+#: git-send-email.perl:1972
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Agregando %s: %s de: '%s'\n"
 
-#: git-send-email.perl:1875
+#: git-send-email.perl:1976
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
-msgstr "(%s) falló al cerrar el pipe para '%s'"
+msgstr "(%s) falló al cerrar el pipe a '%s'"
 
-#: git-send-email.perl:1905
+#: git-send-email.perl:2006
 msgid "cannot send message as 7bit"
 msgstr "no se puede mandar mensaje como 7bit"
 
-#: git-send-email.perl:1913
+#: git-send-email.perl:2014
 msgid "invalid transfer encoding"
 msgstr "codificación de transferencia inválida"
 
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: 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: rechazado por hook sendmail-validate\n"
+"%s\n"
+"peligro: no se mandaron parches\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 "no es posible abrir %s: %s\n"
 
-#: git-send-email.perl:1957
+#: git-send-email.perl:2064
 #, 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 ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal: %s: %d es más grande que 998 caracteres\n"
+"peligro: no se mandaron parches\n"
 
-#: git-send-email.perl:1974
+#: git-send-email.perl:2082
 #, 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:1978
+#: git-send-email.perl:2086
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
-msgstr "¿Realmente deseas mandar %s?[y|N]: "
-
-#~ 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"
-
-#~ msgid "invalid date format '%s' in '%s'"
-#~ msgstr "formato de fecha inválido '%s' en '%s'"
-
-#~ msgid "writing root commit"
-#~ msgstr "escribiendo commit raíz"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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"
-
-#~ 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 "(HEAD detached at %s)"
-#~ msgstr "(HEAD desacoplado en %s)"
-
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD desacoplado de %s)"
-
-#~ 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 open '%s'"
-#~ msgstr "falló al abrir '%s'"
-
-#~ msgid "failed to stat %s\n"
-#~ msgstr "falló al analizar %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 ""
-#~ "Si quiere saltar este commit, use:\n"
-#~ "\n"
-#~ "    git reset\n"
-#~ "\n"
-#~ "Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
-#~ "para los commits restantes.\n"
-
-#~ msgid "unrecognized verb: %s"
-#~ msgstr "verbo no reconocido: %s"
-
-#~ msgid "hash version %X does not match version %X"
-#~ msgstr "versión de hash %X no concuerda con versión %X"
-
-#~ 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í."
-
-#~ msgid ""
-#~ "fatal: cannot combine am options with either interactive or merge options"
-#~ msgstr ""
-#~ "fatal: no se puede combinar opciones am con opciones interactivas o de "
-#~ "merge"
-
-#~ msgid "fatal: cannot combine '--signoff' with '--preserve-merges'"
-#~ msgstr "fatal: no se puede combinar '--signoff' con '--preserve-merges'"
-
-#~ msgid "fatal: cannot combine '--preserve-merges' with '--rebase-merges'"
-#~ msgstr ""
-#~ "fatal: no se puede combinar '--preserve-merges' con '--rebase-merges'"
-
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy-option'"
-#~ msgstr ""
-#~ "fatal: no se puede combinar '--rebase-merges' con '--strategy-option'"
-
-#~ msgid "fatal: cannot combine '--rebase-merges' with '--strategy'"
-#~ msgstr "fatal: no se puede combinar '--rebase-merges' con '--strategy'"
-
-#~ msgid "invalid upstream '$upstream_name'"
-#~ msgstr "upstream inválido '$upstream_name'"
-
-#~ msgid "$onto_name: there are more than one merge bases"
-#~ msgstr "$onto_name: hay más de una base de fusión"
-
-#~ msgid "$onto_name: there is no merge base"
-#~ msgstr "$onto_name: no hay base de fusión"
-
-#~ msgid "Does not point to a valid commit: $onto_name"
-#~ msgstr "No apunta a un commit válido: $onto_name"
-
-#~ msgid "fatal: no such branch/commit '$branch_name'"
-#~ msgstr "fatal: no existe la rama/commit: '$branch_name'"
-
-#~ msgid "Created autostash: $stash_abbrev"
-#~ msgstr "Autostash creado: $stash_abbrev"
-
-#~ msgid "Current branch $branch_name is up to date."
-#~ msgstr "La rama actual $branch_name está actualizada."
-
-#~ msgid "Current branch $branch_name is up to date, rebase forced."
-#~ msgstr "Rama actual $branch_name está actualizada, rebase forzado."
-
-#~ msgid "Changes to $onto:"
-#~ msgstr "Cambios hacia $onto:"
-
-#~ msgid "Changes from $mb to $onto:"
-#~ msgstr "Cambios desde $mb a $onto:"
-
-#~ msgid "Fast-forwarded $branch_name to $onto_name."
-#~ msgstr "Avance rápido de $branch_name a $onto_name."
-
-#~ msgid "First, rewinding head to replay your work on top of it..."
-#~ 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"
-
-#~ msgid "Adding merged %s"
-#~ msgstr "Agregar %s fusionado"
-
-#~ msgid "Internal error"
-#~ msgstr "Error interno"
-
-#~ 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."
-
-#~ msgid "unable to write sha1 filename %s"
-#~ msgstr "incapaz de escribir el nombre de archivo sha1 %s"
-
-#~ msgid "cannot read sha1_file for %s"
-#~ msgstr "no se puede leer sha1_file para %s"
-
-#~ msgid ""
-#~ "error: cannot combine interactive options (--interactive, --exec, --"
-#~ "rebase-merges, --preserve-merges, --keep-empty, --root + --onto) with am "
-#~ "options (%s)"
-#~ msgstr ""
-#~ "error: no se puede combinar opciones interactivas (--interactive, --exec, "
-#~ "--rebase-merges, --preserve-merges, --keep-empty, --root + --onto) con "
-#~ "opciones (%s)"
-
-#~ msgid ""
-#~ "error: cannot combine merge options (--merge, --strategy, --strategy-"
-#~ "option) with am options (%s)"
-#~ 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"
-
-#~ msgid "abort rebase"
-#~ msgstr "abortar rebase"
-
-#~ msgid "make rebase script"
-#~ msgstr "generar script de rebase"
-
-#~ msgid "No such remote: %s"
-#~ msgstr "No existe el remoto: %s"
-
-#~ msgid "cannot move a locked working tree"
-#~ msgstr "no se puede mover un árbol de trabajo encerrado"
-
-#~ msgid "cannot remove a locked working tree"
-#~ msgstr "no se puede eliminar árbol de trabajo encerrado"
-
-#~ msgid ""
-#~ "\n"
-#~ "\tHowever, if you remove everything, the rebase will be aborted.\n"
-#~ "\n"
-#~ "\t"
-#~ msgstr ""
-#~ "\n"
-#~ "\tComo sea, si quieres borrar todo, el rebase será abortado.\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"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "1ra línea del mensaje squash no esperada:\n"
-#~ "\n"
-#~ "\t%.*s"
-
-#~ msgid ""
-#~ "invalid 1st line of squash message:\n"
-#~ "\n"
-#~ "\t%.*s"
-#~ msgstr ""
-#~ "1ra línea del mensaje squash inválida:\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"
+msgstr "¿Realmente deseas mandar %s? [y|N]: "
 
-#~ msgid "invalid filter-spec expression '%s'"
-#~ msgstr "expresión filter-spec inválida '%s'"
+#~ msgid "unable to write stateless separator packet"
+#~ msgstr "no es posible escribir un paquete separador sin estado (stateless)"
 
-#~ msgid "The copy of the patch that failed is found in: %s"
-#~ msgstr "La copia del parche que fallido se encuentra en: %s"
+#~ msgid "git merge --abort"
+#~ msgstr "git merge --abort"
 
-#~ msgid "pathspec and --all are incompatible"
-#~ msgstr "pathspec y --all son incompatibles"
+#~ msgid "git merge --continue"
+#~ msgstr "git merge --continue"
 
-#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-#~ msgstr ""
-#~ "Anulado el registro del submódulo '$name' ($url) para la ruta "
-#~ "'$displaypath'"
-
-#~ msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
-#~ msgstr ""
-#~ "Campos Para/Cc/Bcc no han sido interpretados todavía, han sido ignorados\n"
-
-#~ msgid ""
-#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
-#~ "please use . instead if you meant to match all paths"
-#~ msgstr ""
-#~ "los strings vacíos como pathspecs serán inválidas en las próximas "
-#~ "versiones. por favor use . si quería hacer coincidir todas las rutas"
-
-#~ msgid "could not truncate '%s'"
-#~ msgstr "no se pudo truncar '%s'"
-
-#~ msgid "could not close %s"
-#~ msgstr "no se pudo cerrar %s"
-
-#~ msgid "Copied a misnamed branch '%s' away"
-#~ msgstr "Copiada una rama mal llamada '%s' afuera"
-
-#~ msgid "it does not make sense to create 'HEAD' manually"
-#~ msgstr "No tiene sentido crear 'HEAD' manualmente"
-
-#~ msgid "Don't know how to clone %s"
-#~ msgstr "No se sabe como clonar %s"
-
-#~ msgid "Don't know how to fetch from %s"
-#~ msgstr "No se sabe como extraer de %s"
-
-#~ msgid "'$term' is not a valid term"
-#~ msgstr "'$term' no es un término válido"
-
-#~ 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 "Failed to recurse into submodule path '$sm_path'"
-#~ msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'"
-
-#~ msgid "%%(trailers) does not take arguments"
-#~ msgstr "%%(trailers) no toma argumentos"
-
-#~ msgid "submodule update strategy not supported for submodule '%s'"
-#~ msgstr ""
-#~ "estrategia de actualización de submódulo no soportada para submódulo '%s'"
-
-#~ msgid "change upstream info"
-#~ msgstr "cambie info de upstream"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wanted to make '%s' track '%s', do this:\n"
-#~ "\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Si querías hacer que '%s' rastree '%s', haz esto:\n"
-#~ "\n"
-
-#~ msgid "basename"
-#~ msgstr "nombre base"
-
-#~ msgid ""
-#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Peligro: falta el SHA-1 o no es un commit en la siguiente línea:\n"
-#~ " - $line"
-
-#~ msgid ""
-#~ "Warning: the command isn't recognized in the following line:\n"
-#~ " - $line"
-#~ msgstr ""
-#~ "Peligro: el comando no es reconocido en la siguiente línea:\n"
-#~ " - $line"
+#~ msgid "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 a89a5ed8e9..59481a7d70 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -57,6 +57,7 @@
 #   revision         |  révision
 #   shallow          |  superficiel
 #   shell            |  interpréteur de commandes
+#   sparse           |  clairsemé
 #   stash            |  remisage
 #   to stash         |  remiser
 #   tag              |  étiquette
@@ -69,14 +70,14 @@
 #   upstream         |  amont
 #   viewer           |  visualiseur
 #   worktree /       |
-#   work(ing) tree   |  copie de travail
+#   work(ing) tree   |  arbre de travail
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-10-28 13:19+0800\n"
-"PO-Revision-Date: 2019-10-28 20:35+0100\n"
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"PO-Revision-Date: 2021-08-14 08:28+0200\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"
@@ -84,39 +85,779 @@ 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.2.3\n"
+"X-Generator: Poedit 2.4.2\n"
 
-#: advice.c:109
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Hein (%s) ?"
+
+#: 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 "impossible de lire l'index"
+
+#: add-interactive.c:584 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
+msgid "nothing"
+msgstr "rien"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "inchangé"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Mise à jour"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr "impossible d'indexer '%s'"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+msgid "could not write index"
+msgstr "impossible d'écrire l'index"
+
+#: add-interactive.c:706 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
+#, 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
+#, 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
+msgid "Revert"
+msgstr "Inverser"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "Impossible d'analyser HEAD^{tree}"
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Aucun Fichier non suivi.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Ajouter un fichier non-suivi"
+
+#: add-interactive.c:895 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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "fichier non-fusionné ignoré : %s"
+
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Seuls des fichiers binaires ont changé.\n"
+
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "Aucune modification.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Mise à jour par patch"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Réviser la différence"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "afficher les chemins comprenant des modifications"
+
+#: add-interactive.c:1012
+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"
+
+#: add-interactive.c:1014
+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
+msgid "pick hunks and update selectively"
+msgstr "sélection et mise à jour individuelle des sections"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "visualiser les diffs entre HEAD et l'index"
+
+#: add-interactive.c:1020
+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"
+
+#: add-interactive.c:1028 add-interactive.c:1077
+msgid "Prompt help:"
+msgstr "Aide :"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "sélectionner un seul élément"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "sélectionner une plage d'éléments"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "sélectionner plusieurs plages"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "sélectionner un élément basé sur une préfixe unique"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "désélectionner les éléments spécifiés"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "choisir tous les éléments"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(vide) arrêter de sélectionner"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "sélectionner un élément par son numéro"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(vide) ne rien sélectionner"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Commandes ***"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Et maintenant"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "indexé"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "non-indexé"
+
+#: 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 "chemin"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "impossible de rafraîchir l'index"
+
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "Au revoir.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, 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."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - indexer cette section\n"
+"n - ne pas indexer cette section\n"
+"q - quitter ; ne pas indexer cette section ni les autres restantes\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - remiser cette section\n"
+"n - ne pas remiser cette section\n"
+"q - quitter ; ne pas remiser cette section ni les autres restantes\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - désindexer cette section\n"
+"n - ne pas désindexer cette section\n"
+"q - quitter ; ne pas désindexer cette section ni les autres restantes\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - appliquer cette section\n"
+"n - ne pas appliquer cette section\n"
+"q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - supprimer cette section\n"
+"n - ne pas supprimer cette section\n"
+"q - quitter ; ne pas supprimer cette section ni les autres restantes\n"
+"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
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Abandonner le changement de mode dans l'index et l'arbre [y,n,q,a,d%s,?] ? "
+
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#, 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
+#, 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
+#, 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,?] ? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - éliminer cette section de l'index et de l'arbre de travail\n"
+"n - ne pas éliminer cette section\n"
+"q - quitter ; ne pas éliminer cette section ni les autres restantes\n"
+"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
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Appliquer le changement de mode dans l'index et l'arbre de travail [y,n,q,a,d"
+"%s,?] ? "
+
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Appliquer la suppression dans l'index et l'arbre de travail [y,n,q,a,d"
+"%s,?] ? "
+
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, c-format, perl-format
+msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Appliquer l'ajout dans l'index et l'arbre de travail [y,n,q,a,d%s,?] ? "
+
+#: add-patch.c:174 add-patch.c:219 git-add--interactive.perl:1470
+#, 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,?] ? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - appliquer cette section à l'index et à l'arbre de travail\n"
+"n - ne pas appliquer cette section\n"
+"q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
+"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:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - appliquer cette section à l'arbre de travail\n"
+"n - ne pas appliquer cette section\n"
+"q - quitter ; ne pas appliquer cette section ni les autres restantes\n"
+"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:343
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "impossible d'analyser l'entête de section '%.*s'"
+
+#: 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:420
+msgid "could not parse diff"
+msgstr "impossible d'analyser la diff"
+
+#: add-patch.c:439
+msgid "could not parse colored diff"
+msgstr "impossible d'analyser la diff colorée"
+
+#: add-patch.c:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr "échec pour lancer '%s'"
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "sortie sans correspondance depuis interactive.diffFilter"
+
+#: add-patch.c:613
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Votre filtre doit maintenir une correspondance un-pour-un\n"
+"entre les lignes en entrée et en sortie."
+
+#: add-patch.c:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"ligne de contexte attendue #%d dans\n"
+"%.*s"
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"les sections ne se recouvrent pas :\n"
+"%.*s\n"
+"\tne se termine pas par :\n"
+"%.*s"
+
+#: 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"
+
+#: add-patch.c:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Pour éliminer les lignes '%c', rendez-les ' ' (contexte).\n"
+"Pour éliminer les lignes '%c', effacez-les.\n"
+"Les lignes commençant par %c seront éliminées.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: 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 ça ne s'applique pas proprement, vous aurez la possibilité de\n"
+"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:1133
+msgid "could not parse hunk header"
+msgstr "impossible d'analyser l'entête de section"
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' a échoué"
+
+#. 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.
+#.
+#. 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:1247 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: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:1291 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Les appliquer quand même à l'arbre de travail ? "
+
+#: add-patch.c:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Rien n'a été appliqué.\n"
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - laisser cette section non décidée et aller à la suivante non-décidée\n"
+"J - laisser cette section non décidée et aller à la suivante\n"
+"k - laisser cette section non décidée et aller à la précédente non-décidée\n"
+"K - laisser cette section non décidée et aller à la précédente\n"
+"g - sélectionner une section et s'y rendre\n"
+"/ - rechercher une section correspondant à une regex donnée\n"
+"s - découper la section en sections plus petites\n"
+"e - éditer manuellement la section actuelle\n"
+"? - afficher l'aide\n"
+
+#: add-patch.c:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr "Pas de section précédente"
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr "Pas de section suivante"
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr "Aucune autre section à atteindre"
+
+#: add-patch.c:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "aller à quelle section (<ret> pour voir plus) ? "
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "aller à quelle section ? "
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Numéro invalide : '%s'"
+
+#: 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:1575
+msgid "No other hunks to search"
+msgstr "Aucune autre section à rechercher"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "rechercher la regex ? "
+
+#: add-patch.c:1596
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Regex de recherche malformée %s : %s"
+
+#: add-patch.c:1613
+msgid "No hunk matches the given pattern"
+msgstr "Aucune section ne correspond au motif donné"
+
+#: add-patch.c:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "Désolé, impossible de découper cette section"
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Découpée en %d sections."
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr "Désolé, impossible d'éditer cette section"
+
+#: add-patch.c:1680
+msgid "'git apply' failed"
+msgstr "'git apply' a échoué"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Désactivez ce message avec \"git config advice.%s false\""
+
+#: advice.c:161
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sastuce: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:252
 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:164
+#: advice.c:254
 msgid "Committing is not possible because you have unmerged files."
 msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
 
-#: advice.c:166
+#: advice.c:256
 msgid "Merging is not possible because you have unmerged files."
 msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
 
-#: advice.c:168
+#: advice.c:258
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
 
-#: advice.c:170
+#: advice.c:260
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
 
-#: advice.c:172
+#: advice.c:262
 #, 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:180
+#: 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."
@@ -124,23 +865,41 @@ msgstr ""
 "Corrigez-les puis lancez 'git add/rm <fichier>'\n"
 "si nécessaire pour marquer la résolution et valider."
 
-#: advice.c:188
+#: advice.c:278
 msgid "Exiting because of an unresolved conflict."
 msgstr "Abandon à cause de conflit non résolu."
 
-#: advice.c:193 builtin/merge.c:1332
+#: advice.c:283 builtin/merge.c:1375
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
 
-#: advice.c:195
+#: advice.c:285
 msgid "Please, commit your changes before merging."
 msgstr "Veuillez valider vos changements avant de fusionner."
 
-#: advice.c:196
+#: advice.c:286
 msgid "Exiting because of unfinished merge."
 msgstr "Abandon à cause d'une fusion non terminée."
 
-#: advice.c:202
+#: 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 ""
+"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"
+
+#: 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:310
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -193,89 +952,85 @@ msgstr "cmdline se termine par \\"
 msgid "unclosed quote"
 msgstr "citation non fermée"
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "option d'espace non reconnue '%s'"
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "option d'ignorance d'espace non reconnue '%s'"
 
-#: apply.c:135
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
 
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
 msgstr "--3way hors d'un dépôt"
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
 msgstr "--index hors d'un dépôt"
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
 msgstr "--cached hors d'un dépôt"
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Impossible de préparer la regexp d'horodatage %s"
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec a retourné %d pour l'entrée : %s"
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "nom de fichier du patch introuvable à la ligne %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 : mauvais format de git-diff - /dev/null attendu, %s trouvé à la "
 "ligne %d"
 
-#: apply.c:928
+#: 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"
 
-#: apply.c:929
+#: 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"
 
-#: apply.c:934
+#: 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"
 
-#: apply.c:963
+#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "mode invalide dans la ligne %d : %s"
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "lignes d'entête inconsistantes %d et %d"
 
-#: apply.c:1372
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -290,93 +1045,93 @@ 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:1385
+#: 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)"
 
-#: apply.c:1481
+#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recomptage : ligne inattendue : %.*s"
 
-#: apply.c:1550
+#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "fragment de patch sans en-tête à la ligne %d : %.*s"
 
-#: apply.c:1753
+#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "le nouveau fichier dépend de contenus anciens"
 
-#: apply.c:1755
+#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "le fichier supprimé a encore du contenu"
 
-#: apply.c:1789
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "patch corrompu à la ligne %d"
 
-#: apply.c:1826
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "le nouveau fichier %s dépend de contenus anciens"
 
-#: apply.c:1828
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "le fichier supprimé %s a encore du contenu"
 
-#: apply.c:1831
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** attention : le fichier %s devient vide mais n'est pas supprimé"
 
-#: apply.c:1978
+#: apply.c:1977
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "patch binaire corrompu à la ligne %d : %.*s"
 
-#: apply.c:2015
+#: apply.c:2014
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "patch binaire non reconnu à la ligne %d"
 
-#: apply.c:2177
+#: apply.c:2176
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch totalement incompréhensible à la ligne %d"
 
-#: apply.c:2263
+#: apply.c:2262
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: apply.c:2267
+#: apply.c:2266
 #, c-format
 msgid "unable to open or read %s"
 msgstr "ouverture ou lecture de %s impossible"
 
-#: apply.c:2926
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "début de ligne invalide : '%c'"
 
-#: apply.c:3047
+#: 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] "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:3059
+#: apply.c:3068
 #, 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:3065
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -385,466 +1140,503 @@ msgstr ""
 "pendant la recherche de :\n"
 "%.*s"
 
-#: apply.c:3087
+#: apply.c:3096
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "données de patch binaire manquantes pour '%s'"
 
-#: apply.c:3095
+#: apply.c:3104
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "impossible d'appliquer l'inverse d'un patch binaire à '%s' sans la section "
 "inverse"
 
-#: apply.c:3142
+#: apply.c:3151
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "impossible d'appliquer un patch binaire à '%s' sans la ligne complète d'index"
 
-#: apply.c:3152
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 "le patch s'applique à '%s' (%s), ce qui ne correspond pas au contenu actuel."
 
-#: apply.c:3160
+#: apply.c:3170
 #, 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:3178
+#: apply.c:3188
 #, 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:3191
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "le patch binaire ne s'applique par correctement à '%s'"
 
-#: apply.c:3197
+#: apply.c:3208
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "le patch binaire sur '%s' crée un résultat incorrect (%s attendu, mais %s "
 "trouvé)"
 
-#: apply.c:3218
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "le patch a échoué : %s:%ld"
 
-#: apply.c:3341
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
 msgstr "extraction de %s impossible"
 
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
+#: 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 "échec de la lecture de %s"
 
-#: apply.c:3401
+#: apply.c:3412
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
 
-#: apply.c:3430 apply.c:3673
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "le chemin %s a été renommé/supprimé"
 
-#: apply.c:3516 apply.c:3688
+#: apply.c:3527 apply.c:3702
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s : n'existe pas dans l'index"
 
-#: apply.c:3525 apply.c:3696
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s : ne correspond pas à l'index"
 
-#: apply.c:3560
-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 ""
-"le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
-"points."
+"le dépôt n'a pas les blobs nécessaires pour effectuer une fusion à 3 points."
 
-#: apply.c:3563
+#: apply.c:3574
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "Retour à une fusion à 3 points…\n"
+msgid "Performing three-way merge...\n"
+msgstr "Application d'une fusion à 3 points…\n"
 
-#: apply.c:3579 apply.c:3583
+#: apply.c:3590 apply.c:3594
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "impossible de lire le contenu actuel de '%s'"
 
-#: apply.c:3595
+#: apply.c:3606
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "Échec du retour à une fusion à 3 points…\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "Échec de l'application de la fusion à 3 points…\n"
 
-#: apply.c:3609
+#: apply.c:3620
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch %s appliqué avec des conflits.\n"
 
-#: apply.c:3614
+#: apply.c:3625
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch %s appliqué proprement.\n"
 
-#: apply.c:3640
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Retour à une application directe…\n"
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr "le patch de suppression laisse un contenu dans le fichier"
 
-#: apply.c:3713
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s : type erroné"
 
-#: apply.c:3715
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s est de type %o, mais %o attendu"
 
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: 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 "chemin invalide '%s'"
 
-#: apply.c:3924
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s : existe déjà dans l'index"
 
-#: apply.c:3927
+#: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s : existe déjà dans la copie de travail"
 
-#: apply.c:3947
+#: apply.c:3976
 #, 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:3952
+#: apply.c:3981
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 "le nouveau mode (%o) de %s ne correspond pas à l'ancien mode (%o) de %s"
 
-#: apply.c:3972
+#: apply.c:4001
 #, 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:3976
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s : le patch ne s'applique pas"
 
-#: apply.c:3991
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Vérification du patch %s..."
 
-#: apply.c:4083
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 "l'information sha1 est manquante ou inutilisable pour le sous-module %s"
 
-#: apply.c:4090
+#: apply.c:4119
 #, 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:4093
+#: apply.c:4122
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
 
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "échec de make_cache_entry pour le chemin '%s'"
-
-#: apply.c:4102
+#: apply.c:4131
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "impossible d'ajouter %s à l'index temporaire"
 
-#: apply.c:4112
+#: apply.c:4141
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "impossible d'écrire l'index temporaire dans %s"
 
-#: apply.c:4250
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "suppression de %s dans l'index impossible"
 
-#: apply.c:4284
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrompu pour le sous-module %s"
 
-#: apply.c:4290
+#: apply.c:4319
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "stat du fichier nouvellement créé '%s' impossible"
 
-#: apply.c:4298
+#: apply.c:4327
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 "création du magasin de stockage pour le fichier nouvellement créé %s "
 "impossible"
 
-#: apply.c:4304 apply.c:4449
+#: apply.c:4333 apply.c:4478
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "ajout de l'élément de cache %s impossible"
 
-#: apply.c:4347
+#: apply.c:4376 builtin/bisect--helper.c:525
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "échec de l'écriture dans '%s'"
 
-#: apply.c:4351
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
 msgstr "fermeture du fichier '%s'"
 
-#: apply.c:4421
+#: apply.c:4450
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "écriture du fichier '%s' mode %o impossible"
 
-#: apply.c:4519
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s appliqué proprement."
 
-#: apply.c:4527
+#: apply.c:4556
 msgid "internal error"
 msgstr "erreur interne"
 
-#: apply.c:4530
+#: apply.c:4559
 #, 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:4541
+#: apply.c:4570
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "troncature du nom de fichier .rej en %.*s.rej"
 
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
 
-#: apply.c:4563
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Section n°%d appliquée proprement."
 
-#: apply.c:4567
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Section n°%d rejetée."
 
-#: apply.c:4686
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Chemin '%s' non traité."
 
-#: apply.c:4694
+#: apply.c:4733
 msgid "unrecognized input"
 msgstr "entrée non reconnue"
 
-#: apply.c:4714
+#: apply.c:4753
 msgid "unable to read index file"
 msgstr "lecture du fichier d'index impossible"
 
-#: apply.c:4871
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "ouverture impossible du patch '%s' :%s"
 
-#: apply.c:4898
+#: apply.c:4937
 #, 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:4904 apply.c:4919
+#: apply.c:4943 apply.c:4958
 #, 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:4912
+#: 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 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:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
 msgid "Unable to write new index file"
 msgstr "Impossible d'écrire le nouveau fichier d'index"
 
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "chemin"
-
-#: apply.c:4956
+#: apply.c:4995
 msgid "don't apply changes matching the given path"
 msgstr "ne pas appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:4959
+#: apply.c:4998
 msgid "apply changes matching the given path"
 msgstr "appliquer les modifications qui correspondent au chemin donné"
 
-#: apply.c:4961 builtin/am.c:2206
+#: apply.c:5000 builtin/am.c:2318
 msgid "num"
 msgstr "num"
 
-#: apply.c:4962
+#: apply.c:5001
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "supprimer <num> barres obliques des chemins traditionnels de diff"
 
-#: apply.c:4965
+#: apply.c:5004
 msgid "ignore additions made by the patch"
 msgstr "ignorer les additions réalisées par le patch"
 
-#: apply.c:4967
+#: apply.c:5006
 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:4971
+#: apply.c:5010
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "afficher le nombre de lignes ajoutées et supprimées en notation décimale"
 
-#: apply.c:4973
+#: apply.c:5012
 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:4975
+#: apply.c:5014
 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:4977
+#: apply.c:5016
 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:4979
+#: apply.c:5018
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "marquer les nouveaux fichiers `git add --intent-to-add`"
 
-#: apply.c:4981
+#: apply.c:5020
 msgid "apply a patch without touching the working tree"
 msgstr "appliquer les patch sans toucher à la copie de travail"
 
-#: apply.c:4983
+#: apply.c:5022
 msgid "accept a patch that touches outside the working area"
 msgstr "accepter un patch qui touche hors de la copie de travail"
 
-#: apply.c:4986
+#: apply.c:5025
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "appliquer aussi le patch (à utiliser avec --stat/--summary/--check)"
 
-#: apply.c:4988
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "tenter une fusion à 3 points si le patch ne s'applique pas proprement"
+#: apply.c:5027
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr ""
+"tenter une fusion à 3 points, revenir à un rustinage normal en cas d'échec"
 
-#: apply.c:4990
+#: apply.c:5029
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 "construire un index temporaire fondé sur l'information de l'index embarqué"
 
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
 msgid "paths are separated with NUL character"
 msgstr "les chemins sont séparés par un caractère NUL"
 
-#: apply.c:4995
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
 msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
 
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
+#: 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 "action"
 
-#: apply.c:4997
+#: apply.c:5036
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 "détecter des lignes nouvelles ou modifiées qui contiennent des erreurs "
 "d'espace"
 
-#: apply.c:5000 apply.c:5003
+#: apply.c:5039 apply.c:5042
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorer des modifications d'espace lors de la recherche de contexte"
 
-#: apply.c:5006
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr "appliquer le patch en sens inverse"
 
-#: apply.c:5008
+#: apply.c:5047
 msgid "don't expect at least one line of context"
 msgstr "ne pas s'attendre à au moins une ligne de contexte"
 
-#: apply.c:5010
+#: apply.c:5049
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "laisser les sections rejetées dans les fichiers *.rej correspondants"
 
-#: apply.c:5012
+#: apply.c:5051
 msgid "allow overlapping hunks"
 msgstr "accepter les recouvrements de sections"
 
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 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 "mode verbeux"
 
-#: apply.c:5015
+#: apply.c:5054
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tolérer des erreurs de détection de retours chariot manquants en fin de "
 "fichier"
 
-#: apply.c:5018
+#: apply.c:5057
 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:5020 builtin/am.c:2194
+#: apply.c:5059 builtin/am.c:2306
 msgid "root"
 msgstr "racine"
 
-#: apply.c:5021
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr "préfixer tous les noms de fichier avec <root>"
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "impossible de transmettre le blob %s en flux"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "mode de fichier non supporté :0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "impossible de démarrer le filtre '%s'"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "impossible de rediriger un descripteur"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "le filtre '%s' a retourné une erreur"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "le chemin n'est pas codé en UTF-8 valide : %s"
+
+#: archive-zip.c:322
+#, c-format
+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:365 builtin/pack-objects.c:368
+#, c-format
+msgid "deflate error (%d)"
+msgstr "erreur de compression (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>"
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<options>] <arbre ou apparenté> [<chemin>...]"
@@ -864,183 +1656,158 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: 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:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
+#: builtin/merge.c:1144
+#, c-format
+msgid "could not read '%s'"
+msgstr "impossible de lire '%s'"
+
+#: 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 "le chemin '%s' ne correspond à aucun fichier"
 
-#: archive.c:396
+#: archive.c:451
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "référence inexistante : %.*s"
 
-#: archive.c:401
+#: archive.c:457
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "nom d'objet invalide : %s"
 
-#: archive.c:414
+#: archive.c:470
 #, c-format
 msgid "not a tree object: %s"
 msgstr "objet arbre invalide : %s"
 
-#: archive.c:426
+#: archive.c:482
 msgid "current working directory is untracked"
 msgstr "l'arbre de travail actuel est non-suivi"
 
-#: archive.c:457
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "Fichier non trouvé : %s"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "'%s' n'est pas un fichier normal"
+
+#: archive.c:552
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:457
+#: archive.c:552
 msgid "archive format"
 msgstr "format d'archive"
 
-#: archive.c:458 builtin/log.c:1581
+#: archive.c:553 builtin/log.c:1775
 msgid "prefix"
 msgstr "préfixe"
 
-#: archive.c:459
+#: archive.c:554
 msgid "prepend prefix to each pathname in the archive"
 msgstr "préfixer chaque chemin de fichier dans l'archive"
 
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:186
+#: 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 "fichier"
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr "ajouter les fichiers non suivis à l'archive"
+
+#: archive.c:559 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr "écrire l'archive dans ce fichier"
 
-#: archive.c:463
+#: archive.c:561
 msgid "read .gitattributes in working directory"
 msgstr "lire .gitattributes dans le répertoire de travail"
 
-#: archive.c:464
+#: archive.c:562
 msgid "report archived files on stderr"
 msgstr "afficher les fichiers archivés sur stderr"
 
-#: archive.c:465
-msgid "store only"
-msgstr "stockage seulement"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "compression rapide"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "compression efficace"
+#: archive.c:564
+msgid "set compression level"
+msgstr "régler le niveau de compression"
 
-#: archive.c:477
+#: archive.c:567
 msgid "list supported archive formats"
 msgstr "afficher les formats d'archive supportés"
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: 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 "dépôt"
 
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
 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:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
 #: builtin/notes.c:498
 msgid "command"
 msgstr "commande"
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "chemin vers la commande distante git-upload-archive"
 
-#: archive.c:489
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr "Option --remote inattendue"
 
-#: archive.c:491
+#: 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:493
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr "Option --output inattendue"
 
-#: archive.c:515
+#: 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
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Format d'archive inconnu '%s'"
 
-#: archive.c:522
+#: archive.c:616
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argument non supporté pour le format '%s' : -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "impossible de transmettre le blob %s en flux"
-
-#: archive-tar.c:266 archive-zip.c:363
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "mode de fichier non supporté :0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr "impossible de lire %s"
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "impossible de démarrer le filtre '%s'"
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "impossible de rediriger un descripteur"
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "le filtre '%s' a retourné une erreur"
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "le chemin n'est pas codé en UTF-8 valide : %s"
-
-#: archive-zip.c:318
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "le chemin est trop long (%d caractères, SHA1 : %s) : %s"
-
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
-#, c-format
-msgid "deflate error (%d)"
-msgstr "erreur de compression (%d)"
-
-#: archive-zip.c:609
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "l'horodatage est trop grand pour ce système : %<PRIuMAX>"
-
-#: attr.c:213
+#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s n'est pas un nom valide d'attribut"
 
-#: attr.c:370
+#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s non permis : %s : %d"
 
-#: attr.c:410
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1048,22 +1815,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:468
+#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Contenu mal cité dans le fichier '%s' : %s"
 
-#: bisect.c:678
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Impossible de pousser la bissection plus loin !\n"
 
-#: bisect.c:733
+#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s n'est pas un nom de commit valide"
 
-#: bisect.c:758
+#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1072,7 +1839,7 @@ msgstr ""
 "La base de fusion %s est mauvaise.\n"
 "Cela signifie que le bogue été corrigé entre %s et [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1081,7 +1848,7 @@ msgstr ""
 "La base de fusion %s est nouvelle.\n"
 "La propriété a changé entre %s et [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:801
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1090,7 +1857,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:776
+#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1101,57 +1868,57 @@ 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:789
+#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
 "So we cannot be sure the first %s commit is between %s and %s.\n"
 "We continue anyway."
 msgstr ""
-"La base de fusion entre %s et [%s] doit être évitée.\n"
+"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 continue tout de même."
 
-#: bisect.c:822
+#: bisect.c:861
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bissection : une base de fusion doit être testée\n"
 
-#: bisect.c:865
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr "une révision %s est nécessaire"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
 msgstr "impossible de créer le fichier '%s'"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
 msgstr "impossible de lire le fichier '%s'"
 
-#: bisect.c:958
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "impossible de lire les références de bissection"
 
-#: bisect.c:977
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s était à la fois %s et %s\n"
 
-#: bisect.c:985
+#: bisect.c:1066
 #, 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 ""
 "Aucun commit testable n'a été trouvé\n"
-"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
+"Peut-être avez-vous démarré avec un mauvais arguement de chemin ?\n"
 
-#: bisect.c:1004
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1161,48 +1928,48 @@ msgstr[1] "(à peu près %d étapes)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1101
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bissection : %d révision à tester après ceci %s\n"
 msgstr[1] "Bissection : %d révisions à tester après ceci %s\n"
 
-#: blame.c:2700
+#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents et --reverse ne font pas bon ménage."
 
-#: blame.c:2714
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr "on ne peut pas utiliser --contents avec un nom d'objet commit final"
 
-#: blame.c:2735
+#: 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"
 
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
-#: builtin/shortlog.c:192
+#: 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 "échec de la préparation du parcours des révisions"
 
-#: blame.c:2762
+#: 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"
 
-#: blame.c:2773
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "pas de chemin %s dans %s"
 
-#: blame.c:2784
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "impossible de lire le blob %s  pour le chemin %s"
@@ -1345,419 +2112,380 @@ msgstr "Nom d'objet ambigu : '%s'."
 msgid "Not a valid branch point: '%s'."
 msgstr "Point d'embranchement invalide : '%s'."
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' est déjà extrait dans '%s'"
 
-#: branch.c:387
+#: branch.c:389
 #, 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:36
+#: bundle.c:44
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algorithme d'empreinte du colis inconnu : %s"
+
+#: bundle.c:48
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' ne semble pas être un fichier bundle v2"
+msgid "unknown capability '%s'"
+msgstr "capacité inconnue '%s'"
 
-#: bundle.c:64
+#: 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:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "en-tête non reconnu : %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
-#: builtin/commit.c:791
+#: 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 "impossible d'ouvrir '%s'"
 
-#: bundle.c:143
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
 
-#: bundle.c:146
+#: 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:197
+#: 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:204
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "Le colis enregistre l'historique complet."
 
-#: bundle.c:206
+#: 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:272
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "impossible de dupliquer le descripteur de liasse"
 
-#: bundle.c:279
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Impossible de créer des objets groupés"
 
-#: bundle.c:290
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "les objets groupés ont disparu"
 
-#: bundle.c:332
-msgid "rev-list died"
-msgstr "rev-list a disparu"
-
-#: bundle.c:381
+#: 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:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
+#: bundle.c:504
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "version de colis non supportée %d"
+
+#: 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:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argument non reconnu : %s"
 
-#: bundle.c:468
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Refus de créer un colis vide."
 
-#: bundle.c:478
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "impossible de créer '%s'"
 
-#: bundle.c:503
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "l'index de groupe a disparu"
 
-#: color.c:296
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "Valeur invalide de couleur : %.*s"
+#: 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"
 
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
+#: chunk-format.c:126
 #, c-format
-msgid "could not parse %s"
-msgstr "impossible d'analyser %s"
-
-#: commit.c:52
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s n'est pas un commit !"
-
-#: commit.c:192
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Le support de <GIT_DIR>/info/grafts est déconseillé\n"
-"et sera supprimé dans une version future de Git.\n"
-"\n"
-"Veuillez utiliser \"git replace --convert-graft-file\"\n"
-"pour convertir les grafts en référence de remplacement.\n"
-"\n"
-"Supprimez ce message en lançant\n"
-"\"git config advice.graftFileDeprecated false\""
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "décalage(s) de section incorrect(s) %<PRIx64> et %<PRIx64>"
 
-#: commit.c:1128
+#: chunk-format.c:133
 #, 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."
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "ID de section dupliqué %<PRIx32>"
 
-#: commit.c:1131
+#: chunk-format.c:147
 #, 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."
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "la section finale a un id non nul %<PRIx32>"
 
-#: commit.c:1134
+#: color.c:329
 #, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "La validation %s n'a pas de signature GPG."
-
-#: commit.c:1137
-#, 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"
+msgid "invalid color value: %.*s"
+msgstr "valeur invalide de couleur : %.*s"
 
-#: commit.c:1391
-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"
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr "version d'empreinte invalide"
 
-#: commit-graph.c:127
+#: commit-graph.c:262
 msgid "commit-graph file is too small"
 msgstr "le graphe de commit est trop petit"
 
-#: commit-graph.c:192
+#: 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"
 
-#: commit-graph.c:199
+#: commit-graph.c:362
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "la version %X du graphe de commit ne correspond pas à la version %X"
 
-#: commit-graph.c:206
+#: 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"
 
-#: commit-graph.c:229
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"entrée de table de consultation de morceaux de graphe de commite manquante ; "
-"le fichier est peut être incomplet"
-
-#: commit-graph.c:240
-#, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "décalage de bloc %08x%08x du graphe de commit inadéquat"
-
-#: commit-graph.c:283
+#: commit-graph.c:386
 #, 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 "commit-graph file is too small to hold %u chunks"
+msgstr "le graphe de commit est trop petit pour contenir %u sections"
 
-#: commit-graph.c:347
+#: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
 msgstr "le graphe de commit n'a pas de section de graphes de base"
 
-#: commit-graph.c:357
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr "la chaîne de graphe de commit ne correspond pas"
 
-#: commit-graph.c:404
+#: 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"
 
-#: commit-graph.c:430
+#: 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:561 commit-graph.c:621
+#: commit-graph.c:745 commit-graph.c:782
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "position de commit invalide. Le graphe de commit est vraisemblablement "
 "corrompu"
 
-#: commit-graph.c:582
+#: commit-graph.c:766
 #, c-format
 msgid "could not find commit %s"
 msgstr "impossible de trouver le commit %s"
 
-#: commit-graph.c:855 builtin/am.c:1287
+#: commit-graph.c:799
+msgid "commit-graph requires overflow generation data but has none"
+msgstr ""
+"le graphe de commits requiert des données de génération de débordement mais "
+"n'en contient pas"
+
+#: commit-graph.c:1075 builtin/am.c:1341
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: commit-graph.c:859
-#, c-format
-msgid "unable to get tree for %s"
-msgstr "impossible de récupérer l'arbre de %s"
-
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "impossible d'obtenir le type de l'objet %s"
 
-#: commit-graph.c:1049
+#: commit-graph.c:1368
 msgid "Loading known commits in commit graph"
 msgstr "Lecture des commits connus dans un graphe de commit"
 
-#: commit-graph.c:1066
+#: commit-graph.c:1385
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expansion des commits joignables dans un graphe de commit"
 
-#: commit-graph.c:1085
+#: commit-graph.c:1405
 msgid "Clearing commit marks in commit graph"
 msgstr "Suppression les marques de commit dans le graphe de commits"
 
-#: commit-graph.c:1104
+#: commit-graph.c:1424
+msgid "Computing commit graph topological levels"
+msgstr "Calcul des niveaux topologiques du graphe de commits"
+
+#: commit-graph.c:1477
 msgid "Computing commit graph generation numbers"
 msgstr "Calcul des chiffres de génération du graphe de commits"
 
-#: commit-graph.c:1179
+#: commit-graph.c:1558
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Calcul des filtres Bloom des chemins modifiés du commit"
+
+#: commit-graph.c:1635
+msgid "Collecting referenced commits"
+msgstr "Collecte des commits référencés"
+
+#: 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] "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:1192
+#: commit-graph.c:1673
 #, c-format
 msgid "error adding pack %s"
 msgstr "erreur à l'ajout du packet %s"
 
-#: commit-graph.c:1196
+#: commit-graph.c:1677
 #, c-format
 msgid "error opening index for %s"
 msgstr "erreur à l'ouverture de l'index pour %s"
 
-#: commit-graph.c:1220
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Recherche de commits pour un graphe de commits depuis %d réf"
-msgstr[1] "Recherche de commits pour un graphe de commits depuis %d réfs"
-
-#: commit-graph.c:1240
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "identifiant d'objet commit invalide : %s"
-
-#: commit-graph.c:1255
+#: commit-graph.c:1714
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 "Recherche de commits pour un graphe de commits parmi les objets empaquetés"
 
-#: commit-graph.c:1270
-msgid "Counting distinct commits in commit graph"
-msgstr "Comptage des commits distincts dans un graphe de commit"
-
-#: commit-graph.c:1300
+#: commit-graph.c:1732
 msgid "Finding extra edges in commit graph"
 msgstr "Recherche d'arêtes supplémentaires dans un graphe de commits"
 
-#: commit-graph.c:1346
+#: commit-graph.c:1781
 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:1379 midx.c:810
+#: commit-graph.c:1812 midx.c:911
 #, 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:1391 builtin/index-pack.c:306 builtin/repack.c:241
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr "impossible de créer une couche de graphe temporaire"
+
+#: commit-graph.c:1830
 #, c-format
-msgid "unable to create '%s'"
-msgstr "impossible de créer '%s'"
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "impossible de régler les droits partagés pour '%s'"
 
-#: commit-graph.c:1451
+#: 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] "Écriture le graphe de commits en %d passe"
 msgstr[1] "Écriture le graphe de commits en %d passes"
 
-#: commit-graph.c:1492
+#: commit-graph.c:1923
 msgid "unable to open commit-graph chain file"
 msgstr "impossible d'ouvrir le fichier de graphe de commit"
 
-#: commit-graph.c:1504
+#: commit-graph.c:1939
 msgid "failed to rename base commit-graph file"
 msgstr "échec du renommage du fichier de graphe de commits"
 
-#: commit-graph.c:1524
+#: commit-graph.c:1959
 msgid "failed to rename temporary commit-graph file"
 msgstr "impossible de renommer le fichier temporaire de graphe de commits"
 
-#: commit-graph.c:1635
+#: commit-graph.c:2092
 msgid "Scanning merged commits"
 msgstr "Analyse des commits de fusion"
 
-#: commit-graph.c:1646
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "id de commit %s dupliqué inattendu"
-
-#: commit-graph.c:1670
+#: commit-graph.c:2136
 msgid "Merging commit-graph"
-msgstr "fusion du graphe de commits"
+msgstr "Fusion du graphe de commits"
 
-#: commit-graph.c:1860
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "le graphe de commits ne peut pas écrire %d commits"
+#: commit-graph.c:2244
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+"essai d'écriture de graphe de commits, mais 'core.commitGraph' est désactivé"
 
-#: commit-graph.c:1871
+#: commit-graph.c:2351
 msgid "too many commits to write graph"
 msgstr "trop de commits pour écrire un graphe"
 
-#: commit-graph.c:1961
+#: commit-graph.c:2449
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "le graphe de commit a une somme de contrôle incorrecte et est "
 "vraisemblablement corrompu"
 
-#: commit-graph.c:1971
+#: commit-graph.c:2459
 #, 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:1981 commit-graph.c:1996
+#: commit-graph.c:2469 commit-graph.c:2484
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "le graphe de commit a une valeur de dispersion incorrecte : dispersion[%d] = "
 "%u != %u"
 
-#: commit-graph.c:1988
+#: commit-graph.c:2476
 #, 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:2006
+#: commit-graph.c:2494
 msgid "Verifying commits in commit graph"
 msgstr "Verification des commits dans le graphe de commits"
 
-#: commit-graph.c:2020
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "échec de l'analyse du commit %s depuis la base de données d'objets pour le "
 "graphe de commit"
 
-#: commit-graph.c:2027
+#: commit-graph.c:2516
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "l'OID de l'arbre racine pour le commit %s dans le graphe de commit est %s != "
 "%s"
 
-#: commit-graph.c:2037
+#: commit-graph.c:2526
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 "la liste des parents du graphe de commit pour le commit %s est trop longue"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2535
 #, 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:2059
+#: commit-graph.c:2549
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 "la liste de parents du graphe de commit pour le commit %s se termine trop tôt"
 
-#: commit-graph.c:2064
+#: commit-graph.c:2554
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1765,7 +2493,7 @@ msgstr ""
 "le graphe de commit a un numéro de génération nul pour le commit %s, mais "
 "non-nul ailleurs"
 
-#: commit-graph.c:2068
+#: commit-graph.c:2558
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1773,23 +2501,88 @@ 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:2083
+#: commit-graph.c:2575
 #, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "la génération du graphe de commit pour le commit %s est %u != %u"
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"la génération du graphe de commit pour le commit %s est %<PRIuMAX> < "
+"%<PRIuMAX>"
 
-#: commit-graph.c:2089
+#: commit-graph.c:2581
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "la date de validation pour le commit %s dans le graphe de commit est "
 "%<PRIuMAX> != %<PRIuMAX>"
 
+#: commit.c: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 "impossible d'analyser %s"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s n'est pas un commit !"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Le support de <GIT_DIR>/info/grafts est déconseillé\n"
+"et sera supprimé dans une version future de Git.\n"
+"\n"
+"Veuillez utiliser \"git replace --convert-graft-file\"\n"
+"pour convertir les grafts en référence de remplacement.\n"
+"\n"
+"Supprimez ce message en lançant\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#: commit.c:1237
+#, 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
+#, 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
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "La validation %s n'a pas de signature GPG."
+
+#: commit.c:1247
+#, 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
+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"
+
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "plus de mémoire"
 
-#: config.c:124
+#: config.c:126
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1804,306 +2597,350 @@ msgstr ""
 "\t%s\n"
 "possibilité d'inclusions multiples."
 
-#: config.c:140
+#: config.c:142
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "expansion impossible du chemin d'inclusion '%s'"
 
-#: config.c:151
+#: config.c:153
 msgid "relative config includes must come from files"
 msgstr "les inclusions de configuration relatives doivent venir de fichiers"
 
-#: config.c:197
+#: config.c:199
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "les conditions d'inclusion de configuration relative doivent venir de "
 "fichiers"
 
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "format de config invalide : %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "nom de variable d'environnement manquant pour le configuration '%.*s'"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "variable d'environnement '%s' manquante pour le configuration '%.*s'"
+
+#: config.c:442
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "la clé ne contient pas de section: %s"
 
-#: config.c:382
+#: config.c:448
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "la clé ne contient pas de nom de variable : %s"
 
-#: config.c:406 sequencer.c:2401
+#: config.c:472 sequencer.c:2785
 #, c-format
 msgid "invalid key: %s"
 msgstr "clé invalide : %s"
 
-#: config.c:412
+#: config.c:478
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "clé invalide (retour chariot) : %s"
 
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "clé de configuration vide"
+
+#: config.c:529 config.c:541
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "paramètre de configuration mal formé: %s"
 
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
 #, c-format
 msgid "bogus format in %s"
 msgstr "formatage mal formé dans %s"
 
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "compte faux dans %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "trop d'entrées dans %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "clé de configuration %s manquante"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "valeur de config manquante %s"
+
+#: config.c:995
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "ligne %d de config incorrecte dans le blob %s"
 
-#: config.c:825
+#: config.c:999
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "ligne %d de config incorrecte dans le fichier %s"
 
-#: config.c:829
+#: config.c:1003
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "ligne %d de config incorrecte dans l'entrée standard"
 
-#: config.c:833
+#: config.c:1007
 #, 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:837
+#: config.c:1011
 #, 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:841
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "ligne %d de config incorrecte dans %s"
 
-#: config.c:978
+#: config.c:1152
 msgid "out of range"
 msgstr "hors plage"
 
-#: config.c:978
+#: config.c:1152
 msgid "invalid unit"
 msgstr "unité invalide"
 
-#: config.c:979
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "valeur numérique de configuration invalide '%s' pour '%s' : %s"
 
-#: config.c:998
+#: config.c:1163
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob "
 "%s : %s"
 
-#: config.c:1001
+#: config.c:1166
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le fichier "
 "%s : %s"
 
-#: config.c:1004
+#: config.c:1169
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans l'entrée "
 "standard : %s"
 
-#: config.c:1007
+#: config.c:1172
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans le blob de "
 "sous-module %s : %s"
 
-#: config.c:1010
+#: config.c:1175
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans la ligne de "
 "commande %s : %s"
 
-#: config.c:1013
+#: config.c:1178
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr ""
 "valeur numérique de configuration incorrecte '%s' pour '%s' dans %s : %s"
 
-#: config.c:1108
+#: config.c:1257
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "valeur booléenne de configuration invalide '%s' pour '%s'"
+
+#: config.c:1275
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
 
-#: config.c:1117
+#: config.c:1284
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' pour '%s' n'est pas un horodatage valide"
 
-#: config.c:1208
+#: config.c:1377
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "longueur d'abbrev hors plage : %d"
 
-#: config.c:1222 config.c:1233
+#: config.c:1391 config.c:1402
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "niveau de compression zlib incorrect %d"
 
-#: config.c:1325
+#: config.c:1494
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar ne devrait être qu'un unique caractère"
 
-#: config.c:1358
+#: config.c:1527
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "mode invalide pour la création d'objet : %s"
 
-#: config.c:1425
+#: config.c:1599
 #, c-format
 msgid "malformed value for %s"
 msgstr "valeur mal formée pour %s"
 
-#: config.c:1451
+#: config.c:1625
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "valeur mal formée pour %s : %s"
 
-#: config.c:1452
+#: config.c:1626
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "doit être parmi nothing, matching, simple, upstream ou current"
 
-#: config.c:1513 builtin/pack-objects.c:3394
+#: config.c:1687 builtin/pack-objects.c:4084
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "niveau de compression du paquet %d"
 
-#: config.c:1634
+#: config.c:1809
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "impossible de charger l'objet blob de config '%s'"
 
-#: config.c:1637
+#: config.c:1812
 #, 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:1654
+#: config.c:1829
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "impossible de résoudre le blob de config '%s'"
 
-#: config.c:1684
+#: config.c:1874
 #, c-format
 msgid "failed to parse %s"
 msgstr "échec de l'analyse de %s"
 
-#: config.c:1740
+#: config.c:1930
 msgid "unable to parse command-line config"
 msgstr "lecture de la configuration de ligne de commande impossible"
 
-#: config.c:2091
+#: config.c:2294
 msgid "unknown error occurred while reading the configuration files"
 msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
 
-#: config.c:2261
+#: config.c:2468
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s invalide : '%s'"
 
-#: config.c:2306
+#: config.c:2513
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "la valeur '%d' de splitIndex.maxPercentChange devrait se situer entre 0 et "
 "100"
 
-#: config.c:2352
+#: config.c:2559
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 "impossible d'analyser '%s' depuis le configuration en ligne de commande"
 
-#: config.c:2354
+#: config.c:2561
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 "variable de configuration '%s' incorrecte dans le fichier '%s' à la ligne %d"
 
-#: config.c:2435
+#: config.c:2645
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nom de section invalide '%s'"
 
-#: config.c:2467
+#: config.c:2677
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s a des valeurs multiples"
 
-#: config.c:2496
+#: config.c:2706
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "impossible d'écrire le fichier de configuration %s"
 
-#: config.c:2748 config.c:3072
+#: config.c:2958 config.c:3285
 #, c-format
 msgid "could not lock config file %s"
 msgstr "impossible de verrouiller le fichier de configuration %s"
 
-#: config.c:2759
+#: config.c:2969
 #, c-format
 msgid "opening %s"
 msgstr "ouverture de %s"
 
-#: config.c:2794 builtin/config.c:328
+#: config.c:3006 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "motif invalide : %s"
 
-#: config.c:2819
+#: config.c:3031
 #, c-format
 msgid "invalid config file %s"
 msgstr "fichier de configuration invalide %s"
 
-#: config.c:2832 config.c:3085
+#: config.c:3044 config.c:3298
 #, c-format
 msgid "fstat on %s failed"
 msgstr "échec de fstat sur %s"
 
-#: config.c:2843
+#: config.c:3055
 #, 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:2852 config.c:3090
+#: config.c:3065 config.c:3303
 #, c-format
 msgid "chmod on %s failed"
 msgstr "échec de chmod sur %s"
 
-#: config.c:2937 config.c:3187
+#: config.c:3150 config.c:3400
 #, c-format
 msgid "could not write config file %s"
 msgstr "impossible d'écrire le fichier de configuration %s"
 
-#: config.c:2971
+#: config.c:3184
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "impossible de régler '%s' à '%s'"
 
-#: config.c:2973 builtin/remote.c:782
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr "impossible de désinitialiser '%s'"
 
-#: config.c:3063
+#: config.c:3276
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nom de section invalide : %s"
 
-#: config.c:3230
+#: config.c:3443
 #, c-format
 msgid "missing value for '%s'"
 msgstr "valeur manquante pour '%s'"
@@ -2127,74 +2964,83 @@ msgstr ""
 #: connect.c:81
 #, c-format
 msgid "server doesn't support '%s'"
-msgstr "Le serveur ne supporte pas '%s'"
+msgstr "le serveur ne supporte pas '%s'"
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
-msgstr "Le serveur ne supporte pas la fonctionnalité '%s'"
+msgstr "le serveur ne supporte pas la fonctionnalité '%s'"
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
 msgstr "vidage attendu après les capacités"
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "capacités ignorées après la première ligne '%s'"
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "erreur de protocole : capabilities^{} inattendu"
 
-#: connect.c:273
+#: connect.c:306
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "erreur de protocole : shallow sha-1 attendu, '%s' trouvé"
 
-#: connect.c:275
+#: connect.c:308
 msgid "repository on the other end cannot be shallow"
 msgstr "le dépôt distant ne peut pas être superficiel"
 
-#: connect.c:313
+#: connect.c:347
 msgid "invalid packet"
 msgstr "paquet invalide"
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "erreur de protocole : '%s' attendu"
 
-#: connect.c:441
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "format d'objet spécifié par le serveur inconnu '%s'"
+
+#: connect.c:526
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "réponse à ls-ref invalide : %s"
 
-#: connect.c:445
+#: connect.c:530
 msgid "expected flush after ref listing"
 msgstr "vidage attendu après le listage de références"
 
-#: connect.c:544
+#: connect.c:533
+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
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "le protocole '%s' n'est pas supporté"
 
-#: connect.c:595
+#: connect.c:717
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "impossible de positionner SO_KEEPALIVE sur la socket"
 
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Recherche de %s… "
 
-#: connect.c:639
+#: connect.c:761
 #, 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:643 connect.c:714
+#: connect.c:765 connect.c:836
 #, c-format
 msgid ""
 "done.\n"
@@ -2203,7 +3049,7 @@ msgstr ""
 "fait.\n"
 "Connexion à %s (port %s)… "
 
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2213,89 +3059,94 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
 msgid "done."
 msgstr "fait."
 
-#: connect.c:702
+#: connect.c:824
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "impossible de rechercher %s (%s)"
 
-#: connect.c:708
+#: connect.c:830
 #, c-format
 msgid "unknown port %s"
 msgstr "port inconnu %s"
 
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "nom d'hôte étrange '%s' bloqué"
 
-#: connect.c:847
+#: connect.c:969
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "port étrange '%s' bloqué"
 
-#: connect.c:857
+#: connect.c:979
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "impossible de démarrer un proxy %s"
 
-#: connect.c:928
+#: connect.c:1050
 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"
 
-#: connect.c:1123
+#: connect.c:1190
+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"
+
+#: connect.c:1247
 msgid "ssh variant 'simple' does not support -4"
 msgstr "la variante ssh 'simple' ne supporte pas -4"
 
-#: connect.c:1135
+#: connect.c:1259
 msgid "ssh variant 'simple' does not support -6"
 msgstr "la variante ssh 'simple' ne supporte pas -6"
 
-#: connect.c:1152
+#: connect.c:1276
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "la variante ssh 'simple' ne supporte pas de spécifier le port"
 
-#: connect.c:1264
+#: connect.c:1388
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "chemin étrange '%s' bloqué"
 
-#: connect.c:1311
+#: connect.c:1436
 msgid "unable to fork"
 msgstr "fork impossible"
 
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "Vérification de la connectivité"
 
-#: connected.c:100
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
 msgstr "Impossible de lancer 'git rev-list'"
 
-#: connected.c:120
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr "impossible d'écrire dans la rev-list"
 
-#: connected.c:127
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "impossible de fermer l'entrée standard du rev-list"
 
-#: convert.c:194
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "crlf_action illégal %d"
 
-#: convert.c:207
+#: convert.c:196
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "Les CRLF seraient remplacés par des LF dans %s"
 
-#: convert.c:209
+#: convert.c:198
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2304,12 +3155,12 @@ msgstr ""
 "Les CRLF seront remplacés par des LF dans %s.\n"
 "Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"
 
-#: convert.c:217
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "Les LF seraient remplacés par des CRLF dans %s"
 
-#: convert.c:219
+#: convert.c:208
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2318,26 +3169,26 @@ msgstr ""
 "Les LF seront remplacés par des CRLF dans %s.\n"
 "Le fichier conservera ses fins de ligne d'origine dans votre copie de travail"
 
-#: convert.c:280
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "Aucun BOM n'est permis dans '%s' s'il est encodé comme %s"
 
-#: convert.c:287
+#: convert.c:280
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"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."
+"utiliser UTF-%.*s comme encodage d'arbre de travail."
 
-#: convert.c:305
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr "Un BOM est obligatoire dans '%s' s'il est encodé comme %s"
 
-#: convert.c:307
+#: convert.c:295
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2347,52 +3198,52 @@ msgstr ""
 "utiliser UTF-%sBE ou UTF-%sLE (selon l'ordre désiré) comme encodage d'arbre "
 "de travail."
 
-#: convert.c:425 convert.c:496
+#: convert.c:408 convert.c:479
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "échec de l'encodage de '%s' de %s vers %s"
 
-#: convert.c:468
+#: 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"
 
-#: convert.c:674
+#: convert.c:654
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "impossible de forker pour lancer le filtre externe '%s'"
 
-#: convert.c:694
+#: convert.c:674
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "impossible de fournir l'entrée au filtre externe '%s'"
 
-#: convert.c:701
+#: convert.c:681
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "le filtre externe '%s' a échoué %d"
 
-#: convert.c:736 convert.c:739
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "la lecture depuis le filtre externe '%s' a échoué"
 
-#: convert.c:742 convert.c:797
+#: convert.c:722 convert.c:777
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "le filtre externe '%s' a échoué"
 
-#: convert.c:845
+#: convert.c:826
 msgid "unexpected filter type"
 msgstr "type de filtre inattendu"
 
-#: convert.c:856
+#: convert.c:837
 msgid "path name too long for external filter"
 msgstr "nom de chemin trop long pour un filtre externe"
 
-#: convert.c:930
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2401,20 +3252,51 @@ msgstr ""
 "le filtre externe '%s' n'est plus disponible bien que tous les chemins "
 "n'aient pas été filtrés"
 
-#: convert.c:1229
+#: 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:1417 convert.c:1451
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s : le filtre clean '%s' a échoué"
 
-#: convert.c:1495
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 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"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+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"
+
+#: credential.c:394
+#, 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
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "l'url n'a pas de schéma : %s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "impossible d'analyser l'url d'identification : %s"
+
 #: date.c:138
 msgid "in the future"
 msgstr "dans le futur"
@@ -2509,20 +3391,36 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr "Marquage de %d îlots, fait.\n"
 
-#: diffcore-order.c:24
+#: diff-merges.c:70
 #, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "impossible de lire le fichier de commande '%s'"
+msgid "unknown value for --diff-merges: %s"
+msgstr "valeur inconnue pour --diff-merges : %s"
 
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Détection de renommage inexact en cours"
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base ne fonctionne pas avec des plages"
+
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr "--merge-base ne fonctionne qu'avec des commits"
+
+#: diff-lib.c:576
+msgid "unable to get HEAD"
+msgstr "impossible d'acquérir HEAD"
+
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr "aucune base de fusion trouvée"
 
-#: diff-no-index.c:238
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr "bases multiples de fusion trouvées"
+
+#: 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
+#: diff-no-index.c:262
 msgid ""
 "Not a git repository. Use --no-index to compare two paths outside a working "
 "tree"
@@ -2530,26 +3428,26 @@ msgstr ""
 "Pas un dépôt git. Utilisez --no-index pour comparer deux chemins hors d'un "
 "arbre de travail"
 
-#: diff.c:155
+#: diff.c:156
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  Impossible d'analyser le pourcentage de modification de dirstat '%s'\n"
 
-#: diff.c:160
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Paramètre dirstat inconnu '%s'\n"
 
-#: diff.c:296
+#: 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'"
+"'blocks', 'zebra', 'dimmed-zebra' ou 'plain'"
 
-#: diff.c:324
+#: diff.c:325
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -2559,7 +3457,7 @@ msgstr ""
 "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
 "change'"
 
-#: diff.c:332
+#: diff.c:333
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -2567,13 +3465,13 @@ msgstr ""
 "color-moved-ws : allow-indentation-change ne peut pas être combiné avec "
 "d'autres modes d'espace"
 
-#: diff.c:405
+#: diff.c:410
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 "Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
 
-#: diff.c:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -2582,35 +3480,50 @@ msgstr ""
 "Erreurs dans la variable de configuration 'diff.dirstat' :\n"
 "%s"
 
-#: diff.c:4218
+#: diff.c:4282
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "l'application de diff externe a disparu, arrêt à %s"
 
-#: diff.c:4563
+#: diff.c:4634
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
 
-#: diff.c:4566
+#: diff.c:4637
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S et --find-object sont mutuellement exclusifs"
 
-#: diff.c:4644
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+"-G et --pickaxe-regex sont mutuellement exclusifs, utilisez --pickaxe-regex "
+"avec -S"
+
+#: diff.c:4643
+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"
+
+#: diff.c:4722
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow a besoin d'une spécification de chemin unique"
 
-#: diff.c:4692
+#: diff.c:4770
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valeur invalide de --stat : %s"
 
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
-#: parse-options.c:199 parse-options.c:203
+#: 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
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s attend une valeur numérique"
 
-#: diff.c:4729
+#: diff.c:4807
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2619,42 +3532,42 @@ msgstr ""
 "Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
 "%s"
 
-#: diff.c:4814
+#: diff.c:4892
 #, 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:4838
+#: diff.c:4916
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valeur inconnue après ws-error-highlight=%.*s"
 
-#: diff.c:4852
+#: diff.c:4930
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "impossible de résoudre '%s'"
 
-#: diff.c:4902 diff.c:4908
+#: diff.c:4980 diff.c:4986
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "forme <n>/<m> attendue par %s"
 
-#: diff.c:4920
+#: diff.c:4998
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "caractère attendu par %s, '%s' trouvé"
 
-#: diff.c:4941
+#: diff.c:5019
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "mauvais argument --color-moved : %s"
 
-#: diff.c:4960
+#: diff.c:5038
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "mode invalide '%s' dans --color-moved-ws"
 
-#: diff.c:5000
+#: diff.c:5078
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2662,155 +3575,160 @@ msgstr ""
 "l'option diff-algorithm accept \"myers\", \"minimal\", \"patience\" et "
 "\"histogram\""
 
-#: diff.c:5036 diff.c:5056
+#: diff.c:5114 diff.c:5134
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argument invalide pour %s"
 
-#: diff.c:5194
+#: diff.c:5238
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "regex invalide fournie à -I : '%s'"
+
+#: diff.c:5287
 #, 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:5250
+#: diff.c:5343
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "mauvais argument pour --word-diff : %s"
 
-#: diff.c:5273
+#: diff.c:5379
 msgid "Diff output format options"
 msgstr "Options de format de sortie de diff"
 
-#: diff.c:5275 diff.c:5281
+#: diff.c:5381 diff.c:5387
 msgid "generate patch"
 msgstr "générer la rustine"
 
-#: diff.c:5278 builtin/log.c:172
+#: diff.c:5384 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "supprimer la sortie des différences"
 
-#: diff.c:5283 diff.c:5397 diff.c:5404
+#: diff.c:5389 diff.c:5503 diff.c:5510
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5284 diff.c:5287
+#: diff.c:5390 diff.c:5393
 msgid "generate diffs with <n> lines context"
 msgstr "générer les diffs avec <n> lignes de contexte"
 
-#: diff.c:5289
+#: diff.c:5395
 msgid "generate the diff in raw format"
 msgstr "générer le diff en format brut"
 
-#: diff.c:5292
+#: diff.c:5398
 msgid "synonym for '-p --raw'"
 msgstr "synonyme de '-p --raw'"
 
-#: diff.c:5296
+#: diff.c:5402
 msgid "synonym for '-p --stat'"
 msgstr "synonyme de '-p --stat'"
 
-#: diff.c:5300
+#: diff.c:5406
 msgid "machine friendly --stat"
 msgstr "--stat pour traitement automatique"
 
-#: diff.c:5303
+#: diff.c:5409
 msgid "output only the last line of --stat"
 msgstr "afficher seulement la dernière ligne de --stat"
 
-#: diff.c:5305 diff.c:5313
+#: diff.c:5411 diff.c:5419
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5306
+#: diff.c:5412
 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:5310
+#: diff.c:5416
 msgid "synonym for --dirstat=cumulative"
 msgstr "synonyme pour --dirstat=cumulative"
 
-#: diff.c:5314
+#: diff.c:5420
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "synonyme pour --dirstat=files,param1,param2..."
 
-#: diff.c:5318
+#: diff.c:5424
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "avertir si les modifications introduisent des marqueurs de conflit ou des "
 "erreurs d'espace"
 
-#: diff.c:5321
+#: diff.c:5427
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "résumé succinct tel que les créations, les renommages et les modifications "
 "de mode"
 
-#: diff.c:5324
+#: diff.c:5430
 msgid "show only names of changed files"
 msgstr "n'afficher que les noms de fichiers modifiés"
 
-#: diff.c:5327
+#: diff.c:5433
 msgid "show only names and status of changed files"
 msgstr "n'afficher que les noms et les status des fichiers modifiés"
 
-#: diff.c:5329
+#: diff.c:5435
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<largeur>[,<largeur-de-nom>[,<compte>]]"
 
-#: diff.c:5330
+#: diff.c:5436
 msgid "generate diffstat"
 msgstr "générer un diffstat"
 
-#: diff.c:5332 diff.c:5335 diff.c:5338
+#: diff.c:5438 diff.c:5441 diff.c:5444
 msgid "<width>"
 msgstr "<largeur>"
 
-#: diff.c:5333
+#: diff.c:5439
 msgid "generate diffstat with a given width"
 msgstr "générer un diffstat avec la largeur indiquée"
 
-#: diff.c:5336
+#: diff.c:5442
 msgid "generate diffstat with a given name width"
 msgstr "génerer un diffstat avec la largeur de nom indiquée"
 
-#: diff.c:5339
+#: diff.c:5445
 msgid "generate diffstat with a given graph width"
 msgstr "génerer un diffstat avec la largeur de graphe indiquée"
 
-#: diff.c:5341
+#: diff.c:5447
 msgid "<count>"
 msgstr "<compte>"
 
-#: diff.c:5342
+#: diff.c:5448
 msgid "generate diffstat with limited lines"
 msgstr "générer un diffstat avec des lignes limitées"
 
-#: diff.c:5345
+#: diff.c:5451
 msgid "generate compact summary in diffstat"
 msgstr "générer une résumé compact dans le diffstat"
 
-#: diff.c:5348
+#: diff.c:5454
 msgid "output a binary diff that can be applied"
 msgstr "produire un diff binaire qui peut être appliqué"
 
-#: diff.c:5351
+#: diff.c:5457
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 "afficher les noms complets des objets pre- et post-image sur les lignes "
 "\"index\""
 
-#: diff.c:5353
+#: diff.c:5459
 msgid "show colored diff"
 msgstr "afficher un diff coloré"
 
-#: diff.c:5354
+#: diff.c:5460
 msgid "<kind>"
 msgstr "<sorte>"
 
-#: diff.c:5355
+#: diff.c:5461
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2818,7 +3736,7 @@ msgstr ""
 "surligner les erreurs d'espace dans les lignes 'contexte', 'ancien', "
 "'nouveau' dans le diff"
 
-#: diff.c:5358
+#: diff.c:5464
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2826,93 +3744,93 @@ msgstr ""
 "ne pas compresser les chemins et utiliser des NULs comme terminateurs de "
 "champs dans --raw ou --numstat"
 
-#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
 msgid "<prefix>"
 msgstr "<préfixe>"
 
-#: diff.c:5362
+#: diff.c:5468
 msgid "show the given source prefix instead of \"a/\""
 msgstr "afficher le préfixe de source indiqué au lieu de \"a/\""
 
-#: diff.c:5365
+#: diff.c:5471
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "afficher le préfixe de destination indiqué au lieu de \"b/\""
 
-#: diff.c:5368
+#: diff.c:5474
 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:5371
+#: diff.c:5477
 msgid "do not show any source or destination prefix"
 msgstr "n'afficher aucun préfixe, ni de source, ni de destination"
 
-#: diff.c:5374
+#: diff.c:5480
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "afficher le contexte entre les sections à concurrence du nombre de ligne "
 "indiqué"
 
-#: diff.c:5378 diff.c:5383 diff.c:5388
+#: diff.c:5484 diff.c:5489 diff.c:5494
 msgid "<char>"
 msgstr "<caractère>"
 
-#: diff.c:5379
+#: diff.c:5485
 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:5384
+#: diff.c:5490
 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:5389
+#: diff.c:5495
 msgid "specify the character to indicate a context instead of ' '"
 msgstr ""
 "spécifier le caractère pour indiquer une ligne de contexte au lieu de ' '"
 
-#: diff.c:5392
+#: diff.c:5498
 msgid "Diff rename options"
 msgstr "Options de renommage de diff"
 
-#: diff.c:5393
+#: diff.c:5499
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5394
+#: diff.c:5500
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "casser les modifications d'une réécrire complète en paires de suppression et "
 "création"
 
-#: diff.c:5398
+#: diff.c:5504
 msgid "detect renames"
 msgstr "détecter les renommages"
 
-#: diff.c:5402
+#: diff.c:5508
 msgid "omit the preimage for deletes"
 msgstr "supprimer la pré-image pour les suppressions"
 
-#: diff.c:5405
+#: diff.c:5511
 msgid "detect copies"
 msgstr "détecter les copies"
 
-#: diff.c:5409
+#: diff.c:5515
 msgid "use unmodified files as source to find copies"
 msgstr ""
 "utiliser les fichiers non-modifiés comme sources pour trouver des copies"
 
-#: diff.c:5411
+#: diff.c:5517
 msgid "disable rename detection"
 msgstr "désactiver la détection de renommage"
 
-#: diff.c:5414
+#: diff.c:5520
 msgid "use empty blobs as rename source"
 msgstr "utiliser des blobs vides comme source de renommage"
 
-#: diff.c:5416
+#: diff.c:5522
 msgid "continue listing the history of a file beyond renames"
 msgstr "continuer à afficher l'historique d'un fichier au delà des renommages"
 
-#: diff.c:5419
+#: diff.c:5525
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -2920,161 +3838,165 @@ msgstr ""
 "empêcher la détection de renommage/copie si le nombre de cibles de renommage/"
 "copie excède la limite indiquée"
 
-#: diff.c:5421
+#: diff.c:5527
 msgid "Diff algorithm options"
 msgstr "Options de l'algorithme de diff"
 
-#: diff.c:5423
+#: diff.c:5529
 msgid "produce the smallest possible diff"
 msgstr "produire le diff le plus petit possible"
 
-#: diff.c:5426
+#: diff.c:5532
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorer les espaces lors de la comparaison de ligne"
 
-#: diff.c:5429
+#: diff.c:5535
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorer des modifications du nombre d'espaces"
 
-#: diff.c:5432
+#: diff.c:5538
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorer des modifications d'espace en fin de ligne"
 
-#: diff.c:5435
+#: diff.c:5541
 msgid "ignore carrier-return at the end of line"
 msgstr "ignore le retour chariot en fin de ligne"
 
-#: diff.c:5438
+#: diff.c:5544
 msgid "ignore changes whose lines are all blank"
 msgstr "ignorer les modifications dont les lignes sont vides"
 
-#: diff.c:5441
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5547
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignorer les modifications dont les lignes correspondent à <regex>"
+
+#: diff.c:5550
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "heuristique qui déplace les limites de sections de diff pour faciliter la "
 "lecture"
 
-#: diff.c:5444
+#: diff.c:5553
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "générer un diff en utilisant l'algorithme de différence \"patience\""
 
-#: diff.c:5448
+#: diff.c:5557
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr ""
 "générer un diff en utilisant l'algorithme de différence \"histogramme\""
 
-#: diff.c:5450
+#: diff.c:5559
 msgid "<algorithm>"
 msgstr "<algorithme>"
 
-#: diff.c:5451
+#: diff.c:5560
 msgid "choose a diff algorithm"
 msgstr "choisir un algorithme de différence"
 
-#: diff.c:5453
+#: diff.c:5562
 msgid "<text>"
 msgstr "<texte>"
 
-#: diff.c:5454
+#: diff.c:5563
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "générer un diff en utilisant l'algorithme de différence \"ancré\""
 
-#: diff.c:5456 diff.c:5465 diff.c:5468
+#: diff.c:5565 diff.c:5574 diff.c:5577
 msgid "<mode>"
 msgstr "<mode>"
 
-#: diff.c:5457
+#: diff.c:5566
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "afficher des différences par mot, en utilisant <mode> pour délimiter les "
 "mots modifiés"
 
-#: diff.c:5459 diff.c:5462 diff.c:5507
-msgid "<regex>"
-msgstr "<regex>"
-
-#: diff.c:5460
+#: diff.c:5569
 msgid "use <regex> to decide what a word is"
 msgstr "utiliser <regex> pour décider ce qu'est un mot"
 
-#: diff.c:5463
+#: diff.c:5572
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "équivalent à --word-diff=color --word-diff-regex=<regex>"
 
-#: diff.c:5466
+#: diff.c:5575
 msgid "moved lines of code are colored differently"
 msgstr "les lignes déplacées sont colorées différemment"
 
-#: diff.c:5469
+#: diff.c:5578
 msgid "how white spaces are ignored in --color-moved"
 msgstr "comment les espaces sont ignorés dans --color-moved"
 
-#: diff.c:5472
+#: diff.c:5581
 msgid "Other diff options"
 msgstr "Autres options diff"
 
-#: diff.c:5474
+#: diff.c:5583
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "lancé depuis un sous-répertoire, exclure les modifications en dehors et "
 "afficher les chemins relatifs"
 
-#: diff.c:5478
+#: diff.c:5587
 msgid "treat all files as text"
 msgstr "traiter les fichiers comme texte"
 
-#: diff.c:5480
+#: diff.c:5589
 msgid "swap two inputs, reverse the diff"
 msgstr "échanger les entrées, inverser le diff"
 
-#: diff.c:5482
+#: diff.c:5591
 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:5484
+#: diff.c:5593
 msgid "disable all output of the program"
 msgstr "désactiver tous les affichages du programme"
 
-#: diff.c:5486
+#: diff.c:5595
 msgid "allow an external diff helper to be executed"
 msgstr "autoriser l'exécution d'un assistant externe de diff"
 
-#: diff.c:5488
+#: diff.c:5597
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "lancer les filtres externes de conversion en texte lors de la comparaison de "
 "fichiers binaires"
 
-#: diff.c:5490
+#: diff.c:5599
 msgid "<when>"
 msgstr "<quand>"
 
-#: diff.c:5491
+#: diff.c:5600
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 "ignorer les modifications dans les sous-modules lors de la génération de diff"
 
-#: diff.c:5494
+#: diff.c:5603
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5495
+#: diff.c:5604
 msgid "specify how differences in submodules are shown"
 msgstr "spécifier comment les différences dans les sous-modules sont affichées"
 
-#: diff.c:5499
+#: diff.c:5608
 msgid "hide 'git add -N' entries from the index"
 msgstr "masquer les entrées 'git add -N' de l'index"
 
-#: diff.c:5502
+#: diff.c:5611
 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:5504
+#: diff.c:5613
 msgid "<string>"
 msgstr "<chaîne>"
 
-#: diff.c:5505
+#: diff.c:5614
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -3082,7 +4004,7 @@ msgstr ""
 "rechercher les différences qui modifient le nombre d'occurrences de la "
 "chaîne spécifiée"
 
-#: diff.c:5508
+#: diff.c:5617
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3090,26 +4012,38 @@ msgstr ""
 "rechercher les différences qui modifient le nombre d'occurrences de la regex "
 "spécifiée"
 
-#: diff.c:5511
+#: diff.c:5620
 msgid "show all changes in the changeset with -S or -G"
 msgstr ""
 "afficher toutes les modifications dans l'ensemble de modifications avec -S "
 "ou -G"
 
-#: diff.c:5514
+#: diff.c:5623
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 "traiter <chaîne> dans -S comme une expression rationnelle POSIX étendue"
 
-#: diff.c:5517
+#: diff.c:5626
 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:5518
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr "<chemin>"
+
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr "afficher la modification dans le chemin spécifié en premier"
+
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr "sauter la sortie pour le chemin spécifié"
+
+#: diff.c:5633
 msgid "<object-id>"
 msgstr "<id-objet>"
 
-#: diff.c:5519
+#: diff.c:5634
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -3117,35 +4051,35 @@ msgstr ""
 "rechercher les différences qui modifient le nombre d'occurrences de l'objet "
 "indiqué"
 
-#: diff.c:5521
+#: diff.c:5636
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5522
+#: diff.c:5637
 msgid "select files by diff type"
 msgstr "sélectionner les fichiers par types de diff"
 
-#: diff.c:5524
+#: diff.c:5639
 msgid "<file>"
 msgstr "<fichier>"
 
-#: diff.c:5525
+#: diff.c:5640
 msgid "Output to a specific file"
 msgstr "Sortie vers un fichier spécifié"
 
-#: diff.c:6180
-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 ""
-"détection de renommage inexact annulée à cause d'un trop grand nombre de "
+"détection exhaustive de renommage annulée à cause d'un trop grand nombre de "
 "fichiers."
 
-#: diff.c:6183
+#: diff.c:6301
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "recherche uniquement des copies par modification de chemin à cause d'un trop "
 "grand nombre de fichiers."
 
-#: diff.c:6186
+#: diff.c:6304
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3153,67 +4087,102 @@ msgstr ""
 "vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
 "commande."
 
-#: dir.c:549
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "impossible de lire le fichier de commande '%s'"
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr "Détection de renommage inexact en cours"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Pas de chemin '%s' dans la diff"
+
+#: 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"
 
-#: dir.c:938
+#: dir.c:733 dir.c:762 dir.c:775
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "motif non reconnu : '%s'"
+
+#: dir.c:790 dir.c:804
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "motif négatif non reconnu : '%s'"
+
+#: 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é"
+
+#: dir.c:830
+msgid "disabling cone pattern matching"
+msgstr "désactivation de la correspondance de motif de cone"
+
+#: dir.c:1214
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "impossible d'utiliser %s comme fichier d'exclusion"
 
-#: dir.c:1877
+#: dir.c:2351
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "impossible d'ouvrir le répertoire '%s'"
 
-#: dir.c:2128
+#: dir.c:2653
 msgid "failed to get kernel name and information"
 msgstr "echec de l'obtention d'information de kernel"
 
-#: dir.c:2252
+#: dir.c:2777
 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"
+msgstr "le cache non suivi est désactivé sur ce système ou sur cet endroit"
 
-#: dir.c:3056
+#: dir.c:3610
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "fichier d'index corrompu dans le dépôt %s"
 
-#: dir.c:3101 dir.c:3106
+#: dir.c:3657 dir.c:3662
 #, c-format
 msgid "could not create directories for %s"
 msgstr "impossible de créer les répertoires pour %s"
 
-#: dir.c:3135
+#: dir.c:3691
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr ""
 "suggestion : en attente de la fermeture du fichier par votre éditeur de "
 "texte…%c"
 
-#: entry.c:178
+#: entry.c:176
 msgid "Filtering content"
 msgstr "Filtrage du contenu"
 
-#: entry.c:476
+#: entry.c:497
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "impossible de stat le fichier '%s'"
 
-#: environment.c:148
+#: environment.c:152
 #, c-format
 msgid "bad git namespace path \"%s\""
-msgstr "Espaces de nom de Git \"%s\""
+msgstr "espaces de nom de Git \"%s\""
 
-#: environment.c:330
+#: environment.c:334
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "impossible de régler GIT_DIR à '%s'"
@@ -3223,251 +4192,281 @@ msgstr "impossible de régler GIT_DIR à '%s'"
 msgid "too many args to run %s"
 msgstr "trop d'arguments pour lancer %s"
 
-#: fetch-pack.c:150
+#: fetch-pack.c:182
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack : liste superficielle attendue"
 
-#: fetch-pack.c:153
+#: fetch-pack.c:185
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
 "git fetch-pack : paquet de vidage attendu après une liste superficielle"
 
-#: fetch-pack.c:164
+#: fetch-pack.c:196
 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:184
+#: fetch-pack.c:216
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
 
-#: fetch-pack.c:195
+#: fetch-pack.c:227
 msgid "unable to write to remote"
 msgstr "impossible d'écrire sur un distant"
 
-#: fetch-pack.c:257
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc nécessite multi_ack_detailed"
 
-#: fetch-pack.c:356 fetch-pack.c:1280
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ligne de superficiel invalide : %s"
 
-#: fetch-pack.c:362 fetch-pack.c:1286
+#: fetch-pack.c:389 fetch-pack.c:1429
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ligne de fin de superficiel invalide : %s"
 
-#: fetch-pack.c:364 fetch-pack.c:1288
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
 msgstr "objet non trouvé : %s"
 
-#: fetch-pack.c:367 fetch-pack.c:1291
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
-msgstr "Erreur dans l'objet : %s"
+msgstr "erreur dans l'objet : %s"
 
-#: fetch-pack.c:369 fetch-pack.c:1293
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
-msgstr "Pas de superficiel trouvé : %s"
+msgstr "pas de superficiel trouvé : %s"
 
-#: fetch-pack.c:372 fetch-pack.c:1297
+#: fetch-pack.c:399 fetch-pack.c:1440
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "superficiel/non superficiel attendu, %s trouvé"
 
-#: fetch-pack.c:414
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr "réponse %s %d %s"
 
-#: fetch-pack.c:431
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit invalide %s"
 
-#: fetch-pack.c:462
+#: fetch-pack.c:487
 msgid "giving up"
 msgstr "abandon"
 
-#: fetch-pack.c:475 progress.c:312
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
 msgstr "fait"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "%s trouvé (%d) %s"
 
-#: fetch-pack.c:533
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marquage de %s comme terminé"
 
-#: fetch-pack.c:742
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr "%s déjà possédé (%s)"
 
-#: fetch-pack.c:781
+#: fetch-pack.c:849
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
 
-#: fetch-pack.c:789
+#: fetch-pack.c:857
 msgid "protocol error: bad pack header"
 msgstr "erreur de protocole : mauvais entête de paquet"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:951
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack : impossible de dupliquer %s"
 
-#: fetch-pack.c:873
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack : sortie d'index de pack invalide"
+
+#: fetch-pack.c:974
 #, c-format
 msgid "%s failed"
 msgstr "échec de %s"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
 msgstr "erreur dans le démultiplexer latéral"
 
-#: fetch-pack.c:907
+#: fetch-pack.c:1019
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La version du serveur est %.*s"
 
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
+#: 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 "Le serveur supporte %s"
 
-#: fetch-pack.c:914
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
 msgstr "Le serveur ne supporte les clients superficiels"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:1089
 msgid "Server does not support --shallow-since"
 msgstr "Le receveur ne gère pas --shallow-since"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1094
 msgid "Server does not support --shallow-exclude"
 msgstr "Le receveur ne gère pas --shallow-exclude"
 
-#: fetch-pack.c:983
+#: fetch-pack.c:1098
 msgid "Server does not support --deepen"
 msgstr "Le receveur ne gère pas --deepen"
 
-#: fetch-pack.c:1000
+#: fetch-pack.c:1100
+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
 msgid "no common commits"
 msgstr "pas de commit commun"
 
-#: fetch-pack.c:1012 fetch-pack.c:1468
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+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:1660
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack : échec de le récupération."
 
-#: fetch-pack.c:1150
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "non-correspondance des algorithmes : client %s ; serveur %s"
+
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "le serveur ne supporte pas l'algorithme '%s'"
+
+#: fetch-pack.c:1279
 msgid "Server does not support shallow requests"
-msgstr "Le serveur ne supporte les requêtes superficielles"
+msgstr "Le serveur ne supporte pas les requêtes superficielles"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1286
 msgid "Server supports filter"
 msgstr "Le serveur supporte filter"
 
-#: fetch-pack.c:1180
+#: fetch-pack.c:1329 fetch-pack.c:2043
 msgid "unable to write request to remote"
 msgstr "impossible d'écrire la requête sur le distant"
 
-#: fetch-pack.c:1198
+#: fetch-pack.c:1347
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "erreur à la lecture de l'entête de section '%s'"
 
-#: fetch-pack.c:1204
+#: fetch-pack.c:1353
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "'%s' attendu, '%s' reçu"
 
-#: fetch-pack.c:1243
+#: fetch-pack.c:1387
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "ligne d'acquittement inattendue : '%s'"
 
-#: fetch-pack.c:1248
+#: fetch-pack.c:1392
 #, c-format
 msgid "error processing acks: %d"
 msgstr "erreur lors du traitement des acquittements : %d"
 
-#: fetch-pack.c:1258
+#: fetch-pack.c:1402
 msgid "expected packfile to be sent after 'ready'"
 msgstr "fichier paquet attendu à envoyer après 'ready'"
 
-#: fetch-pack.c:1260
+#: fetch-pack.c:1404
 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:1302
+#: fetch-pack.c:1445
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "erreur lors du traitement de l'information de superficialité : %d"
 
-#: fetch-pack.c:1349
+#: fetch-pack.c:1494
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "wanted-ref attendu, '%s' trouvé"
 
-#: fetch-pack.c:1354
+#: fetch-pack.c:1499
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inattendu : '%s'"
 
-#: fetch-pack.c:1359
+#: fetch-pack.c:1504
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "erreur lors du traitement des références voulues : %d"
 
-#: fetch-pack.c:1693
+#: fetch-pack.c:1534
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack : paquet de fin de réponse attendu"
+
+#: fetch-pack.c:1939
 msgid "no matching remote head"
 msgstr "pas de HEAD distante correspondante"
 
-#: fetch-pack.c:1716 builtin/clone.c:685
+#: fetch-pack.c:1962 builtin/clone.c:697
 msgid "remote did not send all necessary objects"
 msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
 
-#: fetch-pack.c:1743
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr "'ready' inattendu depuis le distant"
+
+#: fetch-pack.c:2088
 #, c-format
 msgid "no such remote ref %s"
 msgstr "référence distante inconnue %s"
 
-#: fetch-pack.c:1746
+#: fetch-pack.c:2091
 #, 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:321
-msgid "gpg failed to sign the data"
-msgstr "gpg n'a pas pu signer les données"
-
-#: gpg-interface.c:347
+#: gpg-interface.c:273
 msgid "could not create temporary file"
 msgstr "impossible de créer un fichier temporaire"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "impossible d'écrire la signature détachée dans '%s'"
 
-#: graph.c:97
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg n'a pas pu signer les données"
+
+#: 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:668
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -3475,18 +4474,18 @@ msgstr ""
 "le motif fourni contient des octets NUL (via -f <fichier>). Ce n'est "
 "supporté qu'avec -P avec PCRE v2"
 
-#: grep.c:2124
+#: grep.c:1895
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s' : lecture de %s impossible"
 
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
-#: 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 "échec du stat de '%s'"
 
-#: grep.c:2152
+#: grep.c:1923
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s' : lecture tronquée"
@@ -3537,50 +4536,50 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Commandes bas niveau / Interrogateurs"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Commandes bas niveau / Synchronisation de dépôts"
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Commandes bas niveau / Assistants internes"
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "commandes git disponibles dans '%s'"
 
-#: help.c:305
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "commandes git disponibles depuis un autre endroit de votre $PATH"
 
-#: help.c:314
+#: help.c:316
 msgid "These are common Git commands used in various situations:"
 msgstr "Ci-dessous les commandes Git habituelles dans diverses situations :"
 
-#: help.c:363 git.c:98
+#: help.c:365 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "type de liste de commandes non supporté '%s'"
 
-#: help.c:403
-msgid "The common Git guides are:"
-msgstr "Les guides Git populaires sont :"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Les guides des concepts de Git sont :"
 
-#: help.c:512
+#: help.c:429
 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"
 
-#: help.c:517
+#: help.c:434
 msgid "External commands"
 msgstr "Commandes externes"
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr "Alias de commande"
 
-#: help.c:596
+#: help.c:527
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -3589,33 +4588,33 @@ 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:655
+#: help.c:543 help.c:631
+#, 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
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Ahem. Votre système n'indique aucune commande Git."
 
-#: help.c:677
+#: help.c:613
 #, 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."
 
-#: help.c:682
+#: help.c:618
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Continuons en supposant que vous avez voulu dire '%s'."
 
-#: help.c:687
+#: help.c:623
 #, 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'."
 
-#: help.c:695
-#, 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:699
+#: help.c:635
 msgid ""
 "\n"
 "The most similar command is"
@@ -3629,16 +4628,16 @@ msgstr[1] ""
 "\n"
 "Les commandes les plus ressemblantes sont"
 
-#: help.c:714
+#: help.c:675
 msgid "git version [<options>]"
 msgstr "git version [<options>]"
 
-#: help.c:783
+#: help.c:730
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:787
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3652,7 +4651,15 @@ msgstr[1] ""
 "\n"
 "Vouliez-vous dire un de ceux-là ?"
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Identité d'auteur inconnue\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Indentité de validateur inconnue\n"
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3678,94 +4685,105 @@ msgstr ""
 "Éliminez --global pour ne faire les réglages que dans ce dépôt.\n"
 "\n"
 
-#: ident.c:379
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
 msgstr "aucun courriel fourni et l'auto-détection est désactivée"
 
-#: ident.c:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "impossible de détecter automatiquement l'adresse ('%s' trouvé)"
 
-#: ident.c:401
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
 msgstr "aucun nom fourni et l'auto-détection est désactivée"
 
-#: ident.c:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "impossible de détecter automatiquement le nom ('%s' trouvé)"
 
-#: ident.c:415
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "nom d'identifiant vide (pour <%s>) non permis"
 
-#: ident.c:421
+#: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "le nom n'est constitué que de caractères interdits : %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:454 builtin/commit.c:647
 #, c-format
 msgid "invalid date format: %s"
 msgstr "format de date invalide : %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"
-
-#: 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"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "impossible de charger l'arbre racine pour le commit %s"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "impossible d'accéder au blob clairsemé dans '%s'"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "impossible d'analyser la donnée de filtre clairsemé dans %s"
-
-#: list-objects-filter-options.c:58
+#: list-objects-filter-options.c:83
 msgid "expected 'tree:<depth>'"
 msgstr "attendu : 'tree:<profondeur>'"
 
-#: list-objects-filter-options.c:73
+#: list-objects-filter-options.c:98
 msgid "sparse:path filters support has been dropped"
 msgstr "sparse : le support des filtres de chemin a été abandonné"
 
-#: list-objects-filter-options.c:86
+#: list-objects-filter-options.c:105
+#, c-format
+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
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "spécificateur de filtre invalide '%s'"
 
-#: list-objects-filter-options.c:102
+#: 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'"
 
-#: list-objects-filter-options.c:144
+#: list-objects-filter-options.c:182
 msgid "expected something after combine:"
 msgstr "quelque chose attendu après combine :"
 
-#: list-objects-filter-options.c:226
+#: list-objects-filter-options.c:264
 msgid "multiple filter-specs cannot be combined"
 msgstr "impossible de combiner des spécificateurs multiples de filtre"
 
-#: lockfile.c:151
+#: 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"
+
+#: list-objects-filter.c:532
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "impossible d'accéder au blob clairsemé dans '%s'"
+
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+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"
+
+#: 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"
+
+#: 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"
+
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3784,165 +4802,398 @@ msgstr ""
 "un processus git peut avoir planté :\n"
 "supprimez le fichier manuellement pour poursuivre."
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Impossible de créer '%s.lock' : %s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "impossible de lire le cache"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "valeur invalide '%s' pour lsrefs.unborn"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "impossible d'écrire le nouveau fichier d'index"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "vidage attendu après les arguments ls-refs"
+
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "CRLF citées détectées"
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "action invalide '%s' pour '%s'"
+
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, 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:1578 merge-recursive.c:1208
+#, 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:1587 merge-recursive.c:1215
+#, 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)"
+
+#: merge-ort.c:1597 merge-ort.c:1604
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Note : Avance rapide du sous-module %s à %s"
+
+#: merge-ort.c:1625
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Échec de la fusion du sous-module %s"
+
+#: merge-ort.c:1632
+#, 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"
+"%s\n"
+
+#: 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 ""
+"Si c'est correct, ajoutez le simplement à l'index\n"
+"en utilisant par exemple :\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"qui acceptera cette suggestion.\n"
+
+#: merge-ort.c:1649
+#, 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"
+"%s"
+
+#: merge-ort.c:1868 merge-recursive.c:1358
+msgid "Failed to execute internal merge"
+msgstr "Échec à l'exécution de la fusion interne"
+
+#: merge-ort.c:1873 merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Impossible d'ajouter %s à la base de données"
+
+#: merge-ort.c:1880 merge-recursive.c:1396
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Fusion automatique de %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 ""
+"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: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 ""
+"CONFLIT (renommage implicite de répertoire) : impossible de transformer "
+"plusieurs chemins sur %s ; les chemins concernés sont : %s"
+
+#: 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 ""
+"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:2241 merge-recursive.c:2464
+#, 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é."
+
+#: 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 ""
+"Chemin mis à jour : %s ajouté dans %s dans un répertoire qui a été renommé "
+"en %s ; déplacé dans %s."
+
+#: 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 ""
+"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: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 ""
+"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: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 ""
+"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:2569
+#, 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."
+
+#: 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 ""
+"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:2683 merge-ort.c:2707
+#, 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."
+
+#: merge-ort.c:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
+msgstr "impossible de lire l'objet %s"
+
+#: merge-ort.c:3185 merge-recursive.c:3011
+#, c-format
+msgid "object %s is not a blob"
+msgstr "l'objet %s n'est pas un blob"
+
+#: merge-ort.c:3613
+#, 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."
+
+#: 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 ""
+"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: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 ""
+"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:3796 merge-recursive.c:3087
+msgid "content"
+msgstr "contenu"
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr "ajout/ajout"
+
+#: merge-ort.c:3800 merge-recursive.c:3136
+msgid "submodule"
+msgstr "sous-module"
+
+#: merge-ort.c:3802 merge-recursive.c:3137
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLIT (%s) : Conflit de fusion dans %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 ""
+"CONFLIT (modification/suppression) : %s supprimé dans %s et modifié dans %s. "
+"Version %s de %s laissée dans l'arbre."
+
+#: 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 ""
+"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:4487
+#, 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:3702
+#, 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"
+"  %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "Déjà à jour."
 
-#: merge-recursive.c:367
+#: merge-recursive.c:352
 msgid "(bad commit)\n"
 msgstr "(mauvais commit)\n"
 
-#: merge-recursive.c:390
+#: merge-recursive.c:375
 #, 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:399
+#: merge-recursive.c:384
 #, 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:885
+#: merge-recursive.c:872
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "impossible de créer le chemin '%s' %s"
 
-#: merge-recursive.c:896
+#: merge-recursive.c:883
 #, 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:910 merge-recursive.c:929
+#: merge-recursive.c:897 merge-recursive.c:916
 msgid ": perhaps a D/F conflict?"
 msgstr ": peut-être un conflit D/F ?"
 
-#: merge-recursive.c:919
+#: merge-recursive.c:906
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "refus de perdre le fichier non suivi '%s'"
 
-#: merge-recursive.c:960 builtin/cat-file.c:41
+#: merge-recursive.c:947 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "impossible de lire l'objet %s '%s'"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:952
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob attendu pour %s '%s'"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:977
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "échec à l'ouverture de '%s' : %s"
 
-#: merge-recursive.c:1001
+#: merge-recursive.c:988
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "échec à la création du lien symbolique '%s' : %s"
 
-#: merge-recursive.c:1006
+#: merge-recursive.c:993
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "ne sait pas traiter %06o %s '%s'"
 
-#: merge-recursive.c:1199
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Échec de la fusion du sous-module %s (non extrait)"
-
-#: merge-recursive.c:1206
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Échec de fusion du sous-module %s (commits non présents)"
-
-#: merge-recursive.c:1213
-#, 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)"
-
-#: merge-recursive.c:1221 merge-recursive.c:1233
+#: merge-recursive.c:1223 merge-recursive.c:1235
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Avance rapide du sous-module %s au commit suivant :"
 
-#: merge-recursive.c:1224 merge-recursive.c:1236
+#: merge-recursive.c:1226 merge-recursive.c:1238
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Avance rapide du sous-module %s"
 
-#: merge-recursive.c:1259
+#: merge-recursive.c:1261
 #, 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)"
 
-#: merge-recursive.c:1263
+#: merge-recursive.c:1265
 #, 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:1264
+#: merge-recursive.c:1266
 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:1267
-#, 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 ""
-"Si c'est correct, ajoutez le simplement à l'index\n"
-"en utilisant par exemple :\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"qui acceptera cette suggestion.\n"
-
-#: merge-recursive.c:1276
+#: merge-recursive.c:1278
 #, 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:1349
-msgid "Failed to execute internal merge"
-msgstr "Échec à l'exécution de la fusion interne"
-
-#: merge-recursive.c:1354
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Impossible d'ajouter %s à la base de données"
-
-#: merge-recursive.c:1386
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Fusion automatique de %s"
-
-#: merge-recursive.c:1410
+#: merge-recursive.c:1420
 #, 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."
 
-#: merge-recursive.c:1482
+#: merge-recursive.c:1492
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3951,7 +5202,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
 "%s laissée dans l'arbre."
 
-#: merge-recursive.c:1487
+#: merge-recursive.c:1497
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3960,7 +5211,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s à %s dans %s. Version "
 "%s de %s laissée dans l'arbre."
 
-#: merge-recursive.c:1494
+#: merge-recursive.c:1504
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3969,7 +5220,7 @@ msgstr ""
 "CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
 "%s laissée dans l'arbre dans le fichier %s."
 
-#: merge-recursive.c:1499
+#: merge-recursive.c:1509
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3978,41 +5229,41 @@ 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:1534
+#: merge-recursive.c:1544
 msgid "rename"
 msgstr "renommage"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1544
 msgid "renamed"
 msgstr "renommé"
 
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Refus de perdre le fichier modifié %s"
 
-#: merge-recursive.c:1624
+#: merge-recursive.c:1605
 #, 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:1682
+#: merge-recursive.c:1663
 #, 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"
 
-#: merge-recursive.c:1713
+#: merge-recursive.c:1694
 #, 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:1718
+#: merge-recursive.c:1699
 #, 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:1737
+#: merge-recursive.c:1726
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -4021,18 +5272,18 @@ msgstr ""
 "CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
 "\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
 
-#: merge-recursive.c:1742
+#: merge-recursive.c:1731
 msgid " (left unresolved)"
 msgstr " (laissé non résolu)"
 
-#: merge-recursive.c:1851
+#: merge-recursive.c:1823
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLIT (renommage/renommage) : renommage '%s'->'%s' dans %s. Renommage '%s'-"
 ">'%s' dans %s"
 
-#: merge-recursive.c:2056
+#: merge-recursive.c:2086
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -4043,25 +5294,7 @@ msgstr ""
 "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:2088
-#, 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."
-
-#: merge-recursive.c:2098
-#, 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"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2220
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -4070,268 +5303,223 @@ msgstr ""
 "CONFLIT (renommage/renommage) : renommage du répertoire %s->%s dans %s. "
 "Renommage de répertoire %s->%s dans %s"
 
-#: merge-recursive.c:2435
-#, 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é."
-
-#: merge-recursive.c:2961
-#, c-format
-msgid "cannot read object %s"
-msgstr "impossible de lire l'objet %s"
-
-#: merge-recursive.c:2964
-#, c-format
-msgid "object %s is not a blob"
-msgstr "l'objet %s n'est pas un blob"
-
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modify"
 msgstr "modification"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modified"
 msgstr "modifié"
 
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "contenu"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "ajout/ajout"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3114
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s sauté (fusion identique à l'existant)"
 
-#: merge-recursive.c:3089 git-submodule.sh:937
-msgid "submodule"
-msgstr "sous-module"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3167
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Ajout plutôt comme %s"
 
-#: merge-recursive.c:3203
-#, 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."
-
-#: merge-recursive.c:3206
-#, 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 ""
-"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-recursive.c:3210
-#, 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."
-
-#: merge-recursive.c:3213
-#, 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 ""
-"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-recursive.c:3327
+#: merge-recursive.c:3371
 #, c-format
 msgid "Removing %s"
 msgstr "Suppression de %s"
 
-#: merge-recursive.c:3350
+#: merge-recursive.c:3394
 msgid "file/directory"
 msgstr "fichier/répertoire"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3399
 msgid "directory/file"
 msgstr "répertoire/fichier"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3406
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLIT (%s) : Il y a un répertoire nommé %s dans %s. Ajout de %s comme %s"
 
-#: merge-recursive.c:3371
+#: merge-recursive.c:3415
 #, c-format
 msgid "Adding %s"
 msgstr "Ajout de %s"
 
-#: merge-recursive.c:3380
+#: merge-recursive.c:3424
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLIT (ajout/ajout) : Conflit de fusion dans %s"
 
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr "Déjà à jour !"
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3477
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "échec de fusion des arbres %s et %s"
 
-#: merge-recursive.c:3537
+#: merge-recursive.c:3571
 msgid "Merging:"
 msgstr "Fusion :"
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3584
 #, 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:3600
+#: merge-recursive.c:3634
 msgid "merge returned no commit"
 msgstr "la fusion n'a pas retourné de commit"
 
-#: merge-recursive.c:3659
-#, 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"
-"  %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3799
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossible d'analyser l'objet '%s'"
 
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
 msgid "Unable to write index."
 msgstr "Impossible d'écrire l'index."
 
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "impossible de lire le cache"
+
+#: 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 "impossible d'écrire le nouveau fichier d'index"
+
+#: midx.c:74
+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
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "le fichier d'index multi-paquet %s est trop petit"
 
-#: midx.c:84
+#: midx.c:121
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 "la signature de l'index multi-paquet 0x%08x ne correspond pas à la signature "
 "0x%08x"
 
-#: midx.c:89
+#: midx.c:126
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "la version d'index multi-paquet %d n'est pas reconnue"
 
-#: midx.c:94
+#: midx.c:131
 #, c-format
-msgid "hash version %u does not match"
-msgstr "la version %u du condensé ne correspond pas"
-
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr "décalage de section invalide (trop grand)"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
+msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
-"identifiant de terminaison de tronçon d'index multi-paquet terminant "
-"apparaît plus tôt qu'attendu"
+"la version d'empreinte d'index multi-paquet %u ne correspond pas à la "
+"version %u"
 
-#: midx.c:145
+#: midx.c:148
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "index multi-paquet manque de tronçon de nom de paquet"
 
-#: midx.c:147
+#: midx.c:150
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "index multi-paquet manque de tronçon de d'étalement OID requis"
 
-#: midx.c:149
+#: midx.c:152
 msgid "multi-pack-index missing required OID lookup chunk"
-msgstr "index multi-paquet manque de tronçon de recherche OID"
+msgstr "index multi-paquet manque de tronçon de recherche OID requis"
 
-#: midx.c:151
+#: midx.c:154
 msgid "multi-pack-index missing required object offsets chunk"
-msgstr "index multi-paquet manque de tronçon de décalage d'objet"
+msgstr "index multi-paquet manque de tronçon de décalage d'objet requis"
 
-#: midx.c:165
+#: midx.c:170
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 "index multi-paquet les noms de paquets sont en désordre : '%s' avant '%s'"
 
-#: midx.c:210
+#: midx.c:214
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "mauvais pack-int-id : %u (%u paquets au total)"
 
-#: midx.c:260
+#: midx.c:264
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
-"multi-pack-index stock un décalage en 64-bit, mais off_t est trop petit"
+"l'index multi-paquet stock un décalage en 64-bit, mais off_t est trop petit"
 
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "erreur à la préparation du fichier paquet depuis un index multi-paquet"
-
-#: midx.c:469
+#: midx.c:490
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "échec de l'ajout du fichier paquet '%s'"
 
-#: midx.c:475
+#: midx.c:496
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "échec à l'ouverture du fichier paquet '%s'"
 
-#: midx.c:535
+#: midx.c:564
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "échec de localisation de l'objet %d dans le fichier paquet"
 
-#: midx.c:864
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr "impossible de stocker le fichier d'index inversé"
+
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+"index multi-paquet existant ignoré ; non-concordance de la somme de contrôle"
+
+#: midx.c:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Ajout de fichiers paquet à un index multi-paquet"
+
+#: midx.c:989
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "fichier paquet à éliminer %s non trouvé"
 
-#: midx.c:1035
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "paquet préféré inconnu : %s"
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "le paquet préféré '%s' est expiré"
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr "aucun fichier paquet à l'index."
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "échec de la suppression de %s"
+
+#: midx.c:1166
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "échec du nettoyage de l'index de multi-paquet à %s"
 
-#: midx.c:1090
+#: midx.c:1225
+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:1233
+msgid "incorrect checksum"
+msgstr "somme de contrôle incorrecte"
+
+#: midx.c:1236
 msgid "Looking for referenced packfiles"
 msgstr "Recherche de fichiers paquets référencés"
 
-#: midx.c:1105
+#: midx.c:1251
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
@@ -4339,57 +5527,69 @@ msgstr ""
 "étalement oid en désordre : étalement[%d] = %<PRIx32> > %<PRIx32> = "
 "étalement[%d]"
 
-#: midx.c:1109
-msgid "Verifying OID order in MIDX"
-msgstr "Vérification de l'ordre des OID dans MIDX"
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr "le midx ne contient aucun oid"
 
-#: midx.c:1118
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Vérification de l'ordre des OID dans l'index multi-paquet"
+
+#: midx.c:1274
 #, 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:1137
+#: midx.c:1294
 msgid "Sorting objects by packfile"
 msgstr "Classement des objets par fichier paquet"
 
-#: midx.c:1143
+#: midx.c:1301
 msgid "Verifying object offsets"
 msgstr "Vérification des décalages des objets"
 
-#: midx.c:1159
+#: midx.c:1317
 #, 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:1165
+#: midx.c:1323
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "impossible de lire le fichier paquet %s"
 
-#: midx.c:1174
+#: midx.c:1332
 #, 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:1349
+#: midx.c:1357
+msgid "Counting referenced objects"
+msgstr "Comptage des objets référencés"
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Recherche et effacement des fichiers paquets non-référencés"
+
+#: midx.c:1558
 msgid "could not start pack-objects"
-msgstr "Impossible de démarrer le groupement d'objets"
+msgstr "impossible de démarrer le groupement d'objets"
 
-#: midx.c:1368
+#: midx.c:1578
 msgid "could not finish pack-objects"
-msgstr "Impossible de finir le groupement d'objets"
+msgstr "impossible de finir le groupement d'objets"
 
-#: name-hash.c:537
+#: name-hash.c:542
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "impossible de créer le fil lazy_dir : %s"
 
-#: name-hash.c:559
+#: name-hash.c:564
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "impossible de créer le fil lazy_name : %s"
 
-#: name-hash.c:565
+#: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "impossible de joindre le fil lazy_name : %s"
@@ -4433,6 +5633,366 @@ 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
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+"le répertoire objet %s n'existe pas ; vérifiez .git/objects/info/alternates"
+
+#: object-file.c:584
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
+
+#: object-file.c:658
+#, 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:665
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "impossible de normaliser le répertoire d'objet : %s"
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr "lecture du fichier d'alternatives impossible"
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr "impossible de déplacer le nouveau fichier d'alternative"
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "le chemin '%s' n'existe pas"
+
+#: object-file.c:789
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
+"encore supporté."
+
+#: object-file.c:795
+#, 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:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "le dépôt de référence '%s' est superficiel"
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "le dépôt de référence '%s' est greffé"
+
+#: object-file.c:869
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
+
+#: object-file.c:1019
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
+
+#: object-file.c:1054
+#, c-format
+msgid "mmap failed%s"
+msgstr "échec de mmap%s"
+
+#: object-file.c:1218
+#, c-format
+msgid "object file %s is empty"
+msgstr "le fichier objet %s est vide"
+
+#: object-file.c:1353 object-file.c:2548
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objet libre corrompu '%s'"
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "données incorrectes à la fin de l'objet libre '%s'"
+
+#: object-file.c:1397
+msgid "invalid object type"
+msgstr "type d'objet invalide"
+
+#: object-file.c:1481
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "impossible de dépaqueter l'entête %s avec --allow-unknown-type"
+
+#: object-file.c:1484
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "impossible de dépaqueter l'entête %s"
+
+#: object-file.c:1490
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "impossible d'analyser l'entête %s avec --allow-unknown-type"
+
+#: object-file.c:1493
+#, c-format
+msgid "unable to parse %s header"
+msgstr "impossible d'analyser l'entête %s"
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr "impossible de lire l'objet %s"
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "remplacement %s non trouvé pour %s"
+
+#: object-file.c:1725
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "l'objet libre %s (stocké dans %s) est corrompu"
+
+#: object-file.c:1729
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
+
+#: object-file.c:1834
+#, c-format
+msgid "unable to write file %s"
+msgstr "impossible d'écrire le fichier %s"
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "impossible de régler les droits de '%s'"
+
+#: object-file.c:1848
+msgid "file write error"
+msgstr "erreur d'écriture d'un fichier"
+
+#: object-file.c:1868
+msgid "error when closing loose object file"
+msgstr "erreur en fermeture du fichier d'objet esseulé"
+
+#: object-file.c:1933
+#, c-format
+msgid "insufficient permission for adding an object to repository database %s"
+msgstr ""
+"droits insuffisants pour ajouter un objet à la base de données %s du dépôt"
+
+#: object-file.c:1935
+msgid "unable to create temporary file"
+msgstr "impossible de créer un fichier temporaire"
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr "impossible d'écrire le fichier d'objet esseulé"
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "impossible de compresser le nouvel objet %s (%d)"
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "échec de deflateEnd sur l'objet %s (%d)"
+
+#: object-file.c:1973
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "données de source d'objet instable pour %s"
+
+#: object-file.c:1983 builtin/pack-objects.c:1237
+#, c-format
+msgid "failed utime() on %s"
+msgstr "échec de utime() sur %s"
+
+#: object-file.c:2060
+#, c-format
+msgid "cannot read object for %s"
+msgstr "impossible de lire l'objet pour %s"
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr "commit corrompu"
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr "étiquette corrompue"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr "erreur de lecture à l'indexation de %s"
+
+#: object-file.c:2222
+#, c-format
+msgid "short read while indexing %s"
+msgstr "lecture tronquée pendant l'indexation de %s"
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s : échec de l'insertion dans la base de données"
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s : type de fichier non supporté"
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s n'est pas un objet valide"
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s n'est pas un objet '%s' valide"
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "impossible d'ouvrir %s"
+
+#: object-file.c:2559 object-file.c:2612
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "incohérence de hachage pour %s (%s attendu)"
+
+#: object-file.c:2583
+#, c-format
+msgid "unable to mmap %s"
+msgstr "impossible de mmap %s"
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "impossible de dépaqueter l'entête de %s"
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "impossible d'analyser l'entête de %s"
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "impossible de dépaqueter le contenu de %s"
+
+#: 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:491
+msgid "The candidates are:"
+msgstr "Les candidats sont :"
+
+#: 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 ""
+"Git ne crée normalement jamais de référence qui se termine par 40\n"
+"caractères hexa car elle serait ignorée si vous spécifiez juste\n"
+"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n"
+"\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"
+"en lançant \"git config advice.objectNameWarning false\""
+
+#: 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: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: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:1702
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"le chemin '%s' existe, mais pas '%s'\n"
+"conseil : peut-être vouliez-vous dire '%.*s:%s', soit '%.*s:./%s' ?"
+
+#: 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:1739
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+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:1755
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+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: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: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: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"
+
+#: object-name.c:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nom d'objet invalide : '%.*s'."
+
 #: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
@@ -4443,36 +6003,115 @@ 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:233
+#: 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:246
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "impossible d'analyser l'objet : %s"
 
-#: object.c:266 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "incohérence de hachage %s"
 
-#: packfile.c:641
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr "impossible de récupérer la taille de %s"
+
+#: pack-bitmap.c:1571 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"
+
+#: pack-revindex.c:221
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "le fichier d'index inversé %s est trop petit"
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "le fichier d'index inversé %s est corrompu"
+
+#: pack-revindex.c:234
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "le fichier d'index inversé %s a une signature inconnue"
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "le fichier d'index inverse %s a une version non gérée %<PRIu32>"
+
+#: pack-revindex.c:243
+#, c-format
+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
+msgid "cannot both write and verify reverse index"
+msgstr "impossible de lire et vérifier à la fois l'index inverse"
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr "stat impossible de %s"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "échec de rendre %s lisible"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "impossible d'écrire le fichier de prometteur '%s'"
+
+#: packfile.c:625
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
 
-#: packfile.c:1887
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "le fichier paquet %s ne peut être mmap%s"
+
+#: packfile.c:1934
 #, 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:1891
+#: packfile.c:1938
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "offset au delà de la fin de l'index de paquet pour %s (index tronqué ?)"
 
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "l'option '%s' attend une valeur numérique"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "date d'expiration malformée : '%s'"
+
+#: parse-options-cb.c:54
+#, 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
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nom d'objet malformé '%s'"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4488,7 +6127,7 @@ msgstr "%s est incompatible avec %s"
 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:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s n'accepte aucune valeur"
@@ -4498,41 +6137,46 @@ msgstr "%s n'accepte aucune valeur"
 msgid "%s isn't available"
 msgstr "%s n'est pas disponible"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, 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:389
+#: parse-options.c:386
 #, 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:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr "vouliez-vous dire `--%s` (avec deux signes moins)?"
 
-#: parse-options.c:860
+#: parse-options.c:668 parse-options.c:988
+#, c-format
+msgid "alias of --%s"
+msgstr "alias pour --%s"
+
+#: parse-options.c:879
 #, c-format
 msgid "unknown option `%s'"
 msgstr "option inconnue « %s »"
 
-#: parse-options.c:862
+#: parse-options.c:881
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "bascule inconnue « %c »"
 
-#: parse-options.c:864
+#: parse-options.c:883
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "option non-ascii inconnue dans la chaîne : '%s'"
 
-#: parse-options.c:888
+#: parse-options.c:907
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:907
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr "usage : %s"
@@ -4540,76 +6184,51 @@ msgstr "usage : %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:913
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
 msgstr "   ou : %s"
 
-#: parse-options.c:916
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:955
+#: parse-options.c:974
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options.c:969
-#, c-format
-msgid "alias of --%s"
-msgstr "alias pour --%s"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "l'option '%s' attend une valeur numérique"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "date d'expiration malformée : '%s'"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "l'option '%s' attend \"always\", \"auto\" ou \"never\""
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nom d'objet malformé '%s'"
-
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Impossible de rendre %s inscriptible pour le groupe"
 
-#: pathspec.c:128
+#: pathspec.c:151
 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"
 
-#: pathspec.c:146
+#: pathspec.c:169
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Une seule spécification 'attr:' est autorisée."
 
-#: pathspec.c:149
+#: pathspec.c:172
 msgid "attr spec must not be empty"
 msgstr "un spécificateur d'attribut ne peut pas être vide"
 
-#: pathspec.c:192
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nom d'attribut invalide %s"
 
-#: pathspec.c:257
+#: pathspec.c:280
 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"
 
-#: pathspec.c:264
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4617,52 +6236,57 @@ 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:304
+#: pathspec.c:327
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "paramètre invalide pour le spécificateur magique de chemin 'prefix'"
 
-#: pathspec.c:325
+#: pathspec.c:348
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "La spécification magique de chemin '%.*s' est invalide dans '%s'"
 
-#: pathspec.c:330
+#: pathspec.c:353
 #, 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:368
+#: pathspec.c:391
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Spécificateur magique '%c' non implémenté dans '%s'"
 
-#: pathspec.c:427
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s : 'literal' et 'glob' sont incompatibles"
 
-#: pathspec.c:440
+#: pathspec.c:466
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s : '%s' est hors du dépôt"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s : '%s' est hors du dépôt à '%s'"
 
-#: pathspec.c:514
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (mnémonique : '%c')"
 
-#: pathspec.c:524
+#: pathspec.c:552
 #, 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"
 
-#: pathspec.c:591
+#: pathspec.c:619
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "le chemin '%s' est au-delà d'un lien symbolique"
 
+#: pathspec.c:664
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "la ligne est mal citée : %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "impossible d'écrire le paquet de vidage"
@@ -4672,154 +6296,192 @@ msgid "unable to write delim packet"
 msgstr "impossible d'écrire le paquet de délimitation"
 
 #: pkt-line.c:106
+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:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:265
 msgid "protocol error: impossibly long line"
 msgstr "erreur de protocole : ligne impossiblement trop longue"
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr "échec de l'écriture d'un paquet avec format"
 
-#: pkt-line.c:196
+#: pkt-line.c:204
 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"
 
-#: pkt-line.c:203 pkt-line.c:210
-msgid "packet write failed"
-msgstr "échec de l'écriture 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:295
+#: pkt-line.c:328 pkt-line.c:329
 msgid "read error"
 msgstr "erreur de lecture"
 
-#: pkt-line.c:303
+#: pkt-line.c:339 pkt-line.c:340
 msgid "the remote end hung up unexpectedly"
-msgstr "L'hôte distant a fermé la connexion de manière inattendue"
+msgstr "l'hôte distant a fermé la connexion de manière inattendue"
 
-#: pkt-line.c:331
+#: pkt-line.c:369 pkt-line.c:371
 #, 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:341 pkt-line.c:346
+#: 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 "erreur de protocole : mauvaise longueur de ligne %d"
 
-#: pkt-line.c:362
+#: pkt-line.c:413 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "erreur distante : %s"
 
-#: preload-index.c:119
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr "Rafraîchissement de l'index"
 
-#: preload-index.c:138
+#: preload-index.c:144
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "impossible de créer le lstat en fil : %s"
 
-#: pretty.c:966
+#: pretty.c:988
 msgid "unable to parse --pretty format"
 msgstr "impossible d'analyser le format --pretty"
 
-#: promisor-remote.c:25
-msgid "Remote with no URL"
-msgstr "Dépôt distant sans URL"
+#: 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"
+
+#: 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"
 
-#: promisor-remote.c:61
+#: 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"
+
+#: 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"
 
-#: range-diff.c:71
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info : vidage attendu après les arguments"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Suppression des objets dupliqués"
+
+#: range-diff.c:78
 msgid "could not start `log`"
 msgstr "impossible de démarrer `log`"
 
-#: range-diff.c:73
+#: range-diff.c:80
 msgid "could not read `log` output"
 msgstr "impossible de lire la sortie de `log`"
 
-#: range-diff.c:92 sequencer.c:4985
+#: range-diff.c:101 sequencer.c:5550
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "impossible d'analyser le commit '%s'"
 
-#: range-diff.c:118
+#: range-diff.c:115
+#, 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'"
+
+#: range-diff.c:140
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "impossible d'analyser l'entête git '%.*s'"
 
-#: range-diff.c:275
+#: range-diff.c:307
 msgid "failed to generate diff"
 msgstr "échec de la génération de diff"
 
-#: range-diff.c:507 range-diff.c:509
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only et --right-only sont mutuellement exclusifs"
+
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "impossible d'analyser le journal pour '%s'"
 
-#: read-cache.c:680
+#: read-cache.c:710
 #, 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:696
+#: read-cache.c:726
 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:718
+#: read-cache.c:748
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s : ne peut ajouter que des fichiers normaux, des liens symboliques ou des "
 "répertoires git"
 
-#: read-cache.c:723
+#: read-cache.c:753
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' n'a pas de commit extrait"
 
-#: read-cache.c:775
+#: read-cache.c:805
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "indexation du fichier '%s' impossible"
 
-#: read-cache.c:794
+#: read-cache.c:824
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "impossible d'ajouter '%s' à l'index"
 
-#: read-cache.c:805
+#: read-cache.c:835
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "fstat de '%s' impossible"
 
-#: read-cache.c:1314
+#: read-cache.c:1358
 #, 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:1520
+#: read-cache.c:1573
 msgid "Refresh index"
 msgstr "Rafraîchir l'index"
 
-#: read-cache.c:1635
+#: read-cache.c:1705
 #, 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:1645
+#: read-cache.c:1715
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4828,150 +6490,165 @@ msgstr ""
 "GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
 "Utilisation de la version %i"
 
-#: read-cache.c:1701
+#: read-cache.c:1771
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "signature incorrecte 0x%08x"
 
-#: read-cache.c:1704
+#: read-cache.c:1774
 #, c-format
 msgid "bad index version %d"
 msgstr "mauvaise version d'index %d"
 
-#: read-cache.c:1713
+#: read-cache.c:1783
 msgid "bad index file sha1 signature"
 msgstr "mauvaise signature sha1 d'index"
 
-#: read-cache.c:1743
+#: read-cache.c:1817
 #, 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:1745
+#: read-cache.c:1819
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "extension %.4s ignorée"
 
-#: read-cache.c:1782
+#: read-cache.c:1856
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "format d'entrée d'index inconnu 0x%08x"
 
-#: read-cache.c:1798
+#: read-cache.c:1872
 #, 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:1855
+#: read-cache.c:1929
 msgid "unordered stage entries in index"
 msgstr "entrées de préparation non ordonnées dans l'index"
 
-#: read-cache.c:1858
+#: read-cache.c:1932
 #, 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:1861
+#: read-cache.c:1935
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "entrées de préparation non ordonnées pour '%s'"
 
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: 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 "fichier d'index corrompu"
 
-#: read-cache.c:2108
+#: read-cache.c:2185
 #, 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:2121
+#: read-cache.c:2198
 #, 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:2154
+#: read-cache.c:2231
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s : l'ouverture du fichier d'index a échoué"
 
-#: read-cache.c:2158
+#: read-cache.c:2235
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s : impossible de faire un stat sur l'index ouvert"
 
-#: read-cache.c:2162
+#: read-cache.c:2239
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s : fichier d'index plus petit qu'attendu"
 
-#: read-cache.c:2166
+#: read-cache.c:2243
 #, 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:2208
+#: read-cache.c:2286
 #, 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:2235
+#: read-cache.c:2313
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "impossible de joindre le fil load_index_extensions : %s"
 
-#: read-cache.c:2267
+#: read-cache.c:2351
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "impossible de rafraîchir l'index partagé '%s'"
 
-#: read-cache.c:2314
+#: read-cache.c:2398
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "index cassé, %s attendu dans %s, %s obtenu"
 
-#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
 #, c-format
 msgid "could not close '%s'"
 msgstr "impossible de fermer '%s'"
 
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
+#: read-cache.c:3075
+msgid "failed to convert to a sparse-index"
+msgstr "échec de conversion d'un index clairsemé"
+
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
 #, c-format
 msgid "could not stat '%s'"
-msgstr "stat impossible de '%s'"
+msgstr "impossible de stat '%s'"
 
-#: read-cache.c:3126
+#: read-cache.c:3159
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "impossible d'ouvrir le répertoire git : %s"
 
-#: read-cache.c:3138
+#: read-cache.c:3171
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "échec lors de l'unlink : %s"
 
-#: read-cache.c:3163
+#: read-cache.c:3200
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "impossible de régler les bits de droit de '%s'"
 
-#: read-cache.c:3312
+#: read-cache.c:3349
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s : impossible de revenir à l'étape 0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
+"rebase --continue'.\n"
+"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
+
+#: 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é."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4979,7 +6656,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"
@@ -4988,7 +6668,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 ""
@@ -4999,7 +6679,13 @@ msgstr ""
 " 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"
+" 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"
@@ -5013,14 +6699,14 @@ msgstr ""
 "\n"
 "Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:66
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 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:65 git-rebase--preserve-merges.sh:228
+#: 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"
@@ -5029,7 +6715,7 @@ msgstr ""
 "Ne supprimez aucune ligne. Utilisez 'drop' explicitement pour supprimer un "
 "commit.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -5037,7 +6723,7 @@ msgstr ""
 "\n"
 "Si vous éliminez une ligne ici, LE COMMIT CORRESPONDANT SERA PERDU.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -5052,7 +6738,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -5062,22 +6748,19 @@ msgstr ""
 "Cependant, si vous effacez tout, le rebasage sera annulé.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Veuillez noter que les commits vides sont en commentaire"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
+#: 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 "impossible d'écrire '%s'"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "impossible de copier '%s' vers '%s'."
+msgid "could not write '%s'."
+msgstr "impossible d'écrire '%s'."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:196
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -5086,7 +6769,7 @@ msgstr ""
 "Attention : certains commits ont pu être accidentellement supprimés.\n"
 "Commits supprimés (du plus jeune au plus vieux) :\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:203
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -5104,125 +6787,15 @@ msgstr ""
 "Les comportements disponibles sont : ignore, warn, error.\n"
 "\n"
 
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s ne pointe pas sur un objet valide!"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "symref pendant %s ignoré"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "réf cassé %s ignoré"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "impossible d'ouvrir '%s' en écriture : %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "impossible de lire la réf '%s'"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "la référence '%s' existe déjà"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "id d'objet inattendu pendant l'écriture de '%s'"
-
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "impossible d'écrire dans '%s'"
-
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1004
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "impossible d'ouvrir '%s' en écriture"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "id d'objet inattendu pendant la suppression de '%s'"
-
-#: refs.c:998
-#, 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:1004
-#, 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:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "le journal pour la réf %s est vide"
-
-#: refs.c:1155
-#, 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:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "échec de update_ref pour la réf '%s' : %s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "mises à jour multiples pour la réf '%s' non permises"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "mises à jour des références interdites en environnement de quarantaine"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' existe ; impossible de créer '%s'"
-
-#: refs.c:2157 refs.c:2192
+#: 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 "cannot process '%s' and '%s' at the same time"
-msgstr "impossible de traiter '%s' et '%s' en même temps"
-
-#: refs/files-backend.c:1234
-#, c-format
-msgid "could not remove reference %s"
-msgstr "impossible de supprimer la référence %s"
-
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Impossible de supprimer la référence %s : %s"
-
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "impossible de supprimer les références : %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "spécificateur de réference invalide : '%s'"
+msgid "could not read '%s'."
+msgstr "impossible de lire '%s'."
 
 # à priori on parle d'une branche ici
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
 msgstr "disparue"
 
@@ -5241,283 +6814,412 @@ msgstr "en retard de %d"
 msgid "ahead %d, behind %d"
 msgstr "en avance de %d, en retard de %d"
 
-#: ref-filter.c:165
+#: ref-filter.c:230
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "format attendu : %%(color:<couleur>)"
 
-#: ref-filter.c:167
+#: ref-filter.c:232
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "couleur non reconnue : %%(color:%s)"
 
-#: ref-filter.c:189
+#: ref-filter.c:254
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Valeur entière attendue refname:lstrip=%s"
 
-#: ref-filter.c:193
+#: ref-filter.c:258
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valeur entière attendue refname:rstrip=%s"
 
-#: ref-filter.c:195
+#: ref-filter.c:260
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "argument %%(%s) non reconnu : %s"
 
-#: ref-filter.c:250
+#: ref-filter.c:315
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) n'accepte pas d'argument"
 
-#: ref-filter.c:272
+#: ref-filter.c:339
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "argument %%(objectsize) non reconnu : %s"
 
-#: ref-filter.c:280
+#: ref-filter.c:347
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) n'accepte pas d'argument"
 
-#: ref-filter.c:292
+#: ref-filter.c:359
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) n'accepte pas d'argument"
 
-#: ref-filter.c:301
+#: ref-filter.c:372
+#, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "argument %%(subject) non reconnu : %s"
+
+#: ref-filter.c:391
 #, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) n'accepte pas d'argument"
+msgid "expected %%(trailers:key=<value>)"
+msgstr "%%(trailers:key=<value>) attendu"
 
-#: ref-filter.c:323
+#: ref-filter.c:393
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "argument %%(trailers) inconnu : %s"
 
-#: ref-filter.c:352
+#: ref-filter.c:424
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valeur positive attendue contents:lines=%s"
 
-#: ref-filter.c:354
+#: ref-filter.c:426
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "argument %%(contents) non reconnu : %s"
 
-#: ref-filter.c:369
+#: ref-filter.c:441
 #, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "valeur positive attendue objectname:short=%s"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "valeur positive attendue '%s' dans %%(%s)"
 
-#: ref-filter.c:373
+#: ref-filter.c:445
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "argument %%(objectname) non reconnu : %s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "argument '%s' non reconnu dans %%(%s)"
 
-#: ref-filter.c:403
+#: ref-filter.c:459
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "option de courriel non reconnue : %s"
+
+#: ref-filter.c:489
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "format attendu : %%(align:<largeur>,<position>)"
 
-#: ref-filter.c:415
+#: ref-filter.c:501
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "position non reconnue : %s"
 
-#: ref-filter.c:422
+#: ref-filter.c:508
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "largeur non reconnue : %s"
 
-#: ref-filter.c:431
+#: ref-filter.c:517
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argument %%(align) non reconnu : %s"
 
-#: ref-filter.c:439
+#: ref-filter.c:525
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "valeur positive attendue avec l'atome %%(align)"
 
-#: ref-filter.c:457
+#: ref-filter.c:543
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "argument %%(if) non reconnu : %s"
 
-#: ref-filter.c:559
+#: ref-filter.c:645
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nom de champ malformé %.*s"
 
-#: ref-filter.c:586
+#: ref-filter.c:672
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nom de champ inconnu : %.*s"
 
-#: ref-filter.c:590
+#: ref-filter.c:676
 #, 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:714
+#: ref-filter.c:801
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
 
-#: ref-filter.c:777
+#: ref-filter.c:865
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
 
-#: ref-filter.c:779
+#: ref-filter.c:867
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format : atome %%(then) utilisé plus d'une fois"
 
-#: ref-filter.c:781
+#: ref-filter.c:869
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atome %%(then) utilisé après %%(else)"
 
-#: ref-filter.c:809
+#: ref-filter.c:897
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
 
-#: ref-filter.c:811
+#: ref-filter.c:899
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
 
-#: ref-filter.c:813
+#: ref-filter.c:901
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format : atome %%(else) utilisé plus d'une fois"
 
-#: ref-filter.c:828
+#: ref-filter.c:916
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format : atome %%(end) utilisé sans atome correspondant"
 
-#: ref-filter.c:885
+#: ref-filter.c:973
 #, c-format
 msgid "malformed format string %s"
-msgstr "Chaîne de formatage mal formée %s"
+msgstr "chaîne de formatage mal formée %s"
+
+#: ref-filter.c:1621
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(aucune branche, rebasage de %s)"
+
+#: ref-filter.c:1624
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(aucune branche, rebasage de la HEAD détachée %s)"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1627
 #, c-format
-msgid "no branch, rebasing %s"
-msgstr "aucune branche, rebasage de %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(aucune branche, bisect a démarré sur %s)"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1631
 #, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "aucune branche, rebasage de la HEAD détachée %s"
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD détachée sur %s)"
 
-#: ref-filter.c:1494
+#: ref-filter.c:1634
 #, c-format
-msgid "no branch, bisect started on %s"
-msgstr "aucune branche, bisect a démarré sur %s"
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD détachée depuis %s)"
 
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "aucune branche"
+#: ref-filter.c:1637
+msgid "(no branch)"
+msgstr "(aucune branche)"
 
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1669 ref-filter.c:1880
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objet manquant %s pour %s"
 
-#: ref-filter.c:1550
+#: ref-filter.c:1679
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "échec de parse_object_buffer sur %s pour %s"
 
-#: ref-filter.c:2004
+#: ref-filter.c:2064
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objet malformé à '%s'"
 
-#: ref-filter.c:2093
+#: ref-filter.c:2153
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "réf avec un nom cassé %s ignoré"
 
-#: ref-filter.c:2389
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: atome %%(end) manquant"
-
-#: ref-filter.c:2489
+#: ref-filter.c:2158 refs.c:676
 #, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "l'option « %s » est incompatible avec --merged"
+msgid "ignoring broken ref %s"
+msgstr "réf cassé %s ignoré"
 
-#: ref-filter.c:2492
+#: ref-filter.c:2502
 #, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "l'option « %s » est incompatible avec --no-merged"
+msgid "format: %%(end) atom missing"
+msgstr "format: atome %%(end) manquant"
 
-#: ref-filter.c:2502
+#: ref-filter.c:2596
 #, c-format
 msgid "malformed object name %s"
 msgstr "nom d'objet malformé %s"
 
-#: ref-filter.c:2507
+#: ref-filter.c:2601
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "l'option '%s' doit pointer sur un commit"
 
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s ne pointe pas sur un objet valide!"
+
+#: 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 ""
+"Utilisation de '%s' comme nom de la branche initiale. Le nom de la branche\n"
+"par défaut peut changer. Pour configurer le nom de la branche initiale\n"
+"pour tous les nouveaux dépôts, et supprimer cet avertissement, lancez :\n"
+"\n"
+"\tgit config --global init.defaultBranch <nom>\n"
+"\n"
+"Les noms les plus utilisés à la place de 'master' sont 'main', 'trunk' et\n"
+"'development'. La branche nouvellement créée peut être rénommée avec :\n"
+"\n"
+"\tgit branch -m <nom>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "impossible de récupérer `%s`"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nom de branche invalide : %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "symref pendant %s ignoré"
+
+#: refs.c:922
+#, 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
+#, 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
+#, c-format
+msgid "log for %s is empty"
+msgstr "le journal pour la réf %s est vide"
+
+#: refs.c:1086
+#, 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
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "échec de update_ref pour la réf '%s' : %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "mises à jour multiples pour la réf '%s' non permises"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "mises à jour des références interdites en environnement de quarantaine"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "mises à jour des références annulées par le crochet"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe ; impossible de créer '%s'"
+
+#: refs.c:2248 refs.c:2283
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "could not delete references: %s"
+msgstr "impossible de supprimer les références : %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "spécificateur de réference invalide : '%s'"
+
+#: remote.c:351
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "un raccourci de configuration de distant ne peut pas commencer par '/' : %s"
 
-#: remote.c:413
+#: remote.c:399
 msgid "more than one receivepack given, using the first"
 msgstr "plus d'un receivepack fournis, utilisation du premier"
 
-#: remote.c:421
+#: remote.c:407
 msgid "more than one uploadpack given, using the first"
 msgstr "plus d'un uploadpack fournis, utilisation du premier"
 
-#: remote.c:611
+#: remote.c:590
 #, 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:615
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s suit habituellement %s, pas %s"
 
-#: remote.c:619
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s suit à la fois %s et %s"
 
-#: remote.c:687
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "la clé '%s' du modèle n'a pas de '*'"
 
-#: remote.c:697
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "la valeur '%s' du modèle n'a pas de '*'"
 
-#: remote.c:1003
+#: remote.c:1083
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr ""
 "le spécificateur de référence source %s ne correspond à aucune référence"
 
-#: remote.c:1008
+#: remote.c:1088
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -5527,7 +7229,7 @@ msgstr ""
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1023
+#: remote.c:1103
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5551,163 +7253,163 @@ msgstr ""
 "Aucune n'a fonctionné, donc abandon. Veuillez spécifier une référence "
 "totalement qualifiée."
 
-#: remote.c:1043
+#: remote.c:1123
 #, 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 partie <source> du spécificateur de référence est un objet commit.\n"
+"La partie <source> du spécificateur de référence est un objet commit.\n"
 "Souhaitiez-vous créer une nouvelle branche en poussant sur\n"
 "'%s:refs/heads/%s' ?"
 
-#: remote.c:1048
+#: remote.c:1128
 #, 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 partie <source> du spécificateur de référence est un objet étiquette.\n"
+"La partie <source> du spécificateur de référence est un objet étiquette.\n"
 "Souhaitiez-vous créer une nouvelle étiquette en poussant sur\n"
 "'%s:refs/tags/%s' ?"
 
-#: remote.c:1053
+#: remote.c:1133
 #, 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 partie <source> du spécificateur de référence est un objet arbre.\n"
+"La partie <source> du spécificateur de référence est un objet arbre.\n"
 "Souhaitiez-vous créer un nouvel arbre en poussant sur\n"
 "'%s:refs/tags/%s' ?"
 
-#: remote.c:1058
+#: remote.c:1138
 #, 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 partie <source> du spécificateur de référence est un objet blob.\n"
+"La partie <source> du spécificateur de référence est un objet blob.\n"
 "Souhaitiez-vous créer un nouveau blob en poussant sur\n"
 "'%s:refs/tags/%s' ?"
 
-#: remote.c:1094
+#: remote.c:1174
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "'%s' ne peut pas être résolue comme une branche"
 
-#: remote.c:1105
+#: remote.c:1185
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
-msgstr "suppression d '%s' impossible : la référence distante n'existe pas"
+msgstr "suppression de '%s' impossible : la référence distante n'existe pas"
 
-#: remote.c:1117
+#: remote.c:1197
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 "le spécificateur de référence dst %s correspond à plus d'un spécificateur de "
 "références"
 
-#: remote.c:1124
+#: remote.c:1204
 #, 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:1627 remote.c:1728
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
 msgstr "HEAD ne pointe pas sur une branche"
 
-#: remote.c:1636
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "pas de branche '%s'"
 
-#: remote.c:1639
+#: remote.c:1736
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "aucune branche amont configurée pour la branche '%s'"
 
-#: remote.c:1645
+#: remote.c:1742
 #, 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:1660
+#: remote.c:1757
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "la destination de poussée '%s' sur le serveur distant '%s' n'a pas de "
 "branche locale de suivi"
 
-#: remote.c:1672
+#: remote.c:1769
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "la branche '%s' n'a aucune branche distante de poussée"
 
-#: remote.c:1682
+#: remote.c:1779
 #, 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:1695
+#: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
 
-#: remote.c:1717
+#: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 "impossible de résoudre une poussée 'simple' pour une destination unique"
 
-#: remote.c:1843
+#: remote.c:1943
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "impossible de trouver la référence distante %s"
 
-#: remote.c:1856
+#: remote.c:1956
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Référence bizarre '%s' ignorée localement"
 
-#: remote.c:2019
+#: remote.c:2119
 #, 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:2023
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (utilisez \"git branch --unset-upstream\" pour corriger)\n"
 
-#: remote.c:2026
+#: remote.c:2126
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Votre branche est à jour avec '%s'.\n"
 
-#: remote.c:2030
+#: remote.c:2130
 #, 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:2033
+#: remote.c:2133
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (utilisez \"%s\" pour plus de détails)\n"
 
-#: remote.c:2037
+#: 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] "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:2043
+#: remote.c:2143
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (utilisez \"git push\" pour publier vos commits locaux)\n"
 
-#: remote.c:2046
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5719,11 +7421,11 @@ msgstr[1] ""
 "Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
 "en avance rapide.\n"
 
-#: remote.c:2054
+#: remote.c:2154
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
 
-#: remote.c:2057
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5738,12 +7440,12 @@ msgstr[1] ""
 "Votre branche et '%s' ont divergé,\n"
 "et ont %d et %d commits différents chacune respectivement.\n"
 
-#: remote.c:2067
+#: remote.c:2167
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 "  (utilisez \"git pull\" pour fusionner la branche distante dans la vôtre)\n"
 
-#: remote.c:2250
+#: remote.c:2359
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "impossible d'analyser le nom attendu d'objet '%s'"
@@ -5758,131 +7460,140 @@ msgstr "mauvaise références de remplacement : %s"
 msgid "duplicate replace ref: %s"
 msgstr "référence de remplacement dupliquée : %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "profondeur de remplacement trop grande pour l'objet %s"
 
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
 msgid "corrupt MERGE_RR"
 msgstr "MERGE_RR corrompu"
 
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
 msgstr "impossible d'écrire l'enregistrement rerere"
 
-#: rerere.c:495
+#: rerere.c:479
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
 msgstr "il y a eu des erreurs à l'écriture de '%s' (%s)"
 
-#: rerere.c:498
+#: rerere.c:482
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "échec du flush de '%s'"
 
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
 #, c-format
 msgid "could not parse conflict hunks in '%s'"
 msgstr "impossible d'analyser la section en conflit dans '%s'"
 
-#: rerere.c:684
+#: rerere.c:668
 #, c-format
 msgid "failed utime() on '%s'"
 msgstr "échec de utime() sur '%s'"
 
-#: rerere.c:694
+#: rerere.c:678
 #, c-format
 msgid "writing '%s' failed"
 msgstr "échec de l'écriture de '%s'"
 
-#: rerere.c:714
+#: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
 msgstr "'%s' indexé en utilisant la résolution pré-existante."
 
-#: rerere.c:753
+#: rerere.c:737
 #, c-format
 msgid "Recorded resolution for '%s'."
 msgstr "Résolution enregistrée pour '%s'."
 
-#: rerere.c:788
+#: rerere.c:772
 #, c-format
 msgid "Resolved '%s' using previous resolution."
 msgstr "'%s' résolu en utilisant la résolution pré-existante."
 
-#: rerere.c:803
+#: rerere.c:787
 #, c-format
 msgid "cannot unlink stray '%s'"
 msgstr "impossible de délier '%s' qui est errant"
 
-#: rerere.c:807
+#: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
 msgstr "Pré-image enregistrée pour '%s'"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: 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 "impossible de créer le répertoire '%s'"
 
-#: rerere.c:1057
+#: rerere.c:1041
 #, c-format
 msgid "failed to update conflicted state in '%s'"
 msgstr "échec de la mise à jour de l'état en conflit dans '%s'"
 
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
 #, c-format
 msgid "no remembered resolution for '%s'"
-msgstr "Aucune résolution enregistrée pour '%s'"
+msgstr "aucune résolution enregistrée pour '%s'"
 
-#: rerere.c:1077
+#: rerere.c:1061
 #, c-format
 msgid "cannot unlink '%s'"
 msgstr "impossible de délier '%s'"
 
-#: rerere.c:1087
+#: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
 msgstr "Pré-image mise à jour pour '%s'"
 
-#: rerere.c:1096
+#: rerere.c:1080
 #, c-format
 msgid "Forgot resolution for '%s'\n"
 msgstr "Résolution  pour '%s' oubliée\n"
 
-#: rerere.c:1199
+#: rerere.c:1191
 msgid "unable to open rr-cache directory"
 msgstr "impossible d'ouvrir le répertoire rr-cache"
 
-#: revision.c:2509
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "impossible de déterminer la révision HEAD"
+
+#: reset.c:69 reset.c:75 sequencer.c:3689
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "impossible de trouver l'arbre de %s"
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<fichier-paquet> n'est plus géré"
+
+#: revision.c:2684
 msgid "your current branch appears to be broken"
 msgstr "votre branche actuelle semble cassée"
 
-#: revision.c:2512
+#: revision.c:2687
 #, 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:2720
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent est incompatible avec --bisect"
-
-#: revision.c:2724
+#: revision.c:2893
 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:763
+#: run-command.c:766
 msgid "open /dev/null failed"
 msgstr "échec de l'ouverture de /dev/null"
 
-#: run-command.c:1269
+#: run-command.c:1274
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "impossible de créer un fil asynchrone : %s"
 
-#: run-command.c:1333
+#: run-command.c:1344
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -5892,31 +7603,44 @@ msgstr ""
 "Vous pouvez désactiver cet avertissement avec `git config advice.ignoredHook "
 "false`."
 
-#: send-pack.c:142
+#: 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"
 
-#: send-pack.c:144
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
 
-#: send-pack.c:146
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "le dépaquetage a échoué : %s"
 
-#: send-pack.c:307
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "impossible de signer le certificat de poussée"
 
-#: send-pack.c:421
+#: send-pack.c:433
+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
+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"
+
+#: send-pack.c:526
+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:535
 msgid "the receiving end does not support --signed push"
-msgstr "Le receveur ne gère pas les poussées avec --signed"
+msgstr "le receveur ne gère pas les poussées avec --signed"
 
-#: send-pack.c:423
+#: send-pack.c:537
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5924,47 +7648,47 @@ msgstr ""
 "pas d'envoi de certificat de poussée car le receveur ne gère pas les "
 "poussées avec --signed"
 
-#: send-pack.c:435
+#: send-pack.c:544
 msgid "the receiving end does not support --atomic push"
-msgstr "Le receveur ne gère pas les poussées avec --atomic"
+msgstr "le receveur ne gère pas les poussées avec --atomic"
 
-#: send-pack.c:440
+#: send-pack.c:549
 msgid "the receiving end does not support push options"
-msgstr "Le receveur ne gère pas les options de poussées"
+msgstr "le receveur ne gère pas les options de poussées"
 
-#: sequencer.c:187
+#: sequencer.c:196
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "mode de nettoyage invalide de message de validation '%s'"
 
-#: sequencer.c:292
+#: sequencer.c:324
 #, c-format
 msgid "could not delete '%s'"
-msgstr "Impossible de supprimer '%s'"
+msgstr "impossible de supprimer '%s'"
 
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
 #, c-format
 msgid "could not remove '%s'"
 msgstr "impossible de supprimer '%s'"
 
-#: sequencer.c:321
+#: sequencer.c:354
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:323
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:358
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
+#: sequencer.c:360
 #, c-format
 msgid "unknown action: %d"
 msgstr "action inconnue : %d"
 
-#: sequencer.c:385
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5972,7 +7696,7 @@ msgstr ""
 "après résolution des conflits, marquez les chemins corrigés\n"
 "avec 'git add <chemins>' ou 'git rm <chemins>'"
 
-#: sequencer.c:388
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5982,110 +7706,109 @@ msgstr ""
 "avec 'git add <chemins>' ou 'git rm <chemins>'\n"
 "puis validez le résultat avec 'git commit'"
 
-#: sequencer.c:401 sequencer.c:2847
+#: sequencer.c:435 sequencer.c:3271
 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossible de verrouiller '%s'"
 
-#: sequencer.c:408
+#: 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 "impossible d'écrire dans '%s'"
+
+#: sequencer.c:442
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "impossible d'écrire la fin de ligne dans '%s'"
 
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
-#: sequencer.c:3130
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "échec lors de la finalisation de '%s'"
 
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
-#: builtin/rebase.c:568
-#, c-format
-msgid "could not read '%s'"
-msgstr "impossible de lire '%s'"
-
-#: sequencer.c:462
+#: sequencer.c:486
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "vos modifications locales seraient écrasées par %s."
 
-#: sequencer.c:466
+#: sequencer.c:490
 msgid "commit your changes or stash them to proceed."
 msgstr "validez vos modifications ou les remiser pour continuer."
 
-#: sequencer.c:498
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s : avance rapide"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:561 builtin/tag.c:609
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Mode de nettoyage invalide %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:631
+#: sequencer.c:671
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Impossible d'écrire le nouveau fichier index"
 
-#: sequencer.c:648
+#: sequencer.c:685
 msgid "unable to update cache tree"
 msgstr "impossible de mettre à jour l'arbre de cache"
 
-#: sequencer.c:662
+#: sequencer.c:699
 msgid "could not resolve HEAD commit"
 msgstr "impossible de résoudre le commit HEAD"
 
-#: sequencer.c:742
+#: sequencer.c:779
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "aucune clé présente dans '%.*s'"
 
-#: sequencer.c:753
+#: sequencer.c:790
 #, c-format
 msgid "unable to dequote value of '%s'"
-msgstr "Impossible de décoter la valeur de '%s'"
+msgstr "impossible de décoter la valeur de '%s'"
 
-#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
+#: 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 "impossible d'ouvrir '%s' en lecture"
 
-#: sequencer.c:800
+#: sequencer.c:837
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' déjà fourni"
 
-#: sequencer.c:805
+#: sequencer.c:842
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' déjà fourni"
 
-#: sequencer.c:810
+#: sequencer.c:847
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' déjà fourni"
 
-#: sequencer.c:814
+#: sequencer.c:851
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variable inconnue '%s'"
 
-#: sequencer.c:819
+#: sequencer.c:856
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "'GIT_AUTHOR_NAME' manquant"
 
-#: sequencer.c:821
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "'GIT_AUTHOR_EMAIL' manquant"
 
-#: sequencer.c:823
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "'GIT_AUTHOR_DATE' manquant"
 
-#: sequencer.c:872
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -6101,7 +7824,7 @@ msgid ""
 "\n"
 "  git rebase --continue\n"
 msgstr ""
-"Vous avez des modifications indexées dans votre copie de travail.\n"
+"vous avez des modifications indexées dans votre copie de travail.\n"
 "Si elles devaient être ajoutées dans le commit précédent, lancez :\n"
 "\n"
 "  git commit --amend %s\n"
@@ -6114,11 +7837,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1146
+#: sequencer.c:1212
 msgid "'prepare-commit-msg' hook failed"
 msgstr "échec du crochet 'prepare-commit-msg'"
 
-#: sequencer.c:1153
+#: 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"
@@ -6147,7 +7870,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1166
+#: 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"
@@ -6173,349 +7896,362 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1208
+#: sequencer.c:1273
 msgid "couldn't look up newly created commit"
 msgstr "impossible de retrouver le commit nouvellement créé"
 
-#: sequencer.c:1210
+#: sequencer.c:1275
 msgid "could not parse newly created commit"
 msgstr "impossible d'analyser le commit nouvellement créé"
 
-#: sequencer.c:1256
+#: sequencer.c:1321
 msgid "unable to resolve HEAD after creating commit"
 msgstr "impossible de résoudre HEAD après création du commit"
 
-#: sequencer.c:1258
+#: sequencer.c:1323
 msgid "detached HEAD"
 msgstr "HEAD détachée"
 
-#: sequencer.c:1262
+#: sequencer.c:1327
 msgid " (root-commit)"
 msgstr " (commit racine)"
 
-#: sequencer.c:1283
+#: sequencer.c:1348
 msgid "could not parse HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:1285
+#: sequencer.c:1350
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s n'est pas un commit !"
 
-#: sequencer.c:1289 builtin/commit.c:1571
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
 msgid "could not parse HEAD commit"
 msgstr "impossible d'analyser le commit HEAD"
 
-#: sequencer.c:1341 sequencer.c:1933
+#: sequencer.c:1410 sequencer.c:2295
 msgid "unable to parse commit author"
 msgstr "impossible d'analyser l'auteur du commit"
 
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree a échoué à écrire un arbre"
 
-#: sequencer.c:1369 sequencer.c:1429
+#: sequencer.c:1454 sequencer.c:1574
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "impossible de lire le message de validation de '%s'"
 
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identité d'auteur invalide '%s'"
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr "auteur corrompu : information de date manquante"
+
+#: 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 "échec de l'écriture de l'objet commit"
 
-#: sequencer.c:1456
+#: 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 "impossible de mettre à jour %s"
+
+#: sequencer.c:1606
 #, c-format
 msgid "could not parse commit %s"
 msgstr "impossible d'analyser le commit %s"
 
-#: sequencer.c:1461
+#: sequencer.c:1611
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "impossible d'analyser le commit parent %s"
 
-#: sequencer.c:1535 sequencer.c:1645
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
 msgid "unknown command: %d"
 msgstr "commande inconnue : %d"
 
-#: sequencer.c:1592 sequencer.c:1617
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "Ceci est le premier message de validation :"
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Ceci est le message de validation numéro %d :"
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "Le premier message de validation sera ignoré :"
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Le message de validation %d sera ignoré :"
+
+#: sequencer.c:1740
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Ceci est la combinaison de %d commits."
 
-#: sequencer.c:1602
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "impossible d'écrire '%s'"
+
+#: sequencer.c:1934
 msgid "need a HEAD to fixup"
 msgstr "une HEAD est nécessaire à la correction"
 
-#: sequencer.c:1604 sequencer.c:3157
+#: sequencer.c:1936 sequencer.c:3582
 msgid "could not read HEAD"
-msgstr "Impossible de lire HEAD"
+msgstr "impossible de lire HEAD"
 
-#: sequencer.c:1606
+#: sequencer.c:1938
 msgid "could not read HEAD's commit message"
 msgstr "impossible de lire le message de validation de HEAD"
 
-#: sequencer.c:1612
-#, c-format
-msgid "cannot write '%s'"
-msgstr "impossible d'écrire '%s'"
-
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
-msgid "This is the 1st commit message:"
-msgstr "Ceci est le premier message de validation :"
-
-#: sequencer.c:1627
+#: sequencer.c:1962
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "impossible de lire le message de validation de %s"
 
-#: sequencer.c:1634
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Ceci est le message de validation numéro %d :"
-
-#: sequencer.c:1640
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Le message de validation %d sera ignoré :"
-
-#: sequencer.c:1728
+#: sequencer.c:2072
 msgid "your index file is unmerged."
 msgstr "votre fichier d'index n'est pas fusionné."
 
-#: sequencer.c:1735
+#: sequencer.c:2079
 msgid "cannot fixup root commit"
 msgstr "impossible de réparer le commit racine"
 
-#: sequencer.c:1754
+#: sequencer.c:2098
 #, 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:1762 sequencer.c:1770
+#: sequencer.c:2106 sequencer.c:2114
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "le commit %s n'a pas de parent %d"
 
-#: sequencer.c:1776
+#: sequencer.c:2120
 #, 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:1795
+#: sequencer.c:2139
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s : impossible d'analyser le commit parent %s"
 
-#: sequencer.c:1860
+#: sequencer.c:2205
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossible de renommer '%s' en '%s'"
 
-#: sequencer.c:1915
+#: sequencer.c:2265
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "impossible d'annuler %s... %s"
 
-#: sequencer.c:1916
+#: sequencer.c:2266
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "impossible d'appliquer %s... %s"
 
-#: sequencer.c:1983
+#: sequencer.c:2287
+#, 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
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s : échec à la lecture de l'index"
 
-#: sequencer.c:1990
+#: sequencer.c:2352
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s : échec du rafraîchissement de l'index"
 
-#: sequencer.c:2066
+#: sequencer.c:2425
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s n'accepte pas d'argument : '%s'"
 
-#: sequencer.c:2075
+#: sequencer.c:2434
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argument manquant pour %s"
 
-#: sequencer.c:2112
+#: sequencer.c:2477
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "impossible d'analyser '%.*s'"
+msgid "could not parse '%s'"
+msgstr "impossible d'analyser '%s'"
 
-#: sequencer.c:2166
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ligne %d invalide : %.*s"
 
-#: sequencer.c:2177
+#: sequencer.c:2549
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "'%s' impossible avec le commit précédent"
 
-#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "impossible de lire '%s'."
-
-#: sequencer.c:2261
+#: sequencer.c:2635
 msgid "cancelling a cherry picking in progress"
 msgstr "annulation d'un picorage en cours"
 
-#: sequencer.c:2268
+#: sequencer.c:2644
 msgid "cancelling a revert in progress"
 msgstr "annulation d'un retour en cours"
 
-#: sequencer.c:2302
+#: sequencer.c:2690
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
 
-#: sequencer.c:2304
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "feuille d'instruction inutilisable : '%s'"
 
-#: sequencer.c:2309
+#: sequencer.c:2697
 msgid "no commits parsed."
 msgstr "aucun commit analysé."
 
-#: sequencer.c:2320
+#: sequencer.c:2708
 msgid "cannot cherry-pick during a revert."
 msgstr "impossible de picorer pendant l'annulation d'un commit."
 
-#: sequencer.c:2322
+#: sequencer.c:2710
 msgid "cannot revert during a cherry-pick."
 msgstr "impossible d'annuler un commit pendant un picorage."
 
-#: sequencer.c:2404
+#: sequencer.c:2788
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valeur invalide pour %s : %s"
 
-#: sequencer.c:2491
+#: sequencer.c:2897
 msgid "unusable squash-onto"
 msgstr "\"écrase-sur\" inutilisable"
 
-#: sequencer.c:2507
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "feuille d'options malformée : %s"
 
-#: sequencer.c:2590 sequencer.c:4308
+#: sequencer.c:3012 sequencer.c:4868
 msgid "empty commit set passed"
 msgstr "l'ensemble de commits spécifié est vide"
 
-#: sequencer.c:2606
+#: sequencer.c:3029
 msgid "revert is already in progress"
 msgstr "un retour est déjà en cours"
 
-#: sequencer.c:2608
+#: sequencer.c:3031
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "essayez \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2611
+#: sequencer.c:3034
 msgid "cherry-pick is already in progress"
 msgstr "un picorage est déjà en cours"
 
-#: sequencer.c:2613
+#: sequencer.c:3036
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "essayez \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2627
+#: sequencer.c:3050
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "impossible de créer le répertoire de séquenceur '%s'"
 
-#: sequencer.c:2642
+#: sequencer.c:3065
 msgid "could not lock HEAD"
 msgstr "impossible de verrouiller HEAD"
 
-#: sequencer.c:2702 sequencer.c:4057
+#: sequencer.c:3125 sequencer.c:4581
 msgid "no cherry-pick or revert in progress"
 msgstr "aucun picorage ou retour en cours"
 
-#: sequencer.c:2704 sequencer.c:2715
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
-#: sequencer.c:2706 sequencer.c:2750
+#: sequencer.c:3129 sequencer.c:3173
 msgid "cannot abort from a branch yet to be born"
 msgstr "impossible d'abandonner depuis une branche non encore créée"
 
-#: sequencer.c:2736 builtin/grep.c:736
+#: sequencer.c:3159 builtin/grep.c:758
 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossible d'ouvrir '%s'"
 
-#: sequencer.c:2738
+#: sequencer.c:3161
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossible de lire '%s' : %s"
 
-#: sequencer.c:2739
+#: sequencer.c:3162
 msgid "unexpected end of file"
 msgstr "fin de fichier inattendue"
 
-#: sequencer.c:2745
+#: sequencer.c:3168
 #, 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:2756
+#: sequencer.c:3179
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Vous semblez avoir déplacé la HEAD. Pas de rembobinage, vérifiez votre HEAD !"
 
-#: sequencer.c:2797
+#: sequencer.c:3220
 msgid "no revert in progress"
-msgstr "Pas de retour en cours ?"
+msgstr "pas de retour en cours"
 
-#: sequencer.c:2805
+#: sequencer.c:3229
 msgid "no cherry-pick in progress"
 msgstr "aucun picorage en cours"
 
-#: sequencer.c:2815
+#: sequencer.c:3239
 msgid "failed to skip the commit"
 msgstr "échec du saut de commit"
 
-#: sequencer.c:2822
+#: sequencer.c:3246
 msgid "there is nothing to skip"
 msgstr "il n'y a rien à sauter"
 
-#: sequencer.c:2825
+#: sequencer.c:3249
 #, c-format
 msgid ""
 "have you committed already?\n"
 "try \"git %s --continue\""
 msgstr ""
-"Avez-vous déjà validé ?\n"
-"essayez \"git %s -continue\""
-
-#: sequencer.c:2949 sequencer.c:3969
-#, c-format
-msgid "could not update %s"
-msgstr "impossible de mettre à jour %s"
+"avez-vous déjà validé ?\n"
+"essayez \"git %s --continue\""
 
-#: sequencer.c:2987 sequencer.c:3949
+#: sequencer.c:3411 sequencer.c:4472
 msgid "cannot read HEAD"
 msgstr "impossible de lire HEAD"
 
-#: sequencer.c:3004
+#: sequencer.c:3428
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: sequencer.c:3012
+#: sequencer.c:3436
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6534,27 +8270,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3022
+#: sequencer.c:3446
 #, c-format
 msgid "Could not apply %s... %.*s"
-msgstr "impossible d'appliquer %s... %.*s"
+msgstr "Impossible d'appliquer %s... %.*s"
 
-#: sequencer.c:3029
+#: sequencer.c:3453
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Impossible de fusionner %.*s"
 
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
-msgid "could not read index"
-msgstr "impossible de lire l'index"
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Exécution : %s\n"
 
-#: sequencer.c:3074
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6569,11 +8305,11 @@ msgstr ""
 "git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3080
+#: sequencer.c:3504
 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:3086
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6583,119 +8319,132 @@ msgid ""
 "  git rebase --continue\n"
 "\n"
 msgstr ""
-"L'exécution a réussi : %s\n"
+"l'exécution a réussi : %s\n"
 "mais a laissé des modifications dans l'index ou la copie de travail\n"
 "Validez ou remisez vos modification, puis lancez\n"
 "\n"
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3147
+#: sequencer.c:3572
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nom de label illégal '%.*s'"
 
-#: sequencer.c:3201
+#: sequencer.c:3645
 msgid "writing fake root commit"
 msgstr "écriture d'un commit racine bidon"
 
-#: sequencer.c:3206
+#: sequencer.c:3650
 msgid "writing squash-onto"
 msgstr "écriture de 'écraser-sur'"
 
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "impossible de trouver l'arbre de %s"
-
-#: sequencer.c:3262 builtin/rebase.c:874
-msgid "could not write index"
-msgstr "impossible d'écrire l'index"
-
-#: sequencer.c:3289
+#: sequencer.c:3734
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "impossible de résoudre '%s'"
 
-#: sequencer.c:3320
+#: sequencer.c:3767
 msgid "cannot merge without a current revision"
 msgstr "impossible de fusionner avec une révision courante"
 
-#: sequencer.c:3342
+#: sequencer.c:3789
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "impossible d'analyser '%.*s'"
 
-#: sequencer.c:3351
+#: sequencer.c:3798
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "rien à fusionner : '%.*s'"
 
-#: sequencer.c:3363
+#: sequencer.c:3810
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 "une fusion octopus ne peut pas être exécutée par dessus une nouvelle racine"
 
-#: sequencer.c:3378
+#: sequencer.c:3826
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "impossible de lire le message de validation de '%s'"
 
-#: sequencer.c:3538
+#: sequencer.c:4009
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "impossible de seulement essayer de fusionner '%.*s'"
 
-#: sequencer.c:3554
+#: sequencer.c:4025
 msgid "merge: Unable to write new index file"
 msgstr "fusion : Impossible d'écrire le nouveau fichier index"
 
-#: sequencer.c:3623 builtin/rebase.c:712
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr "Autoremisage impossible"
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Réponse de remisage inattendue : '%s'"
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Impossible de créer le répertoire pour '%s'"
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Autoremisage créé : %s\n"
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr "impossible de réinitialiser --hard"
+
+#: sequencer.c:4140
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Autoremisage appliqué.\n"
 
-#: sequencer.c:3635
+#: sequencer.c:4152
 #, c-format
 msgid "cannot store %s"
 msgstr "impossible de stocker %s"
 
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
+#: sequencer.c:4155
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
-"L'application de l'autoremisage a provoqué des conflits\n"
+"%s\n"
 "Vos  modifications sont à l'abri dans la remise.\n"
 "Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
 
-#: sequencer.c:3699
-#, c-format
-msgid "could not checkout %s"
-msgstr "extraction de %s impossible"
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
+msgstr "L'application du remisage automatique a créé des conflits."
 
-#: sequencer.c:3713
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s n'est pas un OID valide"
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+"Un remisage automatique existe ; création d'une nouvelle entrée de remisage."
 
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
-msgstr "Impossible de détacher HEAD"
+msgstr "impossible de détacher HEAD"
 
-#: sequencer.c:3733
+#: sequencer.c:4248
 #, c-format
 msgid "Stopped at HEAD\n"
-msgstr "arrêt à HEAD\n"
+msgstr "Arrêt à HEAD\n"
 
-#: sequencer.c:3735
+#: sequencer.c:4250
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Arrêté à %s\n"
 
-#: sequencer.c:3743
+#: sequencer.c:4258
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6716,48 +8465,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3827
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Rebasage (%d/%d)%s"
+
+#: sequencer.c:4350
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
-msgstr "arrêt à %s... %.*s\n"
+msgstr "Arrêt à %s... %.*s\n"
 
-#: sequencer.c:3898
+#: sequencer.c:4421
 #, c-format
 msgid "unknown command %d"
 msgstr "commande inconnue %d"
 
-#: sequencer.c:3957
+#: sequencer.c:4480
 msgid "could not read orig-head"
 msgstr "impossible de lire orig-head"
 
-#: sequencer.c:3962
+#: sequencer.c:4485
 msgid "could not read 'onto'"
 msgstr "impossible de lire 'onto'"
 
-#: sequencer.c:3976
+#: sequencer.c:4499
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossible de mettre à jour HEAD sur %s"
 
-#: sequencer.c:4069
+#: sequencer.c:4559
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebasage et mise à jour de %s avec succès.\n"
+
+#: sequencer.c:4611
 msgid "cannot rebase: You have unstaged changes."
 msgstr "impossible de rebaser : vous avez des modifications non indexées."
 
-#: sequencer.c:4078
+#: sequencer.c:4620
 msgid "cannot amend non-existing commit"
 msgstr "impossible de corriger un commit non-existant"
 
-#: sequencer.c:4080
+#: sequencer.c:4622
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "fichier invalide : '%s'"
 
-#: sequencer.c:4082
+#: sequencer.c:4624
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenu invalide : '%s'"
 
-#: sequencer.c:4085
+#: sequencer.c:4627
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6767,69 +8526,59 @@ 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:4121 sequencer.c:4159
+#: sequencer.c:4663 sequencer.c:4702
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "impossible d'écrire le fichier : '%s'"
 
-#: sequencer.c:4174
+#: sequencer.c:4718
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossible de supprimer CHERRY_PICK_HEAD"
 
-#: sequencer.c:4181
+#: sequencer.c:4725
 msgid "could not commit staged changes."
 msgstr "impossible de valider les modifications indexées."
 
-#: sequencer.c:4285
+#: sequencer.c:4845
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s : impossible de picorer un %s"
 
-#: sequencer.c:4289
+#: sequencer.c:4849
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s : mauvaise révision"
 
-#: sequencer.c:4324
+#: sequencer.c:4884
 msgid "can't revert as initial commit"
 msgstr "impossible d'annuler en tant que commit initial"
 
-#: sequencer.c:4774
+#: sequencer.c:5361
 msgid "make_script: unhandled options"
 msgstr "make_script : options non gérées"
 
-#: sequencer.c:4777
+#: sequencer.c:5364
 msgid "make_script: error preparing revisions"
 msgstr "make_script : erreur lors de la préparation des révisions"
 
-#: sequencer.c:4935
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
-"rebase --continue'.\n"
-"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
-
-#: sequencer.c:5047 sequencer.c:5064
+#: sequencer.c:5614 sequencer.c:5631
 msgid "nothing to do"
 msgstr "rien à faire"
 
-#: sequencer.c:5078
+#: sequencer.c:5650
 msgid "could not skip unnecessary pick commands"
 msgstr "impossible d'éviter les commandes de picorage non nécessaires"
 
-#: sequencer.c:5166
+#: sequencer.c:5750
 msgid "the script was already rearranged."
 msgstr "le script a déjà été réarrangé."
 
-#: setup.c:124
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' est hors du dépôt"
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' est hors du dépôt à '%s'"
 
-#: setup.c:174
+#: setup.c:185
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6839,7 +8588,7 @@ msgstr ""
 "Utilisez 'git <commande> -- <chemin>...' pour spécifier des chemins qui "
 "n'existent pas localement."
 
-#: setup.c:187
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6850,14 +8599,14 @@ msgstr ""
 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
 "'git <commande> [<révision>...] -- [<chemin>...]'"
 
-#: setup.c:236
+#: setup.c:264
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 "l'option '%s' doit être présente avant les arguments qui ne sont pas des "
 "options"
 
-#: setup.c:255
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6868,94 +8617,104 @@ msgstr ""
 "Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
 "'git <commande> [<révision>...] -- [<chemin>...]'"
 
-#: setup.c:391
+#: setup.c:419
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "impossible de mettre en place le répertoire de travail en utilisant une "
 "configuration invalide"
 
-#: setup.c:395
+#: setup.c:423 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"
+msgstr "cette opération doit être effectuée dans un arbre de travail"
 
-#: setup.c:541
+#: setup.c:658
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Version attendue du dépôt git <= %d, %d trouvée"
 
-#: setup.c:549
-msgid "unknown repository extensions found:"
-msgstr "extensions de dépôt inconnues trouvées :"
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "extension de dépôt inconnue trouvée :"
+msgstr[1] "extensions de dépôt inconnues trouvées :"
+
+#: setup.c:680
+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:568
+#: setup.c:701
 #, c-format
 msgid "error opening '%s'"
 msgstr "erreur à l'ouverture de '%s'"
 
-#: setup.c:570
+#: setup.c:703
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "trop gros pour être une fichier .git : '%s'"
 
-#: setup.c:572
+#: setup.c:705
 #, c-format
 msgid "error reading %s"
 msgstr "erreur à la lecture de %s"
 
-#: setup.c:574
+#: setup.c:707
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "format de fichier git invalide : %s"
 
-#: setup.c:576
+#: setup.c:709
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "aucun chemin dans le fichier git : %s"
 
-#: setup.c:578
+#: setup.c:711
 #, c-format
 msgid "not a git repository: %s"
 msgstr "ce n'est pas un dépôt git : %s"
 
-#: setup.c:677
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' trop gros"
 
-#: setup.c:691
+#: setup.c:827
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "ce n'est pas un dépôt git : '%s'"
 
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c:856 setup.c:858 setup.c:889
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "impossible de se déplacer vers le répertoire (chdir) '%s'"
 
-#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
 msgid "cannot come back to cwd"
 msgstr "impossible de revenir au répertoire de travail courant"
 
-#: setup.c:852
+#: setup.c:988
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "échec du stat de '%*s%s%s'"
 
-#: setup.c:1090
+#: setup.c:1231
 msgid "Unable to read current working directory"
 msgstr "Impossible d'accéder au répertoire de travail courant"
 
-#: setup.c:1099 setup.c:1105
+#: setup.c:1240 setup.c:1246
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "impossible de modifier en '%s'"
 
-#: setup.c:1110
+#: setup.c:1251
 #, 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:1116
+#: setup.c:1257
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6966,7 +8725,7 @@ msgstr ""
 "Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "n'est pas défini)."
 
-#: setup.c:1227
+#: setup.c:1381
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6976,347 +8735,69 @@ msgstr ""
 "Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
 "écriture."
 
-#: setup.c:1271
+#: setup.c:1430
 msgid "open /dev/null or dup failed"
 msgstr "échec de l'ouverture ou au dup de /dev/null"
 
-#: setup.c:1286
+#: setup.c:1445
 msgid "fork failed"
 msgstr "échec de la bifurcation"
 
-#: setup.c:1291
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
 msgid "setsid failed"
 msgstr "échec du setsid"
 
-#: sha1-file.c:452
-#, 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"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "impossible de normaliser le chemin d'objet alternatif : %s"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s : magasins d'objets alternatifs ignorés, récursion trop profonde"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "impossible de normaliser le répertoire d'objet : %s"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "impossible d'ouvrir (fdopen) le fichier verrou des alternatives"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "lecture du fichier d'alternatives impossible"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "impossible de déplacer le nouveau fichier d'alternative"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "le chemin '%s' n'existe pas"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
-"encore supporté."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "le dépôt de référence '%s' est superficiel"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "le dépôt de référence '%s' est greffé"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "ligne invalide pendant l'analyse des refs alternatives : %s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "essai de mmap %<PRIuMAX> au delà de la limite %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "échec de mmap"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "le fichier objet %s est vide"
-
-#: sha1-file.c:1252 sha1-file.c:2392
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "objet libre corrompu '%s'"
-
-#: sha1-file.c:1254 sha1-file.c:2396
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "données incorrectes à la fin de l'objet libre '%s'"
-
-#: sha1-file.c:1296
-msgid "invalid object type"
-msgstr "type d'objet invalide"
-
-#: sha1-file.c:1380
-#, 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"
-
-#: sha1-file.c:1383
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "impossible de dépaqueter l'entête %s"
-
-#: sha1-file.c:1389
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "impossible d'analyser l'entête %s avec --allow-unknow-type"
-
-#: sha1-file.c:1392
-#, c-format
-msgid "unable to parse %s header"
-msgstr "impossible d'analyser l'entête %s"
-
-#: sha1-file.c:1584
-#, c-format
-msgid "failed to read object %s"
-msgstr "impossible de lire l'objet %s"
-
-#: sha1-file.c:1588
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "remplacement %s non trouvé pour %s"
-
-#: sha1-file.c:1592
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "l'objet libre %s (stocké dans %s) est corrompu"
-
-#: sha1-file.c:1596
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "l'objet empaqueté %s (stocké dans %s) est corrompu"
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
+msgstr "tentative d'utilisation de l'index partiel sans mode cone"
 
-#: sha1-file.c:1699
-#, c-format
-msgid "unable to write file %s"
-msgstr "impossible d'écrire le fichier %s"
+#: sparse-index.c:176
+msgid "unable to update cache-tree, staying full"
+msgstr "impossible de mettre à jour l'arbre de cache, full conservé"
 
-#: sha1-file.c:1706
+#: sparse-index.c:263
 #, c-format
-msgid "unable to set permission to '%s'"
-msgstr "impossible de régler les droits de '%s'"
-
-#: sha1-file.c:1713
-msgid "file write error"
-msgstr "erreur d'écriture d'un fichier"
-
-#: sha1-file.c:1732
-msgid "error when closing loose object file"
-msgstr "erreur en fermeture du fichier d'objet esseulé"
-
-#: sha1-file.c:1797
-#, 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"
-
-#: sha1-file.c:1799
-msgid "unable to create temporary file"
-msgstr "impossible de créer un fichier temporaire"
-
-#: sha1-file.c:1823
-msgid "unable to write loose object file"
-msgstr "impossible d'écrire le fichier d'objet esseulé"
-
-#: sha1-file.c:1829
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "impossible de compresser le nouvel objet %s (%d)"
-
-#: sha1-file.c:1833
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "échec de deflateEnd sur l'objet %s (%d)"
-
-#: sha1-file.c:1837
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "données de source d'objet instable pour %s"
-
-#: sha1-file.c:1847 builtin/pack-objects.c:925
-#, c-format
-msgid "failed utime() on %s"
-msgstr "échec de utime() sur %s"
-
-#: sha1-file.c:1922
-#, c-format
-msgid "cannot read object for %s"
-msgstr "impossible de lire l'objet pour %s"
-
-#: sha1-file.c:1962
-msgid "corrupt commit"
-msgstr "commit corrompu"
-
-#: sha1-file.c:1970
-msgid "corrupt tag"
-msgstr "étiquette corrompue"
-
-#: sha1-file.c:2069
-#, c-format
-msgid "read error while indexing %s"
-msgstr "erreur de lecture à l'indexation de %s"
-
-#: sha1-file.c:2072
-#, c-format
-msgid "short read while indexing %s"
-msgstr "lecture tronquée pendant l'indexation de %s"
-
-#: sha1-file.c:2145 sha1-file.c:2154
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s : échec de l'insertion dans la base de données"
-
-#: sha1-file.c:2160
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s : type de fichier non supporté"
-
-#: sha1-file.c:2184
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s n'est pas un objet valide"
-
-#: sha1-file.c:2186
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s n'est pas un objet '%s' valide"
-
-#: sha1-file.c:2213 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "impossible d'ouvrir %s"
-
-#: sha1-file.c:2403 sha1-file.c:2455
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "incohérence de hachage pour %s (%s attendu)"
-
-#: sha1-file.c:2427
-#, c-format
-msgid "unable to mmap %s"
-msgstr "impossible de mmap %s"
-
-#: sha1-file.c:2432
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "impossible de dépaqueter l'entête de %s"
-
-#: sha1-file.c:2438
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "impossible d'analyser l'entête de %s"
-
-#: sha1-file.c:2449
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "impossible de dépaqueter le contenu de %s"
-
-#: sha1-name.c:487
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "le SHA1 court %s est ambigu"
-
-#: sha1-name.c:498
-msgid "The candidates are:"
-msgstr "Les candidats sont :"
-
-#: sha1-name.c:797
-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 ""
-"Git ne crée normalement jamais de référence qui se termine par 40\n"
-"caractères hexa car elle serait ignorée si vous spécifiez juste\n"
-"40-hexa. Ces références peuvent être créées par erreur. Par exemple,\n"
-"\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"
-"en lançant \"git config advice.objectNameWarning false\""
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "l'entrée d'index est un répertoire, mais pas clairsemé (%08x)"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:822
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u Gio"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
+#: strbuf.c:852
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u Gio/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:832
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u Mio"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: strbuf.c:862
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u Mio/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:841
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u Kio"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
+#: strbuf.c:871
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u Kio/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:849
+#: strbuf.c:877
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7324,13 +8805,50 @@ msgstr[0] "%u octet"
 msgstr[1] "%u octets"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
+#: strbuf.c:879
 #, c-format
 msgid "%u byte/s"
 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:738
+#: builtin/rebase.c:866
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr "impossible d'éditer '%s'"
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+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"
+
+#: 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"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "valeur invalide pour %s"
+
+#: submodule-config.c:766
+#, 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 ""
@@ -7352,61 +8870,139 @@ 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:327
+#: submodule.c:328
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "dans le sous-module '%s' non populé"
 
-#: submodule.c:358
+#: submodule.c:359
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
 
-#: submodule.c:910
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "mauvais argument --ignore-submodules : %s"
+
+#: submodule.c:805
+#, 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é."
+
+#: submodule.c:908
 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:993
+#, 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"
+
+#: submodule.c:1116
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "le processus pour le sous-module '%s' a échoué"
+
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Échec de résolution de HEAD comme référence valide."
 
-#: submodule.c:1481
+#: submodule.c:1156
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Poussée du sous-module '%s'\n"
+
+#: submodule.c:1159
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "Impossible d'accéder au sous-module '%s'"
+msgid "Unable to push submodule '%s'\n"
+msgstr "Impossible de pousser le sous-module '%s'\n"
 
-#: submodule.c:1651
+#: submodule.c:1451
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Récupération du sous-module %s%s\n"
+
+#: submodule.c:1485
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Impossible d'accéder au sous-module '%s'\n"
+
+#: submodule.c:1640
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Erreurs pendant la récupération du sous-module :\n"
+"%s"
+
+#: submodule.c:1665
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' n'est pas reconnu comme dépôt git"
 
-#: submodule.c:1789
+#: submodule.c:1682
+#, 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:1723
+#, 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:1798
 #, 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:1802
+#: submodule.c:1811
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
 
-#: submodule.c:1817
+#: submodule.c:1826
 #, 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:1907
+#: submodule.c:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "récursion impossible dans le sous-module '%s'"
+
+#: submodule.c:1874
+msgid "could not reset submodule index"
+msgstr "impossible de réinitialiser l'index du sous-module"
+
+#: submodule.c:1916
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "le sous-module '%s' a un index sale"
 
-#: submodule.c:1959
+#: submodule.c:1968
 #, c-format
 msgid "Submodule '%s' could not be updated."
-msgstr "le sous-module '%s' n'a pas pu être mis à jour."
+msgstr "Le sous-module '%s' n'a pas pu être mis à jour."
 
-#: submodule.c:2007
+#: submodule.c:2036
+#, 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'"
+
+#: submodule.c:2057
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7414,12 +9010,17 @@ msgstr ""
 "relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
 "n'est pas supporté"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2069 submodule.c:2128
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "impossible de trouve le nom pour le sous-module '%s'"
 
-#: submodule.c:2026
+#: submodule.c:2073
+#, 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:2080
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7430,208 +9031,90 @@ msgstr ""
 "'%s' sur\n"
 "'%s'\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "récursion impossible dans le sous-module '%s'"
-
-#: submodule.c:2153
+#: submodule.c:2208
 msgid "could not start ls-files in .."
 msgstr "impossible de démarrer ls-files dans .."
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree a renvoyé un code de retour inattendu %d"
 
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "nom de sous-module suspicieux %s ignoré"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
-
-#: submodule-config.c:401
+#: symlinks.c:244
 #, 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"
+msgid "failed to lstat '%s'"
+msgstr "échec du lstat de '%s'"
 
-#: submodule-config.c:490
-#, c-format
-msgid "invalid value for %s"
-msgstr "Valeur invalide pour %s"
-
-#: submodule-config.c:761
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
-
-#: trailer.c:238
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "échec de la commande trailer '%s'"
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: 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:539 trailer.c:544 builtin/remote.c:295
+#: 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 "plus d'un %s"
 
-#: trailer.c:730
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "symbole vide dans la ligne de fin '%.*s'"
 
-#: trailer.c:750
+#: trailer.c:763
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "impossible de lire le fichier d'entrée '%s'"
 
-#: trailer.c:753
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
 msgid "could not read from stdin"
-msgstr "Impossible de lire depuis l'entrée standard"
+msgstr "impossible de lire depuis l'entrée standard"
 
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1024 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
 msgstr "stat impossible de %s"
 
-#: trailer.c:1013
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "%s n'est pas un fichier régulier"
 
-#: trailer.c:1015
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
 
-#: trailer.c:1027
+#: trailer.c:1040
 msgid "could not open temporary file"
 msgstr "impossible de créer un fichier temporaire"
 
-#: trailer.c:1067
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "impossible de renommer un fichier temporaire en %s"
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "impossible de lire la liasse '%s'"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport : option de profondeur invalide '%s'"
-
-#: transport.c:266
-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:267
-msgid "server options require protocol version 2 or later"
-msgstr "les options de serveur exigent une version 2 ou supérieure"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "impossible d'analyser la configuration transport.color.*"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "le support du protocole v2 n'est pas encore implanté"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "valeur inconnue pour la config '%s' : %s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "transport '%s' non permis"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync n'est plus supporté"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Les chemins suivants de sous-module contiennent des modifications\n"
-"qui ne peuvent être trouvées sur aucun distant :\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Veuillez essayer\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"ou bien changez de répertoire et utilisez\n"
-"\n"
-"\tgit push\n"
-"\n"
-"pour les pousser vers un serveur distant.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Abandon."
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "échec de la poussée de tous les sous-modules nécessaires"
-
-#: transport.c:1345 transport-helper.c:655
-msgid "operation not supported by protocol"
-msgstr "option non supportée par le protocole"
-
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
 msgstr "échec de l'écriture totale sur l'assistant distant"
 
-#: transport-helper.c:144
+#: transport-helper.c:145
 #, c-format
 msgid "unable to find remote helper for '%s'"
-msgstr "Impossible de trouver un assistant distant pour '%s'"
+msgstr "impossible de trouver un assistant distant pour '%s'"
 
-#: transport-helper.c:160 transport-helper.c:569
+#: 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"
 
-#: transport-helper.c:211
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7640,160 +9123,275 @@ msgstr ""
 "capacité obligatoire inconnue %s ; cet assistant distant requiert "
 "probablement une une nouvelle version de Git"
 
-#: transport-helper.c:217
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
 msgstr "cet assistant distant devrait supporter la capacité refspec"
 
-#: transport-helper.c:284 transport-helper.c:424
+#: transport-helper.c:287 transport-helper.c:429
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s a dit de manière inattendue : '%s'"
 
-#: transport-helper.c:413
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s a aussi verrouillé %s"
 
-#: transport-helper.c:491
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
 msgstr "impossible de lancer fast-import"
 
-#: transport-helper.c:514
+#: transport-helper.c:520
 msgid "error while running fast-import"
 msgstr "erreur au lancement de fast-import"
 
-#: transport-helper.c:543 transport-helper.c:1132
+#: transport-helper.c:549 transport-helper.c:1247
 #, c-format
 msgid "could not read ref %s"
 msgstr "impossible de lire la réf %s"
 
-#: transport-helper.c:588
+#: transport-helper.c:594
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "réponse inconnue à connect : %s"
 
-#: transport-helper.c:610
+#: 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"
 
-#: transport-helper.c:612
+#: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr "chemin de service distant invalide"
 
-#: transport-helper.c:658
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr "option non supportée par le protocole"
+
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "impossible de se connecter au sous-service %s"
 
-#: transport-helper.c:734
+#: transport-helper.c:693 transport.c:400
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only requiert le protocole v2"
+
+#: transport-helper.c:755
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' sans directive 'ok/error' correspondante"
+
+#: transport-helper.c:798
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "ok/error attendu, l'assistant a dit '%s'"
 
-#: transport-helper.c:787
+#: transport-helper.c:855
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "l'assistant a renvoyé un statut de retour inattendu %s"
 
-#: transport-helper.c:848
+#: transport-helper.c:938
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "l'assistant %s ne gère pas dry-run"
 
-#: transport-helper.c:851
+#: transport-helper.c:941
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "l'assistant %s ne gère pas --signed"
 
-#: transport-helper.c:854
+#: transport-helper.c:944
 #, 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:859
+#: transport-helper.c:949
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "l'assistant %s ne gère pas --atomic"
 
-#: transport-helper.c:865
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "l'assistant %s ne gère pas --%s"
+
+#: transport-helper.c:960
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "l'assistant %s ne gère pas 'push-option'"
 
-#: transport-helper.c:963
+#: transport-helper.c:1060
 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"
 
-#: transport-helper.c:968
+#: transport-helper.c:1065
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "l'assistant %s ne gère pas 'force'"
 
-#: transport-helper.c:1015
+#: transport-helper.c:1112
 msgid "couldn't run fast-export"
 msgstr "impossible de lancer fast-export"
 
-#: transport-helper.c:1020
+#: transport-helper.c:1117
 msgid "error while running fast-export"
 msgstr "erreur au lancement de fast-export"
 
-#: transport-helper.c:1045
+#: transport-helper.c:1142
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 "Aucune référence en commun et aucune spécfiée ; rien à faire.\n"
-"Vous devriez peut-être spécifier une branche telle que 'master'.\n"
+"Vous devriez peut-être spécifier une branche.\n"
+
+#: transport-helper.c:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "format d'objet non géré '%s'"
 
-#: transport-helper.c:1118
+#: transport-helper.c:1233
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "réponse malformée dans le liste de réfs : %s"
 
-#: transport-helper.c:1270
+#: transport-helper.c:1385
 #, c-format
 msgid "read(%s) failed"
 msgstr "échec de read(%s)"
 
-#: transport-helper.c:1297
+#: transport-helper.c:1412
 #, c-format
 msgid "write(%s) failed"
 msgstr "échec de write(%s)"
 
-#: transport-helper.c:1346
+#: transport-helper.c:1461
 #, c-format
 msgid "%s thread failed"
 msgstr "échec du fil d'exécution %s"
 
-#: transport-helper.c:1350
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "échec de jonction du fil d'exécution %s : %s"
 
-#: transport-helper.c:1369 transport-helper.c:1373
+#: transport-helper.c:1484 transport-helper.c:1488
 #, 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:1410
+#: transport-helper.c:1525
 #, c-format
 msgid "%s process failed to wait"
 msgstr "échec du processus %s pour l'attente"
 
-#: transport-helper.c:1414
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed"
 msgstr "échec du processus %s"
 
-#: transport-helper.c:1432 transport-helper.c:1441
+#: transport-helper.c:1547 transport-helper.c:1556
 msgid "can't start thread for copying data"
 msgstr "impossible de démarrer le fil d'exécution pour copier les données"
 
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Positionnerait la branche amont de '%s' sur '%s' de '%s'\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "impossible de lire la liasse '%s'"
+
+#: transport.c:223
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport : option de profondeur invalide '%s'"
+
+#: transport.c:275
+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:276
+msgid "server options require protocol version 2 or later"
+msgstr "les options de serveur exigent une version 2 ou supérieure"
+
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr "le serveur ne prend pas en charge wait-for-done"
+
+#: transport.c:755
+msgid "could not parse transport.color.* config"
+msgstr "impossible d'analyser la configuration transport.color.*"
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr "le support du protocole v2 n'est pas encore implanté"
+
+#: transport.c:965
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valeur inconnue pour la config '%s' : %s"
+
+#: transport.c:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transport '%s' non permis"
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync n'est plus supporté"
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Les chemins suivants de sous-module contiennent des modifications\n"
+"qui ne peuvent être trouvées sur aucun distant :\n"
+
+#: transport.c:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Veuillez essayer\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"ou bien changez de répertoire et utilisez\n"
+"\n"
+"\tgit push\n"
+"\n"
+"pour les pousser vers un serveur distant.\n"
+"\n"
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr "Abandon."
+
+#: transport.c:1346
+msgid "failed to push all needed submodules"
+msgstr "échec de la poussée de tous les sous-modules nécessaires"
+
 #: tree-walk.c:33
 msgid "too-short tree object"
 msgstr "objet arbre trop court"
@@ -7810,7 +9408,7 @@ msgstr "nom de fichier vide dans une entrée de l'arbre"
 msgid "too-short tree file"
 msgstr "fichier arbre trop court"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7821,7 +9419,7 @@ msgstr ""
 "%%sVeuillez valider ou remiser vos modifications avant de basculer de "
 "branche."
 
-#: unpack-trees.c:112
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7831,7 +9429,7 @@ msgstr ""
 "l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7841,7 +9439,7 @@ msgstr ""
 "fusion :\n"
 "%%sVeuillez valider ou remiser vos modifications avant la fusion."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7851,7 +9449,7 @@ msgstr ""
 "fusion :\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7860,7 +9458,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:122
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7869,7 +9467,7 @@ msgstr ""
 "Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
 "%%s"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7879,7 +9477,7 @@ msgstr ""
 "contenus :\n"
 "%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7889,7 +9487,7 @@ msgstr ""
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:133
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7898,7 +9496,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7908,7 +9506,7 @@ msgstr ""
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7917,7 +9515,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par la fusion :\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7927,7 +9525,7 @@ msgstr ""
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7936,7 +9534,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient effacés par %s :\n"
 "%%s"
 
-#: unpack-trees.c:149
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7947,7 +9545,7 @@ msgstr ""
 "l'extraction :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
 
-#: unpack-trees.c:151
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7957,7 +9555,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7967,7 +9565,7 @@ msgstr ""
 "la fusion :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7976,7 +9574,7 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7986,7 +9584,7 @@ msgstr ""
 "%s :\n"
 "%%sVeuillez renommer ou effacer ces fichiers avant %s."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7995,71 +9593,94 @@ msgstr ""
 "Les fichiers suivants non suivis seraient écrasés par %s :\n"
 "%%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
 
-#: unpack-trees.c:172
+#: unpack-trees.c:177
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
 "%s"
 msgstr ""
-"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "
-"pas à jour :\n"
+"Mise à jour impossible pour le sous-module :\n"
 "%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Les fichiers suivants de la copie de travail seraient écrasés par la mise à "
-"jour par l'extraction creuse :\n"
+"Les chemins suivants ne sont pas à jour et ont été laissés malgré les motifs "
+"clairsemés :\n"
 "%s"
 
-#: unpack-trees.c:176
+#: unpack-trees.c:182
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
-"Les fichiers suivants de la copie de travail seraient supprimés par la mise "
-"à jour par extraction creuse :\n"
+"Les chemins suivants ne sont pas fusionnés et ont été laissés malgré les "
+"motifs clairsemés :\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:184
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Mise à jour impossible pour le sous-module :\n"
+"Les chemins suivants étaient déjà présents et ont été laissés malgré les "
+"motifs clairsemés :\n"
 "%s"
 
-#: unpack-trees.c:255
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "Abandon\n"
 
-#: unpack-trees.c:317
+#: unpack-trees.c:291
+#, 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"
+
+#: unpack-trees.c:352
 msgid "Updating files"
 msgstr "Mise à jour des fichiers"
 
-#: unpack-trees.c:349
+#: 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 ""
-"Les chemins suivants sont en collision (par exemple par des chemins\n"
+"les chemins suivants sont en collision (par exemple par des chemins\n"
 "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:1618
+msgid "Updating index flags"
+msgstr "Mise à jour des drapeaux de l'index"
+
+#: unpack-trees.c:2718
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+"l'arbre de travail et le commit non suivi ont des entrées dupliquées : %s"
+
+#: upload-pack.c:1548
+msgid "expected flush after fetch arguments"
+msgstr "vidage attendu après les arguments de récupération"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "nom de schéma d'URL invalide ou suffixe '://' manquant"
@@ -8089,30 +9710,34 @@ msgstr "numéro de port invalide"
 msgid "invalid '..' path segment"
 msgstr "segment de chemin '..' invalide"
 
-#: worktree.c:258 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Récupération des objets"
+
+#: worktree.c:236 builtin/am.c:2152
 #, c-format
 msgid "failed to read '%s'"
 msgstr "échec de la lecture de '%s'"
 
-#: worktree.c:304
+#: worktree.c:303
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 "'%s' dans l'arbre de travail principal n'est pas le répertoire de dépôt"
 
-#: worktree.c:315
+#: worktree.c:314
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "le fichier '%s' ne contient pas de chemin absolu à l'emplacement de l'arbre "
 "de travail"
 
-#: worktree.c:327
+#: worktree.c:326
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' n'existe pas"
 
-#: worktree.c:333
+#: worktree.c:332
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
@@ -8122,17 +9747,85 @@ msgstr "'%s' n'est pas un fichier .git, code d'erreur %d"
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' ne pointe pas en retour sur '%s'"
 
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:603
+msgid "not a directory"
+msgstr "pas un répertoire"
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr ".git n'est pas un fichier"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr "fichier .git cassé"
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr "fichier .git incorrect"
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr "pas un chemin valide"
+
+#: worktree.c:728
+msgid "unable to locate repository; .git is not a file"
+msgstr "impossible de localiser le dépôt ; .git n'est pas un fichier"
+
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+"impossible de localiser le dépôt ; .git ne fait pas référence à un dépôt"
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr "impossible de localiser le dépôt ; fichier .git cassé"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr "gitdir non lisible"
+
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr "gitdir incorrect"
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr "pas un répertoire valide"
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "le fichier gitdir n'existe pas"
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "impossible de lire le fichier gitdir (%s)"
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+"lecture trop courte ( %<PRIuMAX> octets attendus, %<PRIuMAX> octets lus)"
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "fichier gitdir invalide"
+
+#: worktree.c:817
+msgid "gitdir file points to non-existent location"
+msgstr "le fichier gitdir pointe sur un endroit inexistant"
+
+#: wrapper.c:197 wrapper.c:367
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "impossible d'ouvrir '%s' en lecture/écriture"
 
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr "impossible d'accéder à '%s'"
 
-#: wrapper.c:596
+#: wrapper.c:607
 msgid "unable to get current working directory"
 msgstr "impossible d'accéder au répertoire de travail courant"
 
@@ -8169,11 +9862,11 @@ msgstr ""
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
 
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr "Modifications qui seront validées :"
 
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
 msgstr "Modifications qui ne seront pas validées :"
 
@@ -8206,94 +9899,94 @@ msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
 
-#: wt-status.c:268
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr "supprimé des deux côtés :"
 
-#: wt-status.c:270
+#: wt-status.c:268
 msgid "added by us:"
 msgstr "ajouté par nous :"
 
-#: wt-status.c:272
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "supprimé par eux :"
 
-#: wt-status.c:274
+#: wt-status.c:272
 msgid "added by them:"
 msgstr "ajouté par eux :"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr "supprimé par nous :"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "both added:"
 msgstr "ajouté de deux côtés :"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "both modified:"
 msgstr "modifié des deux côtés :"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "new file:"
 msgstr "nouveau fichier :"
 
-#: wt-status.c:292
+#: wt-status.c:290
 msgid "copied:"
 msgstr "copié :"
 
-#: wt-status.c:294
+#: wt-status.c:292
 msgid "deleted:"
 msgstr "supprimé :"
 
-#: wt-status.c:296
+#: wt-status.c:294
 msgid "modified:"
 msgstr "modifié :"
 
-#: wt-status.c:298
+#: wt-status.c:296
 msgid "renamed:"
 msgstr "renommé :"
 
-#: wt-status.c:300
+#: wt-status.c:298
 msgid "typechange:"
 msgstr "modif. type :"
 
-#: wt-status.c:302
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "inconnu :"
 
-#: wt-status.c:304
+#: wt-status.c:302
 msgid "unmerged:"
 msgstr "non fusionné :"
 
-#: wt-status.c:384
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "nouveaux commits, "
 
-#: wt-status.c:386
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "contenu modifié, "
 
-#: wt-status.c:388
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr "contenu non suivi, "
 
-#: wt-status.c:906
+#: wt-status.c:958
 #, 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:938
+#: wt-status.c:989
 msgid "Submodules changed but not updated:"
 msgstr "Sous-modules modifiés mais non mis à jour :"
 
-#: wt-status.c:940
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr "Changements du sous-module à valider :"
 
-#: wt-status.c:1022
+#: wt-status.c:1073
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -8301,7 +9994,7 @@ msgstr ""
 "Ne touchez pas à la ligne ci-dessus.\n"
 "Tout ce qui suit sera éliminé."
 
-#: wt-status.c:1114
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -8313,107 +10006,107 @@ msgstr ""
 "de la branche.\n"
 "Vous pouvez utiliser '--no-ahead-behind' pour éviter ceci.\n"
 
-#: wt-status.c:1144
+#: wt-status.c:1195
 msgid "You have unmerged paths."
 msgstr "Vous avez des chemins non fusionnés."
 
-#: wt-status.c:1147
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (réglez les conflits puis lancez \"git commit\")"
 
-#: wt-status.c:1149
+#: wt-status.c:1200
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (utilisez \"git merge --abort\" pour annuler la fusion)"
 
-#: wt-status.c:1153
+#: wt-status.c:1204
 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:1156
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (utilisez \"git commit\" pour terminer la fusion)"
 
-#: wt-status.c:1165
+#: wt-status.c:1216
 msgid "You are in the middle of an am session."
 msgstr "Vous êtes au milieu d'une session am."
 
-#: wt-status.c:1168
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: wt-status.c:1172
+#: wt-status.c:1223
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git am --continue\")"
 
-#: wt-status.c:1174
+#: wt-status.c:1225
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (utilisez \"git am --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1176
+#: wt-status.c:1227
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
 
-#: wt-status.c:1309
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo est manquant."
 
-#: wt-status.c:1311
+#: wt-status.c:1362
 msgid "No commands done."
 msgstr "Aucune commande réalisée."
 
-#: wt-status.c:1314
+#: wt-status.c:1365
 #, 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:1325
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (voir plus dans le fichier %s)"
 
-#: wt-status.c:1330
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "Aucune commande restante."
 
-#: wt-status.c:1333
+#: 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] "Prochaine commande à effectuer (%d commande restante) :"
 msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
 
-#: wt-status.c:1341
+#: wt-status.c:1392
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
 
-#: wt-status.c:1353
+#: wt-status.c:1404
 #, 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:1358
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr "Vous êtes en train de rebaser."
 
-#: wt-status.c:1371
+#: wt-status.c:1422
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git rebase --continue\")"
 
-#: wt-status.c:1373
+#: wt-status.c:1424
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (utilisez \"git rebase --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1375
+#: wt-status.c:1426
 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:1382
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (tous les conflits sont réglés : lancez \"git rebase --continue\")"
 
-#: wt-status.c:1386
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -8421,144 +10114,163 @@ msgstr ""
 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
 "de la branche '%s' sur '%s'."
 
-#: wt-status.c:1391
+#: wt-status.c:1442
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 "Vous êtes actuellement en train de fractionner un commit pendant un rebasage."
 
-#: wt-status.c:1394
+#: wt-status.c:1445
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Une fois la copie de travail nettoyée, lancez \"git rebase --continue\")"
 
-#: wt-status.c:1398
+#: wt-status.c:1449
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage de la "
 "branche '%s' sur '%s'."
 
-#: wt-status.c:1403
+#: wt-status.c:1454
 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 "Vous êtes actuellement en train d'éditer un commit pendant un rebasage."
 
-#: wt-status.c:1406
+#: wt-status.c:1457
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (utilisez \"git commit --amend\" pour corriger le commit actuel)"
 
-#: wt-status.c:1408
+#: wt-status.c:1459
 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:1419
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr "Picorage en cours."
 
-#: wt-status.c:1422
+#: wt-status.c:1473
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Vous êtes actuellement en train de picorer le commit %s."
 
-#: wt-status.c:1429
+#: wt-status.c:1480
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git cherry-pick --continue\")"
 
-#: wt-status.c:1432
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (lancez \"git cherry-pick --continue\" pour continuer)"
 
-#: wt-status.c:1435
+#: wt-status.c:1486
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (tous les conflits sont réglés : lancez \"git cherry-pick --continue\")"
 
-#: wt-status.c:1437
+#: wt-status.c:1488
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (utilisez \"git cherry-pick --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1439
+#: wt-status.c:1490
 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:1449
+#: wt-status.c:1500
 msgid "Revert currently in progress."
 msgstr "Rétablissement en cours."
 
-#: wt-status.c:1452
+#: wt-status.c:1503
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Vous êtes actuellement en train de rétablir le commit %s."
 
-#: wt-status.c:1458
+#: wt-status.c:1509
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (réglez les conflits puis lancez \"git revert --continue\")"
 
-#: wt-status.c:1461
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (lancez \"git revert --continue\" pour continuer)"
 
-#: wt-status.c:1464
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (tous les conflits sont réglés : lancez \"git revert --continue\")"
 
-#: wt-status.c:1466
+#: wt-status.c:1517
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (utilisez \"git revert --skip\" pour sauter ce patch)"
 
-#: wt-status.c:1468
+#: wt-status.c:1519
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (utilisez \"git revert --abort\" pour annuler le rétablissement)"
 
-#: wt-status.c:1478
+#: wt-status.c:1529
 #, 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:1482
+#: wt-status.c:1533
 msgid "You are currently bisecting."
 msgstr "Vous êtes en cours de bissection."
 
-#: wt-status.c:1485
+#: wt-status.c:1536
 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:1694
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Vous êtes dans une extraction clairsemée."
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Vous êtes dans une extraction partielle avec %d %% de fichiers suivis "
+"présents."
+
+#: wt-status.c:1794
 msgid "On branch "
 msgstr "Sur la branche "
 
-#: wt-status.c:1701
+#: wt-status.c:1801
 msgid "interactive rebase in progress; onto "
 msgstr "rebasage interactif en cours ; sur "
 
-#: wt-status.c:1703
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
 msgstr "rebasage en cours ; sur "
 
-#: wt-status.c:1713
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr "HEAD détachée sur "
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr "HEAD détachée depuis "
+
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr "Actuellement sur aucun branche."
 
-#: wt-status.c:1730
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr "Validation initiale"
 
-#: wt-status.c:1731
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr "Aucun commit"
 
-#: wt-status.c:1745
+#: wt-status.c:1845
 msgid "Untracked files"
 msgstr "Fichiers non suivis"
 
-#: wt-status.c:1747
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "Fichiers ignorés"
 
-#: wt-status.c:1751
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8570,32 +10282,32 @@ msgstr ""
 "oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
 "status')."
 
-#: wt-status.c:1757
+#: wt-status.c:1857
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Fichiers non suivis non affichés%s"
 
-#: wt-status.c:1759
+#: wt-status.c:1859
 msgid " (use -u option to show untracked files)"
 msgstr " (utilisez -u pour afficher les fichiers non suivis)"
 
-#: wt-status.c:1765
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "Aucune modification"
 
-#: wt-status.c:1770
+#: wt-status.c:1870
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "aucune modification n'a été ajoutée à la validation (utilisez \"git add\" ou "
 "\"git commit -a\")\n"
 
-#: wt-status.c:1773
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "aucune modification ajoutée à la validation\n"
 
-#: wt-status.c:1776
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8604,200 +10316,227 @@ 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:1779
+#: wt-status.c:1882
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "aucune modification ajoutée à la validation mais des fichiers non suivis "
 "sont présents\n"
 
-#: wt-status.c:1782
+#: wt-status.c:1886
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "rien à valider (créez/copiez des fichiers et utilisez \"git add\" pour les "
 "suivre)\n"
 
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr "rien à valider\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1893
 #, 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:1792
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "rien à valider, la copie de travail est propre\n"
 
-#: wt-status.c:1905
+#: wt-status.c:2003
 msgid "No commits yet on "
 msgstr "Encore aucun commit sur "
 
-#: wt-status.c:1909
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr "HEAD (aucune branche)"
 
-#: wt-status.c:1940
+#: wt-status.c:2038
 msgid "different"
 msgstr "différent"
 
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "derrière "
 
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "devant "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2569
 #, c-format
 msgid "cannot %s: You have unstaged changes."
-msgstr "Impossible de %s : vous avez des modifications non indexées."
+msgstr "impossible de %s : vous avez des modifications non indexées."
 
-#: wt-status.c:2476
+#: wt-status.c:2575
 msgid "additionally, your index contains uncommitted changes."
 msgstr "de plus, votre index contient des modifications non validées."
 
-#: wt-status.c:2478
+#: wt-status.c:2577
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "%s impossible : votre index contient des modifications non validées."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#: compat/simple-ipc/ipc-unix-socket.c:182
+msgid "could not send IPC command"
+msgstr "impossible de trouver le commit %"
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr "impossible de lire la réponse IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:866
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "impossible de démarrer accept_thread '%s'"
+
+#: compat/simple-ipc/ipc-unix-socket.c:878
+#, 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
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "échec pour délier '%s'"
 
-#: builtin/add.c:25
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<options>] [--] <chemin>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "impossible de chmod %cx '%s'"
+
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "état de diff inattendu %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
 msgstr "échec de la mise à jour des fichiers"
 
-#: builtin/add.c:99
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
 msgstr "suppression de '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:198
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Modifications non indexées après rafraîchissement de l'index :"
 
-#: builtin/add.c:234 builtin/rev-parse.c:897
+#: builtin/add.c:307 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/add.c:245
+#: builtin/add.c:318
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Impossible d'ouvrir '%s' en écriture."
 
-#: builtin/add.c:249
+#: builtin/add.c:322
 msgid "Could not write patch"
 msgstr "Impossible d'écrire le patch"
 
-#: builtin/add.c:252
+#: builtin/add.c:325
 msgid "editing patch failed"
 msgstr "échec de l'édition du patch"
 
-#: builtin/add.c:255
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Stat de '%s' impossible"
 
-#: builtin/add.c:257
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr "Patch vide. Abandon."
 
-#: builtin/add.c:262
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Impossible d'appliquer '%s'"
 
-#: builtin/add.c:270
+#: builtin/add.c:343
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 "Les chemins suivants sont ignorés par un de vos fichiers .gitignore :\n"
 
-#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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 "simuler l'action"
 
-#: builtin/add.c:293
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr "sélection interactive"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "sélection interactive des sections"
 
-#: builtin/add.c:295
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr "édition du diff actuel et application"
 
-#: builtin/add.c:296
+#: builtin/add.c:369
 msgid "allow adding otherwise ignored files"
 msgstr "permettre l'ajout de fichiers ignorés"
 
-#: builtin/add.c:297
+#: builtin/add.c:370
 msgid "update tracked files"
 msgstr "mettre à jour les fichiers suivis"
 
-#: builtin/add.c:298
+#: builtin/add.c:371
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 "renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:372
 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:300
+#: builtin/add.c:373
 msgid "add changes from all tracked and untracked files"
 msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
 
-#: builtin/add.c:303
+#: builtin/add.c:376
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 "ignorer les chemins effacés dans la copie de travail (identique à --no-all)"
 
-#: builtin/add.c:305
+#: builtin/add.c:378
 msgid "don't add, only refresh the index"
 msgstr "ne pas ajouter, juste rafraîchir l'index"
 
-#: builtin/add.c:306
+#: builtin/add.c:379
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "sauter seulement les fichiers qui ne peuvent pas être ajoutés du fait "
 "d'erreurs"
 
-#: builtin/add.c:307
+#: builtin/add.c:380
 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:309 builtin/update-index.c:1002
+#: builtin/add.c:382 builtin/update-index.c:1006
 msgid "override the executable bit of the listed files"
 msgstr "outrepasser le bit exécutable pour les fichiers listés"
 
-#: builtin/add.c:311
+#: builtin/add.c:384
 msgid "warn when adding an embedded repository"
 msgstr "avertir lors de l'ajout d'un dépôt embarqué"
 
-#: builtin/add.c:326
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr "backend pour `git stash -p`"
+
+#: builtin/add.c:404
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8828,150 +10567,182 @@ msgstr ""
 "\n"
 "Référez-vous à \"git help submodule\" pour plus d'information."
 
-#: builtin/add.c:354
+#: builtin/add.c:432
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "dépôt git embarqué ajouté : %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
+#: builtin/add.c: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 ""
+"Utilisez -f si vous voulez vraiment les ajouter.\n"
+"Éliminez ce message en lançant\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:460
 msgid "adding files failed"
 msgstr "échec de l'ajout de fichiers"
 
-#: builtin/add.c:419
+#: 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:426
+#: 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:430
+#: builtin/add.c:526
 #, 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:445
+#: 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 "--pathspec-from-file est incompatible avec pathspec arguments"
+
+#: 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 "--pathspec-file-nul nécessite --pathspec-from-file"
+
+#: builtin/add.c:555
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Rien de spécifié, rien n'a été ajouté.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
+#: 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 ""
+"Peut-être avez-vous voulu dire 'git add .' ?\n"
+"Éliminez ce message en lançant\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:347
+#: builtin/am.c:365
 msgid "could not parse author script"
 msgstr "impossible d'analyser l'auteur du script"
 
-#: builtin/am.c:431
+#: builtin/am.c:455
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' a été effacé par le crochet applypatch-msg"
 
-#: builtin/am.c:473
+#: builtin/am.c:497
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Ligne en entrée malformée : '%s'."
 
-#: builtin/am.c:511
+#: builtin/am.c:535
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Impossible de copier les notes de '%s' vers '%s'"
 
-#: builtin/am.c:537
+#: builtin/am.c:561
 msgid "fseek failed"
 msgstr "échec de fseek"
 
-#: builtin/am.c:725
+#: builtin/am.c:749
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "impossible d'analyser le patch '%s'"
 
-#: builtin/am.c:790
+#: builtin/am.c:814
 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:838
+#: builtin/am.c:862
 msgid "invalid timestamp"
 msgstr "horodatage invalide"
 
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:867 builtin/am.c:879
 msgid "invalid Date line"
 msgstr "ligne de Date invalide"
 
-#: builtin/am.c:850
+#: builtin/am.c:874
 msgid "invalid timezone offset"
 msgstr "décalage horaire invalide"
 
-#: builtin/am.c:943
+#: builtin/am.c:967
 msgid "Patch format detection failed."
 msgstr "Échec de détection du format du patch."
 
-#: builtin/am.c:948 builtin/clone.c:406
+#: builtin/am.c:972 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "échec de la création du répertoire '%s'"
 
-#: builtin/am.c:953
+#: builtin/am.c:977
 msgid "Failed to split patches."
 msgstr "Échec de découpage des patchs."
 
-#: builtin/am.c:1084
+#: builtin/am.c:1126
 #, 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:1085
+#: builtin/am.c:1127
 #, 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:1086
+#: builtin/am.c:1128
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Pour restaurer la branche originale et arrêter de patcher, lancez \"%s --"
 "abort\"."
 
-#: builtin/am.c:1169
+#: builtin/am.c:1223
 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:1197
+#: builtin/am.c:1251
 msgid "Patch is empty."
 msgstr "Le patch actuel est vide."
 
-#: builtin/am.c:1262
+#: builtin/am.c:1316
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "ligne d'auteur manquante dans le commit %s"
 
-#: builtin/am.c:1265
+#: builtin/am.c:1319
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ligne d'identification invalide : %.*s"
 
-#: builtin/am.c:1484
+#: builtin/am.c:1538
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
 "points."
 
-#: builtin/am.c:1486
+#: builtin/am.c:1540
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Utilisation de l'information de l'index pour reconstruire un arbre de base..."
 
-#: builtin/am.c:1505
+#: builtin/am.c:1559
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8979,24 +10750,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:1511
+#: builtin/am.c:1565
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Retour à un patch de la base et fusion à 3 points..."
 
-#: builtin/am.c:1537
+#: builtin/am.c:1591
 msgid "Failed to merge in the changes."
 msgstr "Échec d'intégration des modifications."
 
-#: builtin/am.c:1569
+#: builtin/am.c:1623
 msgid "applying to an empty history"
 msgstr "application à un historique vide"
 
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1675 builtin/am.c:1679
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossible de continuer : %s n'existe pas."
 
-#: builtin/am.c:1638
+#: builtin/am.c:1697
 msgid "Commit Body is:"
 msgstr "Le corps de la validation est :"
 
@@ -9004,40 +10775,40 @@ msgstr "Le corps de la validation est :"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1648
+#: builtin/am.c:1707
 #, 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:1695 builtin/commit.c:374
+#: builtin/am.c:1753 builtin/commit.c:408
 msgid "unable to write index file"
 msgstr "impossible d'écrire le fichier d'index"
 
-#: builtin/am.c:1699
+#: builtin/am.c:1757
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
 
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1797 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Application de  %.*s"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1814
 msgid "No changes -- Patch already applied."
 msgstr "Pas de changement -- Patch déjà appliqué."
 
-#: builtin/am.c:1762
+#: builtin/am.c:1820
 #, c-format
 msgid "Patch failed at %s %.*s"
-msgstr "le patch a échoué à %s %.*s"
+msgstr "l'application de la rustine a échoué à %s %.*s"
 
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1824
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
-"Utilisez 'git am --show-current-patch' pour visualiser le patch en échec"
+"Utilisez 'git am --show-current-patch=diff' pour visualiser le patch en échec"
 
-#: builtin/am.c:1810
+#: 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"
@@ -9048,7 +10819,7 @@ msgstr ""
 "introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
 "patch."
 
-#: builtin/am.c:1817
+#: 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 "
@@ -9061,17 +10832,17 @@ msgstr ""
 "Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
 "accepter son état."
 
-#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
-#: builtin/reset.c:337
+#: 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 "Impossible d'analyser l'objet '%s'."
 
-#: builtin/am.c:1976
+#: builtin/am.c:2034
 msgid "failed to clean index"
 msgstr "échec du nettoyage de l'index"
 
-#: builtin/am.c:2020
+#: builtin/am.c:2078
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -9079,145 +10850,160 @@ msgstr ""
 "Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
 "Pas de retour à ORIG_HEAD"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2185
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valeur invalide pour --patch-format : %s"
 
-#: builtin/am.c:2153
+#: builtin/am.c:2227
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Valeur invalide pour --show-current-patch : %s"
+
+#: builtin/am.c:2231
+#, 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"
+
+#: builtin/am.c:2262
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2154
+#: builtin/am.c:2263
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<options>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2160
+#: builtin/am.c:2269
 msgid "run interactively"
 msgstr "exécution interactive"
 
-#: builtin/am.c:2162
+#: builtin/am.c:2271
 msgid "historical option -- no-op"
 msgstr "option historique -- no-op"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2273
 msgid "allow fall back on 3way merging if needed"
 msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
 
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:297 builtin/stash.c:812
+#: 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 "être silencieux"
 
-#: builtin/am.c:2167
-msgid "add a Signed-off-by line to the commit message"
-msgstr "ajouter une ligne Signed-off-by au message de validation"
+#: builtin/am.c:2276
+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:2170
+#: builtin/am.c:2279
 msgid "recode into utf8 (default)"
 msgstr "recoder en utf-8 (par défaut)"
 
-#: builtin/am.c:2172
+#: builtin/am.c:2281
 msgid "pass -k flag to git-mailinfo"
 msgstr "passer l'option -k à git-mailinfo"
 
-#: builtin/am.c:2174
+#: builtin/am.c:2283
 msgid "pass -b flag to git-mailinfo"
 msgstr "passer l'option -b à git-mailinfo"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2285
 msgid "pass -m flag to git-mailinfo"
 msgstr "passer l'option -m à git-mailinfo"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2287
 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:2181
+#: builtin/am.c:2290
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "ne pas passer l'option --keep-cr à git-mailsplit indépendamment de am.keepcr"
 
-#: builtin/am.c:2184
+#: builtin/am.c:2293
 msgid "strip everything before a scissors line"
 msgstr "retirer tout le contenu avant la ligne des ciseaux"
 
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr "le passer à travers 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 "le passer jusqu'à git-apply"
 
-#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
-#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:150 parse-options.h:171 parse-options.h:312
+#: 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: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:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: 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 "format"
 
-#: builtin/am.c:2210
+#: builtin/am.c:2322
 msgid "format the patch(es) are in"
 msgstr "format de présentation des patchs"
 
-#: builtin/am.c:2216
+#: builtin/am.c:2328
 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:2218
+#: builtin/am.c:2330
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuer à appliquer les patchs après résolution d'un conflit"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2333
 msgid "synonyms for --continue"
 msgstr "synonymes de --continue"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2336
 msgid "skip the current patch"
 msgstr "sauter le patch courant"
 
-#: builtin/am.c:2227
-msgid "restore the original branch and abort the patching operation."
-msgstr ""
-"restaurer la branche originale et abandonner les applications de patch."
+#: builtin/am.c:2339
+msgid "restore the original branch and abort the patching operation"
+msgstr "restaurer la branche originale et abandonner les applications de patch"
 
-#: builtin/am.c:2230
-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:2342
+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:2233
-msgid "show the patch being applied."
-msgstr "afficher le patch en cours d'application."
+#: builtin/am.c:2346
+msgid "show the patch being applied"
+msgstr "afficher le patch en cours d'application"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2351
 msgid "lie about committer date"
 msgstr "mentir sur la date de validation"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2353
 msgid "use current timestamp for author date"
 msgstr "utiliser l'horodatage actuel pour la date d'auteur"
 
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
-#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
+#: 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-clé"
 
-#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
 msgstr "signer les commits avec GPG"
 
-#: builtin/am.c:2245
+#: builtin/am.c:2359
 msgid "(internal use for git-rebase)"
 msgstr "(utilisation interne pour git-rebase)"
 
-#: builtin/am.c:2263
+#: 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."
@@ -9225,17 +11011,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:2270
+#: builtin/am.c:2384
 msgid "failed to read the index"
 msgstr "échec à la lecture de l'index"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2399
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "le répertoire précédent de rebasage %s existe toujours mais mbox donnée."
 
-#: builtin/am.c:2309
+#: builtin/am.c:2423
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9244,13 +11030,13 @@ msgstr ""
 "Répertoire abandonné %s trouvé.\n"
 "Utilisez \"git am --abort\" pour le supprimer."
 
-#: builtin/am.c:2315
+#: builtin/am.c:2429
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 "Pas de résolution de l'opération en cours, nous ne sommes pas dans une "
 "reprise."
 
-#: builtin/am.c:2325
+#: builtin/am.c:2439
 msgid "interactive mode requires patches on the command line"
 msgstr "le mode interactif requiert des rustines sur la ligne de commande"
 
@@ -9288,45 +11074,17 @@ msgstr "git archive : erreur de protocole"
 msgid "git archive: expected a flush"
 msgstr "git archive : vidage attendu"
 
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect --helper --next-all [--no-checkout]"
-
 #: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <terme-pour-mauvais> <terme-pour-bon>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<commit>]"
 
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <état> <révision> <terme-pour-"
-"bon> <terme-pour-mauvais>"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <commande> <terme-pour-bon> "
-"<terme-pour-mauvais>"
-
-#: builtin/bisect--helper.c:28
+#: 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:29
+#: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
@@ -9334,76 +11092,104 @@ msgstr ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:26
 msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<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>...]"
 msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<terme> --term-{new,bad}"
-"=<terme>][--no-checkout] [<mauvais> [<bon>...]] [--] [<chemins>...]"
+"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
+msgid "git bisect--helper --bisect-next"
+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-state (bad|new) [<rév>]"
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+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-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
+#, 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
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "impossible d'écrire le fichier '%s'"
+
+#: builtin/bisect--helper.c:155
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' n'est pas un terme valide"
 
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:159
 #, 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:100
+#: builtin/bisect--helper.c:169
 #, 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:111
+#: builtin/bisect--helper.c:179
 msgid "please use two different terms"
 msgstr "veuillez utiliser deux termes différents"
 
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "impossible d'ouvrir le fichier BISECT_TERMS"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:195
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Pas de bissection en cours.\n"
 
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:203
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' n'est pas un commit valide"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:212
 #, 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 "
+"échec d'extraction de la HEAD d'origine '%s'. Essayez 'git bisect reset "
 "<commit>'."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:256
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Mauvais argument pour bisect_write : %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:261
 #, 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:232
+#: builtin/bisect--helper.c:273
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "impossible d'ouvrir le fichier '%s'"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:299
 #, 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:285
+#: builtin/bisect--helper.c:326
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9412,7 +11198,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:289
+#: builtin/bisect--helper.c:330
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9423,24 +11209,24 @@ 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:321
+#: builtin/bisect--helper.c:350
 #, c-format
 msgid "bisecting only with a %s commit"
-msgstr "Attention : bissection avec seulement une validation %s"
+msgstr "bissection avec seulement un commit %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:329
+#: builtin/bisect--helper.c:358
 msgid "Are you sure [Y/n]? "
 msgstr "Confirmez-vous [Y/n] ? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:419
 msgid "no terms defined"
 msgstr "aucun terme défini"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:422
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9449,7 +11235,7 @@ msgstr ""
 "Vos termes actuels sont %s pour l'état ancien\n"
 "et %s pour le nouvel état.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:432
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9459,274 +11245,322 @@ msgstr ""
 "Les options supportées sont : --term-good|--term-old et --term-bad|--term-"
 "new."
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+msgid "revision walk setup failed\n"
+msgstr "échec de la préparation du parcours des révisions\n"
+
+#: builtin/bisect--helper.c:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "impossible d'ouvrir '%s' en ajout"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr "'' n'est pas un terme valide"
+
+#: builtin/bisect--helper.c:663
 #, c-format
 msgid "unrecognized option: '%s'"
-msgstr "option non reconnue : %s"
+msgstr "option non reconnue : '%s'"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:667
 #, 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:511
+#: builtin/bisect--helper.c:698
 msgid "bad HEAD - I need a HEAD"
 msgstr "mauvaise HEAD - j'ai besoin d'une HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:713
 #, 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>'."
+"l'extraction de '%s' a échoué. Essayez 'git bisect start <branche-valide>'."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:734
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "refus de bissecter sur un arbre 'cg-seeked'"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:737
 msgid "bad HEAD - strange symbolic ref"
 msgstr "mauvaise HEAD - référence symbolique douteuse"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:757
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "réference invalide : '%s'"
 
-#: builtin/bisect--helper.c:630
-msgid "perform 'git bisect next'"
-msgstr "effectuer 'git bisect next'"
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Vous devez démarrer avec \"git bisect start\"\n"
 
-#: builtin/bisect--helper.c:632
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "écrire les termes dans .git/BISECT_TERMS"
+#. 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:826
+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:634
-msgid "cleanup the bisection state"
-msgstr "vérifier l'état de la bissection"
+#: builtin/bisect--helper.c:844
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Veuillez appeler `--bisect-state` avec au moins un argument"
 
-#: builtin/bisect--helper.c:636
-msgid "check for expected revs"
-msgstr "vérifier si des révisions sont attendues"
+#: builtin/bisect--helper.c:857
+#, 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:638
-msgid "reset the bisection state"
-msgstr "réinitialiser l'état de la bissection"
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Mauvaise révision en entrée : %s"
+
+#: builtin/bisect--helper.c:889
+#, 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:921
+msgid "We are not bisecting."
+msgstr "Pas de bissection en cours."
 
-#: builtin/bisect--helper.c:640
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "écrire l'état de la bissection dans BISECT_LOG"
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s' ?? de quoi parlez-vous ?"
 
-#: builtin/bisect--helper.c:642
-msgid "check and set terms in a bisection state"
-msgstr "vérifier et régler les termes dans un état de la bissection"
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "impossible de lire le fichier '%s' pour rejouer"
+
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr "réinitialiser l'état de la bissection"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:1058
 msgid "check whether bad or good terms exist"
 msgstr "vérifier si les termes bons ou mauvais existent"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:1060
 msgid "print out the bisect terms"
 msgstr "afficher les termes de bissection"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:1062
 msgid "start the bisect session"
 msgstr "démarrer une session de bissection"
 
-#: builtin/bisect--helper.c:650
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"
+#: builtin/bisect--helper.c:1064
+msgid "find the next bisection commit"
+msgstr "trouver le prochain commit de bissection"
 
-#: builtin/bisect--helper.c:652
-msgid "no log for BISECT_WRITE"
-msgstr "pas de journal pour BISECT_WRITE"
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr "marquer l'état d'une références (ou plusieurs)"
 
-#: builtin/bisect--helper.c:669
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms exige deux arguments"
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr "lister les étapes de bissection jusqu'ici"
 
-#: builtin/bisect--helper.c:673
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state ne supporte aucun argument"
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
+msgstr "rejouer le processus de bissection depuis le fichier fourni"
 
-#: builtin/bisect--helper.c:680
-msgid "--bisect-reset requires either no argument or a commit"
-msgstr "--bisect-reset supporte soit aucun argument, soit un commit"
+#: builtin/bisect--helper.c:1072
+msgid "skip some commits for checkout"
+msgstr "sauter certains commits pour l'extraction"
 
-#: builtin/bisect--helper.c:684
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write supporte soit 4 arguments, soit 5 arguments"
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "pas de journal pour BISECT_WRITE"
 
-#: builtin/bisect--helper.c:690
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms exige 3 arguments"
+#: builtin/bisect--helper.c:1089
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset supporte soit aucun argument, soit un commit"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:1094
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check exige 2 ou 3 arguments"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:1100
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms exige 0 ou 1 argument"
 
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next exige 0 argument"
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log exige 0 argument"
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr "pas de fichier de log donné"
+
+#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"
 
-#: builtin/blame.c:36
+#: builtin/blame.c:37
 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:409
+#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
 msgstr "couleur attendue : %s"
 
-#: builtin/blame.c:416
+#: builtin/blame.c:417
 msgid "must end with a color"
 msgstr "doit finir avec une couleur"
 
-#: builtin/blame.c:729
+#: builtin/blame.c:728
 #, 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:747
+#: builtin/blame.c:746
 msgid "invalid value for blame.coloring"
 msgstr "valeur invalide pour blame.coloring"
 
-#: builtin/blame.c:822
+#: builtin/blame.c:845
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "référence à ignorer %s introuvable"
 
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
+#: builtin/blame.c:867
+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 "
+"montrer les éléments de blâme au fur et à mesure de leur découverte, de "
 "manière incrémentale"
 
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "Montrer un SHA-1 blanc pour les commits de limite (Défaut : désactivé)"
+#: builtin/blame.c:868
+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é)"
 
-#: builtin/blame.c:846
-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 ""
-"Ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
+"ne pas traiter les commits racine comme des limites (Défaut : désactivé)"
 
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "Montrer les statistiques de coût d'activité"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "montrer les statistiques de coût d'activité"
 
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "Forcer l'affichage de l'état d'avancement"
+#: 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 "forcer l'affichage de l'état d'avancement"
 
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr "Montrer le score de sortie pour les éléments de blâme"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "montrer le score de sortie pour les éléments de blâme"
 
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
-msgstr "Montrer les noms de fichier originaux (Défaut : auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "montrer les noms de fichier originaux (Défaut : auto)"
 
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
-msgstr "Montrer les numéros de lignes originaux (Défaut : désactivé)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "montrer les numéros de lignes originaux (Défaut : désactivé)"
 
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
-msgstr "Afficher dans un format propice à la consommation par machine"
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
+msgstr "afficher dans un format propice à la consommation par machine"
 
-#: builtin/blame.c:853
-msgid "Show porcelain format with per-line commit information"
-msgstr "Afficher en format porcelaine avec l'information de commit par ligne"
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
+msgstr "afficher en format porcelaine avec l'information de commit par ligne"
 
-#: builtin/blame.c:854
-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:877
+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:855
-msgid "Show raw timestamp (Default: off)"
-msgstr "Afficher les horodatages bruts (Défaut : désactivé)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "afficher les horodatages bruts (Défaut : désactivé)"
 
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Afficher les longs SHA1 de commits (Défaut : désactivé)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "afficher les longs SHA1 de commits (Défaut : désactivé)"
 
-#: builtin/blame.c:857
-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:880
+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:858
-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:881
+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:859
-msgid "Ignore whitespace differences"
-msgstr "Ignorer les différences d'espace"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "ignorer les différences d'espace"
 
-#: builtin/blame.c:860 builtin/log.c:1630
+#: builtin/blame.c:883 builtin/log.c:1823
 msgid "rev"
 msgstr "rév"
 
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "ignore <rev> pendant le blâme"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "ignorer <rev> pendant le blâme"
 
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
 msgstr "ignorer les révisions listées dans <fichier>"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:885
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 "colorer différemment les métadonnées redondantes avec la ligne précédente"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:886
 msgid "color lines by age"
 msgstr "colorier les lignes par âge"
 
-#: builtin/blame.c:870
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Utiliser une heuristique expérimentale pour améliorer les diffs"
-
-#: builtin/blame.c:872
-msgid "Spend extra cycles to find better match"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
 msgstr ""
-"Dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
+"dépenser des cycles supplémentaires pour trouver une meilleure correspondance"
 
-#: builtin/blame.c:873
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/blame.c:888
+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"
+"utiliser les révisions du fichier <fichier> au lieu d'appeler git-rev-list"
 
-#: builtin/blame.c:874
-msgid "Use <file>'s contents as the final image"
-msgstr "Utiliser le contenu de <fichier> comme image finale"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "utiliser le contenu de <fichier> comme image finale"
 
-#: builtin/blame.c:875 builtin/blame.c:876
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "score"
 
-#: builtin/blame.c:875
-msgid "Find line copies within and across files"
-msgstr "Trouver les copies de ligne dans et entre les fichiers"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
+msgstr "trouver les copies de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:876
-msgid "Find line movements within and across files"
-msgstr "Trouver les mouvements de ligne dans et entre les fichiers"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "trouver les mouvements de ligne dans et entre les fichiers"
 
-#: builtin/blame.c:877
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "plage"
 
-#: builtin/blame.c:877
-msgid "Process only line range n,m, counting from 1"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
-"Traiter seulement l'intervalle de ligne n,m en commençant le compte à 1"
+"traiter seulement l'intervalle de ligne <début>,<fin> ou la fonction : <nom-"
+"de-fonction>"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:945
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress ne peut pas être utilisé avec --incremental ou les formats "
@@ -9740,28 +11574,28 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr "il y a 10 ans et 11 mois"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1112
 #, 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:1133
+#: builtin/blame.c:1157
 msgid "Blaming lines"
 msgstr "Assignation de blâme aux lignes"
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr "git branch [<options>] [-r | -a] [--merged | --no-merged]"
 
 #: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
-msgstr "git branch [<options] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
+msgstr "git branch [<options>] [-l] [-f] <nom-de-branche> [<point-de-départ>]"
 
 #: builtin/branch.c:31
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
@@ -9821,121 +11655,111 @@ msgstr ""
 msgid "Update of config-file failed"
 msgstr "Échec de la mise à jour du fichier de configuration"
 
-#: builtin/branch.c:220
+#: builtin/branch.c:223
 msgid "cannot use -a with -d"
 msgstr "impossible d'utiliser -a avec -d"
 
-#: builtin/branch.c:226
+#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Impossible de rechercher l'objet commit pour HEAD"
 
-#: builtin/branch.c:240
+#: builtin/branch.c:244
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
 
-#: builtin/branch.c:255
+#: builtin/branch.c:259
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "branche de suivi '%s' non trouvée."
 
-#: builtin/branch.c:256
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
 msgstr "branche '%s' non trouvée."
 
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Erreur lors de la suppression de la branche '%s'"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
 #, 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:280
+#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Branche %s supprimée (précédemment %s).\n"
 
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:440 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "impossible d'analyser la chaîne de format"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:471
 msgid "could not resolve HEAD"
 msgstr "impossible de résoudre HEAD"
 
-#: builtin/branch.c:466
+#: builtin/branch.c:477
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) pointe hors de refs/heads/"
 
-#: builtin/branch.c:481
+#: builtin/branch.c:492
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "La branche %s est en cours de rebasage sur %s"
 
-#: builtin/branch.c:485
+#: builtin/branch.c:496
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "La branche %s est en cours de bissection sur %s"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:513
 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:504
+#: builtin/branch.c:515
 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:515
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nom de branche invalide : '%s'"
 
-#: builtin/branch.c:542
+#: builtin/branch.c:555
 msgid "Branch rename failed"
 msgstr "Échec de renommage de la branche"
 
-#: builtin/branch.c:544
+#: builtin/branch.c:557
 msgid "Branch copy failed"
 msgstr "Échec de copie de la branche"
 
-#: builtin/branch.c:548
+#: builtin/branch.c:561
 #, 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:551
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Renommage d'une branche mal nommée '%s'"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:570
 #, 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:566
+#: builtin/branch.c:579
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 "La branche est renommée, mais la mise à jour du fichier de configuration a "
 "échoué"
 
-#: builtin/branch.c:568
+#: builtin/branch.c:581
 msgid "Branch is copied, but update of config-file failed"
 msgstr ""
 "La branche est copiée, mais la mise à jour du fichier de configuration a "
 "échoué"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -9946,180 +11770,180 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr "Options génériques"
 
-#: builtin/branch.c:620
+#: builtin/branch.c:633
 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:621
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr "supprimer les messages d'information"
 
-#: builtin/branch.c:622
+#: 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:624
+#: builtin/branch.c:637
 msgid "do not use"
 msgstr "ne pas utiliser"
 
-#: builtin/branch.c:626 builtin/rebase.c:486
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr "amont"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr "modifier l'information amont"
 
-#: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "Désactiver l'information amont"
+#: builtin/branch.c:640
+msgid "unset the upstream info"
+msgstr "désactiver l'information amont"
 
-#: builtin/branch.c:628
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr "utiliser la coloration dans la sortie"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
 msgstr "agir sur les branches de suivi distantes"
 
-#: 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 "afficher seulement les branches qui contiennent le commit"
 
-#: 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 "afficher seulement les branches qui ne contiennent pas le commit"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
 msgstr "Actions spécifiques à git-branch :"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:651
 msgid "list both remote-tracking and local branches"
 msgstr "afficher à la fois les branches de suivi et les branches locales"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr "supprimer une branche totalement fusionnée"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:654
 msgid "delete branch (even if not merged)"
 msgstr "supprimer une branche (même non fusionnée)"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:655
 msgid "move/rename a branch and its reflog"
 msgstr "déplacer/renommer une branche et son reflog"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:656
 msgid "move/rename a branch, even if target exists"
 msgstr "déplacer/renommer une branche, même si la cible existe"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:657
 msgid "copy a branch and its reflog"
 msgstr "copier une branche et son reflog"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:658
 msgid "copy a branch, even if target exists"
 msgstr "copier une branche, même si la cible existe"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr "afficher les noms des branches"
 
-#: builtin/branch.c:647
+#: builtin/branch.c:660
 msgid "show current branch name"
 msgstr "afficher le nom de la branche courante"
 
-#: builtin/branch.c:648
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr "créer le reflog de la branche"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr "éditer la description de la branche"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:664
 msgid "force creation, move/rename, deletion"
 msgstr "forcer la création, le déplacement/renommage, ou la suppression"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:665
 msgid "print only branches that are merged"
 msgstr "afficher seulement les branches qui sont fusionnées"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:666
 msgid "print only branches that are not merged"
 msgstr "afficher seulement les branches qui ne sont pas fusionnées"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:667
 msgid "list branches in columns"
 msgstr "afficher les branches en colonnes"
 
-#: builtin/branch.c:657 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:433
+#: builtin/tag.c:477
 msgid "object"
 msgstr "objet"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:670
 msgid "print only branches of the object"
 msgstr "afficher seulement les branches de l'objet"
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
 msgid "sorting and filtering are case insensitive"
 msgstr "le tri et le filtrage sont non-sensibles à la casse"
 
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: 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 "format à utiliser pour la sortie"
 
-#: builtin/branch.c:684 builtin/clone.c:760
+#: builtin/branch.c:695 builtin/clone.c:794
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trouvée sous refs/heads !"
 
-#: builtin/branch.c:708
+#: builtin/branch.c:719
 msgid "--column and --verbose are incompatible"
 msgstr "--column et --verbose sont incompatibles"
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
 msgid "branch name required"
 msgstr "le nom de branche est requis"
 
-#: builtin/branch.c:753
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
 msgstr "Impossible de décrire une HEAD détachée"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:771
 msgid "cannot edit description of more than one branch"
 msgstr "impossible d'éditer la description de plus d'une branche"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:778
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Aucun commit sur la branche '%s'."
 
-#: builtin/branch.c:768
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Aucune branche nommée '%s'."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:796
 msgid "too many branches for a copy operation"
 msgstr "trop de branches pour une opération de copie"
 
-#: builtin/branch.c:792
+#: builtin/branch.c:805
 msgid "too many arguments for a rename operation"
 msgstr "trop d'arguments pour une opération de renommage"
 
-#: builtin/branch.c:797
+#: builtin/branch.c:810
 msgid "too many arguments to set new upstream"
 msgstr "trop d'arguments pour spécifier une branche amont"
 
-#: builtin/branch.c:801
+#: builtin/branch.c:814
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -10127,32 +11951,32 @@ msgstr ""
 "impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
 "aucune branche."
 
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:817 builtin/branch.c:840
 #, c-format
 msgid "no such branch '%s'"
 msgstr "pas de branche '%s'"
 
-#: builtin/branch.c:808
+#: builtin/branch.c:821
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "la branche '%s' n'existe pas"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:834
 msgid "too many arguments to unset upstream"
 msgstr "trop d'arguments pour désactiver un amont"
 
-#: builtin/branch.c:825
+#: builtin/branch.c:838
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "impossible de désactiver une branche amont de HEAD quand elle ne pointe sur "
 "aucune branche."
 
-#: builtin/branch.c:831
+#: builtin/branch.c:844
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "La branche '%s' n'a aucune information de branche amont"
 
-#: builtin/branch.c:841
+#: 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>?"
@@ -10161,7 +11985,7 @@ msgstr ""
 "branche.\n"
 "Vouliez-vous plutôt dire -a|-r --list <motif> ?"
 
-#: builtin/branch.c:845
+#: builtin/branch.c:858
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -10169,20 +11993,167 @@ msgstr ""
 "l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-"
 "upstream-to' à la place."
 
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "version git ::\n"
+
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
-msgstr "%s est correct\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "échec de uname() avec l'erreur '%s' (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "info compilateur : "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "info libc : "
+
+#: builtin/bugreport.c:80
+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
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <fichier>] [-s|--suffix <format>]"
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"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"
+"\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"
+"\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
+msgid "specify a destination for the bugreport file"
+msgstr "spécifier la destination du fichier de rapport de bogue"
+
+#: builtin/bugreport.c:138
+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
+#, 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
+msgid "System Info"
+msgstr "Info système"
+
+#: builtin/bugreport.c:170
+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
+#, c-format
+msgid "unable to write to %s"
+msgstr "impossible d'écrire dans %s"
+
+#: builtin/bugreport.c:190
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Nouveau rapport créé à '%s'.\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<options>] <fichier> <args git-rev-list>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<options>] <fichier>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <fichier> [<nom-de-ref>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <fichier> [<nom-de-ref>...]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr "ne pas afficher la barre de progression"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+msgid "show progress meter"
+msgstr "afficher la barre de progression"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+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:3914
+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
+msgid "specify bundle format version"
+msgstr "spécifier la version du format de colis"
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr "La création d'un colis requiert un dépôt."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr "ne pas afficher les détails du colis"
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s est correct\n"
+
+#: builtin/bundle.c:179
 msgid "Need a repository to unbundle."
 msgstr "Le dépaquetage d'un colis requiert un dépôt."
 
-#: builtin/cat-file.c:595
+#: builtin/bundle.c:191 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:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sous-commande inconnue : %s"
+
+#: 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>"
@@ -10190,82 +12161,82 @@ msgstr ""
 "git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
 "| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
 
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:597
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"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:617
+#: builtin/cat-file.c:618
 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:635
+#: builtin/cat-file.c:636
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<type> peut être : blob, tree, commit ou tag"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object type"
 msgstr "afficher le type de l'objet"
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
 msgid "show object size"
 msgstr "afficher la taille de l'objet"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 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:640
+#: builtin/cat-file.c:641
 msgid "pretty-print object's content"
 msgstr "afficher avec mise en forme le contenu de l'objet"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
 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:644
+#: builtin/cat-file.c:645
 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:645 git-submodule.sh:936
+#: builtin/cat-file.c:646
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
 msgid "use a specific path for --textconv/--filters"
 msgstr "utiliser un chemin spécifique pour --textconv/--filters"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 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:649
+#: builtin/cat-file.c:650
 msgid "buffer --batch output"
 msgstr "bufferiser la sortie de --batch"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:652
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "afficher l'information et le contenu des objets passés en entrée standard"
 
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:656
 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:659
+#: builtin/cat-file.c:660
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "suivre les liens symbolique internes à la copie de travail (utilisé avec --"
 "batch ou --batch-check)"
 
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
 msgid "show all objects with --batch or --batch-check"
 msgstr "montrer tous les objets avec --batch ou --batch-check"
 
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:664
 msgid "do not order --batch-all-objects output"
 msgstr "ne pas ordonner la sortie de --batch-all-objects"
 
@@ -10294,8 +12265,8 @@ msgid "terminate input and output records by a NUL character"
 msgstr ""
 "terminer les enregistrements en entrée et en sortie par un caractère NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "supprimer l'état d'avancement"
 
@@ -10307,27 +12278,27 @@ msgstr "afficher les chemins en entrée qui ne correspondent pas"
 msgid "ignore index when checking"
 msgstr "ignorer l'index pendant la vérification"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "impossible de spécifier les chemins avec --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z n'a de sens qu'avec l'option --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "aucun chemin spécifié"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet n'est valide qu'avec un seul chemin"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "impossible d'avoir --quiet et --verbose"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching n'est valide qu'avec --verbose"
 
@@ -10348,169 +12319,175 @@ msgstr "impossible d'analyser le contact : %s"
 msgid "no contacts specified"
 msgstr "aucun contact spécifié"
 
-#: builtin/checkout-index.c:131
+#: builtin/checkout--worker.c:110
+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: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 "chaîne"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "lors de la création de fichiers, préfixer par <chaîne>"
+
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<options>] [--] [<fichier>...]"
 
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage doit valoir entre 1 et 3, ou all"
 
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "extraire tous les fichiers présents dans l'index"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "forcer l'écrasement des fichiers existants"
 
-#: builtin/checkout-index.c:167
+#: 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"
 
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "ne pas extraire les nouveaux fichiers"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "mettre à jour l'information de stat dans le fichier d'index"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "lire la liste des chemins depuis l'entrée standard"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "écrire le contenu dans des fichiers temporaires"
 
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:679
-msgid "string"
-msgstr "chaîne"
-
-#: builtin/checkout-index.c:179
-msgid "when creating files, prepend <string>"
-msgstr "lors de la création de fichiers, préfixer par <chaîne>"
-
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "copier les fichiers depuis l'index nommé"
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<options>] <branche>"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
 
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<options>] <branche>"
 
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<options>] [--source=<branche>] <fichier>..."
 
-#: builtin/checkout.c:173 builtin/checkout.c:212
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "le chemin '%s' n'a pas notre version"
 
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "le chemin '%s' n'a pas leur version"
 
-#: builtin/checkout.c:191
+#: builtin/checkout.c:208
 #, 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:241
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "le chemin '%s' n'a pas les versions nécessaires"
 
-#: builtin/checkout.c:259
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "chemin '%s' : impossible de fusionner"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
 
-#: builtin/checkout.c:375
+#: builtin/checkout.c:411
 #, 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:380
+#: builtin/checkout.c:416
 #, 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:387
+#: builtin/checkout.c:423
 #, 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:410 builtin/checkout.c:413 builtin/checkout.c:416
-#: builtin/checkout.c:420
+#: 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' ne peut pas être utilisé avec des mises à jour de chemins"
 
-#: builtin/checkout.c:423 builtin/checkout.c:426
+#: builtin/checkout.c:459 builtin/checkout.c:462
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' ne peut pas être utilisé avec %s"
 
-#: builtin/checkout.c:430
+#: builtin/checkout.c:466
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Impossible de mettre à jour les chemins et basculer sur la branche '%s' en "
 "même temps."
 
-#: builtin/checkout.c:434
+#: builtin/checkout.c:470
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "ni '%s', ni '%s' spécifié"
 
-#: builtin/checkout.c:438
+#: builtin/checkout.c:474
 #, 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:443 builtin/checkout.c:448
+#: builtin/checkout.c:479 builtin/checkout.c:484
 #, 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:507 builtin/checkout.c:514
+#: builtin/checkout.c:558 builtin/checkout.c:565
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "le chemin '%s' n'est pas fusionné"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:734
 msgid "you need to resolve your current index first"
 msgstr "vous devez d'abord résoudre votre index courant"
 
-#: builtin/checkout.c:730
+#: builtin/checkout.c:788
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10520,50 +12497,50 @@ msgstr ""
 "suivants :\n"
 "%s"
 
-#: builtin/checkout.c:833
+#: builtin/checkout.c:881
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Impossible de faire un reflog pour '%s' : %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:923
 msgid "HEAD is now at"
 msgstr "HEAD est maintenant sur"
 
-#: builtin/checkout.c:879 builtin/clone.c:713
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "impossible de mettre à jour HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:931
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:934
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Déjà sur '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:938
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Basculement et remise à zéro de la branche '%s'\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:940 builtin/checkout.c:1371
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Basculement sur la nouvelle branche '%s'\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:942
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Basculement sur la branche '%s'\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:993
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... et %d en plus.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:999
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10586,7 +12563,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: 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"
@@ -10615,28 +12592,19 @@ msgstr[1] ""
 "git branch <nouvelle-branche> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1053
 msgid "internal error in revision walk"
 msgstr "erreur interne lors du parcours des révisions"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1057
 msgid "Previous HEAD position was"
 msgstr "La position précédente de HEAD était sur"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
 msgid "You are on a branch yet to be born"
 msgstr "Vous êtes sur une branche qui doit encore naître"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "une seule référence attendue"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "une seule référence attendue, %d fournies."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1179
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10645,37 +12613,71 @@ 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:1243 builtin/worktree.c:290 builtin/worktree.c:455
+#: 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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Si vous souhaitiez extraire une branche de suivi distant sur 'origin',\n"
+"par exemple, qualifiez-la complètement avec l'option --track :\n"
+"\n"
+"    git checkout --track origin/<nom>\n"
+"\n"
+"Si vous souhaitez privilégier un distant particulier lorsque <nom> est\n"
+"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
+"votre config."
+
+#: builtin/checkout.c:1196
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' correspond à plusieurs (%d) branches de suivi à distance"
+
+#: builtin/checkout.c:1262
+msgid "only one reference expected"
+msgstr "une seule référence attendue"
+
+#: builtin/checkout.c:1279
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "une seule référence attendue, %d fournies."
+
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "référence invalide : %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "la référence n'est pas un arbre : %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1385
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "branche attendue, mais étiquette '%s' reçue"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1387
 #, 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:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "une branche est attendue, mais '%s' a été reçue"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1391
 #, 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:1325
+#: builtin/checkout.c:1407
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10683,7 +12685,7 @@ msgstr ""
 "impossible de basculer de branche pendant une fusion\n"
 "Envisagez \"git merge --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1411
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10691,7 +12693,7 @@ msgstr ""
 "impossible de basculer de branche pendant une session am\n"
 "Envisagez \"git am --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1415
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10699,7 +12701,7 @@ msgstr ""
 "impossible de basculer de branche pendant un rebasage\n"
 "Envisagez \"git rebase --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1419
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10707,7 +12709,7 @@ msgstr ""
 "impossible de basculer de branche pendant un picorage\n"
 "Envisagez \"git cherry-pick --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1423
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10715,139 +12717,139 @@ msgstr ""
 "impossible de basculer de branche pendant un retour\n"
 "Envisagez \"git revert --quit\" ou \"git worktree add\"."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1427
 msgid "you are switching branch while bisecting"
-msgstr "Vous basculez de branche en cours de bissection"
+msgstr "vous basculez de branche en cours de bissection"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1434
 msgid "paths cannot be used with switching branches"
 msgstr "impossible d'utiliser des chemins avec un basculement de branches"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
 #, 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:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: 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' ne peut pas être utilisé avec '%s'"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' n'accepte pas <point-de-départ>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1470
 #, 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:1395
+#: builtin/checkout.c:1477
 msgid "missing branch or commit argument"
 msgstr "argument de branche ou de commit manquant"
 
-#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
-#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
-#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "forcer l'affichage de l'état d'avancement"
-
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1520
 msgid "perform a 3-way merge with the new branch"
 msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
 
-#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
 msgid "style"
 msgstr "style"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1522
 msgid "conflict style (merge or diff3)"
 msgstr "style de conflit (merge (fusion) ou diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:503
+#: builtin/checkout.c:1534 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "détacher la HEAD au commit nommé"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1535
 msgid "set upstream info for new branch"
 msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1537
 msgid "force checkout (throw away local modifications)"
 msgstr "forcer l'extraction (laisser tomber les modifications locales)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new-branch"
 msgstr "nouvelle branche"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new unparented branch"
 msgstr "nouvelle branche sans parent"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1541 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr "mettre à jour les fichiers ignorés (par défaut)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1544
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "ne pas vérifier si une autre copie de travail contient le référence fournie"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1557
 msgid "checkout our version for unmerged files"
 msgstr "extraire notre version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1560
 msgid "checkout their version for unmerged files"
 msgstr "extraire leur version pour les fichiers non fusionnés"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1564
 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:1533
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B et --orphan sont mutuellement exclusifs"
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c et --orphan sont mutuellement exclusifs"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1626
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p et --overlay sont mutuellement exclusifs"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1663
 msgid "--track needs a branch name"
 msgstr "--track requiert un nom de branche"
 
-#: builtin/checkout.c:1578
-msgid "missing branch name; try -b"
-msgstr "nom de branche manquant ; essayez -b"
+#: builtin/checkout.c:1668
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "nom de branche manquant ; essayez -%c"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1700
 #, c-format
 msgid "could not resolve %s"
 msgstr "impossible de résoudre %s"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "Vous devez spécifier un ou des chemins à restaurer"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1716
 msgid "invalid path specification"
 msgstr "spécification de chemin invalide"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1723
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1727
 #, 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:1646
+#: builtin/checkout.c:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file est incompatible avec --detach"
+
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file est incompatible avec --patch"
+
+#: builtin/checkout.c:1752
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10855,135 +12857,107 @@ msgstr ""
 "git checkout: --ours/--theirs, --force et --merge sont incompatibles lors\n"
 "de l'extraction de l'index."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' correspond à plusieurs branches de suivi distant. Nous avons\n"
-"trouvé %d distants avec une référence correspondante. Nous avons essayé\n"
-"de résoudre l'argument comme un chemin, sans plus de résultat !\n"
-"\n"
-"Si vous souhaitiez extraire une branche de suivi distant sur 'origin',\n"
-"par exemple, qualifiez-la complètement avec l'option --track :\n"
-"\n"
-"    git checkout --track origin/<nom>\n"
-"\n"
-"Si vous souhaitez privilégier un distant particulier lorsque <nom> est\n"
-"ambigu, vous pouvez positionner checkout.defaultRemote=origin dans\n"
-"votre config."
+#: builtin/checkout.c:1757
+msgid "you must specify path(s) to restore"
+msgstr "vous devez spécifier un ou des chemins à restaurer"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
-#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: 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 "branche"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1784
 msgid "create and checkout a new branch"
 msgstr "créer et extraire une nouvelle branche"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1786
 msgid "create/reset and checkout a branch"
 msgstr "créer/réinitialiser et extraire une branche"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1787
 msgid "create reflog for new branch"
 msgstr "créer un reflog pour une nouvelle branche"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1789
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 "essayer d'interpréter 'git checkout <branche-inexistante>' (par défaut)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1790
 msgid "use overlay mode (default)"
 msgstr "utiliser le mode de superposition (défaut)"
 
-#: builtin/checkout.c:1743
+#: builtin/checkout.c:1835
 msgid "create and switch to a new branch"
 msgstr "créer et basculer sur une nouvelle branche"
 
-#: builtin/checkout.c:1745
+#: builtin/checkout.c:1837
 msgid "create/reset and switch to a branch"
 msgstr "créer/réinitialiser et basculer sur une branche"
 
-#: builtin/checkout.c:1747
+#: builtin/checkout.c:1839
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "interpréter 'git switch <branche-inexistante>'"
 
-#: builtin/checkout.c:1749
+#: builtin/checkout.c:1841
 msgid "throw away local modifications"
 msgstr "laisser tomber les modifications locales"
 
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1875
 msgid "which tree-ish to checkout from"
 msgstr "de quel <arbre-esque> faire l'extraction"
 
-#: builtin/checkout.c:1783
+#: builtin/checkout.c:1877
 msgid "restore the index"
 msgstr "restaurer l'index"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1879
 msgid "restore the working tree (default)"
 msgstr "restaurer l'arbre de travail (par défaut)"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1881
 msgid "ignore unmerged entries"
 msgstr "ignorer les entrées non-fusionnées"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1882
 msgid "use overlay mode"
 msgstr "utiliser le mode de superposition"
 
-#: builtin/clean.c:28
+#: 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>..."
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Suppression de %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Supprimerait %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Ignore le dépôt %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Ignorerait le dépôt %s\n"
 
-#: builtin/clean.c:36
-#, c-format
-msgid "failed to remove %s"
-msgstr "échec de la suppression de %s"
-
-#: builtin/clean.c:37
+#: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "lstat de %s impossible\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10996,7 +12970,7 @@ msgstr ""
 "foo         - sélectionner un élément par un préfixe unique\n"
 "            - (vide) ne rien sélectionner\n"
 
-#: builtin/clean.c:305 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -11017,38 +12991,33 @@ msgstr ""
 "*          - choisir tous les éléments\n"
 "           - (vide) terminer la sélection\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 "Hein (%s) ?\n"
 
-#: builtin/clean.c:663
+#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Entrez les motifs à ignorer>> "
 
-#: builtin/clean.c:700
+#: builtin/clean.c:693
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
 
-#: builtin/clean.c:721
+#: builtin/clean.c:714
 msgid "Select items to delete"
 msgstr "Sélectionner les éléments à supprimer"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Supprimer %s [y/N] ? "
 
-#: builtin/clean.c:787 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Au revoir.\n"
-
-#: builtin/clean.c:795
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -11066,64 +13035,52 @@ msgstr ""
 "help                - cet écran\n"
 "?                   - aide pour la sélection en ligne"
 
-#: builtin/clean.c:822 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Commandes ***"
-
-#: builtin/clean.c:823 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Et maintenant ?"
-
-#: builtin/clean.c:831
+#: builtin/clean.c:822
 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:847
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "Plus de fichier à nettoyer, sortie."
 
-#: builtin/clean.c:909
+#: builtin/clean.c:900
 msgid "do not print names of files removed"
 msgstr "ne pas afficher les noms des fichiers supprimés"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:902
 msgid "force"
 msgstr "forcer"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "nettoyage interactif"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "supprimer les répertoires entiers"
 
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: 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 "motif"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr "ajouter <motif> aux règles ignore"
 
-#: builtin/clean.c:917
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "supprimer les fichiers ignorés, aussi"
 
-#: builtin/clean.c:919
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "supprimer seulement les fichiers ignorés"
 
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -11131,7 +13088,7 @@ msgstr ""
 "clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -11139,164 +13096,181 @@ msgstr ""
 "clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
 "nettoyer"
 
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+msgstr "-x et -X ne peuvent pas être utilisés ensemble"
+
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "ne pas cloner un dépôt superficiel"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "ne pas créer d'extraction"
 
-#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
+#: 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"
 
-#: builtin/clone.c:97
+#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr "créer un dépôt miroir (implique dépôt nu)"
 
-#: builtin/clone.c:99
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "pour cloner depuis un dépôt local"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "ne pas utiliser de liens durs locaux, toujours copier"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "régler comme dépôt partagé"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "spécificateur de chemin"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "initialiser les sous-modules dans le clone"
 
-#: builtin/clone.c:109
+#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr "nombre de sous-modules clonés en parallèle"
 
-#: builtin/clone.c:110 builtin/init-db.c:486
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "répertoire-modèle"
 
-#: builtin/clone.c:111 builtin/init-db.c:487
+#: 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:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: 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 "dépôt de référence"
 
-#: builtin/clone.c:117 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: 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 "utiliser seulement --reference pour cloner"
 
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:320
+#: 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 "nom"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "chemin vers git-upload-pack sur le serveur distant"
 
-#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "profondeur"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr "créer un clone superficiel de cette profondeur"
 
-#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/pull.c:211
 msgid "time"
 msgstr "heure"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr "créer un clone superficiel depuis une date spécifique"
 
-#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
-#: builtin/rebase.c:1417
+#: 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 "révision"
 
-#: builtin/clone.c:129 builtin/fetch.c:172
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "approfondir l'historique d'un clone superficiel en excluant une révision"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
 msgid "clone only one branch, HEAD or --branch"
 msgstr "cloner seulement une branche, HEAD ou --branch"
 
-#: builtin/clone.c:133
+#: 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"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "tous les sous-modules clonés seront superficiels"
 
-#: builtin/clone.c:136 builtin/init-db.c:495
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:137 builtin/init-db.c:496
+#: 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"
 
-#: builtin/clone.c:138
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "clé=valeur"
 
-#: builtin/clone.c:139
+#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr "régler la configuration dans le nouveau dépôt"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:172
+#: 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 "spécifique au serveur"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:173
+#: 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 "option à transmettre"
 
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
-#: builtin/push.c:573
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "n'utiliser que des adresses IPv4"
 
-#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
-#: builtin/push.c:575
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "n'utiliser que des adresses IPv6"
 
-#: builtin/clone.c:148
+#: 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"
 
-#: builtin/clone.c:284
+#: 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"
@@ -11304,42 +13278,42 @@ msgstr ""
 "Aucun nom de répertoire n'a pu être deviné\n"
 "Veuillez spécifier un répertoire dans la ligne de commande"
 
-#: builtin/clone.c:337
+#: builtin/clone.c:345
 #, 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:410
+#: builtin/clone.c:418
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s existe et n'est pas un répertoire"
 
-#: builtin/clone.c:427
+#: builtin/clone.c:436
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "échec du démarrage un itérateur sur '%s'"
 
-#: builtin/clone.c:457
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "échec de la création du lien '%s'"
 
-#: builtin/clone.c:461
+#: builtin/clone.c:471
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "échec de la copie vers '%s'"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:476
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "échec de l'itération sur '%s'"
 
-#: builtin/clone.c:491
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr "fait.\n"
 
-#: builtin/clone.c:505
+#: builtin/clone.c:517
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11349,98 +13323,107 @@ 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:582
+#: builtin/clone.c:594
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Impossible de trouver la branche distante '%s' à cloner."
 
-#: builtin/clone.c:701
+#: builtin/clone.c:713
 #, c-format
 msgid "unable to update %s"
 msgstr "impossible de mettre à jour %s"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "échec lors de l'initialisation l'extraction clairsemée"
+
+#: builtin/clone.c:784
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "la HEAD distante réfère à une référence non existante, impossible de "
 "l'extraire.\n"
 
-#: builtin/clone.c:782
+#: builtin/clone.c:816
 msgid "unable to checkout working tree"
 msgstr "impossible d'extraire la copie de travail"
 
-#: builtin/clone.c:832
+#: builtin/clone.c:894
 msgid "unable to write parameters to config file"
 msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
 
-#: builtin/clone.c:895
+#: builtin/clone.c:957
 msgid "cannot repack to clean up"
 msgstr "impossible de remballer pour nettoyer"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:959
 msgid "cannot unlink temporary alternates file"
 msgstr "impossible de délier le fichier temporaire alternates"
 
-#: builtin/clone.c:937 builtin/receive-pack.c:1948
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
 msgid "Too many arguments."
 msgstr "Trop d'arguments."
 
-#: builtin/clone.c:941
+#: builtin/clone.c:1005
 msgid "You must specify a repository to clone."
 msgstr "Vous devez spécifier un dépôt à cloner."
 
-#: builtin/clone.c:954
+#: builtin/clone.c:1018
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "les options --bare et --origin %s sont incompatibles."
 
-#: builtin/clone.c:957
+#: builtin/clone.c:1021
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare et --separate-git-dir sont incompatibles."
 
-#: builtin/clone.c:970
+#: builtin/clone.c:1035
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "le dépôt '%s' n'existe pas"
 
-#: builtin/clone.c:976 builtin/fetch.c:1790
+#: builtin/clone.c:1039 builtin/fetch.c:2014
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profondeur %s n'est pas un entier positif"
 
-#: builtin/clone.c:986
+#: builtin/clone.c:1049
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 "le chemin de destination '%s' existe déjà et n'est pas un répertoire vide."
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1055
+#, 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
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "la copie de travail '%s' existe déjà."
 
-#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
-#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
+#: 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 "impossible de créer les répertoires de premier niveau dans '%s'"
 
-#: builtin/clone.c:1016
+#: builtin/clone.c:1089
 #, 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:1036
+#: builtin/clone.c:1109
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clonage dans le dépôt nu '%s'\n"
 
-#: builtin/clone.c:1038
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clonage dans '%s'...\n"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1135
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11448,41 +13431,50 @@ msgstr ""
 "clone --recursive n'est pas compatible avec à la fois --reference et --"
 "reference-if-able"
 
-#: builtin/clone.c:1123
+#: 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'est pas un nom valide de distante"
+
+#: builtin/clone.c:1229
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 "--depth est ignoré dans les clones locaux : utilisez plutôt \"file://\"."
 
-#: builtin/clone.c:1125
+#: builtin/clone.c:1231
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-since est ignoré dans les clones locaux : utilisez plutôt \"file://"
 "\"."
 
-#: builtin/clone.c:1127
+#: builtin/clone.c:1233
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 "--shallow-exclude est ignoré dans les clones locaux : utilisez plutôt "
 "\"file://\"."
 
-#: builtin/clone.c:1129
+#: builtin/clone.c:1235
 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:1132
+#: builtin/clone.c:1240
 msgid "source repository is shallow, ignoring --local"
 msgstr "le dépôt source est superficiel, option --local ignorée"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr "--local est ignoré"
 
-#: builtin/clone.c:1212 builtin/clone.c:1220
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "le transport distant a retourné une erreur"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
 #, 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:1223
+#: builtin/clone.c:1347
 msgid "You appear to have cloned an empty repository."
 msgstr "Vous semblez avoir cloné un dépôt vide."
 
@@ -11499,25 +13491,131 @@ msgid "layout to use"
 msgstr "mise en page à utiliser"
 
 #: builtin/column.c:30
-msgid "Maximum width"
-msgstr "Largeur maximale"
+msgid "maximum width"
+msgstr "largeur maximale"
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "Remplissage d'espace sur la bordure gauche"
+msgid "padding space on left border"
+msgstr "remplissage d'espace sur la bordure gauche"
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "Remplissage d'espace sur le côté droit"
+msgid "padding space on right border"
+msgstr "remplissage d'espace sur le côté droit"
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "Remplissage d'espace entre les colonnes"
+msgid "padding space between columns"
+msgstr "remplissage d'espace entre les colonnes"
 
 #: builtin/column.c:51
 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
+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: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:80 builtin/commit-graph.c:210
+#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+msgid "dir"
+msgstr "répertoire"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr "le répertoire d'objet où stocker le graphe"
+
+#: builtin/commit-graph.c:83
+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"
+
+#: builtin/commit-graph.c:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Impossible d'ouvrir le graphe de commit '%s'"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "argument de --split non reconnu, %s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "ID d'objet non hexadécimal inattendu : %s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "objet invalide : %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "commencer le parcours à toutes les réfs"
+
+#: builtin/commit-graph.c:215
+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
+msgid "start walk at commits listed by stdin"
+msgstr "commencer le parcours aux commits listés sur stdin"
+
+#: builtin/commit-graph.c:219
+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"
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr "activer le calcul pour les chemins modifiés"
+
+#: builtin/commit-graph.c:224
+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
+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"
+
+#: builtin/commit-graph.c:230
+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
+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
+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
+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
+msgid "Collecting commits from input"
+msgstr "Collecte des commits depuis l'entrée"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -11531,7 +13629,7 @@ msgstr ""
 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:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
 #, c-format
 msgid "not a valid object name %s"
 msgstr "nom d'objet invalide %s"
@@ -11559,13 +13657,13 @@ msgstr "parent"
 msgid "id of a parent commit object"
 msgstr "id d'un objet commit parent"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: 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 "message"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
 msgid "commit message"
 msgstr "message de validation"
 
@@ -11573,8 +13671,8 @@ msgstr "message de validation"
 msgid "read commit log message from file"
 msgstr "lire le message de validation depuis un fichier"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: 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 "signer la validation avec GPG"
 
@@ -11621,10 +13719,14 @@ msgstr ""
 "\n"
 
 #: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Sinon, veuillez utiliser 'git rebase --skip'\n"
+
+#: builtin/commit.c:66
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Sinon, veuillez utiliser 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:69
 msgid ""
 "and then use:\n"
 "\n"
@@ -11643,64 +13745,76 @@ 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:315
+#: builtin/commit.c:324
 msgid "failed to unpack HEAD tree object"
 msgstr "échec du dépaquetage de l'objet arbre HEAD"
 
-#: builtin/commit.c:356
+#: 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
+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
 msgid "unable to create temporary index"
 msgstr "impossible de créer l'index temporaire"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr "échec de l'ajout interactif"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:410
 msgid "unable to update temporary index"
 msgstr "impossible de mettre à jour l'index temporaire"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:412
 msgid "Failed to update main cache tree"
 msgstr "Impossible de mettre à jour l'arbre de cache principal"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
 msgid "unable to write new_index file"
 msgstr "impossible d'écrire le fichier new_index"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:489
 msgid "cannot do a partial commit during a merge."
 msgstr "impossible de faire une validation partielle pendant une fusion."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:491
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossible de faire une validation partielle pendant un picorage."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:493
+msgid "cannot do a partial commit during a rebase."
+msgstr "impossible de faire une validation partielle pendant un rebasage."
+
+#: builtin/commit.c:501
 msgid "cannot read the index"
 msgstr "impossible de lire l'index"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:520
 msgid "unable to write temporary index file"
 msgstr "impossible d'écrire le fichier d'index temporaire"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:618
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "entête d'auteur manquant dans le commit '%s'"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "le commit '%s' a une ligne d'auteur malformée"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr "paramètre --author mal formé"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:692
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11708,68 +13822,52 @@ 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:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "impossible de rechercher le commit %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:758 builtin/shortlog.c:413
 #, 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:708
+#: builtin/commit.c:760
 msgid "could not read log from standard input"
 msgstr "impossible de lire le journal depuis l'entrée standard"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:764
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "impossible de lire le fichier de journal '%s'"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "impossible de combiner -m avec --fixup:%s"
+
+#: builtin/commit.c:813 builtin/commit.c:829
 msgid "could not read SQUASH_MSG"
 msgstr "impossible de lire SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:820
 msgid "could not read MERGE_MSG"
 msgstr "impossible de lire MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:880
 msgid "could not write commit template"
 msgstr "impossible d'écrire le modèle de commit"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:893
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
-msgstr ""
-"\n"
-"Il semble que vous validiez une fusion.\n"
-"Si ce n'est pas le cas, veuillez supprimer le fichier\n"
-"\t%s\n"
-"et essayez à nouveau.\n"
-
-#: builtin/commit.c:834
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
 msgstr ""
-"\n"
-"Il semble que vous validiez un picorage.\n"
-"Si ce n'est pas le cas, veuillez supprimer le fichier\n"
-"\t%s\n"
-"et essayez à nouveau.\n"
+"Veuillez saisir le message de validation pour vos modifications. Les lignes\n"
+"commençant par '%c' seront ignorées.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:895
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11779,7 +13877,18 @@ msgstr ""
 "commençant par '%c' seront ignorées, et un message vide abandonne la "
 "validation.\n"
 
-#: builtin/commit.c:855
+#: 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 ""
+"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:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11790,148 +13899,206 @@ msgstr ""
 "commençant par '%c' seront conservées ; vous pouvez les supprimer vous-même\n"
 "si vous le souhaitez. Un message vide abandonne la validation.\n"
 
-#: builtin/commit.c:872
+#: 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"
+"Il semble que vous validiez une fusion.\n"
+"Si ce n'est pas le cas, veuillez lancer\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"et essayez à nouveau.\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"
+"Il semble que vous validiez un picorage.\n"
+"Si ce n'est pas le cas, veuillez lancer\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"et essayez à nouveau.\n"
+
+#: builtin/commit.c:947
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAuteur :     %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:955
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDate :       %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:962
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sValidateur : %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:980
 msgid "Cannot read index"
 msgstr "Impossible de lire l'index"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "impossible de passer les lignes finales à --trailers"
+
+#: builtin/commit.c:1065
 msgid "Error building trees"
 msgstr "Erreur lors de la construction des arbres"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1079 builtin/tag.c:319
 #, 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:1030
+#: builtin/commit.c:1123
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' n'est pas de la forme 'Nom <email>' ni ne correspond à aucun "
 "auteur existant"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1137
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Mode de fichier ignoré invalide '%s'"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1155 builtin/commit.c:1448
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Mode de fichier non suivi invalide '%s'"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1195
 msgid "--long and -z are incompatible"
 msgstr "--long et -z sont incompatibles"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1226
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Vous êtes en pleine fusion -- impossible de reformuler."
+
+#: builtin/commit.c:1228
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Vous êtes en plein picorage -- impossible de reformuler."
+
+#: builtin/commit.c:1231
+#, 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'"
+
+#: builtin/commit.c:1233
+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:1252
 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:1155
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Il n'y a rien à corriger."
 
-#: builtin/commit.c:1158
+#: 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:1160
+#: 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:1163
+#: 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: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:1173
+#: 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:1175
+#: 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:1183
+#: 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:1200
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Une seule option parmi --include/--only/--all/--interactive/--patch peut "
 "être utilisée."
 
-#: builtin/commit.c:1202
-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:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "option inconnue : --fixup=%s:%s"
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1352
 #, 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:1339 builtin/commit.c:1523
+#: builtin/commit.c:1483 builtin/commit.c:1652
 msgid "show status concisely"
 msgstr "afficher l'état avec concision"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show branch information"
 msgstr "afficher l'information de branche"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1487
 msgid "show stash information"
 msgstr "afficher l'information de remisage"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1489 builtin/commit.c:1656
 msgid "compute full ahead/behind values"
 msgstr "calcule les valeurs complètes en avance/en retard"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1491
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
-#: builtin/worktree.c:650
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "sortie pour traitement automatique"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1494 builtin/commit.c:1660
 msgid "show status in long format (default)"
 msgstr "afficher l'état en format long (par défaut)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "terminate entries with NUL"
 msgstr "terminer les éléments par NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
+#: 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 "mode"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
 "no. (Défaut : all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1504
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11939,11 +14106,11 @@ msgstr ""
 "afficher les fichiers ignorés, \"mode\" facultatif : traditional "
 "(traditionnel), matching (correspondant), no. (Défaut : traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:188
+#: builtin/commit.c:1506 parse-options.h:193
 msgid "when"
 msgstr "quand"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1507
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11951,175 +14118,198 @@ msgstr ""
 "ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
 "(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1509
 msgid "list untracked files in columns"
 msgstr "afficher les fichiers non suivis en colonnes"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1510
 msgid "do not detect renames"
 msgstr "ne pas détecter les renommages"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1512
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 "détecter les renommages, en spécifiant optionnellement le facteur de "
 "similarité"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1535
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinaison non supportée d'arguments sur les fichiers ignorés et non-suivis"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1617
 msgid "suppress summary after successful commit"
 msgstr "supprimer le résumé après une validation réussie"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1618
 msgid "show diff in commit message template"
 msgstr "afficher les diff dans le modèle de message de validation"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1620
 msgid "Commit message options"
 msgstr "Options du message de validation"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
 msgid "read message from file"
 msgstr "lire le message depuis un fichier"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "author"
 msgstr "auteur"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "override author for commit"
 msgstr "remplacer l'auteur pour la validation"
 
-#: builtin/commit.c:1499 builtin/gc.c:538
+#: builtin/commit.c:1623 builtin/gc.c:550
 msgid "date"
 msgstr "date"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1623
 msgid "override date for commit"
 msgstr "remplacer la date pour la validation"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1625
 msgid "reuse and edit message from specified commit"
 msgstr "réutiliser et éditer le message du commit spécifié"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1626
 msgid "reuse message from specified commit"
 msgstr "réutiliser le message du commit spécifié"
 
-#: builtin/commit.c:1503
-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):]commit"
+
+#: builtin/commit.c:1631
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
-"utiliser un message au format autosquash pour corriger le commit spécifié"
+"utiliser un message au format autosquash pour corriger ou reformuler le "
+"commit spécifié"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1632
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "utiliser un message au format autosquash pour compresser le commit spécifié"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1633
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 "à présent je suis l'auteur de la validation (utilisé avec -C/-c/--amend)"
 
-#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "ajouter une entrée Signed-off-by :"
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "ligne de fin"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1634
+msgid "add custom trailer(s)"
+msgstr "ajouter des lignes terminales personnaliser"
+
+#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "ajouter une ligne terminale Signed-off-by"
+
+#: builtin/commit.c:1636
 msgid "use specified template file"
 msgstr "utiliser le fichier de modèle spécifié"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1637
 msgid "force edit of commit"
 msgstr "forcer l'édition du commit"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1639
 msgid "include status in commit message template"
 msgstr "inclure l'état dans le modèle de message de validation"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1644
 msgid "Commit contents options"
 msgstr "Valider les options des contenus"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1645
 msgid "commit all changed files"
 msgstr "valider tous les fichiers modifiés"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1646
 msgid "add specified files to index for commit"
 msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1647
 msgid "interactively add files"
 msgstr "ajouter des fichiers en mode interactif"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1648
 msgid "interactively add changes"
 msgstr "ajouter les modifications en mode interactif"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1649
 msgid "commit only specified files"
 msgstr "valider seulement les fichiers spécifiés"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1650
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1651
 msgid "show what would be committed"
 msgstr "afficher ce qui serait validé"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1664
 msgid "amend previous commit"
 msgstr "corriger la validation précédente"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1665
 msgid "bypass post-rewrite hook"
 msgstr "éviter d'utiliser le crochet post-rewrite"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1672
 msgid "ok to record an empty change"
 msgstr "accepter d'enregistrer une modification vide"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1674
 msgid "ok to record a change with an empty message"
 msgstr "accepter d'enregistrer une modification avec un message vide"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1750
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Fichier MERGE_HEAD corrompu (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1757
 msgid "could not read MERGE_MODE"
 msgstr "impossible de lire MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1778
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "impossible de lire le message de validation : %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1785
 #, 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:1654
+#: builtin/commit.c:1790
 #, 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:1688
+#: builtin/commit.c:1801
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr ""
+"Abandon de la validation dû à un corps de message de validation vide.\n"
+
+#: builtin/commit.c:1837
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -12129,290 +14319,227 @@ msgstr ""
 "new_index. Vérifiez que le disque n'est pas plein ou que le quota\n"
 "n'a pas été dépassé, puis lancez \"git restore --staged :/\" pour réparer."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-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:29
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <répertoire-d'objet>] [--append|--"
-"split] [--reachable|--stdin-packs|--stdin-commits] [--|no-]progress] "
-"<options de division>"
-
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
-#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
-#: builtin/log.c:1585
-msgid "dir"
-msgstr "répertoire"
-
-#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
-#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
-msgid "The object directory to store the graph"
-msgstr "Le répertoire d'objet où stocker le graphe"
-
-#: builtin/commit-graph.c:58
-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"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:125
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "impossible d'ouvrir le graphe de commit '%s'"
-
-#: builtin/commit-graph.c:173
-msgid "start walk at all refs"
-msgstr "commencer le parcours à toutes les réfs"
-
-#: builtin/commit-graph.c:175
-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:177
-msgid "start walk at commits listed by stdin"
-msgstr "commencer le parcours aux commits listés sur stdin"
-
-#: builtin/commit-graph.c:179
-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"
-
-#: builtin/commit-graph.c:182
-msgid "allow writing an incremental commit-graph file"
-msgstr "permettre d'écrire un fichier incrémental de graphe de commit"
-
-#: builtin/commit-graph.c:184 builtin/commit-graph.c:188
-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"
-
-#: builtin/commit-graph.c:186
-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:204
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "utilisez un seul parmi --reachable, --stdin-commits ou --stdin-packs"
-
 #: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<options>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "argument --type non reconnu, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "qu'un seul type à la fois"
 
-#: builtin/config.c:124
+#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Emplacement du fichier de configuration"
 
-#: builtin/config.c:125
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr "utiliser les fichier de configuration global"
 
-#: builtin/config.c:126
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr "utiliser le fichier de configuration du système"
 
-#: builtin/config.c:127
+#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "utiliser le fichier de configuration du dépôt"
 
-#: builtin/config.c:128
+#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "utiliser un fichier de configuration par arbre de travail"
 
-#: builtin/config.c:129
+#: builtin/config.c:135
 msgid "use given config file"
 msgstr "utiliser le fichier de configuration spécifié"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "lire la configuration depuis l'objet blob fourni"
 
-#: builtin/config.c:131
+#: builtin/config.c:137
 msgid "Action"
 msgstr "Action"
 
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "obtenir la valeur : nom [regex-de-valeur]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "obtenir la valeur : nom [motif-de-valeur]"
 
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "obtenir toutes les valeurs : clé [motif-de-valeur]"
 
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "obtenir les valeur pour la regexp : regex-de-nom [motif-de-valeur]"
 
-#: builtin/config.c:135
+#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
 
-#: builtin/config.c:136
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
-"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
+"remplacer toutes les variables correspondant : nom valeur [motif-de-valeur]"
 
-#: builtin/config.c:137
+#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "ajouter une nouvelle variable : nom valeur"
 
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "supprimer une variable : nom [regex-de-valeur]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "supprimer une variable : nom [motif-de-valeur]"
 
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "supprimer toutes les correspondances nom [motif-de-valeur]"
 
-#: builtin/config.c:140
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "renommer une section : ancien-nom nouveau-nom"
 
-#: builtin/config.c:141
+#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "supprimer une section : nom"
 
-#: builtin/config.c:142
+#: builtin/config.c:148
 msgid "list all"
 msgstr "afficher tout"
 
-#: builtin/config.c:143
+#: 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'"
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr "ouvrir un éditeur"
 
-#: builtin/config.c:144
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "trouver la couleur configurée : slot [par défaut]"
 
-#: builtin/config.c:145
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:153
 msgid "Type"
 msgstr "Type"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "ce type est assigné à la valeur"
 
-#: builtin/config.c:148
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
 
-#: builtin/config.c:149
+#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "la valeur est un nombre décimal"
 
-#: builtin/config.c:150
+#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "la valeur est --bool ou --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "la valeur est --bool ou une chaîne"
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"
 
-#: builtin/config.c:152
+#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "la valeur est une date d'expiration"
 
-#: builtin/config.c:153
+#: builtin/config.c:161
 msgid "Other"
 msgstr "Autre"
 
-#: builtin/config.c:154
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "terminer les valeurs avec un caractère NUL"
 
-#: builtin/config.c:155
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "n'afficher que les noms de variable"
 
-#: builtin/config.c:156
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "respecter les directives d'inclusion lors de la recherche"
 
-#: builtin/config.c:157
+#: 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)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: 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)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "valeur"
 
-#: builtin/config.c:158
+#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "avec --get, utiliser le valeur par défaut quand l'entrée n'existe pas"
 
-#: builtin/config.c:172
+#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "mauvais nombre d'arguments, devrait être %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "mauvais nombre d'arguments, devrait être entre %d et %d"
 
-#: builtin/config.c:308
+#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "motif de clé invalide : %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:377
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "échec du formatage de la valeur de config par défaut : %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "impossible d'analyser la couleur '%s'"
 
-#: builtin/config.c:443
+#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "impossible de lire la valeur de couleur par défaut"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "pas dans un répertoire git"
 
-#: builtin/config.c:499
+#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "l'écriture sur stdin n'est pas supportée"
 
-#: builtin/config.c:502
+#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "l'écriture de blob de configuration n'est pas supportée<"
 
-#: builtin/config.c:587
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12427,23 +14554,27 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "un seul fichier de configuration à la fois"
 
-#: builtin/config.c:616
+#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git"
 
-#: builtin/config.c:619
+#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob ne peut être utilisé qu'à l'intérieur d'un dépôt git"
 
-#: builtin/config.c:638
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree ne peut être utilisé qu'à l'intérieur d'un dépôt git"
+
+#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME n'est pas défini"
 
-#: builtin/config.c:658
+#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12454,19 +14585,19 @@ msgstr ""
 "la section \"CONFIGURATION FILE\" de \"git help worktree\" pour plus de "
 "détails"
 
-#: builtin/config.c:688
+#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color et le type de la variable sont incohérents"
 
-#: builtin/config.c:693
+#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "une seule action à la fois"
 
-#: builtin/config.c:706
+#: builtin/config.c:761
 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:712
+#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -12474,33 +14605,37 @@ msgstr ""
 "--show-origin n'est applicable qu'avec --get, --get-all, --get-regexp ou --"
 "list"
 
-#: builtin/config.c:718
+#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default n'est applicable qu'avec --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value ne s'applique qu'à 'motif-de-valeur'"
+
+#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "lecture du fichier de configuration '%s' impossible"
 
-#: builtin/config.c:734
+#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "erreur lors du traitement de fichier(s) de configuration"
 
-#: builtin/config.c:744
+#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "l'édition de stdin n'est pas supportée"
 
-#: builtin/config.c:746
+#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "l'édition de blobs n'est pas supportée"
 
-#: builtin/config.c:760
+#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "création impossible du fichier de configuration '%s'"
 
-#: builtin/config.c:773
+#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12509,7 +14644,7 @@ msgstr ""
 "impossible de surcharger des valeurs multiples avec une seule valeur\n"
 "       Utilisez une regexp, --add ou --replace-all pour modifier %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "section inexistante : %s"
@@ -12522,6 +14657,37 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "affiche les tailles dans un format humainement lisible"
 
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Les permissions de votre répertoire de socket sont trop permissives ;\n"
+"les autres utilisateurs pourraient lire vos identifiants secrets. Lancez :\n"
+"\n"
+"    chmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+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"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache non disponible ; pas de gestion des socket unix"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "impossible d'accéder au verrou de stockage d'identification en %d ms"
+
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<options>] <commit ou apparenté>*"
@@ -12530,51 +14696,46 @@ msgstr "git describe [<options>] <commit ou apparenté>*"
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<options>] --dirty"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "head"
 msgstr "tête"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "léger"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr "annoté"
 
-#: builtin/describe.c:275
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "l'étiquette annotée %s n'est pas disponible"
 
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
-
 #: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "l'étiquette '%s' est en fait '%s'"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "l'étiquette '%s' est connue à l'extérieur comme '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "aucune étiquette ne correspond parfaitement à '%s'"
 
-#: builtin/describe.c:327
+#: 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"
 
-#: builtin/describe.c:381
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "recherche terminée à %s\n"
 
-#: builtin/describe.c:407
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12583,7 +14744,7 @@ msgstr ""
 "Aucune étiquette annotée ne peut décrire '%s'.\n"
 "Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
 
-#: builtin/describe.c:411
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12592,12 +14753,12 @@ msgstr ""
 "Aucune étiquette ne peut décrire '%s'.\n"
 "Essayez --always, ou créez des étiquettes."
 
-#: builtin/describe.c:441
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits parcourus\n"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12607,147 +14768,165 @@ msgstr ""
 "affichées\n"
 "abandon de la recherche à %s\n"
 
-#: builtin/describe.c:512
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "décrire %s\n"
 
-#: builtin/describe.c:515
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s n'est pas un nom d'objet valide"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s n'est ni un commit ni un blob"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "rechercher l'étiquette qui suit le commit"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "déboguer la stratégie de recherche sur stderr"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "utiliser n'importe quelle référence"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "utiliser n'importe quelle étiquette, même non-annotée"
 
-#: builtin/describe.c:541
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "toujours utiliser le format long"
 
-#: builtin/describe.c:542
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "ne suivre que le premier parent"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "n'afficher que les correspondances exactes"
 
-#: builtin/describe.c:547
+#: 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)"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "ne considérer que les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "ne pas considérer les étiquettes correspondant à <motif>"
 
-#: builtin/describe.c:553 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "afficher les objets commits abrégés en dernier recours"
 
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "marque"
 
-#: builtin/describe.c:555
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
 
-#: builtin/describe.c:558
+#: 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:576
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long et --abbrev=0 sont incompatibles"
 
-#: builtin/describe.c:605
+#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
-msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
+msgstr "Aucun nom trouvé, impossible de décrire quoi que ce soit."
 
-#: builtin/describe.c:656
+#: 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:658
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken est incompatible avec les commits ou assimilés"
 
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin et --merge-base sont mutuellement exclusifs"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base ne fonctionne qu'avec deux commits"
+
+#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "option invalide : %s"
 
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s..%s: pas de base de fusion"
+
+#: builtin/diff.c:486
 msgid "Not a git repository"
-msgstr "Ce n'est pas un dépôt git !"
+msgstr "Ce n'est pas un dépôt git"
 
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objet spécifié '%s' invalide."
 
-#: builtin/diff.c:403
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "plus de deux blobs spécifiés : '%s'"
 
-#: builtin/diff.c:408
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objet non géré '%s' spécifié."
 
-#: builtin/difftool.c:30
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "\"%s...%s\" : bases multiples de fusion, utilisation de %s"
+
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
 
-#: builtin/difftool.c:260
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
 msgstr "échec : %d"
 
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink %s"
 msgstr "lecture du lien symbolique %s impossible"
 
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "impossible de lire le fichier symlink %s"
 
-#: builtin/difftool.c:312
+#: builtin/difftool.c:313
 #, c-format
 msgid "could not read object %s for symlink %s"
-msgstr "Impossible de lire l'objet %s pour le symlink %s"
+msgstr "impossible de lire l'objet %s pour le symlink %s"
 
 #: builtin/difftool.c:413
 msgid ""
@@ -12757,53 +14936,53 @@ msgstr ""
 "les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
 "dans le mode de diff de répertoire ('-d' et '--dir-diff')."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
 
-#: builtin/difftool.c:636
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "le fichier dans l'arbre de travail a été laissé."
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "des fichiers temporaires existent dans '%s'."
 
-#: builtin/difftool.c:648
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
 
-#: builtin/difftool.c:697
+#: builtin/difftool.c:699
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:701
 msgid "perform a full-directory diff"
 msgstr "réalise un diff de répertoire complet"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:703
 msgid "do not prompt before launching a diff tool"
 msgstr "ne pas confirmer avant de lancer l'outil de diff"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:708
 msgid "use symlinks in dir-diff mode"
 msgstr "utiliser les liens symboliques en mode de diff de répertoire"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:709
 msgid "tool"
 msgstr "outil"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:710
 msgid "use the specified diff tool"
 msgstr "utiliser l'outil de diff spécifié"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:712
 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:713
+#: builtin/difftool.c:715
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12811,31 +14990,31 @@ msgstr ""
 "provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
 "non-nul"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:718
 msgid "specify a custom command for viewing diffs"
 msgstr "spécifier une commande personnalisée pour visualiser les différences"
 
-#: builtin/difftool.c:717
+#: builtin/difftool.c:719
 msgid "passed to `diff`"
 msgstr "passé à `diff`"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:734
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool exige un arbre de travail ou --no-index"
 
-#: builtin/difftool.c:739
+#: builtin/difftool.c:741
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff est incompatible avec --no-index"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:744
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool et --extcmd sont mutuellement exclusifs"
 
-#: builtin/difftool.c:750
+#: builtin/difftool.c:752
 msgid "no <tool> given for --tool=<tool>"
 msgstr "pas d'<outil> spécifié pour --tool=<outil>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:759
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
 
@@ -12843,27 +15022,27 @@ 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:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
 msgid "type"
 msgstr "type"
 
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "valeur par défaut pour git_env_*(...) en cas d'absence"
 
-#: builtin/env--helper.c:43
+#: 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"
 
-#: builtin/env--helper.c:62
+#: 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`"
 
-#: builtin/env--helper.c:77
+#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -12876,191 +15055,259 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [options-de-liste-de-révisions]"
 
-#: builtin/fast-export.c:852
+#: builtin/fast-export.c:868
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Erreur : impossible d'exporter des étiquettes imbriquées à moins que --mark-"
 "tags ne soit spécifié."
 
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "le jeton --anonymize-map ne peut pas être vide"
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "afficher la progression après <n> objets"
 
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "sélectionner la gestion des étiquettes signées"
 
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 "sélectionner la gestion des étiquettes qui pointent sur des objets filtrés"
 
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "sélectionner la gestion des messages de validation dans un encodage "
 "alternatif"
 
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
-msgstr "Enregistrer les marques dans ce fichier"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "enregistrer les marques dans ce fichier"
 
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
 msgstr "importer les marques depuis ce fichier"
 
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
 msgstr "importer les marques depuis ce fichier s'il existe"
 
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
+#: builtin/fast-export.c:1216
+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:1173
-msgid "Output full tree for each commit"
-msgstr "Afficher l'arbre complet pour chaque commit"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "afficher l'arbre complet pour chaque commit"
 
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
-msgstr "Utiliser la fonction \"done\" pour terminer le flux"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "utiliser la fonction \"done\" pour terminer le flux"
 
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr "Sauter l'affichage de données de blob"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "sauter l'affichage de données de blob"
 
-#: builtin/fast-export.c:1177 builtin/log.c:1633
+#: builtin/fast-export.c:1222 builtin/log.c:1826
 msgid "refspec"
 msgstr "spécificateur de référence"
 
-#: builtin/fast-export.c:1178
-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:1223
+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:1179
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "anonymise la sortie"
 
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "depuis:vers"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "convertit <depuis> en <vers> dans la sortie anonymisée"
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
-"les parents références qui ne sont pas dans le flux d'export rapide par id "
+"référencer les parents qui ne sont pas dans le flux d'export rapide par id "
 "d'objet"
 
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "Afficher les ids d'objet originaux des blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "afficher les ids d'objet originaux des blobs/commits"
 
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
-msgstr "Marquer les étiquettes avec des ids de marque"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "marquer les étiquettes avec des ids de marque"
 
-#: builtin/fast-export.c:1220
+#: 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/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Champs from manquants pour le sous-module '%s'"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Champs 'to' manquants pour le sous-module '%s'"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Commande 'mark' attendue, %s trouvé"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Commande 'to' attendue, %s trouvé"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+"Format attendu nom:<nom de fichier> pour l'option de réécriture de sous-"
+"module"
+
+#: builtin/fast-import.c:3377
+#, 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"
+
+#: 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
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<options>] <groupe>"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<options>]"
 
-#: builtin/fetch.c:115
+#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel ne peut pas être négatif"
 
-#: builtin/fetch.c:138 builtin/pull.c:204
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "récupérer depuis tous les dépôts distants"
 
-#: builtin/fetch.c:140 builtin/pull.c:248
+#: builtin/fetch.c:147 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
 msgstr "définir la branche amont pour git pull/fetch"
 
-#: builtin/fetch.c:142 builtin/pull.c:207
+#: builtin/fetch.c:149 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
 
-#: builtin/fetch.c:144 builtin/pull.c:210
+#: builtin/fetch.c:151
+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
 msgid "path to upload pack on remote end"
 msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
 
-#: builtin/fetch.c:145
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr "forcer l'écrasement de la branche locale"
 
-#: builtin/fetch.c:147
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "récupérer depuis plusieurs dépôts distants"
 
-#: builtin/fetch.c:149 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "récupérer toutes les étiquettes et leurs objets associés"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "nombre de sous-modules récupérés en parallèle"
 
-#: builtin/fetch.c:155 builtin/pull.c:217
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+"modifier le spécificateur de référence pour placer les références dans refs/"
+"prefetch/"
+
+#: builtin/fetch.c:166 builtin/pull.c:198
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "éliminer les branches de suivi distant si la branche n'existe plus dans le "
 "dépôt distant"
 
-#: builtin/fetch.c:157
+#: builtin/fetch.c:168
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "éliminer les étiquettes locales qui ont disparu du dépôt distant et qui "
 "encombrent les étiquettes modifiées"
 
-#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "à la demande"
 
-#: builtin/fetch.c:159
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
 msgstr "contrôler la récupération récursive dans les sous-modules"
 
-#: builtin/fetch.c:163 builtin/pull.c:225
+#: builtin/fetch.c:175
+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
 msgid "keep downloaded pack"
 msgstr "conserver le paquet téléchargé"
 
-#: builtin/fetch.c:165
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "permettre la mise à jour de la référence HEAD"
 
-#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "approfondir l'historique d'un clone superficiel"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:183 builtin/pull.c:212
 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:176 builtin/pull.c:231
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "convertir en un dépôt complet"
 
-#: builtin/fetch.c:179
+#: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
 msgstr "préfixer ceci à la sortie du chemin du sous-module"
 
-#: builtin/fetch.c:182
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -13068,91 +15315,107 @@ 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:186 builtin/pull.c:234
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "accepter les références qui mettent à jour .git/shallow"
 
-#: builtin/fetch.c:187 builtin/pull.c:236
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr "correspondance de référence"
 
-#: builtin/fetch.c:188 builtin/pull.c:237
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "spécifier une correspondance de référence pour la récupération"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:208 builtin/pull.c:240
 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:198
-msgid "run 'gc --auto' after fetching"
-msgstr "lancer 'gc --auto' après la récupération"
+#: builtin/fetch.c:210
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+"ne pas récupérer le fichier paquet ; à la place, afficher les ancêtres des "
+"sommets de négociation"
+
+#: builtin/fetch.c:213 builtin/fetch.c:215
+msgid "run 'maintenance --auto' after fetching"
+msgstr "lancer 'maintenance --auto' après la récupération"
 
-#: builtin/fetch.c:200 builtin/pull.c:246
+#: builtin/fetch.c:217 builtin/pull.c:243
 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
+msgid "write the commit-graph after fetching"
+msgstr "écrire le graphe de commits après le rapatriement"
+
+#: builtin/fetch.c:221
+msgid "accept refspecs from stdin"
+msgstr "lire les spécificateurs de référence depuis l'entrée standard"
 
-#: builtin/fetch.c:510
+#: builtin/fetch.c:586
 msgid "Couldn't find remote ref HEAD"
 msgstr "impossible de trouver la référence HEAD distante"
 
-#: builtin/fetch.c:650
+#: builtin/fetch.c:757
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 "le paramètre de configuration fetch.output contient une valeur invalide %s"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:856
 #, c-format
 msgid "object %s not found"
 msgstr "objet %s non trouvé"
 
-#: builtin/fetch.c:752
+#: builtin/fetch.c:860
 msgid "[up to date]"
 msgstr "[à jour]"
 
-#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr "[rejeté]"
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:874
 msgid "can't fetch in current branch"
 msgstr "impossible de récupérer dans la branche actuelle"
 
-#: builtin/fetch.c:776
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr "[mise à jour de l'étiquette]"
 
-#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
-#: builtin/fetch.c:848
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
 msgid "unable to update local ref"
 msgstr "impossible de mettre à jour la référence locale"
 
-#: builtin/fetch.c:781
+#: builtin/fetch.c:889
 msgid "would clobber existing tag"
 msgstr "écraserait l'étiquette existante"
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr "[nouvelle étiquette]"
 
-#: builtin/fetch.c:806
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr "[nouvelle branche]"
 
-#: builtin/fetch.c:809
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr "[nouvelle référence]"
 
-#: builtin/fetch.c:848
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr "mise à jour forcée"
 
-#: builtin/fetch.c:853
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
 msgstr "pas en avance rapide"
 
-#: builtin/fetch.c:874
+#: 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"
@@ -13160,9 +15423,9 @@ msgid ""
 msgstr ""
 "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:878
+#: builtin/fetch.c:1069
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -13171,26 +15434,27 @@ msgid ""
 " 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"
+"Vous pouvez utiliser '--no-show-forced-updates' ou lancer\n"
 "'git config fetch.showForcedUpdates false' pour éviter ceci.\n"
 
-#: builtin/fetch.c:908
+#: builtin/fetch.c:1101
 #, 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:929
+#: builtin/fetch.c:1129
 #, 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 rejeté parce que les racines superficielles ne sont pas mises à jour"
+"%s rejeté parce que les  mises à jour de racines superficielles ne sont pas "
+"permises"
 
-#: builtin/fetch.c:1020 builtin/fetch.c:1157
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr "Depuis %.*s\n"
 
-#: builtin/fetch.c:1031
+#: builtin/fetch.c:1228
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -13199,79 +15463,79 @@ 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:1127
+#: builtin/fetch.c:1327
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s sera en suspens)"
 
-#: builtin/fetch.c:1128
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s est devenu en suspens)"
 
-#: builtin/fetch.c:1160
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr "[supprimé]"
 
-#: builtin/fetch.c:1161 builtin/remote.c:1036
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(aucun(e))"
 
-#: builtin/fetch.c:1184
+#: builtin/fetch.c:1384
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
 
-#: builtin/fetch.c:1203
+#: builtin/fetch.c:1403
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
 
-#: builtin/fetch.c:1206
+#: builtin/fetch.c:1406
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "L'option \"%s\" est ignorée pour %s\n"
 
-#: builtin/fetch.c:1414
-msgid "multiple branch detected, incompatible with --set-upstream"
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "branches multiples détectées, imcompatible avec --set-upstream"
 
-#: builtin/fetch.c:1429
+#: builtin/fetch.c:1633
 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:1431
+#: builtin/fetch.c:1635
 msgid "not setting upstream for a remote tag"
 msgstr "dépôt amont non défini pour l'étiquette distante"
 
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1637
 msgid "unknown branch type"
 msgstr "type de branche inconnu"
 
-#: builtin/fetch.c:1435
+#: builtin/fetch.c:1639
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
 msgstr ""
-"Aucune branche source trouvée.\n"
+"aucune branche source trouvée.\n"
 "Vous devez spécifier exactement une branche avec l'option --set-upstream."
 
-#: builtin/fetch.c:1561 builtin/fetch.c:1623
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Récupération de %s\n"
 
-#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Impossible de récupérer %s"
 
-#: builtin/fetch.c:1583
+#: builtin/fetch.c:1790
 #, 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:1685
+#: 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."
@@ -13279,76 +15543,96 @@ 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:1722
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr "Vous devez spécifier un nom d'étiquette."
 
-#: builtin/fetch.c:1774
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only nécessite au moins un --negotiate-tip=*"
+
+#: builtin/fetch.c:1998
 msgid "Negative depth in --deepen is not supported"
 msgstr "Une profondeur négative dans --deepen n'est pas supportée"
 
-#: builtin/fetch.c:1776
+#: builtin/fetch.c:2000
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen et --depth sont mutuellement exclusifs"
 
-#: builtin/fetch.c:1781
+#: builtin/fetch.c:2005
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
 
-#: builtin/fetch.c:1783
+#: builtin/fetch.c:2007
 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:1799
+#: builtin/fetch.c:2024
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all n'accepte pas d'argument de dépôt"
 
-#: builtin/fetch.c:1801
+#: builtin/fetch.c:2026
 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:1810
+#: builtin/fetch.c:2035
 #, c-format
 msgid "No such remote or remote group: %s"
-msgstr "distant ou groupe distant inexistant : %s"
+msgstr "Distant ou groupe distant inexistant : %s"
 
-#: builtin/fetch.c:1817
+#: builtin/fetch.c:2042
 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:1835
+#: builtin/fetch.c:2058
+msgid "must supply remote when using --negotiate-only"
+msgstr "le distant doit être fourni lors de l'utilisation de --negotiate-only"
+
+#: builtin/fetch.c:2063
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "Le protocole ne prend pas en charge --negotiate-only, abandon."
+
+#: builtin/fetch.c:2082
 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"
+"extensions.partialclone"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2086
+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:2090
+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>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 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:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "alias pour --log (obsolète)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "texte"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "utiliser <texte> comme début de message"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "fichier d'où lire"
 
@@ -13361,83 +15645,99 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objet>]"
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+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 [<commit>]] [--no-contains [<commit>]]"
 
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
 msgstr "échapper les champs réservés pour les interpréteurs de commandes"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr "échapper les champs réservés pour perl"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr "échapper les champs réservés pour python"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr "échapper les champs réservés pour compatibilité avec Tcl"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "n'afficher que <n> références correspondant"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
 msgid "respect format colors"
 msgstr "respecter les couleurs de formatage"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "afficher seulement les références pointant sur l'objet"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "afficher seulement les références qui sont fusionnées"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
 msgstr "afficher seulement les références qui ne sont pas fusionnées"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
 msgstr "afficher seulement les références qui contiennent le commit"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
 msgstr "afficher seulement les références qui ne contiennent pas le commit"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<config> <arguments-de-commande>"
+
+#: builtin/for-each-repo.c:34
+msgid "config"
+msgstr "config"
+
+#: 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:43
+msgid "missing --config=<config>"
+msgstr "--config=<config> manquant"
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "inconnu"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "erreur dans l'objet %s %s : %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "avertissement dans l'objet %s %s : %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: 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:168
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "type d'objet inconnu dans le lien"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13446,241 +15746,241 @@ msgstr ""
 "lien cassé depuis %7s %s\n"
 "             vers %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "objet %s manquant %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "objet %s inatteignable %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "objet %s fantôme %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "impossible de créer le fichier lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "impossible de finir '%s'"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "Vérification de l'objet %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Vérification de la connectivité (%d objets)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Vérification de l'objet %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "liens cassés"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "racine %s"
 
-#: builtin/fsck.c:455
+#: 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:484
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s : objet corrompu ou manquant"
 
-#: builtin/fsck.c:509
+#: 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:523
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Vérification du journal de réferences %s-> %s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s : pointeur de sha1 invalide %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "l'objet %s n'est pas un commit"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:591
 msgid "notice: No default references"
-msgstr "Note : pas de référence par défaut"
+msgstr "note : pas de référence par défaut"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:606
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s : objet corrompu ou manquant : %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:619
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s : impossible d'analyser : %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:639
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "mauvais fichier de sha1 : %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:654
 msgid "Checking object directory"
 msgstr "Vérification du répertoire d'objet"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:657
 msgid "Checking object directories"
 msgstr "Vérification des répertoires d'objet"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:672
 #, c-format
 msgid "Checking %s link"
 msgstr "Vérification du lien %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:677 builtin/index-pack.c:864
 #, c-format
 msgid "invalid %s"
 msgstr "%s invalide"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:684
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s pointe sur quelque chose bizarre (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:690
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s : la HEAD détachée ne pointe sur rien"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:694
 #, 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:734
+#: builtin/fsck.c:706
 msgid "Checking cache tree"
 msgstr "Vérification de l'arbre cache"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:711
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s : pointer sha1 invalide dans l'arbre de cache"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:720
 msgid "non-tree in cache-tree"
 msgstr "non-arbre dans l'arbre de cache"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:751
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<options>] [<objet>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:757
 msgid "show unreachable objects"
 msgstr "afficher les objets inaccessibles"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:758
 msgid "show dangling objects"
 msgstr "afficher les objets en suspens"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:759
 msgid "report tags"
 msgstr "afficher les étiquettes"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:760
 msgid "report root nodes"
 msgstr "signaler les nœuds racines"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:761
 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:792
+#: builtin/fsck.c:762
 msgid "make reflogs head nodes (default)"
 msgstr "considérer les reflogs comme nœuds tête (par défaut)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:763
 msgid "also consider packs and alternate objects"
 msgstr "inspecter aussi les objets pack et alternatifs"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:764
 msgid "check only connectivity"
 msgstr "ne vérifier que la connectivité"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:765 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "activer une vérification plus strict"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:767
 msgid "write dangling objects in .git/lost-found"
 msgstr "écrire les objets en suspens dans .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:768 builtin/prune.c:134
 msgid "show progress"
 msgstr "afficher la progression"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:769
 msgid "show verbose names for reachable objects"
 msgstr "afficher les noms étendus pour les objets inaccessibles"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:828 builtin/index-pack.c:262
 msgid "Checking objects"
 msgstr "Vérification des objets"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:856
 #, c-format
 msgid "%s: object missing"
 msgstr "%s : objet manquant"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:867
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "paramètre invalide : sha-1 attendu, '%s' trouvé"
 
-#: builtin/gc.c:35
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<options>]"
 
-#: builtin/gc.c:90
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Échec du stat de %s : %s"
 
-#: builtin/gc.c:126
+#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "échec de l'analyse de '%s' valeur '%s'"
 
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "impossible de faire un stat de '%s'"
 
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: 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:491
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13696,56 +15996,56 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:539
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
 msgstr "éliminer les objets non référencés"
 
-#: builtin/gc.c:541
+#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr "être plus consciencieux (durée de traitement allongée)"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "activer le mode auto-gc"
 
-#: builtin/gc.c:545
+#: builtin/gc.c:557
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "forcer le lancement du ramasse-miettes même si un autre ramasse-miettes "
 "tourne déjà"
 
-#: builtin/gc.c:548
+#: builtin/gc.c:560
 msgid "repack all other packs except the largest pack"
 msgstr "recompacter tous les autres paquets excepté le plus gros paquet"
 
-#: builtin/gc.c:565
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "impossible d'analyser gc.logexpiry %s"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:587
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "impossible d'analyser la valeur d'expiration d'élagage %s"
 
-#: builtin/gc.c:596
+#: builtin/gc.c:607
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Compression automatique du dépôt en tâche de fond pour optimiser les "
 "performances.\n"
 
-#: builtin/gc.c:598
+#: builtin/gc.c:609
 #, 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:599
+#: builtin/gc.c:610
 #, 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:639
+#: builtin/gc.c:650
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13753,23 +16053,190 @@ 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:694
+#: 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/grep.c:29
+#: 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:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule n'est pas accepté"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "argument de --schedule non reconnu, '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "échec de l'écriture du graphe de commits"
+
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr "échec de la pré-récupération des distants"
+
+#: builtin/gc.c:1022
+msgid "failed to start 'git pack-objects' process"
+msgstr "impossible de démarrer le processus 'git pack-objects'"
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr "impossible de finir le processus 'git pack-objects'"
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr "échec de l'écriture de l'index de multi-paquet"
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr "échec de 'git multi-pack-index expire'"
+
+#: builtin/gc.c:1170
+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:1283
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "le fichier verrou '%s' existe, pas de maintenance"
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr "échec de la tâche '%s'"
+
+#: builtin/gc.c:1395
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' n'est pas une tâche valide"
+
+#: builtin/gc.c:1400
+#, 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
+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
+msgid "frequency"
+msgstr "fréquence"
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr "lancer les tâches selon une fréquence"
+
+#: builtin/gc.c:1420
+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
+msgid "task"
+msgstr "tâche"
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr "lancer une tâche spécifique"
+
+#: builtin/gc.c:1439
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "--auto et --schedule=<fréquence> sont mutuellement exclusifs"
+
+#: builtin/gc.c:1482
+msgid "failed to run 'git config'"
+msgstr "échec du lancement de 'git config'"
+
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "impossible d'étendre le chemin '%s'"
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr "échec de démarrage de launchctl"
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "échec de la création des répertoires pour '%s'"
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "échec de l'amorçage du service %s"
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
+msgstr "échec de création du fichier temporaire xml"
+
+#: builtin/gc.c:1835
+msgid "failed to start schtasks"
+msgstr "échec du démarrage de schtasks"
+
+#: builtin/gc.c:1879
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+"echec du lancement de 'crontab -l' ; votre système n'a pas l'air de fournir "
+"'cron'"
+
+#: builtin/gc.c:1896
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+"echec du lancement de 'crontab' ; votre système n'a pas l'air de fournir "
+"'cron'"
+
+#: builtin/gc.c:1900
+msgid "failed to open stdin of 'crontab'"
+msgstr "échec à l'ouverture de stdin de 'crontab'"
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr "'crontab' est mort"
+
+#: builtin/gc.c:1976
+msgid "another process is scheduling background maintenance"
+msgstr ""
+"un autre processus est en train de programmer une maintenance en tâche de "
+"fond"
+
+#: builtin/gc.c:2000
+msgid "failed to add repo to global config"
+msgstr "échec de l'ajout du dépôt à la config globale"
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <subcommand> [<options>]"
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "sous-commande invalide : %s"
+
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
 
-#: builtin/grep.c:225
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep : échec de création du fil: %s"
 
-#: builtin/grep.c:279
+#: builtin/grep.c:277
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "nombre de fils spécifié invalide (%d) pour %s"
@@ -13778,266 +16245,266 @@ msgstr "nombre de fils spécifié invalide (%d) pour %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: 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 "pas de support des fils, ignore %s"
 
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "impossible de lire l'arbre (%s)"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:658
 #, 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:716
+#: builtin/grep.c:738
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "l'option '%c' attend une valeur numérique"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:837
 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:817
+#: builtin/grep.c:839
 msgid "find in contents not managed by git"
 msgstr "rechercher dans les contenus non gérés par git"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:841
 msgid "search in both tracked and untracked files"
 msgstr "rechercher dans les fichiers suivis et non-suivis"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:843
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorer les fichiers spécifiés via '.gitignore'"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:845
 msgid "recursively search in each submodule"
 msgstr "rechercher récursivement dans chaque sous-module"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:848
 msgid "show non-matching lines"
 msgstr "afficher les lignes qui ne correspondent pas"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:850
 msgid "case insensitive matching"
 msgstr "correspondance insensible à la casse"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:852
 msgid "match patterns only at word boundaries"
 msgstr "rechercher les motifs aux séparateurs de mots"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:854
 msgid "process binary files as text"
 msgstr "traiter les fichiers binaires comme texte"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:856
 msgid "don't match patterns in binary files"
 msgstr "ne pas chercher les motifs dans les fichiers binaires"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:859
 msgid "process binary files with textconv filters"
 msgstr "traiter les fichiers binaires avec les filtres textconv"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:861
 msgid "search in subdirectories (default)"
 msgstr "rechercher dans les sous-répertoires (défaut)"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:863
 msgid "descend at most <depth> levels"
 msgstr "descendre au plus de <profondeur> dans l'arborescence"
 
-#: builtin/grep.c:845
+#: builtin/grep.c:867
 msgid "use extended POSIX regular expressions"
 msgstr "utiliser des expressions régulières étendues POSIX"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:870
 msgid "use basic POSIX regular expressions (default)"
 msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:873
 msgid "interpret patterns as fixed strings"
 msgstr "interpréter les motifs comme de chaînes fixes"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:876
 msgid "use Perl-compatible regular expressions"
 msgstr "utiliser des expressions régulières compatibles avec Perl"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:879
 msgid "show line numbers"
 msgstr "afficher les numéros de ligne"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:880
 msgid "show column number of first match"
 msgstr "afficher le numéro de colonne de la première correspondance"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:881
 msgid "don't show filenames"
 msgstr "ne pas pas afficher les noms de fichier"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:882
 msgid "show filenames"
 msgstr "afficher les noms de fichier"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:884
 msgid "show filenames relative to top directory"
 msgstr "afficher les noms de fichiers relativement au répertoire de base"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:886
 msgid "show only filenames instead of matching lines"
 msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:888
 msgid "synonym for --files-with-matches"
 msgstr "synonyme pour --files-with-matches"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:891
 msgid "show only the names of files without match"
 msgstr "n'afficher que les noms des fichiers sans correspondance"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:893
 msgid "print NUL after filenames"
 msgstr "imprimer une caractère NUL après le noms de fichier"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:896
 msgid "show only matching parts of a line"
 msgstr "n'afficher que les parties correspondantes d'une ligne"
 
-#: builtin/grep.c:876
+#: builtin/grep.c:898
 msgid "show the number of matches instead of matching lines"
 msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:899
 msgid "highlight matches"
 msgstr "mettre en évidence les correspondances"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:901
 msgid "print empty line between matches from different files"
 msgstr ""
 "imprimer une ligne vide entre les correspondances de fichiers différents"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:903
 msgid "show filename only once above matches from same file"
 msgstr ""
 "afficher le nom de fichier une fois au dessus des correspondances du même "
 "fichier"
 
-#: builtin/grep.c:884
+#: builtin/grep.c:906
 msgid "show <n> context lines before and after matches"
 msgstr "afficher <n> lignes de contexte avant et après les correspondances"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:909
 msgid "show <n> context lines before matches"
 msgstr "afficher <n> lignes de contexte avant les correspondances"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:911
 msgid "show <n> context lines after matches"
 msgstr "afficher <n> lignes de contexte après les correspondances"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:913
 msgid "use <n> worker threads"
 msgstr "utiliser <n> fils de travail"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:914
 msgid "shortcut for -C NUM"
 msgstr "raccourci pour -C NUM"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:917
 msgid "show a line with the function name before matches"
 msgstr ""
 "afficher une ligne avec le nom de la fonction avant les correspondances"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:919
 msgid "show the surrounding function"
 msgstr "afficher la fonction contenante"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:922
 msgid "read patterns from file"
 msgstr "lire les motifs depuis fichier"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:924
 msgid "match <pattern>"
 msgstr "rechercher <motif>"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:926
 msgid "combine patterns specified with -e"
 msgstr "combiner les motifs spécifiés par -e"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:938
 msgid "indicate hit with exit status without output"
 msgstr ""
 "indiquer des correspondances avec le code de sortie mais sans rien afficher"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:940
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "n'afficher que les correspondances de fichiers qui correspondent à tous les "
 "motifs"
 
-#: builtin/grep.c:920
-msgid "show parse tree for grep expression"
-msgstr "afficher l'arbre d'analyse pour le motif grep"
-
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "pager"
 msgstr "pagineur"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "show matching files in the pager"
 msgstr "afficher les fichiers correspondant dans le pagineur"
 
-#: builtin/grep.c:928
+#: builtin/grep.c:947
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
 
-#: builtin/grep.c:992
+#: builtin/grep.c:1013
 msgid "no pattern given"
 msgstr "aucun motif fourni"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1049
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 "--no-index ou --untracked ne peuvent pas être utilisés avec des révisions"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1057
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "impossible de résoudre la révision : %s"
 
-#: builtin/grep.c:1067
+#: builtin/grep.c:1087
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked non supportée avec --recurse-submodules"
+
+#: builtin/grep.c:1091
 msgid "invalid option combination, ignoring --threads"
 msgstr "option de combinaison invalide, ignore --threads"
 
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
 msgid "no threads support, ignoring --threads"
 msgstr "pas de support des fils, ignore --threads"
 
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "nombre de fils spécifié invalide (%d)"
 
-#: builtin/grep.c:1096
+#: builtin/grep.c:1131
 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:1119
-msgid "option not supported with --recurse-submodules"
-msgstr "option non supportée avec --recurse-submodules"
-
-#: builtin/grep.c:1125
+#: builtin/grep.c:1157
 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:1131
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked ne peut pas être utilisé avec --cached"
+
+#: builtin/grep.c:1166
 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:1139
+#: builtin/grep.c:1174
 msgid "both --cached and trees are given"
 msgstr "--cached et des arbres sont fournis en même temps"
 
@@ -14080,66 +16547,66 @@ msgstr ""
 msgid "process file as it were from this path"
 msgstr "traiter le fichier comme s'il venait de ce chemin"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "afficher toutes les commandes disponibles"
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "exclure les guides"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr "afficher une liste de guides utiles"
 
-#: builtin/help.c:49
+#: builtin/help.c:50
 msgid "print all configuration variable names"
 msgstr "afficher tous les noms de variables de configuration"
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr "afficher la page de manuel"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr "afficher le manuel dans un navigateur web"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "afficher la page info"
 
-#: builtin/help.c:56
+#: builtin/help.c:57
 msgid "print command description"
 msgstr "afficher la description de la commande"
 
-#: builtin/help.c:61
+#: 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:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "format d'aide non reconnu '%s'"
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
-msgstr "échec de démarrage d'emacsclient."
+msgstr "Échec de démarrage d'emacsclient."
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
-msgstr "échec d'analyse de la version d'emacsclient."
+msgstr "Échec d'analyse de la version d'emacsclient."
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "échec de l'exécution de '%s'"
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -14148,7 +16615,7 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -14157,397 +16624,425 @@ msgstr ""
 "'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
 "Veuillez utiliser plutôt 'man.<outil>.cmd'."
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s' : visualiseur de manuel inconnu."
 
-#: builtin/help.c:367
+#: builtin/help.c:452
 msgid "no man viewer handled the request"
 msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
 
-#: builtin/help.c:375
+#: builtin/help.c:459
 msgid "no info viewer handled the request"
 msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
 
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' est un alias de '%s'"
 
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:531 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
-msgstr "Mauvais chaîne alias.%s : %s"
+msgstr "mauvais chaîne alias.%s : %s"
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:561 builtin/help.c:591
 #, c-format
 msgid "usage: %s%s"
 msgstr "usage : %s%s"
 
-#: builtin/help.c:491
+#: builtin/help.c:575
 msgid "'git help config' for more information"
 msgstr "'git help config' pour plus d'information"
 
-#: builtin/index-pack.c:185
+#: builtin/index-pack.c:222
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "type d'objet non correspondant à %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:242
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "objet attendu non reçu %s"
 
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:245
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "objet %s : type attendu %s, reçu %s"
 
-#: builtin/index-pack.c:258
+#: builtin/index-pack.c:295
 #, 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:268
+#: builtin/index-pack.c:305
 msgid "early EOF"
 msgstr "fin de fichier prématurée"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:306
 msgid "read error on input"
 msgstr "erreur de lecture sur l'entrée"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:318
 msgid "used more bytes than were available"
 msgstr "plus d'octets utilisés que disponibles"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:325 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:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "le paquet dépasse la taille maximale permise"
 
-#: builtin/index-pack.c:312
+#: 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:326
+#: builtin/index-pack.c:363
 msgid "pack signature mismatch"
 msgstr "la signature du paquet ne correspond pas"
 
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:365
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "la version de paquet %<PRIu32> non supportée"
 
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:381
 #, 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:466
+#: builtin/index-pack.c:487
 #, c-format
 msgid "inflate returned %d"
 msgstr "la décompression (inflate) a retourné %d"
 
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:536
 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:523
+#: builtin/index-pack.c:544
 msgid "delta base offset is out of bound"
 msgstr "l'objet delta de base est hors limite"
 
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:552
 #, c-format
 msgid "unknown object type %d"
 msgstr "type d'objet inconnu %d"
 
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:583
 msgid "cannot pread pack file"
 msgstr "impossible de lire (pread) le fichier paquet"
 
-#: builtin/index-pack.c:564
+#: 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] "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:590
+#: builtin/index-pack.c:611
 msgid "serious inflate inconsistency"
 msgstr "grave incohérence dans la décompression (inflate)"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: 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 "COLLISION SHA1 TROUVÉE AVEC %s !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: 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 "impossible de lire %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "impossible de lire l'information existante de l'objet %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:831
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "impossible de lire l'objet existant %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:845
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objet blob invalide %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
 msgid "fsck error in packed object"
 msgstr "erreur de fsck dans l'objet empaqueté"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:869
 #, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
 msgid "failed to apply delta"
 msgstr "échec d'application du delta"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Receiving objects"
 msgstr "Réception d'objets"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Indexing objects"
 msgstr "Indexation d'objets"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1194
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1199
 msgid "cannot fstat packfile"
 msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1202
 msgid "pack has junk at the end"
 msgstr "le paquet est invalide à la fin"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1214
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusion extrême dans parse_pack_objects()"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1237
 msgid "Resolving deltas"
 msgstr "Résolution des deltas"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "impossible de créer le fil : %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1281
 msgid "confusion beyond insanity"
 msgstr "confusion extrême"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1287
 #, 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:1264
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 "Somme de contrôle de fin inattendue pour %s (corruption sur le disque ?)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1303
 #, 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:1292
+#: builtin/index-pack.c:1327
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "impossible de compresser l'objet ajouté (%d)"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'objet local %s est corrompu"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1444
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
+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:1427
+#: builtin/index-pack.c:1468
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "impossible d'écrire le fichier %s '%s'"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1476
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "impossible de fermer le fichier %s écrit '%s'"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1502
 msgid "error while closing pack file"
 msgstr "erreur en fermeture du fichier paquet"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1516
 msgid "cannot store pack file"
 msgstr "impossible de stocker le fichier paquet"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1524
 msgid "cannot store index file"
 msgstr "impossible de stocker le fichier d'index"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "mauvais pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1649
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1651
 #, 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:1643
+#: builtin/index-pack.c:1699
 #, 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:1650
+#: builtin/index-pack.c:1706
 #, 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:1689
+#: builtin/index-pack.c:1748
 msgid "Cannot come back to cwd"
 msgstr "Impossible de revenir au répertoire de travail courant"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: 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 "mauvais %s"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1831 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:1850
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1852
 msgid "--stdin requires a git repository"
 msgstr "--stdin requiert un dépôt git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format ne peut pas être utilisé avec --stdin"
+
+#: builtin/index-pack.c:1869
 msgid "--verify with no packfile name given"
 msgstr "--verify sans nom de fichier paquet donné"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "erreur de fsck dans les objets paquets"
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "impossible de faire un stat du modèle '%s'"
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "impossible d'ouvrir le répertoire '%s'"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "impossible de lire le lien '%s'"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "impossible de créer un lien symbolique de '%s' '%s'"
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "impossible de copier '%s' vers '%s'"
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "modèle %s ignoré"
 
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "modèles non trouvés dans %s"
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "pas de copie des modèles depuis '%s' : %s"
 
-#: builtin/init-db.c:334
+#: builtin/init-db.c:263
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nom de branche initiale invalide : '%s'"
+
+#: 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:337
+#: 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:354 builtin/init-db.c:357
+#: 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:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s existe déjà"
 
-#: builtin/init-db.c:413
+#: 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: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:414
+#: 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:418
+#: 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:419
+#: 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:468
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -14555,25 +17050,41 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<répertoire-modèle>] [--"
 "shared[=<permissions>]] [<répertoire>]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "permissions"
 
-#: builtin/init-db.c:492
+#: 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:529 builtin/init-db.c:534
+#: 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:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "empreinte"
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir et --bare sont mutuellement exclusifs"
+
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "impossible de créer le répertoire (mkdir) %s"
 
-#: builtin/init-db.c:538
+#: 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:559
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -14582,11 +17093,15 @@ msgstr ""
 "%s (ou --work-tree=<répertoire>) n'est pas autorisé sans spécifier %s (ou --"
 "git-dir=<répertoire>)"
 
-#: builtin/init-db.c:587
+#: 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: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 "
@@ -14635,10 +17150,6 @@ msgstr "paramètres d'analyse"
 msgid "do not treat --- specially"
 msgstr "ne pas traiter spécialement ---"
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "ligne de fin"
-
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "ligne(s) de fin à ajouter"
@@ -14651,123 +17162,131 @@ msgstr "--trailer n'a aucune signification avec --only-input"
 msgid "no input file given for in-place editing"
 msgstr "aucun fichier en entrée pour l'éditon sur place"
 
-#: builtin/log.c:55
+#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [<options>] <objet>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "option --decorate invalide : %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:180
 msgid "show source"
 msgstr "afficher la source"
 
-#: builtin/log.c:174
-msgid "Use mail map file"
-msgstr "Utiliser le fichier de correspondance de mail"
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "utiliser le fichier de correspondance de mail"
 
-#: builtin/log.c:176
+#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr "décorer seulement les références correspondant à <motif>"
 
-#: builtin/log.c:178
+#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr "ne pas décorer les références correspondant à <motif>"
 
-#: builtin/log.c:179
+#: builtin/log.c:187
 msgid "decorate options"
 msgstr "décorer les options"
 
-#: builtin/log.c:182
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
 msgstr ""
-"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
-"compte à 1"
+"tracer l'évolution d'une plage <début>,<fin> ou d'une fonction <nom-de-"
+"fonction> dans <fichier>"
 
-#: builtin/log.c:280
+#: 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"
+
+#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Sortie finale : %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s : fichier incorrect"
 
-#: builtin/log.c:549 builtin/log.c:644
+#: builtin/log.c:586 builtin/log.c:676
 #, c-format
 msgid "could not read object %s"
 msgstr "impossible de lire l'objet %s"
 
-#: builtin/log.c:669
+#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr "type inconnu : %d"
 
-#: builtin/log.c:792
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s : couverture invalide pour le mode de description"
+
+#: builtin/log.c:853
 msgid "format.headers without value"
 msgstr "format.headers sans valeur"
 
-#: builtin/log.c:909
-msgid "name of output directory is too long"
-msgstr "le nom du répertoire de sortie est trop long"
-
-#: builtin/log.c:925
+#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "impossible d'ouvrir le fichier correctif %s"
 
-#: builtin/log.c:942
+#: builtin/log.c:999
 msgid "need exactly one range"
 msgstr "exactement une plage nécessaire"
 
-#: builtin/log.c:952
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr "ceci n'est pas une plage"
 
-#: builtin/log.c:1075
+#: builtin/log.c:1173
 msgid "cover letter needs email format"
 msgstr "la lettre de motivation doit être au format courriel"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
 msgstr "échec de création du fichier de lettre de motivation"
 
-#: builtin/log.c:1160
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to aberrant : %s"
 
-#: builtin/log.c:1187
+#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
 
-#: builtin/log.c:1245
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "deux répertoires de sortie ?"
 
-#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
 #, c-format
 msgid "unknown commit %s"
 msgstr "commit inconnu %s"
 
-#: builtin/log.c:1366 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 "échec à résoudre '%s' comme une référence valide"
 
-#: builtin/log.c:1371
+#: builtin/log.c:1522
 msgid "could not find exact merge base"
 msgstr "impossible de trouver la base de fusion exacte"
 
-#: builtin/log.c:1375
+#: 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"
@@ -14780,275 +17299,301 @@ msgstr ""
 "Ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
 "manuellement"
 
-#: builtin/log.c:1395
+#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr "échec à trouver la base de fusion exacte"
 
-#: builtin/log.c:1406
+#: builtin/log.c:1572
 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:1410
+#: builtin/log.c:1582
 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:1463
+#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr "impossible d'obtenir l'id du patch"
 
-#: builtin/log.c:1515
-msgid "failed to infer range-diff ranges"
-msgstr "échec d'inférence d'intervalles de différence d'intervalles"
+#: builtin/log.c:1703
+msgid "failed to infer range-diff origin of current series"
+msgstr ""
+"échec d'inférence de l'origine de différence d'intervalles de la série "
+"actuelle"
 
-#: builtin/log.c:1560
+#: builtin/log.c:1705
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr ""
+"utilisation de '%s' comme une différence d'intervalle pour la série actuelle"
+
+#: builtin/log.c:1749
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "utiliser [PATCH n/m] même avec un patch unique"
 
-#: builtin/log.c:1563
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr "utiliser [PATCH] même avec des patchs multiples"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "afficher les patchs sur la sortie standard"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr "générer une lettre de motivation"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1760
 msgid "use simple number sequence for output file names"
 msgstr ""
 "utiliser une séquence simple de nombres pour les nom des fichiers de sortie"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1573
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr "utiliser <sfx> au lieu de '.patch'"
 
-#: builtin/log.c:1575
+#: builtin/log.c:1764
 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:1577
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "reroll-count"
+
+#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr "marquer la série comme une Nième réédition"
 
-#: builtin/log.c:1579
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/log.c:1768
+msgid "max length of output filename"
+msgstr "taille maximum du nom du fichier de sortie"
+
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
 
-#: builtin/log.c:1582
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr "cover-from-description-mode"
+
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"générer des parties de la lettre d'introduction à partir de la description "
+"de la branche"
+
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
 msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "stocker les fichiers résultats dans <répertoire>"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr "ne pas retirer/ajouter [PATCH]"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1785
 msgid "don't output binary diffs"
 msgstr "ne pas imprimer les diffs binaires"
 
-#: builtin/log.c:1593
+#: builtin/log.c:1787
 msgid "output all-zero hash in From header"
 msgstr "écrire une empreinte à zéro dans l'entête From"
 
-#: builtin/log.c:1595
+#: builtin/log.c:1789
 msgid "don't include a patch matching a commit upstream"
 msgstr "ne pas inclure un patch correspondant à un commit amont"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1791
 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:1599
+#: builtin/log.c:1793
 msgid "Messaging"
 msgstr "Communication"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1794
 msgid "header"
 msgstr "en-tête"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "ajouter l'en-tête de courriel"
 
-#: builtin/log.c:1602 builtin/log.c:1604
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "courriel"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "ajouter l'en-tête \"To:\""
 
-#: builtin/log.c:1604
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "ajouter l'en-tête \"Cc:\""
 
-#: builtin/log.c:1606
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1799
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "renseigner l'adresse From à <ident> (ou à l'ident du validateur si absent)"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "id-message"
 
-#: builtin/log.c:1610
+#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr "répondre dans le premier message à <id-message>"
 
-#: builtin/log.c:1611 builtin/log.c:1614
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1612
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "attacher le patch"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "patch à l'intérieur"
 
-#: builtin/log.c:1619
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "signature"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "ajouter une signature"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "commit-de-base"
 
-#: builtin/log.c:1624
+#: builtin/log.c:1816
 msgid "add prerequisite tree info to the patch series"
-msgstr "Ajouter un arbre prérequis à la série de patchs"
+msgstr "ajouter un arbre prérequis à la série de patchs"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "ajouter une signature depuis un fichier"
 
-#: builtin/log.c:1627
+#: builtin/log.c:1820
 msgid "don't print the patch filenames"
 msgstr "ne pas afficher les noms de fichiers des patchs"
 
-#: builtin/log.c:1629
+#: builtin/log.c:1822
 msgid "show progress while generating patches"
 msgstr ""
 "afficher la barre de progression durant la phase de génération des patchs"
 
-#: builtin/log.c:1631
+#: builtin/log.c:1824
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "afficher les modifications par rapport à <rév> dans la première page ou une "
 "rustine"
 
-#: builtin/log.c:1634
+#: builtin/log.c:1827
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "afficher les modifications par rapport à <refspec> dans la première page ou "
 "une rustine"
 
-#: builtin/log.c:1636
+#: builtin/log.c:1829 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:1711
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ligne d'identification invalide : %s"
 
-#: builtin/log.c:1726
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
 msgstr "-n et -k sont mutuellement exclusifs"
 
-#: builtin/log.c:1728
+#: builtin/log.c:1933
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
 msgstr "--name-only n'a pas de sens"
 
-#: builtin/log.c:1738
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
 msgstr "--name-status n'a pas de sens"
 
-#: builtin/log.c:1740
+#: builtin/log.c:1945
 msgid "--check does not make sense"
 msgstr "--check n'a pas de sens"
 
-#: builtin/log.c:1773
-msgid "standard output, or directory, which one?"
-msgstr "sortie standard, ou répertoire, lequel ?"
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout, --output, et --output-directory sont mutuellement exclusifs"
 
-#: builtin/log.c:1877
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff requiert --cover-letter ou une rustine unique"
 
-#: builtin/log.c:1881
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr "Interdiff :"
 
-#: builtin/log.c:1882
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff contre v%d :"
 
-#: builtin/log.c:1888
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor requiert --range-diff"
 
-#: builtin/log.c:1892
+#: builtin/log.c:2104
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff requiert --cover-letter ou une rustine unique"
 
-#: builtin/log.c:1900
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr "Diff-intervalle :"
 
-#: builtin/log.c:1901
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Diff-intervalle contre v%d :"
 
-#: builtin/log.c:1912
+#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "lecture du fichier de signature '%s' impossible"
 
-#: builtin/log.c:1948
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "Génération des patchs"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2204
 msgid "failed to create output files"
 msgstr "échec de création des fichiers en sortie"
 
-#: builtin/log.c:2051
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15056,113 +17601,117 @@ msgstr ""
 "Impossible de trouver une branche distante suivie, merci de spécifier "
 "<branche_amont> manuellement.\n"
 
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<options>] [<fichier>...]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:619
 msgid "identify the file status with tags"
 msgstr "identifier l'état de fichier avec les étiquettes"
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:621
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'"
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:623
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:625
 msgid "show cached files in the output (default)"
 msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:627
 msgid "show deleted files in the output"
 msgstr "afficher les fichiers supprimés dans la sortie"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:629
 msgid "show modified files in the output"
 msgstr "afficher les fichiers modifiés dans la sortie"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:631
 msgid "show other files in the output"
 msgstr "afficher les autres fichiers dans la sortie"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:633
 msgid "show ignored files in the output"
 msgstr "afficher les fichiers ignorés dans la sortie"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:636
 msgid "show staged contents' object name in the output"
 msgstr "afficher les nom des objets indexés dans la sortie"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:638
 msgid "show files on the filesystem that need to be removed"
 msgstr ""
 "afficher les fichiers du système de fichiers qui ont besoin d'être supprimés"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:640
 msgid "show 'other' directories' names only"
 msgstr "afficher seulement les noms des répertoires 'other'"
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:642
 msgid "show line endings of files"
 msgstr "afficher les fins de lignes des fichiers"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:644
 msgid "don't show empty directories"
 msgstr "ne pas afficher les répertoires vides"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:647
 msgid "show unmerged files in the output"
 msgstr "afficher les fichiers non fusionnés dans la sortie"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr "afficher l'information resolv-undo"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:651
 msgid "skip files matching pattern"
 msgstr "sauter les fichiers correspondant au motif"
 
-#: builtin/ls-files.c:561
+#: 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:564
+#: builtin/ls-files.c:657
 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:566
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
 msgstr "ajouter les exclusions git standard"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:663
 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:573
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:668
 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:576
+#: builtin/ls-files.c:669
 msgid "tree-ish"
 msgstr "arbre ou apparenté"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:670
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "considérer que les chemins supprimés depuis <arbre ou apparenté> sont "
 "toujours présents"
 
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr "afficher les données de débogage"
 
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+msgstr "supprimer les entrées dupliquées"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -15173,41 +17722,41 @@ msgstr ""
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<dépôt> [<références>...]]"
 
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "ne pas afficher les URL distantes"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
 msgid "exec"
 msgstr "exécutable"
 
-#: 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 "chemin vers git-upload-pack sur le serveur distant"
 
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "limiter aux étiquettes"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "limiter aux heads"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "ne pas afficher les étiquettes pelées"
 
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "prendre en compte url.<base>.insteadOf"
 
-#: builtin/ls-remote.c:72
+#: 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"
 
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "afficher la réf sous-jacente en plus de l'objet pointé par elle"
 
@@ -15249,199 +17798,351 @@ 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 mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<options>] <msg> <rustine> < mail >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "garder le sujet"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr "conserver les crochets autres que ceux autour de PATCH dans le sujet"
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr "copier le Message-ID à la fin du message de validation"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "ré-encoder les méta-données en i18n.commitEncoding"
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr "désactiver le ré-encodage de jeu de caractère des méta-données"
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr "jeu de caractère"
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr "ré-encoder les méta-données dans ce jeu de caractère"
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr "utiliser les ciseaux"
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr "<action>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "action lorsqu'un CR cité est trouvé"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "utiliser l'entête dans le corps de message"
+
 #: builtin/mailsplit.c:241
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox vide : '%s'"
 
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<options>] [<commit>...]"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <commit> <commit>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <commit>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <validation>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <validation> <validation>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <référence> [<validation>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "afficher tous les ancêtres communs"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "trouver les ancêtres pour une fusion simple à n points"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "afficher les révisions inaccessibles depuis les autres"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "est le premier ancêtre de l'autre ?"
+
+#: builtin/merge-base.c:151
+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>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "envoyer les résultats sur la sortie standard"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "utiliser une fusion basée sur diff3"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "pour les conflits, utiliser notre version (our)"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "pour les conflits, utiliser leur version (their)"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "pour les conflits, utiliser l'ensemble des versions"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "pour les conflits, utiliser cette taille de marqueur"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "ne pas avertir à propos des conflits"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "option inconnue %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "impossible d'analyser l'objet '%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] "impossible de gérer plus de %d base. %s ignoré."
+msgstr[1] "impossible de gérer plus de %d bases. %s ignoré."
+
+#: builtin/merge-recursive.c:65
+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-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "impossible de résoudre la référence '%s'"
 
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Fusion de %s avec %s\n"
 
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<options>] [<commit>...]"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
 msgstr "le commutateur `m' a besoin d'une valeur"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:146
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "le commutateur '%s' a besoin d'une valeur"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:199
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr "Les stratégies disponibles sont :"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:205
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Les stratégies personnalisées sont :"
 
-#: builtin/merge.c:244 builtin/pull.c:152
+#: builtin/merge.c:256 builtin/pull.c:133
 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:247 builtin/pull.c:155
+#: builtin/merge.c:259 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr "afficher un diffstat à la fin de la fusion"
 
-#: builtin/merge.c:248 builtin/pull.c:158
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(synonyme de --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:262 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "ajouter (au plus <n>) éléments du journal court au message de validation de "
 "la fusion"
 
-#: builtin/merge.c:253 builtin/pull.c:167
+#: builtin/merge.c:265 builtin/pull.c:148
 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:255 builtin/pull.c:170
+#: builtin/merge.c:267 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "effectuer une validation si la fusion réussit (défaut)"
 
-#: builtin/merge.c:257 builtin/pull.c:173
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "éditer le message avant la validation"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
 msgstr "autoriser l'avance rapide (défaut)"
 
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:273 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "abandonner si l'avance rapide n'est pas possible"
 
-#: builtin/merge.c:265 builtin/pull.c:183
+#: builtin/merge.c:277 builtin/pull.c:164
 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:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:493 builtin/rebase.c:1501 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 "stratégie"
 
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "stratégie de fusion à utiliser"
 
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr "option=valeur"
 
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "option pour la stratégie de fusion sélectionnée"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:283
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 "message de validation de la fusion (pour une fusion sans avance rapide)"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:290
 msgid "abort the current in-progress merge"
 msgstr "abandonner la fusion en cours"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:292
 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:282
+#: builtin/merge.c:294
 msgid "continue the current in-progress merge"
 msgstr "continuer la fusion en cours"
 
-#: builtin/merge.c:284 builtin/pull.c:199
+#: builtin/merge.c:296 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "permettre la fusion d'historiques sans rapport"
 
-#: builtin/merge.c:290
+#: builtin/merge.c:303
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "ne pas utiliser les crochets pre-merge-commit et commit-msg"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:320
 msgid "could not run stash."
 msgstr "impossible de lancer le remisage."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:325
 msgid "stash failed"
 msgstr "échec du remisage"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:330
 #, c-format
 msgid "not a valid object: %s"
 msgstr "pas un objet valide : %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr "read-tree a échoué"
 
-#: builtin/merge.c:386
-msgid " (nothing to squash)"
-msgstr " (rien à compresser)"
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
+msgstr "Déjà à jour. (rien à compresser)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Validation compressée -- HEAD non mise à jour\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:464
 #, 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:498
+#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' ne pointe pas sur un commit"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
 
-#: builtin/merge.c:705
+#: builtin/merge.c:729
 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:719
+#: builtin/merge.c:742
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Options inconnue pour merge-recursive : -X%s"
 
-#: builtin/merge.c:734
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "impossible d'écrire %s"
 
-#: builtin/merge.c:786
+#: builtin/merge.c:813
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Impossible de lire depuis '%s'"
 
-#: builtin/merge.c:795
+#: builtin/merge.c:822
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Pas de validation de la fusion ; utilisez 'git commit' pour terminer la "
 "fusion.\n"
 
-#: builtin/merge.c:801
+#: 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"
@@ -15453,11 +18154,11 @@ msgstr ""
 "branche de sujet.\n"
 "\n"
 
-#: builtin/merge.c:806
+#: builtin/merge.c:833
 msgid "An empty message aborts the commit.\n"
 msgstr "Un message vide abandonne la validation.\n"
 
-#: builtin/merge.c:809
+#: builtin/merge.c:836
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -15466,74 +18167,74 @@ msgstr ""
 "Les lignes commençant par '%c' seront ignorées, et un message vide\n"
 "abandonne la validation.\n"
 
-#: builtin/merge.c:862
+#: builtin/merge.c:889
 msgid "Empty commit message."
 msgstr "Message de validation vide."
 
-#: builtin/merge.c:877
+#: builtin/merge.c:904
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Merveilleux.\n"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:965
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "La fusion automatique a échoué ; réglez les conflits et validez le "
 "résultat.\n"
 
-#: builtin/merge.c:977
+#: builtin/merge.c:1004
 msgid "No current branch."
 msgstr "Pas de branche courante."
 
-#: builtin/merge.c:979
+#: builtin/merge.c:1006
 msgid "No remote for the current branch."
 msgstr "Pas de branche distante pour la branche courante."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:1008
 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:986
+#: builtin/merge.c:1013
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Pas de branche de suivi pour %s depuis %s"
 
-#: builtin/merge.c:1043
+#: builtin/merge.c:1070
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1173
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "pas possible de fusionner ceci dans %s : %s"
 
-#: builtin/merge.c:1180
+#: builtin/merge.c:1207
 msgid "not something we can merge"
 msgstr "pas possible de fusionner ceci"
 
-#: builtin/merge.c:1283
+#: builtin/merge.c:1317
 msgid "--abort expects no arguments"
 msgstr "--abort n'accepte pas d'argument"
 
-#: builtin/merge.c:1287
+#: builtin/merge.c:1321
 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:1296
+#: builtin/merge.c:1339
 msgid "--quit expects no arguments"
 msgstr "--quit n'accepte pas d'argument"
 
-#: builtin/merge.c:1309
+#: builtin/merge.c:1352
 msgid "--continue expects no arguments"
 msgstr "--continue ne supporte aucun argument"
 
-#: builtin/merge.c:1313
+#: builtin/merge.c:1356
 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:1329
+#: builtin/merge.c:1372
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15541,7 +18242,7 @@ msgstr ""
 "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1336
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15549,213 +18250,135 @@ msgstr ""
 "Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
 "Veuillez valider vos modifications avant de pouvoir fusionner."
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1382
 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:1353
+#: builtin/merge.c:1396
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1398
 msgid "You cannot combine --squash with --commit."
 msgstr "Vous ne pouvez pas combiner --squash avec --commit."
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1414
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 "Pas de validation spécifiée et merge.defaultToUpstream n'est pas défini."
 
-#: builtin/merge.c:1388
+#: builtin/merge.c:1431
 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:1390
+#: builtin/merge.c:1433
 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:1395
+#: builtin/merge.c:1438
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - pas possible de fusionner ceci"
 
-#: builtin/merge.c:1397
+#: builtin/merge.c:1440
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 "Possible de fusionner exactement une seule validation dans une tête vide"
 
-#: builtin/merge.c:1476
+#: builtin/merge.c:1521
 msgid "refusing to merge unrelated histories"
 msgstr "refus de fusionner des historiques sans relation"
 
-#: builtin/merge.c:1485
-msgid "Already up to date."
-msgstr "Déjà à jour."
-
-#: builtin/merge.c:1495
+#: builtin/merge.c:1540
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Mise à jour %s..%s\n"
 
-#: builtin/merge.c:1537
+#: builtin/merge.c:1587
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Essai de fusion vraiment triviale dans l'index...\n"
 
-#: builtin/merge.c:1544
+#: builtin/merge.c:1594
 #, c-format
 msgid "Nope.\n"
 msgstr "Non.\n"
 
-#: builtin/merge.c:1569
-msgid "Already up to date. Yeeah!"
-msgstr "Déjà à jour. Ouais !"
-
-#: builtin/merge.c:1575
+#: builtin/merge.c:1625
 msgid "Not possible to fast-forward, aborting."
 msgstr "Pas possible d'avancer rapidement, abandon."
 
-#: builtin/merge.c:1598 builtin/merge.c:1663
+#: builtin/merge.c:1653 builtin/merge.c:1719
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Retour de l'arbre à l'original...\n"
 
-#: builtin/merge.c:1602
+#: builtin/merge.c:1657
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Essai de la stratégie de fusion %s...\n"
 
-#: builtin/merge.c:1654
+#: builtin/merge.c:1709
 #, 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:1656
+#: builtin/merge.c:1711
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "La fusion avec la stratégie %s a échoué.\n"
 
-#: builtin/merge.c:1665
+#: builtin/merge.c:1721
 #, 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:1677
+#: builtin/merge.c:1735
 #, 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"
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <commit> <commit>..."
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <commit>..."
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <validation>..."
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <validation> <validation>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <référence> [<validation>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "afficher tous les ancêtres communs"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "trouver les ancêtres pour une fusion simple à n points"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "afficher les révisions inaccessibles depuis les autres"
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
 
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "est le premier ancêtre de l'autre ?"
-
-#: builtin/merge-base.c:161
-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>"
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr "envoyer les résultats sur la sortie standard"
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "utiliser une fusion basée sur diff3"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "pour les conflits, utiliser notre version (our)"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "pour les conflits, utiliser leur version (their)"
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr "pour les conflits, utiliser l'ensemble des versions"
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr "pour les conflits, utiliser cette taille de marqueur"
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "ne pas avertir à propos des conflits"
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "attention : l'entrée d'étiquette ne passe pas fsck : %s"
 
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "définir les labels pour fichier1/fichier-orig/fichier2"
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "erreur : l'entrée d'étiquette ne passe pas fsck : %s"
 
-#: builtin/merge-recursive.c:47
+#: builtin/mktag.c:41
 #, c-format
-msgid "unknown option %s"
-msgstr "option inconnue %s"
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) ne devrait jamais rappeler cette fonction"
 
-#: builtin/merge-recursive.c:53
+#: builtin/mktag.c:56
 #, c-format
-msgid "could not parse object '%s'"
-msgstr "Impossible d'analyser l'objet '%s'"
+msgid "could not read tagged object '%s'"
+msgstr "impossible de lire l'objet étiqueté '%s'"
 
-#: builtin/merge-recursive.c:57
+#: builtin/mktag.c:59
 #, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "impossible de gérer plus de %d base. %s ignoré."
-msgstr[1] "impossible de gérer plus de %d bases. %s ignoré."
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "l'objet '%s' étiqueté comme '%s', mais est de type '%s'"
 
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr "impossible de gérer autre chose que la fusion de deux têtes."
+#: builtin/mktag.c:97
+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/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "impossible de résoudre la référence '%s'"
+#: builtin/mktag.c:100
+msgid "tag on stdin did not refer to a valid object"
+msgstr "l'étiquette sur stdin ne pointe pas sur un objet valide"
 
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "Fusion de %s avec %s\n"
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "impossible d'écrire le fichier d'étiquettes"
 
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
@@ -15773,21 +18396,37 @@ msgstr "autoriser les objets manquants"
 msgid "allow creation of more than one tree"
 msgstr "autoriser la création de plus d'un arbre"
 
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
-msgstr ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<taille>)"
+#: builtin/multi-pack-index.c:10
+msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgstr "git multi-pack-index [<options>] write [--preferred-pack=<paquet>]"
+
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<options>] verify"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:16
+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>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [<options>] repack [--batch-size=<taille>]"
+
+#: builtin/multi-pack-index.c:54
 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"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr "paquet-préféré"
+
+#: builtin/multi-pack-index.c:70
+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"
@@ -15795,15 +18434,7 @@ 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:43 builtin/prune-packed.c:67
-msgid "too many arguments"
-msgstr "trop d'arguments"
-
-#: builtin/multi-pack-index.c:52
-msgid "--batch-size option is only for 'repack' subcommand"
-msgstr "l'option --batch-size ne sert que pour la sous-commande 'repack'"
-
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:179
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "sous-commande non reconnue : %s"
@@ -15836,114 +18467,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:169
+#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "la destination '%s' n'est pas un répertoire"
 
-#: builtin/mv.c:180
+#: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Vérification du renommage de '%s' en '%s'\n"
 
-#: builtin/mv.c:184
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr "mauvaise source"
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 msgid "can not move directory into itself"
 msgstr "impossible de déplacer un répertoire dans lui-même"
 
-#: builtin/mv.c:190
+#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr "impossible de déplacer un répertoire sur un fichier"
 
-#: builtin/mv.c:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr "le répertoire source est vide"
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 msgid "not under version control"
 msgstr "pas sous le contrôle de version"
 
 #: builtin/mv.c:227
+msgid "conflicted"
+msgstr "en conflit"
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "la destination existe"
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "écrasement de '%s'"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "Impossible d'écraser"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr "multiples sources pour la même destination"
 
-#: builtin/mv.c:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "le répertoire de destination n'existe pas"
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, source=%s, destination=%s"
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Renommage de %s en %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "le renommage de '%s' a échoué"
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<options>] <validation>..."
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<options>] --all"
 
-#: builtin/name-rev.c:358
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<options>] --stdin"
 
-#: builtin/name-rev.c:415
-msgid "print only names (no SHA-1)"
-msgstr "afficher seulement les noms (pas de SHA-1)"
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr ""
+"afficher seulement les noms basés sur des références (pas de nom d'objet)"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "utiliser seulement les étiquettes pour nommer les validations"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "utiliser seulement les références correspondant à <motif>"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignorer les références correspondant à <motif>"
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr ""
 "afficher toutes les validations accessibles depuis toutes les références"
 
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "lire depuis l'entrée standard"
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "autoriser l'affichage des noms `non définis` (par défaut)"
 
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "déréférencer les étiquettes en entrée (usage interne)"
 
@@ -16090,7 +18726,7 @@ msgstr "impossible d'écrire l'objet note"
 msgid "the note contents have been left in %s"
 msgstr "le contenu de la note a été laissé dans %s"
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:576
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "impossible d'ouvrir ou lire '%s'"
@@ -16128,13 +18764,14 @@ msgstr "impossible de copier les notes de '%s' vers '%s'"
 #: builtin/notes.c:356
 #, 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/)"
+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
-msgid "too many parameters"
-msgstr "trop de paramètres"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
+msgstr "trop d'arguments"
 
 #: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
@@ -16194,8 +18831,8 @@ msgstr ""
 "charger la configuration de réécriture pour <commande> (implique --stdin)"
 
 #: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "pas assez de paramètres"
+msgid "too few arguments"
+msgstr "trop peu d'arguments"
 
 #: builtin/notes.c:538
 #, c-format
@@ -16324,7 +18961,7 @@ msgstr ""
 "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:545
+#: builtin/notes.c:897 builtin/tag.c:589
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Impossible de résoudre '%s' comme une référence valide."
@@ -16343,7 +18980,7 @@ msgstr ""
 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:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "ne pas supprimer, afficher seulement"
 
@@ -16359,148 +18996,166 @@ msgstr "références-notes"
 msgid "use notes from <notes-ref>"
 msgstr "utiliser les notes depuis <références-notes>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1735
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "sous-commande inconnue : %s"
 
-#: builtin/pack-objects.c:52
+#: 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:53
+#: 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:428
+#: 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"
+
+#: 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:439
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "objet empaqueté corrompu pour %s"
 
-#: builtin/pack-objects.c:570
+#: 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:781
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u objets commandés, %<PRIu32> attendus"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "le fichier packet est invalide : %s"
-
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:1036
 #, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "ouverture du fichier paquet pour réutilisation impossible : %s"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "impossible de rechercher (seek) dans le fichier paquet réutilisé"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "lecture du fichier de paquet réutilisé impossible"
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "objet attendu à l'offset %<PRIuMAX> dans le paquet %s"
 
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:1155
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "désactivation de l'écriture en bitmap, les fichiers paquets sont scindés à "
 "cause de pack.packSizeLimit"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:1168
 msgid "Writing objects"
 msgstr "Écriture des objets"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "échec du stat de %s"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1281
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "%<PRIu32> objets écrits, %<PRIu32> attendus"
 
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1523
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "désactivation de l'écriture en bitmap car certains objets ne sont pas "
 "compressés"
 
-#: builtin/pack-objects.c:1592
+#: builtin/pack-objects.c:1971
 #, 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:1601
+#: builtin/pack-objects.c:1980
 #, 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:1870
+#: builtin/pack-objects.c:2261
 msgid "Counting objects"
 msgstr "Décompte des objets"
 
-#: builtin/pack-objects.c:2000
-#, c-format
-msgid "unable to get size of %s"
-msgstr "impossible de récupérer la taille de %s"
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c:2426
 #, 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:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
 #, c-format
 msgid "object %s cannot be read"
 msgstr "l'objet %s ne peut être lu"
 
-#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "objet %s longueur de l'objet inconsistante (%<PRIuMAX> contre %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2125
+#: builtin/pack-objects.c:2536
 msgid "suboptimal pack - out of memory"
 msgstr "paquet sous-optimal - mémoire insuffisante"
 
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2851
 #, 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:2572
+#: builtin/pack-objects.c:2990
 #, 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:2659
+#: builtin/pack-objects.c:3076
 msgid "Compressing objects"
 msgstr "Compression des objets"
 
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:3082
 msgid "inconsistency with delta count"
 msgstr "inconsistance dans le compte de delta"
 
-#: builtin/pack-objects.c:2742
+#: 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 ""
+"la valeur de uploadpack.blobpackfileuri doit être de la forme '<empreinte-d-"
+"objet> <empreinte-de-pack> <uri>' ('%s' reçu)"
+
+#: builtin/pack-objects.c:3164
+#, 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)"
+
+#: builtin/pack-objects.c:3199
+#, 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:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "impossible de trouver le paquet '%s'"
+
+#: builtin/pack-objects.c:3378
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16509,7 +19164,7 @@ msgstr ""
 "ID d'objet de bord attendu, reçu des données illisibles :\n"
 "%s"
 
-#: builtin/pack-objects.c:2748
+#: builtin/pack-objects.c:3384
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16518,256 +19173,277 @@ msgstr ""
 "ID d'objet attendu, reçu des données illisibles :\n"
 "%s"
 
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:3482
 msgid "invalid value for --missing"
 msgstr "valeur invalide pour --missing"
 
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
 msgid "cannot open pack index"
 msgstr "impossible d'ouvrir l'index de paquet"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3572
 #, 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:3021
+#: builtin/pack-objects.c:3658
 msgid "unable to force loose object"
 msgstr "impossible de forcer l'objet libre"
 
-#: builtin/pack-objects.c:3113
+#: builtin/pack-objects.c:3788
 #, c-format
 msgid "not a rev '%s'"
 msgstr "'%s' n'est pas une révision"
 
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "mauvaise révision '%s'"
 
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3819
 msgid "unable to add recent objects"
 msgstr "impossible d'ajouter les objets récents"
 
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3872
 #, c-format
 msgid "unsupported index version %s"
 msgstr "version d'index non supportée %s"
 
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3876
 #, c-format
 msgid "bad index version '%s'"
 msgstr "mauvaise version d'index '%s'"
 
-#: builtin/pack-objects.c:3228
-msgid "do not show progress meter"
-msgstr "ne pas afficher la barre de progression"
-
-#: builtin/pack-objects.c:3230
-msgid "show progress meter"
-msgstr "afficher la barre de progression"
-
-#: builtin/pack-objects.c:3232
-msgid "show progress meter during object writing phase"
-msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-
-#: builtin/pack-objects.c:3235
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "similaire à --all-progress quand la barre de progression est affichée"
-
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3915
 msgid "<version>[,<offset>]"
 msgstr "<version>[,<décalage>]"
 
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3916
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 "écrire le fichier d'index du paquet dans le format d'index de version "
 "spécifié"
 
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3919
 msgid "maximum size of each output pack file"
 msgstr "taille maximum de chaque fichier paquet en sortie"
 
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3921
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignorer les objets empruntés à un autre magasin d'objets"
 
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3923
 msgid "ignore packed objects"
 msgstr "ignorer les objets empaquetés"
 
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3925
 msgid "limit pack window by objects"
 msgstr "limiter la fenêtre d'empaquetage par objets"
 
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3927
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limiter la fenêtre d'empaquetage par mémoire en plus de la limite d'objets"
 
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3929
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 "longueur maximum de la chaîne de delta autorisée dans le paquet résultant"
 
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3931
 msgid "reuse existing deltas"
 msgstr "réutiliser les deltas existants"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3933
 msgid "reuse existing objects"
 msgstr "réutiliser les objets existants"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3935
 msgid "use OFS_DELTA objects"
 msgstr "utiliser les objets OFS_DELTA"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3937
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "utiliser des fils lors de la recherche pour une meilleure correspondance des "
 "deltas"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3939
 msgid "do not create an empty pack output"
 msgstr "ne pas créer un paquet vide"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3941
 msgid "read revision arguments from standard input"
 msgstr "lire les paramètres de révision depuis l'entrée standard"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3943
 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:3267
+#: builtin/pack-objects.c:3946
 msgid "include objects reachable from any reference"
 msgstr "inclure les objets accessibles depuis toute référence"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3949
 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:3273
+#: builtin/pack-objects.c:3952
 msgid "include objects referred to by the index"
 msgstr "inclure les objets référencés par l'index"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr "lire les paquets depuis l'entrée standard"
+
+#: builtin/pack-objects.c:3957
 msgid "output pack to stdout"
 msgstr "afficher l'empaquetage sur la sortie standard"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3959
 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:3280
+#: builtin/pack-objects.c:3961
 msgid "keep unreachable objects"
 msgstr "garder les objets inaccessibles"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3963
 msgid "pack loose unreachable objects"
 msgstr "empaqueter les objets inaccessibles détachés"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3965
 msgid "unpack unreachable objects newer than <time>"
 msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3968
 msgid "use the sparse reachability algorithm"
 msgstr "utiliser l'algorithme de joignabilité creuse"
 
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3970
 msgid "create thin packs"
 msgstr "créer des paquets légers"
 
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3972
 msgid "create packs suitable for shallow fetches"
 msgstr "créer des paquets permettant des récupérations superficielles"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3974
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorer les paquets qui ont un fichier .keep"
 
-#: builtin/pack-objects.c:3295
+#: builtin/pack-objects.c:3976
 msgid "ignore this pack"
 msgstr "ignorer ce paquet"
 
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3978
 msgid "pack compression level"
 msgstr "niveau de compression du paquet"
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3980
 msgid "do not hide commits by grafts"
 msgstr "ne pas cacher les validations par greffes"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3982
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "utiliser un index en bitmap si disponible pour accélerer le décompte des "
 "objets"
 
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3984
 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:3307
+#: builtin/pack-objects.c:3988
 msgid "write a bitmap index if possible"
 msgstr "écrire un index de bitmap si possible"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3992
 msgid "handling for missing objects"
 msgstr "gestion des objets manquants"
 
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3995
 msgid "do not pack objects in promisor packfiles"
 msgstr "ne pas empaqueter les objets dans les fichiers paquets prometteurs"
 
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3997
 msgid "respect islands during delta compression"
 msgstr "respecter les îlots pendant la compression des deltas"
 
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr "protocole"
+
+#: builtin/pack-objects.c:4000
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "exclure tout uploadpack.blobpackfileuri configuré avec ce protocole"
+
+#: builtin/pack-objects.c:4033
 #, 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:3350
+#: builtin/pack-objects.c:4038
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit est trop grand, forcé à %d"
 
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:4094
 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"
 
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:4096
 msgid "minimum pack size limit is 1 MiB"
 msgstr "la taille limite minimale d'un paquet est 1 MiB"
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:4101
 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:3414
+#: builtin/pack-objects.c:4104
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable et --unpack-unreachable sont incompatibles"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:4110
 msgid "cannot use --filter without --stdout"
 msgstr "impossible d'utiliser --filter sans --stdout"
 
-#: builtin/pack-objects.c:3481
+#: builtin/pack-objects.c:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr "impossible d'utiliser --filter avec --stdin-packs"
+
+#: builtin/pack-objects.c:4116
+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:4175
 msgid "Enumerating objects"
 msgstr "Énumération des objets"
 
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:4212
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
 msgstr ""
-"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>)"
+"Total %<PRIu32> (delta %<PRIu32>), réutilisés %<PRIu32> (delta %<PRIu32>), "
+"réutilisés du pack %<PRIu32>"
+
+#: 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 ""
+"La suppression  de 'git pack-redundant' est prévue.\n"
+"Si vous utilisez cette commande, veuillez ajouter\n"
+"une option supplémentaire, '--i-still-use-this',\n"
+"sur la ligne de commande pour nous avertir par\n"
+"un courriel à <git@vger.kernel.org>. Merci.\n"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16781,81 +19457,77 @@ msgstr "empaqueter tout"
 msgid "prune loose refs (default)"
 msgstr "éliminer les références perdues (défaut)"
 
-#: builtin/prune-packed.c:9
+#: 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-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "Suppression des objets dupliqués"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "afficher les objets éliminés"
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "faire expirer les objets plus vieux que <heure>"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "limiter la traversée aux objets hors des fichiers paquets prometteurs"
 
-#: builtin/prune.c:150
+#: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
 msgstr "impossible de nettoyer dans un dépôt d'objets précieux"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valeur invalide pour %s : %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
 
-#: builtin/pull.c:142
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "contrôler la récupération récursive dans les sous-modules"
 
-#: builtin/pull.c:146
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Options relatives à la fusion"
 
-#: builtin/pull.c:149
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
 
-#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "autoriser l'avance rapide"
 
-#: builtin/pull.c:186
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "remiser avant et réappliquer après le rebasage automatiquement"
+#: builtin/pull.c:167 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:202
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Options relatives au rapatriement"
 
-#: builtin/pull.c:212
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "forcer l'écrasement de la branche locale"
 
-#: builtin/pull.c:220
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "nombre de sous-modules tirés en parallèle"
 
-#: builtin/pull.c:320
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valeur invalide pour pull.ff : %s"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16863,14 +19535,14 @@ msgstr ""
 "Il n'y a pas de candidate sur laquelle rebaser parmi les références que vous "
 "venez de récupérer."
 
-#: builtin/pull.c:439
+#: 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:440
+#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16878,7 +19550,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:443
+#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16890,44 +19562,43 @@ msgstr ""
 "configuration\n"
 "pour la branche actuelle, vous devez spécifier la branche avec la commande."
 
-#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1248
 msgid "You are not currently on a branch."
 msgstr "Vous n'êtes actuellement sur aucune branche."
 
-#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
 msgid "Please specify which branch you want to rebase against."
 msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
 
-#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
 msgid "Please specify which branch you want to merge with."
 msgstr "Veuillez spécifier une branche avec laquelle fusionner."
 
-#: builtin/pull.c:453 builtin/pull.c:468
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
 msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
 
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1353 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr "<distant>"
 
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "<branche>"
 
-#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1246
 msgid "There is no tracking information for the current branch."
 msgstr "Pas d'information de suivi distant pour la branche actuelle."
 
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: 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:477
+#: builtin/pull.c:485
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16937,34 +19608,59 @@ msgstr ""
 "'%s'\n"
 "du serveur distant, mais cette référence n'a pas été récupérée."
 
-#: builtin/pull.c:587
+#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr "impossible d'accéder le commit %s"
 
-#: builtin/pull.c:867
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "--verify-signatures est ignoré pour un rebasage"
 
-#: builtin/pull.c:922
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
-
 #: 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 ""
+"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"
+"commandes suivantes avant votre prochain tirage :\n"
+"\n"
+"  git config pull.rebase false  # fusion (stratégie par défaut)\n"
+"  git config pull.rebase true   # rebasage\n"
+"  git config pull.ff only       # avance rapide seulement\n"
+"\n"
+"Vous pouvez remplacer \"git config\" par \"git config --global\" pour que\n"
+"ce soit l'option par défaut pour tous les dépôts. Vous pouvez aussi\n"
+"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:990
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 "Mise à jour d'une branche non encore créée avec les changements ajoutés dans "
 "l'index."
 
-#: builtin/pull.c:934
+#: builtin/pull.c:994
 msgid "pull with rebase"
 msgstr "tirer avec un rebasage"
 
-#: builtin/pull.c:935
+#: builtin/pull.c:995
 msgid "please commit or stash them."
 msgstr "veuillez les valider ou les remiser."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:1020
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16975,7 +19671,7 @@ msgstr ""
 "avance rapide de votre copie de travail\n"
 "depuis le commit %s."
 
-#: builtin/pull.c:966
+#: builtin/pull.c:1026
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16992,15 +19688,15 @@ msgstr ""
 "$ git reset --hard\n"
 "pour régénérer."
 
-#: builtin/pull.c:981
+#: builtin/pull.c:1041
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Impossible de fusionner de multiples branches sur une tête vide."
 
-#: builtin/pull.c:985
+#: builtin/pull.c:1045
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossible de rebaser sur de multiples branches."
 
-#: builtin/pull.c:992
+#: builtin/pull.c:1065
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "impossible de rebaser avec des modifications de sous-modules enregistrées "
@@ -17014,11 +19710,11 @@ msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
 msgid "tag shorthand without <tag>"
 msgstr "raccourci d'étiquette sans <étiquette>"
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete accepte seulement des noms entiers de références cibles"
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -17027,7 +19723,7 @@ msgstr ""
 "Pour choisir l'option de manière permanente, voir push.default dans 'git "
 "help config'."
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -17052,7 +19748,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -17067,7 +19763,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nom-de-la-branche-amont>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -17081,31 +19777,31 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: 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."
 
-#: builtin/push.c:210
+#: 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"
 "your current branch '%s', without telling me what to push\n"
 "to update which remote branch."
 msgstr ""
-"Vous êtes en train de pousser vers la branche distante '%s', qui n'est\n"
-"pas une branche amont de votre branche courante '%s', sans me dire\n"
-"quoi pousser pour mettre à jour quelle branche amont."
+"Vous êtes en train de pousser vers le dépôt distant '%s',\n"
+"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:269
-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:276
+#: 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"
@@ -17120,7 +19816,7 @@ msgstr ""
 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: builtin/push.c:282
+#: 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"
@@ -17135,7 +19831,7 @@ msgstr ""
 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: builtin/push.c:288
+#: 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"
@@ -17153,13 +19849,13 @@ msgstr ""
 "Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
 "d'information."
 
-#: builtin/push.c:295
+#: 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."
 
-#: builtin/push.c:298
+#: 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"
@@ -17171,100 +19867,116 @@ msgstr ""
 "pointer\n"
 "vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
 
-#: builtin/push.c:359
+#: 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 ""
+"Les mises à jour ont été rejetées, car la pointe de la branche\n"
+"de suivi a été mise à jour depuis la dernière extraction. Intégrez\n"
+"ces changements localement (par exemple 'git pull ...') avant de\n"
+"forcer à nouveau une mise à jour.\n"
+
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Poussée vers %s\n"
 
-#: builtin/push.c:366
+#: 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:541
+#: builtin/push.c:544
 msgid "repository"
 msgstr "dépôt"
 
-#: builtin/push.c:542 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "pousser toutes les références"
 
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "refléter toutes les références"
 
-#: builtin/push.c:545
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "supprimer les références"
 
-#: builtin/push.c:546
+#: 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)"
 
-#: builtin/push.c:549 builtin/send-pack.c:167
+#: builtin/push.c:552 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "forcer les mises à jour"
 
-#: builtin/push.c:551 builtin/send-pack.c:181
+#: builtin/push.c:553 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
 msgstr "<nom-de-ref>:<attendu>"
 
-#: builtin/push.c:552 builtin/send-pack.c:182
+#: builtin/push.c:554 builtin/send-pack.c:205
 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:555
+#: builtin/push.c:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "exiger des mises à jours distantes pour une intégration locale"
+
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "contrôler la poussée récursive des sous-modules"
 
-#: builtin/push.c:557 builtin/send-pack.c:175
+#: builtin/push.c:561 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "utiliser un empaquetage léger"
 
-#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr "recevoir le programme d'empaquetage"
 
-#: builtin/push.c:560
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "définir la branche amont pour git pull/status"
 
-#: builtin/push.c:563
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "éliminer les références locales supprimées"
 
-#: builtin/push.c:565
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "éviter d'utiliser le crochet pre-push"
 
-#: builtin/push.c:566
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "pousser les étiquettes manquantes mais pertinentes"
 
-#: builtin/push.c:569 builtin/send-pack.c:169
+#: builtin/push.c:572 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "signer la poussée avec GPG"
 
-#: builtin/push.c:571 builtin/send-pack.c:176
+#: builtin/push.c:574 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
 msgstr "demande une transaction atomique sur le serveur distant"
 
-#: builtin/push.c:589
+#: builtin/push.c:592
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete est incompatible avec --all, --mirror et --tags"
 
-#: builtin/push.c:591
+#: 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:611
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "mauvais dépôt '%s'"
 
-#: builtin/push.c:612
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -17286,64 +19998,76 @@ msgstr ""
 "\n"
 "    git push <nom>\n"
 
-#: builtin/push.c:627
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
 msgstr "--all et --tags sont incompatibles"
 
-#: builtin/push.c:629
+#: 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:633
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror et --tags sont incompatibles"
 
-#: builtin/push.c:635
+#: 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:638
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
 msgstr "--all et --mirror sont incompatibles"
 
-#: builtin/push.c:642
+#: 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"
 
-#: builtin/range-diff.c:8
+#: 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>"
 
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<options>] <ancien-sommet>...<nouveau-sommet>"
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<options>] <base> <ancien-sommet> <nouveau-sommet>"
 
-#: builtin/range-diff.c:21
-msgid "Percentage by which creation is weighted"
-msgstr "Pourcentage par lequel la création est pondérée"
-
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "utiliser des couleurs de diff simples"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "notes"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "passé à 'git log'"
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "afficher seulement les sorties liées à la première plage"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "afficher seulement les sorties liées à la deuxième plage"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
-msgid "no .. in range: '%s'"
-msgstr "pas de .. dans la plage : '%s'"
+msgid "not a commit range: '%s'"
+msgstr "pas une plage de commit : '%s'"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "un format d'argument unique doit être une plage symétrique"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "plage entre deux commits requise"
 
@@ -17355,8 +20079,8 @@ msgid ""
 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 ou apparenté "
-"1> [<arbre ou apparenté 2> [<arbre ou apparenté 3>]])"
+"sparse-checkout] [--index-output=<fichier>] (--empty | <arbre-esque> [<arbre-"
+"esque 2> [<arbre-esque 3>]])"
 
 #: builtin/read-tree.c:124
 msgid "write resulting index to <file>"
@@ -17426,7 +20150,11 @@ msgstr "déboguer unpack-trees"
 msgid "suppress feedback messages"
 msgstr "supprimer les messages d'information de suivi"
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+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>]]"
@@ -17434,227 +20162,204 @@ msgstr ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <nouvelle-base> | --keep-"
 "base] [<amont> [<branche>]]"
 
-#: builtin/rebase.c:34
+#: 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>]"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: 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:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "impossible d'écrire '%s'."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "pas de HEAD ?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:311
 #, c-format
 msgid "could not create temporary %s"
 msgstr "impossible de créer un fichier temporaire %s"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:317
 msgid "could not mark as interactive"
 msgstr "impossible de marquer comme interactif"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:370
 msgid "could not generate todo list"
 msgstr "impossible de générer la liste à-faire"
 
-#: builtin/rebase.c:383
+#: builtin/rebase.c:412
 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:438
+#: builtin/rebase.c:481
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<options>]"
 
-#: builtin/rebase.c:450
-msgid "keep empty commits"
-msgstr "garder les validations vides"
+#: builtin/rebase.c:494 builtin/rebase.c:1389
+msgid "keep commits which start empty"
+msgstr "conserver les commits qui commencent vides"
 
-#: builtin/rebase.c:452 builtin/revert.c:128
+#: 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:453
+#: builtin/rebase.c:500
 msgid "rebase merge commits"
 msgstr "rebaser les commits de fusion"
 
-#: builtin/rebase.c:455
+#: builtin/rebase.c:502
 msgid "keep original branch points of cousins"
 msgstr "conserver les points de branchement de cousins originaux"
 
-#: builtin/rebase.c:457
+#: 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:458
+#: builtin/rebase.c:505
 msgid "sign commits"
 msgstr "signer les commits"
 
-#: builtin/rebase.c:460 builtin/rebase.c:1427
+#: 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:462
+#: builtin/rebase.c:509
 msgid "continue rebase"
 msgstr "continuer le rebasage"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:511
 msgid "skip commit"
 msgstr "sauter le commit"
 
-#: builtin/rebase.c:465
+#: builtin/rebase.c:512
 msgid "edit the todo list"
 msgstr "éditer la liste à-faire"
 
-#: builtin/rebase.c:467
+#: builtin/rebase.c:514
 msgid "show the current patch"
 msgstr "afficher le patch courant"
 
-#: builtin/rebase.c:470
+#: 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:472
+#: 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:474
+#: builtin/rebase.c:521
 msgid "check the todo list"
 msgstr "vérifier la liste à-faire"
 
-#: builtin/rebase.c:476
+#: builtin/rebase.c:523
 msgid "rearrange fixup/squash lines"
 msgstr "réarranger les lignes fixup/squash"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:525
 msgid "insert exec commands in todo list"
 msgstr "insérer les commandes exec dans la liste à-faire"
 
-#: builtin/rebase.c:479
+#: builtin/rebase.c:526
 msgid "onto"
 msgstr "sur"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict-revision"
 msgstr "restrict-revision"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict revision"
 msgstr "restreindre la révision"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:531
 msgid "squash-onto"
 msgstr "écraser-sur"
 
-#: builtin/rebase.c:485
+#: builtin/rebase.c:532
 msgid "squash onto"
 msgstr "écraser sur"
 
-#: builtin/rebase.c:487
+#: builtin/rebase.c:534
 msgid "the upstream commit"
 msgstr "le commit amont"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head-name"
 msgstr "nom du head"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head name"
 msgstr "nom du head"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:541
 msgid "rebase strategy"
 msgstr "stratégie de rebasage"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:542
 msgid "strategy-opts"
 msgstr "options de stratégie"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:543
 msgid "strategy options"
 msgstr "options de stratégie"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:544
 msgid "switch-to"
 msgstr "switch-to"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
 msgid "the branch or commit to checkout"
 msgstr "la branche ou le commit à extraire"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto-name"
 msgstr "sur-le-nom"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto name"
 msgstr "sur le nom"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "cmd"
 msgstr "cmd"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "the command to run"
 msgstr "la commande à lancer"
 
-#: builtin/rebase.c:503 builtin/rebase.c:1510
+#: 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:519
+#: 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:535
+#: builtin/rebase.c:582
 #, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s requiert un rebasage interactif"
+msgid "%s requires the merge backend"
+msgstr "%s requiert un moteur de fusion"
 
-#: builtin/rebase.c:587
+#: builtin/rebase.c:625
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "impossible d'accéder 'onto' : '%s'"
 
-#: builtin/rebase.c:602
+#: builtin/rebase.c:642
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head invalide : '%s'"
 
-#: builtin/rebase.c:627
+#: builtin/rebase.c:667
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "allow_rerere_autoupdate invalide ignoré : '%s'"
 
-#: builtin/rebase.c:703
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Impossible de lire '%s'"
-
-#: builtin/rebase.c:721
-#, c-format
-msgid "Cannot store %s"
-msgstr "Impossible de stocker %s"
-
-#: builtin/rebase.c:828
-msgid "could not determine HEAD revision"
-msgstr "impossible de déterminer la révision HEAD"
-
-#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
+#: 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"
@@ -17668,7 +20373,7 @@ msgstr ""
 "arrêter\n"
 "et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
 
-#: builtin/rebase.c:1032
+#: builtin/rebase.c:896
 #, c-format
 msgid ""
 "\n"
@@ -17687,7 +20392,16 @@ msgstr ""
 "\n"
 "Résultat, git ne peut pas les rebaser."
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1222
+#, 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)."
+
+#: builtin/rebase.c:1240
 #, c-format
 msgid ""
 "%s\n"
@@ -17704,7 +20418,7 @@ msgstr ""
 "    git rebase '<branche>'\n"
 "\n"
 
-#: builtin/rebase.c:1355
+#: builtin/rebase.c:1256
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17718,173 +20432,186 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branche> %s\n"
 "\n"
 
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1286
 msgid "exec commands cannot contain newlines"
 msgstr "les commandes exec ne peut pas contenir de retour à la ligne"
 
-#: builtin/rebase.c:1389
+#: builtin/rebase.c:1290
 msgid "empty exec command"
 msgstr "commande exec vide"
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1319
 msgid "rebase onto given branch instead of upstream"
 msgstr "rebaser sur la branche %s au lieu de la branche amont"
 
-#: builtin/rebase.c:1420
+#: builtin/rebase.c:1321
 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"
 
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1323
 msgid "allow pre-rebase hook to run"
 msgstr "permettre le lancement du crochet pre-rebase"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1325
 msgid "be quiet. implies --no-stat"
 msgstr "être silencieux. implique --no-stat"
 
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1331
 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:1433
-msgid "add a Signed-off-by: line to each commit"
+#: builtin/rebase.c:1334
+msgid "add a Signed-off-by trailer to each commit"
 msgstr "ajouter une ligne Signed-off-by à chaque message de validation"
 
-#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
-msgid "passed to 'git am'"
-msgstr "passé à 'git am'"
+#: builtin/rebase.c:1337
+msgid "make committer date match author date"
+msgstr "mettre la date de validateur à la date auteur"
+
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr "ignorer la date d'auteur et utilise la date actuelle"
 
-#: builtin/rebase.c:1443 builtin/rebase.c:1445
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr "synonyme pour --reset-author-date"
+
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
 msgid "passed to 'git apply'"
-msgstr "passé jusqu'à git-apply"
+msgstr "passé jusqu'à git apply"
+
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr "ignorer des modifications d'espaces"
 
-#: builtin/rebase.c:1447 builtin/rebase.c:1450
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "picorer tous les commits, même sans modifiant"
 
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1354
 msgid "continue"
 msgstr "continuer"
 
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1357
 msgid "skip current patch and continue"
 msgstr "sauter le patch courant et continuer"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1359
 msgid "abort and check out the original branch"
 msgstr "abandonner et extraire la branche d'origine"
 
-#: builtin/rebase.c:1460
+#: builtin/rebase.c:1362
 msgid "abort but keep HEAD where it is"
 msgstr "abandonne mais garde HEAD où il est"
 
-#: builtin/rebase.c:1461
+#: builtin/rebase.c:1363
 msgid "edit the todo list during an interactive rebase"
 msgstr "éditer la liste à faire lors d'un rebasage interactif"
 
-#: builtin/rebase.c:1464
+#: builtin/rebase.c:1366
 msgid "show the patch file being applied or merged"
 msgstr "afficher le patch en cours d'application ou de fusion"
 
-#: builtin/rebase.c:1467
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "utiliser des stratégies d'application pour rebaser"
+
+#: builtin/rebase.c:1373
 msgid "use merging strategies to rebase"
 msgstr "utiliser des stratégies de fusion pour rebaser"
 
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1377
 msgid "let the user edit the list of commits to rebase"
 msgstr "laisser l'utilisateur éditer la liste des commits à rebaser"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1381
 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:1479
-msgid "preserve empty commits during rebase"
-msgstr "préserver les validations vides pendant le rebasage"
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
+msgstr "comment gérer les commits qui deviennent vides"
 
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1393
 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:1487
-msgid "automatically stash/stash pop before and after"
-msgstr "remiser et réappliquer automatiquement avant et après"
-
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1400
 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:1493
+#: builtin/rebase.c:1404
 msgid "allow rebasing commits with empty messages"
 msgstr "autoriser les commits de rebasage avec des messages vides"
 
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1408
 msgid "try to rebase merges instead of skipping them"
 msgstr "essayer de rebaser les fusions au lieu de les garder"
 
-#: builtin/rebase.c:1499
+#: builtin/rebase.c:1411
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "utiliser 'merge-base --fork-point' pour raffiner l'amont"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1413
 msgid "use the given merge strategy"
 msgstr "utiliser la stratégie de fusion indiquée"
 
-#: builtin/rebase.c:1503 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
 msgid "option"
 msgstr "option"
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1416
 msgid "pass the argument through to the merge strategy"
 msgstr "passer les arguments jusqu'à la stratégie de fusion"
 
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1419
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "rebaser tous les objets inatteignables depuis les racines"
 
-#: builtin/rebase.c:1524
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
+#: builtin/rebase.c:1424
+msgid "apply all changes, even those already present upstream"
 msgstr ""
-"les support de rebase.useBuiltin a été supprimé !\n"
-"Voir son entrée dans 'git help config' pour plus de détails."
+"appliquer toutes les modifications, même celles déjà présentes en amont"
 
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1442
 msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser."
+msgstr "Il semble que 'git am' soit en cours. Impossible de rebaser."
 
-#: builtin/rebase.c:1571
+#: 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:1576
+#: builtin/rebase.c:1488
 msgid "cannot combine '--keep-base' with '--onto'"
 msgstr "impossible de combiner '--keep-base' avec '--onto'"
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1490
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr "impossible de combiner '--keep-base' avec '--root'"
 
-#: builtin/rebase.c:1582
+#: builtin/rebase.c:1494
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "impossible de combiner '--root' avec '--fork-point'"
+
+#: builtin/rebase.c:1497
 msgid "No rebase in progress?"
 msgstr "Pas de rebasage en cours ?"
 
-#: builtin/rebase.c:1586
+#: builtin/rebase.c:1501
 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."
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Impossible de lire HEAD"
 
-#: builtin/rebase.c:1621
+#: builtin/rebase.c:1536
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17892,16 +20619,16 @@ msgstr ""
 "Vous devez éditer tous les conflits de fusion et\n"
 "les marquer comme résolus avec git add"
 
-#: builtin/rebase.c:1640
+#: builtin/rebase.c:1555
 msgid "could not discard worktree changes"
-msgstr "Impossible de supprimer les changements de l'arbre de travail"
+msgstr "impossible de supprimer les changements de l'arbre de travail"
 
-#: builtin/rebase.c:1659
+#: builtin/rebase.c:1574
 #, c-format
 msgid "could not move back to %s"
-msgstr "Impossible de revenir à %s"
+msgstr "impossible de revenir à %s"
 
-#: builtin/rebase.c:1704
+#: builtin/rebase.c:1620
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17923,168 +20650,145 @@ msgstr ""
 "chose\n"
 "d'important ici.\n"
 
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1648
 msgid "switch `C' expects a numerical value"
 msgstr "l'option `C' attend un valeur numérique"
 
-#: builtin/rebase.c:1766
+#: builtin/rebase.c:1690
 #, c-format
 msgid "Unknown mode: %s"
-msgstr "mode inconnu : %s"
+msgstr "Mode inconnu : %s"
 
-#: builtin/rebase.c:1788
+#: builtin/rebase.c:1729
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy requiert --merge ou --interactive"
 
-#: builtin/rebase.c:1828
+#: 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:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Backend de rebasage inconnu : %s"
+
+#: builtin/rebase.c:1802
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec requiert --exec ou --interactive"
 
-#: builtin/rebase.c:1840
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"impossible de combiner les options am avec l'options interactive ou merge"
-
-#: builtin/rebase.c:1859
+#: builtin/rebase.c:1822
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "impossible de combiner '--preserve-merges' avec '--rebase-merges'"
 
-#: builtin/rebase.c:1863
+#: 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:1887
+#: builtin/rebase.c:1850
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "amont invalide '%s'"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1856
 msgid "Could not create new root commit"
 msgstr "Impossible de créer un nouveau commit racine"
 
-#: builtin/rebase.c:1919
+#: builtin/rebase.c:1882
 #, 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:1922
+#: builtin/rebase.c:1885
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': exactement une base de fusion nécessaire"
 
-#: builtin/rebase.c:1930
+#: builtin/rebase.c:1893
 #, c-format
 msgid "Does not point to a valid commit '%s'"
-msgstr "ne pointe pas sur une validation valide : '%s'"
+msgstr "Ne pointe pas sur une validation valide : '%s'"
 
-#: builtin/rebase.c:1955
+#: builtin/rebase.c:1921
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "fatal : pas de branche ou commit '%s'"
 
-#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
 #, c-format
 msgid "No such ref: %s"
 msgstr "Référence inexistante : %s"
 
-#: builtin/rebase.c:1974
+#: builtin/rebase.c:1940
 msgid "Could not resolve HEAD to a revision"
 msgstr "Impossible de résoudre le commit HEAD vers un révision"
 
-#: builtin/rebase.c:2012
-msgid "Cannot autostash"
-msgstr "Autoremisage impossible"
-
-#: builtin/rebase.c:2015
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "réponse de remisage inattendue : '%s'"
-
-#: builtin/rebase.c:2021
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Impossible de créer le répertoire pour '%s'"
-
-#: builtin/rebase.c:2024
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Autoremisage créé : %s\n"
-
-#: builtin/rebase.c:2027
-msgid "could not reset --hard"
-msgstr "impossible de réinitialiser --hard"
-
-#: builtin/rebase.c:2036
+#: builtin/rebase.c:1961
 msgid "Please commit or stash them."
 msgstr "Veuillez les valider ou les remiser."
 
-#: builtin/rebase.c:2063
-#, c-format
-msgid "could not parse '%s'"
-msgstr "impossible d'analyser '%s'"
-
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:1997
 #, c-format
 msgid "could not switch to %s"
-msgstr "Impossible de basculer vers %s"
+msgstr "impossible de basculer vers %s"
 
-#: builtin/rebase.c:2087
+#: builtin/rebase.c:2008
 msgid "HEAD is up to date."
 msgstr "HEAD est à jour."
 
-#: builtin/rebase.c:2089
+#: builtin/rebase.c:2010
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "La branche courante %s est à jour.\n"
 
-#: builtin/rebase.c:2097
+#: builtin/rebase.c:2018
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD est à jour, rebasage forcé."
 
-#: builtin/rebase.c:2099
+#: builtin/rebase.c:2020
 #, 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:2107
+#: builtin/rebase.c:2028
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Le crochet pre-rebase a refusé de rebaser."
 
-#: builtin/rebase.c:2114
+#: builtin/rebase.c:2035
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Changements vers %s :\n"
 
-#: builtin/rebase.c:2117
+#: builtin/rebase.c:2038
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Changements de %s sur %s :\n"
 
-#: builtin/rebase.c:2142
+#: builtin/rebase.c:2063
 #, 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"
 
-#: builtin/rebase.c:2151
+#: builtin/rebase.c:2072
 msgid "Could not detach HEAD"
 msgstr "Impossible de détacher HEAD"
 
-#: builtin/rebase.c:2160
+#: builtin/rebase.c:2081
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Avance rapide de %s sur %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <répertoire-git>"
 
-#: builtin/receive-pack.c:830
+#: 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"
@@ -18114,7 +20818,7 @@ msgstr ""
 "Pour éliminer ce message et conserver le comportement par défaut,\n"
 "réglez « receive.denyCurrentBranch » à 'refuse'."
 
-#: builtin/receive-pack.c:850
+#: 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"
@@ -18134,11 +20838,11 @@ msgstr ""
 "\n"
 "Pour éliminer ce message, réglez-le à 'refuse'."
 
-#: builtin/receive-pack.c:1936
+#: builtin/receive-pack.c:2478
 msgid "quiet"
 msgstr "quiet"
 
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:2492
 msgid "You must specify a directory."
 msgstr "Vous devez spécifier un répertoire."
 
@@ -18164,49 +20868,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <référence>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' n'est pas un horodatage valide"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:609
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Marquage des objets inaccessibles..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:647
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s ne pointe nulle part !"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:699
 msgid "no reflog specified to delete"
 msgstr "pas de journal de références à supprimer spécifié"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:708
 #, c-format
 msgid "not a reflog: %s"
 msgstr "'%s' n'est pas un journal de références"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:713
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "pas de journal de références pour '%s'"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:759
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "format de référence invalide : %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:768
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -18214,83 +20918,83 @@ msgstr ""
 "git remote add [-t <branche>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nom> <url>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <ancienne> <nouvelle>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <nom>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nom> (-a | --auto | -d | --delete | <branche>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nom>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nom>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<groupe> | "
 "<distante>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nom> <branche>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nom>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nom> <nouvelle-URL> [<ancienne-URL>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nom> <nouvelle-URL>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nom> <url>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<options>] <nom> <URL>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nom> <branche>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nom> <branche>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<options>] <nom>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<options>] <nom>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<options>] [<groupe> | <distante>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Mise à jour de %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -18298,88 +21002,99 @@ msgstr ""
 "--mirror est dangereux et obsolète ; merci\n"
 "\t d'utiliser --mirror=fetch ou --mirror=push à la place"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argument miroir inconnu : %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "rapatrier les branches distantes"
 
-#: builtin/remote.c:165
+#: 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"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "ou ne rapatrier aucune étiquette (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "branche(s) à suivre"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "branche maîtresse"
 
-#: builtin/remote.c:173
+#: 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"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "spécifier une branche maîtresse n'a pas de sens avec --mirror"
 
-#: builtin/remote.c:187
+#: 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"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr "la distante %s existe déjà."
 
-#: builtin/remote.c:198 builtin/remote.c:640
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' n'est pas un nom valide de distante"
-
-#: builtin/remote.c:238
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Impossible de paramétrer la maîtresse '%s'"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:355
 #, 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"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr "(correspond)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:466
 msgid "(delete)"
 msgstr "(supprimer)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "impossible d'assigner '%s'"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"La configuration %s remote.pushDefault dans :\n"
+"\t%s%d\n"
+"nomme à présent le distant inexistant '%s'"
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Pas de serveur remote : '%s'"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:710
 #, 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:666
+#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18390,17 +21105,17 @@ msgstr ""
 "\t%s\n"
 "\tVeuillez mettre à jour la configuration manuellement si nécessaire."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "échec de suppression de '%s'"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
 msgstr "échec de création de '%s'"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18415,118 +21130,118 @@ msgstr[1] ""
 "supprimées ;\n"
 "pour les supprimer, utilisez :"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Impossible de supprimer la section de configuration '%s'"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:999
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " suivi"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
 #, 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:974
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebase de manière interactive sur la distante %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1058
 #, 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:979
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebase sur la distante %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr " fusionne avec la distante %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "fusionne avec la distante %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    et avec la distante %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
 msgid "create"
 msgstr "créer"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr "supprimer"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "à jour"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
 msgstr "peut être mis à jour en avance rapide"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "le local n'est pas à jour"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s force vers %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s pousse vers %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s force vers %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s pousse vers %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr "ne pas interroger les distantes"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "* distante %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL de rapatriement : %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr "(pas d'URL)"
 
@@ -18534,25 +21249,25 @@ msgstr "(pas d'URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL push : %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Branche HEAD : %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr "(non demandé)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "(inconnu)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -18560,171 +21275,162 @@ msgstr ""
 "  Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
 "suivantes) :\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branche distante :%s"
 msgstr[1] "  Branches distantes :%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr " (état non demandé)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
 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:1215
+#: builtin/remote.c:1297
 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:1221
+#: builtin/remote.c:1303
 #, 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:1242
+#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "supprimer refs/remotes/<nom>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr "Impossible de déterminer la HEAD distante"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 "Il y a de multiples branches HEAD distantes. Veuillez en choisir une "
 "explicitement avec :"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr "Impossible de supprimer %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Référence non valide : %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr "Impossible de paramétrer %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s se retrouvera en suspens !"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s se retrouve en suspens !"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "Élimination de %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "URL : %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [serait éliminé] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [éliminé] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr "éliminer les distants après le rapatriement"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Pas de serveur remote '%s'"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "ajouter une branche"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr "pas de serveur distant spécifié"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
 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:1480
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "retourner toutes les URLs"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "aucune URL configurée pour le dépôt distant '%s'"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "manipuler les URLs push"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "ajouter une URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "supprimer des URLs"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete n'a aucun sens"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Motif d'URL ancien invalide : %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Pas d'URL trouvée : %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
 msgstr "Pas de suppression de toutes les URLs non-push"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "être verbeux : doit être placé avant une sous-commande"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Sous-commande inconnue : %s"
-
-#: builtin/repack.c:23
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr "git repack [<options>]"
 
-#: builtin/repack.c:28
+#: builtin/repack.c:31
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18733,139 +21439,150 @@ msgstr ""
 "Utilisez\n"
 "--no-write-bitmap-index ou désactivez le paramètre pack.writebitmaps."
 
-#: builtin/repack.c:191
+#: builtin/repack.c:198
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "ne pas démarrer pack-objects pour ré-empaqueter les objects de prometteur"
 
-#: builtin/repack.c:230 builtin/repack.c:409
+#: builtin/repack.c:270 builtin/repack.c:630
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack : attente de lignes d'Id d'objets en hexa complet seulement depuis "
 "les objects de paquet."
 
-#: builtin/repack.c:247
+#: builtin/repack.c:294
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "impossible de terminer pack-objects  pour ré-empaqueter les objets de "
 "prometteur"
 
-#: builtin/repack.c:285
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr "impossible d'ouvrir l'index pour %s"
+
+#: builtin/repack.c:368
+#, c-format
+msgid "pack %s too large to consider in geometric progression"
+msgstr ""
+"le paquet %s est trop gros pour être pris en compte dans un progression "
+"géométrique"
+
+#: builtin/repack.c:401 builtin/repack.c:408 builtin/repack.c:413
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "le paquet %s est trop gros à enrouler"
+
+#: builtin/repack.c:460
 msgid "pack everything in a single pack"
 msgstr "empaqueter tout dans un seul paquet"
 
-#: builtin/repack.c:287
+#: builtin/repack.c:462
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "identique à -a et transformer les objets inaccessibles en suspens"
 
-#: builtin/repack.c:290
+#: builtin/repack.c:465
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "supprimer les paquets redondants et lancer git-prune-packed"
 
-#: builtin/repack.c:292
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passer --no-reuse-delta à git-pack-objects"
 
-#: builtin/repack.c:294
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passer --no-reuse-object à git-pack-objects"
 
-#: builtin/repack.c:296
+#: builtin/repack.c:471
 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:299
+#: builtin/repack.c:474
 msgid "pass --local to git-pack-objects"
 msgstr "passer --local à git-pack-objects"
 
-#: builtin/repack.c:301
+#: builtin/repack.c:476
 msgid "write bitmap index"
 msgstr "écrire un index en bitmap"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:478
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "passer --delta-islands à git-pack-objects"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:479
 msgid "approxidate"
 msgstr "date approximative"
 
-#: builtin/repack.c:305
+#: builtin/repack.c:480
 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:307
+#: builtin/repack.c:482
 msgid "with -a, repack unreachable objects"
 msgstr "avec -a, repaquétiser les objets inaccessibles"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:484
 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:310 builtin/repack.c:316
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr "octets"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:486
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "idem ci-dessus, mais limiter la taille mémoire au lieu du nombre d'éléments"
 
-#: builtin/repack.c:313
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr "limite la profondeur maximale des deltas"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:490
 msgid "limits the maximum number of threads"
 msgstr "limite le nombre maximal de fils"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:492
 msgid "maximum size of each packfile"
 msgstr "taille maximum de chaque fichier paquet"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:494
 msgid "repack objects in packs marked with .keep"
 msgstr "réempaqueter les objets dans des paquets marqués avec .keep"
 
-#: builtin/repack.c:321
+#: builtin/repack.c:496
 msgid "do not repack this pack"
 msgstr "ne pas rempaqueter ce paquet"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr "trouver une progression géométrique avec un facteur <N>"
+
+#: builtin/repack.c:508
 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:335
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable et -A sont incompatibles"
 
-#: builtin/repack.c:418
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric est incompatible avec -A, -a"
+
+#: builtin/repack.c:639
 msgid "Nothing new to pack."
 msgstr "Rien de neuf à empaqueter."
 
-#: builtin/repack.c:479
+#: builtin/repack.c:669
 #, 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 ""
-"ALERTE : certains paquets utilisés ont été renommés\n"
-"ALERTE : en les préfixant par old-, de manière à\n"
-"ALERTE : les remplacer par une nouvelle version de\n"
-"ALERTE : fichier. Mais l'opération a échoué et la\n"
-"ALERTE : tentative de renommage en sens inverse a\n"
-"ALERTE : aussi échoué.\n"
-"ALERTE : Veuillez les renommer manuellement dans %s :\n"
+msgid "missing required file: %s"
+msgstr "fichier nécessaire manquant : %s"
 
-#: builtin/repack.c:527
+#: builtin/repack.c:671
 #, c-format
-msgid "failed to remove '%s'"
-msgstr "échec de la suppression de '%s'"
+msgid "could not unlink: %s"
+msgstr "impossible de délier : '%s'"
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
@@ -18970,8 +21687,8 @@ msgstr "fstat de %s impossible"
 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:423
-#: builtin/replace.c:453
+#: 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'"
@@ -18995,17 +21712,17 @@ msgstr "le nouvel objet est identique à l'ancien : '%s'"
 msgid "could not parse %s as a commit"
 msgstr "impossible d'analyser %s comme commit"
 
-#: builtin/replace.c:415
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mauvaise étiquette de fusion dans le commit '%s'"
 
-#: builtin/replace.c:417
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "étiquette de fusion malformée dans le commit '%s'"
 
-#: builtin/replace.c:429
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -19014,31 +21731,31 @@ msgstr ""
 "le commit original '%s' contient l'étiquette de fusion '%s' qui a disparu ; "
 "utilisez --edit au lieu de --graft"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "le commit original '%s' contient une signature GPG"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "la signature sera éliminée dans la validation de remplacement !"
 
-#: builtin/replace.c:479
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
-msgstr "Impossible d'écrire le commit de remplacement pour '%s'"
+msgstr "impossible d'écrire le commit de remplacement pour '%s'"
 
-#: builtin/replace.c:487
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft pour '%s' non nécessaire"
 
-#: builtin/replace.c:491
+#: builtin/replace.c:492
 #, 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:526
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -19047,71 +21764,71 @@ msgstr ""
 "impossible de convertir la(les) greffe(s) suivante(s) :\n"
 "%s"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "afficher les références de remplacement"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "supprimer les références de remplacement"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "éditer l'objet existant"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:551
 msgid "change a commit's parents"
-msgstr "Modifier les parents d'un commit"
+msgstr "modifier les parents d'un commit"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "convertir le fichier de greffe existant"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "remplacer la référence si elle existe"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "afficher sans mise en forme pour --edit"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "utiliser ce format"
 
-#: builtin/replace.c:568
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format ne peut pas être utilisé sans lister"
 
-#: builtin/replace.c:576
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f n'a de sens qu'en écrivant un remplacement"
 
-#: builtin/replace.c:580
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw n'a de sens qu'avec l'option --edit"
 
-#: builtin/replace.c:586
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d requiert au moins un argument"
 
-#: builtin/replace.c:592
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "mauvais nombre d'arguments"
 
-#: builtin/replace.c:598
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e requiert un seul argument"
 
-#: builtin/replace.c:604
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g requiert au moins un argument"
 
-#: builtin/replace.c:610
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file ne supporte aucun argument"
 
-#: builtin/replace.c:616
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "-l n'accepte qu'un motifs"
 
@@ -19120,15 +21837,15 @@ msgid "git rerere [clear | forget <path>... | 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'"
@@ -19140,122 +21857,129 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<arbre ou apparenté>] [--] <chemins>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr ""
+"git reset [-q] [<arbre ou apparenté>] [--] <spécificateur-de-chemin>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<arbre ou apparenté>] [--] [<chemins>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<arbre-esque>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<arbre-esque>] [--] [<spéc.-de-chemin>...]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "mixed"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "merge"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "Vous n'avez pas une HEAD valide."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "Impossible de trouver l'arbre pour HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Impossible de trouver l'arbre pour %s."
 
-#: builtin/reset.c:114
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD est maintenant à %s"
 
-#: builtin/reset.c:193
+#: builtin/reset.c:195
 #, 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:293 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
 msgid "be quiet, only report errors"
 msgstr "être silencieux, afficher seulement les erreurs"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "réinitialiser HEAD et l'index"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "réinitialiser seulement HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "réinitialiser HEAD, l'index et la copie de travail"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "réinitialiser HEAD mais garder les changements locaux"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "enregistrer seulement le fait que les chemins effacés seront ajoutés plus "
 "tard"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:344
 #, 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:334
+#: builtin/reset.c:352
 #, 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:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch est incompatible avec --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 "--mixed avec des chemins est obsolète ; utilisez 'git reset -- <paths>' à la "
 "place."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Impossible de faire un \"%s reset\" avec des chemins."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, 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:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
 msgstr "-N ne peut être utilisé qu'avec --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "Modifications non indexées après reset :"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:416
 #, c-format
 msgid ""
 "\n"
@@ -19270,48 +21994,60 @@ msgstr ""
 "de\n"
 "config reset.quiet à true pour avoir ce comportement en permanence.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, 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:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "Impossible d'écrire le nouveau fichier d'index."
 
-#: builtin/rev-list.c:411
+#: builtin/rev-list.c:541
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "impossible de combiner --exclude-promisor-objects et --missing"
 
-#: builtin/rev-list.c:472
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "le filtrage d'objet exige --objects"
 
-#: builtin/rev-list.c:522
+#: 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:525
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet"
+#: builtin/rev-list.c:679
+msgid "marked counting is incompatible with --objects"
+msgstr "le comptage marqué est incompatible avec --objects"
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "garder le `--` passé en argument"
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "sortie en forme longue fixée"
 
-#: builtin/rev-parse.c:551
+#: 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"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -19326,6 +22062,50 @@ msgstr ""
 "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>..."
 msgstr "git revert [<options>] <commit ou apparenté>..."
@@ -19404,19 +22184,19 @@ msgstr "préserver les validations vides initialement"
 msgid "keep redundant, empty commits"
 msgstr "garder les validations redondantes, vides"
 
-#: builtin/revert.c:232
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr "revert a échoué"
 
-#: builtin/revert.c:245
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr "le picorage a échoué"
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<options>] [--] <fichier>..."
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -19430,7 +22210,7 @@ msgstr[1] ""
 "les fichiers suivants ont du contenu indexé différent\n"
 "du fichier et de HEAD :"
 
-#: builtin/rm.c:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -19438,13 +22218,13 @@ msgstr ""
 "\n"
 "(utilisez -f pour forcer la suppression)"
 
-#: 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] "le fichier suivant a des changements indexés :"
 msgstr[1] "les fichiers suivants ont des changements indexés :"
 
-#: 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)"
@@ -19452,44 +22232,49 @@ msgstr ""
 "\n"
 "(utilisez --cached pour garder le fichier, ou -f pour forcer la suppression)"
 
-#: 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] "le fichier suivant a des modifications locales :"
 msgstr[1] "les fichiers suivants ont des modifications locales :"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:244
 msgid "do not list removed files"
 msgstr "ne pas afficher les fichiers supprimés"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr "supprimer seulement de l'index"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
 msgstr "outrepasser la vérification des fichiers à jour"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr "autoriser la suppression récursive"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:249
 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:289
+#: builtin/rm.c:283
+msgid "No pathspec was given. Which files should I remove?"
+msgstr ""
+"Aucun spécificateur de chemin fourni. Quel fichier doit être supprimé ?"
+
+#: builtin/rm.c:310
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "veuillez indexer vos modifications de .gitmodules ou les remiser pour "
 "continuer"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:331
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "pas de suppression récursive de '%s' sans -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm : impossible de supprimer %s"
@@ -19507,57 +22292,79 @@ msgstr ""
 "  --all et la spécification explicite de <référence> sont mutuellement "
 "exclusifs."
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr "nom distant"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "utiliser un protocole RPC sans état"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "lire les références depuis l'entrée standard"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr "afficher les messages du greffon de protocole distant"
 
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] <chemin>...]"
 
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<options>]"
 
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "Grouper par validateur plutôt que par auteur"
+#: 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"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "l'utilisation de --group=trailer avec stdin n'est pas supportée"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "type de groupe inconnu : %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "grouper par validateur plutôt que par auteur"
 
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "trier la sortie sur le nombre de validations par auteur"
 
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
 msgstr ""
-"Supprimer les descriptions de validation, fournit seulement le nombre de "
+"supprimer les descriptions de validation, fournit seulement le nombre de "
 "validations"
 
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "Afficher l'adresse courriel de chaque auteur"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "afficher l'adresse courriel de chaque auteur"
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr "Couper les lignes"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "couper les lignes"
+
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "champ"
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "grouper par champ"
+
+#: builtin/shortlog.c:391
 msgid "too many arguments given outside repository"
 msgstr "trop d'arguments fournis hors d'un dépôt"
 
@@ -19659,7 +22466,7 @@ msgstr ""
 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr ""
-"--reflog est incompatible avec --all, --remotes, --independant et --merge-"
+"--reflog est incompatible avec --all, --remotes, --independent et --merge-"
 "base"
 
 #: builtin/show-branch.c:735
@@ -19699,6 +22506,14 @@ msgstr "'%s' n'est pas une référence valide."
 msgid "cannot find commit %s (%s)"
 msgstr "impossible de trouver le commit %s (%s)"
 
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "algorithme d'empreinte"
+
+#: builtin/show-index.c:31
+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 | --"
@@ -19748,41 +22563,122 @@ msgstr ""
 "afficher les références de l'entrée standard qui ne sont pas dans le dépôt "
 "local"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: 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) <options>"
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:72
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"cet arbre de travail n'est pas clairsemé (le fichier sparse-checkout "
+"pourrait ne pas exister)"
+
+#: builtin/sparse-checkout.c:227
+msgid "failed to create directory for sparse-checkout file"
+msgstr ""
+"échec de la création du répertoire pour le fichier d'extraction clairsemée"
+
+#: builtin/sparse-checkout.c:268
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+"impossible de mettre à jour le format de dépôt pour activer worktreeConfig"
+
+#: builtin/sparse-checkout.c:270
+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] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "initialiser l'extraction clairsemée en mode cone"
+
+#: builtin/sparse-checkout.c:312
+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
+#, c-format
+msgid "failed to open '%s'"
+msgstr "échec à l'ouverture de '%s'"
+
+#: builtin/sparse-checkout.c:413
+#, c-format
+msgid "could not normalize path %s"
+msgstr "impossible de normaliser le chemin '%s'"
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <motifs>)"
+
+#: builtin/sparse-checkout.c:450
+#, 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:504 builtin/sparse-checkout.c:528
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "impossible de charger les motifs de l'extraction clairsemée existants"
+
+#: builtin/sparse-checkout.c:573
+msgid "read patterns from standard in"
+msgstr "lire les motifs depuis l'entrée standard"
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:607
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:638
+msgid "error while refreshing working directory"
+msgstr "erreur lors du rafraîchissement du répertoire de travail"
+
+#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<options>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<options>] [<remise>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<remise>]"
 
-#: 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] [<remise>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nom-de-branche> [<remise>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28 builtin/stash.c:77
+#: 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"
+"          [--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 <message>]\n"
+"          [--pathspec-from-file=<fichier> [--pathspec-file-nul]]\n"
 "          [--] [<spécificateur-de-chemin>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: 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>]"
@@ -19790,191 +22686,231 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<remise>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<remise>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <message>] [-q|--quiet] <remise>"
 
-#: builtin/stash.c:127
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<spécificateur-de-chemin>...]]"
+
+#: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' n'est pas une validation de type remisage"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Trop de révisions spécifiées : %s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Aucune entrée de remisage trouvée."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s n'est pas une référence valide"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
-msgstr "git stash clear avec des paramètres n'est pas implémenté"
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
+msgstr "git stash clear avec des arguments n'est pas implémenté"
 
-#: builtin/stash.c:403
+#: 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 ""
+"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
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "impossible d'appliquer un remisage en cours de fusion"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:503
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "impossible de générer %s^!."
 
-#: builtin/stash.c:421
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:510
+msgid "conflicts in index. Try without --index."
 msgstr "conflits dans l'index. Essayez sans --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:516
 msgid "could not save index tree"
 msgstr "impossible de sauvegarder l'arbre d'index"
 
-#: builtin/stash.c:436
+#: 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:450
+#: builtin/stash.c:539
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Fusion de %s avec %s"
 
-#: builtin/stash.c:460 git-legacy-stash.sh:680
+#: builtin/stash.c:549
 msgid "Index was not unstashed."
 msgstr "L'index n'a pas été sorti de remise."
 
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:591 builtin/stash.c:689
 msgid "attempt to recreate the index"
 msgstr "tentative de recréer l'index"
 
-#: builtin/stash.c:555
+#: builtin/stash.c:635
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "%s supprimé (%s)"
 
-#: builtin/stash.c:558
+#: builtin/stash.c:638
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s : Impossible de supprimer l'élément de stash"
 
-#: builtin/stash.c:583
+#: builtin/stash.c:651
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' n'est pas une référence de remisage"
 
-#: builtin/stash.c:633 git-legacy-stash.sh:694
+#: builtin/stash.c:701
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 "L'entrée de remisage est conservée au cas où vous en auriez encore besoin."
 
-#: builtin/stash.c:656 git-legacy-stash.sh:712
+#: builtin/stash.c:724
 msgid "No branch name specified"
 msgstr "Aucune branche spécifiée"
 
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "échec de l'analyse de l'arbre"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "échec du dépaquetage des arbres"
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr "inclure les fichiers non suivis dans le remisage"
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr "ne montrer que les fichiers non suivis dans le remisage"
+
+#: builtin/stash.c:929 builtin/stash.c:966
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Impossible de mettre à jour %s avec %s"
 
-#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
 msgid "stash message"
 msgstr "message pour le remisage"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:957
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" exige un argument <commit>"
 
-#: builtin/stash.c:1046 git-legacy-stash.sh:217
+#: builtin/stash.c:1171
 msgid "No changes selected"
 msgstr "Aucun changement sélectionné"
 
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1271
 msgid "You do not have the initial commit yet"
 msgstr "Vous n'avez pas encore la validation initiale"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1298
 msgid "Cannot save the current index state"
 msgstr "Impossible de sauver l'état courant de l'index"
 
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1307
 msgid "Cannot save the untracked files"
 msgstr "Impossible de sauver les fichiers non-suivis"
 
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1318 builtin/stash.c:1327
 msgid "Cannot save the current worktree state"
 msgstr "Impossible de sauver l'état courant de la copie de travail"
 
-#: builtin/stash.c:1229 git-legacy-stash.sh:233
+#: builtin/stash.c:1355
 msgid "Cannot record working tree state"
 msgstr "Impossible d'enregistrer l'état de la copie de travail"
 
-#: builtin/stash.c:1278 git-legacy-stash.sh:337
+#: builtin/stash.c:1404
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "Impossible d'utiliser --patch et --include-untracked ou --all en même temps"
 
-#: builtin/stash.c:1294
+#: builtin/stash.c:1422
 msgid "Did you forget to 'git add'?"
 msgstr "Vous avez sûrement oublié 'git add' ?"
 
-#: builtin/stash.c:1309 git-legacy-stash.sh:345
+#: builtin/stash.c:1437
 msgid "No local changes to save"
 msgstr "Pas de modifications locales à sauver"
 
-#: builtin/stash.c:1316 git-legacy-stash.sh:350
+#: builtin/stash.c:1444
 msgid "Cannot initialize stash"
 msgstr "Impossible d'initialiser le remisage"
 
-#: builtin/stash.c:1331 git-legacy-stash.sh:354
+#: builtin/stash.c:1459
 msgid "Cannot save the current status"
 msgstr "Impossible de sauver l'état courant"
 
-#: builtin/stash.c:1336
+#: builtin/stash.c:1464
 #, 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:1426 git-legacy-stash.sh:384
+#: builtin/stash.c:1554
 msgid "Cannot remove worktree changes"
 msgstr "Impossible de supprimer les changements de la copie de travail"
 
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1593 builtin/stash.c:1658
 msgid "keep index"
 msgstr "conserver l'index"
 
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1595 builtin/stash.c:1660
 msgid "stash in patch mode"
 msgstr "remiser une mode rustine"
 
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1596 builtin/stash.c:1661
 msgid "quiet mode"
 msgstr "mode silencieux"
 
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1598 builtin/stash.c:1663
 msgid "include untracked files in stash"
 msgstr "inclure les fichiers non suivis dans la remise"
 
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1600 builtin/stash.c:1665
 msgid "include ignore files"
 msgstr "inclure les fichiers ignorés"
 
-#: builtin/stash.c:1564
-#, c-format
-msgid "could not exec %s"
-msgstr "impossible d'exécuter %s"
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"la prise en charge de stash.useBuiltin a été supprimée !\n"
+"Voir son entrée dans 'git help config' pour plus de détails."
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -19994,40 +22930,41 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr "ajouter devant chaque ligne le caractère de commentaire et un espace"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Nom de référence complet attendu, %s obtenu"
 
-#: builtin/submodule--helper.c:62
+#: 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:100
+#: 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:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
 msgid "alternative anchor for relative paths"
 msgstr "ancre alternative pour les chemins relatifs"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:416
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: 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 "URL non trouvée pour le chemin de sous-module '%s' dans .gitmodules"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:526
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entrée dans '%s'\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:529
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -20036,7 +22973,7 @@ msgstr ""
 "run_command a retourné un statut non-nul pour %s\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:551
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -20047,20 +22984,21 @@ msgstr ""
 "modules inclus de %s\n"
 "."
 
-#: builtin/submodule--helper.c:563
-msgid "Suppress output of entering each submodule command"
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
 msgstr ""
-"Supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
+"supprimer la sortie lors de l'entrée dans chaque commande de sous-module"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
-msgid "Recurse into nested submodules"
-msgstr "Parcourir récursivement les sous-modules"
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
+msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:574
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <commande>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:601
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -20069,109 +23007,159 @@ msgstr ""
 "impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
 "son propre amont d'autorité."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:668
 #, 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:669
+#: builtin/submodule--helper.c:672
 #, 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:679
+#: builtin/submodule--helper.c:682
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 "attention : nous vous suggérons de spécifier une commande de mode de mise à "
 "jour pour le sous-module '%s'\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:689
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Échec d'enregistrement du mode de mise à jour pour le chemin de sous-module "
 "'%s'"
 
-#: builtin/submodule--helper.c:708
-msgid "Suppress output for initializing a submodule"
-msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
+#: builtin/submodule--helper.c:711
+msgid "suppress output for initializing a submodule"
+msgstr "supprimer la sortie lors de l'initialisation d'un sous-module"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:716
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<options>] [<chemin>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, 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 "
+"pas de mise en correspondance du sous-module trouvé dans .gitmodules pour le "
 "chemin '%s'"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, 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:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "récursion impossible dans le sous-module '%s'"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
-msgid "Suppress submodule status output"
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
 msgstr "supprimer la sortie d'état du sous-module"
 
-#: builtin/submodule--helper.c:876
+#: 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 ""
-"Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
+"utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
 "du sous-module"
 
-#: builtin/submodule--helper.c:877
-msgid "recurse into nested submodules"
-msgstr "parcourir récursivement les sous-modules"
-
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper <nom> <chemin>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(submodule)"
+
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(submodule)->%s(blob)"
+
+#: builtin/submodule--helper.c:1007
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "impossible de calculer l'empreinte de l'objet depuis '%s'"
+
+#: builtin/submodule--helper.c:1061
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "mode %o inattendu\n"
+
+#: builtin/submodule--helper.c:1302
+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"
+
+#: builtin/submodule--helper.c:1304
+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:1306
+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:1308
+msgid "limit the summary size"
+msgstr "limiter la taille du résumé"
+
+#: builtin/submodule--helper.c:1313
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<options>] [<commit>] [--] [<chemin>]"
+
+#: builtin/submodule--helper.c:1337
+msgid "could not fetch a revision for HEAD"
+msgstr "impossible de récupérer une révision pour HEAD"
+
+#: builtin/submodule--helper.c:1342
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached et --files sont mutuellement exclusifs"
+
+#: builtin/submodule--helper.c:1409
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synchronisation de l'URL sous-module pour '%s'\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:1415
 #, 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:990
+#: builtin/submodule--helper.c:1429
 #, 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:1001
+#: builtin/submodule--helper.c:1440
 #, 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:1048
-msgid "Suppress output of synchronizing submodule url"
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
 msgstr ""
-"Supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
+"supprimer la sortie lors de la synchronisation de l'URL d'un sous-module"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1494
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<chemin>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1548
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20181,7 +23169,7 @@ msgstr ""
 "'rm -rf' si vous voulez vraiment le supprimer en incluant tout son "
 "historique)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1560
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20190,232 +23178,351 @@ msgstr ""
 "L'arbre de travail du sous-module '%s' contient des modifications locales ; "
 "utilisez '-f' pour les annuler"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Répertoire '%s' nettoyé\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1570
 #, 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:1142
+#: builtin/submodule--helper.c:1581
 #, 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:1158
+#: builtin/submodule--helper.c:1597
 #, 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:1187
-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 ""
-"Éliminer les arbres de travail des sous-modules même s'ils contiennent des "
+"éliminer les arbres de travail des sous-modules même s'ils contiennent des "
 "modifications locales"
 
-#: builtin/submodule--helper.c:1188
-msgid "Unregister all submodules"
-msgstr "Désenregistrer tous les sous-modules"
+#: builtin/submodule--helper.c:1627
+msgid "unregister all submodules"
+msgstr "désenregistrer tous les sous-modules"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1632
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<chemin>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1646
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 "Utilisez '--all' si vous voulez vraiment réinitialiser tous les sous-modules"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: 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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Une alternative calculée depuis l'alternative du super-projet est invalide.\n"
+"Pour permettre à Git de cloner sans alternative dans un tel cas, réglez\n"
+"submodule.alternateErrorStrategy à 'info', ou de manière équivalente,\n"
+"clonez avec '--reference-if-able' au lieu de '--reference'."
+
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
 #, 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:1341
+#: builtin/submodule--helper.c:1768
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 "La valeur '%s' pour submodule.alternateErrorStrategy n'est pas reconnue"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1775
 #, 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:1371
+#: builtin/submodule--helper.c:1800
+#, 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:1841
+#, 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:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "le répertoire n'est pas vide : '%s'"
+
+#: builtin/submodule--helper.c:1858
+#, 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:1890 builtin/submodule--helper.c:2894
 msgid "where the new submodule will be cloned to"
 msgstr "emplacement où le sous-module sera cloné"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
 msgid "name of the new submodule"
 msgstr "nom du nouveau sous-module"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
 msgid "url where to clone the submodule from"
 msgstr "URL depuis laquelle cloner le sous-module"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
 msgid "depth for shallow clones"
 msgstr "profondeur de l'historique des clones superficiels"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
 msgid "force cloning progress"
 msgstr "forcer l'affichage de la progression du clonage"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+msgid "disallow cloning into non-empty directory"
+msgstr "interdire de cloner dans un répertoire non-vide"
+
+#: builtin/submodule--helper.c:1916
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<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>]  --url <url> --path <chemin>"
-
-#: builtin/submodule--helper.c:1424
-#, 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:1438
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "impossible de créer le répertoire de sous-module pour '%s'"
+"<dépôt>] [--name <nom>] [--depth <profondeur>] [--single-branch] --url <url> "
+"--path <chemin>"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1953
 #, 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'"
+msgstr "Mode de mise à jour '%s' invalide pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1957
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "Mode de mise à jour '%s'invalide configuré pour le chemin de sous-module '%s'"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:2058
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:2062
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:2092
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Sous-module non fusionné %s non traité"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:2121
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Sous-module '%s' non traité"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:2271
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Impossible de cloner '%s'. Réessai prévu"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:2282
 #, 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:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
 msgid "path into the working tree"
 msgstr "chemin dans la copie de travail"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:2347
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "chemin dans la copie de travail, traversant les frontières de sous-modules"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:2351
 msgid "rebase, merge, checkout or none"
 msgstr "valeurs possibles : rebase, merge, checkout ou none"
 
-#: builtin/submodule--helper.c:1864
-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:2357
+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:1867
+#: builtin/submodule--helper.c:2360
 msgid "parallel jobs"
 msgstr "jobs parallèles"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2362
 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:1870
+#: builtin/submodule--helper.c:2363
 msgid "don't print cloning progress"
 msgstr "ne pas afficher la progression du clonage"
 
-#: builtin/submodule--helper.c:1877
+#: builtin/submodule--helper.c:2374
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<chemin>] [<chemin>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:2387
 msgid "bad value for update parameter"
 msgstr "valeur invalide pour la mise à jour du paramètre"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:2435
 #, 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 "
+"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:2061
+#: builtin/submodule--helper.c:2558
 #, 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:2094
+#: builtin/submodule--helper.c:2591
 msgid "recurse into submodules"
 msgstr "parcourir récursivement les sous-modules"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2597
 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:2156
+#: builtin/submodule--helper.c:2653
 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:2159
+#: builtin/submodule--helper.c:2656
 msgid "unset the config in the .gitmodules file"
 msgstr "désactiver la configuration dans le fichier .gitmodules"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2661
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config name [<valeur>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2662
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nom>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2663
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: 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 ""
 "veuillez vous assurer que le fichier .gitmodules est dans l'arbre de travail"
 
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
+#: builtin/submodule--helper.c:2698
+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:2702
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper sync [--quiet] <chemin> <nouvelle-url>"
+
+#: builtin/submodule--helper.c:2735
+msgid "set the default tracking branch to master"
+msgstr "régler la branche de suivi par défaut à master"
+
+#: builtin/submodule--helper.c:2737
+msgid "set the default tracking branch"
+msgstr "régler la branche de suivi par défaut"
+
+#: builtin/submodule--helper.c:2741
+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:2742
+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:2749
+msgid "--branch or --default required"
+msgstr "--branch ou --default requis"
+
+#: builtin/submodule--helper.c:2752
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch et --default sont mutuellement exclusifs"
+
+#: builtin/submodule--helper.c:2815
+#, 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:2818
+#, 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:2828
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr "Un répertoire git pour '%s' est trouvé en local avec le(s) serveur(s) distant(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 ""
+"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'.\n"
+
+#: builtin/submodule--helper.c:2842
+#, 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:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Impossible d'extraire le sous-module '%s'"
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr "la branche du dépôt à extraire lors du clonage"
+
+#: builtin/submodule--helper.c:2910
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "permettre l'ajout des chemins de modules ignorés par ailleurs"
+
+#: builtin/submodule--helper.c:2917
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr "git submodule--helper add-clone [<options>...] --url <url> --path <chemin> --name <nom>"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s ne gère pas --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2991
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -20428,24 +23535,24 @@ msgstr "git symbolic-ref [<options>] nom [<référence>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <nom>"
 
-#: builtin/symbolic-ref.c:40
+#: 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)"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "supprimer la référence symbolique"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "raccourcir l'affichage de la référence"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr "raison"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "raison de la mise à jour"
 
@@ -20465,27 +23572,29 @@ msgstr "git tag -d <nométiquette>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--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>] [--[no-]merged [<commit>]] [<motif>...]"
+"\t\t[--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>..."
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "étiquette '%s' non trouvée."
 
-#: builtin/tag.c:105
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
 
-#: builtin/tag.c:135
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -20498,7 +23607,7 @@ msgstr ""
 "  %s\n"
 "Les lignes commençant par '%c' seront ignorées.\n"
 
-#: builtin/tag.c:139
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -20513,15 +23622,11 @@ msgstr ""
 "Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
 "même si vous le souhaitez.\n"
 
-#: builtin/tag.c:198
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "impossible de signer l'étiquette"
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "impossible d'écrire le fichier d'étiquettes"
-
-#: 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"
@@ -20536,351 +23641,351 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:232
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "mauvais type d'objet."
 
-#: builtin/tag.c:284
+#: builtin/tag.c:328
 msgid "no tag message?"
 msgstr "pas de message pour l'étiquette ?"
 
-#: builtin/tag.c:291
+#: builtin/tag.c:335
 #, 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:402
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr "afficher les noms des étiquettes"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr "affiche <n> lignes de chaque message d'étiquette"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr "supprimer des étiquettes"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr "vérifier des étiquettes"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr "Options de création de l'étiquette"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr "étiquette annotée, nécessite un message"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:457
 msgid "tag message"
 msgstr "message pour l'étiquette"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:459
 msgid "force edit of tag message"
 msgstr "forcer l'édition du message d'étiquetage"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr "étiquette annotée et signée avec GPG"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr "utiliser une autre clé pour signer l'étiquette"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
 msgstr "remplacer l'étiquette si elle existe"
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "créer un reflog"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr "Options d'affichage des étiquettes"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr "afficher la liste des étiquettes sous forme de colonnes"
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that contain the commit"
 msgstr "afficher seulement les étiquettes qui contiennent la validation"
 
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:470 builtin/tag.c:472
 msgid "print only tags that don't contain the commit"
 msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
 
-#: builtin/tag.c:429
+#: builtin/tag.c:473
 msgid "print only tags that are merged"
 msgstr "afficher seulement les étiquettes qui sont fusionnées"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:474
 msgid "print only tags that are not merged"
 msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
 
-#: builtin/tag.c:434
+#: builtin/tag.c:478
 msgid "print only tags of the object"
 msgstr "afficher seulement les étiquettes de l'objet"
 
-#: builtin/tag.c:482
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
 msgstr "--column et -n sont incompatibles"
 
-#: builtin/tag.c:504
+#: 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:506
+#: 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:508
+#: 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"
+msgstr "l'option --no-contains est autorisée seulement en mode liste"
 
-#: builtin/tag.c:510
+#: 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:512
+#: 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:523
+#: 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:542
-msgid "too many params"
-msgstr "trop de paramètres"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:592
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' n'est pas un nom d'étiquette valide."
 
-#: builtin/tag.c:553
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "l'étiquette '%s' existe déjà"
 
-#: builtin/tag.c:584
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Dépaquetage des objets"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "échec de la création du répertoire %s"
 
-#: builtin/update-index.c:99
+#: 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:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "échec de la suppression du fichier %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "échec de la suppression du répertoire %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Test du mtime dans '%s' "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 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"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 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"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 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"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 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"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 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<"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 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"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<options>] [--] [<fichier>...]"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:976
 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:975
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr "rafraîchir : ignorer les sous-modules"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
 msgid "do not ignore new files"
 msgstr "ne pas ignorer les nouveaux fichiers"
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:984
 msgid "let files replace directories and vice-versa"
 msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
 msgid "notice files missing from worktree"
 msgstr "aviser des fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:988
 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:987
+#: builtin/update-index.c:991
 msgid "refresh stat information"
 msgstr "rafraîchir l'information de stat"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr "<mode>, <objet>, <chemin>"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1000
 msgid "add the specified entry to the index"
 msgstr "ajouter l'élément spécifié dans l'index"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1010
 msgid "mark files as \"not changing\""
 msgstr "marquer les fichiers comme \"non changeants\""
 
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
 msgstr "mettre à zéro le bit supposé-non-modifié"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
 msgstr "marquer les fichiers comme \"index seulement\""
 
-#: builtin/update-index.c:1015
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
 msgstr "mettre à zéro le bit sauter-la-copie-de travail"
 
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr "ne pas toucher aux entrées restreintes à l'index"
+
+#: builtin/update-index.c:1024
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "ajouter seulement à l'index ; ne pas ajouter le contenu dans la base de "
 "données des objets"
 
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1026
 msgid "remove named paths even if present in worktree"
 msgstr ""
 "supprimer les chemins nommés même s'ils sont présents dans la copie de "
 "travail"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1028
 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:1024
+#: builtin/update-index.c:1030
 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:1028
+#: builtin/update-index.c:1034
 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:1032
+#: builtin/update-index.c:1038
 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:1036
+#: builtin/update-index.c:1042
 msgid "only update entries that differ from HEAD"
 msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
 
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1046
 msgid "ignore files missing from worktree"
 msgstr "ignorer les fichiers manquants dans la copie de travail"
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1049
 msgid "report actions to standard output"
 msgstr "afficher les actions sur la sortie standard"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1051
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr "écrire l'index dans ce format"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
 msgstr "activer ou désactiver l'index divisé"
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1059
 msgid "enable/disable untracked cache"
 msgstr "activer ou désactiver le cache de non-suivis"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1061
 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:1057
+#: builtin/update-index.c:1063
 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:1059
+#: builtin/update-index.c:1065
 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:1061
+#: builtin/update-index.c:1067
 msgid "enable or disable file system monitor"
 msgstr ""
 "activer ou désactiver la surveillance du système de fichier (fsmonitor)"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1069
 msgid "mark files as fsmonitor valid"
 msgstr "marquer les fichiers comme valides pour fsmonitor"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c:1072
 msgid "clear fsmonitor valid bit"
 msgstr "effacer le bit de validité fsmonitor"
 
-#: builtin/update-index.c:1169
+#: builtin/update-index.c:1175
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20888,7 +23993,7 @@ msgstr ""
 "core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment activer l'index coupé"
 
-#: builtin/update-index.c:1178
+#: builtin/update-index.c:1184
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20896,7 +24001,7 @@ msgstr ""
 "core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment désactiver l'index coupé"
 
-#: builtin/update-index.c:1190
+#: 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"
@@ -20904,11 +24009,11 @@ msgstr ""
 "core.untrackedCache est réglé à true ; supprimez-le ou changez-le si vous "
 "souhaitez vraiment désactiver le cache des fichiers non-suivis"
 
-#: builtin/update-index.c:1194
+#: builtin/update-index.c:1200
 msgid "Untracked cache disabled"
 msgstr "Le cache non suivi est désactivé"
 
-#: builtin/update-index.c:1202
+#: 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"
@@ -20916,29 +24021,29 @@ 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
+#: builtin/update-index.c:1212
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Le cache non suivi est activé pour '%s'"
 
-#: builtin/update-index.c:1214
+#: builtin/update-index.c:1220
 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"
 
-#: builtin/update-index.c:1218
+#: builtin/update-index.c:1224
 msgid "fsmonitor enabled"
 msgstr "fsmonitor activé"
 
-#: builtin/update-index.c:1221
+#: 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
+#: builtin/update-index.c:1231
 msgid "fsmonitor disabled"
 msgstr "fsmonitor désactivé"
 
@@ -20956,19 +24061,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<options>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "supprimer la référence"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
 msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr "l'entrée standard a des arguments qui se terminent par NUL"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr "lire les mises à jour depuis l'entrée standard"
 
@@ -20990,13 +24095,12 @@ 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"
+msgstr "sortir immédiatement après l'annonce initiale des références"
 
 #: builtin/upload-pack.c:27
 msgid "do not try <directory>/.git/ if <directory> is no Git directory"
 msgstr ""
-"nes pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire "
-"Git"
+"ne pas essayer <répertoire>/.git/ si <répertoire> n'est pas un répertoire Git"
 
 #: builtin/upload-pack.c:29
 msgid "interrupt transfer after <n> seconds of inactivity"
@@ -21014,15 +24118,15 @@ msgstr "afficher le contenu du commit"
 msgid "print raw gpg status output"
 msgstr "afficher les messages bruts de gpg"
 
-#: builtin/verify-pack.c:55
+#: 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>..."
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "verbeux"
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "afficher seulement les statistiques"
 
@@ -21034,236 +24138,224 @@ msgstr "git verify-tag [-v | --verbose] [--format=<format>] <étiquette>..."
 msgid "print tag contents"
 msgstr "afficher le contenu de l'étiquette"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<options>] <chemin> [<commit>]"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<options>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<options>] <chemin>"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbre-de-travail> <nouveau-chemin>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<options>]"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<options>] <arbre-de-travail>"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <chemin>"
 
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:61 builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "échec de la suppression de '%s'"
 
-#: builtin/worktree.c:79
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Suppression de worktrees/%s : répertoire invalide"
-
-#: builtin/worktree.c:85
+#: builtin/worktree.c:74
 #, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
+msgid "Removing %s/%s: %s"
+msgstr "Suppression de %s/%s : %s"
 
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr ""
-"Suppression de worktrees/%s : échec de la lecture du fichier gitdir (%s)"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets "
-"attendus, %<PRIuMAX> octets lus)"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-"Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
-"inexistant"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "afficher les arbres de travail éliminés"
 
-#: builtin/worktree.c:167
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "faire expirer les arbres de travail plus vieux que <temps>"
 
-#: builtin/worktree.c:234
+#: builtin/worktree.c:219
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' existe déjà"
 
-#: builtin/worktree.c:251
+#: builtin/worktree.c:228
 #, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "impossible de ré-ajouter l'arbre de travail '%s'"
+msgid "unusable worktree destination '%s'"
+msgstr "arbre de travail destination '%s' inutilisable"
 
-#: builtin/worktree.c:256
+#: builtin/worktree.c:233
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"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 'add -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' "
+"utilisez '%s -f -f' pour passer outre, ou 'unlock' et 'prune' ou 'remove' "
 "pour corriger"
 
-#: builtin/worktree.c:258
+#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 "'%s' est un arbre de travail manquant mais déjà enregistré ;\n"
-"utilisez 'add -f' pour passer outre, ou 'prune' ou 'remove' pour corriger"
+"utilisez '%s -f' pour passer outre, ou 'prune' ou 'remove' pour corriger"
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:286
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "impossible de créer le répertoire de '%s'"
 
-#: builtin/worktree.c:439 builtin/worktree.c:445
+#: builtin/worktree.c:308
+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:441
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "Préparation de l'arbre de travail (réinitialisation de la branche '%s' ; "
 "précédemment sur %s)"
 
-#: builtin/worktree.c:450
+#: 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:456
+#: 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:497
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "extraire la <branche> même si elle est déjà extraite dans une autre copie de "
 "travail"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "créer une nouvelle branche"
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "créer ou réinitialiser une branche"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "remplissage de la nouvelle copie de travail"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "conserver le verrou sur le nouvel arbre de travail"
 
-#: builtin/worktree.c:508
+#: 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:511
+#: 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:519
+#: builtin/worktree.c:506
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B et --detach sont mutuellement exclusifs"
 
-#: builtin/worktree.c:580
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr "--reason exige --lock"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "ajouté avec --lock"
+
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 "--[no-]track ne peut être utilisé qu'à la création d'une nouvelle branche"
 
-#: builtin/worktree.c:680
-msgid "reason for locking"
-msgstr "raison du verrouillage"
+#: 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:693
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+"ajouter l'annotation 'prunable' aux arbres de travail plus vieux que <temps>"
 
-#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: builtin/worktree.c:702
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose et --porcelain sont mutuellement exclusifs"
+
+#: 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:694 builtin/worktree.c:727
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 "La copie de travail principale ne peut pas être verrouillée ou déverrouillée"
 
-#: builtin/worktree.c:699
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' est déjà verrouillé, car '%s'"
 
-#: builtin/worktree.c:701
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' est déjà verrouillé"
 
-#: builtin/worktree.c:729
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' n'est pas verrouillé"
 
-#: builtin/worktree.c:770
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "les arbres de travail contenant des sous-modules ne peuvent pas être "
 "déplacés ou supprimés"
 
-#: builtin/worktree.c:778
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 "forcer le déplacement même si l'arbre de travail est sale ou verrouillé"
 
-#: builtin/worktree.c:801 builtin/worktree.c:928
+#: 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:806
+#: 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:812
-#, c-format
-msgid "target '%s' already exists"
-msgstr "la cible '%s' existe déjà"
-
-#: builtin/worktree.c:820
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -21273,7 +24365,7 @@ msgstr ""
 "verrouillage : %s\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:822
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -21281,39 +24373,39 @@ msgstr ""
 "impossible de déplacer un arbre de travail verrouillé;\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:825
+#: 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:830
+#: 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:878
+#: 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:882
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "'%s' contient des fichiers modifiés ou non-suivis, utilisez --force pour le "
 "supprimer"
 
-#: builtin/worktree.c:887
+#: 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:910
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 "forcer la suppression même si l'arbre de travail est sale ou verrouillé"
 
-#: builtin/worktree.c:933
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -21323,7 +24415,7 @@ msgstr ""
 "verrouillage : %s\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:935
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -21331,12 +24423,22 @@ msgstr ""
 "impossible de supprimer un arbre de travail verrouillé;\n"
 "utilisez 'move -f -f' pour outrepasser ou déverrouiller avant"
 
-#: builtin/worktree.c:938
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 "la validation a échoué, impossible de supprimer l'arbre de travail : %s"
 
+#: builtin/worktree.c:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr "réparation : %s : '%s'"
+
+#: builtin/worktree.c:1011
+#, c-format
+msgid "error: %s: %s"
+msgstr "erreur : %s : %s"
+
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<préfixe>/]"
@@ -21353,57 +24455,14 @@ msgstr "écrire l'objet arbre pour un sous-répertoire <préfixe>"
 msgid "only useful for debugging"
 msgstr "seulement utile pour le débogage"
 
-#: fast-import.c:3118
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "commande 'mark' attendue, %s trouvé"
-
-#: fast-import.c:3123
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "commande 'to' attendue, %s trouvé"
-
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"Les permissions de votre répertoire de socket sont trop permissives ;\n"
-"les autres utilisateurs pourraient lire vos identifiants secrets. Lancez :\n"
-"\n"
-"    chmod 0700 %s"
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "afficher les messages de debug sur stderr"
-
-#: t/helper/test-reach.c:152
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "le commit %s n'est pas marqué joignable"
-
-#: t/helper/test-reach.c:162
-msgid "too many commits marked reachable"
-msgstr "trop de commits marqués joignables"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<options>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "sortir immédiatement après l'annonce des capacités"
-
-#: git.c:27
+#: git.c:28
 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"
 "           [--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"
@@ -21412,9 +24471,11 @@ msgstr ""
 "           [-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"
 "           <commande> [<args>]"
 
-#: git.c:34
+#: 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"
@@ -21426,47 +24487,52 @@ 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:186
+#: git.c:188
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "aucun répertoire fourni pour --git-dir\n"
 
-#: git.c:200
+#: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "aucun espace de nom fournit pour --namespace\n"
 
-#: git.c:214
+#: git.c:216
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "aucun répertoire fourni pour --work-tree\n"
 
-#: git.c:228
+#: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "aucun préfixe fourni pour --super-prefix\n"
 
-#: git.c:250
+#: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c requiert une chaîne de configuration\n"
 
-#: git.c:288
+#: git.c:260
+#, c-format
+msgid "no config key given for --config-env\n"
+msgstr "aucune clé de configuration fournie pour --config-env\n"
+
+#: git.c:300
 #, c-format
 msgid "no directory given for -C\n"
 msgstr "aucun répertoire fourni pour -C\n"
 
-#: git.c:314
+#: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "option inconnue : %s\n"
 
-#: git.c:360
+#: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr "lors de l'expansion de l'alias '%s' : '%s'"
 
-#: git.c:369
+#: git.c:384
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -21475,39 +24541,39 @@ msgstr ""
 "l'alias '%s' modifie les variables d'environnement.\n"
 "Vous pouvez utiliser '!git' dans l'alias pour le faire"
 
-#: git.c:376
+#: git.c:391
 #, c-format
 msgid "empty alias for %s"
 msgstr "alias vide pour %s"
 
-#: git.c:379
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr "alias recursif : %s"
 
-#: git.c:459
+#: git.c:476
 msgid "write failure on standard output"
 msgstr "échec d'écriture sur la sortie standard"
 
-#: git.c:461
+#: git.c:478
 msgid "unknown write failure on standard output"
 msgstr "échec inconnu d'écriture sur la sortie standard"
 
-#: git.c:463
+#: git.c:480
 msgid "close failed on standard output"
 msgstr "échec de fermeture de la sortie standard"
 
-#: git.c:792
+#: git.c:833
 #, 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:842
+#: git.c:883
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "impossible d'utiliser %s comme une fonction intégrée"
 
-#: git.c:855
+#: git.c:896
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -21516,57 +24582,209 @@ msgstr ""
 "usage : %s\n"
 "\n"
 
-#: git.c:875
+#: git.c:916
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 "l'expansion de l'alias '%s' a échoué : '%s' n'est pas une commande git\n"
 
-#: git.c:887
+#: git.c:928
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "échec au lancement de la commande '%s' : %s\n"
 
-#: http.c:378
+#: http-fetch.c:118
+#, 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
+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"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "erreur lors de la préparation des révisions"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "le commit %s n'est pas marqué joignable"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "trop de commits marqués joignables"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<options>]"
+
+#: t/helper/test-serve-v2.c:19
+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
+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
+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
+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>]"
+
+#: t/helper/test-simple-ipc.c:685
+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
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<nom>] [<jeton>]"
+
+#: t/helper/test-simple-ipc.c:687
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+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:696
+msgid "name or pathname of unix domain socket"
+msgstr "nom ou nom de chemin du socket unix"
+
+#: t/helper/test-simple-ipc.c:698
+msgid "named-pipe name"
+msgstr "nom du pipe nommé"
+
+#: t/helper/test-simple-ipc.c:700
+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"
+
+#: t/helper/test-simple-ipc.c:701
+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
+msgid "number of bytes"
+msgstr "nombre d'octets"
+
+#: t/helper/test-simple-ipc.c:704
+msgid "number of requests per thread"
+msgstr "nombre de requêtes par fil d'exécution"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr "octet"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr "caractère ballast"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr "jeton"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "command token to send to the server"
+msgstr "jeton de commande à envoyer au serveur"
+
+#: http.c:399
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr ""
 "valeur négative pour http.postbuffer ; utilisation de la valeur par défaut %d"
 
-#: http.c:399
+#: http.c:420
 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:408
+#: 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:878
+#: http.c:910
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
-msgstr "CURLSSLOPT_NO_REMOVE n'est pas supporté avec cuRL < 7.44.0"
+msgstr "CURLSSLOPT_NO_REVOKE n'est pas supporté avec cuRL < 7.44.0"
 
-#: http.c:951
+#: 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"
 
-#: http.c:1088
+#: http.c:1132
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Dorsale SSL '%s' non supportée. Dorsales SSL supportées :"
 
-#: http.c:1095
+#: http.c:1139
 #, 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"
 
-#: http.c:1099
+#: http.c:1143
 #, 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:1968
+#: http.c:2034
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21577,154 +24795,196 @@ msgstr ""
 "      demandé : %s\n"
 "  redirection : %s"
 
-#: remote-curl.c:166
+#: remote-curl.c:183
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "citation invalide dans la valeur push-option : '%s'"
 
-#: remote-curl.c:263
+#: remote-curl.c:307
 #, 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:364
+#: remote-curl.c:408
 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:395
+#: remote-curl.c:439
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "réponse du serveur invalide ; '%s' reçu"
 
-#: remote-curl.c:455
+#: remote-curl.c:499
 #, c-format
 msgid "repository '%s' not found"
 msgstr "dépôt '%s' non trouvé"
 
-#: remote-curl.c:459
+#: remote-curl.c:503
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Échec d'authentification pour '%s'"
 
-#: remote-curl.c:463
+#: remote-curl.c:507
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "impossible d'accéder à '%s' : %s"
 
-#: remote-curl.c:469
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirection vers %s"
 
-#: remote-curl.c:593
+#: remote-curl.c:644
 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:673
+#: remote-curl.c:656
+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: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"
 
-#: remote-curl.c:733
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl : mauvais caractère de longueur de ligne : %.4s"
+
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl : paquet de fin de réponse inattendu"
+
+#: remote-curl.c:834
 #, c-format
 msgid "RPC failed; %s"
 msgstr "échec RPC ; %s"
 
-#: remote-curl.c:773
+#: remote-curl.c:874
 msgid "cannot handle pushes this big"
 msgstr "impossible de gérer des poussées aussi grosses"
 
-#: remote-curl.c:888
+#: remote-curl.c:989
 #, 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:892
+#: remote-curl.c:993
 #, 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:1023
+#: remote-curl.c:1043
+#, 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:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d octets de corps sont encore attendus"
+
+#: remote-curl.c:1134
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "le protocole http idiot ne supporte la capacité superficielle"
 
-#: remote-curl.c:1037
+#: remote-curl.c:1149
 msgid "fetch failed."
 msgstr "échec du récupération."
 
-#: remote-curl.c:1085
+#: remote-curl.c:1195
 msgid "cannot fetch by sha1 over smart http"
 msgstr "impossible de récupérer par sha1 sur http intelligent"
 
-#: remote-curl.c:1129 remote-curl.c:1135
+#: remote-curl.c:1239 remote-curl.c:1245
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "erreur de protocole : sha/ref attendu, '%s' trouvé"
 
-#: remote-curl.c:1147 remote-curl.c:1261
+#: remote-curl.c:1257 remote-curl.c:1375
 #, c-format
 msgid "http transport does not support %s"
 msgstr "le transport http ne supporte pas %s"
 
-#: remote-curl.c:1183
+#: remote-curl.c:1293
 msgid "git-http-push failed"
 msgstr "échec de git-http-push"
 
-#: remote-curl.c:1367
+#: remote-curl.c:1481
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: usage: git remote-curl <distant> [<url>]"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1513
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl : erreur de lecture du flux de commande depuis git"
 
-#: remote-curl.c:1406
+#: remote-curl.c:1520
 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:1446
+#: remote-curl.c:1561
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl : commande inconnue '%s' depuis git"
 
-#: list-objects-filter-options.h:85
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "aucune information de compilateur disponible\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "aucune information de libc disponible\n"
+
+#: list-objects-filter-options.h:94
 msgid "args"
 msgstr "args"
 
-#: list-objects-filter-options.h:86
+#: list-objects-filter-options.h:95
 msgid "object filtering"
 msgstr "filtrage d'objet"
 
-#: parse-options.h:179
+#: parse-options.h:184
 msgid "expiry-date"
 msgstr "date-d'expiration"
 
-#: parse-options.h:193
+#: parse-options.h:198
 msgid "no-op (backward compatibility)"
 msgstr "sans action (rétrocompatibilité)"
 
-#: parse-options.h:305
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "être plus verbeux"
 
-#: parse-options.h:307
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "être plus silencieux"
 
-#: parse-options.h:313
-msgid "use <n> digits to display SHA-1s"
-msgstr "utiliser <n> chiffres pour afficher les SHA-1s"
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
+msgstr "utiliser <n> chiffres pour afficher les noms des objets"
 
-#: parse-options.h:332
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "comment éliminer les espaces et les commentaires # du message"
 
-#: ref-filter.h:101
+#: parse-options.h:338
+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"
+
+#: ref-filter.h:99
 msgid "key"
 msgstr "clé"
 
-#: ref-filter.h:101
+#: ref-filter.h:99
 msgid "field name to sort on"
 msgstr "nom du champ servant à trier"
 
@@ -21733,14 +24993,6 @@ 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"
 
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "HEAD détachée sur "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD détachée depuis "
-
 #: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Ajouter le contenu de fichiers dans l'index"
@@ -21780,691 +25032,680 @@ msgid "List, create, or delete branches"
 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"
+
+#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Déplacer les objets et références par archive"
 
-#: command-list.h:60
+#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
-"Fournir les contenu ou l'information de type et taille pour les objets du "
+"Fournir le contenu ou l'information de type et taille pour les objets du "
 "dépôt"
 
-#: command-list.h:61
+#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Afficher les informations gitattributes"
 
-#: command-list.h:62
+#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Déboguer gitignore / les fichiers d'exclusion"
 
-#: command-list.h:63
+#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Afficher les noms canoniques et les adresses courriel des contacts"
 
-#: command-list.h:64
+#: command-list.h:65
 msgid "Switch branches or restore working tree files"
 msgstr "Basculer de branche ou restaurer la copie de travail"
 
-#: command-list.h:65
+#: command-list.h:66
 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:66
+#: command-list.h:67
 msgid "Ensures that a reference name is well formed"
-msgstr "Assure qu'un nom de référence est bien formé"
+msgstr "S'assurer qu'un nom de référence est bien formé"
 
-#: command-list.h:67
+#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Trouver les commits à appliquer en amont"
 
-#: command-list.h:68
+#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Appliquer les modifications introduites par des commits existants"
 
-#: command-list.h:69
+#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Alternative graphique à git-commit"
 
-#: command-list.h:70
+#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Supprimer les fichiers non-suivis de l'arbre de travail"
 
-#: command-list.h:71
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Cloner un dépôt dans un nouveau répertoire"
 
-#: command-list.h:72
+#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Afficher les données en colonnes"
 
-#: command-list.h:73
+#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Enregistrer les modifications dans le dépôt"
 
-#: command-list.h:74
+#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Écrire et vérifier les fichiers de graphe de commit Git"
 
-#: command-list.h:75
+#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Créer un nouvel objet commit"
 
-#: command-list.h:76
+#: command-list.h:77
 msgid "Get and set repository or global options"
-msgstr "voir et régler les options globales ou de dépôt"
+msgstr "Voir et régler les options globales ou de dépôt"
 
-#: command-list.h:77
+#: 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"
 
-#: command-list.h:78
+#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Récupérer et sauvegarder les certificats d'utilisateur"
 
-#: command-list.h:79
+#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Assistant pour maintenir temporairement en mémoire les mots de passe"
 
-#: command-list.h:80
+#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Assistant pour sauvegarder les certificats sur disque"
 
-#: command-list.h:81
+#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Exporter un commit unique en extraction CVS"
 
-#: command-list.h:82
+#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Sauver vos données depuis un autre SCM qu'on aime à haïr"
 
-#: command-list.h:83
+#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Un émulateur de serveur CVS pour Git"
 
-#: command-list.h:84
+#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Un serveur vraiment simple pour les dépôts Git"
 
-#: command-list.h:85
+#: 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"
 
-#: command-list.h:86
+#: 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"
 
-#: command-list.h:87
+#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Compare des fichiers de l'arbre de travail et de l'index"
 
-#: command-list.h:88
+#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Comparer un arbre avec l'arbre de travail ou l'index"
 
-#: command-list.h:89
+#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
-msgstr "Compare le contenu et la mode des blobs trouvés via deux objets arbre"
+msgstr "Compare le contenu et le mode des blobs trouvés via deux objets arbre"
 
-#: command-list.h:90
+#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Afficher les modifications en utilisant les outils habituel de diff"
 
-#: command-list.h:91
+#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Exporteur de données Git"
 
-#: command-list.h:92
+#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Moteur pour les importateurs rapides de données Git"
 
-#: command-list.h:93
+#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Télécharger les objets et références depuis un autre dépôt"
 
-#: command-list.h:94
+#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Télécharger les objets manquants depuis un autre dépôt"
 
-#: command-list.h:95
+#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Réécrire les branches"
 
-#: command-list.h:96
+#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Produire un message de validation de fusion"
 
-#: command-list.h:97
+#: command-list.h:98
 msgid "Output information on each ref"
-msgstr "Afficher l'information de chaque référence"
+msgstr "Afficher de l'information sur chaque référence"
 
-#: command-list.h:98
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "Lance une commande Git sur une liste de dépôts"
+
+#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Préparer les patchs pour soumission par courriel"
 
-#: command-list.h:99
+#: 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"
 
-#: command-list.h:100
+#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Effacer les fichiers non-nécessaires et optimiser le dépôt local"
 
-#: command-list.h:101
+#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "Extraire l'ID du commit depuis une archive créée par git-archive"
 
-#: command-list.h:102
+#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Afficher les lignes correspondant à un motif"
 
-#: command-list.h:103
+#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Une interface graphique portable pour Git"
 
-#: command-list.h:104
+#: 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"
 
-#: command-list.h:105
+#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Afficher l'information d'aide à propos de Git"
 
-#: command-list.h:106
+#: command-list.h:108
 msgid "Server side implementation of Git over HTTP"
 msgstr "Implantation côté serveur de Git sur HTTP"
 
-#: command-list.h:107
+#: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Télécharger depuis un dépôt Git distant via HTTP"
 
-#: command-list.h:108
+#: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Pousser les objets sur un autre dépôt via HTTP/DAV"
 
-#: command-list.h:109
+#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
-msgstr "Envoyer un ensemble de patchs depuis stdin vers un répertoire IMAP"
+msgstr "Envoyer un ensemble de rustines depuis stdin vers un répertoire IMAP"
 
-#: command-list.h:110
+#: 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"
 
-#: command-list.h:111
+#: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Créer un dépôt Git vide ou réinitialiser un existant"
 
-#: command-list.h:112
+#: command-list.h:114
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Naviguer instantanément votre dépôt de travail dans gitweb"
 
-#: command-list.h:113
+#: 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"
 
-#: command-list.h:114
+#: command-list.h:116
 msgid "The Git repository browser"
 msgstr "Le navigateur de dépôt Git"
 
-#: command-list.h:115
+#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Afficher l'historique des validations"
 
-#: command-list.h:116
+#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr ""
 "Afficher l'information à propos des fichiers dans l'index ou l'arbre de "
 "travail"
 
-#: command-list.h:117
+#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Lister les références dans un dépôt distant"
 
-#: command-list.h:118
+#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Afficher le contenu d'un objet arbre"
 
-#: command-list.h:119
+#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr ""
 "Extraire le patch et l'information de d'auteur depuis un simple message de "
 "courriel"
 
-#: command-list.h:120
+#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Programme simple de découpage de mbox UNIX"
 
-#: command-list.h:121
+#: command-list.h:123
+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
 msgid "Join two or more development histories together"
 msgstr "Fusionner deux ou plusieurs historiques de développement ensemble"
 
-#: command-list.h:122
+#: command-list.h:125
 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:123
+#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Lancer une fusion à 3 points"
 
-#: command-list.h:124
+#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "Lancer une fusion à 3 points pour les fichiers à fusionner"
 
-#: command-list.h:125
+#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Le programme assistant standard à utiliser avec git-merge-index"
 
-#: command-list.h:126
+#: 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:127
+#: command-list.h:130
 msgid "Show three-way merge without touching index"
 msgstr "Afficher la fusion à trois points sans modifier l'index"
 
-#: command-list.h:128
+#: 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 "Creates a tag object"
-msgstr "Créer un objet étiquette"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Créer un objet étiquette avec validation supplémentaire"
 
-#: command-list.h:130
+#: command-list.h:133
 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:131
+#: command-list.h:134
 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:132
+#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Trouver les noms symboliques pour des révisions données"
 
-#: command-list.h:133
+#: command-list.h:136
 msgid "Add or inspect object notes"
-msgstr "Ajouter ou inspecter les notes d'un objets"
+msgstr "Ajouter ou inspecter les notes d'un objet"
 
-#: command-list.h:134
+#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importer et soumettre à des dépôt Perforce"
 
-#: command-list.h:135
+#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Créer une archive compactée d'objets"
 
-#: command-list.h:136
+#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Trouver les fichiers pack redondants"
 
-#: command-list.h:137
+#: command-list.h:140
 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:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr ""
-"Routines pour aider à analyser les paramètres d'accès aux dépôts distants"
-
-#: command-list.h:139
+#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Calculer l'ID unique d'un patch"
 
-#: command-list.h:140
+#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr ""
 "Éliminer les objets inatteignables depuis la base de données des objets"
 
-#: command-list.h:141
+#: command-list.h:143
 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:142
+#: command-list.h:144
 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:143
+#: command-list.h:145
 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:144
+#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Appliquer un patchset quilt sur la branche courante"
 
-#: command-list.h:145
+#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 "Comparer deux plages de commits (par exemple deux versions d'une branche)"
 
-#: command-list.h:146
+#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Lire l'information d'arbre dans l'index"
 
-#: command-list.h:147
+#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Réapplication des commits sur le sommet de l'autre base"
 
-#: command-list.h:148
+#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Recevoir ce qui est poussé dans le dépôt"
 
-#: command-list.h:149
+#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Gérer l'information de reflog"
 
-#: command-list.h:150
+#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Gérer un ensemble de dépôts suivis"
 
-#: command-list.h:151
+#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Empaqueter les objets non-empaquetés d'un dépôt"
 
-#: command-list.h:152
+#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Créer, lister, supprimer des référence pour remplacer des objets"
 
-#: command-list.h:153
+#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Générer une résumé des modifications en attentes"
 
-#: command-list.h:154
+#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Réutiliser une résolution enregistrée de fusions conflictuelles"
 
-#: command-list.h:155
+#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Réinitialiser la HEAD courante à l'état spécifié"
 
-#: command-list.h:156
+#: command-list.h:158
 msgid "Restore working tree files"
-msgstr "restaurer les fichiers l'arbre de travail"
+msgstr "Restaurer les fichiers l'arbre de travail"
 
-#: command-list.h:157
+#: command-list.h:159
 msgid "Revert some existing commits"
 msgstr "Inverser des commits existants"
 
-#: command-list.h:158
+#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Afficher les objets commit dans l'ordre chronologique inverse"
 
-#: command-list.h:159
+#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "Analyser et préparer les paramètres"
 
-#: command-list.h:160
+#: command-list.h:162
 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:161
+#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Envoyer un ensemble de patchs comme courriels"
 
-#: command-list.h:162
+#: command-list.h:164
 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:163
+#: command-list.h:165
 msgid "Restricted login shell for Git-only SSH access"
-msgstr "shell de login restreint pour un accès SSH vers Git seulement"
+msgstr "Shell de login restreint pour un accès SSH vers Git seulement"
 
-#: command-list.h:164
+#: command-list.h:166
 msgid "Summarize 'git log' output"
 msgstr "Résumer la sortie de 'git log'"
 
-#: command-list.h:165
+#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "Afficher différents types d'objets"
 
-#: command-list.h:166
+#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "Afficher les branches et leurs commits"
 
-#: command-list.h:167
+#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "Afficher l'index de l'archive empaquetée"
 
-#: command-list.h:168
+#: command-list.h:170
 msgid "List references in a local repository"
 msgstr "Lister les références du dépôt local"
 
-#: command-list.h:169
+#: 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:170
+#: command-list.h:172
 msgid "Common Git shell script setup code"
 msgstr "Le code d'initialisation commun aux scripts shell Git"
 
-#: command-list.h:171
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Initialiser et modifier l'extraction clairsemée"
+
+#: 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:172
+#: command-list.h:175
 msgid "Add file contents to the staging area"
 msgstr "Ajouter le contenu de fichiers à l'index"
 
-#: command-list.h:173
+#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Afficher l'état de la copie de travail"
 
-#: command-list.h:174
+#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Retirer les espaces inutiles"
 
-#: command-list.h:175
+#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Initialiser, mettre à jour et inspecter les sous-modules"
 
-#: command-list.h:176
+#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
-msgstr "Opération Bidirectionnelles entre un dépôt Subversion et Git"
+msgstr "Opération Bidirectionnelle entre un dépôt Subversion et Git"
 
-#: command-list.h:177
+#: command-list.h:180
 msgid "Switch branches"
 msgstr "Basculer de branche"
 
-#: command-list.h:178
+#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Lire, modifier et supprimer les références symboliques"
 
-#: command-list.h:179
+#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 "Créer, lister, supprimer ou vérifier un objet d'étiquette signé avec GPG"
 
-#: command-list.h:180
+#: command-list.h:183
 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:181
+#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Dépaqueter les objets depuis une archive empaquetée"
 
-#: command-list.h:182
+#: command-list.h:185
 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:183
+#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr ""
 "Mettre à jour le nom d'objet stocké dans une référence en toute sécurité"
 
-#: command-list.h:184
+#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 "Mettre à jour le fichier d'informations auxiliaires pour aider les serveurs "
 "idiots"
 
-#: command-list.h:185
+#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Renvoyer une archive dans git-archive"
 
-#: command-list.h:186
+#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Renvoyer des objets empaquetés dans git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Afficher un variable logique de Git"
 
-#: command-list.h:188
+#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Vérifier la signature GPG de commits"
 
-#: command-list.h:189
+#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Valider des fichiers d'archive Git empaquetés"
 
-#: command-list.h:190
+#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Vérifier la signature GPG d'étiquettes"
 
-#: command-list.h:191
+#: command-list.h:194
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interface web de Git"
 
-#: command-list.h:192
+#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr "Afficher les journaux avec la différence que chaque commit introduit"
 
-#: command-list.h:193
+#: command-list.h:196
 msgid "Manage multiple working trees"
-msgstr "Gère de arbres de travail multiples"
+msgstr "Gérer des arbres de travail multiples"
 
-#: command-list.h:194
+#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "Créer un objet arbre depuis l'index courant"
 
-#: command-list.h:195
+#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "Définition des attributs par chemin"
 
-#: command-list.h:196
+#: command-list.h:199
 msgid "Git command-line interface and conventions"
-msgstr "interface en ligne de commande et conventions de Git"
+msgstr "Interface en ligne de commande et conventions de Git"
 
-#: command-list.h:197
+#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "Tutoriel du cœur de Git pour les développeurs"
 
-#: command-list.h:198
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Fourniture des noms d'utilisateurs et des mots de passe à Git"
+
+#: command-list.h:202
 msgid "Git for CVS users"
 msgstr "Git pour les utilisateurs de CVS"
 
-#: command-list.h:199
+#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "Bidouillage de la sortie diff"
 
-#: command-list.h:200
+#: command-list.h:204
 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:201
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Foire aux questions sur l'utilisation de Git"
+
+#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "Un glossaire Git"
 
-#: command-list.h:202
+#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Crochets utilisés par Git"
 
-#: command-list.h:203
+#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
 
-#: command-list.h:204
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+"Fait correspondre les noms d'auteur/validateur avec les adresses de courriel"
+
+#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Définition des propriétés de sous-module"
 
-#: command-list.h:205
+#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Espaces de nom de Git"
 
-#: command-list.h:206
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Programmes assistants pour interagir avec des dépôts distants"
+
+#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Disposition d'un dépôt Git"
 
-#: command-list.h:207
+#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Spécification des révisions et portées pour Git"
 
-#: command-list.h:208
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "Montage d'un dépôt dans un autre dépôt"
+
+#: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Une introduction pratique à Git : deuxième partie"
 
-#: command-list.h:209
+#: command-list.h:217
 msgid "A tutorial introduction to Git"
 msgstr "Une introduction pratique à Git"
 
-#: command-list.h:210
+#: 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:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Vous devez démarrer avec \"git bisect start\""
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Souhaitez-vous que je le fasse pour vous [Y/n] ? "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Mauvaise révision en entrée : $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Mauvaise révision en entrée : $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Mauvaise révision en entrée : $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' n'accepte qu'un seul argument."
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "Pas de fichier de log donné"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "impossible de lire $file pour rejouer"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? de quoi parlez-vous ?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
 msgid "bisect run failed: no command provided."
 msgstr "la bissection a échoué : aucune commande fournie."
 
-#: git-bisect.sh:246
+#: git-bisect.sh:73
 #, sh-format
 msgid "running $command"
 msgstr "lancement de $command"
 
-#: git-bisect.sh:253
+#: git-bisect.sh:80
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -22473,27 +25714,23 @@ msgstr ""
 "la bissection a échoué :\n"
 "le code retour $res de '$command' est < 0 ou >= 128"
 
-#: git-bisect.sh:279
+#: git-bisect.sh:105
 msgid "bisect run cannot continue any more"
 msgstr "la bissection ne peut plus continuer"
 
-#: git-bisect.sh:285
+#: git-bisect.sh:111
 #, sh-format
 msgid ""
 "bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
 msgstr ""
 "la bissection a échoué :\n"
-"'bisect_state $state' a retourné le code erreur $res"
+"'bisect-state $state' a retourné le code erreur $res"
 
-#: git-bisect.sh:292
+#: git-bisect.sh:118
 msgid "bisect run success"
 msgstr "succès de la bissection"
 
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "Pas de bissection en cours."
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -22534,193 +25771,55 @@ 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-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "erreur : option inconnue pour 'stash push' : $option"
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "option inconnue : $opt"
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Trop de révisions spécifiées : $REV"
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference n'est pas une référence valide"
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' n'est pas une validation de type remisage"
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' n'est pas une référence de remisage"
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr "impossible de rafraîchir l'index"
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Impossible d'appliquer un remisage en cours de fusion"
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr "Conflits dans l'index. Essayez sans --index."
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr "Impossible de sauvegarder l'arbre d'index"
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr ""
-"Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage"
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr "Impossible de désindexer les fichiers modifiés"
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "${REV} supprimé ($s)"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Impossible de supprimer l'entrée de stash"
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Pour les restaurer tapez \"git stash apply\")"
-
-#: git-submodule.sh:200
+#: 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:210
+#: 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 ./|../"
+msgstr "l'URL de dépôt : '$repo' doit être absolu ou commencer par ./|../"
 
-#: git-submodule.sh:229
+#: 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:232
+#: 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:239
+#: 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:245
-#, 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 ""
-"Le chemin suivant est ignoré par un de vos fichiers .gitignore :\n"
-"$sm_path\n"
-"Utilisez -f si vous voulez vraiment l'ajouter."
-
-#: git-submodule.sh:268
-#, 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:270
-#, 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:278
-#, 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:280
-#, 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:286
-#, 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:298
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Impossible d'extraire le sous-module '$sm_path'"
-
-#: git-submodule.sh:303
+#: git-submodule.sh:248
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Échec d'ajout du sous-module '$sm_path'"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:257
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Échec d'enregistrement du sous-module '$sm_path'"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:532
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Impossible de trouver la révision courante dans le chemin de sous-module "
 "'$displaypath'"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:542
 #, 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:588
+#: git-submodule.sh:547
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22729,7 +25828,7 @@ msgstr ""
 "Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
 "chemin de sous-module '$sm_path'"
 
-#: git-submodule.sh:606
+#: git-submodule.sh:565
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22738,7 +25837,7 @@ msgstr ""
 "Impossible de rapatrier dans le chemin de sous-module '$displaypath' ; essai "
 "de rapatriement direct de $sha1 :"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:571
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22747,87 +25846,56 @@ 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:619
+#: git-submodule.sh:578
 #, 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:620
+#: git-submodule.sh:579
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:583
 #, 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:625
+#: git-submodule.sh:584
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:589
 #, 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:631
+#: git-submodule.sh:590
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:595
 #, 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:637
+#: git-submodule.sh:596
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:627
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "mode $mod_dst inattendu"
-
-#: git-submodule.sh:902
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr "  Attention : $display_name ne contient pas la validation $sha1_src"
-
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr "  Attention : $display_name ne contient pas la validation $sha1_dst"
-
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr ""
-"  Attention : $display_name ne contient pas les validations $sha1_src et "
-"$sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Référez-vous à git-${cmd}(1) pour de plus amples détails."
-
 #: git-rebase--preserve-merges.sh:109
 msgid "Applied autostash."
 msgstr "Autoremisage appliqué."
@@ -22837,12 +25905,22 @@ msgstr "Autoremisage appliqué."
 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:207
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -22881,7 +25959,7 @@ msgstr ""
 "\n"
 "Vous pouvez réordonner ces lignes ; elles sont exécutées de haut en bas.\n"
 
-#: git-rebase--preserve-merges.sh:270
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -22900,83 +25978,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:295
+#: 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:334
+#: git-rebase--preserve-merges.sh:324
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Nom de commit invalide : $sha1"
 
-#: git-rebase--preserve-merges.sh:364
+#: 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:415
+#: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Avance rapide sur $sha1"
 
-#: git-rebase--preserve-merges.sh:417
+#: 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:426
+#: 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:431
+#: 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:449
+#: 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:458
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Impossible de picorer $sha1"
 
-#: git-rebase--preserve-merges.sh:467
+#: 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:472
+#: 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:483
+#: 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:492
+#: git-rebase--preserve-merges.sh:482
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Impossible d'écrire $fixup_msg"
 
-#: git-rebase--preserve-merges.sh:495
+#: 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:536 git-rebase--preserve-merges.sh:579
-#: git-rebase--preserve-merges.sh:582
+#: 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:611
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -22993,31 +26071,31 @@ msgstr ""
 "le\n"
 "problème avant de pouvoir reformuler le message du commit."
 
-#: git-rebase--preserve-merges.sh:626
+#: git-rebase--preserve-merges.sh:616
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Arrêté à $sha1_abbrev... $rest"
 
-#: git-rebase--preserve-merges.sh:641
+#: 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:683
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Exécution : $rest"
 
-#: git-rebase--preserve-merges.sh:691
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "L'exécution a échoué : $rest"
 
-#: git-rebase--preserve-merges.sh:693
+#: 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:695
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -23028,7 +26106,7 @@ msgstr ""
 "git rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:708
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -23043,25 +26121,25 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:719
+#: 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:720
+#: 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:755
+#: 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:812
+#: 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:817
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -23092,12 +26170,12 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--preserve-merges.sh:834
+#: 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:839
+#: 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."
@@ -23105,40 +26183,44 @@ 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:844 git-rebase--preserve-merges.sh:848
+#: 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:879 git-rebase--preserve-merges.sh:965
+#: 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:900
+#: 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:907
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr "Pas de HEAD ?"
 
-#: git-rebase--preserve-merges.sh:908
+#: 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:911
+#: git-rebase--preserve-merges.sh:901
 msgid "Could not mark as interactive"
 msgstr "Impossible de marquer comme interactif"
 
-#: git-rebase--preserve-merges.sh:943
+#: 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:997 git-rebase--preserve-merges.sh:1002
+#: 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"
 
@@ -23210,52 +26292,11 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Impossible de déterminer le chemin absolu du répertoire git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %s12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "indexé"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "non-indexé"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "binaire"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "rien"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "inchangé"
-
-#: git-add--interactive.perl:623
-#, 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"
-
-#: git-add--interactive.perl:626
-#, 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"
-
-#: git-add--interactive.perl:629
-#, 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"
-
 #: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
@@ -23263,28 +26304,7 @@ msgid_plural "touched %d paths\n"
 msgstr[0] "%d chemin touché\n"
 msgstr[1] "%d chemins touchés\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Mise à jour"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Inverser"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "note : %s n'est plus suivi à présent.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Ajouter un fichier non-suivi"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Aucun Fichier non suivi.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -23292,7 +26312,7 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme indexée."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -23300,7 +26320,7 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme remisée."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -23308,8 +26328,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:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: 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."
@@ -23317,8 +26337,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:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: 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."
@@ -23326,17 +26346,12 @@ msgstr ""
 "Si le patch s'applique proprement, la section éditée sera\n"
 "immédiatement marquée comme éliminée."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "impossible d'ouvrir le fichier d'édition de section en écriture : %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-"Mode d'édition manuelle de section -- voir ci-dessous pour un guide rapide.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -23349,36 +26364,12 @@ msgstr ""
 "Pour éliminer les lignes '%s', effacez-les.\n"
 "Les lignes commençant par %s seront éliminées.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-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 ça ne s'applique pas proprement, vous aurez la possibilité de\n"
-"l'éditer à nouveau. Si toutes les lignes de la section sont supprimées,\n"
-"alors l'édition sera abandonnée et la section conservée.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "échec de l'ouverture du fichier d'édition de section en lecture : %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Votre section éditée ne s'applique pas. L'éditer à nouveau (\"no\" "
-"l'élimine !) [y|n] ? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -23392,7 +26383,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:1252
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -23406,7 +26397,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:1258
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -23420,7 +26411,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:1264
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23434,7 +26425,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:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23448,7 +26439,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:1276
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23462,7 +26453,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:1282
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23476,7 +26467,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:1294
+#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23490,7 +26481,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:1309
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23512,234 +26503,91 @@ msgstr ""
 "e - éditer manuellement la section actuelle\n"
 "? - afficher l'aide\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1345
 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:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Les appliquer quand même à l'arbre de travail ? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "Rien n'a été appliqué.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "fichier non-fusionné ignoré : %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Seuls des fichiers binaires ont changé.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Aucune modification.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Mise à jour par patch"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Indexer le changement de mode [y,n,q,a,d%s,?] ? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Indexer la suppression [y,n,q,a,d%s,?] ? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Indexer cette section [y,n,q,a,d%s,?] ? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Remiser le changement de mode [y,n,q,a,d%s,?] ? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Remiser la suppression [y,n,q,a,d%s,?] ? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Remiser cette section [y,n,q,a,d%s,?] ? "
-
-#: git-add--interactive.perl:1436
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Désindexer la suppression [y,n,q,a,d%s,?] ? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Désindexer cette section [y,n,q,a,d%s,?] ? "
-
-#: git-add--interactive.perl:1441
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1442
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1443
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1451
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1452
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1453
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1456
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1457
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1458
-#, 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,?] ? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1479
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 "Appliquer le changement de mode dans l'arbre de travail [y,n,q,a,d%s,?] ? "
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1480
 #, 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:1468
+#: git-add--interactive.perl:1481
+#, 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
 #, 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:1568
+#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
 msgstr "Aucune autre section à atteindre\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "aller à quelle section (<ret> pour voir plus) ? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "aller à quelle section ? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Nombre invalide : '%s'\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1622
 #, 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:1617
+#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
-msgstr "aucune autre section à rechercher\n"
-
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "rechercher la regex ? "
+msgstr "Aucune autre section à rechercher\n"
 
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regex de recherche malformée %s : %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
 msgstr "Aucune section ne correspond au motif donné\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr "Pas de section précédente\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr "Pas de section suivante\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Désolé, impossible de découper cette section\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1736
 #, 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:1706
+#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Désolé, impossible d'éditer cette section\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Réviser la différence"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23757,57 +26605,74 @@ msgstr ""
 "diff          - visualiser les diff entre HEAD et l'index\n"
 "add untracked - ajouter les fichiers non-suivis aux modifications à indexer\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: 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
 msgid "missing --"
 msgstr "-- manquant"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "mode de --patch inconnu : %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argument invalide %s, -- attendu"
 
-#: git-send-email.perl:138
+#: git-send-email.perl:129
 msgid "local zone differs from GMT by a non-minute interval\n"
 msgstr ""
 "la zone locale diffère du GMT par un intervalle supérieur à une minute\n"
 
-#: git-send-email.perl: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 "le décalage de temps local est plus grand ou égal à 24 heures\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 "fatal : la commande '%s' s'est interrompue avec le code %d"
+
+#: git-send-email.perl:227
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'éditeur est sorti en erreur, abandon total"
 
-#: git-send-email.perl:310
+#: git-send-email.perl:316
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' contient une version intermédiaire du courriel que vous composiez.\n"
 
-#: git-send-email.perl:315
+#: git-send-email.perl:321
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contient le courriel composé.\n"
 
-#: git-send-email.perl:408
+#: git-send-email.perl:450
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases est incompatible avec d'autres options\n"
 
-#: git-send-email.perl:481 git-send-email.perl:683
+#: 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 : options de configuration trouvées pour 'sendmail'\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:530 git-send-email.perl:746
 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:484
+#: git-send-email.perl:533
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -23815,39 +26680,39 @@ msgstr ""
 "`batch-size` et `relogin` doivent être spécifiés ensembles (via la ligne de "
 "commande ou des options de configuration)\n"
 
-#: git-send-email.perl:497
+#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Champ de --suppress-cc inconnu : '%s'\n"
 
-#: git-send-email.perl:528
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Paramètre de --confirm inconnu : '%s'\n"
 
-#: git-send-email.perl:556
+#: git-send-email.perl:617
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 "attention : les guillemets ne sont pas supportés dans alias sendmail : %s\n"
 
-#: git-send-email.perl:558
+#: git-send-email.perl:619
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "attention : `:include:` n'est pas supporté : %s\n"
 
-#: git-send-email.perl:560
+#: git-send-email.perl:621
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 "attention : les redirections `/file` ou `|pipe` ne sont pas supportées : %s\n"
 
-#: git-send-email.perl:565
+#: git-send-email.perl:626
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "attention : ligne sendmail non reconnue : %s\n"
 
-#: git-send-email.perl:649
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -23856,27 +26721,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:670
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Échec à l'ouverture du répertoire %s : %s"
 
-#: git-send-email.perl:694
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"fatal : %s : %s\n"
-"attention : aucun patch envoyé\n"
-
-#: git-send-email.perl:705
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -23886,17 +26742,17 @@ msgstr ""
 "Aucun fichier patch spécifié !\n"
 "\n"
 
-#: git-send-email.perl:718
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ligne de sujet non trouvée dans %s ?"
 
-#: git-send-email.perl:728
+#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Impossible d'ouvrir %s en écriture : %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -23910,27 +26766,27 @@ msgstr ""
 "\n"
 "Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
 
-#: git-send-email.perl:763
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Échec à l'ouverture de %s : %s"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Échec à l'ouverture de %s.final : %s"
 
-#: git-send-email.perl:823
+#: git-send-email.perl:886
 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:858
+#: git-send-email.perl:935
 #, 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:913
+#: git-send-email.perl:990
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -23938,11 +26794,11 @@ msgstr ""
 "Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
 "Transfer-Encoding.\n"
 
-#: git-send-email.perl:918
+#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
 
-#: git-send-email.perl:926
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -23955,22 +26811,22 @@ msgstr ""
 "a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
 "vraiment envoyer.\n"
 
-#: git-send-email.perl:945
+#: git-send-email.perl:1022
 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:963
+#: git-send-email.perl:1040
 #, 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:975
+#: git-send-email.perl:1052
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID à utiliser comme In-Reply-To pour le premier courriel (s'il y en "
 "a) ? "
 
-#: git-send-email.perl:1033 git-send-email.perl:1041
+#: git-send-email.perl:1114 git-send-email.perl:1122
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
@@ -23978,16 +26834,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:1045
+#: git-send-email.perl:1126
 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:1362
+#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
-msgstr "le chemin vers la CA \"%s\" n'existe pas"
+msgstr "Le chemin vers la CA \"%s\" n'existe pas"
 
-#: git-send-email.perl:1445
+#: 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"
@@ -24014,130 +26870,145 @@ 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:1460
+#: git-send-email.perl:1544
 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:1463
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr "Une réponse est nécessaire"
 
-#: git-send-email.perl:1491
+#: git-send-email.perl:1581
 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:1538
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Le serveur ne supporte pas STARTTLS ! %s"
 
-#: git-send-email.perl:1543 git-send-email.perl:1547
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "échec de STARTTLS ! %s"
 
-#: git-send-email.perl:1556
+#: git-send-email.perl:1646
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Impossible d'initialiser SMTP. Vérifiez la configuration et utilisez --smtp-"
 "debug."
 
-#: git-send-email.perl:1574
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
-msgstr "échec de l'envoi de %s\n"
+msgstr "Échec de l'envoi de %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Envoi simulé de %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s envoyé\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulation OK. Le journal indique :\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK. Le journal indique :\n"
 
-#: git-send-email.perl:1591
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Résultat : "
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Résultat : OK\n"
 
-#: git-send-email.perl:1612
+#: git-send-email.perl:1709
 #, perl-format
 msgid "can't open file %s"
 msgstr "impossible d'ouvrir le fichier %s"
 
-#: git-send-email.perl:1659 git-send-email.perl:1679
+#: git-send-email.perl:1756 git-send-email.perl:1776
 #, 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:1665
+#: git-send-email.perl:1762
 #, 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:1718
+#: git-send-email.perl:1819
 #, 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:1753
+#: git-send-email.perl:1854
 #, 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:1864
+#: git-send-email.perl:1965
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Impossible d'exécuter '%s'"
 
-#: git-send-email.perl:1871
+#: git-send-email.perl:1972
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
 
-#: git-send-email.perl:1875
+#: git-send-email.perl:1976
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) échec de la fermeture du pipe vers '%s'"
 
-#: git-send-email.perl:1905
+#: git-send-email.perl:2006
 msgid "cannot send message as 7bit"
 msgstr "impossible d'envoyer un message comme 7bit"
 
-#: git-send-email.perl:1913
+#: git-send-email.perl:2014
 msgid "invalid transfer encoding"
 msgstr "codage de transfert invalide"
 
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: 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 : rejeté par le crochet sendemail-validate\n"
+"%s\n"
+"attention : aucun patch envoyé\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 "impossible d'ouvrir %s :%s\n"
 
-#: git-send-email.perl:1957
+#: git-send-email.perl:2064
 #, 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 ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal : %s : %d est plus long que 998 caractères \n"
+"attention : aucun patch envoyé\n"
 
-#: git-send-email.perl:1974
+#: git-send-email.perl:2082
 #, 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:1978
+#: git-send-email.perl:2086
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
diff --git a/po/git.pot b/po/git.pot
index ff00bc201b..fcd45ef0ad 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-10-28 13:19+0800\n"
+"POT-Creation-Date: 2021-08-14 07:56+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"
@@ -18,59 +18,722 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: advice.c:109
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr ""
+
+#: 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 ""
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr ""
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr ""
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr ""
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr ""
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr ""
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+msgid "could not write index"
+msgstr ""
+
+#: add-interactive.c:706 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
+#, 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
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr ""
+
+#: add-interactive.c:759 git-add--interactive.perl:653
+msgid "Revert"
+msgstr ""
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr ""
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr ""
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr ""
+
+#: add-interactive.c:895 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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr ""
+
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr ""
+
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr ""
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr ""
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr ""
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr ""
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr ""
+
+#: add-interactive.c:1014
+msgid "revert staged set of changes back to the HEAD version"
+msgstr ""
+
+#: add-interactive.c:1016
+msgid "pick hunks and update selectively"
+msgstr ""
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr ""
+
+#: add-interactive.c:1020
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+
+#: add-interactive.c:1028 add-interactive.c:1077
+msgid "Prompt help:"
+msgstr ""
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr ""
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr ""
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr ""
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr ""
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr ""
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr ""
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr ""
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr ""
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr ""
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr ""
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr ""
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr ""
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr ""
+
+#: 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 ""
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr ""
+
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr ""
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:35 git-add--interactive.perl:1432
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:37 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:39
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:56 git-add--interactive.perl:1437
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:57 git-add--interactive.perl:1438
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:59 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:61
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:80 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:81 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:83 git-add--interactive.perl:1446
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:85
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: 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 ""
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: 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 ""
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:343
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr ""
+
+#: add-patch.c:362 add-patch.c:366
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr ""
+
+#: add-patch.c:420
+msgid "could not parse diff"
+msgstr ""
+
+#: add-patch.c:439
+msgid "could not parse colored diff"
+msgstr ""
+
+#: add-patch.c:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr ""
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr ""
+
+#: 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:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+
+#: 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:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: 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:1133
+msgid "could not parse hunk header"
+msgstr ""
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr ""
+
+#. 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.
+#.
+#. 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:1247 git-add--interactive.perl:1242
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+
+#: add-patch.c:1290
+msgid "The selected hunks do not apply to the index!"
+msgstr ""
+
+#: add-patch.c:1291 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr ""
+
+#: add-patch.c:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr ""
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+
+#: add-patch.c:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr ""
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr ""
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr ""
+
+#: add-patch.c:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr ""
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr ""
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr ""
+
+#: 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:1575
+msgid "No other hunks to search"
+msgstr ""
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr ""
+
+#: add-patch.c:1596
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr ""
+
+#: add-patch.c:1613
+msgid "No hunk matches the given pattern"
+msgstr ""
+
+#: add-patch.c:1620
+msgid "Sorry, cannot split this hunk"
+msgstr ""
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr ""
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr ""
+
+#: add-patch.c:1680
+msgid "'git apply' failed"
+msgstr ""
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+
+#: advice.c:161
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr ""
 
-#: advice.c:162
+#: advice.c:252
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:164
+#: advice.c:254
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:166
+#: advice.c:256
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:168
+#: advice.c:258
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:170
+#: advice.c:260
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 
-#: advice.c:172
+#: advice.c:262
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 
-#: advice.c:180
+#: 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."
 msgstr ""
 
-#: advice.c:188
+#: advice.c:278
 msgid "Exiting because of an unresolved conflict."
 msgstr ""
 
-#: advice.c:193 builtin/merge.c:1332
+#: advice.c:283 builtin/merge.c:1375
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr ""
 
-#: advice.c:195
+#: advice.c:285
 msgid "Please, commit your changes before merging."
 msgstr ""
 
-#: advice.c:196
+#: advice.c:286
 msgid "Exiting because of unfinished merge."
 msgstr ""
 
-#: advice.c:202
+#: 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"
@@ -101,82 +764,78 @@ msgstr ""
 msgid "unclosed quote"
 msgstr ""
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr ""
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr ""
 
-#: apply.c:135
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
 msgstr ""
 
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr ""
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
 msgstr ""
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
 msgstr ""
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
 msgstr ""
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr ""
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr ""
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr ""
 
-#: apply.c:922
+#: apply.c:921
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr ""
 
-#: apply.c:928
+#: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
 
-#: apply.c:934
+#: apply.c:933
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr ""
 
-#: apply.c:963
+#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr ""
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr ""
 
-#: apply.c:1372
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -187,540 +846,577 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:1385
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr ""
 
-#: apply.c:1481
+#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr ""
 
-#: apply.c:1550
+#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr ""
 
-#: apply.c:1753
+#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr ""
 
-#: apply.c:1755
+#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr ""
 
-#: apply.c:1789
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr ""
 
-#: apply.c:1826
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr ""
 
-#: apply.c:1828
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr ""
 
-#: apply.c:1831
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr ""
 
-#: apply.c:1978
+#: apply.c:1977
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr ""
 
-#: apply.c:2015
+#: apply.c:2014
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr ""
 
-#: apply.c:2177
+#: apply.c:2176
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr ""
 
-#: apply.c:2263
+#: apply.c:2262
 #, c-format
 msgid "unable to read symlink %s"
 msgstr ""
 
-#: apply.c:2267
+#: apply.c:2266
 #, c-format
 msgid "unable to open or read %s"
 msgstr ""
 
-#: apply.c:2926
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr ""
 
-#: apply.c:3047
+#: 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] ""
 msgstr[1] ""
 
-#: apply.c:3059
+#: apply.c:3068
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr ""
 
-#: apply.c:3065
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
 
-#: apply.c:3087
+#: apply.c:3096
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr ""
 
-#: apply.c:3095
+#: apply.c:3104
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 
-#: apply.c:3142
+#: apply.c:3151
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 
-#: apply.c:3152
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
 
-#: apply.c:3160
+#: apply.c:3170
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr ""
 
-#: apply.c:3178
+#: apply.c:3188
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr ""
 
-#: apply.c:3191
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr ""
 
-#: apply.c:3197
+#: apply.c:3208
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 
-#: apply.c:3218
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr ""
 
-#: apply.c:3341
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
 msgstr ""
 
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
+#: 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 ""
 
-#: apply.c:3401
+#: apply.c:3412
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr ""
 
-#: apply.c:3430 apply.c:3673
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr ""
 
-#: apply.c:3516 apply.c:3688
+#: apply.c:3527 apply.c:3702
 #, c-format
 msgid "%s: does not exist in index"
 msgstr ""
 
-#: apply.c:3525 apply.c:3696
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
 msgstr ""
 
-#: apply.c:3560
-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 ""
 
-#: apply.c:3563
+#: apply.c:3574
 #, c-format
-msgid "Falling back to three-way merge...\n"
+msgid "Performing three-way merge...\n"
 msgstr ""
 
-#: apply.c:3579 apply.c:3583
+#: apply.c:3590 apply.c:3594
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr ""
 
-#: apply.c:3595
+#: apply.c:3606
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
+msgid "Failed to perform three-way merge...\n"
 msgstr ""
 
-#: apply.c:3609
+#: apply.c:3620
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr ""
 
-#: apply.c:3614
+#: apply.c:3625
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr ""
 
-#: apply.c:3640
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr ""
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr ""
 
-#: apply.c:3713
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr ""
 
-#: apply.c:3715
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr ""
 
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: 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 ""
 
-#: apply.c:3924
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
 msgstr ""
 
-#: apply.c:3927
+#: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr ""
 
-#: apply.c:3947
+#: apply.c:3976
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr ""
 
-#: apply.c:3952
+#: apply.c:3981
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr ""
 
-#: apply.c:3972
+#: apply.c:4001
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr ""
 
-#: apply.c:3976
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
 msgstr ""
 
-#: apply.c:3991
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
 msgstr ""
 
-#: apply.c:4083
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr ""
 
-#: apply.c:4090
+#: apply.c:4119
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr ""
 
-#: apply.c:4093
+#: apply.c:4122
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr ""
 
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr ""
-
-#: apply.c:4102
+#: apply.c:4131
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr ""
 
-#: apply.c:4112
+#: apply.c:4141
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr ""
 
-#: apply.c:4250
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
 msgstr ""
 
-#: apply.c:4284
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr ""
 
-#: apply.c:4290
+#: apply.c:4319
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr ""
 
-#: apply.c:4298
+#: apply.c:4327
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr ""
 
-#: apply.c:4304 apply.c:4449
+#: apply.c:4333 apply.c:4478
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr ""
 
-#: apply.c:4347
+#: apply.c:4376 builtin/bisect--helper.c:525
 #, c-format
 msgid "failed to write to '%s'"
 msgstr ""
 
-#: apply.c:4351
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
 msgstr ""
 
-#: apply.c:4421
+#: apply.c:4450
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr ""
 
-#: apply.c:4519
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr ""
 
-#: apply.c:4527
+#: apply.c:4556
 msgid "internal error"
 msgstr ""
 
-#: apply.c:4530
+#: apply.c:4559
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4541
+#: apply.c:4570
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr ""
 
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
 msgstr ""
 
-#: apply.c:4563
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr ""
 
-#: apply.c:4567
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr ""
 
-#: apply.c:4686
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr ""
 
-#: apply.c:4694
+#: apply.c:4733
 msgid "unrecognized input"
 msgstr ""
 
-#: apply.c:4714
+#: apply.c:4753
 msgid "unable to read index file"
 msgstr ""
 
-#: apply.c:4871
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr ""
 
-#: apply.c:4898
+#: apply.c:4937
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4904 apply.c:4919
+#: apply.c:4943 apply.c:4958
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] ""
 msgstr[1] ""
 
-#: apply.c:4912
+#: apply.c:4951
 #, 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:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
 msgid "Unable to write new index file"
 msgstr ""
 
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr ""
-
-#: apply.c:4956
+#: apply.c:4995
 msgid "don't apply changes matching the given path"
 msgstr ""
 
-#: apply.c:4959
+#: apply.c:4998
 msgid "apply changes matching the given path"
 msgstr ""
 
-#: apply.c:4961 builtin/am.c:2206
+#: apply.c:5000 builtin/am.c:2318
 msgid "num"
 msgstr ""
 
-#: apply.c:4962
+#: apply.c:5001
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr ""
 
-#: apply.c:4965
+#: apply.c:5004
 msgid "ignore additions made by the patch"
 msgstr ""
 
-#: apply.c:4967
+#: apply.c:5006
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 
-#: apply.c:4971
+#: apply.c:5010
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 
-#: apply.c:4973
+#: apply.c:5012
 msgid "instead of applying the patch, output a summary for the input"
 msgstr ""
 
-#: apply.c:4975
+#: apply.c:5014
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr ""
 
-#: apply.c:4977
+#: apply.c:5016
 msgid "make sure the patch is applicable to the current index"
 msgstr ""
 
-#: apply.c:4979
+#: apply.c:5018
 msgid "mark new files with `git add --intent-to-add`"
 msgstr ""
 
-#: apply.c:4981
+#: apply.c:5020
 msgid "apply a patch without touching the working tree"
 msgstr ""
 
-#: apply.c:4983
+#: apply.c:5022
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 
-#: apply.c:4986
+#: apply.c:5025
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr ""
 
-#: apply.c:4988
-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 ""
 
-#: apply.c:4990
+#: apply.c:5029
 msgid "build a temporary index based on embedded index information"
 msgstr ""
 
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
 msgid "paths are separated with NUL character"
 msgstr ""
 
-#: apply.c:4995
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
 msgstr ""
 
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
+#: 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 ""
 
-#: apply.c:4997
+#: apply.c:5036
 msgid "detect new or modified lines that have whitespace errors"
 msgstr ""
 
-#: apply.c:5000 apply.c:5003
+#: apply.c:5039 apply.c:5042
 msgid "ignore changes in whitespace when finding context"
 msgstr ""
 
-#: apply.c:5006
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr ""
 
-#: apply.c:5008
+#: apply.c:5047
 msgid "don't expect at least one line of context"
 msgstr ""
 
-#: apply.c:5010
+#: apply.c:5049
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr ""
 
-#: apply.c:5012
+#: apply.c:5051
 msgid "allow overlapping hunks"
 msgstr ""
 
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 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 ""
 
-#: apply.c:5015
+#: apply.c:5054
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 
-#: apply.c:5018
+#: apply.c:5057
 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 
-#: apply.c:5020 builtin/am.c:2194
+#: apply.c:5059 builtin/am.c:2306
 msgid "root"
 msgstr ""
 
-#: apply.c:5021
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr ""
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr ""
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr ""
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr ""
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr ""
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr ""
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr ""
+
+#: archive-zip.c:322
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr ""
+
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr ""
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr ""
@@ -738,225 +1434,199 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr ""
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:188
+#, c-format
+msgid "cannot read %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
 
-#: archive.c:396
+#: archive.c:451
 #, c-format
 msgid "no such ref: %.*s"
 msgstr ""
 
-#: archive.c:401
+#: archive.c:457
 #, c-format
 msgid "not a valid object name: %s"
 msgstr ""
 
-#: archive.c:414
+#: archive.c:470
 #, c-format
 msgid "not a tree object: %s"
 msgstr ""
 
-#: archive.c:426
+#: archive.c:482
 msgid "current working directory is untracked"
 msgstr ""
 
-#: archive.c:457
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr ""
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr ""
+
+#: archive.c:552
 msgid "fmt"
 msgstr ""
 
-#: archive.c:457
+#: archive.c:552
 msgid "archive format"
 msgstr ""
 
-#: archive.c:458 builtin/log.c:1581
+#: archive.c:553 builtin/log.c:1775
 msgid "prefix"
 msgstr ""
 
-#: archive.c:459
+#: archive.c:554
 msgid "prepend prefix to each pathname in the archive"
 msgstr ""
 
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:186
+#: 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 ""
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr ""
+
+#: archive.c:559 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr ""
 
-#: archive.c:463
+#: archive.c:561
 msgid "read .gitattributes in working directory"
 msgstr ""
 
-#: archive.c:464
+#: archive.c:562
 msgid "report archived files on stderr"
 msgstr ""
 
-#: archive.c:465
-msgid "store only"
+#: archive.c:564
+msgid "set compression level"
 msgstr ""
 
-#: archive.c:466
-msgid "compress faster"
-msgstr ""
-
-#: archive.c:474
-msgid "compress better"
-msgstr ""
-
-#: archive.c:477
+#: archive.c:567
 msgid "list supported archive formats"
 msgstr ""
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: 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 ""
 
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
 msgstr ""
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
 #: builtin/notes.c:498
 msgid "command"
 msgstr ""
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr ""
 
-#: archive.c:489
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr ""
 
-#: archive.c:491
+#: archive.c:581
 msgid "Option --exec can only be used together with --remote"
 msgstr ""
 
-#: archive.c:493
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr ""
 
-#: archive.c:515
-#, c-format
-msgid "Unknown archive format '%s'"
-msgstr ""
-
-#: archive.c:522
-#, c-format
-msgid "Argument not supported for format '%s': -%d"
+#: archive.c:585
+msgid "Options --add-file and --remote cannot be used together"
 msgstr ""
 
-#: archive-tar.c:125 archive-zip.c:345
+#: archive.c:607
 #, c-format
-msgid "cannot stream blob %s"
-msgstr ""
-
-#: archive-tar.c:266 archive-zip.c:363
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr ""
-
-#: archive-tar.c:293 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr ""
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr ""
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr ""
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr ""
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr ""
-
-#: archive-zip.c:318
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr ""
-
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
-#, c-format
-msgid "deflate error (%d)"
+msgid "Unknown archive format '%s'"
 msgstr ""
 
-#: archive-zip.c:609
+#: archive.c:616
 #, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
+msgid "Argument not supported for format '%s': -%d"
 msgstr ""
 
-#: attr.c:213
+#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr ""
 
-#: attr.c:370
+#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr ""
 
-#: attr.c:410
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
 msgstr ""
 
-#: bisect.c:468
+#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr ""
 
-#: bisect.c:678
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr ""
 
-#: bisect.c:733
+#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr ""
 
-#: bisect.c:758
+#: bisect.c:791
 #, 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:763
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
 msgstr ""
 
-#: bisect.c:768
+#: bisect.c:801
 #, 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:776
+#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -964,7 +1634,7 @@ msgid ""
 "Maybe you mistook %s and %s revs?\n"
 msgstr ""
 
-#: bisect.c:789
+#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -972,43 +1642,43 @@ msgid ""
 "We continue anyway."
 msgstr ""
 
-#: bisect.c:822
+#: bisect.c:861
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr ""
 
-#: bisect.c:865
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr ""
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
 msgstr ""
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
 msgstr ""
 
-#: bisect.c:958
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr ""
 
-#: bisect.c:977
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr ""
 
-#: bisect.c:985
+#: bisect.c:1066
 #, 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 ""
 
-#: bisect.c:1004
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1018,44 +1688,44 @@ msgstr[1] ""
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1101
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: blame.c:2700
+#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr ""
 
-#: blame.c:2714
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr ""
 
-#: blame.c:2735
+#: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
-#: builtin/shortlog.c:192
+#: 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 ""
 
-#: blame.c:2762
+#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 
-#: blame.c:2773
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr ""
 
-#: blame.c:2784
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr ""
@@ -1174,413 +1844,436 @@ msgstr ""
 msgid "Not a valid branch point: '%s'."
 msgstr ""
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr ""
 
-#: branch.c:387
+#: branch.c:389
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr ""
 
-#: bundle.c:36
+#: bundle.c:44
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
+msgid "unrecognized bundle hash algorithm: %s"
 msgstr ""
 
-#: bundle.c:64
+#: bundle.c:48
+#, c-format
+msgid "unknown capability '%s'"
+msgstr ""
+
+#: bundle.c:74
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr ""
+
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr ""
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
-#: builtin/commit.c:791
+#: 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 ""
 
-#: bundle.c:143
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr ""
 
-#: bundle.c:146
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr ""
 
-#: bundle.c:197
+#: 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:204
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr ""
 
-#: bundle.c:206
+#: 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:272
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr ""
 
-#: bundle.c:279
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr ""
 
-#: bundle.c:290
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr ""
 
-#: bundle.c:332
-msgid "rev-list died"
-msgstr ""
-
-#: bundle.c:381
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr ""
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
+#: bundle.c:504
 #, c-format
-msgid "unrecognized argument: %s"
+msgid "unsupported bundle version %d"
 msgstr ""
 
-#: bundle.c:468
-msgid "Refusing to create empty bundle."
-msgstr ""
-
-#: bundle.c:478
+#: bundle.c:506
 #, c-format
-msgid "cannot create '%s'"
+msgid "cannot write bundle version %d with algorithm %s"
 msgstr ""
 
-#: bundle.c:503
-msgid "index-pack died"
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#, c-format
+msgid "unrecognized argument: %s"
 msgstr ""
 
-#: color.c:296
-#, c-format
-msgid "invalid color value: %.*s"
+#: bundle.c:553
+msgid "Refusing to create empty bundle."
 msgstr ""
 
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
+#: bundle.c:563
 #, c-format
-msgid "could not parse %s"
+msgid "cannot create '%s'"
 msgstr ""
 
-#: commit.c:52
-#, c-format
-msgid "%s %s is not a commit!"
+#: bundle.c:588
+msgid "index-pack died"
 msgstr ""
 
-#: commit.c:192
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
 msgstr ""
 
-#: commit.c:1128
+#: chunk-format.c:126
 #, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
 msgstr ""
 
-#: commit.c:1131
+#: chunk-format.c:133
 #, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgid "duplicate chunk ID %<PRIx32> found"
 msgstr ""
 
-#: commit.c:1134
+#: chunk-format.c:147
 #, c-format
-msgid "Commit %s does not have a GPG signature."
+msgid "final chunk has non-zero id %<PRIx32>"
 msgstr ""
 
-#: commit.c:1137
+#: color.c:329
 #, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
+msgid "invalid color value: %.*s"
 msgstr ""
 
-#: commit.c:1391
-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"
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
 msgstr ""
 
-#: commit-graph.c:127
+#: commit-graph.c:262
 msgid "commit-graph file is too small"
 msgstr ""
 
-#: commit-graph.c:192
+#: commit-graph.c:355
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr ""
 
-#: commit-graph.c:199
+#: commit-graph.c:362
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr ""
 
-#: commit-graph.c:206
+#: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr ""
 
-#: commit-graph.c:229
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-
-#: commit-graph.c:240
+#: commit-graph.c:386
 #, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
+msgid "commit-graph file is too small to hold %u chunks"
 msgstr ""
 
-#: commit-graph.c:283
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr ""
-
-#: commit-graph.c:347
+#: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
 msgstr ""
 
-#: commit-graph.c:357
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr ""
 
-#: commit-graph.c:404
+#: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr ""
 
-#: commit-graph.c:430
+#: commit-graph.c:564
 msgid "unable to find all commit-graph files"
 msgstr ""
 
-#: commit-graph.c:561 commit-graph.c:621
+#: commit-graph.c:745 commit-graph.c:782
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:582
+#: commit-graph.c:766
 #, c-format
 msgid "could not find commit %s"
 msgstr ""
 
-#: commit-graph.c:855 builtin/am.c:1287
-#, c-format
-msgid "unable to parse commit %s"
+#: commit-graph.c:799
+msgid "commit-graph requires overflow generation data but has none"
 msgstr ""
 
-#: commit-graph.c:859
+#: commit-graph.c:1075 builtin/am.c:1341
 #, c-format
-msgid "unable to get tree for %s"
+msgid "unable to parse commit %s"
 msgstr ""
 
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
 #, c-format
 msgid "unable to get type of object %s"
 msgstr ""
 
-#: commit-graph.c:1049
+#: commit-graph.c:1368
 msgid "Loading known commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1066
+#: commit-graph.c:1385
 msgid "Expanding reachable commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:1085
+#: commit-graph.c:1405
 msgid "Clearing commit marks in commit graph"
 msgstr ""
 
-#: commit-graph.c:1104
+#: 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:1179
+#: commit-graph.c:1558
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+
+#: commit-graph.c:1635
+msgid "Collecting referenced commits"
+msgstr ""
+
+#: 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:1192
+#: commit-graph.c:1673
 #, c-format
 msgid "error adding pack %s"
 msgstr ""
 
-#: commit-graph.c:1196
+#: commit-graph.c:1677
 #, c-format
 msgid "error opening index for %s"
 msgstr ""
 
-#: commit-graph.c:1220
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] ""
-msgstr[1] ""
-
-#: commit-graph.c:1240
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr ""
-
-#: commit-graph.c:1255
+#: commit-graph.c:1714
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 
-#: commit-graph.c:1270
-msgid "Counting distinct commits in commit graph"
-msgstr ""
-
-#: commit-graph.c:1300
+#: commit-graph.c:1732
 msgid "Finding extra edges in commit graph"
 msgstr ""
 
-#: commit-graph.c:1346
+#: commit-graph.c:1781
 msgid "failed to write correct number of base graph ids"
 msgstr ""
 
-#: commit-graph.c:1379 midx.c:810
+#: commit-graph.c:1812 midx.c:911
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr ""
 
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr ""
+
+#: commit-graph.c:1830
 #, c-format
-msgid "unable to create '%s'"
+msgid "unable to adjust shared permissions for '%s'"
 msgstr ""
 
-#: commit-graph.c:1451
+#: 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:1492
+#: commit-graph.c:1923
 msgid "unable to open commit-graph chain file"
 msgstr ""
 
-#: commit-graph.c:1504
+#: commit-graph.c:1939
 msgid "failed to rename base commit-graph file"
 msgstr ""
 
-#: commit-graph.c:1524
+#: commit-graph.c:1959
 msgid "failed to rename temporary commit-graph file"
 msgstr ""
 
-#: commit-graph.c:1635
+#: commit-graph.c:2092
 msgid "Scanning merged commits"
 msgstr ""
 
-#: commit-graph.c:1646
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr ""
-
-#: commit-graph.c:1670
+#: commit-graph.c:2136
 msgid "Merging commit-graph"
 msgstr ""
 
-#: commit-graph.c:1860
-#, c-format
-msgid "the commit graph format cannot write %d commits"
+#: commit-graph.c:2244
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
 msgstr ""
 
-#: commit-graph.c:1871
+#: commit-graph.c:2351
 msgid "too many commits to write graph"
 msgstr ""
 
-#: commit-graph.c:1961
+#: commit-graph.c:2449
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 
-#: commit-graph.c:1971
+#: commit-graph.c:2459
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr ""
 
-#: commit-graph.c:1981 commit-graph.c:1996
+#: 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:1988
+#: commit-graph.c:2476
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr ""
 
-#: commit-graph.c:2006
+#: commit-graph.c:2494
 msgid "Verifying commits in commit graph"
 msgstr ""
 
-#: commit-graph.c:2020
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 
-#: commit-graph.c:2027
+#: commit-graph.c:2516
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2037
+#: commit-graph.c:2526
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr ""
 
-#: commit-graph.c:2046
+#: commit-graph.c:2535
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr ""
 
-#: commit-graph.c:2059
+#: commit-graph.c:2549
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 
-#: commit-graph.c:2064
+#: commit-graph.c:2554
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2068
+#: commit-graph.c:2558
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr ""
 
-#: commit-graph.c:2083
+#: 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:2089
+#: commit-graph.c:2581
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 
+#: 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 ""
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr ""
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+
+#: commit.c:1237
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c:1241
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c:1244
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c:1247
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: 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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr ""
 
-#: config.c:124
+#: config.c:126
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1590,289 +2283,333 @@ msgid ""
 "This might be due to circular includes."
 msgstr ""
 
-#: config.c:140
+#: config.c:142
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr ""
 
-#: config.c:151
+#: config.c:153
 msgid "relative config includes must come from files"
 msgstr ""
 
-#: config.c:197
+#: config.c:199
 msgid "relative config include conditionals must come from files"
 msgstr ""
 
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr ""
+
+#: 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 ""
 
-#: config.c:382
+#: config.c:448
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr ""
 
-#: config.c:406 sequencer.c:2401
+#: config.c:472 sequencer.c:2785
 #, c-format
 msgid "invalid key: %s"
 msgstr ""
 
-#: config.c:412
+#: config.c:478
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr ""
 
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr ""
+
+#: config.c:529 config.c:541
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr ""
 
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
 #, c-format
 msgid "bogus format in %s"
 msgstr ""
 
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr ""
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr ""
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr ""
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr ""
+
+#: config.c:995
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr ""
 
-#: config.c:825
+#: config.c:999
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr ""
 
-#: config.c:829
+#: config.c:1003
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr ""
 
-#: config.c:833
+#: config.c:1007
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr ""
 
-#: config.c:837
+#: config.c:1011
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr ""
 
-#: config.c:841
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr ""
 
-#: config.c:978
+#: config.c:1152
 msgid "out of range"
 msgstr ""
 
-#: config.c:978
+#: config.c:1152
 msgid "invalid unit"
 msgstr ""
 
-#: config.c:979
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr ""
 
-#: config.c:998
+#: config.c:1163
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr ""
 
-#: config.c:1001
+#: config.c:1166
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr ""
 
-#: config.c:1004
+#: config.c:1169
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 
-#: config.c:1007
+#: config.c:1172
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 
-#: config.c:1010
+#: config.c:1175
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 
-#: config.c:1013
+#: config.c:1178
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr ""
 
-#: config.c:1108
+#: config.c:1257
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr ""
+
+#: config.c:1275
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr ""
 
-#: config.c:1117
+#: config.c:1284
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr ""
 
-#: config.c:1208
+#: config.c:1377
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr ""
 
-#: config.c:1222 config.c:1233
+#: config.c:1391 config.c:1402
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr ""
 
-#: config.c:1325
+#: config.c:1494
 msgid "core.commentChar should only be one character"
 msgstr ""
 
-#: config.c:1358
+#: config.c:1527
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr ""
 
-#: config.c:1425
+#: config.c:1599
 #, c-format
 msgid "malformed value for %s"
 msgstr ""
 
-#: config.c:1451
+#: config.c:1625
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr ""
 
-#: config.c:1452
+#: config.c:1626
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 
-#: config.c:1513 builtin/pack-objects.c:3394
+#: config.c:1687 builtin/pack-objects.c:4084
 #, c-format
 msgid "bad pack compression level %d"
 msgstr ""
 
-#: config.c:1634
+#: config.c:1809
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr ""
 
-#: config.c:1637
+#: config.c:1812
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr ""
 
-#: config.c:1654
+#: config.c:1829
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr ""
 
-#: config.c:1684
+#: config.c:1874
 #, c-format
 msgid "failed to parse %s"
 msgstr ""
 
-#: config.c:1740
+#: config.c:1930
 msgid "unable to parse command-line config"
 msgstr ""
 
-#: config.c:2091
+#: config.c:2294
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 
-#: config.c:2261
+#: config.c:2468
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr ""
 
-#: config.c:2306
+#: config.c:2513
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 
-#: config.c:2352
+#: config.c:2559
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr ""
 
-#: config.c:2354
+#: config.c:2561
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr ""
 
-#: config.c:2435
+#: config.c:2645
 #, c-format
 msgid "invalid section name '%s'"
 msgstr ""
 
-#: config.c:2467
+#: config.c:2677
 #, c-format
 msgid "%s has multiple values"
 msgstr ""
 
-#: config.c:2496
+#: config.c:2706
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr ""
 
-#: config.c:2748 config.c:3072
+#: config.c:2958 config.c:3285
 #, c-format
 msgid "could not lock config file %s"
 msgstr ""
 
-#: config.c:2759
+#: config.c:2969
 #, c-format
 msgid "opening %s"
 msgstr ""
 
-#: config.c:2794 builtin/config.c:328
+#: config.c:3006 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr ""
 
-#: config.c:2819
+#: config.c:3031
 #, c-format
 msgid "invalid config file %s"
 msgstr ""
 
-#: config.c:2832 config.c:3085
+#: config.c:3044 config.c:3298
 #, c-format
 msgid "fstat on %s failed"
 msgstr ""
 
-#: config.c:2843
+#: config.c:3055
 #, c-format
-msgid "unable to mmap '%s'"
+msgid "unable to mmap '%s'%s"
 msgstr ""
 
-#: config.c:2852 config.c:3090
+#: config.c:3065 config.c:3303
 #, c-format
 msgid "chmod on %s failed"
 msgstr ""
 
-#: config.c:2937 config.c:3187
+#: config.c:3150 config.c:3400
 #, c-format
 msgid "could not write config file %s"
 msgstr ""
 
-#: config.c:2971
+#: config.c:3184
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr ""
 
-#: config.c:2973 builtin/remote.c:782
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr ""
 
-#: config.c:3063
+#: config.c:3276
 #, c-format
 msgid "invalid section name: %s"
 msgstr ""
 
-#: config.c:3230
+#: config.c:3443
 #, c-format
 msgid "missing value for '%s'"
 msgstr ""
@@ -1894,79 +2631,88 @@ msgstr ""
 msgid "server doesn't support '%s'"
 msgstr ""
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr ""
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
 msgstr ""
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr ""
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
 msgstr ""
 
-#: connect.c:273
+#: connect.c:306
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr ""
 
-#: connect.c:275
+#: connect.c:308
 msgid "repository on the other end cannot be shallow"
 msgstr ""
 
-#: connect.c:313
+#: connect.c:347
 msgid "invalid packet"
 msgstr ""
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr ""
 
-#: connect.c:441
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr ""
+
+#: connect.c:526
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr ""
 
-#: connect.c:445
+#: connect.c:530
 msgid "expected flush after ref listing"
 msgstr ""
 
-#: connect.c:544
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr ""
+
+#: connect.c:666
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr ""
 
-#: connect.c:595
+#: connect.c:717
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr ""
 
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
 #, c-format
 msgid "Looking up %s ... "
 msgstr ""
 
-#: connect.c:639
+#: connect.c:761
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:643 connect.c:714
+#: connect.c:765 connect.c:836
 #, c-format
 msgid ""
 "done.\n"
 "Connecting to %s (port %s) ... "
 msgstr ""
 
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -1974,193 +2720,225 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
 msgid "done."
 msgstr ""
 
-#: connect.c:702
+#: connect.c:824
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr ""
 
-#: connect.c:708
+#: connect.c:830
 #, c-format
 msgid "unknown port %s"
 msgstr ""
 
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr ""
 
-#: connect.c:847
+#: connect.c:969
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr ""
 
-#: connect.c:857
+#: connect.c:979
 #, c-format
 msgid "cannot start proxy %s"
 msgstr ""
 
-#: connect.c:928
+#: connect.c:1050
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
+
+#: connect.c:1247
 msgid "ssh variant 'simple' does not support -4"
 msgstr ""
 
-#: connect.c:1135
+#: connect.c:1259
 msgid "ssh variant 'simple' does not support -6"
 msgstr ""
 
-#: connect.c:1152
+#: connect.c:1276
 msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 
-#: connect.c:1264
+#: connect.c:1388
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr ""
 
-#: connect.c:1311
+#: connect.c:1436
 msgid "unable to fork"
 msgstr ""
 
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr ""
 
-#: connected.c:100
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
 msgstr ""
 
-#: connected.c:120
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr ""
 
-#: connected.c:127
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr ""
 
-#: convert.c:194
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr ""
 
-#: convert.c:207
+#: convert.c:196
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr ""
 
-#: convert.c:209
+#: 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"
 msgstr ""
 
-#: convert.c:217
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr ""
 
-#: convert.c:219
+#: 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"
 msgstr ""
 
-#: convert.c:280
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr ""
 
-#: convert.c:287
+#: convert.c:280
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
 
-#: convert.c:305
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr ""
 
-#: convert.c:307
+#: 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:425 convert.c:496
+#: convert.c:408 convert.c:479
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr ""
 
-#: convert.c:468
+#: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 
-#: convert.c:674
+#: convert.c:654
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr ""
 
-#: convert.c:694
+#: convert.c:674
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr ""
 
-#: convert.c:701
+#: convert.c:681
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr ""
 
-#: convert.c:736 convert.c:739
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr ""
 
-#: convert.c:742 convert.c:797
+#: convert.c:722 convert.c:777
 #, c-format
 msgid "external filter '%s' failed"
 msgstr ""
 
-#: convert.c:845
+#: convert.c:826
 msgid "unexpected filter type"
 msgstr ""
 
-#: convert.c:856
+#: convert.c:837
 msgid "path name too long for external filter"
 msgstr ""
 
-#: convert.c:930
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr ""
 
-#: convert.c:1229
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr ""
 
-#: convert.c:1417 convert.c:1451
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr ""
 
-#: convert.c:1495
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr ""
 
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr ""
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr ""
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr ""
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr ""
+
+#: credential.c:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr ""
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr ""
+
 #: date.c:138
 msgid "in the future"
 msgstr ""
@@ -2253,646 +3031,727 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr ""
 
-#: diffcore-order.c:24
+#: diff-merges.c:70
 #, c-format
-msgid "failed to read orderfile '%s'"
+msgid "unknown value for --diff-merges: %s"
 msgstr ""
 
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
 msgstr ""
 
-#: diff-no-index.c:238
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr ""
+
+#: diff-lib.c:576
+msgid "unable to get HEAD"
+msgstr ""
+
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr ""
+
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr ""
+
+#: 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:155
+#: diff.c:156
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 
-#: diff.c:160
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr ""
 
-#: diff.c:296
+#: diff.c:297
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
 
-#: diff.c:324
+#: diff.c:325
 #, 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:332
+#: diff.c:333
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr ""
 
-#: diff.c:405
+#: diff.c:410
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 
-#: diff.c:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr ""
 
-#: diff.c:4218
+#: diff.c:4282
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr ""
 
-#: diff.c:4563
+#: diff.c:4634
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 
-#: diff.c:4566
+#: diff.c:4637
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr ""
 
-#: diff.c:4644
+#: 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:4722
 msgid "--follow requires exactly one pathspec"
 msgstr ""
 
-#: diff.c:4692
+#: diff.c:4770
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr ""
 
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
-#: parse-options.c:199 parse-options.c:203
+#: 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
 #, c-format
 msgid "%s expects a numerical value"
 msgstr ""
 
-#: diff.c:4729
+#: diff.c:4807
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr ""
 
-#: diff.c:4814
+#: diff.c:4892
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr ""
 
-#: diff.c:4838
+#: diff.c:4916
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr ""
 
-#: diff.c:4852
+#: diff.c:4930
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: diff.c:4902 diff.c:4908
+#: diff.c:4980 diff.c:4986
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 
-#: diff.c:4920
+#: diff.c:4998
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr ""
 
-#: diff.c:4941
+#: diff.c:5019
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr ""
 
-#: diff.c:4960
+#: diff.c:5038
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr ""
 
-#: diff.c:5000
+#: diff.c:5078
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 
-#: diff.c:5036 diff.c:5056
+#: diff.c:5114 diff.c:5134
 #, c-format
 msgid "invalid argument to %s"
 msgstr ""
 
-#: diff.c:5194
+#: diff.c:5238
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr ""
+
+#: diff.c:5287
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr ""
 
-#: diff.c:5250
+#: diff.c:5343
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr ""
 
-#: diff.c:5273
+#: diff.c:5379
 msgid "Diff output format options"
 msgstr ""
 
-#: diff.c:5275 diff.c:5281
+#: diff.c:5381 diff.c:5387
 msgid "generate patch"
 msgstr ""
 
-#: diff.c:5278 builtin/log.c:172
+#: diff.c:5384 builtin/log.c:179
 msgid "suppress diff output"
 msgstr ""
 
-#: diff.c:5283 diff.c:5397 diff.c:5404
+#: diff.c:5389 diff.c:5503 diff.c:5510
 msgid "<n>"
 msgstr ""
 
-#: diff.c:5284 diff.c:5287
+#: diff.c:5390 diff.c:5393
 msgid "generate diffs with <n> lines context"
 msgstr ""
 
-#: diff.c:5289
+#: diff.c:5395
 msgid "generate the diff in raw format"
 msgstr ""
 
-#: diff.c:5292
+#: diff.c:5398
 msgid "synonym for '-p --raw'"
 msgstr ""
 
-#: diff.c:5296
+#: diff.c:5402
 msgid "synonym for '-p --stat'"
 msgstr ""
 
-#: diff.c:5300
+#: diff.c:5406
 msgid "machine friendly --stat"
 msgstr ""
 
-#: diff.c:5303
+#: diff.c:5409
 msgid "output only the last line of --stat"
 msgstr ""
 
-#: diff.c:5305 diff.c:5313
+#: diff.c:5411 diff.c:5419
 msgid "<param1,param2>..."
 msgstr ""
 
-#: diff.c:5306
+#: diff.c:5412
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 
-#: diff.c:5310
+#: diff.c:5416
 msgid "synonym for --dirstat=cumulative"
 msgstr ""
 
-#: diff.c:5314
+#: diff.c:5420
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr ""
 
-#: diff.c:5318
+#: diff.c:5424
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 
-#: diff.c:5321
+#: diff.c:5427
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 
-#: diff.c:5324
+#: diff.c:5430
 msgid "show only names of changed files"
 msgstr ""
 
-#: diff.c:5327
+#: diff.c:5433
 msgid "show only names and status of changed files"
 msgstr ""
 
-#: diff.c:5329
+#: diff.c:5435
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr ""
 
-#: diff.c:5330
+#: diff.c:5436
 msgid "generate diffstat"
 msgstr ""
 
-#: diff.c:5332 diff.c:5335 diff.c:5338
+#: diff.c:5438 diff.c:5441 diff.c:5444
 msgid "<width>"
 msgstr ""
 
-#: diff.c:5333
+#: diff.c:5439
 msgid "generate diffstat with a given width"
 msgstr ""
 
-#: diff.c:5336
+#: diff.c:5442
 msgid "generate diffstat with a given name width"
 msgstr ""
 
-#: diff.c:5339
+#: diff.c:5445
 msgid "generate diffstat with a given graph width"
 msgstr ""
 
-#: diff.c:5341
+#: diff.c:5447
 msgid "<count>"
 msgstr ""
 
-#: diff.c:5342
+#: diff.c:5448
 msgid "generate diffstat with limited lines"
 msgstr ""
 
-#: diff.c:5345
+#: diff.c:5451
 msgid "generate compact summary in diffstat"
 msgstr ""
 
-#: diff.c:5348
+#: diff.c:5454
 msgid "output a binary diff that can be applied"
 msgstr ""
 
-#: diff.c:5351
+#: diff.c:5457
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 
-#: diff.c:5353
+#: diff.c:5459
 msgid "show colored diff"
 msgstr ""
 
-#: diff.c:5354
+#: diff.c:5460
 msgid "<kind>"
 msgstr ""
 
-#: diff.c:5355
+#: diff.c:5461
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
 
-#: diff.c:5358
+#: diff.c:5464
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgstr ""
 
-#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
 msgid "<prefix>"
 msgstr ""
 
-#: diff.c:5362
+#: diff.c:5468
 msgid "show the given source prefix instead of \"a/\""
 msgstr ""
 
-#: diff.c:5365
+#: diff.c:5471
 msgid "show the given destination prefix instead of \"b/\""
 msgstr ""
 
-#: diff.c:5368
+#: diff.c:5474
 msgid "prepend an additional prefix to every line of output"
 msgstr ""
 
-#: diff.c:5371
+#: diff.c:5477
 msgid "do not show any source or destination prefix"
 msgstr ""
 
-#: diff.c:5374
+#: diff.c:5480
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 
-#: diff.c:5378 diff.c:5383 diff.c:5388
+#: diff.c:5484 diff.c:5489 diff.c:5494
 msgid "<char>"
 msgstr ""
 
-#: diff.c:5379
+#: diff.c:5485
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr ""
 
-#: diff.c:5384
+#: diff.c:5490
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr ""
 
-#: diff.c:5389
+#: diff.c:5495
 msgid "specify the character to indicate a context instead of ' '"
 msgstr ""
 
-#: diff.c:5392
+#: diff.c:5498
 msgid "Diff rename options"
 msgstr ""
 
-#: diff.c:5393
+#: diff.c:5499
 msgid "<n>[/<m>]"
 msgstr ""
 
-#: diff.c:5394
+#: diff.c:5500
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 
-#: diff.c:5398
+#: diff.c:5504
 msgid "detect renames"
 msgstr ""
 
-#: diff.c:5402
+#: diff.c:5508
 msgid "omit the preimage for deletes"
 msgstr ""
 
-#: diff.c:5405
+#: diff.c:5511
 msgid "detect copies"
 msgstr ""
 
-#: diff.c:5409
+#: diff.c:5515
 msgid "use unmodified files as source to find copies"
 msgstr ""
 
-#: diff.c:5411
+#: diff.c:5517
 msgid "disable rename detection"
 msgstr ""
 
-#: diff.c:5414
+#: diff.c:5520
 msgid "use empty blobs as rename source"
 msgstr ""
 
-#: diff.c:5416
+#: diff.c:5522
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 
-#: diff.c:5419
+#: diff.c:5525
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 
-#: diff.c:5421
+#: diff.c:5527
 msgid "Diff algorithm options"
 msgstr ""
 
-#: diff.c:5423
+#: diff.c:5529
 msgid "produce the smallest possible diff"
 msgstr ""
 
-#: diff.c:5426
+#: diff.c:5532
 msgid "ignore whitespace when comparing lines"
 msgstr ""
 
-#: diff.c:5429
+#: diff.c:5535
 msgid "ignore changes in amount of whitespace"
 msgstr ""
 
-#: diff.c:5432
+#: diff.c:5538
 msgid "ignore changes in whitespace at EOL"
 msgstr ""
 
-#: diff.c:5435
+#: diff.c:5541
 msgid "ignore carrier-return at the end of line"
 msgstr ""
 
-#: diff.c:5438
+#: diff.c:5544
 msgid "ignore changes whose lines are all blank"
 msgstr ""
 
-#: diff.c:5441
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr ""
+
+#: diff.c:5547
+msgid "ignore changes whose all lines match <regex>"
+msgstr ""
+
+#: diff.c:5550
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 
-#: diff.c:5444
+#: diff.c:5553
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr ""
 
-#: diff.c:5448
+#: diff.c:5557
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr ""
 
-#: diff.c:5450
+#: diff.c:5559
 msgid "<algorithm>"
 msgstr ""
 
-#: diff.c:5451
+#: diff.c:5560
 msgid "choose a diff algorithm"
 msgstr ""
 
-#: diff.c:5453
+#: diff.c:5562
 msgid "<text>"
 msgstr ""
 
-#: diff.c:5454
+#: diff.c:5563
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr ""
 
-#: diff.c:5456 diff.c:5465 diff.c:5468
+#: diff.c:5565 diff.c:5574 diff.c:5577
 msgid "<mode>"
 msgstr ""
 
-#: diff.c:5457
+#: diff.c:5566
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 
-#: diff.c:5459 diff.c:5462 diff.c:5507
-msgid "<regex>"
-msgstr ""
-
-#: diff.c:5460
+#: diff.c:5569
 msgid "use <regex> to decide what a word is"
 msgstr ""
 
-#: diff.c:5463
+#: diff.c:5572
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr ""
 
-#: diff.c:5466
+#: diff.c:5575
 msgid "moved lines of code are colored differently"
 msgstr ""
 
-#: diff.c:5469
+#: diff.c:5578
 msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 
-#: diff.c:5472
+#: diff.c:5581
 msgid "Other diff options"
 msgstr ""
 
-#: diff.c:5474
+#: diff.c:5583
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 
-#: diff.c:5478
+#: diff.c:5587
 msgid "treat all files as text"
 msgstr ""
 
-#: diff.c:5480
+#: diff.c:5589
 msgid "swap two inputs, reverse the diff"
 msgstr ""
 
-#: diff.c:5482
+#: diff.c:5591
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 
-#: diff.c:5484
+#: diff.c:5593
 msgid "disable all output of the program"
 msgstr ""
 
-#: diff.c:5486
+#: diff.c:5595
 msgid "allow an external diff helper to be executed"
 msgstr ""
 
-#: diff.c:5488
+#: diff.c:5597
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 
-#: diff.c:5490
+#: diff.c:5599
 msgid "<when>"
 msgstr ""
 
-#: diff.c:5491
+#: diff.c:5600
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 
-#: diff.c:5494
+#: diff.c:5603
 msgid "<format>"
 msgstr ""
 
-#: diff.c:5495
+#: diff.c:5604
 msgid "specify how differences in submodules are shown"
 msgstr ""
 
-#: diff.c:5499
+#: diff.c:5608
 msgid "hide 'git add -N' entries from the index"
 msgstr ""
 
-#: diff.c:5502
+#: diff.c:5611
 msgid "treat 'git add -N' entries as real in the index"
 msgstr ""
 
-#: diff.c:5504
+#: diff.c:5613
 msgid "<string>"
 msgstr ""
 
-#: diff.c:5505
+#: diff.c:5614
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr ""
 
-#: diff.c:5508
+#: diff.c:5617
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr ""
 
-#: diff.c:5511
+#: diff.c:5620
 msgid "show all changes in the changeset with -S or -G"
 msgstr ""
 
-#: diff.c:5514
+#: diff.c:5623
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 
-#: diff.c:5517
+#: diff.c:5626
 msgid "control the order in which files appear in the output"
 msgstr ""
 
-#: diff.c:5518
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr ""
+
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr ""
+
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr ""
+
+#: diff.c:5633
 msgid "<object-id>"
 msgstr ""
 
-#: diff.c:5519
+#: diff.c:5634
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr ""
 
-#: diff.c:5521
+#: diff.c:5636
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr ""
 
-#: diff.c:5522
+#: diff.c:5637
 msgid "select files by diff type"
 msgstr ""
 
-#: diff.c:5524
+#: diff.c:5639
 msgid "<file>"
 msgstr ""
 
-#: diff.c:5525
+#: diff.c:5640
 msgid "Output to a specific file"
 msgstr ""
 
-#: diff.c:6180
-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 ""
 
-#: diff.c:6183
+#: diff.c:6301
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 
-#: diff.c:6186
+#: diff.c:6304
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 
-#: dir.c:549
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr ""
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr ""
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr ""
+
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 
-#: dir.c:938
+#: dir.c:733 dir.c:762 dir.c:775
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr ""
+
+#: dir.c:790 dir.c:804
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr ""
+
+#: dir.c:820
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+
+#: dir.c:830
+msgid "disabling cone pattern matching"
+msgstr ""
+
+#: dir.c:1214
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr ""
 
-#: dir.c:1877
+#: dir.c:2351
 #, c-format
 msgid "could not open directory '%s'"
 msgstr ""
 
-#: dir.c:2128
+#: dir.c:2653
 msgid "failed to get kernel name and information"
 msgstr ""
 
-#: dir.c:2252
+#: dir.c:2777
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 
-#: dir.c:3056
+#: dir.c:3610
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr ""
 
-#: dir.c:3101 dir.c:3106
+#: dir.c:3657 dir.c:3662
 #, c-format
 msgid "could not create directories for %s"
 msgstr ""
 
-#: dir.c:3135
+#: dir.c:3691
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr ""
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr ""
 
-#: entry.c:178
+#: entry.c:176
 msgid "Filtering content"
 msgstr ""
 
-#: entry.c:476
+#: entry.c:497
 #, c-format
 msgid "could not stat file '%s'"
 msgstr ""
 
-#: environment.c:148
+#: environment.c:152
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr ""
 
-#: environment.c:330
+#: environment.c:334
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr ""
@@ -2902,267 +3761,297 @@ msgstr ""
 msgid "too many args to run %s"
 msgstr ""
 
-#: fetch-pack.c:150
+#: fetch-pack.c:182
 msgid "git fetch-pack: expected shallow list"
 msgstr ""
 
-#: fetch-pack.c:153
+#: fetch-pack.c:185
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
 
-#: fetch-pack.c:164
+#: fetch-pack.c:196
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr ""
 
-#: fetch-pack.c:184
+#: fetch-pack.c:216
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:195
+#: fetch-pack.c:227
 msgid "unable to write to remote"
 msgstr ""
 
-#: fetch-pack.c:257
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr ""
 
-#: fetch-pack.c:356 fetch-pack.c:1280
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:362 fetch-pack.c:1286
+#: fetch-pack.c:389 fetch-pack.c:1429
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr ""
 
-#: fetch-pack.c:364 fetch-pack.c:1288
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
 msgstr ""
 
-#: fetch-pack.c:367 fetch-pack.c:1291
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
 msgstr ""
 
-#: fetch-pack.c:369 fetch-pack.c:1293
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
 msgstr ""
 
-#: fetch-pack.c:372 fetch-pack.c:1297
+#: fetch-pack.c:399 fetch-pack.c:1440
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr ""
 
-#: fetch-pack.c:414
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr ""
 
-#: fetch-pack.c:431
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
 msgstr ""
 
-#: fetch-pack.c:462
+#: fetch-pack.c:487
 msgid "giving up"
 msgstr ""
 
-#: fetch-pack.c:475 progress.c:312
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
 msgstr ""
 
-#: fetch-pack.c:487
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr ""
 
-#: fetch-pack.c:533
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr ""
 
-#: fetch-pack.c:742
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr ""
 
-#: fetch-pack.c:781
+#: fetch-pack.c:849
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:789
+#: fetch-pack.c:857
 msgid "protocol error: bad pack header"
 msgstr ""
 
-#: fetch-pack.c:857
+#: fetch-pack.c:951
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr ""
 
-#: fetch-pack.c:873
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr ""
+
+#: fetch-pack.c:974
 #, c-format
 msgid "%s failed"
 msgstr ""
 
-#: fetch-pack.c:875
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
 msgstr ""
 
-#: fetch-pack.c:907
+#: fetch-pack.c:1019
 #, c-format
 msgid "Server version is %.*s"
 msgstr ""
 
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
+#: 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 ""
 
-#: fetch-pack.c:914
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
 msgstr ""
 
-#: fetch-pack.c:974
+#: fetch-pack.c:1089
 msgid "Server does not support --shallow-since"
 msgstr ""
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1094
 msgid "Server does not support --shallow-exclude"
 msgstr ""
 
-#: fetch-pack.c:983
+#: fetch-pack.c:1098
 msgid "Server does not support --deepen"
 msgstr ""
 
-#: fetch-pack.c:1000
+#: fetch-pack.c:1100
+msgid "Server does not support this repository's object format"
+msgstr ""
+
+#: fetch-pack.c:1113
 msgid "no common commits"
 msgstr ""
 
-#: fetch-pack.c:1012 fetch-pack.c:1468
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr ""
+
+#: fetch-pack.c:1128 fetch-pack.c:1660
 msgid "git fetch-pack: fetch failed."
 msgstr ""
 
-#: fetch-pack.c:1150
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr ""
+
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr ""
+
+#: fetch-pack.c:1279
 msgid "Server does not support shallow requests"
 msgstr ""
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1286
 msgid "Server supports filter"
 msgstr ""
 
-#: fetch-pack.c:1180
+#: fetch-pack.c:1329 fetch-pack.c:2043
 msgid "unable to write request to remote"
 msgstr ""
 
-#: fetch-pack.c:1198
+#: fetch-pack.c:1347
 #, c-format
 msgid "error reading section header '%s'"
 msgstr ""
 
-#: fetch-pack.c:1204
+#: fetch-pack.c:1353
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr ""
 
-#: fetch-pack.c:1243
+#: fetch-pack.c:1387
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1248
+#: fetch-pack.c:1392
 #, c-format
 msgid "error processing acks: %d"
 msgstr ""
 
-#: fetch-pack.c:1258
+#: fetch-pack.c:1402
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1260
+#: fetch-pack.c:1404
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1302
+#: fetch-pack.c:1445
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr ""
 
-#: fetch-pack.c:1349
+#: fetch-pack.c:1494
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:1354
+#: fetch-pack.c:1499
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1359
+#: fetch-pack.c:1504
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr ""
 
-#: fetch-pack.c:1693
+#: fetch-pack.c:1534
+msgid "git fetch-pack: expected response end packet"
+msgstr ""
+
+#: fetch-pack.c:1939
 msgid "no matching remote head"
 msgstr ""
 
-#: fetch-pack.c:1716 builtin/clone.c:685
+#: fetch-pack.c:1962 builtin/clone.c:697
 msgid "remote did not send all necessary objects"
 msgstr ""
 
-#: fetch-pack.c:1743
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr ""
+
+#: fetch-pack.c:2088
 #, c-format
 msgid "no such remote ref %s"
 msgstr ""
 
-#: fetch-pack.c:1746
+#: fetch-pack.c:2091
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr ""
 
-#: gpg-interface.c:321
-msgid "gpg failed to sign the data"
-msgstr ""
-
-#: gpg-interface.c:347
+#: gpg-interface.c:273
 msgid "could not create temporary file"
 msgstr ""
 
-#: gpg-interface.c:350
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr ""
 
-#: graph.c:97
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+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:668
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
 msgstr ""
 
-#: grep.c:2124
+#: grep.c:1895
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr ""
 
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
-#: 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 ""
 
-#: grep.c:2152
+#: grep.c:1923
 #, c-format
 msgid "'%s': short read"
 msgstr ""
@@ -3212,79 +4101,79 @@ msgid "Low-level Commands / Interrogators"
 msgstr ""
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr ""
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
 msgstr ""
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr ""
 
-#: help.c:305
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr ""
 
-#: help.c:314
+#: help.c:316
 msgid "These are common Git commands used in various situations:"
 msgstr ""
 
-#: help.c:363 git.c:98
+#: help.c:365 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr ""
 
-#: help.c:403
-msgid "The common Git guides are:"
+#: help.c:405
+msgid "The Git concept guides are:"
 msgstr ""
 
-#: help.c:512
+#: help.c:429
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr ""
 
-#: help.c:517
+#: help.c:434
 msgid "External commands"
 msgstr ""
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr ""
 
-#: help.c:596
+#: help.c:527
 #, 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:655
+#: help.c:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr ""
+
+#: help.c:591
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr ""
 
-#: help.c:677
+#: help.c:613
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr ""
 
-#: help.c:682
+#: help.c:618
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr ""
 
-#: help.c:687
+#: help.c:623
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr ""
 
-#: help.c:695
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr ""
-
-#: help.c:699
+#: help.c:635
 msgid ""
 "\n"
 "The most similar command is"
@@ -3294,16 +4183,16 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: help.c:714
+#: help.c:675
 msgid "git version [<options>]"
 msgstr ""
 
-#: help.c:783
+#: help.c:730
 #, c-format
 msgid "%s: %s - %s"
 msgstr ""
 
-#: help.c:787
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3313,7 +4202,15 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr ""
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr ""
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3328,91 +4225,100 @@ msgid ""
 "\n"
 msgstr ""
 
-#: ident.c:379
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
 msgstr ""
 
-#: ident.c:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr ""
 
-#: ident.c:401
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
 msgstr ""
 
-#: ident.c:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr ""
 
-#: ident.c:415
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr ""
 
-#: ident.c:421
+#: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr ""
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:454 builtin/commit.c:647
 #, c-format
 msgid "invalid date format: %s"
 msgstr ""
 
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+#: list-objects-filter-options.c:83
+msgid "expected 'tree:<depth>'"
 msgstr ""
 
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+#: list-objects-filter-options.c:98
+msgid "sparse:path filters support has been dropped"
 msgstr ""
 
-#: list-objects.c:375
+#: list-objects-filter-options.c:105
 #, c-format
-msgid "unable to load root tree for commit %s"
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
 msgstr ""
 
-#: list-objects-filter.c:492
+#: list-objects-filter-options.c:124
 #, c-format
-msgid "unable to access sparse blob in '%s'"
+msgid "invalid filter-spec '%s'"
 msgstr ""
 
-#: list-objects-filter.c:495
+#: list-objects-filter-options.c:140
 #, c-format
-msgid "unable to parse sparse filter data in %s"
+msgid "must escape char in sub-filter-spec: '%c'"
 msgstr ""
 
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
+#: list-objects-filter-options.c:182
+msgid "expected something after combine:"
 msgstr ""
 
-#: list-objects-filter-options.c:73
-msgid "sparse:path filters support has been dropped"
+#: list-objects-filter-options.c:264
+msgid "multiple filter-specs cannot be combined"
+msgstr ""
+
+#: list-objects-filter-options.c:376
+msgid "unable to upgrade repository format to support partial clone"
 msgstr ""
 
-#: list-objects-filter-options.c:86
+#: list-objects-filter.c:532
 #, c-format
-msgid "invalid filter-spec '%s'"
+msgid "unable to access sparse blob in '%s'"
 msgstr ""
 
-#: list-objects-filter-options.c:102
+#: list-objects-filter.c:535
 #, c-format
-msgid "must escape char in sub-filter-spec: '%c'"
+msgid "unable to parse sparse filter data in %s"
 msgstr ""
 
-#: list-objects-filter-options.c:144
-msgid "expected something after combine:"
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
 msgstr ""
 
-#: list-objects-filter-options.c:226
-msgid "multiple filter-specs cannot be combined"
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+
+#: list-objects.c:398
+#, c-format
+msgid "unable to load root tree for commit %s"
 msgstr ""
 
-#: lockfile.c:151
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3424,555 +4330,710 @@ msgid ""
 "remove the file manually to continue."
 msgstr ""
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr ""
 
-#: merge.c:41
-msgid "failed to read the cache"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
 msgstr ""
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
-#: builtin/stash.c:264
-msgid "unable to write new index file"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
 msgstr ""
 
-#: merge-recursive.c:367
-msgid "(bad commit)\n"
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
 msgstr ""
 
-#: merge-recursive.c:390
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
 #, c-format
-msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgid "bad action '%s' for '%s'"
 msgstr ""
 
-#: merge-recursive.c:399
+#: merge-ort.c:1569 merge-recursive.c:1201
 #, c-format
-msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgid "Failed to merge submodule %s (not checked out)"
 msgstr ""
 
-#: merge-recursive.c:885
+#: merge-ort.c:1578 merge-recursive.c:1208
 #, c-format
-msgid "failed to create path '%s'%s"
+msgid "Failed to merge submodule %s (commits not present)"
 msgstr ""
 
-#: merge-recursive.c:896
+#: merge-ort.c:1587 merge-recursive.c:1215
 #, c-format
-msgid "Removing %s to make room for subdirectory\n"
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 
-#: merge-recursive.c:910 merge-recursive.c:929
-msgid ": perhaps a D/F conflict?"
+#: merge-ort.c:1597 merge-ort.c:1604
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
 msgstr ""
 
-#: merge-recursive.c:919
+#: merge-ort.c:1625
 #, c-format
-msgid "refusing to lose untracked file at '%s'"
+msgid "Failed to merge submodule %s"
 msgstr ""
 
-#: merge-recursive.c:960 builtin/cat-file.c:41
+#: merge-ort.c:1632
 #, c-format
-msgid "cannot read object %s '%s'"
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
 msgstr ""
 
-#: merge-recursive.c:965
+#: merge-ort.c:1636 merge-recursive.c:1269
 #, c-format
-msgid "blob expected for %s '%s'"
+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-recursive.c:990
+#: merge-ort.c:1649
 #, c-format
-msgid "failed to open '%s': %s"
+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 ""
 
-#: merge-recursive.c:1001
+#: merge-ort.c:1873 merge-recursive.c:1363
 #, c-format
-msgid "failed to symlink '%s': %s"
+msgid "Unable to add %s to database"
 msgstr ""
 
-#: merge-recursive.c:1006
+#: merge-ort.c:1880 merge-recursive.c:1396
 #, c-format
-msgid "do not know what to do with %06o %s '%s'"
+msgid "Auto-merging %s"
 msgstr ""
 
-#: merge-recursive.c:1199
+#: merge-ort.c:2019 merge-recursive.c:2118
 #, c-format
-msgid "Failed to merge submodule %s (not checked out)"
+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:1206
+#: merge-ort.c:2029 merge-recursive.c:2128
 #, c-format
-msgid "Failed to merge submodule %s (commits not present)"
+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:1213
+#: merge-ort.c:2087
 #, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+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-recursive.c:1221 merge-recursive.c:1233
+#: merge-ort.c:2241 merge-recursive.c:2464
 #, c-format
-msgid "Fast-forwarding submodule %s to the following commit:"
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
 msgstr ""
 
-#: merge-recursive.c:1224 merge-recursive.c:1236
+#: merge-ort.c:2385 merge-recursive.c:3247
 #, c-format
-msgid "Fast-forwarding submodule %s"
+msgid ""
+"Path updated: %s added in %s inside a directory that was renamed in %s; "
+"moving it to %s."
 msgstr ""
 
-#: merge-recursive.c:1259
+#: merge-ort.c:2392 merge-recursive.c:3254
 #, c-format
-msgid "Failed to merge submodule %s (merge following commits not found)"
+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:1263
+#: merge-ort.c:2405 merge-recursive.c:3250
 #, c-format
-msgid "Failed to merge submodule %s (not fast-forward)"
+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:1264
-msgid "Found a possible merge resolution for the submodule:\n"
+#: 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-recursive.c:1267
+#: merge-ort.c:2569
+#, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+
+#: merge-ort.c:2664
 #, 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"
+"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-recursive.c:1276
+#: merge-ort.c:2683 merge-ort.c:2707
 #, c-format
-msgid "Failed to merge submodule %s (multiple merges found)"
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
 msgstr ""
 
-#: merge-recursive.c:1349
-msgid "Failed to execute internal merge"
+#: merge-ort.c:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
 msgstr ""
 
-#: merge-recursive.c:1354
+#: merge-ort.c:3185 merge-recursive.c:3011
 #, c-format
-msgid "Unable to add %s to database"
+msgid "object %s is not a blob"
 msgstr ""
 
-#: merge-recursive.c:1386
+#: merge-ort.c:3613
 #, c-format
-msgid "Auto-merging %s"
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
 msgstr ""
 
-#: merge-recursive.c:1410
+#: merge-ort.c:3689
 #, c-format
-msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed both "
+"of them so each can be recorded somewhere."
 msgstr ""
 
-#: merge-recursive.c:1482
+#: merge-ort.c:3696
 #, c-format
 msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree."
+"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 ""
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr ""
+
+#: merge-ort.c:3800 merge-recursive.c:3136
+msgid "submodule"
+msgstr ""
+
+#: merge-ort.c:3802 merge-recursive.c:3137
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr ""
 
-#: merge-recursive.c:1487
+#: merge-ort.c:3833
 #, c-format
 msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree."
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
 msgstr ""
 
-#: merge-recursive.c:1494
+#: merge-ort.c:4120
 #, c-format
 msgid ""
-"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
-"in tree at %s."
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
 msgstr ""
 
-#: merge-recursive.c:1499
+#. 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 ""
-"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
-"left in tree at %s."
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
 msgstr ""
 
-#: merge-recursive.c:1534
-msgid "rename"
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
 msgstr ""
 
-#: merge-recursive.c:1534
-msgid "renamed"
+#: merge-recursive.c:352
+msgid "(bad commit)\n"
 msgstr ""
 
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:375
 #, c-format
-msgid "Refusing to lose dirty file at %s"
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr ""
 
-#: merge-recursive.c:1624
+#: merge-recursive.c:384
 #, c-format
-msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 
-#: merge-recursive.c:1682
+#: merge-recursive.c:872
 #, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
+msgid "failed to create path '%s'%s"
 msgstr ""
 
-#: merge-recursive.c:1713
+#: merge-recursive.c:883
 #, c-format
-msgid "%s is a directory in %s adding as %s instead"
+msgid "Removing %s to make room for subdirectory\n"
 msgstr ""
 
-#: merge-recursive.c:1718
+#: merge-recursive.c:897 merge-recursive.c:916
+msgid ": perhaps a D/F conflict?"
+msgstr ""
+
+#: merge-recursive.c:906
 #, c-format
-msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgid "refusing to lose untracked file at '%s'"
 msgstr ""
 
-#: merge-recursive.c:1737
+#: merge-recursive.c:947 builtin/cat-file.c:41
 #, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
-"\"->\"%s\" in \"%s\"%s"
+msgid "cannot read object %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:1742
-msgid " (left unresolved)"
+#: merge-recursive.c:952
+#, c-format
+msgid "blob expected for %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:1851
+#: merge-recursive.c:977
 #, c-format
-msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgid "failed to open '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:2056
+#: merge-recursive.c:988
 #, 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."
+msgid "failed to symlink '%s': %s"
 msgstr ""
 
-#: merge-recursive.c:2088
+#: merge-recursive.c:993
 #, 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."
+msgid "do not know what to do with %06o %s '%s'"
 msgstr ""
 
-#: merge-recursive.c:2098
+#: merge-recursive.c:1223 merge-recursive.c:1235
 #, 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"
+msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr ""
 
-#: merge-recursive.c:2190
+#: merge-recursive.c:1226 merge-recursive.c:1238
 #, c-format
-msgid ""
-"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
-">%s in %s"
+msgid "Fast-forwarding submodule %s"
 msgstr ""
 
-#: merge-recursive.c:2435
+#: merge-recursive.c:1261
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+
+#: merge-recursive.c:1265
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr ""
+
+#: merge-recursive.c:1266
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr ""
+
+#: merge-recursive.c:1278
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr ""
+
+#: merge-recursive.c:1420
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr ""
+
+#: merge-recursive.c:1492
 #, c-format
 msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
 msgstr ""
 
-#: merge-recursive.c:2961
+#: merge-recursive.c:1497
 #, c-format
-msgid "cannot read object %s"
+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:2964
+#: merge-recursive.c:1504
 #, c-format
-msgid "object %s is not a blob"
+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:3028
-msgid "modify"
+#: merge-recursive.c:1509
+#, 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:3028
-msgid "modified"
+#: merge-recursive.c:1544
+msgid "rename"
 msgstr ""
 
-#: merge-recursive.c:3040
-msgid "content"
+#: merge-recursive.c:1544
+msgid "renamed"
 msgstr ""
 
-#: merge-recursive.c:3044
-msgid "add/add"
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#, c-format
+msgid "Refusing to lose dirty file at %s"
 msgstr ""
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:1605
 #, c-format
-msgid "Skipped %s (merged same as existing)"
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 
-#: merge-recursive.c:3089 git-submodule.sh:937
-msgid "submodule"
+#: merge-recursive.c:1663
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 
-#: merge-recursive.c:3090
+#: merge-recursive.c:1694
 #, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
+msgid "%s is a directory in %s adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:3120
+#: merge-recursive.c:1699
 #, c-format
-msgid "Adding as %s instead"
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr ""
 
-#: merge-recursive.c:3203
+#: merge-recursive.c:1726
 #, c-format
 msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
 msgstr ""
 
-#: merge-recursive.c:3206
+#: merge-recursive.c:1731
+msgid " (left unresolved)"
+msgstr ""
+
+#: merge-recursive.c:1823
 #, 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 (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 
-#: merge-recursive.c:3210
+#: merge-recursive.c:2086
 #, c-format
 msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
+"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 ""
 
-#: merge-recursive.c:3213
+#: merge-recursive.c:2220
 #, 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."
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+
+#: merge-recursive.c:3075
+msgid "modify"
+msgstr ""
+
+#: merge-recursive.c:3075
+msgid "modified"
 msgstr ""
 
-#: merge-recursive.c:3327
+#: merge-recursive.c:3114
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr ""
+
+#: merge-recursive.c:3167
+#, c-format
+msgid "Adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:3371
 #, c-format
 msgid "Removing %s"
 msgstr ""
 
-#: merge-recursive.c:3350
+#: merge-recursive.c:3394
 msgid "file/directory"
 msgstr ""
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3399
 msgid "directory/file"
 msgstr ""
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3406
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 
-#: merge-recursive.c:3371
+#: merge-recursive.c:3415
 #, c-format
 msgid "Adding %s"
 msgstr ""
 
-#: merge-recursive.c:3380
+#: merge-recursive.c:3424
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr ""
 
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr ""
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3477
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr ""
 
-#: merge-recursive.c:3537
+#: merge-recursive.c:3571
 msgid "Merging:"
 msgstr ""
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3584
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: merge-recursive.c:3600
+#: merge-recursive.c:3634
 msgid "merge returned no commit"
 msgstr ""
 
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3799
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr ""
 
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
 msgid "Unable to write index."
 msgstr ""
 
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr ""
+
+#: 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 ""
+
+#: 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:84
+#: midx.c:121
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 
-#: midx.c:89
+#: midx.c:126
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr ""
 
-#: midx.c:94
+#: midx.c:131
 #, c-format
-msgid "hash version %u does not match"
+msgid "multi-pack-index hash version %u does not match version %u"
 msgstr ""
 
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr ""
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr ""
-
-#: midx.c:145
+#: midx.c:148
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr ""
 
-#: midx.c:147
+#: midx.c:150
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr ""
 
-#: midx.c:149
+#: midx.c:152
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr ""
 
-#: midx.c:151
+#: midx.c:154
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr ""
 
-#: midx.c:165
+#: midx.c:170
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 
-#: midx.c:210
+#: midx.c:214
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 
-#: midx.c:260
+#: midx.c:264
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr ""
-
-#: midx.c:469
+#: midx.c:490
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr ""
 
-#: midx.c:475
+#: midx.c:496
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr ""
 
-#: midx.c:535
+#: midx.c:564
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr ""
 
-#: midx.c:864
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr ""
+
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+
+#: midx.c:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr ""
+
+#: midx.c:989
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr ""
 
-#: midx.c:1035
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr ""
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr ""
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr ""
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr ""
+
+#: midx.c:1166
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr ""
 
-#: midx.c:1090
+#: midx.c:1225
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr ""
+
+#: midx.c:1236
 msgid "Looking for referenced packfiles"
 msgstr ""
 
-#: midx.c:1105
+#: midx.c:1251
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 
-#: midx.c:1109
-msgid "Verifying OID order in MIDX"
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr ""
+
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
 msgstr ""
 
-#: midx.c:1118
+#: midx.c:1274
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr ""
 
-#: midx.c:1137
+#: midx.c:1294
 msgid "Sorting objects by packfile"
 msgstr ""
 
-#: midx.c:1143
+#: midx.c:1301
 msgid "Verifying object offsets"
 msgstr ""
 
-#: midx.c:1159
+#: midx.c:1317
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr ""
 
-#: midx.c:1165
+#: midx.c:1323
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr ""
 
-#: midx.c:1174
+#: midx.c:1332
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 
-#: midx.c:1349
+#: midx.c:1357
+msgid "Counting referenced objects"
+msgstr ""
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr ""
+
+#: midx.c:1558
 msgid "could not start pack-objects"
 msgstr ""
 
-#: midx.c:1368
+#: midx.c:1578
 msgid "could not finish pack-objects"
 msgstr ""
 
-#: name-hash.c:537
+#: name-hash.c:542
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr ""
 
-#: name-hash.c:559
+#: name-hash.c:564
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr ""
 
-#: name-hash.c:565
+#: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr ""
@@ -4013,6 +5074,343 @@ msgstr ""
 msgid "Bad %s value: '%s'"
 msgstr ""
 
+#: 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 ""
+
+#: 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 ""
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr ""
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr ""
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr ""
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr ""
+
+#: object-file.c:789
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+
+#: object-file.c:795
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr ""
+
+#: object-file.c:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr ""
+
+#: object-file.c:1397
+msgid "invalid object type"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr ""
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr ""
+
+#: 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 ""
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr ""
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr ""
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr ""
+
+#: 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 ""
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr ""
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr ""
+
+#: 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 ""
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr ""
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr ""
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr ""
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr ""
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr ""
+
+#: 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 ""
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr ""
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr ""
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr ""
+
+#: object-name.c:480
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr ""
+
+#: object-name.c:491
+msgid "The candidates are:"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: object-name.c:1778
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+
+#: object-name.c:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr ""
+
 #: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
@@ -4023,35 +5421,114 @@ msgstr ""
 msgid "object %s is a %s, not a %s"
 msgstr ""
 
-#: object.c:233
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr ""
 
-#: object.c:246
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr ""
 
-#: object.c:266 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr ""
 
-#: packfile.c:641
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr ""
+
+#: 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 ""
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr ""
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr ""
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr ""
+
+#: packfile.c:625
 msgid "offset before end of packfile (broken .idx?)"
 msgstr ""
 
-#: packfile.c:1887
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr ""
+
+#: packfile.c:1934
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 
-#: packfile.c:1891
+#: packfile.c:1938
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr ""
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr ""
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+
+#: parse-options-cb.c:132 parse-options-cb.c:149
+#, c-format
+msgid "malformed object name '%s'"
+msgstr ""
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4067,7 +5544,7 @@ msgstr ""
 msgid "%s : incompatible with something else"
 msgstr ""
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr ""
@@ -4077,41 +5554,46 @@ msgstr ""
 msgid "%s isn't available"
 msgstr ""
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr ""
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr ""
 
-#: parse-options.c:860
+#: parse-options.c:668 parse-options.c:988
+#, c-format
+msgid "alias of --%s"
+msgstr ""
+
+#: parse-options.c:879
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: parse-options.c:862
+#: parse-options.c:881
 #, c-format
 msgid "unknown switch `%c'"
 msgstr ""
 
-#: parse-options.c:864
+#: parse-options.c:883
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr ""
 
-#: parse-options.c:888
+#: parse-options.c:907
 msgid "..."
 msgstr ""
 
-#: parse-options.c:907
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr ""
@@ -4119,121 +5601,101 @@ msgstr ""
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:913
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
 msgstr ""
 
-#: parse-options.c:916
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr ""
 
-#: parse-options.c:955
+#: parse-options.c:974
 msgid "-NUM"
 msgstr ""
 
-#: parse-options.c:969
-#, c-format
-msgid "alias of --%s"
-msgstr ""
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr ""
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr ""
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr ""
-
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr ""
 
-#: pathspec.c:128
+#: pathspec.c:151
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 
-#: pathspec.c:146
+#: pathspec.c:169
 msgid "Only one 'attr:' specification is allowed."
 msgstr ""
 
-#: pathspec.c:149
+#: pathspec.c:172
 msgid "attr spec must not be empty"
 msgstr ""
 
-#: pathspec.c:192
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr ""
 
-#: pathspec.c:257
+#: pathspec.c:280
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 
-#: pathspec.c:264
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr ""
 
-#: pathspec.c:304
+#: pathspec.c:327
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr ""
 
-#: pathspec.c:325
+#: pathspec.c:348
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr ""
 
-#: pathspec.c:330
+#: pathspec.c:353
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr ""
 
-#: pathspec.c:368
+#: pathspec.c:391
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr ""
 
-#: pathspec.c:427
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr ""
 
-#: pathspec.c:440
+#: pathspec.c:466
 #, c-format
-msgid "%s: '%s' is outside repository"
+msgid "%s: '%s' is outside repository at '%s'"
 msgstr ""
 
-#: pathspec.c:514
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr ""
 
-#: pathspec.c:524
+#: pathspec.c:552
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr ""
 
-#: pathspec.c:591
+#: pathspec.c:619
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr ""
 
+#: pathspec.c:664
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr ""
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr ""
@@ -4243,297 +5705,341 @@ msgid "unable to write delim packet"
 msgstr ""
 
 #: pkt-line.c:106
+msgid "unable to write response end packet"
+msgstr ""
+
+#: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr ""
 
-#: pkt-line.c:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:265
 msgid "protocol error: impossibly long line"
 msgstr ""
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr ""
 
-#: pkt-line.c:196
+#: pkt-line.c:204
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 
-#: pkt-line.c:203 pkt-line.c:210
-msgid "packet write failed"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
 msgstr ""
 
-#: pkt-line.c:295
+#: pkt-line.c:328 pkt-line.c:329
 msgid "read error"
 msgstr ""
 
-#: pkt-line.c:303
+#: pkt-line.c:339 pkt-line.c:340
 msgid "the remote end hung up unexpectedly"
 msgstr ""
 
-#: pkt-line.c:331
+#: pkt-line.c:369 pkt-line.c:371
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr ""
 
-#: pkt-line.c:341 pkt-line.c:346
+#: 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 ""
 
-#: pkt-line.c:362
+#: pkt-line.c:413 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr ""
 
-#: preload-index.c:119
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr ""
 
-#: preload-index.c:138
+#: preload-index.c:144
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr ""
 
-#: pretty.c:966
+#: pretty.c:988
 msgid "unable to parse --pretty format"
 msgstr ""
 
-#: promisor-remote.c:25
-msgid "Remote with no URL"
+#: promisor-remote.c:31
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c:38 promisor-remote.c:40
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c:44
+msgid "promisor-remote: could not close stdin to fetch subprocess"
 msgstr ""
 
-#: promisor-remote.c:61
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr ""
 
-#: range-diff.c:71
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr ""
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr ""
+
+#: range-diff.c:78
 msgid "could not start `log`"
 msgstr ""
 
-#: range-diff.c:73
+#: range-diff.c:80
 msgid "could not read `log` output"
 msgstr ""
 
-#: range-diff.c:92 sequencer.c:4985
+#: range-diff.c:101 sequencer.c:5550
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr ""
 
-#: range-diff.c:118
+#: 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:140
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr ""
 
-#: range-diff.c:275
+#: range-diff.c:307
 msgid "failed to generate diff"
 msgstr ""
 
-#: range-diff.c:507 range-diff.c:509
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr ""
+
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr ""
 
-#: read-cache.c:680
+#: read-cache.c:710
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 
-#: read-cache.c:696
+#: read-cache.c:726
 msgid "cannot create an empty blob in the object database"
 msgstr ""
 
-#: read-cache.c:718
+#: read-cache.c:748
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 
-#: read-cache.c:723
+#: read-cache.c:753
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr ""
 
-#: read-cache.c:775
+#: read-cache.c:805
 #, c-format
 msgid "unable to index file '%s'"
 msgstr ""
 
-#: read-cache.c:794
+#: read-cache.c:824
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr ""
 
-#: read-cache.c:805
+#: read-cache.c:835
 #, c-format
 msgid "unable to stat '%s'"
 msgstr ""
 
-#: read-cache.c:1314
+#: read-cache.c:1358
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr ""
 
-#: read-cache.c:1520
+#: read-cache.c:1573
 msgid "Refresh index"
 msgstr ""
 
-#: read-cache.c:1635
+#: read-cache.c:1705
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1645
+#: read-cache.c:1715
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr ""
 
-#: read-cache.c:1701
+#: read-cache.c:1771
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr ""
 
-#: read-cache.c:1704
+#: read-cache.c:1774
 #, c-format
 msgid "bad index version %d"
 msgstr ""
 
-#: read-cache.c:1713
+#: read-cache.c:1783
 msgid "bad index file sha1 signature"
 msgstr ""
 
-#: read-cache.c:1743
+#: read-cache.c:1817
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 
-#: read-cache.c:1745
+#: read-cache.c:1819
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr ""
 
-#: read-cache.c:1782
+#: read-cache.c:1856
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr ""
 
-#: read-cache.c:1798
+#: read-cache.c:1872
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr ""
 
-#: read-cache.c:1855
+#: read-cache.c:1929
 msgid "unordered stage entries in index"
 msgstr ""
 
-#: read-cache.c:1858
+#: read-cache.c:1932
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr ""
 
-#: read-cache.c:1861
+#: read-cache.c:1935
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr ""
 
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: 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 ""
 
-#: read-cache.c:2108
+#: read-cache.c:2185
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2121
+#: read-cache.c:2198
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2154
+#: read-cache.c:2231
 #, c-format
 msgid "%s: index file open failed"
 msgstr ""
 
-#: read-cache.c:2158
+#: read-cache.c:2235
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr ""
 
-#: read-cache.c:2162
+#: read-cache.c:2239
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr ""
 
-#: read-cache.c:2166
+#: read-cache.c:2243
 #, c-format
-msgid "%s: unable to map index file"
+msgid "%s: unable to map index file%s"
 msgstr ""
 
-#: read-cache.c:2208
+#: read-cache.c:2286
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2235
+#: read-cache.c:2313
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2267
+#: read-cache.c:2351
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr ""
 
-#: read-cache.c:2314
+#: read-cache.c:2398
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr ""
 
-#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
 #, c-format
 msgid "could not close '%s'"
 msgstr ""
 
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
+#: 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 ""
 
-#: read-cache.c:3126
+#: read-cache.c:3159
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr ""
 
-#: read-cache.c:3138
+#: read-cache.c:3171
 #, c-format
 msgid "unable to unlink: %s"
 msgstr ""
 
-#: read-cache.c:3163
+#: read-cache.c:3200
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr ""
 
-#: read-cache.c:3312
+#: read-cache.c:3349
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr ""
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+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 ""
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4541,7 +6047,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"
@@ -4550,31 +6059,31 @@ 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 ""
 
-#: rebase-interactive.c:56
+#: 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] ""
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: 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"
 msgstr ""
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr ""
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4583,36 +6092,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 "\n"
 msgstr ""
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr ""
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
+#: 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 ""
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
 #, c-format
-msgid "could not copy '%s' to '%s'."
+msgid "could not write '%s'."
 msgstr ""
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:196
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr ""
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:203
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4623,416 +6129,425 @@ msgid ""
 "\n"
 msgstr ""
 
-#: refs.c:262
+#: 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 "%s does not point to a valid object!"
+msgid "could not read '%s'."
 msgstr ""
 
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
+#: ref-filter.c:42 wt-status.c:2036
+msgid "gone"
 msgstr ""
 
-#: refs.c:669 ref-filter.c:2098
+#: ref-filter.c:43
 #, c-format
-msgid "ignoring broken ref %s"
+msgid "ahead %d"
 msgstr ""
 
-#: refs.c:804
+#: ref-filter.c:44
 #, c-format
-msgid "could not open '%s' for writing: %s"
+msgid "behind %d"
 msgstr ""
 
-#: refs.c:814 refs.c:865
+#: ref-filter.c:45
 #, c-format
-msgid "could not read ref '%s'"
+msgid "ahead %d, behind %d"
 msgstr ""
 
-#: refs.c:820
+#: ref-filter.c:230
 #, c-format
-msgid "ref '%s' already exists"
+msgid "expected format: %%(color:<color>)"
 msgstr ""
 
-#: refs.c:825
+#: ref-filter.c:232
 #, c-format
-msgid "unexpected object ID when writing '%s'"
+msgid "unrecognized color: %%(color:%s)"
 msgstr ""
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
+#: ref-filter.c:254
 #, c-format
-msgid "could not write to '%s'"
+msgid "Integer value expected refname:lstrip=%s"
 msgstr ""
 
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1004
+#: ref-filter.c:258
 #, c-format
-msgid "could not open '%s' for writing"
+msgid "Integer value expected refname:rstrip=%s"
 msgstr ""
 
-#: refs.c:867
+#: ref-filter.c:260
 #, c-format
-msgid "unexpected object ID when deleting '%s'"
+msgid "unrecognized %%(%s) argument: %s"
 msgstr ""
 
-#: refs.c:998
+#: ref-filter.c:315
 #, c-format
-msgid "log for ref %s has gap after %s"
+msgid "%%(objecttype) does not take arguments"
 msgstr ""
 
-#: refs.c:1004
+#: ref-filter.c:339
 #, c-format
-msgid "log for ref %s unexpectedly ended on %s"
+msgid "unrecognized %%(objectsize) argument: %s"
 msgstr ""
 
-#: refs.c:1063
+#: ref-filter.c:347
 #, c-format
-msgid "log for %s is empty"
+msgid "%%(deltabase) does not take arguments"
 msgstr ""
 
-#: refs.c:1155
+#: ref-filter.c:359
 #, c-format
-msgid "refusing to update ref with bad name '%s'"
+msgid "%%(body) does not take arguments"
 msgstr ""
 
-#: refs.c:1231
+#: ref-filter.c:372
 #, c-format
-msgid "update_ref failed for ref '%s': %s"
+msgid "unrecognized %%(subject) argument: %s"
 msgstr ""
 
-#: refs.c:2023
+#: ref-filter.c:391
 #, c-format
-msgid "multiple updates for ref '%s' not allowed"
+msgid "expected %%(trailers:key=<value>)"
 msgstr ""
 
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
+#: ref-filter.c:393
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
 msgstr ""
 
-#: refs.c:2151 refs.c:2181
+#: ref-filter.c:424
 #, c-format
-msgid "'%s' exists; cannot create '%s'"
+msgid "positive value expected contents:lines=%s"
 msgstr ""
 
-#: refs.c:2157 refs.c:2192
+#: ref-filter.c:426
 #, c-format
-msgid "cannot process '%s' and '%s' at the same time"
+msgid "unrecognized %%(contents) argument: %s"
 msgstr ""
 
-#: refs/files-backend.c:1234
+#: ref-filter.c:441
 #, c-format
-msgid "could not remove reference %s"
+msgid "positive value expected '%s' in %%(%s)"
 msgstr ""
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
+#: ref-filter.c:445
 #, c-format
-msgid "could not delete reference %s: %s"
+msgid "unrecognized argument '%s' in %%(%s)"
 msgstr ""
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
+#: ref-filter.c:459
 #, c-format
-msgid "could not delete references: %s"
+msgid "unrecognized email option: %s"
 msgstr ""
 
-#: refspec.c:137
+#: ref-filter.c:489
 #, c-format
-msgid "invalid refspec '%s'"
+msgid "expected format: %%(align:<width>,<position>)"
 msgstr ""
 
-#: ref-filter.c:42 wt-status.c:1938
-msgid "gone"
+#: ref-filter.c:501
+#, c-format
+msgid "unrecognized position:%s"
 msgstr ""
 
-#: ref-filter.c:43
+#: ref-filter.c:508
 #, c-format
-msgid "ahead %d"
+msgid "unrecognized width:%s"
 msgstr ""
 
-#: ref-filter.c:44
+#: ref-filter.c:517
 #, c-format
-msgid "behind %d"
+msgid "unrecognized %%(align) argument: %s"
 msgstr ""
 
-#: ref-filter.c:45
+#: ref-filter.c:525
 #, c-format
-msgid "ahead %d, behind %d"
+msgid "positive width expected with the %%(align) atom"
 msgstr ""
 
-#: ref-filter.c:165
+#: ref-filter.c:543
 #, c-format
-msgid "expected format: %%(color:<color>)"
+msgid "unrecognized %%(if) argument: %s"
 msgstr ""
 
-#: ref-filter.c:167
+#: ref-filter.c:645
 #, c-format
-msgid "unrecognized color: %%(color:%s)"
+msgid "malformed field name: %.*s"
 msgstr ""
 
-#: ref-filter.c:189
+#: ref-filter.c:672
 #, c-format
-msgid "Integer value expected refname:lstrip=%s"
+msgid "unknown field name: %.*s"
 msgstr ""
 
-#: ref-filter.c:193
+#: ref-filter.c:676
 #, c-format
-msgid "Integer value expected refname:rstrip=%s"
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
-#: ref-filter.c:195
+#: ref-filter.c:801
 #, c-format
-msgid "unrecognized %%(%s) argument: %s"
+msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr ""
 
-#: ref-filter.c:250
+#: ref-filter.c:865
 #, c-format
-msgid "%%(objecttype) does not take arguments"
+msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr ""
 
-#: ref-filter.c:272
+#: ref-filter.c:867
 #, c-format
-msgid "unrecognized %%(objectsize) argument: %s"
+msgid "format: %%(then) atom used more than once"
 msgstr ""
 
-#: ref-filter.c:280
+#: ref-filter.c:869
 #, c-format
-msgid "%%(deltabase) does not take arguments"
+msgid "format: %%(then) atom used after %%(else)"
 msgstr ""
 
-#: ref-filter.c:292
+#: ref-filter.c:897
 #, c-format
-msgid "%%(body) does not take arguments"
+msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr ""
 
-#: ref-filter.c:301
+#: ref-filter.c:899
 #, c-format
-msgid "%%(subject) does not take arguments"
+msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr ""
 
-#: ref-filter.c:323
+#: ref-filter.c:901
 #, c-format
-msgid "unknown %%(trailers) argument: %s"
+msgid "format: %%(else) atom used more than once"
 msgstr ""
 
-#: ref-filter.c:352
+#: ref-filter.c:916
 #, c-format
-msgid "positive value expected contents:lines=%s"
+msgid "format: %%(end) atom used without corresponding atom"
 msgstr ""
 
-#: ref-filter.c:354
+#: ref-filter.c:973
 #, c-format
-msgid "unrecognized %%(contents) argument: %s"
+msgid "malformed format string %s"
 msgstr ""
 
-#: ref-filter.c:369
+#: ref-filter.c:1621
 #, c-format
-msgid "positive value expected objectname:short=%s"
+msgid "(no branch, rebasing %s)"
 msgstr ""
 
-#: ref-filter.c:373
+#: ref-filter.c:1624
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
+msgid "(no branch, rebasing detached HEAD %s)"
 msgstr ""
 
-#: ref-filter.c:403
+#: ref-filter.c:1627
 #, c-format
-msgid "expected format: %%(align:<width>,<position>)"
+msgid "(no branch, bisect started on %s)"
 msgstr ""
 
-#: ref-filter.c:415
+#: ref-filter.c:1631
 #, c-format
-msgid "unrecognized position:%s"
+msgid "(HEAD detached at %s)"
 msgstr ""
 
-#: ref-filter.c:422
+#: ref-filter.c:1634
 #, c-format
-msgid "unrecognized width:%s"
+msgid "(HEAD detached from %s)"
 msgstr ""
 
-#: ref-filter.c:431
-#, c-format
-msgid "unrecognized %%(align) argument: %s"
+#: ref-filter.c:1637
+msgid "(no branch)"
 msgstr ""
 
-#: ref-filter.c:439
+#: ref-filter.c:1669 ref-filter.c:1880
 #, c-format
-msgid "positive width expected with the %%(align) atom"
+msgid "missing object %s for %s"
 msgstr ""
 
-#: ref-filter.c:457
+#: ref-filter.c:1679
 #, c-format
-msgid "unrecognized %%(if) argument: %s"
+msgid "parse_object_buffer failed on %s for %s"
 msgstr ""
 
-#: ref-filter.c:559
+#: ref-filter.c:2064
 #, c-format
-msgid "malformed field name: %.*s"
+msgid "malformed object at '%s'"
 msgstr ""
 
-#: ref-filter.c:586
+#: ref-filter.c:2153
 #, c-format
-msgid "unknown field name: %.*s"
+msgid "ignoring ref with broken name %s"
 msgstr ""
 
-#: ref-filter.c:590
+#: ref-filter.c:2158 refs.c:676
 #, c-format
-msgid ""
-"not a git repository, but the field '%.*s' requires access to object data"
+msgid "ignoring broken ref %s"
 msgstr ""
 
-#: ref-filter.c:714
+#: ref-filter.c:2502
 #, c-format
-msgid "format: %%(if) atom used without a %%(then) atom"
+msgid "format: %%(end) atom missing"
 msgstr ""
 
-#: ref-filter.c:777
+#: ref-filter.c:2596
 #, c-format
-msgid "format: %%(then) atom used without an %%(if) atom"
+msgid "malformed object name %s"
 msgstr ""
 
-#: ref-filter.c:779
+#: ref-filter.c:2601
 #, c-format
-msgid "format: %%(then) atom used more than once"
+msgid "option `%s' must point to a commit"
 msgstr ""
 
-#: ref-filter.c:781
+#: refs.c:264
 #, c-format
-msgid "format: %%(then) atom used after %%(else)"
+msgid "%s does not point to a valid object!"
 msgstr ""
 
-#: ref-filter.c:809
+#: refs.c:566
 #, c-format
-msgid "format: %%(else) atom used without an %%(if) atom"
+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 ""
 
-#: ref-filter.c:811
+#: refs.c:588
 #, c-format
-msgid "format: %%(else) atom used without a %%(then) atom"
+msgid "could not retrieve `%s`"
 msgstr ""
 
-#: ref-filter.c:813
+#: refs.c:598
 #, c-format
-msgid "format: %%(else) atom used more than once"
+msgid "invalid branch name: %s = %s"
 msgstr ""
 
-#: ref-filter.c:828
+#: refs.c:674
 #, c-format
-msgid "format: %%(end) atom used without corresponding atom"
+msgid "ignoring dangling symref %s"
 msgstr ""
 
-#: ref-filter.c:885
+#: refs.c:922
 #, c-format
-msgid "malformed format string %s"
+msgid "log for ref %s has gap after %s"
 msgstr ""
 
-#: ref-filter.c:1488
+#: refs.c:929
 #, c-format
-msgid "no branch, rebasing %s"
+msgid "log for ref %s unexpectedly ended on %s"
 msgstr ""
 
-#: ref-filter.c:1491
+#: refs.c:994
 #, c-format
-msgid "no branch, rebasing detached HEAD %s"
+msgid "log for %s is empty"
 msgstr ""
 
-#: ref-filter.c:1494
+#: refs.c:1086
 #, c-format
-msgid "no branch, bisect started on %s"
+msgid "refusing to update ref with bad name '%s'"
 msgstr ""
 
-#: ref-filter.c:1504
-msgid "no branch"
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
 msgstr ""
 
-#: ref-filter.c:1540 ref-filter.c:1749
+#: refs.c:2051
 #, c-format
-msgid "missing object %s for %s"
+msgid "multiple updates for ref '%s' not allowed"
 msgstr ""
 
-#: ref-filter.c:1550
-#, c-format
-msgid "parse_object_buffer failed on %s for %s"
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
 msgstr ""
 
-#: ref-filter.c:2004
-#, c-format
-msgid "malformed object at '%s'"
+#: refs.c:2142
+msgid "ref updates aborted by hook"
 msgstr ""
 
-#: ref-filter.c:2093
+#: refs.c:2242 refs.c:2272
 #, c-format
-msgid "ignoring ref with broken name %s"
+msgid "'%s' exists; cannot create '%s'"
 msgstr ""
 
-#: ref-filter.c:2389
+#: refs.c:2248 refs.c:2283
 #, c-format
-msgid "format: %%(end) atom missing"
+msgid "cannot process '%s' and '%s' at the same time"
 msgstr ""
 
-#: ref-filter.c:2489
+#: refs/files-backend.c:1228
 #, c-format
-msgid "option `%s' is incompatible with --merged"
+msgid "could not remove reference %s"
 msgstr ""
 
-#: ref-filter.c:2492
+#: refs/files-backend.c:1242 refs/packed-backend.c:1542
+#: refs/packed-backend.c:1552
 #, c-format
-msgid "option `%s' is incompatible with --no-merged"
+msgid "could not delete reference %s: %s"
 msgstr ""
 
-#: ref-filter.c:2502
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
 #, c-format
-msgid "malformed object name %s"
+msgid "could not delete references: %s"
 msgstr ""
 
-#: ref-filter.c:2507
+#: refspec.c:170
 #, c-format
-msgid "option `%s' must point to a commit"
+msgid "invalid refspec '%s'"
 msgstr ""
 
-#: remote.c:366
+#: remote.c:351
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 
-#: remote.c:413
+#: remote.c:399
 msgid "more than one receivepack given, using the first"
 msgstr ""
 
-#: remote.c:421
+#: remote.c:407
 msgid "more than one uploadpack given, using the first"
 msgstr ""
 
-#: remote.c:611
+#: remote.c:590
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr ""
 
-#: remote.c:615
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr ""
 
-#: remote.c:619
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr ""
 
-#: remote.c:687
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr ""
 
-#: remote.c:697
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr ""
 
-#: remote.c:1003
+#: remote.c:1083
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr ""
 
-#: remote.c:1008
+#: remote.c:1088
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -5041,7 +6556,7 @@ msgstr ""
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1023
+#: remote.c:1103
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5055,7 +6570,7 @@ msgid ""
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
 
-#: remote.c:1043
+#: remote.c:1123
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5063,7 +6578,7 @@ msgid ""
 "'%s:refs/heads/%s'?"
 msgstr ""
 
-#: remote.c:1048
+#: remote.c:1128
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5071,7 +6586,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1053
+#: remote.c:1133
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5079,7 +6594,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1058
+#: remote.c:1138
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5087,114 +6602,114 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1094
+#: remote.c:1174
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr ""
 
-#: remote.c:1105
+#: remote.c:1185
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr ""
 
-#: remote.c:1117
+#: remote.c:1197
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 
-#: remote.c:1124
+#: remote.c:1204
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 
-#: remote.c:1627 remote.c:1728
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
 msgstr ""
 
-#: remote.c:1636
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
 msgstr ""
 
-#: remote.c:1639
+#: remote.c:1736
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr ""
 
-#: remote.c:1645
+#: remote.c:1742
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 
-#: remote.c:1660
+#: remote.c:1757
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 
-#: remote.c:1672
+#: remote.c:1769
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr ""
 
-#: remote.c:1682
+#: remote.c:1779
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr ""
 
-#: remote.c:1695
+#: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
 msgstr ""
 
-#: remote.c:1717
+#: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr ""
 
-#: remote.c:1843
+#: remote.c:1943
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr ""
 
-#: remote.c:1856
+#: remote.c:1956
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr ""
 
-#: remote.c:2019
+#: remote.c:2119
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr ""
 
-#: remote.c:2023
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr ""
 
-#: remote.c:2026
+#: remote.c:2126
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr ""
 
-#: remote.c:2030
+#: remote.c:2130
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr ""
 
-#: remote.c:2033
+#: remote.c:2133
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr ""
 
-#: remote.c:2037
+#: 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] ""
 msgstr[1] ""
 
-#: remote.c:2043
+#: remote.c:2143
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr ""
 
-#: remote.c:2046
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5202,11 +6717,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2054
+#: remote.c:2154
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr ""
 
-#: remote.c:2057
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5217,11 +6732,11 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: remote.c:2067
+#: remote.c:2167
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr ""
 
-#: remote.c:2250
+#: remote.c:2359
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr ""
@@ -5236,322 +6751,342 @@ msgstr ""
 msgid "duplicate replace ref: %s"
 msgstr ""
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr ""
 
-#: 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
+#: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
 msgstr ""
 
-#: rerere.c:495
+#: rerere.c:479
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
 msgstr ""
 
-#: rerere.c:498
+#: rerere.c:482
 #, c-format
 msgid "failed to flush '%s'"
 msgstr ""
 
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
 #, c-format
 msgid "could not parse conflict hunks in '%s'"
 msgstr ""
 
-#: rerere.c:684
+#: rerere.c:668
 #, c-format
 msgid "failed utime() on '%s'"
 msgstr ""
 
-#: rerere.c:694
+#: rerere.c:678
 #, c-format
 msgid "writing '%s' failed"
 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
+#: rerere.c:787
 #, c-format
 msgid "cannot unlink stray '%s'"
 msgstr ""
 
-#: rerere.c:807
+#: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
 msgstr ""
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: 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 ""
 
-#: rerere.c:1057
+#: rerere.c:1041
 #, c-format
 msgid "failed to update conflicted state in '%s'"
 msgstr ""
 
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
 #, c-format
 msgid "no remembered resolution for '%s'"
 msgstr ""
 
-#: rerere.c:1077
+#: rerere.c:1061
 #, c-format
 msgid "cannot unlink '%s'"
 msgstr ""
 
-#: rerere.c:1087
+#: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
 msgstr ""
 
-#: rerere.c:1096
+#: rerere.c:1080
 #, c-format
 msgid "Forgot resolution for '%s'\n"
 msgstr ""
 
-#: rerere.c:1199
+#: rerere.c:1191
 msgid "unable to open rr-cache directory"
 msgstr ""
 
-#: revision.c:2509
-msgid "your current branch appears to be broken"
+#: reset.c:42
+msgid "could not determine HEAD revision"
 msgstr ""
 
-#: revision.c:2512
+#: reset.c:69 reset.c:75 sequencer.c:3689
 #, c-format
-msgid "your current branch '%s' does not have any commits yet"
+msgid "failed to find tree of %s"
 msgstr ""
 
-#: revision.c:2720
-msgid "--first-parent is incompatible with --bisect"
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
 msgstr ""
 
-#: revision.c:2724
+#: revision.c:2684
+msgid "your current branch appears to be broken"
+msgstr ""
+
+#: revision.c:2687
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr ""
+
+#: revision.c:2893
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 
-#: run-command.c:763
+#: run-command.c:766
 msgid "open /dev/null failed"
 msgstr ""
 
-#: run-command.c:1269
+#: run-command.c:1274
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr ""
 
-#: run-command.c:1333
+#: 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:142
+#: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 
-#: send-pack.c:144
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr ""
 
-#: send-pack.c:146
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr ""
 
-#: send-pack.c:307
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr ""
 
-#: send-pack.c:421
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr ""
+
+#: 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 ""
+
+#: send-pack.c:535
 msgid "the receiving end does not support --signed push"
 msgstr ""
 
-#: send-pack.c:423
+#: send-pack.c:537
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr ""
 
-#: send-pack.c:435
+#: send-pack.c:544
 msgid "the receiving end does not support --atomic push"
 msgstr ""
 
-#: send-pack.c:440
+#: send-pack.c:549
 msgid "the receiving end does not support push options"
 msgstr ""
 
-#: sequencer.c:187
+#: sequencer.c:196
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr ""
 
-#: sequencer.c:292
+#: sequencer.c:324
 #, c-format
 msgid "could not delete '%s'"
 msgstr ""
 
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
 #, c-format
 msgid "could not remove '%s'"
 msgstr ""
 
-#: sequencer.c:321
+#: sequencer.c:354
 msgid "revert"
 msgstr ""
 
-#: sequencer.c:323
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr ""
 
-#: sequencer.c:325
-msgid "rebase -i"
+#: sequencer.c:358
+msgid "rebase"
 msgstr ""
 
-#: sequencer.c:327
+#: sequencer.c:360
 #, c-format
 msgid "unknown action: %d"
 msgstr ""
 
-#: sequencer.c:385
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr ""
 
-#: sequencer.c:388
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
 "and commit the result with 'git commit'"
 msgstr ""
 
-#: sequencer.c:401 sequencer.c:2847
+#: sequencer.c:435 sequencer.c:3271
 #, c-format
 msgid "could not lock '%s'"
 msgstr ""
 
-#: sequencer.c:408
+#: 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 eol to '%s'"
+msgid "could not write to '%s'"
 msgstr ""
 
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
-#: sequencer.c:3130
+#: sequencer.c:442
 #, c-format
-msgid "failed to finalize '%s'"
+msgid "could not write eol to '%s'"
 msgstr ""
 
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
-#: builtin/rebase.c:568
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
 #, c-format
-msgid "could not read '%s'"
+msgid "failed to finalize '%s'"
 msgstr ""
 
-#: sequencer.c:462
+#: sequencer.c:486
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr ""
 
-#: sequencer.c:466
+#: sequencer.c:490
 msgid "commit your changes or stash them to proceed."
 msgstr ""
 
-#: sequencer.c:498
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr ""
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:561 builtin/tag.c:609
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr ""
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:631
+#: sequencer.c:671
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr ""
 
-#: sequencer.c:648
+#: sequencer.c:685
 msgid "unable to update cache tree"
 msgstr ""
 
-#: sequencer.c:662
+#: sequencer.c:699
 msgid "could not resolve HEAD commit"
 msgstr ""
 
-#: sequencer.c:742
+#: sequencer.c:779
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr ""
 
-#: sequencer.c:753
+#: sequencer.c:790
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr ""
 
-#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
+#: 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 ""
 
-#: sequencer.c:800
+#: sequencer.c:837
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr ""
 
-#: sequencer.c:805
+#: sequencer.c:842
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr ""
 
-#: sequencer.c:810
+#: sequencer.c:847
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr ""
 
-#: sequencer.c:814
+#: sequencer.c:851
 #, c-format
 msgid "unknown variable '%s'"
 msgstr ""
 
-#: sequencer.c:819
+#: sequencer.c:856
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr ""
 
-#: sequencer.c:821
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr ""
 
-#: sequencer.c:823
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr ""
 
-#: sequencer.c:872
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5568,11 +7103,11 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:1146
+#: sequencer.c:1212
 msgid "'prepare-commit-msg' hook failed"
 msgstr ""
 
-#: sequencer.c:1153
+#: 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"
@@ -5587,7 +7122,7 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
-#: sequencer.c:1166
+#: 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"
@@ -5601,346 +7136,359 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr ""
 
-#: sequencer.c:1208
+#: sequencer.c:1273
 msgid "couldn't look up newly created commit"
 msgstr ""
 
-#: sequencer.c:1210
+#: sequencer.c:1275
 msgid "could not parse newly created commit"
 msgstr ""
 
-#: sequencer.c:1256
+#: sequencer.c:1321
 msgid "unable to resolve HEAD after creating commit"
 msgstr ""
 
-#: sequencer.c:1258
+#: sequencer.c:1323
 msgid "detached HEAD"
 msgstr ""
 
-#: sequencer.c:1262
+#: sequencer.c:1327
 msgid " (root-commit)"
 msgstr ""
 
-#: sequencer.c:1283
+#: sequencer.c:1348
 msgid "could not parse HEAD"
 msgstr ""
 
-#: sequencer.c:1285
+#: sequencer.c:1350
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr ""
 
-#: sequencer.c:1289 builtin/commit.c:1571
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
 msgid "could not parse HEAD commit"
 msgstr ""
 
-#: sequencer.c:1341 sequencer.c:1933
+#: sequencer.c:1410 sequencer.c:2295
 msgid "unable to parse commit author"
 msgstr ""
 
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
 msgid "git write-tree failed to write a tree"
 msgstr ""
 
-#: sequencer.c:1369 sequencer.c:1429
+#: sequencer.c:1454 sequencer.c:1574
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr ""
 
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr ""
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr ""
+
+#: 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 ""
 
-#: sequencer.c:1456
+#: 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 ""
+
+#: sequencer.c:1606
 #, c-format
 msgid "could not parse commit %s"
 msgstr ""
 
-#: sequencer.c:1461
+#: sequencer.c:1611
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:1535 sequencer.c:1645
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
 msgid "unknown command: %d"
 msgstr ""
 
-#: sequencer.c:1592 sequencer.c:1617
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr ""
+
+#: sequencer.c:1737
 #, c-format
-msgid "This is a combination of %d commits."
+msgid "This is the commit message #%d:"
 msgstr ""
 
-#: sequencer.c:1602
-msgid "need a HEAD to fixup"
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
 msgstr ""
 
-#: sequencer.c:1604 sequencer.c:3157
-msgid "could not read HEAD"
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
 msgstr ""
 
-#: sequencer.c:1606
-msgid "could not read HEAD's commit message"
+#: sequencer.c:1740
+#, c-format
+msgid "This is a combination of %d commits."
 msgstr ""
 
-#: sequencer.c:1612
+#: sequencer.c:1887 sequencer.c:1944
 #, c-format
 msgid "cannot write '%s'"
 msgstr ""
 
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
-msgid "This is the 1st commit message:"
+#: sequencer.c:1934
+msgid "need a HEAD to fixup"
 msgstr ""
 
-#: sequencer.c:1627
-#, c-format
-msgid "could not read commit message of %s"
+#: sequencer.c:1936 sequencer.c:3582
+msgid "could not read HEAD"
 msgstr ""
 
-#: sequencer.c:1634
-#, c-format
-msgid "This is the commit message #%d:"
+#: sequencer.c:1938
+msgid "could not read HEAD's commit message"
 msgstr ""
 
-#: sequencer.c:1640
+#: sequencer.c:1962
 #, c-format
-msgid "The commit message #%d will be skipped:"
+msgid "could not read commit message of %s"
 msgstr ""
 
-#: sequencer.c:1728
+#: sequencer.c:2072
 msgid "your index file is unmerged."
 msgstr ""
 
-#: sequencer.c:1735
+#: sequencer.c:2079
 msgid "cannot fixup root commit"
 msgstr ""
 
-#: sequencer.c:1754
+#: sequencer.c:2098
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr ""
 
-#: sequencer.c:1762 sequencer.c:1770
+#: sequencer.c:2106 sequencer.c:2114
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr ""
 
-#: sequencer.c:1776
+#: sequencer.c:2120
 #, 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:1795
+#: sequencer.c:2139
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr ""
 
-#: sequencer.c:1860
+#: sequencer.c:2205
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:1915
+#: sequencer.c:2265
 #, c-format
 msgid "could not revert %s... %s"
 msgstr ""
 
-#: sequencer.c:1916
+#: sequencer.c:2266
 #, c-format
 msgid "could not apply %s... %s"
 msgstr ""
 
-#: sequencer.c:1983
+#: sequencer.c:2287
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr ""
+
+#: sequencer.c:2345
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr ""
 
-#: sequencer.c:1990
+#: sequencer.c:2352
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr ""
 
-#: sequencer.c:2066
+#: sequencer.c:2425
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr ""
 
-#: sequencer.c:2075
+#: sequencer.c:2434
 #, c-format
 msgid "missing arguments for %s"
 msgstr ""
 
-#: sequencer.c:2112
+#: sequencer.c:2477
 #, c-format
-msgid "could not parse '%.*s'"
+msgid "could not parse '%s'"
 msgstr ""
 
-#: sequencer.c:2166
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr ""
 
-#: sequencer.c:2177
+#: sequencer.c:2549
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr ""
 
-#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr ""
-
-#: sequencer.c:2261
+#: sequencer.c:2635
 msgid "cancelling a cherry picking in progress"
 msgstr ""
 
-#: sequencer.c:2268
+#: sequencer.c:2644
 msgid "cancelling a revert in progress"
 msgstr ""
 
-#: sequencer.c:2302
+#: sequencer.c:2690
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: sequencer.c:2304
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:2309
+#: sequencer.c:2697
 msgid "no commits parsed."
 msgstr ""
 
-#: sequencer.c:2320
+#: sequencer.c:2708
 msgid "cannot cherry-pick during a revert."
 msgstr ""
 
-#: sequencer.c:2322
+#: sequencer.c:2710
 msgid "cannot revert during a cherry-pick."
 msgstr ""
 
-#: sequencer.c:2404
+#: sequencer.c:2788
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr ""
 
-#: sequencer.c:2491
+#: sequencer.c:2897
 msgid "unusable squash-onto"
 msgstr ""
 
-#: sequencer.c:2507
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr ""
 
-#: sequencer.c:2590 sequencer.c:4308
+#: sequencer.c:3012 sequencer.c:4868
 msgid "empty commit set passed"
 msgstr ""
 
-#: sequencer.c:2606
+#: sequencer.c:3029
 msgid "revert is already in progress"
 msgstr ""
 
-#: sequencer.c:2608
+#: sequencer.c:3031
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr ""
 
-#: sequencer.c:2611
+#: sequencer.c:3034
 msgid "cherry-pick is already in progress"
 msgstr ""
 
-#: sequencer.c:2613
+#: sequencer.c:3036
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr ""
 
-#: sequencer.c:2627
+#: sequencer.c:3050
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr ""
 
-#: sequencer.c:2642
+#: sequencer.c:3065
 msgid "could not lock HEAD"
 msgstr ""
 
-#: sequencer.c:2702 sequencer.c:4057
+#: sequencer.c:3125 sequencer.c:4581
 msgid "no cherry-pick or revert in progress"
 msgstr ""
 
-#: sequencer.c:2704 sequencer.c:2715
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
 msgstr ""
 
-#: sequencer.c:2706 sequencer.c:2750
+#: sequencer.c:3129 sequencer.c:3173
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 
-#: sequencer.c:2736 builtin/grep.c:736
+#: sequencer.c:3159 builtin/grep.c:758
 #, c-format
 msgid "cannot open '%s'"
 msgstr ""
 
-#: sequencer.c:2738
+#: sequencer.c:3161
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr ""
 
-#: sequencer.c:2739
+#: sequencer.c:3162
 msgid "unexpected end of file"
 msgstr ""
 
-#: sequencer.c:2745
+#: sequencer.c:3168
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 
-#: sequencer.c:2756
+#: sequencer.c:3179
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 
-#: sequencer.c:2797
+#: sequencer.c:3220
 msgid "no revert in progress"
 msgstr ""
 
-#: sequencer.c:2805
+#: sequencer.c:3229
 msgid "no cherry-pick in progress"
 msgstr ""
 
-#: sequencer.c:2815
+#: sequencer.c:3239
 msgid "failed to skip the commit"
 msgstr ""
 
-#: sequencer.c:2822
+#: sequencer.c:3246
 msgid "there is nothing to skip"
 msgstr ""
 
-#: sequencer.c:2825
+#: sequencer.c:3249
 #, c-format
 msgid ""
 "have you committed already?\n"
 "try \"git %s --continue\""
 msgstr ""
 
-#: sequencer.c:2949 sequencer.c:3969
-#, c-format
-msgid "could not update %s"
-msgstr ""
-
-#: sequencer.c:2987 sequencer.c:3949
+#: sequencer.c:3411 sequencer.c:4472
 msgid "cannot read HEAD"
 msgstr ""
 
-#: sequencer.c:3004
+#: sequencer.c:3428
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:3012
+#: sequencer.c:3436
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -5952,27 +7500,27 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:3022
+#: sequencer.c:3446
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr ""
 
-#: sequencer.c:3029
+#: sequencer.c:3453
 #, c-format
 msgid "Could not merge %.*s"
 msgstr ""
 
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
-msgid "could not read index"
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
 msgstr ""
 
-#: sequencer.c:3074
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -5982,11 +7530,11 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:3080
+#: sequencer.c:3504
 msgid "and made changes to the index and/or the working tree\n"
 msgstr ""
 
-#: sequencer.c:3086
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -5997,108 +7545,120 @@ msgid ""
 "\n"
 msgstr ""
 
-#: sequencer.c:3147
+#: sequencer.c:3572
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr ""
 
-#: sequencer.c:3201
+#: sequencer.c:3645
 msgid "writing fake root commit"
 msgstr ""
 
-#: sequencer.c:3206
+#: sequencer.c:3650
 msgid "writing squash-onto"
 msgstr ""
 
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
-#, c-format
-msgid "failed to find tree of %s"
-msgstr ""
-
-#: sequencer.c:3262 builtin/rebase.c:874
-msgid "could not write index"
-msgstr ""
-
-#: sequencer.c:3289
+#: sequencer.c:3734
 #, c-format
 msgid "could not resolve '%s'"
 msgstr ""
 
-#: sequencer.c:3320
+#: sequencer.c:3767
 msgid "cannot merge without a current revision"
 msgstr ""
 
-#: sequencer.c:3342
+#: sequencer.c:3789
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr ""
 
-#: sequencer.c:3351
+#: sequencer.c:3798
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr ""
 
-#: sequencer.c:3363
+#: sequencer.c:3810
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 
-#: sequencer.c:3378
+#: sequencer.c:3826
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr ""
 
-#: sequencer.c:3538
+#: sequencer.c:4009
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr ""
 
-#: sequencer.c:3554
+#: sequencer.c:4025
 msgid "merge: Unable to write new index file"
 msgstr ""
 
-#: sequencer.c:3623 builtin/rebase.c:712
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr ""
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr ""
+
+#: sequencer.c:4140
 #, c-format
 msgid "Applied autostash.\n"
 msgstr ""
 
-#: sequencer.c:3635
+#: sequencer.c:4152
 #, c-format
 msgid "cannot store %s"
 msgstr ""
 
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
+#: sequencer.c:4155
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
 
-#: sequencer.c:3699
-#, c-format
-msgid "could not checkout %s"
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
 msgstr ""
 
-#: sequencer.c:3713
-#, c-format
-msgid "%s: not a valid OID"
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
 msgstr ""
 
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
 msgstr ""
 
-#: sequencer.c:3733
+#: sequencer.c:4248
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr ""
 
-#: sequencer.c:3735
+#: sequencer.c:4250
 #, c-format
 msgid "Stopped at %s\n"
 msgstr ""
 
-#: sequencer.c:3743
+#: sequencer.c:4258
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6111,121 +7671,124 @@ msgid ""
 "    git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:3827
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr ""
+
+#: sequencer.c:4350
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr ""
 
-#: sequencer.c:3898
+#: sequencer.c:4421
 #, c-format
 msgid "unknown command %d"
 msgstr ""
 
-#: sequencer.c:3957
+#: sequencer.c:4480
 msgid "could not read orig-head"
 msgstr ""
 
-#: sequencer.c:3962
+#: sequencer.c:4485
 msgid "could not read 'onto'"
 msgstr ""
 
-#: sequencer.c:3976
+#: sequencer.c:4499
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr ""
 
-#: sequencer.c:4069
+#: sequencer.c:4559
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr ""
+
+#: sequencer.c:4611
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 
-#: sequencer.c:4078
+#: sequencer.c:4620
 msgid "cannot amend non-existing commit"
 msgstr ""
 
-#: sequencer.c:4080
+#: sequencer.c:4622
 #, c-format
 msgid "invalid file: '%s'"
 msgstr ""
 
-#: sequencer.c:4082
+#: sequencer.c:4624
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr ""
 
-#: sequencer.c:4085
+#: sequencer.c:4627
 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:4121 sequencer.c:4159
+#: sequencer.c:4663 sequencer.c:4702
 #, c-format
 msgid "could not write file: '%s'"
 msgstr ""
 
-#: sequencer.c:4174
+#: sequencer.c:4718
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: sequencer.c:4181
+#: sequencer.c:4725
 msgid "could not commit staged changes."
 msgstr ""
 
-#: sequencer.c:4285
+#: sequencer.c:4845
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr ""
 
-#: sequencer.c:4289
+#: sequencer.c:4849
 #, c-format
 msgid "%s: bad revision"
 msgstr ""
 
-#: sequencer.c:4324
+#: sequencer.c:4884
 msgid "can't revert as initial commit"
 msgstr ""
 
-#: sequencer.c:4774
+#: sequencer.c:5361
 msgid "make_script: unhandled options"
 msgstr ""
 
-#: sequencer.c:4777
+#: sequencer.c:5364
 msgid "make_script: error preparing revisions"
 msgstr ""
 
-#: sequencer.c:4935
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-
-#: sequencer.c:5047 sequencer.c:5064
+#: sequencer.c:5614 sequencer.c:5631
 msgid "nothing to do"
 msgstr ""
 
-#: sequencer.c:5078
+#: sequencer.c:5650
 msgid "could not skip unnecessary pick commands"
 msgstr ""
 
-#: sequencer.c:5166
+#: sequencer.c:5750
 msgid "the script was already rearranged."
 msgstr ""
 
-#: setup.c:124
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
+msgid "'%s' is outside repository at '%s'"
 msgstr ""
 
-#: setup.c:174
+#: setup.c:185
 #, 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:187
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6233,12 +7796,12 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: setup.c:236
+#: setup.c:264
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 
-#: setup.c:255
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6246,529 +7809,384 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
 
-#: setup.c:391
+#: setup.c:419
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 
-#: setup.c:395
+#: setup.c:423 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr ""
 
-#: setup.c:541
+#: setup.c:658
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr ""
 
-#: setup.c:549
-msgid "unknown repository extensions found:"
-msgstr ""
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: setup.c:568
+#: 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] ""
+msgstr[1] ""
+
+#: setup.c:701
 #, c-format
 msgid "error opening '%s'"
 msgstr ""
 
-#: setup.c:570
+#: setup.c:703
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr ""
 
-#: setup.c:572
+#: setup.c:705
 #, c-format
 msgid "error reading %s"
 msgstr ""
 
-#: setup.c:574
+#: setup.c:707
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr ""
 
-#: setup.c:576
+#: setup.c:709
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr ""
 
-#: setup.c:578
+#: setup.c:711
 #, c-format
 msgid "not a git repository: %s"
 msgstr ""
 
-#: setup.c:677
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
 msgstr ""
 
-#: setup.c:691
+#: setup.c:827
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr ""
 
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c:856 setup.c:858 setup.c:889
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr ""
 
-#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
 msgid "cannot come back to cwd"
 msgstr ""
 
-#: setup.c:852
+#: setup.c:988
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr ""
 
-#: setup.c:1090
+#: setup.c:1231
 msgid "Unable to read current working directory"
 msgstr ""
 
-#: setup.c:1099 setup.c:1105
+#: setup.c:1240 setup.c:1246
 #, c-format
 msgid "cannot change to '%s'"
 msgstr ""
 
-#: setup.c:1110
+#: setup.c:1251
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr ""
 
-#: setup.c:1116
+#: 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 ""
 
-#: setup.c:1227
+#: 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."
 msgstr ""
 
-#: setup.c:1271
+#: setup.c:1430
 msgid "open /dev/null or dup failed"
 msgstr ""
 
-#: setup.c:1286
+#: setup.c:1445
 msgid "fork failed"
 msgstr ""
 
-#: setup.c:1291
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
 msgid "setsid failed"
 msgstr ""
 
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
 msgstr ""
 
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
+#: sparse-index.c:176
+msgid "unable to update cache-tree, staying full"
 msgstr ""
 
-#: sha1-file.c:575
+#: sparse-index.c:263
 #, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr ""
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr ""
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr ""
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
+msgid "index entry is a directory, but not sparse (%08x)"
 msgstr ""
 
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr ""
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr ""
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr ""
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr ""
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr ""
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr ""
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr ""
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr ""
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr ""
-
-#: sha1-file.c:1252 sha1-file.c:2392
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr ""
-
-#: sha1-file.c:1254 sha1-file.c:2396
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr ""
-
-#: sha1-file.c:1296
-msgid "invalid object type"
-msgstr ""
-
-#: sha1-file.c:1380
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr ""
-
-#: sha1-file.c:1383
-#, c-format
-msgid "unable to unpack %s header"
-msgstr ""
-
-#: sha1-file.c:1389
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr ""
-
-#: sha1-file.c:1392
-#, c-format
-msgid "unable to parse %s header"
-msgstr ""
-
-#: sha1-file.c:1584
-#, c-format
-msgid "failed to read object %s"
-msgstr ""
-
-#: sha1-file.c:1588
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:850
 #, c-format
-msgid "replacement %s not found for %s"
+msgid "%u.%2.2u GiB"
 msgstr ""
 
-#: sha1-file.c:1592
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:852
 #, c-format
-msgid "loose object %s (stored in %s) is corrupt"
+msgid "%u.%2.2u GiB/s"
 msgstr ""
 
-#: sha1-file.c:1596
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:860
 #, c-format
-msgid "packed object %s (stored in %s) is corrupt"
+msgid "%u.%2.2u MiB"
 msgstr ""
 
-#: sha1-file.c:1699
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:862
 #, c-format
-msgid "unable to write file %s"
+msgid "%u.%2.2u MiB/s"
 msgstr ""
 
-#: sha1-file.c:1706
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:869
 #, c-format
-msgid "unable to set permission to '%s'"
-msgstr ""
-
-#: sha1-file.c:1713
-msgid "file write error"
-msgstr ""
-
-#: sha1-file.c:1732
-msgid "error when closing loose object file"
+msgid "%u.%2.2u KiB"
 msgstr ""
 
-#: sha1-file.c:1797
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:871
 #, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr ""
-
-#: sha1-file.c:1799
-msgid "unable to create temporary file"
-msgstr ""
-
-#: sha1-file.c:1823
-msgid "unable to write loose object file"
+msgid "%u.%2.2u KiB/s"
 msgstr ""
 
-#: sha1-file.c:1829
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:877
 #, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr ""
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] ""
+msgstr[1] ""
 
-#: sha1-file.c:1833
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:879
 #, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr ""
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] ""
+msgstr[1] ""
 
-#: sha1-file.c:1837
+#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
+#: builtin/rebase.c:866
 #, c-format
-msgid "confused by unstable object source data for %s"
+msgid "could not open '%s' for writing"
 msgstr ""
 
-#: sha1-file.c:1847 builtin/pack-objects.c:925
+#: strbuf.c:1177
 #, c-format
-msgid "failed utime() on %s"
+msgid "could not edit '%s'"
 msgstr ""
 
-#: sha1-file.c:1922
+#: submodule-config.c:237
 #, c-format
-msgid "cannot read object for %s"
-msgstr ""
-
-#: sha1-file.c:1962
-msgid "corrupt commit"
+msgid "ignoring suspicious submodule name: %s"
 msgstr ""
 
-#: sha1-file.c:1970
-msgid "corrupt tag"
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
 msgstr ""
 
-#: sha1-file.c:2069
+#: submodule-config.c:402
 #, c-format
-msgid "read error while indexing %s"
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
 
-#: sha1-file.c:2072
+#: submodule-config.c:499
 #, c-format
-msgid "short read while indexing %s"
+msgid "invalid value for %s"
 msgstr ""
 
-#: sha1-file.c:2145 sha1-file.c:2154
+#: submodule-config.c:766
 #, c-format
-msgid "%s: failed to insert into database"
+msgid "Could not update .gitmodules entry %s"
 msgstr ""
 
-#: sha1-file.c:2160
-#, c-format
-msgid "%s: unsupported file type"
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
 
-#: sha1-file.c:2184
+#: submodule.c:118 submodule.c:147
 #, c-format
-msgid "%s is not a valid object"
+msgid "Could not find section in .gitmodules where path=%s"
 msgstr ""
 
-#: sha1-file.c:2186
+#: submodule.c:154
 #, c-format
-msgid "%s is not a valid '%s' object"
+msgid "Could not remove .gitmodules entry for %s"
 msgstr ""
 
-#: sha1-file.c:2213 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
 msgstr ""
 
-#: sha1-file.c:2403 sha1-file.c:2455
+#: submodule.c:328
 #, c-format
-msgid "hash mismatch for %s (expected %s)"
+msgid "in unpopulated submodule '%s'"
 msgstr ""
 
-#: sha1-file.c:2427
+#: submodule.c:359
 #, c-format
-msgid "unable to mmap %s"
+msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr ""
 
-#: sha1-file.c:2432
+#: submodule.c:436
 #, c-format
-msgid "unable to unpack header of %s"
+msgid "bad --ignore-submodules argument: %s"
 msgstr ""
 
-#: sha1-file.c:2438
+#: submodule.c:805
 #, c-format
-msgid "unable to parse header of %s"
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
 msgstr ""
 
-#: sha1-file.c:2449
+#: submodule.c:908
 #, c-format
-msgid "unable to unpack contents of %s"
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr ""
 
-#: sha1-name.c:487
+#: submodule.c:993
 #, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr ""
-
-#: sha1-name.c:498
-msgid "The candidates are:"
-msgstr ""
-
-#: sha1-name.c:797
 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\""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
 msgstr ""
 
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:822
+#: submodule.c:1116
 #, c-format
-msgid "%u.%2.2u GiB"
+msgid "process for submodule '%s' failed"
 msgstr ""
 
-#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
-#, c-format
-msgid "%u.%2.2u GiB/s"
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+msgid "Failed to resolve HEAD as a valid ref."
 msgstr ""
 
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:832
+#: submodule.c:1156
 #, c-format
-msgid "%u.%2.2u MiB"
+msgid "Pushing submodule '%s'\n"
 msgstr ""
 
-#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: submodule.c:1159
 #, c-format
-msgid "%u.%2.2u MiB/s"
+msgid "Unable to push submodule '%s'\n"
 msgstr ""
 
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:841
+#: submodule.c:1451
 #, c-format
-msgid "%u.%2.2u KiB"
-msgstr ""
-
-#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
-#, c-format
-msgid "%u.%2.2u KiB/s"
+msgid "Fetching submodule %s%s\n"
 msgstr ""
 
-#. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:849
+#: submodule.c:1485
 #, c-format
-msgid "%u byte"
-msgid_plural "%u bytes"
-msgstr[0] ""
-msgstr[1] ""
-
-#. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
-#, c-format
-msgid "%u byte/s"
-msgid_plural "%u bytes/s"
-msgstr[0] ""
-msgstr[1] ""
-
-#: submodule.c:114 submodule.c:143
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgid "Could not access submodule '%s'\n"
 msgstr ""
 
-#: submodule.c:118 submodule.c:147
+#: submodule.c:1640
 #, c-format
-msgid "Could not find section in .gitmodules where path=%s"
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
 msgstr ""
 
-#: submodule.c:154
+#: submodule.c:1665
 #, c-format
-msgid "Could not remove .gitmodules entry for %s"
-msgstr ""
-
-#: submodule.c:165
-msgid "staging updated .gitmodules failed"
+msgid "'%s' not recognized as a git repository"
 msgstr ""
 
-#: submodule.c:327
+#: submodule.c:1682
 #, c-format
-msgid "in unpopulated submodule '%s'"
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
 msgstr ""
 
-#: submodule.c:358
+#: submodule.c:1723
 #, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
+msgid "'git status --porcelain=2' failed in submodule %s"
 msgstr ""
 
-#: submodule.c:910
+#: submodule.c:1798
 #, c-format
-msgid "submodule entry '%s' (%s) is a %s, not a commit"
-msgstr ""
-
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
-msgid "Failed to resolve HEAD as a valid ref."
+msgid "could not start 'git status' in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1481
+#: submodule.c:1811
 #, c-format
-msgid "Could not access submodule '%s'"
+msgid "could not run 'git status' in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1651
+#: submodule.c:1826
 #, c-format
-msgid "'%s' not recognized as a git repository"
+msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1789
+#: submodule.c:1853 submodule.c:2163
 #, c-format
-msgid "could not start 'git status' in submodule '%s'"
+msgid "could not recurse into submodule '%s'"
 msgstr ""
 
-#: submodule.c:1802
-#, c-format
-msgid "could not run 'git status' in submodule '%s'"
+#: submodule.c:1874
+msgid "could not reset submodule index"
 msgstr ""
 
-#: submodule.c:1817
+#: submodule.c:1916
 #, c-format
-msgid "Could not unset core.worktree setting in submodule '%s'"
+msgid "submodule '%s' has dirty index"
 msgstr ""
 
-#: submodule.c:1907
+#: submodule.c:1968
 #, c-format
-msgid "submodule '%s' has dirty index"
+msgid "Submodule '%s' could not be updated."
 msgstr ""
 
-#: submodule.c:1959
+#: submodule.c:2036
 #, c-format
-msgid "Submodule '%s' could not be updated."
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
 msgstr ""
 
-#: submodule.c:2007
+#: submodule.c:2057
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr ""
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2069 submodule.c:2128
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr ""
 
-#: submodule.c:2026
+#: submodule.c:2073
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr ""
+
+#: submodule.c:2080
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -6776,346 +8194,345 @@ msgid ""
 "'%s'\n"
 msgstr ""
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr ""
-
-#: submodule.c:2153
+#: submodule.c:2208
 msgid "could not start ls-files in .."
 msgstr ""
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr ""
 
-#: submodule-config.c:236
+#: symlinks.c:244
 #, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr ""
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr ""
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-
-#: submodule-config.c:490
-#, c-format
-msgid "invalid value for %s"
-msgstr ""
-
-#: submodule-config.c:761
-#, c-format
-msgid "Could not update .gitmodules entry %s"
+msgid "failed to lstat '%s'"
 msgstr ""
 
-#: trailer.c:238
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr ""
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: 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 ""
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: 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 ""
 
-#: trailer.c:730
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr ""
 
-#: trailer.c:750
+#: trailer.c:763
 #, c-format
 msgid "could not read input file '%s'"
 msgstr ""
 
-#: trailer.c:753
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
 msgid "could not read from stdin"
 msgstr ""
 
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1024 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
 msgstr ""
 
-#: trailer.c:1013
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
 msgstr ""
 
-#: trailer.c:1015
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
 msgstr ""
 
-#: trailer.c:1027
+#: trailer.c:1040
 msgid "could not open temporary file"
 msgstr ""
 
-#: trailer.c:1067
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr ""
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr ""
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr ""
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr ""
-
-#: transport.c:266
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-
-#: transport.c:267
-msgid "server options require protocol version 2 or later"
-msgstr ""
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr ""
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr ""
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr ""
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr ""
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr ""
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr ""
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr ""
-
-#: transport.c:1345 transport-helper.c:655
-msgid "operation not supported by protocol"
-msgstr ""
-
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
 msgstr ""
 
-#: transport-helper.c:144
+#: transport-helper.c:145
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr ""
 
-#: transport-helper.c:160 transport-helper.c:569
+#: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
 msgstr ""
 
-#: transport-helper.c:211
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr ""
 
-#: transport-helper.c:217
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
 msgstr ""
 
-#: transport-helper.c:284 transport-helper.c:424
+#: transport-helper.c:287 transport-helper.c:429
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr ""
 
-#: transport-helper.c:413
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
 msgstr ""
 
-#: transport-helper.c:491
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
 msgstr ""
 
-#: transport-helper.c:514
+#: transport-helper.c:520
 msgid "error while running fast-import"
 msgstr ""
 
-#: transport-helper.c:543 transport-helper.c:1132
+#: transport-helper.c:549 transport-helper.c:1247
 #, c-format
 msgid "could not read ref %s"
 msgstr ""
 
-#: transport-helper.c:588
+#: transport-helper.c:594
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr ""
 
-#: transport-helper.c:610
+#: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
 msgstr ""
 
-#: transport-helper.c:612
+#: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr ""
 
-#: transport-helper.c:658
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr ""
+
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr ""
 
-#: transport-helper.c:734
+#: 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:798
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr ""
 
-#: transport-helper.c:787
+#: transport-helper.c:855
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr ""
 
-#: transport-helper.c:848
+#: transport-helper.c:938
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr ""
 
-#: transport-helper.c:851
+#: transport-helper.c:941
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr ""
 
-#: transport-helper.c:854
+#: transport-helper.c:944
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 
-#: transport-helper.c:859
+#: transport-helper.c:949
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr ""
 
-#: transport-helper.c:865
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr ""
+
+#: transport-helper.c:960
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr ""
 
-#: transport-helper.c:963
+#: transport-helper.c:1060
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 
-#: transport-helper.c:968
+#: transport-helper.c:1065
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr ""
 
-#: transport-helper.c:1015
+#: transport-helper.c:1112
 msgid "couldn't run fast-export"
 msgstr ""
 
-#: transport-helper.c:1020
+#: transport-helper.c:1117
 msgid "error while running fast-export"
 msgstr ""
 
-#: transport-helper.c:1045
+#: transport-helper.c:1142
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 
-#: transport-helper.c:1118
+#: transport-helper.c:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr ""
+
+#: transport-helper.c:1233
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr ""
 
-#: transport-helper.c:1270
+#: transport-helper.c:1385
 #, c-format
 msgid "read(%s) failed"
 msgstr ""
 
-#: transport-helper.c:1297
+#: transport-helper.c:1412
 #, c-format
 msgid "write(%s) failed"
 msgstr ""
 
-#: transport-helper.c:1346
+#: transport-helper.c:1461
 #, c-format
 msgid "%s thread failed"
 msgstr ""
 
-#: transport-helper.c:1350
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr ""
 
-#: transport-helper.c:1369 transport-helper.c:1373
+#: transport-helper.c:1484 transport-helper.c:1488
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr ""
 
-#: transport-helper.c:1410
+#: transport-helper.c:1525
 #, c-format
 msgid "%s process failed to wait"
 msgstr ""
 
-#: transport-helper.c:1414
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed"
 msgstr ""
 
-#: transport-helper.c:1432 transport-helper.c:1441
+#: transport-helper.c:1547 transport-helper.c:1556
 msgid "can't start thread for copying data"
 msgstr ""
 
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr ""
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr ""
+
+#: transport.c:223
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr ""
+
+#: transport.c:275
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+
+#: transport.c:276
+msgid "server options require protocol version 2 or later"
+msgstr ""
+
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr ""
+
+#: transport.c:755
+msgid "could not parse transport.color.* config"
+msgstr ""
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:965
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr ""
+
+#: transport.c:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr ""
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+
+#: transport.c:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr ""
+
+#: transport.c:1346
+msgid "failed to push all needed submodules"
+msgstr ""
+
 #: tree-walk.c:33
 msgid "too-short tree object"
 msgstr ""
@@ -7132,98 +8549,98 @@ msgstr ""
 msgid "too-short tree file"
 msgstr ""
 
-#: unpack-trees.c:110
+#: unpack-trees.c:115
 #, 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:112
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:115
+#: unpack-trees.c:120
 #, 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:117
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:120
+#: 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 ""
 
-#: unpack-trees.c:122
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:127
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:131
+#: 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 ""
 
-#: unpack-trees.c:133
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:136
+#: 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 ""
 
-#: unpack-trees.c:138
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:141
+#: 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 ""
 
-#: unpack-trees.c:143
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:149
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7231,7 +8648,7 @@ msgid ""
 "%%sPlease move or remove them before you switch branches."
 msgstr ""
 
-#: unpack-trees.c:151
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7239,85 +8656,105 @@ msgid ""
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:154
+#: 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 ""
 
-#: unpack-trees.c:156
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:159
+#: 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 ""
 
-#: unpack-trees.c:161
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr ""
 
-#: unpack-trees.c:169
+#: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 
-#: unpack-trees.c:172
+#: unpack-trees.c:177
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:176
+#: unpack-trees.c:182
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:178
+#: unpack-trees.c:184
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
 
-#: unpack-trees.c:255
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr ""
 
-#: unpack-trees.c:317
+#: 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:352
 msgid "Updating files"
 msgstr ""
 
-#: unpack-trees.c:349
+#: 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:1618
+msgid "Updating index flags"
+msgstr ""
+
+#: unpack-trees.c:2718
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+
+#: upload-pack.c:1548
+msgid "expected flush after fetch arguments"
+msgstr ""
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr ""
@@ -7347,27 +8784,31 @@ msgstr ""
 msgid "invalid '..' path segment"
 msgstr ""
 
-#: worktree.c:258 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr ""
+
+#: worktree.c:236 builtin/am.c:2152
 #, c-format
 msgid "failed to read '%s'"
 msgstr ""
 
-#: worktree.c:304
+#: worktree.c:303
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 
-#: worktree.c:315
+#: worktree.c:314
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 
-#: worktree.c:327
+#: worktree.c:326
 #, c-format
 msgid "'%s' does not exist"
 msgstr ""
 
-#: worktree.c:333
+#: worktree.c:332
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr ""
@@ -7377,17 +8818,83 @@ msgstr ""
 msgid "'%s' does not point back to '%s'"
 msgstr ""
 
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:603
+msgid "not a directory"
+msgstr ""
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr ""
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr ""
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr ""
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr ""
+
+#: worktree.c:728
+msgid "unable to locate repository; .git is not a file"
+msgstr ""
+
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr ""
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr ""
+
+#: 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 ""
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr ""
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr ""
+
+#: worktree.c:817
+msgid "gitdir file points to non-existent location"
+msgstr ""
+
+#: wrapper.c:197 wrapper.c:367
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr ""
 
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr ""
 
-#: wrapper.c:596
+#: wrapper.c:607
 msgid "unable to get current working directory"
 msgstr ""
 
@@ -7420,11 +8927,11 @@ msgstr ""
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr ""
 
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
 msgstr ""
 
@@ -7450,100 +8957,100 @@ msgstr ""
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 
-#: wt-status.c:268
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr ""
 
-#: wt-status.c:270
+#: wt-status.c:268
 msgid "added by us:"
 msgstr ""
 
-#: wt-status.c:272
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr ""
 
-#: wt-status.c:274
+#: wt-status.c:272
 msgid "added by them:"
 msgstr ""
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr ""
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "both added:"
 msgstr ""
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "both modified:"
 msgstr ""
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "new file:"
 msgstr ""
 
-#: wt-status.c:292
+#: wt-status.c:290
 msgid "copied:"
 msgstr ""
 
-#: wt-status.c:294
+#: wt-status.c:292
 msgid "deleted:"
 msgstr ""
 
-#: wt-status.c:296
+#: wt-status.c:294
 msgid "modified:"
 msgstr ""
 
-#: wt-status.c:298
+#: wt-status.c:296
 msgid "renamed:"
 msgstr ""
 
-#: wt-status.c:300
+#: wt-status.c:298
 msgid "typechange:"
 msgstr ""
 
-#: wt-status.c:302
+#: wt-status.c:300
 msgid "unknown:"
 msgstr ""
 
-#: wt-status.c:304
+#: wt-status.c:302
 msgid "unmerged:"
 msgstr ""
 
-#: wt-status.c:384
+#: wt-status.c:382
 msgid "new commits, "
 msgstr ""
 
-#: wt-status.c:386
+#: wt-status.c:384
 msgid "modified content, "
 msgstr ""
 
-#: wt-status.c:388
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr ""
 
-#: wt-status.c:906
+#: wt-status.c:958
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] ""
 msgstr[1] ""
 
-#: wt-status.c:938
+#: wt-status.c:989
 msgid "Submodules changed but not updated:"
 msgstr ""
 
-#: wt-status.c:940
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr ""
 
-#: wt-status.c:1022
+#: wt-status.c:1073
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr ""
 
-#: wt-status.c:1114
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -7551,242 +9058,259 @@ msgid ""
 "You can use '--no-ahead-behind' to avoid this.\n"
 msgstr ""
 
-#: wt-status.c:1144
+#: wt-status.c:1195
 msgid "You have unmerged paths."
 msgstr ""
 
-#: wt-status.c:1147
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr ""
 
-#: wt-status.c:1149
+#: wt-status.c:1200
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr ""
 
-#: wt-status.c:1153
+#: wt-status.c:1204
 msgid "All conflicts fixed but you are still merging."
 msgstr ""
 
-#: wt-status.c:1156
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr ""
 
-#: wt-status.c:1165
+#: wt-status.c:1216
 msgid "You are in the middle of an am session."
 msgstr ""
 
-#: wt-status.c:1168
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr ""
 
-#: wt-status.c:1172
+#: wt-status.c:1223
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr ""
 
-#: wt-status.c:1174
+#: wt-status.c:1225
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1176
+#: wt-status.c:1227
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr ""
 
-#: wt-status.c:1309
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
 msgstr ""
 
-#: wt-status.c:1311
+#: wt-status.c:1362
 msgid "No commands done."
 msgstr ""
 
-#: wt-status.c:1314
+#: wt-status.c:1365
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] ""
 msgstr[1] ""
 
-#: wt-status.c:1325
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr ""
 
-#: wt-status.c:1330
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr ""
 
-#: wt-status.c:1333
+#: 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] ""
 msgstr[1] ""
 
-#: wt-status.c:1341
+#: wt-status.c:1392
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 
-#: wt-status.c:1353
+#: wt-status.c:1404
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1358
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr ""
 
-#: wt-status.c:1371
+#: wt-status.c:1422
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1373
+#: wt-status.c:1424
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1375
+#: wt-status.c:1426
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 
-#: wt-status.c:1382
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1386
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1391
+#: wt-status.c:1442
 msgid "You are currently splitting a commit during a rebase."
 msgstr ""
 
-#: wt-status.c:1394
+#: wt-status.c:1445
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 
-#: wt-status.c:1398
+#: wt-status.c:1449
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 
-#: wt-status.c:1403
+#: wt-status.c:1454
 msgid "You are currently editing a commit during a rebase."
 msgstr ""
 
-#: wt-status.c:1406
+#: wt-status.c:1457
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr ""
 
-#: wt-status.c:1408
+#: wt-status.c:1459
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 
-#: wt-status.c:1419
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr ""
 
-#: wt-status.c:1422
+#: wt-status.c:1473
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr ""
 
-#: wt-status.c:1429
+#: wt-status.c:1480
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr ""
 
-#: wt-status.c:1432
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr ""
 
-#: wt-status.c:1435
+#: wt-status.c:1486
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 
-#: wt-status.c:1437
+#: wt-status.c:1488
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1439
+#: wt-status.c:1490
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 
-#: wt-status.c:1449
+#: wt-status.c:1500
 msgid "Revert currently in progress."
 msgstr ""
 
-#: wt-status.c:1452
+#: wt-status.c:1503
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr ""
 
-#: wt-status.c:1458
+#: wt-status.c:1509
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:1461
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr ""
 
-#: wt-status.c:1464
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 
-#: wt-status.c:1466
+#: wt-status.c:1517
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr ""
 
-#: wt-status.c:1468
+#: wt-status.c:1519
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr ""
 
-#: wt-status.c:1478
+#: wt-status.c:1529
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr ""
 
-#: wt-status.c:1482
+#: wt-status.c:1533
 msgid "You are currently bisecting."
 msgstr ""
 
-#: wt-status.c:1485
+#: wt-status.c:1536
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr ""
 
-#: wt-status.c:1694
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr ""
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+
+#: wt-status.c:1794
 msgid "On branch "
 msgstr ""
 
-#: wt-status.c:1701
+#: wt-status.c:1801
 msgid "interactive rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1703
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
 msgstr ""
 
-#: wt-status.c:1713
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr ""
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr ""
+
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr ""
 
-#: wt-status.c:1730
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr ""
 
-#: wt-status.c:1731
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr ""
 
-#: wt-status.c:1745
+#: wt-status.c:1845
 msgid "Untracked files"
 msgstr ""
 
-#: wt-status.c:1747
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr ""
 
-#: wt-status.c:1751
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7794,221 +9318,248 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr ""
 
-#: wt-status.c:1757
+#: wt-status.c:1857
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr ""
 
-#: wt-status.c:1759
+#: wt-status.c:1859
 msgid " (use -u option to show untracked files)"
 msgstr ""
 
-#: wt-status.c:1765
+#: wt-status.c:1865
 msgid "No changes"
 msgstr ""
 
-#: wt-status.c:1770
+#: wt-status.c:1870
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 
-#: wt-status.c:1773
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
 msgstr ""
 
-#: wt-status.c:1776
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
 
-#: wt-status.c:1779
+#: wt-status.c:1882
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 
-#: wt-status.c:1782
+#: wt-status.c:1886
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr ""
 
-#: wt-status.c:1788
+#: wt-status.c:1893
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 
-#: wt-status.c:1792
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr ""
 
-#: wt-status.c:1905
+#: wt-status.c:2003
 msgid "No commits yet on "
 msgstr ""
 
-#: wt-status.c:1909
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr ""
 
-#: wt-status.c:1940
+#: wt-status.c:2038
 msgid "different"
 msgstr ""
 
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr ""
 
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr ""
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2569
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr ""
 
-#: wt-status.c:2476
+#: wt-status.c:2575
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 
-#: wt-status.c:2478
+#: wt-status.c:2577
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#: compat/simple-ipc/ipc-unix-socket.c:182
+msgid "could not send IPC command"
+msgstr ""
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr ""
+
+#: 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 ""
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:461
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr ""
 
-#: builtin/add.c:25
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr ""
 
-#: builtin/add.c:84
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr ""
+
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr ""
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
 msgstr ""
 
-#: builtin/add.c:99
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
 msgstr ""
 
-#: builtin/add.c:174
+#: builtin/add.c:198
 msgid "Unstaged changes after refreshing the index:"
 msgstr ""
 
-#: builtin/add.c:234 builtin/rev-parse.c:897
+#: builtin/add.c:307 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr ""
 
-#: builtin/add.c:245
+#: builtin/add.c:318
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr ""
 
-#: builtin/add.c:249
+#: builtin/add.c:322
 msgid "Could not write patch"
 msgstr ""
 
-#: builtin/add.c:252
+#: builtin/add.c:325
 msgid "editing patch failed"
 msgstr ""
 
-#: builtin/add.c:255
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
 msgstr ""
 
-#: builtin/add.c:257
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr ""
 
-#: builtin/add.c:262
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
 msgstr ""
 
-#: builtin/add.c:270
+#: builtin/add.c:343
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr ""
 
-#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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 ""
 
-#: builtin/add.c:293
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr ""
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr ""
 
-#: builtin/add.c:295
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr ""
 
-#: builtin/add.c:296
+#: builtin/add.c:369
 msgid "allow adding otherwise ignored files"
 msgstr ""
 
-#: builtin/add.c:297
+#: builtin/add.c:370
 msgid "update tracked files"
 msgstr ""
 
-#: builtin/add.c:298
+#: builtin/add.c:371
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr ""
 
-#: builtin/add.c:299
+#: builtin/add.c:372
 msgid "record only the fact that the path will be added later"
 msgstr ""
 
-#: builtin/add.c:300
+#: builtin/add.c:373
 msgid "add changes from all tracked and untracked files"
 msgstr ""
 
-#: builtin/add.c:303
+#: builtin/add.c:376
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr ""
 
-#: builtin/add.c:305
+#: builtin/add.c:378
 msgid "don't add, only refresh the index"
 msgstr ""
 
-#: builtin/add.c:306
+#: builtin/add.c:379
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 
-#: builtin/add.c:307
+#: builtin/add.c:380
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 
-#: builtin/add.c:309 builtin/update-index.c:1002
+#: builtin/add.c:382 builtin/update-index.c:1006
 msgid "override the executable bit of the listed files"
 msgstr ""
 
-#: builtin/add.c:311
+#: builtin/add.c:384
 msgid "warn when adding an embedded repository"
 msgstr ""
 
-#: builtin/add.c:326
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr ""
+
+#: builtin/add.c:404
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8026,165 +9577,191 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr ""
 
-#: builtin/add.c:354
+#: builtin/add.c:432
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr ""
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
+#: 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:379
+#: builtin/add.c:460
 msgid "adding files failed"
 msgstr ""
 
-#: builtin/add.c:419
+#: 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:426
+#: builtin/add.c:522
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr ""
 
-#: builtin/add.c:430
+#: builtin/add.c:526
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr ""
 
-#: builtin/add.c:445
+#: 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 ""
+
+#: 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:555
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr ""
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
+#: 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:347
+#: builtin/am.c:365
 msgid "could not parse author script"
 msgstr ""
 
-#: builtin/am.c:431
+#: builtin/am.c:455
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr ""
 
-#: builtin/am.c:473
+#: builtin/am.c:497
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr ""
 
-#: builtin/am.c:511
+#: builtin/am.c:535
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr ""
 
-#: builtin/am.c:537
+#: builtin/am.c:561
 msgid "fseek failed"
 msgstr ""
 
-#: builtin/am.c:725
+#: builtin/am.c:749
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr ""
 
-#: builtin/am.c:790
+#: builtin/am.c:814
 msgid "Only one StGIT patch series can be applied at once"
 msgstr ""
 
-#: builtin/am.c:838
+#: builtin/am.c:862
 msgid "invalid timestamp"
 msgstr ""
 
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:867 builtin/am.c:879
 msgid "invalid Date line"
 msgstr ""
 
-#: builtin/am.c:850
+#: builtin/am.c:874
 msgid "invalid timezone offset"
 msgstr ""
 
-#: builtin/am.c:943
+#: builtin/am.c:967
 msgid "Patch format detection failed."
 msgstr ""
 
-#: builtin/am.c:948 builtin/clone.c:406
+#: builtin/am.c:972 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr ""
 
-#: builtin/am.c:953
+#: builtin/am.c:977
 msgid "Failed to split patches."
 msgstr ""
 
-#: builtin/am.c:1084
+#: builtin/am.c:1126
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr ""
 
-#: builtin/am.c:1085
+#: builtin/am.c:1127
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr ""
 
-#: builtin/am.c:1086
+#: builtin/am.c:1128
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 
-#: builtin/am.c:1169
+#: builtin/am.c:1223
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 
-#: builtin/am.c:1197
+#: builtin/am.c:1251
 msgid "Patch is empty."
 msgstr ""
 
-#: builtin/am.c:1262
+#: builtin/am.c:1316
 #, c-format
 msgid "missing author line in commit %s"
 msgstr ""
 
-#: builtin/am.c:1265
+#: builtin/am.c:1319
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr ""
 
-#: builtin/am.c:1484
+#: builtin/am.c:1538
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 
-#: builtin/am.c:1486
+#: builtin/am.c:1540
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 
-#: builtin/am.c:1505
+#: builtin/am.c:1559
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
 
-#: builtin/am.c:1511
+#: builtin/am.c:1565
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 
-#: builtin/am.c:1537
+#: builtin/am.c:1591
 msgid "Failed to merge in the changes."
 msgstr ""
 
-#: builtin/am.c:1569
+#: builtin/am.c:1623
 msgid "applying to an empty history"
 msgstr ""
 
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1675 builtin/am.c:1679
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr ""
 
-#: builtin/am.c:1638
+#: builtin/am.c:1697
 msgid "Commit Body is:"
 msgstr ""
 
@@ -8192,46 +9769,46 @@ msgstr ""
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1648
+#: builtin/am.c:1707
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 
-#: builtin/am.c:1695 builtin/commit.c:374
+#: builtin/am.c:1753 builtin/commit.c:408
 msgid "unable to write index file"
 msgstr ""
 
-#: builtin/am.c:1699
+#: builtin/am.c:1757
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr ""
 
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1797 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr ""
 
-#: builtin/am.c:1756
+#: builtin/am.c:1814
 msgid "No changes -- Patch already applied."
 msgstr ""
 
-#: builtin/am.c:1762
+#: builtin/am.c:1820
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr ""
 
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1824
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 
-#: builtin/am.c:1810
+#: 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 ""
 
-#: builtin/am.c:1817
+#: 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 "
@@ -8239,185 +9816,201 @@ msgid ""
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr ""
 
-#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
-#: builtin/reset.c:337
+#: 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 ""
 
-#: builtin/am.c:1976
+#: builtin/am.c:2034
 msgid "failed to clean index"
 msgstr ""
 
-#: builtin/am.c:2020
+#: builtin/am.c:2078
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
 
-#: builtin/am.c:2117
+#: builtin/am.c:2185
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr ""
 
-#: builtin/am.c:2153
+#: builtin/am.c:2227
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr ""
+
+#: builtin/am.c:2231
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr ""
+
+#: builtin/am.c:2262
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr ""
 
-#: builtin/am.c:2154
+#: builtin/am.c:2263
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr ""
 
-#: builtin/am.c:2160
+#: builtin/am.c:2269
 msgid "run interactively"
 msgstr ""
 
-#: builtin/am.c:2162
+#: builtin/am.c:2271
 msgid "historical option -- no-op"
 msgstr ""
 
-#: builtin/am.c:2164
+#: builtin/am.c:2273
 msgid "allow fall back on 3way merging if needed"
 msgstr ""
 
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:297 builtin/stash.c:812
+#: 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 ""
 
-#: builtin/am.c:2167
-msgid "add a Signed-off-by line to the commit message"
+#: builtin/am.c:2276
+msgid "add a Signed-off-by trailer to the commit message"
 msgstr ""
 
-#: builtin/am.c:2170
+#: builtin/am.c:2279
 msgid "recode into utf8 (default)"
 msgstr ""
 
-#: builtin/am.c:2172
+#: builtin/am.c:2281
 msgid "pass -k flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2174
+#: builtin/am.c:2283
 msgid "pass -b flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2176
+#: builtin/am.c:2285
 msgid "pass -m flag to git-mailinfo"
 msgstr ""
 
-#: builtin/am.c:2178
+#: builtin/am.c:2287
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr ""
 
-#: builtin/am.c:2181
+#: builtin/am.c:2290
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 
-#: builtin/am.c:2184
+#: builtin/am.c:2293
 msgid "strip everything before a scissors line"
 msgstr ""
 
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr ""
+
+#: 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 ""
 
-#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
-#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:150 parse-options.h:171 parse-options.h:312
+#: 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: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 ""
 
-#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: 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 ""
 
-#: builtin/am.c:2210
+#: builtin/am.c:2322
 msgid "format the patch(es) are in"
 msgstr ""
 
-#: builtin/am.c:2216
+#: builtin/am.c:2328
 msgid "override error message when patch failure occurs"
 msgstr ""
 
-#: builtin/am.c:2218
+#: builtin/am.c:2330
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 
-#: builtin/am.c:2221
+#: builtin/am.c:2333
 msgid "synonyms for --continue"
 msgstr ""
 
-#: builtin/am.c:2224
+#: builtin/am.c:2336
 msgid "skip the current patch"
 msgstr ""
 
-#: builtin/am.c:2227
-msgid "restore the original branch and abort the patching operation."
+#: builtin/am.c:2339
+msgid "restore the original branch and abort the patching operation"
 msgstr ""
 
-#: builtin/am.c:2230
-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:2233
-msgid "show the patch being applied."
+#: builtin/am.c:2346
+msgid "show the patch being applied"
 msgstr ""
 
-#: builtin/am.c:2237
+#: builtin/am.c:2351
 msgid "lie about committer date"
 msgstr ""
 
-#: builtin/am.c:2239
+#: builtin/am.c:2353
 msgid "use current timestamp for author date"
 msgstr ""
 
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
-#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
+#: 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 ""
 
-#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
 msgstr ""
 
-#: builtin/am.c:2245
+#: builtin/am.c:2359
 msgid "(internal use for git-rebase)"
 msgstr ""
 
-#: builtin/am.c:2263
+#: 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 ""
 
-#: builtin/am.c:2270
+#: builtin/am.c:2384
 msgid "failed to read the index"
 msgstr ""
 
-#: builtin/am.c:2285
+#: builtin/am.c:2399
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 
-#: builtin/am.c:2309
+#: builtin/am.c:2423
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr ""
 
-#: builtin/am.c:2315
+#: builtin/am.c:2429
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr ""
 
-#: builtin/am.c:2325
+#: builtin/am.c:2439
 msgid "interactive mode requires patches on the command line"
 msgstr ""
 
@@ -8455,117 +10048,120 @@ msgstr ""
 msgid "git archive: expected a flush"
 msgstr ""
 
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr ""
-
 #: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr ""
 
 #: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
 msgstr ""
 
 #: builtin/bisect--helper.c:25
-msgid "git bisect--helper --bisect-reset [<commit>]"
-msgstr ""
-
-#: builtin/bisect--helper.c:26
 msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
+"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
+"term-new]"
 msgstr ""
 
-#: builtin/bisect--helper.c:27
+#: builtin/bisect--helper.c:26
 msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
+"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:28
-msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgid "git bisect--helper --bisect-next"
 msgstr ""
 
 #: builtin/bisect--helper.c:29
-msgid ""
-"git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
-"term-new]"
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
 msgstr ""
 
 #: builtin/bisect--helper.c:30
-msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<bad> [<good>...]] [--] [<paths>...]"
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:155
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr ""
 
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:159
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr ""
 
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:169
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:179
 msgid "please use two different terms"
 msgstr ""
 
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr ""
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:195
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:203
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:212
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:256
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr ""
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:261
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:273
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:299
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr ""
 
-#: builtin/bisect--helper.c:285
+#: 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 ""
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:330
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -8573,7 +10169,7 @@ msgid ""
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:350
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr ""
@@ -8582,288 +10178,333 @@ msgstr ""
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:358
 msgid "Are you sure [Y/n]? "
 msgstr ""
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:419
 msgid "no terms defined"
 msgstr ""
 
-#: builtin/bisect--helper.c:379
+#: 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:389
+#: 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 ""
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+msgid "revision walk setup failed\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr ""
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr ""
+
+#: builtin/bisect--helper.c:663
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:667
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr ""
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:698
 msgid "bad HEAD - I need a HEAD"
 msgstr ""
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:713
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:734
 msgid "won't bisect on cg-seek'ed tree"
 msgstr ""
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:737
 msgid "bad HEAD - strange symbolic ref"
 msgstr ""
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:757
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:630
-msgid "perform 'git bisect next'"
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:632
-msgid "write the terms to .git/BISECT_TERMS"
+#. 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:826
+msgid "Do you want me to do it for you [Y/n]? "
 msgstr ""
 
-#: builtin/bisect--helper.c:634
-msgid "cleanup the bisection state"
+#: builtin/bisect--helper.c:844
+msgid "Please call `--bisect-state` with at least one argument"
 msgstr ""
 
-#: builtin/bisect--helper.c:636
-msgid "check for expected revs"
+#: builtin/bisect--helper.c:857
+#, c-format
+msgid "'git bisect %s' can take only one argument."
 msgstr ""
 
-#: builtin/bisect--helper.c:638
-msgid "reset the bisection state"
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
 msgstr ""
 
-#: builtin/bisect--helper.c:640
-msgid "write out the bisection state in BISECT_LOG"
+#: builtin/bisect--helper.c:889
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr ""
+
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr ""
+
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr ""
+
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
 msgstr ""
 
-#: builtin/bisect--helper.c:642
-msgid "check and set terms in a bisection state"
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
 msgstr ""
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:1058
 msgid "check whether bad or good terms exist"
 msgstr ""
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:1060
 msgid "print out the bisect terms"
 msgstr ""
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:1062
 msgid "start the bisect session"
 msgstr ""
 
-#: builtin/bisect--helper.c:650
-msgid "update BISECT_HEAD instead of checking out the current commit"
+#: builtin/bisect--helper.c:1064
+msgid "find the next bisection commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:652
-msgid "no log for BISECT_WRITE"
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
 msgstr ""
 
-#: builtin/bisect--helper.c:669
-msgid "--write-terms requires two arguments"
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
 msgstr ""
 
-#: builtin/bisect--helper.c:673
-msgid "--bisect-clean-state requires no arguments"
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
 msgstr ""
 
-#: builtin/bisect--helper.c:680
-msgid "--bisect-reset requires either no argument or a commit"
+#: builtin/bisect--helper.c:1072
+msgid "skip some commits for checkout"
 msgstr ""
 
-#: builtin/bisect--helper.c:684
-msgid "--bisect-write requires either 4 or 5 arguments"
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
 msgstr ""
 
-#: builtin/bisect--helper.c:690
-msgid "--check-and-set-terms requires 3 arguments"
+#: builtin/bisect--helper.c:1089
+msgid "--bisect-reset requires either no argument or a commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:1094
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:1100
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr ""
 
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr ""
+
+#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr ""
 
-#: builtin/blame.c:36
+#: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr ""
 
-#: builtin/blame.c:409
+#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
 msgstr ""
 
-#: builtin/blame.c:416
+#: builtin/blame.c:417
 msgid "must end with a color"
 msgstr ""
 
-#: builtin/blame.c:729
+#: builtin/blame.c:728
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr ""
 
-#: builtin/blame.c:747
+#: builtin/blame.c:746
 msgid "invalid value for blame.coloring"
 msgstr ""
 
-#: builtin/blame.c:822
+#: builtin/blame.c:845
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr ""
 
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
 msgstr ""
 
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:846
-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 ""
 
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
 msgstr ""
 
-#: builtin/blame.c:848
-msgid "Force progress reporting"
+#: 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 ""
 
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
 msgstr ""
 
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
 msgstr ""
 
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
 msgstr ""
 
-#: builtin/blame.c:853
-msgid "Show porcelain format with per-line commit information"
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
 msgstr ""
 
-#: builtin/blame.c:854
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:858
-msgid "Show author email instead of name (Default: off)"
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
 msgstr ""
 
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
 msgstr ""
 
-#: builtin/blame.c:860 builtin/log.c:1630
+#: builtin/blame.c:883 builtin/log.c:1823
 msgid "rev"
 msgstr ""
 
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
 msgstr ""
 
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
 msgstr ""
 
-#: builtin/blame.c:862
+#: builtin/blame.c:885
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 
-#: builtin/blame.c:863
+#: builtin/blame.c:886
 msgid "color lines by age"
 msgstr ""
 
-#: builtin/blame.c:870
-msgid "Use an experimental heuristic to improve diffs"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
 msgstr ""
 
-#: builtin/blame.c:872
-msgid "Spend extra cycles to find better match"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr ""
 
-#: builtin/blame.c:873
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
 msgstr ""
 
-#: builtin/blame.c:874
-msgid "Use <file>'s contents as the final image"
-msgstr ""
-
-#: builtin/blame.c:875 builtin/blame.c:876
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr ""
 
-#: builtin/blame.c:875
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
 msgstr ""
 
-#: builtin/blame.c:876
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
 msgstr ""
 
-#: builtin/blame.c:877
-msgid "n,m"
+#: builtin/blame.c:892
+msgid "range"
 msgstr ""
 
-#: builtin/blame.c:877
-msgid "Process only line range n,m, counting from 1"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
 msgstr ""
 
-#: builtin/blame.c:929
+#: builtin/blame.c:945
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 
@@ -8875,23 +10516,23 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr ""
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1112
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1157
 msgid "Blaming lines"
 msgstr ""
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
 msgstr ""
 
 #: builtin/branch.c:30
@@ -8948,117 +10589,107 @@ msgstr ""
 msgid "Update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:220
+#: builtin/branch.c:223
 msgid "cannot use -a with -d"
 msgstr ""
 
-#: builtin/branch.c:226
+#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr ""
 
-#: builtin/branch.c:240
+#: builtin/branch.c:244
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr ""
 
-#: builtin/branch.c:255
+#: builtin/branch.c:259
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr ""
 
-#: builtin/branch.c:256
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
 msgstr ""
 
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr ""
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr ""
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/branch.c:280
+#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr ""
 
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:440 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr ""
 
-#: builtin/branch.c:460
+#: builtin/branch.c:471
 msgid "could not resolve HEAD"
 msgstr ""
 
-#: builtin/branch.c:466
+#: builtin/branch.c:477
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr ""
 
-#: builtin/branch.c:481
+#: builtin/branch.c:492
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr ""
 
-#: builtin/branch.c:485
+#: builtin/branch.c:496
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr ""
 
-#: builtin/branch.c:502
+#: builtin/branch.c:513
 msgid "cannot copy the current branch while not on any."
 msgstr ""
 
-#: builtin/branch.c:504
+#: builtin/branch.c:515
 msgid "cannot rename the current branch while not on any."
 msgstr ""
 
-#: builtin/branch.c:515
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr ""
 
-#: builtin/branch.c:542
+#: builtin/branch.c:555
 msgid "Branch rename failed"
 msgstr ""
 
-#: builtin/branch.c:544
+#: builtin/branch.c:557
 msgid "Branch copy failed"
 msgstr ""
 
-#: builtin/branch.c:548
+#: builtin/branch.c:561
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:551
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr ""
 
-#: builtin/branch.c:557
+#: builtin/branch.c:570
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr ""
 
-#: builtin/branch.c:566
+#: builtin/branch.c:579
 msgid "Branch is renamed, but update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:568
+#: builtin/branch.c:581
 msgid "Branch is copied, but update of config-file failed"
 msgstr ""
 
-#: builtin/branch.c:584
+#: builtin/branch.c:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -9066,310 +10697,439 @@ msgid ""
 "Lines starting with '%c' will be stripped.\n"
 msgstr ""
 
-#: builtin/branch.c:618
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr ""
 
-#: builtin/branch.c:620
+#: builtin/branch.c:633
 msgid "show hash and subject, give twice for upstream branch"
 msgstr ""
 
-#: builtin/branch.c:621
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr ""
 
-#: builtin/branch.c:622
+#: builtin/branch.c:635
 msgid "set up tracking mode (see git-pull(1))"
 msgstr ""
 
-#: builtin/branch.c:624
+#: builtin/branch.c:637
 msgid "do not use"
 msgstr ""
 
-#: builtin/branch.c:626 builtin/rebase.c:486
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr ""
 
-#: builtin/branch.c:626
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr ""
 
-#: builtin/branch.c:627
-msgid "Unset the upstream info"
+#: builtin/branch.c:640
+msgid "unset the upstream info"
 msgstr ""
 
-#: builtin/branch.c:628
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr ""
 
-#: builtin/branch.c:629
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
 msgstr ""
 
-#: 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 ""
 
-#: 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 ""
 
-#: builtin/branch.c:637
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
 msgstr ""
 
-#: builtin/branch.c:638
+#: builtin/branch.c:651
 msgid "list both remote-tracking and local branches"
 msgstr ""
 
-#: builtin/branch.c:640
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr ""
 
-#: builtin/branch.c:641
+#: builtin/branch.c:654
 msgid "delete branch (even if not merged)"
 msgstr ""
 
-#: builtin/branch.c:642
+#: builtin/branch.c:655
 msgid "move/rename a branch and its reflog"
 msgstr ""
 
-#: builtin/branch.c:643
+#: builtin/branch.c:656
 msgid "move/rename a branch, even if target exists"
 msgstr ""
 
-#: builtin/branch.c:644
+#: builtin/branch.c:657
 msgid "copy a branch and its reflog"
 msgstr ""
 
-#: builtin/branch.c:645
+#: builtin/branch.c:658
 msgid "copy a branch, even if target exists"
 msgstr ""
 
-#: builtin/branch.c:646
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr ""
 
-#: builtin/branch.c:647
+#: builtin/branch.c:660
 msgid "show current branch name"
 msgstr ""
 
-#: builtin/branch.c:648
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr ""
 
-#: builtin/branch.c:650
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr ""
 
-#: builtin/branch.c:651
+#: builtin/branch.c:664
 msgid "force creation, move/rename, deletion"
 msgstr ""
 
-#: builtin/branch.c:652
+#: builtin/branch.c:665
 msgid "print only branches that are merged"
 msgstr ""
 
-#: builtin/branch.c:653
+#: builtin/branch.c:666
 msgid "print only branches that are not merged"
 msgstr ""
 
-#: builtin/branch.c:654
+#: builtin/branch.c:667
 msgid "list branches in columns"
 msgstr ""
 
-#: builtin/branch.c:657 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:433
+#: builtin/tag.c:477
 msgid "object"
 msgstr ""
 
-#: builtin/branch.c:658
+#: builtin/branch.c:670
 msgid "print only branches of the object"
 msgstr ""
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
 msgid "sorting and filtering are case insensitive"
 msgstr ""
 
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: 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 ""
 
-#: builtin/branch.c:684 builtin/clone.c:760
+#: builtin/branch.c:695 builtin/clone.c:794
 msgid "HEAD not found below refs/heads!"
 msgstr ""
 
-#: builtin/branch.c:708
+#: builtin/branch.c:719
 msgid "--column and --verbose are incompatible"
 msgstr ""
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
 msgid "branch name required"
 msgstr ""
 
-#: builtin/branch.c:753
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
 msgstr ""
 
-#: builtin/branch.c:758
+#: builtin/branch.c:771
 msgid "cannot edit description of more than one branch"
 msgstr ""
 
-#: builtin/branch.c:765
+#: builtin/branch.c:778
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr ""
 
-#: builtin/branch.c:768
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
 msgstr ""
 
-#: builtin/branch.c:783
+#: builtin/branch.c:796
 msgid "too many branches for a copy operation"
 msgstr ""
 
-#: builtin/branch.c:792
+#: builtin/branch.c:805
 msgid "too many arguments for a rename operation"
 msgstr ""
 
-#: builtin/branch.c:797
+#: builtin/branch.c:810
 msgid "too many arguments to set new upstream"
 msgstr ""
 
-#: builtin/branch.c:801
+#: builtin/branch.c:814
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr ""
 
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:817 builtin/branch.c:840
 #, c-format
 msgid "no such branch '%s'"
 msgstr ""
 
-#: builtin/branch.c:808
+#: builtin/branch.c:821
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr ""
 
-#: builtin/branch.c:821
+#: builtin/branch.c:834
 msgid "too many arguments to unset upstream"
 msgstr ""
 
-#: builtin/branch.c:825
+#: builtin/branch.c:838
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 
-#: builtin/branch.c:831
+#: builtin/branch.c:844
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr ""
 
-#: builtin/branch.c:841
+#: 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>?"
 msgstr ""
 
-#: builtin/branch.c:845
+#: builtin/branch.c:858
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgstr ""
 
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr ""
+
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr ""
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr ""
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
 msgstr ""
 
-#: builtin/bundle.c:58
+#: builtin/bugreport.c:80
+msgid "not run from a git repository - no hooks to show\n"
+msgstr ""
+
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr ""
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+
+#: builtin/bugreport.c:136
+msgid "specify a destination for the bugreport file"
+msgstr ""
+
+#: builtin/bugreport.c:138
+msgid "specify a strftime format suffix for the filename"
+msgstr ""
+
+#: builtin/bugreport.c:160
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr ""
+
+#: builtin/bugreport.c:170
+msgid "Enabled Hooks"
+msgstr ""
+
+#: builtin/bugreport.c:177
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:180
+#, c-format
+msgid "unable to write to %s"
+msgstr ""
+
+#: builtin/bugreport.c:190
+#, 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 ""
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr ""
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr ""
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr ""
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr ""
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr ""
+
+#: builtin/bundle.c:179
 msgid "Need a repository to unbundle."
 msgstr ""
 
-#: builtin/cat-file.c:595
+#: builtin/bundle.c:191 builtin/remote.c:1700
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/bundle.c:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: 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>"
 msgstr ""
 
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:597
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
 msgstr ""
 
-#: builtin/cat-file.c:617
+#: builtin/cat-file.c:618
 msgid "only one batch option may be specified"
 msgstr ""
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr ""
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object type"
 msgstr ""
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
 msgid "show object size"
 msgstr ""
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "exit with zero when there's no error"
 msgstr ""
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
 msgid "pretty-print object's content"
 msgstr ""
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
 msgid "for blob objects, run textconv on object's content"
 msgstr ""
 
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
 msgid "for blob objects, run filters on object's content"
 msgstr ""
 
-#: builtin/cat-file.c:645 git-submodule.sh:936
+#: builtin/cat-file.c:646
 msgid "blob"
 msgstr ""
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
 msgid "use a specific path for --textconv/--filters"
 msgstr ""
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr ""
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
 msgid "buffer --batch output"
 msgstr ""
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:652
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:656
 msgid "show info about objects fed from the standard input"
 msgstr ""
 
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
 msgid "show all objects with --batch or --batch-check"
 msgstr ""
 
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:664
 msgid "do not order --batch-all-objects output"
 msgstr ""
 
@@ -9397,8 +11157,8 @@ msgstr ""
 msgid "terminate input and output records by a NUL character"
 msgstr ""
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr ""
 
@@ -9410,27 +11170,27 @@ msgstr ""
 msgid "ignore index when checking"
 msgstr ""
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr ""
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr ""
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr ""
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr ""
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr ""
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr ""
 
@@ -9451,215 +11211,221 @@ msgstr ""
 msgid "no contacts specified"
 msgstr ""
 
-#: builtin/checkout-index.c:131
+#: builtin/checkout--worker.c:110
+msgid "git checkout--worker [<options>]"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr ""
+
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr ""
 
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr ""
 
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr ""
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr ""
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr ""
 
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr ""
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr ""
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr ""
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr ""
 
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:679
-msgid "string"
-msgstr ""
-
-#: builtin/checkout-index.c:179
-msgid "when creating files, prepend <string>"
-msgstr ""
-
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr ""
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr ""
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr ""
 
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr ""
 
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr ""
 
-#: builtin/checkout.c:173 builtin/checkout.c:212
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr ""
 
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr ""
 
-#: builtin/checkout.c:191
+#: builtin/checkout.c:208
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr ""
 
-#: builtin/checkout.c:241
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr ""
 
-#: builtin/checkout.c:259
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr ""
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr ""
 
-#: builtin/checkout.c:375
+#: builtin/checkout.c:411
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:380
+#: builtin/checkout.c:416
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:387
+#: builtin/checkout.c:423
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416
-#: builtin/checkout.c:420
+#: 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 ""
 
-#: builtin/checkout.c:423 builtin/checkout.c:426
+#: builtin/checkout.c:459 builtin/checkout.c:462
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr ""
 
-#: builtin/checkout.c:430
+#: builtin/checkout.c:466
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 
-#: builtin/checkout.c:434
+#: builtin/checkout.c:470
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr ""
 
-#: builtin/checkout.c:438
+#: builtin/checkout.c:474
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr ""
 
-#: builtin/checkout.c:443 builtin/checkout.c:448
+#: builtin/checkout.c:479 builtin/checkout.c:484
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr ""
 
-#: builtin/checkout.c:507 builtin/checkout.c:514
+#: builtin/checkout.c:558 builtin/checkout.c:565
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr ""
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:734
 msgid "you need to resolve your current index first"
 msgstr ""
 
-#: builtin/checkout.c:730
+#: builtin/checkout.c:788
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
 
-#: builtin/checkout.c:833
+#: builtin/checkout.c:881
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr ""
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:923
 msgid "HEAD is now at"
 msgstr ""
 
-#: builtin/checkout.c:879 builtin/clone.c:713
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr ""
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:931
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:934
 #, c-format
 msgid "Already on '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:938
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:940 builtin/checkout.c:1371
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:942
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr ""
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:993
 #, c-format
 msgid " ... and %d more.\n"
 msgstr ""
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:999
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -9674,7 +11440,7 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:970
+#: 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"
@@ -9691,345 +11457,346 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1053
 msgid "internal error in revision walk"
 msgstr ""
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1057
 msgid "Previous HEAD position was"
 msgstr ""
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
 msgid "You are on a branch yet to be born"
 msgstr ""
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
+#: 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: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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
 msgstr ""
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1196
 #, c-format
-msgid "only one reference expected, %d given."
+msgid "'%s' matched multiple (%d) remote tracking branches"
 msgstr ""
 
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1262
+msgid "only one reference expected"
+msgstr ""
+
+#: builtin/checkout.c:1279
 #, c-format
-msgid ""
-"'%s' could be both a local file and a tracking branch.\n"
-"Please use -- (and optionally --no-guess) to disambiguate"
+msgid "only one reference expected, %d given."
 msgstr ""
 
-#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr ""
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr ""
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1385
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1387
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1391
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1407
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1329
+#: 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:1333
+#: builtin/checkout.c:1415
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1337
+#: 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:1341
+#: builtin/checkout.c:1423
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
 msgstr ""
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1427
 msgid "you are switching branch while bisecting"
 msgstr ""
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1434
 msgid "paths cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr ""
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: 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 ""
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr ""
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1470
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1477
 msgid "missing branch or commit argument"
 msgstr ""
 
-#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
-#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
-#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr ""
-
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1520
 msgid "perform a 3-way merge with the new branch"
 msgstr ""
 
-#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
 msgid "style"
 msgstr ""
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1522
 msgid "conflict style (merge or diff3)"
 msgstr ""
 
-#: builtin/checkout.c:1452 builtin/worktree.c:503
+#: builtin/checkout.c:1534 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr ""
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1535
 msgid "set upstream info for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1537
 msgid "force checkout (throw away local modifications)"
 msgstr ""
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new-branch"
 msgstr ""
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new unparented branch"
 msgstr ""
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1541 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr ""
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1544
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1557
 msgid "checkout our version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1560
 msgid "checkout their version for unmerged files"
 msgstr ""
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1564
 msgid "do not limit pathspecs to sparse entries only"
 msgstr ""
 
-#: builtin/checkout.c:1533
-msgid "-b, -B and --orphan are mutually exclusive"
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
 msgstr ""
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1626
 msgid "-p and --overlay are mutually exclusive"
 msgstr ""
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1663
 msgid "--track needs a branch name"
 msgstr ""
 
-#: builtin/checkout.c:1578
-msgid "missing branch name; try -b"
+#: builtin/checkout.c:1668
+#, c-format
+msgid "missing branch name; try -%c"
 msgstr ""
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1700
 #, c-format
 msgid "could not resolve %s"
 msgstr ""
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr ""
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1716
 msgid "invalid path specification"
 msgstr ""
 
-#: builtin/checkout.c:1638
+#: 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:1642
+#: builtin/checkout.c:1727
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr ""
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr ""
+
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr ""
+
+#: builtin/checkout.c:1752
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr ""
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
+#: builtin/checkout.c:1757
+msgid "you must specify path(s) to restore"
 msgstr ""
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
-#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: 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 ""
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1784
 msgid "create and checkout a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1786
 msgid "create/reset and checkout a branch"
 msgstr ""
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1787
 msgid "create reflog for new branch"
 msgstr ""
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1789
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr ""
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1790
 msgid "use overlay mode (default)"
 msgstr ""
 
-#: builtin/checkout.c:1743
+#: builtin/checkout.c:1835
 msgid "create and switch to a new branch"
 msgstr ""
 
-#: builtin/checkout.c:1745
+#: builtin/checkout.c:1837
 msgid "create/reset and switch to a branch"
 msgstr ""
 
-#: builtin/checkout.c:1747
+#: builtin/checkout.c:1839
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr ""
 
-#: builtin/checkout.c:1749
+#: builtin/checkout.c:1841
 msgid "throw away local modifications"
 msgstr ""
 
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1875
 msgid "which tree-ish to checkout from"
 msgstr ""
 
-#: builtin/checkout.c:1783
+#: builtin/checkout.c:1877
 msgid "restore the index"
 msgstr ""
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1879
 msgid "restore the working tree (default)"
 msgstr ""
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1881
 msgid "ignore unmerged entries"
 msgstr ""
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1882
 msgid "use overlay mode"
 msgstr ""
 
-#: builtin/clean.c:28
+#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr ""
 
-#: builtin/clean.c:32
-#, c-format
-msgid "Removing %s\n"
-msgstr ""
-
 #: builtin/clean.c:33
 #, c-format
-msgid "Would remove %s\n"
+msgid "Removing %s\n"
 msgstr ""
 
 #: builtin/clean.c:34
 #, c-format
-msgid "Skipping repository %s\n"
+msgid "Would remove %s\n"
 msgstr ""
 
 #: builtin/clean.c:35
 #, c-format
-msgid "Would skip repository %s\n"
+msgid "Skipping repository %s\n"
 msgstr ""
 
 #: builtin/clean.c:36
 #, c-format
-msgid "failed to remove %s"
+msgid "Would skip repository %s\n"
 msgstr ""
 
-#: builtin/clean.c:37
+#: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr ""
 
-#: builtin/clean.c:301 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10038,7 +11805,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr ""
 
-#: builtin/clean.c:305 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10051,38 +11818,33 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr ""
 
-#: 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 ""
 
-#: builtin/clean.c:663
+#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr ""
 
-#: builtin/clean.c:700
+#: builtin/clean.c:693
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr ""
 
-#: builtin/clean.c:721
+#: builtin/clean.c:714
 msgid "Select items to delete"
 msgstr ""
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr ""
 
-#: builtin/clean.c:787 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr ""
-
-#: builtin/clean.c:795
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10093,400 +11855,421 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr ""
 
-#: builtin/clean.c:822 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr ""
-
-#: builtin/clean.c:823 git-add--interactive.perl:1846
-msgid "What now"
-msgstr ""
-
-#: builtin/clean.c:831
+#: builtin/clean.c:822
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/clean.c:847
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr ""
 
-#: builtin/clean.c:909
+#: builtin/clean.c:900
 msgid "do not print names of files removed"
 msgstr ""
 
-#: builtin/clean.c:911
+#: builtin/clean.c:902
 msgid "force"
 msgstr ""
 
-#: builtin/clean.c:912
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr ""
 
-#: builtin/clean.c:914
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr ""
 
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: 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 ""
 
-#: builtin/clean.c:916
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr ""
 
-#: builtin/clean.c:917
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr ""
 
-#: builtin/clean.c:919
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr ""
 
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr ""
-
-#: builtin/clean.c:941
+#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 
-#: builtin/clean.c:944
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+msgstr ""
+
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr ""
 
-#: builtin/clone.c:92
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr ""
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr ""
 
-#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr ""
 
-#: builtin/clone.c:97
+#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr ""
 
-#: builtin/clone.c:99
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr ""
 
-#: builtin/clone.c:101
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr ""
 
-#: builtin/clone.c:103
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr ""
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr ""
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr ""
 
-#: builtin/clone.c:109
+#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr ""
 
-#: builtin/clone.c:110 builtin/init-db.c:486
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr ""
 
-#: builtin/clone.c:111 builtin/init-db.c:487
+#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr ""
 
-#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: 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 ""
 
-#: builtin/clone.c:117 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: 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 ""
 
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:320
+#: 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 ""
 
-#: builtin/clone.c:119
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr ""
 
-#: builtin/clone.c:121
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr ""
 
-#: builtin/clone.c:123
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr ""
 
-#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/pull.c:208
 msgid "depth"
 msgstr ""
 
-#: builtin/clone.c:125
+#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr ""
 
-#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/pull.c:211
 msgid "time"
 msgstr ""
 
-#: builtin/clone.c:127
+#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr ""
 
-#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
-#: builtin/rebase.c:1417
+#: 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 ""
 
-#: builtin/clone.c:129 builtin/fetch.c:172
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 
-#: builtin/clone.c:131
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
 msgid "clone only one branch, HEAD or --branch"
 msgstr ""
 
-#: builtin/clone.c:133
+#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 
-#: builtin/clone.c:135
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr ""
 
-#: builtin/clone.c:136 builtin/init-db.c:495
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr ""
 
-#: builtin/clone.c:137 builtin/init-db.c:496
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr ""
 
-#: builtin/clone.c:138
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr ""
 
-#: builtin/clone.c:139
+#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr ""
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:172
+#: 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 ""
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:173
+#: 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 ""
 
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
-#: builtin/push.c:573
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr ""
 
-#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
-#: builtin/push.c:575
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr ""
 
-#: builtin/clone.c:148
+#: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr ""
 
-#: builtin/clone.c:284
+#: builtin/clone.c:156
+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:337
+#: builtin/clone.c:345
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr ""
 
-#: builtin/clone.c:410
+#: builtin/clone.c:418
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr ""
 
-#: builtin/clone.c:427
+#: builtin/clone.c:436
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr ""
 
-#: builtin/clone.c:457
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to create link '%s'"
 msgstr ""
 
-#: builtin/clone.c:461
+#: builtin/clone.c:471
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr ""
 
-#: builtin/clone.c:466
+#: builtin/clone.c:476
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr ""
 
-#: builtin/clone.c:491
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr ""
 
-#: builtin/clone.c:505
+#: 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 ""
 
-#: builtin/clone.c:582
+#: builtin/clone.c:594
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr ""
 
-#: builtin/clone.c:701
+#: builtin/clone.c:713
 #, c-format
 msgid "unable to update %s"
 msgstr ""
 
-#: builtin/clone.c:751
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr ""
+
+#: builtin/clone.c:784
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 
-#: builtin/clone.c:782
+#: builtin/clone.c:816
 msgid "unable to checkout working tree"
 msgstr ""
 
-#: builtin/clone.c:832
+#: builtin/clone.c:894
 msgid "unable to write parameters to config file"
 msgstr ""
 
-#: builtin/clone.c:895
+#: builtin/clone.c:957
 msgid "cannot repack to clean up"
 msgstr ""
 
-#: builtin/clone.c:897
+#: builtin/clone.c:959
 msgid "cannot unlink temporary alternates file"
 msgstr ""
 
-#: builtin/clone.c:937 builtin/receive-pack.c:1948
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
 msgid "Too many arguments."
 msgstr ""
 
-#: builtin/clone.c:941
+#: builtin/clone.c:1005
 msgid "You must specify a repository to clone."
 msgstr ""
 
-#: builtin/clone.c:954
+#: builtin/clone.c:1018
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr ""
 
-#: builtin/clone.c:957
+#: builtin/clone.c:1021
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr ""
 
-#: builtin/clone.c:970
+#: builtin/clone.c:1035
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr ""
 
-#: builtin/clone.c:976 builtin/fetch.c:1790
+#: builtin/clone.c:1039 builtin/fetch.c:2014
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr ""
 
-#: builtin/clone.c:986
+#: builtin/clone.c:1049
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1055
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:1069
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr ""
 
-#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
-#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
+#: 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 ""
 
-#: builtin/clone.c:1016
+#: builtin/clone.c:1089
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr ""
 
-#: builtin/clone.c:1036
+#: builtin/clone.c:1109
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:1038
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr ""
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1135
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr ""
 
-#: builtin/clone.c:1123
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr ""
+
+#: builtin/clone.c:1229
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1125
+#: builtin/clone.c:1231
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1127
+#: builtin/clone.c:1233
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1129
+#: builtin/clone.c:1235
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1132
+#: builtin/clone.c:1240
 msgid "source repository is shallow, ignoring --local"
 msgstr ""
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr ""
 
-#: builtin/clone.c:1212 builtin/clone.c:1220
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr ""
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr ""
 
-#: builtin/clone.c:1223
+#: builtin/clone.c:1347
 msgid "You appear to have cloned an empty repository."
 msgstr ""
 
@@ -10503,25 +12286,124 @@ msgid "layout to use"
 msgstr ""
 
 #: builtin/column.c:30
-msgid "Maximum width"
+msgid "maximum width"
 msgstr ""
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
+msgid "padding space on left border"
 msgstr ""
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
+msgid "padding space on right border"
 msgstr ""
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
+msgid "padding space between columns"
 msgstr ""
 
 #: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr ""
 
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+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:1779
+msgid "dir"
+msgstr ""
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr ""
+
+#: builtin/commit-graph.c:83
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+
+#: builtin/commit-graph.c:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr ""
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr ""
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr ""
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr ""
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr ""
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr ""
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr ""
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:228
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:230
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:232
+msgid "only expire files older than a given date-time"
+msgstr ""
+
+#: builtin/commit-graph.c:234
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr ""
+
+#: builtin/commit-graph.c:255
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr ""
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -10533,7 +12415,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr ""
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
 #, c-format
 msgid "not a valid object name %s"
 msgstr ""
@@ -10561,13 +12443,13 @@ msgstr ""
 msgid "id of a parent commit object"
 msgstr ""
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: 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 ""
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
 msgid "commit message"
 msgstr ""
 
@@ -10575,8 +12457,8 @@ msgstr ""
 msgid "read commit log message from file"
 msgstr ""
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: 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 ""
 
@@ -10613,10 +12495,14 @@ msgid ""
 msgstr ""
 
 #: builtin/commit.c:63
-msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgid "Otherwise, please use 'git rebase --skip'\n"
 msgstr ""
 
 #: builtin/commit.c:66
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr ""
+
+#: builtin/commit.c:69
 msgid ""
 "and then use:\n"
 "\n"
@@ -10629,125 +12515,136 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/commit.c:315
+#: builtin/commit.c:324
 msgid "failed to unpack HEAD tree object"
 msgstr ""
 
-#: builtin/commit.c:356
+#: builtin/commit.c:360
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr ""
+
+#: builtin/commit.c:374
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+
+#: builtin/commit.c:386
 msgid "unable to create temporary index"
 msgstr ""
 
-#: builtin/commit.c:362
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr ""
 
-#: builtin/commit.c:376
+#: builtin/commit.c:410
 msgid "unable to update temporary index"
 msgstr ""
 
-#: builtin/commit.c:378
+#: builtin/commit.c:412
 msgid "Failed to update main cache tree"
 msgstr ""
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
 msgid "unable to write new_index file"
 msgstr ""
 
-#: builtin/commit.c:455
+#: builtin/commit.c:489
 msgid "cannot do a partial commit during a merge."
 msgstr ""
 
-#: builtin/commit.c:457
+#: builtin/commit.c:491
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr ""
 
-#: builtin/commit.c:465
+#: builtin/commit.c:493
+msgid "cannot do a partial commit during a rebase."
+msgstr ""
+
+#: builtin/commit.c:501
 msgid "cannot read the index"
 msgstr ""
 
-#: builtin/commit.c:484
+#: builtin/commit.c:520
 msgid "unable to write temporary index file"
 msgstr ""
 
-#: builtin/commit.c:582
+#: builtin/commit.c:618
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr ""
 
-#: builtin/commit.c:584
+#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr ""
 
-#: builtin/commit.c:603
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr ""
 
-#: builtin/commit.c:656
+#: builtin/commit.c:692
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr ""
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
 #, c-format
 msgid "could not lookup commit %s"
 msgstr ""
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:758 builtin/shortlog.c:413
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr ""
 
-#: builtin/commit.c:708
+#: builtin/commit.c:760
 msgid "could not read log from standard input"
 msgstr ""
 
-#: builtin/commit.c:712
+#: builtin/commit.c:764
 #, c-format
 msgid "could not read log file '%s'"
 msgstr ""
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr ""
+
+#: builtin/commit.c:813 builtin/commit.c:829
 msgid "could not read SQUASH_MSG"
 msgstr ""
 
-#: builtin/commit.c:750
+#: builtin/commit.c:820
 msgid "could not read MERGE_MSG"
 msgstr ""
 
-#: builtin/commit.c:810
+#: builtin/commit.c:880
 msgid "could not write commit template"
 msgstr ""
 
-#: builtin/commit.c:829
+#: builtin/commit.c:893
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
 msgstr ""
 
-#: builtin/commit.c:834
+#: builtin/commit.c:895
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"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:847
+#: builtin/commit.c:899
 #, 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:855
+#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -10755,600 +12652,608 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/commit.c:872
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/commit.c:947
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:880
+#: builtin/commit.c:955
 #, c-format
 msgid "%sDate:      %s"
 msgstr ""
 
-#: builtin/commit.c:887
+#: builtin/commit.c:962
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr ""
 
-#: builtin/commit.c:905
+#: builtin/commit.c:980
 msgid "Cannot read index"
 msgstr ""
 
-#: builtin/commit.c:972
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr ""
+
+#: builtin/commit.c:1065
 msgid "Error building trees"
 msgstr ""
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1079 builtin/tag.c:319
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr ""
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1123
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1137
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1155 builtin/commit.c:1448
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr ""
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1195
 msgid "--long and -z are incompatible"
 msgstr ""
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1226
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr ""
+
+#: builtin/commit.c:1228
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr ""
+
+#: 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 ""
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr ""
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr ""
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1268
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr ""
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr ""
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr ""
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1292
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr ""
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1310
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
+#: builtin/commit.c:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
 msgstr ""
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1352
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1483 builtin/commit.c:1652
 msgid "show status concisely"
 msgstr ""
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show branch information"
 msgstr ""
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1487
 msgid "show stash information"
 msgstr ""
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1489 builtin/commit.c:1656
 msgid "compute full ahead/behind values"
 msgstr ""
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1491
 msgid "version"
 msgstr ""
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
-#: builtin/worktree.c:650
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr ""
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1494 builtin/commit.c:1660
 msgid "show status in long format (default)"
 msgstr ""
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "terminate entries with NUL"
 msgstr ""
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
+#: 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 ""
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1504
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 
-#: builtin/commit.c:1362 parse-options.h:188
+#: builtin/commit.c:1506 parse-options.h:193
 msgid "when"
 msgstr ""
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1507
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1509
 msgid "list untracked files in columns"
 msgstr ""
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1510
 msgid "do not detect renames"
 msgstr ""
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1512
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1535
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1617
 msgid "suppress summary after successful commit"
 msgstr ""
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1618
 msgid "show diff in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1620
 msgid "Commit message options"
 msgstr ""
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
 msgid "read message from file"
 msgstr ""
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "author"
 msgstr ""
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "override author for commit"
 msgstr ""
 
-#: builtin/commit.c:1499 builtin/gc.c:538
+#: builtin/commit.c:1623 builtin/gc.c:550
 msgid "date"
 msgstr ""
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1623
 msgid "override date for commit"
 msgstr ""
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
 msgstr ""
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1625
 msgid "reuse and edit message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1626
 msgid "reuse message from specified commit"
 msgstr ""
 
-#: builtin/commit.c:1503
-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 ""
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1631
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
+msgstr ""
+
+#: builtin/commit.c:1632
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1633
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr ""
 
-#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
-msgid "add Signed-off-by:"
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
 msgstr ""
 
-#: builtin/commit.c:1507
+#: 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
+msgid "add a Signed-off-by trailer"
+msgstr ""
+
+#: builtin/commit.c:1636
 msgid "use specified template file"
 msgstr ""
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1637
 msgid "force edit of commit"
 msgstr ""
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1639
 msgid "include status in commit message template"
 msgstr ""
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1644
 msgid "Commit contents options"
 msgstr ""
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1645
 msgid "commit all changed files"
 msgstr ""
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1646
 msgid "add specified files to index for commit"
 msgstr ""
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1647
 msgid "interactively add files"
 msgstr ""
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1648
 msgid "interactively add changes"
 msgstr ""
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1649
 msgid "commit only specified files"
 msgstr ""
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1650
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1651
 msgid "show what would be committed"
 msgstr ""
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1664
 msgid "amend previous commit"
 msgstr ""
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1665
 msgid "bypass post-rewrite hook"
 msgstr ""
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1672
 msgid "ok to record an empty change"
 msgstr ""
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1674
 msgid "ok to record a change with an empty message"
 msgstr ""
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1750
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr ""
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1757
 msgid "could not read MERGE_MODE"
 msgstr ""
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1778
 #, c-format
 msgid "could not read commit message: %s"
 msgstr ""
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1785
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr ""
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1790
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr ""
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1801
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr ""
+
+#: 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 ""
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr ""
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr ""
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
-#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
-#: builtin/log.c:1585
-msgid "dir"
-msgstr ""
-
-#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
-#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
-msgid "The object directory to store the graph"
-msgstr ""
-
-#: builtin/commit-graph.c:58
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr ""
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:125
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr ""
-
-#: builtin/commit-graph.c:173
-msgid "start walk at all refs"
-msgstr ""
-
-#: builtin/commit-graph.c:175
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-
-#: builtin/commit-graph.c:177
-msgid "start walk at commits listed by stdin"
-msgstr ""
-
-#: builtin/commit-graph.c:179
-msgid "include all commits already in the commit-graph file"
-msgstr ""
-
-#: builtin/commit-graph.c:182
-msgid "allow writing an incremental commit-graph file"
-msgstr ""
-
-#: builtin/commit-graph.c:184 builtin/commit-graph.c:188
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:186
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr ""
-
-#: builtin/commit-graph.c:204
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr ""
-
 #: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr ""
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr ""
 
-#: builtin/config.c:115
+#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr ""
 
-#: builtin/config.c:124
+#: builtin/config.c:130
 msgid "Config file location"
 msgstr ""
 
-#: builtin/config.c:125
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr ""
 
-#: builtin/config.c:126
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr ""
 
-#: builtin/config.c:127
+#: builtin/config.c:133
 msgid "use repository config file"
 msgstr ""
 
-#: builtin/config.c:128
+#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr ""
 
-#: builtin/config.c:129
+#: builtin/config.c:135
 msgid "use given config file"
 msgstr ""
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr ""
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr ""
 
-#: builtin/config.c:131
+#: builtin/config.c:137
 msgid "Action"
 msgstr ""
 
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:135
+#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr ""
 
-#: builtin/config.c:136
-msgid "replace all matching variables: name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:137
+#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr ""
 
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
 msgstr ""
 
-#: builtin/config.c:140
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr ""
 
-#: builtin/config.c:141
+#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr ""
 
-#: builtin/config.c:142
+#: builtin/config.c:148
 msgid "list all"
 msgstr ""
 
-#: builtin/config.c:143
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr ""
 
-#: builtin/config.c:144
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr ""
 
-#: builtin/config.c:145
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr ""
 
-#: builtin/config.c:146
+#: builtin/config.c:153
 msgid "Type"
 msgstr ""
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr ""
 
-#: builtin/config.c:148
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr ""
 
-#: builtin/config.c:149
+#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr ""
 
-#: builtin/config.c:150
+#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr ""
 
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr ""
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr ""
 
-#: builtin/config.c:152
+#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr ""
 
-#: builtin/config.c:153
+#: builtin/config.c:161
 msgid "Other"
 msgstr ""
 
-#: builtin/config.c:154
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr ""
 
-#: builtin/config.c:155
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr ""
 
-#: builtin/config.c:156
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr ""
 
-#: builtin/config.c:157
+#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+
+#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr ""
 
-#: builtin/config.c:158
+#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr ""
 
-#: builtin/config.c:172
+#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr ""
 
-#: builtin/config.c:174
+#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr ""
 
-#: builtin/config.c:308
+#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr ""
 
-#: builtin/config.c:344
+#: builtin/config.c:377
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr ""
 
-#: builtin/config.c:401
+#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr ""
 
-#: builtin/config.c:443
+#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr ""
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr ""
 
-#: builtin/config.c:499
+#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr ""
 
-#: builtin/config.c:502
+#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr ""
 
-#: builtin/config.c:587
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -11358,81 +13263,89 @@ msgid ""
 "#\temail = %s\n"
 msgstr ""
 
-#: builtin/config.c:611
+#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr ""
 
-#: builtin/config.c:616
+#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr ""
 
-#: builtin/config.c:619
+#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr ""
 
-#: builtin/config.c:638
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr ""
 
-#: builtin/config.c:658
+#: builtin/config.c:708
 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 ""
 
-#: builtin/config.c:688
+#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr ""
 
-#: builtin/config.c:693
+#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr ""
 
-#: builtin/config.c:706
+#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr ""
 
-#: builtin/config.c:712
+#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 
-#: builtin/config.c:718
+#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr ""
 
-#: builtin/config.c:731
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr ""
 
-#: builtin/config.c:734
+#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr ""
 
-#: builtin/config.c:744
+#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr ""
 
-#: builtin/config.c:746
+#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr ""
 
-#: builtin/config.c:760
+#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr ""
 
-#: builtin/config.c:773
+#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr ""
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr ""
@@ -11445,6 +13358,32 @@ msgstr ""
 msgid "print sizes in human readable format"
 msgstr ""
 
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+msgstr ""
+
+#: builtin/credential-cache--daemon.c:316
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr ""
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr ""
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr ""
@@ -11453,210 +13392,223 @@ msgstr ""
 msgid "git describe [<options>] --dirty"
 msgstr ""
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "head"
 msgstr ""
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr ""
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr ""
 
-#: builtin/describe.c:275
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr ""
 
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr ""
-
 #: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
+msgid "tag '%s' is externally known as '%s'"
 msgstr ""
 
-#: builtin/describe.c:325
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr ""
 
-#: builtin/describe.c:327
+#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 
-#: builtin/describe.c:381
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr ""
 
-#: builtin/describe.c:407
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
 
-#: builtin/describe.c:411
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
 
-#: builtin/describe.c:441
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr ""
 
-#: builtin/describe.c:444
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr ""
 
-#: builtin/describe.c:512
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr ""
 
-#: builtin/describe.c:515
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr ""
 
-#: builtin/describe.c:523
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr ""
 
-#: builtin/describe.c:537
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr ""
 
-#: builtin/describe.c:538
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr ""
 
-#: builtin/describe.c:539
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr ""
 
-#: builtin/describe.c:540
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr ""
 
-#: builtin/describe.c:541
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr ""
 
-#: builtin/describe.c:542
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr ""
 
-#: builtin/describe.c:545
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr ""
 
-#: builtin/describe.c:547
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr ""
 
-#: builtin/describe.c:549
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr ""
 
-#: builtin/describe.c:551
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr ""
 
-#: builtin/describe.c:553 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr ""
 
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr ""
 
-#: builtin/describe.c:555
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 
-#: builtin/describe.c:558
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 
-#: builtin/describe.c:576
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
 msgstr ""
 
-#: builtin/describe.c:605
+#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr ""
 
-#: builtin/describe.c:656
+#: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
 msgstr ""
 
-#: builtin/describe.c:658
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr ""
 
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr ""
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr ""
+
+#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr ""
 
-#: builtin/diff.c:235
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr ""
 
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr ""
+
+#: builtin/diff.c:486
 msgid "Not a git repository"
 msgstr ""
 
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr ""
 
-#: builtin/diff.c:403
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr ""
 
-#: builtin/diff.c:408
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr ""
 
-#: builtin/difftool.c:30
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr ""
+
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 
-#: builtin/difftool.c:260
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
 msgstr ""
 
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink %s"
 msgstr ""
 
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
 #, c-format
 msgid "could not read symlink file %s"
 msgstr ""
 
-#: builtin/difftool.c:312
+#: builtin/difftool.c:313
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr ""
@@ -11667,83 +13619,83 @@ msgid ""
 "directory diff mode('-d' and '--dir-diff')."
 msgstr ""
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr ""
 
-#: builtin/difftool.c:636
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr ""
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr ""
 
-#: builtin/difftool.c:648
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr ""
 
-#: builtin/difftool.c:697
+#: builtin/difftool.c:699
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr ""
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:701
 msgid "perform a full-directory diff"
 msgstr ""
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:703
 msgid "do not prompt before launching a diff tool"
 msgstr ""
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:708
 msgid "use symlinks in dir-diff mode"
 msgstr ""
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:709
 msgid "tool"
 msgstr ""
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:710
 msgid "use the specified diff tool"
 msgstr ""
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:712
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr ""
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:715
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr ""
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:718
 msgid "specify a custom command for viewing diffs"
 msgstr ""
 
-#: builtin/difftool.c:717
+#: builtin/difftool.c:719
 msgid "passed to `diff`"
 msgstr ""
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:734
 msgid "difftool requires worktree or --no-index"
 msgstr ""
 
-#: builtin/difftool.c:739
+#: builtin/difftool.c:741
 msgid "--dir-diff is incompatible with --no-index"
 msgstr ""
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:744
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr ""
 
-#: builtin/difftool.c:750
+#: builtin/difftool.c:752
 msgid "no <tool> given for --tool=<tool>"
 msgstr ""
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:759
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr ""
 
@@ -11751,24 +13703,24 @@ msgstr ""
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr ""
 
-#: builtin/env--helper.c:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
 msgid "type"
 msgstr ""
 
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr ""
 
-#: builtin/env--helper.c:43
+#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr ""
 
-#: builtin/env--helper.c:62
+#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
 
-#: builtin/env--helper.c:77
+#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -11779,275 +13731,350 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr ""
 
-#: builtin/fast-export.c:852
+#: builtin/fast-export.c:868
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr ""
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr ""
 
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr ""
 
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
 msgid "select handling of tags that tag filtered objects"
 msgstr ""
 
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
 msgstr ""
 
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
 msgstr ""
 
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
 msgstr ""
 
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
 msgstr ""
 
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
 msgstr ""
 
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
 msgstr ""
 
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
 msgstr ""
 
-#: builtin/fast-export.c:1177 builtin/log.c:1633
+#: builtin/fast-export.c:1222 builtin/log.c:1826
 msgid "refspec"
 msgstr ""
 
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
 msgstr ""
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr ""
 
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
 msgstr ""
 
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
 msgstr ""
 
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
 
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr ""
+
+#: builtin/fast-export.c:1233
+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/fetch.c:34
-msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
 msgstr ""
 
 #: builtin/fetch.c:35
-msgid "git fetch [<options>] <group>"
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
 #: builtin/fetch.c:36
-msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgid "git fetch [<options>] <group>"
 msgstr ""
 
 #: builtin/fetch.c:37
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr ""
+
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr ""
 
-#: builtin/fetch.c:115
+#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr ""
 
-#: builtin/fetch.c:138 builtin/pull.c:204
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr ""
 
-#: builtin/fetch.c:140 builtin/pull.c:248
+#: builtin/fetch.c:147 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
 msgstr ""
 
-#: builtin/fetch.c:142 builtin/pull.c:207
+#: builtin/fetch.c:149 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr ""
 
-#: builtin/fetch.c:144 builtin/pull.c:210
+#: builtin/fetch.c:151
+msgid "use atomic transaction to update references"
+msgstr ""
+
+#: builtin/fetch.c:153 builtin/pull.c:191
 msgid "path to upload pack on remote end"
 msgstr ""
 
-#: builtin/fetch.c:145
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr ""
 
-#: builtin/fetch.c:147
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr ""
 
-#: builtin/fetch.c:149 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr ""
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr ""
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr ""
 
-#: builtin/fetch.c:155 builtin/pull.c:217
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+
+#: builtin/fetch.c:166 builtin/pull.c:198
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 
-#: builtin/fetch.c:157
+#: builtin/fetch.c:168
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 
-#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr ""
 
-#: builtin/fetch.c:159
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
 msgstr ""
 
-#: builtin/fetch.c:163 builtin/pull.c:225
+#: builtin/fetch.c:175
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr ""
+
+#: builtin/fetch.c:176 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr ""
 
-#: builtin/fetch.c:165
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr ""
 
-#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr ""
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:183 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 
-#: builtin/fetch.c:176 builtin/pull.c:231
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr ""
 
-#: builtin/fetch.c:179
+#: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
 msgstr ""
 
-#: builtin/fetch.c:182
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr ""
 
-#: builtin/fetch.c:186 builtin/pull.c:234
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr ""
 
-#: builtin/fetch.c:187 builtin/pull.c:236
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr ""
 
-#: builtin/fetch.c:188 builtin/pull.c:237
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr ""
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:208 builtin/pull.c:240
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 
-#: builtin/fetch.c:198
-msgid "run 'gc --auto' after fetching"
+#: 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 ""
 
-#: builtin/fetch.c:200 builtin/pull.c:246
+#: builtin/fetch.c:217 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr ""
 
-#: builtin/fetch.c:510
+#: builtin/fetch.c:219
+msgid "write the commit-graph after fetching"
+msgstr ""
+
+#: builtin/fetch.c:221
+msgid "accept refspecs from stdin"
+msgstr ""
+
+#: builtin/fetch.c:586
 msgid "Couldn't find remote ref HEAD"
 msgstr ""
 
-#: builtin/fetch.c:650
+#: builtin/fetch.c:757
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr ""
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:856
 #, c-format
 msgid "object %s not found"
 msgstr ""
 
-#: builtin/fetch.c:752
+#: builtin/fetch.c:860
 msgid "[up to date]"
 msgstr ""
 
-#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr ""
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:874
 msgid "can't fetch in current branch"
 msgstr ""
 
-#: builtin/fetch.c:776
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr ""
 
-#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
-#: builtin/fetch.c:848
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
 msgid "unable to update local ref"
 msgstr ""
 
-#: builtin/fetch.c:781
+#: builtin/fetch.c:889
 msgid "would clobber existing tag"
 msgstr ""
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr ""
 
-#: builtin/fetch.c:806
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr ""
 
-#: builtin/fetch.c:809
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr ""
 
-#: builtin/fetch.c:848
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr ""
 
-#: builtin/fetch.c:853
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
 msgstr ""
 
-#: builtin/fetch.c:874
+#: 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:878
+#: builtin/fetch.c:1069
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -12056,169 +14083,189 @@ msgid ""
 " to avoid this check.\n"
 msgstr ""
 
-#: builtin/fetch.c:908
+#: builtin/fetch.c:1101
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr ""
 
-#: builtin/fetch.c:929
+#: builtin/fetch.c:1129
 #, 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:1020 builtin/fetch.c:1157
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr ""
 
-#: builtin/fetch.c:1031
+#: 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 ""
 
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1327
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:1128
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr ""
 
-#: builtin/fetch.c:1160
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr ""
 
-#: builtin/fetch.c:1161 builtin/remote.c:1036
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr ""
 
-#: builtin/fetch.c:1184
+#: builtin/fetch.c:1384
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 
-#: builtin/fetch.c:1203
+#: builtin/fetch.c:1403
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr ""
 
-#: builtin/fetch.c:1206
+#: builtin/fetch.c:1406
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1414
-msgid "multiple branch detected, incompatible with --set-upstream"
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr ""
 
-#: builtin/fetch.c:1429
+#: builtin/fetch.c:1633
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr ""
 
-#: builtin/fetch.c:1431
+#: builtin/fetch.c:1635
 msgid "not setting upstream for a remote tag"
 msgstr ""
 
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1637
 msgid "unknown branch type"
 msgstr ""
 
-#: builtin/fetch.c:1435
+#: 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:1561 builtin/fetch.c:1623
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr ""
 
-#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr ""
 
-#: builtin/fetch.c:1583
+#: builtin/fetch.c:1790
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr ""
 
-#: builtin/fetch.c:1685
+#: 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:1722
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr ""
 
-#: builtin/fetch.c:1774
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr ""
+
+#: builtin/fetch.c:1998
 msgid "Negative depth in --deepen is not supported"
 msgstr ""
 
-#: builtin/fetch.c:1776
+#: builtin/fetch.c:2000
 msgid "--deepen and --depth are mutually exclusive"
 msgstr ""
 
-#: builtin/fetch.c:1781
+#: builtin/fetch.c:2005
 msgid "--depth and --unshallow cannot be used together"
 msgstr ""
 
-#: builtin/fetch.c:1783
+#: builtin/fetch.c:2007
 msgid "--unshallow on a complete repository does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:1799
+#: builtin/fetch.c:2024
 msgid "fetch --all does not take a repository argument"
 msgstr ""
 
-#: builtin/fetch.c:1801
+#: builtin/fetch.c:2026
 msgid "fetch --all does not make sense with refspecs"
 msgstr ""
 
-#: builtin/fetch.c:1810
+#: builtin/fetch.c:2035
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr ""
 
-#: builtin/fetch.c:1817
+#: builtin/fetch.c:2042
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 
-#: builtin/fetch.c:1835
+#: 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/fmt-merge-msg.c:18
+#: 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 ""
+
+#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 msgid "populate log with at most <n> entries from shortlog"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr ""
 
@@ -12231,323 +14278,339 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr ""
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
 msgstr ""
 
 #: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr ""
 
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
 msgstr ""
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr ""
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr ""
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr ""
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr ""
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
 msgid "respect format colors"
 msgstr ""
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr ""
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr ""
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
 msgstr ""
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
 msgstr ""
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
 msgstr ""
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr ""
+
+#: builtin/for-each-repo.c:34
+msgid "config"
+msgstr ""
+
+#: builtin/for-each-repo.c:35
+msgid "config key storing a list of repository paths"
+msgstr ""
+
+#: builtin/for-each-repo.c:43
+msgid "missing --config=<config>"
+msgstr ""
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
 msgstr ""
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr ""
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr ""
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr ""
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr ""
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr ""
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr ""
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr ""
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr ""
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr ""
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr ""
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr ""
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr ""
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr ""
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr ""
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr ""
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr ""
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr ""
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr ""
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr ""
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:606
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr ""
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:619
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr ""
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:639
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr ""
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:654
 msgid "Checking object directory"
 msgstr ""
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:657
 msgid "Checking object directories"
 msgstr ""
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:672
 #, c-format
 msgid "Checking %s link"
 msgstr ""
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:677 builtin/index-pack.c:864
 #, c-format
 msgid "invalid %s"
 msgstr ""
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:684
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr ""
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:690
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr ""
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:694
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr ""
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:706
 msgid "Checking cache tree"
 msgstr ""
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:711
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:720
 msgid "non-tree in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:751
 msgid "git fsck [<options>] [<object>...]"
 msgstr ""
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:757
 msgid "show unreachable objects"
 msgstr ""
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:758
 msgid "show dangling objects"
 msgstr ""
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:759
 msgid "report tags"
 msgstr ""
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:760
 msgid "report root nodes"
 msgstr ""
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:761
 msgid "make index objects head nodes"
 msgstr ""
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:762
 msgid "make reflogs head nodes (default)"
 msgstr ""
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:763
 msgid "also consider packs and alternate objects"
 msgstr ""
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:764
 msgid "check only connectivity"
 msgstr ""
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:765 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr ""
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:767
 msgid "write dangling objects in .git/lost-found"
 msgstr ""
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:768 builtin/prune.c:134
 msgid "show progress"
 msgstr ""
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:769
 msgid "show verbose names for reachable objects"
 msgstr ""
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:828 builtin/index-pack.c:262
 msgid "Checking objects"
 msgstr ""
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:856
 #, c-format
 msgid "%s: object missing"
 msgstr ""
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:867
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr ""
 
-#: builtin/gc.c:35
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr ""
 
-#: builtin/gc.c:90
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr ""
 
-#: builtin/gc.c:126
+#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr ""
 
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr ""
 
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
 #, c-format
 msgid "cannot read '%s'"
 msgstr ""
 
-#: builtin/gc.c:491
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -12557,72 +14620,231 @@ msgid ""
 "%s"
 msgstr ""
 
-#: builtin/gc.c:539
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
 msgstr ""
 
-#: builtin/gc.c:541
+#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr ""
 
-#: builtin/gc.c:542
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr ""
 
-#: builtin/gc.c:545
+#: builtin/gc.c:557
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 
-#: builtin/gc.c:548
+#: builtin/gc.c:560
 msgid "repack all other packs except the largest pack"
 msgstr ""
 
-#: builtin/gc.c:565
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr ""
 
-#: builtin/gc.c:576
+#: builtin/gc.c:587
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr ""
 
-#: builtin/gc.c:596
+#: builtin/gc.c:607
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 
-#: builtin/gc.c:598
+#: builtin/gc.c:609
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr ""
 
-#: builtin/gc.c:599
+#: builtin/gc.c:610
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr ""
 
-#: builtin/gc.c:639
+#: builtin/gc.c:650
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
 msgstr ""
 
-#: builtin/gc.c:694
+#: builtin/gc.c:705
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 
-#: builtin/grep.c:29
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr ""
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr ""
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr ""
+
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr ""
+
+#: builtin/gc.c:1022
+msgid "failed to start 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr ""
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr ""
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr ""
+
+#: builtin/gc.c:1179
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+
+#: builtin/gc.c:1283
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr ""
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr ""
+
+#: builtin/gc.c:1395
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr ""
+
+#: builtin/gc.c:1400
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr ""
+
+#: builtin/gc.c:1415
+msgid "run tasks based on the state of the repository"
+msgstr ""
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr ""
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr ""
+
+#: builtin/gc.c:1420
+msgid "do not report progress or other information over stderr"
+msgstr ""
+
+#: builtin/gc.c:1421
+msgid "task"
+msgstr ""
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr ""
+
+#: builtin/gc.c:1439
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+
+#: builtin/gc.c:1482
+msgid "failed to run 'git config'"
+msgstr ""
+
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr ""
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr ""
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr ""
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr ""
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
+msgstr ""
+
+#: 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:1896
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1900
+msgid "failed to open stdin of 'crontab'"
+msgstr ""
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr ""
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr ""
+
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 
-#: builtin/grep.c:225
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr ""
 
-#: builtin/grep.c:279
+#: builtin/grep.c:277
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr ""
@@ -12631,258 +14853,258 @@ msgstr ""
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: 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 ""
 
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr ""
 
-#: builtin/grep.c:650
+#: builtin/grep.c:658
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr ""
 
-#: builtin/grep.c:716
+#: builtin/grep.c:738
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr ""
 
-#: builtin/grep.c:815
+#: builtin/grep.c:837
 msgid "search in index instead of in the work tree"
 msgstr ""
 
-#: builtin/grep.c:817
+#: builtin/grep.c:839
 msgid "find in contents not managed by git"
 msgstr ""
 
-#: builtin/grep.c:819
+#: builtin/grep.c:841
 msgid "search in both tracked and untracked files"
 msgstr ""
 
-#: builtin/grep.c:821
+#: builtin/grep.c:843
 msgid "ignore files specified via '.gitignore'"
 msgstr ""
 
-#: builtin/grep.c:823
+#: builtin/grep.c:845
 msgid "recursively search in each submodule"
 msgstr ""
 
-#: builtin/grep.c:826
+#: builtin/grep.c:848
 msgid "show non-matching lines"
 msgstr ""
 
-#: builtin/grep.c:828
+#: builtin/grep.c:850
 msgid "case insensitive matching"
 msgstr ""
 
-#: builtin/grep.c:830
+#: builtin/grep.c:852
 msgid "match patterns only at word boundaries"
 msgstr ""
 
-#: builtin/grep.c:832
+#: builtin/grep.c:854
 msgid "process binary files as text"
 msgstr ""
 
-#: builtin/grep.c:834
+#: builtin/grep.c:856
 msgid "don't match patterns in binary files"
 msgstr ""
 
-#: builtin/grep.c:837
+#: builtin/grep.c:859
 msgid "process binary files with textconv filters"
 msgstr ""
 
-#: builtin/grep.c:839
+#: builtin/grep.c:861
 msgid "search in subdirectories (default)"
 msgstr ""
 
-#: builtin/grep.c:841
+#: builtin/grep.c:863
 msgid "descend at most <depth> levels"
 msgstr ""
 
-#: builtin/grep.c:845
+#: builtin/grep.c:867
 msgid "use extended POSIX regular expressions"
 msgstr ""
 
-#: builtin/grep.c:848
+#: builtin/grep.c:870
 msgid "use basic POSIX regular expressions (default)"
 msgstr ""
 
-#: builtin/grep.c:851
+#: builtin/grep.c:873
 msgid "interpret patterns as fixed strings"
 msgstr ""
 
-#: builtin/grep.c:854
+#: builtin/grep.c:876
 msgid "use Perl-compatible regular expressions"
 msgstr ""
 
-#: builtin/grep.c:857
+#: builtin/grep.c:879
 msgid "show line numbers"
 msgstr ""
 
-#: builtin/grep.c:858
+#: builtin/grep.c:880
 msgid "show column number of first match"
 msgstr ""
 
-#: builtin/grep.c:859
+#: builtin/grep.c:881
 msgid "don't show filenames"
 msgstr ""
 
-#: builtin/grep.c:860
+#: builtin/grep.c:882
 msgid "show filenames"
 msgstr ""
 
-#: builtin/grep.c:862
+#: builtin/grep.c:884
 msgid "show filenames relative to top directory"
 msgstr ""
 
-#: builtin/grep.c:864
+#: builtin/grep.c:886
 msgid "show only filenames instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:866
+#: builtin/grep.c:888
 msgid "synonym for --files-with-matches"
 msgstr ""
 
-#: builtin/grep.c:869
+#: builtin/grep.c:891
 msgid "show only the names of files without match"
 msgstr ""
 
-#: builtin/grep.c:871
+#: builtin/grep.c:893
 msgid "print NUL after filenames"
 msgstr ""
 
-#: builtin/grep.c:874
+#: builtin/grep.c:896
 msgid "show only matching parts of a line"
 msgstr ""
 
-#: builtin/grep.c:876
+#: builtin/grep.c:898
 msgid "show the number of matches instead of matching lines"
 msgstr ""
 
-#: builtin/grep.c:877
+#: builtin/grep.c:899
 msgid "highlight matches"
 msgstr ""
 
-#: builtin/grep.c:879
+#: builtin/grep.c:901
 msgid "print empty line between matches from different files"
 msgstr ""
 
-#: builtin/grep.c:881
+#: builtin/grep.c:903
 msgid "show filename only once above matches from same file"
 msgstr ""
 
-#: builtin/grep.c:884
+#: builtin/grep.c:906
 msgid "show <n> context lines before and after matches"
 msgstr ""
 
-#: builtin/grep.c:887
+#: builtin/grep.c:909
 msgid "show <n> context lines before matches"
 msgstr ""
 
-#: builtin/grep.c:889
+#: builtin/grep.c:911
 msgid "show <n> context lines after matches"
 msgstr ""
 
-#: builtin/grep.c:891
+#: builtin/grep.c:913
 msgid "use <n> worker threads"
 msgstr ""
 
-#: builtin/grep.c:892
+#: builtin/grep.c:914
 msgid "shortcut for -C NUM"
 msgstr ""
 
-#: builtin/grep.c:895
+#: builtin/grep.c:917
 msgid "show a line with the function name before matches"
 msgstr ""
 
-#: builtin/grep.c:897
+#: builtin/grep.c:919
 msgid "show the surrounding function"
 msgstr ""
 
-#: builtin/grep.c:900
+#: builtin/grep.c:922
 msgid "read patterns from file"
 msgstr ""
 
-#: builtin/grep.c:902
+#: builtin/grep.c:924
 msgid "match <pattern>"
 msgstr ""
 
-#: builtin/grep.c:904
+#: builtin/grep.c:926
 msgid "combine patterns specified with -e"
 msgstr ""
 
-#: builtin/grep.c:916
+#: builtin/grep.c:938
 msgid "indicate hit with exit status without output"
 msgstr ""
 
-#: builtin/grep.c:918
+#: builtin/grep.c:940
 msgid "show only matches from files that match all patterns"
 msgstr ""
 
-#: builtin/grep.c:920
-msgid "show parse tree for grep expression"
-msgstr ""
-
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "pager"
 msgstr ""
 
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "show matching files in the pager"
 msgstr ""
 
-#: builtin/grep.c:928
+#: builtin/grep.c:947
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr ""
 
-#: builtin/grep.c:992
+#: builtin/grep.c:1013
 msgid "no pattern given"
 msgstr ""
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1049
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr ""
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1057
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr ""
 
-#: builtin/grep.c:1067
+#: builtin/grep.c:1087
+msgid "--untracked not supported with --recurse-submodules"
+msgstr ""
+
+#: builtin/grep.c:1091
 msgid "invalid option combination, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
 msgid "no threads support, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr ""
 
-#: builtin/grep.c:1096
+#: builtin/grep.c:1131
 msgid "--open-files-in-pager only works on the worktree"
 msgstr ""
 
-#: builtin/grep.c:1119
-msgid "option not supported with --recurse-submodules"
+#: builtin/grep.c:1157
+msgid "--cached or --untracked cannot be used with --no-index"
 msgstr ""
 
-#: builtin/grep.c:1125
-msgid "--cached or --untracked cannot be used with --no-index"
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
 msgstr ""
 
-#: builtin/grep.c:1131
+#: builtin/grep.c:1166
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 
-#: builtin/grep.c:1139
+#: builtin/grep.c:1174
 msgid "both --cached and trees are given"
 msgstr ""
 
@@ -12921,504 +15143,552 @@ msgstr ""
 msgid "process file as it were from this path"
 msgstr ""
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr ""
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr ""
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr ""
 
-#: builtin/help.c:49
+#: builtin/help.c:50
 msgid "print all configuration variable names"
 msgstr ""
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr ""
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr ""
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr ""
 
-#: builtin/help.c:56
+#: builtin/help.c:57
 msgid "print command description"
 msgstr ""
 
-#: builtin/help.c:61
+#: builtin/help.c:62
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr ""
 
-#: builtin/help.c:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr ""
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr ""
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr ""
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr ""
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr ""
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr ""
 
-#: builtin/help.c:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr ""
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr ""
 
-#: builtin/help.c:367
+#: builtin/help.c:452
 msgid "no man viewer handled the request"
 msgstr ""
 
-#: builtin/help.c:375
+#: builtin/help.c:459
 msgid "no info viewer handled the request"
 msgstr ""
 
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr ""
 
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:531 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr ""
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:561 builtin/help.c:591
 #, c-format
 msgid "usage: %s%s"
 msgstr ""
 
-#: builtin/help.c:491
+#: builtin/help.c:575
 msgid "'git help config' for more information"
 msgstr ""
 
-#: builtin/index-pack.c:185
+#: builtin/index-pack.c:222
 #, c-format
 msgid "object type mismatch at %s"
 msgstr ""
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:242
 #, c-format
 msgid "did not receive expected object %s"
 msgstr ""
 
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:245
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr ""
 
-#: builtin/index-pack.c:258
+#: builtin/index-pack.c:295
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:305
 msgid "early EOF"
 msgstr ""
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:306
 msgid "read error on input"
 msgstr ""
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:318
 msgid "used more bytes than were available"
 msgstr ""
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:325 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr ""
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr ""
 
-#: builtin/index-pack.c:312
+#: 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:326
+#: builtin/index-pack.c:363
 msgid "pack signature mismatch"
 msgstr ""
 
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:365
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr ""
 
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:381
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr ""
 
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:487
 #, c-format
 msgid "inflate returned %d"
 msgstr ""
 
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:536
 msgid "offset value overflow for delta base object"
 msgstr ""
 
-#: builtin/index-pack.c:523
+#: builtin/index-pack.c:544
 msgid "delta base offset is out of bound"
 msgstr ""
 
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:552
 #, c-format
 msgid "unknown object type %d"
 msgstr ""
 
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:583
 msgid "cannot pread pack file"
 msgstr ""
 
-#: builtin/index-pack.c:564
+#: 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] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:611
 msgid "serious inflate inconsistency"
 msgstr ""
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: 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 ""
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: 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 ""
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr ""
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:831
 #, c-format
 msgid "cannot read existing object %s"
 msgstr ""
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:845
 #, c-format
 msgid "invalid blob object %s"
 msgstr ""
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
 msgid "fsck error in packed object"
 msgstr ""
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:869
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr ""
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
 msgid "failed to apply delta"
 msgstr ""
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Receiving objects"
 msgstr ""
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Indexing objects"
 msgstr ""
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1194
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr ""
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1199
 msgid "cannot fstat packfile"
 msgstr ""
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1202
 msgid "pack has junk at the end"
 msgstr ""
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1214
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr ""
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1237
 msgid "Resolving deltas"
 msgstr ""
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
 #, c-format
 msgid "unable to create thread: %s"
 msgstr ""
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1281
 msgid "confusion beyond insanity"
 msgstr ""
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1287
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr ""
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1303
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1327
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr ""
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr ""
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1444
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
+msgid "packfile name '%s' does not end with '.%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1468
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1476
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1502
 msgid "error while closing pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1516
 msgid "cannot store pack file"
 msgstr ""
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1524
 msgid "cannot store index file"
 msgstr ""
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr ""
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1649
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1651
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1699
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1706
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1748
 msgid "Cannot come back to cwd"
 msgstr ""
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: 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 ""
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1850
 msgid "--fix-thin cannot be used without --stdin"
 msgstr ""
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1852
 msgid "--stdin requires a git repository"
 msgstr ""
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1869
 msgid "--verify with no packfile name given"
 msgstr ""
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr ""
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr ""
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr ""
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr ""
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr ""
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr ""
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr ""
 
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr ""
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr ""
 
-#: builtin/init-db.c:334
+#: builtin/init-db.c:263
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr ""
+
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr ""
 
-#: builtin/init-db.c:337
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr ""
 
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:373
+msgid "attempt to reinitialize repository with different hash"
+msgstr ""
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr ""
 
-#: builtin/init-db.c:413
+#: builtin/init-db.c:432
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr ""
+
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr ""
 
-#: builtin/init-db.c:414
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr ""
 
-#: builtin/init-db.c:418
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr ""
 
-#: builtin/init-db.c:419
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr ""
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
 msgstr ""
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr ""
 
-#: builtin/init-db.c:492
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr ""
 
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: builtin/init-db.c:551
+msgid "override the name of the initial branch"
+msgstr ""
+
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr ""
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr ""
+
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr ""
 
-#: builtin/init-db.c:538
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr ""
 
-#: builtin/init-db.c:559
+#: 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:587
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr ""
 
+#: builtin/init-db.c:684
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr ""
+
 #: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -13465,10 +15735,6 @@ msgstr ""
 msgid "do not treat --- specially"
 msgstr ""
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr ""
-
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr ""
@@ -13481,497 +15747,529 @@ msgstr ""
 msgid "no input file given for in-place editing"
 msgstr ""
 
-#: builtin/log.c:55
+#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 
-#: builtin/log.c:56
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr ""
 
-#: builtin/log.c:109
+#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr ""
 
-#: builtin/log.c:173
+#: builtin/log.c:180
 msgid "show source"
 msgstr ""
 
-#: builtin/log.c:174
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
 msgstr ""
 
-#: builtin/log.c:176
+#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr ""
 
-#: builtin/log.c:178
+#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr ""
 
-#: builtin/log.c:179
+#: builtin/log.c:187
 msgid "decorate options"
 msgstr ""
 
-#: builtin/log.c:182
-msgid "Process line range n,m in file, counting from 1"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
 msgstr ""
 
-#: builtin/log.c:280
+#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr ""
 
-#: builtin/log.c:534
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr ""
 
-#: builtin/log.c:549 builtin/log.c:644
+#: builtin/log.c:586 builtin/log.c:676
 #, c-format
 msgid "could not read object %s"
 msgstr ""
 
-#: builtin/log.c:669
+#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr ""
 
-#: builtin/log.c:792
-msgid "format.headers without value"
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
 msgstr ""
 
-#: builtin/log.c:909
-msgid "name of output directory is too long"
+#: builtin/log.c:853
+msgid "format.headers without value"
 msgstr ""
 
-#: builtin/log.c:925
+#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr ""
 
-#: builtin/log.c:942
+#: builtin/log.c:999
 msgid "need exactly one range"
 msgstr ""
 
-#: builtin/log.c:952
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr ""
 
-#: builtin/log.c:1075
+#: builtin/log.c:1173
 msgid "cover letter needs email format"
 msgstr ""
 
-#: builtin/log.c:1081
+#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
 msgstr ""
 
-#: builtin/log.c:1160
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr ""
 
-#: builtin/log.c:1187
+#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr ""
 
-#: builtin/log.c:1245
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr ""
 
-#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
 #, c-format
 msgid "unknown commit %s"
 msgstr ""
 
-#: builtin/log.c:1366 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 ""
 
-#: builtin/log.c:1371
+#: builtin/log.c:1522
 msgid "could not find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1375
+#: 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"
 "Or you could specify base commit by --base=<base-commit-id> manually"
 msgstr ""
 
-#: builtin/log.c:1395
+#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1406
+#: builtin/log.c:1572
 msgid "base commit should be the ancestor of revision list"
 msgstr ""
 
-#: builtin/log.c:1410
+#: builtin/log.c:1582
 msgid "base commit shouldn't be in revision list"
 msgstr ""
 
-#: builtin/log.c:1463
+#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr ""
 
-#: builtin/log.c:1515
-msgid "failed to infer range-diff ranges"
+#: builtin/log.c:1703
+msgid "failed to infer range-diff origin of current series"
+msgstr ""
+
+#: builtin/log.c:1705
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 
-#: builtin/log.c:1560
+#: builtin/log.c:1749
 msgid "use [PATCH n/m] even with a single patch"
 msgstr ""
 
-#: builtin/log.c:1563
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr ""
 
-#: builtin/log.c:1567
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr ""
 
-#: builtin/log.c:1569
+#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr ""
 
-#: builtin/log.c:1571
+#: builtin/log.c:1760
 msgid "use simple number sequence for output file names"
 msgstr ""
 
-#: builtin/log.c:1572
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr ""
 
-#: builtin/log.c:1573
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr ""
 
-#: builtin/log.c:1575
+#: builtin/log.c:1764
 msgid "start numbering patches at <n> instead of 1"
 msgstr ""
 
-#: builtin/log.c:1577
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr ""
+
+#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr ""
 
-#: builtin/log.c:1579
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/log.c:1768
+msgid "max length of output filename"
 msgstr ""
 
-#: builtin/log.c:1582
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1585
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr ""
+
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr ""
+
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr ""
 
-#: builtin/log.c:1588
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr ""
 
-#: builtin/log.c:1591
+#: builtin/log.c:1785
 msgid "don't output binary diffs"
 msgstr ""
 
-#: builtin/log.c:1593
+#: builtin/log.c:1787
 msgid "output all-zero hash in From header"
 msgstr ""
 
-#: builtin/log.c:1595
+#: builtin/log.c:1789
 msgid "don't include a patch matching a commit upstream"
 msgstr ""
 
-#: builtin/log.c:1597
+#: builtin/log.c:1791
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 
-#: builtin/log.c:1599
+#: builtin/log.c:1793
 msgid "Messaging"
 msgstr ""
 
-#: builtin/log.c:1600
+#: builtin/log.c:1794
 msgid "header"
 msgstr ""
 
-#: builtin/log.c:1601
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr ""
 
-#: builtin/log.c:1602 builtin/log.c:1604
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr ""
 
-#: builtin/log.c:1602
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr ""
 
-#: builtin/log.c:1604
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr ""
 
-#: builtin/log.c:1606
+#: builtin/log.c:1798
 msgid "ident"
 msgstr ""
 
-#: builtin/log.c:1607
+#: builtin/log.c:1799
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 
-#: builtin/log.c:1609
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr ""
 
-#: builtin/log.c:1610
+#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr ""
 
-#: builtin/log.c:1611 builtin/log.c:1614
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr ""
 
-#: builtin/log.c:1612
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr ""
 
-#: builtin/log.c:1615
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr ""
 
-#: builtin/log.c:1619
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 
-#: builtin/log.c:1621
+#: builtin/log.c:1813
 msgid "signature"
 msgstr ""
 
-#: builtin/log.c:1622
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr ""
 
-#: builtin/log.c:1623
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr ""
 
-#: builtin/log.c:1624
+#: builtin/log.c:1816
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 
-#: builtin/log.c:1626
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr ""
 
-#: builtin/log.c:1627
+#: builtin/log.c:1820
 msgid "don't print the patch filenames"
 msgstr ""
 
-#: builtin/log.c:1629
+#: builtin/log.c:1822
 msgid "show progress while generating patches"
 msgstr ""
 
-#: builtin/log.c:1631
+#: builtin/log.c:1824
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1634
+#: builtin/log.c:1827
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1636
+#: builtin/log.c:1829 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr ""
 
-#: builtin/log.c:1711
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
 msgstr ""
 
-#: builtin/log.c:1726
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
 msgstr ""
 
-#: builtin/log.c:1728
+#: builtin/log.c:1933
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr ""
 
-#: builtin/log.c:1736
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
 msgstr ""
 
-#: builtin/log.c:1738
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
 msgstr ""
 
-#: builtin/log.c:1740
+#: builtin/log.c:1945
 msgid "--check does not make sense"
 msgstr ""
 
-#: builtin/log.c:1773
-msgid "standard output, or directory, which one?"
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
 msgstr ""
 
-#: builtin/log.c:1877
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1881
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr ""
 
-#: builtin/log.c:1882
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr ""
 
-#: builtin/log.c:1888
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr ""
 
-#: builtin/log.c:1892
+#: builtin/log.c:2104
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1900
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr ""
 
-#: builtin/log.c:1901
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr ""
 
-#: builtin/log.c:1912
+#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr ""
 
-#: builtin/log.c:1948
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr ""
 
-#: builtin/log.c:1992
+#: builtin/log.c:2204
 msgid "failed to create output files"
 msgstr ""
 
-#: builtin/log.c:2051
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr ""
 
-#: builtin/log.c:2105
+#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr ""
 
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr ""
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:619
 msgid "identify the file status with tags"
 msgstr ""
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:621
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr ""
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:623
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr ""
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:625
 msgid "show cached files in the output (default)"
 msgstr ""
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:627
 msgid "show deleted files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:629
 msgid "show modified files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:631
 msgid "show other files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:633
 msgid "show ignored files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:636
 msgid "show staged contents' object name in the output"
 msgstr ""
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:638
 msgid "show files on the filesystem that need to be removed"
 msgstr ""
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:640
 msgid "show 'other' directories' names only"
 msgstr ""
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:642
 msgid "show line endings of files"
 msgstr ""
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:644
 msgid "don't show empty directories"
 msgstr ""
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:647
 msgid "show unmerged files in the output"
 msgstr ""
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr ""
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:651
 msgid "skip files matching pattern"
 msgstr ""
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:654
 msgid "exclude patterns are read from <file>"
 msgstr ""
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:657
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
 msgstr ""
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:663
 msgid "make the output relative to the project top directory"
 msgstr ""
 
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
 msgstr ""
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:668
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr ""
 
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:669
 msgid "tree-ish"
 msgstr ""
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:670
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr ""
 
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+msgstr ""
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -13979,39 +16277,39 @@ msgid ""
 "                     [--symref] [<repository> [<refs>...]]"
 msgstr ""
 
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr ""
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
 msgid "exec"
 msgstr ""
 
-#: 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 ""
 
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr ""
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr ""
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr ""
 
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr ""
 
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr ""
 
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr ""
 
@@ -14051,489 +16349,563 @@ msgstr ""
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr ""
 
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr ""
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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
 msgid "empty mbox: '%s'"
 msgstr ""
 
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr ""
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr ""
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr ""
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr ""
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr ""
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr ""
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr ""
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr ""
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr ""
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr ""
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr ""
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr ""
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr ""
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
 msgstr ""
 
-#: builtin/merge.c:56
-msgid "git merge --abort"
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
 msgstr ""
 
-#: builtin/merge.c:57
-msgid "git merge --continue"
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
 msgstr ""
 
-#: builtin/merge.c:118
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
 msgstr ""
 
-#: builtin/merge.c:141
+#: builtin/merge.c:146
 #, c-format
 msgid "option `%s' requires a value"
 msgstr ""
 
-#: builtin/merge.c:187
+#: builtin/merge.c:199
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr ""
 
-#: builtin/merge.c:188
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr ""
 
-#: builtin/merge.c:193
+#: builtin/merge.c:205
 #, c-format
 msgid "Available custom strategies are:"
 msgstr ""
 
-#: builtin/merge.c:244 builtin/pull.c:152
+#: builtin/merge.c:256 builtin/pull.c:133
 msgid "do not show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:247 builtin/pull.c:155
+#: builtin/merge.c:259 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr ""
 
-#: builtin/merge.c:248 builtin/pull.c:158
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr ""
 
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:262 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 
-#: builtin/merge.c:253 builtin/pull.c:167
+#: builtin/merge.c:265 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr ""
 
-#: builtin/merge.c:255 builtin/pull.c:170
+#: builtin/merge.c:267 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr ""
 
-#: builtin/merge.c:257 builtin/pull.c:173
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr ""
 
-#: builtin/merge.c:259
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
 msgstr ""
 
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:273 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr ""
 
-#: builtin/merge.c:265 builtin/pull.c:183
+#: builtin/merge.c:277 builtin/pull.c:164
 msgid "verify that the named commit has a valid GPG signature"
 msgstr ""
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:493 builtin/rebase.c:1501 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 ""
 
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr ""
 
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr ""
 
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr ""
 
-#: builtin/merge.c:271
+#: builtin/merge.c:283
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr ""
 
-#: builtin/merge.c:278
+#: builtin/merge.c:290
 msgid "abort the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:280
+#: builtin/merge.c:292
 msgid "--abort but leave index and working tree alone"
 msgstr ""
 
-#: builtin/merge.c:282
+#: builtin/merge.c:294
 msgid "continue the current in-progress merge"
 msgstr ""
 
-#: builtin/merge.c:284 builtin/pull.c:199
+#: builtin/merge.c:296 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:290
+#: builtin/merge.c:303
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr ""
 
-#: builtin/merge.c:307
+#: builtin/merge.c:320
 msgid "could not run stash."
 msgstr ""
 
-#: builtin/merge.c:312
+#: builtin/merge.c:325
 msgid "stash failed"
 msgstr ""
 
-#: builtin/merge.c:317
+#: builtin/merge.c:330
 #, c-format
 msgid "not a valid object: %s"
 msgstr ""
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr ""
 
-#: builtin/merge.c:386
-msgid " (nothing to squash)"
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
 msgstr ""
 
-#: builtin/merge.c:397
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:447
+#: builtin/merge.c:464
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr ""
 
-#: builtin/merge.c:498
+#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr ""
 
-#: builtin/merge.c:585
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr ""
 
-#: builtin/merge.c:705
+#: builtin/merge.c:729
 msgid "Not handling anything other than two heads merge."
 msgstr ""
 
-#: builtin/merge.c:719
+#: builtin/merge.c:742
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr ""
 
-#: builtin/merge.c:734
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr ""
 
-#: builtin/merge.c:786
+#: builtin/merge.c:813
 #, c-format
 msgid "Could not read from '%s'"
 msgstr ""
 
-#: builtin/merge.c:795
+#: builtin/merge.c:822
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:801
+#: 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"
 "\n"
 msgstr ""
 
-#: builtin/merge.c:806
+#: builtin/merge.c:833
 msgid "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:809
+#: builtin/merge.c:836
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:862
+#: builtin/merge.c:889
 msgid "Empty commit message."
 msgstr ""
 
-#: builtin/merge.c:877
+#: builtin/merge.c:904
 #, c-format
 msgid "Wonderful.\n"
 msgstr ""
 
-#: builtin/merge.c:938
+#: builtin/merge.c:965
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 
-#: builtin/merge.c:977
+#: builtin/merge.c:1004
 msgid "No current branch."
 msgstr ""
 
-#: builtin/merge.c:979
+#: builtin/merge.c:1006
 msgid "No remote for the current branch."
 msgstr ""
 
-#: builtin/merge.c:981
+#: builtin/merge.c:1008
 msgid "No default upstream defined for the current branch."
 msgstr ""
 
-#: builtin/merge.c:986
+#: builtin/merge.c:1013
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr ""
 
-#: builtin/merge.c:1043
+#: builtin/merge.c:1070
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr ""
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1173
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr ""
 
-#: builtin/merge.c:1180
+#: builtin/merge.c:1207
 msgid "not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1283
+#: builtin/merge.c:1317
 msgid "--abort expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1287
+#: builtin/merge.c:1321
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1296
+#: builtin/merge.c:1339
 msgid "--quit expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1309
+#: builtin/merge.c:1352
 msgid "--continue expects no arguments"
 msgstr ""
 
-#: builtin/merge.c:1313
+#: builtin/merge.c:1356
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr ""
 
-#: builtin/merge.c:1329
+#: builtin/merge.c:1372
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
 
-#: builtin/merge.c:1336
+#: 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 ""
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1382
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr ""
 
-#: builtin/merge.c:1353
+#: builtin/merge.c:1396
 msgid "You cannot combine --squash with --no-ff."
 msgstr ""
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1398
 msgid "You cannot combine --squash with --commit."
 msgstr ""
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1414
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr ""
 
-#: builtin/merge.c:1388
+#: builtin/merge.c:1431
 msgid "Squash commit into empty head not supported yet"
 msgstr ""
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1433
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr ""
 
-#: builtin/merge.c:1395
+#: builtin/merge.c:1438
 #, c-format
 msgid "%s - not something we can merge"
 msgstr ""
 
-#: builtin/merge.c:1397
+#: builtin/merge.c:1440
 msgid "Can merge only exactly one commit into empty head"
 msgstr ""
 
-#: builtin/merge.c:1476
+#: builtin/merge.c:1521
 msgid "refusing to merge unrelated histories"
 msgstr ""
 
-#: builtin/merge.c:1485
-msgid "Already up to date."
-msgstr ""
-
-#: builtin/merge.c:1495
+#: builtin/merge.c:1540
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr ""
 
-#: builtin/merge.c:1537
+#: builtin/merge.c:1587
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr ""
 
-#: builtin/merge.c:1544
+#: builtin/merge.c:1594
 #, c-format
 msgid "Nope.\n"
 msgstr ""
 
-#: builtin/merge.c:1569
-msgid "Already up to date. Yeeah!"
-msgstr ""
-
-#: builtin/merge.c:1575
+#: builtin/merge.c:1625
 msgid "Not possible to fast-forward, aborting."
 msgstr ""
 
-#: builtin/merge.c:1598 builtin/merge.c:1663
+#: builtin/merge.c:1653 builtin/merge.c:1719
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr ""
 
-#: builtin/merge.c:1602
+#: builtin/merge.c:1657
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr ""
 
-#: builtin/merge.c:1654
+#: builtin/merge.c:1709
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr ""
 
-#: builtin/merge.c:1656
+#: builtin/merge.c:1711
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr ""
 
-#: builtin/merge.c:1665
+#: builtin/merge.c:1721
 #, 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:1677
+#: builtin/merge.c:1735
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr ""
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr ""
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr ""
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr ""
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr ""
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr ""
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr ""
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr ""
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr ""
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr ""
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr ""
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr ""
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr ""
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr ""
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr ""
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
+#: builtin/mktag.c:10
+msgid "git mktag"
 msgstr ""
 
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
 msgstr ""
 
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
 msgstr ""
 
-#: builtin/merge-recursive.c:47
+#: builtin/mktag.c:41
 #, c-format
-msgid "unknown option %s"
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr ""
 
-#: builtin/merge-recursive.c:53
+#: builtin/mktag.c:56
 #, c-format
-msgid "could not parse object '%s'"
+msgid "could not read tagged object '%s'"
 msgstr ""
 
-#: builtin/merge-recursive.c:57
+#: builtin/mktag.c:59
 #, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] ""
-msgstr[1] ""
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr ""
 
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
+#: builtin/mktag.c:97
+msgid "tag on stdin did not pass our strict fsck check"
 msgstr ""
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
+#: builtin/mktag.c:100
+msgid "tag on stdin did not refer to a valid object"
 msgstr ""
 
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
 msgstr ""
 
 #: builtin/mktree.c:66
@@ -14552,31 +16924,41 @@ msgstr ""
 msgid "allow creation of more than one tree"
 msgstr ""
 
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+#: builtin/multi-pack-index.c:10
+msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgstr ""
+
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
+msgstr ""
+
+#: builtin/multi-pack-index.c:16
+msgid "git multi-pack-index [<options>] expire"
 msgstr ""
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:19
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr ""
+
+#: builtin/multi-pack-index.c:54
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 
-#: builtin/multi-pack-index.c:25
-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:43 builtin/prune-packed.c:67
-msgid "too many arguments"
+#: builtin/multi-pack-index.c:70
+msgid "pack for reuse when computing a multi-pack bitmap"
 msgstr ""
 
-#: builtin/multi-pack-index.c:52
-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:61
+#: builtin/multi-pack-index.c:179
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr ""
@@ -14607,113 +16989,117 @@ msgstr ""
 msgid "skip move/rename errors"
 msgstr ""
 
-#: builtin/mv.c:169
+#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr ""
 
-#: builtin/mv.c:180
+#: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr ""
 
-#: builtin/mv.c:184
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr ""
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 msgid "can not move directory into itself"
 msgstr ""
 
-#: builtin/mv.c:190
+#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr ""
 
-#: builtin/mv.c:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr ""
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 msgid "not under version control"
 msgstr ""
 
 #: builtin/mv.c:227
+msgid "conflicted"
+msgstr ""
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr ""
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr ""
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr ""
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr ""
 
-#: builtin/mv.c:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr ""
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr ""
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr ""
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
 #, c-format
 msgid "renaming '%s' failed"
 msgstr ""
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr ""
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr ""
 
-#: builtin/name-rev.c:358
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr ""
 
-#: builtin/name-rev.c:415
-msgid "print only names (no SHA-1)"
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
 msgstr ""
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr ""
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr ""
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr ""
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr ""
 
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr ""
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr ""
 
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr ""
 
@@ -14853,7 +17239,7 @@ msgstr ""
 msgid "the note contents have been left in %s"
 msgstr ""
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:576
 #, c-format
 msgid "could not open or read '%s'"
 msgstr ""
@@ -14896,7 +17282,8 @@ 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
-msgid "too many parameters"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
 msgstr ""
 
 #: builtin/notes.c:389 builtin/notes.c:678
@@ -14954,7 +17341,7 @@ msgid "load rewriting config for <command> (implies --stdin)"
 msgstr ""
 
 #: builtin/notes.c:517
-msgid "too few parameters"
+msgid "too few arguments"
 msgstr ""
 
 #: builtin/notes.c:538
@@ -15074,7 +17461,7 @@ msgid ""
 "abort'.\n"
 msgstr ""
 
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:589
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr ""
@@ -15092,7 +17479,7 @@ msgstr ""
 msgid "read object names from the standard input"
 msgstr ""
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr ""
 
@@ -15108,390 +17495,417 @@ msgstr ""
 msgid "use notes from <notes-ref>"
 msgstr ""
 
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1735
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr ""
 
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 
-#: builtin/pack-objects.c:428
+#: 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 ""
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr ""
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:794
+#: builtin/pack-objects.c:1036
 #, c-format
-msgid "packfile is invalid: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr ""
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
+msgid "expected object at offset %<PRIuMAX> in pack %s"
 msgstr ""
 
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:1155
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:1168
 msgid "Writing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr ""
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1281
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1523
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 
-#: builtin/pack-objects.c:1592
+#: builtin/pack-objects.c:1971
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1601
+#: builtin/pack-objects.c:1980
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1870
+#: builtin/pack-objects.c:2261
 msgid "Counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2000
-#, c-format
-msgid "unable to get size of %s"
-msgstr ""
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c:2426
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
 #, c-format
 msgid "object %s cannot be read"
 msgstr ""
 
-#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
+#: 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:2125
+#: builtin/pack-objects.c:2536
 msgid "suboptimal pack - out of memory"
 msgstr ""
 
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2851
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr ""
 
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2990
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:3076
 msgid "Compressing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:3082
 msgid "inconsistency with delta count"
 msgstr ""
 
-#: builtin/pack-objects.c:2742
+#: 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:3164
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+
+#: builtin/pack-objects.c:3199
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3378
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2748
+#: builtin/pack-objects.c:3384
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:3482
 msgid "invalid value for --missing"
 msgstr ""
 
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
 msgid "cannot open pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3572
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr ""
 
-#: builtin/pack-objects.c:3021
+#: builtin/pack-objects.c:3658
 msgid "unable to force loose object"
 msgstr ""
 
-#: builtin/pack-objects.c:3113
+#: builtin/pack-objects.c:3788
 #, c-format
 msgid "not a rev '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3819
 msgid "unable to add recent objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3872
 #, c-format
 msgid "unsupported index version %s"
 msgstr ""
 
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3876
 #, c-format
 msgid "bad index version '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3228
-msgid "do not show progress meter"
-msgstr ""
-
-#: builtin/pack-objects.c:3230
-msgid "show progress meter"
-msgstr ""
-
-#: builtin/pack-objects.c:3232
-msgid "show progress meter during object writing phase"
-msgstr ""
-
-#: builtin/pack-objects.c:3235
-msgid "similar to --all-progress when progress meter is shown"
-msgstr ""
-
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3915
 msgid "<version>[,<offset>]"
 msgstr ""
 
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3916
 msgid "write the pack index file in the specified idx format version"
 msgstr ""
 
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3919
 msgid "maximum size of each output pack file"
 msgstr ""
 
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3921
 msgid "ignore borrowed objects from alternate object store"
 msgstr ""
 
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3923
 msgid "ignore packed objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3925
 msgid "limit pack window by objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3927
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3929
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3931
 msgid "reuse existing deltas"
 msgstr ""
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3933
 msgid "reuse existing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3935
 msgid "use OFS_DELTA objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3937
 msgid "use threads when searching for best delta matches"
 msgstr ""
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3939
 msgid "do not create an empty pack output"
 msgstr ""
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3941
 msgid "read revision arguments from standard input"
 msgstr ""
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3943
 msgid "limit the objects to those that are not yet packed"
 msgstr ""
 
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3946
 msgid "include objects reachable from any reference"
 msgstr ""
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3949
 msgid "include objects referred by reflog entries"
 msgstr ""
 
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3952
 msgid "include objects referred to by the index"
 msgstr ""
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr ""
+
+#: builtin/pack-objects.c:3957
 msgid "output pack to stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3959
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3961
 msgid "keep unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3963
 msgid "pack loose unreachable objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3965
 msgid "unpack unreachable objects newer than <time>"
 msgstr ""
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3968
 msgid "use the sparse reachability algorithm"
 msgstr ""
 
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3970
 msgid "create thin packs"
 msgstr ""
 
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3972
 msgid "create packs suitable for shallow fetches"
 msgstr ""
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3974
 msgid "ignore packs that have companion .keep file"
 msgstr ""
 
-#: builtin/pack-objects.c:3295
+#: builtin/pack-objects.c:3976
 msgid "ignore this pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3978
 msgid "pack compression level"
 msgstr ""
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3980
 msgid "do not hide commits by grafts"
 msgstr ""
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3982
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3984
 msgid "write a bitmap index together with the pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3988
 msgid "write a bitmap index if possible"
 msgstr ""
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3992
 msgid "handling for missing objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3995
 msgid "do not pack objects in promisor packfiles"
 msgstr ""
 
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3997
 msgid "respect islands during delta compression"
 msgstr ""
 
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:4000
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:4033
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3350
+#: builtin/pack-objects.c:4038
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr ""
 
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:4094
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:4096
 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:4101
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:4104
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr ""
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:4110
 msgid "cannot use --filter without --stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:3481
+#: builtin/pack-objects.c:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr ""
+
+#: builtin/pack-objects.c:4116
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr ""
+
+#: builtin/pack-objects.c:4175
 msgid "Enumerating objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:4212
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+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
@@ -15506,98 +17920,94 @@ msgstr ""
 msgid "prune loose refs (default)"
 msgstr ""
 
-#: builtin/prune-packed.c:9
+#: builtin/prune-packed.c:6
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr ""
 
-#: builtin/prune-packed.c:42
-msgid "Removing duplicate objects"
-msgstr ""
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr ""
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr ""
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr ""
 
-#: builtin/prune.c:136
+#: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr ""
 
-#: builtin/prune.c:150
+#: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr ""
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr ""
 
-#: builtin/pull.c:142
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr ""
 
-#: builtin/pull.c:146
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr ""
 
-#: builtin/pull.c:149
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr ""
 
-#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr ""
 
-#: builtin/pull.c:186
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/pull.c:167 parse-options.h:340
+msgid "automatically stash/stash pop before and after"
 msgstr ""
 
-#: builtin/pull.c:202
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr ""
 
-#: builtin/pull.c:212
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr ""
 
-#: builtin/pull.c:220
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr ""
 
-#: builtin/pull.c:320
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr ""
 
-#: builtin/pull.c:437
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr ""
 
-#: builtin/pull.c:439
+#: builtin/pull.c:447
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 
-#: builtin/pull.c:440
+#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
 
-#: builtin/pull.c:443
+#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -15605,74 +18015,86 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr ""
 
-#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1248
 msgid "You are not currently on a branch."
 msgstr ""
 
-#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
 msgid "Please specify which branch you want to rebase against."
 msgstr ""
 
-#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
 msgid "Please specify which branch you want to merge with."
 msgstr ""
 
-#: builtin/pull.c:453 builtin/pull.c:468
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
 msgstr ""
 
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1353 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr ""
 
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr ""
 
-#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1246
 msgid "There is no tracking information for the current branch."
 msgstr ""
 
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: builtin/pull.c:480
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 
-#: builtin/pull.c:477
+#: 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 ""
 
-#: builtin/pull.c:587
+#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr ""
 
-#: builtin/pull.c:867
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr ""
 
-#: builtin/pull.c:922
-msgid "--[no-]autostash option is only valid with --rebase."
+#: 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 ""
 
-#: builtin/pull.c:930
+#: builtin/pull.c:990
 msgid "Updating an unborn branch with changes added to the index."
 msgstr ""
 
-#: builtin/pull.c:934
+#: builtin/pull.c:994
 msgid "pull with rebase"
 msgstr ""
 
-#: builtin/pull.c:935
+#: builtin/pull.c:995
 msgid "please commit or stash them."
 msgstr ""
 
-#: builtin/pull.c:960
+#: builtin/pull.c:1020
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -15680,7 +18102,7 @@ msgid ""
 "commit %s."
 msgstr ""
 
-#: builtin/pull.c:966
+#: builtin/pull.c:1026
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -15691,15 +18113,15 @@ msgid ""
 "to recover."
 msgstr ""
 
-#: builtin/pull.c:981
+#: builtin/pull.c:1041
 msgid "Cannot merge multiple branches into empty head."
 msgstr ""
 
-#: builtin/pull.c:985
+#: builtin/pull.c:1045
 msgid "Cannot rebase onto multiple branches."
 msgstr ""
 
-#: builtin/pull.c:992
+#: builtin/pull.c:1065
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 
@@ -15711,17 +18133,17 @@ msgstr ""
 msgid "tag shorthand without <tag>"
 msgstr ""
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr ""
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr ""
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -15736,7 +18158,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -15746,7 +18168,7 @@ msgid ""
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
 
-#: builtin/push.c:199
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -15755,12 +18177,17 @@ msgid ""
 "    git push --set-upstream %s %s\n"
 msgstr ""
 
-#: builtin/push.c:207
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 
-#: builtin/push.c:210
+#: 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"
@@ -15768,12 +18195,7 @@ msgid ""
 "to update which remote branch."
 msgstr ""
 
-#: builtin/push.c:269
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-
-#: builtin/push.c:276
+#: 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"
@@ -15781,7 +18203,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/push.c:282
+#: 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"
@@ -15789,7 +18211,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/push.c:288
+#: 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"
@@ -15798,110 +18220,122 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
 
-#: builtin/push.c:295
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 
-#: builtin/push.c:298
+#: 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:359
+#: 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 ""
+
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr ""
 
-#: builtin/push.c:366
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr ""
 
-#: builtin/push.c:541
+#: builtin/push.c:544
 msgid "repository"
 msgstr ""
 
-#: builtin/push.c:542 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr ""
 
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr ""
 
-#: builtin/push.c:545
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr ""
 
-#: builtin/push.c:546
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr ""
 
-#: builtin/push.c:549 builtin/send-pack.c:167
+#: builtin/push.c:552 builtin/send-pack.c:192
 msgid "force updates"
 msgstr ""
 
-#: builtin/push.c:551 builtin/send-pack.c:181
+#: builtin/push.c:553 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
 msgstr ""
 
-#: builtin/push.c:552 builtin/send-pack.c:182
+#: builtin/push.c:554 builtin/send-pack.c:205
 msgid "require old value of ref to be at this value"
 msgstr ""
 
-#: builtin/push.c:555
+#: builtin/push.c:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr ""
+
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr ""
 
-#: builtin/push.c:557 builtin/send-pack.c:175
+#: builtin/push.c:561 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr ""
 
-#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr ""
 
-#: builtin/push.c:560
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr ""
 
-#: builtin/push.c:563
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr ""
 
-#: builtin/push.c:565
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr ""
 
-#: builtin/push.c:566
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr ""
 
-#: builtin/push.c:569 builtin/send-pack.c:169
+#: builtin/push.c:572 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr ""
 
-#: builtin/push.c:571 builtin/send-pack.c:176
+#: builtin/push.c:574 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
 msgstr ""
 
-#: builtin/push.c:589
+#: builtin/push.c:592
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr ""
 
-#: builtin/push.c:591
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr ""
 
-#: builtin/push.c:611
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr ""
 
-#: builtin/push.c:612
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -15914,60 +18348,72 @@ msgid ""
 "    git push <name>\n"
 msgstr ""
 
-#: builtin/push.c:627
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
 msgstr ""
 
-#: builtin/push.c:629
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr ""
 
-#: builtin/push.c:633
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
 msgstr ""
 
-#: builtin/push.c:635
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr ""
 
-#: builtin/push.c:638
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
 msgstr ""
 
-#: builtin/push.c:642
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr ""
 
-#: 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
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:21
-msgid "Percentage by which creation is weighted"
+#: builtin/range-diff.c:30
+msgid "use simple diff colors"
 msgstr ""
 
-#: builtin/range-diff.c:23
-msgid "use simple diff colors"
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr ""
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
 msgstr ""
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr ""
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr ""
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
-msgid "no .. in range: '%s'"
+msgid "not a commit range: '%s'"
 msgstr ""
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr ""
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr ""
 
@@ -16046,231 +18492,212 @@ msgstr ""
 msgid "suppress feedback messages"
 msgstr ""
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr ""
+
+#: builtin/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
 msgstr ""
 
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr ""
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr ""
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr ""
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:311
 #, c-format
 msgid "could not create temporary %s"
 msgstr ""
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:317
 msgid "could not mark as interactive"
 msgstr ""
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:370
 msgid "could not generate todo list"
 msgstr ""
 
-#: builtin/rebase.c:383
+#: builtin/rebase.c:412
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 
-#: builtin/rebase.c:438
+#: builtin/rebase.c:481
 msgid "git rebase--interactive [<options>]"
 msgstr ""
 
-#: builtin/rebase.c:450
-msgid "keep empty commits"
+#: builtin/rebase.c:494 builtin/rebase.c:1389
+msgid "keep commits which start empty"
 msgstr ""
 
-#: builtin/rebase.c:452 builtin/revert.c:128
+#: builtin/rebase.c:498 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr ""
 
-#: builtin/rebase.c:453
+#: builtin/rebase.c:500
 msgid "rebase merge commits"
 msgstr ""
 
-#: builtin/rebase.c:455
+#: builtin/rebase.c:502
 msgid "keep original branch points of cousins"
 msgstr ""
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:504
 msgid "move commits that begin with squash!/fixup!"
 msgstr ""
 
-#: builtin/rebase.c:458
+#: builtin/rebase.c:505
 msgid "sign commits"
 msgstr ""
 
-#: builtin/rebase.c:460 builtin/rebase.c:1427
+#: builtin/rebase.c:507 builtin/rebase.c:1328
 msgid "display a diffstat of what changed upstream"
 msgstr ""
 
-#: builtin/rebase.c:462
+#: builtin/rebase.c:509
 msgid "continue rebase"
 msgstr ""
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:511
 msgid "skip commit"
 msgstr ""
 
-#: builtin/rebase.c:465
+#: builtin/rebase.c:512
 msgid "edit the todo list"
 msgstr ""
 
-#: builtin/rebase.c:467
+#: builtin/rebase.c:514
 msgid "show the current patch"
 msgstr ""
 
-#: builtin/rebase.c:470
+#: builtin/rebase.c:517
 msgid "shorten commit ids in the todo list"
 msgstr ""
 
-#: builtin/rebase.c:472
+#: builtin/rebase.c:519
 msgid "expand commit ids in the todo list"
 msgstr ""
 
-#: builtin/rebase.c:474
+#: builtin/rebase.c:521
 msgid "check the todo list"
 msgstr ""
 
-#: builtin/rebase.c:476
+#: builtin/rebase.c:523
 msgid "rearrange fixup/squash lines"
 msgstr ""
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:525
 msgid "insert exec commands in todo list"
 msgstr ""
 
-#: builtin/rebase.c:479
+#: builtin/rebase.c:526
 msgid "onto"
 msgstr ""
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict-revision"
 msgstr ""
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict revision"
 msgstr ""
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:531
 msgid "squash-onto"
 msgstr ""
 
-#: builtin/rebase.c:485
+#: builtin/rebase.c:532
 msgid "squash onto"
 msgstr ""
 
-#: builtin/rebase.c:487
+#: builtin/rebase.c:534
 msgid "the upstream commit"
 msgstr ""
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head-name"
 msgstr ""
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head name"
 msgstr ""
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:541
 msgid "rebase strategy"
 msgstr ""
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:542
 msgid "strategy-opts"
 msgstr ""
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:543
 msgid "strategy options"
 msgstr ""
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:544
 msgid "switch-to"
 msgstr ""
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
 msgid "the branch or commit to checkout"
 msgstr ""
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto-name"
 msgstr ""
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto name"
 msgstr ""
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "cmd"
 msgstr ""
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "the command to run"
 msgstr ""
 
-#: builtin/rebase.c:503 builtin/rebase.c:1510
+#: builtin/rebase.c:550 builtin/rebase.c:1422
 msgid "automatically re-schedule any `exec` that fails"
 msgstr ""
 
-#: builtin/rebase.c:519
+#: builtin/rebase.c:566
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr ""
 
-#: builtin/rebase.c:535
+#: builtin/rebase.c:582
 #, c-format
-msgid "%s requires an interactive rebase"
+msgid "%s requires the merge backend"
 msgstr ""
 
-#: builtin/rebase.c:587
+#: builtin/rebase.c:625
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr ""
 
-#: builtin/rebase.c:602
+#: builtin/rebase.c:642
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:627
+#: builtin/rebase.c:667
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:703
-#, c-format
-msgid "Could not read '%s'"
-msgstr ""
-
-#: builtin/rebase.c:721
-#, c-format
-msgid "Cannot store %s"
-msgstr ""
-
-#: builtin/rebase.c:828
-msgid "could not determine HEAD revision"
-msgstr ""
-
-#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
+#: 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"
@@ -16279,7 +18706,7 @@ msgid ""
 "abort\"."
 msgstr ""
 
-#: builtin/rebase.c:1032
+#: builtin/rebase.c:896
 #, c-format
 msgid ""
 "\n"
@@ -16291,7 +18718,14 @@ msgid ""
 "As a result, git cannot rebase them."
 msgstr ""
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1222
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+
+#: builtin/rebase.c:1240
 #, c-format
 msgid ""
 "%s\n"
@@ -16302,7 +18736,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/rebase.c:1355
+#: builtin/rebase.c:1256
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -16311,181 +18745,195 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1286
 msgid "exec commands cannot contain newlines"
 msgstr ""
 
-#: builtin/rebase.c:1389
+#: builtin/rebase.c:1290
 msgid "empty exec command"
 msgstr ""
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1319
 msgid "rebase onto given branch instead of upstream"
 msgstr ""
 
-#: builtin/rebase.c:1420
+#: builtin/rebase.c:1321
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr ""
 
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1323
 msgid "allow pre-rebase hook to run"
 msgstr ""
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1325
 msgid "be quiet. implies --no-stat"
 msgstr ""
 
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1331
 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 
-#: builtin/rebase.c:1433
-msgid "add a Signed-off-by: line to each commit"
+#: builtin/rebase.c:1334
+msgid "add a Signed-off-by trailer to each commit"
 msgstr ""
 
-#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
-msgid "passed to 'git am'"
+#: builtin/rebase.c:1337
+msgid "make committer date match author date"
 msgstr ""
 
-#: builtin/rebase.c:1443 builtin/rebase.c:1445
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr ""
+
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr ""
+
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
 msgid "passed to 'git apply'"
 msgstr ""
 
-#: builtin/rebase.c:1447 builtin/rebase.c:1450
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr ""
+
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1354
 msgid "continue"
 msgstr ""
 
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1357
 msgid "skip current patch and continue"
 msgstr ""
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1359
 msgid "abort and check out the original branch"
 msgstr ""
 
-#: builtin/rebase.c:1460
+#: builtin/rebase.c:1362
 msgid "abort but keep HEAD where it is"
 msgstr ""
 
-#: builtin/rebase.c:1461
+#: builtin/rebase.c:1363
 msgid "edit the todo list during an interactive rebase"
 msgstr ""
 
-#: builtin/rebase.c:1464
+#: builtin/rebase.c:1366
 msgid "show the patch file being applied or merged"
 msgstr ""
 
-#: builtin/rebase.c:1467
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1373
 msgid "use merging strategies to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1377
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1381
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr ""
 
-#: builtin/rebase.c:1479
-msgid "preserve empty commits during rebase"
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
 msgstr ""
 
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1393
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 
-#: builtin/rebase.c:1487
-msgid "automatically stash/stash pop before and after"
-msgstr ""
-
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1400
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1404
 msgid "allow rebasing commits with empty messages"
 msgstr ""
 
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1408
 msgid "try to rebase merges instead of skipping them"
 msgstr ""
 
-#: builtin/rebase.c:1499
+#: builtin/rebase.c:1411
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1413
 msgid "use the given merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1503 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
 msgid "option"
 msgstr ""
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1416
 msgid "pass the argument through to the merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1419
 msgid "rebase all reachable commits up to the root(s)"
 msgstr ""
 
-#: builtin/rebase.c:1524
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
+#: builtin/rebase.c:1424
+msgid "apply all changes, even those already present upstream"
 msgstr ""
 
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1442
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr ""
 
-#: builtin/rebase.c:1571
+#: builtin/rebase.c:1483
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1488
 msgid "cannot combine '--keep-base' with '--onto'"
 msgstr ""
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1490
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr ""
 
-#: builtin/rebase.c:1582
+#: builtin/rebase.c:1494
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr ""
+
+#: builtin/rebase.c:1497
 msgid "No rebase in progress?"
 msgstr ""
 
-#: builtin/rebase.c:1586
+#: builtin/rebase.c:1501
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr ""
 
-#: builtin/rebase.c:1621
+#: builtin/rebase.c:1536
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr ""
 
-#: builtin/rebase.c:1640
+#: builtin/rebase.c:1555
 msgid "could not discard worktree changes"
 msgstr ""
 
-#: builtin/rebase.c:1659
+#: builtin/rebase.c:1574
 #, c-format
 msgid "could not move back to %s"
 msgstr ""
 
-#: builtin/rebase.c:1704
+#: builtin/rebase.c:1620
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -16498,163 +18946,140 @@ msgid ""
 "valuable there.\n"
 msgstr ""
 
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1648
 msgid "switch `C' expects a numerical value"
 msgstr ""
 
-#: builtin/rebase.c:1766
+#: builtin/rebase.c:1690
 #, c-format
 msgid "Unknown mode: %s"
 msgstr ""
 
-#: builtin/rebase.c:1788
+#: builtin/rebase.c:1729
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1828
-msgid "--reschedule-failed-exec requires --exec or --interactive"
+#: builtin/rebase.c:1759
+msgid "cannot combine apply options with merge options"
+msgstr ""
+
+#: builtin/rebase.c:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
 msgstr ""
 
-#: builtin/rebase.c:1840
-msgid "cannot combine am options with either interactive or merge options"
+#: builtin/rebase.c:1802
+msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1859
+#: builtin/rebase.c:1822
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr ""
 
-#: builtin/rebase.c:1863
+#: builtin/rebase.c:1826
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 
-#: builtin/rebase.c:1887
+#: builtin/rebase.c:1850
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1856
 msgid "Could not create new root commit"
 msgstr ""
 
-#: builtin/rebase.c:1919
+#: builtin/rebase.c:1882
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr ""
 
-#: builtin/rebase.c:1922
+#: builtin/rebase.c:1885
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr ""
 
-#: builtin/rebase.c:1930
+#: builtin/rebase.c:1893
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1955
+#: builtin/rebase.c:1921
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
 #, c-format
 msgid "No such ref: %s"
 msgstr ""
 
-#: builtin/rebase.c:1974
+#: builtin/rebase.c:1940
 msgid "Could not resolve HEAD to a revision"
 msgstr ""
 
-#: builtin/rebase.c:2012
-msgid "Cannot autostash"
-msgstr ""
-
-#: builtin/rebase.c:2015
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:2021
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr ""
-
-#: builtin/rebase.c:2024
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr ""
-
-#: builtin/rebase.c:2027
-msgid "could not reset --hard"
-msgstr ""
-
-#: builtin/rebase.c:2036
+#: builtin/rebase.c:1961
 msgid "Please commit or stash them."
 msgstr ""
 
-#: builtin/rebase.c:2063
-#, c-format
-msgid "could not parse '%s'"
-msgstr ""
-
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:1997
 #, c-format
 msgid "could not switch to %s"
 msgstr ""
 
-#: builtin/rebase.c:2087
+#: builtin/rebase.c:2008
 msgid "HEAD is up to date."
 msgstr ""
 
-#: builtin/rebase.c:2089
+#: builtin/rebase.c:2010
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr ""
 
-#: builtin/rebase.c:2097
+#: builtin/rebase.c:2018
 msgid "HEAD is up to date, rebase forced."
 msgstr ""
 
-#: builtin/rebase.c:2099
+#: builtin/rebase.c:2020
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr ""
 
-#: builtin/rebase.c:2107
+#: builtin/rebase.c:2028
 msgid "The pre-rebase hook refused to rebase."
 msgstr ""
 
-#: builtin/rebase.c:2114
+#: builtin/rebase.c:2035
 #, c-format
 msgid "Changes to %s:\n"
 msgstr ""
 
-#: builtin/rebase.c:2117
+#: builtin/rebase.c:2038
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr ""
 
-#: builtin/rebase.c:2142
+#: builtin/rebase.c:2063
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 
-#: builtin/rebase.c:2151
+#: builtin/rebase.c:2072
 msgid "Could not detach HEAD"
 msgstr ""
 
-#: builtin/rebase.c:2160
+#: builtin/rebase.c:2081
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr ""
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr ""
 
-#: builtin/receive-pack.c:830
+#: 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"
@@ -16671,7 +19096,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:850
+#: 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"
@@ -16683,11 +19108,11 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
 
-#: builtin/receive-pack.c:1936
+#: builtin/receive-pack.c:2478
 msgid "quiet"
 msgstr ""
 
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:2492
 msgid "You must specify a directory."
 msgstr ""
 
@@ -16708,210 +19133,218 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr ""
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr ""
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:609
 #, c-format
 msgid "Marking reachable objects..."
 msgstr ""
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:647
 #, c-format
 msgid "%s points nowhere!"
 msgstr ""
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:699
 msgid "no reflog specified to delete"
 msgstr ""
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:708
 #, c-format
 msgid "not a reflog: %s"
 msgstr ""
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:713
 #, c-format
 msgid "no reflog for '%s'"
 msgstr ""
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:759
 #, c-format
 msgid "invalid ref format: %s"
 msgstr ""
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:768
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr ""
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr ""
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
 msgstr ""
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr ""
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr ""
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr ""
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr ""
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr ""
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr ""
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr ""
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr ""
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr ""
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr ""
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr ""
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr ""
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr ""
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr ""
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr ""
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr ""
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr ""
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
 msgstr ""
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr ""
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr ""
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr ""
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr ""
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr ""
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr ""
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr ""
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr ""
 
-#: builtin/remote.c:198 builtin/remote.c:640
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr ""
-
-#: builtin/remote.c:238
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr ""
 
-#: builtin/remote.c:344
+#: builtin/remote.c:355
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr ""
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr ""
 
-#: builtin/remote.c:455
+#: builtin/remote.c:466
 msgid "(delete)"
 msgstr ""
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr ""
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
 #, c-format
 msgid "No such remote: '%s'"
 msgstr ""
 
-#: builtin/remote.c:646
+#: builtin/remote.c:710
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr ""
 
-#: builtin/remote.c:666
+#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -16919,17 +19352,17 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr ""
 
-#: builtin/remote.c:702
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
 msgstr ""
 
-#: builtin/remote.c:736
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
 msgstr ""
 
-#: builtin/remote.c:802
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -16939,118 +19372,118 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:816
+#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr ""
 
-#: builtin/remote.c:917
+#: builtin/remote.c:999
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr ""
 
-#: builtin/remote.c:920
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr ""
 
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
 msgstr ""
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr ""
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1058
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr ""
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr ""
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr ""
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
 msgid "create"
 msgstr ""
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr ""
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr ""
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
 msgstr ""
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr ""
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr ""
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr ""
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr ""
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr ""
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr ""
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr ""
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr ""
 
@@ -17058,317 +19491,324 @@ msgstr ""
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr ""
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr ""
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr ""
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr ""
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr ""
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1303
 #, 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:1242
+#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr ""
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr ""
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr ""
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr ""
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr ""
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr ""
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr ""
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
 msgstr ""
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr ""
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr ""
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr ""
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr ""
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr ""
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr ""
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr ""
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr ""
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
 msgid "query push URLs rather than fetch URLs"
 msgstr ""
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr ""
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr ""
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr ""
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr ""
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr ""
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
 msgstr ""
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr ""
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
 msgstr ""
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
 msgstr ""
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr ""
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr ""
-
-#: builtin/repack.c:23
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr ""
 
-#: builtin/repack.c:28
+#: 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 ""
 
-#: builtin/repack.c:191
+#: builtin/repack.c:198
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:230 builtin/repack.c:409
+#: builtin/repack.c:270 builtin/repack.c:630
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 
-#: builtin/repack.c:247
+#: builtin/repack.c:294
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:285
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr ""
+
+#: 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 ""
 
-#: builtin/repack.c:287
+#: builtin/repack.c:462
 msgid "same as -a, and turn unreachable objects loose"
 msgstr ""
 
-#: builtin/repack.c:290
+#: builtin/repack.c:465
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr ""
 
-#: builtin/repack.c:292
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:294
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:296
+#: builtin/repack.c:471
 msgid "do not run git-update-server-info"
 msgstr ""
 
-#: builtin/repack.c:299
+#: builtin/repack.c:474
 msgid "pass --local to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:301
+#: builtin/repack.c:476
 msgid "write bitmap index"
 msgstr ""
 
-#: builtin/repack.c:303
+#: builtin/repack.c:478
 msgid "pass --delta-islands to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:304
+#: builtin/repack.c:479
 msgid "approxidate"
 msgstr ""
 
-#: builtin/repack.c:305
+#: builtin/repack.c:480
 msgid "with -A, do not loosen objects older than this"
 msgstr ""
 
-#: builtin/repack.c:307
+#: builtin/repack.c:482
 msgid "with -a, repack unreachable objects"
 msgstr ""
 
-#: builtin/repack.c:309
+#: builtin/repack.c:484
 msgid "size of the window used for delta compression"
 msgstr ""
 
-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr ""
 
-#: builtin/repack.c:311
+#: builtin/repack.c:486
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 
-#: builtin/repack.c:313
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr ""
 
-#: builtin/repack.c:315
+#: builtin/repack.c:490
 msgid "limits the maximum number of threads"
 msgstr ""
 
-#: builtin/repack.c:317
+#: builtin/repack.c:492
 msgid "maximum size of each packfile"
 msgstr ""
 
-#: builtin/repack.c:319
+#: builtin/repack.c:494
 msgid "repack objects in packs marked with .keep"
 msgstr ""
 
-#: builtin/repack.c:321
+#: builtin/repack.c:496
 msgid "do not repack this pack"
 msgstr ""
 
-#: builtin/repack.c:331
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr ""
+
+#: builtin/repack.c:508
 msgid "cannot delete packs in a precious-objects repo"
 msgstr ""
 
-#: builtin/repack.c:335
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
 msgstr ""
 
-#: builtin/repack.c:418
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr ""
+
+#: builtin/repack.c:639
 msgid "Nothing new to pack."
 msgstr ""
 
-#: builtin/repack.c:479
+#: builtin/repack.c:669
 #, 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"
+msgid "missing required file: %s"
 msgstr ""
 
-#: builtin/repack.c:527
+#: builtin/repack.c:671
 #, c-format
-msgid "failed to remove '%s'"
+msgid "could not unlink: %s"
 msgstr ""
 
 #: builtin/replace.c:22
@@ -17469,8 +19909,8 @@ msgstr ""
 msgid "unable to write object to database"
 msgstr ""
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
-#: builtin/replace.c:453
+#: 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 ""
@@ -17494,119 +19934,119 @@ msgstr ""
 msgid "could not parse %s as a commit"
 msgstr ""
 
-#: builtin/replace.c:415
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr ""
 
-#: builtin/replace.c:417
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr ""
 
-#: builtin/replace.c:429
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr ""
 
-#: builtin/replace.c:468
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr ""
 
-#: builtin/replace.c:469
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr ""
 
-#: builtin/replace.c:479
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr ""
 
-#: builtin/replace.c:487
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr ""
 
-#: builtin/replace.c:491
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:526
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
 msgstr ""
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr ""
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr ""
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr ""
 
-#: builtin/replace.c:550
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr ""
 
-#: builtin/replace.c:551
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr ""
 
-#: builtin/replace.c:552
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr ""
 
-#: builtin/replace.c:554
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr ""
 
-#: builtin/replace.c:555
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr ""
 
-#: builtin/replace.c:568
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr ""
 
-#: builtin/replace.c:576
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr ""
 
-#: builtin/replace.c:580
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr ""
 
-#: builtin/replace.c:586
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:592
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr ""
 
-#: builtin/replace.c:598
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr ""
 
-#: builtin/replace.c:604
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:610
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr ""
 
-#: builtin/replace.c:616
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr ""
 
@@ -17614,15 +20054,15 @@ 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 ""
@@ -17633,118 +20073,123 @@ msgid ""
 msgstr ""
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr ""
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr ""
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr ""
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr ""
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr ""
 
-#: builtin/reset.c:114
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr ""
 
-#: builtin/reset.c:193
+#: builtin/reset.c:195
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr ""
 
-#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
 msgid "be quiet, only report errors"
 msgstr ""
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr ""
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr ""
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr ""
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr ""
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 
-#: builtin/reset.c:326
+#: builtin/reset.c:344
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr ""
 
-#: builtin/reset.c:334
+#: builtin/reset.c:352
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr ""
 
-#: builtin/reset.c:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr ""
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr ""
 
-#: builtin/reset.c:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr ""
 
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr ""
 
-#: builtin/reset.c:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
 msgstr ""
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr ""
 
-#: builtin/reset.c:398
+#: builtin/reset.c:416
 #, c-format
 msgid ""
 "\n"
@@ -17753,48 +20198,60 @@ msgid ""
 "to make this the default.\n"
 msgstr ""
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr ""
 
-#: builtin/reset.c:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr ""
 
-#: builtin/rev-list.c:411
+#: builtin/rev-list.c:541
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr ""
 
-#: builtin/rev-list.c:472
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr ""
 
-#: builtin/rev-list.c:522
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr ""
 
-#: builtin/rev-list.c:525
-msgid "cannot combine --use-bitmap-index with object filtering"
+#: builtin/rev-list.c:679
+msgid "marked counting is incompatible with --objects"
 msgstr ""
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr ""
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr ""
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr ""
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr ""
 
-#: builtin/rev-parse.c:551
+#: 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"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -17803,6 +20260,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 ""
@@ -17881,19 +20382,19 @@ msgstr ""
 msgid "keep redundant, empty commits"
 msgstr ""
 
-#: builtin/revert.c:232
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr ""
 
-#: builtin/revert.c:245
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr ""
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr ""
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -17903,60 +20404,64 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: builtin/rm.c:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
 msgstr ""
 
-#: 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] ""
 msgstr[1] ""
 
-#: 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)"
 msgstr ""
 
-#: 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] ""
 msgstr[1] ""
 
-#: builtin/rm.c:242
+#: builtin/rm.c:244
 msgid "do not list removed files"
 msgstr ""
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr ""
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
 msgstr ""
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr ""
 
-#: builtin/rm.c:247
+#: builtin/rm.c:249
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 
-#: builtin/rm.c:289
+#: builtin/rm.c:283
+msgid "No pathspec was given. Which files should I remove?"
+msgstr ""
+
+#: builtin/rm.c:310
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 
-#: builtin/rm.c:307
+#: builtin/rm.c:331
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr ""
 
-#: builtin/rm.c:346
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr ""
@@ -17969,55 +20474,76 @@ msgid ""
 "  --all and explicit <ref> specification are mutually exclusive."
 msgstr ""
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr ""
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr ""
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr ""
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr ""
 
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr ""
 
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
 msgstr ""
 
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr ""
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr ""
+
+#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr ""
 
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
 msgstr ""
 
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
 msgstr ""
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr ""
 
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr ""
+
+#: builtin/shortlog.c:362
+msgid "field"
 msgstr ""
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr ""
+
+#: builtin/shortlog.c:391
 msgid "too many arguments given outside repository"
 msgstr ""
 
@@ -18151,6 +20677,14 @@ msgstr ""
 msgid "cannot find commit %s (%s)"
 msgstr ""
 
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr ""
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr ""
+
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -18193,225 +20727,332 @@ msgstr ""
 msgid "show refs from stdin that aren't in local repository"
 msgstr ""
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:22
+msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
+msgstr ""
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+msgstr ""
+
+#: builtin/sparse-checkout.c:72
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:227
+msgid "failed to create directory for sparse-checkout file"
+msgstr ""
+
+#: builtin/sparse-checkout.c:268
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+
+#: builtin/sparse-checkout.c:270
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr ""
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr ""
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/sparse-checkout.c:413
+#, c-format
+msgid "could not normalize path %s"
+msgstr ""
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:450
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr ""
+
+#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+msgid "unable to load existing sparse-checkout patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:573
+msgid "read patterns from standard in"
+msgstr ""
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr ""
+
+#: builtin/sparse-checkout.c:607
+msgid "git sparse-checkout disable"
+msgstr ""
+
+#: builtin/sparse-checkout.c:638
+msgid "error while refreshing working directory"
+msgstr ""
+
+#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr ""
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: 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:62
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:27 builtin/stash.c:67
-msgid "git stash clear"
-msgstr ""
-
-#: builtin/stash.c:28 builtin/stash.c:77
+#: 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"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<pathspec>...]]"
 msgstr ""
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: 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:52
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:57
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr ""
 
-#: builtin/stash.c:72
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr ""
 
-#: builtin/stash.c:127
+#: 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:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr ""
 
-#: builtin/stash.c:147
+#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr ""
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr ""
 
-#: builtin/stash.c:175
+#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr ""
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
+msgstr ""
+
+#: 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:403
+#: builtin/stash.c:492
 msgid "cannot apply a stash in the middle of a merge"
 msgstr ""
 
-#: builtin/stash.c:414
+#: builtin/stash.c:503
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr ""
 
-#: builtin/stash.c:421
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:510
+msgid "conflicts in index. Try without --index."
 msgstr ""
 
-#: builtin/stash.c:427
+#: builtin/stash.c:516
 msgid "could not save index tree"
 msgstr ""
 
-#: builtin/stash.c:436
+#: builtin/stash.c:525
 msgid "could not restore untracked files from stash"
 msgstr ""
 
-#: builtin/stash.c:450
+#: builtin/stash.c:539
 #, c-format
 msgid "Merging %s with %s"
 msgstr ""
 
-#: builtin/stash.c:460 git-legacy-stash.sh:680
+#: builtin/stash.c:549
 msgid "Index was not unstashed."
 msgstr ""
 
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:591 builtin/stash.c:689
 msgid "attempt to recreate the index"
 msgstr ""
 
-#: builtin/stash.c:555
+#: builtin/stash.c:635
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr ""
 
-#: builtin/stash.c:558
+#: builtin/stash.c:638
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr ""
 
-#: builtin/stash.c:583
+#: builtin/stash.c:651
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr ""
 
-#: builtin/stash.c:633 git-legacy-stash.sh:694
+#: builtin/stash.c:701
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 
-#: builtin/stash.c:656 git-legacy-stash.sh:712
+#: builtin/stash.c:724
 msgid "No branch name specified"
 msgstr ""
 
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr ""
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr ""
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr ""
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr ""
+
+#: builtin/stash.c:929 builtin/stash.c:966
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr ""
 
-#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
 msgid "stash message"
 msgstr ""
 
-#: builtin/stash.c:824
+#: builtin/stash.c:957
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr ""
 
-#: builtin/stash.c:1046 git-legacy-stash.sh:217
+#: builtin/stash.c:1171
 msgid "No changes selected"
 msgstr ""
 
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1271
 msgid "You do not have the initial commit yet"
 msgstr ""
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1298
 msgid "Cannot save the current index state"
 msgstr ""
 
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1307
 msgid "Cannot save the untracked files"
 msgstr ""
 
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1318 builtin/stash.c:1327
 msgid "Cannot save the current worktree state"
 msgstr ""
 
-#: builtin/stash.c:1229 git-legacy-stash.sh:233
+#: builtin/stash.c:1355
 msgid "Cannot record working tree state"
 msgstr ""
 
-#: builtin/stash.c:1278 git-legacy-stash.sh:337
+#: builtin/stash.c:1404
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 
-#: builtin/stash.c:1294
+#: builtin/stash.c:1422
 msgid "Did you forget to 'git add'?"
 msgstr ""
 
-#: builtin/stash.c:1309 git-legacy-stash.sh:345
+#: builtin/stash.c:1437
 msgid "No local changes to save"
 msgstr ""
 
-#: builtin/stash.c:1316 git-legacy-stash.sh:350
+#: builtin/stash.c:1444
 msgid "Cannot initialize stash"
 msgstr ""
 
-#: builtin/stash.c:1331 git-legacy-stash.sh:354
+#: builtin/stash.c:1459
 msgid "Cannot save the current status"
 msgstr ""
 
-#: builtin/stash.c:1336
+#: builtin/stash.c:1464
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr ""
 
-#: builtin/stash.c:1426 git-legacy-stash.sh:384
+#: builtin/stash.c:1554
 msgid "Cannot remove worktree changes"
 msgstr ""
 
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1593 builtin/stash.c:1658
 msgid "keep index"
 msgstr ""
 
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1595 builtin/stash.c:1660
 msgid "stash in patch mode"
 msgstr ""
 
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1596 builtin/stash.c:1661
 msgid "quiet mode"
 msgstr ""
 
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1598 builtin/stash.c:1663
 msgid "include untracked files in stash"
 msgstr ""
 
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1600 builtin/stash.c:1665
 msgid "include ignore files"
 msgstr ""
 
-#: builtin/stash.c:1564
-#, c-format
-msgid "could not exec %s"
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
 msgstr ""
 
 #: builtin/stripspace.c:18
@@ -18430,47 +21071,48 @@ msgstr ""
 msgid "prepend comment character and space to each line"
 msgstr ""
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
 msgid "alternative anchor for relative paths"
 msgstr ""
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:416
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: 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 ""
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:526
 #, c-format
 msgid "Entering '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:529
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:551
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -18478,346 +21120,503 @@ msgid ""
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:563
-msgid "Suppress output of entering each submodule command"
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
 msgstr ""
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
-msgid "Recurse into nested submodules"
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:574
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr ""
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:601
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:668
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:672
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:682
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:689
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:708
-msgid "Suppress output for initializing a submodule"
+#: builtin/submodule--helper.c:711
+msgid "suppress output for initializing a submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:716
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
-msgid "Suppress submodule status output"
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
 msgstr ""
 
-#: builtin/submodule--helper.c:876
+#: 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:877
-msgid "recurse into nested submodules"
-msgstr ""
-
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr ""
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr ""
+
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr ""
+
+#: builtin/submodule--helper.c:1007
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1061
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1302
+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 ""
+
+#: builtin/submodule--helper.c:1306
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1308
+msgid "limit the summary size"
+msgstr ""
+
+#: builtin/submodule--helper.c:1313
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1337
+msgid "could not fetch a revision for HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:1342
+msgid "--cached and --files are mutually exclusive"
+msgstr ""
+
+#: builtin/submodule--helper.c:1409
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:1415
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1429
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1440
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1048
-msgid "Suppress output of synchronizing submodule url"
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
 msgstr ""
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1494
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1109
+#: 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)"
 msgstr ""
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1560
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1570
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1581
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1597
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1187
-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:1188
-msgid "Unregister all submodules"
+#: builtin/submodule--helper.c:1627
+msgid "unregister all submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1632
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1646
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: 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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1768
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1775
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr ""
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1800
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+
+#: builtin/submodule--helper.c:1841
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr ""
+
+#: builtin/submodule--helper.c:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1858
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
 msgid "where the new submodule will be cloned to"
 msgstr ""
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
 msgid "name of the new submodule"
 msgstr ""
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
 msgid "url where to clone the submodule from"
 msgstr ""
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
 msgid "depth for shallow clones"
 msgstr ""
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
 msgid "force cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:1393
-msgid ""
-"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:1424
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+msgid "disallow cloning into non-empty directory"
 msgstr ""
 
-#: builtin/submodule--helper.c:1438
-#, c-format
-msgid "could not get submodule directory for '%s'"
+#: builtin/submodule--helper.c:1916
+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:1474
+#: builtin/submodule--helper.c:1953
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1957
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:2058
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr ""
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:2062
 msgid "Maybe you want to use 'update --init'?"
 msgstr ""
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:2092
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:2121
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:2271
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr ""
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:2282
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
 msgid "path into the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:2347
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:2351
 msgid "rebase, merge, checkout or none"
 msgstr ""
 
-#: builtin/submodule--helper.c:1864
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2357
+msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr ""
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:2360
 msgid "parallel jobs"
 msgstr ""
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2362
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr ""
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2363
 msgid "don't print cloning progress"
 msgstr ""
 
-#: builtin/submodule--helper.c:1877
+#: builtin/submodule--helper.c:2374
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:2387
 msgid "bad value for update parameter"
 msgstr ""
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:2435
 #, 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:2061
+#: builtin/submodule--helper.c:2558
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2591
 msgid "recurse into submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2597
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2653
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2656
 msgid "unset the config in the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2661
 msgid "git submodule--helper config <name> [<value>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2662
 msgid "git submodule--helper config --unset <name>"
 msgstr ""
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2663
 msgid "git submodule--helper config --check-writeable"
 msgstr ""
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: 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 ""
 
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
+#: builtin/submodule--helper.c:2698
+msgid "suppress output for setting url of a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:2702
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2735
+msgid "set the default tracking branch to master"
+msgstr ""
+
+#: builtin/submodule--helper.c:2737
+msgid "set the default tracking branch"
+msgstr ""
+
+#: builtin/submodule--helper.c:2741
+msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2742
+msgid ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2749
+msgid "--branch or --default required"
+msgstr ""
+
+#: builtin/submodule--helper.c:2752
+msgid "--branch and --default are mutually exclusive"
+msgstr ""
+
+#: builtin/submodule--helper.c:2815
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:2818
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr ""
+
+#: builtin/submodule--helper.c:2828
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/submodule--helper.c:2842
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr ""
+
+#: builtin/submodule--helper.c:2910
+msgid "allow adding an otherwise ignored submodule path"
+msgstr ""
+
+#: builtin/submodule--helper.c:2917
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr ""
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2991
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr ""
@@ -18830,23 +21629,23 @@ msgstr ""
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr ""
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr ""
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr ""
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr ""
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr ""
 
@@ -18864,24 +21663,25 @@ msgstr ""
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"[<pattern>...]"
 msgstr ""
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr ""
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr ""
 
-#: builtin/tag.c:105
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr ""
 
-#: builtin/tag.c:135
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -18890,7 +21690,7 @@ msgid ""
 "Lines starting with '%c' will be ignored.\n"
 msgstr ""
 
-#: builtin/tag.c:139
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -18900,15 +21700,11 @@ msgid ""
 "want to.\n"
 msgstr ""
 
-#: builtin/tag.c:198
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr ""
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr ""
-
-#: 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"
@@ -18917,382 +21713,382 @@ msgid ""
 "\tgit tag -f %s %s^{}"
 msgstr ""
 
-#: builtin/tag.c:232
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr ""
 
-#: builtin/tag.c:284
+#: builtin/tag.c:328
 msgid "no tag message?"
 msgstr ""
 
-#: builtin/tag.c:291
+#: builtin/tag.c:335
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr ""
 
-#: builtin/tag.c:402
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr ""
 
-#: builtin/tag.c:404
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr ""
 
-#: builtin/tag.c:406
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr ""
 
-#: builtin/tag.c:407
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr ""
 
-#: builtin/tag.c:409
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr ""
 
-#: builtin/tag.c:411
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr ""
 
-#: builtin/tag.c:413
+#: builtin/tag.c:457
 msgid "tag message"
 msgstr ""
 
-#: builtin/tag.c:415
+#: builtin/tag.c:459
 msgid "force edit of tag message"
 msgstr ""
 
-#: builtin/tag.c:416
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr ""
 
-#: builtin/tag.c:419
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr ""
 
-#: builtin/tag.c:420
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
 msgstr ""
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr ""
 
-#: builtin/tag.c:423
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr ""
 
-#: builtin/tag.c:424
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr ""
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that contain the commit"
 msgstr ""
 
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:470 builtin/tag.c:472
 msgid "print only tags that don't contain the commit"
 msgstr ""
 
-#: builtin/tag.c:429
+#: builtin/tag.c:473
 msgid "print only tags that are merged"
 msgstr ""
 
-#: builtin/tag.c:430
+#: builtin/tag.c:474
 msgid "print only tags that are not merged"
 msgstr ""
 
-#: builtin/tag.c:434
+#: builtin/tag.c:478
 msgid "print only tags of the object"
 msgstr ""
 
-#: builtin/tag.c:482
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
 msgstr ""
 
-#: builtin/tag.c:504
+#: builtin/tag.c:548
 msgid "-n option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:506
+#: builtin/tag.c:550
 msgid "--contains option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:508
+#: builtin/tag.c:552
 msgid "--no-contains option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:510
+#: builtin/tag.c:554
 msgid "--points-at option is only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:512
+#: builtin/tag.c:556
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 
-#: builtin/tag.c:523
+#: builtin/tag.c:567
 msgid "only one -F or -m option is allowed."
 msgstr ""
 
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr ""
-
-#: builtin/tag.c:548
+#: builtin/tag.c:592
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr ""
 
-#: builtin/tag.c:553
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
 msgstr ""
 
-#: builtin/tag.c:584
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr ""
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr ""
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr ""
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr ""
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr ""
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr ""
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr ""
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr ""
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr ""
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:976
 msgid "continue refresh even when index needs update"
 msgstr ""
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr ""
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
 msgid "do not ignore new files"
 msgstr ""
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:984
 msgid "let files replace directories and vice-versa"
 msgstr ""
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
 msgid "notice files missing from worktree"
 msgstr ""
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:988
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:991
 msgid "refresh stat information"
 msgstr ""
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr ""
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr ""
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1000
 msgid "add the specified entry to the index"
 msgstr ""
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1010
 msgid "mark files as \"not changing\""
 msgstr ""
 
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
 msgstr ""
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
 msgstr ""
 
-#: builtin/update-index.c:1015
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
 msgstr ""
 
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr ""
+
+#: builtin/update-index.c:1024
 msgid "add to index only; do not add content to object database"
 msgstr ""
 
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1026
 msgid "remove named paths even if present in worktree"
 msgstr ""
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1028
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr ""
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1030
 msgid "read list of paths to be updated from standard input"
 msgstr ""
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1034
 msgid "add entries from standard input to the index"
 msgstr ""
 
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1038
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr ""
 
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1042
 msgid "only update entries that differ from HEAD"
 msgstr ""
 
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1046
 msgid "ignore files missing from worktree"
 msgstr ""
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1049
 msgid "report actions to standard output"
 msgstr ""
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1051
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr ""
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
 msgstr ""
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1059
 msgid "enable/disable untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1061
 msgid "test if the filesystem supports untracked cache"
 msgstr ""
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1063
 msgid "enable untracked cache without testing the filesystem"
 msgstr ""
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1065
 msgid "write out the index even if is not flagged as changed"
 msgstr ""
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1067
 msgid "enable or disable file system monitor"
 msgstr ""
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1069
 msgid "mark files as fsmonitor valid"
 msgstr ""
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c:1072
 msgid "clear fsmonitor valid bit"
 msgstr ""
 
-#: builtin/update-index.c:1169
+#: 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 ""
 
-#: builtin/update-index.c:1178
+#: 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 ""
 
-#: builtin/update-index.c:1190
+#: 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 ""
 
-#: builtin/update-index.c:1194
+#: builtin/update-index.c:1200
 msgid "Untracked cache disabled"
 msgstr ""
 
-#: builtin/update-index.c:1202
+#: 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 ""
 
-#: builtin/update-index.c:1206
+#: builtin/update-index.c:1212
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr ""
 
-#: builtin/update-index.c:1214
+#: builtin/update-index.c:1220
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 
-#: builtin/update-index.c:1218
+#: builtin/update-index.c:1224
 msgid "fsmonitor enabled"
 msgstr ""
 
-#: builtin/update-index.c:1221
+#: builtin/update-index.c:1227
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 
-#: builtin/update-index.c:1225
+#: builtin/update-index.c:1231
 msgid "fsmonitor disabled"
 msgstr ""
 
@@ -19308,19 +22104,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr ""
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr ""
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
 msgstr ""
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr ""
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr ""
 
@@ -19364,15 +22160,15 @@ msgstr ""
 msgid "print raw gpg status output"
 msgstr ""
 
-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr ""
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr ""
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr ""
 
@@ -19384,276 +22180,278 @@ msgstr ""
 msgid "print tag contents"
 msgstr ""
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr ""
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
 msgstr ""
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree lock [<options>] <path>"
 msgstr ""
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree move <worktree> <new-path>"
 msgstr ""
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree prune [<options>]"
 msgstr ""
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree remove [<options>] <worktree>"
 msgstr ""
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr ""
 
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:61 builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr ""
 
-#: builtin/worktree.c:79
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr ""
-
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr ""
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr ""
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-
-#: builtin/worktree.c:117
+#: builtin/worktree.c:74
 #, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
+msgid "Removing %s/%s: %s"
 msgstr ""
 
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr ""
 
-#: builtin/worktree.c:167
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr ""
 
-#: builtin/worktree.c:234
+#: builtin/worktree.c:219
 #, c-format
 msgid "'%s' already exists"
 msgstr ""
 
-#: builtin/worktree.c:251
+#: builtin/worktree.c:228
 #, c-format
-msgid "unable to re-add worktree '%s'"
+msgid "unusable worktree destination '%s'"
 msgstr ""
 
-#: builtin/worktree.c:256
+#: builtin/worktree.c:233
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:258
+#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:286
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr ""
 
-#: builtin/worktree.c:439 builtin/worktree.c:445
+#: builtin/worktree.c:308
+msgid "initializing"
+msgstr ""
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
-#: builtin/worktree.c:441
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/worktree.c:450
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
-#: builtin/worktree.c:456
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr ""
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr ""
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr ""
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr ""
 
-#: builtin/worktree.c:508
+#: 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:511
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 
-#: builtin/worktree.c:519
+#: builtin/worktree.c:506
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr ""
 
-#: builtin/worktree.c:580
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr ""
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr ""
+
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 
-#: builtin/worktree.c:680
-msgid "reason for locking"
+#: builtin/worktree.c:691
+msgid "show extended annotations and reasons, if available"
 msgstr ""
 
-#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: builtin/worktree.c:693
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+
+#: 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 ""
 
-#: builtin/worktree.c:694 builtin/worktree.c:727
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr ""
 
-#: builtin/worktree.c:699
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr ""
 
-#: builtin/worktree.c:701
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr ""
 
-#: builtin/worktree.c:729
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr ""
 
-#: builtin/worktree.c:770
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
-#: builtin/worktree.c:778
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:801 builtin/worktree.c:928
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
-#: builtin/worktree.c:806
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 
-#: builtin/worktree.c:812
-#, c-format
-msgid "target '%s' already exists"
-msgstr ""
-
-#: builtin/worktree.c:820
+#: 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:822
+#: 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:825
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:830
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 
-#: builtin/worktree.c:878
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
-#: builtin/worktree.c:882
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 
-#: builtin/worktree.c:887
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
-#: builtin/worktree.c:910
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:933
+#: 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:935
+#: 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:938
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 
+#: builtin/worktree.c:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr ""
+
+#: 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 ""
@@ -19670,57 +22468,18 @@ msgstr ""
 msgid "only useful for debugging"
 msgstr ""
 
-#: fast-import.c:3118
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr ""
-
-#: fast-import.c:3123
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr ""
-
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr ""
-
-#: t/helper/test-reach.c:152
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr ""
-
-#: t/helper/test-reach.c:162
-msgid "too many commits marked reachable"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr ""
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr ""
-
-#: git.c:27
+#: git.c:28
 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"
 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "           <command> [<args>]"
 msgstr ""
 
-#: git.c:34
+#: 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"
@@ -19728,139 +22487,290 @@ msgid ""
 "See 'git help git' for an overview of the system."
 msgstr ""
 
-#: git.c:186
+#: git.c:188
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr ""
 
-#: git.c:200
+#: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr ""
 
-#: git.c:214
+#: git.c:216
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr ""
 
-#: git.c:228
+#: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr ""
 
-#: git.c:250
+#: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr ""
 
-#: git.c:288
+#: 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:314
+#: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
 msgstr ""
 
-#: git.c:360
+#: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr ""
 
-#: git.c:369
+#: 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:376
+#: git.c:391
 #, c-format
 msgid "empty alias for %s"
 msgstr ""
 
-#: git.c:379
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr ""
 
-#: git.c:459
+#: git.c:476
 msgid "write failure on standard output"
 msgstr ""
 
-#: git.c:461
+#: git.c:478
 msgid "unknown write failure on standard output"
 msgstr ""
 
-#: git.c:463
+#: git.c:480
 msgid "close failed on standard output"
 msgstr ""
 
-#: git.c:792
+#: git.c:833
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr ""
 
-#: git.c:842
+#: git.c:883
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr ""
 
-#: git.c:855
+#: git.c:896
 #, c-format
 msgid ""
 "usage: %s\n"
 "\n"
 msgstr ""
 
-#: git.c:875
+#: git.c:916
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 
-#: git.c:887
+#: git.c:928
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr ""
 
-#: http.c:378
+#: http-fetch.c:118
 #, c-format
-msgid "negative value for http.postbuffer; defaulting to %d"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr ""
+
+#: http-fetch.c:128
+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 ""
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr ""
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr ""
+
+#: 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"
+msgstr ""
+
+#: http.c:420
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr ""
 
-#: http.c:408
+#: http.c:429
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr ""
 
-#: http.c:878
+#: http.c:910
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr ""
 
-#: http.c:951
+#: http.c:989
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr ""
 
-#: http.c:1088
+#: http.c:1132
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 
-#: http.c:1095
+#: http.c:1139
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 
-#: http.c:1099
+#: http.c:1143
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 
-#: http.c:1968
+#: http.c:2034
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -19868,165 +22778,197 @@ msgid ""
 "   redirect: %s"
 msgstr ""
 
-#: remote-curl.c:166
+#: remote-curl.c:183
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr ""
 
-#: remote-curl.c:263
+#: remote-curl.c:307
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr ""
 
-#: remote-curl.c:364
+#: remote-curl.c:408
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 
-#: remote-curl.c:395
+#: remote-curl.c:439
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr ""
 
-#: remote-curl.c:455
+#: remote-curl.c:499
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""
 
-#: remote-curl.c:459
+#: remote-curl.c:503
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr ""
 
-#: remote-curl.c:463
+#: remote-curl.c:507
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr ""
 
-#: remote-curl.c:469
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
 msgstr ""
 
-#: remote-curl.c:593
+#: remote-curl.c:644
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr ""
 
-#: remote-curl.c:673
+#: remote-curl.c:656
+msgid "remote server sent unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 
-#: remote-curl.c:733
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
+
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c:834
 #, c-format
 msgid "RPC failed; %s"
 msgstr ""
 
-#: remote-curl.c:773
+#: remote-curl.c:874
 msgid "cannot handle pushes this big"
 msgstr ""
 
-#: remote-curl.c:888
+#: remote-curl.c:989
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 
-#: remote-curl.c:892
+#: remote-curl.c:993
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr ""
 
-#: remote-curl.c:1023
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
+
+#: remote-curl.c:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
+
+#: remote-curl.c:1134
 msgid "dumb http transport does not support shallow capabilities"
 msgstr ""
 
-#: remote-curl.c:1037
+#: remote-curl.c:1149
 msgid "fetch failed."
 msgstr ""
 
-#: remote-curl.c:1085
+#: remote-curl.c:1195
 msgid "cannot fetch by sha1 over smart http"
 msgstr ""
 
-#: remote-curl.c:1129 remote-curl.c:1135
+#: remote-curl.c:1239 remote-curl.c:1245
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr ""
 
-#: remote-curl.c:1147 remote-curl.c:1261
+#: remote-curl.c:1257 remote-curl.c:1375
 #, c-format
 msgid "http transport does not support %s"
 msgstr ""
 
-#: remote-curl.c:1183
+#: remote-curl.c:1293
 msgid "git-http-push failed"
 msgstr ""
 
-#: remote-curl.c:1367
+#: remote-curl.c:1481
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr ""
 
-#: remote-curl.c:1399
+#: remote-curl.c:1513
 msgid "remote-curl: error reading command stream from git"
 msgstr ""
 
-#: remote-curl.c:1406
+#: remote-curl.c:1520
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr ""
 
-#: remote-curl.c:1446
+#: remote-curl.c:1561
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr ""
 
-#: list-objects-filter-options.h:85
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr ""
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr ""
+
+#: list-objects-filter-options.h:94
 msgid "args"
 msgstr ""
 
-#: list-objects-filter-options.h:86
+#: list-objects-filter-options.h:95
 msgid "object filtering"
 msgstr ""
 
-#: parse-options.h:179
+#: parse-options.h:184
 msgid "expiry-date"
 msgstr ""
 
-#: parse-options.h:193
+#: parse-options.h:198
 msgid "no-op (backward compatibility)"
 msgstr ""
 
-#: parse-options.h:305
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr ""
 
-#: parse-options.h:307
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr ""
 
-#: parse-options.h:313
-msgid "use <n> digits to display SHA-1s"
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
 msgstr ""
 
-#: parse-options.h:332
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr ""
 
-#: ref-filter.h:101
-msgid "key"
+#: parse-options.h:338
+msgid "read pathspec from file"
 msgstr ""
 
-#: ref-filter.h:101
-msgid "field name to sort on"
+#: parse-options.h:339
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
 msgstr ""
 
-#: rerere.h:44
-msgid "update the index with reused conflict resolution if possible"
+#: ref-filter.h:99
+msgid "key"
 msgstr ""
 
-#: wt-status.h:67
-msgid "HEAD detached at "
+#: ref-filter.h:99
+msgid "field name to sort on"
 msgstr ""
 
-#: wt-status.h:68
-msgid "HEAD detached from "
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
 msgstr ""
 
 #: command-list.h:50
@@ -20066,692 +23008,676 @@ msgid "List, create, or delete branches"
 msgstr ""
 
 #: command-list.h:59
-msgid "Move objects and refs by archive"
+msgid "Collect information for user to file a bug report"
 msgstr ""
 
 #: command-list.h:60
-msgid "Provide content or type and size information for repository objects"
+msgid "Move objects and refs by archive"
 msgstr ""
 
 #: command-list.h:61
-msgid "Display gitattributes information"
+msgid "Provide content or type and size information for repository objects"
 msgstr ""
 
 #: command-list.h:62
-msgid "Debug gitignore / exclude files"
+msgid "Display gitattributes information"
 msgstr ""
 
 #: command-list.h:63
-msgid "Show canonical names and email addresses of contacts"
+msgid "Debug gitignore / exclude files"
 msgstr ""
 
 #: command-list.h:64
-msgid "Switch branches or restore working tree files"
+msgid "Show canonical names and email addresses of contacts"
 msgstr ""
 
 #: command-list.h:65
-msgid "Copy files from the index to the working tree"
+msgid "Switch branches or restore working tree files"
 msgstr ""
 
 #: command-list.h:66
-msgid "Ensures that a reference name is well formed"
+msgid "Copy files from the index to the working tree"
 msgstr ""
 
 #: command-list.h:67
-msgid "Find commits yet to be applied to upstream"
+msgid "Ensures that a reference name is well formed"
 msgstr ""
 
 #: command-list.h:68
-msgid "Apply the changes introduced by some existing commits"
+msgid "Find commits yet to be applied to upstream"
 msgstr ""
 
 #: command-list.h:69
-msgid "Graphical alternative to git-commit"
+msgid "Apply the changes introduced by some existing commits"
 msgstr ""
 
 #: command-list.h:70
-msgid "Remove untracked files from the working tree"
+msgid "Graphical alternative to git-commit"
 msgstr ""
 
 #: command-list.h:71
-msgid "Clone a repository into a new directory"
+msgid "Remove untracked files from the working tree"
 msgstr ""
 
 #: command-list.h:72
-msgid "Display data in columns"
+msgid "Clone a repository into a new directory"
 msgstr ""
 
 #: command-list.h:73
-msgid "Record changes to the repository"
+msgid "Display data in columns"
 msgstr ""
 
 #: command-list.h:74
-msgid "Write and verify Git commit-graph files"
+msgid "Record changes to the repository"
 msgstr ""
 
 #: command-list.h:75
-msgid "Create a new commit object"
+msgid "Write and verify Git commit-graph files"
 msgstr ""
 
 #: command-list.h:76
-msgid "Get and set repository or global options"
+msgid "Create a new commit object"
 msgstr ""
 
 #: command-list.h:77
-msgid "Count unpacked number of objects and their disk consumption"
+msgid "Get and set repository or global options"
 msgstr ""
 
 #: command-list.h:78
-msgid "Retrieve and store user credentials"
+msgid "Count unpacked number of objects and their disk consumption"
 msgstr ""
 
 #: command-list.h:79
-msgid "Helper to temporarily store passwords in memory"
+msgid "Retrieve and store user credentials"
 msgstr ""
 
 #: command-list.h:80
-msgid "Helper to store credentials on disk"
+msgid "Helper to temporarily store passwords in memory"
 msgstr ""
 
 #: command-list.h:81
-msgid "Export a single commit to a CVS checkout"
+msgid "Helper to store credentials on disk"
 msgstr ""
 
 #: command-list.h:82
-msgid "Salvage your data out of another SCM people love to hate"
+msgid "Export a single commit to a CVS checkout"
 msgstr ""
 
 #: command-list.h:83
-msgid "A CVS server emulator for Git"
+msgid "Salvage your data out of another SCM people love to hate"
 msgstr ""
 
 #: command-list.h:84
-msgid "A really simple server for Git repositories"
+msgid "A CVS server emulator for Git"
 msgstr ""
 
 #: command-list.h:85
-msgid "Give an object a human readable name based on an available ref"
+msgid "A really simple server for Git repositories"
 msgstr ""
 
 #: command-list.h:86
-msgid "Show changes between commits, commit and working tree, etc"
+msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 
 #: command-list.h:87
-msgid "Compares files in the working tree and the index"
+msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 
 #: command-list.h:88
-msgid "Compare a tree to the working tree or index"
+msgid "Compares files in the working tree and the index"
 msgstr ""
 
 #: command-list.h:89
-msgid "Compares the content and mode of blobs found via two tree objects"
+msgid "Compare a tree to the working tree or index"
 msgstr ""
 
 #: command-list.h:90
-msgid "Show changes using common diff tools"
+msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 
 #: command-list.h:91
-msgid "Git data exporter"
+msgid "Show changes using common diff tools"
 msgstr ""
 
 #: command-list.h:92
-msgid "Backend for fast Git data importers"
+msgid "Git data exporter"
 msgstr ""
 
 #: command-list.h:93
-msgid "Download objects and refs from another repository"
+msgid "Backend for fast Git data importers"
 msgstr ""
 
 #: command-list.h:94
-msgid "Receive missing objects from another repository"
+msgid "Download objects and refs from another repository"
 msgstr ""
 
 #: command-list.h:95
-msgid "Rewrite branches"
+msgid "Receive missing objects from another repository"
 msgstr ""
 
 #: command-list.h:96
-msgid "Produce a merge commit message"
+msgid "Rewrite branches"
 msgstr ""
 
 #: command-list.h:97
-msgid "Output information on each ref"
+msgid "Produce a merge commit message"
 msgstr ""
 
 #: command-list.h:98
-msgid "Prepare patches for e-mail submission"
+msgid "Output information on each ref"
 msgstr ""
 
 #: command-list.h:99
-msgid "Verifies the connectivity and validity of the objects in the database"
+msgid "Run a Git command on a list of repositories"
 msgstr ""
 
 #: command-list.h:100
-msgid "Cleanup unnecessary files and optimize the local repository"
+msgid "Prepare patches for e-mail submission"
 msgstr ""
 
 #: command-list.h:101
-msgid "Extract commit ID from an archive created using git-archive"
+msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 
 #: command-list.h:102
-msgid "Print lines matching a pattern"
+msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr ""
 
 #: command-list.h:103
-msgid "A portable graphical interface to Git"
+msgid "Extract commit ID from an archive created using git-archive"
 msgstr ""
 
 #: command-list.h:104
-msgid "Compute object ID and optionally creates a blob from a file"
+msgid "Print lines matching a pattern"
 msgstr ""
 
 #: command-list.h:105
-msgid "Display help information about Git"
+msgid "A portable graphical interface to Git"
 msgstr ""
 
 #: command-list.h:106
-msgid "Server side implementation of Git over HTTP"
+msgid "Compute object ID and optionally creates a blob from a file"
 msgstr ""
 
 #: command-list.h:107
-msgid "Download from a remote Git repository via HTTP"
+msgid "Display help information about Git"
 msgstr ""
 
 #: command-list.h:108
-msgid "Push objects over HTTP/DAV to another repository"
+msgid "Server side implementation of Git over HTTP"
 msgstr ""
 
 #: command-list.h:109
-msgid "Send a collection of patches from stdin to an IMAP folder"
+msgid "Download from a remote Git repository via HTTP"
 msgstr ""
 
 #: command-list.h:110
-msgid "Build pack index file for an existing packed archive"
+msgid "Push objects over HTTP/DAV to another repository"
 msgstr ""
 
 #: command-list.h:111
-msgid "Create an empty Git repository or reinitialize an existing one"
+msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 
 #: command-list.h:112
-msgid "Instantly browse your working repository in gitweb"
+msgid "Build pack index file for an existing packed archive"
 msgstr ""
 
 #: command-list.h:113
-msgid "Add or parse structured information in commit messages"
+msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr ""
 
 #: command-list.h:114
-msgid "The Git repository browser"
+msgid "Instantly browse your working repository in gitweb"
 msgstr ""
 
 #: command-list.h:115
-msgid "Show commit logs"
+msgid "Add or parse structured information in commit messages"
 msgstr ""
 
 #: command-list.h:116
-msgid "Show information about files in the index and the working tree"
+msgid "The Git repository browser"
 msgstr ""
 
 #: command-list.h:117
-msgid "List references in a remote repository"
+msgid "Show commit logs"
 msgstr ""
 
 #: command-list.h:118
-msgid "List the contents of a tree object"
+msgid "Show information about files in the index and the working tree"
 msgstr ""
 
 #: command-list.h:119
-msgid "Extracts patch and authorship from a single e-mail message"
+msgid "List references in a remote repository"
 msgstr ""
 
 #: command-list.h:120
-msgid "Simple UNIX mbox splitter program"
+msgid "List the contents of a tree object"
 msgstr ""
 
 #: command-list.h:121
-msgid "Join two or more development histories together"
+msgid "Extracts patch and authorship from a single e-mail message"
 msgstr ""
 
 #: command-list.h:122
-msgid "Find as good common ancestors as possible for a merge"
+msgid "Simple UNIX mbox splitter program"
 msgstr ""
 
 #: command-list.h:123
-msgid "Run a three-way file merge"
+msgid "Run tasks to optimize Git repository data"
 msgstr ""
 
 #: command-list.h:124
-msgid "Run a merge for files needing merging"
+msgid "Join two or more development histories together"
 msgstr ""
 
 #: command-list.h:125
-msgid "The standard helper program to use with git-merge-index"
+msgid "Find as good common ancestors as possible for a merge"
 msgstr ""
 
 #: command-list.h:126
-msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgid "Run a three-way file merge"
 msgstr ""
 
 #: command-list.h:127
-msgid "Show three-way merge without touching index"
+msgid "Run a merge for files needing merging"
 msgstr ""
 
 #: command-list.h:128
-msgid "Write and verify multi-pack-indexes"
+msgid "The standard helper program to use with git-merge-index"
 msgstr ""
 
 #: command-list.h:129
-msgid "Creates a tag object"
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 
 #: command-list.h:130
-msgid "Build a tree-object from ls-tree formatted text"
+msgid "Show three-way merge without touching index"
 msgstr ""
 
 #: command-list.h:131
-msgid "Move or rename a file, a directory, or a symlink"
+msgid "Write and verify multi-pack-indexes"
 msgstr ""
 
 #: command-list.h:132
-msgid "Find symbolic names for given revs"
+msgid "Creates a tag object with extra validation"
 msgstr ""
 
 #: command-list.h:133
-msgid "Add or inspect object notes"
+msgid "Build a tree-object from ls-tree formatted text"
 msgstr ""
 
 #: command-list.h:134
-msgid "Import from and submit to Perforce repositories"
+msgid "Move or rename a file, a directory, or a symlink"
 msgstr ""
 
 #: command-list.h:135
-msgid "Create a packed archive of objects"
+msgid "Find symbolic names for given revs"
 msgstr ""
 
 #: command-list.h:136
-msgid "Find redundant pack files"
+msgid "Add or inspect object notes"
 msgstr ""
 
 #: command-list.h:137
-msgid "Pack heads and tags for efficient repository access"
+msgid "Import from and submit to Perforce repositories"
 msgstr ""
 
 #: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
+msgid "Create a packed archive of objects"
 msgstr ""
 
 #: command-list.h:139
-msgid "Compute unique ID for a patch"
+msgid "Find redundant pack files"
 msgstr ""
 
 #: command-list.h:140
-msgid "Prune all unreachable objects from the object database"
+msgid "Pack heads and tags for efficient repository access"
 msgstr ""
 
 #: command-list.h:141
-msgid "Remove extra objects that are already in pack files"
+msgid "Compute unique ID for a patch"
 msgstr ""
 
 #: command-list.h:142
-msgid "Fetch from and integrate with another repository or a local branch"
+msgid "Prune all unreachable objects from the object database"
 msgstr ""
 
 #: command-list.h:143
-msgid "Update remote refs along with associated objects"
+msgid "Remove extra objects that are already in pack files"
 msgstr ""
 
 #: command-list.h:144
-msgid "Applies a quilt patchset onto the current branch"
+msgid "Fetch from and integrate with another repository or a local branch"
 msgstr ""
 
 #: command-list.h:145
-msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgid "Update remote refs along with associated objects"
 msgstr ""
 
 #: command-list.h:146
-msgid "Reads tree information into the index"
+msgid "Applies a quilt patchset onto the current branch"
 msgstr ""
 
 #: command-list.h:147
-msgid "Reapply commits on top of another base tip"
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr ""
 
 #: command-list.h:148
-msgid "Receive what is pushed into the repository"
+msgid "Reads tree information into the index"
 msgstr ""
 
 #: command-list.h:149
-msgid "Manage reflog information"
+msgid "Reapply commits on top of another base tip"
 msgstr ""
 
 #: command-list.h:150
-msgid "Manage set of tracked repositories"
+msgid "Receive what is pushed into the repository"
 msgstr ""
 
 #: command-list.h:151
-msgid "Pack unpacked objects in a repository"
+msgid "Manage reflog information"
 msgstr ""
 
 #: command-list.h:152
-msgid "Create, list, delete refs to replace objects"
+msgid "Manage set of tracked repositories"
 msgstr ""
 
 #: command-list.h:153
-msgid "Generates a summary of pending changes"
+msgid "Pack unpacked objects in a repository"
 msgstr ""
 
 #: command-list.h:154
-msgid "Reuse recorded resolution of conflicted merges"
+msgid "Create, list, delete refs to replace objects"
 msgstr ""
 
 #: command-list.h:155
-msgid "Reset current HEAD to the specified state"
+msgid "Generates a summary of pending changes"
 msgstr ""
 
 #: command-list.h:156
-msgid "Restore working tree files"
+msgid "Reuse recorded resolution of conflicted merges"
 msgstr ""
 
 #: command-list.h:157
-msgid "Revert some existing commits"
+msgid "Reset current HEAD to the specified state"
 msgstr ""
 
 #: command-list.h:158
-msgid "Lists commit objects in reverse chronological order"
+msgid "Restore working tree files"
 msgstr ""
 
 #: command-list.h:159
-msgid "Pick out and massage parameters"
+msgid "Revert some existing commits"
 msgstr ""
 
 #: command-list.h:160
-msgid "Remove files from the working tree and from the index"
+msgid "Lists commit objects in reverse chronological order"
 msgstr ""
 
 #: command-list.h:161
-msgid "Send a collection of patches as emails"
+msgid "Pick out and massage parameters"
 msgstr ""
 
 #: command-list.h:162
-msgid "Push objects over Git protocol to another repository"
+msgid "Remove files from the working tree and from the index"
 msgstr ""
 
 #: command-list.h:163
-msgid "Restricted login shell for Git-only SSH access"
+msgid "Send a collection of patches as emails"
 msgstr ""
 
 #: command-list.h:164
-msgid "Summarize 'git log' output"
+msgid "Push objects over Git protocol to another repository"
 msgstr ""
 
 #: command-list.h:165
-msgid "Show various types of objects"
+msgid "Restricted login shell for Git-only SSH access"
 msgstr ""
 
 #: command-list.h:166
-msgid "Show branches and their commits"
+msgid "Summarize 'git log' output"
 msgstr ""
 
 #: command-list.h:167
-msgid "Show packed archive index"
+msgid "Show various types of objects"
 msgstr ""
 
 #: command-list.h:168
-msgid "List references in a local repository"
+msgid "Show branches and their commits"
 msgstr ""
 
 #: command-list.h:169
-msgid "Git's i18n setup code for shell scripts"
+msgid "Show packed archive index"
 msgstr ""
 
 #: command-list.h:170
-msgid "Common Git shell script setup code"
+msgid "List references in a local repository"
 msgstr ""
 
 #: command-list.h:171
-msgid "Stash the changes in a dirty working directory away"
+msgid "Git's i18n setup code for shell scripts"
 msgstr ""
 
 #: command-list.h:172
-msgid "Add file contents to the staging area"
+msgid "Common Git shell script setup code"
 msgstr ""
 
 #: command-list.h:173
-msgid "Show the working tree status"
+msgid "Initialize and modify the sparse-checkout"
 msgstr ""
 
 #: command-list.h:174
-msgid "Remove unnecessary whitespace"
+msgid "Stash the changes in a dirty working directory away"
 msgstr ""
 
 #: command-list.h:175
-msgid "Initialize, update or inspect submodules"
+msgid "Add file contents to the staging area"
 msgstr ""
 
 #: command-list.h:176
-msgid "Bidirectional operation between a Subversion repository and Git"
+msgid "Show the working tree status"
 msgstr ""
 
 #: command-list.h:177
-msgid "Switch branches"
+msgid "Remove unnecessary whitespace"
 msgstr ""
 
 #: command-list.h:178
-msgid "Read, modify and delete symbolic refs"
+msgid "Initialize, update or inspect submodules"
 msgstr ""
 
 #: command-list.h:179
-msgid "Create, list, delete or verify a tag object signed with GPG"
+msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr ""
 
 #: command-list.h:180
-msgid "Creates a temporary file with a blob's contents"
+msgid "Switch branches"
 msgstr ""
 
 #: command-list.h:181
-msgid "Unpack objects from a packed archive"
+msgid "Read, modify and delete symbolic refs"
 msgstr ""
 
 #: command-list.h:182
-msgid "Register file contents in the working tree to the index"
+msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr ""
 
 #: command-list.h:183
-msgid "Update the object name stored in a ref safely"
+msgid "Creates a temporary file with a blob's contents"
 msgstr ""
 
 #: command-list.h:184
-msgid "Update auxiliary info file to help dumb servers"
+msgid "Unpack objects from a packed archive"
 msgstr ""
 
 #: command-list.h:185
-msgid "Send archive back to git-archive"
+msgid "Register file contents in the working tree to the index"
 msgstr ""
 
 #: command-list.h:186
-msgid "Send objects packed back to git-fetch-pack"
+msgid "Update the object name stored in a ref safely"
 msgstr ""
 
 #: command-list.h:187
-msgid "Show a Git logical variable"
+msgid "Update auxiliary info file to help dumb servers"
 msgstr ""
 
 #: command-list.h:188
-msgid "Check the GPG signature of commits"
+msgid "Send archive back to git-archive"
 msgstr ""
 
 #: command-list.h:189
-msgid "Validate packed Git archive files"
+msgid "Send objects packed back to git-fetch-pack"
 msgstr ""
 
 #: command-list.h:190
-msgid "Check the GPG signature of tags"
+msgid "Show a Git logical variable"
 msgstr ""
 
 #: command-list.h:191
-msgid "Git web interface (web frontend to Git repositories)"
+msgid "Check the GPG signature of commits"
 msgstr ""
 
 #: command-list.h:192
-msgid "Show logs with difference each commit introduces"
+msgid "Validate packed Git archive files"
 msgstr ""
 
 #: command-list.h:193
-msgid "Manage multiple working trees"
+msgid "Check the GPG signature of tags"
 msgstr ""
 
 #: command-list.h:194
-msgid "Create a tree object from the current index"
+msgid "Git web interface (web frontend to Git repositories)"
 msgstr ""
 
 #: command-list.h:195
-msgid "Defining attributes per path"
+msgid "Show logs with difference each commit introduces"
 msgstr ""
 
 #: command-list.h:196
-msgid "Git command-line interface and conventions"
+msgid "Manage multiple working trees"
 msgstr ""
 
 #: command-list.h:197
-msgid "A Git core tutorial for developers"
+msgid "Create a tree object from the current index"
 msgstr ""
 
 #: command-list.h:198
-msgid "Git for CVS users"
+msgid "Defining attributes per path"
 msgstr ""
 
 #: command-list.h:199
-msgid "Tweaking diff output"
+msgid "Git command-line interface and conventions"
 msgstr ""
 
 #: command-list.h:200
-msgid "A useful minimum set of commands for Everyday Git"
+msgid "A Git core tutorial for developers"
 msgstr ""
 
 #: command-list.h:201
-msgid "A Git Glossary"
+msgid "Providing usernames and passwords to Git"
 msgstr ""
 
 #: command-list.h:202
-msgid "Hooks used by Git"
+msgid "Git for CVS users"
 msgstr ""
 
 #: command-list.h:203
-msgid "Specifies intentionally untracked files to ignore"
+msgid "Tweaking diff output"
 msgstr ""
 
 #: command-list.h:204
-msgid "Defining submodule properties"
+msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
 
 #: command-list.h:205
-msgid "Git namespaces"
+msgid "Frequently asked questions about using Git"
 msgstr ""
 
 #: command-list.h:206
-msgid "Git Repository Layout"
+msgid "A Git Glossary"
 msgstr ""
 
 #: command-list.h:207
-msgid "Specifying revisions and ranges for Git"
+msgid "Hooks used by Git"
 msgstr ""
 
 #: command-list.h:208
-msgid "A tutorial introduction to Git: part two"
+msgid "Specifies intentionally untracked files to ignore"
 msgstr ""
 
 #: command-list.h:209
-msgid "A tutorial introduction to Git"
+msgid "Map author/committer names and/or E-Mail addresses"
 msgstr ""
 
 #: command-list.h:210
-msgid "An overview of recommended workflows with Git"
-msgstr ""
-
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
+msgid "Defining submodule properties"
 msgstr ""
 
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
+#: command-list.h:211
+msgid "Git namespaces"
 msgstr ""
 
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
 msgstr ""
 
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
+#: command-list.h:213
+msgid "Git Repository Layout"
 msgstr ""
 
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
+#: command-list.h:214
+msgid "Specifying revisions and ranges for Git"
 msgstr ""
 
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
+#: command-list.h:215
+msgid "Mounting one repository inside another"
 msgstr ""
 
-#: git-bisect.sh:209
-msgid "No logfile given"
+#: command-list.h:216
+msgid "A tutorial introduction to Git: part two"
 msgstr ""
 
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
+#: command-list.h:217
+msgid "A tutorial introduction to Git"
 msgstr ""
 
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
+#: command-list.h:218
+msgid "An overview of recommended workflows with Git"
 msgstr ""
 
-#: git-bisect.sh:241
+#: git-bisect.sh:68
 msgid "bisect run failed: no command provided."
 msgstr ""
 
-#: git-bisect.sh:246
+#: git-bisect.sh:73
 #, sh-format
 msgid "running $command"
 msgstr ""
 
-#: git-bisect.sh:253
+#: git-bisect.sh:80
 #, sh-format
 msgid ""
 "bisect run failed:\n"
 "exit code $res from '$command' is < 0 or >= 128"
 msgstr ""
 
-#: git-bisect.sh:279
+#: git-bisect.sh:105
 msgid "bisect run cannot continue any more"
 msgstr ""
 
-#: git-bisect.sh:285
+#: git-bisect.sh:111
 #, sh-format
 msgid ""
 "bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
 msgstr ""
 
-#: git-bisect.sh:292
+#: git-bisect.sh:118
 msgid "bisect run success"
 msgstr ""
 
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr ""
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -20790,271 +23716,116 @@ msgstr ""
 msgid "Simple merge did not work, trying automatic merge."
 msgstr ""
 
-#: git-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr ""
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr ""
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr ""
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr ""
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr ""
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr ""
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr ""
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr ""
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr ""
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr ""
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr ""
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr ""
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr ""
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr ""
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr ""
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr ""
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr ""
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr ""
-
-#: git-submodule.sh:200
+#: git-submodule.sh:179
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 
-#: git-submodule.sh:210
+#: git-submodule.sh:189
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr ""
 
-#: git-submodule.sh:229
+#: git-submodule.sh:208
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr ""
 
-#: git-submodule.sh:232
+#: git-submodule.sh:211
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr ""
 
-#: git-submodule.sh:239
+#: git-submodule.sh:218
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr ""
 
-#: git-submodule.sh:245
-#, 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 ""
-
-#: git-submodule.sh:268
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr ""
-
-#: git-submodule.sh:270
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr ""
-
-#: git-submodule.sh:278
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr ""
-
-#: git-submodule.sh:280
-#, 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:286
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr ""
-
-#: git-submodule.sh:298
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:303
+#: git-submodule.sh:248
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:312
+#: git-submodule.sh:257
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:573
+#: git-submodule.sh:532
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:583
+#: git-submodule.sh:542
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:588
+#: git-submodule.sh:547
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
 
-#: git-submodule.sh:606
+#: git-submodule.sh:565
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
 "$sha1:"
 msgstr ""
 
-#: git-submodule.sh:612
+#: 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 ""
 
-#: git-submodule.sh:619
+#: git-submodule.sh:578
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:620
+#: git-submodule.sh:579
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:624
+#: git-submodule.sh:583
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:625
+#: git-submodule.sh:584
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:630
+#: git-submodule.sh:589
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:631
+#: git-submodule.sh:590
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr ""
 
-#: git-submodule.sh:636
+#: git-submodule.sh:595
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:637
+#: git-submodule.sh:596
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr ""
 
-#: git-submodule.sh:668
+#: git-submodule.sh:627
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr ""
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr ""
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr ""
-
-#: git-submodule.sh:902
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr ""
-
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr ""
-
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr ""
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr ""
-
 #: git-rebase--preserve-merges.sh:109
 msgid "Applied autostash."
 msgstr ""
@@ -21064,12 +23835,19 @@ msgstr ""
 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:207
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -21090,7 +23868,7 @@ msgid ""
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:270
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -21102,83 +23880,83 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:295
+#: git-rebase--preserve-merges.sh:285
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:334
+#: git-rebase--preserve-merges.sh:324
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:364
+#: git-rebase--preserve-merges.sh:354
 msgid "Cannot write current commit's replacement sha1"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:415
+#: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:407
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:426
+#: git-rebase--preserve-merges.sh:416
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:431
+#: git-rebase--preserve-merges.sh:421
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:449
+#: git-rebase--preserve-merges.sh:439
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:458
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:467
+#: git-rebase--preserve-merges.sh:457
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:472
+#: git-rebase--preserve-merges.sh:462
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:483
+#: 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:492
+#: git-rebase--preserve-merges.sh:482
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:495
+#: git-rebase--preserve-merges.sh:485
 msgid "This is a combination of 2 commits."
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
-#: git-rebase--preserve-merges.sh:582
+#: 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:611
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -21188,31 +23966,31 @@ msgid ""
 "you are able to reword the commit."
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:626
+#: git-rebase--preserve-merges.sh:616
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:641
+#: git-rebase--preserve-merges.sh:631
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:683
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:691
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:693
+#: git-rebase--preserve-merges.sh:683
 msgid "and made changes to the index and/or the working tree"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:695
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -21220,7 +23998,7 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:708
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -21230,25 +24008,25 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:719
+#: git-rebase--preserve-merges.sh:709
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:720
+#: git-rebase--preserve-merges.sh:710
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:755
+#: git-rebase--preserve-merges.sh:745
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:812
+#: git-rebase--preserve-merges.sh:802
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:817
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -21266,50 +24044,54 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:834
+#: git-rebase--preserve-merges.sh:824
 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:839
+#: 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:844 git-rebase--preserve-merges.sh:848
+#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
 msgid "Could not commit staged changes."
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
+#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
 msgid "Could not execute editor"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:900
+#: git-rebase--preserve-merges.sh:890
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:907
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:908
+#: git-rebase--preserve-merges.sh:898
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:911
+#: git-rebase--preserve-merges.sh:901
 msgid "Could not mark as interactive"
 msgstr ""
 
-#: git-rebase--preserve-merges.sh:943
+#: 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:997 git-rebase--preserve-merges.sh:1002
+#: 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 ""
 
@@ -21371,52 +24153,11 @@ msgid "Unable to determine absolute path of git directory"
 msgstr ""
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr ""
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr ""
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr ""
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr ""
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr ""
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr ""
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] ""
-msgstr[1] ""
-
 #: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
@@ -21424,69 +24165,44 @@ msgid_plural "touched %d paths\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr ""
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr ""
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr ""
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr ""
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: 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."
 msgstr ""
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: 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."
 msgstr ""
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -21495,31 +24211,12 @@ msgid ""
 "Lines starting with %s will be removed.\n"
 msgstr ""
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-msgid ""
-"If it does not apply cleanly, you will be given an opportunity to\n"
-"edit again.  If all lines of the hunk are removed, then the edit is\n"
-"aborted and the hunk is left unchanged.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr ""
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -21528,7 +24225,7 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -21537,7 +24234,7 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -21546,7 +24243,7 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -21555,7 +24252,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -21564,7 +24261,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -21573,7 +24270,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -21582,7 +24279,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -21591,7 +24288,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr ""
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -21604,226 +24301,90 @@ msgid ""
 "? - print help\n"
 msgstr ""
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1345
 msgid "The selected hunks do not apply to the index!\n"
 msgstr ""
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr ""
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr ""
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr ""
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1427
+#: git-add--interactive.perl:1479
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1480
 #, perl-format
-msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1481
 #, perl-format
-msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr ""
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
 msgstr ""
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr ""
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr ""
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr ""
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1622
 #, 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:1617
+#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
 msgstr ""
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr ""
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr ""
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
 msgstr ""
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1736
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr ""
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -21834,91 +24395,103 @@ msgid ""
 "changes\n"
 msgstr ""
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: 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
 msgid "missing --"
 msgstr ""
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr ""
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr ""
 
-#: git-send-email.perl:138
+#: git-send-email.perl:129
 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:136 git-send-email.perl:142
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr ""
 
-#: 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 ""
 
-#: git-send-email.perl:310
+#: git-send-email.perl:316
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 
-#: git-send-email.perl:315
+#: git-send-email.perl:321
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr ""
 
-#: git-send-email.perl:408
+#: git-send-email.perl:450
 msgid "--dump-aliases incompatible with other options\n"
 msgstr ""
 
-#: git-send-email.perl:481 git-send-email.perl:683
+#: 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:530 git-send-email.perl:746
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr ""
 
-#: git-send-email.perl:484
+#: 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:497
+#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:528
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:556
+#: git-send-email.perl:617
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:558
+#: git-send-email.perl:619
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:560
+#: git-send-email.perl:621
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr ""
 
-#: git-send-email.perl:565
+#: git-send-email.perl:626
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr ""
 
-#: git-send-email.perl:649
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -21928,36 +24501,29 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr ""
 
-#: git-send-email.perl:670
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr ""
 
-#: git-send-email.perl:694
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-
-#: git-send-email.perl:705
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr ""
 
-#: git-send-email.perl:718
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr ""
 
-#: git-send-email.perl:728
+#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr ""
 
-#: git-send-email.perl:739
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -21966,37 +24532,37 @@ msgid ""
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr ""
 
-#: git-send-email.perl:763
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr ""
 
-#: git-send-email.perl:780
+#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr ""
 
-#: git-send-email.perl:823
+#: git-send-email.perl:886
 msgid "Summary email is empty, skipping it\n"
 msgstr ""
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:858
+#: git-send-email.perl:935
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr ""
 
-#: git-send-email.perl:913
+#: git-send-email.perl:990
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr ""
 
-#: git-send-email.perl:918
+#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr ""
 
-#: git-send-email.perl:926
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -22005,20 +24571,20 @@ msgid ""
 "want to send.\n"
 msgstr ""
 
-#: git-send-email.perl:945
+#: git-send-email.perl:1022
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 
-#: git-send-email.perl:963
+#: git-send-email.perl:1040
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr ""
 
-#: git-send-email.perl:975
+#: git-send-email.perl:1052
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 
-#: git-send-email.perl:1033 git-send-email.perl:1041
+#: git-send-email.perl:1114 git-send-email.perl:1122
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr ""
@@ -22026,16 +24592,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:1045
+#: git-send-email.perl:1126
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 
-#: git-send-email.perl:1362
+#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr ""
 
-#: git-send-email.perl:1445
+#: 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"
@@ -22052,128 +24618,138 @@ 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:1460
+#: git-send-email.perl:1544
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 
-#: git-send-email.perl:1463
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr ""
 
-#: git-send-email.perl:1491
+#: git-send-email.perl:1581
 msgid "The required SMTP server is not properly defined."
 msgstr ""
 
-#: git-send-email.perl:1538
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr ""
 
-#: git-send-email.perl:1543 git-send-email.perl:1547
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr ""
 
-#: git-send-email.perl:1556
+#: git-send-email.perl:1646
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 
-#: git-send-email.perl:1574
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr ""
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr ""
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr ""
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr ""
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr ""
 
-#: git-send-email.perl:1591
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr ""
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr ""
 
-#: git-send-email.perl:1612
+#: git-send-email.perl:1709
 #, perl-format
 msgid "can't open file %s"
 msgstr ""
 
-#: git-send-email.perl:1659 git-send-email.perl:1679
+#: git-send-email.perl:1756 git-send-email.perl:1776
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1665
+#: git-send-email.perl:1762
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1819
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1753
+#: git-send-email.perl:1854
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1864
+#: git-send-email.perl:1965
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr ""
 
-#: git-send-email.perl:1871
+#: git-send-email.perl:1972
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr ""
 
-#: git-send-email.perl:1875
+#: git-send-email.perl:1976
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr ""
 
-#: git-send-email.perl:1905
+#: git-send-email.perl:2006
 msgid "cannot send message as 7bit"
 msgstr ""
 
-#: git-send-email.perl:1913
+#: git-send-email.perl:2014
 msgid "invalid transfer encoding"
 msgstr ""
 
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: 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 ""
+
+#: 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 ""
 
-#: git-send-email.perl:1957
+#: git-send-email.perl:2064
 #, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
 msgstr ""
 
-#: git-send-email.perl:1974
+#: git-send-email.perl:2082
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1978
+#: git-send-email.perl:2086
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr ""
diff --git a/po/id.po b/po/id.po
new file mode 100644
index 0000000000..7db807aa2e
--- /dev/null
+++ b/po/id.po
@@ -0,0 +1,25515 @@
+# Indonesian translations for Git package.
+# Copyright (C) 2021 Bagas Sanjaya
+# This file is distributed under the same license as the Git package.
+# Bagas Sanjaya <bagasdotme@gmail.com>, 2021.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2021-08-14 07:56+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"
+"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"
+
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Huh (%s)"
+
+#: 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 "tidak dapat membaca indeks"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "biner"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "tidak ada"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "tak berubah"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Perbarui"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr "tidak dapat menggelar '%s'"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+msgid "could not write index"
+msgstr "tidak dapat menulis indeks"
+
+#: add-interactive.c:706 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
+#, 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
+#, 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
+msgid "Revert"
+msgstr "Kembalikan"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "Tidak dapat menguraikan HEAD^{tree}"
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Tidak ada berkas tak terlacak.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Tambahkan tak terlacak"
+
+#: add-interactive.c:895 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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "mengabaikan tak tergabung: %s"
+
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Hanya berkas biner yang berubah.\n"
+
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "Tidak ada perubahan.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Pembaruan tambalan"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Tinjau diff"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "perlihatkan jalur dengan perubahan"
+
+#: add-interactive.c:1012
+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
+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
+msgid "pick hunks and update selectively"
+msgstr "ambil hunk dan perbarui secara selektif"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "lihat diff antara HEAD dan indeks"
+
+#: add-interactive.c:1020
+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
+msgid "Prompt help:"
+msgstr "Permintaan bantuan:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "pilih satu item"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "pilih kisaran item"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "pilih banyak kisaran"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "pilih item berdasarkan prefiks unik"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "batal pilih item yang disebutkan"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "pilih semua item"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(kosong) sudah memilih"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "pilih item bernomor"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(empty) tidak pilih apapun"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Perintah ***"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Apa sekarang"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "tergelar"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "tak tergelar"
+
+#: 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 "jalur"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "tidak dapat menyegarkan indeks"
+
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "Sampai jumpa.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Gelar hunk 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."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\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"
+
+#: add-patch.c:56 git-add--interactive.perl:1437
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Stase hunk 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."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\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"
+
+#: add-patch.c:80 git-add--interactive.perl:1443
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\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"
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\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"
+
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\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"
+
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\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"
+
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\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"
+
+#: add-patch.c:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\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"
+
+#: add-patch.c:343
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "tidak dapat menguraikan kepala hunk '%.*s'"
+
+#: 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'"
+
+#: add-patch.c:420
+msgid "could not parse diff"
+msgstr "tidak dapat menguraikan diff"
+
+#: add-patch.c:439
+msgid "could not parse colored diff"
+msgstr "tidak dapat menguraikan diff berwarna"
+
+#: add-patch.c:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr "gagal menjalankan '%s'"
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "keluaran tak cocok dari interactive.diffFilter"
+
+#: add-patch.c:613
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Saringan Anda haru menjaga korespondensi satu-satu antara masukannya\n"
+"dan baris keluaran."
+
+#: add-patch.c:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"baris konteks #%d diharapkan dalam\n"
+"%.*s"
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"hunk tidak tumpang tindih:\n"
+"%.*s\n"
+"tidak berakhir dengan:\n"
+"%.*s"
+
+#: 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"
+
+#: add-patch.c:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Untuk menghapus baris '%c', buatlah menjadi baris ' ' (konteks).\n"
+"Untuk menghapus baris '%c', hapuslah itu.\n"
+"Baris yang diawali dengan %c akan dihapus.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: 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"
+
+#: add-patch.c:1133
+msgid "could not parse hunk header"
+msgstr "tidak dapat menguraikan kepala hunk"
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' gagal"
+
+#. 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.
+#.
+#. 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:1247 git-add--interactive.perl:1242
+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]?"
+
+#: add-patch.c:1290
+msgid "The selected hunks do not apply to the index!"
+msgstr "Hunk yang dipilih tidak diterapkan ke indeks!"
+
+#: add-patch.c:1291 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Tetap terapkan itu ke pohon kerja? "
+
+#: add-patch.c:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Tidak ada yang diterapkan.\n"
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"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"
+"? - cetak bantuan\n"
+
+#: add-patch.c:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr "Tidak ada hunk sebelumnya"
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr "Tidak ada hunk selanjutnya"
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr "Tidak ada hunk lainnya untuk dikunjungi"
+
+#: add-patch.c:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "pergi ke hunk yang mana (<ret> untuk lihat lebih)? "
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "pergi ke hunk yang mana?"
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Angka tidak valid: '%s'"
+
+#: 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."
+
+#: add-patch.c:1575
+msgid "No other hunks to search"
+msgstr "Tidak ada hunk lainnya untuk dicari"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "cari untuk regex? "
+
+#: add-patch.c:1596
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "regexp pencarian %s cacat: %s"
+
+#: add-patch.c:1613
+msgid "No hunk matches the given pattern"
+msgstr "Tidak ada hunk yang cocok dengan pola yang diberikan"
+
+#: add-patch.c:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "Maaf, tidak dapat membelah hunk ini"
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Terbelah ke dalam %d hunk."
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr "Maaf, tidak dapat menyunting hunk ini"
+
+#: add-patch.c:1680
+msgid "'git apply' failed"
+msgstr "'git apply' gagal"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+
+#: advice.c:161
+#, c-format
+msgid "%shint: %.*s%s\n"
+msgstr ""
+
+#: advice.c:252
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:254
+msgid "Committing is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:256
+msgid "Merging is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:258
+msgid "Pulling is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:260
+msgid "Reverting is not possible because you have unmerged files."
+msgstr ""
+
+#: advice.c:262
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: advice.c:278
+msgid "Exiting because of an unresolved conflict."
+msgstr ""
+
+#: advice.c:283 builtin/merge.c:1375
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr ""
+
+#: advice.c:285
+msgid "Please, commit your changes before merging."
+msgstr ""
+
+#: advice.c:286
+msgid "Exiting because of unfinished merge."
+msgstr ""
+
+#: 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"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by switching back to a branch.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+"  git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
+"\n"
+msgstr ""
+
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr ""
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr ""
+
+#: apply.c:70
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: apply.c:800
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr ""
+
+#: apply.c:809
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr ""
+
+#: apply.c:883
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr ""
+
+#: apply.c:921
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+
+#: apply.c:927
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+
+#: apply.c:928
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+
+#: apply.c:933
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr ""
+
+#: apply.c:962
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr ""
+
+#: apply.c:1281
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: apply.c:1384
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr ""
+
+#: apply.c:1480
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr ""
+
+#: apply.c:1549
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr ""
+
+#: apply.c:1752
+msgid "new file depends on old contents"
+msgstr ""
+
+#: apply.c:1754
+msgid "deleted file still has contents"
+msgstr ""
+
+#: apply.c:1788
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr ""
+
+#: apply.c:1825
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr ""
+
+#: apply.c:1827
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr ""
+
+#: apply.c:1830
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr ""
+
+#: apply.c:1977
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr ""
+
+#: apply.c:2014
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr ""
+
+#: apply.c:2176
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr ""
+
+#: apply.c:2262
+#, c-format
+msgid "unable to read symlink %s"
+msgstr ""
+
+#: apply.c:2266
+#, c-format
+msgid "unable to open or read %s"
+msgstr ""
+
+#: apply.c:2935
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: apply.c:3068
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr ""
+
+#: apply.c:3074
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+
+#: apply.c:3096
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr ""
+
+#: apply.c:3104
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+
+#: apply.c:3151
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr ""
+
+#: apply.c:3162
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+
+#: apply.c:3170
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr ""
+
+#: apply.c:3188
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr ""
+
+#: apply.c:3201
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr ""
+
+#: apply.c:3208
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+
+#: apply.c:3229
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr ""
+
+#: apply.c:3352
+#, 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
+#, c-format
+msgid "failed to read %s"
+msgstr ""
+
+#: apply.c:3412
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr ""
+
+#: apply.c:3441 apply.c:3687
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr ""
+
+#: apply.c:3527 apply.c:3702
+#, c-format
+msgid "%s: does not exist in index"
+msgstr ""
+
+#: apply.c:3536 apply.c:3710 apply.c:3954
+#, c-format
+msgid "%s: does not match index"
+msgstr ""
+
+#: apply.c:3571
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr ""
+
+#: apply.c:3574
+#, c-format
+msgid "Performing three-way merge...\n"
+msgstr ""
+
+#: apply.c:3590 apply.c:3594
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr ""
+
+#: apply.c:3606
+#, c-format
+msgid "Failed to perform three-way merge...\n"
+msgstr ""
+
+#: apply.c:3620
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr ""
+
+#: apply.c:3625
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr ""
+
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr ""
+
+#: apply.c:3654
+msgid "removal patch leaves file contents"
+msgstr ""
+
+#: apply.c:3727
+#, c-format
+msgid "%s: wrong type"
+msgstr ""
+
+#: apply.c:3729
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr ""
+
+#: 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 ""
+
+#: apply.c:3952
+#, c-format
+msgid "%s: already exists in index"
+msgstr ""
+
+#: apply.c:3956
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr ""
+
+#: apply.c:3976
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr ""
+
+#: apply.c:3981
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o) of %s"
+msgstr ""
+
+#: apply.c:4001
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr ""
+
+#: apply.c:4005
+#, c-format
+msgid "%s: patch does not apply"
+msgstr ""
+
+#: apply.c:4020
+#, c-format
+msgid "Checking patch %s..."
+msgstr ""
+
+#: apply.c:4112
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr ""
+
+#: apply.c:4119
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr ""
+
+#: apply.c:4122
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr ""
+
+#: apply.c:4131
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr ""
+
+#: apply.c:4141
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr ""
+
+#: apply.c:4279
+#, c-format
+msgid "unable to remove %s from index"
+msgstr ""
+
+#: apply.c:4313
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr ""
+
+#: apply.c:4319
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr ""
+
+#: apply.c:4327
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr ""
+
+#: apply.c:4333 apply.c:4478
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr ""
+
+#: apply.c:4376 builtin/bisect--helper.c:525
+#, c-format
+msgid "failed to write to '%s'"
+msgstr ""
+
+#: apply.c:4380
+#, c-format
+msgid "closing file '%s'"
+msgstr ""
+
+#: apply.c:4450
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr ""
+
+#: apply.c:4548
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr ""
+
+#: apply.c:4556
+msgid "internal error"
+msgstr ""
+
+#: apply.c:4559
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4570
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr ""
+
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#, c-format
+msgid "cannot open %s"
+msgstr ""
+
+#: apply.c:4592
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr ""
+
+#: apply.c:4596
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr ""
+
+#: apply.c:4725
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr ""
+
+#: apply.c:4733
+msgid "unrecognized input"
+msgstr ""
+
+#: apply.c:4753
+msgid "unable to read index file"
+msgstr ""
+
+#: apply.c:4910
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr ""
+
+#: apply.c:4937
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4943 apply.c:4958
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] ""
+msgstr[1] ""
+
+#: apply.c:4951
+#, 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:678 builtin/mv.c:304 builtin/rm.c:423
+msgid "Unable to write new index file"
+msgstr ""
+
+#: apply.c:4995
+msgid "don't apply changes matching the given path"
+msgstr ""
+
+#: apply.c:4998
+msgid "apply changes matching the given path"
+msgstr ""
+
+#: apply.c:5000 builtin/am.c:2318
+msgid "num"
+msgstr ""
+
+#: apply.c:5001
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr ""
+
+#: apply.c:5004
+msgid "ignore additions made by the patch"
+msgstr ""
+
+#: apply.c:5006
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr ""
+
+#: apply.c:5010
+msgid "show number of added and deleted lines in decimal notation"
+msgstr ""
+
+#: apply.c:5012
+msgid "instead of applying the patch, output a summary for the input"
+msgstr ""
+
+#: apply.c:5014
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr ""
+
+#: apply.c:5016
+msgid "make sure the patch is applicable to the current index"
+msgstr ""
+
+#: apply.c:5018
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:5020
+msgid "apply a patch without touching the working tree"
+msgstr ""
+
+#: apply.c:5022
+msgid "accept a patch that touches outside the working area"
+msgstr ""
+
+#: apply.c:5025
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr ""
+
+#: apply.c:5027
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr ""
+
+#: apply.c:5029
+msgid "build a temporary index based on embedded index information"
+msgstr ""
+
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+msgid "paths are separated with NUL character"
+msgstr ""
+
+#: apply.c:5034
+msgid "ensure at least <n> lines of context match"
+msgstr ""
+
+#: 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 ""
+
+#: apply.c:5036
+msgid "detect new or modified lines that have whitespace errors"
+msgstr ""
+
+#: apply.c:5039 apply.c:5042
+msgid "ignore changes in whitespace when finding context"
+msgstr ""
+
+#: apply.c:5045
+msgid "apply the patch in reverse"
+msgstr ""
+
+#: apply.c:5047
+msgid "don't expect at least one line of context"
+msgstr ""
+
+#: apply.c:5049
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr ""
+
+#: apply.c:5051
+msgid "allow overlapping hunks"
+msgstr ""
+
+#: 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 ""
+
+#: apply.c:5054
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr ""
+
+#: apply.c:5057
+msgid "do not trust the line counts in the hunk headers"
+msgstr ""
+
+#: apply.c:5059 builtin/am.c:2306
+msgid "root"
+msgstr ""
+
+#: apply.c:5060
+msgid "prepend <root> to all filenames"
+msgstr ""
+
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr ""
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr ""
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr ""
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr ""
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr ""
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr ""
+
+#: archive-zip.c:322
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr ""
+
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#, c-format
+msgid "deflate error (%d)"
+msgstr ""
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr ""
+
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<opsi>] <mirip pohon> [<jalur>...]"
+
+#: archive.c:15
+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 <repo> [--exec <perintah>] [<opsi>] <mirip pohon> "
+"[<jalur>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <repo> [--exec <perintah>] --list"
+
+#: archive.c:188
+#, 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:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
+#: builtin/merge.c:1144
+#, c-format
+msgid "could not read '%s'"
+msgstr "tidak dapat membaca '%s'"
+
+#: 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 "spek jalur '%s' tidak cocok dengan berkas apapun"
+
+#: archive.c:451
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "tidak ada referensi seperti: %.*s"
+
+#: archive.c:457
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "bukan nama objek valid: %s"
+
+#: archive.c:470
+#, c-format
+msgid "not a tree object: %s"
+msgstr "bukan objek pohon: %s"
+
+#: archive.c:482
+msgid "current working directory is untracked"
+msgstr "direktori kerja saat ini tak terlacak"
+
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "Berkas tidak ditemukan: %s"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Bukan berkas reguler: %s"
+
+#: archive.c:552
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:552
+msgid "archive format"
+msgstr "format arsip"
+
+#: archive.c:553 builtin/log.c:1775
+msgid "prefix"
+msgstr "prefiks"
+
+#: archive.c:554
+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: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 "berkas"
+
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr "tambahkan berkas tak terlacak ke arsip"
+
+#: archive.c:559 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "tulis arsip ke berkas ini"
+
+#: archive.c:561
+msgid "read .gitattributes in working directory"
+msgstr "baca .gitattributes dalam direktori kerja"
+
+#: archive.c:562
+msgid "report archived files on stderr"
+msgstr "laporkan berkas terarsip ke error standar"
+
+#: archive.c:564
+msgid "set compression level"
+msgstr "setel level kompresi"
+
+#: archive.c:567
+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:1898 builtin/submodule--helper.c:2352
+#: builtin/submodule--helper.c:2902
+msgid "repo"
+msgstr "repositori"
+
+#: archive.c:570 builtin/archive.c:92
+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:717
+#: builtin/notes.c:498
+msgid "command"
+msgstr "perintah"
+
+#: archive.c:572 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "jalur ke perintah git-upload-archive remote"
+
+#: archive.c:579
+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:583
+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
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Format arsip tidak dikenal '%s'"
+
+#: archive.c:616
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumen tidak didukung untuk format '%s': -%d"
+
+#: attr.c:202
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr ""
+
+#: attr.c:363
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr ""
+
+#: attr.c:403
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+
+#: bisect.c:489
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Kontent terkutip jelek dalam berkas '%s': %s"
+
+#: bisect.c:699
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Kami tidak dapat membagi dua lagi!\n"
+
+#: bisect.c:766
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Bukan sebuah nama komit yang valid %s"
+
+#: bisect.c:791
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Membagi dua: dasar penggabungan harus diuji\n"
+
+#: bisect.c:911
+#, c-format
+msgid "a %s revision is needed"
+msgstr "sebuah revisi %s diperlukan"
+
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#, c-format
+msgid "could not create file '%s'"
+msgstr "tidak dapat membuat berkas '%s'"
+
+#: bisect.c:987 builtin/merge.c:153
+#, c-format
+msgid "could not read file '%s'"
+msgstr "tidak dapat membaca berkas '%s'"
+
+#: bisect.c:1027
+msgid "reading bisect refs failed"
+msgstr "gagal membaca berkas referensi bagi dua"
+
+#: bisect.c:1057
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s sama-sama %s dan %s\n"
+
+#: bisect.c:1066
+#, 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
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+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
+#, 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] "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 "--contents dan --reverse tidak dapat dipadu dengan baik."
+
+#: blame.c:2790
+msgid "cannot use --contents with final commit object name"
+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: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 "persiapan jalan revisi gagal"
+
+#: blame.c:2838
+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 "tidak ada jalur seperti %s di %s"
+
+#: blame.c:2860
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "tidak dapat membaca blob %s untuk jalur %s"
+
+#: branch.c:53
+#, c-format
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+msgstr ""
+
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr ""
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+
+#: branch.c:94
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr ""
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+
+#: branch.c:99
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr ""
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr ""
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+
+#: branch.c:110
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr ""
+
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr ""
+
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr ""
+
+#: branch.c:189
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr ""
+
+#: branch.c:208
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr ""
+
+#: branch.c:213
+msgid "Cannot force update the current branch."
+msgstr ""
+
+#: branch.c:233
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+
+#: branch.c:235
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr ""
+
+#: branch.c:237
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+
+#: branch.c:281
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr ""
+
+#: branch.c:301
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr ""
+
+#: branch.c:306
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr ""
+
+#: branch.c:366
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr ""
+
+#: branch.c:389
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr ""
+
+#: bundle.c:44
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr ""
+
+#: bundle.c:48
+#, c-format
+msgid "unknown capability '%s'"
+msgstr ""
+
+#: bundle.c:74
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr ""
+
+#: bundle.c:113
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr ""
+
+#: 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 ""
+
+#: bundle.c:198
+msgid "Repository lacks these prerequisite commits:"
+msgstr ""
+
+#: bundle.c:201
+msgid "need a repository to verify a bundle"
+msgstr ""
+
+#: 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:264
+msgid "The bundle records a complete history."
+msgstr ""
+
+#: 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:333
+msgid "unable to dup bundle descriptor"
+msgstr ""
+
+#: bundle.c:340
+msgid "Could not spawn pack-objects"
+msgstr ""
+
+#: bundle.c:351
+msgid "pack-objects died"
+msgstr ""
+
+#: bundle.c:400
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr ""
+
+#: bundle.c:504
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr ""
+
+#: bundle.c:506
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr ""
+
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr ""
+
+#: bundle.c:553
+msgid "Refusing to create empty bundle."
+msgstr ""
+
+#: bundle.c:563
+#, c-format
+msgid "cannot create '%s'"
+msgstr ""
+
+#: bundle.c:588
+msgid "index-pack died"
+msgstr ""
+
+#: 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 ""
+
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr ""
+
+#: commit-graph.c:262
+msgid "commit-graph file is too small"
+msgstr ""
+
+#: commit-graph.c:355
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr ""
+
+#: commit-graph.c:362
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:369
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:386
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr ""
+
+#: commit-graph.c:482
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c:492
+msgid "commit-graph chain does not match"
+msgstr ""
+
+#: commit-graph.c:540
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c:564
+msgid "unable to find all commit-graph files"
+msgstr ""
+
+#: commit-graph.c:745 commit-graph.c:782
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:766
+#, c-format
+msgid "could not find commit %s"
+msgstr ""
+
+#: 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 ""
+
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#, c-format
+msgid "unable to get type of object %s"
+msgstr ""
+
+#: commit-graph.c:1368
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1385
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1405
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: 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:1558
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+
+#: commit-graph.c:1635
+msgid "Collecting referenced commits"
+msgstr ""
+
+#: 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:1673
+#, c-format
+msgid "error adding pack %s"
+msgstr ""
+
+#: commit-graph.c:1677
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c:1714
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c:1732
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:1781
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+
+#: commit-graph.c:1812 midx.c:911
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr ""
+
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr ""
+
+#: commit-graph.c:1830
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr ""
+
+#: 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:1923
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+#: commit-graph.c:1939
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1959
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+#: commit-graph.c:2092
+msgid "Scanning merged commits"
+msgstr ""
+
+#: commit-graph.c:2136
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c:2244
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+
+#: commit-graph.c:2351
+msgid "too many commits to write graph"
+msgstr ""
+
+#: commit-graph.c:2449
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:2459
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+
+#: 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:2476
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr ""
+
+#: commit-graph.c:2494
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:2509
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c:2516
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2526
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c:2535
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2549
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c:2554
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2558
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2575
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+
+#: commit-graph.c:2581
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+
+#: 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 ""
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr ""
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+
+#: commit.c:1237
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr ""
+
+#: commit.c:1241
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr ""
+
+#: commit.c:1244
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr ""
+
+#: commit.c:1247
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr ""
+
+#: 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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr ""
+
+#: config.c:126
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"melebihi kedalaman include maksimum (%d) ketika memasukkan\n"
+"\t%s\n"
+"dari\n"
+"\t%s\n"
+"Ini mungkin disebabkan oleh include sirkular."
+
+#: config.c:142
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "tidak dapat menjabarkan jalur include '%s'"
+
+#: config.c:153
+msgid "relative config includes must come from files"
+msgstr "include konfigurasi relatif harus dari berkas"
+
+#: config.c:199
+msgid "relative config include conditionals must come from files"
+msgstr "kondisional include konfigurasi relative harus dari berkas"
+
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "format konfigurasi tidak valid: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "nama variabel lingkungan untuk konfigurasi hilang '%.*s'"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "variabel lingkungan '%s' untuk konfigurasi '%.*s'"
+
+#: config.c:442
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "kunci tidak berisi bagian: %s"
+
+#: config.c:448
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "kunci tidak berisi nama variabel: %s"
+
+#: config.c:472 sequencer.c:2785
+#, c-format
+msgid "invalid key: %s"
+msgstr "kunci tidak valid: %s"
+
+#: config.c:478
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "kunci tidak valid (barisbaru): %s"
+
+#: config.c:511
+msgid "empty config key"
+msgstr "kunci konfigurasi kosong"
+
+#: config.c:529 config.c:541
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "parameter konfigurasi gadungan: %s"
+
+#: config.c:555 config.c:572 config.c:579 config.c:588
+#, c-format
+msgid "bogus format in %s"
+msgstr "format gadungan dalam %s"
+
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "hitungan gadungan dalam %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "terlalu banyak entri di %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "kunci konfigurasi %s hilang"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "nilai konfigurasi %s hilang"
+
+#: config.c:995
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "baris konfigurasi %d jelek dalam blob %s"
+
+#: config.c:999
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "baris konfigurasi %d jelek dalam berkas %s"
+
+#: config.c:1003
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "baris konfigurasi %d jelek pada masukan standar"
+
+#: config.c:1007
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "baris konfigurasi %d jelek dalam blob submodul %s"
+
+#: config.c:1011
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "baris konfigurasi %d jelek pada baris perintah %s"
+
+#: config.c:1015
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "baris konfigurasi %d jelek dalam %s"
+
+#: config.c:1152
+msgid "out of range"
+msgstr "di luar rentang"
+
+#: config.c:1152
+msgid "invalid unit"
+msgstr "satuan tidak valid"
+
+#: config.c:1153
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "nilai konfigurasi numerik '%s' jelek untuk '%s': %s"
+
+#: config.c:1163
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "nilai konfigurasi boolean '%s' jelek untuk '%s'"
+
+#: config.c:1275
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "gagal menjabarkan direktori pengguna di: '%s'"
+
+#: config.c:1284
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' untuk '%s' bukan stempel waktu valid"
+
+#: config.c:1377
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "panjang singkatan di luar rentang: %d"
+
+#: config.c:1391 config.c:1402
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "level kompresi zlib jelek %d"
+
+#: config.c:1494
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar harusnya hanya satu karakter"
+
+#: config.c:1527
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "mode tidak valid untuk pembuatan objek: %s"
+
+#: config.c:1599
+#, c-format
+msgid "malformed value for %s"
+msgstr "nilai rusak untuk %s"
+
+#: config.c:1625
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "nilai rusak untuk %s: %s"
+
+#: config.c:1626
+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:4084
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "level kompresi pak jelek %d"
+
+#: config.c:1809
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "tidak dapat memuat objek blob konfigurasi '%s'"
+
+#: config.c:1812
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "referensi '%s' tidak menunjuk pada sebuah blob"
+
+#: config.c:1829
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "tidak dapat menguraikan blob konfigurasi '%s'"
+
+#: config.c:1874
+#, c-format
+msgid "failed to parse %s"
+msgstr "gagal menguraikan %s"
+
+#: config.c:1930
+msgid "unable to parse command-line config"
+msgstr "gagal menguraikan konfigurasi baris perintah"
+
+#: config.c:2294
+msgid "unknown error occurred while reading the configuration files"
+msgstr "error tidak diketahui ketika membaca berkas konfigurasi"
+
+#: config.c:2468
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "%s tidak valid: '%s'"
+
+#: config.c:2513
+#, 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:2559
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "tidak dapat menguraikan '%s' dari konfigurasi baris perintah"
+
+#: config.c:2561
+#, 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:2645
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "nama bagian '%s' tidak valid"
+
+#: config.c:2677
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s punya banyak nilai"
+
+#: config.c:2706
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "gagal menulis berkas konfigurasi baru %s"
+
+#: config.c:2958 config.c:3285
+#, c-format
+msgid "could not lock config file %s"
+msgstr "tidak dapat mengunci berkas konfigurasi %s"
+
+#: config.c:2969
+#, c-format
+msgid "opening %s"
+msgstr "membuka %s"
+
+#: config.c:3006 builtin/config.c:361
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "pola tidak valid: %s"
+
+#: config.c:3031
+#, c-format
+msgid "invalid config file %s"
+msgstr "berkas konfigurasi %s tidak valid"
+
+#: config.c:3044 config.c:3298
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat pada %s gagal"
+
+#: config.c:3055
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "tidak dapat me-mmap '%s'%s"
+
+#: config.c:3065 config.c:3303
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod pada %s gagal"
+
+#: config.c:3150 config.c:3400
+#, c-format
+msgid "could not write config file %s"
+msgstr "tidak dapat menulis berkas konfigurasi %s"
+
+#: config.c:3184
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "tidak dapat menyetel '%s' ke '%s'"
+
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#, c-format
+msgid "could not unset '%s'"
+msgstr "tidak dapat mem-batal setel '%s'"
+
+#: config.c:3276
+#, c-format
+msgid "invalid section name: %s"
+msgstr "nama bagian tidak valid: %s"
+
+#: config.c:3443
+#, c-format
+msgid "missing value for '%s'"
+msgstr "nilai hilang untuk '%s'"
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr ""
+
+#: connect.c:63
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr ""
+
+#: connect.c:118
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr ""
+
+#: connect.c:129
+msgid "expected flush after capabilities"
+msgstr ""
+
+#: connect.c:263
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr ""
+
+#: connect.c:284
+msgid "protocol error: unexpected capabilities^{}"
+msgstr ""
+
+#: connect.c:306
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr ""
+
+#: connect.c:308
+msgid "repository on the other end cannot be shallow"
+msgstr ""
+
+#: connect.c:347
+msgid "invalid packet"
+msgstr ""
+
+#: connect.c:367
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr ""
+
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr ""
+
+#: connect.c:526
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr ""
+
+#: connect.c:530
+msgid "expected flush after ref listing"
+msgstr ""
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr ""
+
+#: connect.c:666
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr ""
+
+#: connect.c:717
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr ""
+
+#: connect.c:757 connect.c:820
+#, c-format
+msgid "Looking up %s ... "
+msgstr ""
+
+#: connect.c:761
+#, 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
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+
+#: connect.c:787 connect.c:864
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:793 connect.c:870
+msgid "done."
+msgstr ""
+
+#: connect.c:824
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr ""
+
+#: connect.c:830
+#, c-format
+msgid "unknown port %s"
+msgstr ""
+
+#: connect.c:967 connect.c:1299
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr ""
+
+#: connect.c:969
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr ""
+
+#: connect.c:979
+#, c-format
+msgid "cannot start proxy %s"
+msgstr ""
+
+#: connect.c:1050
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
+
+#: connect.c:1247
+msgid "ssh variant 'simple' does not support -4"
+msgstr ""
+
+#: connect.c:1259
+msgid "ssh variant 'simple' does not support -6"
+msgstr ""
+
+#: connect.c:1276
+msgid "ssh variant 'simple' does not support setting port"
+msgstr ""
+
+#: connect.c:1388
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr ""
+
+#: connect.c:1436
+msgid "unable to fork"
+msgstr ""
+
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+msgid "Checking connectivity"
+msgstr ""
+
+#: connected.c:120
+msgid "Could not run 'git rev-list'"
+msgstr ""
+
+#: connected.c:144
+msgid "failed write to rev-list"
+msgstr ""
+
+#: connected.c:149
+msgid "failed to close rev-list's stdin"
+msgstr ""
+
+#: convert.c:183
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr ""
+
+#: convert.c:196
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr ""
+
+#: 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"
+msgstr ""
+
+#: convert.c:206
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr ""
+
+#: 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"
+msgstr ""
+
+#: convert.c:273
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
+
+#: 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:293
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr ""
+
+#: 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:408 convert.c:479
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr ""
+
+#: convert.c:451
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+
+#: convert.c:654
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr ""
+
+#: convert.c:674
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr ""
+
+#: convert.c:681
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr ""
+
+#: convert.c:716 convert.c:719
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr ""
+
+#: convert.c:722 convert.c:777
+#, c-format
+msgid "external filter '%s' failed"
+msgstr ""
+
+#: convert.c:826
+msgid "unexpected filter type"
+msgstr ""
+
+#: convert.c:837
+msgid "path name too long for external filter"
+msgstr ""
+
+#: convert.c:935
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+
+#: convert.c:1236
+msgid "true/false are no valid working-tree-encodings"
+msgstr ""
+
+#: convert.c:1416 convert.c:1449
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr ""
+
+#: convert.c:1492
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr ""
+
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr ""
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr ""
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr ""
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr ""
+
+#: credential.c:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr ""
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr ""
+
+#: date.c:138
+msgid "in the future"
+msgstr ""
+
+#: date.c:144
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:151
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:158
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:165
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:171
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:178
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:189
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:192
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: date.c:197 date.c:202
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] ""
+msgstr[1] ""
+
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr ""
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr ""
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+
+#: delta-islands.c:467
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr ""
+
+#: diff-merges.c:70
+#, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr ""
+
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
+msgstr ""
+
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr ""
+
+#: diff-lib.c:576
+msgid "unable to get HEAD"
+msgstr ""
+
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr ""
+
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr ""
+
+#: diff-no-index.c:237
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  Gagal mengurai persentase potongan dirstat '%s'\n"
+
+#: diff.c:161
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Parameter dirstat tidak ditketahui '%s'\n"
+
+#: diff.c:297
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"Setelan warna berpindah harus salah satu dari 'no', 'default', 'blocks', "
+"'dimmed-zebra', 'plain'"
+
+#: diff.c:325
+#, 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 ""
+"mode color-moved-ws tidak dikenal '%s', nilai yang mungkin yaitu '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 tidak dapat digabungkan dengan mode "
+"spasi yang lainnya"
+
+#: diff.c:410
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Nilai tidak dikenal untuk variabel konfigurasi 'diff.submodule': '%s'"
+
+#: diff.c:470
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Ditemukan error dalam variable konfigurasi 'diff.dirstat':\n"
+"%s"
+
+#: diff.c:4282
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "diff eksternal mati, berhenti pada %s"
+
+#: diff.c:4634
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check dan -s saling eksklusif"
+
+#: diff.c:4637
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S dan --find-object saling eksklusif"
+
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+"-G dan --pickaxe-regex saling eksklusif, gunakan --pickaxe-regex dengan -S"
+
+#: diff.c:4643
+msgid ""
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr ""
+"--pickaxe-all dan --find-object saling eksklusif, gunakan --pickaxe-all "
+"dengan -G dan -S"
+
+#: diff.c:4722
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow butuh tepatnya satu spek jalur"
+
+#: diff.c:4770
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "nilai --stat tidak valid: %s"
+
+#: 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
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s harap nilai numerik"
+
+#: diff.c:4807
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Gagal menguraikan parameter opsi --dirstat/-X:\n"
+"%s"
+
+#: diff.c:4892
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "kelas perubahan '%c' tidak dikenal dalam --diff-filter=%s"
+
+#: diff.c:4916
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "nilai tidak dikenal setelah ws-error-highlight=%.*s"
+
+#: diff.c:4930
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "tidak dapat menguraikan '%s'"
+
+#: diff.c:4980 diff.c:4986
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s butuh bentuk <n>/<m>"
+
+#: diff.c:4998
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s butuh sebuah karakter, dapat '%s'"
+
+#: diff.c:5019
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "argumen --color-moved jelek: %s"
+
+#: diff.c:5038
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "mode tidak valid '%s' dalam --color-moved-ws"
+
+#: diff.c:5078
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"opsi diff-algorithm terima \"myers\", \"minimal\", \"patience\" dan "
+"\"histogram\""
+
+#: diff.c:5114 diff.c:5134
+#, c-format
+msgid "invalid argument to %s"
+msgstr "argumen tidak valid ke %s"
+
+#: diff.c:5238
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "regex tidak valid diberikan ke -I: '%s'"
+
+#: diff.c:5287
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "gagal menguraikan parameter opsi --submodule: '%s'"
+
+#: diff.c:5343
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "argumen --word-diff jelek: %s"
+
+#: diff.c:5379
+msgid "Diff output format options"
+msgstr "Opsi format keluaran diff"
+
+#: diff.c:5381 diff.c:5387
+msgid "generate patch"
+msgstr "buat tambalan"
+
+#: diff.c:5384 builtin/log.c:179
+msgid "suppress diff output"
+msgstr "sembunyikan keluaran diff"
+
+#: diff.c:5389 diff.c:5503 diff.c:5510
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5390 diff.c:5393
+msgid "generate diffs with <n> lines context"
+msgstr "buat diff dengan <n> baris konteks"
+
+#: diff.c:5395
+msgid "generate the diff in raw format"
+msgstr "buat diff dalam format mentah"
+
+#: diff.c:5398
+msgid "synonym for '-p --raw'"
+msgstr "sinonim untuk '-p --raw'"
+
+#: diff.c:5402
+msgid "synonym for '-p --stat'"
+msgstr "sinonim untuk '-p --stat'"
+
+#: diff.c:5406
+msgid "machine friendly --stat"
+msgstr "--stat yang ramah mesin"
+
+#: diff.c:5409
+msgid "output only the last line of --stat"
+msgstr "keluarkan hanya baris terakhir --stat"
+
+#: diff.c:5411 diff.c:5419
+msgid "<param1,param2>..."
+msgstr "<parameter 1,parameter 2>..."
+
+#: diff.c:5412
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+"keluarkan distribusi jumlah perubahan relatif untuk setiap subdirektori"
+
+#: diff.c:5416
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinonim untuk --dirstat=cumulative"
+
+#: diff.c:5420
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "sinonim untuk --dirstat=files,param1,param2..."
+
+#: diff.c:5424
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+"peringatkan bila perubahan memasukkan penanda konflik atau kesalahan spasi"
+
+#: diff.c:5427
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+"ringkasan singkat seperti pembuatan, penggantian nama dan perubahan mode"
+
+#: diff.c:5430
+msgid "show only names of changed files"
+msgstr "perlihatkan hanya nama berkas yang berubah"
+
+#: diff.c:5433
+msgid "show only names and status of changed files"
+msgstr "perlihatkan hanya nama dan status berkas yang berubah"
+
+#: diff.c:5435
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<lebar>[,<nama lebar>[,<hitungan>]]"
+
+#: diff.c:5436
+msgid "generate diffstat"
+msgstr "buat diffstat"
+
+#: diff.c:5438 diff.c:5441 diff.c:5444
+msgid "<width>"
+msgstr "<lebar>"
+
+#: diff.c:5439
+msgid "generate diffstat with a given width"
+msgstr "buat diffstat dengan lebar yang diberikan"
+
+#: diff.c:5442
+msgid "generate diffstat with a given name width"
+msgstr "buat diffstat dengan nama lebar yang diberikan"
+
+#: diff.c:5445
+msgid "generate diffstat with a given graph width"
+msgstr "buat diffstat dengan lebar grafik yang diberikan"
+
+#: diff.c:5447
+msgid "<count>"
+msgstr "<hitungan>"
+
+#: diff.c:5448
+msgid "generate diffstat with limited lines"
+msgstr "buat diffstat dengan baris yang terbatas"
+
+#: diff.c:5451
+msgid "generate compact summary in diffstat"
+msgstr "buat ringkasan singkat dalam diffstat"
+
+#: diff.c:5454
+msgid "output a binary diff that can be applied"
+msgstr "keluarkan diff biner yang dapat diterapkan"
+
+#: diff.c:5457
+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:5459
+msgid "show colored diff"
+msgstr "perlihatkan diff berwarna"
+
+#: diff.c:5460
+msgid "<kind>"
+msgstr "<tipe>"
+
+#: diff.c:5461
+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:5464
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"jangan tengkar jalur nama dan gunakan NUL sebagai pembatas bidang keluaran "
+"pada --raw atau --numstat"
+
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+msgid "<prefix>"
+msgstr "<prefiks>"
+
+#: diff.c:5468
+msgid "show the given source prefix instead of \"a/\""
+msgstr "perlihatkan prefiks sumber yang diberikan daripada \"a/\""
+
+#: diff.c:5471
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "perlihatkan prefiks tujuan daripada \"b/\""
+
+#: diff.c:5474
+msgid "prepend an additional prefix to every line of output"
+msgstr "tambah depan prefiks tambahan pada setiap baris keluaran"
+
+#: diff.c:5477
+msgid "do not show any source or destination prefix"
+msgstr "jangan perlihatkan prefiks sumber atau tujuan apapun"
+
+#: diff.c:5480
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr ""
+"perlihatkan konteks diantara hunk diff hingga jumlah baris yang disebutkan"
+
+#: diff.c:5484 diff.c:5489 diff.c:5494
+msgid "<char>"
+msgstr "<karakter>"
+
+#: diff.c:5485
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "sebutkan karakter yang menandai baris baru daripada '+'"
+
+#: diff.c:5490
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "sebutkan karakter yang menandai baris lama daripada '-'"
+
+#: diff.c:5495
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "sebutkan karakter yang menandai konteks daripada ' '"
+
+#: diff.c:5498
+msgid "Diff rename options"
+msgstr "Opsi penamaan ulang diff"
+
+#: diff.c:5499
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5500
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+"pisahkan perubahan penulisan ulang penuh kedalam pasangan penghapusan dan "
+"pembuatan"
+
+#: diff.c:5504
+msgid "detect renames"
+msgstr "deteksi penamaan ulang"
+
+#: diff.c:5508
+msgid "omit the preimage for deletes"
+msgstr "lewati pracitra untuk penghapusan"
+
+#: diff.c:5511
+msgid "detect copies"
+msgstr "deteksi penyalinan"
+
+#: diff.c:5515
+msgid "use unmodified files as source to find copies"
+msgstr ""
+"gunakan berkas tak termodifikasi sebagai sumber untuk menemukan salinan"
+
+#: diff.c:5517
+msgid "disable rename detection"
+msgstr "nonaktifkan deteksi penamaan ulang"
+
+#: diff.c:5520
+msgid "use empty blobs as rename source"
+msgstr "gunakan blob kosong sebagai sumber penamaan ulang"
+
+#: diff.c:5522
+msgid "continue listing the history of a file beyond renames"
+msgstr "lanjutkan daftarkan riwayat berkas di luar penamaan ulang"
+
+#: diff.c:5525
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"cegah pendeteksian penamaan ulang/penyalinan jika jumlah target penamaan "
+"ulang/penyalinan melebihi batas yang diberikan"
+
+#: diff.c:5527
+msgid "Diff algorithm options"
+msgstr "Opsi algoritma diff"
+
+#: diff.c:5529
+msgid "produce the smallest possible diff"
+msgstr "hasilkan diff yang paling kecil yang dimungkinkan"
+
+#: diff.c:5532
+msgid "ignore whitespace when comparing lines"
+msgstr "abaikan spasi saat membandingkan baris"
+
+#: diff.c:5535
+msgid "ignore changes in amount of whitespace"
+msgstr "abaikan perubahan dalam jumlah spasi"
+
+#: diff.c:5538
+msgid "ignore changes in whitespace at EOL"
+msgstr "abaikan perubahan spasi pada EOL"
+
+#: diff.c:5541
+msgid "ignore carrier-return at the end of line"
+msgstr "abaikan kembalian-kurir pada akhir baris"
+
+#: diff.c:5544
+msgid "ignore changes whose lines are all blank"
+msgstr "abaikan perubahan yang semua baris kosong"
+
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5547
+msgid "ignore changes whose all lines match <regex>"
+msgstr "abaikan perubahan yang semua baris cocok dengan <regex>"
+
+#: diff.c:5550
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "heuristik untuk geser perbatasan hunk diff untuk pembacaan yang mudah"
+
+#: diff.c:5553
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "buat diff menggunakan algoritma \"diff sabar\""
+
+#: diff.c:5557
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "buat diff menggunakan algoritma \"diff histogram\""
+
+#: diff.c:5559
+msgid "<algorithm>"
+msgstr "<algoritma>"
+
+#: diff.c:5560
+msgid "choose a diff algorithm"
+msgstr "pilih algoritma diff"
+
+#: diff.c:5562
+msgid "<text>"
+msgstr "<teks>"
+
+#: diff.c:5563
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "buat diff menggunakan algoritma \"diff terlabuh\""
+
+#: diff.c:5565 diff.c:5574 diff.c:5577
+msgid "<mode>"
+msgstr "<mode>"
+
+#: diff.c:5566
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+"perlihatkan diff kata, menggunakan <mode> untuk batasi kata yang berubah"
+
+#: diff.c:5569
+msgid "use <regex> to decide what a word is"
+msgstr "gunakan <regex> untuk menentukan apa itu kata"
+
+#: diff.c:5572
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "sama dengan --word-diff=color --word-diff-regex=<regex>"
+
+#: diff.c:5575
+msgid "moved lines of code are colored differently"
+msgstr "baris kode yang berpindah diwarnai berbeda"
+
+#: diff.c:5578
+msgid "how white spaces are ignored in --color-moved"
+msgstr "bagaimana spasi diabaikan di --color-moved"
+
+#: diff.c:5581
+msgid "Other diff options"
+msgstr "Opsi diff yang lainnya"
+
+#: diff.c:5583
+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:5587
+msgid "treat all files as text"
+msgstr "perlakukan semua berkas sebagai teks"
+
+#: diff.c:5589
+msgid "swap two inputs, reverse the diff"
+msgstr "tukar dua masukkan, balikkan diff"
+
+#: diff.c:5591
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "keluar dengan 1 jika ada perbedaan, selain itu 0"
+
+#: diff.c:5593
+msgid "disable all output of the program"
+msgstr "nonaktifkan semua keluaran program"
+
+#: diff.c:5595
+msgid "allow an external diff helper to be executed"
+msgstr "perbolehkan pembantu diff eksternal untuk dieksekusi"
+
+#: diff.c:5597
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+"jalankan saringan konversi teks eksternal ketika membandingkan berkas biner"
+
+#: diff.c:5599
+msgid "<when>"
+msgstr "<kapan>"
+
+#: diff.c:5600
+msgid "ignore changes to submodules in the diff generation"
+msgstr "abaikan perubahan submodul dalam pembuatan diff"
+
+#: diff.c:5603
+msgid "<format>"
+msgstr "<format>"
+
+#: diff.c:5604
+msgid "specify how differences in submodules are shown"
+msgstr "sebutkan bagaimana perbedaan dalam submodul diperlihatkan"
+
+#: diff.c:5608
+msgid "hide 'git add -N' entries from the index"
+msgstr "sembunyikan entri 'git add -N' dari indeks"
+
+#: diff.c:5611
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "perlakukan entri 'git add -N' sebagai nyata dalam indeks"
+
+#: diff.c:5613
+msgid "<string>"
+msgstr "<untai>"
+
+#: diff.c:5614
+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:5617
+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:5620
+msgid "show all changes in the changeset with -S or -G"
+msgstr "perlihatkan semua perubahan dalam set perubahan dengan -S atau -G"
+
+#: diff.c:5623
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr ""
+"perlakukan <string> di -S sebagai ekspresi reguler POSIX yang diperluas"
+
+#: diff.c:5626
+msgid "control the order in which files appear in the output"
+msgstr "kontrol urutan berkas yang muncul dalam keluaran"
+
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr "<jalur>"
+
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr "perlihatkan perubahan dalam jalur yang disebutkan terlebih dahulu"
+
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr "lewati keluaran ke jalur yang disebutkan"
+
+#: diff.c:5633
+msgid "<object-id>"
+msgstr "<id objek>"
+
+#: diff.c:5634
+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:5636
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5637
+msgid "select files by diff type"
+msgstr "pilih berkas oleh tipe diff"
+
+#: diff.c:5639
+msgid "<file>"
+msgstr "<berkas>"
+
+#: diff.c:5640
+msgid "Output to a specific file"
+msgstr "Keluarkan ke berkas yang disebutkan"
+
+#: diff.c:6298
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr "deteksi penamaan ulang lengkap dilewati karena terlalu banyak berkas."
+
+#: diff.c:6301
+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:6304
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"mungkin Anda ingin menyetel variabel %s Anda ke setidaknya %d dan coba lagi "
+"perintah."
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr ""
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr ""
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr ""
+
+#: dir.c:593
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr ""
+
+#: dir.c:733 dir.c:762 dir.c:775
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr ""
+
+#: dir.c:790 dir.c:804
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr ""
+
+#: dir.c:820
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+
+#: dir.c:830
+msgid "disabling cone pattern matching"
+msgstr ""
+
+#: dir.c:1214
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr ""
+
+#: dir.c:2351
+#, c-format
+msgid "could not open directory '%s'"
+msgstr ""
+
+#: dir.c:2653
+msgid "failed to get kernel name and information"
+msgstr ""
+
+#: dir.c:2777
+msgid "untracked cache is disabled on this system or location"
+msgstr ""
+
+#: dir.c:3610
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr ""
+
+#: dir.c:3657 dir.c:3662
+#, c-format
+msgid "could not create directories for %s"
+msgstr ""
+
+#: dir.c:3691
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr ""
+
+#: editor.c:74
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr ""
+
+#: entry.c:176
+msgid "Filtering content"
+msgstr ""
+
+#: entry.c:497
+#, c-format
+msgid "could not stat file '%s'"
+msgstr ""
+
+#: environment.c:152
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr ""
+
+#: environment.c:334
+#, 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
+msgid "git fetch-pack: expected shallow list"
+msgstr ""
+
+#: fetch-pack.c:185
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr ""
+
+#: fetch-pack.c:196
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr ""
+
+#: fetch-pack.c:216
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:227
+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
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr ""
+
+#: fetch-pack.c:389 fetch-pack.c:1429
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr ""
+
+#: fetch-pack.c:391 fetch-pack.c:1431
+#, c-format
+msgid "object not found: %s"
+msgstr ""
+
+#: fetch-pack.c:394 fetch-pack.c:1434
+#, c-format
+msgid "error in object: %s"
+msgstr ""
+
+#: fetch-pack.c:396 fetch-pack.c:1436
+#, c-format
+msgid "no shallow found: %s"
+msgstr ""
+
+#: fetch-pack.c:399 fetch-pack.c:1440
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr ""
+
+#: fetch-pack.c:439
+#, c-format
+msgid "got %s %d %s"
+msgstr ""
+
+#: fetch-pack.c:456
+#, c-format
+msgid "invalid commit %s"
+msgstr ""
+
+#: fetch-pack.c:487
+msgid "giving up"
+msgstr ""
+
+#: fetch-pack.c:500 progress.c:339
+msgid "done"
+msgstr ""
+
+#: fetch-pack.c:512
+#, c-format
+msgid "got %s (%d) %s"
+msgstr ""
+
+#: fetch-pack.c:548
+#, c-format
+msgid "Marking %s as complete"
+msgstr ""
+
+#: fetch-pack.c:763
+#, c-format
+msgid "already have %s (%s)"
+msgstr ""
+
+#: fetch-pack.c:849
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr ""
+
+#: fetch-pack.c:857
+msgid "protocol error: bad pack header"
+msgstr ""
+
+#: fetch-pack.c:951
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr ""
+
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr ""
+
+#: fetch-pack.c:974
+#, c-format
+msgid "%s failed"
+msgstr ""
+
+#: fetch-pack.c:976
+msgid "error in sideband demultiplexer"
+msgstr ""
+
+#: fetch-pack.c:1019
+#, 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: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 ""
+
+#: fetch-pack.c:1029
+msgid "Server does not support shallow clients"
+msgstr ""
+
+#: fetch-pack.c:1089
+msgid "Server does not support --shallow-since"
+msgstr ""
+
+#: fetch-pack.c:1094
+msgid "Server does not support --shallow-exclude"
+msgstr ""
+
+#: fetch-pack.c:1098
+msgid "Server does not support --deepen"
+msgstr ""
+
+#: fetch-pack.c:1100
+msgid "Server does not support this repository's object format"
+msgstr ""
+
+#: fetch-pack.c:1113
+msgid "no common commits"
+msgstr ""
+
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr ""
+
+#: fetch-pack.c:1128 fetch-pack.c:1660
+msgid "git fetch-pack: fetch failed."
+msgstr ""
+
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr ""
+
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr ""
+
+#: fetch-pack.c:1279
+msgid "Server does not support shallow requests"
+msgstr ""
+
+#: fetch-pack.c:1286
+msgid "Server supports filter"
+msgstr ""
+
+#: fetch-pack.c:1329 fetch-pack.c:2043
+msgid "unable to write request to remote"
+msgstr ""
+
+#: fetch-pack.c:1347
+#, c-format
+msgid "error reading section header '%s'"
+msgstr ""
+
+#: fetch-pack.c:1353
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr ""
+
+#: fetch-pack.c:1387
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1392
+#, c-format
+msgid "error processing acks: %d"
+msgstr ""
+
+#: fetch-pack.c:1402
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1404
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1445
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr ""
+
+#: fetch-pack.c:1494
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:1499
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1504
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr ""
+
+#: fetch-pack.c:1534
+msgid "git fetch-pack: expected response end packet"
+msgstr ""
+
+#: fetch-pack.c:1939
+msgid "no matching remote head"
+msgstr ""
+
+#: fetch-pack.c:1962 builtin/clone.c:697
+msgid "remote did not send all necessary objects"
+msgstr ""
+
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr ""
+
+#: fetch-pack.c:2088
+#, c-format
+msgid "no such remote ref %s"
+msgstr ""
+
+#: fetch-pack.c:2091
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr ""
+
+#: gpg-interface.c:273
+msgid "could not create temporary file"
+msgstr ""
+
+#: gpg-interface.c:276
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr ""
+
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr ""
+
+#: graph.c:98
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr ""
+
+#: 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:1895
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': tidak dapat membaca %s"
+
+#: 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 "gagal men-stat '%s'"
+
+#: grep.c:1923
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': baca pendek"
+
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "mulai area kerja (lihat pula: git help tutorial)"
+
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr "bekerja pada perubahan saat ini (lihat pula: git help everyday)"
+
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "periksa riwayat dan keadaan (lihat pula: git help revisions)"
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "tumbuhkan, tandai, dan cubit riwayat umum Anda"
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "kolaborasi (lihat pula: git help workflows)"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "Perintah Porselen Utama"
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "Perintah Tambahan / Peubah"
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "Perintah Tambahan / Pemeriksa"
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "Berinteraksi dengan yang Lain"
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "Perintah Tingkat Rendah / Peubah"
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "Perintah Tingkat Rendah / Pemeriksa"
+
+#: help.c:37
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Perintah Tingkat Rendah / Sinkronisasi Repositori"
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Perintah Tingak Rendah / Pembantu Internal"
+
+#: help.c:300
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "perintah git yang tersedia di '%s'"
+
+#: help.c:307
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "perintah git yang tersedia dari tempat lain pada $PATH Anda"
+
+#: help.c:316
+msgid "These are common Git commands used in various situations:"
+msgstr "Berikut ini perintah Git umum yang digunakan dalam beragam situasi:"
+
+#: help.c:365 git.c:100
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "tipe daftar perintah '%s' tidak didukung"
+
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Panduan konsep Git adalah:"
+
+#: help.c:429
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "Lihat 'git help <perintah>' untuk baca tentang subperintah spesifik"
+
+#: help.c:434
+msgid "External commands"
+msgstr "Perintah eksternal"
+
+#: help.c:449
+msgid "Command aliases"
+msgstr "Alias perintah"
+
+#: help.c:527
+#, 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
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' bukan perintah git. Lihat 'git --help'."
+
+#: help.c:591
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Eh oh. Sistem Anda melaporkan tidak ada perintah Git sama sekali."
+
+#: help.c:613
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "PERINGATAN: Anda memanggil perintah Git bernama '%s' yang tidak ada."
+
+#: help.c:618
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Melanjutkan di bawah asumsi bahwa maksud Anda '%s'."
+
+#: help.c:623
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Melanjutkan dalam %0.1f detik, mengasumsikan bahwa maksud Anda '%s'."
+
+#: help.c:635
+msgid ""
+"\n"
+"The most similar command is"
+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
+msgid "git version [<options>]"
+msgstr "git version [<opsi>]"
+
+#: help.c:730
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: help.c:734
+msgid ""
+"\n"
+"Did you mean this?"
+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?"
+
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr ""
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr ""
+
+#: ident.c:362
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+
+#: ident.c:397
+msgid "no email was given and auto-detection is disabled"
+msgstr ""
+
+#: ident.c:402
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr ""
+
+#: ident.c:419
+msgid "no name was given and auto-detection is disabled"
+msgstr ""
+
+#: ident.c:425
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr ""
+
+#: ident.c:433
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr ""
+
+#: ident.c:439
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr ""
+
+#: ident.c:454 builtin/commit.c:647
+#, c-format
+msgid "invalid date format: %s"
+msgstr ""
+
+#: list-objects-filter-options.c:83
+msgid "expected 'tree:<depth>'"
+msgstr ""
+
+#: list-objects-filter-options.c:98
+msgid "sparse:path filters support has been dropped"
+msgstr ""
+
+#: list-objects-filter-options.c:105
+#, c-format
+msgid "'%s' for 'object:type=<type>' is not a valid object type"
+msgstr ""
+
+#: list-objects-filter-options.c:124
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr ""
+
+#: list-objects-filter-options.c:140
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+
+#: list-objects-filter-options.c:182
+msgid "expected something after combine:"
+msgstr ""
+
+#: list-objects-filter-options.c:264
+msgid "multiple filter-specs cannot be combined"
+msgstr ""
+
+#: list-objects-filter-options.c:376
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+
+#: list-objects-filter.c:532
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr ""
+
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr ""
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+
+#: list-objects.c:398
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr ""
+
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: merge-ort.c:1873 merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
+msgstr ""
+
+#: merge-ort.c:1880 merge-recursive.c:1396
+#, c-format
+msgid "Auto-merging %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: merge-ort.c:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
+msgstr ""
+
+#: merge-ort.c:3185 merge-recursive.c:3011
+#, c-format
+msgid "object %s is not a blob"
+msgstr ""
+
+#: 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 ""
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr ""
+
+#: merge-ort.c:3800 merge-recursive.c:3136
+msgid "submodule"
+msgstr ""
+
+#: merge-ort.c:3802 merge-recursive.c:3137
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "Sudah terbaru."
+
+#: merge-recursive.c:352
+msgid "(bad commit)\n"
+msgstr ""
+
+#: merge-recursive.c:375
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr ""
+
+#: merge-recursive.c:384
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr ""
+
+#: merge-recursive.c:872
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr ""
+
+#: merge-recursive.c:883
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr ""
+
+#: merge-recursive.c:897 merge-recursive.c:916
+msgid ": perhaps a D/F conflict?"
+msgstr ""
+
+#: merge-recursive.c:906
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr ""
+
+#: merge-recursive.c:947 builtin/cat-file.c:41
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr ""
+
+#: merge-recursive.c:952
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr ""
+
+#: merge-recursive.c:977
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr ""
+
+#: merge-recursive.c:988
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr ""
+
+#: merge-recursive.c:993
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr ""
+
+#: merge-recursive.c:1223 merge-recursive.c:1235
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr ""
+
+#: merge-recursive.c:1226 merge-recursive.c:1238
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr ""
+
+#: merge-recursive.c:1261
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+
+#: merge-recursive.c:1265
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr ""
+
+#: merge-recursive.c:1266
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr ""
+
+#: merge-recursive.c:1278
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr ""
+
+#: merge-recursive.c:1420
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr ""
+
+#: merge-recursive.c:1492
+#, 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:1497
+#, 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:1504
+#, 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:1509
+#, 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:1544
+msgid "rename"
+msgstr ""
+
+#: merge-recursive.c:1544
+msgid "renamed"
+msgstr ""
+
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr ""
+
+#: merge-recursive.c:1605
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr ""
+
+#: merge-recursive.c:1663
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
+msgstr ""
+
+#: merge-recursive.c:1694
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:1699
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:1726
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+
+#: merge-recursive.c:1731
+msgid " (left unresolved)"
+msgstr ""
+
+#: merge-recursive.c:1823
+#, c-format
+msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
+msgstr ""
+
+#: merge-recursive.c:2086
+#, 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."
+msgstr ""
+
+#: merge-recursive.c:2220
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+
+#: merge-recursive.c:3075
+msgid "modify"
+msgstr ""
+
+#: merge-recursive.c:3075
+msgid "modified"
+msgstr ""
+
+#: merge-recursive.c:3114
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr ""
+
+#: merge-recursive.c:3167
+#, c-format
+msgid "Adding as %s instead"
+msgstr ""
+
+#: merge-recursive.c:3371
+#, c-format
+msgid "Removing %s"
+msgstr ""
+
+#: merge-recursive.c:3394
+msgid "file/directory"
+msgstr ""
+
+#: merge-recursive.c:3399
+msgid "directory/file"
+msgstr ""
+
+#: merge-recursive.c:3406
+#, c-format
+msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
+msgstr ""
+
+#: merge-recursive.c:3415
+#, c-format
+msgid "Adding %s"
+msgstr ""
+
+#: merge-recursive.c:3424
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr ""
+
+#: merge-recursive.c:3477
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr ""
+
+#: merge-recursive.c:3571
+msgid "Merging:"
+msgstr ""
+
+#: merge-recursive.c:3584
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: merge-recursive.c:3634
+msgid "merge returned no commit"
+msgstr ""
+
+#: merge-recursive.c:3799
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr ""
+
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
+msgid "Unable to write index."
+msgstr ""
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr ""
+
+#: 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 ""
+
+#: 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:121
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+
+#: midx.c:126
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr ""
+
+#: midx.c:131
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr ""
+
+#: midx.c:148
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
+
+#: midx.c:150
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
+
+#: midx.c:152
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr ""
+
+#: midx.c:154
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:170
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
+
+#: midx.c:214
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr ""
+
+#: midx.c:264
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+
+#: midx.c:490
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr ""
+
+#: midx.c:496
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr ""
+
+#: midx.c:564
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr ""
+
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr "tidak dapat menyimpan berkas indeks balik"
+
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr ""
+
+#: midx.c:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr ""
+
+#: midx.c:989
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr ""
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr ""
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr ""
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "gagal menghapus %s"
+
+#: midx.c:1166
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr ""
+
+#: midx.c:1225
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr ""
+
+#: midx.c:1236
+msgid "Looking for referenced packfiles"
+msgstr ""
+
+#: midx.c:1251
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr ""
+
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
+msgstr ""
+
+#: midx.c:1274
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr ""
+
+#: midx.c:1294
+msgid "Sorting objects by packfile"
+msgstr ""
+
+#: midx.c:1301
+msgid "Verifying object offsets"
+msgstr ""
+
+#: midx.c:1317
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr ""
+
+#: midx.c:1323
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr ""
+
+#: midx.c:1332
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+
+#: midx.c:1357
+msgid "Counting referenced objects"
+msgstr ""
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr ""
+
+#: midx.c:1558
+msgid "could not start pack-objects"
+msgstr ""
+
+#: midx.c:1578
+msgid "could not finish pack-objects"
+msgstr ""
+
+#: name-hash.c:542
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr ""
+
+#: name-hash.c:564
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr ""
+
+#: name-hash.c:570
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr ""
+
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr ""
+
+#: notes-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr ""
+
+#. 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr ""
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr ""
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr ""
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr ""
+
+#: object-file.c:789
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+
+#: object-file.c:795
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr ""
+
+#: object-file.c:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr ""
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr ""
+
+#: object-file.c:1397
+msgid "invalid object type"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr ""
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr ""
+
+#: 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 ""
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr ""
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr ""
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr ""
+
+#: 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 ""
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr ""
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr ""
+
+#: 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 ""
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr ""
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr ""
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr ""
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr ""
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "tidak dapat membuka %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 ""
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr ""
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr ""
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr ""
+
+#: object-name.c:480
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr ""
+
+#: object-name.c:491
+msgid "The candidates are:"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: object-name.c:1778
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+
+#: object-name.c:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr ""
+
+#: object.c:53
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr ""
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr ""
+
+#: object.c:250
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr ""
+
+#: object.c:263
+#, c-format
+msgid "unable to parse object: %s"
+msgstr ""
+
+#: object.c:283 object.c:295
+#, c-format
+msgid "hash mismatch %s"
+msgstr ""
+
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr ""
+
+#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr ""
+
+#: 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 ""
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr ""
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr ""
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr ""
+
+#: packfile.c:625
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr ""
+
+#: packfile.c:1934
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+
+#: packfile.c:1938
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr ""
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr ""
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+
+#: parse-options-cb.c:132 parse-options-cb.c:149
+#, c-format
+msgid "malformed object name '%s'"
+msgstr ""
+
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr ""
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr ""
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr ""
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#, c-format
+msgid "%s takes no value"
+msgstr ""
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr ""
+
+#: parse-options.c:217
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+
+#: parse-options.c:386
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr ""
+
+#: parse-options.c:420 parse-options.c:428
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr ""
+
+#: parse-options.c:668 parse-options.c:988
+#, c-format
+msgid "alias of --%s"
+msgstr ""
+
+#: parse-options.c:879
+#, c-format
+msgid "unknown option `%s'"
+msgstr ""
+
+#: parse-options.c:881
+#, c-format
+msgid "unknown switch `%c'"
+msgstr ""
+
+#: parse-options.c:883
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr ""
+
+#: parse-options.c:907
+msgid "..."
+msgstr ""
+
+#: parse-options.c:926
+#, c-format
+msgid "usage: %s"
+msgstr ""
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:932
+#, c-format
+msgid "   or: %s"
+msgstr ""
+
+#: parse-options.c:935
+#, c-format
+msgid "    %s"
+msgstr ""
+
+#: parse-options.c:974
+msgid "-NUM"
+msgstr ""
+
+#: path.c:915
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr ""
+
+#: pathspec.c:151
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+
+#: pathspec.c:169
+msgid "Only one 'attr:' specification is allowed."
+msgstr ""
+
+#: pathspec.c:172
+msgid "attr spec must not be empty"
+msgstr ""
+
+#: pathspec.c:215
+#, c-format
+msgid "invalid attribute name %s"
+msgstr ""
+
+#: pathspec.c:280
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+
+#: pathspec.c:287
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+
+#: pathspec.c:327
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr ""
+
+#: pathspec.c:348
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr ""
+
+#: pathspec.c:353
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr ""
+
+#: pathspec.c:391
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr ""
+
+#: pathspec.c:450
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr ""
+
+#: pathspec.c:466
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr ""
+
+#: pathspec.c:542
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr ""
+
+#: pathspec.c:552
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr ""
+
+#: pathspec.c:619
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr ""
+
+#: pathspec.c:664
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr ""
+
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr ""
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr ""
+
+#: pkt-line.c:106
+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
+msgid "protocol error: impossibly long line"
+msgstr ""
+
+#: pkt-line.c:169 pkt-line.c:171
+msgid "packet write with format failed"
+msgstr ""
+
+#: pkt-line.c:204
+msgid "packet write failed - data exceeds max packet size"
+msgstr ""
+
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr ""
+
+#: pkt-line.c:328 pkt-line.c:329
+msgid "read error"
+msgstr ""
+
+#: pkt-line.c:339 pkt-line.c:340
+msgid "the remote end hung up unexpectedly"
+msgstr ""
+
+#: pkt-line.c:369 pkt-line.c:371
+#, 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
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr ""
+
+#: pkt-line.c:413 sideband.c:165
+#, c-format
+msgid "remote error: %s"
+msgstr ""
+
+#: preload-index.c:125
+msgid "Refreshing index"
+msgstr ""
+
+#: preload-index.c:144
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr ""
+
+#: pretty.c:988
+msgid "unable to parse --pretty format"
+msgstr ""
+
+#: promisor-remote.c:31
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c:38 promisor-remote.c:40
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c:44
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+
+#: 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 ""
+
+#: range-diff.c:78
+msgid "could not start `log`"
+msgstr ""
+
+#: range-diff.c:80
+msgid "could not read `log` output"
+msgstr ""
+
+#: range-diff.c:101 sequencer.c:5550
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: 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:140
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr ""
+
+#: range-diff.c:307
+msgid "failed to generate diff"
+msgstr ""
+
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr ""
+
+#: range-diff.c:562 range-diff.c:564
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr ""
+
+#: read-cache.c:710
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr ""
+
+#: read-cache.c:726
+msgid "cannot create an empty blob in the object database"
+msgstr ""
+
+#: read-cache.c:748
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+
+#: read-cache.c:753
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr ""
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to index file '%s'"
+msgstr ""
+
+#: read-cache.c:824
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr ""
+
+#: read-cache.c:835
+#, c-format
+msgid "unable to stat '%s'"
+msgstr ""
+
+#: read-cache.c:1358
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr ""
+
+#: read-cache.c:1573
+msgid "Refresh index"
+msgstr ""
+
+#: read-cache.c:1705
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c:1715
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+
+#: read-cache.c:1771
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr ""
+
+#: read-cache.c:1774
+#, c-format
+msgid "bad index version %d"
+msgstr ""
+
+#: read-cache.c:1783
+msgid "bad index file sha1 signature"
+msgstr ""
+
+#: read-cache.c:1817
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
+
+#: read-cache.c:1819
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr ""
+
+#: read-cache.c:1856
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr ""
+
+#: read-cache.c:1872
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr ""
+
+#: read-cache.c:1929
+msgid "unordered stage entries in index"
+msgstr ""
+
+#: read-cache.c:1932
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr ""
+
+#: read-cache.c:1935
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: read-cache.c:2185
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2198
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr ""
+
+#: read-cache.c:2231
+#, c-format
+msgid "%s: index file open failed"
+msgstr ""
+
+#: read-cache.c:2235
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr ""
+
+#: read-cache.c:2239
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr ""
+
+#: read-cache.c:2243
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr ""
+
+#: read-cache.c:2286
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2313
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr ""
+
+#: read-cache.c:2351
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr ""
+
+#: read-cache.c:2398
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr ""
+
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#, c-format
+msgid "could not close '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: read-cache.c:3159
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr ""
+
+#: read-cache.c:3171
+#, c-format
+msgid "unable to unlink: %s"
+msgstr ""
+
+#: read-cache.c:3200
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr ""
+
+#: read-cache.c:3349
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr ""
+
+#: rebase-interactive.c:11
+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 ""
+
+#: rebase-interactive.c:33
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+
+#: rebase-interactive.c:42
+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 [-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"
+"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 ""
+
+#: 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] ""
+
+#: 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"
+msgstr ""
+
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+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
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+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:3836
+#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#, c-format
+msgid "could not write '%s'"
+msgstr ""
+
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
+#, c-format
+msgid "could not write '%s'."
+msgstr ""
+
+#: rebase-interactive.c:196
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+
+#: rebase-interactive.c:203
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+
+#: 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 ""
+
+#: ref-filter.c:42 wt-status.c:2036
+msgid "gone"
+msgstr ""
+
+#: ref-filter.c:43
+#, c-format
+msgid "ahead %d"
+msgstr ""
+
+#: ref-filter.c:44
+#, c-format
+msgid "behind %d"
+msgstr ""
+
+#: ref-filter.c:45
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr ""
+
+#: ref-filter.c:230
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr ""
+
+#: ref-filter.c:232
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr ""
+
+#: ref-filter.c:254
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr ""
+
+#: ref-filter.c:258
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr ""
+
+#: ref-filter.c:260
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr ""
+
+#: ref-filter.c:315
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:339
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr ""
+
+#: ref-filter.c:347
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:359
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr ""
+
+#: ref-filter.c:372
+#, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr ""
+
+#: ref-filter.c:391
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr ""
+
+#: ref-filter.c:393
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr ""
+
+#: ref-filter.c:424
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr ""
+
+#: ref-filter.c:426
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr ""
+
+#: ref-filter.c:441
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr ""
+
+#: ref-filter.c:445
+#, c-format
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr ""
+
+#: ref-filter.c:459
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr ""
+
+#: ref-filter.c:489
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr ""
+
+#: ref-filter.c:501
+#, c-format
+msgid "unrecognized position:%s"
+msgstr ""
+
+#: ref-filter.c:508
+#, c-format
+msgid "unrecognized width:%s"
+msgstr ""
+
+#: ref-filter.c:517
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr ""
+
+#: ref-filter.c:525
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr ""
+
+#: ref-filter.c:543
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr ""
+
+#: ref-filter.c:645
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr ""
+
+#: ref-filter.c:672
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr ""
+
+#: ref-filter.c:676
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+
+#: ref-filter.c:801
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr ""
+
+#: ref-filter.c:865
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr ""
+
+#: ref-filter.c:867
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr ""
+
+#: ref-filter.c:869
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr ""
+
+#: ref-filter.c:897
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr ""
+
+#: ref-filter.c:899
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr ""
+
+#: ref-filter.c:901
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr ""
+
+#: ref-filter.c:916
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr ""
+
+#: ref-filter.c:973
+#, c-format
+msgid "malformed format string %s"
+msgstr ""
+
+#: ref-filter.c:1621
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr ""
+
+#: ref-filter.c:1624
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr ""
+
+#: ref-filter.c:1627
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr ""
+
+#: ref-filter.c:1631
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr ""
+
+#: ref-filter.c:1634
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr ""
+
+#: ref-filter.c:1637
+msgid "(no branch)"
+msgstr ""
+
+#: ref-filter.c:1669 ref-filter.c:1880
+#, c-format
+msgid "missing object %s for %s"
+msgstr ""
+
+#: ref-filter.c:1679
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr ""
+
+#: ref-filter.c:2064
+#, c-format
+msgid "malformed object at '%s'"
+msgstr ""
+
+#: ref-filter.c:2153
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr ""
+
+#: ref-filter.c:2158 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr ""
+
+#: ref-filter.c:2502
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr ""
+
+#: ref-filter.c:2596
+#, c-format
+msgid "malformed object name %s"
+msgstr ""
+
+#: ref-filter.c:2601
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr ""
+
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr ""
+
+#: 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 ""
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr ""
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr ""
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr ""
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr ""
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr ""
+
+#: refs.c:2248 refs.c:2283
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr ""
+
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
+msgstr ""
+
+#: refs/files-backend.c:1242 refs/packed-backend.c:1542
+#: refs/packed-backend.c:1552
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr ""
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr ""
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr ""
+
+#: remote.c:351
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "pintasan konfigurasi remote tidak dapat diawali dengan '/': %s"
+
+#: remote.c:399
+msgid "more than one receivepack given, using the first"
+msgstr "lebih dari satu paket terima diberikan, gunakan yang pertama"
+
+#: remote.c:407
+msgid "more than one uploadpack given, using the first"
+msgstr "lebih dari satu paket unggah diberikan, gunakan yang pertama"
+
+#: remote.c:590
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "tidak dapat mengambil baik %s dan %s ke %s"
+
+#: remote.c:594
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s biasanya melacak %s, bukan %s"
+
+#: remote.c:598
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s melacak baik %s dan %s"
+
+#: remote.c:666
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "kunci '%s' dari pola tidak ada '*'"
+
+#: remote.c:676
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "nilai '%s' dari pola tidak ada '*'"
+
+#: remote.c:1083
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "spek referensi sumber %s tidak cocok dengan apapun"
+
+#: remote.c:1088
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "spek referensi sumber %s cocok dengan lebih dari satu"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1103
+#, 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"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"Tujuan yang Anda berikan bukan nama referensi penuh (seperti \n"
+"dimulai dengan \"refs/\"). Kami mencoba menebak maksud Anda dengan:\n"
+"- Cari referensi yang cocok dengan '%s' pada sisi remote.\n"
+"- Perika apakah <src> yang sedang didorong ('%s') adalah \n"
+"  referensi pada \"refs/{heads,tags}\". Bila demikian kami \n"
+"  menambahkan awalan refs/{heads,tags}/ yang bersesuaian pada sisi \n"
+"  remote.\n"
+"\n"
+"Kedua-duanya tidak bekerja, jadi kami menyerah. Anda harus kualifikasi\n"
+"penuh referensi."
+
+#: remote.c:1123
+#, 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 ""
+"Bagian <src> dari spek referensi adalah objek komit.\n"
+"Apakah maksud Anda buat cabang baru dengan mendorong ke\n"
+"'%s:refs/heads/%s'?"
+
+#: remote.c:1128
+#, 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 ""
+"Bagian <src> dari spek referensi adalah objek tag.\n"
+"Apakah maksud Anda buat tag baru dengan mendorong ke\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c:1133
+#, 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 ""
+"Bagian <src> dari spek referensi adalah objek pohon.\n"
+"Apakah maksud Anda tag pohon dengan mendorong ke\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c:1138
+#, 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 ""
+"Bagian <src> dari spek referensi adalah objek blob.\n"
+"Apakah maksud Anda tag blob baru dengan mendorong ke\n"
+"'%s:refs/tags/%s'?"
+
+#: remote.c:1174
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s tidak dapat diselesaikan ke cabang"
+
+#: remote.c:1185
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "tidak dapat menghapus '%s': referensi remote tidak ada"
+
+#: remote.c:1197
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "spek referensi tujuan %s cocok dengan lebih dari satu"
+
+#: remote.c:1204
+#, 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
+msgid "HEAD does not point to a branch"
+msgstr "HEAD tidak menunjuk ke cabang"
+
+#: remote.c:1733
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "tidak ada cabang seperti: '%s'"
+
+#: remote.c:1736
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "tidak ada hulu yang terkonfigurasi untuk cabang '%s'"
+
+#: remote.c:1742
+#, 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
+#, 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
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "cabang '%s' tidak ada remote untuk didorong"
+
+#: remote.c:1779
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "spek referensi dorong untuk '%s' tidak termasuk '%s'"
+
+#: remote.c:1792
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "dorong tidak ada tujuan (push.default yaitu 'nothing')"
+
+#: remote.c:1814
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "tidak dapat menyelesaikan dorongan 'sederhana' ke satu tujuan"
+
+#: remote.c:1943
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "tidak dapat menemukan referensi remote %s"
+
+#: remote.c:1956
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Abaikan referensi lucu '%s' secara lokal"
+
+#: remote.c:2119
+#, 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
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (gunakan \"git branch --unset-upstream\" untuk perbaiki)\n"
+
+#: remote.c:2126
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Cabang Anda mutakhir dengan '%s'.\n"
+
+#: remote.c:2130
+#, 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
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (gunakan \"%s\" untuk selengkapnya)\n"
+
+#: 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] ""
+msgstr[1] ""
+
+#: remote.c:2143
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (gunakan \"git push\" untuk terbitkan komit lokal Anda)\n"
+
+#: remote.c:2146
+#, 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] ""
+msgstr[1] ""
+
+#: remote.c:2154
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (gunakan \"git pull\" untuk perbarui cabang lokal Anda)\n"
+
+#: remote.c:2157
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: remote.c:2167
+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
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "tidak dapat mengurai nama object yang diharapkan '%s'"
+
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr ""
+
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr ""
+
+#: replace-object.c:82
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr ""
+
+#: rerere.c:201 rerere.c:210 rerere.c:213
+msgid "corrupt MERGE_RR"
+msgstr ""
+
+#: rerere.c:248 rerere.c:253
+msgid "unable to write rerere record"
+msgstr ""
+
+#: rerere.c:479
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr ""
+
+#: rerere.c:482
+#, c-format
+msgid "failed to flush '%s'"
+msgstr ""
+
+#: rerere.c:487 rerere.c:1023
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr ""
+
+#: rerere.c:668
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr ""
+
+#: rerere.c:678
+#, c-format
+msgid "writing '%s' failed"
+msgstr ""
+
+#: rerere.c:698
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr ""
+
+#: rerere.c:737
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr ""
+
+#: rerere.c:772
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr ""
+
+#: rerere.c:787
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr ""
+
+#: rerere.c:791
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: rerere.c:1041
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr ""
+
+#: rerere.c:1052 rerere.c:1059
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr ""
+
+#: rerere.c:1061
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr ""
+
+#: rerere.c:1071
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr ""
+
+#: rerere.c:1080
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr ""
+
+#: rerere.c:1191
+msgid "unable to open rr-cache directory"
+msgstr ""
+
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "tidak dapat menentukan revisi HEAD"
+
+#: reset.c:69 reset.c:75 sequencer.c:3689
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "gagal menemukan pohon %s"
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr ""
+
+#: revision.c:2684
+msgid "your current branch appears to be broken"
+msgstr ""
+
+#: revision.c:2687
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr ""
+
+#: revision.c:2893
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr ""
+
+#: run-command.c:766
+msgid "open /dev/null failed"
+msgstr ""
+
+#: run-command.c:1274
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr ""
+
+#: 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:150
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+
+#: send-pack.c:152
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr ""
+
+#: send-pack.c:154
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr ""
+
+#: send-pack.c:378
+msgid "failed to sign the push certificate"
+msgstr ""
+
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr ""
+
+#: 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 ""
+
+#: send-pack.c:535
+msgid "the receiving end does not support --signed push"
+msgstr ""
+
+#: send-pack.c:537
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+
+#: send-pack.c:544
+msgid "the receiving end does not support --atomic push"
+msgstr ""
+
+#: send-pack.c:549
+msgid "the receiving end does not support push options"
+msgstr ""
+
+#: sequencer.c:196
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr ""
+
+#: sequencer.c:324
+#, c-format
+msgid "could not delete '%s'"
+msgstr ""
+
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#, c-format
+msgid "could not remove '%s'"
+msgstr ""
+
+#: sequencer.c:354
+msgid "revert"
+msgstr ""
+
+#: sequencer.c:356
+msgid "cherry-pick"
+msgstr ""
+
+#: sequencer.c:358
+msgid "rebase"
+msgstr ""
+
+#: sequencer.c:360
+#, c-format
+msgid "unknown action: %d"
+msgstr ""
+
+#: sequencer.c:419
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+
+#: sequencer.c:422
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'\n"
+"and commit the result with 'git commit'"
+msgstr ""
+
+#: sequencer.c:435 sequencer.c:3271
+#, c-format
+msgid "could not lock '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: sequencer.c:442
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr ""
+
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr ""
+
+#: sequencer.c:486
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr ""
+
+#: sequencer.c:490
+msgid "commit your changes or stash them to proceed."
+msgstr ""
+
+#: sequencer.c:522
+#, c-format
+msgid "%s: fast-forward"
+msgstr ""
+
+#: sequencer.c:561 builtin/tag.c:609
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr ""
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c:671
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr ""
+
+#: sequencer.c:685
+msgid "unable to update cache tree"
+msgstr ""
+
+#: sequencer.c:699
+msgid "could not resolve HEAD commit"
+msgstr ""
+
+#: sequencer.c:779
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr ""
+
+#: sequencer.c:790
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr ""
+
+#: 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 ""
+
+#: sequencer.c:837
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr ""
+
+#: sequencer.c:842
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr ""
+
+#: sequencer.c:847
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr ""
+
+#: sequencer.c:851
+#, c-format
+msgid "unknown variable '%s'"
+msgstr ""
+
+#: sequencer.c:856
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr ""
+
+#: sequencer.c:858
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr ""
+
+#: sequencer.c:860
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
+
+#: sequencer.c:925
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+
+#: sequencer.c:1212
+msgid "'prepare-commit-msg' hook failed"
+msgstr ""
+
+#: 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"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+
+#: sequencer.c:1231
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+
+#: sequencer.c:1273
+msgid "couldn't look up newly created commit"
+msgstr ""
+
+#: sequencer.c:1275
+msgid "could not parse newly created commit"
+msgstr ""
+
+#: sequencer.c:1321
+msgid "unable to resolve HEAD after creating commit"
+msgstr ""
+
+#: sequencer.c:1323
+msgid "detached HEAD"
+msgstr ""
+
+#: sequencer.c:1327
+msgid " (root-commit)"
+msgstr ""
+
+#: sequencer.c:1348
+msgid "could not parse HEAD"
+msgstr ""
+
+#: sequencer.c:1350
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr ""
+
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+msgid "could not parse HEAD commit"
+msgstr ""
+
+#: sequencer.c:1410 sequencer.c:2295
+msgid "unable to parse commit author"
+msgstr ""
+
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: sequencer.c:1454 sequencer.c:1574
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr ""
+
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr ""
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: sequencer.c:1606
+#, c-format
+msgid "could not parse commit %s"
+msgstr ""
+
+#: sequencer.c:1611
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr ""
+
+#: sequencer.c:1694 sequencer.c:1975
+#, c-format
+msgid "unknown command: %d"
+msgstr ""
+
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr ""
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr ""
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr ""
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr ""
+
+#: sequencer.c:1740
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr ""
+
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr ""
+
+#: sequencer.c:1934
+msgid "need a HEAD to fixup"
+msgstr ""
+
+#: sequencer.c:1936 sequencer.c:3582
+msgid "could not read HEAD"
+msgstr ""
+
+#: sequencer.c:1938
+msgid "could not read HEAD's commit message"
+msgstr ""
+
+#: sequencer.c:1962
+#, c-format
+msgid "could not read commit message of %s"
+msgstr ""
+
+#: sequencer.c:2072
+msgid "your index file is unmerged."
+msgstr ""
+
+#: sequencer.c:2079
+msgid "cannot fixup root commit"
+msgstr ""
+
+#: sequencer.c:2098
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr ""
+
+#: sequencer.c:2106 sequencer.c:2114
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr ""
+
+#: sequencer.c:2120
+#, 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
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr ""
+
+#: sequencer.c:2205
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:2265
+#, c-format
+msgid "could not revert %s... %s"
+msgstr ""
+
+#: sequencer.c:2266
+#, c-format
+msgid "could not apply %s... %s"
+msgstr ""
+
+#: sequencer.c:2287
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr ""
+
+#: sequencer.c:2345
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr ""
+
+#: sequencer.c:2352
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr ""
+
+#: sequencer.c:2425
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr ""
+
+#: sequencer.c:2434
+#, c-format
+msgid "missing arguments for %s"
+msgstr ""
+
+#: sequencer.c:2477
+#, c-format
+msgid "could not parse '%s'"
+msgstr ""
+
+#: sequencer.c:2538
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr ""
+
+#: sequencer.c:2549
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr ""
+
+#: sequencer.c:2635
+msgid "cancelling a cherry picking in progress"
+msgstr ""
+
+#: sequencer.c:2644
+msgid "cancelling a revert in progress"
+msgstr ""
+
+#: sequencer.c:2690
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr ""
+
+#: sequencer.c:2692
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr ""
+
+#: sequencer.c:2697
+msgid "no commits parsed."
+msgstr ""
+
+#: sequencer.c:2708
+msgid "cannot cherry-pick during a revert."
+msgstr ""
+
+#: sequencer.c:2710
+msgid "cannot revert during a cherry-pick."
+msgstr ""
+
+#: sequencer.c:2788
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr ""
+
+#: sequencer.c:2897
+msgid "unusable squash-onto"
+msgstr ""
+
+#: sequencer.c:2917
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr ""
+
+#: sequencer.c:3012 sequencer.c:4868
+msgid "empty commit set passed"
+msgstr ""
+
+#: sequencer.c:3029
+msgid "revert is already in progress"
+msgstr ""
+
+#: sequencer.c:3031
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:3034
+msgid "cherry-pick is already in progress"
+msgstr ""
+
+#: sequencer.c:3036
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr ""
+
+#: sequencer.c:3050
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr ""
+
+#: sequencer.c:3065
+msgid "could not lock HEAD"
+msgstr ""
+
+#: sequencer.c:3125 sequencer.c:4581
+msgid "no cherry-pick or revert in progress"
+msgstr ""
+
+#: sequencer.c:3127 sequencer.c:3138
+msgid "cannot resolve HEAD"
+msgstr ""
+
+#: sequencer.c:3129 sequencer.c:3173
+msgid "cannot abort from a branch yet to be born"
+msgstr ""
+
+#: sequencer.c:3159 builtin/grep.c:758
+#, c-format
+msgid "cannot open '%s'"
+msgstr ""
+
+#: sequencer.c:3161
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr ""
+
+#: sequencer.c:3162
+msgid "unexpected end of file"
+msgstr ""
+
+#: sequencer.c:3168
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr ""
+
+#: sequencer.c:3179
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr ""
+
+#: sequencer.c:3220
+msgid "no revert in progress"
+msgstr ""
+
+#: sequencer.c:3229
+msgid "no cherry-pick in progress"
+msgstr ""
+
+#: sequencer.c:3239
+msgid "failed to skip the commit"
+msgstr ""
+
+#: sequencer.c:3246
+msgid "there is nothing to skip"
+msgstr ""
+
+#: sequencer.c:3249
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+
+#: sequencer.c:3411 sequencer.c:4472
+msgid "cannot read HEAD"
+msgstr ""
+
+#: sequencer.c:3428
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:3436
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+
+#: sequencer.c:3446
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr ""
+
+#: sequencer.c:3453
+#, c-format
+msgid "Could not merge %.*s"
+msgstr ""
+
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr ""
+
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr ""
+
+#: sequencer.c:3498
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: sequencer.c:3504
+msgid "and made changes to the index and/or the working tree\n"
+msgstr ""
+
+#: sequencer.c:3510
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+
+#: sequencer.c:3572
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr ""
+
+#: sequencer.c:3645
+msgid "writing fake root commit"
+msgstr ""
+
+#: sequencer.c:3650
+msgid "writing squash-onto"
+msgstr ""
+
+#: sequencer.c:3734
+#, c-format
+msgid "could not resolve '%s'"
+msgstr ""
+
+#: sequencer.c:3767
+msgid "cannot merge without a current revision"
+msgstr ""
+
+#: sequencer.c:3789
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr ""
+
+#: sequencer.c:3798
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr ""
+
+#: sequencer.c:3810
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
+
+#: sequencer.c:3826
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr ""
+
+#: sequencer.c:4009
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr ""
+
+#: sequencer.c:4025
+msgid "merge: Unable to write new index file"
+msgstr ""
+
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr ""
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr ""
+
+#: sequencer.c:4140
+#, c-format
+msgid "Applied autostash.\n"
+msgstr ""
+
+#: sequencer.c:4152
+#, c-format
+msgid "cannot store %s"
+msgstr ""
+
+#: sequencer.c:4155
+#, 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 ""
+
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
+msgstr ""
+
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+msgid "could not detach HEAD"
+msgstr ""
+
+#: sequencer.c:4248
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr ""
+
+#: sequencer.c:4250
+#, c-format
+msgid "Stopped at %s\n"
+msgstr ""
+
+#: sequencer.c:4258
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr ""
+
+#: sequencer.c:4350
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr ""
+
+#: sequencer.c:4421
+#, c-format
+msgid "unknown command %d"
+msgstr ""
+
+#: sequencer.c:4480
+msgid "could not read orig-head"
+msgstr ""
+
+#: sequencer.c:4485
+msgid "could not read 'onto'"
+msgstr ""
+
+#: sequencer.c:4499
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr ""
+
+#: sequencer.c:4559
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr ""
+
+#: sequencer.c:4611
+msgid "cannot rebase: You have unstaged changes."
+msgstr ""
+
+#: sequencer.c:4620
+msgid "cannot amend non-existing commit"
+msgstr ""
+
+#: sequencer.c:4622
+#, c-format
+msgid "invalid file: '%s'"
+msgstr ""
+
+#: sequencer.c:4624
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr ""
+
+#: sequencer.c:4627
+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:4663 sequencer.c:4702
+#, c-format
+msgid "could not write file: '%s'"
+msgstr ""
+
+#: sequencer.c:4718
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr ""
+
+#: sequencer.c:4725
+msgid "could not commit staged changes."
+msgstr ""
+
+#: sequencer.c:4845
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr ""
+
+#: sequencer.c:4849
+#, c-format
+msgid "%s: bad revision"
+msgstr ""
+
+#: sequencer.c:4884
+msgid "can't revert as initial commit"
+msgstr ""
+
+#: sequencer.c:5361
+msgid "make_script: unhandled options"
+msgstr ""
+
+#: sequencer.c:5364
+msgid "make_script: error preparing revisions"
+msgstr ""
+
+#: sequencer.c:5614 sequencer.c:5631
+msgid "nothing to do"
+msgstr ""
+
+#: sequencer.c:5650
+msgid "could not skip unnecessary pick commands"
+msgstr ""
+
+#: sequencer.c:5750
+msgid "the script was already rearranged."
+msgstr ""
+
+#: setup.c:133
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr ""
+
+#: setup.c:185
+#, 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
+#, 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 ""
+
+#: setup.c:264
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr ""
+
+#: setup.c:283
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+
+#: setup.c:419
+msgid "unable to set up work tree using invalid config"
+msgstr ""
+
+#: setup.c:423 builtin/rev-parse.c:895
+msgid "this operation must be run in a work tree"
+msgstr ""
+
+#: setup.c:658
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr ""
+
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: setup.c:701
+#, c-format
+msgid "error opening '%s'"
+msgstr ""
+
+#: setup.c:703
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr ""
+
+#: setup.c:705
+#, c-format
+msgid "error reading %s"
+msgstr ""
+
+#: setup.c:707
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr ""
+
+#: setup.c:709
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr ""
+
+#: setup.c:711
+#, c-format
+msgid "not a git repository: %s"
+msgstr ""
+
+#: setup.c:813
+#, c-format
+msgid "'$%s' too big"
+msgstr ""
+
+#: setup.c:827
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr ""
+
+#: setup.c:856 setup.c:858 setup.c:889
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr ""
+
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+msgid "cannot come back to cwd"
+msgstr ""
+
+#: setup.c:988
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr ""
+
+#: setup.c:1231
+msgid "Unable to read current working directory"
+msgstr ""
+
+#: setup.c:1240 setup.c:1246
+#, c-format
+msgid "cannot change to '%s'"
+msgstr ""
+
+#: setup.c:1251
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr ""
+
+#: 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 ""
+
+#: 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."
+msgstr ""
+
+#: setup.c:1430
+msgid "open /dev/null or dup failed"
+msgstr ""
+
+#: setup.c:1445
+msgid "fork failed"
+msgstr ""
+
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
+msgid "setsid failed"
+msgstr ""
+
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
+msgstr ""
+
+#: sparse-index.c:176
+msgid "unable to update cache-tree, staying full"
+msgstr ""
+
+#: sparse-index.c:263
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:850
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:852
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:860
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:862
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:869
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:871
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:877
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:879
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] ""
+msgstr[1] ""
+
+#: 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 ""
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr ""
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "abaikan nama submodul dicurigai: %s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "nilai negatif tidak diperbolehkan untuk submodule.fetchjobs"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "abaikan '%s' yang mungkin ditafsirkan sebagai opsi baris perintah: %s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "nilai tidak valid untuk %s"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Tidak dapat memperbarui entri .gitmodules %s"
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Tidak dapat mengubah .gitmodules yang tak tergabung, selesaikan konflik "
+"penggabungan terlebih dahulu"
+
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Tidak dapat menemukan bagian .gitmodules dimana path=%s"
+
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Tidak dapat menghapus entri .gitmodules untuk %s"
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr "gagal menggelar .gitmodules terbarui"
+
+#: submodule.c:328
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "dalam submodul tak terisi '%s'"
+
+#: submodule.c:359
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Spek jalur '%s' di dalam submodul '%.*s'"
+
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "argumen --ignore-submodules jelek: %s"
+
+#: submodule.c:805
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Submodul dalam komit %s pada jalur '%s' bertabrakan dengan submodul yang "
+"bernama sama. Melewati itu."
+
+#: submodule.c:908
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "entri submodul '%s' (%s) adalah %s, bukan komit"
+
+#: submodule.c:993
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Tidak dapat menjalankan perintah 'git rev-list <komit> --not --remotes -n 1' "
+"dalam submodul %s"
+
+#: submodule.c:1116
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "proses untuk submodul '%s' gagal"
+
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Gagal menguraikan HEAD sebagai referensi valid."
+
+#: submodule.c:1156
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Mendorong submodul '%s'\n"
+
+#: submodule.c:1159
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Tidak dapat mendorong submodul '%s'\n"
+
+#: submodule.c:1451
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Mengambil submodul %s%s\n"
+
+#: submodule.c:1485
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Tidak dapat mengakses submodul '%s'\n"
+
+#: submodule.c:1640
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Kesalahan saat pengambilan submodul:\n"
+"%s"
+
+#: submodule.c:1665
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' tak dikenal sebagai repositori git"
+
+#: submodule.c:1682
+#, 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:1723
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' gagal dalam submodul %s"
+
+#: submodule.c:1798
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "Tidak dalat memulai 'git status' dalam submodul '%s'"
+
+#: submodule.c:1811
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "tidak dapat menjalankan 'git status' dalam submodul '%s'"
+
+#: submodule.c:1826
+#, 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:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "tidak dapat rekursi ke dalam submodul '%s'"
+
+#: submodule.c:1874
+msgid "could not reset submodule index"
+msgstr "tidak dapat reset indeks submodul"
+
+#: submodule.c:1916
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "submodul '%s' punya indeks kotor"
+
+#: submodule.c:1968
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Submodul '%s' tidak dapat diperbarui."
+
+#: submodule.c:2036
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "direktori submodul git '%s' di dalam direktori git '%.*s'"
+
+#: submodule.c:2057
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir untuk submodul '%s' dengan lebih dari satu pohon kerja tidak "
+"didukung"
+
+#: submodule.c:2069 submodule.c:2128
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "tidak dapat mencari nama untuk submodul '%s'"
+
+#: submodule.c:2073
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "menolak memindahkan '%s' ke dalam direktori git yang ada"
+
+#: submodule.c:2080
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Memigrasikan direktori git '%s%s' dari\n"
+"'%s' ke\n"
+"'%s'\n"
+
+#: submodule.c:2208
+msgid "could not start ls-files in .."
+msgstr "tidak dapat memulai ls-files dalam .."
+
+#: submodule.c:2248
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree kembalikan kode kembali %d yang tak diharapkan"
+
+#: symlinks.c:244
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr ""
+
+#: trailer.c:244
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: trailer.c:743
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr ""
+
+#: trailer.c:763
+#, c-format
+msgid "could not read input file '%s'"
+msgstr ""
+
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+msgid "could not read from stdin"
+msgstr ""
+
+#: trailer.c:1024 wrapper.c:676
+#, c-format
+msgid "could not stat %s"
+msgstr ""
+
+#: trailer.c:1026
+#, c-format
+msgid "file %s is not a regular file"
+msgstr ""
+
+#: trailer.c:1028
+#, c-format
+msgid "file %s is not writable by user"
+msgstr ""
+
+#: trailer.c:1040
+msgid "could not open temporary file"
+msgstr ""
+
+#: trailer.c:1080
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr ""
+
+#: transport-helper.c:62 transport-helper.c:91
+msgid "full write to remote helper failed"
+msgstr ""
+
+#: transport-helper.c:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr ""
+
+#: transport-helper.c:161 transport-helper.c:575
+msgid "can't dup helper output fd"
+msgstr ""
+
+#: transport-helper.c:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+
+#: transport-helper.c:220
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+
+#: transport-helper.c:287 transport-helper.c:429
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr ""
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr ""
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr ""
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr ""
+
+#: transport-helper.c:549 transport-helper.c:1247
+#, c-format
+msgid "could not read ref %s"
+msgstr ""
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr ""
+
+#: transport-helper.c:616
+msgid "setting remote service path not supported by protocol"
+msgstr ""
+
+#: transport-helper.c:618
+msgid "invalid remote service path"
+msgstr ""
+
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr ""
+
+#: transport-helper.c:664
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr ""
+
+#: 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:798
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
+
+#: transport-helper.c:855
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr ""
+
+#: transport-helper.c:938
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr ""
+
+#: transport-helper.c:941
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr ""
+
+#: transport-helper.c:944
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr ""
+
+#: transport-helper.c:949
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr ""
+
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr ""
+
+#: transport-helper.c:960
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr ""
+
+#: transport-helper.c:1060
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+
+#: transport-helper.c:1065
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr ""
+
+#: transport-helper.c:1112
+msgid "couldn't run fast-export"
+msgstr ""
+
+#: transport-helper.c:1117
+msgid "error while running fast-export"
+msgstr ""
+
+#: 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:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr ""
+
+#: transport-helper.c:1233
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr ""
+
+#: transport-helper.c:1385
+#, c-format
+msgid "read(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1412
+#, c-format
+msgid "write(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1461
+#, c-format
+msgid "%s thread failed"
+msgstr ""
+
+#: transport-helper.c:1465
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr ""
+
+#: transport-helper.c:1484 transport-helper.c:1488
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#: transport-helper.c:1525
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#: transport-helper.c:1529
+#, c-format
+msgid "%s process failed"
+msgstr ""
+
+#: transport-helper.c:1547 transport-helper.c:1556
+msgid "can't start thread for copying data"
+msgstr ""
+
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr ""
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr ""
+
+#: transport.c:223
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr ""
+
+#: transport.c:275
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+
+#: transport.c:276
+msgid "server options require protocol version 2 or later"
+msgstr ""
+
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr ""
+
+#: transport.c:755
+msgid "could not parse transport.color.* config"
+msgstr ""
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:965
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr ""
+
+#: transport.c:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr ""
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+
+#: transport.c:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr ""
+
+#: transport.c:1346
+msgid "failed to push all needed submodules"
+msgstr ""
+
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr ""
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr ""
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr ""
+
+#: tree-walk.c:118
+msgid "too-short tree file"
+msgstr ""
+
+#: unpack-trees.c:115
+#, 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
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:120
+#, 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
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: 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 ""
+
+#: unpack-trees.c:127
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:132
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+
+#: 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 ""
+
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+
+#: 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 ""
+
+#: unpack-trees.c:143
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+
+#: 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 ""
+
+#: unpack-trees.c:148
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+
+#: 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 ""
+
+#: unpack-trees.c:156
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+
+#: 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 ""
+
+#: unpack-trees.c:161
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+
+#: 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 ""
+
+#: unpack-trees.c:166
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+
+#: unpack-trees.c:174
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr ""
+
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:182
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:184
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+
+#: unpack-trees.c:264
+#, c-format
+msgid "Aborting\n"
+msgstr ""
+
+#: 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:352
+msgid "Updating files"
+msgstr ""
+
+#: 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:1618
+msgid "Updating index flags"
+msgstr ""
+
+#: unpack-trees.c:2718
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
+
+#: upload-pack.c:1548
+msgid "expected flush after fetch arguments"
+msgstr ""
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr ""
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr ""
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr ""
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr ""
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr ""
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr ""
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr ""
+
+#: walker.c:170
+msgid "Fetching objects"
+msgstr ""
+
+#: worktree.c:236 builtin/am.c:2152
+#, c-format
+msgid "failed to read '%s'"
+msgstr "gagal membaca '%s'"
+
+#: worktree.c:303
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "'%s' pada pohon kerja utama bukan direktori repositori"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "berkas '%s' tidak berisi jalur absolut ke lokasi pohon kerja"
+
+#: worktree.c:326
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' tidak ada"
+
+#: worktree.c:332
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' bukan berkas .git, kode error %d"
+
+#: worktree.c:341
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' tidak menunjuk kembali ke '%s'"
+
+#: worktree.c:603
+msgid "not a directory"
+msgstr "bukan direktori"
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr ".git bukan berkas"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr "berkas .git rusak"
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr "berkas .git salah"
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr "bukan jalur valid"
+
+#: worktree.c:728
+msgid "unable to locate repository; .git is not a file"
+msgstr "tidak dapat menempatkan repositori; .git bukan berkas"
+
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr ""
+"tidak dapat menempatkan repositori; berkas .git tidak merujuk repositori"
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr "tidak dapat menempatkan repositori; berkas .git rusak"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr "gitdir tidak dapat dibaca"
+
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr "gitdir salah"
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr "bukan direktori valid"
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "berkas gitdir tidak ada"
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "tidak dapat membaca berkas gitdir (%s)"
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "baca singkat (diharapkan %<PRIuMAX> bita, terbaca %<PRIuMAX>)"
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "berkas gitdir tidak valid"
+
+#: worktree.c:817
+msgid "gitdir file points to non-existent location"
+msgstr "berkas gitdir menunjuk ke lokasi yang tidak ada"
+
+#: wrapper.c:197 wrapper.c:367
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr ""
+
+#: wrapper.c:398 wrapper.c:599
+#, c-format
+msgid "unable to access '%s'"
+msgstr ""
+
+#: wrapper.c:607
+msgid "unable to get current working directory"
+msgstr ""
+
+#: wt-status.c:158
+msgid "Unmerged paths:"
+msgstr "Jalur yang tak tergabung:"
+
+#: wt-status.c:187 wt-status.c:219
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  (gunakan \"git restore --staged <berkas>...\" untuk menggelar balik)"
+
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (gunakan \"git restore --source=%s --staged <berkas>..\" untuk menggelar "
+"balik)"
+
+#: wt-status.c:193 wt-status.c:225
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (gunakan \"git rm --cached <berkas>...\" untuk menggelar balik)"
+
+#: wt-status.c:197
+msgid "  (use \"git add <file>...\" to mark resolution)"
+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 "
+"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:1125
+msgid "Changes to be committed:"
+msgstr "Perubahan yang akan dikomit:"
+
+#: wt-status.c:234 wt-status.c:1134
+msgid "Changes not staged for commit:"
+msgstr "Perubahan yang tidak digelar untuk komit:"
+
+#: wt-status.c:238
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+"  (gunakan \"git add <berkas>...\" untuk memperbarui apa yang akan dikomit)"
+
+#: wt-status.c:240
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+"  (gunakan \"git add/rm <berkas>...\" untuk memperbarui apa yang akan "
+"dikomit)"
+
+#: wt-status.c:241
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (gunakan \"git restore <berkas>...\" untuk membuang perubahan di direktori "
+"kerja)"
+
+#: wt-status.c:243
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr ""
+"  (komit atau buang konten yang tak dilacak atau diubah dalam submodul)"
+
+#: wt-status.c:254
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  (use \"git %s <berkas>...\" untuk menyertakan apa yang akan dikomit)"
+
+#: wt-status.c:266
+msgid "both deleted:"
+msgstr "kedua-duanya dihapus:"
+
+#: wt-status.c:268
+msgid "added by us:"
+msgstr "ditambahkan oleh kami:"
+
+#: wt-status.c:270
+msgid "deleted by them:"
+msgstr "dihapus oleh mereka:"
+
+#: wt-status.c:272
+msgid "added by them:"
+msgstr "ditambahkan oleh mereka:"
+
+#: wt-status.c:274
+msgid "deleted by us:"
+msgstr "dihapus oleh kami:"
+
+#: wt-status.c:276
+msgid "both added:"
+msgstr "kedua-duanya ditambah:"
+
+#: wt-status.c:278
+msgid "both modified:"
+msgstr "kedua-duanya diubah:"
+
+#: wt-status.c:288
+msgid "new file:"
+msgstr "berkas baru:"
+
+#: wt-status.c:290
+msgid "copied:"
+msgstr "tersalin:"
+
+#: wt-status.c:292
+msgid "deleted:"
+msgstr "terhapus:"
+
+#: wt-status.c:294
+msgid "modified:"
+msgstr "terubah:"
+
+#: wt-status.c:296
+msgid "renamed:"
+msgstr "terganti nama:"
+
+#: wt-status.c:298
+msgid "typechange:"
+msgstr "tipe perubahan:"
+
+#: wt-status.c:300
+msgid "unknown:"
+msgstr "tidak diketahui:"
+
+#: wt-status.c:302
+msgid "unmerged:"
+msgstr "tidak digabung:"
+
+#: wt-status.c:382
+msgid "new commits, "
+msgstr "komit baru, "
+
+#: wt-status.c:384
+msgid "modified content, "
+msgstr "konten yang dimodifikasi, "
+
+#: wt-status.c:386
+msgid "untracked content, "
+msgstr "konten yang tak dilacak, "
+
+#: wt-status.c:958
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Simpanan Anda saat ini ada %d entri"
+msgstr[1] "Simpanan Anda saat ini ada %d entri"
+
+#: wt-status.c:989
+msgid "Submodules changed but not updated:"
+msgstr "Submodul berubah tapi tak diperbarui:"
+
+#: wt-status.c:991
+msgid "Submodule changes to be committed:"
+msgstr "Perubahan submodul yang akan dikomit:"
+
+#: wt-status.c:1073
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Jangan ubah atau hapus baris diatas.\n"
+"Semua dibawahnya akan diabaikan."
+
+#: wt-status.c:1165
+#, 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 ""
+"\n"
+"Butuh %.2f detik untuk menghitung cabang di depan/di belakang nilai.\n"
+"Anda bisa gunakan '--no-ahead-behind' untuk menghindari hal tersebut.\n"
+
+#: wt-status.c:1195
+msgid "You have unmerged paths."
+msgstr "Anda punya jalur yang tak tergabung."
+
+#: wt-status.c:1198
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (selesaikan konflik dan jalankan \"git commit\")"
+
+#: wt-status.c:1200
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (gunakan \"git merge --abort\" untuk membatalkan penggabungan)"
+
+#: wt-status.c:1204
+msgid "All conflicts fixed but you are still merging."
+msgstr "Semua konflik sudah selesai tapi Anda masih menggabungkan."
+
+#: wt-status.c:1207
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (gunakan \"git commit\" untuk mengakhiri penggabungan)"
+
+#: wt-status.c:1216
+msgid "You are in the middle of an am session."
+msgstr "Anda berada ditengah-tengah sesi am."
+
+#: wt-status.c:1219
+msgid "The current patch is empty."
+msgstr "Jalur saat ini kosong"
+
+#: wt-status.c:1223
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (selesaikan konflik lalu jalankan \"git am --continue\")"
+
+#: wt-status.c:1225
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (gunakan \"git am --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c:1227
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (gunakan \"git am --abort\" untuk mengembalikan cabang asal)"
+
+#: wt-status.c:1360
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo hilang."
+
+#: wt-status.c:1362
+msgid "No commands done."
+msgstr "Tidak ada perintah selesai."
+
+#: wt-status.c:1365
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Perintah yang selesai (%d perintah):"
+msgstr[1] "Perintah yang selesai (%d perintah):"
+
+#: wt-status.c:1376
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (lihat lebih lanjut di berkas %s)"
+
+#: wt-status.c:1381
+msgid "No commands remaining."
+msgstr "Tidak ada perintah yang tersisa."
+
+#: 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] "Perintah berikutnya (%d perintah tersisa):"
+msgstr[1] "Perintah berikutnya (%d perintah tersisa):"
+
+#: wt-status.c:1392
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (gunakan \"git rebase --edit-todo\" untuk lihat dan sunting)"
+
+#: wt-status.c:1404
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Anda sedang mendasarkan ulang cabang '%s' pada '%s'."
+
+#: wt-status.c:1409
+msgid "You are currently rebasing."
+msgstr "Anda sedang mendasarkan ulang."
+
+#: wt-status.c:1422
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (selesaikan konflik lalu jalankan \"git rebase --continue\")"
+
+#: wt-status.c:1424
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (gunakan \"git rebase --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c:1426
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  (gunakan \"git rebase --abort\" untuk check out cabang asal)"
+
+#: wt-status.c:1433
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (semua konflik sudah selesai: jalankan \"git rebase --continue\")"
+
+#: wt-status.c:1437
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Anda sedang membelah komit saat mendasarkan ulang cabang '%s' pada '%s'."
+
+#: wt-status.c:1442
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Anda sedang membelah komit saat mendasarkan ulang."
+
+#: wt-status.c:1445
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (Setelah direktori kerja Anda bersih, jalankan \"git rebase --continue\")"
+
+#: wt-status.c:1449
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Anda sedang menyunting komit saat mendasarkan ulang cabang '%s' pada '%s'."
+
+#: wt-status.c:1454
+msgid "You are currently editing a commit during a rebase."
+msgstr "Anda sedang menyunting komit saat mendasarkan ulang."
+
+#: wt-status.c:1457
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (gunakan \"git commit --amend\" untuk mengubah komit saat ini)"
+
+#: wt-status.c:1459
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (gunakan \"git rebase --continue\" begitu Anda puas dengan perubahan Anda)"
+
+#: wt-status.c:1470
+msgid "Cherry-pick currently in progress."
+msgstr "Petik ceri sedang berjalan."
+
+#: wt-status.c:1473
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Anda sedang memetik ceri komit %s."
+
+#: wt-status.c:1480
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (selesaikan konflik dan jalankan \"git cherry-pick --continue\")"
+
+#: wt-status.c:1483
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (jalankan \"git cherry-pick --continue\" untuk melanjutkan)"
+
+#: wt-status.c:1486
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+"  (semua konflik sudah selesai: jalankan \"git cherry-pick --continue\")"
+
+#: wt-status.c:1488
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (gunakan \"git cherry-pick --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c:1490
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+"  (gunakan \"git cherry-pick --abort\" untuk membatalkan operasi petik ceri)"
+
+#: wt-status.c:1500
+msgid "Revert currently in progress."
+msgstr "Pengembalian sedang berjalang."
+
+#: wt-status.c:1503
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Anda sedang mengembalikan komit %s."
+
+#: wt-status.c:1509
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (selesaikan konflik dan jalankan \"git revert --continue\")"
+
+#: wt-status.c:1512
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (jalankan \"git revert --continue\" untuk melanjutkan)"
+
+#: wt-status.c:1515
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (semua konflik sudah selesai: jalankan \"git revert --continue\")"
+
+#: wt-status.c:1517
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (gunakan \"git revert --skip\" untuk lewati tambalan ini)"
+
+#: wt-status.c:1519
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr ""
+"  (gunakan \"git revert --abort\" untuk membatalkan operasi pengembalian)"
+
+#: wt-status.c:1529
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Anda sedang membagi dua, dimulai dari cabang '%s'."
+
+#: wt-status.c:1533
+msgid "You are currently bisecting."
+msgstr "Anda sedang membagi dua."
+
+#: wt-status.c:1536
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (gunakan \"git bisect reset\" untuk kembali ke cabang asal)"
+
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Anda berada dalam checkout tipis."
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "Anda berada dalam checkout tipis dengan %d%% berkas terlacak ada."
+
+#: wt-status.c:1794
+msgid "On branch "
+msgstr "Pada cabang "
+
+#: wt-status.c:1801
+msgid "interactive rebase in progress; onto "
+msgstr "sedang mendasarkan ulang interaktif; ke "
+
+#: wt-status.c:1803
+msgid "rebase in progress; onto "
+msgstr "sedang mendasarkan ulang; ke "
+
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr ""
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr ""
+
+#: wt-status.c:1813
+msgid "Not currently on any branch."
+msgstr "Tidak sedang berada pada cabang apapun."
+
+#: wt-status.c:1830
+msgid "Initial commit"
+msgstr "Komit awal"
+
+#: wt-status.c:1831
+msgid "No commits yet"
+msgstr "Tidak ada komit"
+
+#: wt-status.c:1845
+msgid "Untracked files"
+msgstr "Berkas tak terlacak"
+
+#: wt-status.c:1847
+msgid "Ignored files"
+msgstr "Berkas yang diabaikan"
+
+#: 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 ""
+"Butuh %.2f detik untuk menghitung berkas tak terlacak. 'status -uno'\n"
+"mungkin bisa mempercepat, tapi Anda harus berhati-hati jangan sampai lupa\n"
+"untuk tambahkan berkas baru sendiri (lihat 'git help status')."
+
+#: wt-status.c:1857
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Berkas tak terlacak yang tak disebutkan%s"
+
+#: wt-status.c:1859
+msgid " (use -u option to show untracked files)"
+msgstr " (gunakan opsi -u untuk melihat berkas yang tak terlacak)"
+
+#: wt-status.c:1865
+msgid "No changes"
+msgstr "Tidak ada perubahan"
+
+#: wt-status.c:1870
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"tidak ada perubahan untuk dikomit (gunakan \"git add\" dan/atau \"git commit "
+"-a\")\n"
+
+#: wt-status.c:1874
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "tidak ada perubahan untuk dikomit\n"
+
+#: wt-status.c:1878
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada(gunakan "
+"\"git add\" untuk lacak)\n"
+
+#: wt-status.c:1882
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "tidak ada perubahan untuk dikomit tapi berkas yang tak terlacak ada\n"
+
+#: wt-status.c:1886
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"tidak ada yang dikomit (buat/salin berkas dan gunakan \"git add\" untuk "
+"lacak)\n"
+
+#: wt-status.c:1890 wt-status.c:1896
+#, c-format
+msgid "nothing to commit\n"
+msgstr "tidak ada yang dikomit\n"
+
+#: wt-status.c:1893
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "tidak ada yang dikomit (gunakan -u untuk lihat berkas tak terlacak)\n"
+
+#: wt-status.c:1898
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "tidak ada yang dikomit, pohon kerja bersih\n"
+
+#: wt-status.c:2003
+msgid "No commits yet on "
+msgstr "Tidak ada komit apapun pada "
+
+#: wt-status.c:2007
+msgid "HEAD (no branch)"
+msgstr "HEAD (tanpa cabang)"
+
+#: wt-status.c:2038
+msgid "different"
+msgstr "berbeda"
+
+#: wt-status.c:2040 wt-status.c:2048
+msgid "behind "
+msgstr "di belakang "
+
+#: wt-status.c:2043 wt-status.c:2046
+msgid "ahead "
+msgstr "di depan "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2569
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "tidak dapat %s: Anda punya perubahan yang tidak digelar."
+
+#: wt-status.c:2575
+msgid "additionally, your index contains uncommitted changes."
+msgstr "juga indeks Anda berisi perubahan yang belum dikomit."
+
+#: wt-status.c:2577
+#, 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:182
+msgid "could not send IPC command"
+msgstr ""
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr ""
+
+#: 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 ""
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr ""
+
+#: builtin/add.c:26
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<opsi>] [--] <pathspec>..."
+
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "tidak dapat chmod %cx '%s'"
+
+#: builtin/add.c:99
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "status diff tak diharapkan %c"
+
+#: builtin/add.c:104 builtin/commit.c:297
+msgid "updating files failed"
+msgstr "gagal memperbarui berkas"
+
+#: builtin/add.c:114
+#, c-format
+msgid "remove '%s'\n"
+msgstr "hapus '%s'\n"
+
+#: builtin/add.c:198
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Perubahan tak tergelar setelah menyegarkan indeks:"
+
+#: builtin/add.c:307 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
+msgid "Could not write patch"
+msgstr "Tidak dapat menulis tambalan"
+
+#: builtin/add.c:325
+msgid "editing patch failed"
+msgstr "Gagal menyunting tambalan"
+
+#: builtin/add.c:328
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "Tidak dapat men-stat '%s'"
+
+#: builtin/add.c:330
+msgid "Empty patch. Aborted."
+msgstr "Tambalan kosong. Dibatalkan."
+
+#: builtin/add.c:335
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "Tidak dapat terapkan '%s'"
+
+#: builtin/add.c:343
+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: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 "latihan"
+
+#: builtin/add.c:366
+msgid "interactive picking"
+msgstr "pengambilan interaktif"
+
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+msgid "select hunks interactively"
+msgstr "pilih bingkah secara interaktif"
+
+#: builtin/add.c:368
+msgid "edit current diff and apply"
+msgstr "sunting diff saat ini dan terapkan"
+
+#: builtin/add.c:369
+msgid "allow adding otherwise ignored files"
+msgstr "perbolehkan tambah berkas yang diabaikan"
+
+#: builtin/add.c:370
+msgid "update tracked files"
+msgstr "perbarui berkas terlacak"
+
+#: builtin/add.c:371
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "normalisasi ulang EOL berkas terlacak (menyiratkan -u)"
+
+#: builtin/add.c:372
+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
+msgid "add changes from all tracked and untracked files"
+msgstr "tambahkan perubahan dari semua berkas terlacak dan tak terlacak"
+
+#: builtin/add.c:376
+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
+msgid "don't add, only refresh the index"
+msgstr "jangan tambahkan, hanya segarkan indeks"
+
+#: builtin/add.c:379
+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
+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
+msgid "override the executable bit of the listed files"
+msgstr "timpa bit yang dapat dieksekusi dari berkas terdaftar"
+
+#: builtin/add.c:384
+msgid "warn when adding an embedded repository"
+msgstr "peringatkan ketika menambahkan repositori tertanam"
+
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr "tulang belakang untuk `git stash -p`"
+
+#: builtin/add.c:404
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"Anda telah menambahkan repositori git yang lain di dalam repositori Anda\n"
+"saat ini. Kloningan repositori luar tidak akan berisi isi repositori\n"
+"tertanam dan tidak akan tahu bagaimana cara mendapatkannya.\n"
+"Jika maksud anda menambahkan submodul, gunakan:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Jika Anda menambahkan jalur itu sebagai kesengajaan, Anda dapat menghapus\n"
+"itu dari indeks dengan:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Lihat \"git help submodule\" untuk selengkapnya."
+
+#: builtin/add.c:432
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "menambahkan repositori git tertanam: %s"
+
+#: 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 ""
+"Gunakan -f jika Anda benar-benar ingin tambahkan itu.\n"
+"Matikan pesan ini dengan menjalankan\n"
+"\"git config advice.addIgnoredFile false\""
+
+#: builtin/add.c:460
+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
+#, 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: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 "--pathspec-from-file tidak kompatibel dengan argumen pathspec"
+
+#: 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 "--pathspec-file-nul butuh --pathspec-from-file"
+
+#: builtin/add.c:555
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Tidak ada yang disebutkan, tidak ada yang ditambahkan.\n"
+
+#: 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 ""
+"Mungkin Anda ingin bilang 'git add .'?\n"
+"Matikan pesan ini dengan menjalankan\n"
+"\"git config advice.addEmptyPathspec false\""
+
+#: builtin/am.c:365
+msgid "could not parse author script"
+msgstr ""
+
+#: builtin/am.c:455
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr ""
+
+#: builtin/am.c:497
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr ""
+
+#: builtin/am.c:535
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#: builtin/am.c:561
+msgid "fseek failed"
+msgstr ""
+
+#: builtin/am.c:749
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr ""
+
+#: builtin/am.c:814
+msgid "Only one StGIT patch series can be applied at once"
+msgstr ""
+
+#: builtin/am.c:862
+msgid "invalid timestamp"
+msgstr ""
+
+#: builtin/am.c:867 builtin/am.c:879
+msgid "invalid Date line"
+msgstr ""
+
+#: builtin/am.c:874
+msgid "invalid timezone offset"
+msgstr ""
+
+#: builtin/am.c:967
+msgid "Patch format detection failed."
+msgstr ""
+
+#: builtin/am.c:972 builtin/clone.c:414
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr ""
+
+#: builtin/am.c:977
+msgid "Failed to split patches."
+msgstr ""
+
+#: builtin/am.c:1126
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr ""
+
+#: builtin/am.c:1127
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr ""
+
+#: builtin/am.c:1128
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+
+#: builtin/am.c:1223
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
+
+#: builtin/am.c:1251
+msgid "Patch is empty."
+msgstr ""
+
+#: builtin/am.c:1316
+#, c-format
+msgid "missing author line in commit %s"
+msgstr ""
+
+#: builtin/am.c:1319
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr ""
+
+#: builtin/am.c:1538
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr ""
+
+#: builtin/am.c:1540
+msgid "Using index info to reconstruct a base tree..."
+msgstr ""
+
+#: builtin/am.c:1559
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+
+#: builtin/am.c:1565
+msgid "Falling back to patching base and 3-way merge..."
+msgstr ""
+
+#: builtin/am.c:1591
+msgid "Failed to merge in the changes."
+msgstr ""
+
+#: builtin/am.c:1623
+msgid "applying to an empty history"
+msgstr ""
+
+#: builtin/am.c:1675 builtin/am.c:1679
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr ""
+
+#: builtin/am.c:1697
+msgid "Commit Body is:"
+msgstr ""
+
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1707
+#, c-format
+msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
+msgstr ""
+
+#: builtin/am.c:1753 builtin/commit.c:408
+msgid "unable to write index file"
+msgstr ""
+
+#: builtin/am.c:1757
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr ""
+
+#: builtin/am.c:1797 builtin/am.c:1865
+#, c-format
+msgid "Applying: %.*s"
+msgstr ""
+
+#: builtin/am.c:1814
+msgid "No changes -- Patch already applied."
+msgstr ""
+
+#: builtin/am.c:1820
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr ""
+
+#: builtin/am.c:1824
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr ""
+
+#: 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 ""
+
+#: 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 "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
+msgstr ""
+
+#: 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 "Tidak dapat mengurai objek '%s'."
+
+#: builtin/am.c:2034
+msgid "failed to clean index"
+msgstr ""
+
+#: builtin/am.c:2078
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+
+#: builtin/am.c:2185
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr ""
+
+#: builtin/am.c:2227
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr ""
+
+#: builtin/am.c:2231
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr ""
+
+#: builtin/am.c:2262
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr ""
+
+#: builtin/am.c:2263
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr ""
+
+#: builtin/am.c:2269
+msgid "run interactively"
+msgstr ""
+
+#: builtin/am.c:2271
+msgid "historical option -- no-op"
+msgstr ""
+
+#: builtin/am.c:2273
+msgid "allow fall back on 3way merging if needed"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/am.c:2276
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr ""
+
+#: builtin/am.c:2279
+msgid "recode into utf8 (default)"
+msgstr ""
+
+#: builtin/am.c:2281
+msgid "pass -k flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2283
+msgid "pass -b flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2285
+msgid "pass -m flag to git-mailinfo"
+msgstr ""
+
+#: builtin/am.c:2287
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr ""
+
+#: builtin/am.c:2290
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr ""
+
+#: builtin/am.c:2293
+msgid "strip everything before a scissors line"
+msgstr ""
+
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr ""
+
+#: 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 ""
+
+#: 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: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 ""
+
+#: 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 ""
+
+#: builtin/am.c:2322
+msgid "format the patch(es) are in"
+msgstr ""
+
+#: builtin/am.c:2328
+msgid "override error message when patch failure occurs"
+msgstr ""
+
+#: builtin/am.c:2330
+msgid "continue applying patches after resolving a conflict"
+msgstr ""
+
+#: builtin/am.c:2333
+msgid "synonyms for --continue"
+msgstr ""
+
+#: builtin/am.c:2336
+msgid "skip the current patch"
+msgstr ""
+
+#: builtin/am.c:2339
+msgid "restore the original branch and abort the patching operation"
+msgstr ""
+
+#: builtin/am.c:2342
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr ""
+
+#: builtin/am.c:2346
+msgid "show the patch being applied"
+msgstr ""
+
+#: builtin/am.c:2351
+msgid "lie about committer date"
+msgstr ""
+
+#: builtin/am.c:2353
+msgid "use current timestamp for author date"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+msgid "GPG-sign commits"
+msgstr ""
+
+#: builtin/am.c:2359
+msgid "(internal use for git-rebase)"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/am.c:2384
+msgid "failed to read the index"
+msgstr ""
+
+#: builtin/am.c:2399
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr ""
+
+#: builtin/am.c:2423
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+
+#: builtin/am.c:2429
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr ""
+
+#: builtin/am.c:2439
+msgid "interactive mode requires patches on the command line"
+msgstr ""
+
+#: builtin/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr ""
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr ""
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr ""
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr ""
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr ""
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr ""
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr ""
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr ""
+
+#: builtin/bisect--helper.c:23
+msgid "git bisect--helper --bisect-reset [<commit>]"
+msgstr "git bisect--helper --bisect-reset [<komit>]"
+
+#: builtin/bisect--helper.c:24
+msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
+msgstr ""
+"git bisect--helper --bisect-next-check <istilah bagus> <istilah jelek> "
+"[<istilah>]"
+
+#: 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 ""
+"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}=<istilah> --term-{old,"
+"good}=<istilah>] [--no-checkout] [--first-parent] [<jelek> [<bagus>...]] "
+"[--] [<jalur>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+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-state (bad|new) [<revisi>]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<revisi>...]"
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <nama berkas>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<revisi>|<rentang>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "tidak dapat membuka berkas '%s' dalam mode '%s'"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "tidak dapat menulis ke berkas '%s'"
+
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' bukan istilah yang valid"
+
+#: builtin/bisect--helper.c:159
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "tidak dapat menggunakan perintah bawaan '%s' sebagai istilah"
+
+#: builtin/bisect--helper.c:169
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "tidak dapat mengubah makna istilah '%s'"
+
+#: builtin/bisect--helper.c:179
+msgid "please use two different terms"
+msgstr "mohon gunakan dua istilah yang berbeda"
+
+#: builtin/bisect--helper.c:195
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "Kami tidak sedang membagi dua.\n"
+
+#: builtin/bisect--helper.c:203
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' bukan sebuah komit yang valid"
+
+#: builtin/bisect--helper.c:212
+#, 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:256
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "argument bisect_write jelek: %s"
+
+#: builtin/bisect--helper.c:261
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "tidak dapat mendapatkan oid revisi '%s'"
+
+#: builtin/bisect--helper.c:273
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "tidak dapat membuka berkas '%s'"
+
+#: builtin/bisect--helper.c:299
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "Perintah tidak valid: sekarang Anda berada dalam pembagian dua %s/%s"
+
+#: 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 ""
+"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: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 ""
+"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:350
+#, c-format
+msgid "bisecting only with a %s commit"
+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:358
+msgid "Are you sure [Y/n]? "
+msgstr "Anda yakin [Y/n]?"
+
+#: builtin/bisect--helper.c:419
+msgid "no terms defined"
+msgstr "tidak ada istilah yang didefinisikan"
+
+#: 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 ""
+"Istilah Anda saat ini adalah %s untuk keadaan lama\n"
+"dan %s untuk keadaan baru.\n"
+
+#: 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 ""
+"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:499 builtin/bisect--helper.c:1023
+msgid "revision walk setup failed\n"
+msgstr "setup jalan revisi gagal\n"
+
+#: builtin/bisect--helper.c:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "tidak dapat membuka '%s' untuk menambahkan"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr "'' bukan istilah yang valid"
+
+#: builtin/bisect--helper.c:663
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "opsi tidak dikenal: '%s'"
+
+#: builtin/bisect--helper.c:667
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' sepertinya bukan revisi valid"
+
+#: builtin/bisect--helper.c:698
+msgid "bad HEAD - I need a HEAD"
+msgstr "HEAD jelek - saya butuh HEAD"
+
+#: builtin/bisect--helper.c:713
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr "gagal men-checkout '%s'. Coba 'git bisect start <cabang valid>'."
+
+#: builtin/bisect--helper.c:734
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "tidak akan membagi dua pada pohon yang di-cg-seek"
+
+#: builtin/bisect--helper.c:737
+msgid "bad HEAD - strange symbolic ref"
+msgstr "HEAD jelek - referensi simbolik aneh"
+
+#: builtin/bisect--helper.c:757
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "referensi tidak valid: '%s'"
+
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
+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:826
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "Anda ingin saya melakukannya untuk Anda [Y/n]"
+
+#: builtin/bisect--helper.c:844
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Mohon panggil `--bisect-state` dengan setidaknya satu argumen"
+
+#: builtin/bisect--helper.c:857
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' hanya dapat mengambil satu argumen."
+
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Masukan revisi jelek: %s"
+
+#: builtin/bisect--helper.c:889
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Masukan revisi jelek (bukan sebuah komit): %s"
+
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr "Kami tidak sedang membagi dua."
+
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? Anda bilang tentang apa?"
+
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "tidak dapat membuka berkas '%s' untuk memainkan ulang"
+
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr "setel ulang keadaan pembagian dua"
+
+#: builtin/bisect--helper.c:1058
+msgid "check whether bad or good terms exist"
+msgstr "periksa apakah ada istilah jelek atau bagus"
+
+#: builtin/bisect--helper.c:1060
+msgid "print out the bisect terms"
+msgstr "cetak istilah pembagian dua"
+
+#: builtin/bisect--helper.c:1062
+msgid "start the bisect session"
+msgstr "mulai sesi pembagian dua"
+
+#: builtin/bisect--helper.c:1064
+msgid "find the next bisection commit"
+msgstr "temukan komit pembagian dua berikutnya"
+
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr "tandai keadaan referensi"
+
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr "daftar langkah pembagian dua sejauh ini"
+
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
+msgstr "mainkan ulang proses pembagian dua dari berkas yang diberikan"
+
+#: builtin/bisect--helper.c:1072
+msgid "skip some commits for checkout"
+msgstr "lewati beberapa komit untuk checkout"
+
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "tidak ada log untuk BISECT_WRITE"
+
+#: builtin/bisect--helper.c:1089
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset butuh baik tanpa argumen atau sebuah komit"
+
+#: builtin/bisect--helper.c:1094
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check butuh 2 atau 3 argumen"
+
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms butuh 0 atau 1 argumen"
+
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next butuh 0 argumen"
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log butuh 0 argumen"
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr "tidak ada berkas log yang diberikan"
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<opsi>] [<opsi revisi>] [<revisi>] [--] <berkas>"
+
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<opsi revisi> didokumentasikan dalam git-rev-list(1)"
+
+#: builtin/blame.c:410
+#, c-format
+msgid "expecting a color: %s"
+msgstr "mengharapkan warna: %s"
+
+#: builtin/blame.c:417
+msgid "must end with a color"
+msgstr "harus berakhir dengan warna"
+
+#: builtin/blame.c:728
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "warna tidak valid '%s' pada color.blame.repeatedLines"
+
+#: builtin/blame.c:746
+msgid "invalid value for blame.coloring"
+msgstr "nilai tidak valid untuk blame.coloring"
+
+#: builtin/blame.c:845
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "tidak dapat menemukan revisi %s untuk diabaikan"
+
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "perlihatkan entri penyalahan seperti yang kami temukan secara bertahap"
+
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "jangan perlihatkan nama objek dari komit perbatasan (asali: off)"
+
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "jangan perlakukan komit akar sebagai perbatasan (asali: off)"
+
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "perlihatkan statistik biaya usaha"
+
+#: 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 "paksa laporkan perkembangan"
+
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "perlihatkan nilai keluaran untuk entri penyalahan"
+
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "perlihatkan nama berkas asli (asali: auto)"
+
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "perlihatkan nomor baris asli (asali: off)"
+
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
+msgstr "perlihatkan dalam format yang didesain untuk konsumsi mesin"
+
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
+msgstr "perlihatkan format porselen dengan informasi komit per baris"
+
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr "gunakan mode keluaran yang sama dengan git-annotate (asali: off)"
+
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "perlihatkan stempel waktu mentah (asali: off)"
+
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "perlihatkan SHA1 komit panjang (asali: off)"
+
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "sembunyikan nama pengarang dan stempel waktu (asali: off)"
+
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
+msgstr "perlihatkan email pengarang daripada nama (asali: off)"
+
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "abaikan perbedaan spasi putih"
+
+#: builtin/blame.c:883 builtin/log.c:1823
+msgid "rev"
+msgstr "revisi"
+
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "abaikan <revisi> ketika menyalahkan"
+
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "abaikan revisi dari <berkas>"
+
+#: builtin/blame.c:885
+msgid "color redundant metadata from previous line differently"
+msgstr "metadata warna berlebihan dari baris sebelumnya secara berbeda"
+
+#: builtin/blame.c:886
+msgid "color lines by age"
+msgstr "warnai baris oleh umur"
+
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr "perlihatkan siklus ekstra untuk menemukan cocokan yang lebih baik"
+
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "gunakan revisi dari <berkas> daripada memanggil git-rev-list"
+
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "gunakan konten <berkas> sebagai citra final"
+
+#: builtin/blame.c:890 builtin/blame.c:891
+msgid "score"
+msgstr "nilai"
+
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
+msgstr "temukan salinan baris di dalam dan di seluruh berkas"
+
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "temukan gerakan baris di dalam dan di seluruh baris"
+
+#: builtin/blame.c:892
+msgid "range"
+msgstr "rentang"
+
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr "hanya proses rentang baris <awal>,<akhir> atau fungsi :<nama fungsi>"
+
+#: builtin/blame.c:945
+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
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:996
+msgid "4 years, 11 months ago"
+msgstr "4 tahun, 11 bulan yang lalu"
+
+#: builtin/blame.c:1112
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+msgstr[0] "berkas %s hanya punya %lu baris"
+msgstr[1] "berkas %s hanya punya %lu baris"
+
+#: builtin/blame.c:1157
+msgid "Blaming lines"
+msgstr "Menyalahkan baris"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<opsi>] [-r | -a] [--merged] [--no-merged]"
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<opsi>] [-l] [-f] <nama-cabang> [<titik-awal>]"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<opsi> [-r] (-d | -D) <nama-cabang>...]"
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<opsi>] (-m | -M) [<cabang-lama>] <cabang-baru>"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opsi>] (-c | -C) [<cabang-lama>] <cabang-baru>"
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<opsi>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<opsi>] [-r | -a] [--format]"
+
+#: builtin/branch.c:154
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+"         '%s', but not yet merged to HEAD."
+msgstr ""
+"menghapus cabang '%s' yang sudah digabungkan ke\n"
+"         '%s', tapi belum digabungkan ke HEAD."
+
+#: builtin/branch.c:158
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD."
+msgstr ""
+"tidak menghapus cabang '%s' yang belum digabungkan ke\n"
+"         '%s', walaupun tergabung ke HEAD."
+
+#: builtin/branch.c:172
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "Tidak dapat mencari objek komit untuk '%s'"
+
+#: builtin/branch.c:176
+#, 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 ""
+"Cabang '%s' belum sepenuhnya tergabung.\n"
+"Kalau Anda yakin ingin menghapus itu, jalankan 'git branch -D %s'."
+
+#: builtin/branch.c:189
+msgid "Update of config-file failed"
+msgstr "Pembaruan berkas konfigurasi gagal"
+
+#: builtin/branch.c:223
+msgid "cannot use -a with -d"
+msgstr "tidak dapat gunakan -a dengan -d"
+
+#: builtin/branch.c:230
+msgid "Couldn't look up commit object for HEAD"
+msgstr "Tidak dapat mencari objek komit untuk HEAD"
+
+#: builtin/branch.c:244
+#, 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
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "cabang pelacak remote '%s' tidak ditemukan."
+
+#: builtin/branch.c:260
+#, c-format
+msgid "branch '%s' not found."
+msgstr "cabang '%s' tidak ditemukan."
+
+#: builtin/branch.c:291
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Cabang pelacak remote %s (yaitu %s) dihapus.\n"
+
+#: builtin/branch.c:292
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "Cabang %s (yaitu %s) dihapus.\n"
+
+#: builtin/branch.c:440 builtin/tag.c:63
+msgid "unable to parse format string"
+msgstr "tidak dapat menguraikan untai format"
+
+#: builtin/branch.c:471
+msgid "could not resolve HEAD"
+msgstr "tidak dapat menguraikan HEAD"
+
+#: builtin/branch.c:477
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) merujuk diluar refs/heads/"
+
+#: builtin/branch.c:492
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Cabang %s sedang didasarkan ulang pada %s"
+
+#: builtin/branch.c:496
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Cabang %s sedang dibagi dua pada %s"
+
+#: builtin/branch.c:513
+msgid "cannot copy the current branch while not on any."
+msgstr "tidak dapat menyalin cabang saat ini ketika tidak ada."
+
+#: builtin/branch.c:515
+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
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Nama cabang tidak valid: '%s'"
+
+#: builtin/branch.c:555
+msgid "Branch rename failed"
+msgstr "Penggantian nama cabang gagal"
+
+#: builtin/branch.c:557
+msgid "Branch copy failed"
+msgstr "Penyalinan cabang gagal"
+
+#: builtin/branch.c:561
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "Salinan cabang salah nama '%s' dibuat"
+
+#: builtin/branch.c:564
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "Cabang salah nama '%s' berganti nama"
+
+#: builtin/branch.c:570
+#, 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
+msgid "Branch is renamed, but update of config-file failed"
+msgstr "Cabang berganti nama, tapi pembaruan berkas konfigurasi gagal"
+
+#: builtin/branch.c:581
+msgid "Branch is copied, but update of config-file failed"
+msgstr "Cabang disalin, tapi pembaruan berkas konfigurasi gagal"
+
+#: builtin/branch.c:597
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+"  %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Mohon sunting deskripsi untuk cabang\n"
+"  %s\n"
+"Baris yang diawali dengan '%c' akan dicopot.\n"
+
+#: builtin/branch.c:631
+msgid "Generic options"
+msgstr "Opsi generik"
+
+#: builtin/branch.c:633
+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
+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:637
+msgid "do not use"
+msgstr "jangan gunakan"
+
+#: builtin/branch.c:639 builtin/rebase.c:533
+msgid "upstream"
+msgstr "hulu"
+
+#: builtin/branch.c:639
+msgid "change the upstream info"
+msgstr "ubah info hulu"
+
+#: builtin/branch.c:640
+msgid "unset the upstream info"
+msgstr "batal-setel info hulu"
+
+#: builtin/branch.c:641
+msgid "use colored output"
+msgstr "gunakan keluaran berwarna"
+
+#: builtin/branch.c:642
+msgid "act on remote-tracking branches"
+msgstr "lakukan pada cabang pelacak remote"
+
+#: builtin/branch.c:644 builtin/branch.c:646
+msgid "print only branches that contain the commit"
+msgstr "cetak hanya cabang yang berisi komit"
+
+#: builtin/branch.c:645 builtin/branch.c:647
+msgid "print only branches that don't contain the commit"
+msgstr "cetak hanya cabang yang tak berisi komit"
+
+#: builtin/branch.c:650
+msgid "Specific git-branch actions:"
+msgstr "Aksi git-branch spesifik:"
+
+#: builtin/branch.c:651
+msgid "list both remote-tracking and local branches"
+msgstr "sebut baik cabang pelacak remote dan cabang lokal"
+
+#: builtin/branch.c:653
+msgid "delete fully merged branch"
+msgstr "hapus cabang yang tergabung sepenuhnya"
+
+#: builtin/branch.c:654
+msgid "delete branch (even if not merged)"
+msgstr "hapus cabang (walaupun tak tergabung)"
+
+#: builtin/branch.c:655
+msgid "move/rename a branch and its reflog"
+msgstr "pindah/ganti nama cabang dan reflog-nya"
+
+#: builtin/branch.c:656
+msgid "move/rename a branch, even if target exists"
+msgstr "pindah/ganti nama cabang, walaupun target ada"
+
+#: builtin/branch.c:657
+msgid "copy a branch and its reflog"
+msgstr "salin cabang dan reflog-nya"
+
+#: builtin/branch.c:658
+msgid "copy a branch, even if target exists"
+msgstr "salin cabang, walapun target ada"
+
+#: builtin/branch.c:659
+msgid "list branch names"
+msgstr "sebut nama cabang"
+
+#: builtin/branch.c:660
+msgid "show current branch name"
+msgstr "perlihatkan nama cabang saat ini"
+
+#: builtin/branch.c:661
+msgid "create the branch's reflog"
+msgstr "buat reflog cabang"
+
+#: builtin/branch.c:663
+msgid "edit the description for the branch"
+msgstr "sunting deskripsi cabang"
+
+#: builtin/branch.c:664
+msgid "force creation, move/rename, deletion"
+msgstr "paksa buat, pindah/ganti nama, hapus"
+
+#: builtin/branch.c:665
+msgid "print only branches that are merged"
+msgstr "cetak hanya cabang yang tergabung"
+
+#: builtin/branch.c:666
+msgid "print only branches that are not merged"
+msgstr "cetak hanya cabang yang tak tergabung"
+
+#: builtin/branch.c:667
+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
+msgid "object"
+msgstr "objek"
+
+#: builtin/branch.c:670
+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
+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/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
+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
+msgid "branch name required"
+msgstr "nama cabang diperlukan"
+
+#: builtin/branch.c:766
+msgid "Cannot give description to detached HEAD"
+msgstr "Tidak dapat memberikan deskripsi ke HEAD terpisah"
+
+#: builtin/branch.c:771
+msgid "cannot edit description of more than one branch"
+msgstr "tidak dapat menyunting deskripsi lebih dari satu cabang"
+
+#: builtin/branch.c:778
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "Belum ada komit pada cabang '%s'."
+
+#: builtin/branch.c:781
+#, c-format
+msgid "No branch named '%s'."
+msgstr "Tidak ada cabang bernama '%s'."
+
+#: builtin/branch.c:796
+msgid "too many branches for a copy operation"
+msgstr "terlalu banyak cabang untuk operasi penyalinan"
+
+#: builtin/branch.c:805
+msgid "too many arguments for a rename operation"
+msgstr "terlalu banyak argumen untuk operasi penggantian nama"
+
+#: builtin/branch.c:810
+msgid "too many arguments to set new upstream"
+msgstr "terlalu banyak argumen untuk menyetel hulu baru"
+
+#: builtin/branch.c:814
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+"tidak dapat menyetel hulu HEAD ke %s ketika itu tak menunjuk pada cabang "
+"apapun."
+
+#: builtin/branch.c:817 builtin/branch.c:840
+#, c-format
+msgid "no such branch '%s'"
+msgstr "tidak ada cabang '%s'"
+
+#: builtin/branch.c:821
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "cabang '%s' tidak ada"
+
+#: builtin/branch.c:834
+msgid "too many arguments to unset upstream"
+msgstr "terlalu banyak argumen untuk batal-setel hulu"
+
+#: builtin/branch.c:838
+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
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "Cabang '%s' tidak ada informasi hulu"
+
+#: 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>?"
+msgstr ""
+"Opsi -a dan -r tidak mengambil nama cabang.\n"
+"Mungkin maksud Anda gunakan: -a|-r --list <pola>?"
+
+#: builtin/branch.c:858
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+"opsi '--set-upstream' tidak lagi didukung. Mohon gunakan '--track' atau '--"
+"set-upstream-to' sebagai gantinya."
+
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr ""
+
+#: builtin/bugreport.c:21
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr ""
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr ""
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr ""
+
+#: builtin/bugreport.c:80
+msgid "not run from a git repository - no hooks to show\n"
+msgstr ""
+
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr ""
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+
+#: builtin/bugreport.c:136
+msgid "specify a destination for the bugreport file"
+msgstr ""
+
+#: builtin/bugreport.c:138
+msgid "specify a strftime format suffix for the filename"
+msgstr ""
+
+#: builtin/bugreport.c:160
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr ""
+
+#: builtin/bugreport.c:170
+msgid "Enabled Hooks"
+msgstr ""
+
+#: builtin/bugreport.c:177
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:180
+#, c-format
+msgid "unable to write to %s"
+msgstr ""
+
+#: builtin/bugreport.c:190
+#, 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 ""
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr ""
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr ""
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+msgid "show progress meter"
+msgstr ""
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+msgid "show progress meter during object writing phase"
+msgstr ""
+
+#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+msgid "similar to --all-progress when progress meter is shown"
+msgstr ""
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr ""
+
+#: builtin/bundle.c:96
+msgid "Need a repository to create a bundle."
+msgstr ""
+
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr ""
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr ""
+
+#: builtin/bundle.c:179
+msgid "Need a repository to unbundle."
+msgstr ""
+
+#: builtin/bundle.c:191 builtin/remote.c:1700
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+
+#: builtin/bundle.c:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr ""
+
+#: 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>"
+msgstr ""
+
+#: builtin/cat-file.c:597
+msgid ""
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
+msgstr ""
+
+#: builtin/cat-file.c:618
+msgid "only one batch option may be specified"
+msgstr ""
+
+#: builtin/cat-file.c:636
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr ""
+
+#: builtin/cat-file.c:637
+msgid "show object type"
+msgstr ""
+
+#: builtin/cat-file.c:638
+msgid "show object size"
+msgstr ""
+
+#: builtin/cat-file.c:640
+msgid "exit with zero when there's no error"
+msgstr ""
+
+#: builtin/cat-file.c:641
+msgid "pretty-print object's content"
+msgstr ""
+
+#: builtin/cat-file.c:643
+msgid "for blob objects, run textconv on object's content"
+msgstr ""
+
+#: builtin/cat-file.c:645
+msgid "for blob objects, run filters on object's content"
+msgstr ""
+
+#: builtin/cat-file.c:646
+msgid "blob"
+msgstr ""
+
+#: builtin/cat-file.c:647
+msgid "use a specific path for --textconv/--filters"
+msgstr ""
+
+#: builtin/cat-file.c:649
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr ""
+
+#: builtin/cat-file.c:650
+msgid "buffer --batch output"
+msgstr ""
+
+#: builtin/cat-file.c:652
+msgid "show info and content of objects fed from the standard input"
+msgstr ""
+
+#: builtin/cat-file.c:656
+msgid "show info about objects fed from the standard input"
+msgstr ""
+
+#: builtin/cat-file.c:660
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr ""
+
+#: builtin/cat-file.c:662
+msgid "show all objects with --batch or --batch-check"
+msgstr ""
+
+#: builtin/cat-file.c:664
+msgid "do not order --batch-all-objects output"
+msgstr ""
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr ""
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr ""
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr ""
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr ""
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr ""
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr ""
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
+msgid "suppress progress reporting"
+msgstr ""
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr ""
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr ""
+
+#: builtin/check-ignore.c:165
+msgid "cannot specify pathnames with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:168
+msgid "-z only makes sense with --stdin"
+msgstr ""
+
+#: builtin/check-ignore.c:170
+msgid "no path specified"
+msgstr ""
+
+#: builtin/check-ignore.c:174
+msgid "--quiet is only valid with a single pathname"
+msgstr ""
+
+#: builtin/check-ignore.c:176
+msgid "cannot have both --quiet and --verbose"
+msgstr ""
+
+#: builtin/check-ignore.c:179
+msgid "--non-matching is only valid with --verbose"
+msgstr ""
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr ""
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr ""
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr ""
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr ""
+
+#: builtin/checkout--worker.c:110
+msgid "git checkout--worker [<options>]"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr ""
+
+#: builtin/checkout-index.c:152
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/checkout-index.c:169
+msgid "stage should be between 1 and 3 or all"
+msgstr ""
+
+#: builtin/checkout-index.c:187
+msgid "check out all files in the index"
+msgstr ""
+
+#: builtin/checkout-index.c:188
+msgid "force overwrite of existing files"
+msgstr ""
+
+#: builtin/checkout-index.c:190
+msgid "no warning for existing files and files not in index"
+msgstr ""
+
+#: builtin/checkout-index.c:192
+msgid "don't checkout new files"
+msgstr ""
+
+#: builtin/checkout-index.c:194
+msgid "update stat information in the index file"
+msgstr ""
+
+#: builtin/checkout-index.c:198
+msgid "read list of paths from the standard input"
+msgstr ""
+
+#: builtin/checkout-index.c:200
+msgid "write the content to temporary files"
+msgstr ""
+
+#: builtin/checkout-index.c:204
+msgid "copy out the files from named stage"
+msgstr ""
+
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<opsi>] <cabang>"
+
+#: builtin/checkout.c:34
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<opsi>] [<cabang>] -- <berkas>..."
+
+#: builtin/checkout.c:39
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<opsi>] [<cabang>]"
+
+#: builtin/checkout.c:44
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<opsi>] [--source=<cabang>] <berkas>..."
+
+#: builtin/checkout.c:190 builtin/checkout.c:229
+#, 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
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "jalur '%s' tidak punya versi mereka"
+
+#: builtin/checkout.c:208
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "jalur '%s' tidak punya semua versi yang diperlukan"
+
+#: builtin/checkout.c:261
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "jalur '%s' tidak punya versi yang diperlukan"
+
+#: builtin/checkout.c:278
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "jalur '%s': tidak dapat gabung"
+
+#: builtin/checkout.c:294
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Tidak dapat menambahkan hasil penggabungan untuk '%s'"
+
+#: builtin/checkout.c:411
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Konflik penggabungan %d dibuat ulang"
+msgstr[1] "Konflik penggabungan %d dibuat ulang"
+
+#: builtin/checkout.c:416
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "%d jalur diperbarui dari %s"
+msgstr[1] "%d jalur diperbarui dari %s"
+
+#: builtin/checkout.c:423
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "%d jalur diperbarui dari indeks"
+msgstr[1] "%d jalur diperbarui dari indeks"
+
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' tidak dapat digunakan untuk memperbarui jalur"
+
+#: builtin/checkout.c:459 builtin/checkout.c:462
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s' tidak dapat digunakan untuk %s"
+
+#: builtin/checkout.c:466
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr ""
+"Tidak dapat memperbarui jalur dan mengganti ke cabang '%s' dalam waktu yang "
+"bersamaan."
+
+#: builtin/checkout.c:470
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "baik '%s' atau '%s' tidak disebutkan"
+
+#: builtin/checkout.c:474
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' harus disebutkan ketika '%s' tidak disebutkan"
+
+#: builtin/checkout.c:479 builtin/checkout.c:484
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' atau '%s' tidak dapat digunakan untuk %s"
+
+#: builtin/checkout.c:558 builtin/checkout.c:565
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "jalur '%s' tak tergabung"
+
+#: builtin/checkout.c:734
+msgid "you need to resolve your current index first"
+msgstr "Anda perlu selesaikan dulu indeks Anda saat ini"
+
+#: builtin/checkout.c:788
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"tidak dapat melanjutkan dengan perubahan yang tergelar dalam berkas "
+"berikut:\n"
+"%s"
+
+#: builtin/checkout.c:881
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "Tidak dapat melakukan reflog untuk '%s': %s\n"
+
+#: builtin/checkout.c:923
+msgid "HEAD is now at"
+msgstr "HEAD sekarang berada di"
+
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+msgid "unable to update HEAD"
+msgstr "tidak dapat memperbarui HEAD"
+
+#: builtin/checkout.c:931
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Ganti ulang cabang '%s'\n"
+
+#: builtin/checkout.c:934
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Sudah berada pada '%s'\n"
+
+#: builtin/checkout.c:938
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Ganti ke dan ganti cabang '%s'\n"
+
+#: builtin/checkout.c:940 builtin/checkout.c:1371
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Ganti ke cabang baru '%s'\n"
+
+#: builtin/checkout.c:942
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Ganti ke cabang '%s'\n"
+
+#: builtin/checkout.c:993
+#, c-format
+msgid " ... and %d more.\n"
+msgstr "... dan %d lainnya.\n"
+
+#: builtin/checkout.c:999
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+"Peringatan: Anda meninggalkan %d komit di belakang, tidak terhubung ke\n"
+"cabang Anda manapun:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Peringatan: Anda meninggalkan %d komit di belakang, tidak terhubung ke\n"
+"cabang Anda manapun:\n"
+"\n"
+"%s\n"
+
+#: 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"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+"Jika Anda ingin memelihara itu dengan membuat cabang baru, ini mungkin\n"
+"saat yang tepat untuk dilakukan dengan:\n"
+"git branch <nama-cabang-baru> %s\n"
+msgstr[1] ""
+"Jika Anda ingin memelihara itu dengan membuat cabang baru, ini mungkin\n"
+"saat yang tepat untuk dilakukan dengan:\n"
+"git branch <nama-cabang-baru> %s\n"
+
+#: builtin/checkout.c:1053
+msgid "internal error in revision walk"
+msgstr "kesalahan internal dalam jalan revisi"
+
+#: builtin/checkout.c:1057
+msgid "Previous HEAD position was"
+msgstr "Posisi HEAD sebelumnya adalah"
+
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
+msgid "You are on a branch yet to be born"
+msgstr "Anda berada pada cabang yang belum lahir"
+
+#: 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 ""
+"'%s' bisa jadi berkas lokal dan cabang pelacak.\n"
+"Mohon gunakan -- (dan secara opsional --no-guess) untuk disambiguasi"
+
+#: 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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Jika maksud Anda check out cabang pelacak remote, seperti 'origin',\n"
+"Anda bisa lakukan dengan kualifikasi penuh nama dengan opsi --track:\n"
+"\n"
+"    git checkout --track origin/<nama>\n"
+"\n"
+"Jika Anda ingin checkout <nama> ambigu selalu memilih satu remote,\n"
+"seperti remote 'origin', pertimbangkan untuk menyetel\n"
+"checkout.defaultRemote=origin di konfigurasi Anda"
+
+#: builtin/checkout.c:1196
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' cocok dengan banyak (%d) cabang pelacak remote"
+
+#: builtin/checkout.c:1262
+msgid "only one reference expected"
+msgstr "hanya satu referensi yang diharapkan"
+
+#: builtin/checkout.c:1279
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "hanya satu referensi yang diharapkan, %d diberikan"
+
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#, c-format
+msgid "invalid reference: %s"
+msgstr "referensi tidak valid: %s"
+
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "referensi bukan pohon: %s"
+
+#: builtin/checkout.c:1385
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "sebuah cabang diharapkan, dapat tag '%s'"
+
+#: builtin/checkout.c:1387
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "sebuah cabang diharapkan, dapat cabang remote '%s'"
+
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "sebuah cabang diharapkan, dapat '%s'"
+
+#: builtin/checkout.c:1391
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "sebuah cabang diharapkan, dapat komit '%s'"
+
+#: builtin/checkout.c:1407
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"tidak dapat mengganti cabang saat penggabungan\n"
+"Pertimbangkan untuk menggunakan \"git merge --quit\" atau \"git worktree add"
+"\"."
+
+#: 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 ""
+"tidak dapat mengganti cabang di tengah sesi am\n"
+"Pertimbangkan untuk menggunakan \"git am --quit\" atau \"git worktree add\"."
+
+#: builtin/checkout.c:1415
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"tidak dapat mengganti cabang saat pendasaran ulang\n"
+"Pertimbangkan untuk menggunakan \"git rebase --quit\" atau \"git worktree add"
+"\"."
+
+#: builtin/checkout.c:1419
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"tidak dapat mengganti cabang saat pemetikan ceri\n"
+"Pertimbangkan untuk menggunakan \"git cherry-pick --quit\" atau \"git "
+"worktree add\"."
+
+#: builtin/checkout.c:1423
+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 revert --quit\" atau \"git worktree add"
+"\"."
+
+#: builtin/checkout.c:1427
+msgid "you are switching branch while bisecting"
+msgstr "Anda mengganti cabang saat pembagian dua"
+
+#: builtin/checkout.c:1434
+msgid "paths cannot be used with switching branches"
+msgstr "jalur tidak dapat digunakan dengan mengganti cabang"
+
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' tidak dapat digunakan dengan mengganti cabang"
+
+#: 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' tidak dapat digunakan dengan '%s'"
+
+#: builtin/checkout.c:1462
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' tidak bisa mengambil <titik-awal>"
+
+#: builtin/checkout.c:1470
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Tidak dapat mengganti cabang ke bukan komit '%s'"
+
+#: builtin/checkout.c:1477
+msgid "missing branch or commit argument"
+msgstr "kehilangan argumen cabang atau komit"
+
+#: builtin/checkout.c:1520
+msgid "perform a 3-way merge with the new branch"
+msgstr "lakukan penggabungan 3 arah dengan cabang baru"
+
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+msgid "style"
+msgstr "gaya"
+
+#: builtin/checkout.c:1522
+msgid "conflict style (merge or diff3)"
+msgstr "gaya konflik (merge atau diff3)"
+
+#: builtin/checkout.c:1534 builtin/worktree.c:488
+msgid "detach HEAD at named commit"
+msgstr "lepas HEAD pada komit bernama"
+
+#: builtin/checkout.c:1535
+msgid "set upstream info for new branch"
+msgstr "setel info hulu untuk cabang baru"
+
+#: builtin/checkout.c:1537
+msgid "force checkout (throw away local modifications)"
+msgstr "paksa checkout (buang modifikasi lokal)"
+
+#: builtin/checkout.c:1539
+msgid "new-branch"
+msgstr "cabang baru"
+
+#: builtin/checkout.c:1539
+msgid "new unparented branch"
+msgstr "cabang baru tanpa induk"
+
+#: builtin/checkout.c:1541 builtin/merge.c:301
+msgid "update ignored files (default)"
+msgstr "perbarui berkas yang diabaikan (default)"
+
+#: builtin/checkout.c:1544
+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:1557
+msgid "checkout our version for unmerged files"
+msgstr "checkout versi kami untuk berkas yang tak tergabung"
+
+#: builtin/checkout.c:1560
+msgid "checkout their version for unmerged files"
+msgstr "checkout versi mereka untuk berkas yang tak tergabung"
+
+#: builtin/checkout.c:1564
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "jangan batasi jalur spek hanya ke entri tipis"
+
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c dan --orphan saling eksklusif"
+
+#: builtin/checkout.c:1626
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p dan --overlay saling eksklusif"
+
+#: builtin/checkout.c:1663
+msgid "--track needs a branch name"
+msgstr "--track butuh nama cabang"
+
+#: builtin/checkout.c:1668
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "kehilangan nama cabang; coba -%c"
+
+#: builtin/checkout.c:1700
+#, c-format
+msgid "could not resolve %s"
+msgstr "tidak dapat menyelesaikan %s"
+
+#: builtin/checkout.c:1716
+msgid "invalid path specification"
+msgstr "spesifikasi jalur tidak valid"
+
+#: builtin/checkout.c:1723
+#, 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:1727
+#, 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:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file tidak kompatible dengan --detach"
+
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file tidak kompatibel dengan --patch"
+
+#: builtin/checkout.c:1752
+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"
+"men-checkout index"
+
+#: builtin/checkout.c:1757
+msgid "you must specify path(s) to restore"
+msgstr "Anda harus sebutkan jalur untuk dipulihkan"
+
+#: 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 "cabang"
+
+#: builtin/checkout.c:1784
+msgid "create and checkout a new branch"
+msgstr "buat dan checkout cabang baru"
+
+#: builtin/checkout.c:1786
+msgid "create/reset and checkout a branch"
+msgstr "buat/setel ulang dan checkout cabang"
+
+#: builtin/checkout.c:1787
+msgid "create reflog for new branch"
+msgstr "buat reflog untuk cabang baru"
+
+#: builtin/checkout.c:1789
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "tebakan kedua 'git checkout <tidak-ada-cabang-seperti-itu>' (default)"
+
+#: builtin/checkout.c:1790
+msgid "use overlay mode (default)"
+msgstr "gunakan mode hamparan (default)"
+
+#: builtin/checkout.c:1835
+msgid "create and switch to a new branch"
+msgstr "buat dan ganti ke cabang baru"
+
+#: builtin/checkout.c:1837
+msgid "create/reset and switch to a branch"
+msgstr "buat/setel ulang dan ganti ke cabang"
+
+#: builtin/checkout.c:1839
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "tebakan kedua 'git switch <tidak-ada-cabang-seperti-itu>'"
+
+#: builtin/checkout.c:1841
+msgid "throw away local modifications"
+msgstr "buang modifikasi lokal"
+
+#: builtin/checkout.c:1875
+msgid "which tree-ish to checkout from"
+msgstr "mana mirip-cabang untuk di-checkout"
+
+#: builtin/checkout.c:1877
+msgid "restore the index"
+msgstr "pulihkan indeks"
+
+#: builtin/checkout.c:1879
+msgid "restore the working tree (default)"
+msgstr "pulihkan pohon kerja (default)"
+
+#: builtin/checkout.c:1881
+msgid "ignore unmerged entries"
+msgstr "abaikan entri yang tak tergabung"
+
+#: builtin/checkout.c:1882
+msgid "use overlay mode"
+msgstr "gunakan mode hamparan"
+
+#: 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 <pola>] [-x | -X] [--] <jalur>..."
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Removing %s\n"
+msgstr "Menghapus %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Akan hapus %s\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "Melewatkan repositori %s\n"
+
+#: builtin/clean.c:36
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "Akan melewatkan repositori %s\n"
+
+#: builtin/clean.c:38
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "tidak dapat me-lstat %s\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a numbered item\n"
+"foo        - select item based on unique prefix\n"
+"           - (empty) select nothing\n"
+msgstr ""
+"Bisik bantuan:\n"
+"1          - pilih item bernomor\n"
+"foo        - pilih item berdasarkan prefiks unik\n"
+"           - (kosong) tidak pilih apa-apa\n"
+
+#: builtin/clean.c:304 git-add--interactive.perl:602
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a single item\n"
+"3-5        - select a range of items\n"
+"2-3,6-9    - select multiple ranges\n"
+"foo        - select item based on unique prefix\n"
+"-...       - unselect specified items\n"
+"*          - choose all items\n"
+"           - (empty) finish selecting\n"
+msgstr ""
+"Bisik bantuan:\n"
+"1          - pilih item tunggal\n"
+"3-5        - pilih satu rentang item\n"
+"2-3,6-9    - pilih banyak rentang\n"
+"foo        - pilih item berdasarkan prefiks unik\n"
+"-...       - batal pilih item yang disebutkan\n"
+"*          - pilih semua item\n"
+"           - (kosong) selesai memilih\n"
+
+#: builtin/clean.c:519 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Huh (%s)?\n"
+
+#: builtin/clean.c:659
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Masukkan pola pengabaian>> "
+
+#: builtin/clean.c:693
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "PERINGATAN: Tidak dapat menemukan item yang cocok dengan: %s"
+
+#: builtin/clean.c:714
+msgid "Select items to delete"
+msgstr "Pilih item untuk dihapus"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:755
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "Hapus %s [y/N]? "
+
+#: builtin/clean.c:786
+msgid ""
+"clean               - start cleaning\n"
+"filter by pattern   - exclude items from deletion\n"
+"select by numbers   - select items to be deleted by numbers\n"
+"ask each            - confirm each deletion (like \"rm -i\")\n"
+"quit                - stop cleaning\n"
+"help                - this screen\n"
+"?                   - help for prompt selection"
+msgstr ""
+"clean               - mulai membersihkan\n"
+"filter by pattern   - kecualikan item dari penghapusan\n"
+"select by numbers   - pilih item untuk dihapus oleh nomor\n"
+"ask each            - konfirmasi setiap penghapusan (seperti \"rm -i\")\n"
+"quit                - berhenti membersihkan\n"
+"help                - layar ini\n"
+"?                   - bantuan untuk bisik pemilihan"
+
+#: builtin/clean.c:822
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "Akan menghapus item berikut:"
+msgstr[1] "Akan menghapus item berikut:"
+
+#: builtin/clean.c:838
+msgid "No more files to clean, exiting."
+msgstr "Tidak ada lagi berkas untuk dibersihkan, keluar."
+
+#: builtin/clean.c:900
+msgid "do not print names of files removed"
+msgstr "jangan cetak nama berkas yang dihapus"
+
+#: builtin/clean.c:902
+msgid "force"
+msgstr "paksa"
+
+#: builtin/clean.c:903
+msgid "interactive cleaning"
+msgstr "pembersihan interaktif"
+
+#: builtin/clean.c:905
+msgid "remove whole directories"
+msgstr "hapus keseluruhan direktori"
+
+#: 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 "pola"
+
+#: builtin/clean.c:907
+msgid "add <pattern> to ignore rules"
+msgstr "tambahkan <pola> ke aturan pengabaian"
+
+#: builtin/clean.c:908
+msgid "remove ignored files, too"
+msgstr "juga hapus berkas terabaikan"
+
+#: builtin/clean.c:910
+msgid "remove only ignored files"
+msgstr "hanya hapus berkas terabaikan"
+
+#: builtin/clean.c:925
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce disetel ke true dan baik -i, -n, atau -f tidak diberikan; "
+"menolak membersihkan"
+
+#: builtin/clean.c:928
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce asal ke true dan baik -i, -n, atau -f tidak diberikan; "
+"menolak membersihkan"
+
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+msgstr "-x dan -X tidak dapat digunakan bersamaan"
+
+#: builtin/clone.c:45
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<opsi>] [--] <repo> [<direktori>]"
+
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "jangan kloning repositori dangkal"
+
+#: builtin/clone.c:98
+msgid "don't create a checkout"
+msgstr "jangan buat checkout"
+
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+msgid "create a bare repository"
+msgstr "buat repositori bare"
+
+#: builtin/clone.c:103
+msgid "create a mirror repository (implies bare)"
+msgstr "buat repositori cermin (implikasikan bare)"
+
+#: builtin/clone.c:105
+msgid "to clone from a local repository"
+msgstr "kloning dari repositori lokal"
+
+#: builtin/clone.c:107
+msgid "don't use local hardlinks, always copy"
+msgstr "jangan gunakan tautan keras lokal, selalu salin"
+
+#: builtin/clone.c:109
+msgid "setup as shared repository"
+msgstr "siapkan sebagai repositori berbagi"
+
+#: builtin/clone.c:111
+msgid "pathspec"
+msgstr "spek jalur"
+
+#: builtin/clone.c:111
+msgid "initialize submodules in the clone"
+msgstr "inisialisasi submodul dalam klon"
+
+#: builtin/clone.c:115
+msgid "number of submodules cloned in parallel"
+msgstr "jumlah submodul yang diklon secara paralel"
+
+#: builtin/clone.c:116 builtin/init-db.c:539
+msgid "template-directory"
+msgstr "direktori templat"
+
+#: 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:1899
+#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+msgid "reference repository"
+msgstr "repositori rujukan"
+
+#: 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 "gunakan --reference hanya pada saat kloning"
+
+#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
+#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+msgid "name"
+msgstr "nama"
+
+#: builtin/clone.c:125
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "gunakan <nama> daripada 'origin' untuk lacak hulu"
+
+#: builtin/clone.c:127
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "checkout <cabang> daripada HEAD remote"
+
+#: builtin/clone.c:129
+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:862
+#: builtin/pull.c:208
+msgid "depth"
+msgstr "kedalaman"
+
+#: builtin/clone.c:131
+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:3964
+#: builtin/pull.c:211
+msgid "time"
+msgstr "waktu"
+
+#: builtin/clone.c:133
+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
+msgid "revision"
+msgstr "revisi"
+
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "perdalam riwayat klon dangkal, tidak termasuk rev"
+
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
+msgid "clone only one branch, HEAD or --branch"
+msgstr "klon hanya satu cabang, HEAD atau --branch"
+
+#: builtin/clone.c:139
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "jangan klon tag apapun, dan buat pengambilan nanti tidak mengikutinya"
+
+#: builtin/clone.c:141
+msgid "any cloned submodules will be shallow"
+msgstr "submodul yang diklon akan dangkal"
+
+#: builtin/clone.c:142 builtin/init-db.c:548
+msgid "gitdir"
+msgstr "direktori git"
+
+#: builtin/clone.c:143 builtin/init-db.c:549
+msgid "separate git dir from working tree"
+msgstr "pisahkan direktori git dari pohon kerja"
+
+#: builtin/clone.c:144
+msgid "key=value"
+msgstr "kunci=nilai"
+
+#: builtin/clone.c:145
+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:575 builtin/send-pack.c:196
+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:575 builtin/send-pack.c:197
+msgid "option to transmit"
+msgstr "opsi untuk transmisi"
+
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: 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:578
+msgid "use IPv6 addresses only"
+msgstr "gunakan hanya alamat IPv6"
+
+#: builtin/clone.c:154
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "submodul yang diklon akan menggunakan cabang yang melacak remotenya"
+
+#: builtin/clone.c:156
+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
+#, 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
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s ada dan bukan direktori"
+
+#: builtin/clone.c:436
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "gagal memulai iterator pada '%s'"
+
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "gagal membuat tautan '%s'"
+
+#: builtin/clone.c:471
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "gagal menyalin berkas ke '%s'"
+
+#: builtin/clone.c:476
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "gagal iterasi pada '%s'"
+
+#: builtin/clone.c:503
+#, c-format
+msgid "done.\n"
+msgstr "selesai.\n"
+
+#: 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 ""
+"Klon sukses, tapi checkout gagal.\n"
+"Anda dapat periksa apa yang dicheckout dengan 'git status'\n"
+"dan coba lagi dengan 'git restore --source=HEAD :/'\n"
+
+#: builtin/clone.c:594
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "Tidak dapat menemukan cabang remote %s untuk diklon."
+
+#: builtin/clone.c:713
+#, c-format
+msgid "unable to update %s"
+msgstr "tidak dapat memperbarui %s"
+
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "gagal menginisalisasi checkout tipis"
+
+#: builtin/clone.c:784
+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
+msgid "unable to checkout working tree"
+msgstr "tidak dapat men-checkout pohon kerja"
+
+#: builtin/clone.c:894
+msgid "unable to write parameters to config file"
+msgstr "tidak dapat menulis parameter ke berkas konfigurasi"
+
+#: builtin/clone.c:957
+msgid "cannot repack to clean up"
+msgstr "tidak dapat memaket ulang untuk pembersihan"
+
+#: builtin/clone.c:959
+msgid "cannot unlink temporary alternates file"
+msgstr "tidak dapat batal-taut berkas alternatif sementara"
+
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+msgid "Too many arguments."
+msgstr "Terlalu banyak argumen."
+
+#: builtin/clone.c:1005
+msgid "You must specify a repository to clone."
+msgstr "Anda harus sebutkan repositori untuk diklon."
+
+#: builtin/clone.c:1018
+#, 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."
+
+#: builtin/clone.c:1035
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "repositori '%s' tidak ada"
+
+#: builtin/clone.c:1039 builtin/fetch.c:2014
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "kedalaman %s bukan bilangan positif"
+
+#: builtin/clone.c:1049
+#, 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
+#, 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
+#, 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:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "tidak dapat membuat direktori pendahulu '%s'"
+
+#: builtin/clone.c:1089
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "tidak dapat membuat direktori pohon kerja '%s'"
+
+#: builtin/clone.c:1109
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Kloning ke repositori bare '%s'...\n"
+
+#: builtin/clone.c:1111
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Kloning ke '%s'...\n"
+
+#: builtin/clone.c:1135
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive tidak kompatibel dengan baik --reference dan --reference-"
+"if-able"
+
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' bukan nama remote yang valid"
+
+#: builtin/clone.c:1229
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "--depth diabaikan di klon lokal; gunakan file:// sebagai gantinya."
+
+#: builtin/clone.c:1231
+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
+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
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--filter diabaikan di klon lokal; gunakan file:// sebagai gantinya."
+
+#: builtin/clone.c:1240
+msgid "source repository is shallow, ignoring --local"
+msgstr "repositori sumber dangkal, abaikan --local"
+
+#: builtin/clone.c:1245
+msgid "--local is ignored"
+msgstr "--local diabaikan"
+
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "transportasi remote melaporkan kesalahan"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "Cabang remote %s tidak ditemukan di hulu %s"
+
+#: builtin/clone.c:1347
+msgid "You appear to have cloned an empty repository."
+msgstr "Anda tampaknya mengklon repositori kosong."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr ""
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr ""
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr ""
+
+#: builtin/column.c:30
+msgid "maximum width"
+msgstr ""
+
+#: builtin/column.c:31
+msgid "padding space on left border"
+msgstr ""
+
+#: builtin/column.c:32
+msgid "padding space on right border"
+msgstr ""
+
+#: builtin/column.c:33
+msgid "padding space between columns"
+msgstr ""
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr ""
+
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
+
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+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:1779
+msgid "dir"
+msgstr ""
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr ""
+
+#: builtin/commit-graph.c:83
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+
+#: builtin/commit-graph.c:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr ""
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr ""
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr ""
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr ""
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr ""
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr ""
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr ""
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:228
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:230
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:232
+msgid "only expire files older than a given date-time"
+msgstr ""
+
+#: builtin/commit-graph.c:234
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr ""
+
+#: builtin/commit-graph.c:255
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr ""
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr ""
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#, 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
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr ""
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
+msgid "commit message"
+msgstr ""
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr ""
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr ""
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<opsi>] [--] <spek jalur>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<opsi>] [--] <spek jalur>..."
+
+#: builtin/commit.c:51
+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 ""
+"Anda diminta untuk mengubah komit terkini, tetapi melakukan\n"
+"hal itu akan membuat komit kosong. Anda dapat mengulangi perintah\n"
+"dengan --allow-empty, atau Anda dapat menghapus keseluruhan komit\n"
+"dengan \"git reset HEAD^\".\n"
+
+#: builtin/commit.c:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+msgstr ""
+"Petik ceri sebelumnya sekarang kosong, kemungkinan karena resolusi konflik.\n"
+"Jika Anda ingin komit, gunakan:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Selain itu, gunakan 'git rebase --skip'\n"
+
+#: builtin/commit.c:66
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "Selain itu, gunakan 'git cherry-pick --skip'\n"
+
+#: builtin/commit.c:69
+msgid ""
+"and then use:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+msgstr ""
+"dan gunakan:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"untuk melanjutkan pemetikan ceri sisa komit.\n"
+"Jika Anda ingin melewatkan komit ini, gunakan:\n"
+"    git cherry-pick --skip\n"
+"\n"
+
+#: builtin/commit.c:324
+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
+msgid "No paths with --include/--only does not make sense."
+msgstr "Tanpa jalur dengan --include/--only tidak masuk akal."
+
+#: builtin/commit.c:386
+msgid "unable to create temporary index"
+msgstr "tidak dapat membuat indeks sementara"
+
+#: builtin/commit.c:395
+msgid "interactive add failed"
+msgstr "penambahan interaktif gagal"
+
+#: builtin/commit.c:410
+msgid "unable to update temporary index"
+msgstr "tidak dapat memperbarui indeks sementara"
+
+#: builtin/commit.c:412
+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
+msgid "unable to write new_index file"
+msgstr "tidak dapat menulis berkas new_index"
+
+#: builtin/commit.c:489
+msgid "cannot do a partial commit during a merge."
+msgstr "tidak dapat melakukan komit sebagian selama penggabungan."
+
+#: builtin/commit.c:491
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "tidak dapat melakukan komit sebagian selama pemetikan ceri."
+
+#: builtin/commit.c:493
+msgid "cannot do a partial commit during a rebase."
+msgstr "tidak dapat melakukan komit sebagian selama pendasaran ulang."
+
+#: builtin/commit.c:501
+msgid "cannot read the index"
+msgstr "tidak dapat membaca indeks"
+
+#: builtin/commit.c:520
+msgid "unable to write temporary index file"
+msgstr "tidak dapat menulis berkas indeks sementara"
+
+#: builtin/commit.c:618
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "komit '%s' kurang kepala pengarang"
+
+#: builtin/commit.c:620
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "komit '%s' ada baris pengarang cacat"
+
+#: builtin/commit.c:639
+msgid "malformed --author parameter"
+msgstr "parameter --author cacat"
+
+#: builtin/commit.c:692
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+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:1165
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "tidak dapat mencari komit %s"
+
+#: builtin/commit.c:758 builtin/shortlog.c:413
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(baca pesan log dari standar masukan)\n"
+
+#: builtin/commit.c:760
+msgid "could not read log from standard input"
+msgstr "tidak dapat membaca log dari standar masukan"
+
+#: builtin/commit.c:764
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "tidak dapat membaca berkas log '%s'"
+
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "tidak dapat menggabungkan -m dengan --fixup:%s"
+
+#: builtin/commit.c:813 builtin/commit.c:829
+msgid "could not read SQUASH_MSG"
+msgstr "tidak dapat membaca SQUASH_MSG"
+
+#: builtin/commit.c:820
+msgid "could not read MERGE_MSG"
+msgstr "tidak dapat membaca MERGE_MSG"
+
+#: builtin/commit.c:880
+msgid "could not write commit template"
+msgstr "tidak dapat menulis templat komit"
+
+#: builtin/commit.c:893
+#, 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:895
+#, 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: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 ""
+"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:903
+#, 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: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"
+"Sepertinya Anda mungkin mengkomit penggabungan.\n"
+"Jika itu salah, mohon jalankan\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"dan coba lagi.\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"
+"Sepertinya Anda mungkin mengkomit petik ceri.\n"
+"Jika it salah, mohon jalankan\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"dan coba lagi.\n"
+
+#: builtin/commit.c:947
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr "%sPengarang:    %.*s <%.*s>"
+
+#: builtin/commit.c:955
+#, c-format
+msgid "%sDate:      %s"
+msgstr "%sTanggal:       %s"
+
+#: builtin/commit.c:962
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sPengkomit: %.*s <%.*s>"
+
+#: builtin/commit.c:980
+msgid "Cannot read index"
+msgstr "Tidak dapat membaca indeks"
+
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "tidak dapat melewatkan trailer ke --trailers"
+
+#: builtin/commit.c:1065
+msgid "Error building trees"
+msgstr "Kesalahan membangun pohon"
+
+#: builtin/commit.c:1079 builtin/tag.c:319
+#, 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:1123
+#, 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:1137
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Mode terabaikan '%s' tidak valid"
+
+#: builtin/commit.c:1155 builtin/commit.c:1448
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Mode berkas tak terlacak '%s' tidak valid"
+
+#: builtin/commit.c:1195
+msgid "--long and -z are incompatible"
+msgstr "--long dan -z tidak kompatibel"
+
+#: builtin/commit.c:1226
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Anda berada di tengah penggabungan -- tidak dapat menulis ulang."
+
+#: builtin/commit.c:1228
+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:1231
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr ""
+"tidak dapat menggabungkan opsi penulisan ulang --fixup dengan jalur '%s'"
+
+#: 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 "Menggunakan baik --reset-author dan --author tidak masuk akal"
+
+#: builtin/commit.c:1261
+msgid "You have nothing to amend."
+msgstr "Anda tidak punya apapun untuk diubah."
+
+#: 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: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: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:1271
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "Opsi --squash dan --fixup tidak dapat digunakan bersamaan"
+
+#: 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:1283
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Opsi -m tidak dapat digabung dengan -c/-C/-F."
+
+#: 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: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:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr ""
+
+#: builtin/commit.c:1352
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "jalur '%s ...' dengan -a tidak masuk akal"
+
+#: builtin/commit.c:1483 builtin/commit.c:1652
+msgid "show status concisely"
+msgstr "perlihatkan status dengan ringkas"
+
+#: builtin/commit.c:1485 builtin/commit.c:1654
+msgid "show branch information"
+msgstr "perlihatkan informasi cabang"
+
+#: builtin/commit.c:1487
+msgid "show stash information"
+msgstr "perlihatkan informasi stase"
+
+#: builtin/commit.c:1489 builtin/commit.c:1656
+msgid "compute full ahead/behind values"
+msgstr "hitung nilai didepan/dibelakang penuh"
+
+#: builtin/commit.c:1491
+msgid "version"
+msgstr "versi"
+
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
+msgid "machine-readable output"
+msgstr "keluaran yang dapat dibaca mesin"
+
+#: builtin/commit.c:1494 builtin/commit.c:1660
+msgid "show status in long format (default)"
+msgstr "perlihatkan status dalam format panjang (asali)"
+
+#: builtin/commit.c:1497 builtin/commit.c:1663
+msgid "terminate entries with NUL"
+msgstr "akhiri entri dengan NUL"
+
+#: 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 "mode"
+
+#: builtin/commit.c:1500 builtin/commit.c:1666
+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:1504
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"perlihatkan berkas terabaikan, mode opsional: traditional, matching, no. "
+"(Asali: traditional)"
+
+#: builtin/commit.c:1506 parse-options.h:193
+msgid "when"
+msgstr "bila"
+
+#: builtin/commit.c:1507
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"abaikan perubahan submodul, bila opsional: all, dirty, untracked. (Asali: "
+"all)"
+
+#: builtin/commit.c:1509
+msgid "list untracked files in columns"
+msgstr "sebut berkas tak terlacak dalam kolom"
+
+#: builtin/commit.c:1510
+msgid "do not detect renames"
+msgstr "jangan deteksi penggantian nama"
+
+#: builtin/commit.c:1512
+msgid "detect renames, optionally set similarity index"
+msgstr "deteksi penggantian nama, setel indeks kemiripan secara opsional"
+
+#: builtin/commit.c:1535
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "Kombinasi argumen berkas terabaikan dan tak terlacak tidak didukung"
+
+#: builtin/commit.c:1617
+msgid "suppress summary after successful commit"
+msgstr "sembunyikan rangkuman setelah komit berhasil"
+
+#: builtin/commit.c:1618
+msgid "show diff in commit message template"
+msgstr "perlihatkan diff dalam templat pesan komit"
+
+#: builtin/commit.c:1620
+msgid "Commit message options"
+msgstr "Opsi pesan komit"
+
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+msgid "read message from file"
+msgstr "Baca pesan dari berkas"
+
+#: builtin/commit.c:1622
+msgid "author"
+msgstr "pengarang"
+
+#: builtin/commit.c:1622
+msgid "override author for commit"
+msgstr "timpa pengarang komit"
+
+#: builtin/commit.c:1623 builtin/gc.c:550
+msgid "date"
+msgstr "tangal"
+
+#: builtin/commit.c:1623
+msgid "override date for commit"
+msgstr "timpa tanggal komit"
+
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
+msgid "commit"
+msgstr "komit"
+
+#: builtin/commit.c:1625
+msgid "reuse and edit message from specified commit"
+msgstr "gunakan kembali dan sunting pesan dari komit tersebut"
+
+#: builtin/commit.c:1626
+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:1631
+msgid "[(amend|reword):]commit"
+msgstr "[(amend|reword):]komit"
+
+#: builtin/commit.c:1631
+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:1632
+msgid "use autosquash formatted message to squash specified commit"
+msgstr "gunakan pesan terformat autosquash untuk lumat komit tersebut"
+
+#: builtin/commit.c:1633
+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:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr ""
+
+#: 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
+msgid "add a Signed-off-by trailer"
+msgstr "tambahkan trailer Signed-off-by"
+
+#: builtin/commit.c:1636
+msgid "use specified template file"
+msgstr "gunakan templat berkas tersebut"
+
+#: builtin/commit.c:1637
+msgid "force edit of commit"
+msgstr "paksa sunting komit"
+
+#: builtin/commit.c:1639
+msgid "include status in commit message template"
+msgstr "masukkan status dalam templat pesaan komit"
+
+#: builtin/commit.c:1644
+msgid "Commit contents options"
+msgstr "Opsi isi komit"
+
+#: builtin/commit.c:1645
+msgid "commit all changed files"
+msgstr "komit semua berkas terubah"
+
+#: builtin/commit.c:1646
+msgid "add specified files to index for commit"
+msgstr "tambahakn berkas tersebut ke indeks untuk dikomit"
+
+#: builtin/commit.c:1647
+msgid "interactively add files"
+msgstr "tambah berkas secara interaktif"
+
+#: builtin/commit.c:1648
+msgid "interactively add changes"
+msgstr "tambah perubahan secara interaktif"
+
+#: builtin/commit.c:1649
+msgid "commit only specified files"
+msgstr "hanya komit berkas tersebut"
+
+#: builtin/commit.c:1650
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "lewati hook pre-commit dan commit-msg"
+
+#: builtin/commit.c:1651
+msgid "show what would be committed"
+msgstr "perlihatkan apa yang akan dikomit"
+
+#: builtin/commit.c:1664
+msgid "amend previous commit"
+msgstr "ubah komit sebelumnya"
+
+#: builtin/commit.c:1665
+msgid "bypass post-rewrite hook"
+msgstr "lewati hook post-rewrite"
+
+#: builtin/commit.c:1672
+msgid "ok to record an empty change"
+msgstr "ok merekam perubahan kosong"
+
+#: builtin/commit.c:1674
+msgid "ok to record a change with an empty message"
+msgstr "ok merekam perubahan dengan pesan kosong"
+
+#: builtin/commit.c:1750
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Berkas MERGE_HEAD (%s) rusak"
+
+#: builtin/commit.c:1757
+msgid "could not read MERGE_MODE"
+msgstr "tidak dapat membaca MERGE_MODE"
+
+#: builtin/commit.c:1778
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "tidak dapat membaca pesan komit: %s"
+
+#: builtin/commit.c:1785
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "Batalkan komit karena pesan komit kosong.\n"
+
+#: builtin/commit.c:1790
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Batalkan komit; Anda tidak menyunting pesan.\n"
+
+#: builtin/commit.c:1801
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "Batalkan komit karena badan pesan komit kosong.\n"
+
+#: 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 ""
+"repositori sudah diperbarui, tetapi tidak dapat menulis\n"
+"berkas new_index. Periksa bahwa disk tidak penuh dan kuota\n"
+"tidak terlampaui, lalu \"git restore --staged :/\" untuk pulihkan."
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<opsi>]"
+
+#: builtin/config.c:109 builtin/env--helper.c:27
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "argumen --type tidak dikenal %s"
+
+#: builtin/config.c:121
+msgid "only one type at a time"
+msgstr "hanya satu tipe pada suatu saat"
+
+#: builtin/config.c:130
+msgid "Config file location"
+msgstr "Lokasi berkas konfigurasi"
+
+#: builtin/config.c:131
+msgid "use global config file"
+msgstr "gunakan berkas konfigurasi global"
+
+#: builtin/config.c:132
+msgid "use system config file"
+msgstr "gunakan berkas konfigurasi sistem"
+
+#: builtin/config.c:133
+msgid "use repository config file"
+msgstr "gunakan berkas konfigurasi repositori"
+
+#: builtin/config.c:134
+msgid "use per-worktree config file"
+msgstr "gunakan berkas konfigurasi per pohon kerja"
+
+#: builtin/config.c:135
+msgid "use given config file"
+msgstr "gunakan berkas konfigurasi yang diberikan"
+
+#: builtin/config.c:136
+msgid "blob-id"
+msgstr "id blob"
+
+#: builtin/config.c:136
+msgid "read config from given blob object"
+msgstr "baca konfigurasi dari objek blob yang diberikan"
+
+#: builtin/config.c:137
+msgid "Action"
+msgstr "Tindakan"
+
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "dapatkan nilai: name [pola nilai]"
+
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "dapatkan semua nilai: key [pola nilai]"
+
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "dapatkan nilai dari regexp: name-regex [pola nilai]"
+
+#: builtin/config.c:141
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "dapatkan nilai spesifik untuk URL: section[.var] URL"
+
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "ganti semua variabel yang cocok: name value [pola nilai]"
+
+#: builtin/config.c:143
+msgid "add a new variable: name value"
+msgstr "tambahkan variabel baru: name value"
+
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "hapus variabel: name [pola nilai]"
+
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "hapus semua cocokan: name [pola nilai]"
+
+#: builtin/config.c:146
+msgid "rename section: old-name new-name"
+msgstr "ganti nama bagian: old-name new-name"
+
+#: builtin/config.c:147
+msgid "remove a section: name"
+msgstr "hapus bagian: name"
+
+#: builtin/config.c:148
+msgid "list all"
+msgstr "daftar semua"
+
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "gunakan kesamaan untai ketika membandingkan nilai ke 'pola nilai'"
+
+#: builtin/config.c:150
+msgid "open an editor"
+msgstr "buka penyunting"
+
+#: builtin/config.c:151
+msgid "find the color configured: slot [default]"
+msgstr "temukan warna terkonfigurasi: slot [asali]"
+
+#: builtin/config.c:152
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "temukan setelan warna: slot [stdout-is-tty]"
+
+#: builtin/config.c:153
+msgid "Type"
+msgstr "Tipe"
+
+#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "value is given this type"
+msgstr "Nilai diberikan tipe ini"
+
+#: builtin/config.c:155
+msgid "value is \"true\" or \"false\""
+msgstr "Nilai adala \"true\" atau \"false\""
+
+#: builtin/config.c:156
+msgid "value is decimal number"
+msgstr "nilai adalah angka desimal"
+
+#: builtin/config.c:157
+msgid "value is --bool or --int"
+msgstr "nilai adalah --bool atau --int"
+
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "nilai adalah --bool atau untai"
+
+#: builtin/config.c:159
+msgid "value is a path (file or directory name)"
+msgstr "nilai adalah jalur (nama berkas atau direktori)"
+
+#: builtin/config.c:160
+msgid "value is an expiry date"
+msgstr "nilai adalah tanggal kadaluarsa"
+
+#: builtin/config.c:161
+msgid "Other"
+msgstr "Lainnya"
+
+#: builtin/config.c:162
+msgid "terminate values with NUL byte"
+msgstr "Akhiri nilai dengan bita NUL"
+
+#: builtin/config.c:163
+msgid "show variable names only"
+msgstr "perlihatkan hanya nama variabel"
+
+#: builtin/config.c:164
+msgid "respect include directives on lookup"
+msgstr "segani arahan masukkan pada pencarian"
+
+#: builtin/config.c:165
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"perlihatkan asal konfigurasi (berkas, masukan standar, blob, baris perintah)"
+
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"perlihatkan cakupan konfigurasi (pohon kerja, lokal, global, sistem, "
+"perintah)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
+msgid "value"
+msgstr "nilai"
+
+#: builtin/config.c:167
+msgid "with --get, use default value when missing entry"
+msgstr "dengan --get, gunakan nilai asali ketika kehilangan entri"
+
+#: builtin/config.c:181
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "jumlah argumen salah, seharusnya %d"
+
+#: builtin/config.c:183
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "jumlah argumen salah, seharusnya dari %d ke %d"
+
+#: builtin/config.c:339
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "pola kunci tidak valid: %s"
+
+#: builtin/config.c:377
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "gagal memformat nilai konfigurasi asali: %s"
+
+#: builtin/config.c:441
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "tidak dapat menguraikan warna '%s'"
+
+#: builtin/config.c:483
+msgid "unable to parse default color value"
+msgstr "tidak dapat menguraikan nilai warna asali"
+
+#: builtin/config.c:536 builtin/config.c:833
+msgid "not in a git directory"
+msgstr "bukan di dalam direktori git"
+
+#: builtin/config.c:539
+msgid "writing to stdin is not supported"
+msgstr "menulis ke stdin tidak didukung"
+
+#: builtin/config.c:542
+msgid "writing config blobs is not supported"
+msgstr "menulis blob konfigurasi tidak didukung"
+
+#: builtin/config.c:627
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# Ini adalah berkas konfigurasi Git per pengguna.\n"
+"[user]\n"
+"# Mohon sesuaikan dan batal komen baris berikut:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:652
+msgid "only one config file at a time"
+msgstr "hanya satu berkas konfigurasi pada suatu saat"
+
+#: builtin/config.c:658
+msgid "--local can only be used inside a git repository"
+msgstr "--local hanya dapat digunakan di dalam repositori git"
+
+#: builtin/config.c:660
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob hanya dapat digunakan di dalam repositori git"
+
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree hanya dapat digunakan di dalam repositori git"
+
+#: builtin/config.c:684
+msgid "$HOME not set"
+msgstr "$HOME tak disetel"
+
+#: builtin/config.c:708
+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 tidak dapat digunakan dengan banyak pohon kerja kecuali\n"
+"konfigurasi ekstensi worktreeConfig diaktifkan. Mohon baca bagian\n"
+"\"CONFIGURATION FILE\" di \"git help worktree\" untuk selengkapnya"
+
+#: builtin/config.c:743
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color dan tipe variabel raban"
+
+#: builtin/config.c:748
+msgid "only one action at a time"
+msgstr "hanya satu tindakan pada suatu saat"
+
+#: builtin/config.c:761
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only hanya dapat diterapkan pada --list atau --get-regexp"
+
+#: builtin/config.c:767
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+"--show-origin hanya dapat diterapkan pada --get, --get-all, --get-regexp, "
+"dan --list"
+
+#: builtin/config.c:773
+msgid "--default is only applicable to --get"
+msgstr "--default hanya dapat diterapkan pada --get"
+
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value hanya diterapkan dengan 'pola nilai'"
+
+#: builtin/config.c:822
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "tidak dapat membaca berkas konfigurasi '%s'"
+
+#: builtin/config.c:825
+msgid "error processing config file(s)"
+msgstr "kesalahan memproses berkas konfigurasi"
+
+#: builtin/config.c:835
+msgid "editing stdin is not supported"
+msgstr "menyunting stdin tidak didukung"
+
+#: builtin/config.c:837
+msgid "editing blobs is not supported"
+msgstr "menyunting blob tidak didukung"
+
+#: builtin/config.c:851
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "tidak dapat membuat berkas konfigurasi %s"
+
+#: builtin/config.c:864
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"tidak dapat menimpa banyak nilai dengan nilai tunggal\n"
+"       Gunakan regexp, --add atau --replace-all untuk mengubah %s."
+
+#: builtin/config.c:943 builtin/config.c:954
+#, c-format
+msgid "no such section: %s"
+msgstr "tidak ada bagian seperti: %s"
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr ""
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr ""
+
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+msgstr ""
+
+#: builtin/credential-cache--daemon.c:316
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr ""
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr ""
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<opsi>] [<mirip-komit>...]"
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<opsi>] --dirty"
+
+#: builtin/describe.c:63
+msgid "head"
+msgstr "kepala"
+
+#: builtin/describe.c:63
+msgid "lightweight"
+msgstr "ringan"
+
+#: builtin/describe.c:63
+msgid "annotated"
+msgstr "teranotasi"
+
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "tag teranotasi %s tidak tersedia"
+
+#: builtin/describe.c:281
+#, c-format
+msgid "tag '%s' is externally known as '%s'"
+msgstr "tag '%s' dikenal luar sebagai '%s'"
+
+#: builtin/describe.c:328
+#, c-format
+msgid "no tag exactly matches '%s'"
+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 "selesai mencari pada %s\n"
+
+#: builtin/describe.c:424
+#, c-format
+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
+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 "%lu komit dilintasi\n"
+
+#: builtin/describe.c:461
+#, c-format
+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 "jelaskan %s\n"
+
+#: builtin/describe.c:532
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Bukan nama objek yang valid %s"
+
+#: builtin/describe.c:540
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s bukan sebuah komit atau blob"
+
+#: builtin/describe.c:554
+msgid "find the tag that comes after the commit"
+msgstr "temukan tag yang datang setelah komit"
+
+#: builtin/describe.c:555
+msgid "debug search strategy on stderr"
+msgstr "debug strategi pencarian pada keluaran standar"
+
+#: builtin/describe.c:556
+msgid "use any ref"
+msgstr "gunakan referensi apapun"
+
+#: builtin/describe.c:557
+msgid "use any tag, even unannotated"
+msgstr "gunakan tag apapun, bahkan tak teranotasi"
+
+#: builtin/describe.c:558
+msgid "always use long format"
+msgstr "selalu gunakan format panjang"
+
+#: builtin/describe.c:559
+msgid "only follow first parent"
+msgstr "hanya ikuti induk pertama"
+
+#: builtin/describe.c:562
+msgid "only output exact matches"
+msgstr "hanya keluarkan kecocokan eksak"
+
+#: builtin/describe.c:564
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "pertimbangkan <n> tag terbaru (asali: 10)"
+
+#: builtin/describe.c:566
+msgid "only consider tags matching <pattern>"
+msgstr "hanya pertimbangkan tag yang cocok dengan <pola>"
+
+#: builtin/describe.c:568
+msgid "do not consider tags matching <pattern>"
+msgstr "jangan pertimbangkan tag yang cocok dengan <pola>"
+
+#: builtin/describe.c:570 builtin/name-rev.c:535
+msgid "show abbreviated commit object as fallback"
+msgstr "perlihatkan objek komit singkat sebagai langkah terakhir"
+
+#: builtin/describe.c:571 builtin/describe.c:574
+msgid "mark"
+msgstr "tanda"
+
+#: builtin/describe.c:572
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "tambahkan <tanda> pada direktori kerja kotor (asali: \"-dirty\")"
+
+#: builtin/describe.c:575
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "tambahkan <tanda> pada direktori kerja rusak (asali: \"-broken\")"
+
+#: builtin/describe.c:593
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long tidak kompatibel dengan --abbrev=0"
+
+#: builtin/describe.c:622
+msgid "No names found, cannot describe anything."
+msgstr "Tidak ada nama yang ditemukan, tidak dapat menjelaskan apapun."
+
+#: builtin/describe.c:673
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty tidak kompatibel dengan mirip-komit"
+
+#: builtin/describe.c:675
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken tidak kompatibel dengan mirip-komit"
+
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin dan --merge-base saling eksklusif"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base hanya bekerja dengan dua komit"
+
+#: builtin/diff.c:92
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s': bukan berkas reguler atau tautan simbolik"
+
+#: builtin/diff.c:259
+#, c-format
+msgid "invalid option: %s"
+msgstr "opsi tidak valid: %s"
+
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: tidak ada dasar penggabungan"
+
+#: builtin/diff.c:486
+msgid "Not a git repository"
+msgstr "bukan repositori git"
+
+#: builtin/diff.c:532 builtin/grep.c:684
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "objek yang diberikan '%s' tidak valid"
+
+#: builtin/diff.c:543
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "lebih dari dua blob diberikan: '%s'"
+
+#: builtin/diff.c:548
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "objek tak tertangani '%s' diberikan"
+
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: banyak dasar penggabungan, menggunakan %s"
+
+#: builtin/difftool.c:31
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr ""
+
+#: builtin/difftool.c:261
+#, c-format
+msgid "failed: %d"
+msgstr ""
+
+#: builtin/difftool.c:303
+#, c-format
+msgid "could not read symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read symlink file %s"
+msgstr ""
+
+#: builtin/difftool.c:313
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr ""
+
+#: builtin/difftool.c:413
+msgid ""
+"combined diff formats('-c' and '--cc') are not supported in\n"
+"directory diff mode('-d' and '--dir-diff')."
+msgstr ""
+
+#: builtin/difftool.c:637
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr ""
+
+#: builtin/difftool.c:639
+msgid "working tree file has been left."
+msgstr ""
+
+#: builtin/difftool.c:650
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr ""
+
+#: builtin/difftool.c:651
+msgid "you may want to cleanup or recover these."
+msgstr ""
+
+#: builtin/difftool.c:699
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr ""
+
+#: builtin/difftool.c:701
+msgid "perform a full-directory diff"
+msgstr ""
+
+#: builtin/difftool.c:703
+msgid "do not prompt before launching a diff tool"
+msgstr ""
+
+#: builtin/difftool.c:708
+msgid "use symlinks in dir-diff mode"
+msgstr ""
+
+#: builtin/difftool.c:709
+msgid "tool"
+msgstr ""
+
+#: builtin/difftool.c:710
+msgid "use the specified diff tool"
+msgstr ""
+
+#: builtin/difftool.c:712
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr ""
+
+#: builtin/difftool.c:715
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr ""
+
+#: builtin/difftool.c:718
+msgid "specify a custom command for viewing diffs"
+msgstr ""
+
+#: builtin/difftool.c:719
+msgid "passed to `diff`"
+msgstr ""
+
+#: builtin/difftool.c:734
+msgid "difftool requires worktree or --no-index"
+msgstr ""
+
+#: builtin/difftool.c:741
+msgid "--dir-diff is incompatible with --no-index"
+msgstr ""
+
+#: builtin/difftool.c:744
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr ""
+
+#: builtin/difftool.c:752
+msgid "no <tool> given for --tool=<tool>"
+msgstr ""
+
+#: builtin/difftool.c:759
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr ""
+
+#: 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
+msgid "type"
+msgstr ""
+
+#: builtin/env--helper.c:46
+msgid "default for git_env_*(...) to fall back on"
+msgstr ""
+
+#: builtin/env--helper.c:48
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
+
+#: builtin/env--helper.c:67
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+
+#: builtin/env--helper.c:82
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr ""
+
+#: builtin/fast-export.c:868
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr ""
+
+#: builtin/fast-export.c:1197
+msgid "show progress after <n> objects"
+msgstr ""
+
+#: builtin/fast-export.c:1199
+msgid "select handling of signed tags"
+msgstr ""
+
+#: builtin/fast-export.c:1202
+msgid "select handling of tags that tag filtered objects"
+msgstr ""
+
+#: builtin/fast-export.c:1205
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr ""
+
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr ""
+
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr ""
+
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr ""
+
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr ""
+
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr ""
+
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr ""
+
+#: builtin/fast-export.c:1222 builtin/log.c:1826
+msgid "refspec"
+msgstr ""
+
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr ""
+
+#: builtin/fast-export.c:1224
+msgid "anonymize output"
+msgstr ""
+
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr ""
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr ""
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
+msgstr ""
+
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr ""
+
+#: builtin/fast-export.c:1233
+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
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr ""
+
+#: builtin/fetch.c:35
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<opsi>] [<repositori> [<spek referensi>...]]"
+
+#: builtin/fetch.c:36
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<opsi>] <grup>"
+
+#: builtin/fetch.c:37
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<opsi>] [(<repositori> | <grup>)]"
+
+#: builtin/fetch.c:38
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<opsi>]"
+
+#: builtin/fetch.c:122
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel tidak dapat bernilai negatif"
+
+#: builtin/fetch.c:145 builtin/pull.c:185
+msgid "fetch from all remotes"
+msgstr "ambil dari semua remote"
+
+#: builtin/fetch.c:147 builtin/pull.c:245
+msgid "set upstream for git pull/fetch"
+msgstr "setel hulu untuk git pull/fetch"
+
+#: builtin/fetch.c:149 builtin/pull.c:188
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "tambah ke .git/FETCH_HEAD daripada timpa"
+
+#: builtin/fetch.c:151
+msgid "use atomic transaction to update references"
+msgstr ""
+
+#: builtin/fetch.c:153 builtin/pull.c:191
+msgid "path to upload pack on remote end"
+msgstr "jalur ke paket unggah pada sisi remote"
+
+#: builtin/fetch.c:154
+msgid "force overwrite of local reference"
+msgstr "paksa timpa referensi lokal"
+
+#: builtin/fetch.c:156
+msgid "fetch from multiple remotes"
+msgstr "ambil dari banyak remote"
+
+#: builtin/fetch.c:158 builtin/pull.c:195
+msgid "fetch all tags and associated objects"
+msgstr "ambil semua tag dan objek yang bersesuaian"
+
+#: builtin/fetch.c:160
+msgid "do not fetch all tags (--no-tags)"
+msgstr "jangan ambil semua tag (--no-tags)"
+
+#: builtin/fetch.c:162
+msgid "number of submodules fetched in parallel"
+msgstr "jumlah submodul yang diambil secara bersamaan"
+
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+
+#: builtin/fetch.c:166 builtin/pull.c:198
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "buang cabang pelacak remote yang tidak ada pada remote"
+
+#: builtin/fetch.c:168
+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
+msgid "on-demand"
+msgstr "sesuai permintaan"
+
+#: builtin/fetch.c:170
+msgid "control recursive fetching of submodules"
+msgstr "kontrol pengambilan submodul rekursif"
+
+#: builtin/fetch.c:175
+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
+msgid "keep downloaded pack"
+msgstr "simpan paket yang diunduh"
+
+#: builtin/fetch.c:178
+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
+msgid "deepen history of shallow clone"
+msgstr "perdalam riwayat klon dangkal"
+
+#: builtin/fetch.c:183 builtin/pull.c:212
+msgid "deepen history of shallow repository based on time"
+msgstr "perdalam riwayat repositori dangkal berdasarkan waktu"
+
+#: builtin/fetch.c:189 builtin/pull.c:221
+msgid "convert to a complete repository"
+msgstr "ubah ke repositori penuh"
+
+#: builtin/fetch.c:192
+msgid "prepend this to submodule path output"
+msgstr "tambahkan ini ke jalur keluaran submodul"
+
+#: builtin/fetch.c:195
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"default untuk ambil submodul secara rekursif (prioritas lebih rendah "
+"dariberkas konfigurasi)"
+
+#: builtin/fetch.c:199 builtin/pull.c:224
+msgid "accept refs that update .git/shallow"
+msgstr "terima referensi yang memperbarui .git/shallow"
+
+#: builtin/fetch.c:200 builtin/pull.c:226
+msgid "refmap"
+msgstr "peta referensi"
+
+#: builtin/fetch.c:201 builtin/pull.c:227
+msgid "specify fetch refmap"
+msgstr "sebutkan ambil peta referensi"
+
+#: builtin/fetch.c:208 builtin/pull.c:240
+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
+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 "lakukan 'maintenance --auto' setelah pengambilan"
+
+#: builtin/fetch.c:217 builtin/pull.c:243
+msgid "check for forced-updates on all updated branches"
+msgstr "periksa pembaruan terpaksa pada semua cabang"
+
+#: builtin/fetch.c:219
+msgid "write the commit-graph after fetching"
+msgstr "tulis grafik komit setelah pengambilan"
+
+#: builtin/fetch.c:221
+msgid "accept refspecs from stdin"
+msgstr "terima spek referensi dari masukan standar"
+
+#: builtin/fetch.c:586
+msgid "Couldn't find remote ref HEAD"
+msgstr "tidak dapat menemukan referensi remote HEAD"
+
+#: builtin/fetch.c:757
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "konfigurasi fetch.output berisi nilai tidak valid %s"
+
+#: builtin/fetch.c:856
+#, c-format
+msgid "object %s not found"
+msgstr "objek %s tidak ditemukan"
+
+#: builtin/fetch.c:860
+msgid "[up to date]"
+msgstr "[terkini]"
+
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+msgid "[rejected]"
+msgstr "[tertolak]"
+
+#: builtin/fetch.c:874
+msgid "can't fetch in current branch"
+msgstr "tidak dapat mengambil di cabang saat ini"
+
+#: builtin/fetch.c:884
+msgid "[tag update]"
+msgstr "[pembaruan tag]"
+
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
+msgid "unable to update local ref"
+msgstr "tidak dapat memperbarui referensi lokal"
+
+#: builtin/fetch.c:889
+msgid "would clobber existing tag"
+msgstr "akan klob tag yang ada"
+
+#: builtin/fetch.c:911
+msgid "[new tag]"
+msgstr "[tag baru]"
+
+#: builtin/fetch.c:914
+msgid "[new branch]"
+msgstr "[cabang baru]"
+
+#: builtin/fetch.c:917
+msgid "[new ref]"
+msgstr "[referensi baru]"
+
+#: builtin/fetch.c:956
+msgid "forced update"
+msgstr "pembaruan terpaksa"
+
+#: builtin/fetch.c:961
+msgid "non-fast-forward"
+msgstr "bukan-maju-cepat"
+
+#: 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 ""
+"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'."
+
+#: builtin/fetch.c:1069
+#, 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"
+msgstr ""
+"Butuh waktu %2.f detik untuk periksa pembaruan terpaksa. Anda dapat\n"
+"menggunakan '--no-show-forced-updates' atau jalankan\n"
+"'git config fetch.showForcedUpdates false'\n"
+" untuk menghindari pemeriksaan ini.\n"
+
+#: builtin/fetch.c:1101
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s tidak mengirim semua objek yang diperlukan\n"
+
+#: builtin/fetch.c:1129
+#, c-format
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "tolak %s karena akar dangkal tidak diperkenankan untuk diperbarui"
+
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#, c-format
+msgid "From %.*s\n"
+msgstr "Dari %.*s\n"
+
+#: 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 ""
+"beberapa referensi lokal tidak dapat diperbarui; coba jalankan\n"
+" 'git remote prune %s' untuk hapus cabang yang lama dan berkonflik"
+
+#: builtin/fetch.c:1327
+#, c-format
+msgid "   (%s will become dangling)"
+msgstr "   (%s akan menjadi terjuntai)"
+
+#: builtin/fetch.c:1328
+#, c-format
+msgid "   (%s has become dangling)"
+msgstr "   (%s telah menjadi terjuntai)"
+
+#: builtin/fetch.c:1360
+msgid "[deleted]"
+msgstr "[dihapus]"
+
+#: builtin/fetch.c:1361 builtin/remote.c:1118
+msgid "(none)"
+msgstr "(tidak ada)"
+
+#: builtin/fetch.c:1384
+#, 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"
+
+#: builtin/fetch.c:1403
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "Opsi \"%s\" nilai \"%s\" tidak valid untuk %s"
+
+#: builtin/fetch.c:1406
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "Opsi \"%s\" diabaikan untuk %s\n"
+
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "banyak cabang terdeteksi, tidak kompatibel dengan --set-upstream"
+
+#: builtin/fetch.c:1633
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "tidak setel hulu untuk cabang remote pelacak remote"
+
+#: builtin/fetch.c:1635
+msgid "not setting upstream for a remote tag"
+msgstr "tidak setel hulu untuk tag remote"
+
+#: builtin/fetch.c:1637
+msgid "unknown branch type"
+msgstr "tipe cabang tidak diketahui"
+
+#: builtin/fetch.c:1639
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"cabang sumber tidak ditemukan.\n"
+"Anda harus sebutkan tepat satu cabang dengan opsi --set-upstream."
+
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Mengambil %s\n"
+
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Tidak dapat mengambil %s"
+
+#: builtin/fetch.c:1790
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "tidak dapat mengambil '%s' (kode keluar: %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 ""
+"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"
+
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only perlu satu atau lebih --negotiate-tip=*"
+
+#: builtin/fetch.c:1998
+msgid "Negative depth in --deepen is not supported"
+msgstr "Kedalaman negatif di --deepen tidak didukung"
+
+#: builtin/fetch.c:2000
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen dan --depth saling eksklusif"
+
+#: builtin/fetch.c:2005
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth dan --unshallow tidak dapat digunakan bersamaan"
+
+#: builtin/fetch.c:2007
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "--unshallow pada repositori penuh tidak masuk akal"
+
+#: builtin/fetch.c:2024
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all tidak mengambil argumen repositori"
+
+#: builtin/fetch.c:2026
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all tidak masuk akal dengan spek referensi"
+
+#: builtin/fetch.c:2035
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "tidak ada remote atau grup remote seperti itu: %s"
+
+#: builtin/fetch.c:2042
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "Ambil grup dan sebutkan spek referensi tidak masuk akal"
+
+#: 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 ""
+"--filter hanya dapat digunakan dengan remote yang terkonfigurasi di "
+"extensions.partialclone"
+
+#: builtin/fetch.c:2086
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic hanya dapat digunakan saat mengambil dari satu remote"
+
+#: builtin/fetch.c:2090
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "--stdin hanya dapat digunakan saat mengambil dari satu remote"
+
+#: builtin/fmt-merge-msg.c:7
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:18
+msgid "populate log with at most <n> entries from shortlog"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:21
+msgid "alias for --log (deprecated)"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:24
+msgid "text"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:25
+msgid "use <text> as start of message"
+msgstr ""
+
+#: builtin/fmt-merge-msg.c:26
+msgid "file to read from"
+msgstr ""
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr ""
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr ""
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for shells"
+msgstr ""
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for perl"
+msgstr ""
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for python"
+msgstr ""
+
+#: builtin/for-each-ref.c:36
+msgid "quote placeholders suitably for Tcl"
+msgstr ""
+
+#: builtin/for-each-ref.c:39
+msgid "show only <n> matched refs"
+msgstr ""
+
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
+msgid "respect format colors"
+msgstr ""
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs which points at the given object"
+msgstr ""
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs that are not merged"
+msgstr ""
+
+#: builtin/for-each-ref.c:48
+msgid "print only refs which contain the commit"
+msgstr ""
+
+#: builtin/for-each-ref.c:49
+msgid "print only refs which don't contain the commit"
+msgstr ""
+
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr ""
+
+#: builtin/for-each-repo.c:34
+msgid "config"
+msgstr ""
+
+#: builtin/for-each-repo.c:35
+msgid "config key storing a list of repository paths"
+msgstr ""
+
+#: builtin/for-each-repo.c:43
+msgid "missing --config=<config>"
+msgstr ""
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
+msgid "unknown"
+msgstr ""
+
+#. 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 ""
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:94
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr ""
+
+#: builtin/fsck.c:124 builtin/fsck.c:127
+#, c-format
+msgid "broken link from %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:136
+msgid "wrong object type in link"
+msgstr ""
+
+#: builtin/fsck.c:152
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:264
+#, c-format
+msgid "missing %s %s"
+msgstr ""
+
+#: builtin/fsck.c:291
+#, c-format
+msgid "unreachable %s %s"
+msgstr ""
+
+#: builtin/fsck.c:311
+#, c-format
+msgid "dangling %s %s"
+msgstr ""
+
+#: builtin/fsck.c:321
+msgid "could not create lost-found"
+msgstr ""
+
+#: builtin/fsck.c:332
+#, c-format
+msgid "could not finish '%s'"
+msgstr ""
+
+#: builtin/fsck.c:349
+#, c-format
+msgid "Checking %s"
+msgstr ""
+
+#: builtin/fsck.c:387
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr ""
+
+#: builtin/fsck.c:406
+#, c-format
+msgid "Checking %s %s"
+msgstr ""
+
+#: builtin/fsck.c:411
+msgid "broken links"
+msgstr ""
+
+#: builtin/fsck.c:420
+#, c-format
+msgid "root %s"
+msgstr ""
+
+#: builtin/fsck.c:428
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr ""
+
+#: builtin/fsck.c:457
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr ""
+
+#: builtin/fsck.c:482
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr ""
+
+#: builtin/fsck.c:496
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr ""
+
+#: builtin/fsck.c:530
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr ""
+
+#: builtin/fsck.c:537
+#, c-format
+msgid "%s: not a commit"
+msgstr ""
+
+#: builtin/fsck.c:591
+msgid "notice: No default references"
+msgstr ""
+
+#: builtin/fsck.c:606
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr ""
+
+#: builtin/fsck.c:619
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr ""
+
+#: builtin/fsck.c:639
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr ""
+
+#: builtin/fsck.c:654
+msgid "Checking object directory"
+msgstr ""
+
+#: builtin/fsck.c:657
+msgid "Checking object directories"
+msgstr ""
+
+#: builtin/fsck.c:672
+#, c-format
+msgid "Checking %s link"
+msgstr ""
+
+#: builtin/fsck.c:677 builtin/index-pack.c:864
+#, c-format
+msgid "invalid %s"
+msgstr "%s tidak valid"
+
+#: builtin/fsck.c:684
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr ""
+
+#: builtin/fsck.c:690
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr ""
+
+#: builtin/fsck.c:694
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:706
+msgid "Checking cache tree"
+msgstr ""
+
+#: builtin/fsck.c:711
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:720
+msgid "non-tree in cache-tree"
+msgstr ""
+
+#: builtin/fsck.c:751
+msgid "git fsck [<options>] [<object>...]"
+msgstr ""
+
+#: builtin/fsck.c:757
+msgid "show unreachable objects"
+msgstr ""
+
+#: builtin/fsck.c:758
+msgid "show dangling objects"
+msgstr ""
+
+#: builtin/fsck.c:759
+msgid "report tags"
+msgstr ""
+
+#: builtin/fsck.c:760
+msgid "report root nodes"
+msgstr ""
+
+#: builtin/fsck.c:761
+msgid "make index objects head nodes"
+msgstr ""
+
+#: builtin/fsck.c:762
+msgid "make reflogs head nodes (default)"
+msgstr ""
+
+#: builtin/fsck.c:763
+msgid "also consider packs and alternate objects"
+msgstr ""
+
+#: builtin/fsck.c:764
+msgid "check only connectivity"
+msgstr ""
+
+#: builtin/fsck.c:765 builtin/mktag.c:75
+msgid "enable more strict checking"
+msgstr ""
+
+#: builtin/fsck.c:767
+msgid "write dangling objects in .git/lost-found"
+msgstr ""
+
+#: builtin/fsck.c:768 builtin/prune.c:134
+msgid "show progress"
+msgstr ""
+
+#: builtin/fsck.c:769
+msgid "show verbose names for reachable objects"
+msgstr ""
+
+#: builtin/fsck.c:828 builtin/index-pack.c:262
+msgid "Checking objects"
+msgstr "Memeriksa objek"
+
+#: builtin/fsck.c:856
+#, c-format
+msgid "%s: object missing"
+msgstr ""
+
+#: builtin/fsck.c:867
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr ""
+
+#: builtin/gc.c:39
+msgid "git gc [<options>]"
+msgstr ""
+
+#: builtin/gc.c:93
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr ""
+
+#: builtin/gc.c:129
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr ""
+
+#: builtin/gc.c:487 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
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+
+#: builtin/gc.c:551
+msgid "prune unreferenced objects"
+msgstr ""
+
+#: builtin/gc.c:553
+msgid "be more thorough (increased runtime)"
+msgstr ""
+
+#: builtin/gc.c:554
+msgid "enable auto-gc mode"
+msgstr ""
+
+#: builtin/gc.c:557
+msgid "force running gc even if there may be another gc running"
+msgstr ""
+
+#: builtin/gc.c:560
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:576
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr ""
+
+#: builtin/gc.c:587
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr ""
+
+#: builtin/gc.c:607
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:609
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr ""
+
+#: builtin/gc.c:610
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr ""
+
+#: builtin/gc.c:650
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+
+#: builtin/gc.c:705
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr ""
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr ""
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr ""
+
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr ""
+
+#: builtin/gc.c:1022
+msgid "failed to start 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr ""
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr ""
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr ""
+
+#: builtin/gc.c:1179
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+
+#: builtin/gc.c:1283
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr ""
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr ""
+
+#: builtin/gc.c:1395
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr ""
+
+#: builtin/gc.c:1400
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr ""
+
+#: builtin/gc.c:1415
+msgid "run tasks based on the state of the repository"
+msgstr ""
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr ""
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr ""
+
+#: builtin/gc.c:1420
+msgid "do not report progress or other information over stderr"
+msgstr ""
+
+#: builtin/gc.c:1421
+msgid "task"
+msgstr ""
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr ""
+
+#: builtin/gc.c:1439
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+
+#: builtin/gc.c:1482
+msgid "failed to run 'git config'"
+msgstr ""
+
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr ""
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr ""
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr ""
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr ""
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
+msgstr ""
+
+#: 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:1896
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1900
+msgid "failed to open stdin of 'crontab'"
+msgstr ""
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr ""
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr ""
+
+#: builtin/grep.c:30
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<opsi>] [-e] <pola> [<revisi>...] [[--] <pola>...]"
+
+#: builtin/grep.c:223
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: gagal membuat utas: %s"
+
+#: builtin/grep.c:277
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+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:1588 builtin/index-pack.c:1791
+#: builtin/pack-objects.c:3129
+#, 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
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "tidak dapat membaca pohon (%s)"
+
+#: builtin/grep.c:658
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "tidak dapan men-grep dari objek dengan tipe %s"
+
+#: builtin/grep.c:738
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "saklar '%c' mengharapkan nilai numerik"
+
+#: builtin/grep.c:837
+msgid "search in index instead of in the work tree"
+msgstr "cari dalam index daripada dalam pohon kerja"
+
+#: builtin/grep.c:839
+msgid "find in contents not managed by git"
+msgstr "temukan dalam konten yang tak dikelola oleh git"
+
+#: builtin/grep.c:841
+msgid "search in both tracked and untracked files"
+msgstr "cari dalam berkas terlacak dan tak terlacak"
+
+#: builtin/grep.c:843
+msgid "ignore files specified via '.gitignore'"
+msgstr "abaikan berkas yang disebutkan via '.gitignore'"
+
+#: builtin/grep.c:845
+msgid "recursively search in each submodule"
+msgstr "cari secara rekursif dalam setiap submodul"
+
+#: builtin/grep.c:848
+msgid "show non-matching lines"
+msgstr "perlihatkan baris nir-cocok"
+
+#: builtin/grep.c:850
+msgid "case insensitive matching"
+msgstr "pencocokan tak peka kapital"
+
+#: builtin/grep.c:852
+msgid "match patterns only at word boundaries"
+msgstr "cocokkan pola hanya pada batas kata"
+
+#: builtin/grep.c:854
+msgid "process binary files as text"
+msgstr "proses berkas biner sebagai teks"
+
+#: builtin/grep.c:856
+msgid "don't match patterns in binary files"
+msgstr "jangan cocokkan pola pada berkas biner"
+
+#: builtin/grep.c:859
+msgid "process binary files with textconv filters"
+msgstr "proses berkas biner dengan saringan textconv"
+
+#: builtin/grep.c:861
+msgid "search in subdirectories (default)"
+msgstr "cari dalam subdirektori (asali)"
+
+#: builtin/grep.c:863
+msgid "descend at most <depth> levels"
+msgstr "turun paling banyak <kedalaman> tingkat"
+
+#: builtin/grep.c:867
+msgid "use extended POSIX regular expressions"
+msgstr "gunakan ekspresi reguler POSIX diperpanjang"
+
+#: builtin/grep.c:870
+msgid "use basic POSIX regular expressions (default)"
+msgstr "gunakan ekspresi reguler POSIX dasar (asali)"
+
+#: builtin/grep.c:873
+msgid "interpret patterns as fixed strings"
+msgstr "tafsirkan pola sebagai untai tetap"
+
+#: builtin/grep.c:876
+msgid "use Perl-compatible regular expressions"
+msgstr "gunakan ekspresi reguler kompatibel dengan Perl"
+
+#: builtin/grep.c:879
+msgid "show line numbers"
+msgstr "perlihatkan nomor baris"
+
+#: builtin/grep.c:880
+msgid "show column number of first match"
+msgstr "perlihatkan nomor kolom cocokan pertama"
+
+#: builtin/grep.c:881
+msgid "don't show filenames"
+msgstr "jangan perlihatkan nama berkas"
+
+#: builtin/grep.c:882
+msgid "show filenames"
+msgstr "perlihatkan nama berkas"
+
+#: builtin/grep.c:884
+msgid "show filenames relative to top directory"
+msgstr "perlihatkan nama berkas relatif terhadap direktori puncak"
+
+#: builtin/grep.c:886
+msgid "show only filenames instead of matching lines"
+msgstr "hanya perlihatkan nama berkas daripada baris yang cocok"
+
+#: builtin/grep.c:888
+msgid "synonym for --files-with-matches"
+msgstr "sinonim untuk --files-with-matches"
+
+#: builtin/grep.c:891
+msgid "show only the names of files without match"
+msgstr "hanya perlihatkan nama berkas tanpa cocok"
+
+#: builtin/grep.c:893
+msgid "print NUL after filenames"
+msgstr "cetak NUL setelah nama berkas"
+
+#: builtin/grep.c:896
+msgid "show only matching parts of a line"
+msgstr "hanya perlihatkan bagian cocokan baris"
+
+#: builtin/grep.c:898
+msgid "show the number of matches instead of matching lines"
+msgstr "perlihatkan jumlah cocokan daripada baris yang cocok"
+
+#: builtin/grep.c:899
+msgid "highlight matches"
+msgstr "sorot cocokan"
+
+#: builtin/grep.c:901
+msgid "print empty line between matches from different files"
+msgstr "cetak baris kosong di antara cocokan dari berkas yang berbeda"
+
+#: builtin/grep.c:903
+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:906
+msgid "show <n> context lines before and after matches"
+msgstr "perlihatkan <n> baris konteks sebelum dan sesudah cocokan"
+
+#: builtin/grep.c:909
+msgid "show <n> context lines before matches"
+msgstr "perlihatkan <n> baris konteks sebelum cocokan"
+
+#: builtin/grep.c:911
+msgid "show <n> context lines after matches"
+msgstr "perlihatkan <n> baris konteks setelah cocokan"
+
+#: builtin/grep.c:913
+msgid "use <n> worker threads"
+msgstr "gunakan <n> utas pekerja"
+
+#: builtin/grep.c:914
+msgid "shortcut for -C NUM"
+msgstr "pintasan untuk -C NUM"
+
+#: builtin/grep.c:917
+msgid "show a line with the function name before matches"
+msgstr "perlihatkan sebuah baris dengan nama fungsi sebelum cocokan"
+
+#: builtin/grep.c:919
+msgid "show the surrounding function"
+msgstr "perlihatkan fungsi di sekitar"
+
+#: builtin/grep.c:922
+msgid "read patterns from file"
+msgstr "baca pola dari berkas"
+
+#: builtin/grep.c:924
+msgid "match <pattern>"
+msgstr "cocokkan <pola>"
+
+#: builtin/grep.c:926
+msgid "combine patterns specified with -e"
+msgstr "kombinasikan pola yang disebutkan dengan -e"
+
+#: builtin/grep.c:938
+msgid "indicate hit with exit status without output"
+msgstr "tunjukkan kena dengan status keluar tanpa keluaran"
+
+#: builtin/grep.c:940
+msgid "show only matches from files that match all patterns"
+msgstr "hanya perlihatkan cocokan dari berkas yang cocok dengan semua pola"
+
+#: builtin/grep.c:943
+msgid "pager"
+msgstr "penghalaman"
+
+#: builtin/grep.c:943
+msgid "show matching files in the pager"
+msgstr "perlihatkan berkas yang cocok dalam penghalaman"
+
+#: builtin/grep.c:947
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "perbolehkan pemanggilan grep(1) (diabaikan oleh bangunan ini)"
+
+#: builtin/grep.c:1013
+msgid "no pattern given"
+msgstr "tidak ada pola yang diberikan"
+
+#: builtin/grep.c:1049
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index atau --untracked tidak dapat digunakan dengan revisi"
+
+#: builtin/grep.c:1057
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "tidak dapat menguraikan revisi: %s"
+
+#: builtin/grep.c:1087
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked tidak didukung dengan --recurse-submodules"
+
+#: builtin/grep.c:1091
+msgid "invalid option combination, ignoring --threads"
+msgstr "kombinasi opsi tidak valid, abaikan --threads"
+
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+msgid "no threads support, ignoring --threads"
+msgstr "tidak ada dukungan utas, abaikan --threads"
+
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "jumlah utas tersebut (%d) tidak valid"
+
+#: builtin/grep.c:1131
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager hanya bekerja pada pohon kerja"
+
+#: builtin/grep.c:1157
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached atau --untracked tidak dapat digunakan dengan --no-index"
+
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked tidak dapat digunakan dengan --cached"
+
+#: builtin/grep.c:1166
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr "--[no-]exclude-standard tidak dapat digunakan untuk konten terlacak"
+
+#: builtin/grep.c:1174
+msgid "both --cached and trees are given"
+msgstr "baik --cached dan pohon diberikan"
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+
+#: builtin/hash-object.c:86
+msgid "git hash-object  --stdin-paths"
+msgstr ""
+
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr ""
+
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr ""
+
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr ""
+
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr ""
+
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr ""
+
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
+msgstr ""
+
+#: builtin/help.c:47
+msgid "print all available commands"
+msgstr "cetak semua perintah yang tersedia"
+
+#: builtin/help.c:48
+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
+msgid "show man page"
+msgstr "perlihatkan halaman man"
+
+#: builtin/help.c:53
+msgid "show manual in web browser"
+msgstr "perlihatkan manual dalam penjelajah web"
+
+#: builtin/help.c:55
+msgid "show info page"
+msgstr "perlihatkan halaman info"
+
+#: builtin/help.c:57
+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:163
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "format bantuan tidak dikenal '%s'"
+
+#: builtin/help.c:190
+msgid "Failed to start emacsclient."
+msgstr "gagal menjalankan emacsclient."
+
+#: builtin/help.c:203
+msgid "Failed to parse emacsclient version."
+msgstr "gagal menguraikan versi emacsclient."
+
+#: builtin/help.c:211
+#, 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
+#, c-format
+msgid "failed to exec '%s'"
+msgstr "gagal menjalankan '%s'"
+
+#: builtin/help.c:307
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s': jalur untuk pembaca man yang tidak didukung.\n"
+"Mohon gunakan 'man.<tool>.cmd' sebagai gantinya."
+
+#: builtin/help.c:319
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': cmd untuk pembaca man yang didukung.\n"
+"Mohon gunakan 'man.<tool>.path' sebagai gantinya."
+
+#: builtin/help.c:436
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s': pembaca man tidak dikenal"
+
+#: builtin/help.c:452
+msgid "no man viewer handled the request"
+msgstr "tidak ada pembaca man yang menangani permintaan"
+
+#: builtin/help.c:459
+msgid "no info viewer handled the request"
+msgstr "tidak ada pembaca info yang menangani permintaan"
+
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' dialiaskan ke '%s'"
+
+#: builtin/help.c:531 git.c:380
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr "untai alias.%s jelek: %s"
+
+#: builtin/help.c:561 builtin/help.c:591
+#, c-format
+msgid "usage: %s%s"
+msgstr "penggunaan: %s%s"
+
+#: builtin/help.c:575
+msgid "'git help config' for more information"
+msgstr "'git help config' untuk informasi lebih lanjut"
+
+#: builtin/index-pack.c:222
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "tipe objek tidak cocok pada %s"
+
+#: builtin/index-pack.c:242
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "tidak menerima objek yang diharapkan %s"
+
+#: builtin/index-pack.c:245
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "objek %s: yang diharapkan %s, yang didapat %s"
+
+#: builtin/index-pack.c:295
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:305
+msgid "early EOF"
+msgstr "EOF awal"
+
+#: builtin/index-pack.c:306
+msgid "read error on input"
+msgstr "kesalahan baca pada masukan"
+
+#: builtin/index-pack.c:318
+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: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
+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
+msgid "pack signature mismatch"
+msgstr "tanda tangan paket tidak cocok"
+
+#: builtin/index-pack.c:365
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "versi paket %<PRIu32> tidak didukung"
+
+#: builtin/index-pack.c:381
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "paket ada objek jelek pada offset %<PRIuMAX>: %s"
+
+#: builtin/index-pack.c:487
+#, c-format
+msgid "inflate returned %d"
+msgstr "inflate mengembalikan %d"
+
+#: builtin/index-pack.c:536
+msgid "offset value overflow for delta base object"
+msgstr "nilai offset meluap untuk objek basis delta"
+
+#: builtin/index-pack.c:544
+msgid "delta base offset is out of bound"
+msgstr "offset basis delta di luar jangkauan"
+
+#: builtin/index-pack.c:552
+#, c-format
+msgid "unknown object type %d"
+msgstr "tipe objek tidak diketahui %d"
+
+#: builtin/index-pack.c:583
+msgid "cannot pread pack file"
+msgstr "tidak dapat pread berkas paket"
+
+#: 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] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:611
+msgid "serious inflate inconsistency"
+msgstr "inkonsistensi inflate serius"
+
+#: 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 "TUMBUKAN SHA1 DITEMUKAN DENGAN %s !"
+
+#: 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 "tidak dapat membaca %s"
+
+#: builtin/index-pack.c:823
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "tidak dapat membaca info objek yang ada %s"
+
+#: builtin/index-pack.c:831
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "tidak dapat membaca objek yang ada %s"
+
+#: builtin/index-pack.c:845
+#, c-format
+msgid "invalid blob object %s"
+msgstr "objek blob tidak valid %s"
+
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
+msgid "fsck error in packed object"
+msgstr "kesalahan fsck dalam objek terpaket"
+
+#: builtin/index-pack.c:869
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "Tidak semua objek anak dari %s bisa dicapai"
+
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
+msgid "failed to apply delta"
+msgstr "gagal menerapkan delta"
+
+#: builtin/index-pack.c:1160
+msgid "Receiving objects"
+msgstr "Menerima objek"
+
+#: builtin/index-pack.c:1160
+msgid "Indexing objects"
+msgstr "Mengindeks objek"
+
+#: builtin/index-pack.c:1194
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "paket rusak (SHA1 tidak cocok)"
+
+#: builtin/index-pack.c:1199
+msgid "cannot fstat packfile"
+msgstr "tidak dapat fstat berkas paket"
+
+#: builtin/index-pack.c:1202
+msgid "pack has junk at the end"
+msgstr "paket memiliki sampah pada ujung"
+
+#: builtin/index-pack.c:1214
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "bingung di luar kegilaan di parse_pack_objects()"
+
+#: builtin/index-pack.c:1237
+msgid "Resolving deltas"
+msgstr "Menguraikan delta"
+
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "tidak dapat membuat utas: %s"
+
+#: builtin/index-pack.c:1281
+msgid "confusion beyond insanity"
+msgstr "bingung di luar kegilaan"
+
+#: builtin/index-pack.c:1287
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1299
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "Checksum ekor tidak diharapkan untuk %s (kerusakan disk?)"
+
+#: builtin/index-pack.c:1303
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1327
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "tidak dapat menggemboskan objek tertambah (%d)"
+
+#: builtin/index-pack.c:1423
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "objek lokal %s rusak"
+
+#: builtin/index-pack.c:1444
+#, c-format
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "nama berkas paket '%s' tidak diakhiri dengan '.%s'"
+
+#: builtin/index-pack.c:1468
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "tidak dapat menulis %s berkas '%s'"
+
+#: builtin/index-pack.c:1476
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "tidak dapat menutup %s berkas tertulis '%s'"
+
+#: builtin/index-pack.c:1502
+msgid "error while closing pack file"
+msgstr "kesalahan menutup berkas paket"
+
+#: builtin/index-pack.c:1516
+msgid "cannot store pack file"
+msgstr "tidak dapat menyimpan berkas paket"
+
+#: builtin/index-pack.c:1524
+msgid "cannot store index file"
+msgstr "tidak dapat menyimpan berkas indeks"
+
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "pack.indexversion=%<PRIu32> jelek"
+
+#: builtin/index-pack.c:1649
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "tidak dapat membuka berkas paket yang ada '%s'"
+
+#: builtin/index-pack.c:1651
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "tidak dapat membuka berkas indeks paket untuk '%s'"
+
+#: builtin/index-pack.c:1699
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1706
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/index-pack.c:1748
+msgid "Cannot come back to cwd"
+msgstr "tidak dapat kembali ke direktori kerja saat ini"
+
+#: 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 "%s jelek"
+
+#: builtin/index-pack.c:1831 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:1850
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin tidak dapat digunakan tanpa --stdin"
+
+#: builtin/index-pack.c:1852
+msgid "--stdin requires a git repository"
+msgstr "--stdin memerlukan repositori git"
+
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format tidak dapat digunakan dengan --stdin"
+
+#: builtin/index-pack.c:1869
+msgid "--verify with no packfile name given"
+msgstr "--verify tanpa nama berkas paket diberikan"
+
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+msgid "fsck error in pack objects"
+msgstr "kesalahan fsck dalam objek paket"
+
+#: builtin/init-db.c:63
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "tidak dapat men-stat templat '%s'"
+
+#: builtin/init-db.c:68
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "tidak dapat membuka direktori '%s'"
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "tidak dapat membaca tautan '%s'"
+
+#: builtin/init-db.c:82
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "tidak dapat menautkan simbolik '%s' '%s'"
+
+#: builtin/init-db.c:88
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "tidak dapat menyalin '%s' ke '%s'"
+
+#: builtin/init-db.c:92
+#, c-format
+msgid "ignoring template %s"
+msgstr "mengabaikan templat %s"
+
+#: builtin/init-db.c:123
+#, c-format
+msgid "templates not found in %s"
+msgstr "templat tidak ditemukan di %s"
+
+#: builtin/init-db.c:138
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "tidak menyalin templat dari '%s': %s"
+
+#: builtin/init-db.c:263
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nama cabang asal salah: '%s'"
+
+#: 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:357
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "tidak dapat memindahkan %s ke %s"
+
+#: 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:397 builtin/init-db.c:400
+#, c-format
+msgid "%s already exists"
+msgstr "%s sudah ada"
+
+#: 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: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: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: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: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:518
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<direktori-templat>][--"
+"shared[=<perizinan>]] [<direktori>]"
+
+#: builtin/init-db.c:544
+msgid "permissions"
+msgstr "perizinan"
+
+#: 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:551
+msgid "override the name of the initial branch"
+msgstr "timpa nama cabang asal"
+
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr ""
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir dan --bare saling eksklusif"
+
+#: builtin/init-db.c:591 builtin/init-db.c:596
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "tidak dapat membuat direktori %s"
+
+#: 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: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>)"
+
+#: builtin/init-db.c:679
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "Tidak dapat mengakses pohon kerja '%s'"
+
+#: builtin/init-db.c:684
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir tidak kompatibel dengan repositori bare"
+
+#: builtin/interpret-trailers.c:16
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+
+#: builtin/interpret-trailers.c:95
+msgid "edit files in place"
+msgstr ""
+
+#: builtin/interpret-trailers.c:96
+msgid "trim empty trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:99
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:101
+msgid "action if trailer already exists"
+msgstr ""
+
+#: builtin/interpret-trailers.c:103
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "output only the trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:106
+msgid "do not apply config rules"
+msgstr ""
+
+#: builtin/interpret-trailers.c:107
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:108
+msgid "set parsing options"
+msgstr ""
+
+#: builtin/interpret-trailers.c:110
+msgid "do not treat --- specially"
+msgstr ""
+
+#: builtin/interpret-trailers.c:112
+msgid "trailer(s) to add"
+msgstr ""
+
+#: builtin/interpret-trailers.c:123
+msgid "--trailer with --only-input does not make sense"
+msgstr ""
+
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
+msgstr ""
+
+#: builtin/log.c:59
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<opsi>] [<rentang revisi>] [[--] <jalur>...]"
+
+#: builtin/log.c:60
+msgid "git show [<options>] <object>..."
+msgstr "git show [<opsi>] <objek>..."
+
+#: builtin/log.c:113
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "opsi --decorate tidak valid: %s"
+
+#: builtin/log.c:180
+msgid "show source"
+msgstr "perlihatkan sumber"
+
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "gunakan berkas peta surat"
+
+#: builtin/log.c:184
+msgid "only decorate refs that match <pattern>"
+msgstr "hanya dekorasi referensi yang cocok dengan <pola>"
+
+#: builtin/log.c:186
+msgid "do not decorate refs that match <pattern>"
+msgstr "jangan dekorasi referensi yang cocok dengan <pola>"
+
+#: builtin/log.c:187
+msgid "decorate options"
+msgstr "opsi dekorasi"
+
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"lacak evolusi rentang baris <awal>,<akhir> atau fungsi :<nama fungsi> dalam "
+"<berkas>"
+
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<rentang>:<berkas> tidak dapat digunakan dengan spek jalur"
+
+#: builtin/log.c:306
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "Keluaran terakhir: %d %s\n"
+
+#: builtin/log.c:571
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: berkas jelek"
+
+#: builtin/log.c:586 builtin/log.c:676
+#, c-format
+msgid "could not read object %s"
+msgstr "tidak dapat membaca objek %s"
+
+#: builtin/log.c:701
+#, c-format
+msgid "unknown type: %d"
+msgstr "tipe tidak dikenal: %d"
+
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: sampul tidak valid dari mode deskripsi"
+
+#: builtin/log.c:853
+msgid "format.headers without value"
+msgstr "format.headers tanpa nilai"
+
+#: builtin/log.c:982
+#, c-format
+msgid "cannot open patch file %s"
+msgstr "tidak dapat membuka berkas tambalan %s"
+
+#: builtin/log.c:999
+msgid "need exactly one range"
+msgstr "butuh tepatnya satu rentang"
+
+#: builtin/log.c:1009
+msgid "not a range"
+msgstr "bukan sebuah rentang"
+
+#: builtin/log.c:1173
+msgid "cover letter needs email format"
+msgstr "sampul surat butuh format email"
+
+#: builtin/log.c:1179
+msgid "failed to create cover-letter file"
+msgstr "gagal membuat berkas sampul surat"
+
+#: builtin/log.c:1266
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "in-reply-to gila: %s"
+
+#: builtin/log.c:1293
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<opsi>] [<sejak> | <rentang revisi>]"
+
+#: builtin/log.c:1351
+msgid "two output directories?"
+msgstr "dua direktori keluaran?"
+
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#, c-format
+msgid "unknown commit %s"
+msgstr "komit tidak dikenal %s"
+
+#: 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 "gagal menguraikan '%s' sebagai referensi valid"
+
+#: builtin/log.c:1522
+msgid "could not find exact merge base"
+msgstr "tidak dapat menemukan dasar penggabungan eksak"
+
+#: 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"
+"Or you could specify base commit by --base=<base-commit-id> manually"
+msgstr ""
+"gagal mendapatkan hulu, jika Anda ingin merekam dasar komit secara "
+"otomatis,\n"
+"mohon gunakan git branch --set-upstream-to untuk melacak cabang remote.\n"
+"Atau Anda dapat menyebutkan dasar komit secara manual dengan --base=<id "
+"dasar komit>"
+
+#: builtin/log.c:1555
+msgid "failed to find exact merge base"
+msgstr "tidak dapat menemukan dasar penggabungan eksak"
+
+#: builtin/log.c:1572
+msgid "base commit should be the ancestor of revision list"
+msgstr "dasar komit seharusnya menjadi leluhur daftar revisi"
+
+#: builtin/log.c:1582
+msgid "base commit shouldn't be in revision list"
+msgstr "dasar komit tidak seharusnya dalam daftar revisi"
+
+#: builtin/log.c:1640
+msgid "cannot get patch id"
+msgstr "tidak dapat mendapatkan id tambalan"
+
+#: builtin/log.c:1703
+msgid "failed to infer range-diff origin of current series"
+msgstr "gagal menduga asal range-diff dari seri saat ini"
+
+#: builtin/log.c:1705
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "menggunakan '%s' sebagai asal range-diff dari seri saat ini"
+
+#: builtin/log.c:1749
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "gunakan [PATCH n/m] bahkan dengan satu tambalan"
+
+#: builtin/log.c:1752
+msgid "use [PATCH] even with multiple patches"
+msgstr "gunakan [PATCH] bahkan dengan banyak tambalan"
+
+#: builtin/log.c:1756
+msgid "print patches to standard out"
+msgstr "cetak tambalan ke keluaran standar"
+
+#: builtin/log.c:1758
+msgid "generate a cover letter"
+msgstr "buat sampul surat"
+
+#: builtin/log.c:1760
+msgid "use simple number sequence for output file names"
+msgstr "gunakan urutan bilangan sederhana untuk keluarkan nama berkas"
+
+#: builtin/log.c:1761
+msgid "sfx"
+msgstr "sfx"
+
+#: builtin/log.c:1762
+msgid "use <sfx> instead of '.patch'"
+msgstr "gunakan <akhiran> daripada '.patch'"
+
+#: builtin/log.c:1764
+msgid "start numbering patches at <n> instead of 1"
+msgstr "mulai menomorkan tambalan pada <n> daripada 1"
+
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr ""
+
+#: builtin/log.c:1766
+msgid "mark the series as Nth re-roll"
+msgstr "tandai seri sebagai gulung ulang ke-N"
+
+#: builtin/log.c:1768
+msgid "max length of output filename"
+msgstr "panjang nama berkas keluaran maksimum"
+
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "gunakan [RFC PATCH] daripada [PATCH]"
+
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr "cover-from-description-mode"
+
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "buat bagian dari sampul surat berdasarkan deskripsi cabang"
+
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "gunakan [<prefix>] daripada [PATCH]"
+
+#: builtin/log.c:1779
+msgid "store resulting files in <dir>"
+msgstr "simpan hasil berkas di <direktori>"
+
+#: builtin/log.c:1782
+msgid "don't strip/add [PATCH]"
+msgstr "jangan copot/tambah [PATCH]"
+
+#: builtin/log.c:1785
+msgid "don't output binary diffs"
+msgstr "jangan keluarkan diff biner"
+
+#: builtin/log.c:1787
+msgid "output all-zero hash in From header"
+msgstr "keluarkan hash semua-nol di kepala From"
+
+#: builtin/log.c:1789
+msgid "don't include a patch matching a commit upstream"
+msgstr "jangan termasuk tambalan yang cocok dengan komit hulu"
+
+#: builtin/log.c:1791
+msgid "show patch format instead of default (patch + stat)"
+msgstr "perlihatkan format tambalan daripada asali (tambalan + stat)"
+
+#: builtin/log.c:1793
+msgid "Messaging"
+msgstr "Perpesanan"
+
+#: builtin/log.c:1794
+msgid "header"
+msgstr "kepala"
+
+#: builtin/log.c:1795
+msgid "add email header"
+msgstr "tambahkan kepala email"
+
+#: builtin/log.c:1796 builtin/log.c:1797
+msgid "email"
+msgstr "email"
+
+#: builtin/log.c:1796
+msgid "add To: header"
+msgstr "tambahkan kepala To:"
+
+#: builtin/log.c:1797
+msgid "add Cc: header"
+msgstr "tambahkan kepala Cc:"
+
+#: builtin/log.c:1798
+msgid "ident"
+msgstr "ident"
+
+#: builtin/log.c:1799
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+"setel alamat From ke <identitas> (atau identitas pengkomit jika tidak ada)"
+
+#: builtin/log.c:1801
+msgid "message-id"
+msgstr "message-id"
+
+#: builtin/log.c:1802
+msgid "make first mail a reply to <message-id>"
+msgstr "buat surat pertama balasan ke <id pesan>"
+
+#: builtin/log.c:1803 builtin/log.c:1806
+msgid "boundary"
+msgstr "perbatasan"
+
+#: builtin/log.c:1804
+msgid "attach the patch"
+msgstr "lampirkan tambalan"
+
+#: builtin/log.c:1807
+msgid "inline the patch"
+msgstr "bariskan tambalan"
+
+#: builtin/log.c:1811
+msgid "enable message threading, styles: shallow, deep"
+msgstr "aktifkan utasan pesan, gaya: shallow, deep"
+
+#: builtin/log.c:1813
+msgid "signature"
+msgstr "tanda tangan"
+
+#: builtin/log.c:1814
+msgid "add a signature"
+msgstr "tambah tanda tangan"
+
+#: builtin/log.c:1815
+msgid "base-commit"
+msgstr "dasar komit"
+
+#: builtin/log.c:1816
+msgid "add prerequisite tree info to the patch series"
+msgstr "tambahkan info pohon prasyarat ke seri tambalan"
+
+#: builtin/log.c:1819
+msgid "add a signature from a file"
+msgstr "tambahkan tandatangan dari berkas"
+
+#: builtin/log.c:1820
+msgid "don't print the patch filenames"
+msgstr "jangan cetak nama berkas tambalan"
+
+#: builtin/log.c:1822
+msgid "show progress while generating patches"
+msgstr "perlihatkan perkembangan ketika membuat tambalan"
+
+#: builtin/log.c:1824
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+"perlihatkan perubahan terhadap <revisi> di sampul surat atau satu tambalan"
+
+#: builtin/log.c:1827
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+"perlihatkan perubahan terhadap <spek referensi> di sampul surat atau satu "
+"tambalan"
+
+#: builtin/log.c:1829 builtin/range-diff.c:28
+msgid "percentage by which creation is weighted"
+msgstr "persentase dimana pembuatan tertimbang"
+
+#: builtin/log.c:1916
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "baris identitas tidak valid: %s"
+
+#: builtin/log.c:1931
+msgid "-n and -k are mutually exclusive"
+msgstr "-n dan -k saling eksklusif"
+
+#: builtin/log.c:1933
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr "--subject-prefix/--rfc dan -k saling eksklusif"
+
+#: builtin/log.c:1941
+msgid "--name-only does not make sense"
+msgstr "--name-only tidak masuk akal"
+
+#: builtin/log.c:1943
+msgid "--name-status does not make sense"
+msgstr "--name-status tidak masuk akal"
+
+#: builtin/log.c:1945
+msgid "--check does not make sense"
+msgstr "--check tidak masuk akal"
+
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout, --output, dan --output-directory saling eksklusif"
+
+#: builtin/log.c:2089
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff butuh --cover-letter atau satu tambalan"
+
+#: builtin/log.c:2093
+msgid "Interdiff:"
+msgstr "Interdiff:"
+
+#: builtin/log.c:2094
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr "Interdiff terhadap v%d:"
+
+#: builtin/log.c:2100
+msgid "--creation-factor requires --range-diff"
+msgstr "--creation-factor butuh --range-diff"
+
+#: builtin/log.c:2104
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff butuh --cover-letter atau satu tambalan"
+
+#: builtin/log.c:2112
+msgid "Range-diff:"
+msgstr "Range-diff:"
+
+#: builtin/log.c:2113
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr "Range-diff terhadap v%d:"
+
+#: builtin/log.c:2124
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "tidak dapat membaca berkas tanda tangan '%s'"
+
+#: builtin/log.c:2160
+msgid "Generating patches"
+msgstr "Membuat tambalan"
+
+#: builtin/log.c:2204
+msgid "failed to create output files"
+msgstr "tidak dapat membuat berkas keluaran"
+
+#: builtin/log.c:2263
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<hulu> [<kepala> [<batas>]]]"
+
+#: builtin/log.c:2317
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"Tidak dapat menemukan cabang remote terlacak, mohon sebutkan <hulu>\n"
+"secara manual.\n"
+
+#: builtin/ls-files.c:563
+msgid "git ls-files [<options>] [<file>...]"
+msgstr ""
+
+#: builtin/ls-files.c:619
+msgid "identify the file status with tags"
+msgstr ""
+
+#: builtin/ls-files.c:621
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr ""
+
+#: builtin/ls-files.c:623
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr ""
+
+#: builtin/ls-files.c:625
+msgid "show cached files in the output (default)"
+msgstr ""
+
+#: builtin/ls-files.c:627
+msgid "show deleted files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:629
+msgid "show modified files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:631
+msgid "show other files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:633
+msgid "show ignored files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:636
+msgid "show staged contents' object name in the output"
+msgstr ""
+
+#: builtin/ls-files.c:638
+msgid "show files on the filesystem that need to be removed"
+msgstr ""
+
+#: builtin/ls-files.c:640
+msgid "show 'other' directories' names only"
+msgstr ""
+
+#: builtin/ls-files.c:642
+msgid "show line endings of files"
+msgstr ""
+
+#: builtin/ls-files.c:644
+msgid "don't show empty directories"
+msgstr ""
+
+#: builtin/ls-files.c:647
+msgid "show unmerged files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:649
+msgid "show resolve-undo information"
+msgstr ""
+
+#: builtin/ls-files.c:651
+msgid "skip files matching pattern"
+msgstr ""
+
+#: builtin/ls-files.c:654
+msgid "exclude patterns are read from <file>"
+msgstr ""
+
+#: builtin/ls-files.c:657
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+
+#: builtin/ls-files.c:659
+msgid "add the standard git exclusions"
+msgstr ""
+
+#: builtin/ls-files.c:663
+msgid "make the output relative to the project top directory"
+msgstr ""
+
+#: builtin/ls-files.c:666
+msgid "recurse through submodules"
+msgstr ""
+
+#: builtin/ls-files.c:668
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr ""
+
+#: builtin/ls-files.c:669
+msgid "tree-ish"
+msgstr ""
+
+#: builtin/ls-files.c:670
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+
+#: builtin/ls-files.c:672
+msgid "show debugging data"
+msgstr ""
+
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+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>...]]"
+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
+msgid "exec"
+msgstr ""
+
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
+msgid "path of git-upload-pack on the remote host"
+msgstr ""
+
+#: builtin/ls-remote.c:66
+msgid "limit to tags"
+msgstr ""
+
+#: builtin/ls-remote.c:67
+msgid "limit to heads"
+msgstr ""
+
+#: builtin/ls-remote.c:68
+msgid "do not show peeled tags"
+msgstr ""
+
+#: builtin/ls-remote.c:70
+msgid "take url.<base>.insteadOf into account"
+msgstr ""
+
+#: builtin/ls-remote.c:73
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr ""
+
+#: builtin/ls-remote.c:76
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr ""
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr ""
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr ""
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr ""
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr ""
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr ""
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr ""
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr ""
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr ""
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr ""
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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
+msgid "empty mbox: '%s'"
+msgstr ""
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr ""
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr ""
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr ""
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr ""
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr ""
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr ""
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr ""
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr ""
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr ""
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr ""
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr ""
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr ""
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr ""
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr ""
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr ""
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr ""
+
+#: 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] ""
+msgstr[1] ""
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr ""
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr ""
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr ""
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opsi>] [<komit>...]"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "tombol `m' butuh sebuah nilai"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "opsi `%s' butuh sebuah nilai"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Tidak dapat menemukan strategi penggabungan '%s'.\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Strategi yang tersedia:"
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Strategi kustom yang tersedia:"
+
+#: builtin/merge.c:256 builtin/pull.c:133
+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
+msgid "show a diffstat at the end of the merge"
+msgstr "perlihatkan diffstat pada akhir penggabungan"
+
+#: builtin/merge.c:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "(sinonim untuk --stat)"
+
+#: builtin/merge.c:262 builtin/pull.c:142
+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
+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
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "lakukan komit jika penggabungan sukses (asali)"
+
+#: builtin/merge.c:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "sunting pesan sebelum komit"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "perbolehkan maju cepat (asali)"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "batalkan jika maju cepat tidak dimungkinkan"
+
+#: builtin/merge.c:277 builtin/pull.c:164
+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
+msgid "strategy"
+msgstr "strategi"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "strategi penggabungan yang digunakan"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "opsi=nilai"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "opsi untuk strategi penggabungan yang dipilih"
+
+#: builtin/merge.c:283
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "pesan komit penggabungan (untuk penggabungan bukan maju cepat)"
+
+#: builtin/merge.c:290
+msgid "abort the current in-progress merge"
+msgstr "batalkan penggabungan yang sedang berlangsung saat ini"
+
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort tapi biarkan indeks dan pohon kerja"
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr "lanjutkan penggabungan yang sedang berlangsung saat ini"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "perbolehkan penggabungan riwayat yang tak terkait"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "lewati hook pre-merge-commit dan commit-msg"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "tidak dapat menjalankan stase."
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "stase gagal"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "bukan objek valid: %s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "read-tree gagal"
+
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
+msgstr "Sudah diperbarui. (tidak ada yang bisa dilumat)"
+
+#: builtin/merge.c:414
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Lumat komit -- tak perbarui HEAD\n"
+
+#: builtin/merge.c:464
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Tidak ada pesan komit -- tak perbarui HEAD\n"
+
+#: builtin/merge.c:515
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' tidak menunjuk pada sebuah komit"
+
+#: builtin/merge.c:603
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Untai branch.%s.mergeoptions jelek: %s"
+
+#: builtin/merge.c:729
+msgid "Not handling anything other than two heads merge."
+msgstr "Tak tangani apapun selain penggabungan dua kepala."
+
+#: builtin/merge.c:742
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Opsi merge-recursive tak dikenal: -X%s"
+
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#, c-format
+msgid "unable to write %s"
+msgstr "tidak dapat menulis %s"
+
+#: builtin/merge.c:813
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Tidak dapat membaca dari '%s'"
+
+#: builtin/merge.c:822
+#, 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: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"
+"\n"
+msgstr ""
+"Mohon masukkan pesan komit untuk jelaskan mengapa penggabungan ini\n"
+"diperlukan, khususnya jika itu menggabungkan hulu terbarui ke cabang\n"
+"topik.\n"
+
+#: builtin/merge.c:833
+msgid "An empty message aborts the commit.\n"
+msgstr "Pesan kosong membatalkan komit.\n"
+
+#: builtin/merge.c:836
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Baris yang diawali dengan '%c' akan diabaikan, dan pesan kosong batalkan\n"
+"komit.\n"
+
+#: builtin/merge.c:889
+msgid "Empty commit message."
+msgstr "Pesan komit kosong"
+
+#: builtin/merge.c:904
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Luar biasa.\n"
+
+#: builtin/merge.c:965
+#, 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:1004
+msgid "No current branch."
+msgstr "Tidak ada cabang saat ini."
+
+#: builtin/merge.c:1006
+msgid "No remote for the current branch."
+msgstr "Tidak ada remote untuk cabang saat ini."
+
+#: builtin/merge.c:1008
+msgid "No default upstream defined for the current branch."
+msgstr "Tidak ada hulu asali yang ditentukan untuk cabang saat ini."
+
+#: builtin/merge.c:1013
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "Tidak ada cabang pelacak remote untuk %s dari %s"
+
+#: builtin/merge.c:1070
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Nilai jelek '%s' dalam lingkungan '%s'"
+
+#: builtin/merge.c:1173
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "bukan sesuatu yang kami bisa gabungkan di %s: %s"
+
+#: builtin/merge.c:1207
+msgid "not something we can merge"
+msgstr "bukan sesuatu yang kami bisa gabungkan"
+
+#: builtin/merge.c:1317
+msgid "--abort expects no arguments"
+msgstr "--abort harap tanpa argumen"
+
+#: builtin/merge.c:1321
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Tidak ada penggabungan yang bisa dibatalkan (MERGE_HEAD hilang)."
+
+#: builtin/merge.c:1339
+msgid "--quit expects no arguments"
+msgstr "--quit harap tanpa argumen"
+
+#: builtin/merge.c:1352
+msgid "--continue expects no arguments"
+msgstr "--continue harap tanpa argumen"
+
+#: builtin/merge.c:1356
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Tidak ada penggabungan yang sedang berlangsung (MERGE_HEAD hilang)."
+
+#: builtin/merge.c:1372
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Anda belum mengakhiri penggabungan Anda (MERGE_HEAD ada).\n"
+"Mohon komit perubahan Anda sebelum Anda gabungkan."
+
+#: 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 ""
+"Anda belum mengakhiri pemetikan ceri Anda (CHERRY_PICK_HEAD ada).\n"
+"Mohon komit perubahan Anda sebelum Anda gabungkan."
+
+#: builtin/merge.c:1382
+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:1396
+msgid "You cannot combine --squash with --no-ff."
+msgstr "Anda tidak dapat menggabungkan --squash dengan --no-ff."
+
+#: builtin/merge.c:1398
+msgid "You cannot combine --squash with --commit."
+msgstr "Anda tidak dapat menggabungkan --squash dengan --commit"
+
+#: builtin/merge.c:1414
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+"Tidak ada komit yang disebutkan dan merge.defaultToUpstream tidak disetel."
+
+#: builtin/merge.c:1431
+msgid "Squash commit into empty head not supported yet"
+msgstr "Lumat komit ke kepala kosong belum didukung"
+
+#: builtin/merge.c:1433
+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:1438
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - bukan sesuatu yang kami bisa gabungkan"
+
+#: builtin/merge.c:1440
+msgid "Can merge only exactly one commit into empty head"
+msgstr "Hanya bisa menggabungkan tepantnya satu komit ke kepala kosong"
+
+#: builtin/merge.c:1521
+msgid "refusing to merge unrelated histories"
+msgstr "menolak menggabungkan riwayat tak terkait"
+
+#: builtin/merge.c:1540
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Memperbarui %s..%s\n"
+
+#: builtin/merge.c:1587
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Mencoba penggabungan dalam indeks yang sangat sepele\n"
+
+#: builtin/merge.c:1594
+#, c-format
+msgid "Nope.\n"
+msgstr "Tidak.\n"
+
+#: builtin/merge.c:1625
+msgid "Not possible to fast-forward, aborting."
+msgstr "Tidak mungkin untuk maju cepat, batalkan."
+
+#: builtin/merge.c:1653 builtin/merge.c:1719
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Memutar ulang pohon ke asli...\n"
+
+#: builtin/merge.c:1657
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Mencoba strategi penggabungan %s...\n"
+
+#: builtin/merge.c:1709
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Tidak ada strategi yang menangani penggabungan.\n"
+
+#: builtin/merge.c:1711
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Penggabungan dengan strategi %s gagal.\n"
+
+#: builtin/merge.c:1721
+#, c-format
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "Menggunakan strategi %s untuk menyiapkan penyelesaian dengan tangan.\n"
+
+#: builtin/merge.c:1735
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Penggabungan otomatis berjalan baik; berhenti sebelum mengkomit seperti yang "
+"diminta\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 ""
+
+#: 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 ""
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr ""
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr ""
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr ""
+
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr ""
+
+#: builtin/mktree.c:156
+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 ""
+
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
+msgstr ""
+
+#: builtin/multi-pack-index.c:16
+msgid "git multi-pack-index [<options>] expire"
+msgstr ""
+
+#: builtin/multi-pack-index.c:19
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr ""
+
+#: builtin/multi-pack-index.c:54
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
+
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr ""
+
+#: builtin/multi-pack-index.c:70
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr ""
+
+#: 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:179
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr ""
+
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<opsi>] <sumber>... <tujuan>"
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "Direktori %s di dalam indeks dan tidak ada submodul?"
+
+#: builtin/mv.c:85
+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/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s di dalam indeks"
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "paksa pindah/ganti nama bahkan jika target ada"
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr "lewati kesalahan pindah/ganti nama"
+
+#: builtin/mv.c:170
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "tujuan '%s' bukan direktori"
+
+#: builtin/mv.c:181
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "Memeriksa penamaan ulang '%s' ke '%s'\n"
+
+#: builtin/mv.c:185
+msgid "bad source"
+msgstr "sumber jelek"
+
+#: builtin/mv.c:188
+msgid "can not move directory into itself"
+msgstr "tidak dapat memindahkan direktori ke dirinya sendiri"
+
+#: builtin/mv.c:191
+msgid "cannot move directory over file"
+msgstr "tidak dapat memindahkan direktori ke berkas"
+
+#: builtin/mv.c:200
+msgid "source directory is empty"
+msgstr "direktori asal kosong"
+
+#: builtin/mv.c:225
+msgid "not under version control"
+msgstr "bukan dalam kontrol versi"
+
+#: builtin/mv.c:227
+msgid "conflicted"
+msgstr "terkonflik"
+
+#: builtin/mv.c:230
+msgid "destination exists"
+msgstr "tujuan ada"
+
+#: builtin/mv.c:238
+#, c-format
+msgid "overwriting '%s'"
+msgstr "menimpa '%s'"
+
+#: builtin/mv.c:241
+msgid "Cannot overwrite"
+msgstr "Tidak dapat menimpa"
+
+#: builtin/mv.c:244
+msgid "multiple sources for the same target"
+msgstr "banyak asal untuk target yang sama"
+
+#: builtin/mv.c:246
+msgid "destination directory does not exist"
+msgstr "direktori tujuan tidak ada"
+
+#: builtin/mv.c:253
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, source=%s, destination=%s"
+
+#: builtin/mv.c:274
+#, 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
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "gagal mengganti nama '%s'"
+
+#: builtin/name-rev.c:465
+msgid "git name-rev [<options>] <commit>..."
+msgstr ""
+
+#: builtin/name-rev.c:466
+msgid "git name-rev [<options>] --all"
+msgstr ""
+
+#: builtin/name-rev.c:467
+msgid "git name-rev [<options>] --stdin"
+msgstr ""
+
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr ""
+
+#: builtin/name-rev.c:525
+msgid "only use tags to name the commits"
+msgstr ""
+
+#: builtin/name-rev.c:527
+msgid "only use refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:529
+msgid "ignore refs matching <pattern>"
+msgstr ""
+
+#: builtin/name-rev.c:531
+msgid "list all commits reachable from all refs"
+msgstr ""
+
+#: builtin/name-rev.c:532
+msgid "read from stdin"
+msgstr ""
+
+#: builtin/name-rev.c:533
+msgid "allow to print `undefined` names (default)"
+msgstr ""
+
+#: builtin/name-rev.c:539
+msgid "dereference tags in the input (internal use)"
+msgstr ""
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:31
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr ""
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr ""
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr ""
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr ""
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr ""
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr ""
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr ""
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr ""
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr ""
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr ""
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr ""
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr ""
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr ""
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr ""
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr ""
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr ""
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr ""
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr ""
+
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr ""
+
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr ""
+
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr ""
+
+#: builtin/notes.c:242 builtin/tag.c:576
+#, 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
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr ""
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr ""
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr ""
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr ""
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
+#, 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
+msgid "too many arguments"
+msgstr ""
+
+#: builtin/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
+msgstr ""
+
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr ""
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr ""
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr ""
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr ""
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr ""
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr ""
+
+#: builtin/notes.c:448
+#, 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
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr ""
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr ""
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr ""
+
+#: builtin/notes.c:517
+msgid "too few arguments"
+msgstr ""
+
+#: builtin/notes.c:538
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+msgstr ""
+
+#: builtin/notes.c:550
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr ""
+
+#: builtin/notes.c:603
+#, 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
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr ""
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr ""
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr ""
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr ""
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr ""
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr ""
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr ""
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr ""
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr ""
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr ""
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr ""
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr ""
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr ""
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr ""
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr ""
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr ""
+
+#: builtin/notes.c:878
+#, 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 ""
+
+#: builtin/notes.c:897 builtin/tag.c:589
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr ""
+
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr ""
+
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr ""
+
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr ""
+
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+msgid "do not remove, show only"
+msgstr ""
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr ""
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr ""
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr ""
+
+#: builtin/notes.c:1034 builtin/stash.c:1735
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr ""
+
+#: builtin/pack-objects.c:182
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: builtin/pack-objects.c:183
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/pack-objects.c:591
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:722
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr ""
+
+#: builtin/pack-objects.c:941
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1036
+#, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1155
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr ""
+
+#: builtin/pack-objects.c:1168
+msgid "Writing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#, c-format
+msgid "failed to stat %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1281
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1523
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr ""
+
+#: builtin/pack-objects.c:1971
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1980
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2261
+msgid "Counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:2426
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr ""
+
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
+#, c-format
+msgid "object %s cannot be read"
+msgstr ""
+
+#: 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:2536
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2851
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2990
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3076
+msgid "Compressing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3082
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: 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:3164
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+
+#: builtin/pack-objects.c:3199
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3378
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3384
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3482
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+msgid "cannot open pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3572
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3658
+msgid "unable to force loose object"
+msgstr ""
+
+#: builtin/pack-objects.c:3788
+#, c-format
+msgid "not a rev '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#, c-format
+msgid "bad revision '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3819
+msgid "unable to add recent objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3872
+#, c-format
+msgid "unsupported index version %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3876
+#, c-format
+msgid "bad index version '%s'"
+msgstr ""
+
+#: builtin/pack-objects.c:3915
+msgid "<version>[,<offset>]"
+msgstr ""
+
+#: builtin/pack-objects.c:3916
+msgid "write the pack index file in the specified idx format version"
+msgstr ""
+
+#: builtin/pack-objects.c:3919
+msgid "maximum size of each output pack file"
+msgstr ""
+
+#: builtin/pack-objects.c:3921
+msgid "ignore borrowed objects from alternate object store"
+msgstr ""
+
+#: builtin/pack-objects.c:3923
+msgid "ignore packed objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3925
+msgid "limit pack window by objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3927
+msgid "limit pack window by memory in addition to object limit"
+msgstr ""
+
+#: builtin/pack-objects.c:3929
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3931
+msgid "reuse existing deltas"
+msgstr ""
+
+#: builtin/pack-objects.c:3933
+msgid "reuse existing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3935
+msgid "use OFS_DELTA objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3937
+msgid "use threads when searching for best delta matches"
+msgstr ""
+
+#: builtin/pack-objects.c:3939
+msgid "do not create an empty pack output"
+msgstr ""
+
+#: builtin/pack-objects.c:3941
+msgid "read revision arguments from standard input"
+msgstr ""
+
+#: builtin/pack-objects.c:3943
+msgid "limit the objects to those that are not yet packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3946
+msgid "include objects reachable from any reference"
+msgstr ""
+
+#: builtin/pack-objects.c:3949
+msgid "include objects referred by reflog entries"
+msgstr ""
+
+#: builtin/pack-objects.c:3952
+msgid "include objects referred to by the index"
+msgstr ""
+
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr ""
+
+#: builtin/pack-objects.c:3957
+msgid "output pack to stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:3959
+msgid "include tag objects that refer to objects to be packed"
+msgstr ""
+
+#: builtin/pack-objects.c:3961
+msgid "keep unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3963
+msgid "pack loose unreachable objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3965
+msgid "unpack unreachable objects newer than <time>"
+msgstr ""
+
+#: builtin/pack-objects.c:3968
+msgid "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3970
+msgid "create thin packs"
+msgstr ""
+
+#: builtin/pack-objects.c:3972
+msgid "create packs suitable for shallow fetches"
+msgstr ""
+
+#: builtin/pack-objects.c:3974
+msgid "ignore packs that have companion .keep file"
+msgstr ""
+
+#: builtin/pack-objects.c:3976
+msgid "ignore this pack"
+msgstr ""
+
+#: builtin/pack-objects.c:3978
+msgid "pack compression level"
+msgstr ""
+
+#: builtin/pack-objects.c:3980
+msgid "do not hide commits by grafts"
+msgstr ""
+
+#: builtin/pack-objects.c:3982
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3984
+msgid "write a bitmap index together with the pack index"
+msgstr ""
+
+#: builtin/pack-objects.c:3988
+msgid "write a bitmap index if possible"
+msgstr ""
+
+#: builtin/pack-objects.c:3992
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3995
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3997
+msgid "respect islands during delta compression"
+msgstr ""
+
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:4000
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:4033
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:4038
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:4094
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
+
+#: builtin/pack-objects.c:4096
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:4101
+msgid "--thin cannot be used to build an indexable pack"
+msgstr ""
+
+#: builtin/pack-objects.c:4104
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr ""
+
+#: builtin/pack-objects.c:4110
+msgid "cannot use --filter without --stdout"
+msgstr ""
+
+#: builtin/pack-objects.c:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr ""
+
+#: builtin/pack-objects.c:4116
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr ""
+
+#: builtin/pack-objects.c:4175
+msgid "Enumerating objects"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr ""
+
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr ""
+
+#: builtin/prune-packed.c:6
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr ""
+
+#: builtin/prune.c:14
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr ""
+
+#: builtin/prune.c:133
+msgid "report pruned objects"
+msgstr ""
+
+#: builtin/prune.c:136
+msgid "expire objects older than <time>"
+msgstr ""
+
+#: builtin/prune.c:138
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr ""
+
+#: builtin/prune.c:152
+msgid "cannot prune in a precious-objects repo"
+msgstr ""
+
+#: builtin/pull.c:45 builtin/pull.c:47
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Nilai tidak valid untuk %s: %s"
+
+#: builtin/pull.c:67
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<opsi>] [<repositori> [<spek referensi>]]"
+
+#: builtin/pull.c:123
+msgid "control for recursive fetching of submodules"
+msgstr "kontrol pengambilan rekursif submodul"
+
+#: builtin/pull.c:127
+msgid "Options related to merging"
+msgstr "Opsi yang berkaitan dengan penggabungan"
+
+#: builtin/pull.c:130
+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
+msgid "allow fast-forward"
+msgstr "perbolehkan maju cepat"
+
+#: builtin/pull.c:167 parse-options.h:340
+msgid "automatically stash/stash pop before and after"
+msgstr "stash/stash pop otomatis sebelum dan sesudah"
+
+#: builtin/pull.c:183
+msgid "Options related to fetching"
+msgstr "Opsi yang berkaitan dengan pengambilan"
+
+#: builtin/pull.c:193
+msgid "force overwrite of local branch"
+msgstr "paksa timpa cabang lokal"
+
+#: builtin/pull.c:201
+msgid "number of submodules pulled in parallel"
+msgstr "nomor submodul ditarik dalam paralel"
+
+#: builtin/pull.c:317
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "Nilai tidak valid untuk pull.ff: %s"
+
+#: builtin/pull.c:445
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr ""
+"Tidak ada kandidat untuk didasarkan ulang diantara referensi yang baru saja "
+"Anda ambil."
+
+#: builtin/pull.c:447
+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
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"Umumnya itu berarti Anda memberikan spek referensi wildcard yang tidak\n"
+"cocok pada ujung remote."
+
+#: 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 ""
+"Anda minta untuk tarik dari remote '%s', tapi tidak menyebutkan\n"
+"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
+msgid "You are not currently on a branch."
+msgstr "Anda tidak berada pada sebuah cabang."
+
+#: builtin/pull.c:458 builtin/pull.c:473
+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
+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
+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
+msgid "<remote>"
+msgstr "<remote>"
+
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+msgid "<branch>"
+msgstr "<cabang>"
+
+#: builtin/pull.c:471 builtin/rebase.c:1246
+msgid "There is no tracking information for the current branch."
+msgstr "Tidak ada informasi pelacakan untuk cabang saat ini."
+
+#: builtin/pull.c:480
+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
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"Konfigurasi Anda menyebutkan untuk menggabungkan dengan referensi '%s'\n"
+"dari remote, tapi tidak ada referensi seperti itu yang diambil."
+
+#: builtin/pull.c:596
+#, c-format
+msgid "unable to access commit %s"
+msgstr "Tidak dapat mengakses komit %s"
+
+#: builtin/pull.c:902
+msgid "ignoring --verify-signatures for rebase"
+msgstr "mengabaikan --verify-signatures untuk pendasaran ulang"
+
+#: 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 ""
+"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"
+"\n"
+"  git config pull.rebase false  # penggabungan (strategi asali)\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"
+"--rebase, --no-rebase, atau --ff-only pada baris perintah untuk menimpa\n"
+"asali terkonfigurasi untuk setiap invokasi.\n"
+
+#: builtin/pull.c:990
+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:994
+msgid "pull with rebase"
+msgstr "tarik dengan pendasaran ulang"
+
+#: builtin/pull.c:995
+msgid "please commit or stash them."
+msgstr "mohon komit atau stase itu."
+
+#: builtin/pull.c:1020
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"fetch memperbarui kepala cabang saat ini.\n"
+"memajukan-cepat pohon kerja Anda dari komit %s."
+
+#: builtin/pull.c:1026
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"Tidak dapat maju-cepat pohon kerja Anda.\n"
+"Setelah Anda yakin Anda simpan apapun yang penting dari keluaran\n"
+"$ git diff %s,\n"
+"jalankan\n"
+"$ git reset --hard\n"
+"untuk memulihkan."
+
+#: builtin/pull.c:1041
+msgid "Cannot merge multiple branches into empty head."
+msgstr "Tidak dapat menggabungkan banyak cabang ke kepala kosong."
+
+#: builtin/pull.c:1045
+msgid "Cannot rebase onto multiple branches."
+msgstr "Tidak dapat mendasarkan ulang pada banyak cabang."
+
+#: builtin/pull.c:1065
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+"tidak dapat mendasarkan ulang dengan modifikasi submodul yang terekam lokal."
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<opsi>] [<repositori> [<spek referensi>...]]"
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr "pintasan tag tanpa <tag>"
+
+#: builtin/push.c:119
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete hanya terima nama target referensi polos"
+
+#: builtin/push.c:164
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"Untuk memilih salah satu opsi secara permanen, lihat push.default di 'git "
+"help config'."
+
+#: builtin/push.c:167
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch.  To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+msgstr ""
+"Cabang hulu dari cabang Anda saat ini tidak cocok dengan \n"
+"nama cabang Anda saat ini. Untuk dorong ke cabang hulu pada remote,\n"
+"gunakan\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"Untuk dorong ke cabang bernama sama pada remote, gunakan\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+
+#: builtin/push.c:182
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+"    git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"Anda tidak berada pada cabang.\n"
+"Untuk dorong riwayat hingga kondisi saat ini (HEAD terlepas)\n"
+"sekarang, gunakan\n"
+"\n"
+"    git push %s HEAD:<nama-cabang-remote>\n"
+
+#: builtin/push.c:191
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+msgstr ""
+"Cabang saat ini %s tidak punya cabang hulu.\n"
+"Untuk dorong cabang saat ini dan setel remote sebagai hulu, gunakan\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+
+#: 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: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"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+"Anda sedang mendorong ke remote '%s', yang bukan hulu dari\n"
+"cabang Anda saat ini '%s', tanpa beri tahu saya apa yang harus\n"
+"didorong untuk perbarui cabang remote yang mana."
+
+#: 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 ""
+"Pembaruan ditolak karena ujung dari cabang Anda saat ini di belakang\n"
+"pasangan remotenya. Integrasikan perubahan remote (seperti\n"
+"'git pull') sebelum dorong lagi.\n"
+"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
+
+#: 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 ""
+"Pembaruan ditolak karena ujung dari cabang yang didorong di belakang\n"
+"pasangan remotenya. Check out cabang itu dan integrasikan perubahan\n"
+"remote (seperti 'git pull') sebelum dorong lagi.\n"
+"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
+
+#: 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"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Pembaruan ditolak karena remote berisi kerja yang Anda tidak punya\n"
+"di lokal. Ini biasanya disebabkan repositori yang lain dorong ke\n"
+"referensi yang sama. Mungkin Anda ingin integrasikan terlebih dahulu\n"
+"perubahan remote (seperti 'git pull') sebelum dorong lagi.\n"
+"Lihat 'Note about fast-forwards' di 'git push --help' untuk selengkapnya."
+
+#: 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: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 ""
+"Anda tidak dapat memperbarui referensi remote yang menunjuk ke objek\n"
+"non komit atau memperbarui referensi remote agar itu memnunjuk ke\n"
+"objek non komit, tanpa menggunakan opsi '--force'.\n"
+
+#: 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 ""
+"Pembaruan ditolak karena ujung dari cabang pelacak remote\n"
+"sudah diperbarui sejak checkout terakhir. Mungkin Anda ingin\n"
+"integrasikan perubahan tersebut ke lokal (seperti 'git pull...')\n"
+"sebelum memaksa pembaruan.\n"
+
+#: builtin/push.c:355
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Mendorong ke %s\n"
+
+#: builtin/push.c:362
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "gagal dorong beberapa referensi ke '%s'"
+
+#: builtin/push.c:544
+msgid "repository"
+msgstr "repositori"
+
+#: builtin/push.c:545 builtin/send-pack.c:189
+msgid "push all refs"
+msgstr "dorong semua referensi"
+
+#: builtin/push.c:546 builtin/send-pack.c:191
+msgid "mirror all refs"
+msgstr "cermin semua referensi"
+
+#: builtin/push.c:548
+msgid "delete refs"
+msgstr "hapus referensi"
+
+#: 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:552 builtin/send-pack.c:192
+msgid "force updates"
+msgstr "paksa pembaruan"
+
+#: builtin/push.c:553 builtin/send-pack.c:204
+msgid "<refname>:<expect>"
+msgstr "<nama referensi>:<harapan>"
+
+#: builtin/push.c:554 builtin/send-pack.c:205
+msgid "require old value of ref to be at this value"
+msgstr "memerlukan nilai lama referensi berada pada nilai saat ini"
+
+#: builtin/push.c:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "memerlukan pembaruan remote diintegrasikan ke lokal"
+
+#: builtin/push.c:560
+msgid "control recursive pushing of submodules"
+msgstr "kontrol dorong rekursif submodul"
+
+#: builtin/push.c:561 builtin/send-pack.c:199
+msgid "use thin pack"
+msgstr "gunakan paket tipis"
+
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
+msgid "receive pack program"
+msgstr "program terima paket"
+
+#: builtin/push.c:564
+msgid "set upstream for git pull/status"
+msgstr "setel hulu untuk git pull/status"
+
+#: builtin/push.c:567
+msgid "prune locally removed refs"
+msgstr "buang referensi terhapus lokal"
+
+#: builtin/push.c:569
+msgid "bypass pre-push hook"
+msgstr "lewati kait pra-dorong"
+
+#: builtin/push.c:570
+msgid "push missing but relevant tags"
+msgstr "dorong tag yang hilang tapi relevan"
+
+#: builtin/push.c:572 builtin/send-pack.c:193
+msgid "GPG sign the push"
+msgstr "Tandatangan GPG dorong"
+
+#: builtin/push.c:574 builtin/send-pack.c:200
+msgid "request atomic transaction on remote side"
+msgstr "minta transaksi atomik pada sisi remote"
+
+#: builtin/push.c:592
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete tidak kompatibel dengan --all, --mirror dan --tags "
+
+#: builtin/push.c:594
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete tidak masuk akal tanpa referensi"
+
+#: builtin/push.c:614
+#, c-format
+msgid "bad repository '%s'"
+msgstr "repositori jelek '%s'"
+
+#: 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"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"Tidak ada tujuan dorong terkonfigurasi.\n"
+"Baik sebutkan URL dari baris perintah atau konfigurasikan repositori remote "
+"dengan menggunakan\n"
+"\n"
+"    git remote add <nama> <url>\n"
+"\n"
+"dan dorong dengan menggunakan nama remote\n"
+"\n"
+"    git push <nama>\n"
+
+#: builtin/push.c:630
+msgid "--all and --tags are incompatible"
+msgstr "--all dan --tags tidak kompatibel"
+
+#: builtin/push.c:632
+msgid "--all can't be combined with refspecs"
+msgstr "--all tidak dapat digabung dengan spek referensi"
+
+#: builtin/push.c:636
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror dan --tags tidak kompatibel"
+
+#: builtin/push.c:638
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror tidak dapat digabungkan dengan spek referensi"
+
+#: builtin/push.c:641
+msgid "--all and --mirror are incompatible"
+msgstr "--all dan --mirror tidak kompatibel"
+
+#: builtin/push.c:648
+msgid "push options must not have new line characters"
+msgstr "opsi dorong harus tidak ada karakter baris baru"
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:11
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:30
+msgid "use simple diff colors"
+msgstr ""
+
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr ""
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr ""
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr ""
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr ""
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr ""
+
+#: builtin/range-diff.c:74
+msgid "single arg format must be symmetric range"
+msgstr ""
+
+#: builtin/range-diff.c:89
+msgid "need two commit ranges"
+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>]])"
+msgstr ""
+
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr ""
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr ""
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr ""
+
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr ""
+
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr ""
+
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr ""
+
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr ""
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr ""
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr ""
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr ""
+
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr ""
+
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr ""
+
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr ""
+
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr ""
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr ""
+
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr ""
+
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr ""
+
+#: builtin/rebase.c:35
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+"git rebase [-i] [opsi] [--exec <perintah>] [--onto <basis baru> | --keep-"
+"base][<hulu> [<cabang>]]"
+
+#: builtin/rebase.c:37
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [opsi] [--exec <perintah>] [--onto <basis baru>] --root "
+"[<cabang>]"
+
+#: 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 "daftar todo tidak dapat digunakan: '%s'"
+
+#: builtin/rebase.c:311
+#, c-format
+msgid "could not create temporary %s"
+msgstr "tidak dapat membuat %s sementara"
+
+#: builtin/rebase.c:317
+msgid "could not mark as interactive"
+msgstr "tidak dapat menandai sebagai interaktif"
+
+#: builtin/rebase.c:370
+msgid "could not generate todo list"
+msgstr "tidak dapat membuat daftar todo"
+
+#: builtin/rebase.c:412
+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
+#, c-format
+msgid "%s requires the merge backend"
+msgstr "%s butuh tulang belakang penggabungan"
+
+#: builtin/rebase.c:625
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "tidak dapat mendapatkan 'ke': '%s'"
+
+#: builtin/rebase.c:642
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "orig-head tidak valid: '%s'"
+
+#: builtin/rebase.c:667
+#, 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
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+"Selesaikan semua konflik secara manual, tandai sebagai terselesaikan\n"
+"dengan \"git add/rm <berkas terkonflik>\", lalu jalankan\n"
+"\"git rebase --continue\".\n"
+"Anda juga bisa melewatkan komit ini: jalankan \"git rebase --skip\".\n"
+"Untuk membatalkan dan kembali ke kondisi sebelum \"git rebase\",jalankan "
+"\"git rebase --abort\"."
+
+#: builtin/rebase.c:896
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+"    %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"git menemui kesalahan ketika menyiapan tambalan untuk memainkan ulang\n"
+"revisi berikut:\n"
+"\n"
+"    %s\n"
+"\n"
+"Hasilnya git tidak dapat mendasarkan ulang itu."
+
+#: builtin/rebase.c:1222
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"tipe kosong tak dikenali '%s'; nilai yang valid adalah \"drop\", \"keep\", "
+"dan \"ask\"."
+
+#: builtin/rebase.c:1240
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+msgstr ""
+"%s\n"
+"Mohon sebutkan cabang mana yang Anda ingin dasarkan ulang.\n"
+"Lihat git-rebase(1) untuk selengkapnya.\n"
+"\n"
+"    git rebase '<cabang>'.\n"
+"\n"
+
+#: builtin/rebase.c:1256
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
+"Kalau Anda ingin menyetel informasi pelacakan untuk cabang ini Anda\n"
+"dapat melakukan hal itu dengan:\n"
+"    git branch --set-upstream-to=%s/<cabang> %s\n"
+"\n"
+
+#: builtin/rebase.c:1286
+msgid "exec commands cannot contain newlines"
+msgstr "perintah exec tidak dapat berisi baris baru"
+
+#: builtin/rebase.c:1290
+msgid "empty exec command"
+msgstr "perintah exec kosong"
+
+#: builtin/rebase.c:1319
+msgid "rebase onto given branch instead of upstream"
+msgstr "dasarkan ulang kepada cabang yang diberikan daripada hulu"
+
+#: builtin/rebase.c:1321
+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
+msgid "allow pre-rebase hook to run"
+msgstr "perbolehkan hook pre-rebase untuk dijalankan"
+
+#: builtin/rebase.c:1325
+msgid "be quiet. implies --no-stat"
+msgstr "diam. menyiratkan --no-stat"
+
+#: builtin/rebase.c:1331
+msgid "do not show diffstat of what changed upstream"
+msgstr "jangan perlihatkan diffstat apa yang berubah di hulu"
+
+#: builtin/rebase.c:1334
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "tambahkan trailer Signed-off-by ke setiap komit"
+
+#: builtin/rebase.c:1337
+msgid "make committer date match author date"
+msgstr "jadikan tanggal pengkomit sama dengan tanggal pengarang"
+
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr "abaikan tanggal pengarang dan gunakan tanggal saat ini"
+
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr "sinonim dari --reset-author-date"
+
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
+msgid "passed to 'git apply'"
+msgstr "lewatkan ke 'git apply'"
+
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr "abaikan perubahan spasi"
+
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "petik ceri semua komit, bahkan jika tak berubah"
+
+#: builtin/rebase.c:1354
+msgid "continue"
+msgstr "lanjutkan"
+
+#: builtin/rebase.c:1357
+msgid "skip current patch and continue"
+msgstr "lewatkan tambalan saat ini dan lanjutkan"
+
+#: builtin/rebase.c:1359
+msgid "abort and check out the original branch"
+msgstr "hentikan dan check out cabang asli"
+
+#: builtin/rebase.c:1362
+msgid "abort but keep HEAD where it is"
+msgstr "hentikan tapi simpan HEAD dimana itu berada"
+
+#: builtin/rebase.c:1363
+msgid "edit the todo list during an interactive rebase"
+msgstr "sunting daftar todo selama pendasaran ulang interaktif"
+
+#: builtin/rebase.c:1366
+msgid "show the patch file being applied or merged"
+msgstr "perlihatkan berkas tambalan yang sedang diterapkan atau digabungkan"
+
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "gunakan strategi penerapan ke pendasaran ulang"
+
+#: builtin/rebase.c:1373
+msgid "use merging strategies to rebase"
+msgstr "gunakan strategi penggabungan ke pendasaran ulang"
+
+#: builtin/rebase.c:1377
+msgid "let the user edit the list of commits to rebase"
+msgstr "biarkan pengguna menyunting daftar komit untuk didasarkan ulang"
+
+#: builtin/rebase.c:1381
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "(USANG) coba buat ulang penggabungan daripada abaikan itu"
+
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
+msgstr "bagaimana cara menangani komit yang menjadi kosong"
+
+#: builtin/rebase.c:1393
+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
+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
+msgid "allow rebasing commits with empty messages"
+msgstr "perbolehkan mendasarkan ulang komit dengan pesan kosong"
+
+#: builtin/rebase.c:1408
+msgid "try to rebase merges instead of skipping them"
+msgstr "coba mendasarkan ulang penggabungan daripada melewatkan itu"
+
+#: builtin/rebase.c:1411
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "gunakan 'merge-base --fork-point' untuk menyaring hulu"
+
+#: builtin/rebase.c:1413
+msgid "use the given merge strategy"
+msgstr "gunakan strategi penggabungan yang diberikan"
+
+#: builtin/rebase.c:1415 builtin/revert.c:115
+msgid "option"
+msgstr "opsi"
+
+#: builtin/rebase.c:1416
+msgid "pass the argument through to the merge strategy"
+msgstr "lewatkan argumen ke strategi penggabungan"
+
+#: builtin/rebase.c:1419
+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
+msgid "apply all changes, even those already present upstream"
+msgstr "terapkan semua perubahan, bahkan yang sudah ada di hulu"
+
+#: builtin/rebase.c:1442
+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:1494
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "tidak dapat menggabungkan '--root' dengan '--fork-point'"
+
+#: builtin/rebase.c:1497
+msgid "No rebase in progress?"
+msgstr "Tidak ada pendasaran ulang yang sedang berjalan?"
+
+#: builtin/rebase.c:1501
+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:122
+msgid "Cannot read HEAD"
+msgstr "Tidak dapat membaca HEAD"
+
+#: builtin/rebase.c:1536
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"Anda harus menyunting semua konflik penggabungan lalu\n"
+"tandai itu sebagai terselesaikan menggunakan git add"
+
+#: builtin/rebase.c:1555
+msgid "could not discard worktree changes"
+msgstr "tidak dapat menyingkirkan perubahan pohon kerja"
+
+#: builtin/rebase.c:1574
+#, c-format
+msgid "could not move back to %s"
+msgstr "tidak dapt memindahkan kembali ke %s"
+
+#: 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"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+"Sepertinya sudah ada direktori %s, dan saya ingin tahu kalau Anda\n"
+"berada di tengah-tengah pendasaran ulang yang lain. Jika itu maksudnya,\n"
+"mohon coba \n"
+"\t%s\n"
+"Jika itu bukan, mohon\n"
+"\t%s\n"
+"dan jalankan saya lagi. Saya berhenti seandainya Anda masih punya\n"
+"sesuatu yang berharga di sana.\n"
+
+#: builtin/rebase.c:1648
+msgid "switch `C' expects a numerical value"
+msgstr "tombol `C' harap nilai numerik"
+
+#: builtin/rebase.c:1690
+#, c-format
+msgid "Unknown mode: %s"
+msgstr "Mode tidak dikenal: %s"
+
+#: builtin/rebase.c:1729
+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:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Tulang belakang pendasaran ulang tidak dikenal: %s"
+
+#: builtin/rebase.c:1802
+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
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "hulu tidak valid '%s'"
+
+#: builtin/rebase.c:1856
+msgid "Could not create new root commit"
+msgstr "tidak dapat membuat komit akar baru"
+
+#: builtin/rebase.c:1882
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s': butuh tepatnya satu dasar penggabungan dengan cabang"
+
+#: builtin/rebase.c:1885
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "'%s': butuh tepatnya satu dasar penggabungan"
+
+#: builtin/rebase.c:1893
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "Tidak menunjuk pada komit yang valid '%s'"
+
+#: builtin/rebase.c:1921
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "fatal: tidak ada cabang/komit seperti '%s'"
+
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
+#, c-format
+msgid "No such ref: %s"
+msgstr "Tidak ada referensi seperti: %s"
+
+#: builtin/rebase.c:1940
+msgid "Could not resolve HEAD to a revision"
+msgstr "Tidak dapat menguraikan HEAD ke sebuah revisi"
+
+#: builtin/rebase.c:1961
+msgid "Please commit or stash them."
+msgstr "Mohon komit atau stase itu."
+
+#: builtin/rebase.c:1997
+#, c-format
+msgid "could not switch to %s"
+msgstr "tidak dapat mengganti ke %s"
+
+#: builtin/rebase.c:2008
+msgid "HEAD is up to date."
+msgstr "HEAD terbaru."
+
+#: builtin/rebase.c:2010
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "Cabang saat ini %s terbaru.\n"
+
+#: builtin/rebase.c:2018
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD terbaru, pendasaran ulang dipaksa."
+
+#: builtin/rebase.c:2020
+#, 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
+msgid "The pre-rebase hook refused to rebase."
+msgstr "Hook pre-rebase menolak mendasarkan ulang."
+
+#: builtin/rebase.c:2035
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "Perubahan unuk %s:\n"
+
+#: builtin/rebase.c:2038
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "Perubahan dari %s ke %s:\n"
+
+#: builtin/rebase.c:2063
+#, 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
+msgid "Could not detach HEAD"
+msgstr "Tidak dapat melepas HEAD"
+
+#: builtin/rebase.c:2081
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "Maju-cepat %s ke %s.\n"
+
+#: builtin/receive-pack.c:34
+msgid "git receive-pack <git-dir>"
+msgstr ""
+
+#: 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"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+
+#: 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"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+
+#: builtin/receive-pack.c:2478
+msgid "quiet"
+msgstr ""
+
+#: builtin/receive-pack.c:2492
+msgid "You must specify a directory."
+msgstr ""
+
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr ""
+
+#: builtin/reflog.c:568 builtin/reflog.c:573
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr ""
+
+#: builtin/reflog.c:609
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:647
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
+
+#: builtin/reflog.c:699
+msgid "no reflog specified to delete"
+msgstr ""
+
+#: builtin/reflog.c:708
+#, c-format
+msgid "not a reflog: %s"
+msgstr ""
+
+#: builtin/reflog.c:713
+#, c-format
+msgid "no reflog for '%s'"
+msgstr ""
+
+#: builtin/reflog.c:759
+#, c-format
+msgid "invalid ref format: %s"
+msgstr ""
+
+#: builtin/reflog.c:768
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
+#: builtin/remote.c:17
+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 <cabang>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nama> <url>"
+
+#: builtin/remote.c:19 builtin/remote.c:39
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <lama> <baru>"
+
+#: builtin/remote.c:20 builtin/remote.c:44
+msgid "git remote remove <name>"
+msgstr "git remote remove <nama>"
+
+#: builtin/remote.c:21 builtin/remote.c:49
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <nama> (-a | --auto | -d | --delete | <cabang>)"
+
+#: builtin/remote.c:22
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <nama>"
+
+#: builtin/remote.c:23
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <nama>"
+
+#: builtin/remote.c:24
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <remote>)...]"
+
+#: builtin/remote.c:25
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <nama> <cabang>..."
+
+#: builtin/remote.c:26 builtin/remote.c:75
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <nama>"
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <nama> <url baru> [<url lama>]"
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <nama> <url baru>"
+
+#: builtin/remote.c:29 builtin/remote.c:82
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <nama> <url>"
+
+#: builtin/remote.c:34
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<opsi>] <nama> <url>"
+
+#: builtin/remote.c:54
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <nama> <cabang>"
+
+#: builtin/remote.c:55
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <nama> <cabang>"
+
+#: builtin/remote.c:60
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<opsi>] <nama>"
+
+#: builtin/remote.c:65
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<opsi>] <nama>"
+
+#: builtin/remote.c:70
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<opsi>] [<group> | <remote>]..."
+
+#: builtin/remote.c:99
+#, c-format
+msgid "Updating %s"
+msgstr "Memperbarui %s"
+
+#: builtin/remote.c:131
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"--mirror berbahaya dan usang; mohon gunakan --mirror=fetch\n"
+"\t atau --mirror=push sebagai gantinya"
+
+#: builtin/remote.c:148
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "argumen mirror tidak dikenal: %s"
+
+#: builtin/remote.c:164
+msgid "fetch the remote branches"
+msgstr "ambil cabang remote"
+
+#: builtin/remote.c:166
+msgid "import all tags and associated objects when fetching"
+msgstr "impor semua tag dan objek yang terkait ketika mengambil"
+
+#: builtin/remote.c:169
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "atau jangan mengambil tag apapun (--no-tags)"
+
+#: builtin/remote.c:171
+msgid "branch(es) to track"
+msgstr "cabang untuk dilacak"
+
+#: builtin/remote.c:172
+msgid "master branch"
+msgstr "cabang master"
+
+#: builtin/remote.c:174
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr "atur remote sebagai cermin untuk didorong atau diambil"
+
+#: builtin/remote.c:186
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "menyebutkan cabang master tidak masuk akal dengan --mirror"
+
+#: builtin/remote.c:188
+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
+#, c-format
+msgid "remote %s already exists."
+msgstr "remote %s sudah ada"
+
+#: builtin/remote.c:240
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "Tidak dapat mengatur master '%s'"
+
+#: builtin/remote.c:355
+#, 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
+msgid "(matching)"
+msgstr "(sepadan)"
+
+#: builtin/remote.c:466
+msgid "(delete)"
+msgstr "(hapus)"
+
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "tidak dapat menyetel '%s'"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Konfigurasi %s remote.pushDefault di:\n"
+"\t%s:%d\n"
+"sekarang menamai remote yang tiada '%s'"
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#, c-format
+msgid "No such remote: '%s'"
+msgstr "Tidak ada remote seperti: '%s'"
+
+#: builtin/remote.c:710
+#, 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
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"Tidak memperbarui spek referensi pengambilan bukan asali\n"
+"\t%s\n"
+"\tMohon perbarui konfigurasi secara manual bila diperlukan."
+
+#: builtin/remote.c:770
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "menghapus '%s' gagal"
+
+#: builtin/remote.c:804
+#, c-format
+msgid "creating '%s' failed"
+msgstr "membuat '%s' gagal"
+
+#: builtin/remote.c:882
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+"Catatan: Sebuah cabang diluar hierarki refs/remotes tidak dihapus;\n"
+"untuk menghapus itu, gunakan:"
+msgstr[1] ""
+"Catatan: Beberapa cabang diluar hierarki refs/remotes tidak dihapus;\n"
+"untuk menghapus itu, gunakan:"
+
+#: builtin/remote.c:896
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "Tidak dapat menghapus bagian konfigurasi '%s'"
+
+#: builtin/remote.c:999
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " baru (pengambilan berikutnya akan simpan di remotes/%s)"
+
+#: builtin/remote.c:1002
+msgid " tracked"
+msgstr " dilacak"
+
+#: builtin/remote.c:1004
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " basi (gunakan 'git remote prune' untuk hapus)"
+
+#: builtin/remote.c:1006
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:1047
+#, 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
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "dasarkan ulang secara interaktif ke remote %s"
+
+#: builtin/remote.c:1058
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "dasarkan ulang secara interaktif (dengan penggabungan) ke remote %s"
+
+#: builtin/remote.c:1061
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "dasarkan ulang ke remote %s"
+
+#: builtin/remote.c:1065
+#, c-format
+msgid " merges with remote %s"
+msgstr " gabungkan dengan remote %s"
+
+#: builtin/remote.c:1068
+#, c-format
+msgid "merges with remote %s"
+msgstr "gabungkan dengan remote %s"
+
+#: builtin/remote.c:1071
+#, c-format
+msgid "%-*s    and with remote %s\n"
+msgstr "%-*s    dan dengan remote %s\n"
+
+#: builtin/remote.c:1114
+msgid "create"
+msgstr "buat"
+
+#: builtin/remote.c:1117
+msgid "delete"
+msgstr "hapus"
+
+#: builtin/remote.c:1121
+msgid "up to date"
+msgstr "terbaru"
+
+#: builtin/remote.c:1124
+msgid "fast-forwardable"
+msgstr "bisa dimaju cepat"
+
+#: builtin/remote.c:1127
+msgid "local out of date"
+msgstr "lokal kuno"
+
+#: builtin/remote.c:1134
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr "    %-*s memaksa untuk %-*s (%s)"
+
+#: builtin/remote.c:1137
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr "    %-*s mendorong ke %-*s (%s)"
+
+#: builtin/remote.c:1141
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr "    %-*s memaksa untuk %s"
+
+#: builtin/remote.c:1144
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr "    %-*s mendorong ke %s"
+
+#: builtin/remote.c:1212
+msgid "do not query remotes"
+msgstr "jangan tanyakan remote"
+
+#: builtin/remote.c:1239
+#, c-format
+msgid "* remote %s"
+msgstr "* remote %s"
+
+#: builtin/remote.c:1240
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr "  URL pengambilan: %s"
+
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+msgid "(no URL)"
+msgstr "(tidak ada URL)"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1255 builtin/remote.c:1257
+#, c-format
+msgid "  Push  URL: %s"
+msgstr "  URL pendorongan: %s"
+
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#, c-format
+msgid "  HEAD branch: %s"
+msgstr "  Cabang HEAD: %s"
+
+#: builtin/remote.c:1259
+msgid "(not queried)"
+msgstr "(tidak ditanyakan)"
+
+#: builtin/remote.c:1261
+msgid "(unknown)"
+msgstr "(tidak diketahui)"
+
+#: builtin/remote.c:1265
+#, 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
+#, 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
+msgid " (status not queried)"
+msgstr " (status tidak ditanyakan)"
+
+#: builtin/remote.c:1289
+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
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr "  Referensi lokal yang akan dicerminkan oleh 'git push'"
+
+#: builtin/remote.c:1303
+#, 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
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "setel refs/remotes/<nama>/HEAD tergantung remote"
+
+#: builtin/remote.c:1326
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "hapus refs/remotes/<nama>/HEAD"
+
+#: builtin/remote.c:1341
+msgid "Cannot determine remote HEAD"
+msgstr "Tidak dapat menentukan HEAD remote"
+
+#: builtin/remote.c:1343
+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
+#, c-format
+msgid "Could not delete %s"
+msgstr "Tidak dapat menghapus %s"
+
+#: builtin/remote.c:1361
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "Bukan referensi valid: %s"
+
+#: builtin/remote.c:1363
+#, c-format
+msgid "Could not setup %s"
+msgstr "Tidak dapat mengatur %s"
+
+#: builtin/remote.c:1381
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %s akan menjadi teruntai!"
+
+#: builtin/remote.c:1382
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %s telah menjadi teruntai!"
+
+#: builtin/remote.c:1392
+#, c-format
+msgid "Pruning %s"
+msgstr "Memangkas %s"
+
+#: builtin/remote.c:1393
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: builtin/remote.c:1409
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [akan pangkas] %s"
+
+#: builtin/remote.c:1412
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [dipangkas] %s"
+
+#: builtin/remote.c:1457
+msgid "prune remotes after fetching"
+msgstr "pangkas remote setelah pengambilan"
+
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#, c-format
+msgid "No such remote '%s'"
+msgstr "Tidak ada remote seperti '%s'"
+
+#: builtin/remote.c:1539
+msgid "add branch"
+msgstr "tambah cabang"
+
+#: builtin/remote.c:1546
+msgid "no remote specified"
+msgstr "tidak ada remote yang disebutkan"
+
+#: builtin/remote.c:1563
+msgid "query push URLs rather than fetch URLs"
+msgstr "tanyakan URL pendorongan daripada URL pengambilan"
+
+#: builtin/remote.c:1565
+msgid "return all URLs"
+msgstr "kembalikan semua URL"
+
+#: builtin/remote.c:1595
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "tidak ada URL yang dikonfigurasi untuk remote '%s'"
+
+#: builtin/remote.c:1621
+msgid "manipulate push URLs"
+msgstr "manipulasi URL pendorongan"
+
+#: builtin/remote.c:1623
+msgid "add URL"
+msgstr "tambah URL"
+
+#: builtin/remote.c:1625
+msgid "delete URLs"
+msgstr "hapus URL"
+
+#: builtin/remote.c:1632
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete tidak masuk akal"
+
+#: builtin/remote.c:1673
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "pola URL lama tidak valid: %s"
+
+#: builtin/remote.c:1681
+#, c-format
+msgid "No such URL found: %s"
+msgstr "Tidak ada URL yang ditemukan seperti: %s"
+
+#: builtin/remote.c:1683
+msgid "Will not delete all non-push URLs"
+msgstr "Tidak akan hapus semua URL non-dorong"
+
+#: builtin/repack.c:26
+msgid "git repack [<options>]"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/repack.c:198
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:270 builtin/repack.c:630
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:294
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/repack.c:462
+msgid "same as -a, and turn unreachable objects loose"
+msgstr ""
+
+#: builtin/repack.c:465
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr ""
+
+#: builtin/repack.c:467
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:469
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:471
+msgid "do not run git-update-server-info"
+msgstr ""
+
+#: builtin/repack.c:474
+msgid "pass --local to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:476
+msgid "write bitmap index"
+msgstr ""
+
+#: builtin/repack.c:478
+msgid "pass --delta-islands to git-pack-objects"
+msgstr ""
+
+#: builtin/repack.c:479
+msgid "approxidate"
+msgstr ""
+
+#: builtin/repack.c:480
+msgid "with -A, do not loosen objects older than this"
+msgstr ""
+
+#: builtin/repack.c:482
+msgid "with -a, repack unreachable objects"
+msgstr ""
+
+#: builtin/repack.c:484
+msgid "size of the window used for delta compression"
+msgstr ""
+
+#: builtin/repack.c:485 builtin/repack.c:491
+msgid "bytes"
+msgstr ""
+
+#: builtin/repack.c:486
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+
+#: builtin/repack.c:488
+msgid "limits the maximum delta depth"
+msgstr ""
+
+#: builtin/repack.c:490
+msgid "limits the maximum number of threads"
+msgstr ""
+
+#: builtin/repack.c:492
+msgid "maximum size of each packfile"
+msgstr ""
+
+#: builtin/repack.c:494
+msgid "repack objects in packs marked with .keep"
+msgstr ""
+
+#: builtin/repack.c:496
+msgid "do not repack this pack"
+msgstr ""
+
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr ""
+
+#: 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:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr ""
+
+#: builtin/repack.c:639
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:669
+#, c-format
+msgid "missing required file: %s"
+msgstr ""
+
+#: builtin/repack.c:671
+#, c-format
+msgid "could not unlink: %s"
+msgstr ""
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr ""
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr ""
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr ""
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr ""
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr ""
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr ""
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr ""
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr ""
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr ""
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr ""
+
+#: builtin/replace.c:178
+#, 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 ""
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr ""
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr ""
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr ""
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr ""
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr ""
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr ""
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr ""
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr ""
+
+#: builtin/replace.c:303
+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
+#, c-format
+msgid "unable to get object type for %s"
+msgstr ""
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr ""
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:384
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr ""
+
+#: builtin/replace.c:416
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:418
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr ""
+
+#: builtin/replace.c:430
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+
+#: builtin/replace.c:469
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr ""
+
+#: builtin/replace.c:470
+msgid "the signature will be removed in the replacement commit!"
+msgstr ""
+
+#: builtin/replace.c:480
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr ""
+
+#: builtin/replace.c:488
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr ""
+
+#: builtin/replace.c:492
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:527
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+
+#: builtin/replace.c:548
+msgid "list replace refs"
+msgstr ""
+
+#: builtin/replace.c:549
+msgid "delete replace refs"
+msgstr ""
+
+#: builtin/replace.c:550
+msgid "edit existing object"
+msgstr ""
+
+#: builtin/replace.c:551
+msgid "change a commit's parents"
+msgstr ""
+
+#: builtin/replace.c:552
+msgid "convert existing graft file"
+msgstr ""
+
+#: builtin/replace.c:553
+msgid "replace the ref if it exists"
+msgstr ""
+
+#: builtin/replace.c:555
+msgid "do not pretty-print contents for --edit"
+msgstr ""
+
+#: builtin/replace.c:556
+msgid "use this format"
+msgstr ""
+
+#: builtin/replace.c:569
+msgid "--format cannot be used when not listing"
+msgstr ""
+
+#: builtin/replace.c:577
+msgid "-f only makes sense when writing a replacement"
+msgstr ""
+
+#: builtin/replace.c:581
+msgid "--raw only makes sense with --edit"
+msgstr ""
+
+#: builtin/replace.c:587
+msgid "-d needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:593
+msgid "bad number of arguments"
+msgstr ""
+
+#: builtin/replace.c:599
+msgid "-e needs exactly one argument"
+msgstr ""
+
+#: builtin/replace.c:605
+msgid "-g needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:611
+msgid "--convert-graft-file takes no argument"
+msgstr ""
+
+#: builtin/replace.c:617
+msgid "only one pattern can be given with -l"
+msgstr ""
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr ""
+
+#: builtin/rerere.c:58
+msgid "register clean resolutions in index"
+msgstr ""
+
+#: builtin/rerere.c:77
+msgid "'git rerere forget' without paths is deprecated"
+msgstr ""
+
+#: builtin/rerere.c:111
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr ""
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<komit>]"
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<mirip-pohon>] [--] <spek jalur>..."
+
+#: 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]] [<mirip-pohon>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<mirip-pohon>] [--] [<pathspec>...]"
+
+#: builtin/reset.c:41
+msgid "mixed"
+msgstr "campuran"
+
+#: builtin/reset.c:41
+msgid "soft"
+msgstr "lunak"
+
+#: builtin/reset.c:41
+msgid "hard"
+msgstr "keras"
+
+#: builtin/reset.c:41
+msgid "merge"
+msgstr "gabungan"
+
+#: builtin/reset.c:41
+msgid "keep"
+msgstr "simpan"
+
+#: builtin/reset.c:83
+msgid "You do not have a valid HEAD."
+msgstr "Anda tidak punya HEAD yang valid."
+
+#: builtin/reset.c:85
+msgid "Failed to find tree of HEAD."
+msgstr "Gagal menemukan pohon HEAD."
+
+#: builtin/reset.c:91
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Gagal menemukan pohon dari %s."
+
+#: builtin/reset.c:116
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD sekarang pada %s"
+
+#: builtin/reset.c:195
+#, 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
+msgid "be quiet, only report errors"
+msgstr "diam, hanya laporkan kesalahan"
+
+#: builtin/reset.c:297
+msgid "reset HEAD and index"
+msgstr "setel ulang HEAD dan indeks"
+
+#: builtin/reset.c:298
+msgid "reset only HEAD"
+msgstr "hanya setel ulang HEAD"
+
+#: builtin/reset.c:300 builtin/reset.c:302
+msgid "reset HEAD, index and working tree"
+msgstr "setel ulang HEAD, indeks dan pohon kerja"
+
+#: builtin/reset.c:304
+msgid "reset HEAD but keep local changes"
+msgstr "setel ulang HEAD tapi simpan perubahan lokal"
+
+#: builtin/reset.c:310
+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
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "Gagal menguraikan '%s' sebagai revisi yang valid."
+
+#: builtin/reset.c:352
+#, 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
+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
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Tidak dapat lakukan reset %s dengan jalur."
+
+#: builtin/reset.c:388
+#, 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
+msgid "Unstaged changes after reset:"
+msgstr "Perubahan tak tergelar setelah setel ulang:"
+
+#: builtin/reset.c:416
+#, 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 ""
+"\n"
+"Butuh %.2f detik untuk daftar perubahan tak tergelar setelah setel ulang.\n"
+"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
+#, 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
+msgid "Could not write new index file."
+msgstr "Tidak dapat menulis berkas indeks baru."
+
+#: builtin/rev-list.c:541
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
+
+#: builtin/rev-list.c:602
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: builtin/rev-list.c:674
+msgid "rev-list does not support display of notes"
+msgstr ""
+
+#: builtin/rev-list.c:679
+msgid "marked counting is incompatible with --objects"
+msgstr ""
+
+#: builtin/rev-parse.c:409
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr ""
+
+#: builtin/rev-parse.c:414
+msgid "keep the `--` passed as an arg"
+msgstr ""
+
+#: builtin/rev-parse.c:416
+msgid "stop parsing after the first non-option argument"
+msgstr ""
+
+#: builtin/rev-parse.c:419
+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"
+"   or: git rev-parse --sq-quote [<arg>...]\n"
+"   or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+
+#: 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 "git revert [<opsi>] <mirip-komit>..."
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr "git revert <subperintah>"
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<opsi>] <mirip-komit>..."
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <subperintah>"
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "opsi `%s' harap sebuah angka lebih dari nol"
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s: %s tidak dapat digunakan dengan %s"
+
+#: builtin/revert.c:102
+msgid "end revert or cherry-pick sequence"
+msgstr "akhiri rangkaian pembalikan atau pemetikan ceri"
+
+#: builtin/revert.c:103
+msgid "resume revert or cherry-pick sequence"
+msgstr "lanjutkan rangkaian pembalikan atau pemetikan ceri"
+
+#: builtin/revert.c:104
+msgid "cancel revert or cherry-pick sequence"
+msgstr "batalkan rangkaian pembalikan atau pemetikan ceri"
+
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "lewati komit saat ini dan lanjutkan"
+
+#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr "jangan komit otomatis"
+
+#: builtin/revert.c:108
+msgid "edit the commit message"
+msgstr "sunting pesan komit"
+
+#: builtin/revert.c:111
+msgid "parent-number"
+msgstr "nomor-induk"
+
+#: builtin/revert.c:112
+msgid "select mainline parent"
+msgstr "pilih induk garis utama"
+
+#: builtin/revert.c:114
+msgid "merge strategy"
+msgstr "strategi penggabungan"
+
+#: builtin/revert.c:116
+msgid "option for merge strategy"
+msgstr "opsi untuk strategi penggabungan"
+
+#: builtin/revert.c:125
+msgid "append commit name"
+msgstr "tambahkan nama komit"
+
+#: builtin/revert.c:127
+msgid "preserve initially empty commits"
+msgstr "pertahankan komit kosong awal"
+
+#: builtin/revert.c:129
+msgid "keep redundant, empty commits"
+msgstr "simpan komit kosong mubazir"
+
+#: builtin/revert.c:237
+msgid "revert failed"
+msgstr "pembalikan gagal"
+
+#: builtin/revert.c:250
+msgid "cherry-pick failed"
+msgstr "pemetikan ceri gagal"
+
+#: builtin/rm.c:20
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<opsi>] [--] <berkas>..."
+
+#: builtin/rm.c:208
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+"berkas berikut punya konten tergelar yang berbeda dengan baik\n"
+"berkas dan HEAD:"
+msgstr[1] ""
+"berkas berikut punya konten tergelar yang berbeda dengan baik\n"
+"berkas dan HEAD:"
+
+#: builtin/rm.c:213
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(gunakan -f untuk paksa hapus)"
+
+#: 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] "berkas berikut punya perubahan tergelar dalam indeks:"
+msgstr[1] "berkas berikut punya perubahan tergelar dalam indeks:"
+
+#: builtin/rm.c:221 builtin/rm.c:230
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"(gunakan --cached untuk jaga berkas, atau -f untuk paksa hapus)"
+
+#: builtin/rm.c:227
+msgid "the following file has local modifications:"
+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
+msgid "do not list removed files"
+msgstr "jangan daftar berkas terhapus"
+
+#: builtin/rm.c:245
+msgid "only remove from the index"
+msgstr "hanya hapus dari indeks"
+
+#: builtin/rm.c:246
+msgid "override the up-to-date check"
+msgstr "timpa pemeriksaan terbaru"
+
+#: builtin/rm.c:247
+msgid "allow recursive removal"
+msgstr "perbolehkan penghapusan rekursif"
+
+#: builtin/rm.c:249
+msgid "exit with a zero status even if nothing matched"
+msgstr "keluar dengan nol bahkan jika tidak ada yang cocok"
+
+#: builtin/rm.c:283
+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
+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
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "tidak menghapus '%s' secara rekursif tanpa -r"
+
+#: builtin/rm.c:379
+#, 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."
+msgstr ""
+
+#: builtin/send-pack.c:188
+msgid "remote name"
+msgstr ""
+
+#: builtin/send-pack.c:201
+msgid "use stateless RPC protocol"
+msgstr ""
+
+#: builtin/send-pack.c:202
+msgid "read refs from stdin"
+msgstr ""
+
+#: builtin/send-pack.c:203
+msgid "print status from remote helper"
+msgstr ""
+
+#: builtin/shortlog.c:16
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<opsi>] [<rentang revisi>] [[--] <jalur>...]"
+
+#: builtin/shortlog.c:17
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<opsi>]"
+
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "menggunakan banyak opsi --group dengan masukan standar tidak didukung"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "mengguanakn --group=trailer dengan stdin tidak didukung"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "tipe kelompok tidak dikenal: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "kelompokkan oleh pengkomit daripada pengarang"
+
+#: builtin/shortlog.c:354
+msgid "sort output according to the number of commits per author"
+msgstr "urutkan keluaran berdasarkan jumlah komit per pengarang"
+
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "sembunyikan deskripsi komit, hanya sediakan hitungan komit"
+
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "perlihatkan alamat email setiap pengarang"
+
+#: builtin/shortlog.c:359
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "bungkus-baris keluaran"
+
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "bidang"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "kelompokkan oleh bidang"
+
+#: builtin/shortlog.c:391
+msgid "too many arguments given outside repository"
+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>)...]"
+msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<kapan>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<revisi> | <glob>)...]"
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+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] "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
+#, c-format
+msgid "no matching refs with %s"
+msgstr "tidak ada referensi yang cocok dengan %s"
+
+#: builtin/show-branch.c:645
+msgid "show remote-tracking and local branches"
+msgstr "perlihatkan cabang pelacak remote dan lokal"
+
+#: builtin/show-branch.c:647
+msgid "show remote-tracking branches"
+msgstr "perlihatkan cabang pelacak remote"
+
+#: builtin/show-branch.c:649
+msgid "color '*!+-' corresponding to the branch"
+msgstr "warna '*!+-' bersesuaian pada cabang"
+
+#: builtin/show-branch.c:651
+msgid "show <n> more commits after the common ancestor"
+msgstr "perlihatkan <n> komit lagi setelah nenek moyang yang sama"
+
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
+msgstr "sinonim untuk more=-1"
+
+#: builtin/show-branch.c:654
+msgid "suppress naming strings"
+msgstr "sembunyikan untai penamaan"
+
+#: builtin/show-branch.c:656
+msgid "include the current branch"
+msgstr "masukkan cabang saat ini"
+
+#: builtin/show-branch.c:658
+msgid "name commits with their object names"
+msgstr "namai komit dengan nama objeknya"
+
+#: builtin/show-branch.c:660
+msgid "show possible merge bases"
+msgstr "perlihatkan dasar penggabungan yang mungkin"
+
+#: builtin/show-branch.c:662
+msgid "show refs unreachable from any other ref"
+msgstr ""
+"perlihatkan referensi yang tidak dapat dicapai dari referensi yang lainnya"
+
+#: builtin/show-branch.c:664
+msgid "show commits in topological order"
+msgstr "perlihatkan komit dalam urutan topologis"
+
+#: builtin/show-branch.c:667
+msgid "show only commits not on the first branch"
+msgstr "hanya perlihatkan komit yang bukan pada cabang pertama"
+
+#: builtin/show-branch.c:669
+msgid "show merges reachable from only one tip"
+msgstr "perlihatkan penggabungan yang bisa dicapai hanya dari satu ujung"
+
+#: builtin/show-branch.c:671
+msgid "topologically sort, maintaining date order where possible"
+msgstr "urutkan secara topologis, pelihara urutan tanggal bila memungkinkan"
+
+#: builtin/show-branch.c:674
+msgid "<n>[,<base>]"
+msgstr "<n>[,<dasar>]"
+
+#: builtin/show-branch.c:675
+msgid "show <n> most recent ref-log entries starting at base"
+msgstr "perlihatkan <n> entri ref-log terkini dimulai dari dasar"
+
+#: builtin/show-branch.c:711
+msgid ""
+"--reflog is incompatible with --all, --remotes, --independent or --merge-base"
+msgstr ""
+"--reflog tidak kompatibel dengan --all, --remotes, --independent atau --"
+"merge-base"
+
+#: builtin/show-branch.c:735
+msgid "no branches given, and HEAD is not valid"
+msgstr "tidak ada cabang yang diberikan, dan HEAD tidak valid"
+
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
+msgstr "opsi --reflog butuh satu nama cabang"
+
+#: builtin/show-branch.c:741
+#, 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] "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
+#, c-format
+msgid "no such ref %s"
+msgstr "tidak ada referensi seperti %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] "tidak dapat menangani lebih dari %d revisi."
+msgstr[1] "tidak dapat menangani lebih dari %d revisi."
+
+#: builtin/show-branch.c:835
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' bukan sebuah referensi yang valid."
+
+#: builtin/show-branch.c:838
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "tidak dapat menemukan komit %s (%s)"
+
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "algoritma hash"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+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 "git show-ref --exclude-existing[=<pola>]"
+
+#: builtin/show-ref.c:162
+msgid "only show tags (can be combined with heads)"
+msgstr "hanya perlihatkan tag (bisa dikombinasikan dengan kepala)"
+
+#: builtin/show-ref.c:163
+msgid "only show heads (can be combined with tags)"
+msgstr "hanya perlihatkan kepala (bisa dikombinasikan dengan tag)"
+
+#: builtin/show-ref.c:164
+msgid "stricter reference checking, requires exact ref path"
+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 "perlihatkan referensi HEAD, bahkan jika itu akan disaring"
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr "dereferensi tag ke dalam ID objek"
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr "hanya perlihatkan hash SHA1 menggunakan <n> digit"
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+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 ""
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+msgstr ""
+
+#: builtin/sparse-checkout.c:72
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:227
+msgid "failed to create directory for sparse-checkout file"
+msgstr ""
+
+#: builtin/sparse-checkout.c:268
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+
+#: builtin/sparse-checkout.c:270
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr ""
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr ""
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/sparse-checkout.c:413
+#, c-format
+msgid "could not normalize path %s"
+msgstr ""
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:450
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr ""
+
+#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+msgid "unable to load existing sparse-checkout patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:573
+msgid "read patterns from standard in"
+msgstr ""
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr ""
+
+#: builtin/sparse-checkout.c:607
+msgid "git sparse-checkout disable"
+msgstr ""
+
+#: builtin/sparse-checkout.c:638
+msgid "error while refreshing working directory"
+msgstr ""
+
+#: builtin/stash.c:24 builtin/stash.c:40
+msgid "git stash list [<options>]"
+msgstr "git stash list [<opsi>]"
+
+#: builtin/stash.c:25 builtin/stash.c:45
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<opsi>] [<stase>]"
+
+#: builtin/stash.c:26 builtin/stash.c:50
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<stase>]"
+
+#: builtin/stash.c:27
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stase>]"
+
+#: builtin/stash.c:28 builtin/stash.c:65
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <nama cabang> [<stase>]"
+
+#: 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"
+"          [--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>...]]"
+
+#: 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 ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [<pesan>]"
+
+#: builtin/stash.c:55
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<stase>]"
+
+#: builtin/stash.c:60
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<stase>]"
+
+#: builtin/stash.c:75
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <pesan>] [-q|--quiet] <komit>"
+
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <pesan>]\n"
+"          [--] [<spek jalur>...]"
+
+#: builtin/stash.c:130
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' bukan komit mirip stase"
+
+#: builtin/stash.c:150
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Terlalu banyak revisi disebutkan:%s"
+
+#: builtin/stash.c:164
+msgid "No stash entries found."
+msgstr "Tidak ada entri stase ditemukan."
+
+#: builtin/stash.c:178
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s bukan referensi valid"
+
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
+msgstr "git stash clear dengan argument tak diimplementasikan"
+
+#: 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 ""
+"PERINGATAN: Berkas tak terlacak dengan cara berkas terlacak! Menamakan "
+"ulang\n"
+"            %s -> %s\n"
+"         untuk buat ruang.\n"
+
+#: builtin/stash.c:492
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "tidak dapat menerapkan stase di tengah-tengah penggabungan"
+
+#: builtin/stash.c:503
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "tidak dapat membuat diff %s^!."
+
+#: builtin/stash.c:510
+msgid "conflicts in index. Try without --index."
+msgstr "konflik dalam indeks. Coba tanpa --index."
+
+#: builtin/stash.c:516
+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
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Menggabungkan %s dengan %s"
+
+#: builtin/stash.c:549
+msgid "Index was not unstashed."
+msgstr "Indeks tak dibatal-stasekan."
+
+#: builtin/stash.c:591 builtin/stash.c:689
+msgid "attempt to recreate the index"
+msgstr "coba membuat ulang indeks"
+
+#: builtin/stash.c:635
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "%s (%s) dijatuhkan"
+
+#: builtin/stash.c:638
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Tidak dapat menjatuhkan entri stase"
+
+#: builtin/stash.c:651
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' bukan referensi stase"
+
+#: builtin/stash.c:701
+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
+msgid "No branch name specified"
+msgstr "Tidak ada nama cabang yang disebutkan"
+
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "gagal menguraikan pohon"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "gagal membongkar pohon"
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr "masukkan berkas tak terlacak ke dalam stase"
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr "hanya perlihatkan berkas tak terlacak dalam stase"
+
+#: builtin/stash.c:929 builtin/stash.c:966
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "Tidak dapat memperbarui %s dengan %s"
+
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+msgid "stash message"
+msgstr "pesan stase"
+
+#: builtin/stash.c:957
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" butuh satu argumen <komit>"
+
+#: builtin/stash.c:1171
+msgid "No changes selected"
+msgstr "Tidak ada perubahan yang dipilih"
+
+#: builtin/stash.c:1271
+msgid "You do not have the initial commit yet"
+msgstr "Anda belum punya komit awal"
+
+#: builtin/stash.c:1298
+msgid "Cannot save the current index state"
+msgstr "Tidak dapat menyimpan keadaan indeks saat ini"
+
+#: builtin/stash.c:1307
+msgid "Cannot save the untracked files"
+msgstr "Tidak dapat menyimpan berkas tak terlacak"
+
+#: builtin/stash.c:1318 builtin/stash.c:1327
+msgid "Cannot save the current worktree state"
+msgstr "Tidak dapat menyimpang keadaan pohon kerja saat ini"
+
+#: builtin/stash.c:1355
+msgid "Cannot record working tree state"
+msgstr "Tidak dapat merekam keadaan pohon kerja"
+
+#: builtin/stash.c:1404
+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:1422
+msgid "Did you forget to 'git add'?"
+msgstr "Anda lupa untuk 'git add'?"
+
+#: builtin/stash.c:1437
+msgid "No local changes to save"
+msgstr "Tidak ada perubahan lokal untuk disimpan"
+
+#: builtin/stash.c:1444
+msgid "Cannot initialize stash"
+msgstr "Tidak dapat menginisialisasi stase"
+
+#: builtin/stash.c:1459
+msgid "Cannot save the current status"
+msgstr "Tidak dapat menyimpan status saat ini"
+
+#: builtin/stash.c:1464
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Direktori kerja dan keadaan indeks %s disimpan"
+
+#: builtin/stash.c:1554
+msgid "Cannot remove worktree changes"
+msgstr "Tidak dapat menghapus perubahaan pohon kerja"
+
+#: builtin/stash.c:1593 builtin/stash.c:1658
+msgid "keep index"
+msgstr "jaga indeks"
+
+#: builtin/stash.c:1595 builtin/stash.c:1660
+msgid "stash in patch mode"
+msgstr "stase dalam mode tambalan"
+
+#: builtin/stash.c:1596 builtin/stash.c:1661
+msgid "quiet mode"
+msgstr "mode hening"
+
+#: builtin/stash.c:1598 builtin/stash.c:1663
+msgid "include untracked files in stash"
+msgstr "masukkan berkas tak terlacak ke dalam stase"
+
+#: builtin/stash.c:1600 builtin/stash.c:1665
+msgid "include ignore files"
+msgstr "masukkan berkas ignore"
+
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"Dukungan untuk stash.useBuiltin sudah dihapus!\n"
+"Lihat entri itu di 'git help config' untuk selengkapnya."
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr ""
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr ""
+
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
+msgstr ""
+
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Mengharapkan nama referensi penuh, dapat %s"
+
+#: 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:101
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "tidak dapat mencopot satu komponen dari url '%s'"
+
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
+msgid "alternative anchor for relative paths"
+msgstr "jangkar alternatif untuk jalur relatif"
+
+#: builtin/submodule--helper.c:416
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<jalur>] [<jalur>...]"
+
+#: 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 ""
+"Tidak ada url yang ditemukan untuk jalur submodul '%s' dalam .gitmodules"
+
+#: builtin/submodule--helper.c:526
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Memasuki '%s'\n"
+
+#: builtin/submodule--helper.c:529
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command mengembalikan status bukan nol untuk %s\n"
+"."
+
+#: builtin/submodule--helper.c:551
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command mengembalikan status bukan nol ketika merekursi dalam submodul "
+"bersarang %s\n"
+"."
+
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
+msgstr "sembunyikan keluaran memasuki setiap perintah submodul"
+
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
+msgstr "rekursi ke dalam submodul bersarang"
+
+#: builtin/submodule--helper.c:574
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr ""
+"git submodule--helper foreach [--quiet] [--recursive] [--] [<perintah>]"
+
+#: builtin/submodule--helper.c:601
+#, 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:668
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Gagal mendaftarkan url untuk jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:672
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Submodul '%s' (%s) didaftarkan untuk jalur '%s'\n"
+
+#: builtin/submodule--helper.c:682
+#, 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:689
+#, 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:711
+msgid "suppress output for initializing a submodule"
+msgstr "sembunyikan keluaran menginisialisasi submodul"
+
+#: builtin/submodule--helper.c:716
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<opsi>] [<jalur>]"
+
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#, 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:837
+#, 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:864 builtin/submodule--helper.c:1459
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "gagal merekursi ke dalam submodul '%s'"
+
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
+msgstr "sembunyikan keluaran status submodul"
+
+#: builtin/submodule--helper.c:889
+msgid ""
+"use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"gunakan komit yang disimpan di dalam indeks daripada yang disimpan di dalam "
+"HEAD"
+
+#: builtin/submodule--helper.c:895
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<jalur>...]"
+
+#: builtin/submodule--helper.c:919
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <jalur>"
+
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(submodul)"
+
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(submodul)->%s(blob)"
+
+#: builtin/submodule--helper.c:1007
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "tidak dapat hash objek dari '%s'"
+
+#: builtin/submodule--helper.c:1061
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "mode tidak diharapkan %o\n"
+
+#: builtin/submodule--helper.c:1302
+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:1304
+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:1306
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "lewatkan submodul dengan nilai 'ignore_config' disetel ke 'all'"
+
+#: builtin/submodule--helper.c:1308
+msgid "limit the summary size"
+msgstr "batasi ukuran ringkasan"
+
+#: builtin/submodule--helper.c:1313
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<opsi>] [<commit>] -- [<jalur>]"
+
+#: builtin/submodule--helper.c:1337
+msgid "could not fetch a revision for HEAD"
+msgstr "tidak dapat mengambil revisi untuk HEAD"
+
+#: builtin/submodule--helper.c:1342
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached dan --files saling eksklusif"
+
+#: builtin/submodule--helper.c:1409
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Mensinkronisasi url submodul untuk '%s'\n"
+
+#: builtin/submodule--helper.c:1415
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "gagal mendaftarkan url untuk jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:1429
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "gagal mendapatkan remote asali untuk submodul '%s'"
+
+#: builtin/submodule--helper.c:1440
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "gagal memperbarui remote untuk submodul '%s'"
+
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
+msgstr "sembunyikan keluaran mensinkronisasi url submodul"
+
+#: builtin/submodule--helper.c:1494
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<jalur>]"
+
+#: 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)"
+msgstr ""
+"Pohon kerja submodul '%s' berisi direktori .git (gunakan 'rm -rf' bila Anda "
+"benar-benar ingin menghapus itu termasuk semua riwayatnya)"
+
+#: builtin/submodule--helper.c:1560
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr ""
+"Pohon kerja submodul '%s' berisi modifikasi lokal; gunakan '-f' untuk "
+"menyingkirkan itu"
+
+#: builtin/submodule--helper.c:1568
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Direktori '%s' dibersihkan\n"
+
+#: builtin/submodule--helper.c:1570
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Tidak dapat menghapus pohon kerja submodul '%s'\n"
+
+#: builtin/submodule--helper.c:1581
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "tidak dapat membuat direktori submodul kosong %s"
+
+#: builtin/submodule--helper.c:1597
+#, 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:1626
+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:1627
+msgid "unregister all submodules"
+msgstr "batal daftar semua submodul"
+
+#: builtin/submodule--helper.c:1632
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<jalur>...]]"
+
+#: builtin/submodule--helper.c:1646
+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: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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Sebuah pengganti yang dihitung dari pengganti proyek super tidak valid.\n"
+"Untuk memperbolehkan Git untuk kloning tanpa pengganti dalam kasus seperti\n"
+" itu, setel submodule.alternateErrorStrategy ke 'info' atau yang sama,\n"
+"kloning degan '--reference-if-able' daripada '--reference'."
+
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "submodul '%s' tidak dapat menambahkan pengganti: %s"
+
+#: builtin/submodule--helper.c:1768
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "Nilai '%s' untuk submodule.alternateErrorStrategy tidak dikenal"
+
+#: builtin/submodule--helper.c:1775
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "Nilai '%s' untuk submodule.alternateLocation tidak dikenal"
+
+#: builtin/submodule--helper.c:1800
+#, 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:1841
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "gagal mengkloning '%s' ke dalam jalur submodul '%s'"
+
+#: builtin/submodule--helper.c:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "direktori tidak kosong: '%s'"
+
+#: builtin/submodule--helper.c:1858
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "tidak dapat mendapatkan direktori submodul untuk '%s'"
+
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+msgid "where the new submodule will be cloned to"
+msgstr "di mana submodul baru akan dikloning"
+
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+msgid "name of the new submodule"
+msgstr "nama submodul baru"
+
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+msgid "url where to clone the submodule from"
+msgstr "url di mana submodul dikloning"
+
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+msgid "depth for shallow clones"
+msgstr "kedalaman untuk kloning dangkal"
+
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
+msgid "force cloning progress"
+msgstr "paksa perkembangan kloning"
+
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+msgid "disallow cloning into non-empty directory"
+msgstr "tak perbolehkan kloning ke dalam direktori bukan kosong"
+
+#: builtin/submodule--helper.c:1916
+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=<jalur>] [--quiet] [--reference "
+"<repositori>] [--name <nama>] [--depth <kedalaman>] [--single-branch] --url "
+"<url> --path <jalur>"
+
+#: builtin/submodule--helper.c:1953
+#, 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:1957
+#, 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:2058
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Jalur submodul '%s' tidak diinisialisasi"
+
+#: builtin/submodule--helper.c:2062
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Mungkin Anda ingin menggunakan 'update --init'?"
+
+#: builtin/submodule--helper.c:2092
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Melewati submodul tak tergabung %s"
+
+#: builtin/submodule--helper.c:2121
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Melewati submodul '%s'"
+
+#: builtin/submodule--helper.c:2271
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Gagal mengkloning '%s'. Percobaan ulang dijadwalkan"
+
+#: builtin/submodule--helper.c:2282
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Gagal mengkloning '%s' untuk kedua kalinya, batalkan"
+
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+msgid "path into the working tree"
+msgstr "jalur ke dalam pohon kerja"
+
+#: builtin/submodule--helper.c:2347
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "jalur ke dalam pohon kerja, melintasi perbatasan submodul bersarang"
+
+#: builtin/submodule--helper.c:2351
+msgid "rebase, merge, checkout or none"
+msgstr "dasarkan ulang, gabungkan, checkout atau tidak sama sekali"
+
+#: builtin/submodule--helper.c:2357
+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:2360
+msgid "parallel jobs"
+msgstr "pekerjaan paralel"
+
+#: builtin/submodule--helper.c:2362
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "apakah klon awal seharusnya mengikuti rekomendasi dangkal"
+
+#: builtin/submodule--helper.c:2363
+msgid "don't print cloning progress"
+msgstr "jangan cetak perkembangan pengkloningan"
+
+#: builtin/submodule--helper.c:2374
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<jalur>] [<jalur>...]"
+
+#: builtin/submodule--helper.c:2387
+msgid "bad value for update parameter"
+msgstr "nilai jelek untuk parameter pembaruan"
+
+#: builtin/submodule--helper.c:2435
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Cabang submodul (%s) dikonfigurasikan untuk mewarisi cabang dari proyek "
+"super, tapi proyek super tidak pada cabang apapun"
+
+#: builtin/submodule--helper.c:2558
+#, 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:2591
+msgid "recurse into submodules"
+msgstr "rekursi ke dalam submodul"
+
+#: builtin/submodule--helper.c:2597
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opsi>] [<jalur>...]"
+
+#: builtin/submodule--helper.c:2653
+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:2656
+msgid "unset the config in the .gitmodules file"
+msgstr "batal setel konfigurasi dalam berkas .gitmodules"
+
+#: builtin/submodule--helper.c:2661
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <nama> [<nilai>]"
+
+#: builtin/submodule--helper.c:2662
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <nama>"
+
+#: builtin/submodule--helper.c:2663
+msgid "git submodule--helper config --check-writeable"
+msgstr "git submodule--helper config --check-writeable"
+
+#: 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 "mohom pastikan berkas .gitmodules di dalam pohon kerja"
+
+#: builtin/submodule--helper.c:2698
+msgid "suppress output for setting url of a submodule"
+msgstr "sembunyikan keluaran penyetelan url submodule"
+
+#: builtin/submodule--helper.c:2702
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <jalur> <url baru>"
+
+#: builtin/submodule--helper.c:2735
+msgid "set the default tracking branch to master"
+msgstr "setel cabang pelacak asali ke master"
+
+#: builtin/submodule--helper.c:2737
+msgid "set the default tracking branch"
+msgstr "setel cabang pelacak asali"
+
+#: builtin/submodule--helper.c:2741
+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:2742
+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:2749
+msgid "--branch or --default required"
+msgstr "--branch atau --default dibutuhkan"
+
+#: builtin/submodule--helper.c:2752
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch dan --default saling eksklusif"
+
+#: builtin/submodule--helper.c:2815
+#, 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:2818
+#, 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:2828
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr "Sebuah direktori git untuk '%s' ditemukan lokal dengan remote:"
+
+#: 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 ""
+"Jika Anda ingin menggunakan ulang direktori git lokal ini daripada "
+"mengkloning lagi dari\n"
+"  %s\n"
+"gynakan opsi '--force'. Jika direktori git lokal bukan repo yang benar\n"
+"atau Anda tidak yakin apa maksudnya, pilih nama yang lain dengan opsi "
+"'--name'.\n"
+
+#: builtin/submodule--helper.c:2842
+#, 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:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Tidak dapat men-checkout submodul '%s'"
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr "cabang repositori untuk di-checkout saat kloning"
+
+#: builtin/submodule--helper.c:2910
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "perbolehkan menambah jalur submodul yang diabaikan"
+
+#: builtin/submodule--helper.c:2917
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr ""
+"git submodule--helper add-clone [<opsi>...] --url <url> --path <path> "
+"--name <nama>"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s tidak mendukung --super-prefix"
+
+#: builtin/submodule--helper.c:2991
+#, 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 ""
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr ""
+
+#: builtin/symbolic-ref.c:42
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr ""
+
+#: builtin/symbolic-ref.c:43
+msgid "delete symbolic ref"
+msgstr ""
+
+#: builtin/symbolic-ref.c:44
+msgid "shorten ref output"
+msgstr ""
+
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+msgid "reason"
+msgstr ""
+
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+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>]"
+msgstr ""
+"git tag [-a | -s | -u <id kunci>] [-f] [-m <pesan | -F <berkas>]\n"
+"\t\t<nama tag> [<kepala>]"
+
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <nama tag>..."
+
+#: 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>...]"
+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>...]"
+
+#: builtin/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format]<format>] <nama tag>..."
+
+#: builtin/tag.c:100
+#, c-format
+msgid "tag '%s' not found."
+msgstr "tag '%s' tidak ditemukan."
+
+#: builtin/tag.c:135
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "Tag '%s' (yaitu %s) dihapus\n"
+
+#: builtin/tag.c:170
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"Tulis pesan untuk tag:\n"
+"  %s\n"
+"Baris yang diawali dengan '%c' akan diabaikan.\n"
+
+#: builtin/tag.c:174
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"Tulis pesan untuk tag:\n"
+"  %s\n"
+"Baris yang diawali dengan '%c' akan disimpan; Anda dapat menghapus itu bila "
+"Anda mau.\n"
+
+#: builtin/tag.c:241
+msgid "unable to sign the tag"
+msgstr "tidak dapat menandatangani tag"
+
+#: builtin/tag.c:259
+#, 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 ""
+"Anda telah membuat tag bersarang. Objek yang dirujuk oleh tag baru Anda\n"
+"sudah menjadi tag. Jika maksud Anda men-tag objek yang ditunjukkannya,\n"
+"gunakan:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:275
+msgid "bad object type."
+msgstr "tipe objek jelek."
+
+#: builtin/tag.c:328
+msgid "no tag message?"
+msgstr "tidak ada pesan tag?"
+
+#: builtin/tag.c:335
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "Pesan tag dibiarkan di %s\n"
+
+#: builtin/tag.c:446
+msgid "list tag names"
+msgstr "daftarkan nama tag"
+
+#: builtin/tag.c:448
+msgid "print <n> lines of each tag message"
+msgstr "cetak <n> baris dari setiap pesan tag"
+
+#: builtin/tag.c:450
+msgid "delete tags"
+msgstr "hapus tag"
+
+#: builtin/tag.c:451
+msgid "verify tags"
+msgstr "verifikasi tag"
+
+#: builtin/tag.c:453
+msgid "Tag creation options"
+msgstr "Opsi pembuatan tag"
+
+#: builtin/tag.c:455
+msgid "annotated tag, needs a message"
+msgstr "tag bercatat, butuh sebuah pesan"
+
+#: builtin/tag.c:457
+msgid "tag message"
+msgstr "pesan tag"
+
+#: builtin/tag.c:459
+msgid "force edit of tag message"
+msgstr "paksa sunting pesan tag"
+
+#: builtin/tag.c:460
+msgid "annotated and GPG-signed tag"
+msgstr "tag bercatat dan bertandatangan GPG"
+
+#: builtin/tag.c:463
+msgid "use another key to sign the tag"
+msgstr "gunakan kunci yang lain untuk menandatangani tag"
+
+#: builtin/tag.c:464
+msgid "replace the tag if exists"
+msgstr "ganti tag jika ada"
+
+#: builtin/tag.c:465 builtin/update-ref.c:505
+msgid "create a reflog"
+msgstr "buat log referensi"
+
+#: builtin/tag.c:467
+msgid "Tag listing options"
+msgstr "Opsi daftar tag"
+
+#: builtin/tag.c:468
+msgid "show tag list in columns"
+msgstr "perlihatkan daftar tag dalam kolom"
+
+#: builtin/tag.c:469 builtin/tag.c:471
+msgid "print only tags that contain the commit"
+msgstr "hanya cetak tag yang berisi komit"
+
+#: builtin/tag.c:470 builtin/tag.c:472
+msgid "print only tags that don't contain the commit"
+msgstr "hanya cetak tag yang tidak berisi komit"
+
+#: builtin/tag.c:473
+msgid "print only tags that are merged"
+msgstr "hanya cetak tag yang tergabung"
+
+#: builtin/tag.c:474
+msgid "print only tags that are not merged"
+msgstr "hanya cetak tag yang tak tergabung"
+
+#: builtin/tag.c:478
+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:592
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' bukan nama tag yang valid."
+
+#: builtin/tag.c:597
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "tag '%s' sudah ada"
+
+#: builtin/tag.c:628
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "Tag '%s' diperbarui (yaitu %s)\n"
+
+#: builtin/unpack-objects.c:504
+msgid "Unpacking objects"
+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 ""
+
+#: builtin/update-index.c:108
+#, c-format
+msgid "failed to delete file %s"
+msgstr ""
+
+#: builtin/update-index.c:115 builtin/update-index.c:221
+#, c-format
+msgid "failed to delete directory %s"
+msgstr ""
+
+#: builtin/update-index.c:140
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr ""
+
+#: builtin/update-index.c:154
+msgid "directory stat info does not change after adding a new file"
+msgstr ""
+
+#: builtin/update-index.c:167
+msgid "directory stat info does not change after adding a new directory"
+msgstr ""
+
+#: builtin/update-index.c:180
+msgid "directory stat info changes after updating a file"
+msgstr ""
+
+#: builtin/update-index.c:191
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr ""
+
+#: builtin/update-index.c:202
+msgid "directory stat info does not change after deleting a file"
+msgstr ""
+
+#: builtin/update-index.c:215
+msgid "directory stat info does not change after deleting a directory"
+msgstr ""
+
+#: builtin/update-index.c:222
+msgid " OK"
+msgstr ""
+
+#: builtin/update-index.c:591
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr ""
+
+#: builtin/update-index.c:976
+msgid "continue refresh even when index needs update"
+msgstr ""
+
+#: builtin/update-index.c:979
+msgid "refresh: ignore submodules"
+msgstr ""
+
+#: builtin/update-index.c:982
+msgid "do not ignore new files"
+msgstr ""
+
+#: builtin/update-index.c:984
+msgid "let files replace directories and vice-versa"
+msgstr ""
+
+#: builtin/update-index.c:986
+msgid "notice files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:988
+msgid "refresh even if index contains unmerged entries"
+msgstr ""
+
+#: builtin/update-index.c:991
+msgid "refresh stat information"
+msgstr ""
+
+#: builtin/update-index.c:995
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr ""
+
+#: builtin/update-index.c:999
+msgid "<mode>,<object>,<path>"
+msgstr ""
+
+#: builtin/update-index.c:1000
+msgid "add the specified entry to the index"
+msgstr ""
+
+#: builtin/update-index.c:1010
+msgid "mark files as \"not changing\""
+msgstr ""
+
+#: builtin/update-index.c:1013
+msgid "clear assumed-unchanged bit"
+msgstr ""
+
+#: builtin/update-index.c:1016
+msgid "mark files as \"index-only\""
+msgstr ""
+
+#: builtin/update-index.c:1019
+msgid "clear skip-worktree bit"
+msgstr ""
+
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr ""
+
+#: builtin/update-index.c:1024
+msgid "add to index only; do not add content to object database"
+msgstr ""
+
+#: builtin/update-index.c:1026
+msgid "remove named paths even if present in worktree"
+msgstr ""
+
+#: builtin/update-index.c:1028
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr ""
+
+#: builtin/update-index.c:1030
+msgid "read list of paths to be updated from standard input"
+msgstr ""
+
+#: builtin/update-index.c:1034
+msgid "add entries from standard input to the index"
+msgstr ""
+
+#: builtin/update-index.c:1038
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr ""
+
+#: builtin/update-index.c:1042
+msgid "only update entries that differ from HEAD"
+msgstr ""
+
+#: builtin/update-index.c:1046
+msgid "ignore files missing from worktree"
+msgstr ""
+
+#: builtin/update-index.c:1049
+msgid "report actions to standard output"
+msgstr ""
+
+#: builtin/update-index.c:1051
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr ""
+
+#: builtin/update-index.c:1055
+msgid "write index in this format"
+msgstr ""
+
+#: builtin/update-index.c:1057
+msgid "enable or disable split index"
+msgstr ""
+
+#: builtin/update-index.c:1059
+msgid "enable/disable untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1061
+msgid "test if the filesystem supports untracked cache"
+msgstr ""
+
+#: builtin/update-index.c:1063
+msgid "enable untracked cache without testing the filesystem"
+msgstr ""
+
+#: builtin/update-index.c:1065
+msgid "write out the index even if is not flagged as changed"
+msgstr ""
+
+#: builtin/update-index.c:1067
+msgid "enable or disable file system monitor"
+msgstr ""
+
+#: builtin/update-index.c:1069
+msgid "mark files as fsmonitor valid"
+msgstr ""
+
+#: builtin/update-index.c:1072
+msgid "clear fsmonitor valid bit"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: builtin/update-index.c:1200
+msgid "Untracked cache disabled"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/update-index.c:1212
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr ""
+
+#: builtin/update-index.c:1220
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1224
+msgid "fsmonitor enabled"
+msgstr ""
+
+#: builtin/update-index.c:1227
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1231
+msgid "fsmonitor disabled"
+msgstr ""
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr ""
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
+msgstr ""
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr ""
+
+#: builtin/update-ref.c:500
+msgid "delete the reference"
+msgstr ""
+
+#: builtin/update-ref.c:502
+msgid "update <refname> not the one it points to"
+msgstr ""
+
+#: builtin/update-ref.c:503
+msgid "stdin has NUL-terminated arguments"
+msgstr ""
+
+#: builtin/update-ref.c:504
+msgid "read updates from stdin"
+msgstr ""
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr ""
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr ""
+
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr ""
+
+#: builtin/upload-pack.c:23 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:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr ""
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr ""
+
+#: builtin/verify-commit.c:19
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr ""
+
+#: builtin/verify-commit.c:68
+msgid "print commit contents"
+msgstr ""
+
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
+msgstr ""
+
+#: builtin/verify-pack.c:59
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr ""
+
+#: builtin/verify-pack.c:70
+msgid "verbose"
+msgstr ""
+
+#: builtin/verify-pack.c:72
+msgid "show statistics only"
+msgstr ""
+
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr ""
+
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr ""
+
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr ""
+
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
+msgstr ""
+
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
+msgstr ""
+
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
+msgstr ""
+
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr ""
+
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
+msgstr ""
+
+#: builtin/worktree.c:61 builtin/worktree.c:944
+#, c-format
+msgid "failed to delete '%s'"
+msgstr ""
+
+#: builtin/worktree.c:74
+#, c-format
+msgid "Removing %s/%s: %s"
+msgstr ""
+
+#: builtin/worktree.c:147
+msgid "report pruned working trees"
+msgstr ""
+
+#: builtin/worktree.c:149
+msgid "expire working trees older than <time>"
+msgstr ""
+
+#: builtin/worktree.c:219
+#, c-format
+msgid "'%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:228
+#, c-format
+msgid "unusable worktree destination '%s'"
+msgstr ""
+
+#: 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: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:286
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr ""
+
+#: builtin/worktree.c:308
+msgid "initializing"
+msgstr ""
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr ""
+
+#: builtin/worktree.c:422
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr ""
+
+#: builtin/worktree.c:431
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr ""
+
+#: builtin/worktree.c:437
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr ""
+
+#: builtin/worktree.c:482
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr ""
+
+#: builtin/worktree.c:485
+msgid "create a new branch"
+msgstr ""
+
+#: builtin/worktree.c:487
+msgid "create or reset a branch"
+msgstr ""
+
+#: builtin/worktree.c:489
+msgid "populate the new working tree"
+msgstr ""
+
+#: builtin/worktree.c:490
+msgid "keep the new working tree locked"
+msgstr ""
+
+#: 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:498
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr ""
+
+#: builtin/worktree.c:506
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr ""
+
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr ""
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr ""
+
+#: builtin/worktree.c:574
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr ""
+
+#: builtin/worktree.c:691
+msgid "show extended annotations and reasons, if available"
+msgstr ""
+
+#: builtin/worktree.c:693
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/worktree.c:743 builtin/worktree.c:776
+msgid "The main working tree cannot be locked or unlocked"
+msgstr ""
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr ""
+
+#: builtin/worktree.c:750
+#, c-format
+msgid "'%s' is already locked"
+msgstr ""
+
+#: builtin/worktree.c:778
+#, c-format
+msgid "'%s' is not locked"
+msgstr ""
+
+#: builtin/worktree.c:819
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:827
+msgid "force move even if worktree is dirty or locked"
+msgstr ""
+
+#: builtin/worktree.c:850 builtin/worktree.c:974
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr ""
+
+#: builtin/worktree.c:855
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr ""
+
+#: 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:870
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:873
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:878
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr ""
+
+#: builtin/worktree.c:924
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr ""
+
+#: builtin/worktree.c:928
+#, c-format
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:933
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr ""
+
+#: builtin/worktree.c:956
+msgid "force removal even if worktree is dirty or locked"
+msgstr ""
+
+#: 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:981
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:984
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
+msgstr ""
+
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
+msgstr ""
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr ""
+
+#: git.c:28
+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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+
+#: 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"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+
+#: git.c:188
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr ""
+
+#: 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 ""
+
+#: git.c:230
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr ""
+
+#: git.c:252
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr ""
+
+#: 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:326
+#, c-format
+msgid "unknown option: %s\n"
+msgstr ""
+
+#: git.c:375
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#: 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:391
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:394
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+#: git.c:476
+msgid "write failure on standard output"
+msgstr ""
+
+#: git.c:478
+msgid "unknown write failure on standard output"
+msgstr ""
+
+#: git.c:480
+msgid "close failed on standard output"
+msgstr ""
+
+#: git.c:833
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#: git.c:883
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr ""
+
+#: git.c:896
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+
+#: git.c:916
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+
+#: git.c:928
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr ""
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr ""
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr ""
+
+#: 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"
+msgstr ""
+
+#: http.c:420
+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"
+msgstr ""
+
+#: http.c:910
+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
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#: http.c:1139
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#: http.c:1143
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr ""
+
+#: http.c:2034
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+
+#: remote-curl.c:183
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+
+#: remote-curl.c:307
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr ""
+
+#: remote-curl.c:408
+msgid "invalid server response; expected service, got flush packet"
+msgstr ""
+
+#: remote-curl.c:439
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr ""
+
+#: remote-curl.c:499
+#, c-format
+msgid "repository '%s' not found"
+msgstr ""
+
+#: remote-curl.c:503
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr ""
+
+#: remote-curl.c:507
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr ""
+
+#: remote-curl.c:513
+#, c-format
+msgid "redirecting to %s"
+msgstr ""
+
+#: remote-curl.c:644
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
+
+#: remote-curl.c:656
+msgid "remote server sent unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c:726
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
+
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c:834
+#, c-format
+msgid "RPC failed; %s"
+msgstr ""
+
+#: remote-curl.c:874
+msgid "cannot handle pushes this big"
+msgstr ""
+
+#: remote-curl.c:989
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#: remote-curl.c:993
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
+
+#: remote-curl.c:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
+
+#: remote-curl.c:1134
+msgid "dumb http transport does not support shallow capabilities"
+msgstr ""
+
+#: remote-curl.c:1149
+msgid "fetch failed."
+msgstr ""
+
+#: remote-curl.c:1195
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#: remote-curl.c:1239 remote-curl.c:1245
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+
+#: remote-curl.c:1257 remote-curl.c:1375
+#, c-format
+msgid "http transport does not support %s"
+msgstr ""
+
+#: remote-curl.c:1293
+msgid "git-http-push failed"
+msgstr ""
+
+#: remote-curl.c:1481
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c:1513
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c:1520
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c:1561
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr ""
+
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr ""
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr ""
+
+#: list-objects-filter-options.h:94
+msgid "args"
+msgstr ""
+
+#: list-objects-filter-options.h:95
+msgid "object filtering"
+msgstr ""
+
+#: parse-options.h:184
+msgid "expiry-date"
+msgstr ""
+
+#: parse-options.h:198
+msgid "no-op (backward compatibility)"
+msgstr ""
+
+#: parse-options.h:310
+msgid "be more verbose"
+msgstr ""
+
+#: parse-options.h:312
+msgid "be more quiet"
+msgstr ""
+
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
+msgstr ""
+
+#: parse-options.h:337
+msgid "how to strip spaces and #comments from message"
+msgstr ""
+
+#: parse-options.h:338
+msgid "read pathspec from file"
+msgstr ""
+
+#: parse-options.h:339
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+
+#: ref-filter.h:99
+msgid "key"
+msgstr ""
+
+#: ref-filter.h:99
+msgid "field name to sort on"
+msgstr ""
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+
+#: command-list.h:50
+msgid "Add file contents to the index"
+msgstr ""
+
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr ""
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr ""
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr ""
+
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr ""
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr ""
+
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr ""
+
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr ""
+
+#: command-list.h:58
+msgid "List, create, or delete branches"
+msgstr ""
+
+#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr ""
+
+#: command-list.h:60
+msgid "Move objects and refs by archive"
+msgstr ""
+
+#: command-list.h:61
+msgid "Provide content or type and size information for repository objects"
+msgstr ""
+
+#: command-list.h:62
+msgid "Display gitattributes information"
+msgstr ""
+
+#: command-list.h:63
+msgid "Debug gitignore / exclude files"
+msgstr ""
+
+#: command-list.h:64
+msgid "Show canonical names and email addresses of contacts"
+msgstr ""
+
+#: command-list.h:65
+msgid "Switch branches or restore working tree files"
+msgstr ""
+
+#: command-list.h:66
+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 ""
+
+#: command-list.h:69
+msgid "Apply the changes introduced by some existing commits"
+msgstr ""
+
+#: command-list.h:70
+msgid "Graphical alternative to git-commit"
+msgstr ""
+
+#: command-list.h:71
+msgid "Remove untracked files from the working tree"
+msgstr ""
+
+#: command-list.h:72
+msgid "Clone a repository into a new directory"
+msgstr ""
+
+#: command-list.h:73
+msgid "Display data in columns"
+msgstr ""
+
+#: command-list.h:74
+msgid "Record changes to the repository"
+msgstr ""
+
+#: command-list.h:75
+msgid "Write and verify Git commit-graph files"
+msgstr ""
+
+#: command-list.h:76
+msgid "Create a new commit object"
+msgstr ""
+
+#: command-list.h:77
+msgid "Get and set repository or global options"
+msgstr ""
+
+#: command-list.h:78
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr ""
+
+#: command-list.h:79
+msgid "Retrieve and store user credentials"
+msgstr ""
+
+#: command-list.h:80
+msgid "Helper to temporarily store passwords in memory"
+msgstr ""
+
+#: command-list.h:81
+msgid "Helper to store credentials on disk"
+msgstr ""
+
+#: command-list.h:82
+msgid "Export a single commit to a CVS checkout"
+msgstr ""
+
+#: command-list.h:83
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr ""
+
+#: command-list.h:84
+msgid "A CVS server emulator for Git"
+msgstr ""
+
+#: command-list.h:85
+msgid "A really simple server for Git repositories"
+msgstr ""
+
+#: command-list.h:86
+msgid "Give an object a human readable name based on an available ref"
+msgstr ""
+
+#: command-list.h:87
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr ""
+
+#: command-list.h:88
+msgid "Compares files in the working tree and the index"
+msgstr ""
+
+#: command-list.h:89
+msgid "Compare a tree to the working tree or index"
+msgstr ""
+
+#: command-list.h:90
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+
+#: command-list.h:91
+msgid "Show changes using common diff tools"
+msgstr ""
+
+#: command-list.h:92
+msgid "Git data exporter"
+msgstr ""
+
+#: command-list.h:93
+msgid "Backend for fast Git data importers"
+msgstr ""
+
+#: command-list.h:94
+msgid "Download objects and refs from another repository"
+msgstr ""
+
+#: command-list.h:95
+msgid "Receive missing objects from another repository"
+msgstr ""
+
+#: command-list.h:96
+msgid "Rewrite branches"
+msgstr ""
+
+#: command-list.h:97
+msgid "Produce a merge commit message"
+msgstr ""
+
+#: command-list.h:98
+msgid "Output information on each ref"
+msgstr ""
+
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr ""
+
+#: command-list.h:100
+msgid "Prepare patches for e-mail submission"
+msgstr ""
+
+#: command-list.h:101
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr ""
+
+#: command-list.h:102
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr ""
+
+#: command-list.h:103
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr ""
+
+#: command-list.h:104
+msgid "Print lines matching a pattern"
+msgstr ""
+
+#: command-list.h:105
+msgid "A portable graphical interface to Git"
+msgstr ""
+
+#: command-list.h:106
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr ""
+
+#: command-list.h:107
+msgid "Display help information about Git"
+msgstr ""
+
+#: command-list.h:108
+msgid "Server side implementation of Git over HTTP"
+msgstr ""
+
+#: command-list.h:109
+msgid "Download from a remote Git repository via HTTP"
+msgstr ""
+
+#: command-list.h:110
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr ""
+
+#: command-list.h:111
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr ""
+
+#: command-list.h:112
+msgid "Build pack index file for an existing packed archive"
+msgstr ""
+
+#: command-list.h:113
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr ""
+
+#: command-list.h:114
+msgid "Instantly browse your working repository in gitweb"
+msgstr ""
+
+#: command-list.h:115
+msgid "Add or parse structured information in commit messages"
+msgstr ""
+
+#: command-list.h:116
+msgid "The Git repository browser"
+msgstr ""
+
+#: command-list.h:117
+msgid "Show commit logs"
+msgstr ""
+
+#: command-list.h:118
+msgid "Show information about files in the index and the working tree"
+msgstr ""
+
+#: command-list.h:119
+msgid "List references in a remote repository"
+msgstr ""
+
+#: command-list.h:120
+msgid "List the contents of a tree object"
+msgstr ""
+
+#: command-list.h:121
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr ""
+
+#: command-list.h:122
+msgid "Simple UNIX mbox splitter program"
+msgstr ""
+
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr ""
+
+#: command-list.h:124
+msgid "Join two or more development histories together"
+msgstr ""
+
+#: command-list.h:125
+msgid "Find as good common ancestors as possible for a merge"
+msgstr ""
+
+#: command-list.h:126
+msgid "Run a three-way file merge"
+msgstr ""
+
+#: command-list.h:127
+msgid "Run a merge for files needing merging"
+msgstr ""
+
+#: command-list.h:128
+msgid "The standard helper program to use with git-merge-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
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr ""
+
+#: command-list.h:134
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr ""
+
+#: command-list.h:135
+msgid "Find symbolic names for given revs"
+msgstr ""
+
+#: command-list.h:136
+msgid "Add or inspect object notes"
+msgstr ""
+
+#: command-list.h:137
+msgid "Import from and submit to Perforce repositories"
+msgstr ""
+
+#: command-list.h:138
+msgid "Create a packed archive of objects"
+msgstr ""
+
+#: command-list.h:139
+msgid "Find redundant pack files"
+msgstr ""
+
+#: command-list.h:140
+msgid "Pack heads and tags for efficient repository access"
+msgstr ""
+
+#: command-list.h:141
+msgid "Compute unique ID for a patch"
+msgstr ""
+
+#: command-list.h:142
+msgid "Prune all unreachable objects from the object database"
+msgstr ""
+
+#: command-list.h:143
+msgid "Remove extra objects that are already in pack files"
+msgstr ""
+
+#: command-list.h:144
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr ""
+
+#: command-list.h:145
+msgid "Update remote refs along with associated objects"
+msgstr ""
+
+#: command-list.h:146
+msgid "Applies a quilt patchset onto the current branch"
+msgstr ""
+
+#: command-list.h:147
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr ""
+
+#: command-list.h:148
+msgid "Reads tree information into the index"
+msgstr ""
+
+#: command-list.h:149
+msgid "Reapply commits on top of another base tip"
+msgstr ""
+
+#: command-list.h:150
+msgid "Receive what is pushed into the repository"
+msgstr ""
+
+#: command-list.h:151
+msgid "Manage reflog information"
+msgstr ""
+
+#: command-list.h:152
+msgid "Manage set of tracked repositories"
+msgstr ""
+
+#: command-list.h:153
+msgid "Pack unpacked objects in a repository"
+msgstr ""
+
+#: command-list.h:154
+msgid "Create, list, delete refs to replace objects"
+msgstr ""
+
+#: command-list.h:155
+msgid "Generates a summary of pending changes"
+msgstr ""
+
+#: command-list.h:156
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr ""
+
+#: command-list.h:157
+msgid "Reset current HEAD to the specified state"
+msgstr ""
+
+#: command-list.h:158
+msgid "Restore working tree files"
+msgstr ""
+
+#: command-list.h:159
+msgid "Revert some existing commits"
+msgstr ""
+
+#: command-list.h:160
+msgid "Lists commit objects in reverse chronological order"
+msgstr ""
+
+#: command-list.h:161
+msgid "Pick out and massage parameters"
+msgstr ""
+
+#: command-list.h:162
+msgid "Remove files from the working tree and from the index"
+msgstr ""
+
+#: command-list.h:163
+msgid "Send a collection of patches as emails"
+msgstr ""
+
+#: command-list.h:164
+msgid "Push objects over Git protocol to another repository"
+msgstr ""
+
+#: command-list.h:165
+msgid "Restricted login shell for Git-only SSH access"
+msgstr ""
+
+#: command-list.h:166
+msgid "Summarize 'git log' output"
+msgstr ""
+
+#: command-list.h:167
+msgid "Show various types of objects"
+msgstr ""
+
+#: command-list.h:168
+msgid "Show branches and their commits"
+msgstr ""
+
+#: command-list.h:169
+msgid "Show packed archive index"
+msgstr ""
+
+#: command-list.h:170
+msgid "List references in a local repository"
+msgstr ""
+
+#: command-list.h:171
+msgid "Git's i18n setup code for shell scripts"
+msgstr ""
+
+#: command-list.h:172
+msgid "Common Git shell script setup code"
+msgstr ""
+
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+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
+msgid "Remove unnecessary whitespace"
+msgstr ""
+
+#: command-list.h:178
+msgid "Initialize, update or inspect submodules"
+msgstr ""
+
+#: command-list.h:179
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr ""
+
+#: command-list.h:180
+msgid "Switch branches"
+msgstr ""
+
+#: command-list.h:181
+msgid "Read, modify and delete symbolic refs"
+msgstr ""
+
+#: command-list.h:182
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr ""
+
+#: command-list.h:183
+msgid "Creates a temporary file with a blob's contents"
+msgstr ""
+
+#: command-list.h:184
+msgid "Unpack objects from a packed archive"
+msgstr ""
+
+#: command-list.h:185
+msgid "Register file contents in the working tree to the index"
+msgstr ""
+
+#: command-list.h:186
+msgid "Update the object name stored in a ref safely"
+msgstr ""
+
+#: command-list.h:187
+msgid "Update auxiliary info file to help dumb servers"
+msgstr ""
+
+#: command-list.h:188
+msgid "Send archive back to git-archive"
+msgstr ""
+
+#: command-list.h:189
+msgid "Send objects packed back to git-fetch-pack"
+msgstr ""
+
+#: command-list.h:190
+msgid "Show a Git logical variable"
+msgstr ""
+
+#: command-list.h:191
+msgid "Check the GPG signature of commits"
+msgstr ""
+
+#: command-list.h:192
+msgid "Validate packed Git archive files"
+msgstr ""
+
+#: command-list.h:193
+msgid "Check the GPG signature of tags"
+msgstr ""
+
+#: command-list.h:194
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr ""
+
+#: command-list.h:195
+msgid "Show logs with difference each commit introduces"
+msgstr ""
+
+#: command-list.h:196
+msgid "Manage multiple working trees"
+msgstr ""
+
+#: command-list.h:197
+msgid "Create a tree object from the current index"
+msgstr ""
+
+#: command-list.h:198
+msgid "Defining attributes per path"
+msgstr ""
+
+#: command-list.h:199
+msgid "Git command-line interface and conventions"
+msgstr ""
+
+#: command-list.h:200
+msgid "A Git core tutorial for developers"
+msgstr ""
+
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr ""
+
+#: command-list.h:202
+msgid "Git for CVS users"
+msgstr ""
+
+#: command-list.h:203
+msgid "Tweaking diff output"
+msgstr ""
+
+#: command-list.h:204
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr ""
+
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr ""
+
+#: command-list.h:206
+msgid "A Git Glossary"
+msgstr ""
+
+#: command-list.h:207
+msgid "Hooks used by Git"
+msgstr ""
+
+#: command-list.h:208
+msgid "Specifies intentionally untracked files to ignore"
+msgstr ""
+
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+
+#: command-list.h:210
+msgid "Defining submodule properties"
+msgstr ""
+
+#: command-list.h:211
+msgid "Git namespaces"
+msgstr ""
+
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr ""
+
+#: command-list.h:213
+msgid "Git Repository Layout"
+msgstr ""
+
+#: command-list.h:214
+msgid "Specifying revisions and ranges for Git"
+msgstr ""
+
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr ""
+
+#: command-list.h:216
+msgid "A tutorial introduction to Git: part two"
+msgstr ""
+
+#: command-list.h:217
+msgid "A tutorial introduction to Git"
+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 "
+"merge"
+msgstr ""
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr ""
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr ""
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr ""
+
+#: git-merge-octopus.sh:102
+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:248
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:257
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:532
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:542
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:547
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+
+#: git-submodule.sh:565
+#, sh-format
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr ""
+
+#: 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 ""
+
+#: git-submodule.sh:578
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:579
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:583
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:584
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:589
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:590
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr ""
+
+#: git-submodule.sh:595
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr ""
+
+#: git-submodule.sh:596
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr ""
+
+#: git-submodule.sh:627
+#, 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
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+
+#: git-sh-setup.sh:200 git-sh-setup.sh:207
+#, 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
+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
+#, 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
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr ""
+
+#: git-sh-setup.sh:253
+msgid "Additionally, your index contains uncommitted changes."
+msgstr ""
+
+#: git-sh-setup.sh:373
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr ""
+
+#: git-sh-setup.sh:378
+msgid "Unable to determine absolute path of git directory"
+msgstr ""
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:212
+#, perl-format
+msgid "%12s %12s %s"
+msgstr ""
+
+#: git-add--interactive.perl:632
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:1056
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+
+#: git-add--interactive.perl:1059
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+
+#: git-add--interactive.perl:1062
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: 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."
+msgstr ""
+
+#: git-add--interactive.perl:1114
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr ""
+
+#: git-add--interactive.perl:1121
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+
+#: git-add--interactive.perl:1143
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr ""
+
+#: git-add--interactive.perl:1251
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1257
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1263
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1269
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1281
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1287
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1299
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1314
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+
+#: git-add--interactive.perl:1345
+msgid "The selected hunks do not apply to the index!\n"
+msgstr ""
+
+#: git-add--interactive.perl:1360
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr ""
+
+#: git-add--interactive.perl:1479
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1480
+#, perl-format
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1481
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1482
+#, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+
+#: git-add--interactive.perl:1599
+msgid "No other hunks to goto\n"
+msgstr ""
+
+#: git-add--interactive.perl:1617
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr ""
+
+#: git-add--interactive.perl:1622
+#, 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
+msgid "No other hunks to search\n"
+msgstr ""
+
+#: git-add--interactive.perl:1674
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr ""
+
+#: git-add--interactive.perl:1684
+msgid "No hunk matches the given pattern\n"
+msgstr ""
+
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+msgid "No previous hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+msgid "No next hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1730
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1736
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] ""
+msgstr[1] ""
+
+#: git-add--interactive.perl:1746
+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
+msgid ""
+"status        - show paths with changes\n"
+"update        - add working tree state to the staged set of changes\n"
+"revert        - revert staged set of changes back to the HEAD version\n"
+"patch         - pick hunks and update selectively\n"
+"diff          - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+
+#: 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
+msgid "missing --"
+msgstr ""
+
+#: git-add--interactive.perl:1866
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr ""
+
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr ""
+
+#: git-send-email.perl:129
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr ""
+
+#: git-send-email.perl:136 git-send-email.perl:142
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr ""
+
+#: 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 ""
+
+#: git-send-email.perl:316
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+
+#: git-send-email.perl:321
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr ""
+
+#: git-send-email.perl:450
+msgid "--dump-aliases incompatible with other options\n"
+msgstr ""
+
+#: 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:530 git-send-email.perl:746
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr ""
+
+#: 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:546
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:577
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:617
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:619
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:621
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr ""
+
+#: git-send-email.perl:626
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr ""
+
+#: git-send-email.perl:711
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for.  Please disambiguate by...\n"
+"\n"
+"    * Saying \"./%s\" if you mean a file; or\n"
+"    * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+
+#: git-send-email.perl:732
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr ""
+
+#: git-send-email.perl:767
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+
+#: git-send-email.perl:780
+#, perl-format
+msgid "No subject line in %s?"
+msgstr ""
+
+#: git-send-email.perl:791
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr ""
+
+#: git-send-email.perl:802
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+
+#: git-send-email.perl:826
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr ""
+
+#: git-send-email.perl:843
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr ""
+
+#: git-send-email.perl:886
+msgid "Summary email is empty, skipping it\n"
+msgstr ""
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:935
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr ""
+
+#: git-send-email.perl:990
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+
+#: git-send-email.perl:995
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr ""
+
+#: git-send-email.perl:1003
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+
+#: git-send-email.perl:1022
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr ""
+
+#: git-send-email.perl:1040
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr ""
+
+#: git-send-email.perl:1052
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr ""
+
+#: git-send-email.perl:1114 git-send-email.perl:1122
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr ""
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1126
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr ""
+
+#: git-send-email.perl:1446
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr ""
+
+#: 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"
+"    send-email prompts before sending whenever this occurs.\n"
+"    This behavior is controlled by the sendemail.confirm\n"
+"    configuration setting.\n"
+"\n"
+"    For additional information, run 'git send-email --help'.\n"
+"    To retain the current behavior, but squelch this message,\n"
+"    run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1544
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr ""
+
+#: git-send-email.perl:1547
+msgid "Send this email reply required"
+msgstr ""
+
+#: git-send-email.perl:1581
+msgid "The required SMTP server is not properly defined."
+msgstr ""
+
+#: git-send-email.perl:1628
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr ""
+
+#: git-send-email.perl:1633 git-send-email.perl:1637
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr ""
+
+#: git-send-email.perl:1646
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+
+#: git-send-email.perl:1664
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr ""
+
+#: git-send-email.perl:1667
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr ""
+
+#: git-send-email.perl:1667
+#, perl-format
+msgid "Sent %s\n"
+msgstr ""
+
+#: git-send-email.perl:1669
+msgid "Dry-OK. Log says:\n"
+msgstr ""
+
+#: git-send-email.perl:1669
+msgid "OK. Log says:\n"
+msgstr ""
+
+#: git-send-email.perl:1688
+msgid "Result: "
+msgstr ""
+
+#: git-send-email.perl:1691
+msgid "Result: OK\n"
+msgstr ""
+
+#: git-send-email.perl:1709
+#, perl-format
+msgid "can't open file %s"
+msgstr ""
+
+#: git-send-email.perl:1756 git-send-email.perl:1776
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1762
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1819
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1854
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1965
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr ""
+
+#: git-send-email.perl:1972
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr ""
+
+#: git-send-email.perl:1976
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr ""
+
+#: git-send-email.perl:2006
+msgid "cannot send message as 7bit"
+msgstr ""
+
+#: git-send-email.perl:2014
+msgid "invalid transfer encoding"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: git-send-email.perl:2064
+#, perl-format
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+
+#: git-send-email.perl:2082
+#, perl-format
+msgid "Skipping %s with backup suffix '%s'.\n"
+msgstr ""
+
+#. TRANSLATORS: please keep "[y|N]" as is.
+#: git-send-email.perl:2086
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+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 "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."
diff --git a/po/it.po b/po/it.po
index 036276fc41..02a8c2b7c8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1,18 +1,18 @@
 # Italian translations for Git.
 # Copyright (C) 2012 Marco Paolone <marcopaolone@gmail.com>
-# Copyright © 2018-2019 Alessandro Menti <alessandro.menti@alessandromenti.it>
+# Copyright © 2018-2020 Alessandro Menti <alessandro.menti@alessandromenti.it>
 # This file is distributed under the same license as the Git package.
 #
 # Thanks to the former translators, Marco Paolone <marcopaolone AT gmail.com>
 # and Stefano Lattarini <stefano.lattarini AT gmail.com>, for their
 # contributions.
-# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2019.
+# Alessandro Menti <alessandro.menti@alessandromenti.it>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-10-28 13:19+0800\n"
-"PO-Revision-Date: 2019-10-28 20:11+0100\n"
+"POT-Creation-Date: 2020-10-10 09:32+0800\n"
+"PO-Revision-Date: 2020-10-10 09:31+0200\n"
 "Last-Translator: Alessandro Menti <alessandro.menti@alessandromenti.it>\n"
 "Language-Team: Italian <>\n"
 "Language: it\n"
@@ -20,51 +20,805 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 19.08.2\n"
+"X-Generator: Lokalize 20.08.1\n"
 
-#: advice.c:109
+#: add-interactive.c:368
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Eh (%s)?"
+
+#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3250
+#: sequencer.c:3698 sequencer.c:3840 builtin/rebase.c:1526
+#: builtin/rebase.c:1944
+msgid "could not read index"
+msgstr "impossibile leggere l'indice"
+
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binario"
+
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "non fare nulla"
+
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "non modificato"
+
+#: add-interactive.c:672 git-add--interactive.perl:643
+msgid "Update"
+msgstr "Aggiorna"
+
+#: add-interactive.c:689 add-interactive.c:877
+#, c-format
+msgid "could not stage '%s'"
+msgstr "impossibile aggiungere '%s' all'area di staging"
+
+#: add-interactive.c:695 add-interactive.c:884 reset.c:89 sequencer.c:3444
+msgid "could not write index"
+msgstr "impossibile scrivere l'indice"
+
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "aggiornato %d percorso\n"
+msgstr[1] "aggiornati %d percorsi\n"
+
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "nota: %s ora non è tracciato.\n"
+
+#: add-interactive.c:721 apply.c:4127 builtin/checkout.c:295
+#: builtin/reset.c:145
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry non riuscito per il percorso '%s'"
+
+#: add-interactive.c:751 git-add--interactive.perl:655
+msgid "Revert"
+msgstr "Esegui il revert"
+
+#: add-interactive.c:767
+msgid "Could not parse HEAD^{tree}"
+msgstr "Impossibile analizzare HEAD^{tree}"
+
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "ripristinato %d percorso\n"
+msgstr[1] "ripristinati %d percorsi\n"
+
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Nessun file non tracciato.\n"
+
+#: add-interactive.c:860 git-add--interactive.perl:689
+msgid "Add untracked"
+msgstr "Aggiungi file non tracciati"
+
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "aggiunto %d percorso\n"
+msgstr[1] "aggiunti %d percorsi\n"
+
+#: add-interactive.c:917
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ignoro ciò che non è stato sottoposto a merge: %s"
+
+#: add-interactive.c:929 add-patch.c:1738 git-add--interactive.perl:1371
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Sono stati modificati solo file binari.\n"
+
+#: add-interactive.c:931 add-patch.c:1736 git-add--interactive.perl:1373
+#, c-format
+msgid "No changes.\n"
+msgstr "Nessuna modifica.\n"
+
+#: add-interactive.c:935 git-add--interactive.perl:1381
+msgid "Patch update"
+msgstr "Aggiornamento patch"
+
+#: add-interactive.c:974 git-add--interactive.perl:1794
+msgid "Review diff"
+msgstr "Rivedi diff"
+
+#: add-interactive.c:1002
+msgid "show paths with changes"
+msgstr "visualizza i percorsi modificati"
+
+#: add-interactive.c:1004
+msgid "add working tree state to the staged set of changes"
+msgstr ""
+"aggiungi lo stato dall'albero di lavoro all'insieme delle modifiche "
+"nell'area di staging"
+
+#: add-interactive.c:1006
+msgid "revert staged set of changes back to the HEAD version"
+msgstr ""
+"ripristina l'insieme delle modifiche nell'area di staging alla versione HEAD"
+
+#: add-interactive.c:1008
+msgid "pick hunks and update selectively"
+msgstr ""
+"seleziona gli hunk in modalità interattiva ed esegui l'aggiornamento in modo "
+"selettivo"
+
+#: add-interactive.c:1010
+msgid "view diff between HEAD and index"
+msgstr "visualizza il diff fra HEAD e l'indice"
+
+#: add-interactive.c:1012
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+"aggiungi i contenuti dei file non tracciati all'insieme delle modifiche "
+"nell'area di staging"
+
+#: add-interactive.c:1020 add-interactive.c:1069
+msgid "Prompt help:"
+msgstr "Guida prompt:"
+
+#: add-interactive.c:1022
+msgid "select a single item"
+msgstr "seleziona un singolo elemento"
+
+#: add-interactive.c:1024
+msgid "select a range of items"
+msgstr "seleziona un intervallo di elementi"
+
+#: add-interactive.c:1026
+msgid "select multiple ranges"
+msgstr "seleziona più intervalli"
+
+#: add-interactive.c:1028 add-interactive.c:1073
+msgid "select item based on unique prefix"
+msgstr "seleziona un elemento basandoti su un prefisso univoco"
+
+#: add-interactive.c:1030
+msgid "unselect specified items"
+msgstr "deseleziona gli elementi specificati"
+
+#: add-interactive.c:1032
+msgid "choose all items"
+msgstr "seleziona tutti gli elementi"
+
+#: add-interactive.c:1034
+msgid "(empty) finish selecting"
+msgstr "(vuoto) termina la selezione"
+
+#: add-interactive.c:1071
+msgid "select a numbered item"
+msgstr "seleziona un elemento numerato"
+
+#: add-interactive.c:1075
+msgid "(empty) select nothing"
+msgstr "(vuoto) non selezionare nulla"
+
+#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1891
+msgid "*** Commands ***"
+msgstr "*** Comandi ***"
+
+#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1888
+msgid "What now"
+msgstr "Cosa faccio ora"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "staged"
+msgstr "nell'area di staging"
+
+#: add-interactive.c:1136 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "rimosso dall'area di staging"
+
+#: add-interactive.c:1136 apply.c:4984 apply.c:4987 builtin/am.c:2270
+#: builtin/am.c:2273 builtin/bugreport.c:133 builtin/clone.c:123
+#: builtin/fetch.c:147 builtin/merge.c:275 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
+#: git-add--interactive.perl:213
+msgid "path"
+msgstr "percorso"
+
+#: add-interactive.c:1143
+msgid "could not refresh index"
+msgstr "impossibile aggiornare l'indice"
+
+#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1805
+#, c-format
+msgid "Bye.\n"
+msgstr "Ciao.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Modifica modo stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1434
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Eliminazione stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:36 git-add--interactive.perl:1435
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr "Aggiunta stage [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:37 git-add--interactive.perl:1436
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Eseguire lo stage di quest'hunk [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 ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
+"contrassegnato immediatamente per l'aggiunta all'area di staging."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - aggiungi quest'hunk all'area di staging\n"
+"n - non aggiungere quest'hunk all'area di staging\n"
+"q - esci; non aggiungere né quest'hunk né quelli rimanenti all'area di "
+"staging\n"
+"a - aggiungi quest'hunk e tutti quelli successivi nel file all'area di "
+"staging\n"
+"d - non aggiungere né quest'hunk né quelli successivi nel file all'area di "
+"staging\n"
+
+#: add-patch.c:56 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Stash mode change [y,n,q,a,d%s,?]? "
+msgstr "Modifica modo stash [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:57 git-add--interactive.perl:1440
+#, c-format, perl-format
+msgid "Stash deletion [y,n,q,a,d%s,?]? "
+msgstr "Eliminazione stash [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58 git-add--interactive.perl:1441
+#, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr "Aggiunta stash [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:59 git-add--interactive.perl:1442
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Eseguire lo stash di quest'hunk [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 ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
+"contrassegnato immediatamente per lo stash."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - esegui lo stash di quest'hunk\n"
+"n - non eseguire lo stash di quest'hunk\n"
+"q - esci; non eseguire lo stash di quest'hunk né di quelli rimanenti\n"
+"a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n"
+"d - non eseguire lo stash né di quest'hunk né di quelli successivi nel file\n"
+
+#: add-patch.c:80 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81 git-add--interactive.perl:1446
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:82 git-add--interactive.perl:1447
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr "Rimozione aggiunta dall'area di staging [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:83 git-add--interactive.perl:1448
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Rimuovere quest'hunk dall'area di staging [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 ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
+"contrassegnato immediatamente per la rimozione dall'area di staging."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - rimuovi quest'hunk dall'area di staging\n"
+"n - non rimuovere quest'hunk dall'area di staging\n"
+"q - esci; non rimuovere né quest'hunk né quelli rimanenti dall'area di "
+"staging\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file dall'area di "
+"staging\n"
+"d - non rimuovere né quest'hunk né quelli successivi nel file dall'area di "
+"staging\n"
+
+#: 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 "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? "
+
+#: 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 "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? "
+
+#: 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 "Applicare l'aggiunta all'indice [y,n,q,a,d%s,?]? "
+
+#: 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 "Applicare quest'hunk all'indice [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 ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
+"contrassegnato immediatamente per l'applicazione."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applica quest'hunk all'indice\n"
+"n - non applicare quest'hunk all'indice\n"
+"q - esci; non applicare né quest'hunk né quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare né quest'hunk né quelli successivi nel file\n"
+
+#: 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 "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: 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 "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: 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 "Scartare l'aggiunta dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: 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 "Scartare quest'hunk dall'albero di lavoro [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 ""
+"Se la patch viene applicata senza problemi, l'hunk modificato sarà "
+"contrassegnato immediatamente per la rimozione."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - rimuovi quest'hunk dall'albero di lavoro\n"
+"n - non rimuovere quest'hunk dall'albero di lavoro\n"
+"q - esci; non rimuovere né quest'hunk né quelli rimanenti\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
+"d - non rimuovere né quest'hunk né quelli successivi nel file\n"
+
+#: 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 ""
+"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d"
+"%s,?]? "
+
+#: 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 ""
+"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: 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 ""
+"Scartare l'aggiunta dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: 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 ""
+"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - rimuovi quest'hunk dall'indice e dall'albero di lavoro\n"
+"n - non rimuovere quest'hunk dall'indice e dall'albero di lavoro\n"
+"q - esci; non rimuovere né quest'hunk né quelli rimanenti\n"
+"a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
+"d - non rimuovere né quest'hunk né quelli successivi nel file\n"
+
+#: 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 ""
+"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d"
+"%s,?]? "
+
+#: 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 ""
+"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: 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 ""
+"Applicare l'aggiunta all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: 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 ""
+"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applica quest'hunk all'indice e all'albero di lavoro\n"
+"n - non applicare quest'hunk all'indice e all'albero di lavoro\n"
+"q - esci; non applicare né quest'hunk né quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare né quest'hunk né quelli successivi nel file\n"
+
+#: add-patch.c:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applica quest'hunk all'albero di lavoro\n"
+"n - non applicare quest'hunk all'albero di lavoro\n"
+"q - esci; non applicare né quest'hunk né quelli rimanenti\n"
+"a - applica quest'hunk e tutti quelli successivi nel file\n"
+"d - non applicare né quest'hunk né quelli successivi nel file\n"
+
+#: add-patch.c:342
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "impossibile analizzare l'header hunk '%.*s'"
+
+#: add-patch.c:361 add-patch.c:365
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "impossibile analizzare l'header hunk colorato '%.*s'"
+
+#: add-patch.c:419
+msgid "could not parse diff"
+msgstr "impossibile analizzare il diff"
+
+#: add-patch.c:438
+msgid "could not parse colored diff"
+msgstr "impossibile analizzare il diff colorato"
+
+#: add-patch.c:452
+#, c-format
+msgid "failed to run '%s'"
+msgstr "esecuzione di '%s' non riuscita"
+
+#: add-patch.c:611
+msgid "mismatched output from interactive.diffFilter"
+msgstr "output di interactive.diffFilter non corrispondente"
+
+#: add-patch.c:612
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Il filtro deve mantenere una corrispondenza uno a uno\n"
+"fra le righe di input e di output."
+
+#: add-patch.c:785
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"attesa riga contesto %d in\n"
+"%.*s"
+
+#: add-patch.c:800
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"gli hunk non si sovrappongono:\n"
+"%.*s\n"
+"\tnon termina con:\n"
+"%.*s"
+
+#: add-patch.c:1076 git-add--interactive.perl:1117
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr ""
+"Modalità manuale modifica hunt - vedi la fine del file per una guida "
+"veloce.\n"
+
+#: add-patch.c:1080
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Per rimuovere '%c' righe, rendile righe ' ' (contesto).\n"
+"Per rimuovere '%c' righe, eliminale.\n"
+"Le righe che iniziano con %c saranno rimosse.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1094 git-add--interactive.perl:1131
+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 ""
+"Se non può essere applicata senza problemi, ti sarà data la possibilità\n"
+"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n"
+"rimosse, la modifica sarà interrotta e l'hunk non sarà modificato.\n"
+
+#: add-patch.c:1127
+msgid "could not parse hunk header"
+msgstr "impossibile analizzare l'header hunk"
+
+#: add-patch.c:1172
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' non riuscito"
+
+#. 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.
+#.
+#. 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:1241 git-add--interactive.perl:1244
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"L'hunk modificato non può essere applicato senza problemi. Modificarlo di "
+"nuovo (se rispondi \"no\", sarà eliminato!) [y/n]? "
+
+#: add-patch.c:1284
+msgid "The selected hunks do not apply to the index!"
+msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!"
+
+#: add-patch.c:1285 git-add--interactive.perl:1348
+msgid "Apply them to the worktree anyway? "
+msgstr "Vuoi comunque applicarli all'albero di lavoro? "
+
+#: add-patch.c:1292 git-add--interactive.perl:1351
+msgid "Nothing was applied.\n"
+msgstr "Non è stato applicato nulla.\n"
+
+#: add-patch.c:1349
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - non decidere in merito a quest'hunk, vai al successivo hunk per cui non "
+"è stata presa una decisione\n"
+"J - non decidere in merito a quest'hunk, vai all'hunk successivo\n"
+"k - non decidere in merito a quest'hunk, vai al precedente hunk per cui non "
+"è stata presa una decisione\n"
+"K - non decidere in merito a quest'hunk, vai all'hunk precedente\n"
+"g - seleziona un hunk a cui andare\n"
+"/ - cerca un hunk corrispondente all'espressione regolare data\n"
+"s - suddividi l'hunk corrente in hunk più piccoli\n"
+"e - modifica manualmente l'hunk corrente\n"
+"? - stampa una guida\n"
+
+#: add-patch.c:1511 add-patch.c:1521
+msgid "No previous hunk"
+msgstr "Nessun hunk precedente"
+
+#: add-patch.c:1516 add-patch.c:1526
+msgid "No next hunk"
+msgstr "Nessun hunk successivo"
+
+#: add-patch.c:1532
+msgid "No other hunks to goto"
+msgstr "Nessun altro hunk a cui andare"
+
+#: add-patch.c:1543 git-add--interactive.perl:1608
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? "
+
+#: add-patch.c:1544 git-add--interactive.perl:1610
+msgid "go to which hunk? "
+msgstr "a quale hunk desideri andare? "
+
+#: add-patch.c:1555
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Numero non valido: '%s'"
+
+#: add-patch.c:1560
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] "Mi dispiace, è disponibile solo %d hunk."
+msgstr[1] "Mi dispiace, sono disponibili solo %d hunk."
+
+#: add-patch.c:1569
+msgid "No other hunks to search"
+msgstr "Nessun altro hunk in cui eseguire la ricerca"
+
+#: add-patch.c:1575 git-add--interactive.perl:1663
+msgid "search for regex? "
+msgstr "cercare un'espressione regolare? "
+
+#: add-patch.c:1590
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Espressione regolare di ricerca %s malformata: %s"
+
+#: add-patch.c:1607
+msgid "No hunk matches the given pattern"
+msgstr "Nessun hunk corrisponde al pattern fornito"
+
+#: add-patch.c:1614
+msgid "Sorry, cannot split this hunk"
+msgstr "Mi dispiace, non posso suddividere quest'hunk"
+
+#: add-patch.c:1618
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Suddiviso in %d hunk."
+
+#: add-patch.c:1622
+msgid "Sorry, cannot edit this hunk"
+msgstr "Mi dispiace, non posso modificare quest'hunk"
+
+#: add-patch.c:1674
+msgid "'git apply' failed"
+msgstr "'git apply' non riuscito"
+
+#: advice.c:140
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Per disabilitare questo messaggio, esegui \"git config advice.%s false\""
+
+#: advice.c:156
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%ssuggerimento: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:247
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr ""
 "Il cherry picking non è possibile perché ci sono file di cui non è stato "
 "eseguito il merge."
 
-#: advice.c:164
+#: advice.c:249
 msgid "Committing is not possible because you have unmerged files."
 msgstr ""
 "Il commit non è possibile perché ci sono file di cui non è stato eseguito il "
 "merge."
 
-#: advice.c:166
+#: advice.c:251
 msgid "Merging is not possible because you have unmerged files."
 msgstr ""
 "Il merge non è possibile perché ci sono file di cui non è stato eseguito il "
 "merge."
 
-#: advice.c:168
+#: advice.c:253
 msgid "Pulling is not possible because you have unmerged files."
 msgstr ""
 "Il pull non è possibile perché ci sono file di cui non è stato eseguito il "
 "merge."
 
-#: advice.c:170
+#: advice.c:255
 msgid "Reverting is not possible because you have unmerged files."
 msgstr ""
 "Il revert non è possibile perché ci sono file di cui non è stato eseguito il "
 "merge."
 
-#: advice.c:172
+#: advice.c:257
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr ""
 "Impossibile eseguire il %s perché ci sono file di cui non è stato eseguito "
 "il merge."
 
-#: advice.c:180
+#: advice.c:265
 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."
@@ -72,23 +826,23 @@ msgstr ""
 "Correggili nell'albero di lavoro, quindi usa 'git add/rm <file>...' come "
 "appropriato per risolverli ed esegui un commit."
 
-#: advice.c:188
+#: advice.c:273
 msgid "Exiting because of an unresolved conflict."
 msgstr "Esco a causa di un conflitto non risolto."
 
-#: advice.c:193 builtin/merge.c:1332
+#: advice.c:278 builtin/merge.c:1349
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Il merge non è stato concluso (esiste MERGE_HEAD)."
 
-#: advice.c:195
+#: advice.c:280
 msgid "Please, commit your changes before merging."
 msgstr "Esegui il commit delle modifiche prima di eseguire il merge."
 
-#: advice.c:196
+#: advice.c:281
 msgid "Exiting because of unfinished merge."
 msgstr "Esco a causa di un merge non terminato."
 
-#: advice.c:202
+#: advice.c:287
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -302,24 +1056,24 @@ msgstr "impossibile leggere il collegamento simbolico %s"
 msgid "unable to open or read %s"
 msgstr "impossibile aprire o leggere %s"
 
-#: apply.c:2926
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "inizio della riga non valido: '%c'"
 
-#: apply.c:3047
+#: 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] "Applicazione frammento %d riuscita alla riga %d (offset: %d riga)."
 msgstr[1] "Applicazione frammento %d riuscita alla riga %d (offset: %d righe)."
 
-#: apply.c:3059
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Contesto ridotto a (%ld/%ld) per applicare il frammento alla riga %d"
 
-#: apply.c:3065
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -328,26 +1082,26 @@ msgstr ""
 "durante la ricerca di:\n"
 "%.*s"
 
-#: apply.c:3087
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "dati della patch binaria mancanti per '%s'"
 
-#: apply.c:3095
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr ""
 "impossibile applicare una patch binaria al contrario senza l'hunk contrario "
 "per '%s'"
 
-#: apply.c:3142
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr ""
 "impossibile applicare una patch binaria a '%s' senza la riga d'indice "
 "completa"
 
-#: apply.c:3152
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -355,435 +1109,465 @@ msgstr ""
 "la patch si applica a '%s' (%s), che non corrisponde ai contenuti correnti "
 "del file."
 
-#: apply.c:3160
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "la patch si applica a un file vuoto '%s' ma il file non è vuoto"
 
-#: apply.c:3178
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "impossibile leggere la postimmagine %s necessaria per '%s'"
 
-#: apply.c:3191
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "la patch binaria non si applica correttamente a '%s'"
 
-#: apply.c:3197
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
 "la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)"
 
-#: apply.c:3218
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "patch non riuscita: %s:%ld"
 
-#: apply.c:3341
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "impossibile eseguire il checkout di '%s'"
 
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:72 setup.c:308
 #, c-format
 msgid "failed to read %s"
 msgstr "lettura di %s non riuscita"
 
-#: apply.c:3401
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "lettura di '%s' oltre un collegamento simbolico"
 
-#: apply.c:3430 apply.c:3673
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "il percorso %s è stato rinominato/eliminato"
 
-#: apply.c:3516 apply.c:3688
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: non esiste nell'indice"
 
-#: apply.c:3525 apply.c:3696
+#: apply.c:3537 apply.c:3708 apply.c:3953
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: non corrisponde all'indice"
 
-#: apply.c:3560
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr ""
 "dal repository manca il blob necessario per ripiegare sul merge a tre vie."
 
-#: apply.c:3563
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Ripiego sul merge a tre vie...\n"
 
-#: apply.c:3579 apply.c:3583
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "impossibile leggere i contenuti correnti di '%s'"
 
-#: apply.c:3595
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "Ripiego sul merge a tre vie non riuscito...\n"
 
-#: apply.c:3609
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch applicata a '%s' con conflitti.\n"
 
-#: apply.c:3614
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch '%s' applicata correttamente.\n"
 
-#: apply.c:3640
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr "la rimozione della patch lascia contenuti del file"
 
-#: apply.c:3713
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo errato"
 
-#: apply.c:3715
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s ha il tipo %o, atteso %o"
 
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
+#: read-cache.c:1313
 #, c-format
 msgid "invalid path '%s'"
 msgstr "percorso '%s' non valido"
 
-#: apply.c:3924
+#: apply.c:3950
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: esiste già nell'indice"
 
-#: apply.c:3927
+#: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: esiste già nella directory di lavoro"
 
-#: apply.c:3947
+#: apply.c:3976
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o)"
 
-#: apply.c:3952
+#: apply.c:3981
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "il nuovo modo (%o) di %s non corrisponde al vecchio modo (%o) di %s"
 
-#: apply.c:3972
+#: apply.c:4001
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "il file interessato '%s' si trova oltre un collegamento simbolico"
 
-#: apply.c:3976
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: la patch non si applica correttamente"
 
-#: apply.c:3991
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Controllo della patch %s in corso..."
 
-#: apply.c:4083
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "le informazioni SHA1 per il sottomodulo %s sono mancanti o inutili"
 
-#: apply.c:4090
+#: apply.c:4119
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "modifica modo per %s che non è nell'HEAD corrente"
 
-#: apply.c:4093
+#: apply.c:4122
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "le informazioni SHA1 sono mancanti o inutili (%s)."
 
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry non riuscito per il percorso '%s'"
-
-#: apply.c:4102
+#: apply.c:4131
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "impossibile aggiungere %s all'indice temporaneo"
 
-#: apply.c:4112
+#: apply.c:4141
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "impossibile scrivere l'indice temporaneo in %s"
 
-#: apply.c:4250
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "impossibile rimuovere %s dall'indice"
 
-#: apply.c:4284
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrotta per il sottomodulo %s"
 
-#: apply.c:4290
+#: apply.c:4319
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "impossibile eseguire lo stat del file appena creato '%s'"
 
-#: apply.c:4298
+#: apply.c:4327
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "impossibile creare l'archivio di backup per il file appena creato %s"
 
-#: apply.c:4304 apply.c:4449
+#: apply.c:4333 apply.c:4478
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "impossibile aggiungere la voce della cache per %s"
 
-#: apply.c:4347
+#: apply.c:4376 builtin/bisect--helper.c:537
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "scrittura in '%s' non riuscita"
 
-#: apply.c:4351
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
 msgstr "chiusura del file '%s' in corso"
 
-#: apply.c:4421
+#: apply.c:4450
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "impossibile scrivere il file '%s' con modo %o"
 
-#: apply.c:4519
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s applicata correttamente."
 
-#: apply.c:4527
+#: apply.c:4556
 msgid "internal error"
 msgstr "errore interno"
 
-#: apply.c:4530
+#: apply.c:4559
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "Applicazione della patch %%s con %d frammento respinto..."
 msgstr[1] "Applicazione della patch %%s con %d frammenti respinti..."
 
-#: apply.c:4541
+#: apply.c:4570
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "nome file .rej troncato a %.*s.rej"
 
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
+#: apply.c:4578 builtin/fetch.c:927 builtin/fetch.c:1228
 #, c-format
 msgid "cannot open %s"
 msgstr "impossibile aprire %s"
 
-#: apply.c:4563
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Frammento %d applicato correttamente."
 
-#: apply.c:4567
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Frammento %d respinto."
 
-#: apply.c:4686
+#: apply.c:4715
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ignorata."
 
-#: apply.c:4694
+#: apply.c:4723
 msgid "unrecognized input"
 msgstr "input non riconosciuto"
 
-#: apply.c:4714
+#: apply.c:4743
 msgid "unable to read index file"
 msgstr "impossibile leggere il file index"
 
-#: apply.c:4871
+#: apply.c:4900
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "impossibile aprire la patch '%s': %s"
 
-#: apply.c:4898
+#: apply.c:4927
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "%d errore di spazi bianchi soppresso"
 msgstr[1] "%d errori di spazi bianchi soppressi"
 
-#: apply.c:4904 apply.c:4919
+#: apply.c:4933 apply.c:4948
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d riga aggiunge errori di spazi bianchi."
 msgstr[1] "%d righe aggiungono errori di spazi bianchi."
 
-#: apply.c:4912
+#: apply.c:4941
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "%d riga applicata dopo la correzione di errori di spazi bianchi."
 msgstr[1] "%d righe applicate dopo la correzione di errori di spazi bianchi."
 
-#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4957 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "Impossibile scrivere il nuovo file index"
 
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "percorso"
-
-#: apply.c:4956
+#: apply.c:4985
 msgid "don't apply changes matching the given path"
 msgstr "non applicare le modifiche corrispondenti al percorso specificato"
 
-#: apply.c:4959
+#: apply.c:4988
 msgid "apply changes matching the given path"
 msgstr "applica le modifiche corrispondenti al percorso specificato"
 
-#: apply.c:4961 builtin/am.c:2206
+#: apply.c:4990 builtin/am.c:2279
 msgid "num"
 msgstr "num"
 
-#: apply.c:4962
+#: apply.c:4991
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "rimuovi <num> barre iniziali dai percorsi diff tradizionali"
 
-#: apply.c:4965
+#: apply.c:4994
 msgid "ignore additions made by the patch"
 msgstr "ignora le aggiunte create dalla patch"
 
-#: apply.c:4967
+#: apply.c:4996
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr ""
 "invece di applicare la patch, visualizza l'output di diffstat per l'input"
 
-#: apply.c:4971
+#: apply.c:5000
 msgid "show number of added and deleted lines in decimal notation"
 msgstr ""
 "visualizza il numero di righe aggiunte ed eliminate in notazione decimale"
 
-#: apply.c:4973
+#: apply.c:5002
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "invece di applicare la patch, visualizza un riassunto per l'input"
 
-#: apply.c:4975
+#: apply.c:5004
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "invece di applicare la patch, verifica se può essere applicata"
 
-#: apply.c:4977
+#: apply.c:5006
 msgid "make sure the patch is applicable to the current index"
 msgstr "assicura che la patch sia applicabile all'indice corrente"
 
-#: apply.c:4979
+#: apply.c:5008
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "contrassegna i nuovi file con `git add --intent-to-add`"
 
-#: apply.c:4981
+#: apply.c:5010
 msgid "apply a patch without touching the working tree"
 msgstr "applica una patch senza modificare l'albero di lavoro"
 
-#: apply.c:4983
+#: apply.c:5012
 msgid "accept a patch that touches outside the working area"
 msgstr ""
 "accetta una patch che apporta modifiche al di fuori dell'area di lavoro"
 
-#: apply.c:4986
+#: apply.c:5015
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "applica anche la patch (da usare con --stat/--summary/--check)"
 
-#: apply.c:4988
+#: apply.c:5017
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "prova un merge a tre vie se la patch non si applica correttamente"
 
-#: apply.c:4990
+#: apply.c:5019
 msgid "build a temporary index based on embedded index information"
 msgstr "compila un index temporaneo basato sulle informazioni indice incluse"
 
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5022 builtin/checkout-index.c:173 builtin/ls-files.c:525
 msgid "paths are separated with NUL character"
 msgstr "i percorsi sono separati con un carattere NUL"
 
-#: apply.c:4995
+#: apply.c:5024
 msgid "ensure at least <n> lines of context match"
 msgstr "assicura che almeno <n> righe di contesto corrispondano"
 
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
+#: apply.c:5025 builtin/am.c:2258 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
+#: builtin/pack-objects.c:3562 builtin/rebase.c:1340
 msgid "action"
 msgstr "azione"
 
-#: apply.c:4997
+#: apply.c:5026
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi"
 
-#: apply.c:5000 apply.c:5003
+#: apply.c:5029 apply.c:5032
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignora modifiche agli spazi bianchi durante la ricerca dei contesti"
 
-#: apply.c:5006
+#: apply.c:5035
 msgid "apply the patch in reverse"
 msgstr "applica la patch in maniera inversa"
 
-#: apply.c:5008
+#: apply.c:5037
 msgid "don't expect at least one line of context"
 msgstr "non aspettare almeno una riga di contesto"
 
-#: apply.c:5010
+#: apply.c:5039
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "lascia i frammenti respinti nei file *.rej corrispondenti"
 
-#: apply.c:5012
+#: apply.c:5041
 msgid "allow overlapping hunks"
 msgstr "consenti la sovrapposizione dei frammenti"
 
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5042 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:2270 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "visualizza ulteriori dettagli"
 
-#: apply.c:5015
+#: apply.c:5044
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr ""
 "tollera carattere fine riga rilevato erroneamente come mancante alla fine "
 "del file"
 
-#: apply.c:5018
+#: apply.c:5047
 msgid "do not trust the line counts in the hunk headers"
 msgstr ""
 "non fare affidamento sul numero di righe nelle intestazioni dei frammenti"
 
-#: apply.c:5020 builtin/am.c:2194
+#: apply.c:5049 builtin/am.c:2267
 msgid "root"
 msgstr "radice"
 
-#: apply.c:5021
+#: apply.c:5050
 msgid "prepend <root> to all filenames"
 msgstr "anteponi <radice> a tutti i nomi file"
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "impossibile eseguire lo streaming del blob %s"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "modo file non supportato: 0%o (SHA1: %s)"
+
+#: archive-tar.c:449
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "impossibile avviare il filtro '%s'"
+
+#: archive-tar.c:452
+msgid "unable to redirect descriptor"
+msgstr "impossibile ridirezionare il descrittore"
+
+#: archive-tar.c:459
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "il filtro '%s' ha segnalato un errore"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "il percorso non è codificato validamente in UTF-8: %s"
+
+#: archive-zip.c:322
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s"
+
+#: archive-zip.c:469 builtin/pack-objects.c:244 builtin/pack-objects.c:247
+#, c-format
+msgid "deflate error (%d)"
+msgstr "errore deflate (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "timestamp troppo grande per questo sistema: %<PRIuMAX>"
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<opzioni>] <albero> [<percorso>...]"
@@ -803,183 +1587,164 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repository> [--exec <comando>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:192
+#, c-format
+msgid "cannot read %s"
+msgstr "impossibile leggere %s"
+
+#: archive.c:345 sequencer.c:445 sequencer.c:1706 sequencer.c:2852
+#: sequencer.c:3293 sequencer.c:3402 builtin/am.c:263 builtin/commit.c:786
+#: builtin/merge.c:1124
+#, c-format
+msgid "could not read '%s'"
+msgstr "impossibile leggere '%s'"
+
+#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "lo specificatore percorso '%s' non corrisponde ad alcun file"
 
-#: archive.c:396
+#: archive.c:454
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "riferimento non esistente: %.*s"
 
-#: archive.c:401
+#: archive.c:460
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "%s non è un nome oggetto valido"
 
-#: archive.c:414
+#: archive.c:473
 #, c-format
 msgid "not a tree object: %s"
 msgstr "%s non è un oggetto albero valido"
 
-#: archive.c:426
+#: archive.c:485
 msgid "current working directory is untracked"
 msgstr "la directory di lavoro corrente non è tracciata"
 
-#: archive.c:457
+#: archive.c:526
+#, c-format
+msgid "File not found: %s"
+msgstr "File non trovato: %s"
+
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "non è un file regolare: %s"
+
+#: archive.c:553
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:457
+#: archive.c:553
 msgid "archive format"
 msgstr "formato archivio"
 
-#: archive.c:458 builtin/log.c:1581
+#: archive.c:554 builtin/log.c:1760
 msgid "prefix"
 msgstr "prefisso"
 
-#: archive.c:459
+#: archive.c:555
 msgid "prepend prefix to each pathname in the archive"
 msgstr "anteponi <prefisso> a ogni nome percorso nell'archivio"
 
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:186
+#: archive.c:556 archive.c:559 builtin/blame.c:884 builtin/blame.c:888
+#: builtin/blame.c:889 builtin/commit-tree.c:117 builtin/config.c:133
+#: builtin/fast-export.c:1208 builtin/fast-export.c:1210
+#: builtin/fast-export.c:1214 builtin/grep.c:908 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
 msgid "file"
 msgstr "file"
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:557
+msgid "add untracked file to archive"
+msgstr "aggiungi il file non tracciato all'archivio"
+
+#: archive.c:560 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr "scrivi l'archivio in questo file"
 
-#: archive.c:463
+#: archive.c:562
 msgid "read .gitattributes in working directory"
 msgstr "leggi il file .gitattributes nella directory di lavoro"
 
-#: archive.c:464
+#: archive.c:563
 msgid "report archived files on stderr"
 msgstr "elenca i file archiviati sullo standard error"
 
-#: archive.c:465
+#: archive.c:564
 msgid "store only"
 msgstr "salva solamente"
 
-#: archive.c:466
+#: archive.c:565
 msgid "compress faster"
 msgstr "comprimi più velocemente"
 
-#: archive.c:474
+#: archive.c:573
 msgid "compress better"
 msgstr "comprimi meglio"
 
-#: archive.c:477
+#: archive.c:576
 msgid "list supported archive formats"
 msgstr "elenca i formati archivio supportati"
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: archive.c:578 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1830 builtin/submodule--helper.c:2335
 msgid "repo"
 msgstr "repository"
 
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:579 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "recupera l'archivio dal repository remoto <repository>"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:580 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "comando"
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:581 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "percorso al comando remoto git-upload-archive"
 
-#: archive.c:489
+#: archive.c:588
 msgid "Unexpected option --remote"
 msgstr "Opzione --remote inattesa"
 
-#: archive.c:491
+#: archive.c:590
 msgid "Option --exec can only be used together with --remote"
 msgstr "L'opzione --exec può essere usata solo con --remote"
 
-#: archive.c:493
+#: archive.c:592
 msgid "Unexpected option --output"
 msgstr "Opzione --output inattesa"
 
-#: archive.c:515
+#: archive.c:594
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "Le opzioni --add-file e --remote non possono essere usate insieme"
+
+#: archive.c:616
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Formato archivio '%s' sconosciuto"
 
-#: archive.c:522
+#: archive.c:623
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argomento non supportato per il formato '%s': -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "impossibile eseguire lo streaming del blob %s"
-
-#: archive-tar.c:266 archive-zip.c:363
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "modo file non supportato: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr "impossibile leggere %s"
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "impossibile avviare il filtro '%s'"
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "impossibile ridirezionare il descrittore"
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "il filtro '%s' ha segnalato un errore"
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "il percorso non è codificato validamente in UTF-8: %s"
-
-#: archive-zip.c:318
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "percorso troppo lungo (%d caratteri, SHA1: %s): %s"
-
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
-#, c-format
-msgid "deflate error (%d)"
-msgstr "errore deflate (%d)"
-
-#: archive-zip.c:609
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "timestamp troppo grande per questo sistema: %<PRIuMAX>"
-
-#: attr.c:213
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s non è un nome attributo valido"
 
-#: attr.c:370
+#: attr.c:369
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s non consentito: %s:%d"
 
-#: attr.c:410
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -987,22 +1752,22 @@ msgstr ""
 "I pattern negativi sono ignorati negli attributi git\n"
 "Usa '\\!' per specificare letteralmente un punto esclamativo iniziale."
 
-#: bisect.c:468
+#: bisect.c:476
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Contenuto mal racchiuso fra virgolette nel file '%s': %s"
 
-#: bisect.c:678
+#: bisect.c:686
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Impossibile eseguire un'ulteriore bisezione!\n"
 
-#: bisect.c:733
+#: bisect.c:753
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "%s non è un nome commit valido"
 
-#: bisect.c:758
+#: bisect.c:778
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1011,7 +1776,7 @@ msgstr ""
 "La base del merge %s non funziona.\n"
 "Ciò significa che il bug è stato corretto fra %s e [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:783
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1020,7 +1785,7 @@ msgstr ""
 "La base del merge %s è nuova.\n"
 "La proprietà è stata modificata fra %s e [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:788
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1029,7 +1794,7 @@ msgstr ""
 "La base del merge %s è %s.\n"
 "Ciò significa che il primo commit '%s' è fra %s e [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:796
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1040,7 +1805,7 @@ msgstr ""
 "git bisect non può funzionare correttamente in questo caso.\n"
 "Forse hai confuso le revisioni %s con quelle %s?\n"
 
-#: bisect.c:789
+#: bisect.c:809
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1051,36 +1816,36 @@ msgstr ""
 "Non è possibile essere sicuri che il primo commit %s sia fra %s e %s.\n"
 "Continuo comunque."
 
-#: bisect.c:822
+#: bisect.c:848
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisezione: dev'essere testata una base del merge\n"
 
-#: bisect.c:865
+#: bisect.c:898
 #, c-format
 msgid "a %s revision is needed"
 msgstr "è richiesta una revisione %s"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:928 builtin/notes.c:177 builtin/tag.c:255
 #, c-format
 msgid "could not create file '%s'"
 msgstr "impossibile creare il file '%s'"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:974 builtin/merge.c:150
 #, c-format
 msgid "could not read file '%s'"
 msgstr "impossibile leggere il file '%s'"
 
-#: bisect.c:958
+#: bisect.c:1014
 msgid "reading bisect refs failed"
 msgstr "lettura riferimenti della bisezione non riuscita"
 
-#: bisect.c:977
+#: bisect.c:1044
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s era sia %s sia %s\n"
 
-#: bisect.c:985
+#: bisect.c:1053
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1089,7 +1854,7 @@ msgstr ""
 "Nessun commit testabile trovato.\n"
 "Forse hai iniziato il procedimento specificando parametri percorso errati?\n"
 
-#: bisect.c:1004
+#: bisect.c:1082
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1099,7 +1864,7 @@ msgstr[1] "(circa %d passi)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1088
 #, 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"
@@ -1108,41 +1873,41 @@ msgstr[0] ""
 msgstr[1] ""
 "Bisezione in corso: %d revisioni rimanenti da testare dopo questa %s\n"
 
-#: blame.c:2700
+#: blame.c:2778
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents e --reverse non sono compatibili."
 
-#: blame.c:2714
+#: blame.c:2792
 msgid "cannot use --contents with final commit object name"
 msgstr "impossibile usare --contents con il nome oggetto del commit finale"
 
-#: blame.c:2735
+#: blame.c:2813
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "le opzioni --reverse e --first-parent se usate insieme richiedono che sia "
 "specificato l'ultimo commit"
 
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
-#: builtin/shortlog.c:192
+#: blame.c:2822 bundle.c:213 ref-filter.c:2264 remote.c:2020 sequencer.c:2105
+#: sequencer.c:4606 submodule.c:855 builtin/commit.c:1045 builtin/log.c:404
+#: builtin/log.c:1020 builtin/log.c:1622 builtin/log.c:2029 builtin/log.c:2319
+#: builtin/merge.c:414 builtin/pack-objects.c:3380 builtin/pack-objects.c:3395
+#: builtin/shortlog.c:320
 msgid "revision walk setup failed"
 msgstr "impostazione percorso revisioni non riuscita"
 
-#: blame.c:2762
+#: blame.c:2840
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "le opzioni --reverse e --first-parent se usate insieme richiedono che sia "
 "specificato un intervallo nella catena del primo commit genitore"
 
-#: blame.c:2773
+#: blame.c:2851
 #, c-format
 msgid "no such path %s in %s"
 msgstr "il percorso %s in %s non esiste"
 
-#: blame.c:2784
+#: blame.c:2862
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "impossibile leggere il blob %s per il percorso %s"
@@ -1284,415 +2049,370 @@ msgstr "Nome oggetto ambiguo: '%s'."
 msgid "Not a valid branch point: '%s'."
 msgstr "Punto di branch non valido: '%s'."
 
-#: branch.c:364
+#: branch.c:365
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "Il checkout di '%s' è già stato eseguito in '%s'"
 
-#: branch.c:387
+#: branch.c:388
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "L'HEAD dell'albero di lavoro %s non è aggiornato"
 
-#: bundle.c:36
+#: bundle.c:41
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' non sembra essere un file bundle v2"
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algoritmo hash bundle non riconosciuto: %s"
 
-#: bundle.c:64
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "capacità '%s' sconosciuta"
+
+#: bundle.c:71
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' non sembra essere un file bundle v2 o v3"
+
+#: bundle.c:110
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "intestazione non riconosciuta: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
-#: builtin/commit.c:791
+#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2357 sequencer.c:3142
+#: builtin/commit.c:814
 #, c-format
 msgid "could not open '%s'"
 msgstr "impossibile aprire '%s'"
 
-#: bundle.c:143
+#: bundle.c:189
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Dal repository mancano questi commit richiesti come prerequisito:"
 
-#: bundle.c:146
+#: bundle.c:192
 msgid "need a repository to verify a bundle"
 msgstr "è necessario un repository per verificare un bundle"
 
-#: bundle.c:197
+#: bundle.c:243
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
 msgstr[0] "Il bundle contiene questo riferimento:"
 msgstr[1] "Il bundle contiene questi %d riferimenti:"
 
-#: bundle.c:204
+#: bundle.c:250
 msgid "The bundle records a complete history."
 msgstr "Nel bundle è registrata una cronologia completa."
 
-#: bundle.c:206
+#: bundle.c:252
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "Il bundle richiede questo riferimento:"
 msgstr[1] "Il bundle richiede questi %d riferimenti:"
 
-#: bundle.c:272
+#: bundle.c:319
 msgid "unable to dup bundle descriptor"
 msgstr "impossibile duplicare il descrittore bundle"
 
-#: bundle.c:279
+#: bundle.c:326
 msgid "Could not spawn pack-objects"
 msgstr "Impossibile avviare pack-objects"
 
-#: bundle.c:290
+#: bundle.c:337
 msgid "pack-objects died"
 msgstr "comando pack-objects morto"
 
-#: bundle.c:332
+#: bundle.c:379
 msgid "rev-list died"
 msgstr "comando rev-list morto"
 
-#: bundle.c:381
+#: bundle.c:428
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "il riferimento '%s' è escluso dalle opzioni di rev-list"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
+#: bundle.c:498
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "versione bundle %d non supportata"
+
+#: bundle.c:500
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "impossibile scrivere il bundle versione %d con l'algoritmo %s"
+
+#: bundle.c:522 builtin/log.c:207 builtin/log.c:1918 builtin/shortlog.c:461
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "argomento non riconosciuto: %s"
 
-#: bundle.c:468
+#: bundle.c:530
 msgid "Refusing to create empty bundle."
 msgstr "Mi rifiuto di creare un bundle vuoto."
 
-#: bundle.c:478
+#: bundle.c:540
 #, c-format
 msgid "cannot create '%s'"
 msgstr "impossibile creare '%s'"
 
-#: bundle.c:503
+#: bundle.c:565
 msgid "index-pack died"
 msgstr "comando index-pack morto"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "valore colore non valido: %.*s"
 
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
-#, c-format
-msgid "could not parse %s"
-msgstr "impossibile analizzare %s"
-
-#: commit.c:52
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s non è un commit!"
-
-#: commit.c:192
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Il supporto per <GIT_DIR>/info/graft è deprecato\n"
-"e sarà rimosso in una versione futura di Git.\n"
-"\n"
-"Usa \"git replace --convert-graft-file\"\n"
-"per convertire i graft in ref sostitutivi.\n"
-"\n"
-"Per disabilitare questo messaggio, esegui\n"
-"\"git config advice.graftFileDeprecated false\""
+#: commit-graph.c:188 midx.c:46
+msgid "invalid hash version"
+msgstr "versione hash non valida"
 
-#: commit.c:1128
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "Il commit %s ha una firma GPG non affidabile, presumibilmente di %s."
-
-#: commit.c:1131
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "Il commit %s ha una firma GPG non valida presumibilmente di %s."
-
-#: commit.c:1134
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Il commit %s non ha una firma GPG."
-
-#: commit.c:1137
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "Il commit %s ha una firma GPG valida di %s\n"
-
-#: commit.c:1391
-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 ""
-"Attenzione: il messaggio di commit non è conforme alla codifica UTF-8.\n"
-"Potresti volerlo modificare dopo aver corretto il messaggio, o impostare\n"
-"la variabile di configurazione i18n.commitencoding alla codifica usata\n"
-"dal tuo progetto.\n"
-
-#: commit-graph.c:127
+#: commit-graph.c:246
 msgid "commit-graph file is too small"
 msgstr "il file grafo dei commit %s è troppo piccolo"
 
-#: commit-graph.c:192
+#: commit-graph.c:311
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "la firma del grafo dei commit %X non corrisponde alla firma %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:318
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "la versione del grafo dei commit %X non corrisponde alla versione %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:325
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr ""
 "la versione hash del grafo dei commit %X non corrisponde alla versione %X"
 
-#: commit-graph.c:229
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"voce blocco grafo dei commit mancante nella tabella di ricerca; il file "
-"potrebbe non essere completo"
+#: commit-graph.c:342
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "il file grafo dei commit è troppo piccolo per contenere %u chunk"
 
-#: commit-graph.c:240
+#: commit-graph.c:361
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "offset blocco grafo dei commit improprio %08x%08x"
 
-#: commit-graph.c:283
+#: commit-graph.c:433
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "l'ID del blocco grafo dei commit %08x compare più volte"
 
-#: commit-graph.c:347
+#: commit-graph.c:499
 msgid "commit-graph has no base graphs chunk"
 msgstr "il grafo dei commit non ha un blocco grafi di base"
 
-#: commit-graph.c:357
+#: commit-graph.c:509
 msgid "commit-graph chain does not match"
 msgstr "la catena del grafo dei commit non corrisponde"
 
-#: commit-graph.c:404
+#: commit-graph.c:557
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "catena grafo dei commit non valida: la riga '%s' non è un hash"
 
-#: commit-graph.c:430
+#: commit-graph.c:581
 msgid "unable to find all commit-graph files"
 msgstr "impossibile trovare tutti i file grafo dei commit"
 
-#: commit-graph.c:561 commit-graph.c:621
+#: commit-graph.c:721 commit-graph.c:785
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr ""
 "posizione commit non valida. Il grafo dei commit è probabilmente corrotto"
 
-#: commit-graph.c:582
+#: commit-graph.c:742
 #, c-format
 msgid "could not find commit %s"
 msgstr "impossibile trovare il commit %s"
 
-#: commit-graph.c:855 builtin/am.c:1287
+#: commit-graph.c:1042 builtin/am.c:1306
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "impossibile analizzare il commit %s"
 
-#: commit-graph.c:859
-#, c-format
-msgid "unable to get tree for %s"
-msgstr "impossibile recuperare l'albero per %s"
-
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
+#: commit-graph.c:1265 builtin/pack-objects.c:2864
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "impossibile recuperare il tipo dell'oggetto %s"
 
-#: commit-graph.c:1049
+#: commit-graph.c:1301
 msgid "Loading known commits in commit graph"
 msgstr "Caricamento commit noti nel grafo dei commit in corso"
 
-#: commit-graph.c:1066
+#: commit-graph.c:1318
 msgid "Expanding reachable commits in commit graph"
 msgstr "Espansione dei commit raggiungibili nel grafo dei commit in corso"
 
-#: commit-graph.c:1085
+#: commit-graph.c:1338
 msgid "Clearing commit marks in commit graph"
 msgstr "Rimozione dei contrassegni commit nel grafo dei commit in corso"
 
-#: commit-graph.c:1104
+#: commit-graph.c:1357
 msgid "Computing commit graph generation numbers"
 msgstr "Calcolo numeri generazione del grafo dei commit in corso"
 
-#: commit-graph.c:1179
+#: commit-graph.c:1424
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+"Calcolo dei filtri di Bloom per i percorsi modificati nei commit in corso"
+
+#: commit-graph.c:1501
+msgid "Collecting referenced commits"
+msgstr "Raccolta dei commit referenziati in corso"
+
+#: commit-graph.c:1526
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
 msgstr[0] "Ricerca dei commit per il grafo dei commit in %d pack in corso"
 msgstr[1] "Ricerca dei commit per il grafo dei commit in %d pack in corso"
 
-#: commit-graph.c:1192
+#: commit-graph.c:1539
 #, c-format
 msgid "error adding pack %s"
 msgstr "errore durante l'aggiunta del pack %s"
 
-#: commit-graph.c:1196
+#: commit-graph.c:1543
 #, c-format
 msgid "error opening index for %s"
 msgstr "errore durante l'apertura dell'indice per %s"
 
-#: commit-graph.c:1220
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] ""
-"Ricerca dei commit per il grafo dei commit da %d riferimento in corso"
-msgstr[1] ""
-"Ricerca dei commit per il grafo dei commit da %d riferimenti in corso"
-
-#: commit-graph.c:1240
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "ID oggetto commit non valido: %s"
-
-#: commit-graph.c:1255
+#: commit-graph.c:1582
 msgid "Finding commits for commit graph among packed objects"
 msgstr ""
 "Ricerca dei commit per il grafo dei commit fra gli oggetti nei pack in corso"
 
-#: commit-graph.c:1270
+#: commit-graph.c:1597
 msgid "Counting distinct commits in commit graph"
 msgstr "Conteggio commit distinti nel grafo dei commit in corso"
 
-#: commit-graph.c:1300
+#: commit-graph.c:1629
 msgid "Finding extra edges in commit graph"
 msgstr "Ricerca degli archi aggiuntivi nel grafo dei commit in corso"
 
-#: commit-graph.c:1346
+#: commit-graph.c:1678
 msgid "failed to write correct number of base graph ids"
 msgstr "impossibile scrivere il numero esatto degli ID grafo di base"
 
-#: commit-graph.c:1379 midx.c:810
+#: commit-graph.c:1720 midx.c:826
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "impossibile creare le prime directory di %s"
 
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
+#: commit-graph.c:1733
+msgid "unable to create temporary graph layer"
+msgstr "impossibile creare il livello grafico temporaneo"
+
+#: commit-graph.c:1738
 #, c-format
-msgid "unable to create '%s'"
-msgstr "impossibile creare '%s'"
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "impossibile modificare i permessi condivisi per '%s'"
 
-#: commit-graph.c:1451
+#: commit-graph.c:1808
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
 msgstr[0] "Scrittura in %d passaggio del grafo dei commit in corso"
 msgstr[1] "Scrittura in %d passaggi del grafo dei commit in corso"
 
-#: commit-graph.c:1492
+#: commit-graph.c:1853
 msgid "unable to open commit-graph chain file"
 msgstr "impossibile aprire il file catena grafo dei commit"
 
-#: commit-graph.c:1504
+#: commit-graph.c:1869
 msgid "failed to rename base commit-graph file"
 msgstr "impossibile ridenominare il file di base grafo dei commit"
 
-#: commit-graph.c:1524
+#: commit-graph.c:1889
 msgid "failed to rename temporary commit-graph file"
 msgstr "impossibile ridenominare il file temporaneo grafo dei commit"
 
-#: commit-graph.c:1635
+#: commit-graph.c:2015
 msgid "Scanning merged commits"
 msgstr "Scansione dei commit sottoposti a merge in corso"
 
-#: commit-graph.c:1646
+#: commit-graph.c:2026
 #, c-format
 msgid "unexpected duplicate commit id %s"
 msgstr "ID commit duplicato inatteso: %s"
 
-#: commit-graph.c:1670
+#: commit-graph.c:2049
 msgid "Merging commit-graph"
 msgstr "Merge del grafo dei commit in corso"
 
-#: commit-graph.c:1860
+#: commit-graph.c:2259
 #, c-format
 msgid "the commit graph format cannot write %d commits"
 msgstr ""
 "il formato del grafo dei commit non può essere usato per scrivere %d commit"
 
-#: commit-graph.c:1871
+#: commit-graph.c:2270
 msgid "too many commits to write graph"
 msgstr "troppi commit da scrivere nel grafo"
 
-#: commit-graph.c:1961
+#: commit-graph.c:2363
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr ""
 "il file del grafo dei commit ha un checksum non corretto e probabilmente è "
 "corrotto"
 
-#: commit-graph.c:1971
+#: commit-graph.c:2373
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "il grafo dei commit ha un ordine OID non corretto: %s seguito da %s"
 
-#: commit-graph.c:1981 commit-graph.c:1996
+#: commit-graph.c:2383 commit-graph.c:2398
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr ""
 "il grafo dei commit ha un valore fanout non corretto: fanout[%d] = %u != %u"
 
-#: commit-graph.c:1988
+#: commit-graph.c:2390
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "impossibile analizzare il commit %s nel grafo dei commit"
 
-#: commit-graph.c:2006
+#: commit-graph.c:2408
 msgid "Verifying commits in commit graph"
 msgstr "Verifica dei commit nel grafo dei commit in corso"
 
-#: commit-graph.c:2020
+#: commit-graph.c:2423
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr ""
 "impossibile analizzare il commit %s dal database oggetti per il grafo dei "
 "commit"
 
-#: commit-graph.c:2027
+#: commit-graph.c:2430
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr ""
 "l'OID dell'albero radice per il commit %s nel grafo dei commit è %s != %s"
 
-#: commit-graph.c:2037
+#: commit-graph.c:2440
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "l'elenco genitori nel grafo dei commit per il commit %s è troppo lungo"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2449
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "il genitore nel grafo dei commit per %s è %s != %s"
 
-#: commit-graph.c:2059
+#: commit-graph.c:2463
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr ""
 "l'elenco genitori nel grafo dei commit per il commit %s è finito prima del "
 "previsto"
 
-#: commit-graph.c:2064
+#: commit-graph.c:2468
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1700,7 +2420,7 @@ msgstr ""
 "il grafo dei commit ha un numero generazione zero per il commit %s ma non "
 "pari a zero per gli altri"
 
-#: commit-graph.c:2068
+#: commit-graph.c:2472
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1708,22 +2428,84 @@ msgstr ""
 "il grafo dei commit ha un numero generazione non pari a zero per il commit "
 "%s ma pari a zero per gli altri"
 
-#: commit-graph.c:2083
+#: commit-graph.c:2488
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "il numero generazione nel grafo dei commit per il commit %s è %u != %u"
 
-#: commit-graph.c:2089
+#: commit-graph.c:2494
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr ""
 "la data per il commit %s nel grafo dei commit è %<PRIuMAX> != %<PRIuMAX>"
 
+#: commit.c:52 sequencer.c:2845 builtin/am.c:373 builtin/am.c:417
+#: builtin/am.c:1385 builtin/am.c:2031 builtin/replace.c:457
+#, c-format
+msgid "could not parse %s"
+msgstr "impossibile analizzare %s"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s non è un commit!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Il supporto per <GIT_DIR>/info/graft è deprecato\n"
+"e sarà rimosso in una versione futura di Git.\n"
+"\n"
+"Usa \"git replace --convert-graft-file\"\n"
+"per convertire i graft in ref sostitutivi.\n"
+"\n"
+"Per disabilitare questo messaggio, esegui\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#: commit.c:1172
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "Il commit %s ha una firma GPG non affidabile, presumibilmente di %s."
+
+#: commit.c:1176
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Il commit %s ha una firma GPG non valida presumibilmente di %s."
+
+#: commit.c:1179
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Il commit %s non ha una firma GPG."
+
+#: commit.c:1182
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Il commit %s ha una firma GPG valida di %s\n"
+
+#: commit.c:1436
+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 ""
+"Attenzione: il messaggio di commit non è conforme alla codifica UTF-8.\n"
+"Potresti volerlo modificare dopo aver corretto il messaggio, o impostare\n"
+"la variabile di configurazione i18n.commitencoding alla codifica usata\n"
+"dal tuo progetto.\n"
+
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "memoria esaurita"
 
-#: config.c:124
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1738,299 +2520,299 @@ msgstr ""
 "\t%s\n"
 "Ciò può essere dovuto a delle inclusioni circolari."
 
-#: config.c:140
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "impossibile espandere il percorso di inclusione '%s'"
 
-#: config.c:151
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "le inclusioni configurazione relative devono provenire da file"
 
-#: config.c:197
+#: config.c:198
 msgid "relative config include conditionals must come from files"
 msgstr ""
 "i condizionali di inclusione configurazione relativi devono provenire da file"
 
-#: config.c:376
+#: config.c:378
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "la chiave non contiene una sezione: %s"
 
-#: config.c:382
+#: config.c:384
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "la chiave non contiene un nome variabile: %s"
 
-#: config.c:406 sequencer.c:2401
+#: config.c:408 sequencer.c:2547
 #, c-format
 msgid "invalid key: %s"
 msgstr "chiave non valida: %s"
 
-#: config.c:412
+#: config.c:414
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "chiave non valida (nuova riga): %s"
 
-#: config.c:448 config.c:460
+#: config.c:450 config.c:462
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "parametro configurazione fittizio: %s"
 
-#: config.c:495
+#: config.c:497
 #, c-format
 msgid "bogus format in %s"
 msgstr "formato fittizio in %s"
 
-#: config.c:821
+#: config.c:836
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "riga configurazione %d errata nel blob %s"
 
-#: config.c:825
+#: config.c:840
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "riga configurazione %d errata nel file %s"
 
-#: config.c:829
+#: config.c:844
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "riga configurazione %d errata nello standard input"
 
-#: config.c:833
+#: config.c:848
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "riga configurazione %d errata nel blob sottomodulo %s"
 
-#: config.c:837
+#: config.c:852
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "riga configurazione %d errata nella riga di comando %s"
 
-#: config.c:841
+#: config.c:856
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "riga configurazione %d errata in %s"
 
-#: config.c:978
+#: config.c:993
 msgid "out of range"
 msgstr "fuori intervallo"
 
-#: config.c:978
+#: config.c:993
 msgid "invalid unit"
 msgstr "unità non valida"
 
-#: config.c:979
+#: config.c:994
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "valore configurazione numerico '%s' errato per '%s': %s"
 
-#: config.c:998
+#: config.c:1013
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "valore configurazione numerico '%s' errato per '%s' nel blob %s: %s"
 
-#: config.c:1001
+#: config.c:1016
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "valore configurazione numerico '%s' errato per '%s' nel file %s: %s"
 
-#: config.c:1004
+#: config.c:1019
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr ""
 "valore configurazione numerico '%s' errato per '%s' nello standard input: %s"
 
-#: config.c:1007
+#: config.c:1022
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr ""
 "valore configurazione numerico '%s' errato per '%s' nel blob sottomodulo %s: "
 "%s"
 
-#: config.c:1010
+#: config.c:1025
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr ""
 "valore configurazione numerico '%s' errato per '%s' nella riga di comando "
 "%s: %s"
 
-#: config.c:1013
+#: config.c:1028
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "valore configurazione numerico '%s' errato per '%s' in %s: %s"
 
-#: config.c:1108
+#: config.c:1123
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "espansione directory utente in '%s' non riuscita"
 
-#: config.c:1117
+#: config.c:1132
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%s' per '%s' non è un timestamp valido"
 
-#: config.c:1208
+#: config.c:1223
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "lunghezza abbreviazione fuori intervallo: %d"
 
-#: config.c:1222 config.c:1233
+#: config.c:1237 config.c:1248
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "livello compressione zlib %d non valido"
 
-#: config.c:1325
+#: config.c:1340
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar dovrebbe essere composto da un solo carattere"
 
-#: config.c:1358
+#: config.c:1373
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "modalità non valida per la creazione di un oggetto: %s"
 
-#: config.c:1425
+#: config.c:1445
 #, c-format
 msgid "malformed value for %s"
 msgstr "valore malformato per %s"
 
-#: config.c:1451
+#: config.c:1471
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "valore malformato per %s: %s"
 
-#: config.c:1452
+#: config.c:1472
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "dev'essere nothing, matching, simple, upstream o current"
 
-#: config.c:1513 builtin/pack-objects.c:3394
+#: config.c:1533 builtin/pack-objects.c:3649
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "livello compressione pack %d non valido"
 
-#: config.c:1634
+#: config.c:1655
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "impossibile caricare l'oggetto blob configurazione '%s'"
 
-#: config.c:1637
+#: config.c:1658
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "il riferimento '%s' non punta ad un blob"
 
-#: config.c:1654
+#: config.c:1675
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "impossibile risolvere il blob configurazione '%s'"
 
-#: config.c:1684
+#: config.c:1705
 #, c-format
 msgid "failed to parse %s"
 msgstr "analisi di %s non riuscita"
 
-#: config.c:1740
+#: config.c:1759
 msgid "unable to parse command-line config"
 msgstr "impossibile analizzare la configurazione a riga di comando"
 
-#: config.c:2091
+#: config.c:2122
 msgid "unknown error occurred while reading the configuration files"
 msgstr ""
 "si è verificato un errore imprevisto durante la lettura dei file di "
 "configurazione"
 
-#: config.c:2261
+#: config.c:2296
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s non valido: '%s'"
 
-#: config.c:2306
+#: config.c:2341
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr ""
 "il valore splitIndex.maxPercentChange '%d' dovrebbe essere compreso fra 0 e "
 "100"
 
-#: config.c:2352
+#: config.c:2387
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "impossibile analizzare '%s' dalla configurazione a riga di comando"
 
-#: config.c:2354
+#: config.c:2389
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "variabile configurazione '%s' errata nel file '%s' alla riga %d"
 
-#: config.c:2435
+#: config.c:2470
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "nome sezione '%s' non valido"
 
-#: config.c:2467
+#: config.c:2502
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s ha più valori"
 
-#: config.c:2496
+#: config.c:2531
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "scrittura del nuovo file di configurazione %s non riuscita"
 
-#: config.c:2748 config.c:3072
+#: config.c:2783 config.c:3107
 #, c-format
 msgid "could not lock config file %s"
 msgstr "impossibile bloccare il file di configurazione %s"
 
-#: config.c:2759
+#: config.c:2794
 #, c-format
 msgid "opening %s"
 msgstr "apertura di %s in corso"
 
-#: config.c:2794 builtin/config.c:328
+#: config.c:2829 builtin/config.c:354
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "pattern non valido: %s"
 
-#: config.c:2819
+#: config.c:2854
 #, c-format
 msgid "invalid config file %s"
 msgstr "file di configurazione %s non valido"
 
-#: config.c:2832 config.c:3085
+#: config.c:2867 config.c:3120
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat di %s non riuscita"
 
-#: config.c:2843
+#: config.c:2878
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr "impossibile eseguire mmap su '%s'"
 
-#: config.c:2852 config.c:3090
+#: config.c:2887 config.c:3125
 #, c-format
 msgid "chmod on %s failed"
 msgstr "esecuzione chmod su %s non riuscita"
 
-#: config.c:2937 config.c:3187
+#: config.c:2972 config.c:3222
 #, c-format
 msgid "could not write config file %s"
 msgstr "impossibile scrivere il file di configurazione %s"
 
-#: config.c:2971
+#: config.c:3006
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "impossibile impostare '%s' a '%s'"
 
-#: config.c:2973 builtin/remote.c:782
+#: config.c:3008 builtin/remote.c:656 builtin/remote.c:850 builtin/remote.c:858
 #, c-format
 msgid "could not unset '%s'"
 msgstr "impossibile eliminare l'impostazione di '%s'"
 
-#: config.c:3063
+#: config.c:3098
 #, c-format
 msgid "invalid section name: %s"
 msgstr "nome sezione non valido: %s"
 
-#: config.c:3230
+#: config.c:3265
 #, c-format
 msgid "missing value for '%s'"
 msgstr "valore mancante per '%s'"
@@ -2057,72 +2839,81 @@ msgstr ""
 msgid "server doesn't support '%s'"
 msgstr "il server non supporta '%s'"
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "il server non supporta la funzionalità '%s'"
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
 msgstr "atteso flush dopo lettura funzionalità"
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "ignoro le funzionalità dopo la prima riga '%s'"
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "errore protocollo: capabilities^{} non atteso"
 
-#: connect.c:273
+#: connect.c:306
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "errore protocollo: atteso SHA1 shallow, ricevuto '%s'"
 
-#: connect.c:275
+#: connect.c:308
 msgid "repository on the other end cannot be shallow"
 msgstr "il repository della controparte non può essere shallow"
 
-#: connect.c:313
+#: connect.c:347
 msgid "invalid packet"
 msgstr "pacchetto non valido"
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "errore protocollo: '%s' non atteso"
 
-#: connect.c:441
+#: connect.c:473
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "formato oggetto '%s' sconosciuto specificato dal server"
+
+#: connect.c:500
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "risposta ls-refs non valida: %s"
 
-#: connect.c:445
+#: connect.c:504
 msgid "expected flush after ref listing"
 msgstr "atteso flush dopo elenco ref"
 
-#: connect.c:544
+#: connect.c:507
+msgid "expected response end packet after ref listing"
+msgstr "atteso pacchetto fine risposta dopo elenco ref"
+
+#: connect.c:640
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "il protocollo '%s' non è supportato"
 
-#: connect.c:595
+#: connect.c:691
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "impossibile impostare SO_KEEPALIVE sul socket"
 
-#: connect.c:635 connect.c:698
+#: connect.c:731 connect.c:794
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Risoluzione di %s in corso... "
 
-#: connect.c:639
+#: connect.c:735
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr "impossibile risolvere %s (porta %s) (%s)"
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:643 connect.c:714
+#: connect.c:739 connect.c:810
 #, c-format
 msgid ""
 "done.\n"
@@ -2131,7 +2922,7 @@ msgstr ""
 "fatto.\n"
 "Connessione a %s (porta %s) in corso... "
 
-#: connect.c:665 connect.c:742
+#: connect.c:761 connect.c:838
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2141,75 +2932,75 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:767 connect.c:844
 msgid "done."
 msgstr "fatto."
 
-#: connect.c:702
+#: connect.c:798
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "impossibile risolvere %s (%s)"
 
-#: connect.c:708
+#: connect.c:804
 #, c-format
 msgid "unknown port %s"
 msgstr "porta %s sconosciuta"
 
-#: connect.c:845 connect.c:1175
+#: connect.c:941 connect.c:1271
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "nome host strano '%s' bloccato"
 
-#: connect.c:847
+#: connect.c:943
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "porta strana '%s' bloccata"
 
-#: connect.c:857
+#: connect.c:953
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "impossibile avviare il proxy %s"
 
-#: connect.c:928
+#: connect.c:1024
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 "nessun percorso specificato; vedere 'git help pull' per le sintassi URL "
 "valide"
 
-#: connect.c:1123
+#: connect.c:1219
 msgid "ssh variant 'simple' does not support -4"
 msgstr "la variante SSH 'simple' non supporta -4"
 
-#: connect.c:1135
+#: connect.c:1231
 msgid "ssh variant 'simple' does not support -6"
 msgstr "la variante SSH 'simple' non supporta -6"
 
-#: connect.c:1152
+#: connect.c:1248
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "la variante SSH 'simple' non supporta l'impostazione della porta"
 
-#: connect.c:1264
+#: connect.c:1360
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "percorso strano '%s' bloccato"
 
-#: connect.c:1311
+#: connect.c:1408
 msgid "unable to fork"
 msgstr "impossibile eseguire fork"
 
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "Controllo connessione in corso"
 
-#: connected.c:100
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
 msgstr "Impossibile eseguire 'git-rev-list'"
 
-#: connected.c:120
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr "scrittura nella rev-list non riuscita"
 
-#: connected.c:127
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "chiusura standard input della rev-list non riuscita"
 
@@ -2246,26 +3037,26 @@ msgstr ""
 "LF sarà sostituito da CRLF in %s.\n"
 "Il file avrà i suoi fine riga originari nella propria directory di lavoro"
 
-#: convert.c:280
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "Il BOM è vietato in '%s' se il file è codificato come %s"
 
-#: convert.c:287
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
-"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-%s "
-"come codifica dell'albero di lavoro."
+"Il file '%s' contiene un indicatore dell'ordine dei byte (BOM). Usare UTF-"
+"%.*s come codifica dell'albero di lavoro."
 
-#: convert.c:305
+#: convert.c:304
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr "Il BOM è richiesto in '%s' se il file è codificato come %s"
 
-#: convert.c:307
+#: convert.c:306
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2275,51 +3066,51 @@ msgstr ""
 "o UTF-%sLE (a seconda dell'ordine dei byte) come codifica dell'albero di "
 "lavoro."
 
-#: convert.c:425 convert.c:496
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "conversione della codifica '%s' da %s a %s non riuscita"
 
-#: convert.c:468
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 "il risultato della codifica di '%s' da %s a %s e viceversa non è lo stesso"
 
-#: convert.c:674
+#: convert.c:665
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "impossibile eseguire fork per eseguire il filtro esterno '%s'"
 
-#: convert.c:694
+#: convert.c:685
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "impossibile fornire l'input al filtro esterno '%s'"
 
-#: convert.c:701
+#: convert.c:692
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "esecuzione del filtro esterno '%s' non riuscita: %d"
 
-#: convert.c:736 convert.c:739
+#: convert.c:727 convert.c:730
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "lettura dal filtro esterno '%s' non riuscita"
 
-#: convert.c:742 convert.c:797
+#: convert.c:733 convert.c:788
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "esecuzione del filtro esterno '%s' non riuscita"
 
-#: convert.c:845
+#: convert.c:837
 msgid "unexpected filter type"
 msgstr "tipo filtro inatteso"
 
-#: convert.c:856
+#: convert.c:848
 msgid "path name too long for external filter"
 msgstr "nome percorso troppo lungo per il filtro esterno"
 
-#: convert.c:930
+#: convert.c:940
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2328,20 +3119,49 @@ msgstr ""
 "il filtro esterno '%s' non è più disponibile nonostante non tutti i percorsi "
 "siano stati filtrati"
 
-#: convert.c:1229
+#: convert.c:1240
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false non sono codifiche dell'albero di lavoro valide"
 
-#: convert.c:1417 convert.c:1451
+#: convert.c:1428 convert.c:1462
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: esecuzione del filtro clean '%s' non riuscita"
 
-#: convert.c:1495
+#: convert.c:1508
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: esecuzione del filtro smudge '%s' non riuscita"
 
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "ignoro la ricerca delle credenziali per la chiave credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "mi rifiuto di lavorare se il campo host della credenziale è mancante"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr ""
+"mi rifiuto di lavorare se il campo protocol della credenziale è mancante"
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "l'URL contiene un carattere nuova riga nella sua componente %s: %s"
+
+#: credential.c:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "l'URL non ha uno schema: %s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "impossibile analizzare l'URL della credenziale: %s"
+
 #: date.c:138
 msgid "in the future"
 msgstr "in futuro"
@@ -2437,15 +3257,6 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr "Contrassegnate %d isole, fatto.\n"
 
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "lettura dell'orderfile '%s' non riuscita"
-
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Rilevamento ridenominazione non esatta in corso"
-
 #: diff-no-index.c:238
 msgid "git diff --no-index [<options>] <path> <path>"
 msgstr "git diff --no-index [<opzioni>] <percorso> <percorso>"
@@ -2458,19 +3269,19 @@ msgstr ""
 "Non è un repository Git. Usa --no-index per confrontare due percorsi al di "
 "fuori di un albero di lavoro"
 
-#: diff.c:155
+#: diff.c:156
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr ""
 "  Analisi della percentuale di cutoff statistiche directory '%s' non "
 "riuscita\n"
 
-#: diff.c:160
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Parametro statistiche directory '%s' sconosciuto\n"
 
-#: diff.c:296
+#: diff.c:297
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
@@ -2478,7 +3289,7 @@ msgstr ""
 "l'impostazione colore per file spostati deve essere 'no', 'default', "
 "'blocks', 'zebra', 'dimmed-zebra', 'plain'"
 
-#: diff.c:324
+#: diff.c:325
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -2488,7 +3299,7 @@ msgstr ""
 "space-change', 'ignore-space-at-eol', 'ignore-all-space', 'allow-indentation-"
 "change'"
 
-#: diff.c:332
+#: diff.c:333
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -2496,13 +3307,13 @@ msgstr ""
 "color-moved-ws: allow-indentation-change non può essere combinata con altre "
 "modalità spazi bianchi"
 
-#: diff.c:405
+#: diff.c:410
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr ""
 "Valore sconosciuto per la variabile di configurazione 'diff.submodule': '%s'"
 
-#: diff.c:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -2511,36 +3322,36 @@ msgstr ""
 "Trovati errori nella variabile di configurazione 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:4218
+#: diff.c:4269
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "processo esterno diff morto, mi fermo a %s"
 
-#: diff.c:4563
+#: diff.c:4618
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr ""
 "le opzioni --name-only, --name-status, --check e -s sono mutuamente esclusive"
 
-#: diff.c:4566
+#: diff.c:4621
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "le opzioni -G, -S e --find-object sono mutuamente esclusive"
 
-#: diff.c:4644
+#: diff.c:4699
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow richiede esattamente uno specificatore percorso"
 
-#: diff.c:4692
+#: diff.c:4747
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "valore non valido per --stat: %s"
 
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4752 diff.c:4757 diff.c:4762 diff.c:4767 diff.c:5279
+#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s richiede un valore numerico"
 
-#: diff.c:4729
+#: diff.c:4784
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2549,42 +3360,42 @@ msgstr ""
 "Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n"
 "%s"
 
-#: diff.c:4814
+#: diff.c:4869
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "classe modifica '%c' sconosciuta in --diff-filter=%s"
 
-#: diff.c:4838
+#: diff.c:4893
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "valore sconosciuto dopo ws-error-highlight=%.*s"
 
-#: diff.c:4852
+#: diff.c:4907
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "impossibile risolvere '%s'"
 
-#: diff.c:4902 diff.c:4908
+#: diff.c:4957 diff.c:4963
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s richiede il formato <n>/<m>"
 
-#: diff.c:4920
+#: diff.c:4975
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s richiede un carattere, ricevuto '%s'"
 
-#: diff.c:4941
+#: diff.c:4996
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "argomento --color-moved errato: %s"
 
-#: diff.c:4960
+#: diff.c:5015
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "modo non valido '%s' in --color-moved-ws"
 
-#: diff.c:5000
+#: diff.c:5055
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2592,151 +3403,151 @@ msgstr ""
 "l'opzione diff-algorithm accetta i valori \"myers\", \"minimal\", \"patience"
 "\" e \"histogram\""
 
-#: diff.c:5036 diff.c:5056
+#: diff.c:5091 diff.c:5111
 #, c-format
 msgid "invalid argument to %s"
 msgstr "argomento non valido per %s"
 
-#: diff.c:5194
+#: diff.c:5248
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "analisi del parametro dell'opzione --submodule non riuscita: '%s'"
 
-#: diff.c:5250
+#: diff.c:5304
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "argomento --word-diff errato: %s"
 
-#: diff.c:5273
+#: diff.c:5327
 msgid "Diff output format options"
 msgstr "Opzioni formato output diff"
 
-#: diff.c:5275 diff.c:5281
+#: diff.c:5329 diff.c:5335
 msgid "generate patch"
 msgstr "genera patch"
 
-#: diff.c:5278 builtin/log.c:172
+#: diff.c:5332 builtin/log.c:176
 msgid "suppress diff output"
 msgstr "non visualizzare l'output del diff"
 
-#: diff.c:5283 diff.c:5397 diff.c:5404
+#: diff.c:5337 diff.c:5451 diff.c:5458
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5284 diff.c:5287
+#: diff.c:5338 diff.c:5341
 msgid "generate diffs with <n> lines context"
 msgstr "genera diff con <n> righe di contesto"
 
-#: diff.c:5289
+#: diff.c:5343
 msgid "generate the diff in raw format"
 msgstr "genera il diff in formato grezzo"
 
-#: diff.c:5292
+#: diff.c:5346
 msgid "synonym for '-p --raw'"
 msgstr "sinonimo di '-p --raw'"
 
-#: diff.c:5296
+#: diff.c:5350
 msgid "synonym for '-p --stat'"
 msgstr "sinonimo di '-p --stat'"
 
-#: diff.c:5300
+#: diff.c:5354
 msgid "machine friendly --stat"
 msgstr "--stat leggibile da una macchina"
 
-#: diff.c:5303
+#: diff.c:5357
 msgid "output only the last line of --stat"
 msgstr "emetti in output solo l'ultima riga di --stat"
 
-#: diff.c:5305 diff.c:5313
+#: diff.c:5359 diff.c:5367
 msgid "<param1,param2>..."
 msgstr "<parametro1,parametro2>..."
 
-#: diff.c:5306
+#: diff.c:5360
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 "emetti in output la distribuzione del numero di modifiche relativo a ogni "
 "sottodirectory"
 
-#: diff.c:5310
+#: diff.c:5364
 msgid "synonym for --dirstat=cumulative"
 msgstr "sinonimo di --dirstat=cumulative"
 
-#: diff.c:5314
+#: diff.c:5368
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "sinonimo di --dirstat=files,parametro1,parametro2..."
 
-#: diff.c:5318
+#: diff.c:5372
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 "avvisa se le modifiche introducono marcatori conflitto o errori spazi bianchi"
 
-#: diff.c:5321
+#: diff.c:5375
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr ""
 "riassunto conciso (ad es. elementi creati, ridenominati e modifiche modi)"
 
-#: diff.c:5324
+#: diff.c:5378
 msgid "show only names of changed files"
 msgstr "visualizza solo i nomi dei file modificati"
 
-#: diff.c:5327
+#: diff.c:5381
 msgid "show only names and status of changed files"
 msgstr "visualizza solo i nomi e lo stato dei file modificati"
 
-#: diff.c:5329
+#: diff.c:5383
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<ampiezza>[,<ampiezza nome>[,<numero>]]"
 
-#: diff.c:5330
+#: diff.c:5384
 msgid "generate diffstat"
 msgstr "genera diffstat"
 
-#: diff.c:5332 diff.c:5335 diff.c:5338
+#: diff.c:5386 diff.c:5389 diff.c:5392
 msgid "<width>"
 msgstr "<ampiezza>"
 
-#: diff.c:5333
+#: diff.c:5387
 msgid "generate diffstat with a given width"
 msgstr "genera il diffstat con un'ampiezza specificata"
 
-#: diff.c:5336
+#: diff.c:5390
 msgid "generate diffstat with a given name width"
 msgstr "genera il diffstat con un'ampiezza nomi specificata"
 
-#: diff.c:5339
+#: diff.c:5393
 msgid "generate diffstat with a given graph width"
 msgstr "genera il diffstat con un'ampiezza grafo specificata"
 
-#: diff.c:5341
+#: diff.c:5395
 msgid "<count>"
 msgstr "<numero>"
 
-#: diff.c:5342
+#: diff.c:5396
 msgid "generate diffstat with limited lines"
 msgstr "genera il diffstat con righe limitate"
 
-#: diff.c:5345
+#: diff.c:5399
 msgid "generate compact summary in diffstat"
 msgstr "genera riassunto conciso nel diffstat"
 
-#: diff.c:5348
+#: diff.c:5402
 msgid "output a binary diff that can be applied"
 msgstr "stampa in output un diff binario che può essere applicato"
 
-#: diff.c:5351
+#: diff.c:5405
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "visualizza i nomi oggetto pre e post immagine nelle righe \"indice\""
 
-#: diff.c:5353
+#: diff.c:5407
 msgid "show colored diff"
 msgstr "visualizza diff colorato"
 
-#: diff.c:5354
+#: diff.c:5408
 msgid "<kind>"
 msgstr "<tipo>"
 
-#: diff.c:5355
+#: diff.c:5409
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2744,7 +3555,7 @@ msgstr ""
 "evidenzia gli errori di spazi bianchi nelle righe 'contesto', 'vecchie' o "
 "'nuove' nel diff"
 
-#: diff.c:5358
+#: diff.c:5412
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2752,91 +3563,91 @@ msgstr ""
 "non rimuovere i nomi percorso e usare caratteri NUL come terminatori campo "
 "in --raw o --numstat"
 
-#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
+#: diff.c:5415 diff.c:5418 diff.c:5421 diff.c:5527
 msgid "<prefix>"
 msgstr "<prefisso>"
 
-#: diff.c:5362
+#: diff.c:5416
 msgid "show the given source prefix instead of \"a/\""
 msgstr "visualizza il prefisso sorgente specificato invece di \"a/\""
 
-#: diff.c:5365
+#: diff.c:5419
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "visualizza il prefisso destinazione specificato invece di \"b/\""
 
-#: diff.c:5368
+#: diff.c:5422
 msgid "prepend an additional prefix to every line of output"
 msgstr "anteponi un prefisso aggiuntivo ad ogni riga dell'output"
 
-#: diff.c:5371
+#: diff.c:5425
 msgid "do not show any source or destination prefix"
 msgstr "non visualizzare alcun prefisso sorgente o destinazione"
 
-#: diff.c:5374
+#: diff.c:5428
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 "visualizza il contesto tra gli hunk del diff fino al numero di righe "
 "specificato"
 
-#: diff.c:5378 diff.c:5383 diff.c:5388
+#: diff.c:5432 diff.c:5437 diff.c:5442
 msgid "<char>"
 msgstr "<carattere>"
 
-#: diff.c:5379
+#: diff.c:5433
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "specifica il carattere che indica una nuova riga al posto di '+'"
 
-#: diff.c:5384
+#: diff.c:5438
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "specifica il carattere che indica una vecchia riga al posto di '-'"
 
-#: diff.c:5389
+#: diff.c:5443
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "specifica il carattere che indica un contesto al posto di ' '"
 
-#: diff.c:5392
+#: diff.c:5446
 msgid "Diff rename options"
 msgstr "Opzioni rinominazione diff"
 
-#: diff.c:5393
+#: diff.c:5447
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5394
+#: diff.c:5448
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 "spezza modifiche di riscrittura completa in coppie eliminazione/creazione"
 
-#: diff.c:5398
+#: diff.c:5452
 msgid "detect renames"
 msgstr "rileva le ridenominazioni"
 
-#: diff.c:5402
+#: diff.c:5456
 msgid "omit the preimage for deletes"
 msgstr "ometti la preimmagine per le eliminazioni"
 
-#: diff.c:5405
+#: diff.c:5459
 msgid "detect copies"
 msgstr "rileva le copie"
 
-#: diff.c:5409
+#: diff.c:5463
 msgid "use unmodified files as source to find copies"
 msgstr "usa file non modificati come sorgente per trovare copie"
 
-#: diff.c:5411
+#: diff.c:5465
 msgid "disable rename detection"
 msgstr "disabilita rilevamento ridenominazione"
 
-#: diff.c:5414
+#: diff.c:5468
 msgid "use empty blobs as rename source"
 msgstr "usa blob vuoti come sorgente ridenominazione"
 
-#: diff.c:5416
+#: diff.c:5470
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 "continua a elencare la cronologia di un file al di là delle ridenominazioni"
 
-#: diff.c:5419
+#: diff.c:5473
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -2844,159 +3655,159 @@ msgstr ""
 "impedisci il rilevamento ridenominazione/copia se il numero delle "
 "destinazioni ridenominazione/copia eccede il limite specificato"
 
-#: diff.c:5421
+#: diff.c:5475
 msgid "Diff algorithm options"
 msgstr "Opzioni algoritmo diff"
 
-#: diff.c:5423
+#: diff.c:5477
 msgid "produce the smallest possible diff"
 msgstr "produci il diff più piccolo possibile"
 
-#: diff.c:5426
+#: diff.c:5480
 msgid "ignore whitespace when comparing lines"
 msgstr "ignora gli spazi bianchi durante il confronto delle righe"
 
-#: diff.c:5429
+#: diff.c:5483
 msgid "ignore changes in amount of whitespace"
 msgstr "ignora le modifiche al numero degli spazi bianchi"
 
-#: diff.c:5432
+#: diff.c:5486
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignora modifiche agli spazi bianchi a fine riga"
 
-#: diff.c:5435
+#: diff.c:5489
 msgid "ignore carrier-return at the end of line"
 msgstr "ignora carattere ritorno a capo a fine riga"
 
-#: diff.c:5438
+#: diff.c:5492
 msgid "ignore changes whose lines are all blank"
 msgstr "ignora modifiche che riguardano solo righe vuote"
 
-#: diff.c:5441
+#: diff.c:5495
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 "euristica per spostare i limiti degli hunk nel diff per una lettura agevole"
 
-#: diff.c:5444
+#: diff.c:5498
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "genera il diff usando l'algoritmo \"patience diff\""
 
-#: diff.c:5448
+#: diff.c:5502
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "genera il diff usando l'algoritmo \"histogram diff\""
 
-#: diff.c:5450
+#: diff.c:5504
 msgid "<algorithm>"
 msgstr "<algoritmo>"
 
-#: diff.c:5451
+#: diff.c:5505
 msgid "choose a diff algorithm"
 msgstr "seleziona un algoritmo diff"
 
-#: diff.c:5453
+#: diff.c:5507
 msgid "<text>"
 msgstr "<testo>"
 
-#: diff.c:5454
+#: diff.c:5508
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "genera il diff usando l'algoritmo \"anchored diff\""
 
-#: diff.c:5456 diff.c:5465 diff.c:5468
+#: diff.c:5510 diff.c:5519 diff.c:5522
 msgid "<mode>"
 msgstr "<modalità>"
 
-#: diff.c:5457
+#: diff.c:5511
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 "visualizza il diff parola per parola usando <modalità> per delimitare le "
 "parole modificate"
 
-#: diff.c:5459 diff.c:5462 diff.c:5507
+#: diff.c:5513 diff.c:5516 diff.c:5561
 msgid "<regex>"
 msgstr "<espressione regolare>"
 
-#: diff.c:5460
+#: diff.c:5514
 msgid "use <regex> to decide what a word is"
 msgstr "usa <espressione regolare> per decidere cosa costituisce una parola"
 
-#: diff.c:5463
+#: diff.c:5517
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr ""
 "equivalente di --word-diff=color --word-diff-regex=<espressione regolare>"
 
-#: diff.c:5466
+#: diff.c:5520
 msgid "moved lines of code are colored differently"
 msgstr "le righe di codice spostate sono colorate in modo diverso"
 
-#: diff.c:5469
+#: diff.c:5523
 msgid "how white spaces are ignored in --color-moved"
 msgstr "modo in cui sono ignorati gli spazi bianchi in --color-moved"
 
-#: diff.c:5472
+#: diff.c:5526
 msgid "Other diff options"
 msgstr "Altre opzioni diff"
 
-#: diff.c:5474
+#: diff.c:5528
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 "se eseguito da una sottodirectory, escludi le modifiche esterne ad essa e "
 "visualizza i percorsi relativi"
 
-#: diff.c:5478
+#: diff.c:5532
 msgid "treat all files as text"
 msgstr "tratta tutti i file come se fossero di testo"
 
-#: diff.c:5480
+#: diff.c:5534
 msgid "swap two inputs, reverse the diff"
 msgstr "scambia i due input, genera un diff al contrario"
 
-#: diff.c:5482
+#: diff.c:5536
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "esci con codice 1 se ci sono differenze, con 0 altrimenti"
 
-#: diff.c:5484
+#: diff.c:5538
 msgid "disable all output of the program"
 msgstr "disabilita l'intero output del programma"
 
-#: diff.c:5486
+#: diff.c:5540
 msgid "allow an external diff helper to be executed"
 msgstr "consenti l'esecuzione di un helper diff esterno"
 
-#: diff.c:5488
+#: diff.c:5542
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 "esegui filtri di conversione in testo esterni quando si confrontano file "
 "binari"
 
-#: diff.c:5490
+#: diff.c:5544
 msgid "<when>"
 msgstr "<quando>"
 
-#: diff.c:5491
+#: diff.c:5545
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignora le modifiche ai sottomoduli durante la generazione del diff"
 
-#: diff.c:5494
+#: diff.c:5548
 msgid "<format>"
 msgstr "<formato>"
 
-#: diff.c:5495
+#: diff.c:5549
 msgid "specify how differences in submodules are shown"
 msgstr "specifica come verranno visualizzate le differenze nei sottomoduli"
 
-#: diff.c:5499
+#: diff.c:5553
 msgid "hide 'git add -N' entries from the index"
 msgstr "nascondi le voci 'git add -N' nell'indice"
 
-#: diff.c:5502
+#: diff.c:5556
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "tratta le voci 'git add -N' come reali nell'indice"
 
-#: diff.c:5504
+#: diff.c:5558
 msgid "<string>"
 msgstr "<stringa>"
 
-#: diff.c:5505
+#: diff.c:5559
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -3004,7 +3815,7 @@ msgstr ""
 "cerca differenze che modificano il numero di occorrenze della stringa "
 "specificata"
 
-#: diff.c:5508
+#: diff.c:5562
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -3012,24 +3823,24 @@ msgstr ""
 "cerca differenze che modificano il numero di occorrenze dell'espressione "
 "regolare specificata"
 
-#: diff.c:5511
+#: diff.c:5565
 msgid "show all changes in the changeset with -S or -G"
 msgstr "visualizza tutte le modifiche nel changeset con -S o -G"
 
-#: diff.c:5514
+#: diff.c:5568
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 "tratta la <stringa> nell'opzione -S come un'espressione regolare POSIX estesa"
 
-#: diff.c:5517
+#: diff.c:5571
 msgid "control the order in which files appear in the output"
 msgstr "controlla l'ordine con cui i file appariranno nell'output"
 
-#: diff.c:5518
+#: diff.c:5572
 msgid "<object-id>"
 msgstr "<ID oggetto>"
 
-#: diff.c:5519
+#: diff.c:5573
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -3037,34 +3848,34 @@ msgstr ""
 "cerca differenze che modificano il numero di occorrenze dell'oggetto "
 "specificato"
 
-#: diff.c:5521
+#: diff.c:5575
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5522
+#: diff.c:5576
 msgid "select files by diff type"
 msgstr "seleziona file in base al tipo diff"
 
-#: diff.c:5524
+#: diff.c:5578
 msgid "<file>"
 msgstr "<file>"
 
-#: diff.c:5525
+#: diff.c:5579
 msgid "Output to a specific file"
 msgstr "Salva l'output in un file specifico"
 
-#: diff.c:6180
+#: diff.c:6236
 msgid "inexact rename detection was skipped due to too many files."
 msgstr ""
 "il rilevamento ridenominazione non esatta è stato omesso per la presenza di "
 "troppi file."
 
-#: diff.c:6183
+#: diff.c:6239
 msgid "only found copies from modified paths due to too many files."
 msgstr ""
 "trovate solo copie dai percorsi modificati per la presenza di troppi file."
 
-#: diff.c:6186
+#: diff.c:6242
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3072,66 +3883,96 @@ msgstr ""
 "potresti voler impostare la variabile %s ad almeno %d e riprovare ad "
 "eseguire il comando."
 
-#: dir.c:549
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "lettura dell'orderfile '%s' non riuscita"
+
+#: diffcore-rename.c:592
+msgid "Performing inexact rename detection"
+msgstr "Rilevamento ridenominazione non esatta in corso"
+
+#: dir.c:578
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 "lo specificatore percorso '%s' non corrisponde ad alcun file noto a git"
 
-#: dir.c:938
+#: dir.c:718 dir.c:747 dir.c:760
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "pattern non riconosciuto: '%s'"
+
+#: dir.c:777 dir.c:791
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "pattern negativo non riconosciuto: '%s'"
+
+#: dir.c:809
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+"il file sparse-checkout potrebbe avere dei problemi: il pattern '%s' è "
+"ripetuto"
+
+#: dir.c:819
+msgid "disabling cone pattern matching"
+msgstr "disabilito il pattern matching di tipo cone"
+
+#: dir.c:1198
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "impossibile usare %s come file di esclusione"
 
-#: dir.c:1877
+#: dir.c:2305
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "impossibile aprire la directory '%s'"
 
-#: dir.c:2128
+#: dir.c:2605
 msgid "failed to get kernel name and information"
 msgstr "impossibile ottenere il nome e le informazioni sul kernel"
 
-#: dir.c:2252
+#: dir.c:2729
 msgid "untracked cache is disabled on this system or location"
 msgstr "la cache non tracciata è disabilitata su questo sistema o percorso"
 
-#: dir.c:3056
+#: dir.c:3520
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "file index corrotto nel repository %s"
 
-#: dir.c:3101 dir.c:3106
+#: dir.c:3565 dir.c:3570
 #, c-format
 msgid "could not create directories for %s"
 msgstr "impossibile creare le directory per %s"
 
-#: dir.c:3135
+#: dir.c:3599
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "impossibile migrare la directory git da '%s' a '%s'"
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr ""
 "suggerimento: In attesa della chiusura del file da parte dell'editor...%c"
 
-#: entry.c:178
+#: entry.c:177
 msgid "Filtering content"
 msgstr "Filtraggio contenuto in corso"
 
-#: entry.c:476
+#: entry.c:478
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "impossibile eseguire stat sul file '%s'"
 
-#: environment.c:148
+#: environment.c:150
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "percorso spazio dei nomi git \"%s\" non valido"
 
-#: environment.c:330
+#: environment.c:337
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "impossibile impostare GIT_DIR a '%s'"
@@ -3141,248 +3982,266 @@ msgstr "impossibile impostare GIT_DIR a '%s'"
 msgid "too many args to run %s"
 msgstr "troppi argomenti per eseguire %s"
 
-#: fetch-pack.c:150
+#: fetch-pack.c:176
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: attesa lista shallow"
 
-#: fetch-pack.c:153
+#: fetch-pack.c:179
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack: atteso pacchetto flush dopo lista shallow"
 
-#: fetch-pack.c:164
+#: fetch-pack.c:190
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: attesi ACK/NAK, ricevuto pacchetto flush"
 
-#: fetch-pack.c:184
+#: fetch-pack.c:210
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: attesi ACK/NAK, ricevuto '%s'"
 
-#: fetch-pack.c:195
+#: fetch-pack.c:221
 msgid "unable to write to remote"
 msgstr "impossibile scrivere sul remoto"
 
-#: fetch-pack.c:257
+#: fetch-pack.c:282
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc richiede multi_ack_detailed"
 
-#: fetch-pack.c:356 fetch-pack.c:1280
+#: fetch-pack.c:375 fetch-pack.c:1397
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "riga shallow non valida: '%s'"
 
-#: fetch-pack.c:362 fetch-pack.c:1286
+#: fetch-pack.c:381 fetch-pack.c:1403
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "riga unshallow non valida: '%s'"
 
-#: fetch-pack.c:364 fetch-pack.c:1288
+#: fetch-pack.c:383 fetch-pack.c:1405
 #, c-format
 msgid "object not found: %s"
 msgstr "oggetto non trovato: %s"
 
-#: fetch-pack.c:367 fetch-pack.c:1291
+#: fetch-pack.c:386 fetch-pack.c:1408
 #, c-format
 msgid "error in object: %s"
 msgstr "errore nell'oggetto: %s"
 
-#: fetch-pack.c:369 fetch-pack.c:1293
+#: fetch-pack.c:388 fetch-pack.c:1410
 #, c-format
 msgid "no shallow found: %s"
 msgstr "nessuno shallow trovato: %s"
 
-#: fetch-pack.c:372 fetch-pack.c:1297
+#: fetch-pack.c:391 fetch-pack.c:1414
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "attesi shallow/unshallow, ricevuto %s"
 
-#: fetch-pack.c:414
+#: fetch-pack.c:431
 #, c-format
 msgid "got %s %d %s"
 msgstr "ricevuto %s %d %s"
 
-#: fetch-pack.c:431
+#: fetch-pack.c:448
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit non valido: %s"
 
-#: fetch-pack.c:462
+#: fetch-pack.c:479
 msgid "giving up"
 msgstr "smetto di provare"
 
-#: fetch-pack.c:475 progress.c:312
+#: fetch-pack.c:492 progress.c:339
 msgid "done"
 msgstr "fatto"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:504
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "ricevuto %s (%d) %s"
 
-#: fetch-pack.c:533
+#: fetch-pack.c:540
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Contrassegno %s come completo"
 
-#: fetch-pack.c:742
+#: fetch-pack.c:755
 #, c-format
 msgid "already have %s (%s)"
 msgstr "ho già %s (%s)"
 
-#: fetch-pack.c:781
+#: fetch-pack.c:824
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr ""
 "fetch-pack: impossibile eseguire il fork del demultiplexer della banda "
 "laterlae"
 
-#: fetch-pack.c:789
+#: fetch-pack.c:832
 msgid "protocol error: bad pack header"
 msgstr "errore protocollo: intestazione pack non valida"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:916
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: impossibile eseguire il fork di %s"
 
-#: fetch-pack.c:873
+#: fetch-pack.c:933
 #, c-format
 msgid "%s failed"
 msgstr "%s non riuscito"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:935
 msgid "error in sideband demultiplexer"
 msgstr "errore nel demultiplexer della banda laterale"
 
-#: fetch-pack.c:907
+#: fetch-pack.c:978
 #, c-format
 msgid "Server version is %.*s"
 msgstr "La versione del server è %.*s"
 
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
+#: fetch-pack.c:983 fetch-pack.c:989 fetch-pack.c:992 fetch-pack.c:998
+#: fetch-pack.c:1002 fetch-pack.c:1006 fetch-pack.c:1010 fetch-pack.c:1014
+#: fetch-pack.c:1018 fetch-pack.c:1022 fetch-pack.c:1026 fetch-pack.c:1030
+#: fetch-pack.c:1036 fetch-pack.c:1042 fetch-pack.c:1047 fetch-pack.c:1052
 #, c-format
 msgid "Server supports %s"
 msgstr "Il server supporta %s"
 
-#: fetch-pack.c:914
+#: fetch-pack.c:985
 msgid "Server does not support shallow clients"
 msgstr "Il server non supporta client shallow"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:1045
 msgid "Server does not support --shallow-since"
 msgstr "Il server non supporta --shallow-since"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1050
 msgid "Server does not support --shallow-exclude"
 msgstr "Il server non supporta --shallow-exclude"
 
-#: fetch-pack.c:983
+#: fetch-pack.c:1054
 msgid "Server does not support --deepen"
 msgstr "Il server non supporta --deepen"
 
-#: fetch-pack.c:1000
+#: fetch-pack.c:1056
+msgid "Server does not support this repository's object format"
+msgstr "Il server non supporta il formato oggetti di questo repository"
+
+#: fetch-pack.c:1069
 msgid "no common commits"
 msgstr "nessun commit in comune"
 
-#: fetch-pack.c:1012 fetch-pack.c:1468
+#: fetch-pack.c:1081 fetch-pack.c:1619
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: recupero non riuscito."
 
-#: fetch-pack.c:1150
+#: fetch-pack.c:1205
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "algoritmi non corrispondenti: client %s; server %s"
+
+#: fetch-pack.c:1209
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "il server non supporta l'algoritmo '%s'"
+
+#: fetch-pack.c:1229
 msgid "Server does not support shallow requests"
 msgstr "Il server non supporta le richieste shallow"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1236
 msgid "Server supports filter"
 msgstr "Il server supporta filter"
 
-#: fetch-pack.c:1180
+#: fetch-pack.c:1275
 msgid "unable to write request to remote"
 msgstr "impossibile scrivere la richiesta sul remoto"
 
-#: fetch-pack.c:1198
+#: fetch-pack.c:1293
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "errore durante la lettura dell'intestazione di sezione '%s'"
 
-#: fetch-pack.c:1204
+#: fetch-pack.c:1299
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "atteso '%s', ricevuto '%s'"
 
-#: fetch-pack.c:1243
+#: fetch-pack.c:1360
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "riga di conferma inattesa: '%s'"
 
-#: fetch-pack.c:1248
+#: fetch-pack.c:1365
 #, c-format
 msgid "error processing acks: %d"
 msgstr "errore durante l'elaborazione degli ack: %d"
 
-#: fetch-pack.c:1258
+#: fetch-pack.c:1375
 msgid "expected packfile to be sent after 'ready'"
 msgstr "ci si attendeva che il packfile fosse inviato dopo 'ready'"
 
-#: fetch-pack.c:1260
+#: fetch-pack.c:1377
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 "ci si attendeva che nessun'altra sezione fosse inviata in assenza di 'ready'"
 
-#: fetch-pack.c:1302
+#: fetch-pack.c:1419
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "errore durante l'elaborazione delle informazioni shallow: %d"
 
-#: fetch-pack.c:1349
+#: fetch-pack.c:1466
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "atteso wanted-ref, ricevuto '%s'"
 
-#: fetch-pack.c:1354
+#: fetch-pack.c:1471
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "wanted-ref inatteso: '%s'"
 
-#: fetch-pack.c:1359
+#: fetch-pack.c:1476
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "errore durante l'elaborazione dei riferimenti desiderati: %d"
 
-#: fetch-pack.c:1693
+#: fetch-pack.c:1506
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: atteso pacchetto fine risposta"
+
+#: fetch-pack.c:1887
 msgid "no matching remote head"
 msgstr "nessun head remoto corrispondente"
 
-#: fetch-pack.c:1716 builtin/clone.c:685
+#: fetch-pack.c:1910 builtin/clone.c:692
 msgid "remote did not send all necessary objects"
 msgstr "il remoto non ha inviato tutti gli oggetti necessari"
 
-#: fetch-pack.c:1743
+#: fetch-pack.c:1937
 #, c-format
 msgid "no such remote ref %s"
 msgstr "riferimento remoto non esistente: %s"
 
-#: fetch-pack.c:1746
+#: fetch-pack.c:1940
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Il server non consente richieste per l'oggetto non pubblicizzato %s"
 
-#: gpg-interface.c:321
-msgid "gpg failed to sign the data"
-msgstr "gpg non è riuscito a firmare i dati"
-
-#: gpg-interface.c:347
+#: gpg-interface.c:272
 msgid "could not create temporary file"
 msgstr "impossibile creare il file temporaneo"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:275
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "scrittura della firma separata in '%s' non riuscita"
 
-#: graph.c:97
+#: gpg-interface.c:457
+msgid "gpg failed to sign the data"
+msgstr "gpg non è riuscito a firmare i dati"
+
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "ignoro il colore non valido '%.*s' in log.graphColors"
@@ -3395,18 +4254,18 @@ msgstr ""
 "il pattern fornito (con -f <file>) contiene un byte NULL. Ciò è supportato "
 "solo con -P usando PCRE v2"
 
-#: grep.c:2124
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s': impossibile leggere %s"
 
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
+#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:89
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "stat di '%s' non riuscito"
 
-#: grep.c:2152
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': lettura troppo breve"
@@ -3456,49 +4315,49 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Comandi / operazioni di interrogazione di basso livello"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Comandi di basso livello / Sincronizzazione repository"
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Comandi di basso livello / Funzioni helper interne"
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "comandi git disponibili in '%s'"
 
-#: help.c:305
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "comandi git disponibili altrove nel tuo $PATH"
 
-#: help.c:314
+#: help.c:316
 msgid "These are common Git commands used in various situations:"
 msgstr "Questi sono i comandi Git comuni usati in varie situazioni:"
 
-#: help.c:363 git.c:98
+#: help.c:365 git.c:99
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "tipo elenco comandi non supportato: '%s'"
 
-#: help.c:403
-msgid "The common Git guides are:"
-msgstr "Le guide Git comuni sono:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Le guide Git concettuali sono:"
 
-#: help.c:512
+#: help.c:429
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr ""
 "Vedi 'git help <comando>' per saperne di più su un sottocomando specifico"
 
-#: help.c:517
+#: help.c:434
 msgid "External commands"
 msgstr "Comandi esterni"
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr "Alias comandi"
 
-#: help.c:596
+#: help.c:513
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -3507,31 +4366,31 @@ msgstr ""
 "'%s' sembra essere un comando git, ma non è stato\n"
 "possibile eseguirlo. Forse git-%s è corrotto?"
 
-#: help.c:655
+#: help.c:572
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Oh oh. Il tuo sistema non riporta alcun comando Git."
 
-#: help.c:677
+#: help.c:594
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "ATTENZIONE: hai chiamato un comando Git '%s' inesistente."
 
-#: help.c:682
+#: help.c:599
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Continuo assumendo che intendessi '%s'."
 
-#: help.c:687
+#: help.c:604
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "Continuo fra %0.1f secondi assumendo che intendessi '%s'."
 
-#: help.c:695
+#: help.c:612
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git: '%s' non è un comando git. Vedi 'git --help'."
 
-#: help.c:699
+#: help.c:616
 msgid ""
 "\n"
 "The most similar command is"
@@ -3545,16 +4404,16 @@ msgstr[1] ""
 "\n"
 "I comandi maggiormente simili sono"
 
-#: help.c:714
+#: help.c:656
 msgid "git version [<options>]"
 msgstr "git version [<opzioni>]"
 
-#: help.c:783
+#: help.c:711
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:787
+#: help.c:715
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3568,7 +4427,15 @@ msgstr[1] ""
 "\n"
 "Intendevi uno di questi?"
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Identità autore sconosciuta\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Identità autore del commit sconosciuta\n"
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3594,95 +4461,100 @@ msgstr ""
 "Ometti --global per impostare l'identità solo in questo repository.\n"
 "\n"
 
-#: ident.c:379
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
 msgstr ""
 "nessun indirizzo e-mail specificato e rilevamento automatico disabilitato"
 
-#: ident.c:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr ""
 "impossibile rilevare automaticamente l'indirizzo e-mail (ho ricavato '%s')"
 
-#: ident.c:401
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
 msgstr "nessun nome specificato e rilevamento automatico disabilitato"
 
-#: ident.c:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "impossibile rilevare automaticamente il nome (ho ricavato '%s')"
 
-#: ident.c:415
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "nome ident vuoto (per <%s>) non consentito"
 
-#: ident.c:421
+#: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "il nome è composto solo da caratteri non consentiti: %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:454 builtin/commit.c:634
 #, c-format
 msgid "invalid date format: %s"
 msgstr "formato data non valido: %s"
 
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "la voce '%s' nell'albero %s ha la modalità albero, ma non è un albero"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "la voce '%s' nell'albero %s ha la modalità blob, ma non è un blob"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "impossibile caricare l'albero radice per il commit %s"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "impossibile accedere al blob sparse in '%s'"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "impossibile analizzare i dati filtro sparse in %s"
-
-#: list-objects-filter-options.c:58
+#: list-objects-filter-options.c:81
 msgid "expected 'tree:<depth>'"
 msgstr "atteso 'tree:<profondità>'"
 
-#: list-objects-filter-options.c:73
+#: list-objects-filter-options.c:96
 msgid "sparse:path filters support has been dropped"
 msgstr "il supporto per i filtri sparse:percorso è stato rimosso"
 
-#: list-objects-filter-options.c:86
+#: list-objects-filter-options.c:109
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "specificatore filtro '%s' non valido"
 
-#: list-objects-filter-options.c:102
+#: list-objects-filter-options.c:125
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
 msgstr ""
 "è necessario eseguire l'escape del carattere nello specificatore del "
 "sottofiltro: '%c'"
 
-#: list-objects-filter-options.c:144
+#: list-objects-filter-options.c:167
 msgid "expected something after combine:"
 msgstr "atteso qualcosa dopo la ricombinazione:"
 
-#: list-objects-filter-options.c:226
+#: list-objects-filter-options.c:249
 msgid "multiple filter-specs cannot be combined"
 msgstr "non è possibile combinare più specificatori filtro"
 
-#: lockfile.c:151
+#: list-objects-filter-options.c:361
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+"impossibile aggiornare il formato repository per supportare il clone parziale"
+
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "impossibile accedere al blob sparse in '%s'"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "impossibile analizzare i dati filtro sparse in %s"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "la voce '%s' nell'albero %s ha la modalità albero, ma non è un albero"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "la voce '%s' nell'albero %s ha la modalità blob, ma non è un blob"
+
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "impossibile caricare l'albero radice per il commit %s"
+
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3702,124 +4574,118 @@ msgstr ""
 "possibile che un processo git sia andato in crash in questo repository\n"
 "in precedenza: rimuovi manualmente il file per continuare."
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Impossibile creare '%s.lock': %s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "lettura della cache non riuscita"
+#: ls-refs.c:109
+msgid "expected flush after ls-refs arguments"
+msgstr "atteso flush dopo argomenti ls-refs"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "impossibile scrivere il nuovo file index"
-
-#: merge-recursive.c:367
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "(commit non valido)\n"
 
-#: merge-recursive.c:390
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo non riuscito per il percorso '%s'; interrompo il merge."
 
-#: merge-recursive.c:399
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr ""
 "aggiornamento add_cacheinfo non riuscito per il percorso '%s'; interrompo il "
 "merge."
 
-#: merge-recursive.c:885
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "creazione del percorso '%s' non riuscita%s"
 
-#: merge-recursive.c:896
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Rimuovo %s per fare spazio alla sottodirectory\n"
 
-#: merge-recursive.c:910 merge-recursive.c:929
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr ": forse si tratta di un conflitto D/F?"
 
-#: merge-recursive.c:919
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "mi rifiuto di perdere un file non tracciato in '%s'"
 
-#: merge-recursive.c:960 builtin/cat-file.c:41
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "impossibile leggere l'oggetto %s '%s'"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "atteso blob per %s '%s'"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "apertura di '%s' non riuscita: %s"
 
-#: merge-recursive.c:1001
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "creazione del collegamento simbolico '%s' non riuscita: %s"
 
-#: merge-recursive.c:1006
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "non so che fare con %06o %s '%s'"
 
-#: merge-recursive.c:1199
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "Merge del sottomodulo %s non riuscito (checkout non eseguito)"
 
-#: merge-recursive.c:1206
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "Merge del sottomodulo %s non riuscito (commit non presenti)"
 
-#: merge-recursive.c:1213
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr ""
 "Merge del sottomodulo %s non riuscito (i commit non seguono la base del "
 "merge)"
 
-#: merge-recursive.c:1221 merge-recursive.c:1233
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Eseguo il fast forward del sottomodulo %s al seguente commit:"
 
-#: merge-recursive.c:1224 merge-recursive.c:1236
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Eseguo il fast forward del sottomodulo %s"
 
-#: merge-recursive.c:1259
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr ""
 "Merge del sottomodulo %s non riuscito (merge dopo i commit non trovato)"
 
-#: merge-recursive.c:1263
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Merge del sottomodulo %s non riuscito (non fast forward)"
 
-#: merge-recursive.c:1264
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "Trovata possibile risoluzione merge per il sottomodulo:\n"
 
-#: merge-recursive.c:1267
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3836,32 +4702,32 @@ msgstr ""
 "\n"
 "per accettare questo suggerimento.\n"
 
-#: merge-recursive.c:1276
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "Merge del sottomodulo %s non riuscito (più merge trovati)"
 
-#: merge-recursive.c:1349
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "Esecuzione del merge interno non riuscita"
 
-#: merge-recursive.c:1354
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "Impossibile aggiungere %s al database"
 
-#: merge-recursive.c:1386
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "Merge automatico di %s in corso"
 
-#: merge-recursive.c:1410
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr ""
 "Errore: mi rifiuto di perdere il file non tracciato %s; scrivo invece in %s."
 
-#: merge-recursive.c:1482
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3870,7 +4736,7 @@ msgstr ""
 "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di "
 "%s lasciata nell'albero."
 
-#: merge-recursive.c:1487
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3879,7 +4745,7 @@ msgstr ""
 "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione "
 "%s di %s lasciata nell'albero."
 
-#: merge-recursive.c:1494
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3888,7 +4754,7 @@ msgstr ""
 "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s in %s. Versione %s di "
 "%s lasciata nell'albero in %s."
 
-#: merge-recursive.c:1499
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3897,43 +4763,43 @@ msgstr ""
 "CONFLITTO (%s/eliminazione): %s eliminato in %s e %s come %s in %s. Versione "
 "%s di %s lasciata nell'albero in %s."
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "ridenominazione"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "rinominato"
 
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Mi rifiuto di perdere un file sporco in %s"
 
-#: merge-recursive.c:1624
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr ""
 "Mi rifiuto di perdere un file non tracciato in %s, benché sia d'ostacolo."
 
-#: merge-recursive.c:1682
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 "CONFLITTO (ridenominazione/aggiunta): elemento ridenominato %s->%s in %s. %s "
 "aggiunto in %s"
 
-#: merge-recursive.c:1713
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s è una directory in %s; la aggiungo come %s"
 
-#: merge-recursive.c:1718
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "Mi rifiuto di perdere un file non tracciato in %s; lo aggiungo come %s"
 
-#: merge-recursive.c:1737
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3942,18 +4808,18 @@ msgstr ""
 "CONFLITTO (ridenominazione/ridenominazione): file ridenominato \"%s\"->\"%s"
 "\" nel branch \"%s\", ridenominato \"%s\"->\"%s\" in \"%s\"%s"
 
-#: merge-recursive.c:1742
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr " (lasciato irrisolto)"
 
-#: merge-recursive.c:1851
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr ""
 "CONFLITTO (ridenominazione/ridenominazione): file ridenominato %s->%s in %s. "
 "Ridenominato %s->%s in %s"
 
-#: merge-recursive.c:2056
+#: merge-recursive.c:2068
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3964,7 +4830,7 @@ msgstr ""
 "perché la directory %s è stata ridenominata in più directory diverse e "
 "nessuna directory di destinazione contiene la maggior parte dei file."
 
-#: merge-recursive.c:2088
+#: merge-recursive.c:2100
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Existing file/dir at %s in the way of "
@@ -3974,7 +4840,7 @@ msgstr ""
 "%s è d'ostacolo alle seguenti ridenominazioni directory che spostano in tale "
 "posizione i seguenti percorsi: %s."
 
-#: merge-recursive.c:2098
+#: merge-recursive.c:2110
 #, c-format
 msgid ""
 "CONFLICT (implicit dir rename): Cannot map more than one path to %s; "
@@ -3984,7 +4850,7 @@ msgstr ""
 "un percorso in %s; delle ridenominazioni directory implicite hanno tentato "
 "di spostare in tale posizione i seguenti percorsi: %s"
 
-#: merge-recursive.c:2190
+#: merge-recursive.c:2202
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3993,7 +4859,7 @@ msgstr ""
 "CONFLITTO (ridenominazione/ridenominazione): directory ridenominata %s->%s "
 "in %s. Directory ridenominata %s->%s in %s"
 
-#: merge-recursive.c:2435
+#: merge-recursive.c:2447
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
@@ -4002,52 +4868,52 @@ msgstr ""
 "ATTENZIONE: evito di applicare la ridenominazione %s -> %s a %s perché %s "
 "stesso è stato ridenominato."
 
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
 #, c-format
 msgid "cannot read object %s"
 msgstr "impossibile leggere l'oggetto %s"
 
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
 #, c-format
 msgid "object %s is not a blob"
 msgstr "l'oggetto %s non è un blob"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
 msgid "modify"
 msgstr "modifica"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
 msgid "modified"
 msgstr "modificato"
 
-#: merge-recursive.c:3040
+#: merge-recursive.c:3052
 msgid "content"
 msgstr "contenuto"
 
-#: merge-recursive.c:3044
+#: merge-recursive.c:3056
 msgid "add/add"
 msgstr "aggiunta/aggiunta"
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Omesso %s (elemento sottoposto a merge uguale a quello esistente)"
 
-#: merge-recursive.c:3089 git-submodule.sh:937
+#: merge-recursive.c:3101
 msgid "submodule"
 msgstr "sottomodulo"
 
-#: merge-recursive.c:3090
+#: merge-recursive.c:3102
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "CONFLITTO (%s): conflitto di merge in %s"
 
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Lo aggiungo come %s"
 
-#: merge-recursive.c:3203
+#: merge-recursive.c:3215
 #, c-format
 msgid ""
 "Path updated: %s added in %s inside a directory that was renamed in %s; "
@@ -4056,7 +4922,7 @@ msgstr ""
 "Percorso aggiornato: %s aggiunto in %s in una directory ridenominata in %s; "
 "lo sposto in %s."
 
-#: merge-recursive.c:3206
+#: merge-recursive.c:3218
 #, c-format
 msgid ""
 "CONFLICT (file location): %s added in %s inside a directory that was renamed "
@@ -4065,7 +4931,7 @@ msgstr ""
 "CONFLITTO (posizione file): %s aggiunto in %s in una directory ridenominata "
 "in %s, il che suggerisce che forse dovrebbe essere spostato in %s."
 
-#: merge-recursive.c:3210
+#: merge-recursive.c:3222
 #, c-format
 msgid ""
 "Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
@@ -4074,7 +4940,7 @@ msgstr ""
 "Percorso aggiornato: %s ridenominato in %s in %s in una directory "
 "ridenominata in %s; lo sposto in %s."
 
-#: merge-recursive.c:3213
+#: merge-recursive.c:3225
 #, c-format
 msgid ""
 "CONFLICT (file location): %s renamed to %s in %s, inside a directory that "
@@ -4084,61 +4950,61 @@ msgstr ""
 "ridenominata in %s, il che suggerisce che forse dovrebbe essere spostato in "
 "%s."
 
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
 #, c-format
 msgid "Removing %s"
 msgstr "Rimozione di %s"
 
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
 msgid "file/directory"
 msgstr "file/directory"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
 msgid "directory/file"
 msgstr "directory/file"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3374
 #, c-format
 msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr ""
 "CONFLITTO (%s): una directory denominata %s esiste già in %s. Aggiungo %s "
 "come %s"
 
-#: merge-recursive.c:3371
+#: merge-recursive.c:3383
 #, c-format
 msgid "Adding %s"
 msgstr "Aggiunta %s"
 
-#: merge-recursive.c:3380
+#: merge-recursive.c:3392
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "CONFLITTO (aggiungi/aggiungi): conflitto di merge in %s"
 
-#: merge-recursive.c:3424
+#: merge-recursive.c:3436
 msgid "Already up to date!"
 msgstr "Già aggiornato!"
 
-#: merge-recursive.c:3433
+#: merge-recursive.c:3445
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "merge degli alberi %s e %s non riuscito"
 
-#: merge-recursive.c:3537
+#: merge-recursive.c:3550
 msgid "Merging:"
 msgstr "Merge in corso:"
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3563
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "trovato %u antenato comune:"
 msgstr[1] "trovati %u antenati comuni:"
 
-#: merge-recursive.c:3600
+#: merge-recursive.c:3613
 msgid "merge returned no commit"
 msgstr "il merge non ha restituito alcun commit"
 
-#: merge-recursive.c:3659
+#: merge-recursive.c:3672
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4147,151 +5013,191 @@ msgstr ""
 "Le tue modifiche locali ai seguenti file sarebbero sovrascritte dal merge:\n"
 "  %s"
 
-#: merge-recursive.c:3756
+#: merge-recursive.c:3769
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Impossibile analizzare l'oggetto '%s'"
 
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3787 builtin/merge.c:702 builtin/merge.c:881
 msgid "Unable to write index."
 msgstr "Impossibile scrivere l'indice."
 
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "lettura della cache non riuscita"
+
+#: merge.c:109 rerere.c:720 builtin/am.c:1896 builtin/am.c:1930
+#: builtin/checkout.c:560 builtin/checkout.c:816 builtin/clone.c:816
+#: builtin/stash.c:265
+msgid "unable to write new index file"
+msgstr "impossibile scrivere il nuovo file index"
+
+#: midx.c:79
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "il file multi-pack-index %s è troppo piccolo"
 
-#: midx.c:84
+#: midx.c:95
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "la firma del multi-pack-index 0x%08x non corrisponde alla firma 0x%08x"
 
-#: midx.c:89
+#: midx.c:100
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "versione %d multi-pack-index non riconosciuta"
 
-#: midx.c:94
+#: midx.c:105
 #, c-format
-msgid "hash version %u does not match"
-msgstr "la versione dell'hash %u non corrisponde"
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr ""
+"la versione dell'hash multi-pack-index %u non corrisponde alla versione %u"
 
-#: midx.c:108
+#: midx.c:122
 msgid "invalid chunk offset (too large)"
 msgstr "offset blocco non valido (troppo grande)"
 
-#: midx.c:132
+#: midx.c:146
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr "l'ID blocco finale multi-pack-index compare prima di quanto previsto"
 
-#: midx.c:145
+#: midx.c:159
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "dal multi-pack-index manca il blocco richiesto pack-name"
 
-#: midx.c:147
+#: midx.c:161
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "dal multi-pack-index manca il blocco richiesto fanout OID"
 
-#: midx.c:149
+#: midx.c:163
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "dal multi-pack-index manca il blocco richiesto lookup OID"
 
-#: midx.c:151
+#: midx.c:165
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "dal multi-pack-index manca il blocco richiesto offset oggetti"
 
-#: midx.c:165
+#: midx.c:179
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "nomi pack multi-pack-index in disordine: '%s' appare prima di '%s'"
 
-#: midx.c:210
+#: midx.c:222
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "pack-int-id non valido: %u (%u pack totali)"
 
-#: midx.c:260
+#: midx.c:272
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 "nel multi-pack-index è salvato un offset a 64 bit, ma off_t è troppo piccolo"
 
-#: midx.c:288
+#: midx.c:300
 msgid "error preparing packfile from multi-pack-index"
 msgstr "errore durante la preparazione del packfile dal multi-pack-index"
 
-#: midx.c:469
+#: midx.c:485
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "aggiunta del packfile '%s' non riuscita"
 
-#: midx.c:475
+#: midx.c:491
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "apertura del pack-index '%s' non riuscita"
 
-#: midx.c:535
+#: midx.c:551
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "ricerca dell'oggetto %d nel packfile non riuscita"
 
-#: midx.c:864
+#: midx.c:853
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Aggiunta dei file pack al multi-pack-index in corso"
+
+#: midx.c:886
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "non ho visto il file pack %s da scartare"
 
-#: midx.c:1035
+#: midx.c:938
+msgid "no pack files to index."
+msgstr "nessun file pack da indicizzare."
+
+#: midx.c:990
+msgid "Writing chunks to multi-pack-index"
+msgstr "Scrittura dei chunk nel multi-pack-index in corso"
+
+#: midx.c:1068
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "pulizia del multi-pack-index %s non riuscita"
 
-#: midx.c:1090
+#: midx.c:1124
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+"il file multi-pack-index esiste, ma non è stato possibile interpretarlo"
+
+#: midx.c:1132
 msgid "Looking for referenced packfiles"
 msgstr "Ricerca di file pack referenziati in corso"
 
-#: midx.c:1105
+#: midx.c:1147
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 "fanout oid in disordine: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1109
-msgid "Verifying OID order in MIDX"
-msgstr "Verifica ordine OID in MIDX in corso"
+#: midx.c:1152
+msgid "the midx contains no oid"
+msgstr "il midx non contiene alcun OID"
 
-#: midx.c:1118
+#: midx.c:1161
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Verifica ordine OID nel multi-pack-index in corso"
+
+#: midx.c:1170
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "lookup oid in disordine: oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1137
+#: midx.c:1190
 msgid "Sorting objects by packfile"
 msgstr "Ordinamento degli oggetti nel packfile in corso"
 
-#: midx.c:1143
+#: midx.c:1197
 msgid "Verifying object offsets"
 msgstr "Verifica offset oggetti in corso"
 
-#: midx.c:1159
+#: midx.c:1213
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "caricamento voce pack per oid[%d] = %s non riuscito"
 
-#: midx.c:1165
+#: midx.c:1219
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "caricamento pack-index per il packfile %s non riuscito"
 
-#: midx.c:1174
+#: midx.c:1228
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "offset oggetto non corretto per oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 
-#: midx.c:1349
+#: midx.c:1253
+msgid "Counting referenced objects"
+msgstr "Conteggio degli oggetti referenziati in corso"
+
+#: midx.c:1263
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Ricerca ed eliminazione dei file pack non referenziati in corso"
+
+#: midx.c:1454
 msgid "could not start pack-objects"
 msgstr "impossibile avviare pack-objects"
 
-#: midx.c:1368
+#: midx.c:1474
 msgid "could not finish pack-objects"
 msgstr "impossibile finire pack-objects"
 
@@ -4372,27 +5278,52 @@ msgstr "l'oggetto %s ha l'ID tipo sconosciuto %d"
 msgid "unable to parse object: %s"
 msgstr "impossibile analizzare l'oggetto: %s"
 
-#: object.c:266 object.c:277
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
 msgstr "hash non corrispondente: %s"
 
-#: packfile.c:641
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216
+#, c-format
+msgid "unable to get size of %s"
+msgstr "impossibile recuperare le dimensioni di %s"
+
+#: packfile.c:630
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset collocato prima della fine del packfile (.idx corrotto?)"
 
-#: packfile.c:1887
+#: packfile.c:1922
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr ""
 "offset collocato prima dell'inizio dell'indice pack per %s (indice corrotto?)"
 
-#: packfile.c:1891
+#: packfile.c:1926
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr ""
 "offset collocato dopo la fine dell'indice pack per %s (indice troncato?)"
 
+#: parse-options-cb.c:20 parse-options-cb.c:24
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "l'opzione `%s' richiede un valore numerico"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "data scadenza '%s' malformata"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "l'opzione `%s' richiede \"always\", \"auto\" o \"never\""
+
+#: parse-options-cb.c:132 parse-options-cb.c:149
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nome oggetto '%s' malformato"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4408,7 +5339,7 @@ msgstr "%s non è compatibile con %s"
 msgid "%s : incompatible with something else"
 msgstr "%s non è compatibile con qualcos'altro"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s non richiede un valore"
@@ -4418,42 +5349,47 @@ msgstr "%s non richiede un valore"
 msgid "%s isn't available"
 msgstr "%s non è disponibile"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 "%s richiede un valore intero non negativo con un suffisso k/m/g facoltativo"
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "opzione ambigua: %s (potrebbe essere --%s%s o --%s%s)"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "did you mean `--%s` (with two dashes)?"
 msgstr "forse intendevi `--%s` (con due trattini)?"
 
-#: parse-options.c:860
+#: parse-options.c:666 parse-options.c:971
+#, c-format
+msgid "alias of --%s"
+msgstr "alias di --%s"
+
+#: parse-options.c:862
 #, c-format
 msgid "unknown option `%s'"
 msgstr "opzione sconosciuta `%s'"
 
-#: parse-options.c:862
+#: parse-options.c:864
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "opzione `%c` sconosciuta"
 
-#: parse-options.c:864
+#: parse-options.c:866
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "opzione non ASCII sconosciuta presente nella stringa: `%s'"
 
-#: parse-options.c:888
+#: parse-options.c:890
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:907
+#: parse-options.c:909
 #, c-format
 msgid "usage: %s"
 msgstr "uso: %s"
@@ -4461,76 +5397,51 @@ msgstr "uso: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:913
+#: parse-options.c:915
 #, c-format
 msgid "   or: %s"
 msgstr "  oppure: %s"
 
-#: parse-options.c:916
+#: parse-options.c:918
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:955
+#: parse-options.c:957
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options.c:969
-#, c-format
-msgid "alias of --%s"
-msgstr "alias di --%s"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "l'opzione `%s' richiede un valore numerico"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "data scadenza '%s' malformata"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "l'opzione `%s' richiede \"always\", \"auto\" o \"never\""
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nome oggetto '%s' malformato"
-
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Impossibile rendere %s scrivibile dal gruppo"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr ""
 "Carattere di escape '\\' non consentito come ultimo carattere del valore "
 "attributo"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "È consentita solo una specifica 'attr:'."
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "la specifica attr non deve essere vuota"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nome attributo %s non valido"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "le impostazioni globali specificatore percorso 'glob' e 'noglob' non sono "
 "compatibili"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4538,51 +5449,56 @@ msgstr ""
 "l'impostazione globale specificatore percorso 'literal' è incompatibile con "
 "tutte le altre impostazioni globali specificatore percorso"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "parametro per il magic specificatore percorso 'prefix' non valido"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Magic specificatore percorso '%.*s' in '%s' non valido"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "')' mancante alla fine del magic specificatore percorso in '%s'"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Magic specificatore percorso '%c' in '%s' non implementato"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' e 'glob' non sono compatibili"
 
-#: pathspec.c:440
+#: pathspec.c:445
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' è al di fuori del repository"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' è al di fuori del repository in '%s'"
 
-#: pathspec.c:514
+#: pathspec.c:521
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (opzione mnemonica: '%c')"
 
-#: pathspec.c:524
+#: pathspec.c:531
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: magic specificatore percorso non supportato da questo comando: %s"
 
-#: pathspec.c:591
+#: pathspec.c:598
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr ""
 "lo specificatore percorso '%s' si trova oltre un collegamento simbolico"
 
+#: pathspec.c:643
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "la riga non è ben racchiusa tra virgolette: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "impossibile scrivere il pacchetto flush"
@@ -4592,46 +5508,50 @@ msgid "unable to write delim packet"
 msgstr "impossibile scrivere il pacchetto delim"
 
 #: pkt-line.c:106
+msgid "unable to write stateless separator packet"
+msgstr "impossibile scrivere il pacchetto separatore senza stato"
+
+#: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "scrittura con flush pacchetto non riuscita"
 
-#: pkt-line.c:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:239
 msgid "protocol error: impossibly long line"
 msgstr "errore protocollo: riga impossibilmente lunga"
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr "scrittura pacchetto con formato non riuscita"
 
-#: pkt-line.c:196
+#: pkt-line.c:203
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 "scrittura pacchetto non riuscita - i dati sono più della dimensione massima "
 "pacchetto"
 
-#: pkt-line.c:203 pkt-line.c:210
+#: pkt-line.c:210 pkt-line.c:217
 msgid "packet write failed"
 msgstr "scrittura pacchetto non riuscita"
 
-#: pkt-line.c:295
+#: pkt-line.c:302
 msgid "read error"
 msgstr "errore di lettura"
 
-#: pkt-line.c:303
+#: pkt-line.c:310
 msgid "the remote end hung up unexpectedly"
 msgstr "l'interlocutore remoto ha chiuso inaspettatamente la connessione"
 
-#: pkt-line.c:331
+#: pkt-line.c:338
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "errore protocollo: carattere lunghezza riga non valido: %.4s"
 
-#: pkt-line.c:341 pkt-line.c:346
+#: pkt-line.c:352 pkt-line.c:357
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr "errore protocollo: lunghezza riga non valida: %d"
 
-#: pkt-line.c:362
+#: pkt-line.c:373 sideband.c:150
 #, c-format
 msgid "remote error: %s"
 msgstr "errore remoto: %s"
@@ -4645,92 +5565,116 @@ msgstr "Aggiornamento indice in corso"
 msgid "unable to create threaded lstat: %s"
 msgstr "impossibile creare lstat in versione threaded: %s"
 
-#: pretty.c:966
+#: pretty.c:983
 msgid "unable to parse --pretty format"
 msgstr "impossibile analizzare il formato --pretty"
 
-#: promisor-remote.c:25
-msgid "Remote with no URL"
-msgstr "Remoto senza URL"
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr ""
+"promisor-remote: impossibile eseguire il fork del sottoprocesso di fetch"
+
+#: promisor-remote.c:35 promisor-remote.c:37
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: impossibile scrivere sul sottoprocesso di fetch"
 
-#: promisor-remote.c:61
+#: promisor-remote.c:41
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+"promisor-remote: impossibile chiudere lo standard input del sottoprocesso di "
+"fetch"
+
+#: promisor-remote.c:53
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "il nome del remoto promettente non può iniziare con '/': %s"
 
-#: range-diff.c:71
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Rimozione oggetti duplicati in corso"
+
+#: range-diff.c:77
 msgid "could not start `log`"
 msgstr "impossibile avviare `log`"
 
-#: range-diff.c:73
+#: range-diff.c:79
 msgid "could not read `log` output"
 msgstr "impossibile leggere l'output di `log`"
 
-#: range-diff.c:92 sequencer.c:4985
+#: range-diff.c:98 sequencer.c:5283
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "impossibile analizzare il commit '%s'"
 
-#: range-diff.c:118
+#: range-diff.c:112
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"impossibile analizzare la prima riga dell'output di `log`: non inizia con "
+"'commit ': %s"
+
+#: range-diff.c:137
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "impossibile analizzare l'header Git '%.*s'"
 
-#: range-diff.c:275
+#: range-diff.c:301
 msgid "failed to generate diff"
 msgstr "generazione del diff non riuscita"
 
-#: range-diff.c:507 range-diff.c:509
+#: range-diff.c:534 range-diff.c:536
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "impossibile analizzare il registro di '%s'"
 
-#: read-cache.c:680
+#: read-cache.c:682
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "non aggiungerò l'alias file '%s' ('%s' esiste già nell'indice)"
 
-#: read-cache.c:696
+#: read-cache.c:698
 msgid "cannot create an empty blob in the object database"
 msgstr "impossibile creare un blob vuoto nel database oggetti"
 
-#: read-cache.c:718
+#: read-cache.c:720
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 "%s: è possibile aggiungere solo file regolari, collegamenti simbolici o "
 "directory Git"
 
-#: read-cache.c:723
+#: read-cache.c:725
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' non ha un commit di cui è stato eseguito il checkout"
 
-#: read-cache.c:775
+#: read-cache.c:777
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "impossibile indicizzare il file '%s'"
 
-#: read-cache.c:794
+#: read-cache.c:796
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "impossibile aggiungere '%s' all'indice"
 
-#: read-cache.c:805
+#: read-cache.c:807
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "impossibile eseguire stat su '%s'"
 
-#: read-cache.c:1314
+#: read-cache.c:1318
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' compare sia come file sia come directory"
 
-#: read-cache.c:1520
+#: read-cache.c:1524
 msgid "Refresh index"
 msgstr "Aggiornamento indice"
 
-#: read-cache.c:1635
+#: read-cache.c:1639
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4739,7 +5683,7 @@ msgstr ""
 "index.version impostato, ma il valore non è valido.\n"
 "Uso la versione %i"
 
-#: read-cache.c:1645
+#: read-cache.c:1649
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4748,143 +5692,154 @@ msgstr ""
 "GIT_INDEX_VERSION impostato, ma il valore non è valido.\n"
 "Uso la versione %i"
 
-#: read-cache.c:1701
+#: read-cache.c:1705
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "firma non valida: 0x%08x"
 
-#: read-cache.c:1704
+#: read-cache.c:1708
 #, c-format
 msgid "bad index version %d"
 msgstr "versione indice non valida: %d"
 
-#: read-cache.c:1713
+#: read-cache.c:1717
 msgid "bad index file sha1 signature"
 msgstr "firma SHA1 file indice non valida"
 
-#: read-cache.c:1743
+#: read-cache.c:1747
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "l'indice usa l'estensione %.4s che non comprendiamo"
 
-#: read-cache.c:1745
+#: read-cache.c:1749
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "estensione %.4s ignorata"
 
-#: read-cache.c:1782
+#: read-cache.c:1786
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "formato voce indice sconosciuto: 0x%08x"
 
-#: read-cache.c:1798
+#: read-cache.c:1802
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "campo nome malformato nell'indice, vicino al percorso '%s'"
 
-#: read-cache.c:1855
+#: read-cache.c:1859
 msgid "unordered stage entries in index"
 msgstr "voci stage non ordinate nell'indice"
 
-#: read-cache.c:1858
+#: read-cache.c:1862
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "voci stage multiple per il file sottoposto a merge '%s'"
 
-#: read-cache.c:1861
+#: read-cache.c:1865
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "voci stage non ordinate per '%s'"
 
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: 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:489 builtin/checkout.c:675 builtin/clean.c:991
+#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/mv.c:146 builtin/reset.c:247 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "file indice corrotto"
 
-#: read-cache.c:2108
+#: read-cache.c:2115
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "impossibile creare il thread load_cache_entries: %s"
 
-#: read-cache.c:2121
+#: read-cache.c:2128
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "impossibile bloccare il thread load_cache_entries: %s"
 
-#: read-cache.c:2154
+#: read-cache.c:2161
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: apertura del file indice non riuscita"
 
-#: read-cache.c:2158
+#: read-cache.c:2165
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: impossibile eseguire stat sull'indice aperto"
 
-#: read-cache.c:2162
+#: read-cache.c:2169
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: file indice più piccolo della dimensione attesa"
 
-#: read-cache.c:2166
+#: read-cache.c:2173
 #, c-format
 msgid "%s: unable to map index file"
 msgstr "%s: impossibile mappare il file indice"
 
-#: read-cache.c:2208
+#: read-cache.c:2215
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "impossibile creare il thread load_index_extensions: %s"
 
-#: read-cache.c:2235
+#: read-cache.c:2242
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "impossibile bloccare il thread load_index_extensions: %s"
 
-#: read-cache.c:2267
+#: read-cache.c:2274
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "impossibile aggiornare l'indice condiviso '%s'"
 
-#: read-cache.c:2314
+#: read-cache.c:2321
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "indice corrotto, atteso %s in %s, presente %s"
 
-#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1126
 #, c-format
 msgid "could not close '%s'"
 msgstr "impossibile chiudere '%s'"
 
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
+#: read-cache.c:3120 sequencer.c:2446 sequencer.c:4185
 #, c-format
 msgid "could not stat '%s'"
 msgstr "impossibile eseguire lo stat di '%s'"
 
-#: read-cache.c:3126
+#: read-cache.c:3133
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "impossibile aprire la directory git: %s"
 
-#: read-cache.c:3138
+#: read-cache.c:3145
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "impossibile eseguire unlink: %s"
 
-#: read-cache.c:3163
+#: read-cache.c:3170
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "impossibile correggere i permessi di '%s'"
 
-#: read-cache.c:3312
+#: read-cache.c:3319
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: impossibile ripiegare sullo stadio 0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+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 ""
+"Puoi correggere questa situazione con 'git rebase --edit-todo' e quindi "
+"eseguire 'git rebase --continue'.\n"
+"Oppure puoi interrompere il rebase con 'git rebase --abort'.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
@@ -4892,7 +5847,7 @@ msgstr ""
 "impostazione %s non riconosciuta per l'opzione rebase.missingCommitsCheck. "
 "La ignoro."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4937,14 +5892,14 @@ msgstr ""
 "Queste righe possono essere riordinate; saranno eseguite dalla prima "
 "all'ultima.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "Rebase di %s su %s (%d comando)"
 msgstr[1] "Rebase di %s su %s (%d comandi)"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -4953,7 +5908,7 @@ msgstr ""
 "Non eliminare alcuna riga. Usa esplicitamente 'drop' per rimuovere un "
 "commit.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4961,7 +5916,7 @@ msgstr ""
 "\n"
 "Rimuovendo una riga da qui IL COMMIT CORRISPONDENTE ANDRÀ PERDUTO.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4975,7 +5930,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4985,22 +5940,19 @@ msgstr ""
 "Ciò nonostante, se rimuovi tutto, il rebase sarà annullato.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Nota che i commit vuoti sono commentati"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
+#: rebase-interactive.c:110 rerere.c:485 rerere.c:692 sequencer.c:3571
+#: sequencer.c:3597 sequencer.c:5389 builtin/fsck.c:347 builtin/rebase.c:264
 #, c-format
 msgid "could not write '%s'"
 msgstr "impossibile scrivere '%s'"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:196 builtin/rebase.c:222
+#: builtin/rebase.c:246
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "impossibile copiare '%s' in '%s'."
+msgid "could not write '%s'."
+msgstr "impossibile scrivere '%s'."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -5010,7 +5962,7 @@ msgstr ""
 "accidentalmente.\n"
 "Commit scartati (dal più al meno recente):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -5028,124 +5980,14 @@ msgstr ""
 "I comportamenti possibili sono ignore, warn, error.\n"
 "\n"
 
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s non punta a un oggetto valido!"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "ignoro il riferimento simbolico pendente %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "ignoro il riferimento rotto %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "impossibile aprire '%s' in scrittura: %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "impossibile leggere il riferimento '%s'"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "il riferimento '%s' esiste già"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "ID oggetto inatteso durante la scrittura di '%s'"
-
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "impossibile scrivere su '%s'"
-
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1004
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "impossibile aprire '%s' in scrittura"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "ID oggetto inatteso durante l'eliminazione di '%s'"
-
-#: refs.c:998
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "il registro per il riferimento %s ha delle voci mancanti dopo %s"
-
-#: refs.c:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "il registro per il riferimento %s è terminato inaspettatamente a %s"
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "il registro per %s è vuoto"
-
-#: refs.c:1155
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'"
-
-#: refs.c:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "update_ref per il riferimento '%s' non riuscita: %s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' esiste già; impossibile creare '%s'"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "impossibile gestire '%s' e '%s' contemporaneamente"
-
-#: refs/files-backend.c:1234
-#, c-format
-msgid "could not remove reference %s"
-msgstr "impossibile rimuovere il riferimento %s"
-
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "impossibile eliminare il riferimento %s: %s"
-
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "impossibile eliminare i riferimenti: %s"
-
-#: refspec.c:137
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2361
+#: builtin/rebase.c:182 builtin/rebase.c:207 builtin/rebase.c:233
+#: builtin/rebase.c:258
 #, c-format
-msgid "invalid refspec '%s'"
-msgstr "specificatore riferimento '%s' non valido"
+msgid "could not read '%s'."
+msgstr "impossibile leggere '%s'."
 
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1973
 msgid "gone"
 msgstr "sparito"
 
@@ -5164,122 +6006,127 @@ msgstr "prima di %d"
 msgid "ahead %d, behind %d"
 msgstr "dopo %d, prima di %d"
 
-#: ref-filter.c:165
+#: ref-filter.c:169
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "formato atteso: %%(color:<colore>)"
 
-#: ref-filter.c:167
+#: ref-filter.c:171
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "colore non riconosciuto: %%(color:%s)"
 
-#: ref-filter.c:189
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Atteso valore intero: refname:lstrip=%s"
 
-#: ref-filter.c:193
+#: ref-filter.c:197
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Atteso valore intero: refname:rstrip=%s"
 
-#: ref-filter.c:195
+#: ref-filter.c:199
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "argomento %%(%s) non riconosciuto: %s"
 
-#: ref-filter.c:250
+#: ref-filter.c:254
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) non accetta argomenti"
 
-#: ref-filter.c:272
+#: ref-filter.c:276
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "argomento %%(objectsize) non riconosciuto: %s"
 
-#: ref-filter.c:280
+#: ref-filter.c:284
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) non accetta argomenti"
 
-#: ref-filter.c:292
+#: ref-filter.c:296
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) non accetta argomenti"
 
-#: ref-filter.c:301
+#: ref-filter.c:309
 #, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) non accetta argomenti"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "argomento %%(subject) non riconosciuto: %s"
 
-#: ref-filter.c:323
+#: ref-filter.c:330
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "argomento %%(trailers) sconosciuto: %s"
 
-#: ref-filter.c:352
+#: ref-filter.c:363
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "atteso valore positivo in contents:lines=%s"
 
-#: ref-filter.c:354
+#: ref-filter.c:365
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "argomento %%(contents) non riconosciuto: %s"
 
-#: ref-filter.c:369
+#: ref-filter.c:380
 #, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "atteso valore positivo in objectname:short=%s"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "atteso valore positivo '%s' in %%(%s)"
 
-#: ref-filter.c:373
+#: ref-filter.c:384
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "argomento %%(objectname) non riconosciuto: %s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "argomento non riconosciuto '%s' in %%(%s)"
 
-#: ref-filter.c:403
+#: ref-filter.c:398
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "opzione e-mail non riconosciuta: %s"
+
+#: ref-filter.c:428
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "formato atteso: %%(align:<ampiezza>,<posizione>)"
 
-#: ref-filter.c:415
+#: ref-filter.c:440
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "valore non riconosciuto: position:%s"
 
-#: ref-filter.c:422
+#: ref-filter.c:447
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "valore non riconosciuto: width:%s"
 
-#: ref-filter.c:431
+#: ref-filter.c:456
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "argomento %%(align) non riconosciuto: %s"
 
-#: ref-filter.c:439
+#: ref-filter.c:464
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "attesa ampiezza positiva con l'atom %%(align)"
 
-#: ref-filter.c:457
+#: ref-filter.c:482
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "argomento %%(if) non riconosciuto: %s"
 
-#: ref-filter.c:559
+#: ref-filter.c:584
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nome campo malformato: %.*s"
 
-#: ref-filter.c:586
+#: ref-filter.c:611
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nome campo sconosciuto: %.*s"
 
-#: ref-filter.c:590
+#: ref-filter.c:615
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
@@ -5287,160 +6134,244 @@ msgstr ""
 "non è un repository git, ma il campo '%.*s' richiede l'accesso ai dati "
 "oggetto"
 
-#: ref-filter.c:714
+#: ref-filter.c:739
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "formato: atomo %%(if) usato senza un atomo %%(then)"
 
-#: ref-filter.c:777
+#: ref-filter.c:802
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "formato: atomo %%(then) usato senza un atomo %%(if)"
 
-#: ref-filter.c:779
+#: ref-filter.c:804
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "formato: atomo %%(then) usato più di una volta"
 
-#: ref-filter.c:781
+#: ref-filter.c:806
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "formato: atomo %%(then) usato dopo %%(else)"
 
-#: ref-filter.c:809
+#: ref-filter.c:834
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "formato: atomo %%(else) usato senza un atomo %%(if)"
 
-#: ref-filter.c:811
+#: ref-filter.c:836
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "formato: atomo %%(else) usato senza un atomo %%(then)"
 
-#: ref-filter.c:813
+#: ref-filter.c:838
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "formato: atomo %%(else) usato più di una volta"
 
-#: ref-filter.c:828
+#: ref-filter.c:853
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "formato: atomo %%(end) usato senza l'atomo corrispondente"
 
-#: ref-filter.c:885
+#: ref-filter.c:910
 #, c-format
 msgid "malformed format string %s"
 msgstr "stringa di formato %s malformata"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1541
 #, c-format
 msgid "no branch, rebasing %s"
 msgstr "nessun branch, eseguo il rebase di %s"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1544
 #, c-format
 msgid "no branch, rebasing detached HEAD %s"
 msgstr "nessun branch, eseguo il rebase dell'HEAD scollegato %s"
 
-#: ref-filter.c:1494
+#: ref-filter.c:1547
 #, c-format
 msgid "no branch, bisect started on %s"
 msgstr "nessun branch, bisezione avviata su %s"
 
-#: ref-filter.c:1504
+#: ref-filter.c:1557
 msgid "no branch"
 msgstr "nessun branch"
 
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1591 ref-filter.c:1800
 #, c-format
 msgid "missing object %s for %s"
 msgstr "oggetto %s mancante per %s"
 
-#: ref-filter.c:1550
+#: ref-filter.c:1601
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer non riuscito su %s per %s"
 
-#: ref-filter.c:2004
+#: ref-filter.c:2054
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "oggetto malformato in '%s'"
 
-#: ref-filter.c:2093
+#: ref-filter.c:2143
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignoro il riferimento con il nome malformato %s"
 
-#: ref-filter.c:2389
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "formato: atomo %%(end) mancante"
-
-#: ref-filter.c:2489
+#: ref-filter.c:2148 refs.c:657
 #, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "l'opzione `%s' non è compatibile con --merged"
+msgid "ignoring broken ref %s"
+msgstr "ignoro il riferimento rotto %s"
 
-#: ref-filter.c:2492
+#: ref-filter.c:2464
 #, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "l'opzione `%s' non è compatibile con --no-merged"
+msgid "format: %%(end) atom missing"
+msgstr "formato: atomo %%(end) mancante"
 
-#: ref-filter.c:2502
+#: ref-filter.c:2563
 #, c-format
 msgid "malformed object name %s"
 msgstr "nome dell'oggetto %s malformato"
 
-#: ref-filter.c:2507
+#: ref-filter.c:2568
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "l'opzione `%s' deve puntare ad un commit"
 
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s non punta a un oggetto valido!"
+
+#: refs.c:572
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "impossibile recuperare `%s`"
+
+#: refs.c:579
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nome branch non valido: %s = %s"
+
+#: refs.c:655
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignoro il riferimento simbolico pendente %s"
+
+#: refs.c:892
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "il registro per il riferimento %s ha delle voci mancanti dopo %s"
+
+#: refs.c:898
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "il registro per il riferimento %s è terminato inaspettatamente a %s"
+
+#: refs.c:957
+#, c-format
+msgid "log for %s is empty"
+msgstr "il registro per %s è vuoto"
+
+#: refs.c:1049
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "mi rifiuto di aggiornare il riferimento con il nome non valido '%s'"
+
+#: refs.c:1120
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref per il riferimento '%s' non riuscita: %s"
+
+#: refs.c:1944
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "aggiornamenti multipli per il riferimento '%s' non consentiti"
+
+#: refs.c:2024
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "aggiornamenti riferimento vietati nell'ambiente quarantena"
+
+#: refs.c:2035
+msgid "ref updates aborted by hook"
+msgstr "aggiornamento ref interrotto dall'hook"
+
+#: refs.c:2135 refs.c:2165
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' esiste già; impossibile creare '%s'"
+
+#: refs.c:2141 refs.c:2176
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "impossibile gestire '%s' e '%s' contemporaneamente"
+
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
+msgstr "impossibile rimuovere il riferimento %s"
+
+#: refs/files-backend.c:1242 refs/packed-backend.c:1542
+#: refs/packed-backend.c:1552
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "impossibile eliminare il riferimento %s: %s"
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr "impossibile eliminare i riferimenti: %s"
+
+#: refspec.c:167
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "specificatore riferimento '%s' non valido"
+
+#: remote.c:351
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 "la forma breve della configurazione del remoto non può iniziare con '/': %s"
 
-#: remote.c:413
+#: remote.c:399
 msgid "more than one receivepack given, using the first"
 msgstr "è stata specificata più di una direttiva receivepack, uso la prima"
 
-#: remote.c:421
+#: remote.c:407
 msgid "more than one uploadpack given, using the first"
 msgstr "è stata specificata più di una direttiva uploadpack, uso la prima"
 
-#: remote.c:611
+#: remote.c:590
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "Impossibile recuperare sia %s sia %s in %s"
 
-#: remote.c:615
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s solitamente traccia %s, non %s"
 
-#: remote.c:619
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s traccia sia %s sia %s"
 
-#: remote.c:687
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "la chiave '%s' del pattern non aveva un '*'"
 
-#: remote.c:697
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "il valore '%s' del pattern non ha un '*'"
 
-#: remote.c:1003
+#: remote.c:1073
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "nessuna corrispondenza per lo specificatore riferimento sorgente %s"
 
-#: remote.c:1008
+#: remote.c:1078
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -5451,7 +6382,7 @@ msgstr ""
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1023
+#: remote.c:1093
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5477,7 +6408,7 @@ msgstr ""
 "Nessuna delle due opzioni ha funzionato, quindi ci siamo arresi.\n"
 "Devi specificare un riferimento completamente qualificato."
 
-#: remote.c:1043
+#: remote.c:1113
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5488,7 +6419,7 @@ msgstr ""
 "è un oggetto tag. Forse intendevi creare un nuovo\n"
 "branch eseguendo il push a '%s:refs/heads/%s'?"
 
-#: remote.c:1048
+#: remote.c:1118
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5499,7 +6430,7 @@ msgstr ""
 "è un oggetto tag. Forse intendevi creare un nuovo\n"
 "branch eseguendo il push a '%s:refs/tags/%s'?"
 
-#: remote.c:1053
+#: remote.c:1123
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5511,7 +6442,7 @@ msgstr ""
 "tag a un nuovo albero eseguendo il push a\n"
 "'%s:refs/tags/%s'?"
 
-#: remote.c:1058
+#: remote.c:1128
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5523,121 +6454,121 @@ msgstr ""
 "tag a un nuovo blob eseguendo il push a\n"
 "'%s:refs/tags/%s'?"
 
-#: remote.c:1094
+#: remote.c:1164
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s non può essere risolto in un branch"
 
-#: remote.c:1105
+#: remote.c:1175
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "impossibile eliminare '%s': il riferimento remoto non esiste"
 
-#: remote.c:1117
+#: remote.c:1187
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 "sono state trovate più corrispondenze per lo specificatore riferimento "
 "destinazione %s"
 
-#: remote.c:1124
+#: remote.c:1194
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 "lo specificatore riferimento destinazione %s riceve dati da più di una "
 "sorgente"
 
-#: remote.c:1627 remote.c:1728
+#: remote.c:1703 remote.c:1804
 msgid "HEAD does not point to a branch"
 msgstr "HEAD non punta ad un branch"
 
-#: remote.c:1636
+#: remote.c:1712
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "branch '%s' non esistente"
 
-#: remote.c:1639
+#: remote.c:1715
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "nessun upstream configurato per il branch '%s'"
 
-#: remote.c:1645
+#: remote.c:1721
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr ""
 "branch upstream '%s' non memorizzato come branch che ne traccia uno remoto"
 
-#: remote.c:1660
+#: remote.c:1736
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
 "la destinazione del push '%s' sul remoto '%s' non ha un branch locale che la "
 "traccia"
 
-#: remote.c:1672
+#: remote.c:1748
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "il branch '%s' non ha un remoto per il push"
 
-#: remote.c:1682
+#: remote.c:1758
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "gli specificatori riferimento per '%s' non includono '%s'"
 
-#: remote.c:1695
+#: remote.c:1771
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "il push non ha una destinazione (push.default è 'nothing')"
 
-#: remote.c:1717
+#: remote.c:1793
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "impossibile risolvere il push 'simple' a una singola destinazione"
 
-#: remote.c:1843
+#: remote.c:1922
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "impossibile trovare il riferimento remoto %s"
 
-#: remote.c:1856
+#: remote.c:1935
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Ignoro localmente il riferimento strano '%s'"
 
-#: remote.c:2019
+#: remote.c:2098
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Il tuo branch è basato su '%s', ma l'upstream è scomparso.\n"
 
-#: remote.c:2023
+#: remote.c:2102
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (usa \"git branch --unset-upstream\" per correggere la situazione)\n"
 
-#: remote.c:2026
+#: remote.c:2105
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Il tuo branch è aggiornato rispetto a '%s'.\n"
 
-#: remote.c:2030
+#: remote.c:2109
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Il tuo branch e '%s' fanno riferimento a commit differenti.\n"
 
-#: remote.c:2033
+#: remote.c:2112
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (usa \"%s\" per visualizzare i dettagli)\n"
 
-#: remote.c:2037
+#: remote.c:2116
 #, 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] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n"
 msgstr[1] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n"
 
-#: remote.c:2043
+#: remote.c:2122
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (usa \"git push\" per pubblicare i tuoi commit locali)\n"
 
-#: remote.c:2046
+#: remote.c:2125
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5649,11 +6580,11 @@ msgstr[1] ""
 "Il tuo branch, rispetto a '%s', è indietro di %d commit e ne posso eseguire "
 "il fast forward.\n"
 
-#: remote.c:2054
+#: remote.c:2133
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (usa \"git pull\" per aggiornare il tuo branch locale)\n"
 
-#: remote.c:2057
+#: remote.c:2136
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5668,11 +6599,11 @@ msgstr[1] ""
 "Il tuo branch e '%s' sono diventati divergenti\n"
 "e hanno rispettivamente %d e %d commit differenti.\n"
 
-#: remote.c:2067
+#: remote.c:2146
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (usa \"git pull\" per eseguire il merge del branch remoto nel tuo)\n"
 
-#: remote.c:2250
+#: remote.c:2337
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "impossibile analizzare il nome oggetto atteso '%s'"
@@ -5687,7 +6618,7 @@ msgstr "nome riferimento sostitutivo non valido: %s"
 msgid "duplicate replace ref: %s"
 msgstr "riferimento sostitutivo duplicato: %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "profondità sostituzione troppo elevata per l'oggetto %s"
@@ -5750,8 +6681,8 @@ msgstr "impossibile eseguire l'unlink dell'oggetto smarrito '%s'"
 msgid "Recorded preimage for '%s'"
 msgstr "Salvata preimmagine di '%s'"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2082 builtin/log.c:1975
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "impossibile creare la directory '%s'"
@@ -5785,20 +6716,34 @@ msgstr "Risoluzione per '%s' dimenticata\n"
 msgid "unable to open rr-cache directory"
 msgstr "impossibile aprire la directory cache rr"
 
-#: revision.c:2509
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "impossibile determinare la revisione HEAD"
+
+#: reset.c:70 reset.c:76 sequencer.c:3426
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "impossibile trovare l'albero di %s"
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> non è più supportato"
+
+#: revision.c:2364
+#, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr "valore sconosciuto per --diff-merges: %s"
+
+#: revision.c:2702
 msgid "your current branch appears to be broken"
 msgstr "sembra che il tuo branch corrente sia rotto"
 
-#: revision.c:2512
+#: revision.c:2705
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "il tuo branch corrente '%s' non ha ancora commit"
 
-#: revision.c:2720
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent non è compatibile con --bisect"
-
-#: revision.c:2724
+#: revision.c:2915
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L non supporta ancora formati diff oltre a -p e -s"
 
@@ -5806,12 +6751,12 @@ msgstr "-L non supporta ancora formati diff oltre a -p e -s"
 msgid "open /dev/null failed"
 msgstr "apertura di /dev/null non riuscita"
 
-#: run-command.c:1269
+#: run-command.c:1270
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "impossibile creare il thread async: %s"
 
-#: run-command.c:1333
+#: run-command.c:1334
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -5820,31 +6765,35 @@ msgstr ""
 "L'hook '%s' è stato ignorato perché non è impostato come eseguibile.\n"
 "Puoi disabilitare quest'avviso con `git config advice.ignoredHook false`."
 
-#: send-pack.c:142
+#: send-pack.c:145
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "pacchetto flush inatteso durante la lettura dello stato decompressione del "
 "remoto"
 
-#: send-pack.c:144
+#: send-pack.c:147
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "impossibile analizzare lo stato decompressione del remoto: %s"
 
-#: send-pack.c:146
+#: send-pack.c:149
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "decompressione sul remoto non riuscita: %s"
 
-#: send-pack.c:307
+#: send-pack.c:372
 msgid "failed to sign the push certificate"
 msgstr "firma del certificato per il push non riuscita"
 
-#: send-pack.c:421
+#: send-pack.c:460
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "il ricevente non supporta l'algoritmo hash di questo repository"
+
+#: send-pack.c:469
 msgid "the receiving end does not support --signed push"
 msgstr "il ricevente non supporta i push --signed"
 
-#: send-pack.c:423
+#: send-pack.c:471
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5852,47 +6801,47 @@ msgstr ""
 "non invio un certificato push perché il ricevente non supporta i push --"
 "signed"
 
-#: send-pack.c:435
+#: send-pack.c:483
 msgid "the receiving end does not support --atomic push"
 msgstr "il ricevente non supporta i push --atomic"
 
-#: send-pack.c:440
+#: send-pack.c:488
 msgid "the receiving end does not support push options"
 msgstr "il ricevente non supporta le opzioni push"
 
-#: sequencer.c:187
+#: sequencer.c:194
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "modalità pulizia messaggio commit non valida: '%s'"
 
-#: sequencer.c:292
+#: sequencer.c:308
 #, c-format
 msgid "could not delete '%s'"
 msgstr "impossibile eliminare '%s'"
 
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
+#: sequencer.c:329 builtin/rebase.c:749 builtin/rebase.c:1590 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr "impossibile rimuovere '%s'"
 
-#: sequencer.c:321
+#: sequencer.c:339
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:323
+#: sequencer.c:341
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:343
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
+#: sequencer.c:345
 #, c-format
 msgid "unknown action: %d"
 msgstr "azione sconosciuta: %d"
 
-#: sequencer.c:385
+#: sequencer.c:404
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5900,7 +6849,7 @@ msgstr ""
 "dopo aver risolto i conflitti, contrassegna i percorsi corretti\n"
 "con 'git add <path>' o 'git rm <path>'"
 
-#: sequencer.c:388
+#: sequencer.c:407
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5910,110 +6859,109 @@ msgstr ""
 "con 'git add <path>' o 'git rm <path>' ed esegui\n"
 "il commit del risultato con 'git commit'"
 
-#: sequencer.c:401 sequencer.c:2847
+#: sequencer.c:420 sequencer.c:3028
 #, c-format
 msgid "could not lock '%s'"
 msgstr "impossibile bloccare '%s'"
 
-#: sequencer.c:408
+#: sequencer.c:422 sequencer.c:2827 sequencer.c:3032 sequencer.c:3046
+#: sequencer.c:3303 sequencer.c:5299 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "impossibile scrivere su '%s'"
+
+#: sequencer.c:427
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "impossibile scrivere il carattere di fine riga in '%s'"
 
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
-#: sequencer.c:3130
+#: sequencer.c:432 sequencer.c:2832 sequencer.c:3034 sequencer.c:3048
+#: sequencer.c:3311
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "finalizzazione di '%s' non riuscita"
 
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
-#: builtin/rebase.c:568
-#, c-format
-msgid "could not read '%s'"
-msgstr "impossibile leggere '%s'"
-
-#: sequencer.c:462
+#: sequencer.c:471
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "le tue modifiche locali sarebbero sovrascritte da %s."
 
-#: sequencer.c:466
+#: sequencer.c:475
 msgid "commit your changes or stash them to proceed."
 msgstr "esegui il commit delle modifiche o lo stash per procedere."
 
-#: sequencer.c:498
+#: sequencer.c:507
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: fast forward"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:546 builtin/tag.c:566
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Modalità pulizia non valida: %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:631
+#: sequencer.c:640
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: impossibile scrivere il nuovo file indice"
 
-#: sequencer.c:648
+#: sequencer.c:657
 msgid "unable to update cache tree"
 msgstr "impossibile aggiornare l'albero cache"
 
-#: sequencer.c:662
+#: sequencer.c:671
 msgid "could not resolve HEAD commit"
 msgstr "impossibile risolvere il commit HEAD"
 
-#: sequencer.c:742
+#: sequencer.c:751
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "nessuna chiave presente in '%.*s'"
 
-#: sequencer.c:753
+#: sequencer.c:762
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "impossibile rimuovere gli apici dal valore di '%s'"
 
-#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
+#: sequencer.c:799 wrapper.c:201 wrapper.c:371 builtin/am.c:724
+#: builtin/am.c:816 builtin/merge.c:1121 builtin/rebase.c:902
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "impossibile aprire '%s' in lettura"
 
-#: sequencer.c:800
+#: sequencer.c:809
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "'GIT_AUTHOR_NAME' già specificato"
 
-#: sequencer.c:805
+#: sequencer.c:814
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "'GIT_AUTHOR_EMAIL' già specificato"
 
-#: sequencer.c:810
+#: sequencer.c:819
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "'GIT_AUTHOR_DATE' già specificato"
 
-#: sequencer.c:814
+#: sequencer.c:823
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "variabile '%s' sconosciuta"
 
-#: sequencer.c:819
+#: sequencer.c:828
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "'GIT_AUTHOR_NAME' mancante"
 
-#: sequencer.c:821
+#: sequencer.c:830
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "'GIT_AUTHOR_EMAIL' mancante"
 
-#: sequencer.c:823
+#: sequencer.c:832
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "'GIT_AUTHOR_DATE' mancante"
 
-#: sequencer.c:872
+#: sequencer.c:897
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -6043,11 +6991,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1146
+#: sequencer.c:1178
 msgid "'prepare-commit-msg' hook failed"
 msgstr "hook 'prepare-commit-msg' non riuscito"
 
-#: sequencer.c:1153
+#: sequencer.c:1184
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6074,7 +7022,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1166
+#: sequencer.c:1197
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -6100,329 +7048,342 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1208
+#: sequencer.c:1239
 msgid "couldn't look up newly created commit"
 msgstr "impossibile trovare il commit appena creato"
 
-#: sequencer.c:1210
+#: sequencer.c:1241
 msgid "could not parse newly created commit"
 msgstr "impossibile analizzare il commit appena creato"
 
-#: sequencer.c:1256
+#: sequencer.c:1287
 msgid "unable to resolve HEAD after creating commit"
 msgstr "impossibile risolvere HEAD dopo la creazione del commit"
 
-#: sequencer.c:1258
+#: sequencer.c:1289
 msgid "detached HEAD"
 msgstr "HEAD scollegato"
 
-#: sequencer.c:1262
+#: sequencer.c:1293
 msgid " (root-commit)"
 msgstr " (commit radice)"
 
-#: sequencer.c:1283
+#: sequencer.c:1314
 msgid "could not parse HEAD"
 msgstr "impossibile analizzare HEAD"
 
-#: sequencer.c:1285
+#: sequencer.c:1316
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "L'HEAD %s non è un commit!"
 
-#: sequencer.c:1289 builtin/commit.c:1571
+#: sequencer.c:1320 sequencer.c:1395 builtin/commit.c:1577
 msgid "could not parse HEAD commit"
 msgstr "impossibile analizzare il commit HEAD"
 
-#: sequencer.c:1341 sequencer.c:1933
+#: sequencer.c:1373 sequencer.c:2067
 msgid "unable to parse commit author"
 msgstr "impossibile analizzare l'autore del commit"
 
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1384 builtin/am.c:1580 builtin/merge.c:692
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree non è riuscito a scrivere un albero"
 
-#: sequencer.c:1369 sequencer.c:1429
+#: sequencer.c:1417 sequencer.c:1535
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "impossibile leggere il messaggio di commit da '%s'"
 
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1446 sequencer.c:1478
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "identità autore '%s' non valida"
+
+#: sequencer.c:1452
+msgid "corrupt author: missing date information"
+msgstr "informazioni sull'autore corrotte: informazioni sulla data mancanti"
+
+#: sequencer.c:1491 builtin/am.c:1606 builtin/commit.c:1678 builtin/merge.c:890
+#: builtin/merge.c:915
 msgid "failed to write commit object"
 msgstr "scrittura dell'oggetto del commit non riuscita"
 
-#: sequencer.c:1456
+#: sequencer.c:1518 sequencer.c:4237
+#, c-format
+msgid "could not update %s"
+msgstr "impossibile aggiornare %s"
+
+#: sequencer.c:1567
 #, c-format
 msgid "could not parse commit %s"
 msgstr "impossibile analizzare il commit %s"
 
-#: sequencer.c:1461
+#: sequencer.c:1572
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "impossibile analizzare il commit genitore %s"
 
-#: sequencer.c:1535 sequencer.c:1645
+#: sequencer.c:1655 sequencer.c:1766
 #, c-format
 msgid "unknown command: %d"
 msgstr "comando sconosciuto: %d"
 
-#: sequencer.c:1592 sequencer.c:1617
+#: sequencer.c:1713 sequencer.c:1738
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Questa è una combinazione di %d commit."
 
-#: sequencer.c:1602
+#: sequencer.c:1723
 msgid "need a HEAD to fixup"
 msgstr "è necessaria un'HEAD per il fixup"
 
-#: sequencer.c:1604 sequencer.c:3157
+#: sequencer.c:1725 sequencer.c:3338
 msgid "could not read HEAD"
 msgstr "impossibile leggere l'HEAD"
 
-#: sequencer.c:1606
+#: sequencer.c:1727
 msgid "could not read HEAD's commit message"
 msgstr "impossibile leggere il messaggio di commit dell'HEAD"
 
-#: sequencer.c:1612
+#: sequencer.c:1733
 #, c-format
 msgid "cannot write '%s'"
 msgstr "impossibile scrivere '%s'"
 
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1740 git-rebase--preserve-merges.sh:486
 msgid "This is the 1st commit message:"
 msgstr "Questo è il primo messaggio di commit:"
 
-#: sequencer.c:1627
+#: sequencer.c:1748
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "impossibile leggere il messaggio di commit di %s"
 
-#: sequencer.c:1634
+#: sequencer.c:1755
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Questo è il messaggio di commit numero %d:"
 
-#: sequencer.c:1640
+#: sequencer.c:1761
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Il messaggio di commit numero %d sarà saltato:"
 
-#: sequencer.c:1728
+#: sequencer.c:1849
 msgid "your index file is unmerged."
 msgstr "il file indice non è stato sottoposto a merge."
 
-#: sequencer.c:1735
+#: sequencer.c:1856
 msgid "cannot fixup root commit"
 msgstr "impossibile eseguire il fixup sul commit radice"
 
-#: sequencer.c:1754
+#: sequencer.c:1875
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "il commit %s è un merge ma non è stata specificata l'opzione -m."
 
-#: sequencer.c:1762 sequencer.c:1770
+#: sequencer.c:1883 sequencer.c:1891
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "il commit %s non ha il genitore %d"
 
-#: sequencer.c:1776
+#: sequencer.c:1897
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "impossibile ottenere il messaggio di commit per %s"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1795
+#: sequencer.c:1916
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: impossibile analizzare il commit genitore %s"
 
-#: sequencer.c:1860
+#: sequencer.c:1981
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "impossibile ridenominare '%s' in '%s'"
 
-#: sequencer.c:1915
+#: sequencer.c:2038
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "non è stato possibile eseguire il revert di %s... %s"
 
-#: sequencer.c:1916
+#: sequencer.c:2039
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "non è stato possibile applicare %s... %s"
 
-#: sequencer.c:1983
+#: sequencer.c:2059
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "scarto %s %s - i contenuti della patch sono già upstream\n"
+
+#: sequencer.c:2117
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: lettura dell'indice non riuscita"
 
-#: sequencer.c:1990
+#: sequencer.c:2124
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: aggiornamento dell'indice non riuscito"
 
-#: sequencer.c:2066
+#: sequencer.c:2201
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s non accetta argomenti: '%s'"
 
-#: sequencer.c:2075
+#: sequencer.c:2210
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argomenti mancanti per %s"
 
-#: sequencer.c:2112
+#: sequencer.c:2241
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "impossibile analizzare '%.*s'"
+msgid "could not parse '%s'"
+msgstr "impossibile analizzare '%s'"
 
-#: sequencer.c:2166
+#: sequencer.c:2302
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "riga %d non valida: %.*s"
 
-#: sequencer.c:2177
+#: sequencer.c:2313
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "impossibile eseguire '%s' senza un commit precedente"
 
-#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "impossibile leggere '%s'."
-
-#: sequencer.c:2261
+#: sequencer.c:2399
 msgid "cancelling a cherry picking in progress"
 msgstr "annullo un'operazione di cherry-pick in corso"
 
-#: sequencer.c:2268
+#: sequencer.c:2408
 msgid "cancelling a revert in progress"
 msgstr "annullo un'operazione di revert in corso"
 
-#: sequencer.c:2302
+#: sequencer.c:2452
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "correggi la situazione usando 'git rebase --edit-todo'."
 
-#: sequencer.c:2304
+#: sequencer.c:2454
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "foglio istruzioni inutilizzabile: '%s'"
 
-#: sequencer.c:2309
+#: sequencer.c:2459
 msgid "no commits parsed."
 msgstr "nessun commit analizzato."
 
-#: sequencer.c:2320
+#: sequencer.c:2470
 msgid "cannot cherry-pick during a revert."
 msgstr "impossibile eseguire un cherry-pick durante un revert."
 
-#: sequencer.c:2322
+#: sequencer.c:2472
 msgid "cannot revert during a cherry-pick."
 msgstr "impossibile eseguire un revert durante un cherry-pick."
 
-#: sequencer.c:2404
+#: sequencer.c:2550
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "valore non valido per %s: %s"
 
-#: sequencer.c:2491
+#: sequencer.c:2657
 msgid "unusable squash-onto"
 msgstr "squash-onto inutilizzabile"
 
-#: sequencer.c:2507
+#: sequencer.c:2677
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "foglio opzioni malformati: '%s'"
 
-#: sequencer.c:2590 sequencer.c:4308
+#: sequencer.c:2769 sequencer.c:4609
 msgid "empty commit set passed"
 msgstr "è stato passato un insieme di commit vuoto"
 
-#: sequencer.c:2606
+#: sequencer.c:2786
 msgid "revert is already in progress"
 msgstr "un'operazione di revert è già in corso"
 
-#: sequencer.c:2608
+#: sequencer.c:2788
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "prova \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2611
+#: sequencer.c:2791
 msgid "cherry-pick is already in progress"
 msgstr "un'operazione di cherry-pick è già in corso"
 
-#: sequencer.c:2613
+#: sequencer.c:2793
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "prova \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2627
+#: sequencer.c:2807
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "impossibile creare la directory sequencer '%s'"
 
-#: sequencer.c:2642
+#: sequencer.c:2822
 msgid "could not lock HEAD"
 msgstr "impossibile bloccare HEAD"
 
-#: sequencer.c:2702 sequencer.c:4057
+#: sequencer.c:2882 sequencer.c:4325
 msgid "no cherry-pick or revert in progress"
 msgstr "nessuna operazione di cherry-pick o revert in corso"
 
-#: sequencer.c:2704 sequencer.c:2715
+#: sequencer.c:2884 sequencer.c:2895
 msgid "cannot resolve HEAD"
 msgstr "impossibile risolvere HEAD"
 
-#: sequencer.c:2706 sequencer.c:2750
+#: sequencer.c:2886 sequencer.c:2930
 msgid "cannot abort from a branch yet to be born"
 msgstr ""
 "impossibile interrompere l'operazione da un branch che deve essere ancora "
 "creato"
 
-#: sequencer.c:2736 builtin/grep.c:736
+#: sequencer.c:2916 builtin/grep.c:745
 #, c-format
 msgid "cannot open '%s'"
 msgstr "impossibile aprire '%s'"
 
-#: sequencer.c:2738
+#: sequencer.c:2918
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "impossibile leggere '%s': %s"
 
-#: sequencer.c:2739
+#: sequencer.c:2919
 msgid "unexpected end of file"
 msgstr "fine del file inattesa"
 
-#: sequencer.c:2745
+#: sequencer.c:2925
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr ""
 "il file '%s' in cui è stato salvato l'HEAD prima del cherry pick è corrotto"
 
-#: sequencer.c:2756
+#: sequencer.c:2936
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr ""
 "Sembra che tu abbia spostato l'HEAD. Non eseguo il rewind, controlla l'HEAD!"
 
-#: sequencer.c:2797
+#: sequencer.c:2977
 msgid "no revert in progress"
 msgstr "nessun revert in corso"
 
-#: sequencer.c:2805
+#: sequencer.c:2986
 msgid "no cherry-pick in progress"
 msgstr "nessun cherry-pick in corso"
 
-#: sequencer.c:2815
+#: sequencer.c:2996
 msgid "failed to skip the commit"
 msgstr "salto del commit non riuscito"
 
-#: sequencer.c:2822
+#: sequencer.c:3003
 msgid "there is nothing to skip"
 msgstr "non c'è nulla da saltare"
 
-#: sequencer.c:2825
+#: sequencer.c:3006
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6431,21 +7392,16 @@ msgstr ""
 "hai già eseguito il commit?\n"
 "prova \"git %s --continue\""
 
-#: sequencer.c:2949 sequencer.c:3969
-#, c-format
-msgid "could not update %s"
-msgstr "impossibile aggiornare %s"
-
-#: sequencer.c:2987 sequencer.c:3949
+#: sequencer.c:3168 sequencer.c:4217
 msgid "cannot read HEAD"
 msgstr "impossibile leggere l'HEAD"
 
-#: sequencer.c:3004
+#: sequencer.c:3185
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "impossibile copiare '%s' in '%s'"
 
-#: sequencer.c:3012
+#: sequencer.c:3193
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6464,27 +7420,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3022
+#: sequencer.c:3203
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Impossibile applicare %s... %.*s"
 
-#: sequencer.c:3029
+#: sequencer.c:3210
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Impossibile eseguire il merge di %.*s"
 
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
+#: sequencer.c:3224 sequencer.c:3228 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "impossibile copiare '%s' in '%s'"
 
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
-msgid "could not read index"
-msgstr "impossibile leggere l'indice"
+#: sequencer.c:3240
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Eseguo %s\n"
 
-#: sequencer.c:3074
+#: sequencer.c:3255
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6499,11 +7455,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3080
+#: sequencer.c:3261
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro\n"
 
-#: sequencer.c:3086
+#: sequencer.c:3267
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6520,111 +7476,128 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3147
+#: sequencer.c:3328
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "nome etichetta illecito: '%.*s'"
 
-#: sequencer.c:3201
+#: sequencer.c:3382
 msgid "writing fake root commit"
 msgstr "scrittura commit radice falso in corso"
 
-#: sequencer.c:3206
+#: sequencer.c:3387
 msgid "writing squash-onto"
 msgstr "scrittura squash-onto in corso"
 
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "impossibile trovare l'albero di %s"
-
-#: sequencer.c:3262 builtin/rebase.c:874
-msgid "could not write index"
-msgstr "impossibile scrivere l'indice"
-
-#: sequencer.c:3289
+#: sequencer.c:3471
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "impossibile risolvere '%s'"
 
-#: sequencer.c:3320
+#: sequencer.c:3502
 msgid "cannot merge without a current revision"
 msgstr "impossibile eseguire il merge senza una revisione corrente"
 
-#: sequencer.c:3342
+#: sequencer.c:3524
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "impossibile analizzare '%.*s'"
 
-#: sequencer.c:3351
+#: sequencer.c:3533
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "non c'è nulla di cui eseguire il merge: '%.*s'"
 
-#: sequencer.c:3363
+#: sequencer.c:3545
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "il merge octopus non può essere eseguito su un [nuovo commit radice]"
 
-#: sequencer.c:3378
+#: sequencer.c:3561
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "impossibile ottenere il messaggio di commit per '%s'"
 
-#: sequencer.c:3538
+#: sequencer.c:3730
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "non è stato nemmeno possibile tentare di eseguire il merge di '%.*s'"
 
-#: sequencer.c:3554
+#: sequencer.c:3746
 msgid "merge: Unable to write new index file"
 msgstr "merge: impossibile scrivere il nuovo file indice"
 
-#: sequencer.c:3623 builtin/rebase.c:712
+#: sequencer.c:3820
+msgid "Cannot autostash"
+msgstr "Impossibile eseguire lo stash automatico"
+
+#: sequencer.c:3823
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Risposta stash non attesa: '%s'"
+
+#: sequencer.c:3829
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Impossibile creare la directory '%s'"
+
+#: sequencer.c:3832
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Stash automatico creato: %s\n"
+
+#: sequencer.c:3836
+msgid "could not reset --hard"
+msgstr "impossibile eseguire reset --hard"
+
+#: sequencer.c:3861
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Stash automatico applicato.\n"
 
-#: sequencer.c:3635
+#: sequencer.c:3873
 #, c-format
 msgid "cannot store %s"
 msgstr "impossibile memorizzare %s"
 
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
+#: sequencer.c:3876
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
-"L'applicazione dello stash automatico ha generato conflitti.\n"
+"%s\n"
 "Le tue modifiche sono al sicuro nello stash.\n"
 "Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n"
 
-#: sequencer.c:3699
-#, c-format
-msgid "could not checkout %s"
-msgstr "impossibile eseguire il checkout di %s"
+#: sequencer.c:3881
+msgid "Applying autostash resulted in conflicts."
+msgstr "L'applicazione dello stash automatico ha generato dei conflitti."
 
-#: sequencer.c:3713
+#: sequencer.c:3882
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Uno stash automatica esiste già; creo una nuova voce stash."
+
+#: sequencer.c:3974
 #, c-format
 msgid "%s: not a valid OID"
 msgstr "%s: non è un OID valido"
 
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3979 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
 msgstr "impossibile scollegare l'HEAD"
 
-#: sequencer.c:3733
+#: sequencer.c:3994
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Fermato a HEAD\n"
 
-#: sequencer.c:3735
+#: sequencer.c:3996
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Fermato a %s\n"
 
-#: sequencer.c:3743
+#: sequencer.c:4004
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6646,49 +7619,59 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3827
+#: sequencer.c:4050
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Rebase in corso (%d/%d)%s"
+
+#: sequencer.c:4095
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Fermato a %s... %.*s\n"
 
-#: sequencer.c:3898
+#: sequencer.c:4166
 #, c-format
 msgid "unknown command %d"
 msgstr "comando %d sconosciuto"
 
-#: sequencer.c:3957
+#: sequencer.c:4225
 msgid "could not read orig-head"
 msgstr "impossibile leggere orig-head"
 
-#: sequencer.c:3962
+#: sequencer.c:4230
 msgid "could not read 'onto'"
 msgstr "impossibile leggere 'onto'"
 
-#: sequencer.c:3976
+#: sequencer.c:4244
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "impossibile aggiornare l'HEAD a %s"
 
-#: sequencer.c:4069
+#: sequencer.c:4304
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Rebase e aggiornamento di %s eseguiti con successo.\n"
+
+#: sequencer.c:4337
 msgid "cannot rebase: You have unstaged changes."
 msgstr ""
 "impossibile eseguire il rebase: ci sono delle modifiche non in staging."
 
-#: sequencer.c:4078
+#: sequencer.c:4346
 msgid "cannot amend non-existing commit"
 msgstr "impossibile modificare un commit inesistente"
 
-#: sequencer.c:4080
+#: sequencer.c:4348
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "file non valido: '%s'"
 
-#: sequencer.c:4082
+#: sequencer.c:4350
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "contenuti non validi: '%s'"
 
-#: sequencer.c:4085
+#: sequencer.c:4353
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6699,69 +7682,64 @@ msgstr ""
 "di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n"
 "--continue'."
 
-#: sequencer.c:4121 sequencer.c:4159
+#: sequencer.c:4389 sequencer.c:4428
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "impossibile scrivere il file: '%s'"
 
-#: sequencer.c:4174
+#: sequencer.c:4444
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "impossibile rimuovere CHERRY_PICK_HEAD"
 
-#: sequencer.c:4181
+#: sequencer.c:4451
 msgid "could not commit staged changes."
 msgstr "impossibile eseguire il commit delle modifiche in staging."
 
-#: sequencer.c:4285
+#: sequencer.c:4477
+#, c-format
+msgid "invalid committer '%s'"
+msgstr "autore del commit non valido: '%s'"
+
+#: sequencer.c:4586
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: impossibile eseguire il cherry pick di un %s"
 
-#: sequencer.c:4289
+#: sequencer.c:4590
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisione non valida"
 
-#: sequencer.c:4324
+#: sequencer.c:4625
 msgid "can't revert as initial commit"
 msgstr "impossibile eseguire il revert come commit iniziale"
 
-#: sequencer.c:4774
+#: sequencer.c:5102
 msgid "make_script: unhandled options"
 msgstr "make_script: opzioni non gestite"
 
-#: sequencer.c:4777
+#: sequencer.c:5105
 msgid "make_script: error preparing revisions"
 msgstr "make_script: errore durante la preparazione delle revisioni"
 
-#: sequencer.c:4935
-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 ""
-"Puoi correggere questa situazione con 'git rebase --edit-todo' e quindi "
-"eseguire 'git rebase --continue'.\n"
-"Oppure puoi interrompere il rebase con 'git rebase --abort'.\n"
-
-#: sequencer.c:5047 sequencer.c:5064
+#: sequencer.c:5347 sequencer.c:5364
 msgid "nothing to do"
 msgstr "nulla da fare"
 
-#: sequencer.c:5078
+#: sequencer.c:5383
 msgid "could not skip unnecessary pick commands"
 msgstr "impossibile saltare i comandi pick non necessari"
 
-#: sequencer.c:5166
+#: sequencer.c:5480
 msgid "the script was already rearranged."
 msgstr "lo script è già stato riordinato."
 
-#: setup.c:124
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' è al di fuori del repository"
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' è al di fuori del repository in '%s'"
 
-#: setup.c:174
+#: setup.c:185
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6771,7 +7749,7 @@ msgstr ""
 "Usa 'git <comando> -- <percorso>...' per specificare percorsi non esistenti "
 "localmente."
 
-#: setup.c:187
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6783,14 +7761,14 @@ msgstr ""
 "Usa '--' per separare i percorsi dalle revisioni, come segue:\n"
 "'git <comando> [<revisione>...] -- [<file>...]'"
 
-#: setup.c:236
+#: setup.c:264
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 "l'opzione '%s' deve essere specificata prima degli argomenti che non "
 "costituiscono un'opzione"
 
-#: setup.c:255
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6801,93 +7779,99 @@ msgstr ""
 "Usa '--' per separare i percorsi dalle revisioni, come segue:\n"
 "'git <comando> [<revisione>...] -- [<file>...]'"
 
-#: setup.c:391
+#: setup.c:419
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 "impossibile preparare l'albero di lavoro usando una configurazione non valida"
 
-#: setup.c:395
+#: setup.c:423
 msgid "this operation must be run in a work tree"
 msgstr "quest'operazione deve essere eseguita in un albero di lavoro"
 
-#: setup.c:541
+#: setup.c:661
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Attesa versione repository Git <= %d, trovata %d"
 
-#: setup.c:549
+#: setup.c:669
 msgid "unknown repository extensions found:"
 msgstr "trovate estensioni repository sconosciute:"
 
-#: setup.c:568
+#: setup.c:681
+msgid "repo version is 0, but v1-only extensions found:"
+msgstr ""
+"la versione del repository è 0, ma sono state trovate estensioni proprie "
+"solo della versione 1:"
+
+#: setup.c:700
 #, c-format
 msgid "error opening '%s'"
 msgstr "errore durante l'apertura di '%s'"
 
-#: setup.c:570
+#: setup.c:702
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "'%s' troppo grande per essere un file .git"
 
-#: setup.c:572
+#: setup.c:704
 #, c-format
 msgid "error reading %s"
 msgstr "errore durante la lettura di %s"
 
-#: setup.c:574
+#: setup.c:706
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "formato file Git non valido: %s"
 
-#: setup.c:576
+#: setup.c:708
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "nessun percorso presente nel file Git: %s"
 
-#: setup.c:578
+#: setup.c:710
 #, c-format
 msgid "not a git repository: %s"
 msgstr "%s non è un repository Git"
 
-#: setup.c:677
+#: setup.c:812
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' è troppo grande"
 
-#: setup.c:691
+#: setup.c:826
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "'%s' non è un repository Git"
 
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c:855 setup.c:857 setup.c:888
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "impossibile modificare la directory corrente in '%s'"
 
-#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
 msgid "cannot come back to cwd"
 msgstr "impossibile tornare alla directory di lavoro corrente"
 
-#: setup.c:852
+#: setup.c:987
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "stat di '%*s%s%s' non riuscito"
 
-#: setup.c:1090
+#: setup.c:1225
 msgid "Unable to read current working directory"
 msgstr "Impossibile leggere la directory di lavoro corrente"
 
-#: setup.c:1099 setup.c:1105
+#: setup.c:1234 setup.c:1240
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "impossibile entrare in '%s'"
 
-#: setup.c:1110
+#: setup.c:1245
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "%s non è un repository Git (né lo è alcuna delle directory genitrici)"
 
-#: setup.c:1116
+#: setup.c:1251
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6897,7 +7881,7 @@ msgstr ""
 "Mi fermo al limite del filesystem (l'opzione GIT_DISCOVERY_ACROSS_FILESYSTEM "
 "non è impostata)."
 
-#: setup.c:1227
+#: setup.c:1362
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6907,289 +7891,289 @@ msgstr ""
 "(0%.3o).\n"
 "Il proprietario dei file deve avere sempre i permessi di lettura e scrittura."
 
-#: setup.c:1271
+#: setup.c:1409
 msgid "open /dev/null or dup failed"
 msgstr "apertura di /dev/null o dup non riuscita"
 
-#: setup.c:1286
+#: setup.c:1424
 msgid "fork failed"
 msgstr "fork non riuscita"
 
-#: setup.c:1291
+#: setup.c:1429
 msgid "setsid failed"
 msgstr "setsid non riuscita"
 
-#: sha1-file.c:452
+#: sha1-file.c:470
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 "la directory oggetti %s non esiste; controlla .git/objects/info/alternates"
 
-#: sha1-file.c:503
+#: sha1-file.c:521
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr "impossibile normalizzare il percorso alternativo oggetto: %s"
 
-#: sha1-file.c:575
+#: sha1-file.c:593
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 "%s: ignoro gli archivi oggetto alternativi, la nidificazione è troppo "
 "profonda"
 
-#: sha1-file.c:582
+#: sha1-file.c:600
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr "impossibile normalizzare la directory oggetti: %s"
 
-#: sha1-file.c:625
+#: sha1-file.c:643
 msgid "unable to fdopen alternates lockfile"
 msgstr "impossibile eseguire fdopen sul file di lock alternates"
 
-#: sha1-file.c:643
+#: sha1-file.c:661
 msgid "unable to read alternates file"
 msgstr "impossibile leggere il file alternates"
 
-#: sha1-file.c:650
+#: sha1-file.c:668
 msgid "unable to move new alternates file into place"
 msgstr "impossibile spostare il nuovo file alternates nella posizione corretta"
 
-#: sha1-file.c:685
+#: sha1-file.c:703
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "il percorso '%s' non esiste"
 
-#: sha1-file.c:711
+#: sha1-file.c:724
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr ""
 "l'aggiunta del repository di riferimento '%s' come checkout collegato non è "
 "ancora supportata."
 
-#: sha1-file.c:717
+#: sha1-file.c:730
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "il repository di riferimento '%s' non è un repository locale."
 
-#: sha1-file.c:723
+#: sha1-file.c:736
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "il repository di riferimento '%s' è shallow"
 
-#: sha1-file.c:731
+#: sha1-file.c:744
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "il repository di riferimento '%s' è un graft"
 
-#: sha1-file.c:791
+#: sha1-file.c:804
 #, c-format
 msgid "invalid line while parsing alternate refs: %s"
 msgstr "riga non valida durante l'analisi dei riferimenti degli alternati: %s"
 
-#: sha1-file.c:943
+#: sha1-file.c:954
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr "tento di eseguire mmap %<PRIuMAX> al di sopra del limite %<PRIuMAX>"
 
-#: sha1-file.c:964
+#: sha1-file.c:975
 msgid "mmap failed"
 msgstr "mmap non riuscita"
 
-#: sha1-file.c:1128
+#: sha1-file.c:1139
 #, c-format
 msgid "object file %s is empty"
 msgstr "l'oggetto %s è vuoto"
 
-#: sha1-file.c:1252 sha1-file.c:2392
+#: sha1-file.c:1274 sha1-file.c:2467
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr "oggetto sciolto '%s' corrotto"
 
-#: sha1-file.c:1254 sha1-file.c:2396
+#: sha1-file.c:1276 sha1-file.c:2471
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr "dati inutilizzabili presenti alla fine dell'oggetto sciolto '%s'"
 
-#: sha1-file.c:1296
+#: sha1-file.c:1318
 msgid "invalid object type"
 msgstr "tipo oggetto non valido"
 
-#: sha1-file.c:1380
+#: sha1-file.c:1402
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr "impossibile decomprimere l'intestazione %s con --allow-unknown-type"
 
-#: sha1-file.c:1383
+#: sha1-file.c:1405
 #, c-format
 msgid "unable to unpack %s header"
 msgstr "impossibile decomprimere l'intestazione %s"
 
-#: sha1-file.c:1389
+#: sha1-file.c:1411
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr "impossibile analizzare l'intestazione %s con --allow-unknown-type"
 
-#: sha1-file.c:1392
+#: sha1-file.c:1414
 #, c-format
 msgid "unable to parse %s header"
 msgstr "impossibile analizzare l'intestazione %s"
 
-#: sha1-file.c:1584
+#: sha1-file.c:1641
 #, c-format
 msgid "failed to read object %s"
 msgstr "lettura dell'oggetto %s non riuscita"
 
-#: sha1-file.c:1588
+#: sha1-file.c:1645
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr "%s sostitutivo non trovato per %s"
 
-#: sha1-file.c:1592
+#: sha1-file.c:1649
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr "l'oggetto sciolto %s (salvato in %s) è corrotto"
 
-#: sha1-file.c:1596
+#: sha1-file.c:1653
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr "l'oggetto archiviato %s (salvato in %s) è corrotto"
 
-#: sha1-file.c:1699
+#: sha1-file.c:1758
 #, c-format
 msgid "unable to write file %s"
 msgstr "impossibile scrivere il file %s"
 
-#: sha1-file.c:1706
+#: sha1-file.c:1765
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr "impossibile impostare i permessi a '%s'"
 
-#: sha1-file.c:1713
+#: sha1-file.c:1772
 msgid "file write error"
 msgstr "errore di scrittura del file"
 
-#: sha1-file.c:1732
+#: sha1-file.c:1792
 msgid "error when closing loose object file"
 msgstr "errore durante la chiusura del file oggetto sciolto"
 
-#: sha1-file.c:1797
+#: sha1-file.c:1857
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 "permessi non sufficienti per l'aggiunta di un oggetto al database repository "
 "%s"
 
-#: sha1-file.c:1799
+#: sha1-file.c:1859
 msgid "unable to create temporary file"
 msgstr "impossibile creare il file temporaneo"
 
-#: sha1-file.c:1823
+#: sha1-file.c:1883
 msgid "unable to write loose object file"
 msgstr "impossibile scrivere il file oggetto sciolto"
 
-#: sha1-file.c:1829
+#: sha1-file.c:1889
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr "impossibile comprimere con deflate il nuovo oggetto %s (%d)"
 
-#: sha1-file.c:1833
+#: sha1-file.c:1893
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr "deflateEnd non riuscita sull'oggetto %s (%d)"
 
-#: sha1-file.c:1837
+#: sha1-file.c:1897
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr "sono confuso dall'origine dati oggetto non stabile per %s"
 
-#: sha1-file.c:1847 builtin/pack-objects.c:925
+#: sha1-file.c:1907 builtin/pack-objects.c:1086
 #, c-format
 msgid "failed utime() on %s"
 msgstr "utime() di %s non riuscita"
 
-#: sha1-file.c:1922
+#: sha1-file.c:1984
 #, c-format
 msgid "cannot read object for %s"
 msgstr "impossibile leggere l'oggetto per %s"
 
-#: sha1-file.c:1962
+#: sha1-file.c:2035
 msgid "corrupt commit"
 msgstr "commit corrotto"
 
-#: sha1-file.c:1970
+#: sha1-file.c:2043
 msgid "corrupt tag"
 msgstr "tag corrotto"
 
-#: sha1-file.c:2069
+#: sha1-file.c:2143
 #, c-format
 msgid "read error while indexing %s"
 msgstr "errore di lettura durante l'indicizzazione di %s"
 
-#: sha1-file.c:2072
+#: sha1-file.c:2146
 #, c-format
 msgid "short read while indexing %s"
 msgstr "lettura troppo breve durante l'indicizzazione di %s"
 
-#: sha1-file.c:2145 sha1-file.c:2154
+#: sha1-file.c:2219 sha1-file.c:2229
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr "%s: inserimento del record nel database non riuscito"
 
-#: sha1-file.c:2160
+#: sha1-file.c:2235
 #, c-format
 msgid "%s: unsupported file type"
 msgstr "%s: tipo di file non supportato"
 
-#: sha1-file.c:2184
+#: sha1-file.c:2259
 #, c-format
 msgid "%s is not a valid object"
 msgstr "%s non è un oggetto valido"
 
-#: sha1-file.c:2186
+#: sha1-file.c:2261
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s non è un oggetto '%s' valido"
 
-#: sha1-file.c:2213 builtin/index-pack.c:155
+#: sha1-file.c:2288 builtin/index-pack.c:192
 #, c-format
 msgid "unable to open %s"
 msgstr "impossibile aprire %s"
 
-#: sha1-file.c:2403 sha1-file.c:2455
+#: sha1-file.c:2478 sha1-file.c:2531
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
 msgstr "mancata corrispondenza per %s (atteso %s)"
 
-#: sha1-file.c:2427
+#: sha1-file.c:2502
 #, c-format
 msgid "unable to mmap %s"
 msgstr "impossibile eseguire mmap su %s"
 
-#: sha1-file.c:2432
+#: sha1-file.c:2507
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr "impossibile decomprimere l'intestazione di %s"
 
-#: sha1-file.c:2438
+#: sha1-file.c:2513
 #, c-format
 msgid "unable to parse header of %s"
 msgstr "impossibile analizzare l'intestazione di %s"
 
-#: sha1-file.c:2449
+#: sha1-file.c:2524
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr "impossibile decomprimere i contenuti di %s"
 
-#: sha1-name.c:487
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "lo SHA1 breve %s è ambiguo"
 
-#: sha1-name.c:498
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "I candidati sono:"
 
-#: sha1-name.c:797
+#: sha1-name.c:796
 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"
@@ -7213,44 +8197,112 @@ msgstr ""
 "riferimenti ed eliminali se necessario. Disabilita questo\n"
 "messaggio eseguendo \"git config advice.objectNameWarning false\""
 
+#: sha1-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "il log per '%.*s' è disponibile solo fino al %s"
+
+#: sha1-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "il log per '%.*s' ha solo %d voci"
+
+#: sha1-name.c:1702
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "il percorso '%s' esiste su disco, ma non in '%.*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 ""
+"il percorso '%s' esiste, ma non '%s'\n"
+"suggerimento: forse intendevi '%.*s:%s' ossia '%.*s:./%s'?"
+
+#: sha1-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "il percorso '%s' non esiste in '%.*s'"
+
+#: 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 ""
+"il percorso '%s' è nell'indice, ma non nel passo %d\n"
+"suggerimento: Forse intendevi ':%d:%s'?"
+
+#: 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 ""
+"il percorso '%s' è nell'indice, ma non '%s'\n"
+"suggerimento: Forse intendevi ':%d:%s' ossia ':%d:./%s'?"
+
+#: sha1-name.c:1769
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "il percorso '%s' esiste su disco, ma non nell'indice"
+
+#: sha1-name.c:1771
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "il percorso '%s' non esiste (né su disco né nell'indice)"
+
+#: sha1-name.c:1784
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+"la sintassi per i percorsi relativi non può essere usata al di fuori "
+"dell'albero di lavoro"
+
+#: sha1-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nome oggetto non valido: '%.*s'."
+
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:822
+#: strbuf.c:848
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:832
+#: strbuf.c:858
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:841
+#: strbuf.c:867
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/s"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:849
+#: strbuf.c:875
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7258,13 +8310,50 @@ msgstr[0] "%u byte"
 msgstr[1] "%u byte"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
+#: strbuf.c:877
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u byte/s"
 msgstr[1] "%u byte/s"
 
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:733
+#: builtin/rebase.c:858
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "impossibile aprire '%s' in scrittura"
+
+#: strbuf.c:1175
+#, c-format
+msgid "could not edit '%s'"
+msgstr "impossibile modificare '%s'"
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignoro un nome sottomodulo sospetto: %s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "i valori negativi non sono consentiti per submodule.fetchjobs"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"ignoro '%s' che potrebbe essere interpretato come argomento della riga di "
+"comando: %s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "valore non valido per %s"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Impossibile aggiornare la voce .gitmodules %s"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7295,53 +8384,132 @@ msgstr "nel sottomodulo non popolato '%s'"
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Lo specificatore percorso '%s' è nel sottomodulo '%.*s'"
 
-#: submodule.c:910
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "argomento --ignore-submodules errato: %s"
+
+#: submodule.c:816
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Il sottomodulo nel commit %s e nel percorso '%s' collide con un sottomodulo "
+"con lo stesso nome. Lo salto."
+
+#: submodule.c:919
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "la voce sottomodulo '%s' (%s) è un %s, non un commit"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:1004
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Impossibile eseguire il comando 'git rev-list <commit> --not --remotes -n 1' "
+"nel sottomodulo %s"
+
+#: submodule.c:1127
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "il processo per il sottomodulo '%s' non è uscito con successo"
+
+#: submodule.c:1156 builtin/branch.c:678 builtin/submodule--helper.c:2469
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Impossibile risolvere HEAD come riferimento valido."
 
-#: submodule.c:1481
+#: submodule.c:1167
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "Impossibile accedere al sottomodulo '%s'"
+msgid "Pushing submodule '%s'\n"
+msgstr "Push del sottomodulo '%s' in corso\n"
 
-#: submodule.c:1651
+#: submodule.c:1170
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Impossibile eseguire il push del sottomodulo '%s'\n"
+
+#: submodule.c:1462
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Recupero del sottomodulo %s%s in corso\n"
+
+#: submodule.c:1492
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Impossibile accedere al sottomodulo '%s'\n"
+
+#: submodule.c:1646
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Errore durante il recupero del sottomodulo:\n"
+"%s"
+
+#: submodule.c:1671
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "'%s' non riconosciuto come repository Git"
 
-#: submodule.c:1789
+#: submodule.c:1688
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "Impossibile eseguire 'git status --porcelain=2' nel sottomodulo %s"
+
+#: submodule.c:1729
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr ""
+"Esecuzione di 'git status --porcelain=2' non riuscita nel sottomodulo %s"
+
+#: submodule.c:1804
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "impossibile avviare 'git status' nel sottomodulo '%s'"
 
-#: submodule.c:1802
+#: submodule.c:1817
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "impossibile eseguire 'git status' nel sottomodulo '%s'"
 
-#: submodule.c:1817
+#: submodule.c:1832
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr ""
 "Impossibile annullare l'impostazione dell'opzione core.worktree nel "
 "sottomodulo '%s'"
 
-#: submodule.c:1907
+#: submodule.c:1859 submodule.c:2169
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'"
+
+#: submodule.c:1880
+msgid "could not reset submodule index"
+msgstr "impossibile ripristinare l'indice del sottomodulo"
+
+#: submodule.c:1922
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "il sottomodulo '%s' ha l'indice sporco"
 
-#: submodule.c:1959
+#: submodule.c:1974
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Impossibile aggiornare il sottomodulo '%s'."
 
-#: submodule.c:2007
+#: submodule.c:2042
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+"la directory Git del sottomodulo '%s' è all'interno della directory Git "
+"'%.*s'"
+
+#: submodule.c:2063
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7349,12 +8517,17 @@ msgstr ""
 "relocate_gitdir non è supportata per il sottomodulo '%s' con più di un "
 "albero di lavoro"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2075 submodule.c:2134
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "impossibile ricercare il nome per il sottomodulo '%s'"
 
-#: submodule.c:2026
+#: submodule.c:2079
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "mi rifiuto di spostare '%s' in una directory Git esistente"
+
+#: submodule.c:2086
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7365,207 +8538,83 @@ msgstr ""
 "'%s' a\n"
 "'%s'\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "impossibile eseguire l'azione ricorsivamente nel sottomodulo '%s'"
-
-#: submodule.c:2153
+#: submodule.c:2214
 msgid "could not start ls-files in .."
 msgstr "impossibile avviare ls-files in .."
 
-#: submodule.c:2192
+#: submodule.c:2254
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree ha restituito il valore di ritorno inatteso %d"
 
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "ignoro un nome sottomodulo sospetto: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "i valori negativi non sono consentiti per submodule.fetchjobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"ignoro '%s' che potrebbe essere interpretato come argomento della riga di "
-"comando: %s"
-
-#: submodule-config.c:490
-#, c-format
-msgid "invalid value for %s"
-msgstr "valore non valido per %s"
-
-#: submodule-config.c:761
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Impossibile aggiornare la voce .gitmodules %s"
-
-#: trailer.c:238
+#: trailer.c:236
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "esecuzione del comando finale '%s' non riuscita"
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
+#: trailer.c:555
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "valore '%s' sconosciuto per la chiave '%s'"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:537 trailer.c:542 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr "più di un %s"
 
-#: trailer.c:730
+#: trailer.c:728
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "token finale vuoto nella stringa finale '%.*s'"
 
-#: trailer.c:750
+#: trailer.c:748
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "impossibile leggere il file di input '%s'"
 
-#: trailer.c:753
+#: trailer.c:751
 msgid "could not read from stdin"
 msgstr "impossibile leggere dallo standard input"
 
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1009 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
 msgstr "impossibile eseguire lo stat di '%s'"
 
-#: trailer.c:1013
+#: trailer.c:1011
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "il file %s non è un file regolare"
 
-#: trailer.c:1015
+#: trailer.c:1013
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "il file %s non è scrivibile dall'utente"
 
-#: trailer.c:1027
+#: trailer.c:1025
 msgid "could not open temporary file"
 msgstr "impossibile aprire un file temporaneo"
 
-#: trailer.c:1067
+#: trailer.c:1065
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "impossibile ridenominare il file temporaneo in %s"
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "L'upstream di '%s' sarebbe impostato a '%s' di '%s'\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "impossibile leggere il bundle '%s'"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "trasporto: opzione profondità '%s' non valida"
-
-#: transport.c:266
-msgid "see protocol.version in 'git help config' for more details"
-msgstr "vedi protocol.version in 'git help config' per maggiori dettagli"
-
-#: transport.c:267
-msgid "server options require protocol version 2 or later"
-msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "impossibile analizzare la configurazione transport.color.*"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "supporto alla versione 2 del protocollo non ancora implementato"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "valore sconosciuto per la configurazione '%s': %s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "trasporto '%s' non consentito"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync non è più supportato"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"I seguenti percorsi sottomodulo contengono modifiche\n"
-"non trovate su nessun remoto:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Prova\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"o esegui un cd al percorso e usa\n"
-"\n"
-"\tgit push\n"
-"\n"
-"per eseguirne il push a un remoto.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Interrompo l'operazione."
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "push di tutti i sottomoduli richiesti non riuscito"
-
-#: transport.c:1345 transport-helper.c:655
-msgid "operation not supported by protocol"
-msgstr "operazione non supportata dal protocollo"
-
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
 msgstr "scrittura completa verso l'helper remoto non riuscita"
 
-#: transport-helper.c:144
+#: transport-helper.c:145
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "impossibile trovare l'helper remoto per '%s'"
 
-#: transport-helper.c:160 transport-helper.c:569
+#: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
 msgstr "impossibile duplicare il descrittore file dell'output helper"
 
-#: transport-helper.c:211
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7574,177 +8623,279 @@ msgstr ""
 "capability necessaria %s sconosciuta; quest'helper remoto probabilmente "
 "richiede una versione di Git più recente"
 
-#: transport-helper.c:217
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
 msgstr "questo helper remoto dovrebbe implementare la capability refspec"
 
-#: transport-helper.c:284 transport-helper.c:424
+#: transport-helper.c:287 transport-helper.c:429
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s ha inviato un messaggio inatteso: '%s'"
 
-#: transport-helper.c:413
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s ha bloccato anche %s"
 
-#: transport-helper.c:491
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
 msgstr "impossibile eseguire fast-import"
 
-#: transport-helper.c:514
+#: transport-helper.c:520
 msgid "error while running fast-import"
 msgstr "errore durante l'esecuzione di fast-import"
 
-#: transport-helper.c:543 transport-helper.c:1132
+#: transport-helper.c:549 transport-helper.c:1226
 #, c-format
 msgid "could not read ref %s"
 msgstr "impossibile leggere il riferimento %s"
 
-#: transport-helper.c:588
+#: transport-helper.c:594
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "risposta inattesa a connect: %s"
 
-#: transport-helper.c:610
+#: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
 msgstr ""
 "l'impostazione del percorso del servizio remoto non è supportata dal "
 "protocollo"
 
-#: transport-helper.c:612
+#: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr "percorso servizio remoto non valido"
 
-#: transport-helper.c:658
+#: transport-helper.c:661 transport.c:1428
+msgid "operation not supported by protocol"
+msgstr "operazione non supportata dal protocollo"
+
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "impossibile connettersi al sottoservizio %s"
 
-#: transport-helper.c:734
+#: transport-helper.c:745
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' senza una direttiva corrispondente 'ok/error'"
+
+#: transport-helper.c:788
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "attesi ok/error, l'helper ha inviato '%s'"
 
-#: transport-helper.c:787
+#: transport-helper.c:841
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "l'helper ha segnalato uno stato inatteso di %s"
 
-#: transport-helper.c:848
+#: transport-helper.c:924
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "l'helper %s non supporta dry-run"
 
-#: transport-helper.c:851
+#: transport-helper.c:927
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "l'helper %s non supporta --signed"
 
-#: transport-helper.c:854
+#: transport-helper.c:930
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "l'helper %s non supporta --signed=if-asked"
 
-#: transport-helper.c:859
+#: transport-helper.c:935
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "l'helper %s non supporta --atomic"
 
-#: transport-helper.c:865
+#: transport-helper.c:941
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "l'helper %s non supporta 'push-option'"
 
-#: transport-helper.c:963
+#: transport-helper.c:1040
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 "l'helper remoto non supporta il push; è necessario uno specificatore "
 "riferimento"
 
-#: transport-helper.c:968
+#: transport-helper.c:1045
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "l'helper %s non supporta 'force'"
 
-#: transport-helper.c:1015
+#: transport-helper.c:1092
 msgid "couldn't run fast-export"
 msgstr "impossibile eseguire fast-export"
 
-#: transport-helper.c:1020
+#: transport-helper.c:1097
 msgid "error while running fast-export"
 msgstr "errore durante l'esecuzione di fast-export"
 
-#: transport-helper.c:1045
+#: transport-helper.c:1122
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 "Nessun riferimento in comune e nessuno specificato; non eseguo nulla.\n"
-"Forse dovresti specificare un branch come 'master'.\n"
+"Forse dovresti specificare un branch.\n"
+
+#: transport-helper.c:1203
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "formato oggetto non supportato: '%s'"
 
-#: transport-helper.c:1118
+#: transport-helper.c:1212
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "risposta malformata nell'elenco riferimenti: %s"
 
-#: transport-helper.c:1270
+#: transport-helper.c:1364
 #, c-format
 msgid "read(%s) failed"
 msgstr "read(%s) non riuscita"
 
-#: transport-helper.c:1297
+#: transport-helper.c:1391
 #, c-format
 msgid "write(%s) failed"
 msgstr "write(%s) non riuscita"
 
-#: transport-helper.c:1346
+#: transport-helper.c:1440
 #, c-format
 msgid "%s thread failed"
 msgstr "thread %s non riuscito"
 
-#: transport-helper.c:1350
+#: transport-helper.c:1444
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "join non riuscita per il thread %s: %s"
 
-#: transport-helper.c:1369 transport-helper.c:1373
+#: transport-helper.c:1463 transport-helper.c:1467
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "impossibile avviare il thread per la copia dei dati: %s"
 
-#: transport-helper.c:1410
+#: transport-helper.c:1504
 #, c-format
 msgid "%s process failed to wait"
 msgstr "wait non riuscita per il processo %s"
 
-#: transport-helper.c:1414
+#: transport-helper.c:1508
 #, c-format
 msgid "%s process failed"
 msgstr "processo %s non riuscito"
 
-#: transport-helper.c:1432 transport-helper.c:1441
+#: transport-helper.c:1526 transport-helper.c:1535
 msgid "can't start thread for copying data"
 msgstr "impossibile avviare il thread per la copia dei dati"
 
-#: tree-walk.c:33
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "L'upstream di '%s' sarebbe impostato a '%s' di '%s'\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "impossibile leggere il bundle '%s'"
+
+#: transport.c:220
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "trasporto: opzione profondità '%s' non valida"
+
+#: transport.c:269
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "vedi protocol.version in 'git help config' per maggiori dettagli"
+
+#: transport.c:270
+msgid "server options require protocol version 2 or later"
+msgstr "le opzioni server richiedono la versione 2 o successiva del protocollo"
+
+#: transport.c:712
+msgid "could not parse transport.color.* config"
+msgstr "impossibile analizzare la configurazione transport.color.*"
+
+#: transport.c:785
+msgid "support for protocol v2 not implemented yet"
+msgstr "supporto alla versione 2 del protocollo non ancora implementato"
+
+#: transport.c:919
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valore sconosciuto per la configurazione '%s': %s"
+
+#: transport.c:985
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "trasporto '%s' non consentito"
+
+#: transport.c:1038
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync non è più supportato"
+
+#: transport.c:1140
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"I seguenti percorsi sottomodulo contengono modifiche\n"
+"non trovate su nessun remoto:\n"
+
+#: transport.c:1144
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Prova\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o esegui un cd al percorso e usa\n"
+"\n"
+"\tgit push\n"
+"\n"
+"per eseguirne il push a un remoto.\n"
+"\n"
+
+#: transport.c:1152
+msgid "Aborting."
+msgstr "Interrompo l'operazione."
+
+#: transport.c:1297
+msgid "failed to push all needed submodules"
+msgstr "push di tutti i sottomoduli richiesti non riuscito"
+
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "oggetto albero troppo corto"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "modo malformato nella voce dell'albero"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "nome file vuoto nella voce dell'albero"
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "file alber troppo corto"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7754,7 +8905,7 @@ msgstr ""
 "checkout:\n"
 "%%sEsegui il commit o lo stash delle modifiche prima di cambiare branch."
 
-#: unpack-trees.c:112
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7764,7 +8915,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7774,7 +8925,7 @@ msgstr ""
 "merge:\n"
 "%%sEsegui il commit o lo stash delle modifiche prima di eseguire il merge."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7784,7 +8935,7 @@ msgstr ""
 "merge:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7795,7 +8946,7 @@ msgstr ""
 "%%sEsegui il commit o lo stash delle modifiche prima di eseguire "
 "l'operazione di %s."
 
-#: unpack-trees.c:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7805,7 +8956,7 @@ msgstr ""
 "l'operazione di %s:\n"
 "%%s"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7815,7 +8966,7 @@ msgstr ""
 "tracciati in esse contenuti vengano persi:\n"
 "%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7825,7 +8976,7 @@ msgstr ""
 "eliminati con il checkout:\n"
 "%%sSpostali o eliminali prima di cambiare branch."
 
-#: unpack-trees.c:133
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7835,7 +8986,7 @@ msgstr ""
 "eliminati con il checkout:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7845,7 +8996,7 @@ msgstr ""
 "eliminati dal merge:\n"
 "%%sSpostali o eliminali prima di eseguire il merge."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7855,7 +9006,7 @@ msgstr ""
 "eliminati dal merge:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7865,7 +9016,7 @@ msgstr ""
 "eliminati con l'operazione di %s:\n"
 "%%sSpostali o eliminali prima di eseguire l'operazione di %s."
 
-#: unpack-trees.c:143
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7875,7 +9026,7 @@ msgstr ""
 "eliminati con l'operazione di %s:\n"
 "%%s"
 
-#: unpack-trees.c:149
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7886,7 +9037,7 @@ msgstr ""
 "sovrascritti con il checkout:\n"
 "%%sSpostali o eliminali prima di cambiare branch."
 
-#: unpack-trees.c:151
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7897,7 +9048,7 @@ msgstr ""
 "sovrascritti con il checkout:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:157
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7907,7 +9058,7 @@ msgstr ""
 "sovrascritti dal merge:\n"
 "%%sSpostali o eliminali prima di eseguire il merge."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7917,7 +9068,7 @@ msgstr ""
 "sovrascritti dal merge:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7927,7 +9078,7 @@ msgstr ""
 "sovrascritti con l'operazione di %s:\n"
 "%%sSpostali o eliminali prima di eseguire l'operazione di %s."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7937,63 +9088,72 @@ msgstr ""
 "sovrascritti con l'operazione di %s:\n"
 "%%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:172
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr ""
 "La voce '%s' si sovrappone a '%s'. Impossibile eseguire il collegamento."
 
-#: unpack-trees.c:172
+#: unpack-trees.c:175
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
 "%s"
 msgstr ""
-"Impossibile aggiornare il checkout sparse: le seguenti voci non sono "
-"aggiornate:\n"
+"Impossibile aggiornare il sottomodulo:\n"
 "%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:178
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"I seguenti file dell'albero di lavoro sarebbero sovrascritti con "
-"l'aggiornamento del checkout sparse:\n"
+"I seguenti percorsi non sono aggiornati e sono stati mantenuti nonostante vi "
+"siano dei pattern sparse:\n"
 "%s"
 
-#: unpack-trees.c:176
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
-"I seguenti file dell'albero di lavoro sarebbero eliminati con "
-"l'aggiornamento del checkout sparse:\n"
+"I seguenti percorsi non sono stati sottoposti a merge e sono stati mantenuti "
+"nonostante vi siano dei pattern sparse:\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:182
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Impossibile aggiornare il sottomodulo:\n"
+"I seguenti percorsi erano già presenti e pertanto non sono stati aggiornati "
+"nonostante vi siano dei pattern sparse:\n"
 "%s"
 
-#: unpack-trees.c:255
+#: unpack-trees.c:262
 #, c-format
 msgid "Aborting\n"
 msgstr "Interrompo l'operazione\n"
 
-#: unpack-trees.c:317
+#: unpack-trees.c:289
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Dopo aver corretto i percorsi sopra menzionati, potresti voler eseguire `git "
+"sparse-checkout reapply`.\n"
+
+#: unpack-trees.c:350
 msgid "Updating files"
 msgstr "Aggiornamento dei file in corso"
 
-#: unpack-trees.c:349
+#: unpack-trees.c:382
 msgid ""
 "the following paths have collided (e.g. case-sensitive paths\n"
 "on a case-insensitive filesystem) and only one from the same\n"
@@ -8004,6 +9164,14 @@ msgstr ""
 "su un filesystem non sensibile a tale differenza) e solo uno\n"
 "per gruppo in conflitto è nell'albero di lavoro:\n"
 
+#: unpack-trees.c:1498
+msgid "Updating index flags"
+msgstr "Aggiornamento dei contrassegni indice in corso"
+
+#: upload-pack.c:1516
+msgid "expected flush after fetch arguments"
+msgstr "atteso flush dopo recupero argomenti"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "nome schema URL non valido o suffisso '://' mancante"
@@ -8033,50 +9201,90 @@ msgstr "numero di porta non valido"
 msgid "invalid '..' path segment"
 msgstr "parte percorso '..' non valida"
 
-#: worktree.c:258 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Recupero oggetti in corso"
+
+#: worktree.c:236 builtin/am.c:2116
 #, c-format
 msgid "failed to read '%s'"
 msgstr "lettura di '%s' non riuscita"
 
-#: worktree.c:304
+#: worktree.c:283
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 "'%s' nell'albero di lavoro principale non è la directory del repository"
 
-#: worktree.c:315
+#: worktree.c:294
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 "il file '%s' non contiene il percorso assoluto alla posizione dell'albero di "
 "lavoro"
 
-#: worktree.c:327
+#: worktree.c:306
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' non esiste"
 
-#: worktree.c:333
+#: worktree.c:312
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' non è un file .git, codice d'errore %d"
 
-#: worktree.c:341
+#: worktree.c:321
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' non punta a '%s'"
 
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:587
+msgid "not a directory"
+msgstr "non è una directory"
+
+#: worktree.c:596
+msgid ".git is not a file"
+msgstr ".git non è un file"
+
+#: worktree.c:598
+msgid ".git file broken"
+msgstr "file .git corrotto"
+
+#: worktree.c:600
+msgid ".git file incorrect"
+msgstr "file .git non corretto"
+
+#: worktree.c:670
+msgid "not a valid path"
+msgstr "non è un percorso valido"
+
+#: worktree.c:676
+msgid "unable to locate repository; .git is not a file"
+msgstr "impossibile trovare il repository; .git non è un file"
+
+#: worktree.c:679
+msgid "unable to locate repository; .git file broken"
+msgstr "impossibile trovare il repository; file .git corrotto"
+
+#: worktree.c:685
+msgid "gitdir unreadable"
+msgstr "gitdir non leggibile"
+
+#: worktree.c:689
+msgid "gitdir incorrect"
+msgstr "gitdir non corretto"
+
+#: wrapper.c:197 wrapper.c:367
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "impossibile aprire '%s' in lettura e scrittura"
 
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr "impossibile accedere a '%s'"
 
-#: wrapper.c:596
+#: wrapper.c:607
 msgid "unable to get current working directory"
 msgstr "impossibile ottenere la directory di lavoro corrente"
 
@@ -8119,11 +9327,11 @@ msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr ""
 "  (usa \"git rm <file>...\" per contrassegnare il conflitto come risolto)"
 
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1070
 msgid "Changes to be committed:"
 msgstr "Modifiche di cui verrà eseguito il commit:"
 
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1079
 msgid "Changes not staged for commit:"
 msgstr "Modifiche non nell'area di staging per il commit:"
 
@@ -8159,94 +9367,94 @@ msgstr ""
 "  (usa \"git %s <file>...\" per includere l'elemento fra quelli di cui verrà "
 "eseguito il commit)"
 
-#: wt-status.c:268
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr "entrambi eliminati:"
 
-#: wt-status.c:270
+#: wt-status.c:268
 msgid "added by us:"
 msgstr "aggiunto da noi:"
 
-#: wt-status.c:272
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "eliminato da loro:"
 
-#: wt-status.c:274
+#: wt-status.c:272
 msgid "added by them:"
 msgstr "aggiunto da loro:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr "eliminato da noi:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "both added:"
 msgstr "entrambi aggiunti:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "both modified:"
 msgstr "entrambi modificati:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "new file:"
 msgstr "nuovo file:"
 
-#: wt-status.c:292
+#: wt-status.c:290
 msgid "copied:"
 msgstr "copiato:"
 
-#: wt-status.c:294
+#: wt-status.c:292
 msgid "deleted:"
 msgstr "eliminato:"
 
-#: wt-status.c:296
+#: wt-status.c:294
 msgid "modified:"
 msgstr "modificato:"
 
-#: wt-status.c:298
+#: wt-status.c:296
 msgid "renamed:"
 msgstr "rinominato:"
 
-#: wt-status.c:300
+#: wt-status.c:298
 msgid "typechange:"
 msgstr "modifica tipo:"
 
-#: wt-status.c:302
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "sconosciuto:"
 
-#: wt-status.c:304
+#: wt-status.c:302
 msgid "unmerged:"
 msgstr "non sottoposto a merge:"
 
-#: wt-status.c:384
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "nuovi commit, "
 
-#: wt-status.c:386
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "contenuto modificato, "
 
-#: wt-status.c:388
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr "contenuto non tracciato, "
 
-#: wt-status.c:906
+#: wt-status.c:903
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "Lo stash attualmente ha %d voce"
 msgstr[1] "Lo stash attualmente ha %d voci"
 
-#: wt-status.c:938
+#: wt-status.c:934
 msgid "Submodules changed but not updated:"
 msgstr "Sottomoduli modificati ma non aggiornati:"
 
-#: wt-status.c:940
+#: wt-status.c:936
 msgid "Submodule changes to be committed:"
 msgstr "Modifiche ai sottomoduli di cui verrà eseguito il commit:"
 
-#: wt-status.c:1022
+#: wt-status.c:1018
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -8254,7 +9462,7 @@ msgstr ""
 "Non modificare o rimuovere la riga soprastante.\n"
 "Tutto ciò che si trova al di sotto di essa sarà ignorato."
 
-#: wt-status.c:1114
+#: wt-status.c:1110
 #, c-format
 msgid ""
 "\n"
@@ -8266,111 +9474,111 @@ msgstr ""
 "precedenti/successivi nel branch.\n"
 "Puoi usare '--no-ahead-behind' per evitare il calcolo.\n"
 
-#: wt-status.c:1144
+#: wt-status.c:1140
 msgid "You have unmerged paths."
 msgstr "Hai dei percorsi non sottoposti a merge."
 
-#: wt-status.c:1147
+#: wt-status.c:1143
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (risolvi i conflitti ed esegui \"git commit\")"
 
-#: wt-status.c:1149
+#: wt-status.c:1145
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (usa \"git merge --abort\" per interrompere il merge)"
 
-#: wt-status.c:1153
+#: wt-status.c:1149
 msgid "All conflicts fixed but you are still merging."
 msgstr "Tutti i conflitti sono stati risolti ma il merge è ancora in corso."
 
-#: wt-status.c:1156
+#: wt-status.c:1152
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (usa \"git commit\" per terminare il merge)"
 
-#: wt-status.c:1165
+#: wt-status.c:1161
 msgid "You are in the middle of an am session."
 msgstr "Sei nel bel mezzo di una sessione am."
 
-#: wt-status.c:1168
+#: wt-status.c:1164
 msgid "The current patch is empty."
 msgstr "La patch corrente è vuota."
 
-#: wt-status.c:1172
+#: wt-status.c:1168
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (risolvi i conflitti e quindi esegui \"git am --continue\")"
 
-#: wt-status.c:1174
+#: wt-status.c:1170
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (usa \"git am --skip\" per saltare questa patch)"
 
-#: wt-status.c:1176
+#: wt-status.c:1172
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (usa \"git am --abort\" per ripristinare il branch originario)"
 
-#: wt-status.c:1309
+#: wt-status.c:1305
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo è mancante."
 
-#: wt-status.c:1311
+#: wt-status.c:1307
 msgid "No commands done."
 msgstr "Nessun comando eseguito."
 
-#: wt-status.c:1314
+#: wt-status.c:1310
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "Ultimo comando eseguito (%d comando eseguito):"
 msgstr[1] "Ultimi comandi eseguiti (%d comandi eseguiti):"
 
-#: wt-status.c:1325
+#: wt-status.c:1321
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (vedi di più nel file %s)"
 
-#: wt-status.c:1330
+#: wt-status.c:1326
 msgid "No commands remaining."
 msgstr "Nessun comando rimanente."
 
-#: wt-status.c:1333
+#: wt-status.c:1329
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "Prossimo comando da eseguire (%d comando rimanente):"
 msgstr[1] "Prossimi comandi da eseguire (%d comandi rimanenti):"
 
-#: wt-status.c:1341
+#: wt-status.c:1337
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr ""
 "  (usa \"git rebase --edit-todo\" per visualizzare e modificare le "
 "operazioni)"
 
-#: wt-status.c:1353
+#: wt-status.c:1349
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Attualmente stai eseguendo il rebase del branch '%s' su '%s'."
 
-#: wt-status.c:1358
+#: wt-status.c:1354
 msgid "You are currently rebasing."
 msgstr "Attualmente stai eseguendo un rebase."
 
-#: wt-status.c:1371
+#: wt-status.c:1367
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (risolvi i conflitti e quindi esegui \"git rebase --continue\")"
 
-#: wt-status.c:1373
+#: wt-status.c:1369
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (usa \"git rebase --skip\" per saltare questa patch)"
 
-#: wt-status.c:1375
+#: wt-status.c:1371
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr ""
 "  (usa \"git rebase --abort\" per eseguire il checkout del branch originario)"
 
-#: wt-status.c:1382
+#: wt-status.c:1378
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 "  (tutti i conflitti sono stati risolti: esegui \"git rebase --continue\")"
 
-#: wt-status.c:1386
+#: wt-status.c:1382
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -8378,145 +9586,151 @@ msgstr ""
 "Attualmente stai dividendo un commit durante il rebase del branch '%s' su "
 "'%s'."
 
-#: wt-status.c:1391
+#: wt-status.c:1387
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Attualmente stai dividendo un commit durante un rebase."
 
-#: wt-status.c:1394
+#: wt-status.c:1390
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr ""
 "  (Una volta che la tua directory di lavoro è pulita, esegui \"git rebase --"
 "continue\")"
 
-#: wt-status.c:1398
+#: wt-status.c:1394
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr ""
 "Attualmente stai modificando un commit durante il rebase del branch '%s' su "
 "'%s'."
 
-#: wt-status.c:1403
+#: wt-status.c:1399
 msgid "You are currently editing a commit during a rebase."
 msgstr "Attualmente stai modificando un commit durante un rebase."
 
-#: wt-status.c:1406
+#: wt-status.c:1402
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (usa \"git commit --amend\" per correggere il commit corrente)"
 
-#: wt-status.c:1408
+#: wt-status.c:1404
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr ""
 "  (usa \"git rebase --continue\" una volta soddisfatto delle tue modifiche)"
 
-#: wt-status.c:1419
+#: wt-status.c:1415
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick in corso."
 
-#: wt-status.c:1422
+#: wt-status.c:1418
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Attualmente stai eseguendo il cherry-pick del commit %s."
 
-#: wt-status.c:1429
+#: wt-status.c:1425
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (risolvi i conflitti ed esegui \"git cherry-pick --continue\")"
 
-#: wt-status.c:1432
+#: wt-status.c:1428
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (esegui \"git cherry-pick --continue\" per continuare)"
 
-#: wt-status.c:1435
+#: wt-status.c:1431
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (tutti i conflitti sono stati risolti: esegui \"git cherry-pick --continue"
 "\")"
 
-#: wt-status.c:1437
+#: wt-status.c:1433
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  (usa \"git cherry-pick --skip\" per saltare questa patch)"
 
-#: wt-status.c:1439
+#: wt-status.c:1435
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr ""
 "  (usa \"git cherry-pick --abort\" per annullare l'operazione di cherry-pick)"
 
-#: wt-status.c:1449
+#: wt-status.c:1445
 msgid "Revert currently in progress."
 msgstr "Revert in corso."
 
-#: wt-status.c:1452
+#: wt-status.c:1448
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Attualmente stai eseguendo il revert del commit %s."
 
-#: wt-status.c:1458
+#: wt-status.c:1454
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (risolvi i conflitti ed esegui \"git revert --continue\")"
 
-#: wt-status.c:1461
+#: wt-status.c:1457
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (esegui \"git revert --continue\" per continuare)"
 
-#: wt-status.c:1464
+#: wt-status.c:1460
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 "  (tutti i conflitti sono stati risolti: esegui \"git revert --continue\")"
 
-#: wt-status.c:1466
+#: wt-status.c:1462
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (usa \"git revert --skip\" per saltare questa patch)"
 
-#: wt-status.c:1468
+#: wt-status.c:1464
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (usa \"git revert --abort\" per annullare l'operazione di revert)"
 
-#: wt-status.c:1478
+#: wt-status.c:1474
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Attualmente stai eseguendo una bisezione partendo dal branch '%s'."
 
-#: wt-status.c:1482
+#: wt-status.c:1478
 msgid "You are currently bisecting."
 msgstr "Attualmente stai eseguendo una bisezione."
 
-#: wt-status.c:1485
+#: wt-status.c:1481
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (usa \"git bisect reset\" per tornare al branch originario)"
 
-#: wt-status.c:1694
+#: wt-status.c:1492
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Sei in uno sparse checkout in cui è presente il %d%% dei file tracciati."
+
+#: wt-status.c:1731
 msgid "On branch "
 msgstr "Sul branch "
 
-#: wt-status.c:1701
+#: wt-status.c:1738
 msgid "interactive rebase in progress; onto "
 msgstr "rebase interattivo in corso su "
 
-#: wt-status.c:1703
+#: wt-status.c:1740
 msgid "rebase in progress; onto "
 msgstr "rebase in corso su "
 
-#: wt-status.c:1713
+#: wt-status.c:1750
 msgid "Not currently on any branch."
 msgstr "Attualmente non sei su alcun branch."
 
-#: wt-status.c:1730
+#: wt-status.c:1767
 msgid "Initial commit"
 msgstr "Commit iniziale"
 
-#: wt-status.c:1731
+#: wt-status.c:1768
 msgid "No commits yet"
 msgstr "Non ci sono ancora commit"
 
-#: wt-status.c:1745
+#: wt-status.c:1782
 msgid "Untracked files"
 msgstr "File non tracciati"
 
-#: wt-status.c:1747
+#: wt-status.c:1784
 msgid "Ignored files"
 msgstr "File ignorati"
 
-#: wt-status.c:1751
+#: wt-status.c:1788
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8528,31 +9742,31 @@ msgstr ""
 "ma devi stare attento a non dimenticarti di aggiungere\n"
 "autonomamente i file nuovi (vedi 'git help status')."
 
-#: wt-status.c:1757
+#: wt-status.c:1794
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "File non tracciati non elencati%s"
 
-#: wt-status.c:1759
+#: wt-status.c:1796
 msgid " (use -u option to show untracked files)"
 msgstr " (usa l'opzione -u per visualizzare i file non tracciati)"
 
-#: wt-status.c:1765
+#: wt-status.c:1802
 msgid "No changes"
 msgstr "Nessuna modifica"
 
-#: wt-status.c:1770
+#: wt-status.c:1807
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
 "nessuna modifica aggiunta al commit (usa \"git add\" e/o \"git commit -a\")\n"
 
-#: wt-status.c:1773
+#: wt-status.c:1811
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "nessuna modifica aggiunta al commit\n"
 
-#: wt-status.c:1776
+#: wt-status.c:1815
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8561,202 +9775,206 @@ msgstr ""
 "non è stato aggiunto nulla al commit ma sono presenti file non tracciati "
 "(usa \"git add\" per tracciarli)\n"
 
-#: wt-status.c:1779
+#: wt-status.c:1819
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr ""
 "non è stato aggiunto nulla al commit ma sono presenti file non tracciati\n"
 
-#: wt-status.c:1782
+#: wt-status.c:1823
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr ""
 "non c'è nulla di cui eseguire il commit (crea/copia dei file e usa \"git add"
 "\" per tracciarli)\n"
 
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1827 wt-status.c:1833
 #, c-format
 msgid "nothing to commit\n"
 msgstr "non c'è nulla di cui eseguire il commit\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1830
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr ""
 "non c'è nulla di cui eseguire il commit (usa -u per visualizzare i file non "
 "tracciati)\n"
 
-#: wt-status.c:1792
+#: wt-status.c:1835
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "non c'è nulla di cui eseguire il commit, l'albero di lavoro è pulito\n"
 
-#: wt-status.c:1905
+#: wt-status.c:1940
 msgid "No commits yet on "
 msgstr "Non ci sono ancora commit su"
 
-#: wt-status.c:1909
+#: wt-status.c:1944
 msgid "HEAD (no branch)"
 msgstr "HEAD (nessun branch)"
 
-#: wt-status.c:1940
+#: wt-status.c:1975
 msgid "different"
 msgstr "differente"
 
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1977 wt-status.c:1985
 msgid "behind "
 msgstr "indietro "
 
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1980 wt-status.c:1983
 msgid "ahead "
 msgstr "avanti "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2505
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "impossibile eseguire %s: ci sono delle modifiche non in staging."
 
-#: wt-status.c:2476
+#: wt-status.c:2511
 msgid "additionally, your index contains uncommitted changes."
 msgstr ""
 "inoltre, l'indice contiene modifiche di cui non è stato eseguito il commit."
 
-#: wt-status.c:2478
+#: wt-status.c:2513
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "impossibile eseguire %s: l'indice contiene modifiche di cui non è stato "
 "eseguito il commit."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#: compat/precompose_utf8.c:58 builtin/clone.c:456
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "unlink di '%s' non riuscito"
 
-#: builtin/add.c:25
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opzioni>] [--] <specificatore percorso>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "stato diff inatteso %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:285
 msgid "updating files failed"
 msgstr "aggiornamento dei file non riuscito"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "elimina '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Modifiche non nell'area di staging dopo l'aggiornamento dell'indice:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:897
+#: builtin/add.c:272 builtin/rev-parse.c:904
 msgid "Could not read the index"
 msgstr "Impossibile leggere l'indice"
 
-#: builtin/add.c:245
+#: builtin/add.c:283
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Impossibile aprire '%s' in scrittura."
 
-#: builtin/add.c:249
+#: builtin/add.c:287
 msgid "Could not write patch"
 msgstr "Impossibile scrivere la patch"
 
-#: builtin/add.c:252
+#: builtin/add.c:290
 msgid "editing patch failed"
 msgstr "modifica della patch non riuscita"
 
-#: builtin/add.c:255
+#: builtin/add.c:293
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Impossibile eseguire lo stat di '%s'"
 
-#: builtin/add.c:257
+#: builtin/add.c:295
 msgid "Empty patch. Aborted."
 msgstr "Patch vuota. Operazione interrotta."
 
-#: builtin/add.c:262
+#: builtin/add.c:300
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Impossibile applicare '%s'"
 
-#: builtin/add.c:270
+#: builtin/add.c:308
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "I seguenti percorsi sono ignorati da uno dei file .gitignore:\n"
 
-#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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:538
+#: builtin/remote.c:1422 builtin/rm.c:242 builtin/send-pack.c:184
 msgid "dry run"
 msgstr "test controllato"
 
-#: builtin/add.c:293
+#: builtin/add.c:331
 msgid "interactive picking"
 msgstr "scelta interattiva"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:332 builtin/checkout.c:1529 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "seleziona gli hunk in modalità interattiva"
 
-#: builtin/add.c:295
+#: builtin/add.c:333
 msgid "edit current diff and apply"
 msgstr "modifica il diff corrente e applicalo"
 
-#: builtin/add.c:296
+#: builtin/add.c:334
 msgid "allow adding otherwise ignored files"
 msgstr "consenti l'aggiunta di file altrimenti ignorati"
 
-#: builtin/add.c:297
+#: builtin/add.c:335
 msgid "update tracked files"
 msgstr "aggiorna i file tracciati"
 
-#: builtin/add.c:298
+#: builtin/add.c:336
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "rinormalizza i fine riga dei file tracciati (implica -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:337
 msgid "record only the fact that the path will be added later"
 msgstr "salva solo il fatto che il percorso sarà aggiunto successivamente"
 
-#: builtin/add.c:300
+#: builtin/add.c:338
 msgid "add changes from all tracked and untracked files"
 msgstr "aggiungi le modifiche da tutti i file tracciati e non"
 
-#: builtin/add.c:303
+#: builtin/add.c:341
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "ignora i percorsi eliminati nell'albero di lavoro (come --no-all)"
 
-#: builtin/add.c:305
+#: builtin/add.c:343
 msgid "don't add, only refresh the index"
 msgstr "non eseguire l'aggiunta, aggiorna solo l'indice"
 
-#: builtin/add.c:306
+#: builtin/add.c:344
 msgid "just skip files which cannot be added because of errors"
 msgstr ""
 "salta semplicemente i file che non possono essere aggiunti a causa di errori"
 
-#: builtin/add.c:307
+#: builtin/add.c:345
 msgid "check if - even missing - files are ignored in dry run"
 msgstr ""
 "controlla se i file - anche quelli mancanti - sono ignorati durante il test "
 "controllato"
 
-#: builtin/add.c:309 builtin/update-index.c:1002
+#: builtin/add.c:347 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "esegui l'override del bit eseguibile dei file elencati"
 
-#: builtin/add.c:311
+#: builtin/add.c:349
 msgid "warn when adding an embedded repository"
 msgstr "emetti un avviso quando si aggiunge un repository incorporato"
 
-#: builtin/add.c:326
+#: builtin/add.c:351
+msgid "backend for `git stash -p`"
+msgstr "backend per `git stash -p`"
+
+#: builtin/add.c:369
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8787,148 +10005,183 @@ msgstr ""
 "\n"
 "Vedi \"git help submodule\" per ulteriori informazioni."
 
-#: builtin/add.c:354
+#: builtin/add.c:397
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "aggiunta repository Git incorporato in corso: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Usa -f se vuoi davvero aggiungerli.\n"
+#: builtin/add.c:416
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"Usa -f se vuoi veramente aggiungerli.\n"
+"Per disabilitare questo messaggio, esegui\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:425
 msgid "adding files failed"
 msgstr "aggiunta dei file non riuscita"
 
-#: builtin/add.c:419
+#: builtin/add.c:453 builtin/commit.c:345
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file non è compatibile con --interactive/--patch"
+
+#: builtin/add.c:470
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file non è compatibile con --edit"
+
+#: builtin/add.c:482
 msgid "-A and -u are mutually incompatible"
 msgstr "-A e -u non sono compatibili fra loro"
 
-#: builtin/add.c:426
+#: builtin/add.c:485
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "L'opzione --ignore-missing può essere usata solo con --dry-run"
 
-#: builtin/add.c:430
+#: builtin/add.c:489
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "Il parametro --chmod '%s' deve essere -x o +x"
 
-#: builtin/add.c:445
+#: builtin/add.c:507 builtin/checkout.c:1697 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1503
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr ""
+"--pathspec-from-file non è compatibile con gli argomenti specificatore "
+"percorso"
+
+#: builtin/add.c:514 builtin/checkout.c:1709 builtin/commit.c:357
+#: builtin/reset.c:334 builtin/rm.c:278 builtin/stash.c:1509
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul richiede --pathspec-from-file"
+
+#: builtin/add.c:518
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Non è stato specificato nulla, non è stato aggiunto nulla.\n"
 
-#: builtin/add.c:446
+#: builtin/add.c:520
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"Forse volevi dire 'git add .'?\n"
+"Per disabilitare questo messaggio, esegui\n"
+"\"git config advice.addEmptyPathspec false\""
+
+#: builtin/am.c:160
 #, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Forse intendevi dire 'git add .'?\n"
+msgid "invalid committer: %s"
+msgstr "autore commit non valido: %s"
 
-#: builtin/am.c:347
+#: builtin/am.c:366
 msgid "could not parse author script"
 msgstr "impossibile analizzare lo script author"
 
-#: builtin/am.c:431
+#: builtin/am.c:450
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' è stato eliminato dall'hook applypatch-msg"
 
-#: builtin/am.c:473
+#: builtin/am.c:492
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Riga di input malformata: '%s'."
 
-#: builtin/am.c:511
+#: builtin/am.c:530
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Copia delle note da '%s' a '%s' non riuscita"
 
-#: builtin/am.c:537
+#: builtin/am.c:556
 msgid "fseek failed"
 msgstr "fseek non riuscita"
 
-#: builtin/am.c:725
+#: builtin/am.c:744
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "impossibile analizzare la patch '%s'"
 
-#: builtin/am.c:790
+#: builtin/am.c:809
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Può essere applicata solo una serie di patch StGIT per volta"
 
-#: builtin/am.c:838
+#: builtin/am.c:857
 msgid "invalid timestamp"
 msgstr "timestamp non valido"
 
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:862 builtin/am.c:874
 msgid "invalid Date line"
 msgstr "riga Date non valida"
 
-#: builtin/am.c:850
+#: builtin/am.c:869
 msgid "invalid timezone offset"
 msgstr "offset fuso orario non valido"
 
-#: builtin/am.c:943
+#: builtin/am.c:962
 msgid "Patch format detection failed."
 msgstr "Rilevamento del formato della patch non riuscito."
 
-#: builtin/am.c:948 builtin/clone.c:406
+#: builtin/am.c:967 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "creazione della directory '%s' non riuscita"
 
-#: builtin/am.c:953
+#: builtin/am.c:972
 msgid "Failed to split patches."
 msgstr "Divisione delle patch non riuscita."
 
-#: builtin/am.c:1084
+#: builtin/am.c:1103
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Una volta risolto questo problema, esegui \"%s --continue\"."
 
-#: builtin/am.c:1085
+#: builtin/am.c:1104
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Se preferisci saltare questa patch, esegui invece \"%s --skip\"."
 
-#: builtin/am.c:1086
+#: builtin/am.c:1105
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr ""
 "Per ripristinare il branch originario e terminare il patching, esegui \"%s --"
 "abort\"."
 
-#: builtin/am.c:1169
+#: builtin/am.c:1188
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 "Patch inviata con format=flowed; gli spazi al termine delle righe potrebbero "
 "essere andati perduti."
 
-#: builtin/am.c:1197
+#: builtin/am.c:1216
 msgid "Patch is empty."
 msgstr "La patch è vuota."
 
-#: builtin/am.c:1262
+#: builtin/am.c:1281
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "riga autore mancante nel commit %s"
 
-#: builtin/am.c:1265
+#: builtin/am.c:1284
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "riga ident non valida: %.*s"
 
-#: builtin/am.c:1484
+#: builtin/am.c:1503
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr ""
 "Dal repository mancano i blob necessari per ripiegare sul merge a tre vie."
 
-#: builtin/am.c:1486
+#: builtin/am.c:1505
 msgid "Using index info to reconstruct a base tree..."
 msgstr ""
 "Utilizzo le informazioni dell'indice per ricostruire un albero di base..."
 
-#: builtin/am.c:1505
+#: builtin/am.c:1524
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8936,24 +10189,24 @@ msgstr ""
 "Hai modificato manualmente la patch?\n"
 "Non può essere applicata ai blob registrati nel suo indice."
 
-#: builtin/am.c:1511
+#: builtin/am.c:1530
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Ripiego sul patching della base e sul merge a tre vie..."
 
-#: builtin/am.c:1537
+#: builtin/am.c:1556
 msgid "Failed to merge in the changes."
 msgstr "Merge delle modifiche non riuscito."
 
-#: builtin/am.c:1569
+#: builtin/am.c:1588
 msgid "applying to an empty history"
 msgstr "applicazione a una cronologia vuota"
 
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1639 builtin/am.c:1643
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "impossibile riprendere l'attività: %s non esiste."
 
-#: builtin/am.c:1638
+#: builtin/am.c:1661
 msgid "Commit Body is:"
 msgstr "Il corpo del commit è:"
 
@@ -8961,41 +10214,41 @@ msgstr "Il corpo del commit è:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1648
+#: builtin/am.c:1671
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr ""
 "Applico? Sì [y]/No [n]/Modifica [e]/[V]isualizza patch/[A]ccetta tutto:"
 
-#: builtin/am.c:1695 builtin/commit.c:374
+#: builtin/am.c:1717 builtin/commit.c:395
 msgid "unable to write index file"
 msgstr "impossibile scrivere il file indice"
 
-#: builtin/am.c:1699
+#: builtin/am.c:1721
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Indice sporco: impossibile applicare le patch (elemento sporco: %s)"
 
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1761 builtin/am.c:1829
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Applicazione in corso: %.*s"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1778
 msgid "No changes -- Patch already applied."
 msgstr "Nessuna modifica -- patch già applicata."
 
-#: builtin/am.c:1762
+#: builtin/am.c:1784
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Patch non riuscita a %s %.*s"
 
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1788
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
-"Usa 'git am --show-current-patch' per visualizzare la patch non riuscita"
+"Usa 'git am --show-current-patch=diff' per visualizzare la patch non riuscita"
 
-#: builtin/am.c:1810
+#: builtin/am.c:1832
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -9005,7 +10258,7 @@ msgstr ""
 "Se non rimane nulla da aggiungere all'area di staging, forse qualcos'altro\n"
 "ha già introdotto le stesse modifiche; potresti voler saltare questa patch."
 
-#: builtin/am.c:1817
+#: builtin/am.c:1839
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -9018,17 +10271,17 @@ msgstr ""
 "Potresti eseguire `git rm` su un file per accettarne la risoluzione "
 "\"eliminato da loro\"."
 
-#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1946 builtin/am.c:1950 builtin/am.c:1962 builtin/reset.c:347
+#: builtin/reset.c:355
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "Impossibile analizzare l'oggetto '%s'."
 
-#: builtin/am.c:1976
+#: builtin/am.c:1998
 msgid "failed to clean index"
 msgstr "pulizia dell'indice non riuscita"
 
-#: builtin/am.c:2020
+#: builtin/am.c:2042
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -9037,148 +10290,160 @@ msgstr ""
 "'am'.\n"
 "Non ritorno indietro a ORIG_HEAD"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2149
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valore non valido per --patch-format: %s"
 
-#: builtin/am.c:2153
+#: builtin/am.c:2191
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Valore non valido per --show-current-patch: %s"
+
+#: builtin/am.c:2195
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s non è compatibile con --show-current-patch=%s"
+
+#: builtin/am.c:2226
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opzioni>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2154
+#: builtin/am.c:2227
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opzioni>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2160
+#: builtin/am.c:2233
 msgid "run interactively"
 msgstr "esegui in modalità interattiva"
 
-#: builtin/am.c:2162
+#: builtin/am.c:2235
 msgid "historical option -- no-op"
 msgstr "opzione storica -- non esegue nulla"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2237
 msgid "allow fall back on 3way merging if needed"
 msgstr "consenti il ripiego sul merge a tre vie se necessario"
 
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:297 builtin/stash.c:812
+#: builtin/am.c:2238 builtin/init-db.c:558 builtin/prune-packed.c:16
+#: builtin/repack.c:309 builtin/stash.c:816
 msgid "be quiet"
 msgstr "non visualizzare messaggi"
 
-#: builtin/am.c:2167
+#: builtin/am.c:2240
 msgid "add a Signed-off-by line to the commit message"
 msgstr "aggiungi una riga Signed-off-by al messaggio di commit"
 
-#: builtin/am.c:2170
+#: builtin/am.c:2243
 msgid "recode into utf8 (default)"
 msgstr "converti codifica in UTF-8 (impostazione predefinita)"
 
-#: builtin/am.c:2172
+#: builtin/am.c:2245
 msgid "pass -k flag to git-mailinfo"
 msgstr "fornisci l'argomento -k a git-mailinfo"
 
-#: builtin/am.c:2174
+#: builtin/am.c:2247
 msgid "pass -b flag to git-mailinfo"
 msgstr "fornisci l'argomento -b a git-mailinfo"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2249
 msgid "pass -m flag to git-mailinfo"
 msgstr "fornisci l'argomento -m a git-mailinfo"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2251
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "fornisci a git-mailsplit l'argomento --keep-cr per il formato mbox"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2254
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr ""
 "non fornire l'argomento --keep-cr a git-mailsplit indipendentemente dal "
 "valore di am.keepcr"
 
-#: builtin/am.c:2184
+#: builtin/am.c:2257
 msgid "strip everything before a scissors line"
 msgstr "rimuovi tutte le righe prima di una riga \"taglia qui\""
 
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2259 builtin/am.c:2262 builtin/am.c:2265 builtin/am.c:2268
+#: builtin/am.c:2271 builtin/am.c:2274 builtin/am.c:2277 builtin/am.c:2280
+#: builtin/am.c:2286
 msgid "pass it through git-apply"
 msgstr "passa l'argomento a git-apply"
 
-#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
-#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:150 parse-options.h:171 parse-options.h:312
+#: builtin/am.c:2276 builtin/commit.c:1395 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:892 builtin/merge.c:251
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1335 builtin/repack.c:320 builtin/repack.c:324
+#: builtin/repack.c:326 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
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2282 builtin/branch.c:659 builtin/bugreport.c:135
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438
+#: builtin/verify-tag.c:38
 msgid "format"
 msgstr "formato"
 
-#: builtin/am.c:2210
+#: builtin/am.c:2283
 msgid "format the patch(es) are in"
 msgstr "il formato delle patch"
 
-#: builtin/am.c:2216
+#: builtin/am.c:2289
 msgid "override error message when patch failure occurs"
 msgstr ""
 "esegui l'override del messaggio d'errore quando si verifica un errore legato "
 "alle patch"
 
-#: builtin/am.c:2218
+#: builtin/am.c:2291
 msgid "continue applying patches after resolving a conflict"
 msgstr ""
 "continua l'applicazione delle patch dopo la risoluzione di un conflitto"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2294
 msgid "synonyms for --continue"
 msgstr "sinonimi di --continue"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2297
 msgid "skip the current patch"
 msgstr "salta la patch corrente"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2300
 msgid "restore the original branch and abort the patching operation."
 msgstr "ripristina il branch originario e interrompi l'operazione di patching."
 
-#: builtin/am.c:2230
+#: builtin/am.c:2303
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "interrompi l'operazione di patching ma mantieni HEAD dov'è."
 
-#: builtin/am.c:2233
-msgid "show the patch being applied."
-msgstr "visualizza la patch in fase di applicazione."
+#: builtin/am.c:2307
+msgid "show the patch being applied"
+msgstr "visualizza la patch in fase di applicazione"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2312
 msgid "lie about committer date"
 msgstr "menti sulla data del commit"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2314
 msgid "use current timestamp for author date"
 msgstr "usa il timestamp corrente come data autore"
 
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
-#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2316 builtin/commit-tree.c:120 builtin/commit.c:1515
+#: builtin/merge.c:288 builtin/pull.c:175 builtin/rebase.c:530
+#: builtin/rebase.c:1388 builtin/revert.c:117 builtin/tag.c:419
 msgid "key-id"
 msgstr "ID chiave"
 
-#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
+#: builtin/am.c:2317 builtin/rebase.c:531 builtin/rebase.c:1389
 msgid "GPG-sign commits"
 msgstr "firma i commit con GPG"
 
-#: builtin/am.c:2245
+#: builtin/am.c:2320
 msgid "(internal use for git-rebase)"
 msgstr "(a uso interno per git-rebase)"
 
-#: builtin/am.c:2263
+#: builtin/am.c:2338
 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."
@@ -9186,18 +10451,18 @@ msgstr ""
 "L'opzione -b/--binary non esegue nulla da molto tempo e\n"
 "sarà rimossa. Non usarla più."
 
-#: builtin/am.c:2270
+#: builtin/am.c:2345
 msgid "failed to read the index"
 msgstr "lettura dell'indice non riuscita"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2360
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr ""
 "la directory di rebase precedente %s esiste ancora ma è stata specificata "
 "un'mbox."
 
-#: builtin/am.c:2309
+#: builtin/am.c:2384
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9206,11 +10471,11 @@ msgstr ""
 "Trovata directory smarrita %s.\n"
 "Usa \"git am --abort\" per eliminarla."
 
-#: builtin/am.c:2315
+#: builtin/am.c:2390
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Operazione di risoluzione non in corso, non riprendiamo."
 
-#: builtin/am.c:2325
+#: builtin/am.c:2400
 msgid "interactive mode requires patches on the command line"
 msgstr ""
 "la modalità interattiva richiede che le patch siano fornite sulla riga di "
@@ -9250,25 +10515,25 @@ msgstr "git archive: errore del protocollo"
 msgid "git archive: expected a flush"
 msgstr "git archive: atteso un flush"
 
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
 #: builtin/bisect--helper.c:23
+msgid "git bisect--helper --next-all"
+msgstr "git bisect--helper --next-all"
+
+#: builtin/bisect--helper.c:24
 msgid "git bisect--helper --write-terms <bad_term> <good_term>"
 msgstr ""
 "git bisect--helper --write-terms <termine revisione non funzionante> "
 "<termine revisione funzionante>"
 
-#: builtin/bisect--helper.c:24
+#: builtin/bisect--helper.c:25
 msgid "git bisect--helper --bisect-clean-state"
 msgstr "git bisect--helper --bisect-clean-state"
 
-#: builtin/bisect--helper.c:25
+#: builtin/bisect--helper.c:26
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<commit>]"
 
-#: builtin/bisect--helper.c:26
+#: builtin/bisect--helper.c:27
 msgid ""
 "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
 "<bad_term>"
@@ -9276,7 +10541,7 @@ msgstr ""
 "git bisect--helper --bisect-write [--no-log] <stato> <revisione> <termine "
 "revisione funzionante> <termine revisione non funzionante>"
 
-#: builtin/bisect--helper.c:27
+#: builtin/bisect--helper.c:28
 msgid ""
 "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
 "<bad_term>"
@@ -9284,13 +10549,13 @@ msgstr ""
 "git bisect--helper --bisect-check-and-set-terms <comando> <termine revisione "
 "funzionante> <termine revisione non funzionante>"
 
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:29
 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
 msgstr ""
 "git bisect--helper --bisect-next-check <termine revisione funzionante> "
 "<termine revisione non funzionante> [<termine>]"
 
-#: builtin/bisect--helper.c:29
+#: builtin/bisect--helper.c:30
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
@@ -9298,49 +10563,68 @@ msgstr ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:31
 msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<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>...]"
 msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<termine> --term-{new,"
-"bad}=<termine>][--no-checkout] [<non funzionante> [<funzionante>...]] [--] "
-"[<percorsi>...]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<termine> --term-{old,"
+"good}=<termine>] [--no-checkout] [--first-parent] [<non funzionante> "
+"[<funzionante>...]] [--] [<percorsi>...]"
+
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-next"
+msgstr "git bisect--helper --bisect-next"
+
+#: builtin/bisect--helper.c:34
+msgid "git bisect--helper --bisect-auto-next"
+msgstr "git bisect--helper --bisect-auto-next"
+
+#: builtin/bisect--helper.c:35
+msgid "git bisect--helper --bisect-autostart"
+msgstr "git bisect--helper --bisect-autostart"
+
+#: builtin/bisect--helper.c:97
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "impossibile aprire il file '%s' in modalità '%s'"
+
+#: builtin/bisect--helper.c:104
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "impossibile scrivere il file '%s'"
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:143
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' non è un termine valido"
 
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:147
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "impossibile usare il comando nativo '%s' come termine"
 
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:157
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "impossibile cambiare il significato del termine '%s'"
 
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:167
 msgid "please use two different terms"
 msgstr "usa due termini differenti"
 
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "impossibile aprire il file BISECT_TERMS"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:207
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Non stiamo eseguendo un bisect.\n"
 
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:215
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' non è un commit valido"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:224
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9348,27 +10632,27 @@ msgstr ""
 "impossibile eseguire il checkout dell'HEAD originario '%s'. Prova con 'git "
 "bisect reset <commit>'."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:268
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Argomento bisect_write errato: %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:273
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "impossibile recuperare l'OID della revisione '%s'"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:285
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "impossibile aprire il file '%s'"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:311
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "Comando non valido: attualmente stai eseguendo una bisezione %s/%s"
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:338
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9377,7 +10661,7 @@ msgstr ""
 "Devi specificare almeno una revisione %s ed una %s.\n"
 "Puoi usare \"git bisect %s\" e \"git bisect %s\" per questo scopo."
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:342
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9388,7 +10672,7 @@ msgstr ""
 "Quindi devi specificare almeno una revisione %s ed una %s.\n"
 "Puoi usare \"git bisect %s\" e \"git bisect %s\" a questo scopo."
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:362
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "eseguo la bisezione solo con un commit %s"
@@ -9397,15 +10681,15 @@ msgstr "eseguo la bisezione solo con un commit %s"
 #. translation. The program will only accept English input
 #. at this point.
 #.
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:370
 msgid "Are you sure [Y/n]? "
 msgstr "Sei sicuro? [Y/n] "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:431
 msgid "no terms defined"
 msgstr "nessun termine definito"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:434
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9414,7 +10698,7 @@ msgstr ""
 "I tuoi termini correnti sono %s per lo stato vecchio\n"
 "e %s per lo stato nuovo.\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:444
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9423,286 +10707,329 @@ msgstr ""
 "argomento %s non valido per 'git bisect terms'.\n"
 "Le opzioni supportate sono: --term-good|--term-old e --term-bad|--term-new."
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:511
+msgid "revision walk setup failed\n"
+msgstr "impostazione percorso revisioni non riuscita\n"
+
+#: builtin/bisect--helper.c:533
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "impossibile aprire '%s' per accodare dati"
+
+#: builtin/bisect--helper.c:651 builtin/bisect--helper.c:664
+msgid "'' is not a valid term"
+msgstr "'' non è un termine valido"
+
+#: builtin/bisect--helper.c:674
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "opzione non riconosciuta: '%s'"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:678
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "sembra che '%s' non sia una revisione valida"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:709
 msgid "bad HEAD - I need a HEAD"
 msgstr "HEAD non valida - ho bisogno di un'HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:724
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 "checkout di '%s' non riuscito. Prova con 'git bisect start <branch valido>'."
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:745
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "non eseguirò la bisezione su un albero sottoposto a cg-seek"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:748
 msgid "bad HEAD - strange symbolic ref"
 msgstr "head non valida - riferimento simbolico strano"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:775
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "riferimento non valido: '%s'"
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:827
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Devi iniziare con \"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:838
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "Vuoi che me ne occupi io [Y/n]? "
+
+#: builtin/bisect--helper.c:866
 msgid "perform 'git bisect next'"
 msgstr "esegui 'git bisect next'"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:868
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "scrivi i termini in .git/BISECT_TERMS"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:870
 msgid "cleanup the bisection state"
 msgstr "pulisci lo stato bisezione"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:872
 msgid "check for expected revs"
 msgstr "controlla se le revisioni attese sono presenti"
 
-#: builtin/bisect--helper.c:638
+#: builtin/bisect--helper.c:874
 msgid "reset the bisection state"
 msgstr "reimposta lo stato della bisezione"
 
-#: builtin/bisect--helper.c:640
+#: builtin/bisect--helper.c:876
 msgid "write out the bisection state in BISECT_LOG"
 msgstr "scrivi lo stato della bisezione in BISECT_LOG"
 
-#: builtin/bisect--helper.c:642
+#: builtin/bisect--helper.c:878
 msgid "check and set terms in a bisection state"
 msgstr "controlla e imposta i termini in uno stato bisezione"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:880
 msgid "check whether bad or good terms exist"
 msgstr ""
 "controlla se esistono termini per revisioni non funzionanti o funzionanti"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:882
 msgid "print out the bisect terms"
 msgstr "stampa i termini della bisezione"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:884
 msgid "start the bisect session"
 msgstr "inizia la sessione di bisezione"
 
-#: builtin/bisect--helper.c:650
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "aggiorna BISECT_HEAD anziché eseguire il checkout del commit corrente"
+#: builtin/bisect--helper.c:886
+msgid "find the next bisection commit"
+msgstr "trova il prossimo commit della bisezione"
+
+#: builtin/bisect--helper.c:888
+msgid "verify the next bisection state then checkout the next bisection commit"
+msgstr ""
+"verifica il prossimo stato della bisezione, quindi esegui il checkout del "
+"prossimo commit della bisezione"
+
+#: builtin/bisect--helper.c:890
+msgid "start the bisection if it has not yet been started"
+msgstr "avvia la bisezione se non è già stata avviata"
 
-#: builtin/bisect--helper.c:652
+#: builtin/bisect--helper.c:892
 msgid "no log for BISECT_WRITE"
 msgstr "non registrare le operazioni eseguite per BISECT_WRITE"
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:910
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms richiede due argomenti"
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:914
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state non richiede argomenti"
 
-#: builtin/bisect--helper.c:680
+#: builtin/bisect--helper.c:921
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr "--bisect-reset richiede o nessun argomento o un commit"
 
-#: builtin/bisect--helper.c:684
+#: builtin/bisect--helper.c:925
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr "--bisect-write richiede o quattro o cinque argomenti"
 
-#: builtin/bisect--helper.c:690
+#: builtin/bisect--helper.c:931
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr "--check-and-set-terms richiede tre argomenti"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:937
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check richiede due o tre argomenti"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:943
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms richiede zero o un argomento"
 
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:952
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next richiede zero argomenti"
+
+#: builtin/bisect--helper.c:958
+msgid "--bisect-auto-next requires 0 arguments"
+msgstr "--bisect-auto-next richiede zero argomenti"
+
+#: builtin/bisect--helper.c:964
+msgid "--bisect-autostart does not accept arguments"
+msgstr "--bisect-autostart non accetta argomenti"
+
+#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opzioni>] [<opzioni revisione>] [<revisione>] [--] <file>"
 
-#: builtin/blame.c:36
+#: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "le <opzioni revisione> sono documentate in git-rev-list(1)"
 
-#: builtin/blame.c:409
+#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
 msgstr "atteso colore: %s"
 
-#: builtin/blame.c:416
+#: builtin/blame.c:417
 msgid "must end with a color"
 msgstr "deve terminare con un colore"
 
-#: builtin/blame.c:729
+#: builtin/blame.c:730
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "colore '%s' non valido in color.blame.repeatedLines"
 
-#: builtin/blame.c:747
+#: builtin/blame.c:748
 msgid "invalid value for blame.coloring"
 msgstr "valore non valido per blame.coloring"
 
-#: builtin/blame.c:822
+#: builtin/blame.c:845
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "impossibile trovare la revisione %s da ignorare"
 
-#: builtin/blame.c:844
+#: builtin/blame.c:867
 msgid "Show blame entries as we find them, incrementally"
 msgstr ""
 "Visualizza le voci blame incrementalmente, a mano a mano che le troviamo"
 
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: builtin/blame.c:868
+msgid "Do not show object names of boundary commits (Default: off)"
 msgstr ""
-"Visualizza un hash SHA-1 vuoto per i commit limite (impostazione "
+"Non visualizzare i nomi degli oggetti dei commit limite (impostazione "
 "predefinita: off)"
 
-#: builtin/blame.c:846
+#: builtin/blame.c:869
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr ""
 "Non gestire i commit radice come commit limite (impostazione predefinita: "
 "off)"
 
-#: builtin/blame.c:847
+#: builtin/blame.c:870
 msgid "Show work cost statistics"
 msgstr "Visualizza le statistiche sul costo dell'operazione"
 
-#: builtin/blame.c:848
+#: builtin/blame.c:871
 msgid "Force progress reporting"
 msgstr "Forza l'indicazione d'avanzamento dell'operazione"
 
-#: builtin/blame.c:849
+#: builtin/blame.c:872
 msgid "Show output score for blame entries"
 msgstr "Visualizza il punteggio di output per le voci blame"
 
-#: builtin/blame.c:850
+#: builtin/blame.c:873
 msgid "Show original filename (Default: auto)"
 msgstr ""
 "Visualizza il nome file originario (impostazione predefinita: automatico)"
 
-#: builtin/blame.c:851
+#: builtin/blame.c:874
 msgid "Show original linenumber (Default: off)"
 msgstr ""
 "Visualizza il numero di riga originario (impostazione predefinita: off)"
 
-#: builtin/blame.c:852
+#: builtin/blame.c:875
 msgid "Show in a format designed for machine consumption"
 msgstr ""
 "Visualizza l'output in un formato progettato per l'utilizzo da parte di una "
 "macchina"
 
-#: builtin/blame.c:853
+#: builtin/blame.c:876
 msgid "Show porcelain format with per-line commit information"
 msgstr ""
 "Visualizza il formato porcelain con le informazioni sul commit per ogni riga"
 
-#: builtin/blame.c:854
+#: builtin/blame.c:877
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr ""
 "Usa la stessa modalità di output di git-annotate (impostazione predefinita: "
 "off)"
 
-#: builtin/blame.c:855
+#: builtin/blame.c:878
 msgid "Show raw timestamp (Default: off)"
 msgstr "Visualizza il timestamp grezzo (impostazione predefinita: off)"
 
-#: builtin/blame.c:856
+#: builtin/blame.c:879
 msgid "Show long commit SHA1 (Default: off)"
 msgstr ""
 "Visualizza l'hash SHA1 del commit in forma lunga (impostazione predefinita: "
 "off)"
 
-#: builtin/blame.c:857
+#: builtin/blame.c:880
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr ""
 "Non visualizzare il nome autore e il timestamp (impostazione predefinita: "
 "off)"
 
-#: builtin/blame.c:858
+#: builtin/blame.c:881
 msgid "Show author email instead of name (Default: off)"
 msgstr ""
 "Visualizza l'indirizzo e-mail dell'autore invece del nome (impostazione "
 "predefinita: off)"
 
-#: builtin/blame.c:859
+#: builtin/blame.c:882
 msgid "Ignore whitespace differences"
 msgstr "Ignora le differenze relative agli spazi bianchi"
 
-#: builtin/blame.c:860 builtin/log.c:1630
+#: builtin/blame.c:883 builtin/log.c:1808
 msgid "rev"
 msgstr "revisione"
 
-#: builtin/blame.c:860
+#: builtin/blame.c:883
 msgid "Ignore <rev> when blaming"
 msgstr "Ignora <revisione> durante l'esecuzione del blame"
 
-#: builtin/blame.c:861
+#: builtin/blame.c:884
 msgid "Ignore revisions from <file>"
 msgstr "Ignora le revisioni specificate in <file>"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:885
 msgid "color redundant metadata from previous line differently"
 msgstr "colora in modo differente i metadati ridondanti della riga precedente"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:886
 msgid "color lines by age"
 msgstr "colora le righe in base all'età"
 
-#: builtin/blame.c:870
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Usa un'euristica sperimentale per migliorare i diff"
-
-#: builtin/blame.c:872
+#: builtin/blame.c:887
 msgid "Spend extra cycles to find better match"
 msgstr "Usa cicli extra per trovare una corrispondenza migliore"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:888
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "Usa le revisioni salvate in <file> anziché richiamare git-rev-list"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:889
 msgid "Use <file>'s contents as the final image"
 msgstr "Usa i contenuti di <file> come immagine finale"
 
-#: builtin/blame.c:875 builtin/blame.c:876
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "punteggio"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:890
 msgid "Find line copies within and across files"
 msgstr "Trova copie delle righe all'interno e fra file"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:891
 msgid "Find line movements within and across files"
 msgstr "Trova righe spostate all'interno e fra file"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:892
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:892
 msgid "Process only line range n,m, counting from 1"
 msgstr "Elabora solo l'intervallo righe n,m, contandole da 1"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:944
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr ""
 "--progress non può essere usato con --incremental o con i formati porcelain"
@@ -9715,24 +11042,24 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:995
 msgid "4 years, 11 months ago"
 msgstr "4 anni, 11 giorni fa"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1110
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
 msgstr[0] "il file %s ha solo %lu riga"
 msgstr[1] "il file %s ha solo %lu righe"
 
-#: builtin/blame.c:1133
+#: builtin/blame.c:1156
 msgid "Blaming lines"
 msgstr "Eseguo il blame sulle righe"
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<opzioni>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<opzioni>] [-r | -a] [--merged] [--no-merged]"
 
 #: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -9944,7 +11271,7 @@ msgstr "imposta la modalità tracking (vedi git-pull(1))"
 msgid "do not use"
 msgstr "non usare"
 
-#: builtin/branch.c:626 builtin/rebase.c:486
+#: builtin/branch.c:626 builtin/rebase.c:526
 msgid "upstream"
 msgstr "upstream"
 
@@ -9953,8 +11280,8 @@ msgid "change the upstream info"
 msgstr "modifica le informazioni sull'upstream"
 
 #: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "Rimuovi le informazioni sull'upstream"
+msgid "unset the upstream info"
+msgstr "rimuovi le informazioni sull'upstream"
 
 #: builtin/branch.c:628
 msgid "use colored output"
@@ -10036,73 +11363,73 @@ msgstr "stampa solo i branch non sottoposti a merge"
 msgid "list branches in columns"
 msgstr "elenca i branch in colonne"
 
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:656 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:433
+#: builtin/tag.c:434
 msgid "object"
 msgstr "oggetto"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:657
 msgid "print only branches of the object"
 msgstr "stampa solo i branch dell'oggetto"
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
 msgid "sorting and filtering are case insensitive"
 msgstr ""
 "l'ordinamento e il filtraggio non fanno differenza tra maiuscole e minuscole"
 
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "formato da usare per l'output"
 
-#: builtin/branch.c:684 builtin/clone.c:760
+#: builtin/branch.c:682 builtin/clone.c:789
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD non trovato fra i riferimenti/head!"
 
-#: builtin/branch.c:708
+#: builtin/branch.c:706
 msgid "--column and --verbose are incompatible"
 msgstr "--column e --verbose non sono compatibili"
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
 msgid "branch name required"
 msgstr "nome branch richiesto"
 
-#: builtin/branch.c:753
+#: builtin/branch.c:751
 msgid "Cannot give description to detached HEAD"
 msgstr "Impossibile fornire una descrizione per l'HEAD scollegato"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:756
 msgid "cannot edit description of more than one branch"
 msgstr "impossibile modificare la descrizione per più di un branch"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:763
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Non esiste ancora nessun commit sul branch '%s'."
 
-#: builtin/branch.c:768
+#: builtin/branch.c:766
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Non esiste alcun branch denominato '%s'."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:781
 msgid "too many branches for a copy operation"
 msgstr "sono presenti troppi branch per consentire un'operazione di copia"
 
-#: builtin/branch.c:792
+#: builtin/branch.c:790
 msgid "too many arguments for a rename operation"
 msgstr ""
 "sono presenti troppi argomenti per consentire un'operazione di "
 "ridenominazione"
 
-#: builtin/branch.c:797
+#: builtin/branch.c:795
 msgid "too many arguments to set new upstream"
 msgstr ""
 "sono presenti troppi argomenti per consentire l'impostazione del nuovo "
 "upstream"
 
-#: builtin/branch.c:801
+#: builtin/branch.c:799
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -10110,33 +11437,33 @@ msgstr ""
 "impossibile impostare l'upstream di HEAD a %s quando non punta ad alcun "
 "branch."
 
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:802 builtin/branch.c:825
 #, c-format
 msgid "no such branch '%s'"
 msgstr "branch '%s' non esistente"
 
-#: builtin/branch.c:808
+#: builtin/branch.c:806
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "il branch '%s' non esiste"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:819
 msgid "too many arguments to unset upstream"
 msgstr ""
 "sono presenti troppi argomenti per rimuovere le informazioni sull'upstream"
 
-#: builtin/branch.c:825
+#: builtin/branch.c:823
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr ""
 "impossibile rimuovere le informazioni sull'upstream di HEAD quando non punta "
 "ad alcun branch."
 
-#: builtin/branch.c:831
+#: builtin/branch.c:829
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Il branch '%s' non ha informazioni sull'upstream"
 
-#: builtin/branch.c:841
+#: builtin/branch.c:839
 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>?"
@@ -10144,7 +11471,7 @@ msgstr ""
 "Le opzioni di 'git branch' -a e -r non richiedono un nome branch.\n"
 "Forse volevi usare: -a|-r --list <pattern>?"
 
-#: builtin/branch.c:845
+#: builtin/branch.c:843
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -10152,20 +11479,171 @@ msgstr ""
 "l'opzione '--set-upstream' non è più supportata. Usa '--track' o '--set-"
 "upstream-to'."
 
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "versione di git:\n"
+
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
-msgstr "%s è corretto\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() non riuscita: errore '%s' (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "informazioni sul compilatore: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "informazioni su libc: "
+
+#: builtin/bugreport.c:80
+msgid "not run from a git repository - no hooks to show\n"
+msgstr ""
+"comando non eseguito da un repository Git - nessun hook da visualizzare\n"
+
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <file>] [-s|--suffix <formato>]"
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"Grazie per voler compilare una segnalazione d'errore per Git!\n"
+"Rispondi alle seguenti domande per consentirci di capire il problema.\n"
+"\n"
+"Cos'hai fatto prima che si verificasse l'errore? (Passaggi per riprodurre "
+"il\n"
+"problema)\n"
+"\n"
+"Cosa ti aspettavi che succedesse? (Comportamento atteso)\n"
+"\n"
+"Cosa è successo invece? (Comportamento reale)\n"
+"\n"
+"Cosa c'è di diverso fra quello che ti aspettavi e ciò che in realtà è\n"
+"successo?\n"
+"\n"
+"Altre note che desideri aggiungere:\n"
+"\n"
+"Rivedi il resto della segnalazione d'errore qui sotto.\n"
+"Puoi eliminare le righe che non desideri condividere.\n"
+
+#: builtin/bugreport.c:134
+msgid "specify a destination for the bugreport file"
+msgstr ""
+"specifica una destinazione per il file contenente la segnalazione d'errore"
+
+#: builtin/bugreport.c:136
+msgid "specify a strftime format suffix for the filename"
+msgstr "specifica un suffisso in formato strftime per il nome del file"
+
+#: builtin/bugreport.c:158
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "impossibile creare le prime directory per '%s'"
+
+#: builtin/bugreport.c:165
+msgid "System Info"
+msgstr "Informazioni di sistema"
 
-#: builtin/bundle.c:58
+#: builtin/bugreport.c:168
+msgid "Enabled Hooks"
+msgstr "Hook abilitati"
+
+#: builtin/bugreport.c:175
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "impossibile creare un nuovo file in '%s'"
+
+#: builtin/bugreport.c:178
+#, c-format
+msgid "unable to write to %s"
+msgstr "impossibile scrivere su %s"
+
+#: builtin/bugreport.c:188
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Nuovo report creato in '%s'.\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<opzioni>] <file> <argomenti git-rev-list>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<opzioni>] <file>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <file> [<nome riferimento>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <file> [<nome riferimento>...]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3480
+msgid "do not show progress meter"
+msgstr "non visualizzare la barra di avanzamento"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3482
+msgid "show progress meter"
+msgstr "visualizza la barra di avanzamento"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3484
+msgid "show progress meter during object writing phase"
+msgstr ""
+"visualizza la barra di avanzamento durante la fase di scrittura oggetti"
+
+#: builtin/bundle.c:74 builtin/pack-objects.c:3487
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento"
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr "specifica la versione del formato bundle"
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr "Per creare un bundle è necessario un repository."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:107
+msgid "do not show bundle details"
+msgstr "non visualizzare i dettagli sul bundle"
+
+#: builtin/bundle.c:122
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s è corretto\n"
+
+#: builtin/bundle.c:163
 msgid "Need a repository to unbundle."
 msgstr "Per decomprimere un bundle è necessario un repository."
 
-#: builtin/cat-file.c:595
+#: builtin/bundle.c:171 builtin/remote.c:1687
+msgid "be verbose; must be placed before a subcommand"
+msgstr ""
+"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando"
+
+#: builtin/bundle.c:193 builtin/remote.c:1718
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sottocomando sconosciuto: %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>"
@@ -10173,83 +11651,83 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipo> | --textconv | --filters) [--path=<percorso>] <oggetto>"
 
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:599
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"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[=<formato>] | --batch-check[=<formato>]) [--follow-"
+"symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:617
+#: builtin/cat-file.c:620
 msgid "only one batch option may be specified"
 msgstr "può essere specificata solo un'opzione batch"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:638
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<tipo> può essere uno fra blob, tree, commit, tag"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:639
 msgid "show object type"
 msgstr "visualizza tipo oggetto"
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
 msgid "show object size"
 msgstr "visualizza dimensioni oggetto"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:642
 msgid "exit with zero when there's no error"
 msgstr "esci con codice d'uscita zero se non si sono verificati errori"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:643
 msgid "pretty-print object's content"
 msgstr "stampa il contenuto dell'oggetto con un formato leggibile"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:645
 msgid "for blob objects, run textconv on object's content"
 msgstr "esegui textconv sul contenuto dell'oggetto (per gli oggetti blob)"
 
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:647
 msgid "for blob objects, run filters on object's content"
 msgstr "esegui i filtri sul contenuto dell'oggetto (per gli oggetti blob)"
 
-#: builtin/cat-file.c:645 git-submodule.sh:936
+#: builtin/cat-file.c:648
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:649
 msgid "use a specific path for --textconv/--filters"
 msgstr "usa un percorso specifico per --textconv/--filters"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:651
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "consenti a -s e -t di funzionare con oggetti malformati/corrotti"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:652
 msgid "buffer --batch output"
 msgstr "esegui il buffering dell'output di --batch"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:654
 msgid "show info and content of objects fed from the standard input"
 msgstr ""
 "visualizza le informazioni e il contenuto degli oggetti forniti nello "
 "standard input"
 
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:658
 msgid "show info about objects fed from the standard input"
 msgstr "visualizza le informazioni degli oggetti forniti nello standard input"
 
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:662
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr ""
 "segui i collegamenti simbolici entro l'albero (usato con --batch o --batch-"
 "check)"
 
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:664
 msgid "show all objects with --batch or --batch-check"
 msgstr "visualizza tutti gli oggetti con --batch o --batch-check"
 
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:666
 msgid "do not order --batch-all-objects output"
 msgstr "non ordinare l'output di --batch-all-objects"
 
@@ -10277,8 +11755,8 @@ msgstr "leggi i nomi dei file dallo standard input"
 msgid "terminate input and output records by a NUL character"
 msgstr "termina i record di input e output con un carattere NUL"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1482 builtin/gc.c:538
+#: builtin/worktree.c:561
 msgid "suppress progress reporting"
 msgstr "non visualizzare l'avanzamento dell'operazione"
 
@@ -10290,27 +11768,27 @@ msgstr "visualizza i percorsi di input non corrispondenti"
 msgid "ignore index when checking"
 msgstr "ignora l'indice durante il controllo"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "impossibile specificare i nomi percorso con --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "-z ha senso solo con --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "nessun percorso specificato"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet è valido solo con un nome percorso singolo"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "non è possibile usare sia --quiet sia --verbose"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching è valido solo con --verbose"
 
@@ -10368,9 +11846,9 @@ msgid "write the content to temporary files"
 msgstr "scrivi il contenuto in file temporanei"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:679
+#: builtin/submodule--helper.c:1824 builtin/submodule--helper.c:1827
+#: builtin/submodule--helper.c:1835 builtin/submodule--helper.c:2333
+#: builtin/worktree.c:754
 msgid "string"
 msgstr "stringa"
 
@@ -10398,100 +11876,100 @@ msgstr "git switch [<opzioni>] <branch>"
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<opzioni>] [--source=<branch>] <file>..."
 
-#: builtin/checkout.c:173 builtin/checkout.c:212
+#: builtin/checkout.c:188 builtin/checkout.c:227
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "il percorso '%s' non ha la nostra versione"
 
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "il percorso '%s' non ha la loro versione"
 
-#: builtin/checkout.c:191
+#: builtin/checkout.c:206
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "il percorso '%s' non ha tutte le versioni necessarie"
 
-#: builtin/checkout.c:241
+#: builtin/checkout.c:258
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "il percorso '%s' non ha le versioni necessarie"
 
-#: builtin/checkout.c:259
+#: builtin/checkout.c:275
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "percorso '%s': impossibile eseguire il merge"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:291
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Impossibile aggiungere il risultato del merge per '%s'"
 
-#: builtin/checkout.c:375
+#: builtin/checkout.c:396
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "Ricreato %d conflitto di merge"
 msgstr[1] "Ricreati %d conflitti di merge"
 
-#: builtin/checkout.c:380
+#: builtin/checkout.c:401
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
 msgstr[0] "Aggiornato %d percorso da %s"
 msgstr[1] "Aggiornati %d percorsi da %s"
 
-#: builtin/checkout.c:387
+#: builtin/checkout.c:408
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
 msgstr[0] "Aggiornato %d percorso dall'indice"
 msgstr[1] "Aggiornati %d percorsi dall'indice"
 
-#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416
-#: builtin/checkout.c:420
+#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
+#: builtin/checkout.c:441
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' non può essere usato con i percorsi in fase di aggiornamento"
 
-#: builtin/checkout.c:423 builtin/checkout.c:426
+#: builtin/checkout.c:444 builtin/checkout.c:447
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' non può essere usato con %s"
 
-#: builtin/checkout.c:430
+#: builtin/checkout.c:451
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr ""
 "Impossibile aggiornare dei percorsi e passare al branch '%s' "
 "contemporaneamente."
 
-#: builtin/checkout.c:434
+#: builtin/checkout.c:455
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "né '%s' né '%s' sono stati specificati"
 
-#: builtin/checkout.c:438
+#: builtin/checkout.c:459
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "'%s' dev'essere usato quando '%s' non è specificato"
 
-#: builtin/checkout.c:443 builtin/checkout.c:448
+#: builtin/checkout.c:464 builtin/checkout.c:469
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' o '%s' non possono essere usati con %s"
 
-#: builtin/checkout.c:507 builtin/checkout.c:514
+#: builtin/checkout.c:528 builtin/checkout.c:535
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "il percorso '%s' non è stato sottoposto a merge"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:703
 msgid "you need to resolve your current index first"
 msgstr "prima devi risolvere l'indice corrente"
 
-#: builtin/checkout.c:730
+#: builtin/checkout.c:757
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10500,50 +11978,50 @@ msgstr ""
 "impossibile continuare con modifiche in stage nei file seguenti:\n"
 "%s"
 
-#: builtin/checkout.c:833
+#: builtin/checkout.c:853
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Impossibile esaminare il registro dei riferimenti per '%s': %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:895
 msgid "HEAD is now at"
 msgstr "HEAD si trova ora a"
 
-#: builtin/checkout.c:879 builtin/clone.c:713
+#: builtin/checkout.c:899 builtin/clone.c:720
 msgid "unable to update HEAD"
 msgstr "impossibile aggiornare HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:903
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Ripristina il branch '%s'\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:906
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Si è già su '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:910
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Si è passati al branch '%s' e lo si è reimpostato\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:912 builtin/checkout.c:1338
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Si è passati a un nuovo branch '%s'\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:914
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Si è passati al branch '%s'\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:965
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ...e altri %d.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:971
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10566,7 +12044,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:990
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -10593,28 +12071,19 @@ msgstr[1] ""
 " git branch <nome del nuovo branch> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1025
 msgid "internal error in revision walk"
 msgstr "errore interno durante la visita delle revisioni"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1029
 msgid "Previous HEAD position was"
 msgstr "La precedente posizione di HEAD era"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1069 builtin/checkout.c:1333
 msgid "You are on a branch yet to be born"
 msgstr "Sei su un branch che deve ancora essere creato"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "atteso solo un riferimento"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "atteso solo un riferimento, %d specificati."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1146
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10623,37 +12092,72 @@ msgstr ""
 "'%s' potrebbe essere sia un file locale, sia un branch da tracciare.\n"
 "Usa -- (e facoltativamente --no-guess) per rimuovere l'ambiguità"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455
+#: builtin/checkout.c:1153
+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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Se intendevi eseguire il checkout di un branch remoto, ad es. 'origin',\n"
+"puoi farlo usando la versione completamente qualificata del nome\n"
+"con l'opzione --track:\n"
+"\n"
+"    git checkout --track origin/<nome>\n"
+"\n"
+"Se preferisci che i checkout di un <nome> ambiguo siano sempre risolti\n"
+"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n"
+"impostare checkout.defaultRemote=origin nel tuo file di configurazione."
+
+#: builtin/checkout.c:1163
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' corrisponde a più (%d) branch che ne tracciano uno remoto"
+
+#: builtin/checkout.c:1229
+msgid "only one reference expected"
+msgstr "atteso solo un riferimento"
+
+#: builtin/checkout.c:1246
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "atteso solo un riferimento, %d specificati."
+
+#: builtin/checkout.c:1292 builtin/worktree.c:342 builtin/worktree.c:510
 #, c-format
 msgid "invalid reference: %s"
 msgstr "riferimento non valido: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1305 builtin/checkout.c:1671
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "il riferimento non è un albero: %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1352
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "atteso branch, ricevuto tag '%s'"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1354
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "atteso branch, ricevuto branch remoto '%s'"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1355 builtin/checkout.c:1363
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "atteso branch, ricevuto '%s'"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1358
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "atteso branch, ricevuto commit '%s'"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1374
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10661,7 +12165,7 @@ msgstr ""
 "impossibile cambiare branch durante un merge\n"
 "Considera l'uso di \"git merge --quit\" o di \"git worktree add\"."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1378
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10669,7 +12173,7 @@ msgstr ""
 "impossibile cambiare branch nel bel mezzo di una sessione am\n"
 "Considera l'uso di \"git am --quit\" o di \"git worktree add\"."
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1382
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10677,7 +12181,7 @@ msgstr ""
 "impossibile cambiare branch durante un rebase\n"
 "Considera l'uso di \"git rebase --quit\" o di \"git worktree add\"."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1386
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10685,7 +12189,7 @@ msgstr ""
 "impossibile cambiare branch durante un cherry-pick\n"
 "Considera l'uso di \"git cherry-pick --quit\" o di \"git worktree add\"."
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1390
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10693,142 +12197,149 @@ msgstr ""
 "impossibile cambiare branch durante un revert\n"
 "Considera l'uso di \"git revert --quit\" o di \"git worktree add\"."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1394
 msgid "you are switching branch while bisecting"
 msgstr "stai cambiando branch durante una bisezione"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1401
 msgid "paths cannot be used with switching branches"
 msgstr "i percorsi non possono essere usati passando da un branch a un altro"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1404 builtin/checkout.c:1408 builtin/checkout.c:1412
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' non può essere usato passando da un branch a un altro"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1416 builtin/checkout.c:1419 builtin/checkout.c:1422
+#: builtin/checkout.c:1427 builtin/checkout.c:1432
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' non può essere usato con '%s'"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1429
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' non accetta l'argomento <punto di partenza>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1437
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Impossibile cambiare branch per passare a '%s' che non è un commit"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1444
 msgid "missing branch or commit argument"
 msgstr "argomento branch o commit mancante"
 
-#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
-#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
-#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
+#: builtin/checkout.c:1486 builtin/clone.c:91 builtin/commit-graph.c:84
+#: builtin/commit-graph.c:222 builtin/fetch.c:172 builtin/merge.c:287
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:551
+#: builtin/send-pack.c:192
 msgid "force progress reporting"
 msgstr "forza l'indicazione d'avanzamento dell'operazione"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1487
 msgid "perform a 3-way merge with the new branch"
 msgstr "esegui un merge a tre vie con il nuovo branch"
 
-#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318
+#: builtin/checkout.c:1488 builtin/log.c:1795 parse-options.h:322
 msgid "style"
 msgstr "stile"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1489
 msgid "conflict style (merge or diff3)"
 msgstr "stile conflitti (merge o diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:503
+#: builtin/checkout.c:1501 builtin/worktree.c:558
 msgid "detach HEAD at named commit"
 msgstr "scollega l'HEAD al commit specificato"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1502
 msgid "set upstream info for new branch"
 msgstr "imposta le informazioni sull'upstream per il nuovo branch"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1504
 msgid "force checkout (throw away local modifications)"
 msgstr "esegui forzatamente il checkout (scarta le modifiche locali)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1506
 msgid "new-branch"
 msgstr "nuovo branch"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1506
 msgid "new unparented branch"
 msgstr "nuovo branch senza genitore"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1508 builtin/merge.c:291
 msgid "update ignored files (default)"
 msgstr "aggiorna i file ignorati (impostazione predefinita)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1511
 msgid "do not check if another worktree is holding the given ref"
 msgstr ""
 "non controllare se un altro albero di lavoro contiene il riferimento "
 "specificato"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1524
 msgid "checkout our version for unmerged files"
 msgstr ""
 "esegui il checkout della nostra versione per i file non sottoposti a merge"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1527
 msgid "checkout their version for unmerged files"
 msgstr ""
 "esegui il checkout della loro versione per i file non sottoposti a merge"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1531
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "non limitare gli specificatori percorso solo alle voci sparse"
 
-#: builtin/checkout.c:1533
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "le opzioni -b, -B e --orphan sono mutuamente esclusive"
+#: builtin/checkout.c:1586
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "le opzioni -%c, -%c e --orphan sono mutuamente esclusive"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1590
 msgid "-p and --overlay are mutually exclusive"
 msgstr "le opzioni -p e --overlay sono mutualmente esclusive"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1627
 msgid "--track needs a branch name"
 msgstr "--track richiede il nome di un branch"
 
-#: builtin/checkout.c:1578
-msgid "missing branch name; try -b"
-msgstr "nome del branch mancante; prova con -b"
+#: builtin/checkout.c:1632
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "nome del branch mancante; prova con -%c"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1664
 #, c-format
 msgid "could not resolve %s"
 msgstr "impossibile risolvere %s"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "devi specificare il percorso/i percorsi da ripristinare"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1680
 msgid "invalid path specification"
 msgstr "specificatore percorso non valido"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1687
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
 "'%s' non è un commit e non si può creare un branch '%s' che parta da esso"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1691
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach non accetta un percorso '%s' come argomento"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1700
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file non è compatibile con --detach"
+
+#: builtin/checkout.c:1703 builtin/reset.c:325 builtin/stash.c:1500
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file non è compatibile con --patch"
+
+#: builtin/checkout.c:1716
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10836,137 +12347,111 @@ msgstr ""
 "git checkout: --ours/--theirs, --force e --merge sono incompatibili quando\n"
 "si esegue il checkout dell'indice."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' corrisponde a più di un branch remoto.\n"
-"Abbiamo trovato %d remoti con un riferimento corrispondente, per cui\n"
-"abbiamo ripiegato tentando di risolvere l'argomento come percorso, ma\n"
-"non siamo riusciti nemmeno a portare a termine tale operazione!\n"
-"\n"
-"Se intendevi eseguire il checkout di un branch remoto, ad es. 'origin',\n"
-"puoi farlo usando la versione completamente qualificata del nome\n"
-"con l'opzione --track:\n"
-"\n"
-"    git checkout --track origin/<nome>\n"
-"\n"
-"Se preferisci che i checkout di un <nome> ambiguo siano sempre risolti\n"
-"rispetto a un particolare remoto, ad es. 'origin', potresti voler\n"
-"impostare checkout.defaultRemote=origin nel tuo file di configurazione."
+#: builtin/checkout.c:1721
+msgid "you must specify path(s) to restore"
+msgstr "devi specificare il percorso/i percorsi da ripristinare"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
-#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: builtin/checkout.c:1747 builtin/checkout.c:1749 builtin/checkout.c:1798
+#: builtin/checkout.c:1800 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/submodule--helper.c:2719 builtin/worktree.c:554
+#: builtin/worktree.c:556
 msgid "branch"
 msgstr "branch"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1748
 msgid "create and checkout a new branch"
 msgstr "crea un nuovo branch ed eseguine il checkout"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1750
 msgid "create/reset and checkout a branch"
 msgstr "crea/reimposta un branch ed eseguine il checkout"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1751
 msgid "create reflog for new branch"
 msgstr "crea il registro dei riferimenti per il nuovo branch"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1753
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "prevedi 'git checkout <branch inesistente>' (impostazione predefinita)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1754
 msgid "use overlay mode (default)"
 msgstr "usa modalità overlay (impostazione predefinita)"
 
-#: builtin/checkout.c:1743
+#: builtin/checkout.c:1799
 msgid "create and switch to a new branch"
 msgstr "crea un nuovo branch e passa a quest'ultimo"
 
-#: builtin/checkout.c:1745
+#: builtin/checkout.c:1801
 msgid "create/reset and switch to a branch"
 msgstr "crea/reimposta un branch e passa a quest'ultimo"
 
-#: builtin/checkout.c:1747
+#: builtin/checkout.c:1803
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "prevedi 'git switch <branch inesistente>'"
 
-#: builtin/checkout.c:1749
+#: builtin/checkout.c:1805
 msgid "throw away local modifications"
 msgstr "scarta le modifiche locali"
 
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1839
 msgid "which tree-ish to checkout from"
 msgstr "albero da cui eseguire il checkout"
 
-#: builtin/checkout.c:1783
+#: builtin/checkout.c:1841
 msgid "restore the index"
 msgstr "ripristina l'indice"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1843
 msgid "restore the working tree (default)"
 msgstr "ripristina l'albero di lavoro (impostazione predefinita)"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1845
 msgid "ignore unmerged entries"
 msgstr "ignora voci non sottoposte a merge"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1846
 msgid "use overlay mode"
 msgstr "usa modalità overlay"
 
-#: builtin/clean.c:28
+#: 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 <pattern>] [-x | -X] [--] "
 "<percorsi>..."
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Eliminazione di %s in corso\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Eliminerei %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Salto il repository %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Salterei il repository %s\n"
 
-#: builtin/clean.c:36
+#: builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "eliminazione di %s non riuscita"
 
-#: builtin/clean.c:37
+#: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "impossibile eseguire l'lstat di %s\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:593
+#: builtin/clean.c:302 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10979,7 +12464,7 @@ msgstr ""
 "pippo      - seleziona un elemento basandoti su un prefisso univoco\n"
 "           - (vuoto) non selezionare niente\n"
 
-#: builtin/clean.c:305 git-add--interactive.perl:602
+#: builtin/clean.c:306 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -11000,38 +12485,33 @@ msgstr ""
 "*          - seleziona tutti gli elementi\n"
 "           - (vuoto) termina il processo di selezione\n"
 
-#: builtin/clean.c:521 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Eh (%s)?\n"
 
-#: builtin/clean.c:663
+#: builtin/clean.c:661
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Immetti i pattern da ignorare>> "
 
-#: builtin/clean.c:700
+#: builtin/clean.c:696
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ATTENZIONE: Impossibile trovare elementi corrispondenti a %s"
 
-#: builtin/clean.c:721
+#: builtin/clean.c:717
 msgid "Select items to delete"
 msgstr "Seleziona gli elementi da eliminare"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:758
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Eliminare %s [y/N]? "
 
-#: builtin/clean.c:787 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Ciao.\n"
-
-#: builtin/clean.c:795
+#: builtin/clean.c:789
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -11050,64 +12530,52 @@ msgstr ""
 "help                - visualizza questa schermata\n"
 "?                   - guida al prompt di selezione"
 
-#: builtin/clean.c:822 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Comandi ***"
-
-#: builtin/clean.c:823 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Cosa faccio ora"
-
-#: builtin/clean.c:831
+#: builtin/clean.c:825
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Eliminerei il seguente elemento:"
 msgstr[1] "Eliminerei i seguenti elementi:"
 
-#: builtin/clean.c:847
+#: builtin/clean.c:841
 msgid "No more files to clean, exiting."
 msgstr "Non ci sono più file da ripulire, esco."
 
-#: builtin/clean.c:909
+#: builtin/clean.c:903
 msgid "do not print names of files removed"
 msgstr "non stampare i nomi dei file eliminati"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:905
 msgid "force"
 msgstr "forza l'operazione"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:906
 msgid "interactive cleaning"
 msgstr "pulizia interattiva"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:908
 msgid "remove whole directories"
 msgstr "rimuovi intere directory"
 
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:910 builtin/log.c:181 builtin/log.c:183
+#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "pattern"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:910
 msgid "add <pattern> to ignore rules"
 msgstr "aggiungi <pattern> alle regole usate per ignorare i file"
 
-#: builtin/clean.c:917
+#: builtin/clean.c:911
 msgid "remove ignored files, too"
 msgstr "elimina anche i file ignorati"
 
-#: builtin/clean.c:919
+#: builtin/clean.c:913
 msgid "remove only ignored files"
 msgstr "elimina solo i file ignorati"
 
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x e -X non possono essere usati insieme"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:929
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -11115,7 +12583,7 @@ msgstr ""
 "clean.requireForce è impostato a true e né -i, né -n, né -f sono stati "
 "specificati; mi rifiuto di eseguire la pulizia"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:932
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -11123,31 +12591,35 @@ msgstr ""
 "clean.requireForce è true per impostazione predefinita e né -i, né -n, né -f "
 "sono stati specificati; mi rifiuto di eseguire la pulizia"
 
+#: builtin/clean.c:944
+msgid "-x and -X cannot be used together"
+msgstr "-x e -X non possono essere usati insieme"
+
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<opzioni>] [--] <repository> [<directory>]"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:93
 msgid "don't create a checkout"
 msgstr "non creare un checkout"
 
-#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:553
 msgid "create a bare repository"
 msgstr "crea un repository spoglio"
 
-#: builtin/clone.c:97
+#: builtin/clone.c:98
 msgid "create a mirror repository (implies bare)"
 msgstr "crea un repository mirror (implica che sia spoglio)"
 
-#: builtin/clone.c:99
+#: builtin/clone.c:100
 msgid "to clone from a local repository"
 msgstr "per clonare da un repository locale"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:102
 msgid "don't use local hardlinks, always copy"
 msgstr "non usare i collegamenti reali locali, copia sempre i file"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:104
 msgid "setup as shared repository"
 msgstr "imposta il repository come condiviso"
 
@@ -11159,128 +12631,136 @@ msgstr "specificatore percorso"
 msgid "initialize submodules in the clone"
 msgstr "inizializza sottomoduli durante la clonazione"
 
-#: builtin/clone.c:109
+#: builtin/clone.c:110
 msgid "number of submodules cloned in parallel"
 msgstr "numero di sottomoduli clonati in parallelo"
 
-#: builtin/clone.c:110 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:550
 msgid "template-directory"
 msgstr "directory modelli"
 
-#: builtin/clone.c:111 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:551
 msgid "directory from which templates will be used"
 msgstr "directory da cui saranno recuperati i modelli"
 
-#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
 msgid "reference repository"
 msgstr "repository di riferimento"
 
-#: builtin/clone.c:117 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1833
+#: builtin/submodule--helper.c:2338
 msgid "use --reference only while cloning"
 msgstr "usa --reference solo durante la clonazione"
 
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:320
+#: builtin/clone.c:119 builtin/column.c:27 builtin/init-db.c:561
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:332
 msgid "name"
 msgstr "nome"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:120
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "usa <nome> anziché 'origin' per tracciare l'upstream"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:122
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "esegui il checkout di <branch> anziché dell'HEAD del remoto"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:124
 msgid "path to git-upload-pack on the remote"
 msgstr "percorso al comando remoto git-upload-pack"
 
-#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:125 builtin/fetch.c:173 builtin/grep.c:849
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "profondità"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:126
 msgid "create a shallow clone of that depth"
 msgstr "crea un clone shallow con questa profondità"
 
-#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
+#: builtin/clone.c:127 builtin/fetch.c:175 builtin/pack-objects.c:3535
+#: builtin/pull.c:211
 msgid "time"
 msgstr "tempo"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:128
 msgid "create a shallow clone since a specific time"
 msgstr "crea un clone shallow a partire dall'istante specificato"
 
-#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
-#: builtin/rebase.c:1417
+#: builtin/clone.c:129 builtin/fetch.c:177 builtin/fetch.c:200
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1311
 msgid "revision"
 msgstr "revisione"
 
-#: builtin/clone.c:129 builtin/fetch.c:172
+#: builtin/clone.c:130 builtin/fetch.c:178 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr ""
 "aumenta la profondità della cronologia del clone shallow fino alla revisione "
 "specificata esclusa"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:132 builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c:2352
 msgid "clone only one branch, HEAD or --branch"
 msgstr "clona solo un branch, HEAD o quello specificato con --branch"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:134
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "non clonare alcun tag e fai sì che i fetch successivi non li seguano"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:136
 msgid "any cloned submodules will be shallow"
 msgstr "tutti i sottomoduli clonati saranno shallow"
 
-#: builtin/clone.c:136 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:559
 msgid "gitdir"
 msgstr "directory Git"
 
-#: builtin/clone.c:137 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:560
 msgid "separate git dir from working tree"
 msgstr "separa la directory Git dall'albero di lavoro"
 
-#: builtin/clone.c:138
+#: builtin/clone.c:139
 msgid "key=value"
 msgstr "chiave=valore"
 
-#: builtin/clone.c:139
+#: builtin/clone.c:140
 msgid "set config inside the new repository"
 msgstr "imposta la configurazione nel nuovo repository"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:560 builtin/send-pack.c:190
 msgid "server-specific"
 msgstr "specifica del server"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:195 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:560 builtin/send-pack.c:191
 msgid "option to transmit"
 msgstr "opzione da trasmettere"
 
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
-#: builtin/push.c:573
+#: builtin/clone.c:143 builtin/fetch.c:196 builtin/pull.c:234
+#: builtin/push.c:561
 msgid "use IPv4 addresses only"
 msgstr "usa solo indirizzi IPv4"
 
-#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
-#: builtin/push.c:575
+#: builtin/clone.c:145 builtin/fetch.c:198 builtin/pull.c:237
+#: builtin/push.c:563
 msgid "use IPv6 addresses only"
 msgstr "usa solo indirizzi IPv6"
 
-#: builtin/clone.c:148
+#: builtin/clone.c:149
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr ""
 "tutti i sottomoduli clonati useranno il loro rispettivo branch remoto "
 "tracciato"
 
-#: builtin/clone.c:284
+#: builtin/clone.c:151
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+"inizializza il file sparse-checkout per includere solo i file nel percorso "
+"radice"
+
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11288,42 +12768,42 @@ msgstr ""
 "Non è stato possibile indovinare alcun nome directory.\n"
 "Specifica una directory tramite la riga di comando"
 
-#: builtin/clone.c:337
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "informazione: Impossibile aggiungere un alternato a '%s': %s\n"
 
-#: builtin/clone.c:410
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s esiste e non è una directory"
 
-#: builtin/clone.c:427
+#: builtin/clone.c:431
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "impossibile avviare l'iteratore su '%s'"
 
-#: builtin/clone.c:457
+#: builtin/clone.c:462
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "creazione del collegamento '%s' non riuscita"
 
-#: builtin/clone.c:461
+#: builtin/clone.c:466
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "copia del file in '%s' non riuscita"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:471
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "iterazione su '%s' non riuscita"
 
-#: builtin/clone.c:491
+#: builtin/clone.c:498
 #, c-format
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: builtin/clone.c:505
+#: builtin/clone.c:512
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11334,98 +12814,108 @@ msgstr ""
 "con 'git status' e riprovare ad eseguire il checkout con\n"
 "'git restore --source=HEAD :/'\n"
 
-#: builtin/clone.c:582
+#: builtin/clone.c:589
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "Impossibile trovare il branch remoto %s da clonare."
 
-#: builtin/clone.c:701
+#: builtin/clone.c:708
 #, c-format
 msgid "unable to update %s"
 msgstr "impossibile aggiornare %s"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:756
+msgid "failed to initialize sparse-checkout"
+msgstr "inizializzazione del file sparse-checkout non riuscita"
+
+#: builtin/clone.c:779
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
 "l'HEAD remoto fa riferimento a un riferimento inesistente, impossibile "
 "eseguire il checkout.\n"
 
-#: builtin/clone.c:782
+#: builtin/clone.c:811
 msgid "unable to checkout working tree"
 msgstr "impossibile eseguire il checkout dell'albero di lavoro"
 
-#: builtin/clone.c:832
+#: builtin/clone.c:868
 msgid "unable to write parameters to config file"
 msgstr "impossibile scrivere i parametri nel file di configurazione"
 
-#: builtin/clone.c:895
+#: builtin/clone.c:931
 msgid "cannot repack to clean up"
 msgstr "impossibile eseguire il repack per pulire l'area di lavoro"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:933
 msgid "cannot unlink temporary alternates file"
 msgstr "impossibile eseguire l'unlink del file alternates temporaneo"
 
-#: builtin/clone.c:937 builtin/receive-pack.c:1948
+#: builtin/clone.c:970 builtin/receive-pack.c:2434
 msgid "Too many arguments."
 msgstr "Troppi argomenti."
 
-#: builtin/clone.c:941
+#: builtin/clone.c:974
 msgid "You must specify a repository to clone."
 msgstr "Devi specificare un repository da clonare."
 
-#: builtin/clone.c:954
+#: builtin/clone.c:987
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "le opzioni --bare e --origin %s non sono compatibili."
 
-#: builtin/clone.c:957
+#: builtin/clone.c:990
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "le opzioni --bare e --separate-git-dir non sono compatibili."
 
-#: builtin/clone.c:970
+#: builtin/clone.c:1006
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "il repository '%s' non esiste"
 
-#: builtin/clone.c:976 builtin/fetch.c:1790
+#: builtin/clone.c:1010 builtin/fetch.c:1841
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "la profondità %s non è un numero positivo"
 
-#: builtin/clone.c:986
+#: builtin/clone.c:1020
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr ""
 "il percorso di destinazione '%s' esiste già e non è una directory vuota."
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1026
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr ""
+"il percorso del repository '%s' esiste già e non è una directory vuota."
+
+#: builtin/clone.c:1040
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "l'albero di lavoro '%s' esiste già."
 
-#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
-#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
+#: builtin/clone.c:1055 builtin/clone.c:1076 builtin/difftool.c:271
+#: builtin/log.c:1970 builtin/worktree.c:354 builtin/worktree.c:386
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "impossibile creare le prime directory di '%s'"
 
-#: builtin/clone.c:1016
+#: builtin/clone.c:1060
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "impossibile creare la directory dell'albero di lavoro '%s'"
 
-#: builtin/clone.c:1036
+#: builtin/clone.c:1080
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Clone nel repository spoglio '%s' in corso...\n"
 
-#: builtin/clone.c:1038
+#: builtin/clone.c:1082
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Clone in '%s' in corso...\n"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1106
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11433,36 +12923,36 @@ msgstr ""
 "il clone --recursive non è compatibile né con --reference né con --reference-"
 "if-able"
 
-#: builtin/clone.c:1123
+#: builtin/clone.c:1170
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "L'opzione --depth è ignorata nei cloni locali; usa file://."
 
-#: builtin/clone.c:1125
+#: builtin/clone.c:1172
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "L'opzione --shallow-since è ignorata nei cloni locali; usa file://."
 
-#: builtin/clone.c:1127
+#: builtin/clone.c:1174
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "L'opzione --shallow-exclude è ignorata nei cloni locali; usa file://."
 
-#: builtin/clone.c:1129
+#: builtin/clone.c:1176
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "L'opzione --filter è ignorata nei cloni locali; usa file://."
 
-#: builtin/clone.c:1132
+#: builtin/clone.c:1179
 msgid "source repository is shallow, ignoring --local"
 msgstr "il repository sorgente è shallow, ignoro l'opzione --local"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1184
 msgid "--local is ignored"
 msgstr "l'opzione --local è ignorata"
 
-#: builtin/clone.c:1212 builtin/clone.c:1220
+#: builtin/clone.c:1268 builtin/clone.c:1276
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Il branch remoto %s non è stato trovato nell'upstream %s"
 
-#: builtin/clone.c:1223
+#: builtin/clone.c:1279
 msgid "You appear to have cloned an empty repository."
 msgstr "Sembra che tu abbia clonato un repository vuoto."
 
@@ -11498,6 +12988,112 @@ msgstr "Spazi vuoti fra le colonne"
 msgid "--command must be the first argument"
 msgstr "--command deve essere il primo argomento"
 
+#: 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 <directory oggetti>] [--shallow] [--"
+"[no-]progress]"
+
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+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 <directory oggetti>] [--append] [--"
+"split[=<strategia>]] [--reachable|--stdin-packs|--stdin-commits] [--changed-"
+"paths] [--[no-]max-new-filters <n>] [--[no-]progress] <opzioni split>"
+
+#: builtin/commit-graph.c:64
+#, c-format
+msgid "could not find object directory matching %s"
+msgstr "impossibile trovare la directory oggetti corrispondente a %s"
+
+#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
+#: builtin/commit-graph.c:316 builtin/fetch.c:184 builtin/log.c:1764
+msgid "dir"
+msgstr "directory"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "The object directory to store the graph"
+msgstr "La directory oggetti in cui memorizzare il grafo"
+
+#: builtin/commit-graph.c:83
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "se il grafo dei commit è diviso, verifica solo l'ultimo file"
+
+#: builtin/commit-graph.c:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Impossibile aprire il grafo dei commit '%s'"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "argomento --split non riconosciuto, %s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "ID oggetto non esadecimale inatteso: %s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "oggetto non valido: %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "inizia la visita da tutti i riferimenti"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+"esamina i pack-index elencati sullo standard input alla ricerca di commit"
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr "inizia la visita ai commit elencati sullo standard input"
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr "includi tutti i commit già presenti nel file commit-graph"
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr "abilita calcolo percorsi modificati"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "consenti la scrittura di un file grafo dei commit incrementale"
+
+#: builtin/commit-graph.c:228
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "numero massimo di commit in un grafo dei commit diviso non di base"
+
+#: builtin/commit-graph.c:230
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "rapporto massimo fra due livelli di un grafo dei commit diviso"
+
+#: builtin/commit-graph.c:232
+msgid "only expire files older than a given date-time"
+msgstr "fai scadere solo i file più vecchi di una determinata data e ora"
+
+#: builtin/commit-graph.c:234
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr ""
+"numero massimo dei filtri di Bloom per i percorsi modificati da calcolare"
+
+#: builtin/commit-graph.c:255
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "usa al più un'opzione fra --reachable, --stdin-commits o --stdin-packs"
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr "Raccolta dei commit dall'input in corso"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -11511,7 +13107,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "genitore duplicato %s ignorato"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:546
 #, c-format
 msgid "not a valid object name %s"
 msgstr "%s non è un nome oggetto valido"
@@ -11539,13 +13135,13 @@ msgstr "genitore"
 msgid "id of a parent commit object"
 msgstr "ID di un oggetto commit genitore"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1504 builtin/merge.c:272
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1471
+#: builtin/tag.c:413
 msgid "message"
 msgstr "messaggio"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
 msgid "commit message"
 msgstr "messaggio di commit"
 
@@ -11553,8 +13149,8 @@ msgstr "messaggio di commit"
 msgid "read commit log message from file"
 msgstr "leggi il messaggio di log del commit da un file"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:289
+#: builtin/pull.c:176 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "firma il commit con GPG"
 
@@ -11601,10 +13197,14 @@ msgstr ""
 "\n"
 
 #: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Altrimenti, usa 'git rebase --skip'\n"
+
+#: builtin/commit.c:66
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Altrimenti, usa 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:69
 msgid ""
 "and then use:\n"
 "\n"
@@ -11626,61 +13226,74 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:315
+#: builtin/commit.c:312
 msgid "failed to unpack HEAD tree object"
 msgstr "decompressione dell'oggetto HEAD dell'albero non riuscita"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:348
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "l'opzione --pathspec-from-file non ha senso con -a"
+
+#: builtin/commit.c:361
+msgid "No paths with --include/--only does not make sense."
+msgstr ""
+"Non specificare un percorso con le opzioni --include/--only non ha senso."
+
+#: builtin/commit.c:373
 msgid "unable to create temporary index"
 msgstr "impossibile creare l'indice temporaneo"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:382
 msgid "interactive add failed"
 msgstr "aggiunta interattiva non riuscita"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:397
 msgid "unable to update temporary index"
 msgstr "impossibile aggiornare l'indice temporaneo"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:399
 msgid "Failed to update main cache tree"
 msgstr "Impossibile aggiornare l'albero cache principale"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
 msgid "unable to write new_index file"
 msgstr "impossibile scrivere il file new_index"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:476
 msgid "cannot do a partial commit during a merge."
 msgstr "impossibile eseguire un commit parziale durante un merge."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:478
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "impossibile eseguire un commit parziale durante un cherry-pick."
 
-#: builtin/commit.c:465
+#: builtin/commit.c:480
+msgid "cannot do a partial commit during a rebase."
+msgstr "impossibile eseguire un commit parziale durante un rebase."
+
+#: builtin/commit.c:488
 msgid "cannot read the index"
 msgstr "impossibile leggere l'indice"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:507
 msgid "unable to write temporary index file"
 msgstr "impossibile scrivere il file indice temporaneo"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:605
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "dal commit '%s' manca l'intestazione autore"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:607
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "il commit '%s' ha una riga autore malformata"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:626
 msgid "malformed --author parameter"
 msgstr "parametro --author malformato"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:679
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11688,68 +13301,66 @@ msgstr ""
 "impossibile selezionare un carattere commento non usato\n"
 "nel messaggio di commit corrente"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "impossibile trovare il commit %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:478
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(lettura del messaggio di log dallo standard input)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:731
 msgid "could not read log from standard input"
 msgstr "impossibile leggere il log dallo standard input"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:735
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "impossibile leggere il file di log '%s'"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:766 builtin/commit.c:782
 msgid "could not read SQUASH_MSG"
 msgstr "impossibile leggere SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:773
 msgid "could not read MERGE_MSG"
 msgstr "impossibile leggere MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:833
 msgid "could not write commit template"
 msgstr "impossibile scrivere il modello di commit"
 
-#: builtin/commit.c:829
-#, c-format
+#: builtin/commit.c:853
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d MERGE_HEAD\n"
 "and try again.\n"
 msgstr ""
 "\n"
 "Sembra che tu stia eseguendo il commit di un merge.\n"
-"Se ciò non è corretto, elimina il file\n"
-"\t%s\n"
+"Se ciò non è corretto, esegui\n"
+"\tgit update-ref -d MERGE_HEAD\n"
 "e riprova.\n"
 
-#: builtin/commit.c:834
-#, c-format
+#: builtin/commit.c:858
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "and try again.\n"
 msgstr ""
 "\n"
-"Sembra che tu stia eseguendo il commit di un merge.\n"
-"Se ciò non è corretto, elimina il file\n"
-"\t%s\n"
+"Sembra che tu stia eseguendo il commit di un cherry-pick.\n"
+"Se ciò non è corretto, esegui\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "e riprova.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:868
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11758,7 +13369,7 @@ msgstr ""
 "Immetti il messaggio di commit per le modifiche. Le righe che iniziano\n"
 "con '%c' saranno ignorate e un messaggio vuoto interromperà il commit.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:876
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11769,149 +13380,148 @@ msgstr ""
 "con '%c' saranno mantenute; puoi rimuoverle autonomamente se lo desideri.\n"
 "Un messaggio vuoto interromperà il commit.\n"
 
-#: builtin/commit.c:872
+#: builtin/commit.c:893
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sAutore:           %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:901
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:             %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:908
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sEsecutore commit: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:926
 msgid "Cannot read index"
 msgstr "Impossibile leggere l'indice"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr "Errore durante la costruzione degli alberi"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1011 builtin/tag.c:276
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Fornisci il messaggio usando l'opzione -m o -F.\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
 "--author '%s' non è nel formato 'Nome <e-mail>' e non corrisponde ad alcun "
 "autore esistente"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Modo non valido ignorato: '%s'"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1087 builtin/commit.c:1331
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Modo file non tracciati non valido: '%s'"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr "--long e -z non sono compatibili"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "L'uso di entrambe le opzioni --reset-author e --author non ha senso"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "Non c'è nulla da modificare."
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Sei nel bel mezzo di un merge - impossibile eseguire l'amend."
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Sei nel bel mezzo di un cherry-pick - impossibile eseguire l'amend."
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1187
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Sei nel bel mezzo di un rebase - impossibile eseguire l'amend."
+
+#: builtin/commit.c:1190
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Le opzioni --squash e --fixup non possono essere usate insieme"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1200
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Solo una delle opzioni -c/-C/-F/--fixup può essere usata."
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1202
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "L'opzione -m non può essere combinata con -c/-C/-F."
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1211
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "L'opzione --reset-author può essere usata solo con -C, -c o --amend."
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1229
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr ""
 "Può essere usata solo una delle opzioni --include/--only/--all/--"
 "interactive/--patch."
 
-#: builtin/commit.c:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr ""
-"Non specificare un percorso con le opzioni --include/--only non ha senso."
-
-#: builtin/commit.c:1208
+#: builtin/commit.c:1235
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "i percorsi '%s ...' non hanno senso con -a"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1366 builtin/commit.c:1527
 msgid "show status concisely"
 msgstr "visualizza concisamente lo stato"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1368 builtin/commit.c:1529
 msgid "show branch information"
 msgstr "visualizza le informazioni sul branch"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1370
 msgid "show stash information"
 msgstr "visualizza le informazioni sullo stash"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1372 builtin/commit.c:1531
 msgid "compute full ahead/behind values"
 msgstr "calcola tutti i valori dopo/prima di"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1374
 msgid "version"
 msgstr "versione"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
-#: builtin/worktree.c:650
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:539
+#: builtin/worktree.c:722
 msgid "machine-readable output"
 msgstr "output leggibile da una macchina"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1377 builtin/commit.c:1535
 msgid "show status in long format (default)"
 msgstr "visualizza lo stato in forma lunga (impostazione predefinita)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1380 builtin/commit.c:1538
 msgid "terminate entries with NUL"
 msgstr "termina le voci con NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
+#: 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:1400 parse-options.h:336
 msgid "mode"
 msgstr "modo"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1383 builtin/commit.c:1541
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "visualizza file non tracciati, modalità facoltative: all, normal, no. "
 "(Impostazione predefinita: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1387
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11919,11 +13529,11 @@ msgstr ""
 "visualizza file ignorati, modalità facoltative: traditional, matching, no. "
 "(Impostazione predefinita: traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:188
+#: builtin/commit.c:1389 parse-options.h:192
 msgid "when"
 msgstr "quando"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1390
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11931,175 +13541,175 @@ msgstr ""
 "ignora modifiche ai sottomoduli, opzione facoltativa \"quando\": all, dirty, "
 "untracked. (Impostazione predefinita: all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1392
 msgid "list untracked files in columns"
 msgstr "elenca i file non tracciati in colonne"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1393
 msgid "do not detect renames"
 msgstr "non rilevare le ridenominazioni"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1395
 msgid "detect renames, optionally set similarity index"
 msgstr ""
 "rileva le ridenominazioni, imposta facoltativamente l'indice di similarità"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1415
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr ""
 "Combinazione di argomenti sui file ignorati e non tracciati non supportata"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1497
 msgid "suppress summary after successful commit"
 msgstr ""
 "ometti di visualizzare il riepilogo dopo un commit completato con successo"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1498
 msgid "show diff in commit message template"
 msgstr "visualizza il diff nel modello del messaggio di commit"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1500
 msgid "Commit message options"
 msgstr "Opzioni messaggio di commit"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1501 builtin/merge.c:276 builtin/tag.c:415
 msgid "read message from file"
 msgstr "leggi il messaggio da un file"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1502
 msgid "author"
 msgstr "autore"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1502
 msgid "override author for commit"
 msgstr "sovrascrivi l'autore per il commit"
 
-#: builtin/commit.c:1499 builtin/gc.c:538
+#: builtin/commit.c:1503 builtin/gc.c:539
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1503
 msgid "override date for commit"
 msgstr "sovrascrivi la data per il commit"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1505
 msgid "reuse and edit message from specified commit"
 msgstr "riusa il messaggio del commit specificato per poi modificarlo"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1506
 msgid "reuse message from specified commit"
 msgstr "riusa il messaggio del commit specificato"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1507
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr ""
 "usa il messaggio in formato autosquash per correggere il commit specificato"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1508
 msgid "use autosquash formatted message to squash specified commit"
 msgstr ""
 "usa il messaggio in formato autosquash per eseguire lo squash del commit "
 "specificato"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1509
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "il commit ora ha me come autore (opzione usata con -C/-c/--amend)"
 
-#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
+#: builtin/commit.c:1510 builtin/log.c:1741 builtin/merge.c:292
+#: builtin/pull.c:145 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "aggiungi Signed-off-by:"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1511
 msgid "use specified template file"
 msgstr "usa il file modello specificato"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1512
 msgid "force edit of commit"
 msgstr "forza la modifica del commit"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1514
 msgid "include status in commit message template"
 msgstr "includi lo stato nel modello del messaggio di commit"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1519
 msgid "Commit contents options"
 msgstr "Opzioni contenuto commit"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1520
 msgid "commit all changed files"
 msgstr "esegui il commit di tutti i file modificati"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1521
 msgid "add specified files to index for commit"
 msgstr "aggiungi i file specificati all'indice per il commit"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1522
 msgid "interactively add files"
 msgstr "aggiungi i file in modalità interattiva"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1523
 msgid "interactively add changes"
 msgstr "aggiungi le modifiche in modalità interattiva"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1524
 msgid "commit only specified files"
 msgstr "esegui il commit solo dei file specificati"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1525
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "ignora gli hook pre-commit e commit-msg"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1526
 msgid "show what would be committed"
 msgstr "visualizza gli elementi di cui sarebbe eseguito il commit"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1539
 msgid "amend previous commit"
 msgstr "modifica il commit precedente"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1540
 msgid "bypass post-rewrite hook"
 msgstr "ignora l'hook post-rewrite"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1547
 msgid "ok to record an empty change"
 msgstr "accetta di registrare una modifica vuota"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1549
 msgid "ok to record a change with an empty message"
 msgstr "accetta di registrare una modifica con un messaggio vuoto"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1622
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "File MERGE_HEAD corrotto (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1629
 msgid "could not read MERGE_MODE"
 msgstr "impossibile leggere MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1650
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "impossibile leggere il messaggio di commit: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Interrompo il commit a causa di un messaggio di commit vuoto.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1662
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Interrompo il commit; non hai modificato il messaggio.\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1696
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -12111,292 +13721,226 @@ msgstr ""
 "superata, quindi esegui \"git restore --staged :/\" per\n"
 "procedere al ripristino."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <directory oggetti>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <directory oggetti>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-msgid ""
-"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
-msgstr ""
-"git commit-graph verify [--object-dir <directory oggetti>] [--shallow] [--"
-"[no-]progress]"
-
-#: builtin/commit-graph.c:14 builtin/commit-graph.c:29
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <directory oggetti>] [--append|--split] "
-"[--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <opzioni split>"
-
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
-#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
-#: builtin/log.c:1585
-msgid "dir"
-msgstr "directory"
-
-#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
-#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
-msgid "The object directory to store the graph"
-msgstr "La directory oggetti in cui memorizzare il grafo"
-
-#: builtin/commit-graph.c:58
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr "se il grafo dei commit è diviso, verifica solo l'ultimo file"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:125
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Impossibile aprire il grafo dei commit '%s'"
-
-#: builtin/commit-graph.c:173
-msgid "start walk at all refs"
-msgstr "inizia la visita da tutti i riferimenti"
-
-#: builtin/commit-graph.c:175
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr ""
-"esamina i pack-index elencati sullo standard input alla ricerca di commit"
-
-#: builtin/commit-graph.c:177
-msgid "start walk at commits listed by stdin"
-msgstr "inizia la visita ai commit elencati sullo standard input"
-
-#: builtin/commit-graph.c:179
-msgid "include all commits already in the commit-graph file"
-msgstr "includi tutti i commit già presenti nel file commit-graph"
-
-#: builtin/commit-graph.c:182
-msgid "allow writing an incremental commit-graph file"
-msgstr "consenti la scrittura di un file grafo dei commit incrementale"
-
-#: builtin/commit-graph.c:184 builtin/commit-graph.c:188
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "numero massimo di commit in un grafo dei commit diviso non di base"
-
-#: builtin/commit-graph.c:186
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "rapporto massimo fra due livelli di un grafo dei commit diviso"
-
-#: builtin/commit-graph.c:204
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "usa al più un'opzione fra --reachable, --stdin-commits o --stdin-packs"
-
 #: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<opzioni>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:107 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "argomento --type non riconosciuto: %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:119
 msgid "only one type at a time"
 msgstr "solo un tipo per volta"
 
-#: builtin/config.c:124
+#: builtin/config.c:128
 msgid "Config file location"
 msgstr "Percorso file di configurazione"
 
-#: builtin/config.c:125
+#: builtin/config.c:129
 msgid "use global config file"
 msgstr "usa il file di configurazione globale"
 
-#: builtin/config.c:126
+#: builtin/config.c:130
 msgid "use system config file"
 msgstr "usa il file di configurazione di sistema"
 
-#: builtin/config.c:127
+#: builtin/config.c:131
 msgid "use repository config file"
 msgstr "usa il file di configurazione del repository"
 
-#: builtin/config.c:128
+#: builtin/config.c:132
 msgid "use per-worktree config file"
 msgstr "usa il file di configurazione per albero di lavoro"
 
-#: builtin/config.c:129
+#: builtin/config.c:133
 msgid "use given config file"
 msgstr "usa il file di configurazione specificato"
 
-#: builtin/config.c:130
+#: builtin/config.c:134
 msgid "blob-id"
 msgstr "ID blob"
 
-#: builtin/config.c:130
+#: builtin/config.c:134
 msgid "read config from given blob object"
 msgstr "leggi la configurazione dall'oggetto blob specificato"
 
-#: builtin/config.c:131
+#: builtin/config.c:135
 msgid "Action"
 msgstr "Azione"
 
-#: builtin/config.c:132
+#: builtin/config.c:136
 msgid "get value: name [value-regex]"
 msgstr "ottieni valore: nome [espressione-regolare-valore]"
 
-#: builtin/config.c:133
+#: builtin/config.c:137
 msgid "get all values: key [value-regex]"
 msgstr "ottieni tutti i valori: chiave [espressione-regolare-valore]"
 
-#: builtin/config.c:134
+#: builtin/config.c:138
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr ""
 "ottieni i valori in base a un'espressione regolare: espressione-regolare-"
 "nome [espressione-regolare-valore]"
 
-#: builtin/config.c:135
+#: builtin/config.c:139
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "ottieni il valore specifico per l'URL: sezione[.variabile] URL"
 
-#: builtin/config.c:136
+#: builtin/config.c:140
 msgid "replace all matching variables: name value [value_regex]"
 msgstr ""
 "sostituisci tutte le variabili corrispondenti: nome-valore [espressione-"
 "regolare-valore]"
 
-#: builtin/config.c:137
+#: builtin/config.c:141
 msgid "add a new variable: name value"
 msgstr "aggiungi una nuova variabile: nome valore"
 
-#: builtin/config.c:138
+#: builtin/config.c:142
 msgid "remove a variable: name [value-regex]"
 msgstr "rimuovi una variabile: nome [espressione-regolare-valore]"
 
-#: builtin/config.c:139
+#: builtin/config.c:143
 msgid "remove all matches: name [value-regex]"
 msgstr "rimuovi tutte le corrispondenze: nome [espressione-regolare-valore]"
 
-#: builtin/config.c:140
+#: builtin/config.c:144
 msgid "rename section: old-name new-name"
 msgstr "rinomina sezione: vecchio-nome nuovo-nome"
 
-#: builtin/config.c:141
+#: builtin/config.c:145
 msgid "remove a section: name"
 msgstr "rimuovi una sezione: nome"
 
-#: builtin/config.c:142
+#: builtin/config.c:146
 msgid "list all"
 msgstr "elenca tutti"
 
-#: builtin/config.c:143
+#: builtin/config.c:147
 msgid "open an editor"
 msgstr "apri un editor"
 
-#: builtin/config.c:144
+#: builtin/config.c:148
 msgid "find the color configured: slot [default]"
 msgstr "trova il colore configurato: slot [valore-predefinito]"
 
-#: builtin/config.c:145
+#: builtin/config.c:149
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "trova l'impostazione colore: slot [standard-output-è-una-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:150
 msgid "Type"
 msgstr "Tipo"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:151 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "al valore è assegnato questo tipo"
 
-#: builtin/config.c:148
+#: builtin/config.c:152
 msgid "value is \"true\" or \"false\""
 msgstr "il valore è \"true\" o \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:153
 msgid "value is decimal number"
 msgstr "il valore è un numero decimale"
 
-#: builtin/config.c:150
+#: builtin/config.c:154
 msgid "value is --bool or --int"
 msgstr "il valore è --bool o --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:155
+msgid "value is --bool or string"
+msgstr "il valore è --bool o una stringa"
+
+#: builtin/config.c:156
 msgid "value is a path (file or directory name)"
 msgstr "il valore è un percorso (nome file o directory)"
 
-#: builtin/config.c:152
+#: builtin/config.c:157
 msgid "value is an expiry date"
 msgstr "il valore è una data di scadenza"
 
-#: builtin/config.c:153
+#: builtin/config.c:158
 msgid "Other"
 msgstr "Altro"
 
-#: builtin/config.c:154
+#: builtin/config.c:159
 msgid "terminate values with NUL byte"
 msgstr "termina i valori con un byte NUL"
 
-#: builtin/config.c:155
+#: builtin/config.c:160
 msgid "show variable names only"
 msgstr "visualizza solo i nomi delle variabili"
 
-#: builtin/config.c:156
+#: builtin/config.c:161
 msgid "respect include directives on lookup"
 msgstr ""
 "rispetta le directory di inclusione durante il recupero delle variabili"
 
-#: builtin/config.c:157
+#: builtin/config.c:162
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "visualizza l'origine del file di configurazione (file, standard input, blob, "
 "riga di comando)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:163
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"visualizza l'ambito della configurazione (albero di lavoro, locale, globale, "
+"sistema, comando)"
+
+#: builtin/config.c:164 builtin/env--helper.c:45
 msgid "value"
 msgstr "valore"
 
-#: builtin/config.c:158
+#: builtin/config.c:164
 msgid "with --get, use default value when missing entry"
 msgstr "con --get, usa il valore predefinito se la voce è mancante"
 
-#: builtin/config.c:172
+#: builtin/config.c:178
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "numero di argomenti errato, dovrebbero essere %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:180
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "numero di argomenti errato, dovrebbero essere da %d a %d"
 
-#: builtin/config.c:308
+#: builtin/config.c:334
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "pattern chiave non valido: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:370
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "formattazione del valore configurazione predefinito non riuscita: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:434
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "impossibile analizzare il colore '%s'"
 
-#: builtin/config.c:443
+#: builtin/config.c:476
 msgid "unable to parse default color value"
 msgstr "impossibile analizzare il valore colore predefinito"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:529 builtin/config.c:789
 msgid "not in a git directory"
 msgstr "non si è in una directory git"
 
-#: builtin/config.c:499
+#: builtin/config.c:532
 msgid "writing to stdin is not supported"
 msgstr "la scrittura su standard input non è supportata"
 
-#: builtin/config.c:502
+#: builtin/config.c:535
 msgid "writing config blobs is not supported"
 msgstr "la scrittura di blob di configurazione non è supportata"
 
-#: builtin/config.c:587
+#: builtin/config.c:620
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12411,23 +13955,27 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:644
 msgid "only one config file at a time"
 msgstr "solo un file di configurazione per volta"
 
-#: builtin/config.c:616
+#: builtin/config.c:650
 msgid "--local can only be used inside a git repository"
 msgstr "--local può essere usato solo in un repository Git"
 
-#: builtin/config.c:619
+#: builtin/config.c:652
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob può essere usato solo in un repository Git"
 
-#: builtin/config.c:638
+#: builtin/config.c:654
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree può essere usato solo in un repository Git"
+
+#: builtin/config.c:676
 msgid "$HOME not set"
 msgstr "$HOME non impostata"
 
-#: builtin/config.c:658
+#: builtin/config.c:700
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12438,52 +13986,52 @@ msgstr ""
 "Leggi la sezione \"FILE DI CONFIGURAZIONE\" in \"git help worktree\" per\n"
 "i dettagli"
 
-#: builtin/config.c:688
+#: builtin/config.c:735
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color e il tipo della variabile non sono coerenti"
 
-#: builtin/config.c:693
+#: builtin/config.c:740
 msgid "only one action at a time"
 msgstr "solo un'azione per volta"
 
-#: builtin/config.c:706
+#: builtin/config.c:753
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only è applicabile solo a --list o --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:759
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin è applicabile solo a --get, --get-all, --get-regexp e --list"
 
-#: builtin/config.c:718
+#: builtin/config.c:765
 msgid "--default is only applicable to --get"
 msgstr "--default è applicabile solo a --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:778
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "impossibile leggere il file di configurazione '%s'"
 
-#: builtin/config.c:734
+#: builtin/config.c:781
 msgid "error processing config file(s)"
 msgstr "errore durante l'elaborazione del/dei file di configurazione"
 
-#: builtin/config.c:744
+#: builtin/config.c:791
 msgid "editing stdin is not supported"
 msgstr "la modifica dello standard input non è supportata"
 
-#: builtin/config.c:746
+#: builtin/config.c:793
 msgid "editing blobs is not supported"
 msgstr "la modifica dei blob non è supportata"
 
-#: builtin/config.c:760
+#: builtin/config.c:807
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "impossibile creare il file di configurazione %s"
 
-#: builtin/config.c:773
+#: builtin/config.c:820
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12492,7 +14040,7 @@ msgstr ""
 "impossibile sovrascrivere valori multipli con un singolo valore\n"
 "       Usa un'espressione regolare, --add o --replace-all per modificare %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:894 builtin/config.c:905
 #, c-format
 msgid "no such section: %s"
 msgstr "sezione %s non esistente"
@@ -12505,6 +14053,33 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "stampa le dimensioni in un formato leggibile"
 
+#: builtin/credential-cache--daemon.c:226
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"I permessi sulla directory del socket sono troppo laschi; altri\n"
+"utenti potrebbero essere in grado di leggere le credenziali nella\n"
+"cache. Valuta di eseguire:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:275
+msgid "print debugging messages to stderr"
+msgstr "stampa i messaggi di debug sullo standard error"
+
+#: builtin/credential-cache--daemon.c:315
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr ""
+"credential-cache--daemon non disponibile; supporto socket UNIX non presente"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache non disponibile; supporto socket UNIX non presente"
+
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<opzioni>] [<espressione commit>...]"
@@ -12513,51 +14088,46 @@ msgstr "git describe [<opzioni>] [<espressione commit>...]"
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opzioni>] --dirty"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "head"
 msgstr "head"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "leggero"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr "annotato"
 
-#: builtin/describe.c:275
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "il tag annotato %s non è disponibile"
 
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "il tag annotato %s non ha un nome incorporato"
-
 #: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "il tag '%s' in realtà qui è '%s'"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "il tag '%s' è noto all'esterno come '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "nessun tag corrisponde esattamente a '%s'"
 
-#: builtin/describe.c:327
+#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Nessuna corrispondenza esatta sui riferimenti o sui tag, sto eseguendo una "
 "ricerca per descrivere il commit\n"
 
-#: builtin/describe.c:381
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "ricerca terminata in %s\n"
 
-#: builtin/describe.c:407
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12566,7 +14136,7 @@ msgstr ""
 "Nessun tag annotato può descrivere '%s'.\n"
 "Ciò nonostante, c'erano dei tag non annotati: prova con --tags."
 
-#: builtin/describe.c:411
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12575,12 +14145,12 @@ msgstr ""
 "Nessun tag può descrivere '%s'.\n"
 "Prova con --always o crea dei tag."
 
-#: builtin/describe.c:441
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "ho attraversato %lu commit\n"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12589,126 +14159,136 @@ msgstr ""
 "trovati più di %i tag; ho elencato i %i più recenti\n"
 "ho terminato la ricerca in %s\n"
 
-#: builtin/describe.c:512
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "descrivi %s\n"
 
-#: builtin/describe.c:515
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "%s non è un nome oggetto valido"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s non è né un commit né un blob"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "trova il tag successivo al commit"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "esegui il debug della strategia di ricerca sullo standard error"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "usa qualunque riferimento"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "usa qualunque tag, anche quelli non annotati"
 
-#: builtin/describe.c:541
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "usa sempre il formato lungo"
 
-#: builtin/describe.c:542
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "segui solo il primo genitore"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "visualizza solo le corrispondenze esatte"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considera gli <n> tag più recenti (impostazione predefinita: 10)"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "considera solo i tag corrispondenti al <pattern>"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "non considerare i tag corrispondenti al <pattern>"
 
-#: builtin/describe.c:553 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "visualizza l'oggetto commit abbreviato come fallback"
 
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "contrassegno"
 
-#: builtin/describe.c:555
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 "aggiungi <contrassegno> all'albero di lavoro sporco (impostazione "
 "predefinita: \"-dirty\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "aggiungi <contrassegno> all'albero di lavoro rotto (impostazione "
 "predefinita: \"-broken\")"
 
-#: builtin/describe.c:576
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long non è compatibile con --abbrev=0"
 
-#: builtin/describe.c:605
+#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Nessun nome trovato, non è possibile descrivere nulla."
 
-#: builtin/describe.c:656
+#: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty non è compatibile con le espressioni commit"
 
-#: builtin/describe.c:658
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken non è compatibile con le espressioni commit"
 
-#: builtin/diff.c:84
+#: builtin/diff.c:91
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s': non è un file regolare o un collegamento simbolico"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:241
 #, c-format
 msgid "invalid option: %s"
 msgstr "opzione non valida: %s"
 
-#: builtin/diff.c:350
+#: builtin/diff.c:358
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: non esiste una base per il merge"
+
+#: builtin/diff.c:468
 msgid "Not a git repository"
 msgstr "Non è un repository Git"
 
-#: builtin/diff.c:394
+#: builtin/diff.c:513
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "specificato oggetto non valido '%s'."
 
-#: builtin/diff.c:403
+#: builtin/diff.c:524
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "più di due blob specificati: '%s'"
 
-#: builtin/diff.c:408
+#: builtin/diff.c:529
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "specificato oggetto non gestito '%s'."
 
+#: builtin/diff.c:563
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: esistono più basi per il merge, utilizzo %s"
+
 #: builtin/difftool.c:30
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opzioni>] [<commit> [<commit>]] [--] [<percorso>...]"
@@ -12828,28 +14408,28 @@ msgstr "nessun <comando> specificato per --extcmd=<comando>"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <opzioni> <variabile d'ambiente>"
 
-#: builtin/env--helper.c:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
 msgid "type"
 msgstr "tipo"
 
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr ""
 "impostazione predefinita su cui ripiegheranno le chiamate git_env_*(...)"
 
-#: builtin/env--helper.c:43
+#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr ""
 "non visualizzare messaggi, usa solo il valore di git_env_*() come codice "
 "d'uscita"
 
-#: builtin/env--helper.c:62
+#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
 "l'opzione `--default' richiede un valore booleano con `--type=bool`, non `%s`"
 
-#: builtin/env--helper.c:77
+#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -12862,189 +14442,246 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [opzioni-elenco-rev]"
 
-#: builtin/fast-export.c:852
+#: builtin/fast-export.c:868
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr ""
 "Errore: Impossibile esportare i tag nidificati a meno che non sia "
 "specificata l'opzione --mark-tags."
 
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1178
+msgid "--anonymize-map token cannot be empty"
+msgstr "il token --anonymize-map non può essere vuoto"
+
+#: builtin/fast-export.c:1198
 msgid "show progress after <n> objects"
 msgstr "visualizza l'avanzamento dopo <n> oggetti"
 
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1200
 msgid "select handling of signed tags"
 msgstr "seleziona la gestione dei tag firmati"
 
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1203
 msgid "select handling of tags that tag filtered objects"
 msgstr "seleziona la gestione dei tag che contrassegnano oggetti filtrati"
 
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1206
 msgid "select handling of commit messages in an alternate encoding"
 msgstr ""
 "seleziona la gestione dei messaggi di commit in una codifica alternativa"
 
-#: builtin/fast-export.c:1163
+#: builtin/fast-export.c:1209
 msgid "Dump marks to this file"
 msgstr "Esegui il dump dei contrassegni in questo file"
 
-#: builtin/fast-export.c:1165
+#: builtin/fast-export.c:1211
 msgid "Import marks from this file"
 msgstr "Importa i contrassegni da questo file"
 
-#: builtin/fast-export.c:1169
+#: builtin/fast-export.c:1215
 msgid "Import marks from this file if it exists"
 msgstr "Importa i contrassegni da questo file se esiste"
 
-#: builtin/fast-export.c:1171
+#: builtin/fast-export.c:1217
 msgid "Fake a tagger when tags lack one"
 msgstr "Usa un tagger falso se i tag non ne hanno uno"
 
-#: builtin/fast-export.c:1173
+#: builtin/fast-export.c:1219
 msgid "Output full tree for each commit"
 msgstr "Visualizza in output l'albero completo per ogni commit"
 
-#: builtin/fast-export.c:1175
+#: builtin/fast-export.c:1221
 msgid "Use the done feature to terminate the stream"
 msgstr "Usa la funzionalità \"fatto\" per terminare il flusso"
 
-#: builtin/fast-export.c:1176
+#: builtin/fast-export.c:1222
 msgid "Skip output of blob data"
 msgstr "Ometti l'output dei dati dei blob"
 
-#: builtin/fast-export.c:1177 builtin/log.c:1633
+#: builtin/fast-export.c:1223 builtin/log.c:1811
 msgid "refspec"
 msgstr "specificatore riferimento"
 
-#: builtin/fast-export.c:1178
+#: builtin/fast-export.c:1224
 msgid "Apply refspec to exported refs"
 msgstr "Applica lo specificatore riferimento ai riferimenti esportati"
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1225
 msgid "anonymize output"
 msgstr "rendi anonimo l'output"
 
-#: builtin/fast-export.c:1181
+#: builtin/fast-export.c:1226
+msgid "from:to"
+msgstr "da:a"
+
+#: builtin/fast-export.c:1227
+msgid "convert <from> to <to> in anonymized output"
+msgstr "converte <da> ad <a> nell'output in forma anonima"
+
+#: builtin/fast-export.c:1230
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr ""
 "Fai riferimento ai genitori non nel flusso fast-export tramite l'ID oggetto"
 
-#: builtin/fast-export.c:1183
+#: builtin/fast-export.c:1232
 msgid "Show original object ids of blobs/commits"
 msgstr "Visualizza gli ID oggetto originari dei blob/commit"
 
-#: builtin/fast-export.c:1185
+#: builtin/fast-export.c:1234
 msgid "Label tags with mark ids"
 msgstr "Etichetta i tag con ID contrassegno"
 
-#: builtin/fast-export.c:1220
+#: builtin/fast-export.c:1257
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize-map senza --anonymize non ha senso"
+
+#: builtin/fast-export.c:1272
 msgid "Cannot pass both --import-marks and --import-marks-if-exists"
 msgstr ""
 "Impossibile fornire entrambe le opzioni --import-marks e --import-marks-if-"
 "exists"
 
-#: builtin/fetch.c:34
+#: builtin/fast-import.c:3086
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Contrassegni Da mancanti per il sottomodulo '%s'"
+
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Contrassegni A mancanti per il sottomodulo '%s'"
+
+#: builtin/fast-import.c:3223
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Atteso comando 'mark', ricevuto %s"
+
+#: builtin/fast-import.c:3228
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Atteso comando 'to', ricevuto %s"
+
+#: builtin/fast-import.c:3320
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+"Per l'opzione riscrittura sottomodulo ci si attendeva un formato nome:"
+"nomefile"
+
+#: builtin/fast-import.c:3374
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "funzionalità '%s' vietata nell'input senza --allow-unsafe-features"
+
+#: builtin/fetch-pack.c:241
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "File di lock creato ma non segnalato: %s"
+
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<opzioni>] [<repository> [<specificatore riferimento>...]]"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opzioni>] <gruppo>"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opzioni>] [(<repository> | <gruppo>)...]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opzioni>]"
 
-#: builtin/fetch.c:115
+#: builtin/fetch.c:119
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel non può essere negativo"
 
-#: builtin/fetch.c:138 builtin/pull.c:204
+#: builtin/fetch.c:142 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "esegui il fetch da tutti i remoti"
 
-#: builtin/fetch.c:140 builtin/pull.c:248
+#: builtin/fetch.c:144 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
 msgstr "imposta l'upstream per git pull/fetch"
 
-#: builtin/fetch.c:142 builtin/pull.c:207
+#: builtin/fetch.c:146 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "aggiungi i dati a .git/FETCH_HEAD anziché sovrascriverli"
 
-#: builtin/fetch.c:144 builtin/pull.c:210
+#: builtin/fetch.c:148 builtin/pull.c:191
 msgid "path to upload pack on remote end"
 msgstr "percorso in cui caricare il pack sul remoto"
 
-#: builtin/fetch.c:145
+#: builtin/fetch.c:149
 msgid "force overwrite of local reference"
 msgstr "forza la sovrascrittura del riferimento locale"
 
-#: builtin/fetch.c:147
+#: builtin/fetch.c:151
 msgid "fetch from multiple remotes"
 msgstr "esegui il fetch da più remoti"
 
-#: builtin/fetch.c:149 builtin/pull.c:214
+#: builtin/fetch.c:153 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "esegui il fetch di tutti i tag e degli oggetti associati"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:155
 msgid "do not fetch all tags (--no-tags)"
 msgstr "non eseguire il fetch di alcun tag (--no-tags)"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:157
 msgid "number of submodules fetched in parallel"
 msgstr "numero di sottomoduli recuperati in parallelo"
 
-#: builtin/fetch.c:155 builtin/pull.c:217
+#: builtin/fetch.c:159 builtin/pull.c:198
 msgid "prune remote-tracking branches no longer on remote"
 msgstr ""
 "elimina i branch che ne tracciano uno remoto ma non più presenti sul remoto"
 
-#: builtin/fetch.c:157
+#: builtin/fetch.c:161
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 "elimina i tag locali non più presenti sul remoto e sovrascrivi i tag "
 "modificati"
 
-#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141
+#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
 msgid "on-demand"
 msgstr "a richiesta"
 
-#: builtin/fetch.c:159
+#: builtin/fetch.c:163
 msgid "control recursive fetching of submodules"
 msgstr "controlla il recupero ricorsivo dei sottomoduli"
 
-#: builtin/fetch.c:163 builtin/pull.c:225
+#: builtin/fetch.c:168
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "scrivi i riferimenti recuperati nel file FETCH_HEAD"
+
+#: builtin/fetch.c:169 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "mantieni il pack scaricato"
 
-#: builtin/fetch.c:165
+#: builtin/fetch.c:171
 msgid "allow updating of HEAD ref"
 msgstr "consenti l'aggiornamento del riferimento HEAD"
 
-#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
+#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "aumenta la profondità della cronologia di un clone shallow"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:176 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr ""
 "aumenta la profondità della cronologia di un clone shallow in base al tempo"
 
-#: builtin/fetch.c:176 builtin/pull.c:231
+#: builtin/fetch.c:182 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "converti in un repository completo"
 
-#: builtin/fetch.c:179
+#: builtin/fetch.c:185
 msgid "prepend this to submodule path output"
 msgstr "anteponi questo prefisso all'output del percorso del sottomodulo"
 
-#: builtin/fetch.c:182
+#: builtin/fetch.c:188
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -13052,90 +14689,98 @@ msgstr ""
 "impostazione predefinita per il recupero ricorsivo dei sottomoduli (a "
 "priorità minore rispetto ai file di configurazione)"
 
-#: builtin/fetch.c:186 builtin/pull.c:234
+#: builtin/fetch.c:192 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "accetta i riferimenti che aggiornano .git/shallow"
 
-#: builtin/fetch.c:187 builtin/pull.c:236
+#: builtin/fetch.c:193 builtin/pull.c:226
 msgid "refmap"
 msgstr "mappa riferimenti"
 
-#: builtin/fetch.c:188 builtin/pull.c:237
+#: builtin/fetch.c:194 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "specifica la mappa dei riferimenti per il fetch"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:201 builtin/pull.c:240
 msgid "report that we have only objects reachable from this object"
 msgstr "segnala che abbiamo solo oggetti raggiungibili da quest'oggetto"
 
-#: builtin/fetch.c:198
-msgid "run 'gc --auto' after fetching"
-msgstr "esegui 'gc --auto' dopo il fetch"
+#: builtin/fetch.c:204 builtin/fetch.c:206
+msgid "run 'maintenance --auto' after fetching"
+msgstr "esegui 'maintenance --auto' dopo il fetch"
 
-#: builtin/fetch.c:200 builtin/pull.c:246
+#: builtin/fetch.c:208 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr "controlla aggiornamenti forzati su tutti i branch aggiornati"
 
-#: builtin/fetch.c:510
+#: builtin/fetch.c:210
+msgid "write the commit-graph after fetching"
+msgstr "scrivi il grafo dei commit dopo il fetch"
+
+#: builtin/fetch.c:212
+msgid "accept refspecs from stdin"
+msgstr "accetta gli specificatori riferimento dallo standard input"
+
+#: builtin/fetch.c:523
 msgid "Couldn't find remote ref HEAD"
 msgstr "Impossibile trovare l'HEAD del riferimento remoto"
 
-#: builtin/fetch.c:650
+#: builtin/fetch.c:677
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "il valore dell'opzione fetch.output contiene il valore non valido %s"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:775
 #, c-format
 msgid "object %s not found"
 msgstr "oggetto %s non trovato"
 
-#: builtin/fetch.c:752
+#: builtin/fetch.c:779
 msgid "[up to date]"
 msgstr "[aggiornato]"
 
-#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
+#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
 msgid "[rejected]"
 msgstr "[rifiutato]"
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:793
 msgid "can't fetch in current branch"
 msgstr "impossibile eseguire il fetch nel branch corrente"
 
-#: builtin/fetch.c:776
+#: builtin/fetch.c:803
 msgid "[tag update]"
 msgstr "[tag aggiornato]"
 
-#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
-#: builtin/fetch.c:848
+#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863
+#: builtin/fetch.c:875
 msgid "unable to update local ref"
 msgstr "impossibile aggiornare il riferimento locale"
 
-#: builtin/fetch.c:781
+#: builtin/fetch.c:808
 msgid "would clobber existing tag"
 msgstr "sovrascriverebbe il tag esistente"
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:830
 msgid "[new tag]"
 msgstr "[nuovo tag]"
 
-#: builtin/fetch.c:806
+#: builtin/fetch.c:833
 msgid "[new branch]"
 msgstr "[nuovo branch]"
 
-#: builtin/fetch.c:809
+#: builtin/fetch.c:836
 msgid "[new ref]"
 msgstr "[nuovo riferimento]"
 
-#: builtin/fetch.c:848
+#: builtin/fetch.c:875
 msgid "forced update"
 msgstr "aggiornamento forzato"
 
-#: builtin/fetch.c:853
+#: builtin/fetch.c:880
 msgid "non-fast-forward"
 msgstr "non fast forward"
 
-#: builtin/fetch.c:874
+#: builtin/fetch.c:901
 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"
@@ -13146,7 +14791,7 @@ msgstr ""
 "riabilitarlo, usa l'opzione '--show-forced-updates' o esegui 'git config\n"
 "fetch.showForcedUpdates true'."
 
-#: builtin/fetch.c:878
+#: builtin/fetch.c:905
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -13158,22 +14803,22 @@ msgstr ""
 "aggiornamenti forzati. Puoi usare '--no-show-forced-updates' o eseguire\n"
 "'git config fetch.showForcedUpdates false' per omettere questo controllo.\n"
 
-#: builtin/fetch.c:908
+#: builtin/fetch.c:939
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s non ha inviato tutti gli oggetti necessari\n"
 
-#: builtin/fetch.c:929
+#: builtin/fetch.c:960
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "%s rifiutato perché non è consentito aggiornare radici shallow"
 
-#: builtin/fetch.c:1020 builtin/fetch.c:1157
+#: builtin/fetch.c:1053 builtin/fetch.c:1191
 #, c-format
 msgid "From %.*s\n"
 msgstr "Da %.*s\n"
 
-#: builtin/fetch.c:1031
+#: builtin/fetch.c:1064
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -13183,58 +14828,58 @@ msgstr ""
 "eseguire\n"
 " 'git remote prune %s' per rimuovere ogni branch vecchio in conflitto"
 
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1161
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s diventerà pendente)"
 
-#: builtin/fetch.c:1128
+#: builtin/fetch.c:1162
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s è diventato pendente)"
 
-#: builtin/fetch.c:1160
+#: builtin/fetch.c:1194
 msgid "[deleted]"
 msgstr "[eliminato]"
 
-#: builtin/fetch.c:1161 builtin/remote.c:1036
+#: builtin/fetch.c:1195 builtin/remote.c:1113
 msgid "(none)"
 msgstr "(nessuno)"
 
-#: builtin/fetch.c:1184
+#: builtin/fetch.c:1218
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 "Mi rifiuto di eseguire il fetch nel branch corrente %s di un repository non "
 "bare"
 
-#: builtin/fetch.c:1203
+#: builtin/fetch.c:1237
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "L'opzione \"%s\" con il valore \"%s\" non è valida per %s"
 
-#: builtin/fetch.c:1206
+#: builtin/fetch.c:1240
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "L'opzione \"%s\" è ignorata per %s\n"
 
-#: builtin/fetch.c:1414
-msgid "multiple branch detected, incompatible with --set-upstream"
+#: builtin/fetch.c:1448
+msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "rilevati branch multipli, stato incompatibile con --set-upstream"
 
-#: builtin/fetch.c:1429
+#: builtin/fetch.c:1463
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "non imposto l'upstream per un branch remoto che ne traccia uno remoto"
 
-#: builtin/fetch.c:1431
+#: builtin/fetch.c:1465
 msgid "not setting upstream for a remote tag"
 msgstr "non imposto l'upstream per un tag remoto"
 
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1467
 msgid "unknown branch type"
 msgstr "tipo branch sconosciuto"
 
-#: builtin/fetch.c:1435
+#: builtin/fetch.c:1469
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
@@ -13242,22 +14887,22 @@ msgstr ""
 "nessun branch sorgente trovato.\n"
 "devi specificare esattamente un branch con l'opzione --set-upstream."
 
-#: builtin/fetch.c:1561 builtin/fetch.c:1623
+#: builtin/fetch.c:1598 builtin/fetch.c:1661
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Recupero di %s in corso\n"
 
-#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
+#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Impossibile recuperare %s"
 
-#: builtin/fetch.c:1583
+#: builtin/fetch.c:1620
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "impossibile recuperare '%s' (codice di uscita: %d)\n"
 
-#: builtin/fetch.c:1685
+#: builtin/fetch.c:1724
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
@@ -13265,75 +14910,79 @@ msgstr ""
 "Non è stato specificato alcun repository remoto. Specifica un URL o il\n"
 "nome di un remoto da cui dovranno essere recuperate le nuove revisioni."
 
-#: builtin/fetch.c:1722
+#: builtin/fetch.c:1760
 msgid "You need to specify a tag name."
 msgstr "Devi specificare il nome di un tag."
 
-#: builtin/fetch.c:1774
+#: builtin/fetch.c:1825
 msgid "Negative depth in --deepen is not supported"
 msgstr "Le profondità negative in --deepen non sono supportate"
 
-#: builtin/fetch.c:1776
+#: builtin/fetch.c:1827
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "le opzioni --deepen e --depth sono mutualmente esclusive"
 
-#: builtin/fetch.c:1781
+#: builtin/fetch.c:1832
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth e --unshallow non possono essere usati insieme."
 
-#: builtin/fetch.c:1783
+#: builtin/fetch.c:1834
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow su un repository completo non ha senso"
 
-#: builtin/fetch.c:1799
+#: builtin/fetch.c:1851
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all non richiede un repository come argomento"
 
-#: builtin/fetch.c:1801
+#: builtin/fetch.c:1853
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all non ha senso con degli specificatori riferimento"
 
-#: builtin/fetch.c:1810
+#: builtin/fetch.c:1862
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Remoto o gruppo remoti non esistente: %s"
 
-#: builtin/fetch.c:1817
+#: builtin/fetch.c:1869
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr ""
 "Recuperare un gruppo e specificare gli specificatori riferimento non ha senso"
 
-#: builtin/fetch.c:1835
+#: builtin/fetch.c:1887
 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/fmt-merge-msg.c:18
+#: builtin/fetch.c:1891
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "--stdin può essere usato solo durante il fetch da un remoto"
+
+#: 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 <messaggio>] [--log[=<n>] | --no-log] [--file <file>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "popola il registro con al più <n> voci del registro breve"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "alias di --log (deprecato)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "testo"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "usa <testo> come stringa iniziale del messaggio"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "file da cui leggere"
 
@@ -13346,8 +14995,8 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <oggetto>]"
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+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>]]"
@@ -13376,7 +15025,7 @@ msgstr "racchiudi i segnaposto fra virgolette in modo da poterli usare con Tcl"
 msgid "show only <n> matched refs"
 msgstr "visualizza solo <n> riferimenti corrispondenti"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:39 builtin/tag.c:440
 msgid "respect format colors"
 msgstr "rispetta le stringhe di formato per i colori"
 
@@ -13400,32 +15049,32 @@ msgstr "stampa solo i riferimenti contenenti il commit"
 msgid "print only refs which don't contain the commit"
 msgstr "stampa solo i riferimenti che non contengono il commit"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
 msgid "unknown"
 msgstr "sconosciuto"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:101 builtin/fsck.c:121
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "errore in %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:115
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "avviso in %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:144 builtin/fsck.c:147
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "collegamento rotto da %7s %s"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:156
 msgid "wrong object type in link"
 msgstr "tipo oggetto errato nel collegamento"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:172
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13434,240 +15083,240 @@ msgstr ""
 "collegamento rotto da %7s %s\n"
 "                   a %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:283
 #, c-format
 msgid "missing %s %s"
 msgstr "%s mancante %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:310
 #, c-format
 msgid "unreachable %s %s"
 msgstr "%s non raggiungibile %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:330
 #, c-format
 msgid "dangling %s %s"
 msgstr "%s pendente %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:340
 msgid "could not create lost-found"
 msgstr "impossibile creare lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:351
 #, c-format
 msgid "could not finish '%s'"
 msgstr "impossibile terminare '%s'"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:368
 #, c-format
 msgid "Checking %s"
 msgstr "Controllo di %s in corso"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Controllo connessione in corso (%d oggetti)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:425
 #, c-format
 msgid "Checking %s %s"
 msgstr "Controllo di %s in corso %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:430
 msgid "broken links"
 msgstr "collegamenti rotti"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:439
 #, c-format
 msgid "root %s"
 msgstr "radice %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:447
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "eseguito tag di %s %s (%s) in %s"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:476
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: oggetto corrotto o mancante"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:501
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: voce registro riferimenti non valida: %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:515
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Controllo registro riferimenti %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:549
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: puntatore SHA1 non valido: %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:556
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: non è un commit"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:610
 msgid "notice: No default references"
 msgstr "avviso: nessun riferimento predefinito"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:625
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: oggetto corrotto o mancante: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:638
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: impossibile analizzare l'oggetto: %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:658
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "file SHA1 non valido: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:673
 msgid "Checking object directory"
 msgstr "Controllo directory oggetti in corso"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:676
 msgid "Checking object directories"
 msgstr "Controllo directory oggetti in corso"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:691
 #, c-format
 msgid "Checking %s link"
 msgstr "Controllo collegamento %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:696 builtin/index-pack.c:865
 #, c-format
 msgid "invalid %s"
 msgstr "%s non valido"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:703
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s punta a qualcosa di strano (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:709
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: l'HEAD scollegato non punta a niente"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:713
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "avviso: %s punta a un branch non nato (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:725
 msgid "Checking cache tree"
 msgstr "Controllo cache albero in corso"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:730
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: puntatore SHA1 non valido nella cache alberi"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:739
 msgid "non-tree in cache-tree"
 msgstr "oggetto non albero nella cache alberi"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:770
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opzioni>] [<oggetto>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:776
 msgid "show unreachable objects"
 msgstr "visualizza oggetti non raggiungibili"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:777
 msgid "show dangling objects"
 msgstr "visualizza oggetti pendenti"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:778
 msgid "report tags"
 msgstr "segnala i tag"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:779
 msgid "report root nodes"
 msgstr "segnala i nodi radice"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:780
 msgid "make index objects head nodes"
 msgstr "rendi gli oggetti indice nodi head"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:781
 msgid "make reflogs head nodes (default)"
 msgstr "rendi i registri dei riferimenti nodi head (impostazione predefinita)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:782
 msgid "also consider packs and alternate objects"
 msgstr "considera anche i pack e gli oggetti alternativi"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:783
 msgid "check only connectivity"
 msgstr "controlla solo la connessione"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:784
 msgid "enable more strict checking"
 msgstr "abilita controlli più restrittivi"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:786
 msgid "write dangling objects in .git/lost-found"
 msgstr "scrivi oggetti pendenti in .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:787 builtin/prune.c:134
 msgid "show progress"
 msgstr "visualizza l'avanzamento"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:788
 msgid "show verbose names for reachable objects"
 msgstr "visualizza nomi dettagliati per gli oggetti raggiungibili"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:847 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Controllo oggetti in corso"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:875
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: oggetto mancante"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:886
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "parametro non valido: atteso SHA1, presente '%s'"
 
-#: builtin/gc.c:35
+#: builtin/gc.c:36
 msgid "git gc [<options>]"
 msgstr "git gc [<opzioni>]"
 
-#: builtin/gc.c:90
+#: builtin/gc.c:91
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "fstat di %s non riuscito: %s"
 
-#: builtin/gc.c:126
+#: builtin/gc.c:127
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "analisi dell'opzione '%s' con valore '%s' non riuscita"
 
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:476 builtin/init-db.c:58
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "impossibile eseguire lo stat di '%s'"
 
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:530
 #, c-format
 msgid "cannot read '%s'"
 msgstr "impossibile leggere '%s'"
 
-#: builtin/gc.c:491
+#: builtin/gc.c:492
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13683,56 +15332,56 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:539
+#: builtin/gc.c:540
 msgid "prune unreferenced objects"
 msgstr "elimina oggetti non referenziati"
 
-#: builtin/gc.c:541
+#: builtin/gc.c:542
 msgid "be more thorough (increased runtime)"
 msgstr "sii più accurato (tempi di esecuzione maggiori)"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:543
 msgid "enable auto-gc mode"
 msgstr "abilita modalità garbage collector automatica"
 
-#: builtin/gc.c:545
+#: builtin/gc.c:546
 msgid "force running gc even if there may be another gc running"
 msgstr ""
 "forza l'esecuzione del garbage collector anche nel caso in cui ve ne "
 "potrebbe essere un altro in esecuzione"
 
-#: builtin/gc.c:548
+#: builtin/gc.c:549
 msgid "repack all other packs except the largest pack"
 msgstr ""
 "esegui il repack di tutti gli altri pack ad eccezione di quello più grande"
 
-#: builtin/gc.c:565
+#: builtin/gc.c:566
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "analisi del valore %s di gc.logexpiry non riuscita"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:577
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "analisi del valore %s per la scadenza delle eliminazioni non riuscita"
 
-#: builtin/gc.c:596
+#: builtin/gc.c:597
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
 "Comprimo il repository in background per ottenere le migliori prestazioni.\n"
 
-#: builtin/gc.c:598
+#: builtin/gc.c:599
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Comprimo il repository per ottenere le migliori prestazioni.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:600
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Vedi \"git help gc\" per le operazioni di manutenzione manuali.\n"
 
-#: builtin/gc.c:639
+#: builtin/gc.c:640
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13740,14 +15389,68 @@ msgstr ""
 "gc è già in esecuzione sul computer '%s' con PID %<PRIuMAX> (usa --force se "
 "non lo è)"
 
-#: builtin/gc.c:694
+#: builtin/gc.c:695
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr ""
 "Ci sono troppi oggetti sparsi non raggiungibili; esegui 'git prune' per "
 "eliminarli."
 
-#: builtin/grep.c:29
+#: builtin/gc.c:705
+msgid "git maintenance run [--auto] [--[no-]quiet] [--task=<task>]"
+msgstr "git maintenance run [--auto] [--[no-]quiet] [--task=<attività>]"
+
+#: builtin/gc.c:812
+msgid "failed to write commit-graph"
+msgstr "scrittura del grafo dei commit non riuscita"
+
+#: builtin/gc.c:905
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "il file di lock '%s' esiste, ignoro le attività di manutenzione"
+
+#: builtin/gc.c:932
+#, c-format
+msgid "task '%s' failed"
+msgstr "attività '%s' non riuscita"
+
+#: builtin/gc.c:979
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' non è un'attività valida"
+
+#: builtin/gc.c:984
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "l'attività '%s' non può essere selezionata più volte"
+
+#: builtin/gc.c:999
+msgid "run tasks based on the state of the repository"
+msgstr "esegui delle attività in base allo stato del repository"
+
+#: builtin/gc.c:1001
+msgid "do not report progress or other information over stderr"
+msgstr ""
+"non visualizzare l'avanzamento o altre informazioni sullo standard error"
+
+#: builtin/gc.c:1002
+msgid "task"
+msgstr "attività"
+
+#: builtin/gc.c:1003
+msgid "run a specific task"
+msgstr "esegui un'attività specifica"
+
+#: builtin/gc.c:1026
+msgid "git maintenance run [<options>]"
+msgstr "git maintenance run [<opzioni>]"
+
+#: builtin/gc.c:1037
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "sottocomando non valido: %s"
+
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr ""
 "git grep [<opzioni>] [-e] <pattern> [<revisione>...] [[--] <percorso>...]"
@@ -13766,263 +15469,263 @@ msgstr "specificato numero non valido di thread (%d) per %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766
+#: builtin/pack-objects.c:2936
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "non vi è supporto per i thread, ignoro %s"
 
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "impossibile leggere il tree (%s)"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:655
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "impossibile eseguire grep su un oggetto di tipo %s"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:725
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "switch '%c' richiede un valore numerico"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:824
 msgid "search in index instead of in the work tree"
 msgstr "cerca nell'index anziché nell'albero di lavoro"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:826
 msgid "find in contents not managed by git"
 msgstr "la ricerca nei contenuti non è gestita da Git"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:828
 msgid "search in both tracked and untracked files"
 msgstr "cerca sia nei file tracciati sia in quelli non tracciati"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:830
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignora i file specificati in '.gitignore'"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:832
 msgid "recursively search in each submodule"
 msgstr "cerca ricorsivamente in ogni sottomodulo"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:835
 msgid "show non-matching lines"
 msgstr "visualizza le righe non corrispondenti"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:837
 msgid "case insensitive matching"
 msgstr "ricerca corrispondenze senza differenze maiuscole/minuscole"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:839
 msgid "match patterns only at word boundaries"
 msgstr "cerca corrispondenze ai pattern solo a inizio/fine parola"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:841
 msgid "process binary files as text"
 msgstr "elabora i file binari come testuali"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:843
 msgid "don't match patterns in binary files"
 msgstr "non cercare corrispondenze ai pattern nei file binari"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:846
 msgid "process binary files with textconv filters"
 msgstr "elabora i file binari con filtri di conversione in testo"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:848
 msgid "search in subdirectories (default)"
 msgstr "cerca nelle sottodirectory (impostazione predefinita)"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:850
 msgid "descend at most <depth> levels"
 msgstr "scendi al più di <profondità> livelli"
 
-#: builtin/grep.c:845
+#: builtin/grep.c:854
 msgid "use extended POSIX regular expressions"
 msgstr "usa espressioni regolari POSIX estese"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:857
 msgid "use basic POSIX regular expressions (default)"
 msgstr "usa espressioni regolari POSIX di base (impostazione predefinita)"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:860
 msgid "interpret patterns as fixed strings"
 msgstr "interpreta i pattern come stringhe fisse"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:863
 msgid "use Perl-compatible regular expressions"
 msgstr "usa espressioni regolari compatibili con Perl"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:866
 msgid "show line numbers"
 msgstr "visualizza numeri di riga"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:867
 msgid "show column number of first match"
 msgstr "visualizza il numero di colonna della prima corrispondenza"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:868
 msgid "don't show filenames"
 msgstr "non visualizzare i nomi file"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:869
 msgid "show filenames"
 msgstr "visualizza i nomi file"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:871
 msgid "show filenames relative to top directory"
 msgstr "visualizza i nomi file relativi alla directory di primo livello"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:873
 msgid "show only filenames instead of matching lines"
 msgstr "visualizza solo i nomi file anziché le righe corrispondenti"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:875
 msgid "synonym for --files-with-matches"
 msgstr "sinonimo di --files-with-matches"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:878
 msgid "show only the names of files without match"
 msgstr "visualizza solo i nomi dei file non corrispondenti"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:880
 msgid "print NUL after filenames"
 msgstr "stampa NUL dopo i nomi file"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:883
 msgid "show only matching parts of a line"
 msgstr "visualizza solo le parti corrispondenti di una riga"
 
-#: builtin/grep.c:876
+#: builtin/grep.c:885
 msgid "show the number of matches instead of matching lines"
 msgstr "visualizza il numero di corrispondenze anziché le righe corrispondenti"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:886
 msgid "highlight matches"
 msgstr "evidenzia corrispondenze"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:888
 msgid "print empty line between matches from different files"
 msgstr "stampa una riga vuota fra le corrispondenze in file differenti"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:890
 msgid "show filename only once above matches from same file"
 msgstr ""
 "visualizza il nome file solo una volta prima delle corrispondenze nello "
 "stesso file"
 
-#: builtin/grep.c:884
+#: builtin/grep.c:893
 msgid "show <n> context lines before and after matches"
 msgstr "visualizza <n> righe di contesto prima e dopo le corrispondenze"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:896
 msgid "show <n> context lines before matches"
 msgstr "visualizza <n> righe di contesto prima delle corrispondenze"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:898
 msgid "show <n> context lines after matches"
 msgstr "visualizza <n> righe di contesto dopo le corrispondenze"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:900
 msgid "use <n> worker threads"
 msgstr "usa <n> thread di lavoro"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:901
 msgid "shortcut for -C NUM"
 msgstr "scorciatoia per -C NUM"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:904
 msgid "show a line with the function name before matches"
 msgstr "visualizza una riga con il nome funzione prima delle corrispondenze"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:906
 msgid "show the surrounding function"
 msgstr "visualizza la funzione circostante"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:909
 msgid "read patterns from file"
 msgstr "leggi le corrispondenze da un file"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:911
 msgid "match <pattern>"
 msgstr "cerca corrispondenze con <pattern>"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:913
 msgid "combine patterns specified with -e"
 msgstr "combina i pattern specificati con -e"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:925
 msgid "indicate hit with exit status without output"
 msgstr ""
 "segnala una corrispondenza con il codice di uscita senza emettere output"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:927
 msgid "show only matches from files that match all patterns"
 msgstr ""
 "visualizza solo le corrispondenze nei file in cui vi sono corrispondenze per "
 "tutti i pattern"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:929
 msgid "show parse tree for grep expression"
 msgstr "visualizza l'albero di analisi per l'espressione grep"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:933
 msgid "pager"
 msgstr "pager"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:933
 msgid "show matching files in the pager"
 msgstr "visualizza i file corrispondenti nel pager"
 
-#: builtin/grep.c:928
+#: builtin/grep.c:937
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "consenti"
 
-#: builtin/grep.c:992
+#: builtin/grep.c:1004
 msgid "no pattern given"
 msgstr "nessun pattern specificato"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1040
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index o --untracked non possono essere usate con le revisioni"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1048
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "impossibile risolvere la revisione %s"
 
-#: builtin/grep.c:1067
+#: builtin/grep.c:1078
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "l'opzione --untracked non è supportata con --recurse-submodules"
+
+#: builtin/grep.c:1082
 msgid "invalid option combination, ignoring --threads"
 msgstr "combinazione di opzioni non valida, ignoro --threads"
 
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1085 builtin/pack-objects.c:3655
 msgid "no threads support, ignoring --threads"
 msgstr "non vi è supporto per i thread, ignoro --threads"
 
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1088 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "specificato numero non valido di thread (%d)"
 
-#: builtin/grep.c:1096
+#: builtin/grep.c:1122
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager funziona solo sull'albero di lavoro"
 
-#: builtin/grep.c:1119
-msgid "option not supported with --recurse-submodules"
-msgstr "opzione non supportata con --recurse-submodules"
-
-#: builtin/grep.c:1125
+#: builtin/grep.c:1148
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached o --untracked non possono essere usate con --no-index"
 
-#: builtin/grep.c:1131
+#: builtin/grep.c:1154
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard non può essere usata per i contenuti tracciati"
 
-#: builtin/grep.c:1139
+#: builtin/grep.c:1162
 msgid "both --cached and trees are given"
 msgstr "sono specificati sia --cached sia degli alberi"
 
@@ -14065,66 +15768,66 @@ msgstr ""
 msgid "process file as it were from this path"
 msgstr "elabora i file come se fossero in questo percorso"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "stampa tutti i comandi disponibili"
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "escludi le guide"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr "stampa un elenco di guide utili"
 
-#: builtin/help.c:49
+#: builtin/help.c:50
 msgid "print all configuration variable names"
 msgstr "stampa i nomi di tutte le variabili di configurazione"
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr "visualizza la pagina man"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr "visualizza il manuale nel browser Web"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "visualizza la pagina info"
 
-#: builtin/help.c:56
+#: builtin/help.c:57
 msgid "print command description"
 msgstr "stampa la descrizione del comando"
 
-#: builtin/help.c:61
+#: 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:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "formato di aiuto '%s' non riconosciuto"
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "Esecuzione di emacsclient non riuscita."
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "Verifica della versione di emacsclient non riuscita."
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "la versione '%d' di emacsclient è troppo vecchia (<22)."
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "esecuzione di '%s' non riuscita"
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -14133,7 +15836,7 @@ msgstr ""
 "'%s': path ad un visualizzatore man pages non supportato.\n"
 "Usa invece 'man.<tool>.cmd'."
 
-#: builtin/help.c:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -14142,396 +15845,424 @@ msgstr ""
 "'%s': comando per visualizzatore man pages supportato.\n"
 "Per favore usa 'man.<tool>.path' invece."
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualizzatore man sconosciuto."
 
-#: builtin/help.c:367
+#: builtin/help.c:453
 msgid "no man viewer handled the request"
 msgstr "nessun visualizzatore man ha gestito la richiesta"
 
-#: builtin/help.c:375
+#: builtin/help.c:461
 msgid "no info viewer handled the request"
 msgstr "nessun visualizzatore info ha gestito la richiesta"
 
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:520 builtin/help.c:531 git.c:337
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' è un alias di '%s'"
 
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:534 git.c:369
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "stringa alias.%s non valida: %s"
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:563 builtin/help.c:593
 #, c-format
 msgid "usage: %s%s"
 msgstr "uso: %s%s"
 
-#: builtin/help.c:491
+#: builtin/help.c:577
 msgid "'git help config' for more information"
 msgstr "Vedi 'git help config' per maggiori informazioni"
 
-#: builtin/index-pack.c:185
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "tipo oggetto non corrispondente in %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "non si è ricevuto l'oggetto atteso %s"
 
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "oggetto %s: atteso tipo %s, trovato %s"
 
-#: builtin/index-pack.c:258
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "impossibile riempire %d byte"
 msgstr[1] "impossibile riempire %d byte"
 
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "EOF prematuro"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "errore di lettura in input"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "usati più byte di quelli disponibili"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:324 builtin/pack-objects.c:619
 msgid "pack too large for current definition of off_t"
 msgstr "pack troppo largo per la definizione corrente di off_t"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "il pack supera la dimensione massima consentita"
 
-#: builtin/index-pack.c:312
+#: builtin/index-pack.c:342 builtin/repack.c:254
+#, c-format
+msgid "unable to create '%s'"
+msgstr "impossibile creare '%s'"
+
+#: builtin/index-pack.c:348
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "impossibile aprire il file pack '%s'"
 
-#: builtin/index-pack.c:326
+#: builtin/index-pack.c:362
 msgid "pack signature mismatch"
 msgstr "la firma del pack non coincide"
 
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:364
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "versione pack %<PRIu32> non supportata"
 
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:382
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "il pack ha un oggetto danneggiato all'offset %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:488
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate ha restituito il codice %d"
 
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:537
 msgid "offset value overflow for delta base object"
 msgstr "overflow del valore dell'offset base del delta"
 
-#: builtin/index-pack.c:523
+#: builtin/index-pack.c:545
 msgid "delta base offset is out of bound"
 msgstr "l'offset base del delta è fuori dall'intervallo consentito"
 
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:553
 #, c-format
 msgid "unknown object type %d"
 msgstr "tipo oggetto %d sconosciuto"
 
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:584
 msgid "cannot pread pack file"
 msgstr "impossibile eseguire pread sul file pack"
 
-#: builtin/index-pack.c:564
+#: builtin/index-pack.c:586
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
 msgstr[0] "fine del file pack prematura, %<PRIuMAX> byte mancante"
 msgstr[1] "fine del file pack prematura, %<PRIuMAX> byte mancanti"
 
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:612
 msgid "serious inflate inconsistency"
 msgstr "inconsistenza grave di inflate"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "TROVATA COLLISIONE SHA1 CON %s !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:760 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
 #, c-format
 msgid "unable to read %s"
 msgstr "impossibile leggere %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "impossibile leggere le informazioni sull'oggetto esistente: %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:832
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "non è possibile leggere l'oggetto %s esistente"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:846
 #, c-format
 msgid "invalid blob object %s"
 msgstr "oggetto blob %s non valido"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
 msgid "fsck error in packed object"
 msgstr "errore fsck nell'oggetto sottoposto a pack"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:870
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "Non tutti gli oggetti figlio di %s sono raggiungibili"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
 msgid "failed to apply delta"
 msgstr "applicazione del delta non riuscita"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1161
 msgid "Receiving objects"
 msgstr "Ricezione degli oggetti"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1161
 msgid "Indexing objects"
 msgstr "Indicizzazione degli oggetti"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1195
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "il pack è corrotto (SHA1 non corrisponde)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1200
 msgid "cannot fstat packfile"
 msgstr "impossibile eseguire fstat sul file pack"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1203
 msgid "pack has junk at the end"
 msgstr "il pack ha dati inutili alla fine"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1215
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "confusione oltre ogni follia in parse_pack_objects()"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1238
 msgid "Resolving deltas"
 msgstr "Risoluzione dei delta"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "impossibile creare il thread: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1282
 msgid "confusion beyond insanity"
 msgstr "confusione oltre ogni follia"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1288
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "completato con %d oggetto locale"
 msgstr[1] "completato con %d oggetti locali"
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1300
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "Checksum in coda inatteso per %s (disco corrotto?)"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1304
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "pack ha %d delta irrisolto"
 msgstr[1] "pack ha %d delta irrisolti"
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1328
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "impossibile eseguire deflate sull'oggetto aggiunto alla fine (%d)"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1424
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "l'oggetto locale %s è corrotto"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1444
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "il nome del file pack '%s' non termina con '.pack'"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1469
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "impossibile scrivere il file %s '%s'"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1477
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "impossibile chiudere il file %s scritto '%s'"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1501
 msgid "error while closing pack file"
 msgstr "errore nella chiusura del file pack"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1515
 msgid "cannot store pack file"
 msgstr "impossibile archiviare il file pack"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1523
 msgid "cannot store index file"
 msgstr "impossibile archiviare index file"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "pack.indexversion=%<PRIu32> non valida"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Impossibile aprire il file pack '%s' esistente"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1633
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "Impossibile aprire il file pack idx esistente per '%s'"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1681
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "non delta: %d oggetto"
 msgstr[1] "non delta: %d oggetti"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1688
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "lunghezza della catena = %d: %lu oggetto"
 msgstr[1] "lunghezza della catena = %d: %lu oggetti"
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1728
 msgid "Cannot come back to cwd"
 msgstr "impossibile tornare alla directory di lavoro corrente"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1777 builtin/index-pack.c:1780
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
 #, c-format
 msgid "bad %s"
 msgstr "%s errato"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1806 builtin/init-db.c:391 builtin/init-db.c:623
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "algoritmo hash '%s' sconosciuto"
+
+#: builtin/index-pack.c:1821
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin non può essere usato senza --stdin"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1823
 msgid "--stdin requires a git repository"
 msgstr "--stdin richiede un repository Git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1825
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format non può essere usato con --stdin"
+
+#: builtin/index-pack.c:1831
 msgid "--verify with no packfile name given"
 msgstr "--verify senza un nome del file pack specificato"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
 msgstr "errore fsck negli oggetti sottoposti a pack"
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:64
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "impossibile eseguire stat sul modello '%s'"
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:69
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "impossibile aprire la directory '%s'"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:81
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "impossibile leggere il link '%s'"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:83
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "impossibile creare il collegamento simbolico da '%s' a '%s'"
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:89
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "impossibile copiare '%s' in '%s'"
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:93
 #, c-format
 msgid "ignoring template %s"
 msgstr "ignoro il modello %s"
 
-#: builtin/init-db.c:121
+#: builtin/init-db.c:124
 #, c-format
 msgid "templates not found in %s"
 msgstr "modelli non trovati in %s"
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:139
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "non copio i modelli da '%s': %s"
 
-#: builtin/init-db.c:334
+#: builtin/init-db.c:274
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nome branch iniziale non valido: '%s'"
+
+#: builtin/init-db.c:366
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "impossibile gestire il tipo di file %d"
 
-#: builtin/init-db.c:337
+#: builtin/init-db.c:369
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "impossibile spostare %s in %s"
 
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:385
+msgid "attempt to reinitialize repository with different hash"
+msgstr "tentativo di reinizializzare il repository con un hash differente"
+
+#: builtin/init-db.c:409 builtin/init-db.c:412
 #, c-format
 msgid "%s already exists"
 msgstr "%s esiste già"
 
-#: builtin/init-db.c:413
+#: builtin/init-db.c:443
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: opzione --initial-branch=%s ignorata"
+
+#: builtin/init-db.c:474
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Reinizializzato repository Git condiviso esistente in %s%s\n"
 
-#: builtin/init-db.c:414
+#: builtin/init-db.c:475
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Reinizializzato repository Git esistente in %s%s\n"
 
-#: builtin/init-db.c:418
+#: builtin/init-db.c:479
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Inizializzato repository Git condiviso vuoto in %s%s\n"
 
-#: builtin/init-db.c:419
+#: builtin/init-db.c:480
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Inizializzato repository Git vuoto in %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:529
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -14539,25 +16270,41 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<directory-modello>] [--"
 "shared[=<permessi>]] [<directory>]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:555
 msgid "permissions"
 msgstr "permessi"
 
-#: builtin/init-db.c:492
+#: builtin/init-db.c:556
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "specifica che il repository Git deve essere condiviso con più utenti"
 
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: builtin/init-db.c:562
+msgid "override the name of the initial branch"
+msgstr "esegui l'override del nome del branch iniziale"
+
+#: builtin/init-db.c:563 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "hash"
+
+#: builtin/init-db.c:564 builtin/show-index.c:22 builtin/verify-pack.c:75
+msgid "specify the hash algorithm to use"
+msgstr "specifica l'algoritmo hash da usare"
+
+#: builtin/init-db.c:571
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "le opzioni --separate-git-dir e --bare sono mutualmente esclusive"
+
+#: builtin/init-db.c:600 builtin/init-db.c:605
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "impossibile creare la directory %s"
 
-#: builtin/init-db.c:538
+#: builtin/init-db.c:609 builtin/init-db.c:664
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "impossibile modificare la directory corrente in %s"
 
-#: builtin/init-db.c:559
+#: builtin/init-db.c:636
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -14566,11 +16313,15 @@ msgstr ""
 "%s (o --work-tree=<directory>) non consentito senza specificare %s (o --git-"
 "dir=<directory>)"
 
-#: builtin/init-db.c:587
+#: builtin/init-db.c:688
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Impossibile accedere all'albero di lavoro '%s'"
 
+#: builtin/init-db.c:693
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir non è compatibile con un repository bare"
+
 #: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -14635,121 +16386,126 @@ msgstr "--trailer con --only-input non ha senso"
 msgid "no input file given for in-place editing"
 msgstr "nessun file di input specificato per la modifica sul posto"
 
-#: builtin/log.c:55
+#: builtin/log.c:56
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opzioni>] [<intervallo-revisioni>] [[--] <percorso>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:57
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opzioni>] <oggetto>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:110
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opzione --decorate non valida: %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:177
 msgid "show source"
 msgstr "visualizza sorgente"
 
-#: builtin/log.c:174
+#: builtin/log.c:178
 msgid "Use mail map file"
 msgstr "Usa il file mappatura e-mail"
 
-#: builtin/log.c:176
+#: builtin/log.c:181
 msgid "only decorate refs that match <pattern>"
 msgstr "decora solo i riferimenti corrispondenti a <pattern>"
 
-#: builtin/log.c:178
+#: builtin/log.c:183
 msgid "do not decorate refs that match <pattern>"
 msgstr "non decorare i riferimenti corrispondenti a <pattern>"
 
-#: builtin/log.c:179
+#: builtin/log.c:184
 msgid "decorate options"
 msgstr "opzioni decorazione"
 
-#: builtin/log.c:182
+#: builtin/log.c:187
 msgid "Process line range n,m in file, counting from 1"
 msgstr "Elabora l'intervallo righe n,m nel file, contandole da 1"
 
-#: builtin/log.c:280
+#: builtin/log.c:297
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Output finale: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:555
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: file non valido"
 
-#: builtin/log.c:549 builtin/log.c:644
+#: builtin/log.c:570 builtin/log.c:665
 #, c-format
 msgid "could not read object %s"
 msgstr "impossibile leggere l'oggetto %s"
 
-#: builtin/log.c:669
+#: builtin/log.c:690
 #, c-format
 msgid "unknown type: %d"
 msgstr "tipo sconosciuto: %d"
 
-#: builtin/log.c:792
+#: builtin/log.c:839
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: modo lettera da descrizione non valido"
+
+#: builtin/log.c:846
 msgid "format.headers without value"
 msgstr "format.headers non ha alcun valore"
 
-#: builtin/log.c:909
+#: builtin/log.c:965
 msgid "name of output directory is too long"
 msgstr "il nome della directory di output è troppo lungo"
 
-#: builtin/log.c:925
+#: builtin/log.c:981
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "impossibile aprire il file patch %s"
 
-#: builtin/log.c:942
+#: builtin/log.c:998
 msgid "need exactly one range"
 msgstr "è necessario specificare esattamente un intervallo"
 
-#: builtin/log.c:952
+#: builtin/log.c:1008
 msgid "not a range"
 msgstr "il valore non è un intervallo"
 
-#: builtin/log.c:1075
+#: builtin/log.c:1172
 msgid "cover letter needs email format"
 msgstr "la lettera di accompagnamento dev'essere in formato e-mail"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1178
 msgid "failed to create cover-letter file"
 msgstr "creazione del file lettera di accompagnamento non riuscita"
 
-#: builtin/log.c:1160
+#: builtin/log.c:1259
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "valore in-reply-to folle: %s"
 
-#: builtin/log.c:1187
+#: builtin/log.c:1286
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<opzioni>] [<da> | <intervallo revisioni>]"
 
-#: builtin/log.c:1245
+#: builtin/log.c:1344
 msgid "two output directories?"
 msgstr "due directory di output?"
 
-#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: builtin/log.c:1495 builtin/log.c:2301 builtin/log.c:2303 builtin/log.c:2315
 #, c-format
 msgid "unknown commit %s"
 msgstr "commit %s sconosciuto"
 
-#: builtin/log.c:1366 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1506 builtin/replace.c:58 builtin/replace.c:207
 #: builtin/replace.c:210
 #, c-format
 msgid "failed to resolve '%s' as a valid ref"
 msgstr "impossibile risolvere '%s' come riferimento valido"
 
-#: builtin/log.c:1371
+#: builtin/log.c:1515
 msgid "could not find exact merge base"
 msgstr "impossibile trovare esattamente la base del merge"
 
-#: builtin/log.c:1375
+#: builtin/log.c:1525
 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"
@@ -14761,278 +16517,293 @@ msgstr ""
 "In alternativa puoi specificare manualmente il commit di base con\n"
 "--base=<ID commit di base>"
 
-#: builtin/log.c:1395
+#: builtin/log.c:1548
 msgid "failed to find exact merge base"
 msgstr "impossibile trovare esattamente la base del merge"
 
-#: builtin/log.c:1406
+#: builtin/log.c:1565
 msgid "base commit should be the ancestor of revision list"
 msgstr "il commit di base dovrebbe essere l'antenato dell'elenco revisioni"
 
-#: builtin/log.c:1410
+#: builtin/log.c:1575
 msgid "base commit shouldn't be in revision list"
 msgstr "il commit di base non dovrebbe essere nell'elenco revisioni"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1633
 msgid "cannot get patch id"
 msgstr "impossibile ottenere l'ID della patch"
 
-#: builtin/log.c:1515
-msgid "failed to infer range-diff ranges"
-msgstr "inferenza degli intervalli range-diff non riuscita"
+#: builtin/log.c:1690
+msgid "failed to infer range-diff origin of current series"
+msgstr "inferenza dell'origine range-diff della serie corrente non riuscita"
 
-#: builtin/log.c:1560
+#: builtin/log.c:1692
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "uso '%s' come origine range-diff della serie corrente"
+
+#: builtin/log.c:1736
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "usa [PATCH n/m] anche con una singola patch"
 
-#: builtin/log.c:1563
+#: builtin/log.c:1739
 msgid "use [PATCH] even with multiple patches"
 msgstr "usa [PATCH] anche con più patch"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1743
 msgid "print patches to standard out"
 msgstr "stampa le patch sullo standard output"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1745
 msgid "generate a cover letter"
 msgstr "genera una lettera di accompagnamento"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1747
 msgid "use simple number sequence for output file names"
 msgstr "usa una sequenza numerica semplice per i nomi file di output"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1748
 msgid "sfx"
 msgstr "suff"
 
-#: builtin/log.c:1573
+#: builtin/log.c:1749
 msgid "use <sfx> instead of '.patch'"
 msgstr "usa <suff> anziché '.patch'"
 
-#: builtin/log.c:1575
+#: builtin/log.c:1751
 msgid "start numbering patches at <n> instead of 1"
 msgstr "inizia a numerare le patch da <n> anziché da 1"
 
-#: builtin/log.c:1577
+#: builtin/log.c:1753
 msgid "mark the series as Nth re-roll"
 msgstr "contrassegna la serie come l'n-esima versione revisionata"
 
-#: builtin/log.c:1579
+#: builtin/log.c:1755
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "Usa [RFC PATCH] anziché [PATCH]"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1758
+msgid "cover-from-description-mode"
+msgstr "modo-lettera-da-descrizione"
+
+#: builtin/log.c:1759
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+"genera parti di una lettera d'accompagnamento basandosi sulla descrizione di "
+"un branch"
+
+#: builtin/log.c:1761
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "Usa [<prefisso>] anziché [PATCH]"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1764
 msgid "store resulting files in <dir>"
 msgstr "salva i file risultanti in <dir>"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1767
 msgid "don't strip/add [PATCH]"
 msgstr "non eliminare/aggiungere [PATCH]"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1770
 msgid "don't output binary diffs"
 msgstr "non mandare in output diff binari"
 
-#: builtin/log.c:1593
+#: builtin/log.c:1772
 msgid "output all-zero hash in From header"
 msgstr "manda in output un hash costituito da soli zeri nell'intestazione From"
 
-#: builtin/log.c:1595
+#: builtin/log.c:1774
 msgid "don't include a patch matching a commit upstream"
 msgstr "non includere una patch corrispondente a un commit upstream"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1776
 msgid "show patch format instead of default (patch + stat)"
 msgstr ""
 "visualizza il formato della patch anziché l'impostazione predefinita (patch "
 "+ stat)"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1778
 msgid "Messaging"
 msgstr "Messaggistica"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1779
 msgid "header"
 msgstr "intestazione"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1780
 msgid "add email header"
 msgstr "aggiungi intestazione e-mail"
 
-#: builtin/log.c:1602 builtin/log.c:1604
+#: builtin/log.c:1781 builtin/log.c:1782
 msgid "email"
 msgstr "e-mail"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1781
 msgid "add To: header"
 msgstr "aggiungi intestazione A:"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1782
 msgid "add Cc: header"
 msgstr "aggiungi intestazione Cc:"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1783
 msgid "ident"
 msgstr "identità"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1784
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr ""
 "imposta l'indirizzo Da a <identità> (o all'identità di chi ha creato il "
 "commit se assente)"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1786
 msgid "message-id"
 msgstr "ID messaggio"
 
-#: builtin/log.c:1610
+#: builtin/log.c:1787
 msgid "make first mail a reply to <message-id>"
 msgstr "rendi la prima e-mail una risposta a <ID messaggio>"
 
-#: builtin/log.c:1611 builtin/log.c:1614
+#: builtin/log.c:1788 builtin/log.c:1791
 msgid "boundary"
 msgstr "delimitatore"
 
-#: builtin/log.c:1612
+#: builtin/log.c:1789
 msgid "attach the patch"
 msgstr "allega la patch"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1792
 msgid "inline the patch"
 msgstr "includi la patch nel messaggio"
 
-#: builtin/log.c:1619
+#: builtin/log.c:1796
 msgid "enable message threading, styles: shallow, deep"
 msgstr ""
 "abilita il raggruppamento messaggi per conversazione, stili: superficiale, "
 "profondo"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1798
 msgid "signature"
 msgstr "firma"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1799
 msgid "add a signature"
 msgstr "aggiungi una firma"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1800
 msgid "base-commit"
 msgstr "commit di base"
 
-#: builtin/log.c:1624
+#: builtin/log.c:1801
 msgid "add prerequisite tree info to the patch series"
 msgstr ""
 "aggiungi le informazioni prerequisito per l'albero alla serie delle patch"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1804
 msgid "add a signature from a file"
 msgstr "aggiungi una firma da file"
 
-#: builtin/log.c:1627
+#: builtin/log.c:1805
 msgid "don't print the patch filenames"
 msgstr "non stampare i nomi file delle patch"
 
-#: builtin/log.c:1629
+#: builtin/log.c:1807
 msgid "show progress while generating patches"
 msgstr "visualizza l'avanzamento dell'operazione di generazione patch"
 
-#: builtin/log.c:1631
+#: builtin/log.c:1809
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 "visualizza le modifiche rispetto a <revisione> nella lettera di "
 "accompagnamento o in una patch singola"
 
-#: builtin/log.c:1634
+#: builtin/log.c:1812
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 "visualizza le modifiche rispetto a <specificatore revisione> nella lettera "
 "di accompagnamento o in una patch singola"
 
-#: builtin/log.c:1636
+#: builtin/log.c:1814
 msgid "percentage by which creation is weighted"
 msgstr "percentuale in base a cui viene pesata la creazione"
 
-#: builtin/log.c:1711
+#: builtin/log.c:1896
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "riga ident non valida: %s"
 
-#: builtin/log.c:1726
+#: builtin/log.c:1911
 msgid "-n and -k are mutually exclusive"
 msgstr "le opzioni -n e -k sono mutuamente esclusive"
 
-#: builtin/log.c:1728
+#: builtin/log.c:1913
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "le opzioni --subject-prefix/--rfc e -k sono mutuamente esclusive"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1921
 msgid "--name-only does not make sense"
 msgstr "--name-only non ha senso"
 
-#: builtin/log.c:1738
+#: builtin/log.c:1923
 msgid "--name-status does not make sense"
 msgstr "--name-status non ha senso"
 
-#: builtin/log.c:1740
+#: builtin/log.c:1925
 msgid "--check does not make sense"
 msgstr "--check non ha senso"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1958
 msgid "standard output, or directory, which one?"
 msgstr "standard output, o directory, quale dei due?"
 
-#: builtin/log.c:1877
+#: builtin/log.c:2062
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff richiede --cover-letter o una singola patch"
 
-#: builtin/log.c:1881
+#: builtin/log.c:2066
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:1882
+#: builtin/log.c:2067
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff rispetto alla versione %d:"
 
-#: builtin/log.c:1888
+#: builtin/log.c:2073
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor richiede --range-diff"
 
-#: builtin/log.c:1892
+#: builtin/log.c:2077
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff richiede --cover-letter o una singola patch"
 
-#: builtin/log.c:1900
+#: builtin/log.c:2085
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:1901
+#: builtin/log.c:2086
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff rispetto alla versione %d:"
 
-#: builtin/log.c:1912
+#: builtin/log.c:2097
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "impossibile leggere il file firma '%s'"
 
-#: builtin/log.c:1948
+#: builtin/log.c:2133
 msgid "Generating patches"
 msgstr "Generazione delle patch in corso"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2177
 msgid "failed to create output files"
 msgstr "creazione dei file di output non riuscita"
 
-#: builtin/log.c:2051
+#: builtin/log.c:2236
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<upstream> [<head> [<limite>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2290
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -15040,113 +16811,113 @@ msgstr ""
 "Impossibile trovare un branch remoto tracciato, specifica <upstream> "
 "manualmente.\n"
 
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:471
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opzioni>] [<file>...]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:527
 msgid "identify the file status with tags"
 msgstr "identifica lo stato del file con i tag"
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:529
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "usa lettere minuscole per i file che si 'assumono non modificati'"
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:531
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "usa lettere minuscole per i file 'fsmonitor clean'"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:533
 msgid "show cached files in the output (default)"
 msgstr "visualizza file in cache nell'output (impostazione predefinita)"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:535
 msgid "show deleted files in the output"
 msgstr "visualizza file eliminati nell'output"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:537
 msgid "show modified files in the output"
 msgstr "visualizza file modificati nell'output"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:539
 msgid "show other files in the output"
 msgstr "visualizza altri file nell'output"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:541
 msgid "show ignored files in the output"
 msgstr "visualizza file ignorati nell'output"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:544
 msgid "show staged contents' object name in the output"
 msgstr ""
 "visualizza il nome dell'oggetto \"contenuti nell'area di staging\" "
 "nell'output"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
 msgid "show files on the filesystem that need to be removed"
 msgstr "visualizza i file nel filesystem che devono essere rimossi"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
 msgid "show 'other' directories' names only"
 msgstr "visualizza solo i nomi delle directory 'altro'"
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:550
 msgid "show line endings of files"
 msgstr "visualizza i fine riga dei file"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:552
 msgid "don't show empty directories"
 msgstr "non visualizzare le directory vuote"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:555
 msgid "show unmerged files in the output"
 msgstr "visualizza file non sottoposti a merge nell'output"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:557
 msgid "show resolve-undo information"
 msgstr "visualizza informazioni resolve-undo"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:559
 msgid "skip files matching pattern"
 msgstr "salta i file corrispondenti a \"espressione regolare\""
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:562
 msgid "exclude patterns are read from <file>"
 msgstr "le espressioni regolari di esclusione sono lette da <file>"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:565
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr ""
 "leggi espressioni regolari di esclusione aggiuntive specifiche per directory "
 "da <file>"
 
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:567
 msgid "add the standard git exclusions"
 msgstr "aggiungi le esclusioni standard di Git"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:571
 msgid "make the output relative to the project top directory"
 msgstr "rendi l'output relativo alla directory radice del progetto"
 
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:574
 msgid "recurse through submodules"
 msgstr "esegui ricorsivamente sui sottomoduli"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "se dei <file> non sono nell'indice, consideralo un errore"
 
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
 msgid "tree-ish"
 msgstr "espressione albero"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:578
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr ""
 "fingi che i percorsi rimossi da <espressione albero> in poi siano ancora "
 "presenti"
 
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:580
 msgid "show debugging data"
 msgstr "visualizza informazioni di debug"
 
@@ -15164,7 +16935,7 @@ msgstr ""
 msgid "do not print remote URL"
 msgstr "non stampare l'URL del remoto"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1392
 msgid "exec"
 msgstr "eseguibile"
 
@@ -15240,192 +17011,305 @@ msgstr ""
 msgid "empty mbox: '%s'"
 msgstr "mbox vuota: '%s'"
 
-#: builtin/merge.c:55
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <commit> <commit>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <commit>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <commit>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <commit> <commit>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <riferimento> [<commit>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "manda in output tutti gli antenati comuni"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "trova gli antenati per un singolo merge a n vie"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "elenca le revisioni non raggiungibili dalle altre"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "il primo argomento è antenato dell'altro?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+"trova il punto di fork di <commit> dal registro dei riferimenti di "
+"<riferimento>"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<opzioni>] [-L <nome1> [-L <originale> [-L <nome2>]]] "
+"<file1> <file originale> <file2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "invia i risultati allo standard output"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "usa un merge basato su diff3"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "per i conflitti, usa la nostra versione"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "per i conflitti, usa la loro versione"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "per i conflitti, usa una versione unita"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "per i conflitti, usa questa dimensione dei contrassegni"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "non emettere avvisi in caso di conflitti"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "imposta etichette per file1/file originale/file2"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "opzione sconosciuta %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "impossibile analizzare l'oggetto '%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] "impossibile gestire più di %d base. Ignoro %s."
+msgstr[1] "impossibile gestire più di %d basi. Ignoro %s."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "non gestisco nulla che non sia il merge di due head."
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "impossibile risolvere il riferimento '%s'"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Merge di %s con %s in corso\n"
+
+#: builtin/merge.c:56
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<opzioni>] [<commit>...]"
 
-#: builtin/merge.c:56
+#: builtin/merge.c:57
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:57
+#: builtin/merge.c:58
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:120
 msgid "switch `m' requires a value"
 msgstr "lo switch 'm' richiede un valore"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:143
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "l'opzione `%s' richiede un valore"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:189
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:190
 #, c-format
 msgid "Available strategies are:"
 msgstr "Le strategie disponibili sono:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:195
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Le strategie personalizzate disponibili sono:"
 
-#: builtin/merge.c:244 builtin/pull.c:152
+#: builtin/merge.c:246 builtin/pull.c:133
 msgid "do not show a diffstat at the end of the merge"
 msgstr "non visualizzare un diffstat al termine del merge"
 
-#: builtin/merge.c:247 builtin/pull.c:155
+#: builtin/merge.c:249 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr "visualizza un diffstat al termine del merge"
 
-#: builtin/merge.c:248 builtin/pull.c:158
+#: builtin/merge.c:250 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(sinonimo di --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:252 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr ""
 "aggiungi (al più <n>) voci dal registro breve al messaggio di commit del "
 "merge"
 
-#: builtin/merge.c:253 builtin/pull.c:167
+#: builtin/merge.c:255 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr "crea un singolo commit anziché eseguire un merge"
 
-#: builtin/merge.c:255 builtin/pull.c:170
+#: builtin/merge.c:257 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "esegui un commit se il merge ha successo (impostazione predefinita)"
 
-#: builtin/merge.c:257 builtin/pull.c:173
+#: builtin/merge.c:259 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "modifica il messaggio prima di eseguire il commit"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:261
 msgid "allow fast-forward (default)"
 msgstr "consenti fast forward (impostazione predefinita)"
 
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:263 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "interrompi se il fast forward non è possibile"
 
-#: builtin/merge.c:265 builtin/pull.c:183
+#: builtin/merge.c:267 builtin/pull.c:164
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "verifica che il commit specificato abbia una firma GPG valida"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114
+#: builtin/merge.c:268 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:533 builtin/rebase.c:1406 builtin/revert.c:114
 msgid "strategy"
 msgstr "strategia"
 
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:269 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "strategia di merge da usare"
 
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:270 builtin/pull.c:172
 msgid "option=value"
 msgstr "opzione=valore"
 
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:271 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "opzione per la strategia di merge selezionata"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:273
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "messaggio di commit del merge (per un merge non fast forward)"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:280
 msgid "abort the current in-progress merge"
 msgstr "interrompi il merge attualmente in corso"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:282
 msgid "--abort but leave index and working tree alone"
 msgstr "esegui --abort ma mantieni immutati l'indice e l'albero di lavoro"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:284
 msgid "continue the current in-progress merge"
 msgstr "continua il merge attualmente in corso"
 
-#: builtin/merge.c:284 builtin/pull.c:199
+#: builtin/merge.c:286 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "consenti di unire cronologie non correlate"
 
-#: builtin/merge.c:290
+#: builtin/merge.c:293
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "ignora gli hook pre-merge-commit e commit-msg"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:310
 msgid "could not run stash."
 msgstr "non è stato possibile eseguire stash."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:315
 msgid "stash failed"
 msgstr "esecuzione di stash non riuscita"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:320
 #, c-format
 msgid "not a valid object: %s"
 msgstr "non è un oggetto valido: %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:342 builtin/merge.c:359
 msgid "read-tree failed"
 msgstr "read-tree non riuscito"
 
-#: builtin/merge.c:386
+#: builtin/merge.c:389
 msgid " (nothing to squash)"
 msgstr " (nulla di cui eseguire lo squash)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:400
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Commit di squash -- non aggiorno HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:450
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:501
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' non punta ad un commit"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:588
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Stringa branch.%s.mergeoptions errata: %s"
 
-#: builtin/merge.c:705
+#: builtin/merge.c:713
 msgid "Not handling anything other than two heads merge."
 msgstr "Non gestisco nulla che non sia il merge di due head."
 
-#: builtin/merge.c:719
+#: builtin/merge.c:726
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Opzione sconosciuta per merge-recursive: -X%s"
 
-#: builtin/merge.c:734
+#: builtin/merge.c:741
 #, c-format
 msgid "unable to write %s"
 msgstr "impossibile scrivere %s"
 
-#: builtin/merge.c:786
+#: builtin/merge.c:793
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Non è stato possibile leggere da '%s'"
 
-#: builtin/merge.c:795
+#: builtin/merge.c:802
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
 "Non eseguo il commit del merge; usa 'git commit' per completare il merge.\n"
 
-#: builtin/merge.c:801
+#: builtin/merge.c:808
 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"
@@ -15436,11 +17320,11 @@ msgstr ""
 "aggiornato in un topic branch.\n"
 "\n"
 
-#: builtin/merge.c:806
+#: builtin/merge.c:813
 msgid "An empty message aborts the commit.\n"
 msgstr "Un messaggio vuoto interromperà il commit.\n"
 
-#: builtin/merge.c:809
+#: builtin/merge.c:816
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -15449,74 +17333,74 @@ msgstr ""
 "Le righe che iniziano con '%c' saranno ignorate e un messaggio vuoto\n"
 "interromperà il commit.\n"
 
-#: builtin/merge.c:862
+#: builtin/merge.c:869
 msgid "Empty commit message."
 msgstr "Messaggio di commit vuoto."
 
-#: builtin/merge.c:877
+#: builtin/merge.c:884
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Splendido.\n"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:945
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
 "Merge automatico fallito; risolvi i conflitti ed esegui il commit\n"
 "del risultato.\n"
 
-#: builtin/merge.c:977
+#: builtin/merge.c:984
 msgid "No current branch."
 msgstr "Nessun branch corrente."
 
-#: builtin/merge.c:979
+#: builtin/merge.c:986
 msgid "No remote for the current branch."
 msgstr "Nessun remote per il branch corrente."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:988
 msgid "No default upstream defined for the current branch."
 msgstr "Nessun upstream di default definito per il branch corrente."
 
-#: builtin/merge.c:986
+#: builtin/merge.c:993
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "Nessun branch che tracci un remoto per %s da %s"
 
-#: builtin/merge.c:1043
+#: builtin/merge.c:1050
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valore errato '%s' nell'ambiente '%s'"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1153
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "non è qualcosa di cui possiamo eseguire il merge in %s: %s"
 
-#: builtin/merge.c:1180
+#: builtin/merge.c:1187
 msgid "not something we can merge"
 msgstr "non è qualcosa di cui possiamo eseguire il merge"
 
-#: builtin/merge.c:1283
+#: builtin/merge.c:1291
 msgid "--abort expects no arguments"
 msgstr "--abort non richiede argomenti"
 
-#: builtin/merge.c:1287
+#: builtin/merge.c:1295
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Non c'è nessun merge da interrompere (MERGE_HEAD mancante)."
 
-#: builtin/merge.c:1296
+#: builtin/merge.c:1313
 msgid "--quit expects no arguments"
 msgstr "--quit non richiede argomenti"
 
-#: builtin/merge.c:1309
+#: builtin/merge.c:1326
 msgid "--continue expects no arguments"
 msgstr "--continue non richiede argomenti"
 
-#: builtin/merge.c:1313
+#: builtin/merge.c:1330
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Non c'è nessun merge in corso (MERGE_HEAD mancante)."
 
-#: builtin/merge.c:1329
+#: builtin/merge.c:1346
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15524,7 +17408,7 @@ msgstr ""
 "Non hai concluso il merge (MERGE_HEAD esiste).\n"
 "Esegui il commit delle modifiche prima di eseguire il merge."
 
-#: builtin/merge.c:1336
+#: builtin/merge.c:1353
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15532,215 +17416,102 @@ msgstr ""
 "Non hai concluso il cherry-pick (CHERRY_PICK_HEAD esiste).\n"
 "Esegui il commit delle modifiche prima di eseguire il merge."
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1356
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Il cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)."
 
-#: builtin/merge.c:1353
+#: builtin/merge.c:1370
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Non è possibile combinare --squash con --no-ff."
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1372
 msgid "You cannot combine --squash with --commit."
 msgstr "Non è possibile combinare --squash con --commit."
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1388
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Nessun commit specificato e merge.defaultToUpstream non impostato."
 
-#: builtin/merge.c:1388
+#: builtin/merge.c:1405
 msgid "Squash commit into empty head not supported yet"
 msgstr "Lo squash di un commit in un'head vuota non è ancora supportato"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1407
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Un commit non fast forward non ha senso in un'head vuota"
 
-#: builtin/merge.c:1395
+#: builtin/merge.c:1412
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - non è qualcosa per cui possiamo eseguire il merge"
 
-#: builtin/merge.c:1397
+#: builtin/merge.c:1414
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Si può eseguire solo il merge di uno e un solo commit in un'head vuota"
 
-#: builtin/merge.c:1476
+#: builtin/merge.c:1495
 msgid "refusing to merge unrelated histories"
 msgstr "mi rifiuto di eseguire il merge di cronologie non correlate"
 
-#: builtin/merge.c:1485
+#: builtin/merge.c:1504
 msgid "Already up to date."
 msgstr "Già aggiornato."
 
-#: builtin/merge.c:1495
+#: builtin/merge.c:1514
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Aggiornamento di %s..%s\n"
 
-#: builtin/merge.c:1537
+#: builtin/merge.c:1560
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Provo con un merge veramente banale dentro l'indice...\n"
 
-#: builtin/merge.c:1544
+#: builtin/merge.c:1567
 #, c-format
 msgid "Nope.\n"
 msgstr "No.\n"
 
-#: builtin/merge.c:1569
+#: builtin/merge.c:1592
 msgid "Already up to date. Yeeah!"
 msgstr "Già aggiornato. Oh sì!"
 
-#: builtin/merge.c:1575
+#: builtin/merge.c:1598
 msgid "Not possible to fast-forward, aborting."
 msgstr "Fast forward non possibile, interrompo l'operazione."
 
-#: builtin/merge.c:1598 builtin/merge.c:1663
+#: builtin/merge.c:1626 builtin/merge.c:1691
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Ripristino l'albero in uno stato pulito...\n"
 
-#: builtin/merge.c:1602
+#: builtin/merge.c:1630
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Tentativo con la strategia di merge %s...\n"
 
-#: builtin/merge.c:1654
+#: builtin/merge.c:1682
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Nessuna strategia di merge ha gestito il merge.\n"
 
-#: builtin/merge.c:1656
+#: builtin/merge.c:1684
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Merge con la strategia %s fallito.\n"
 
-#: builtin/merge.c:1665
+#: builtin/merge.c:1693
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "Uso %s per preparare una risoluzione manuale.\n"
 
-#: builtin/merge.c:1677
+#: builtin/merge.c:1707
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Il merge automatico è andato a buon fine; fermato prima del commit come "
 "richiesto\n"
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <commit> <commit>..."
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <commit>..."
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <commit>..."
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <commit> <commit>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <riferimento> [<commit>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "manda in output tutti gli antenati comuni"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "trova gli antenati per un singolo merge a n vie"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "elenca le revisioni non raggiungibili dalle altre"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "il primo argomento è antenato dell'altro?"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr ""
-"trova il punto di fork di <commit> dal registro dei riferimenti di "
-"<riferimento>"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-"git merge-file [<opzioni>] [-L <nome1> [-L <originale> [-L <nome2>]]] "
-"<file1> <file originale> <file2>"
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr "invia i risultati allo standard output"
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "usa un merge basato su diff3"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "per i conflitti, usa la nostra versione"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "per i conflitti, usa la loro versione"
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr "per i conflitti, usa una versione unita"
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr "per i conflitti, usa questa dimensione dei contrassegni"
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "non emettere avvisi in caso di conflitti"
-
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "imposta etichette per file1/file originale/file2"
-
-#: builtin/merge-recursive.c:47
-#, c-format
-msgid "unknown option %s"
-msgstr "opzione sconosciuta %s"
-
-#: builtin/merge-recursive.c:53
-#, c-format
-msgid "could not parse object '%s'"
-msgstr "impossibile analizzare l'oggetto '%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] "impossibile gestire più di %d base. Ignoro %s."
-msgstr[1] "impossibile gestire più di %d basi. Ignoro %s."
-
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr "non gestisco nulla che non sia il merge di due head."
-
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "impossibile risolvere il riferimento '%s'"
-
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "Merge di %s con %s in corso\n"
-
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
@@ -15759,18 +17530,18 @@ msgstr "consenti la creazione di più di un albero"
 
 #: builtin/multi-pack-index.c:9
 msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
-"git multi-pack-index [--object-dir=<directory>] (write|verify|expire|repack "
-"--batch-size=<dimensione>)"
+"git multi-pack-index [<opzioni>] (write|verify|expire|repack --batch-"
+"size=<dimensione>)"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 "directory oggetti contenente un insieme di coppie packfile e pack-index"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:29
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15778,15 +17549,15 @@ msgstr ""
 "durante il repack, raccogli i file pack di dimensioni più piccole in un "
 "gruppo più grande di queste dimensioni"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
 msgid "too many arguments"
 msgstr "troppi argomenti"
 
-#: builtin/multi-pack-index.c:52
+#: builtin/multi-pack-index.c:60
 msgid "--batch-size option is only for 'repack' subcommand"
 msgstr "l'opzione --batch-size è consentita solo per il sottocomando 'repack'"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:69
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "sottocomando sconosciuto: %s"
@@ -15819,113 +17590,117 @@ msgstr "forza spostamento/ridenominazione anche se la destinazione esiste"
 msgid "skip move/rename errors"
 msgstr "salta errori spostamento/ridenominazione"
 
-#: builtin/mv.c:169
+#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "la destinazione '%s' non è una directory"
 
-#: builtin/mv.c:180
+#: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Controllo la ridenominazione di '%s' in '%s'\n"
 
-#: builtin/mv.c:184
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr "sourgente errata"
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 msgid "can not move directory into itself"
 msgstr "non è possibile spostare la directory in sé stessa"
 
-#: builtin/mv.c:190
+#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr "non è possibile spostare la directory su un file"
 
-#: builtin/mv.c:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr "la directory sorgente è vuota"
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 msgid "not under version control"
 msgstr "non è sotto controllo di versione"
 
 #: builtin/mv.c:227
+msgid "conflicted"
+msgstr "conflitto"
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "la destinazione esiste"
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "sovrascrittura di %s in corso"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "Impossibile sovrascrivere"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr "fonti multiple per la stessa destinazione"
 
-#: builtin/mv.c:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "la directory di destinazione non esiste"
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, sorgente=%s, destinazione=%s"
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Rinominazione di %s in %s in corso\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:280 builtin/remote.c:782 builtin/repack.c:518
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "rinomina di '%s' non riuscita"
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opzioni>] <commit>..."
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opzioni>] --all"
 
-#: builtin/name-rev.c:358
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opzioni>] --stdin"
 
-#: builtin/name-rev.c:415
-msgid "print only names (no SHA-1)"
-msgstr "stampa solo i nomi (non lo SHA-1)"
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr "stampa solo i nomi basati sui riferimenti (non i nomi oggetto)"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "usa solo tag per denominare i commit"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "usa solo i riferimenti corrispondenti a <pattern>"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignora i riferimenti corrispondenti a <pattern>"
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "elenca tutti i commit raggiungibili da tutti i riferimenti"
 
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "leggi dallo standard input"
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "consenti di stampare nomi `non definito` (impostazione predefinita)"
 
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "dereferenzia tag nell'input (uso interno)"
 
@@ -16073,7 +17848,7 @@ msgstr "impossibile scrivere l'oggetto nota"
 msgid "the note contents have been left in %s"
 msgstr "i contenuti della nota sono stati lasciati in %s"
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:533
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "non è stato possibile aprire o leggere '%s'"
@@ -16311,7 +18086,7 @@ msgstr ""
 "esegui il commit del risultato con 'git notes merge --commit' o interrompi "
 "il merge con 'git notes merge --abort'.\n"
 
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:546
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Risoluzione di '%s' come riferimento valido non riuscita."
@@ -16329,7 +18104,7 @@ msgstr "il tentativo di rimuovere una nota inesistente non è un errore"
 msgid "read object names from the standard input"
 msgstr "leggi i nomi degli oggetti dallo standard input"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
 msgid "do not remove, show only"
 msgstr "non rimuovere, limitati a visualizzare"
 
@@ -16345,148 +18120,142 @@ msgstr "riferimento note"
 msgid "use notes from <notes-ref>"
 msgstr "usa le note in <riferimento note>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1605
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "sottocomando sconosciuto: %s"
 
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:54
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects --stdout [<opzioni>...] [< <elenco riferimenti> | < <elenco "
 "oggetti>]"
 
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:55
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr ""
 "git pack-objects [<opzioni>...] <nome base> [< <elenco riferimenti> | < "
 "<elenco oggetti>]"
 
-#: builtin/pack-objects.c:428
+#: builtin/pack-objects.c:443
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "CRC oggetto sottoposto a pack %s errato"
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:454
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "oggetto sottoposto a pack %s corrotto"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:585
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "rilevato delta ricorsivo per l'oggetto %s"
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:796
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "%u oggetti ordinati, attesi %<PRIu32>"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "packfile non valido: %s"
-
-#: builtin/pack-objects.c:798
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "impossibile aprire il packfile per il suo riuso: %s"
-
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "impossibile eseguire seek nel packfile riusato"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "impossibile leggere dal packfile riusato"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:1004
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr ""
 "disabilito la scrittura delle bitmap, i pack sono divisi a causa "
 "dell'impostazione pack.packSizeLimit"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:1017
 msgid "Writing objects"
 msgstr "Scrittura degli oggetti in corso"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1078 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "stat di %s non riuscito"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1131
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "scritti %<PRIu32> oggetti quando me ne attendevo %<PRIu32>"
 
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1348
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr ""
 "disabilito la scrittura delle bitmap perché alcuni oggetti non saranno "
 "sottoposti a pack"
 
-#: builtin/pack-objects.c:1592
+#: builtin/pack-objects.c:1796
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "overflow dell'offset base del delta nel pack per %s"
 
-#: builtin/pack-objects.c:1601
+#: builtin/pack-objects.c:1805
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "offset base del delta fuori dall'intervallo consentito per %s"
 
-#: builtin/pack-objects.c:1870
+#: builtin/pack-objects.c:2086
 msgid "Counting objects"
 msgstr "Conteggio degli oggetti in corso"
 
-#: builtin/pack-objects.c:2000
-#, c-format
-msgid "unable to get size of %s"
-msgstr "impossibile recuperare le dimensioni di %s"
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c:2231
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "impossibile analizzare l'intestazione oggetto di %s"
 
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317
+#: builtin/pack-objects.c:2327
 #, c-format
 msgid "object %s cannot be read"
 msgstr "impossibile leggere l'oggetto %s"
 
-#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
+#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 "oggetto %s: lunghezza oggetto inconsistente (%<PRIuMAX> contro %<PRIuMAX>)"
 
-#: builtin/pack-objects.c:2125
+#: builtin/pack-objects.c:2341
 msgid "suboptimal pack - out of memory"
 msgstr "pack subottimo - memoria esaurita"
 
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2656
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Compressione delta in corso, uso fino a %d thread"
 
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2795
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "impossibile eseguire il pack degli oggetti raggiungibili dal tag %s"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2883
 msgid "Compressing objects"
 msgstr "Compressione oggetti in corso"
 
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:2889
 msgid "inconsistency with delta count"
 msgstr "inconsistenza con il numero dei delta"
 
-#: builtin/pack-objects.c:2742
+#: builtin/pack-objects.c:2961
+#, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
+"il valore di uploadpack.blobpackfileuri dev'essere nella forma '<hash "
+"oggetto> <hash pack> <URI>' (ricevuto '%s')"
+
+#: builtin/pack-objects.c:2964
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"oggetto già configurato in un altro uploadpack.blobpackfileuri (ricevuto "
+"'%s')"
+
+#: builtin/pack-objects.c:2993
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16495,7 +18264,7 @@ msgstr ""
 "atteso ID oggetto arco, ricevuti dati errati:\n"
 " %s"
 
-#: builtin/pack-objects.c:2748
+#: builtin/pack-objects.c:2999
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16504,256 +18273,251 @@ msgstr ""
 "atteso ID oggetto, ricevuti dati errati:\n"
 " %s"
 
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:3097
 msgid "invalid value for --missing"
 msgstr "valore non valido per --missing"
 
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
 msgid "cannot open pack index"
 msgstr "impossibile aprire l'indice pack"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3187
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "impossibile esaminare l'oggetto sciolto %s"
 
-#: builtin/pack-objects.c:3021
+#: builtin/pack-objects.c:3272
 msgid "unable to force loose object"
 msgstr "impossibile forzare l'oggetto sciolto"
 
-#: builtin/pack-objects.c:3113
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "not a rev '%s'"
 msgstr "'%s' non è una revisione"
 
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3368
 #, c-format
 msgid "bad revision '%s'"
 msgstr "revisione '%s' errata"
 
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3393
 msgid "unable to add recent objects"
 msgstr "impossibile aggiungere gli oggetti recenti"
 
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3446
 #, c-format
 msgid "unsupported index version %s"
 msgstr "versione %s di index non supportata"
 
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3450
 #, c-format
 msgid "bad index version '%s'"
 msgstr "versione '%s' di index errata"
 
-#: builtin/pack-objects.c:3228
-msgid "do not show progress meter"
-msgstr "non visualizzare la barra di avanzamento"
-
-#: builtin/pack-objects.c:3230
-msgid "show progress meter"
-msgstr "visualizza la barra di avanzamento"
-
-#: builtin/pack-objects.c:3232
-msgid "show progress meter during object writing phase"
-msgstr ""
-"visualizza la barra di avanzamento durante la fase di scrittura oggetti"
-
-#: builtin/pack-objects.c:3235
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "simile a --all-progress quando è visualizzata la barra di avanzamento"
-
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3488
 msgid "<version>[,<offset>]"
 msgstr "<versione>[,<offset>]"
 
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3489
 msgid "write the pack index file in the specified idx format version"
 msgstr "scrivi il file indice pack usando la versione formato idx specificata"
 
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3492
 msgid "maximum size of each output pack file"
 msgstr "dimensione massima di ogni file pack in output"
 
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3494
 msgid "ignore borrowed objects from alternate object store"
 msgstr "ignora gli oggetti presi in prestito dallo store oggetti alternativo"
 
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3496
 msgid "ignore packed objects"
 msgstr "ignora gli oggetti sottoposti a pack"
 
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3498
 msgid "limit pack window by objects"
 msgstr "limita la finestra di pack al numero di oggetti specificato"
 
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3500
 msgid "limit pack window by memory in addition to object limit"
 msgstr ""
 "limita la finestra di pack alla memoria specificata in aggiunta al limite "
 "sugli oggetti"
 
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3502
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "lunghezza massima della catena di delta consentita nel pack risultante"
 
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3504
 msgid "reuse existing deltas"
 msgstr "riusa i delta esistenti"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3506
 msgid "reuse existing objects"
 msgstr "riusa gli oggetti esistenti"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3508
 msgid "use OFS_DELTA objects"
 msgstr "usa oggetti OFS_DELTA"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3510
 msgid "use threads when searching for best delta matches"
 msgstr ""
 "usa più thread durante la ricerca delle migliori corrispondenze per i delta"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3512
 msgid "do not create an empty pack output"
 msgstr "non creare un output pack vuoto"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3514
 msgid "read revision arguments from standard input"
 msgstr "leggi gli argomenti revisione dallo standard input"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3516
 msgid "limit the objects to those that are not yet packed"
 msgstr "limita gli oggetti a quelli non ancora sottoposti a pack"
 
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3519
 msgid "include objects reachable from any reference"
 msgstr "includi gli oggetti raggiungibili da qualunque riferimento"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3522
 msgid "include objects referred by reflog entries"
 msgstr "includi gli oggetti referenziati da voci del log riferimenti"
 
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3525
 msgid "include objects referred to by the index"
 msgstr "includi gli oggetti referenziati dall'indice"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3528
 msgid "output pack to stdout"
 msgstr "invia il pack in output sullo standard output"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3530
 msgid "include tag objects that refer to objects to be packed"
 msgstr ""
 "includi gli oggetti tag che fanno riferimento agli oggetti da sottoporre a "
 "pack"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3532
 msgid "keep unreachable objects"
 msgstr "mantieni gli oggetti non raggiungibili"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3534
 msgid "pack loose unreachable objects"
 msgstr "esegui il pack degli oggetti non raggiungibili sciolti"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3536
 msgid "unpack unreachable objects newer than <time>"
 msgstr "decomprimi gli oggetti non raggiungibili più recenti di <tempo>"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3539
 msgid "use the sparse reachability algorithm"
 msgstr "usa l'algoritmo di raggiungibilità sparse"
 
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3541
 msgid "create thin packs"
 msgstr "crea pack thin"
 
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3543
 msgid "create packs suitable for shallow fetches"
 msgstr "crea pack adatti per fetch shallow"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3545
 msgid "ignore packs that have companion .keep file"
 msgstr "ignora i pack che hanno un file .keep che li accompagna"
 
-#: builtin/pack-objects.c:3295
+#: builtin/pack-objects.c:3547
 msgid "ignore this pack"
 msgstr "ignora questo pack"
 
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3549
 msgid "pack compression level"
 msgstr "livello compressione pack"
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3551
 msgid "do not hide commits by grafts"
 msgstr "non nascondere i commit innestati"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3553
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr ""
 "usa un indice bitmap se disponibile per velocizzare il conteggio degli "
 "oggetti"
 
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3555
 msgid "write a bitmap index together with the pack index"
 msgstr "scrivi un indice bitmap insieme all'indice pack"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3559
 msgid "write a bitmap index if possible"
 msgstr "scrivi un indice bitmap se possibile"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3563
 msgid "handling for missing objects"
 msgstr "azione da eseguire sugli oggetti mancanti"
 
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3566
 msgid "do not pack objects in promisor packfiles"
 msgstr "non eseguire il pack degli oggetti nei file pack promettenti"
 
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3568
 msgid "respect islands during delta compression"
 msgstr "rispetta le isole durante la compressione delta"
 
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3570
+msgid "protocol"
+msgstr "protocollo"
+
+#: builtin/pack-objects.c:3571
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"escludi tutti gli uploadpack.blobpackfileuri configurati con questo "
+"protocollo"
+
+#: builtin/pack-objects.c:3600
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "la profondità della catena dei delta (%d) è troppo elevata, forzo %d"
 
-#: builtin/pack-objects.c:3350
+#: builtin/pack-objects.c:3605
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "il valore pack.deltaCacheLimit è troppo elevato, forzo %d"
 
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:3659
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 "--max-pack-size non può essere usato per generare un pack da trasferire"
 
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:3661
 msgid "minimum pack size limit is 1 MiB"
 msgstr "il limite minimo delle dimensioni dei pack è 1 MiB"
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:3666
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin non può essere usato per generare un pack indicizzabile"
 
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3669
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable e --unpack-unreachable non sono compatibili"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:3675
 msgid "cannot use --filter without --stdout"
 msgstr "impossibile usare --filter senza --stdout"
 
-#: builtin/pack-objects.c:3481
+#: builtin/pack-objects.c:3735
 msgid "Enumerating objects"
 msgstr "Enumerazione degli oggetti in corso"
 
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:3766
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
 msgstr ""
 "%<PRIu32> oggetti totali (%<PRIu32> delta), %<PRIu32> riutilizzati "
-"(%<PRIu32> delta)"
+"(%<PRIu32> delta), %<PRIu32> riutilizzati nel file pack"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16767,82 +18531,109 @@ msgstr "esegui il pack di tutto"
 msgid "prune loose refs (default)"
 msgstr "elimina i riferimenti sciolti (impostazione predefinita)"
 
-#: builtin/prune-packed.c:9
+#: 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-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "Rimozione oggetti duplicati in corso"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <tempo>] [--] [<head>...]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "segnala gli oggetti ripuliti"
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "fai scadere oggetti più vecchi di <tempo>"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "limita la visita agli oggetti al di fuori dei file pack promettenti"
 
-#: builtin/prune.c:150
+#: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
 msgstr ""
 "impossibile eseguire l'eliminazione in un repository 'oggetti preziosi'"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valore non valido per %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opzioni>] [<repository> [<specificatore riferimento>...]]"
 
-#: builtin/pull.c:142
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "controlla il recupero ricorsivo dei sottomoduli"
 
-#: builtin/pull.c:146
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Opzioni relative al merge"
 
-#: builtin/pull.c:149
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorpora le modifiche eseguendo un rebase anziché un merge"
 
-#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:484 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "consenti fast forward"
 
-#: builtin/pull.c:186
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "esegui stash/stash pop automaticamente prima e dopo il rebase"
+#: builtin/pull.c:167 parse-options.h:339
+msgid "automatically stash/stash pop before and after"
+msgstr "esegui stash/stash pop automaticamente prima e dopo"
 
-#: builtin/pull.c:202
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Opzioni relative al fetch"
 
-#: builtin/pull.c:212
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "forza la sovrascrittura del branch locale"
 
-#: builtin/pull.c:220
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "numero di sottomoduli recuperati in parallelo"
 
-#: builtin/pull.c:320
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valore non valido per pull.ff: %s"
 
-#: builtin/pull.c:437
+#: 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 ""
+"L'esecuzione di un pull senza specificare come riconciliare branch\n"
+"divergenti non è consigliata. È possibile sopprimere questo messaggio\n"
+"eseguendo uno dei seguenti comandi prima di eseguire il prossimo pull:\n"
+"\n"
+"  git config pull.rebase false  # merge (strategia predefinita)\n"
+"  git config pull.rebase true   # rebase\n"
+"  git config pull.ff only       # esegui solo fast forward\n"
+"\n"
+"Puoi sostituire \"git config\" con \"git config --global\" per impostare "
+"una\n"
+"preferenza predefinita per tutti i repository. Puoi anche passare gli\n"
+"argomenti --rebase, --no-rebase o --ff-only sulla riga di comando per\n"
+"eseguire l'override del valore predefinito configurato per una singola\n"
+"invocazione.\n"
+
+#: builtin/pull.c:458
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16850,14 +18641,14 @@ msgstr ""
 "Non ci sono candidati in base ai quali eseguire il rebase fra i riferimenti "
 "appena recuperati."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:460
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr ""
 "Non ci sono candidati in base ai quali eseguire il merge fra i riferimenti "
 "appena recuperati."
 
-#: builtin/pull.c:440
+#: builtin/pull.c:461
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16865,7 +18656,7 @@ msgstr ""
 "In generale, questo significa che hai fornito uno specificatore\n"
 "riferimento che non aveva corrispondenze nel remoto."
 
-#: builtin/pull.c:443
+#: builtin/pull.c:464
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16877,44 +18668,44 @@ msgstr ""
 "configurato come predefinito per il branch corrente, devi\n"
 "specificare un branch sulla riga di comando."
 
-#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73
+#: builtin/pull.c:469 builtin/rebase.c:1240 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "Attualmente non sei su un branch."
 
-#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:471 builtin/pull.c:486 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "Specifica il branch in base a cui vuoi effettuare il rebase."
 
-#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:473 builtin/pull.c:488 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "Specifica il branch in base a cui vuoi effettuare il merge."
 
-#: builtin/pull.c:453 builtin/pull.c:468
+#: builtin/pull.c:474 builtin/pull.c:489
 msgid "See git-pull(1) for details."
 msgstr "Vedi git-pull(1) per ulteriori dettagli."
 
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1353 git-parse-remote.sh:64
+#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
+#: builtin/rebase.c:1246 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<remoto>"
 
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
+#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<branch>"
 
-#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
+#: builtin/pull.c:484 builtin/rebase.c:1238 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "Non ci sono informazioni di tracciamento per il branch corrente."
 
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: builtin/pull.c:493 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr ""
 "Se vuoi impostare le informazioni di tracciamento per questo branch puoi "
 "farlo con:"
 
-#: builtin/pull.c:477
+#: builtin/pull.c:498
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16924,32 +18715,28 @@ msgstr ""
 "il merge con il riferimento '%s' del remoto, ma un tale\n"
 "riferimento non è stato recuperato."
 
-#: builtin/pull.c:587
+#: builtin/pull.c:609
 #, c-format
 msgid "unable to access commit %s"
 msgstr "impossibile accedere al commit %s"
 
-#: builtin/pull.c:867
+#: builtin/pull.c:894
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignoro --verify-signature per il rebase"
 
-#: builtin/pull.c:922
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "l'opzione --[no-]autostash option è valida solo con --rebase."
-
-#: builtin/pull.c:930
+#: builtin/pull.c:954
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Aggiorno un branch non nato con le modifiche aggiunte all'indice."
 
-#: builtin/pull.c:934
+#: builtin/pull.c:958
 msgid "pull with rebase"
 msgstr "pull con rebase"
 
-#: builtin/pull.c:935
+#: builtin/pull.c:959
 msgid "please commit or stash them."
 msgstr "eseguine il commit o lo stash."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:984
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16961,7 +18748,7 @@ msgstr ""
 "Eseguo il fast forward dell'albero\n"
 "di lavoro dal commit %s."
 
-#: builtin/pull.c:966
+#: builtin/pull.c:990
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16980,15 +18767,15 @@ msgstr ""
 "$ git reset --hard\n"
 "per eseguire il ripristino."
 
-#: builtin/pull.c:981
+#: builtin/pull.c:1005
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Impossibile eseguire il merge di più branch in un head vuoto."
 
-#: builtin/pull.c:985
+#: builtin/pull.c:1009
 msgid "Cannot rebase onto multiple branches."
 msgstr "Impossibile eseguire il rebase su più branch."
 
-#: builtin/pull.c:992
+#: builtin/pull.c:1017
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr ""
 "impossibile eseguire il rebase se ci sono delle modifiche registrate "
@@ -17002,11 +18789,11 @@ msgstr "git push [<opzioni>] [<repository> [<specificatore riferimento>...]]"
 msgid "tag shorthand without <tag>"
 msgstr "esegui il tag della forma breve senza <tag>"
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete accetta solo nomi dei ref di destinazione in chiaro"
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -17015,7 +18802,7 @@ msgstr ""
 "Per scegliere permanentemente una delle due opzioni, vedi push.default in "
 "'git help config'."
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -17040,7 +18827,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -17055,7 +18842,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<nome del branch remoto>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:194
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -17069,13 +18856,13 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:202
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr ""
 "Il branch corrente %s ha più branch upstream, mi rifiuto di eseguire il push."
 
-#: builtin/push.c:210
+#: builtin/push.c:205
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -17086,14 +18873,14 @@ msgstr ""
 "branch corrente '%s', senza dirmi di cosa devo eseguire il push\n"
 "per aggiornare quale branch remoto."
 
-#: builtin/push.c:269
+#: builtin/push.c:260
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr ""
 "Non è stato specificato alcun refspec per il push, e push.default è \"nothing"
 "\"."
 
-#: builtin/push.c:276
+#: builtin/push.c:267
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -17107,7 +18894,7 @@ msgstr ""
 "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
 "dettagli."
 
-#: builtin/push.c:282
+#: builtin/push.c:273
 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"
@@ -17122,7 +18909,7 @@ msgstr ""
 "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
 "dettagli."
 
-#: builtin/push.c:288
+#: builtin/push.c:279
 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"
@@ -17138,12 +18925,12 @@ msgstr ""
 "Vedi la 'Nota sui fast forward' in 'git push --help' per ulteriori\n"
 "dettagli."
 
-#: builtin/push.c:295
+#: builtin/push.c:286
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr ""
 "Gli aggiornamenti sono stati rifiutati perché il tag esiste già nel remoto."
 
-#: builtin/push.c:298
+#: builtin/push.c:289
 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"
@@ -17154,100 +18941,100 @@ msgstr ""
 "puntare a un oggetto diverso da un commit senza usare l'opzione\n"
 "'--force'.\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:351
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Push su %s in corso\n"
 
-#: builtin/push.c:366
+#: builtin/push.c:358
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "push di alcuni riferimenti su '%s' non riuscito"
 
-#: builtin/push.c:541
+#: builtin/push.c:532
 msgid "repository"
 msgstr "repository"
 
-#: builtin/push.c:542 builtin/send-pack.c:164
+#: builtin/push.c:533 builtin/send-pack.c:183
 msgid "push all refs"
 msgstr "esegui il push di tutti i riferimenti"
 
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:534 builtin/send-pack.c:185
 msgid "mirror all refs"
 msgstr "esegui il mirror di tutti i riferimenti"
 
-#: builtin/push.c:545
+#: builtin/push.c:536
 msgid "delete refs"
 msgstr "elimina riferimenti"
 
-#: builtin/push.c:546
+#: builtin/push.c:537
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "esegui il push dei tag (non può essere usato con --all o --mirror)"
 
-#: builtin/push.c:549 builtin/send-pack.c:167
+#: builtin/push.c:540 builtin/send-pack.c:186
 msgid "force updates"
 msgstr "forza gli aggiornamenti"
 
-#: builtin/push.c:551 builtin/send-pack.c:181
+#: builtin/push.c:541 builtin/send-pack.c:198
 msgid "<refname>:<expect>"
 msgstr "<nome riferimento>:<valore atteso>"
 
-#: builtin/push.c:552 builtin/send-pack.c:182
+#: builtin/push.c:542 builtin/send-pack.c:199
 msgid "require old value of ref to be at this value"
 msgstr ""
 "richiedi che il vecchio valore del riferimento corrisponda a questo valore"
 
-#: builtin/push.c:555
+#: builtin/push.c:545
 msgid "control recursive pushing of submodules"
 msgstr "controlla il push ricorsivo dei sottomoduli"
 
-#: builtin/push.c:557 builtin/send-pack.c:175
+#: builtin/push.c:546 builtin/send-pack.c:193
 msgid "use thin pack"
 msgstr "usa un thin pack"
 
-#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:547 builtin/push.c:548 builtin/send-pack.c:180
+#: builtin/send-pack.c:181
 msgid "receive pack program"
 msgstr "programma ricezione pack"
 
-#: builtin/push.c:560
+#: builtin/push.c:549
 msgid "set upstream for git pull/status"
 msgstr "imposta l'upstream per git pull/status"
 
-#: builtin/push.c:563
+#: builtin/push.c:552
 msgid "prune locally removed refs"
 msgstr "elimina i riferimenti rimossi localmente"
 
-#: builtin/push.c:565
+#: builtin/push.c:554
 msgid "bypass pre-push hook"
 msgstr "ignora l'hook pre-push"
 
-#: builtin/push.c:566
+#: builtin/push.c:555
 msgid "push missing but relevant tags"
 msgstr "esegui il push dei tag mancanti ma rilevanti"
 
-#: builtin/push.c:569 builtin/send-pack.c:169
+#: builtin/push.c:557 builtin/send-pack.c:187
 msgid "GPG sign the push"
 msgstr "firma il push con GPG"
 
-#: builtin/push.c:571 builtin/send-pack.c:176
+#: builtin/push.c:559 builtin/send-pack.c:194
 msgid "request atomic transaction on remote side"
 msgstr "richiedi l'atomicità della transazione al remoto"
 
-#: builtin/push.c:589
+#: builtin/push.c:577
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete non è compatibile con --all, --mirror e --tags"
 
-#: builtin/push.c:591
+#: builtin/push.c:579
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete non ha senso senza alcun ref"
 
-#: builtin/push.c:611
+#: builtin/push.c:599
 #, c-format
 msgid "bad repository '%s'"
 msgstr "repository '%s' errato"
 
-#: builtin/push.c:612
+#: builtin/push.c:600
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -17269,27 +19056,27 @@ msgstr ""
 "\n"
 "    git push <nome>\n"
 
-#: builtin/push.c:627
+#: builtin/push.c:615
 msgid "--all and --tags are incompatible"
 msgstr "--all e --tags non sono compatibili"
 
-#: builtin/push.c:629
+#: builtin/push.c:617
 msgid "--all can't be combined with refspecs"
 msgstr "--all non può essere combinato con degli specificatori riferimento"
 
-#: builtin/push.c:633
+#: builtin/push.c:621
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror e --tags non sono compatibili"
 
-#: builtin/push.c:635
+#: builtin/push.c:623
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror non può essere combinato con degli specificatori riferimento"
 
-#: builtin/push.c:638
+#: builtin/push.c:626
 msgid "--all and --mirror are incompatible"
 msgstr "--all e --mirror non sono compatibili"
 
-#: builtin/push.c:642
+#: builtin/push.c:630
 msgid "push options must not have new line characters"
 msgstr "le opzioni push non devono avere caratteri di fine riga"
 
@@ -17310,24 +19097,32 @@ msgstr ""
 "git range-diff [<opzioni>] <base> <vecchio ultimo commit> <nuovo ultimo "
 "commit>"
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr "Percentuale in base a cui viene pesata la creazione"
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr "usa colori semplici per il diff"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr "note"
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr "passato a 'git log'"
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr "nessun .. nell'intervallo: '%s'"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr "il formato dell'unico argomento dev'essere un intervallo simmetrico"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr "devono essere specificati due intervalli commit"
 
@@ -17410,7 +19205,11 @@ msgstr "esegui il debug di unpack-trees"
 msgid "suppress feedback messages"
 msgstr "non visualizzare i messaggi di feedback"
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Prima devi risolvere l'indice corrente"
+
+#: builtin/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -17418,228 +19217,205 @@ msgstr ""
 "git rebase [-i] [opzioni] [--exec <comando>] [--onto <nuova base> | --keep-"
 "base] [<upstream> [<branch>]]"
 
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [options] [--exec <comando>] [--onto <nuova base>] --root "
 "[<branch>]"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:187 builtin/rebase.c:211 builtin/rebase.c:238
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "elenco todo inutilizzabile: '%s'"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "impossibile scrivere '%s'."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "nessun'HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:304
 #, c-format
 msgid "could not create temporary %s"
 msgstr "impossibile creare un %s temporaneo"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:310
 msgid "could not mark as interactive"
 msgstr "impossibile contrassegnare come interattivo"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:364
 msgid "could not generate todo list"
 msgstr "impossibile generare l'elenco todo"
 
-#: builtin/rebase.c:383
+#: builtin/rebase.c:405
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 "le opzioni --upstream o --onto richiedono che sia fornito un commit di base"
 
-#: builtin/rebase.c:438
+#: builtin/rebase.c:474
 msgid "git rebase--interactive [<options>]"
-msgstr "git rebase --interactive [<opzioni>]"
+msgstr "git rebase--interactive [<opzioni>]"
 
-#: builtin/rebase.c:450
-msgid "keep empty commits"
-msgstr "mantieni i commit vuoti"
+#: builtin/rebase.c:487 builtin/rebase.c:1382
+msgid "keep commits which start empty"
+msgstr "mantieni i commit che iniziano vuoti"
 
-#: builtin/rebase.c:452 builtin/revert.c:128
+#: builtin/rebase.c:491 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "consenti commit con messaggi vuoti"
 
-#: builtin/rebase.c:453
+#: builtin/rebase.c:493
 msgid "rebase merge commits"
 msgstr "esegui il rebase dei commit di merge"
 
-#: builtin/rebase.c:455
+#: builtin/rebase.c:495
 msgid "keep original branch points of cousins"
 msgstr "mantieni i punti di branch originali dei cugini"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:497
 msgid "move commits that begin with squash!/fixup!"
 msgstr "sposta i commit che iniziano con squash!/fixup!"
 
-#: builtin/rebase.c:458
+#: builtin/rebase.c:498
 msgid "sign commits"
 msgstr "firma i commit"
 
-#: builtin/rebase.c:460 builtin/rebase.c:1427
+#: builtin/rebase.c:500 builtin/rebase.c:1321
 msgid "display a diffstat of what changed upstream"
 msgstr "visualizza un diffstat delle modifiche upstream"
 
-#: builtin/rebase.c:462
+#: builtin/rebase.c:502
 msgid "continue rebase"
 msgstr "continua il rebase"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:504
 msgid "skip commit"
 msgstr "salta il commit"
 
-#: builtin/rebase.c:465
+#: builtin/rebase.c:505
 msgid "edit the todo list"
 msgstr "modifica l'elenco todo"
 
-#: builtin/rebase.c:467
+#: builtin/rebase.c:507
 msgid "show the current patch"
 msgstr "visualizza la patch corrente"
 
-#: builtin/rebase.c:470
+#: builtin/rebase.c:510
 msgid "shorten commit ids in the todo list"
 msgstr "abbrevia gli ID dei commit nell'elenco todo"
 
-#: builtin/rebase.c:472
+#: builtin/rebase.c:512
 msgid "expand commit ids in the todo list"
 msgstr "espandi gli ID dei commit nell'elenco todo"
 
-#: builtin/rebase.c:474
+#: builtin/rebase.c:514
 msgid "check the todo list"
 msgstr "controlla l'elenco todo"
 
-#: builtin/rebase.c:476
+#: builtin/rebase.c:516
 msgid "rearrange fixup/squash lines"
 msgstr "ridisponi le righe fixup/squash"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:518
 msgid "insert exec commands in todo list"
 msgstr "inserisci i comandi exec nell'elenco todo"
 
-#: builtin/rebase.c:479
+#: builtin/rebase.c:519
 msgid "onto"
 msgstr "su"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:522
 msgid "restrict-revision"
 msgstr "revisioni-limite"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:522
 msgid "restrict revision"
 msgstr "limita la revisione"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:524
 msgid "squash-onto"
 msgstr "squash-su"
 
-#: builtin/rebase.c:485
+#: builtin/rebase.c:525
 msgid "squash onto"
 msgstr "esegui lo squash su"
 
-#: builtin/rebase.c:487
+#: builtin/rebase.c:527
 msgid "the upstream commit"
 msgstr "il commit upstream"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:529
 msgid "head-name"
 msgstr "nome head"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:529
 msgid "head name"
 msgstr "nome head"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:534
 msgid "rebase strategy"
 msgstr "strategia di rebase"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:535
 msgid "strategy-opts"
 msgstr "opzioni strategia"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:536
 msgid "strategy options"
 msgstr "opzioni strategia"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:537
 msgid "switch-to"
 msgstr "passa a"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:538
 msgid "the branch or commit to checkout"
 msgstr "il branch o il commit di cui eseguire il checkout"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:539
 msgid "onto-name"
 msgstr "nome"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:539
 msgid "onto name"
 msgstr "sul nome"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:540
 msgid "cmd"
 msgstr "comando"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:540
 msgid "the command to run"
 msgstr "il comando da eseguire"
 
-#: builtin/rebase.c:503 builtin/rebase.c:1510
+#: builtin/rebase.c:543 builtin/rebase.c:1415
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "schedula nuovamente le operazioni `exec` non riuscite automaticamente"
 
-#: builtin/rebase.c:519
+#: builtin/rebase.c:559
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "--[no-]rebase-cousins non ha effetto senza --rebase-merges"
 
-#: builtin/rebase.c:535
+#: builtin/rebase.c:575
 #, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s richiede un rebase interattivo"
+msgid "%s requires the merge backend"
+msgstr "%s richiede il backend da utilizzare per il merge"
 
-#: builtin/rebase.c:587
+#: builtin/rebase.c:618
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "impossibile ottenere 'onto': '%s'"
 
-#: builtin/rebase.c:602
+#: builtin/rebase.c:635
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head non valida: '%s'"
 
-#: builtin/rebase.c:627
+#: builtin/rebase.c:660
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignoro il valore non valido per allow_rerere_autoupdate: '%s'"
 
-#: builtin/rebase.c:703
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Impossibile leggere '%s'"
-
-#: builtin/rebase.c:721
-#, c-format
-msgid "Cannot store %s"
-msgstr "Impossibile memorizzare %s"
-
-#: builtin/rebase.c:828
-msgid "could not determine HEAD revision"
-msgstr "impossibile determinare la revisione HEAD"
-
-#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:805 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"
@@ -17655,7 +19431,7 @@ msgstr ""
 "Per interrompere l'operazione e tornare allo stato precedente\n"
 "il \"git rebase\", esegui \"git rebase --abort\"."
 
-#: builtin/rebase.c:1032
+#: builtin/rebase.c:888
 #, c-format
 msgid ""
 "\n"
@@ -17674,7 +19450,16 @@ msgstr ""
 "\n"
 "Di conseguenza, Git non può eseguirne il rebase."
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1214
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"tipo vuoto '%s' non riconosciuto; i valori validi sono \"drop\", \"keep\" e "
+"\"ask\"."
+
+#: builtin/rebase.c:1232
 #, c-format
 msgid ""
 "%s\n"
@@ -17691,7 +19476,7 @@ msgstr ""
 "    git rebase '<branch>'\n"
 "\n"
 
-#: builtin/rebase.c:1355
+#: builtin/rebase.c:1248
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17705,135 +19490,153 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1278
 msgid "exec commands cannot contain newlines"
 msgstr "i comandi exec non possono contenere caratteri di fine riga"
 
-#: builtin/rebase.c:1389
+#: builtin/rebase.c:1282
 msgid "empty exec command"
 msgstr "comando exec vuoto"
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1312
 msgid "rebase onto given branch instead of upstream"
 msgstr "esegui il rebase sul branch specificato anziché su quello upstream"
 
-#: builtin/rebase.c:1420
+#: builtin/rebase.c:1314
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "usa la base del merge dell'upstream e del branch come base corrente"
 
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1316
 msgid "allow pre-rebase hook to run"
 msgstr "consenti l'esecuzione dell'hook pre-rebase"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1318
 msgid "be quiet. implies --no-stat"
 msgstr "sii silenzioso. implica --no-stat"
 
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1324
 msgid "do not show diffstat of what changed upstream"
 msgstr "non visualizzare un diffstat delle modifiche upstream"
 
-#: builtin/rebase.c:1433
+#: builtin/rebase.c:1327
 msgid "add a Signed-off-by: line to each commit"
 msgstr "aggiungi una riga Signed-off-by: a ogni commit"
 
-#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
-msgid "passed to 'git am'"
-msgstr "passato a 'git am'"
+#: builtin/rebase.c:1330
+msgid "make committer date match author date"
+msgstr ""
+"fai corrispondere la data della persona che ha eseguito il commit alla data "
+"autore"
+
+#: builtin/rebase.c:1332
+msgid "ignore author date and use current date"
+msgstr "ignora la data autore e usa la data corrente"
+
+#: builtin/rebase.c:1334
+msgid "synonym of --reset-author-date"
+msgstr "sinonimo di --reset-author-date"
 
-#: builtin/rebase.c:1443 builtin/rebase.c:1445
+#: builtin/rebase.c:1336 builtin/rebase.c:1340
 msgid "passed to 'git apply'"
 msgstr "passato a 'git apply'"
 
-#: builtin/rebase.c:1447 builtin/rebase.c:1450
+#: builtin/rebase.c:1338
+msgid "ignore changes in whitespace"
+msgstr "ignora modifiche agli spazi bianchi"
+
+#: builtin/rebase.c:1342 builtin/rebase.c:1345
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "esegui il cherry-pick di tutti i commit, anche se non modificati"
 
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1347
 msgid "continue"
 msgstr "continua"
 
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1350
 msgid "skip current patch and continue"
 msgstr "salta la patch corrente e continua"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1352
 msgid "abort and check out the original branch"
 msgstr "interrompi ed esegui il checkout del branch originario"
 
-#: builtin/rebase.c:1460
+#: builtin/rebase.c:1355
 msgid "abort but keep HEAD where it is"
 msgstr "interrompi ma mantieni l'HEAD dov'è"
 
-#: builtin/rebase.c:1461
+#: builtin/rebase.c:1356
 msgid "edit the todo list during an interactive rebase"
 msgstr "modifica l'elenco todo durante un rebase interattivo"
 
-#: builtin/rebase.c:1464
+#: builtin/rebase.c:1359
 msgid "show the patch file being applied or merged"
 msgstr ""
 "visualizza il file patch che sta per essere applicato o sottoposto a merge"
 
-#: builtin/rebase.c:1467
+#: builtin/rebase.c:1362
+msgid "use apply strategies to rebase"
+msgstr "usa le strategie di apply per eseguire il rebase"
+
+#: builtin/rebase.c:1366
 msgid "use merging strategies to rebase"
 msgstr "usa le strategie di merge per eseguire il rebase"
 
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1370
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 "consenti all'utente di modificare l'elenco dei commit di cui eseguire il "
 "rebase"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1374
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "(DEPRECATO) prova a ricreare i merge anziché ignorarli"
 
-#: builtin/rebase.c:1479
-msgid "preserve empty commits during rebase"
-msgstr "mantieni i commit vuoti durante il rebase"
+#: builtin/rebase.c:1379
+msgid "how to handle commits that become empty"
+msgstr "come gestire i commit che diventano vuoti"
 
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1386
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "sposta i commit che iniziano con squash!/fixup! in -i"
 
-#: builtin/rebase.c:1487
-msgid "automatically stash/stash pop before and after"
-msgstr "esegui stash/stash pop automaticamente prima e dopo"
-
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1393
 msgid "add exec lines after each commit of the editable list"
 msgstr "aggiungi righe exec dopo ogni commit della lista modificabile"
 
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1397
 msgid "allow rebasing commits with empty messages"
 msgstr "consenti il rebase di commit con messaggi vuoti"
 
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1401
 msgid "try to rebase merges instead of skipping them"
 msgstr "prova ad eseguire il rebase dei merge anziché saltarli"
 
-#: builtin/rebase.c:1499
+#: builtin/rebase.c:1404
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 "usa 'merge-base --fork-point' per ridefinire più precisamente l'upstream"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1406
 msgid "use the given merge strategy"
 msgstr "usa la strategia di merge specificata"
 
-#: builtin/rebase.c:1503 builtin/revert.c:115
+#: builtin/rebase.c:1408 builtin/revert.c:115
 msgid "option"
 msgstr "opzione"
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1409
 msgid "pass the argument through to the merge strategy"
 msgstr "passa l'argomento alla strategia di merge"
 
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1412
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "esegui il rebase di tutti i commit raggiungibili fino a quelli radice"
 
-#: builtin/rebase.c:1524
+#: builtin/rebase.c:1417
+msgid "apply all changes, even those already present upstream"
+msgstr "applica tutte le modifiche, anche quelle già presenti upstream"
+
+#: builtin/rebase.c:1434
 msgid ""
 "the rebase.useBuiltin support has been removed!\n"
 "See its entry in 'git help config' for details."
@@ -17841,37 +19644,41 @@ msgstr ""
 "il supporto per rebase.useBuiltin è stato rimosso!\n"
 "Vedi la voce relativa in 'git help config' per i dettagli."
 
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1440
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Sembra che 'git am' sia in corso. Impossibile eseguire il rebase."
 
-#: builtin/rebase.c:1571
+#: builtin/rebase.c:1481
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr "git rebase --preserve-merges è deprecato. Usa --rebase-merges."
 
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1486
 msgid "cannot combine '--keep-base' with '--onto'"
 msgstr "impossibile combinare '--keep-base' con '--onto'"
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1488
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr "impossibile combinare '--keep-base' con '--root'"
 
-#: builtin/rebase.c:1582
+#: builtin/rebase.c:1492
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "impossibile combinare '--root' con '--fork-point'"
+
+#: builtin/rebase.c:1495
 msgid "No rebase in progress?"
 msgstr "Nessun rebase in corso?"
 
-#: builtin/rebase.c:1586
+#: builtin/rebase.c:1499
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr ""
 "L'azione --edit-todo può essere usata solo durante un rebase interattivo."
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1522
 msgid "Cannot read HEAD"
 msgstr "Impossibile leggere l'HEAD"
 
-#: builtin/rebase.c:1621
+#: builtin/rebase.c:1534
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17880,16 +19687,16 @@ msgstr ""
 "quindi contrassegnarli come risolti usando\n"
 "git add"
 
-#: builtin/rebase.c:1640
+#: builtin/rebase.c:1553
 msgid "could not discard worktree changes"
 msgstr "impossibile scartare le modifiche all'albero di lavoro"
 
-#: builtin/rebase.c:1659
+#: builtin/rebase.c:1572
 #, c-format
 msgid "could not move back to %s"
 msgstr "impossibile ritornare a %s"
 
-#: builtin/rebase.c:1704
+#: builtin/rebase.c:1618
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17910,169 +19717,146 @@ msgstr ""
 "ed eseguimi di nuovo. Mi fermo nel caso in cui tu abbia ancora\n"
 "salvato qualcosa di importante lì.\n"
 
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1646
 msgid "switch `C' expects a numerical value"
 msgstr "l'opzione `C` richiede un valore numerico"
 
-#: builtin/rebase.c:1766
+#: builtin/rebase.c:1688
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Modo sconosciuto: %s"
 
-#: builtin/rebase.c:1788
+#: builtin/rebase.c:1727
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy richiede --merge o --interactive"
 
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1757
+msgid "cannot combine apply options with merge options"
+msgstr "non è possibile combinare le opzioni apply con quelle merge"
+
+#: builtin/rebase.c:1770
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Backend di rebase sconosciuto: %s"
+
+#: builtin/rebase.c:1795
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec richiede --exec o --interactive"
 
-#: builtin/rebase.c:1840
-msgid "cannot combine am options with either interactive or merge options"
-msgstr "non è possibile combinare le opzioni am con quelle interactive o merge"
-
-#: builtin/rebase.c:1859
+#: builtin/rebase.c:1815
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "impossibile combinare '--preserve-merges' con '--rebase-merges'"
 
-#: builtin/rebase.c:1863
+#: builtin/rebase.c:1819
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 "errore: impossibile combinare '--preserve-merges' con '--reschedule-failed-"
 "exec'"
 
-#: builtin/rebase.c:1887
+#: builtin/rebase.c:1843
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "upstream non valido: '%s'"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1849
 msgid "Could not create new root commit"
 msgstr "Impossibile creare il nuovo commit radice"
 
-#: builtin/rebase.c:1919
+#: builtin/rebase.c:1875
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr ""
 "'%s': è necessario specificare esattamente una base per il merge con il "
 "branch"
 
-#: builtin/rebase.c:1922
+#: builtin/rebase.c:1878
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s': è necessario specificare esattamente una base per il merge"
 
-#: builtin/rebase.c:1930
+#: builtin/rebase.c:1886
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "'%s' non punta a un commit valido"
 
-#: builtin/rebase.c:1955
+#: builtin/rebase.c:1912
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "errore fatale: branch/commit '%s' inesistente"
 
-#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1920 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
 #, c-format
 msgid "No such ref: %s"
 msgstr "Riferimento non esistente: %s"
 
-#: builtin/rebase.c:1974
+#: builtin/rebase.c:1931
 msgid "Could not resolve HEAD to a revision"
 msgstr "Impossibile risolvere HEAD come revisione"
 
-#: builtin/rebase.c:2012
-msgid "Cannot autostash"
-msgstr "Impossibile eseguire lo stash automatico"
-
-#: builtin/rebase.c:2015
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Risposta stash non attesa: '%s'"
-
-#: builtin/rebase.c:2021
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Impossibile creare la directory '%s'"
-
-#: builtin/rebase.c:2024
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Stash automatico creato: %s\n"
-
-#: builtin/rebase.c:2027
-msgid "could not reset --hard"
-msgstr "impossibile eseguire reset --hard"
-
-#: builtin/rebase.c:2036
+#: builtin/rebase.c:1952
 msgid "Please commit or stash them."
 msgstr "Eseguine il commit o lo stash."
 
-#: builtin/rebase.c:2063
-#, c-format
-msgid "could not parse '%s'"
-msgstr "impossibile analizzare '%s'"
-
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:1988
 #, c-format
 msgid "could not switch to %s"
 msgstr "impossibile passare a %s"
 
-#: builtin/rebase.c:2087
+#: builtin/rebase.c:1999
 msgid "HEAD is up to date."
 msgstr "HEAD è aggiornato."
 
-#: builtin/rebase.c:2089
+#: builtin/rebase.c:2001
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Il branch corrente %s è aggiornato.\n"
 
-#: builtin/rebase.c:2097
+#: builtin/rebase.c:2009
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD è aggiornato, forzo il rebase."
 
-#: builtin/rebase.c:2099
+#: builtin/rebase.c:2011
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "Il branch corrente %s è aggiornato, forzo il rebase.\n"
 
-#: builtin/rebase.c:2107
+#: builtin/rebase.c:2019
 msgid "The pre-rebase hook refused to rebase."
 msgstr "L'hook pre-rebase ha rifiutato di consentire il rebase."
 
-#: builtin/rebase.c:2114
+#: builtin/rebase.c:2026
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Modifiche a %s:\n"
 
-#: builtin/rebase.c:2117
+#: builtin/rebase.c:2029
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Modifiche da %s a %s:\n"
 
-#: builtin/rebase.c:2142
+#: builtin/rebase.c:2054
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 "Per prima cosa, ripristino l'head per riapplicare le tue modifiche su di "
 "esso...\n"
 
-#: builtin/rebase.c:2151
+#: builtin/rebase.c:2063
 msgid "Could not detach HEAD"
 msgstr "Impossibile scollegare l'HEAD"
 
-#: builtin/rebase.c:2160
+#: builtin/rebase.c:2072
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Fast forward da %s a %s eseguito.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <directory Git>"
 
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:1224
 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"
@@ -18105,7 +19889,7 @@ msgstr ""
 "il comportamento predefinito, imposta la variabile di\n"
 "configurazione 'receive.denyCurrentBranch' a 'refuse'."
 
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:1244
 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"
@@ -18128,11 +19912,11 @@ msgstr ""
 "Per non visualizzare più questo messaggio, puoi impostarla a\n"
 "'refuse'."
 
-#: builtin/receive-pack.c:1936
+#: builtin/receive-pack.c:2422
 msgid "quiet"
 msgstr "non visualizzare messaggi"
 
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:2436
 msgid "You must specify a directory."
 msgstr "Devi specificare una directory."
 
@@ -18158,49 +19942,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <riferimento>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' non è un timestamp valido"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Contrassegno gli oggetti raggiungibili..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s non punta a niente!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr "nessun registro riferimenti da eliminare specificato"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr "non è un registro riferimenti: %s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "log riferimenti non esistente per '%s'"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "formato riferimento non valido: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -18208,82 +19992,82 @@ msgstr ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nome> <URL>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <vecchio> <nuovo>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <nome>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nome> (-a | --auto | -d | --delete | <branch>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nome>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nome>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<gruppo> | <remoto>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nome> <branch>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nome>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nome> <nuovo URL> [<vecchio URL>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nome> <nuovo URL>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nome> <URL>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opzioni>] <nome> <URL>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nome> <branch>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nome> <branch>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opzioni>] <nome>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opzioni>] <nome>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opzioni>] [<gruppo> | <remoto>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Aggiornamento di %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -18291,88 +20075,104 @@ msgstr ""
 "--mirror è pericoloso e deprecato; per favore\n"
 "\t usa invece --mirror-fetch o --mirror-push"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argomento di mirror sconosciuto: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "recupera i branch remoti"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "importa tutti i tag e gli oggetti associati durante il recupero"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "o non recuperare alcun tag (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "branch da tracciare"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "branch master"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr ""
 "imposta il remoto come mirror su cui eseguire push o da cui recuperare dati"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "specificare un branch master con --mirror non ha senso"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr ""
 "specificare i branch da tracciare ha senso solo con i mirror da cui "
 "recuperare dati"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:697
 #, c-format
 msgid "remote %s already exists."
 msgstr "il remoto %s esiste già."
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:701
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' non è un nome di remoto valido"
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Impossibile configurare il master '%s'"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr ""
 "Impossibile ottenere la mappa di recupero per lo specificatore riferimento %s"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr "(corrispondente)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr "(elimina)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:654
+#, c-format
+msgid "could not set '%s'"
+msgstr "impossibile impostare '%s'"
+
+#: builtin/remote.c:659
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"La configurazione remote.pushDefault %s in:\n"
+"\t%s:%d\n"
+"ora dà il nome al remoto inesistente '%s'"
+
+#: builtin/remote.c:690 builtin/remote.c:833 builtin/remote.c:941
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Remoto non esistente: '%s'"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:707
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr ""
 "Non è stato possibile ridenominare la sezione di configurazione da '%s' in "
 "'%s'"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:727
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18383,17 +20183,17 @@ msgstr ""
 "\t%s\n"
 "\tAggiorna la configurazione manualmente se necessario."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:767
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "eliminazione di '%s' non riuscita"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:801
 #, c-format
 msgid "creating '%s' failed"
 msgstr "creazione di '%s' non riuscita"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:877
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18409,120 +20209,120 @@ msgstr[1] ""
 "eliminati;\n"
 "per eliminarli, usa:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:891
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Impossibile rimuovere la sezione di configurazione '%s'"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:994
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " nuovo (il prossimo fetch lo salverà in remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:997
 msgid " tracked"
 msgstr " tracciato"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:999
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " vecchio (usa 'git remote prune' per rimuoverlo)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1001
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1042
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr ""
 "valore branch.%s.merge non valido; impossibile eseguire il rebase su più di "
 "un branch"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1051
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebase interattivo sul remoto %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1053
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "rebase interattivo (con merge) sul remoto %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebase sul remoto %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1060
 #, c-format
 msgid " merges with remote %s"
 msgstr " merge con il remote %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1063
 #, c-format
 msgid "merges with remote %s"
 msgstr "merge con il remote %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1066
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    e con il remoto %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1109
 msgid "create"
 msgstr "crea"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1112
 msgid "delete"
 msgstr "elimina"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1116
 msgid "up to date"
 msgstr "aggiornato"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1119
 msgid "fast-forwardable"
 msgstr "fast forward possibile"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1122
 msgid "local out of date"
 msgstr "locale non aggiornato"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1129
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s esegue un aggiornamento forzato su %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1132
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s esegue il push su %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1136
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s esegue un aggiornamento forzato su %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1139
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s esegue il push su %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1207
 msgid "do not query remotes"
 msgstr "non interrogare i remoti"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1234
 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1235
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL recupero: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1236 builtin/remote.c:1252 builtin/remote.c:1391
 msgid "(no URL)"
 msgstr "(nessun URL)"
 
@@ -18530,195 +20330,185 @@ msgstr "(nessun URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1250 builtin/remote.c:1252
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "      URL push: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1254 builtin/remote.c:1256 builtin/remote.c:1258
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  branch HEAD: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1254
 msgid "(not queried)"
 msgstr "(non interrogato)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1256
 msgid "(unknown)"
 msgstr "(sconosciuto)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1260
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr ""
 "  branch HEAD (l'HEAD remoto è ambiguo, potrebbe essere uno dei seguenti):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1272
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Branch remoto:%s"
 msgstr[1] "  Branch remoti:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1275 builtin/remote.c:1301
 msgid " (status not queried)"
 msgstr " (stato non richiesto)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1284
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Branch locale configurato per 'git pull':"
 msgstr[1] "  Branch locali configurati per 'git pull':"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1292
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  I riferimenti locali saranno copiati da 'git push'"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1298
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  Ref locale configurato per 'git push'%s:"
 msgstr[1] "  Ref locali configurati per 'git push'%s:"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1319
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "imposta refs/remotes/<nome>/HEAD in base al remoto"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1321
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "elimina refs/remotes/<nome>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1336
 msgid "Cannot determine remote HEAD"
 msgstr "Impossibile determinare l'HEAD remoto"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1338
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Branch HEAD remoti multipli. Scegline uno esplicitamente con:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1348
 #, c-format
 msgid "Could not delete %s"
 msgstr "Non è stato possibile eliminare %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1356
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Non è un ref valido: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1358
 #, c-format
 msgid "Could not setup %s"
 msgstr "Non è stato possibile configurare %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s diventerà pendente!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1377
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s è diventato pendente!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1387
 #, c-format
 msgid "Pruning %s"
 msgstr "Eliminazione di %s in corso"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1388
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1404
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [sarebbe eliminato] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1407
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [eliminato] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1452
 msgid "prune remotes after fetching"
 msgstr "elimina remoti dopo il fetch"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1515 builtin/remote.c:1569 builtin/remote.c:1637
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Remote '%s' non esistente"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1531
 msgid "add branch"
 msgstr "aggiungi branch"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1538
 msgid "no remote specified"
 msgstr "nessun remote specificato"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1555
 msgid "query push URLs rather than fetch URLs"
 msgstr "interroga gli URL per il push anziché gli URL per il fetch"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1557
 msgid "return all URLs"
 msgstr "restituisci tutti gli URL"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1585
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "nessun URL configurato per il remoto '%s'"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1611
 msgid "manipulate push URLs"
 msgstr "manipola gli URL per il push"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1613
 msgid "add URL"
 msgstr "aggiungi URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1615
 msgid "delete URLs"
 msgstr "elimina URL"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1622
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete non ha senso"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1661
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Pattern URL vecchio non valido: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1669
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Nessuna URL trovata: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1671
 msgid "Will not delete all non-push URLs"
 msgstr "Non eliminerò tutti gli URL non push"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr ""
-"visualizza ulteriori dettagli; deve essere collocato prima di un sottocomando"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Sottocomando sconosciuto: %s"
-
-#: builtin/repack.c:23
+#: builtin/repack.c:25
 msgid "git repack [<options>]"
 msgstr "git repack [<opzioni>]"
 
-#: builtin/repack.c:28
+#: builtin/repack.c:30
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18727,118 +20517,118 @@ msgstr ""
 "Usa --no-write-bitmap-index o disabilita l'opzione di configurazione\n"
 "pack.writebitmaps."
 
-#: builtin/repack.c:191
+#: builtin/repack.c:197
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 "impossibile avviare pack-objects per eseguire il repack degli oggetti "
 "promettenti"
 
-#: builtin/repack.c:230 builtin/repack.c:409
+#: builtin/repack.c:236 builtin/repack.c:421
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 "repack: Da pack-objects mi attendevo solo righe con gli ID completi "
 "esadecimali degli oggetti."
 
-#: builtin/repack.c:247
+#: builtin/repack.c:260
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 "impossibile portare a termine pack-objects per eseguire il repack degli "
 "oggetti promettenti"
 
-#: builtin/repack.c:285
+#: builtin/repack.c:297
 msgid "pack everything in a single pack"
 msgstr "esegui il pack di tutto in un singolo pack"
 
-#: builtin/repack.c:287
+#: builtin/repack.c:299
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "come -a e rendi sciolti gli oggetti non raggiungibili"
 
-#: builtin/repack.c:290
+#: builtin/repack.c:302
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "rimuovi i pack ridondanti ed esegui git-prune-packed"
 
-#: builtin/repack.c:292
+#: builtin/repack.c:304
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "fornisci l'opzione --no-reuse-delta a git-pack-objects"
 
-#: builtin/repack.c:294
+#: builtin/repack.c:306
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "fornisci l'opzione --no-reuse-object a git-pack-objects"
 
-#: builtin/repack.c:296
+#: builtin/repack.c:308
 msgid "do not run git-update-server-info"
 msgstr "non eseguire git-update-server-info"
 
-#: builtin/repack.c:299
+#: builtin/repack.c:311
 msgid "pass --local to git-pack-objects"
 msgstr "fornisci l'opzione --local a git-pack-objects"
 
-#: builtin/repack.c:301
+#: builtin/repack.c:313
 msgid "write bitmap index"
 msgstr "scrivi l'indice bitmap"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:315
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "fornisci l'opzione --delta-islands a git-pack-objects"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:316
 msgid "approxidate"
 msgstr "data approssimativa"
 
-#: builtin/repack.c:305
+#: builtin/repack.c:317
 msgid "with -A, do not loosen objects older than this"
 msgstr "con -A, non rendere sciolti gli oggetti meno recenti di questa data"
 
-#: builtin/repack.c:307
+#: builtin/repack.c:319
 msgid "with -a, repack unreachable objects"
 msgstr "con -a, esegui il repack degli oggetti non raggiungibili"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:321
 msgid "size of the window used for delta compression"
 msgstr "dimensione della finestra usata per la compressione delta"
 
-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:322 builtin/repack.c:328
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:323
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr ""
 "come sopra, ma limita le dimensioni della memoria invece del numero di voci"
 
-#: builtin/repack.c:313
+#: builtin/repack.c:325
 msgid "limits the maximum delta depth"
 msgstr "limita la profondità massima dei delta"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:327
 msgid "limits the maximum number of threads"
 msgstr "limita il numero massimo di thread"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:329
 msgid "maximum size of each packfile"
 msgstr "dimensione massima di ogni file pack"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:331
 msgid "repack objects in packs marked with .keep"
 msgstr "esegui il repack degli oggetti nei pack contrassegnati con .keep"
 
-#: builtin/repack.c:321
+#: builtin/repack.c:333
 msgid "do not repack this pack"
 msgstr "non eseguire il repack di questo pack"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:343
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "impossibile eliminare i pack in un repository 'oggetti preziosi'"
 
-#: builtin/repack.c:335
+#: builtin/repack.c:347
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable e -A non sono compatibili"
 
-#: builtin/repack.c:418
+#: builtin/repack.c:430
 msgid "Nothing new to pack."
 msgstr "Non ci sono oggetti nuovi di cui eseguire il pack."
 
-#: builtin/repack.c:479
+#: builtin/repack.c:486
 #, c-format
 msgid ""
 "WARNING: Some packs in use have been renamed by\n"
@@ -18858,7 +20648,7 @@ msgstr ""
 "AVVISO: non è riuscito. Ridenominali manualmente\n"
 "AVVISO: entro %s:\n"
 
-#: builtin/repack.c:527
+#: builtin/repack.c:534
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "eliminazione di '%s' non riuscita"
@@ -18966,8 +20756,8 @@ msgstr "impossibile eseguire fstat su %s"
 msgid "unable to write object to database"
 msgstr "impossibile scrivere l'oggetto nel database"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
-#: builtin/replace.c:453
+#: 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 "nome oggetto non valido: '%s'"
@@ -18991,17 +20781,17 @@ msgstr "il nuovo oggetto è lo stesso di quello vecchio: '%s'"
 msgid "could not parse %s as a commit"
 msgstr "impossibile analizzare %s come commit"
 
-#: builtin/replace.c:415
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "tag merge non valido nel commit '%s'"
 
-#: builtin/replace.c:417
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "tag merge malformato nel commit '%s'"
 
-#: builtin/replace.c:429
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -19010,31 +20800,31 @@ msgstr ""
 "il commit originario '%s' contiene il tag merge '%s' che è stato scartato; "
 "usa --edit anziché --graft"
 
-#: builtin/replace.c:468
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "il commit originario '%s' ha una firma GPG"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "la firma sarà rimossa nel commit sostitutivo!"
 
-#: builtin/replace.c:479
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "impossibile scrivere il commit sostitutivo per '%s'"
 
-#: builtin/replace.c:487
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft per '%s' non necessario"
 
-#: builtin/replace.c:491
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "il nuovo commit è lo stesso di quello vecchio: '%s'"
 
-#: builtin/replace.c:526
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -19043,71 +20833,71 @@ msgstr ""
 "impossibile convertire i seguenti graft:\n"
 "%s"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "elenca i riferimenti sostitutivi"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "elimina i riferimenti sostitutivi"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "modifica l'oggetto esistente"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "cambia i genitori di un commit"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "converti un file graft esistente"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "sostituisci il riferimento se esiste"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "non stampare i contenuti in un formato leggibile (per --edit)"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "usa questo formato"
 
-#: builtin/replace.c:568
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format non può essere usato quando non si elencano voci"
 
-#: builtin/replace.c:576
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f ha senso solo se si sta scrivendo un oggetto sostitutivo"
 
-#: builtin/replace.c:580
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw ha senso solo con --edit"
 
-#: builtin/replace.c:586
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d richiede almeno un argomento"
 
-#: builtin/replace.c:592
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "numero di argomenti errato"
 
-#: builtin/replace.c:598
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e richiede esattamente un argomento"
 
-#: builtin/replace.c:604
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g richiede almeno un argomento"
 
-#: builtin/replace.c:610
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file non richiede argomenti"
 
-#: builtin/replace.c:616
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "con -l può essere specificato solo un pattern"
 
@@ -19136,119 +20926,127 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<espressione albero>] [--] <percorsi>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<espressione albero>] [--] <specificatore percorso>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<espressione albero>] [--] [<percorsi>...]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<espressione "
+"albero>]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr ""
+"git reset --patch [<espressione albero>] [--] [<specificatore percorso>...]"
+
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "misto"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "soft"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "hard"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "merge"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "keep"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "Non hai un HEAD valido."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "Impossibile trovare l'albero di HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Impossibile trovare l'albero di %s."
 
-#: builtin/reset.c:114
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD ora si trova a %s"
 
-#: builtin/reset.c:193
+#: builtin/reset.c:195
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "Impossibile eseguire un %s reset nel corso di un merge."
 
-#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
 #: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr "non visualizzare messaggi, segnala solo gli errori"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "reimposta l'HEAD e l'indice"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "reimposta solo l'HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "reimposta l'HEAD, l'indice e l'albero di lavoro"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "reimposta l'HEAD ma mantieni le modifiche locali"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 msgid "record only the fact that removed paths will be added later"
 msgstr ""
 "salva solo il fatto che i percorsi rimossi saranno aggiunti successivamente"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:344
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Risoluzione di '%s' come revisione valida non riuscita."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:352
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Risoluzione di '%s' come albero valido non riuscita."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch non è compatibile con --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed con i path è deprecata; usa invece 'git reset -- <path>'."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Impossibile eseguire un %s reset con dei percorsi."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "%s reset non è consentito in un repository spoglio"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
 msgstr "-N può essere usato solo con --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "Modifiche non nell'area di staging dopo il reset:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:416
 #, c-format
 msgid ""
 "\n"
@@ -19262,49 +21060,49 @@ msgstr ""
 "messaggio. Imposta l'opzione di configurazione reset.quiet a true per\n"
 "rendere tale comportamento quello predefinito.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Impossibile ripristinare il file indice alla revisione '%s'."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "Impossibile scrivere il nuovo file indice."
 
-#: builtin/rev-list.c:411
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "impossibile combinare --exclude-promisor-objects e --missing"
 
-#: builtin/rev-list.c:472
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "il filtraggio oggetti richiede --objects"
 
-#: builtin/rev-list.c:522
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list non supporta la visualizzazione delle note"
 
-#: builtin/rev-list.c:525
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr "il conteggio contrassegnato non è compatibile con --objects"
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opzioni>] -- [<argomenti>...]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "mantieni la stringa passata `--` come argomento"
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr ""
 "termina l'analisi dopo il primo argomento non corrispondente a un'opzione"
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "emetti l'output in forma \"stuck long\""
 
-#: builtin/rev-parse.c:551
+#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -19452,40 +21250,45 @@ msgid_plural "the following files have local modifications:"
 msgstr[0] "il seguente file ha delle modifiche locali:"
 msgstr[1] "i seguenti file hanno delle modifiche locali:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "non elencare i file rimossi"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "rimuovi solo dall'indice"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "ignora il controllo sullo stato di aggiornamento"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "consenti rimozioni ricorsive"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr ""
 "esci con codice d'uscita zero anche nel caso in cui non vi siano "
 "corrispondenze"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr ""
+"Non è stato fornito uno specificatore percorso. Quali file devo rimuovere?"
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 "esegui lo stage delle modifiche a .gitmodules o eseguine lo stash per "
 "procedere"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "non rimuovo '%s' ricorsivamente senza -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: non è possibile eliminare %s"
@@ -19502,55 +21305,77 @@ msgstr ""
 "[<riferimento>...]\n"
 "  --all e uno specificatore <riferimento> sono mutualmente esclusivi."
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:182
 msgid "remote name"
 msgstr "nome remoto"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:195
 msgid "use stateless RPC protocol"
 msgstr "usa protocollo RPC senza stato"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:196
 msgid "read refs from stdin"
 msgstr "leggi i riferimento dallo standard input"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:197
 msgid "print status from remote helper"
 msgstr "stampa lo stato dell'helper remoto"
 
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:15
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<opzioni>] [<intervallo revisioni>] [[--] <percorso>...]"
 
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:16
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<opzioni>]"
 
-#: builtin/shortlog.c:264
+#: builtin/shortlog.c:134
+msgid "using multiple --group options with stdin is not supported"
+msgstr ""
+"l'utilizzo di opzioni --group multiple con lo standard input non è supportato"
+
+#: builtin/shortlog.c:144
+msgid "using --group=trailer with stdin is not supported"
+msgstr "l'utilizzo di --group=trailer con lo standard input non è supportato"
+
+#: builtin/shortlog.c:388
+#, c-format
+msgid "unknown group type: %s"
+msgstr "tipo gruppo sconosciuto: %s"
+
+#: builtin/shortlog.c:416
 msgid "Group by committer rather than author"
 msgstr "Raggruppa per persona che ha eseguito il commit anziché per autore"
 
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:419
 msgid "sort output according to the number of commits per author"
 msgstr "ordina l'output in base al numero di commit per autore"
 
-#: builtin/shortlog.c:268
+#: builtin/shortlog.c:421
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "Ometti le descrizioni dei commit, fornisci solo il numero dei commit"
 
-#: builtin/shortlog.c:270
+#: builtin/shortlog.c:423
 msgid "Show the email address of each author"
 msgstr "Visualizza l'indirizzo e-mail di ogni autore"
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:424
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:272
+#: builtin/shortlog.c:425
 msgid "Linewrap output"
 msgstr "Output a capo automatico"
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:427
+msgid "field"
+msgstr "campo"
+
+#: builtin/shortlog.c:428
+msgid "Group by field"
+msgstr "Raggruppa per campo"
+
+#: builtin/shortlog.c:456
 msgid "too many arguments given outside repository"
 msgstr "troppi argomenti forniti oltre al repository"
 
@@ -19692,6 +21517,14 @@ msgstr "'%s' non è un riferimento valido."
 msgid "cannot find commit %s (%s)"
 msgstr "impossibile trovare il commit %s (%s)"
 
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "algoritmo hash"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "Algoritmo hash sconosciuto"
+
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -19740,15 +21573,89 @@ msgstr ""
 "visualizza i riferimenti dati sullo standard input che non sono nel "
 "repository locale"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
+msgstr "git sparse-checkout (init|list|set|add|reapply|disable) <opzioni>"
+
+#: builtin/sparse-checkout.c:50
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:76
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+"questo albero di lavoro non è sparse (il file sparse-checkout potrebbe non "
+"esistere)"
+
+#: builtin/sparse-checkout.c:228
+msgid "failed to create directory for sparse-checkout file"
+msgstr "creazione della directory per il file sparse-checkout non riuscita"
+
+#: builtin/sparse-checkout.c:269
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+"impossibile aggiornare il formato repository per abilitare worktreeConfig"
+
+#: builtin/sparse-checkout.c:271
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "impostazione dell'opzione extensions.worktreeConfig non riuscita"
+
+#: builtin/sparse-checkout.c:288
+msgid "git sparse-checkout init [--cone]"
+msgstr "git sparse-checkout init [--cone]"
+
+#: builtin/sparse-checkout.c:307
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "inizializza il checkout sparse in modalità cone"
+
+#: builtin/sparse-checkout.c:344
+#, c-format
+msgid "failed to open '%s'"
+msgstr "apertura di '%s' non riuscita"
+
+#: builtin/sparse-checkout.c:401
+#, c-format
+msgid "could not normalize path %s"
+msgstr "impossibile normalizzare il percorso '%s'"
+
+#: builtin/sparse-checkout.c:413
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <pattern>)"
+
+#: builtin/sparse-checkout.c:438
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "impossibile rimuovere le virgolette dalla stringa in stile C '%s'"
+
+#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "impossibile caricare i pattern sparse-checkout esistenti"
+
+#: builtin/sparse-checkout.c:561
+msgid "read patterns from standard in"
+msgstr "leggi i pattern dallo standard input"
+
+#: builtin/sparse-checkout.c:576
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:595
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:623
+msgid "error while refreshing working directory"
+msgstr "errore durante l'aggiornamento della directory di lavoro"
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [<opzioni>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<opzioni>] [<stash>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
@@ -19756,25 +21663,27 @@ msgstr "git stash drop [-q|--quiet] [<stash>]"
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <nome branch> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-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 <messaggio>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<specificatore percorso>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 msgid ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<message>]"
@@ -19782,68 +21691,78 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<messaggio>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <messaggio>] [-q|--quiet] <commit>"
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <messaggio>]\n"
+"          [--] [<specificatore percorso>...]]"
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' non è un commit simile a uno stash"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Troppe revisioni specificate:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162
 msgid "No stash entries found."
 msgstr "Nessuna voce di stash trovata."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s non è un riferimento valido"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear con parametri non è implementato"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "impossibile applicare uno stash nel mezzo di un merge"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "impossibile generare il diff %s^!"
 
-#: builtin/stash.c:421
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:422
+msgid "conflicts in index. Try without --index."
 msgstr "ci sono conflitti nell'indice. Prova senza --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "impossibile salvare l'albero indice"
 
-#: builtin/stash.c:436
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr "non è stato possibile ripristinare i file non tracciati dallo stash"
 
-#: builtin/stash.c:450
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Merge di %s con %s in corso"
 
-#: builtin/stash.c:460 git-legacy-stash.sh:680
+#: builtin/stash.c:461
 msgid "Index was not unstashed."
 msgstr "L'indice non è stato rimosso dallo stash."
 
@@ -19866,107 +21785,109 @@ msgstr "%s: Impossibile scartare la voce di stash"
 msgid "'%s' is not a stash reference"
 msgstr "'%s' non è un riferimento stash"
 
-#: builtin/stash.c:633 git-legacy-stash.sh:694
+#: builtin/stash.c:633
 msgid "The stash entry is kept in case you need it again."
 msgstr ""
 "La voce di stash è mantenuta nel caso in cui tu ne abbia nuovamente bisogno."
 
-#: builtin/stash.c:656 git-legacy-stash.sh:712
+#: builtin/stash.c:656
 msgid "No branch name specified"
 msgstr "Nome del branch non specificato"
 
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:800 builtin/stash.c:837
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Impossibile aggiornare %s con %s"
 
-#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:818 builtin/stash.c:1472 builtin/stash.c:1537
 msgid "stash message"
 msgstr "messaggio di stash"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:828
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" richiede un argomento <commit>"
 
-#: builtin/stash.c:1046 git-legacy-stash.sh:217
+#: builtin/stash.c:1043
 msgid "No changes selected"
 msgstr "Nessuna modifica selezionata"
 
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1143
 msgid "You do not have the initial commit yet"
 msgstr "Non hai ancora un commit iniziale"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1170
 msgid "Cannot save the current index state"
 msgstr "Impossibile salvare lo stato corrente di index"
 
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1179
 msgid "Cannot save the untracked files"
 msgstr "Impossibile salvare i file non tracciati"
 
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1190 builtin/stash.c:1199
 msgid "Cannot save the current worktree state"
 msgstr "Impossibile salvare lo stato corrente dell'albero di lavoro"
 
-#: builtin/stash.c:1229 git-legacy-stash.sh:233
+#: builtin/stash.c:1227
 msgid "Cannot record working tree state"
 msgstr "Impossibile registrare lo stato dell'albero di lavoro"
 
-#: builtin/stash.c:1278 git-legacy-stash.sh:337
+#: builtin/stash.c:1276
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr ""
 "Impossibile usare --patch e --include-untracked o --all allo stesso tempo"
 
-#: builtin/stash.c:1294
+#: builtin/stash.c:1292
 msgid "Did you forget to 'git add'?"
 msgstr "Ti sei scordato di eseguire 'git add'?"
 
-#: builtin/stash.c:1309 git-legacy-stash.sh:345
+#: builtin/stash.c:1307
 msgid "No local changes to save"
 msgstr "Nessuna modifica locale da salvare"
 
-#: builtin/stash.c:1316 git-legacy-stash.sh:350
+#: builtin/stash.c:1314
 msgid "Cannot initialize stash"
 msgstr "Impossibile inizializzare stash"
 
-#: builtin/stash.c:1331 git-legacy-stash.sh:354
+#: builtin/stash.c:1329
 msgid "Cannot save the current status"
 msgstr "Impossibile salvare lo stato attuale"
 
-#: builtin/stash.c:1336
+#: builtin/stash.c:1334
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Directory di lavoro e stato indice salvati: %s"
 
-#: builtin/stash.c:1426 git-legacy-stash.sh:384
+#: builtin/stash.c:1424
 msgid "Cannot remove worktree changes"
 msgstr "Impossibile rimuovere le modifiche all'albero di lavoro"
 
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1463 builtin/stash.c:1528
 msgid "keep index"
 msgstr "mantieni l'indice"
 
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1465 builtin/stash.c:1530
 msgid "stash in patch mode"
 msgstr "esegui lo stash in modalità patch"
 
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1466 builtin/stash.c:1531
 msgid "quiet mode"
 msgstr "modalità silenziosa"
 
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1468 builtin/stash.c:1533
 msgid "include untracked files in stash"
 msgstr "includi i file non tracciati nello stash"
 
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1470 builtin/stash.c:1535
 msgid "include ignore files"
 msgstr "includi i file ignorati"
 
-#: builtin/stash.c:1564
-#, c-format
-msgid "could not exec %s"
-msgstr "impossibile eseguire %s"
+#: builtin/stash.c:1570
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"il supporto per stash.useBuiltin è stato rimosso!\n"
+"Vedi la voce relativa in 'git help config' per i dettagli."
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -19984,40 +21905,40 @@ msgstr "salta e rimuovi tutte le righe che iniziano con un carattere commento"
 msgid "prepend comment character and space to each line"
 msgstr "anteponi il carattere commento e uno spazio a ogni riga"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Atteso nome riferimento completo, ricevuto %s"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote non richiede argomenti"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "impossibile rimuovere un componente dall'URL '%s'"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
 msgid "alternative anchor for relative paths"
 msgstr "ancoraggio alternativo per i percorsi relativi"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<percorso>] [<percorso>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:652
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "Nessun URL trovato in .gitmodules per il percorso del sottomodulo '%s'"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "Entro in '%s'\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -20026,7 +21947,7 @@ msgstr ""
 "run_command ha restituito un codice diverso da zero per %s\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -20037,19 +21958,19 @@ msgstr ""
 "nei sottomoduli innestati di %s\n"
 "."
 
-#: builtin/submodule--helper.c:563
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr "Non visualizzare l'output dei comandi eseguiti in ogni sottomodulo"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
 msgid "Recurse into nested submodules"
 msgstr "Esegui ricorsivamente sui sottomoduli innestati"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <comando>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -20058,56 +21979,56 @@ msgstr ""
 "impossibile trovare la configurazione '%s'. Assumo che questo repository sia "
 "il proprio repository autoritativo upstream."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:666
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Registrazione dell'URL per il percorso sottomodulo '%s' non riuscita"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:670
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Sottomodulo '%s' (%s) registrato per il percorso '%s'\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:680
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr ""
 "avviso: suggerita modalità comando aggiornamento per il sottomodulo '%s'\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:687
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr ""
 "Registrazione della modalità aggiornamento per il percorso sottomodulo '%s'"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:709
 msgid "Suppress output for initializing a submodule"
 msgstr "Non visualizzare l'output dell'inizializzazione del sottomodulo"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:714
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<opzioni>] [<percorso>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "mapping sottomodulo per il percorso '%s' non trovato in .gitmodules"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:835
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "impossibile risolvere il riferimento HEAD nel sottomodulo '%s'"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "ricorsione nel sottomodulo '%s' non riuscita"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
 msgid "Suppress submodule status output"
 msgstr "Non visualizzare l'output dello stato del sottomodulo"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:887
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
@@ -20115,49 +22036,107 @@ msgstr ""
 "Usa il commit salvato nell'indice anziché quello salvato nell'HEAD del "
 "sottomodulo"
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:888
 msgid "recurse into nested submodules"
 msgstr "esegui ricorsivamente sui sottomoduli innestati"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:893
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 "git submodule status [--quiet] [--cached] [--recursive] [<percorso>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:917
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <percorso>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(sottomodulo)"
+
+#: builtin/submodule--helper.c:992
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(sottomodulo)->%s(blob)"
+
+#: builtin/submodule--helper.c:1005
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1055
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "impossibile calcolare l'hash dell'oggetto da '%s'"
+
+#: builtin/submodule--helper.c:1059
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "modalità %o inattesa\n"
+
+#: builtin/submodule--helper.c:1300
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr ""
+"usa il commit salvato nell'indice anziché quello salvato nell'HEAD del "
+"sottomodulo"
+
+#: builtin/submodule--helper.c:1302
+msgid "to compare the commit in the index with that in the submodule HEAD"
+msgstr ""
+"per confrontare il commit salvato nell'indice con quello salvato nell'HEAD "
+"del sottomodulo"
+
+#: builtin/submodule--helper.c:1304
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr ""
+"ignora i sottomoduli il cui valore 'ignore_config' è impostato ad 'all'"
+
+#: builtin/submodule--helper.c:1306
+msgid "limit the summary size"
+msgstr "limita le dimensioni del riassunto"
+
+#: builtin/submodule--helper.c:1311
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<opzioni>] [<commit>] [--] [<percorso>]"
+
+#: builtin/submodule--helper.c:1335
+msgid "could not fetch a revision for HEAD"
+msgstr "impossibile recuperare una revisione per HEAD"
+
+#: builtin/submodule--helper.c:1340
+msgid "--cached and --files are mutually exclusive"
+msgstr "le opzioni --cached e --files sono mutualmente esclusive"
+
+#: builtin/submodule--helper.c:1407
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Sincronizzazione URL sottomodulo per '%s' in corso\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:1413
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "registrazione dell'URL per il percorso sottomodulo '%s' non riuscita"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1427
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "recupero del remoto predefinito per il sottomodulo '%s' non riuscito"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1438
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "aggiornamento del remoto per il sottomodulo '%s' non riuscito"
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1485
 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 "Non visualizzare l'output della sincronizzazione dell'URL del sottomodulo"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1492
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<percorso>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -20166,7 +22145,7 @@ msgstr ""
 "L'albero di lavoro del sottomodulo ('%s') contiene una directory .git (usa "
 "'rm -rf' se vuoi veramente rimuoverla, inclusa l'intera sua cronologia)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1558
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -20175,182 +22154,213 @@ msgstr ""
 "L'albero di lavoro del sottomodulo ('%s') contiene modifiche locali; usa '-"
 "f' per scartarle"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1566
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Directory '%s' ripulita\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Impossibile rimuovere l'albero di lavoro del sottomodulo '%s'\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1579
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "impossibile creare la directory vuota del sottomodulo %s"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1595
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "Rimossa registrazione sottomodulo '%s' (%s) per il percorso '%s'\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1624
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 "Rimuovi gli alberi di lavoro dei sottomoduli anche se contengono modifiche "
 "locali"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1625
 msgid "Unregister all submodules"
 msgstr "Annulla la registrazione di tutti i sottomoduli"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1630
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<percorso>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1644
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "Usa '--all' se vuoi veramente deinizializzare tutti i sottomoduli"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1713
+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 alternato calcolato a partire dall'alternato di un progetto di livello\n"
+"superiore non è valido.\n"
+"Per consentire a Git di eseguire il clone senza alternati in tal caso, "
+"imposta\n"
+"submodule.alternateErrorStrategy a 'info' o, equivalentemente, esegui il "
+"clone\n"
+"con l'opzione '--reference-if-able' anziché '--reference'."
+
+#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "non è possibile aggiungere un alternato per il sottomodulo '%s': %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1791
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Valore '%s' per submodule.alternateErrorStrategy non riconosciuto"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1798
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Valore '%s' per submodule.alternateLocation non riconosciuto"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1822
 msgid "where the new submodule will be cloned to"
 msgstr "percorso in cui sarà clonato il nuovo sottomodulo"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1825
 msgid "name of the new submodule"
 msgstr "nome del nuovo sottomodulo"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1828
 msgid "url where to clone the submodule from"
 msgstr "URL da cui clonare il sottomodulo"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1836
 msgid "depth for shallow clones"
 msgstr "profondità per i cloni shallow"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
 msgid "force cloning progress"
 msgstr "forza l'indicazione d'avanzamento della clonazione"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+msgid "disallow cloning into non-empty directory"
+msgstr "disabilita il clone in una directory non vuota"
+
+#: builtin/submodule--helper.c:1848
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<percorso>] [--quiet] [--reference "
-"<repository>] [--name <nome>] [--depth <profondità>] --url <URL> --path "
-"<percorso>"
+"<repository>] [--name <nome>] [--depth <profondità>] [--single-branch] --url "
+"<URL> --path <percorso>"
+
+#: builtin/submodule--helper.c:1873
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
+"mi rifiuto di creare/usare '%s' nella directory Git di un altro sottomodulo"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1884
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "clone di '%s' nel percorso del sottomodulo ('%s') non riuscito"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1888
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "directory non vuota: '%s'"
+
+#: builtin/submodule--helper.c:1900
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "impossibile recuperare la directory del sottomodulo per '%s'"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1936
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 "Modalità aggiornamento '%s' non valida per il percorso del sottomodulo ('%s')"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1940
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 "È stata configurata una modalità aggiornamento '%s' non valida per il "
 "percorso del sottomodulo ('%s')"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:2041
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Percorso del sottomodulo ('%s') non inizializzato"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:2045
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Potresti voler usare 'update --init'."
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:2075
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Ignoro il sottomodulo %s non sottoposto a merge"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:2104
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Ignoro il sottomodulo '%s'"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:2254
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Clone di '%s' non riuscito. Nuovo tentativo programmato"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:2265
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr ""
 "Clone di '%s' non riuscito per la seconda volta, interrompo l'operazione"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
 msgid "path into the working tree"
 msgstr "percorso nell'albero di lavoro"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:2330
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr ""
 "percorso nell'albero di lavoro attraverso i confini dei sottomoduli innestati"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:2334
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout o none"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:2340
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Crea un clone shallow limitato al numero di revisioni specificato"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:2343
 msgid "parallel jobs"
 msgstr "processi da eseguire in parallelo"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2345
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "determina se il clone iniziale sarà shallow come raccomandato"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2346
 msgid "don't print cloning progress"
 msgstr "non stampare l'indicazione di avanzamento della clonazione"
 
-#: builtin/submodule--helper.c:1877
+#: builtin/submodule--helper.c:2357
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr ""
 "git submodule--helper update-clone [--prefix=<percorso>] [<percorso>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:2370
 msgid "bad value for update parameter"
 msgstr "valore parametro aggiornamento errato"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:2418
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20359,50 +22369,86 @@ msgstr ""
 "Il branch del sottomodulo (%s) è configurato in modo da ereditare il branch "
 "dal progetto al livello superiore, ma questo non è su alcun branch"
 
-#: builtin/submodule--helper.c:2061
+#: builtin/submodule--helper.c:2541
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "impossibile recuperare un handle repository per il sottomodulo '%s'"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2574
 msgid "recurse into submodules"
 msgstr "esegui ricorsivamente sui sottomoduli"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2580
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<opzioni>] [<percorso>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2636
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "controlla se è sicuro scrivere sul file .gitmodules"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2639
 msgid "unset the config in the .gitmodules file"
 msgstr "rimuovi la configurazione nel file .gitmodules"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2644
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <nome> [<valore>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2645
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <nome>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2646
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2665 git-submodule.sh:151
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr "assicurati che il file .gitmodules sia nell'albero di lavoro"
 
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
+#: builtin/submodule--helper.c:2681
+msgid "Suppress output for setting url of a submodule"
+msgstr "Non visualizzare l'output dell'impostazione dell'URL del sottomodulo"
+
+#: builtin/submodule--helper.c:2685
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <percorso> <nuovo URL>"
+
+#: builtin/submodule--helper.c:2718
+msgid "set the default tracking branch to master"
+msgstr "imposta il branch tracciato predefinito a master"
+
+#: builtin/submodule--helper.c:2720
+msgid "set the default tracking branch"
+msgstr "imposta il branch tracciato predefinito"
+
+#: builtin/submodule--helper.c:2724
+msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr ""
+"git submodule--helper set-branch [-q|--quiet] (-d|--default) <percorso>"
+
+#: builtin/submodule--helper.c:2725
+msgid ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> "
+"<percorso>"
+
+#: builtin/submodule--helper.c:2732
+msgid "--branch or --default required"
+msgstr "è richiesto specificare --branch o --default"
+
+#: builtin/submodule--helper.c:2735
+msgid "--branch and --default are mutually exclusive"
+msgstr "le opzioni --branch e --default sono mutualmente esclusive"
+
+#: builtin/submodule--helper.c:2792 git.c:438 git.c:710
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s non supporta --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2798
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' non è un sottocomando submodule--helper valido"
@@ -20429,11 +22475,11 @@ msgstr "elimina riferimento simbolico"
 msgid "shorten ref output"
 msgstr "abbrevia il riferimento nell'output"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
 msgid "reason"
 msgstr "motivo"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
 msgid "reason of the update"
 msgstr "motivo dell'aggiornamento"
 
@@ -20453,11 +22499,13 @@ msgstr "git tag -d <nome tag>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<numero>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <oggetto>]\n"
-"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--format=<formato>] [--merged <commit>] [--no-merged <commit>] "
+"[<pattern>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
@@ -20527,351 +22575,355 @@ msgstr ""
 msgid "bad object type."
 msgstr "tipo oggetto errato."
 
-#: builtin/tag.c:284
+#: builtin/tag.c:285
 msgid "no tag message?"
 msgstr "nessun messaggio per il tag?"
 
-#: builtin/tag.c:291
+#: builtin/tag.c:292
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Il messaggio del tag è stato lasciato in %s\n"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:403
 msgid "list tag names"
 msgstr "elenca i nomi dei tag"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:405
 msgid "print <n> lines of each tag message"
 msgstr "stampa le prime <n> righe di ogni messaggio tag"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:407
 msgid "delete tags"
 msgstr "elimina tag"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:408
 msgid "verify tags"
 msgstr "verifica tag"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:410
 msgid "Tag creation options"
 msgstr "Opzioni creazione tag"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:412
 msgid "annotated tag, needs a message"
 msgstr "tag annotato, richiede un messaggio"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:414
 msgid "tag message"
 msgstr "messaggio tag"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:416
 msgid "force edit of tag message"
 msgstr "forza modifica del messaggio tag"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:417
 msgid "annotated and GPG-signed tag"
 msgstr "tag annotato e firmato con GPG"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:420
 msgid "use another key to sign the tag"
 msgstr "usa un'altra chiave per firmare il tag"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:421
 msgid "replace the tag if exists"
 msgstr "sostituisci il tag se esiste"
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:422 builtin/update-ref.c:492
 msgid "create a reflog"
 msgstr "crea un registro riferimenti"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:424
 msgid "Tag listing options"
 msgstr "Opzioni elenco tag"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:425
 msgid "show tag list in columns"
 msgstr "visualizza l'elenco dei tag in colonne"
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:426 builtin/tag.c:428
 msgid "print only tags that contain the commit"
 msgstr "stampa solo i tag che contengono il commit"
 
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:427 builtin/tag.c:429
 msgid "print only tags that don't contain the commit"
 msgstr "stampa solo i tag che non contengono i commit"
 
-#: builtin/tag.c:429
+#: builtin/tag.c:430
 msgid "print only tags that are merged"
 msgstr "stampa solo i tag sottoposti a merge"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:431
 msgid "print only tags that are not merged"
 msgstr "stampa solo i tag non sottoposti a merge"
 
-#: builtin/tag.c:434
+#: builtin/tag.c:435
 msgid "print only tags of the object"
 msgstr "stampa solo i tag dell'oggetto"
 
-#: builtin/tag.c:482
+#: builtin/tag.c:483
 msgid "--column and -n are incompatible"
 msgstr "--column e -n non sono compatibili"
 
-#: builtin/tag.c:504
+#: builtin/tag.c:505
 msgid "-n option is only allowed in list mode"
 msgstr "l'opzione -n è consentita solo in modalità elenco"
 
-#: builtin/tag.c:506
+#: builtin/tag.c:507
 msgid "--contains option is only allowed in list mode"
 msgstr "l'opzione --contains è consentita solo in modalità elenco"
 
-#: builtin/tag.c:508
+#: builtin/tag.c:509
 msgid "--no-contains option is only allowed in list mode"
 msgstr "l'opzione --no-contains è consentita solo in modalità elenco"
 
-#: builtin/tag.c:510
+#: builtin/tag.c:511
 msgid "--points-at option is only allowed in list mode"
 msgstr "l'opzione --points-at è consentita solo in modalità elenco"
 
-#: builtin/tag.c:512
+#: builtin/tag.c:513
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr ""
 "le opzioni --merged e --no-merged sono consentite solo in modalità elenco"
 
-#: builtin/tag.c:523
+#: builtin/tag.c:524
 msgid "only one -F or -m option is allowed."
 msgstr "è consentita una sola opzione tra -F e -m."
 
-#: builtin/tag.c:542
+#: builtin/tag.c:543
 msgid "too many params"
 msgstr "troppi parametri"
 
-#: builtin/tag.c:548
+#: builtin/tag.c:549
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' non è un nome tag valido."
 
-#: builtin/tag.c:553
+#: builtin/tag.c:554
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "il tag '%s' esiste già"
 
-#: builtin/tag.c:584
+#: builtin/tag.c:585
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Tag '%s' aggiornato (era %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "Decompressione degli oggetti in corso"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "creazione della directory %s non riuscita"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "creazione del file %s non riuscita"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "eliminazione del file %s non riuscita"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "eliminazione della directory %s non riuscita"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Test di mtime in '%s' in corso "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr ""
 "le informazioni stat della directory non cambiano dopo l'aggiunta di un "
 "nuovo file"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr ""
 "le informazioni stat della directory non cambiano dopo l'aggiunta di una "
 "nuova directory"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr ""
 "le informazioni stat della directory cambiano dopo l'aggiornamento di un file"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr ""
 "le informazioni stat della directory cambiano dopo l'aggiunta di un file in "
 "una sottodirectory"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr ""
 "le informazioni stat della directory non cambiano dopo l'eliminazione di un "
 "file"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr ""
 "le informazioni stat della directory non cambiano dopo l'eliminazione di una "
 "directory"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opzioni>] [--] [<file>...]"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr ""
 "continua l'aggiornamento anche nel caso in cui l'indice richieda di essere "
 "aggiornato"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "aggiornamento: ignora i sottomoduli"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "non ignorare i nuovi file"
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "consenti che dei file sostituiscano delle directory e viceversa"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "nota se dei file mancano dall'albero di lavoro"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr ""
 "esegui l'aggiornamento anche se l'indice contiene delle voci non sottoposte "
 "a merge"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "aggiorna le informazioni stat"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "come --refresh, ma ignora l'impostazione assume-unchanged"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<oggetto>,<percorso>"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "aggiunge la voce specificata all'indice"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "contrassegna i file come \"non saranno modificati\""
 
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "reimposta a zero il bit \"non saranno modificati\""
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "contrassegna i file come \"solamente da indicizzare\""
 
-#: builtin/update-index.c:1015
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "reimposta a zero il bit \"solamente da indicizzare\""
 
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "non eseguire il touch di voci presenti solo nell'indice"
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr ""
 "aggiungi solo all'indice; non aggiungere il contenuto al database oggetti"
 
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "rimuovi i percorsi specificati anche se presenti nell'albero di lavoro"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "con --stdin: le righe di input sono terminate da byte NULL"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "leggi l'elenco dei percorsi da aggiornare dallo standard input"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "aggiungi le voci specificate sullo standard input all'indice"
 
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "ripopola le fasi 2 e 3 per i percorsi elencati"
 
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "aggiorna solo le voci differenti rispetto all'HEAD"
 
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "ignora i file mancanti nell'albero di lavoro"
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "stampa le azioni sullo standard output"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr ""
 "(per i comandi ad alto livello) dimentica i conflitti non risolti salvati"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "scrivi l'indice in questo formato"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "abilita o disabilita l'indice suddiviso"
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "abilita/disabilita la cache non tracciata"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "verifica se il filesystem supporta la cache non tracciata"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "abilita la cache non tracciata senza testare il filesystem"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "scrivi l'indice anche se non è stato contrassegnato come modificato"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "abilita o disabilita il monitor del filesystem"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "contrassegna i file come validi rispetto al monitor del filesystem"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr ""
 "reimposta a zero il bit \"file validi rispetto al monitor del filesystem\""
 
-#: builtin/update-index.c:1169
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20879,7 +22931,7 @@ msgstr ""
 "core.splitIndex è impostato a false; rimuovilo o modificalo se vuoi "
 "veramente abilitare l'indice suddiviso"
 
-#: builtin/update-index.c:1178
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20887,7 +22939,7 @@ msgstr ""
 "core.splitIndex è impostato a true; rimuovilo o modificalo se vuoi veramente "
 "disabilitare l'indice suddiviso"
 
-#: builtin/update-index.c:1190
+#: 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"
@@ -20895,11 +22947,11 @@ msgstr ""
 "core.untrackedCache è impostato a true; rimuovilo o modificalo se vuoi "
 "veramente disabilitare la cache non tracciata"
 
-#: builtin/update-index.c:1194
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "Cache non tracciata disabilitata"
 
-#: builtin/update-index.c:1202
+#: 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"
@@ -20907,29 +22959,29 @@ msgstr ""
 "core.untrackedCache è impostato a false; rimuovilo o modificalo se vuoi "
 "veramente abilitare la cache non tracciata"
 
-#: builtin/update-index.c:1206
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Cache non tracciata abilitata per '%s'"
 
-#: builtin/update-index.c:1214
+#: builtin/update-index.c:1218
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr ""
 "core.fsmonitor non è impostato; impostalo se vuoi veramente abilitare il "
 "monitor del filesystem"
 
-#: builtin/update-index.c:1218
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "monitor filesystem abilitato"
 
-#: builtin/update-index.c:1221
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr ""
 "core.fsmonitor è impostato; rimuovi tale impostazione se vuoi veramente "
 "disabilitare il monitor del filesystem"
 
-#: builtin/update-index.c:1225
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "monitor filesystem disabilitato"
 
@@ -20947,19 +22999,19 @@ msgstr ""
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opzioni>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:487
 msgid "delete the reference"
 msgstr "elimina il riferimento"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:489
 msgid "update <refname> not the one it points to"
 msgstr "aggiorna <nome riferimento>, non ciò a cui punta"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:490
 msgid "stdin has NUL-terminated arguments"
 msgstr "lo standard input ha argomenti terminati da NUL"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:491
 msgid "read updates from stdin"
 msgstr "leggi aggiornamenti dallo standard input"
 
@@ -21005,15 +23057,15 @@ msgstr "stampa i contenuti del commit"
 msgid "print raw gpg status output"
 msgstr "stampa l'output grezzo dello stato di GPG"
 
-#: builtin/verify-pack.c:55
+#: 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>..."
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "dettagliato"
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "visualizza solo le statistiche"
 
@@ -21053,205 +23105,197 @@ msgstr "git worktree remove [<opzioni>] <albero di lavoro>"
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <percorso>"
 
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:60 builtin/worktree.c:970
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "eliminazione di '%s' non riuscita"
 
-#: builtin/worktree.c:79
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Rimuovo worktrees/%s: non è una directory valida"
-
 #: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Rimuovo worktrees/%s: il file gitdir non esiste"
+msgid "not a valid directory"
+msgstr "directory non valida"
 
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)"
+#: builtin/worktree.c:91
+msgid "gitdir file does not exist"
+msgstr "il file gitdir non esiste"
 
-#: builtin/worktree.c:109
+#: builtin/worktree.c:96 builtin/worktree.c:105
 #, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"Rimuovo worktrees/%s: letti meno dati del previsto (attesi %<PRIuMAX>byte, "
-"%<PRIuMAX> letti)"
+msgid "unable to read gitdir file (%s)"
+msgstr "impossibile leggere il file gitdir (%s)"
 
-#: builtin/worktree.c:117
+#: builtin/worktree.c:115
 #, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Rimuovo worktrees/%s: file gitdir non valido"
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "lettura troppo breve (attesi %<PRIuMAX> byte, letti %<PRIuMAX>)"
+
+#: builtin/worktree.c:123
+msgid "invalid gitdir file"
+msgstr "file gitdir non valido"
+
+#: builtin/worktree.c:131
+msgid "gitdir file points to non-existent location"
+msgstr "il file gitdir punta a un percorso non esistente"
 
-#: builtin/worktree.c:126
+#: builtin/worktree.c:146
 #, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Rimuovo worktrees/%s: il file gitdir punta a un percorso non esistente"
+msgid "Removing %s/%s: %s"
+msgstr "Rimuovo %s/%s: %s"
 
-#: builtin/worktree.c:165
+#: builtin/worktree.c:221
 msgid "report pruned working trees"
 msgstr "segnala gli alberi di lavoro eliminati"
 
-#: builtin/worktree.c:167
+#: builtin/worktree.c:223
 msgid "expire working trees older than <time>"
 msgstr "fai scadere gli alberi di lavoro più vecchi di <tempo>"
 
-#: builtin/worktree.c:234
+#: builtin/worktree.c:293
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' esiste già"
 
-#: builtin/worktree.c:251
+#: builtin/worktree.c:302
 #, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "impossibile aggiungere nuovamente l'albero di lavoro '%s'"
+msgid "unusable worktree destination '%s'"
+msgstr "destinazione albero di lavoro non utilizzabile: '%s'"
 
-#: builtin/worktree.c:256
+#: builtin/worktree.c:307
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 "'%s' è un albero di lavoro mancante ma bloccato;\n"
-"usa 'add -f -f' per eseguire l'override, o 'unlock' e 'prune' o 'remove' per "
+"usa '%s -f -f' per eseguire l'override, o 'unlock' e 'prune' o 'remove' per "
 "rimuoverlo"
 
-#: builtin/worktree.c:258
+#: builtin/worktree.c:309
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 "'%s' è un albero di lavoro mancante ma già registrato;\n"
-"usa 'add -f' per eseguire l'override, o 'prune' o 'remove' per rimuoverlo"
+"usa '%s -f' per eseguire l'override, o 'prune' o 'remove' per rimuoverlo"
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:360
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "impossibile creare la directory di '%s'"
 
-#: builtin/worktree.c:439 builtin/worktree.c:445
+#: builtin/worktree.c:494 builtin/worktree.c:500
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "Preparazione dell'albero di lavoro in corso (nuovo branch '%s')"
 
-#: builtin/worktree.c:441
+#: builtin/worktree.c:496
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 "Preparazione dell'albero di lavoro in corso (reimposto il branch '%s'; era a "
 "%s)"
 
-#: builtin/worktree.c:450
+#: builtin/worktree.c:505
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Preparazione dell'albero di lavoro in corso (checkout di '%s')"
 
-#: builtin/worktree.c:456
+#: builtin/worktree.c:511
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Preparazione dell'albero di lavoro in corso (HEAD scollegato %s)"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:552
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "esegui il checkout di <branch> anche se tale operazione è stata eseguita in "
 "un altro albero di lavoro"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:555
 msgid "create a new branch"
 msgstr "crea un nuovo branch"
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:557
 msgid "create or reset a branch"
 msgstr "crea o reimposta un branch"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:559
 msgid "populate the new working tree"
 msgstr "popola il nuovo albero di lavoro"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:560
 msgid "keep the new working tree locked"
 msgstr "mantieni bloccato il nuovo albero di lavoro"
 
-#: builtin/worktree.c:508
+#: builtin/worktree.c:563
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "imposta la modalità tracking (vedi git-branch(1))"
 
-#: builtin/worktree.c:511
+#: builtin/worktree.c:566
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr ""
 "tenta di cercare una corrispondenza fra il nome del nuovo branch e un branch "
 "remoto da tracciare"
 
-#: builtin/worktree.c:519
+#: builtin/worktree.c:574
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "le opzioni -b, -B e --detach sono mutualmente esclusive"
 
-#: builtin/worktree.c:580
+#: builtin/worktree.c:635
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr ""
 "l'opzione --[no-]track può essere usata solo se viene creato un nuovo branch"
 
-#: builtin/worktree.c:680
+#: builtin/worktree.c:755
 msgid "reason for locking"
 msgstr "motivo di blocco"
 
-#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: builtin/worktree.c:767 builtin/worktree.c:800 builtin/worktree.c:874
+#: builtin/worktree.c:998
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' non è un albero di lavoro"
 
-#: builtin/worktree.c:694 builtin/worktree.c:727
+#: builtin/worktree.c:769 builtin/worktree.c:802
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Non è possibile bloccare o sbloccare l'albero di lavoro principale"
 
-#: builtin/worktree.c:699
+#: builtin/worktree.c:774
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' è già bloccato per questo motivo: %s"
 
-#: builtin/worktree.c:701
+#: builtin/worktree.c:776
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' è già bloccato"
 
-#: builtin/worktree.c:729
+#: builtin/worktree.c:804
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' non è bloccato"
 
-#: builtin/worktree.c:770
+#: builtin/worktree.c:845
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 "gli alberi di lavoro contenenti sottomoduli non possono essere spostati o "
 "rimossi"
 
-#: builtin/worktree.c:778
+#: builtin/worktree.c:853
 msgid "force move even if worktree is dirty or locked"
 msgstr "forza lo spostamento anche se l'albero di lavoro è sporco o bloccato"
 
-#: builtin/worktree.c:801 builtin/worktree.c:928
+#: builtin/worktree.c:876 builtin/worktree.c:1000
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' è un albero di lavoro principale"
 
-#: builtin/worktree.c:806
+#: builtin/worktree.c:881
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "impossibile determinare il nome destinazione da '%s'"
 
-#: builtin/worktree.c:812
-#, c-format
-msgid "target '%s' already exists"
-msgstr "la destinazione '%s' esiste già"
-
-#: builtin/worktree.c:820
+#: builtin/worktree.c:894
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -21261,7 +23305,7 @@ msgstr ""
 "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
 "l'operazione"
 
-#: builtin/worktree.c:822
+#: builtin/worktree.c:896
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -21270,37 +23314,37 @@ msgstr ""
 "usa 'move -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
 "l'operazione"
 
-#: builtin/worktree.c:825
+#: builtin/worktree.c:899
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "validazione non riuscita, impossibile spostare l'albero di lavoro: %s"
 
-#: builtin/worktree.c:830
+#: builtin/worktree.c:904
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "spostamento di '%s' in '%s' non riuscito"
 
-#: builtin/worktree.c:878
+#: builtin/worktree.c:950
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "esecuzione di 'git status' su '%s' non riuscita"
 
-#: builtin/worktree.c:882
+#: builtin/worktree.c:954
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 "'%s' contiene file modificati o non tracciati, usa --force per eliminarlo"
 
-#: builtin/worktree.c:887
+#: builtin/worktree.c:959
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "esecuzione di 'git status' su '%s' non riuscita, codice %d"
 
-#: builtin/worktree.c:910
+#: builtin/worktree.c:982
 msgid "force removal even if worktree is dirty or locked"
 msgstr "forza la rimozione anche se l'albero di lavoro è sporco o bloccato"
 
-#: builtin/worktree.c:933
+#: builtin/worktree.c:1005
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -21310,7 +23354,7 @@ msgstr ""
 "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
 "l'operazione"
 
-#: builtin/worktree.c:935
+#: builtin/worktree.c:1007
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -21319,11 +23363,21 @@ msgstr ""
 "usa 'remove -f -f' per eseguirne l'override o sbloccalo prima di eseguire "
 "l'operazione"
 
-#: builtin/worktree.c:938
+#: builtin/worktree.c:1010
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "validazione non riuscita, impossibile rimuovere l'albero di lavoro: %s"
 
+#: builtin/worktree.c:1034
+#, c-format
+msgid "repair: %s: %s"
+msgstr "ripara: %s: %s"
+
+#: builtin/worktree.c:1037
+#, c-format
+msgid "error: %s: %s"
+msgstr "errore: %s: %s"
+
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefisso>/]"
@@ -21340,40 +23394,21 @@ msgstr "scrivi l'oggetto albero per una sottodirectory <prefisso>"
 msgid "only useful for debugging"
 msgstr "utile solo per il debug"
 
-#: fast-import.c:3118
+#: http-fetch.c:114
 #, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "Atteso comando 'mark', ricevuto %s"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "l'argomento di --packfile dev'essere un hash valido (ricevuto '%s')"
 
-#: fast-import.c:3123
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "Atteso comando 'to', ricevuto %s"
+#: http-fetch.c:122
+msgid "not a git repository"
+msgstr "non è un repository Git"
 
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"I permessi sulla directory del socket sono troppo laschi; altri\n"
-"utenti potrebbero essere in grado di leggere le credenziali nella\n"
-"cache. Valuta di eseguire:\n"
-"\n"
-"\tchmod 0700 %s"
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "stampa i messaggi di debug sullo standard error"
-
-#: t/helper/test-reach.c:152
+#: t/helper/test-reach.c:154
 #, c-format
 msgid "commit %s is not marked reachable"
 msgstr "il commit %s non è contrassegnato come raggiungibile"
 
-#: t/helper/test-reach.c:162
+#: t/helper/test-reach.c:164
 msgid "too many commits marked reachable"
 msgstr "troppi commit contrassegnati come raggiungibili"
 
@@ -21385,7 +23420,7 @@ msgstr "test-tool serve-v2 [<opzioni>]"
 msgid "exit immediately after advertising capabilities"
 msgstr "esci subito dopo aver annunciato le funzionalità"
 
-#: git.c:27
+#: git.c:28
 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
 "           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
@@ -21403,7 +23438,7 @@ msgstr ""
 "namespace=<nome>]\n"
 "           <comando> [<argomenti>]"
 
-#: git.c:34
+#: git.c:35
 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"
@@ -21416,47 +23451,47 @@ msgstr ""
 "specifici.\n"
 "Vedi 'git help git' per una panoramica del sistema."
 
-#: git.c:186
+#: git.c:187
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "nessuna directory specificata per --git-dir\n"
 
-#: git.c:200
+#: git.c:201
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "nessuno spazio dei nomi specificato per --namespace\n"
 
-#: git.c:214
+#: git.c:215
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "nessuna directory specificata per --work-tree\n"
 
-#: git.c:228
+#: git.c:229
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "nessun prefisso specificato per --super-prefix\n"
 
-#: git.c:250
+#: git.c:251
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c: attesa stringa di configurazione\n"
 
-#: git.c:288
+#: git.c:289
 #, c-format
 msgid "no directory given for -C\n"
 msgstr "nessuna directory specificata per -C\n"
 
-#: git.c:314
+#: git.c:315
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "opzione sconosciuta: %s\n"
 
-#: git.c:360
+#: git.c:364
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr "durante l'espansione dell'alias '%s': '%s'"
 
-#: git.c:369
+#: git.c:373
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -21465,39 +23500,39 @@ msgstr ""
 "l'alias '%s' modifica le variabili d'ambiente.\n"
 "Puoi usare '!git' nell'alias per farlo"
 
-#: git.c:376
+#: git.c:380
 #, c-format
 msgid "empty alias for %s"
 msgstr "alias vuoto per %s"
 
-#: git.c:379
+#: git.c:383
 #, c-format
 msgid "recursive alias: %s"
 msgstr "alias ricorsivo: %s"
 
-#: git.c:459
+#: git.c:465
 msgid "write failure on standard output"
 msgstr "errore di scrittura sullo standard output"
 
-#: git.c:461
+#: git.c:467
 msgid "unknown write failure on standard output"
 msgstr "errore di scrittura sconosciuto sullo standard output"
 
-#: git.c:463
+#: git.c:469
 msgid "close failed on standard output"
 msgstr "chiusura dello standard output non riuscita"
 
-#: git.c:792
+#: git.c:819
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "rilevato ciclo alias: l'espansione di '%s' non termina:%s"
 
-#: git.c:842
+#: git.c:869
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "impossibile gestire %s come comando incorporato"
 
-#: git.c:855
+#: git.c:882
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -21506,55 +23541,55 @@ msgstr ""
 "uso: %s\n"
 "\n"
 
-#: git.c:875
+#: git.c:902
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "espansione dell'alias '%s' non riuscita; '%s' non è un comando Git\n"
 
-#: git.c:887
+#: git.c:914
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "esecuzione del comando '%s' non riuscita: %s\n"
 
-#: http.c:378
+#: http.c:399
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "valore negativo per http.postbuffer; uso l'impostazione predefinita %d"
 
-#: http.c:399
+#: http.c:420
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Il controllo delegazione non è supportato con cURL < 7.22.0"
 
-#: http.c:408
+#: http.c:429
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Il pinning delle chiavi pubbliche non è supportato con cURL < 7.44.0"
 
-#: http.c:878
+#: http.c:910
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "CURLSSLOPT_NO_REVOKE non è supportato con cURL < 7.44.0"
 
-#: http.c:951
+#: http.c:989
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "Le restrizioni protocollo non sono supportate con cURL < 7.19.4"
 
-#: http.c:1088
+#: http.c:1132
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "Backend SSL '%s' non supportato. Backend SSL supportati:"
 
-#: http.c:1095
+#: http.c:1139
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 "Impossibile impostare il backend SSL a '%s': cURL è stato compilato senza "
 "backend SSL"
 
-#: http.c:1099
+#: http.c:1143
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "Impossibile impostare il backend SSL a '%s': già impostato"
 
-#: http.c:1968
+#: http.c:2025
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21565,160 +23600,202 @@ msgstr ""
 "  richiesta: %s\n"
 "   redirect: %s"
 
-#: remote-curl.c:166
+#: remote-curl.c:174
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "virgolette non valide nel valore push-option: '%s'"
 
-#: remote-curl.c:263
+#: remote-curl.c:298
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr "%sinfo/refs non valido: è un repository Git?"
 
-#: remote-curl.c:364
+#: remote-curl.c:399
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 "risposta del server non valida; atteso servizio, ricevuto pacchetto flush"
 
-#: remote-curl.c:395
+#: remote-curl.c:430
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "risposta del server non valida; ricevuto '%s'"
 
-#: remote-curl.c:455
+#: remote-curl.c:490
 #, c-format
 msgid "repository '%s' not found"
 msgstr "repository '%s' non trovato"
 
-#: remote-curl.c:459
+#: remote-curl.c:494
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Autenticazione non riuscita per '%s'"
 
-#: remote-curl.c:463
+#: remote-curl.c:498
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "impossibile accedere a '%s': %s"
 
-#: remote-curl.c:469
+#: remote-curl.c:504
 #, c-format
 msgid "redirecting to %s"
 msgstr "redirezione a %s in corso"
 
-#: remote-curl.c:593
+#: remote-curl.c:633
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr ""
 "non dovrebbe esserci un pacchetto fine file se non si è accomodanti con "
 "questi ultimi"
 
-#: remote-curl.c:673
+#: remote-curl.c:645
+msgid "remote server sent stateless separator"
+msgstr "il server remoto ha inviato un separatore senza stato"
+
+#: remote-curl.c:715
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr ""
 "impossibile ritornare a un punto precedente dei dati POST RPC - prova ad "
 "aumentare il valore di http.postBuffer"
 
-#: remote-curl.c:733
+#: remote-curl.c:745
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: carattere lunghezza riga non valido: %.4s"
+
+#: remote-curl.c:747
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: pacchetto fine risposta non atteso"
+
+#: remote-curl.c:823
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC non riuscita; %s"
 
-#: remote-curl.c:773
+#: remote-curl.c:863
 msgid "cannot handle pushes this big"
 msgstr "impossibile gestire push così grandi"
 
-#: remote-curl.c:888
+#: remote-curl.c:978
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 "impossibile eseguire il deflate della richiesta; errore deflate zlib %d"
 
-#: remote-curl.c:892
+#: remote-curl.c:982
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "impossibile eseguire il deflate della richiesta; errore fine zlib %d"
 
-#: remote-curl.c:1023
+#: remote-curl.c:1032
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "sono stati ricevuti %d byte dell'intestazione sulla lunghezza"
+
+#: remote-curl.c:1034
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "sono ancora attesi %d byte del corpo"
+
+#: remote-curl.c:1123
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "il trasporto http stupido non supporta le funzionalità shallow"
 
-#: remote-curl.c:1037
+#: remote-curl.c:1138
 msgid "fetch failed."
 msgstr "recupero non riuscito."
 
-#: remote-curl.c:1085
+#: remote-curl.c:1184
 msgid "cannot fetch by sha1 over smart http"
 msgstr ""
 "impossibile recuperare i dati in base allo SHA1 con il trasporto HTTP "
 "intelligente"
 
-#: remote-curl.c:1129 remote-curl.c:1135
+#: remote-curl.c:1228 remote-curl.c:1234
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "errore protocollo: atteso SHA/riferimento, ricevuto '%s'"
 
-#: remote-curl.c:1147 remote-curl.c:1261
+#: remote-curl.c:1246 remote-curl.c:1361
 #, c-format
 msgid "http transport does not support %s"
 msgstr "il trasporto HTTP non supporta %s"
 
-#: remote-curl.c:1183
+#: remote-curl.c:1282
 msgid "git-http-push failed"
 msgstr "git-http-push non riuscito"
 
-#: remote-curl.c:1367
+#: remote-curl.c:1467
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: uso: git remote-curl <remoto> [<URL>]"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1499
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl: errore durante la lettura del flusso dei comandi da Git"
 
-#: remote-curl.c:1406
+#: remote-curl.c:1506
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: tentato un fetch senza un repository locale"
 
-#: remote-curl.c:1446
+#: remote-curl.c:1547
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: ricevuto comando sconosciuto '%s' da Git"
 
-#: list-objects-filter-options.h:85
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "nessuna informazione sul compilatore disponibile\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "nessuna informazione su libc disponibile\n"
+
+#: list-objects-filter-options.h:91
 msgid "args"
 msgstr "argomenti"
 
-#: list-objects-filter-options.h:86
+#: list-objects-filter-options.h:92
 msgid "object filtering"
 msgstr "filtraggio oggetti"
 
-#: parse-options.h:179
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "data-scadenza"
 
-#: parse-options.h:193
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "no-op (retrocompatibilità)"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "visualizza più dettagli"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "visualizza meno dettagli"
 
-#: parse-options.h:313
-msgid "use <n> digits to display SHA-1s"
-msgstr "usa <n> cifre per mostrare gli hash SHA-1"
+#: parse-options.h:317
+msgid "use <n> digits to display object names"
+msgstr "usa <n> cifre per mostrare i nomi oggetto"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "come rimuovere gli spazi e i #commenti dal messaggio"
 
-#: ref-filter.h:101
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "leggi gli specificatori percorso da un file"
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"con --pathspec-from-file gli elementi specificatori percorso sono separati "
+"da un carattere NUL"
+
+#: ref-filter.h:96
 msgid "key"
 msgstr "chiave"
 
-#: ref-filter.h:101
+#: ref-filter.h:96
 msgid "field name to sort on"
 msgstr "nome campo in base a cui ordinare"
 
@@ -21728,11 +23805,11 @@ msgstr ""
 "aggiorna l'indice con la tecnica di risoluzione conflitti riutilizzata se "
 "possibile"
 
-#: wt-status.h:67
+#: wt-status.h:80
 msgid "HEAD detached at "
 msgstr "HEAD scollegato su "
 
-#: wt-status.h:68
+#: wt-status.h:81
 msgid "HEAD detached from "
 msgstr "HEAD scollegato da "
 
@@ -21775,688 +23852,707 @@ msgid "List, create, or delete branches"
 msgstr "Elenca, crea o elimina branch"
 
 #: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr ""
+"Raccogli le informazioni necessarie perché l'utente possa inviare una "
+"segnalazione d'errore"
+
+#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Sposta oggetti e riferimenti in base a un archivio"
 
-#: command-list.h:60
+#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
 "Fornisci informazioni sul contenuto o sul tipo e sulle dimensioni per gli "
 "oggetti di un repository"
 
-#: command-list.h:61
+#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Visualizza le informazioni sugli attributi Git"
 
-#: command-list.h:62
+#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Esegui il debug dei file gitignore/escludi file"
 
-#: command-list.h:63
+#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Visualizza i nomi canonici e gli indirizzi e-mail dei contatti"
 
-#: command-list.h:64
+#: command-list.h:65
 msgid "Switch branches or restore working tree files"
 msgstr ""
 "Passa da un branch a un altro o ripristina i file nell'albero di lavoro"
 
-#: command-list.h:65
+#: command-list.h:66
 msgid "Copy files from the index to the working tree"
 msgstr "Copia dei file dall'indice all'albero di lavoro"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Ensures that a reference name is well formed"
 msgstr "Si assicura che un nome riferimento sia ben formato"
 
-#: command-list.h:67
+#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Trova commit che devono essere ancora applicati upstream"
 
-#: command-list.h:68
+#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Applica le modifiche introdotte da alcuni commit esistenti"
 
-#: command-list.h:69
+#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Alternativa grafica a git-commit"
 
-#: command-list.h:70
+#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Rimuove i file non tracciati dall'albero di lavoro"
 
-#: command-list.h:71
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Clona un repository in una nuova directory"
 
-#: command-list.h:72
+#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Visualizza i dati in colonne"
 
-#: command-list.h:73
+#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Registra modifiche al repository"
 
-#: command-list.h:74
+#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Scrive e verifica i file grafo dei commit di Git"
 
-#: command-list.h:75
+#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Crea un nuovo oggetto commit"
 
-#: command-list.h:76
+#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Ottiene e imposta le opzioni a livello di repository o globali"
 
-#: command-list.h:77
+#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr ""
 "Conta il numero di oggetti non in un pack e la loro occupazione di spazio su "
 "disco"
 
-#: command-list.h:78
+#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Recupera e salva credenziali utente"
 
-#: command-list.h:79
+#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Helper per salvare temporaneamente password in memoria"
 
-#: command-list.h:80
+#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Helper per salvare credenziali su disco"
 
-#: command-list.h:81
+#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Esporta un singolo commit in un checkout CVS"
 
-#: command-list.h:82
+#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr ""
 "Recupera i dati da un sistema di controllo di versione che le persone "
 "adorano odiare"
 
-#: command-list.h:83
+#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Un emulatore di server CVS per Git"
 
-#: command-list.h:84
+#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Un server veramente semplice per repository Git"
 
-#: command-list.h:85
+#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "Attribuisce un nome leggibile a un oggetto basandosi su un riferimento "
 "disponibile"
 
-#: command-list.h:86
+#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 "Visualizza le modifiche fra commit, un commit e l'albero di lavoro, ecc."
 
-#: command-list.h:87
+#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Confronta file nell'albero di lavoro e nell'indice"
 
-#: command-list.h:88
+#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Confronta un albero con l'albero di lavoro o l'indice"
 
-#: command-list.h:89
+#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 "Confronta il contenuto e i mode dei blob trovati tramite due oggetti albero"
 
-#: command-list.h:90
+#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr ""
 "Visualizza le modifiche usando tool comuni per la visualizzazione dei diff"
 
-#: command-list.h:91
+#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Esportatore di dati Git"
 
-#: command-list.h:92
+#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Backend per importatori di dati Git veloci"
 
-#: command-list.h:93
+#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Scarica oggetti e riferimenti da un altro repository"
 
-#: command-list.h:94
+#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Riceve oggetti mancanti da un altro repository"
 
-#: command-list.h:95
+#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Riscrive branch"
 
-#: command-list.h:96
+#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Genera un messaggio di commit del merge"
 
-#: command-list.h:97
+#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Visualizza in output le informazioni su ogni riferimento"
 
-#: command-list.h:98
+#: command-list.h:99
 msgid "Prepare patches for e-mail submission"
 msgstr "Prepara patch per il loro invio tramite e-mail"
 
-#: command-list.h:99
+#: command-list.h:100
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "Verifica la connessione e la validità degli oggetti nel database"
 
-#: command-list.h:100
+#: command-list.h:101
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Ripulisce file non necessari e ottimizza il repository locale"
 
-#: command-list.h:101
+#: command-list.h:102
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "Estrae l'ID del commit da un archivio creato usando git-archive"
 
-#: command-list.h:102
+#: command-list.h:103
 msgid "Print lines matching a pattern"
 msgstr "Stampa le righe corrispondenti a un'espressione regolare"
 
-#: command-list.h:103
+#: command-list.h:104
 msgid "A portable graphical interface to Git"
 msgstr "Un'interfaccia grafica portabile per Git"
 
-#: command-list.h:104
+#: command-list.h:105
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "Calcola l'ID oggetto e crea facoltativamente un blob da un file"
 
-#: command-list.h:105
+#: command-list.h:106
 msgid "Display help information about Git"
 msgstr "Visualizza una guida a Git"
 
-#: command-list.h:106
+#: command-list.h:107
 msgid "Server side implementation of Git over HTTP"
 msgstr "Implementazione lato server di Git su HTTP"
 
-#: command-list.h:107
+#: command-list.h:108
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Scarica dati da un repository Git remoto tramite HTTP"
 
-#: command-list.h:108
+#: command-list.h:109
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Esegue il push di oggetti su un altro repository tramite HTTP/DAV"
 
-#: command-list.h:109
+#: command-list.h:110
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "Invia un insieme di patch dallo standard input a una cartella IMAP"
 
-#: command-list.h:110
+#: command-list.h:111
 msgid "Build pack index file for an existing packed archive"
 msgstr "Genera il file indice pack per un archivio esistente sottoposto a pack"
 
-#: command-list.h:111
+#: command-list.h:112
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Crea un repository Git vuoto o ne reinizializza uno esistente"
 
-#: command-list.h:112
+#: command-list.h:113
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Sfoglia istantaneamente il tuo repository di lavoro su gitweb"
 
-#: command-list.h:113
+#: command-list.h:114
 msgid "Add or parse structured information in commit messages"
 msgstr "Aggiunge o analizza informazioni strutturate nei messaggi di commit"
 
-#: command-list.h:114
+#: command-list.h:115
 msgid "The Git repository browser"
 msgstr "Il browser per i repository Git"
 
-#: command-list.h:115
+#: command-list.h:116
 msgid "Show commit logs"
 msgstr "Visualizza i log dei commit"
 
-#: command-list.h:116
+#: command-list.h:117
 msgid "Show information about files in the index and the working tree"
 msgstr "Visualizza informazioni sui file nell'indice e nell'albero di lavoro"
 
-#: command-list.h:117
+#: command-list.h:118
 msgid "List references in a remote repository"
 msgstr "Elenca i riferimenti in un repository remoto"
 
-#: command-list.h:118
+#: command-list.h:119
 msgid "List the contents of a tree object"
 msgstr "Elenca i contenuti di un oggetto albero"
 
-#: command-list.h:119
+#: command-list.h:120
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr ""
 "Estrae la patch e le informazioni sull'autore da un singolo messaggio e-mail"
 
-#: command-list.h:120
+#: command-list.h:121
 msgid "Simple UNIX mbox splitter program"
 msgstr "Un semplice programma per suddividere i file UNIX mbox"
 
-#: command-list.h:121
+#: command-list.h:122
+msgid "Run tasks to optimize Git repository data"
+msgstr "Esegui delle attività per ottimizzare i dati dei repository Git"
+
+#: command-list.h:123
 msgid "Join two or more development histories together"
 msgstr "Unisce due o più cronologie di sviluppo"
 
-#: command-list.h:122
+#: command-list.h:124
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Trova il maggior numero possibile di antenati comuni per un merge"
 
-#: command-list.h:123
+#: command-list.h:125
 msgid "Run a three-way file merge"
 msgstr "Esegue un merge a tre vie su file"
 
-#: command-list.h:124
+#: command-list.h:126
 msgid "Run a merge for files needing merging"
 msgstr "Esegue un merge per i file che lo richiedono"
 
-#: command-list.h:125
+#: command-list.h:127
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Il programma helper standard da usare con git-merge-index"
 
-#: command-list.h:126
+#: command-list.h:128
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 "Esegue gli strumenti di risoluzione conflitti di merge per risolvere i "
 "conflitti di merge"
 
-#: command-list.h:127
+#: command-list.h:129
 msgid "Show three-way merge without touching index"
 msgstr "Visualizza un merge a tre vie senza modificare l'indice"
 
-#: command-list.h:128
+#: command-list.h:130
 msgid "Write and verify multi-pack-indexes"
 msgstr "Scrive e verifica indici multi-pack"
 
-#: command-list.h:129
+#: command-list.h:131
 msgid "Creates a tag object"
 msgstr "Crea un oggetto tag"
 
-#: command-list.h:130
+#: command-list.h:132
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Genera un oggetto albero da testo in formato ls-tree"
 
-#: command-list.h:131
+#: command-list.h:133
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Sposta o rinomina un file, una directory o un collegamento simbolico"
 
-#: command-list.h:132
+#: command-list.h:134
 msgid "Find symbolic names for given revs"
 msgstr "Trova i nomi simbolici per le revisioni date"
 
-#: command-list.h:133
+#: command-list.h:135
 msgid "Add or inspect object notes"
 msgstr "Aggiunge o esamina le note agli oggetti"
 
-#: command-list.h:134
+#: command-list.h:136
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importa dati da, o invia dati a, repository Perforce"
 
-#: command-list.h:135
+#: command-list.h:137
 msgid "Create a packed archive of objects"
 msgstr "Crea un archivio di oggetti sottoposto a pack"
 
-#: command-list.h:136
+#: command-list.h:138
 msgid "Find redundant pack files"
 msgstr "Trova file pack ridondanti"
 
-#: command-list.h:137
+#: command-list.h:139
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Esegue il pack di head e tag per un accesso efficiente al repository"
 
-#: command-list.h:138
+#: command-list.h:140
 msgid "Routines to help parsing remote repository access parameters"
 msgstr ""
 "Routine che aiutano ad analizzare i parametri di accesso ai repository remoti"
 
-#: command-list.h:139
+#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Calcola l'ID univoco per una patch"
 
-#: command-list.h:140
+#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "Elimina tutti gli oggetti non raggiungibili dal database oggetti"
 
-#: command-list.h:141
+#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr "Rimuove gli oggetti aggiuntivi già presenti nei file pack"
 
-#: command-list.h:142
+#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr ""
 "Esegue il fetch e l'integrazione con un altro repository o un branch locale"
 
-#: command-list.h:143
+#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Aggiorna i riferimenti remoti insieme agli oggetti associati"
 
-#: command-list.h:144
+#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Applica un insieme di patch quilt sul branch corrente"
 
-#: command-list.h:145
+#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Compara due intervalli di commit (ad es. due versioni di un branch)"
 
-#: command-list.h:146
+#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Legge le informazioni su un albero dall'indice"
 
-#: command-list.h:147
+#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Riapplica dei commit dopo l'ultimo commit di un branch"
 
-#: command-list.h:148
+#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Riceve quanto sottoposto a push nel repository"
 
-#: command-list.h:149
+#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Gestisce le informazioni del registro dei riferimenti"
 
-#: command-list.h:150
+#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Gestisce l'insieme dei repository tracciati"
 
-#: command-list.h:151
+#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Esegue il pack degli oggetti non sottoposti a pack in un repository"
 
-#: command-list.h:152
+#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Crea, elenca, elimina i riferimenti per sostituire oggetti"
 
-#: command-list.h:153
+#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Genera un riassunto delle modifiche in sospeso"
 
-#: command-list.h:154
+#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Riusa la risoluzione registrata dei merge che hanno generato conflitti"
 
-#: command-list.h:155
+#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Ripristina l'HEAD corrente allo stato specificato"
 
-#: command-list.h:156
+#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Ripristina i file nell'albero di lavoro"
 
-#: command-list.h:157
+#: command-list.h:159
 msgid "Revert some existing commits"
 msgstr "Esegue il revert di alcuni commit esistenti"
 
-#: command-list.h:158
+#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Elenca gli oggetti commit in ordine cronologico inverso"
 
-#: command-list.h:159
+#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "Sceglie e altera i parametri"
 
-#: command-list.h:160
+#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "Rimuove file dall'albero di lavoro e dall'indice"
 
-#: command-list.h:161
+#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Invia un insieme di patch come e-mail"
 
-#: command-list.h:162
+#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr ""
 "Esegue il push di oggetti su un altro repository tramite il protocollo Git"
 
-#: command-list.h:163
+#: command-list.h:165
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Shell di login limitata per concedere accesso SSH solo per Git"
 
-#: command-list.h:164
+#: command-list.h:166
 msgid "Summarize 'git log' output"
 msgstr "Riassume l'output di 'git log'"
 
-#: command-list.h:165
+#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "Visualizza vari tipi di oggetti"
 
-#: command-list.h:166
+#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "Visualizza i branch e i loro commit"
 
-#: command-list.h:167
+#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "Visualizza l'indice di un archivio sottoposto a pack"
 
-#: command-list.h:168
+#: command-list.h:170
 msgid "List references in a local repository"
 msgstr "Elenca i riferimenti in un repository locale"
 
-#: command-list.h:169
+#: command-list.h:171
 msgid "Git's i18n setup code for shell scripts"
 msgstr ""
 "Codice di inizializzazione dell'internazionalizzazione di Git per gli script "
 "shell"
 
-#: command-list.h:170
+#: command-list.h:172
 msgid "Common Git shell script setup code"
 msgstr "Codice comune di inizializzazione di Git per gli script shell"
 
-#: command-list.h:171
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Inizializza e modifica sparse-checkout"
+
+#: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Mette da parte le modifiche in una directory di lavoro sporca"
 
-#: command-list.h:172
+#: command-list.h:175
 msgid "Add file contents to the staging area"
 msgstr "Aggiunge i contenuti dei file all'area di staging"
 
-#: command-list.h:173
+#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Visualizza lo stato dell'albero di lavoro"
 
-#: command-list.h:174
+#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Rimuove spazi bianchi non necessari"
 
-#: command-list.h:175
+#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Inizializza, aggiorna o esamina sottomoduli"
 
-#: command-list.h:176
+#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Operatività bidirezionale tra un repository Subversion e Git"
 
-#: command-list.h:177
+#: command-list.h:180
 msgid "Switch branches"
 msgstr "Passa da un branch a un altro"
 
-#: command-list.h:178
+#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Legge, modifica ed elimina riferimenti simbolici"
 
-#: command-list.h:179
+#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG"
 
-#: command-list.h:180
+#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Crea un file temporaneo con i contenuti di un blob"
 
-#: command-list.h:181
+#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Decomprime gli oggetti da un archivio sottoposto a pack"
 
-#: command-list.h:182
+#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Registra i contenuti dei file dell'albero di lavoro nell'indice"
 
-#: command-list.h:183
+#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr "Aggiorna in modo sicuro il nome oggetto salvato in un riferimento"
 
-#: command-list.h:184
+#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Aggiorna il file informazioni aggiuntive per aiutare i server stupidi"
 
-#: command-list.h:185
+#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Reinvia l'archivio a git-archive"
 
-#: command-list.h:186
+#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Reinvia gli oggetti sottoposti a pack a git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Visualizza una variabile logica di Git"
 
-#: command-list.h:188
+#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Verifica la firma GPG dei commit"
 
-#: command-list.h:189
+#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Convalida i file archivio sottoposti a pack di Git"
 
-#: command-list.h:190
+#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Verifica la firma GPG dei tag"
 
-#: command-list.h:191
+#: command-list.h:194
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Interfaccia Web per Git (frontend Web ai repository Git)"
 
-#: command-list.h:192
+#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr ""
 "Visualizza i registri insieme alle differenze introdotte da ciascun commit"
 
-#: command-list.h:193
+#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "Gestisce alberi di lavoro multipli"
 
-#: command-list.h:194
+#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "Crea un oggetto albero dall'indice corrente"
 
-#: command-list.h:195
+#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "Definizione di attributi per percorso"
 
-#: command-list.h:196
+#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Interfaccia a riga di comando di Git e convenzioni"
 
-#: command-list.h:197
+#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "Un tutorial Git di base per gli sviluppatori"
 
-#: command-list.h:198
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Fornire nomi utente e password a Git"
+
+#: command-list.h:202
 msgid "Git for CVS users"
 msgstr "Git per utenti CVS"
 
-#: command-list.h:199
+#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "Messa a punto dell'output di diff"
 
-#: command-list.h:200
+#: command-list.h:204
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Un insieme di comandi utile e minimale per l'uso quotidiano di Git"
 
-#: command-list.h:201
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Domande frequenti sull'utilizzo di Git"
+
+#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "Un glossario di Git"
 
-#: command-list.h:202
+#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Hook usati da Git"
 
-#: command-list.h:203
+#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Specifica i file intenzionalmente non tracciati da ignorare"
 
-#: command-list.h:204
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "Definizione proprietà sottomodulo"
 
-#: command-list.h:205
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Spazi dei nomi Git"
 
-#: command-list.h:206
+#: command-list.h:211
+msgid "Helper programs to interact with remote repositories"
+msgstr "Programmi helper per interagire con repository remoti"
+
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Struttura repository Git"
 
-#: command-list.h:207
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "Come specificare revisioni e intervalli in Git"
 
-#: command-list.h:208
+#: command-list.h:214
+msgid "Mounting one repository inside another"
+msgstr "Monto un repository dentro un altro"
+
+#: command-list.h:215
 msgid "A tutorial introduction to Git: part two"
 msgstr "Un tutorial introduttivo per Git: seconda parte"
 
-#: command-list.h:209
+#: command-list.h:216
 msgid "A tutorial introduction to Git"
 msgstr "Un tutorial introduttivo per Git"
 
-#: command-list.h:210
+#: command-list.h:217
 msgid "An overview of recommended workflows with Git"
 msgstr "Una panoramica dei flussi di lavoro raccomandati in Git"
 
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Devi iniziare con \"git bisect start\""
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Vuoi che me ne occupi io [Y/n]? "
-
-#: git-bisect.sh:101
+#: git-bisect.sh:79
 #, sh-format
 msgid "Bad rev input: $arg"
 msgstr "Revisione fornita non valida: $arg"
 
-#: git-bisect.sh:121
+#: git-bisect.sh:99
 #, sh-format
 msgid "Bad rev input: $bisected_head"
 msgstr "Revisione fornita non valida: $bisected_head"
 
-#: git-bisect.sh:130
+#: git-bisect.sh:108
 #, sh-format
 msgid "Bad rev input: $rev"
 msgstr "Revisione fornita non valida: $rev"
 
-#: git-bisect.sh:139
+#: git-bisect.sh:117
 #, sh-format
 msgid "'git bisect $TERM_BAD' can take only one argument."
 msgstr "'git bisect $TERM_BAD' richiede un solo argomento."
 
-#: git-bisect.sh:209
+#: git-bisect.sh:149
 msgid "No logfile given"
 msgstr "Nessun file di log specificato"
 
-#: git-bisect.sh:210
+#: git-bisect.sh:150
 #, sh-format
 msgid "cannot read $file for replaying"
 msgstr "impossibile leggere $file per rieseguire i comandi contenuti"
 
-#: git-bisect.sh:232
+#: git-bisect.sh:173
 msgid "?? what are you talking about?"
 msgstr "?? di cosa stai parlando?"
 
-#: git-bisect.sh:241
+#: git-bisect.sh:183
 msgid "bisect run failed: no command provided."
 msgstr "esecuzione di bisect non riuscita: nessun comando fornito."
 
-#: git-bisect.sh:246
+#: git-bisect.sh:188
 #, sh-format
 msgid "running $command"
 msgstr "esecuzione di $command in corso"
 
-#: git-bisect.sh:253
+#: git-bisect.sh:195
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -22465,11 +24561,11 @@ msgstr ""
 "esecuzione di bisect non riuscita:\n"
 "il codice di uscita $res da '$command' è < 0 oppure >= 128"
 
-#: git-bisect.sh:279
+#: git-bisect.sh:221
 msgid "bisect run cannot continue any more"
 msgstr "l'esecuzione di bisect non può più proseguire"
 
-#: git-bisect.sh:285
+#: git-bisect.sh:227
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -22478,11 +24574,11 @@ msgstr ""
 "esecuzione di bisect non riuscita:\n"
 "'bisect_state $state' è uscito con il codice di errore $res"
 
-#: git-bisect.sh:292
+#: git-bisect.sh:234
 msgid "bisect run success"
 msgstr "esecuzione di bisect completata con successo"
 
-#: git-bisect.sh:300
+#: git-bisect.sh:242
 msgid "We are not bisecting."
 msgstr "Non stiamo eseguendo una bisezione."
 
@@ -22526,144 +24622,50 @@ msgstr "Provo un merge semplice con $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Il merge semplice non ha funzionato, provo il merge automatico."
 
-#: git-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Impossibile rimuovere l'indice temporaneo (non può succedere)"
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Impossibile aggiornare $ref_stash con $w_commit"
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "errore: opzione sconosciuta per 'stash push': $option"
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Directory di lavoro e stato indice salvati: $stash_msg"
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "opzione sconosciuta: $opt"
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Troppe revisioni specificate: $REV"
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference non è un riferimento valido"
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' non è un commit di tipo stash"
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' non è un riferimento a uno stash"
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr "impossibile aggiornare l'indice"
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Impossibile applicare uno stash nel mezzo di un merge"
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr "Ci sono conflitti in index. Prova senza --index."
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr "Non è stato possibile salvare l'albero indice"
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr ""
-"Non è stato possibile ripristinare i file non tracciati dalla voce stash"
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr "Non è stato possibile rimuovere i file modificati dall'area di staging"
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "${REV} eliminata ($s)"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: non è stato possibile rimuovere la voce di stash"
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Per ripristinarli digita \"git stash apply\")"
-
-#: git-submodule.sh:200
+#: git-submodule.sh:180
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr ""
 "Il percorso relativo può essere usato solo dal primo livello dell'albero di "
 "lavoro"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:190
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "URL repository:: '$repo' deve essere assoluto o iniziare con ./|../"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:209
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' esiste già nell'indice"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:212
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' esiste già nell'indice e non è un sottomodulo"
 
-#: git-submodule.sh:239
+#: git-submodule.sh:219
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "'$sm_path' non ha un commit di cui è stato eseguito il checkout"
 
-#: git-submodule.sh:245
-#, 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 ""
-"Il seguente percorso è ignorato da uno dei tuoi file .gitignore:\n"
-"$sm_path\n"
-"Usa -f se vuoi davvero aggiungerlo."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:250
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Aggiunta del repository esistente in '$sm_path' all'indice"
 
-#: git-submodule.sh:270
+#: git-submodule.sh:252
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' esiste già e non è un repository Git valido"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:260
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr ""
 "È stata trovata localmente una directory Git per '$sm_name' con i seguenti "
 "remoti:"
 
-#: git-submodule.sh:280
+#: git-submodule.sh:262
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -22680,39 +24682,39 @@ msgstr ""
 "altro\n"
 "nome con l'opzione '--name'."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:268
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Riattivo la directory Git locale per il sottomodulo '$sm_name'."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:280
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "Impossibile eseguire il checkout del sottomodulo '$sm_path'"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:285
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Aggiunta del sottomodulo '$sm_path' non riuscita"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:294
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Registrazione del sottomodulo '$sm_path' non riuscita"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:567
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr ""
 "Impossibile trovare la revisione corrente nel percorso del sottomodulo "
 "'$displaypath'"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:577
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "Impossibile eseguire il fetch nel percorso del sottomodulo '$sm_path'"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:582
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22721,7 +24723,7 @@ msgstr ""
 "Impossibile trovare la revisione corrente per ${remote_name}/${branch} nel "
 "percorso del sottomodulo '$sm_path'"
 
-#: git-submodule.sh:606
+#: git-submodule.sh:600
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22730,7 +24732,7 @@ msgstr ""
 "Impossibile eseguire il fetch nel percorso del sottomodulo '$displaypath'; "
 "provo a recuperare direttamente $sha1:"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:606
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22739,84 +24741,59 @@ msgstr ""
 "Fetch eseguito nel percorso del sottomodulo '$displaypath', ma non conteneva "
 "$sha1. Fetch diretto di tale commit non riuscito."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:613
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossibile eseguire il checkout di '$sha1' nel percorso del sottomodulo "
 "'$displaypath'"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:614
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Percorso del sottomodulo '$displaypath': eseguito checkout di '$sha1'"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:618
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossibile eseguire il rebase di '$sha1' nel percorso del sottomodulo "
 "'$displaypath'"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:619
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Percorso del sottomodulo '$displaypath': eseguito rebase su '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:624
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr ""
 "Impossibile eseguire il merge di '$sha1' nel percorso del sottomodulo "
 "'$displaypath'"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:625
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Percorso del sottomodulo '$displaypath': eseguito merge in '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:630
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr ""
 "Esecuzione di '$command $sha1' non riuscita nel percorso del sottomodulo "
 "'$displaypath'"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:631
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Percorso del sottomodulo '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:662
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Ricorsione nel percorso del sottomodulo '$displaypath' non riuscita"
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr "L'opzione --cached non può essere usata con l'opzione --files"
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "modalità $mod_dst inattesa"
-
-#: git-submodule.sh:902
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr "  Attenzione: $display_name non contiene il commit $sha1_src"
-
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr "  Attenzione: $display_name non contiene il commit $sha1_dst"
-
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr ""
-"  Attenzione: $display_name non contiene i commit $sha1_src e $sha1_dst"
-
 #: git-parse-remote.sh:89
 #, sh-format
 msgid "See git-${cmd}(1) for details."
@@ -22831,12 +24808,22 @@ msgstr "Stash automatico applicato."
 msgid "Cannot store $stash_sha1"
 msgstr "Impossibile memorizzare $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'applicazione dello stash automatico ha generato conflitti.\n"
+"Le tue modifiche sono al sicuro nello stash.\n"
+"Puoi eseguire \"git stash pop\" o \"git stash drop\" in qualunque momento.\n"
+
 #: git-rebase--preserve-merges.sh:191
 #, sh-format
 msgid "Rebasing ($new_count/$total)"
 msgstr "Rebase in corso ($new_count/$total)"
 
-#: git-rebase--preserve-merges.sh:207
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -22878,7 +24865,7 @@ msgstr ""
 "Queste righe possono essere riordinate; saranno eseguite dalla prima "
 "all'ultima.\n"
 
-#: git-rebase--preserve-merges.sh:270
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -22897,85 +24884,85 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:295
+#: git-rebase--preserve-merges.sh:285
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: non è un commit che possa essere scelto"
 
-#: git-rebase--preserve-merges.sh:334
+#: git-rebase--preserve-merges.sh:324
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Nome commit non valido: $sha1"
 
-#: git-rebase--preserve-merges.sh:364
+#: git-rebase--preserve-merges.sh:354
 msgid "Cannot write current commit's replacement sha1"
 msgstr ""
 "Impossibile scrivere lo SHA1 del commit che dovrebbe sostituire quello "
 "corrente"
 
-#: git-rebase--preserve-merges.sh:415
+#: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Fast forward a $sha1"
 
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:407
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "Impossibile eseguire il fast forward a $sha1"
 
-#: git-rebase--preserve-merges.sh:426
+#: git-rebase--preserve-merges.sh:416
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "Impossibile spostare l'HEAD a $first_parent"
 
-#: git-rebase--preserve-merges.sh:431
+#: git-rebase--preserve-merges.sh:421
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Mi rifiuto di eseguire lo squash di un merge: $sha1"
 
-#: git-rebase--preserve-merges.sh:449
+#: git-rebase--preserve-merges.sh:439
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Errore durante la riesecuzione del merge di $sha1"
 
-#: git-rebase--preserve-merges.sh:458
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Impossibile scegliere $sha1"
 
-#: git-rebase--preserve-merges.sh:467
+#: git-rebase--preserve-merges.sh:457
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Questo è il messaggio di commit numero ${n}:"
 
-#: git-rebase--preserve-merges.sh:472
+#: git-rebase--preserve-merges.sh:462
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Il messaggio di commit numero ${n} sarà saltato:"
 
-#: git-rebase--preserve-merges.sh:483
+#: 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] "Questa è una combinazione di $count commit."
 msgstr[1] "Questa è una combinazione di $count commit."
 
-#: git-rebase--preserve-merges.sh:492
+#: git-rebase--preserve-merges.sh:482
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Impossibile scrivere $fixup_msg"
 
-#: git-rebase--preserve-merges.sh:495
+#: git-rebase--preserve-merges.sh:485
 msgid "This is a combination of 2 commits."
 msgstr "Questa è una combinazione di 2 commit."
 
-#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
-#: git-rebase--preserve-merges.sh:582
+#: 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 "Impossibile applicare $sha1... $rest"
 
-#: git-rebase--preserve-merges.sh:611
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -22990,31 +24977,31 @@ msgstr ""
 "potrebbe essere necessario risolvere il problema evidenziato per essere in\n"
 "grado di modificare il messaggio di commit."
 
-#: git-rebase--preserve-merges.sh:626
+#: git-rebase--preserve-merges.sh:616
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Fermato a $sha1_abbrev... $rest"
 
-#: git-rebase--preserve-merges.sh:641
+#: git-rebase--preserve-merges.sh:631
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "Impossibile eseguire '$squash_style' senza un commit precedente"
 
-#: git-rebase--preserve-merges.sh:683
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Eseguo $rest"
 
-#: git-rebase--preserve-merges.sh:691
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Esecuzione non riuscita: $rest"
 
-#: git-rebase--preserve-merges.sh:693
+#: git-rebase--preserve-merges.sh:683
 msgid "and made changes to the index and/or the working tree"
 msgstr "e sono state apportate modifiche all'indice e/o all'albero di lavoro"
 
-#: git-rebase--preserve-merges.sh:695
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -23025,7 +25012,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:708
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -23040,25 +25027,25 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:719
+#: git-rebase--preserve-merges.sh:709
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Comando sconosciuto: $command $sha1 $rest"
 
-#: git-rebase--preserve-merges.sh:720
+#: git-rebase--preserve-merges.sh:710
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Correggi la situazione usando 'git rebase --edit-todo'."
 
-#: git-rebase--preserve-merges.sh:755
+#: git-rebase--preserve-merges.sh:745
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "Rebase e aggiornamento di $head_name eseguiti con successo."
 
-#: git-rebase--preserve-merges.sh:812
+#: git-rebase--preserve-merges.sh:802
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "impossibile rimuovere CHERRY_PICK_HEAD"
 
-#: git-rebase--preserve-merges.sh:817
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -23089,13 +25076,13 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--preserve-merges.sh:834
+#: git-rebase--preserve-merges.sh:824
 msgid "Error trying to find the author identity to amend commit"
 msgstr ""
 "Errore durante la ricerca dell'identità dell'autore per la modifica del "
 "commit"
 
-#: git-rebase--preserve-merges.sh:839
+#: 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."
@@ -23104,40 +25091,44 @@ msgstr ""
 "di lavoro. Eseguine prima il commit e quindi esegui nuovamente 'git rebase\n"
 "--continue'."
 
-#: git-rebase--preserve-merges.sh:844 git-rebase--preserve-merges.sh:848
+#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
 msgid "Could not commit staged changes."
 msgstr "Impossibile eseguire il commit delle modifiche in staging."
 
-#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
+#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
 msgid "Could not execute editor"
 msgstr "Impossibile eseguire l'editor"
 
-#: git-rebase--preserve-merges.sh:900
+#: git-rebase--preserve-merges.sh:890
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "Impossibile eseguire il checkout di $switch_to"
 
-#: git-rebase--preserve-merges.sh:907
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr "Nessun'HEAD?"
 
-#: git-rebase--preserve-merges.sh:908
+#: git-rebase--preserve-merges.sh:898
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "Impossibile creare la directory temporanea $state_dir"
 
-#: git-rebase--preserve-merges.sh:911
+#: git-rebase--preserve-merges.sh:901
 msgid "Could not mark as interactive"
 msgstr "Impossibile contrassegnare come interattivo"
 
-#: git-rebase--preserve-merges.sh:943
+#: 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 di $shortrevisions su $shortonto ($todocount comando)"
 msgstr[1] "Rebase di $shortrevisions su $shortonto ($todocount comandi)"
 
-#: git-rebase--preserve-merges.sh:997 git-rebase--preserve-merges.sh:1002
+#: git-rebase--preserve-merges.sh:945
+msgid "Note that empty commits are commented out"
+msgstr "Nota che i commit vuoti sono commentati"
+
+#: git-rebase--preserve-merges.sh:987 git-rebase--preserve-merges.sh:992
 msgid "Could not init rewritten commits"
 msgstr "Impossibile inizializzare i commit riscritti"
 
@@ -23213,81 +25204,19 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Impossibile determinare il percorso assoluto della directory Git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%20s %32s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "nell'area di staging"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "rimosso dall'area di staging"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "binario"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "non fare nulla"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "non modificato"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "aggiunto %d percorso\n"
-msgstr[1] "aggiunti %d percorsi\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "aggiornato %d percorso\n"
-msgstr[1] "aggiornati %d percorsi\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "ripristinato %d percorso\n"
-msgstr[1] "ripristinati %d percorsi\n"
-
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "eseguito touch su %d percorso\n"
 msgstr[1] "eseguito touch su %d percorsi\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Aggiorna"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Esegui il revert"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "nota: %s ora non è tracciato.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Aggiungi file non tracciati"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Nessun file non tracciato.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1058
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -23295,7 +25224,7 @@ msgstr ""
 "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
 "contrassegnato immediatamente per l'aggiunta all'area di staging."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1061
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -23303,7 +25232,7 @@ msgstr ""
 "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
 "contrassegnato immediatamente per lo stash."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1064
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -23311,8 +25240,8 @@ msgstr ""
 "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
 "contrassegnato immediatamente per la rimozione dall'area di staging."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1067 git-add--interactive.perl:1076
+#: git-add--interactive.perl:1082
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
@@ -23320,8 +25249,8 @@ msgstr ""
 "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
 "contrassegnato immediatamente per l'applicazione."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1070 git-add--interactive.perl:1073
+#: git-add--interactive.perl:1079
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
@@ -23329,18 +25258,12 @@ msgstr ""
 "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
 "contrassegnato immediatamente per la rimozione."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1116
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "apertura del file di modifica hunk in scrittura non riuscita: %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr ""
-"Modalità manuale modifica hunt - vedi la fine del file per una guida "
-"veloce.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1123
 #, perl-format
 msgid ""
 "---\n"
@@ -23353,36 +25276,12 @@ msgstr ""
 "Per rimuovere '%s' righe, eliminale.\n"
 "Le righe che iniziano con %s saranno rimosse.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-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 ""
-"Se non può essere applicata senza problemi, ti sarà data la possibilità\n"
-"di modificarla di nuovo. Se tutte le righe dell'hunk saranno state\n"
-"rimosse, la modifica sarà interrotta e l'hunk non sarà modificato.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1145
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "apertura del file di modifica hunk in lettura non riuscita: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"L'hunk modificato non può essere applicato senza problemi. Modificarlo di "
-"nuovo (se rispondi \"no\", sarà eliminato!) [y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1253
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -23399,7 +25298,7 @@ msgstr ""
 "d - non aggiungere né quest'hunk né quelli successivi nel file all'area di "
 "staging"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1259
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -23413,7 +25312,7 @@ msgstr ""
 "a - esegui lo stash di quest'hunk e di tutti quelli successivi nel file\n"
 "d - non eseguire lo stash né di quest'hunk né di quelli successivi nel file"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1265
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -23430,7 +25329,7 @@ msgstr ""
 "d - non rimuovere né quest'hunk né quelli successivi nel file dall'area di "
 "staging"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1271
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23444,7 +25343,7 @@ msgstr ""
 "a - applica quest'hunk e tutti quelli successivi nel file\n"
 "d - non applicare né quest'hunk né quelli successivi nel file"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: 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"
@@ -23458,7 +25357,7 @@ msgstr ""
 "a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
 "d - non rimuovere né quest'hunk né quelli successivi nel file"
 
-#: git-add--interactive.perl:1276
+#: 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"
@@ -23472,7 +25371,7 @@ msgstr ""
 "a - rimuovi quest'hunk e tutti quelli successivi nel file\n"
 "d - non rimuovere né quest'hunk né quelli successivi nel file"
 
-#: git-add--interactive.perl:1282
+#: 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"
@@ -23486,7 +25385,7 @@ msgstr ""
 "a - applica quest'hunk e tutti quelli successivi nel file\n"
 "d - non applicare né quest'hunk né quelli successivi nel file"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1301
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23500,7 +25399,7 @@ msgstr ""
 "a - applica quest'hunk e tutti quelli successivi nel file\n"
 "d - non applicare né quest'hunk né quelli successivi nel file"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1316
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23524,234 +25423,90 @@ msgstr ""
 "e - modifica manualmente l'hunk corrente\n"
 "? - stampa una guida\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1347
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Gli hunk selezionati non si applicano senza problemi all'indice!\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Vuoi comunque applicarli all'albero di lavoro? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "Non è stato applicato nulla.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1362
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignoro ciò che non è stato sottoposto a merge: %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Sono stati modificati solo file binari.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Nessuna modifica.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Aggiornamento patch"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Modifica modo stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Eliminazione stage [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Eseguire lo stage di quest'hunk [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Modifica modo stash [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Eliminazione stash [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Eseguire lo stash di quest'hunk [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Rimozione modifica modo dall'area di staging [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Rimozione eliminazione dall'area di staging [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Rimuovere quest'hunk dall'area di staging [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "Applicare la modifica modo all'indice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Applicare l'eliminazione all'indice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Applicare quest'hunk all'indice [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Scartare le modifiche modo dall'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Scartare l'eliminazione dall'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Scartare quest'hunk dall'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Scartare la modifica modo dall'indice e dall'albero di lavoro [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Scartare l'eliminazione dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Scartare quest'hunk dall'indice e dall'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Applicare la modifica modo all'indice e all'albero di lavoro [y,n,q,a,d"
-"%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Applicare l'eliminazione all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr ""
-"Applicare quest'hunk all'indice e all'albero di lavoro [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1481
 #, perl-format
 msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicare la modifica modo all'albero di lavoro [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1467
+#: git-add--interactive.perl:1482
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicare l'eliminazione all'albero di lavoro [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1483
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "Applicare l'aggiunta all'albero di lavoro [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1484
 #, perl-format
 msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
 msgstr "Applicare quest'hunk all'albero di lavoro [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1601
 msgid "No other hunks to goto\n"
 msgstr "Nessun altro hunk a cui andare\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "a quale hunk desideri andare (premi <Invio> per vederne altri)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "a quale hunk desideri andare? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1619
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Numero non valido: '%s'\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1624
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "Mi dispiace, è disponibile solo %d hunk.\n"
 msgstr[1] "Mi dispiace, sono disponibili solo %d hunk.\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1659
 msgid "No other hunks to search\n"
 msgstr "Nessun altro hunk in cui ricercare\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "cercare un'espressione regolare? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1676
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Espressione regolare di ricerca %s malformata: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1686
 msgid "No hunk matches the given pattern\n"
 msgstr "Nessun hunk corrisponde al pattern fornito\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1698 git-add--interactive.perl:1720
 msgid "No previous hunk\n"
 msgstr "Nessun hunk precedente\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1707 git-add--interactive.perl:1726
 msgid "No next hunk\n"
 msgstr "Nessun hunk successivo\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1732
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Mi dispiace, non posso suddividere quest'hunk\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1738
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "Suddiviso in %d hunk.\n"
 msgstr[1] "Suddiviso in %d hunk.\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1748
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Mi dispiace, non posso modificare quest'hunk\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Rivedi diff"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1813
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23771,19 +25526,19 @@ msgstr ""
 "add untracked - aggiunge i contenuti dei file non tracciati all'insieme di\n"
 "                modifiche nell'area di staging\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1830 git-add--interactive.perl:1835
+#: git-add--interactive.perl:1838 git-add--interactive.perl:1845
+#: git-add--interactive.perl:1848 git-add--interactive.perl:1855
+#: git-add--interactive.perl:1859 git-add--interactive.perl:1865
 msgid "missing --"
 msgstr "-- mancante"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1861
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "modalità --patch sconosciuta: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1867 git-add--interactive.perl:1873
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argomento %s non valido, atteso --"
@@ -23802,27 +25557,38 @@ msgstr "l'offset del fuso orario locale è maggiore o uguale a 24 ore\n"
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "l'editor non è terminato regolarmente, interrompo tutte le operazioni"
 
-#: git-send-email.perl:310
+#: git-send-email.perl:312
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr ""
 "'%s' contiene una versione intermedia dell'e-mail che stavi componendo.\n"
 
-#: git-send-email.perl:315
+#: git-send-email.perl:317
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' contiene l'e-mail composta.\n"
 
-#: git-send-email.perl:408
+#: git-send-email.perl:410
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases non è compatibile con altre opzioni\n"
 
-#: git-send-email.perl:481 git-send-email.perl:683
+#: git-send-email.perl:484
+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 ""
+"errore fatale: sono state trovate opzioni di configurazione per 'sendmail'\n"
+"git-send-email è configurato con le opzioni sendemail.* - nota la 'e'.\n"
+"Imposta sendemail.forbidSendmailVariables a false per disabilitare questo "
+"controllo.\n"
+
+#: git-send-email.perl:489 git-send-email.perl:691
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "Impossibile eseguire git format-patch al di fuori di un repository\n"
 
-#: git-send-email.perl:484
+#: git-send-email.perl:492
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -23830,37 +25596,37 @@ msgstr ""
 "`batch-size` e `relogin` devono essere specificati insieme (sulla riga di "
 "comando o tramite un'opzione di configurazione)\n"
 
-#: git-send-email.perl:497
+#: git-send-email.perl:505
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Campo --suppress-cc sconosciuto: '%s'\n"
 
-#: git-send-email.perl:528
+#: git-send-email.perl:536
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Impostazione --confirm sconosciuta: '%s'\n"
 
-#: git-send-email.perl:556
+#: git-send-email.perl:564
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "attenzione: non sono supportati alias sendmail con virgolette: %s\n"
 
-#: git-send-email.perl:558
+#: git-send-email.perl:566
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "attenzione: `:include:` non supportato: %s\n"
 
-#: git-send-email.perl:560
+#: git-send-email.perl:568
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "attenzione: redirezioni `/file` o `|pipe` non supportate: %s\n"
 
-#: git-send-email.perl:565
+#: git-send-email.perl:573
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "attenzione: riga sendmail non riconosciuta: %s\n"
 
-#: git-send-email.perl:649
+#: git-send-email.perl:657
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -23877,12 +25643,12 @@ msgstr ""
 "    * ...fornendo l'opzione --format-patch se ti riferisci\n"
 "      a un intervallo.\n"
 
-#: git-send-email.perl:670
+#: git-send-email.perl:678
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "opendir di %s non riuscita: %s"
 
-#: git-send-email.perl:694
+#: git-send-email.perl:702
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
@@ -23891,7 +25657,7 @@ msgstr ""
 "errore fatale: %s: %s\n"
 "attenzione: non è stata inviata alcuna patch\n"
 
-#: git-send-email.perl:705
+#: git-send-email.perl:713
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -23901,17 +25667,17 @@ msgstr ""
 "Nessun file patch specificato!\n"
 "\n"
 
-#: git-send-email.perl:718
+#: git-send-email.perl:726
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Riga oggetto assente in %s?"
 
-#: git-send-email.perl:728
+#: git-send-email.perl:736
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Apertura di %s in scrittura non riuscita: %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:747
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -23925,27 +25691,27 @@ msgstr ""
 "\n"
 "Rimuovi il corpo se non vuoi inviare un sommario.\n"
 
-#: git-send-email.perl:763
+#: git-send-email.perl:771
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Apertura di %s non riuscita: %s"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:788
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Apertura di %s.final non riuscita: %s"
 
-#: git-send-email.perl:823
+#: git-send-email.perl:831
 msgid "Summary email is empty, skipping it\n"
 msgstr "E-mail riassuntiva vuota, la ometto\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:858
+#: git-send-email.perl:866
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Usare <%s> [y/N]? "
 
-#: git-send-email.perl:913
+#: git-send-email.perl:921
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -23953,11 +25719,11 @@ msgstr ""
 "I seguenti file sono codificati a 8 bit ma non dichiarano un Content-"
 "Transfer-Encoding.\n"
 
-#: git-send-email.perl:918
+#: git-send-email.perl:926
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Che codifica a 8 bit devo dichiarare [UTF-8]? "
 
-#: git-send-email.perl:926
+#: git-send-email.perl:934
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -23970,24 +25736,24 @@ msgstr ""
 "ha come oggetto nel modello '*** SUBJECT HERE ***'. Fornisci l'opzione --"
 "force se vuoi veramente procedere con l'invio.\n"
 
-#: git-send-email.perl:945
+#: git-send-email.perl:953
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr ""
 "A chi dovranno essere inviate le e-mail (se devono essere inviate a "
 "qualcuno)?"
 
-#: git-send-email.perl:963
+#: git-send-email.perl:971
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "errore fatale: l'alias '%s' si espande in se stesso\n"
 
-#: git-send-email.perl:975
+#: git-send-email.perl:983
 msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
 msgstr ""
 "Message-ID da usare nell'intestazione In-Reply-To per la prima e-mail (se "
 "dev'essere usato)? "
 
-#: git-send-email.perl:1033 git-send-email.perl:1041
+#: git-send-email.perl:1041 git-send-email.perl:1049
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "errore: impossibile estrarre un indirizzo valido da %s\n"
@@ -23995,17 +25761,17 @@ msgstr "errore: impossibile estrarre un indirizzo valido da %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:1045
+#: git-send-email.perl:1053
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr ""
 "Cosa devo fare con quest'indirizzo? (Esci [q]|scarta [d]|modifica [e]): "
 
-#: git-send-email.perl:1362
+#: git-send-email.perl:1370
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "Il percorso CA \"%s\" non esiste"
 
-#: git-send-email.perl:1445
+#: git-send-email.perl:1453
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -24034,135 +25800,502 @@ 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:1460
+#: git-send-email.perl:1468
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr ""
 "Inviare quest'e-mail? (Sì [y]|[n]o|modifica [e]|esci [q]|invia tutte [a]): "
 
-#: git-send-email.perl:1463
+#: git-send-email.perl:1471
 msgid "Send this email reply required"
 msgstr "È richiesta una risposta alla richiesta di invio e-mail"
 
-#: git-send-email.perl:1491
+#: git-send-email.perl:1499
 msgid "The required SMTP server is not properly defined."
 msgstr "Il server SMTP richiesto non è definito in modo adeguato."
 
-#: git-send-email.perl:1538
+#: git-send-email.perl:1546
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Il server non supporta STARTTLS! %s"
 
-#: git-send-email.perl:1543 git-send-email.perl:1547
+#: git-send-email.perl:1551 git-send-email.perl:1555
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS non riuscito! %s"
 
-#: git-send-email.perl:1556
+#: git-send-email.perl:1564
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
 "Impossibile inizializzare SMTP in modo adeguato. Controlla la configurazione "
 "e usa --smtp-debug."
 
-#: git-send-email.perl:1574
+#: git-send-email.perl:1582
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Invio di %s non riuscito\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1585
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Test invio %s riuscito\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1585
 #, perl-format
 msgid "Sent %s\n"
 msgstr "%s inviato\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1587
 msgid "Dry-OK. Log says:\n"
 msgstr "Esecuzione di prova riuscita. Il registro è il seguente:\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1587
 msgid "OK. Log says:\n"
 msgstr "Operazione riuscita. Il registro è il seguente:\n"
 
-#: git-send-email.perl:1591
+#: git-send-email.perl:1599
 msgid "Result: "
 msgstr "Risultato: "
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1602
 msgid "Result: OK\n"
 msgstr "Risultato: OK\n"
 
-#: git-send-email.perl:1612
+#: git-send-email.perl:1620
 #, perl-format
 msgid "can't open file %s"
 msgstr "impossibile aprire il file %s"
 
-#: git-send-email.perl:1659 git-send-email.perl:1679
+#: git-send-email.perl:1667 git-send-email.perl:1687
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Aggiungo cc: %s dalla riga '%s'\n"
 
-#: git-send-email.perl:1665
+#: git-send-email.perl:1673
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Aggiungo to: %s dalla riga '%s'\n"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1730
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non mbox) Aggiungo cc: %s dalla riga '%s'\n"
 
-#: git-send-email.perl:1753
+#: git-send-email.perl:1765
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(corpo) Aggiungo cc: %s dalla riga '%s'\n"
 
-#: git-send-email.perl:1864
+#: git-send-email.perl:1876
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Impossibile eseguire '%s'"
 
-#: git-send-email.perl:1871
+#: git-send-email.perl:1883
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Aggiungo %s: %s da: '%s'\n"
 
-#: git-send-email.perl:1875
+#: git-send-email.perl:1887
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) chiusura della pipe a '%s' non riuscita"
 
-#: git-send-email.perl:1905
+#: git-send-email.perl:1917
 msgid "cannot send message as 7bit"
 msgstr "impossibile inviare il messaggio con codifica a 7 bit"
 
-#: git-send-email.perl:1913
+#: git-send-email.perl:1925
 msgid "invalid transfer encoding"
 msgstr "codifica di trasferimento non valida"
 
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "impossibile aprire %s: %s\n"
 
-#: git-send-email.perl:1957
+#: git-send-email.perl:1969
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: la patch contiene una riga più lunga di 998 caratteri"
 
-#: git-send-email.perl:1974
+#: git-send-email.perl:1986
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr "Salto %s con il suffisso di backup '%s'.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1978
+#: git-send-email.perl:1990
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Inviare %s? [y|N]: "
 
+#~ msgid "unknown hash algorithm length"
+#~ msgstr "lunghezza algoritmo hash sconosciuta"
+
+#~ msgid ""
+#~ "commit-graph chunk lookup table entry missing; file may be incomplete"
+#~ msgstr ""
+#~ "voce blocco grafo dei commit mancante nella tabella di ricerca; il file "
+#~ "potrebbe non essere completo"
+
+#~ msgid "Writing changed paths Bloom filters index"
+#~ msgstr ""
+#~ "Scrittura dell'indice dei filtri di Bloom per i percorsi modificati in "
+#~ "corso"
+
+#, c-format
+#~ msgid "hash version %u does not match"
+#~ msgstr "la versione dell'hash %u non corrisponde"
+
+#~ msgid "Remote with no URL"
+#~ msgstr "Remoto senza URL"
+
+#, c-format
+#~ msgid "%%(subject) does not take arguments"
+#~ msgstr "%%(subject) non accetta argomenti"
+
+#, c-format
+#~ msgid "positive value expected objectname:short=%s"
+#~ msgstr "atteso valore positivo in objectname:short=%s"
+
+#, c-format
+#~ msgid "unrecognized %%(objectname) argument: %s"
+#~ msgstr "argomento %%(objectname) non riconosciuto: %s"
+
+#, c-format
+#~ msgid "option `%s' is incompatible with --merged"
+#~ msgstr "l'opzione `%s' non è compatibile con --merged"
+
+#, c-format
+#~ msgid "option `%s' is incompatible with --no-merged"
+#~ msgstr "l'opzione `%s' non è compatibile con --no-merged"
+
+#, c-format
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "impossibile aprire '%s' in scrittura: %s"
+
+#, c-format
+#~ msgid "could not read ref '%s'"
+#~ msgstr "impossibile leggere il riferimento '%s'"
+
+#, c-format
+#~ msgid "ref '%s' already exists"
+#~ msgstr "il riferimento '%s' esiste già"
+
+#, c-format
+#~ msgid "unexpected object ID when writing '%s'"
+#~ msgstr "ID oggetto inatteso durante la scrittura di '%s'"
+
+#, c-format
+#~ msgid "unexpected object ID when deleting '%s'"
+#~ msgstr "ID oggetto inatteso durante l'eliminazione di '%s'"
+
+#, c-format
+#~ msgid "The hash algorithm %s is not supported in this build."
+#~ msgstr "L'algoritmo hash %s non è supportato in questa compilazione."
+
+#~ msgid "could not open the file BISECT_TERMS"
+#~ msgstr "impossibile aprire il file BISECT_TERMS"
+
+#~ msgid "update BISECT_HEAD instead of checking out the current commit"
+#~ msgstr ""
+#~ "aggiorna BISECT_HEAD anziché eseguire il checkout del commit corrente"
+
+#~ msgid "print only names (no SHA-1)"
+#~ msgstr "stampa solo i nomi (non lo SHA-1)"
+
+#~ msgid "passed to 'git am'"
+#~ msgstr "passato a 'git am'"
+
+#~ msgid "The --cached option cannot be used with the --files option"
+#~ msgstr "L'opzione --cached non può essere usata con l'opzione --files"
+
+#, sh-format
+#~ msgid "  Warn: $display_name doesn't contain commit $sha1_src"
+#~ msgstr "  Attenzione: $display_name non contiene il commit $sha1_src"
+
+#, sh-format
+#~ msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
+#~ msgstr "  Attenzione: $display_name non contiene il commit $sha1_dst"
+
+#, sh-format
+#~ msgid ""
+#~ "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+#~ msgstr ""
+#~ "  Attenzione: $display_name non contiene i commit $sha1_src e $sha1_dst"
+
+#, c-format
+#~ msgid "Finding commits for commit graph from %d ref"
+#~ msgid_plural "Finding commits for commit graph from %d refs"
+#~ msgstr[0] ""
+#~ "Ricerca dei commit per il grafo dei commit da %d riferimento in corso"
+#~ msgstr[1] ""
+#~ "Ricerca dei commit per il grafo dei commit da %d riferimenti in corso"
+
+#, c-format
+#~ msgid "invalid commit object id: %s"
+#~ msgstr "ID oggetto commit non valido: %s"
+
+#, c-format
+#~ msgid "Removing worktrees/%s: not a valid directory"
+#~ msgstr "Rimuovo worktrees/%s: non è una directory valida"
+
+#, c-format
+#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#~ msgstr "Rimuovo worktrees/%s: impossibile leggere il file gitdir (%s)"
+
+#, c-format
+#~ msgid "Removing worktrees/%s: invalid gitdir file"
+#~ msgstr "Rimuovo worktrees/%s: file gitdir non valido"
+
+#, c-format
+#~ msgid "unable to re-add worktree '%s'"
+#~ msgstr "impossibile aggiungere nuovamente l'albero di lavoro '%s'"
+
+#, c-format
+#~ msgid "target '%s' already exists"
+#~ msgstr "la destinazione '%s' esiste già"
+
+#, c-format
+#~ msgid ""
+#~ "Cannot update sparse checkout: the following entries are not up to date:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Impossibile aggiornare il checkout sparse: le seguenti voci non sono "
+#~ "aggiornate:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid ""
+#~ "The following working tree files would be overwritten by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "I seguenti file dell'albero di lavoro sarebbero sovrascritti con "
+#~ "l'aggiornamento del checkout sparse:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid ""
+#~ "The following working tree files would be removed by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "I seguenti file dell'albero di lavoro sarebbero eliminati con "
+#~ "l'aggiornamento del checkout sparse:\n"
+#~ "%s"
+
+#, c-format
+#~ msgid "annotated tag %s has no embedded name"
+#~ msgstr "il tag annotato %s non ha un nome incorporato"
+
+#~ msgid "automatically stash/stash pop before and after rebase"
+#~ msgstr "esegui stash/stash pop automaticamente prima e dopo il rebase"
+
+#~ msgid "--[no-]autostash option is only valid with --rebase."
+#~ msgstr "l'opzione --[no-]autostash option è valida solo con --rebase."
+
+#~ msgid "(DEPRECATED) keep empty commits"
+#~ msgstr "(DEPRECATO) mantieni i commit vuoti"
+
+#, c-format
+#~ msgid "Could not read '%s'"
+#~ msgstr "Impossibile leggere '%s'"
+
+#, c-format
+#~ msgid "Cannot store %s"
+#~ msgstr "Impossibile memorizzare %s"
+
+#~ msgid "initialize sparse-checkout"
+#~ msgstr "inizializza sparse-checkout"
+
+#~ msgid "set sparse-checkout patterns"
+#~ msgstr "imposta i pattern sparse-checkout"
+
+#~ msgid "disable sparse-checkout"
+#~ msgstr "disabilita sparse-checkout"
+
+#, c-format
+#~ msgid "could not exec %s"
+#~ msgstr "impossibile eseguire %s"
+
+#~ msgid "Cannot remove temporary index (can't happen)"
+#~ msgstr "Impossibile rimuovere l'indice temporaneo (non può succedere)"
+
+#, sh-format
+#~ msgid "Cannot update $ref_stash with $w_commit"
+#~ msgstr "Impossibile aggiornare $ref_stash con $w_commit"
+
+#, sh-format
+#~ msgid "error: unknown option for 'stash push': $option"
+#~ msgstr "errore: opzione sconosciuta per 'stash push': $option"
+
+#, sh-format
+#~ msgid "Saved working directory and index state $stash_msg"
+#~ msgstr "Directory di lavoro e stato indice salvati: $stash_msg"
+
+#, sh-format
+#~ msgid "unknown option: $opt"
+#~ msgstr "opzione sconosciuta: $opt"
+
+#, sh-format
+#~ msgid "Too many revisions specified: $REV"
+#~ msgstr "Troppe revisioni specificate: $REV"
+
+#, sh-format
+#~ msgid "$reference is not a valid reference"
+#~ msgstr "$reference non è un riferimento valido"
+
+#, sh-format
+#~ msgid "'$args' is not a stash-like commit"
+#~ msgstr "'$args' non è un commit di tipo stash"
+
+#, sh-format
+#~ msgid "'$args' is not a stash reference"
+#~ msgstr "'$args' non è un riferimento a uno stash"
+
+#~ msgid "unable to refresh index"
+#~ msgstr "impossibile aggiornare l'indice"
+
+#~ msgid "Cannot apply a stash in the middle of a merge"
+#~ msgstr "Impossibile applicare uno stash nel mezzo di un merge"
+
+#~ msgid "Conflicts in index. Try without --index."
+#~ msgstr "Ci sono conflitti in index. Prova senza --index."
+
+#~ msgid "Could not save index tree"
+#~ msgstr "Non è stato possibile salvare l'albero indice"
+
+#~ msgid "Could not restore untracked files from stash entry"
+#~ msgstr ""
+#~ "Non è stato possibile ripristinare i file non tracciati dalla voce stash"
+
+#~ msgid "Cannot unstage modified files"
+#~ msgstr ""
+#~ "Non è stato possibile rimuovere i file modificati dall'area di staging"
+
+#, sh-format
+#~ msgid "Dropped ${REV} ($s)"
+#~ msgstr "${REV} eliminata ($s)"
+
+#, sh-format
+#~ msgid "${REV}: Could not drop stash entry"
+#~ msgstr "${REV}: non è stato possibile rimuovere la voce di stash"
+
+#~ msgid "(To restore them type \"git stash apply\")"
+#~ msgstr "(Per ripristinarli digita \"git stash apply\")"
+
+#~ msgid "{drop,keep,ask}"
+#~ msgstr "{drop,keep,ask}"
+
+#, c-format
+#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
+#~ msgstr "Modifica modo stage [y,n,a,q,d%s,?]? "
+
+#, c-format
+#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
+#~ msgstr "Eliminazione stage [y,n,a,q,d%s,?]? "
+
+#, c-format
+#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
+#~ msgstr "Eseguire lo stage di quest'hunk [y,n,a,q,d%s,?]? "
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for staging.\n"
+#~ msgstr ""
+#~ "Se la patch viene applicata senza problemi, l'hunk modificato sarà\n"
+#~ "contrassegnato immediatamente per l'aggiunta all'area di staging.\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 - aggiungi quest'hunk all'area di staging\n"
+#~ "n - non aggiungere quest'hunk all'area di staging\n"
+#~ "q - esci; non aggiungere né quest'hunk né quelli rimanenti all'area di "
+#~ "staging\n"
+#~ "a - aggiungi quest'hunk e tutti quelli successivi nel file all'area di "
+#~ "staging\n"
+#~ "d - non aggiungere né quest'hunk né quelli successivi nel file all'area "
+#~ "di staging\n"
+
+#, c-format
+#~ msgid "could not copy '%s' to '%s'."
+#~ msgstr "impossibile copiare '%s' in '%s'."
+
+#~ msgid "malformed ident line"
+#~ msgstr "riga ident malformata"
+
+#, c-format
+#~ msgid "could not parse '%.*s'"
+#~ msgstr "impossibile analizzare '%.*s'"
+
+#, c-format
+#~ msgid "could not checkout %s"
+#~ msgstr "impossibile eseguire il checkout di %s"
+
+#, c-format
+#~ msgid "filename in tree entry contains backslash: '%s'"
+#~ msgstr "il nome file nella voce albero contiene una barra rovesciata: '%s'"
+
+#, c-format
+#~ msgid "Use -f if you really want to add them.\n"
+#~ msgstr "Usa -f se vuoi davvero aggiungerli.\n"
+
+#, c-format
+#~ msgid "Maybe you wanted to say 'git add .'?\n"
+#~ msgstr "Forse intendevi dire 'git add .'?\n"
+
+#, c-format
+#~ msgid "packfile is invalid: %s"
+#~ msgstr "packfile non valido: %s"
+
+#, c-format
+#~ msgid "unable to open packfile for reuse: %s"
+#~ msgstr "impossibile aprire il packfile per il suo riuso: %s"
+
+#~ msgid "unable to seek in reused packfile"
+#~ msgstr "impossibile eseguire seek nel packfile riusato"
+
+#~ msgid "unable to read from reused packfile"
+#~ msgstr "impossibile leggere dal packfile riusato"
+
+#~ msgid "no HEAD?"
+#~ msgstr "nessun'HEAD?"
+
+#~ msgid "preserve empty commits during rebase"
+#~ msgstr "mantieni i commit vuoti durante il rebase"
+
+#~ msgid "cannot combine --use-bitmap-index with object filtering"
+#~ msgstr "impossibile combinare --use-bitmap-index con il filtraggio oggetti"
+
+#, 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 ""
+#~ "Il seguente percorso è ignorato da uno dei tuoi file .gitignore:\n"
+#~ "$sm_path\n"
+#~ "Usa -f se vuoi davvero aggiungerlo."
+
+#, c-format
+#~ msgid "unable to get tree for %s"
+#~ msgstr "impossibile recuperare l'albero per %s"
+
+#~ msgid "Use an experimental heuristic to improve diffs"
+#~ msgstr "Usa un'euristica sperimentale per migliorare i diff"
+
+#~ msgid "git commit-graph [--object-dir <objdir>]"
+#~ msgstr "git commit-graph [--object-dir <directory oggetti>]"
+
+#~ msgid "git commit-graph read [--object-dir <objdir>]"
+#~ msgstr "git commit-graph read [--object-dir <directory oggetti>]"
+
 #, c-format
 #~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 #~ msgstr ""
@@ -24277,9 +26410,6 @@ msgstr "Inviare %s? [y|N]: "
 #~ "impossibile eseguire l'attività in modalità interattiva con lo standard "
 #~ "input non collegato a un terminale."
 
-#~ msgid "failed to open '%s'"
-#~ msgstr "apertura di '%s' non riuscita"
-
 #~ msgid "failed to stat %s\n"
 #~ msgstr "stat di %s non riuscito\n"
 
@@ -24301,9 +26431,6 @@ msgstr "Inviare %s? [y|N]: "
 #~ msgid "unrecognized verb: %s"
 #~ msgstr "verbo non riconosciuto: %s"
 
-#~ msgid "hash version %X does not match version %X"
-#~ msgstr "la versione dell'hash %X non corrisponde alla versione %X"
-
 #~ msgid "option '%s' requires a value"
 #~ msgstr "l'opzione '%s' richiede un valore"
 
@@ -24386,9 +26513,6 @@ msgstr "Inviare %s? [y|N]: "
 #~ msgid "Can't stat %s"
 #~ msgstr "impossibile eseguire lo stat di '%s'"
 
-#~ msgid "No such remote: %s"
-#~ msgstr "Remote non esistente: %s"
-
 #~ msgid " %d file changed"
 #~ msgid_plural " %d files changed"
 #~ msgstr[0] " %d file modificato"
diff --git a/po/ko.po b/po/ko.po
index dcfe21c223..766d4605b1 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
@@ -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"
@@ -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
diff --git a/po/pl.po b/po/pl.po
new file mode 100644
index 0000000000..6bb665e846
--- /dev/null
+++ b/po/pl.po
@@ -0,0 +1,26403 @@
+# Polish translations for Git.
+# Copyright (C) 2017 m4sk1n, m4sk1n@vivaldi.net
+# Copyright (C) 2020 Arusekk <arek_koz@o2.pl>
+# This file is distributed under the same license as the Git package.
+#
+# Stosowana jest następująca terminologia dla kluczowych terminów:
+#  commit         - zapis, złożyć - uzasadnienie niżej
+#  commit message - komunikat zapisu
+#  tag            - tag
+#  email          - e-mail
+#  merge          - scalenie, scalić
+#  push           - wypchnąć
+#  pull           - zaciągnąć
+#  checkout       - wybrać
+#  stash          - przenieść do schowka
+#  stashed        - ze schowka
+#  rebase         - przestawić
+#  stage, unstage - przygotować, wycofać
+#  branch         - gałąź
+#  patch          - Å‚atka
+#  hunk           - skrawek
+#  hook           - skrypt (skrypt repozytorium)
+#  property       - właściwość
+#  notes          - uwagi
+#  bare (repo)    - suche (repozytorium)
+#  hash algorithm - algorytm skrótu
+#
+# Terminologia inspirowana tłumaczeniem do subversion, którego kluczowe terminy
+# wybrał Marcin Kasperski <Marcin.Kasperski@acn.waw.pl>.
+#
+# Ponieważ commit nie ma naturalnie doskonałego tłumaczenia, przytoczę kilka
+# możliwych par rzeczownik-czasownik (w kolejności od najlepiej oddającego
+# znaczenie do najszkaradniejszych):
+# - zapis, zapisać (record, synonim)
+# - odprawa, odprawić (check in, synonim)
+# - skład/złożenie, złożyć (inter, submit, put together, synonimy)
+# - osadzenie, osadzić (bardziej embed, deposit, put)
+# - rewizja, zrewidować (bardziej revise, return, search)
+# - odnotowanie, odnotować (bardziej note, make note)
+# - umieszczenie, umieścić (bardziej emplace)
+# - zatwierdzenie, zatwierdzić (bardziej confirm) - użyte w subversion, ale tam znaczy to co innego
+# - oddanie, oddać (bardziej commitment, devotion)
+# - zapamiętanie, zapamiętać (bardziej remember, memorize)
+# - przeznaczenie, przeznaczyć (bardziej destine, intend, designate, allocate)
+# - zakomitować (nie jest słowem)
+# Zdecydowałem się na zapis, bo zdaje się najlepiej oddawać znaczenie,
+# ponadto brzmi dosyć zręcznie i nie ma utartego użycia.
+#
+# Myślę, że wybierając to słowo w języku angielskim (a nie było wcześniej aż tak
+# powszechne) twórcy kontroli wielu wersji mieć na myśli właśnie jakiś zapis,
+# który dokumentuje rozwój.
+# Powstawanie gita najlepiej widać w wątku "Kernel SCM saga.." w archiwach.
+# Nie podoba się?  Bardzo chętnie zobaczę lepsze tłumaczenie.
+#
+# m4sk1n, m4sk1n@vivaldi.net, 2017.
+# Arusekk <arek_koz@o2.pl>, 2020, 2021.
+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"
+"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"
+
+#: add-interactive.c:376
+#, 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
+msgid "could not read index"
+msgstr "nie można odczytać indeksu"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binarne"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "nic"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "brak zmian"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Aktualizacja"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, 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
+msgid "could not write index"
+msgstr "nie można zapisać indeksu"
+
+#: add-interactive.c:706 git-add--interactive.perl:626
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+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
+#, 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
+#, 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
+msgid "Revert"
+msgstr "Odwracanie"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "Nie można przetworzyć HEAD^{tree}"
+
+#: add-interactive.c:813 git-add--interactive.perl:629
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Brak nieśledzonych plików.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Dodaj nieśledzone"
+
+#: add-interactive.c:895 git-add--interactive.perl:623
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "pomijanie niescalonego: %s"
+
+#: add-interactive.c:937 add-patch.c:1751 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
+#, c-format
+msgid "No changes.\n"
+msgstr "Brak zmian.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Aktualizacja Å‚atki"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Przejrzyj zmiany"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "pokaż ścieżkę ze zmianami"
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr "dodaj stan drzewa roboczego do przygotowanego zestawu zmian"
+
+#: add-interactive.c:1014
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "przywróć przygotowany zestaw zmian do wersji HEAD"
+
+#: add-interactive.c:1016
+msgid "pick hunks and update selectively"
+msgstr "wybierz skrawki i zaktualizuj wybiórczo"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "wyświetl różnice między HEAD i indeksem"
+
+#: add-interactive.c:1020
+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
+msgid "Prompt help:"
+msgstr "Pomoc do zachęty:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "wybierz pojedynczy element"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "wybierz zakres elementów"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "wybierz wiele zakresów"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "wybierz element na podstawie jednoznacznego poczÄ…tku"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "odznacz podane elementy"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "wybierz wszystkie elementy"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(puste) zakończ zaznaczanie"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "wybierz kolejny element"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(puste) nic nie wybieraj"
+
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Polecenia ***"
+
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Co teraz"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "przygotowane"
+
+#: add-interactive.c:1144 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
+#: git-add--interactive.perl:213
+msgid "path"
+msgstr "ścieżka"
+
+#: add-interactive.c:1151
+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
+#, c-format
+msgid "Bye.\n"
+msgstr "Do zobaczenia.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, c-format, perl-format
+msgid "Stage mode change [y,n,q,a,d%s,?]? "
+msgstr "Przygotować zmianę trybu [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:35 git-add--interactive.perl:1432
+#, c-format, perl-format
+msgid "Stage deletion [y,n,q,a,d%s,?]? "
+msgstr "Przygotować usunięcie [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:36 git-add--interactive.perl:1433
+#, c-format, perl-format
+msgid "Stage addition [y,n,q,a,d%s,?]? "
+msgstr "Przygotować dodanie [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 "Przygotować ten skrawek [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 ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast "
+"oznaczony do przygotowania."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - przygotuj ten skrawek\n"
+"n - nie przygotowuj tego skrawka\n"
+"q - wyjdź; nie przygotowuj tego skrawka, ani żadnych kolejnych\n"
+"a - przygotuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie przygotowuj tego skrawka ani żadnych kolejnych w tym pliku\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 "Dodać zmianę trybu do schowka [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 "Dodać usunięcie do schowka [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, c-format, perl-format
+msgid "Stash addition [y,n,q,a,d%s,?]? "
+msgstr "Dodać dodanie do schowka [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 "Dodać ten skrawek do schowka [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 ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast "
+"oznaczony do dodania do schowka."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - dodaj ten skrawek do schowka\n"
+"n - nie dodawaj tego skrawka do schowka\n"
+"q - wyjdź; nie dodawaj tego skrawka, ani żadnych kolejnych\n"
+"a - dodaj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie dodawaj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:80 git-add--interactive.perl:1443
+#, c-format, perl-format
+msgid "Unstage mode change [y,n,q,a,d%s,?]? "
+msgstr "Wycofać zmianę trybu [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:81 git-add--interactive.perl:1444
+#, c-format, perl-format
+msgid "Unstage deletion [y,n,q,a,d%s,?]? "
+msgstr "Wycofać usunięcie [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:82 git-add--interactive.perl:1445
+#, c-format, perl-format
+msgid "Unstage addition [y,n,q,a,d%s,?]? "
+msgstr "Wycofać dodanie [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 "Wycofać ten skrawek [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 ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast "
+"oznaczony do wycofania."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - wycofaj ten skrawek\n"
+"n - nie wycofuj tego skrawka\n"
+"q - wyjdź; nie wycofuj tego skrawka, ani żadnych kolejnych\n"
+"a - wycofaj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie wycofuj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, c-format, perl-format
+msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
+msgstr "Zastosować zmianę trybu do indeksu [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:104 git-add--interactive.perl:1450
+#, c-format, perl-format
+msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
+msgstr "Zastosować usunięcie do indeksu [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:105 git-add--interactive.perl:1451
+#, c-format, perl-format
+msgid "Apply addition to index [y,n,q,a,d%s,?]? "
+msgstr "Zastosować dodanie do indeksu [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 "Zastosować ten skrawek do indeksu [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 ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast "
+"oznaczony do zastosowania."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - zastosuj ten skrawek do indeksu\n"
+"n - nie stosuj tego skrawka do indeksu\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"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:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, c-format, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić zmianę trybu z drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:127 git-add--interactive.perl:1456
+#: git-add--interactive.perl:1474
+#, c-format, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić usunięcie z drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:128 git-add--interactive.perl:1457
+#: git-add--interactive.perl:1475
+#, c-format, perl-format
+msgid "Discard addition from worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić dodanie z drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:129 git-add--interactive.perl:1458
+#: git-add--interactive.perl:1476
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić ten skrawek z drzewa roboczego [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 ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast "
+"oznaczony do odrzucenia."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - odrzuć ten skrawek z drzewa roboczego\n"
+"n - nie odrzucaj tego skrawka z drzewa roboczego\n"
+"q - wyjdź; nie odrzucaj tego skrawka, ani żadnych pozostałych\n"
+"a - odrzuć ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie odrzucaj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#, c-format, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić zmianę trybu z indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:150 add-patch.c:195 git-add--interactive.perl:1462
+#, c-format, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić usunięcie z indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:151 add-patch.c:196 git-add--interactive.perl:1463
+#, c-format, perl-format
+msgid "Discard addition from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić dodanie z indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:152 add-patch.c:197 git-add--interactive.perl:1464
+#, c-format, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Odrzucić ten skrawek z indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - odrzuć ten skrawek z indeksu i drzewa roboczego\n"
+"n - nie odrzucaj tego skrawka z indeksu i drzewa roboczego\n"
+"q - wyjdź; nie odrzucaj tego skrawka, ani żadnych pozostałych\n"
+"a - odrzuć ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie odrzucaj tego skrawka ani żadnych kolejnych w tym pliku\n"
+
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#, c-format, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Zastosować zmianę trybu do indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:172 add-patch.c:217 git-add--interactive.perl:1468
+#, c-format, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować usunięcie do indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:173 add-patch.c:218 git-add--interactive.perl:1469
+#, c-format, perl-format
+msgid "Apply addition to index and worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować dodanie do indeksu i drzewa roboczego [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 "Zastosować ten skrawek do indeksu i drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - zastosuj ten skrawek do indeksu i drzewa roboczego\n"
+"n - nie stosuj tego skrawka do indeksu i drzewa roboczego\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"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:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - zastosuj ten skrawek do drzewa roboczego\n"
+"n - nie stosuj tego skrawka do drzewa roboczego\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"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
+#, 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
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "nie można przetworzyć nagłówka kolorowego skrawka „%.*s�"
+
+#: add-patch.c:419
+msgid "could not parse diff"
+msgstr "nie można przetworzyć różnic"
+
+#: add-patch.c:438
+msgid "could not parse colored diff"
+msgstr "nie można przetworzyć kolorowych różnic"
+
+#: add-patch.c:452
+#, c-format
+msgid "failed to run '%s'"
+msgstr "nie można wykonać „%s�"
+
+#: add-patch.c:611
+msgid "mismatched output from interactive.diffFilter"
+msgstr "błędne wyjście z interactive.diffFilter"
+
+#: add-patch.c:612
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Twój filtr musi zachować odpowiedniość jeden do jednego\n"
+"między wierszami z wejścia i wyjścia."
+
+#: add-patch.c:790
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"oczekiwano wiersza kontekstu nr %d w\n"
+"%.*s"
+
+#: add-patch.c:805
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"skrawki siÄ™ nie nachodzÄ…:\n"
+"%.*s\n"
+"\tnie kończy się na:\n"
+"%.*s"
+
+#: add-patch.c:1081 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
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Aby usunąć wiersze „%c�, zmień je w wiersze „ � (kontekstu).\n"
+"Aby usunąć wiersze „%c�, usuń je.\n"
+"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
+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 ""
+"Jeśli nie stosuje się gładko, nadarzy się jeszcze szansa, żeby ją\n"
+"zmienić.  Jeśli wszystkie wiersze skrawka zostaną usunięte, edycja\n"
+"będzie przerwana, a skrawek niezmieniony.\n"
+
+#: add-patch.c:1132
+msgid "could not parse hunk header"
+msgstr "nie można przetworzyć nagłówka skrawka"
+
+#: add-patch.c:1177
+msgid "'git apply --cached' failed"
+msgstr "„git apply --cached� nie powiodło się"
+
+#. 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.
+#.
+#. 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
+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
+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
+msgid "Apply them to the worktree anyway? "
+msgstr "Zastosować je do drzewa roboczego mimo to? "
+
+#: add-patch.c:1297 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Nic nie zastosowano.\n"
+
+#: add-patch.c:1354
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - pozostaw ten skrawek nierozstrzygniętym, zobacz następny "
+"nierozstrzygnięty skrawek\n"
+"J - pozostaw ten skrawek nierozstrzygniętym, zobacz następny skrawek\n"
+"k - pozostaw ten skrawek nierozstrzygniętym, zobacz poprzedni "
+"nierozstrzygnięty skrawek\n"
+"K - pozostaw ten skrawek nierozstrzygniętym, zobacz poprzedni skrawek\n"
+"g - wybierz skrawek, to którego przejść\n"
+"/ - wyszukaj skrawek pasujący do podanego wyrażenia regularnego\n"
+"s - podziel ten skrawek na mniejsze\n"
+"e - ręcznie zmień bieżący skrawek\n"
+"? - wypisz pomoc\n"
+
+#: add-patch.c:1516 add-patch.c:1526
+msgid "No previous hunk"
+msgstr "Nie ma poprzedniego skrawka"
+
+#: add-patch.c:1521 add-patch.c:1531
+msgid "No next hunk"
+msgstr "Nie ma następnego skrawka"
+
+#: add-patch.c:1537
+msgid "No other hunks to goto"
+msgstr "Nie ma innych skrawków do przejścia"
+
+#: add-patch.c:1548 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
+msgid "go to which hunk? "
+msgstr "przejść do którego skrawka? "
+
+#: add-patch.c:1560
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Nieprawidłowa liczba: „%s�"
+
+#: add-patch.c:1565
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+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
+msgid "No other hunks to search"
+msgstr "Nie ma innych skrawków do wyszukania"
+
+#: add-patch.c:1580 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "wyszukaj wyrażenie regularne? "
+
+#: add-patch.c:1595
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Nieprawidłowe wyrażenie regularne %s: %s"
+
+#: add-patch.c:1612
+msgid "No hunk matches the given pattern"
+msgstr "Żaden skrawek nie pasuje do podanego wzorca"
+
+#: add-patch.c:1619
+msgid "Sorry, cannot split this hunk"
+msgstr "Niestety nie można podzielić tego skrawka"
+
+#: add-patch.c:1623
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Podzielono na %d skrawków."
+
+#: add-patch.c:1627
+msgid "Sorry, cannot edit this hunk"
+msgstr "Niestety nie można zmienić tego skrawka"
+
+#: add-patch.c:1679
+msgid "'git apply' failed"
+msgstr "„git apply� nie powiodło się"
+
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Wyłącz ten komunikat przez „git config advice.%s false�"
+
+#: advice.c:159
+#, c-format
+msgid "%shint: %.*s%s\n"
+msgstr "%spodpowiedź: %.*s%s\n"
+
+#: advice.c:250
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "Dobieranie nie jest możliwe, ponieważ istnieją niescalone pliki."
+
+#: advice.c:252
+msgid "Committing is not possible because you have unmerged files."
+msgstr "Składanie nie jest możliwe, ponieważ istnieją niescalone pliki."
+
+#: advice.c:254
+msgid "Merging is not possible because you have unmerged files."
+msgstr "Scalanie jest możliwe, ponieważ istnieją niescalone pliki."
+
+#: advice.c:256
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "Zaciąganie jest możliwe, ponieważ istnieją niescalone pliki."
+
+#: advice.c:258
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "Odwracanie jest możliwe, ponieważ istnieją niescalone pliki."
+
+#: advice.c:260
+#, 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
+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 ""
+"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
+msgid "Exiting because of an unresolved conflict."
+msgstr "Wyjście z powodu nierozwiązanego konfliktu."
+
+#: advice.c:281 builtin/merge.c:1370
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Nie zwieńczono scalania (MERGE_HEAD istnieje)."
+
+#: advice.c:283
+msgid "Please, commit your changes before merging."
+msgstr "Złóż swoje zmiany przez scalaniem."
+
+#: advice.c:284
+msgid "Exiting because of unfinished merge."
+msgstr "Wyjście z powodu niedokończonego scalania."
+
+#: advice.c:290
+#, c-format
+msgid ""
+"Note: switching to '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by switching back to a branch.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+"  git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
+"\n"
+msgstr ""
+"Uwaga: przełączanie na „%s�.\n"
+"\n"
+"Jesteś w stanie „odłączonego HEAD�. Możesz się rozglądać, tworzyć\n"
+"eksperymentalne zmiany i je składać, i możesz odrzucić wszystkie zapisy,\n"
+"które złożysz w tym stanie, bez wpływu na żadną gałąź, przełączając z "
+"powrotem na jakąś gałąź.\n"
+"\n"
+"Jeśli chcesz utworzyć nową gałąź, która zachowa zapisy, które złożysz,\n"
+"możesz to zrobić (teraz lub później) używając -c w ponownym poleceniu "
+"przełączenia.\n"
+"Przykład:\n"
+"\n"
+"  git switch -c <nazwa-nowej-gałęzi>\n"
+"\n"
+"Lub cofnąć tę operację przez:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Wyłącz tę poradę ustawiając zmienną konfiguracji advice.detachedHead na "
+"false\n"
+"\n"
+
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "wiersz poleceń kończy się na \\"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "niezamknięty cudzysłów"
+
+#: apply.c:69
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "Nierozpoznana opcja z białych znaków: „%s�"
+
+#: apply.c:85
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "nierozpoznana opcja ignorowania z białych znaków: „%s�"
+
+#: apply.c:135
+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
+msgid "--3way outside a repository"
+msgstr "--3way poza repozytorium"
+
+#: apply.c:151
+msgid "--index outside a repository"
+msgstr "--index poza repozytorium"
+
+#: apply.c:154
+msgid "--cached outside a repository"
+msgstr "--cached poza repozytorium"
+
+#: apply.c:801
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Nie można przygotować wyrażenia regularnego znacznika czasu %s"
+
+#: apply.c:810
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec zwrócił %d dla wejścia: %s"
+
+#: apply.c:884
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "błędny tryb w wierszu %d: %s"
+
+#: apply.c:1282
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "niespójne wiersze nagłówka %d i %d"
+
+#: apply.c:1372
+#, 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] ""
+"w nagłówku git diff brakuje informacji o nazwach plików po usunięciu %d "
+"wiodącego komponentu ścieżki (wiersz %d)"
+msgstr[1] ""
+"w nagłówku git diff brakuje informacji o nazwach plików po usunięciu %d "
+"wiodących komponentów ścieżki (wiersz %d)"
+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
+#, 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
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "przeliczanie: nieoczekiwany wiersz: %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragment łatki bez nagłówka w wierszu %d: %.*s"
+
+#: apply.c:1753
+msgid "new file depends on old contents"
+msgstr "nowy plik zależy od starej zawartości"
+
+#: apply.c:1755
+msgid "deleted file still has contents"
+msgstr "usunięty plik nadal ma zawartość"
+
+#: apply.c:1789
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "uszkodzona Å‚atka w wierszu %d"
+
+#: apply.c:1826
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "nowy plik %s zależy od starej zawartości"
+
+#: apply.c:1828
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "usunięty plik %s nadal ma zawartość"
+
+#: apply.c:1831
+#, 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"
+
+#: apply.c:1978
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "uszkodzona Å‚atka binarna w wierszu %d: %.*s"
+
+#: apply.c:2015
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "nierozpoznana Å‚atka binarna w wierszu %d"
+
+#: apply.c:2177
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "łatka z samymi śmieciami w wierszu %d"
+
+#: apply.c:2263
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "nie można odczytać nawiązania symbolicznego %s"
+
+#: apply.c:2267
+#, c-format
+msgid "unable to open or read %s"
+msgstr "nie można otworzyć lub odczytać %s"
+
+#: apply.c:2936
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "nieprawidłowy początek wiersza: „%c�"
+
+#: 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] "Skrawek nr %d dopasował się w %d (przesunięcie: %d wiersz)."
+msgstr[1] "Skrawek nr %d dopasował się w %d (przesunięcie: %d wiersze)."
+msgstr[2] "Skrawek nr %d dopasował się w %d (przesunięcie: %d wierszy)."
+
+#: apply.c:3069
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "Kontekst zmniejszony do (%ld/%ld), aby zastosować fragment w %d"
+
+#: apply.c:3075
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"podczas wyszukiwania:\n"
+"%.*s"
+
+#: apply.c:3097
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "brakujące dane łatki binarnej w „%s�"
+
+#: apply.c:3105
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+"nie można odwrotnie zastosować łatki binarnej bez odwrotnego skrawka do „%s�"
+
+#: apply.c:3152
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr ""
+"nie można zastosować łatki binarnej do „%s� bez pełnego wiersza indeksu"
+
+#: apply.c:3163
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"łatka stosuje się do „%s� (%s), które nie pasuje do bieżącej zawartości."
+
+#: apply.c:3171
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "łatka stosuje się do pustego „%s�, ale nie jest pusty"
+
+#: apply.c:3189
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "nie można odczytać potrzebnego obraz postimage %s dla „%s�"
+
+#: apply.c:3202
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "łatka binarna nie stosuje się do „%s�"
+
+#: apply.c:3209
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"łatka binarna do „%s� daje nieprawidłowy wynik (oczekiwane %s, daje %s)"
+
+#: apply.c:3230
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "łatanie nie powiodło się: %s:%ld"
+
+#: apply.c:3353
+#, c-format
+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
+#: setup.c:308
+#, c-format
+msgid "failed to read %s"
+msgstr "nie można odczytać %s"
+
+#: apply.c:3413
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "czytanie z „%s� przechodzącego przez dowiązanie"
+
+#: apply.c:3442 apply.c:3685
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "ścieżka %s została przeniesiona/usunięta"
+
+#: apply.c:3528 apply.c:3700
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: brak w indeksie"
+
+#: apply.c:3537 apply.c:3708 apply.c:3952
+#, 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:3575
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "Uciekanie się do trójstronnego scalania...\n"
+
+#: apply.c:3591 apply.c:3595
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "nie można odczytać bieżącej zawartości „%s�"
+
+#: apply.c:3607
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Nie można uciec się do trójstronnego scalania...\n"
+
+#: apply.c:3621
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Zastosowano łatkę do „%s� z konfliktami\n"
+
+#: apply.c:3626
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Gładko zastosowano łatkę do „%s�.\n"
+
+#: apply.c:3652
+msgid "removal patch leaves file contents"
+msgstr "łatka usuwająca pozostawia zawartość pliku"
+
+#: apply.c:3725
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: nieprawidłowy rodzaj"
+
+#: apply.c:3727
+#, 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
+#, c-format
+msgid "invalid path '%s'"
+msgstr "nieprawidłowa ścieżka „%s�"
+
+#: apply.c:3950
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: już widnieje w indeksie"
+
+#: apply.c:3954
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: już istnieje w katalogu roboczym"
+
+#: apply.c:3974
+#, 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
+#, 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
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "dotknięty plik „%s� jest pod dowiązaniem"
+
+#: apply.c:4003
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: Å‚atka siÄ™ nie stosuje"
+
+#: apply.c:4018
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Sprawdzanie Å‚atki %s..."
+
+#: apply.c:4110
+#, 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"
+
+#: apply.c:4117
+#, 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
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "brakuje informacji SHA-1 lub jest bezużyteczna (%s)."
+
+#: apply.c:4129
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "nie można dodać %s do indeksu tymczasowego"
+
+#: apply.c:4139
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "nie można zapisać indeksu tymczasowego w %s"
+
+#: apply.c:4277
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "nie można usunąć %s z indeksu"
+
+#: apply.c:4311
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "uszkodzona łatka pod-modułu %s"
+
+#: apply.c:4317
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "nie można wykonać stat na nowo utworzonym pliku „%s�"
+
+#: apply.c:4325
+#, 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
+#, 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
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "nie można pisać do „%s�"
+
+#: apply.c:4378
+#, c-format
+msgid "closing file '%s'"
+msgstr "zamykanie pliku „%s�"
+
+#: apply.c:4448
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "nie można ustawić w pliku „%s� trybu %o"
+
+#: apply.c:4546
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "GÅ‚adko zastosowano Å‚atkÄ™ %s."
+
+#: apply.c:4554
+msgid "internal error"
+msgstr "wewnętrzny błąd"
+
+#: apply.c:4557
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+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
+#, 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
+#, c-format
+msgid "cannot open %s"
+msgstr "nie można otworzyć %s"
+
+#: apply.c:4590
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Skrawek nr %d gładko zastosowany."
+
+#: apply.c:4594
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "Odrzucono skrawek nr %d."
+
+#: apply.c:4718
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Pominięto łatkę „%s�."
+
+#: apply.c:4726
+msgid "unrecognized input"
+msgstr "nierozpoznawane wejście"
+
+#: apply.c:4746
+msgid "unable to read index file"
+msgstr "nie można odczytać pliku indeksu"
+
+#: apply.c:4903
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "nie można otworzyć łatki „%s�: %s"
+
+#: apply.c:4930
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+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
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+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
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+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
+msgid "Unable to write new index file"
+msgstr "Nie można zapisać nowego pliku indeksu"
+
+#: apply.c:4988
+msgid "don't apply changes matching the given path"
+msgstr "nie stosuj zmian pasujących do podanej ścieżki"
+
+#: apply.c:4991
+msgid "apply changes matching the given path"
+msgstr "zastosuj zmiany pasujące do podanej ścieżki"
+
+#: apply.c:4993 builtin/am.c:2266
+msgid "num"
+msgstr "ile"
+
+#: apply.c:4994
+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
+msgid "ignore additions made by the patch"
+msgstr "ignoruj wstawienia wykonywane przez Å‚atkÄ™"
+
+#: apply.c:4999
+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
+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
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "zamiast stosować łatkę, wypisz podsumowanie dla wejścia"
+
+#: apply.c:5007
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "zamiast stosować łatkę, zobacz, czy się stosuje"
+
+#: apply.c:5009
+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
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "oznacz nowe pliki przez „git add --intent-to-add�"
+
+#: apply.c:5013
+msgid "apply a patch without touching the working tree"
+msgstr "zastosuj Å‚atkÄ™ bez dotykania drzewa roboczego"
+
+#: apply.c:5015
+msgid "accept a patch that touches outside the working area"
+msgstr "przyjmuj łatkę, która wychodzi poza obszar roboczy"
+
+#: apply.c:5018
+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:5022
+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
+msgid "paths are separated with NUL character"
+msgstr "ścieżki są rozdzielone znakiem NUL"
+
+#: apply.c:5027
+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
+msgid "action"
+msgstr "działanie"
+
+#: apply.c:5029
+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
+msgid "ignore changes in whitespace when finding context"
+msgstr "ignoruj zmiany w białych znakach przy znajdywaniu kontekstu"
+
+#: apply.c:5038
+msgid "apply the patch in reverse"
+msgstr "zastosuj łatkę na odwrót"
+
+#: apply.c:5040
+msgid "don't expect at least one line of context"
+msgstr "nie oczekuj przynajmniej jednego wiersza kontekstu"
+
+#: apply.c:5042
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "zostaw odrzucone skrawki w odpowiednich plikach *.rej"
+
+#: apply.c:5044
+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
+msgid "be verbose"
+msgstr "więcej komunikatów"
+
+#: apply.c:5047
+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
+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
+msgid "root"
+msgstr "korzeń"
+
+#: apply.c:5053
+msgid "prepend <root> to all filenames"
+msgstr "dodaj <korzeń> przed wszystkimi nazwami plików"
+
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "nie można strumieniować blobu %s"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "nieobsługiwany tryb pliku: 0%o (SHA-1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "nie można uruchomić filtra „%s�"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "nie można przekierować deskryptora"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "filtr „%s� zgłosił błąd"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "ścieżka nie jest prawidłowym UTF-8: %s"
+
+#: archive-zip.c:322
+#, c-format
+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
+#, c-format
+msgid "deflate error (%d)"
+msgstr "błąd kompresji (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "znacznik czasu za duży na ten system: %<PRIuMAX>"
+
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<opcje>] <drzewo> [<ścieżka>...]"
+
+#: archive.c:15
+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 <repozytorium> [--exec <polecenie>] [<opcje>] <drzewo> "
+"[<ścieżka>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <repozytorium> [--exec <polecenie>] --list"
+
+#: archive.c:192
+#, 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
+#, 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
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "ścieżka „%s� nie pasuje do żadnych plików"
+
+#: archive.c:454
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "nie ma takiej referencji: %*.s"
+
+#: archive.c:460
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "nieprawidłowa nazwa obiektu: %s"
+
+#: archive.c:473
+#, c-format
+msgid "not a tree object: %s"
+msgstr "nie jest obiektem drzewa: %s"
+
+#: archive.c:485
+msgid "current working directory is untracked"
+msgstr "bieżący katalog roboczy jest nieśledzony"
+
+#: archive.c:526
+#, c-format
+msgid "File not found: %s"
+msgstr "Nie znaleziono pliku: %s"
+
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Nie jest zwykłym plikiem: %s"
+
+#: archive.c:555
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:555
+msgid "archive format"
+msgstr "format archiwum"
+
+#: archive.c:556 builtin/log.c:1764
+msgid "prefix"
+msgstr "prefiks"
+
+#: archive.c:557
+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
+msgid "file"
+msgstr "plik"
+
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr "dodaj nieśledzony plik do archiwum"
+
+#: archive.c:562 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "zapisz archiwum do tego pliku"
+
+#: archive.c:564
+msgid "read .gitattributes in working directory"
+msgstr "przeczytaj .gitattributes w katalogu roboczym"
+
+#: archive.c:565
+msgid "report archived files on stderr"
+msgstr "zgłaszaj zarchiwizowane pliki na standardowe wyjście diagnostyczne"
+
+#: archive.c:567
+msgid "set compression level"
+msgstr "ustaw stopień kompresji"
+
+#: archive.c:570
+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
+msgid "repo"
+msgstr "repozytorium"
+
+#: archive.c:573 builtin/archive.c:92
+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
+msgid "command"
+msgstr "polecenie"
+
+#: archive.c:575 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "ścieżka do zdalnego polecenia git-upload-archive"
+
+#: archive.c:582
+msgid "Unexpected option --remote"
+msgstr "Nieoczekiwana opcja --remote"
+
+#: archive.c:584
+msgid "Option --exec can only be used together with --remote"
+msgstr "Opcja --exec może być użyta tylko z --remote"
+
+#: archive.c:586
+msgid "Unexpected option --output"
+msgstr "Nieoczekiwana opcja --output"
+
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "Opcje --add-file i --remote siÄ™ wykluczajÄ…"
+
+#: archive.c:610
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Nieznany format archiwum „%s�"
+
+#: archive.c:619
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argument niewspierany w formacie „%s�: -%d"
+
+#: attr.c:202
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%*.s nie jest prawidłową nazwą atrybutu"
+
+#: attr.c:359
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s niedozwolone: %s:%d"
+
+#: attr.c:399
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Negatywne wzorce sÄ… pomijane w atrybutach gita\n"
+"Użyj „\\!� dla dosłownego początkowego wykrzyknika."
+
+#: bisect.c:489
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Źle zacytowana zawartość w pliku „%s�: %s"
+
+#: bisect.c:699
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Nie można już przeszukiwać!\n"
+
+#: bisect.c:766
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Nieprawidłowa nazwa zapisu %s"
+
+#: bisect.c:791
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"Podstawa scalania %s jest zła.\n"
+"To znaczy, że błąd naprawiono pomiędzy %s i [%s].\n"
+
+#: bisect.c:796
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"Podstawa scalenia %s jest nowa.\n"
+"Właściwość zmieniła się między %s i [%s].\n"
+
+#: bisect.c:801
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"Podstawa scalania %s jest %s.\n"
+"To znaczy, że pierwszy zapis „%s� jest pomiędzy %s i [%s].\n"
+
+#: bisect.c:809
+#, 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 ""
+"Niektóre rewizje %s nie są przodkami rewizji %s.\n"
+"git bisect nie może w tym przypadku działać poprawnie.\n"
+"Może pomylono rewizje %s i %s?\n"
+
+#: bisect.c:822
+#, 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 ""
+"trzeba pominąć podstawę scalania pomiędzy %s i [%s].\n"
+"Nie możemy być więc pewni, że pierwszy zapis %s jest między %s i %s.\n"
+"Kontynuowanie mimo to."
+
+#: bisect.c:861
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Przeszukiwanie: podstawa scalenia musi być sprawdzona\n"
+
+#: bisect.c:911
+#, c-format
+msgid "a %s revision is needed"
+msgstr "potrzebna jest rewizja %s"
+
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:287
+#, c-format
+msgid "could not create file '%s'"
+msgstr "nie można utworzyć pliku „%s�"
+
+#: bisect.c:987 builtin/merge.c:153
+#, c-format
+msgid "could not read file '%s'"
+msgstr "nie można odczytać pliku „%s�"
+
+#: bisect.c:1027
+msgid "reading bisect refs failed"
+msgstr "nie można odczytać referencji przeszukiwania"
+
+#: bisect.c:1057
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s był jednocześnie %s i %s\n"
+
+#: bisect.c:1066
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path arguments?\n"
+msgstr ""
+"Nie znaleziono sprawdzalnego zapisu.\n"
+"Może zaczęto ze złymi argumentami ścieżek?\n"
+
+#: bisect.c:1095
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(około %d krok)"
+msgstr[1] "(około %d kroki)"
+msgstr[2] "(około %d kroków)"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1101
+#, 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] "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
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents i --reverse siÄ™ wykluczajÄ…."
+
+#: blame.c:2791
+msgid "cannot use --contents with final commit object name"
+msgstr "--contents i nazwa obiektu ostatniego zapisu wykluczajÄ… siÄ™"
+
+#: blame.c:2812
+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
+#: builtin/shortlog.c:255
+msgid "revision walk setup failed"
+msgstr "nie udało się przygotować przejścia rewizji"
+
+#: blame.c:2839
+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
+#, c-format
+msgid "no such path %s in %s"
+msgstr "nie ma ścieżki %s w %s"
+
+#: blame.c:2861
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "nie można odczytać blobu %s ścieżki %s"
+
+#: branch.c:53
+#, c-format
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+msgstr ""
+"\n"
+"Po naprawieniu przyczyny błędu, możesz spróbować naprawić\n"
+"informacje o śledzeniu uruchamiając\n"
+"„git branch --set-upstream-to=%s%s%s�."
+
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "Nie ustawiam gałęzi %s jako nadrzędną jej samej."
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+"Gałąź „%s� ustawiona na śledzenie zdalnej gałęzi „%s� z „%s� przez "
+"przestawianie."
+
+#: branch.c:94
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "Gałąź „%s� ustawiona na śledzenie zdalnej gałęzi „%s� z „%s�."
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+"Gałąź „%s� ustawiona na śledzenie lokalnej gałęzi „%s� przez przestawianie."
+
+#: branch.c:99
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Gałąź „%s� ustawiona na śledzenie lokalnej gałęzi „%s�."
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"Gałąź „%s� ustawiona na śledzenie zdalnej referencji „%s� przez "
+"przestawianie."
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "Gałąź „%s� ustawiona na śledzenie zdalnej referencji „%s�."
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+"Gałąź „%s� ustawiona na śledzenie lokalnej referencji „%s� przez "
+"przestawianie."
+
+#: branch.c:110
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "Gałąź „%s� ustawiona na śledzenie lokalnej referencji „%s�."
+
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "Nie można zapisać konfiguracji gałęzi nadrzędnej"
+
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "Nie śledzenie: niejednoznaczna informacja dla referencji %s"
+
+#: branch.c:189
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "„%s� nie jest prawidłową nazwą gałęzi."
+
+#: branch.c:208
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "Gałąź o nazwie „%s� już istnieje."
+
+#: branch.c:213
+msgid "Cannot force update the current branch."
+msgstr "Nie można zaktualizować bieżącej gałęzi."
+
+#: branch.c:233
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+"Nie można ustawić informacji śledzenia; punkt początkowy „%s� nie jest "
+"gałęzią."
+
+#: branch.c:235
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "żądana zdalna gałąź „%s� nie istnieje"
+
+#: branch.c:237
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"Jeśli planujesz oprzeć swoją pracę na zdalnej gałęzi, która\n"
+"już istnieje, możesz potrzebować uruchomić „git fetch�,\n"
+"aby ją pobrać.\n"
+"\n"
+"Jeśli planujesz wypchnąć nową lokalną gałąź, która będzie\n"
+"śledzić swój zdalny odpowiednik, możesz chcieć użyć\n"
+"„git push -u�, żeby ustawić gałąź nadrzędną przy wypychaniu."
+
+#: branch.c:281
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "Nieprawidłowa nazwa obiektu: „%s�."
+
+#: branch.c:301
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Niejednoznaczna nazwa obiektu: „%s�."
+
+#: branch.c:306
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Nieprawidłowy punkt rozgałęzienia: „%s�."
+
+#: branch.c:365
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "„%s� jest już wybrana w „%s�"
+
+#: branch.c:388
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "nie zaktualizowano HEAD drzewa roboczego %s"
+
+#: bundle.c:41
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "nierozpoznany algorytm skrótu wiązki: %s"
+
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "nieznana zdolność (capability) „%s�"
+
+#: bundle.c:71
+#, 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
+#, 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
+#, c-format
+msgid "could not open '%s'"
+msgstr "nie można otworzyć „%s�"
+
+#: bundle.c:189
+msgid "Repository lacks these prerequisite commits:"
+msgstr "W repozytorium brakuje tych wymaganych zapisów:"
+
+#: bundle.c:192
+msgid "need a repository to verify a bundle"
+msgstr "należy podać repozytorium, aby sprawdzić wiązkę"
+
+#: bundle.c:243
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+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
+msgid "The bundle records a complete history."
+msgstr "Wiązka zapisuje pełną historię."
+
+#: bundle.c:252
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+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
+msgid "unable to dup bundle descriptor"
+msgstr "nie można wykonać dup deskryptora wiązki"
+
+#: bundle.c:326
+msgid "Could not spawn pack-objects"
+msgstr "Nie można uruchomić pack-objects"
+
+#: bundle.c:337
+msgid "pack-objects died"
+msgstr "pack-objects padł"
+
+#: bundle.c:386
+#, 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
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "nieobsługiwana wersja wiązki %d"
+
+#: bundle.c:492
+#, 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
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "nierozpoznany argument: %s"
+
+#: bundle.c:539
+msgid "Refusing to create empty bundle."
+msgstr "Odmawiam utworzenia pustej wiÄ…zki."
+
+#: bundle.c:549
+#, c-format
+msgid "cannot create '%s'"
+msgstr "nie można utworzyć „%s�"
+
+#: bundle.c:574
+msgid "index-pack died"
+msgstr "index-pack padł"
+
+#: color.c:329
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "nieprawidłowa wartość koloru: %.*s"
+
+#: commit-graph.c:198 midx.c:47
+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
+msgid "commit-graph file is too small"
+msgstr "plik grafu zapisów jest za mały"
+
+#: commit-graph.c:329
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "commit-graph has no base graphs chunk"
+msgstr "graf zapisów nie ma podstawowego kawałka grafów"
+
+#: commit-graph.c:541
+msgid "commit-graph chain does not match"
+msgstr "łańcuch grafu zapisów się nie zgadza"
+
+#: commit-graph.c:589
+#, 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
+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
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+"nieprawidłowa pozycja zapisu. Graf zapisów jest prawdopodobnie uszkodzony"
+
+#: commit-graph.c:815
+#, c-format
+msgid "could not find commit %s"
+msgstr "nie znaleziono zapisu %s"
+
+#: commit-graph.c:848
+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
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "nie można przeanalizować zapisu %s"
+
+#: commit-graph.c:1378 builtin/pack-objects.c:2872
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "nie można uzyskać rodzaju obiektu %s"
+
+#: commit-graph.c:1409
+msgid "Loading known commits in commit graph"
+msgstr "�adowanie znanych zapisów w graf zapisów"
+
+#: commit-graph.c:1426
+msgid "Expanding reachable commits in commit graph"
+msgstr "Rozwijanie osiągalnych zapisów w grafie zapisów"
+
+#: commit-graph.c:1446
+msgid "Clearing commit marks in commit graph"
+msgstr "Czyszczenie znamion zapisów w grafie zapisów"
+
+#: commit-graph.c:1465
+msgid "Computing commit graph topological levels"
+msgstr "Obliczanie topologicznych poziomów grafu zapisów"
+
+#: commit-graph.c:1518
+msgid "Computing commit graph generation numbers"
+msgstr "Obliczanie numerów pokoleń grafu zapisów"
+
+#: commit-graph.c:1599
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Obliczanie filtrów Blooma zmienionych ścieżek zapisu"
+
+#: commit-graph.c:1676
+msgid "Collecting referenced commits"
+msgstr "Zbieranie wspominanych zapisów"
+
+#: commit-graph.c:1701
+#, c-format
+msgid "Finding commits for commit graph in %d pack"
+msgid_plural "Finding commits for commit graph in %d packs"
+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
+#, c-format
+msgid "error adding pack %s"
+msgstr "błąd przy dodawaniu paczki %s"
+
+#: commit-graph.c:1718
+#, c-format
+msgid "error opening index for %s"
+msgstr "błąd otwierania indeksu dla %s"
+
+#: commit-graph.c:1755
+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
+msgid "Finding extra edges in commit graph"
+msgstr "Znajdywanie dodatkowych krawędzi w grafie zapisów"
+
+#: commit-graph.c:1821
+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
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "nie można utworzyć wiodących katalogów %s"
+
+#: commit-graph.c:1876
+msgid "unable to create temporary graph layer"
+msgstr "nie można utworzyć tymczasowej warstwy grafu"
+
+#: commit-graph.c:1881
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "nie można dostroić współdzielonych uprawnień „%s�"
+
+#: commit-graph.c:1966
+#, c-format
+msgid "Writing out commit graph in %d pass"
+msgid_plural "Writing out commit graph in %d passes"
+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
+msgid "unable to open commit-graph chain file"
+msgstr "nie można otworzyć pliku łańcucha grafu zapisów"
+
+#: commit-graph.c:2027
+msgid "failed to rename base commit-graph file"
+msgstr "nie można zmienić nazwy podstawowego pliku grafu zapisów"
+
+#: commit-graph.c:2047
+msgid "failed to rename temporary commit-graph file"
+msgstr "nie można zmienić nazwy tymczasowego pliku grafu zapisów"
+
+#: commit-graph.c:2180
+msgid "Scanning merged commits"
+msgstr "Skanowanie scalonych zapisów"
+
+#: commit-graph.c:2224
+msgid "Merging commit-graph"
+msgstr "Scalanie grafu zapisów"
+
+#: commit-graph.c:2331
+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
+msgid "too many commits to write graph"
+msgstr "za dużo zapisów, by wypisać graf"
+
+#: commit-graph.c:2536
+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
+#, 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
+#, 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
+#, 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
+msgid "Verifying commits in commit graph"
+msgstr "Sprawdzanie zapisów w grafie zapisów"
+
+#: commit-graph.c:2596
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+"graf zapisów ma numer pokolenia zerowy w zapisie %s, ale niezerowy gdzie "
+"indziej"
+
+#: commit-graph.c:2645
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+"graf zapisów ma numer pokolenia niezerowy w zapisie %s, ale zerowy gdzie "
+"indziej"
+
+#: commit-graph.c:2662
+#, 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
+#, 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
+#, c-format
+msgid "could not parse %s"
+msgstr "nie można przetworzyć „%s�"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s nie jest zapisem!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Wsparcie dla <KATALOG_GITA>/info/grafts jest przestarzałe\n"
+"i zostanie usunięte w przyszłej wersji Gita.\n"
+"\n"
+"Użyj „git replace --convert-graft-file�\n"
+"aby zamienić szczepki w zastępcze referencje.\n"
+"\n"
+"Wyłącz ten komunikat uruchamiając\n"
+"„git config advice.graftFileDeprecated false�"
+
+#: commit.c:1223
+#, 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
+#, 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
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Zapis %s nie ma podpisu GPG."
+
+#: commit.c:1233
+#, 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
+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 ""
+"Ostrzeżenie: komunikat zapisu nie stosuje się do UTF-8.\n"
+"Możesz chcieć go poprawić po naprawieniu komunikatu, albo ustawić\n"
+"wartość konfiguracji i18n.commitencoding na kodowanie, którego\n"
+"używa projekt.\n"
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "pamięć wyczerpana"
+
+#: config.c:126
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"przekroczono maksymalną głębokość załączania (%d) podczas załączania\n"
+"\t%s\n"
+"z\n"
+"\t%s\n"
+"Może to być spowodowane cyklicznymi załączeniami."
+
+#: config.c:142
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "nie można rozwinąć ścieżki załączeń (include) „%s�"
+
+#: config.c:153
+msgid "relative config includes must come from files"
+msgstr "względne załączenia konfiguracji muszą pochodzić z plików"
+
+#: config.c:199
+msgid "relative config include conditionals must come from files"
+msgstr "względne warunkowe załączenia konfiguracji muszą pochodzić z plików"
+
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "nieprawidłowy format ustawień: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "brak nazwy zmiennej środowiska dla ustawienia „%.*s�"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "brak zmiennej środowiska „%s� dla ustawienia „%.*s�"
+
+#: config.c:442
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "klucz nie zawiera rozdziału: %s"
+
+#: config.c:448
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "klucz nie zawiera nazwy zmiennej: %s"
+
+#: config.c:472 sequencer.c:2588
+#, c-format
+msgid "invalid key: %s"
+msgstr "nieprawidłowy klucz: %s"
+
+#: config.c:478
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "błędny klucz (nowy wiersz): %s"
+
+#: config.c:511
+msgid "empty config key"
+msgstr "pusty klucz ustawień"
+
+#: config.c:529 config.c:541
+#, 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
+#, c-format
+msgid "bogus format in %s"
+msgstr "fałszywy format %s"
+
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "fałszywy licznik w %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "za dużo wpisów w %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "brak klucza ustawień %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "brakująca wartość ustawienia %s"
+
+#: config.c:995
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "zły wiersz konfiguracji %d w blobie %s"
+
+#: config.c:999
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "zły wiersz konfiguracji %d w pliku %s"
+
+#: config.c:1003
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "zły wiersz konfiguracji %d na standardowym wejściu"
+
+#: config.c:1007
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "zły wiersz konfiguracji %d w blobie pod-modułu %s"
+
+#: config.c:1011
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "zły wiersz konfiguracji %d w wierszu poleceń %s"
+
+#: config.c:1015
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "zły wiersz konfiguracji %d w %s"
+
+#: config.c:1152
+msgid "out of range"
+msgstr "poza zakresem"
+
+#: config.c:1152
+msgid "invalid unit"
+msgstr "nieprawidłowa jednostka"
+
+#: config.c:1153
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "zła liczbowa wartość konfiguracji „%s� dla „%s�: %s"
+
+#: config.c:1163
+#, 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
+#, 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
+#, 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
+#, 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"
+
+#: config.c:1175
+#, 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
+#, 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
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "zła logiczna wartość konfiguracji „%s� w „%s�"
+
+#: config.c:1289
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "nie można rozwinąć katalogu użytkownika w: „%s�"
+
+#: config.c:1298
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "„%s� do „%s� nie jest prawidłowym znacznikiem czasu"
+
+#: config.c:1391
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "długość skrótu poza zakresem: %d"
+
+#: config.c:1405 config.c:1416
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "zły stopień kompresji zlib %d"
+
+#: config.c:1508
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar powinno być tylko jednym znakiem"
+
+#: config.c:1541
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "nieprawidłowy tryb utworzenia obiektu: %s"
+
+#: config.c:1613
+#, c-format
+msgid "malformed value for %s"
+msgstr "nieprawidłowa wartość %s"
+
+#: config.c:1639
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "nieprawidłowa wartość %s: %s"
+
+#: config.c:1640
+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
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "zły stopień kompresji paczki %d"
+
+#: config.c:1823
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "nie można wczytać konfiguracyjnego obiektu blobu „%s�"
+
+#: config.c:1826
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "referencja „%s� nie wskazuje blobu"
+
+#: config.c:1843
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "nie można rozwiązać blobu konfiguracji „%s�"
+
+#: config.c:1873
+#, c-format
+msgid "failed to parse %s"
+msgstr "nie można przetworzyć %s"
+
+#: config.c:1927
+msgid "unable to parse command-line config"
+msgstr "nie można przeanalizować konfiguracji wiersza poleceń"
+
+#: config.c:2290
+msgid "unknown error occurred while reading the configuration files"
+msgstr "wystąpił nieznany błąd podczas odczytywania plików konfiguracyjnych"
+
+#: config.c:2464
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Nieprawidłowy %s: „%s�"
+
+#: config.c:2509
+#, 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
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "nie można przetworzyć „%s� z konfiguracji wiersza poleceń"
+
+#: config.c:2557
+#, 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
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "nieprawidłowa nazwa rozdziału „%s�"
+
+#: config.c:2673
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s ma wiele wartości"
+
+#: config.c:2702
+#, 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
+#, c-format
+msgid "could not lock config file %s"
+msgstr "nie można zablokować pliku konfiguracyjnego %s"
+
+#: config.c:2965
+#, c-format
+msgid "opening %s"
+msgstr "otwieranie %s"
+
+#: config.c:3002 builtin/config.c:361
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "nieprawidłowy wzorzec: %s"
+
+#: config.c:3027
+#, c-format
+msgid "invalid config file %s"
+msgstr "nieprawidłowy plik konfiguracyjny %s"
+
+#: config.c:3040 config.c:3293
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat na %s nie powiódł się"
+
+#: config.c:3051
+#, c-format
+msgid "unable to mmap '%s'"
+msgstr "nie można wykonać mmap „%s�"
+
+#: config.c:3060 config.c:3298
+#, c-format
+msgid "chmod on %s failed"
+msgstr "chmod na %s nie powiodło się"
+
+#: config.c:3145 config.c:3395
+#, c-format
+msgid "could not write config file %s"
+msgstr "nie można zapisać pliku konfiguracji %s"
+
+#: config.c:3179
+#, 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
+#, c-format
+msgid "could not unset '%s'"
+msgstr "nie można usunąć ustawienia „%s�"
+
+#: config.c:3271
+#, c-format
+msgid "invalid section name: %s"
+msgstr "nieprawidłowa nazwa rozdziału: %s"
+
+#: config.c:3438
+#, c-format
+msgid "missing value for '%s'"
+msgstr "brakująca wartość „%s�"
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr "zdalna maszyna rozłączyła się po początkowym kontakcie"
+
+#: connect.c:63
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Nie można czytać ze zdalnego repozytorium.\n"
+"\n"
+"Upewnij się, że masz odpowiednie prawa dostępu\n"
+"i że repozytorium istnieje."
+
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "serwer nie wspiera „%s�"
+
+#: connect.c:118
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "serwer nie wspiera funkcji „%s�"
+
+#: connect.c:129
+msgid "expected flush after capabilities"
+msgstr "oczekiwano wypróżnienia po możliwościach (capabilities)"
+
+#: connect.c:263
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "pomijanie możliwości (capabilities) po pierwszym wierszu „%s�"
+
+#: connect.c:284
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "błąd protokołu: nieoczekiwane możliwości capabilities^{}"
+
+#: connect.c:306
+#, 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
+msgid "repository on the other end cannot be shallow"
+msgstr "repozytorium po drugiej stronie nie może być płytkie"
+
+#: connect.c:347
+msgid "invalid packet"
+msgstr "nieprawidłowy pakiet"
+
+#: connect.c:367
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "błąd protokołu: nieoczekiwane „%s�"
+
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "serwer podał nieznany format obiektu „%s�"
+
+#: connect.c:526
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "nieprawidłowa odpowiedź ls-refs: %s"
+
+#: connect.c:530
+msgid "expected flush after ref listing"
+msgstr "oczekiwano wypróżnienia po wypisaniu referencji"
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "oczekiwano pakietu końca odpowiedzi po wypisaniu referencji"
+
+#: connect.c:666
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "protokół „%s� jest niewspierany"
+
+#: connect.c:717
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "nie można ustawić w gnieździe SO_KEEPALIVE"
+
+#: connect.c:757 connect.c:820
+#, c-format
+msgid "Looking up %s ... "
+msgstr "Odnajdywanie %s ... "
+
+#: connect.c:761
+#, 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
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"gotowe.\n"
+"�ączenie z %s (port %s) ... "
+
+#: connect.c:787 connect.c:864
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"nie można połączyć z %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:793 connect.c:870
+msgid "done."
+msgstr "gotowe."
+
+#: connect.c:824
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "nie odnaleziono %s (%s)"
+
+#: connect.c:830
+#, c-format
+msgid "unknown port %s"
+msgstr "nieznany port %s"
+
+#: connect.c:967 connect.c:1299
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "zablokowano dziwną nazwę hosta „%s�"
+
+#: connect.c:969
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "zablokowano dziwny port „%s�"
+
+#: connect.c:979
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "nie można uruchomić pośrednika %s"
+
+#: connect.c:1050
+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
+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"
+
+#: connect.c:1247
+msgid "ssh variant 'simple' does not support -4"
+msgstr "wariant SSH „simple� nie wspiera -4"
+
+#: connect.c:1259
+msgid "ssh variant 'simple' does not support -6"
+msgstr "wariant SSH „simple� nie wspiera -6"
+
+#: connect.c:1276
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "wariant SSH „simple� nie wspiera ustawiania portu"
+
+#: connect.c:1388
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "zablokowano dziwną ścieżkę „%s�"
+
+#: connect.c:1436
+msgid "unable to fork"
+msgstr "nie można wykonać fork"
+
+#: connected.c:108 builtin/fsck.c:191 builtin/prune.c:45
+msgid "Checking connectivity"
+msgstr "Sprawdzanie spójności"
+
+#: connected.c:120
+msgid "Could not run 'git rev-list'"
+msgstr "Nie można wykonać „git rev-list�"
+
+#: connected.c:144
+msgid "failed write to rev-list"
+msgstr "nie można zapisać do rev-list"
+
+#: connected.c:149
+msgid "failed to close rev-list's stdin"
+msgstr "nie można zamknąć wejścia rev-list"
+
+#: convert.c:194
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "błędne działanie crlf_action %d"
+
+#: convert.c:207
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLFy zostałyby zastąpione LFami w %s"
+
+#: convert.c:209
+#, c-format
+msgid ""
+"CRLF will be replaced by LF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+"CRLFy zostanÄ… zastÄ…pione LFami %s.\n"
+"Plik zachowa swoje pierwotne końce wiersza w katalogu roboczym"
+
+#: convert.c:217
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LFy zostałyby zastąpione CRLFami w %s"
+
+#: convert.c:219
+#, c-format
+msgid ""
+"LF will be replaced by CRLF in %s.\n"
+"The file will have its original line endings in your working directory"
+msgstr ""
+"LFy zostanÄ… zastÄ…pione CRLFami %s.\n"
+"Plik zachowa swoje pierwotne końce wiersza w katalogu roboczym"
+
+#: convert.c:284
+#, 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
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"Plik „%s� zawiera znacznik kolejności bajtów (BOM). Użyj UTF-%.*s jako "
+"kodowania drzewa roboczego."
+
+#: convert.c:304
+#, 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
+#, 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 ""
+"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
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "nie można przekodować „%s� z %s na %s"
+
+#: convert.c:462
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "zewnętrzny filtr „%s� nie powiódł się %d"
+
+#: convert.c:727 convert.c:730
+#, 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
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "zewnętrzny filtr „%s� nie powiódł się"
+
+#: convert.c:837
+msgid "unexpected filter type"
+msgstr "nieoczekiwany rodzaj filtra"
+
+#: convert.c:848
+msgid "path name too long for external filter"
+msgstr "ścieżka zewnętrznego filtra za długa"
+
+#: convert.c:940
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"zewnętrzny filtr „%s� nie jest już dostępny, chociaż nie wszystkie ścieżki "
+"zostały przefiltrowane"
+
+#: convert.c:1240
+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
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s: filtr czyszczenia „%s� zawiódł"
+
+#: convert.c:1508
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: filtr smarowania %s zawiódł"
+
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "pomijanie odnajdywania poświadczeń dla klucza: credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "odmawiam pracy z poświadczeniem bez pola maszyny (hosta)"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr "odmawiam pracy z poświadczeniem bez pola protokołu"
+
+#: credential.c:394
+#, 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
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "adres URL nie ma schematu: %s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "nie można przetworzyć poświadczenia adresu URL: %s"
+
+#: date.c:138
+msgid "in the future"
+msgstr "w przyszłości"
+
+#: date.c:144
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> sekundÄ™ temu"
+msgstr[1] "%<PRIuMAX> sekundy temu"
+msgstr[2] "%<PRIuMAX> sekund temu"
+
+#: date.c:151
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> minutÄ™ temu"
+msgstr[1] "%<PRIuMAX> minuty temu"
+msgstr[2] "%<PRIuMAX> minut temu"
+
+#: date.c:158
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> godzinÄ™ temu"
+msgstr[1] "%<PRIuMAX> godziny temu"
+msgstr[2] "%<PRIuMAX> godzin temu"
+
+#: date.c:165
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> dzień temu"
+msgstr[1] "%<PRIuMAX> dni temu"
+msgstr[2] "%<PRIuMAX> dni temu"
+
+#: date.c:171
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> tydzień temu"
+msgstr[1] "%<PRIuMAX> tygodnie temu"
+msgstr[2] "%<PRIuMAX> tygodni temu"
+
+#: date.c:178
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> miesiÄ…c temu"
+msgstr[1] "%<PRIuMAX> miesiÄ…ce temu"
+msgstr[2] "%<PRIuMAX> miesięcy temu"
+
+#: date.c:189
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> rok"
+msgstr[1] "%<PRIuMAX> lata"
+msgstr[2] "%<PRIuMAX> lat"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:192
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> miesiÄ…c temu"
+msgstr[1] "%s, %<PRIuMAX> miesiÄ…ce temu"
+msgstr[2] "%s, %<PRIuMAX> miesięcy temu"
+
+#: date.c:197 date.c:202
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> rok temu"
+msgstr[1] "%<PRIuMAX> lata temu"
+msgstr[2] "%<PRIuMAX> lat temu"
+
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr "Propagowanie znaczników wyspy"
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr "zły obiekt drzewa %s"
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "nie można wczytać wyrażenia wyspy dla „%s�: %s"
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"wyrażenie wyspy z konfiguracji ma za dużo grup przechwytujących (max=%d)"
+
+#: delta-islands.c:467
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "Oznaczono %d wysp, gotowe.\n"
+
+#: diff-merges.c:70
+#, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr "nierozpoznana wartość --diff-merges: %s"
+
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base nie działa z zakresami"
+
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr "--merge-base działa tylko z zapisami"
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr "nie można uzyskać HEAD"
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr "nie znaleziono podstawy scalenia"
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr "znaleziono wiele podstaw scalenia"
+
+#: diff-no-index.c:238
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<opcje>] <ścieżka> <ścieżka>"
+
+#: diff-no-index.c:263
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+msgstr ""
+"To nie jest repozytorium gita. Użyj --no-index, aby porównać dwie ścieżki "
+"poza drzewem roboczym"
+
+#: diff.c:156
+#, 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
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Nieznany parametr dirstat „%s�\n"
+
+#: diff.c:297
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"ustawienie kolorowania przeniesień musi być jednym z „no�, „default�, "
+"„blocks�, „zebra�, „dimmed-zebra� czy „plain�"
+
+#: diff.c:325
+#, 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 ""
+"nieznany tryb color-moved-ws „%s�, możliwe wartości to „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 nie może być łączone z innymi "
+"trybami białych znaków"
+
+#: diff.c:410
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "Nierozpoznana wartość zmiennej konfiguracji „diff.submodule�: „%s�"
+
+#: diff.c:470
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Znaleziono błędy w zmiennej konfiguracji „diff.dirstat�:\n"
+"%s"
+
+#: diff.c:4276
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "zewnętrzny diff padł, zatrzymano na %s"
+
+#: diff.c:4628
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check i -s siÄ™ wykluczajÄ…"
+
+#: diff.c:4631
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S i --find-object siÄ™ wykluczajÄ…"
+
+#: diff.c:4710
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow wymaga dokładnie jednej ścieżki"
+
+#: diff.c:4758
+#, 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
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s oczekuje wartości liczbowej"
+
+#: diff.c:4795
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Nie można przetworzyć parametru opcji --dirstat/-X:\n"
+"%s"
+
+#: diff.c:4880
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "nieznana klasa zmian „%c� w --diff-filter=%s"
+
+#: diff.c:4904
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "nieznana wartość po ws-error-highlight=%.*s"
+
+#: diff.c:4918
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "nie można rozwiązać „%s�"
+
+#: diff.c:4968 diff.c:4974
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s oczekuje postaci <n>/<m>"
+
+#: diff.c:4986
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s oczekuje znaku, otrzymano „%s�"
+
+#: diff.c:5007
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "zły argument --color-moved: %s"
+
+#: diff.c:5026
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "nieprawidłowy tryb „%s� w --color-moved-ws"
+
+#: diff.c:5066
+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
+#, c-format
+msgid "invalid argument to %s"
+msgstr "nieprawidłowy argument do %s"
+
+#: diff.c:5226
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "w -I podano nieprawidłowe wyrażenie regularne: „%s�"
+
+#: diff.c:5275
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "nie można przetworzyć parametru opcji --submodule: „%s�"
+
+#: diff.c:5331
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "zły argument --word-diff: %s"
+
+#: diff.c:5367
+msgid "Diff output format options"
+msgstr "Opcje formatu wyjściowego różnic"
+
+#: diff.c:5369 diff.c:5375
+msgid "generate patch"
+msgstr "wygeneruj Å‚atkÄ™"
+
+#: diff.c:5372 builtin/log.c:179
+msgid "suppress diff output"
+msgstr "nie wypisuj różnic"
+
+#: diff.c:5377 diff.c:5491 diff.c:5498
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5378 diff.c:5381
+msgid "generate diffs with <n> lines context"
+msgstr "wygeneruj różnice z <n> wierszami kontekstu"
+
+#: diff.c:5383
+msgid "generate the diff in raw format"
+msgstr "wygeneruj różnice w surowym formacie"
+
+#: diff.c:5386
+msgid "synonym for '-p --raw'"
+msgstr "synonim do „-p --raw�"
+
+#: diff.c:5390
+msgid "synonym for '-p --stat'"
+msgstr "synonim do „-p --stat�"
+
+#: diff.c:5394
+msgid "machine friendly --stat"
+msgstr "--stat czytelne dla maszyny"
+
+#: diff.c:5397
+msgid "output only the last line of --stat"
+msgstr "wypisz tylko ostatni wiersz --stat"
+
+#: diff.c:5399 diff.c:5407
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+#: diff.c:5400
+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
+msgid "synonym for --dirstat=cumulative"
+msgstr "zamiennik na --dirstat=cumulative"
+
+#: diff.c:5408
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "synonim do --dirstat=files,param1,param2..."
+
+#: diff.c:5412
+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
+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
+msgid "show only names of changed files"
+msgstr "pokazuj tylko nazwy zmienionych plików"
+
+#: diff.c:5421
+msgid "show only names and status of changed files"
+msgstr "pokazuj tylko nazwy i stan zmienionych plików"
+
+#: diff.c:5423
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<szerokość>[,<szerokość-nazwy>[,<liczba>]]"
+
+#: diff.c:5424
+msgid "generate diffstat"
+msgstr "wygeneruj statystyki różnic"
+
+#: diff.c:5426 diff.c:5429 diff.c:5432
+msgid "<width>"
+msgstr "<szerokość>"
+
+#: diff.c:5427
+msgid "generate diffstat with a given width"
+msgstr "wygeneruj statystyki różnic o podanej szerokości"
+
+#: diff.c:5430
+msgid "generate diffstat with a given name width"
+msgstr "wygeneruj statystyki różnic o podanej szerokości nazw"
+
+#: diff.c:5433
+msgid "generate diffstat with a given graph width"
+msgstr "wygeneruj statystyki różnic o podanej szerokości grafu"
+
+#: diff.c:5435
+msgid "<count>"
+msgstr "<liczba>"
+
+#: diff.c:5436
+msgid "generate diffstat with limited lines"
+msgstr "wygeneruj statystyki różnic o ograniczonych wierszach"
+
+#: diff.c:5439
+msgid "generate compact summary in diffstat"
+msgstr "wygeneruj zwięzłe podsumowanie w statystykach różnic"
+
+#: diff.c:5442
+msgid "output a binary diff that can be applied"
+msgstr "wypisz binarne różnice, które mogą być zastosowane"
+
+#: diff.c:5445
+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
+msgid "show colored diff"
+msgstr "pokaż kolorowe różnice"
+
+#: diff.c:5448
+msgid "<kind>"
+msgstr "<rodzaj>"
+
+#: diff.c:5449
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+"podświetl błędy białych znaków w rodzaju wierszy różnic: „context�, „old� "
+"lub „new�"
+
+#: diff.c:5452
+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
+msgid "<prefix>"
+msgstr "<prefiks>"
+
+#: diff.c:5456
+msgid "show the given source prefix instead of \"a/\""
+msgstr "pokaż podany prefiks źródła zamiast „a/�"
+
+#: diff.c:5459
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "pokaż podany prefiks celu zamiast „b/�"
+
+#: diff.c:5462
+msgid "prepend an additional prefix to every line of output"
+msgstr "dodatkowy prefiks do dodania przed każdym wierszem wyjścia"
+
+#: diff.c:5465
+msgid "do not show any source or destination prefix"
+msgstr "nie pokazuj żadnego prefiksu źródła ani celu"
+
+#: diff.c:5468
+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
+msgid "<char>"
+msgstr "<znak>"
+
+#: diff.c:5473
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "podaj znak wskazujący nowy wiersz zamiast „+�"
+
+#: diff.c:5478
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "podaj znak wskazujący stary wiersz zamiast „-�"
+
+#: diff.c:5483
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "podaj znak wskazujący kontekst zamiast odstępu „ �"
+
+#: diff.c:5486
+msgid "Diff rename options"
+msgstr "Opcje zmiany nazw różnic"
+
+#: diff.c:5487
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5488
+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
+msgid "detect renames"
+msgstr "wykrywaj zmiany nazw"
+
+#: diff.c:5496
+msgid "omit the preimage for deletes"
+msgstr "omiń wstępny obraz przy usunięciach"
+
+#: diff.c:5499
+msgid "detect copies"
+msgstr "wykrywaj kopie"
+
+#: diff.c:5503
+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
+msgid "disable rename detection"
+msgstr "wyłącz wykrywanie zmian nazw"
+
+#: diff.c:5508
+msgid "use empty blobs as rename source"
+msgstr "użyj pustych blobów jako źródła zmiany nazwy"
+
+#: diff.c:5510
+msgid "continue listing the history of a file beyond renames"
+msgstr "kontynuuj wypisywanie historii pliku poza zmianami nazw"
+
+#: diff.c:5513
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+"powstrzymaj wykrywanie zmian nazw i kopii, jeśli liczba zmian nazw / kopii "
+"przekracza podanÄ… granicÄ™"
+
+#: diff.c:5515
+msgid "Diff algorithm options"
+msgstr "Opcje algorytmu różnic"
+
+#: diff.c:5517
+msgid "produce the smallest possible diff"
+msgstr "wyprodukuj najmniejsze możliwe różnice"
+
+#: diff.c:5520
+msgid "ignore whitespace when comparing lines"
+msgstr "ignoruj zmiany w białych znakach przy porównywaniu plików"
+
+#: diff.c:5523
+msgid "ignore changes in amount of whitespace"
+msgstr "ignoruj zmiany w liczbie białych znaków"
+
+#: diff.c:5526
+msgid "ignore changes in whitespace at EOL"
+msgstr "ignoruj zmiany w białych znakach na końcu wiersza"
+
+#: diff.c:5529
+msgid "ignore carrier-return at the end of line"
+msgstr "ignoruj powrót karetki (CR) na końcu wiersza"
+
+#: diff.c:5532
+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
+msgid "<regex>"
+msgstr "<wyr-reg>"
+
+#: diff.c:5535
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignoruj zmiany, których wszystkie wiersze pasują do <wyr-reg>"
+
+#: diff.c:5538
+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
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "wygeneruj różnice używając algorytmu „cierpliwych różnic�"
+
+#: diff.c:5545
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "wygeneruj różnice używając algorytmu „histogramu różnic�"
+
+#: diff.c:5547
+msgid "<algorithm>"
+msgstr "<algorytm>"
+
+#: diff.c:5548
+msgid "choose a diff algorithm"
+msgstr "wybierz algorytm różnic"
+
+#: diff.c:5550
+msgid "<text>"
+msgstr "<tekst>"
+
+#: diff.c:5551
+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
+msgid "<mode>"
+msgstr "<tryb>"
+
+#: diff.c:5554
+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
+msgid "use <regex> to decide what a word is"
+msgstr "użyj <wyr-reg>, aby zdecydować, czym jest słowo"
+
+#: diff.c:5560
+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
+msgid "moved lines of code are colored differently"
+msgstr "przeniesione wiersze kodu sÄ… kolorowane inaczej"
+
+#: diff.c:5566
+msgid "how white spaces are ignored in --color-moved"
+msgstr "jak są ignorowane białe znaki w --color-moved"
+
+#: diff.c:5569
+msgid "Other diff options"
+msgstr "Inne opcje różnic"
+
+#: diff.c:5571
+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
+msgid "treat all files as text"
+msgstr "traktuj wszystkie pliki jako tekstowe"
+
+#: diff.c:5577
+msgid "swap two inputs, reverse the diff"
+msgstr "zamień dwa wejścia, odwróć różnice"
+
+#: diff.c:5579
+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
+msgid "disable all output of the program"
+msgstr "wyłącz całe wyjście programu"
+
+#: diff.c:5583
+msgid "allow an external diff helper to be executed"
+msgstr "pozwól wykonać zewnętrzny pomocnik różnic"
+
+#: diff.c:5585
+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
+msgid "<when>"
+msgstr "<kiedy>"
+
+#: diff.c:5588
+msgid "ignore changes to submodules in the diff generation"
+msgstr "ignoruj zmiany w pod-modułach przy generowaniu różnic"
+
+#: diff.c:5591
+msgid "<format>"
+msgstr "<format>"
+
+#: diff.c:5592
+msgid "specify how differences in submodules are shown"
+msgstr "podaj, jak będą pokazywane różnice w pod-modułach"
+
+#: diff.c:5596
+msgid "hide 'git add -N' entries from the index"
+msgstr "ukryj elementy „git add -N� z indeksu"
+
+#: diff.c:5599
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "traktuj elementy „git add -N� jako prawdziwe w indeksie"
+
+#: diff.c:5601
+msgid "<string>"
+msgstr "<łańcuch>"
+
+#: diff.c:5602
+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
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+"szukaj różnic, które zmieniają liczbę wystąpień podanego wyrażenia "
+"regularnego"
+
+#: diff.c:5608
+msgid "show all changes in the changeset with -S or -G"
+msgstr "pokaż wszystkie zmiany w zestawie z -S lub -G"
+
+#: diff.c:5611
+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
+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
+msgid "<path>"
+msgstr "<ścieżka>"
+
+#: diff.c:5616
+msgid "show the change in the specified path first"
+msgstr "pokaż najpierw zmianę w podanej ścieżce"
+
+#: diff.c:5619
+msgid "skip the output to the specified path"
+msgstr "pomiń wyjście do podanej ścieżki"
+
+#: diff.c:5621
+msgid "<object-id>"
+msgstr "<id-obiektu>"
+
+#: diff.c:5622
+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
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5625
+msgid "select files by diff type"
+msgstr "wybierz pliki według rodzaju różnic"
+
+#: diff.c:5627
+msgid "<file>"
+msgstr "<plik>"
+
+#: diff.c:5628
+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."
+msgstr ""
+"pominięto wykrywanie niedokładnych zmian nazw z powodu zbyt wielu plików."
+
+#: diff.c:6288
+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
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"możesz chcieć ustawić zmienną %s na przynajmniej %d i ponowić polecenie."
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "nie można odczytać pliku kolejności „%s�"
+
+#: diffcore-rename.c:555
+msgid "Performing inexact rename detection"
+msgstr "Wykrywanie niedokładnych zmian nazw"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "W różnicy nie ma ścieżki „%s�"
+
+#: dir.c:578
+#, 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
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "nierozpoznany wzorzec: %s"
+
+#: dir.c:777 dir.c:791
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "nierozpoznany antywzorzec: „%s�"
+
+#: dir.c:809
+#, 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
+msgid "disabling cone pattern matching"
+msgstr "wyłączanie stożkowego dopasowania wzorca"
+
+#: dir.c:1198
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "nie można użyć %s jako pliku wyłączeń"
+
+#: dir.c:2305
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "nie można otworzyć katalogu „%s�"
+
+#: dir.c:2605
+msgid "failed to get kernel name and information"
+msgstr "nie można uzyskać nazwy i informacji jądra"
+
+#: dir.c:2729
+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
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "uszkodzony plik indeksu w repozytorium %s"
+
+#: dir.c:3582 dir.c:3587
+#, c-format
+msgid "could not create directories for %s"
+msgstr "nie można utworzyć katalogów dla %s"
+
+#: dir.c:3616
+#, 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
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "wskazówka: Czekanie, aż edytor zamknie plik...%c"
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr "Filtrowanie zawartości"
+
+#: entry.c:478
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "nie można wykonać stat na pliku „%s�"
+
+#: environment.c:152
+#, 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
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: oczekiwano listy shallow"
+
+#: fetch-pack.c:180
+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
+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
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack: oczekiwano ACK/NAK, otrzymano „%s�"
+
+#: fetch-pack.c:222
+msgid "unable to write to remote"
+msgstr "nie można pisać do zdalnego repozytorium"
+
+#: fetch-pack.c:283
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc wymaga multi_ack_detailed"
+
+#: fetch-pack.c:378 fetch-pack.c:1400
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "nieprawidłowy wiersz shallow: %s"
+
+#: fetch-pack.c:384 fetch-pack.c:1406
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "nieprawidłowy wiersz unshallow: %s"
+
+#: fetch-pack.c:386 fetch-pack.c:1408
+#, c-format
+msgid "object not found: %s"
+msgstr "nie znaleziono obiektu: %s"
+
+#: fetch-pack.c:389 fetch-pack.c:1411
+#, c-format
+msgid "error in object: %s"
+msgstr "błąd w obiekcie: %s"
+
+#: fetch-pack.c:391 fetch-pack.c:1413
+#, c-format
+msgid "no shallow found: %s"
+msgstr "nie znaleziono shallow: %s"
+
+#: fetch-pack.c:394 fetch-pack.c:1417
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "oczekiwano shallow/unshallow, otrzymano %s"
+
+#: fetch-pack.c:434
+#, c-format
+msgid "got %s %d %s"
+msgstr "dostałem %s %d %s"
+
+#: fetch-pack.c:451
+#, c-format
+msgid "invalid commit %s"
+msgstr "nieprawidłowy zapis %s"
+
+#: fetch-pack.c:482
+msgid "giving up"
+msgstr "poddajÄ™ siÄ™"
+
+#: fetch-pack.c:495 progress.c:339
+msgid "done"
+msgstr "gotowe"
+
+#: fetch-pack.c:507
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "dostałem %s (%d) %s"
+
+#: fetch-pack.c:543
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Oznaczam %s jako gotowe"
+
+#: fetch-pack.c:758
+#, c-format
+msgid "already have %s (%s)"
+msgstr "już mam %s (%s)"
+
+#: fetch-pack.c:821
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: nie można uruchomić rozdzielania pasma bocznego"
+
+#: fetch-pack.c:829
+msgid "protocol error: bad pack header"
+msgstr "błąd protokołu: zły nagłówek paczki"
+
+#: fetch-pack.c:913
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: nie można uruchomić %s"
+
+#: fetch-pack.c:931
+#, c-format
+msgid "%s failed"
+msgstr "%s nie powiodło się"
+
+#: fetch-pack.c:933
+msgid "error in sideband demultiplexer"
+msgstr "błąd rozdzielania pasma bocznego"
+
+#: fetch-pack.c:976
+#, 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
+#, c-format
+msgid "Server supports %s"
+msgstr "Serwer wspiera %s"
+
+#: fetch-pack.c:986
+msgid "Server does not support shallow clients"
+msgstr "Serwer nie wspiera płytkich klientów"
+
+#: fetch-pack.c:1046
+msgid "Server does not support --shallow-since"
+msgstr "Serwer nie wspiera --shallow-since"
+
+#: fetch-pack.c:1051
+msgid "Server does not support --shallow-exclude"
+msgstr "Serwer nie wspiera --shallow-exclude"
+
+#: fetch-pack.c:1055
+msgid "Server does not support --deepen"
+msgstr "Serwer nie wspiera --deepen"
+
+#: fetch-pack.c:1057
+msgid "Server does not support this repository's object format"
+msgstr "Serwer nie wspiera formatu obiektów z tego repozytorium"
+
+#: fetch-pack.c:1070
+msgid "no common commits"
+msgstr "brak wspólnych zapisów"
+
+#: fetch-pack.c:1082 fetch-pack.c:1622
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: pobieranie nie powiodło się."
+
+#: fetch-pack.c:1208
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "niezgodne algorytmy: klient %s; serwer %s"
+
+#: fetch-pack.c:1212
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "serwer nie wspiera algorytmu „%s�"
+
+#: fetch-pack.c:1232
+msgid "Server does not support shallow requests"
+msgstr "Serwer nie wspiera płytkich żądań"
+
+#: fetch-pack.c:1239
+msgid "Server supports filter"
+msgstr "Serwer wspiera filtrowanie"
+
+#: fetch-pack.c:1278
+msgid "unable to write request to remote"
+msgstr "nie można pisać żądania do zdalnej maszyny"
+
+#: fetch-pack.c:1296
+#, c-format
+msgid "error reading section header '%s'"
+msgstr "błąd odczytu nagłówka rozdziału „%s�"
+
+#: fetch-pack.c:1302
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "oczekiwano „%s�, odebrano „%s�"
+
+#: fetch-pack.c:1363
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "nieoczekiwany wiersz potwierdzenia: „%s�"
+
+#: fetch-pack.c:1368
+#, c-format
+msgid "error processing acks: %d"
+msgstr "błąd przetwarzania potwierdzeń: %d"
+
+#: fetch-pack.c:1378
+msgid "expected packfile to be sent after 'ready'"
+msgstr "oczekiwano pliku paczki wysłanego po „ready�"
+
+#: fetch-pack.c:1380
+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
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "błąd przetwarzania płytkich informacji: %d"
+
+#: fetch-pack.c:1469
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "oczekiwano wanted-ref, otrzymano %s"
+
+#: fetch-pack.c:1474
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "nieoczekiwana wanted-ref: „%s�"
+
+#: fetch-pack.c:1479
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "błąd przetwarzania chcianych referencji: %d"
+
+#: fetch-pack.c:1509
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: oczekiwano pakietu końca odpowiedzi"
+
+#: fetch-pack.c:1891
+msgid "no matching remote head"
+msgstr "brak pasującego zdalnego czoła"
+
+#: fetch-pack.c:1914 builtin/clone.c:693
+msgid "remote did not send all necessary objects"
+msgstr "zdalna maszyna nie przysłała wszystkich potrzebnych obiektów"
+
+#: fetch-pack.c:1941
+#, c-format
+msgid "no such remote ref %s"
+msgstr "nie ma takiej zdalnej referencji %s"
+
+#: fetch-pack.c:1944
+#, 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
+msgid "could not create temporary file"
+msgstr "nie można utworzyć pliku tymczasowego"
+
+#: gpg-interface.c:276
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "nie można zapisać oddzielonego podpisu do „%s�"
+
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg nie może podpisać danych"
+
+#: graph.c:98
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "ignoruj nieprawidłowy kolor „%.*s� w log.graphColors"
+
+#: grep.c:543
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"podany wzorzec zawiera znak NUL (przez -f <plik>). To jest wspierane tylko z "
+"-P pod PCRE v2"
+
+#: grep.c:1906
+#, 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
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "nie można wykonać stat na „%s�'"
+
+#: grep.c:1934
+#, c-format
+msgid "'%s': short read"
+msgstr "„%s�: przeczytano mniej niż powinno być"
+
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "przyszykuj obszar do pracy (zobacz też: git help tutorial)"
+
+#: help.c:24
+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
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "badaj historię i stan (zobacz też: git help revisions)"
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "poszerzaj, oznaczaj i dostosowuj wspólną historię"
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "współpracuj (zobacz też: git help workflows)"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "Główne porcelanowe polecenia"
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "Polecenia pomocnicze / manipulatory"
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "Polecenia pomocnicze / odpytywanie"
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "Interakcje z innymi"
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "Polecenia niskopoziomowe / manipulatory"
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "Polecenia niskopoziomowe / odpytywanie"
+
+#: help.c:37
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Polecenia niskopoziomowe / synchronizacja repozytoriów"
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Polecenia niskopoziomowe / wewnętrzne pomocniki"
+
+#: help.c:300
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "dostępne polecenia gita w „%s�"
+
+#: help.c:307
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "polecenia gita dostępne gdzie indziej w ścieżce $PATH"
+
+#: help.c:316
+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
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "nieobsługiwany rodzaj spisu poleceń „%s�"
+
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Podręczniki pojęć Gita to:"
+
+#: help.c:429
+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
+msgid "External commands"
+msgstr "Zewnętrzne polecenia"
+
+#: help.c:449
+msgid "Command aliases"
+msgstr "Skróty poleceń"
+
+#: help.c:527
+#, 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� 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
+#, 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
+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
+#, 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
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Zakładam dalej, że chodziło o „%s�."
+
+#: help.c:623
+#, 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
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Najpodobniejsze polecenie to"
+msgstr[1] ""
+"\n"
+"Najpodobniejsze polecenia to"
+msgstr[2] ""
+"\n"
+"Najpodobniejsze polecenia to"
+
+#: help.c:675
+msgid "git version [<options>]"
+msgstr "git version [<opcje>]"
+
+#: help.c:730
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s — %s"
+
+#: help.c:734
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Czy chodziło o to?"
+msgstr[1] ""
+"\n"
+"Czy chodziło o któreś z tych?"
+msgstr[2] ""
+"\n"
+"Czy chodziło o któreś z tych?"
+
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Nieznana tożsamość autora\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Nieznana tożsamość składającego\n"
+
+#: ident.c:362
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Powiedz mi, kim jesteÅ›.\n"
+"\n"
+"Wykonaj\n"
+"\n"
+"  git config --global user.email \"toja@example.com\"\n"
+"  git config --global user.name \"Twoje ImiÄ™ Nazwisko\"\n"
+"\n"
+"by ustawić domyślną tożsamość swojego konta.\n"
+"Pomiń --global, żeby ustawić tożsamość tylko w tym repozytorium.\n"
+"\n"
+
+#: ident.c:397
+msgid "no email was given and auto-detection is disabled"
+msgstr "nie podano adresu e-mail, a automatyczne wykrywanie jest wyłączone"
+
+#: ident.c:402
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "nie można wykryć automatycznie adresu e-mail (otrzymano „%s�)"
+
+#: ident.c:419
+msgid "no name was given and auto-detection is disabled"
+msgstr "nie podano nazwiska, a automatyczne wykrywanie jest wyłączone"
+
+#: ident.c:425
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "nie można wykryć nazwy (otrzymano „%s�)"
+
+#: ident.c:433
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "puste nazwisko (do <%s>) niedozwolone"
+
+#: ident.c:439
+#, c-format
+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
+#, c-format
+msgid "invalid date format: %s"
+msgstr "nieprawidłowy format daty: %s"
+
+#: list-objects-filter-options.c:81
+msgid "expected 'tree:<depth>'"
+msgstr "oczekiwano „tree:<głębokość>�"
+
+#: list-objects-filter-options.c:96
+msgid "sparse:path filters support has been dropped"
+msgstr "wsparcie filtrów sparse:path zostało porzucone"
+
+#: list-objects-filter-options.c:109
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "nieprawidłowy filtr: %s"
+
+#: list-objects-filter-options.c:125
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "trzeba zacytować znak w podfiltrze: „%c�"
+
+#: list-objects-filter-options.c:167
+msgid "expected something after combine:"
+msgstr "oczekiwano czegoÅ› po combine:"
+
+#: list-objects-filter-options.c:249
+msgid "multiple filter-specs cannot be combined"
+msgstr "nie można łączyć podania wielu filtrów"
+
+#: list-objects-filter-options.c:361
+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
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "brak dostępu do rzadkiego bloba w „%s�"
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "nie można przetworzyć danych rzadkiego filtra w %s"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "element „%s� drzewa %s ma tryb drzewa, ale nie jest drzewem"
+
+#: list-objects.c:140
+#, c-format
+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
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "nie można wczytać drzewa korzenia dla zapisu %s"
+
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"Nie można utworzyć „%s.lock�: %s.\n"
+"\n"
+"Inny proces gita wydaje się działać na tym repozytorium, np.\n"
+"edytor otwarty przez „git commit�.  Upewnij się, że wszystkie procesy\n"
+"są zakończone i spróbuj ponownie.  Jeśli nadal się nie uda, proces\n"
+"gita mógł się wcześniej zepsuć w tym repozytorium:\n"
+"usuń ten plik ręcznie, aby kontynuować."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "Nie można utworzyć „%s.lock�: %s"
+
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "nieprawidłowa wartość „%s� lsrefs.unborn"
+
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "oczekiwano wypróżnienia po argumentach ls-refs"
+
+#: merge-ort.c:855 merge-recursive.c:1191
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Nie można scalić pod-modułu %s (nie wybrano)"
+
+#: merge-ort.c:864 merge-recursive.c:1198
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Nie można scalić pod-modułu %s (brak zapisów)"
+
+#: merge-ort.c:873 merge-recursive.c:1205
+#, 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)"
+
+#: merge-ort.c:883 merge-ort.c:890
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Uwaga: Przewinięcie pod-modułu %s do %s"
+
+#: merge-ort.c:911
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Nie można scalić pod-modułu %s"
+
+#: merge-ort.c:918
+#, 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"
+"%s\n"
+
+#: merge-ort.c:922 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"
+msgstr ""
+"Jeśli tak ma być, po prostu dodaj go do indeksu, na przykład\n"
+"przez:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"które przyjmie tylko tę sugestię.\n"
+
+#: merge-ort.c:935
+#, 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"
+"%s"
+
+#: merge-ort.c:1094 merge-recursive.c:1341
+msgid "Failed to execute internal merge"
+msgstr "Nie można wykonać wewnętrznego scalenia"
+
+#: merge-ort.c:1099 merge-recursive.c:1346
+#, 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
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Auto-scalanie %s"
+
+#: merge-ort.c:1245 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 ""
+"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
+#, 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 ""
+"KONFLIKT (domyślna zmiana nazwy katalogu): Nie można dopasować więcej niż "
+"jednej ścieżki do %s; domyślna zmiana nazwy próbowała wstawić tam "
+"następujące ścieżki: %s"
+
+#: merge-ort.c:1438
+#, 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 ""
+"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."
+
+#: merge-ort.c:1604 merge-recursive.c:2447
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+msgstr ""
+"Ostrzeżenie: unikam zastosowania zmiany nazwy %s -> %s na %s, bo %s sam "
+"zmienił nazwę."
+
+#: merge-ort.c:1748 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 ""
+"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
+#, c-format
+msgid ""
+"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
+"%s; moving it to %s."
+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
+#, 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 ""
+"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
+#, 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 ""
+"KONFLIKT (położenie pliku): zmieniono nazwę %s na %s 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:1919
+#, 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."
+
+#: merge-ort.c:2014
+#, 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 ""
+"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."
+
+#: merge-ort.c:2033 merge-ort.c:2057
+#, 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."
+
+#: merge-ort.c:2683
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"KONFLIKT (plik/katalog): katalog zawadza %s z %s; zamiast tego przenoszenie "
+"do %s."
+
+#: merge-ort.c:2756
+#, c-format
+msgid ""
+"CONFLICT (distinct types): %s had different types on each side; renamed %s "
+"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."
+
+#: merge-ort.c:2760
+msgid "both"
+msgstr "obu"
+
+#: merge-ort.c:2760
+msgid "one"
+msgstr "jednej"
+
+#: merge-ort.c:2855 merge-recursive.c:3052
+msgid "content"
+msgstr "zawartość"
+
+#: merge-ort.c:2857 merge-recursive.c:3056
+msgid "add/add"
+msgstr "dodano/dodano"
+
+#: merge-ort.c:2859 merge-recursive.c:3101
+msgid "submodule"
+msgstr "pod-moduł"
+
+#: merge-ort.c:2861 merge-recursive.c:3102
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIKT (%s): Konflikt scalania w %s"
+
+#: merge-ort.c:2886
+#, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"KONFLIKT (zmiana/usunięcie): %s usunięto w %s a zmieniono w %s. Wersja %s "
+"pliku %s pozostaje w drzewie."
+
+#. 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
+#, 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
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Twoje lokalne zmiany następujących plików zostaną zastąpione przez "
+"scalenie:\n"
+"  %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Już aktualne!"
+
+#: merge-recursive.c:356
+msgid "(bad commit)\n"
+msgstr "(zły zapis)\n"
+
+#: merge-recursive.c:379
+#, 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
+#, 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
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "nie można utworzyć ścieżki „%s�%s"
+
+#: merge-recursive.c:885
+#, 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
+msgid ": perhaps a D/F conflict?"
+msgstr ": Może konflikt plik/katalog?"
+
+#: merge-recursive.c:908
+#, 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
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "nie można odczytać obiektu %s „%s�"
+
+#: merge-recursive.c:954
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "oczekiwano blobu w %s „%s�"
+
+#: merge-recursive.c:979
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "nie można otworzyć „%s�: %s"
+
+#: merge-recursive.c:990
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "nie można dowiązać „%s�: „%s�"
+
+#: merge-recursive.c:995
+#, 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
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "Przewinięcie pod-modułu %s do następującego zapisu:"
+
+#: merge-recursive.c:1216 merge-recursive.c:1228
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Przewinięcie pod-modułu %s"
+
+#: merge-recursive.c:1251
+#, 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)"
+
+#: merge-recursive.c:1255
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "Nie można scalić pod-modułu %s (nie przewija się)"
+
+#: merge-recursive.c:1256
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "Znaleziono możliwe rozwiązanie scalenia dla pod-modułu:\n"
+
+#: merge-recursive.c:1268
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "Nie można scalić pod-modułu %s (znaleziono wiele scaleń)"
+
+#: merge-recursive.c:1402
+#, 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
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+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
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+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
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+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
+#, 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 ""
+"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
+msgid "rename"
+msgstr "zmiana nazwy"
+
+#: merge-recursive.c:1526
+msgid "renamed"
+msgstr "zmieniono nazwÄ™"
+
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Odmawiam utraty brudnego pliku w %s"
+
+#: merge-recursive.c:1587
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+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
+msgid " (left unresolved)"
+msgstr " (nierozwiÄ…zane)"
+
+#: merge-recursive.c:1805
+#, 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
+#, 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."
+msgstr ""
+"KONFLIKT (podział zmiany nazwy katalogu): Nie ma pewności, gdzie umieścić "
+"%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
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+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
+msgid "modify"
+msgstr "zmiana"
+
+#: merge-recursive.c:3040
+msgid "modified"
+msgstr "zmieniono"
+
+#: merge-recursive.c:3079
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Pominięto %s (scalono tak samo jak istniejące)"
+
+#: merge-recursive.c:3132
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Dodawanie zamiast tego jako %s"
+
+#: merge-recursive.c:3339
+#, c-format
+msgid "Removing %s"
+msgstr "Usuwanie %s"
+
+#: merge-recursive.c:3362
+msgid "file/directory"
+msgstr "plik/katalog"
+
+#: merge-recursive.c:3367
+msgid "directory/file"
+msgstr "katalog/plik"
+
+#: merge-recursive.c:3374
+#, 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
+#, c-format
+msgid "Adding %s"
+msgstr "Dodawanie %s"
+
+#: merge-recursive.c:3392
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "KONFLIKT (dodanie/dodanie): Konflikt scalania w %s"
+
+#: merge-recursive.c:3445
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "nie można scalić drzew %s i %s"
+
+#: merge-recursive.c:3539
+msgid "Merging:"
+msgstr "Scalanie:"
+
+#: merge-recursive.c:3552
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+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
+msgid "merge returned no commit"
+msgstr "scalenie nie zwróciło żadnych zapisów"
+
+#: merge-recursive.c:3758
+#, 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
+msgid "Unable to write index."
+msgstr "Nie można zapisać indeksu."
+
+#: merge.c:41
+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
+msgid "unable to write new index file"
+msgstr "nie można zapisać nowego pliku indeksu"
+
+#: midx.c:80
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "plik indeksu wielu paczek %s jest za mały"
+
+#: midx.c:96
+#, 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
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "nie rozpoznano wersji %d indeksu wielu paczek"
+
+#: midx.c:106
+#, 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
+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
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "w indeksie wielu paczek brakuje wymaganego kawałka fanout OID"
+
+#: midx.c:164
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "w indeksie wielu paczek brakuje wymaganego kawałka odnajdywania OID"
+
+#: midx.c:166
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "w indeksie wielu paczek brakuje wymaganego kawałka przesunięć obiektów"
+
+#: midx.c:180
+#, 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
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "złe pack-int-id: %u (razem %u paczek)"
+
+#: midx.c:273
+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
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "nie można dodać pliku paczki „%s�"
+
+#: midx.c:486
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "nie można otworzyć indeksu paczki „%s�"
+
+#: midx.c:546
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "nie można odnaleźć obiektu %d w pliku paczki"
+
+#: midx.c:846
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Dodawanie plików paczek do indeksu wielu paczek"
+
+#: midx.c:879
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "nie widać pliku paczki %s do porzucenia"
+
+#: midx.c:931
+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:1060
+#, 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
+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
+msgid "Looking for referenced packfiles"
+msgstr "Szukanie wskazywanych plików paczek"
+
+#: midx.c:1139
+#, 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
+msgid "the midx contains no oid"
+msgstr "midx nie zawiera oid"
+
+#: midx.c:1153
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Weryfikowanie zamówienia OID w indeksie wielu paczek"
+
+#: midx.c:1162
+#, 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
+msgid "Sorting objects by packfile"
+msgstr "Sortowanie obiektów według plików paczek"
+
+#: midx.c:1189
+msgid "Verifying object offsets"
+msgstr "Weryfikowanie przesunięć obiektów"
+
+#: midx.c:1205
+#, 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
+#, 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
+#, 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
+msgid "Counting referenced objects"
+msgstr "Zliczanie osiągalnych obiektów"
+
+#: midx.c:1255
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Znajdywanie i usuwanie niewskazywanych plików paczek"
+
+#: midx.c:1446
+msgid "could not start pack-objects"
+msgstr "nie można uruchomić pack-objects"
+
+#: midx.c:1466
+msgid "could not finish pack-objects"
+msgstr "nie można zakończyć pack-objects"
+
+#: name-hash.c:538
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "nie można utworzyć wątku lazy_dir: %s"
+
+#: name-hash.c:560
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "nie można utworzyć wątku lazy_name: %s"
+
+#: name-hash.c:566
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "nie można dołączyć do wątku 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."
+msgstr ""
+"Nie zwieńczono poprzedniego scalania uwag (%s istnieje).\n"
+"Użyj „git notes merge --commit� lub „git notes merge --abort�, aby złożyć/"
+"przerwać poprzednie scalenie zanim zaczniesz nowe."
+
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Nie zwieńczono scalania uwag (%s istnieje)."
+
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "Nie można złożyć niezainicjowanego/niewskazywanego drzewa uwag"
+
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Zła wartość notes.rewriteMode: „%s�"
+
+#: notes-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Odmawiam przepisania uwag w %s (poza 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 "Zła wartość %s: „%s�"
+
+#: object-file.c:480
+#, 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
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "nie można znormalizować ścieżki alternatywnego obiektu: %s"
+
+#: object-file.c:603
+#, 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
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "nie można znormalizować katalogu obiektu: %s"
+
+#: object-file.c:653
+msgid "unable to fdopen alternates lockfile"
+msgstr "nie można wykonać fdopen na pliku blokady alternatywnych obiektów"
+
+#: object-file.c:671
+msgid "unable to read alternates file"
+msgstr "nie można odczytać pliku alternatywnych obiektów"
+
+#: object-file.c:678
+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
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "ścieżka „%s� nie istnieje"
+
+#: object-file.c:734
+#, 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
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "repozytorium odniesienia „%s� nie jest lokalnym repozytorium."
+
+#: object-file.c:746
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "repozytorium odniesienia „%s� jest płytkie"
+
+#: object-file.c:754
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "repozytorium odniesienia „%s� jest szczepione"
+
+#: object-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "błędny wiersz przy przetwarzaniu alternatywnych referencji: %s"
+
+#: object-file.c:964
+#, 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:1149
+#, c-format
+msgid "object file %s is empty"
+msgstr "plik obiektu %s jest pusty"
+
+#: object-file.c:1284 object-file.c:2477
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "uszkodzony wolny obiekt „%s�"
+
+#: object-file.c:1286 object-file.c:2481
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "śmieci na końcu wolnego obiektu „%s�"
+
+#: object-file.c:1328
+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
+#, 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
+#, c-format
+msgid "unable to parse %s header"
+msgstr "nie można przetworzyć nagłówka %s"
+
+#: object-file.c:1651
+#, c-format
+msgid "failed to read object %s"
+msgstr "nie można odczytać obiektu %s"
+
+#: object-file.c:1655
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "nie znaleziono zastępstwa %s dla %s"
+
+#: object-file.c:1659
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "wolny obiekt %s (przechowywany w %s) jest uszkodzony"
+
+#: object-file.c:1663
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "spakowany obiekt %s (przechowywany w %s) jest uszkodzony"
+
+#: object-file.c:1768
+#, c-format
+msgid "unable to write file %s"
+msgstr "nie można zapisać pliku %s"
+
+#: object-file.c:1775
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "nie można ustawić uprawnień na „%s�"
+
+#: object-file.c:1782
+msgid "file write error"
+msgstr "błąd zapisu pliku"
+
+#: object-file.c:1802
+msgid "error when closing loose object file"
+msgstr "błąd podczas zamykania pliku wolnego obiektu"
+
+#: object-file.c:1867
+#, 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
+msgid "unable to create temporary file"
+msgstr "nie można utworzyć tymczasowego pliku"
+
+#: object-file.c:1893
+msgid "unable to write loose object file"
+msgstr "nie można zapisać pliku wolnego obiektu"
+
+#: object-file.c:1899
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "nie można skompresować nowego obiektu %s (%d)"
+
+#: object-file.c:1903
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "deflateEnd w obiekcie %s nie powiodło się (%d)"
+
+#: object-file.c:1907
+#, 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
+#, c-format
+msgid "failed utime() on %s"
+msgstr "nie można wykonać utime() na %s"
+
+#: object-file.c:1994
+#, c-format
+msgid "cannot read object for %s"
+msgstr "nie można odczytać obiektu do %s"
+
+#: object-file.c:2045
+msgid "corrupt commit"
+msgstr "uszkodzony zapis"
+
+#: object-file.c:2053
+msgid "corrupt tag"
+msgstr "uszkodzony tag"
+
+#: object-file.c:2153
+#, c-format
+msgid "read error while indexing %s"
+msgstr "błąd odczytu podczas indeksowania %s"
+
+#: object-file.c:2156
+#, c-format
+msgid "short read while indexing %s"
+msgstr "przeczytano mniej niż oczekiwano przy indeksowaniu %s"
+
+#: object-file.c:2229 object-file.c:2239
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: nie można wstawić do bazy danych"
+
+#: object-file.c:2245
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: niewspierany typ pliku"
+
+#: object-file.c:2269
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s nie jest prawidłowym obiektem"
+
+#: object-file.c:2271
+#, 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
+#, c-format
+msgid "unable to open %s"
+msgstr "nie można otworzyć %s"
+
+#: object-file.c:2488 object-file.c:2541
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "niezgodne skróty %s (oczekiwano %s)"
+
+#: object-file.c:2512
+#, c-format
+msgid "unable to mmap %s"
+msgstr "nie można wykonać mmap %s"
+
+#: object-file.c:2517
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "nie można rozpakować nagłówka %s"
+
+#: object-file.c:2523
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "nie można przetworzyć nagłówka %s"
+
+#: object-file.c:2534
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "nie można rozpakować zawartości %s"
+
+#: object-name.c:486
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "krótki identyfikator %s jest niejednoznaczny"
+
+#: object-name.c:497
+msgid "The candidates are:"
+msgstr "Kandydaci to:"
+
+#: object-name.c:796
+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 ""
+"Git normalnie nigdy nie tworzy referencji kończącej się czterdziestoma\n"
+"heksadecymalnymi znakami, bo byłyby ignorowane zawsze, gdy podasz\n"
+"tylko tych czterdzieści znaków. Te referencje mogą być utworzone przez\n"
+"pomyłkę.  Na przykład\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"gdzie „$br� jakoś okazuje się puste i tworzona jest taka nietypowa "
+"referencja.\n"
+"Sprawdź te referencje i może je usuń. Wyłącz ten komunikat za pomocą\n"
+"„git config advice.objectNameWarning false�"
+
+#: object-name.c:916
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "dziennik „%.*s� sięga tylko %s"
+
+#: object-name.c:924
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "dziennik „%.*s� ma tylko %d wpisów"
+
+#: object-name.c:1702
+#, 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
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"ścieżka „%s� istnieje, ale nie „%s�\n"
+"wskazówka: Czy chodziło o „%.*s:%s� czyli „%.*s:./%s�?"
+
+#: object-name.c:1717
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "ścieżka „%s� nie istnieje w „%.*s�"
+
+#: object-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 ""
+"ścieżka „%s� jest w indeksie, ale nie na etapie %d\n"
+"wskazówka: Czy chodziło o „:%d:%s�?"
+
+#: object-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 ""
+"ś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
+#, 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
+#, 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
+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"
+
+#: object-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "nieprawidłowa nazwa obiektu: „%.*s�."
+
+#: object.c:53
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "nieprawidłowy rodzaj obiektu „%s�"
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "obiekt %s to %s, nie %s"
+
+#: object.c:233
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "obiekt %s ma nieznany identyfikator rodzaju %d"
+
+#: object.c:246
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "nie można przetworzyć obiektu: %s"
+
+#: object.c:266 object.c:278
+#, c-format
+msgid "hash mismatch %s"
+msgstr "niezgodne skróty %s"
+
+#: pack-bitmap.c:843 pack-bitmap.c:849 builtin/pack-objects.c:2226
+#, 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
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "nie można uzyskać użycia dysku %s"
+
+#: pack-revindex.c:220
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "plik odwrotnego indeksu %s jest za mały"
+
+#: pack-revindex.c:225
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "plik odwrotnego indeksu %s jest uszkodzony"
+
+#: pack-revindex.c:233
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "plik odwrotnego indeksu %s ma nieznanÄ… sygnaturÄ™"
+
+#: pack-revindex.c:237
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "plik odwrotnego indeksu %s ma niewspieranÄ… wersjÄ™ %<PRIu32>"
+
+#: pack-revindex.c:242
+#, 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
+msgid "cannot both write and verify reverse index"
+msgstr "nie można i zapisać, i sprawdzić odwrotnego indeksu"
+
+#: pack-write.c:257
+#, c-format
+msgid "could not stat: %s"
+msgstr "nie można wykonać stat: %s"
+
+#: pack-write.c:269
+#, c-format
+msgid "failed to make %s readable"
+msgstr "nie można dodać praw do odczytu %s"
+
+#: pack-write.c:502
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "nie można pisać do obiecującego pliku „%s�"
+
+#: packfile.c:625
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "pozycja przed końcem pliku paczki (zepsuty .idx?)"
+
+#: packfile.c:1934
+#, 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
+#, 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
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "opcja „%s� oczekuje wartości liczbowej"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "nieprawidłowa data wygaśnięcia „%s�"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr "opcja „%s� oczekuje „always�, „auto� lub „never�"
+
+#: parse-options-cb.c:132 parse-options-cb.c:149
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nieprawidłowa nazwa obiektu „%s�"
+
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s wymaga wartości"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s i %s siÄ™ wykluczajÄ…"
+
+#: parse-options.c:78
+#, 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
+#, c-format
+msgid "%s takes no value"
+msgstr "%s nie przyjmuje wartości"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s niedostępny"
+
+#: parse-options.c:217
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "alias of --%s"
+msgstr "synonim do --%s"
+
+#: parse-options.c:862
+#, c-format
+msgid "unknown option `%s'"
+msgstr "nieznana opcja „%s�"
+
+#: parse-options.c:864
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "nieznany przełącznik „%c�"
+
+#: parse-options.c:866
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "nieznana opcja spoza zakresu ASCII w łańcuchu: „%s�"
+
+#: parse-options.c:890
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:909
+#, c-format
+msgid "usage: %s"
+msgstr "użycie: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:915
+#, c-format
+msgid "   or: %s"
+msgstr "   lub: %s"
+
+#: parse-options.c:918
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+#: parse-options.c:957
+msgid "-NUM"
+msgstr "-ILE"
+
+#: path.c:915
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "Nie można pozwolić grupie zapisywać do %s"
+
+#: pathspec.c:130
+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
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Wolno użyć tylko jednego „attr:�."
+
+#: pathspec.c:151
+msgid "attr spec must not be empty"
+msgstr "atrybut nie może być pusty"
+
+#: pathspec.c:194
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "błędna nazwa atrybutu %s"
+
+#: pathspec.c:259
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "globalne ustawienia ścieżek „glob� i „noglob� się wykluczają"
+
+#: pathspec.c:266
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"globalne ustawienia ścieżek „literal� i wszystkie inne globalne wykluczają "
+"siÄ™"
+
+#: pathspec.c:306
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "nieprawidłowy parametr magicznej ścieżki „prefix:�"
+
+#: pathspec.c:327
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Nieprawidłowy magiczny numer ścieżki „%.*s� w „%s�"
+
+#: pathspec.c:332
+#, 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
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Niezaimplementowany magiczny numer ścieżki „%c� w „%s�"
+
+#: pathspec.c:429
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: „literal� i „glob� się wykluczają"
+
+#: pathspec.c:445
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: „%s� jest poza repozytorium w „%s�"
+
+#: pathspec.c:521
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (skrót: '%c')"
+
+#: pathspec.c:531
+#, 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
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "ścieżka „%s� przechodzi przez dowiązanie"
+
+#: pathspec.c:643
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "wiersz jest źle zacytowany: %s"
+
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "nie można zapisać pakietu wypróżnienia"
+
+#: pkt-line.c:99
+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"
+
+#: 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
+msgid "protocol error: impossibly long line"
+msgstr "błąd protokołu: niemożliwie długi wiersz"
+
+#: pkt-line.c:169 pkt-line.c:171
+msgid "packet write with format failed"
+msgstr "nie można zapisać pakietu z formatem"
+
+#: pkt-line.c:203
+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:302
+msgid "read error"
+msgstr "błąd odczytu"
+
+#: pkt-line.c:310
+msgid "the remote end hung up unexpectedly"
+msgstr "zdalna maszyna nieoczekiwanie się rozłączyła"
+
+#: pkt-line.c:338
+#, 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
+#, 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
+#, c-format
+msgid "remote error: %s"
+msgstr "błąd serwera: %s"
+
+#: preload-index.c:119
+msgid "Refreshing index"
+msgstr "Odświeżanie indeksu"
+
+#: preload-index.c:138
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "nie można utworzyć wątkowanego lstat: %s"
+
+#: pretty.c:984
+msgid "unable to parse --pretty format"
+msgstr "nie można przetworzyć formatu --pretty"
+
+#: promisor-remote.c:30
+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
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: nie można zapisać do pod-procesu pobierania"
+
+#: promisor-remote.c:41
+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
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "obiecująca zdalna nazwa nie może zaczynać się od „/�: %s"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Usuwanie zduplikowanych obiektów"
+
+#: range-diff.c:78
+msgid "could not start `log`"
+msgstr "nie można uruchomić „log�"
+
+#: range-diff.c:80
+msgid "could not read `log` output"
+msgstr "nie można odczytać wyjścia „log�"
+
+#: range-diff.c:101 sequencer.c:5318
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "nie można przetworzyć zapisu „%s�"
+
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"nie można przetworzyć pierwszego wiersza wyjścia „log�: nie zaczynał się od "
+"„zapis�: „%s�"
+
+#: range-diff.c:140
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "nie można przetworzyć nagłówka gita „%.*s�"
+
+#: range-diff.c:306
+msgid "failed to generate diff"
+msgstr "nie można wygenerować różnic"
+
+#: range-diff.c:558
+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
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "nie można przetworzyć dziennika do „%s�"
+
+#: read-cache.c:682
+#, 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
+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
+#, 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
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "„%s� nie ma wybranego zapisu"
+
+#: read-cache.c:777
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "nie można zaindeksować pliku „%s�"
+
+#: read-cache.c:796
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "nie można dodać „%s� do indeksu"
+
+#: read-cache.c:807
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "nie można wykonać stat na „%s�"
+
+#: read-cache.c:1318
+#, 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
+msgid "Refresh index"
+msgstr "Odśwież indeks"
+
+#: read-cache.c:1639
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"ustawiono index.version, ale wartość jest nieprawidłowa.\n"
+"Używanie wersji %i"
+
+#: read-cache.c:1649
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"ustawiono GIT_INDEX_VERSION, ale wartość jest nieprawidłowa.\n"
+"Używanie wersji %i"
+
+#: read-cache.c:1705
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "zły podpis 0x%08x"
+
+#: read-cache.c:1708
+#, c-format
+msgid "bad index version %d"
+msgstr "zła wersja indeksu %d"
+
+#: read-cache.c:1717
+msgid "bad index file sha1 signature"
+msgstr "zły skrót SHA-1 pliku indeksu"
+
+#: read-cache.c:1747
+#, 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
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "pomijanie rozszerzenia %.4s"
+
+#: read-cache.c:1786
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "nieznany format elementu indeksu 0x%08x"
+
+#: read-cache.c:1802
+#, 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
+msgid "unordered stage entries in index"
+msgstr "nieuporzÄ…dkowane elementy przygotowane w indeksie"
+
+#: read-cache.c:1862
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "wiele elementów w przygotowaniu dla scalonego pliku „%s�"
+
+#: read-cache.c:1865
+#, 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
+msgid "index file corrupt"
+msgstr "uszkodzony plik indeksu"
+
+#: read-cache.c:2115
+#, 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
+#, 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
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: nie można otworzyć pliku indeksu"
+
+#: read-cache.c:2165
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: nie można wykonać stat na otwartym indeksie"
+
+#: read-cache.c:2169
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: plik indeksu mniejszy niż oczekiwano"
+
+#: read-cache.c:2173
+#, c-format
+msgid "%s: unable to map index file"
+msgstr "%s: nie można wykonać mapowania pliku indeksu"
+
+#: read-cache.c:2215
+#, 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
+#, 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
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "nie można odświeżyć wspólnego indeksu „%s�"
+
+#: read-cache.c:2321
+#, 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
+#, c-format
+msgid "could not close '%s'"
+msgstr "nie można zamknąć „%s�"
+
+#: read-cache.c:3120 sequencer.c:2487 sequencer.c:4239
+#, c-format
+msgid "could not stat '%s'"
+msgstr "nie można wykonać stat na „%s�"
+
+#: read-cache.c:3133
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "nie można otworzyć katalogu gita: %s"
+
+#: read-cache.c:3145
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "nie można wykonać unlink: „%s�"
+
+#: read-cache.c:3170
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "nie można naprawić bitów uprawnień w „%s�"
+
+#: read-cache.c:3319
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: nie można zrzucić do etapu nr 0"
+
+#: rebase-interactive.c:11
+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 ""
+"Możesz to naprawić używając „git rebase --edit-todo� i uruchamiając później "
+"„git rebase --continue�.\n"
+"Albo możesz przerwać przestawianie przez „git rebase --abort�.\n"
+
+#: rebase-interactive.c:33
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "nieznane ustawienie %s opcji rebase.missingCommitsCheck. Ignorowanie."
+
+#: rebase-interactive.c:42
+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 <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"
+"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"
+"b, break = zatrzymaj się tu (kontynuuj przestawianie przez „git rebase --"
+"continue�)\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"
+
+#: rebase-interactive.c:63
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+msgid_plural "Rebase %s onto %s (%d commands)"
+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
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"Nie usuwaj żadnego wiersza. Użyj jawnie „drop�, żeby usunąć wpis.\n"
+
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Jeśli usuniesz tutaj wiersz, TEN ZAPIS BĘDZIE STRACONY.\n"
+
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Edytujesz plik z poleceniami trwajÄ…cego interaktywnego przestawienia.\n"
+"Aby kontynuować przestawienie po edycji, wykonaj:\n"
+"    git rebase --continue\n"
+"\n"
+
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"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
+#, 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
+#, c-format
+msgid "could not write '%s'."
+msgstr "nie można pisać do „%s�."
+
+#: rebase-interactive.c:193
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Ostrzeżenie: niektóre zapisy mogły zostać omyłkowo porzucone.\n"
+"Porzucone zapisy (od najnowszych do najstarszych):\n"
+
+#: rebase-interactive.c:200
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Aby uniknąć tego komunikatu, użyj „drop�, aby wyraźnie jawnie usunąć zapis.\n"
+"\n"
+"Użyj „git config rebase.missingCommitsCheck�, aby zmienić poziom ostrzeżeń.\n"
+"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
+#, c-format
+msgid "could not read '%s'."
+msgstr "nie można odczytać „%s�."
+
+#: ref-filter.c:42 wt-status.c:1975
+msgid "gone"
+msgstr "nie ma"
+
+#: ref-filter.c:43
+#, c-format
+msgid "ahead %d"
+msgstr "do przodu %d"
+
+#: ref-filter.c:44
+#, c-format
+msgid "behind %d"
+msgstr "w tyle %d"
+
+#: ref-filter.c:45
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "do przodu %d, w tyle %d"
+
+#: ref-filter.c:169
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "oczekiwany format: %%(color:<kolor>)"
+
+#: ref-filter.c:171
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "nierozpoznany kolor: %%(kolor:%s)"
+
+#: ref-filter.c:193
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Oczekiwano wartości całkowitej refname:lstrip=%s"
+
+#: ref-filter.c:197
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Oczekiwano wartości całkowitej refname:rstrip=%s"
+
+#: ref-filter.c:199
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "nierozpoznany argument %%(%s): %s"
+
+#: ref-filter.c:254
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) nie przyjmuje argumentów"
+
+#: ref-filter.c:276
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "nierozpoznany argument %%(objectsize): %s"
+
+#: ref-filter.c:284
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) nie przyjmuje argumentów"
+
+#: ref-filter.c:296
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) nie przyjmuje argumentów"
+
+#: ref-filter.c:309
+#, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "nierozpoznany argument %%(subject): %s"
+
+#: ref-filter.c:330
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "nieznany argument %%(trailers): %s"
+
+#: ref-filter.c:363
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "oczekiwano wartości dodatniej contents:lines=%s"
+
+#: ref-filter.c:365
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "nierozpoznany argument %%(contents): %s"
+
+#: ref-filter.c:380
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "oczekiwano wartości dodatniej „%s� w %%(%s)"
+
+#: ref-filter.c:384
+#, c-format
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "nierozpoznany argument „%s� w %%(%s)"
+
+#: ref-filter.c:398
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "nierozpoznawana opcja e-mail: %s"
+
+#: ref-filter.c:428
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "oczekiwany format: %%(align:<szerokość>,<pozycja>)"
+
+#: ref-filter.c:440
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "nierozpoznawana pozycja:%s"
+
+#: ref-filter.c:447
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "nierozpoznawana szerokość:%s"
+
+#: ref-filter.c:456
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "nierozpoznany argument %%(align): %s"
+
+#: ref-filter.c:464
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "oczekiwano dodatniej szerokości z atomem %%(align)"
+
+#: ref-filter.c:482
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "nierozpoznany argument %%(if): %s"
+
+#: ref-filter.c:584
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nieprawidłowa nazwa pola %.*s"
+
+#: ref-filter.c:611
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nieznana nazwa pola: %.*s"
+
+#: ref-filter.c:615
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+"to nie jest repozytorium gita, ale pole „%.*s� wymaga dostępu do danych "
+"obiektów"
+
+#: ref-filter.c:739
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "format: atom %%(if) użyty bez atomu %%(then)"
+
+#: ref-filter.c:802
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "format: atom %%(then) użyty bez atomu %%(if)"
+
+#: ref-filter.c:804
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "format: atom %%(then) użyty więcej niż raz"
+
+#: ref-filter.c:806
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "format: atom %%(then) użyty po %%(else)"
+
+#: ref-filter.c:834
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "format: atom %%(else) użyty bez atomu %%(if)"
+
+#: ref-filter.c:836
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "format: atom %%(else) użyty bez atomu %%(then)"
+
+#: ref-filter.c:838
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "format: atom %%(else) użyty więcej niż raz"
+
+#: ref-filter.c:853
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "format: atom %%(end) użyty bez odpowiadającego atomu"
+
+#: ref-filter.c:910
+#, c-format
+msgid "malformed format string %s"
+msgstr "nieprawidłowy format %s"
+
+#: ref-filter.c:1551
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(brak gałęzi, przestawianie %s)"
+
+#: ref-filter.c:1554
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(brak gałęzi, przestawianie odłączonego HEAD %s)"
+
+#: ref-filter.c:1557
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(brak gałęzi, przeszukiwanie rozpoczęte od %s)"
+
+#: ref-filter.c:1561
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD odłączone na %s)"
+
+#: ref-filter.c:1564
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD odłączone od %s)"
+
+#: ref-filter.c:1567
+msgid "(no branch)"
+msgstr "(brak gałęzi)"
+
+#: ref-filter.c:1599 ref-filter.c:1808
+#, c-format
+msgid "missing object %s for %s"
+msgstr "brakujÄ…cy obiekt %s do %s"
+
+#: ref-filter.c:1609
+#, 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
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "uszkodzony obiekt w „%s�"
+
+#: ref-filter.c:2081
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ignorowanie referencji z zepsutÄ… nazwÄ… %s"
+
+#: ref-filter.c:2086 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorowanie zepsutej referencji %s"
+
+#: ref-filter.c:2426
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "format: brakuje atomu %%(end)"
+
+#: ref-filter.c:2525
+#, c-format
+msgid "malformed object name %s"
+msgstr "nieprawidłowa nazwa obiektu %s"
+
+#: ref-filter.c:2530
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "opcja „%s� musi wskazywać na zapis"
+
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s nie wskazuje na prawidłowy obiekt!"
+
+#: 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 ""
+"Użycie „%s� jako nawy początkowej gałęzi. Ta domyślna nazwa gałęzi\n"
+"może się zmienić. Aby ustawić nazwę początkowej gałęzi do użycia we\n"
+"wszystkich nowych repozytoriach, co uciszy ten komunikat, wykonaj:\n"
+"\n"
+"\tgit config --global init.defaultBranch <nazwa>\n"
+"\n"
+"Tradycyjnie było „master�, a inne popularne to „main�, „trunk�\n"
+"i „development�. Nazwę właśnie utworzonej gałęzi można zmienić tym "
+"poleceniem:\n"
+"\n"
+"\tgit branch -m <nazwa>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "nie można odebrać „%s�"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "nieprawidłowa nazwa gałęzi: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorowanie wiszÄ…cej referencji symbolicznej %s"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "dziennik referencji %s ma lukÄ™ po %s"
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "dziennik referencji %s nieoczekiwanie się skończył na %s"
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "dziennik dla %s jest pusty"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "odmawiam zaktualizowania referencji ze złą nazwą „%s�"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref nie powiodło się dla referencji „%s�: %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "wiele aktualizacji referencji „%s� niedozwolone"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "aktualizacje referencji zabronione w środowisku kwarantanny"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "aktualizacje referencji przerwane przez skrypt repozytorium"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "„%s� istnieje; nie można utworzyć „%s�"
+
+#: refs.c:2248 refs.c:2283
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "could not delete references: %s"
+msgstr "nie można usunąć referencji: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "nieprawidłowa referencja „%s�"
+
+#: remote.c:351
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "zdalny skrót konfiguracji nie może zaczynać się od „/�: %s"
+
+#: remote.c:399
+msgid "more than one receivepack given, using the first"
+msgstr "podano więcej niż jedną paczkę odbiorczą, użycie pierwszej"
+
+#: remote.c:407
+msgid "more than one uploadpack given, using the first"
+msgstr "podano więcej niż jedną paczkę nadawczą, użycie pierwszej"
+
+#: remote.c:590
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Nie można pobrać jednocześnie %s i %s do %s"
+
+#: remote.c:594
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s zwykle śledzi %s, nie %s"
+
+#: remote.c:598
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s śledzi jednocześnie %s i %s"
+
+#: remote.c:666
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "klucz „%s� z wzorca nie miał „*�"
+
+#: remote.c:676
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "wartość „%s� z wzorca nie miała „*�"
+
+#: remote.c:1083
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "źródłowa referencja %s nie pasuje do żadnej"
+
+#: remote.c:1088
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "źródłowa ścieżka %s pasuje do więcej niż jednej"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1103
+#, 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"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"Podany cel nie jest pełną nazwą referencji (tj.\n"
+"nie zaczyna się od „refs/�). Próbowaliśmy zgadnąć, o co chodzi:\n"
+"\n"
+"- Szukając referencji pasującej do „%s� po zdalnej stronie.\n"
+"- Sprawdzając, czy wypychane <źródło> („%s�)\n"
+"  jest referencją w „refs/{heads,tags}/�. Jeśli tak, dodajemy odpowiedni\n"
+"  prefiks refs/{heads,tags}/ po zdalnej stronie.\n"
+"\n"
+"Żadne nie zadziałało, więc się poddaliśmy. Musisz uzupełnić pełną postać "
+"referencji."
+
+#: remote.c:1123
+#, 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 ""
+"Część <źródła> referencji jest obiektem zapisu.\n"
+"Czy chodziło o utworzenie nowej gałęzi przez wypchnięcie na\n"
+"„%s:refs/heads/%s�?"
+
+#: remote.c:1128
+#, 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 ""
+"Część <źródła> referencji jest obiektem tagu.\n"
+"Czy chodziło o utworzenie nowego tagu przez wypchnięcie na\n"
+"„%s:refs/tags/%s�?"
+
+#: remote.c:1133
+#, 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 ""
+"Część <źródła> referencji jest obiektem drzewa.\n"
+"Czy chodziło o utworzenie nowego drzewa przez wypchnięcie na\n"
+"„%s:refs/tags/%s�?"
+
+#: remote.c:1138
+#, 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 ""
+"Część <źródła> referencji jest obiektem blobu.\n"
+"Czy chodziło o utworzenie nowego blobu przez wypchnięcie na\n"
+"„%s:refs/tags/%s�?"
+
+#: remote.c:1174
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "nie można rozwiązać %s jako gałęzi"
+
+#: remote.c:1185
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "nie można usunąć „%s�: zdalna referencja nie istnieje"
+
+#: remote.c:1197
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "docelowa referencja %s pasuje do więcej niż jednej"
+
+#: remote.c:1204
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "docelowa referencja %s pobiera z więcej niż jednego źródła"
+
+#: remote.c:1724 remote.c:1825
+msgid "HEAD does not point to a branch"
+msgstr "HEAD nie wskazuje gałęzi"
+
+#: remote.c:1733
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "nie ma takiej gałęzi: „%s�"
+
+#: remote.c:1736
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "gałąź „%s� nie ma ustawionej gałęzi nadrzędnej"
+
+#: remote.c:1742
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "gałąź nadrzędna „%s� nie jest przechowana jako gałąź śledząca"
+
+#: remote.c:1757
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"cel wypchnięcia „%s� na zdalnym repozytorium „%s� nie ma lokalnej gałęzi "
+"śledzącej"
+
+#: remote.c:1769
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "Gałąź „%s� nie ma zdalnego repozytorium do wypychania"
+
+#: remote.c:1779
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "referencje wypychania do „%s� nie zawierają „%s�"
+
+#: remote.c:1792
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "wypchnięcie nie ma celu (push.default ma wartość „nothing�)"
+
+#: remote.c:1814
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "nie można rozwiązać „prostego� wypchnięcia do pojedynczego celu"
+
+#: remote.c:1943
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "nie znaleziono zdalnej referencji %s"
+
+#: remote.c:1956
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Pomijanie zabawnej referencji „%s� lokalnie"
+
+#: remote.c:2119
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "Twoja gałąź jest oparta na „%s�, ale jej nadrzędna zniknęła.\n"
+
+#: remote.c:2123
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (użyj „git branch --unset-upstream�, aby naprawić)\n"
+
+#: remote.c:2126
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Twoja gałąź jest na bieżąco z „%s�.\n"
+
+#: remote.c:2130
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "Twoja gałąź i „%s� odnoszą się do innych zapisów.\n"
+
+#: remote.c:2133
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (więcej szczegółów w „%s�)\n"
+
+#: 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] "Twoja gałąź jest do przodu względem „%s� o %d zapis.\n"
+msgstr[1] "Twoja gałąź jest do przodu względem „%s� o %d zapisy.\n"
+msgstr[2] "Twoja gałąź jest do przodu względem „%s� o %d zapisów.\n"
+
+#: remote.c:2143
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  (użyj „git push�, aby opublikować swoje zapisy)\n"
+
+#: remote.c:2146
+#, 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] "Twoja gałąź jest za „%s� o %d zapis i może zostać przewinięta.\n"
+msgstr[1] "Twoja gałąź jest za „%s� o %d zapisy i może zostać przewinięta.\n"
+msgstr[2] "Twoja gałąź jest za „%s� o %d zapisów i może zostać przewinięta.\n"
+
+#: remote.c:2154
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  (użyj „git pull�, aby zaktualizować lokalną gałąź)\n"
+
+#: remote.c:2157
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Twoja gałąź i „%s� się rozeszły\n"
+"i mają odpowiednio %d i %d różny zapis.\n"
+msgstr[1] ""
+"Twoja gałąź i „%s� się rozeszły\n"
+"i mają odpowiednio %d i %d różne zapisy.\n"
+msgstr[2] ""
+"Twoja gałąź i „%s� się rozeszły\n"
+"i mają odpowiednio %d i %d różnych zapisów.\n"
+
+#: remote.c:2167
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  (użyj „git pull�, aby scalić zdalną gałąź w swoją)\n"
+
+#: remote.c:2359
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "nie można przetworzyć nazwy obiektu „%s�"
+
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "zła nazwa zastępczej referencji: %s"
+
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "podwójna referencja zastępcza: %s"
+
+#: replace-object.c:82
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "zamień głębokość za dużą dla obiektu %s"
+
+#: rerere.c:201 rerere.c:210 rerere.c:213
+msgid "corrupt MERGE_RR"
+msgstr "uszkodzone MERGE_RR"
+
+#: rerere.c:248 rerere.c:253
+msgid "unable to write rerere record"
+msgstr "nie można zapisać wpisu rerere"
+
+#: rerere.c:479
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "wystąpiły błędy przy zapisywaniu „%s� (%s)"
+
+#: rerere.c:482
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "nie można wypróżnić „%s�'"
+
+#: rerere.c:487 rerere.c:1023
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "nie można przetworzyć skrawków konfliktu w „%s�"
+
+#: rerere.c:668
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "nie można wykonać utime() na „%s�"
+
+#: rerere.c:678
+#, c-format
+msgid "writing '%s' failed"
+msgstr "nie można zapisać „%s�"
+
+#: rerere.c:698
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "Przygotowano „%s� używając poprzedniego rozwiązania."
+
+#: rerere.c:737
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "Zapamiętano rozwiązanie dla „%s�."
+
+#: rerere.c:772
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "Rozwiązano „%s� przy użyciu poprzedniego rozwiązania."
+
+#: rerere.c:787
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "nie można usunąć bezpańskiego „%s�"
+
+#: rerere.c:791
+#, c-format
+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
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "nie można utworzyć katalogu „%s�"
+
+#: rerere.c:1041
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "nie można zaktualizować skonfliktowanego stanu w „%s�"
+
+#: rerere.c:1052 rerere.c:1059
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "brak zapamiętanego wyniku scalenia dla „%s�"
+
+#: rerere.c:1061
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "nie można usunąć „%s�"
+
+#: rerere.c:1071
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "Zaktualizowano wstępny obraz „%s�"
+
+#: rerere.c:1080
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Zapomniano rozwiązanie dla „%s�\n"
+
+#: rerere.c:1191
+msgid "unable to open rr-cache directory"
+msgstr "nie można otworzyć katalogu pamięci podręcznej rr-cache"
+
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "nie można ustalić rewizji HEAD"
+
+#: reset.c:70 reset.c:76 sequencer.c:3468
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "nie znaleziono drzewa %s"
+
+#: revision.c:2338
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<plik-paczki> nie jest już wspierany"
+
+#: revision.c:2668
+msgid "your current branch appears to be broken"
+msgstr "twoja obecna gałąź wydaje się być uszkodzona"
+
+#: revision.c:2671
+#, 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
+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
+#, 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
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr ""
+"nieoczekiwany pakiet wypróżnienia podczas odczytu stanu zdalnego rozpakowania"
+
+#: send-pack.c:148
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "nie można przetworzyć zdalnego stanu rozpakowania: %s"
+
+#: send-pack.c:150
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "zdalne rozpakowanie nie powiodło się: %s"
+
+#: send-pack.c:374
+msgid "failed to sign the push certificate"
+msgstr "nie można podpisać certyfikatu wypychania"
+
+#: send-pack.c:467
+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
+msgid "the receiving end does not support --signed push"
+msgstr "odbierający koniec nie wspiera podpisanych wypchnięć"
+
+#: send-pack.c:478
+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"
+
+#: send-pack.c:490
+msgid "the receiving end does not support --atomic push"
+msgstr "odbierający koniec nie wspiera atomowych wypchnięć"
+
+#: send-pack.c:495
+msgid "the receiving end does not support push options"
+msgstr "odbierajÄ…cy koniec nie wspiera opcji wypychania"
+
+#: sequencer.c:195
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "nieprawidłowy tryb czyszczenia komunikatu zapisu „%s�"
+
+#: sequencer.c:323
+#, 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
+#, c-format
+msgid "could not remove '%s'"
+msgstr "nie można usunąć „%s�"
+
+#: sequencer.c:353
+msgid "revert"
+msgstr "odwracanie"
+
+#: sequencer.c:355
+msgid "cherry-pick"
+msgstr "dobieranie"
+
+#: sequencer.c:357
+msgid "rebase"
+msgstr "przestawianie"
+
+#: sequencer.c:359
+#, c-format
+msgid "unknown action: %d"
+msgstr "nieznane działanie: %d"
+
+#: sequencer.c:418
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"po rozwiązaniu konfliktów oznacz poprawione ścieżki\n"
+"z „git add <ścieżki>� lub „git rm <ścieżki>�"
+
+#: sequencer.c:421
+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�"
+
+#: sequencer.c:434 sequencer.c:3070
+#, 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
+#, c-format
+msgid "could not write to '%s'"
+msgstr "nie można pisać do „%s�"
+
+#: sequencer.c:441
+#, 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
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "nie można sfinalizować „%s�"
+
+#: sequencer.c:485
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "twoje lokalne zmiany zostanÄ… nadpisane przez %s."
+
+#: sequencer.c:489
+msgid "commit your changes or stash them to proceed."
+msgstr "złóż swoje zmiany lub dodaj do schowka, aby kontynuować."
+
+#: sequencer.c:521
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: przewijanie"
+
+#: sequencer.c:560 builtin/tag.c:598
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Nieprawidłowy tryb czyszczenia %s"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c:670
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Nie można zapisać nowego pliku indeksu"
+
+#: sequencer.c:684
+msgid "unable to update cache tree"
+msgstr "nie można zaktualizować drzewa pamięci podręcznej"
+
+#: sequencer.c:698
+msgid "could not resolve HEAD commit"
+msgstr "nie można rozwiązać zapisu HEAD"
+
+#: sequencer.c:778
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "nie ma żadnego klucza w „%.*s�"
+
+#: sequencer.c:789
+#, 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
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "nie można otworzyć „%s� do odczytu"
+
+#: sequencer.c:836
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "już podano „GIT_AUTHOR_NAME�"
+
+#: sequencer.c:841
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "już podano „GIT_AUTHOR_EMAIL�"
+
+#: sequencer.c:846
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "już podano „GIT_AUTHOR_DATE�"
+
+#: sequencer.c:850
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "nieznana zmienna „%s�"
+
+#: sequencer.c:855
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "brak „GIT_AUTHOR_NAME�"
+
+#: sequencer.c:857
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "brak „GIT_AUTHOR_EMAIL�"
+
+#: sequencer.c:859
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "brak „GIT_AUTHOR_DATE�"
+
+#: sequencer.c:924
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"w drzewie roboczym masz przygotowane zmiany\n"
+"Jeśli te zmiany mają być spłaszczone z poprzednim zapisem, wykonaj:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Jeśli mają być złożone w nowym zapisie, wykonaj:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"W obu przypadkach, gdy zakończysz, kontynuuj przez:\n"
+"\n"
+"  git rebase --continue\n"
+
+#: sequencer.c:1211
+msgid "'prepare-commit-msg' hook failed"
+msgstr "skrypt „prepare-commit-msg� się nie powiódł"
+
+#: sequencer.c:1217
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Twoja nazwa i adres e-mail zostały automatycznie skonfigurowane na "
+"podstawie\n"
+"twojej nazwy użytkownika i nazwy hosta. Sprawdź, czy są one prawidłowe.\n"
+"Możesz ukryć tą wiadomość ustawiając je samodzielnie. Uruchom\n"
+"następującą komendę i postępuj zgodnie z instrukcjami w edytorze, aby "
+"edytować\n"
+"twój plik konfiguracyjny:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"Po tym możesz poprawić podpis użyty w tym zapisie używając:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:1230
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Twoja nazwa i adres e-mail zostały automatycznie skonfigurowane na "
+"podstawie\n"
+" twojej nazwy użytkownika i nazwy hosta. Sprawdź, czy są one prawidłowe.\n"
+"Możesz ukryć tą wiadomość ustawiając je samodzielnie:\n"
+"\n"
+"    git config --global user.email \"toja@example.com\"\n"
+"    git config --global user.name \"Twoje ImiÄ™ Nazwisko\"\n"
+"\n"
+"Po tym możesz poprawić podpis użyty w tym zapisie używając:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:1272
+msgid "couldn't look up newly created commit"
+msgstr "nie odnaleziono nowo utworzonego zapisu"
+
+#: sequencer.c:1274
+msgid "could not parse newly created commit"
+msgstr "nie można przetworzyć nowo utworzonego zapisu"
+
+#: sequencer.c:1320
+msgid "unable to resolve HEAD after creating commit"
+msgstr "nie można rozwiązać HEAD po utworzeniu zapisu"
+
+#: sequencer.c:1322
+msgid "detached HEAD"
+msgstr "oddzielone HEAD"
+
+#: sequencer.c:1326
+msgid " (root-commit)"
+msgstr " (zapis-korzeń)"
+
+#: sequencer.c:1347
+msgid "could not parse HEAD"
+msgstr "nie można przetworzyć HEAD"
+
+#: sequencer.c:1349
+#, 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
+msgid "could not parse HEAD commit"
+msgstr "nie można przetworzyć zapisu HEAD"
+
+#: sequencer.c:1409 sequencer.c:2108
+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
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree nie może zapisać drzewa"
+
+#: sequencer.c:1453 sequencer.c:1573
+#, 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
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "nieprawidłowa tożsamość autora „%s�"
+
+#: sequencer.c:1490
+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
+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
+#, c-format
+msgid "could not update %s"
+msgstr "nie można zaktualizować „%s�"
+
+#: sequencer.c:1605
+#, c-format
+msgid "could not parse commit %s"
+msgstr "nie można przetworzyć zapisu %s"
+
+#: sequencer.c:1610
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "nie można przetworzyć zapisu rodzica %s"
+
+#: sequencer.c:1693 sequencer.c:1804
+#, c-format
+msgid "unknown command: %d"
+msgstr "nieznane pod-polecenie: %d"
+
+#: sequencer.c:1751 sequencer.c:1776
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "To jest połączenie %d zapisów."
+
+#: sequencer.c:1761
+msgid "need a HEAD to fixup"
+msgstr "potrzeba HEAD do naprawienia"
+
+#: sequencer.c:1763 sequencer.c:3380
+msgid "could not read HEAD"
+msgstr "nie można odczytać HEAD"
+
+#: sequencer.c:1765
+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
+#, 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
+msgid "your index file is unmerged."
+msgstr "plik indeksu jest niescalony."
+
+#: sequencer.c:1894
+msgid "cannot fixup root commit"
+msgstr "nie można poprawić zapisu korzenia"
+
+#: sequencer.c:1913
+#, 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
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "zapis %s nie ma rodzica %d"
+
+#: sequencer.c:1935
+#, 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
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: nie można przetworzyć rodzica zapisu %s"
+
+#: sequencer.c:2019
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "nie można zmienić nazwy „%s� na „%s�"
+
+#: sequencer.c:2079
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "nie można odwrócić %s... %s"
+
+#: sequencer.c:2080
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "nie można zastosować %s... %s"
+
+#: sequencer.c:2100
+#, 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
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: nie można odczytać indeksu"
+
+#: sequencer.c:2165
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: nie można odświeżyć indeksu"
+
+#: sequencer.c:2242
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s nie przyjmuje argumentów: „%s�"
+
+#: sequencer.c:2251
+#, c-format
+msgid "missing arguments for %s"
+msgstr "brakujÄ…ce argumenty dla %s"
+
+#: sequencer.c:2282
+#, c-format
+msgid "could not parse '%s'"
+msgstr "nie można przetworzyć „%s�"
+
+#: sequencer.c:2343
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "nieprawidłowy wiersz %d: %.*s"
+
+#: sequencer.c:2354
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "nie można użyć „%s� bez poprzedniego zapisu"
+
+#: sequencer.c:2440
+msgid "cancelling a cherry picking in progress"
+msgstr "przerywanie trwajÄ…cego dobierania"
+
+#: sequencer.c:2449
+msgid "cancelling a revert in progress"
+msgstr "przerywanie trwajÄ…cego odwracania"
+
+#: sequencer.c:2493
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "napraw to używając „git rebase --edit-todo�."
+
+#: sequencer.c:2495
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "plik z instrukcjami się nie nadaje: „%s�"
+
+#: sequencer.c:2500
+msgid "no commits parsed."
+msgstr "nie przetworzono żadnego zapisu."
+
+#: sequencer.c:2511
+msgid "cannot cherry-pick during a revert."
+msgstr "nie można dobierać w czasie odwracania."
+
+#: sequencer.c:2513
+msgid "cannot revert during a cherry-pick."
+msgstr "nie można odwrócić w czasie dobierania."
+
+#: sequencer.c:2591
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "nieprawidłowa wartość %s: %s"
+
+#: sequencer.c:2698
+msgid "unusable squash-onto"
+msgstr "spłaszcz-na się nie nadaje"
+
+#: sequencer.c:2718
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "nieprawidłowy plik opcji: „%s�"
+
+#: sequencer.c:2811 sequencer.c:4644
+msgid "empty commit set passed"
+msgstr "podano pusty zbiór zapisów"
+
+#: sequencer.c:2828
+msgid "revert is already in progress"
+msgstr "już trwa dobieranie"
+
+#: sequencer.c:2830
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "spróbuj „git revert (--continue | %s--abort | --quit)�"
+
+#: sequencer.c:2833
+msgid "cherry-pick is already in progress"
+msgstr "już trwa dobieranie"
+
+#: sequencer.c:2835
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "spróbuj „git cherry-pick (--continue | %s--abort | --quit)�"
+
+#: sequencer.c:2849
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "nie można utworzyć katalogu sekwencjonowania „%s�"
+
+#: sequencer.c:2864
+msgid "could not lock HEAD"
+msgstr "nie można zablokować HEAD"
+
+#: sequencer.c:2924 sequencer.c:4379
+msgid "no cherry-pick or revert in progress"
+msgstr "nie trwa dobieranie ani odwracanie"
+
+#: sequencer.c:2926 sequencer.c:2937
+msgid "cannot resolve HEAD"
+msgstr "nie można rozwiązać HEAD"
+
+#: sequencer.c:2928 sequencer.c:2972
+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
+#, c-format
+msgid "cannot open '%s'"
+msgstr "nie można otworzyć „%s�"
+
+#: sequencer.c:2960
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "nie można odczytać „%s�: %s"
+
+#: sequencer.c:2961
+msgid "unexpected end of file"
+msgstr "nieoczekiwany koniec pliku"
+
+#: sequencer.c:2967
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "zapisany plik HEAD sprzed dobierania „%s� jest uszkodzony"
+
+#: sequencer.c:2978
+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
+msgid "no revert in progress"
+msgstr "nie trwa żadne odwracanie"
+
+#: sequencer.c:3028
+msgid "no cherry-pick in progress"
+msgstr "nie trwa żadne dobieranie"
+
+#: sequencer.c:3038
+msgid "failed to skip the commit"
+msgstr "nie udało się pominąć zapisu"
+
+#: sequencer.c:3045
+msgid "there is nothing to skip"
+msgstr "nie ma nic do pominięcia"
+
+#: sequencer.c:3048
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"zapis już złożony?\n"
+"spróbuj „git %s --continue�"
+
+#: sequencer.c:3210 sequencer.c:4271
+msgid "cannot read HEAD"
+msgstr "nie można odczytać HEAD"
+
+#: sequencer.c:3227
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "nie można skopiować „%s� do „%s�"
+
+#: sequencer.c:3235
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Możesz teraz poprawić zapis przez\n"
+"\n"
+"\tgit commit --amend %s\n"
+"\n"
+"Kiedy zadowolisz siÄ™ swoimi zmianami, wykonaj\n"
+"\n"
+"\tgit rebase --continue\n"
+
+#: sequencer.c:3245
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Nie można zastosować %s... %.*s"
+
+#: sequencer.c:3252
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "Nie można scalić %.*s"
+
+#: sequencer.c:3266 sequencer.c:3270 builtin/difftool.c:640
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "nie można skopiować „%s� do „%s�"
+
+#: sequencer.c:3282
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Wykonywanie: %s\n"
+
+#: sequencer.c:3297
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"wykonanie nie powiodło się: %s\n"
+"%sMożesz naprawić problem i uruchomić\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c:3303
+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
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"wykonanie powiodło się: %s\n"
+"ale pozostały zmiany w indeksie i/lub drzewie roboczym.\n"
+"Złóż swoje zmiany lub dodaj do schowka, i wtedy wykonaj:\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c:3370
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nieprawidłowa nazwa etykietki „%.*s�"
+
+#: sequencer.c:3424
+msgid "writing fake root commit"
+msgstr "zapisywanie fałszywego zapisu korzenia"
+
+#: sequencer.c:3429
+msgid "writing squash-onto"
+msgstr "zapisywanie spłaszcz-na"
+
+#: sequencer.c:3513
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "nie można rozwiązać „%s�"
+
+#: sequencer.c:3546
+msgid "cannot merge without a current revision"
+msgstr "nie można scalić bez bieżącej rewizji"
+
+#: sequencer.c:3568
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "nie można przetworzyć „%.*s�"
+
+#: sequencer.c:3577
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "nic do scalenia: „%.*s�"
+
+#: sequencer.c:3589
+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
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "nie można uzyskać komunikatu zapisu „%s�"
+
+#: sequencer.c:3788
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "nie można nawet spróbować scalić „%.*s�"
+
+#: sequencer.c:3804
+msgid "merge: Unable to write new index file"
+msgstr "scalanie: Nie można zapisać nowego pliku indeksu"
+
+#: sequencer.c:3878
+msgid "Cannot autostash"
+msgstr "Nie można automatycznie dodać do schowka"
+
+#: sequencer.c:3881
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Nieoczekiwana odpowiedź schowka: „%s�"
+
+#: sequencer.c:3887
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Nie można utworzyć katalogu dla „%s�"
+
+#: sequencer.c:3890
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Automatycznie zapisano w schowku: %s\n"
+
+#: sequencer.c:3894
+msgid "could not reset --hard"
+msgstr "nie można zresetować --hard"
+
+#: sequencer.c:3919
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Zastosowano zmiany z automatycznego schowka.\n"
+
+#: sequencer.c:3931
+#, c-format
+msgid "cannot store %s"
+msgstr "nie można zapisać %s"
+
+#: sequencer.c:3934
+#, 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"
+"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
+msgid "Applying autostash resulted in conflicts."
+msgstr "Stosowanie zmian z automatycznego schowka spowodowało konflikty."
+
+#: sequencer.c:3940
+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
+msgid "could not detach HEAD"
+msgstr "nie można odłączyć HEAD"
+
+#: sequencer.c:4048
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Zatrzymano przy HEAD\n"
+
+#: sequencer.c:4050
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "Zatrzymano przy %s\n"
+
+#: sequencer.c:4058
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"Nie można wykonać polecenia z zadań do zrobienia\n"
+"\n"
+"    %.*s\n"
+"Zostało przeplanowane; Aby zmienić polecenie przed kontynuowaniem,\n"
+"zmień najpierw listę zadań do zrobienia:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#: sequencer.c:4104
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Przestawianie (%d/%d)%s"
+
+#: sequencer.c:4149
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "Zatrzymano na %s... %.*s\n"
+
+#: sequencer.c:4220
+#, c-format
+msgid "unknown command %d"
+msgstr "nieznane polecenie %d"
+
+#: sequencer.c:4279
+msgid "could not read orig-head"
+msgstr "nie można odczytać pierwotnego czoła"
+
+#: sequencer.c:4284
+msgid "could not read 'onto'"
+msgstr "nie można odczytać „onto�"
+
+#: sequencer.c:4298
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "nie można zapisać HEAD do %s"
+
+#: sequencer.c:4358
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Pomyślnie przestawiono i zaktualizowano %s.\n"
+
+#: sequencer.c:4391
+msgid "cannot rebase: You have unstaged changes."
+msgstr "nie można przestawić: Masz nieprzygotowane zmiany."
+
+#: sequencer.c:4400
+msgid "cannot amend non-existing commit"
+msgstr "nie można poprawić nieistniejącego obiektu"
+
+#: sequencer.c:4402
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "nieprawidłowy plik: „%s�"
+
+#: sequencer.c:4404
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "nieprawidłowa zawartość: „%s�"
+
+#: sequencer.c:4407
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"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
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "nie można zapisać pliku: „%s�"
+
+#: sequencer.c:4498
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "nie można usunąć CHERRY_PICK_HEAD"
+
+#: sequencer.c:4505
+msgid "could not commit staged changes."
+msgstr "nie udało się złożyć zmian ze schowka."
+
+#: sequencer.c:4621
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: nie można dobrać %s"
+
+#: sequencer.c:4625
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: zła rewizja"
+
+#: sequencer.c:4660
+msgid "can't revert as initial commit"
+msgstr "nie można odwrócić jako pierwszy zapis"
+
+#: sequencer.c:5137
+msgid "make_script: unhandled options"
+msgstr "make_script: nieobsłużone opcje"
+
+#: sequencer.c:5140
+msgid "make_script: error preparing revisions"
+msgstr "make_script: błąd przygotowania rewizji"
+
+#: sequencer.c:5382 sequencer.c:5399
+msgid "nothing to do"
+msgstr "nic do zrobienia"
+
+#: sequencer.c:5418
+msgid "could not skip unnecessary pick commands"
+msgstr "nie można pominąć niepotrzebnych poleceń pick"
+
+#: sequencer.c:5512
+msgid "the script was already rearranged."
+msgstr "kolejność skryptu została już zmieniona."
+
+#: setup.c:133
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "„%s� jest poza repozytorium w „%s�"
+
+#: setup.c:185
+#, 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: nie ma takiej ścieżki w drzewie roboczym.\n"
+"Użyj „git <polecenie> -- <ścieżka>...�, aby podać nieistniejące lokalnie "
+"ścieżki."
+
+#: setup.c:198
+#, 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 ""
+"niejednoznaczny argument „%s�: nieznana rewizja lub ścieżka niebędąca\n"
+"w drzewie roboczym. Użyj „--� do oddzielenia ścieżek od rewizji:\n"
+"„git <polecenie> [<rewizja>...] -- [<plik>...]�"
+
+#: setup.c:264
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "opcja „%s� musi się znaleźć przed argumentami, nie licząc innych opcji"
+
+#: setup.c:283
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"niejednoznaczny argument „%s�: jednocześnie rewizja i nazwa pliku\n"
+"Użyj „--�, aby rozdzielić ścieżki od rewizji:\n"
+"„git <polecenie> [<rewizja>...] -- [<plik>...]�"
+
+#: setup.c:419
+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
+msgid "this operation must be run in a work tree"
+msgstr "to działanie musi być wykonane w drzewie roboczym"
+
+#: setup.c:661
+#, 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:681
+msgid "repo version is 0, but v1-only extensions found:"
+msgstr "wersja repozytorium to 0, ale znaleziono rozszerzenia typowe dla v1"
+
+#: setup.c:700
+#, c-format
+msgid "error opening '%s'"
+msgstr "nie można otworzyć „%s�"
+
+#: setup.c:702
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "za duży jak na plik .git: „%s�"
+
+#: setup.c:704
+#, c-format
+msgid "error reading %s"
+msgstr "błąd odczytu %s"
+
+#: setup.c:706
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "nieprawidłowy format pliku gitfile: %s"
+
+#: setup.c:708
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "brak ścieżki w pliku gitfile %s"
+
+#: setup.c:710
+#, c-format
+msgid "not a git repository: %s"
+msgstr "to nie jest repozytorium gita: %s"
+
+#: setup.c:812
+#, c-format
+msgid "'$%s' too big"
+msgstr "„$%s� za duże"
+
+#: setup.c:826
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "to nie jest repozytorium gita: „%s�"
+
+#: setup.c:855 setup.c:857 setup.c:888
+#, 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
+msgid "cannot come back to cwd"
+msgstr "nie można wrócić do cwd"
+
+#: setup.c:987
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "nie można wykonać stat na „%*s%s%s�"
+
+#: setup.c:1225
+msgid "Unable to read current working directory"
+msgstr "Nie można odczytać obecnego katalogu roboczego"
+
+#: setup.c:1234 setup.c:1240
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "nie można zmienić na „%s�"
+
+#: setup.c:1245
+#, 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
+#, 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 ""
+"to nie jest repozytorium gita (ani żaden katalog nadrzędny aż do punktu "
+"montowania %s)\n"
+"Zatrzymano na granicy systemu plików (nie ustawiono "
+"GIT_DISCOVERY_ACROSS_FILESYSTEM)."
+
+#: setup.c:1362
+#, c-format
+msgid ""
+"problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+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
+msgid "fork failed"
+msgstr "fork nie powiódł się"
+
+#: setup.c:1429
+msgid "setsid failed"
+msgstr "setsid nie powiodło się"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:848
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:858
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:860
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:867
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:869
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/s"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:875
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u bajt"
+msgstr[1] "%u bajty"
+msgstr[2] "%u bajtów"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:877
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+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
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "nie można otworzyć „%s� do zapisywania"
+
+#: strbuf.c:1175
+#, c-format
+msgid "could not edit '%s'"
+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"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "ujemne wartości niedozwolone w submodule.fetchjobs"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"pomijanie „%s�, które można zinterpretować jako opcję wiersza polecenia: %s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "nieprawidłowa wartość %s"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Nie można zaktualizować wpisu .gitmodules %s"
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "Nie można zmienić niescalonego .gitmodules, najpierw scal konflikty"
+
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "Nie znaleziono rozdziału w .gitmodules, gdzie path=%s"
+
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "Nie można usunąć wpisu .gitmodules dla %s"
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr "przygotowanie zaktualizowanego .gitmodules nie powiodło się"
+
+#: submodule.c:327
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "w niezapełnionym pod-module „%s�"
+
+#: submodule.c:358
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Ścieżka „%s� jest w pod-module „%.*s�"
+
+#: submodule.c:435
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "zły argument --ignore-submodules: %s"
+
+#: submodule.c:817
+#, 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 "
+"nazwie. Pomijanie."
+
+#: submodule.c:920
+#, 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"
+
+#: submodule.c:1005
+#, 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"
+
+#: submodule.c:1128
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "proces dla pod-modułu „%s� nie powiódł się"
+
+#: submodule.c:1157 builtin/branch.c:689 builtin/submodule--helper.c:2469
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Nie można rozwiązać HEAD jako prawidłowej referencji."
+
+#: submodule.c:1168
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Wypychanie pod-modułu „%s�\n"
+
+#: submodule.c:1171
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Nie można wypchnąć pod-modułu „%s�\n"
+
+#: submodule.c:1463
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Pobieranie pod-modułu %s%s\n"
+
+#: submodule.c:1497
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Nie można się dostać do pod-modułu „%s�\n"
+
+#: submodule.c:1652
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Błędy podczas pobierania pod-modułów:\n"
+"%s"
+
+#: submodule.c:1677
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "nie rozpoznano „%s� jako repozytorium gita"
+
+#: submodule.c:1694
+#, 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"
+
+#: submodule.c:1735
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "„git status --porcelain=2� nie powiódł się w pod-module %s"
+
+#: submodule.c:1810
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "nie można uruchomić „git status� w pod-module „%s�"
+
+#: submodule.c:1823
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "nie można wykonać „git status� w pod-module „%s�"
+
+#: submodule.c:1838
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "Nie można usunąć ustawienia core.worktree w pod-module „%s�"
+
+#: submodule.c:1865 submodule.c:2175
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "nie można zejść do pod-modułu „%s�"
+
+#: submodule.c:1886
+msgid "could not reset submodule index"
+msgstr "nie można zresetować indeksu pod-modułu"
+
+#: submodule.c:1928
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "pod-moduł „%s� ma brudny indeks"
+
+#: submodule.c:1980
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Nie można zaktualizować pod-modułu „%s�."
+
+#: submodule.c:2048
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "katalog gita pod-modułu „%s� jest w katalogu gita „%.*s�"
+
+#: submodule.c:2069
+#, 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 "
+"niewspierane"
+
+#: submodule.c:2081 submodule.c:2140
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "nie odnaleziono nazwy pod-modułu „%s�"
+
+#: submodule.c:2085
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "odmawiam przeniesienia „%s� do istniejącego katalogu gita"
+
+#: submodule.c:2092
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Migrowanie katalogu gita „%s%s� z\n"
+"„%s� do\n"
+"„%s�\n"
+
+#: submodule.c:2220
+msgid "could not start ls-files in .."
+msgstr "nie można uruchomić ls-files w .."
+
+#: submodule.c:2260
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree zwróciło nieoczekiwany kod wyjścia %d"
+
+#: trailer.c:236
+#, 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
+#, 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
+#, c-format
+msgid "more than one %s"
+msgstr "więcej niż jeden %s"
+
+#: trailer.c:728
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "pusty klucz w końcówce „%.*s�"
+
+#: trailer.c:748
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "nie można odczytać pliku „%s�"
+
+#: trailer.c:751 builtin/mktag.c:91
+msgid "could not read from stdin"
+msgstr "nie można czytać ze standardowego wejścia"
+
+#: trailer.c:1009 wrapper.c:676
+#, c-format
+msgid "could not stat %s"
+msgstr "nie można wykonać stat na %s"
+
+#: trailer.c:1011
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "plik %s nie jest zwykłym plikiem"
+
+#: trailer.c:1013
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "plik %s nie może być zapisany przez użytkownika"
+
+#: trailer.c:1025
+msgid "could not open temporary file"
+msgstr "nie można otworzyć pliku tymczasowego"
+
+#: trailer.c:1065
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "nie można zmienić nazwy pliku tymczasowego na %s"
+
+#: transport-helper.c:62 transport-helper.c:91
+msgid "full write to remote helper failed"
+msgstr "pełny zapis do zdalnego pomocnika nie powiódł się"
+
+#: transport-helper.c:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "nie znaleziono zdalnego pomocnika do „%s�"
+
+#: transport-helper.c:161 transport-helper.c:575
+msgid "can't dup helper output fd"
+msgstr "nie można zduplikować wyjściowego deskryptora pliku"
+
+#: transport-helper.c:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"nieznana obowiązkowa zdolność %s; ten zdalny pomocnik zapewne potrzebuje "
+"nowszej wersji Gita"
+
+#: transport-helper.c:220
+msgid "this remote helper should implement refspec capability"
+msgstr ""
+"ten zdalny pomocnik powinien zaimplementować zdolność referencji refspec"
+
+#: transport-helper.c:287 transport-helper.c:429
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s nieoczekiwanie odpowiedział: „%s�"
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s zablokował także %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "nie można wykonać fast-import"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "błąd wykonywania fast-import"
+
+#: transport-helper.c:549 transport-helper.c:1237
+#, c-format
+msgid "could not read ref %s"
+msgstr "nie można odczytać referencji %s"
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "nieznana odpowiedź na połączenie: %s"
+
+#: transport-helper.c:616
+msgid "setting remote service path not supported by protocol"
+msgstr "ustawianie ścieżki zdalnej usługi niewspierane przez protokół"
+
+#: transport-helper.c:618
+msgid "invalid remote service path"
+msgstr "nieprawidłowa ścieżka zdalnej usługi"
+
+#: transport-helper.c:661 transport.c:1447
+msgid "operation not supported by protocol"
+msgstr "operacja niewspierana przez protokół"
+
+#: transport-helper.c:664
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "nie można połączyć z pod-usługą %s"
+
+#: transport-helper.c:745
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "„option� bez pasującej dyrektywy „ok/error�"
+
+#: transport-helper.c:788
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "oczekiwano ok/error pomocnik powiedział „%s�"
+
+#: transport-helper.c:845
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "pomocnik zwrócił nieoczekiwany stan %s"
+
+#: transport-helper.c:928
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "pomocnik %s nie wspiera wykonania na sucho (dry-run)"
+
+#: transport-helper.c:931
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "pomocnik %s nie wspiera --signed"
+
+#: transport-helper.c:934
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "pomocnik %s nie wspiera --signed=if-asked"
+
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "pomocnik %s nie wspiera --atomic"
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "pomocnik %s nie wspiera --%s"
+
+#: transport-helper.c:950
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "pomocnik %s nie wspiera „push-option�"
+
+#: transport-helper.c:1050
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "zdalny pomocnik nie wspiera wypychania; potrzeba referencji"
+
+#: transport-helper.c:1055
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "pomocnik %s nie wspiera „force�"
+
+#: transport-helper.c:1102
+msgid "couldn't run fast-export"
+msgstr "nie można wykonać fast-export"
+
+#: transport-helper.c:1107
+msgid "error while running fast-export"
+msgstr "błąd wykonywania fast-export"
+
+#: transport-helper.c:1132
+#, c-format
+msgid ""
+"No refs in common and none specified; doing nothing.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+"Brak wspólnych referencji lub żadnych nie podano; brak działania.\n"
+"Pewnie należy podać jakąś gałąź.\n"
+
+#: transport-helper.c:1214
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "niewspierany format obiektu „%s�"
+
+#: transport-helper.c:1223
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "nieprawidłowa odpowiedź na liście referencji: %s"
+
+#: transport-helper.c:1375
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) nie powiodło się"
+
+#: transport-helper.c:1402
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) nie powiodło się"
+
+#: transport-helper.c:1451
+#, c-format
+msgid "%s thread failed"
+msgstr "wątek %s nie powiódł się"
+
+#: transport-helper.c:1455
+#, 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
+#, 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
+#, c-format
+msgid "%s process failed to wait"
+msgstr "procesowi %s nie udało się zaczekać"
+
+#: transport-helper.c:1519
+#, c-format
+msgid "%s process failed"
+msgstr "proces %s nie powiódł się"
+
+#: transport-helper.c:1537 transport-helper.c:1546
+msgid "can't start thread for copying data"
+msgstr "nie można uruchomić wątku do kopiowania danych"
+
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Ustawiłoby gałąź nadrzędną „%s� na „%s� z „%s�\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "nie można odczytać wiązki „%s�"
+
+#: transport.c:220
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: nieprawidłowa opcja głębokości „%s�"
+
+#: transport.c:269
+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
+msgid "server options require protocol version 2 or later"
+msgstr "opcje serwera wymagają wersji protokołu 2 lub późniejszej"
+
+#: transport.c:727
+msgid "could not parse transport.color.* config"
+msgstr "nie można przetworzyć ustawienia transport.color.*"
+
+#: transport.c:802
+msgid "support for protocol v2 not implemented yet"
+msgstr "wsparcie dla protokołu v2 jeszcze niezaimplementowane"
+
+#: transport.c:936
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "nierozpoznana wartość klucza „%s�: %s"
+
+#: transport.c:1002
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transport „%s� niedozwolony"
+
+#: transport.c:1055
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync nie jest już wspierany"
+
+#: transport.c:1157
+#, 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"
+"znaleźć w żadnym zdalnym repozytorium:\n"
+
+#: transport.c:1161
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Spróbuj\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"lub wejść cd do ścieżki i użyć\n"
+"\n"
+"\tgit push\n"
+"\n"
+"żeby wypchnąć je do zdalnego repozytorium.\n"
+"\n"
+
+#: transport.c:1169
+msgid "Aborting."
+msgstr "Przerywanie."
+
+#: transport.c:1316
+msgid "failed to push all needed submodules"
+msgstr "nie można wypchnąć wszystkich potrzebnych zagnieżdżonych pod-modułów"
+
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr "za krótki obiekt drzewa"
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr "nieprawidłowy tryb w elemencie drzewa"
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr "pusta nazwa pliku w elemencie drzewa"
+
+#: tree-walk.c:118
+msgid "too-short tree file"
+msgstr "za krótki plik drzewa"
+
+#: unpack-trees.c:113
+#, 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 ""
+"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
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Wybranie nadpisałoby lokalne zmiany w następujących plikach:\n"
+"%%s"
+
+#: unpack-trees.c:118
+#, 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 ""
+"Scalenie nadpisałoby zmiany w następujących plikach:\n"
+"%%sZłóż swoje zmiany lub dodaj do schowka zanim je scalisz."
+
+#: unpack-trees.c:120
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Twoje lokalne zmiany do następujących plików zostaną zastąpione przez "
+"scalenie:\n"
+"%%s"
+
+#: unpack-trees.c:123
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%sPlease commit your changes or stash them before you %s."
+msgstr ""
+"%s nadpisałoby zmiany w następujących plikach:\n"
+"%%sZłóż swoje zmiany lub dodaj do schowka zanim wykonasz %s."
+
+#: unpack-trees.c:125
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Twoje lokalne zmiany do następujących plików zostaną zastąpione przez %s:\n"
+"%%s"
+
+#: unpack-trees.c:130
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Aktualizowanie następujących katalogów postradałoby nieśledzone pliki:\n"
+"%s"
+
+#: unpack-trees.c:134
+#, 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 ""
+"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
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Następujące nieśledzone pliki drzewa roboczego zostałyby usunięte przez "
+"wybranie:\n"
+"%%s"
+
+#: unpack-trees.c:139
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Scalenie usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%sPrzenieś je lub usuń przed scalaniem."
+
+#: unpack-trees.c:141
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Następujące nieśledzone pliki drzewa roboczego zostałyby usunięte przez "
+"scalenie:\n"
+"%%s"
+
+#: unpack-trees.c:144
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"%s usunęłoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%sPrzenieś je lub usuń przed %s."
+
+#: unpack-trees.c:146
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Następujące nieśledzone pliki drzewa roboczego zostałyby usunięte przez %s:\n"
+"%%s"
+
+#: unpack-trees.c:152
+#, 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 ""
+"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
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Wybranie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%s"
+
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Scalenie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%sPrzenieś je lub usuń przed scalaniem."
+
+#: unpack-trees.c:159
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Scalenie nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%s"
+
+#: unpack-trees.c:162
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"%s nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%sPrzenieś je lub usuń przed %s."
+
+#: unpack-trees.c:164
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s nadpisałoby następujące nieśledzone pliki drzewa roboczego:\n"
+"%%s"
+
+#: unpack-trees.c:172
+#, 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
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Nie można zaktualizować pod-modułu:\n"
+"%s"
+
+#: unpack-trees.c:178
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Następujące ścieżki nie są aktualne i zostały mimo rzadkich wzorców:\n"
+"%s"
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Następujące ścieżki są niescalone i zostały mimo rzadkich wzorców:\n"
+"%s"
+
+#: unpack-trees.c:182
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Następujące ścieżki już istniały i nie są zaktualizowane mimo rzadkich "
+"wzorców:\n"
+"%s"
+
+#: unpack-trees.c:262
+#, c-format
+msgid "Aborting\n"
+msgstr "Przerywanie\n"
+
+#: unpack-trees.c:289
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Po naprawieniu powyższych ścieżek możesz chcieć wykonać „git sparse-checkout "
+"reapply�.\n"
+
+#: unpack-trees.c:350
+msgid "Updating files"
+msgstr "Aktualizowanie plików"
+
+#: unpack-trees.c:382
+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 ""
+"następujące ścieżki się zderzyły (np. ścieżki różniące się wielkością\n"
+"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
+msgid "Updating index flags"
+msgstr "Aktualizowanie flag indeksu"
+
+#: upload-pack.c:1543
+msgid "expected flush after fetch arguments"
+msgstr "oczekiwano wypróżnienia po argumentach pobrania"
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "nieprawidłowa nazwa schematu w adresie URL lub brakujące „://�"
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "błędna sekwencja %XX"
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "brakuje maszyny, a schemat nie jest „file:�"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "adres „file:� nie może mieć numeru portu"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "nieprawidłowe znaki w nazwie maszyny"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "nieprawidłowy numer portu"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "nieprawidłowy segment ścieżki „..�"
+
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Pobieranie obiektów"
+
+#: worktree.c:238 builtin/am.c:2103
+#, c-format
+msgid "failed to read '%s'"
+msgstr "nie można odczytać „%s�"
+
+#: worktree.c:304
+#, 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
+#, 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
+#, c-format
+msgid "'%s' does not exist"
+msgstr "„%s� nie istnieje"
+
+#: worktree.c:333
+#, 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
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "„%s� nie wskazuje z powrotem na „%s�"
+
+#: worktree.c:608
+msgid "not a directory"
+msgstr "nie jest katalogiem"
+
+#: worktree.c:617
+msgid ".git is not a file"
+msgstr ".git nie jest plikiem"
+
+#: worktree.c:619
+msgid ".git file broken"
+msgstr "plik .git zepsuty"
+
+#: worktree.c:621
+msgid ".git file incorrect"
+msgstr "plik .git nieprawidłowy"
+
+#: worktree.c:727
+msgid "not a valid path"
+msgstr "nieprawidłowa ścieżka"
+
+#: worktree.c:733
+msgid "unable to locate repository; .git is not a file"
+msgstr "nie odnaleziono repozytorium; .git nie jest plikiem"
+
+#: worktree.c:737
+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
+msgid "unable to locate repository; .git file broken"
+msgstr "nie odnaleziono repozytorium; plik .git zepsuty"
+
+#: worktree.c:747
+msgid "gitdir unreadable"
+msgstr "katalog gita nie do odczytania"
+
+#: worktree.c:751
+msgid "gitdir incorrect"
+msgstr "katalog gita nieprawidłowy"
+
+#: worktree.c:776
+msgid "not a valid directory"
+msgstr "nie jest prawidłowym katalogiem"
+
+#: worktree.c:782
+msgid "gitdir file does not exist"
+msgstr "plik gitdir nie istnieje"
+
+#: worktree.c:787 worktree.c:796
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "nie można odczytać pliku gitdir (%s)"
+
+#: worktree.c:806
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "przykrótki odczyt (oczekiwano %<PRIuMAX> bajtów, odczytano %<PRIuMAX>)"
+
+#: worktree.c:814
+msgid "invalid gitdir file"
+msgstr "nieprawidłowy plik gitdir"
+
+#: worktree.c:822
+msgid "gitdir file points to non-existent location"
+msgstr "plik gitdir wskazuje nieistniejące położenie"
+
+#: wrapper.c:197 wrapper.c:367
+#, 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
+#, c-format
+msgid "unable to access '%s'"
+msgstr "brak dostępu do „%s�"
+
+#: wrapper.c:607
+msgid "unable to get current working directory"
+msgstr "Nie można uzyskać obecnego katalogu roboczego"
+
+#: wt-status.c:158
+msgid "Unmerged paths:"
+msgstr "Niescalone ścieżki"
+
+#: wt-status.c:187 wt-status.c:219
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  (użyj „git restore --staged <plik>...�, aby wycofać)"
+
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr "  (użyj „git restore --source=%s --staged <plik>...�, aby wycofać)"
+
+#: wt-status.c:193 wt-status.c:225
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (użyj „git rm --cached <plik>...�, aby wycofać)"
+
+#: wt-status.c:197
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (użyj „git add <plik>...� aby zaznaczyć rozwiązanie)"
+
+#: wt-status.c:199 wt-status.c:203
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr "  (użyj odpowiednio „git add/rm <plik>...� aby zaznaczyć rozwiązanie)"
+
+#: wt-status.c:201
+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
+msgid "Changes to be committed:"
+msgstr "Zmiany do złożenia:"
+
+#: wt-status.c:234 wt-status.c:1081
+msgid "Changes not staged for commit:"
+msgstr "Zmiany nie przygotowane do złożenia:"
+
+#: wt-status.c:238
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  (użyj „git add <plik>...�, żeby zmienić, co zostanie złożone)"
+
+#: wt-status.c:240
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr "  (użyj „git add/rm <plik>...�, żeby zmienić, co zostanie złożone)"
+
+#: wt-status.c:241
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (użyj „git restore <plik>...�, aby odrzucić zmiany w katalogu roboczym)"
+
+#: 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)"
+
+#: wt-status.c:254
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  (użyj „git %s <plik>...�, żeby uwzględnić, co zostanie złożone)"
+
+#: wt-status.c:266
+msgid "both deleted:"
+msgstr "oba usunięte:"
+
+#: wt-status.c:268
+msgid "added by us:"
+msgstr "dodane przez nas:"
+
+#: wt-status.c:270
+msgid "deleted by them:"
+msgstr "usunięte przez nich:"
+
+#: wt-status.c:272
+msgid "added by them:"
+msgstr "dodane przez nich:"
+
+#: wt-status.c:274
+msgid "deleted by us:"
+msgstr "usunięte przez nas:"
+
+#: wt-status.c:276
+msgid "both added:"
+msgstr "oba dodane:"
+
+#: wt-status.c:278
+msgid "both modified:"
+msgstr "oba zmienione:"
+
+#: wt-status.c:288
+msgid "new file:"
+msgstr "nowy plik:"
+
+#: wt-status.c:290
+msgid "copied:"
+msgstr "skopiowano:"
+
+#: wt-status.c:292
+msgid "deleted:"
+msgstr "usunięto:"
+
+#: wt-status.c:294
+msgid "modified:"
+msgstr "zmieniono:"
+
+#: wt-status.c:296
+msgid "renamed:"
+msgstr "zmieniono nazwÄ™:"
+
+#: wt-status.c:298
+msgid "typechange:"
+msgstr "zmiana typu:"
+
+#: wt-status.c:300
+msgid "unknown:"
+msgstr "nieznane:"
+
+#: wt-status.c:302
+msgid "unmerged:"
+msgstr "niescalone:"
+
+#: wt-status.c:382
+msgid "new commits, "
+msgstr "nowe zapisy, "
+
+#: wt-status.c:384
+msgid "modified content, "
+msgstr "zmieniona zawartość, "
+
+#: wt-status.c:386
+msgid "untracked content, "
+msgstr "nieśledzona zawartość, "
+
+#: wt-status.c:905
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+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
+msgid "Submodules changed but not updated:"
+msgstr "Pod-moduły zmienione, ale nie zaktualizowane:"
+
+#: wt-status.c:938
+msgid "Submodule changes to be committed:"
+msgstr "Zmiany w pod-modułach do złożenia:"
+
+#: wt-status.c:1020
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Nie zmieniaj ani nie usuwaj wiersza powyżej.\n"
+"Wszystko po nim będzie pominięte."
+
+#: wt-status.c:1112
+#, 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 ""
+"\n"
+"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
+msgid "You have unmerged paths."
+msgstr "Masz niescalone ścieżki."
+
+#: wt-status.c:1145
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (napraw konflikty i wykonaj „git commit�)"
+
+#: wt-status.c:1147
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (użyj „git merge --abort�, aby przerwać scalanie)"
+
+#: wt-status.c:1151
+msgid "All conflicts fixed but you are still merging."
+msgstr "Wszystkie konflikty naprawione, ale wciąż trwa scalanie."
+
+#: wt-status.c:1154
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (użyj „git commit�, żeby zwieńczyć scalanie)"
+
+#: wt-status.c:1163
+msgid "You are in the middle of an am session."
+msgstr "JesteÅ› w trakcie sesji am."
+
+#: wt-status.c:1166
+msgid "The current patch is empty."
+msgstr "Obecna ścieżka jest pusta."
+
+#: wt-status.c:1170
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (napraw konflikty i wykonaj „git am --continue�)"
+
+#: wt-status.c:1172
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (użyj „git am --skip� aby pominąć tę łatkę)"
+
+#: wt-status.c:1174
+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
+msgid "git-rebase-todo is missing."
+msgstr "brakuje git-rebase-todo."
+
+#: wt-status.c:1309
+msgid "No commands done."
+msgstr "Nie wykonano żadnych poleceń."
+
+#: wt-status.c:1312
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+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
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (zobacz więcej w pliku %s)"
+
+#: wt-status.c:1328
+msgid "No commands remaining."
+msgstr "Brak pozostałych poleceń."
+
+#: wt-status.c:1331
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+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
+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
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Przestawiasz właśnie gałąź „%s� na „%s�."
+
+#: wt-status.c:1356
+msgid "You are currently rebasing."
+msgstr "JesteÅ› w trakcie przestawiania."
+
+#: wt-status.c:1369
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (napraw konflikty i wykonaj „git rebase --continue�)"
+
+#: wt-status.c:1371
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (użyj „git rebase --skip� aby pominąć tę łatkę)"
+
+#: wt-status.c:1373
+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
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (wszystkie konflikty naprawione: wykonaj „git rebase --continue�)"
+
+#: wt-status.c:1384
+#, 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
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Dzielisz właśnie zapis podczas przestawiania."
+
+#: wt-status.c:1392
+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
+#, 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
+msgid "You are currently editing a commit during a rebase."
+msgstr "Edytujesz właśnie zapis podczas przestawiania."
+
+#: wt-status.c:1404
+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
+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
+msgid "Cherry-pick currently in progress."
+msgstr "Trwa właśnie dobieranie."
+
+#: wt-status.c:1420
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Dobierasz właśnie zapis %s."
+
+#: wt-status.c:1427
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (napraw konflikty i wykonaj „git cherry-pick --continue�)"
+
+#: wt-status.c:1430
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (wykonaj „git cherry-pick --continue�, aby kontynuować)"
+
+#: wt-status.c:1433
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+"  (wszystkie konflikty naprawione: wykonaj „git cherry-pick --continue�)"
+
+#: wt-status.c:1435
+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
+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
+msgid "Revert currently in progress."
+msgstr "Trwa właśnie odwracanie."
+
+#: wt-status.c:1450
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Odwracasz właśnie zapis %s."
+
+#: wt-status.c:1456
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (napraw konflikty i wykonaj „git revert --continue�)"
+
+#: wt-status.c:1459
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (wykonaj „git revert --continue�, aby kontynuować)"
+
+#: wt-status.c:1462
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (wszystkie konflikty naprawione: wykonaj „git revert --continue�)"
+
+#: wt-status.c:1464
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (użyj „git revert --skip� aby pominąć tę łatkę)"
+
+#: wt-status.c:1466
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  (użyj „git revert --abort�, aby przerwać odwracanie)"
+
+#: wt-status.c:1476
+#, 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
+msgid "You are currently bisecting."
+msgstr "JesteÅ› w trakcie przeszukiwania."
+
+#: wt-status.c:1483
+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
+#, 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
+msgid "On branch "
+msgstr "Na gałęzi "
+
+#: wt-status.c:1740
+msgid "interactive rebase in progress; onto "
+msgstr "trwa interaktywne przestawianie na "
+
+#: wt-status.c:1742
+msgid "rebase in progress; onto "
+msgstr "trwa przestawianie na "
+
+#: wt-status.c:1747
+msgid "HEAD detached at "
+msgstr "HEAD odłączone na "
+
+#: wt-status.c:1749
+msgid "HEAD detached from "
+msgstr "HEAD odłączone od "
+
+#: wt-status.c:1752
+msgid "Not currently on any branch."
+msgstr "Nie jesteś na żadnej gałęzi."
+
+#: wt-status.c:1769
+msgid "Initial commit"
+msgstr "Pierwszy zapis"
+
+#: wt-status.c:1770
+msgid "No commits yet"
+msgstr "Jeszcze nie ma zapisów"
+
+#: wt-status.c:1784
+msgid "Untracked files"
+msgstr "Nieśledzone pliki"
+
+#: wt-status.c:1786
+msgid "Ignored files"
+msgstr "Ignorowane pliki"
+
+#: wt-status.c:1790
+#, 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 ""
+"Sprawdzenie nieśledzonych plików zajęło %.2f sekund. „status -uno�\n"
+"może to przyspieszyć, ale musisz wtedy pilnować dodawania\n"
+"nowych plików (zobacz „git help status�)."
+
+#: wt-status.c:1796
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Nie wypisano nieśledzonych plików%s"
+
+#: wt-status.c:1798
+msgid " (use -u option to show untracked files)"
+msgstr " (użyj opcji -u, aby pokazać nieśledzone pliki)"
+
+#: wt-status.c:1804
+msgid "No changes"
+msgstr "Brak zmian"
+
+#: wt-status.c:1809
+#, 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
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "brak zmian dodanych do zapisu\n"
+
+#: wt-status.c:1817
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"nie dodano nic do złożenia, ale są nieśledzone pliki (użyj „git add�, aby "
+"śledzić)\n"
+
+#: wt-status.c:1821
+#, 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
+#, 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
+#, c-format
+msgid "nothing to commit\n"
+msgstr "nic do złożenia\n"
+
+#: wt-status.c:1832
+#, 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
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "nic do złożenia, drzewo robocze czyste\n"
+
+#: wt-status.c:1942
+msgid "No commits yet on "
+msgstr "Jeszcze nie ma zapisów na "
+
+#: wt-status.c:1946
+msgid "HEAD (no branch)"
+msgstr "HEAD (brak gałęzi)"
+
+#: wt-status.c:1977
+msgid "different"
+msgstr "różne"
+
+#: wt-status.c:1979 wt-status.c:1987
+msgid "behind "
+msgstr "wstecz "
+
+#: wt-status.c:1982 wt-status.c:1985
+msgid "ahead "
+msgstr "do przodu "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2507
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "nie można wykonać %s: masz nieprzygotowane zmiany."
+
+#: wt-status.c:2513
+msgid "additionally, your index contains uncommitted changes."
+msgstr "dodatkowo, twój indeks zawiera nieoddane zmiany."
+
+#: wt-status.c:2515
+#, 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
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "nie można wykonać unlink na „%s�"
+
+#: builtin/add.c:26
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<opcje>] [--] <ścieżka>..."
+
+#: builtin/add.c:58
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "nie można wykonać chmod %cx „%s�"
+
+#: builtin/add.c:96
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "niespodziewany stan diff %c"
+
+#: builtin/add.c:101 builtin/commit.c:285
+msgid "updating files failed"
+msgstr "aktualizacja plików nie powiodła się"
+
+#: builtin/add.c:111
+#, c-format
+msgid "remove '%s'\n"
+msgstr "usuń „%s�\n"
+
+#: builtin/add.c:186
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Wycofane zmiany po odświeżeniu indeksu:"
+
+#: builtin/add.c:280 builtin/rev-parse.c:991
+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
+msgid "Could not write patch"
+msgstr "Nie można zapisać łatki"
+
+#: builtin/add.c:298
+msgid "editing patch failed"
+msgstr "edycja łatki nie powiodła się"
+
+#: builtin/add.c:301
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "Nie można wykonać stat na „%s�"
+
+#: builtin/add.c:303
+msgid "Empty patch. Aborted."
+msgstr "Pusta Å‚atka. Przerwano."
+
+#: builtin/add.c:308
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "Nie można zastosować „%s�"
+
+#: builtin/add.c:316
+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
+msgid "dry run"
+msgstr "na sucho"
+
+#: builtin/add.c:339
+msgid "interactive picking"
+msgstr "interaktywne wybieranie"
+
+#: builtin/add.c:340 builtin/checkout.c:1546 builtin/reset.c:308
+msgid "select hunks interactively"
+msgstr "wybierz skrawki interaktywnie"
+
+#: builtin/add.c:341
+msgid "edit current diff and apply"
+msgstr "zmień bieżące różnice i zastosuj"
+
+#: builtin/add.c:342
+msgid "allow adding otherwise ignored files"
+msgstr "pozwól na dodawanie inaczej ignorowanych plików"
+
+#: builtin/add.c:343
+msgid "update tracked files"
+msgstr "aktualizuj śledzone pliki"
+
+#: builtin/add.c:344
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "znormalizuj ponownie końce wierszy w śledzonych plikach (zakłada -u)"
+
+#: builtin/add.c:345
+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
+msgid "add changes from all tracked and untracked files"
+msgstr "dodaj zmiany z plików śledzonych i nieśledzonych"
+
+#: builtin/add.c:349
+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
+msgid "don't add, only refresh the index"
+msgstr "nie dodawaj, tylko odśwież indeks"
+
+#: builtin/add.c:352
+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
+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
+msgid "override the executable bit of the listed files"
+msgstr "wymuś bit wykonywalności podanych plików"
+
+#: builtin/add.c:357
+msgid "warn when adding an embedded repository"
+msgstr "ostrzegaj przed dodawaniem wbudowanego repozytorium"
+
+#: builtin/add.c:359
+msgid "backend for `git stash -p`"
+msgstr "silnik do „git stash -p�"
+
+#: builtin/add.c:377
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"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"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Jeśli dodano tę ścieżkę przez pomyłkę, można ją usunąć\n"
+"z indeksu przez:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Więcej informacji w „git help submodule�."
+
+#: builtin/add.c:405
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "dodawanie wbudowanego repozytorium gita: %s"
+
+#: builtin/add.c:424
+msgid ""
+"Use -f if you really want to add them.\n"
+"Turn this message off by running\n"
+"\"git config advice.addIgnoredFile false\""
+msgstr ""
+"Użyj -f, jeśli rzeczywiście chcesz je dodać.\n"
+"Wyłącz ten komunikat wykonując\n"
+"„git config advice.addIgnoredFile false�"
+
+#: builtin/add.c:433
+msgid "adding files failed"
+msgstr "dodawanie plików nie powiodło się"
+
+#: builtin/add.c:461 builtin/commit.c:345
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr "--pathspec-from-file i --interactive/--patch siÄ™ wykluczajÄ…"
+
+#: builtin/add.c:478
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr "--pathspec-from-file i --edit siÄ™ wykluczajÄ…"
+
+#: builtin/add.c:490
+msgid "-A and -u are mutually incompatible"
+msgstr "-A i -u siÄ™ wykluczajÄ…"
+
+#: builtin/add.c:493
+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"
+
+#: builtin/add.c:497
+#, 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
+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
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr "--pathspec-file-nul wymaga --pathspec-from-file"
+
+#: builtin/add.c:526
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Nic nie podano, nic nie dodano.\n"
+
+#: builtin/add.c:528
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"Może chodziło o „git add .�?\n"
+"Wyłącz ten komunikat wykonując\n"
+"„git config advice.addEmptyPathspec false�"
+
+#: builtin/am.c:352
+msgid "could not parse author script"
+msgstr "nie można przetworzyć skryptu autorstwa"
+
+#: builtin/am.c:436
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "skrypt applypatch-msg usunął „%s�"
+
+#: builtin/am.c:478
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "Uszkodzony wiersz wejścia: „%s�."
+
+#: builtin/am.c:516
+#, 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
+msgid "fseek failed"
+msgstr "fseek nie powiodło się"
+
+#: builtin/am.c:730
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "nie można przetworzyć łatki „%s�"
+
+#: builtin/am.c:795
+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
+msgid "invalid timestamp"
+msgstr "nieprawidłowy znacznik czasu"
+
+#: builtin/am.c:848 builtin/am.c:860
+msgid "invalid Date line"
+msgstr "nieprawidłowy wiersz Date"
+
+#: builtin/am.c:855
+msgid "invalid timezone offset"
+msgstr "nieprawidłowe przesunięcie strefy czasowej"
+
+#: builtin/am.c:948
+msgid "Patch format detection failed."
+msgstr "Nie można wykryć formatu łatki."
+
+#: builtin/am.c:953 builtin/clone.c:410
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "nie można utworzyć katalogu „%s�"
+
+#: builtin/am.c:958
+msgid "Failed to split patches."
+msgstr "Nie można rozdzielić łatek."
+
+#: builtin/am.c:1089
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Kiedy rozwiążesz problem, wykonaj „%s --continue�."
+
+#: builtin/am.c:1090
+#, 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
+#, 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
+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
+msgid "Patch is empty."
+msgstr "�atka jest pusta."
+
+#: builtin/am.c:1267
+#, c-format
+msgid "missing author line in commit %s"
+msgstr "brakuje wiersza autorstwa w zapisie %s"
+
+#: builtin/am.c:1270
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "błędny wiersz tożsamości: %.*s"
+
+#: builtin/am.c:1489
+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
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Używanie informacji z indeksu do odtworzenia drzewa podstawy..."
+
+#: builtin/am.c:1510
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Czy łatka była zmieniana ręcznie?\n"
+"Nie stosuje się do plików zapisanych w swoim indeksie."
+
+#: builtin/am.c:1516
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Uciekanie się do podstawy łatania i trójstronnego scalania..."
+
+#: builtin/am.c:1542
+msgid "Failed to merge in the changes."
+msgstr "Nie można scalić zmian."
+
+#: builtin/am.c:1574
+msgid "applying to an empty history"
+msgstr "stosowanie na pustej historii"
+
+#: builtin/am.c:1626 builtin/am.c:1630
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "nie można wznowić: %s nie istnieje."
+
+#: builtin/am.c:1648
+msgid "Commit Body is:"
+msgstr "Zawartość zapisu to:"
+
+#. 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:1658
+#, 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
+msgid "unable to write index file"
+msgstr "nie można zapisać pliku indeksu"
+
+#: builtin/am.c:1708
+#, 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
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Stosowanie: %.*s"
+
+#: builtin/am.c:1765
+msgid "No changes -- Patch already applied."
+msgstr "Brak zmian -- łatka już zastosowana."
+
+#: builtin/am.c:1771
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "�atanie nie powiodło się przy %s %.*s"
+
+#: builtin/am.c:1775
+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
+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 ""
+"Brak zmian - czy zapomniano użyć „git add�?\n"
+"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
+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 ""
+"W indeksie nadal są niescalone ścieżki.\n"
+"Należy dodać każdy plik „git add� z rozwiązanymi konfliktami, aby je tak "
+"oznaczyć.\n"
+"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
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "Nie można przetworzyć obiektu „%s�."
+
+#: builtin/am.c:1985
+msgid "failed to clean index"
+msgstr "nie można wyczyścić indeksu"
+
+#: builtin/am.c:2029
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Wydaje się, że HEAD się przesunęło od ostatniego niepowodzenia „am�.\n"
+"Nie cofanie do ORIG_HEAD"
+
+#: builtin/am.c:2136
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "Nieprawidłowa wartość --patch-format: %s"
+
+#: builtin/am.c:2178
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Nieprawidłowa wartość --show-current-patch: %s"
+
+#: builtin/am.c:2182
+#, 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
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<opcje>] [(<mbox> | <Maildir>)...]"
+
+#: builtin/am.c:2214
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<opcje>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2220
+msgid "run interactively"
+msgstr "uruchom interaktywnie"
+
+#: builtin/am.c:2222
+msgid "historical option -- no-op"
+msgstr "opcja historyczna — nic nie robi"
+
+#: builtin/am.c:2224
+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
+msgid "be quiet"
+msgstr "mniej komunikatów"
+
+#: builtin/am.c:2227
+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
+msgid "recode into utf8 (default)"
+msgstr "przekoduj na utf8 (domyślnie)"
+
+#: builtin/am.c:2232
+msgid "pass -k flag to git-mailinfo"
+msgstr "przekaż flagę -k do git-mailinfo"
+
+#: builtin/am.c:2234
+msgid "pass -b flag to git-mailinfo"
+msgstr "przekaż flagę -b do git-mailinfo"
+
+#: builtin/am.c:2236
+msgid "pass -m flag to git-mailinfo"
+msgstr "przekaż flagę -m do git-mailinfo"
+
+#: builtin/am.c:2238
+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
+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
+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
+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
+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/verify-tag.c:38
+msgid "format"
+msgstr "format"
+
+#: builtin/am.c:2270
+msgid "format the patch(es) are in"
+msgstr "format, w którym są łatki"
+
+#: builtin/am.c:2276
+msgid "override error message when patch failure occurs"
+msgstr "zastąp komunikat błędu, kiedy wystąpi błąd łatania"
+
+#: builtin/am.c:2278
+msgid "continue applying patches after resolving a conflict"
+msgstr "kontynuuj stosowanie Å‚atek po rozwiÄ…zaniu konfliktu"
+
+#: builtin/am.c:2281
+msgid "synonyms for --continue"
+msgstr "zamienniki dla --continue"
+
+#: builtin/am.c:2284
+msgid "skip the current patch"
+msgstr "pomiń obecną ścieżkę"
+
+#: builtin/am.c:2287
+msgid "restore the original branch and abort the patching operation"
+msgstr "przywróć pierwotną gałąź i przerwij łatanie"
+
+#: builtin/am.c:2290
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "przerwij operacjÄ™ Å‚atania, ale zostaw HEAD, gdzie jest"
+
+#: builtin/am.c:2294
+msgid "show the patch being applied"
+msgstr "pokaż właśnie stosowaną łatkę"
+
+#: builtin/am.c:2299
+msgid "lie about committer date"
+msgstr "zmyśl datę zapisu"
+
+#: builtin/am.c:2301
+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
+msgid "key-id"
+msgstr "id-klucza"
+
+#: builtin/am.c:2304 builtin/rebase.c:539 builtin/rebase.c:1401
+msgid "GPG-sign commits"
+msgstr "podpisuj zapisy GPG"
+
+#: builtin/am.c:2307
+msgid "(internal use for git-rebase)"
+msgstr "(użycie wewnętrzne w git-rebase)"
+
+#: builtin/am.c:2325
+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 ""
+"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
+msgid "failed to read the index"
+msgstr "nie można odczytać indeksu"
+
+#: builtin/am.c:2347
+#, 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
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Znaleziono bezpański katalog %s.\n"
+"Użyj „git am --abort� aby go usunąć."
+
+#: builtin/am.c:2377
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "Nie trwa operacja rozwiÄ…zywania, nie wznawiamy."
+
+#: builtin/am.c:2387
+msgid "interactive mode requires patches on the command line"
+msgstr "tryb interaktywny wymaga łatek w wierszu poleceń"
+
+#: builtin/apply.c:8
+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
+msgid "could not redirect output"
+msgstr "nie można przekierować wyjścia"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive: Zdalne repozytorium bez adresu"
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: oczekiwano ACK/NAK, otrzymano pakiet wypróżnienia"
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive: NACK %s"
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr "git archive: błąd protokołu"
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr "git archive: oczekiwano wypróżnienia"
+
+#: builtin/bisect--helper.c:23
+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 | --"
+"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>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{new,bad}=<określenie> --term-{old,"
+"good}=<określenie>] [--no-checkout] [--first-parent] [<złe> [<dobre>...]] "
+"[--] [<ścieżki>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+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-state (bad|new) [<rewizja>]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<rewizja>...]"
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <nazwa-pliku>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rewizja>|<zakres>)...]"
+
+#: builtin/bisect--helper.c:107
+#, 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
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "nie można pisać do pliku „%s�"
+
+#: builtin/bisect--helper.c:153
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "„%s� nie jest prawidłowym sformułowaniem"
+
+#: builtin/bisect--helper.c:157
+#, 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
+#, 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
+msgid "please use two different terms"
+msgstr "użyj dwóch różnych sformułowań"
+
+#: builtin/bisect--helper.c:193
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "Teraz nie przeszukujemy.\n"
+
+#: builtin/bisect--helper.c:201
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "„%s� nie jest prawidłowym zapisem"
+
+#: builtin/bisect--helper.c:210
+#, 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
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Błędny argument bisect_write: %s"
+
+#: builtin/bisect--helper.c:259
+#, 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
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "nie można otworzyć pliku „%s�"
+
+#: builtin/bisect--helper.c:297
+#, 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
+#, 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 ""
+"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
+#, 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 ""
+"Należy zacząć przez „git bisect start�.\n"
+"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
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "przeszukiwanie tylko z zapisem %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
+msgid "Are you sure [Y/n]? "
+msgstr "Czy na pewno [Y/n]? "
+
+#: builtin/bisect--helper.c:417
+msgid "no terms defined"
+msgstr "nie zdefiniowano sformułowań"
+
+#: builtin/bisect--helper.c:420
+#, c-format
+msgid ""
+"Your current terms are %s for the old state\n"
+"and %s for the new state.\n"
+msgstr ""
+"Bieżące sformułowania to %s na stary stan\n"
+"i %s na nowy stan.\n"
+
+#: builtin/bisect--helper.c:430
+#, c-format
+msgid ""
+"invalid argument %s for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+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
+msgid "revision walk setup failed\n"
+msgstr "nie udało się przygotować przejścia rewizji\n"
+
+#: builtin/bisect--helper.c:519
+#, 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
+msgid "'' is not a valid term"
+msgstr "„� nie jest prawidłowym sformułowaniem"
+
+#: builtin/bisect--helper.c:661
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "nierozpoznana opcja: „%s�"
+
+#: builtin/bisect--helper.c:665
+#, 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
+msgid "bad HEAD - I need a HEAD"
+msgstr "złe HEAD — potrzeba HEAD"
+
+#: builtin/bisect--helper.c:711
+#, 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
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "nie przeszukam na drzewie cg-seek'owanym"
+
+#: builtin/bisect--helper.c:735
+msgid "bad HEAD - strange symbolic ref"
+msgstr "złe HEAD — dziwna referencja symboliczna"
+
+#: builtin/bisect--helper.c:755
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "nieprawidłowa referencja: „%s�"
+
+#: builtin/bisect--helper.c:813
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Musisz rozpocząć przez „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
+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
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Wywołaj „--bisect-state� z przynajmniej jednym argumentem"
+
+#: builtin/bisect--helper.c:855
+#, 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
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Błędne wejście rev: %s"
+
+#: builtin/bisect--helper.c:912
+msgid "We are not bisecting."
+msgstr "Teraz nie przeszukujemy."
+
+#: builtin/bisect--helper.c:962
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "„%s�?? o czym ty w ogóle mówisz?"
+
+#: builtin/bisect--helper.c:974
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "nie można odczytać „%s� do odtwarzania"
+
+#: builtin/bisect--helper.c:1047
+msgid "reset the bisection state"
+msgstr "zresetuj stan przeszukiwania"
+
+#: builtin/bisect--helper.c:1049
+msgid "check whether bad or good terms exist"
+msgstr "sprawdź, czy istnieją złe lub dobre określenia"
+
+#: builtin/bisect--helper.c:1051
+msgid "print out the bisect terms"
+msgstr "wypisz tylko określenia przeszukiwania"
+
+#: builtin/bisect--helper.c:1053
+msgid "start the bisect session"
+msgstr "rozpocznij sesjÄ™ przeszukiwania"
+
+#: builtin/bisect--helper.c:1055
+msgid "find the next bisection commit"
+msgstr "znajdź kolejny zapis do przeszukiwania"
+
+#: builtin/bisect--helper.c:1057
+msgid "mark the state of ref (or refs)"
+msgstr "oznacz stan referencji"
+
+#: builtin/bisect--helper.c:1059
+msgid "list the bisection steps so far"
+msgstr "wypisz dotychczasowe kroki przeszukiwania"
+
+#: builtin/bisect--helper.c:1061
+msgid "replay the bisection process from the given file"
+msgstr "odtwórz proces przeszukiwania z podanego pliku"
+
+#: builtin/bisect--helper.c:1063
+msgid "skip some commits for checkout"
+msgstr "pomiń niektóre zapisy do wybrania"
+
+#: builtin/bisect--helper.c:1065
+msgid "no log for BISECT_WRITE"
+msgstr "brak dziennika do BISECT_WRITE"
+
+#: builtin/bisect--helper.c:1080
+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
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms wymaga maksymalnie jednego argumentu"
+
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next wymaga braku argumentów"
+
+#: builtin/bisect--helper.c:1111
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log wymaga braku argumentów"
+
+#: builtin/bisect--helper.c:1116
+msgid "no logfile given"
+msgstr "nie podano pliku dziennika"
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<opcje>] [<opcje-rewizji>] [<rewizja>] [--] <plik>"
+
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<opcje-rewizji> sÄ… opisane w git-rev-list(1)"
+
+#: builtin/blame.c:410
+#, c-format
+msgid "expecting a color: %s"
+msgstr "oczekiwano koloru: %s"
+
+#: builtin/blame.c:417
+msgid "must end with a color"
+msgstr "musi się kończyć kolorem"
+
+#: builtin/blame.c:728
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "błędny kolor „%s� w color.blame.repeatedLines"
+
+#: builtin/blame.c:746
+msgid "invalid value for blame.coloring"
+msgstr "nieprawidłowa wartość blame.coloring"
+
+#: builtin/blame.c:845
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "nie znaleziono rewizji %s do pominięcia"
+
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "pokaż elementy oskarżenia w miarę znajdywania, przyrostowo"
+
+#: builtin/blame.c:868
+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
+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
+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
+msgid "force progress reporting"
+msgstr "wymuś zgłaszanie postępu"
+
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "pokaż wynik wyjściowy elementów oskarżenia"
+
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "pokazuj pierwotną nazwę pliku (Domyślnie: automatycznie)"
+
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "pokaż pierwotny numer wiersza (domyślnie wyłączone)"
+
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
+msgstr "pokaż w formacie zaprojektowanym do przetwarzania maszynowego"
+
+#: builtin/blame.c:876
+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
+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
+msgid "show raw timestamp (Default: off)"
+msgstr "pokaż surowy znacznik czasu (domyślnie wyłączone)"
+
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "pokaż długie SHA-1 zapisu (domyślnie wyłączone)"
+
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "nie wypisuj nazwiska autora i znacznika czasu (domyślnie wyłączone)"
+
+#: builtin/blame.c:881
+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
+msgid "ignore whitespace differences"
+msgstr "ignoruj różnice w białych znakach"
+
+#: builtin/blame.c:883 builtin/log.c:1812
+msgid "rev"
+msgstr "rewizja"
+
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "pomiń <rewizję> przy obwinianiu"
+
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "pomiń rewizje z <pliku>"
+
+#: builtin/blame.c:885
+msgid "color redundant metadata from previous line differently"
+msgstr "koloruj inaczej zbędne metadane z poprzedniego wiersza"
+
+#: builtin/blame.c:886
+msgid "color lines by age"
+msgstr "koloruj wiersze według wieku"
+
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr "poświęć dodatkowe cykle, aby znaleźć lepsze dopasowanie"
+
+#: builtin/blame.c:888
+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
+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
+msgid "score"
+msgstr "wynik"
+
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
+msgstr "znajdź kopie wierszy w plikach i pomiędzy nimi"
+
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "znajdź ruchy wierszy w plikach i pomiędzy nimi"
+
+#: builtin/blame.c:892
+msgid "range"
+msgstr "zakres"
+
+#: builtin/blame.c:893
+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
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "nie można użyć --progress z --incremental ani formatami porcelanowymi"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:996
+msgid "4 years, 11 months ago"
+msgstr "4 lata, 11 miesięcy temu"
+
+#: builtin/blame.c:1112
+#, c-format
+msgid "file %s has only %lu line"
+msgid_plural "file %s has only %lu lines"
+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
+msgid "Blaming lines"
+msgstr "Obwinianie wierszy"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<opcje>] [-r | -a] [--merged] [--no-merged]"
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<opcje>] [-l] [-f] <nazwa-gałęzi> [<początek>]"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<opcje>] [-r] (-d | -D) <nazwa-gałęzi>..."
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<opcje>] (-m | -M) [<stara-gałąż>] <nowa-gałąź>"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opcje>] (-c | -C) [<stara-gałąż>] <nowa-gałąź>"
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<opcje>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<opcje>] [-r | -a] [--format]"
+
+#: builtin/branch.c:154
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+"         '%s', but not yet merged to HEAD."
+msgstr ""
+"usuwanie gałęzi „%s� scalonej z\n"
+"        „%s�, ale jeszcze nie scalonej z HEAD."
+
+#: builtin/branch.c:158
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD."
+msgstr ""
+"nie usuwam gałęzi „%s�, która nie jest jeszcze scalona z\n"
+"        „%s�, mimo że jest scalona z HEAD."
+
+#: builtin/branch.c:172
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "Nie odnaleziono obiektu zapisu „%s�"
+
+#: builtin/branch.c:176
+#, 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 ""
+"Gałąź „%s� nie jest w pełni scalona.\n"
+"Jeżeli na pewno chcesz ją usunąć, użyj „git branch -D %s�."
+
+#: builtin/branch.c:189
+msgid "Update of config-file failed"
+msgstr "Aktualizacja pliku konfiguracyjnego nie powiodła się"
+
+#: builtin/branch.c:223
+msgid "cannot use -a with -d"
+msgstr "-a i -d siÄ™ wykluczajÄ…"
+
+#: builtin/branch.c:230
+msgid "Couldn't look up commit object for HEAD"
+msgstr "Nie odnaleziono obiektu zapisu HEAD"
+
+#: builtin/branch.c:244
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "Nie można usunąć gałęzi „%s� wybranej w „%s�"
+
+#: builtin/branch.c:259
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "Nie znaleziono gałęzi śledzącej „%s�"
+
+#: builtin/branch.c:260
+#, c-format
+msgid "branch '%s' not found."
+msgstr "nie znaleziono gałęzi „%s�."
+
+#: builtin/branch.c:291
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Usunięto gałąź śledzącą %s (wskazywała %s).\n"
+
+#: builtin/branch.c:292
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "Usunięto gałąź %s (wskazywała %s).\n"
+
+#: builtin/branch.c:438 builtin/tag.c:61
+msgid "unable to parse format string"
+msgstr "nie można przetworzyć łańcucha formatu"
+
+#: builtin/branch.c:469
+msgid "could not resolve HEAD"
+msgstr "nie można rozwiązać HEAD"
+
+#: builtin/branch.c:475
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) wskazuje poza refs/heads/"
+
+#: builtin/branch.c:490
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Gałąź %s jest przestawiana na %s"
+
+#: builtin/branch.c:494
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Gałąź %s jest przeszukiwana w %s"
+
+#: builtin/branch.c:511
+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
+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
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Nieprawidłowa nazwa gałęzi: „%s�"
+
+#: builtin/branch.c:553
+msgid "Branch rename failed"
+msgstr "Zmiana nazwy gałęzi nie powiodła się"
+
+#: builtin/branch.c:555
+msgid "Branch copy failed"
+msgstr "Kopiowanie gałęzi nie powiodło się"
+
+#: builtin/branch.c:559
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "Skopiowano źle nazwaną gałąź „%s�"
+
+#: builtin/branch.c:562
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "Poprawiono nazwę gałęzi „%s�"
+
+#: builtin/branch.c:568
+#, 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
+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
+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
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+"  %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Edytuj opis gałęzi\n"
+"  %s\n"
+"Wiersze zaczynające się od „%c� zostaną wycięte.\n"
+
+#: builtin/branch.c:629
+msgid "Generic options"
+msgstr "Opcje ogólne"
+
+#: builtin/branch.c:631
+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
+msgid "suppress informational messages"
+msgstr "pomiń komunikaty informacyjne"
+
+#: builtin/branch.c:633
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "ustaw tryb śledzenia (zobacz git-pull(1))"
+
+#: builtin/branch.c:635
+msgid "do not use"
+msgstr "nie używaj"
+
+#: builtin/branch.c:637 builtin/rebase.c:534
+msgid "upstream"
+msgstr "zdalne-repozytorium"
+
+#: builtin/branch.c:637
+msgid "change the upstream info"
+msgstr "zmień gałąź nadrzędną"
+
+#: builtin/branch.c:638
+msgid "unset the upstream info"
+msgstr "usuń informacje o gałęzi nadrzędnej"
+
+#: builtin/branch.c:639
+msgid "use colored output"
+msgstr "użyj kolorowego wyjścia"
+
+#: builtin/branch.c:640
+msgid "act on remote-tracking branches"
+msgstr "działaj na gałęziach śledzących"
+
+#: builtin/branch.c:642 builtin/branch.c:644
+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
+msgid "print only branches that don't contain the commit"
+msgstr "wypisz tylko gałęzie nie zawierające tego zapisu"
+
+#: builtin/branch.c:648
+msgid "Specific git-branch actions:"
+msgstr "Działania typowe dla git-branch:"
+
+#: builtin/branch.c:649
+msgid "list both remote-tracking and local branches"
+msgstr "wypisz i śledzące i lokalne gałęzie"
+
+#: builtin/branch.c:651
+msgid "delete fully merged branch"
+msgstr "usuń całkowicie scaloną gałąź"
+
+#: builtin/branch.c:652
+msgid "delete branch (even if not merged)"
+msgstr "usuń gałąź (nawet niescaloną)"
+
+#: builtin/branch.c:653
+msgid "move/rename a branch and its reflog"
+msgstr "przenieś gałąź i jej dziennik referencji / zmień ich nazwę"
+
+#: builtin/branch.c:654
+msgid "move/rename a branch, even if target exists"
+msgstr "przenieś gałąź / zmień jej nazwę, nawet jeśli cel istnieje"
+
+#: builtin/branch.c:655
+msgid "copy a branch and its reflog"
+msgstr "skopiuj gałąź i jej dziennik referencji"
+
+#: builtin/branch.c:656
+msgid "copy a branch, even if target exists"
+msgstr "skopiuj gałąź, nawet jeśli cel istnieje"
+
+#: builtin/branch.c:657
+msgid "list branch names"
+msgstr "wypisz nazwy gałęzi"
+
+#: builtin/branch.c:658
+msgid "show current branch name"
+msgstr "pokaż nazwę bieżącej gałęzi"
+
+#: builtin/branch.c:659
+msgid "create the branch's reflog"
+msgstr "utwórz dziennik referencji gałęzi"
+
+#: builtin/branch.c:661
+msgid "edit the description for the branch"
+msgstr "edytuj opis gałęzi"
+
+#: builtin/branch.c:662
+msgid "force creation, move/rename, deletion"
+msgstr "wymuś utworzenie, przeniesienie/zmianę nazwy, usunięcie"
+
+#: builtin/branch.c:663
+msgid "print only branches that are merged"
+msgstr "wypisz tylko scalone gałęzie"
+
+#: builtin/branch.c:664
+msgid "print only branches that are not merged"
+msgstr "wypisz tylko niescalone gałęzie"
+
+#: builtin/branch.c:665
+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
+msgid "object"
+msgstr "obiekt"
+
+#: builtin/branch.c:668
+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
+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/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
+msgid "HEAD not found below refs/heads!"
+msgstr "nie znaleziono HEAD w refs/heads!"
+
+#: builtin/branch.c:717
+msgid "--column and --verbose are incompatible"
+msgstr "--column i --verbose siÄ™ wykluczajÄ…"
+
+#: builtin/branch.c:732 builtin/branch.c:788 builtin/branch.c:797
+msgid "branch name required"
+msgstr "wymagana nazwa gałęzi"
+
+#: builtin/branch.c:764
+msgid "Cannot give description to detached HEAD"
+msgstr "Nie można nadać opisu odłączonemu HEAD"
+
+#: builtin/branch.c:769
+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
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "Jeszcze nie ma zapisów na gałęzi „%s�."
+
+#: builtin/branch.c:779
+#, c-format
+msgid "No branch named '%s'."
+msgstr "Nie ma gałęzi „%s�."
+
+#: builtin/branch.c:794
+msgid "too many branches for a copy operation"
+msgstr "za dużo gałęzi do operacji kopiowania"
+
+#: builtin/branch.c:803
+msgid "too many arguments for a rename operation"
+msgstr "za dużo argumentów do operacji zmiany nazwy"
+
+#: builtin/branch.c:808
+msgid "too many arguments to set new upstream"
+msgstr "za dużo argumentów do ustawienia nadrzędnej gałęzi"
+
+#: builtin/branch.c:812
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+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
+#, c-format
+msgid "no such branch '%s'"
+msgstr "nie ma takiej gałęzi „%s�"
+
+#: builtin/branch.c:819
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "gałąź „%s� nie istnieje"
+
+#: builtin/branch.c:832
+msgid "too many arguments to unset upstream"
+msgstr "za dużo argumentów do usunięcia nadrzędnej gałęzi"
+
+#: builtin/branch.c:836
+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
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "Gałąź „%s� nie ma informacji o gałęzi nadrzędnej"
+
+#: builtin/branch.c:852
+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 ""
+"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
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+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
+msgid "git version:\n"
+msgstr "wersja gita:\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() zawiodło z błędem „%s� (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "informacje o kompilacji: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "informacje o bibliotece libc: "
+
+#: builtin/bugreport.c:80
+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
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <plik>] [-s|--suffix <format>]"
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"Dziękujemy za wypełnienie zgłoszenia o błędzie Gita!\n"
+"Odpowiedz na następujące pytania, aby pomóc nam zrozumieć problem.\n"
+"\n"
+"Co robiłeś/-aś zanim pojawił się błąd? (Kroki, aby odtworzyć problem)\n"
+"\n"
+"Co powinno się stać? (Oczekiwane zachowanie)\n"
+"\n"
+"Co stało się zamiast tego? (Rzeczywiste zachowanie)\n"
+"\n"
+"Jaka jest różnica między tym, co powinno się stać, a tym, co się stało?\n"
+"\n"
+"Inne cenne uwagi:\n"
+"\n"
+"Przejrzyj resztę zgłoszenia błędu poniżej.\n"
+"Możesz usunąć wiersze, którymi nie chcesz się dzielić.\n"
+
+#: builtin/bugreport.c:135
+msgid "specify a destination for the bugreport file"
+msgstr "podaj cel pliku ze zgłoszeniem błędu"
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr "podaj sufiks w formacie strftime do nazwy pliku"
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "nie można utworzyć wiodących katalogów „%s�"
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr "Informacje o systemie"
+
+#: builtin/bugreport.c:169
+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
+#, c-format
+msgid "unable to write to %s"
+msgstr "nie można pisać do %s"
+
+#: builtin/bugreport.c:189
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Utworzono nowe zgłoszenie w „%s�.\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<opcje>] <plik> <argumenty git-rev-list>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<opcje>] <plik>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <plik> [<referencja>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <plik> [<referencja>...]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3495
+msgid "do not show progress meter"
+msgstr "nie pokazuj wskaźnika postępu"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3497
+msgid "show progress meter"
+msgstr "pokazuj wskaźnik postępu"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3499
+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
+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
+msgid "specify bundle format version"
+msgstr "podaj wersjÄ™ formatu wiÄ…zki"
+
+#: builtin/bundle.c:96
+msgid "Need a repository to create a bundle."
+msgstr "Należy podać repozytorium, aby utworzyć wiązkę."
+
+#: builtin/bundle.c:107
+msgid "do not show bundle details"
+msgstr "nie pokazuj szczegółów wiązki"
+
+#: builtin/bundle.c:122
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s jest w porzÄ…dku\n"
+
+#: builtin/bundle.c:163
+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:193 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Nieznane pod-polecenie: %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-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <rodzaj> | --textconv | --filters) [--path=<ścieżka>] <obiekt>"
+
+#: 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:620
+msgid "only one batch option may be specified"
+msgstr "można podać tylko jedną opcję wsadową „batch�"
+
+#: builtin/cat-file.c:638
+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
+msgid "show object type"
+msgstr "pokaż typ obiektu"
+
+#: builtin/cat-file.c:640
+msgid "show object size"
+msgstr "pokaż rozmiar obiektu"
+
+#: builtin/cat-file.c:642
+msgid "exit with zero when there's no error"
+msgstr "zwróć zero, kiedy nie ma błędu"
+
+#: builtin/cat-file.c:643
+msgid "pretty-print object's content"
+msgstr "ładnie wypisz zawartość obiektu"
+
+#: builtin/cat-file.c:645
+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
+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
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:649
+msgid "use a specific path for --textconv/--filters"
+msgstr "użyj podanej ścieżki do --textconv/--filters"
+
+#: builtin/cat-file.c:651
+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
+msgid "buffer --batch output"
+msgstr "buforuj wyjście --batch"
+
+#: builtin/cat-file.c:654
+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
+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
+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
+msgid "show all objects with --batch or --batch-check"
+msgstr "pokaż wszystkie obiekty z --batch lub --batch-check"
+
+#: builtin/cat-file.c:666
+msgid "do not order --batch-all-objects output"
+msgstr "nie porządkuj wyjścia --batch-all-objects"
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <atrybut>...] [--] <ścieżka>..."
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <atrybut>...]"
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr "zgłaszaj wszystkie atrybuty ustawione na pliku"
+
+#: builtin/check-attr.c:22
+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
+msgid "read file names from stdin"
+msgstr "wczytaj nazwy plików ze standardowego wejścia"
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+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
+msgid "suppress progress reporting"
+msgstr "nie zgłaszaj postępu"
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr "pokaż niepasujące ścieżki wejściowe"
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr "pomiń indeks przy sprawdzaniu"
+
+#: builtin/check-ignore.c:163
+msgid "cannot specify pathnames with --stdin"
+msgstr "nie można podać ścieżek z --stdin"
+
+#: builtin/check-ignore.c:166
+msgid "-z only makes sense with --stdin"
+msgstr "-z ma sens tylko z --stdin"
+
+#: builtin/check-ignore.c:168
+msgid "no path specified"
+msgstr "nie podano ścieżki"
+
+#: builtin/check-ignore.c:172
+msgid "--quiet is only valid with a single pathname"
+msgstr "--quiet ma sens tylko z pojedynczą ścieżką"
+
+#: builtin/check-ignore.c:174
+msgid "cannot have both --quiet and --verbose"
+msgstr "--quiet i --verbose siÄ™ wykluczajÄ…"
+
+#: builtin/check-ignore.c:177
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching ma sens tylko z --verbose"
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<opcje>] <kontakt>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "wczytaj kontakty także ze standardowego wejścia"
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "nie można przetworzyć kontaktu: %s"
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "nie podano kontaktów"
+
+#: builtin/checkout-index.c:152
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<opcje>] [--] [<plik>...]"
+
+#: builtin/checkout-index.c:169
+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
+msgid "check out all files in the index"
+msgstr "wybierz wszystkie pliki z indeksu"
+
+#: builtin/checkout-index.c:187
+msgid "force overwrite of existing files"
+msgstr "wymuś nadpisanie istniejących plików"
+
+#: builtin/checkout-index.c:189
+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
+msgid "don't checkout new files"
+msgstr "nie wybieraj nowych plików"
+
+#: builtin/checkout-index.c:193
+msgid "update stat information in the index file"
+msgstr "zaktualizuj informacje stat w pliku indeksu"
+
+#: builtin/checkout-index.c:197
+msgid "read list of paths from the standard input"
+msgstr "odczytaj listę ścieżek ze standardowego wejścia"
+
+#: builtin/checkout-index.c:199
+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
+msgid "copy out the files from named stage"
+msgstr "wykopiuj pliki z nazwanego przygotowania"
+
+#: builtin/checkout.c:31
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<opcje>] <gałąź>"
+
+#: builtin/checkout.c:32
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<opcje>] [<gałąź>] -- <plik>..."
+
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<opcje>] <gałąź>"
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<opcje>] [--source=<gałąź>] <plik>..."
+
+#: builtin/checkout.c:188 builtin/checkout.c:227
+#, 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
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "ścieżka „%s� nie ma „ich� wersji"
+
+#: builtin/checkout.c:206
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "ścieżka „%s� nie ma wszystkich potrzebnych wersji"
+
+#: builtin/checkout.c:258
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "ścieżka „%s� nie ma potrzebnych wersji"
+
+#: builtin/checkout.c:275
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "ścieżka „%s�: nie można scalić"
+
+#: builtin/checkout.c:291
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Nie można dodać wyniku scalenia dla „%s�"
+
+#: builtin/checkout.c:396
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "Odtworzono %d konflikt scalenia"
+msgstr[1] "Odtworzono %d konflikty scalenia"
+msgstr[2] "Odtworzono %d konfliktów scalenia"
+
+#: builtin/checkout.c:401
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+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
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+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
+#, 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
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "„%s� i %s wykluczają się"
+
+#: builtin/checkout.c:451
+#, 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
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "nie podano ani „%s� ani „%s�"
+
+#: builtin/checkout.c:459
+#, 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
+#, 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
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "ścieżka „%s� jest niescalona"
+
+#: builtin/checkout.c:718
+msgid "you need to resolve your current index first"
+msgstr "musisz najpierw rozwiązać bieżący indeks"
+
+#: builtin/checkout.c:772
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"nie można kontynuować z przygotowanymi zmianami w następujących plikach:\n"
+"%s"
+
+#: builtin/checkout.c:865
+#, 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
+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
+msgid "unable to update HEAD"
+msgstr "nie można zaktualizować HEAD"
+
+#: builtin/checkout.c:915
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Zresetuj gałąź „%s�\n"
+
+#: builtin/checkout.c:918
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Już jesteś na „%s�\n"
+
+#: builtin/checkout.c:922
+#, 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
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Przełączono na nową gałąź „%s�\n"
+
+#: builtin/checkout.c:926
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Przełączono na gałąź „%s�\n"
+
+#: builtin/checkout.c:977
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... i %d innych.\n"
+
+#: builtin/checkout.c:983
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+"Ostrzeżenie: zostawiasz za sobą %d zapis, niepowiązany z żadną\n"
+"z gałęzi:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Ostrzeżenie: zostawiasz za sobą %d zapisy, niepowiązane z żadną\n"
+"z gałęzi:\n"
+"\n"
+"%s\n"
+msgstr[2] ""
+"Ostrzeżenie: zostawiasz za sobą %d zapisów, niepowiązanych z żadną\n"
+"z gałęzi:\n"
+"\n"
+"%s\n"
+
+#: builtin/checkout.c:1002
+#, c-format
+msgid ""
+"If you want to keep it by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+"Jeśli chcesz go zachować tworząc nową gałąź, to może być dobry moment\n"
+"na zrobienie tego:\n"
+"\n"
+" git branch <nazwa-nowej-gałęzi> %s\n"
+"\n"
+msgstr[1] ""
+"Jeśli chcesz je zachować tworząc nową gałąź, to może być dobry moment\n"
+"na zrobienie tego:\n"
+"\n"
+" git branch <nazwa-nowej-gałęzi> %s\n"
+"\n"
+msgstr[2] ""
+"Jeśli chcesz je zachować tworząc nową gałąź, to może być dobry moment\n"
+"na zrobienie tego:\n"
+"\n"
+" git branch <nazwa-nowej-gałęzi> %s\n"
+"\n"
+
+#: builtin/checkout.c:1037
+msgid "internal error in revision walk"
+msgstr "wewnętrzny błąd w przechodzeniu rewizji"
+
+#: builtin/checkout.c:1041
+msgid "Previous HEAD position was"
+msgstr "Poprzednim wskazaniem HEAD było"
+
+#: builtin/checkout.c:1081 builtin/checkout.c:1350
+msgid "You are on a branch yet to be born"
+msgstr "Jesteś na gałęzi, która dopiero ma powstać"
+
+#: builtin/checkout.c:1163
+#, 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� 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
+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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Jeśli chodziło o wybranie gałęzi śledzącej, np. na „origin�,\n"
+"możesz to zrobić podając pełną nazwę z opcją --track:\n"
+"\n"
+"    git checkout --track origin/<nazwa>\n"
+"\n"
+"Jeśli chcesz, żeby wybrania wszystkich niejednoznacznych\n"
+"<nazw> preferowały jedno zdalne repozytorium, rozważ ustawienie\n"
+"checkout.defaultRemote=origin w swoich ustawieniach."
+
+#: builtin/checkout.c:1180
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "„%s� pasuje do wielu (%d) gałęzi śledzących"
+
+#: builtin/checkout.c:1246
+msgid "only one reference expected"
+msgstr "oczekiwano tylko jednej referencji"
+
+#: builtin/checkout.c:1263
+#, 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
+#, c-format
+msgid "invalid reference: %s"
+msgstr "nieprawidłowa referencja: %s"
+
+#: builtin/checkout.c:1322 builtin/checkout.c:1688
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "referencja nie jest drzewem: %s"
+
+#: builtin/checkout.c:1369
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "oczekiwano gałęzi, otrzymano tag „%s�"
+
+#: builtin/checkout.c:1371
+#, 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
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "oczekiwano gałęzi, otrzymano „%s�"
+
+#: builtin/checkout.c:1375
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "oczekiwano gałęzi, otrzymano zapis „%s�"
+
+#: builtin/checkout.c:1391
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"Nie można przełączyć gałęzi w trakcie scalania\n"
+"Rozważ „git merge --quit� lub „git worktree add�."
+
+#: builtin/checkout.c:1395
+msgid ""
+"cannot switch branch in the middle of an am session\n"
+"Consider \"git am --quit\" or \"git worktree add\"."
+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
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"Nie można przełączyć gałęzi w trakcie przestawiania\n"
+"Rozważ „git rebase --quit� lub „git worktree add�."
+
+#: builtin/checkout.c:1403
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+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
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"Nie można przełączyć gałęzi w trakcie odwracania\n"
+"Rozważ „git revert --quit� lub „git worktree add�."
+
+#: builtin/checkout.c:1411
+msgid "you are switching branch while bisecting"
+msgstr "zmiana gałęzi w trakcie przeszukiwania"
+
+#: builtin/checkout.c:1418
+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
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "„%s� nie może być użyte 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
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "„%s� i „%s� wykluczają się"
+
+#: builtin/checkout.c:1446
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "„%s� nie może przyjąć <punktu-startowego>"
+
+#: builtin/checkout.c:1454
+#, 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
+msgid "missing branch or commit argument"
+msgstr "brakuje argumentu gałęzi lub zapisu"
+
+#: builtin/checkout.c:1504
+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
+msgid "style"
+msgstr "styl"
+
+#: builtin/checkout.c:1506
+msgid "conflict style (merge or diff3)"
+msgstr "styl konfliktów (merge lub diff3)"
+
+#: builtin/checkout.c:1518 builtin/worktree.c:486
+msgid "detach HEAD at named commit"
+msgstr "odłącz HEAD na podanym zapisie"
+
+#: builtin/checkout.c:1519
+msgid "set upstream info for new branch"
+msgstr "ustaw gałąź nadrzędną nowej gałęzi"
+
+#: builtin/checkout.c:1521
+msgid "force checkout (throw away local modifications)"
+msgstr "wymuś wybranie (wyrzuć lokalne zmiany)"
+
+#: builtin/checkout.c:1523
+msgid "new-branch"
+msgstr "nowa-gałąź"
+
+#: builtin/checkout.c:1523
+msgid "new unparented branch"
+msgstr "nowa gałąź bez rodzica"
+
+#: builtin/checkout.c:1525 builtin/merge.c:301
+msgid "update ignored files (default)"
+msgstr "aktualizuj ignorowane pliki (domyślnie)"
+
+#: builtin/checkout.c:1528
+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
+msgid "checkout our version for unmerged files"
+msgstr "wybierz „naszą� wersję niescalonych plików"
+
+#: builtin/checkout.c:1544
+msgid "checkout their version for unmerged files"
+msgstr "wybierz „ich� wersję niescalonych plików"
+
+#: builtin/checkout.c:1548
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "nie ograniczaj ścieżek tylko do rzadkich elementów"
+
+#: builtin/checkout.c:1603
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c i --orphan siÄ™ wykluczajÄ…"
+
+#: builtin/checkout.c:1607
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p i --overlay siÄ™ wykluczajÄ…"
+
+#: builtin/checkout.c:1644
+msgid "--track needs a branch name"
+msgstr "--track potrzebuje nazwy gałęzi"
+
+#: builtin/checkout.c:1649
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "brakuje nazwy gałęzi; spróbuj -%c"
+
+#: builtin/checkout.c:1681
+#, c-format
+msgid "could not resolve %s"
+msgstr "nie można rozwiązać %s"
+
+#: builtin/checkout.c:1697
+msgid "invalid path specification"
+msgstr "nieprawidłowa ścieżka"
+
+#: builtin/checkout.c:1704
+#, 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
+#, 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
+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
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file i --patch siÄ™ wykluczajÄ…"
+
+#: builtin/checkout.c:1733
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force i --merge siÄ™ wykluczajÄ…, gdy\n"
+"wybieranie z indeksu."
+
+#: builtin/checkout.c:1738
+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
+msgid "branch"
+msgstr "gałąź"
+
+#: builtin/checkout.c:1765
+msgid "create and checkout a new branch"
+msgstr "utwórz i wybierz nową gałąź"
+
+#: builtin/checkout.c:1767
+msgid "create/reset and checkout a branch"
+msgstr "utwórz/zresetuj i wybierz gałąź"
+
+#: builtin/checkout.c:1768
+msgid "create reflog for new branch"
+msgstr "utwórz dziennik referencji nowej gałęzi"
+
+#: builtin/checkout.c:1770
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "spróbuj zgadnąć „git checkout <nieistniejąca-gałąź>� (domyślnie)"
+
+#: builtin/checkout.c:1771
+msgid "use overlay mode (default)"
+msgstr "użyj trybu nakładki (domyślnie)"
+
+#: builtin/checkout.c:1816
+msgid "create and switch to a new branch"
+msgstr "utwórz i przełącz na nową gałąź"
+
+#: builtin/checkout.c:1818
+msgid "create/reset and switch to a branch"
+msgstr "utwórz/zresetuj i przełącz na gałąź"
+
+#: builtin/checkout.c:1820
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "spróbuj zgadnąć „git switch <nieistniejąca-gałąź>�"
+
+#: builtin/checkout.c:1822
+msgid "throw away local modifications"
+msgstr "wyrzuć lokalne zmiany"
+
+#: builtin/checkout.c:1856
+msgid "which tree-ish to checkout from"
+msgstr "z którego drzewa wybrać"
+
+#: builtin/checkout.c:1858
+msgid "restore the index"
+msgstr "przywróć indeks"
+
+#: builtin/checkout.c:1860
+msgid "restore the working tree (default)"
+msgstr "przywróć drzewo robocze (domyślnie)"
+
+#: builtin/checkout.c:1862
+msgid "ignore unmerged entries"
+msgstr "pomiń niescalone elementy"
+
+#: builtin/checkout.c:1863
+msgid "use overlay mode"
+msgstr "użyj trybu nakładki"
+
+#: 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 <wzorzec>] [-x | -X] [--] <ścieżki>..."
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Removing %s\n"
+msgstr "Usuwanie %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Usunięto by %s\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "Pomijanie repozytorium %s\n"
+
+#: builtin/clean.c:36
+#, c-format
+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
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a numbered item\n"
+"foo        - select item based on unique prefix\n"
+"           - (empty) select nothing\n"
+msgstr ""
+"Pomoc do zachęty:\n"
+"1          - wybierz kolejny element\n"
+"foo        - wybierz element po unikatowym poczÄ…tku\n"
+"           - (puste) nic nie wybiera\n"
+
+#: builtin/clean.c:306 git-add--interactive.perl:602
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a single item\n"
+"3-5        - select a range of items\n"
+"2-3,6-9    - select multiple ranges\n"
+"foo        - select item based on unique prefix\n"
+"-...       - unselect specified items\n"
+"*          - choose all items\n"
+"           - (empty) finish selecting\n"
+msgstr ""
+"Pomoc do zachęty:\n"
+"1          - wybierz jeden element\n"
+"3-5        - wybierz zakres elementów\n"
+"2-3,6-9    - wybierz wiele zakresów\n"
+"foo        - wybierz element po unikatowym poczÄ…tku\n"
+"-...       - nie wybieraj elementów\n"
+"*          - wybierz wszystko\n"
+"           - (puste) zakończ zaznaczanie\n"
+
+#: builtin/clean.c:521 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
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Wprowadź wzorce ignorowania>> "
+
+#: builtin/clean.c:696
+#, 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
+msgid "Select items to delete"
+msgstr "Wybierz elementy do skasowania"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:758
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "Usunąć %s [y/N]? "
+
+#: builtin/clean.c:789
+msgid ""
+"clean               - start cleaning\n"
+"filter by pattern   - exclude items from deletion\n"
+"select by numbers   - select items to be deleted by numbers\n"
+"ask each            - confirm each deletion (like \"rm -i\")\n"
+"quit                - stop cleaning\n"
+"help                - this screen\n"
+"?                   - help for prompt selection"
+msgstr ""
+"clean               - rozpocznij czyszczenie\n"
+"filter by pattern   - pomiń elementy przy usuwaniu\n"
+"select by numbers   - wybierz elementy do usunięcia według numerów\n"
+"ask each            - potwierdź każde usunięcie (jak „rm -i�)\n"
+"quit                - przestań czyścić\n"
+"help                - ten ekran\n"
+"?                   - pomoc do zachęty wyboru"
+
+#: builtin/clean.c:825
+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
+msgid "No more files to clean, exiting."
+msgstr "Brak plików do wyczyszczenia, wyjście."
+
+#: builtin/clean.c:903
+msgid "do not print names of files removed"
+msgstr "nie wypisuj nazw usuwanym plików"
+
+#: builtin/clean.c:905
+msgid "force"
+msgstr "wymuÅ›"
+
+#: builtin/clean.c:906
+msgid "interactive cleaning"
+msgstr "interaktywne czyszczenie"
+
+#: builtin/clean.c:908
+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/show-ref.c:179
+msgid "pattern"
+msgstr "wzorzec"
+
+#: builtin/clean.c:910
+msgid "add <pattern> to ignore rules"
+msgstr "dodaj <wzorzec> do reguł ignorowania"
+
+#: builtin/clean.c:911
+msgid "remove ignored files, too"
+msgstr "usuń też ignorowane pliki"
+
+#: builtin/clean.c:913
+msgid "remove only ignored files"
+msgstr "usuń tylko ignorowane pliki"
+
+#: builtin/clean.c:929
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce ustawione na true, a nie podano -i, -n ani -f; odmawiam "
+"czyszczenia"
+
+#: builtin/clean.c:932
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce to domyślnie true, a nie podano -i, -n ani -f; odmawiam "
+"czyszczenia"
+
+#: builtin/clean.c:944
+msgid "-x and -X cannot be used together"
+msgstr "-x i -X wykluczajÄ… siÄ™"
+
+#: builtin/clone.c:45
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<opcje>] [--] <repozytorium> [<katalog>]"
+
+#: builtin/clone.c:94
+msgid "don't create a checkout"
+msgstr "nie wybieraj plików"
+
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
+msgid "create a bare repository"
+msgstr "utwórz suche repozytorium"
+
+#: builtin/clone.c:99
+msgid "create a mirror repository (implies bare)"
+msgstr "utwórz lustrzane repozytorium (zakłada suche)"
+
+#: builtin/clone.c:101
+msgid "to clone from a local repository"
+msgstr "aby sklonować z lokalnego repozytorium"
+
+#: builtin/clone.c:103
+msgid "don't use local hardlinks, always copy"
+msgstr "nie używaj twardych dowiązań, zawsze kopiuj"
+
+#: builtin/clone.c:105
+msgid "setup as shared repository"
+msgstr "ustaw jako repozytorium dzielone"
+
+#: builtin/clone.c:107
+msgid "pathspec"
+msgstr "ścieżka"
+
+#: builtin/clone.c:107
+msgid "initialize submodules in the clone"
+msgstr "zainicjuj pod-moduły w klonie"
+
+#: builtin/clone.c:111
+msgid "number of submodules cloned in parallel"
+msgstr "liczba pod-modułów klonowanych równolegle"
+
+#: builtin/clone.c:112 builtin/init-db.c:552
+msgid "template-directory"
+msgstr "katalog-szablonów"
+
+#: builtin/clone.c:113 builtin/init-db.c:553
+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
+msgid "reference repository"
+msgstr "repozytorium odniesienia"
+
+#: builtin/clone.c:119 builtin/submodule--helper.c:1833
+#: builtin/submodule--helper.c:2338
+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
+msgid "name"
+msgstr "nazwa"
+
+#: builtin/clone.c:121
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "użyj <nazwy> zamiast „origin�, żeby śledzić zdalne repozytorium"
+
+#: builtin/clone.c:123
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "wybierz <gałąź> zamiast zdalnego HEAD"
+
+#: builtin/clone.c:125
+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
+msgid "depth"
+msgstr "głębokość"
+
+#: builtin/clone.c:127
+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
+msgid "time"
+msgstr "czas"
+
+#: builtin/clone.c:129
+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
+msgid "revision"
+msgstr "rewizja"
+
+#: builtin/clone.c:131 builtin/fetch.c:181 builtin/pull.c:215
+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
+msgid "clone only one branch, HEAD or --branch"
+msgstr "sklonuj tylko jedną gałąź, HEAD lub --branch"
+
+#: builtin/clone.c:135
+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
+msgid "any cloned submodules will be shallow"
+msgstr "wszystkie sklonowane pod-moduły będą płytkie"
+
+#: builtin/clone.c:138 builtin/init-db.c:561
+msgid "gitdir"
+msgstr "katalog-gita"
+
+#: builtin/clone.c:139 builtin/init-db.c:562
+msgid "separate git dir from working tree"
+msgstr "oddziel katalog gita od drzewa roboczego"
+
+#: builtin/clone.c:140
+msgid "key=value"
+msgstr "klucz=wartość"
+
+#: builtin/clone.c:141
+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
+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
+msgid "option to transmit"
+msgstr "nadaj opcjÄ™"
+
+#: builtin/clone.c:144 builtin/fetch.c:199 builtin/pull.c:234
+#: builtin/push.c:585
+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
+msgid "use IPv6 addresses only"
+msgstr "używaj tylko adresów IPv6"
+
+#: builtin/clone.c:150
+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"
+
+#: builtin/clone.c:152
+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
+#, 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
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s istnieje i nie jest katalogiem"
+
+#: builtin/clone.c:432
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "nie można rozpocząć iteracji po „%s�"
+
+#: builtin/clone.c:463
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "nie można utworzyć dowiązania „%s�"
+
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "nie można skopiować pliku do „%s�"
+
+#: builtin/clone.c:472
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "nie można iterować po „%s�"
+
+#: builtin/clone.c:499
+#, c-format
+msgid "done.\n"
+msgstr "gotowe.\n"
+
+#: builtin/clone.c:513
+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 ""
+"Klonowanie powiodło się, ale już nie wybieranie.\n"
+"Możesz zobaczyć, co zostało wybrane w „git status�\n"
+"i ponowić przez „git restore --source=HEAD :/�\n"
+
+#: builtin/clone.c:590
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "Nie znaleziono zdalnej gałęzi %s do sklonowania."
+
+#: builtin/clone.c:709
+#, c-format
+msgid "unable to update %s"
+msgstr "nie można zaktualizować %s"
+
+#: builtin/clone.c:757
+msgid "failed to initialize sparse-checkout"
+msgstr "nie można zainicjować rzadkiego wybrania"
+
+#: builtin/clone.c:780
+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
+msgid "unable to checkout working tree"
+msgstr "nie można wybrać drzewa roboczego"
+
+#: builtin/clone.c:887
+msgid "unable to write parameters to config file"
+msgstr "nie można zapisać parametrów do pliku konfiguracyjnego"
+
+#: builtin/clone.c:950
+msgid "cannot repack to clean up"
+msgstr "nie można przepakować, żeby posprzątać"
+
+#: builtin/clone.c:952
+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
+msgid "Too many arguments."
+msgstr "Zbyt dużo argumentów."
+
+#: builtin/clone.c:997
+msgid "You must specify a repository to clone."
+msgstr "Musisz określić repozytorium do sklonowania."
+
+#: builtin/clone.c:1010
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "opcje --bare i --origin %s wykluczajÄ… siÄ™."
+
+#: builtin/clone.c:1013
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare i --separate-git-dir siÄ™ wykluczajÄ…."
+
+#: builtin/clone.c:1026
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "repozytorium „%s� nie istnieje"
+
+#: builtin/clone.c:1030 builtin/fetch.c:1951
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "głębokość %s nie jest liczbą dodatnią"
+
+#: builtin/clone.c:1040
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "nie można utworzyć wiodących katalogów „%s�"
+
+#: builtin/clone.c:1080
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "nie można utworzyć katalogu drzewa roboczego „%s�"
+
+#: builtin/clone.c:1100
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Klonowanie do suchego repozytorium „%s�...\n"
+
+#: builtin/clone.c:1102
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Klonowanie do „%s�...\n"
+
+#: builtin/clone.c:1126
+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
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "„%s� nie jest prawidłową nazwą zdalnego repozytorium"
+
+#: builtin/clone.c:1211
+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
+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
+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
+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
+msgid "source repository is shallow, ignoring --local"
+msgstr "źródłowe repozytorium jest płytkie, ignorowanie --local"
+
+#: builtin/clone.c:1225
+msgid "--local is ignored"
+msgstr "--local jest ignorowane"
+
+#: builtin/clone.c:1315 builtin/clone.c:1323
+#, 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
+msgid "You appear to have cloned an empty repository."
+msgstr "Wygląda na to, że sklonowano puste repozytorium."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<opcje>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "odczytaj wartości konfiguracji"
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "układ do użycia"
+
+#: builtin/column.c:30
+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"
+
+#: builtin/column.c:32
+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"
+
+#: 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
+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
+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 <katalog-obiektów>] [--append] [--"
+"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
+msgid "dir"
+msgstr "katalog"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr "katalog obiektów do przechowania grafu"
+
+#: builtin/commit-graph.c:83
+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
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Nie można otworzyć grafu zapisów „%s�"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "nierozpoznany argument --split, %s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "nieoczekiwany nieszesnastkowy identyfikator obiektu: %s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "nieprawidłowy obiekt: %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "zacznij przechodzenie po wszystkich referencjach"
+
+#: builtin/commit-graph.c:215
+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
+msgid "start walk at commits listed by stdin"
+msgstr "zacznij przechodzenie od zapisów wypisanych na standardowym wejściu"
+
+#: builtin/commit-graph.c:219
+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
+msgid "enable computation for changed paths"
+msgstr "włącz obliczanie zmienionych ścieżek"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "pozwól zapisać przyrostowy plik grafu zapisów"
+
+#: builtin/commit-graph.c:228
+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
+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
+msgid "only expire files older than a given date-time"
+msgstr "wygaś tylko obiekty starsze niż podany czas"
+
+#: builtin/commit-graph.c:234
+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
+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
+msgid "Collecting commits from input"
+msgstr "Zbieranie zapisów z wejścia"
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <rodzic>)...] [-S[<id-klucza>]] [(-m <komunikat>)...] "
+"[(-F <plik>)...] <drzewo>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+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
+#, 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
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: nie można odczytać „%s�"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: nie można zamknąć „%s�"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "rodzic"
+
+#: builtin/commit-tree.c:112
+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
+msgid "message"
+msgstr "komunikat"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
+msgid "commit message"
+msgstr "komunikat zapisu"
+
+#: builtin/commit-tree.c:118
+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
+msgid "GPG sign commit"
+msgstr "podpisz zapis GPG"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "należy podać tylko jedno drzewo"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: nie można odczytać"
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<opcje>] [--] <ścieżka>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<opcje>] [--] <ścieżka>..."
+
+#: builtin/commit.c:51
+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 ""
+"Kazano poprawić najnowszy zapis, ale stałby się on przez to pusty.\n"
+"Możesz powtórzyć polecenie z --allow-empty, lub usunąć ten zapis\n"
+"całkowicie przez „git reset HEAD^�.\n"
+
+#: builtin/commit.c:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+msgstr ""
+"Poprzednie dobranie (cherry-pick) jest teraz puste — możliwe, że przez "
+"rozwiÄ…zane konflikty.\n"
+"Jeśli i tak chcesz je złożyć, użyj:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "W przeciwnym wypadku użyj „git rebase --skip�\n"
+
+#: builtin/commit.c:66
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "W przeciwnym wypadku użyj „git cherry-pick --skip�\n"
+
+#: builtin/commit.c:69
+msgid ""
+"and then use:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+msgstr ""
+"a wtedy użyj:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"aby wznowić dobieranie pozostałych zapisów.\n"
+"Jeśli chcesz pominąć ten zapis, użyj:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+
+#: builtin/commit.c:312
+msgid "failed to unpack HEAD tree object"
+msgstr "nie można rozpakować obiektu drzewa HEAD"
+
+#: builtin/commit.c:348
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file i -a wykluczajÄ… siÄ™"
+
+#: builtin/commit.c:361
+msgid "No paths with --include/--only does not make sense."
+msgstr "Brak ścieżek z --include/--only nie ma sensu."
+
+#: builtin/commit.c:373
+msgid "unable to create temporary index"
+msgstr "nie można utworzyć tymczasowego indeksu"
+
+#: builtin/commit.c:382
+msgid "interactive add failed"
+msgstr "interaktywne dodawanie nie powiodło się"
+
+#: builtin/commit.c:397
+msgid "unable to update temporary index"
+msgstr "nie można zaktualizować tymczasowego indeksu"
+
+#: builtin/commit.c:399
+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
+msgid "unable to write new_index file"
+msgstr "nie można zapisać pliku new_index"
+
+#: builtin/commit.c:476
+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
+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
+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
+msgid "cannot read the index"
+msgstr "nie można odczytać indeksu"
+
+#: builtin/commit.c:507
+msgid "unable to write temporary index file"
+msgstr "nie można zapisać tymczasowego pliku indeksu"
+
+#: builtin/commit.c:605
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "zapis „%s� nie ma nagłówka autora"
+
+#: builtin/commit.c:607
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "zapis „%s� ma nieprawidłowy wiersz autorstwa"
+
+#: builtin/commit.c:626
+msgid "malformed --author parameter"
+msgstr "nieprawidłowy parametr --author"
+
+#: builtin/commit.c:679
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+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
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "nie odnaleziono zapisu %s"
+
+#: builtin/commit.c:729 builtin/shortlog.c:413
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(czytanie komunikatu dziennika ze standardowego wejścia)\n"
+
+#: builtin/commit.c:731
+msgid "could not read log from standard input"
+msgstr "nie można odczytać dziennika ze standardowego wejścia"
+
+#: builtin/commit.c:735
+#, 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
+msgid "could not read SQUASH_MSG"
+msgstr "nie można odczytać SQUASH_MSG"
+
+#: builtin/commit.c:773
+msgid "could not read MERGE_MSG"
+msgstr "nie czytaj MERGE_MSG"
+
+#: builtin/commit.c:833
+msgid "could not write commit template"
+msgstr "nie można zapisać szablonu zapisu"
+
+#: builtin/commit.c:853
+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"
+"Wygląda, że składasz scalenie.\n"
+"Jeśli tak nie jest, wykonaj\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"i spróbuj ponownie.\n"
+
+#: builtin/commit.c:858
+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"
+"Wygląda, że składasz dobranie (cherry-pick).\n"
+"Jeśli tak nie jest, wykonaj\n"
+"\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
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr "%sAutor:      %.*s <%.*s>"
+
+#: builtin/commit.c:901
+#, c-format
+msgid "%sDate:      %s"
+msgstr "%sData:      %s"
+
+#: builtin/commit.c:908
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sSkładający: %.*s <%.*s>"
+
+#: builtin/commit.c:926
+msgid "Cannot read index"
+msgstr "Nie można odczytać indeksu"
+
+#: builtin/commit.c:997
+msgid "Error building trees"
+msgstr "BÅ‚Ä…d budowania drzew"
+
+#: builtin/commit.c:1011 builtin/tag.c:308
+#, 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
+#, 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
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Nieprawidłowy tryb pomijanych plików „%s�"
+
+#: builtin/commit.c:1087 builtin/commit.c:1331
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Nieprawidłowy tryb nieśledzonych plików „%s�"
+
+#: builtin/commit.c:1127
+msgid "--long and -z are incompatible"
+msgstr "--long i -z siÄ™ wykluczajÄ…"
+
+#: builtin/commit.c:1171
+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
+msgid "You have nothing to amend."
+msgstr "Nie masz nic do poprawienia."
+
+#: builtin/commit.c:1183
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "Jesteś w trakcie scalania — nie można poprawiać."
+
+#: builtin/commit.c:1185
+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
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Jesteś w trakcie przestawiania — nie można poprawiać."
+
+#: builtin/commit.c:1190
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "Opcje --squash i --fixup siÄ™ wykluczajÄ…"
+
+#: builtin/commit.c:1200
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "-c, -C, -F i --fixup siÄ™ wykluczajÄ…."
+
+#: builtin/commit.c:1202
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Opcje -m, -c, -C i -F siÄ™ wykluczajÄ…."
+
+#: builtin/commit.c:1211
+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."
+
+#: builtin/commit.c:1229
+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
+#, 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
+msgid "show status concisely"
+msgstr "pokaż stan zwięźle"
+
+#: builtin/commit.c:1368 builtin/commit.c:1529
+msgid "show branch information"
+msgstr "pokaż informacje o gałęzi"
+
+#: builtin/commit.c:1370
+msgid "show stash information"
+msgstr "pokaż informacje o schowku"
+
+#: builtin/commit.c:1372 builtin/commit.c:1531
+msgid "compute full ahead/behind values"
+msgstr "oblicz pełne wartości przed/w tyle"
+
+#: builtin/commit.c:1374
+msgid "version"
+msgstr "wersja"
+
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:679
+msgid "machine-readable output"
+msgstr "wyjście czytelne dla maszyny"
+
+#: builtin/commit.c:1377 builtin/commit.c:1535
+msgid "show status in long format (default)"
+msgstr "pokazuj stan w długim formacie (domyślnie)"
+
+#: builtin/commit.c:1380 builtin/commit.c:1538
+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
+msgid "mode"
+msgstr "tryb"
+
+#: builtin/commit.c:1383 builtin/commit.c:1541
+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
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"pokaż pomijane pliki, dodatkowe tryby: traditional, matching, no. (domyślnie "
+"traditional)"
+
+#: builtin/commit.c:1389 parse-options.h:192
+msgid "when"
+msgstr "kiedy"
+
+#: builtin/commit.c:1390
+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. "
+"(domyślnie all)"
+
+#: builtin/commit.c:1392
+msgid "list untracked files in columns"
+msgstr "wypisz nieśledzone pliki w kolumnach"
+
+#: builtin/commit.c:1393
+msgid "do not detect renames"
+msgstr "nie wykrywaj zmian nazw"
+
+#: builtin/commit.c:1395
+msgid "detect renames, optionally set similarity index"
+msgstr "wykryj zmiany nazw, opcjonalnie ustaw wskaźnik podobieństwa"
+
+#: builtin/commit.c:1415
+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
+msgid "suppress summary after successful commit"
+msgstr "pomiń podsumowanie po udanym zapisie"
+
+#: builtin/commit.c:1498
+msgid "show diff in commit message template"
+msgstr "pokaż różnice w szablonie komunikatu zapisu"
+
+#: builtin/commit.c:1500
+msgid "Commit message options"
+msgstr "Opcje komunikatu zapisu"
+
+#: builtin/commit.c:1501 builtin/merge.c:286 builtin/tag.c:447
+msgid "read message from file"
+msgstr "odczytaj komunikat z pliku"
+
+#: builtin/commit.c:1502
+msgid "author"
+msgstr "autor"
+
+#: builtin/commit.c:1502
+msgid "override author for commit"
+msgstr "nadpisz autora w zapisie"
+
+#: builtin/commit.c:1503 builtin/gc.c:550
+msgid "date"
+msgstr "data"
+
+#: builtin/commit.c:1503
+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
+msgid "commit"
+msgstr "zapis"
+
+#: builtin/commit.c:1505
+msgid "reuse and edit message from specified commit"
+msgstr "użyj komunikatu jak w podanym zapisie i edytuj go"
+
+#: builtin/commit.c:1506
+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"
+msgstr ""
+"użyj komunikatu automatycznego spłaszczania, mówiącego, aby naprawić podany "
+"zapis"
+
+#: builtin/commit.c:1508
+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
+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
+msgid "add a Signed-off-by trailer"
+msgstr "dodaj końcówkę Signed-off-by"
+
+#: builtin/commit.c:1511
+msgid "use specified template file"
+msgstr "użyj określonego pliku szablonu"
+
+#: builtin/commit.c:1512
+msgid "force edit of commit"
+msgstr "wymuÅ› edycjÄ™ zapisu"
+
+#: builtin/commit.c:1514
+msgid "include status in commit message template"
+msgstr "uwzględnij status w szablonie komunikatu zapisu"
+
+#: builtin/commit.c:1519
+msgid "Commit contents options"
+msgstr "Opcje zawartości zapisu"
+
+#: builtin/commit.c:1520
+msgid "commit all changed files"
+msgstr "złóż wszystkie zmienione pliki"
+
+#: builtin/commit.c:1521
+msgid "add specified files to index for commit"
+msgstr "dodaj podane pliki do indeksu do złożenia"
+
+#: builtin/commit.c:1522
+msgid "interactively add files"
+msgstr "interaktywnie dodaj pliki"
+
+#: builtin/commit.c:1523
+msgid "interactively add changes"
+msgstr "interaktywnie dodaj zmiany"
+
+#: builtin/commit.c:1524
+msgid "commit only specified files"
+msgstr "złóż tylko podane pliki"
+
+#: builtin/commit.c:1525
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "omiń skrypty pre-commit i commit-msg"
+
+#: builtin/commit.c:1526
+msgid "show what would be committed"
+msgstr "pokaż, co byłoby złożone"
+
+#: builtin/commit.c:1539
+msgid "amend previous commit"
+msgstr "popraw poprzedni zapis"
+
+#: builtin/commit.c:1540
+msgid "bypass post-rewrite hook"
+msgstr "omiń skrypt post-rewrite"
+
+#: builtin/commit.c:1547
+msgid "ok to record an empty change"
+msgstr "pozwól złożyć pustą zmianę"
+
+#: builtin/commit.c:1549
+msgid "ok to record a change with an empty message"
+msgstr "pozwól złożyć zmianę z pustym komunikatem"
+
+#: builtin/commit.c:1622
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Uszkodzony plik MERGE_HEAD (%s)"
+
+#: builtin/commit.c:1629
+msgid "could not read MERGE_MODE"
+msgstr "nie można odczytać MERGE_MODE"
+
+#: builtin/commit.c:1650
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "nie można odczytać komunikatu zapisu: %s"
+
+#: builtin/commit.c:1657
+#, 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
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Przerywanie zapisu; nie wpisano komunikatu.\n"
+
+#: builtin/commit.c:1696
+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 ""
+"repozytorium zostało zaktualizowane, ale nie można zapisać\n"
+"pliku new_index.  Sprawdź, czy jest jeszcze miejsce na dysku\n"
+"i nie jest przekroczony przydział, i wykonaj „git restore --staged :/�, by "
+"się pozbierać."
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<opcje>]"
+
+#: builtin/config.c:109 builtin/env--helper.c:27
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "nierozpoznany argument --type, %s"
+
+#: builtin/config.c:121
+msgid "only one type at a time"
+msgstr "tylko jeden rodzaj na raz"
+
+#: builtin/config.c:130
+msgid "Config file location"
+msgstr "Położenie pliku konfiguracyjnego"
+
+#: builtin/config.c:131
+msgid "use global config file"
+msgstr "użyj globalnego pliku konfiguracyjnego"
+
+#: builtin/config.c:132
+msgid "use system config file"
+msgstr "użyj pliku konfiguracyjnego systemu"
+
+#: builtin/config.c:133
+msgid "use repository config file"
+msgstr "użyj pliku konfiguracyjnego repozytorium"
+
+#: builtin/config.c:134
+msgid "use per-worktree config file"
+msgstr "użyj pliku konfiguracyjnego drzewa roboczego"
+
+#: builtin/config.c:135
+msgid "use given config file"
+msgstr "użyj podanego pliku konfiguracyjnego"
+
+#: builtin/config.c:136
+msgid "blob-id"
+msgstr "id-blobu"
+
+#: builtin/config.c:136
+msgid "read config from given blob object"
+msgstr "odczytaj ustawienia z podanego obiektu blob"
+
+#: builtin/config.c:137
+msgid "Action"
+msgstr "Działanie"
+
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "pobierz wartość: nazwa [wzorzec-wartości]"
+
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "pobierz wszystkie wartości: klucz [wzorzec-wartości]"
+
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr ""
+"pobierz wartości wyrażenia regularnego: wyr-reg-nazwy [wzorzec-wartości]"
+
+#: builtin/config.c:141
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "pobierz wartość typową dla adresu URL: rozdział[.zmienna] adres"
+
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "zastąp wszystkie pasujące zmienne: nazwa wartość [wzorzec-wartości]"
+
+#: builtin/config.c:143
+msgid "add a new variable: name value"
+msgstr "dodaj nową zmienną: nazwa wartość"
+
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "usuń zmienną: nazwa [wzorzec-wartości]"
+
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "usuń wszystkie dopasowania: nazwa [wzorzec-wartości]"
+
+#: builtin/config.c:146
+msgid "rename section: old-name new-name"
+msgstr "zmień nazwę rozdziału: stara-nazwa nowa-nazwa"
+
+#: builtin/config.c:147
+msgid "remove a section: name"
+msgstr "usuń rozdział: nazwa"
+
+#: builtin/config.c:148
+msgid "list all"
+msgstr "wypisz wszystko"
+
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+"użyj równości łańcuchów przy porównywaniu wartości do „wzorca-wartości�"
+
+#: builtin/config.c:150
+msgid "open an editor"
+msgstr "otwórz edytor"
+
+#: builtin/config.c:151
+msgid "find the color configured: slot [default]"
+msgstr "znajdź ustawiony kolor: nazwa [domyślny]"
+
+#: builtin/config.c:152
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "znajdź ustawienie koloru: nazwa [stdout-jest-tty]"
+
+#: builtin/config.c:153
+msgid "Type"
+msgstr "Rodzaj"
+
+#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "value is given this type"
+msgstr "wartość dostaje ten typ"
+
+#: builtin/config.c:155
+msgid "value is \"true\" or \"false\""
+msgstr "wartość to \"true\" lub \"false\""
+
+#: builtin/config.c:156
+msgid "value is decimal number"
+msgstr "wartość jest liczbą dziesiętną"
+
+#: builtin/config.c:157
+msgid "value is --bool or --int"
+msgstr "wartość to --bool lub --int"
+
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "wartość to --bool lub łańcuch"
+
+#: builtin/config.c:159
+msgid "value is a path (file or directory name)"
+msgstr "wartość jest ścieżką (nazwą pliku lub katalogu)"
+
+#: builtin/config.c:160
+msgid "value is an expiry date"
+msgstr "wartość jest datą wygaśnięcia"
+
+#: builtin/config.c:161
+msgid "Other"
+msgstr "Inne"
+
+#: builtin/config.c:162
+msgid "terminate values with NUL byte"
+msgstr "zakończ wartości znakiem NUL"
+
+#: builtin/config.c:163
+msgid "show variable names only"
+msgstr "pokazuj tylko nazwy zmiennych"
+
+#: builtin/config.c:164
+msgid "respect include directives on lookup"
+msgstr "uszanuj dyrektywy załączające (include) przy wyszukaniu"
+
+#: builtin/config.c:165
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"pokaż pochodzenie konfiguracji (plik, standardowe wejście, blob, wiersz "
+"poleceń)"
+
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"pokaż zasięg konfiguracji (drzewo robocze, lokalny, globalny, system, "
+"polecenie)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
+msgid "value"
+msgstr "wartość"
+
+#: builtin/config.c:167
+msgid "with --get, use default value when missing entry"
+msgstr "przy --get użyj domyślnej wartości, jeśli wpisu nie ma"
+
+#: builtin/config.c:181
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "zła liczba argumentów, powinna być %d"
+
+#: builtin/config.c:183
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "zła liczba argumentów, powinna być od %d do %d"
+
+#: builtin/config.c:339
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "nieprawidłowy wzorzec klucza: %s"
+
+#: builtin/config.c:377
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "nie można sformatować domyślnej wartości ustawienia: %s"
+
+#: builtin/config.c:441
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "nie można przetworzyć koloru „%s�"
+
+#: builtin/config.c:483
+msgid "unable to parse default color value"
+msgstr "nie można przetworzyć domyślnej wartości koloru"
+
+#: builtin/config.c:536 builtin/config.c:833
+msgid "not in a git directory"
+msgstr "nie jesteśmy w katalogu gita"
+
+#: builtin/config.c:539
+msgid "writing to stdin is not supported"
+msgstr "pisanie na standardowe wejście nie jest wspierane"
+
+#: builtin/config.c:542
+msgid "writing config blobs is not supported"
+msgstr "zapisywanie blobów konfiguracji nie jest wspierane"
+
+#: builtin/config.c:627
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# To jest plik konfiguracyjny użytkownika Gita.\n"
+"[user]\n"
+"# Dostosuj i odkomentuj poniższe wiersze:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:652
+msgid "only one config file at a time"
+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"
+
+#: 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"
+
+#: 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"
+
+#: builtin/config.c:684
+msgid "$HOME not set"
+msgstr "nie ustawiono $HOME"
+
+#: builtin/config.c:708
+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 ""
+"nie można użyć --worktree z wieloma drzewami roboczymi, chyba że włączono\n"
+"rozszerzenie konfiguracji worktreeConfig. Więcej szczegółów w rozdziale\n"
+"„CONFIGURATION FILE� w „git help worktree�"
+
+#: builtin/config.c:743
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color i typ zmiennej siÄ™ wykluczajÄ…"
+
+#: builtin/config.c:748
+msgid "only one action at a time"
+msgstr "tylko jedno działanie na raz"
+
+#: builtin/config.c:761
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only stosuje siÄ™ tylko do --list lub --get-regexp"
+
+#: builtin/config.c:767
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+"--show-origin stosuje siÄ™ tylko do --get, --get-all, --get-regexp i --list"
+
+#: builtin/config.c:773
+msgid "--default is only applicable to --get"
+msgstr "--default stosuje siÄ™ tylko do --get"
+
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value stosuje się tylko do „wzorca-wartości�"
+
+#: builtin/config.c:822
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "nie można odczytać pliku ustawień „%s�"
+
+#: builtin/config.c:825
+msgid "error processing config file(s)"
+msgstr "błąd przetwarzania plików konfiguracyjnych"
+
+#: builtin/config.c:835
+msgid "editing stdin is not supported"
+msgstr "edycja standardowego wejścia jest niewspierana"
+
+#: builtin/config.c:837
+msgid "editing blobs is not supported"
+msgstr "edycja blobów jest niewspierana"
+
+#: builtin/config.c:851
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "nie można utworzyć pliku konfiguracyjnego %s"
+
+#: builtin/config.c:864
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"nie można nadpisać wielu wartości jedną wartością\n"
+"       Użyj wyrażenia regularnego, --add lub --replace-all, aby zmienić %s."
+
+#: builtin/config.c:943 builtin/config.c:954
+#, c-format
+msgid "no such section: %s"
+msgstr "nie ma takiego rozdziału: %s"
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr "wypisz rozmiary w formacie czytelnym dla człowieka"
+
+#: builtin/credential-cache--daemon.c:226
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Uprawnienia do twojego katalogu gniazd sÄ… zbyt swobodne; inni\n"
+"użytkownicy mogą odczytać twoje przechowywane poświadczenia. Rozważ użycie:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:275
+msgid "print debugging messages to stderr"
+msgstr "wypisuj informacje diagnostyczne na stderr"
+
+#: builtin/credential-cache--daemon.c:315
+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
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache niedostępna; brak wsparcia dla gniazd uniksa"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "nie można uzyskać blokady magazynu poświadczeń w %d ms"
+
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<opcje>] [<zapis>...]"
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<opcje>] --dirty"
+
+#: builtin/describe.c:63
+msgid "head"
+msgstr "czoło"
+
+#: builtin/describe.c:63
+msgid "lightweight"
+msgstr "lekkie"
+
+#: builtin/describe.c:63
+msgid "annotated"
+msgstr "opisany"
+
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "opisany tag %s niedostępny"
+
+#: builtin/describe.c:281
+#, c-format
+msgid "tag '%s' is externally known as '%s'"
+msgstr "tag „%s� jest znany na zewnątrz jako „%s�"
+
+#: builtin/describe.c:328
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "żaden tag nie pasuje dokładnie do „%s�"
+
+#: builtin/describe.c:330
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+"Brak dokładnych dopasowań do referencji i tagów, szukanie, aby opisać\n"
+
+#: builtin/describe.c:397
+#, c-format
+msgid "finished search at %s\n"
+msgstr "zakończono wyszukiwanie na %s\n"
+
+#: builtin/describe.c:424
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"Żaden opisany tag nie może opisać „%s�.\n"
+"Ale są jeszcze nieopisane: spróbuj --tags."
+
+#: builtin/describe.c:428
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"Żaden tag nie może opisać „%s�.\n"
+"Spróbuj --always, lub utwórz jakieś tagi."
+
+#: builtin/describe.c:458
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "przebyto %lu zapisów\n"
+
+#: builtin/describe.c:461
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+"znaleziono ponad %i tagów; wypisano %i najświeższych\n"
+"poddano siÄ™ przy %s\n"
+
+#: builtin/describe.c:529
+#, c-format
+msgid "describe %s\n"
+msgstr "opisywanie %s\n"
+
+#: builtin/describe.c:532
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Nieprawidłowa nazwa obiektu %s"
+
+#: builtin/describe.c:540
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s nie jest ani zapisem, ani blobem"
+
+#: builtin/describe.c:554
+msgid "find the tag that comes after the commit"
+msgstr "znajdź tag, który następuje po tym zapisie"
+
+#: builtin/describe.c:555
+msgid "debug search strategy on stderr"
+msgstr "strategia wyszukiwania na standardowe wyjście diagnostyczne"
+
+#: builtin/describe.c:556
+msgid "use any ref"
+msgstr "użyj dowolnej referencji"
+
+#: builtin/describe.c:557
+msgid "use any tag, even unannotated"
+msgstr "użyj dowolnego tagu, nawet nieopisanego"
+
+#: builtin/describe.c:558
+msgid "always use long format"
+msgstr "zawsze używaj długiego formatu"
+
+#: builtin/describe.c:559
+msgid "only follow first parent"
+msgstr "pokaż tylko pierwszego rodzica"
+
+#: builtin/describe.c:562
+msgid "only output exact matches"
+msgstr "zwracaj tylko dokładne dopasowania"
+
+#: builtin/describe.c:564
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "uwzględnij <n> najświeższych tagów (domyślnie: 10)"
+
+#: builtin/describe.c:566
+msgid "only consider tags matching <pattern>"
+msgstr "uwzględnij tylko tagi pasujące do <wzorca>"
+
+#: builtin/describe.c:568
+msgid "do not consider tags matching <pattern>"
+msgstr "nie uwzględniaj tagów pasujących do <wzorca>"
+
+#: builtin/describe.c:570 builtin/name-rev.c:535
+msgid "show abbreviated commit object as fallback"
+msgstr "pokaż skrócony obiekt zapisu w razie braku"
+
+#: builtin/describe.c:571 builtin/describe.c:574
+msgid "mark"
+msgstr "znamiÄ™"
+
+#: builtin/describe.c:572
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "dodaj <znamię> do brudnego drzewa roboczego (domyślnie „-dirty�)"
+
+#: builtin/describe.c:575
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "dodaj <znamię> do zepsutego drzewa roboczego (domyślnie „-broken�)"
+
+#: builtin/describe.c:593
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long i --abbrev=0 siÄ™ wykluczajÄ…"
+
+#: builtin/describe.c:622
+msgid "No names found, cannot describe anything."
+msgstr "Nie znaleziono nazw, nie można nic opisać."
+
+#: builtin/describe.c:673
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty i zapisy siÄ™ wykluczajÄ…"
+
+#: builtin/describe.c:675
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken i zapisy siÄ™ wykluczajÄ…"
+
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin i --merge-base siÄ™ wykluczajÄ…"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base działa tylko z dwoma zapisami"
+
+#: builtin/diff.c:92
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "„%s�: nie jest zwykłym plikiem ani dowiązaniem"
+
+#: builtin/diff.c:259
+#, c-format
+msgid "invalid option: %s"
+msgstr "nieprawidłowa opcja: %s"
+
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: brak podstawy scalenia"
+
+#: builtin/diff.c:486
+msgid "Not a git repository"
+msgstr "To nie jest repozytorium gita"
+
+#: builtin/diff.c:532 builtin/grep.c:682
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "podano nieprawidłowy obiekt „%s�."
+
+#: builtin/diff.c:543
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "podano ponad dwa bloby: „%s�"
+
+#: builtin/diff.c:548
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "otrzymano nieobsługiwany obiekt „%s�."
+
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: wiele podstaw scalenia, używanie %s"
+
+#: builtin/difftool.c:30
+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
+#, c-format
+msgid "could not read symlink %s"
+msgstr "nie można odczytać dowiązania symbolicznego %s"
+
+#: builtin/difftool.c:304
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "nie można odczytać pliku dowiązania symbolicznego %s"
+
+#: builtin/difftool.c:312
+#, 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
+msgid ""
+"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
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "oba pliki zmienione: „%s� i „%s�."
+
+#: builtin/difftool.c:635
+msgid "working tree file has been left."
+msgstr "plik z drzewem roboczym został opuszczony."
+
+#: builtin/difftool.c:646
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "istnieją tymczasowe pliki w „%s�."
+
+#: builtin/difftool.c:647
+msgid "you may want to cleanup or recover these."
+msgstr "możesz chcieć je wyczyścić lub odzyskać."
+
+#: builtin/difftool.c:696
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "użyj „diff.guitool� zamiast „diff.tool�"
+
+#: builtin/difftool.c:698
+msgid "perform a full-directory diff"
+msgstr "zbadaj różnice całych katalogów"
+
+#: builtin/difftool.c:700
+msgid "do not prompt before launching a diff tool"
+msgstr "nie pytaj przed uruchomieniem narzędzia różnic"
+
+#: builtin/difftool.c:705
+msgid "use symlinks in dir-diff mode"
+msgstr "użyj dowiązań symbolicznych w trybie różnic katalogów"
+
+#: builtin/difftool.c:706
+msgid "tool"
+msgstr "narzędzie"
+
+#: builtin/difftool.c:707
+msgid "use the specified diff tool"
+msgstr "użyj podanego narzędzia różnic"
+
+#: builtin/difftool.c:709
+msgid "print a list of diff tools that may be used with `--tool`"
+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 "
+"code"
+msgstr ""
+"niech „git-difftool� wyjdzie, kiedy wywołane narzędzie różnic zwróci "
+"niezerowy kod wyjścia"
+
+#: builtin/difftool.c:715
+msgid "specify a custom command for viewing diffs"
+msgstr "podaj niestandardowe polecenie do wyświetlania różnic"
+
+#: builtin/difftool.c:716
+msgid "passed to `diff`"
+msgstr "przekazywane do „diff�"
+
+#: builtin/difftool.c:731
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool wymaga drzewa roboczego lub --no-index"
+
+#: builtin/difftool.c:738
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff i --no-index siÄ™ wykluczajÄ…"
+
+#: builtin/difftool.c:741
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool i --extcmd siÄ™ wykluczajÄ…"
+
+#: builtin/difftool.c:749
+msgid "no <tool> given for --tool=<tool>"
+msgstr "nie podano <narzędzia> do --tool=<narzędzie>"
+
+#: builtin/difftool.c:756
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "nie podano <polecenia> do --extcmd=<polecenie>"
+
+#: builtin/env--helper.c:6
+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
+msgid "type"
+msgstr "rodzaj"
+
+#: builtin/env--helper.c:46
+msgid "default for git_env_*(...) to fall back on"
+msgstr "domyślna wartość git_env_*(...), do której się uciec"
+
+#: builtin/env--helper.c:48
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr "bądź cicho, użyj tylko wartości git_env_*() jako kodu wyjścia"
+
+#: builtin/env--helper.c:67
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"opcja „--default� oczekuje przy „--type=bool� wartości logicznej, nie „%s�"
+
+#: builtin/env--helper.c:82
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"opcja „--default� oczekuje przy „--type=ulong� długiej wartości bez znaku, "
+"nie „%s�"
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [opcje-listy-rewizji]"
+
+#: builtin/fast-export.c:868
+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
+msgid "--anonymize-map token cannot be empty"
+msgstr "żeton --anonymize-map nie może być pusty"
+
+#: builtin/fast-export.c:1197
+msgid "show progress after <n> objects"
+msgstr "pokaż wskaźnik postępu po <n> obiektach"
+
+#: builtin/fast-export.c:1199
+msgid "select handling of signed tags"
+msgstr "wybierz traktowanie podpisanych tagów"
+
+#: builtin/fast-export.c:1202
+msgid "select handling of tags that tag filtered objects"
+msgstr "wybierz traktowanie tagów przypisanych do filtrowanych obiektów"
+
+#: builtin/fast-export.c:1205
+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
+msgid "dump marks to this file"
+msgstr "zrzuć znaczniki to tego pliku"
+
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "wczytaj znaczniki z tego pliku"
+
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "wczytaj znaczniki z tego pliku, jeśli istnieje"
+
+#: builtin/fast-export.c:1216
+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
+msgid "output full tree for each commit"
+msgstr "wypisz pełne drzewo dla każdego zapisu"
+
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "użyj funkcji done, żeby zakończyć strumień"
+
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "pomiń wypisywanie danych binarnych"
+
+#: builtin/fast-export.c:1222 builtin/log.c:1815
+msgid "refspec"
+msgstr "referencja"
+
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "zastosuj referencjÄ™ do wyeksportowanych referencji"
+
+#: builtin/fast-export.c:1224
+msgid "anonymize output"
+msgstr "anonimizuj wyjście"
+
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "od:do"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "zamień <z> na <na> w zanonimizowanym wyjściu"
+
+#: builtin/fast-export.c:1229
+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
+msgid "show original object ids of blobs/commits"
+msgstr "pokaż pierwotne identyfikatory obiektów blobów/zapisów"
+
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "oznacz tagi identyfikatorami znaczników"
+
+#: builtin/fast-export.c:1256
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize nie ma sensu bez --anonymize"
+
+#: builtin/fast-export.c:1271
+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�"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Brakujące znaczniki do z pod-modułu „%s�"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Oczekiwano polecenia „mark�, otrzymano %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+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"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "funkcja „%s� zabroniona na wejściu bez --allow-unsafe-features"
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "Utworzono plik blokady, ale go nie zgłoszono: %s"
+
+#: builtin/fetch.c:35
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<opcje>] [<repozytorium> [<referencja>...]]"
+
+#: builtin/fetch.c:36
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<opcje>] <grupa>"
+
+#: builtin/fetch.c:37
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<opcje>] [(<repozytorium> | <grupa>)...]"
+
+#: builtin/fetch.c:38
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<opcje>]"
+
+#: builtin/fetch.c:120
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel nie może być ujemne"
+
+#: builtin/fetch.c:143 builtin/pull.c:185
+msgid "fetch from all remotes"
+msgstr "pobierz ze wszystkich zdalnych repozytoriów"
+
+#: builtin/fetch.c:145 builtin/pull.c:245
+msgid "set upstream for git pull/fetch"
+msgstr "ustaw gałąź nadrzędną do git pull/fetch"
+
+#: builtin/fetch.c:147 builtin/pull.c:188
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "dopisz do .git/FETCH_HEAD zamiast nadpisywać"
+
+#: builtin/fetch.c:149
+msgid "use atomic transaction to update references"
+msgstr "zażądaj atomowej transakcji do aktualizacji referencji"
+
+#: builtin/fetch.c:151 builtin/pull.c:191
+msgid "path to upload pack on remote end"
+msgstr "ścieżka do wysyłania paczki po zdalnej stronie"
+
+#: builtin/fetch.c:152
+msgid "force overwrite of local reference"
+msgstr "wymuÅ› nadpisanie lokalnej referencji"
+
+#: builtin/fetch.c:154
+msgid "fetch from multiple remotes"
+msgstr "pobierz z wielu zdalnych repozytoriów"
+
+#: builtin/fetch.c:156 builtin/pull.c:195
+msgid "fetch all tags and associated objects"
+msgstr "pobierz wszystkie tagi i powiÄ…zane obiekty"
+
+#: builtin/fetch.c:158
+msgid "do not fetch all tags (--no-tags)"
+msgstr "nie pobieraj wszystkich tagów (--no-tags)"
+
+#: builtin/fetch.c:160
+msgid "number of submodules fetched in parallel"
+msgstr "liczba pod-modułów pobieranych równolegle"
+
+#: builtin/fetch.c:162 builtin/pull.c:198
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "przytnij gałęzie śledzące usunięte ze zdalnego repozytorium"
+
+#: builtin/fetch.c:164
+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
+msgid "on-demand"
+msgstr "on-demand"
+
+#: builtin/fetch.c:166
+msgid "control recursive fetching of submodules"
+msgstr "steruj rekurencyjnym pobieraniem pod-modułów"
+
+#: builtin/fetch.c:171
+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
+msgid "keep downloaded pack"
+msgstr "zachowaj pobranÄ… paczkÄ™"
+
+#: builtin/fetch.c:174
+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
+msgid "deepen history of shallow clone"
+msgstr "pogłęb historię płytkiego klonu"
+
+#: builtin/fetch.c:179 builtin/pull.c:212
+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
+msgid "convert to a complete repository"
+msgstr "przekształć w pełne repozytorium"
+
+#: builtin/fetch.c:188
+msgid "prepend this to submodule path output"
+msgstr "dodaj to przed wyjściem ścieżki pod-modułu"
+
+#: builtin/fetch.c:191
+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 "
+"konfiguracji)"
+
+#: builtin/fetch.c:195 builtin/pull.c:224
+msgid "accept refs that update .git/shallow"
+msgstr "przyjmuj referencje, które aktualizują .git/shallow"
+
+#: builtin/fetch.c:196 builtin/pull.c:226
+msgid "refmap"
+msgstr "mapowanie"
+
+#: builtin/fetch.c:197 builtin/pull.c:227
+msgid "specify fetch refmap"
+msgstr "podaj mapÄ™ referencji do pobrania"
+
+#: builtin/fetch.c:204 builtin/pull.c:240
+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
+msgid "run 'maintenance --auto' after fetching"
+msgstr "wykonaj „maintenance --auto� po pobraniu"
+
+#: builtin/fetch.c:211 builtin/pull.c:243
+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
+msgid "write the commit-graph after fetching"
+msgstr "wypisz graf zapisów po pobraniu"
+
+#: builtin/fetch.c:215
+msgid "accept refspecs from stdin"
+msgstr "przyjmuj referencje ze standardowego wejścia"
+
+#: builtin/fetch.c:526
+msgid "Couldn't find remote ref HEAD"
+msgstr "Nie znaleziono zdalnej referencji HEAD"
+
+#: builtin/fetch.c:697
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "ustawienie fetch.output zawiera nieprawidłową wartość %s"
+
+#: builtin/fetch.c:796
+#, c-format
+msgid "object %s not found"
+msgstr "nie znaleziono obiektu %s"
+
+#: builtin/fetch.c:800
+msgid "[up to date]"
+msgstr "[aktualne]"
+
+#: builtin/fetch.c:813 builtin/fetch.c:829 builtin/fetch.c:901
+msgid "[rejected]"
+msgstr "[odrzucono]"
+
+#: builtin/fetch.c:814
+msgid "can't fetch in current branch"
+msgstr "nie można pobrać na bieżącej gałęzi"
+
+#: builtin/fetch.c:824
+msgid "[tag update]"
+msgstr "[aktualizacja tagu]"
+
+#: builtin/fetch.c:825 builtin/fetch.c:862 builtin/fetch.c:884
+#: builtin/fetch.c:896
+msgid "unable to update local ref"
+msgstr "nie można zaktualizować lokalnej referencji"
+
+#: builtin/fetch.c:829
+msgid "would clobber existing tag"
+msgstr "nadpisałoby istniejący tag"
+
+#: builtin/fetch.c:851
+msgid "[new tag]"
+msgstr "[nowy tag]"
+
+#: builtin/fetch.c:854
+msgid "[new branch]"
+msgstr "[nowa gałąź]"
+
+#: builtin/fetch.c:857
+msgid "[new ref]"
+msgstr "[nowa referencja]"
+
+#: builtin/fetch.c:896
+msgid "forced update"
+msgstr "wymuszona aktualizacja"
+
+#: builtin/fetch.c:901
+msgid "non-fast-forward"
+msgstr "nieprzewinięte"
+
+#: builtin/fetch.c:1005
+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 ""
+"Pobranie zwykle wskazuje, które gałęzie miały wymuszoną aktualizację,\n"
+"ale to sprawdzenie zostało wyłączone. Aby włączyć je ponownie,\n"
+"użyj flagi „--show-forced-updates� lub wykonaj\n"
+"„git fetch.showForcedUpdates true�."
+
+#: builtin/fetch.c:1009
+#, 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"
+msgstr ""
+"Sprawdzenie wymuszonych aktualizacji zajęło %.2f sekund. Możesz użyć\n"
+"„--no-show-forced-updates� lub wykonać „git config fetch.showForcedUpdates "
+"false�\n"
+" aby uniknąć tego sprawdzenia.\n"
+
+#: builtin/fetch.c:1041
+#, 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
+#, 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"
+
+#: builtin/fetch.c:1146 builtin/fetch.c:1297
+#, c-format
+msgid "From %.*s\n"
+msgstr "Z %.*s\n"
+
+#: builtin/fetch.c:1168
+#, c-format
+msgid ""
+"some local refs could not be updated; try running\n"
+" 'git remote prune %s' to remove any old, conflicting branches"
+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
+#, c-format
+msgid "   (%s will become dangling)"
+msgstr "   (%s będzie wiszący)"
+
+#: builtin/fetch.c:1268
+#, c-format
+msgid "   (%s has become dangling)"
+msgstr "   (%s stał się wiszący)"
+
+#: builtin/fetch.c:1300
+msgid "[deleted]"
+msgstr "[usunięto]"
+
+#: builtin/fetch.c:1301 builtin/remote.c:1118
+msgid "(none)"
+msgstr "(brak)"
+
+#: builtin/fetch.c:1324
+#, 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
+#, 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
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "Opcja „%s� jest ignorowana przez %s\n"
+
+#: builtin/fetch.c:1558
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "wykryto wiele gałęzi, wyklucza się to z --set-upstream"
+
+#: builtin/fetch.c:1573
+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
+msgid "not setting upstream for a remote tag"
+msgstr "nie ustawiam głównego nurtu w zdalnym tagu"
+
+#: builtin/fetch.c:1577
+msgid "unknown branch type"
+msgstr "nieznany rodzaj gałęzi"
+
+#: builtin/fetch.c:1579
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+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
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Pobieranie %s\n"
+
+#: builtin/fetch.c:1718 builtin/fetch.c:1773 builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "Nie można pobrać %s"
+
+#: builtin/fetch.c:1730
+#, 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
+msgid ""
+"No remote repository specified.  Please, specify either a URL or a\n"
+"remote name from which new revisions should be fetched."
+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
+msgid "You need to specify a tag name."
+msgstr "Musisz określić nazwę tagu."
+
+#: builtin/fetch.c:1935
+msgid "Negative depth in --deepen is not supported"
+msgstr "ujemna głębokość w --deepen nie jest wspierana"
+
+#: builtin/fetch.c:1937
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepend i --depth siÄ™ wykluczajÄ…"
+
+#: builtin/fetch.c:1942
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth i --unshallow wykluczajÄ… siÄ™"
+
+#: builtin/fetch.c:1944
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "--unshallow w pełnym repozytorium nie ma sensu"
+
+#: builtin/fetch.c:1961
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all nie przyjmuje argumentów z repozytoriów"
+
+#: builtin/fetch.c:1963
+msgid "fetch --all does not make sense with refspecs"
+msgstr "--all i referencje siÄ™ wykluczajÄ…"
+
+#: builtin/fetch.c:1972
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "Nie ma takiego zdalnego repozytorium ani ich grupy: %s"
+
+#: builtin/fetch.c:1979
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "pobieranie grupy i podanie referencji nie ma sensu"
+
+#: builtin/fetch.c:1997
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"można użyć --filter tylko ze zdalnym repozytorium ustawionym w extensions."
+"partialclone"
+
+#: builtin/fetch.c:2001
+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
+msgid "--stdin can only be used when fetching from one remote"
+msgstr ""
+"można użyć --stdin tylko przy pobieraniu z jednego zdalnego repozytorium"
+
+#: 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 <komunikat>] [--log[=<n>] | --no-log] [--file <plik>]"
+
+#: builtin/fmt-merge-msg.c:18
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "zapełnij dziennik co najwyżej <n> wpisami z krótkiego dziennika"
+
+#: builtin/fmt-merge-msg.c:21
+msgid "alias for --log (deprecated)"
+msgstr "synonim do --log (przestarzały)"
+
+#: builtin/fmt-merge-msg.c:24
+msgid "text"
+msgstr "tekst"
+
+#: builtin/fmt-merge-msg.c:25
+msgid "use <text> as start of message"
+msgstr "użyj <tekstu> jako początku komunikatu"
+
+#: builtin/fmt-merge-msg.c:26
+msgid "file to read from"
+msgstr "plik do przeczytania"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<opcje>] [<wzorzec>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <obiekt>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr "git for-each-ref [--merged [<zapis>]] [--no-merged [<zapis>]]"
+
+#: builtin/for-each-ref.c:13
+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
+msgid "quote placeholders suitably for shells"
+msgstr "użyj cytowania jak w powłokach"
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr "użyj cytowania jak w perlu"
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr "użyj cytowania jak w pythonie"
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr "użyj cytowania jak w Tclu"
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr "pokazuj tylko <n> pasujÄ…cych referencji"
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:472
+msgid "respect format colors"
+msgstr "uszanuj kolory formatu"
+
+#: builtin/for-each-ref.c:42
+msgid "print only refs which points at the given object"
+msgstr "wypisz tylko referencje wskazujÄ…ce ten obiekt"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs that are merged"
+msgstr "wypisz tylko scalone referencje"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are not merged"
+msgstr "wypisz tylko niescalone referencje"
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs which contain the commit"
+msgstr "wypisz tylko referencje zawierajÄ…ce ten zapis"
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which don't contain the commit"
+msgstr "wypisz tylko referencje nie zawierajÄ…ce tego zapisu"
+
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<konfiguracja> <argumenty-polecenia>"
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr "konfiguracja"
+
+#: builtin/for-each-repo.c:38
+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
+msgid "missing --config=<config>"
+msgstr "brakuje --config=<konfiguracja>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:130 builtin/fsck.c:131
+msgid "unknown"
+msgstr "nieznane"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:83 builtin/fsck.c:103
+#, 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
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "ostrzeżenie w %s %s:%s"
+
+#: builtin/fsck.c:126 builtin/fsck.c:129
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "zepsute Å‚Ä…cze z %7s %s"
+
+#: builtin/fsck.c:138
+msgid "wrong object type in link"
+msgstr "zły rodzaj obiektu w łączu"
+
+#: builtin/fsck.c:154
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+"zepsute Å‚Ä…cze z %7s %s\n"
+"             do %7s %s"
+
+#: builtin/fsck.c:265
+#, c-format
+msgid "missing %s %s"
+msgstr "brakujÄ…cy %s %s"
+
+#: builtin/fsck.c:292
+#, c-format
+msgid "unreachable %s %s"
+msgstr "nieosiÄ…galny %s %s"
+
+#: builtin/fsck.c:312
+#, c-format
+msgid "dangling %s %s"
+msgstr "wiszÄ…ce %s %s"
+
+#: builtin/fsck.c:322
+msgid "could not create lost-found"
+msgstr "nie można utworzyć biura obiektów znalezionych"
+
+#: builtin/fsck.c:333
+#, c-format
+msgid "could not finish '%s'"
+msgstr "nie można zakończyć „%s�"
+
+#: builtin/fsck.c:350
+#, c-format
+msgid "Checking %s"
+msgstr "Sprawdzanie %s"
+
+#: builtin/fsck.c:388
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Sprawdzanie spójności (%d obiektów)"
+
+#: builtin/fsck.c:407
+#, c-format
+msgid "Checking %s %s"
+msgstr "Sprawdzanie %s %s"
+
+#: builtin/fsck.c:412
+msgid "broken links"
+msgstr "zepsute Å‚Ä…cza"
+
+#: builtin/fsck.c:421
+#, c-format
+msgid "root %s"
+msgstr "korzeń %s"
+
+#: builtin/fsck.c:429
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "otagowano %s %s (%s) w %s"
+
+#: builtin/fsck.c:458
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: brakujÄ…cy lub uszkodzony obiekt"
+
+#: builtin/fsck.c:483
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s: nieprawidłowy element dziennika referencji %s"
+
+#: builtin/fsck.c:497
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Sprawdzanie dziennika referencji %s->%s"
+
+#: builtin/fsck.c:531
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: nieprawidłowy wskaźnik SHA-1 %s"
+
+#: builtin/fsck.c:538
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: nie jest zapisem"
+
+#: builtin/fsck.c:592
+msgid "notice: No default references"
+msgstr "uwaga: Brak domyślnych referencji"
+
+#: builtin/fsck.c:607
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: brakujÄ…cy lub uszkodzony obiekt: %s"
+
+#: builtin/fsck.c:620
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: nie można przetworzyć obiektu: %s"
+
+#: builtin/fsck.c:640
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "zły plik SHA-1: %s"
+
+#: builtin/fsck.c:655
+msgid "Checking object directory"
+msgstr "Sprawdzanie katalogu obiektów"
+
+#: builtin/fsck.c:658
+msgid "Checking object directories"
+msgstr "Sprawdzanie katalogów obiektów"
+
+#: builtin/fsck.c:673
+#, c-format
+msgid "Checking %s link"
+msgstr "Sprawdzanie połączenia %s"
+
+#: builtin/fsck.c:678 builtin/index-pack.c:865
+#, c-format
+msgid "invalid %s"
+msgstr "błędny %s"
+
+#: builtin/fsck.c:685
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s wskazuje na coÅ› dziwnego (%s)"
+
+#: builtin/fsck.c:691
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: oddzielone HEAD niczego nie wskazuje"
+
+#: builtin/fsck.c:695
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "uwaga: %s wskazuje nienarodzoną gałąź (%s)"
+
+#: builtin/fsck.c:707
+msgid "Checking cache tree"
+msgstr "Sprawdzanie drzewa pamięci podręcznej"
+
+#: builtin/fsck.c:712
+#, 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
+msgid "non-tree in cache-tree"
+msgstr "nie-drzewo w drzewie pamięci podręcznej"
+
+#: builtin/fsck.c:752
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<opcje>] [<obiekt>...]"
+
+#: builtin/fsck.c:758
+msgid "show unreachable objects"
+msgstr "pokazuj nieosiÄ…galne obiekty"
+
+#: builtin/fsck.c:759
+msgid "show dangling objects"
+msgstr "pokaż wiszące obiekty"
+
+#: builtin/fsck.c:760
+msgid "report tags"
+msgstr "zgłaszaj tagi"
+
+#: builtin/fsck.c:761
+msgid "report root nodes"
+msgstr "zgłaszaj węzły korzenia"
+
+#: builtin/fsck.c:762
+msgid "make index objects head nodes"
+msgstr "dodaj obiekty indeksu do naczelnych węzłów"
+
+#: builtin/fsck.c:763
+msgid "make reflogs head nodes (default)"
+msgstr "dodaj dzienniki referencji do węzłów naczelnych (domyślnie)"
+
+#: builtin/fsck.c:764
+msgid "also consider packs and alternate objects"
+msgstr "przejrzyj też paczki i obiekty alternatywne"
+
+#: builtin/fsck.c:765
+msgid "check only connectivity"
+msgstr "sprawdź tylko spójność"
+
+#: builtin/fsck.c:766 builtin/mktag.c:78
+msgid "enable more strict checking"
+msgstr "włącz ściślejsze sprawdzanie"
+
+#: builtin/fsck.c:768
+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
+msgid "show progress"
+msgstr "pokazuj postęp"
+
+#: builtin/fsck.c:770
+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
+msgid "Checking objects"
+msgstr "Sprawdzanie obiektów"
+
+#: builtin/fsck.c:857
+#, c-format
+msgid "%s: object missing"
+msgstr "%s: brakujÄ…cy obiekt"
+
+#: builtin/fsck.c:868
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "nieprawidłowy parametr: oczekiwano SHA-1, otrzymano „%s�"
+
+#: builtin/gc.c:39
+msgid "git gc [<options>]"
+msgstr "git gc [<opcje>]"
+
+#: builtin/gc.c:93
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "Nie można wykonać fstat na %s: %s"
+
+#: builtin/gc.c:129
+#, c-format
+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
+#, 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
+#, c-format
+msgid "cannot read '%s'"
+msgstr "nie można odczytać „%s�"
+
+#: builtin/gc.c:503
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"Ostatnie wykonanie gc zgłosiło, co następuje. Napraw główną przyczynę\n"
+"i usuń %s.\n"
+"Automatyczne czyszczenie nie zostanie przeprowadzone, póki ten plik nie "
+"zniknie.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:551
+msgid "prune unreferenced objects"
+msgstr "przytnij niewskazywane obiekty"
+
+#: builtin/gc.c:553
+msgid "be more thorough (increased runtime)"
+msgstr "bądź dokładniejszy (dłuższy czas działania)"
+
+#: builtin/gc.c:554
+msgid "enable auto-gc mode"
+msgstr "włącz automatyczne zbieranie śmieci"
+
+#: builtin/gc.c:557
+msgid "force running gc even if there may be another gc running"
+msgstr "wymuś uruchomienie gc, nawet jeśli inne może być właśnie w trakcie"
+
+#: builtin/gc.c:560
+msgid "repack all other packs except the largest pack"
+msgstr "przepakuj wszystkie pozostałe paczki oprócz największej"
+
+#: builtin/gc.c:576
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr "nie można przetworzyć wartości gc.logexpiry %s"
+
+#: builtin/gc.c:587
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "nie można przetworzyć wartości wygaśnięcia przycięć %s"
+
+#: builtin/gc.c:607
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr "Automatyczne pakowanie repozytorium w tle dla optymalnej wydajności.\n"
+
+#: builtin/gc.c:609
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "Automatyczne pakowanie repozytorium dla optymalnej wydajności.\n"
+
+#: builtin/gc.c:610
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "Zobacz „git help gc�, aby utrzymywać repozytorium ręcznie.\n"
+
+#: builtin/gc.c:650
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc już działa na maszynie „%s� pid %<PRIuMAX> (użyj --force, jeśli nie)"
+
+#: builtin/gc.c:705
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Jest za dużo nieosiągalnych luźnych obiektów; wykonaj „git prune�, aby je "
+"usunąć."
+
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<zadanie>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule nie jest dozwolone"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "nierozpoznany argument --schedule „%s�"
+
+#: builtin/gc.c:869
+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:1037
+msgid "failed to start 'git pack-objects' process"
+msgstr "nie można uruchomić procesu „git pack-objects�"
+
+#: builtin/gc.c:1054
+msgid "failed to finish 'git pack-objects' process"
+msgstr "nie można ukończyć procesu „git pack-objects�"
+
+#: builtin/gc.c:1106
+msgid "failed to write multi-pack-index"
+msgstr "nie można zapisać indeksu wielu paczek"
+
+#: builtin/gc.c:1124
+msgid "'git multi-pack-index expire' failed"
+msgstr "„git multi-pack-index expire� nie powiodło się"
+
+#: builtin/gc.c:1185
+msgid "'git multi-pack-index repack' failed"
+msgstr "„git multi-pack-index repack� nie powiodło się"
+
+#: builtin/gc.c:1194
+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
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "istnieje plik blokady „%s�, pomijanie porządków"
+
+#: builtin/gc.c:1328
+#, c-format
+msgid "task '%s' failed"
+msgstr "zadanie „%s� nie powiodło się"
+
+#: builtin/gc.c:1410
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "„%s� nie jest prawidłowym zadaniem"
+
+#: builtin/gc.c:1415
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "nie można wybrać wiele razy zadania „%s�"
+
+#: builtin/gc.c:1430
+msgid "run tasks based on the state of the repository"
+msgstr "uruchamiaj zadania w oparciu o stan repozytorium"
+
+#: builtin/gc.c:1431
+msgid "frequency"
+msgstr "częstotliwość"
+
+#: builtin/gc.c:1432
+msgid "run tasks based on frequency"
+msgstr "uruchamiaj zadania w oparciu o częstotliwość"
+
+#: builtin/gc.c:1435
+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
+msgid "task"
+msgstr "zadanie"
+
+#: builtin/gc.c:1437
+msgid "run a specific task"
+msgstr "uruchom konkretne zadanie"
+
+#: builtin/gc.c:1454
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "--auto i --schedule=<frequency> siÄ™ wykluczajÄ…"
+
+#: builtin/gc.c:1497
+msgid "failed to run 'git config'"
+msgstr "nie można wykonać „git config�"
+
+#: builtin/gc.c:1562
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "nie można rozwinąć ścieżki „%s�"
+
+#: builtin/gc.c:1591
+msgid "failed to start launchctl"
+msgstr "nie można uruchomić launchctl"
+
+#: builtin/gc.c:1628
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "nie można utworzyć katalogów na „%s�"
+
+#: builtin/gc.c:1689
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "nie można wydostać usługi %s"
+
+#: builtin/gc.c:1760
+msgid "failed to create temp xml file"
+msgstr "nie można utworzyć tymczasowego pliku XML"
+
+#: builtin/gc.c:1850
+msgid "failed to start schtasks"
+msgstr "nie można uruchomić schtasks"
+
+#: builtin/gc.c:1894
+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
+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
+msgid "failed to open stdin of 'crontab'"
+msgstr "nie można otworzyć standardowego wejścia „crontab�"
+
+#: builtin/gc.c:1956
+msgid "'crontab' died"
+msgstr "„crontab� padł"
+
+#: builtin/gc.c:1990
+msgid "another process is scheduling background maintenance"
+msgstr "inny proces planuje porzÄ…dki w tle"
+
+#: builtin/gc.c:2009
+msgid "failed to add repo to global config"
+msgstr "nie można dodać repozytorium do globalnej konfiguracji"
+
+#: builtin/gc.c:2019
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <pod-polecenie> [<opcje>]"
+
+#: builtin/gc.c:2038
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "nieprawidłowe pod-polecenie: %s"
+
+#: builtin/grep.c:30
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<opcje>] [-e] <wzorzec> [<rewizja>...] [[--] <ścieżka>...]"
+
+#: builtin/grep.c:223
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: nie można utworzyć wątku: %s"
+
+#: builtin/grep.c:277
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "podano nieprawidłową liczbę wątków (%d) do %s"
+
+#. TRANSLATORS: %s is the configuration
+#. 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
+#, 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
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "nie można odczytać drzewa (%s)"
+
+#: builtin/grep.c:656
+#, 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
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "przełącznik „%c� oczekuje wartości liczbowej"
+
+#: builtin/grep.c:836
+msgid "search in index instead of in the work tree"
+msgstr "wyszukaj w indeksie zamiast w drzewie roboczym"
+
+#: builtin/grep.c:838
+msgid "find in contents not managed by git"
+msgstr "znajdź w zawartości nie zarządzanej przez gita"
+
+#: builtin/grep.c:840
+msgid "search in both tracked and untracked files"
+msgstr "szukaj i w plikach śledzonych i nieśledzonych"
+
+#: builtin/grep.c:842
+msgid "ignore files specified via '.gitignore'"
+msgstr "pomiń pliki wymienione w „.gitignore�"
+
+#: builtin/grep.c:844
+msgid "recursively search in each submodule"
+msgstr "wyszukaj rekurencyjnie w każdym pod-module"
+
+#: builtin/grep.c:847
+msgid "show non-matching lines"
+msgstr "pokaż niepasujące wiersze"
+
+#: builtin/grep.c:849
+msgid "case insensitive matching"
+msgstr "ignorowanie wielkości liter przy dopasowaniu"
+
+#: builtin/grep.c:851
+msgid "match patterns only at word boundaries"
+msgstr "dopasuj wzorce tylko na brzegach słów"
+
+#: builtin/grep.c:853
+msgid "process binary files as text"
+msgstr "przetwarzaj pliki binarne jako tekst"
+
+#: builtin/grep.c:855
+msgid "don't match patterns in binary files"
+msgstr "nie dopasowuj wzorców w plikach binarnych"
+
+#: builtin/grep.c:858
+msgid "process binary files with textconv filters"
+msgstr "przetwarzaj pliki binarne filtrami textconv"
+
+#: builtin/grep.c:860
+msgid "search in subdirectories (default)"
+msgstr "wyszukaj w pod-katalogach (domyślnie)"
+
+#: builtin/grep.c:862
+msgid "descend at most <depth> levels"
+msgstr "zejdź o co najwyżej <głębokość> poziomów"
+
+#: builtin/grep.c:866
+msgid "use extended POSIX regular expressions"
+msgstr "użyj rozszerzonych wyrażeń regularnych POSIX"
+
+#: builtin/grep.c:869
+msgid "use basic POSIX regular expressions (default)"
+msgstr "użyj podstawowych wyrażeń regularnych POSIX (domyślnie)"
+
+#: builtin/grep.c:872
+msgid "interpret patterns as fixed strings"
+msgstr "interpretuj wzorce jako stałe łańcuchy"
+
+#: builtin/grep.c:875
+msgid "use Perl-compatible regular expressions"
+msgstr "użyj wyrażeń regularnych kompatybilnych z Perlem"
+
+#: builtin/grep.c:878
+msgid "show line numbers"
+msgstr "pokaż numery wierszy"
+
+#: builtin/grep.c:879
+msgid "show column number of first match"
+msgstr "pokaż numer kolumny pierwszego dopasowania"
+
+#: builtin/grep.c:880
+msgid "don't show filenames"
+msgstr "nie pokazuj nazw plików"
+
+#: builtin/grep.c:881
+msgid "show filenames"
+msgstr "pokaż nazwy plików"
+
+#: builtin/grep.c:883
+msgid "show filenames relative to top directory"
+msgstr "pokaż nazwy plików względem głównego katalogu"
+
+#: builtin/grep.c:885
+msgid "show only filenames instead of matching lines"
+msgstr "pokazuj tylko nazwy plików zamiast pasujących wierszy"
+
+#: builtin/grep.c:887
+msgid "synonym for --files-with-matches"
+msgstr "zamiennik na --files-with-matches"
+
+#: builtin/grep.c:890
+msgid "show only the names of files without match"
+msgstr "pokazuj tylko nazwy plików bez trafień"
+
+#: builtin/grep.c:892
+msgid "print NUL after filenames"
+msgstr "wypisuj NUL po nazwach plików"
+
+#: builtin/grep.c:895
+msgid "show only matching parts of a line"
+msgstr "pokaż tylko pasujące fragmenty wiersza"
+
+#: builtin/grep.c:897
+msgid "show the number of matches instead of matching lines"
+msgstr "pokaż liczbę dopasowań zamiast pasujących wierszy"
+
+#: builtin/grep.c:898
+msgid "highlight matches"
+msgstr "podświetl dopasowania"
+
+#: builtin/grep.c:900
+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
+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
+msgid "show <n> context lines before and after matches"
+msgstr "pokaż <n> wierszy kontekstu przed dopasowaniami i po nich"
+
+#: builtin/grep.c:908
+msgid "show <n> context lines before matches"
+msgstr "pokaż <n> wierszy kontekstu przed dopasowaniami"
+
+#: builtin/grep.c:910
+msgid "show <n> context lines after matches"
+msgstr "pokaż <n> wierszy kontekstu po dopasowaniach"
+
+#: builtin/grep.c:912
+msgid "use <n> worker threads"
+msgstr "użyj <n> wątków roboczych"
+
+#: builtin/grep.c:913
+msgid "shortcut for -C NUM"
+msgstr "skrót na -C ILE"
+
+#: builtin/grep.c:916
+msgid "show a line with the function name before matches"
+msgstr "pokaż wiersz z nazwą funkcji przed dopasowaniami"
+
+#: builtin/grep.c:918
+msgid "show the surrounding function"
+msgstr "pokaż okalającą funkcję"
+
+#: builtin/grep.c:921
+msgid "read patterns from file"
+msgstr "wczytaj wzorce z pliku"
+
+#: builtin/grep.c:923
+msgid "match <pattern>"
+msgstr "dopasuj <wzorzec>"
+
+#: builtin/grep.c:925
+msgid "combine patterns specified with -e"
+msgstr "Å‚Ä…cz wzorce podane przez -e"
+
+#: builtin/grep.c:937
+msgid "indicate hit with exit status without output"
+msgstr "zgłoś trafienie kodem wyjścia bez wypisywania"
+
+#: builtin/grep.c:939
+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
+msgid "pager"
+msgstr "czytnik"
+
+#: builtin/grep.c:942
+msgid "show matching files in the pager"
+msgstr "pokaż pasujące pliki w czytniku"
+
+#: builtin/grep.c:946
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "pozwól wykonać grep(1) (ignorowane w tej wersji)"
+
+#: builtin/grep.c:1012
+msgid "no pattern given"
+msgstr "nie podano wzorca"
+
+#: builtin/grep.c:1048
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index i --untracked wykluczajÄ… siÄ™ z rewizjami"
+
+#: builtin/grep.c:1056
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "nie można rozwiązać rewizji: %s"
+
+#: builtin/grep.c:1086
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked niewspierane z --recurse-submodules"
+
+#: builtin/grep.c:1090
+msgid "invalid option combination, ignoring --threads"
+msgstr "nieprawidłowe połączenie opcji, pomijanie --threads"
+
+#: builtin/grep.c:1093 builtin/pack-objects.c:3672
+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
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "podano nieprawidłową liczbę wątków (%d)"
+
+#: builtin/grep.c:1130
+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
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached i --untracked wykluczajÄ… siÄ™ z --no-index"
+
+#: builtin/grep.c:1159
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked i --cached siÄ™ wykluczajÄ…"
+
+#: builtin/grep.c:1165
+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
+msgid "both --cached and trees are given"
+msgstr "podano jednocześnie --cached i drzewa"
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <rodzaj>] [-w] [--path=<ścieżka> | --no-filters] [--"
+"stdin] [--] <plik>..."
+
+#: builtin/hash-object.c:86
+msgid "git hash-object  --stdin-paths"
+msgstr "git hash-object  --stdin-paths"
+
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr "rodzaj obiektu"
+
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr "zapisz obiekt do bazy danych obiektu"
+
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr "wczytaj obiekt ze standardowego wejścia"
+
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr "przechowaj plik jak jest, bez filtrów"
+
+#: builtin/hash-object.c:104
+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
+msgid "process file as it were from this path"
+msgstr "przetwórz plik, jakby był z tej ścieżki"
+
+#: builtin/help.c:47
+msgid "print all available commands"
+msgstr "wypisz wszystkie dostępne polecenia"
+
+#: builtin/help.c:48
+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
+msgid "show man page"
+msgstr "pokaż podręcznik użytkowania"
+
+#: builtin/help.c:53
+msgid "show manual in web browser"
+msgstr "pokaż podręcznik w przeglądarce"
+
+#: builtin/help.c:55
+msgid "show info page"
+msgstr "pokaż stronę podręcznika info"
+
+#: builtin/help.c:57
+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:163
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "nierozpoznany format pomocy „%s�"
+
+#: builtin/help.c:190
+msgid "Failed to start emacsclient."
+msgstr "Nie można uruchomić emacsclient."
+
+#: builtin/help.c:203
+msgid "Failed to parse emacsclient version."
+msgstr "Nie można przetworzyć wersji emacsclienta."
+
+#: builtin/help.c:211
+#, 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
+#, c-format
+msgid "failed to exec '%s'"
+msgstr "nie można wykonać „%s�"
+
+#: builtin/help.c:307
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"„%s�: ścieżka do niewspieranego czytnika podręcznika.\n"
+"Rozważ zamiast tego użycie „man.<narzędzie>.cmd�."
+
+#: builtin/help.c:319
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"„%s�: polecenie niewspieranego czytnika podręcznika.\n"
+"Rozważ zamiast tego użycie „man.<narzędzie>.path�."
+
+#: builtin/help.c:436
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "„%s�: nieznany czytnik podręcznika."
+
+#: builtin/help.c:453
+msgid "no man viewer handled the request"
+msgstr "żaden czytnik podręcznika nie obsłużył żądania"
+
+#: builtin/help.c:461
+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
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "„%s� jest skrótem na „%s�"
+
+#: builtin/help.c:534 git.c:372
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr "zły łańcuch alias.%s: %s"
+
+#: builtin/help.c:563 builtin/help.c:593
+#, c-format
+msgid "usage: %s%s"
+msgstr "użycie: %s%s"
+
+#: builtin/help.c:577
+msgid "'git help config' for more information"
+msgstr "więcej informacji w „git help config�"
+
+#: builtin/index-pack.c:221
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "niezgodność rodzajów obiektów w %s"
+
+#: builtin/index-pack.c:241
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "nie odebrano oczekiwanego obiektu %s"
+
+#: builtin/index-pack.c:244
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "obiekt %s: oczekiwano rodzaju %s, znaleziono %s"
+
+#: builtin/index-pack.c:294
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "nie można wypełnić %d bajtu"
+msgstr[1] "nie można wypełnić %d bajtów"
+msgstr[2] "nie można wypełnić %d bajtów"
+
+#: builtin/index-pack.c:304
+msgid "early EOF"
+msgstr "przedwczesny koniec pliku"
+
+#: builtin/index-pack.c:305
+msgid "read error on input"
+msgstr "błąd odczytu na wejściu"
+
+#: builtin/index-pack.c:317
+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
+msgid "pack too large for current definition of off_t"
+msgstr "paczka za duża na obecną definicję off_t"
+
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
+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
+msgid "pack signature mismatch"
+msgstr "niezgodność podpisu paczki"
+
+#: builtin/index-pack.c:364
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "wersja paczki %<PRIu32> niewspierana"
+
+#: builtin/index-pack.c:382
+#, 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
+#, c-format
+msgid "inflate returned %d"
+msgstr "dekompresja zwróciła %d"
+
+#: builtin/index-pack.c:537
+msgid "offset value overflow for delta base object"
+msgstr "przepełnienie wartości przesunięcia dla obiektu podstawowego delty"
+
+#: builtin/index-pack.c:545
+msgid "delta base offset is out of bound"
+msgstr "podstawowe przesunięcie delty jest poza zakresem"
+
+#: builtin/index-pack.c:553
+#, c-format
+msgid "unknown object type %d"
+msgstr "nieznany typ obiektu %d"
+
+#: builtin/index-pack.c:584
+msgid "cannot pread pack file"
+msgstr "nie można wykonać pread na pliku paczki"
+
+#: builtin/index-pack.c:586
+#, c-format
+msgid "premature end of pack file, %<PRIuMAX> byte missing"
+msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
+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
+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
+#, 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
+#, c-format
+msgid "unable to read %s"
+msgstr "nie można odczytać %s"
+
+#: builtin/index-pack.c:824
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "nie można odczytać informacji istniejącego obiektu %s"
+
+#: builtin/index-pack.c:832
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "nie można odczytać istniejącego obiektu %s"
+
+#: builtin/index-pack.c:846
+#, c-format
+msgid "invalid blob object %s"
+msgstr "nieprawidłowy obiekt blob %s"
+
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
+msgid "fsck error in packed object"
+msgstr "błąd fsck w spakowanym obiekcie"
+
+#: builtin/index-pack.c:870
+#, 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
+msgid "failed to apply delta"
+msgstr "nie można zastosować delty"
+
+#: builtin/index-pack.c:1161
+msgid "Receiving objects"
+msgstr "Pobieranie obiektów"
+
+#: builtin/index-pack.c:1161
+msgid "Indexing objects"
+msgstr "Indeksowanie obiektów"
+
+#: builtin/index-pack.c:1195
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "paczka jest uszkodzona (różnica w SHA1)"
+
+#: builtin/index-pack.c:1200
+msgid "cannot fstat packfile"
+msgstr "nie można wykonać fstat na pliku paczki"
+
+#: builtin/index-pack.c:1203
+msgid "pack has junk at the end"
+msgstr "paczka ma śmieci na końcu"
+
+#: builtin/index-pack.c:1215
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "dezorientacja ponad szaleństwo w parse_pack_objects()"
+
+#: builtin/index-pack.c:1238
+msgid "Resolving deltas"
+msgstr "RozwiÄ…zywanie delt"
+
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2707
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "nie można utworzyć wątku: %s"
+
+#: builtin/index-pack.c:1282
+msgid "confusion beyond insanity"
+msgstr "dezorientacja ponad szaleństwo"
+
+#: builtin/index-pack.c:1288
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+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
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "Nieoczekiwana końcowa suma kontrolna %s (uszkodzenie dysku?)"
+
+#: builtin/index-pack.c:1304
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+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
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "nie można skompresować dodanego obiektu (%d)"
+
+#: builtin/index-pack.c:1424
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "lokalny obiekt %s jest uszkodzony"
+
+#: builtin/index-pack.c:1445
+#, 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
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "nie można zapisać pliku %s „%s�"
+
+#: builtin/index-pack.c:1477
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "nie można zamknąć zapisanego pliku %s „%s�"
+
+#: builtin/index-pack.c:1503
+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
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "zła wartość pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1650
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "Nie można otworzyć istniejącego pliku paczki „%s�"
+
+#: builtin/index-pack.c:1652
+#, 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
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "nie delta: %d obiekt"
+msgstr[1] "nie delta: %d obiekty"
+msgstr[2] "nie delta: %d obiektów"
+
+#: builtin/index-pack.c:1707
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+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
+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
+#, c-format
+msgid "bad %s"
+msgstr "błędny %s"
+
+#: builtin/index-pack.c:1832 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "nieznany algorytm skrótu „%s�"
+
+#: builtin/index-pack.c:1851
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin i --stdin wykluczajÄ… siÄ™"
+
+#: builtin/index-pack.c:1853
+msgid "--stdin requires a git repository"
+msgstr "--stdin wymaga repozytorium gita"
+
+#: builtin/index-pack.c:1855
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format i --stdin wykluczajÄ… siÄ™"
+
+#: builtin/index-pack.c:1870
+msgid "--verify with no packfile name given"
+msgstr "--verify bez podanej nazwy pliku paczki"
+
+#: builtin/index-pack.c:1936 builtin/unpack-objects.c:582
+msgid "fsck error in pack objects"
+msgstr "błąd fsck w obiektach paczek"
+
+#: builtin/init-db.c:64
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "nie można wykonać stat na szablonie „%s�"
+
+#: builtin/init-db.c:69
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "nie można otworzyć katalogu „%s�"
+
+#: builtin/init-db.c:81
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "nie można wykonać readlink na „%s�"
+
+#: builtin/init-db.c:83
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "nie można wykonać symlink na „%s� „%s�"
+
+#: builtin/init-db.c:89
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "nie można skopiować „%s� do „%s�"
+
+#: builtin/init-db.c:93
+#, c-format
+msgid "ignoring template %s"
+msgstr "pomijanie szablonu %s"
+
+#: builtin/init-db.c:124
+#, c-format
+msgid "templates not found in %s"
+msgstr "nie znaleziono szablonów w %s"
+
+#: builtin/init-db.c:139
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "nie kopiowanie szablonów z „%s�: %s"
+
+#: builtin/init-db.c:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "nieprawidłowa początkowa nazwa gałęzi: „%s�"
+
+#: builtin/init-db.c:367
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "nie można obsłużyć typu pliku %d"
+
+#: builtin/init-db.c:370
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "nie można przenieść %s do %s"
+
+#: builtin/init-db.c:386
+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
+#, c-format
+msgid "%s already exists"
+msgstr "%s już istnieje"
+
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: pominięto --initial-branch=%s"
+
+#: builtin/init-db.c:476
+#, 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
+#, 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
+#, 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
+#, 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
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<katalog-szablonu>] [--"
+"shared[=<uprawnienia>]] [<katalog>]"
+
+#: builtin/init-db.c:557
+msgid "permissions"
+msgstr "uprawnienia"
+
+#: builtin/init-db.c:558
+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
+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
+msgid "hash"
+msgstr "skrót"
+
+#: builtin/init-db.c:566 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
+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
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "nie można utworzyć katalogu %s"
+
+#: builtin/init-db.c:611 builtin/init-db.c:666
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "nie można wejść do %s"
+
+#: builtin/init-db.c:638
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (lub --work-tree=<katalog>) niedozwolone bez podania %s (lub --git-"
+"dir=<katalog>)"
+
+#: builtin/init-db.c:690
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "Nie można dostać się do drzewa roboczego „%s�"
+
+#: builtin/init-db.c:695
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir i suche repozytorium siÄ™ wykluczajÄ…"
+
+#: 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 "
+"<klucz>[(=|:)<wartość>])...] [<plik>...]"
+
+#: builtin/interpret-trailers.c:95
+msgid "edit files in place"
+msgstr "edytuj pliki w miejscu"
+
+#: builtin/interpret-trailers.c:96
+msgid "trim empty trailers"
+msgstr "obcinaj puste końcówki"
+
+#: builtin/interpret-trailers.c:99
+msgid "where to place the new trailer"
+msgstr "gdzie umieścić nową końcówkę"
+
+#: builtin/interpret-trailers.c:101
+msgid "action if trailer already exists"
+msgstr "działanie, jeśli końcówka już istnieje"
+
+#: builtin/interpret-trailers.c:103
+msgid "action if trailer is missing"
+msgstr "działanie, jeśli brakuje końcówki"
+
+#: builtin/interpret-trailers.c:105
+msgid "output only the trailers"
+msgstr "wypisz tylko końcówki"
+
+#: builtin/interpret-trailers.c:106
+msgid "do not apply config rules"
+msgstr "nie stosuj reguł konfiguracji"
+
+#: builtin/interpret-trailers.c:107
+msgid "join whitespace-continued values"
+msgstr "złącz wartości kontynuowane od białych znaków"
+
+#: builtin/interpret-trailers.c:108
+msgid "set parsing options"
+msgstr "ustaw opcje przetwarzania"
+
+#: builtin/interpret-trailers.c:110
+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Ä™"
+
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
+msgstr "nie podano pliku wejściowego do edycji w miejscu"
+
+#: builtin/log.c:59
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<opcje>] [<zakres-rewizji>] [[--] <ścieżka>...]"
+
+#: builtin/log.c:60
+msgid "git show [<options>] <object>..."
+msgstr "git show [<opcje>] <obiekt>..."
+
+#: builtin/log.c:113
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "nieprawidłowa opcja --decorate: %s"
+
+#: builtin/log.c:180
+msgid "show source"
+msgstr "pokaż źródło"
+
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "użyj pliku mapy adresów"
+
+#: builtin/log.c:184
+msgid "only decorate refs that match <pattern>"
+msgstr "dekoruj tylko referencje pasujÄ…ce do <wzorca>"
+
+#: builtin/log.c:186
+msgid "do not decorate refs that match <pattern>"
+msgstr "nie dekoruj referencji pasujÄ…cych do <wzorca>"
+
+#: builtin/log.c:187
+msgid "decorate options"
+msgstr "opcje dekoracyjne"
+
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"śledź ewolucję zakresu wierszy <start>,<end> lub funkcji :<nazwa-funkcji> w "
+"<pliku>"
+
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<zakres>:<plik> i ścieżki się wykluczają"
+
+#: builtin/log.c:303
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "Ostateczne wyjście: %d %s\n"
+
+#: builtin/log.c:566
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: zły plik"
+
+#: builtin/log.c:581 builtin/log.c:671
+#, c-format
+msgid "could not read object %s"
+msgstr "nie można odczytać obiektu %s"
+
+#: builtin/log.c:696
+#, c-format
+msgid "unknown type: %d"
+msgstr "nieznany rodzaj: %d"
+
+#: builtin/log.c:841
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: nieprawidłowy tryb listu motywacyjnego z opisu"
+
+#: builtin/log.c:848
+msgid "format.headers without value"
+msgstr "format.headers bez wartości"
+
+#: builtin/log.c:977
+#, c-format
+msgid "cannot open patch file %s"
+msgstr "nie można otworzyć pliku łatki %s"
+
+#: builtin/log.c:994
+msgid "need exactly one range"
+msgstr "potrzeba dokładnie jednego zakresu"
+
+#: builtin/log.c:1004
+msgid "not a range"
+msgstr "to nie jest zakres"
+
+#: builtin/log.c:1168
+msgid "cover letter needs email format"
+msgstr "list motywacyjny wymaga formatu e-mail"
+
+#: builtin/log.c:1174
+msgid "failed to create cover-letter file"
+msgstr "nie można utworzyć pliku z listem motywacyjnym"
+
+#: builtin/log.c:1261
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "szalone in-reply-to: %s"
+
+#: builtin/log.c:1288
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<opcje>] [<od-kiedy> | <zakres-rewizji>]"
+
+#: builtin/log.c:1346
+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
+#, c-format
+msgid "unknown commit %s"
+msgstr "nieznany zapis %s"
+
+#: builtin/log.c:1508 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
+msgid "could not find exact merge base"
+msgstr "nie znaleziono dokładnej podstawy scalania"
+
+#: builtin/log.c:1527
+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 ""
+"nie udało się uzyskać nadrzędnego repozytorium, jeśli chcesz automatycznie\n"
+"zapisać zapis podstawy, użyj git branch --set-upstream-to, aby śledzić "
+"zdalną gałąź.\n"
+"Albo możesz podać zapis podstawy ręcznie przez --base=<id-zapisu-podstawy>"
+
+#: builtin/log.c:1550
+msgid "failed to find exact merge base"
+msgstr "nie znaleziono dokładnej podstawy scalania"
+
+#: builtin/log.c:1567
+msgid "base commit should be the ancestor of revision list"
+msgstr "podstawowy zapis powinien być przodkiem listy rewizji"
+
+#: builtin/log.c:1577
+msgid "base commit shouldn't be in revision list"
+msgstr "podstawowy zapis nie powinien być na liście rewizji"
+
+#: builtin/log.c:1635
+msgid "cannot get patch id"
+msgstr "nie można uzyskać identyfikatora łatki"
+
+#: builtin/log.c:1692
+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
+#, 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
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "użyj [PATCH n/m] nawet przy pojedynczej łatce"
+
+#: builtin/log.c:1741
+msgid "use [PATCH] even with multiple patches"
+msgstr "użyj [PATCH] nawet przy wielu łatkach"
+
+#: builtin/log.c:1745
+msgid "print patches to standard out"
+msgstr "wypisz łatki na standardowe wyjście"
+
+#: builtin/log.c:1747
+msgid "generate a cover letter"
+msgstr "wygeneruj list motywacyjny"
+
+#: builtin/log.c:1749
+msgid "use simple number sequence for output file names"
+msgstr "użyj tylko numerów w nazwach wynikowych plików"
+
+#: builtin/log.c:1750
+msgid "sfx"
+msgstr "sfx"
+
+#: builtin/log.c:1751
+msgid "use <sfx> instead of '.patch'"
+msgstr "użyj <sfx> zamiast „.patch�"
+
+#: builtin/log.c:1753
+msgid "start numbering patches at <n> instead of 1"
+msgstr "zacznij numerować łatki od <n> zamiast od 1"
+
+#: builtin/log.c:1755
+msgid "mark the series as Nth re-roll"
+msgstr "oznacz serię jako N-te podejście"
+
+#: builtin/log.c:1757
+msgid "max length of output filename"
+msgstr "maksymalna długość nazwy wynikowego pliku"
+
+#: builtin/log.c:1759
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "użyj [RFC PATCH] zamiast [PATCH]"
+
+#: builtin/log.c:1762
+msgid "cover-from-description-mode"
+msgstr "tryb-listu-z-opisu"
+
+#: builtin/log.c:1763
+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
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "użyj [<prefiksu>] zamiast [PATCH]"
+
+#: builtin/log.c:1768
+msgid "store resulting files in <dir>"
+msgstr "zachowaj wynikowe pliki w <katalogu>"
+
+#: builtin/log.c:1771
+msgid "don't strip/add [PATCH]"
+msgstr "nie usuwaj/nie dodawaj [PATCH]"
+
+#: builtin/log.c:1774
+msgid "don't output binary diffs"
+msgstr "nie wypisuj binarnych różnic"
+
+#: builtin/log.c:1776
+msgid "output all-zero hash in From header"
+msgstr "wypisz skrót z samych zer w nagłówku Od"
+
+#: builtin/log.c:1778
+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
+msgid "show patch format instead of default (patch + stat)"
+msgstr "pokaż format łatki zamiast domyślnego (łatka + statystyki)"
+
+#: builtin/log.c:1782
+msgid "Messaging"
+msgstr "Wiadomości"
+
+#: builtin/log.c:1783
+msgid "header"
+msgstr "nagłówek"
+
+#: builtin/log.c:1784
+msgid "add email header"
+msgstr "dodaj nagłówek e-maila"
+
+#: builtin/log.c:1785 builtin/log.c:1786
+msgid "email"
+msgstr "e-mail"
+
+#: builtin/log.c:1785
+msgid "add To: header"
+msgstr "dodaj pole Do:"
+
+#: builtin/log.c:1786
+msgid "add Cc: header"
+msgstr "dodaj pole DW:"
+
+#: builtin/log.c:1787
+msgid "ident"
+msgstr "tożsamość"
+
+#: builtin/log.c:1788
+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
+msgid "message-id"
+msgstr "id-wiadomości"
+
+#: builtin/log.c:1791
+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
+msgid "boundary"
+msgstr "granica/boundary"
+
+#: builtin/log.c:1793
+msgid "attach the patch"
+msgstr "załącz łatkę"
+
+#: builtin/log.c:1796
+msgid "inline the patch"
+msgstr "umieść łatkę w treści"
+
+#: builtin/log.c:1800
+msgid "enable message threading, styles: shallow, deep"
+msgstr "zezwól na wątkowanie komunikatów, style: shallow, deep"
+
+#: builtin/log.c:1802
+msgid "signature"
+msgstr "podpis"
+
+#: builtin/log.c:1803
+msgid "add a signature"
+msgstr "dodaj podpis"
+
+#: builtin/log.c:1804
+msgid "base-commit"
+msgstr "zapis-podstawy"
+
+#: builtin/log.c:1805
+msgid "add prerequisite tree info to the patch series"
+msgstr "dodaj informacje o wymaganym poczÄ…tkowym drzewie do serii Å‚atek"
+
+#: builtin/log.c:1808
+msgid "add a signature from a file"
+msgstr "dodaj podpis z pliku"
+
+#: builtin/log.c:1809
+msgid "don't print the patch filenames"
+msgstr "nie wypisuj nazw plików łatek"
+
+#: builtin/log.c:1811
+msgid "show progress while generating patches"
+msgstr "pokaż postęp podczas generowania łatek"
+
+#: builtin/log.c:1813
+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
+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
+msgid "percentage by which creation is weighted"
+msgstr "procent, według jakiego ważone jest tworzenie"
+
+#: builtin/log.c:1904
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "błędny wiersz tożsamości: %s"
+
+#: builtin/log.c:1919
+msgid "-n and -k are mutually exclusive"
+msgstr "-n i -k siÄ™ wykluczajÄ…"
+
+#: builtin/log.c:1921
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr "--subject-prefix/--rfc i -k siÄ™ wykluczajÄ…"
+
+#: builtin/log.c:1929
+msgid "--name-only does not make sense"
+msgstr "--name-only nie ma sensu"
+
+#: builtin/log.c:1931
+msgid "--name-status does not make sense"
+msgstr "--name-status nie ma sensu"
+
+#: builtin/log.c:1933
+msgid "--check does not make sense"
+msgstr "--check nie ma sensu"
+
+#: builtin/log.c:1955
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout, --output i --output-directory siÄ™ wykluczajÄ…"
+
+#: builtin/log.c:2078
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff wymaga --cover-letter lub pojedynczej Å‚atki"
+
+#: builtin/log.c:2082
+msgid "Interdiff:"
+msgstr "Różnice w różnicach:"
+
+#: builtin/log.c:2083
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr "Różnice w różnicach względem v%d:"
+
+#: builtin/log.c:2089
+msgid "--creation-factor requires --range-diff"
+msgstr "--creation-factor wymaga --range-diff"
+
+#: builtin/log.c:2093
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff wymaga --cover-letter lub pojedynczej Å‚atki"
+
+#: builtin/log.c:2101
+msgid "Range-diff:"
+msgstr "Różnice zakresów:"
+
+#: builtin/log.c:2102
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr "Różnice zakresów względem v%d:"
+
+#: builtin/log.c:2113
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "nie można odczytać pliku podpisu „%s�"
+
+#: builtin/log.c:2149
+msgid "Generating patches"
+msgstr "Generowanie Å‚atek"
+
+#: builtin/log.c:2193
+msgid "failed to create output files"
+msgstr "nie można utworzyć plików wyjściowych"
+
+#: builtin/log.c:2252
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<nadrzędna> [<czoło> [<limit>]]]"
+
+#: builtin/log.c:2306
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr ""
+"Nie znaleziono śledzonej zdalnej gałęzi, podaj ręcznie <zdalne-"
+"repozytorium>.\n"
+
+#: builtin/ls-files.c:486
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<opcje>] [<plik>...]"
+
+#: builtin/ls-files.c:542
+msgid "identify the file status with tags"
+msgstr "opisz stan pliku tagami"
+
+#: builtin/ls-files.c:544
+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
+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
+msgid "show cached files in the output (default)"
+msgstr "pokaż w wyjściu zapamiętane pliki (domyślnie)"
+
+#: builtin/ls-files.c:550
+msgid "show deleted files in the output"
+msgstr "pokaż w wyjściu usunięte pliki"
+
+#: builtin/ls-files.c:552
+msgid "show modified files in the output"
+msgstr "pokaż w wyjściu zmienione pliki"
+
+#: builtin/ls-files.c:554
+msgid "show other files in the output"
+msgstr "pokazuj pliki innego typu w wyjściu"
+
+#: builtin/ls-files.c:556
+msgid "show ignored files in the output"
+msgstr "pokaż w wyjściu ignorowane pliki"
+
+#: builtin/ls-files.c:559
+msgid "show staged contents' object name in the output"
+msgstr "pokaż w wyjściu nazwę obiektu przygotowanej zawartości"
+
+#: builtin/ls-files.c:561
+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
+msgid "show 'other' directories' names only"
+msgstr "pokaż tylko nazwy nieśledzonych katalogów"
+
+#: builtin/ls-files.c:565
+msgid "show line endings of files"
+msgstr "pokaż zakończenia wierszy w plikach"
+
+#: builtin/ls-files.c:567
+msgid "don't show empty directories"
+msgstr "nie pokazuj pustych katalogów"
+
+#: builtin/ls-files.c:570
+msgid "show unmerged files in the output"
+msgstr "pokaż niescalone pliki w wyjściu"
+
+#: builtin/ls-files.c:572
+msgid "show resolve-undo information"
+msgstr "pokaż informacje o resolve-undo"
+
+#: builtin/ls-files.c:574
+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:580
+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
+msgid "add the standard git exclusions"
+msgstr "dodaj standardowe wyjÄ…tki gita"
+
+#: builtin/ls-files.c:586
+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
+msgid "recurse through submodules"
+msgstr "schodź do pod-modułów"
+
+#: builtin/ls-files.c:591
+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
+msgid "tree-ish"
+msgstr "drzewo"
+
+#: builtin/ls-files.c:593
+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
+msgid "show debugging data"
+msgstr "pokaż dane diagnostyczne"
+
+#: builtin/ls-files.c:597
+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>...]]"
+msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<program>]\n"
+"                     [-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
+msgid "exec"
+msgstr "program"
+
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
+msgid "path of git-upload-pack on the remote host"
+msgstr "ścieżka git-upload-pack na zdalnej maszynie"
+
+#: builtin/ls-remote.c:66
+msgid "limit to tags"
+msgstr "ogranicz do tagów"
+
+#: builtin/ls-remote.c:67
+msgid "limit to heads"
+msgstr "ogranicz do głównych gałęzi"
+
+#: builtin/ls-remote.c:68
+msgid "do not show peeled tags"
+msgstr "nie pokazuj obranych tagów"
+
+#: builtin/ls-remote.c:70
+msgid "take url.<base>.insteadOf into account"
+msgstr "weź pod uwagę url.<podstawa>.insteadOf"
+
+#: builtin/ls-remote.c:73
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "zwróć kod wyjścia 2, jeśli nie znaleziono pasujących referencji"
+
+#: builtin/ls-remote.c:76
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "pokaż referencję podłoża oprócz obiektu wskazywanego przez nią"
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<opcje>] <drzewo> [<ścieżka>...]"
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr "pokaż tylko drzewa"
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr "schodź do pod-modułów"
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr "pokaż drzewa podczas schodzenia"
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr "rozdziel elementy znakiem NUL"
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr "uwzględnij rozmiar obiektu"
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr "wypisz tylko nazwy plików"
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr "użyj pełnych nazw ścieżek"
+
+#: builtin/ls-tree.c:145
+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
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "pusta skrzynka mbox: „%s�"
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <zapis> <zapis>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <zapis>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <zapis>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <zapis> <zapis>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <referencja> [<zapis>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "wypisz wszystkich wspólnych przodków"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "znajdź przodków pojedynczego n-stronnego scalenia"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "wypisz referencje nieosiÄ…galne z innych"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "czy pierwszy jest przodkiem drugiego?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "znajdź, gdzie <zapis> odgałęził się od dziennika referencji <ref>"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<opcje>] [-L <nazwa1> [-L <oryg> [-L <nazwa2>]]] <plik1> "
+"<plik-pierw> <plik2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "wyślij wynik na standardowe wyjście"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "użyj scalenia opartego o diff3"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "przy konfliktach użyj „naszej� wersji"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "przy konfliktach użyj „ich� wersji"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "przy konfliktach użyj sumy obu wersji"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "przy konfliktach użyj tylu ==/>>/<< w znaczniku"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "nie ostrzegaj o konfliktach"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "ustaw etykiety do file1/orig-file/file2"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "nieznana opcja %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "nie można przetworzyć obiektu „%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] "nie można obsłużyć więcej niż %d podstawy. Pomijanie %s."
+msgstr[1] "nie można obsłużyć więcej niż %d podstaw. Pomijanie %s."
+msgstr[2] "nie można obsłużyć więcej niż %d podstaw. Pomijanie %s."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "nie rozpatrywanie niczego poza scalaniem dwóch czół."
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "nie można rozwiązać referencji „%s�"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Scalanie %s z %s\n"
+
+#: builtin/merge.c:58
+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
+msgid "switch `m' requires a value"
+msgstr "przełącznik „m� wymaga wartości"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "opcja „%s� wymaga wartości"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Nie znaleziono strategii scalania „%s�.\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Dostępne strategie:"
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Dostępne niestandardowe strategie:"
+
+#: builtin/merge.c:256 builtin/pull.c:133
+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
+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
+msgid "(synonym to --stat)"
+msgstr "(synonim do --stat)"
+
+#: builtin/merge.c:262 builtin/pull.c:142
+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
+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
+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
+msgid "edit message before committing"
+msgstr "edytuj komunikat przed złożeniem"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "zezwól na przewijanie (domyślne)"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+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
+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
+msgid "strategy"
+msgstr "strategia"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "strategia scalania"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "opcja=wartość"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "opcja wybranej strategii scalania"
+
+#: builtin/merge.c:283
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "komunikat zapisu scalenia (do nieprzewiniętego scalenia)"
+
+#: builtin/merge.c:290
+msgid "abort the current in-progress merge"
+msgstr "przerwij bieżące trwające scalanie"
+
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr "jak --abort, ale zostaw w spokoju indeks i drzewo robocze"
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr "kontynuuj bieżące trwające scalanie"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "zezwól na scalenie niepowiązanych historii"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "omiń skrypty pre-merge-commit i commit-msg"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "nie można wykonać dodania do schowka."
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "dodanie zmian do schowka nie powiodło się"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "nieprawidłowy obiekt: %s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+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:410
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Spłaszczony zapis — nie aktualizowanie HEAD\n"
+
+#: builtin/merge.c:460
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Brak komunikatu scalenia — nie aktualizowanie HEAD\n"
+
+#: builtin/merge.c:511
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "„%s� nie wskazuje na zapis"
+
+#: builtin/merge.c:598
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Zły łańcuch branch.%s.mergeoptions: %s"
+
+#: builtin/merge.c:724
+msgid "Not handling anything other than two heads merge."
+msgstr "Nie rozpatrywanie niczego poza scalaniem dwóch czół."
+
+#: builtin/merge.c:737
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Nieznana opcja merge-recursive: -X%s"
+
+#: builtin/merge.c:756 t/helper/test-fast-rebase.c:209
+#, c-format
+msgid "unable to write %s"
+msgstr "nie można zapisać %s"
+
+#: builtin/merge.c:808
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Nie można odczytać „%s�"
+
+#: builtin/merge.c:817
+#, 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
+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 ""
+"Podaj komunikat zapisu, żeby wyjaśnić, dlaczego to scalenie jest konieczne,\n"
+"zwłaszcza jeśli scala zaktualizowaną gałąź nadrzędną z gałęzią tematyczną.\n"
+"\n"
+
+#: builtin/merge.c:828
+msgid "An empty message aborts the commit.\n"
+msgstr "Pusty komunikat przerywa zapis.\n"
+
+#: builtin/merge.c:831
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Wiersze zaczynające się od „%c� będą ignorowane, a pusty komunikat\n"
+"przerwie zapis.\n"
+
+#: builtin/merge.c:884
+msgid "Empty commit message."
+msgstr "Pusty komunikat zapisu."
+
+#: builtin/merge.c:899
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Wspaniale.\n"
+
+#: builtin/merge.c:960
+#, 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
+msgid "No current branch."
+msgstr "Nie ma bieżącej gałęzi."
+
+#: builtin/merge.c:1001
+msgid "No remote for the current branch."
+msgstr "Bieżąca gałąź nie ma zdalnego repozytorium."
+
+#: builtin/merge.c:1003
+msgid "No default upstream defined for the current branch."
+msgstr "Nie zdefiniowano gałęzi nadrzędnej wobec bieżącej."
+
+#: builtin/merge.c:1008
+#, 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
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Błędna wartość „%s� w środowisku „%s�"
+
+#: builtin/merge.c:1168
+#, 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
+msgid "not something we can merge"
+msgstr "to nie jest coś, co można scalić"
+
+#: builtin/merge.c:1312
+msgid "--abort expects no arguments"
+msgstr "--abort nie przyjmuje argumentów"
+
+#: builtin/merge.c:1316
+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
+msgid "--quit expects no arguments"
+msgstr "--quit nie przyjmuje argumentów"
+
+#: builtin/merge.c:1347
+msgid "--continue expects no arguments"
+msgstr "--continue nie przyjmuje argumentów"
+
+#: builtin/merge.c:1351
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Nie trwa żadne scalenie (brak MERGE_HEAD)."
+
+#: builtin/merge.c:1367
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Nie zwieńczono scalania (MERGE_HEAD istnieje).\n"
+"Złóż swoje zmiany przed scaleniem."
+
+#: builtin/merge.c:1374
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"Nie zwieńczono dobierania (CHERRY_PICK_HEAD istnieje).\n"
+"Złóż swoje zmiany przed scaleniem."
+
+#: builtin/merge.c:1377
+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
+msgid "You cannot combine --squash with --no-ff."
+msgstr "--squash i --no-ff siÄ™ wykluczajÄ…."
+
+#: builtin/merge.c:1393
+msgid "You cannot combine --squash with --commit."
+msgstr "--squash i --commit siÄ™ wykluczajÄ…."
+
+#: builtin/merge.c:1409
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Nie podano zapisu, a nie ustawiono merge.defaultToUpstream."
+
+#: builtin/merge.c:1426
+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
+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
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s — nie jest czymś, co możemy scalić"
+
+#: builtin/merge.c:1435
+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
+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
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Aktualizowanie %s..%s\n"
+
+#: builtin/merge.c:1581
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Próba naprawdę trywialnego scalenia w indeksie...\n"
+
+#: builtin/merge.c:1588
+#, 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
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Cofanie drzewa do nieskalanego stanu...\n"
+
+#: builtin/merge.c:1651
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Próba strategii scalania %s...\n"
+
+#: builtin/merge.c:1703
+#, 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
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Scalanie ze strategią %s nie powiodło się.\n"
+
+#: builtin/merge.c:1714
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "Użycie %s, żeby przygotować ręczne rozwiązywanie.\n"
+
+#: builtin/merge.c:1728
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Automatyczne scalanie powiodło się; zatrzymano przez złożeniem, jak "
+"polecono\n"
+
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:30
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "nie można odczytać otagowanego obiektu „%s�"
+
+#: builtin/mktag.c:62
+#, 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
+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
+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
+msgid "unable to write tag file"
+msgstr "nie można zapisać pliku tagu"
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr "wejście jest zakończone znakiem NUL"
+
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr "zezwól na brakujące obiekty"
+
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr "pozwól na tworzenie więcej niż jednego drzewa"
+
+#: builtin/multi-pack-index.c:9
+msgid ""
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
+msgstr ""
+"git multi-pack-index [<opcje>] (write|verify|expire|repack --batch-"
+"size=<rozmiar>)"
+
+#: builtin/multi-pack-index.c:26
+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
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+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>"
+
+#: 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?"
+
+#: builtin/mv.c:85
+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/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s jest w indeksie"
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "wymuś przeniesienie/zmianę nazwy nawet jeśli cel istnieje"
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr "pomiń błędy przenoszenia/zmiany nazwy"
+
+#: builtin/mv.c:170
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "cel „%s� nie jest katalogiem"
+
+#: builtin/mv.c:181
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "Sprawdzanie zmiany nazwy „%s� na „%s�\n"
+
+#: builtin/mv.c:185
+msgid "bad source"
+msgstr "złe źródło"
+
+#: builtin/mv.c:188
+msgid "can not move directory into itself"
+msgstr "nie można przenieść katalogu do niego samego"
+
+#: builtin/mv.c:191
+msgid "cannot move directory over file"
+msgstr "nie można przesunąć katalogu na plik"
+
+#: builtin/mv.c:200
+msgid "source directory is empty"
+msgstr "katalog źródłowy jest pusty"
+
+#: builtin/mv.c:225
+msgid "not under version control"
+msgstr "nie podlega kontroli wersji"
+
+#: builtin/mv.c:227
+msgid "conflicted"
+msgstr "skonfliktowane"
+
+#: builtin/mv.c:230
+msgid "destination exists"
+msgstr "cel istnieje"
+
+#: builtin/mv.c:238
+#, c-format
+msgid "overwriting '%s'"
+msgstr "nadpisywanie „%s�"
+
+#: builtin/mv.c:241
+msgid "Cannot overwrite"
+msgstr "Nie można nadpisać"
+
+#: builtin/mv.c:244
+msgid "multiple sources for the same target"
+msgstr "wiele źródeł do tego samego celu"
+
+#: builtin/mv.c:246
+msgid "destination directory does not exist"
+msgstr "katalog docelowy nie istnieje"
+
+#: builtin/mv.c:253
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, źródło=%s, cel=%s"
+
+#: builtin/mv.c:274
+#, 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
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "nie można zmienić nazwy „%s�"
+
+#: builtin/name-rev.c:465
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<opcje>] <zapis>..."
+
+#: builtin/name-rev.c:466
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<opcje>] --all"
+
+#: builtin/name-rev.c:467
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<opcje>] --stdin"
+
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr "wypisz tylko nazwy oparte o referencje (bez nazw obiektów)"
+
+#: builtin/name-rev.c:525
+msgid "only use tags to name the commits"
+msgstr "użyj tagów tylko do nazwania zapisów"
+
+#: builtin/name-rev.c:527
+msgid "only use refs matching <pattern>"
+msgstr "użyj tylko referencji pasujących do <wzorca>"
+
+#: builtin/name-rev.c:529
+msgid "ignore refs matching <pattern>"
+msgstr "pomiń referencje pasujące do <wzorca>"
+
+#: builtin/name-rev.c:531
+msgid "list all commits reachable from all refs"
+msgstr "wypisz wszystkie zapisy osiÄ…galne ze wszystkich referencji"
+
+#: builtin/name-rev.c:532
+msgid "read from stdin"
+msgstr "czytaj ze standardowego wejścia"
+
+#: builtin/name-rev.c:533
+msgid "allow to print `undefined` names (default)"
+msgstr "pozwól wypisać „niezdefiniowane� nazwy (domyślnie)"
+
+#: builtin/name-rev.c:539
+msgid "dereference tags in the input (internal use)"
+msgstr "zaglądaj do tagów z wejścia (użycie wewnętrzne)"
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <ref-uwagi>] [list [<obiekt>]]"
+
+#: 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 <ref-uwagi>] add [-f] [--allow-empty] [-m <komunikat> | -F "
+"<plik> | (-c | -C) <obiekt>] [<obiekt>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <ref-uwagi>] copy [-f] <obiekt-z> <obiekt-do>"
+
+#: 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 <ref-uwagi>] append [--allow-empty] [-m <komunikat> | -F "
+"<plik> | (-c | -C) <obiekt>] [<obiekt>]"
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <ref-uwagi>] edit [--allow-empty] [<obiekt>]"
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <ref-uwagi>] show [<obiekt>]"
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <referencja-uwag>] merge [-v | -q] [-s <strategia>] "
+"<referencja-uwag>"
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <ref-uwagi>] remove [<obiekt>...]"
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <ref-uwag>] prune [-n] [-v]"
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <referencja-uwagi>] get-ref"
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<obiekt>]]"
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<opcje>] [<obiekt>]"
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<opcje>] <obiekt-z> <obiekt-do>"
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<obiekt-z> <obiekt-do>]..."
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<opcje>] [<obiekt>]"
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<obiekt>]"
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr "git notes show [<obiekt>]"
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<opcje>] <ref-uwagi>"
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<opcje>]"
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<opcje>]"
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<obiekt>]"
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<opcje>]"
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr "Zapisz/edytuj uwagi do następującego obiektu:"
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "nie można uruchomić „show� na obiekcie „%s�"
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr "nie można odczytać wyjścia „show�"
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "nie można ukończyć „show� na obiekcie „%s�"
+
+#: builtin/notes.c:197
+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
+msgid "unable to write note object"
+msgstr "nie można zapisać obiektu uwagi"
+
+#: builtin/notes.c:208
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "nie można odczytać obiektu „%s�."
+
+#: builtin/notes.c:268
+#, 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
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "uszkodzony wiersz wejścia: „%s�."
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+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
+#, 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
+#, c-format
+msgid "no note found for object %s."
+msgstr "brak uwag do obiektu %s."
+
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr "zawartość uwagi jako łańcuch"
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr "zawartość uwag w pliku"
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr "użyj ponownie i edytuj podany obiekt uwagi"
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr "odrzuć podany obiekt węzła"
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr "pozwól zachować pustą uwagę"
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr "zastÄ…p istniejÄ…ce uwagi"
+
+#: builtin/notes.c:448
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+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
+#, 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
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "Usuwanie uwagi do obiektu %s\n"
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr "wczytaj obiekty ze standardowego wejścia"
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "wczytaj ustawienia przepisywania dla <polecenia> (zakłada --stdin)"
+
+#: builtin/notes.c:517
+msgid "too few arguments"
+msgstr "za mało argumentów"
+
+#: builtin/notes.c:538
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+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
+#, 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
+#, 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 ""
+"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
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "nie można usunąć referencji NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "nie można usunąć referencji NOTES_MERGE_REF"
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "nie można usunąć drzewa roboczego „git notes merge�"
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "nie można odczytać referencji NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "nie znaleziono zapisu z NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "nie można przetworzyć zapisu z NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "nie można rozwiązać NOTES_MERGE_REF"
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr "nie można zwieńczyć scalenia uwag"
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "nieznana strategia scalenia uwag %s"
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr "Opcje ogólne"
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr "Opcje scalania"
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"rozwiąż konflikty uwag używając podanej strategii (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr "Składanie niescalonych uwag"
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "zwieńcz scalenie uwag składając niescalone uwagi"
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr "Przerywanie rozwiÄ…zania scalenia uwag"
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr "przerwij scalanie uwag"
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "--commit, --abort i -s/--strategy wykluczajÄ… siÄ™"
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr "należy podać referencję uwag do scalenia"
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "nieznana wartość -s/--strategy: %s"
+
+#: builtin/notes.c:873
+#, 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
+#, 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
+#, 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 ""
+"Automatyczne scalanie uwag nie powiodło się. Napraw konflikty w %s i złóż "
+"wynik przez „git notes merge --commit�, lub przerwij scalanie przez „git "
+"notes merge --abort�.\n"
+
+#: builtin/notes.c:897 builtin/tag.c:578
+#, 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
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "Obiekt %s nie ma uwag\n"
+
+#: builtin/notes.c:912
+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
+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
+msgid "do not remove, show only"
+msgstr "nie usuwaj, tylko pokaż"
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr "zgłaszaj przycięte uwagi"
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr "ref-uwagi"
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr "użyj uwag z <referencja-uwagi>"
+
+#: builtin/notes.c:1034 builtin/stash.c:1671
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr "nieznana podkomenda: %s"
+
+#: builtin/pack-objects.c:54
+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
+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
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: nie odnaleziono %s, oczekiwano na pozycji %<PRIuMAX> w "
+"paczce %s"
+
+#: builtin/pack-objects.c:448
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr "zły CRC spakowanego obiektu dla %s"
+
+#: builtin/pack-objects.c:459
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr "uszkodzony spakowany obiekt dla %s"
+
+#: builtin/pack-objects.c:590
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr "wykryto rekurencyjnÄ… deltÄ™ dla obiektu %s"
+
+#: builtin/pack-objects.c:801
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "zamówiono %u obiektów, oczekiwano %<PRIu32>"
+
+#: builtin/pack-objects.c:896
+#, 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
+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
+msgid "Writing objects"
+msgstr "Zapisywanie obiektów"
+
+#: builtin/pack-objects.c:1089 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
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "wypisano %<PRIu32> obiektów, a oczekiwano %<PRIu32>"
+
+#: builtin/pack-objects.c:1358
+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
+#, 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
+#, 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
+msgid "Counting objects"
+msgstr "Zliczanie obiektów"
+
+#: builtin/pack-objects.c:2241
+#, 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
+#, 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
+#, 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
+msgid "suboptimal pack - out of memory"
+msgstr "nieoptymalna paczka — brak pamięci"
+
+#: builtin/pack-objects.c:2666
+#, 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
+#, 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
+msgid "Compressing objects"
+msgstr "Kompresowanie obiektów"
+
+#: builtin/pack-objects.c:2897
+msgid "inconsistency with delta count"
+msgstr "niespójność z liczbą delt"
+
+#: builtin/pack-objects.c:2976
+#, c-format
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
+"wartość uploadpack.blobpackfileuri musi być postaci „<skrót-obiektu> <skrót-"
+"paczki> <uri>� (otrzymano „%s�)"
+
+#: builtin/pack-objects.c:2979
+#, 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
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+"oczekiwano identyfikatora obiektu krawędzi, otrzymano śmieci:\n"
+"%s"
+
+#: builtin/pack-objects.c:3014
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"oczekiwano identyfikatora obiektu, otrzymano śmieci:\n"
+"%s"
+
+#: builtin/pack-objects.c:3112
+msgid "invalid value for --missing"
+msgstr "nieprawidłowa wartość --missing"
+
+#: builtin/pack-objects.c:3171 builtin/pack-objects.c:3279
+msgid "cannot open pack index"
+msgstr "nie można otworzyć indeksu paczki"
+
+#: builtin/pack-objects.c:3202
+#, 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
+msgid "unable to force loose object"
+msgstr "nie można wymusić wolnego obiektu"
+
+#: builtin/pack-objects.c:3380
+#, c-format
+msgid "not a rev '%s'"
+msgstr "nie jest rewizją „%s�"
+
+#: builtin/pack-objects.c:3383
+#, c-format
+msgid "bad revision '%s'"
+msgstr "zła rewizja „%s�"
+
+#: builtin/pack-objects.c:3408
+msgid "unable to add recent objects"
+msgstr "nie można dodać ostatnich obiektów"
+
+#: builtin/pack-objects.c:3461
+#, c-format
+msgid "unsupported index version %s"
+msgstr "nieobsługiwana wersja indeksu %s"
+
+#: builtin/pack-objects.c:3465
+#, c-format
+msgid "bad index version '%s'"
+msgstr "zła wersja indeksu „%s�"
+
+#: builtin/pack-objects.c:3503
+msgid "<version>[,<offset>]"
+msgstr "<wersja>[,<pozycja>]"
+
+#: builtin/pack-objects.c:3504
+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
+msgid "maximum size of each output pack file"
+msgstr "maksymalny rozmiar pojedynczego wyjściowego pliku paczki"
+
+#: builtin/pack-objects.c:3509
+msgid "ignore borrowed objects from alternate object store"
+msgstr "pomiń pożyczone obiekty z alternatywnych zbiorów obiektów"
+
+#: builtin/pack-objects.c:3511
+msgid "ignore packed objects"
+msgstr "ignoruj spakowane obiekty"
+
+#: builtin/pack-objects.c:3513
+msgid "limit pack window by objects"
+msgstr "ogranicz okno paczki w obiektach"
+
+#: builtin/pack-objects.c:3515
+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
+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
+msgid "reuse existing deltas"
+msgstr "użyj ponownie istniejących delt"
+
+#: builtin/pack-objects.c:3521
+msgid "reuse existing objects"
+msgstr "użyj ponownie istniejących obiektów"
+
+#: builtin/pack-objects.c:3523
+msgid "use OFS_DELTA objects"
+msgstr "użyj obiektów OFS_DELTA"
+
+#: builtin/pack-objects.c:3525
+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
+msgid "do not create an empty pack output"
+msgstr "nie można utworzyć pustej paczki na wyjściu"
+
+#: builtin/pack-objects.c:3529
+msgid "read revision arguments from standard input"
+msgstr "odczytaj argumenty rewizji ze standardowego wejścia"
+
+#: builtin/pack-objects.c:3531
+msgid "limit the objects to those that are not yet packed"
+msgstr "ogranicz obiekty do jeszcze nie spakowanych"
+
+#: builtin/pack-objects.c:3534
+msgid "include objects reachable from any reference"
+msgstr "uwzględnij obiekty osiągalne z dowolnej referencji"
+
+#: builtin/pack-objects.c:3537
+msgid "include objects referred by reflog entries"
+msgstr "uwzględnij obiekty z odniesieniami z wpisów dziennika referencji"
+
+#: builtin/pack-objects.c:3540
+msgid "include objects referred to by the index"
+msgstr "uwzględnij obiekty z odniesieniami z indeksu"
+
+#: builtin/pack-objects.c:3543
+msgid "output pack to stdout"
+msgstr "wypisz paczkę na standardowe wyjście"
+
+#: builtin/pack-objects.c:3545
+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
+msgid "keep unreachable objects"
+msgstr "zachowaj nieosiÄ…galne obiekty"
+
+#: builtin/pack-objects.c:3549
+msgid "pack loose unreachable objects"
+msgstr "spakuj luźnie nieosiągalne obiekty"
+
+#: builtin/pack-objects.c:3551
+msgid "unpack unreachable objects newer than <time>"
+msgstr "rozpakuj nieosiągalne obiekty nowsze niż <czas>"
+
+#: builtin/pack-objects.c:3554
+msgid "use the sparse reachability algorithm"
+msgstr "użyj rzadkiego algorytmu osiągalności"
+
+#: builtin/pack-objects.c:3556
+msgid "create thin packs"
+msgstr "twórz wąskie paczki"
+
+#: builtin/pack-objects.c:3558
+msgid "create packs suitable for shallow fetches"
+msgstr "utwórz paczki odpowiednie do płytkich pobrań"
+
+#: builtin/pack-objects.c:3560
+msgid "ignore packs that have companion .keep file"
+msgstr "pomiń paczki, którym towarzyszy plik .keep"
+
+#: builtin/pack-objects.c:3562
+msgid "ignore this pack"
+msgstr "pomiń tę paczkę"
+
+#: builtin/pack-objects.c:3564
+msgid "pack compression level"
+msgstr "stopień kompresji paczki"
+
+#: builtin/pack-objects.c:3566
+msgid "do not hide commits by grafts"
+msgstr "nie ukrywaj przeszczepionych zapisów"
+
+#: builtin/pack-objects.c:3568
+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
+msgid "write a bitmap index together with the pack index"
+msgstr "zapisz indeks bitmapy razem z indeksem paczek"
+
+#: builtin/pack-objects.c:3574
+msgid "write a bitmap index if possible"
+msgstr "zapisz indeks bitmapy jeśli możliwe"
+
+#: builtin/pack-objects.c:3578
+msgid "handling for missing objects"
+msgstr "traktowanie brakujących obiektów"
+
+#: builtin/pack-objects.c:3581
+msgid "do not pack objects in promisor packfiles"
+msgstr "nie pakuj obiektów w obiecujące pliki paczek"
+
+#: builtin/pack-objects.c:3583
+msgid "respect islands during delta compression"
+msgstr "uszanuj wyspy podczas kompresji delt"
+
+#: builtin/pack-objects.c:3585
+msgid "protocol"
+msgstr "protokół"
+
+#: builtin/pack-objects.c:3586
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "wyłącz w tym protokole wszystkie ustawione uploadpack.blobpackfileuri"
+
+#: builtin/pack-objects.c:3617
+#, 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
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "pack.deltaCacheLimit za wysoki, wymuszanie %d"
+
+#: builtin/pack-objects.c:3676
+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
+msgid "minimum pack size limit is 1 MiB"
+msgstr "minimalna granica rozmiaru paczki to 1 MiB"
+
+#: builtin/pack-objects.c:3683
+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
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr "--keep-unreachable i --unpack-unreachable siÄ™ wykluczajÄ…"
+
+#: builtin/pack-objects.c:3692
+msgid "cannot use --filter without --stdout"
+msgstr "nie można użyć --filter bez --stdout"
+
+#: builtin/pack-objects.c:3752
+msgid "Enumerating objects"
+msgstr "Wymienianie obiektów"
+
+#: builtin/pack-objects.c:3783
+#, c-format
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Razem %<PRIu32> (delty %<PRIu32>), użyte ponownie %<PRIu32> (delty "
+"%<PRIu32>), paczki użyte ponownie %<PRIu32>"
+
+#: 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 ""
+"„git pack-redundant� naznaczono do usunięcia.\n"
+"Jeśli nadal używasz tego polecenia, dodaj dodatkową\n"
+"opcję, „--i-still-use-this�, w wierszu poleceń\n"
+"i daj znać, że nadal jej używasz wysyłając list e-mail\n"
+"na <git@vger.kernel.org>.  Dzięki.\n"
+
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<opcje>]"
+
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr "spakuj wszystko"
+
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr "przytnij luźne referencje"
+
+#: 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
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <czas>] [--] [<czoło>...]"
+
+#: builtin/prune.c:133
+msgid "report pruned objects"
+msgstr "zgłaszaj przycięte obiekty"
+
+#: builtin/prune.c:136
+msgid "expire objects older than <time>"
+msgstr "wygaś obiekty starsze niż <czas>"
+
+#: builtin/prune.c:138
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "ogranicz przejście do obiektów poza obiecującymi plikami paczek"
+
+#: builtin/prune.c:152
+msgid "cannot prune in a precious-objects repo"
+msgstr "nie można przyciąć repozytorium o cennych obiektach"
+
+#: builtin/pull.c:45 builtin/pull.c:47
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Nieprawidłowa wartość %s: %s"
+
+#: builtin/pull.c:67
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<opcje>] [<repozytorium> [<referencja>...]]"
+
+#: builtin/pull.c:123
+msgid "control for recursive fetching of submodules"
+msgstr "sterowanie rekurencyjnym pobieraniem pod-modułów"
+
+#: builtin/pull.c:127
+msgid "Options related to merging"
+msgstr "Opcje zwiÄ…zane ze scalaniem"
+
+#: builtin/pull.c:130
+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
+msgid "allow fast-forward"
+msgstr "zezwól na przewijanie"
+
+#: builtin/pull.c:167 parse-options.h:339
+msgid "automatically stash/stash pop before and after"
+msgstr "automatycznie dodaj zmiany do schowka przed i przywróć je po"
+
+#: builtin/pull.c:183
+msgid "Options related to fetching"
+msgstr "Opcje zwiÄ…zane z pobieraniem"
+
+#: builtin/pull.c:193
+msgid "force overwrite of local branch"
+msgstr "wymuś nadpisanie lokalnej gałęzi"
+
+#: builtin/pull.c:201
+msgid "number of submodules pulled in parallel"
+msgstr "liczba pod-modułów zaciąganych równolegle"
+
+#: builtin/pull.c:317
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "Nieprawidłowa wartość pull.ff: %s"
+
+#: builtin/pull.c:445
+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
+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
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"Zwykle oznacza to, że podano referencję z globem bez dopasowań\n"
+"po zdalnej stronie."
+
+#: 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 ""
+"Kazano zaciągnąć zmiany ze zdalnego repozytorium „%s�, ale nie podano\n"
+"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
+msgid "You are not currently on a branch."
+msgstr "Nie jesteś obecnie w gałęzi."
+
+#: builtin/pull.c:458 builtin/pull.c:473
+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
+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
+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
+msgid "<remote>"
+msgstr "<zdalne-repozytorium>"
+
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+msgid "<branch>"
+msgstr "<gałąź>"
+
+#: builtin/pull.c:471 builtin/rebase.c:1251
+msgid "There is no tracking information for the current branch."
+msgstr "Bieżąca gałąź nie ma informacji o śledzeniu."
+
+#: builtin/pull.c:480
+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
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"Konfiguracja podaje, żeby scalić z referencją „%s�\n"
+"ze zdalnego repozytorium, ale nie pobrano stamtąd żadnej takiej."
+
+#: builtin/pull.c:596
+#, c-format
+msgid "unable to access commit %s"
+msgstr "brak dostępu do zapisu %s"
+
+#: builtin/pull.c:902
+msgid "ignoring --verify-signatures for rebase"
+msgstr "pomijanie --verify-signatures przy przestawianiu"
+
+#: 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 ""
+"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"
+"\n"
+"  git config pull.rebase false  # scalenie (domyślna strategia)\n"
+"  git config pull.rebase true   # przestawienie\n"
+"  git config pull.ff only       # tylko przewinięcie\n"
+"\n"
+"Można zamienić „git config� na „git config --global�, aby ustawić domyślny\n"
+"wybór do wszystkich repozytoriów. Można też przekazać --rebase, --no-rebase\n"
+"lub --ff-only w wierszu poleceń, aby zmienić ustawione zachowanie\n"
+"w jednym wywołaniu.\n"
+
+#: builtin/pull.c:991
+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
+msgid "pull with rebase"
+msgstr "zaciÄ…gnij z przestawieniem"
+
+#: builtin/pull.c:996
+msgid "please commit or stash them."
+msgstr "złóż je lub dodaj do schowka."
+
+#: builtin/pull.c:1021
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"pobranie zaktualizowało czoło bieżącej gałęzi.\n"
+"przewijanie drzewa roboczego\n"
+"z zapisu %s."
+
+#: builtin/pull.c:1027
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"Nie można przewinąć drzewa roboczego.\n"
+"Po upewnieniu się, że zapiszesz wszystko cenne z wyjścia\n"
+"$ git diff %s\n"
+"wykonaj\n"
+"$ git reset --hard\n"
+"by się pozbierać."
+
+#: builtin/pull.c:1042
+msgid "Cannot merge multiple branches into empty head."
+msgstr "Nie można scalić wielu gałęzi w puste czoło."
+
+#: builtin/pull.c:1046
+msgid "Cannot rebase onto multiple branches."
+msgstr "Nie można przestawić na wiele gałęzi."
+
+#: builtin/pull.c:1067
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr "nie można przestawić z lokalnie zapisanymi zmianami pod-modułów"
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<opcje>] [<repozytorium> [<referencja>...]]"
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr "skrót tagu bez <tagu>"
+
+#: builtin/push.c:119
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete przyjmuje tylko zwykłe docelowe nazwy referencji"
+
+#: builtin/push.c:164
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"Aby wybrać którąś opcję na zawsze, zobacz push.default w „git help config�."
+
+#: builtin/push.c:167
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch.  To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+msgstr ""
+"Nadrzędna gałąź bieżącej gałęzi nie pasuje do jej nazwy.\n"
+"Aby wypchnąć zmiany na zdalną nadrzędną gałąź, użyj\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"Aby wypchnąć je do zdalnej gałęzi o tej samej nazwie, użyj\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+
+#: builtin/push.c:182
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+"    git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"Nie jesteś teraz na gałęzi.\n"
+"Żeby wypchnąć historię wiodącą do bieżącego stanu\n"
+"(odłączonego HEAD), użyj\n"
+"\n"
+"    git push %s HEAD:<nazwa-zdalnej-gałęzi>\n"
+
+#: builtin/push.c:194
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+msgstr ""
+"Bieżąca gałąź %s nie ma gałęzi nadrzędnej.\n"
+"Aby wypchnąć bieżącą gałąź i ustawić zdalne repozytorium jako nadrzędne, "
+"użyj\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+
+#: builtin/push.c:202
+#, 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
+#, 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 ""
+"Wypychasz do zdalnego repozytorium „%s�, które nie jest nadrzędne dla\n"
+"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
+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 ""
+"Aktualizacje zostały odrzucone, ponieważ czubek bieżącej gałęzi jest\n"
+"w tyle za swoim zdalnym odpowiednikiem. Zintegruj zdalne zmiany (np.\n"
+"„git pull ...�) przed kolejnym wypchnięciem.\n"
+"Zobacz szczegóły w „Uwadze o przewijaniu� w „git push --help�."
+
+#: builtin/push.c:273
+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 ""
+"Aktualizacje zostały odrzucone, ponieważ czubek wypychanej gałęzi jest\n"
+"w tyle za swoim zdalnym odpowiednikiem. Wybierz tę gałąź i zintegruj\n"
+"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
+msgid ""
+"Updates were rejected because the remote contains work that you do\n"
+"not have locally. This is usually caused by another repository pushing\n"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Aktualizacje zostały odrzucone, ponieważ zdalne repozytorium zawiera\n"
+"pracę, której nie ma u ciebie lokalnie. Jest to zwykle spowodowane innym\n"
+"repozytorium wypychającym na tę samą referencję. Możesz najpierw chcieć\n"
+"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
+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
+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 ""
+"Nie możesz zaktualizować zdalnej referencji, która wskazuje na obiekt\n"
+"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
+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 ""
+"Aktualizacje zostały odrzucone, ponieważ czubek śledzącej gałęzi\n"
+"został zaktualizowany od ostatniego wybrania. Możesz chcieć\n"
+"zintegrować te zmiany lokalnie (np. „git pull ...�)\n"
+"przed wymuszeniem wypchnięcia.\n"
+
+#: builtin/push.c:364
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Wypychanie do %s\n"
+
+#: builtin/push.c:371
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "nie można wypchnąć niektórych referencji do „%s�"
+
+#: builtin/push.c:553
+msgid "repository"
+msgstr "repozytorium"
+
+#: builtin/push.c:554 builtin/send-pack.c:189
+msgid "push all refs"
+msgstr "wypchnij wszystkie referencje"
+
+#: builtin/push.c:555 builtin/send-pack.c:191
+msgid "mirror all refs"
+msgstr "odwzoruj wszystkie referencje"
+
+#: builtin/push.c:557
+msgid "delete refs"
+msgstr "usuń referencje"
+
+#: builtin/push.c:558
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "wypchnij tagi (nie może być użyte z --all ani --mirror)"
+
+#: builtin/push.c:561 builtin/send-pack.c:192
+msgid "force updates"
+msgstr "wymuszone aktualizacje"
+
+#: builtin/push.c:562 builtin/send-pack.c:204
+msgid "<refname>:<expect>"
+msgstr "<referencja>:<oczekiwana>"
+
+#: builtin/push.c:563 builtin/send-pack.c:205
+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
+msgid "require remote updates to be integrated locally"
+msgstr "wymagaj, by zdalne aktualizacje były wcielone lokalnie"
+
+#: builtin/push.c:569
+msgid "control recursive pushing of submodules"
+msgstr "steruj rekurencyjnym wypychaniem pod-modułów"
+
+#: builtin/push.c:570 builtin/send-pack.c:199
+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
+msgid "receive pack program"
+msgstr "program do odbierania paczek"
+
+#: builtin/push.c:573
+msgid "set upstream for git pull/status"
+msgstr "ustaw gałąź nadrzędną do git pull/status"
+
+#: builtin/push.c:576
+msgid "prune locally removed refs"
+msgstr "przytnij lokalnie usunięte referencje"
+
+#: builtin/push.c:578
+msgid "bypass pre-push hook"
+msgstr "omiń skrypt pre-push"
+
+#: builtin/push.c:579
+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
+msgid "GPG sign the push"
+msgstr "podpisz wypchnięcie GPG"
+
+#: builtin/push.c:583 builtin/send-pack.c:200
+msgid "request atomic transaction on remote side"
+msgstr "zażądaj atomowej transakcji po stronie zdalnej"
+
+#: builtin/push.c:601
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete wyklucza siÄ™ z --all, --mirror i --tags"
+
+#: builtin/push.c:603
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete nie ma sensu bez żadnych referencji"
+
+#: builtin/push.c:623
+#, c-format
+msgid "bad repository '%s'"
+msgstr "złe repozytorium „%s�"
+
+#: builtin/push.c:624
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"Nie ustawiono celu wypychania.\n"
+"Albo podaj adres w wierszu poleceń, albo skonfiguruj zdalne repozytorium "
+"używając\n"
+"\n"
+"    git remote add <nazwa> <adres>\n"
+"\n"
+"i wtedy wypchnij używając tej nazwy\n"
+"\n"
+"    git push <nazwa>\n"
+
+#: builtin/push.c:639
+msgid "--all and --tags are incompatible"
+msgstr "--all i --tags siÄ™ wykluczajÄ…"
+
+#: builtin/push.c:641
+msgid "--all can't be combined with refspecs"
+msgstr "--all i referencje wykluczajÄ… siÄ™"
+
+#: builtin/push.c:645
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror i --tags siÄ™ wykluczajÄ…"
+
+#: builtin/push.c:647
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror i referencje wykluczajÄ… siÄ™"
+
+#: builtin/push.c:650
+msgid "--all and --mirror are incompatible"
+msgstr "--all i --mirror siÄ™ wykluczajÄ…"
+
+#: builtin/push.c:657
+msgid "push options must not have new line characters"
+msgstr "opcje wypychania nie mogą zawierać znaków końca wiersza"
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+"git range-diff [<opcje>] <stara-podstawa>..<stary-czubek> <nowa-podstawa>.."
+"<nowy-czubek>"
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<opcje>] <stary-czubek>...<nowy-czubek>"
+
+#: builtin/range-diff.c:11
+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"
+
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "uwagi"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "przekazywane do „git log�"
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "daj tylko wyjście powiązane z pierwszym zakresem"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "daj tylko wyjście powiązane z drugim zakresem"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "nie jest zakresem zapisów: „%s�"
+
+#: builtin/range-diff.c:74
+msgid "single arg format must be symmetric range"
+msgstr "format w pojedynczym argumencie musi być symetrycznym zakresem"
+
+#: builtin/range-diff.c:89
+msgid "need two commit ranges"
+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>]])"
+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>]])"
+
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr "zapisz wynikowy indeks w <pliku>"
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr "tylko opróżnij indeks"
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr "Scalanie"
+
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr "dokonaj scalenia oprócz odczytu"
+
+#: builtin/read-tree.c:133
+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
+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
+msgid "same as -m, but discard unmerged entries"
+msgstr "to samo, co -m, ale odrzuć niescalone elementy"
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr "<podkatalog>/"
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "wczytaj drzewo do indeksu w <podkatalogu>/"
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr "zaktualizuj drzewo robocze wynikiem scalenia"
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "zezwól na nadpisywanie jawnie ignorowanych plików"
+
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr "nie sprawdzaj drzewa roboczego po scaleniu"
+
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr "nie aktualizuj indeksu ani drzewa roboczego"
+
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr "pomiń stosowanie filtru rzadkiego wybrania"
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr "odpluskwianie unpack-trees"
+
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "pomiń komunikaty zwrotne"
+
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Musisz najpierw rozwiązać bieżący indeks"
+
+#: builtin/rebase.c:35
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+"git rebase [-i] [options] [--exec <polecenie>] [--onto <nowa-podstawa> | --"
+"keep-base] [<gałąź-nadrzędna> [<gałąź>]]"
+
+#: builtin/rebase.c:37
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [options] [--exec <polecenie>] [--onto <nowa-podstawa>] --"
+"root [<gałąź>]"
+
+#: builtin/rebase.c:39
+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
+#, c-format
+msgid "could not create temporary %s"
+msgstr "nie można utworzyć tymczasowego %s"
+
+#: builtin/rebase.c:318
+msgid "could not mark as interactive"
+msgstr "nie można oznaczyć jako interaktywne"
+
+#: builtin/rebase.c:371
+msgid "could not generate todo list"
+msgstr "nie można wygenerować listy zadań do zrobienia"
+
+#: builtin/rebase.c:413
+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
+#, c-format
+msgid "%s requires the merge backend"
+msgstr "%s wymaga silnika scalenia"
+
+#: builtin/rebase.c:626
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "nie można uzyskać „onto�: „%s�"
+
+#: builtin/rebase.c:643
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "nieprawidłowe pierwotne czoło: „%s�"
+
+#: builtin/rebase.c:668
+#, 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
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+"Rozwiąż ręcznie wszystkie konflikty, oznacz je jako rozwiązane przez\n"
+"„git add/rm <skonfliktowane_pliki>� i wykonaj „git rebase --continue�.\n"
+"Możesz zamiast tego pominąć ten zapis: wykonaj „git rebase --skip�.\n"
+"Aby przerwać i powrócić do stanu sprzed „git rebase�, wykonaj „git rebase --"
+"abort�."
+
+#: builtin/rebase.c:896
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+"    %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"git napotkał błąd podczas przygotowania łatek do odtworzenia\n"
+"tych rewizji:\n"
+"\n"
+"    %s\n"
+"\n"
+"Z tego powodu git nie może ich przestawić."
+
+#: builtin/rebase.c:1227
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"nierozpoznany pusty rodzaj „%s�; prawidłowe wartości to „drop�, „keep� i "
+"„ask�."
+
+#: builtin/rebase.c:1245
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+msgstr ""
+"%s\n"
+"Podaj, względem jakiej gałęzi chcesz przestawiać.\n"
+"Więcej szczegółów w git-rebase(1).\n"
+"\n"
+"    git rebase '<gałąź>'\n"
+"\n"
+
+#: builtin/rebase.c:1261
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
+"Jeśli chcesz ustawić informacje o śledzeniu w tej gałęzi, możesz to zrobić "
+"przez:\n"
+"    git branch --set-upstream-to=%s/<gałąź> %s\n"
+"\n"
+
+#: builtin/rebase.c:1291
+msgid "exec commands cannot contain newlines"
+msgstr "polecenia exec nie mogą zawierać znaków nowego wiersza"
+
+#: builtin/rebase.c:1295
+msgid "empty exec command"
+msgstr "puste polecenie exec"
+
+#: builtin/rebase.c:1324
+msgid "rebase onto given branch instead of upstream"
+msgstr "przestaw na podaną gałąź zamiast na główny nurt"
+
+#: builtin/rebase.c:1326
+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
+msgid "allow pre-rebase hook to run"
+msgstr "pozwól wykonać skrypt pre-rebase"
+
+#: builtin/rebase.c:1330
+msgid "be quiet. implies --no-stat"
+msgstr "bądź cicho. zakłada --no-stat"
+
+#: builtin/rebase.c:1336
+msgid "do not show diffstat of what changed upstream"
+msgstr "nie pokazuj statystyk różnic ze zmian głównego nurtu"
+
+#: builtin/rebase.c:1339
+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
+msgid "make committer date match author date"
+msgstr "ustaw datę złożenia na datę utworzenia"
+
+#: builtin/rebase.c:1344
+msgid "ignore author date and use current date"
+msgstr "pomiń datę utworzenia i użyj bieżącej"
+
+#: builtin/rebase.c:1346
+msgid "synonym of --reset-author-date"
+msgstr "zamiennik na --reset-author-date"
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1352
+msgid "passed to 'git apply'"
+msgstr "przekaż do „git apply�"
+
+#: builtin/rebase.c:1350
+msgid "ignore changes in whitespace"
+msgstr "ignoruj zmiany w białych znakach"
+
+#: builtin/rebase.c:1354 builtin/rebase.c:1357
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "dobierz wszystkie zapisy, nawet jeśli niezmienione"
+
+#: builtin/rebase.c:1359
+msgid "continue"
+msgstr "kontynuuj"
+
+#: builtin/rebase.c:1362
+msgid "skip current patch and continue"
+msgstr "pomiń obecną łatkę i kontynuuj"
+
+#: builtin/rebase.c:1364
+msgid "abort and check out the original branch"
+msgstr "przerwij i wybierz pierwotną gałąź"
+
+#: builtin/rebase.c:1367
+msgid "abort but keep HEAD where it is"
+msgstr "przerwij, ale zostaw HEAD, gdzie jest"
+
+#: builtin/rebase.c:1368
+msgid "edit the todo list during an interactive rebase"
+msgstr "edytuj listę zadań do zrobienia podczas interaktywnego przestawiania"
+
+#: builtin/rebase.c:1371
+msgid "show the patch file being applied or merged"
+msgstr "pokaż plik łatki właśnie stosowanej lub scalanej"
+
+#: builtin/rebase.c:1374
+msgid "use apply strategies to rebase"
+msgstr "użyj strategii stosowania do przestawiania"
+
+#: builtin/rebase.c:1378
+msgid "use merging strategies to rebase"
+msgstr "użyj strategii scalania do przestawiania"
+
+#: builtin/rebase.c:1382
+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
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "(PRZESTARZA�E) spróbuj odtworzyć scalenia zamiast je pomijać"
+
+#: builtin/rebase.c:1391
+msgid "how to handle commits that become empty"
+msgstr "jak traktować zapisy, które staną się puste"
+
+#: builtin/rebase.c:1398
+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
+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
+msgid "allow rebasing commits with empty messages"
+msgstr "pozwól przestawiać zapisy z pustymi komunikatami"
+
+#: builtin/rebase.c:1413
+msgid "try to rebase merges instead of skipping them"
+msgstr "spróbuj przestawić scalenia zamiast je pomijać"
+
+#: builtin/rebase.c:1416
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "użyj „git merge-base --fork-point�, aby poprawić gałąź nadrzędną"
+
+#: builtin/rebase.c:1418
+msgid "use the given merge strategy"
+msgstr "użyj podanej strategii scalania"
+
+#: builtin/rebase.c:1420 builtin/revert.c:115
+msgid "option"
+msgstr "opcja"
+
+#: builtin/rebase.c:1421
+msgid "pass the argument through to the merge strategy"
+msgstr "przekaż argument do strategii scalania"
+
+#: builtin/rebase.c:1424
+msgid "rebase all reachable commits up to the root(s)"
+msgstr "przestaw wszystkie osiągalne zapisy aż do korzenia"
+
+#: builtin/rebase.c:1429
+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
+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:1498
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "„--keep-base� i „--onto� się wykluczają."
+
+#: builtin/rebase.c:1500
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "„--keep-base� i „--root� się wykluczają."
+
+#: builtin/rebase.c:1504
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "„--keep-base� i „--fork-point� się wykluczają."
+
+#: builtin/rebase.c:1507
+msgid "No rebase in progress?"
+msgstr "Nie trwa żadne przestawianie?"
+
+#: builtin/rebase.c:1511
+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."
+
+#: builtin/rebase.c:1534 t/helper/test-fast-rebase.c:123
+msgid "Cannot read HEAD"
+msgstr "Nie można odczytać HEAD"
+
+#: builtin/rebase.c:1546
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"Musisz edytować wszystkie konflikty scalania\n"
+"i oznaczyć je jako rozwiązane przy pomocy git add"
+
+#: builtin/rebase.c:1565
+msgid "could not discard worktree changes"
+msgstr "nie można odrzucić zmian w drzewie roboczym"
+
+#: builtin/rebase.c:1584
+#, c-format
+msgid "could not move back to %s"
+msgstr "nie można cofnąć do %s"
+
+#: builtin/rebase.c:1630
+#, 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"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+"Wygląda na to, że już jest katalog %s,\n"
+"i zastanawiam siÄ™, czy nie jesteÅ› w trakcie innego przestawienia.\n"
+"Jeśli tak jest, spróbuj\n"
+"\t%s\n"
+"A jeśli tak nie jest,\n"
+"\t%s\n"
+"i wykonaj mnie ponownie. Przerywam na wypadek, gdyby było tam\n"
+"coÅ› cennego.\n"
+
+#: builtin/rebase.c:1658
+msgid "switch `C' expects a numerical value"
+msgstr "przełącznik „C� oczekuje wartości liczbowej"
+
+#: builtin/rebase.c:1700
+#, c-format
+msgid "Unknown mode: %s"
+msgstr "Nieznany tryb: %s"
+
+#: builtin/rebase.c:1739
+msgid "--strategy requires --merge or --interactive"
+msgstr "--strategy wymaga --merge lub --interactive"
+
+#: builtin/rebase.c:1769
+msgid "cannot combine apply options with merge options"
+msgstr "nie można łączyć opcji stosowania z opcjami scalania"
+
+#: builtin/rebase.c:1782
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Nieznany silnik przestawiania: %s"
+
+#: builtin/rebase.c:1812
+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ą"
+
+#: builtin/rebase.c:1860
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "nieprawidłowa gałąź nadrzędna „%s�"
+
+#: builtin/rebase.c:1866
+msgid "Could not create new root commit"
+msgstr "Nie można utworzyć nowego zapisu korzenia"
+
+#: builtin/rebase.c:1892
+#, 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
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "„%s�: potrzeba dokładnie jednej podstawy scalania"
+
+#: builtin/rebase.c:1903
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "Nie wskazuje na prawidłowy zapis „%s�"
+
+#: builtin/rebase.c:1931
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "błąd krytyczny: brak gałęzi/zapisu „%s�"
+
+#: builtin/rebase.c:1939 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
+#, c-format
+msgid "No such ref: %s"
+msgstr "Nie ma takiej referencji: %s"
+
+#: builtin/rebase.c:1950
+msgid "Could not resolve HEAD to a revision"
+msgstr "Nie można rozwiązać HEAD do rewizji"
+
+#: builtin/rebase.c:1971
+msgid "Please commit or stash them."
+msgstr "Złóż je lub dodaj do schowka."
+
+#: builtin/rebase.c:2007
+#, c-format
+msgid "could not switch to %s"
+msgstr "nie można przełączyć na %s"
+
+#: builtin/rebase.c:2018
+msgid "HEAD is up to date."
+msgstr "HEAD jest aktualne."
+
+#: builtin/rebase.c:2020
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "Obecna gałąź %s jest aktualna.\n"
+
+#: builtin/rebase.c:2028
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD jest aktualne, wymuszono przestawianie."
+
+#: builtin/rebase.c:2030
+#, 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
+msgid "The pre-rebase hook refused to rebase."
+msgstr "Skrypt pre-rebase odmówił przestawiania."
+
+#: builtin/rebase.c:2045
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "Zmiany w %s:\n"
+
+#: builtin/rebase.c:2048
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "Zmiany z %s na %s:\n"
+
+#: builtin/rebase.c:2073
+#, 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
+msgid "Could not detach HEAD"
+msgstr "Nie można odłączyć HEAD"
+
+#: builtin/rebase.c:2091
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "Przewinięto %s do %s.\n"
+
+#: builtin/receive-pack.c:34
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <katalog-gita>"
+
+#: builtin/receive-pack.c:1276
+msgid ""
+"By default, updating the current branch in a non-bare repository\n"
+"is denied, because it will make the index and work tree inconsistent\n"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+"Domyślnie aktualizacja bieżącej gałęzi w nie-suchym repozytorium\n"
+"jest zabroniona, bo rozspójni indeks i drzewo robocze z tym,\n"
+"co wypchnięto, i będzie wymagać „git reset --hard�, żeby dopasować\n"
+"drzewo robocze do HEAD.\n"
+"\n"
+"Możesz ustawić wartość konfiguracji „receive.denyCurrentBranch�\n"
+"w zdalnym repozytorium na „ignore� lub „warn�, aby zezwolić na\n"
+"wypychanie na jego bieżącą gałąź; nie jest to jednak zalecane, chyba że\n"
+"umiesz zaktualizować jego drzewo robocze do wypychanych zmian\n"
+"w jakiś inny sposób.\n"
+"\n"
+"Aby wyciszyć tę wiadomość i utrzymać domyślne zachowanie, ustaw\n"
+"wartość konfiguracji „receive.denyCurrentBranch� na „refuse�."
+
+#: builtin/receive-pack.c:1296
+msgid ""
+"By default, deleting the current branch is denied, because the next\n"
+"'git clone' won't result in any file checked out, causing confusion.\n"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+"Domyślnie usuwanie bieżącej gałęzi jest zabronione, ponieważ kolejny\n"
+"„git clone� nie wybrałby żadnego pliku, wprowadzając zamieszanie.\n"
+"\n"
+"Możesz ustawić wartość konfiguracji „receive.denyDeleteCurrent�\n"
+"w zdalnym repozytorium na „warn� lub „ignore�, żeby zezwolić na\n"
+"usuwanie bieżącej gałęzi, z ostrzeżeniem lub bez niego.\n"
+"\n"
+"Żeby wyciszyć ten komunikat, możesz ustawić ją na „refuse�."
+
+#: builtin/receive-pack.c:2481
+msgid "quiet"
+msgstr "cicho"
+
+#: builtin/receive-pack.c:2495
+msgid "You must specify a directory."
+msgstr "Musisz określić katalog."
+
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<czas>] [--expire-unreachable=<czas>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<referencje>..."
+
+#: 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] "
+"<referencje>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <referencja>"
+
+#: builtin/reflog.c:568 builtin/reflog.c:573
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "„%s� nie jest prawidłowym znacznikiem czasu"
+
+#: builtin/reflog.c:609
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Oznaczanie osiągalnych obiektów..."
+
+#: builtin/reflog.c:647
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s nigdzie nie wskazuje!"
+
+#: builtin/reflog.c:699
+msgid "no reflog specified to delete"
+msgstr "nie podano dziennika referencji do skasowania"
+
+#: builtin/reflog.c:708
+#, c-format
+msgid "not a reflog: %s"
+msgstr "nie jest dziennikiem referencji: %s"
+
+#: builtin/reflog.c:713
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "„%s� nie ma dziennika referencji"
+
+#: builtin/reflog.c:759
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "nieprawidłowy format referencji: %s"
+
+#: builtin/reflog.c:768
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
+#: builtin/remote.c:17
+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 <gałąź>] [-m <główna>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nazwa> <adres>"
+
+#: builtin/remote.c:19 builtin/remote.c:39
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <stare> <nowe>"
+
+#: builtin/remote.c:20 builtin/remote.c:44
+msgid "git remote remove <name>"
+msgstr "git remote remove <nazwa>"
+
+#: builtin/remote.c:21 builtin/remote.c:49
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <nazwa> (-a | --auto | -d | --delete | <gałąź>)"
+
+#: builtin/remote.c:22
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <nazwa>"
+
+#: builtin/remote.c:23
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <nazwa>"
+
+#: builtin/remote.c:24
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<grupa> | <zdalne-"
+"repozytorium>)...]"
+
+#: builtin/remote.c:25
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <nazwa> <gałąź>..."
+
+#: builtin/remote.c:26 builtin/remote.c:75
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <nazwa>"
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <nazwa> <nowy-adres> [<stary-adres>]"
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <nazwa> <nowy-adres>"
+
+#: builtin/remote.c:29 builtin/remote.c:82
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <nazwa> <adres>"
+
+#: builtin/remote.c:34
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<opcje>] <nazwa> <adres>"
+
+#: builtin/remote.c:54
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <nazwa> <gałąź>..."
+
+#: builtin/remote.c:55
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <nazwa> <gałąź>..."
+
+#: builtin/remote.c:60
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<opcje>] <nazwa>"
+
+#: builtin/remote.c:65
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<opcje>] <nazwa>"
+
+#: builtin/remote.c:70
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<opcje>] [<grupa> | <zdalne-repozytorium>]..."
+
+#: builtin/remote.c:99
+#, c-format
+msgid "Updating %s"
+msgstr "Aktualizowanie %s"
+
+#: builtin/remote.c:131
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"--mirror jest niebezpieczne i przestarzałe;\n"
+"\t użyj zamiast tego --mirror=fetch lub --mirror=push"
+
+#: builtin/remote.c:148
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "nieznany argument lustrzany: %s"
+
+#: builtin/remote.c:164
+msgid "fetch the remote branches"
+msgstr "pobierz zdalne gałęzie"
+
+#: builtin/remote.c:166
+msgid "import all tags and associated objects when fetching"
+msgstr "załaduj wszystkie tagi i powiązane obiekty przy ściąganiu"
+
+#: builtin/remote.c:169
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "albo nie pobieraj w ogóle żadnego tagu (--no-tags)"
+
+#: builtin/remote.c:171
+msgid "branch(es) to track"
+msgstr "gałąź (gałęzie) do śledzenia"
+
+#: builtin/remote.c:172
+msgid "master branch"
+msgstr "główna gałąź"
+
+#: builtin/remote.c:174
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr "ustaw zdalne repozytorium jako zwierciadło do wypychania i pobierania"
+
+#: builtin/remote.c:186
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "podanie głównej gałęzi nie ma sensu z --mirror"
+
+#: builtin/remote.c:188
+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
+#, c-format
+msgid "remote %s already exists."
+msgstr "zdalne repozytorium %s już istnieje."
+
+#: builtin/remote.c:240
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "Nie można ustawić głównej gałęzi „%s�"
+
+#: builtin/remote.c:355
+#, 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
+msgid "(matching)"
+msgstr "(pasujÄ…ce)"
+
+#: builtin/remote.c:466
+msgid "(delete)"
+msgstr "(usunięcie)"
+
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "nie można ustawić „%s�"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Konfiguracja remote.pushDefault %s w:\n"
+"\t%s:%d\n"
+"wskazuje teraz nieistniejące zdalne repozytorium „%s�"
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
+#, c-format
+msgid "No such remote: '%s'"
+msgstr "Nie ma takiego zdalnego repozytorium: „%s�"
+
+#: builtin/remote.c:710
+#, 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
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"Nie aktualizowanie referencji pobierania innej niż domyślna\n"
+"\t%s\n"
+"\tJeśli to konieczne, zaktualizuj ustawienia ręcznie."
+
+#: builtin/remote.c:770
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "nie można usunąć „%s�"
+
+#: builtin/remote.c:804
+#, c-format
+msgid "creating '%s' failed"
+msgstr "nie można utworzyć „%s�"
+
+#: builtin/remote.c:882
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+"Uwaga: nie usuwam gałęzi poza hierarchią refs/remotes/;\n"
+"aby ją usunąć, użyj:"
+msgstr[1] ""
+"Uwaga: nie usuwam gałęzi poza hierarchią refs/remotes/;\n"
+"aby je usunąć, użyj:"
+msgstr[2] ""
+"Uwaga: nie usuwam gałęzi poza hierarchią refs/remotes/;\n"
+"aby je usunąć, użyj:"
+
+#: builtin/remote.c:896
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "Nie można usunąć rozdziału konfiguracji „%s�"
+
+#: builtin/remote.c:999
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " nowe (następne pobranie zapisze w remotes/%s)"
+
+#: builtin/remote.c:1002
+msgid " tracked"
+msgstr " śledzone"
+
+#: builtin/remote.c:1004
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " zastała (użyj „git remote prune�, aby usunąć)"
+
+#: builtin/remote.c:1006
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:1047
+#, 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
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "przestawia interaktywnie na zdalne repozytorium %s"
+
+#: builtin/remote.c:1058
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "przestawia interaktywnie (ze scaleniami) na zdalne repozytorium %s"
+
+#: builtin/remote.c:1061
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "przestawia siÄ™ na zdalne repozytorium %s"
+
+#: builtin/remote.c:1065
+#, c-format
+msgid " merges with remote %s"
+msgstr " scala siÄ™ ze zdalnym repozytorium %s"
+
+#: builtin/remote.c:1068
+#, c-format
+msgid "merges with remote %s"
+msgstr "scala siÄ™ ze zdalnym repozytorium %s"
+
+#: builtin/remote.c:1071
+#, c-format
+msgid "%-*s    and with remote %s\n"
+msgstr "%-*s    i ze zdalnym repozytorium %s\n"
+
+#: builtin/remote.c:1114
+msgid "create"
+msgstr "utwórz"
+
+#: builtin/remote.c:1117
+msgid "delete"
+msgstr "usuń"
+
+#: builtin/remote.c:1121
+msgid "up to date"
+msgstr "aktualne"
+
+#: builtin/remote.c:1124
+msgid "fast-forwardable"
+msgstr "przewijalne"
+
+#: builtin/remote.c:1127
+msgid "local out of date"
+msgstr "lokalna nieaktualna"
+
+#: builtin/remote.c:1134
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr "    %-*s wymusza na %-*s (%s)"
+
+#: builtin/remote.c:1137
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr "    %-*s wypycha na %-*s (%s)"
+
+#: builtin/remote.c:1141
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr "    %-*s wymusza na %s"
+
+#: builtin/remote.c:1144
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr "    %-*s wypycha na %s"
+
+#: builtin/remote.c:1212
+msgid "do not query remotes"
+msgstr "nie odpytuj zdalnych repozytoriów"
+
+#: builtin/remote.c:1239
+#, c-format
+msgid "* remote %s"
+msgstr "* zdalne repozytorium %s"
+
+#: builtin/remote.c:1240
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr "  Adres do pobierania: %s"
+
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+msgid "(no URL)"
+msgstr "(brak adresu URL)"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1255 builtin/remote.c:1257
+#, c-format
+msgid "  Push  URL: %s"
+msgstr "  Adres do wypychania: %s"
+
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#, c-format
+msgid "  HEAD branch: %s"
+msgstr "  gałąź HEAD: %s"
+
+#: builtin/remote.c:1259
+msgid "(not queried)"
+msgstr "(nie odpytano)"
+
+#: builtin/remote.c:1261
+msgid "(unknown)"
+msgstr "(nieznane)"
+
+#: builtin/remote.c:1265
+#, c-format
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+"  gałąź HEAD (zdalne HEAD jest niejednoznaczne, może być jednym z "
+"następujących):\n"
+
+#: builtin/remote.c:1277
+#, c-format
+msgid "  Remote branch:%s"
+msgid_plural "  Remote branches:%s"
+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
+msgid " (status not queried)"
+msgstr " (nie odpytano stanu)"
+
+#: builtin/remote.c:1289
+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
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr "  Lokalne referencje będą odzwierciedlane przez „git push�"
+
+#: builtin/remote.c:1303
+#, c-format
+msgid "  Local ref configured for 'git push'%s:"
+msgid_plural "  Local refs configured for 'git push'%s:"
+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
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "ustaw refs/remotes/<nazwa>/HEAD według zdalnego repozytorium"
+
+#: builtin/remote.c:1326
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "usuń refs/remotes/<nazwa>/HEAD"
+
+#: builtin/remote.c:1341
+msgid "Cannot determine remote HEAD"
+msgstr "Nie można ustalić zdalnego HEAD"
+
+#: builtin/remote.c:1343
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "Wiele gałęzi HEAD. Wybierz jedną jawnie przez:"
+
+#: builtin/remote.c:1353
+#, c-format
+msgid "Could not delete %s"
+msgstr "Nie można usunąć %s"
+
+#: builtin/remote.c:1361
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "Nieprawidłowa referencja: %s"
+
+#: builtin/remote.c:1363
+#, c-format
+msgid "Could not setup %s"
+msgstr "Nie można ustawić %s"
+
+#: builtin/remote.c:1381
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %s będzie wiszący!"
+
+#: builtin/remote.c:1382
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %s stał się wiszący!"
+
+#: builtin/remote.c:1392
+#, c-format
+msgid "Pruning %s"
+msgstr "Przycinanie %s"
+
+#: builtin/remote.c:1393
+#, c-format
+msgid "URL: %s"
+msgstr "Adres URL: %s"
+
+#: builtin/remote.c:1409
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [przycięto by] %s"
+
+#: builtin/remote.c:1412
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [przycięto] %s"
+
+#: builtin/remote.c:1457
+msgid "prune remotes after fetching"
+msgstr "przytnij zdalne repozytoria po pobraniu"
+
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#, c-format
+msgid "No such remote '%s'"
+msgstr "Nie ma takiego zdalnego repozytorium „%s�"
+
+#: builtin/remote.c:1539
+msgid "add branch"
+msgstr "dodaj gałąź"
+
+#: builtin/remote.c:1546
+msgid "no remote specified"
+msgstr "nie podano zdalnego repozytorium"
+
+#: builtin/remote.c:1563
+msgid "query push URLs rather than fetch URLs"
+msgstr "operuj na adresach wypychania zamiast pobierania"
+
+#: builtin/remote.c:1565
+msgid "return all URLs"
+msgstr "zwróć wszystkie adresy URL"
+
+#: builtin/remote.c:1595
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "zdalne repozytorium „%s� nie ma skonfigurowanych adresów"
+
+#: builtin/remote.c:1621
+msgid "manipulate push URLs"
+msgstr "operuj na adresach wypychania"
+
+#: builtin/remote.c:1623
+msgid "add URL"
+msgstr "dodaj adres URL"
+
+#: builtin/remote.c:1625
+msgid "delete URLs"
+msgstr "usuń adresy URL"
+
+#: builtin/remote.c:1632
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete nie ma sensu"
+
+#: builtin/remote.c:1673
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "Nieprawidłowy stary wzorzec adresu: %s"
+
+#: builtin/remote.c:1681
+#, c-format
+msgid "No such URL found: %s"
+msgstr "Nie znaleziono takiego adresu URL: %s"
+
+#: builtin/remote.c:1683
+msgid "Will not delete all non-push URLs"
+msgstr "Nie skasuje wszystkich adresów nie do wypychania"
+
+#: builtin/repack.c:26
+msgid "git repack [<options>]"
+msgstr "git repack [<opcje>]"
+
+#: 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 ""
+"Przyrostowe przepakowania są niekompatybilne z indeksami bitmap.  Użyj\n"
+"--no-write-bitmap-index lub wyłącz konfigurację pack.writebitmaps."
+
+#: builtin/repack.c:198
+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
+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
+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
+msgid "pack everything in a single pack"
+msgstr "spakuj wszystko w jednÄ… paczkÄ™"
+
+#: builtin/repack.c:324
+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
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "usuń zbędne paczki i wykonaj git-prune-packed"
+
+#: builtin/repack.c:329
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "przekaż --no-reuse-delta do git-pack-objects"
+
+#: builtin/repack.c:331
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "przekaż --no-reuse-object do git-pack-objects"
+
+#: builtin/repack.c:333
+msgid "do not run git-update-server-info"
+msgstr "nie wykonuj git-update-server-info"
+
+#: builtin/repack.c:336
+msgid "pass --local to git-pack-objects"
+msgstr "przekaż --local do git-pack-objects"
+
+#: builtin/repack.c:338
+msgid "write bitmap index"
+msgstr "zapisz indeks bitmapy"
+
+#: builtin/repack.c:340
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "przekaż --delta-islands do git-pack-objects"
+
+#: builtin/repack.c:341
+msgid "approxidate"
+msgstr "przybliżona-data"
+
+#: builtin/repack.c:342
+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
+msgid "with -a, repack unreachable objects"
+msgstr "z -a przepakuj wszystkie nieosiÄ…galne obiekty"
+
+#: builtin/repack.c:346
+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
+msgid "bytes"
+msgstr "bajty"
+
+#: builtin/repack.c:348
+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
+msgid "limits the maximum delta depth"
+msgstr "ogranicza maksymalną głębokość delty"
+
+#: builtin/repack.c:352
+msgid "limits the maximum number of threads"
+msgstr "ogranicza maksymalną liczbę wątków"
+
+#: builtin/repack.c:354
+msgid "maximum size of each packfile"
+msgstr "maksymalny rozmiar pojedynczego pliku paczki"
+
+#: builtin/repack.c:356
+msgid "repack objects in packs marked with .keep"
+msgstr "przepakuj obiekty w paczki oznaczone przez .keep"
+
+#: builtin/repack.c:358
+msgid "do not repack this pack"
+msgstr "nie przepakowuj tej paczki"
+
+#: builtin/repack.c:368
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "nie można usuwać paczek w repozytorium o cennych obiektach"
+
+#: builtin/repack.c:372
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable i -A siÄ™ wykluczajÄ…"
+
+#: builtin/repack.c:455
+msgid "Nothing new to pack."
+msgstr "Nic nowego do spakowania."
+
+#: builtin/repack.c:485
+#, c-format
+msgid "missing required file: %s"
+msgstr "brakuje wymaganego pliku: %s"
+
+#: builtin/repack.c:487
+#, c-format
+msgid "could not unlink: %s"
+msgstr "nie można usunąć przez unlink: %s"
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <obiekt> <zamiennik>"
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <obiekt>"
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <zapis> [<rodzic>...]"
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --convert-graft-file"
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr "git replace -d <obiekt>..."
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<format>] [-l [<wzorzec>]]"
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"nieprawidłowy format zamiany „%s�\n"
+"prawidłowe formaty to „short�, „medium� i „long�"
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "nie znaleziono zamiennej referencji „%s�"
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "Usunięto zastępczą referencję „%s�"
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "„%s� nie jest prawidłową nazwą referencji"
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "referencja zastępcza „%s� już istnieje"
+
+#: builtin/replace.c:178
+#, 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 ""
+"Obiekty muszą być tego samego typu.\n"
+"„%s� wskazuje na zastąpiony obiekt „%s�,\n"
+"a „%s� wskazuje na zastępczy obiekt „%s�."
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "nie można otworzyć „%s� do zapisywania"
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr "cat-file zgłosiło błąd"
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "nie można otworzyć %s do odczytu"
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr "nie można uruchomić mktree"
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr "nie można odczytać z mktree"
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr "mktree zgłosiło błąd"
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr "mktree nie zwróciło nazwy obiektu"
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr "nie można wykonać fstat na %s"
+
+#: builtin/replace.c:303
+msgid "unable to write object to database"
+msgstr "nie można zapisać obiektu do bazy danych"
+
+#: 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 "nieprawidłowa nazwa obiektu: „%s�"
+
+#: builtin/replace.c:326
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "nie można uzyskać rodzaju obiektu %s"
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr "edycja pliku obiektu nie powiodła się"
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "nowy obiekt jest tym samym, co stary: „%s�"
+
+#: builtin/replace.c:384
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "nie można przetworzyć %s jako zapisu"
+
+#: builtin/replace.c:416
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "zły tag scalenia w zapisie „%s�"
+
+#: builtin/replace.c:418
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "nieprawidłowy tag scalenia w zapisie „%s�"
+
+#: builtin/replace.c:430
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+"pierwotny zapis „%s� zawiera tag scalenia „%s�, który jest odrzucany; użyj --"
+"edit zamiast --graft"
+
+#: builtin/replace.c:469
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr "pierwotny zapis „%s� ma podpis GPG"
+
+#: builtin/replace.c:470
+msgid "the signature will be removed in the replacement commit!"
+msgstr "podpis zostanie usunięty w zastępczym zapisie!"
+
+#: builtin/replace.c:480
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "nie można zapisać zastępczego zapisu dla: „%s�"
+
+#: builtin/replace.c:488
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "szczepka w „%s� niepotrzebna"
+
+#: builtin/replace.c:492
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "nowy zapis jest tym samym, co stary: „%s�"
+
+#: builtin/replace.c:527
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"nie można skonwertować następujących szczepek:\n"
+"%s"
+
+#: builtin/replace.c:548
+msgid "list replace refs"
+msgstr "wypisz referencje replace"
+
+#: builtin/replace.c:549
+msgid "delete replace refs"
+msgstr "usuń zastępcze referencje"
+
+#: builtin/replace.c:550
+msgid "edit existing object"
+msgstr "edytuj istniejÄ…cy obiekt"
+
+#: builtin/replace.c:551
+msgid "change a commit's parents"
+msgstr "zmień rodziców zapisu"
+
+#: builtin/replace.c:552
+msgid "convert existing graft file"
+msgstr "skonwertuj istniejÄ…cy plik szczepek"
+
+#: builtin/replace.c:553
+msgid "replace the ref if it exists"
+msgstr "zastąp referencję, jeśli istnieje"
+
+#: builtin/replace.c:555
+msgid "do not pretty-print contents for --edit"
+msgstr "nie wypisuj ładnie zawartości do --edit"
+
+#: builtin/replace.c:556
+msgid "use this format"
+msgstr "użyj tego formatu"
+
+#: builtin/replace.c:569
+msgid "--format cannot be used when not listing"
+msgstr "nie można użyć --format bez wymieniania"
+
+#: builtin/replace.c:577
+msgid "-f only makes sense when writing a replacement"
+msgstr "-f ma sens tylko przy wypisywaniu zamiennika"
+
+#: builtin/replace.c:581
+msgid "--raw only makes sense with --edit"
+msgstr "--raw ma sens tylko z --edit"
+
+#: builtin/replace.c:587
+msgid "-d needs at least one argument"
+msgstr "-d potrzebuje przynajmniej jednego argumentu"
+
+#: builtin/replace.c:593
+msgid "bad number of arguments"
+msgstr "zła liczba argumentów"
+
+#: builtin/replace.c:599
+msgid "-e needs exactly one argument"
+msgstr "-e potrzebuje dokładnie jednego argumentu"
+
+#: builtin/replace.c:605
+msgid "-g needs at least one argument"
+msgstr "-g potrzebuje przynajmniej jednego argumentu"
+
+#: builtin/replace.c:611
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file nie przyjmuje argumentu"
+
+#: builtin/replace.c:617
+msgid "only one pattern can be given with -l"
+msgstr "z -l można podać tylko jeden wzorzec"
+
+#: builtin/rerere.c:13
+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
+msgid "register clean resolutions in index"
+msgstr "zarejestruj gładkie rozwiązania w indeksie"
+
+#: builtin/rerere.c:79
+msgid "'git rerere forget' without paths is deprecated"
+msgstr "„git rerere forget� bez ścieżek jest przestarzałe"
+
+#: builtin/rerere.c:113
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr "nie można wygenerować różnic dla „%s�"
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<zapis>]"
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<drzewo>] [--] <ścieżka>..."
+
+#: 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]] [<drzewo>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<drzewo>] [--] [<ścieżka>...]"
+
+#: builtin/reset.c:41
+msgid "mixed"
+msgstr "mieszany"
+
+#: builtin/reset.c:41
+msgid "soft"
+msgstr "miękki"
+
+#: builtin/reset.c:41
+msgid "hard"
+msgstr "twardy"
+
+#: builtin/reset.c:41
+msgid "merge"
+msgstr "scalenie"
+
+#: builtin/reset.c:41
+msgid "keep"
+msgstr "zachowaj"
+
+#: builtin/reset.c:83
+msgid "You do not have a valid HEAD."
+msgstr "HEAD jest nieprawidłowe."
+
+#: builtin/reset.c:85
+msgid "Failed to find tree of HEAD."
+msgstr "Nie znaleziono drzewa HEAD."
+
+#: builtin/reset.c:91
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Nie znaleziono drzewa %s."
+
+#: builtin/reset.c:116
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD wskazuje teraz %s"
+
+#: builtin/reset.c:195
+#, 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
+msgid "be quiet, only report errors"
+msgstr "mniej komunikatów, wypisuj tylko błędy"
+
+#: builtin/reset.c:297
+msgid "reset HEAD and index"
+msgstr "zresetuj HEAD i indeks"
+
+#: builtin/reset.c:298
+msgid "reset only HEAD"
+msgstr "zresetuj tylko HEAD"
+
+#: builtin/reset.c:300 builtin/reset.c:302
+msgid "reset HEAD, index and working tree"
+msgstr "zresetuj HEAD, indeks i drzewo robocze"
+
+#: builtin/reset.c:304
+msgid "reset HEAD but keep local changes"
+msgstr "zresetuj HEAD, ale zachowaj lokalne zmiany"
+
+#: builtin/reset.c:310
+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
+#, 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
+#, 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
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch i --{hard,mixed,soft} siÄ™ wykluczajÄ…"
+
+#: builtin/reset.c:371
+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
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Nie można wykonać resetu %s ze ścieżkami."
+
+#: builtin/reset.c:388
+#, 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
+msgid "-N can only be used with --mixed"
+msgstr "-N może być użyte tylko z --mixed"
+
+#: builtin/reset.c:413
+msgid "Unstaged changes after reset:"
+msgstr "Nieprzygotowane zmiany po resecie:"
+
+#: builtin/reset.c:416
+#, 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 ""
+"\n"
+"Przejrzenie nieprzygotowanych zmian po resecie zajęło %.2f sekund.\n"
+"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
+#, 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
+msgid "Could not write new index file."
+msgstr "Nie można zapisać nowego pliku indeksu."
+
+#: builtin/rev-list.c:534
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "--exclude-promisor-objects i --missing siÄ™ wykluczajÄ…"
+
+#: builtin/rev-list.c:595
+msgid "object filtering requires --objects"
+msgstr "filtrowanie obiektów wymaga --objects"
+
+#: builtin/rev-list.c:651
+msgid "rev-list does not support display of notes"
+msgstr "rev-list nie wspiera wyświetlania uwag"
+
+#: builtin/rev-list.c:656
+msgid "marked counting is incompatible with --objects"
+msgstr "znaczone zliczanie i --objects siÄ™ wykluczajÄ…"
+
+#: builtin/rev-parse.c:409
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<opcje>] -- [<argumenty>...]"
+
+#: builtin/rev-parse.c:414
+msgid "keep the `--` passed as an arg"
+msgstr "przekaż „--� dalej jako argument"
+
+#: builtin/rev-parse.c:416
+msgid "stop parsing after the first non-option argument"
+msgstr "przerwij przetwarzanie po pierwszym argumencie, który nie jest opcją"
+
+#: builtin/rev-parse.c:419
+msgid "output in stuck long form"
+msgstr "wypisz w zbitej długiej postaci"
+
+#: builtin/rev-parse.c:552
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+"   or: git rev-parse --sq-quote [<arg>...]\n"
+"   or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+"git rev-parse --parseopt [<opcje>] -- [<argumenty>...]\n"
+"   lub: git rev-parse --sq-quote [<arg>...]\n"
+"   lub: git rev-parse [<opcje>] [<arg>...]\n"
+"\n"
+"Wykonaj „git rev-parse --parseopt -h�, aby uzyskać więcej informacji o "
+"pierwszym użyciu."
+
+#: builtin/revert.c:24
+msgid "git revert [<options>] <commit-ish>..."
+msgstr "git revert [<opcje>] <zmiana>..."
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr "git revert <pod-polecenie>"
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<opcje>] <zmiana>..."
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <pod-polecenie>"
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+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Ä™"
+
+#: builtin/revert.c:102
+msgid "end revert or cherry-pick sequence"
+msgstr "zakończ sekwencję odwracania lub dobierania"
+
+#: builtin/revert.c:103
+msgid "resume revert or cherry-pick sequence"
+msgstr "wznów sekwencję odwracania lub dobierania"
+
+#: builtin/revert.c:104
+msgid "cancel revert or cherry-pick sequence"
+msgstr "anuluj sekwencjÄ™ odwracania lub dobierania"
+
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "pomiń bieżący zapis i kontynuuj"
+
+#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr "nie składaj zapisów automatycznie"
+
+#: builtin/revert.c:108
+msgid "edit the commit message"
+msgstr "edytuj komunikat zapisu"
+
+#: builtin/revert.c:111
+msgid "parent-number"
+msgstr "numer-rodzica"
+
+#: builtin/revert.c:112
+msgid "select mainline parent"
+msgstr "wybierz rodzica w głównym nurcie"
+
+#: builtin/revert.c:114
+msgid "merge strategy"
+msgstr "strategia scalania"
+
+#: builtin/revert.c:116
+msgid "option for merge strategy"
+msgstr "opcja strategii scalania"
+
+#: builtin/revert.c:125
+msgid "append commit name"
+msgstr "dodaj nazwÄ™ zapisu"
+
+#: builtin/revert.c:127
+msgid "preserve initially empty commits"
+msgstr "zachowaj poczÄ…tkowo puste zapisy"
+
+#: builtin/revert.c:129
+msgid "keep redundant, empty commits"
+msgstr "zachowaj zbędne puste zapisy"
+
+#: builtin/revert.c:239
+msgid "revert failed"
+msgstr "odwrócenie nie powiodło się"
+
+#: builtin/revert.c:252
+msgid "cherry-pick failed"
+msgstr "dobieranie nie powiodło się"
+
+#: builtin/rm.c:19
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<opcje>] [--] <plik>..."
+
+#: builtin/rm.c:207
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+"następujący plik ma przygotowaną zawartość różną i od pliku\n"
+"i od HEAD:"
+msgstr[1] ""
+"następujące pliki ma przygotowaną zawartość różną i od pliku\n"
+"i od HEAD:"
+msgstr[2] ""
+"następujące pliki ma przygotowaną zawartość różną i od pliku\n"
+"i od HEAD:"
+
+#: builtin/rm.c:212
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(użyj -f, by wymusić usunięcie)"
+
+#: builtin/rm.c:216
+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
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"(użyj --cached, aby zachować plik, lub -f, by wymusić usunięcie)"
+
+#: builtin/rm.c:226
+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
+msgid "do not list removed files"
+msgstr "nie wypisuj usuniętych plików"
+
+#: builtin/rm.c:244
+msgid "only remove from the index"
+msgstr "tylko usuń z indeksu"
+
+#: builtin/rm.c:245
+msgid "override the up-to-date check"
+msgstr "wyłącz sprawdzenie aktualności"
+
+#: builtin/rm.c:246
+msgid "allow recursive removal"
+msgstr "zezwól na usuwanie rekurencyjne"
+
+#: builtin/rm.c:248
+msgid "exit with a zero status even if nothing matched"
+msgstr "zwróć zero, nawet jeśli nic nie dopasowano"
+
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Nie podano żadnych ścieżek. Które pliki usunąć?"
+
+#: builtin/rm.c:305
+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
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "nie usuwanie „%s� rekurencyjne bez -r"
+
+#: builtin/rm.c:362
+#, 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."
+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Ä™."
+
+#: builtin/send-pack.c:188
+msgid "remote name"
+msgstr "nazwa zdalnego repozytorium"
+
+#: builtin/send-pack.c:201
+msgid "use stateless RPC protocol"
+msgstr "użyj bezstanowego protokołu RPC"
+
+#: builtin/send-pack.c:202
+msgid "read refs from stdin"
+msgstr "wczytaj referencje ze standardowego wejścia"
+
+#: builtin/send-pack.c:203
+msgid "print status from remote helper"
+msgstr "wypisuj stan zdalnego pomocnika"
+
+#: builtin/shortlog.c:16
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<opcje>] [<zakres-rewizji>] [[--] <ścieżka>...]"
+
+#: builtin/shortlog.c:17
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<opcje>]"
+
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "użycie wielu opcji --group ze standardowym wejściem nie jest wspierane"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "użycie --group=trailer ze standardowym wejściem nie jest wspierane"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "nieznany rodzaj grupy: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "grupuj według składającego, a nie autora"
+
+#: builtin/shortlog.c:354
+msgid "sort output according to the number of commits per author"
+msgstr "posortuj wyjście według liczby zapisów na autora"
+
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "pomiń opisy zapisów, podaje tylko liczbę zapisów"
+
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "pokazuj adres e-mail każdego autora"
+
+#: builtin/shortlog.c:359
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "zawijaj wiersze wyjścia"
+
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "pole"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "grupuj według pola"
+
+#: builtin/shortlog.c:391
+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>)...]"
+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>)...]"
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr ""
+"git show-branch (-g | --reflog)[=<n>[,<podstawa>]] [--list] [<referencja>]"
+
+#: 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] "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
+#, c-format
+msgid "no matching refs with %s"
+msgstr "brak pasujÄ…cych referencji z %s"
+
+#: builtin/show-branch.c:645
+msgid "show remote-tracking and local branches"
+msgstr "pokaż śledzące i lokalne gałęzie"
+
+#: builtin/show-branch.c:647
+msgid "show remote-tracking branches"
+msgstr "wypisz gałęzie śledzące"
+
+#: builtin/show-branch.c:649
+msgid "color '*!+-' corresponding to the branch"
+msgstr "koloruj „*!+-� odpowiednio do gałęzi"
+
+#: builtin/show-branch.c:651
+msgid "show <n> more commits after the common ancestor"
+msgstr "pokaż <n> dodatkowych zapisów po wspólnym przodku"
+
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
+msgstr "zamiennik na more=-1"
+
+#: builtin/show-branch.c:654
+msgid "suppress naming strings"
+msgstr "ukryj nazwy"
+
+#: builtin/show-branch.c:656
+msgid "include the current branch"
+msgstr "uwzględnij bieżącą gałąź"
+
+#: builtin/show-branch.c:658
+msgid "name commits with their object names"
+msgstr "nazwij zapisy ich nazwami obiektów"
+
+#: builtin/show-branch.c:660
+msgid "show possible merge bases"
+msgstr "pokaż możliwe podstawy scalenia"
+
+#: builtin/show-branch.c:662
+msgid "show refs unreachable from any other ref"
+msgstr "pokaż referencje nieosiągalne z żadnej innej"
+
+#: builtin/show-branch.c:664
+msgid "show commits in topological order"
+msgstr "pokaż zapisy w kolejności topologicznej"
+
+#: builtin/show-branch.c:667
+msgid "show only commits not on the first branch"
+msgstr "pokaż tylko zapisy spoza pierwszej gałęzi"
+
+#: builtin/show-branch.c:669
+msgid "show merges reachable from only one tip"
+msgstr "pokaż scalenia osiągalne z tylko jednego czubka"
+
+#: builtin/show-branch.c:671
+msgid "topologically sort, maintaining date order where possible"
+msgstr "posortuj topologicznie, zachowując kolejność dat, gdzie się da"
+
+#: builtin/show-branch.c:674
+msgid "<n>[,<base>]"
+msgstr "<n>[,<podstawa>]"
+
+#: builtin/show-branch.c:675
+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
+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
+msgid "no branches given, and HEAD is not valid"
+msgstr "nie podano gałęzi, a HEAD jest nieprawidłowe"
+
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
+msgstr "opcja --reflog potrzebuje nazwy gałęzi"
+
+#: builtin/show-branch.c:741
+#, 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] "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
+#, c-format
+msgid "no such ref %s"
+msgstr "nie ma takiej referencji %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] "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
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "„%s� nie jest prawidłową referencją."
+
+#: builtin/show-branch.c:838
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "nie odnaleziono zapisu %s (%s)"
+
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "algorytm-skrótu"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "Nieznany algorytm skrótu"
+
+#: 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] [--] [<wzorzec>...]"
+
+#: builtin/show-ref.c:13
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<wzorzec>]"
+
+#: builtin/show-ref.c:162
+msgid "only show tags (can be combined with heads)"
+msgstr "pokazuj tylko tagi (może być połączone z czołami)"
+
+#: builtin/show-ref.c:163
+msgid "only show heads (can be combined with tags)"
+msgstr "pokazuj tylko czoła (może być połączone z tagami)"
+
+#: builtin/show-ref.c:164
+msgid "stricter reference checking, requires exact ref path"
+msgstr ""
+"ściślejsze sprawdzanie referencji, wymaga dokładnej ścieżki do referencji"
+
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "pokaż referencję HEAD, nawet jeśli byłaby odfiltrowana"
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr "odczytaj z tagów identyfikatory obiektów"
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr "nie pokazuj nazwy, a SHA-1 skróć do <n> cyfr"
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "nie wypisuj wyników na wyjście (przydatne do --verify)"
+
+#: builtin/show-ref.c:179
+msgid "show refs from stdin that aren't in local repository"
+msgstr ""
+"pokaż referencje ze standardowego wejścia, których nie ma w lokalnym "
+"repozytorium"
+
+#: builtin/sparse-checkout.c:21
+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
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:71
+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
+msgid "failed to create directory for sparse-checkout file"
+msgstr "nie można utworzyć katalogu dla pliku rzadkiego wybrania"
+
+#: builtin/sparse-checkout.c:264
+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
+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:302
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "zainicjuj rzadkie wybranie w trybie stożka"
+
+#: builtin/sparse-checkout.c:339
+#, c-format
+msgid "failed to open '%s'"
+msgstr "nie można otworzyć „%s�"
+
+#: builtin/sparse-checkout.c:396
+#, c-format
+msgid "could not normalize path %s"
+msgstr "nie można unormować ścieżki %s"
+
+#: builtin/sparse-checkout.c:408
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <wzorce>)"
+
+#: builtin/sparse-checkout.c:433
+#, 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
+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
+msgid "read patterns from standard in"
+msgstr "wczytaj wzorce ze standardowego wejścia"
+
+#: builtin/sparse-checkout.c:571
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:590
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:618
+msgid "error while refreshing working directory"
+msgstr "błąd podczas odświeżania katalogu roboczego"
+
+#: builtin/stash.c:22 builtin/stash.c:38
+msgid "git stash list [<options>]"
+msgstr "git stash list [<opcje>]"
+
+#: builtin/stash.c:23 builtin/stash.c:43
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<opcje>] [<schowek>]"
+
+#: builtin/stash.c:24 builtin/stash.c:48
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<schowek>]"
+
+#: builtin/stash.c:25
+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
+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
+msgid ""
+"git stash [push [-p|--patch] [-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 <komunikat>]\n"
+"          [--pathspec-from-file=<plik> [--pathspec-file-nul]]\n"
+"          [--] [<ścieżka>...]]"
+
+#: builtin/stash.c:32 builtin/stash.c:85
+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:53
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<schowek>]"
+
+#: builtin/stash.c:58
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<schowek>]"
+
+#: builtin/stash.c:73
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <komunikat>] [-q|--quiet] <zapis>"
+
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <komunikat>]\n"
+"          [--] [<ścieżka>...]]"
+
+#: builtin/stash.c:128
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "„%s� nie jest zapisem ze zmianami ze schowka"
+
+#: builtin/stash.c:148
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Podano za dużo rewizji: %s"
+
+#: builtin/stash.c:162
+msgid "No stash entries found."
+msgstr "Brak zmian w schowku."
+
+#: builtin/stash.c:176
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s nie jest prawidłową referencją."
+
+#: builtin/stash.c:225
+msgid "git stash clear with arguments is unimplemented"
+msgstr "nie zaimplementowano parametrów w git stash clear"
+
+#: builtin/stash.c:429
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file!  Renaming\n"
+"            %s -> %s\n"
+"         to make room.\n"
+msgstr ""
+"OSTRZEŻENIE: Nieśledzony plik zawadza śledzonemu plikowi!  Zmienianie nazwy\n"
+"            %s -> %s\n"
+"         aby zwolnić miejsce.\n"
+
+#: builtin/stash.c:490
+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
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "nie można wygenerować zmian %s^!."
+
+#: builtin/stash.c:508
+msgid "conflicts in index. Try without --index."
+msgstr "konflikty w indeksie. Spróbuj bez --index."
+
+#: builtin/stash.c:514
+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
+#, c-format
+msgid "Merging %s with %s"
+msgstr "Scalanie %s z %s"
+
+#: builtin/stash.c:547
+msgid "Index was not unstashed."
+msgstr "Indeks nie został wyjęty ze schowka."
+
+#: builtin/stash.c:589 builtin/stash.c:687
+msgid "attempt to recreate the index"
+msgstr "spróbuj odtworzyć indeks"
+
+#: builtin/stash.c:633
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "Porzucono %s (%s)"
+
+#: builtin/stash.c:636
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Nie można porzucić wpisu ze schowka"
+
+#: builtin/stash.c:649
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "„%s� nie wskazuje na zmiany ze schowka"
+
+#: builtin/stash.c:699
+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
+msgid "No branch name specified"
+msgstr "Nie określono nazwy gałęzi"
+
+#: builtin/stash.c:866 builtin/stash.c:903
+#, 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
+msgid "stash message"
+msgstr "komunikat skrytki"
+
+#: builtin/stash.c:894
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "„git stash store� wymaga jednego argumentu z <zapisem>"
+
+#: builtin/stash.c:1109
+msgid "No changes selected"
+msgstr "Nie wybrano zmian"
+
+#: builtin/stash.c:1209
+msgid "You do not have the initial commit yet"
+msgstr "Nie masz jeszcze poczÄ…tkowego zapisu"
+
+#: builtin/stash.c:1236
+msgid "Cannot save the current index state"
+msgstr "Nie można zapisać bieżącego stanu indeksu"
+
+#: builtin/stash.c:1245
+msgid "Cannot save the untracked files"
+msgstr "Nie można zapisać nieśledzonych plików"
+
+#: builtin/stash.c:1256 builtin/stash.c:1265
+msgid "Cannot save the current worktree state"
+msgstr "Nie można zapisać bieżącego stanu drzewa roboczego"
+
+#: builtin/stash.c:1293
+msgid "Cannot record working tree state"
+msgstr "Nie można zapisać stanu drzewa roboczego"
+
+#: builtin/stash.c:1342
+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
+msgid "Did you forget to 'git add'?"
+msgstr "Czyżby zabrakło „git add�?"
+
+#: builtin/stash.c:1373
+msgid "No local changes to save"
+msgstr "Brak lokalnych zmian do zapisania"
+
+#: builtin/stash.c:1380
+msgid "Cannot initialize stash"
+msgstr "Nie można zainicjować schowka"
+
+#: builtin/stash.c:1395
+msgid "Cannot save the current status"
+msgstr "Nie można zachować bieżącego stanu"
+
+#: builtin/stash.c:1400
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Zapisano katalog roboczy i stan indeksu %s"
+
+#: builtin/stash.c:1490
+msgid "Cannot remove worktree changes"
+msgstr "Nie można usunąć zmian w drzewie roboczym"
+
+#: builtin/stash.c:1529 builtin/stash.c:1594
+msgid "keep index"
+msgstr "zachowaj indeks"
+
+#: builtin/stash.c:1531 builtin/stash.c:1596
+msgid "stash in patch mode"
+msgstr "dodaj do schowka w trybie Å‚atki"
+
+#: builtin/stash.c:1532 builtin/stash.c:1597
+msgid "quiet mode"
+msgstr "tryb cichy"
+
+#: builtin/stash.c:1534 builtin/stash.c:1599
+msgid "include untracked files in stash"
+msgstr "uwzględnij nieśledzone pliki w schowku"
+
+#: builtin/stash.c:1536 builtin/stash.c:1601
+msgid "include ignore files"
+msgstr "uwzględnij pomijane pliki"
+
+#: builtin/stash.c:1636
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"wsparcie stash.useBuiltin zostało usunięte!\n"
+"Zobacz szczegóły pod jego opisem w „git help config�."
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
+msgstr "pomiń i usuń wszystkie wiersze rozpoczynające się znakiem komentarza"
+
+#: builtin/stripspace.c:40
+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
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Oczekiwano pełnej nazwy referencji, otrzymano %s"
+
+#: builtin/submodule--helper.c:64
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote nie przyjmuje argumentów"
+
+#: builtin/submodule--helper.c:102
+#, 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
+msgid "alternative anchor for relative paths"
+msgstr "alternatywne zakotwiczenie ścieżek względnych"
+
+#: builtin/submodule--helper.c:415
+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
+#, 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"
+
+#: builtin/submodule--helper.c:524
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Otwieranie „%s�\n"
+
+#: builtin/submodule--helper.c:527
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command zwróciło niezerowy kod wyjścia z %s\n"
+"."
+
+#: builtin/submodule--helper.c:549
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command zwróciło niezerowy kod wyjścia podczas przechodzenia "
+"zagnieżdżonych pod-modułów %s\n"
+"."
+
+#: builtin/submodule--helper.c:565
+msgid "suppress output of entering each submodule command"
+msgstr "powstrzymaj wyjście przy podawaniu każdego polecenia pod-modułu"
+
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:888
+#: builtin/submodule--helper.c:1487
+msgid "recurse into nested submodules"
+msgstr "schodź do zagnieżdżonych pod-modułów"
+
+#: builtin/submodule--helper.c:572
+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
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "Nie można zarejestrować adresu do ścieżki pod-modułu „%s�"
+
+#: builtin/submodule--helper.c:670
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "Zarejestrowano pod-moduł „%s� (%s) w „%s�\n"
+
+#: builtin/submodule--helper.c:680
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr ""
+"ostrzeżenie: zaproponowano tryb aktualizowania polecenia w pod-module „%s�\n"
+
+#: builtin/submodule--helper.c:687
+#, 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�"
+
+#: builtin/submodule--helper.c:709
+msgid "suppress output for initializing a submodule"
+msgstr "powstrzymaj wyjście przy inicjalizacji pod-modułu"
+
+#: builtin/submodule--helper.c:714
+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
+#, 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�"
+
+#: builtin/submodule--helper.c:835
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "nie można rozwiązać referencji HEAD w pod-module „%s�"
+
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "Nie można zejść do pod-modułu „%s�"
+
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
+msgid "suppress submodule status output"
+msgstr "powstrzymaj wyjście stanu pod-modułów"
+
+#: builtin/submodule--helper.c:887
+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"
+
+#: builtin/submodule--helper.c:893
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ścieżka>...]"
+
+#: builtin/submodule--helper.c:917
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <ścieżka>"
+
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(pod-moduł)"
+
+#: builtin/submodule--helper.c:992
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(pod-moduł)->%s(blob)"
+
+#: builtin/submodule--helper.c:1005
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1055
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "nie można skrócić obiektu z „%s�"
+
+#: builtin/submodule--helper.c:1059
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "nieoczekiwany tryb %o\n"
+
+#: builtin/submodule--helper.c:1300
+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"
+
+#: 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:1304
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "pomiń pod-moduły z wartością „ignore_config� ustawioną na „all�"
+
+#: builtin/submodule--helper.c:1306
+msgid "limit the summary size"
+msgstr "ogranicz rozmiar podsumowania"
+
+#: builtin/submodule--helper.c:1311
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<opcje>] [<zapis>] [--] [<ścieżka>]"
+
+#: builtin/submodule--helper.c:1335
+msgid "could not fetch a revision for HEAD"
+msgstr "nie można pobrać rewizji dla HEAD"
+
+#: builtin/submodule--helper.c:1340
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached i --files siÄ™ wykluczajÄ…"
+
+#: builtin/submodule--helper.c:1407
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Synchronizowanie adresu URL pod-modułu w „%s�\n"
+
+#: builtin/submodule--helper.c:1413
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "nie można zarejestrować adresu do ścieżki pod-modułu „%s�"
+
+#: builtin/submodule--helper.c:1427
+#, 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�"
+
+#: builtin/submodule--helper.c:1438
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "nie można zaktualizować zdalnego repozytorium pod-modułu „%s�"
+
+#: builtin/submodule--helper.c:1485
+msgid "suppress output of synchronizing submodule url"
+msgstr "powstrzymaj wyjście przy synchronizacji adresu pod-modułu"
+
+#: builtin/submodule--helper.c:1492
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<ścieżka>]"
+
+#: builtin/submodule--helper.c:1546
+#, 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 "
+"pewno chcesz je usunąć wraz z całą jego historią)"
+
+#: builtin/submodule--helper.c:1558
+#, 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 "
+"odrzucić"
+
+#: builtin/submodule--helper.c:1566
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Wyczyszczono katalog „%s�\n"
+
+#: builtin/submodule--helper.c:1568
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Nie można usunąć drzewa roboczego pod-modułu „%s�\n"
+
+#: builtin/submodule--helper.c:1579
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "nie można utworzyć pustego katalogu pod-modułu „%s�"
+
+#: builtin/submodule--helper.c:1595
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "Wyrejestrowano pod-moduł „%s� (%s) ze ścieżki „%s�\n"
+
+#: builtin/submodule--helper.c:1624
+msgid "remove submodule working trees even if they contain local changes"
+msgstr "usuń drzewa robocze pod-modułów, nawet jeśli zawierają lokalne zmiany"
+
+#: builtin/submodule--helper.c:1625
+msgid "unregister all submodules"
+msgstr "wyrejestruj wszystkie pod-moduły"
+
+#: builtin/submodule--helper.c:1630
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<ścieżka>...]]"
+
+#: builtin/submodule--helper.c:1644
+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
+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 ""
+"Alternatywa obliczona z alternatywy nad-projektu jest nieprawidłowa.\n"
+"Aby pozwolić Gitowi w takim wypadku klonować bez alternatywy, ustaw\n"
+"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
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "pod-moduł „%s� nie może dodać alternatywnego położenia: %s"
+
+#: builtin/submodule--helper.c:1791
+#, 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
+#, 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
+msgid "where the new submodule will be cloned to"
+msgstr "dokąd zostanie sklonowany nowy pod-moduł"
+
+#: builtin/submodule--helper.c:1825
+msgid "name of the new submodule"
+msgstr "nazwa nowego pod-modułu"
+
+#: builtin/submodule--helper.c:1828
+msgid "url where to clone the submodule from"
+msgstr "adres, skąd sklonować pod-moduł"
+
+#: builtin/submodule--helper.c:1836
+msgid "depth for shallow clones"
+msgstr "głębokość płytkich klonów"
+
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
+msgid "force cloning progress"
+msgstr "wymuś postęp klonowania"
+
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+msgid "disallow cloning into non-empty directory"
+msgstr "nie pozwól sklonować do niepustego katalogu"
+
+#: builtin/submodule--helper.c:1848
+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=<ścieżka>] [--quiet] [--reference "
+"<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
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr "Nieprawidłowy tryb aktualizacji „%s� do ścieżki pod-modułu „%s�"
+
+#: builtin/submodule--helper.c:1940
+#, 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�"
+
+#: builtin/submodule--helper.c:2041
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Ścieżka pod-modułu „%s� niezainicjowana"
+
+#: builtin/submodule--helper.c:2045
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Może chcesz użyć „update --init�?"
+
+#: builtin/submodule--helper.c:2075
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Pomijanie niescalonego pod-modułu %s"
+
+#: builtin/submodule--helper.c:2104
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Pomijanie pod-modułu „%s�"
+
+#: builtin/submodule--helper.c:2254
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Nie można sklonować „%s�. Zaplanowano ponowienie"
+
+#: builtin/submodule--helper.c:2265
+#, 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
+msgid "path into the working tree"
+msgstr "ścieżka w drzewie roboczym"
+
+#: builtin/submodule--helper.c:2330
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "ścieżka w drzewie roboczym, przez granice zagnieżdżonych pod-modułów"
+
+#: builtin/submodule--helper.c:2334
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout lub none"
+
+#: builtin/submodule--helper.c:2340
+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
+msgid "parallel jobs"
+msgstr "równoległe zadania"
+
+#: builtin/submodule--helper.c:2345
+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
+msgid "don't print cloning progress"
+msgstr "nie wypisuj postępu klonowania"
+
+#: builtin/submodule--helper.c:2357
+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
+msgid "bad value for update parameter"
+msgstr "zła wartość parametru aktualizacji"
+
+#: builtin/submodule--helper.c:2418
+#, 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 "
+"nad-projekt nie jest na żadnej gałęzi"
+
+#: builtin/submodule--helper.c:2541
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "nie można uzyskać uchwytu repozytorium pod-modułu dla „%s�"
+
+#: builtin/submodule--helper.c:2574
+msgid "recurse into submodules"
+msgstr "schodź do pod-modułów"
+
+#: builtin/submodule--helper.c:2580
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<opcje>] [<ścieżka>...]"
+
+#: builtin/submodule--helper.c:2636
+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
+msgid "unset the config in the .gitmodules file"
+msgstr "usuń konfigurację z pliku .gitmodules"
+
+#: builtin/submodule--helper.c:2644
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <nazwa> [<wartość>]"
+
+#: builtin/submodule--helper.c:2645
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <nazwa>"
+
+#: builtin/submodule--helper.c:2646
+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
+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
+msgid "suppress output for setting url of a submodule"
+msgstr "powstrzymaj wyjście przy ustawianiu adresu pod-modułu"
+
+#: builtin/submodule--helper.c:2685
+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
+msgid "set the default tracking branch to master"
+msgstr "ustaw domyślną gałąź śledzącą na master"
+
+#: builtin/submodule--helper.c:2720
+msgid "set the default tracking branch"
+msgstr "ustaw domyślną gałąź śledzącą"
+
+#: builtin/submodule--helper.c:2724
+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
+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
+msgid "--branch or --default required"
+msgstr "wymagane --branch lub --default"
+
+#: builtin/submodule--helper.c:2735
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch i --default siÄ™ wykluczajÄ…"
+
+#: builtin/submodule--helper.c:2792 git.c:441 git.c:714
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s nie wspiera --super-prefix"
+
+#: builtin/submodule--helper.c:2798
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "„%s� nie jest prawidłowym pod-poleceniem submodule--helper"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<opcje>] <nazwa> [<referencja>]"
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <nazwa>"
+
+#: builtin/symbolic-ref.c:40
+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
+msgid "delete symbolic ref"
+msgstr "usuń referencję symboliczną"
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr "skróć wyjściową referencję"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+msgid "reason"
+msgstr "powód"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
+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>]"
+msgstr ""
+"git tag [-a | -s | -u <id-klucza>] [-f] [-m <komunikat> | -F <plik>]\n"
+"\t\t<tag> [<czoło>]"
+
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <nazwa-tagu>..."
+
+#: 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>...]"
+msgstr ""
+"git tag -l [-n[<num>]] [--contains <zapis>] [--no-contains <zapis>] [--"
+"points-at <obiekt>]\n"
+"\t\t[--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
+#, c-format
+msgid "tag '%s' not found."
+msgstr "nie znaleziono tagu „%s�."
+
+#: builtin/tag.c:124
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "Usunięto tag „%s� (wskazywał %s)\n"
+
+#: builtin/tag.c:159
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"Napisz komunikat do tagu:\n"
+"  %s\n"
+"Wiersze zaczynające się od „%c� zostaną zignorowane.\n"
+
+#: builtin/tag.c:163
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"Napisz komunikat do tagu:\n"
+"  %s\n"
+"Wiersze zaczynające się od „%c� będą zachowane; możesz je sam(a) usunąć, "
+"jeśli chcesz.\n"
+
+#: builtin/tag.c:230
+msgid "unable to sign the tag"
+msgstr "nie można podpisać tagu"
+
+#: builtin/tag.c:248
+#, 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 ""
+"Utworzono zagnieżdżony tag. Obiekt wskazywany przez nowy tag sam jest\n"
+"tagiem. Jeśli chodziło o otagowanie obiektu, na który wskazuje, użyj:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:264
+msgid "bad object type."
+msgstr "zły rodzaj obiektu."
+
+#: builtin/tag.c:317
+msgid "no tag message?"
+msgstr "brak komunikatu tagu?"
+
+#: builtin/tag.c:324
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "Pozostawiono komunikat tagu w %s\n"
+
+#: builtin/tag.c:435
+msgid "list tag names"
+msgstr "wypisz nazwy tagów"
+
+#: builtin/tag.c:437
+msgid "print <n> lines of each tag message"
+msgstr "wypisz <n> wierszy każdego komunikatu tagu"
+
+#: builtin/tag.c:439
+msgid "delete tags"
+msgstr "usuń tagi"
+
+#: builtin/tag.c:440
+msgid "verify tags"
+msgstr "weryfikuj tagi"
+
+#: builtin/tag.c:442
+msgid "Tag creation options"
+msgstr "Opcje tworzenia tagów"
+
+#: builtin/tag.c:444
+msgid "annotated tag, needs a message"
+msgstr "opisz tag, potrzebuje komunikatu"
+
+#: builtin/tag.c:446
+msgid "tag message"
+msgstr "wiadomość tagu"
+
+#: builtin/tag.c:448
+msgid "force edit of tag message"
+msgstr "wymuÅ› edycjÄ™ komunikatu tagu"
+
+#: builtin/tag.c:449
+msgid "annotated and GPG-signed tag"
+msgstr "tag opisany i podpisany GPG"
+
+#: builtin/tag.c:452
+msgid "use another key to sign the tag"
+msgstr "użyj innego klucza do podpisania tagu"
+
+#: builtin/tag.c:453
+msgid "replace the tag if exists"
+msgstr "zamień tag, jeśli istnieje"
+
+#: builtin/tag.c:454 builtin/update-ref.c:505
+msgid "create a reflog"
+msgstr "utwórz dziennik referencji"
+
+#: builtin/tag.c:456
+msgid "Tag listing options"
+msgstr "Opcje wypisywania tagów"
+
+#: builtin/tag.c:457
+msgid "show tag list in columns"
+msgstr "pokaż listę tagów w kolumnach"
+
+#: builtin/tag.c:458 builtin/tag.c:460
+msgid "print only tags that contain the commit"
+msgstr "wypisz tylko tagi zawierajÄ…ce ten zapis"
+
+#: builtin/tag.c:459 builtin/tag.c:461
+msgid "print only tags that don't contain the commit"
+msgstr "wypisz tylko tagi nie zawierajÄ…ce tego zapisu"
+
+#: builtin/tag.c:462
+msgid "print only tags that are merged"
+msgstr "wypisz tylko scalone tagi"
+
+#: builtin/tag.c:463
+msgid "print only tags that are not merged"
+msgstr "wypisz tylko niescalone tagi"
+
+#: builtin/tag.c:467
+msgid "print only tags of the object"
+msgstr "wypisz tylko tagi tego obiektu"
+
+#: builtin/tag.c:515
+msgid "--column and -n are incompatible"
+msgstr "--column i -n siÄ™ wykluczajÄ…"
+
+#: builtin/tag.c:537
+msgid "-n option is only allowed in list mode"
+msgstr "opcja -n może być użyta tylko w trybie wymieniania"
+
+#: builtin/tag.c:539
+msgid "--contains option is only allowed in list mode"
+msgstr "opcja --contains może być użyta tylko w trybie wymieniania"
+
+#: builtin/tag.c:541
+msgid "--no-contains option is only allowed in list mode"
+msgstr "opcja --no-contains może być użyta tylko w trybie wymieniania"
+
+#: builtin/tag.c:543
+msgid "--points-at option is only allowed in list mode"
+msgstr "opcja --points-at może być użyta tylko w trybie wymieniania"
+
+#: builtin/tag.c:545
+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
+msgid "only one -F or -m option is allowed."
+msgstr "-F i -m siÄ™ wykluczajÄ…."
+
+#: builtin/tag.c:581
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "„%s� nie jest prawidłową nazwą tagu."
+
+#: builtin/tag.c:586
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "tag „%s� już istnieje"
+
+#: builtin/tag.c:617
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "Zaktualizowano tag „%s� (wskazywał %s)\n"
+
+#: builtin/unpack-objects.c:502
+msgid "Unpacking objects"
+msgstr "Rozpakowywanie obiektów"
+
+#: builtin/update-index.c:84
+#, c-format
+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
+#, 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
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "nie można usunąć katalogu %s"
+
+#: builtin/update-index.c:140
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "Sprawdzanie czasu modyfikacji „%s� "
+
+#: builtin/update-index.c:154
+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
+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
+msgid "directory stat info changes after updating a file"
+msgstr "informacje stat katalogu zmieniajÄ… siÄ™ po zaktualizowaniu pliku"
+
+#: builtin/update-index.c:191
+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
+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
+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
+msgid " OK"
+msgstr " OK"
+
+#: builtin/update-index.c:591
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<opcje>] [--] [<plik>...]"
+
+#: builtin/update-index.c:974
+msgid "continue refresh even when index needs update"
+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"
+
+#: builtin/update-index.c:980
+msgid "do not ignore new files"
+msgstr "nie ignoruj nowych plików"
+
+#: builtin/update-index.c:982
+msgid "let files replace directories and vice-versa"
+msgstr "pozwól plikom zastępować katalogi i na odwrót"
+
+#: builtin/update-index.c:984
+msgid "notice files missing from worktree"
+msgstr "zauważaj pliki, których brakuje w drzewie roboczym"
+
+#: builtin/update-index.c:986
+msgid "refresh even if index contains unmerged entries"
+msgstr "odśwież, nawet jeśli indeks zawiera niescalone elementy"
+
+#: builtin/update-index.c:989
+msgid "refresh stat information"
+msgstr "odśwież informacje stat"
+
+#: builtin/update-index.c:993
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "jak --refresh, ale pomiń ustawienie założenia niezmienności"
+
+#: builtin/update-index.c:997
+msgid "<mode>,<object>,<path>"
+msgstr "<tryb>,<obiekt>,<ścieżka>"
+
+#: builtin/update-index.c:998
+msgid "add the specified entry to the index"
+msgstr "dodaj podany element do indeksu"
+
+#: builtin/update-index.c:1008
+msgid "mark files as \"not changing\""
+msgstr "oznacz pliki jako „bez zmian�"
+
+#: builtin/update-index.c:1011
+msgid "clear assumed-unchanged bit"
+msgstr "wyczyść bit założenia niezmienności"
+
+#: builtin/update-index.c:1014
+msgid "mark files as \"index-only\""
+msgstr "oznacz pliki jako „tylko do indeksu�"
+
+#: builtin/update-index.c:1017
+msgid "clear skip-worktree bit"
+msgstr "wyczyść bit pominięcia drzewa roboczego"
+
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr "nie dotykaj elementów będących tylko w indeksie"
+
+#: builtin/update-index.c:1022
+msgid "add to index only; do not add content to object database"
+msgstr "tylko dodaj do indeksu; nie dodawaj zawartości do bazy obiektów"
+
+#: builtin/update-index.c:1024
+msgid "remove named paths even if present in worktree"
+msgstr "usuń nazwane ścieżki, nawet jeśli występują w drzewie roboczym"
+
+#: builtin/update-index.c:1026
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "z --stdin: wiersze wejścia są zakończone znakami NUL"
+
+#: builtin/update-index.c:1028
+msgid "read list of paths to be updated from standard input"
+msgstr "odczytaj listę ścieżek do zaktualizowania ze standardowego wejścia"
+
+#: builtin/update-index.c:1032
+msgid "add entries from standard input to the index"
+msgstr "dodaj elementy ze standardowego wejścia do indeksu"
+
+#: builtin/update-index.c:1036
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "ponownie zapełnij etapy nr 2 i 3 dla wymienionych ścieżek"
+
+#: builtin/update-index.c:1040
+msgid "only update entries that differ from HEAD"
+msgstr "zaktualizuj tylko elementy, które różnią się od HEAD"
+
+#: builtin/update-index.c:1044
+msgid "ignore files missing from worktree"
+msgstr "ignoruj pliki, których brakuje w drzewie roboczym"
+
+#: builtin/update-index.c:1047
+msgid "report actions to standard output"
+msgstr "zgłaszaj działania na standardowe wyjście"
+
+#: builtin/update-index.c:1049
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(do porcelany) zapomnij zachowane nierozwiÄ…zane konflikty"
+
+#: builtin/update-index.c:1053
+msgid "write index in this format"
+msgstr "wypisz indeks w tym formacie"
+
+#: builtin/update-index.c:1055
+msgid "enable or disable split index"
+msgstr "włącz lub wyłącz podzielony indeks"
+
+#: builtin/update-index.c:1057
+msgid "enable/disable untracked cache"
+msgstr "włącz/wyłącz pamięć o nieśledzonych"
+
+#: builtin/update-index.c:1059
+msgid "test if the filesystem supports untracked cache"
+msgstr "sprawdź, czy system plików wspiera pamięć o nieśledzonych"
+
+#: builtin/update-index.c:1061
+msgid "enable untracked cache without testing the filesystem"
+msgstr "włącz pamięć o nieśledzonych bez sprawdzania systemu plików"
+
+#: builtin/update-index.c:1063
+msgid "write out the index even if is not flagged as changed"
+msgstr "wypisz indeks, nawet jeśli nie oznaczony jako zmieniony"
+
+#: builtin/update-index.c:1065
+msgid "enable or disable file system monitor"
+msgstr "włącz lub wyłącz monitorowanie systemu plików"
+
+#: builtin/update-index.c:1067
+msgid "mark files as fsmonitor valid"
+msgstr "oznacz pliki jako prawidłowo monitorowane"
+
+#: builtin/update-index.c:1070
+msgid "clear fsmonitor valid bit"
+msgstr "wyczyść bit prawidłowego monitorowania"
+
+#: 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 ""
+"ustawiono core.splitIndex na false; usuń to lub zmień, jeśli rzeczywiście "
+"chcesz włączyć rozdzielony indeks"
+
+#: 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 ""
+"ustawiono core.splitIndex na true; usuń to lub zmień, jeśli rzeczywiście "
+"chcesz wyłączyć rozdzielony indeks"
+
+#: 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 ""
+"ustawiono core.untrackedCache na true; usuń to lub zmień, jeśli rzeczywiście "
+"chcesz wyłączyć pamięć o nieśledzonych"
+
+#: builtin/update-index.c:1198
+msgid "Untracked cache disabled"
+msgstr "wyłączona pamięć o nieśledzonych"
+
+#: 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 ""
+"ustawiono core.untrackedCache na false; usuń to lub zmień, jeśli "
+"rzeczywiście chcesz włączyć pamięć o nieśledzonych"
+
+#: builtin/update-index.c:1210
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "Włączono pamięć nieśledzonych w „%s�"
+
+#: builtin/update-index.c:1218
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+"nie ustawiono core.fsmonitor; ustaw je, jeśli rzeczywiście chcesz włączyć "
+"monitorowanie systemu plików"
+
+#: builtin/update-index.c:1222
+msgid "fsmonitor enabled"
+msgstr "włączone monitorowanie systemu plików"
+
+#: builtin/update-index.c:1225
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"ustawiono core.fsmonitor; usuń je, jeśli rzeczywiście chcesz wyłączyć "
+"monitorowanie systemu plików"
+
+#: builtin/update-index.c:1229
+msgid "fsmonitor disabled"
+msgstr "wyłączone monitorowanie systemu plików"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<opcje>] -d <referencja> [<stara-wartość>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
+msgstr ""
+"git update-ref [<opcje>]    <referencja> <nowa-wartość> [<stara-wartość>]"
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<opcje>] --stdin [-z]"
+
+#: builtin/update-ref.c:500
+msgid "delete the reference"
+msgstr "usuń referencję"
+
+#: builtin/update-ref.c:502
+msgid "update <refname> not the one it points to"
+msgstr "zaktualizuj <referencję>, a nie tę, na którą wskazuje"
+
+#: builtin/update-ref.c:503
+msgid "stdin has NUL-terminated arguments"
+msgstr "wejście ma argumenty rozdzielone NULami"
+
+#: builtin/update-ref.c:504
+msgid "read updates from stdin"
+msgstr "wczytaj aktualizacje ze standardowego wejścia"
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr "git update-server-info [--force]"
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr "zaktualizuj pliki informacji od zera"
+
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<opcje>] <katalog>"
+
+#: builtin/upload-pack.c:23 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:27
+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
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "przerwij przesyłanie po <n> sekundach nieaktywności"
+
+#: builtin/verify-commit.c:19
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <zapis>..."
+
+#: builtin/verify-commit.c:68
+msgid "print commit contents"
+msgstr "wypisz zawartość zapisu"
+
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
+msgstr "wypisz surowe wyjście stanu gpg"
+
+#: builtin/verify-pack.c:59
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paczka>..."
+
+#: builtin/verify-pack.c:70
+msgid "verbose"
+msgstr "gadatliwy"
+
+#: builtin/verify-pack.c:72
+msgid "show statistics only"
+msgstr "pokazuj tylko statystyki"
+
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr "wypisz zawartość tagu"
+
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<opcje>] <ścieżka> [<zapis>]"
+
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<opcje>]"
+
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<opcje>] <ścieżka>"
+
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <drzewo-robocze> <nowa-ścieżka>"
+
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<opcje>]"
+
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<opcje>] <drzewo-robocze>"
+
+#: builtin/worktree.c:24
+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
+#, c-format
+msgid "Removing %s/%s: %s"
+msgstr "Usuwanie %s/%s: %s"
+
+#: builtin/worktree.c:149
+msgid "report pruned working trees"
+msgstr "zgłaszaj przycięte drzewa robocze"
+
+#: builtin/worktree.c:151
+msgid "expire working trees older than <time>"
+msgstr "wygaś drzewa robocze starsze niż <czas>"
+
+#: builtin/worktree.c:221
+#, c-format
+msgid "'%s' already exists"
+msgstr "„%s� już istnieje"
+
+#: builtin/worktree.c:230
+#, c-format
+msgid "unusable worktree destination '%s'"
+msgstr "cel drzewa roboczego „%s� nie nadaje się do użytku"
+
+#: builtin/worktree.c:235
+#, 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� jest brakującym, ale zablokowanym drzewem roboczym;\n"
+"użyj „%s -f -f�, aby wymusić, lub „unlock� i „prune� lub „remove�, aby "
+"wyczyścić"
+
+#: builtin/worktree.c:237
+#, 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� 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
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "nie można utworzyć katalogu „%s�"
+
+#: builtin/worktree.c:422 builtin/worktree.c:428
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "Przygotowywanie drzewa roboczego (nowa gałąź „%s�)"
+
+#: builtin/worktree.c:424
+#, 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
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "Przygotowywanie drzewa roboczego (wybieranie „%s�)"
+
+#: builtin/worktree.c:439
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "Przygotowywanie drzewa roboczego (oddzielone HEAD %s)"
+
+#: builtin/worktree.c:480
+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
+msgid "create a new branch"
+msgstr "utwórz nową gałąź"
+
+#: builtin/worktree.c:485
+msgid "create or reset a branch"
+msgstr "utwórz lub zresetuj gałąź"
+
+#: builtin/worktree.c:487
+msgid "populate the new working tree"
+msgstr "wypełnij nowe drzewo robocze"
+
+#: builtin/worktree.c:488
+msgid "keep the new working tree locked"
+msgstr "pozostaw nowe drzewo robocze zablokowane"
+
+#: builtin/worktree.c:491
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "ustaw tryb śledzenia (zobacz git-branch(1))"
+
+#: builtin/worktree.c:494
+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
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b, -B i --detach siÄ™ wykluczajÄ…"
+
+#: builtin/worktree.c:563
+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
+msgid "show extended annotations and reasons, if available"
+msgstr "pokaż rozszerzone adnotacje i powody, jeśli dostępne"
+
+#: builtin/worktree.c:682
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "oznacz drzewa robocze starsze niż <czas> jako „do przycięcia�"
+
+#: builtin/worktree.c:691
+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
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "„%s� nie jest drzewem roboczym"
+
+#: builtin/worktree.c:732 builtin/worktree.c:765
+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
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "„%s� już jest zablokowany, powód: %s"
+
+#: builtin/worktree.c:739
+#, c-format
+msgid "'%s' is already locked"
+msgstr "„%s� już jest zablokowany"
+
+#: builtin/worktree.c:767
+#, c-format
+msgid "'%s' is not locked"
+msgstr "„%s� nie jest zablokowany"
+
+#: builtin/worktree.c:808
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+"nie można przenosić ani usuwać drzew roboczych zawierających pod-moduły"
+
+#: builtin/worktree.c:816
+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
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "„%s� jest głównym drzewem roboczym"
+
+#: builtin/worktree.c:844
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "nie można uzyskać nazwy celu z „%s�"
+
+#: builtin/worktree.c:857
+#, c-format
+msgid ""
+"cannot move a locked working tree, lock reason: %s\n"
+"use 'move -f -f' to override or unlock first"
+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
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"nie można przenieść zablokowanego drzewa roboczego;\n"
+"użyj „move -f -f�, żeby to wymusić lub najpierw odblokować"
+
+#: builtin/worktree.c:862
+#, 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
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "nie można przenieść „%s� do „%s�"
+
+#: builtin/worktree.c:913
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "nie można wykonać „git status� na „%s�"
+
+#: builtin/worktree.c:917
+#, 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
+#, 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
+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
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+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
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"nie można usunąć zablokowanego drzewa roboczego;\n"
+"użyj „remove -f -f�, żeby to wymusić lub najpierw odblokować"
+
+#: builtin/worktree.c:973
+#, 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
+#, c-format
+msgid "repair: %s: %s"
+msgstr "naprawa: %s: %s"
+
+#: builtin/worktree.c:1000
+#, c-format
+msgid "error: %s: %s"
+msgstr "błąd: %s: %s"
+
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<prefiks>/]"
+
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
+msgstr "<prefiks>/"
+
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "zapisz obiekt drzewa katalogu <prefiks>"
+
+#: builtin/write-tree.c:31
+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"
+"           [--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>]"
+msgstr ""
+"git [--version] [--help] [-C <ścieżka>] [-c <nazwa>=<wartość>]\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"
+"           [--super-prefix=<ścieżka>] [--config-env=<nazwa>=<zmśrod>]\n"
+"           <polecenie> [<argumenty>]"
+
+#: 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"
+"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� wypisują dostępne polecenia gita i "
+"wyjaśnienia\n"
+"niektórych koncepcji.  Zobacz „git help <polecenie>� lub „git help "
+"<pojęcie>�,\n"
+"aby poczytać o konkretnym poleceniu lub pojęciu.\n"
+"W „git help git� znajdziesz przegląd systemu."
+
+#: git.c:188
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "nie podano katalogu do --git-dir\n"
+
+#: git.c:202
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr "nie podano przestrzeni nazw do --namespace\n"
+
+#: git.c:216
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr "nie podano katalogu do --work-tree\n"
+
+#: git.c:230
+#, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "nie podano prefiksu do --super-prefix\n"
+
+#: git.c:252
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c oczekuje łańcucha konfiguracji\n"
+
+#: git.c:292
+#, c-format
+msgid "no directory given for -C\n"
+msgstr "nie podano katalogu do -C\n"
+
+#: git.c:318
+#, c-format
+msgid "unknown option: %s\n"
+msgstr "nieznana opcja: %s\n"
+
+#: git.c:367
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "podczas rozszerzania skrótu „%s�: „%s�"
+
+#: git.c:376
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"skrót „%s� zmienia zmienne środowiska.\n"
+"Aby to zrobić, możesz użyć w skrócie „!git�"
+
+#: git.c:383
+#, c-format
+msgid "empty alias for %s"
+msgstr "pusty skrót dla %s"
+
+#: git.c:386
+#, c-format
+msgid "recursive alias: %s"
+msgstr "rekurencyjny skrót: %s"
+
+#: git.c:468
+msgid "write failure on standard output"
+msgstr "błąd wypisywania na standardowe wyjście"
+
+#: git.c:470
+msgid "unknown write failure on standard output"
+msgstr "nieznany błąd wypisywania na standardowe wyjście"
+
+#: git.c:472
+msgid "close failed on standard output"
+msgstr "nie można zamknąć standardowego wyjścia"
+
+#: git.c:823
+#, 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
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "nie można obsłużyć %s jako polecenia wbudowanego"
+
+#: git.c:886
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"użycie: %s\n"
+"\n"
+
+#: git.c:906
+#, 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
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "nie można wykonać polecenia „%s�: %s\n"
+
+#: http.c:399
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "ujemna wartość http.postbuffer; użycie domyślnej %d"
+
+#: http.c:420
+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:910
+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
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Niewspierany silnik SSL „%s�. Wspierane silniki SSL:"
+
+#: http.c:1139
+#, 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
+#, 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
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"nie można zaktualizować podstawy adresu do przekierowania:\n"
+"  poproszono o: %s\n"
+"    przekierowanie: %s"
+
+#: remote-curl.c:183
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "nieprawidłowe cytowanie w wartości opcji wypchnięcia: „%s�"
+
+#: remote-curl.c:307
+#, 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
+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
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "nieprawidłowa odpowiedź serwera; otrzymano „%s�"
+
+#: remote-curl.c:499
+#, c-format
+msgid "repository '%s' not found"
+msgstr "nie znaleziono repozytorium „%s�"
+
+#: remote-curl.c:503
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Uwierzytelnienie nie powiodło się dla „%s�"
+
+#: remote-curl.c:507
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "brak dostępu do „%s�: %s"
+
+#: remote-curl.c:513
+#, c-format
+msgid "redirecting to %s"
+msgstr "przekierowanie do %s"
+
+#: remote-curl.c:642
+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:724
+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
+#, 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
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: nieoczekiwany pakiet końca odpowiedzi"
+
+#: remote-curl.c:832
+#, c-format
+msgid "RPC failed; %s"
+msgstr "wywołanie RPC nie powiodło się; %s"
+
+#: remote-curl.c:872
+msgid "cannot handle pushes this big"
+msgstr "nie można obsłużyć tak dużych wypchnięć"
+
+#: remote-curl.c:987
+#, 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
+#, 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
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "otrzymano nagłówek długości %d bajtów"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "nadal oczekuję na %d bajtów ciała"
+
+#: remote-curl.c:1132
+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
+msgid "fetch failed."
+msgstr "pobieranie nie powiodło się."
+
+#: remote-curl.c:1193
+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
+#, 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
+#, c-format
+msgid "http transport does not support %s"
+msgstr "transport http nie wspiera %s"
+
+#: remote-curl.c:1291
+msgid "git-http-push failed"
+msgstr "git-http-push nie powiodło się"
+
+#: remote-curl.c:1479
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: użycie: git remote-curl <zdalne-repozytorium> [<adres>]"
+
+#: remote-curl.c:1511
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: błąd odczytu strumienia poleceń od gita"
+
+#: remote-curl.c:1518
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: próba pobrania bez lokalnego repozytorium"
+
+#: remote-curl.c:1559
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: nieznane polecenie „%s� z gita"
+
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "brak dostępnych informacji o kompilatorze\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "brak dostępnych informacji o bibliotece standardowej\n"
+
+#: list-objects-filter-options.h:91
+msgid "args"
+msgstr "argumenty"
+
+#: list-objects-filter-options.h:92
+msgid "object filtering"
+msgstr "filtrowanie obiektów"
+
+#: parse-options.h:183
+msgid "expiry-date"
+msgstr "data wygaśnięcia"
+
+#: parse-options.h:197
+msgid "no-op (backward compatibility)"
+msgstr "nic nie robi (kompatybilność wsteczna)"
+
+#: parse-options.h:309
+msgid "be more verbose"
+msgstr "więcej komunikatów"
+
+#: parse-options.h:311
+msgid "be more quiet"
+msgstr "mniej komunikatów"
+
+#: parse-options.h:317
+msgid "use <n> digits to display object names"
+msgstr "użyj <n> cyfr, aby wyświetlić nazwy obiektów"
+
+#: parse-options.h:336
+msgid "how to strip spaces and #comments from message"
+msgstr "jak usuwać odstępy i #komentarze z komunikatu"
+
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr "wczytaj ścieżki z pliku"
+
+#: parse-options.h:338
+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
+msgid "key"
+msgstr "klucz"
+
+#: ref-filter.h:99
+msgid "field name to sort on"
+msgstr "nazwa pola, według którego należy posortować"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"jeśli to możliwe, zaktualizuj indeks używając ponownie starych rozwiązań "
+"konfliktów"
+
+#: command-list.h:50
+msgid "Add file contents to the index"
+msgstr "Dodaj zawartość pliku do indeksu"
+
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr "Zastosuj seriÄ™ Å‚atek ze skrzynki pocztowej"
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr "Dodaj przypisy do wierszy pliku z informacjami o zapisach"
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr "Zastosuj łatkę do plików i/lub indeksu"
+
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr "Zaimportuj repozytorium GNU Arch do Gita"
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr "Utwórz archiwum plików z nazwanego drzewa"
+
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "Użyj wyszukiwania binarnego, aby znaleźć zapis, który wprowadził błędy"
+
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr "Obwiń, kto i w jakiej rewizji ostatnio zmienił każdy wiersz pliku"
+
+#: command-list.h:58
+msgid "List, create, or delete branches"
+msgstr "Wypisz, utwórz lub usuń gałęzie"
+
+#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "Zbierz za użytkownika informacje, żeby zgłosić błąd"
+
+#: command-list.h:60
+msgid "Move objects and refs by archive"
+msgstr "PrzenoÅ› obiekty i referencje po archiwach"
+
+#: command-list.h:61
+msgid "Provide content or type and size information for repository objects"
+msgstr ""
+"Dostarcz informacje o zawartości lub rodzaju i rozmiarze obiektów "
+"repozytorium"
+
+#: command-list.h:62
+msgid "Display gitattributes information"
+msgstr "Wypisz informacje gitattributes"
+
+#: command-list.h:63
+msgid "Debug gitignore / exclude files"
+msgstr "Diagnozuj pliki pomijania gitignore / exclude"
+
+#: command-list.h:64
+msgid "Show canonical names and email addresses of contacts"
+msgstr "Pokaż kanoniczne nazwy i adresy e-mail kontaktów"
+
+#: command-list.h:65
+msgid "Switch branches or restore working tree files"
+msgstr "Przełącz gałąź lub przywróć pliki drzewa roboczego"
+
+#: command-list.h:66
+msgid "Copy files from the index to the working tree"
+msgstr "Skopiuj pliki z indeksu do drzewa roboczego"
+
+#: command-list.h:67
+msgid "Ensures that a reference name is well formed"
+msgstr "Zapewnia, że nazwa referencji jest prawidłowa"
+
+#: command-list.h:68
+msgid "Find commits yet to be applied to upstream"
+msgstr "Znajdź zapisy jeszcze do zastosowania w górnym biegu"
+
+#: command-list.h:69
+msgid "Apply the changes introduced by some existing commits"
+msgstr "Zastosuj zmiany wprowadzone niektórymi istniejącymi zapisami"
+
+#: command-list.h:70
+msgid "Graphical alternative to git-commit"
+msgstr "Graficzna alternatywa git-commit"
+
+#: command-list.h:71
+msgid "Remove untracked files from the working tree"
+msgstr "Usuń nieśledzone pliki z drzewa roboczego"
+
+#: command-list.h:72
+msgid "Clone a repository into a new directory"
+msgstr "Sklonuj repozytorium do nowego katalogu"
+
+#: command-list.h:73
+msgid "Display data in columns"
+msgstr "Wyświetl dane w kolumnach"
+
+#: command-list.h:74
+msgid "Record changes to the repository"
+msgstr "Zapisz zmiany w repozytorium"
+
+#: command-list.h:75
+msgid "Write and verify Git commit-graph files"
+msgstr "Zapisz i zweryfikuj pliki grafu zapisów Gita"
+
+#: command-list.h:76
+msgid "Create a new commit object"
+msgstr "Utwórz nowy obiekt zapisu"
+
+#: command-list.h:77
+msgid "Get and set repository or global options"
+msgstr "Podaj lub ustaw opcje repozytorium lub globalne"
+
+#: command-list.h:78
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "Zlicz rozpakowane obiekty i ich zużycie dysku"
+
+#: command-list.h:79
+msgid "Retrieve and store user credentials"
+msgstr "Uzyskaj i przechowaj poświadczenia użytkownika"
+
+#: command-list.h:80
+msgid "Helper to temporarily store passwords in memory"
+msgstr "Pomocnik do tymczasowego przechowania haseł w pamięci"
+
+#: command-list.h:81
+msgid "Helper to store credentials on disk"
+msgstr "Pomocnik do przechowania poświadczeń na dysku"
+
+#: command-list.h:82
+msgid "Export a single commit to a CVS checkout"
+msgstr "Wyeksportuj pojedynczy zapis do poboru CVS"
+
+#: command-list.h:83
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr ""
+"Ocal swoje dane przed innym systemem kontroli wersji, który ludzie "
+"uwielbiają nienawidzić"
+
+#: command-list.h:84
+msgid "A CVS server emulator for Git"
+msgstr "Emulator serwera CVS w Gicie"
+
+#: command-list.h:85
+msgid "A really simple server for Git repositories"
+msgstr "Naprawdę prosty serwer do repozytoriów Gita"
+
+#: command-list.h:86
+msgid "Give an object a human readable name based on an available ref"
+msgstr ""
+"Nadaj obiektowi nazwę czytelną dla człowieka opartą o dostępną referencję"
+
+#: command-list.h:87
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "Pokaż zmiany pomiędzy zapisami, zapisem i drzewem roboczym itp."
+
+#: command-list.h:88
+msgid "Compares files in the working tree and the index"
+msgstr "Porównuje pliki w drzewie roboczym i indeksie"
+
+#: command-list.h:89
+msgid "Compare a tree to the working tree or index"
+msgstr "Porównaj drzewo do drzewa roboczego lub indeksu"
+
+#: command-list.h:90
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+"Porównuje zawartość i tryb blobów znalezionych przez dwa obiekty drzewa"
+
+#: command-list.h:91
+msgid "Show changes using common diff tools"
+msgstr "Pokaż zmiany używając zwykłych narzędzi różnic"
+
+#: command-list.h:92
+msgid "Git data exporter"
+msgstr "Eksporter danych Gita"
+
+#: command-list.h:93
+msgid "Backend for fast Git data importers"
+msgstr "Silnik dla szybkich importerów danych Gita"
+
+#: command-list.h:94
+msgid "Download objects and refs from another repository"
+msgstr "Pobierz obiekty i referencje z innego repozytorium"
+
+#: command-list.h:95
+msgid "Receive missing objects from another repository"
+msgstr "Odbierz brakujÄ…ce obiekty z innego repozytorium"
+
+#: command-list.h:96
+msgid "Rewrite branches"
+msgstr "Przerób gałęzie"
+
+#: command-list.h:97
+msgid "Produce a merge commit message"
+msgstr "Wytwórz komunikat zapisu scalenia"
+
+#: command-list.h:98
+msgid "Output information on each ref"
+msgstr "Wypisz informacje o każdej referencji"
+
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "Wykonaj polecenie Gita na liście repozytoriów"
+
+#: command-list.h:100
+msgid "Prepare patches for e-mail submission"
+msgstr "Przygotuj łatki do wysłania pocztą e-mail"
+
+#: command-list.h:101
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr "Sprawdza spójność i poprawność obiektów w bazie danych"
+
+#: command-list.h:102
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "Wyczyść niepotrzebne pliki i zoptymalizuj lokalne repozytorium"
+
+#: command-list.h:103
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "Wydobądź identyfikator zapisu z archiwum utworzonego z git-archive"
+
+#: command-list.h:104
+msgid "Print lines matching a pattern"
+msgstr "Wypisz wiersze pasujÄ…ce do wzorca"
+
+#: command-list.h:105
+msgid "A portable graphical interface to Git"
+msgstr "Przenośny interfejs graficzny do Gita"
+
+#: command-list.h:106
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr "Oblicz identyfikator obiektu i opcjonalnie utwórz blob z pliku"
+
+#: command-list.h:107
+msgid "Display help information about Git"
+msgstr "Wyświetl pomocne informacje o Gicie"
+
+#: command-list.h:108
+msgid "Server side implementation of Git over HTTP"
+msgstr "Implementacja Gita po HTTP po stronie serwera"
+
+#: command-list.h:109
+msgid "Download from a remote Git repository via HTTP"
+msgstr "Pobierz obiekty ze zdalnego repozytorium przez HTTP"
+
+#: command-list.h:110
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Wypchnij obiekty po HTTP/DAV do innego repozytorium"
+
+#: command-list.h:111
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "Wyślij zbiór łatek ze standardowego wejścia do katalogu IMAP"
+
+#: command-list.h:112
+msgid "Build pack index file for an existing packed archive"
+msgstr "Zbuduj plik indeksu paczki istniejÄ…cemu spakowanemu archiwum"
+
+#: command-list.h:113
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "Utwórz puste repozytorium Gita lub przeinicjuj istniejące"
+
+#: command-list.h:114
+msgid "Instantly browse your working repository in gitweb"
+msgstr "PrzeglÄ…daj na miejscu swoje robocze repozytorium w gitweb"
+
+#: command-list.h:115
+msgid "Add or parse structured information in commit messages"
+msgstr "Dodaj lub przetwórz ustrukturyzowane informacje z komunikatów zapisów"
+
+#: command-list.h:116
+msgid "The Git repository browser"
+msgstr "PrzeglÄ…darka repozytorium Gita"
+
+#: command-list.h:117
+msgid "Show commit logs"
+msgstr "Pokaż dziennik zapisów"
+
+#: command-list.h:118
+msgid "Show information about files in the index and the working tree"
+msgstr "Pokaż informacje o plikach w indeksie i drzewie roboczym"
+
+#: command-list.h:119
+msgid "List references in a remote repository"
+msgstr "Wypisz referencje w zdalnym repozytorium"
+
+#: command-list.h:120
+msgid "List the contents of a tree object"
+msgstr "Wypisz zawartość obiektu drzewa"
+
+#: command-list.h:121
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "Wydobądź łatkę i autorstwo z pojedynczego listu e-mail"
+
+#: command-list.h:122
+msgid "Simple UNIX mbox splitter program"
+msgstr "Prosty program do dzielenia Uniksowej skrzynki mbox"
+
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Wykonuj zadania, by zoptymalizować dane repozytorium Gita"
+
+#: command-list.h:124
+msgid "Join two or more development histories together"
+msgstr "Połącz ze sobą dwie lub więcej historii rozwoju"
+
+#: command-list.h:125
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "Znajdź najlepszych możliwych przodków scalenia"
+
+#: command-list.h:126
+msgid "Run a three-way file merge"
+msgstr "Wykonaj trójstronne scalenie pliku"
+
+#: command-list.h:127
+msgid "Run a merge for files needing merging"
+msgstr "Wykonaj scalenie w plikach wymagajÄ…cych scalenia"
+
+#: command-list.h:128
+msgid "The standard helper program to use with git-merge-index"
+msgstr "Standardowy program pomocniczy do użycia z git-merge-index"
+
+#: command-list.h:129
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
+"Uruchom narzędzia do rozwiązywania konfliktów, aby rozwiązać konflikty "
+"scalania"
+
+#: command-list.h:130
+msgid "Show three-way merge without touching index"
+msgstr "Pokaż trójstronne scalenie bez dotykania indeksu"
+
+#: command-list.h:131
+msgid "Write and verify multi-pack-indexes"
+msgstr "Wypisz i sprawdź indeksy multi-pack"
+
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "Tworzy obiekt tagu z dodatkowymi sprawdzeniami"
+
+#: command-list.h:133
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "Zbuduj obiekt drzewa z tekstu sformatowanego jak ls-tree"
+
+#: command-list.h:134
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "Przenieś plik, katalog lub dowiązanie albo zmień jego nazwę"
+
+#: command-list.h:135
+msgid "Find symbolic names for given revs"
+msgstr "Znajdź nazwy symboliczne dla podanych rewizji"
+
+#: command-list.h:136
+msgid "Add or inspect object notes"
+msgstr "Dodaj lub zbadaj uwagi do obiektów"
+
+#: command-list.h:137
+msgid "Import from and submit to Perforce repositories"
+msgstr "Importuj z repozytoriów Perforce i przesyłaj do nich"
+
+#: command-list.h:138
+msgid "Create a packed archive of objects"
+msgstr "Utwórz spakowane archiwum obiektów"
+
+#: command-list.h:139
+msgid "Find redundant pack files"
+msgstr "Znajdź zbędne pliki paczek"
+
+#: command-list.h:140
+msgid "Pack heads and tags for efficient repository access"
+msgstr "Spakuj czoła i tagi do wydajnego dostępu do repozytorium"
+
+#: command-list.h:141
+msgid "Compute unique ID for a patch"
+msgstr "Oblicz unikatowy identyfikator Å‚atki"
+
+#: command-list.h:142
+msgid "Prune all unreachable objects from the object database"
+msgstr "Przytnij wszystkie nieosiągalne obiekty z bazy danych obiektów"
+
+#: command-list.h:143
+msgid "Remove extra objects that are already in pack files"
+msgstr "Usuń dodatkowe obiekty, które już są w plikach paczek"
+
+#: command-list.h:144
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "Pobierz i zintegruj zmiany z innego repozytorium lub lokalnej gałęzi"
+
+#: command-list.h:145
+msgid "Update remote refs along with associated objects"
+msgstr "Zaktualizuj zdalne referencje razem z przypisanymi obiektami"
+
+#: command-list.h:146
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Stosuje zestaw łatek quilta na bieżącą gałąź"
+
+#: command-list.h:147
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "Porównaj dwa zakresy zapisów (np. dwie wersje gałęzi)"
+
+#: command-list.h:148
+msgid "Reads tree information into the index"
+msgstr "Wczytuje informacje o drzewie do indeksu"
+
+#: command-list.h:149
+msgid "Reapply commits on top of another base tip"
+msgstr "Ponownie zastosuj zapisy na czubku innej gałęzi"
+
+#: command-list.h:150
+msgid "Receive what is pushed into the repository"
+msgstr "Odbierz to, co zostało wypchnięte do repozytorium"
+
+#: command-list.h:151
+msgid "Manage reflog information"
+msgstr "ZarzÄ…dzaj informacjami o dzienniku referencji"
+
+#: command-list.h:152
+msgid "Manage set of tracked repositories"
+msgstr "Zarządzaj zestawem śledzonych repozytoriów"
+
+#: command-list.h:153
+msgid "Pack unpacked objects in a repository"
+msgstr "Spakuj rozpakowane obiekty w repozytorium"
+
+#: command-list.h:154
+msgid "Create, list, delete refs to replace objects"
+msgstr "Utwórz, wypisz, usuń referencje do obiektów zamiennych"
+
+#: command-list.h:155
+msgid "Generates a summary of pending changes"
+msgstr "Generuje podsumowanie trwajÄ…cych zmian"
+
+#: command-list.h:156
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "Użyj ponownie zapisanego rozwiązania skonfliktowanych scaleń"
+
+#: command-list.h:157
+msgid "Reset current HEAD to the specified state"
+msgstr "Zresetuj bieżący HEAD do podanego stanu"
+
+#: command-list.h:158
+msgid "Restore working tree files"
+msgstr "Przywróć pliki drzewa roboczego"
+
+#: command-list.h:159
+msgid "Revert some existing commits"
+msgstr "Odwróć niektóre istniejące zapisy"
+
+#: command-list.h:160
+msgid "Lists commit objects in reverse chronological order"
+msgstr "Wypisz zapisy w odwrotnej kolejności chronologicznej"
+
+#: command-list.h:161
+msgid "Pick out and massage parameters"
+msgstr "Dobierz i wymasuj parametry"
+
+#: command-list.h:162
+msgid "Remove files from the working tree and from the index"
+msgstr "Usuń pliki z drzewa roboczego i z indeksu"
+
+#: command-list.h:163
+msgid "Send a collection of patches as emails"
+msgstr "Wyślij zbiór łatek jako e-mail"
+
+#: command-list.h:164
+msgid "Push objects over Git protocol to another repository"
+msgstr "Wypchnij obiekty po protokole Gita do innego repozytorium"
+
+#: command-list.h:165
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "Ograniczona powłoka logowania do dostępu przez SSH tylko do Gita"
+
+#: command-list.h:166
+msgid "Summarize 'git log' output"
+msgstr "Podsumuj wyjście „git log�"
+
+#: command-list.h:167
+msgid "Show various types of objects"
+msgstr "Pokazuj różne typy obiektów"
+
+#: command-list.h:168
+msgid "Show branches and their commits"
+msgstr "Pokaż gałęzie i ich zapisy"
+
+#: command-list.h:169
+msgid "Show packed archive index"
+msgstr "Pokaż indeks spakowanych archiwów"
+
+#: command-list.h:170
+msgid "List references in a local repository"
+msgstr "Wypisz referencje w lokalnym repozytorium"
+
+#: command-list.h:171
+msgid "Git's i18n setup code for shell scripts"
+msgstr "Kod międzynarodowy Gita w skryptach powłoki"
+
+#: command-list.h:172
+msgid "Common Git shell script setup code"
+msgstr "Wspólny kod przygotowania Gita w skryptach powłoki"
+
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Inicjuj i zmieniaj rzadkie wybranie"
+
+#: command-list.h:174
+msgid "Stash the changes in a dirty working directory away"
+msgstr "PrzenieÅ› do schowka zmiany z brudnego drzewa roboczego"
+
+#: command-list.h:175
+msgid "Add file contents to the staging area"
+msgstr "Dodaj zawartość pliku do obszaru przygotowania"
+
+#: command-list.h:176
+msgid "Show the working tree status"
+msgstr "Pokaż stan drzewa roboczego"
+
+#: command-list.h:177
+msgid "Remove unnecessary whitespace"
+msgstr "Usuń niepotrzebne białe znaki"
+
+#: command-list.h:178
+msgid "Initialize, update or inspect submodules"
+msgstr "Zainicjuj, zaktualizuj lub zbadaj pod-moduły"
+
+#: command-list.h:179
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Dwukierunkowa operacja między repozytorium Subversion i Gita"
+
+#: command-list.h:180
+msgid "Switch branches"
+msgstr "Przełączaj gałęzie"
+
+#: command-list.h:181
+msgid "Read, modify and delete symbolic refs"
+msgstr "Czytaj, zmieniaj lub kasuj referencje symboliczne"
+
+#: command-list.h:182
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr "Utwórz, wypisz, usuń lub zweryfikuj obiekt tagu podpisany GPG"
+
+#: command-list.h:183
+msgid "Creates a temporary file with a blob's contents"
+msgstr "Utwórz tymczasowy plik z zawartością blobu"
+
+#: command-list.h:184
+msgid "Unpack objects from a packed archive"
+msgstr "Rozpakuj obiekty ze spakowanego archiwum"
+
+#: command-list.h:185
+msgid "Register file contents in the working tree to the index"
+msgstr "Zarejestruj zawartość pliku z drzewa roboczego w indeksie"
+
+#: command-list.h:186
+msgid "Update the object name stored in a ref safely"
+msgstr "Zaktualizuj bezpiecznie nazwÄ™ obiektu zapisanÄ… w referencji"
+
+#: command-list.h:187
+msgid "Update auxiliary info file to help dumb servers"
+msgstr "Zaktualizuj pomocnicze informacje, aby pomóc tępym serwerom"
+
+#: command-list.h:188
+msgid "Send archive back to git-archive"
+msgstr "Wyślij archiwum z powrotem do git-archive"
+
+#: command-list.h:189
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Wyślij spakowane obiekty z powrotem do git-fetch-pack"
+
+#: command-list.h:190
+msgid "Show a Git logical variable"
+msgstr "Pokaż logiczną zmienną Gita"
+
+#: command-list.h:191
+msgid "Check the GPG signature of commits"
+msgstr "Sprawdź podpisy GPG zapisów"
+
+#: command-list.h:192
+msgid "Validate packed Git archive files"
+msgstr "Sprawdź spakowane pliki archiwów Gita"
+
+#: command-list.h:193
+msgid "Check the GPG signature of tags"
+msgstr "Sprawdź podpisy GPG tagów"
+
+#: command-list.h:194
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interfejs www Gita (przeglÄ…darkowy wglÄ…d w repozytoria Gita)"
+
+#: command-list.h:195
+msgid "Show logs with difference each commit introduces"
+msgstr "Pokaż dzienniki z różnicami, które wprowadza każdy zapis"
+
+#: command-list.h:196
+msgid "Manage multiple working trees"
+msgstr "ZarzÄ…dzaj wieloma drzewami roboczymi"
+
+#: command-list.h:197
+msgid "Create a tree object from the current index"
+msgstr "Utwórz obiekt drzewa z bieżącego indeksu"
+
+#: command-list.h:198
+msgid "Defining attributes per path"
+msgstr "Definiowanie atrybutów ścieżek"
+
+#: command-list.h:199
+msgid "Git command-line interface and conventions"
+msgstr "Interfejs wiersza poleceń i konwencje Gita"
+
+#: command-list.h:200
+msgid "A Git core tutorial for developers"
+msgstr "Samouczek podstaw Gita dla deweloperów"
+
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Podawanie Gitowi nazw użytkownika i haseł"
+
+#: command-list.h:202
+msgid "Git for CVS users"
+msgstr "Git dla użytkowników CVS"
+
+#: command-list.h:203
+msgid "Tweaking diff output"
+msgstr "Dostrajanie wyjścia różnic"
+
+#: command-list.h:204
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "Użyteczny podstawowy zbiór poleceń do Codziennego Gita"
+
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Często zadawane pytania o użyciu Gita"
+
+#: command-list.h:206
+msgid "A Git Glossary"
+msgstr "SÅ‚owniczek Gita"
+
+#: command-list.h:207
+msgid "Hooks used by Git"
+msgstr "Skrypty używane przez Gita"
+
+#: command-list.h:208
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "Podaje celowo nieśledzone pliki do pomijania"
+
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
+"Przypisz nazwiska autorów/składających i/lub ich adresy poczty elektronicznej"
+
+#: command-list.h:210
+msgid "Defining submodule properties"
+msgstr "Definiowanie właściwości pod-modułów"
+
+#: command-list.h:211
+msgid "Git namespaces"
+msgstr "Przestrzenie nazw Gita"
+
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Pomocnicze programy do interakcji ze zdalnymi repozytoriami"
+
+#: command-list.h:213
+msgid "Git Repository Layout"
+msgstr "Układ repozytorium Gita"
+
+#: command-list.h:214
+msgid "Specifying revisions and ranges for Git"
+msgstr "Podawanie Gitowi rewizji i zakresów"
+
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "Montowanie jednego repozytorium w drugim"
+
+#: command-list.h:216
+msgid "A tutorial introduction to Git: part two"
+msgstr "Samouczek wprowadzenia do Gita: część druga"
+
+#: command-list.h:217
+msgid "A tutorial introduction to Git"
+msgstr "Samouczek wprowadzenia do Gita"
+
+#: command-list.h:218
+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 "
+"merge"
+msgstr "Błąd: Scalenie nadpisałoby lokalne zmiany w następujących plikach"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "Automatyczne scalenie nie zadziałało."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr "Nie powinna się robić ośmiornica."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "Nie znaleziono wspólnego zapisu z $pretty_name"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "Już aktualne z $pretty_name"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Przewijanie do: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Próba prostego scalenia z $pretty_name"
+
+#: git-merge-octopus.sh:102
+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
+#, 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
+#, 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
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+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
+#, 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"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "użycie: $dashless $USAGE"
+
+#: git-sh-setup.sh:191
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+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."
+
+#: 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
+#, 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
+#, 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
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Dodatkowo, twój indeks zawiera niezłożone zmiany."
+
+#: git-sh-setup.sh:373
+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
+msgid "Unable to determine absolute path of git directory"
+msgstr "Nie można określić bezwzględnej ścieżki katalogu gita"
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:212
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%20s %20s %s"
+
+#: git-add--interactive.perl:632
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "dotknięto %d ścieżkę\n"
+msgstr[1] "dotknięto %d ścieżki\n"
+msgstr[2] "dotknięto %d ścieżek\n"
+
+#: git-add--interactive.perl:1056
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast\n"
+"oznaczony do przygotowania."
+
+#: git-add--interactive.perl:1059
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast\n"
+"oznaczony do dodania do schowka."
+
+#: git-add--interactive.perl:1062
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast\n"
+"oznaczony do wycofania."
+
+#: 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."
+msgstr ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast\n"
+"oznaczony do zastosowania."
+
+#: 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."
+msgstr ""
+"Jeśli łatka stosuje się gładko, zmieniony skrawek zostanie natychmiast\n"
+"oznaczony do odrzucenia."
+
+#: git-add--interactive.perl:1114
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "nie można otworzyć do zapisu pliku edycji skrawka: %s"
+
+#: git-add--interactive.perl:1121
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"Aby usunąć wiersze „%s�, oznacz je jako wiersze „ � lines (kontekst).\n"
+"Aby usunąć wiersze „%s�, usuń je.\n"
+"Wiersze zaczynające się od %s zostaną usunięte.\n"
+
+#: git-add--interactive.perl:1143
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "nie można otworzyć do odczytu pliku edycji skrawka: %s"
+
+#: git-add--interactive.perl:1251
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - przygotuj ten skrawek\n"
+"n - nie przygotowuj tego skrawka\n"
+"q - wyjdź; nie przygotowuj tego skrawka, ani żadnych kolejnych\n"
+"a - przygotuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie przygotowuj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1257
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - dodaj ten skrawek do schowka\n"
+"n - nie dodawaj tego skrawka do schowka\n"
+"q - wyjdź; nie dodawaj tego skrawka, ani żadnych kolejnych\n"
+"a - dodaj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie dodawaj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1263
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - wycofaj ten skrawek\n"
+"n - nie wycofuj tego skrawka\n"
+"q - wyjdź; nie wycofuj tego skrawka, ani żadnych kolejnych\n"
+"a - wycofaj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie wycofuj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1269
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - zastosuj ten skrawek do indeksu\n"
+"n - nie stosuj tego skrawka do indeksu\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - odrzuć ten skrawek z drzewa roboczego\n"
+"n - nie odrzucaj tego skrawka z drzewa roboczego\n"
+"q - wyjdź; nie odrzucaj tego skrawka, ani żadnych pozostałych\n"
+"a - odrzuć ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie odrzucaj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1281
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - odrzuć ten skrawek z indeksu i drzewa roboczego\n"
+"n - nie odrzucaj tego skrawka z indeksu i drzewa roboczego\n"
+"q - wyjdź; nie odrzucaj tego skrawka, ani żadnych pozostałych\n"
+"a - odrzuć ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie odrzucaj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1287
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - zastosuj ten skrawek do indeksu i drzewa roboczego\n"
+"n - nie stosuj tego skrawka do indeksu i drzewa roboczego\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1299
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - zastosuj ten skrawek do drzewa roboczego\n"
+"n - nie stosuj tego skrawka do drzewa roboczego\n"
+"q - wyjdź; nie stosuj tego skrawka, ani żadnych kolejnych\n"
+"a - zastosuj ten skrawek i wszystkie kolejne w tym pliku\n"
+"d - nie stosuj tego skrawka ani żadnych kolejnych w tym pliku"
+
+#: git-add--interactive.perl:1314
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - wybierz skrawek, to którego przejść\n"
+"/ - wyszukaj skrawek pasujący do podanego wyrażenia regularnego\n"
+"j - pozostaw ten skrawek nierozstrzygniętym, zobacz następny "
+"nierozstrzygnięty skrawek\n"
+"J - pozostaw ten skrawek nierozstrzygniętym, zobacz następny skrawek\n"
+"k - pozostaw ten skrawek nierozstrzygniętym, zobacz poprzedni "
+"nierozstrzygnięty skrawek\n"
+"K - pozostaw ten skrawek nierozstrzygniętym, zobacz poprzedni skrawek\n"
+"s - podziel ten skrawek na mniejsze\n"
+"e - ręcznie zmień bieżący skrawek\n"
+"? - wypisz pomoc\n"
+
+#: git-add--interactive.perl:1345
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "Wybrane skrawki nie stosujÄ… siÄ™ do indeksu!\n"
+
+#: git-add--interactive.perl:1360
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "pomijanie niescalonego: %s\n"
+
+#: git-add--interactive.perl:1479
+#, perl-format
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować zmianę trybu do drzewa roboczego [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 "Zastosować usunięcie do drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1481
+#, perl-format
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr "Zastosować dodanie do drzewa roboczego [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 "Zastosować ten skrawek do drzewa roboczego [y,n,q,a,d%s,?]? "
+
+#: git-add--interactive.perl:1599
+msgid "No other hunks to goto\n"
+msgstr "Nie ma innych skrawków do przejścia\n"
+
+#: git-add--interactive.perl:1617
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "Nieprawidłowa liczba: „%s�\n"
+
+#: git-add--interactive.perl:1622
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] "Niestety dostępny jest tylko %d skrawek.\n"
+msgstr[1] "Niestety dostępne są tylko %d skrawki.\n"
+msgstr[2] "Niestety dostępnych jest tylko %d skrawków.\n"
+
+#: git-add--interactive.perl:1657
+msgid "No other hunks to search\n"
+msgstr "Nie ma innych skrawków do wyszukania\n"
+
+#: git-add--interactive.perl:1674
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "Nieprawidłowe wyrażenie regularne %s: %s\n"
+
+#: git-add--interactive.perl:1684
+msgid "No hunk matches the given pattern\n"
+msgstr "Żaden skrawek nie pasuje do podanego wzorca\n"
+
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+msgid "No previous hunk\n"
+msgstr "Nie ma poprzedniego skrawka\n"
+
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+msgid "No next hunk\n"
+msgstr "Nie ma następnego skrawka\n"
+
+#: git-add--interactive.perl:1730
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Niestety nie można podzielić tego skrawka\n"
+
+#: git-add--interactive.perl:1736
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] "Podzielono na %d skrawek.\n"
+msgstr[1] "Podzielono na %d skrawki.\n"
+msgstr[2] "Podzielono na %d skrawków.\n"
+
+#: git-add--interactive.perl:1746
+msgid "Sorry, cannot edit this hunk\n"
+msgstr "Niestety nie można zmienić tego skrawka\n"
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1811
+msgid ""
+"status        - show paths with changes\n"
+"update        - add working tree state to the staged set of changes\n"
+"revert        - revert staged set of changes back to the HEAD version\n"
+"patch         - pick hunks and update selectively\n"
+"diff          - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+"status        - pokaż ścieżki ze zmianami\n"
+"update        - dodaj stan drzewa roboczego do przygotowanego zestawu zmian\n"
+"revert        - przywróć przygotowany zestaw zmian z powrotem do wersji "
+"HEAD\n"
+"patch         - wybierz skrawki i zaktualizuj wybiórczo\n"
+"diff          - pokaż różnice między HEAD i indeksem\n"
+"add untracked - dodaj zawartość nieśledzonych plików do przygotowanego "
+"zestawu zmian\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
+msgid "missing --"
+msgstr "brakujÄ…ce --"
+
+#: git-add--interactive.perl:1866
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "nieznany tryb --patch: %s"
+
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "nieprawidłowy argument %s, oczekiwano --"
+
+#: git-send-email.perl:138
+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
+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
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "edytor nie wyszedł gładko, przerywanie wszystkiego"
+
+#: git-send-email.perl:312
+#, 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
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "„%s.final� zawiera napisany list e-mail.\n"
+
+#: git-send-email.perl:410
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases i inne opcje siÄ™ wykluczajÄ…\n"
+
+#: git-send-email.perl:484
+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 ""
+"błąd krytyczny: znaleziono opcje konfiguracji do „sendmail�\n"
+"git-send-email jest skonfigurowany z opcjami sendemail.* — uwaga na „e�.\n"
+"Ustaw sendemail.forbidSendmailVariables na false, aby wyłączyć to "
+"sprawdzenie.\n"
+
+#: git-send-email.perl:489 git-send-email.perl:691
+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
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"„batch-size� i „relogin� muszą być podane razem (z wiersza poleceń lub opcji "
+"konfiguracji)\n"
+
+#: git-send-email.perl:505
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "Nieznane pole --suppress-cc: „%s�\n"
+
+#: git-send-email.perl:536
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Nieznane ustawienie --confirm: „%s�\n"
+
+#: git-send-email.perl:564
+#, 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
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "ostrzeżenie: „:include:� niewspierane: %s\n"
+
+#: git-send-email.perl:568
+#, 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
+#, 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
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for.  Please disambiguate by...\n"
+"\n"
+"    * Saying \"./%s\" if you mean a file; or\n"
+"    * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"Plik „%s� istnieje, ale to mógłby być też zakres zapisów,\n"
+"do wytworzenia Å‚atek.  Ujednoznacznij...\n"
+"\n"
+"    * 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
+#, 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
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"Nie podano plików łatek!\n"
+"\n"
+
+#: git-send-email.perl:726
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "Brak wiersza tematu w %s?"
+
+#: git-send-email.perl:736
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "Nie można otworzyć %s do zapisu: %s"
+
+#: git-send-email.perl:747
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+"Wiersze zaczynające się od „GIT:� zostaną usunięte.\n"
+"Rozważ uwzględnienie ogólnych statystyk różnic lub spisu treści\n"
+"w łatce, którą piszesz.\n"
+"\n"
+"Wyczyść zawartość treści, jeśli chcesz wysłać podsumowanie.\n"
+
+#: git-send-email.perl:771
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "Nie można otworzyć %s: %s"
+
+#: git-send-email.perl:788
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Nie można otworzyć %s.final: %s"
+
+#: git-send-email.perl:831
+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
+#, 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
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Następujące pliki są ośmiobitowe, ale nie deklarują kodowania Content-"
+"Transfer-Encoding.\n"
+
+#: git-send-email.perl:926
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "Jakie ośmiobitowe kodowanie zadeklarować [UTF-8]? "
+
+#: git-send-email.perl:934
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+"Odmawiam wysłania, bo łatka\n"
+"\t%s\n"
+"ma temat z szablonu „*** SUBJECT HERE ***�. Przekaż --force, jeśli naprawdę "
+"chcesz to wysłać.\n"
+
+#: git-send-email.perl:953
+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
+#, 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
+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
+#, 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"
+
+#. 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
+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
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "ścieżka CA „%s� nie istnieje"
+
+#: git-send-email.perl:1453
+msgid ""
+"    The Cc list above has been expanded by additional\n"
+"    addresses found in the patch commit message. By default\n"
+"    send-email prompts before sending whenever this occurs.\n"
+"    This behavior is controlled by the sendemail.confirm\n"
+"    configuration setting.\n"
+"\n"
+"    For additional information, run 'git send-email --help'.\n"
+"    To retain the current behavior, but squelch this message,\n"
+"    run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+"    Lista DW powyżej została poszerzona o dodatkowe\n"
+"    adresy znalezione w komunikacie zapisu łatki. Domyślnie\n"
+"    send-email pyta przed wysłaniem, kiedy to się dzieje.\n"
+"    To zachowanie jest sterowane przez ustawienie\n"
+"    sendemail.confirm.\n"
+"\n"
+"    Więcej informacji w „git send-email --help�.\n"
+"    Aby zachować obecne zachowanie, ale uciszyć ten komunikat,\n"
+"    wykonaj „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:1468
+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
+msgid "Send this email reply required"
+msgstr "Wyślij ten list e-mail z wymaganą odpowiedzią"
+
+#: git-send-email.perl:1499
+msgid "The required SMTP server is not properly defined."
+msgstr "Wymagany serwer SMTP nie jest prawidłowo zdefiniowany."
+
+#: git-send-email.perl:1546
+#, 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
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "nie można wykonać STARTTLS! %s"
+
+#: git-send-email.perl:1564
+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
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "Nie można wysłać %s\n"
+
+#: git-send-email.perl:1585
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "Wysłano na sucho %s\n"
+
+#: git-send-email.perl:1585
+#, perl-format
+msgid "Sent %s\n"
+msgstr "Wysłano %s\n"
+
+#: git-send-email.perl:1587
+msgid "Dry-OK. Log says:\n"
+msgstr "OK na sucho. Dziennik mówi:\n"
+
+#: git-send-email.perl:1587
+msgid "OK. Log says:\n"
+msgstr "OK. Dziennik mówi:\n"
+
+#: git-send-email.perl:1599
+msgid "Result: "
+msgstr "Wynik:"
+
+#: git-send-email.perl:1602
+msgid "Result: OK\n"
+msgstr "Wynik: OK\n"
+
+#: git-send-email.perl:1620
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) Nie można wykonać „%s�"
+
+#: git-send-email.perl:1883
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) Dodawanie %s: %s z: „%s�\n"
+
+#: git-send-email.perl:1887
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) nie można zamknąć potoku do „%s�"
+
+#: git-send-email.perl:1917
+msgid "cannot send message as 7bit"
+msgstr "nie można wysłać wiadomości jako siedmiobitowej"
+
+#: git-send-email.perl:1925
+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
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "nie można otworzyć %s: %s\n"
+
+#: git-send-email.perl:1969
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr "%s: łatka zawiera wiersz dłuższy niż 998 znaków"
+
+#: git-send-email.perl:1986
+#, 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
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "Czy na pewno wysłać %s? [y | N]: "
+
+#~ msgid "rev-list died"
+#~ msgstr "rev-list padło"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
+#~ "<good_term> <bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-write [--no-log] <stan> <rewizja> "
+#~ "<dobre_określenie> <złe_określenie>"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+#~ "<bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-check-and-set-terms <polecenie> "
+#~ "<dobre_określenie> <złe_określenie>"
+
+#~ msgid "git bisect--helper --bisect-auto-next"
+#~ msgstr "git bisect--helper --bisect-auto-next"
+
+#~ msgid "write out the bisection state in BISECT_LOG"
+#~ msgstr "wypisz stan przeszukiwania w BISECT_LOG"
+
+#~ msgid "check and set terms in a bisection state"
+#~ msgstr "sprawdź i ustaw określenia w stanie przeszukiwania"
+
+#~ msgid ""
+#~ "verify the next bisection state then checkout the next bisection commit"
+#~ msgstr ""
+#~ "sprawdź kolejny stan przeszukiwania, i wtedy wybierz kolejny zapis do "
+#~ "przeszukiwania"
+
+#~ msgid "--bisect-write requires either 4 or 5 arguments"
+#~ msgstr "--bisect-write wymaga 4 albo 5 argumentów"
+
+#~ msgid "--check-and-set-terms requires 3 arguments"
+#~ msgstr "--check-and-set-terms wymaga 3 argumentów"
+
+#~ msgid "--bisect-auto-next requires 0 arguments"
+#~ msgstr "--bisect-auto-next wymaga braku argumentów"
+
+#~ msgid "Force progress reporting"
+#~ msgstr "Wymuś zgłaszanie postępu"
+
+#, c-format
+#~ msgid "Error deleting remote-tracking branch '%s'"
+#~ msgstr "Błąd usuwania śledzącej gałęzi „%s�"
+
+#, c-format
+#~ msgid "Error deleting branch '%s'"
+#~ msgstr "Błąd usuwania gałęzi „%s�"
+
+#~ msgid "show parse tree for grep expression"
+#~ msgstr "pokaż drzewo przetwarzania w wyrażeniu grepa"
+
+#~ msgid "too many parameters"
+#~ msgstr "zbyt wiele parametrów"
+
+#~ msgid "too few parameters"
+#~ msgstr "zbyt mało argumentów"
+
+#~ msgid "Recurse into nested submodules"
+#~ msgstr "Schodź do zagnieżdżonych pod-modułów"
+
+#~ msgid "too many params"
+#~ msgstr "zbyt wiele parametrów"
+
+#, sh-format
+#~ msgid "Bad rev input: $arg"
+#~ msgstr "Błędne wejście rev: $arg"
+
+#~ msgid "Counting distinct commits in commit graph"
+#~ msgstr "Zliczanie rozróżnialnych zapisów w grafie zapisów"
+
+#, c-format
+#~ msgid "the commit graph format cannot write %d commits"
+#~ msgstr "format grafu zapisów nie może wypisać %d zapisów"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr "Możesz też przerwać przestawianie przez „git rebase --abort�."
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Ostrzeżenie: komenda nie jest rozpoznawana w poniższym wierszu:\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Ostrzeżenie: brak skrótu SHA-1 lub nie jest zapisem w następującym "
+#~ "wierszu:\n"
+#~ " - $line"
+
+#~ msgid "See git-${cmd}(1) for details."
+#~ msgstr "Zobacz git-${cmd}(1) aby uzyskać szczegółowe informacje."
+
+#~ msgid ""
+#~ "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+#~ msgstr ""
+#~ "  Ostrzeżenie: $display_name nie zawiera zapisów $sha1_src ani $sha1_dst"
+
+#~ msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
+#~ msgstr "  Ostrzeżenie: $display_name nie zawiera zapisu $sha1_dst"
+
+#~ msgid "  Warn: $display_name doesn't contain commit $sha1_src"
+#~ msgstr "  Ostrzeżenie: $display_name nie zawiera zapisu $sha1_src"
+
+#~ msgid "The --cached option cannot be used with the --files option"
+#~ msgstr "Opcja --cached nie może być użyta z opcją --files"
+
+#~ msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+#~ msgstr "Podmoduł „$name� ($url) wyrejestrowany ze ścieżki „$displaypath�"
+
+#~ msgid "pathspec and --all are incompatible"
+#~ msgstr "ścieżka i --all się wykluczają"
+
+#~ msgid "Stopping at '$displaypath'; script returned non-zero status."
+#~ msgstr "Przerwano na „$displaypath�; skrypt zwrócił niezerowy kod."
+
+#~ msgid "Entering '$displaypath'"
+#~ msgstr "Otwieranie „$displaypath�"
+
+#~ 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 ""
+#~ "Poniższa ścieżka jest ignorowana przez jeden z plików .gitignore:\n"
+#~ "$sm_path\n"
+#~ "Użyj -f jeśli na pewno chcesz ją dodać."
+
+#~ msgid "(To restore them type \"git stash apply\")"
+#~ msgstr "(Aby je przywrócić, użyj „git stash apply�)"
+
+#~ msgid "Cannot unstage modified files"
+#~ msgstr "Nie można wycofać zmienionych plików"
+
+#~ msgid "$reference is not a valid reference"
+#~ msgstr "$reference nie jest prawidłową referencją"
+
+#~ msgid "unknown option: $opt"
+#~ msgstr "nieznana opcja: $opt"
+
+#~ msgid ""
+#~ "error: unknown option for 'stash save': $option\n"
+#~ "       To provide a message, use git stash save -- '$option'"
+#~ msgstr ""
+#~ "błąd: nieznana opcja „stash save�: $option\n"
+#~ "        Aby podać komunikat, użyj git stash save -- „$option�"
+
+#~ msgid "Cannot remove temporary index (can't happen)"
+#~ msgstr "Nie można usunąć tymczasowego indeksu (nie może się to zdarzyć)"
+
+#~ msgid "Fast-forwarded $branch_name to $onto_name."
+#~ msgstr "Przewinięto $branch_name do $onto_name."
+
+#~ msgid "fatal: no such branch: $branch_name"
+#~ msgstr "błąd krytyczny: brak gałęzi $branch_name"
+
+#~ msgid "$onto_name: there is no merge base"
+#~ msgstr "$onto_name: brak podstawy scalenia"
+
+#~ msgid "$onto_name: there are more than one merge bases"
+#~ msgstr "$onto_name: jest wiele podstaw scalenia"
+
+#~ msgid "invalid upstream $upstream_name"
+#~ msgstr "nieprawidłowa gałąź nadrzędna $upstream_name"
+
+#~ msgid "'$invalid' is not a valid commit"
+#~ msgstr "„$invalid� nie jest prawidłowym zapisem"
+
+#~ msgid "Bad rev input: $bisected_head"
+#~ msgstr "Błędne wejście rev: $bisected_head"
+
+#~ msgid "unrecognised option: '$arg'"
+#~ msgstr "nierozpoznana opcja: „$arg�"
+
+#~ msgid "Removing worktrees/%s: invalid gitdir file"
+#~ msgstr "Usuwanie drzew roboczych/%s: nieprawidłowy plik gitdir"
+
+#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#~ msgstr "Usuwanie drzew roboczych/%s: nie można przeczytać pliku gitdir (%s)"
+
+#~ msgid "Removing worktrees/%s: not a valid directory"
+#~ msgstr "Usuwanie drzew roboczych/%s: nie jest prawidłowym katalogiem"
+
+#~ msgid "tag header too big."
+#~ msgstr "Zbyt duży nagłówek tagu."
+
+#~ msgid "tag name too long: %.*s..."
+#~ msgstr "zbyt długa nazwa tagu: %.*s..."
+
+#~ msgid "submodule--helper subcommand must be called with a subcommand"
+#~ msgstr "pod-polecenie submodule--helper musi być wywołane z pod-poleceniem"
+
+#~ msgid "w[,i1[,i2]]"
+#~ msgstr "w[,i1[,i2]]"
+
+#~ msgid ""
+#~ "\n"
+#~ "(use 'rm -rf' if you really want to remove it including all of its "
+#~ "history)"
+#~ msgstr ""
+#~ "\n"
+#~ "(użyj „rm -rf� jeśli na pewno chcesz je usunąć wraz z całą jego historią)"
+
+#~ 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] ""
+#~ "następujący pod-moduł (lub jeden z jego zagnieżdżonych pod-modułó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"
+#~ "używają katalogu .git:"
+#~ msgstr[2] ""
+#~ "następujące pod-moduły (lub jeden z jego zagnieżdżonych pod-modułów)\n"
+#~ "używają katalogu .git:"
+
+#~ msgid "push|fetch"
+#~ msgstr "push|fetch"
+
+#~ msgid "--[no-]autostash option is only valid with --rebase."
+#~ msgstr "--[no-]autostash ma sens tylko z --rebase."
+
+#~ 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?"
+
+#~ msgid "name of output directory is too long"
+#~ msgstr "nazwa wyjściowego katalogu jest za długa"
+
+#~ msgid "Process line range n,m in file, counting from 1"
+#~ msgstr "Przetwórz zakres wierszy n,m w pliku, licząc od 1"
+
+#~ msgid "Error in object"
+#~ msgstr "BÅ‚Ä…d w obiekcie"
+
+#~ msgid "Everyday Git With 20 Commands Or So"
+#~ msgstr "Codzienny Git w 20 poleceniach dla opornych"
+
+#~ msgid "insanely long object directory %.*s"
+#~ msgstr "szalenie długi katalog obiektów %.*s"
+
+#~ msgid "Don't know how to fetch from %s"
+#~ msgstr "Nie wiem, jak pobrać z %s"
+
+#~ msgid "default mode for recursion"
+#~ msgstr "domyślny tryb rekurencji"
+
+#~ msgid "annotated tag %s has no embedded name"
+#~ msgstr "opisany tag %s nie ma wbudowanej nazwy"
+
+#~ msgid "default"
+#~ msgstr "default"
+
+#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
+#~ msgstr "Podane jawne ścieżki bez -i czy -o; zakładanie --only..."
+
+#~ msgid "Clever... amending the last one with dirty index."
+#~ msgstr "Sprytnie... poprawianie ostatniego z brudnym indeksem."
+
+#~ 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 ""
+#~ "Jeśli chcesz pominąć ten zapis, użyj:\n"
+#~ "\n"
+#~ "    git reset\n"
+#~ "\n"
+#~ "Wtedy „git cherry-pick --continue� wznowi dobieranie\n"
+#~ "pozostałych zapisów.\n"
+
+#~ msgid "failed to stat %s\n"
+#~ msgstr "nie można wykonać stat na %s\n"
+
+#~ 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 ""
+#~ "Nie można jednocześnie zaktualizować ścieżek i przełączyć na gałąź „%s�.\n"
+#~ "Czy chodziło o wybranie „%s�, którego nie można rozwiązać jako zapis?"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Jeśli chcesz, żeby „%s� śledziło „%s�, wykonaj to:\n"
+#~ "\n"
+
+#~ msgid "it does not make sense to create 'HEAD' manually"
+#~ msgstr "nie ma sensu ręcznie tworzyć „HEAD�"
+
+#~ msgid "change upstream info"
+#~ msgstr "zmień gałąź nadrzędną"
+
+#~ msgid " **** invalid ref ****"
+#~ msgstr " **** nieprawidłowa referencja ****"
+
+#~ msgid "[%s: ahead %d, behind %d]"
+#~ msgstr "[%s: do przodu %d, w tyle %d]"
+
+#~ msgid "[%s: ahead %d]"
+#~ msgstr "[%s: do przodu %d]"
+
+#~ msgid "[%s: behind %d]"
+#~ msgstr "[%s: w tyle za %d]"
+
+#~ msgid "[%s: gone]"
+#~ msgstr "[%s: brak]"
+
+#~ msgid "n,m"
+#~ msgstr "n,m"
+
+#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
+#~ msgstr ""
+#~ "Użyj eksperymentalnej heurystyki opartej o puste wiersze, aby poprawić "
+#~ "różnice"
+
+#~ msgid "Use an experimental indent-based heuristic to improve diffs"
+#~ msgstr ""
+#~ "Użyj eksperymentalnej heurystyki opartej o wcięcia, aby poprawić różnice"
+
+#~ msgid "update BISECT_HEAD instead of checking out the current commit"
+#~ msgstr "zaktualizuj BISECT_HEAD zamiast wybierania bieżącego zapisu"
+
+#~ msgid "perform 'git bisect next'"
+#~ msgstr "wykonaj „git bisect next�"
+
+#~ msgid ""
+#~ "You still have unmerged paths in your index.\n"
+#~ "Did you forget to use 'git add'?"
+#~ msgstr ""
+#~ "Nadal są w indeksie niescalone ścieżki.\n"
+#~ "Czyżby zabrakło „git add�?"
+
+#~ msgid "The copy of the patch that failed is found in: %s"
+#~ msgstr "Kopia łatki, która się nie powiodła, znajduje się w: %s"
+
+#~ msgid "cannot be interactive without stdin connected to a terminal."
+#~ msgstr ""
+#~ "nie można wykonać interaktywnie bez stdin podłączonego do terminala."
+
+#~ msgid "Patch is empty. Was it split wrong?"
+#~ msgstr "�atka jest pusta. Czy została źle podzielona?"
+
+#~ msgid "Use -f if you really want to add them.\n"
+#~ msgstr "Użyj -f jeżeli na pewno chcesz je dodać.\n"
+
+#~ msgid "(+/-)x"
+#~ msgstr "(+/-)x"
+
+#~ msgid "Initial commit on "
+#~ msgstr "Pierwszy zapis na "
+
+#~ msgid "git fetch-pack: expected ACK/NAK, got EOF"
+#~ msgstr "git fetch-pack: oczekiwano ACK/NAK, dostałem EOF"
+
+#~ msgid "Server supports multi_ack_detailed"
+#~ msgstr "Serwer wspiera multi_ack_detailed"
+
+#~ msgid "Server supports no-done"
+#~ msgstr "Serwer wspiera no-done"
+
+#~ msgid "Server supports multi_ack"
+#~ msgstr "Serwer wspiera multi_ack"
+
+#~ msgid "Server supports side-band-64k"
+#~ msgstr "Serwer wspiera side-band-64k"
+
+#~ msgid "Server supports allow-tip-sha1-in-want"
+#~ msgstr "Serwer wspiera allow-tip-sha1-in-want"
+
+#~ msgid "Server supports allow-reachable-sha1-in-want"
+#~ msgstr "Serwer wspiera allow-reachable-sha1-in-want"
+
+#~ msgid "in %0.1f seconds automatically..."
+#~ msgstr "za %0.1f sekundy automatycznie..."
+
+#~ msgid "Renaming %s to %s and %s to %s instead"
+#~ msgstr "Zamiast tego zmiana nazwy z %s na %s i z %s na %s"
+
+#~ msgid ""
+#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
+#~ "please use . instead if you meant to match all paths"
+#~ msgstr ""
+#~ "puste łańcuchy jako ścieżki będą uznane za niepoprawne w przyszłych "
+#~ "wydaniach. użyj zamiast tego . jeśli chodzi o wszystkie ścieżki"
+
+#~ msgid ""
+#~ "There is nothing to exclude from by :(exclude) patterns.\n"
+#~ "Perhaps you forgot to add either ':/' or '.' ?"
+#~ msgstr ""
+#~ "Nie ma z czego wyłączać w wzorcach :(exclude).\n"
+#~ "Może brakuje „:/� albo „.�?"
+
+#~ msgid "unrecognized format: %%(%s)"
+#~ msgstr "nierozpoznany format: %%(%s)"
+
+#~ msgid "ref '%s' does not have %ld components to :strip"
+#~ msgstr "referencja „%s� nie ma %ld komponentów do odcięcia :strip="
+
+#~ msgid "Internal error"
+#~ msgstr "Wewnętrzny błąd"
+
+#~ msgid "dup2(%d,%d) failed"
+#~ msgstr "dup2(%d,%d) nie powiodło się"
+
+#~ msgid "mainline was specified but commit %s is not a merge."
+#~ msgstr "podano główny nurt, ale zapis %s nie jest scaleniem."
+
+#~ msgid ""
+#~ "Cannot update sparse checkout: the following entries are not up-to-date:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Nie można zaktualizować rzadkiego wybrania: następujące elementy nie są "
+#~ "aktualne:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The following working tree files would be overwritten by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Rzadkie wybranie nadpisałoby następujące pliki drzewa roboczego:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The following working tree files would be removed by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Aktualizacja rzadkiego wybrania usunęłaby następujące pliki drzewa "
+#~ "roboczego:\n"
+#~ "%s"
+
+#~ msgid "could not close %s"
+#~ msgstr "nie można zamknąć %s"
+
+#~ msgid "store only"
+#~ msgstr "bez kompresji"
+
+#~ msgid "compress faster"
+#~ msgstr "szybsza kompresja"
+
+#~ msgid "compress better"
+#~ msgstr "lepsza kompresja"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 8a2d55a8b6..b09f16205a 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -1,189 +1,1187 @@
-# Portuguese translations for Git package.
-# Copyright (C) 2012 Marco Sousa <marcomsousa AT gmail.com>
-# Copyright (C) 2016 Vasco Almeida <vascomalmeida@sapo.pt>
+# Portugal's Portuguese translations for Git package.
+# Copyright (C) 2021 Daniel Santos <hello@brighterdan.com> 
 # This file is distributed under the same license as the Git package.
 # Contributors:
-# - Marco Sousa <marcomsousa AT gmail.com>
-# Vasco Almeida <vascomalmeida@sapo.pt>, 2016, 2017.
+#   - Daniel Santos <hello@brighterdan.com>
+# Past Contributors:
+#   - Marco Sousa <marcomsousa AT gmail.com>
+#   - Vasco Almeida <vascomalmeida@sapo.pt>, 2016, 2017.
+#
+#  Git glossary for Portuguese translators
+#
+#   English                          |  Portuguese
+#   ---------------------------------+--------------------------------------
+#   3-way merge                      |  tri-junção
+#   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                           |  bisetar
+#   blame                            |  blame
+#   blob object                      |  objeto-blob
+#   branch                           |  ramo 
+#   bug                              |  bug
+#   bundle                           |  conjunto
+#   bypass                           |  desviar
+#   cache                            |  cenário
+#   chain                            |  corrente
+#   changeset                        |  memória
+#   checkout                         |  observar
+#   checksum                         |  checksum
+#   cherry-picking                   |  apanhar
+#   chunk                            |  fragmento
+#   clean                            |  limpa
+#   clone                            |  clone
+#   commit                           |  memorizar
+#   commit message                   |  mensagem de memória
+#   commit object                    |  objeto de memória
+#   commit-ish (also committish)     |  mnemónica
+#   committer                        |  memorizador
+#   conflict                         |  conflito
+#   core Git                         |  núcleo-Git
+#   cover letter                     |  carta de apresentação
+#   DAG                              |  DAG
+#   dangling object                  |  objeto perdido
+#   detached HEAD                    |  HEAD desanexada
+#   directory                        |  pasta
+#   dirty                            |  suja
+#   dumb HTTP protocol               |  protocolo HTTP burro
+#   fanout                           |  fanout
+#   fast-forward                     |  avanço
+#   fetch                            |  buscar
+#   file system                      |  sistema de ficheiro
+#   fixup                            |  consertar
+#   fork                             |  ramificar
+#   Git archive                      |  repositório
+#   gitfile                          |  ficheiro-git
+#   grafts                           |  enxertos
+#   hash                             |  hash
+#   HEAD                             |  HEAD
+#   head                             |  cabeça
+#   header                           |  cabeçalho
+#   hook                             |  gancho
+#   hunk                             |  pedaço
+#   index                            |  cenário
+#   index entry                      |  entrada do cenário
+#   init                             |  inicializar
+#   loose object                     |  objeto solto
+#   loose refs                       |  refs soltas
+#   mark                             |  marca
+#   master                           |  master
+#   merge                            |  junção 
+#   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
+#   range                            |  intervalo
+#   reachable                        |  acessí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                            |  restabelecer
+#   resolve                          |  resolver
+#   revert                           |  reverter
+#   revision                         |  revisão
+#   rewind                           |  rebobinar
+#   root commit                      |  memória-raiz
+#   SCM                              |  SCM
+#   SHA-1                            |  SHA-1
+#   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 inacessível
+#   unstage                          |  desencenar
+#   upstream                         |  upstream
+#   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
+#   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: 2017-04-23 09:54+0800\n"
-"PO-Revision-Date: 2017-05-01 21:17+0000\n"
-"Last-Translator: Vasco Almeida <vascomalmeida@sapo.pt>\n"
-"Language-Team: Portuguese\n"
-"Language: pt\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"
+"Language: pt-PT\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: Virtaal 0.7.1\n"
 
-#: advice.c:55
+#: add-interactive.c:376
+#, fuzzy, c-format
+msgid "Huh (%s)?"
+msgstr "O quê (%s)?"
+
+#: 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"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binário"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "nada"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "inalterado"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Atualizar"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, fuzzy, c-format
+msgid "could not stage '%s'"
+msgstr "incapaz de stage '%s'"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+#, fuzzy
+msgid "could not write index"
+msgstr "incapaz de escrever index"
+
+#: add-interactive.c:706 git-add--interactive.perl:626
+#, c-format, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "actualizou %d path\n"
+msgstr[1] "actualizou %d paths\n"
+
+#: add-interactive.c:724 git-add--interactive.perl:676
+#, c-format, perl-format
+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:298
+#: builtin/reset.c:145
 #, c-format
-msgid "hint: %.*s\n"
-msgstr "dica: %.*s\n"
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry falhou para path '%s'"
 
-#: advice.c:83
-msgid "Cherry-picking is not possible because you have unmerged files."
+#: add-interactive.c:759 git-add--interactive.perl:653
+msgid "Revert"
+msgstr "Reverter"
+
+#: add-interactive.c:775
+#, fuzzy
+msgid "Could not parse HEAD^{tree}"
+msgstr "Incapaz de parse HEAD^{tree}"
+
+#: add-interactive.c:813 git-add--interactive.perl:629
+#, c-format, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "reverti %d path\n"
+msgstr[1] "reverti %d paths\n"
+
+#: add-interactive.c:864 git-add--interactive.perl:693
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Nenhuns ficheiros untracked.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Adiciona untracked"
+
+#: add-interactive.c:895 git-add--interactive.perl:623
+#, c-format, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "adicionei %d path\n"
+msgstr[1] "adicionei %d paths\n"
+
+#: add-interactive.c:925
+#, fuzzy, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ignorando unmerged: %s"
+
+#: 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:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "Sem modificação.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Atualizar patch"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Rever diff"
+
+#: add-interactive.c:1010
+#, fuzzy
+msgid "show paths with changes"
+msgstr "mostrar paths modificados"
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr "adicionar estado de working tree para conjunto das modificações staged"
+
+#: add-interactive.c:1014
+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 seletivamente"
+
+#: add-interactive.c:1018
+#, fuzzy
+msgid "view diff between HEAD and index"
+msgstr "ver diff entre HEAD e índex"
+
+#: add-interactive.c:1020
+msgid "add contents of untracked files to the staged set of changes"
+msgstr ""
+"adiciona conteúdo de ficheiros untracked para conjunto das modificações "
+"staged"
+
+#: add-interactive.c:1028 add-interactive.c:1077
+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"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+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"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "escolhe todos items"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(vazio) acaba de selecionar"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "seleciona item numerado"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(vazio) seleciona nada"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Comandos ***"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "E agora"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "staged"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "unstaged"
+
+#: 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"
+
+#: add-interactive.c:1151
+#, fuzzy
+msgid "could not refresh index"
+msgstr "incapaz de reactualizar o index"
+
+#: 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
+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
+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
+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
+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."
+msgstr ""
+"Se o patch submete-se corretamente, o pedaço editado será marcado para stage "
+"imediatamente."
+
+#: add-patch.c:42
+#, fuzzy
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - stage este pedaço\n"
+"n - o stage deste pedaço será retirado\n"
+"q - sair; retirar de stage este pedaço e qualquer um dos que permaneçam\n"
+"a - stage este pedaço e qualquer próximo pedaço neste ficheiro\n"
+"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
+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
+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
+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
+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."
+msgstr ""
+"Se o patch submete-se corretamente, o pedaço editado será marcado para "
+"arrumação imediatamente."
+
+#: add-patch.c:64
+#, fuzzy
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - arrumar este pedaço\n"
+"n - mostrar este pedaço\n"
+"q - sair; mostrar este pedaço e qualquer outro restante\n"
+"a - arrumar este pedaço e qualquer próximo deste ficheiro\n"
+"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
+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
+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
+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
+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."
+msgstr ""
+"Se patch submete-se corretamente, o pedaço editado será imediatamente "
+"marcado para unstage."
+
+#: add-patch.c:88
+#, fuzzy
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - unstage este pedaço\n"
+"n - o unstage deste pedaço será retirado\n"
+"q - sair; retirar de unstage este pedaço e qualquer outro restante\n"
+"a - unstage este pedaço e todos próximos pedaços deste ficheiro\n"
+"d - retirar este pedaço da arrumação e qualquer próximo pedaço deste "
+"ficheiro\n"
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, fuzzy, 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
+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
+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
+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."
+msgstr ""
+"Se o patch aplica-se corretamente, o pedaço editado será marcado para a "
+"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"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - submeter este pedaço para index\n"
+"n - declinar este pedaço para index\n"
+"q - sair; declinar este pedaço e qualquer outro restante\n"
+"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:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, fuzzy, 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
+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
+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
+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."
+msgstr ""
+"Se o patch aplica-se corretamente, o pedaço editado será marcado para ser "
+"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"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - descartar este pedaço de worktree\n"
+"n - aceitar este pedaço de worktree\n"
+"q - sair; aceitar este pedaço e qualquer outro restante\n"
+"a - descartar este pedaço e qualquer próximo deste ficheiro\n"
+"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
+msgid "Discard mode change from index and 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
+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
+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
+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"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - descartar este pedaço de index e worktree\n"
+"n - aceitar este pedaço de index e worktree\n"
+"q - sair; aceitar este pedaço e qualquer outro restante\n"
+"a - descartar este pedaço e qualquer próximo deste ficheiro\n"
+"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
+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
+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
+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
+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"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - submeter este pedaço para index e worktree\n"
+"n - declinar este pedaço para index e worktree\n"
+"q - sair; declinar este pedaço e qualquer outro restante\n"
+"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:224
+#, fuzzy
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - submeter este pedaço para worktree\n"
+"n - declinar este pedaço para worktree\n"
+"q - sair; declinar este pedaço e qualquer outro restantes\n"
+"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:343
+#, fuzzy, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "incapaz de analisar início de pedaço '%s'"
+
+#: add-patch.c:362 add-patch.c:366
+#, fuzzy, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "incapaz de analisar início de pedaço colorido '%.*s'"
+
+#: add-patch.c:420
+#, fuzzy
+msgid "could not parse diff"
+msgstr "incapaz de analisar diff"
+
+#: add-patch.c:439
+#, fuzzy
+msgid "could not parse colored diff"
+msgstr "incapaz de analisar diff colorido"
+
+#: add-patch.c:453
+#, fuzzy, c-format
+msgid "failed to run '%s'"
+msgstr "falhou executar '%s'"
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "sem match de output de interactive.diffFilter"
+
+#: add-patch.c:613
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"O teu filtro tem de manter uma correspondência exata\n"
+"entre seu input e linhas output."
+
+#: add-patch.c:791
+#, fuzzy, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
 msgstr ""
-"Não é possível efetuar cherry-pick porque tem ficheiros não integrados."
+"linha de contexto esperada #%d em\n"
+"%.*s"
 
-#: advice.c:85
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"pedaços sem overlap:\n"
+"%.*s\n"
+"\ttermina sem:\n"
+"%.*s"
+
+#: 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:1086
+#, fuzzy, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Para remover '%c' linhas, torna-as linhas ' ' (contexto).\n"
+"Para remover '%c' linhas, elimina-as.\n"
+"Linhas começadas com %c serão removidas.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: 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 ""
+"Se falha na submissão correta, ser-lhe-á dada nova oportunidade para\n"
+"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:1133
+#, fuzzy
+msgid "could not parse hunk header"
+msgstr "incapaz interpretar início de pedaço"
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' falhou"
+
+#. 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.
+#.
+#. 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: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]? "
+
+#: add-patch.c:1290
+#, fuzzy
+msgid "The selected hunks do not apply to the index!"
+msgstr "Submissão incorreta de pedaços selecionados para index!"
+
+#: 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:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Nada foi submetido.\n"
+
+#: add-patch.c:1355
+#, fuzzy
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - deixar este pedaço indecidido, ver próximo pedaço indecidido\n"
+"J - deixar este pedaço indecidido, ver próximo pedaço\n"
+"k - deixar este pedaço indecidido, ver pedaço indecidido anterior\n"
+"K - deixar este pedaço indecidido, ver pedaço anterior\n"
+"g - selecionar próximo pedaço\n"
+"/ - procurar por pedaço correspondendo à regex\n"
+"s - dividir o pedaço atual em pedaços mais pequenos\n"
+"e - editar manualmente o pedaço atual\n"
+"? - mostrar ajuda\n"
+
+#: add-patch.c:1517 add-patch.c:1527
+#, fuzzy
+msgid "No previous hunk"
+msgstr "Sem pedaço anterior"
+
+#: add-patch.c:1522 add-patch.c:1532
+#, fuzzy
+msgid "No next hunk"
+msgstr "Sem próximo pedaço"
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr "Sem qualquer outro pedaço"
+
+#: 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:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "ir para qual pedaço? "
+
+#: add-patch.c:1561
+#, fuzzy, c-format
+msgid "Invalid number: '%s'"
+msgstr "Número inválido: '%s'"
+
+#: add-patch.c:1566
+#, fuzzy, 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:1575
+msgid "No other hunks to search"
+msgstr "Sem outro pedaço a procurar"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "procurar por regex? "
+
+#: add-patch.c:1596
+#, fuzzy, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Pesquisa regexp deformada %s: %s"
+
+#: add-patch.c:1613
+#, fuzzy
+msgid "No hunk matches the given pattern"
+msgstr "Sem pedaço correspondente ao padrão fornecido"
+
+#: add-patch.c:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "Lamento, incapaz de dividir este pedaço"
+
+#: add-patch.c:1624
+#, fuzzy, c-format
+msgid "Split into %d hunks."
+msgstr "Dividir em %d pedaços."
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr "Lamento, incapaz de editar este pedaço"
+
+#: add-patch.c:1680
+#, fuzzy
+msgid "'git apply' failed"
+msgstr "'git apply' falhou"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Desative este mensagem com \"git config advice.%s false\""
+
+#: advice.c:161
+#, fuzzy, c-format
+msgid "%shint: %.*s%s\n"
+msgstr "%sdica: %.*s%s\n"
+
+#: 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:254
 msgid "Committing is not possible because you have unmerged files."
-msgstr "Não é possível submeter porque tem ficheiros não integrados."
+msgstr "Cometer é impossível porque tem ficheiros em separado."
 
-#: advice.c:87
+#: advice.c:256
 msgid "Merging is not possible because you have unmerged files."
-msgstr "Não é possível integrar porque tem ficheiros não integrados."
+msgstr "Juntar é impossível porque tem ficheiros em separado."
 
-#: advice.c:89
+#: advice.c:258
 msgid "Pulling is not possible because you have unmerged files."
-msgstr "Não é possível puxar porque tem ficheiros não integrados."
+msgstr "Puxar é impossível porque tem ficheiros em separado."
 
-#: advice.c:91
+#: advice.c:260
 msgid "Reverting is not possible because you have unmerged files."
-msgstr "Não é possível reverte porque tem ficheiros não integrados."
+msgstr "Reverter é impossível porque tem ficheiros em separado."
 
-#: advice.c:93
+#: advice.c:262
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
-msgstr "Não é possível efetuar %s porque tem ficheiros não integrados."
+msgstr "É impossível fazer %s porque tem ficheiros em separado."
 
-#: advice.c:101
+#: 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."
 msgstr ""
-"Corrija-os na árvore de trabalho e use 'git add/rm <ficheiro>'\n"
-"conforme apropriado para marcá-los como resolvidos e submeta."
+"Corrija-os em worktree, e use 'git add/rm <ficheiro>' apropriadamente\n"
+"para marcar resolução e fazer uma memória."
 
-#: advice.c:109
+#: advice.c:278
 msgid "Exiting because of an unresolved conflict."
-msgstr "A terminar devido a conflito não resolvido."
+msgstr "Saindo devido a conflito por resolver."
 
-#: advice.c:114 builtin/merge.c:1185
+#: advice.c:283 builtin/merge.c:1375
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
-msgstr "Não concluído a integração (MERGE_HEAD presente)."
+msgstr "O teu juntar ficou por concluir (MERGE_HEAD presente)."
 
-#: advice.c:116
+#: advice.c:285
 msgid "Please, commit your changes before merging."
-msgstr "Submeta as suas alterações antes de integrar."
+msgstr "Por favor, memoriza as tuas modificações antes de juntar."
 
-#: advice.c:117
+#: advice.c:286
 msgid "Exiting because of unfinished merge."
-msgstr "A terminar devido a integração incompleta."
+msgstr "Saindo devido a juntar inacabado."
 
-#: advice.c:123
+#: advice.c:296
 #, c-format
 msgid ""
-"Note: checking out '%s'.\n"
+"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
+#, fuzzy, c-format
+msgid ""
+"Note: switching to '%s'.\n"
 "\n"
 "You are in 'detached HEAD' state. You can look around, make experimental\n"
 "changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
 "\n"
 "If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+"  git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+"  git switch -\n"
 "\n"
-"  git checkout -b <new-branch-name>\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
 "\n"
 msgstr ""
-"Nota: a extrair '%s'.\n"
+"Nota: trocando para '%s'.\n"
 "\n"
-"Encontra-se em estado 'HEAD destacada'. Pode inspecionar, fazer alterações\n"
-"experimentais e submetê-las e pode descartar qualquer commit que faça neste\n"
-"estado sem interferir outro ramo se extrair outro ramo.\n"
+"Está em 'HEAD solta'. Podes olhar, fazer mudanças experimentais e\n"
+"memorizá-las, e, neste estado, podes descartar qualquer memória que faças\n"
+"sem interferir em qualquer ramo fazendo um switch de ramos.\n"
 "\n"
-"Se deseja criar um novo ramo para reter os commits que criou, pode fazê-lo\n"
-"(agora ou mais tarde) usando -b com o comando checkout outra vez. Exemplo:\n"
+"Se queres criar um novo ramo para reter as memórias que criaste, podes\n"
+"fazer (agora ou mais tarde) usando -c com o comando switch. Exemplo:\n"
 "\n"
-"  git checkout -b <novo-nome-ramo>\n"
+"  git switch -c <novo-nome-de-branch>\n"
 "\n"
+"Ou desfazer esta operação com:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"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 \\"
 
-#: apply.c:57
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "aspa aberta"
+
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
-msgstr "opção de espaço em branco não reconhecida '%s'"
+msgstr "opção de whitespace desconhecida '%s'"
 
-#: apply.c:73
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
-msgstr "opção de ignorar espaço em branco não reconhecida '%s'"
+msgstr "opção de ignorar whitespace desconhecida '%s'"
 
-#: apply.c:125
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
-msgstr "--reject e --3way não podem ser usados juntos."
-
-#: apply.c:127
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached e --3way não podem ser usados juntos."
+msgstr "--reject e --3way só podem ser usados separadamente."
 
-#: apply.c:130
+#: apply.c:139
 msgid "--3way outside a repository"
 msgstr "--3way fora de um repositório"
 
-#: apply.c:141
+#: apply.c:150
 msgid "--index outside a repository"
 msgstr "--index fora de um repositório"
 
-#: apply.c:144
+#: apply.c:153
 msgid "--cached outside a repository"
-msgstr "--cached fora de um repositório"
+msgstr "--cached fora de repositório"
 
-#: apply.c:845
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
-msgstr "Não é possível preparar a regexp de carimbo de data/hora %s"
+msgstr "Incapaz preparar timestamp de regexp %s"
 
-#: apply.c:854
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
-msgstr "regexec retornou %d para a entra: %s"
+msgstr "regexec devolveu %d para input: %s"
 
-#: apply.c:938
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
-msgstr "não foi possível encontrar o nome do ficheiro no patch na linha %d"
+msgstr "incapaz de encontrar o nome do ficheiro no patch da linha %d"
 
-#: apply.c:977
+#: 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-se /dev/null, obteve-se %s na linha "
-"%d"
+"git apply: git-diff incorreto - esperava /dev/null, tive %s na linha %d"
 
-#: apply.c:983
+#: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr ""
-"git apply: git-diff incorreto - o nome do novo ficheiro na linha %d é "
-"inconsistente"
+"git apply: git-diff incorreto - novo nome de ficheiro inconsistente na linha "
+"%d"
 
-#: apply.c:984
+#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr ""
-"git apply: git-diff incorreto - o nome do ficheiro antigo na linha %d é "
-"inconsistente"
+"git apply: git-diff incorreto - antigo nome de ficheiro inconsistente na "
+"linha %d"
 
-#: apply.c:990
+#: apply.c:933
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: git-diff incorreto - esperava-se /dev/null na linha %d"
+msgstr "git apply: git-diff incorreto - esperava /dev/null na linha %d"
 
-#: apply.c:1488
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recontagem: linha inesperada: %.*s"
+#: apply.c:962
+#, fuzzy, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "modo inválido na linha %d: %s"
 
-#: apply.c:1557
+#: apply.c:1281
 #, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "fragmento de patch sem cabeçalho na linha %d: %.*s"
+msgid "inconsistent header lines %d and %d"
+msgstr "linhas de cabeçalho %d e %d inconsistentes"
 
-#: apply.c:1577
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -192,663 +1190,767 @@ msgid_plural ""
 "git diff header lacks filename information when removing %d leading pathname "
 "components (line %d)"
 msgstr[0] ""
-"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover "
-"%d componente do caminho (linha %d)"
+"cabeçalho do git diff falta informação de nome de ficheiro quando removendo"
+"%d componente do pathname (linha %d)"
 msgstr[1] ""
-"o cabeçalho do git diff não revelou o nome do ficheiro depois de se remover "
-"%d componentes de caminho (linha %d)"
+"cabeçalho do git diff falta informação de nome de ficheiro quando removendo "
+"%d componentes do pathname (linha %d)"
 
-#: apply.c:1589
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
-msgstr "o cabeçalho do git diff não revela o nome do ficheiro (linha %d)"
+msgstr "cabeçalho do git diff falta informação de nome de ficheiro (linha %d)"
+
+#: apply.c:1480
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recontagem: linha inesperada: %.*s"
+
+#: 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:1759
+#: apply.c:1752
 msgid "new file depends on old contents"
-msgstr "o novo ficheiro depende de conteúdos antigos"
+msgstr "novo ficheiro depende de conteúdos antigos"
 
-#: apply.c:1761
+#: apply.c:1754
 msgid "deleted file still has contents"
-msgstr "o ficheiro eliminado ainda tem conteúdos"
+msgstr "ficheiro eliminado ainda tem conteúdos"
 
-#: apply.c:1795
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
-msgstr "patch corrompido na linha %d"
+msgstr "patch roto na linha %d"
 
-#: apply.c:1832
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
-msgstr "o novo ficheiro %s depende de conteúdos antigos"
+msgstr "novo ficheiro %s depende de conteúdos antigos"
 
-#: apply.c:1834
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
-msgstr "o ficheiro eliminado %s ainda tem conteúdos"
+msgstr "ficheiro apagado %s ainda tem conteúdos"
 
-#: apply.c:1837
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
-msgstr "** aviso: o ficheiro %s ficará vazio, mas não será eliminado"
+msgstr "** aviso: ficheiro %s fica vazio e mantêm-se"
 
-#: apply.c:1984
+#: apply.c:1977
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
-msgstr "patch binário corrompido na linha %d: %.*s"
+msgstr "patch binário roto na linha %d: %.*s"
 
-#: apply.c:2021
+#: apply.c:2014
 #, c-format
 msgid "unrecognized binary patch at line %d"
-msgstr "patch binário não reconhecido na linha %d"
+msgstr "patch binário irreconhecível na linha %d"
 
-#: apply.c:2182
+#: apply.c:2176
 #, c-format
 msgid "patch with only garbage at line %d"
-msgstr "patch incompreensível na linha %d"
+msgstr "patch com apenas lixo na linha %d"
 
-#: apply.c:2265
+#: apply.c:2262
 #, c-format
 msgid "unable to read symlink %s"
-msgstr "não é possível ler a ligação simbólica %s"
+msgstr "incapaz de ler ligação simbólica %s"
 
-#: apply.c:2269
+#: apply.c:2266
 #, c-format
 msgid "unable to open or read %s"
-msgstr "não é possível abrir ou ler %s"
+msgstr "incapaz de abrir ou ler %s"
 
-#: apply.c:2922
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "início de linha inválido: '%c'"
 
-#: apply.c:3041
+#: 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] "Excerto nº%d bem sucedido na linha %d (%d linha deslocada)."
-msgstr[1] "Excerto nº%d bem sucedido na linha %d (%d linhas deslocadas)."
+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:3053
+#: apply.c:3068
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "Contexto reduzido para (%ld/%ld) para aplicar o fragmento em %d"
+msgstr "Contexto reduzido a (%ld/%ld) para submeter fragmento em %d"
 
-#: apply.c:3059
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr ""
-"ao procura por:\n"
+"procurando por:\n"
 "%.*s"
 
-#: apply.c:3081
+#: apply.c:3096
 #, c-format
 msgid "missing binary patch data for '%s'"
-msgstr "falta de dados do patch binário '%s'"
+msgstr "faltando patch binário para '%s'"
 
-#: apply.c:3089
+#: apply.c:3104
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
-msgstr ""
-"não é possível aplicar o reverso de um patch binário a '%s' sem o excerto "
-"reverso"
+msgstr "incapaz submeter-inversamente patch binário sem pedaço inverso a '%s'"
 
-#: apply.c:3135
+#: apply.c:3151
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
-msgstr ""
-"não é possível aplicar patch binário a '%s' sem linha de índice completa"
+msgstr "incapaz submeter patch binário a '%s' sem a linha completa de index"
 
-#: apply.c:3145
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr ""
-"o patch aplica-se a '%s' (%s), que não corresponde aos conteúdos atuais."
+"o patch submete-se a '%s' (%s), que corresponde a conteúdo actual nenhum."
 
-#: apply.c:3153
+#: apply.c:3170
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
-msgstr "o patch aplica-se a um '%s' vazio mas não está vazio"
+msgstr "o patch submete-se a um '%s' vazio mas tem conteúdo"
 
-#: apply.c:3171
+#: apply.c:3188
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
-msgstr "não é possível ler a postimage necessária %s de '%s'"
+msgstr "incapaz ler a postimage necessária %s para '%s'"
 
-#: apply.c:3184
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
-msgstr "o patch binário não foi aplicado corretamente a '%s'"
+msgstr "path binário submete-se a '%s' de maneira nenhuma"
 
-#: apply.c:3190
+#: apply.c:3208
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr ""
-"o patch binário aplicado a '%s' gera resultados incorretos (esperava-se %s, "
-"obteve-se %s)"
+"patch binário para '%s' cria resultado incorreto (esperei %s, recebi %s)"
 
-#: apply.c:3211
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
-msgstr "falha ao aplicar o patch: %s:%ld"
+msgstr "patch falhou: %s:%ld"
 
-#: apply.c:3333
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
-msgstr "não é possível extrair %s"
+msgstr "incapaz de checkout %s"
 
-#: apply.c:3381 apply.c:3392 apply.c:3438 setup.c:253
+#: 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 ao ler %s"
+msgstr "falha a ler %s"
 
-#: apply.c:3389
+#: apply.c:3412
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
-msgstr "a ler '%s' indicado por uma ligação simbólica"
+msgstr "lendo '%s' além de uma ligação simbólica"
 
-#: apply.c:3418 apply.c:3658
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
-msgstr "o caminho %s foi eliminado ou mudou de nome"
+msgstr "path %s mudou de nome ou foi eliminado"
 
-#: apply.c:3501 apply.c:3672
+#: apply.c:3527 apply.c:3702
 #, c-format
 msgid "%s: does not exist in index"
-msgstr "%s: não existe no índice"
+msgstr "%s: tem inexistência no index"
 
-#: apply.c:3510 apply.c:3680
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
-msgstr "%s: não tem correspondência no índice"
+msgstr "%s: no index há correspondência nenhuma"
 
-#: apply.c:3545
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr ""
-"o repositório não tem o blob necessário para recorrer a integração com 3 "
-"pontos."
+#: apply.c:3571
+#, fuzzy
+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:3548
-#, c-format
-msgid "Falling back to three-way merge...\n"
+#: apply.c:3574
+#, fuzzy, c-format
+msgid "Performing three-way merge...\n"
 msgstr "A recorrer a integração com 3 pontos...\n"
 
-#: apply.c:3564 apply.c:3568
+#: apply.c:3590 apply.c:3594
 #, c-format
 msgid "cannot read the current contents of '%s'"
-msgstr "não é possível ler o conteúdo atual de '%s'"
+msgstr "incapaz ler conteúdo atual de '%s'"
 
-#: apply.c:3580
-#, c-format
-msgid "Failed to fall back on three-way merge...\n"
+#: apply.c:3606
+#, fuzzy, c-format
+msgid "Failed to perform three-way merge...\n"
 msgstr "Falha a recorrer a integração com 3 pontos...\n"
 
-#: apply.c:3594
+#: apply.c:3620
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Patch aplicado a '%s' com conflitos.\n"
 
-#: apply.c:3599
+#: apply.c:3625
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Patch aplicado a '%s' com sucesso.\n"
 
-#: apply.c:3625
+#: apply.c:3642
+#, fuzzy, c-format
+msgid "Falling back to direct application...\n"
+msgstr "A recorrer a integração com 3 pontos...\n"
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr "patch de remoção deixa conteúdos no ficheiro"
 
-#: apply.c:3697
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: tipo errado"
 
-#: apply.c:3699
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s é do tipo %o, esperado %o"
 
-#: apply.c:3850 apply.c:3852
+#: 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:3908
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: já existe no índice"
 
-#: apply.c:3911
+#: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: já existe no diretório de trabalho"
 
-#: apply.c:3931
+#: apply.c:3976
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
-msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o)"
+msgstr "novo modo (%o) de %s é incorrespondente ao modo antigo (%o)"
 
-#: apply.c:3936
+#: apply.c:3981
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
-msgstr "o novo modo (%o) de %s não corresponde ao modo antigo (%o) de %s"
+msgstr "novo modo (%o) de %s é incorrespondente ao modo antigo (%o) de %s"
 
-#: apply.c:3956
+#: apply.c:4001
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "o ficheiro afetado '%s' é indicado por uma ligação simbólica"
 
-#: apply.c:3960
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
-msgstr "%s: patch não se aplica com sucesso"
+msgstr "%s: patch submete-se de maneira nenhuma"
 
-#: apply.c:3975
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
-msgstr "A verificar o patch %s..."
+msgstr ""
 
-#: apply.c:4066
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
-msgstr "falta informação de sha1 ou não é útil para o submódulo %s"
+msgstr "sha1 tem falta informação ou é inútil para o submódulo %s"
 
-#: apply.c:4073
+#: apply.c:4119
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
-msgstr "alteração de modo de %s que não está na HEAD atual"
+msgstr "alteração de modo para %s, que está fora da HEAD atual"
 
-#: apply.c:4076
+#: apply.c:4122
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
-msgstr "falta informação de sha1 ou não é útil (%s)."
-
-#: apply.c:4081 builtin/checkout.c:252 builtin/reset.c:135
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "falha ao invocar make_cache_entry em '%s'"
+msgstr "informação de sha1 está faltando ou é inútil (%s)."
 
-#: apply.c:4085
+#: apply.c:4131
 #, c-format
 msgid "could not add %s to temporary index"
-msgstr "não foi possível adicionar %s ao índice temporário"
+msgstr "incapaz adicionar %s ao índex temporário"
 
-#: apply.c:4095
+#: apply.c:4141
 #, c-format
 msgid "could not write temporary index to %s"
-msgstr "não foi possível escrever índice temporário para %s"
+msgstr "incapaz escrever index temporário para %s"
 
-#: apply.c:4233
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
-msgstr "não é possível remover %s do índice"
+msgstr "impossível remover %s de index"
 
-#: apply.c:4268
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "patch corrompido no submódulo %s"
 
-#: apply.c:4274
+#: apply.c:4319
 #, c-format
 msgid "unable to stat newly created file '%s'"
-msgstr "não é possível obter estado do novo ficheiro criado '%s'"
+msgstr "incapaz obter estatutário de ficheiro recém-criado '%s'"
 
-#: apply.c:4282
+#: apply.c:4327
 #, c-format
 msgid "unable to create backing store for newly created file %s"
-msgstr ""
-"não é possível criar armazenamento de segurança do ficheiro recém-criado %s"
+msgstr "incapaz criar armazenamento de backup para ficheiro recém-criado %s"
 
-#: apply.c:4288 apply.c:4432
+#: apply.c:4333 apply.c:4478
 #, c-format
 msgid "unable to add cache entry for %s"
-msgstr "não é possível adicionar %s à cache"
+msgstr "incapaz adicionar entrada de cache para %s"
 
-#: apply.c:4329
+#: apply.c:4376 builtin/bisect--helper.c:525
 #, c-format
 msgid "failed to write to '%s'"
-msgstr "falha ao escrever para '%s'"
+msgstr "falha a escrever para '%s'"
 
-#: apply.c:4333
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
-msgstr "a fechar o ficheiro '%s'"
+msgstr "fechando ficheiro '%s'"
 
-#: apply.c:4403
+#: apply.c:4450
 #, c-format
 msgid "unable to write file '%s' mode %o"
-msgstr "não é possível escrever o ficheiro '%s' com o modo %o"
+msgstr "incapaz escrever ficheiro '%s' com modo %o"
 
-#: apply.c:4501
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Patch %s aplicado com sucesso."
 
-#: apply.c:4509
+#: apply.c:4556
 msgid "internal error"
 msgstr "erro interno"
 
-#: apply.c:4512
+#: apply.c:4559
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "A aplicar patch %%s com %d rejeição..."
 msgstr[1] "A aplicar patch %%s com %d rejeições..."
 
-#: apply.c:4523
+#: apply.c:4570
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "a truncar o nome do ficheiro .rej em %.*s.rej"
 
-#: apply.c:4531 builtin/fetch.c:739 builtin/fetch.c:988
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
-msgstr "não é possível abrir %s"
+msgstr "incapaz abrir %s"
 
-#: apply.c:4545
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Excerto nº%d aplicado com sucesso."
 
-#: apply.c:4549
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Excerto nº%d rejeitado."
 
-#: apply.c:4659
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Patch '%s' ignorado."
 
-#: apply.c:4667
+#: apply.c:4733
 msgid "unrecognized input"
-msgstr "entrada não reconhecida"
+msgstr "input desconhecido"
 
-#: apply.c:4686
+#: apply.c:4753
 msgid "unable to read index file"
-msgstr "não foi possível ler o ficheiro de índice"
+msgstr "incapaz ler ficheiro index"
 
-#: apply.c:4823
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
-msgstr "não é possível abrir o patch '%s': %s"
+msgstr "incapaz abrir patch '%s': %s"
 
-#: apply.c:4850
+#: 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:4856 apply.c:4871
+#: 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:4864
+#: 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:4880 builtin/add.c:463 builtin/mv.c:298 builtin/rm.c:391
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
 msgid "Unable to write new index file"
-msgstr "Não foi possível escrever novo ficheiro de índice"
-
-#: apply.c:4911 apply.c:4914 builtin/am.c:2277 builtin/am.c:2280
-#: builtin/clone.c:113 builtin/fetch.c:98 builtin/pull.c:180
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
-#: git-add--interactive.perl:239
-msgid "path"
-msgstr "caminho"
+msgstr "Incapaz de escrever novo ficheiro index"
 
-#: apply.c:4912
+#: apply.c:4995
 msgid "don't apply changes matching the given path"
-msgstr "não aplicar alterações que correspondam ao caminho fornecido"
+msgstr ""
+"submeter de maneira nenhuma alterações correspondentes a path fornecido"
 
-#: apply.c:4915
+#: apply.c:4998
 msgid "apply changes matching the given path"
-msgstr "aplicar alterações que correspondam ao caminho fornecido"
+msgstr "submeter alterações correspondentes a path fornecido"
 
-#: apply.c:4917 builtin/am.c:2286
+#: apply.c:5000 builtin/am.c:2318
 msgid "num"
 msgstr "num"
 
-#: apply.c:4918
+#: apply.c:5001
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "remover <num> barras à esquerda dos caminhos de diff tradicional"
 
-#: apply.c:4921
+#: apply.c:5004
 msgid "ignore additions made by the patch"
 msgstr "ignorar adições feitas pelo patch"
 
-#: apply.c:4923
+#: apply.c:5006
 msgid "instead of applying the patch, output diffstat for the input"
-msgstr "em vez de aplicar o patch, mostrar o diffstat da entrada"
+msgstr "invés aplicada patch, output diffstat para "
 
-#: apply.c:4927
+#: 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:4929
+#: 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:4931
+#: 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:4933
+#: 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:4935
+#: apply.c:5018
+msgid "mark new files with `git add --intent-to-add`"
+msgstr ""
+
+#: apply.c:5020
 msgid "apply a patch without touching the working tree"
 msgstr "aplicar um patch sem tocar na árvore de trabalho"
 
-#: apply.c:4937
+#: 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:4939
+#: apply.c:5025
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "aplicar o patch também (use com --stat/--summary/--check)"
 
-#: apply.c:4941
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "tentar integração com três pontos se um patch não se aplica com êxito"
+#: apply.c:5027
+#, fuzzy
+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:4943
+#: 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:4946 builtin/checkout-index.c:169 builtin/ls-files.c:508
+#: 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"
 
-#: apply.c:4948
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
 msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
 
-#: apply.c:4949 builtin/am.c:2265
+#: 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:4950
+#: 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:4953 apply.c:4956
+#: 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:4959
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr "aplicar o patch em reverso"
 
-#: apply.c:4961
+#: apply.c:5047
 msgid "don't expect at least one line of context"
-msgstr "não esperar nenhuma linha de contexto"
+msgstr "conta com linha de contexto nenhuma"
 
-#: apply.c:4963
+#: 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:4965
+#: apply.c:5051
 msgid "allow overlapping hunks"
-msgstr "permitir a sobreposição de excertos"
+msgstr "permitir a sobreposição de pedaços"
 
-#: apply.c:4966 builtin/add.c:267 builtin/check-ignore.c:19
-#: builtin/commit.c:1337 builtin/count-objects.c:94 builtin/fsck.c:651
-#: builtin/log.c:1867 builtin/mv.c:122 builtin/read-tree.c:134
+#: 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:4968
+#: 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:4971
+#: apply.c:5057
 msgid "do not trust the line counts in the hunk headers"
-msgstr "não confiar na contagem de linhas no cabeçalho dos excertos"
+msgstr "desconfia da contagem de linhas nos headers de pedaços"
 
-#: apply.c:4973 builtin/am.c:2274
+#: apply.c:5059 builtin/am.c:2306
 msgid "root"
 msgstr "raiz"
 
-#: apply.c:4974
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr "preceder <root> a todos os nomes de ficheiro"
 
-#: archive.c:12
+#: archive-tar.c:125 archive-zip.c:345
+#, fuzzy, c-format
+msgid "cannot stream blob %s"
+msgstr "incapaz streamar blob %s"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, fuzzy, 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
+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"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr ""
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr ""
+
+#: archive-zip.c:322
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr ""
+
+#: 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)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr ""
+
+#: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<opções>] <árvore-etc> [<caminho>...]"
 
-#: archive.c:13
+#: archive.c:15
 msgid "git archive --list"
 msgstr "git archive --list"
 
-#: archive.c:14
+#: archive.c:16
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
 "git archive --remote <repo> [--exec <cmd>] [<opções>] <árvore-etc> "
 "[<caminho>...]"
 
-#: archive.c:15
+#: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <repo> [--exec <cmd>] --list"
 
-#: archive.c:332 builtin/add.c:152 builtin/add.c:442 builtin/rm.c:300
+#: archive.c:188
+#, fuzzy, c-format
+msgid "cannot read %s"
+msgstr "incapaz ler %s"
+
+#: 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:427 builtin/add.c:205 builtin/add.c:645 builtin/rm.c:328
 #, c-format
 msgid "pathspec '%s' did not match any files"
-msgstr "o especificador de caminho '%s' não corresponde a nenhum ficheiro"
+msgstr "especificador de path '%s' correspondeu a ficheiro nenhum"
+
+#: archive.c:451
+#, fuzzy, c-format
+msgid "no such ref: %.*s"
+msgstr "ref inexistente: %.*s"
+
+#: archive.c:457
+#, fuzzy, c-format
+msgid "not a valid object name: %s"
+msgstr "nome de objeto inválido: %s"
 
-#: archive.c:417
+#: archive.c:470
+#, fuzzy, c-format
+msgid "not a tree object: %s"
+msgstr "é objeto árvore nenhum: %s"
+
+#: archive.c:482
+#, fuzzy
+msgid "current working directory is untracked"
+msgstr "pasta de trabalho atual está por seguir"
+
+#: archive.c:523
+#, fuzzy, c-format
+msgid "File not found: %s"
+msgstr "ficheiro por encontrar: %s"
+
+#: archive.c:525
+#, fuzzy, c-format
+msgid "Not a regular file: %s"
+msgstr "É ficheiro normal nenhum: %s"
+
+#: archive.c:552
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:417
+#: archive.c:552
 msgid "archive format"
 msgstr "formato do arquivo"
 
-#: archive.c:418 builtin/log.c:1436
+#: archive.c:553 builtin/log.c:1775
 msgid "prefix"
 msgstr "prefixo"
 
-#: archive.c:419
+#: 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:420 builtin/blame.c:2598 builtin/blame.c:2599 builtin/config.c:59
-#: builtin/fast-export.c:987 builtin/fast-export.c:989 builtin/grep.c:1061
-#: builtin/hash-object.c:101 builtin/ls-files.c:542 builtin/ls-files.c:545
-#: builtin/notes.c:401 builtin/notes.c:564 builtin/read-tree.c:129
-#: parse-options.h:153
+#: 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:421 builtin/archive.c:89
+#: archive.c:556
+#, fuzzy
+msgid "add untracked file to archive"
+msgstr "adiciona ficheiro por seguir a arquivo"
+
+#: archive.c:559 builtin/archive.c:90
 msgid "write the archive to this file"
-msgstr "escrever o arquivo para este ficheiro"
+msgstr "escreve arquivo para este ficheiro"
 
-#: archive.c:423
+#: archive.c:561
 msgid "read .gitattributes in working directory"
 msgstr "ler .gitattributes do diretório de trabalho"
 
-#: archive.c:424
+#: archive.c:562
 msgid "report archived files on stderr"
 msgstr "listar ficheiros arquivados para stderr"
 
-#: archive.c:425
-msgid "store only"
-msgstr "armazenar apenas"
-
-#: archive.c:426
-msgid "compress faster"
-msgstr "compressão rápida"
-
-#: archive.c:434
-msgid "compress better"
-msgstr "compressão ótima"
+#: archive.c:564
+#, fuzzy
+msgid "set compression level"
+msgstr "nível de compactação do pacote"
 
-#: archive.c:437
+#: archive.c:567
 msgid "list supported archive formats"
 msgstr "listar formatos de arquivo suportados"
 
-#: archive.c:439 builtin/archive.c:90 builtin/clone.c:103 builtin/clone.c:106
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: 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:440 builtin/archive.c:91
+#: 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:441 builtin/archive.c:92 builtin/notes.c:485
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
+#: builtin/notes.c:498
 msgid "command"
 msgstr "comando"
 
-#: archive.c:442 builtin/archive.c:93
+#: 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:449
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr "Opção inesperada --remote"
 
-#: archive.c:451
+#: 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:453
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr "Opção inesperada --output"
 
-#: archive.c:475
+#: archive.c:585
+#, fuzzy
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "Opções --add-file e --remote podem nada ser usadas juntas"
+
+#: archive.c:607
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Formato de arquivo desconhecido '%s'"
 
-#: archive.c:482
+#: archive.c:616
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
-msgstr "Argumento não suportado para o formato '%s': -%d"
+msgstr "Argumento por ser suportado para formato '%s': -%d"
 
-#: attr.c:212
+#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
-msgstr "%.*s não é um nome de atributo válido"
+msgstr "%.*s é nome de atributo inválido"
+
+#: attr.c:363
+#, fuzzy, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "falha ao aplicar o patch: %s:%ld"
 
-#: attr.c:408
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -856,27 +1958,22 @@ msgstr ""
 "Os padrões negativos são ignorados nos atributos do git\n"
 "Use '\\!' para uma exclamação literal à esquerda."
 
-#: bisect.c:443
-#, c-format
-msgid "Could not open file '%s'"
-msgstr "Não foi possível abrir o ficheiro '%s'"
-
-#: bisect.c:448
+#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Conteúdo incorretamente citado no ficheiro '%s': %s"
 
-#: bisect.c:656
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
-msgstr "Não se está a bissetar mais!\n"
+msgstr "Conseguimos bisectar mais nenhum!\n"
 
-#: bisect.c:709
+#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
-msgstr "%s não é um nome de commit válido"
+msgstr "Nome de commit inválido %s"
 
-#: bisect.c:733
+#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -885,7 +1982,7 @@ msgstr ""
 "A base de integração %s é má (bad).\n"
 "Significa que o bug foi corrigido entre %s e [%s].\n"
 
-#: bisect.c:738
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -894,7 +1991,7 @@ msgstr ""
 "A base de integração %s é nova (new).\n"
 "A propriedade foi mudada entre %s e [%s].\n"
 
-#: bisect.c:743
+#: bisect.c:801
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -903,83 +2000,120 @@ msgstr ""
 "A base de integração %s é %s.\n"
 "Significa que o primeiro commit '%s' está entre %s e [%s].\n"
 
-#: bisect.c:751
+#: bisect.c:809
 #, 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 ""
-"Algumas revisões %s não antecedem a revisão %s.\n"
-"git bisect não pode funcionar corretamente nesta situação.\n"
-"Talvez confundiu revisões %s e %s?\n"
+"Algumas revisões %s são sucessores da revisão %s.\n"
+"git bisect pode funcionar incorretamente nesta situação.\n"
+"Talvez tenhas confundido revisões %s e %s?\n"
 
-#: bisect.c:764
+#: bisect.c:822
 #, 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 ""
-"tem-se que saltar a base de integração entre %s e [%s].\n"
-"Portanto não se pode ter a certeza que o primeiro commit %s está entre %s e "
-"%s.\n"
-"Continua-se de qualquer maneira."
+"a base de junção entre %s e [%s] tem de ser saltada.\n"
+"Portanto temos incerteza quanto a o primeiro commit %s estar entre %s e %s.\n"
+"Continuemos de qualquer maneira."
 
-#: bisect.c:799
+#: bisect.c:861
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "A bissetar: uma base de integração tem de ser testada\n"
 
-#: bisect.c:850
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr "precisa-se de uma revisão %s"
 
-#: bisect.c:867 builtin/notes.c:174 builtin/tag.c:255
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
-msgstr "não foi possível criar o ficheiro '%s'"
+msgstr "incapaz criar ficheiro '%s'"
 
-#: bisect.c:918
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
-msgstr "não foi possível ler o ficheiro '%s'"
+msgstr "incapaz ler ficheiro '%s'"
 
-#: bisect.c:948
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "falha ao ler referências bissetadas"
 
-#: bisect.c:968
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s era %s e %s em simultâneo\n"
 
-#: bisect.c:976
-#, c-format
+#: bisect.c:1066
+#, fuzzy, 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"
 
-#: bisect.c:995
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
 msgstr[0] "(aproximadamente %d passo)"
 msgstr[1] "(aproximadamente %d passos)"
 
-#. TRANSLATORS: the last %s will be replaced with
-#. "(roughly %d steps)" translation
-#: bisect.c:999
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1101
 #, 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] "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:2776
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents e --reverse são imiscíveis."
+
+#: 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:2811
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse e --first-parent juntos requer que se especifique o último commit"
+
+#: 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: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:2849
+#, c-format
+msgid "no such path %s in %s"
+msgstr "path %s inexistente em %s"
+
+#: blame.c:2860
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "incapaz ler blob %s para path %s"
+
 #: branch.c:53
 #, c-format
 msgid ""
@@ -996,83 +2130,84 @@ msgstr ""
 #: branch.c:67
 #, c-format
 msgid "Not setting branch %s as its own upstream."
-msgstr "O ramo %s não foi configurado com ramo a montante dele próprio."
+msgstr "Indefinindo ramo %s como seu próprio upstream."
 
 #: branch.c:93
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+#, fuzzy, 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
-#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
+#, fuzzy, 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."
 
 #: branch.c:98
-#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+#, fuzzy, 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
-#, c-format
-msgid "Branch %s set up to track local branch %s."
+#, fuzzy, 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
-#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+#, fuzzy, 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
-#, c-format
-msgid "Branch %s set up to track remote ref %s."
+#, fuzzy, 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
-#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+#, fuzzy, 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
-#, c-format
-msgid "Branch %s set up to track local ref %s."
+#, fuzzy, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
 msgstr "Ramo %s configurado para seguir a referência local %s."
 
 #: branch.c:119
 msgid "Unable to write upstream branch configuration"
-msgstr "Não foi possível escrever a configuração do ramo a montante"
+msgstr "Incapaz de escrever configuração de ramo upstream"
 
 #: branch.c:156
 #, c-format
 msgid "Not tracking: ambiguous information for ref %s"
-msgstr "Não seguido: informação da referência %s ambígua"
+msgstr "Incapaz de seguir: informação ambígua para ref %s"
 
-#: branch.c:185
+#: branch.c:189
 #, c-format
 msgid "'%s' is not a valid branch name."
-msgstr "'%s' não é um nome válido para um ramo."
+msgstr "'%s' é um nome inválido para ramo."
 
-#: branch.c:190
+#: branch.c:208
 #, c-format
 msgid "A branch named '%s' already exists."
 msgstr "Já existe um ramo designado '%s'."
 
-#: branch.c:198
+#: branch.c:213
 msgid "Cannot force update the current branch."
-msgstr "Não é possível forçar a atualização do ramo atual."
+msgstr "Incapaz de forçar a atualização do ramo atual."
 
-#: branch.c:218
+#: branch.c:233
 #, c-format
 msgid "Cannot setup tracking information; starting point '%s' is not a branch."
 msgstr ""
-"Não é possível configurar ramo a seguir; o ponto inicial '%s' não é um ramo."
+"Impossível configurar informação sobre seguir; o ponto inicial '%s' é ramo "
+"nenhum."
 
-#: branch.c:220
+#: branch.c:235
 #, c-format
 msgid "the requested upstream branch '%s' does not exist"
-msgstr "o ramo a montante solicitado '%s' não existe"
+msgstr "o ramo upstream solicitado '%s' é inexistente"
 
-#: branch.c:222
+#: branch.c:237
 msgid ""
 "\n"
 "If you are planning on basing your work on an upstream\n"
@@ -1088,459 +2223,1320 @@ msgstr ""
 "a montante que já existe no remoto, pode ser necessário\n"
 "executar \"git fetch\" para obtê-lo.\n"
 "\n"
-"Se pretende publicar um novo ramo local que irá seguir\n"
+"Se pretende atirar um novo ramo local que irá seguir\n"
 "o seu homólogo remoto, pode usar \"git push -u\" para configurar\n"
 "o respetivo ramo a montante, ao mesmo tempo que publica."
 
-#: branch.c:265
+#: branch.c:281
 #, c-format
 msgid "Not a valid object name: '%s'."
 msgstr "Nome de objeto inválido: '%s'."
 
-#: branch.c:285
+#: branch.c:301
 #, c-format
 msgid "Ambiguous object name: '%s'."
 msgstr "Nome de objeto ambíguo: '%s'."
 
-#: branch.c:290
+#: branch.c:306
 #, c-format
 msgid "Not a valid branch point: '%s'."
 msgstr "Ponto no ramo inválido: '%s'."
 
-#: branch.c:344
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' foi já extraído em '%s'"
 
-#: branch.c:364
+#: branch.c:389
 #, c-format
 msgid "HEAD of working tree %s is not updated"
-msgstr "HEAD da árvore de trabalho %s não está atualizada"
+msgstr "HEAD da working tree %s está desatualizada"
 
-#: bundle.c:34
-#, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' não parece ser um ficheiro bundle v2"
+#: bundle.c:44
+#, fuzzy, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "algoritmo hash de bundle irreconhecível: %s"
+
+#: bundle.c:48
+#, fuzzy, c-format
+msgid "unknown capability '%s'"
+msgstr "capacidade desconhecida '%s'"
+
+#: bundle.c:74
+#, fuzzy, 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:61
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
-msgstr "cabeçalho não reconhecido: %s%s (%d)"
+msgstr "cabeçalho irreconhecível: %s%s (%d)"
 
-#: bundle.c:87 sequencer.c:1339 sequencer.c:1760 builtin/commit.c:777
+#: 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 "não foi possível abrir '%s'"
+msgstr "incapaz abrir '%s'"
 
-#: bundle.c:139
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
-msgstr "O repositório não possuí estes commits pré-requisitados:"
+msgstr "Falta ao repositório estes pré-requisitos de commits:"
 
-#: bundle.c:163 ref-filter.c:1852 sequencer.c:1162 sequencer.c:2299
-#: builtin/blame.c:2811 builtin/commit.c:1061 builtin/log.c:353
-#: builtin/log.c:897 builtin/log.c:1347 builtin/log.c:1673 builtin/log.c:1916
-#: builtin/merge.c:359 builtin/shortlog.c:176
-msgid "revision walk setup failed"
-msgstr "falha ao configurar percurso de revisões"
+#: bundle.c:201
+#, fuzzy
+msgid "need a repository to verify a bundle"
+msgstr "é preciso repositório para verificar um bundle."
 
-#: bundle.c:185
+#: 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:192
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "O pacote regista um histórico completo."
 
-#: bundle.c:194
+#: 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:253
+#: bundle.c:333
+#, fuzzy
+msgid "unable to dup bundle descriptor"
+msgstr "incapaz de dup descritor de bundle"
+
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
-msgstr "Não foi possível lançar pack-objects"
+msgstr "Impossível gerar pack-objects"
 
-#: bundle.c:264
+#: bundle.c:351
 msgid "pack-objects died"
-msgstr "pack-objects terminou inesperadamente"
-
-#: bundle.c:304
-msgid "rev-list died"
-msgstr "rev-list terminou inesperadamente"
+msgstr "pack-objects terminaram inesperadamente"
 
-#: bundle.c:353
+#: 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:443 builtin/log.c:170 builtin/log.c:1579 builtin/shortlog.c:281
+#: bundle.c:504
+#, fuzzy, c-format
+msgid "unsupported bundle version %d"
+msgstr "fora de suporte versão bundle %d"
+
+#: bundle.c:506
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr ""
+
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
 #, c-format
 msgid "unrecognized argument: %s"
-msgstr "argumento não reconhecido: %s"
+msgstr "argumento irreconhecível: %s"
 
-#: bundle.c:451
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Criação de bundle vazio recusada."
 
-#: bundle.c:463
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
-msgstr "não é possível criar '%s'"
+msgstr "incapaz criar '%s'"
 
-#: bundle.c:491
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack terminou inesperadamente"
 
-#: color.c:300
+#: 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.c:40 sequencer.c:1572 builtin/am.c:421 builtin/am.c:457
-#: builtin/am.c:1493 builtin/am.c:2127
+#: commit-graph.c:204 midx.c:47
+#, fuzzy
+msgid "invalid hash version"
+msgstr "especificação de caminho inválida"
+
+#: commit-graph.c:262
+msgid "commit-graph file is too small"
+msgstr ""
+
+#: commit-graph.c:355
+#, fuzzy, 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:362
+#, fuzzy, 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:369
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr ""
+
+#: commit-graph.c:386
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr ""
+
+#: commit-graph.c:482
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c:492
+msgid "commit-graph chain does not match"
+msgstr ""
+
+#: commit-graph.c:540
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c:564
+#, fuzzy
+msgid "unable to find all commit-graph files"
+msgstr "incapaz de encontrar todos ficheiros commit-graph"
+
+#: commit-graph.c:745 commit-graph.c:782
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:766
+#, fuzzy, c-format
+msgid "could not find commit %s"
+msgstr "incapaz encontrar commit %s"
+
+#: 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:1337 builtin/pack-objects.c:3057
+#, fuzzy, c-format
+msgid "unable to get type of object %s"
+msgstr "incapaz obter tipo de objeto %s"
+
+#: commit-graph.c:1368
+msgid "Loading known commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1385
+msgid "Expanding reachable commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:1405
+msgid "Clearing commit marks in commit graph"
+msgstr ""
+
+#: 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:1558
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+
+#: commit-graph.c:1635
+#, fuzzy
+msgid "Collecting referenced commits"
+msgstr "Recolhendo commits referênciados"
+
+#: 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:1673
+#, fuzzy, c-format
+msgid "error adding pack %s"
+msgstr "error adicionando pacote %s"
+
+#: commit-graph.c:1677
+#, c-format
+msgid "error opening index for %s"
+msgstr ""
+
+#: commit-graph.c:1714
+msgid "Finding commits for commit graph among packed objects"
+msgstr ""
+
+#: commit-graph.c:1732
+msgid "Finding extra edges in commit graph"
+msgstr ""
+
+#: commit-graph.c:1781
+msgid "failed to write correct number of base graph ids"
+msgstr ""
+
+#: commit-graph.c:1812 midx.c:911
+#, fuzzy, c-format
+msgid "unable to create leading directories of %s"
+msgstr "incapaz criar as pastas superiores a %s"
+
+#: commit-graph.c:1825
+#, fuzzy
+msgid "unable to create temporary graph layer"
+msgstr "incapaz criar camada de grafo temporária"
+
+#: commit-graph.c:1830
+#, fuzzy, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "incapaz de ajustar permissão partilhada para '%s'"
+
+#: 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:1923
+#, fuzzy
+msgid "unable to open commit-graph chain file"
+msgstr "incapaz abrir ficheiro commit-graph chain"
+
+#: commit-graph.c:1939
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1959
+#, fuzzy
+msgid "failed to rename temporary commit-graph file"
+msgstr "falha a renomear ficheiro commit-graph temporário"
+
+#: commit-graph.c:2092
+#, fuzzy
+msgid "Scanning merged commits"
+msgstr "A adicionar %s integrado"
+
+#: commit-graph.c:2136
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c:2244
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+
+#: commit-graph.c:2351
+#, fuzzy
+msgid "too many commits to write graph"
+msgstr "demasiados commits para escrever grafo"
+
+#: commit-graph.c:2449
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:2459
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr ""
+
+#: 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:2476
+#, fuzzy, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "incapaz analisar commit %s de commit-graph"
+
+#: commit-graph.c:2494
+msgid "Verifying commits in commit graph"
+msgstr ""
+
+#: commit-graph.c:2509
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr ""
+
+#: commit-graph.c:2516
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2526
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr ""
+
+#: commit-graph.c:2535
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr ""
+
+#: commit-graph.c:2549
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr ""
+
+#: commit-graph.c:2554
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2558
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr ""
+
+#: commit-graph.c:2575
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+
+#: commit-graph.c:2581
+#, c-format
+msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
+msgstr ""
+
+#: 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 "não foi possível analisar %s"
+msgstr "incapaz analisar %s"
 
-#: commit.c:42
+#: commit.c:54
 #, c-format
 msgid "%s %s is not a commit!"
-msgstr "%s %s não é um commit!"
+msgstr "%s %s é commit nenhum!"
 
-#: commit.c:1511
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+
+#: 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: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:1244
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Commit %s tem assinatura GPG nenhuma."
+
+#: 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: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"
 "variable i18n.commitencoding to the encoding your project uses.\n"
 msgstr ""
-"aviso: a mensagem de commit não conforma com UTF-8.\n"
-"Pode querer emendá-lo depois de corrigir a mensagem ou definir a\n"
-"variável de configuração i18n.commitencoding com a codificação que\n"
-"o seu projeto utiliza.\n"
+"aviso: a mensagem de commit é inconforme com UTF-8.\n"
+"Podes querer emendá-lo depois de corrigir a mensagem, ou definir a\n"
+"variável de config i18n.commitencoding com a codificação que o teu\n"
+"projeto usa.\n"
 
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "memória esgotada"
 
-#: config.c:191
+#: config.c:126
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+
+#: config.c:142
+#, fuzzy, c-format
+msgid "could not expand include path '%s'"
+msgstr "incapaz de expandir include path '%s'"
+
+#: config.c:153
+#, fuzzy
+msgid "relative config includes must come from files"
+msgstr ""
+"configuração relativa com inclusão condicional deve provir de ficheiros"
+
+#: config.c:199
 msgid "relative config include conditionals must come from files"
-msgstr "configuração relativa com inclusão condicional deve provir de ficheiros"
+msgstr ""
+"configuração relativa com inclusão condicional deve provir de ficheiros"
+
+#: config.c:396
+#, fuzzy, c-format
+msgid "invalid config format: %s"
+msgstr "formato de ref 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:701
+#: config.c:442
+#, fuzzy, c-format
+msgid "key does not contain a section: %s"
+msgstr "chave contém secção nenhuma: %s"
+
+#: config.c:448
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr ""
+
+#: config.c:472 sequencer.c:2785
+#, c-format
+msgid "invalid key: %s"
+msgstr "chave inválida: %s"
+
+#: config.c:478
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr ""
+
+#: config.c:511
+msgid "empty config key"
+msgstr ""
+
+#: config.c:529 config.c:541
+#, fuzzy, c-format
+msgid "bogus config parameter: %s"
+msgstr "parâmetros insuficientes"
+
+#: config.c:555 config.c:572 config.c:579 config.c:588
+#, fuzzy, c-format
+msgid "bogus format in %s"
+msgstr "formato falso em %s"
+
+#: config.c:622
+#, fuzzy, c-format
+msgid "bogus count in %s"
+msgstr "contagem falsa em %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr ""
+
+#: config.c:636
+#, fuzzy, c-format
+msgid "missing config key %s"
+msgstr "ficheiro config inválido %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr ""
+
+#: 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:705
+#: 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:709
+#: 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:713
+#: 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:717
+#: 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:721
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "linha de configuração %d incorreta em %s"
 
-#: config.c:840
+#: config.c:1152
 msgid "out of range"
 msgstr "fora de intervalo"
 
-#: config.c:840
+#: config.c:1152
 msgid "invalid unit"
 msgstr "unidade inválida"
 
-#: config.c:846
+#: 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"
 
-#: config.c:851
+#: 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:854
+#: 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:857
+#: 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:860
+#: 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:863
+#: 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:866
+#: 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:953
+#: config.c:1257
+#, fuzzy, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "valor numérico '%s' da configuração '%s' incorreto: %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:1048 config.c:1059
+#: 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:1377
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr ""
+
+#: 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:1176
+#: config.c:1494
+msgid "core.commentChar should only be one character"
+msgstr ""
+
+#: config.c:1527
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "modo inválido para criação de objeto: %s"
 
-#: config.c:1332
+#: config.c:1599
+#, fuzzy, c-format
+msgid "malformed value for %s"
+msgstr "valor desformado para %s"
+
+#: config.c:1625
+#, fuzzy, c-format
+msgid "malformed value for %s: %s"
+msgstr ": %s"
+
+#: config.c:1626
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr ""
+
+#: 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:1522
+#: config.c:1809
+#, fuzzy, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "incapaz carregar objeto blob config '%s'"
+
+#: config.c:1812
+#, fuzzy, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "referência '%s' aponta para blob nenhum"
+
+#: config.c:1829
+#, fuzzy, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "incapaz resolver blog config '%s'"
+
+#: config.c:1874
+#, fuzzy, c-format
+msgid "failed to parse %s"
+msgstr "falha a analisar %s"
+
+#: config.c:1930
 msgid "unable to parse command-line config"
-msgstr "não é possível analisar configuração de linha de comandos"
+msgstr "incapaz analisar config de linha de comandos"
 
-#: config.c:1572
+#: 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:1931
+#: config.c:2468
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Inválido %s: '%s'"
 
-#: config.c:1952
-#, 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"
-
-#: config.c:1978
+#: 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:1989
+#: config.c:2559
 #, c-format
 msgid "unable to parse '%s' from command-line config"
-msgstr "não é possível analisar '%s' da configuração de linha de comandos"
+msgstr "incapaz analisar '%s' da configuração de linha de comandos"
 
-#: config.c:1991
+#: 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:2050
+#: config.c:2645
+#, fuzzy, c-format
+msgid "invalid section name '%s'"
+msgstr "conteúdo inválido: '%s'"
+
+#: config.c:2677
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s tem múltiplos valores"
 
-#: config.c:2384 config.c:2609
+#: config.c:2706
+#, fuzzy, c-format
+msgid "failed to write new configuration file %s"
+msgstr "falha a escrever novo ficheiro configuração %s"
+
+#: config.c:2958 config.c:3285
+#, fuzzy, c-format
+msgid "could not lock config file %s"
+msgstr "incapaz trancar ficheiro config %s"
+
+#: config.c:2969
+#, fuzzy, c-format
+msgid "opening %s"
+msgstr "abrindo %s"
+
+#: config.c:3006 builtin/config.c:361
+#, fuzzy, c-format
+msgid "invalid pattern: %s"
+msgstr "padrão inválido: %s"
+
+#: config.c:3031
+#, fuzzy, c-format
+msgid "invalid config file %s"
+msgstr "ficheiro config inválido %s"
+
+#: 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:3055
+#, fuzzy, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "incapaz mmap '%s'%s"
 
-#: config.c:2502
+#: config.c:3065 config.c:3303
+#, fuzzy, c-format
+msgid "chmod on %s failed"
+msgstr "chmod em %s falhou"
+
+#: config.c:3150 config.c:3400
+#, fuzzy, c-format
+msgid "could not write config file %s"
+msgstr "incapaz escrever ficheiro config %s"
+
+#: config.c:3184
 #, c-format
 msgid "could not set '%s' to '%s'"
-msgstr "não foi possível definir '%s' como '%s'"
+msgstr "incapaz definir '%s' como '%s'"
 
-#: config.c:2504 builtin/remote.c:774
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
-msgstr "não foi possível reiniciar '%s'"
+msgstr "incapaz desdefinir '%s'"
+
+#: config.c:3276
+#, c-format
+msgid "invalid section name: %s"
+msgstr ""
+
+#: config.c:3443
+#, c-format
+msgid "missing value for '%s'"
+msgstr ""
 
-#: connect.c:49
-msgid "The remote end hung up upon initial contact"
+#: connect.c:61
+#, fuzzy
+msgid "the remote end hung up upon initial contact"
 msgstr "O remoto desligou após contacto inicial"
 
-#: connect.c:51
+#: connect.c:63
 msgid ""
 "Could not read from remote repository.\n"
 "\n"
 "Please make sure you have the correct access rights\n"
 "and the repository exists."
 msgstr ""
-"Não foi possível ler do repositório remoto.\n"
+"Incapaz de ler o repositório remoto.\n"
 "\n"
-"Certifica-se que tem os direitos de acesso corretos\n"
+"Certifica-te que tem as permissões de acesso corretas\n"
 "e que o repositório existe."
 
-#: connected.c:63 builtin/fsck.c:190 builtin/prune.c:140
+#: connect.c:81
+#, fuzzy, c-format
+msgid "server doesn't support '%s'"
+msgstr "servidor tem fora de suporte '%s'"
+
+#: connect.c:118
+#, fuzzy, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "servidor tem fora suporte a característica '%s'"
+
+#: connect.c:129
+msgid "expected flush after capabilities"
+msgstr ""
+
+#: connect.c:263
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr ""
+
+#: connect.c:284
+msgid "protocol error: unexpected capabilities^{}"
+msgstr ""
+
+#: connect.c:306
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr ""
+
+#: connect.c:308
+msgid "repository on the other end cannot be shallow"
+msgstr ""
+
+#: connect.c:347
+msgid "invalid packet"
+msgstr ""
+
+#: connect.c:367
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr ""
+
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "objeto desconhecido '%s' pelo formato em servidor."
+
+#: connect.c:526
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr ""
+
+#: connect.c:530
+msgid "expected flush after ref listing"
+msgstr ""
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr ""
+
+#: connect.c:666
+#, fuzzy, c-format
+msgid "protocol '%s' is not supported"
+msgstr "protocolo '%s' é insustentado"
+
+#: connect.c:717
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr ""
+
+#: connect.c:757 connect.c:820
+#, c-format
+msgid "Looking up %s ... "
+msgstr ""
+
+#: connect.c:761
+#, fuzzy, 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:765 connect.c:836
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+
+#: connect.c:787 connect.c:864
+#, fuzzy, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"impossível conetar a %s:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:793 connect.c:870
+#, fuzzy
+msgid "done."
+msgstr "concluído."
+
+#: connect.c:824
+#, fuzzy, c-format
+msgid "unable to look up %s (%s)"
+msgstr "incapaz procurar %s (%s)"
+
+#: connect.c:830
+#, c-format
+msgid "unknown port %s"
+msgstr ""
+
+#: connect.c:967 connect.c:1299
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr ""
+
+#: connect.c:969
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr ""
+
+#: connect.c:979
+#, fuzzy, c-format
+msgid "cannot start proxy %s"
+msgstr "incapaz começar proxy %s"
+
+#: connect.c:1050
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr ""
+
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr ""
+
+#: connect.c:1247
+msgid "ssh variant 'simple' does not support -4"
+msgstr ""
+
+#: connect.c:1259
+msgid "ssh variant 'simple' does not support -6"
+msgstr ""
+
+#: connect.c:1276
+#, fuzzy
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh variant 'simple' insustenta definir porta"
+
+#: connect.c:1388
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr ""
+
+#: connect.c:1436
+#, fuzzy
+msgid "unable to fork"
+msgstr "incapaz de aforquilhar"
+
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "A verificar conectividade"
 
-#: connected.c:75
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
-msgstr "Não foi possível executar 'git rev-list'"
+msgstr "Impossível executar 'git rev-list'"
 
-#: connected.c:95
+#: connected.c:144
 msgid "failed write to rev-list"
-msgstr "falha ao escrever para rev-list"
+msgstr "falhou escrever para rev-list"
 
-#: connected.c:102
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "falha ao fechar entrada padrão de rev-list"
 
-#: convert.c:201
+#: convert.c:183
 #, c-format
+msgid "illegal crlf_action %d"
+msgstr ""
+
+#: convert.c:196
+#, fuzzy, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF será substituído por LF em %s."
+
+#: convert.c:198
+#, fuzzy, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
-"The file will have its original line endings in your working directory."
+"The file will have its original line endings in your working directory"
 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:205
+#: convert.c:206
 #, c-format
-msgid "CRLF would be replaced by LF in %s."
-msgstr "CRLF será substituído por LF em %s."
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF será substituído por CRLF em %s."
 
-#: convert.c:211
-#, c-format
+#: convert.c:208
+#, fuzzy, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
-"The file will have its original line endings in your working directory."
+"The file will have its original line endings in your working directory"
 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:215
+#: convert.c:273
 #, c-format
-msgid "LF would be replaced by CRLF in %s"
-msgstr "LF será substituído por CRLF em %s."
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr ""
 
-#: date.c:97
+#: 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:293
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr ""
+
+#: 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:408 convert.c:479
+#, fuzzy, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "falha ao copiar notas de '%s' para '%s'"
+
+#: convert.c:451
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+
+#: convert.c:654
+#, fuzzy, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "incapaz aforquilhar para correr filtro externo '%s'"
+
+#: convert.c:674
+#, fuzzy, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "incapaz introduzir input para filtro externo '%s'"
+
+#: convert.c:681
+#, fuzzy, c-format
+msgid "external filter '%s' failed %d"
+msgstr "filtro externo '%s' falhou %d"
+
+#: convert.c:716 convert.c:719
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr ""
+
+#: convert.c:722 convert.c:777
+#, fuzzy, c-format
+msgid "external filter '%s' failed"
+msgstr "filtro externo '%s' falhou"
+
+#: convert.c:826
+msgid "unexpected filter type"
+msgstr ""
+
+#: convert.c:837
+msgid "path name too long for external filter"
+msgstr ""
+
+#: convert.c:935
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+
+#: convert.c:1236
+msgid "true/false are no valid working-tree-encodings"
+msgstr ""
+
+#: convert.c:1416 convert.c:1449
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr ""
+
+#: convert.c:1492
+#, fuzzy, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "falha ao atualizar os ficheiros"
+
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr ""
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr ""
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr ""
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr ""
+
+#: credential.c:438
+#, fuzzy, c-format
+msgid "url has no scheme: %s"
+msgstr "Remoto inexistente: %s"
+
+#: credential.c:511
+#, fuzzy, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "incapaz analisar url credencial: %s"
+
+#: date.c:138
 msgid "in the future"
 msgstr "no futuro"
 
-#: date.c:103
-#, c-format
-msgid "%lu second ago"
-msgid_plural "%lu seconds ago"
+#: date.c:144
+#, fuzzy, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
 msgstr[0] "há %lu segundo"
 msgstr[1] "há %lu segundos"
 
-#: date.c:110
-#, c-format
-msgid "%lu minute ago"
-msgid_plural "%lu minutes ago"
+#: date.c:151
+#, fuzzy, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
 msgstr[0] "há %lu minuto"
 msgstr[1] "há %lu minutos"
 
-#: date.c:117
-#, c-format
-msgid "%lu hour ago"
-msgid_plural "%lu hours ago"
+#: date.c:158
+#, fuzzy, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
 msgstr[0] "há %lu hora"
 msgstr[1] "há %lu horas"
 
-#: date.c:124
-#, c-format
-msgid "%lu day ago"
-msgid_plural "%lu days ago"
+#: date.c:165
+#, fuzzy, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
 msgstr[0] "há %lu dia"
 msgstr[1] "há %lu dias"
 
-#: date.c:130
-#, c-format
-msgid "%lu week ago"
-msgid_plural "%lu weeks ago"
+#: date.c:171
+#, fuzzy, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
 msgstr[0] "há %lu semana"
 msgstr[1] "há %lu semanas"
 
-#: date.c:137
-#, c-format
-msgid "%lu month ago"
-msgid_plural "%lu months ago"
+#: date.c:178
+#, fuzzy, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
 msgstr[0] "há %lu mês"
 msgstr[1] "há %lu meses"
 
-#: date.c:148
-#, c-format
-msgid "%lu year"
-msgid_plural "%lu years"
+#: date.c:189
+#, fuzzy, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
 msgstr[0] "%lu ano"
 msgstr[1] "%lu anos"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:151
-#, c-format
-msgid "%s, %lu month ago"
-msgid_plural "%s, %lu months ago"
+#: date.c:192
+#, fuzzy, 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"
 
-#: date.c:156 date.c:161
-#, c-format
-msgid "%lu year ago"
-msgid_plural "%lu years ago"
+#: date.c:197 date.c:202
+#, fuzzy, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
 msgstr[0] "há %lu ano"
 msgstr[1] "há %lu anos"
 
-#: diffcore-order.c:24
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr ""
+
+#: delta-islands.c:290
+#, fuzzy, c-format
+msgid "bad tree object %s"
+msgstr "objeto árvore"
+
+#: delta-islands.c:334
 #, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "falha ao ler o ficheiro de comando '%s'"
+msgid "failed to load island regex for '%s': %s"
+msgstr ""
 
-#: diffcore-rename.c:536
-msgid "Performing inexact rename detection"
-msgstr "Deteção de mudança de nome inexata em curso"
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
 
-#: diff.c:62
+#: delta-islands.c:467
 #, c-format
-msgid "option '%s' requires a value"
-msgstr "a opção '%s' requer um valor"
+msgid "Marked %d islands, done.\n"
+msgstr ""
+
+#: diff-merges.c:70
+#, fuzzy, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr "valor desconhecido '%s' da chave '%s'"
+
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
+msgstr ""
 
-#: diff.c:124
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr ""
+
+#: diff-lib.c:576
+#, fuzzy
+msgid "unable to get HEAD"
+msgstr "incapaz obter HEAD"
+
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr ""
+
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr ""
+
+#: diff-no-index.c:237
+#, fuzzy
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git worktree add [<opções>] <caminho> [<ramo>]"
+
+#: 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
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Falha ao analisar percentagem limite de dirstat '%s'\n"
 
-#: diff.c:129
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Parâmetro de dirstat desconhecido '%s'\n"
 
-#: diff.c:281
+#: diff.c:297
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+
+#: diff.c:325
+#, 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
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+
+#: diff.c:410
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Valor desconhecido na variável de configuração 'diff.submodule': '%s'"
 
-#: diff.c:344
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -1549,20 +3545,46 @@ msgstr ""
 "Erros encontrados na variável de configuração 'diff.dirstat':\n"
 "%s"
 
-#: diff.c:3102
+#: diff.c:4282
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "o diff externo terminou inesperadamente, interrompido em %s"
 
-#: diff.c:3428
+#: 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:3518
+#: diff.c:4637
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr ""
+
+#: 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:4722
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow requer exatamente um único especificador de caminho"
 
-#: diff.c:3681
+#: diff.c:4770
+#, fuzzy, c-format
+msgid "invalid --stat value: %s"
+msgstr "valor de cor inválido: %.*s"
+
+#: 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
+#, c-format
+msgid "%s expects a numerical value"
+msgstr ""
+
+#: diff.c:4807
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1571,308 +3593,1099 @@ msgstr ""
 "Falha ao analisar parâmetro da opção --dirstat/-X:\n"
 "%s"
 
-#: diff.c:3695
+#: diff.c:4892
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr ""
+
+#: diff.c:4916
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr ""
+
+#: diff.c:4930
+#, fuzzy, c-format
+msgid "unable to resolve '%s'"
+msgstr "incapaz resolver '%s'"
+
+#: diff.c:4980 diff.c:4986
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr ""
+
+#: diff.c:4998
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr ""
+
+#: diff.c:5019
+#, fuzzy, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "argumento incorreto --color-moved: %s"
+
+#: diff.c:5038
+#, fuzzy, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "objeto inválido '%s' fornecido."
+
+#: diff.c:5078
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+
+#: diff.c:5114 diff.c:5134
+#, c-format
+msgid "invalid argument to %s"
+msgstr ""
+
+#: diff.c:5238
 #, c-format
-msgid "Failed to parse --submodule option parameter: '%s'"
+msgid "invalid regex given to -I: '%s'"
+msgstr ""
+
+#: diff.c:5287
+#, fuzzy, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
 
-#: diff.c:4719
-msgid "inexact rename detection was skipped due to too many files."
+#: diff.c:5343
+#, c-format
+msgid "bad --word-diff argument: %s"
 msgstr ""
-"a deteção mudança de nome inexata foi omitida devido a demasiados ficheiros."
 
-#: diff.c:4722
+#: diff.c:5379
+msgid "Diff output format options"
+msgstr ""
+
+#: diff.c:5381 diff.c:5387
+#, fuzzy
+msgid "generate patch"
+msgstr "incorporar o patch"
+
+#: diff.c:5384 builtin/log.c:179
+msgid "suppress diff output"
+msgstr "suprimir saída do diff"
+
+#: diff.c:5389 diff.c:5503 diff.c:5510
+msgid "<n>"
+msgstr ""
+
+#: diff.c:5390 diff.c:5393
+#, fuzzy
+msgid "generate diffs with <n> lines context"
+msgstr "garantir que, pelo menos, <n> linhas de contexto coincidem"
+
+#: diff.c:5395
+msgid "generate the diff in raw format"
+msgstr ""
+
+#: diff.c:5398
+msgid "synonym for '-p --raw'"
+msgstr ""
+
+#: diff.c:5402
+msgid "synonym for '-p --stat'"
+msgstr ""
+
+#: diff.c:5406
+#, fuzzy
+msgid "machine friendly --stat"
+msgstr "saída inteligível por máquina"
+
+#: diff.c:5409
+msgid "output only the last line of --stat"
+msgstr ""
+
+#: diff.c:5411 diff.c:5419
+msgid "<param1,param2>..."
+msgstr ""
+
+#: diff.c:5412
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr ""
+
+#: diff.c:5416
+#, fuzzy
+msgid "synonym for --dirstat=cumulative"
+msgstr "sinónimo de --dirstat=cumulative"
+
+#: diff.c:5420
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr ""
+
+#: diff.c:5424
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr ""
+
+#: diff.c:5427
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr ""
+
+#: diff.c:5430
+msgid "show only names of changed files"
+msgstr ""
+
+#: diff.c:5433
+msgid "show only names and status of changed files"
+msgstr ""
+
+#: diff.c:5435
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr ""
+
+#: diff.c:5436
+#, fuzzy
+msgid "generate diffstat"
+msgstr "diff status inesperado %c"
+
+#: diff.c:5438 diff.c:5441 diff.c:5444
+msgid "<width>"
+msgstr ""
+
+#: diff.c:5439
+msgid "generate diffstat with a given width"
+msgstr ""
+
+#: diff.c:5442
+msgid "generate diffstat with a given name width"
+msgstr ""
+
+#: diff.c:5445
+msgid "generate diffstat with a given graph width"
+msgstr ""
+
+#: diff.c:5447
+msgid "<count>"
+msgstr ""
+
+#: diff.c:5448
+msgid "generate diffstat with limited lines"
+msgstr ""
+
+#: diff.c:5451
+msgid "generate compact summary in diffstat"
+msgstr ""
+
+#: diff.c:5454
+msgid "output a binary diff that can be applied"
+msgstr ""
+
+#: diff.c:5457
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr ""
+
+#: diff.c:5459
+#, fuzzy
+msgid "show colored diff"
+msgstr "mostrar ficheiros ignorados"
+
+#: diff.c:5460
+msgid "<kind>"
+msgstr ""
+
+#: diff.c:5461
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr ""
+
+#: diff.c:5464
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+#, fuzzy
+msgid "<prefix>"
+msgstr "<prefixo>/"
+
+#: diff.c:5468
+msgid "show the given source prefix instead of \"a/\""
+msgstr ""
+
+#: diff.c:5471
+msgid "show the given destination prefix instead of \"b/\""
+msgstr ""
+
+#: diff.c:5474
+#, fuzzy
+msgid "prepend an additional prefix to every line of output"
+msgstr "preceder o nomebase do projeto pai na saída"
+
+#: diff.c:5477
+msgid "do not show any source or destination prefix"
+msgstr ""
+
+#: diff.c:5480
+#, fuzzy
+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"
+
+#: diff.c:5484 diff.c:5489 diff.c:5494
+msgid "<char>"
+msgstr ""
+
+#: diff.c:5485
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr ""
+
+#: diff.c:5490
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr ""
+
+#: diff.c:5495
+msgid "specify the character to indicate a context instead of ' '"
+msgstr ""
+
+#: diff.c:5498
+msgid "Diff rename options"
+msgstr ""
+
+#: diff.c:5499
+#, fuzzy
+msgid "<n>[/<m>]"
+msgstr "<n>[,<base>]"
+
+#: diff.c:5500
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr ""
+
+#: diff.c:5504
+#, fuzzy
+msgid "detect renames"
+msgstr "detetar renomeações"
+
+#: diff.c:5508
+msgid "omit the preimage for deletes"
+msgstr ""
+
+#: diff.c:5511
+msgid "detect copies"
+msgstr ""
+
+#: diff.c:5515
+msgid "use unmodified files as source to find copies"
+msgstr ""
+
+#: diff.c:5517
+#, fuzzy
+msgid "disable rename detection"
+msgstr "Deteção de mudança de nome inexata em curso"
+
+#: diff.c:5520
+msgid "use empty blobs as rename source"
+msgstr ""
+
+#: diff.c:5522
+msgid "continue listing the history of a file beyond renames"
+msgstr ""
+
+#: diff.c:5525
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr ""
+
+#: diff.c:5527
+msgid "Diff algorithm options"
+msgstr ""
+
+#: diff.c:5529
+msgid "produce the smallest possible diff"
+msgstr ""
+
+#: diff.c:5532
+msgid "ignore whitespace when comparing lines"
+msgstr ""
+
+#: diff.c:5535
+msgid "ignore changes in amount of whitespace"
+msgstr ""
+
+#: diff.c:5538
+msgid "ignore changes in whitespace at EOL"
+msgstr ""
+
+#: diff.c:5541
+msgid "ignore carrier-return at the end of line"
+msgstr ""
+
+#: diff.c:5544
+msgid "ignore changes whose lines are all blank"
+msgstr ""
+
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr ""
+
+#: diff.c:5547
+msgid "ignore changes whose all lines match <regex>"
+msgstr ""
+
+#: diff.c:5550
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr ""
+
+#: diff.c:5553
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr ""
+
+#: diff.c:5557
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr ""
+
+#: diff.c:5559
+msgid "<algorithm>"
+msgstr ""
+
+#: diff.c:5560
+msgid "choose a diff algorithm"
+msgstr ""
+
+#: diff.c:5562
+#, fuzzy
+msgid "<text>"
+msgstr "texto"
+
+#: diff.c:5563
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr ""
+
+#: diff.c:5565 diff.c:5574 diff.c:5577
+#, fuzzy
+msgid "<mode>"
+msgstr "modo"
+
+#: diff.c:5566
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr ""
+
+#: diff.c:5569
+msgid "use <regex> to decide what a word is"
+msgstr ""
+
+#: diff.c:5572
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr ""
+
+#: diff.c:5575
+msgid "moved lines of code are colored differently"
+msgstr ""
+
+#: diff.c:5578
+msgid "how white spaces are ignored in --color-moved"
+msgstr ""
+
+#: diff.c:5581
+msgid "Other diff options"
+msgstr ""
+
+#: diff.c:5583
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr ""
+
+#: diff.c:5587
+#, fuzzy
+msgid "treat all files as text"
+msgstr "processar ficheiros binários como texto"
+
+#: diff.c:5589
+msgid "swap two inputs, reverse the diff"
+msgstr ""
+
+#: diff.c:5591
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr ""
+
+#: diff.c:5593
+msgid "disable all output of the program"
+msgstr ""
+
+#: diff.c:5595
+msgid "allow an external diff helper to be executed"
+msgstr ""
+
+#: diff.c:5597
+msgid "run external text conversion filters when comparing binary files"
+msgstr ""
+
+#: diff.c:5599
+#, fuzzy
+msgid "<when>"
+msgstr "quando"
+
+#: diff.c:5600
+#, fuzzy
+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:5603
+#, fuzzy
+msgid "<format>"
+msgstr "formato"
+
+#: diff.c:5604
+msgid "specify how differences in submodules are shown"
+msgstr ""
+
+#: diff.c:5608
+msgid "hide 'git add -N' entries from the index"
+msgstr ""
+
+#: diff.c:5611
+msgid "treat 'git add -N' entries as real in the index"
+msgstr ""
+
+#: diff.c:5613
+#, fuzzy
+msgid "<string>"
+msgstr "cadeia"
+
+#: diff.c:5614
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr ""
+
+#: diff.c:5617
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr ""
+
+#: diff.c:5620
+#, fuzzy
+msgid "show all changes in the changeset with -S or -G"
+msgstr "mostrar ficheiros com correspondências no paginador"
+
+#: diff.c:5623
+#, fuzzy
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "usar expressões regulares estendidas do POSIX"
+
+#: diff.c:5626
+#, fuzzy
+msgid "control the order in which files appear in the output"
+msgstr "mostrar outros ficheiros na saída"
+
+#: diff.c:5627 diff.c:5630
+#, fuzzy
+msgid "<path>"
+msgstr "path"
+
+#: diff.c:5628
+#, fuzzy
+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:5631
+#, fuzzy
+msgid "skip the output to the specified path"
+msgstr "Repor a HEAD atual no estado especificado"
+
+#: diff.c:5633
+#, fuzzy
+msgid "<object-id>"
+msgstr "objeto"
+
+#: diff.c:5634
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr ""
+
+#: diff.c:5636
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr ""
+
+#: diff.c:5637
+msgid "select files by diff type"
+msgstr ""
+
+#: diff.c:5639
+#, fuzzy
+msgid "<file>"
+msgstr "ficheiro"
+
+#: diff.c:5640
+#, fuzzy
+msgid "Output to a specific file"
+msgstr "submeter somente os ficheiros especificados"
+
+#: diff.c:6298
+#, fuzzy
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr ""
+"detecção de renomeação exaustiva foi ignorada devido a demasiados ficheiros."
+
+#: 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:4725
+#: diff.c:6304
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 "pode tentar definir a variável %s para, pelo menos, %d e repetir o comando."
 
-#: dir.c:1899
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "falha ao ler ficheiro de comando '%s'"
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr "Deteção de mudança de nome inexata em curso"
+
+#: diffcore-rotate.c:29
+#, fuzzy, c-format
+msgid "No such path '%s' in the diff"
+msgstr "path %s inexistente em %s"
+
+#: dir.c:593
+#, fuzzy, 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"
+
+#: dir.c:733 dir.c:762 dir.c:775
+#, fuzzy, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "padrão irreconhecível: '%s'"
+
+#: dir.c:790 dir.c:804
+#, fuzzy, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "por reconhecer padrão negativo: '%s'"
+
+#: dir.c:820
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+
+#: dir.c:830
+msgid "disabling cone pattern matching"
+msgstr ""
+
+#: dir.c:1214
+#, fuzzy, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "incapaz usar %s como ficheiro de exclusão"
+
+#: dir.c:2351
+#, fuzzy, c-format
+msgid "could not open directory '%s'"
+msgstr "incapaz abrir pasta '%s'"
+
+#: dir.c:2653
 msgid "failed to get kernel name and information"
 msgstr "falha ao obter nome e informação do kernel"
 
-#: dir.c:2018
-msgid "Untracked cache is disabled on this system or location."
-msgstr "A cache não controlada está desativada neste sistema ou localização."
+#: dir.c:2777
+#, fuzzy
+msgid "untracked cache is disabled on this system or location"
+msgstr "cache untracked está desativada neste sistema ou localização."
+
+#: dir.c:3610
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr ""
 
-#: dir.c:2776 dir.c:2781
+#: dir.c:3657 dir.c:3662
 #, c-format
 msgid "could not create directories for %s"
-msgstr "não foi possível criar o diretórios para %s"
+msgstr "incapaz criar pasta para %s"
 
-#: dir.c:2806
+#: dir.c:3691
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "não foi possível migrar o diretório git de '%s' para '%s'"
+msgstr "incapaz migrar pasta git de '%s' para '%s'"
 
-#: entry.c:280
+#: editor.c:74
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr ""
+
+#: entry.c:176
+#, fuzzy
+msgid "Filtering content"
+msgstr "imprimir conteúdo da tag"
+
+#: entry.c:497
 #, c-format
 msgid "could not stat file '%s'"
-msgstr "não foi possível obter stat do ficheiro '%s'"
+msgstr "incapaz de stat o ficheiro '%s'"
+
+#: environment.c:152
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr ""
 
-#: fetch-pack.c:249
+#: environment.c:334
+#, fuzzy, c-format
+msgid "could not set GIT_DIR to '%s'"
+msgstr "incapaz definir GIT_DIR para '%s'"
+
+#: exec-cmd.c:363
+#, c-format
+msgid "too many args to run %s"
+msgstr ""
+
+#: 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 rasa"
 
-#: fetch-pack.c:261
-msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se EOF"
+#: fetch-pack.c:185
+#, fuzzy
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack: esperado pacote flush após lista rasa"
 
-#: fetch-pack.c:279
+#: fetch-pack.c:196
+#, fuzzy
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack: esperava-se ACK/NAK, obteve-se '%s'"
+
+#: 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'"
 
-#: fetch-pack.c:331
+#: fetch-pack.c:227
+#, fuzzy
+msgid "unable to write to remote"
+msgstr "incapaz escrever para remoto"
+
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc requer multi_ack_detailed"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "linha rasa inválida: %s"
 
-#: fetch-pack.c:423
+#: 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:425
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
-msgstr "objeto não encontrado: %s"
+msgstr "objeto perdido: %s"
 
-#: fetch-pack.c:428
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
 msgstr "erro no objeto: %s"
 
-#: fetch-pack.c:430
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
-msgstr "raso não encontrado: %s"
+msgstr "shallow por encontrar: %s"
 
-#: fetch-pack.c:433
+#: 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:472
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr "obteve-se %s %d %s"
 
-#: fetch-pack.c:486
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
 msgstr "commit inválido %s"
 
-#: fetch-pack.c:519
+#: fetch-pack.c:487
 msgid "giving up"
-msgstr "desistência"
+msgstr "a desistir"
 
-#: fetch-pack.c:529 progress.c:235
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
 msgstr "concluído"
 
-#: fetch-pack.c:541
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "obteve-se %s (%d) %s"
 
-#: fetch-pack.c:587
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Marcado %s como completo"
 
-#: fetch-pack.c:735
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr "já se tem %s (%s)"
 
-#: fetch-pack.c:773
+#: fetch-pack.c:849
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
-msgstr "fetch-pack: não é possível efetuar fork de sideband demultiplexer"
+msgstr "fetch-pack: incapaz de aforquilhar demultiplexer sideband"
 
-#: fetch-pack.c:781
+#: fetch-pack.c:857
 msgid "protocol error: bad pack header"
-msgstr "erro de protocolo: cabeçalho de pacote incorreto"
+msgstr ""
 
-#: fetch-pack.c:837
+#: fetch-pack.c:951
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
-msgstr "fetch-pack: não é possível criar processo filho %s"
+msgstr "fetch-pack: incapaz de aforquilhar %s"
+
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr ""
 
-#: fetch-pack.c:853
+#: fetch-pack.c:974
 #, c-format
 msgid "%s failed"
 msgstr "%s falhou"
 
-#: fetch-pack.c:855
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
-msgstr "erro no sideband demultiplexer"
+msgstr "erro em demultiplexer sideband"
+
+#: fetch-pack.c:1019
+#, c-format
+msgid "Server version is %.*s"
+msgstr "A versão do servidor é %.*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
+#, fuzzy, c-format
+msgid "Server supports %s"
+msgstr "O servidor suporta side-band"
 
-#: fetch-pack.c:882
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
-msgstr "O servidor não suporta clientes rasos"
+msgstr "Servidor insustenta clientes shallow"
 
-#: fetch-pack.c:886
-msgid "Server supports multi_ack_detailed"
-msgstr "O servidor suporta multi_ack_detailed"
+#: fetch-pack.c:1089
+msgid "Server does not support --shallow-since"
+msgstr "Servidor insustenta --shallow-since"
 
-#: fetch-pack.c:889
-msgid "Server supports no-done"
-msgstr "O servidor suporta no-done"
+#: fetch-pack.c:1094
+msgid "Server does not support --shallow-exclude"
+msgstr "Servidor insustenta --shallow-exclude"
 
-#: fetch-pack.c:895
-msgid "Server supports multi_ack"
-msgstr "O servidor suporta muilti_ack"
+#: fetch-pack.c:1098
+msgid "Server does not support --deepen"
+msgstr "Servidor insustenta --deepen"
 
-#: fetch-pack.c:899
-msgid "Server supports side-band-64k"
-msgstr "O servidor suporta side-band-64k"
+#: fetch-pack.c:1100
+#, fuzzy
+msgid "Server does not support this repository's object format"
+msgstr "Servidor insustenta formato de objeto deste repositório"
 
-#: fetch-pack.c:903
-msgid "Server supports side-band"
-msgstr "O servidor suporta side-band"
+#: fetch-pack.c:1113
+msgid "no common commits"
+msgstr "commits comuns nenhuns"
+
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+#, fuzzy
+msgid "source repository is shallow, reject to clone."
+msgstr "o repositório de origem é raso, --local ignorado"
+
+#: fetch-pack.c:1128 fetch-pack.c:1660
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: falha ao obter."
+
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr ""
 
-#: fetch-pack.c:907
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "O servidor suporta allow-tip-sha1-in-want"
+#: fetch-pack.c:1246
+#, fuzzy, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "o servidor insustenta algoritmo '%s'"
 
-#: fetch-pack.c:911
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "O servidor suporta allow-reachable-sha1-in-want"
+#: fetch-pack.c:1279
+#, fuzzy
+msgid "Server does not support shallow requests"
+msgstr "Servidor insustenta pedidos shallow"
 
-#: fetch-pack.c:921
-msgid "Server supports ofs-delta"
-msgstr "O servidor suporta ofs-delta"
+#: fetch-pack.c:1286
+#, fuzzy
+msgid "Server supports filter"
+msgstr "Servidor sustenta filtro"
 
-#: fetch-pack.c:928
+#: fetch-pack.c:1329 fetch-pack.c:2043
+#, fuzzy
+msgid "unable to write request to remote"
+msgstr "incapaz escrever pedidos para remoto"
+
+#: fetch-pack.c:1347
 #, c-format
-msgid "Server version is %.*s"
-msgstr "A versão do servidor é %.*s"
+msgid "error reading section header '%s'"
+msgstr ""
 
-#: fetch-pack.c:934
-msgid "Server does not support --shallow-since"
-msgstr "O servidor não suporta --shallow-since"
+#: fetch-pack.c:1353
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr ""
 
-#: fetch-pack.c:938
-msgid "Server does not support --shallow-exclude"
-msgstr "O servidor não suporta --shallow-exclude"
+#: fetch-pack.c:1387
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr ""
 
-#: fetch-pack.c:940
-msgid "Server does not support --deepen"
-msgstr "O servidor não suporta --deepen"
+#: fetch-pack.c:1392
+#, c-format
+msgid "error processing acks: %d"
+msgstr ""
 
-#: fetch-pack.c:951
-msgid "no common commits"
-msgstr "nenhum commit em comum"
+#: fetch-pack.c:1402
+msgid "expected packfile to be sent after 'ready'"
+msgstr ""
 
-#: fetch-pack.c:963
-msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-pack: falha ao obter."
+#: fetch-pack.c:1404
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr ""
+
+#: fetch-pack.c:1445
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr ""
+
+#: fetch-pack.c:1494
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr ""
+
+#: fetch-pack.c:1499
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr ""
+
+#: fetch-pack.c:1504
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr ""
+
+#: fetch-pack.c:1534
+#, fuzzy
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: esperado pacote fim de resposta"
 
-#: fetch-pack.c:1125
+#: fetch-pack.c:1939
 msgid "no matching remote head"
-msgstr "nenhuma cabeça remota correspondente"
+msgstr "corresponde a remote head nenhuma"
 
-#: fetch-pack.c:1147
+#: 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: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:1150
+#: fetch-pack.c:2091
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
-msgstr "O servidor não permite pedido do objeto não anunciado %s"
+msgstr "Servidor proíbe pedido de objeto por anunciar %s"
 
-#: gpg-interface.c:185
-msgid "gpg failed to sign the data"
-msgstr "gpg não assinou os dados"
-
-#: gpg-interface.c:215
+#: gpg-interface.c:273
 msgid "could not create temporary file"
-msgstr "não foi possível criar ficheiro temporário"
+msgstr "incapaz criar ficheiro temporário"
 
-#: gpg-interface.c:217
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "falha ao escrever assinatura destacada em '%s'"
 
-#: graph.c:96
-#, c-format
-msgid "ignore invalid color '%.*s' in log.graphColors"
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg falhou assinar os dados"
+
+#: graph.c:98
+#, fuzzy, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
 msgstr "ignorar cor inválida '%.*s' em log.graphColors"
 
-#: grep.c:1796
+#: grep.c:531
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+
+#: grep.c:1895
 #, c-format
 msgid "'%s': unable to read %s"
-msgstr "'%s': não foi possível ler %s"
+msgstr "'%s': incapaz ler %s"
 
-#: grep.c:1813 builtin/clone.c:399 builtin/diff.c:81 builtin/rm.c:133
+#: 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:1824
+#: grep.c:1923
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s': leitura truncada"
 
-#: help.c:218
+#: 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)"
+
+#: 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)"
+
+#: 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)"
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+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)"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr ""
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr ""
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr ""
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr ""
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr ""
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr ""
+
+#: help.c:37
+msgid "Low-level Commands / Syncing Repositories"
+msgstr ""
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr ""
+
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "comandos do git disponível em '%s'"
 
-#: help.c:225
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "comandos do git disponíveis noutras localizações em $PATH"
 
-#: help.c:256
+#: help.c:316
 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:321
+#: help.c:365 git.c:100
+#, fuzzy, 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:"
+
+#: help.c:429
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr ""
+
+#: help.c:434
+#, fuzzy
+msgid "External commands"
+msgstr "a executar $command"
+
+#: help.c:449
+msgid "Command aliases"
+msgstr ""
+
+#: help.c:527
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
 "able to execute it. Maybe git-%s is broken?"
 msgstr ""
-"'%s' parece ser um comando do git, mas não é possível\n"
-"executá-lo. Talvez git-%s esteja danificado?"
+"'%s' parece ser comando git, mas incapaz executá-lo.\n"
+"Talvez git-%s esteja danificado?"
+
+#: help.c:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: '%s' é comando git nenhum. Vê 'git --help'."
 
-#: help.c:376
+#: help.c:591
 msgid "Uh oh. Your system reports no Git commands at all."
-msgstr "Oh não. Não há nenhum comando do Git disponível no sistema."
+msgstr "Carago. Teu sistema reporta comandos Git nenhuns."
 
-#: help.c:398
+#: help.c:613
+#, fuzzy, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "AVISO: Chamou comando Git designado '%s', que é inexistente."
+
+#: help.c:618
 #, c-format
-msgid ""
-"WARNING: You called a Git command named '%s', which does not exist.\n"
-"Continuing under the assumption that you meant '%s'"
+msgid "Continuing under the assumption that you meant '%s'."
 msgstr ""
-"AVISO: Invocou um comando do Git designado '%s' que não existe.\n"
-"Continuando, assumindo que queria dizer '%s'"
 
-#: help.c:403
+#: help.c:623
 #, c-format
-msgid "in %0.1f seconds automatically..."
-msgstr "automaticamente em %0.1f..."
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr ""
+
+#: help.c:635
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+msgstr[1] ""
 
-#: help.c:410
+#: help.c:675
+#, fuzzy
+msgid "git version [<options>]"
+msgstr "git column [<opções>]"
+
+#: help.c:730
 #, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: '%s' não é um comando do git. Consulte 'git --help'."
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
 
-#: help.c:414 help.c:480
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -1886,12 +4699,15 @@ msgstr[1] ""
 "\n"
 "Queria dizer deste?"
 
-#: help.c:476
-#, c-format
-msgid "%s: %s - %s"
-msgstr "%s: %s - %s"
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr ""
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr ""
 
-#: ident.c:343
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -1917,40 +4733,99 @@ msgstr ""
 "Omita --global para definir a identidade apenas neste repositório.\n"
 "\n"
 
-#: ident.c:367
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
-msgstr "nenhum e-mail indicado e a deteção automática está desativada"
+msgstr "foi dado email nenhum e deteção automática está desativada"
 
-#: ident.c:372
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
-msgstr ""
-"não é possível detetar automaticamente endereço de e-mail (obteve-se '%s')"
+msgstr "incapaz auto-detetar endereço de e-mail (recebi '%s')"
 
-#: ident.c:382
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
-msgstr "nenhum nome indicado e a deteção automática está desativada"
+msgstr "foi dado nome nenhum e deteção automática está desativada"
 
-#: ident.c:388
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
-msgstr "não é possível detetar automaticamente o nome (obteve-se '%s')"
+msgstr "incapaz auto-detetar nome (recebi '%s')"
 
-#: ident.c:396
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
-msgstr "nome de identificação vazio (de <%s>) não é permitido"
+msgstr "nome de identação vazio (para <%s>) proíbido"
 
-#: ident.c:402
+#: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
-msgstr "nome consiste apenas de caracteres não permitidos: %s"
+msgstr "nome consiste apenas de caracteres proíbidos: %s"
 
-#: ident.c:417 builtin/commit.c:611
+#: 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:83
+msgid "expected 'tree:<depth>'"
+msgstr ""
+
+#: list-objects-filter-options.c:98
+msgid "sparse:path filters support has been dropped"
+msgstr ""
+
+#: list-objects-filter-options.c:105
+#, fuzzy, 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 ""
+
+#: list-objects-filter-options.c:140
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+
+#: list-objects-filter-options.c:182
+msgid "expected something after combine:"
+msgstr ""
+
+#: list-objects-filter-options.c:264
+msgid "multiple filter-specs cannot be combined"
+msgstr ""
+
+#: list-objects-filter-options.c:376
+msgid "unable to upgrade repository format to support partial clone"
+msgstr ""
+
+#: list-objects-filter.c:532
+#, fuzzy, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "incapaz acessar blob sparse em '%s'"
+
+#: list-objects-filter.c:535
+#, fuzzy, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "incapaz analisar dados de filtro sparse em %s"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+
+#: list-objects.c:398
+#, fuzzy, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "incapaz carregar raiz de árvore para commit %s"
+
 #: lockfile.c:152
 #, c-format
 msgid ""
@@ -1962,95 +4837,361 @@ msgid ""
 "may have crashed in this repository earlier:\n"
 "remove the file manually to continue."
 msgstr ""
-"Não é possível criar '%s.lock': %s.\n"
+"Incapaz de criar '%s.lock': %s.\n"
 "\n"
-"Outro processo git parece estar a executar neste repositório, e.g.\n"
-"um editor aberto por 'git commit'. Certifique-se que todos os processos\n"
-"terminaram e tente de novo. Se ainda assim falhar, um processo git\n"
-"pode ter falhado anteriormente no repositório:\n"
-"remova o ficheiro manualmente para continuar."
+"Outro processo git parece estar a correr neste repositório, e.g.\n"
+"um editor aberto por 'git commit'. Por favor, certifica-te que todos\n"
+"os processos são terminados e tenta de novo. Se ainda assim falhar,\n"
+"um processo git anterior pode ter crashado neste repositório:\n"
+"remove o ficheiro manualmente para continuar."
 
 #: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
-msgstr "Não é foi possível criar '%s.lock': %s"
+msgstr "Incapaz de criar '%s.lock': %s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "falha ao ler a cache"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr ""
 
-#: merge.c:96 builtin/am.c:2000 builtin/am.c:2035 builtin/checkout.c:393
-#: builtin/checkout.c:607 builtin/clone.c:749
-msgid "unable to write new index file"
-msgstr "não foi possível escrever novo ficheiro de índice"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr ""
+
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr ""
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "Failed to merge submodule %s"
+msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
+
+#: 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-recursive.c:209
+#: 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
+#, fuzzy, c-format
+msgid "CONFLICT (rename/rename): %s renamed to %s in %s and to %s in %s."
+msgstr ""
+"CONFLITO (mudar nome/mudar nome): Mudar de nome %s->%s em %s. Mudar o nome "
+"%s->%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
+#, fuzzy, c-format
+msgid "CONFLICT (rename/delete): %s renamed to %s in %s, but deleted in %s."
+msgstr ""
+"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado 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 integração em %s"
+
+#: merge-ort.c:3833
+#, fuzzy, c-format
+msgid ""
+"CONFLICT (modify/delete): %s deleted in %s and modified in %s.  Version %s "
+"of %s left in tree."
+msgstr ""
+"CONFLITO (%s/eliminar): %s eliminado em %s e %s em %s. Versão de %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
+#, fuzzy, 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"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+#, fuzzy
+msgid "Already up to date."
+msgstr "Já está atualizado."
+
+#: merge-recursive.c:352
 msgid "(bad commit)\n"
 msgstr "(commit incorreto)\n"
 
-#: merge-recursive.c:231 merge-recursive.c:239
-#, c-format
-msgid "addinfo_cache failed for path '%s'"
+#: merge-recursive.c:375
+#, fuzzy, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "addinfo_cache falhou no caminho '%s'"
 
-#: merge-recursive.c:303
-msgid "error building trees"
-msgstr "erro ao construir árvores"
+#: merge-recursive.c:384
+#, fuzzy, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr "addinfo_cache falhou no caminho '%s'"
 
-#: merge-recursive.c:727
+#: merge-recursive.c:872
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "falha ao criar o caminho '%s'%s"
 
-#: merge-recursive.c:738
+#: 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:752 merge-recursive.c:771
+#: merge-recursive.c:897 merge-recursive.c:916
 msgid ": perhaps a D/F conflict?"
 msgstr ": talvez um conflito D/F?"
 
-#: merge-recursive.c:761
+#: merge-recursive.c:906
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
-msgstr "perda de ficheiro não controlado em '%s' recusada"
+msgstr "recusando perder ficheiro untracked em '%s'"
 
-#: merge-recursive.c:803 builtin/cat-file.c:34
+#: merge-recursive.c:947 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
-msgstr "não é possível ler o objeto %s: '%s'"
+msgstr "incapaz ler objeto %s '%s'"
 
-#: merge-recursive.c:805
+#: merge-recursive.c:952
 #, c-format
 msgid "blob expected for %s '%s'"
-msgstr "blob para %s '%s' esperado"
+msgstr ""
 
-#: merge-recursive.c:829
+#: 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:840
+#: 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:845
+#: merge-recursive.c:993
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
-msgstr "não sei o que fazer com %06o %s '%s'"
+msgstr "desconheço que fazer com %06o %s '%s'"
 
-#: merge-recursive.c:985
-msgid "Failed to execute internal merge"
-msgstr "Falha ao executar integração interna"
+#: merge-recursive.c:1223 merge-recursive.c:1235
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr ""
+
+#: merge-recursive.c:1226 merge-recursive.c:1238
+#, fuzzy, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "Avançando submódulo %s"
 
-#: merge-recursive.c:989
+#: merge-recursive.c:1261
 #, c-format
-msgid "Unable to add %s to database"
-msgstr "Não é possível adicionar %s à base de dados"
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr ""
+
+#: merge-recursive.c:1265
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr ""
+
+#: merge-recursive.c:1266
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr ""
+
+#: merge-recursive.c:1278
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr ""
+
+#: merge-recursive.c:1420
+#, 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"
 
-#: merge-recursive.c:1092
+#: merge-recursive.c:1492
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2059,7 +5200,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:1097
+#: merge-recursive.c:1497
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2068,7 +5209,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:1104
+#: merge-recursive.c:1504
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2077,7 +5218,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:1109
+#: merge-recursive.c:1509
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2086,20 +5227,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:1143
+#: merge-recursive.c:1544
 msgid "rename"
 msgstr "mudar nome"
 
-#: merge-recursive.c:1143
+#: merge-recursive.c:1544
 msgid "renamed"
 msgstr "nome mudado"
 
-#: merge-recursive.c:1200
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#, fuzzy, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "Recusando perder ficheiro sujo de %s"
+
+#: merge-recursive.c:1605
+#, fuzzy, 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."
+
+#: merge-recursive.c:1663
+#, fuzzy, 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: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:1225
+#: merge-recursive.c:1699
+#, fuzzy, 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"
+
+#: merge-recursive.c:1726
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2108,245 +5272,956 @@ 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:1230
+#: merge-recursive.c:1731
 msgid " (left unresolved)"
 msgstr " (por resolver)"
 
-#: merge-recursive.c:1292
+#: 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:1325
-#, 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"
-
-#: merge-recursive.c:1528
+#: merge-recursive.c:2086
 #, c-format
-msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+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."
 msgstr ""
-"CONFLITO (mudar nome/adicionar): Mudar o nome %s->%s em %s. %s adicionado em "
-"%s"
 
-#: merge-recursive.c:1543
-#, c-format
-msgid "Adding merged %s"
-msgstr "A adicionar %s integrado"
-
-#: merge-recursive.c:1550 merge-recursive.c:1780
-#, c-format
-msgid "Adding as %s instead"
-msgstr "A adicionar como %s, em alternativa."
-
-#: merge-recursive.c:1607
-#, c-format
-msgid "cannot read object %s"
-msgstr "não foi possível ler o objeto %s"
-
-#: merge-recursive.c:1610
-#, c-format
-msgid "object %s is not a blob"
-msgstr "o objeto %s não é um blob"
+#: merge-recursive.c:2220
+#, 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:1679
+#: merge-recursive.c:3075
 msgid "modify"
 msgstr "modificar"
 
-#: merge-recursive.c:1679
+#: merge-recursive.c:3075
 msgid "modified"
 msgstr "modificado"
 
-#: merge-recursive.c:1689
-msgid "content"
-msgstr "conteúdo"
-
-#: merge-recursive.c:1696
-msgid "add/add"
-msgstr "adicionar/adicionar"
-
-#: merge-recursive.c:1732
+#: merge-recursive.c:3114
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "%s ignorado (integrado é igual ao existente)"
 
-#: merge-recursive.c:1746
+#: merge-recursive.c:3167
 #, c-format
-msgid "Auto-merging %s"
-msgstr "A integrar automaticamente %s"
-
-#: merge-recursive.c:1750 git-submodule.sh:944
-msgid "submodule"
-msgstr "submódulo"
-
-#: merge-recursive.c:1751
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "CONFLITO (%s): conflito de integração em %s"
+msgid "Adding as %s instead"
+msgstr "A adicionar como %s, em alternativa."
 
-#: merge-recursive.c:1845
+#: merge-recursive.c:3371
 #, c-format
 msgid "Removing %s"
 msgstr "A remover %s"
 
-#: merge-recursive.c:1871
+#: merge-recursive.c:3394
 msgid "file/directory"
 msgstr "ficheiro/diretório"
 
-#: merge-recursive.c:1877
+#: merge-recursive.c:3399
 msgid "directory/file"
 msgstr "diretório/ficheiro"
 
-#: merge-recursive.c:1883
+#: 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:1892
+#: merge-recursive.c:3415
 #, c-format
 msgid "Adding %s"
 msgstr "A adicionar %s"
 
-#: merge-recursive.c:1929
-msgid "Already up-to-date!"
-msgstr "Já está atualizado!"
+#: merge-recursive.c:3424
+#, fuzzy, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "CONFLITO (%s): conflito de integração em %s"
 
-#: merge-recursive.c:1938
+#: 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:2021
+#: merge-recursive.c:3571
 msgid "Merging:"
 msgstr "A integrar:"
 
-#: merge-recursive.c:2034
+#: 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:2073
+#: merge-recursive.c:3634
 msgid "merge returned no commit"
-msgstr "a integração não retornou nenhum commit"
+msgstr "junção retornou commit nenhum"
 
-#: merge-recursive.c:2136
+#: merge-recursive.c:3799
 #, c-format
 msgid "Could not parse object '%s'"
-msgstr "Não foi possível analisar o objeto '%s'"
+msgstr "Incapaz de analisar objeto '%s'"
 
-#: merge-recursive.c:2150 builtin/merge.c:645 builtin/merge.c:792
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
 msgid "Unable to write index."
-msgstr "Não é possível escrever no índice."
+msgstr "Incapaz de escrever no index."
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "falha ao ler a cache"
+
+#: 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:74
+#, fuzzy
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "versão %d de multi-pack-index é irreconhecível"
+
+#: midx.c:105
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr ""
+
+#: midx.c:121
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr ""
+
+#: midx.c:126
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "versão %d de multi-pack-index é irreconhecível"
+
+#: midx.c:131
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr ""
+
+#: midx.c:148
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr ""
+
+#: midx.c:150
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr ""
+
+#: midx.c:152
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr ""
+
+#: midx.c:154
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr ""
+
+#: midx.c:170
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr ""
+
+#: midx.c:214
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr ""
+
+#: midx.c:264
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr ""
+
+#: midx.c:490
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr ""
+
+#: midx.c:496
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr ""
+
+#: midx.c:564
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr ""
+
+#: midx.c:880 builtin/index-pack.c:1533
+#, fuzzy
+msgid "cannot store reverse index file"
+msgstr "incapaz guardar ficheiro index"
+
+#: 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:989
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr ""
+
+#: midx.c:1039
+#, fuzzy, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "o repositório de referência '%s' está enxertado"
+
+#: midx.c:1055
+#, fuzzy
+msgid "no pack files to index."
+msgstr "pack files nenhuns para index."
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "falha ao remover %s"
+
+#: midx.c:1166
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr ""
+
+#: midx.c:1225
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
 
-#: notes-merge.c:273
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr "checksum incorreto"
+
+#: midx.c:1236
+msgid "Looking for referenced packfiles"
+msgstr ""
+
+#: midx.c:1251
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr ""
+
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr ""
+
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
+msgstr ""
+
+#: midx.c:1274
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr ""
+
+#: midx.c:1294
+msgid "Sorting objects by packfile"
+msgstr ""
+
+#: midx.c:1301
+msgid "Verifying object offsets"
+msgstr ""
+
+#: midx.c:1317
+#, fuzzy, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "falhou carregar entrada pack para oid[%d] = %s"
+
+#: midx.c:1323
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr ""
+
+#: midx.c:1332
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr ""
+
+#: midx.c:1357
+#, fuzzy
+msgid "Counting referenced objects"
+msgstr "Contando objetos referenciados"
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr ""
+
+#: midx.c:1558
+#, fuzzy
+msgid "could not start pack-objects"
+msgstr "incapaz de começar pack-objects"
+
+#: midx.c:1578
+#, fuzzy
+msgid "could not finish pack-objects"
+msgstr "incapaz de terminar pack-objects"
+
+#: name-hash.c:542
+#, fuzzy, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "incapaz criar thread lazy_dir: %s"
+
+#: name-hash.c:564
+#, fuzzy, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "incapaz criar thread lazy_name: %s"
+
+#: name-hash.c:570
+#, fuzzy, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "incapaz juntar a thread 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."
 msgstr ""
-"Não concluíu a integração de notas anterior (%s existe).\n"
-"Use 'git notes merge --commit' ou 'git notes merge --abort' para submeter/"
-"abortar a integração anterior antes de começar uma nova integração de notas."
+"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."
 
-#: notes-merge.c:280
+#: notes-merge.c:284
 #, c-format
 msgid "You have not concluded your notes merge (%s exists)."
-msgstr "Não concluído a integração de integração de notas (%s presente)."
+msgstr "Ficou por concluír a tua junção de notas (%s existe)."
 
-#: notes-utils.c:41
+#: notes-utils.c:46
 msgid "Cannot commit uninitialized/unreferenced notes tree"
 msgstr ""
-"Não é possível submeter árvore de notas não inicializada ou não referenciada"
+"Impossível commit notas de árvore que estejam por iniciar/por referênciar"
 
-#: notes-utils.c:100
+#: notes-utils.c:105
 #, c-format
 msgid "Bad notes.rewriteMode value: '%s'"
 msgstr "Valor de notes.rewriteMode incorreto: '%s'"
 
-#: notes-utils.c:110
+#: notes-utils.c:115
 #, c-format
 msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
 msgstr "Reescrita de notas em %s (fora de refs/notes/) recusada"
 
-#. TRANSLATORS: The first %s is the name of the
-#. environment variable, the second %s is its value
-#: notes-utils.c:137
+#. 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 incorreto de %s: '%s'"
 
-#: object.c:240
+#: object-file.c:526
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr ""
+
+#: object-file.c:584
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "incapaz normalizar pasta de objeto: %s"
+
+#: object-file.c:708
+#, fuzzy
+msgid "unable to fdopen alternates lockfile"
+msgstr "incapaz de fdopen lockfile alternativo"
+
+#: object-file.c:726
+#, fuzzy
+msgid "unable to read alternates file"
+msgstr "incapaz ler ficheiro alternativo"
+
+#: object-file.c:733
+#, fuzzy
+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 "o 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
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "corrupt loose object '%s'"
+msgstr "objeto solto '%s' corrupto"
+
+#: object-file.c:1355 object-file.c:2552
+#, fuzzy, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "lixo no fim de objeto solto '%s'"
+
+#: object-file.c:1397
+#, fuzzy
+msgid "invalid object type"
+msgstr "tipo de objeto incorreto."
+
+#: object-file.c:1481
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr ""
+
+#: object-file.c:1484
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "unable to parse %s header"
+msgstr "incapaz processar cabeçalho %s"
+
+#: object-file.c:1717
+#, fuzzy, c-format
+msgid "failed to read object %s"
+msgstr "falha ao ler o objeto '%s'."
+
+#: object-file.c:1721
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "unable to write file %s"
+msgstr "incapaz escrever ficheiro %s"
+
+#: object-file.c:1841
+#, fuzzy, 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
+#, fuzzy
+msgid "unable to create temporary file"
+msgstr "incapaz criar ficheiro temporário"
+
+#: object-file.c:1959
+#, fuzzy
+msgid "unable to write loose object file"
+msgstr "incapaz escrever ficheiro objeto solto"
+
+#: object-file.c:1965
+#, fuzzy, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "incapaz esvaziar objeto novo %s (%d)"
+
+#: object-file.c:1969
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "cannot read object for %s"
+msgstr "incapaz ler objeto para %s"
+
+#: object-file.c:2111
+#, fuzzy
+msgid "corrupt commit"
+msgstr "substituir autor do commit"
+
+#: object-file.c:2119
+#, fuzzy
+msgid "corrupt tag"
+msgstr "mostrar tags"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr ""
+
+#: object-file.c:2222
+#, fuzzy, c-format
+msgid "short read while indexing %s"
+msgstr "leitura curta enquanto indexando %s"
+
+#: object-file.c:2295 object-file.c:2305
+#, fuzzy, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: falhou inserir na base de dados"
+
+#: object-file.c:2311
+#, fuzzy, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: tipo ficheiro insustentado"
+
+#: object-file.c:2335
+#, fuzzy, 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
+#, fuzzy, c-format
+msgid "unable to mmap %s"
+msgstr "incapaz mmap %s"
+
+#: object-file.c:2588
+#, fuzzy, c-format
+msgid "unable to unpack header of %s"
+msgstr "incapaz desempacotar cabeçalho de %s"
+
+#: object-file.c:2594
+#, fuzzy, c-format
+msgid "unable to parse header of %s"
+msgstr "incapaz processar cabeçalho de %s"
+
+#: object-file.c:2605
+#, fuzzy, c-format
+msgid "unable to unpack contents of %s"
+msgstr "incapaz desempacotar conteúdo de %s"
+
+#: object-name.c:480
+#, fuzzy, 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
+#, 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\""
+
+#: 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
+#, fuzzy, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "O caminho '%s' está dentro do submódulo '%.*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
+#, fuzzy, 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
+#, fuzzy, 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
+#, 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"
+
+#: object-name.c:1916
+#, fuzzy, c-format
+msgid "invalid object name '%.*s'."
+msgstr "Nome de objeto inválido: '%s'."
+
+#: object.c:53
+#, fuzzy, c-format
+msgid "invalid object type \"%s\""
+msgstr "objeto blob inválido %s"
+
+#: object.c:173
+#, fuzzy, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "objeto %s é %s, é %s nenhum(a)"
+
+#: object.c:250
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr ""
+
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
-msgstr "não foi possível analisar o objeto: %s"
+msgstr "incapaz analisar objeto: %s"
+
+#: object.c:283 object.c:295
+#, c-format
+msgid "hash mismatch %s"
+msgstr ""
+
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, fuzzy, c-format
+msgid "unable to get size of %s"
+msgstr "incapaz obter tamanho de %s"
+
+#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#, fuzzy, c-format
+msgid "unable to get disk usage of %s"
+msgstr "incapaz obter tamanho 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
+#, fuzzy
+msgid "cannot both write and verify reverse index"
+msgstr "incapaz ler o index"
+
+#: pack-write.c:271
+#, fuzzy, c-format
+msgid "could not stat: %s"
+msgstr "incapaz obter estatutário %s"
+
+#: pack-write.c:283
+#, fuzzy, c-format
+msgid "failed to make %s readable"
+msgstr "falha a analisar %s"
+
+#: pack-write.c:522
+#, fuzzy, 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:655
+#, fuzzy, 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: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
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr ""
+
+#: parse-options-cb.c:41
+#, fuzzy, c-format
+msgid "malformed expiration date '%s'"
+msgstr "data de prazo de validade malformada '%s'"
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+
+#: parse-options-cb.c:132 parse-options-cb.c:149
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nome do objeto malformado '%s'"
+
+#: parse-options.c:38
+#, fuzzy, c-format
+msgid "%s requires a value"
+msgstr "a opção '%s' requer um valor"
+
+#: parse-options.c:73
+#, fuzzy, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s é incompatível com %s"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr ""
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#, fuzzy, c-format
+msgid "%s takes no value"
+msgstr "%s tem múltiplos valores"
+
+#: parse-options.c:94
+#, fuzzy, c-format
+msgid "%s isn't available"
+msgstr "%s está indisponível"
+
+#: parse-options.c:217
+#, c-format
+msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
+msgstr ""
+
+#: parse-options.c:386
+#, c-format
+msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
+msgstr ""
+
+#: parse-options.c:420 parse-options.c:428
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr ""
+
+#: parse-options.c:668 parse-options.c:988
+#, c-format
+msgid "alias of --%s"
+msgstr ""
+
+#: parse-options.c:879
+#, c-format
+msgid "unknown option `%s'"
+msgstr ""
+
+#: parse-options.c:881
+#, c-format
+msgid "unknown switch `%c'"
+msgstr ""
 
-#: parse-options.c:572
+#: parse-options.c:883
+#, fuzzy, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "Definidição --confirm desconhecida: '%s'"
+
+#: parse-options.c:907
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:590
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr "utilização: %s"
 
 #. TRANSLATORS: the colon here should align with the
-#. one in "usage: %s" translation
-#: parse-options.c:594
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
 msgstr "        ou: %s"
 
-#: parse-options.c:597
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr "         %s"
 
-#: parse-options.c:631
+#: parse-options.c:974
 msgid "-NUM"
 msgstr "-NUM"
 
-#: parse-options-cb.c:108
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "nome do objeto malformado '%s'"
-
-#: path.c:805
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
-msgstr "Não foi possível dar permissão de escrita ao grupo a %s"
+msgstr "Incapaz de fazer %s escrevível ao grupo"
 
-#: pathspec.c:125
+#: pathspec.c:151
 msgid "Escape character '\\' not allowed as last character in attr value"
-msgstr ""
-"O carácter de escape '\\' não pode ser usado como último carácter no valor "
-"de attr"
+msgstr "Carácter de escape '\\' é proíbido como último carácter no valor attr"
 
-#: pathspec.c:143
+#: pathspec.c:169
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Só se pode especificar um 'attr:'."
 
-#: pathspec.c:146
+#: pathspec.c:172
 msgid "attr spec must not be empty"
-msgstr "especificador attr não pode estar vazio"
+msgstr "attr spec tem de ter algum conteúdo"
 
-#: pathspec.c:189
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "nome de atributo inválido %s"
 
-#: pathspec.c:254
+#: 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:261
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -2354,69 +6229,243 @@ 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:301
+#: pathspec.c:327
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
 
-#: pathspec.c:322
+#: 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:327
+#: 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:365
+#: pathspec.c:391
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Mágica de especificador de caminho '%c' em '%s' não implementada"
+msgstr "Por implementar, magic pathspec '%c' em '%s'"
 
-#: pathspec.c:421 pathspec.c:443
-#, c-format
-msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
-
-#: pathspec.c:483
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: 'literal' e 'glob' são incompatíveis"
 
-#: pathspec.c:496
-#, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' está fora do repositório"
+#: pathspec.c:466
+#, fuzzy, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s' está fora do repositório em '%s'"
 
-#: pathspec.c:584
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s' (mnemónica: '%c')"
 
-#: pathspec.c:594
+#: 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: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:664
+#, c-format
+msgid "line is badly quoted: %s"
 msgstr ""
-"%s: mágica de especificador de caminho não suportada por este comando: %s"
 
-#: pathspec.c:644
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
+#: 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 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: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:204
+msgid "packet write failed - data exceeds max packet size"
 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"
 
-#: pathspec.c:668
+#: pkt-line.c:222
+#, fuzzy, c-format
+msgid "packet write failed: %s"
+msgstr "escrita de pacote falhou"
+
+#: pkt-line.c:328 pkt-line.c:329
+#, fuzzy
+msgid "read error"
+msgstr "erro do programa"
+
+#: pkt-line.c:339 pkt-line.c:340
+#, fuzzy
+msgid "the remote end hung up unexpectedly"
+msgstr "O remoto desligou após contacto inicial"
+
+#: pkt-line.c:369 pkt-line.c:371
 #, c-format
-msgid "pathspec '%s' is beyond a symbolic link"
-msgstr "o especificador de caminho '%s' é indicado por uma ligação simbólica"
+msgid "protocol error: bad line length character: %.4s"
+msgstr ""
 
-#: pretty.c:982
+#: 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 ""
+
+#: pkt-line.c:413 sideband.c:165
+#, c-format
+msgid "remote error: %s"
+msgstr "erro remoto: %s"
+
+#: preload-index.c:125
+#, fuzzy
+msgid "Refreshing index"
+msgstr "Refrescando index"
+
+#: preload-index.c:144
+#, fuzzy, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "incapaz criar thread de lstat: %s"
+
+#: pretty.c:988
 msgid "unable to parse --pretty format"
-msgstr "não foi possível analisar o formato de --pretty"
+msgstr "incapaz analisar formato de --pretty"
+
+#: promisor-remote.c:31
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c:38 promisor-remote.c:40
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr ""
 
-#: read-cache.c:1307
+#: promisor-remote.c:44
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c:54
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr ""
+
+#: protocol-caps.c:103
+#, fuzzy
+msgid "object-info: expected flush after arguments"
+msgstr "--continue supõe argumento nenhum"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "A remover objetos duplicados"
+
+#: range-diff.c:78
+#, fuzzy
+msgid "could not start `log`"
+msgstr "incapaz começar `log`"
+
+#: range-diff.c:80
+#, fuzzy
+msgid "could not read `log` output"
+msgstr "incapaz ler output de `log`"
+
+#: range-diff.c:101 sequencer.c:5550
+#, fuzzy, c-format
+msgid "could not parse commit '%s'"
+msgstr "incapaz analisar commit '%s'"
+
+#: 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:140
+#, fuzzy, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "incapaz analisar cabeçalho git '%.*s'"
+
+#: range-diff.c:307
+msgid "failed to generate diff"
+msgstr ""
+
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr ""
+
+#: range-diff.c:562 range-diff.c:564
+#, fuzzy, c-format
+msgid "could not parse log for '%s'"
+msgstr "incapaz analisar log para '%s'"
+
+#: read-cache.c:710
+#, fuzzy, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "%s: já existe no índice"
+
+#: read-cache.c:726
+msgid "cannot create an empty blob in the object database"
+msgstr ""
+
+#: read-cache.c:748
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+
+#: read-cache.c:753
+#, fuzzy, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' tem commit checked out nenhum"
+
+#: read-cache.c:805
+#, fuzzy, c-format
+msgid "unable to index file '%s'"
+msgstr "incapaz indexar ficheiro '%s'"
+
+#: read-cache.c:824
+#, fuzzy, c-format
+msgid "unable to add '%s' to index"
+msgstr "incapaz adicionar %s a index"
+
+#: read-cache.c:835
+#, fuzzy, c-format
+msgid "unable to stat '%s'"
+msgstr "incapaz obter estatutário de '%s'"
+
+#: read-cache.c:1358
+#, fuzzy, 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:1573
+#, fuzzy
+msgid "Refresh index"
+msgstr "Refresca index"
+
+#: read-cache.c:1705
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2425,7 +6474,7 @@ msgstr ""
 "index.version definido, mas com valor inválido.\n"
 "A usar a versão %i"
 
-#: read-cache.c:1317
+#: read-cache.c:1715
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2434,360 +6483,870 @@ msgstr ""
 "GIT_INDEX_VERSION definido, mas com valor inválido.\n"
 "A usar a versão %i"
 
-#: read-cache.c:2232
+#: read-cache.c:1771
 #, c-format
-msgid "could not stat '%s"
-msgstr "não foi possível obter stat de '%s'"
+msgid "bad signature 0x%08x"
+msgstr ""
+
+#: read-cache.c:1774
+#, fuzzy, c-format
+msgid "bad index version %d"
+msgstr "versão de índice '%s' incorreta"
 
-#: read-cache.c:2245
+#: read-cache.c:1783
+msgid "bad index file sha1 signature"
+msgstr ""
+
+#: read-cache.c:1817
 #, c-format
-msgid "unable to open git dir: %s"
-msgstr "não é possível diretório git: %s"
+msgid "index uses %.4s extension, which we do not understand"
+msgstr ""
 
-#: read-cache.c:2257
+#: read-cache.c:1819
+#, fuzzy, c-format
+msgid "ignoring %.4s extension"
+msgstr "modelo %s ignorado"
+
+#: read-cache.c:1856
+#, fuzzy, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "formato de %.*s desconhecido %s"
+
+#: read-cache.c:1872
 #, c-format
-msgid "unable to unlink: %s"
-msgstr "não é possível invocar unlink: %s"
+msgid "malformed name field in the index, near path '%s'"
+msgstr ""
+
+#: read-cache.c:1929
+msgid "unordered stage entries in index"
+msgstr ""
+
+#: read-cache.c:1932
+#, fuzzy, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "multíplas entradas de estágio para ficheiro juntado '%s'"
+
+#: read-cache.c:1935
+#, fuzzy, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "entradas de estágio desordenadas para '%s'"
+
+#: 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 ""
+
+#: read-cache.c:2185
+#, fuzzy, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "incapaz criar thread load_cache_entries: %s"
 
-#: refs.c:619 builtin/merge.c:844
+#: read-cache.c:2198
+#, fuzzy, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "incapaz juntar a thread load_cache_entries: %s"
+
+#: read-cache.c:2231
+#, fuzzy, c-format
+msgid "%s: index file open failed"
+msgstr "falha ao adicionar ficheiros"
+
+#: read-cache.c:2235
+#, fuzzy, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: incapaz obter estatutário de index aberto"
+
+#: read-cache.c:2239
 #, c-format
-msgid "Could not open '%s' for writing"
-msgstr "Não foi possível abrir '%s' para escrita"
+msgid "%s: index file smaller than expected"
+msgstr ""
+
+#: read-cache.c:2243
+#, fuzzy, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s: incapaz mapear ficheiro index%s"
+
+#: read-cache.c:2286
+#, fuzzy, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "incapaz criar thread load_index_extensions: %s"
 
-#: refs/files-backend.c:2531
+#: read-cache.c:2313
+#, fuzzy, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "incapaz juntar a thread load_index_extensions: %s"
+
+#: read-cache.c:2351
+#, fuzzy, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "incapaz refrescar index partilhado '%s'"
+
+#: read-cache.c:2398
 #, c-format
-msgid "could not delete reference %s: %s"
-msgstr "não foi possível eliminar a referência %s: %s"
+msgid "broken index, expect %s in %s, got %s"
+msgstr ""
 
-#: refs/files-backend.c:2534
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
 #, c-format
-msgid "could not delete references: %s"
-msgstr "não foi possível eliminar as referências: %s"
+msgid "could not close '%s'"
+msgstr "incapaz fechar '%s'"
+
+#: read-cache.c:3075
+msgid "failed to convert to a sparse-index"
+msgstr ""
+
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#, fuzzy, c-format
+msgid "could not stat '%s'"
+msgstr "incapaz obter estatutário '%s'"
 
-#: refs/files-backend.c:2543
+#: read-cache.c:3159
 #, c-format
-msgid "could not remove reference %s"
-msgstr "não foi possível eliminar a referência %s"
+msgid "unable to open git dir: %s"
+msgstr "incapaz abrir pasta git: %s"
+
+#: read-cache.c:3171
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "incapaz deslinkar: %s"
+
+#: read-cache.c:3200
+#, fuzzy, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "incapaz arranjar bits de permissão em '%s'"
+
+#: read-cache.c:3349
+#, fuzzy, 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"
 
-#: ref-filter.c:35 wt-status.c:1780
+#: rebase-interactive.c:33
+#, fuzzy, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"Definição $check_level desconhecida da opção rebase.missingCommitsCheck. "
+"Ignorado."
+
+#: rebase-interactive.c:42
+#, fuzzy
+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 [-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"
+"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 = 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"
+"\n"
+"Estas linhas pode ser reordenadas; são executadas de cima para baixo.\n"
+
+#: rebase-interactive.c:66
+#, fuzzy, 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)"
+
+#: 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"
+msgstr ""
+"\n"
+"Remove linha nenhuma. Usa explicitamente 'drop' para remover um commit.\n"
+
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Se remover uma linha daqui AQUELE COMMIT SER� PERDIDO.\n"
+
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Está a editar o ficheiro de tarefa de um rebase interativo em curso.\n"
+"Para continuar o rebase depois de editar, execute:\n"
+"    git rebase --continue\n"
+"\n"
+
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"No entanto, se remover tudo, o rebase será abortado.\n"
+"\n"
+
+#: 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
+#, fuzzy, c-format
+msgid "could not write '%s'"
+msgstr "incapaz escrever '%s'"
+
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
+#, fuzzy, c-format
+msgid "could not write '%s'."
+msgstr "incapaz escrever '%s'."
+
+#: rebase-interactive.c:196
+#, fuzzy, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Aviso: alguns commits podem ter sido descartados acidentalmente.\n"
+"Commits descartados (mais novo para o mais velho):\n"
+
+#: rebase-interactive.c:203
+#, fuzzy, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Para evitar esta mensagem, use \"drop\" para remover um commit "
+"explicitamente.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' para mudar o nível de avisos.\n"
+"O comportamentos possíveis são: 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
+#, c-format
+msgid "could not read '%s'."
+msgstr "incapaz ler '%s'."
+
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
-msgstr "desaparecido"
+msgstr "desapareceu"
 
-#: ref-filter.c:36
+#: ref-filter.c:43
 #, c-format
 msgid "ahead %d"
 msgstr "à frente %d"
 
-#: ref-filter.c:37
+#: ref-filter.c:44
 #, c-format
 msgid "behind %d"
 msgstr "atrás %d"
 
-#: ref-filter.c:38
+#: ref-filter.c:45
 #, c-format
 msgid "ahead %d, behind %d"
 msgstr "à frente %d, atrás %d"
 
-#: ref-filter.c:104
+#: ref-filter.c:230
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "formato esperado: %%(color:<cor>)"
 
-#: ref-filter.c:106
+#: ref-filter.c:232
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
-msgstr "cor não reconhecida: %%(color:%s)"
+msgstr "cor desconhecida: %%(color:%s)"
 
-#: ref-filter.c:120
+#: ref-filter.c:254
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "valor inteiro esperado refname:lstrip=%s"
 
-#: ref-filter.c:124
+#: ref-filter.c:258
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Valor inteiro esperado refname:rstrip=%s"
 
-#: ref-filter.c:126
+#: ref-filter.c:260
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
-msgstr "argumento de %%(%s) não reconhecido: %s"
+msgstr "argumento %%(%s) desconhecido: %s"
+
+#: ref-filter.c:315
+#, fuzzy, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) leva argumentos nenhuns"
+
+#: ref-filter.c:339
+#, fuzzy, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "argumento %%(objectsize) desconhecido: %s"
 
-#: ref-filter.c:166
+#: ref-filter.c:347
+#, fuzzy, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) leva argumentos nenhuns"
+
+#: ref-filter.c:359
 #, c-format
 msgid "%%(body) does not take arguments"
-msgstr "%%(body) não leva argumentos"
+msgstr "%%(body) leva argumentos nenhuns"
 
-#: ref-filter.c:173
-#, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) não leva argumentos"
+#: ref-filter.c:372
+#, fuzzy, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "argumento %%(subject) desconhecido: %s"
 
-#: ref-filter.c:180
+#: ref-filter.c:391
 #, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) não leva argumentos"
+msgid "expected %%(trailers:key=<value>)"
+msgstr ""
 
-#: ref-filter.c:199
+#: ref-filter.c:393
+#, fuzzy, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "argumento %%(trailers) desconhecido: %s"
+
+#: ref-filter.c:424
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "valor positivo esperado contents:lines=%s"
 
-#: ref-filter.c:201
+#: ref-filter.c:426
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
-msgstr "argumento de %%(contents) não reconhecido: %s"
+msgstr "argumento %%(contents) desconhecido: %s"
 
-#: ref-filter.c:214
-#, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "valor positivo esperado objectname:short=%s"
+#: ref-filter.c:441
+#, fuzzy, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "valor positivo esperado contents:lines=%s"
 
-#: ref-filter.c:218
-#, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "argumento de %%(objectname) não reconhecido: %s"
+#: ref-filter.c:445
+#, fuzzy, c-format
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "argumento '%s' desconhecido em %%(%s)"
 
-#: ref-filter.c:245
+#: ref-filter.c:459
+#, fuzzy, c-format
+msgid "unrecognized email option: %s"
+msgstr "opção de email desconhecida: %s"
+
+#: ref-filter.c:489
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "formato esperado: %%(align:<largura>,<posição>)"
 
-#: ref-filter.c:257
+#: ref-filter.c:501
 #, c-format
 msgid "unrecognized position:%s"
-msgstr "posição não reconhecida:%s"
+msgstr "posição desconhecida: %s"
 
-#: ref-filter.c:261
+#: ref-filter.c:508
 #, c-format
 msgid "unrecognized width:%s"
-msgstr "largura não reconhecida:%s"
+msgstr "largura desconhecida: %s"
 
-#: ref-filter.c:267
+#: ref-filter.c:517
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
-msgstr "argumento de %%(align) não reconhecido: %s"
+msgstr "argumento %%(align) desconhecido: %s"
 
-#: ref-filter.c:271
+#: ref-filter.c:525
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "largura positiva esperada com o átomo %%(algn)"
 
-#: ref-filter.c:286
+#: ref-filter.c:543
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
-msgstr "argumento de %%(if) não reconhecido: %s"
+msgstr "argumento %%(if) desconhecido: %s"
 
-#: ref-filter.c:371
+#: ref-filter.c:645
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "nome de ficheiro malformado: %.*s"
 
-#: ref-filter.c:397
+#: ref-filter.c:672
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "nome do campo desconhecido: %.*s"
 
-#: ref-filter.c:501
+#: ref-filter.c:676
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr ""
+
+#: 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:561
+#: 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:563
+#: 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:565
+#: ref-filter.c:869
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "formato: átomo %%(then) utilizado depois de %%(else)"
 
-#: ref-filter.c:591
+#: 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:593
+#: 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:595
+#: 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:608
+#: 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:663
+#: ref-filter.c:973
 #, c-format
 msgid "malformed format string %s"
-msgstr "cadeia malformada %s"
+msgstr "formato de string %s malformado"
 
-#: ref-filter.c:1247
-#, c-format
+#: ref-filter.c:1621
+#, fuzzy, c-format
 msgid "(no branch, rebasing %s)"
-msgstr "(nenhum ramo, a efetuar rebase de %s)"
+msgstr "(ramo nenhum, rebaseando %s)"
 
-#: ref-filter.c:1250
-#, c-format
+#: ref-filter.c:1624
+#, fuzzy, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(ramo nenhum, rebaseando HEAD solta %s)"
+
+#: ref-filter.c:1627
+#, fuzzy, c-format
 msgid "(no branch, bisect started on %s)"
-msgstr "(nenhum ramo, bissecção iniciada em %s)"
+msgstr "(ramo nenhum, bisseção iniciada em %s)"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached at " in wt-status.c
-#: ref-filter.c:1256
+#: ref-filter.c:1631
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "(HEAD destacada em %s)"
 
-#. TRANSLATORS: make sure this matches
-#. "HEAD detached from " in wt-status.c
-#: ref-filter.c:1261
+#: ref-filter.c:1634
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "(HEAD destacada de %s)"
 
-#: ref-filter.c:1265
+#: ref-filter.c:1637
+#, fuzzy
 msgid "(no branch)"
-msgstr "(nenhum ramo)"
+msgstr "(ramo nenhum)"
 
-#: ref-filter.c:1420 ref-filter.c:1451
+#: 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:1423 ref-filter.c:1454
+#: 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:1692
+#: ref-filter.c:2064
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "objeto malformado em '%s'"
 
-#: ref-filter.c:1759
+#: 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:1764
+#: ref-filter.c:2158 refs.c:676
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "a referência %s danificada foi ignorada"
 
-#: ref-filter.c:2028
+#: ref-filter.c:2502
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "formato: falta átomo %%(end)"
 
-#: ref-filter.c:2109
+#: ref-filter.c:2596
 #, c-format
 msgid "malformed object name %s"
 msgstr "nome de objeto malformado %s"
 
-#: remote.c:754
+#: ref-filter.c:2601
+#, fuzzy, 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
+msgid "%s does not point to a valid object!"
+msgstr "'%s' aponta para objeto válido nenhum!"
+
+#: 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
+#, fuzzy, c-format
+msgid "could not retrieve `%s`"
+msgstr "incapaz recuperar '%s'"
+
+#: refs.c:598
+#, fuzzy, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "Nome de ramo inválido: %s = %s"
+
+#: refs.c:674
+#, fuzzy, c-format
+msgid "ignoring dangling symref %s"
+msgstr "a referência %s danificada foi ignorada"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1086
+#, fuzzy, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "recusando atualizar ref com nome inválido '%s'"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#: refs.c:2051
+#, fuzzy, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "atualizações múltiplas para ref '%s' proíbidas"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr ""
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr ""
+
+#: refs.c:2242 refs.c:2272
+#, fuzzy, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' existe; incapaz criar '%s'"
+
+#: refs.c:2248 refs.c:2283
+#, fuzzy, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "incapaz processar '%s' e '%s' ao mesmo tempo"
+
+#: refs/files-backend.c:1228
+#, c-format
+msgid "could not remove reference %s"
+msgstr "incapaz remover referência %s"
+
+#: refs/files-backend.c:1242 refs/packed-backend.c:1542
+#: refs/packed-backend.c:1552
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "incapaz apagar referência %s: %s"
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr "incapaz apagar referências: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr ""
+
+#: remote.c:351
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr ""
+
+#: remote.c:399
+msgid "more than one receivepack given, using the first"
+msgstr ""
+
+#: remote.c:407
+msgid "more than one uploadpack given, using the first"
+msgstr ""
+
+#: remote.c:590
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
-msgstr "Não é possível obter %s e %s ao mesmo tempo para %s"
+msgstr "Incapaz buscar ambos %s e %s para %s"
 
-#: remote.c:758
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
-msgstr "%s geralmente segue %s, não %s"
+msgstr "%s geralmente segue %s, invés de %s"
 
-#: remote.c:762
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s segue %s e %s em simultâneo"
 
-#: remote.c:770
-msgid "Internal error"
-msgstr "Erro interno"
+#: remote.c:666
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr ""
+
+#: remote.c:676
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr ""
+
+#: remote.c:1083
+#, fuzzy, c-format
+msgid "src refspec %s does not match any"
+msgstr "src refspec %s corresponde a nenhum"
+
+#: remote.c:1088
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr ""
 
-#: remote.c:1685 remote.c:1787
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1103
+#, 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"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+
+#: remote.c:1123
+#, 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 ""
+
+#: remote.c:1128
+#, 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 ""
+
+#: remote.c:1133
+#, 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 ""
+
+#: remote.c:1138
+#, 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 ""
+
+#: remote.c:1174
+#, fuzzy, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s incapaz ser resolvido para ramo"
+
+#: remote.c:1185
+#, fuzzy, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "incapaz apagar '%s': ref remoto é inexistente"
+
+#: remote.c:1197
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr ""
+
+#: remote.c:1204
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr ""
+
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
-msgstr "HEAD não aponta para um ramo"
+msgstr "HEAD aponta para ramo nenhum"
 
-#: remote.c:1694
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "ramo inexistente: '%s'"
 
-#: remote.c:1697
+#: remote.c:1736
 #, c-format
 msgid "no upstream configured for branch '%s'"
-msgstr "nenhum ramo a montante configurado para o ramo '%s'"
+msgstr "configurado upstream nenhum para ramo '%s'"
 
-#: remote.c:1703
+#: remote.c:1742
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
-msgstr ""
-"o ramo a montante '%s' não está guardado como um ramo de monitorização remoto"
+msgstr "incapaz gravar ramo upstream '%s' como ramo remote-tracking"
 
-#: remote.c:1718
+#: remote.c:1757
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr ""
-"o destino de publicação '%s' no remoto '%s' não é seguido por nenhum ramo "
-"local"
+"destino de atirar '%s' em remoto '%s' tem ramo de tracking local nenhum"
 
-#: remote.c:1730
+#: remote.c:1769
 #, c-format
 msgid "branch '%s' has no remote for pushing"
-msgstr "o ramo '%s' não tem nenhum remoto para publicar"
+msgstr "ramo '%s' tem remoto para atirar nenhum"
 
-#: remote.c:1741
+#: remote.c:1779
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
-msgstr ""
-"'%2$s' não faz parte dos especificadores de referência de '%1$s' para "
-"publicação"
+msgstr "refspecs de atirar para '%s'incluí '%s' nenhum"
 
-#: remote.c:1754
+#: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "publicação sem destino (push.default é 'nothing')"
 
-#: remote.c:1776
+#: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
-msgstr "não é possível resolver a publicação 'simple' num único destino"
+msgstr "incapaz resolver atiro 'simple' para destino único"
+
+#: remote.c:1943
+#, fuzzy, c-format
+msgid "couldn't find remote ref %s"
+msgstr "incapaz encontrar ref remoto %s"
 
-#: remote.c:2081
+#: remote.c:1956
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr ""
+
+#: 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:2085
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (use \"git branch --unset-upstream\" para corrigir)\n"
 
-#: remote.c:2088
-#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+#: remote.c:2126
+#, fuzzy, c-format
+msgid "Your branch is up to date with '%s'.\n"
 msgstr "O seu ramo está atualizado com '%s'.\n"
 
-#: remote.c:2092
+#: remote.c:2130
+#, fuzzy, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "O seu ramo está à frente de '%s' por %d commit.\n"
+
+#: remote.c:2133
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr ""
+
+#: 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:2098
+#: remote.c:2143
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (use \"git push\" para publicar os commits locais)\n"
 
-#: remote.c:2101
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2799,11 +7358,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:2109
+#: remote.c:2154
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (use \"git pull\" para atualizar o seu ramo local)\n"
 
-#: remote.c:2112
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2818,84 +7377,255 @@ msgstr[1] ""
 "O seu ramo e '%s' divergiram,\n"
 "tendo cada um %d e %d commits diferentes, respetivamente.\n"
 
-#: remote.c:2122
+#: 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"
 
-#: revision.c:2158
+#: remote.c:2359
+#, fuzzy, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "incapaz analisar nome de objeto esperado '%s'"
+
+#: replace-object.c:21
+#, fuzzy, c-format
+msgid "bad replace ref name: %s"
+msgstr "substituição de nome de ref inválida: %s"
+
+#: replace-object.c:30
+#, fuzzy, c-format
+msgid "duplicate replace ref: %s"
+msgstr "substituição duplicada de ref: %s"
+
+#: replace-object.c:82
+#, fuzzy, c-format
+msgid "replace depth too high for object %s"
+msgstr "substituir a tag se esta existir"
+
+#: rerere.c:201 rerere.c:210 rerere.c:213
+msgid "corrupt MERGE_RR"
+msgstr ""
+
+#: rerere.c:248 rerere.c:253
+#, fuzzy
+msgid "unable to write rerere record"
+msgstr "incapaz escrever registro rerere"
+
+#: rerere.c:479
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr ""
+
+#: rerere.c:482
+#, c-format
+msgid "failed to flush '%s'"
+msgstr ""
+
+#: rerere.c:487 rerere.c:1023
+#, fuzzy, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "incapaz analisar pedaços conflituosos em '%s'"
+
+#: rerere.c:668
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr ""
+
+#: rerere.c:678
+#, c-format
+msgid "writing '%s' failed"
+msgstr ""
+
+#: rerere.c:698
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr ""
+
+#: rerere.c:737
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr ""
+
+#: rerere.c:772
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr ""
+
+#: rerere.c:787
+#, fuzzy, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "incapaz deslinkar o perdido '%s'"
+
+#: rerere.c:791
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr ""
+
+#: 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:1041
+#, fuzzy, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "falha ao criar a ligação '%s'"
+
+#: rerere.c:1052 rerere.c:1059
+#, fuzzy, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "a faltar a lembrança da solução para '%s'"
+
+#: rerere.c:1061
+#, fuzzy, c-format
+msgid "cannot unlink '%s'"
+msgstr "incapaz de deslinkar '%s'"
+
+#: rerere.c:1071
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr ""
+
+#: rerere.c:1080
+#, fuzzy, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "Está esquecida resolução para '%s'\n"
+
+#: rerere.c:1191
+#, fuzzy
+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:69 reset.c:75 sequencer.c:3689
+#, fuzzy, c-format
+msgid "failed to find tree of %s"
+msgstr "Falha ao procurar árvore de %s."
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr ""
+
+#: revision.c:2684
 msgid "your current branch appears to be broken"
 msgstr "o ramo atual parece estar danificado"
 
-#: revision.c:2161
+#: revision.c:2687
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
-msgstr "o ramo atual '%s' ainda não contém nenhum commit"
+msgstr "teu ramo atual '%s' ainda contém commits nenhuns"
 
-#: revision.c:2355
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent é incompatível com --bisect"
+#: revision.c:2893
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr ""
 
-#: run-command.c:125
+#: run-command.c:766
 msgid "open /dev/null failed"
 msgstr "falha ao abrir /dev/null"
 
-#: run-command.c:127
+#: run-command.c:1274
+#, fuzzy, c-format
+msgid "cannot create async thread: %s"
+msgstr "incapaz criar thread assíncrona: %s"
+
+#: run-command.c:1344
 #, c-format
-msgid "dup2(%d,%d) failed"
-msgstr "dup2(%d,%d) falhou"
+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
+#, fuzzy
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "flush de pacotes inesperado enquanto lendo unpack status remoto"
+
+#: 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:152
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "descompactação remota falhou: %s"
 
-#: send-pack.c:315
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "falha ao assinar o certificado de publicação"
 
-#: send-pack.c:428
+#: send-pack.c:433
+#, fuzzy
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "fetch-pack: incapaz de aforquilhar %s"
+
+#: send-pack.c:455
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr ""
+
+#: send-pack.c:526
+#, fuzzy
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "o recetor insustenta algoritmo hash deste repositório"
+
+#: 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 recetor insustenta atiro --signed"
 
-#: send-pack.c:430
+#: 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:442
+#: 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 recetor insustenta atiro com --atomic"
 
-#: send-pack.c:447
+#: 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:196
+#, fuzzy, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "Modo de limpeza inválido %s"
 
-#: sequencer.c:215
+#: sequencer.c:324
+#, fuzzy, c-format
+msgid "could not delete '%s'"
+msgstr "incapaz de apagar '%s'"
+
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#, c-format
+msgid "could not remove '%s'"
+msgstr "incapaz remover '%s'"
+
+#: sequencer.c:354
 msgid "revert"
 msgstr "reverter"
 
-#: sequencer.c:217
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:219
-msgid "rebase -i"
+#: sequencer.c:358
+#, fuzzy
+msgid "rebase"
 msgstr "rebase -i"
 
-#: sequencer.c:221
-#, c-format
-msgid "Unknown action: %d"
+#: sequencer.c:360
+#, fuzzy, c-format
+msgid "unknown action: %d"
 msgstr "Ação desconhecida: %d"
 
-#: sequencer.c:278
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -2903,7 +7633,7 @@ msgstr ""
 "depois de resolver os conflitos, marque os caminhos corrigidos\n"
 "com 'git add <caminhos>' ou 'git rm <caminhos>'"
 
-#: sequencer.c:281
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2913,63 +7643,111 @@ msgstr ""
 "com 'git add <caminhos>' ou 'git rm <caminhos>'\n"
 "e submeta o resultado com 'git commit'"
 
-#: sequencer.c:294 sequencer.c:1675
+#: 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:297 sequencer.c:1553 sequencer.c:1680 sequencer.c:1694
+#: 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:301
+#: 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:305 sequencer.c:1558 sequencer.c:1682
-#, c-format
-msgid "failed to finalize '%s'."
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
+#, fuzzy, c-format
+msgid "failed to finalize '%s'"
 msgstr "falha ao finalizar '%s'."
 
-#: sequencer.c:329 sequencer.c:814 sequencer.c:1579 builtin/am.c:259
-#: builtin/commit.c:749 builtin/merge.c:1018
-#, c-format
-msgid "could not read '%s'"
-msgstr "não foi possível ler '%s'"
-
-#: sequencer.c:355
+#: 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:359
+#: sequencer.c:490
 msgid "commit your changes or stash them to proceed."
 msgstr "submeta ou esconda as suas alterações para continuar."
 
-#: sequencer.c:388
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: avanço rápido"
 
+#: sequencer.c:561 builtin/tag.c:609
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Modo de limpeza inválido %s"
+
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:470
+#: sequencer.c:671
 #, c-format
 msgid "%s: Unable to write new index file"
-msgstr "%s: Não foi possível escrever novo ficheiro de índice"
+msgstr "%s: Incapaz de escrever novo ficheiro index"
+
+#: sequencer.c:685
+#, fuzzy
+msgid "unable to update cache tree"
+msgstr "incapaz atualizar árvore de cache"
+
+#: sequencer.c:699
+#, fuzzy
+msgid "could not resolve HEAD commit"
+msgstr "incapaz resolver memória HEAD"
+
+#: sequencer.c:779
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr ""
+
+#: sequencer.c:790
+#, fuzzy, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "incapaz retirar valor, da citação '%s'"
+
+#: 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 "incapaz abrir '%s' para leitura"
+
+#: sequencer.c:837
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr ""
+
+#: sequencer.c:842
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr ""
+
+#: sequencer.c:847
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr ""
 
-#: sequencer.c:489
-msgid "could not resolve HEAD commit\n"
-msgstr "não foi possível resolver o commit HEAD\n"
+#: sequencer.c:851
+#, c-format
+msgid "unknown variable '%s'"
+msgstr ""
+
+#: sequencer.c:856
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr ""
 
-#: sequencer.c:509
-msgid "unable to update cache tree\n"
-msgstr "não foi possível atualizar a árvore de cache\n"
+#: sequencer.c:858
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr ""
+
+#: sequencer.c:860
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr ""
 
-#: sequencer.c:592
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -2998,262 +7776,462 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:694
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr "não foi possível analisar o commit %s\n"
-
-#: sequencer.c:699
-#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "não foi possível analisar o commit pai %s\n"
+#: sequencer.c:1212
+msgid "'prepare-commit-msg' hook failed"
+msgstr ""
 
-#: sequencer.c:821
-#, c-format
+#: sequencer.c:1218
 msgid ""
-"unexpected 1st line of squash message:\n"
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
 "\n"
-"\t%.*s"
+"    git commit --amend --reset-author\n"
 msgstr ""
-"1ª linha inesperada da mensagem de squash:\n"
+"O seu nome e endereço de e-mail foram configurados automaticamente com base\n"
+"no seu nome de utilizador e nome de máquina. Verifique se estão corretos.\n"
+"Pode suprimir esta mensagem configurando-os explicitamente. Execute\n"
+"o seguinte comando e siga as instruções no editor para editar\n"
+"o ficheiro de configuração:\n"
 "\n"
-"\t%.*s"
+"    git config --global --edit\n"
+"\n"
+"Após fazer isto, pode corrigir a identidade usada neste commit com:\n"
+"\n"
+"    git commit --amend --reset-author\n"
 
-#: sequencer.c:827
-#, c-format
+#: sequencer.c:1231
 msgid ""
-"invalid 1st line of squash message:\n"
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
 "\n"
-"\t%.*s"
+"    git commit --amend --reset-author\n"
 msgstr ""
-"1ª linha inválida da mensagem de squash:\n"
+"O seu nome e endereço de e-mail foram configurados automaticamente com base\n"
+"no seu nome de utilizador e nome de máquina. Verifique se estão corretos.\n"
+"Pode suprimir esta mensagem configurando-os explicitamente:\n"
+"\n"
+"    git config --global user.name \"O Seu Nome\"\n"
+"    git config --global user.email utilizador@exemplo.com\n"
 "\n"
-"\t%.*s"
+"Após fazer isto, pode corrigir a identidade usada neste commit com:\n"
+"\n"
+"    git commit --amend --reset-author\n"
 
-#: sequencer.c:833 sequencer.c:858
+#: sequencer.c:1273
+msgid "couldn't look up newly created commit"
+msgstr "incapaz consultar memória recém-criada"
+
+#: sequencer.c:1275
+msgid "could not parse newly created commit"
+msgstr "incapaz analisar memória recém-criada"
+
+#: sequencer.c:1321
+#, fuzzy
+msgid "unable to resolve HEAD after creating commit"
+msgstr "incapaz resolver HEAD após criar memória"
+
+#: sequencer.c:1323
+msgid "detached HEAD"
+msgstr "HEAD destacada"
+
+#: sequencer.c:1327
+msgid " (root-commit)"
+msgstr " (commit-raiz)"
+
+#: sequencer.c:1348
+#, fuzzy
+msgid "could not parse HEAD"
+msgstr "incapaz processar HEAD"
+
+#: sequencer.c:1350
+#, fuzzy, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s é commit nenhum!"
+
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+msgid "could not parse HEAD commit"
+msgstr "incapaz analisar commit HEAD"
+
+#: sequencer.c:1410 sequencer.c:2295
+#, fuzzy
+msgid "unable to parse commit author"
+msgstr "incapaz processar autor de commit"
+
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+msgid "git write-tree failed to write a tree"
+msgstr ""
+
+#: sequencer.c:1454 sequencer.c:1574
+#, fuzzy, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "incapaz ler mensagem de commit de '%s'"
+
+#: sequencer.c:1485 sequencer.c:1517
 #, c-format
-msgid "This is a combination of %d commits."
-msgstr "Isto é a combinação de %d commits."
+msgid "invalid author identity '%s'"
+msgstr ""
 
-#: sequencer.c:842
-msgid "need a HEAD to fixup"
-msgstr "necessária uma HEAD para fixup"
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr ""
 
-#: sequencer.c:844
-msgid "could not read HEAD"
-msgstr "não foi possível ler HEAD"
+#: 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 ""
 
-#: sequencer.c:846
-msgid "could not read HEAD's commit message"
-msgstr "não foi possível ler a mensagem de commit de HEAD"
+#: 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 "incapaz atualizar %s"
+
+#: sequencer.c:1606
+#, fuzzy, c-format
+msgid "could not parse commit %s"
+msgstr "incapaz processar commit %s"
 
-#: sequencer.c:852
+#: sequencer.c:1611
+#, fuzzy, c-format
+msgid "could not parse parent commit %s"
+msgstr "incapaz processar commit parente %s"
+
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
-msgid "cannot write '%s'"
-msgstr "não é possível escrever '%s'"
+msgid "unknown command: %d"
+msgstr "comando desconhecido: %d"
 
-#: sequencer.c:861 git-rebase--interactive.sh:445
+#: 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:869
-#, c-format
-msgid "could not read commit message of %s"
-msgstr "não foi possível ler a mensagem de commit de %s"
-
-#: sequencer.c:876
+#: sequencer.c:1737
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Esta é a mensagem de commit nº%d:"
 
-#: sequencer.c:881
+#: 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:886
+#: sequencer.c:1740
 #, c-format
-msgid "unknown command: %d"
-msgstr "comando desconhecido: %d"
+msgid "This is a combination of %d commits."
+msgstr "Isto é a combinação de %d commits."
 
-#: sequencer.c:952
+#: 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:1936 sequencer.c:3582
+msgid "could not read HEAD"
+msgstr "incapaz ler HEAD"
+
+#: sequencer.c:1938
+msgid "could not read HEAD's commit message"
+msgstr "incapaz ler mensagem de commit de HEAD"
+
+#: sequencer.c:1962
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "incapaz ler mensagem de commit de %s"
+
+#: 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:970
+#: sequencer.c:2079
+#, fuzzy
+msgid "cannot fixup root commit"
+msgstr "incapaz consertar commit raíz"
+
+#: 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:978
+#: 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:982
-#, 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."
-
-#: sequencer.c:988
+#: 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:1009
+#: 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:1071 sequencer.c:1820
+#: 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:1122
+#: 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:1123
+#: 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:1165
-msgid "empty commit set passed"
-msgstr "o conjunto de commits especificado está vazio"
+#: sequencer.c:2287
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr ""
 
-#: sequencer.c:1175
+#: 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:1182
+#: sequencer.c:2352
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: falha ao atualizar o índice"
 
-#: sequencer.c:1302
+#: sequencer.c:2425
+#, fuzzy, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s rejeita argumentos: '%s'"
+
+#: sequencer.c:2434
+#, c-format
+msgid "missing arguments for %s"
+msgstr ""
+
+#: sequencer.c:2477
+#, fuzzy, c-format
+msgid "could not parse '%s'"
+msgstr "incapaz processar '%s'"
+
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "linha %d inválida: %.*s"
 
-#: sequencer.c:1310
+#: 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:1342
-#, c-format
-msgid "could not read '%s'."
-msgstr "não foi possível ler '%s'."
+#: sequencer.c:2635
+#, fuzzy
+msgid "cancelling a cherry picking in progress"
+msgstr "cancelando um cherry picking em curso"
+
+#: sequencer.c:2644
+#, fuzzy
+msgid "cancelling a revert in progress"
+msgstr "cancelando uma reversão em curso"
 
-#: sequencer.c:1349
+#: sequencer.c:2690
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "corrija-o usando 'git rebase --edit-todo'."
 
-#: sequencer.c:1351
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "folha de instruções inutilizável: '%s'"
 
-#: sequencer.c:1356
+#: sequencer.c:2697
 msgid "no commits parsed."
-msgstr "nenhum commit analisado."
+msgstr "commits nenhuns analisados."
 
-#: sequencer.c:1367
+#: 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:1369
+#: 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:1432
-#, c-format
-msgid "invalid key: %s"
-msgstr "chave inválida: %s"
-
-#: sequencer.c:1435
+#: 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:2897
+msgid "unusable squash-onto"
+msgstr ""
 
-#: sequencer.c:1492
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "folha de opções malformada: '%s'"
 
-#: sequencer.c:1530
-msgid "a cherry-pick or revert is already in progress"
+#: sequencer.c:3012 sequencer.c:4868
+msgid "empty commit set passed"
+msgstr "o conjunto de commits especificado está vazio"
+
+#: sequencer.c:3029
+#, fuzzy
+msgid "revert is already in progress"
 msgstr "cherry-pick ou revert em curso"
 
-#: sequencer.c:1531
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+#: sequencer.c:3031
+#, fuzzy, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
 
-#: sequencer.c:1534
+#: sequencer.c:3034
+#, fuzzy
+msgid "cherry-pick is already in progress"
+msgstr "cherry-pick ou revert em curso"
+
+#: sequencer.c:3036
+#, fuzzy, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "tente \"git cherry-pick (--continue | --quit |--abort)\""
+
+#: 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:1548
+#: sequencer.c:3065
 msgid "could not lock HEAD"
-msgstr "não foi possível bloquear HEAD"
+msgstr "incapaz bloquear HEAD"
 
-#: sequencer.c:1604 sequencer.c:2159
+#: sequencer.c:3125 sequencer.c:4581
 msgid "no cherry-pick or revert in progress"
-msgstr "nenhum cherry-pick ou revert em curso"
+msgstr "sem cherry-pick ou revert em curso"
 
-#: sequencer.c:1606
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
-msgstr "não é possível resolver HEAD"
+msgstr "incapaz resolver HEAD"
 
-#: sequencer.c:1608 sequencer.c:1642
+#: 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:1628 builtin/grep.c:910
+#: 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:1630
+#: 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:1631
+#: sequencer.c:3162
 msgid "unexpected end of file"
-msgstr "fim de ficheiro inesperado"
+msgstr ""
 
-#: sequencer.c:1637
+#: 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:1648
+#: sequencer.c:3179
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
-msgstr "Parece que a HEAD se moveu. Não recuando, verifique a HEAD."
+msgstr "Parece que moveste a HEAD. Recusando rebobinar, verifique a tua HEAD!"
+
+#: sequencer.c:3220
+#, fuzzy
+msgid "no revert in progress"
+msgstr "em curso reversão nenhuma"
 
-#: sequencer.c:1785 sequencer.c:2058
+#: sequencer.c:3229
+#, fuzzy
+msgid "no cherry-pick in progress"
+msgstr "cherry-pick nenhum em curso"
+
+#: sequencer.c:3239
+msgid "failed to skip the commit"
+msgstr ""
+
+#: sequencer.c:3246
+msgid "there is nothing to skip"
+msgstr ""
+
+#: sequencer.c:3249
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+
+#: sequencer.c:3411 sequencer.c:4472
 msgid "cannot read HEAD"
-msgstr "não é possível ler HEAD"
+msgstr "incapaz ler HEAD"
+
+#: sequencer.c:3428
+#, fuzzy, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "incapaz copiar '%s' para '%s'"
+
+#: sequencer.c:3436
+#, fuzzy, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Pode emendar o commit agora, com\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Assim que estiver satisfeito com as alterações, execute\n"
+"\n"
+"  git rebase --continue\n"
 
-#: sequencer.c:1825 builtin/difftool.c:616
+#: sequencer.c:3446
+#, fuzzy, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "Incapaz aplicar %s... %.*s"
+
+#: sequencer.c:3453
+#, fuzzy, c-format
+msgid "Could not merge %.*s"
+msgstr "Incapaz juntar %.*s"
+
+#: 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:1841
-msgid "could not read index"
-msgstr "não foi possível ler o índice"
+#: sequencer.c:3483
+#, fuzzy, c-format
+msgid "Executing: %s\n"
+msgstr "A executar: %s\n"
 
-#: sequencer.c:1846
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3268,11 +8246,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1852
+#: 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"
 
-#: sequencer.c:1858
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3289,78 +8267,192 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:1913 git-rebase.sh:168
-#, c-format
-msgid "Applied autostash."
-msgstr "Pilha automática (autostash) aplicada."
+#: sequencer.c:3572
+#, fuzzy, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "nome de ficheiro malformado: %.*s"
+
+#: sequencer.c:3645
+#, fuzzy
+msgid "writing fake root commit"
+msgstr "escrevendo commit de raíz falso"
+
+#: sequencer.c:3650
+msgid "writing squash-onto"
+msgstr ""
+
+#: sequencer.c:3734
+#, fuzzy, c-format
+msgid "could not resolve '%s'"
+msgstr "incapaz resolver '%s'"
+
+#: sequencer.c:3767
+#, fuzzy
+msgid "cannot merge without a current revision"
+msgstr "incapaz juntar sem uma revisão currente"
+
+#: sequencer.c:3789
+#, fuzzy, c-format
+msgid "unable to parse '%.*s'"
+msgstr "incapaz processar '%.*s'"
+
+#: sequencer.c:3798
+#, fuzzy, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "nada a juntar: '%.*s'"
+
+#: sequencer.c:3810
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr ""
+
+#: sequencer.c:3826
+#, fuzzy, c-format
+msgid "could not get commit message of '%s'"
+msgstr "incapaz obter mensagem de commit de '%s'"
+
+#: sequencer.c:4009
+#, fuzzy, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "incapaz de tentar juntar '%.*s'"
+
+#: sequencer.c:4025
+#, fuzzy
+msgid "merge: Unable to write new index file"
+msgstr "merge: Incapaz de escrever novo ficheiro index"
+
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr "Incapaz de arrumar automaticamente (autostash)"
 
-#: sequencer.c:1925
+#: sequencer.c:4102
+#, fuzzy, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Resposta de squash inexperada: '%s'"
+
+#: sequencer.c:4108
+#, fuzzy, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Incapaz de criar a pasta para '%s'"
+
+#: sequencer.c:4111
+#, fuzzy, c-format
+msgid "Created autostash: %s\n"
+msgstr "Criado autostash: %s\n"
+
+#: sequencer.c:4115
+#, fuzzy
+msgid "could not reset --hard"
+msgstr "incapaz repor --hard"
+
+#: sequencer.c:4140
+#, fuzzy, c-format
+msgid "Applied autostash.\n"
+msgstr "Autostash aplicado.\n"
+
+#: sequencer.c:4152
 #, c-format
 msgid "cannot store %s"
-msgstr "não é possível guardar %s"
+msgstr "incapaz guardar %s"
 
-#: sequencer.c:1927 git-rebase.sh:172
-#, c-format
+#: sequencer.c:4155
+#, fuzzy, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
-"Surgiram conflitos ao aplicar a pilha automática (autostash).\n"
+"%s\n"
 "As suas alterações estão guardadas na pilha.\n"
 "Pode executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
 
-#: sequencer.c:2009
+#: sequencer.c:4160
+#, fuzzy
+msgid "Applying autostash resulted in conflicts."
+msgstr "Patch aplicado a '%s' com conflitos."
+
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
+msgstr ""
+
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+msgid "could not detach HEAD"
+msgstr "incapaz soltar HEAD"
+
+#: sequencer.c:4248
+#, fuzzy, c-format
+msgid "Stopped at HEAD\n"
+msgstr "Parou no HEAD\n"
+
+#: sequencer.c:4250
+#, fuzzy, c-format
+msgid "Stopped at %s\n"
+msgstr "Parou a %s...  %.*s\n"
+
+#: sequencer.c:4258
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr ""
+
+#: sequencer.c:4350
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
-msgstr "Parou a %s...  %.*s\n"
+msgstr "Parou no %s...  %.*s\n"
 
-#: sequencer.c:2036
+#: sequencer.c:4421
 #, c-format
 msgid "unknown command %d"
 msgstr "comando desconhecido %d"
 
-#: sequencer.c:2066
+#: 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:2070
+#: sequencer.c:4485
 msgid "could not read 'onto'"
-msgstr "não foi possível ler 'onto'"
-
-#: sequencer.c:2077
-#, c-format
-msgid "could not update %s"
-msgstr "não foi possível atualizar %s"
+msgstr "incapaz ler 'onto'"
 
-#: sequencer.c:2084
+#: 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:2168
-msgid "cannot rebase: You have unstaged changes."
-msgstr "não é possível rebasear: tem alterações não preparadas."
+#: sequencer.c:4559
+#, fuzzy, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "O %s foi rebaseado e atualizado com sucesso.\n"
 
-#: sequencer.c:2173
-msgid "could not remove CHERRY_PICK_HEAD"
-msgstr "não foi possível remover CHERRY_PICK_HEAD"
+#: sequencer.c:4611
+msgid "cannot rebase: You have unstaged changes."
+msgstr "incapaz rebasear: tem alterações despreparadas."
 
-#: sequencer.c:2182
+#: 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:2184
+#: sequencer.c:4622
 #, c-format
 msgid "invalid file: '%s'"
-msgstr "ficheiro inválido: '%s'"
+msgstr ""
 
-#: sequencer.c:2186
+#: sequencer.c:4624
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "conteúdo inválido: '%s'"
 
-#: sequencer.c:2189
+#: sequencer.c:4627
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3370,47 +8462,87 @@ msgstr ""
 "Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"
 "e execute 'git rebase --continue' de novo."
 
-#: sequencer.c:2199
+#: sequencer.c:4663 sequencer.c:4702
+#, fuzzy, c-format
+msgid "could not write file: '%s'"
+msgstr "incapaz escrever ficheiro: '%s'"
+
+#: sequencer.c:4718
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "incapaz remover CHERRY_PICK_HEAD"
+
+#: 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:2279
+#: 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:2283
+#: sequencer.c:4849
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: revisão incorreta"
 
-#: sequencer.c:2316
+#: 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:5361
+msgid "make_script: unhandled options"
+msgstr ""
+
+#: sequencer.c:5364
+msgid "make_script: error preparing revisions"
+msgstr ""
+
+#: sequencer.c:5614 sequencer.c:5631
+#, fuzzy
+msgid "nothing to do"
+msgstr "nada a fazer"
 
-#: setup.c:165
+#: sequencer.c:5650
+#, fuzzy
+msgid "could not skip unnecessary pick commands"
+msgstr "incapaz de saltar comandos pick desnecessários"
+
+#: sequencer.c:5750
+msgid "the script was already rearranged."
+msgstr ""
+
+#: setup.c:133
+#, fuzzy, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "%s está fora do repositório em '%s'"
+
+#: setup.c:185
 #, 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: não há tal caminho na árvore de trabalho.\n"
-"Use 'git <comando> -- <caminho>...' para especificar caminhos que não "
-"existem localmente."
+"%s: sem tal path na working tree.\n"
+"Use 'git <comando> -- <path>...' para especificar caminhos inexistentes "
+"localmente."
 
-#: setup.c:178
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
 "Use '--' to separate paths from revisions, like this:\n"
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr ""
-"argumento 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:228
+#: setup.c:264
+#, fuzzy, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "opção '%s' tem de vir antes argumentos diferentes de opção"
+
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -3421,196 +8553,405 @@ msgstr ""
 "Use '--' para separar caminhos de revisões, assim:\n"
 "'git <comando> [<revisão>...] -- [<ficheiro>...]'"
 
-#: setup.c:475
+#: setup.c:419
+#, fuzzy
+msgid "unable to set up work tree using invalid config"
+msgstr "incapaz preparar work tree usando config inválido"
+
+#: setup.c:423 builtin/rev-parse.c:895
+msgid "this operation must be run in a work tree"
+msgstr ""
+
+#: 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"
 
-#: setup.c:483
-msgid "unknown repository extensions found:"
-msgstr "extensões de repositório desconhecidas encontradas:"
+#: setup.c:666
+#, fuzzy
+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:776
+#: setup.c:680
+#, fuzzy
+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:701
 #, c-format
-msgid "Not a git repository (or any of the parent directories): %s"
-msgstr "Não é um repositório git (ou um dos diretórios pai): %s"
+msgid "error opening '%s'"
+msgstr ""
 
-#: setup.c:778 builtin/index-pack.c:1646
-msgid "Cannot come back to cwd"
-msgstr "Não é possível voltar ao diretório de trabalho atual"
+#: setup.c:703
+#, fuzzy, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "demasiado grande para ser um ficheiro .git: '%s'"
 
-#: setup.c:1010
-msgid "Unable to read current working directory"
-msgstr "Não é possível ler o diretório de trabalho atual"
+#: setup.c:705
+#, fuzzy, c-format
+msgid "error reading %s"
+msgstr "erro lendo %s"
+
+#: setup.c:707
+#, fuzzy, c-format
+msgid "invalid gitfile format: %s"
+msgstr "formato de data inválido: %s"
+
+#: setup.c:709
+#, fuzzy, c-format
+msgid "no path in gitfile: %s"
+msgstr "gitfile sem path: %s"
 
-#: setup.c:1022 setup.c:1028
+#: setup.c:711
+#, fuzzy, c-format
+msgid "not a git repository: %s"
+msgstr "é repositório git nenhum: %s"
+
+#: setup.c:813
 #, c-format
-msgid "Cannot change to '%s'"
-msgstr "não é possível mudar para '%s'"
+msgid "'$%s' too big"
+msgstr ""
+
+#: setup.c:827
+#, fuzzy, c-format
+msgid "not a git repository: '%s'"
+msgstr "é repositório git nenhum: '%s'"
 
-#: setup.c:1041
+#: setup.c:856 setup.c:858 setup.c:889
+#, fuzzy, c-format
+msgid "cannot chdir to '%s'"
+msgstr "incapaz chdir para '%s'"
+
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+#, fuzzy
+msgid "cannot come back to cwd"
+msgstr "incapaz de voltar para cwd"
+
+#: setup.c:988
 #, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr ""
+
+#: setup.c:1231
+msgid "Unable to read current working directory"
+msgstr "Incapaz de ler pasta atual de trabalho"
+
+#: setup.c:1240 setup.c:1246
+#, fuzzy, c-format
+msgid "cannot change to '%s'"
+msgstr "incapaz mudar para '%s'"
+
+#: setup.c:1251
+#, fuzzy, 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"
+
+#: setup.c:1257
+#, fuzzy, c-format
 msgid ""
-"Not a git repository (or any parent up to mount point %s)\n"
+"not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr ""
-"Não é um repositório git (ou um diretório pai até ao ponto de montagem %s)\n"
-"Interrompido no limite do sistema de ficheiros "
-"(GIT_DISCOVERY_ACROSS_FILESYSTEM não definido)."
+"é 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)."
 
-#: setup.c:1106
-#, c-format
+#: setup.c:1381
+#, fuzzy, c-format
 msgid ""
-"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"problem with core.sharedRepository filemode value (0%.3o).\n"
 "The owner of files must always have read and write permissions."
 msgstr ""
 "Problema 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."
 
-#: sha1_file.c:559
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "o caminho '%s' não existe"
+#: setup.c:1430
+#, fuzzy
+msgid "open /dev/null or dup failed"
+msgstr "falha ao abrir /dev/null"
+
+#: setup.c:1445
+#, fuzzy
+msgid "fork failed"
+msgstr "falha ao invocar fseek"
 
-#: sha1_file.c:585
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
+msgid "setsid failed"
+msgstr ""
+
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
+msgstr ""
+
+#: sparse-index.c:176
+#, fuzzy
+msgid "unable to update cache-tree, staying full"
+msgstr "incapaz atualizar árvore de cache"
+
+#: sparse-index.c:263
 #, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgid "index entry is a directory, but not sparse (%08x)"
 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:591
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:850
 #, 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."
+msgid "%u.%2.2u GiB"
+msgstr ""
 
-#: sha1_file.c:597
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:852
 #, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "o repositório de referência '%s' é raso"
+msgid "%u.%2.2u GiB/s"
+msgstr ""
 
-#: sha1_file.c:605
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:860
 #, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "o repositório de referência '%s' está enxertado"
+msgid "%u.%2.2u MiB"
+msgstr ""
 
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset antes do fim do ficheiro de pacote (.idx danificado?)"
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:862
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr ""
 
-#: sha1_file.c:2721
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:869
 #, 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?)"
+msgid "%u.%2.2u KiB"
+msgstr ""
 
-#: sha1_file.c:2725
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:871
 #, 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?)"
+msgid "%u.%2.2u KiB/s"
+msgstr ""
 
-#: sha1_name.c:409
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:877
+#, fuzzy, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "bytes"
+msgstr[1] "bytes"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:879
+#, fuzzy, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "bytes"
+msgstr[1] "bytes"
+
+#: strbuf.c:1168 wrapper.c:199 wrapper.c:369 builtin/am.c:738
+#: builtin/rebase.c:866
 #, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "SHA1 curto %s é ambíguo"
+msgid "could not open '%s' for writing"
+msgstr "incapaz abrir '%s' para escrita"
 
-#: sha1_name.c:420
-msgid "The candidates are:"
-msgstr "Os candidatos são:"
+#: strbuf.c:1177
+#, fuzzy, c-format
+msgid "could not edit '%s'"
+msgstr "incapaz editar '%s'"
 
-#: sha1_name.c:580
-msgid ""
-"Git normally never creates a ref that ends with 40 hex characters\n"
-"because it will be ignored when you just specify 40-hex. These refs\n"
-"may be created by mistake. For example,\n"
-"\n"
-"  git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
-"examine these refs and maybe delete them. Turn this message off by\n"
-"running \"git config advice.objectNameWarning false\""
-msgstr ""
-"Normalmente o Git nunca cria referências que terminem em 40 caracteres "
-"hexadecimais,\n"
-"pois uma referência destas seria ignorada se indicasse só 40 caracteres "
-"hexadecimais.\n"
-"Estas referências podem ser criadas por engano. Como no exemplo,\n"
-"\n"
-"  git checkout -b $br $(git rev-parse ...)\n"
-"\n"
-"onde \"$br\" está vazio e é criada uma referência de 40 caracteres "
-"hexadecimais.\n"
-"Analise estas referências e elimine-as se desejar. Desative esta\n"
-"mensagem executando \"git config advice.objectNameWarning false\""
+#: submodule-config.c:237
+#, fuzzy, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignorando nome suspeito de submódulo: %s"
 
-#: submodule.c:67 submodule.c:101
-msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+#: submodule-config.c:304
+#, fuzzy
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "é proíbido valores negativos para submodule.fetchjobs"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
 msgstr ""
-"Não é possível alterar .gitmodules não integrado, resolva primeiro os "
-"conflitos de integração"
 
-#: submodule.c:71 submodule.c:105
+#: submodule-config.c:499
 #, c-format
-msgid "Could not find section in .gitmodules where path=%s"
-msgstr "Secção de .gitmodules cujo path=%s não encontrada"
+msgid "invalid value for %s"
+msgstr ""
 
-#: submodule.c:79
+#: submodule-config.c:766
 #, c-format
 msgid "Could not update .gitmodules entry %s"
-msgstr "Não foi possível atualizar o elemento %s de .gitmodules"
+msgstr "Incapaz de atualizar entrada de .gitmodules %s"
 
-#: submodule.c:112
+#: 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"
+
+#: 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 por encontrar"
+
+#: submodule.c:154
 #, c-format
 msgid "Could not remove .gitmodules entry for %s"
-msgstr "Não foi possível remover o elemento %s de .gitmodules"
+msgstr "Incapaz de remover a entrada de .gitmodules para %s"
 
-#: submodule.c:123
+#: submodule.c:165
 msgid "staging updated .gitmodules failed"
 msgstr "falha ao preparar .gitmodules atualizado"
 
-#: submodule.c:161
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "não é permitido valores negativos em submodule.fetchJobs"
+#: submodule.c:328
+#, fuzzy, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "em submódulo despopulado '%s'"
 
-#: submodule.c:1194
+#: submodule.c:359
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "O caminho '%s' está dentro do submódulo '%.*s'"
+
+#: submodule.c:436
+#, fuzzy, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "Falha ao analisar parâmetro da opção --submodule: '%s'"
+
+#: 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:908
+#, fuzzy, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "entrada submódulo '%s' (%s) é um(a) %s, não um commit"
+
+#: submodule.c:993
+#, fuzzy, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"Incapaz executar comando 'git rev-list <commits> --not --remotes -n 1' "
+"emsubmódulo %s"
+
+#: submodule.c:1116
+#, fuzzy, c-format
+msgid "process for submodule '%s' failed"
+msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
+
+#: 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:1156
+#, fuzzy, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Atirando submódulo '%s'\n"
+
+#: submodule.c:1159
+#, fuzzy, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Impossível enviar submódulo '%s'\n"
+
+#: submodule.c:1451
+#, fuzzy, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Buscando submódulo %s%s\n"
+
+#: submodule.c:1485
+#, fuzzy, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Submódulo '%s' inacessível\n"
+
+#: submodule.c:1640
+#, fuzzy, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Erros na busca do submódulo:\n"
+"%s"
+
+#: 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:1332
+#: submodule.c:1682
+#, fuzzy, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "Incapaz executar 'git status' no submódulo '%s'"
+
+#: submodule.c:1723
+#, fuzzy, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "'git status --porcelain=2' falhou no submódulo '%s'"
+
+#: 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:1345
+#: 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:1826
+#, fuzzy, 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:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "incapaz percorrer recursivamente o submódulo '%s'"
+
+#: submodule.c:1874
+#, fuzzy
+msgid "could not reset submodule index"
+msgstr "incapaz repor index de submódulo"
 
-#: submodule.c:1421
+#: submodule.c:1916
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "o submódulo '%s' tem índice sujo"
 
-#: submodule.c:1679
+#: submodule.c:1968
+#, fuzzy, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "Submódulo '%s' incapaz de ser atualizado."
+
+#: submodule.c:2036
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+
+#: 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:1691 submodule.c:1747
+#: 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:1695 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:2073
 #, c-format
-msgid "could not create directory '%s'"
-msgstr "não foi possível criar o diretório '%s'"
+msgid "refusing to move '%s' into an existing git dir"
+msgstr ""
 
-#: submodule.c:1698
+#: submodule.c:2080
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -3621,103 +8962,330 @@ msgstr ""
 "'%s' para\n"
 "'%s'\n"
 
-#: submodule.c:1782
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "não foi possível percorrer recursivamente o submódulo '%s'"
-
-#: submodule.c:1826
+#: submodule.c:2208
 msgid "could not start ls-files in .."
-msgstr "não foi possível iniciar ls-files em .."
-
-#: submodule.c:1846
-msgid "BUG: returned path string doesn't match cwd?"
-msgstr "BUG: returned path string doesn't match cwd?"
+msgstr "incapaz iniciar ls-files em .."
 
-#: submodule.c:1865
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree retornou código de retorno inesperado %d"
 
-#: submodule-config.c:380
+#: symlinks.c:244
 #, c-format
-msgid "invalid value for %s"
-msgstr "valor inválido de %s"
+msgid "failed to lstat '%s'"
+msgstr ""
 
-#: trailer.c:240
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "falha ao executar o comando trailer '%s'"
 
-#: trailer.c:473 trailer.c:477 trailer.c:481 trailer.c:535 trailer.c:539
-#: trailer.c:543
+#: 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:525 trailer.c:530 builtin/remote.c:289
+#: 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:702
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "token terminador vazio no terminador '%.*s'"
 
-#: trailer.c:722
+#: 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:725
+#: 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:949 builtin/am.c:44
+#: 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 obter estatutário %s"
 
-#: trailer.c:951
+#: 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:953
+#: 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:965
+#: 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:1001
+#: 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"
+
+#: transport-helper.c:145
+#, fuzzy, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "incapaz de encontrar helper remoto para '%s'"
+
+#: transport-helper.c:161 transport-helper.c:575
+msgid "can't dup helper output fd"
+msgstr ""
+
+#: transport-helper.c:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+
+#: transport-helper.c:220
+msgid "this remote helper should implement refspec capability"
+msgstr ""
 
-#: transport.c:62
+#: transport-helper.c:287 transport-helper.c:429
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr ""
+
+#: transport-helper.c:417
+#, fuzzy, c-format
+msgid "%s also locked %s"
+msgstr "%s também trancou %s"
+
+#: transport-helper.c:497
+#, fuzzy
+msgid "couldn't run fast-import"
+msgstr "incapaz executar fast-import"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr ""
+
+#: transport-helper.c:549 transport-helper.c:1247
+#, fuzzy, c-format
+msgid "could not read ref %s"
+msgstr "incapaz de ler ref %s"
+
+#: transport-helper.c:594
+#, fuzzy, c-format
+msgid "unknown response to connect: %s"
+msgstr "resposta de conexão desconhecida: %s"
+
+#: transport-helper.c:616
+msgid "setting remote service path not supported by protocol"
+msgstr ""
+
+#: transport-helper.c:618
+msgid "invalid remote service path"
+msgstr ""
+
+#: transport-helper.c:661 transport.c:1477
+#, fuzzy
+msgid "operation not supported by protocol"
+msgstr "opção insustentado pelo protocolo"
+
+#: transport-helper.c:664
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr ""
+
+#: 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:798
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr ""
+
+#: transport-helper.c:855
+#, fuzzy, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "helper reportou código de status inesperado de %s"
+
+#: transport-helper.c:938
+#, fuzzy, c-format
+msgid "helper %s does not support dry-run"
+msgstr "helper %s insustenta dry-run"
+
+#: transport-helper.c:941
+#, fuzzy, c-format
+msgid "helper %s does not support --signed"
+msgstr "helper %s insustenta --signed"
+
+#: transport-helper.c:944
+#, fuzzy, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "helper %s insustenta --signed=if-asked"
+
+#: transport-helper.c:949
+#, fuzzy, c-format
+msgid "helper %s does not support --atomic"
+msgstr "helper %s insustenta --atomic"
+
+#: transport-helper.c:953
+#, fuzzy, c-format
+msgid "helper %s does not support --%s"
+msgstr "helper %s insustenta --%s"
+
+#: transport-helper.c:960
+#, fuzzy, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "helper %s insustenta 'push-option'"
+
+#: transport-helper.c:1060
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr ""
+
+#: transport-helper.c:1065
+#, fuzzy, c-format
+msgid "helper %s does not support 'force'"
+msgstr "helper %s insustenta 'force'"
+
+#: transport-helper.c:1112
+#, fuzzy
+msgid "couldn't run fast-export"
+msgstr "incapaz executar fast-export"
+
+#: transport-helper.c:1117
+msgid "error while running fast-export"
+msgstr ""
+
+#: 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:1224
+#, fuzzy, c-format
+msgid "unsupported object format '%s'"
+msgstr "objeto malformado em '%s'"
+
+#: transport-helper.c:1233
+#, fuzzy, c-format
+msgid "malformed response in ref list: %s"
+msgstr "resposta em lista de ref malformada: %s"
+
+#: transport-helper.c:1385
+#, c-format
+msgid "read(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1412
+#, c-format
+msgid "write(%s) failed"
+msgstr ""
+
+#: transport-helper.c:1461
+#, c-format
+msgid "%s thread failed"
+msgstr ""
+
+#: transport-helper.c:1465
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr ""
+
+#: transport-helper.c:1484 transport-helper.c:1488
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr ""
+
+#: transport-helper.c:1525
+#, c-format
+msgid "%s process failed to wait"
+msgstr ""
+
+#: transport-helper.c:1529
+#, c-format
+msgid "%s process failed"
+msgstr ""
+
+#: transport-helper.c:1547 transport-helper.c:1556
+msgid "can't start thread for copying data"
+msgstr ""
+
+#: transport.c:116
 #, c-format
 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:151
+#: transport.c:145
+#, fuzzy, c-format
+msgid "could not read bundle '%s'"
+msgstr "incapaz ler conjunto '%s'"
+
+#: transport.c:223
 #, c-format
 msgid "transport: invalid depth option '%s'"
 msgstr "transporte: opção de profundidade '%s' inválida"
 
-#: transport.c:889
+#: transport.c:275
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+
+#: transport.c:276
+msgid "server options require protocol version 2 or later"
+msgstr ""
+
+#: transport.c:403
+#, fuzzy
+msgid "server does not support wait-for-done"
+msgstr "Servidor insustenta --deepen"
+
+#: transport.c:755
+#, fuzzy
+msgid "could not parse transport.color.* config"
+msgstr "incapaz processar config transport.color.*"
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:965
+#, fuzzy, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "valor para config '%s' desconhecido: %s"
+
+#: transport.c:1031
+#, fuzzy, c-format
+msgid "transport '%s' not allowed"
+msgstr "transport '%s' proibido"
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:1187
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr ""
-"Os seguintes caminhos de submódulo contêm alterações que\n"
-"não puderam ser encontradas a nenhum remoto:\n"
+"Os seguintes paths de submódulo contêm alterações que\n"
+"puderam ser encontradas em remoto nenhum:\n"
 
-#: transport.c:893
+#: transport.c:1191
 #, c-format
 msgid ""
 "\n"
@@ -3744,32 +9312,32 @@ msgstr ""
 "para publicá-las no remoto.\n"
 "\n"
 
-#: transport.c:901
+#: transport.c:1199
 msgid "Aborting."
 msgstr "Abortado."
 
-#: transport-helper.c:1080
-#, c-format
-msgid "Could not read ref %s"
-msgstr "Não foi possível ler a referência %s"
+#: transport.c:1346
+#, fuzzy
+msgid "failed to push all needed submodules"
+msgstr "Falha ao adicionar o submódulo '$sm_path'"
 
-#: tree-walk.c:31
+#: tree-walk.c:33
 msgid "too-short tree object"
 msgstr "objeto árvore demasiado curto"
 
-#: tree-walk.c:37
+#: tree-walk.c:39
 msgid "malformed mode in tree entry"
 msgstr "modo na entrada de árvore malformado"
 
-#: tree-walk.c:41
+#: tree-walk.c:43
 msgid "empty filename in tree entry"
 msgstr "nome de ficheiro vazio na entrada de árvore"
 
-#: tree-walk.c:113
+#: tree-walk.c:118
 msgid "too-short tree file"
 msgstr "ficheiro de árvore demasiado curto"
 
-#: unpack-trees.c:104
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3779,7 +9347,7 @@ msgstr ""
 "extrair:\n"
 "%%sSubmeta as suas alterações ou esconda-as antes de trocar de ramo."
 
-#: unpack-trees.c:106
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -3789,7 +9357,7 @@ msgstr ""
 "extrair:\n"
 "%%s"
 
-#: unpack-trees.c:109
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3799,7 +9367,7 @@ msgstr ""
 "integrar:\n"
 "%%sSubmeta as suas alterações ou esconda-as antes de integrar."
 
-#: unpack-trees.c:111
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -3809,17 +9377,17 @@ msgstr ""
 "integrar:\n"
 "%%s"
 
-#: unpack-trees.c:114
+#: 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:116
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -3829,197 +9397,208 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:121
+#: 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:125
+#: 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:127
+#: 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:130
+#: 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"
-"%%sMova 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:132
+#: 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:135
+#: 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:137
+#: 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:142
+#: 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:144
+#: 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:147
+#: 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:149
+#: 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:152
+#: 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:154
+#: 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:161
+#: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
-msgstr "A entrada '%s' sobrepõe-se com '%s'. Não é possível vincular."
+msgstr "Entrada '%s' sobrepõe-se a '%s'. Impossível vincular."
 
-#: unpack-trees.c:164
+#: unpack-trees.c:177
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update submodule:\n"
 "%s"
 msgstr ""
-"Não é possível extrair esparsamente: as seguintes entradas não estão "
-"atualizadas:\n"
+"Impossível atualizar submódulo:\n"
 "%s"
 
-#: unpack-trees.c:166
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Os seguintes ficheiros na árvore de trabalho seriam substituídos ao "
-"atualizar a extração esparsa:\n"
-"%s"
 
-#: unpack-trees.c:168
-#, c-format
+#: unpack-trees.c:182
+#, fuzzy, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
-"Os seguintes ficheiros na árvore de trabalho seriam removidos ao atualizar a "
-"extração esparsa:\n"
+"Os seguintes caminhos estão unmerged e foram abandonados, apesar de sparse "
+"patterns:\n"
 "%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:184
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Não é possível atualizar submódulo:\n"
-"%s"
 
-#: unpack-trees.c:247
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "A abortar\n"
 
-#: unpack-trees.c:272
+#: 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:352
+#, fuzzy
+msgid "Updating files"
+msgstr "Atualizando ficheiros"
+
+#: 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:1618
+#, fuzzy
+msgid "Updating index flags"
+msgstr "Atualizando flags de cenário"
+
+#: unpack-trees.c:2718
 #, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "não foi possível procurar pelo submódulo '%s'"
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr ""
 
-#: unpack-trees.c:340
-msgid "Checking out files"
-msgstr "A extrair ficheiros"
+#: upload-pack.c:1548
+msgid "expected flush after fetch arguments"
+msgstr ""
 
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
@@ -4032,11 +9611,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"
@@ -4050,299 +9629,404 @@ msgstr "número de porta inválido"
 msgid "invalid '..' path segment"
 msgstr "segmento de caminho '..' inválido"
 
-#: worktree.c:285
+#: walker.c:170
+#, fuzzy
+msgid "Fetching objects"
+msgstr "Buscando objetos"
+
+#: worktree.c:236 builtin/am.c:2152
 #, c-format
 msgid "failed to read '%s'"
 msgstr "falha ao ler '%s'"
 
-#: wrapper.c:222 wrapper.c:392
+#: worktree.c:303
 #, c-format
-msgid "could not open '%s' for reading and writing"
-msgstr "não foi possível abrir '%s' para leitura e escrita"
+msgid "'%s' at main working tree is not the repository directory"
+msgstr ""
 
-#: wrapper.c:224 wrapper.c:394 builtin/am.c:766
+#: worktree.c:314
 #, c-format
-msgid "could not open '%s' for writing"
-msgstr "não foi possível abrir '%s' para escrita"
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr ""
 
-#: wrapper.c:226 wrapper.c:396 builtin/am.c:320 builtin/am.c:759
-#: builtin/am.c:847 builtin/commit.c:1700 builtin/merge.c:1015
-#: builtin/pull.c:341
-#, c-format
-msgid "could not open '%s' for reading"
-msgstr "não foi possível abrir '%s' para leitura"
+#: worktree.c:326
+#, fuzzy, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' é inexistente"
+
+#: worktree.c:332
+#, fuzzy, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' é ficheiro .git nenhum, código de erro %d"
+
+#: worktree.c:341
+#, fuzzy, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' aponta para algo diferente de '%s'"
+
+#: worktree.c:603
+#, fuzzy
+msgid "not a directory"
+msgstr "é pasta nenhuma"
+
+#: worktree.c:612
+#, fuzzy
+msgid ".git is not a file"
+msgstr "git show %s: ficheiro incorreto"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr ""
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr ""
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr ""
+
+#: worktree.c:728
+#, fuzzy
+msgid "unable to locate repository; .git is not a file"
+msgstr "incapaz localizar repositório; .git é diferente de ficheiro"
+
+#: worktree.c:732
+#, fuzzy
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "incapaz localizar repositório; .git é diferente de ficheiro"
+
+#: worktree.c:736
+#, fuzzy
+msgid "unable to locate repository; .git file broken"
+msgstr "incapaz localizar repositório; .git está quebrado"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr ""
 
-#: wrapper.c:581 wrapper.c:602
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr ""
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr ""
+
+#: worktree.c:777
+#, fuzzy
+msgid "gitdir file does not exist"
+msgstr "ficheiro gitdir é inexistente"
+
+#: worktree.c:782 worktree.c:791
+#, fuzzy, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "incapaz ler ficheiro gitdir (%s)"
+
+#: worktree.c:801
 #, c-format
-msgid "unable to access '%s'"
-msgstr "não é possível aceder a '%s'"
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
 
-#: wrapper.c:610
-msgid "unable to get current working directory"
-msgstr "não é possível de obter o diretório de trabalho atual"
+#: worktree.c:809
+#, fuzzy
+msgid "invalid gitdir file"
+msgstr "linha de Data inválida"
+
+#: worktree.c:817
+#, fuzzy
+msgid "gitdir file points to non-existent location"
+msgstr ""
+"A remover worktrees/%s: o ficheiro gitdir aponta para uma localização "
+"inexistente"
 
-#: wrapper.c:634
+#: wrapper.c:197 wrapper.c:367
 #, c-format
-msgid "could not write to %s"
-msgstr "não foi possível escrever para %s"
+msgid "could not open '%s' for reading and writing"
+msgstr "incapaz abrir '%s' para leitura e escrita"
 
-#: wrapper.c:636
+#: wrapper.c:398 wrapper.c:599
 #, c-format
-msgid "could not close %s"
-msgstr "não foi possível fechar %s"
+msgid "unable to access '%s'"
+msgstr "incapaz aceder '%s'"
+
+#: wrapper.c:607
+msgid "unable to get current working directory"
+msgstr "incapaz obter pasta atual de trabalho"
 
-#: wt-status.c:151
+#: wt-status.c:158
 msgid "Unmerged paths:"
-msgstr "Caminhos não integrados:"
+msgstr "Paths por juntar:"
 
-#: wt-status.c:178 wt-status.c:205
-#, c-format
-msgid "  (use \"git reset %s <file>...\" to unstage)"
+#: 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)"
+
+#: wt-status.c:190 wt-status.c:222
+#, fuzzy, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
 msgstr "  (use \"git reset %s <ficheiro>...\" para despreparar)"
 
-#: wt-status.c:180 wt-status.c:207
+#: wt-status.c:193 wt-status.c:225
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (use \"git rm --cached <ficheiro>...\" para despreparar)"
 
-#: wt-status.c:184
+#: wt-status.c:197
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (use \"git add <ficheiro>...\" para marcar como resolvido)"
 
-#: wt-status.c:186 wt-status.c:190
+#: 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 "
 "resolvido)"
 
-#: wt-status.c:188
+#: wt-status.c:201
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (use \"git rm <ficheiro>...\" para marcar como resolvido)"
 
-#: wt-status.c:199 wt-status.c:958
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr "Alterações para serem submetidas:"
 
-#: wt-status.c:217 wt-status.c:967
+#: 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:221
+#: 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)"
 
-#: wt-status.c:223
+#: 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)"
 
-#: wt-status.c:224
+#: wt-status.c:241
+#, fuzzy
 msgid ""
-"  (use \"git checkout -- <file>...\" to discard changes in working directory)"
+"  (use \"git restore <file>...\" to discard changes in working directory)"
 msgstr ""
 "  (use \"git checkout -- <ficheiro>...\" para descartar alterações no "
 "diretório de trabalho)"
 
-#: wt-status.c:226
+#: 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)"
+"  (faz commit ou descarta o conteúdo por seguir ou modificado nos submódulos)"
 
-#: wt-status.c:238
+#: 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)"
 
-#: wt-status.c:253
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr "eliminado por ambos:"
 
-#: wt-status.c:255
+#: wt-status.c:268
 msgid "added by us:"
 msgstr "adicionado por nós:"
 
-#: wt-status.c:257
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "eliminado por eles:"
 
-#: wt-status.c:259
+#: wt-status.c:272
 msgid "added by them:"
 msgstr "adicionado por eles:"
 
-#: wt-status.c:261
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr "eliminado por nós:"
 
-#: wt-status.c:263
+#: wt-status.c:276
 msgid "both added:"
 msgstr "adicionado por ambos:"
 
-#: wt-status.c:265
+#: wt-status.c:278
 msgid "both modified:"
 msgstr "modificado por ambos:"
 
-#: wt-status.c:275
+#: wt-status.c:288
 msgid "new file:"
 msgstr "novo ficheiro:"
 
-#: wt-status.c:277
+#: wt-status.c:290
 msgid "copied:"
 msgstr "copiado:"
 
-#: wt-status.c:279
+#: wt-status.c:292
 msgid "deleted:"
 msgstr "eliminado:"
 
-#: wt-status.c:281
+#: wt-status.c:294
 msgid "modified:"
 msgstr "modificado:"
 
-#: wt-status.c:283
+#: wt-status.c:296
 msgid "renamed:"
 msgstr "nome mudado:"
 
-#: wt-status.c:285
+#: wt-status.c:298
 msgid "typechange:"
 msgstr "tipo alterado:"
 
-#: wt-status.c:287
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "desconhecido:"
 
-#: wt-status.c:289
+#: wt-status.c:302
 msgid "unmerged:"
-msgstr "não integrado:"
+msgstr "por juntar:"
 
-#: wt-status.c:371
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "novos commits, "
 
-#: wt-status.c:373
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "conteúdo modificado, "
 
-#: wt-status.c:375
+#: wt-status.c:386
 msgid "untracked content, "
-msgstr "conteúdo não controlado, "
+msgstr "conteúdo por seguir, "
+
+#: wt-status.c:958
+#, fuzzy, 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."
 
-#: wt-status.c:831
+#: 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:833
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr "Alterações em submódulos para serem submetidas:"
 
-#: wt-status.c:914
+#: wt-status.c:1073
+#, fuzzy
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Deixe estar a linha acima.\n"
+"Tudo abaixo será ignorado."
+
+#: wt-status.c:1165
+#, c-format
 msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"\n"
+"It took %.2f seconds to compute the branch ahead/behind values.\n"
+"You can use '--no-ahead-behind' to avoid this.\n"
 msgstr ""
-"Não altere a linha acima.\n"
-"Tudo o que estiver abaixo será removido."
 
-#: wt-status.c:1026
+#: wt-status.c:1195
 msgid "You have unmerged paths."
-msgstr "Há caminhos não integrados."
+msgstr "Tens paths por juntar."
 
-#: wt-status.c:1029
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (corrija os conflitos e execute \"git commit\")"
 
-#: wt-status.c:1031
+#: wt-status.c:1200
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (use \"git am --abort\" para abortar a integração)"
 
-#: wt-status.c:1036
+#: 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:1039
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (use \"git commit\" para concluir a integração)"
 
-#: wt-status.c:1049
+#: wt-status.c:1216
 msgid "You are in the middle of an am session."
 msgstr "Sessão am em curso."
 
-#: wt-status.c:1052
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr "O patch atual está vazio."
 
-#: wt-status.c:1056
+#: wt-status.c:1223
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (corrija os conflitos e execute \"git am --continue\")"
 
-#: wt-status.c:1058
+#: wt-status.c:1225
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (use \"git am --skip\" para ignorar este patch)"
 
-#: wt-status.c:1060
+#: wt-status.c:1227
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (use \"git am --abort\" para restaurar o ramo original)"
 
-#: wt-status.c:1189
+#: 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:1191
+#: wt-status.c:1362
 msgid "No commands done."
-msgstr "Nenhum comando concluído."
+msgstr "Comando nenhum concluído."
 
-#: wt-status.c:1194
+#: 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:1205
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (veja mais no ficheiro %s)"
 
-#: wt-status.c:1210
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "Nenhum comando por concluir."
 
-#: wt-status.c:1213
+#: 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:1221
+#: wt-status.c:1392
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  (use \"git rebase --edit-todo\" para visualizar e editar)"
 
-#: wt-status.c:1234
+#: 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:1239
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr "Está a rebasear neste momento."
 
-#: wt-status.c:1253
+#: wt-status.c:1422
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (corrija os conflitos e execute \"git rebase --continue\")"
 
-#: wt-status.c:1255
+#: wt-status.c:1424
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (use \"git rebase --skip\" para ignorar este patch)"
 
-#: wt-status.c:1257
+#: 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)"
 
-#: wt-status.c:1263
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr ""
 "  (todos os conflitos foram corrigidos: execute \"git rebase --continue\")"
 
-#: wt-status.c:1267
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4350,539 +10034,642 @@ msgstr ""
 "Está a dividir um commit ao mesmo tempo que se efetua rebase do ramo '%s' "
 "sobre '%s'."
 
-#: wt-status.c:1272
+#: 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:1275
+#: 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\")"
 
-#: wt-status.c:1279
+#: 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:1284
+#: 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:1287
+#: wt-status.c:1457
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (use \"git commit --amend\" para emendar o commit atual)"
 
-#: wt-status.c:1289
+#: 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:1299
+#: wt-status.c:1470
+#, fuzzy
+msgid "Cherry-pick currently in progress."
+msgstr "Cherry-pick atualmente em curso"
+
+#: 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:1304
+#: wt-status.c:1480
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (corrija os conflitos e execute \"git cherry-pick --continue\")"
 
-#: wt-status.c:1307
+#: wt-status.c:1483
+#, fuzzy
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (corrija os conflitos e execute \"git cherry-pick --continue\")"
+
+#: wt-status.c:1486
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr ""
 "  (todos os conflitos foram corrigidos: execute \"git cherry-pick --continue"
 "\")"
 
-#: wt-status.c:1309
+#: wt-status.c:1488
+#, fuzzy
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (use \"git am --skip\" para ignorar este patch)"
+
+#: 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)"
 
-#: wt-status.c:1318
+#: wt-status.c:1500
+#, fuzzy
+msgid "Revert currently in progress."
+msgstr "abortar integração em curso"
+
+#: 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:1323
+#: wt-status.c:1509
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (corrija dos conflitos e execute \"git revert --continue\")"
 
-#: wt-status.c:1326
+#: wt-status.c:1512
+#, fuzzy
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (corrija dos conflitos e execute \"git revert --continue\")"
+
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr ""
 "  (todos os conflitos foram corrigidos: execute \"git revert --continue\")"
 
-#: wt-status.c:1328
+#: wt-status.c:1517
+#, fuzzy
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (use \"git rebase --skip\" para ignorar este patch)"
+
+#: 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)"
 
-#: wt-status.c:1339
+#: 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:1343
+#: wt-status.c:1533
 msgid "You are currently bisecting."
 msgstr "Está a bissetar neste momento."
 
-#: wt-status.c:1346
+#: 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)"
 
-#: wt-status.c:1543
+#: wt-status.c:1547
+#, fuzzy
+msgid "You are in a sparse checkout."
+msgstr "Estás num checkout disperso."
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+
+#: wt-status.c:1794
 msgid "On branch "
 msgstr "No ramo "
 
-#: wt-status.c:1549
+#: wt-status.c:1801
 msgid "interactive rebase in progress; onto "
 msgstr "rebase interativo em curso; sobre "
 
-#: wt-status.c:1551
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
 msgstr "rebase em curso; sobre "
 
-#: wt-status.c:1556
+#: wt-status.c:1808
 msgid "HEAD detached at "
 msgstr "HEAD destacada em "
 
-#: wt-status.c:1558
+#: wt-status.c:1810
 msgid "HEAD detached from "
 msgstr "HEAD destacada de "
 
-#: wt-status.c:1561
+#: wt-status.c:1813
 msgid "Not currently on any branch."
-msgstr "Não se encontra em nenhum ramo neste momento."
+msgstr "Atualmente em ramo nenhum."
 
-#: wt-status.c:1579
+#: wt-status.c:1830
 msgid "Initial commit"
-msgstr "Commit inicial"
+msgstr "Memória inicial"
+
+#: wt-status.c:1831
+#, fuzzy
+msgid "No commits yet"
+msgstr "Ainda commits nenhuns"
 
-#: wt-status.c:1593
+#: wt-status.c:1845
 msgid "Untracked files"
-msgstr "Ficheiros não controlados"
+msgstr "Ficheiros por seguir"
 
-#: wt-status.c:1595
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "Ficheiros ignorados"
 
-#: wt-status.c:1599
+#: 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:1605
+#: 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:1607
+#: 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:1613
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "Sem alterações"
 
-#: wt-status.c:1618
+#: wt-status.c:1870
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr ""
-"nenhuma alteração adicionada para submeter (use \"git add\" e/ou \"git "
-"commit -a\")\n"
+"foi adicionado a commit alteração nenhuma (usa \"git add\" e/ou \"git commit "
+"-a\")\n"
 
-#: wt-status.c:1621
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
-msgstr "nenhuma alteração adicionada para submeter\n"
+msgstr "foi adicionado a commit alteração nenhuma\n"
 
-#: wt-status.c:1624
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr ""
-"não foi adicionado nada para submeter, mas existem ficheiros não controlados "
-"(use \"git add\" para controlá-los)\n"
+"nada adicionado para commit mas há ficheiros por seguir presentes (usa(\"git "
+"add\" para seguir)\n"
 
-#: wt-status.c:1627
+#: wt-status.c:1882
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
-msgstr ""
-"não foi adicionado nada para submeter, mas existem ficheiros não "
-"controlados\n"
+msgstr "nada adicionado para commit mas ficheiros por seguir presentes\n"
 
-#: wt-status.c:1630
+#: wt-status.c:1886
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
-msgstr ""
-"não há nada para submeter (crie/copie ficheiros e use \"git add\" para "
-"controlá-los)\n"
+msgstr "nada a commit (cria/copia ficheiros e usa \"git add\" para seguir)\n"
 
-#: wt-status.c:1633 wt-status.c:1638
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
-msgstr "não há nada para submeter\n"
+msgstr "nada a commit\n"
 
-#: wt-status.c:1636
+#: wt-status.c:1893
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
-msgstr ""
-"não há nada para submeter (use -u para mostrar os ficheiros não "
-"controlados)\n"
+msgstr "nada a commit (use -u para mostrar ficheiros por seguir)\n"
 
-#: wt-status.c:1640
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit, working tree clean\n"
-msgstr "não há nada para submeter, árvore de trabalho limpa\n"
+msgstr "nada a commitar, worktree limpa\n"
 
-#: wt-status.c:1749
-msgid "Initial commit on "
-msgstr "Commit inicial em "
+#: wt-status.c:2003
+#, fuzzy
+msgid "No commits yet on "
+msgstr "Memórias nenhumas em "
 
-#: wt-status.c:1753
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
-msgstr "HEAD (nenhum ramo)"
+msgstr "HEAD (ramo nenhum)"
 
-#: wt-status.c:1782 wt-status.c:1790
+#: wt-status.c:2038
+msgid "different"
+msgstr "diferente"
+
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "atrás "
 
-#: wt-status.c:1785 wt-status.c:1788
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "à frente "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2280
+#: 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:2286
+#: 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:2288
+#: 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
+#, fuzzy
+msgid "could not send IPC command"
+msgstr "incapaz encontrar commit %s"
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+#, fuzzy
+msgid "could not read IPC response"
+msgstr "incapaz de ler ref %s"
+
+#: 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
+#, fuzzy, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "incapaz analisar log para '%s'"
 
-#: compat/precompose_utf8.c:57 builtin/clone.c:432
+#: 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:22
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<opções>] [--] <caminho>..."
 
-#: builtin/add.c:80
+#: builtin/add.c:61
+#, fuzzy, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "incapaz chdir para '%s'"
+
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff status inesperado %c"
 
-#: builtin/add.c:85 builtin/commit.c:291
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
 msgstr "falha ao atualizar os ficheiros"
 
-#: builtin/add.c:95
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
-msgstr "remover '%s'\n"
+msgstr "remove '%s'\n"
 
-#: builtin/add.c:149
+#: 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:209 builtin/rev-parse.c:872
+#: builtin/add.c:307 builtin/rev-parse.c:993
 msgid "Could not read the index"
-msgstr "Não foi possível ler o índice"
+msgstr "Incapaz ler o index"
 
-#: builtin/add.c:220
+#: builtin/add.c:318
 #, c-format
 msgid "Could not open '%s' for writing."
-msgstr "Não foi possível abrir '%s' para escrita."
+msgstr "Incapaz de abrir '%s' para escrita."
 
-#: builtin/add.c:224
+#: builtin/add.c:322
 msgid "Could not write patch"
-msgstr "Não foi possível escrever patch"
+msgstr "Incapaz de escrever patch"
 
-#: builtin/add.c:227
+#: builtin/add.c:325
 msgid "editing patch failed"
-msgstr "falha ao editar patch"
+msgstr "edição de patch falhou"
 
-#: builtin/add.c:230
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
-msgstr "Não foi possível obter stat de '%s'"
+msgstr "Impossível fazer stat de '%s'"
 
-#: builtin/add.c:232
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr "Patch vazio. Abortado."
 
-#: builtin/add.c:237
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
-msgstr "Não foi possível aplicar '%s'"
+msgstr "Impossível submeter '%s'"
 
-#: builtin/add.c:247
+#: 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:266 builtin/clean.c:876 builtin/fetch.c:115 builtin/mv.c:123
-#: builtin/prune-packed.c:55 builtin/pull.c:198 builtin/push.c:524
-#: builtin/remote.c:1328 builtin/rm.c:241 builtin/send-pack.c:163
+#: 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:269
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr "seleção interativa"
 
-#: builtin/add.c:270 builtin/checkout.c:1177 builtin/reset.c:286
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "selecionar blocos interativamente"
 
-#: builtin/add.c:271
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr "editar o diff atual e aplicá-lo"
 
-#: builtin/add.c:272
+#: builtin/add.c:369
 msgid "allow adding otherwise ignored files"
 msgstr "permitir adicionar ficheiros ignorados"
 
-#: builtin/add.c:273
+#: builtin/add.c:370
 msgid "update tracked files"
 msgstr "atualizar ficheiros controlados"
 
-#: builtin/add.c:274
+#: builtin/add.c:371
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr ""
+
+#: 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:275
+#: 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:278
+#: 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 worktree (o mesmo que --no-all)"
 
-#: builtin/add.c:280
+#: 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:281
+#: 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:282
+#: 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:283 builtin/update-index.c:951
-msgid "(+/-)x"
-msgstr "(+/-)x"
-
-#: builtin/add.c:283 builtin/update-index.c:952
+#: 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"
 
-#: builtin/add.c:305
+#: builtin/add.c:384
+#, fuzzy
+msgid "warn when adding an embedded repository"
+msgstr "criar um repositório nu"
+
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr ""
+
+#: builtin/add.c:404
 #, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Use -f se deseja mesmo adicioná-los.\n"
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+
+#: builtin/add.c:432
+#, fuzzy, c-format
+msgid "adding embedded git repository: %s"
+msgstr "--stdin requer um repositório git"
+
+#: 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:312
+#: builtin/add.c:460
 msgid "adding files failed"
 msgstr "falha ao adicionar ficheiros"
 
-#: builtin/add.c:348
+#: 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 "-A e -u são mutuamente incompatíveis"
 
-#: builtin/add.c:355
+#: 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"
 
-#: builtin/add.c:359
+#: 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"
 
-#: builtin/add.c:374
-#, c-format
-msgid "Nothing specified, nothing added.\n"
-msgstr "Não foi especificado nada, nada adicionado.\n"
+#: builtin/add.c:544 builtin/checkout.c:1733 builtin/commit.c:363
+#: builtin/reset.c:328 builtin/rm.c:273 builtin/stash.c:1633
+#, fuzzy
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+msgstr "--patch é incompatível com --{hard,mixed,soft}"
 
-#: builtin/add.c:375
+#: 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:555
 #, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Queria dizer 'git add .'?\n"
+msgid "Nothing specified, nothing added.\n"
+msgstr ".\n"
 
-#: builtin/add.c:380 builtin/check-ignore.c:172 builtin/checkout.c:298
-#: builtin/checkout.c:491 builtin/clean.c:920 builtin/commit.c:350
-#: builtin/mv.c:143 builtin/reset.c:235 builtin/rm.c:271
-#: builtin/submodule--helper.c:244
-msgid "index file corrupt"
-msgstr "ficheiro de índice corrompido"
+#: 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:414
+#: 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:491
+#: 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:532
+#: builtin/am.c:497
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Linha de entrada malformada: '%s'."
 
-#: builtin/am.c:569
+#: 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:595
+#: builtin/am.c:561
 msgid "fseek failed"
-msgstr "falha ao invocar fseek"
+msgstr "falha de fseek"
 
-#: builtin/am.c:775
+#: 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:840
+#: 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:887
+#: builtin/am.c:862
 msgid "invalid timestamp"
 msgstr "carimbo de data/hora inválido"
 
-#: builtin/am.c:890 builtin/am.c:898
+#: builtin/am.c:867 builtin/am.c:879
 msgid "invalid Date line"
 msgstr "linha de Data inválida"
 
-#: builtin/am.c:895
+#: builtin/am.c:874
 msgid "invalid timezone offset"
 msgstr "mudança de fuso horário inválida"
 
-#: builtin/am.c:984
+#: builtin/am.c:967
 msgid "Patch format detection failed."
 msgstr "Falha ao detetar o formato do patch."
 
-#: builtin/am.c:989 builtin/clone.c:397
+#: builtin/am.c:972 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "falha ao criar o diretório '%s'"
 
-#: builtin/am.c:993
+#: builtin/am.c:977
 msgid "Failed to split patches."
 msgstr "Falha ao dividir patches."
 
-#: builtin/am.c:1125 builtin/commit.c:376
-msgid "unable to write index file"
-msgstr "não é possível escrever o ficheiro de índice"
-
-#: builtin/am.c:1176
+#: 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\"."
 
-#: builtin/am.c:1177
+#: 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\"."
 
-#: builtin/am.c:1178
+#: 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\"."
 
-#: builtin/am.c:1316
-msgid "Patch is empty. Was it split wrong?"
-msgstr "O patch está vazio. Foi dividido incorretamente?"
+#: builtin/am.c:1223
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr ""
 
-#: builtin/am.c:1390 builtin/log.c:1557
-#, c-format
-msgid "invalid ident line: %s"
-msgstr "linha de identidade inválida: %s"
+#: builtin/am.c:1251
+#, fuzzy
+msgid "Patch is empty."
+msgstr "O patch atual está vazio."
 
-#: builtin/am.c:1417
-#, c-format
-msgid "unable to parse commit %s"
-msgstr "não foi possível analisar o commit %s"
+#: builtin/am.c:1316
+#, fuzzy, c-format
+msgid "missing author line in commit %s"
+msgstr "Autor em falta: %s"
+
+#: builtin/am.c:1319
+#, fuzzy, c-format
+msgid "invalid ident line: %.*s"
+msgstr "linha de indentação inválida: %.*s"
 
-#: builtin/am.c:1610
+#: 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:1612
+#: 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:1631
+#: builtin/am.c:1559
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr ""
-"Editou o patch manualmente?\n"
-"Não é possível aplicá-lo aos blobs registados no índice."
+"Editaste o patch manualmente?\n"
+"No registo de index, aplica-se a blobs nenhuns."
 
-#: builtin/am.c:1637
+#: 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:1662
+#: builtin/am.c:1591
 msgid "Failed to merge in the changes."
 msgstr "Falha ao integrar as alterações."
 
-#: builtin/am.c:1686 builtin/merge.c:631
-msgid "git write-tree failed to write a tree"
-msgstr "git write-tree falhou ao escrever uma árvore"
-
-#: builtin/am.c:1693
+#: builtin/am.c:1623
 msgid "applying to an empty history"
 msgstr "a aplicar a um histórico vazio"
 
-#: builtin/am.c:1706 builtin/commit.c:1764 builtin/merge.c:802
-#: builtin/merge.c:827
-msgid "failed to write commit object"
-msgstr "falha ao escrever objeto de commit"
-
-#: builtin/am.c:1739 builtin/am.c:1743
+#: 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."
-
-#: builtin/am.c:1759
-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."
+msgstr "incapaz continuar: %s é inexistente."
 
-#: builtin/am.c:1764
+#: builtin/am.c:1697
 msgid "Commit Body is:"
 msgstr "Corpo do commit:"
 
@@ -4890,216 +10677,251 @@ msgstr "Corpo do commit:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1774
+#: 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:1824
+#: builtin/am.c:1753 builtin/commit.c:408
+msgid "unable to write index file"
+msgstr "incapaz escrever ficheiro de index"
+
+#: 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:1861 builtin/am.c:1933
+#: builtin/am.c:1797 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "A aplicar: %.*s"
 
-#: builtin/am.c:1877
+#: builtin/am.c:1814
 msgid "No changes -- Patch already applied."
 msgstr "Nenhuma alteração -- Já foi aplicado o patch."
 
-#: builtin/am.c:1885
+#: builtin/am.c:1820
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Falha ao aplicar o patch em %s %.*s"
 
-#: builtin/am.c:1891
-#, 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"
+#: builtin/am.c:1824
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr ""
 
-#: builtin/am.c:1936
+#: 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 ""
-"Sem alterações - esqueceu-se de usar 'git add'?\n"
-"Se não há nada por preparar, provavelmente essas mesmas alterações\n"
-"já foram introduzidas; pode querer ignorar este patch."
+"Sem alterações - esqueceste-te de usar 'git add'?\n"
+"Se há mais nada por preparar, provavelmente essas mesmas alterações\n"
+"já foram introduzidas; poderás querer saltar este patch."
 
-#: builtin/am.c:1943
+#: builtin/am.c:1875
 msgid ""
 "You still have unmerged paths in your index.\n"
-"Did you forget to use 'git add'?"
+"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 ""
-"Ainda há caminhos não integrados no índice.\n"
-"Esqueceu-se de usar 'git add'?"
 
-#: builtin/am.c:2051 builtin/am.c:2055 builtin/am.c:2067 builtin/reset.c:308
-#: builtin/reset.c:316
+#: 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 "Não foi possível analisar o objeto '%s'."
+msgstr "Incapaz analisar objeto '%s'."
 
-#: builtin/am.c:2103
+#: builtin/am.c:2034
 msgid "failed to clean index"
-msgstr "falha ao limpar o índice"
+msgstr ""
 
-#: builtin/am.c:2137
+#: builtin/am.c:2078
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr ""
-"Parece que a HEAD foi movida desde a última vez que o 'am' falhou.\n"
-"Não recuando a ORIG_HEAD"
+"Parece que moveste HEAD desde a última falha de 'am'.\n"
+"Recusando rebobinar até ORIG_HEAD"
 
-#: builtin/am.c:2200
+#: builtin/am.c:2185
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Valor inválido de --patch-format: %s"
 
-#: builtin/am.c:2233
+#: builtin/am.c:2227
+#, fuzzy, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Valor inválido de --patch-format: %s"
+
+#: builtin/am.c:2231
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr ""
+
+#: builtin/am.c:2262
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<opções>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2263
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<opções>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2269
 msgid "run interactively"
 msgstr "executar interativamente"
 
-#: builtin/am.c:2242
+#: builtin/am.c:2271
 msgid "historical option -- no-op"
 msgstr "opção histórica -- sem-ação"
 
-#: builtin/am.c:2244
+#: 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:2245 builtin/init-db.c:483 builtin/prune-packed.c:57
-#: builtin/repack.c:178
+#: 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"
 
-#: builtin/am.c:2247
-msgid "add a Signed-off-by line to the commit message"
+#: builtin/am.c:2276
+#, fuzzy
+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"
 
-#: builtin/am.c:2250
+#: builtin/am.c:2279
 msgid "recode into utf8 (default)"
 msgstr "recodificar em utf8 (predefinição)"
 
-#: builtin/am.c:2252
+#: builtin/am.c:2281
 msgid "pass -k flag to git-mailinfo"
 msgstr "passar a opção -k ao git-mailinfo"
 
-#: builtin/am.c:2254
+#: builtin/am.c:2283
 msgid "pass -b flag to git-mailinfo"
 msgstr "passar a opção -b ao git-mailinfo"
 
-#: builtin/am.c:2256
+#: builtin/am.c:2285
 msgid "pass -m flag to git-mailinfo"
 msgstr "passar a opção -m ao git-mailinfo"
 
-#: builtin/am.c:2258
+#: 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 flag --keep-cr para  git-mailsplit para formato mbox"
 
-#: builtin/am.c:2261
+#: 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 para  git-mailsplit independentemente de am."
+"keepcr"
 
-#: builtin/am.c:2264
+#: 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:2266 builtin/am.c:2269 builtin/am.c:2272 builtin/am.c:2275
-#: builtin/am.c:2278 builtin/am.c:2281 builtin/am.c:2284 builtin/am.c:2287
-#: builtin/am.c:2293
-msgid "pass it through git-apply"
+#: builtin/am.c:2295
+#, fuzzy
+msgid "pass it through git-mailinfo"
 msgstr "transmitir ao git-apply"
 
-#: builtin/am.c:2283 builtin/fmt-merge-msg.c:662 builtin/fmt-merge-msg.c:665
-#: builtin/grep.c:1045 builtin/merge.c:201 builtin/pull.c:135
-#: builtin/pull.c:194 builtin/repack.c:187 builtin/repack.c:191
-#: builtin/show-branch.c:637 builtin/show-ref.c:169 builtin/tag.c:398
-#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+#: 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 "passa-o pelo git-apply"
+
+#: 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: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:2289 builtin/branch.c:592 builtin/for-each-ref.c:37
-#: builtin/replace.c:442 builtin/tag.c:433 builtin/verify-tag.c:38
+#: 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:2290
+#: builtin/am.c:2322
 msgid "format the patch(es) are in"
 msgstr "formato de apresentação de patches"
 
-#: builtin/am.c:2296
+#: 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"
 
-#: builtin/am.c:2298
+#: builtin/am.c:2330
 msgid "continue applying patches after resolving a conflict"
 msgstr "continuar a aplicar os patches depois de resolver os conflitos"
 
-#: builtin/am.c:2301
+#: builtin/am.c:2333
 msgid "synonyms for --continue"
 msgstr "sinónimo de --continue"
 
-#: builtin/am.c:2304
+#: builtin/am.c:2336
 msgid "skip the current patch"
-msgstr "ignorar o patch atual"
+msgstr "ignorar remendo atual"
 
-#: builtin/am.c:2307
-msgid "restore the original branch and abort the patching operation."
+#: builtin/am.c:2339
+#, fuzzy
+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:2311
+#: builtin/am.c:2342
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr ""
+
+#: builtin/am.c:2346
+#, fuzzy
+msgid "show the patch being applied"
+msgstr "mostrar linhas sendo submetidas"
+
+#: builtin/am.c:2351
 msgid "lie about committer date"
 msgstr "mentir sobre a data de commit"
 
-#: builtin/am.c:2313
+#: 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:2315 builtin/commit.c:1600 builtin/merge.c:232
-#: builtin/pull.c:165 builtin/revert.c:111 builtin/tag.c:413
+#: 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:2316
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
 msgstr "assinar os commits com GPG"
 
-#: builtin/am.c:2319
+#: builtin/am.c:2359
 msgid "(internal use for git-rebase)"
 msgstr "(uso interno de git-rebase)"
 
-#: builtin/am.c:2334
+#: 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:2341
+#: builtin/am.c:2384
 msgid "failed to read the index"
-msgstr "falha ao ler o índice"
+msgstr "falhou ler cenário"
 
-#: builtin/am.c:2356
+#: 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:2380
+#: builtin/am.c:2423
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5108,9 +10930,13 @@ msgstr ""
 "Diretório abandonado %s encontrado.\n"
 "Use \"git am --abort\" para o remover."
 
-#: builtin/am.c:2386
+#: 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:2439
+msgid "interactive mode requires patches on the command line"
+msgstr ""
 
 #: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
@@ -5119,358 +10945,744 @@ msgstr "git apply [<opções>] [<patch>...]"
 #: 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:58
-msgid "git archive: expected ACK/NAK, got EOF"
+#: 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"
 
-#: builtin/archive.c:61
+#: builtin/archive.c:64
 #, c-format
 msgid "git archive: NACK %s"
 msgstr "git archive: NACK %s"
 
-#: builtin/archive.c:63
-#, c-format
-msgid "remote error: %s"
-msgstr "erro remoto: %s"
-
-#: builtin/archive.c:64
+#: builtin/archive.c:65
 msgid "git archive: protocol error"
 msgstr "git archive: erro de protocolo"
 
-#: builtin/archive.c:68
+#: builtin/archive.c:69
 msgid "git archive: expected a flush"
 msgstr "git archive: esvaziamento de cache (flush) esperado"
 
-#: builtin/bisect--helper.c:7
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
+#: builtin/bisect--helper.c: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>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:25
+#, fuzzy
+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>...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+msgstr ""
+
+#: builtin/bisect--helper.c:29
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr ""
+
+#: 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
+#, fuzzy, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "incapaz abrir ficheiro '%s' em modo '%s'"
+
+#: builtin/bisect--helper.c:114
+#, fuzzy, c-format
+msgid "could not write to file '%s'"
+msgstr "incapaz escrever para ficheiro '%s'"
+
+#: builtin/bisect--helper.c:155
+#, fuzzy, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' é um termo inválido."
 
-#: builtin/bisect--helper.c:17
-msgid "perform 'git bisect next'"
-msgstr "executar 'git bisect next'"
+#: builtin/bisect--helper.c:159
+#, fuzzy, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "incapaz usar comando embutido '%s' como um termo"
 
-#: builtin/bisect--helper.c:19
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "atualizar BISECT_HEAD em vez de extrair o commit atual"
+#: builtin/bisect--helper.c:169
+#, fuzzy, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "incapaz alterar o significado do termo '%s'"
 
-#: builtin/blame.c:33
+#: builtin/bisect--helper.c:179
+msgid "please use two different terms"
+msgstr "por favor, usa dois termos diferentes"
+
+#: builtin/bisect--helper.c:195
+#, fuzzy, c-format
+msgid "We are not bisecting.\n"
+msgstr "Estamos bissetando nada.\n"
+
+#: builtin/bisect--helper.c:203
+#, fuzzy, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' é um commit inválido"
+
+#: builtin/bisect--helper.c:212
+#, fuzzy, 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:256
+#, fuzzy, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Argumento de bisect_write incorreto: $state"
+
+#: builtin/bisect--helper.c:261
+#, fuzzy, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "incapaz obter oid da rev '%s'"
+
+#: builtin/bisect--helper.c:273
+#, fuzzy, c-format
+msgid "couldn't open the file '%s'"
+msgstr "incapaz abrir o ficheiro '%s'"
+
+#: builtin/bisect--helper.c:299
+#, fuzzy, 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."
+
+#: builtin/bisect--helper.c:326
+#, fuzzy, 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.)"
+
+#: builtin/bisect--helper.c:330
+#, fuzzy, 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.)"
+
+#: builtin/bisect--helper.c:350
+#, fuzzy, c-format
+msgid "bisecting only with a %s commit"
+msgstr "Aviso: a bissetar só com um commit $TERM_BAD."
+
+#. 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:358
+msgid "Are you sure [Y/n]? "
+msgstr "Tem a certeza [Y/n]? "
+
+#: builtin/bisect--helper.c:419
+msgid "no terms defined"
+msgstr "termo nenhum definido"
+
+#: 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:432
+#, fuzzy, 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."
+
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+#, fuzzy
+msgid "revision walk setup failed\n"
+msgstr "falha ao configurar percurso de revisões\n"
+
+#: builtin/bisect--helper.c:521
+#, fuzzy, c-format
+msgid "could not open '%s' for appending"
+msgstr "incapaz abrir '%s' para acrescentar"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+#, fuzzy
+msgid "'' is not a valid term"
+msgstr "'' é um termo inválido"
+
+#: builtin/bisect--helper.c:663
+#, fuzzy, c-format
+msgid "unrecognized option: '%s'"
+msgstr "opção desconhecida: '%s'"
+
+#: builtin/bisect--helper.c:667
+#, fuzzy, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' parece ser uma revisão inválida"
+
+#: builtin/bisect--helper.c:698
+#, fuzzy
+msgid "bad HEAD - I need a HEAD"
+msgstr "HEAD incorreta - é necessário uma HEAD"
+
+#: builtin/bisect--helper.c:713
+#, fuzzy, 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>'."
+
+#: builtin/bisect--helper.c:734
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "incapaz bissetar numa árvore \"cg-seek'ada\""
+
+#: builtin/bisect--helper.c:737
+#, fuzzy
+msgid "bad HEAD - strange symbolic ref"
+msgstr "HEAD incorreta - referência simbólica desconhecida"
+
+#: builtin/bisect--helper.c:757
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:815
+#, fuzzy
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Deve começar por executar \"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: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]? "
+
+#: builtin/bisect--helper.c:844
+#, fuzzy
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Invoque 'bisect_state' com pelo menos um argumento."
+
+#: builtin/bisect--helper.c:857
+#, fuzzy, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect $TERM_BAD' só leva um argumento."
+
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, fuzzy, c-format
+msgid "Bad rev input: %s"
+msgstr "Revisão incorreta na entrada: $arg"
+
+#: builtin/bisect--helper.c:889
+#, fuzzy, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Revisão incorreta na entrada: $arg"
+
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr "Estamos bissetando nada."
+
+#: builtin/bisect--helper.c:971
+#, fuzzy, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "?? de que é que estás a falar?"
+
+#: builtin/bisect--helper.c:983
+#, fuzzy, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "incapaz ler $file para reproduzir"
+
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:1058
+msgid "check whether bad or good terms exist"
+msgstr ""
+
+#: builtin/bisect--helper.c:1060
+#, fuzzy
+msgid "print out the bisect terms"
+msgstr "imprimir termos de bifurcação"
+
+#: builtin/bisect--helper.c:1062
+msgid "start the bisect session"
+msgstr ""
+
+#: builtin/bisect--helper.c:1064
+#, fuzzy
+msgid "find the next bisection commit"
+msgstr "encontra próximo commit de bisecção"
+
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr ""
+
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr ""
+
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
+msgstr ""
+
+#: builtin/bisect--helper.c:1072
+#, fuzzy
+msgid "skip some commits for checkout"
+msgstr "'%s' tem commit checked out nenhum"
+
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr ""
+
+#: builtin/bisect--helper.c:1089
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr ""
+
+#: builtin/bisect--helper.c:1094
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:1100
+#, fuzzy
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr ":strip= requer um inteiro positivo como argumento"
+
+#: builtin/bisect--helper.c:1109
+#, fuzzy
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next requer 0 argumentos"
+
+#: builtin/bisect--helper.c:1120
+#, fuzzy
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-next requer 0 argumentos"
+
+#: builtin/bisect--helper.c:1125
+#, fuzzy
+msgid "no logfile given"
+msgstr "Nenhum ficheiro de log fornecido"
+
+#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<opções>] [<rev-opções>] [<rev>] [--] <ficheiro>"
 
-#: builtin/blame.c:38
+#: 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)"
 
-#: builtin/blame.c:1777
-msgid "Blaming lines"
-msgstr "Linhas de culpa"
+#: builtin/blame.c:410
+#, fuzzy, c-format
+msgid "expecting a color: %s"
+msgstr "a redirecionar para %s "
+
+#: builtin/blame.c:417
+msgid "must end with a color"
+msgstr ""
+
+#: builtin/blame.c:728
+#, fuzzy, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "ignorar cor inválida '%.*s' em log.graphColors"
+
+#: builtin/blame.c:746
+msgid "invalid value for blame.coloring"
+msgstr ""
 
-#: builtin/blame.c:2573
-msgid "Show blame entries as we find them, incrementally"
+#: builtin/blame.c:845
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr ""
+
+#: builtin/blame.c:867
+#, fuzzy
+msgid "show blame entries as we find them, incrementally"
 msgstr ""
 "Mostrar entradas de culpa à medida que forem encontradas, incrementalmente"
 
-#: builtin/blame.c:2574
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: builtin/blame.c:868
+#, fuzzy
+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:2575
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "Não tratar os commits raiz como limites (Predefinição: desativado)"
+#: builtin/blame.c:869
+#, fuzzy
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "Tratar commits raiz como limite nenhum (Predefinição: desativado)"
 
-#: builtin/blame.c:2576
-msgid "Show work cost statistics"
+#: builtin/blame.c:870
+#, fuzzy
+msgid "show work cost statistics"
 msgstr "Mostrar estatísticas de custo de atividade"
 
-#: builtin/blame.c:2577
-msgid "Force progress reporting"
-msgstr "Forçar informação de progresso"
+#: 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:2578
-msgid "Show output score for blame entries"
+#: builtin/blame.c:872
+#, fuzzy
+msgid "show output score for blame entries"
 msgstr "Mostrar a pontuação das entradas de culpa"
 
-#: builtin/blame.c:2579
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+#, fuzzy
+msgid "show original filename (Default: auto)"
 msgstr "Mostrar o nome do ficheiro original (Predefinição: auto)"
 
-#: builtin/blame.c:2580
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+#, fuzzy
+msgid "show original linenumber (Default: off)"
 msgstr "Mostrar números de linha originais (Predefinição: desativado)"
 
-#: builtin/blame.c:2581
-msgid "Show in a format designed for machine consumption"
+#: builtin/blame.c:875
+#, fuzzy
+msgid "show in a format designed for machine consumption"
 msgstr "Mostrar em formato próprio para ser consumo por uma máquina"
 
-#: builtin/blame.c:2582
-msgid "Show porcelain format with per-line commit information"
+#: builtin/blame.c:876
+#, fuzzy
+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:2583
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/blame.c:877
+#, fuzzy
+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:2584
-msgid "Show raw timestamp (Default: off)"
+#: builtin/blame.c:878
+#, fuzzy
+msgid "show raw timestamp (Default: off)"
 msgstr "Mostrar carimbo de data/hora em bruto (Predefinição: desativado)"
 
-#: builtin/blame.c:2585
-msgid "Show long commit SHA1 (Default: off)"
+#: builtin/blame.c:879
+#, fuzzy
+msgid "show long commit SHA1 (Default: off)"
 msgstr "Mostrar SHA1 longo de commit (Predefinição: desativado)"
 
-#: builtin/blame.c:2586
-msgid "Suppress author name and timestamp (Default: off)"
+#: builtin/blame.c:880
+#, fuzzy
+msgid "suppress author name and timestamp (Default: off)"
 msgstr ""
 "Suprimir nome de autor e carimbo de data/hora (Predefinição: desativado)"
 
-#: builtin/blame.c:2587
-msgid "Show author email instead of name (Default: off)"
+#: builtin/blame.c:881
+#, fuzzy
+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:2588
-msgid "Ignore whitespace differences"
+#: builtin/blame.c:882
+#, fuzzy
+msgid "ignore whitespace differences"
 msgstr "Ignorar as diferenças de espaço em branco"
 
-#: builtin/blame.c:2595
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Usar um heurística experimental para melhorar diffs"
+#: builtin/blame.c:883 builtin/log.c:1823
+#, fuzzy
+msgid "rev"
+msgstr "reverter"
+
+#: builtin/blame.c:883
+#, fuzzy
+msgid "ignore <rev> when blaming"
+msgstr "ignorar o índice ao verificar"
 
-#: builtin/blame.c:2597
-msgid "Spend extra cycles to find better match"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr ""
+
+#: builtin/blame.c:885
+msgid "color redundant metadata from previous line differently"
+msgstr ""
+
+#: builtin/blame.c:886
+msgid "color lines by age"
+msgstr ""
+
+#: builtin/blame.c:887
+#, fuzzy
+msgid "spend extra cycles to find better match"
 msgstr "Despender ciclos extra para encontrar uma melhor correspondência"
 
-#: builtin/blame.c:2598
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/blame.c:888
+#, fuzzy
+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:2599
-msgid "Use <file>'s contents as the final image"
+#: builtin/blame.c:889
+#, fuzzy
+msgid "use <file>'s contents as the final image"
 msgstr "Usar o conteúdo do <ficheiro> como imagem final"
 
-#: builtin/blame.c:2600 builtin/blame.c:2601
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "pontuação"
 
-#: builtin/blame.c:2600
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+#, fuzzy
+msgid "find line copies within and across files"
 msgstr "Localizar linhas copiadas dentro e entre ficheiros"
 
-#: builtin/blame.c:2601
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+#, fuzzy
+msgid "find line movements within and across files"
 msgstr "Localizar linhas movidas dentro e entre ficheiros"
 
-#: builtin/blame.c:2602
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+#, fuzzy
+msgid "range"
+msgstr "intervalo"
 
-#: builtin/blame.c:2602
-msgid "Process only line range n,m, counting from 1"
+#: builtin/blame.c:893
+#, 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:2649
+#: 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"
+"estás proibido de usar --progress com --incremental ou formatos porcelain"
 
-#. TRANSLATORS: This string is used to tell us the maximum
-#. display width for a relative timestamp in "git blame"
-#. output.  For C locale, "4 years, 11 months ago", which
-#. takes 22 places, is the longest among various forms of
-#. relative timestamps, but your language may need more or
-#. fewer display columns.
-#: builtin/blame.c:2697
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr "há 4 anos e 11 meses atrás"
 
-#: builtin/blame.c:2777
-msgid "--contents and --reverse do not blend well."
-msgstr "--contents e --reverse não se misturam bem."
-
-#: builtin/blame.c:2797
-msgid "cannot use --contents with final commit object name"
-msgstr "não é possível usar --contents com nome de objeto commit final"
-
-#: builtin/blame.c:2802
-msgid "--reverse and --first-parent together require specified latest commit"
-msgstr ""
-"--reverse e --first-parent juntos requer que se especifique o último commit"
-
-#: builtin/blame.c:2829
-msgid ""
-"--reverse --first-parent together require range along first-parent chain"
-msgstr ""
-"--reverse --first-parent juntos requer intervalo ao longo do primeiro-pai"
-
-#: builtin/blame.c:2840
-#, c-format
-msgid "no such path %s in %s"
-msgstr "o caminho %s não existe em %s"
-
-#: builtin/blame.c:2851
-#, c-format
-msgid "cannot read blob %s for path %s"
-msgstr "não é possível ler o blob %s do caminho %s"
-
-#: builtin/blame.c:2870
+#: 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/branch.c:26
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+#: 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]"
 
-#: builtin/branch.c:27
+#: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
 msgstr "git branch [<opções>] [-l] [-f] <nome-ramo> [<ponto-de-partida>]"
 
-#: builtin/branch.c:28
+#: builtin/branch.c:31
 msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
 msgstr "git branch [<opções>] [-r] (-d | -D) <nome-do-ramo>..."
 
-#: builtin/branch.c:29
+#: 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:30
+#: 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>"
+
+#: builtin/branch.c:34
 msgid "git branch [<options>] [-r | -a] [--points-at]"
 msgstr "git branch [<opções>] [-r | -a] [--points-at]"
 
-#: builtin/branch.c:31
+#: builtin/branch.c:35
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<opções>] [-r | -a] [--format]"
 
-#: builtin/branch.c:144
+#: builtin/branch.c:154
 #, c-format
 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:148
+#: builtin/branch.c:158
 #, c-format
 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:162
+#: builtin/branch.c:172
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
-msgstr "Não foi possível pesquisar pelo objeto commit de '%s'"
+msgstr "Incapaz pesquisar objeto commit para '%s'"
 
-#: builtin/branch.c:166
+#: builtin/branch.c:176
 #, 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 ""
-"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:179
+#: builtin/branch.c:189
 msgid "Update of config-file failed"
 msgstr "Falha ao atualizar o ficheiro de configuração"
 
-#: builtin/branch.c:210
+#: 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:216
+#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
-msgstr "Não foi possível pesquisar pelo objeto commit de HEAD"
+msgstr "Incapaz de pesquisar objeto commit para HEAD"
 
-#: builtin/branch.c:230
+#: builtin/branch.c:244
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
-msgstr "Não é possível eliminar o ramo '%s' extraído em '%s'"
+msgstr "Impossível apagar ramo '%s' checked out em '%s'"
 
-#: builtin/branch.c:245
+#: 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:246
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
-msgstr "ramo '%s' não encontrado."
-
-#: builtin/branch.c:261
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Erro a eliminar o ramo de monitorização remoto '%s'"
-
-#: builtin/branch.c:262
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Erro a eliminar ramo '%s'"
+msgstr "ramo '%s' por encontrar."
 
-#: builtin/branch.c:269
+#: 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:270
+#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Ramo %s eliminado (era %s).\n"
 
-#: builtin/branch.c:441
+#: builtin/branch.c:440 builtin/tag.c:63
+#, fuzzy
+msgid "unable to parse format string"
+msgstr "incapaz processar o formato string"
+
+#: builtin/branch.c:471
+#, fuzzy
+msgid "could not resolve HEAD"
+msgstr "incapaz resolver HEAD"
+
+#: builtin/branch.c:477
+#, fuzzy, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) aponta para fora de refs/heads/"
+
+#: 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:445
+#: builtin/branch.c:496
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "O ramo %s está a ser bissetado em %s"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:513
+#, fuzzy
+msgid "cannot copy the current branch while not on any."
+msgstr "apenas podes copiar o ramo corrente enquanto estás num."
+
+#: 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:470
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Nome de ramo inválido: '%s'"
 
-#: builtin/branch.c:487
+#: builtin/branch.c:555
 msgid "Branch rename failed"
 msgstr "Falha ao mudar o nome do ramo"
 
-#: builtin/branch.c:490
+#: builtin/branch.c:557
+#, fuzzy
+msgid "Branch copy failed"
+msgstr "Falha ao mudar o nome do ramo"
+
+#: builtin/branch.c:561
+#, fuzzy, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "O ramo incorretamente denominado '%s' mudou de nome"
+
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "O ramo incorretamente denominado '%s' mudou de nome"
 
-#: builtin/branch.c:493
+#: 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:502
+#: 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:518
+#: builtin/branch.c:581
+#, fuzzy
+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:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -5481,251 +11693,386 @@ msgstr ""
 "  %s\n"
 "Linha começadas com '%c' serão ignoradas.\n"
 
-#: builtin/branch.c:551
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr "Opções genéricas"
 
-#: builtin/branch.c:553
+#: 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:554
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr "suprimir mensagens informativas"
 
-#: builtin/branch.c:555
+#: builtin/branch.c:635
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "configurar modo de seguimento (consulte git-pull(1))"
 
-#: builtin/branch.c:557
-msgid "change upstream info"
-msgstr "alterar a informação do ramo a montante"
+#: builtin/branch.c:637
+#, fuzzy
+msgid "do not use"
+msgstr "esquema a usar"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr "a montante"
 
-#: builtin/branch.c:559
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr "alterar a informação do ramo a montante"
 
-#: builtin/branch.c:560
-msgid "Unset the upstream info"
+#: builtin/branch.c:640
+#, fuzzy
+msgid "unset the upstream info"
 msgstr "Remover a informação do ramo a montante"
 
-#: builtin/branch.c:561
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr "usar saída colorida"
 
-#: builtin/branch.c:562
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
 msgstr "atuar sobre ramos de monitorização remotos"
 
-#: builtin/branch.c:564 builtin/branch.c:566
+#: builtin/branch.c:644 builtin/branch.c:646
 msgid "print only branches that contain the commit"
 msgstr "imprimir apenas ramos que contenham o commit"
 
-#: builtin/branch.c:565 builtin/branch.c:567
+#: 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:570
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
 msgstr "Ações específicas do git-branch:"
 
-#: builtin/branch.c:571
+#: 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:573
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr "eliminar um ramo totalmente integrado"
 
-#: builtin/branch.c:574
+#: 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:575
+#: 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"
 
-#: builtin/branch.c:576
+#: 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"
 
-#: builtin/branch.c:577
+#: builtin/branch.c:657
+#, fuzzy
+msgid "copy a branch and its reflog"
+msgstr "mover ou mudar o nome de um ramo e o seu reflog"
+
+#: builtin/branch.c:658
+#, fuzzy
+msgid "copy a branch, even if target exists"
+msgstr "mover ou mudar o nome de um ramo, mesmo que o destino já exista"
+
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr "listar os nomes dos ramos"
 
-#: builtin/branch.c:578
+#: builtin/branch.c:660
+#, fuzzy
+msgid "show current branch name"
+msgstr "Nenhum ramo atual."
+
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr "criar reflog do ramo"
 
-#: builtin/branch.c:580
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr "editar a descrição do ramo"
 
-#: builtin/branch.c:581
+#: 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:582
+#: builtin/branch.c:665
 msgid "print only branches that are merged"
 msgstr "imprimir apenas os ramos que foram integrados"
 
-#: builtin/branch.c:583
+#: 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:584
+#: builtin/branch.c:667
 msgid "list branches in columns"
 msgstr "listar os ramos em colunas"
 
-#: builtin/branch.c:585 builtin/for-each-ref.c:38 builtin/tag.c:426
-msgid "key"
-msgstr "chave"
-
-#: builtin/branch.c:586 builtin/for-each-ref.c:39 builtin/tag.c:427
-msgid "field name to sort on"
-msgstr "nome do campo pelo qual ordernar"
-
-#: builtin/branch.c:588 builtin/for-each-ref.c:41 builtin/notes.c:404
-#: builtin/notes.c:407 builtin/notes.c:567 builtin/notes.c:570
-#: builtin/tag.c:429
+#: 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
 msgid "object"
 msgstr "objeto"
 
-#: builtin/branch.c:589
+#: builtin/branch.c:670
 msgid "print only branches of the object"
 msgstr "imprimir apenas os ramos do objeto"
 
-#: builtin/branch.c:591 builtin/for-each-ref.c:47 builtin/tag.c:434
+#: 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:592 builtin/for-each-ref.c:37 builtin/tag.c:433
+#: 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:611
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Falha ao resolver HEAD numa referência válida."
-
-#: builtin/branch.c:615 builtin/clone.c:724
+#: 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:638
+#: builtin/branch.c:719
 msgid "--column and --verbose are incompatible"
 msgstr "--column e --verbose são incompatíveis"
 
-#: builtin/branch.c:649 builtin/branch.c:701
+#: 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:677
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
-msgstr "Não é possível atribuir descrição a HEAD destacada"
+msgstr "Impossível dar descrição a HEAD solta"
 
-#: builtin/branch.c:682
+#: 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:689
+#: 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:692
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
-msgstr "Não há nenhum ramo denominado '%s'."
+msgstr "Ramo nenhum denominado '%s'."
+
+#: builtin/branch.c:796
+#, fuzzy
+msgid "too many branches for a copy operation"
+msgstr "demasiados ramos para uma operação de mudança de nome"
 
-#: builtin/branch.c:707
-msgid "too many branches for a rename operation"
+#: builtin/branch.c:805
+#, fuzzy
+msgid "too many arguments for a rename operation"
 msgstr "demasiados ramos para uma operação de mudança de nome"
 
-#: builtin/branch.c:712
-msgid "too many branches to set new upstream"
+#: builtin/branch.c:810
+#, fuzzy
+msgid "too many arguments to set new upstream"
 msgstr "demasiados ramos para definir novo ramo a montante"
 
-#: builtin/branch.c:716
+#: 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:719 builtin/branch.c:741 builtin/branch.c:762
+#: 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:723
+#: 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:735
-msgid "too many branches to unset upstream"
+#: builtin/branch.c:834
+#, fuzzy
+msgid "too many arguments to unset upstream"
 msgstr "demasiados ramos para remover a definição de ramo a montante"
 
-#: builtin/branch.c:739
+#: 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:745
+#: 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:759
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "não faz sentido criar 'HEAD' manualmente"
-
-#: builtin/branch.c:765
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+#: builtin/branch.c:854
+#, fuzzy
+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 ""
-"as opções -a e -r de 'git branch' não fazem sentido com um nome de ramo"
+"As opções -a, e -r, em 'git branch' levam nome de branch nenhum.\n"
+"Quiseste utilizar: -a|-r --list <pattern>? "
 
-#: builtin/branch.c:768
-#, c-format
+#: builtin/branch.c:858
+#, fuzzy
 msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
 msgstr ""
-"A opção --set-upstream é obsoleta e será removida. Considere o uso de --"
-"track ou --set-upstream-to\n"
+"A opção --set-upstream está obsoleta. Por favor, usa '--track' ou '--set-"
+"upstream-to' invés."
+
+#: builtin/bugreport.c:15
+#, fuzzy
+msgid "git version:\n"
+msgstr "versão git:\n"
 
-#: builtin/branch.c:785
+#: builtin/bugreport.c:21
 #, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr ""
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr ""
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr ""
+
+#: builtin/bugreport.c:80
+msgid "not run from a git repository - no hooks to show\n"
+msgstr ""
+
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr ""
+
+#: builtin/bugreport.c:97
 msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\n"
 "\n"
-"If you wanted to make '%s' track '%s', do this:\n"
+"What did you do before the bug happened? (Steps to reproduce your issue)\n"
 "\n"
-msgstr ""
+"What did you expect to happen? (Expected behavior)\n"
+"\n"
+"What happened instead? (Actual behavior)\n"
 "\n"
-"Se quer que '%s' siga '%s', faça:\n"
+"What's different between what you expected and what actually happened?\n"
 "\n"
+"Anything else you want to add:\n"
+"\n"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+
+#: builtin/bugreport.c:136
+msgid "specify a destination for the bugreport file"
+msgstr ""
+
+#: builtin/bugreport.c:138
+msgid "specify a strftime format suffix for the filename"
+msgstr ""
+
+#: builtin/bugreport.c:160
+#, fuzzy, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "incapaz criar pastas superiores para '%s'"
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr ""
+
+#: builtin/bugreport.c:170
+#, fuzzy
+msgid "Enabled Hooks"
+msgstr "Hooks Ativados"
+
+#: builtin/bugreport.c:177
+#, fuzzy, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr "incapaz criar novo ficheiro em '%s'"
+
+#: builtin/bugreport.c:180
+#, fuzzy, c-format
+msgid "unable to write to %s"
+msgstr "incapaz escrever para %s"
 
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:190
 #, c-format
-msgid "%s is okay\n"
-msgstr "%s está correto\n"
+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>"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:16 builtin/bundle.c:28
+#, fuzzy
+msgid "git bundle verify [<options>] <file>"
+msgstr "git rm [<opções>] [--] <ficheiro>..."
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr "mostrar medidor de progresso nenhum"
+
+#: 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:3911
+msgid "show progress meter during object writing phase"
+msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
+
+#: 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"
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr ""
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr "É necessário um repositório para criar um bundle."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:109
+#, fuzzy
+msgid "do not show bundle details"
+msgstr "mostrar nenhuns detalhes de conjunto"
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s está ok\n"
+
+#: builtin/bundle.c:179
 msgid "Need a repository to unbundle."
 msgstr "É preciso um repositório para desempacotar."
 
-#: builtin/cat-file.c:513
+#: 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:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Subcomando desconhecido: %s"
+
+#: 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>"
@@ -5733,314 +12080,383 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <tipo> | --textconv | --filters) [--path=<caminho>] <objeto>"
 
-#: builtin/cat-file.c:514
+#: builtin/cat-file.c:597
+#, fuzzy
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
 msgstr ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:551
+#: builtin/cat-file.c:618
+#, fuzzy
+msgid "only one batch option may be specified"
+msgstr "Nenhum nome de ramo especificado"
+
+#: 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:552
+#: builtin/cat-file.c:637
 msgid "show object type"
 msgstr "mostrar tipo do objeto"
 
-#: builtin/cat-file.c:553
+#: builtin/cat-file.c:638
 msgid "show object size"
 msgstr "mostrar tamanho do objeto"
 
-#: builtin/cat-file.c:555
+#: 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:556
+#: 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:558
+#: 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:560
+#: 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:561 git-submodule.sh:943
+#: builtin/cat-file.c:646
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:562
+#: 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:564
+#: 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:565
+#: builtin/cat-file.c:650
 msgid "buffer --batch output"
 msgstr "carregar a saída de --batch"
 
-#: builtin/cat-file.c:567
+#: 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:570
+#: 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:573
+#: 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)"
 
-#: builtin/cat-file.c:575
+#: 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/check-attr.c:11
+#: builtin/cat-file.c:664
+msgid "do not order --batch-all-objects output"
+msgstr ""
+
+#: builtin/check-attr.c:13
 msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
 msgstr "git check-attr [-a | --all | <atributo>...] [--] <caminho>..."
 
-#: builtin/check-attr.c:12
+#: builtin/check-attr.c:14
 msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
 msgstr "git check-attr --stdin [-z] [-a | --all | <atributo>...]"
 
-#: builtin/check-attr.c:19
+#: builtin/check-attr.c:21
 msgid "report all attributes set on file"
 msgstr "apresentar todos os atributos definidos no ficheiro"
 
-#: builtin/check-attr.c:20
+#: builtin/check-attr.c:22
 msgid "use .gitattributes only from the index"
-msgstr "usar .gitattributes apenas a partir do índice"
+msgstr "usar .gitattributes apenas a partir de cenário"
 
-#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:98
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
 msgid "read file names from stdin"
 msgstr "ler os nomes dos ficheiros da entrada padrão"
 
-#: builtin/check-attr.c:23 builtin/check-ignore.c:24
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
 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:18 builtin/checkout.c:1158 builtin/gc.c:352
+#: 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"
 
-#: builtin/check-ignore.c:26
+#: builtin/check-ignore.c:29
 msgid "show non-matching input paths"
 msgstr "mostrar caminhos de entrada sem correspondência"
 
-#: builtin/check-ignore.c:28
+#: builtin/check-ignore.c:31
 msgid "ignore index when checking"
 msgstr "ignorar o índice ao verificar"
 
-#: builtin/check-ignore.c:154
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
-msgstr "não é possível especificar caminhos com --stdin"
+msgstr "incapaz especificar pathnames com --stdin"
 
-#: builtin/check-ignore.c:157
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z só faz sentido com --stdin"
 
-#: builtin/check-ignore.c:159
+#: builtin/check-ignore.c:170
 msgid "no path specified"
-msgstr "nenhum caminho especificado"
+msgstr "path nenhum especificado"
 
-#: builtin/check-ignore.c:163
+#: 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:165
+#: 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:168
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching só é válido com --verbose"
 
-#: builtin/check-mailmap.c:8
+#: builtin/check-mailmap.c:9
 msgid "git check-mailmap [<options>] <contact>..."
 msgstr "git check-mailmap [<opções>] <contacto>..."
 
-#: builtin/check-mailmap.c:13
+#: builtin/check-mailmap.c:14
 msgid "also read contacts from stdin"
 msgstr "também ler contactos da entrada padrão"
 
-#: builtin/check-mailmap.c:24
+#: 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:47
+#: builtin/check-mailmap.c:48
 msgid "no contacts specified"
-msgstr "nenhum contacto especificado"
+msgstr "contato nenhum especificado"
+
+#: builtin/checkout--worker.c:110
+#, fuzzy
+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 "cadeia"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "preceder <cadeia> ao criar ficheiros"
 
-#: builtin/checkout-index.c:127
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<opções>] [--] [<ficheiro>...]"
 
-#: builtin/checkout-index.c:144
+#: 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:160
+#: 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:161
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "forçar substituição dos ficheiros existentes"
 
-#: builtin/checkout-index.c:163
+#: 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:165
+#: 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:167
+#: 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:171
+#: 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:173
+#: 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:174 builtin/column.c:30
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:472
-msgid "string"
-msgstr "cadeia"
-
-#: builtin/checkout-index.c:175
-msgid "when creating files, prepend <string>"
-msgstr "preceder <cadeia> ao criar ficheiros"
-
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "copiar os ficheiros do estágio indicado"
 
-#: builtin/checkout.c:27
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<opções>] <ramo>"
 
-#: builtin/checkout.c:28
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<opções>] [<ramo>] -- <ficheiro>..."
 
-#: builtin/checkout.c:153 builtin/checkout.c:186
+#: builtin/checkout.c:39
+#, fuzzy
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<opções>] [<ramo>]"
+
+#: builtin/checkout.c:44
+#, fuzzy
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<opções>] [--source=<ramo>] <ficheiro>..."
+
+#: 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:155 builtin/checkout.c:188
+#: 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:171
+#: 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:215
+#: 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:232
+#: 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:249
+#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
-msgstr "Não é possível adicionar os resultados da integração de '%s'"
+msgstr "Impossível adicionar o resultado da junção para '%s'"
 
-#: builtin/checkout.c:269 builtin/checkout.c:272 builtin/checkout.c:275
-#: builtin/checkout.c:278
+#: builtin/checkout.c:411
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:416
+#, fuzzy, 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"
+
+#: builtin/checkout.c:423
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] ""
+msgstr[1] ""
+
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
 #, 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:281 builtin/checkout.c:284
+#: 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:287
+#: 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:470
+#, c-format
+msgid "neither '%s' or '%s' is specified"
 msgstr ""
-"Não é possível atualizar os caminhos e mudar para o ramo '%s' ao mesmo tempo."
 
-#: builtin/checkout.c:358 builtin/checkout.c:365
+#: builtin/checkout.c:474
+#, fuzzy, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s' tem de ser usado quando '%s' está por ser especificado"
+
+#: builtin/checkout.c:479 builtin/checkout.c:484
+#, fuzzy, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' ou '%s'  impossível ser usado com %s"
+
+#: 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:513
+#: builtin/checkout.c:734
 msgid "you need to resolve your current index first"
 msgstr "primeiro deve resolver o índice atual"
 
-#: builtin/checkout.c:644
+#: builtin/checkout.c:788
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+
+#: builtin/checkout.c:881
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
-msgstr "Não é possível efetuar reflog de '%s': %s\n"
+msgstr "Incapaz fazer reflog para '%s': %s\n"
 
-#: builtin/checkout.c:685
+#: builtin/checkout.c:923
 msgid "HEAD is now at"
 msgstr "HEAD está agora em"
 
-#: builtin/checkout.c:689 builtin/clone.c:678
+#: 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:693
+#: builtin/checkout.c:931
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Repor ramo '%s'\n"
 
-#: builtin/checkout.c:696
+#: builtin/checkout.c:934
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Já em '%s'\n"
 
-#: builtin/checkout.c:700
+#: 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:702 builtin/checkout.c:1090
+#: 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:704
+#: builtin/checkout.c:942
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Mudou para o ramo '%s'\n"
 
-#: builtin/checkout.c:755
+#: builtin/checkout.c:993
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... e mais %d.\n"
 
-#: builtin/checkout.c:761
+#: builtin/checkout.c:999
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6053,15 +12469,17 @@ msgid_plural ""
 "\n"
 "%s\n"
 msgstr[0] ""
-"Aviso: deixa %d commit para trás, não ligado a nenhum ramo:\n"
+"Aviso: estás deixando %d commit para trás, desconetado a qualquer dos teus "
+"ramos:\n"
 "\n"
 "%s\n"
 msgstr[1] ""
-"Aviso: deixa %d commits para trás, não ligados a nenhum ramo:\n"
+"Aviso: estás deixando %d commits para trás, desconetado a qualquer dos teus "
+"ramos:\n"
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:780
+#: 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"
@@ -6088,166 +12506,245 @@ msgstr[1] ""
 " git branch <nome-do-novo-ramo> %s\n"
 "\n"
 
-#: builtin/checkout.c:816
+#: builtin/checkout.c:1053
 msgid "internal error in revision walk"
 msgstr "erro interno durante o curso de revisões"
 
-#: builtin/checkout.c:820
+#: builtin/checkout.c:1057
 msgid "Previous HEAD position was"
 msgstr "A posição anterior de HEAD era"
 
-#: builtin/checkout.c:847 builtin/checkout.c:1085
+#: 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:991
+#: 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: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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+
+#: builtin/checkout.c:1196
+#, fuzzy, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "atuar sobre ramos de monitorização remotos"
+
+#: builtin/checkout.c:1262
+#, fuzzy
+msgid "only one reference expected"
+msgstr "esperava-se apenas uma referência, %d fornecidas."
+
+#: builtin/checkout.c:1279
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "esperava-se apenas uma referência, %d fornecidas."
 
-#: builtin/checkout.c:1031 builtin/worktree.c:214
+#: 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:1060
+#: 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:1385
+#, fuzzy, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "esperado um ramo, recebi tag '%s'"
+
+#: builtin/checkout.c:1387
+#, fuzzy, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "Ramo %s configurado para seguir o ramo remoto %s de %s."
+
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#, fuzzy, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "O ramo %s está a ser bissetado em %s"
+
+#: builtin/checkout.c:1391
+#, fuzzy, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "é suposto um branch, recebi um commit '%s'"
+
+#: builtin/checkout.c:1407
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: 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:1415
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: 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:1099
+#: builtin/checkout.c:1423
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1427
+#, fuzzy
+msgid "you are switching branch while bisecting"
+msgstr "Está a bissetar neste momento."
+
+#: 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:1102 builtin/checkout.c:1106
+#: 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:1110 builtin/checkout.c:1113 builtin/checkout.c:1118
-#: builtin/checkout.c:1121
+#: 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:1462
+#, fuzzy, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' incapaz receber <start-point>"
 
-#: builtin/checkout.c:1126
+#: builtin/checkout.c:1470
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "Não é possível mudar de ramo para '%s', visto que não é um commit"
+msgstr "Incapaz mudar ramo para '%s', pois está fora de ser um commit"
 
-#: builtin/checkout.c:1159 builtin/checkout.c:1161 builtin/clone.c:111
-#: builtin/remote.c:165 builtin/remote.c:167 builtin/worktree.c:325
-#: builtin/worktree.c:327
-msgid "branch"
-msgstr "ramo"
+#: builtin/checkout.c:1477
+#, fuzzy
+msgid "missing branch or commit argument"
+msgstr "Falta um nome dum ramo; tente -b"
 
-#: builtin/checkout.c:1160
-msgid "create and checkout a new branch"
-msgstr "criar e extrair um novo ramo"
+#: 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:1162
-msgid "create/reset and checkout a branch"
-msgstr "criar/repor e extrair um ramo"
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+msgid "style"
+msgstr "estilo"
 
-#: builtin/checkout.c:1163
-msgid "create reflog for new branch"
-msgstr "criar reflog do novo ramo"
+#: builtin/checkout.c:1522
+msgid "conflict style (merge or diff3)"
+msgstr "estilo de conflito (merge ou diff3)"
 
-#: builtin/checkout.c:1164 builtin/worktree.c:329
+#: builtin/checkout.c:1534 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "destacar HEAD no commit indicado"
 
-#: builtin/checkout.c:1165
+#: 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:1167
+#: builtin/checkout.c:1537
+msgid "force checkout (throw away local modifications)"
+msgstr "forçar extração (descartar modificações locais)"
+
+#: builtin/checkout.c:1539
 msgid "new-branch"
 msgstr "novo-ramo"
 
-#: builtin/checkout.c:1167
+#: builtin/checkout.c:1539
 msgid "new unparented branch"
 msgstr "novo ramo sem pai"
 
-#: builtin/checkout.c:1168
-msgid "checkout our version for unmerged files"
-msgstr "extrair a nossa versão dos ficheiros não integrados"
-
-#: builtin/checkout.c:1170
-msgid "checkout their version for unmerged files"
-msgstr "extrair a versão deles dos ficheiros não integrados"
-
-#: builtin/checkout.c:1172
-msgid "force checkout (throw away local modifications)"
-msgstr "forçar extração (descartar modificações locais)"
-
-#: builtin/checkout.c:1173
-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:1174 builtin/merge.c:234
+#: builtin/checkout.c:1541 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr "atualizar ficheiros ignorados (predefinição)"
 
-#: builtin/checkout.c:1175 builtin/log.c:1473 parse-options.h:251
-msgid "style"
-msgstr "estilo"
+#: builtin/checkout.c:1544
+msgid "do not check if another worktree is holding the given ref"
+msgstr "incapaz verificar se outra worktree contém referência dada"
 
-#: builtin/checkout.c:1176
-msgid "conflict style (merge or diff3)"
-msgstr "estilo de conflito (merge ou diff3)"
+#: builtin/checkout.c:1557
+msgid "checkout our version for unmerged files"
+msgstr "checkout a nossa versão dos ficheiros por juntar"
 
-#: builtin/checkout.c:1179
-msgid "do not limit pathspecs to sparse entries only"
-msgstr "não restringir especificadores de caminho a entradas esparsas"
+#: builtin/checkout.c:1560
+msgid "checkout their version for unmerged files"
+msgstr "checkout a versão deles dos ficheiros por juntar"
 
-#: builtin/checkout.c:1181
-msgid "second guess 'git checkout <no-such-branch>'"
-msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+#: builtin/checkout.c:1564
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "abrange especificadores de path além de entradas dispersas"
 
-#: builtin/checkout.c:1183
-msgid "do not check if another worktree is holding the given ref"
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
 msgstr ""
-"não verificar se outra árvore de trabalho contém a referência fornecida"
-
-#: builtin/checkout.c:1187 builtin/clone.c:78 builtin/fetch.c:119
-#: builtin/merge.c:231 builtin/pull.c:117 builtin/push.c:539
-#: builtin/send-pack.c:172
-msgid "force progress reporting"
-msgstr "forçar informação de progresso"
 
-#: builtin/checkout.c:1224
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B e --orphan são mutuamente exclusivos"
+#: builtin/checkout.c:1626
+msgid "-p and --overlay are mutually exclusive"
+msgstr ""
 
-#: builtin/checkout.c:1241
+#: builtin/checkout.c:1663
 msgid "--track needs a branch name"
 msgstr "--track requer um nome dum ramo"
 
-#: builtin/checkout.c:1246
-msgid "Missing branch name; try -b"
+#: builtin/checkout.c:1668
+#, fuzzy, c-format
+msgid "missing branch name; try -%c"
 msgstr "Falta um nome dum ramo; tente -b"
 
-#: builtin/checkout.c:1282
+#: builtin/checkout.c:1700
+#, fuzzy, c-format
+msgid "could not resolve %s"
+msgstr "incapaz resolver %s"
+
+#: builtin/checkout.c:1716
 msgid "invalid path specification"
 msgstr "especificação de caminho inválida"
 
-#: builtin/checkout.c:1289
+#: builtin/checkout.c:1723
 #, 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?"
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr ""
-"Não é 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?"
 
-#: builtin/checkout.c:1294
+#: 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:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr ""
 
-#: builtin/checkout.c:1298
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr ""
+
+#: builtin/checkout.c:1752
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -6255,38 +12752,115 @@ msgstr ""
 "git checkout: --ours/--theirs, --force e --merge são incompatíveis\n"
 "durante a extração do índice."
 
-#: builtin/clean.c:25
+#: builtin/checkout.c:1757
+#, fuzzy
+msgid "you must specify path(s) to restore"
+msgstr "Deve especificar um diretório."
+
+#: 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:1784
+msgid "create and checkout a new branch"
+msgstr "criar e extrair um novo ramo"
+
+#: builtin/checkout.c:1786
+msgid "create/reset and checkout a branch"
+msgstr "criar/repor e extrair um ramo"
+
+#: builtin/checkout.c:1787
+msgid "create reflog for new branch"
+msgstr "criar reflog do novo ramo"
+
+#: builtin/checkout.c:1789
+#, fuzzy
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+
+#: builtin/checkout.c:1790
+msgid "use overlay mode (default)"
+msgstr ""
+
+#: builtin/checkout.c:1835
+#, fuzzy
+msgid "create and switch to a new branch"
+msgstr "criar e extrair um novo ramo"
+
+#: builtin/checkout.c:1837
+#, fuzzy
+msgid "create/reset and switch to a branch"
+msgstr "criar/repor e extrair um ramo"
+
+#: builtin/checkout.c:1839
+#, fuzzy
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "tentar adivinhar 'git checkout <ramo-inexistente>'"
+
+#: builtin/checkout.c:1841
+#, fuzzy
+msgid "throw away local modifications"
+msgstr "forçar extração (descartar modificações locais)"
+
+#: builtin/checkout.c:1875
+msgid "which tree-ish to checkout from"
+msgstr ""
+
+#: builtin/checkout.c:1877
+#, fuzzy
+msgid "restore the index"
+msgstr "restaurar o cenário"
+
+#: builtin/checkout.c:1879
+#, fuzzy
+msgid "restore the working tree (default)"
+msgstr "Mostrar o estado da árvores de trabalho"
+
+#: builtin/checkout.c:1881
+#, fuzzy
+msgid "ignore unmerged entries"
+msgstr "ignora unmerged entries"
+
+#: builtin/checkout.c:1882
+msgid "use overlay mode"
+msgstr ""
+
+#: 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 <padrão>] [-x | -X] [--] <caminhos>..."
 
-#: builtin/clean.c:29
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "A remover %s\n"
 
-#: builtin/clean.c:30
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Removeria %s\n"
 
-#: builtin/clean.c:31
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "A ignorar o repositório %s\n"
 
-#: builtin/clean.c:32
+#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Ignoraria o repositório %s\n"
 
-#: builtin/clean.c:33
-#, c-format
-msgid "failed to remove %s"
-msgstr "falha ao remover %s"
+#: builtin/clean.c:38
+#, fuzzy, c-format
+msgid "could not lstat %s\n"
+msgstr "incapaz lstat %s\n"
 
-#: builtin/clean.c:297 git-add--interactive.perl:614
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6297,9 +12871,9 @@ msgstr ""
 "Ajuda de linha de comandos:\n"
 "1          - selecionar um item numerado\n"
 "foo        - selecionar item baseado no prefixo único\n"
-"           - (vazio) não seleciona nada\n"
+"           - (vazio) seleciona nada\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:623
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6320,8 +12894,8 @@ msgstr ""
 "*          - escolher todos os itens\n"
 "           - (vazio) concluir seleção\n"
 
-#: builtin/clean.c:517 git-add--interactive.perl:589
-#: git-add--interactive.perl:594
+#: 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"
@@ -6331,27 +12905,22 @@ msgstr "O quê (%s)?\n"
 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:783 git-add--interactive.perl:1660
-#, c-format
-msgid "Bye.\n"
-msgstr "Adeus.\n"
-
-#: builtin/clean.c:791
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6369,490 +12938,652 @@ msgstr ""
 "help                - esta ajuda\n"
 "?                   - ajuda para seleção em linha de comandos"
 
-#: builtin/clean.c:818 git-add--interactive.perl:1736
-msgid "*** Commands ***"
-msgstr "*** Comandos ***"
-
-#: builtin/clean.c:819 git-add--interactive.perl:1733
-msgid "What now"
-msgstr "E agora"
-
-#: builtin/clean.c:827
+#: 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:844
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
-msgstr "Não há mais ficheiros por limpar, a terminar."
+msgstr "Mais ficheiro por limpar nenhum, saindo."
 
-#: builtin/clean.c:875
+#: 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:877
+#: builtin/clean.c:902
 msgid "force"
 msgstr "forçar"
 
-#: builtin/clean.c:878
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "limpeza interativa"
 
-#: builtin/clean.c:880
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "remover diretórios inteiros"
 
-#: builtin/clean.c:881 builtin/describe.c:449 builtin/describe.c:451
-#: builtin/grep.c:1063 builtin/ls-files.c:539 builtin/name-rev.c:348
-#: builtin/name-rev.c:350 builtin/show-ref.c:176
+#: 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:882
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr "adicionar <padrão> às regras ignoradas"
 
-#: builtin/clean.c:883
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "também remover ficheiros ignorados"
 
-#: builtin/clean.c:885
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "remover apenas ficheiros ignorados"
 
-#: builtin/clean.c:903
-msgid "-x and -X cannot be used together"
-msgstr "-x e -X não pode ser usados juntos"
-
-#: builtin/clean.c:907
+#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr ""
 "clean.requireForce definido como true e nenhum -i, -n, ou -f fornecido; "
-"limpeza recusada"
+"recusando limpar"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce predefinido como true e nenhum -i, -n, ou -f fornecido; "
-"limpeza recusada"
+"recusando limpar"
 
-#: builtin/clone.c:37
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+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:80
+#: builtin/clone.c:96
+#, fuzzy
+msgid "don't clone shallow repository"
+msgstr "para clonar de um repositório local"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
-msgstr "não criar uma extração"
+msgstr "cria checkout nenhum"
 
-#: builtin/clone.c:81 builtin/clone.c:83 builtin/init-db.c:478
+#: 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:85
+#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr "criar um repositório espelhado (implica repositório nu)"
 
-#: builtin/clone.c:87
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "para clonar de um repositório local"
 
-#: builtin/clone.c:89
+#: 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:91
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "configurar como repositório partilhado"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "pathspec"
 
-#: builtin/clone.c:93 builtin/clone.c:97
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "inicializar submódulos no clone"
 
-#: builtin/clone.c:100
+#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr "número de submódulos clonados em paralelo"
 
-#: builtin/clone.c:101 builtin/init-db.c:475
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "diretório-modelo"
 
-#: builtin/clone.c:102 builtin/init-db.c:476
+#: 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:104 builtin/clone.c:106 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: 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:108
+#: 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"
 
-#: builtin/clone.c:109 builtin/column.c:26 builtin/merge-file.c:43
+#: 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:110
+#: 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:112
+#: 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:114
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "caminho para git-upload-pack no remoto"
 
-#: builtin/clone.c:115 builtin/fetch.c:120 builtin/grep.c:1006
-#: builtin/pull.c:202
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "profundidade"
 
-#: builtin/clone.c:116
+#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr "criar um clone raso com essa profundidade"
 
-#: builtin/clone.c:117 builtin/fetch.c:122 builtin/pack-objects.c:2918
-#: parse-options.h:142
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/pull.c:211
 msgid "time"
 msgstr "hora"
 
-#: builtin/clone.c:118
+#: 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:119 builtin/fetch.c:124
+#: 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:120 builtin/fetch.c:125
+#: 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:122
+#: 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:124
+#: builtin/clone.c:139
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr ""
+
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "qualquer submódulo clonado será raso"
 
-#: builtin/clone.c:125 builtin/init-db.c:484
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:126 builtin/init-db.c:485
+#: 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"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "chave=valor"
 
-#: builtin/clone.c:128
+#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr "definir configuração dentro do novo repositório"
 
-#: builtin/clone.c:129 builtin/fetch.c:140 builtin/push.c:550
+#: 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: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: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:131 builtin/fetch.c:142 builtin/push.c:552
+#: 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:268
+#: builtin/clone.c:154
+#, fuzzy
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "qualquer submódulo clonado será raso"
+
+#: builtin/clone.c:156
+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ão foi possível adivinhar o nome do diretório.\n"
-"Especifique um diretório na linha de comandos"
+"Incapaz adivinhar nome de pasta.\n"
+"Por favor especifique uma pasta na linha de comandos"
 
-#: builtin/clone.c:321
+#: builtin/clone.c:345
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
-msgstr "info: Não foi possível adicionar sobressalente de '%s': %s\n"
-
-#: builtin/clone.c:393
-#, c-format
-msgid "failed to open '%s'"
-msgstr "falha ao abrir '%s'"
+msgstr "info: Incapaz adicionar sobressalente para '%s': %s\n"
 
-#: builtin/clone.c:401
+#: 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:415
-#, c-format
-msgid "failed to stat %s\n"
-msgstr "falha ao invocar stat de %s\n"
+#: builtin/clone.c:436
+#, fuzzy, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "falhou começar iterador em '%s'"
 
-#: builtin/clone.c:437
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "falha ao criar a ligação '%s'"
 
-#: builtin/clone.c:441
+#: builtin/clone.c:471
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "falha ao copiar o ficheiro para '%s'"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:476
+#, fuzzy, c-format
+msgid "failed to iterate over '%s'"
+msgstr "falha ao remover '%s'"
+
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr "concluído.\n"
 
-#: builtin/clone.c:478
+#: builtin/clone.c:517
+#, fuzzy
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
+"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"
 
-#: builtin/clone.c:555
+#: 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:650
-msgid "remote did not send all necessary objects"
-msgstr "o remoto não enviou todos os objetos necessários"
-
-#: builtin/clone.c:666
+#: 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:761
+#, fuzzy
+msgid "failed to initialize sparse-checkout"
+msgstr "falha ao finalizar integração de notas"
 
-#: builtin/clone.c:715
+#: builtin/clone.c:784
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr ""
-"a HEAD remota referencia uma referência inexistente, não é possível "
-"extrair.\n"
+"remote HEAD refere-se a referência inexistente, impossível fazer checkout.\n"
 
-#: builtin/clone.c:746
+#: 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:786
+#: 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:849
+#: 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:851
+#: 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:884 builtin/receive-pack.c:1901
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
 msgid "Too many arguments."
-msgstr "Demasiados argumentos."
+msgstr ""
 
-#: builtin/clone.c:888
+#: builtin/clone.c:1005
 msgid "You must specify a repository to clone."
 msgstr "Deve especificar um repositório para clonar."
 
-#: builtin/clone.c:901
+#: 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."
 
-#: builtin/clone.c:904
+#: 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:917
+#: 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:923 builtin/fetch.c:1337
+#: 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:933
+#: 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:943
+#: builtin/clone.c:1055
+#, fuzzy, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "path de repositório '%s' já existe e é diretório vazio nenhum."
+
+#: builtin/clone.c:1069
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "a árvore de trabalho '%s' já existe."
 
-#: builtin/clone.c:958 builtin/clone.c:969 builtin/difftool.c:252
-#: builtin/worktree.c:222 builtin/worktree.c:249
+#: 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:961
+#: 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:973
+#: 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:975
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
-msgstr "A clonar em '%s'...\n"
+msgstr "Clonando em '%s'...\n"
 
-#: builtin/clone.c:999
+#: 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:1055
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' é nome de remoto inválido"
+
+#: builtin/clone.c:1229
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth é ignorado em clones locais; use file:// ."
 
-#: builtin/clone.c:1057
+#: builtin/clone.c:1231
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since é ignorado em clones locais; use file:// ."
 
-#: builtin/clone.c:1059
+#: builtin/clone.c:1233
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude é ignorado em clones locais; use file:// ."
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1235
+#, fuzzy
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "--depth é ignorado em clones locais; use file:// ."
+
+#: builtin/clone.c:1240
 msgid "source repository is shallow, ignoring --local"
 msgstr "o repositório de origem é raso, --local ignorado"
 
-#: builtin/clone.c:1067
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr "--local ignorado"
 
-#: builtin/clone.c:1071
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "Não sei como clonar %s"
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "transporte remoto reportou erro"
 
-#: builtin/clone.c:1126 builtin/clone.c:1134
+#: 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:1137
+#: builtin/clone.c:1347
 msgid "You appear to have cloned an empty repository."
 msgstr "Parece foi clonado um repositório vazio."
 
-#: builtin/column.c:9
+#: builtin/column.c:10
 msgid "git column [<options>]"
 msgstr "git column [<opções>]"
 
-#: builtin/column.c:26
+#: builtin/column.c:27
 msgid "lookup config vars"
 msgstr "pesquisar variáveis de configuração"
 
-#: builtin/column.c:27 builtin/column.c:28
+#: builtin/column.c:28 builtin/column.c:29
 msgid "layout to use"
 msgstr "esquema a usar"
 
-#: builtin/column.c:29
-msgid "Maximum width"
+#: builtin/column.c:30
+#, fuzzy
+msgid "maximum width"
 msgstr "Largura máxima"
 
-#: builtin/column.c:30
-msgid "Padding space on left border"
+#: builtin/column.c:31
+#, fuzzy
+msgid "padding space on left border"
 msgstr "Espaço de preenchimento na borda esquerda"
 
-#: builtin/column.c:31
-msgid "Padding space on right border"
+#: builtin/column.c:32
+#, fuzzy
+msgid "padding space on right border"
 msgstr "Espaço de preenchimento na borda direita"
 
-#: builtin/column.c:32
-msgid "Padding space between columns"
+#: builtin/column.c:33
+#, fuzzy
+msgid "padding space between columns"
 msgstr "Espaço de preenchimento entre colunas"
 
 #: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command deve ser o primeiro argumento"
 
-#: builtin/commit.c:38
-msgid "git commit [<options>] [--] <pathspec>..."
-msgstr "git commit [<opções>] [--] <especificador-de-caminho>..."
-
-#: builtin/commit.c:43
-msgid "git status [<options>] [--] <pathspec>..."
-msgstr "git status [<opções>] [--] <especificador-de-caminho>..."
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] [--[no-]progress]"
+msgstr ""
 
-#: builtin/commit.c:48
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
 msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly. Run the\n"
-"following command and follow the instructions in your editor to edit\n"
-"your configuration file:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
+"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
+#, fuzzy, c-format
+msgid "could not find object directory matching %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: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"
+msgstr ""
+
+#: builtin/commit-graph.c:83
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+
+#: builtin/commit-graph.c:106
+#, fuzzy, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Incapaz abrir commit-graph '%s'"
+
+#: builtin/commit-graph.c:142
+#, fuzzy, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "argumento --split desconhecido, %s"
+
+#: builtin/commit-graph.c:155
+#, fuzzy, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "reutilizar o objeto de nota especificado"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr ""
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr ""
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr ""
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr ""
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr ""
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
 msgstr ""
-"O seu nome e endereço de e-mail foram configurados automaticamente com base\n"
-"no seu nome de utilizador e nome de máquina. Verifique se estão corretos.\n"
-"Pode suprimir esta mensagem configurando-os explicitamente. Execute\n"
-"o seguinte comando e siga as instruções no editor para editar\n"
-"o ficheiro de configuração:\n"
-"\n"
-"    git config --global --edit\n"
-"\n"
-"Após fazer isto, pode corrigir a identidade usada neste commit com:\n"
-"\n"
-"    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:61
+#: builtin/commit-graph.c:228
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:230
+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>"
+
+#: builtin/commit-graph.c:234
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr ""
+
+#: builtin/commit-graph.c:255
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr ""
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr ""
+
+#: builtin/commit-tree.c:18
 msgid ""
-"Your name and email address were configured automatically based\n"
-"on your username and hostname. Please check that they are accurate.\n"
-"You can suppress this message by setting them explicitly:\n"
-"\n"
-"    git config --global user.name \"Your Name\"\n"
-"    git config --global user.email you@example.com\n"
-"\n"
-"After doing this, you may fix the identity used for this commit with:\n"
-"\n"
-"    git commit --amend --reset-author\n"
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
 msgstr ""
-"O seu nome e endereço de e-mail foram configurados automaticamente com base\n"
-"no seu nome de utilizador e nome de máquina. Verifique se estão corretos.\n"
-"Pode suprimir esta mensagem configurando-os explicitamente:\n"
-"\n"
-"    git config --global user.name \"O Seu Nome\"\n"
-"    git config --global user.email utilizador@exemplo.com\n"
-"\n"
-"Após fazer isto, pode corrigir a identidade usada neste commit com:\n"
-"\n"
-"    git commit --amend --reset-author\n"
 
-#: builtin/commit.c:73
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr ""
+
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
+#, fuzzy, c-format
+msgid "not a valid object name %s"
+msgstr "nome de objeto inválido %s"
+
+#: builtin/commit-tree.c:93
+#, c-format
+msgid "git commit-tree: failed to open '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:96
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr ""
+
+#: builtin/commit-tree.c:111
+#, fuzzy
+msgid "parent"
+msgstr "número-pai"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr ""
+
+#: 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:1624
+msgid "commit message"
+msgstr "mensagem de commit"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr ""
+
+#: 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
+msgid "must give exactly one tree"
+msgstr ""
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr ""
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<opções>] [--] <especificador-de-caminho>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<opções>] [--] <especificador-de-caminho>..."
+
+#: builtin/commit.c:51
 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"
@@ -6862,7 +13593,7 @@ msgstr ""
 "vazio. Pode repetir o comando com --allow-empty, ou pode remover o\n"
 "commit completamente com \"git reset HEAD^\".\n"
 
-#: builtin/commit.c:78
+#: builtin/commit.c:56
 msgid ""
 "The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
 "If you wish to commit it anyway, use:\n"
@@ -6871,156 +13602,158 @@ msgid ""
 "\n"
 msgstr ""
 "O cherry-pick anterior está vazio, possivelmente devido a resolução de "
-"conflitos.\n"
-"Se deseja submeter de qualquer forma, use:\n"
+"conflito.\n"
+"Se ainda desejas commit, usa:\n"
 "\n"
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:85
-msgid "Otherwise, please use 'git reset'\n"
+#: builtin/commit.c:63
+#, fuzzy
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Caso contrário, use 'git reset'\n"
+
+#: builtin/commit.c:66
+#, fuzzy
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Caso contrário, use 'git reset'\n"
 
-#: builtin/commit.c:88
+#: builtin/commit.c:69
 msgid ""
-"If you wish to skip this commit, use:\n"
+"and then use:\n"
 "\n"
-"    git reset\n"
+"    git cherry-pick --continue\n"
 "\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
-msgstr ""
-"Se deseja ignorar este commit, use:\n"
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
 "\n"
-"    git reset\n"
+"    git cherry-pick --skip\n"
 "\n"
-"Depois \"git cherry-pick --continue\" irá retomar o cherry-pick\n"
-"dos restantes commits.\n"
+msgstr ""
 
-#: builtin/commit.c:318
+#: builtin/commit.c:324
 msgid "failed to unpack HEAD tree object"
 msgstr "falha ao descompactar o objeto árvore HEAD"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:360
+#, fuzzy
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspe de ficheiro com -a faz sentido nenhum."
+
+#: builtin/commit.c:374
+msgid "No paths with --include/--only does not make sense."
+msgstr "--include/--only fazem sentido nenhum sem indicar paths."
+
+#: 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:365
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr "falha ao adicionar interativamente"
 
-#: builtin/commit.c:378
+#: 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:380
+#: builtin/commit.c:412
 msgid "Failed to update main cache tree"
 msgstr "Falha ao atualizar a árvore de cache principal"
 
-#: builtin/commit.c:404 builtin/commit.c:427 builtin/commit.c:476
+#: 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:458
+#: 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:460
+#: 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:469
+#: builtin/commit.c:493
+#, fuzzy
+msgid "cannot do a partial commit during a rebase."
+msgstr "incapaz fazer commit parcial durante um rebase."
+
+#: builtin/commit.c:501
 msgid "cannot read the index"
-msgstr "não é possível ler o índice"
+msgstr "incapaz ler o index"
 
-#: builtin/commit.c:488
+#: 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:582
+#: 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:584
+#: 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:603
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr "parâmetro --author malformado"
 
-#: builtin/commit.c:655
+#: 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:692 builtin/commit.c:725 builtin/commit.c:1096
+#: 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:704 builtin/shortlog.c:294
+#: 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:706
+#: 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:710
+#: 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:801
+#, fuzzy, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "incapaz de combinar '--root' com '--fork-point'"
 
-#: builtin/commit.c:737 builtin/commit.c:745
+#: 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:742
+#: 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:796
+#: builtin/commit.c:880
 msgid "could not write commit template"
-msgstr "não foi possível escrever o modelo de commit"
-
-#: builtin/commit.c:814
-#, c-format
-msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
-msgstr ""
-"\n"
-"Parece que está a submeter uma integração.\n"
-"Se não for o caso, remova o ficheiro\n"
-"\t%s\n"
-"e tente de novo.\n"
+msgstr "incapaz escrever o modelo de commit"
 
-#: builtin/commit.c:819
-#, c-format
+#: builtin/commit.c:893
+#, fuzzy, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"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"
-"\t%s\n"
-"e tente outra vez.\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:832
+#: builtin/commit.c:895
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7030,7 +13763,17 @@ msgstr ""
 "Linhas começadas com '%c' serão ignoradas, e uma mensagem vazia\n"
 "aborta o commit.\n"
 
-#: builtin/commit.c:839
+#: builtin/commit.c:899
+#, fuzzy, 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"
@@ -7041,149 +13784,223 @@ 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:859
+#: builtin/commit.c:915
+#, 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á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
+#, fuzzy
+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:867
+#: builtin/commit.c:955
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sData:      %s"
 
-#: builtin/commit.c:874
+#: builtin/commit.c:962
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sCommitter: %.*s <%.*s>"
 
-#: builtin/commit.c:892
+#: builtin/commit.c:980
 msgid "Cannot read index"
-msgstr "Não é possível ler o índice"
+msgstr "Incapaz ler index"
+
+#: builtin/commit.c:1025
+#, fuzzy
+msgid "unable to pass trailers to --trailers"
+msgstr "incapaz processar cabeçalho de %s"
 
-#: builtin/commit.c:954
+#: builtin/commit.c:1065
 msgid "Error building trees"
 msgstr "Erro ao construir árvores"
 
-#: builtin/commit.c:968 builtin/tag.c:273
+#: 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 as opções -m ou -F.\n"
+msgstr "Indique a mensagem usando apenas as opções -m ou -F.\n"
 
-#: builtin/commit.c:1071
+#: 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"
+"--author '%s' é diferente 'Nome <email>' e corresponde a um autor inexistente"
 
-#: builtin/commit.c:1086 builtin/commit.c:1325
+#: builtin/commit.c:1137
+#, fuzzy, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Modo de ignorar inválido '%s'"
+
+#: 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:1124
+#: builtin/commit.c:1195
 msgid "--long and -z are incompatible"
 msgstr "--long e -z são incompatíveis"
 
-#: builtin/commit.c:1154
+#: builtin/commit.c:1226
+#, fuzzy
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "Estás no meio de junção -- incapaz emendar."
+
+#: builtin/commit.c:1228
+#, fuzzy
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "Estás no meio de cherry-pick -- incapaz emendar."
+
+#: 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 "Não faz sentido usar --reset-author e --author ao mesmo tempo"
+msgstr "Usar ambos --reset-author e --author faz sentido nenhum"
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
-msgstr "Não há nada para emendar."
+msgstr "Tens nada para emendar."
 
-#: builtin/commit.c:1166
+#: 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:1168
+#: 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 cherry-pick -- incapaz emendar."
 
-#: builtin/commit.c:1171
+#: builtin/commit.c:1268
+#, fuzzy
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "Estás no meio de rebase -- incapaz emendar."
+
+#: 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:1181
+#: 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:1183
-msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
-msgstr "A opção -m não pode ser combinada com -c/C/-F/--fixup."
+#: builtin/commit.c:1283
+#, fuzzy
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "Opção -m incapaz ser combinada com -c/C/-F."
 
-#: builtin/commit.c:1191
+#: 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:1208
+#: 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:1210
-msgid "No paths with --include/--only does not make sense."
-msgstr "As opções --include/--only não fazem sentido sem indicar caminhos."
-
-#: builtin/commit.c:1212
-msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-msgstr "Caminhos explícitos especificados sem -i ou -o; assumindo --only..."
+#: builtin/commit.c:1338
+#, fuzzy, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "desconheço opção: %s\n"
 
-#: builtin/commit.c:1224 builtin/tag.c:551
-#, c-format
-msgid "Invalid cleanup mode %s"
-msgstr "Modo de limpeza inválido %s"
-
-#: builtin/commit.c:1229
-msgid "Paths with -a does not make sense."
-msgstr "Indicar caminhos com -a não faz sentido."
+#: builtin/commit.c:1352
+#, fuzzy, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "paths '%s ...' com -a faz sentido nenhum"
 
-#: builtin/commit.c:1339 builtin/commit.c:1612
+#: builtin/commit.c:1483 builtin/commit.c:1652
 msgid "show status concisely"
 msgstr "mostrar status de forma concisa"
 
-#: builtin/commit.c:1341 builtin/commit.c:1614
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show branch information"
 msgstr "mostrar informação do ramo"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1487
+#, fuzzy
+msgid "show stash information"
+msgstr "mostrar informação do ramo"
+
+#: builtin/commit.c:1489 builtin/commit.c:1656
+msgid "compute full ahead/behind values"
+msgstr ""
+
+#: builtin/commit.c:1491
 msgid "version"
 msgstr "versão"
 
-#: builtin/commit.c:1343 builtin/commit.c:1616 builtin/push.c:525
-#: builtin/worktree.c:443
+#: 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"
 
-#: builtin/commit.c:1346 builtin/commit.c:1618
+#: 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:1349 builtin/commit.c:1621
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "terminate entries with NUL"
 msgstr "terminar entradas com NUL"
 
-#: builtin/commit.c:1351 builtin/commit.c:1624 builtin/fast-export.c:981
-#: builtin/fast-export.c:984 builtin/tag.c:411
+#: 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:1352 builtin/commit.c:1624
+#: 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:1355
-msgid "show ignored files"
-msgstr "mostrar ficheiros ignorados"
+#: builtin/commit.c:1504
+#, fuzzy
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"mostrar ficheiros ignorados, modo opcional: traditional, matching, no. "
+"(Predefinição: tradicional)"
 
-#: builtin/commit.c:1356 parse-options.h:155
+#: builtin/commit.c:1506 parse-options.h:193
 msgid "when"
 msgstr "quando"
 
-#: builtin/commit.c:1357
+#: builtin/commit.c:1507
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -7191,349 +14008,436 @@ msgstr ""
 "ignorar alterações em submódulos, quando é opcional: all, dirty, untracked. "
 "(Predefinição: all)"
 
-#: builtin/commit.c:1359
+#: 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:1435
-msgid "couldn't look up newly created commit"
-msgstr "não foi possível consultar o commit recém-criado"
+#: builtin/commit.c:1510
+#, fuzzy
+msgid "do not detect renames"
+msgstr "detecção renomeação nenhuma"
 
-#: builtin/commit.c:1437
-msgid "could not parse newly created commit"
-msgstr "não foi possível analisar o commit recém-criado"
-
-#: builtin/commit.c:1482
-msgid "detached HEAD"
-msgstr "HEAD destacada"
+#: builtin/commit.c:1512
+msgid "detect renames, optionally set similarity index"
+msgstr ""
 
-#: builtin/commit.c:1485
-msgid " (root-commit)"
-msgstr " (commit-raiz)"
+#: builtin/commit.c:1535
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
 
-#: builtin/commit.c:1582
+#: builtin/commit.c:1617
 msgid "suppress summary after successful commit"
 msgstr "suprimir o resumo depois de submeter com sucesso"
 
-#: builtin/commit.c:1583
+#: builtin/commit.c:1618
 msgid "show diff in commit message template"
 msgstr "mostrar diff no modelo da mensagem de commit"
 
-#: builtin/commit.c:1585
+#: builtin/commit.c:1620
 msgid "Commit message options"
 msgstr "Opções de mensagem de commit"
 
-#: builtin/commit.c:1586 builtin/tag.c:409
+#: 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:1587
+#: builtin/commit.c:1622
 msgid "author"
 msgstr "autor"
 
-#: builtin/commit.c:1587
+#: builtin/commit.c:1622
 msgid "override author for commit"
 msgstr "substituir autor do commit"
 
-#: builtin/commit.c:1588 builtin/gc.c:353
+#: builtin/commit.c:1623 builtin/gc.c:550
 msgid "date"
 msgstr "data"
 
-#: builtin/commit.c:1588
+#: builtin/commit.c:1623
 msgid "override date for commit"
 msgstr "substituir data do commit"
 
-#: builtin/commit.c:1589 builtin/merge.c:221 builtin/notes.c:398
-#: builtin/notes.c:561 builtin/tag.c:407
-msgid "message"
-msgstr "mensagem"
-
-#: builtin/commit.c:1589
-msgid "commit message"
-msgstr "mensagem de commit"
-
-#: builtin/commit.c:1590 builtin/commit.c:1591 builtin/commit.c:1592
-#: builtin/commit.c:1593 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
 msgstr "commit"
 
-#: builtin/commit.c:1590
+#: 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:1591
+#: builtin/commit.c:1626
 msgid "reuse message from specified commit"
 msgstr "reutilizar a mensagem de um commit especificado"
 
-#: builtin/commit.c:1592
-msgid "use autosquash formatted message to fixup specified commit"
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+#: builtin/commit.c:1631
+#, fuzzy
+msgid "[(amend|reword):]commit"
+msgstr "emendar o commit anterior"
+
+#: builtin/commit.c:1631
+#, fuzzy
+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:1593
+#: 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:1594
+#: 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)"
 
-#: builtin/commit.c:1595 builtin/log.c:1420 builtin/revert.c:104
-msgid "add Signed-off-by:"
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "terminador"
+
+#: 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:"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1636
 msgid "use specified template file"
 msgstr "usar ficheiro de modelo especificado"
 
-#: builtin/commit.c:1597
+#: builtin/commit.c:1637
 msgid "force edit of commit"
 msgstr "forçar edição do commit"
 
-#: builtin/commit.c:1598
-msgid "default"
-msgstr "predefinição"
-
-#: builtin/commit.c:1598 builtin/tag.c:412
-msgid "how to strip spaces and #comments from message"
-msgstr "como retirar espaços e #comentários da mensagem"
-
-#: builtin/commit.c:1599
+#: builtin/commit.c:1639
 msgid "include status in commit message template"
 msgstr "incluir status no modelo da mensagem de commit"
 
-#: builtin/commit.c:1601 builtin/merge.c:233 builtin/pull.c:166
-#: builtin/revert.c:112
-msgid "GPG sign commit"
-msgstr "assinar o commit com GPG"
-
-#: builtin/commit.c:1604
+#: builtin/commit.c:1644
 msgid "Commit contents options"
 msgstr "Opções de conteúdo do commit"
 
-#: builtin/commit.c:1605
+#: builtin/commit.c:1645
 msgid "commit all changed files"
 msgstr "submeter todos os ficheiros alterados"
 
-#: builtin/commit.c:1606
+#: builtin/commit.c:1646
 msgid "add specified files to index for commit"
 msgstr "adicionar ficheiros especificados ao índice para submeter"
 
-#: builtin/commit.c:1607
+#: builtin/commit.c:1647
 msgid "interactively add files"
 msgstr "adicionar ficheiros interativamente"
 
-#: builtin/commit.c:1608
+#: builtin/commit.c:1648
 msgid "interactively add changes"
 msgstr "adicionar alterações interativamente"
 
-#: builtin/commit.c:1609
+#: builtin/commit.c:1649
 msgid "commit only specified files"
 msgstr "submeter somente os ficheiros especificados"
 
-#: builtin/commit.c:1610
+#: builtin/commit.c:1650
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "ignorar pre-commit e commit-msg hooks"
 
-#: builtin/commit.c:1611
+#: builtin/commit.c:1651
 msgid "show what would be committed"
 msgstr "mostrar o que seria submetido"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1664
 msgid "amend previous commit"
 msgstr "emendar o commit anterior"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1665
 msgid "bypass post-rewrite hook"
 msgstr "ignorar post-rewrite hook"
 
-#: builtin/commit.c:1628
+#: builtin/commit.c:1672
 msgid "ok to record an empty change"
 msgstr "aceitar o registo duma alteração vazia"
 
-#: builtin/commit.c:1630
+#: 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:1659
-msgid "could not parse HEAD commit"
-msgstr "não foi possível analisar o commit HEAD"
-
-#: builtin/commit.c:1707
+#: 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:1714
+#: 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:1733
+#: 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:1744
+#: builtin/commit.c:1785
 #, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "A abortar o commit; não editou a mensagem.\n"
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
 
-#: builtin/commit.c:1749
+#: builtin/commit.c:1790
 #, c-format
-msgid "Aborting commit due to empty commit message.\n"
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Abortando commit; mensagem ficou por editar.\n"
+
+#: builtin/commit.c:1801
+#, fuzzy, c-format
+msgid "Aborting commit due to empty commit message body.\n"
 msgstr "A abortar o commit uma vez que a mensagem de commit está vazia.\n"
 
-#: builtin/commit.c:1797
+#: builtin/commit.c:1837
+#, fuzzy
 msgid ""
-"Repository has been updated, but unable to write\n"
+"repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
+"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:9
+#: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<opções>]"
 
-#: builtin/config.c:55
+#: builtin/config.c:109 builtin/env--helper.c:27
+#, fuzzy, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "argumento --type desconhecido: %s"
+
+#: builtin/config.c:121
+#, fuzzy
+msgid "only one type at a time"
+msgstr "imprimir apenas correspondências exatas"
+
+#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Localização do ficheiro de configuração"
 
-#: builtin/config.c:56
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr "usar ficheiro de configuração global"
 
-#: builtin/config.c:57
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr "usar ficheiro de configuração do sistema"
 
-#: builtin/config.c:58
+#: builtin/config.c:133
 msgid "use repository config file"
-msgstr "usar ficheiro de configuração do repositório"
+msgstr ""
+
+#: builtin/config.c:134
+msgid "use per-worktree config file"
+msgstr ""
 
-#: builtin/config.c:59
+#: builtin/config.c:135
 msgid "use given config file"
 msgstr "usar ficheiro de configuração fornecido"
 
-#: builtin/config.c:60
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr "id-blob"
 
-#: builtin/config.c:60
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "ler configuração a partir do objeto blob fornecido"
 
-#: builtin/config.c:61
+#: builtin/config.c:137
 msgid "Action"
 msgstr "Ação"
 
-#: builtin/config.c:62
-msgid "get value: name [value-regex]"
+#: builtin/config.c:138
+#, fuzzy
+msgid "get value: name [value-pattern]"
 msgstr "obter valor: nome [regex-do-valor]"
 
-#: builtin/config.c:63
-msgid "get all values: key [value-regex]"
+#: builtin/config.c:139
+#, fuzzy
+msgid "get all values: key [value-pattern]"
 msgstr "obter todos os valores: chave [regex-do-valor]"
 
-#: builtin/config.c:64
-msgid "get values for regexp: name-regex [value-regex]"
+#: 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]"
 
-#: builtin/config.c:65
+#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "obter valor do URL especificado: section[.var] URL"
 
-#: builtin/config.c:66
-msgid "replace all matching variables: name value [value_regex]"
+#: 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]"
 
-#: builtin/config.c:67
+#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "adicionar uma nova variável: nome valor"
 
-#: builtin/config.c:68
-msgid "remove a variable: name [value-regex]"
+#: builtin/config.c:144
+#, fuzzy
+msgid "remove a variable: name [value-pattern]"
 msgstr "remover uma variável: nome [regex-do-valor]"
 
-#: builtin/config.c:69
-msgid "remove all matches: name [value-regex]"
+#: builtin/config.c:145
+#, fuzzy
+msgid "remove all matches: name [value-pattern]"
 msgstr "remover todas as correspondências: nome [regex-do-valor]"
 
-#: builtin/config.c:70
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "mudar o nome da secção: nome-antigo novo-nome"
 
-#: builtin/config.c:71
+#: builtin/config.c:147
 msgid "remove a section: name"
-msgstr "remover uma secção: nome"
+msgstr "remove secção: nome"
 
-#: builtin/config.c:72
+#: builtin/config.c:148
 msgid "list all"
 msgstr "listar todos"
 
-#: builtin/config.c:73
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr "abrir um editor"
 
-#: builtin/config.c:74
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "encontrar a cor configurada: slot [predefinição]"
 
-#: builtin/config.c:75
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "encontrar a definição de cor: slot [stdout-é-tty]"
 
-#: builtin/config.c:76
+#: builtin/config.c:153
 msgid "Type"
 msgstr "Tipo"
 
-#: builtin/config.c:77
+#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "value is given this type"
+msgstr ""
+
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "o valor é \"true\" (verdadeiro) ou \"false\" (falso)"
 
-#: builtin/config.c:78
+#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "o valor é um número decimal"
 
-#: builtin/config.c:79
+#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "o valor é --bool ou --int"
 
-#: builtin/config.c:80
+#: builtin/config.c:158
+#, fuzzy
+msgid "value is --bool or string"
+msgstr "o valor é --bool ou --int"
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "o valor é um caminho (nome dum ficheiro ou diretório)"
 
-#: builtin/config.c:81
+#: builtin/config.c:160
+msgid "value is an expiry date"
+msgstr ""
+
+#: builtin/config.c:161
 msgid "Other"
 msgstr "Outro"
 
-#: builtin/config.c:82
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "terminar valores com o byte NUL"
 
-#: builtin/config.c:83
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "mostrar apenas os nomes das variáveis"
 
-#: builtin/config.c:84
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "respeitar diretivas de inclusão ao pesquisar"
 
-#: builtin/config.c:85
+#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "mostrar a origem da configuração (ficheiro, entrada padrão, blob, linha de "
 "comandos)"
 
-#: builtin/config.c:327
+#: builtin/config.c:166
+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"
+
+#: builtin/config.c:167
+msgid "with --get, use default value when missing entry"
+msgstr ""
+
+#: builtin/config.c:181
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr ""
+
+#: builtin/config.c:183
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr ""
+
+#: builtin/config.c:339
+#, fuzzy, c-format
+msgid "invalid key pattern: %s"
+msgstr "chave inválida: %s"
+
+#: builtin/config.c:377
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr ""
+
+#: builtin/config.c:441
+#, fuzzy, c-format
+msgid "cannot parse color '%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:471
+#: 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"
+
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -7548,112 +14452,206 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:652
+msgid "only one config file at a time"
+msgstr ""
+
+#: builtin/config.c:658
+msgid "--local can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:660
+msgid "--blob can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:662
+#, fuzzy
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree apenas pode ser usado dentro repositório git"
+
+#: builtin/config.c:684
+msgid "$HOME not set"
+msgstr ""
+
+#: builtin/config.c:708
+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 ""
+
+#: builtin/config.c:743
+msgid "--get-color and variable type are incoherent"
+msgstr ""
+
+#: builtin/config.c:748
+msgid "only one action at a time"
+msgstr ""
+
+#: builtin/config.c:761
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr ""
+
+#: builtin/config.c:767
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+
+#: builtin/config.c:773
+msgid "--default is only applicable to --get"
+msgstr ""
+
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:822
+#, fuzzy, c-format
+msgid "unable to read config file '%s'"
+msgstr "incapaz ler ficheiro config '%s'"
+
+#: builtin/config.c:825
+msgid "error processing config file(s)"
+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:623
+#: builtin/config.c:864
 #, c-format
 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"
-"\tUse uma regexp, --add ou --replace-all para alterar %s."
+"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
+msgid "no such section: %s"
+msgstr "secção inexistente: %s"
 
-#: builtin/count-objects.c:86
+#: builtin/count-objects.c:90
 msgid "git count-objects [-v] [-H | --human-readable]"
 msgstr "git count-objects [-v] [-H | --human-readable]"
 
-#: builtin/count-objects.c:96
+#: builtin/count-objects.c:100
 msgid "print sizes in human readable format"
 msgstr "imprimir dimensões em formato inteligível por humanos"
 
-#: builtin/describe.c:18
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"As permissões do diretório do socket são demasiado fracas; outros\n"
+"utilizadores poderão conseguir as suas credenciais em cache. Considere "
+"executar:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: 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:316
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr ""
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr ""
+
+#: builtin/credential-store.c:66
+#, fuzzy, c-format
+msgid "unable to get credential storage lock in %d ms"
+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>...]"
 
-#: builtin/describe.c:19
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<opções>] --dirty"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:63
 msgid "head"
 msgstr "cabeça"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "leve"
 
-#: builtin/describe.c:53
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr "anotado"
 
-#: builtin/describe.c:250
+#: 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:254
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "a tag anotada %s não tem nenhum nome incorporado"
-
-#: builtin/describe.c:256
-#, c-format
-msgid "tag '%s' is really '%s' here"
+#: builtin/describe.c:281
+#, fuzzy, c-format
+msgid "tag '%s' is externally known as '%s'"
 msgstr "a tag '%s' está de facto em '%s'"
 
-#: builtin/describe.c:283 builtin/log.c:487
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "%s não é um nome de objeto válido"
-
-#: builtin/describe.c:286
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s não é um objeto '%s' válido"
-
-#: builtin/describe.c:303
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
-msgstr "nenhuma tag corresponde exatamente a '%s'"
+msgstr "tag nenhuma corresponde exatamente a '%s'"
 
-#: builtin/describe.c:305
+#: builtin/describe.c:330
 #, c-format
-msgid "searching to describe %s\n"
-msgstr "à procurar da descrição de %s\n"
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
 
-#: builtin/describe.c:352
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "a pesquisa terminou em %s\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr ""
-"Não é possível usar tags anotadas para descrever '%s'.\n"
-"No entanto, é possível com tags não anotadas: tente --tags."
+"'%s' pode ser descrição de tag anotada nenhuma.\n"
+"No entanto, houve fora das tags anotadas: tenta --tags."
 
-#: builtin/describe.c:383
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr ""
-"Não é possível usar tags para descrever '%s'.\n"
-"Tente --always, ou crie algumas tags."
+"'%s' pode ser descrição de tag nenhuma.\n"
+"Tenta --always, ou cria algumas tags."
 
-#: builtin/describe.c:413
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "%lu commits percorridos\n"
 
-#: builtin/describe.c:416
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -7662,500 +14660,760 @@ msgstr ""
 "mais de %i tags encontradas; foram listadas as %i mais recentes\n"
 "pesquisa interrompida em %s\n"
 
-#: builtin/describe.c:438
+#: builtin/describe.c:529
+#, fuzzy, 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 é nome de objeto inválido"
+
+#: builtin/describe.c:540
+#, fuzzy, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "'%s' é nem commit nem blob"
+
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "localizar a tag que vem após o commit"
 
-#: builtin/describe.c:439
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "depurar a estratégia de procura para stderr"
 
-#: builtin/describe.c:440
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "usar uma referência qualquer"
 
-#: builtin/describe.c:441
+#: 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:442
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "usar sempre formato longo"
 
-#: builtin/describe.c:443
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "seguir só o primeiro pai"
 
-#: builtin/describe.c:446
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "imprimir apenas correspondências exatas"
 
-#: builtin/describe.c:448
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "considerar as <n> tags mais recentes (predefinição: 10)"
 
-#: builtin/describe.c:450
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "apenas considerar tags que correspondam ao <padrão>"
 
-#: builtin/describe.c:452
+#: 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:454 builtin/name-rev.c:357
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "mostrar objetos de commit abreviados em recurso"
 
-#: builtin/describe.c:455 builtin/describe.c:458
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "marca"
 
-#: builtin/describe.c:456
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr ""
 "acrescentar <marca> se a árvore de trabalho contiver alterações "
 "(predefinição: \"-dirty\")"
 
-#: builtin/describe.c:459
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr ""
 "acrescentar <marca> no caso de árvore de trabalho quebrada (predefinição: \"-"
 "broken\")"
 
-#: builtin/describe.c:477
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long é incompatível com --abbrev=0"
 
-#: builtin/describe.c:506
+#: 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:549
+#: 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:551
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken é incompatível com commits ou semelhantes"
 
-#: builtin/diff.c:83
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr ""
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr ""
+
+#: 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:234
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
-msgstr "opção inválida: %s"
+msgstr ""
+
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr ""
 
-#: builtin/diff.c:358
+#: builtin/diff.c:486
 msgid "Not a git repository"
-msgstr "Não é um repositório git"
+msgstr "É repositório git nenhum"
 
-#: builtin/diff.c:401
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objeto inválido '%s' fornecido."
 
-#: builtin/diff.c:410
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "mais do que dois blobs fornecidos: '%s'"
 
-#: builtin/diff.c:417
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "objeto sem tratamento '%s' fornecido."
 
-#: builtin/difftool.c:28
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr ""
+
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<opções>] [<commit> [<commit>]] [--] [<caminho>...]"
 
-#: builtin/difftool.c:241
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
 msgstr "falha: %d"
 
-#: builtin/difftool.c:283
+#: 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:285
+#: 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:293
+#: 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:395
+#: 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:609
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "ambos os ficheiros modificados: '%s' e '%s'."
 
-#: builtin/difftool.c:611
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "ficheiro de árvore de trabalho foi deixado."
 
-#: builtin/difftool.c:622
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "existem ficheiros temporários em '%s'."
 
-#: builtin/difftool.c:623
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr "pode querer limpar ou recuperá-los."
 
-#: builtin/difftool.c:669
+#: builtin/difftool.c:699
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "use 'diff.guitool' em vez de 'diff.tool'"
 
-#: builtin/difftool.c:671
+#: builtin/difftool.c:701
 msgid "perform a full-directory diff"
 msgstr "efetuar diff diretório completo"
 
-#: builtin/difftool.c:673
+#: 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:679
+#: builtin/difftool.c:708
 msgid "use symlinks in dir-diff mode"
 msgstr "usar symlinks no modi dir-diff"
 
-#: builtin/difftool.c:680
-msgid "<tool>"
-msgstr "<ferramenta>"
+#: builtin/difftool.c:709
+#, fuzzy
+msgid "tool"
+msgstr "ferramenta"
 
-#: builtin/difftool.c:681
+#: builtin/difftool.c:710
 msgid "use the specified diff tool"
 msgstr "usar a ferramenta diff especificada"
 
-#: builtin/difftool.c:683
+#: 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'"
 
-#: builtin/difftool.c:686
+#: 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:688
-msgid "<command>"
-msgstr "<comando>"
-
-#: builtin/difftool.c:689
+#: builtin/difftool.c:718
 msgid "specify a custom command for viewing diffs"
 msgstr "especificar um comando personalizado para ver diffs"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:719
+msgid "passed to `diff`"
+msgstr ""
+
+#: builtin/difftool.c:734
+msgid "difftool requires worktree or --no-index"
+msgstr ""
+
+#: builtin/difftool.c:741
+#, fuzzy
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff é incompatível com --no-index"
+
+#: builtin/difftool.c:744
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr ""
+
+#: builtin/difftool.c:752
 msgid "no <tool> given for --tool=<tool>"
-msgstr "nenhuma <ferramenta> dada a --tool=<ferramenta>"
+msgstr "<ferramenta> nenhuma dada a --tool=<ferramenta>"
 
-#: builtin/difftool.c:720
+#: builtin/difftool.c:759
 msgid "no <cmd> given for --extcmd=<cmd>"
-msgstr "nenhum <cmd> dado a --extcmd=<cmd>"
+msgstr "<cmd> nenhum dado a --extcmd=<cmd>"
+
+#: 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
+msgid "type"
+msgstr "tipo"
+
+#: builtin/env--helper.c:46
+msgid "default for git_env_*(...) to fall back on"
+msgstr ""
+
+#: builtin/env--helper.c:48
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
 
-#: builtin/fast-export.c:25
+#: builtin/env--helper.c:67
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+
+#: builtin/env--helper.c:82
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+
+#: builtin/fast-export.c:29
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [opções-de-rev-list]"
 
-#: builtin/fast-export.c:980
+#: builtin/fast-export.c:868
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr ""
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "mostrar progresso depois de <n> objetos"
 
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "selecionar o tratamento de tags assinadas"
 
-#: builtin/fast-export.c:985
+#: 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"
 
-#: builtin/fast-export.c:988
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1205
+#, fuzzy
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "selecionar o tratamento de tags que apontem para objetos filtrados"
+
+#: builtin/fast-export.c:1208
+#, fuzzy
+msgid "dump marks to this file"
 msgstr "Capturar marcas neste ficheiro"
 
-#: builtin/fast-export.c:990
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+#, fuzzy
+msgid "import marks from this file"
+msgstr "Importar marcas deste ficheiro"
+
+#: builtin/fast-export.c:1214
+#, fuzzy
+msgid "import marks from this file if it exists"
 msgstr "Importar marcas deste ficheiro"
 
-#: builtin/fast-export.c:992
-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
+#, fuzzy
+msgid "fake a tagger when tags lack one"
+msgstr "Falsear um \"tageador\" para quando falte um às tags"
 
-#: builtin/fast-export.c:994
-msgid "Output full tree for each commit"
+#: builtin/fast-export.c:1218
+#, fuzzy
+msgid "output full tree for each commit"
 msgstr "Mostrar a árvore completa para cada commit"
 
-#: builtin/fast-export.c:996
-msgid "Use the done feature to terminate the stream"
+#: builtin/fast-export.c:1220
+#, fuzzy
+msgid "use the done feature to terminate the stream"
 msgstr "Usar a funcionalidade done para terminar o fluxo"
 
-#: builtin/fast-export.c:997
-msgid "Skip output of blob data"
+#: builtin/fast-export.c:1221
+#, fuzzy
+msgid "skip output of blob data"
 msgstr "Ignorar a exibição de dados de blob"
 
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1222 builtin/log.c:1826
 msgid "refspec"
 msgstr "especificador de referência"
 
-#: builtin/fast-export.c:999
-msgid "Apply refspec to exported refs"
+#: builtin/fast-export.c:1223
+#, fuzzy
+msgid "apply refspec to exported refs"
 msgstr "Aplicar o especificador de referência a referências exportadas"
 
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "anonimizar saída"
 
-#: builtin/fetch.c:21
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr ""
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr ""
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
+msgstr ""
+
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr ""
+
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr ""
+
+#: builtin/fast-export.c:1256
+#, fuzzy
+msgid "--anonymize-map without --anonymize does not make sense"
+msgstr "--anonymize-map sem --anonymize faz sentido nenhum"
+
+#: builtin/fast-export.c:1271
+msgid "Cannot pass both --import-marks and --import-marks-if-exists"
+msgstr ""
+
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+
+#: builtin/fetch-pack.c:242
+#, fuzzy, c-format
+msgid "Lockfile created but not reported: %s"
+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>...]]"
 
-#: builtin/fetch.c:22
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<opções>] <grupo>"
 
-#: builtin/fetch.c:23
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<opções>] [(<repositório> | <grupo>)...]"
 
-#: builtin/fetch.c:24
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<opções>]"
 
-#: builtin/fetch.c:95 builtin/pull.c:175
+#: builtin/fetch.c:122
+msgid "fetch.parallel cannot be negative"
+msgstr ""
+
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "obter de todos os remotos"
 
-#: builtin/fetch.c:97 builtin/pull.c:178
+#: builtin/fetch.c:147 builtin/pull.c:245
+#, fuzzy
+msgid "set upstream for git pull/fetch"
+msgstr "definir upstream para git pull/fetch"
+
+#: 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"
 
-#: builtin/fetch.c:99 builtin/pull.c:181
+#: builtin/fetch.c:151
+#, fuzzy
+msgid "use atomic transaction to update references"
+msgstr "solicitar transação atómica no servidor remoto"
+
+#: 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:100 builtin/pull.c:183
-msgid "force overwrite of local branch"
+#: builtin/fetch.c:154
+#, fuzzy
+msgid "force overwrite of local reference"
 msgstr "forçar a substituição do ramo local"
 
-#: builtin/fetch.c:102
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "obter de múltiplos remotos"
 
-#: builtin/fetch.c:104 builtin/pull.c:185
+#: 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:106
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
-msgstr "não obter todas as tags (--no-tags)"
+msgstr "buscar tag nenhuma (--no-tags)"
 
-#: builtin/fetch.c:108
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "número de submódulos obtidos em paralelo"
 
-#: builtin/fetch.c:110 builtin/pull.c:188
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+
+#: 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 ""
-"eliminar os ramos de monitorização remotos que já não existem no remoto"
 
-#: builtin/fetch.c:111 builtin/pull.c:191
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:112 builtin/pull.c:192
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
 msgstr "controlar a obtenção recursiva de submódulos"
 
-#: builtin/fetch.c:116 builtin/pull.c:200
+#: builtin/fetch.c:175
+#, fuzzy
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "escrever o arquivo para este ficheiro"
+
+#: builtin/fetch.c:176 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "manter o pacote transferido"
 
-#: builtin/fetch.c:118
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "permitir a atualização da referência HEAD"
 
-#: builtin/fetch.c:121 builtin/fetch.c:127 builtin/pull.c:203
+#: 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:123
+#: 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:129 builtin/pull.c:206
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "converter num repositório completo"
 
-#: builtin/fetch.c:131 builtin/log.c:1440
-msgid "dir"
-msgstr "dir"
-
-#: builtin/fetch.c:132
+#: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
 msgstr "preceder isto ao caminho do submódulo"
 
-#: builtin/fetch.c:135
-msgid "default mode for recursion"
-msgstr "modo recursivo por omissão"
+#: builtin/fetch.c:195
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
 
-#: builtin/fetch.c:137 builtin/pull.c:209
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "aceitar referência que atualizem .git/shallow"
 
-#: builtin/fetch.c:138 builtin/pull.c:211
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr "mapa de referências"
 
-#: builtin/fetch.c:139 builtin/pull.c:212
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "especificar mapa de referências"
 
-#: builtin/fetch.c:395
+#: builtin/fetch.c:208 builtin/pull.c:240
+msgid "report that we have only objects reachable from this object"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "run 'maintenance --auto' after fetching"
+msgstr "executar 'maintenance --auto' após buscar"
+
+#: builtin/fetch.c:217 builtin/pull.c:243
+msgid "check for forced-updates on all updated branches"
+msgstr ""
+
+#: builtin/fetch.c:219
+#, fuzzy
+msgid "write the commit-graph after fetching"
+msgstr "escrever commit-graph após buscar"
+
+#: builtin/fetch.c:221
+#, fuzzy
+msgid "accept refspecs from stdin"
+msgstr "ler referências do stdin"
+
+#: 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:513
+#: 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:606
+#: 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:610
+#: builtin/fetch.c:860
 msgid "[up to date]"
 msgstr "[atualizado]"
 
-#: builtin/fetch.c:623 builtin/fetch.c:703
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr "[rejeitado]"
 
-#: builtin/fetch.c:624
+#: 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:633
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr "[tag atualizada]"
 
-#: builtin/fetch.c:634 builtin/fetch.c:667 builtin/fetch.c:683
-#: builtin/fetch.c:698
+#: 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:653
+#: builtin/fetch.c:889
+msgid "would clobber existing tag"
+msgstr ""
+
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr "[nova tag]"
 
-#: builtin/fetch.c:656
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr "[novo ramo]"
 
-#: builtin/fetch.c:659
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr "[nova referência]"
 
-#: builtin/fetch.c:698
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr "atualização forçada"
 
-#: builtin/fetch.c:703
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
 msgstr "sem avanço-rápido"
 
-#: builtin/fetch.c:748
+#: 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:1069
 #, c-format
-msgid "%s did not send all necessary objects\n"
-msgstr "%s não enviou todos os objetos necessários\n"
+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"
+msgstr ""
 
-#: builtin/fetch.c:768
+#: builtin/fetch.c:1101
 #, 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 "%s did not send all necessary objects\n"
+msgstr "%s ficou por enviar todos objetos necessários\n"
 
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:1129
+#, fuzzy, c-format
+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:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr "De %.*s\n"
 
-#: builtin/fetch.c:866
+#: 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:921
+#: builtin/fetch.c:1327
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s ficará suspenso)"
 
-#: builtin/fetch.c:922
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s ficou suspenso)"
 
-#: builtin/fetch.c:954
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr "[eliminado]"
 
-#: builtin/fetch.c:955 builtin/remote.c:1022
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(nenhum)"
 
-#: builtin/fetch.c:978
+#: 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:997
+#: 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:1000
+#: 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:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "Não sei como obter de %s"
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr ""
+
+#: builtin/fetch.c:1633
+#, fuzzy
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "desdefinindo upstream para remoto de ramo de monitorização remoto"
 
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1635
+msgid "not setting upstream for a remote tag"
+msgstr ""
+
+#: builtin/fetch.c:1637
+#, fuzzy
+msgid "unknown branch type"
+msgstr "tipo de ramo desconhecido"
+
+#: 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:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr "A obter de %s\n"
 
-#: builtin/fetch.c:1238 builtin/remote.c:96
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
-msgstr "Não foi possível obter de %s"
+msgstr "Incapaz buscar %s"
+
+#: builtin/fetch.c:1790
+#, fuzzy, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "fetch '%s' impossível (exit code: %d)\n"
 
-#: builtin/fetch.c:1256
+#: 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."
@@ -8163,204 +15421,448 @@ 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:1279
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr "Deve especificar um nome para a tag."
 
-#: builtin/fetch.c:1321
+#: 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 "Não é suportada profundidade negativa em --deepen"
+msgstr "Profundidade negativa em --deepen tem suporte nenhum"
 
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:2000
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen e --depth são mutuamente exclusivos"
 
-#: builtin/fetch.c:1328
+#: 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:1330
+#: 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:1352
+#: 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:1354
+#: 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 refspecs, faz sentido nenhum"
 
-#: builtin/fetch.c:1365
+#: 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:1373
+#: builtin/fetch.c:2042
 msgid "Fetching a group and specifying refspecs does not make sense"
-msgstr "Não faz sentido obter um grupo e especificar uma referência"
+msgstr "Buscar um grupo e especificar refspecs faz sentido nenhum"
+
+#: 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/fmt-merge-msg.c:14
+#: builtin/fetch.c:2082
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+
+#: 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 ""
+
+#: 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 <mensagem>] [--log[=<n>] | --no-log] [--file "
 "<ficheiro>]"
 
-#: builtin/fmt-merge-msg.c:663
+#: builtin/fmt-merge-msg.c:18
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "povoar o registo com, no máximo, <n> entradas do shortlog"
 
-#: builtin/fmt-merge-msg.c:666
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "alias de --log (obsoleto)"
 
-#: builtin/fmt-merge-msg.c:669
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "texto"
 
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "usar <texto> no início da mensagem"
 
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "ficheiro a ler"
 
-#: builtin/for-each-ref.c:9
+#: builtin/for-each-ref.c:10
 msgid "git for-each-ref [<options>] [<pattern>]"
 msgstr "git for-each-ref [<opções>] [<padrão>]"
 
-#: builtin/for-each-ref.c:10
+#: builtin/for-each-ref.c:11
 msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objeto>]"
 
-#: builtin/for-each-ref.c:11
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+#: 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>]]"
 
-#: builtin/for-each-ref.c:12
+#: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 
-#: builtin/for-each-ref.c:27
+#: 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:29
+#: 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:31
+#: 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:33
+#: 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:36
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "mostrar apenas <n> referências correspondidas"
 
-#: builtin/for-each-ref.c:41
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
+#, fuzzy
+msgid "respect format colors"
+msgstr "formato esperado: %%(color:<cor>)"
+
+#: 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:43
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "imprimir apenas referenciadas integradas"
 
-#: builtin/for-each-ref.c:44
+#: 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:45
+#: 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:46
+#: 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:34
+msgid "config"
+msgstr ""
+
+#: builtin/for-each-repo.c:35
+msgid "config key storing a list of repository paths"
+msgstr ""
 
-#: builtin/fsck.c:554
+#: builtin/for-each-repo.c:43
+msgid "missing --config=<config>"
+msgstr ""
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
+#, fuzzy
+msgid "unknown"
+msgstr "desconhecido"
+
+#. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
+#: builtin/fsck.c:78 builtin/fsck.c:100
+#, fuzzy, c-format
+msgid "error in %s %s: %s"
+msgstr "erro em %s %s: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:94
+#, fuzzy, c-format
+msgid "warning in %s %s: %s"
+msgstr "aviso em %s %s: %s"
+
+#: builtin/fsck.c:124 builtin/fsck.c:127
+#, c-format
+msgid "broken link from %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:136
+#, fuzzy
+msgid "wrong object type in link"
+msgstr "link com tipo de objeto errado"
+
+#: builtin/fsck.c:152
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+
+#: builtin/fsck.c:264
+#, c-format
+msgid "missing %s %s"
+msgstr ""
+
+#: builtin/fsck.c:291
+#, fuzzy, c-format
+msgid "unreachable %s %s"
+msgstr "já se tem %s (%s)"
+
+#: builtin/fsck.c:311
+#, fuzzy, c-format
+msgid "dangling %s %s"
+msgstr "balanceando %s %s"
+
+#: builtin/fsck.c:321
+#, fuzzy
+msgid "could not create lost-found"
+msgstr "incapaz criar lost-found"
+
+#: builtin/fsck.c:332
+#, fuzzy, c-format
+msgid "could not finish '%s'"
+msgstr "incapaz acabar '%s'"
+
+#: builtin/fsck.c:349
+#, fuzzy, c-format
+msgid "Checking %s"
+msgstr "Verificando %s"
+
+#: builtin/fsck.c:387
+#, fuzzy, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "Verificando conectividade (%d objetos)"
+
+#: builtin/fsck.c:406
+#, fuzzy, c-format
+msgid "Checking %s %s"
+msgstr "Verificando %s %s"
+
+#: builtin/fsck.c:411
+msgid "broken links"
+msgstr "links quebrados"
+
+#: builtin/fsck.c:420
+#, fuzzy, c-format
+msgid "root %s"
+msgstr "raiz %s"
+
+#: builtin/fsck.c:428
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr ""
+
+#: builtin/fsck.c:457
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr ""
+
+#: builtin/fsck.c:482
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr ""
+
+#: builtin/fsck.c:496
+#, fuzzy, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Verificando reflog %s->%s"
+
+#: builtin/fsck.c:530
+#, fuzzy, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "linha rasa inválida: %s"
+
+#: builtin/fsck.c:537
+#, fuzzy, c-format
+msgid "%s: not a commit"
+msgstr "%s: é commit nenhum"
+
+#: builtin/fsck.c:591
+#, fuzzy
+msgid "notice: No default references"
+msgstr "notificação: Referências padrão nenhumas"
+
+#: builtin/fsck.c:606
+#, fuzzy, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: objeto roto ou em falta: %s"
+
+#: builtin/fsck.c:619
+#, fuzzy, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: objeto incapaz de ser processado: %s"
+
+#: builtin/fsck.c:639
+#, fuzzy, c-format
+msgid "bad sha1 file: %s"
+msgstr "mau ficheiro sha1: %s"
+
+#: builtin/fsck.c:654
+#, fuzzy
+msgid "Checking object directory"
+msgstr "Verificando pasta objeto"
+
+#: builtin/fsck.c:657
 msgid "Checking object directories"
-msgstr "A verificar diretórios de objetos"
+msgstr "Verificando pastas objeto"
+
+#: builtin/fsck.c:672
+#, fuzzy, c-format
+msgid "Checking %s link"
+msgstr "Verfificando ligação %s"
+
+#: builtin/fsck.c:677 builtin/index-pack.c:864
+#, c-format
+msgid "invalid %s"
+msgstr "%s inválido"
+
+#: builtin/fsck.c:684
+#, fuzzy, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s aponta para algo estranho (%s)"
+
+#: builtin/fsck.c:690
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr ""
+
+#: builtin/fsck.c:694
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr ""
+
+#: builtin/fsck.c:706
+msgid "Checking cache tree"
+msgstr ""
+
+#: builtin/fsck.c:711
+#, fuzzy, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "Falha ao atualizar a árvore de cache principal"
+
+#: builtin/fsck.c:720
+msgid "non-tree in cache-tree"
+msgstr ""
 
-#: builtin/fsck.c:646
+#: builtin/fsck.c:751
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<opções>] [<objeto>...]"
 
-#: builtin/fsck.c:652
+#: builtin/fsck.c:757
 msgid "show unreachable objects"
 msgstr "mostrar objetos inalcançáveis"
 
-#: builtin/fsck.c:653
+#: builtin/fsck.c:758
 msgid "show dangling objects"
 msgstr "mostrar objetos suspensos"
 
-#: builtin/fsck.c:654
+#: builtin/fsck.c:759
 msgid "report tags"
 msgstr "mostrar tags"
 
-#: builtin/fsck.c:655
+#: builtin/fsck.c:760
 msgid "report root nodes"
 msgstr "mostrar nós raiz"
 
-#: builtin/fsck.c:656
+#: builtin/fsck.c:761
 msgid "make index objects head nodes"
 msgstr "considerar objetos do índice como nós cabeça"
 
-#: builtin/fsck.c:657
+#: builtin/fsck.c:762
 msgid "make reflogs head nodes (default)"
 msgstr "considerar os reflogs como nós cabeça (predefinição)"
 
-#: builtin/fsck.c:658
+#: builtin/fsck.c:763
 msgid "also consider packs and alternate objects"
 msgstr "considerar também pacotes e objetos sobressalente"
 
-#: builtin/fsck.c:659
+#: builtin/fsck.c:764
 msgid "check only connectivity"
 msgstr "verificar só a conetividade"
 
-#: builtin/fsck.c:660
+#: builtin/fsck.c:765 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "ativar verificação mais rigorosa"
 
-#: builtin/fsck.c:662
+#: builtin/fsck.c:767
 msgid "write dangling objects in .git/lost-found"
 msgstr "escrever objetos suspensos em .git/lost-found"
 
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:768 builtin/prune.c:134
 msgid "show progress"
 msgstr "mostrar progresso"
 
-#: builtin/fsck.c:664
+#: builtin/fsck.c:769
 msgid "show verbose names for reachable objects"
 msgstr "mostrar nomes verbosos de objetos inalcançáveis"
 
-#: builtin/fsck.c:725
+#: builtin/fsck.c:828 builtin/index-pack.c:262
 msgid "Checking objects"
-msgstr "A verificar objetos"
+msgstr "Verificando objetos"
+
+#: builtin/fsck.c:856
+#, fuzzy, c-format
+msgid "%s: object missing"
+msgstr "mostrar tamanho do objeto"
+
+#: builtin/fsck.c:867
+#, fuzzy, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "parâmetro inválido na mágica 'prefix' do especificador de caminho"
 
-#: builtin/gc.c:25
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<opções>]"
 
-#: builtin/gc.c:78
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "falha ao invocar fstat sobre %s: %s"
 
-#: builtin/gc.c:306
+#: builtin/gc.c:129
 #, c-format
-msgid "Can't stat %s"
-msgstr "não é possível invocar stat sobre %s"
+msgid "failed to parse '%s' value '%s'"
+msgstr ""
+
+#: builtin/gc.c:487 builtin/init-db.c:57
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "incapaz estatutar '%s'"
+
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
+#, c-format
+msgid "cannot read '%s'"
+msgstr "incapaz ler '%s'"
 
-#: builtin/gc.c:315
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -8370,321 +15872,524 @@ 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:354
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
-msgstr "eliminar ficheiros não referenciados"
+msgstr "podar objetos por referênciar"
 
-#: builtin/gc.c:356
+#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr "ser mais minucioso (aumenta o tempo de execução)"
 
-#: builtin/gc.c:357
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "ativar modo auto-gc"
 
-#: builtin/gc.c:358
+#: 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:375
-#, c-format
-msgid "Failed to parse gc.logexpiry value %s"
+#: builtin/gc.c:560
+msgid "repack all other packs except the largest pack"
+msgstr ""
+
+#: builtin/gc.c:576
+#, fuzzy, c-format
+msgid "failed to parse gc.logexpiry value %s"
 msgstr "falha ao analisar o valor %s de gc.logexpiry"
 
-#: builtin/gc.c:403
+#: builtin/gc.c:587
+#, fuzzy, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "falha ao analisar o valor %s de gc.logexpiry"
+
+#: builtin/gc.c:607
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr ""
-"A autocompactar o repositório em segundo plano para obter um melhor "
-"desempenho.\n"
+"Auto-empacotando repositório, em segundo plano, para desempenho otimizado.\n"
 
-#: builtin/gc.c:405
+#: builtin/gc.c:609
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
-msgstr "A autocompactar o repositório para obter um melhor desempenho.\n"
+msgstr "Auto-empacotando repositório para desempenho otimizado.\n"
 
-#: builtin/gc.c:406
+#: builtin/gc.c:610
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
-msgstr "Consulte \"git help gc\" para ler sobre manutenção manual.\n"
+msgstr "Vê \"git help gc\" para manual de manutenção.\n"
 
-#: builtin/gc.c:427
+#: 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:471
+#: 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/grep.c:25
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr ""
+
+#: builtin/gc.c:750
+#, fuzzy, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "argumento --schedule desconhecido: '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr ""
+
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr ""
+
+#: builtin/gc.c:1022
+#, fuzzy
+msgid "failed to start 'git pack-objects' process"
+msgstr "começar processo 'git pack-objects' falhou"
+
+#: builtin/gc.c:1039
+#, fuzzy
+msgid "failed to finish 'git pack-objects' process"
+msgstr "terminar processo 'git pack-objects' falhou"
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr ""
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr ""
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr ""
+
+#: builtin/gc.c:1179
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+
+#: builtin/gc.c:1283
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr ""
+
+#: builtin/gc.c:1313
+#, fuzzy, c-format
+msgid "task '%s' failed"
+msgstr "tarefa '%s' falhou"
+
+#: builtin/gc.c:1395
+#, fuzzy, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' é uma tarefa inválida"
+
+#: builtin/gc.c:1400
+#, fuzzy, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "tarefa '%s' apenas pode ser selecionada uma vez"
+
+#: builtin/gc.c:1415
+msgid "run tasks based on the state of the repository"
+msgstr ""
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr ""
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr ""
+
+#: builtin/gc.c:1420
+msgid "do not report progress or other information over stderr"
+msgstr ""
+
+#: builtin/gc.c:1421
+msgid "task"
+msgstr ""
+
+#: builtin/gc.c:1422
+#, fuzzy
+msgid "run a specific task"
+msgstr "corre uma tarefa específica"
+
+#: builtin/gc.c:1439
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+
+#: builtin/gc.c:1482
+#, fuzzy
+msgid "failed to run 'git config'"
+msgstr "falhou executar 'git config'"
+
+#: builtin/gc.c:1547
+#, fuzzy, c-format
+msgid "failed to expand path '%s'"
+msgstr "falha ao criar o caminho '%s'%s"
+
+#: builtin/gc.c:1576
+#, fuzzy
+msgid "failed to start launchctl"
+msgstr "Falha ao iniciar emacsclient."
+
+#: builtin/gc.c:1613
+#, fuzzy, c-format
+msgid "failed to create directories for '%s'"
+msgstr "falha ao criar o diretório '%s'"
+
+#: builtin/gc.c:1674
+#, fuzzy, 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: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:1896
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1900
+msgid "failed to open stdin of 'crontab'"
+msgstr ""
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr ""
+
+#: 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 ""
+
+#: builtin/gc.c:2010
+#, fuzzy
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git notes prune [<opções>]"
+
+#: builtin/gc.c:2029
+#, fuzzy, c-format
+msgid "invalid subcommand: %s"
+msgstr "commit 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:232
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: falha ao criar thread: %s"
 
-#: builtin/grep.c:290
+#: 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)"
 
-#: builtin/grep.c:769 builtin/grep.c:810
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: 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"
+
+#: 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:829
+#: 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:893
+#: 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:980
+#: 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:982
+#: 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 do git"
 
-#: builtin/grep.c:984
+#: 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:986
+#: builtin/grep.c:843
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorar ficheiros especificados via '.gitignore'"
 
-#: builtin/grep.c:988
+#: builtin/grep.c:845
 msgid "recursively search in each submodule"
 msgstr "procurar recursivamente em cada submódulo"
 
-#: builtin/grep.c:990
-msgid "basename"
-msgstr "nomebase"
-
-#: builtin/grep.c:991
-msgid "prepend parent project's basename to output"
-msgstr "preceder o nomebase do projeto pai na saída"
-
-#: builtin/grep.c:994
+#: builtin/grep.c:848
 msgid "show non-matching lines"
-msgstr "mostrar linhas não correspondidas"
+msgstr "mostrar linhas por corresponder"
 
-#: builtin/grep.c:996
+#: 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:998
+#: builtin/grep.c:852
 msgid "match patterns only at word boundaries"
 msgstr "corresponder padrões apenas a palavras"
 
-#: builtin/grep.c:1000
+#: builtin/grep.c:854
 msgid "process binary files as text"
 msgstr "processar ficheiros binários como texto"
 
-#: builtin/grep.c:1002
+#: builtin/grep.c:856
 msgid "don't match patterns in binary files"
 msgstr "ignorar ficheiros binários"
 
-#: builtin/grep.c:1005
+#: builtin/grep.c:859
 msgid "process binary files with textconv filters"
 msgstr "processar ficheiros binários com filtros textconv"
 
-#: builtin/grep.c:1007
+#: builtin/grep.c:861
+msgid "search in subdirectories (default)"
+msgstr ""
+
+#: builtin/grep.c:863
 msgid "descend at most <depth> levels"
 msgstr "descer no máximo até <profundidade>"
 
-#: builtin/grep.c:1011
+#: builtin/grep.c:867
 msgid "use extended POSIX regular expressions"
 msgstr "usar expressões regulares estendidas do POSIX"
 
-#: builtin/grep.c:1014
+#: 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:1017
+#: builtin/grep.c:873
 msgid "interpret patterns as fixed strings"
 msgstr "interpretar padrões como cadeias de caracteres fixas"
 
-#: builtin/grep.c:1020
+#: builtin/grep.c:876
 msgid "use Perl-compatible regular expressions"
 msgstr "usar expressões regulares compatíveis com Perl"
 
-#: builtin/grep.c:1023
+#: builtin/grep.c:879
 msgid "show line numbers"
 msgstr "mostrar números de linha"
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:880
+#, fuzzy
+msgid "show column number of first match"
+msgstr "mostrar apenas nomes de ficheiro sem correspondência"
+
+#: builtin/grep.c:881
 msgid "don't show filenames"
-msgstr "não mostrar nomes de ficheiro"
+msgstr "esconder nomes de ficheiro"
 
-#: builtin/grep.c:1025
+#: builtin/grep.c:882
 msgid "show filenames"
 msgstr "mostrar nomes de ficheiro"
 
-#: builtin/grep.c:1027
+#: builtin/grep.c:884
 msgid "show filenames relative to top directory"
 msgstr "mostrar nomes de ficheiro relativamente ao diretório superior"
 
-#: builtin/grep.c:1029
+#: 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:1031
+#: builtin/grep.c:888
 msgid "synonym for --files-with-matches"
 msgstr "sinónimo de --files-with-matches"
 
-#: builtin/grep.c:1034
+#: 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:1036
+#: builtin/grep.c:893
 msgid "print NUL after filenames"
 msgstr "imprimir NUL depois dos nomes de ficheiro"
 
-#: builtin/grep.c:1038
+#: builtin/grep.c:896
+#, fuzzy
+msgid "show only matching parts of a line"
+msgstr "mostrar apenas partes da linha correspondentes"
+
+#: 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:1039
+#: builtin/grep.c:899
 msgid "highlight matches"
 msgstr "realçar correspondências"
 
-#: builtin/grep.c:1041
+#: 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:1043
+#: 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:1046
+#: 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:1049
+#: builtin/grep.c:909
 msgid "show <n> context lines before matches"
 msgstr "mostrar <n> linhas de contexto antes das correspondências"
 
-#: builtin/grep.c:1051
+#: builtin/grep.c:911
 msgid "show <n> context lines after matches"
 msgstr "mostrar <n> linhas de contexto depois das correspondências"
 
-#: builtin/grep.c:1053
+#: builtin/grep.c:913
 msgid "use <n> worker threads"
 msgstr "usar <n> threads de trabalho"
 
-#: builtin/grep.c:1054
+#: builtin/grep.c:914
 msgid "shortcut for -C NUM"
 msgstr "atalho para -C NUM"
 
-#: builtin/grep.c:1057
+#: 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:1059
+#: builtin/grep.c:919
 msgid "show the surrounding function"
 msgstr "mostrar a função circundante"
 
-#: builtin/grep.c:1062
+#: builtin/grep.c:922
 msgid "read patterns from file"
 msgstr "ler padrões do ficheiro"
 
-#: builtin/grep.c:1064
+#: builtin/grep.c:924
 msgid "match <pattern>"
 msgstr "procurar <padrão>"
 
-#: builtin/grep.c:1066
+#: builtin/grep.c:926
 msgid "combine patterns specified with -e"
 msgstr "combinar padrões especificados com -e"
 
-#: builtin/grep.c:1078
+#: 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:1080
+#: 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:1082
-msgid "show parse tree for grep expression"
-msgstr "mostrar árvore de analise da expressões grep"
-
-#: builtin/grep.c:1086
+#: builtin/grep.c:943
 msgid "pager"
 msgstr "paginador"
 
-#: builtin/grep.c:1086
+#: builtin/grep.c:943
 msgid "show matching files in the pager"
 msgstr "mostrar ficheiros com correspondências no paginador"
 
-#: builtin/grep.c:1089
+#: 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:1153
-msgid "no pattern given."
-msgstr "nenhum padrão fornecido."
+#: builtin/grep.c:1013
+#, fuzzy
+msgid "no pattern given"
+msgstr "fornecido pattern nenhum"
 
-#: builtin/grep.c:1189
+#: 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:1195
+#: 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:1087
+#, fuzzy
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked insustentada com --recurse-submodules"
+
+#: builtin/grep.c:1091
+msgid "invalid option combination, ignoring --threads"
+msgstr ""
+
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+#, fuzzy
+msgid "no threads support, ignoring --threads"
+msgstr "sem suporte de threads, %s ignorado"
 
-#: builtin/grep.c:1228 builtin/index-pack.c:1485
+#: 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:1251
+#: 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"
 
-#: builtin/grep.c:1274
-msgid "option not supported with --recurse-submodules."
-msgstr "opção não suportada com --recurse-submodules."
+#: builtin/grep.c:1157
+#, fuzzy
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached ou --untracked proibidos serem usados com --no-index"
 
-#: builtin/grep.c:1280
-msgid "--cached or --untracked cannot be used with --no-index."
-msgstr "--cached ou --untracked não podem ser usados com --no-index."
+#: builtin/grep.c:1160
+#, fuzzy
+msgid "--untracked cannot be used with --cached"
+msgstr "--cached ou --untracked proibidos serem usados com --no-index"
 
-#: builtin/grep.c:1286
-msgid "--[no-]exclude-standard cannot be used for tracked contents."
+#: builtin/grep.c:1166
+#, fuzzy
+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:1294
-msgid "both --cached and trees are given."
+#: builtin/grep.c:1174
+#, fuzzy
+msgid "both --cached and trees are given"
 msgstr "--cached e árvores foram fornecidos simultaneamente."
 
-#: builtin/hash-object.c:81
+#: builtin/hash-object.c:85
 msgid ""
 "git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
 "[--] <file>..."
@@ -8692,545 +16397,536 @@ msgstr ""
 "git hash-object [-t <tipo>] [-w] [--path=<ficheiro> | --no-filters] [--"
 "stdin] [--] <ficheiro>..."
 
-#: builtin/hash-object.c:82
+#: builtin/hash-object.c:86
 msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
-#: builtin/hash-object.c:94
-msgid "type"
-msgstr "tipo"
-
-#: builtin/hash-object.c:94
+#: builtin/hash-object.c:98
 msgid "object type"
 msgstr "tipo do objeto"
 
-#: builtin/hash-object.c:95
+#: 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:97
+#: builtin/hash-object.c:101
 msgid "read the object from stdin"
 msgstr "ler o objeto da entrada padrão"
 
-#: builtin/hash-object.c:99
+#: builtin/hash-object.c:103
 msgid "store file as is without filters"
 msgstr "guardar o ficheiro tal como está, sem filtros"
 
-#: builtin/hash-object.c:100
+#: builtin/hash-object.c:104
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
 msgstr ""
 "obter hash de lixo aleatório para criar objetos corrompidos para depurar o "
 "Git"
 
-#: builtin/hash-object.c:101
+#: builtin/hash-object.c:105
 msgid "process file as it were from this path"
 msgstr "processar o ficheiro como se este fosse do caminho indicado"
 
-#: builtin/help.c:42
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "imprimir todos os comandos disponíveis"
 
-#: builtin/help.c:43
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "excluir guias"
 
-#: builtin/help.c:44
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr "imprimir lista de guias úteis"
 
-#: builtin/help.c:45
+#: builtin/help.c:50
+#, fuzzy
+msgid "print all configuration variable names"
+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:46
+#: 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:48
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "mostrar página info"
 
-#: builtin/help.c:54
+#: builtin/help.c:57
+#, fuzzy
+msgid "print command description"
+msgstr "imprimir descrição de 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:66
+#: 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:93
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "Falha ao iniciar emacsclient."
 
-#: builtin/help.c:106
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "Falha ao analisar a versão do emacsclient."
 
-#: builtin/help.c:114
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "a versão do emacsclient '%d' é demasiado antiga (< 22)."
 
-#: builtin/help.c:132 builtin/help.c:153 builtin/help.c:162 builtin/help.c:170
+#: 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:207
+#: builtin/help.c:307
 #, c-format
 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:219
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr ""
-"'%s': comando de visualizador de manual suportado.\n"
-"Considere usar 'man.<ferramenta>.path'."
+"'%s': comando para visualizador de man.\n"
+"Considera usar 'man.<ferramenta>.path' invés."
 
-#: builtin/help.c:336
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s': visualizador de manual desconhecido."
 
-#: builtin/help.c:353
+#: builtin/help.c:452
 msgid "no man viewer handled the request"
-msgstr "nenhum visualizador de manual atendeu o pedido"
+msgstr "atendeu ao pedido visualizador de man nenhum"
 
-#: builtin/help.c:361
+#: builtin/help.c:459
 msgid "no info viewer handled the request"
-msgstr "nenhum visualizador de info atendeu o pedido"
-
-#: builtin/help.c:403
-msgid "Defining attributes per path"
-msgstr "Definir atributos por caminho"
-
-#: builtin/help.c:404
-msgid "Everyday Git With 20 Commands Or So"
-msgstr "Diário Git com mais ou menos 20 Comandos"
-
-#: builtin/help.c:405
-msgid "A Git glossary"
-msgstr "Um Glossário do Git"
-
-#: builtin/help.c:406
-msgid "Specifies intentionally untracked files to ignore"
-msgstr ""
-"Especificar ficheiros não controlados para serem intencionalmente ignorados"
-
-#: builtin/help.c:407
-msgid "Defining submodule properties"
-msgstr "Definir propriedades de submódulos"
-
-#: builtin/help.c:408
-msgid "Specifying revisions and ranges for Git"
-msgstr "Especificar revisões e intervalos do Git"
-
-#: builtin/help.c:409
-msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
-msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
-
-#: builtin/help.c:410
-msgid "An overview of recommended workflows with Git"
-msgstr "Uma descrição geral dos fluxos de trabalho recomendados para o Git"
-
-#: builtin/help.c:422
-msgid "The common Git guides are:\n"
-msgstr "Os guias comuns do Git:\n"
+msgstr "atendeu ao pedido visualizador de info nenhum"
 
-#: builtin/help.c:440
-#, c-format
-msgid "`git %s' is aliased to `%s'"
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#, fuzzy, c-format
+msgid "'%s' is aliased to '%s'"
 msgstr "'git %s' é um alias de '%s'"
 
-#: builtin/help.c:462 builtin/help.c:479
+#: builtin/help.c:531 git.c:380
+#, fuzzy, c-format
+msgid "bad alias.%s string: %s"
+msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
+
+#: builtin/help.c:561 builtin/help.c:591
 #, c-format
 msgid "usage: %s%s"
 msgstr "utilização: %s%s"
 
-#: builtin/index-pack.c:154
-#, c-format
-msgid "unable to open %s"
-msgstr "não foi possível abrir %s"
+#: builtin/help.c:575
+msgid "'git help config' for more information"
+msgstr ""
 
-#: builtin/index-pack.c:204
+#: 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:224
+#: 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:227
+#: 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:269
+#: 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:279
+#: builtin/index-pack.c:305
 msgid "early EOF"
-msgstr "fim de ficheiro (EOF) prematuro"
+msgstr "EOF prematuro"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:306
 msgid "read error on input"
 msgstr "erro de leitura da entrada"
 
-#: builtin/index-pack.c:292
+#: 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:299
+#: 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:302 builtin/unpack-objects.c:92
+#: 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:317
+#: 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:323
+#: 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:337
+#: 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:339
+#: 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:357
+#: 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"
 
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:487
 #, c-format
 msgid "inflate returned %d"
 msgstr "a descompactação retornou %d"
 
-#: builtin/index-pack.c:528
+#: 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:536
+#: 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:544
+#: 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:575
+#: 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:577
+#: 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:603
+#: builtin/index-pack.c:611
 msgid "serious inflate inconsistency"
 msgstr "inconsistência de descompactação grave"
 
-#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: 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:752 builtin/pack-objects.c:164
-#: builtin/pack-objects.c:257
+#: 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:814
+#: 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:822
+#: 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:836
+#: builtin/index-pack.c:845
 #, c-format
 msgid "invalid blob object %s"
 msgstr "objeto blob inválido %s"
 
-#: builtin/index-pack.c:850
-#, c-format
-msgid "invalid %s"
-msgstr "inválido %s"
-
-#: builtin/index-pack.c:853
-msgid "Error in object"
-msgstr "Erro no objeto"
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
+msgid "fsck error in packed object"
+msgstr ""
 
-#: builtin/index-pack.c:855
+#: 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:927 builtin/index-pack.c:958
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
 msgid "failed to apply delta"
 msgstr "falha ao aplicar delta"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1160
 msgid "Receiving objects"
 msgstr "A receber objetos"
 
-#: builtin/index-pack.c:1128
+#: builtin/index-pack.c:1160
 msgid "Indexing objects"
 msgstr "A indexar objetos"
 
-#: builtin/index-pack.c:1160
+#: 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:1165
+#: 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:1168
+#: builtin/index-pack.c:1202
 msgid "pack has junk at the end"
 msgstr "pacote com lixo no final"
 
-#: builtin/index-pack.c:1179
+#: 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:1202
+#: builtin/index-pack.c:1237
 msgid "Resolving deltas"
 msgstr "A resolver deltas"
 
-#: builtin/index-pack.c:1213
+#: 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 thread: %s"
 
-#: builtin/index-pack.c:1255
+#: builtin/index-pack.c:1281
 msgid "confusion beyond insanity"
 msgstr "extrema confusão"
 
-#: builtin/index-pack.c:1261
+#: 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:1273
+#: 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:1277
+#: 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:1301
+#: 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:1377
+#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
-msgstr "objeto local %s corrompido"
+msgstr ""
 
-#: builtin/index-pack.c:1403
-msgid "error while closing pack file"
-msgstr "erro ao fechar ficheiro de pacote"
+#: builtin/index-pack.c:1444
+#, fuzzy, c-format
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "ao nome de ficheiro de pacote '%s' falta terminar em '.pack'"
 
-#: builtin/index-pack.c:1415
-#, c-format
-msgid "cannot write keep file '%s'"
-msgstr "não é possível escrever o ficheiro de conservação '%s'"
+#: builtin/index-pack.c:1468
+#, fuzzy, c-format
+msgid "cannot write %s file '%s'"
+msgstr "incapaz escrever ficheiro %s '%s'"
 
-#: builtin/index-pack.c:1423
-#, c-format
-msgid "cannot close written keep file '%s'"
-msgstr "não é possível fechar o ficheiro de conservação '%s' escrito"
+#: builtin/index-pack.c:1476
+#, fuzzy, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "incapaz fechar ficheiro %s gravado '%s'"
+
+#: builtin/index-pack.c:1502
+msgid "error while closing pack file"
+msgstr ""
 
-#: builtin/index-pack.c:1433
+#: 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:1441
+#: builtin/index-pack.c:1524
 msgid "cannot store index file"
-msgstr "não é possível guardar o ficheiro índice"
+msgstr "incapaz guardar ficheiro index"
 
-#: builtin/index-pack.c:1479
+#: 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:1489 builtin/index-pack.c:1686
-#, c-format
-msgid "no threads support, ignoring %s"
-msgstr "sem suporte de threads, %s ignorado"
-
-#: builtin/index-pack.c:1547
+#: builtin/index-pack.c:1649
 #, c-format
 msgid "Cannot open existing pack file '%s'"
-msgstr "Não é possível abrir o ficheiro de pacote '%s' existente"
+msgstr "Incapaz abrir ficheiro pack existente '%s'"
 
-#: builtin/index-pack.c:1549
+#: builtin/index-pack.c:1651
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
-msgstr "Não é possível abrir o ficheiro de índice do pacote existente de '%s'"
+msgstr "Incapaz abrir ficheiro idx existente para '%s'"
 
-#: builtin/index-pack.c:1596
+#: 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:1603
+#: 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:1616
-#, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "o nome do ficheiro de pacote '%s' não termina em '.pack'"
+#: builtin/index-pack.c:1748
+msgid "Cannot come back to cwd"
+msgstr "Incapaz voltar a cwd"
 
-#: builtin/index-pack.c:1698 builtin/index-pack.c:1701
-#: builtin/index-pack.c:1717 builtin/index-pack.c:1721
+#: 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 "%s incorreto"
 
-#: builtin/index-pack.c:1737
+#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr ""
+
+#: 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 requer ser usado com --stdin"
 
-#: builtin/index-pack.c:1739
+#: builtin/index-pack.c:1852
 msgid "--stdin requires a git repository"
 msgstr "--stdin requer um repositório git"
 
-#: builtin/index-pack.c:1747
+#: builtin/index-pack.c:1854
+#, fuzzy
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format incapaz ser usado com --stdin"
+
+#: builtin/index-pack.c:1869
 msgid "--verify with no packfile name given"
 msgstr "--verify sem nome do ficheiro de pacote indicado"
 
-#: builtin/init-db.c:54
-#, c-format
-msgid "cannot stat '%s'"
-msgstr "não é possível invocar stat sobre '%s'"
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+#, fuzzy
+msgid "fsck error in pack objects"
+msgstr "erro no objeto: %s"
 
-#: builtin/init-db.c:60
+#: 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:65
+#: 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:76
+#: 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:78
+#: 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:84
+#: 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:88
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
-msgstr "modelo %s ignorado"
+msgstr "ignorando modelo %s"
 
-#: builtin/init-db.c:119
-#, c-format
-msgid "templates not found %s"
-msgstr "modelos não encontrados em %s"
+#: builtin/init-db.c:123
+#, fuzzy, c-format
+msgid "templates not found in %s"
+msgstr "modelos em %s por encontrar"
 
-#: builtin/init-db.c:134
+#: 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:327
+#: builtin/init-db.c:263
+#, fuzzy, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "Nome de ramo inicial inválido: '%s'"
+
+#: 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:330
+#: 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:373
+msgid "attempt to reinitialize repository with different hash"
+msgstr ""
 
-#: builtin/init-db.c:347 builtin/init-db.c:350
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s já existe"
 
-#: builtin/init-db.c:403
+#: builtin/init-db.c:432
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr ""
+
+#: builtin/init-db.c:463
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
-msgstr "Repositório Git partilhado e existente reinicializado em %s%s\n"
+msgstr "Reiniciei respositório partilhado existente de Git em %s%s\n"
 
-#: builtin/init-db.c:404
+#: builtin/init-db.c:464
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
-msgstr "Repositório Git existem reinicializado em %s%s\n"
+msgstr "Reiniciei repositório existente de Git em %s%s\n"
 
-#: builtin/init-db.c:408
+#: builtin/init-db.c:468
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
-msgstr "Repositório Git vazio e partilhado inicializado em %s%s\n"
+msgstr "Iniciei repositório vazio partilhado de Git em %s%s\n"
 
-#: builtin/init-db.c:409
+#: builtin/init-db.c:469
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
-msgstr "Repositório Git vazio inicializado em %s%s\n"
+msgstr "Iniciei repositório vazio de Git em %s%s\n"
 
-#: builtin/init-db.c:457
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -9238,40 +16934,62 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<diretório-modelo>] [--"
 "shared[=<permissões>]] [<diretório>]"
 
-#: builtin/init-db.c:480
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "permissões"
 
-#: builtin/init-db.c:481
+#: 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:515 builtin/init-db.c:520
+#: builtin/init-db.c:551
+#, fuzzy
+msgid "override the name of the initial branch"
+msgstr "substituir o bit executável dos ficheiros listados"
+
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr ""
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr ""
+
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
-msgstr "não é possível criar o diretório %s"
+msgstr "incapaz mkdir %s"
 
-#: builtin/init-db.c:524
+#: 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:545
+#: 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:573
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
-msgstr "Não é possível aceder à árvore de trabalho '%s'"
+msgstr "Incapaz aceder work tree '%s'"
+
+#: builtin/init-db.c:684
+#, fuzzy
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir incompatível com repositório nú"
 
-#: builtin/interpret-trailers.c:15
+#: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<value>])...] [<file>...]"
@@ -9279,465 +16997,620 @@ msgstr ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
 "<token>[(=|:)<valor>])...] [<ficheiro>...]"
 
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "editar ficheiros no local"
 
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "cortar terminadores vazios"
 
-#: builtin/interpret-trailers.c:28
-msgid "trailer"
-msgstr "terminador"
+#: 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."
+
+#: builtin/interpret-trailers.c:103
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+#, fuzzy
+msgid "output only the trailers"
+msgstr "cortar terminadores vazios"
+
+#: builtin/interpret-trailers.c:106
+#, fuzzy
+msgid "do not apply config rules"
+msgstr "pesquisar variáveis de configuração"
+
+#: builtin/interpret-trailers.c:107
+msgid "join whitespace-continued values"
+msgstr ""
 
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
+#, fuzzy
+msgid "set parsing options"
+msgstr "Opções de integração"
+
+#: builtin/interpret-trailers.c:110
+msgid "do not treat --- specially"
+msgstr ""
+
+#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "terminadores a adicionar"
 
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:123
+#, fuzzy
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer com --only-input faz sentido nenhum"
+
+#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
-msgstr "nenhum ficheiro de entrada fornecido para edição no local"
+msgstr "fornecido para edição in-place, ficheiro de entrada nenhum"
 
-#: builtin/log.c:44
+#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<opções>] [<intervalo-de-revisões>] [[--] <caminho>...]"
 
-#: builtin/log.c:45
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [<opções>] <objeto>..."
 
-#: builtin/log.c:89
+#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "opção --decorate inválida: %s"
 
-#: builtin/log.c:144
-msgid "suppress diff output"
-msgstr "suprimir saída do diff"
-
-#: builtin/log.c:145
+#: builtin/log.c:180
 msgid "show source"
 msgstr "mostrar origem"
 
-#: builtin/log.c:146
-msgid "Use mail map file"
+#: builtin/log.c:181
+#, fuzzy
+msgid "use mail map file"
 msgstr "usar ficheiro de mapeamento de correio"
 
-#: builtin/log.c:147
+#: builtin/log.c:184
+#, fuzzy
+msgid "only decorate refs that match <pattern>"
+msgstr "usar apenas referência que correspondam ao <padrão>"
+
+#: builtin/log.c:186
+#, fuzzy
+msgid "do not decorate refs that match <pattern>"
+msgstr "deixar por decorar refs correspondentes a <padrão>"
+
+#: builtin/log.c:187
 msgid "decorate options"
 msgstr "opções de decoração"
 
-#: builtin/log.c:150
-msgid "Process line range n,m in file, counting from 1"
-msgstr "processar intervalo de linhas n,m, a contar a partir de 1"
+#: builtin/log.c:190
+#, fuzzy
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr "Processar apenas o intervalo de linhas n,m, a cantar de 1"
+
+#: builtin/log.c:213
+#, fuzzy
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<alcance>:<ficheiro>incapaz ser usado com especificador de path"
 
-#: builtin/log.c:246
+#: 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:493
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ficheiro incorreto"
 
-#: builtin/log.c:507 builtin/log.c:601
-#, c-format
-msgid "Could not read object %s"
-msgstr "Não foi possível ler o objeto %s"
+#: builtin/log.c:586 builtin/log.c:676
+#, fuzzy, c-format
+msgid "could not read object %s"
+msgstr "incapaz ler objeto %s"
 
-#: builtin/log.c:625
-#, c-format
-msgid "Unknown type: %d"
+#: builtin/log.c:701
+#, fuzzy, c-format
+msgid "unknown type: %d"
 msgstr "Tipo desconhecido: %d"
 
-#: builtin/log.c:746
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr ""
+
+#: builtin/log.c:853
 msgid "format.headers without value"
 msgstr "format.headers sem valor"
 
-#: builtin/log.c:846
-msgid "name of output directory is too long"
-msgstr "o nome do diretório de saída é demasiado longo"
+#: builtin/log.c:982
+#, fuzzy, c-format
+msgid "cannot open patch file %s"
+msgstr "incapaz abrir ficheiro patch %s"
 
-#: builtin/log.c:861
-#, c-format
-msgid "Cannot open patch file %s"
-msgstr "Não é possível abrir o ficheiro de patch %s"
-
-#: builtin/log.c:875
-msgid "Need exactly one range."
-msgstr "É necessário exatamente um intervalo."
+#: builtin/log.c:999
+msgid "need exactly one range"
+msgstr ""
 
-#: builtin/log.c:885
-msgid "Not a range."
-msgstr "Não é um intervalo."
+#: builtin/log.c:1009
+#, fuzzy
+msgid "not a range"
+msgstr "é intervalo nenhum"
 
-#: builtin/log.c:991
-msgid "Cover letter needs email format"
+#: builtin/log.c:1173
+#, fuzzy
+msgid "cover letter needs email format"
 msgstr "A carta de apresentação precisa de um formato de e-mail"
 
-#: builtin/log.c:1071
+#: builtin/log.c:1179
+msgid "failed to create cover-letter file"
+msgstr ""
+
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to incorreto: %s"
 
-#: builtin/log.c:1098
+#: 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:1148
-msgid "Two output directories?"
+#: builtin/log.c:1351
+#, fuzzy
+msgid "two output directories?"
 msgstr "Dois diretórios de saída?"
 
-#: builtin/log.c:1255 builtin/log.c:1898 builtin/log.c:1900 builtin/log.c:1912
-#, c-format
-msgid "Unknown commit %s"
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#, fuzzy, c-format
+msgid "unknown commit %s"
 msgstr "Commit desconhecido %s"
 
-#: builtin/log.c:1265 builtin/notes.c:883 builtin/tag.c:532
-#, c-format
-msgid "Failed to resolve '%s' as a valid ref."
-msgstr "Falha ao resolver '%s' numa referência válida."
+#: builtin/log.c:1513 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/replace.c:210
+#, fuzzy, c-format
+msgid "failed to resolve '%s' as a valid ref"
+msgstr "falha ao resolver '%s' como uma referência válida."
 
-#: builtin/log.c:1270
-msgid "Could not find exact merge base."
-msgstr "Não foi possível encontrar a base exata de integração."
+#: builtin/log.c:1522
+#, fuzzy
+msgid "could not find exact merge base"
+msgstr "incapaz encontrar a exata base de junção."
 
-#: builtin/log.c:1274
+#: builtin/log.c:1532
+#, fuzzy
 msgid ""
-"Failed to get upstream, if you want to record base commit automatically,\n"
+"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."
+"Or you could specify base commit by --base=<base-commit-id> manually"
 msgstr ""
 "Falha ao obter ramo a montante, se quer gravar o commit base "
 "automaticamente,\n"
 "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:1294
-msgid "Failed to find exact merge base"
+#: builtin/log.c:1555
+#, fuzzy
+msgid "failed to find exact merge base"
 msgstr "Falha ao procurar base exata de integração"
 
-#: builtin/log.c:1305
+#: 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:1309
+#: 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:1358
+#: 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:1703
+#, fuzzy
+msgid "failed to infer range-diff origin of current series"
+msgstr "falha ao guardar ligação à referência de notas atual (%s)"
 
-#: builtin/log.c:1415
+#: builtin/log.c:1705
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr ""
+
+#: 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:1418
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr "usar [PATCH] mesmo com múltiplos patches"
 
-#: builtin/log.c:1422
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "imprimir patches para a saída padrão"
 
-#: builtin/log.c:1424
+#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr "gerar uma carta de apresentação"
 
-#: builtin/log.c:1426
+#: 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:1427
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1428
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr "usar <sfx> em vez de '.patch'"
 
-#: builtin/log.c:1430
+#: 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:1432
+#: 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:1434
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/log.c:1768
+#, fuzzy
+msgid "max length of output filename"
+msgstr "tamanho máximo de cada ficheiro de pacote gerado"
+
+#: builtin/log.c:1770
+#, fuzzy
+msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "Usar [RFC PATCH] em vez de [PATCH]"
 
-#: builtin/log.c:1437
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr ""
+
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+
+#: builtin/log.c:1776
+#, fuzzy
+msgid "use [<prefix>] instead of [PATCH]"
 msgstr "usar [<prefixo>] em vez de [PATCH]"
 
-#: builtin/log.c:1440
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "guardar os ficheiros resultantes em <dir>"
 
-#: builtin/log.c:1443
+#: 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:1446
+#: 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:1448
+#: 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:1450
+#: 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:1452
+#: 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:1454
+#: builtin/log.c:1793
 msgid "Messaging"
 msgstr "Mensagem"
 
-#: builtin/log.c:1455
+#: builtin/log.c:1794
 msgid "header"
 msgstr "cabeçalho"
 
-#: builtin/log.c:1456
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "adicionar cabeçalho de e-mail"
 
-#: builtin/log.c:1457 builtin/log.c:1459
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "e-mail"
 
-#: builtin/log.c:1457
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "adicionar cabeçalho To:"
 
-#: builtin/log.c:1459
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "adicionar cabeçalho Cc:"
 
-#: builtin/log.c:1461
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "identidade"
 
-#: builtin/log.c:1462
+#: 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:1464
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "id-mensagem"
 
-#: builtin/log.c:1465
+#: 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:1466 builtin/log.c:1469
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "limite"
 
-#: builtin/log.c:1467
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "anexar o patch"
 
-#: builtin/log.c:1470
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "incorporar o patch"
 
-#: builtin/log.c:1474
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr "ativar mensagens por tópicos, estilos: shallow (raso), deep (profundo)"
 
-#: builtin/log.c:1476
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "assinatura"
 
-#: builtin/log.c:1477
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "adicionar uma assinatura"
 
-#: builtin/log.c:1478
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "commit-base"
 
-#: builtin/log.c:1479
+#: 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:1481
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "adicionar uma assinatura de um ficheiro"
 
-#: builtin/log.c:1482
+#: 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:1572
-msgid "-n and -k are mutually exclusive."
+#: builtin/log.c:1822
+#, fuzzy
+msgid "show progress while generating patches"
+msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
+
+#: builtin/log.c:1824
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1827
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+
+#: builtin/log.c:1829 builtin/range-diff.c:28
+msgid "percentage by which creation is weighted"
+msgstr ""
+
+#: builtin/log.c:1916
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "linha de indentação inválida: %s"
+
+#: builtin/log.c:1931
+#, fuzzy
+msgid "-n and -k are mutually exclusive"
 msgstr "-n e -k são mutuamente exclusivos."
 
-#: builtin/log.c:1574
-msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+#: builtin/log.c:1933
+#, fuzzy
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc e -k são mutuamente exclusivos."
 
-#: builtin/log.c:1582
+#: 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:1584
+#: 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:1586
+#: builtin/log.c:1945
 msgid "--check does not make sense"
-msgstr "--check não faz sentido"
+msgstr "--check faz sentido nenhum"
+
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr ""
+
+#: builtin/log.c:2089
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr ""
+
+#: builtin/log.c:2093
+msgid "Interdiff:"
+msgstr ""
+
+#: builtin/log.c:2094
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr ""
+
+#: builtin/log.c:2100
+msgid "--creation-factor requires --range-diff"
+msgstr ""
+
+#: builtin/log.c:2104
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr ""
 
-#: builtin/log.c:1616
-msgid "standard output, or directory, which one?"
-msgstr "saída padrão, ou diretório, qual deles?"
+#: builtin/log.c:2112
+msgid "Range-diff:"
+msgstr ""
 
-#: builtin/log.c:1618
+#: builtin/log.c:2113
 #, c-format
-msgid "Could not create directory '%s'"
-msgstr "Não foi possível criar o diretório '%s'"
+msgid "Range-diff against v%d:"
+msgstr ""
 
-#: builtin/log.c:1712
+#: 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:1784
-msgid "Failed to create output files"
-msgstr "Falha ao criar os ficheiros de saída"
+#: builtin/log.c:2160
+#, fuzzy
+msgid "Generating patches"
+msgstr "falha ao editar patch"
 
-#: builtin/log.c:1833
+#: builtin/log.c:2204
+msgid "failed to create output files"
+msgstr ""
+
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<ramo-a-montante> [<head> [<limite>]]]"
 
-#: builtin/log.c:1887
+#: 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:461
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<opções>] [<ficheiro>...]"
 
-#: builtin/ls-files.c:510
+#: builtin/ls-files.c:619
 msgid "identify the file status with tags"
 msgstr "identificar o estado do ficheiro com tags"
 
-#: builtin/ls-files.c:512
+#: 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:514
+#: builtin/ls-files.c:623
+#, fuzzy
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "usar letras minúsculas para ficheiros 'fsmonitor clean'"
+
+#: 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:516
+#: builtin/ls-files.c:627
 msgid "show deleted files in the output"
 msgstr "mostrar ficheiros eliminados na saída"
 
-#: builtin/ls-files.c:518
+#: builtin/ls-files.c:629
 msgid "show modified files in the output"
 msgstr "mostrar ficheiros modificados na saída"
 
-#: builtin/ls-files.c:520
+#: builtin/ls-files.c:631
 msgid "show other files in the output"
 msgstr "mostrar outros ficheiros na saída"
 
-#: builtin/ls-files.c:522
+#: builtin/ls-files.c:633
 msgid "show ignored files in the output"
 msgstr "mostrar ficheiros ignorados na saída"
 
-#: builtin/ls-files.c:525
+#: 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:527
+#: 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:529
+#: builtin/ls-files.c:640
 msgid "show 'other' directories' names only"
 msgstr "mostrar nomes de diretórios 'other' (outro)"
 
-#: builtin/ls-files.c:531
+#: builtin/ls-files.c:642
 msgid "show line endings of files"
 msgstr "mostrar finais de linha dos ficheiros"
 
-#: builtin/ls-files.c:533
+#: 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:536
+#: 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:538
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr "mostrar informação de resolver-desfazer"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:651
 msgid "skip files matching pattern"
 msgstr "ignorar ficheiros que correspondam ao padrão"
 
-#: builtin/ls-files.c:543
+#: 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:546
+#: 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:548
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
 msgstr "incluir as exclusões standard do git"
 
-#: builtin/ls-files.c:551
+#: 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"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
-msgstr "percorrer submódulos recursivamente"
+msgstr "percorrer recursivamente submódulos"
 
-#: builtin/ls-files.c:556
+#: 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:557
+#: builtin/ls-files.c:669
 msgid "tree-ish"
 msgstr "árvore-etc"
 
-#: builtin/ls-files.c:558
+#: 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:560
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr "mostrar dados de depuração"
 
-#: builtin/ls-remote.c:7
+#: builtin/ls-files.c:674
+#, fuzzy
+msgid "suppress duplicate entries"
+msgstr "suprimir a cadeias de caracteres de nomes"
+
+#: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
@@ -9747,739 +17620,874 @@ msgstr ""
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<repositório> [<referências>...]]"
 
-#: builtin/ls-remote.c:52
+#: 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:53 builtin/ls-remote.c:55
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
 msgid "exec"
 msgstr "exec"
 
-#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
+#: 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"
 
-#: builtin/ls-remote.c:58
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "restringir-se a tags"
 
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "restringir-se a cabeças"
 
-#: builtin/ls-remote.c:60
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
-msgstr "não mostrar tags descascadas"
+msgstr "mostrar nenhumas tags descascadas"
 
-#: builtin/ls-remote.c:62
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "ter url.<base>.insteadOf em conta"
 
-#: builtin/ls-remote.c:64
+#: 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:66
+#: 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:28
+#: builtin/ls-tree.c:30
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
 msgstr "git ls-tree [<opções>] <árvore-etc> [<caminho>...]"
 
-#: builtin/ls-tree.c:126
+#: builtin/ls-tree.c:128
 msgid "only show trees"
 msgstr "mostrar apenas árvores"
 
-#: builtin/ls-tree.c:128
+#: builtin/ls-tree.c:130
 msgid "recurse into subtrees"
 msgstr "percorrer as subárvores recursivamente"
 
-#: builtin/ls-tree.c:130
+#: builtin/ls-tree.c:132
 msgid "show trees when recursing"
 msgstr "mostrar árvores ao percorrer"
 
-#: builtin/ls-tree.c:133
+#: builtin/ls-tree.c:135
 msgid "terminate entries with NUL byte"
 msgstr "terminar entradas com o byte NUL"
 
-#: builtin/ls-tree.c:134
+#: builtin/ls-tree.c:136
 msgid "include object size"
 msgstr "incluir dimensão dos objetos"
 
-#: builtin/ls-tree.c:136 builtin/ls-tree.c:138
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
 msgid "list only filenames"
 msgstr "listar apenas os nomes de ficheiro"
 
-#: builtin/ls-tree.c:141
+#: builtin/ls-tree.c:143
 msgid "use full path names"
 msgstr "usar nomes de caminho completos"
 
-#: builtin/ls-tree.c:143
+#: 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; e para além do diretório atual (implica --full-name)"
 
-#: builtin/merge.c:46
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<opções>] [<commit>...]"
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+#, fuzzy
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git merge [<opções>] <msg> HEAD <commit>"
+
+#: builtin/mailinfo.c:58
+#, fuzzy
+msgid "keep subject"
+msgstr "manter assunto"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr ""
+
+#: builtin/mailinfo.c:62
+#, fuzzy
+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
+#, fuzzy
+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
+msgid "empty mbox: '%s'"
+msgstr ""
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <commit> <commit>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <commit>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <commit>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <commit> <commit>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <referência> [<commit>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+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"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+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 outro?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr ""
+"descobrir onde foi que o <commit> divergiu usando o reflog da <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 [<opções>] [-L <nome1> [-L <orig> [-L <nome2>]]] <ficheiro1> "
+"<ficheiro-orig> <ficheiro2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "enviar resultados para a saída padrão"
 
-#: builtin/merge.c:47
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "usar integração baseada em diff3"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "usar a nossa versão em caso de conflito"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "usar a versão deles em caso de conflito"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "usar a união das versões em caso de conflito"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "usar este comprimento de marcador para os conflitos"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "deixar de alertar sobre conflitos"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "definir identificares para ficheiro1/ficheiro-orig/ficheiro2"
 
-#: builtin/merge.c:48
-msgid "git merge --continue"
-msgstr "git merge --continue"
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr ""
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "incapaz processar objeto '%s'"
 
-#: builtin/merge.c:103
+#: 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] "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 "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 "incapaz resolver ref '%s'"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Juntando %s com %s\n"
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opções>] [<commit>...]"
+
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
 msgstr "a opção 'm' requer um valor"
 
-#: builtin/merge.c:140
+#: builtin/merge.c:146
+#, fuzzy, c-format
+msgid "option `%s' requires a value"
+msgstr "a opção '%s' requer um valor"
+
+#: 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:141
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr "Estratégias disponíveis:"
 
-#: builtin/merge.c:146
+#: builtin/merge.c:205
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Estratégias personalizadas disponíveis:"
 
-#: builtin/merge.c:196 builtin/pull.c:127
+#: 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:199 builtin/pull.c:130
+#: 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:200 builtin/pull.c:133
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(sinónimo de --stat)"
 
-#: builtin/merge.c:202 builtin/pull.c:136
+#: 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:205 builtin/pull.c:139
+#: 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:207 builtin/pull.c:142
+#: 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:209 builtin/pull.c:145
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "editar a mensagem antes de submeter"
 
-#: builtin/merge.c:210
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
 msgstr "permitir avanço rápido (predefinição)"
 
-#: builtin/merge.c:212 builtin/pull.c:151
+#: 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:216 builtin/pull.c:154
+#: 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:217 builtin/notes.c:773 builtin/pull.c:158
-#: builtin/revert.c:108
+#: 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:218 builtin/pull.c:159
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "estratégia de integração a usar"
 
-#: builtin/merge.c:219 builtin/pull.c:162
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr "opção=valor"
 
-#: builtin/merge.c:220 builtin/pull.c:163
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "opções da estratégia de integração selecionada"
 
-#: builtin/merge.c:222
+#: 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:226
+#: builtin/merge.c:290
 msgid "abort the current in-progress merge"
 msgstr "abortar integração em curso"
 
-#: builtin/merge.c:228
+#: builtin/merge.c:292
+#, fuzzy
+msgid "--abort but leave index and working tree alone"
+msgstr "repor HEAD, índice e árvore de trabalho"
+
+#: builtin/merge.c:294
 msgid "continue the current in-progress merge"
 msgstr "continuar a integração em curso"
 
-#: builtin/merge.c:230 builtin/pull.c:170
+#: 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:303
+#, fuzzy
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "ignorar pre-commit e commit-msg hooks"
 
-#: builtin/merge.c:258
+#: 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:263
+#: builtin/merge.c:325
 msgid "stash failed"
-msgstr "falha ao executar o comando stash"
+msgstr ""
 
-#: builtin/merge.c:268
+#: builtin/merge.c:330
 #, c-format
 msgid "not a valid object: %s"
-msgstr "nome de objeto inválido: %s"
+msgstr ""
 
-#: builtin/merge.c:287 builtin/merge.c:304
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr "falha ao executar o comando read-tree"
 
-#: builtin/merge.c:334
-msgid " (nothing to squash)"
-msgstr " (não há nada para esmagar)"
+#: builtin/merge.c:400
+#, fuzzy
+msgid "Already up to date. (nothing to squash)"
+msgstr " (nada para esmagar)"
 
-#: builtin/merge.c:345
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
-msgstr "Commit esmagado -- HEAD não atualizada\n"
+msgstr "Squash commit -- deixar HEAD por atualizar\n"
 
-#: builtin/merge.c:395
+#: 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 -- deixar HEAD por atualizar\n"
 
-#: builtin/merge.c:446
+#: 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:536
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Valor de branch.%s.mergeoptions incorreto: %s"
 
-#: builtin/merge.c:656
+#: builtin/merge.c:729
 msgid "Not handling anything other than two heads merge."
-msgstr "Não se processa outra coisa senão incorporação de duas cabeças."
+msgstr "Lidando nada além da junção de duas heads."
 
-#: builtin/merge.c:670
+#: 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:685
+#: 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:737
+#: builtin/merge.c:813
 #, c-format
 msgid "Could not read from '%s'"
-msgstr "Não foi possível ler '%s'"
+msgstr "Incapaz ler de '%s'"
 
-#: builtin/merge.c:746
+#: builtin/merge.c:822
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr ""
-"Commit de integração não realizado; use 'git commit' para concluir a "
-"integração.\n"
+"Usa 'git commit' para completar a junção. Committando junção nenhuma.\n"
 
-#: builtin/merge.c:752
-#, c-format
+#: builtin/merge.c:828
+#, fuzzy
 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 ""
+"Introduza uma mensagem de commit, explicando o porquê desta integração\n"
+"ser necessária, especialmente se é merge de updated stream para topic "
+"branch.\n"
+"\n"
+
+#: builtin/merge.c:833
+#, fuzzy
+msgid "An empty message aborts the commit.\n"
+msgstr "Uma mensagem vazia aborta o commit.\n"
+
+#: builtin/merge.c:836
+#, fuzzy, c-format
+msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr ""
-"Introduza uma mensagem de commit, explicando por que esta integração é "
-"necessário,\n"
-"sobretudo se incorpora um ramo a montante atualizado, num ramo tópico.\n"
-"\n"
-"Linhas começadas com '%c' são ignoradas e uma mensagem vazia\n"
-"aborta o commit.\n"
+"Linhas começadas com '%c' são ignoradas, e uma messagem vazia aborta\n"
+"o commit.\n"
 
-#: builtin/merge.c:776
+#: builtin/merge.c:889
 msgid "Empty commit message."
-msgstr "Mensagem de commit vazia."
+msgstr "Mensagem commit vazia."
 
-#: builtin/merge.c:796
+#: builtin/merge.c:904
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Maravilhoso.\n"
 
-#: builtin/merge.c:851
+#: builtin/merge.c:965
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr ""
-"Falha ao realizar integração automática; corrija os conflitos e submeta o "
+"Merge automático falhou; resolve os conflitos e depois podes commitar o "
 "resultado.\n"
 
-#: builtin/merge.c:890
+#: builtin/merge.c:1004
 msgid "No current branch."
 msgstr "Nenhum ramo atual."
 
-#: builtin/merge.c:892
+#: builtin/merge.c:1006
 msgid "No remote for the current branch."
-msgstr "Não há um remoto para o ramo atual."
+msgstr "Ŕamo atual de remoto nenhum."
 
-#: builtin/merge.c:894
+#: builtin/merge.c:1008
 msgid "No default upstream defined for the current branch."
-msgstr "Não está definido nenhum ramo a montante para o ramo atual."
+msgstr "Ramo atual sem upstream default definido."
 
-#: builtin/merge.c:899
+#: 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:946
+#: builtin/merge.c:1070
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Valor '%s' incorreto no ambiente '%s'"
 
-#: builtin/merge.c:1020
-#, c-format
-msgid "could not close '%s'"
-msgstr "não foi possível fechar '%s'"
-
-#: builtin/merge.c:1047
+#: 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:1081
+#: builtin/merge.c:1207
 msgid "not something we can merge"
-msgstr "não se pode integrar"
+msgstr "podemos juntar nada"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1317
 msgid "--abort expects no arguments"
-msgstr "--abort não leva argumentos"
+msgstr "--abort supõe argumento nenhum"
 
-#: builtin/merge.c:1150
+#: builtin/merge.c:1321
 msgid "There is no merge to abort (MERGE_HEAD missing)."
-msgstr "Não há nenhuma integração para se abortar (MERGE_HEAD não presente)."
+msgstr "Há junção nenhuma para abortar (MERGE_HEAD faltando)."
 
-#: builtin/merge.c:1162
+#: builtin/merge.c:1339
+#, fuzzy
+msgid "--quit expects no arguments"
+msgstr "--abort supõe argumento nenhum"
+
+#: builtin/merge.c:1352
 msgid "--continue expects no arguments"
-msgstr "--continue não leva argumentos"
+msgstr "--continue supõe argumento nenhum"
 
-#: builtin/merge.c:1166
+#: builtin/merge.c:1356
 msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "Não há nenhuma integração em curso (MERGE_HEAD não presente)."
+msgstr "Há junção nenhuma em curso (MERGE_HEAD faltando)."
 
-#: builtin/merge.c:1182
+#: builtin/merge.c:1372
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr ""
-"Não concluiu a integração (MERGE_HEAD presente).\n"
-"Submeta as suas alterações antes de integrar."
+"Junção está por concluir (MERGE_HEAD existe).\n"
+"Por favor, faz commit das tuas alterações antes de juntar."
 
-#: builtin/merge.c:1189
+#: 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:1192
+#: 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:1201
+#: builtin/merge.c:1396
 msgid "You cannot combine --squash with --no-ff."
-msgstr "Não é possível combinar --squash e --no-ff."
+msgstr "Impossível combinar --squash com --no-ff."
+
+#: builtin/merge.c:1398
+#, fuzzy
+msgid "You cannot combine --squash with --commit."
+msgstr "Impossível combinar --squash com --commit."
 
-#: builtin/merge.c:1209
+#: 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:1226
+#: builtin/merge.c:1431
 msgid "Squash commit into empty head not supported yet"
-msgstr "Esmagar um commit numa cabeça vazia ainda não é suportado"
+msgstr "Esmagar commit para uma cabeça vazia por enquanto tem suporte nenhum"
 
-#: builtin/merge.c:1228
+#: builtin/merge.c:1433
 msgid "Non-fast-forward commit does not make sense into an empty head"
-msgstr ""
-"Não faz sentido submeter de modo não suscetível a avanço rápido, numa cabeça "
-"vazia"
+msgstr "Non-fast-forward commit para uma cabeça vazia faz sentido nenhum"
 
-#: builtin/merge.c:1233
+#: 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:1235
+#: 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:1269
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr ""
-"A assinatura GPG do commit %s, alegadamente assinada por %s, não é de "
-"confiança."
-
-#: builtin/merge.c:1272
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr ""
-"A assinatura GPG do commit %s, alegadamente assinada por %s, está incorreta."
-
-#: builtin/merge.c:1275
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "O commit %s não tem uma assinatura GPG."
-
-#: builtin/merge.c:1278
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "A assinatura GPG do commit %s por %s está correta\n"
-
-#: builtin/merge.c:1340
+#: builtin/merge.c:1521
 msgid "refusing to merge unrelated histories"
-msgstr "integração de históricos não relacionados recusada"
-
-#: builtin/merge.c:1349
-msgid "Already up-to-date."
-msgstr "Já está atualizado."
+msgstr "recusando juntar históricos diferentes"
 
-#: builtin/merge.c:1359
+#: builtin/merge.c:1540
 #, c-format
 msgid "Updating %s..%s\n"
-msgstr "A atualizar %s..%s\n"
+msgstr "Atualizando %s..%s\n"
 
-#: builtin/merge.c:1400
+#: 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:1407
+#: builtin/merge.c:1594
 #, c-format
 msgid "Nope.\n"
-msgstr "Não.\n"
-
-#: builtin/merge.c:1432
-msgid "Already up-to-date. Yeeah!"
-msgstr "Já está atualizado. Sim!"
+msgstr "Nada.\n"
 
-#: builtin/merge.c:1438
+#: builtin/merge.c:1625
 msgid "Not possible to fast-forward, aborting."
-msgstr "Não é possível avançar rapidamente, a abortar."
+msgstr "Impossível fazer fast-forward, abortando."
 
-#: builtin/merge.c:1461 builtin/merge.c:1540
+#: builtin/merge.c:1653 builtin/merge.c:1719
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
-msgstr "A recuar a árvore ao seu estado original...\n"
+msgstr "Recuando a árvore para estado pristino...\n"
 
-#: builtin/merge.c:1465
+#: builtin/merge.c:1657
 #, c-format
 msgid "Trying merge strategy %s...\n"
-msgstr "A tentar a estratégia de integração %s...\n"
+msgstr "Tentando estratégia merge %s...\n"
 
-#: builtin/merge.c:1531
+#: builtin/merge.c:1709
 #, c-format
 msgid "No merge strategy handled the merge.\n"
-msgstr "Nenhuma estratégia de integração conseguiu processar a integração.\n"
+msgstr "A junção lidou com estratégia de junção nenhuma.\n"
 
-#: builtin/merge.c:1533
+#: 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:1542
+#: 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:1554
+#: builtin/merge.c:1735
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
-msgstr ""
-"A integração automática foi bem sucedida; interrompida antes de submeter "
-"como solicitado\n"
-
-#: builtin/merge-base.c:29
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <commit> <commit>..."
-
-#: builtin/merge-base.c:30
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <commit>..."
-
-#: builtin/merge-base.c:31
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <commit>..."
-
-#: builtin/merge-base.c:32
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <commit> <commit>"
-
-#: builtin/merge-base.c:33
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <referência> [<commit>]"
-
-#: builtin/merge-base.c:217
-msgid "output all common ancestors"
-msgstr "mostrar todos os antecessores"
-
-#: builtin/merge-base.c:219
-msgid "find ancestors for a single n-way merge"
-msgstr "encontrar antecessores de uma única integração com n pontos"
+msgstr "Merge automática correu bem; parei antes de commitar como pedido\n"
 
-#: builtin/merge-base.c:221
-msgid "list revs not reachable from others"
-msgstr "listar revisões não alcançáveis a partir de outras"
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr ""
 
-#: builtin/merge-base.c:223
-msgid "is the first one ancestor of the other?"
-msgstr "o primeiro é antecessor do segundo?"
+#: builtin/mktag.c:27
+#, fuzzy, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "aviso: `:include:` insustentado: %s\n"
 
-#: builtin/merge-base.c:225
-msgid "find where <commit> forked from reflog of <ref>"
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
 msgstr ""
-"descobrir onde foi que o <commit> divergiu usando o reflog da <referência>"
 
-#: builtin/merge-file.c:8
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
+#: builtin/mktag.c:41
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
 msgstr ""
-"git merge-file [<opções>] [-L <nome1> [-L <orig> [-L <nome2>]]] <ficheiro1> "
-"<ficheiro-orig> <ficheiro2>"
 
-#: builtin/merge-file.c:32
-msgid "send results to standard output"
-msgstr "enviar resultados para a saída padrão"
+#: builtin/mktag.c:56
+#, fuzzy, c-format
+msgid "could not read tagged object '%s'"
+msgstr "incapaz ler objeto %s"
 
-#: builtin/merge-file.c:33
-msgid "use a diff3 based merge"
-msgstr "usar integração baseada em diff3"
+#: builtin/mktag.c:59
+#, fuzzy, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "objeto %s é %s, é %s nenhum(a)"
 
-#: builtin/merge-file.c:34
-msgid "for conflicts, use our version"
-msgstr "usar a nossa versão em caso de conflito"
+#: builtin/mktag.c:97
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr ""
 
-#: builtin/merge-file.c:36
-msgid "for conflicts, use their version"
-msgstr "usar a versão deles em caso de conflito"
+#: builtin/mktag.c:100
+#, fuzzy
+msgid "tag on stdin did not refer to a valid object"
+msgstr "'%s' aponta para objeto válido nenhum!"
 
-#: builtin/merge-file.c:38
-msgid "for conflicts, use a union version"
-msgstr "usar a união das versões em caso de conflito"
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "incapaz escrever ficheiro de tag"
 
-#: builtin/merge-file.c:41
-msgid "for conflicts, use this marker size"
-msgstr "usar este comprimento de marcador para os conflitos"
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
 
-#: builtin/merge-file.c:42
-msgid "do not warn about conflicts"
-msgstr "não alertar sobre conflitos"
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr "a entrada termina com NUL"
 
-#: builtin/merge-file.c:44
-msgid "set labels for file1/orig-file/file2"
-msgstr "definir identificares para ficheiro1/ficheiro-orig/ficheiro2"
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr "permitir objetos que faltam"
 
-#: builtin/merge-recursive.c:45
-#, c-format
-msgid "unknown option %s"
-msgstr "opção desconhecido %s"
+#: builtin/mktree.c:156
+msgid "allow creation of more than one tree"
+msgstr "permitir a criação de mais do que uma árvore"
 
-#: builtin/merge-recursive.c:51
-#, c-format
-msgid "could not parse object '%s'"
-msgstr "não foi possível analisar o objeto '%s'"
+#: builtin/multi-pack-index.c:10
+#, fuzzy
+msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgstr "git multi-pack-index [<opções>] write [--preferred-pack=<pacote>]"
 
-#: builtin/merge-recursive.c:55
-#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "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."
+#: builtin/multi-pack-index.c:13
+#, fuzzy
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<opções>] verify"
 
-#: builtin/merge-recursive.c:63
-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."
+#: builtin/multi-pack-index.c:16
+#, fuzzy
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<opções>] expire"
 
-#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "não foi possível resolver a referência %s"
+#: builtin/multi-pack-index.c:19
+#, fuzzy
+msgid "git multi-pack-index [<options>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [<opções>] repack [--batch-size=<tamanho>]"
 
-#: builtin/merge-recursive.c:77
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "A integrar %s com %s\n"
+#: builtin/multi-pack-index.c:54
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr ""
 
-#: builtin/mktree.c:65
-msgid "git mktree [-z] [--missing] [--batch]"
-msgstr "git mktree [-z] [--missing] [--batch]"
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr ""
 
-#: builtin/mktree.c:152
-msgid "input is NUL terminated"
-msgstr "a entrada termina com NUL"
+#: builtin/multi-pack-index.c:70
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr ""
 
-#: builtin/mktree.c:153 builtin/write-tree.c:24
-msgid "allow missing objects"
-msgstr "permitir objetos não presentes"
+#: 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/mktree.c:154
-msgid "allow creation of more than one tree"
-msgstr "permitir a criação de mais do que uma árvore"
+#: builtin/multi-pack-index.c:179
+#, fuzzy, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "subcomando desconhecido: %s"
 
-#: builtin/mv.c:16
+#: builtin/mv.c:18
 msgid "git mv [<options>] <source>... <destination>"
 msgstr "git mv [<opções>] <origem>... <destino>"
 
-#: builtin/mv.c:82
+#: builtin/mv.c:83
 #, c-format
 msgid "Directory %s is in index and no submodule?"
-msgstr "O diretório %s está no índice porém nenhum submódulo?"
+msgstr "A pasta %s está no index porém submódulo nenhum?"
 
-#: builtin/mv.c:84 builtin/rm.c:290
+#: 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"
 
-#: builtin/mv.c:102
+#: builtin/mv.c:103
 #, c-format
 msgid "%.*s is in index"
 msgstr "%.*s está no índice"
 
-#: builtin/mv.c:124
+#: builtin/mv.c:125
 msgid "force move/rename even if target exists"
 msgstr "forçar mover/mudar o nome mesmo que o destino exista"
 
-#: builtin/mv.c:125
+#: builtin/mv.c:127
 msgid "skip move/rename errors"
 msgstr "ignorar erros ao mover/mudar o nome"
 
-#: builtin/mv.c:167
+#: 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:178
+#: 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"
 
-#: builtin/mv.c:182
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr "origem incorreta"
 
-#: builtin/mv.c:185
+#: 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:188
+#: 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:197
+#: 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:222
+#: builtin/mv.c:225
 msgid "not under version control"
-msgstr "não está no controlo de versões"
+msgstr ""
 
-#: builtin/mv.c:225
+#: builtin/mv.c:227
+msgid "conflicted"
+msgstr ""
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "o destino já existe"
 
-#: builtin/mv.c:233
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "a substituir '%s'"
 
-#: builtin/mv.c:236
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
-msgstr "Não é possível substituir"
+msgstr "Incapaz subscrever"
 
-#: builtin/mv.c:239
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr "múltiplas origens para o mesmo destino"
 
-#: builtin/mv.c:241
+#: 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:248
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, origem=%s, destino=%s"
 
-#: builtin/mv.c:269
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "A mudar de nome de %s para %s\n"
 
-#: builtin/mv.c:275 builtin/remote.c:710 builtin/repack.c:384
+#: 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:289
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<opções>] <commit>..."
 
-#: builtin/name-rev.c:290
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<opções>] --all"
 
-#: builtin/name-rev.c:291
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<opções>] --stdin"
 
-#: builtin/name-rev.c:346
-msgid "print only names (no SHA-1)"
-msgstr "imprimir apenas nomes (sem SHA-1)"
+#: builtin/name-rev.c:524
+#, fuzzy
+msgid "print only ref-based names (no object names)"
+msgstr "imprimir apenas os ramos do objeto"
 
-#: builtin/name-rev.c:347
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "usar apenas tags para designar commits"
 
-#: builtin/name-rev.c:349
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "usar apenas referência que correspondam ao <padrão>"
 
-#: builtin/name-rev.c:351
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignorar referências que correspondam ao <padrão>"
 
-#: builtin/name-rev.c:353
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "listar todos os commits alcançáveis a partir de todas as referências"
 
-#: builtin/name-rev.c:354
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "ler da entrada padrão"
 
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "permitir imprimir nomes 'indefinidos' (predefinição)"
 
-#: builtin/name-rev.c:361
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "desreferenciar tags na entrada (uso interno)"
 
-#: builtin/notes.c:25
+#: builtin/notes.c:28
 msgid "git notes [--ref <notes-ref>] [list [<object>]]"
 msgstr "git notes [--ref <notes-ref>] [list [<objeto>]]"
 
-#: builtin/notes.c:26
+#: builtin/notes.c:29
 msgid ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
 "| (-c | -C) <object>] [<object>]"
@@ -10487,11 +18495,11 @@ msgstr ""
 "git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F "
 "<ficheiro> | (-c | -C) <objeto>] [<objeto>]"
 
-#: builtin/notes.c:27
+#: 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>"
 
-#: builtin/notes.c:28
+#: builtin/notes.c:31
 msgid ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
 "(-c | -C) <object>] [<object>]"
@@ -10499,248 +18507,246 @@ msgstr ""
 "git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F "
 "<ficheiro> | (-c | -C) <objeto>] [<objeto>]"
 
-#: builtin/notes.c:29
+#: builtin/notes.c:32
 msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
 msgstr "git notes [--ref <notes-ref>] edit [--allow-empty] [<objeto>]"
 
-#: builtin/notes.c:30
+#: builtin/notes.c:33
 msgid "git notes [--ref <notes-ref>] show [<object>]"
 msgstr "git notes [--ref <notes-ref>] show [<objeto>]"
 
-#: builtin/notes.c:31
+#: 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>"
 
-#: builtin/notes.c:32
+#: builtin/notes.c:35
 msgid "git notes merge --commit [-v | -q]"
 msgstr "git notes merge --commit [-v | -q]"
 
-#: builtin/notes.c:33
+#: builtin/notes.c:36
 msgid "git notes merge --abort [-v | -q]"
 msgstr "git notes merge --abort [-v | -q]"
 
-#: builtin/notes.c:34
+#: builtin/notes.c:37
 msgid "git notes [--ref <notes-ref>] remove [<object>...]"
 msgstr "git notes [--ref <notes-ref>] remove [<objeto>...]"
 
-#: builtin/notes.c:35
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+#: builtin/notes.c:38
+#, fuzzy
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
 msgstr "git notes [--ref <notes-ref>] prune [-n | -v]"
 
-#: builtin/notes.c:36
+#: builtin/notes.c:39
 msgid "git notes [--ref <notes-ref>] get-ref"
 msgstr "git notes [--ref <notes-ref>] get-ref"
 
-#: builtin/notes.c:41
+#: builtin/notes.c:44
 msgid "git notes [list [<object>]]"
 msgstr "git notes [list [<objeto>]]"
 
-#: builtin/notes.c:46
+#: builtin/notes.c:49
 msgid "git notes add [<options>] [<object>]"
 msgstr "git notes add [<opções>] [<objeto>]"
 
-#: builtin/notes.c:51
+#: builtin/notes.c:54
 msgid "git notes copy [<options>] <from-object> <to-object>"
 msgstr "git notes copy [<opções>] <de-objeto> <para-objeto>"
 
-#: builtin/notes.c:52
+#: builtin/notes.c:55
 msgid "git notes copy --stdin [<from-object> <to-object>]..."
 msgstr "git notes copy --stdin [<de-objeto> <para-objeto>]..."
 
-#: builtin/notes.c:57
+#: builtin/notes.c:60
 msgid "git notes append [<options>] [<object>]"
 msgstr "git notes append [<opções>] [<objeto>]"
 
-#: builtin/notes.c:62
+#: builtin/notes.c:65
 msgid "git notes edit [<object>]"
 msgstr "git notes edit [<objeto>]"
 
-#: builtin/notes.c:67
+#: builtin/notes.c:70
 msgid "git notes show [<object>]"
 msgstr "git notes show [<objeto>]"
 
-#: builtin/notes.c:72
+#: builtin/notes.c:75
 msgid "git notes merge [<options>] <notes-ref>"
 msgstr "git notes merge [<opções>] <notes-ref>"
 
-#: builtin/notes.c:73
+#: builtin/notes.c:76
 msgid "git notes merge --commit [<options>]"
 msgstr "git notes merge --commit [<opções>]"
 
-#: builtin/notes.c:74
+#: builtin/notes.c:77
 msgid "git notes merge --abort [<options>]"
 msgstr "git notes merge --abort [<opções>]"
 
-#: builtin/notes.c:79
+#: builtin/notes.c:82
 msgid "git notes remove [<object>]"
 msgstr "git notes remove [<objeto>]"
 
-#: builtin/notes.c:84
+#: builtin/notes.c:87
 msgid "git notes prune [<options>]"
 msgstr "git notes prune [<opções>]"
 
-#: builtin/notes.c:89
+#: builtin/notes.c:92
 msgid "git notes get-ref"
 msgstr "git notes get-ref"
 
-#: builtin/notes.c:94
+#: builtin/notes.c:97
 msgid "Write/edit the notes for the following object:"
 msgstr "Escreva/edite as notas do seguinte objeto:"
 
-#: builtin/notes.c:147
+#: 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:151
+#: 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:159
+#: builtin/notes.c:162
 #, c-format
 msgid "failed to finish 'show' for object '%s'"
 msgstr "falha ao concluir o comando 'show' sobre o objeto '%s'"
 
-#: builtin/notes.c:194
+#: builtin/notes.c:197
 msgid "please supply the note contents using either -m or -F option"
 msgstr "forneça o conteúdo da nota usando a opção -m ou -F"
 
-#: builtin/notes.c:203
+#: 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:205
+#: 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:233 builtin/tag.c:516
-#, c-format
-msgid "cannot read '%s'"
-msgstr "não é possível ler '%s'"
-
-#: builtin/notes.c:235 builtin/tag.c:519
+#: 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:254 builtin/notes.c:305 builtin/notes.c:307
-#: builtin/notes.c:372 builtin/notes.c:427 builtin/notes.c:513
-#: builtin/notes.c:518 builtin/notes.c:596 builtin/notes.c:658
+#: 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."
 
-#: builtin/notes.c:257
+#: builtin/notes.c:265
 #, c-format
 msgid "failed to read object '%s'."
 msgstr "falha ao ler o objeto '%s'."
 
-#: builtin/notes.c:261
+#: 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:301
+#: builtin/notes.c:309
 #, c-format
 msgid "malformed input line: '%s'."
 msgstr "linha de entrada malformada: '%s'."
 
-#: builtin/notes.c:316
+#: builtin/notes.c:324
 #, c-format
 msgid "failed to copy notes from '%s' to '%s'"
 msgstr "falha ao copiar notas de '%s' para '%s'"
 
-#. TRANSLATORS: the first %s will be replaced by a
-#. git notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:345
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
 #, c-format
 msgid "refusing to %s notes in %s (outside of refs/notes/)"
 msgstr "foi recusado efetuar %s de notas em %s (fora de refs/notes/)"
 
-#: builtin/notes.c:365 builtin/notes.c:420 builtin/notes.c:496
-#: builtin/notes.c:508 builtin/notes.c:584 builtin/notes.c:651
-#: builtin/notes.c:801 builtin/notes.c:948 builtin/notes.c:969
-msgid "too many parameters"
-msgstr "demasiados parâmetros"
+#: 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
+msgid "too many arguments"
+msgstr ""
 
-#: builtin/notes.c:378 builtin/notes.c:664
+#: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
 msgid "no note found for object %s."
-msgstr "nenhuma nota encontrada para o objeto %s."
+msgstr "Encontrada nota nenhuma para objeto %s."
 
-#: builtin/notes.c:399 builtin/notes.c:562
+#: builtin/notes.c:410 builtin/notes.c:576
 msgid "note contents as a string"
 msgstr "conteúdo da nota sob a forma de cadeia de caracteres"
 
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:413 builtin/notes.c:579
 msgid "note contents in a file"
 msgstr "conteúdo da nota de um ficheiro"
 
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:416 builtin/notes.c:582
 msgid "reuse and edit specified note object"
 msgstr "reutilizar e editar o objeto de nota especificado"
 
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:419 builtin/notes.c:585
 msgid "reuse specified note object"
 msgstr "reutilizar o objeto de nota especificado"
 
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:422 builtin/notes.c:588
 msgid "allow storing empty note"
 msgstr "permitir guardar uma nota vazia"
 
-#: builtin/notes.c:412 builtin/notes.c:483
+#: builtin/notes.c:423 builtin/notes.c:496
 msgid "replace existing notes"
 msgstr "substituir notas existentes"
 
-#: builtin/notes.c:437
+#: builtin/notes.c:448
 #, c-format
 msgid ""
 "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
-"Não é possível adicionar notas. Notas do objeto %s encontradas. Use '-f' "
-"para substituí-las."
+"Incapaz adicionar notas. Encontrei notas existentes para objeto %s. Usa '-f' "
+"para subscrever notas existentes"
 
-#: builtin/notes.c:452 builtin/notes.c:531
+#: builtin/notes.c:463 builtin/notes.c:544
 #, c-format
 msgid "Overwriting existing notes for object %s\n"
-msgstr "A substituir as notas existentes do objeto %s\n"
+msgstr "Gravando por cima, notas existentes para objeto %s\n"
 
-#: builtin/notes.c:463 builtin/notes.c:623 builtin/notes.c:888
+#: builtin/notes.c:475 builtin/notes.c:637 builtin/notes.c:902
 #, c-format
 msgid "Removing note for object %s\n"
-msgstr "A remover a nota do objeto %s\n"
+msgstr "Removendo nota para objeto %s\n"
 
-#: builtin/notes.c:484
+#: builtin/notes.c:497
 msgid "read objects from stdin"
-msgstr "ler objetos da entrada padrão"
+msgstr "ler objetos de stdin"
 
-#: builtin/notes.c:486
+#: builtin/notes.c:499
 msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "carregar configuração de reescrita do <comando> (implica --stdin)"
 
-#: builtin/notes.c:504
-msgid "too few parameters"
-msgstr "parâmetros insuficientes"
+#: builtin/notes.c:517
+msgid "too few arguments"
+msgstr ""
 
-#: builtin/notes.c:525
+#: builtin/notes.c:538
 #, c-format
 msgid ""
 "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
 "existing notes"
 msgstr ""
-"Não é possível copiar notas. Notas do objeto %s encontradas. Use '-f' para "
-"substituí-las."
+"Incapaz copiar notas. Encontrei Notas existentes para objeto %s. Usa '-f' "
+"para subscrever notas existentes"
 
-#: builtin/notes.c:537
+#: builtin/notes.c:550
 #, c-format
 msgid "missing notes on source object %s. Cannot copy."
-msgstr "faltam notas no objeto de origem %s. Não é possível copiar."
+msgstr "faltando notas para objeto fonte %s. Incapaz copiar."
 
-#: builtin/notes.c:589
+#: builtin/notes.c:603
 #, c-format
 msgid ""
 "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10749,52 +18755,52 @@ msgstr ""
 "As opções -m/-F/-c/-C são obsoletas no subcomando 'edit'.\n"
 "Use 'git notes add -f -m/-F/-c/-C' em seu lugar.\n"
 
-#: builtin/notes.c:684
+#: builtin/notes.c:698
 msgid "failed to delete ref NOTES_MERGE_PARTIAL"
 msgstr "falha ao eliminar a referência NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:686
+#: builtin/notes.c:700
 msgid "failed to delete ref NOTES_MERGE_REF"
 msgstr "falha ao eliminar a referência NOTES_MERGE_REF"
 
-#: builtin/notes.c:688
+#: builtin/notes.c:702
 msgid "failed to remove 'git notes merge' worktree"
 msgstr "falha ao remover a árvore de trabalho de 'git notes merge'"
 
-#: builtin/notes.c:708
+#: builtin/notes.c:722
 msgid "failed to read ref NOTES_MERGE_PARTIAL"
 msgstr "falha ao ler referência NOTES_MERGE_PARTIAL"
 
-#: builtin/notes.c:710
+#: 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 commit a partir de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:712
+#: 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 commit a partir de NOTES_MERGE_PARTIAL."
 
-#: builtin/notes.c:725
+#: builtin/notes.c:739
 msgid "failed to resolve NOTES_MERGE_REF"
 msgstr "falha ao resolver NOTES_MERGE_REF"
 
-#: builtin/notes.c:728
+#: builtin/notes.c:742
 msgid "failed to finalize notes merge"
 msgstr "falha ao finalizar integração de notas"
 
-#: builtin/notes.c:754
+#: builtin/notes.c:768
 #, c-format
 msgid "unknown notes merge strategy %s"
 msgstr "estratégia de integração de notas %s desconhecida"
 
-#: builtin/notes.c:770
+#: builtin/notes.c:784
 msgid "General options"
 msgstr "Opções gerais"
 
-#: builtin/notes.c:772
+#: builtin/notes.c:786
 msgid "Merge options"
 msgstr "Opções de integração"
 
-#: builtin/notes.c:774
+#: builtin/notes.c:788
 msgid ""
 "resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
 "cat_sort_uniq)"
@@ -10802,46 +18808,46 @@ msgstr ""
 "resolver conflitos nas notas usando a estratégia indicada (manual/ours/"
 "theirs/union/cat_sort_uniq)"
 
-#: builtin/notes.c:776
+#: builtin/notes.c:790
 msgid "Committing unmerged notes"
-msgstr "A submeter notas não integradas"
+msgstr "Memorizando notas por juntar"
 
-#: builtin/notes.c:778
+#: 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:780
+#: builtin/notes.c:794
 msgid "Aborting notes merge resolution"
 msgstr "A abortar resolução de integração das notas"
 
-#: builtin/notes.c:782
+#: builtin/notes.c:796
 msgid "abort notes merge"
 msgstr "abortar integração das notas"
 
-#: builtin/notes.c:793
+#: 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:798
+#: builtin/notes.c:812
 msgid "must specify a notes ref to merge"
 msgstr "tem de especificar uma referência de notas para integrar"
 
-#: builtin/notes.c:822
+#: builtin/notes.c:836
 #, c-format
 msgid "unknown -s/--strategy: %s"
 msgstr "-s/--strategy desconhecida: %s"
 
-#: builtin/notes.c:859
+#: builtin/notes.c:873
 #, c-format
 msgid "a notes merge into %s is already in-progress at %s"
 msgstr "uma integração das notas em %s já está em curso em %s"
 
-#: builtin/notes.c:862
+#: 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)"
 
-#: builtin/notes.c:864
+#: builtin/notes.c:878
 #, c-format
 msgid ""
 "Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10852,410 +18858,677 @@ msgstr ""
 "submeta o resultado com 'git notes merge --commit' ou aborte a integração "
 "com 'git notes merge --abort'.\n"
 
-#: builtin/notes.c:886
+#: 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."
+
+#: builtin/notes.c:900
 #, c-format
 msgid "Object %s has no note\n"
-msgstr "O objeto %s não tem nenhuma nota\n"
+msgstr "O objeto %s tem nota nenhuma\n"
 
-#: builtin/notes.c:898
+#: 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:901
+#: builtin/notes.c:915
 msgid "read object names from the standard input"
 msgstr "ler nome dos objetos da entrada padrão"
 
-#: builtin/notes.c:939 builtin/prune.c:105 builtin/worktree.c:127
+#: 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:940
+#: builtin/notes.c:955
 msgid "report pruned notes"
 msgstr "reportar notas podadas"
 
-#: builtin/notes.c:982
+#: builtin/notes.c:998
 msgid "notes-ref"
 msgstr "notes-ref"
 
-#: builtin/notes.c:983
+#: builtin/notes.c:999
 msgid "use notes from <notes-ref>"
 msgstr "usar notas de <notes-ref>"
 
-#: builtin/notes.c:1018
+#: builtin/notes.c:1034 builtin/stash.c:1735
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "subcomando desconhecido: %s"
 
-#: builtin/pack-objects.c:29
+#: 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:30
+#: 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:177 builtin/pack-objects.c:180
+#: builtin/pack-objects.c:572
 #, c-format
-msgid "deflate error (%d)"
-msgstr "erro ao compactar (%d)"
+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 ""
+
+#: builtin/pack-objects.c:591
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:722
+#, fuzzy, c-format
+msgid "recursive delta detected for object %s"
+msgstr "delta recursivo detetado para objeto %s"
+
+#: builtin/pack-objects.c:941
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr ""
+
+#: builtin/pack-objects.c:1036
+#, fuzzy, c-format
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "pacote com objeto incorreto no offset %<PRIuMAX>: %s"
 
-#: builtin/pack-objects.c:770
+#: 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:783
+#: builtin/pack-objects.c:1168
 msgid "Writing objects"
-msgstr "A escrever objetos"
+msgstr ""
+
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#, c-format
+msgid "failed to stat %s"
+msgstr "falhou stat a %s"
+
+#: builtin/pack-objects.c:1281
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr ""
 
-#: builtin/pack-objects.c:1063
+#: 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:1971
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr ""
+
+#: builtin/pack-objects.c:1980
+#, fuzzy, c-format
+msgid "delta base offset out of bound for %s"
+msgstr "offset de base delta está fora do limite para %s"
+
+#: builtin/pack-objects.c:2261
+msgid "Counting objects"
+msgstr "A contar objetos"
 
 #: builtin/pack-objects.c:2426
+#, fuzzy, c-format
+msgid "unable to parse object header of %s"
+msgstr "incapaz processar cabeçalho de objeto de %s"
+
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
+#, fuzzy, c-format
+msgid "object %s cannot be read"
+msgstr "objeto %s incapaz ser lido"
+
+#: 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:2536
+msgid "suboptimal pack - out of memory"
+msgstr ""
+
+#: builtin/pack-objects.c:2851
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr ""
+
+#: builtin/pack-objects.c:2990
+#, fuzzy, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr "incluir objetos alcançáveis a partir de qualquer referência"
+
+#: builtin/pack-objects.c:3076
 msgid "Compressing objects"
 msgstr "A comprimir objetos"
 
-#: builtin/pack-objects.c:2829
+#: builtin/pack-objects.c:3082
+msgid "inconsistency with delta count"
+msgstr ""
+
+#: builtin/pack-objects.c:3161
 #, c-format
-msgid "unsupported index version %s"
-msgstr "versão de índice %s não suportada"
+msgid ""
+"value of uploadpack.blobpackfileuri must be of the form '<object-hash> <pack-"
+"hash> <uri>' (got '%s')"
+msgstr ""
 
-#: builtin/pack-objects.c:2833
+#: builtin/pack-objects.c:3164
 #, c-format
-msgid "bad index version '%s'"
-msgstr "versão de índice '%s' incorreta"
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
 
-#: builtin/pack-objects.c:2863
-msgid "do not show progress meter"
-msgstr "não mostrar medidor de progresso"
+#: builtin/pack-objects.c:3199
+#, fuzzy, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "incapaz obter tipo de objeto %s"
 
-#: builtin/pack-objects.c:2865
-msgid "show progress meter"
-msgstr "mostrar medidor de progresso"
+#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#, fuzzy, c-format
+msgid "could not find pack '%s'"
+msgstr "incapaz acabar '%s'"
 
-#: builtin/pack-objects.c:2867
-msgid "show progress meter during object writing phase"
-msgstr "mostrar medidor de progresso durante a fase de escrita de objetos"
+#: builtin/pack-objects.c:3378
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
 
-#: builtin/pack-objects.c:2870
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "semelhante a --all-progress quando o medidor de progresso é mostrado"
+#: builtin/pack-objects.c:3384
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+
+#: builtin/pack-objects.c:3482
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+#, fuzzy
+msgid "cannot open pack index"
+msgstr "incapaz abrir index pack"
+
+#: builtin/pack-objects.c:3572
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr ""
+
+#: builtin/pack-objects.c:3658
+#, fuzzy
+msgid "unable to force loose object"
+msgstr "incapaz forçar objeto solto"
+
+#: builtin/pack-objects.c:3788
+#, fuzzy, c-format
+msgid "not a rev '%s'"
+msgstr "rev '%s' nenhum"
+
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#, fuzzy, c-format
+msgid "bad revision '%s'"
+msgstr "revisão '%s' incorreto"
+
+#: builtin/pack-objects.c:3819
+#, fuzzy
+msgid "unable to add recent objects"
+msgstr "incapaz adicionar objetos recentes"
+
+#: builtin/pack-objects.c:3872
+#, c-format
+msgid "unsupported index version %s"
+msgstr "versão de index %s insustentada"
+
+#: builtin/pack-objects.c:3876
+#, c-format
+msgid "bad index version '%s'"
+msgstr "versão de índice '%s' incorreta"
 
-#: builtin/pack-objects.c:2871
-msgid "version[,offset]"
+#: builtin/pack-objects.c:3915
+#, fuzzy
+msgid "<version>[,<offset>]"
 msgstr "versão[,offset]"
 
-#: builtin/pack-objects.c:2872
+#: 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:2875
+#: builtin/pack-objects.c:3919
 msgid "maximum size of each output pack file"
 msgstr "tamanho máximo de cada ficheiro de pacote gerado"
 
-#: builtin/pack-objects.c:2877
+#: 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:2879
+#: builtin/pack-objects.c:3923
 msgid "ignore packed objects"
-msgstr "ignorar objetos compactados"
+msgstr ""
 
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:3925
 msgid "limit pack window by objects"
 msgstr "limitar a janela de compactação por objetos"
 
-#: builtin/pack-objects.c:2883
+#: 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:2885
+#: 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:2887
+#: builtin/pack-objects.c:3931
 msgid "reuse existing deltas"
 msgstr "reutilizar deltas existentes"
 
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:3933
 msgid "reuse existing objects"
 msgstr "reutilizar objetos existentes"
 
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:3935
 msgid "use OFS_DELTA objects"
 msgstr "usar objetos OFS_DELTA"
 
-#: builtin/pack-objects.c:2893
+#: 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:2895
+#: 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:2897
+#: 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:2899
+#: 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:2902
+#: 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:2905
+#: builtin/pack-objects.c:3949
 msgid "include objects referred by reflog entries"
 msgstr "incluir objetos referenciados por entradas do reflog"
 
-#: builtin/pack-objects.c:2908
+#: builtin/pack-objects.c:3952
 msgid "include objects referred to by the index"
 msgstr "incluir objetos referenciados pelo índice"
 
-#: builtin/pack-objects.c:2911
+#: 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:2913
+#: 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:2915
+#: builtin/pack-objects.c:3961
 msgid "keep unreachable objects"
 msgstr "manter objetos inalcançáveis"
 
-#: builtin/pack-objects.c:2917
+#: builtin/pack-objects.c:3963
 msgid "pack loose unreachable objects"
 msgstr "empacotar objetos soltos inalcançáveis"
 
-#: builtin/pack-objects.c:2919
+#: 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:2922
+#: builtin/pack-objects.c:3968
+msgid "use the sparse reachability algorithm"
+msgstr ""
+
+#: builtin/pack-objects.c:3970
 msgid "create thin packs"
 msgstr "criar pacotes finos"
 
-#: builtin/pack-objects.c:2924
+#: 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:2926
+#: 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:2928
+#: builtin/pack-objects.c:3976
+#, fuzzy
+msgid "ignore this pack"
+msgstr "usar pacote fino"
+
+#: builtin/pack-objects.c:3978
 msgid "pack compression level"
 msgstr "nível de compactação do pacote"
 
-#: builtin/pack-objects.c:2930
+#: 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:2932
+#: 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:2934
+#: 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:3061
-msgid "Counting objects"
-msgstr "A contar objetos"
+#: builtin/pack-objects.c:3988
+#, fuzzy
+msgid "write a bitmap index if possible"
+msgstr "escrever índice de mapa de bits"
+
+#: builtin/pack-objects.c:3992
+#, fuzzy
+msgid "handling for missing objects"
+msgstr "lidando para objetos que faltem"
+
+#: builtin/pack-objects.c:3995
+msgid "do not pack objects in promisor packfiles"
+msgstr ""
+
+#: builtin/pack-objects.c:3997
+#, fuzzy
+msgid "respect islands during delta compression"
+msgstr "dimensão da janela usada em compressão de deltas"
+
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:4000
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:4033
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:4038
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr ""
+
+#: builtin/pack-objects.c:4094
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr ""
 
-#: builtin/pack-refs.c:6
+#: builtin/pack-objects.c:4096
+msgid "minimum pack size limit is 1 MiB"
+msgstr ""
+
+#: builtin/pack-objects.c:4101
+#, fuzzy
+msgid "--thin cannot be used to build an indexable pack"
+msgstr "incapaz usar --thin para construir pack indexável"
+
+#: builtin/pack-objects.c:4104
+#, fuzzy
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr "--keep-unreachable e -A são incompatíveis"
+
+#: builtin/pack-objects.c:4110
+#, fuzzy
+msgid "cannot use --filter without --stdout"
+msgstr "usar --filter com --stdout"
+
+#: builtin/pack-objects.c:4112
+#, fuzzy
+msgid "cannot use --filter with --stdin-packs"
+msgstr "usar --filter com --stdout"
+
+#: builtin/pack-objects.c:4116
+#, fuzzy
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "incapaz especificar pathnames com --stdin"
+
+#: builtin/pack-objects.c:4175
+msgid "Enumerating objects"
+msgstr ""
+
+#: 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>]"
 
-#: builtin/pack-refs.c:14
+#: builtin/pack-refs.c:16
 msgid "pack everything"
 msgstr "compactar tudo"
 
-#: builtin/pack-refs.c:15
+#: 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:7
+#: 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-packed.c:40
-msgid "Removing duplicate objects"
-msgstr "A remover objetos duplicados"
-
-#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+#: builtin/prune.c:14
+#, fuzzy
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--expire <tempo>] [--] [<head>...]"
 
-#: builtin/prune.c:106
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "apresentar objetos eliminados"
 
-#: builtin/prune.c:109
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "expirar objetos mais antigos que <tempo>"
 
-#: builtin/prune.c:123
+#: builtin/prune.c:138
+msgid "limit traversal to objects outside promisor packfiles"
+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:51 builtin/pull.c:53
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Valor inválido de %s: %s"
 
-#: builtin/pull.c:73
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<opções>] [<repositório> [<especificador-de-referência>...]]"
 
-#: builtin/pull.c:121
+#: builtin/pull.c:123
+#, fuzzy
+msgid "control for recursive fetching of submodules"
+msgstr "controlar a obtenção recursiva de submódulos"
+
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Opções relativas a integração"
 
-#: builtin/pull.c:124
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "incorporar alterações por rebase em vez de integrar"
 
-#: builtin/pull.c:148 builtin/rebase--helper.c:18 builtin/revert.c:120
+#: 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:157
-msgid "automatically stash/stash pop before and after rebase"
+#: builtin/pull.c:167 parse-options.h:340
+#, fuzzy
+msgid "automatically stash/stash pop before and after"
 msgstr "empilhar/desempilhar automaticamente antes de depois de rebase"
 
-#: builtin/pull.c:173
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Opções relacionadas com obtenção de objetos"
 
-#: builtin/pull.c:195
+#: builtin/pull.c:193
+msgid "force overwrite of local branch"
+msgstr "forçar a substituição do ramo local"
+
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
-msgstr "número de submódulos puxados em paralelo"
+msgstr "número de submódulos com pull em paralelo"
 
-#: builtin/pull.c:284
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Valor inválido de pull.ff: %s"
 
-#: builtin/pull.c:397
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
-msgstr ""
-"Não há nenhum candidato com o qual realizar rebase de entre as referências "
-"que se acabaram de obter."
+msgstr "As refs que obteste tem candidato nenhum para onde rebasear."
 
-#: builtin/pull.c:399
+#: builtin/pull.c:447
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
-msgstr ""
-"Não há nenhum candidato com o qual integrar de entre as referências que se "
-"acabaram obter."
+msgstr "As refs que obteste tem candidato nenhum para junção."
 
-#: builtin/pull.c:400
+#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr ""
-"Geralmente, significa que forneceu um especificador de referência\n"
-"com um carácter universal (wildcard) que não corresponde a nenhum remoto."
+"Normalmente isto significa que forneceste um wildcard especificador de ref\n"
+"que tem correspondência nenhuma no lado do remoto."
 
-#: builtin/pull.c:403
+#: 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:408 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1248
 msgid "You are not currently on a branch."
-msgstr "Não se encontra em nenhum ramo de momento."
+msgstr "Atualmente estás em ramo nenhum."
 
-#: builtin/pull.c:410 builtin/pull.c:425 git-parse-remote.sh:79
+#: 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:412 builtin/pull.c:427 git-parse-remote.sh:82
+#: 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:413 builtin/pull.c:428
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
 msgstr "Consulte git-pull(1) para obter mais detalhes."
 
-#: builtin/pull.c:415 builtin/pull.c:421 builtin/pull.c:430
-#: git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr "<remoto>"
 
-#: builtin/pull.c:415 builtin/pull.c:430 builtin/pull.c:435 git-rebase.sh:455
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "<ramo>"
 
-#: builtin/pull.c:423 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1246
 msgid "There is no tracking information for the current branch."
-msgstr "O ramo atual não segue nenhum ramo."
+msgstr "O ramo atual tem informação de tracking nenhuma."
 
-#: builtin/pull.c:432 git-parse-remote.sh:95
+#: 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:437
+#: 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:596
+#, fuzzy, c-format
+msgid "unable to access commit %s"
+msgstr "incapaz acessar commit %s"
 
-#: builtin/pull.c:754
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorado --verify-signatures para rebase"
 
-#: builtin/pull.c:801
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "a opção --[no-]autostash só é válida com --rebase."
+#: 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 ""
 
-#: builtin/pull.c:809
+#: builtin/pull.c:990
 msgid "Updating an unborn branch with changes added to the index."
-msgstr ""
-"A atualizar um ramo que ainda não foi criado e com alterações adicionadas ao "
-"índice."
+msgstr "Atualizando um ramo por nascer com alterações adicionadas ao índex."
 
-#: builtin/pull.c:812
+#: builtin/pull.c:994
 msgid "pull with rebase"
-msgstr "puxar com rebase"
+msgstr "pull com rebase"
 
-#: builtin/pull.c:813
+#: builtin/pull.c:995
 msgid "please commit or stash them."
 msgstr "submeta ou esconda-as."
 
-#: builtin/pull.c:838
+#: builtin/pull.c:1020
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11266,7 +19539,7 @@ msgstr ""
 "a avançar a árvore de trabalho a partir do\n"
 "commit %s."
 
-#: builtin/pull.c:843
+#: builtin/pull.c:1026
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11276,34 +19549,38 @@ msgid ""
 "$ git reset --hard\n"
 "to recover."
 msgstr ""
-"Não é possível avançar rapidamente a árvore de trabalho.\n"
-"Depois de guardar todas as alterações importantes indicadas por\n"
+"Incapaz de fast-forward a tua working tree.\n"
+"Após confirmares que guardaste algo precioso do resultado de\n"
 "$ git diff %s\n"
 "execute\n"
 "$ git reset --hard\n"
 "para recuperar."
 
-#: builtin/pull.c:858
+#: builtin/pull.c:1041
 msgid "Cannot merge multiple branches into empty head."
-msgstr "Não é possível integrar múltiplos ramos numa cabeça vazia."
+msgstr "Incapaz de juntar ramos múltiplos para head vazia."
 
-#: builtin/pull.c:862
+#: builtin/pull.c:1045
 msgid "Cannot rebase onto multiple branches."
-msgstr "Não é possível efetuar rebase sobre múltiplos ramos."
+msgstr "Incapaz de rebasear sobre ramos múltiplos."
 
-#: builtin/push.c:16
+#: 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>...]]"
 
-#: builtin/push.c:89
+#: builtin/push.c:111
 msgid "tag shorthand without <tag>"
 msgstr "forma abreviada de tag sem <tag>"
 
-#: builtin/push.c:99
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete só aceita nomes simples como referências de destino"
 
-#: builtin/push.c:143
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -11312,8 +19589,8 @@ msgstr ""
 "Para escolher uma opção permanentemente, consulte push.default em 'git help "
 "config'."
 
-#: builtin/push.c:146
-#, c-format
+#: builtin/push.c:167
+#, fuzzy, 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"
@@ -11323,20 +19600,20 @@ msgid ""
 "\n"
 "To push to the branch of the same name on the remote, use\n"
 "\n"
-"    git push %s %s\n"
+"    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:161
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -11345,13 +19622,12 @@ msgid ""
 "\n"
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr ""
-"Não se encontra em nenhum ramo neste momento.\n"
-"Para publicar o histórico que conduziu ao estado atual (de HEAD\n"
-"destacada), use\n"
+"Atualmente estás em ramo nenhum.\n"
+"Para atirar a história que leva ao estado atual (HEAD solta), usa\n"
 "\n"
-"    git push %s HEAD:<name-of-remote-branch>\n"
+"    git push %s HEAD:<nome-de-ramo-remoto>\n"
 
-#: builtin/push.c:175
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -11359,35 +19635,33 @@ msgid ""
 "\n"
 "    git push --set-upstream %s %s\n"
 msgstr ""
-"O ramo atual %s não tem nenhum ramo a montante.\n"
-"Para publicar o ramo atual e definir o remoto a montante, use\n"
+"O ramo atual %s tem ramo upstream nenhum.\n"
+"Para atirar o ramo atual e definir o remoto como upstream, usa\n"
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:183
+#: 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:186
+#: 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:245
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr ""
-"Não indicou nenhum especificador de referência para publicar e o valor de "
-"push.default é \"nothing\"."
-
-#: builtin/push.c:252
+#: 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"
@@ -11399,7 +19673,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:258
+#: 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"
@@ -11411,7 +19685,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:264
+#: 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"
@@ -11419,174 +19693,235 @@ msgid ""
 "(e.g., 'git pull ...') before pushing again.\n"
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr ""
-"As atualizações foram rejeitadas porque o remoto contém alterações que\n"
-"não tem localmente. Habitualmente, acontece porque outro repositório "
-"publicou\n"
-"na mesma referência. Pode integrar primeiro as alterações remotas\n"
-"(e.g., '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 o remoto contém trabalho diferente\n"
+"do teu trabalho local. A causa, normalmente, é um push para a mesma ref.\n"
+"Podes tentar integrar as diferenças remotas (p.e., 'git pull ...') antes\n"
+"de fazeres novo push.\n"
+"Vê a 'Note about fast-forwards' do 'git push --help' para detalhes."
 
-#: builtin/push.c:271
+#: 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:274
+#: 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 ""
-"Não é possível atualizar uma referência remota que aponte para um\n"
-"objeto não commit, ou atualizar uma referência remota fazendo-a\n"
-"apontar para um objeto não commit, sem usar a opção '--force'.\n"
+"És impedido de atualizar uma ref remota que aponte para um objecto\n"
+"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:334
+#: builtin/push.c:285
+#, fuzzy
+msgid ""
+"Updates were rejected because the tip of the remote-tracking\n"
+"branch has been updated since the last checkout. You may want\n"
+"to integrate those changes locally (e.g., 'git pull ...')\n"
+"before forcing an update.\n"
+msgstr ""
+"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."
+
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
-msgstr "A publicar em %s\n"
+msgstr "Fazendo push para %s\n"
 
-#: builtin/push.c:338
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "falha ao publicar algumas referências em '%s'"
 
-#: builtin/push.c:369
-#, c-format
-msgid "bad repository '%s'"
-msgstr "repositório '%s' incorreto"
-
-#: builtin/push.c:370
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote "
-"repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr ""
-"Destino de publicação não definido.\n"
-"Indique um URL na 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"
-"\n"
-"    git push <nome>\n"
-
-#: builtin/push.c:388
-msgid "--all and --tags are incompatible"
-msgstr "--all e --tags são incompatíveis"
-
-#: builtin/push.c:389
-msgid "--all can't be combined with refspecs"
-msgstr "--all não pode ser combinado com especificadores de referências"
-
-#: builtin/push.c:394
-msgid "--mirror and --tags are incompatible"
-msgstr "--mirror e --tags são incompatíveis"
-
-#: builtin/push.c:395
-msgid "--mirror can't be combined with refspecs"
-msgstr "--mirror não pode ser combinado com especificadores de referências"
-
-#: builtin/push.c:400
-msgid "--all and --mirror are incompatible"
-msgstr "--all e --mirror são incompatíveis"
-
-#: builtin/push.c:518
+#: builtin/push.c:544
 msgid "repository"
 msgstr "repositório"
 
-#: builtin/push.c:519 builtin/send-pack.c:162
+#: builtin/push.c:545 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "publicar todas as referências"
 
-#: builtin/push.c:520 builtin/send-pack.c:164
+#: builtin/push.c:546 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "replicar todas as referências"
 
-#: builtin/push.c:522
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "eliminar referências"
 
-#: builtin/push.c:523
+#: 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 tags (incapaz ser usado com --all ou --mirror)"
 
-#: builtin/push.c:526 builtin/send-pack.c:165
+#: builtin/push.c:552 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "forçar atualização"
 
-#: builtin/push.c:528 builtin/send-pack.c:179
-msgid "refname>:<expect"
+#: builtin/push.c:553 builtin/send-pack.c:204
+#, fuzzy
+msgid "<refname>:<expect>"
 msgstr "nome da referência>:<esperado"
 
-#: builtin/push.c:529 builtin/send-pack.c:180
+#: 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"
 
-#: builtin/push.c:532
+#: builtin/push.c:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr ""
+
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "controlar a publicação recursiva de submódulos"
 
-#: builtin/push.c:534 builtin/send-pack.c:173
+#: builtin/push.c:561 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "usar pacote fino"
 
-#: builtin/push.c:535 builtin/push.c:536 builtin/send-pack.c:159
-#: builtin/send-pack.c:160
+#: 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:537
+#: 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:540
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "eliminar referências removidas localmente"
 
-#: builtin/push.c:542
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "ignorar pre-push hook"
 
-#: builtin/push.c:543
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "publicar tags perdidas mas relevantes"
 
-#: builtin/push.c:546 builtin/send-pack.c:167
+#: builtin/push.c:572 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "assinar publicação com GPG"
 
-#: builtin/push.c:548 builtin/send-pack.c:174
+#: 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"
 
-#: builtin/push.c:549 builtin/send-pack.c:170
-msgid "server-specific"
-msgstr "específico do servidor"
-
-#: builtin/push.c:549 builtin/send-pack.c:171
-msgid "option to transmit"
-msgstr "opção para transmitir"
-
-#: builtin/push.c:563
+#: 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:565
+#: 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:584
+#: builtin/push.c:614
+#, c-format
+msgid "bad repository '%s'"
+msgstr "repositório '%s' incorreto"
+
+#: 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"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"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 depois atire usando o nome remoto\n"
+"\n"
+"    git push <nome>\n"
+
+#: builtin/push.c:630
+msgid "--all and --tags are incompatible"
+msgstr "--all e --tags são incompatíveis"
+
+#: builtin/push.c:632
+msgid "--all can't be combined with refspecs"
+msgstr "incapaz combinar --all com refspecs"
+
+#: builtin/push.c:636
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror e --tags são incompatíveis"
+
+#: builtin/push.c:638
+msgid "--mirror can't be combined with refspecs"
+msgstr "incapaz combinar --mirror com refspecs"
+
+#: builtin/push.c:641
+msgid "--all and --mirror are incompatible"
+msgstr "--all e --mirror são incompatíveis"
+
+#: 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 atiranço podem ter caracteres de nova linha nenhuns"
 
-#: builtin/read-tree.c:40
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+
+#: builtin/range-diff.c:10
+#, fuzzy
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git merge [<opções>] [<commit>...]"
+
+#: builtin/range-diff.c:11
+#, fuzzy
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr "git mv [<opções>] <origem>... <destino>"
+
+#: builtin/range-diff.c:30
+#, fuzzy
+msgid "use simple diff colors"
+msgstr "usar a ferramenta diff especificada"
+
+#: builtin/range-diff.c:32
+#, fuzzy
+msgid "notes"
+msgstr "notes-ref"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr ""
+
+#: builtin/range-diff.c:35
+#, fuzzy
+msgid "only emit output related to the first range"
+msgstr "mostrar apenas commits fora do primeiro ramo"
+
+#: builtin/range-diff.c:37
+#, fuzzy
+msgid "only emit output related to the second range"
+msgstr "mostrar os caminhos relativamente ao diretório superior do projeto"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, fuzzy, c-format
+msgid "not a commit range: '%s'"
+msgstr "ramo inexistente: '%s'"
+
+#: builtin/range-diff.c:74
+msgid "single arg format must be symmetric range"
+msgstr ""
+
+#: builtin/range-diff.c:89
+#, fuzzy
+msgid "need two commit ranges"
+msgstr "preciso dois intervalos de memórias"
+
+#: builtin/read-tree.c:41
 msgid ""
 "git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
 "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
@@ -11597,89 +19932,734 @@ msgstr ""
 "sparse-checkout] [--index-output=<ficheiro>] (--empty | <árvore-etc1> "
 "[<árvore-etc2> [<árvore-etc3>]])"
 
-#: builtin/read-tree.c:130
+#: builtin/read-tree.c:124
 msgid "write resulting index to <file>"
 msgstr "escrever o índice resultante no <ficheiro>"
 
-#: builtin/read-tree.c:133
+#: builtin/read-tree.c:127
 msgid "only empty the index"
 msgstr "apenas esvaziar o índice"
 
-#: builtin/read-tree.c:135
+#: builtin/read-tree.c:129
 msgid "Merging"
 msgstr "A integrar"
 
-#: builtin/read-tree.c:137
+#: builtin/read-tree.c:131
 msgid "perform a merge in addition to a read"
 msgstr "realizar uma integração em adição a uma leitura"
 
-#: builtin/read-tree.c:139
+#: 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:141
+#: 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:143
+#: 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:144
+#: builtin/read-tree.c:138
 msgid "<subdirectory>/"
 msgstr "<subdiretório>/"
 
-#: builtin/read-tree.c:145
+#: builtin/read-tree.c:139
 msgid "read the tree into the index under <subdirectory>/"
 msgstr "ler a árvore em <subdiretório>/ para o índice"
 
-#: builtin/read-tree.c:148
+#: builtin/read-tree.c:142
 msgid "update working tree with merge result"
 msgstr "atualizar a árvore de trabalho com os resultados da integração"
 
-#: builtin/read-tree.c:150
+#: builtin/read-tree.c:144
 msgid "gitignore"
 msgstr "gitignore"
 
-#: builtin/read-tree.c:151
+#: builtin/read-tree.c:145
 msgid "allow explicitly ignored files to be overwritten"
 msgstr "permitir que os ficheiros explicitamente ignorados sejam substituídos"
 
-#: builtin/read-tree.c:154
+#: 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:155
+#: 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:157
+#: builtin/read-tree.c:151
 msgid "skip applying sparse checkout filter"
 msgstr "ignorar a aplicação do filtro de extração esparsa"
 
-#: builtin/read-tree.c:159
+#: builtin/read-tree.c:153
 msgid "debug unpack-trees"
 msgstr "depurar unpack-trees"
 
-#: builtin/rebase--helper.c:7
-msgid "git rebase--helper [<options>]"
+#: builtin/read-tree.c:157
+#, fuzzy
+msgid "suppress feedback messages"
+msgstr "suprimir mensagens informativas"
+
+#: builtin/read-tree.c:188
+#, fuzzy
+msgid "You need to resolve your current index first"
+msgstr "primeiro deve resolver o índice atual"
+
+#: builtin/rebase.c:35
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+
+#: builtin/rebase.c:37
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+
+#: builtin/rebase.c:39
+#, fuzzy
+msgid "git rebase --continue | --abort | --skip | --edit-todo"
+msgstr "git am [<opções>] (--continue | --skip | --abort)"
+
+#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
+#, fuzzy, c-format
+msgid "unusable todo list: '%s'"
+msgstr "lista de tarefas inutilizável: '%s'"
+
+#: builtin/rebase.c:311
+#, fuzzy, c-format
+msgid "could not create temporary %s"
+msgstr "incapaz criar %s temporário"
+
+#: builtin/rebase.c:317
+#, fuzzy
+msgid "could not mark as interactive"
+msgstr "incapaz marcar como interativo"
+
+#: builtin/rebase.c:370
+#, fuzzy
+msgid "could not generate todo list"
+msgstr "incapaz gerar lista de tarefas"
+
+#: builtin/rebase.c:412
+msgid "a base commit must be provided with --upstream or --onto"
+msgstr ""
+
+#: builtin/rebase.c:481
+#, fuzzy
+msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--helper [<opções>]"
 
-#: builtin/rebase--helper.c:19
+#: 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 "permitir commits com mensagens vazias"
+
+#: builtin/rebase.c:500
+#, fuzzy
+msgid "rebase merge commits"
+msgstr "mergetag incorreta no commit '%s'"
+
+#: 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
+#, fuzzy
+msgid "sign commits"
+msgstr "assinar os commits com GPG"
+
+#: 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 "continuar rebase"
 
-#: builtin/rebase--helper.c:21
-msgid "abort rebase"
-msgstr "abortar rebase"
+#: builtin/rebase.c:511
+#, fuzzy
+msgid "skip commit"
+msgstr "commit"
+
+#: builtin/rebase.c:512
+msgid "edit the todo list"
+msgstr ""
+
+#: builtin/rebase.c:514
+#, fuzzy
+msgid "show the current patch"
+msgstr "mostrar remendo atual"
+
+#: 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
+#, fuzzy
+msgid "restrict-revision"
+msgstr "revisão-restrita"
+
+#: builtin/rebase.c:529
+#, fuzzy
+msgid "restrict revision"
+msgstr "revisão restrita"
+
+#: builtin/rebase.c:531
+msgid "squash-onto"
+msgstr ""
+
+#: builtin/rebase.c:532
+msgid "squash onto"
+msgstr ""
+
+#: builtin/rebase.c:534
+#, fuzzy
+msgid "the upstream commit"
+msgstr "Remover a informação do ramo a montante"
+
+#: builtin/rebase.c:536
+#, fuzzy
+msgid "head-name"
+msgstr "mudar nome"
+
+#: builtin/rebase.c:536
+#, fuzzy
+msgid "head name"
+msgstr "à frente "
+
+#: builtin/rebase.c:541
+#, fuzzy
+msgid "rebase strategy"
+msgstr "estratégia de integração"
+
+#: builtin/rebase.c:542
+#, fuzzy
+msgid "strategy-opts"
+msgstr "estratégia"
+
+#: builtin/rebase.c:543
+#, fuzzy
+msgid "strategy options"
+msgstr "opções de decoração"
+
+#: builtin/rebase.c:544
+msgid "switch-to"
+msgstr ""
+
+#: builtin/rebase.c:545
+msgid "the branch or commit to checkout"
+msgstr ""
+
+#: builtin/rebase.c:546
+#, fuzzy
+msgid "onto-name"
+msgstr "para-nome"
+
+#: builtin/rebase.c:546
+#, fuzzy
+msgid "onto name"
+msgstr "para nome"
+
+#: builtin/rebase.c:547
+#, fuzzy
+msgid "cmd"
+msgstr "comando"
+
+#: 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
+#, c-format
+msgid "%s requires the merge backend"
+msgstr ""
+
+#: builtin/rebase.c:625
+#, fuzzy, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "incapaz obter 'onto': '%s'"
+
+#: builtin/rebase.c:642
+#, fuzzy, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "orig-head inválida: '%s'"
+
+#: builtin/rebase.c:667
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr ""
+
+#: builtin/rebase.c:813 git-rebase--preserve-merges.sh:81
+#, fuzzy
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+"Depois de resolver este problema, execute \"git rebase --continue\".\n"
+"Se prefere ignorar este patch, execute \"git rebase --skip\".\n"
+"Para extrair o ramo original e interromper o rebase, execute \"git rebase --"
+"abort\"."
+
+#: builtin/rebase.c:896
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+"    %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+
+#: builtin/rebase.c:1222
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+
+#: builtin/rebase.c:1240
+#, fuzzy, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+msgstr ""
+"%s\n"
+"Por favor, diz o branch sobre o qual queres rebasear.\n"
+"Vê git-rebase(1) para detalhes.\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+
+#: builtin/rebase.c:1256
+#, fuzzy, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
+"Se desejas por tracking information neste branch, podes fazer com:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+
+#: builtin/rebase.c:1286
+msgid "exec commands cannot contain newlines"
+msgstr ""
+
+#: builtin/rebase.c:1290
+msgid "empty exec command"
+msgstr ""
+
+#: builtin/rebase.c:1319
+#, fuzzy
+msgid "rebase onto given branch instead of upstream"
+msgstr "demasiados ramos para remover a definição de ramo a montante"
+
+#: builtin/rebase.c:1321
+#, fuzzy
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "usar a base de junção de upstream e ramo como base atual"
+
+#: builtin/rebase.c:1323
+#, fuzzy
+msgid "allow pre-rebase hook to run"
+msgstr "Rebase recusado pelo hook pre-rebase."
+
+#: builtin/rebase.c:1325
+msgid "be quiet. implies --no-stat"
+msgstr ""
+
+#: builtin/rebase.c:1331
+#, fuzzy
+msgid "do not show diffstat of what changed upstream"
+msgstr "esconder diffstat de o que alterou upstream"
+
+#: builtin/rebase.c:1334
+#, fuzzy
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "adicionar uma linha com Signed-of-by no fim da mensagem de commit"
+
+#: builtin/rebase.c:1337
+#, fuzzy
+msgid "make committer date match author date"
+msgstr "agrupar por committer em vez de autor"
+
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr ""
+
+#: builtin/rebase.c:1341
+#, fuzzy
+msgid "synonym of --reset-author-date"
+msgstr "sinónimo de --reset-author-date"
+
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
+#, fuzzy
+msgid "passed to 'git apply'"
+msgstr "passado para 'git apply'"
+
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr ""
+
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
+msgid "cherry-pick all commits, even if unchanged"
+msgstr ""
+
+#: builtin/rebase.c:1354
+#, fuzzy
+msgid "continue"
+msgstr "continuar rebase"
+
+#: builtin/rebase.c:1357
+#, fuzzy
+msgid "skip current patch and continue"
+msgstr "ignorar remendo atual e continuar"
+
+#: builtin/rebase.c:1359
+#, fuzzy
+msgid "abort and check out the original branch"
+msgstr "  (use \"git rebase --abort\" para restaurar o ramo original)"
+
+#: builtin/rebase.c:1362
+msgid "abort but keep HEAD where it is"
+msgstr ""
+
+#: builtin/rebase.c:1363
+#, fuzzy
+msgid "edit the todo list during an interactive rebase"
+msgstr "editar a lista de afazeres durante rebase interativa"
+
+#: builtin/rebase.c:1366
+msgid "show the patch file being applied or merged"
+msgstr ""
+
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1373
+#, fuzzy
+msgid "use merging strategies to rebase"
+msgstr "estratégia de integração a usar"
+
+#: builtin/rebase.c:1377
+msgid "let the user edit the list of commits to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1381
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr ""
+
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
+msgstr ""
+
+#: builtin/rebase.c:1393
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr ""
+
+#: builtin/rebase.c:1400
+msgid "add exec lines after each commit of the editable list"
+msgstr ""
+
+#: builtin/rebase.c:1404
+#, fuzzy
+msgid "allow rebasing commits with empty messages"
+msgstr "permitir commits com mensagens vazias"
+
+#: builtin/rebase.c:1408
+msgid "try to rebase merges instead of skipping them"
+msgstr ""
+
+#: builtin/rebase.c:1411
+#, fuzzy
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "git merge-base --fork-point <referência> [<commit>]"
+
+#: builtin/rebase.c:1413
+#, fuzzy
+msgid "use the given merge strategy"
+msgstr "opção de estratégia de integração"
+
+#: builtin/rebase.c:1415 builtin/revert.c:115
+msgid "option"
+msgstr "opção"
+
+#: builtin/rebase.c:1416
+msgid "pass the argument through to the merge strategy"
+msgstr ""
+
+#: builtin/rebase.c:1419
+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
+#, fuzzy
+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:1483
+msgid ""
+"git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
+msgstr ""
+
+#: builtin/rebase.c:1488
+#, fuzzy
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr "incapaz de combinar '--keep-base' com '--onto'"
+
+#: builtin/rebase.c:1490
+#, fuzzy
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr "incapaz de combinar '--keep-base' com '--root'"
+
+#: builtin/rebase.c:1494
+#, fuzzy
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "incapaz de combinar '--root' com '--fork-point'"
+
+#: builtin/rebase.c:1497
+msgid "No rebase in progress?"
+msgstr "Algum rebase em curso?"
+
+#: 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 uma rebase interativa."
+
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
+msgid "Cannot read HEAD"
+msgstr "Incapaz ler HEAD"
+
+#: builtin/rebase.c:1536
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"Deve editar todos os conflitos da integração\n"
+"e marcá-los como resolvidos usando git add"
+
+#: builtin/rebase.c:1555
+#, fuzzy
+msgid "could not discard worktree changes"
+msgstr "incapaz de descartar alterações de worktree"
+
+#: builtin/rebase.c:1574
+#, fuzzy, c-format
+msgid "could not move back to %s"
+msgstr "incapaz de retroceder a %s"
+
+#: builtin/rebase.c:1620
+#, fuzzy, 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"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+"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"
+"Caso eu esteja errado, faz por favor\n"
+"\t%s\n"
+"e execute-me novamente. Estou parando caso ainda tenhas algo\n"
+"de valor aí.\n"
+
+#: builtin/rebase.c:1648
+msgid "switch `C' expects a numerical value"
+msgstr ""
+
+#: builtin/rebase.c:1690
+#, fuzzy, c-format
+msgid "Unknown mode: %s"
+msgstr "Mode de --patch desconhecido: %s"
+
+#: builtin/rebase.c:1729
+msgid "--strategy requires --merge or --interactive"
+msgstr ""
+
+#: builtin/rebase.c:1759
+msgid "cannot combine apply options with merge options"
+msgstr ""
+
+#: builtin/rebase.c:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr ""
+
+#: builtin/rebase.c:1802
+msgid "--reschedule-failed-exec requires --exec or --interactive"
+msgstr ""
 
-#: builtin/receive-pack.c:27
+#: 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
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr ""
+
+#: builtin/rebase.c:1856
+#, fuzzy
+msgid "Could not create new root commit"
+msgstr "incapaz criar novo commit raiz"
+
+#: builtin/rebase.c:1882
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr ""
+
+#: builtin/rebase.c:1885
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr ""
+
+#: builtin/rebase.c:1893
+#, fuzzy, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "Aponta nada para commit válido '%s'"
+
+#: builtin/rebase.c:1921
+#, fuzzy, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "fatal: nenhum ramo/commit '%s'"
+
+#: 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:1940
+#, fuzzy
+msgid "Could not resolve HEAD to a revision"
+msgstr "Foi impossível resolver HEAD para uma revisão"
+
+#: builtin/rebase.c:1961
+msgid "Please commit or stash them."
+msgstr "Submeta ou esconda-as."
+
+#: builtin/rebase.c:1997
+#, fuzzy, c-format
+msgid "could not switch to %s"
+msgstr "incapaz alternar para %s"
+
+#: builtin/rebase.c:2008
+#, fuzzy
+msgid "HEAD is up to date."
+msgstr "HEAD está agora em"
+
+#: builtin/rebase.c:2010
+#, fuzzy, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "Branch atual %s está atualizado.\n"
+
+#: builtin/rebase.c:2018
+#, fuzzy
+msgid "HEAD is up to date, rebase forced."
+msgstr "O ramo atual $branch_name está atualizado, rebase forçado."
+
+#: builtin/rebase.c:2020
+#, fuzzy, 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:2028
+msgid "The pre-rebase hook refused to rebase."
+msgstr "Rebase recusado pelo hook pre-rebase."
+
+#: builtin/rebase.c:2035
+#, fuzzy, c-format
+msgid "Changes to %s:\n"
+msgstr "Modificações para %s:\n"
+
+#: builtin/rebase.c:2038
+#, fuzzy, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "Modificações de %s para %s:\n"
+
+#: builtin/rebase.c:2063
+#, fuzzy, 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:2072
+#, fuzzy
+msgid "Could not detach HEAD"
+msgstr "incapaz soltar HEAD"
+
+#: builtin/rebase.c:2081
+#, fuzzy, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "Avançei-rápido %s para %s.\n"
+
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-dir>"
 
-#: builtin/receive-pack.c:796
+#: 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"
@@ -11696,20 +20676,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 a "
-"variável de configuração 'receive.denyCurrentBranch' como 'refuse'."
+"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:816
+#: 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"
@@ -11720,38 +20700,84 @@ msgid ""
 "\n"
 "To squelch this message, you can set it to 'refuse'."
 msgstr ""
-"Por predefinição, eliminar o ramo atual é proibido, porque o próximo\n"
-"'git clone' não resultará em nenhum ficheiro extraído, causando confusão.\n"
+"Por predefinição, apagar o ramo atual é proibido, porque o próximo\n"
+"'git clone' resultará em ficheiro nenhum checked out, causando confusão.\n"
 "\n"
-"Pode definir a variável de configuração 'receive.denyDeleteCurrent' como\n"
+"Podes definir a variável de configuração 'receive.denyDeleteCurrent' como\n"
 "'warn' ou 'ignore' no repositório remoto para permitir eliminar o\n"
-"ramo atual, com ou sem uma mensagem de aviso.\n"
+"ramo atual, com ou sem a mensagem de aviso.\n"
 "\n"
-"Para suprimir esta mensagem, pode definí-la como 'refuse'."
+"Para suprimir esta mensagem, podes definí-la como 'refuse'."
 
-#: builtin/receive-pack.c:1889
+#: builtin/receive-pack.c:2478
 msgid "quiet"
 msgstr "silencioso"
 
-#: builtin/receive-pack.c:1903
+#: builtin/receive-pack.c:2492
 msgid "You must specify a directory."
 msgstr "Deve especificar um diretório."
 
-#: builtin/reflog.c:423
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%s' em '%s' não é um carimbo de data/hora válido"
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:22
+msgid ""
+"git reflog delete [--rewrite] [--updateref] [--dry-run | -n] [--verbose] "
+"<refs>..."
+msgstr ""
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr ""
 
-#: builtin/reflog.c:540 builtin/reflog.c:545
+#: 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:609
+#, c-format
+msgid "Marking reachable objects..."
+msgstr ""
+
+#: builtin/reflog.c:647
+#, c-format
+msgid "%s points nowhere!"
+msgstr ""
 
-#: builtin/remote.c:12
+#: builtin/reflog.c:699
+#, fuzzy
+msgid "no reflog specified to delete"
+msgstr "especificado reflog nenhum para apagar"
+
+#: builtin/reflog.c:708
+#, fuzzy, c-format
+msgid "not a reflog: %s"
+msgstr "reflog inválido: %s"
+
+#: builtin/reflog.c:713
+#, fuzzy, c-format
+msgid "no reflog for '%s'"
+msgstr "reflog nenhum para '%s'"
+
+#: builtin/reflog.c:759
+#, fuzzy, c-format
+msgid "invalid ref format: %s"
+msgstr "formato de ref inválido: %s"
+
+#: builtin/reflog.c:768
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr ""
+
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:13
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -11759,193 +20785,193 @@ msgstr ""
 "git remote add [-t <ramo>] [-m <mestre>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <nome> <url>"
 
-#: builtin/remote.c:14 builtin/remote.c:34
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <antigo> <novo>"
 
-#: builtin/remote.c:15 builtin/remote.c:39
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <nome>"
 
-#: builtin/remote.c:16 builtin/remote.c:44
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <nome> (-a | --auto | -d | --delete | <ramo>)"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <nome>"
 
-#: builtin/remote.c:18
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <nome>"
 
-#: builtin/remote.c:19
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
 
-#: builtin/remote.c:20
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <nome> <ramo>..."
 
-#: builtin/remote.c:21 builtin/remote.c:70
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <nome>"
 
-#: builtin/remote.c:22 builtin/remote.c:75
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <nome> <novo-url> [<url-antigo>]"
 
-#: builtin/remote.c:23 builtin/remote.c:76
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <nome> <novo-url>"
 
-#: builtin/remote.c:24 builtin/remote.c:77
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <nome> <url>"
 
-#: builtin/remote.c:29
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<opções>] <nome> <url>"
 
-#: builtin/remote.c:49
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <nome> <ramo>..."
 
-#: builtin/remote.c:50
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <nome> <ramo>..."
 
-#: builtin/remote.c:55
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<opções>] <nome>"
 
-#: builtin/remote.c:60
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<opções>] <nome>"
 
-#: builtin/remote.c:65
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<opções>] [<grupo> | <remoto>]..."
 
-#: builtin/remote.c:94
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
-msgstr "A atualizar %s"
+msgstr "Atualizando %s"
 
-#: builtin/remote.c:126
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
 msgstr ""
-"--mirror é perigoso e obsoleto;\n"
-"\t use --mirror=fetch ou --mirror=push"
+"--mirror é perigoso e obsoleto; por favor\n"
+"\t usa --mirror=fetch ou --mirror=push invés"
 
-#: builtin/remote.c:143
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "argumento de mirror desconhecido: %s"
 
-#: builtin/remote.c:159
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "obter os ramos remotos"
 
-#: builtin/remote.c:161
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "importar todas as tags e objetos associados ao obter"
 
-#: builtin/remote.c:164
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
-msgstr "ou não obter nenhuma tag (--no-tags)"
+msgstr "ou busca tag nenhuma (--no-tags)"
 
-#: builtin/remote.c:166
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "ramos a seguir"
 
-#: builtin/remote.c:167
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "ramo mestre"
 
-#: builtin/remote.c:168
-msgid "push|fetch"
-msgstr "push|fetch"
-
-#: builtin/remote.c:169
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "configurar o remoto como um espelho para publicar ou obter"
 
-#: builtin/remote.c:181
+#: 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:183
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "especificar ramos para seguir só faz sentido com fetch mirrors"
 
-#: builtin/remote.c:190 builtin/remote.c:629
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr "o remoto %s já existe."
 
-#: builtin/remote.c:194 builtin/remote.c:633
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' não é um nome de remoto válido"
-
-#: builtin/remote.c:234
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
-msgstr "Não foi possível configuração o ramo mestre '%s'"
+msgstr "Incapaz configurar master '%s'"
 
-#: builtin/remote.c:336
+#: builtin/remote.c:355
 #, c-format
 msgid "Could not get fetch map for refspec %s"
-msgstr ""
-"Não foi possível obter o mapa de fetch do especificador de referência %s"
+msgstr "Incapaz de obter mapa de busca para refspec %s"
 
-#: builtin/remote.c:437 builtin/remote.c:445
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr "(correspondente)"
 
-#: builtin/remote.c:449
+#: builtin/remote.c:466
 msgid "(delete)"
-msgstr "(eliminado)"
+msgstr "(apagar)"
 
-#: builtin/remote.c:622 builtin/remote.c:757 builtin/remote.c:856
+#: builtin/remote.c:655
+#, fuzzy, c-format
+msgid "could not set '%s'"
+msgstr "incapaz definir '%s'"
+
+#: builtin/remote.c:660
 #, c-format
-msgid "No such remote: %s"
-msgstr "Remoto inexistente: %s"
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
 
-#: builtin/remote.c:639
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#, fuzzy, c-format
+msgid "No such remote: '%s'"
+msgstr "Remoto inexistente '%s'"
+
+#: builtin/remote.c:710
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
-msgstr ""
-"Não foi possível mudar o nome da secção de configuração de '%s' para '%s'"
+msgstr "Incapaz de mudar o nome a secção de configuração '%s' para '%s'"
 
-#: builtin/remote.c:659
+#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
 "\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:695
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
-msgstr "falha ao eliminar '%s'"
+msgstr "falha ao apagar '%s'"
 
-#: builtin/remote.c:729
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
-msgstr "falha ao criar '%s'"
+msgstr "falhou criar '%s'"
 
-#: builtin/remote.c:794
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -11953,438 +20979,600 @@ 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:808
+#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
-msgstr "Não foi possível remover a secção de configuração '%s'"
+msgstr "Incapaz remover secção de configuração '%s'"
 
-#: builtin/remote.c:909
+#: builtin/remote.c:999
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " novo (os próxima objetos obtidos serão guardados em remotes/%s)"
 
-#: builtin/remote.c:912
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " seguido"
 
-#: builtin/remote.c:914
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " obsoleto (use 'git remote prune' para remover)"
 
-#: builtin/remote.c:916
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:957
+#: 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:965
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "rebaseia interativamente sobre %s do remoto"
 
-#: builtin/remote.c:966
+#: builtin/remote.c:1058
+#, fuzzy, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "rebaseia interativamente sobre %s do remoto"
+
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "rebaseia sobre %s do remoto"
 
-#: builtin/remote.c:969
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr " integra com %s do remoto"
 
-#: builtin/remote.c:972
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "integra com %s do remoto"
 
-#: builtin/remote.c:975
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
-msgstr "%-*s    e com o %s do remoto\n"
+msgstr "%-*s    e com o %s remote\n"
 
-#: builtin/remote.c:1018
+#: builtin/remote.c:1114
 msgid "create"
 msgstr "criado"
 
-#: builtin/remote.c:1021
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr "eliminado"
 
-#: builtin/remote.c:1025
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "atualizado"
 
-#: builtin/remote.c:1028
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
 msgstr "pode ser avançado rapidamente"
 
-#: builtin/remote.c:1031
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "local desatualizado"
 
-#: builtin/remote.c:1038
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s força em %-*s (%s)"
 
-#: builtin/remote.c:1041
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s publica em %-*s (%s)"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s força em %s"
 
-#: builtin/remote.c:1048
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s publica em %s"
 
-#: builtin/remote.c:1116
+#: builtin/remote.c:1212
 msgid "do not query remotes"
-msgstr "não consultar remotos"
+msgstr "faz consulta a remotos nenhuns"
 
-#: builtin/remote.c:1143
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "* remoto %s"
 
-#: builtin/remote.c:1144
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
-msgstr "  Obter    do URL: %s"
+msgstr "  Buscar URL: %s"
 
-#: builtin/remote.c:1145 builtin/remote.c:1158 builtin/remote.c:1297
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
-msgstr "(nenhum URL)"
+msgstr "(URL nenhum)"
 
-#. TRANSLATORS: the colon ':' should align with
-#. the one in "  Fetch URL: %s" translation
-#: builtin/remote.c:1156 builtin/remote.c:1158
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: 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:1160 builtin/remote.c:1162 builtin/remote.c:1164
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Ramo HEAD: %s"
 
-#: builtin/remote.c:1160
+#: builtin/remote.c:1259
 msgid "(not queried)"
-msgstr "(não consultado)"
+msgstr "(nada consultado)"
 
-#: builtin/remote.c:1162
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "(desconhecido)"
 
-#: builtin/remote.c:1166
+#: builtin/remote.c:1265
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
-msgstr "  Ramo HEAD (o remoto HEAD é ambíguo, pode ser um dos seguintes):\n"
+msgstr "  HEAD branch (HEAD remote é ambíguo, pode ser um dos seguintes):\n"
 
-#: builtin/remote.c:1178
+#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Ramo remoto:%s"
 msgstr[1] "  Ramos remotos:%s"
 
-#: builtin/remote.c:1181 builtin/remote.c:1207
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
-msgstr " (estado não consultado)"
+msgstr " (estado é nada consultado)"
 
-#: builtin/remote.c:1190
+#: builtin/remote.c:1289
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Ramo local configurado para 'git pull':"
 msgstr[1] "  Ramos locais configurados para 'git pull':"
 
-#: builtin/remote.c:1198
+#: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Referências locais serão refletidas (mirror) por 'git push'"
 
-#: builtin/remote.c:1204
+#: builtin/remote.c:1303
 #, 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 para 'git push'%s:"
 msgstr[1] "  Referências locais configuradas para 'git push'%s:"
 
-#: builtin/remote.c:1225
+#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "definir refs/remotes/<nome>/HEAD de acordo com o remoto"
 
-#: builtin/remote.c:1227
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "eliminar refs/remotes/<nome>/HEAD"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
-msgstr "Não é possível determinar o remoto HEAD"
+msgstr "Incapaz de determinar o HEAD remoto"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1343
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "Múltiplos ramos HEAD remotos. Escolha um explicitamente com:"
 
-#: builtin/remote.c:1254
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
-msgstr "Não foi possível eliminar %s"
+msgstr "Incapaz eliminar %s"
 
-#: builtin/remote.c:1262
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Referência inválida: %s"
 
-#: builtin/remote.c:1264
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
-msgstr "Não foi possível configurar %s"
+msgstr "Incapaz configurar %s"
 
-#: builtin/remote.c:1282
+#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s ficará suspenso!"
 
-#: builtin/remote.c:1283
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s ficou suspenso!"
 
-#: builtin/remote.c:1293
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "A eliminar %s"
 
-#: builtin/remote.c:1294
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [eliminaria] %s"
 
-#: builtin/remote.c:1313
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [eliminado] %s"
 
-#: builtin/remote.c:1358
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
-msgstr "eliminar remotos depois de obter"
+msgstr "podar remotos após buscar"
 
-#: builtin/remote.c:1421 builtin/remote.c:1475 builtin/remote.c:1543
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Remoto inexistente '%s'"
 
-#: builtin/remote.c:1437
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "adicionar ramo"
 
-#: builtin/remote.c:1444
+#: builtin/remote.c:1546
 msgid "no remote specified"
-msgstr "nenhum remoto especificado"
+msgstr "especificado remoto nenhum"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1563
 msgid "query push URLs rather than fetch URLs"
 msgstr "consultar URLs de publicação em vez de URLs utilizados para obter"
 
-#: builtin/remote.c:1463
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "retornar todos os URLs"
 
-#: builtin/remote.c:1491
+#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
-msgstr "o remoto '%s' não tem nenhum URL configurado"
+msgstr "o remoto '%s' tem configurado URL nenhum"
 
-#: builtin/remote.c:1517
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "manipular URLs de publicação"
 
-#: builtin/remote.c:1519
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "adicionar URL"
 
-#: builtin/remote.c:1521
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "eliminar URLs"
 
-#: builtin/remote.c:1528
+#: 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:1569
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Padrão de URL antigo inválido: %s"
 
-#: builtin/remote.c:1577
+#: 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:1579
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
-msgstr "Não é possível remover todos os URLs de não publicação"
+msgstr "Apagarei apenas alguns URLs de não-atirar"
 
-#: builtin/remote.c:1593
-msgid "be verbose; must be placed before a subcommand"
-msgstr "ser verboso; deve ser colocado antes de um subcomando"
-
-#: builtin/remote.c:1624
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Subcomando desconhecido: %s"
-
-#: builtin/repack.c:17
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr "git repack [<opções>]"
 
-#: builtin/repack.c:22
+#: 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 índices bitmap. Use\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:198
+msgid "could not start pack-objects to repack promisor objects"
+msgstr ""
+
+#: builtin/repack.c:270 builtin/repack.c:630
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr ""
+
+#: builtin/repack.c:294
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr ""
 
-#: builtin/repack.c:166
+#: builtin/repack.c:309
+#, fuzzy, c-format
+msgid "cannot open index for %s"
+msgstr "incapaz opendir '%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:168
+#: 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:171
+#: 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:173
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "passar --no-reuse-delta ao git-pack-objects"
 
-#: builtin/repack.c:175
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "passar --no-reuse-object ao git-pack-objects"
 
-#: builtin/repack.c:177
+#: 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:180
+#: 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:182
+#: builtin/repack.c:476
 msgid "write bitmap index"
 msgstr "escrever índice de mapa de bits"
 
-#: builtin/repack.c:183
+#: builtin/repack.c:478
+#, fuzzy
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "passar --local ao git-pack-objects"
+
+#: builtin/repack.c:479
 msgid "approxidate"
 msgstr "aproximar"
 
-#: builtin/repack.c:184
+#: 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:186
+#: builtin/repack.c:482
 msgid "with -a, repack unreachable objects"
 msgstr "com -a, reempacotar objetos inalcançáveis"
 
-#: builtin/repack.c:188
+#: builtin/repack.c:484
 msgid "size of the window used for delta compression"
 msgstr "dimensão da janela usada em compressão de deltas"
 
-#: builtin/repack.c:189 builtin/repack.c:193
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr "bytes"
 
-#: builtin/repack.c:190
+#: 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:192
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr "limitar a profundidade máxima de delta"
 
-#: builtin/repack.c:194
+#: builtin/repack.c:490
+#, fuzzy
+msgid "limits the maximum number of threads"
+msgstr "limitar a profundidade máxima de delta"
+
+#: builtin/repack.c:492
 msgid "maximum size of each packfile"
 msgstr "tamanho máximo de cada ficheiro de pacote"
 
-#: builtin/repack.c:196
+#: builtin/repack.c:494
 msgid "repack objects in packs marked with .keep"
 msgstr "reempacotar objetos em pacotes marcados com .keep"
 
-#: builtin/repack.c:206
+#: builtin/repack.c:496
+#, fuzzy
+msgid "do not repack this pack"
+msgstr "criar pacotes finos"
+
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr ""
+
+#: 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:210
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable e -A são incompatíveis"
 
-#: builtin/repack.c:400 builtin/worktree.c:115
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr ""
+
+#: builtin/repack.c:639
+msgid "Nothing new to pack."
+msgstr ""
+
+#: builtin/repack.c:669
 #, c-format
-msgid "failed to remove '%s'"
-msgstr "falha ao remover '%s'"
+msgid "missing required file: %s"
+msgstr ""
+
+#: builtin/repack.c:671
+#, fuzzy, c-format
+msgid "could not unlink: %s"
+msgstr "incapaz unlink: %s"
 
-#: builtin/replace.c:19
+#: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
 msgstr "git replace [-f] <objeto> <substituição>"
 
-#: builtin/replace.c:20
+#: builtin/replace.c:23
 msgid "git replace [-f] --edit <object>"
 msgstr "git replace [-f] --edit <objeto>"
 
-#: builtin/replace.c:21
+#: builtin/replace.c:24
 msgid "git replace [-f] --graft <commit> [<parent>...]"
 msgstr "git replace [-f] --graft <commit> [<pai>...]"
 
-#: builtin/replace.c:22
+#: builtin/replace.c:25
+#, fuzzy
+msgid "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --edit <objeto>"
+
+#: builtin/replace.c:26
 msgid "git replace -d <object>..."
 msgstr "git replace -d <objeto>..."
 
-#: builtin/replace.c:23
+#: builtin/replace.c:27
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<formato>] [-l [<padrão>]]"
 
-#: builtin/replace.c:329 builtin/replace.c:367 builtin/replace.c:395
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+
+#: builtin/replace.c:125
+#, fuzzy, c-format
+msgid "replace ref '%s' not found"
+msgstr "ref substituição '%s' por encontrar"
+
+#: builtin/replace.c:141
+#, fuzzy, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "Ref substituição '%s' apagada"
+
+#: builtin/replace.c:153
+#, fuzzy, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "'%s' é nome de ref inválido"
+
+#: builtin/replace.c:158
+#, fuzzy, c-format
+msgid "replace ref '%s' already exists"
+msgstr "ref substituição '%s' já existe"
+
+#: builtin/replace.c:178
 #, c-format
-msgid "Not a valid object name: '%s'"
-msgstr "Nome de objeto inválido: '%s'"
+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 ""
+
+#: builtin/replace.c:229
+#, fuzzy, c-format
+msgid "unable to open %s for writing"
+msgstr "incapaz abrir %s para escrita"
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr ""
+
+#: builtin/replace.c:258
+#, fuzzy, c-format
+msgid "unable to open %s for reading"
+msgstr "incapaz abrir %s para ler"
+
+#: builtin/replace.c:272
+#, fuzzy
+msgid "unable to spawn mktree"
+msgstr "incapaz lançar mktree"
+
+#: builtin/replace.c:276
+#, fuzzy
+msgid "unable to read from mktree"
+msgstr "incapaz ler de mktree"
+
+#: builtin/replace.c:285
+#, fuzzy
+msgid "mktree reported failure"
+msgstr "mktree reportou falha"
+
+#: builtin/replace.c:289
+#, fuzzy
+msgid "mktree did not return an object name"
+msgstr "mktree retornou nome de objeto nenhum"
+
+#: builtin/replace.c:298
+#, fuzzy, c-format
+msgid "unable to fstat %s"
+msgstr "incapaz fstat %s"
 
-#: builtin/replace.c:359
+#: builtin/replace.c:303
+#, fuzzy
+msgid "unable to write object to database"
+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
+msgid "not a valid object name: '%s'"
+msgstr "nome de objeto inválido: '%s'"
+
+#: builtin/replace.c:326
+#, fuzzy, c-format
+msgid "unable to get object type for %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"
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:384
+#, fuzzy, c-format
+msgid "could not parse %s as a commit"
+msgstr "incapaz processar %s como commit"
+
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "mergetag incorreta no commit '%s'"
 
-#: builtin/replace.c:361
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "mergetag malformada no commit '%s'"
 
-#: builtin/replace.c:372
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -12393,49 +21581,112 @@ msgstr ""
 "o commit original '%s' contém a mergetag '%s' que foi excluída; use --edit "
 "em vez de --graft"
 
-#: builtin/replace.c:405
-#, c-format
-msgid "the original commit '%s' has a gpg signature."
+#: builtin/replace.c:469
+#, fuzzy, c-format
+msgid "the original commit '%s' has a gpg signature"
 msgstr "o commit original '%s' tem uma assinatura gpg."
 
-#: builtin/replace.c:406
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "a assinatura será removida do commit suplente!"
 
-#: builtin/replace.c:412
+#: 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
+msgid "graft for '%s' unnecessary"
+msgstr ""
+
+#: builtin/replace.c:492
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr ""
+
+#: builtin/replace.c:527
+#, fuzzy, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"Impossível converter os seguinte(s) graft(s):\n"
+"%s"
 
-#: builtin/replace.c:436
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "listar referências substituídas"
 
-#: builtin/replace.c:437
+#: builtin/replace.c:549
 msgid "delete replace refs"
-msgstr "eliminar referências substituídas"
+msgstr "eliminar refs de substituição"
 
-#: builtin/replace.c:438
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "editar objeto existente"
 
-#: builtin/replace.c:439
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "mudar os pais de um commit"
 
-#: builtin/replace.c:440
+#: builtin/replace.c:552
+#, fuzzy
+msgid "convert existing graft file"
+msgstr "forçar substituição dos ficheiros existentes"
+
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "substituir a referência se esta existir"
 
-#: builtin/replace.c:441
+#: 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:442
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "usar este formato"
 
-#: builtin/rerere.c:12
+#: builtin/replace.c:569
+#, fuzzy
+msgid "--format cannot be used when not listing"
+msgstr "--format apenas pode ser usado quando faz listagem"
+
+#: builtin/replace.c:577
+msgid "-f only makes sense when writing a replacement"
+msgstr ""
+
+#: builtin/replace.c:581
+msgid "--raw only makes sense with --edit"
+msgstr ""
+
+#: builtin/replace.c:587
+msgid "-d needs at least one argument"
+msgstr ""
+
+#: builtin/replace.c:593
+msgid "bad number of arguments"
+msgstr ""
+
+#: builtin/replace.c:599
+msgid "-e needs exactly one argument"
+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 "--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"
+
+#: builtin/rerere.c:13
 msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
 msgstr ""
 "git rerere [clear | forget <caminho>... | status | remaining | diff | gc]"
@@ -12444,154 +21695,206 @@ msgstr ""
 msgid "register clean resolutions in index"
 msgstr "registar resoluções limpas no índice"
 
-#: builtin/reset.c:26
+#: builtin/rerere.c:77
+msgid "'git rerere forget' without paths is deprecated"
+msgstr ""
+
+#: builtin/rerere.c:111
+#, fuzzy, c-format
+msgid "unable to generate diff for '%s'"
+msgstr "incapaz gerar diff para '%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:27
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+#: builtin/reset.c:33
+#, fuzzy
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<árvore-etc>] [--] <caminhos>..."
 
-#: builtin/reset.c:28
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+#: builtin/reset.c:34
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+
+#: builtin/reset.c:35
+#, fuzzy
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<árvore-etc>] [--] [<caminhos>...]"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "misturado"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "suave"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "forte"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "merge"
 
-#: builtin/reset.c:34
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "conservador"
 
-#: builtin/reset.c:74
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "HEAD inválida."
 
-#: builtin/reset.c:76
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "Falha ao procurar árvore de HEAD."
 
-#: builtin/reset.c:82
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Falha ao procurar árvore de %s."
 
-#: builtin/reset.c:100
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD está agora em %s"
 
-#: builtin/reset.c:183
+#: builtin/reset.c:195
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
-msgstr "Não é possível repor de modo %s durante uma integração."
+msgstr "Incapaz de fazer uma reposição %s durante uma junção."
 
-#: builtin/reset.c:276
+#: 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"
 
-#: builtin/reset.c:278
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "repor HEAD e índice"
 
-#: builtin/reset.c:279
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "repor HEAD apenas"
 
-#: builtin/reset.c:281 builtin/reset.c:283
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "repor HEAD, índice e árvore de trabalho"
 
-#: builtin/reset.c:285
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "repor HEAD mas conservar alterações locais"
 
-#: builtin/reset.c:288
+#: builtin/reset.c:310
 msgid "record only the fact that removed paths will be added later"
 msgstr "registar apenas o facto de que os caminhos removidos serão adicionados"
 
-#: builtin/reset.c:305
+#: builtin/reset.c:344
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Falha ao resolver '%s' como referência válida."
 
-#: builtin/reset.c:313
+#: builtin/reset.c:352
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "Falha ao resolver '%s' como árvore válida."
 
-#: builtin/reset.c:322
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch é incompatível com --{hard,mixed,soft}"
 
-#: builtin/reset.c:331
+#: 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>'."
 
-#: builtin/reset.c:333
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
-msgstr "Não é possível repor de modo %s com caminhos."
+msgstr "Incapaz de fazer uma reposição %s com paths."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:388
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
-msgstr "Não é permitido repor de modo %s num repositório nu"
+msgstr "%s reset é proíbido num repositório nú"
 
-#: builtin/reset.c:347
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
 msgstr "-N só pode ser usado com --mixed"
 
-#: builtin/reset.c:364
+#: 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
+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 ""
 
-#: builtin/reset.c:370
+#: builtin/reset.c:434
 #, c-format
 msgid "Could not reset index file to revision '%s'."
-msgstr "Não foi possível repor o ficheiro índice para a revisão '%s'."
+msgstr "Incapaz repor ficheiro index para a revisão '%s'."
 
-#: builtin/reset.c:374
+#: builtin/reset.c:439
 msgid "Could not write new index file."
-msgstr "Não foi possível escrever novo ficheiro de índice."
+msgstr "Incapaz escrever novo ficheiro index."
+
+#: builtin/rev-list.c:541
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr ""
 
-#: builtin/rev-list.c:354
+#: builtin/rev-list.c:602
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: 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:679
+msgid "marked counting is incompatible with --objects"
+msgstr ""
 
-#: builtin/rev-parse.c:393
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<opções>] -- [<argumentos>...]"
 
-#: builtin/rev-parse.c:398
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "conservar '--' passado como argumento"
 
-#: builtin/rev-parse.c:400
+#: 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:403
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "mostrar em formato fixo e longo"
 
-#: builtin/rev-parse.c:534
+#: builtin/rev-parse.c:438
+#, fuzzy
+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
+#, fuzzy
+msgid "Needed a single revision"
+msgstr "Precisava uma única revisão"
+
+#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12600,102 +21903,153 @@ msgid ""
 "Run \"git rev-parse --parseopt -h\" for more information on the first usage."
 msgstr ""
 "git rev-parse --parseopt [<opções>] -- [<argumentos>...]\n"
-"   or: git rev-parse --sq-quote [<argumentos>...]\n"
-"   or: git rev-parse [<opções>] [<argumentos>...]\n"
+"   ou: git rev-parse --sq-quote [<argumentos>...]\n"
+"   ou: git rev-parse [<opções>] [<argumentos>...]\n"
 "\n"
-"Execute \"git rev-parse --parseopt -h\" para obter mais informação sobre a "
-"primeira utilização."
-
-#: builtin/revert.c:22
+"Execute \"git rev-parse --parseopt -h\" para mais informação com a primeira "
+"utilização."
+
+#: builtin/rev-parse.c:712
+#, fuzzy
+msgid "--resolve-git-dir requires an argument"
+msgstr "--resolve-git-dir requer argumento"
+
+#: builtin/rev-parse.c:715
+#, fuzzy, c-format
+msgid "not a gitdir '%s'"
+msgstr "gitdir '%s' nenhuma"
+
+#: builtin/rev-parse.c:739
+#, fuzzy
+msgid "--git-path requires an argument"
+msgstr "--git-path requer argumento"
+
+#: builtin/rev-parse.c:749
+#, fuzzy
+msgid "-n requires an argument"
+msgstr "-n requer argumento"
+
+#: builtin/rev-parse.c:763
+#, fuzzy
+msgid "--path-format requires an argument"
+msgstr "--path-format requer argumento"
+
+#: builtin/rev-parse.c:769
+#, fuzzy, c-format
+msgid "unknown argument to --path-format: %s"
+msgstr "argumento desconhecido para --path-format: %s"
+
+#: builtin/rev-parse.c:776
+#, fuzzy
+msgid "--default requires an argument"
+msgstr "--default requer argumento"
+
+#: builtin/rev-parse.c:782
+#, fuzzy
+msgid "--prefix requires an argument"
+msgstr "--prefix requer argumento"
+
+#: builtin/rev-parse.c:851
+#, fuzzy, c-format
+msgid "unknown mode for --abbrev-ref: %s"
+msgstr "modo desconhecido para --abbrev-ref: %s"
+
+#: builtin/rev-parse.c:1023
+#, fuzzy, 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>..."
 
-#: builtin/revert.c:23
+#: builtin/revert.c:25
 msgid "git revert <subcommand>"
 msgstr "git revert <subcommando>"
 
-#: builtin/revert.c:28
+#: builtin/revert.c:30
 msgid "git cherry-pick [<options>] <commit-ish>..."
 msgstr "git cherry-pick [<opções>] <commit-etc>..."
 
-#: builtin/revert.c:29
+#: builtin/revert.c:31
 msgid "git cherry-pick <subcommand>"
 msgstr "git cherry-pick <subcommando>"
 
-#: builtin/revert.c:89
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+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:98
+#: builtin/revert.c:102
 msgid "end revert or cherry-pick sequence"
 msgstr "terminar reversão ou cherry-pick"
 
-#: builtin/revert.c:99
+#: builtin/revert.c:103
 msgid "resume revert or cherry-pick sequence"
 msgstr "retomar a reversão ou cherry-pick"
 
-#: builtin/revert.c:100
+#: builtin/revert.c:104
 msgid "cancel revert or cherry-pick sequence"
 msgstr "cancelar reversão ou cherry-pick"
 
-#: builtin/revert.c:101
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr ""
+
+#: builtin/revert.c:107
 msgid "don't automatically commit"
-msgstr "não submeter automaticamente"
+msgstr "memorizar automaticamente nada"
 
-#: builtin/revert.c:102
+#: builtin/revert.c:108
 msgid "edit the commit message"
-msgstr "editar a mensagem de commit"
+msgstr "editar mensagem de memória"
 
-#: builtin/revert.c:105
+#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "número-pai"
 
-#: builtin/revert.c:106
+#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "selecionar pai principal"
 
-#: builtin/revert.c:108
+#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "estratégia de integração"
 
-#: builtin/revert.c:109
-msgid "option"
-msgstr "opção"
-
-#: builtin/revert.c:110
+#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "opção de estratégia de integração"
 
-#: builtin/revert.c:119
+#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "acrescentar nome do commit"
 
-#: builtin/revert.c:121
+#: builtin/revert.c:127
 msgid "preserve initially empty commits"
 msgstr "preservar commits inicialmente vazios"
 
-#: builtin/revert.c:122
-msgid "allow commits with empty messages"
-msgstr "permitir commits com mensagens vazias"
-
-#: builtin/revert.c:123
+#: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "manter commits redundantes e vazios"
 
-#: builtin/revert.c:211
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr "falha ao reverter"
 
-#: builtin/revert.c:224
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr "falha ao efetuar cherry-pick"
 
-#: builtin/rm.c:17
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<opções>] [--] <ficheiro>..."
 
-#: builtin/rm.c:205
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -12703,27 +22057,27 @@ msgid_plural ""
 "the following files have staged content different from both the\n"
 "file and the HEAD:"
 msgstr[0] ""
-"o seguinte ficheiro tem conteúdo preparado no índice diferente\n"
-"do conteúdo no ficheiro e em HEAD:"
+"o seguinte ficheiro tem staged content diferente quer no ficheiro\n"
+"quer em HEAD:"
 msgstr[1] ""
-"os seguintes ficheiros têm conteúdo preparado no índice diferente\n"
-"do conteúdo no ficheiro e em HEAD:"
+"os seguintes ficheiros têm staged content diferente quer no ficheiro\n"
+"quer em HEAD:"
 
-#: builtin/rm.c:210
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
 msgstr ""
 "\n"
-"(use -f para forçar remoção)"
+"(usa -f para forçar remoção)"
 
-#: builtin/rm.c:214
+#: 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:218 builtin/rm.c:227
+#: builtin/rm.c:221 builtin/rm.c:230
 msgid ""
 "\n"
 "(use --cached to keep the file, or -f to force removal)"
@@ -12731,48 +22085,53 @@ msgstr ""
 "\n"
 "(use --cached para manter o ficheiro, ou -f para forçar remoção)"
 
-#: builtin/rm.c:224
+#: 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:242
+#: builtin/rm.c:244
 msgid "do not list removed files"
-msgstr "não listar ficheiros removidos"
+msgstr "listar ficheiros removidos nenhuns"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr "remover apenas do índice"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
 msgstr "ignorar verificação de atualização"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr "permitir remoção recursiva"
 
-#: builtin/rm.c:247
+#: 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:283
+msgid "No pathspec was given. Which files should I remove?"
+msgstr ""
 
-#: builtin/rm.c:308
+#: builtin/rm.c:310
+#, fuzzy
+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"
+
+#: 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:347
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
-msgstr "git rm: não é possível remover %s"
-
-#: builtin/rm.c:370
-#, c-format
-msgid "could not remove '%s'"
-msgstr "não foi possível remover '%s'"
+msgstr "git rm: incapaz remover %s"
 
-#: builtin/send-pack.c:18
+#: builtin/send-pack.c:20
 msgid ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
@@ -12781,56 +22140,90 @@ msgid ""
 msgstr ""
 "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
 "receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<diretório> "
-"[<referência>...]\n"
-"  --all e especificação explicita duma <referência> são mutuamente "
-"exclusivos."
+"[<ref>...]\n"
+"  --all e <ref> explícito são mutuamente exclusivos."
 
-#: builtin/send-pack.c:161
+#: builtin/send-pack.c:188
 msgid "remote name"
-msgstr "nome do remoto"
+msgstr "nome de remoto"
 
-#: builtin/send-pack.c:175
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "use protocolo RPC sem estado"
 
-#: builtin/send-pack.c:176
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "ler referências do stdin"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr "imprimir estado do programa auxiliar remoto"
 
-#: builtin/shortlog.c:13
-msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+#: builtin/shortlog.c:16
+#, fuzzy
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr ""
 "git shortlog [<opções>] [<intervalo-de-revisões>] [[--] [<caminho>...]]"
 
-#: builtin/shortlog.c:248
-msgid "Group by committer rather than author"
+#: builtin/shortlog.c:17
+#, fuzzy
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<opções>]"
+
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:323
+#, fuzzy, c-format
+msgid "unknown group type: %s"
+msgstr "Tipo desconhecido: %d"
+
+#: builtin/shortlog.c:351
+#, fuzzy
+msgid "group by committer rather than author"
 msgstr "agrupar por committer em vez de autor"
 
-#: builtin/shortlog.c:250
+#: 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:252
-msgid "Suppress commit descriptions, only provides commit count"
+#: builtin/shortlog.c:356
+#, fuzzy
+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:254
-msgid "Show the email address of each author"
+#: builtin/shortlog.c:358
+#, fuzzy
+msgid "show the email address of each author"
 msgstr "Mostrar o endereço de e-mail de cada autor"
 
-#: builtin/shortlog.c:255
-msgid "w[,i1[,i2]]"
-msgstr "w[,i1[,i2]]"
+#: builtin/shortlog.c:359
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr ""
 
-#: builtin/shortlog.c:256
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+#, fuzzy
+msgid "linewrap output"
 msgstr "ajustar linhas"
 
-#: builtin/show-branch.c:10
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr ""
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr ""
+
+#: builtin/shortlog.c:391
+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"
@@ -12842,131 +22235,139 @@ msgstr ""
 "\t\t[--more=<n> | --list | --independent | --merge-base]\n"
 "\t\t[--no-name | --sha1-name] [--topics] [(<revisão> | <glob>)...]"
 
-#: builtin/show-branch.c:14
+#: 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>]"
 
-#: builtin/show-branch.c:374
+#: 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:536
+#: builtin/show-branch.c:548
 #, c-format
 msgid "no matching refs with %s"
-msgstr "nenhuma referência corresponde com %s"
+msgstr "correspondência de refs com %s nenhuma"
 
-#: builtin/show-branch.c:632
+#: builtin/show-branch.c:645
 msgid "show remote-tracking and local branches"
 msgstr "mostrar os ramos de monitorização remotos e os ramos locais"
 
-#: builtin/show-branch.c:634
+#: builtin/show-branch.c:647
 msgid "show remote-tracking branches"
-msgstr "mostrar os ramos de monitorização remotos"
+msgstr ""
 
-#: builtin/show-branch.c:636
+#: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
 msgstr "colorir '*!+-' correspondendo ao ramo"
 
-#: builtin/show-branch.c:638
+#: builtin/show-branch.c:651
 msgid "show <n> more commits after the common ancestor"
 msgstr "mostrar mais <n> commits depois do antecessor comum"
 
-#: builtin/show-branch.c:640
+#: builtin/show-branch.c:653
 msgid "synonym to more=-1"
 msgstr "sinónimo de more=-1"
 
-#: builtin/show-branch.c:641
+#: builtin/show-branch.c:654
 msgid "suppress naming strings"
 msgstr "suprimir a cadeias de caracteres de nomes"
 
-#: builtin/show-branch.c:643
+#: builtin/show-branch.c:656
 msgid "include the current branch"
 msgstr "incluir o ramo atual"
 
-#: builtin/show-branch.c:645
+#: builtin/show-branch.c:658
 msgid "name commits with their object names"
 msgstr "designar commits pelos seus nomes de objeto"
 
-#: builtin/show-branch.c:647
+#: builtin/show-branch.c:660
 msgid "show possible merge bases"
 msgstr "mostrar possíveis bases de integração"
 
-#: builtin/show-branch.c:649
+#: builtin/show-branch.c:662
 msgid "show refs unreachable from any other ref"
 msgstr "mostrar referências inalcançáveis a partir de outras referências"
 
-#: builtin/show-branch.c:651
+#: 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:654
+#: 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 commits fora do primeiro ramo"
 
-#: builtin/show-branch.c:656
+#: builtin/show-branch.c:669
 msgid "show merges reachable from only one tip"
 msgstr "mostrar integrações alcançáveis a partir duma única ponta"
 
-#: builtin/show-branch.c:658
+#: builtin/show-branch.c:671
 msgid "topologically sort, maintaining date order where possible"
 msgstr ""
 "ordenar topologicamente, mantendo a ordenação por data sempre que possível"
 
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:674
 msgid "<n>[,<base>]"
 msgstr "<n>[,<base>]"
 
-#: builtin/show-branch.c:662
+#: builtin/show-branch.c:675
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "mostrar as <n> entradas de ref-log mais recente a partir da base"
 
-#: builtin/show-branch.c:696
+#: builtin/show-branch.c:711
 msgid ""
 "--reflog is incompatible with --all, --remotes, --independent or --merge-base"
 msgstr ""
 "--reflog é incompatível com --all, --remotes, --independent or --merge-base"
 
-#: builtin/show-branch.c:720
+#: builtin/show-branch.c:735
 msgid "no branches given, and HEAD is not valid"
-msgstr "nenhum ramo fornecido e HEAD não é válida"
+msgstr "fornecido ramo nenhum, e HEAD é inválida"
 
-#: builtin/show-branch.c:723
+#: builtin/show-branch.c:738
 msgid "--reflog option needs one branch name"
 msgstr "a opção --reflog precisa do nome de um ramo"
 
-#: builtin/show-branch.c:726
+#: builtin/show-branch.c:741
 #, 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] "apenas %d entrada podem ser mostradas neste momento."
 msgstr[1] "apenas %d entradas podem ser mostradas neste momento."
 
-#: builtin/show-branch.c:730
+#: 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:814
+#: 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:818
+#: 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:821
+#: 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-ref.c:10
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr ""
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr ""
+
+#: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
@@ -12974,353 +22375,1070 @@ msgstr ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
 "hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<padrão>...]"
 
-#: builtin/show-ref.c:11
+#: builtin/show-ref.c:13
 msgid "git show-ref --exclude-existing[=<pattern>]"
 msgstr "git show-ref --exclude-existing[=<padrão>]"
 
-#: builtin/show-ref.c:159
+#: builtin/show-ref.c:162
 msgid "only show tags (can be combined with heads)"
 msgstr "mostrar apenas tags (pode ser combinado com heads)"
 
-#: builtin/show-ref.c:160
+#: builtin/show-ref.c:163
 msgid "only show heads (can be combined with tags)"
 msgstr "mostrar apenas cabeças (pode ser combinado com tags)"
 
-#: builtin/show-ref.c:161
+#: builtin/show-ref.c:164
 msgid "stricter reference checking, requires exact ref path"
 msgstr ""
 "verificação de referências mais rigorosa, requer o caminho exato da "
 "referência"
 
-#: builtin/show-ref.c:164 builtin/show-ref.c:166
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
 msgid "show the HEAD reference, even if it would be filtered out"
 msgstr "mostrar a referência HEAD, mesmo que fosse filtrada"
 
-#: builtin/show-ref.c:168
+#: builtin/show-ref.c:171
 msgid "dereference tags into object IDs"
 msgstr "desreferenciar tags em IDs de objeto"
 
-#: builtin/show-ref.c:170
+#: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
 msgstr "mostrar hash SHA1 com <n> digitos"
 
-#: builtin/show-ref.c:174
+#: 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:176
+#: 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:22
+msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
+msgstr ""
+
+#: builtin/sparse-checkout.c:46
+#, fuzzy
+msgid "git sparse-checkout list"
+msgstr "git archive --list"
+
+#: builtin/sparse-checkout.c:72
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:227
+#, fuzzy
+msgid "failed to create directory for sparse-checkout file"
+msgstr "falha ao criar o diretório %s"
+
+#: builtin/sparse-checkout.c:268
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+
+#: builtin/sparse-checkout.c:270
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr ""
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr ""
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr ""
+
+#: 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'"
+
+#: builtin/sparse-checkout.c:413
+#, fuzzy, c-format
+msgid "could not normalize path %s"
+msgstr "incapaz normalizar patch %s"
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:450
+#, fuzzy, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "incapaz de unquote string de C-style '%s'"
+
+#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+msgid "unable to load existing sparse-checkout patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:573
+msgid "read patterns from standard in"
+msgstr ""
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr ""
+
+#: builtin/sparse-checkout.c:607
+#, fuzzy
+msgid "git sparse-checkout disable"
+msgstr "ignorar a aplicação do filtro de extração esparsa"
+
+#: builtin/sparse-checkout.c:638
+#, fuzzy
+msgid "error while refreshing working directory"
+msgstr "erro enquanto refrescava pasta de trabalho"
+
+#: builtin/stash.c:24 builtin/stash.c:40
+#, fuzzy
+msgid "git stash list [<options>]"
+msgstr "git stash list [<opções>]"
+
+#: builtin/stash.c:25 builtin/stash.c:45
+#, fuzzy
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<opções>] [<escondido>]"
+
+#: builtin/stash.c:26 builtin/stash.c:50
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:27
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:28 builtin/stash.c:65
+#, fuzzy
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <nome-de-ramo> [<escondido>]"
+
+#: 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"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
+"          [--] [<pathspec>...]]"
+msgstr ""
+
+#: 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:55
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:60
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr ""
+
+#: builtin/stash.c:75
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr ""
+
+#: 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:130
+#, fuzzy, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' é commit tipo-arrumos nenhum"
+
+#: builtin/stash.c:150
+#, fuzzy, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Demasiadas revisões especificadas: $REV"
+
+#: builtin/stash.c:164
+#, fuzzy
+msgid "No stash entries found."
+msgstr "Nenhuma pilha encontrada."
+
+#: builtin/stash.c:178
+#, fuzzy, c-format
+msgid "%s is not a valid reference"
+msgstr "%s é referência inválida"
 
-#: builtin/stripspace.c:17
+#: builtin/stash.c:227
+#, fuzzy
+msgid "git stash clear with arguments is unimplemented"
+msgstr "git stash clear com parâmetros está por implementar"
+
+#: 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:492
+#, fuzzy
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "incapaz aplicar arrumação durante uma junção"
+
+#: builtin/stash.c:503
+#, fuzzy, c-format
+msgid "could not generate diff %s^!."
+msgstr "incapaz gerar diff %s^!."
+
+#: builtin/stash.c:510
+#, fuzzy
+msgid "conflicts in index. Try without --index."
+msgstr "Conflitos no index. Tenta sem --index."
+
+#: builtin/stash.c:516
+#, fuzzy
+msgid "could not save index tree"
+msgstr "incapaz guardar árvore index"
+
+#: builtin/stash.c:525
+#, fuzzy
+msgid "could not restore untracked files from stash"
+msgstr "incapaz restaurar ficheiros por seguir de arrumos"
+
+#: builtin/stash.c:539
+#, fuzzy, c-format
+msgid "Merging %s with %s"
+msgstr "Juntando %s com %s"
+
+#: builtin/stash.c:549
+msgid "Index was not unstashed."
+msgstr "Index está por despreparar."
+
+#: builtin/stash.c:591 builtin/stash.c:689
+msgid "attempt to recreate the index"
+msgstr ""
+
+#: builtin/stash.c:635
+#, fuzzy, c-format
+msgid "Dropped %s (%s)"
+msgstr "A descartar ${REV} ($s)"
+
+#: builtin/stash.c:638
+#, fuzzy, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Incapaz descartar entrada de arrumos"
+
+#: builtin/stash.c:651
+#, fuzzy, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' é referência de arrumos nenhuma"
+
+#: builtin/stash.c:701
+#, fuzzy
+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:724
+msgid "No branch name specified"
+msgstr "Nenhum nome de ramo especificado"
+
+#: builtin/stash.c:808
+#, fuzzy
+msgid "failed to parse tree"
+msgstr "falhou processar árvore"
+
+#: builtin/stash.c:819
+#, fuzzy
+msgid "failed to unpack trees"
+msgstr "falha ao descompactar o objeto árvore HEAD"
+
+#: builtin/stash.c:839
+#, fuzzy
+msgid "include untracked files in the stash"
+msgstr "incluir ficheiros desmonitorizados de esconderijo"
+
+#: builtin/stash.c:842
+#, fuzzy
+msgid "only show untracked files in the stash"
+msgstr "mostrar apenas ficheiros desmonitorizados de esconderijo"
+
+#: builtin/stash.c:929 builtin/stash.c:966
+#, fuzzy, c-format
+msgid "Cannot update %s with %s"
+msgstr "Incapaz atualizar %s com %s"
+
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+#, fuzzy
+msgid "stash message"
+msgstr "mensagem da tag"
+
+#: builtin/stash.c:957
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr ""
+
+#: builtin/stash.c:1171
+msgid "No changes selected"
+msgstr "Nenhuma alteração selecionada"
+
+#: builtin/stash.c:1271
+msgid "You do not have the initial commit yet"
+msgstr "Commit inicial ainda é inexistente"
+
+#: builtin/stash.c:1298
+msgid "Cannot save the current index state"
+msgstr "Incapaz guardar estado atual de index"
+
+#: builtin/stash.c:1307
+msgid "Cannot save the untracked files"
+msgstr "Incapaz de guardar ficheiros por seguir"
+
+#: 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:1355
+msgid "Cannot record working tree state"
+msgstr "Incapaz gravar o estado de worktree"
+
+#: 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:1422
+#, fuzzy
+msgid "Did you forget to 'git add'?"
+msgstr "Será que falta 'git add'?"
+
+#: builtin/stash.c:1437
+msgid "No local changes to save"
+msgstr "Com alterações locais para guardar nenhumas"
+
+#: builtin/stash.c:1444
+msgid "Cannot initialize stash"
+msgstr "Incapaz inicializar arrumos"
+
+#: builtin/stash.c:1459
+msgid "Cannot save the current status"
+msgstr "Incapaz guardar o estado atual"
+
+#: builtin/stash.c:1464
+#, fuzzy, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Diretório de trabalho e estado do índice $stash_msg guardados"
+
+#: builtin/stash.c:1554
+msgid "Cannot remove worktree changes"
+msgstr "Incapaz remover alterações de worktree"
+
+#: builtin/stash.c:1593 builtin/stash.c:1658
+msgid "keep index"
+msgstr ""
+
+#: builtin/stash.c:1595 builtin/stash.c:1660
+msgid "stash in patch mode"
+msgstr ""
+
+#: builtin/stash.c:1596 builtin/stash.c:1661
+#, fuzzy
+msgid "quiet mode"
+msgstr "modo silencioso"
+
+#: builtin/stash.c:1598 builtin/stash.c:1663
+#, fuzzy
+msgid "include untracked files in stash"
+msgstr "incluir ficheiros desmonitorizados de esconderijo"
+
+#: builtin/stash.c:1600 builtin/stash.c:1665
+#, fuzzy
+msgid "include ignore files"
+msgstr "mostrar ficheiros ignorados"
+
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+
+#: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
 msgstr "git stripspace [-s | --strip-comments]"
 
-#: builtin/stripspace.c:18
+#: builtin/stripspace.c:19
 msgid "git stripspace [-c | --comment-lines]"
 msgstr "git stripspace [-c | --comment-lines]"
 
-#: builtin/stripspace.c:35
+#: builtin/stripspace.c:37
 msgid "skip and remove all lines starting with comment character"
 msgstr ""
 "ignorar e remover todas as linhas começadas com um carácter de comentário"
 
-#: builtin/stripspace.c:38
+#: builtin/stripspace.c:40
 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:24 builtin/submodule--helper.c:1075
-#, c-format
-msgid "No such ref: %s"
-msgstr "Referência inexistente: %s"
-
-#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1084
+#: 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:71
+#: builtin/submodule--helper.c:63
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr ""
+
+#: 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:305 builtin/submodule--helper.c:630
+#: 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:310
+#: 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:356 builtin/submodule--helper.c:382
+#: 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:395
+#: builtin/submodule--helper.c:526
+#, fuzzy, c-format
+msgid "Entering '%s'\n"
+msgstr "Entrando em '%s'\n"
+
+#: builtin/submodule--helper.c:529
 #, c-format
 msgid ""
-"could not lookup configuration '%s'. Assuming this repository is its own "
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:551
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
+msgstr ""
+
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+#, fuzzy
+msgid "recurse into nested submodules"
+msgstr "percorrer recursivamente submódulos aninhados"
+
+#: builtin/submodule--helper.c:574
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr ""
+
+#: builtin/submodule--helper.c:601
+#, fuzzy, 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:406
+#: 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'"
 
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:672
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
-msgstr "Submódulo '%s' (%s) registado com caminho '%s'\n"
+msgstr "Submódulo '%s' (%s) registado para path '%s'\n"
 
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:682
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
-msgstr "aviso: modo de atualização do comando sugerido para o submódulo '%s'\n"
+msgstr "aviso: modo command update sugerido para submódulo '%s'\n"
 
-#: builtin/submodule--helper.c:427
+#: 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:443
-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:448
-msgid "git submodule--helper init [<path>]"
-msgstr "git submodule--helper init [<caminho>]"
+#: builtin/submodule--helper.c:716
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr ""
 
-#: builtin/submodule--helper.c:476
+#: 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"
+
+#: builtin/submodule--helper.c:837
+#, fuzzy, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "incapaz resolver ref HEAD dentro de submódulo '%s'"
+
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#, fuzzy, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "falha a percorrer recursivamente dentro de submódulo '%s'"
+
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+#, fuzzy
+msgid "suppress submodule status output"
+msgstr "preceder isto ao caminho do submódulo"
+
+#: builtin/submodule--helper.c:889
+msgid ""
+"use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:895
+#, fuzzy
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
+
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <caminho>"
 
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:991
 #, c-format
-msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgid "* %s %s(blob)->%s(submodule)"
 msgstr ""
-"nenhum mapeamento de submódulo do caminho '%s' encontrado em .gitmodules"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr ""
+
+#: builtin/submodule--helper.c:1007
+#, fuzzy, c-format
+msgid "%s"
+msgstr "[%s]"
+
+#: builtin/submodule--helper.c:1057
+#, fuzzy, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "incapaz fazer hash a objeto a partir de '%s'"
+
+#: builtin/submodule--helper.c:1061
+#, fuzzy, c-format
+msgid "unexpected mode %o\n"
+msgstr "modo inesperado %o\n"
+
+#: builtin/submodule--helper.c:1302
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:1304
+#, fuzzy
+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:1308
+#, fuzzy
+msgid "limit the summary size"
+msgstr "restringir-se a cabeças"
+
+#: builtin/submodule--helper.c:1313
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1337
+#, fuzzy
+msgid "could not fetch a revision for HEAD"
+msgstr "incapaz buscar uma revisão para HEAD"
+
+#: builtin/submodule--helper.c:1342
+msgid "--cached and --files are mutually exclusive"
+msgstr ""
+
+#: builtin/submodule--helper.c:1409
+#, fuzzy, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "Sincronizando url de submódulo para '%s'\n"
+
+#: builtin/submodule--helper.c:1415
+#, fuzzy, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "Falha ao registar o URL do caminho de submódulo '%s'"
+
+#: builtin/submodule--helper.c:1429
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1440
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
+msgstr ""
+
+#: builtin/submodule--helper.c:1494
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1548
+#, fuzzy, 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 ""
+"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:1560
+#, fuzzy, 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"
+
+#: builtin/submodule--helper.c:1568
+#, fuzzy, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "Pasta '%s' limpa\n"
+
+#: builtin/submodule--helper.c:1570
+#, fuzzy, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "Impossível remover submodule work tree '%s'\n"
+
+#: builtin/submodule--helper.c:1581
+#, fuzzy, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "incapaz criar pasta vazio de submódulo %s"
+
+#: builtin/submodule--helper.c:1597
+#, fuzzy, 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:1626
+msgid "remove submodule working trees even if they contain local changes"
+msgstr ""
+
+#: builtin/submodule--helper.c:1627
+msgid "unregister all submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:1632
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+
+#: 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"
+
+#: 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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+
+#: 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:604
+#: 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:611
+#: 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:633
+#: 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:636
+#: 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:639
+#: 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:645
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
 msgid "depth for shallow clones"
 msgstr "profundidade de clones rasos"
 
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: 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:653
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+#, fuzzy
+msgid "disallow cloning into non-empty directory"
+msgstr "a aplicar a um histórico vazio"
+
+#: builtin/submodule--helper.c:1916
+#, fuzzy
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<caminho>] [--quiet] [--reference "
 "<repositório>] [--name <nome>] [--depth <depth>] --url <url> --path <caminho>"
 
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:1953
 #, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "falha ao clonar '%s' no caminho de submódulo '%s'"
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr ""
 
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:1957
 #, 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'"
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr ""
 
-#: builtin/submodule--helper.c:764
+#: 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:768
+#: 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:793
+#: 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:814
+#: 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:942
+#: 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:953
+#: 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:974 builtin/submodule--helper.c:1162
+#: 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:977
+#: 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:981
+#: builtin/submodule--helper.c:2351
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout ou none"
 
-#: builtin/submodule--helper.c:985
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2357
+#, fuzzy
+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:988
+#: builtin/submodule--helper.c:2360
 msgid "parallel jobs"
 msgstr "trabalhos em paralelo"
 
-#: builtin/submodule--helper.c:990
+#: 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:991
+#: 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:998
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+#: builtin/submodule--helper.c:2374
+#, fuzzy
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<caminho>] [<caminho>...]"
 
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:2387
 msgid "bad value for update parameter"
 msgstr "valor incorreto no parâmetro update"
 
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:2435
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
 "the superproject is not on any branch"
 msgstr ""
-"O ramo do submódulo (%s) foi configurado para herdar o ramo do superprojeto, "
-"mas o superprojeto não está em nenhum ramo"
+"Ramo de submódulo (%s) foi configurado para herdar o ramo do superprojeto, "
+"mas o superprojeto está em ramo nenhum"
+
+#: builtin/submodule--helper.c:2558
+#, fuzzy, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "incapaz obter pega de repositório para submódulo '%s'"
 
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:2591
 msgid "recurse into submodules"
-msgstr "percorrer submódulos recursivamente"
+msgstr "percorrer recursivamente submódulos"
 
-#: builtin/submodule--helper.c:1169
-msgid "git submodule--helper embed-git-dir [<path>...]"
+#: builtin/submodule--helper.c:2597
+#, fuzzy
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<caminho>...]"
 
-#: builtin/submodule--helper.c:1226
-msgid "submodule--helper subcommand must be called with a subcommand"
-msgstr "o subcomando submodule--helper deve ser invocado com um subcomando"
+#: builtin/submodule--helper.c:2653
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr ""
+
+#: builtin/submodule--helper.c:2656
+#, fuzzy
+msgid "unset the config in the .gitmodules file"
+msgstr "falha ao preparar .gitmodules atualizado"
+
+#: builtin/submodule--helper.c:2661
+#, fuzzy
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper name <caminho>"
+
+#: builtin/submodule--helper.c:2662
+msgid "git submodule--helper config --unset <name>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2663
+msgid "git submodule--helper config --check-writeable"
+msgstr ""
+
+#: builtin/submodule--helper.c:2682 git-submodule.sh:150
+#, fuzzy, 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"
+
+#: builtin/submodule--helper.c:2698
+msgid "suppress output for setting url of a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:2702
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2735
+msgid "set the default tracking branch to master"
+msgstr ""
+
+#: builtin/submodule--helper.c:2737
+msgid "set the default tracking branch"
+msgstr ""
 
-#: builtin/submodule--helper.c:1233
+#: builtin/submodule--helper.c:2741
+#, fuzzy
+msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr "git submodule--helper set-branch [-q|--quiet] (-d|--default) <caminho>"
+
+#: builtin/submodule--helper.c:2742
+#, fuzzy
+msgid ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <ramo> <caminho>"
+
+#: builtin/submodule--helper.c:2749
+#, fuzzy
+msgid "--branch or --default required"
+msgstr "nome do ramo é obrigatório"
+
+#: builtin/submodule--helper.c:2752
+msgid "--branch and --default are mutually exclusive"
+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: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:1239
+#: 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 inválido de submodule--helper"
 
-#: builtin/symbolic-ref.c:7
+#: builtin/symbolic-ref.c:8
 msgid "git symbolic-ref [<options>] <name> [<ref>]"
 msgstr "git symbolic-ref [<opções>] <nome> [<referência>]"
 
-#: builtin/symbolic-ref.c:8
+#: 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:362
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr "razão"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "razão da atualização"
 
-#: builtin/tag.c:23
+#: builtin/tag.c:25
+#, fuzzy
 msgid ""
-"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 <file>]\n"
+"\t\t<tagname> [<head>]"
 msgstr ""
-"git tag [-a | -s | -u <id-chave>] [-f] [-m <msg> | -F <ficheiro>] <nome-da-"
-"tag> [<head>]"
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <ficheiro>]\n"
+"\t\t<tagname> [<head>]"
 
-#: builtin/tag.c:24
+#: builtin/tag.c:27
 msgid "git tag -d <tagname>..."
 msgstr "git tag -d <nome-da-tag>..."
 
-#: builtin/tag.c:25
+#: builtin/tag.c:28
+#, fuzzy
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--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>] [--[no-]merged [<commit>]] [<padrão>...]"
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <objeto>]\n"
+"\t\t[--format=<formato>] [--merged [<commit>] [--no-merged <commit>] "
+"[<pattern>...]"
 
-#: builtin/tag.c:27
+#: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<formato>] <nometag>..."
 
-#: builtin/tag.c:83
+#: 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:99
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
-msgstr "Tag '%s' eliminada (era %s)\n"
+msgstr "Apaguei tag '%s' (era %s)\n"
 
-#: builtin/tag.c:128
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -13329,11 +23447,11 @@ msgid ""
 "Lines starting with '%c' will be ignored.\n"
 msgstr ""
 "\n"
-"Escreva a mensagem da tag:\n"
+"Escreve mensagem para tag:\n"
 "  %s\n"
 "Linha começadas com '%c' serão ignoradas.\n"
 
-#: builtin/tag.c:132
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -13343,369 +23461,360 @@ msgid ""
 "want to.\n"
 msgstr ""
 "\n"
-"Escreva a mensagem da tag:\n"
+"Escreve mensagem para tag:\n"
 "  %s\n"
-"Linhas começadas com '%c' serão mantidas; pode removê-las se o desejar.\n"
+"Linhas começadas com '%c' serão mantidas; se queres, podes apagá-las.\n"
 
-#: builtin/tag.c:210
+#: 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:212
-msgid "unable to write tag file"
-msgstr "não foi possível escrever o ficheiro da tag"
+#: builtin/tag.c:259
+#, 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 ""
 
-#: builtin/tag.c:236
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "tipo de objeto incorreto."
 
-#: builtin/tag.c:282
+#: builtin/tag.c:328
 msgid "no tag message?"
 msgstr "sem mensagem de tag?"
 
-#: builtin/tag.c:289
+#: builtin/tag.c:335
 #, c-format
 msgid "The tag message has been left in %s\n"
-msgstr "A mensagem da tag foi guardada em %s\n"
-
-#: builtin/tag.c:312
-msgid "tag: tagging "
-msgstr "tag: a colocar tag"
-
-#: builtin/tag.c:320
-msgid "object of unknown type"
-msgstr "objeto de tipo desconhecido"
+msgstr "Deixei a mensagem da tag em %s\n"
 
-#: builtin/tag.c:327
-msgid "commit object"
-msgstr "objeto commit"
-
-#: builtin/tag.c:335
-msgid "tree object"
-msgstr "objeto árvore"
-
-#: builtin/tag.c:338
-msgid "blob object"
-msgstr "objeto blob"
-
-#: builtin/tag.c:341
-msgid "other tag object"
-msgstr "outro objeto tag"
-
-#: builtin/tag.c:397
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr "listar os nomes das tag"
 
-#: builtin/tag.c:399
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr "imprimir <n> linhas de cada mensagem de tag"
 
-#: builtin/tag.c:401
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr "eliminar tags"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr "verificar tags"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr "Opções de criação de tags"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr "tag anotada, é necessário uma mensagem"
 
-#: builtin/tag.c:408
+#: builtin/tag.c:457
 msgid "tag message"
 msgstr "mensagem da tag"
 
-#: builtin/tag.c:410
+#: builtin/tag.c:459
+#, fuzzy
+msgid "force edit of tag message"
+msgstr "forçar edição do commit"
+
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr "tag anotada e assinada com GPG"
 
-#: builtin/tag.c:414
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr "usar outra chave para assinar a tag"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
 msgstr "substituir a tag se esta existir"
 
-#: builtin/tag.c:416 builtin/update-ref.c:368
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "criar um reflog"
 
-#: builtin/tag.c:418
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr "Opções de listagem de tags"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr "mostrar a lista de tags em colunas"
 
-#: builtin/tag.c:420 builtin/tag.c:422
+#: 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:421 builtin/tag.c:423
+#: 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:424
+#: builtin/tag.c:473
 msgid "print only tags that are merged"
 msgstr "imprimir apenas as tags que foram integradas"
 
-#: builtin/tag.c:425
+#: 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:430
+#: 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:469
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
 msgstr "--column e -n são incompatíveis"
 
-#: builtin/tag.c:491
+#: builtin/tag.c:548
 msgid "-n option is only allowed in list mode"
 msgstr "a opção -n só é permitida no modo lista"
 
-#: builtin/tag.c:493
+#: builtin/tag.c:550
 msgid "--contains option is only allowed in list mode"
 msgstr "a opção --contains só é permitida no modo lista"
 
-#: builtin/tag.c:495
+#: 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 lista"
 
-#: builtin/tag.c:497
+#: 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"
 
-#: builtin/tag.c:499
+#: 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"
 
-#: builtin/tag.c:510
+#: 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:529
-msgid "too many params"
-msgstr "demasiado parâmetros"
-
-#: builtin/tag.c:535
+#: 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 tag inválido."
 
-#: builtin/tag.c:540
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "a tag '%s' já existe"
 
-#: builtin/tag.c:570
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
-msgstr "Tag '%s' atualizada (era %s)\n"
+msgstr "Atualizei tag '%s' (era %s)\n"
 
-#: builtin/unpack-objects.c:493
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
-msgstr "A descompactar objetos"
+msgstr "Desempacotando objetos"
 
-#: builtin/update-index.c:79
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "falha ao criar o diretório %s"
 
-#: builtin/update-index.c:85
-#, c-format
-msgid "failed to stat %s"
-msgstr "falha ao invocar stat de %s"
-
-#: builtin/update-index.c:95
+#: 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:103
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "falha ao eliminar o ficheiro %s"
 
-#: builtin/update-index.c:110 builtin/update-index.c:216
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "falha ao eliminar o diretório %s"
 
-#: builtin/update-index.c:135
+#: 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:149
+#: 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:162
+#: 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:175
+#: 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:186
+#: 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:197
+#: 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:210
+#: 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:217
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:568
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<opções>] [--] [<ficheiro>...]"
 
-#: builtin/update-index.c:923
+#: 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:926
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr "refrescar: ignorar submódulos"
 
-#: builtin/update-index.c:929
+#: 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:931
+#: 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:933
+#: 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:935
+#: 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:938
+#: builtin/update-index.c:991
 msgid "refresh stat information"
 msgstr "refrescar informação de stat"
 
-#: builtin/update-index.c:942
+#: 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:946
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr "<modo>,<objeto>,<caminho>"
 
-#: builtin/update-index.c:947
+#: builtin/update-index.c:1000
 msgid "add the specified entry to the index"
 msgstr "adicionar o elemento especificado ao índice"
 
-#: builtin/update-index.c:956
+#: 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:959
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
 msgstr "limpar o bit assumed-unchanged"
 
-#: builtin/update-index.c:962
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
 msgstr "marcar ficheiros como \"únicos do índice\""
 
-#: builtin/update-index.c:965
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
 msgstr "limpar o bit ignorar-árvore-de-trabalho"
 
-#: builtin/update-index.c:968
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr ""
+
+#: 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:970
+#: 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:972
+#: 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"
 
-#: builtin/update-index.c:974
+#: 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:978
+#: 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:982
+#: 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:986
+#: 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:990
+#: 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:993
+#: 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:995
+#: 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:999
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr "escrever o índice neste formato"
 
-#: builtin/update-index.c:1001
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
 msgstr "ativar ou desativar a divisão do índice"
 
-#: builtin/update-index.c:1003
+#: 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:1005
+#: 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:1007
+#: 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:1065
+msgid "write out the index even if is not flagged as changed"
+msgstr ""
+
+#: builtin/update-index.c:1067
+#, fuzzy
+msgid "enable or disable file system monitor"
+msgstr "ativar ou desativar a divisão do índice"
+
+#: builtin/update-index.c:1069
+#, fuzzy
+msgid "mark files as fsmonitor valid"
+msgstr "marcar ficheiros válidos para fsmonitor"
 
-#: builtin/update-index.c:1107
+#: builtin/update-index.c:1072
+msgid "clear fsmonitor valid bit"
+msgstr "limpar bit válido de 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"
@@ -13713,7 +23822,7 @@ msgstr ""
 "core.splitIndex está definida como false; remova ou altere-a se pretende "
 "mesmo ativar índice separado"
 
-#: builtin/update-index.c:1116
+#: builtin/update-index.c:1184
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -13721,91 +23830,133 @@ msgstr ""
 "core.splitIndex está definida como true; remova ou altere-a se pretende "
 "mesmo desativar índice separado"
 
-#: builtin/update-index.c:1127
+#: 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:1131
+#: 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:1139
+#: 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:1143
+#: 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:1220
+#, fuzzy
+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"
+
+#: builtin/update-index.c:1224
+msgid "fsmonitor enabled"
+msgstr ""
 
-#: builtin/update-ref.c:9
+#: builtin/update-index.c:1227
+#, fuzzy
+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"
+
+#: builtin/update-index.c:1231
+msgid "fsmonitor disabled"
+msgstr ""
+
+#: 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>]"
 
-#: builtin/update-ref.c:10
+#: 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>]"
 
-#: builtin/update-ref.c:11
+#: builtin/update-ref.c:12
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<opções>] --stdin [-z]"
 
-#: builtin/update-ref.c:363
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "eliminar a referência"
 
-#: builtin/update-ref.c:365
+#: 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:366
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr "os argumentos da entrada padrão terminam em NUL"
 
-#: builtin/update-ref.c:367
+#: 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:6
+#: builtin/update-server-info.c:7
 msgid "git update-server-info [--force]"
 msgstr "git update-server-info [--force]"
 
-#: builtin/update-server-info.c:14
+#: builtin/update-server-info.c:15
 msgid "update the info files from scratch"
 msgstr "atualizar os ficheiros de informação do zero"
 
-#: builtin/verify-commit.c:17
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<opções>] <dir>"
+
+#: builtin/upload-pack.c:23 t/helper/test-serve-v2.c:17
+msgid "quit after a single request/response exchange"
+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"
+
+#: builtin/upload-pack.c:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "tentar <pasta>/.git/ apenas se <pasta> for pasta Git"
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+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>..."
 
-#: builtin/verify-commit.c:72
+#: 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:73 builtin/verify-tag.c:37
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "imprimir informação do gpg em bruto"
 
-#: builtin/verify-pack.c:54
+#: 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>..."
 
-#: builtin/verify-pack.c:64
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "verboso"
 
-#: builtin/verify-pack.c:66
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "mostrar apenas estatísticas"
 
@@ -13817,1191 +23968,1809 @@ msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
 msgid "print tag contents"
 msgstr "imprimir conteúdo da tag"
 
-#: builtin/worktree.c:15
-msgid "git worktree add [<options>] <path> [<branch>]"
-msgstr "git worktree add [<opções>] <caminho> [<ramo>]"
+#: builtin/worktree.c:18
+#, fuzzy
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<opções>] <caminho> [<mnemónica>]"
 
-#: builtin/worktree.c:16
+#: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<opções>]"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:20
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<opções>] <caminho>"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:21
+#, fuzzy
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <árvore-de-trabalho> <novo-caminho>"
+
+#: builtin/worktree.c:22
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<opções>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:23
+#, fuzzy
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<opções>] <árvore-de-trabalho>"
+
+#: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <caminho>"
 
-#: builtin/worktree.c:42
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "A remover worktrees/%s: diretório inválido"
-
-#: builtin/worktree.c:48
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "A remover worktrees/%s: o ficheiro gitdir não existe"
-
-#: builtin/worktree.c:53
-#, 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)"
-
-#: builtin/worktree.c:64
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "A remover worktrees/%s: ficheiro gitdir inválido"
+#: builtin/worktree.c:61 builtin/worktree.c:944
+#, fuzzy, c-format
+msgid "failed to delete '%s'"
+msgstr "falhou apagar '%s'"
 
-#: builtin/worktree.c:80
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr ""
-"A remover worktrees/%s: o ficheiro gitdir aponta para uma localização "
-"inexistente"
+#: builtin/worktree.c:74
+#, fuzzy, c-format
+msgid "Removing %s/%s: %s"
+msgstr "A remover %s"
 
-#: builtin/worktree.c:128
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "reportar árvores de trabalho podadas"
 
-#: builtin/worktree.c:130
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "expirar árvores de trabalho mais antigos que <tempo>"
 
-#: builtin/worktree.c:204
+#: builtin/worktree.c:219
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' já existe"
 
-#: builtin/worktree.c:236
+#: builtin/worktree.c:228
+#, fuzzy, c-format
+msgid "unusable worktree destination '%s'"
+msgstr "destino '%s' de worktree inutilizável"
+
+#: 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: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: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:308
+msgid "initializing"
+msgstr "iniciando"
 
-#: builtin/worktree.c:272
+#: builtin/worktree.c:420 builtin/worktree.c:426
+#, fuzzy, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "Erro a eliminar ramo '%s'"
+
+#: builtin/worktree.c:422
 #, c-format
-msgid "Preparing %s (identifier %s)"
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr ""
+
+#: builtin/worktree.c:431
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr ""
+
+#: builtin/worktree.c:437
+#, fuzzy, c-format
+msgid "Preparing worktree (detached HEAD %s)"
 msgstr "A preparar %s (identificador %s)"
 
-#: builtin/worktree.c:324
+#: 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:326
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "criar um novo ramo"
 
-#: builtin/worktree.c:328
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "criar ou repor um ramo"
 
-#: builtin/worktree.c:330
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "povoar a nova árvore de trabalho"
 
-#: builtin/worktree.c:338
-msgid "-b, -B, and --detach are mutually exclusive"
-msgstr "-b, -B e --detach são mutuamente exclusivos"
+#: builtin/worktree.c:490
+#, fuzzy
+msgid "keep the new working tree locked"
+msgstr "povoar a nova árvore de trabalho"
 
-#: builtin/worktree.c:473
+#: builtin/worktree.c:492 builtin/worktree.c:729
 msgid "reason for locking"
-msgstr "razão de trancar"
+msgstr "razão para trancar"
+
+#: builtin/worktree.c:495
+#, fuzzy
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "configurar modo de seguimento (consulte git-pull(1))"
+
+#: builtin/worktree.c:498
+#, fuzzy
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "tenta corresponder nome de novo ramo com ramo de monitorização remoto"
+
+#: builtin/worktree.c:506
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr ""
+
+#: builtin/worktree.c:508
+#, fuzzy
+msgid "--reason requires --lock"
+msgstr "--reason requer --lock"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "adicionado com --lock"
 
-#: builtin/worktree.c:485 builtin/worktree.c:518
+#: builtin/worktree.c:574
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr ""
+
+#: builtin/worktree.c:691
+msgid "show extended annotations and reasons, if available"
+msgstr ""
+
+#: builtin/worktree.c:693
+#, fuzzy
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "expirar árvores de trabalho mais antigos 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:487 builtin/worktree.c:520
+#: 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:492
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' já está trancada, razão: %s"
 
-#: builtin/worktree.c:494
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' já está trancada"
 
-#: builtin/worktree.c:522
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
-msgstr "'%s' não está trancada"
+msgstr "'%s' está destrancada"
+
+#: builtin/worktree.c:819
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr ""
+
+#: builtin/worktree.c:827
+#, fuzzy
+msgid "force move even if worktree is dirty or locked"
+msgstr "forçar mover/mudar o nome mesmo que o destino exista"
+
+#: builtin/worktree.c:850 builtin/worktree.c:974
+#, fuzzy, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' é uma working tree principal"
 
-#: builtin/write-tree.c:13
+#: builtin/worktree.c:855
+#, fuzzy, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "incapaz descobrir nome de destino a partir de '%s'"
+
+#: 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:870
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:873
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:878
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr ""
+
+#: builtin/worktree.c:924
+#, fuzzy, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "falhou executar 'git status' em '%s'"
+
+#: builtin/worktree.c:928
+#, c-format
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr ""
+
+#: builtin/worktree.c:933
+#, fuzzy, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "falhou executar 'git status' em '%s', código %d"
+
+#: builtin/worktree.c:956
+msgid "force removal even if worktree is dirty or locked"
+msgstr ""
+
+#: 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:981
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+
+#: builtin/worktree.c:984
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr ""
+
+#: builtin/worktree.c:1008
+#, fuzzy, c-format
+msgid "repair: %s: %s"
+msgstr "%s: %s"
+
+#: builtin/worktree.c:1011
+#, fuzzy, c-format
+msgid "error: %s: %s"
+msgstr "%s: %s"
+
+#: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefixo>/]"
 
-#: builtin/write-tree.c:26
+#: builtin/write-tree.c:28
 msgid "<prefix>/"
 msgstr "<prefixo>/"
 
-#: builtin/write-tree.c:27
+#: builtin/write-tree.c:29
 msgid "write tree object for a subdirectory <prefix>"
 msgstr "escrever objeto árvore do subdiretório <prefixo>"
 
-#: builtin/write-tree.c:30
+#: builtin/write-tree.c:31
 msgid "only useful for debugging"
 msgstr "apenas útil para depuração"
 
-#: upload-pack.c:22
-msgid "git upload-pack [<options>] <dir>"
-msgstr "git upload-pack [<opções>] <dir>"
+#: git.c:28
+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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
 
-#: upload-pack.c:1040
-msgid "quit after a single request/response exchange"
-msgstr "terminar depois de uma única troca de pedido/resposta"
+#: git.c:36
+#, fuzzy
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"'git help -a' e 'git help -g' listam subcomandos disponíveis e alguns\n"
+"guias de conceitos. Consulta 'git help <comando>' ou 'git help <conceito>'\n"
+"para ler sobre um subcomando específico ou conceito específico.\n"
+"Vê 'git help git' para visão geral do sistema."
 
-#: upload-pack.c:1042
-msgid "exit immediately after initial ref advertisement"
-msgstr "sair imediatamente depois do anúncio inicial da referência"
+#: git.c:188
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr ""
 
-#: upload-pack.c:1044
-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"
+#: git.c:202
+#, c-format
+msgid "no namespace given for --namespace\n"
+msgstr ""
 
-#: upload-pack.c:1046
-msgid "interrupt transfer after <n> seconds of inactivity"
-msgstr "interromper transferência depois de <n> segundos de inatividade"
+#: git.c:216
+#, c-format
+msgid "no directory given for --work-tree\n"
+msgstr ""
 
-#: credential-cache--daemon.c:223
+#: git.c:230
+#, fuzzy, c-format
+msgid "no prefix given for --super-prefix\n"
+msgstr "--super-prefix recebeu prefixo nenhum\n"
+
+#: git.c:252
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr ""
+
+#: 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:326
+#, fuzzy, c-format
+msgid "unknown option: %s\n"
+msgstr "desconheço opção: %s\n"
+
+#: git.c:375
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr ""
+
+#: git.c:384
 #, c-format
 msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+
+#: git.c:391
+#, c-format
+msgid "empty alias for %s"
+msgstr ""
+
+#: git.c:394
+#, c-format
+msgid "recursive alias: %s"
+msgstr ""
+
+#: git.c:476
+msgid "write failure on standard output"
+msgstr ""
+
+#: git.c:478
+msgid "unknown write failure on standard output"
+msgstr ""
+
+#: git.c:480
+#, fuzzy
+msgid "close failed on standard output"
+msgstr "enviar resultados para a saída padrão"
+
+#: git.c:833
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr ""
+
+#: git.c:883
+#, fuzzy, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "incapaz lidar %s como um builtin"
+
+#: git.c:896
+#, fuzzy, c-format
+msgid ""
+"usage: %s\n"
 "\n"
-"\tchmod 0700 %s"
 msgstr ""
-"As permissões do diretório do socket são demasiado fracas; outros\n"
-"utilizadores poderão conseguir as suas credenciais em cache. Considere "
-"executar:\n"
+"utilização: %s\n"
 "\n"
-"\tchmod 0700 %s"
 
-#: credential-cache--daemon.c:271
-msgid "print debugging messages to stderr"
-msgstr "imprimir mensagens de depuração no stderr"
+#: git.c:916
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr ""
+
+#: git.c:928
+#, fuzzy, 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
+#, fuzzy
+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
+#, fuzzy
+msgid "--index-pack-args can only be used with --packfile"
+msgstr "-N só pode ser usado com --mixed"
+
+#: t/helper/test-fast-rebase.c:141
+#, fuzzy
+msgid "unhandled options"
+msgstr "Opções gerais"
 
-#: git.c:14
+#: t/helper/test-fast-rebase.c:146
+#, fuzzy
+msgid "error preparing revisions"
+msgstr "erro preparando revisões"
+
+#: t/helper/test-reach.c:154
+#, fuzzy, 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
+#, 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"
+
+#: 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 ""
-"'git help -a' and 'git help -g' list available subcommands and some\n"
-"concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
+"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
+#, fuzzy
+msgid "number of requests per thread"
+msgstr "incapaz criar thread: %s"
+
+#: t/helper/test-simple-ipc.c:706
+#, fuzzy
+msgid "byte"
+msgstr "bytes"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
 msgstr ""
-"'git help -a' e 'git help -g' listam os subcomandos disponíveis e alguns\n"
-"guias de conceitos. Consulte 'git help <comando>' ou 'git help <conceito>'\n"
-"para ler sobre um subcomando ou conceito específico."
 
-#: http.c:355
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr ""
+
+#: 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"
+msgstr ""
+
+#: http.c:420
 msgid "Delegation control is not supported with cURL < 7.22.0"
-msgstr "Não é suportado delegar controlo com cURL < 7.22.0"
+msgstr "Delegação de controlo tem suporte nenhum com cURL < 7.22.0"
 
-#: http.c:364
+#: http.c:429
 msgid "Public key pinning not supported with cURL < 7.44.0"
-msgstr "Não é suportado afixar chaves públicas com 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"
+
+#: http.c:1132
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr ""
+
+#: http.c:1139
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr ""
+
+#: http.c:1143
+#, fuzzy, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "Incapaz de definir backend SSL para '%s': já definido"
 
-#: http.c:1755
+#: http.c:2034
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
 "  asked for: %s\n"
 "   redirect: %s"
 msgstr ""
-"não é possível atualizar base de url de redireção:\n"
-"  pedido para: %s\n"
-"    redireção: %s"
+"incapaz de atualizar base url da redireção:\n"
+"  pedi: %s\n"
+"   redireção: %s"
+
+#: remote-curl.c:183
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr ""
+
+#: remote-curl.c:307
+#, fuzzy, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+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
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr ""
+
+#: remote-curl.c:499
+#, fuzzy, c-format
+msgid "repository '%s' not found"
+msgstr "repositório '%s' inexistente"
+
+#: remote-curl.c:503
+#, fuzzy, c-format
+msgid "Authentication failed for '%s'"
+msgstr "Falha ao executar: $rest"
 
-#: remote-curl.c:323
+#: remote-curl.c:507
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "incapaz aceder '%s': %s"
+
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
 msgstr "a redirecionar para %s "
 
-#: common-cmds.h:9
-msgid "start a working area (see also: git help tutorial)"
-msgstr "iniciar uma área de trabalho (consulte também: git help tutorial)"
+#: remote-curl.c:644
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr ""
 
-#: common-cmds.h:10
-msgid "work on the current change (see also: git help everyday)"
-msgstr "trabalhar na alteração atual (consulte também: git help everyday)"
+#: remote-curl.c:656
+#, fuzzy
+msgid "remote server sent unexpected response end packet"
+msgstr "servidor remoto enviou pacote fim de resposta inesperado"
 
-#: common-cmds.h:11
-msgid "examine the history and state (see also: git help revisions)"
-msgstr "examinar o histórico e estado (consulte também: git help revisions)"
+#: remote-curl.c:726
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
 
-#: common-cmds.h:12
-msgid "grow, mark and tweak your common history"
-msgstr "aumentar, marcar e ajustar o seu histórico comum"
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
 
-#: common-cmds.h:13
-msgid "collaborate (see also: git help workflows)"
-msgstr "colaborar (consulte também: git help workflows)"
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c:834
+#, fuzzy, c-format
+msgid "RPC failed; %s"
+msgstr "falha: %d"
+
+#: remote-curl.c:874
+#, fuzzy
+msgid "cannot handle pushes this big"
+msgstr "incapaz atirar algo tão grande"
+
+#: remote-curl.c:989
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr ""
+
+#: remote-curl.c:993
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr ""
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
+
+#: remote-curl.c:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
+
+#: remote-curl.c:1134
+#, fuzzy
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "transporte http estúpido insustenta capacidades shallow"
+
+#: remote-curl.c:1149
+msgid "fetch failed."
+msgstr ""
+
+#: remote-curl.c:1195
+msgid "cannot fetch by sha1 over smart http"
+msgstr ""
+
+#: remote-curl.c:1239 remote-curl.c:1245
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr ""
+
+#: remote-curl.c:1257 remote-curl.c:1375
+#, fuzzy, c-format
+msgid "http transport does not support %s"
+msgstr "transporte http insustenta %s"
+
+#: remote-curl.c:1293
+msgid "git-http-push failed"
+msgstr ""
+
+#: remote-curl.c:1481
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr ""
+
+#: remote-curl.c:1513
+msgid "remote-curl: error reading command stream from git"
+msgstr ""
+
+#: remote-curl.c:1520
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr ""
+
+#: remote-curl.c:1561
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr ""
+
+#: compat/compiler.h:26
+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:94
+msgid "args"
+msgstr ""
+
+#: list-objects-filter-options.h:95
+#, fuzzy
+msgid "object filtering"
+msgstr "tipo do objeto"
+
+#: parse-options.h:184
+msgid "expiry-date"
+msgstr "data-de-validade"
+
+#: parse-options.h:198
+msgid "no-op (backward compatibility)"
+msgstr "sem-ação (retrocompatibilidade)"
+
+#: parse-options.h:310
+msgid "be more verbose"
+msgstr "ser mais verboso"
+
+#: parse-options.h:312
+msgid "be more quiet"
+msgstr "ser mais silencioso"
+
+#: parse-options.h:318
+#, fuzzy
+msgid "use <n> digits to display object names"
+msgstr "usar <n> dígitos para mostrar SHA-1s"
+
+#: 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:338
+#, fuzzy
+msgid "read pathspec from file"
+msgstr "ler padrões do ficheiro"
+
+#: parse-options.h:339
+#, fuzzy
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "os caminhos estão separados por caracteres NUL"
 
-#: common-cmds.h:17
+#: ref-filter.h:99
+msgid "key"
+msgstr "chave"
+
+#: ref-filter.h:99
+msgid "field name to sort on"
+msgstr "nome do campo pelo qual ordernar"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"atualizar o índice com resoluções de conflitos reutilizadas se possível"
+
+#: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Adicionar conteúdos de ficheiros ao índice"
 
-#: common-cmds.h:18
+#: 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"
+
+#: command-list.h:53
+#, fuzzy
+msgid "Apply a patch to files and/or to the index"
+msgstr "adicionar o elemento especificado ao índice"
+
+#: 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"
+
+#: command-list.h:56
 msgid "Use binary search to find the commit that introduced a bug"
 msgstr "Use procura binário para encontrar o commit que introduziu um bug"
 
-#: common-cmds.h:19
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr ""
+
+#: command-list.h:58
 msgid "List, create, or delete branches"
 msgstr "Listar, criar ou eliminar ramos"
 
-#: common-cmds.h:20
+#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr ""
+
+#: command-list.h:60
+msgid "Move objects and refs by archive"
+msgstr ""
+
+#: command-list.h:61
+msgid "Provide content or type and size information for repository objects"
+msgstr ""
+
+#: command-list.h:62
+msgid "Display gitattributes information"
+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"
+
+#: command-list.h:65
 msgid "Switch branches or restore working tree files"
 msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"
 
-#: common-cmds.h:21
+#: command-list.h:66
+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 ""
+
+#: command-list.h:69
+msgid "Apply the changes introduced by some existing commits"
+msgstr ""
+
+#: command-list.h:70
+msgid "Graphical alternative to git-commit"
+msgstr ""
+
+#: command-list.h:71
+msgid "Remove untracked files from the working tree"
+msgstr ""
+
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Clonar um repositório num novo diretório"
 
-#: common-cmds.h:22
+#: command-list.h:73
+#, fuzzy
+msgid "Display data in columns"
+msgstr "listar os ramos 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"
 
-#: common-cmds.h:23
-msgid "Show changes between commits, commit and working tree, etc"
+#: command-list.h:75
+msgid "Write and verify Git commit-graph files"
 msgstr ""
-"Mostrar alterações entre commits, entre commit e árvore de trabalho, etc"
 
-#: common-cmds.h:24
-msgid "Download objects and refs from another repository"
-msgstr "Transferir objetos e referências doutro repositório"
+#: command-list.h:76
+msgid "Create a new commit object"
+msgstr ""
 
-#: common-cmds.h:25
-msgid "Print lines matching a pattern"
-msgstr "Imprimir linhas que correspondam a um padrão"
+#: command-list.h:77
+msgid "Get and set repository or global options"
+msgstr ""
 
-#: common-cmds.h:26
-msgid "Create an empty Git repository or reinitialize an existing one"
-msgstr "Criar um repositório Git vazio ou reinicializar um já existente"
+#: command-list.h:78
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr ""
 
-#: common-cmds.h:27
-msgid "Show commit logs"
-msgstr "Mostrar histórico de commits"
+#: command-list.h:79
+msgid "Retrieve and store user credentials"
+msgstr ""
 
-#: common-cmds.h:28
-msgid "Join two or more development histories together"
-msgstr "Juntar duas ou mais histórias de desenvolvimento numa só"
+#: command-list.h:80
+msgid "Helper to temporarily store passwords in memory"
+msgstr ""
 
-#: common-cmds.h:29
-msgid "Move or rename a file, a directory, or a symlink"
-msgstr "Mover ou mudar o nome de um ficheiro, diretório ou ligação simbólica"
+#: command-list.h:81
+msgid "Helper to store credentials on disk"
+msgstr ""
 
-#: common-cmds.h:30
-msgid "Fetch from and integrate with another repository or a local branch"
-msgstr "Obter e integrar com outro repositório ou outro ramo local"
+#: command-list.h:82
+msgid "Export a single commit to a CVS checkout"
+msgstr ""
 
-#: common-cmds.h:31
-msgid "Update remote refs along with associated objects"
-msgstr "Atualizar referências remotas juntamente com objetos associados"
+#: command-list.h:83
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr ""
 
-#: common-cmds.h:32
-msgid "Reapply commits on top of another base tip"
-msgstr "Reaplicar commits no topo de outra base"
+#: command-list.h:84
+msgid "A CVS server emulator for Git"
+msgstr ""
 
-#: common-cmds.h:33
-msgid "Reset current HEAD to the specified state"
-msgstr "Repor a HEAD atual no estado especificado"
+#: command-list.h:85
+msgid "A really simple server for Git repositories"
+msgstr ""
 
-#: common-cmds.h:34
-msgid "Remove files from the working tree and from the index"
-msgstr "Remover ficheiros da árvore de trabalho e do índice"
+#: command-list.h:86
+msgid "Give an object a human readable name based on an available ref"
+msgstr ""
 
-#: common-cmds.h:35
-msgid "Show various types of objects"
-msgstr "Mostrar vários tipos objetos"
+#: command-list.h:87
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr ""
+"Mostrar alterações entre commits, entre commit e árvore de trabalho, etc"
 
-#: common-cmds.h:36
-msgid "Show the working tree status"
-msgstr "Mostrar o estado da árvores de trabalho"
+#: command-list.h:88
+msgid "Compares files in the working tree and the index"
+msgstr ""
 
-#: common-cmds.h:37
-msgid "Create, list, delete or verify a tag object signed with GPG"
-msgstr "Criar, listar, eliminar ou verificar um objeto tag assinado com GPG"
+#: command-list.h:89
+msgid "Compare a tree to the working tree or index"
+msgstr ""
 
-#: parse-options.h:145
-msgid "expiry-date"
-msgstr "data-de-validade"
+#: command-list.h:90
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
 
-#: parse-options.h:160
-msgid "no-op (backward compatibility)"
-msgstr "sem-ação (retrocompatibilidade)"
+#: command-list.h:91
+msgid "Show changes using common diff tools"
+msgstr ""
 
-#: parse-options.h:238
-msgid "be more verbose"
-msgstr "ser mais verboso"
+#: command-list.h:92
+msgid "Git data exporter"
+msgstr ""
 
-#: parse-options.h:240
-msgid "be more quiet"
-msgstr "ser mais silencioso"
+#: command-list.h:93
+msgid "Backend for fast Git data importers"
+msgstr ""
 
-#: parse-options.h:246
-msgid "use <n> digits to display SHA-1s"
-msgstr "usar <n> dígitos para mostrar SHA-1s"
+#: command-list.h:94
+msgid "Download objects and refs from another repository"
+msgstr "Download objectos e refs de outro repositório"
 
-#: rerere.h:40
-msgid "update the index with reused conflict resolution if possible"
+#: command-list.h:95
+msgid "Receive missing objects from another repository"
 msgstr ""
-"atualizar o índice com resoluções de conflitos reutilizadas se possível"
 
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Deve começar por executar \"git bisect start\""
+#: command-list.h:96
+#, fuzzy
+msgid "Rewrite branches"
+msgstr "  Ramo remoto:%s"
 
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Quer que o Git o faça por si [Y/n]? "
+#: command-list.h:97
+msgid "Produce a merge commit message"
+msgstr ""
 
-#: git-bisect.sh:121
-#, sh-format
-msgid "unrecognised option: '$arg'"
-msgstr "opção não reconhecida: '$arg'"
+#: command-list.h:98
+msgid "Output information on each ref"
+msgstr ""
 
-#: git-bisect.sh:125
-#, sh-format
-msgid "'$arg' does not appear to be a valid revision"
-msgstr "'$arg' não parecer ser uma revisão válida"
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr ""
 
-#: git-bisect.sh:154
-msgid "Bad HEAD - I need a HEAD"
-msgstr "HEAD incorreta - é necessário uma HEAD"
+#: command-list.h:100
+msgid "Prepare patches for e-mail submission"
+msgstr ""
 
-#: git-bisect.sh:167
-#, sh-format
-msgid ""
-"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+#: command-list.h:101
+msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr ""
-"Falha ao extrair '$start_head'. Tente 'git bisect reset <ramo-válido>'."
 
-#: git-bisect.sh:177
-msgid "won't bisect on cg-seek'ed tree"
-msgstr "não é possível bissetar numa árvore \"cg-seek'ed\""
+#: command-list.h:102
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr ""
 
-#: git-bisect.sh:181
-msgid "Bad HEAD - strange symbolic ref"
-msgstr "HEAD incorreta - referência simbólica desconhecida"
+#: command-list.h:103
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr ""
 
-#: git-bisect.sh:233
-#, sh-format
-msgid "Bad bisect_write argument: $state"
-msgstr "Argumento de bisect_write incorreto: $state"
+#: command-list.h:104
+msgid "Print lines matching a pattern"
+msgstr "Imprimir linhas que correspondam a um padrão"
 
-#: git-bisect.sh:262
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Revisão incorreta na entrada: $arg"
+#: command-list.h:105
+msgid "A portable graphical interface to Git"
+msgstr ""
 
-#: git-bisect.sh:281
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Revisão incorreta na entrada: $bisected_head"
+#: command-list.h:106
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr ""
 
-#: git-bisect.sh:290
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Revisão incorreta na entrada: $rev"
+#: command-list.h:107
+msgid "Display help information about Git"
+msgstr ""
 
-#: git-bisect.sh:299
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' só leva um argumento."
+#: command-list.h:108
+msgid "Server side implementation of Git over HTTP"
+msgstr ""
 
-#: git-bisect.sh:322
-#, sh-format
-msgid "Warning: bisecting only with a $TERM_BAD commit."
-msgstr "Aviso: a bissetar só com um commit $TERM_BAD."
+#: command-list.h:109
+msgid "Download from a remote Git repository via HTTP"
+msgstr ""
 
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:328
-msgid "Are you sure [Y/n]? "
-msgstr "Tem a certeza [Y/n]? "
+#: command-list.h:110
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr ""
 
-#: git-bisect.sh:340
-#, sh-format
-msgid ""
-"You need to give me at least one $bad_syn and one $good_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+#: command-list.h:111
+msgid "Send a collection of patches from stdin to an IMAP folder"
 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.)"
 
-#: git-bisect.sh:343
-#, sh-format
-msgid ""
-"You need to start by \"git bisect start\".\n"
-"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
-"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+#: command-list.h:112
+msgid "Build pack index file for an existing packed archive"
 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.)"
 
-#: git-bisect.sh:414 git-bisect.sh:546
-msgid "We are not bisecting."
-msgstr "Não se está a bissetar."
+#: command-list.h:113
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "Criar um repositório Git vazio ou reinicializar um já existente"
 
-#: git-bisect.sh:421
-#, sh-format
-msgid "'$invalid' is not a valid commit"
-msgstr "'$invalid' não é um commit válido"
+#: command-list.h:114
+msgid "Instantly browse your working repository in gitweb"
+msgstr ""
 
-#: git-bisect.sh:430
-#, sh-format
-msgid ""
-"Could not check out original HEAD '$branch'.\n"
-"Try 'git bisect reset <commit>'."
+#: command-list.h:115
+msgid "Add or parse structured information in commit messages"
 msgstr ""
-"Não foi possível extrair a HEAD original de '$branch'.\n"
-"Tente 'git bisect reset <commit>'."
 
-#: git-bisect.sh:458
-msgid "No logfile given"
-msgstr "Nenhum ficheiro de log fornecido"
+#: command-list.h:116
+#, fuzzy
+msgid "The Git repository browser"
+msgstr "O browser de repositórios Git"
 
-#: git-bisect.sh:459
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "não é possível ler $file para reproduzir"
+#: command-list.h:117
+msgid "Show commit logs"
+msgstr "Mostrar histórico de commits"
 
-#: git-bisect.sh:480
-msgid "?? what are you talking about?"
-msgstr "?? do que é que está a falar?"
+#: 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"
 
-#: git-bisect.sh:492
-#, sh-format
-msgid "running $command"
-msgstr "a executar $command"
+#: command-list.h:119
+#, fuzzy
+msgid "List references in a remote repository"
+msgstr "repositório de referência"
 
-#: git-bisect.sh:499
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"exit code $res from '$command' is < 0 or >= 128"
+#: command-list.h:120
+msgid "List the contents of a tree object"
 msgstr ""
-"falha ao bissetar:\n"
-"código de saída $res de '$command' é < 0 ou >= 128"
 
-#: git-bisect.sh:525
-msgid "bisect run cannot continue any more"
-msgstr "não é possível continuar a bissetar"
+#: command-list.h:121
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr ""
 
-#: git-bisect.sh:531
-#, sh-format
-msgid ""
-"bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+#: command-list.h:122
+msgid "Simple UNIX mbox splitter program"
 msgstr ""
-"falha ao bissetar:\n"
-"'bisect_state $state' retornou com o código de erro $res"
 
-#: git-bisect.sh:538
-msgid "bisect run success"
-msgstr "bissecção concluída com sucesso"
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr ""
 
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "use dois termos diferentes"
+#: command-list.h:124
+msgid "Join two or more development histories together"
+msgstr "Juntar duas ou mais histórias de desenvolvimento numa só"
 
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "'$term' não é um termo válido"
+#: 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"
 
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr "não é possível usar o comando '$term' como um termo"
+#: command-list.h:126
+#, fuzzy
+msgid "Run a three-way file merge"
+msgstr "Faz uma junção por três de ficheiro"
 
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "não é possível alterar o significado do termo '$term'"
+#: command-list.h:127
+#, fuzzy
+msgid "Run a merge for files needing merging"
+msgstr "Faz um merge de ficheiros precisando de merge"
 
-#: git-bisect.sh:606
-#, sh-format
-msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
+#: command-list.h:128
+msgid "The standard helper program to use with git-merge-index"
 msgstr ""
-"Comando inválido: está-se a bissetar usando os termos $TERM_BAD/$TERM_GOOD."
 
-#: git-bisect.sh:636
-msgid "no terms defined"
-msgstr "nenhum termo definido"
+#: command-list.h:129
+msgid "Run merge conflict resolution tools to resolve merge conflicts"
+msgstr ""
 
-#: git-bisect.sh:653
-#, sh-format
-msgid ""
-"invalid argument $arg for 'git bisect terms'.\n"
-"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+#: command-list.h:130
+msgid "Show three-way merge without touching index"
 msgstr ""
-"argumento inválido $arg de 'git bisect terms'.\n"
-"Opções suportadas: --term-good|--term-old e --term-bad|--term-new."
 
-#: git-merge-octopus.sh:46
-msgid ""
-"Error: Your local changes to the following files would be overwritten by "
-"merge"
+#: command-list.h:131
+msgid "Write and verify multi-pack-indexes"
 msgstr ""
-"Erro: As suas alterações locais nos seguintes ficheiros seriam substituídas "
-"ao integrar"
 
-#: git-merge-octopus.sh:61
-msgid "Automated merge did not work."
-msgstr "A integração automática não funcionou."
+#: command-list.h:132
+#, fuzzy
+msgid "Creates a tag object with extra validation"
+msgstr "outro objeto tag"
 
-#: git-merge-octopus.sh:62
-msgid "Should not be doing an octopus."
-msgstr "Não se deviria estar a fazer um polvo."
+#: command-list.h:133
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr ""
 
-#: git-merge-octopus.sh:73
-#, sh-format
-msgid "Unable to find common commit with $pretty_name"
-msgstr "Não é possível encontrar commit comum com $pretty_name"
+#: command-list.h:134
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "Mover ou mudar o nome de um ficheiro, diretório ou ligação simbólica"
 
-#: git-merge-octopus.sh:77
-#, sh-format
-msgid "Already up-to-date with $pretty_name"
-msgstr "Já está atualizado com $pretty_name"
+#: command-list.h:135
+msgid "Find symbolic names for given revs"
+msgstr ""
 
-#: git-merge-octopus.sh:89
-#, sh-format
-msgid "Fast-forwarding to: $pretty_name"
-msgstr "A avançar rapidamente para: $pretty_name"
+#: command-list.h:136
+#, fuzzy
+msgid "Add or inspect object notes"
+msgstr "Adicionar ou inspecionar notas de objeto"
 
-#: git-merge-octopus.sh:97
-#, sh-format
-msgid "Trying simple merge with $pretty_name"
-msgstr "A tentar integração simples com $pretty_name"
+#: command-list.h:137
+msgid "Import from and submit to Perforce repositories"
+msgstr ""
 
-#: 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."
+#: command-list.h:138
+msgid "Create a packed archive of objects"
+msgstr ""
 
-#: git-rebase.sh:57
-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"
-"\"."
+#: command-list.h:139
+#, fuzzy
+msgid "Find redundant pack files"
+msgstr "Encontrar ficheiros de pacote redundantes"
+
+#: command-list.h:140
+msgid "Pack heads and tags for efficient repository access"
 msgstr ""
-"Depois de resolver este problema, execute \"git rebase --continue\".\n"
-"Se prefere ignorar este patch, execute \"git rebase --skip\".\n"
-"Para extrair o ramo original e interromper o rebase, execute \"git rebase --"
-"abort\"."
 
-#: git-rebase.sh:157 git-rebase.sh:396
-#, sh-format
-msgid "Could not move back to $head_name"
-msgstr "Não foi possível voltar para $head_name"
+#: command-list.h:141
+msgid "Compute unique ID for a patch"
+msgstr ""
 
-#: git-rebase.sh:171
-#, sh-format
-msgid "Cannot store $stash_sha1"
-msgstr "Não é possível guardar $stash_sha1"
+#: command-list.h:142
+msgid "Prune all unreachable objects from the object database"
+msgstr ""
 
-#: git-rebase.sh:211
-msgid "The pre-rebase hook refused to rebase."
-msgstr "Rebase recusado pelo hook pre-rebase."
+#: command-list.h:143
+msgid "Remove extra objects that are already in pack files"
+msgstr ""
 
-#: git-rebase.sh:216
-msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr "Parece que o git-am está em curso. Não é possível efetuar rebase."
+#: command-list.h:144
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "Obter e integrar com outro repositório ou outro ramo local"
 
-#: git-rebase.sh:357
-msgid "No rebase in progress?"
-msgstr "Rebase não está em curso?"
+#: command-list.h:145
+msgid "Update remote refs along with associated objects"
+msgstr "Atualizar referências remotas juntamente com objetos associados"
 
-#: git-rebase.sh:368
-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."
+#: command-list.h:146
+#, fuzzy
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Submete a mistura de patchset para o ramo atual."
 
-#: git-rebase.sh:375
-msgid "Cannot read HEAD"
-msgstr "Não é possível ler HEAD"
+#: command-list.h:147
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr ""
 
-#: git-rebase.sh:378
-msgid ""
-"You must edit all merge conflicts and then\n"
-"mark them as resolved using git add"
+#: command-list.h:148
+msgid "Reads tree information into the index"
 msgstr ""
-"Deve editar todos os conflitos da integração\n"
-"e marcá-los como resolvidos usando git add"
 
-#: git-rebase.sh:418
-#, sh-format
-msgid ""
-"It seems that there is already a $state_dir_base directory, and\n"
-"I wonder if you are in the middle of another rebase.  If that is the\n"
-"case, please try\n"
-"\t$cmd_live_rebase\n"
-"If that is not the case, please\n"
-"\t$cmd_clear_stale_rebase\n"
-"and run me again.  I am stopping in case you still have something\n"
-"valuable there."
-msgstr ""
-"Parece que já existe um diretório $state_dir_base e\n"
-"é possível que outro processo de rebase já esteja em curso.\n"
-"Se for o caso, tente\n"
-"\t$cmd_live_rebase\n"
-"Se não for o caso,\n"
-"\t$cmd_clear_stale_rebase\n"
-"e execute o comando de novo. A execução foi interrompida no caso de\n"
-"ainda ter algo importante nesse sítio."
-
-#: git-rebase.sh:469
-#, sh-format
-msgid "invalid upstream $upstream_name"
-msgstr "$upstream_name a montante inválido"
+#: command-list.h:149
+msgid "Reapply commits on top of another base tip"
+msgstr "Reaplicar commits no topo de outra base"
 
-#: git-rebase.sh:493
-#, sh-format
-msgid "$onto_name: there are more than one merge bases"
-msgstr "$onto_name: há mais do que uma base de integração"
+#: command-list.h:150
+#, fuzzy
+msgid "Receive what is pushed into the repository"
+msgstr "Receber para o repositório, o que foi atirado"
 
-#: git-rebase.sh:496 git-rebase.sh:500
-#, sh-format
-msgid "$onto_name: there is no merge base"
-msgstr "$onto_name: não há nenhuma base de integração"
+#: command-list.h:151
+#, fuzzy
+msgid "Manage reflog information"
+msgstr "mostrar informação de resolver-desfazer"
 
-#: git-rebase.sh:505
-#, sh-format
-msgid "Does not point to a valid commit: $onto_name"
-msgstr "Não aponta para um commit válido: $onto_name"
+#: command-list.h:152
+msgid "Manage set of tracked repositories"
+msgstr ""
 
-#: git-rebase.sh:528
-#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr "fatal: ramo inexistente: $branch_name"
+#: command-list.h:153
+msgid "Pack unpacked objects in a repository"
+msgstr ""
 
-#: git-rebase.sh:561
-msgid "Cannot autostash"
-msgstr "Não é possível empilhar automaticamente (autostash)"
+#: 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"
 
-#: git-rebase.sh:566
-#, sh-format
-msgid "Created autostash: $stash_abbrev"
-msgstr "Pilha automática (autostash) criada: $stash_abbrev"
+#: command-list.h:155
+msgid "Generates a summary of pending changes"
+msgstr ""
 
-#: git-rebase.sh:570
-msgid "Please commit or stash them."
-msgstr "Submeta ou esconda-as."
+#: command-list.h:156
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr ""
 
-#: git-rebase.sh:590
-#, sh-format
-msgid "Current branch $branch_name is up to date."
-msgstr "O ramo atual $branch_name está atualizado."
+#: command-list.h:157
+msgid "Reset current HEAD to the specified state"
+msgstr "Repor a HEAD atual no estado especificado"
 
-#: git-rebase.sh:594
-#, sh-format
-msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "O ramo atual $branch_name está atualizado, rebase forçado."
+#: command-list.h:158
+#, fuzzy
+msgid "Restore working tree files"
+msgstr "Mudar de ramos ou restaurar os ficheiros da árvore de trabalho"
 
-#: git-rebase.sh:605
-#, sh-format
-msgid "Changes from $mb to $onto:"
-msgstr "Alterações de $mb para $onto:"
+#: command-list.h:159
+#, fuzzy
+msgid "Revert some existing commits"
+msgstr "Reverter algumas memórias existentes"
 
-#: git-rebase.sh:614
-msgid "First, rewinding head to replay your work on top of it..."
+#: command-list.h:160
+msgid "Lists commit objects in reverse chronological order"
 msgstr ""
-"Primeiro, a recuar a cabeça para replicar as suas alterações no topo dela..."
 
-#: git-rebase.sh:624
-#, sh-format
-msgid "Fast-forwarded $branch_name to $onto_name."
-msgstr "$branch_name avançado rapidamente para $onto_name."
+#: command-list.h:161
+#, fuzzy
+msgid "Pick out and massage parameters"
+msgstr "demasiados parâmetros"
 
-#: git-stash.sh:53
-msgid "git stash clear with parameters is unimplemented"
-msgstr "não está implementado git stash clear com parâmetros"
+#: command-list.h:162
+msgid "Remove files from the working tree and from the index"
+msgstr ""
 
-#: git-stash.sh:94
-msgid "You do not have the initial commit yet"
-msgstr "O commit inicial ainda não existe"
+#: command-list.h:163
+msgid "Send a collection of patches as emails"
+msgstr ""
 
-#: git-stash.sh:109
-msgid "Cannot save the current index state"
-msgstr "Não é possível guardar o estado atual do índice"
+#: command-list.h:164
+msgid "Push objects over Git protocol to another repository"
+msgstr ""
 
-#: git-stash.sh:124
-msgid "Cannot save the untracked files"
-msgstr "Não é possível guardar os ficheiros não controlados"
+#: command-list.h:165
+msgid "Restricted login shell for Git-only SSH access"
+msgstr ""
 
-#: git-stash.sh:144 git-stash.sh:157
-msgid "Cannot save the current worktree state"
-msgstr "Não é possível guardar o estado atual da árvore de trabalho"
+#: command-list.h:166
+msgid "Summarize 'git log' output"
+msgstr ""
 
-#: git-stash.sh:161
-msgid "No changes selected"
-msgstr "Nenhuma alteração selecionada"
+#: command-list.h:167
+msgid "Show various types of objects"
+msgstr "Mostrar vários tipos objetos"
 
-#: git-stash.sh:164
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Não é possível remover o índice temporário (não pode acontecer)"
+#: command-list.h:168
+#, fuzzy
+msgid "Show branches and their commits"
+msgstr "imprimir apenas ramos que contenham o commit"
 
-#: git-stash.sh:177
-msgid "Cannot record working tree state"
-msgstr "Não é possível gravar o estado da árvore de trabalho"
+#: command-list.h:169
+msgid "Show packed archive index"
+msgstr ""
 
-#: git-stash.sh:209
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Não é possível atualizar $ref_stash com $w_commit"
-
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:265
-#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-"       To provide a message, use git stash save -- '$option'"
+#: command-list.h:170
+#, fuzzy
+msgid "List references in a local repository"
+msgstr "Lista referências num repositório local"
+
+#: command-list.h:171
+msgid "Git's i18n setup code for shell scripts"
 msgstr ""
-"erro: opção desconhecida de 'stash save': $option\n"
-"      Para fornecer uma mensagem, use git stash save -- '$option'"
 
-#: git-stash.sh:278
-msgid "Can't use --patch and --include-untracked or --all at the same time"
+#: command-list.h:172
+msgid "Common Git shell script setup code"
 msgstr ""
-"Não é possível usar --patch e --include-untracked ou --all ao mesmo tempo"
 
-#: git-stash.sh:286
-msgid "No local changes to save"
-msgstr "Não há alterações locais para guardar"
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr ""
 
-#: git-stash.sh:291
-msgid "Cannot initialize stash"
-msgstr "Não é possível inicializar a pilha"
+#: command-list.h:174
+#, fuzzy
+msgid "Stash the changes in a dirty working directory away"
+msgstr "%s: já existe no diretório de trabalho"
 
-#: git-stash.sh:295
-msgid "Cannot save the current status"
-msgstr "Não é possível guardar o estado atual"
+#: command-list.h:175
+#, fuzzy
+msgid "Add file contents to the staging area"
+msgstr "Adicionar conteúdos de ficheiros ao índice"
 
-#: git-stash.sh:296
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Diretório de trabalho e estado do índice $stash_msg guardados"
+#: command-list.h:176
+msgid "Show the working tree status"
+msgstr "Mostrar o estado da árvores de trabalho"
 
-#: git-stash.sh:323
-msgid "Cannot remove worktree changes"
-msgstr "Não é possível remover as alterações da árvore de trabalho"
+#: command-list.h:177
+msgid "Remove unnecessary whitespace"
+msgstr ""
 
-#: git-stash.sh:471
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "opção desconhecido: $opt"
+#: command-list.h:178
+msgid "Initialize, update or inspect submodules"
+msgstr ""
 
-#: git-stash.sh:484
-msgid "No stash found."
-msgstr "Nenhuma pilha encontrada."
+#: command-list.h:179
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr ""
 
-#: git-stash.sh:491
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Demasiadas revisões especificadas: $REV"
+#: command-list.h:180
+#, fuzzy
+msgid "Switch branches"
+msgstr "Troca branches"
 
-#: git-stash.sh:506
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference não é uma referência válida"
+#: command-list.h:181
+#, fuzzy
+msgid "Read, modify and delete symbolic refs"
+msgstr "eliminar referências simbólicas"
 
-#: git-stash.sh:534
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' não é um commit semelhante a pilha"
+#: 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"
 
-#: git-stash.sh:545
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' não é uma referência de pilha"
+#: command-list.h:183
+msgid "Creates a temporary file with a blob's contents"
+msgstr ""
 
-#: git-stash.sh:553
-msgid "unable to refresh index"
-msgstr "não foi possível refrescar o índice"
+#: command-list.h:184
+msgid "Unpack objects from a packed archive"
+msgstr ""
 
-#: git-stash.sh:557
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Não é possível aplicar uma pilha durante uma integração"
+#: command-list.h:185
+msgid "Register file contents in the working tree to the index"
+msgstr ""
 
-#: git-stash.sh:565
-msgid "Conflicts in index. Try without --index."
-msgstr "Conflitos no índice. Tente sem --index."
+#: command-list.h:186
+msgid "Update the object name stored in a ref safely"
+msgstr ""
 
-#: git-stash.sh:567
-msgid "Could not save index tree"
-msgstr "Não foi possível guardar árvore do índice"
+#: command-list.h:187
+msgid "Update auxiliary info file to help dumb servers"
+msgstr ""
 
-#: git-stash.sh:576
-msgid "Could not restore untracked files from stash"
-msgstr "Não foi possível restaurar os ficheiros não controlados da pilha"
+#: command-list.h:188
+msgid "Send archive back to git-archive"
+msgstr ""
 
-#: git-stash.sh:601
-msgid "Cannot unstage modified files"
-msgstr "Não é possível despreparar os ficheiros modificado"
+#: command-list.h:189
+msgid "Send objects packed back to git-fetch-pack"
+msgstr ""
 
-#: git-stash.sh:616
-msgid "Index was not unstashed."
-msgstr "O índice não foi reposto."
+#: command-list.h:190
+msgid "Show a Git logical variable"
+msgstr ""
 
-#: git-stash.sh:630
-msgid "The stash is kept in case you need it again."
-msgstr "A pilha é guarda no caso de precisar dela de novo."
+#: command-list.h:191
+#, fuzzy
+msgid "Check the GPG signature of commits"
+msgstr "Verifica assinatura GPG de memórias"
 
-#: git-stash.sh:639
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "A descartar ${REV} ($s)"
+#: command-list.h:192
+#, fuzzy
+msgid "Validate packed Git archive files"
+msgstr "Validar ficheiros pacote de arquivo Git"
 
-#: git-stash.sh:640
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Não foi possível descartar elemento da pilha"
+#: command-list.h:193
+msgid "Check the GPG signature of tags"
+msgstr "Verifica assinatura GPG de tags"
 
-#: git-stash.sh:648
-msgid "No branch name specified"
-msgstr "Nenhum nome de ramo especificado"
+#: command-list.h:194
+msgid "Git web interface (web frontend to Git repositories)"
+msgstr "Interface web de Git (frontend web para repositórios Git)"
 
-#: git-stash.sh:727
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Para os restaurar execute \"git stash apply\")"
+#: command-list.h:195
+msgid "Show logs with difference each commit introduces"
+msgstr "Mostrar logs com diferenças que cada memória introduz"
 
-#: git-submodule.sh:181
-msgid "Relative path can only be used from the toplevel of the working tree"
+#: command-list.h:196
+#, fuzzy
+msgid "Manage multiple working trees"
+msgstr "Gerir múltiplas working trees"
+
+#: command-list.h:197
+#, fuzzy
+msgid "Create a tree object from the current index"
+msgstr "Criar um objeto tree a partir de index atual"
+
+#: command-list.h:198
+msgid "Defining attributes per path"
+msgstr "Definir atributos por path"
+
+#: command-list.h:199
+msgid "Git command-line interface and conventions"
 msgstr ""
-"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
-"trabalho"
 
-#: git-submodule.sh:191
-#, sh-format
-msgid "repo URL: '$repo' must be absolute or begin with ./|../"
-msgstr "URL do repositório: '$repo' deve ser absoluto ou começar com ./|../"
+#: command-list.h:200
+msgid "A Git core tutorial for developers"
+msgstr ""
 
-#: git-submodule.sh:210
-#, sh-format
-msgid "'$sm_path' already exists in the index"
-msgstr "'$sm_path' já existe no índice"
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr ""
 
-#: git-submodule.sh:213
-#, 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"
+#: command-list.h:202
+msgid "Git for CVS users"
+msgstr ""
 
-#: git-submodule.sh:218
-#, 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."
+#: command-list.h:203
+#, fuzzy
+msgid "Tweaking diff output"
+msgstr "suprimir saída do diff"
+
+#: command-list.h:204
+msgid "A useful minimum set of commands for Everyday Git"
 msgstr ""
-"O seguinte caminho foi ignorado por um ficheiro .gitignore:\n"
-"$sm_path\n"
-"Use -f se pretende mesmo adicioná-lo."
 
-#: git-submodule.sh:236
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "A adicionar repositório existente em '$sm_path' ao índice"
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr ""
 
-#: git-submodule.sh:238
-#, 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"
+#: command-list.h:206
+#, fuzzy
+msgid "A Git Glossary"
+msgstr "Um Glossário de Git"
 
-#: git-submodule.sh:246
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
+#: command-list.h:207
+msgid "Hooks used by Git"
 msgstr ""
-"Um diretório git de '$sm_name' foi encontrado localmente com os remotos:"
 
-#: git-submodule.sh:248
-#, 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."
+#: command-list.h:208
+msgid "Specifies intentionally untracked files to ignore"
 msgstr ""
-"Se quer reutilizar este diretório git local em vez de clonar de novo de\n"
-"  $realrepo\n"
-"use a opção '--force'. Se o diretório git local não é o repo correto\n"
-"ou não tem a certeza o que isto significa escolha outro nome com a opção '--"
-"name'."
+"Especificar ficheiros por monitorizar intencionalmente, para serem ignorados"
 
-#: git-submodule.sh:254
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "A reativar o diretório git local do submódulo '$sm_name'."
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr ""
 
-#: git-submodule.sh:266
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Não foi possível extrair o submódulo '$sm_path'"
+#: command-list.h:210
+msgid "Defining submodule properties"
+msgstr "Definir propriedades de submódulos"
 
-#: git-submodule.sh:271
-#, sh-format
-msgid "Failed to add submodule '$sm_path'"
-msgstr "Falha ao adicionar o submódulo '$sm_path'"
+#: command-list.h:211
+msgid "Git namespaces"
+msgstr ""
 
-#: git-submodule.sh:280
-#, sh-format
-msgid "Failed to register submodule '$sm_path'"
-msgstr "Falha ao registar o submódulo '$sm_path'"
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr ""
 
-#: git-submodule.sh:341
-#, sh-format
-msgid "Entering '$displaypath'"
-msgstr "A entrar em '$displaypath'"
+#: command-list.h:213
+msgid "Git Repository Layout"
+msgstr ""
 
-#: git-submodule.sh:361
-#, sh-format
-msgid "Stopping at '$displaypath'; script returned non-zero status."
+#: command-list.h:214
+msgid "Specifying revisions and ranges for Git"
+msgstr "Especificar revisões e intervalos do Git"
+
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr ""
+
+#: command-list.h:216
+#, fuzzy
+msgid "A tutorial introduction to Git: part two"
+msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
+
+#: command-list.h:217
+#, fuzzy
+msgid "A tutorial introduction to Git"
+msgstr "Uma introdução ao Git (versão 1.5.1 ou mais recente)"
+
+#: 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:68
+msgid "bisect run failed: no command provided."
 msgstr ""
-"Interrompido em '$displaypath'; o script retornou um valor diferente de zero."
 
-#: git-submodule.sh:432
+#: git-bisect.sh:73
 #, sh-format
-msgid "pathspec and --all are incompatible"
-msgstr "especificador de caminho e --all são incompatíveis"
+msgid "running $command"
+msgstr "executando $command"
 
-#: git-submodule.sh:437
+#: git-bisect.sh:80
 #, sh-format
-msgid "Use '--all' if you really want to deinitialize all submodules"
+msgid ""
+"bisect run failed:\n"
+"exit code $res from '$command' is < 0 or >= 128"
 msgstr ""
-"Use '--all' se pretende mesmo anular a inicialização todos os submódulos"
+"bissetar impossível:\n"
+"exit code $res de '$command' é < 0 ou >= 128"
 
-#: git-submodule.sh:457
-#, sh-format
+#: git-bisect.sh:105
+msgid "bisect run cannot continue any more"
+msgstr "bisseção incapaz de continuar"
+
+#: git-bisect.sh:111
+#, fuzzy, sh-format
 msgid ""
-"Submodule work tree '$displaypath' contains a .git directory\n"
-"(use 'rm -rf' if you really want to remove it including all of its history)"
+"bisect run failed:\n"
+"'bisect-state $state' exited with error code $res"
 msgstr ""
-"A árvore de trabalho do submódulo '$displaypath' contém um diretório .git\n"
-"(use 'rm -rf' se pretende mesmo removê-lo, incluindo todo o seu histórico)"
+"bisseção impossível:\n"
+"'bisect_state $state' retornou código $res de erro"
 
-#: git-submodule.sh:465
-#, sh-format
+#: git-bisect.sh:118
+msgid "bisect run success"
+msgstr "bissecção concluída com sucesso"
+
+#: git-merge-octopus.sh:46
 msgid ""
-"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
-"discard them"
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
 msgstr ""
-"A árvore de trabalho do submódulo '$displaypath' contém alterações locais; "
-"use '-f' para as descartar"
+"Erro: As suas alterações locais nos seguintes ficheiros seriam substituídas "
+"ao integrar"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "Junção automática falhou."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr "Deverias estar a fazer polvo nenhum."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+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
+msgid "Already up to date with $pretty_name"
+msgstr "Já está atualizado com $pretty_name"
 
-#: git-submodule.sh:468
+#: git-merge-octopus.sh:89
 #, sh-format
-msgid "Cleared directory '$displaypath'"
-msgstr "Diretório '$displaypath' limpo"
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "A avançar rapidamente para: $pretty_name"
 
-#: git-submodule.sh:469
+#: git-merge-octopus.sh:97
 #, sh-format
-msgid "Could not remove submodule work tree '$displaypath'"
+msgid "Trying simple merge with $pretty_name"
+msgstr "A tentar integração simples com $pretty_name"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+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"
 msgstr ""
-"Não foi possível remover a árvore de trabalho do submódulo '$displaypath'"
+"Os caminhos relativos só podem ser usados a partir do topo da árvore de "
+"trabalho"
 
-#: git-submodule.sh:472
+#: git-submodule.sh:189
 #, sh-format
-msgid "Could not create empty submodule directory '$displaypath'"
-msgstr "Não foi possível criar o diretório vazio do submódulo '$displaypath'"
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+msgstr "URL do repositório: '$repo' deve ser absoluto ou começar com ./|../"
 
-#: git-submodule.sh:481
+#: git-submodule.sh:208
 #, sh-format
-msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
-msgstr ""
-"O registo do submódulo '$name' ($url) foi removido do caminho '$displaypath'"
+msgid "'$sm_path' already exists in the index"
+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 index e é submódulo nenhum"
+
+#: git-submodule.sh:218
+#, fuzzy, sh-format
+msgid "'$sm_path' does not have a commit checked out"
+msgstr "'$sm_path' tem memória nenhuma checked out"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:248
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr "Falha ao adicionar o submódulo '$sm_path'"
+
+#: git-submodule.sh:257
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "Falha ao registar submódulo '$sm_path'"
+
+#: git-submodule.sh:532
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
-msgstr ""
-"Não foi possível encontrar a revisão atual no caminho de submódulo "
-"'$displaypath'"
+msgstr "Incapaz encontrar revisão atual em path de submódulo '$displaypath'"
 
-#: git-submodule.sh:647
+#: git-submodule.sh:542
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
-msgstr "Não foi possível obter no caminho de submódulo '$sm_path'"
+msgstr "Incapaz de buscar em path de submódulo '$sm_path'"
 
-#: git-submodule.sh:652
+#: git-submodule.sh:547
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr ""
-"Não foi possível encontrar a revisão atual ${remote_name}/${branch} no "
-"caminho de submódulo '$sm_path'"
+"Incapaz de encontrar revisão atual ${remote_name}/${branch} em path de "
+"submódulo '$sm_path'"
 
-#: git-submodule.sh:670
-#, sh-format
-msgid "Unable to fetch in submodule path '$displaypath'"
-msgstr "Não é possível obter no caminho de submódulo '$displaypath'"
+#: git-submodule.sh:565
+#, fuzzy, 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:"
 
-#: git-submodule.sh:676
+#: 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:683
+#: git-submodule.sh:578
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
-msgstr "Não é possível extrair '$sha1' no caminho de submódulo '$displaypath'"
+msgstr "Incapaz de checkout '$sha1' no path de submódulo '$displaypath'"
 
-#: git-submodule.sh:684
+#: 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:688
+#: git-submodule.sh:583
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
-msgstr ""
-"Não foi possível efetuar rebase de '$sha1' no caminho de submódulo "
-"'$displaypath'"
+msgstr "Incapaz de rebasear '$sha1' em path de submódulo '$displaypath'"
 
-#: git-submodule.sh:689
+#: 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:694
+#: git-submodule.sh:589
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
-msgstr "Não é possível integrar '$sha1' no caminho de submódulo '$displaypath'"
+msgstr "Incapaz juntar '$sha1' em path de submódulo '$displaypath'"
 
-#: git-submodule.sh:695
+#: 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:700
+#: 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:701
+#: git-submodule.sh:596
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Caminho de submódulo '$displaypath': '$command $sha1'"
 
-#: git-submodule.sh:732
+#: git-submodule.sh:627
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Falha ao percorrer o caminho de submódulo '$displaypath'"
 
-#: git-submodule.sh:840
-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"
-
-#: git-submodule.sh:892
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "modo inesperado $mod_dst"
-
-#: git-submodule.sh:912
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr "  Aviso: $display_name não contém o commit $sha1_src"
-
-#: git-submodule.sh:915
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr "  Warn: $display_name não contém o commit $sha1_dst"
-
-#: git-submodule.sh:918
-#, 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"
-
-#: git-submodule.sh:1064
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "Falha ao percorrer recursivamente o caminho de submódulo '$sm_path'"
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Pilha automática (autostash) aplicada."
 
-#: git-submodule.sh:1136
+#: git-rebase--preserve-merges.sh:112
 #, sh-format
-msgid "Synchronizing submodule url for '$displaypath'"
-msgstr "A sincronizar o URL do submódulo '$displaypath'"
+msgid "Cannot store $stash_sha1"
+msgstr "Incapaz guardar $stash_sha1"
 
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Consulte git-${cmd}(1) para obter mais detalhes."
+#: 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 ""
+"Realizando autostash existem sobreposições.\n"
+"As tuas mudanças estão salvas na stash.\n"
+"Podes executar \"git stash pop\" ou \"git stash drop\" oportunamente.\n"
 
-#: git-rebase--interactive.sh:140
+#: git-rebase--preserve-merges.sh:191
 #, sh-format
 msgid "Rebasing ($new_count/$total)"
 msgstr "A rebasear ($new_count/$total)"
 
-#: git-rebase--interactive.sh:156
+#: git-rebase--preserve-merges.sh:197
+#, fuzzy
 msgid ""
 "\n"
 "Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick <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 = 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 <commit> = usa commit\n"
+"r, reword <commit> = usa commit, editando a mensagem commit\n"
+"e, edit <commit> = usa commit, mas pára para emendar\n"
+"s, squash <commit> = usa commit, fundindo no commit anterior\n"
+"f, fixup <commit> = como \"squash\", mas descarta mensagem deste commit\n"
+"x, exec <commit> = executa comando (do resto da linha) usando a shell\n"
+"d, drop <commit> = larga commit\n"
+"l, label <label> = dá um label a HEAD atual\n"
+"t, reset <label> = reinicia a HEAD em label\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       cria merge commit usando a commit message original (a única\n"
+".       linha também poderá ser utlilizada). Usa -c <commit> para \n"
+".       modificar a commit message.\n"
 "\n"
-"Estas linhas pode ser reordenadas; são executadas de cima para baixo.\n"
+"Estas linhas podem ser reordenadas; são executadas de cima para baixo.\n"
 
-#: git-rebase--interactive.sh:171
-msgid ""
-"\n"
-"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
-msgstr ""
-"\n"
-"Não remover nenhum linha. Use 'drop' explicitamente para remover um commit.\n"
-
-#: git-rebase--interactive.sh:175
-msgid ""
-"\n"
-"If you remove a line here THAT COMMIT WILL BE LOST.\n"
-msgstr ""
-"\n"
-"Se remover uma linha daqui AQUELE COMMIT SER� PERDIDO.\n"
-
-#: git-rebase--interactive.sh:211
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -15012,91 +25781,91 @@ msgid ""
 "\n"
 "\tgit rebase --continue"
 msgstr ""
-"Pode emendar o commit agora, com\n"
+"Podes emendar o commit agora, com\n"
 "\n"
 "\tgit commit --amend $gpg_sign_opt_quoted\n"
 "\n"
-"Assim que estiver satisfeito com as alterações, execute\n"
+"Quando modificações estão correctas, executa\n"
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:236
+#: 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--interactive.sh:275
+#: git-rebase--preserve-merges.sh:324
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Nome de commit inválido: $sha1"
 
-#: git-rebase--interactive.sh:317
+#: git-rebase--preserve-merges.sh:354
 msgid "Cannot write current commit's replacement sha1"
-msgstr "Não é possível escrever o sha1 substituto do commit"
+msgstr "Incapaz escrever sha1 substituto atual de commit"
 
-#: git-rebase--interactive.sh:369
+#: 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--interactive.sh:371
+#: git-rebase--preserve-merges.sh:407
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
-msgstr "Não é possível avançar rapidamente para $sha1"
+msgstr "Incapaz fast-forward até $sha1"
 
-#: git-rebase--interactive.sh:380
+#: git-rebase--preserve-merges.sh:416
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
-msgstr "Não é possível mover HEAD para $first_parent"
+msgstr "Incapaz mover HEAD até $first_parent"
 
-#: git-rebase--interactive.sh:385
+#: git-rebase--preserve-merges.sh:421
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "Recusa-se a esmagar uma integração: $sha1"
 
-#: git-rebase--interactive.sh:399
+#: git-rebase--preserve-merges.sh:439
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Erro ao refazer integração $sha1"
 
-#: git-rebase--interactive.sh:407
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
-msgstr "Não foi possível apanhar $sha1"
+msgstr "Incapaz apanhar $sha1"
 
-#: git-rebase--interactive.sh:416
+#: 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--interactive.sh:421
+#: 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--interactive.sh:432
+#: 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] "Isto é a combinação de $count commit."
 msgstr[1] "Isto é a combinação de $count commits."
 
-#: git-rebase--interactive.sh:441
+#: git-rebase--preserve-merges.sh:482
 #, sh-format
 msgid "Cannot write $fixup_msg"
-msgstr "Não é possível escrever $fixup_msg"
+msgstr "Incapaz escrever $fixup_msg"
 
-#: git-rebase--interactive.sh:444
+#: git-rebase--preserve-merges.sh:485
 msgid "This is a combination of 2 commits."
 msgstr "Isto é a combinação de 2 commits."
 
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: 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 "Não foi possível aplicar $sha1... $rest"
+msgstr "Incapaz submeter $sha1... $rest"
 
-#: git-rebase--interactive.sh:559
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15105,50 +25874,47 @@ msgid ""
 "before\n"
 "you are able to reword the commit."
 msgstr ""
-"Não foi possível emendar o commit depois de apanhar com sucesso $sha1... "
-"$rest\n"
-"Deve-se provavelmente a uma mensagem de commit vazia ou o pre-commit hook "
-"falhou.\n"
-"Se o pre-commit hook falhou, pode precisar de resolver o problema ante de "
-"poder\n"
-"reformular a mensagem do commit."
+"Impossível emendar commit pós um sucesso do picking $sha1... $rest\n"
+" devido a um commit message vazio, ou o pre-commit hook falhou. Se o \n"
+"pre-commit hook falhou, pode ser preciso resolver o issue antes de \n"
+"tentares modificar a mensagem commit."
 
-#: git-rebase--interactive.sh:574
+#: git-rebase--preserve-merges.sh:616
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "Parou em $sha1_abbrev... $rest"
 
-#: git-rebase--interactive.sh:589
+#: git-rebase--preserve-merges.sh:631
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
-msgstr "Não é possível efetuar '$squash_style' sem um commit anterior"
+msgstr "Incapaz '$squash_style' sem um commit anterior"
 
-#: git-rebase--interactive.sh:631
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr "A executar: $rest"
 
-#: git-rebase--interactive.sh:639
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Falha ao executar: $rest"
 
-#: git-rebase--interactive.sh:641
+#: 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"
 
-#: git-rebase--interactive.sh:643
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
 "\tgit rebase --continue"
 msgstr ""
-"Pode corrigir o problema e executar\n"
+"Podes resolver o problema, e executar\n"
 "\n"
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -15158,99 +25924,30 @@ msgid ""
 "\tgit rebase --continue"
 msgstr ""
 "Executado com sucesso: $rest\n"
-"mas deixou alterações no índice e/ou na árvore de trabalho\n"
-"Submeta ou esconda as alterações e execute\n"
+"e tens alterações em índice e/ou em working tree\n"
+"Põe no commit ou stash, e corre\n"
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--interactive.sh:667
+#: git-rebase--preserve-merges.sh:709
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "Comando desconhecido: $command $sha1 $rest"
 
-#: git-rebase--interactive.sh:668
+#: git-rebase--preserve-merges.sh:710
 msgid "Please fix this using 'git rebase --edit-todo'."
 msgstr "Corrija-o usando 'git rebase --edit-todo'."
 
-#: git-rebase--interactive.sh:703
+#: git-rebase--preserve-merges.sh:745
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "$head_name rebaseado e atualizado com sucesso."
 
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Não foi possível saltar comandos pick desnecessários"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Aviso: falta o SHA-1 ou a seguinte linha não tem um commit:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, 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"
-
-#: git-rebase--interactive.sh:980
-msgid "could not detach HEAD"
-msgstr "não foi possível destacar HEAD"
-
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Aviso: alguns commits podem ter sido descartados acidentalmente.\n"
-"Commits descartados (mais novo para o mais velho):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"Para evitar esta mensagem, use \"drop\" para remover um commit "
-"explicitamente.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' para mudar o nível de avisos.\n"
-"O comportamentos possíveis são: ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Definição $check_level desconhecida da opção rebase.missingCommitsCheck. "
-"Ignorado."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Pode corrí-lo com 'git rebase --edit-todo' e depois executar 'git rebase --"
-"continue'."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Ou pode abortar o rebase com 'git rebase --abort'."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--preserve-merges.sh:802
 msgid "Could not remove CHERRY_PICK_HEAD"
-msgstr "Não foi possível remover CHERRY_PICK_HEAD"
+msgstr "Incapaz remover CHERRY_PICK_HEAD"
 
-#: git-rebase--interactive.sh:1088
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -15267,25 +25964,25 @@ msgid ""
 "\n"
 "  git rebase --continue\n"
 msgstr ""
-"Tem alterações preparadas na árvore de trabalho.\n"
-"Se tenciona esmagar estas alterações\n"
-"no commit anterior, execute:\n"
+"Tens modificações staged na working tree.\n"
+"Se tenciona squash as modificações no último\n"
+"commit, execute:\n"
 "\n"
 "  git commit --amend $gpg_sign_opt_quoted\n"
 "\n"
-"Se tenciona pô-las num novo commit, execute:\n"
+"Se tenciona pô-las em novo commit, execute:\n"
 "\n"
 "  git commit $gpg_sign_opt_quoted\n"
 "\n"
-"Em ambos os casos, quando estiver pronto, continue com:\n"
+"Em ambos os casos, quando feito, continue com:\n"
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--interactive.sh:1105
+#: git-rebase--preserve-merges.sh:824
 msgid "Error trying to find the author identity to amend commit"
 msgstr "Erro ao tentar encontrar a identidade do autor para emendar o commit"
 
-#: git-rebase--interactive.sh:1110
+#: 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."
@@ -15293,258 +25990,166 @@ msgstr ""
 "Tem alterações por submeter na árvore de trabalho. Submeta-as primeiro\n"
 "e execute 'git rebase --continue' de novo."
 
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
 msgid "Could not commit staged changes."
-msgstr "Não foi possível submeter as alterações preparadas."
+msgstr "Incapaz de commit alterações preparadas."
 
-#: git-rebase--interactive.sh:1147
-msgid ""
-"\n"
-"You are editing the todo file of an ongoing interactive rebase.\n"
-"To continue rebase after editing, run:\n"
-"    git rebase --continue\n"
-"\n"
-msgstr ""
-"\n"
-"Está a editar o ficheiro de tarefa de um rebase interativo em curso.\n"
-"Para continuar o rebase depois de editar, execute:\n"
-"    git rebase --continue\n"
-"\n"
-
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
 msgid "Could not execute editor"
-msgstr "Não foi possível executar o editor"
+msgstr "Incapaz executar editor"
 
-#: git-rebase--interactive.sh:1168
+#: git-rebase--preserve-merges.sh:890
 #, sh-format
 msgid "Could not checkout $switch_to"
-msgstr "Não foi possível extrair $switch_to"
+msgstr "Incapaz checkout $switch_to"
 
-#: git-rebase--interactive.sh:1173
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
-msgstr "Sem HEAD?"
+msgstr "HEAD nenhuma?"
 
-#: git-rebase--interactive.sh:1174
+#: git-rebase--preserve-merges.sh:898
 #, sh-format
 msgid "Could not create temporary $state_dir"
-msgstr "Não foi possível criar $state_dir temporário"
+msgstr "Incapaz criar $state_dir temporário"
 
-#: git-rebase--interactive.sh:1176
+#: git-rebase--preserve-merges.sh:901
 msgid "Could not mark as interactive"
-msgstr "Não foi possível marcar como interativo"
+msgstr "Incapaz marcar como interativo"
 
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
-msgid "Could not init rewritten commits"
-msgstr "Não foi possível inicializar commits reescritos"
-
-#: git-rebase--interactive.sh:1291
+#: 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 sobre $shortonto ($todocount comando)"
 msgstr[1] "Rebase $shortrevisions sobre $shortonto ($todocount comandos)"
 
-#: git-rebase--interactive.sh:1296
-msgid ""
-"\n"
-"However, if you remove everything, the rebase will be aborted.\n"
-"\n"
-msgstr ""
-"\n"
-"No entanto, se remover tudo, o rebase será abortado.\n"
-"\n"
-
-#: git-rebase--interactive.sh:1303
+#: 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 memórias reescritas"
 
 #: git-sh-setup.sh:89 git-sh-setup.sh:94
 #, sh-format
 msgid "usage: $dashless $USAGE"
 msgstr "utilização: $dashless $USAGE"
 
-#: git-sh-setup.sh:190
+#: git-sh-setup.sh:191
 #, sh-format
 msgid "Cannot chdir to $cdup, the toplevel of the working tree"
-msgstr ""
-"Não é possível mudar de diretório para $cdup, o topo da árvore de trabalho"
+msgstr "Incapaz chdir para $cdup, o topo da árvore de trabalho"
 
-#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#: 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:220
+#: git-sh-setup.sh:221
 msgid "Cannot rebase: You have unstaged changes."
-msgstr "Não é possível rebasear: tem alterações não preparadas."
+msgstr "Incapaz rebasear: Tens alterações despreparadas."
 
-#: git-sh-setup.sh:223
+#: git-sh-setup.sh:224
 msgid "Cannot rewrite branches: You have unstaged changes."
-msgstr "Não é possível reescrever ramos: tem alterações não preparadas."
+msgstr "Incapaz reescrever ramos: Tens alterações despreparadas."
 
-#: git-sh-setup.sh:226
+#: git-sh-setup.sh:227
 msgid "Cannot pull with rebase: You have unstaged changes."
-msgstr "Não é possível puxar com rebase: tem alterações não preparadas."
+msgstr "Incapaz agarrar com rebase: Tens alterações despreparadas."
 
-#: git-sh-setup.sh:229
+#: git-sh-setup.sh:230
 #, sh-format
 msgid "Cannot $action: You have unstaged changes."
-msgstr "Não é possível efetuar $action: tem alterações não preparadas."
+msgstr "Incapaz $action: Tens alterações despreparadas."
 
-#: git-sh-setup.sh:242
+#: git-sh-setup.sh:243
 msgid "Cannot rebase: Your index contains uncommitted changes."
-msgstr "Não é possível rebasear: o índice contém alterações não submetidas."
+msgstr "Incapaz rebasear: Teu index contém alterações por memorizar."
 
-#: git-sh-setup.sh:245
+#: git-sh-setup.sh:246
 msgid "Cannot pull with rebase: Your index contains uncommitted changes."
-msgstr ""
-"Não é possível puxar com rebase: o índice contém alterações não submetidas."
+msgstr "Incapaz agarrar com rebase: Teu index contém alterações por memorizar."
 
-#: git-sh-setup.sh:248
+#: git-sh-setup.sh:249
 #, sh-format
 msgid "Cannot $action: Your index contains uncommitted changes."
-msgstr ""
-"Não é possível efetuar $action: o índice contém alterações não submetidas."
+msgstr "Incapaz $action: Teu index contém alterações por memorizar."
 
-#: git-sh-setup.sh:252
+#: 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:372
+#: git-sh-setup.sh:373
 msgid "You need to run this command from the toplevel of the working tree."
 msgstr ""
 "Precisa de executar este comando a partir do topo da árvore de trabalho."
 
-#: git-sh-setup.sh:377
+#: git-sh-setup.sh:378
 msgid "Unable to determine absolute path of git directory"
-msgstr "Não é possível determinar o caminho absoluto do diretório git"
+msgstr "Incapaz determinar caminho absoluto de pasta git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:238
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:239
-msgid "staged"
-msgstr "preparado"
-
-#: git-add--interactive.perl:239
-msgid "unstaged"
-msgstr "não preparado"
-
-#: git-add--interactive.perl:288 git-add--interactive.perl:313
-msgid "binary"
-msgstr "binário"
-
-#: git-add--interactive.perl:297 git-add--interactive.perl:351
-msgid "nothing"
-msgstr "nada"
-
-#: git-add--interactive.perl:333 git-add--interactive.perl:348
-msgid "unchanged"
-msgstr "não alterado"
-
-#: git-add--interactive.perl:644
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "%d caminho adicionar\n"
-msgstr[1] "%d caminhos adicionados\n"
-
-#: git-add--interactive.perl:647
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "%d caminho atualizado\n"
-msgstr[1] "%d caminhos atualizados\n"
-
-#: git-add--interactive.perl:650
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "%d caminho revertido\n"
-msgstr[1] "%d caminhos revertidos\n"
-
-#: git-add--interactive.perl:653
+#: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d caminho afetado\n"
 msgstr[1] "%d caminhos afetados\n"
 
-#: git-add--interactive.perl:662
-msgid "Update"
-msgstr "Atualizar"
-
-#: git-add--interactive.perl:674
-msgid "Revert"
-msgstr "Reverter"
-
-#: git-add--interactive.perl:697
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "nota: %s é agora não controlado.\n"
-
-#: git-add--interactive.perl:708
-msgid "Add untracked"
-msgstr "Adicionar não controlados"
-
-#: git-add--interactive.perl:714
-msgid "No untracked files.\n"
-msgstr "Nenhum ficheiros não controlado.\n"
-
-#: git-add--interactive.perl:1030
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"como preparado imediatamente."
+"Se patch aplica-se correctamente, a edição do hunk será marcada\n"
+"imediatamente como preparado."
 
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"como escondido imediatamente."
+"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
+"imediatamente como stashed."
 
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"como não preparado imediatamente."
+"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
+"imediatamente como despreparada."
 
-#: git-add--interactive.perl:1039 git-add--interactive.perl:1048
+#: 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."
 msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"para ser aplicado imediatamente."
+"Se patch aplica-se corretamente, a edição do hunk será marcada\n"
+"imediatamente como aplicada."
 
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1045
+#: 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."
 msgstr ""
-"Se o patch se aplicar corretamente, o excerto editado será marcado\n"
-"para ser descartado imediatamente."
+"Se patch aplica-se corretamente, o pedaço editado será marcado\n"
+"imediatamente como descartado."
 
-#: git-add--interactive.perl:1058
+#: 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:1059
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Modo de edição manual de excerto -- ver guia rápido abaixo no final.\n"
-
-#: git-add--interactive.perl:1065
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -15553,41 +26158,16 @@ msgid ""
 "Lines starting with %s will be removed.\n"
 msgstr ""
 "---\n"
-"Para remover linhas '%s', torne-as linhas ' ' (contexto).\n"
-"Para remover linhas '%s', elimine-as.\n"
+"Removendo linhas '%s', torna-as linhas ' ' (contexto).\n"
+"Removendo linhas '%s', elimina-as.\n"
 "Linhas começadas com %s serão removidas.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1073
-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 ""
-"Se não se aplicar corretamente, ser-lhe-á dada oportunidade para editar\n"
-"de novo.  Se todas as linhas do excerto forem removidas, a edição é\n"
-"abortada e o exceto é deixado inalterado.\n"
-
-#: git-add--interactive.perl:1087
+#: 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"
-
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1178
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"O excerto que editou não aplica.\n"
-"Edite de novo (responder \"não\" descarta!) [y/n]? "
+msgstr "falha a abrir ficheiro de edição do pedaço para leitura: %s"
 
-#: git-add--interactive.perl:1187
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -15595,13 +26175,13 @@ 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:1193
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -15609,13 +26189,13 @@ 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:1199
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -15623,13 +26203,13 @@ 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:1205
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -15637,13 +26217,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\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:1211
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -15651,13 +26231,13 @@ 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:1217
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -15665,13 +26245,13 @@ 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 do índice e da árvore de trabalho\n"
-"n - não descartar este excerto do índice nem da árvore de trabalho\n"
-"q - sair; não descartar este excerto nem nenhum dos 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 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:1223
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -15679,13 +26259,28 @@ 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"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 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:1232
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -15697,213 +26292,105 @@ 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:1263
+#: 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"
-
-#: git-add--interactive.perl:1264
-msgid "Apply them to the worktree anyway? "
-msgstr "Aplicá-los à árvore de trabalho mesmo assim? "
-
-#: git-add--interactive.perl:1267
-msgid "Nothing was applied.\n"
-msgstr "Não foi aplicado nada.\n"
-
-#: git-add--interactive.perl:1278
-#, perl-format
-msgid "ignoring unmerged: %s\n"
-msgstr "ignorado não integrado: %s\n"
-
-#: git-add--interactive.perl:1287
-msgid "Only binary files changed.\n"
-msgstr "Apenas ficheiros binários alterados.\n"
-
-#: git-add--interactive.perl:1289
-msgid "No changes.\n"
-msgstr "Sem alterações.\n"
-
-#: git-add--interactive.perl:1297
-msgid "Patch update"
-msgstr "Atualizar patch"
-
-#: git-add--interactive.perl:1349
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Preparar alteração de modo [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1350
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Preparar eliminação [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1351
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Preparar este excerto [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1354
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Esconder alteração de modo [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1355
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Esconder eliminação [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1356
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Esconder este excerto [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1359
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
-msgstr "Não preparar alteração de modo [y,n,q,a,d,/%s,?]? "
+msgstr "Os pedaços selecionados ficam de fora de index!\n"
 
 #: git-add--interactive.perl:1360
 #, perl-format
-msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Não preparar eliminação [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1361
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
-msgstr "Não preparar este excerto [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1364
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar alteração de modo ao índice [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1365
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar eliminação ao índice [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1366
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
-msgstr "Aplicar este excerto ao índice [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1369
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descartar alteração de modo da árvore de trabalho [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1370
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descartar eliminação da árvore de trabalho [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1371
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descartar este excerto da árvore de trabalho [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1374
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Descartar alteração de modo do índice e da árvore de trabalho [y,n,q,a,d,/"
-"%s,?]? "
-
-#: git-add--interactive.perl:1375
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Descartar eliminação do índice e da árvore de trabalho [y,n,q,a,d,/%s,?]? "
-
-#: git-add--interactive.perl:1376
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
-msgstr ""
-"Descartar este excerto do índice e da árvore de trabalho [y,n,q,a,d,/%s,?]? "
+msgid "ignoring unmerged: %s\n"
+msgstr "ignorando por juntar: %s\n"
 
-#: git-add--interactive.perl:1379
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+#: git-add--interactive.perl:1479
+#, fuzzy, 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:1380
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+#: git-add--interactive.perl:1480
+#, fuzzy, 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:1381
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+#: git-add--interactive.perl:1481
+#, fuzzy, perl-format
+msgid "Apply addition 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 eliminação ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1484
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "ir para que excerto (<ret> para ver mais)? "
+#: git-add--interactive.perl:1482
+#, fuzzy, perl-format
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
+"Aplicar este pedaço ao índice e à árvore de trabalho [y,n,q,a,d,/%s,?]? "
 
-#: git-add--interactive.perl:1486
-msgid "go to which hunk? "
-msgstr "ir para que excerto? "
+#: git-add--interactive.perl:1599
+msgid "No other hunks to goto\n"
+msgstr ""
 
-#: git-add--interactive.perl:1495
+#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Número inválido: '%s'\n"
 
-#: git-add--interactive.perl:1500
+#: git-add--interactive.perl:1622
 #, 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:1526
-msgid "search for regex? "
-msgstr "procurar por regex? "
+#: git-add--interactive.perl:1657
+msgid "No other hunks to search\n"
+msgstr ""
 
-#: git-add--interactive.perl:1539
+#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Regexp de pesquisa malformada %s: %s\n"
 
-#: git-add--interactive.perl:1549
+#: 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:1561 git-add--interactive.perl:1583
+#: 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:1570 git-add--interactive.perl:1589
+#: 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:1597
+#: git-add--interactive.perl:1730
+msgid "Sorry, cannot split this hunk\n"
+msgstr ""
+
+#: git-add--interactive.perl:1736
 #, 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:1649
-msgid "Review diff"
-msgstr "Rever diff"
+#: git-add--interactive.perl:1746
+msgid "Sorry, cannot edit this hunk\n"
+msgstr ""
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1668
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -15913,94 +26400,113 @@ 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:1685 git-add--interactive.perl:1690
-#: git-add--interactive.perl:1693 git-add--interactive.perl:1700
-#: git-add--interactive.perl:1704 git-add--interactive.perl:1710
+#: 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
 msgid "missing --"
 msgstr "falta --"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "Mode de --patch desconhecido: %s"
 
-#: git-add--interactive.perl:1712 git-add--interactive.perl:1718
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "argumento inválido %s, esperava-se --"
 
-#: git-send-email.perl:121
+#: 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:128 git-send-email.perl:134
+#: 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:202 git-send-email.perl:208
+#: 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:282
+#: 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:287
+#: 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:305
+#: 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:368 git-send-email.perl:623
+#: 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:530 git-send-email.perl:746
 msgid "Cannot run git format-patch from outside a repository\n"
-msgstr "Não é possível executar git format-patch fora de um repositório\n"
+msgstr "Incapaz executar git format-patch fora de um repositório\n"
+
+#: 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:437
+#: 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:466
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Definidição --confirm desconhecida: '%s'\n"
 
-#: git-send-email.perl:498
+#: 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:500
+#: 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:502
+#: 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:507
+#: 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:589
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -16015,21 +26521,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:610
+#: 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:634
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"fatal: %s: %s\n"
-"aviso: nenhum patch foi enviado\n"
-
-#: git-send-email.perl:645
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -16039,17 +26536,17 @@ msgstr ""
 "Nenhum ficheiro patch especificado!\n"
 "\n"
 
-#: git-send-email.perl:658
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Nenhum linha de assunto em %s?"
 
-#: git-send-email.perl:668
+#: 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:678
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -16059,47 +26556,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:701
-#, perl-format
-msgid "Failed to open %s.final: %s"
-msgstr "Falha ao abrir %s.final: %s"
-
-#: git-send-email.perl:704
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Falha ao abrir %s: %s"
 
-#: git-send-email.perl:739
-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"
+#: 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:748
+#: 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:780
+#: 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:809
+#: 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:814
+#: 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:822
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -16112,39 +26605,39 @@ msgstr ""
 "tem o assunto modelo '*** SUBJECT HERE ***'. Passe --force se pretende mesmo "
 "enviar.\n"
 
-#: git-send-email.perl:841
+#: 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:859
+#: 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:871
+#: 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:921 git-send-email.perl:929
+#: 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:933
+#: 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:1234
+#: 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:1309
+#: 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"
@@ -16168,637 +26661,148 @@ msgstr ""
 "    execute 'git config --global sendemail.confirm auto'.\n"
 "\n"
 
-#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. 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:1324
-msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+#: git-send-email.perl:1544
+#, fuzzy
+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:1327
+#: 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:1353
+#: 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:1397
+#: 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:1633 git-send-email.perl:1637
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "Falhou STARTTLS! %s"
 
-#: git-send-email.perl:1403
+#: git-send-email.perl:1646
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr ""
-"Não é possível inicializar SMTP devidamente. Verifique a configuração e use "
-"--smtp-debug."
+"Incapaz inicializar SMTP devidamente. Verifica configuração e usa --smtp-"
+"debug."
 
-#: git-send-email.perl:1421
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Falha ao enviar %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Simulado-Enviado %s\n"
 
-#: git-send-email.perl:1424
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Enviado %s\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "Simulado-OK. O registo diz:\n"
 
-#: git-send-email.perl:1426
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK. O registo diz:\n"
 
-#: git-send-email.perl:1438
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Resultado: "
 
-#: git-send-email.perl:1441
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Resultado: OK\n"
 
-#: git-send-email.perl:1454
+#: 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:1501 git-send-email.perl:1521
+#: 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:1507
+#: 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:1555
+#: 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:1578
+#: 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:1676
+#: git-send-email.perl:1965
 #, perl-format
 msgid "(%s) Could not execute '%s'"
-msgstr "(%s) Não foi possível executar '%s'"
+msgstr "(%s) Incapaz executar '%s'"
 
-#: git-send-email.perl:1683
+#: 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:1687
+#: 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:1714
+#: 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:1722
+#: git-send-email.perl:2014
 msgid "invalid transfer encoding"
 msgstr "codificação de transferência inválida"
 
-#: git-send-email.perl:1741 git-send-email.perl:1792 git-send-email.perl:1802
+#: git-send-email.perl:2051
+#, fuzzy, 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:1744
-#, 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"
+#: git-send-email.perl:2064
+#, fuzzy, perl-format
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal: %s: %s\n"
+"aviso: enviado patch nenhum\n"
 
-#: git-send-email.perl:1760
+#: 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:1764
+#: 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 ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "Não há nada para excluir de acordo com o padrão :(excluir).\n"
-#~ "Talvez se tenha esquecido de acrescentar ':/' ou '.' ?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "formato não reconhecido: %%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= requer um inteiro positivo como argumento"
-
-#~ 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 "unknown %.*s format %s"
-#~ msgstr "formato de %.*s desconhecido %s"
-
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: desaparecido]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ 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 "'%s' is not a commit"
-#~ msgstr "'%s' não é um commit"
-
-#~ msgid "cannot open file '%s'"
-#~ msgstr "não é possível abrir o ficheiro '%s'"
-
-#~ msgid "could not close file %s"
-#~ msgstr "não é possível fechar o ficheiro %s"
-
-#~ 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 "Não foi possível 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 "Não é possível reverter durante outra reversão."
-
-#~ msgid "Cannot cherry-pick during another cherry-pick."
-#~ msgstr ""
-#~ "Não é possível efetuar cherry-pick durante outro cherry-pick. durante um "
-#~ "cherry-pick."
-
-#~ msgid "Could not parse line %d."
-#~ msgstr "Não foi possível analisar a linha %d."
-
-#~ msgid "Could not open %s"
-#~ msgstr "Não foi possível abrir %s"
-
-#~ msgid "Could not read %s."
-#~ msgstr "Não foi possível ler %s."
-
-#~ msgid "Could not format %s."
-#~ msgstr "Não foi possível formatar %s."
-
-#~ msgid "%s: %s"
-#~ msgstr "%s: %s"
-
-#~ msgid "cannot open %s: %s"
-#~ msgstr "não é possível abrir %s: %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 "Error wrapping up %s"
-#~ msgstr "Erro ao rematar %s."
-
-#~ msgid "Cannot %s during a %s"
-#~ msgstr "Não foi possível efetuar %s durante %s"
-
-#~ msgid "Can't cherry-pick into empty head"
-#~ msgstr "Não é possível efetuar cherry-pick numa cabeça vazia"
-
-#~ msgid "could not open %s for writing"
-#~ msgstr "não foi possível abrir %s para escrita"
-
-#~ 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 "program error"
-#~ msgstr "erro do programa"
-
-#~ msgid "Please call 'bisect_state' with at least one argument."
-#~ msgstr "Invoque 'bisect_state' com pelo menos um argumento."
-
-#~ 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 "unable to access '%s': %s"
-#~ msgstr "não é possível aceder a '%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 "could not verify the tag '%s'"
-#~ msgstr "não foi possível validar a tag '%s'"
-
-#~ 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 "unable to parse format"
-#~ msgstr "não foi possível analisar o formato"
-
-#~ msgid "improper format entered align:%s"
-#~ msgstr "formato impróprio introduzido align:%s"
-
-#~ msgid "Could not set core.worktree in %s"
-#~ msgstr "Não foi possível definir core.worktree em %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 "Não foi possível acrescentar '%s'"
-
-#~ msgid "Missing author: %s"
-#~ msgstr "Autor em falta: %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 "nenhum ficheiros adicionado"
-
-#~ msgid "Could not extract email from committer identity."
-#~ msgstr "Não foi possível extrair a identidade do committer do e-mail."
-
-#~ 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/ru.po b/po/ru.po
index a77b462e62..993d106f1f 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,16 +3,19 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2019
-# insolor, 2014
-# insolor, 2014
+# Alexander Golubev <fatzer2@gmail.com>, 2020
+# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2021
+# Mike Manturov, 2014
+# Mike Manturov, 2014
+# Sergey Alyoshin <alyoshin.s@gmail.com>, 2020
+# Sergey Kuznetsov <votkinsk@gmail.com>, 2021
 # Чук Таблицоменделеев <aurum444an@gmail.com>, 2019
 msgid ""
 msgstr ""
 "Project-Id-Version: Git Russian Localization Project\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-06-04 08:24+0800\n"
-"PO-Revision-Date: 2019-06-21 17:28+0000\n"
+"POT-Creation-Date: 2020-12-21 07:10+0800\n"
+"PO-Revision-Date: 2021-01-29 19:33+0000\n"
 "Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
 "Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -21,73 +24,736 @@ msgstr ""
 "Language: ru\n"
 "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
 
-#: advice.c:103
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Хм (%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
+msgid "could not read index"
+msgstr "не удало�ь прочитать индек�"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "двоичный"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "ничего"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "нет изменений"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Обновить"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr " не удало�ь проиндек�ировать «%s»"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:89 sequencer.c:3478
+msgid "could not write index"
+msgstr "не удало�ь запи�ать индек�"
+
+#: add-interactive.c:706 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"
+msgstr[2] "обновлено %d путей\n"
+msgstr[3] "обновлено %d пути\n"
+
+#: add-interactive.c:724 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:4125 builtin/checkout.c:295
+#: builtin/reset.c:145
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "�бой make_cache_entry дл� пути «%s»"
+
+#: add-interactive.c:759 git-add--interactive.perl:653
+msgid "Revert"
+msgstr "Обратить изменени�"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "�е удало�ь разобрать HEAD^{tree}"
+
+#: add-interactive.c:813 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"
+msgstr[2] "обращены изменени� %d путей\n"
+msgstr[3] "обращены изменени� %d путей\n"
+
+#: add-interactive.c:864 git-add--interactive.perl:693
+#, c-format
+msgid "No untracked files.\n"
+msgstr "�ет неот�леживаемых файлов.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Добавить неот�леживаемый"
+
+#: add-interactive.c:895 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"
+msgstr[2] "добавлено %d путей\n"
+msgstr[3] "добавлено %d пути\n"
+
+#: add-interactive.c:925
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "игнорирую не �литое: %s"
+
+#: add-interactive.c:937 add-patch.c:1751 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Только изменени� двоичных файлов.\n"
+
+#: add-interactive.c:939 add-patch.c:1749 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "�ет изменений.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Обновление патча"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Про�мотреть �пи�ок изменений"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "показать пути � изменени�ми"
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr "добавить �одержимое рабочего каталога к �пи�ку проиндек�ированных изменений"
+
+#: add-interactive.c:1014
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "вернуть проиндек�ированные изменени� назад к HEAD-вер�ии"
+
+#: add-interactive.c:1016
+msgid "pick hunks and update selectively"
+msgstr "выбрать отдельные блоки изменений и обновить выборочно"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "про�мотреть �пи�ок изменений между HEAD и индек�ом"
+
+#: add-interactive.c:1020
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "добавить �одержимое неот�леживаемых файлов к �пи�ку проиндек�ированных изменений"
+
+#: add-interactive.c:1028 add-interactive.c:1077
+msgid "Prompt help:"
+msgstr "Справка:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "выбрать один �лемент"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "выбрать диапазон �лементов"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "выбрать не�колько диапазонов"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "выбрать �лемент на о�нове уникального префик�а"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "убрать выбор указанных �лементов"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "выбрать в�е �лементы"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(пу�то) закончить выбор"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "выбрать �лемент по номеру"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(пу�то) ничего не выбирать"
+
+#: add-interactive.c:1091 builtin/clean.c:816 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Команды ***"
+
+#: add-interactive.c:1092 builtin/clean.c:817 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Что теперь"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "в индек�е"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "не в индек�е"
+
+#: 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: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
+#: git-add--interactive.perl:213
+msgid "path"
+msgstr "путь"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "не удало�ь обновить индек�"
+
+#: add-interactive.c:1165 builtin/clean.c:781 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "До �видани�.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Проиндек�ировать �тот блок изменений [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 "При чи�том наложении патча изменённа� ча�ть �разу будет отмечена дл� индек�ировани�."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:56 git-add--interactive.perl:1437
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Спр�тать �тот блок изменений [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 "При чи�том наложении патча изменённа� ча�ть �разу будет отмечена дл� �крыти�."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:80 git-add--interactive.perl:1443
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Убрать из индек�а �тот блок измений [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 "При чи�том наложении патча изменённа� ча�ть �разу будет отмечена дл� удалени� из индек�а."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "Применить �тот блок к индек�у [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 "При чи�том наложении патча изменённа� ча�ть �разу будет отмечена дл� применени�."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "Отменить изменени� �того блока в рабочем каталоге [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 "При чи�том наложении патча изменённа� ча�ть �разу будет отмечена дл� отмены."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+
+#: add-patch.c:342
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "не удало�ь разобрать заголовок блока изменений «%.*s»"
+
+#: add-patch.c:361 add-patch.c:365
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "не удало�ь разобрать цветной заголовок блока изменений «%.*s»"
+
+#: add-patch.c:419
+msgid "could not parse diff"
+msgstr "не удало�ь разобрать �пи�ок изменений (diff)"
+
+#: add-patch.c:438
+msgid "could not parse colored diff"
+msgstr "не удало�ь разобрать цветной �пи�ок изменений (diff)"
+
+#: add-patch.c:452
+#, c-format
+msgid "failed to run '%s'"
+msgstr ""
+
+#: add-patch.c:611
+msgid "mismatched output from interactive.diffFilter"
+msgstr ""
+
+#: add-patch.c:612
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+
+#: add-patch.c:790
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr "на %d �троке ожидала�ь информаци� о контек�те\n%.*s"
+
+#: add-patch.c:805
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr "блоки изменений не пере�екают��:\n%.*s\n\tне заканчивает�� на:\n%.*s"
+
+#: add-patch.c:1081 git-add--interactive.perl:1115
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Ручной режим редактировани� блока изменений — �мотрите ниже дл� небольшого руковод�тва.\n"
+
+#: add-patch.c:1085
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr "---\nЧтобы убрать «%c»-�троки, �делайте их ' '-�троками (контек�тными).\nЧтобы убрать «%c»-�троки, удалите их.\nСтроки, начинающие�� � %cбудут удалены.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: add-patch.c:1099 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
+msgid "could not parse hunk header"
+msgstr ""
+
+#: add-patch.c:1177
+msgid "'git apply --cached' failed"
+msgstr ""
+
+#. 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.
+#. 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
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?"
+" "
+msgstr "Изменённый вами блок не примен�ет��. Редактировать �нова (ответ «y» означает «нет»!) [y/n]? "
+
+#: add-patch.c:1289
+msgid "The selected hunks do not apply to the index!"
+msgstr ""
+
+#: add-patch.c:1290 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "В�е равно применить их к рабочему каталогу? "
+
+#: add-patch.c:1297 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "�ичего не применено.\n"
+
+#: add-patch.c:1354
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+
+#: add-patch.c:1516 add-patch.c:1526
+msgid "No previous hunk"
+msgstr ""
+
+#: add-patch.c:1521 add-patch.c:1531
+msgid "No next hunk"
+msgstr ""
+
+#: add-patch.c:1537
+msgid "No other hunks to goto"
+msgstr ""
+
+#: add-patch.c:1548 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? "
+
+#: add-patch.c:1549 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "на какой блок перейти? "
+
+#: add-patch.c:1560
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr ""
+
+#: add-patch.c:1565
+#, c-format
+msgid "Sorry, only %d hunk available."
+msgid_plural "Sorry, only %d hunks available."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: add-patch.c:1574
+msgid "No other hunks to search"
+msgstr ""
+
+#: add-patch.c:1580 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "и�кать � помощью регул�рного выражени�? "
+
+#: add-patch.c:1595
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr ""
+
+#: add-patch.c:1612
+msgid "No hunk matches the given pattern"
+msgstr ""
+
+#: add-patch.c:1619
+msgid "Sorry, cannot split this hunk"
+msgstr ""
+
+#: add-patch.c:1623
+#, c-format
+msgid "Split into %d hunks."
+msgstr ""
+
+#: add-patch.c:1627
+msgid "Sorry, cannot edit this hunk"
+msgstr ""
+
+#: add-patch.c:1679
+msgid "'git apply' failed"
+msgstr ""
+
+#: advice.c:143
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+
+#: advice.c:159
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sпод�казка: %.*s%s\n"
 
-#: advice.c:156
+#: advice.c:250
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "�евозможно выполнить копирование коммита в текущую ветку, так как у ва� имеют�� не �литые файлы."
 
-#: advice.c:158
+#: advice.c:252
 msgid "Committing is not possible because you have unmerged files."
 msgstr "�евозможно закоммитить, так как у ва� имеют�� не �литые файлы."
 
-#: advice.c:160
+#: advice.c:254
 msgid "Merging is not possible because you have unmerged files."
 msgstr "�евозможно выполнить �ли�ние, так как у ва� имеют�� не �литые файлы."
 
-#: advice.c:162
+#: advice.c:256
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "�евозможно выполнить получение, так как у ва� имеют�� не �литые файлы."
 
-#: advice.c:164
+#: advice.c:258
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "�евозможно обратить изменени�, так как у ва� имеют�� не �литые файлы."
 
-#: advice.c:166
+#: advice.c:260
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "�евозможно выполнить %s, так как у ва� имеют�� не �литые файлы."
 
-#: advice.c:174
+#: advice.c:268
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
 msgstr "И�правьте их в рабочем каталоге, затем запу�тите «git add/rm <файл>»,\nчтобы пометить и�правление и �делайте коммит."
 
-#: advice.c:182
+#: advice.c:276
 msgid "Exiting because of an unresolved conflict."
 msgstr "Выход из-за неразрешенного конфликта."
 
-#: advice.c:187 builtin/merge.c:1320
+#: advice.c:281 builtin/merge.c:1369
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Вы не завершили �ли�ние (при�ут�твует файл MERGE_HEAD)."
 
-#: advice.c:189
+#: advice.c:283
 msgid "Please, commit your changes before merging."
 msgstr "Перед �ли�нием, выполните коммит ваших изменений."
 
-#: advice.c:190
+#: advice.c:284
 msgid "Exiting because of unfinished merge."
 msgstr "Выход из-за незавершенного �ли�ни�."
 
-#: advice.c:196
+#: advice.c:290
 #, c-format
 msgid ""
-"Note: checking out '%s'.\n"
+"Note: switching to '%s'.\n"
 "\n"
 "You are in 'detached HEAD' state. You can look around, make experimental\n"
 "changes and commit them, and you can discard any commits you make in this\n"
-"state without impacting any branches by performing another checkout.\n"
+"state without impacting any branches by switching back to a branch.\n"
 "\n"
 "If you want to create a new branch to retain commits you create, you may\n"
-"do so (now or later) by using -b with the checkout command again. Example:\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+"  git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
 "\n"
-"  git checkout -b <new-branch-name>\n"
+"  git switch -\n"
 "\n"
-msgstr "Примечание: переход на «%s».\n\nВы �ейча� в �о�то�нии «отделённого HEAD». Вы можете о�мотреть��, �делать\n�к�периментальные изменени� и закоммитить их, также вы можете отменить\nизменени� любых коммитов в �том �о�то�нии не затрагива� любые ветки и\nне переход� на них.\n\nЕ�ли вы хотите �оздать новую ветку и �охранить �вои коммиты, то вы\nможете �делать �то (�ейча� или позже) вызвав команду checkout �нова,\nно � параметром -b. �апример:\n\n  git checkout -b <им�-новой-ветки>\n\n"
+"Turn off this advice by setting config variable advice.detachedHead to false\n"
+"\n"
+msgstr ""
 
 #: alias.c:50
 msgid "cmdline ends with \\"
@@ -97,92 +763,82 @@ msgstr "команднаÑ� Ñ�трока заканчиваетÑ�Ñ� Ñ�имволÐ
 msgid "unclosed quote"
 msgstr "пропущена закрывающа� кавычка"
 
-#: apply.c:63
+#: apply.c:69
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "неопознанна� опци� дл� пробелов «%s»"
 
-#: apply.c:79
+#: apply.c:85
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "неопознанна� опци� дл� игнорировани� пробелов «%s»"
 
-#: apply.c:129
+#: apply.c:135
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject и --3way нельз� и�пользовать одновременно."
 
-#: apply.c:131
+#: apply.c:137
 msgid "--cached and --3way cannot be used together."
 msgstr "--cached и --3way нельз� и�пользовать одновременно."
 
-#: apply.c:134
+#: apply.c:140
 msgid "--3way outside a repository"
 msgstr "--3way вне репозитори�"
 
-#: apply.c:145
+#: apply.c:151
 msgid "--index outside a repository"
 msgstr "--index вне репозитори�"
 
-#: apply.c:148
+#: apply.c:154
 msgid "--cached outside a repository"
 msgstr "--cached вне репозитори�"
 
-#: apply.c:829
+#: apply.c:801
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "�е удало�ь подготовить регул�рное выражение дл� метки времени %s"
 
-#: apply.c:838
+#: apply.c:810
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec возвратил %d дл� ввода: %s"
 
-#: apply.c:912
+#: apply.c:884
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "не удало�ь найти им� файла в �троке патча %d"
 
-#: apply.c:950
+#: apply.c:922
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
 msgstr "git apply: плохой git-diff — ожидало�ь /dev/null, получено %s на �троке %d"
 
-#: apply.c:956
+#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: плохой git-diff — не �огла�ующее�� новое им� файла на �троке %d"
 
-#: apply.c:957
+#: apply.c:929
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: плохой git-diff — не �огла�ующее�� �тарое им� файла на �троке %d"
 
-#: apply.c:962
+#: apply.c:934
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: плохой git-diff  — ожидало�ь /dev/null на �троке %d"
 
-#: apply.c:991
+#: apply.c:963
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "недопу�тимый режим %d: %s"
 
-#: apply.c:1310
+#: apply.c:1282
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "противоречивые �троки заголовка %d и %d"
 
-#: apply.c:1482
-#, c-format
-msgid "recount: unexpected line: %.*s"
-msgstr "recount: не ожидаема� �трока: %.*s"
-
-#: apply.c:1551
-#, c-format
-msgid "patch fragment without header at line %d: %.*s"
-msgstr "фрагмент изменений без заголовка на �троке %d: %.*s"
-
-#: apply.c:1571
+#: apply.c:1372
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname"
@@ -195,70 +851,80 @@ msgstr[1] "заголовок git diff не нашел информацию об
 msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (�трока %d)"
 msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (�трока %d)"
 
-#: apply.c:1584
+#: apply.c:1385
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "заголовок git diff не �одержит информации об имени файла (�трока %d)"
 
-#: apply.c:1772
+#: apply.c:1481
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: не ожидаема� �трока: %.*s"
+
+#: apply.c:1550
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "фрагмент изменений без заголовка на �троке %d: %.*s"
+
+#: apply.c:1753
 msgid "new file depends on old contents"
 msgstr "новый файл зави�ит от �тарого �одержимого"
 
-#: apply.c:1774
+#: apply.c:1755
 msgid "deleted file still has contents"
 msgstr "удаленный файл в�е еще имеет �одержимое"
 
-#: apply.c:1808
+#: apply.c:1789
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "патч поврежден на �троке %d"
 
-#: apply.c:1845
+#: apply.c:1826
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "новый файл %s зави�ит от �тарого �одержимого"
 
-#: apply.c:1847
+#: apply.c:1828
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "удаленный файл %s в�е еще имеет �одержимое"
 
-#: apply.c:1850
+#: apply.c:1831
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** предупреждение: файл %s �тановит�� пу�тым, но не удал�ет��"
 
-#: apply.c:1997
+#: apply.c:1978
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "поврежденный двоичный патч на �троке %d: %.*s"
 
-#: apply.c:2034
+#: apply.c:2015
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "неопознанный двоичный патч на �троке %d"
 
-#: apply.c:2196
+#: apply.c:2177
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "патч � му�ором на �троке %d"
 
-#: apply.c:2282
+#: apply.c:2263
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "не удало�ь прочитать �имвольную ��ылку %s"
 
-#: apply.c:2286
+#: apply.c:2267
 #, c-format
 msgid "unable to open or read %s"
 msgstr "не удало�ь открыть или проче�ть %s"
 
-#: apply.c:2945
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "неправильное начало �троки: «%c»"
 
-#: apply.c:3066
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -267,258 +933,253 @@ msgstr[1] "Ча�ть #%d у�пешно применена на %d (�о �дв
 msgstr[2] "Ча�ть #%d у�пешно применена на %d (�о �двигом в %d �трок)."
 msgstr[3] "Ча�ть #%d у�пешно применена на %d (�о �двигом в %d �трок)."
 
-#: apply.c:3078
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "Контек�т �ужен до (%ld/%ld), чтобы применить фрагмент на %d �троке"
 
-#: apply.c:3084
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
 "%.*s"
 msgstr "при пои�ке:\n%.*s"
 
-#: apply.c:3106
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "пропущены данные двоичного патча дл� «%s»"
 
-#: apply.c:3114
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "невозможно выполнить reverse-apply дл� двоичного патча, без обращени� изменений блока «%s»"
 
-#: apply.c:3161
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "невозможно применить двоичный патч «%s» без �троки � указанной полной вер�ией индек�а"
 
-#: apply.c:3171
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "патч примен�т�� к файлу «%s» (%s), но его текущее �одержимое не �оотве�твует ожидаемому."
 
-#: apply.c:3179
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "патч примен�ет�� к пу�тому файлу «%s», но файл не пу�той"
 
-#: apply.c:3197
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "не удало�ь прочитать необходимую по�ылку %s дл� «%s»"
 
-#: apply.c:3210
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "не удало�ь применить двоичный патч к «%s»"
 
-#: apply.c:3216
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "по�ле применени� двоичного патча дл� «%s» был получен неправильный результат (ожидало�ь %s, получено %s)"
 
-#: apply.c:3237
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "ошибка применени� изменений: %s:%ld"
 
-#: apply.c:3360
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "не удало�ь переключить �о�то�ние на %s"
 
-#: apply.c:3412 apply.c:3423 apply.c:3469 midx.c:59 setup.c:279
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:73 setup.c:308
 #, c-format
 msgid "failed to read %s"
 msgstr "не удало�ь прочитать %s"
 
-#: apply.c:3420
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "чтение из «%s» за �имволиче�кой ��ылкой"
 
-#: apply.c:3449 apply.c:3692
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "путь %s был переименован/удален"
 
-#: apply.c:3535 apply.c:3707
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: нет в индек�е"
 
-#: apply.c:3544 apply.c:3715
+#: apply.c:3537 apply.c:3708 apply.c:3952
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: не �овпадает � индек�ом"
 
-#: apply.c:3579
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr "в репозитории от�ут�твует необходимый двоичный объект дл� отката к трёхходовому �ли�нию."
 
-#: apply.c:3582
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "Откат к трёхходовому �ли�нию…\n"
 
-#: apply.c:3598 apply.c:3602
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "не удало�ь прочитать текущее �одержимое «%s»"
 
-#: apply.c:3614
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "�е удало�ь откатить�� к трёхходовому �ли�нию…\n"
 
-#: apply.c:3628
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Патч применен к «%s» � конфликтами.\n"
 
-#: apply.c:3633
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Патч применен к «%s» без ошибок.\n"
 
-#: apply.c:3659
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr "патч удалени� не удалил �одержимое файла"
 
-#: apply.c:3732
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: неправильный тип"
 
-#: apply.c:3734
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s имеет тип %o, а ожидал�� %o"
 
-#: apply.c:3885 apply.c:3887 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3892 apply.c:3894 read-cache.c:832 read-cache.c:858
+#: read-cache.c:1313
 #, c-format
 msgid "invalid path '%s'"
 msgstr "неправильный путь «%s»"
 
-#: apply.c:3943
+#: apply.c:3950
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: уже �одержит�� в индек�е"
 
-#: apply.c:3946
+#: apply.c:3954
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: уже �одержит�� в рабочем каталоге"
 
-#: apply.c:3966
+#: apply.c:3974
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "новый режим до�тупа (%o) дл� %s не �оответ�твует �тарому режиму до�тупа (%o)"
 
-#: apply.c:3971
+#: apply.c:3979
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "новый режим до�тупа (%o) дл� %s не �оответ�твует �тарому режиму до�тупа (%o) дл� %s"
 
-#: apply.c:3991
+#: apply.c:3999
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "затронутый файл «%s» находит�� за �имволиче�кой ��ылкой"
 
-#: apply.c:3995
+#: apply.c:4003
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: не удало�ь применить патч"
 
-#: apply.c:4010
+#: apply.c:4018
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Проверка патча %s…"
 
-#: apply.c:4102
+#: apply.c:4110
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "информаци� об sha1 от�ут�твует или бе�полезна дл� подмодул� %s"
 
-#: apply.c:4109
+#: apply.c:4117
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "изменен режим дл� %s, который не находит�� в текущем HEAD"
 
-#: apply.c:4112
+#: apply.c:4120
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "информаци� об sha1 от�ут�твует или бе�полезна (%s)."
 
-#: apply.c:4117 builtin/checkout.c:257 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "�бой make_cache_entry дл� пути «%s»"
-
-#: apply.c:4121
+#: apply.c:4129
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "не удало�ь добавить %s во временный индек�"
 
-#: apply.c:4131
+#: apply.c:4139
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "не удало�ь запи�ать временный индкек� в %s"
 
-#: apply.c:4269
+#: apply.c:4277
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "не удало�ь удалить %s из индек�а"
 
-#: apply.c:4303
+#: apply.c:4311
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "поврежденный патч дл� подмодул� %s"
 
-#: apply.c:4309
+#: apply.c:4317
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "не удало�ь выполнить stat дл� �озданного файла «%s»"
 
-#: apply.c:4317
+#: apply.c:4325
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "не удало�ь �оздать в�помогательный файл дл� �озданного файла %s"
 
-#: apply.c:4323 apply.c:4468
+#: apply.c:4331 apply.c:4476
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "не удало�ь �оздать запи�ь в к�ше дл� %s"
 
-#: apply.c:4366
+#: apply.c:4374 builtin/bisect--helper.c:524
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "не удало�ь запи�ать в «%s»"
 
-#: apply.c:4370
+#: apply.c:4378
 #, c-format
 msgid "closing file '%s'"
 msgstr "закрытие файла «%s»"
 
-#: apply.c:4440
+#: apply.c:4448
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "не удало�ь запи�ать файл «%s» � режимом до�тупа %o"
 
-#: apply.c:4538
+#: apply.c:4546
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Патч %s применен без ошибок."
 
-#: apply.c:4546
+#: apply.c:4554
 msgid "internal error"
 msgstr "внутренн�� ошибка"
 
-#: apply.c:4549
+#: apply.c:4557
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
@@ -527,45 +1188,45 @@ msgstr[1] "Применение патча %%s � %d отказами…"
 msgstr[2] "Применение патча %%s � %d отказами…"
 msgstr[3] "Применение патча %%s � %d отказами…"
 
-#: apply.c:4560
+#: apply.c:4568
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "у�ечение имени .rej файла до %.*s.rej"
 
-#: apply.c:4568 builtin/fetch.c:837 builtin/fetch.c:1118
+#: apply.c:4576 builtin/fetch.c:927 builtin/fetch.c:1228
 #, c-format
 msgid "cannot open %s"
 msgstr "не удало�ь открыть %s"
 
-#: apply.c:4582
+#: apply.c:4590
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Блок №%d применен без ошибок."
 
-#: apply.c:4586
+#: apply.c:4594
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Блок №%d отклонен."
 
-#: apply.c:4696
+#: apply.c:4718
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Патч «%s» пропущен."
 
-#: apply.c:4704
+#: apply.c:4726
 msgid "unrecognized input"
 msgstr "не ра�познанный ввод"
 
-#: apply.c:4724
+#: apply.c:4746
 msgid "unable to read index file"
 msgstr "не удало�ь прочитать файл индек�а"
 
-#: apply.c:4879
+#: apply.c:4903
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "не удало�ь открыть патч «%s»: %s"
 
-#: apply.c:4906
+#: apply.c:4930
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
@@ -574,7 +1235,7 @@ msgstr[1] "пропущено %d ошибки в пробельных �имво
 msgstr[2] "пропущено %d ошибок в пробельных �имволах"
 msgstr[3] "пропущено %d ошибок в пробельных �имволах"
 
-#: apply.c:4912 apply.c:4927
+#: apply.c:4936 apply.c:4951
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
@@ -583,7 +1244,7 @@ msgstr[1] "%d �троки добавили ошибки в пробельных
 msgstr[2] "%d �трок добавили ошибки в пробельных �имволах."
 msgstr[3] "%d �трок добавили ошибки в пробельных �имволах."
 
-#: apply.c:4920
+#: apply.c:4944
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
@@ -592,143 +1253,178 @@ msgstr[1] "%d �троки добавлено по�ле и�правлени�
 msgstr[2] "%d �трок добавлено по�ле и�правлени� ошибок в пробелах."
 msgstr[3] "%d �троки добавлено по�ле и�правлени� ошибок в пробелах."
 
-#: apply.c:4936 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4960 builtin/add.c:618 builtin/mv.c:304 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "�е удало�ь запи�ать новый файл индек�а"
 
-#: apply.c:4963 apply.c:4966 builtin/am.c:2210 builtin/am.c:2213
-#: builtin/clone.c:120 builtin/fetch.c:118 builtin/merge.c:271
-#: builtin/pull.c:207 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1366 builtin/submodule--helper.c:1369
-#: builtin/submodule--helper.c:1849 builtin/submodule--helper.c:1852
-#: builtin/submodule--helper.c:2091 git-add--interactive.perl:197
-msgid "path"
-msgstr "путь"
-
-#: apply.c:4964
+#: apply.c:4988
 msgid "don't apply changes matching the given path"
 msgstr "не примен�ть изменени� по указанному пути"
 
-#: apply.c:4967
+#: apply.c:4991
 msgid "apply changes matching the given path"
 msgstr "примен�ть изменени� по указанному пути"
 
-#: apply.c:4969 builtin/am.c:2219
+#: apply.c:4993 builtin/am.c:2266
 msgid "num"
 msgstr "количе�тво"
 
-#: apply.c:4970
+#: apply.c:4994
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "удалить <количе�тво> ведущих ко�ых черт из традиционных путей �пи�ка изменений"
 
-#: apply.c:4973
+#: apply.c:4997
 msgid "ignore additions made by the patch"
 msgstr "игнорировать добавлени�, �деланные �тим патчем"
 
-#: apply.c:4975
+#: apply.c:4999
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "вме�то применени� патча выве�ти �тати�тику добавлений и удалений дл� ввода"
 
-#: apply.c:4979
+#: apply.c:5003
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "показать количе�тво добавленных и удаленных �трок в де��тичном пред�тавлении"
 
-#: apply.c:4981
+#: apply.c:5005
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "вме�то применени� патча выве�ти �водку изменений дл� ввода"
 
-#: apply.c:4983
+#: apply.c:5007
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "вме�то применени� патча проверить подходит ли он"
 
-#: apply.c:4985
+#: apply.c:5009
 msgid "make sure the patch is applicable to the current index"
 msgstr "проверить, что патч примен�ет�� к текущему индек�у"
 
-#: apply.c:4987
+#: apply.c:5011
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "помечать новые файлы � «git add --intent-to-add»"
 
-#: apply.c:4989
+#: apply.c:5013
 msgid "apply a patch without touching the working tree"
 msgstr "применить патч, не измен�� рабочий каталог"
 
-#: apply.c:4991
+#: apply.c:5015
 msgid "accept a patch that touches outside the working area"
 msgstr "прин�ть патч, который затрагивает файлы за рабочим каталогом"
 
-#: apply.c:4994
+#: apply.c:5018
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "а также применить патч (и�пользуйте � --stat/--summary/--check)"
 
-#: apply.c:4996
+#: apply.c:5020
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "попытать�� �делать трехходовое �ли�ние, е�ли патч не примен�ет��"
 
-#: apply.c:4998
+#: apply.c:5022
 msgid "build a temporary index based on embedded index information"
 msgstr "по�троить временный индек�, о�нованный на в�троенной информации об индек�е"
 
-#: apply.c:5001 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5025 builtin/checkout-index.c:182 builtin/ls-files.c:525
 msgid "paths are separated with NUL character"
 msgstr "пути, отделённые �УЛЕВЫМ �имволом"
 
-#: apply.c:5003
+#: apply.c:5027
 msgid "ensure at least <n> lines of context match"
 msgstr "удо�товерить��, что по крайней мере <n> �трок контек�та �овпадают"
 
-#: apply.c:5004 builtin/am.c:2198 builtin/interpret-trailers.c:97
-#: builtin/interpret-trailers.c:99 builtin/interpret-trailers.c:101
-#: builtin/pack-objects.c:3317 builtin/rebase.c:1415
+#: 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:3562 builtin/rebase.c:1346
 msgid "action"
 msgstr "дей�твие"
 
-#: apply.c:5005
+#: apply.c:5029
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "определ�ть новые или модифицированные �троки, у которых е�ть ошибки в пробельных �имволах"
 
-#: apply.c:5008 apply.c:5011
+#: apply.c:5032 apply.c:5035
 msgid "ignore changes in whitespace when finding context"
 msgstr "игнорировать изменени� в пробельных �имволах при пои�ке контек�та"
 
-#: apply.c:5014
+#: apply.c:5038
 msgid "apply the patch in reverse"
 msgstr "применить патч � обращением изменений"
 
-#: apply.c:5016
+#: apply.c:5040
 msgid "don't expect at least one line of context"
 msgstr "не ожидать как минимум одной �троки контек�та"
 
-#: apply.c:5018
+#: apply.c:5042
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "о�тавить отклоненные блоки изменений в �оответ�твующих *.rej файлах"
 
-#: apply.c:5020
+#: apply.c:5044
 msgid "allow overlapping hunks"
 msgstr "разрешить перекрывающие�� блоки изменений"
 
-#: apply.c:5021 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1317 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2045 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5045 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
 msgid "be verbose"
 msgstr "быть много�ловнее"
 
-#: apply.c:5023
+#: apply.c:5047
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "разрешить некорректно определенные пропущенные пу�тые �троки в конце файла"
 
-#: apply.c:5026
+#: apply.c:5050
 msgid "do not trust the line counts in the hunk headers"
 msgstr "не довер�ть количе�тву �трок из заголовка блока изменений"
 
-#: apply.c:5028 builtin/am.c:2207
+#: apply.c:5052 builtin/am.c:2254
 msgid "root"
 msgstr "корень"
 
-#: apply.c:5029
+#: apply.c:5053
 msgid "prepend <root> to all filenames"
 msgstr "добавить <корень> �переди ко в�ем именам файлов"
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "не удало�ь �оздать поток двоичного объекта %s"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "неподдерживаемый режим до�тупа к файлу: 0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "не удало�ь запу�тить фильтр «%s»"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "не удало�ь перенаправить де�криптор"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "фильтр «%s» �ообщил об ошибке"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "путь не �вл�ет�� дей�твительным UTF-8: %s"
+
+#: archive-zip.c:322
+#, c-format
+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
+#, c-format
+msgid "deflate error (%d)"
+msgstr "ошибка �жати� (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "отметка времени �лишком больша� дл� �той �и�темы: %<PRIuMAX>"
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<опции>] <указатель-дерева> [<путь>…]"
@@ -747,224 +1443,198 @@ msgstr "git archive --remote <репозиторий> [--exec <команда>]
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <репозиторий> [--exec <команда>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:192
+#, c-format
+msgid "cannot read %s"
+msgstr "не удало�ь прочитать %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
+#, c-format
+msgid "could not read '%s'"
+msgstr "не удало�ь прочитать «%s»"
+
+#: archive.c:430 builtin/add.c:181 builtin/add.c:594 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "�пецификатор пути «%s» не �оответ�твует ни одному файлу"
 
-#: archive.c:396
+#: archive.c:454
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "нет такой ��ылки: %.*s"
 
-#: archive.c:401
+#: archive.c:460
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "недопу�тимое им� объекта: %s"
 
-#: archive.c:414
+#: archive.c:473
 #, c-format
 msgid "not a tree object: %s"
 msgstr "недей�твительный объект дерева: %s"
 
-#: archive.c:424
+#: archive.c:485
 msgid "current working directory is untracked"
 msgstr "текущий рабочий каталог не от�леживает��"
 
-#: archive.c:455
+#: archive.c:526
+#, c-format
+msgid "File not found: %s"
+msgstr ""
+
+#: archive.c:528
+#, c-format
+msgid "Not a regular file: %s"
+msgstr ""
+
+#: archive.c:555
 msgid "fmt"
 msgstr "формат"
 
-#: archive.c:455
+#: archive.c:555
 msgid "archive format"
 msgstr "формат архива"
 
-#: archive.c:456 builtin/log.c:1557
+#: archive.c:556 builtin/log.c:1765
 msgid "prefix"
 msgstr "префик�"
 
-#: archive.c:457
+#: archive.c:557
 msgid "prepend prefix to each pathname in the archive"
 msgstr "добавл�ть префик� перед каждым путем файла в архиве"
 
-#: archive.c:458 builtin/blame.c:821 builtin/blame.c:822
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1091
-#: builtin/fast-export.c:1093 builtin/grep.c:895 builtin/hash-object.c:105
-#: builtin/ls-files.c:560 builtin/ls-files.c:563 builtin/notes.c:412
-#: builtin/notes.c:578 builtin/read-tree.c:123 parse-options.h:177
+#: 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:1207 builtin/fast-export.c:1209
+#: builtin/fast-export.c:1213 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
 msgid "file"
 msgstr "файл"
 
-#: archive.c:459 builtin/archive.c:90
+#: archive.c:559
+msgid "add untracked file to archive"
+msgstr ""
+
+#: archive.c:562 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr "запи�ь архива в �тот файл"
 
-#: archive.c:461
+#: archive.c:564
 msgid "read .gitattributes in working directory"
 msgstr "читать .gitattributes в рабочем каталоге"
 
-#: archive.c:462
+#: archive.c:565
 msgid "report archived files on stderr"
 msgstr "отчет об архивированных файлах в stderr"
 
-#: archive.c:463
-msgid "store only"
-msgstr "только хранение"
-
-#: archive.c:464
-msgid "compress faster"
-msgstr "�жимать бы�трее"
-
-#: archive.c:472
-msgid "compress better"
-msgstr "�жимать лучше"
+#: archive.c:567
+msgid "set compression level"
+msgstr ""
 
-#: archive.c:475
+#: archive.c:570
 msgid "list supported archive formats"
 msgstr "перечи�лить поддерживаемые форматы архивов"
 
-#: archive.c:477 builtin/archive.c:91 builtin/clone.c:110 builtin/clone.c:113
-#: builtin/submodule--helper.c:1378 builtin/submodule--helper.c:1858
+#: 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
 msgid "repo"
 msgstr "репозиторий"
 
-#: archive.c:478 builtin/archive.c:92
+#: archive.c:573 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "получить архив из внешнего <репозитори�>"
 
-#: archive.c:479 builtin/archive.c:93 builtin/difftool.c:707
+#: archive.c:574 builtin/archive.c:93 builtin/difftool.c:714
 #: builtin/notes.c:498
 msgid "command"
 msgstr "команда"
 
-#: archive.c:480 builtin/archive.c:94
+#: archive.c:575 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "путь к команде git-upload-archive на машине � внешним репозиторием"
 
-#: archive.c:487
+#: archive.c:582
 msgid "Unexpected option --remote"
 msgstr "�еожиданна� опци� --remote"
 
-#: archive.c:489
+#: archive.c:584
 msgid "Option --exec can only be used together with --remote"
 msgstr "Опци� --exec может и�пользовать�� только вме�те � --remote"
 
-#: archive.c:491
+#: archive.c:586
 msgid "Unexpected option --output"
 msgstr "�еожиданна� опци� --output"
 
-#: archive.c:513
+#: archive.c:588
+msgid "Options --add-file and --remote cannot be used together"
+msgstr ""
+
+#: archive.c:610
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "�еизве�тный формат архива «%s»"
 
-#: archive.c:520
+#: archive.c:619
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "�ргумент не поддерживает�� дл� формата «%s»: -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "не удало�ь �оздать поток двоичного объекта %s"
-
-#: archive-tar.c:260 archive-zip.c:363
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "неподдерживаемый режим до�тупа к файлу: 0%o (SHA1: %s)"
-
-#: archive-tar.c:287 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr "не удало�ь прочитать %s"
-
-#: archive-tar.c:459
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "не удало�ь запу�тить фильтр «%s»"
-
-#: archive-tar.c:462
-msgid "unable to redirect descriptor"
-msgstr "не удало�ь перенаправить де�криптор"
-
-#: archive-tar.c:469
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "фильтр «%s» �ообщил об ошибке"
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "путь не �вл�ет�� дей�твительным UTF-8: %s"
-
-#: archive-zip.c:318
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "путь �лишком длинный (%d �имволов, SHA1: %s): %s"
-
-#: archive-zip.c:474 builtin/pack-objects.c:226 builtin/pack-objects.c:229
-#, c-format
-msgid "deflate error (%d)"
-msgstr "ошибка �жати� (%d)"
-
-#: archive-zip.c:609
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "отметка времени �лишком больша� дл� �той �и�темы: %<PRIuMAX>"
-
-#: attr.c:211
+#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s не �вл�ет�� допу�тимым именем атрибута"
 
-#: attr.c:368
+#: attr.c:359
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s не разрешено: %s:%d"
 
-#: attr.c:408
+#: attr.c:399
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
 msgstr "Отрицающие шаблоны в атрибутах git игнорируют��.\nИ�пользуйте «\\!» дл� буквального и�пользовани� �имвола в значении «во�клицательный знак»."
 
-#: bisect.c:468
+#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Плохое �одержимое файла «%s»: %s"
 
-#: bisect.c:678
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "�евозможно продолжить бинарный пои�к!\n"
 
-#: bisect.c:733
+#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "�едопу�тимое им� коммита %s"
 
-#: bisect.c:758
+#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
 "This means the bug has been fixed between %s and [%s].\n"
 msgstr "База �ли�ни� %s �вл�ет�� плохим коммитом.\nЭто значит, что ошибка была и�правлена где-то между %s и [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
 "The property has changed between %s and [%s].\n"
 msgstr "База �ли�ни� %s �вл�ет�� новой.\nСвой�тво было изменено где-то между %s и [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:801
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
 "This means the first '%s' commit is between %s and [%s].\n"
 msgstr "База �ли�ни� %s �вл�ет�� %s.\nЭто значит, что «%s» коммит находит�� где-то между %s и [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -972,7 +1642,7 @@ msgid ""
 "Maybe you mistook %s and %s revs?\n"
 msgstr "�е�колько %s коммитов не �вл�ют�� предками %s коммита.\nВ �том �лучае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s ме�тами?\n"
 
-#: bisect.c:789
+#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -980,43 +1650,43 @@ msgid ""
 "We continue anyway."
 msgstr "База �ли�ни� между %s и [%s] должно быть пропущена.\nПо�тому мы не можем быть уверены, что первый %s коммит находит�� между %s и %s.\n�о в�е же продолжаем пои�к."
 
-#: bisect.c:822
+#: bisect.c:861
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Бинарный пои�к: база �ли�ни� должна быть проверена\n"
 
-#: bisect.c:865
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr "нужно указать %s редакцию"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:248
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:255
 #, c-format
 msgid "could not create file '%s'"
 msgstr "не удало�ь �оздать файл «%s»"
 
-#: bisect.c:928 builtin/merge.c:146
+#: bisect.c:987 builtin/merge.c:152
 #, c-format
 msgid "could not read file '%s'"
 msgstr "не удало�ь прочитать файл «%s»"
 
-#: bisect.c:958
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "�бой при чтении ��ылок двоичного пои�ка"
 
-#: bisect.c:977
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s была одновременно и %s и %s\n"
 
-#: bisect.c:985
+#: bisect.c:1066
 #, c-format
 msgid ""
 "No testable commit found.\n"
 "Maybe you started with bad path parameters?\n"
 msgstr "Те�тируемый коммит не найден.\nВозможно, вы начали пои�к � указанием неправильного параметра пути?\n"
 
-#: bisect.c:1004
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1027,7 +1697,7 @@ msgstr[3] "(примерно %d шагов)"
 
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
-#: bisect.c:1010
+#: bisect.c:1101
 #, 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"
@@ -1036,37 +1706,37 @@ msgstr[1] "Бинарный поиÑ�к: %d редакции оÑ�талоÑ�ÑŒ пÑ
 msgstr[2] "Бинарный пои�к: %d редакций о�тало�ь проверить по�ле �той %s\n"
 msgstr[3] "Бинарный пои�к: %d редакций о�тало�ь проверить по�ле �той %s\n"
 
-#: blame.c:1794
+#: blame.c:2777
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents и --reverse не очень �очетают��."
 
-#: blame.c:1808
+#: blame.c:2791
 msgid "cannot use --contents with final commit object name"
 msgstr "нельз� и�пользовать --contents � указанием финального имени объекта"
 
-#: blame.c:1829
+#: blame.c:2812
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "при --reverse и --first-parent вме�те нужно указывать конкретный по�ледний коммит"
 
-#: blame.c:1838 bundle.c:164 ref-filter.c:2077 remote.c:1938 sequencer.c:2030
-#: sequencer.c:4224 builtin/commit.c:1017 builtin/log.c:382 builtin/log.c:940
-#: builtin/log.c:1428 builtin/log.c:1804 builtin/log.c:2094
-#: builtin/merge.c:415 builtin/pack-objects.c:3140 builtin/pack-objects.c:3155
-#: builtin/shortlog.c:192
+#: 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
 msgid "revision walk setup failed"
 msgstr "�бой инициализации прохода по редакци�м"
 
-#: blame.c:1856
+#: blame.c:2839
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr "при указании --reverse и --first-parent вме�те, требует�� также указать диапазон по цепочке первого родител�"
 
-#: blame.c:1867
+#: blame.c:2850
 #, c-format
 msgid "no such path %s in %s"
 msgstr "нет такого пути %s в %s"
 
-#: blame.c:1878
+#: blame.c:2861
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "невозможно прочитать объект %s дл� пути %s"
@@ -1186,37 +1856,51 @@ msgstr "�еоднозначное им� объекта: «%s»."
 msgid "Not a valid branch point: '%s'."
 msgstr "�едопу�тима� точка ветки: «%s»."
 
-#: branch.c:359
+#: branch.c:365
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "«%s» уже находит�� на «%s»"
 
-#: branch.c:382
+#: branch.c:388
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD рабочего каталога %s не обновлён"
 
-#: bundle.c:36
+#: bundle.c:41
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr ""
+
+#: bundle.c:45
+#, c-format
+msgid "unknown capability '%s'"
+msgstr ""
+
+#: bundle.c:71
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "«%s» не похож на файл пакета вер�ии 2"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr ""
 
-#: bundle.c:64
+#: bundle.c:110
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "неопознанный заголовок: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2281 sequencer.c:2916
-#: builtin/commit.c:788
+#: bundle.c:136 rerere.c:480 rerere.c:690 sequencer.c:2390 sequencer.c:3176
+#: builtin/commit.c:814
 #, c-format
 msgid "could not open '%s'"
 msgstr "не удало�ь открыть «%s»"
 
-#: bundle.c:143
+#: bundle.c:189
 msgid "Repository lacks these prerequisite commits:"
 msgstr "В репозитории от�ут�твуют необходимые коммиты:"
 
-#: bundle.c:194
+#: bundle.c:192
+msgid "need a repository to verify a bundle"
+msgstr ""
+
+#: bundle.c:243
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
@@ -1225,11 +1909,11 @@ msgstr[1] "Пакет �одержит �ти %d ��ылки:"
 msgstr[2] "Пакет �одержит �ти %d ��ылок:"
 msgstr[3] "Пакет �одержит �ти %d ��ылок:"
 
-#: bundle.c:201
+#: bundle.c:250
 msgid "The bundle records a complete history."
 msgstr "Пакет �одержит полную и�торию."
 
-#: bundle.c:203
+#: bundle.c:252
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
@@ -1238,160 +1922,159 @@ msgstr[1] "Пакет требует �ти %d ��ылки:"
 msgstr[2] "Пакет требует �ти %d ��ылок:"
 msgstr[3] "Пакет требует �ти %d ��ылок:"
 
-#: bundle.c:269
+#: bundle.c:319
 msgid "unable to dup bundle descriptor"
 msgstr "не удало�ь дублировать де�криптор пакета"
 
-#: bundle.c:276
+#: bundle.c:326
 msgid "Could not spawn pack-objects"
 msgstr "�е удало�ь �оздать объекты пакета"
 
-#: bundle.c:287
+#: bundle.c:337
 msgid "pack-objects died"
 msgstr "критиче�ка� ошибка pack-objects"
 
-#: bundle.c:329
+#: bundle.c:379
 msgid "rev-list died"
 msgstr "критиче�ка� ошибка rev-list"
 
-#: bundle.c:378
+#: bundle.c:428
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "��ылка «%s» и�ключена в �оответ�твии � опци�ми rev-list"
 
-#: bundle.c:457 builtin/log.c:197 builtin/log.c:1709 builtin/shortlog.c:306
+#: bundle.c:498
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr ""
+
+#: bundle.c:500
+#, 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
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "неопознанный аргумент: %s"
 
-#: bundle.c:465
+#: bundle.c:530
 msgid "Refusing to create empty bundle."
 msgstr "Отклонение �оздани� пу�того пакета."
 
-#: bundle.c:475
+#: bundle.c:540
 #, c-format
 msgid "cannot create '%s'"
 msgstr "не удало�ь �оздать «%s»"
 
-#: bundle.c:500
+#: bundle.c:565
 msgid "index-pack died"
 msgstr "критиче�ка� ошибка index-pack"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "недопу�тимое значение цвета: %.*s"
 
-#: commit.c:50 sequencer.c:2697 builtin/am.c:355 builtin/am.c:399
-#: builtin/am.c:1377 builtin/am.c:2022 builtin/replace.c:455
-#, c-format
-msgid "could not parse %s"
-msgstr "не удало�ь разобрать %s"
-
-#: commit.c:52
-#, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s не �вл�ет�� коммитом!"
-
-#: commit.c:193
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr "Поддержка <GIT_DIR>/info/grafts у�тарела и будет удалена в �ледующих вер�и�х Git.\n\nИ�пользуйте «git replace --convert-graft-file» дл�  конвертации �ращений (grafts) на ��ылки замены.\n\nЧтобы �крыть �то �ообщение запу�тите «git config advice.graftFileDeprecated false»"
-
-#: commit.c:1128
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "Коммит %s �одержит не доверенную GPG подпи�ь, предположительно от %s."
-
-#: commit.c:1131
-#, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "Коммит %s �одержит плохую GPG подпи�ь, предположительно от %s."
-
-#: commit.c:1134
-#, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Коммит %s не �одержит GPG подпи�ь."
-
-#: commit.c:1137
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "Коммит %s �одержит дей�твительную GPG подпи�ь, от %s.\n"
-
-#: commit.c:1391
-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 "Предупреждение: �ообщение коммита не �оответ�твует UTF-8.\nВозможно, вы захотите и�править его по�ле и�правлени� �ообщени�\nили на�троить опцию i18n.commitencoding и указать кодировку\n�ообщений, которую и�пользует ваш проект.\n"
+#: commit-graph.c:188 midx.c:47
+msgid "invalid hash version"
+msgstr ""
 
-#: commit-graph.c:105
+#: commit-graph.c:246
 msgid "commit-graph file is too small"
 msgstr "файл commit-graph �лишком маленький"
 
-#: commit-graph.c:170
+#: commit-graph.c:311
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "подпи�ь commit-graph файла %X не �оотве�твует подпи�и %X"
 
-#: commit-graph.c:177
+#: commit-graph.c:318
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "вер�и� commit-graph файла %X не �оотве�твует вер�ии %X"
 
-#: commit-graph.c:184
+#: commit-graph.c:325
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
-msgstr "вер�и� хеш-�уммы commit-graph файла %X не �оответ�твует вер�ии %X"
+msgstr "вер�и� х�ш-функции commit-graph файла %X не �оответ�твует вер�ии %X"
 
-#: commit-graph.c:207
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr "не найдена таблица ра�положени� ча�тей в файле commit-graph; возможно файл повреждён"
+#: commit-graph.c:342
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr ""
 
-#: commit-graph.c:218
+#: commit-graph.c:361
 #, c-format
 msgid "commit-graph improper chunk offset %08x%08x"
 msgstr "некорректное �мещение ча�ти в commit-graph файле %08x%08x"
 
-#: commit-graph.c:255
+#: commit-graph.c:433
 #, c-format
 msgid "commit-graph chunk id %08x appears multiple times"
 msgstr "ча�ть файла commit-graph � идентификатором %08x по�вл�ет�� не�колько раз"
 
-#: commit-graph.c:390
+#: commit-graph.c:499
+msgid "commit-graph has no base graphs chunk"
+msgstr ""
+
+#: commit-graph.c:509
+msgid "commit-graph chain does not match"
+msgstr ""
+
+#: commit-graph.c:557
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr ""
+
+#: commit-graph.c:581
+msgid "unable to find all commit-graph files"
+msgstr ""
+
+#: commit-graph.c:721 commit-graph.c:785
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr ""
+
+#: commit-graph.c:742
 #, c-format
 msgid "could not find commit %s"
 msgstr "не удало�ь найти коммит %s"
 
-#: commit-graph.c:732 builtin/pack-objects.c:2649
+#: commit-graph.c:1036 builtin/am.c:1292
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "не удало�ь разобрать коммит %s"
+
+#: commit-graph.c:1252 builtin/pack-objects.c:2864
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "не удало�ь получить тип объекта %s"
 
-#: commit-graph.c:765
+#: commit-graph.c:1283
 msgid "Loading known commits in commit graph"
 msgstr "Загрузка изве�тных коммитов на граф коммитов"
 
-#: commit-graph.c:781
+#: commit-graph.c:1300
 msgid "Expanding reachable commits in commit graph"
 msgstr "Ра�ширение до�тижимых коммитов на граф коммитов"
 
-#: commit-graph.c:793
+#: commit-graph.c:1320
 msgid "Clearing commit marks in commit graph"
 msgstr "Очи�тка пометок коммитов на графе коммитов"
 
-#: commit-graph.c:813
+#: commit-graph.c:1339
 msgid "Computing commit graph generation numbers"
 msgstr "Вычи�ление номеров поколений на графе коммитов"
 
-#: commit-graph.c:930
+#: commit-graph.c:1406
+msgid "Computing commit changed paths Bloom filters"
+msgstr ""
+
+#: commit-graph.c:1483
+msgid "Collecting referenced commits"
+msgstr ""
+
+#: commit-graph.c:1508
 #, c-format
 msgid "Finding commits for commit graph in %d pack"
 msgid_plural "Finding commits for commit graph in %d packs"
@@ -1400,52 +2083,43 @@ msgstr[1] "Пои�к коммитов дл� графа коммитов в %d
 msgstr[2] "Пои�к коммитов дл� графа коммитов в %d пакетах"
 msgstr[3] "Пои�к коммитов дл� графа коммитов в %d пакетах"
 
-#: commit-graph.c:943
+#: commit-graph.c:1521
 #, c-format
 msgid "error adding pack %s"
 msgstr "ошибка добавлени� пакета %s"
 
-#: commit-graph.c:945
+#: commit-graph.c:1525
 #, c-format
 msgid "error opening index for %s"
 msgstr "ошибка открыти� индек�а дл� %s"
 
-#: commit-graph.c:959
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Пои�к коммитов дл� графа коммитов по %d ��ылке"
-msgstr[1] "Пои�к коммитов дл� графа коммитов по %d ��ылкам"
-msgstr[2] "Пои�к коммитов дл� графа коммитов по %d ��ылкам"
-msgstr[3] "Пои�к коммитов дл� графа коммитов по %d ��ылкам"
-
-#: commit-graph.c:991
+#: commit-graph.c:1562
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Пои�к коммитов дл� графа коммитов �реди упакованных объектов"
 
-#: commit-graph.c:1004
-msgid "Counting distinct commits in commit graph"
-msgstr "Вычи�ление количе�тва отдельных коммитов на графе коммитов"
-
-#: commit-graph.c:1017
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "программе форматировани� графа коммитов не удало�ь запи�ать %d коммитов"
-
-#: commit-graph.c:1026
+#: commit-graph.c:1580
 msgid "Finding extra edges in commit graph"
 msgstr "Пои�к дополнительных ребер на графе коммитов"
 
-#: commit-graph.c:1050
-msgid "too many commits to write graph"
-msgstr "�лишком много коммитов дл� запи�и графа"
+#: commit-graph.c:1628
+msgid "failed to write correct number of base graph ids"
+msgstr ""
 
-#: commit-graph.c:1057 midx.c:819
+#: commit-graph.c:1670 midx.c:819
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "не удало�ь �оздать родитель�кие каталоги дл� %s"
 
-#: commit-graph.c:1097
+#: commit-graph.c:1683
+msgid "unable to create temporary graph layer"
+msgstr ""
+
+#: commit-graph.c:1688
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr ""
+
+#: commit-graph.c:1758
 #, c-format
 msgid "Writing out commit graph in %d pass"
 msgid_plural "Writing out commit graph in %d passes"
@@ -1454,83 +2128,161 @@ msgstr[1] "Запи�ь графа коммитов в %d прохода"
 msgstr[2] "Запи�ь графа коммитов в %d проходов"
 msgstr[3] "Запи�ь графа коммитов в %d прохода"
 
-#: commit-graph.c:1162
+#: commit-graph.c:1803
+msgid "unable to open commit-graph chain file"
+msgstr ""
+
+#: commit-graph.c:1819
+msgid "failed to rename base commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1839
+msgid "failed to rename temporary commit-graph file"
+msgstr ""
+
+#: commit-graph.c:1965
+msgid "Scanning merged commits"
+msgstr ""
+
+#: commit-graph.c:2009
+msgid "Merging commit-graph"
+msgstr ""
+
+#: commit-graph.c:2115
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr ""
+
+#: commit-graph.c:2214
+msgid "too many commits to write graph"
+msgstr "�лишком много коммитов дл� запи�и графа"
+
+#: commit-graph.c:2307
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "файл commit-graph �одержит неправильную контрольную �умму и �корее в�его поврежден"
 
-#: commit-graph.c:1172
+#: commit-graph.c:2317
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "файл commit-graph �одержит неправильный пор�док OID: %s, а затем %s"
 
-#: commit-graph.c:1182 commit-graph.c:1197
+#: commit-graph.c:2327 commit-graph.c:2342
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "файл commit-graph �одержит неправильное значение fanout: fanout[%d] = %u != %u"
 
-#: commit-graph.c:1189
+#: commit-graph.c:2334
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "не удало�ь разобрать коммит %s из файла commit-graph"
 
-#: commit-graph.c:1206
+#: commit-graph.c:2352
 msgid "Verifying commits in commit graph"
 msgstr "Проверка коммитов на графе коммитов"
 
-#: commit-graph.c:1219
+#: commit-graph.c:2367
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr "не удало�ь разобрать коммит %s из базы объектов файла commit-graph"
 
-#: commit-graph.c:1226
+#: commit-graph.c:2374
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
-msgstr " в файле commit-graph OID корн� дерева дл� коммита %s �вл�ет�� %s != %s"
+msgstr "в файле commit-graph OID корн� дерева дл� коммита %s �вл�ет�� %s != %s"
 
-#: commit-graph.c:1236
+#: commit-graph.c:2384
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "�лишком большой �пи�ок родителей файле commit-graph дл� коммита %s"
 
-#: commit-graph.c:1242
+#: commit-graph.c:2393
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "в файле commit-graph родитель дл� %s �вл�ет�� %s != %s"
 
-#: commit-graph.c:1255
+#: commit-graph.c:2407
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "в файле commit-graph �пи�ок родителей дл� коммита %s закончил�� �лишком рано"
 
-#: commit-graph.c:1260
+#: commit-graph.c:2412
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero "
 "elsewhere"
 msgstr "в файле commit-graph �одержит�� нулевой номер поколени� дл� коммита %s, но ненулевой в о�тальных �луча�х"
 
-#: commit-graph.c:1264
+#: commit-graph.c:2416
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero "
 "elsewhere"
 msgstr "в файле commit-graph �одержит�� ненулевой номер поколени� дл� коммита %s, но нулевой в о�тальных �луча�х"
 
-#: commit-graph.c:1279
+#: commit-graph.c:2432
 #, c-format
 msgid "commit-graph generation for commit %s is %u != %u"
 msgstr "в файле commit-graph номер поколени� дл� коммита %s �вл�ет�� %u != %u"
 
-#: commit-graph.c:1285
+#: commit-graph.c:2438
 #, c-format
 msgid "commit date for commit %s in commit-graph is %<PRIuMAX> != %<PRIuMAX>"
 msgstr "в файле commit-graph дата коммита %s �вл�ет�� %<PRIuMAX> != %<PRIuMAX>"
 
+#: 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
+#, c-format
+msgid "could not parse %s"
+msgstr "не удало�ь разобрать %s"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s не �вл�ет�� коммитом!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr "Поддержка <GIT_DIR>/info/grafts у�тарела и будет удалена в �ледующих вер�и�х Git.\n\nИ�пользуйте «git replace --convert-graft-file» дл�  конвертации �ращений (grafts) на ��ылки замены.\n\nЧтобы �крыть �то �ообщение запу�тите «git config advice.graftFileDeprecated false»"
+
+#: commit.c:1172
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "Коммит %s �одержит не доверенную GPG подпи�ь, предположительно от %s."
+
+#: commit.c:1176
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Коммит %s �одержит плохую GPG подпи�ь, предположительно от %s."
+
+#: commit.c:1179
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Коммит %s не �одержит GPG подпи�ь."
+
+#: commit.c:1182
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "Коммит %s �одержит дей�твительную GPG подпи�ь, от %s.\n"
+
+#: commit.c:1436
+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 "Предупреждение: �ообщение коммита не �оответ�твует UTF-8.\nВозможно, вы захотите и�править его по�ле и�правлени� �ообщени�\nили на�троить опцию i18n.commitencoding и указать кодировку\n�ообщений, которую и�пользует ваш проект.\n"
+
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "пам�ть и�черпана"
 
-#: config.c:123
+#: config.c:125
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1540,294 +2292,290 @@ msgid ""
 "This might be due to circular includes."
 msgstr ""
 
-#: config.c:139
+#: config.c:141
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "не удало�ь ра�крыть путь включени� «%s»"
 
-#: config.c:150
+#: config.c:152
 msgid "relative config includes must come from files"
 msgstr "отно�ительные включени� конфигурации должны и�ходить из файлов"
 
-#: config.c:190
+#: config.c:198
 msgid "relative config include conditionals must come from files"
 msgstr "отно�ительные у�ловные включени� конфигурации должны и�ходить из файлов"
 
-#: config.c:348
+#: config.c:378
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr ""
 
-#: config.c:354
+#: config.c:384
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr ""
 
-#: config.c:378 sequencer.c:2459
+#: config.c:408 sequencer.c:2580
 #, c-format
 msgid "invalid key: %s"
 msgstr "недей�твительный ключ: %s"
 
-#: config.c:384
+#: config.c:414
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr ""
 
-#: config.c:420 config.c:432
+#: config.c:450 config.c:462
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr ""
 
-#: config.c:467
+#: config.c:497
 #, c-format
 msgid "bogus format in %s"
 msgstr ""
 
-#: config.c:793
+#: config.c:836
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "ошибка в %d �троке двоичного объекта %s"
 
-#: config.c:797
+#: config.c:840
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "ошибка в %d �троке файла %s"
 
-#: config.c:801
+#: config.c:844
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "ошибка в %d �троке �тандартного ввода"
 
-#: config.c:805
+#: config.c:848
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "ошибка в %d �троке двоичного объекта подмодул� %s"
 
-#: config.c:809
+#: config.c:852
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "ошибка в %d �троке коммандной �троки %s"
 
-#: config.c:813
+#: config.c:856
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "ошибка в %d �троке в %s"
 
-#: config.c:952
+#: config.c:993
 msgid "out of range"
 msgstr "вне диапазона"
 
-#: config.c:952
+#: config.c:993
 msgid "invalid unit"
 msgstr "неправильное чи�ло"
 
-#: config.c:958
+#: config.c:994
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s»: %s"
 
-#: config.c:963
+#: config.c:1013
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» в двоичном объекте %s: %s"
 
-#: config.c:966
+#: config.c:1016
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» в файле %s: %s"
 
-#: config.c:969
+#: config.c:1019
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» на �тандартном вводе: %s"
 
-#: config.c:972
+#: config.c:1022
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» в двоичном объекте подмодул� %s: %s"
 
-#: config.c:975
+#: config.c:1025
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» на коммандной �троке %s: %s"
 
-#: config.c:978
+#: config.c:1028
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "неправильное чи�ловое значение «%s» дл� «%s» в %s: %s"
 
-#: config.c:1073
+#: config.c:1123
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "�бой разворачивани� пути каталога пользовател�: «%s»"
 
-#: config.c:1082
+#: config.c:1132
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "«%s» дл� «%s» не �вл�ет�� допу�тимой меткой даты/времени"
 
-#: config.c:1173
+#: config.c:1223
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr ""
 
-#: config.c:1187 config.c:1198
+#: config.c:1237 config.c:1248
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "неправильный уровень �жати� zlib %d"
 
-#: config.c:1290
+#: config.c:1340
 msgid "core.commentChar should only be one character"
 msgstr ""
 
-#: config.c:1323
+#: config.c:1373
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "недопу�тимый режим �оздани� объекта: %s"
 
-#: config.c:1395
+#: config.c:1445
 #, c-format
 msgid "malformed value for %s"
 msgstr ""
 
-#: config.c:1421
+#: config.c:1471
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr ""
 
-#: config.c:1422
+#: config.c:1472
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr ""
 
-#: config.c:1483 builtin/pack-objects.c:3397
+#: config.c:1533 builtin/pack-objects.c:3649
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "неправильный уровень �жати� пакета %d"
 
-#: config.c:1604
+#: config.c:1655
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr ""
 
-#: config.c:1607
+#: config.c:1658
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr ""
 
-#: config.c:1624
+#: config.c:1675
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr ""
 
-#: config.c:1654
+#: config.c:1705
 #, c-format
 msgid "failed to parse %s"
 msgstr ""
 
-#: config.c:1710
+#: config.c:1759
 msgid "unable to parse command-line config"
 msgstr "не удало�ь разобрать конфигурацию из командной �троки"
 
-#: config.c:2059
+#: config.c:2122
 msgid "unknown error occurred while reading the configuration files"
 msgstr "произошла неизве�тна� ошибка при чтении файлов конфигурации"
 
-#: config.c:2229
+#: config.c:2296
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "�едей�твительный %s: «%s»"
 
-#: config.c:2272
-#, c-format
-msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr "неизве�тное значение «%s» дл� core.untrackedCache; и�пользую �тандартное значение «keep»"
-
-#: config.c:2298
+#: config.c:2341
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "значение «%d» дл� splitIndex.maxPercentChange должно быть от 0 до 100"
 
-#: config.c:2344
+#: config.c:2387
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "не удало�ь разобрать «%s» в конфигурации из командной �троки"
 
-#: config.c:2346
+#: config.c:2389
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "неправильна� переменна� конфигурации «%s» в файле «%s» на �троке %d"
 
-#: config.c:2427
+#: config.c:2473
 #, c-format
 msgid "invalid section name '%s'"
 msgstr ""
 
-#: config.c:2459
+#: config.c:2505
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s имеет не�колько значений"
 
-#: config.c:2488
+#: config.c:2534
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr ""
 
-#: config.c:2740 config.c:3064
+#: config.c:2786 config.c:3112
 #, c-format
 msgid "could not lock config file %s"
 msgstr ""
 
-#: config.c:2751
+#: config.c:2797
 #, c-format
 msgid "opening %s"
 msgstr ""
 
-#: config.c:2786 builtin/config.c:328
+#: config.c:2834 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr ""
 
-#: config.c:2811
+#: config.c:2859
 #, c-format
 msgid "invalid config file %s"
 msgstr ""
 
-#: config.c:2824 config.c:3077
+#: config.c:2872 config.c:3125
 #, c-format
 msgid "fstat on %s failed"
 msgstr "�бой при выполнении fstat на файле %s"
 
-#: config.c:2835
+#: config.c:2883
 #, c-format
 msgid "unable to mmap '%s'"
 msgstr ""
 
-#: config.c:2844 config.c:3082
+#: config.c:2892 config.c:3130
 #, c-format
 msgid "chmod on %s failed"
 msgstr ""
 
-#: config.c:2929 config.c:3179
+#: config.c:2977 config.c:3227
 #, c-format
 msgid "could not write config file %s"
 msgstr ""
 
-#: config.c:2963
+#: config.c:3011
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "не удало�ь у�тановить «%s» в «%s»"
 
-#: config.c:2965 builtin/remote.c:782
+#: config.c:3013 builtin/remote.c:657 builtin/remote.c:855
+#: builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr "не удало�ь �бро�ить значение дл� «%s»"
 
-#: config.c:3055
+#: config.c:3103
 #, c-format
 msgid "invalid section name: %s"
 msgstr ""
 
-#: config.c:3222
+#: config.c:3270
 #, c-format
 msgid "missing value for '%s'"
 msgstr ""
@@ -1849,79 +2597,88 @@ msgstr "Ð�е удалоÑ�ÑŒ прочитать из внешнего репозÐ
 msgid "server doesn't support '%s'"
 msgstr ""
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr ""
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
 msgstr ""
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr ""
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
 msgstr ""
 
-#: connect.c:273
+#: connect.c:306
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr ""
 
-#: connect.c:275
+#: connect.c:308
 msgid "repository on the other end cannot be shallow"
 msgstr ""
 
-#: connect.c:313
+#: connect.c:347
 msgid "invalid packet"
 msgstr ""
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr ""
 
-#: connect.c:441
+#: connect.c:473
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr ""
+
+#: connect.c:500
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr ""
 
-#: connect.c:445
+#: connect.c:504
 msgid "expected flush after ref listing"
 msgstr ""
 
-#: connect.c:544
+#: connect.c:507
+msgid "expected response end packet after ref listing"
+msgstr ""
+
+#: connect.c:640
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr ""
 
-#: connect.c:595
+#: connect.c:691
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr ""
 
-#: connect.c:635 connect.c:698
+#: connect.c:731 connect.c:794
 #, c-format
 msgid "Looking up %s ... "
 msgstr ""
 
-#: connect.c:639
+#: connect.c:735
 #, c-format
 msgid "unable to look up %s (port %s) (%s)"
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Looking up %s ... "
-#: connect.c:643 connect.c:714
+#: connect.c:739 connect.c:810
 #, c-format
 msgid ""
 "done.\n"
 "Connecting to %s (port %s) ... "
 msgstr ""
 
-#: connect.c:665 connect.c:742
+#: connect.c:761 connect.c:838
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -1929,116 +2686,116 @@ msgid ""
 msgstr ""
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:767 connect.c:844
 msgid "done."
 msgstr ""
 
-#: connect.c:702
+#: connect.c:798
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr ""
 
-#: connect.c:708
+#: connect.c:804
 #, c-format
 msgid "unknown port %s"
 msgstr ""
 
-#: connect.c:845 connect.c:1171
+#: connect.c:941 connect.c:1271
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr ""
 
-#: connect.c:847
+#: connect.c:943
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr ""
 
-#: connect.c:857
+#: connect.c:953
 #, c-format
 msgid "cannot start proxy %s"
 msgstr ""
 
-#: connect.c:924
+#: connect.c:1024
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr ""
 
-#: connect.c:1119
+#: connect.c:1219
 msgid "ssh variant 'simple' does not support -4"
 msgstr ""
 
-#: connect.c:1131
+#: connect.c:1231
 msgid "ssh variant 'simple' does not support -6"
 msgstr ""
 
-#: connect.c:1148
+#: connect.c:1248
 msgid "ssh variant 'simple' does not support setting port"
 msgstr ""
 
-#: connect.c:1260
+#: connect.c:1360
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr ""
 
-#: connect.c:1307
+#: connect.c:1408
 msgid "unable to fork"
 msgstr ""
 
-#: connected.c:85 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:209 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "Проверка �оединени�"
 
-#: connected.c:97
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
 msgstr "�е удало�ь запу�тить «git rev-list»"
 
-#: connected.c:117
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr "�бой запи�и в rev-list"
 
-#: connected.c:124
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "�бой закрыти� �тандартного ввода у rev-list"
 
-#: convert.c:193
+#: convert.c:194
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr ""
 
-#: convert.c:206
+#: convert.c:207
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr ""
 
-#: convert.c:208
+#: convert.c:209
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
 "The file will have its original line endings in your working directory"
 msgstr ""
 
-#: convert.c:216
+#: convert.c:217
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF будет заменен на CRLF в %s"
 
-#: convert.c:218
+#: convert.c:219
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
 "The file will have its original line endings in your working directory"
 msgstr ""
 
-#: convert.c:279
+#: convert.c:284
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "BOM запрещен в «%s», е�ли кодирует�� как %s"
 
-#: convert.c:286
+#: convert.c:291
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as "
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
 "working-tree-encoding."
-msgstr "Файл «%s» �одержит маркер по�ледовательно�ти байтов (BOM). И�пользуйте UTF-%s как кодировку рабочего каталога."
+msgstr ""
 
 #: convert.c:304
 #, c-format
@@ -2052,75 +2809,103 @@ msgid ""
 "UTF-%sLE (depending on the byte order) as working-tree-encoding."
 msgstr "Файл «%s» не �одержит маркер по�ледовательно�ти байтов (BOM).  И�пользуйте UTF-%sBE или UTF-%sLE (в зави�имо�ти от пор�дка байтов) как кодировку рабочего каталога."
 
-#: convert.c:424 convert.c:495
+#: convert.c:419 convert.c:490
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "не удало�ь перекодировать «%s» из %s в %s"
 
-#: convert.c:467
+#: convert.c:462
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "перекодирование «%s» из %s в %s и обратно не одно и то же"
 
-#: convert.c:673
+#: convert.c:665
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr ""
 
-#: convert.c:693
+#: convert.c:685
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr ""
 
-#: convert.c:700
+#: convert.c:692
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr ""
 
-#: convert.c:735 convert.c:738
+#: convert.c:727 convert.c:730
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr ""
 
-#: convert.c:741 convert.c:796
+#: convert.c:733 convert.c:788
 #, c-format
 msgid "external filter '%s' failed"
 msgstr ""
 
-#: convert.c:844
+#: convert.c:837
 msgid "unexpected filter type"
 msgstr ""
 
-#: convert.c:855
+#: convert.c:848
 msgid "path name too long for external filter"
 msgstr ""
 
-#: convert.c:929
+#: convert.c:940
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr ""
 
-#: convert.c:1228
+#: convert.c:1240
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false не �вл�ет�� допу�тимым значением дл� working-tree-encoding"
 
-#: convert.c:1398 convert.c:1432
+#: convert.c:1428 convert.c:1462
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr ""
 
-#: convert.c:1476
+#: convert.c:1508
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr ""
 
-#: date.c:137
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr ""
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr ""
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr ""
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr ""
+
+#: credential.c:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr ""
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr ""
+
+#: date.c:138
 msgid "in the future"
 msgstr "в будущем"
 
-#: date.c:143
+#: date.c:144
 #, c-format
 msgid "%<PRIuMAX> second ago"
 msgid_plural "%<PRIuMAX> seconds ago"
@@ -2129,7 +2914,7 @@ msgstr[1] "%<PRIuMAX> �екунды назад"
 msgstr[2] "%<PRIuMAX> �екунд назад"
 msgstr[3] "%<PRIuMAX> �екунды назад"
 
-#: date.c:150
+#: date.c:151
 #, c-format
 msgid "%<PRIuMAX> minute ago"
 msgid_plural "%<PRIuMAX> minutes ago"
@@ -2138,7 +2923,7 @@ msgstr[1] "%<PRIuMAX> минуты назад"
 msgstr[2] "%<PRIuMAX> минут назад"
 msgstr[3] "%<PRIuMAX> минуты назад"
 
-#: date.c:157
+#: date.c:158
 #, c-format
 msgid "%<PRIuMAX> hour ago"
 msgid_plural "%<PRIuMAX> hours ago"
@@ -2147,7 +2932,7 @@ msgstr[1] "%<PRIuMAX> ча�а назад"
 msgstr[2] "%<PRIuMAX> ча�ов назад"
 msgstr[3] "%<PRIuMAX> ча�а назад"
 
-#: date.c:164
+#: date.c:165
 #, c-format
 msgid "%<PRIuMAX> day ago"
 msgid_plural "%<PRIuMAX> days ago"
@@ -2156,7 +2941,7 @@ msgstr[1] "%<PRIuMAX> дн� назад"
 msgstr[2] "%<PRIuMAX> дней назад"
 msgstr[3] "%<PRIuMAX> дн� назад"
 
-#: date.c:170
+#: date.c:171
 #, c-format
 msgid "%<PRIuMAX> week ago"
 msgid_plural "%<PRIuMAX> weeks ago"
@@ -2165,7 +2950,7 @@ msgstr[1] "%<PRIuMAX> недели назад"
 msgstr[2] "%<PRIuMAX> недель назад"
 msgstr[3] "%<PRIuMAX> недели назад"
 
-#: date.c:177
+#: date.c:178
 #, c-format
 msgid "%<PRIuMAX> month ago"
 msgid_plural "%<PRIuMAX> months ago"
@@ -2174,7 +2959,7 @@ msgstr[1] "%<PRIuMAX> ме��ца назад"
 msgstr[2] "%<PRIuMAX> ме��цев назад"
 msgstr[3] "%<PRIuMAX> ме��ца назад"
 
-#: date.c:188
+#: date.c:189
 #, c-format
 msgid "%<PRIuMAX> year"
 msgid_plural "%<PRIuMAX> years"
@@ -2184,7 +2969,7 @@ msgstr[2] "%<PRIuMAX> лет"
 msgstr[3] "%<PRIuMAX> года"
 
 #. TRANSLATORS: "%s" is "<n> years"
-#: date.c:191
+#: date.c:192
 #, c-format
 msgid "%s, %<PRIuMAX> month ago"
 msgid_plural "%s, %<PRIuMAX> months ago"
@@ -2193,7 +2978,7 @@ msgstr[1] "%s, %<PRIuMAX> ме��ца назад"
 msgstr[2] "%s, %<PRIuMAX> ме��цев назад"
 msgstr[3] "%s, %<PRIuMAX> ме��ца назад"
 
-#: date.c:196 date.c:201
+#: date.c:197 date.c:202
 #, c-format
 msgid "%<PRIuMAX> year ago"
 msgid_plural "%<PRIuMAX> years ago"
@@ -2221,19 +3006,30 @@ msgstr ""
 msgid "island regex from config has too many capture groups (max=%d)"
 msgstr ""
 
-#: delta-islands.c:466
+#: delta-islands.c:467
 #, c-format
 msgid "Marked %d islands, done.\n"
 msgstr ""
 
-#: diffcore-order.c:24
-#, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "�бой чтени� orderfile «%s»"
+#: diff-lib.c:534
+msgid "--merge-base does not work with ranges"
+msgstr ""
 
-#: diffcore-rename.c:544
-msgid "Performing inexact rename detection"
-msgstr "Выполн�ет�� неточное определение переименовани�"
+#: diff-lib.c:536
+msgid "--merge-base only works with commits"
+msgstr ""
+
+#: diff-lib.c:553
+msgid "unable to get HEAD"
+msgstr ""
+
+#: diff-lib.c:560
+msgid "no merge base found"
+msgstr ""
+
+#: diff-lib.c:562
+msgid "multiple merge bases found"
+msgstr ""
 
 #: diff-no-index.c:238
 msgid "git diff --no-index [<options>] <path> <path>"
@@ -2245,615 +3041,652 @@ msgid ""
 "tree"
 msgstr ""
 
-#: diff.c:155
+#: diff.c:156
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Сбой разбора величины �реза (cut-off) у dirstat «%s»\n"
 
-#: diff.c:160
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
-msgstr "�еизве�тный параметр dirstat: «%s»\n"
+msgstr " �еизве�тный параметр dirstat: «%s»\n"
 
-#: diff.c:296
+#: diff.c:297
 msgid ""
 "color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
 "'dimmed-zebra', 'plain'"
 msgstr ""
 
-#: diff.c:324
+#: diff.c:325
 #, 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:332
+#: diff.c:333
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr ""
 
-#: diff.c:405
+#: diff.c:410
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�еизве�тное значени� дл� переменной «diff.submodule»: «%s»"
 
-#: diff.c:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
 "%s"
 msgstr "�айдены ошибки в переменной «diff.dirstat»:\n%s"
 
-#: diff.c:4210
+#: diff.c:4276
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "критиче�ка� ошибка при внешнем �равнении, о�танов на %s"
 
-#: diff.c:4555
+#: diff.c:4625
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only, --name-status, --check и -s нельз� и�пользовать одновременно"
 
-#: diff.c:4558
+#: diff.c:4628
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S и --find-object нельз� и�пользовать одновременно"
 
-#: diff.c:4636
+#: diff.c:4707
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow требует ровно одного �пецификатора пути"
 
-#: diff.c:4684
+#: diff.c:4755
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr ""
 
-#: diff.c:4689 diff.c:4694 diff.c:4699 diff.c:4704 diff.c:5217
-#: parse-options.c:199 parse-options.c:203
+#: diff.c:4760 diff.c:4765 diff.c:4770 diff.c:4775 diff.c:5303
+#: parse-options.c:197 parse-options.c:201 builtin/commit-graph.c:180
 #, c-format
 msgid "%s expects a numerical value"
 msgstr ""
 
-#: diff.c:4721
+#: diff.c:4792
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
 "%s"
 msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
 
-#: diff.c:4806
+#: diff.c:4877
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr ""
 
-#: diff.c:4830
+#: diff.c:4901
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr ""
 
-#: diff.c:4844
+#: diff.c:4915
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr ""
 
-#: diff.c:4894 diff.c:4900
+#: diff.c:4965 diff.c:4971
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr ""
 
-#: diff.c:4912
+#: diff.c:4983
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr ""
 
-#: diff.c:4933
+#: diff.c:5004
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr ""
 
-#: diff.c:4952
+#: diff.c:5023
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr ""
 
-#: diff.c:4992
+#: diff.c:5063
 msgid "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and \"histogram\""
 msgstr ""
 
-#: diff.c:5028 diff.c:5048
+#: diff.c:5099 diff.c:5119
 #, c-format
 msgid "invalid argument to %s"
 msgstr ""
 
-#: diff.c:5186
+#: diff.c:5223
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr ""
+
+#: diff.c:5272
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr ""
 
-#: diff.c:5242
+#: diff.c:5328
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr ""
 
-#: diff.c:5265
+#: diff.c:5351
 msgid "Diff output format options"
 msgstr ""
 
-#: diff.c:5267 diff.c:5273
+#: diff.c:5353 diff.c:5359
 msgid "generate patch"
 msgstr ""
 
-#: diff.c:5270 builtin/log.c:167
+#: diff.c:5356 builtin/log.c:178
 msgid "suppress diff output"
 msgstr "не выводить �пи�ок изменений"
 
-#: diff.c:5275 diff.c:5389 diff.c:5396
+#: diff.c:5361 diff.c:5475 diff.c:5482
 msgid "<n>"
 msgstr ""
 
-#: diff.c:5276 diff.c:5279
+#: diff.c:5362 diff.c:5365
 msgid "generate diffs with <n> lines context"
 msgstr ""
 
-#: diff.c:5281
+#: diff.c:5367
 msgid "generate the diff in raw format"
 msgstr ""
 
-#: diff.c:5284
+#: diff.c:5370
 msgid "synonym for '-p --raw'"
 msgstr ""
 
-#: diff.c:5288
+#: diff.c:5374
 msgid "synonym for '-p --stat'"
 msgstr ""
 
-#: diff.c:5292
+#: diff.c:5378
 msgid "machine friendly --stat"
 msgstr ""
 
-#: diff.c:5295
+#: diff.c:5381
 msgid "output only the last line of --stat"
 msgstr ""
 
-#: diff.c:5297 diff.c:5305
+#: diff.c:5383 diff.c:5391
 msgid "<param1,param2>..."
 msgstr ""
 
-#: diff.c:5298
+#: diff.c:5384
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr ""
 
-#: diff.c:5302
+#: diff.c:5388
 msgid "synonym for --dirstat=cumulative"
 msgstr ""
 
-#: diff.c:5306
+#: diff.c:5392
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr ""
 
-#: diff.c:5310
+#: diff.c:5396
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr ""
 
-#: diff.c:5313
+#: diff.c:5399
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "кратка� �водка изменений, вроде �озданий, переименований или изменений режима до�тупа"
 
-#: diff.c:5316
+#: diff.c:5402
 msgid "show only names of changed files"
 msgstr ""
 
-#: diff.c:5319
+#: diff.c:5405
 msgid "show only names and status of changed files"
 msgstr ""
 
-#: diff.c:5321
+#: diff.c:5407
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr ""
 
-#: diff.c:5322
+#: diff.c:5408
 msgid "generate diffstat"
 msgstr ""
 
-#: diff.c:5324 diff.c:5327 diff.c:5330
+#: diff.c:5410 diff.c:5413 diff.c:5416
 msgid "<width>"
 msgstr ""
 
-#: diff.c:5325
+#: diff.c:5411
 msgid "generate diffstat with a given width"
 msgstr ""
 
-#: diff.c:5328
+#: diff.c:5414
 msgid "generate diffstat with a given name width"
 msgstr ""
 
-#: diff.c:5331
+#: diff.c:5417
 msgid "generate diffstat with a given graph width"
 msgstr ""
 
-#: diff.c:5333
+#: diff.c:5419
 msgid "<count>"
 msgstr ""
 
-#: diff.c:5334
+#: diff.c:5420
 msgid "generate diffstat with limited lines"
 msgstr ""
 
-#: diff.c:5337
+#: diff.c:5423
 msgid "generate compact summary in diffstat"
-msgstr "генераци� компактной �водки изменений в diffstat"
+msgstr "генераци� компактной �водки в diffstat"
 
-#: diff.c:5340
+#: diff.c:5426
 msgid "output a binary diff that can be applied"
 msgstr ""
 
-#: diff.c:5343
+#: diff.c:5429
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr ""
 
-#: diff.c:5345
+#: diff.c:5431
 msgid "show colored diff"
 msgstr ""
 
-#: diff.c:5346
+#: diff.c:5432
 msgid "<kind>"
 msgstr ""
 
-#: diff.c:5347
+#: diff.c:5433
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
 
-#: diff.c:5350
+#: diff.c:5436
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
 msgstr ""
 
-#: diff.c:5353 diff.c:5356 diff.c:5359 diff.c:5465
+#: diff.c:5439 diff.c:5442 diff.c:5445 diff.c:5554
 msgid "<prefix>"
 msgstr ""
 
-#: diff.c:5354
+#: diff.c:5440
 msgid "show the given source prefix instead of \"a/\""
 msgstr ""
 
-#: diff.c:5357
+#: diff.c:5443
 msgid "show the given destination prefix instead of \"b/\""
 msgstr ""
 
-#: diff.c:5360
+#: diff.c:5446
 msgid "prepend an additional prefix to every line of output"
 msgstr ""
 
-#: diff.c:5363
+#: diff.c:5449
 msgid "do not show any source or destination prefix"
 msgstr ""
 
-#: diff.c:5366
+#: diff.c:5452
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr ""
 
-#: diff.c:5370 diff.c:5375 diff.c:5380
+#: diff.c:5456 diff.c:5461 diff.c:5466
 msgid "<char>"
 msgstr ""
 
-#: diff.c:5371
+#: diff.c:5457
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr ""
 
-#: diff.c:5376
+#: diff.c:5462
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr ""
 
-#: diff.c:5381
+#: diff.c:5467
 msgid "specify the character to indicate a context instead of ' '"
 msgstr ""
 
-#: diff.c:5384
+#: diff.c:5470
 msgid "Diff rename options"
 msgstr ""
 
-#: diff.c:5385
+#: diff.c:5471
 msgid "<n>[/<m>]"
 msgstr ""
 
-#: diff.c:5386
+#: diff.c:5472
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr ""
 
-#: diff.c:5390
+#: diff.c:5476
 msgid "detect renames"
 msgstr ""
 
-#: diff.c:5394
+#: diff.c:5480
 msgid "omit the preimage for deletes"
 msgstr ""
 
-#: diff.c:5397
+#: diff.c:5483
 msgid "detect copies"
 msgstr ""
 
-#: diff.c:5401
+#: diff.c:5487
 msgid "use unmodified files as source to find copies"
 msgstr ""
 
-#: diff.c:5403
+#: diff.c:5489
 msgid "disable rename detection"
 msgstr ""
 
-#: diff.c:5406
+#: diff.c:5492
 msgid "use empty blobs as rename source"
 msgstr ""
 
-#: diff.c:5408
+#: diff.c:5494
 msgid "continue listing the history of a file beyond renames"
 msgstr ""
 
-#: diff.c:5411
+#: diff.c:5497
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr ""
 
-#: diff.c:5413
+#: diff.c:5499
 msgid "Diff algorithm options"
 msgstr ""
 
-#: diff.c:5415
+#: diff.c:5501
 msgid "produce the smallest possible diff"
 msgstr ""
 
-#: diff.c:5418
+#: diff.c:5504
 msgid "ignore whitespace when comparing lines"
 msgstr ""
 
-#: diff.c:5421
+#: diff.c:5507
 msgid "ignore changes in amount of whitespace"
 msgstr ""
 
-#: diff.c:5424
+#: diff.c:5510
 msgid "ignore changes in whitespace at EOL"
 msgstr ""
 
-#: diff.c:5427
+#: diff.c:5513
 msgid "ignore carrier-return at the end of line"
 msgstr ""
 
-#: diff.c:5430
+#: diff.c:5516
 msgid "ignore changes whose lines are all blank"
 msgstr ""
 
-#: diff.c:5433
+#: diff.c:5518 diff.c:5540 diff.c:5543 diff.c:5588
+msgid "<regex>"
+msgstr ""
+
+#: diff.c:5519
+msgid "ignore changes whose all lines match <regex>"
+msgstr ""
+
+#: diff.c:5522
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr ""
 
-#: diff.c:5436
+#: diff.c:5525
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr ""
 
-#: diff.c:5440
+#: diff.c:5529
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr ""
 
-#: diff.c:5442
+#: diff.c:5531
 msgid "<algorithm>"
 msgstr ""
 
-#: diff.c:5443
+#: diff.c:5532
 msgid "choose a diff algorithm"
 msgstr ""
 
-#: diff.c:5445
+#: diff.c:5534
 msgid "<text>"
 msgstr ""
 
-#: diff.c:5446
+#: diff.c:5535
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr ""
 
-#: diff.c:5448 diff.c:5457 diff.c:5460
+#: diff.c:5537 diff.c:5546 diff.c:5549
 msgid "<mode>"
 msgstr ""
 
-#: diff.c:5449
+#: diff.c:5538
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
 
-#: diff.c:5451 diff.c:5454 diff.c:5499
-msgid "<regex>"
-msgstr ""
-
-#: diff.c:5452
+#: diff.c:5541
 msgid "use <regex> to decide what a word is"
 msgstr ""
 
-#: diff.c:5455
+#: diff.c:5544
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr ""
 
-#: diff.c:5458
+#: diff.c:5547
 msgid "moved lines of code are colored differently"
 msgstr ""
 
-#: diff.c:5461
+#: diff.c:5550
 msgid "how white spaces are ignored in --color-moved"
 msgstr ""
 
-#: diff.c:5464
+#: diff.c:5553
 msgid "Other diff options"
 msgstr ""
 
-#: diff.c:5466
+#: diff.c:5555
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
 
-#: diff.c:5470
+#: diff.c:5559
 msgid "treat all files as text"
 msgstr ""
 
-#: diff.c:5472
+#: diff.c:5561
 msgid "swap two inputs, reverse the diff"
 msgstr ""
 
-#: diff.c:5474
+#: diff.c:5563
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr ""
 
-#: diff.c:5476
+#: diff.c:5565
 msgid "disable all output of the program"
 msgstr ""
 
-#: diff.c:5478
+#: diff.c:5567
 msgid "allow an external diff helper to be executed"
 msgstr ""
 
-#: diff.c:5480
+#: diff.c:5569
 msgid "run external text conversion filters when comparing binary files"
 msgstr ""
 
-#: diff.c:5482
+#: diff.c:5571
 msgid "<when>"
 msgstr ""
 
-#: diff.c:5483
+#: diff.c:5572
 msgid "ignore changes to submodules in the diff generation"
 msgstr ""
 
-#: diff.c:5486
+#: diff.c:5575
 msgid "<format>"
 msgstr ""
 
-#: diff.c:5487
+#: diff.c:5576
 msgid "specify how differences in submodules are shown"
 msgstr ""
 
-#: diff.c:5491
+#: diff.c:5580
 msgid "hide 'git add -N' entries from the index"
 msgstr ""
 
-#: diff.c:5494
+#: diff.c:5583
 msgid "treat 'git add -N' entries as real in the index"
 msgstr ""
 
-#: diff.c:5496
+#: diff.c:5585
 msgid "<string>"
 msgstr ""
 
-#: diff.c:5497
+#: diff.c:5586
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr ""
 
-#: diff.c:5500
+#: diff.c:5589
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr ""
 
-#: diff.c:5503
+#: diff.c:5592
 msgid "show all changes in the changeset with -S or -G"
 msgstr ""
 
-#: diff.c:5506
+#: diff.c:5595
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr ""
 
-#: diff.c:5509
+#: diff.c:5598
 msgid "control the order in which files appear in the output"
 msgstr ""
 
-#: diff.c:5510
+#: diff.c:5599
 msgid "<object-id>"
 msgstr ""
 
-#: diff.c:5511
+#: diff.c:5600
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr ""
 
-#: diff.c:5513
+#: diff.c:5602
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr ""
 
-#: diff.c:5514
+#: diff.c:5603
 msgid "select files by diff type"
 msgstr ""
 
-#: diff.c:5516
+#: diff.c:5605
 msgid "<file>"
 msgstr ""
 
-#: diff.c:5517
+#: diff.c:5606
 msgid "Output to a specific file"
 msgstr ""
 
-#: diff.c:6150
+#: diff.c:6263
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "неточное определение переименовани� было пропущено из-за �лишком большого количе�тва файлов."
 
-#: diff.c:6153
+#: diff.c:6266
 msgid "only found copies from modified paths due to too many files."
 msgstr "найдены только копии из измененных путей из-за �лишком большого количе�тва файлов."
 
-#: diff.c:6156
+#: diff.c:6269
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "возможно вы захотите у�тановить переменную %s в как минимум значение %d и повторить вызов команды."
 
-#: dir.c:537
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "�бой чтени� orderfile «%s»"
+
+#: diffcore-rename.c:592
+msgid "Performing inexact rename detection"
+msgstr "Выполн�ет�� неточное определение переименовани�"
+
+#: dir.c:578
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr ""
 
-#: dir.c:926
+#: dir.c:718 dir.c:747 dir.c:760
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr ""
+
+#: dir.c:777 dir.c:791
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr ""
+
+#: dir.c:809
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr ""
+
+#: dir.c:819
+msgid "disabling cone pattern matching"
+msgstr ""
+
+#: dir.c:1198
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr ""
 
-#: dir.c:1843
+#: dir.c:2305
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "не удало�ь открыть каталог «%s»"
 
-#: dir.c:2085
+#: dir.c:2605
 msgid "failed to get kernel name and information"
 msgstr "не удало�ь получить им� �дра и информацию"
 
-#: dir.c:2209
+#: dir.c:2729
 msgid "untracked cache is disabled on this system or location"
 msgstr ""
 
-#: dir.c:3013
+#: dir.c:3520
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr ""
 
-#: dir.c:3058 dir.c:3063
+#: dir.c:3565 dir.c:3570
 #, c-format
 msgid "could not create directories for %s"
 msgstr "не удало�ь �оздать каталоги дл� %s"
 
-#: dir.c:3092
+#: dir.c:3599
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "не удало�ь переме�тить каталог git � «%s» в «%s»"
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "под�казка: Ожидание, пока вы закроете редактор � файлом…%c"
 
-#: entry.c:178
+#: entry.c:177
 msgid "Filtering content"
 msgstr "Фильтрует�� �одержимое"
 
-#: entry.c:476
+#: entry.c:478
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "не удало�ь выполнить stat дл� файла «%s»"
@@ -2863,7 +3696,7 @@ msgstr "не удало�ь выполнить stat дл� файла «%s»"
 msgid "bad git namespace path \"%s\""
 msgstr ""
 
-#: environment.c:332
+#: environment.c:337
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr ""
@@ -2873,289 +3706,285 @@ msgstr ""
 msgid "too many args to run %s"
 msgstr ""
 
-#: fetch-object.c:17
-msgid "Remote with no URL"
-msgstr "Внешний репозиторий без URL"
-
-#: fetch-pack.c:151
+#: fetch-pack.c:177
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: ожидает�� передача �пи�ка дл� получение ча�ти"
 
-#: fetch-pack.c:154
+#: fetch-pack.c:180
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr ""
 
-#: fetch-pack.c:165
+#: fetch-pack.c:191
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack: ожидает�� ACK/NAK, а получен пу�той пакет"
 
-#: fetch-pack.c:185
+#: fetch-pack.c:211
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack: ожидает�� ACK/NAK, а получено «%s»"
 
-#: fetch-pack.c:196
+#: fetch-pack.c:222
 msgid "unable to write to remote"
 msgstr ""
 
-#: fetch-pack.c:258
+#: fetch-pack.c:283
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc требует multi_ack_detailed"
 
-#: fetch-pack.c:360 fetch-pack.c:1271
+#: fetch-pack.c:378 fetch-pack.c:1406
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "неправильна� �трока ча�тичного получени�: %s"
 
-#: fetch-pack.c:366 fetch-pack.c:1277
+#: fetch-pack.c:384 fetch-pack.c:1412
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "неправильна� �трока полного получени�: %s"
 
-#: fetch-pack.c:368 fetch-pack.c:1279
+#: fetch-pack.c:386 fetch-pack.c:1414
 #, c-format
 msgid "object not found: %s"
 msgstr "объект не найден: %s"
 
-#: fetch-pack.c:371 fetch-pack.c:1282
+#: fetch-pack.c:389 fetch-pack.c:1417
 #, c-format
 msgid "error in object: %s"
 msgstr "ошибка в объекте: %s"
 
-#: fetch-pack.c:373 fetch-pack.c:1284
+#: fetch-pack.c:391 fetch-pack.c:1419
 #, c-format
 msgid "no shallow found: %s"
 msgstr "ча�тичный клон не найден: %s"
 
-#: fetch-pack.c:376 fetch-pack.c:1288
+#: fetch-pack.c:394 fetch-pack.c:1423
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "ожидало�ь shallow/unshallow, а получено %s"
 
-#: fetch-pack.c:417
+#: fetch-pack.c:434
 #, c-format
 msgid "got %s %d %s"
 msgstr "получено %s %d %s"
 
-#: fetch-pack.c:434
+#: fetch-pack.c:451
 #, c-format
 msgid "invalid commit %s"
 msgstr "недопу�тимый коммит %s"
 
-#: fetch-pack.c:465
+#: fetch-pack.c:482
 msgid "giving up"
 msgstr "о�танавливаю дальнейшие попытки"
 
-#: fetch-pack.c:477 progress.c:284
+#: fetch-pack.c:495 progress.c:339
 msgid "done"
 msgstr "готово"
 
-#: fetch-pack.c:489
+#: fetch-pack.c:507
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "получено %s (%d) %s"
 
-#: fetch-pack.c:535
+#: fetch-pack.c:543
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Помечаю %s как завершенный"
 
-#: fetch-pack.c:744
+#: fetch-pack.c:758
 #, c-format
 msgid "already have %s (%s)"
 msgstr "уже е�ть %s (%s)"
 
-#: fetch-pack.c:783
+#: fetch-pack.c:827
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: не удало�ь запу�тить программу разбора данных"
 
-#: fetch-pack.c:791
+#: fetch-pack.c:835
 msgid "protocol error: bad pack header"
 msgstr "ошибка протокола: неправильный заголовок потока"
 
-#: fetch-pack.c:859
+#: fetch-pack.c:919
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: не удало�ь запу�тить программу %s"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:937
 #, c-format
 msgid "%s failed"
 msgstr "%s завершен � ошибкой"
 
-#: fetch-pack.c:877
+#: fetch-pack.c:939
 msgid "error in sideband demultiplexer"
 msgstr "произошла  ошибка в  программе разбора данных"
 
-#: fetch-pack.c:906
-msgid "Server does not support shallow clients"
-msgstr "Сервер не поддерживает клиентов � ча�тичным клонированием"
-
-#: fetch-pack.c:910
-msgid "Server supports multi_ack_detailed"
-msgstr "Сервер поддерживает multi_ack_detailed"
-
-#: fetch-pack.c:913
-msgid "Server supports no-done"
-msgstr "Сервер поддерживает no-done"
-
-#: fetch-pack.c:919
-msgid "Server supports multi_ack"
-msgstr "Сервер поддерживает multi_ack"
-
-#: fetch-pack.c:923
-msgid "Server supports side-band-64k"
-msgstr "Сервер поддерживает side-band-64k"
-
-#: fetch-pack.c:927
-msgid "Server supports side-band"
-msgstr "Сервер поддерживает side-band"
-
-#: fetch-pack.c:931
-msgid "Server supports allow-tip-sha1-in-want"
-msgstr "Сервер поддерживает allow-tip-sha1-in-want"
-
-#: fetch-pack.c:935
-msgid "Server supports allow-reachable-sha1-in-want"
-msgstr "Сервер поддерживает allow-reachable-sha1-in-want"
-
-#: fetch-pack.c:945
-msgid "Server supports ofs-delta"
-msgstr "Сервер поддерживает ofs-delta"
-
-#: fetch-pack.c:951 fetch-pack.c:1144
-msgid "Server supports filter"
-msgstr "Сервер поддерживает фильтрацию"
-
-#: fetch-pack.c:959
+#: fetch-pack.c:982
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Вер�и� �ервера %.*s"
 
-#: fetch-pack.c:965
+#: 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
+#, c-format
+msgid "Server supports %s"
+msgstr ""
+
+#: fetch-pack.c:992
+msgid "Server does not support shallow clients"
+msgstr "Сервер не поддерживает клиентов � ча�тичным клонированием"
+
+#: fetch-pack.c:1052
 msgid "Server does not support --shallow-since"
 msgstr "Сервер не поддерживает --shallow-since"
 
-#: fetch-pack.c:969
+#: fetch-pack.c:1057
 msgid "Server does not support --shallow-exclude"
 msgstr "Сервер не поддерживает --shallow-exclude"
 
-#: fetch-pack.c:971
+#: fetch-pack.c:1061
 msgid "Server does not support --deepen"
 msgstr "Сервер не поддерживает --deepen"
 
-#: fetch-pack.c:988
+#: fetch-pack.c:1063
+msgid "Server does not support this repository's object format"
+msgstr ""
+
+#: fetch-pack.c:1076
 msgid "no common commits"
 msgstr "не общих коммитов"
 
-#: fetch-pack.c:1000 fetch-pack.c:1449
+#: fetch-pack.c:1088 fetch-pack.c:1628
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: ошибка при получении данных."
 
-#: fetch-pack.c:1138
+#: fetch-pack.c:1214
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr ""
+
+#: fetch-pack.c:1218
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr ""
+
+#: fetch-pack.c:1238
 msgid "Server does not support shallow requests"
 msgstr "Сервер не поддерживает ча�тичные запро�ы"
 
-#: fetch-pack.c:1171
+#: fetch-pack.c:1245
+msgid "Server supports filter"
+msgstr "Сервер поддерживает фильтрацию"
+
+#: fetch-pack.c:1284
 msgid "unable to write request to remote"
 msgstr ""
 
-#: fetch-pack.c:1189
+#: fetch-pack.c:1302
 #, c-format
 msgid "error reading section header '%s'"
 msgstr ""
 
-#: fetch-pack.c:1195
+#: fetch-pack.c:1308
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr ""
 
-#: fetch-pack.c:1234
+#: fetch-pack.c:1369
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1239
+#: fetch-pack.c:1374
 #, c-format
 msgid "error processing acks: %d"
 msgstr ""
 
-#: fetch-pack.c:1249
+#: fetch-pack.c:1384
 msgid "expected packfile to be sent after 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1251
+#: fetch-pack.c:1386
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr ""
 
-#: fetch-pack.c:1293
+#: fetch-pack.c:1428
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr ""
 
-#: fetch-pack.c:1340
+#: fetch-pack.c:1475
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr ""
 
-#: fetch-pack.c:1345
+#: fetch-pack.c:1480
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr ""
 
-#: fetch-pack.c:1350
+#: fetch-pack.c:1485
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr ""
 
-#: fetch-pack.c:1676
+#: fetch-pack.c:1515
+msgid "git fetch-pack: expected response end packet"
+msgstr ""
+
+#: fetch-pack.c:1897
 msgid "no matching remote head"
 msgstr "нет �оотве�твующего внешнего указател� на ветку"
 
-#: fetch-pack.c:1699 builtin/clone.c:673
+#: fetch-pack.c:1920 builtin/clone.c:693
 msgid "remote did not send all necessary objects"
 msgstr "внешний репозиторий при�лал не в�е необходимые объекты"
 
-#: fetch-pack.c:1726
+#: fetch-pack.c:1947
 #, c-format
 msgid "no such remote ref %s"
 msgstr "нет такой внешней ��ылки %s"
 
-#: fetch-pack.c:1729
+#: fetch-pack.c:1950
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "Сервер не поддерживает запро� необъ�вленного объекта %s"
 
-#: gpg-interface.c:318
-msgid "gpg failed to sign the data"
-msgstr "gpg не удало�ь подпи�ать данные"
-
-#: gpg-interface.c:344
+#: gpg-interface.c:272
 msgid "could not create temporary file"
 msgstr "не удало�ь �оздать временный файл"
 
-#: gpg-interface.c:347
+#: gpg-interface.c:275
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "�бой запи�и от�оединенной подпи�и в «%s»"
 
-#: graph.c:97
+#: gpg-interface.c:457
+msgid "gpg failed to sign the data"
+msgstr "gpg не удало�ь подпи�ать данные"
+
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "игнорирую недопу�тимый цвет «%.*s» в log.graphColors"
 
-#: grep.c:2113
+#: grep.c:640
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+
+#: grep.c:2100
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "«%s»: не удало�ь проче�ть %s"
 
-#: grep.c:2130 setup.c:164 builtin/clone.c:411 builtin/diff.c:82
+#: grep.c:2117 setup.c:176 builtin/clone.c:412 builtin/diff.c:89
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "не удало�ь выполнить stat «%s»"
 
-#: grep.c:2141
+#: grep.c:2128
 #, c-format
 msgid "'%s': short read"
 msgstr "«%s»: �лишком мало данных прочитано"
@@ -3205,79 +4034,79 @@ msgid "Low-level Commands / Interrogators"
 msgstr "�изкоуровневые команды / Запро�чики"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
-msgstr "�изкоуровневые команды / Синхронизаци� репозиториев"
+msgid "Low-level Commands / Syncing Repositories"
+msgstr ""
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
 msgstr "�изкоуровневые команды / Внутренние в�помогательные"
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "до�тупные команды git в «%s»"
 
-#: help.c:305
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "команды git, до�тупные в других ме�тах вашего $PATH"
 
-#: help.c:314
+#: help.c:316
 msgid "These are common Git commands used in various situations:"
 msgstr "Стандартные команды Git и�пользуемые в различных �итуаци�х:"
 
-#: help.c:363 git.c:97
+#: help.c:365 git.c:99
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "неподдерживаемый тип �пи�ка команд «%s»"
 
-#: help.c:403
-msgid "The common Git guides are:"
-msgstr "О�новные руковод�тва Git:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr ""
 
-#: help.c:512
+#: help.c:429
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "Запу�тите «git help <команда>», чтобы проче�ть о конкретной подкоманде"
 
-#: help.c:517
+#: help.c:434
 msgid "External commands"
 msgstr ""
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr ""
 
-#: help.c:596
+#: help.c:527
 #, 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» похоже на команду git, но нам не удало�ь ее запу�тить. Возможно, git-%s  не работает?"
 
-#: help.c:655
+#: help.c:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git: «%s» не �вл�ет�� командой git. Смотрите «git --help»."
+
+#: help.c:591
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Ой-ёй! Ваша �и�тема не �ообщает ни о каких командах Git вообще."
 
-#: help.c:677
+#: help.c:613
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "Внимание: Вы запу�тили не �уще�твующую команду Git «%s»."
 
-#: help.c:682
+#: help.c:618
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Продолжаю, предполага�, что вы имели в виду «%s»."
 
-#: help.c:687
+#: help.c:623
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "Продолжу через %0.1f �екунд, предполага�, что вы имели в виду «%s»."
 
-#: help.c:695
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git: «%s» не �вл�ет�� командой git. Смотрите «git --help»."
-
-#: help.c:699
+#: help.c:635
 msgid ""
 "\n"
 "The most similar command is"
@@ -3289,16 +4118,16 @@ msgstr[1] "\nСамые похожие команды:"
 msgstr[2] "\nСамые похожие команды:"
 msgstr[3] "\nСамые похожие команды:"
 
-#: help.c:714
+#: help.c:675
 msgid "git version [<options>]"
 msgstr "git version [<options>]"
 
-#: help.c:782
+#: help.c:730
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s — %s"
 
-#: help.c:786
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3310,7 +4139,15 @@ msgstr[1] "\nВозможно, вы имели в виду что-то из �т
 msgstr[2] "\nВозможно, вы имели в виду что-то из �того?"
 msgstr[3] "\nВозможно, вы имели в виду что-то из �того?"
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr ""
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr ""
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3325,71 +4162,95 @@ msgid ""
 "\n"
 msgstr "\n*** Пожалуй�та, �кажите мне кто вы е�ть.\n\nЗапу�тите\n\n  git config --global user.email \"you@example.com\"\n  git config --global user.name \"Ваше Им�\"\n\nдл� указани� идентификационных данных аккаунта по умолчанию.\nПропу�тите параметр --global дл� указани� данных только дл� �того репозитори�.\n\n"
 
-#: ident.c:379
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
 msgstr "адре� �лектронной почты не указан и автоопределение отключено"
 
-#: ident.c:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "не удало�ь выполнить автоопределение адре�а �лектронной почты (получено «%s»)"
 
-#: ident.c:401
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
 msgstr "им� не указано и автоопределение отключено"
 
-#: ident.c:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "не удало�ь выполнить автоопределение имени (получено «%s»)"
 
-#: ident.c:415
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "пу�тое им� идентификатора (дл� <%s>) не разрешено"
 
-#: ident.c:421
+#: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "им� �о�тоит только из неразрешенных �имоволов: %s"
 
-#: ident.c:436 builtin/commit.c:608
+#: ident.c:454 builtin/commit.c:634
 #, c-format
 msgid "invalid date format: %s"
 msgstr "неправильный формат даты: %s"
 
-#: list-objects.c:129
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+#: list-objects-filter-options.c:81
+msgid "expected 'tree:<depth>'"
+msgstr ""
+
+#: list-objects-filter-options.c:96
+msgid "sparse:path filters support has been dropped"
 msgstr ""
 
-#: list-objects.c:142
+#: list-objects-filter-options.c:109
 #, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgid "invalid filter-spec '%s'"
 msgstr ""
 
-#: list-objects.c:378
+#: list-objects-filter-options.c:125
 #, c-format
-msgid "unable to load root tree for commit %s"
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr ""
+
+#: list-objects-filter-options.c:167
+msgid "expected something after combine:"
 msgstr ""
 
-#: list-objects-filter-options.c:36
+#: list-objects-filter-options.c:249
 msgid "multiple filter-specs cannot be combined"
 msgstr "невозможно объедин�ть фильтрацию � помощью не�кольких �пецификаций"
 
-#: list-objects-filter-options.c:58
-msgid "expected 'tree:<depth>'"
+#: list-objects-filter-options.c:361
+msgid "unable to upgrade repository format to support partial clone"
 msgstr ""
 
-#: list-objects-filter-options.c:84
-msgid "sparse:path filters support has been dropped"
+#: list-objects-filter.c:492
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr ""
+
+#: list-objects-filter.c:495
+#, c-format
+msgid "unable to parse sparse filter data in %s"
 msgstr ""
 
-#: list-objects-filter-options.c:158
-msgid "cannot change partial clone promisor remote"
-msgstr "нельз� изменить внешний репозиторий при ча�тичном клонировании"
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr ""
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
 
-#: lockfile.c:151
+#: list-objects.c:375
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr ""
+
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3401,123 +4262,125 @@ msgid ""
 "remove the file manually to continue."
 msgstr "�е удало�ь �оздать «%s.lock»: %s.\n\nПохоже, что другой проце�� git запущен в �том репозитории,\nнапример редактор открыт из «git commit». Пожалуй�та, убедите�ь,\nчто в�е проце��ы были завершены и потом попробуйте �нова.\nЕ�ли �то не поможет, то возможно проце�� git был ранее завершен\n� ошибкой в �том репозитории: \nудалите файл вручную дл� продолжени�."
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "�е удало�ь �оздать «%s.lock»: %s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "�бой чтени� к�ша"
+#: ls-refs.c:109
+msgid "expected flush after ls-refs arguments"
+msgstr ""
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1887 builtin/am.c:1921
-#: builtin/checkout.c:461 builtin/checkout.c:811 builtin/clone.c:773
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "не удало�ь запи�ать новый файл индек�а"
+#: merge-ort-wrappers.c:13 merge-recursive.c:3672
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
 
-#: merge-recursive.c:322
+#: merge-ort-wrappers.c:33 merge-recursive.c:3436
+#, c-format
+msgid "Already up to date!"
+msgstr "Уже обновлено!"
+
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "(плохой коммит)\n"
 
-#: merge-recursive.c:345
+#: merge-recursive.c:379
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "�бой add_cacheinfo дл� пути «%s»; отмена �ли�ни�."
 
-#: merge-recursive.c:354
+#: merge-recursive.c:388
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "�бой обновлени� add_cacheinfo дл� пути «%s»; отмена �ли�ни�."
 
-#: merge-recursive.c:437
-msgid "error building trees"
-msgstr "ошибка при по�троении деревьев"
-
-#: merge-recursive.c:861
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "не удало�ь �оздать путь «%s»%s"
 
-#: merge-recursive.c:872
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "Удаление %s, чтобы о�вободить ме�то дл� подкаталогов\n"
 
-#: merge-recursive.c:886 merge-recursive.c:905
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr ": возможно, конфликт каталогов/файлов?"
 
-#: merge-recursive.c:895
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "отказ потери неот�леживаемого файла в «%s»"
 
-#: merge-recursive.c:936 builtin/cat-file.c:40
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "невозможно прочитать объект %s «%s»"
 
-#: merge-recursive.c:939
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "ожидает�� двоичный объект дл� %s «%s»"
 
-#: merge-recursive.c:963
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "не удало�ь открыть «%s»: %s"
 
-#: merge-recursive.c:974
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "не удало�ь �оздать �имвольную ��ылку «%s»: %s"
 
-#: merge-recursive.c:979
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "не пон�тно, что делать � %06o %s «%s»"
 
-#: merge-recursive.c:1175
+#: merge-recursive.c:1191
 #, c-format
 msgid "Failed to merge submodule %s (not checked out)"
 msgstr "�е удало�ь �лить подмодуль %s (�о�то�ние не забрано)"
 
-#: merge-recursive.c:1182
+#: merge-recursive.c:1198
 #, c-format
 msgid "Failed to merge submodule %s (commits not present)"
 msgstr "�е удало�ь �лить подмодуль %s (нет коммитов)"
 
-#: merge-recursive.c:1189
+#: merge-recursive.c:1205
 #, c-format
 msgid "Failed to merge submodule %s (commits don't follow merge-base)"
 msgstr "�е удало�ь �лить подмодуль %s (у коммитов друга� база �ли�ни�)"
 
-#: merge-recursive.c:1197 merge-recursive.c:1209
+#: merge-recursive.c:1213 merge-recursive.c:1225
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Перемотка вперед подмодул� %s до указанного коммита:"
 
-#: merge-recursive.c:1200 merge-recursive.c:1212
+#: merge-recursive.c:1216 merge-recursive.c:1228
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Перемотка вперед подмодул� %s"
 
-#: merge-recursive.c:1235
+#: merge-recursive.c:1251
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr "�е удало�ь �лить подмодуль %s (нет указанных коммитов дл� �ли�ни�)"
 
-#: merge-recursive.c:1239
+#: merge-recursive.c:1255
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "�е удало�ь �лить подмодуль %s (нельз� �делать перемотку вперед)"
 
-#: merge-recursive.c:1240
+#: merge-recursive.c:1256
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "�айдено возможное разрешение �ли�ти� дл� подмодул�:\n"
 
-#: merge-recursive.c:1243
+#: merge-recursive.c:1259
 #, c-format
 msgid ""
 "If this is correct simply add it to the index for example\n"
@@ -3528,108 +4391,108 @@ msgid ""
 "which will accept this suggestion.\n"
 msgstr "Е�ли оно верное, то про�то добавьте его в индек�, например так:\n\n  git update-index --cacheinfo 160000 %s \"%s\"\n\nтем �амым принима� �то предположение.\n"
 
-#: merge-recursive.c:1252
+#: merge-recursive.c:1268
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "�е удало�ь �лить подмодуль %s (найдено не�колько �ли�ний)"
 
-#: merge-recursive.c:1325
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "�е удало�ь запу�тить внутреннее �ли�ние"
 
-#: merge-recursive.c:1330
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "�е удало�ь добавить %s в базу данных"
 
-#: merge-recursive.c:1362
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "�вто�ли�ние %s"
 
-#: merge-recursive.c:1385
+#: merge-recursive.c:1402
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "Ошибка: Отказ потери неот�леживаемого файла %s; запи�ь в %s взамен."
 
-#: merge-recursive.c:1457
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr "КО�ФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Вер�и� %s из %s о�тавлена в дереве."
 
-#: merge-recursive.c:1462
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree."
 msgstr "КО�ФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Вер�и� %s из %s о�тавлена в дереве."
 
-#: merge-recursive.c:1469
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree at %s."
 msgstr "КО�ФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Вер�и� %s из %s о�тавлена в дереве на %s."
 
-#: merge-recursive.c:1474
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
 "left in tree at %s."
 msgstr "КО�ФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Вер�и� %s из %s о�тавлена в дереве на %s."
 
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "переименование"
 
-#: merge-recursive.c:1509
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "переименовано"
 
-#: merge-recursive.c:1589 merge-recursive.c:2445 merge-recursive.c:3085
+#: merge-recursive.c:1577 merge-recursive.c:2484 merge-recursive.c:3129
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Отказ потери изменённого файла %s"
 
-#: merge-recursive.c:1599
+#: merge-recursive.c:1587
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "Отказ потери неот�леживаемого файла %s, даже � учетом его наличи�."
 
-#: merge-recursive.c:1657
+#: merge-recursive.c:1645
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s.  Added %s in %s"
 msgstr ""
 
-#: merge-recursive.c:1687
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s — �то каталог в %s, добавл�ем как %s вме�то �того"
 
-#: merge-recursive.c:1692
+#: merge-recursive.c:1681
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "Отказ потери неот�леживаемого файла %s; добавление как %s взамен."
 
-#: merge-recursive.c:1711
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
 "\"%s\"->\"%s\" in \"%s\"%s"
 msgstr "КО�ФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s"
 
-#: merge-recursive.c:1716
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr " (о�тавлено неразрешенным)"
 
-#: merge-recursive.c:1825
+#: merge-recursive.c:1805
 #, 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:2030
+#: merge-recursive.c:2068
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3637,157 +4500,146 @@ msgid ""
 "getting a majority of the files."
 msgstr ""
 
-#: merge-recursive.c:2062
+#: 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:2072
+#: merge-recursive.c:2110
 #, 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:2164
+#: merge-recursive.c:2202
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory "
 "%s->%s in %s"
 msgstr ""
 
-#: merge-recursive.c:2408
+#: merge-recursive.c:2447
 #, c-format
 msgid ""
 "WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
 "renamed."
 msgstr ""
 
-#: merge-recursive.c:2929
+#: merge-recursive.c:2973
 #, c-format
 msgid "cannot read object %s"
 msgstr "невозможно прочитать объект «%s»"
 
-#: merge-recursive.c:2932
+#: merge-recursive.c:2976
 #, c-format
 msgid "object %s is not a blob"
 msgstr "объект %s не �вл�ет�� двоичным объектом"
 
-#: merge-recursive.c:2996
+#: merge-recursive.c:3040
 msgid "modify"
 msgstr "изменение"
 
-#: merge-recursive.c:2996
+#: merge-recursive.c:3040
 msgid "modified"
 msgstr "изменено"
 
-#: merge-recursive.c:3008
+#: merge-recursive.c:3052
 msgid "content"
 msgstr "�одержимое"
 
-#: merge-recursive.c:3012
+#: merge-recursive.c:3056
 msgid "add/add"
 msgstr "добавление/добавление"
 
-#: merge-recursive.c:3035
+#: merge-recursive.c:3079
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Пропу�к %s (�литы одинаковые изменени� как �уще�твующие)"
 
-#: merge-recursive.c:3057 git-submodule.sh:937
+#: merge-recursive.c:3101
 msgid "submodule"
 msgstr "подмодуль"
 
-#: merge-recursive.c:3058
+#: merge-recursive.c:3102
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "КО�ФЛИКТ (%s): Конфликт �ли�ни� в %s"
 
-#: merge-recursive.c:3088
+#: merge-recursive.c:3132
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Добавление вме�то �того как %s"
 
-#: merge-recursive.c:3170
+#: 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:3173
+#: 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:3177
+#: 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:3180
+#: 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:3294
+#: merge-recursive.c:3339
 #, c-format
 msgid "Removing %s"
 msgstr "Удаление %s"
 
-#: merge-recursive.c:3317
+#: merge-recursive.c:3362
 msgid "file/directory"
 msgstr "файл/каталог"
 
-#: merge-recursive.c:3322
+#: merge-recursive.c:3367
 msgid "directory/file"
 msgstr "каталог/файл"
 
-#: merge-recursive.c:3329
+#: merge-recursive.c:3374
 #, 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:3338
+#: merge-recursive.c:3383
 #, c-format
 msgid "Adding %s"
 msgstr "Добавление %s"
 
-#: merge-recursive.c:3347
+#: merge-recursive.c:3392
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr ""
 
-#: merge-recursive.c:3385
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-
-#: merge-recursive.c:3396
-msgid "Already up to date!"
-msgstr "Уже обновлено!"
-
-#: merge-recursive.c:3405
+#: merge-recursive.c:3445
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "�бой �ли�ни� деревьев «%s» и «%s»"
 
-#: merge-recursive.c:3504
+#: merge-recursive.c:3550
 msgid "Merging:"
 msgstr "Сли�ние:"
 
-#: merge-recursive.c:3517
+#: merge-recursive.c:3563
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
@@ -3796,154 +4648,201 @@ msgstr[1] "найдено %u общих предка:"
 msgstr[2] "найдено %u общих предков:"
 msgstr[3] "найдено %u общих предков:"
 
-#: merge-recursive.c:3556
+#: merge-recursive.c:3613
 msgid "merge returned no commit"
 msgstr "�ли�ние не вернуло коммит"
 
-#: merge-recursive.c:3622
+#: merge-recursive.c:3769
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�е удало�ь разобрать объект «%s»"
 
-#: merge-recursive.c:3638 builtin/merge.c:702 builtin/merge.c:873
+#: merge-recursive.c:3787 builtin/merge.c:711 builtin/merge.c:895
 msgid "Unable to write index."
 msgstr "�е удает�� запи�ать индек�."
 
-#: midx.c:66
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "�бой чтени� к�ша"
+
+#: 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
+msgid "unable to write new index file"
+msgstr "не удало�ь запи�ать новый файл индек�а"
+
+#: midx.c:80
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr ""
 
-#: midx.c:82
+#: midx.c:96
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr ""
 
-#: midx.c:87
+#: midx.c:101
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr ""
 
-#: midx.c:92
+#: midx.c:106
 #, c-format
-msgid "hash version %u does not match"
-msgstr "вер�и� хеш-�уммы %u не �оответ�вует"
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr ""
 
-#: midx.c:106
+#: midx.c:123
 msgid "invalid chunk offset (too large)"
 msgstr ""
 
-#: midx.c:130
+#: midx.c:147
 msgid "terminating multi-pack-index chunk id appears earlier than expected"
 msgstr ""
 
-#: midx.c:143
+#: midx.c:160
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr ""
 
-#: midx.c:145
+#: midx.c:162
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr ""
 
-#: midx.c:147
+#: midx.c:164
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr ""
 
-#: midx.c:149
+#: midx.c:166
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr ""
 
-#: midx.c:163
+#: midx.c:180
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr ""
 
-#: midx.c:208
+#: midx.c:223
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr ""
 
-#: midx.c:258
+#: midx.c:273
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr ""
 
-#: midx.c:286
-msgid "error preparing packfile from multi-pack-index"
-msgstr ""
-
-#: midx.c:457
+#: midx.c:480
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr ""
 
-#: midx.c:463
+#: midx.c:486
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr ""
 
-#: midx.c:557
+#: midx.c:546
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr ""
 
-#: midx.c:993
+#: midx.c:846
+msgid "Adding packfiles to multi-pack-index"
+msgstr ""
+
+#: midx.c:879
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr ""
+
+#: midx.c:931
+msgid "no pack files to index."
+msgstr ""
+
+#: midx.c:982
+msgid "Writing chunks to multi-pack-index"
+msgstr ""
+
+#: midx.c:1060
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr ""
 
-#: midx.c:1048
+#: midx.c:1116
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr ""
+
+#: midx.c:1124
 msgid "Looking for referenced packfiles"
 msgstr ""
 
-#: midx.c:1063
+#: midx.c:1139
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr ""
 
-#: midx.c:1067
-msgid "Verifying OID order in MIDX"
+#: midx.c:1144
+msgid "the midx contains no oid"
 msgstr ""
 
-#: midx.c:1076
+#: midx.c:1153
+msgid "Verifying OID order in multi-pack-index"
+msgstr ""
+
+#: midx.c:1162
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr ""
 
-#: midx.c:1095
+#: midx.c:1182
 msgid "Sorting objects by packfile"
 msgstr ""
 
-#: midx.c:1101
+#: midx.c:1189
 msgid "Verifying object offsets"
 msgstr ""
 
-#: midx.c:1117
+#: midx.c:1205
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr ""
 
-#: midx.c:1123
+#: midx.c:1211
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr ""
 
-#: midx.c:1132
+#: midx.c:1220
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr ""
 
-#: name-hash.c:531
+#: midx.c:1245
+msgid "Counting referenced objects"
+msgstr ""
+
+#: midx.c:1255
+msgid "Finding and deleting unreferenced packfiles"
+msgstr ""
+
+#: midx.c:1446
+msgid "could not start pack-objects"
+msgstr ""
+
+#: midx.c:1466
+msgid "could not finish pack-objects"
+msgstr ""
+
+#: name-hash.c:537
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr ""
 
-#: name-hash.c:553
+#: name-hash.c:559
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr ""
 
-#: name-hash.c:559
+#: name-hash.c:565
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr ""
@@ -3982,45 +4881,70 @@ msgstr "Отказ в перезапи�и заметок в %s (за преде
 msgid "Bad %s value: '%s'"
 msgstr "�еправильное значение переменной %s: «%s»"
 
-#: object.c:54
+#: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
 msgstr ""
 
-#: object.c:174
+#: object.c:173
 #, c-format
 msgid "object %s is a %s, not a %s"
 msgstr ""
 
-#: object.c:234
+#: object.c:233
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr ""
 
-#: object.c:247
+#: object.c:246
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "не удало�ь разобрать объект: %s"
 
-#: object.c:267 object.c:278
+#: object.c:266 object.c:278
 #, c-format
 msgid "hash mismatch %s"
-msgstr "не�оответ�твие хеш-�уммы %s"
+msgstr "не�оответ�твие х�ш-кода %s"
+
+#: pack-bitmap.c:815 pack-bitmap.c:821 builtin/pack-objects.c:2216
+#, c-format
+msgid "unable to get size of %s"
+msgstr "не удало�ь получить размер %s"
 
-#: packfile.c:617
+#: packfile.c:615
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "�двиг до конца файла пакета (возможно, повреждён файл .idx?)"
 
-#: packfile.c:1868
+#: packfile.c:1907
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "�двиг до начала индек�а пакета дл� %s (повреждён индек�?)"
 
-#: packfile.c:1872
+#: packfile.c:1911
 #, 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
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr ""
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr ""
+
+#: parse-options-cb.c:54
+#, c-format
+msgid "option `%s' expects \"always\", \"auto\", or \"never\""
+msgstr ""
+
+#: parse-options-cb.c:132 parse-options-cb.c:149
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "�еправильное им� объекта «%s»"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4036,7 +4960,7 @@ msgstr ""
 msgid "%s : incompatible with something else"
 msgstr ""
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr ""
@@ -4046,162 +4970,147 @@ msgstr ""
 msgid "%s isn't available"
 msgstr ""
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, c-format
 msgid "%s expects a non-negative integer value with an optional k/m/g suffix"
 msgstr ""
 
-#: parse-options.c:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr ""
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr ""
+
+#: parse-options.c:666 parse-options.c:971
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
+msgid "alias of --%s"
 msgstr ""
 
-#: parse-options.c:859
+#: parse-options.c:862
 #, c-format
 msgid "unknown option `%s'"
 msgstr ""
 
-#: parse-options.c:861
+#: parse-options.c:864
 #, c-format
 msgid "unknown switch `%c'"
 msgstr ""
 
-#: parse-options.c:863
+#: parse-options.c:866
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr ""
 
-#: parse-options.c:887
+#: parse-options.c:890
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:906
+#: parse-options.c:909
 #, c-format
 msgid "usage: %s"
 msgstr "и�пользование: %s"
 
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
-#: parse-options.c:912
+#: parse-options.c:915
 #, c-format
 msgid "   or: %s"
 msgstr "          или: %s"
 
-#: parse-options.c:915
+#: parse-options.c:918
 #, c-format
 msgid "    %s"
 msgstr "            %s"
 
-#: parse-options.c:954
+#: parse-options.c:957
 msgid "-NUM"
 msgstr "-КОЛИЧЕСТВО"
 
-#: parse-options.c:968
-#, c-format
-msgid "alias of --%s"
-msgstr ""
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr ""
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr ""
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "�еправильное им� объекта «%s»"
-
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�е удало�ь предо�тавить до�туп к %s на запи�ь"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Управл�ющий �имвол «\\» не разрешен как по�ледний �имвол в значении attr"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Разрешен только один �пецификатор «attr:»."
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "�пецификатор attr не должен быть пу�той"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "недопу�тимое им� атрибута %s"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "глобальные опции �пецификаторов пути «glob» и «noglob» нельз� и�пользовать одновременно"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr "глобальна� опци� �пецификатора пути «literal» не �овме�тима � другими глобальными �пецификаторами до�тупа"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
-msgstr "неправильный параметр дл� магиче�кого �лова «prefix» в �пецификаторе пути "
+msgstr "неправильный параметр дл� магиче�кого �лова «prefix» в �пецификаторе пути"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "неправильное магиче�кое �лово «%.*s» в �пецификаторе пути «%s»"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "Пропущено «)» в конце магиче�кого �лова �пецификатора пути «%s»"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "�ереализованное магиче�кое �лово «%c» �пецификатора пути «%s»"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: «literal» и «glob» не �овме�тимы"
 
-#: pathspec.c:440
+#: pathspec.c:445
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: «%s» вне репозитори�"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr ""
 
-#: pathspec.c:514
+#: pathspec.c:521
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "«%s» (мнемоника: «%c»)"
 
-#: pathspec.c:524
+#: pathspec.c:531
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s: магиче�кие �лова в �пецификаторе пути не поддерживают�� командой: %s"
 
-#: pathspec.c:591
+#: pathspec.c:598
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "�пецификатор пути «%s» находит�� за �имволиче�кой ��ылкой"
 
+#: pathspec.c:643
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr ""
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr ""
@@ -4211,44 +5120,48 @@ msgid "unable to write delim packet"
 msgstr ""
 
 #: pkt-line.c:106
+msgid "unable to write stateless separator packet"
+msgstr ""
+
+#: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr ""
 
-#: pkt-line.c:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:239
 msgid "protocol error: impossibly long line"
 msgstr ""
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr ""
 
-#: pkt-line.c:196
+#: pkt-line.c:203
 msgid "packet write failed - data exceeds max packet size"
 msgstr ""
 
-#: pkt-line.c:203 pkt-line.c:210
+#: pkt-line.c:210 pkt-line.c:217
 msgid "packet write failed"
 msgstr ""
 
-#: pkt-line.c:295
+#: pkt-line.c:302
 msgid "read error"
 msgstr ""
 
-#: pkt-line.c:303
+#: pkt-line.c:310
 msgid "the remote end hung up unexpectedly"
 msgstr ""
 
-#: pkt-line.c:331
+#: pkt-line.c:338
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr ""
 
-#: pkt-line.c:341 pkt-line.c:346
+#: pkt-line.c:352 pkt-line.c:357
 #, c-format
 msgid "protocol error: bad line length %d"
 msgstr ""
 
-#: pkt-line.c:362
+#: pkt-line.c:373 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "ошибка внешнего репозитори�: %s"
@@ -4262,233 +5175,272 @@ msgstr ""
 msgid "unable to create threaded lstat: %s"
 msgstr ""
 
-#: pretty.c:966
+#: pretty.c:983
 msgid "unable to parse --pretty format"
 msgstr "не удало�ь разобрать формат дл� --pretty"
 
-#: range-diff.c:56
+#: promisor-remote.c:30
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c:35 promisor-remote.c:37
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c:41
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr ""
+
+#: promisor-remote.c:53
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr ""
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Удаление дублирующих�� объектов"
+
+#: range-diff.c:77
 msgid "could not start `log`"
 msgstr ""
 
-#: range-diff.c:59
+#: range-diff.c:79
 msgid "could not read `log` output"
 msgstr ""
 
-#: range-diff.c:74 sequencer.c:4897
+#: range-diff.c:98 sequencer.c:5310
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "не удало�ь разобрать коммит «%s»"
 
-#: range-diff.c:224
+#: range-diff.c:112
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+
+#: range-diff.c:137
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr ""
+
+#: range-diff.c:299
 msgid "failed to generate diff"
 msgstr ""
 
-#: range-diff.c:455 range-diff.c:457
+#: range-diff.c:532 range-diff.c:534
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr ""
 
-#: read-cache.c:680
+#: read-cache.c:682
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr ""
 
-#: read-cache.c:696
+#: read-cache.c:698
 msgid "cannot create an empty blob in the object database"
 msgstr ""
 
-#: read-cache.c:718
+#: read-cache.c:720
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr ""
 
-#: read-cache.c:723
+#: read-cache.c:725
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr ""
 
-#: read-cache.c:775
+#: read-cache.c:777
 #, c-format
 msgid "unable to index file '%s'"
 msgstr ""
 
-#: read-cache.c:794
+#: read-cache.c:796
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr ""
 
-#: read-cache.c:805
+#: read-cache.c:807
 #, c-format
 msgid "unable to stat '%s'"
 msgstr ""
 
-#: read-cache.c:1314
+#: read-cache.c:1318
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr ""
 
-#: read-cache.c:1499
+#: read-cache.c:1524
 msgid "Refresh index"
 msgstr ""
 
-#: read-cache.c:1613
+#: read-cache.c:1639
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
 "Using version %i"
 msgstr "index.version указан, но значение недей�твительное.\nИ�пользую вер�ию %i"
 
-#: read-cache.c:1623
+#: read-cache.c:1649
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
 "Using version %i"
 msgstr "GIT_INDEX_VERSION указан, но значение недей�твительное.\nИ�пользую вер�ию %i"
 
-#: read-cache.c:1679
+#: read-cache.c:1705
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr ""
 
-#: read-cache.c:1682
+#: read-cache.c:1708
 #, c-format
 msgid "bad index version %d"
 msgstr ""
 
-#: read-cache.c:1691
+#: read-cache.c:1717
 msgid "bad index file sha1 signature"
 msgstr ""
 
-#: read-cache.c:1721
+#: read-cache.c:1747
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr ""
 
-#: read-cache.c:1723
+#: read-cache.c:1749
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr ""
 
-#: read-cache.c:1760
+#: read-cache.c:1786
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr ""
 
-#: read-cache.c:1776
+#: read-cache.c:1802
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr ""
 
-#: read-cache.c:1833
+#: read-cache.c:1859
 msgid "unordered stage entries in index"
 msgstr ""
 
-#: read-cache.c:1836
+#: read-cache.c:1862
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr ""
 
-#: read-cache.c:1839
+#: read-cache.c:1865
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr ""
 
-#: read-cache.c:1946 read-cache.c:2234 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:358
-#: builtin/checkout.c:672 builtin/checkout.c:1060 builtin/clean.c:955
-#: builtin/commit.c:344 builtin/diff-tree.c:120 builtin/grep.c:498
-#: builtin/mv.c:145 builtin/reset.c:245 builtin/rm.c:271
-#: builtin/submodule--helper.c:330
+#: 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
 msgid "index file corrupt"
 msgstr "файл индек�а поврежден"
 
-#: read-cache.c:2087
+#: read-cache.c:2115
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2100
+#: read-cache.c:2128
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr ""
 
-#: read-cache.c:2133
+#: read-cache.c:2161
 #, c-format
 msgid "%s: index file open failed"
 msgstr ""
 
-#: read-cache.c:2137
+#: read-cache.c:2165
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr ""
 
-#: read-cache.c:2141
+#: read-cache.c:2169
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr ""
 
-#: read-cache.c:2145
+#: read-cache.c:2173
 #, c-format
 msgid "%s: unable to map index file"
 msgstr ""
 
-#: read-cache.c:2187
+#: read-cache.c:2215
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2214
+#: read-cache.c:2242
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr ""
 
-#: read-cache.c:2246
+#: read-cache.c:2274
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr ""
 
-#: read-cache.c:2293
+#: read-cache.c:2321
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr ""
 
-#: read-cache.c:2989 wrapper.c:658 builtin/merge.c:1117
+#: read-cache.c:3017 strbuf.c:1171 wrapper.c:633 builtin/merge.c:1140
 #, c-format
 msgid "could not close '%s'"
 msgstr "не удало�ь закрыть «%s»"
 
-#: read-cache.c:3092 sequencer.c:2354 sequencer.c:3807
+#: read-cache.c:3120 sequencer.c:2479 sequencer.c:4231
 #, c-format
 msgid "could not stat '%s'"
 msgstr "не удало�ь выполнить stat дл� «%s»"
 
-#: read-cache.c:3105
+#: read-cache.c:3133
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "не удало�ь открыть каталог git: %s"
 
-#: read-cache.c:3117
+#: read-cache.c:3145
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "не удало�ь от�оединить: %s"
 
-#: read-cache.c:3142
+#: read-cache.c:3170
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr ""
 
-#: read-cache.c:3291
+#: read-cache.c:3319
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr ""
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr "Вы можете и�править �то � помощью «git rebase --edit-todo», а потом запу�тив «git rebase --continue».\nИли вы можете прервать проце�� перемещени�, выполнив «git rebase --abort»\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr "нера�познанна� на�тройка %s дл� опции rebase.missingCommitsCheck. Игнорирую."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4510,7 +5462,7 @@ msgid ""
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr "\nКоманды:\np, pick <коммит> = и�пользовать коммит\nr, reword <коммит> = и�пользовать коммит, но изменить �ообщение коммита\ne, edit <коммит> = и�пользовать коммит, но о�тановить�� дл� и�правлени�\ns, squash <коммит> = и�пользовать коммит, но объединить � предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропу�тить �ообщение коммита\nx, exec <команда> = выполнить команду (о�таток �троки) � помощью командной оболочки\nb, break = о�тановить�� зде�ь (продолжить � помощью «git rebase --continue»)\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать им� текущему HEAD\nt, reset <метка> = �бро�ить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <�трока>]\n. �оздать �ли�ние и�пользу� �ообщение коммита оригинального\n. �ли�ни� (или и�пользовать указанную �троку, е�ли оригинальное\n. �ли�ние не указано). И�пользуйте -c <коммит> чтобы изменить\n. �ообщение коммита.\n\nЭти �троки можно перемещать; они будут выполнены �верху вниз.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:63
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
@@ -4519,19 +5471,19 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:173
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:218
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
 msgstr "\n�е удал�йте �троки. И�пользуйте «drop», чтобы �вно удалить коммит.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:177
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
 msgstr "\nЕ�ли вы удалите �троку зде�ь, то УК�З���ЫЙ КОММИТ БУДЕТ УТЕРЯ�.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:816
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4540,36 +5492,33 @@ msgid ""
 "\n"
 msgstr "\nВы �ейча� редактируете файл �о �пи�ком дел дл� интерактивного перемещени�.\nДл� продолжени� перемещени�, по�ле редактировани� файла запу�тите:\n    git rebase --continue\n\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:893
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
 "\n"
 msgstr "\n�о е�ли вы удалите в�е, то проце�� перемещени� будет будет прерван.\n\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:900
-msgid "Note that empty commits are commented out"
-msgstr "Заметьте, что пу�тые коммиты закомментированны"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3339
-#: sequencer.c:3365 sequencer.c:4996 builtin/fsck.c:356 builtin/rebase.c:235
+#: 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
 #, c-format
 msgid "could not write '%s'"
 msgstr "не удало�ь запи�ать «%s»"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:116 builtin/rebase.c:202 builtin/rebase.c:228
+#: builtin/rebase.c:252
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr ""
+msgid "could not write '%s'."
+msgstr "не удало�ь запи�ать «%s»."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
 "Dropped commits (newer to older):\n"
 msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к �тарым):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4579,430 +5528,410 @@ msgid ""
 "\n"
 msgstr "Чтобы избежать �того �ообщени�, и�пользуйте «drop» чтобы �вно удалить коммит.\n\nИ�пользуйте опцию «git config rebase.missingCommitsCheck» дл� изменени� количе�тва предупреждений.\nВозможные значени�: ignore, warn, error.\n\n"
 
-#: refs.c:192
+#: 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
 #, c-format
-msgid "%s does not point to a valid object!"
-msgstr ""
-
-#: refs.c:597
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr ""
-
-#: refs.c:599 ref-filter.c:1982
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "игнорирую неправильную ��ылку %s"
-
-#: refs.c:734
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "не удало�ь открыть «%s» дл� запи�и: %s"
-
-#: refs.c:744 refs.c:795
-#, c-format
-msgid "could not read ref '%s'"
-msgstr ""
-
-#: refs.c:750
-#, c-format
-msgid "ref '%s' already exists"
-msgstr ""
-
-#: refs.c:755
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr ""
-
-#: refs.c:763 sequencer.c:400 sequencer.c:2679 sequencer.c:2805
-#: sequencer.c:2819 sequencer.c:3076 sequencer.c:4913 wrapper.c:656
-#, c-format
-msgid "could not write to '%s'"
-msgstr "не удало�ь запи�ать в «%s»"
-
-#: refs.c:790 wrapper.c:225 wrapper.c:395 builtin/am.c:715
-#: builtin/rebase.c:993
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "не удало�ь открыть «%s» дл� запи�и"
-
-#: refs.c:797
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr ""
-
-#: refs.c:928
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr ""
-
-#: refs.c:934
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr ""
-
-#: refs.c:993
-#, c-format
-msgid "log for %s is empty"
-msgstr ""
-
-#: refs.c:1085
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr ""
-
-#: refs.c:1161
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr ""
-
-#: refs.c:1942
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr ""
-
-#: refs.c:1974
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "обновление ��ылок запрещено в изолированном окружении"
-
-#: refs.c:2070 refs.c:2100
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr ""
-
-#: refs.c:2076 refs.c:2111
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr ""
-
-#: refs/files-backend.c:1234
-#, c-format
-msgid "could not remove reference %s"
-msgstr "не удало�ь удалить ��ылки %s"
-
-#: refs/files-backend.c:1248 refs/packed-backend.c:1532
-#: refs/packed-backend.c:1542
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "не удало�ь удалить ��ылку %s: %s"
-
-#: refs/files-backend.c:1251 refs/packed-backend.c:1545
-#, c-format
-msgid "could not delete references: %s"
-msgstr "не удало�ь удалить ��ылки: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr ""
+msgid "could not read '%s'."
+msgstr "не удало�ь прочитать «%s»."
 
-#: ref-filter.c:39 wt-status.c:1909
+#: ref-filter.c:42 wt-status.c:1973
 msgid "gone"
 msgstr "и�чез"
 
-#: ref-filter.c:40
+#: ref-filter.c:43
 #, c-format
 msgid "ahead %d"
 msgstr "впереди %d"
 
-#: ref-filter.c:41
+#: ref-filter.c:44
 #, c-format
 msgid "behind %d"
 msgstr "позади %d"
 
-#: ref-filter.c:42
+#: ref-filter.c:45
 #, c-format
 msgid "ahead %d, behind %d"
 msgstr "впереди %d, позади %d"
 
-#: ref-filter.c:138
+#: ref-filter.c:169
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "ожидаемый формат: %%(color:<color>)"
 
-#: ref-filter.c:140
+#: ref-filter.c:171
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "неопознанный цвет: %%(color:%s)"
 
-#: ref-filter.c:162
+#: ref-filter.c:193
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Ожидает�� целочи�ленное значение refname:lstrip=%s"
 
-#: ref-filter.c:166
+#: ref-filter.c:197
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Ожидает�� целочи�ленное значение refname:rstrip=%s"
 
-#: ref-filter.c:168
+#: ref-filter.c:199
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "неопознанный аргумент %%(%s): %s"
 
-#: ref-filter.c:223
+#: ref-filter.c:254
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:245
+#: ref-filter.c:276
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr ""
 
-#: ref-filter.c:253
+#: ref-filter.c:284
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr ""
 
-#: ref-filter.c:265
+#: ref-filter.c:296
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "параметр %%(body) не принимает аргументы"
 
-#: ref-filter.c:274
+#: ref-filter.c:309
 #, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "параметр %%(subject) не принимает аргументы"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr ""
 
-#: ref-filter.c:296
+#: ref-filter.c:330
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "неизве�тный аргумент дл� %%(trailers): %s"
 
-#: ref-filter.c:325
+#: ref-filter.c:363
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "положительное значение ожидает contents:lines=%s"
 
-#: ref-filter.c:327
+#: ref-filter.c:365
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "неопознанный аргумент %%(contents): %s"
 
-#: ref-filter.c:342
+#: ref-filter.c:380
 #, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "ожидает�� положительное значение objectname:short=%s"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr ""
 
-#: ref-filter.c:346
+#: ref-filter.c:384
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "неопознанный аргумент %%(objectname): %s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr ""
 
-#: ref-filter.c:376
+#: ref-filter.c:398
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr ""
+
+#: ref-filter.c:428
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "ожидаемый формат: %%(align:<width>,<position>)"
 
-#: ref-filter.c:388
+#: ref-filter.c:440
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "неопознанна� позици�:%s"
 
-#: ref-filter.c:395
+#: ref-filter.c:447
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "неопознанна� ширина:%s"
 
-#: ref-filter.c:404
+#: ref-filter.c:456
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "неопознанный аргумент %%(align): %s"
 
-#: ref-filter.c:412
+#: ref-filter.c:464
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "ожидает�� положительна� ширина � указанием ча�тицы %%(align)"
 
-#: ref-filter.c:430
+#: ref-filter.c:482
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "неопознанный аргумент %%(if): %s"
 
-#: ref-filter.c:531
+#: ref-filter.c:584
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "неправильное им� пол�: %.*s"
 
-#: ref-filter.c:558
+#: ref-filter.c:611
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "неизве�тное им� пол�: %.*s"
 
-#: ref-filter.c:562
+#: ref-filter.c:615
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
 msgstr ""
 
-#: ref-filter.c:686
+#: ref-filter.c:739
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "формат: ча�тица %%(if) и�пользована без ча�тицы %%(then)"
 
-#: ref-filter.c:749
+#: ref-filter.c:802
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "формат: ча�тица %%(then) и�пользована без ча�тицы %%(if)"
 
-#: ref-filter.c:751
+#: ref-filter.c:804
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "формат: ча�тица %%(then) и�пользована более одного раза"
 
-#: ref-filter.c:753
+#: ref-filter.c:806
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "формат: ча�тица %%(then) и�пользована по�ле %%(else)"
 
-#: ref-filter.c:781
+#: ref-filter.c:834
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "формат: ча�тица %%(else) и�пользована без ча�тицы %%(if)"
 
-#: ref-filter.c:783
+#: ref-filter.c:836
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "формат: ча�тица %%(else) и�пользована без ча�тицы %%(then)"
 
-#: ref-filter.c:785
+#: ref-filter.c:838
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "формат: ча�тица %%(else) и�пользована более одного раза"
 
-#: ref-filter.c:800
+#: ref-filter.c:853
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "формат: ча�тица %%(end) и�пользована без �оответ�твующей ча�тицы"
 
-#: ref-filter.c:857
+#: ref-filter.c:910
 #, c-format
 msgid "malformed format string %s"
 msgstr "неправильна� �трока формата %s"
 
-#: ref-filter.c:1453
-#, c-format
-msgid "(no branch, rebasing %s)"
-msgstr "(нет ветки, перемещение %s)"
-
-#: ref-filter.c:1456
-#, c-format
-msgid "(no branch, rebasing detached HEAD %s)"
-msgstr "(нет ветки перемещение отделённого HEAD %s)"
-
-#: ref-filter.c:1459
+#: ref-filter.c:1549
 #, c-format
-msgid "(no branch, bisect started on %s)"
-msgstr "(нет ветки, двоичный пои�к начат на %s)"
+msgid "no branch, rebasing %s"
+msgstr ""
 
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached at " in wt-status.c
-#: ref-filter.c:1467
+#: ref-filter.c:1552
 #, c-format
-msgid "(HEAD detached at %s)"
-msgstr "(HEAD отделён на %s)"
+msgid "no branch, rebasing detached HEAD %s"
+msgstr ""
 
-#. TRANSLATORS: make sure this matches "HEAD
-#. detached from " in wt-status.c
-#: ref-filter.c:1474
+#: ref-filter.c:1555
 #, c-format
-msgid "(HEAD detached from %s)"
-msgstr "(HEAD отделён начина� � %s)"
+msgid "no branch, bisect started on %s"
+msgstr ""
 
-#: ref-filter.c:1478
-msgid "(no branch)"
-msgstr "(нет ветки)"
+#: ref-filter.c:1565
+msgid "no branch"
+msgstr ""
 
-#: ref-filter.c:1512 ref-filter.c:1669
+#: ref-filter.c:1599 ref-filter.c:1808
 #, c-format
 msgid "missing object %s for %s"
 msgstr "не найден объект %s дл� %s"
 
-#: ref-filter.c:1522
+#: ref-filter.c:1609
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "�бой при выполнении parse_object_buffer на %s дл� %s"
 
-#: ref-filter.c:1888
+#: ref-filter.c:2062
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "Повреждённый объект «%s»"
 
-#: ref-filter.c:1977
+#: ref-filter.c:2151
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "игнорирую ��ылку � неправильным именем %s"
 
-#: ref-filter.c:2263
+#: ref-filter.c:2156 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "игнорирую неправильную ��ылку %s"
+
+#: ref-filter.c:2472
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "format: пропущена ча�тица %%(end)"
 
-#: ref-filter.c:2363
+#: ref-filter.c:2571
+#, c-format
+msgid "malformed object name %s"
+msgstr "неправильное им� объекта %s"
+
+#: ref-filter.c:2576
 #, c-format
-msgid "option `%s' is incompatible with --merged"
+msgid "option `%s' must point to a commit"
 msgstr ""
 
-#: ref-filter.c:2366
+#: refs.c:264
 #, c-format
-msgid "option `%s' is incompatible with --no-merged"
+msgid "%s does not point to a valid object!"
 msgstr ""
 
-#: ref-filter.c:2376
+#: refs.c:566
 #, c-format
-msgid "malformed object name %s"
-msgstr "неправильное им� объекта %s"
+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 ""
 
-#: ref-filter.c:2381
+#: refs.c:588
 #, c-format
-msgid "option `%s' must point to a commit"
+msgid "could not retrieve `%s`"
+msgstr ""
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr ""
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr ""
+
+#: refs.c:911
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr ""
+
+#: refs.c:917
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr ""
+
+#: refs.c:976
+#, c-format
+msgid "log for %s is empty"
+msgstr ""
+
+#: refs.c:1068
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr ""
+
+#: refs.c:1139
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr ""
+
+#: refs.c:1963
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
 msgstr ""
 
-#: remote.c:363
+#: refs.c:2043
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "обновление ��ылок запрещено в изолированном окружении"
+
+#: refs.c:2054
+msgid "ref updates aborted by hook"
+msgstr ""
+
+#: refs.c:2154 refs.c:2184
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr ""
+
+#: refs.c:2160 refs.c:2195
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr ""
+
+#: refs/files-backend.c:1228
+#, 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
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "не удало�ь удалить ��ылку %s: %s"
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr "не удало�ь удалить ��ылки: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr ""
+
+#: remote.c:351
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr ""
 
-#: remote.c:410
+#: remote.c:399
 msgid "more than one receivepack given, using the first"
 msgstr ""
 
-#: remote.c:418
+#: remote.c:407
 msgid "more than one uploadpack given, using the first"
 msgstr ""
 
-#: remote.c:608
+#: remote.c:590
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�ельз� извлечь одновременно %s и %s в %s"
 
-#: remote.c:612
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s обычно от�леживает %s, а не %s"
 
-#: remote.c:616
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s от�леживает и %s и %s"
 
-#: remote.c:684
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr ""
 
-#: remote.c:694
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr ""
 
-#: remote.c:1000
+#: remote.c:1073
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr ""
 
-#: remote.c:1005
+#: remote.c:1078
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr ""
@@ -5010,7 +5939,7 @@ msgstr ""
 #. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
-#: remote.c:1020
+#: remote.c:1093
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5024,7 +5953,7 @@ msgid ""
 "Neither worked, so we gave up. You must fully qualify the ref."
 msgstr ""
 
-#: remote.c:1040
+#: remote.c:1113
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5032,7 +5961,7 @@ msgid ""
 "'%s:refs/heads/%s'?"
 msgstr ""
 
-#: remote.c:1045
+#: remote.c:1118
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5040,7 +5969,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1050
+#: remote.c:1123
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5048,7 +5977,7 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1055
+#: remote.c:1128
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5056,103 +5985,103 @@ msgid ""
 "'%s:refs/tags/%s'?"
 msgstr ""
 
-#: remote.c:1091
+#: remote.c:1164
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr ""
 
-#: remote.c:1102
+#: remote.c:1175
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr ""
 
-#: remote.c:1114
+#: remote.c:1187
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr ""
 
-#: remote.c:1121
+#: remote.c:1194
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr ""
 
-#: remote.c:1624 remote.c:1725
+#: remote.c:1714 remote.c:1815
 msgid "HEAD does not point to a branch"
 msgstr "HEAD не указывает на ветку"
 
-#: remote.c:1633
+#: remote.c:1723
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "нет такой ветки: «%s»"
 
-#: remote.c:1636
+#: remote.c:1726
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "выше�то�ща� ветка не на�троена дл� ветки «%s»"
 
-#: remote.c:1642
+#: remote.c:1732
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "выше�то�ща� ветка «%s» не �охранена как от�леживаема� ветка"
 
-#: remote.c:1657
+#: remote.c:1747
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "назначение дл� отправки «%s» на внешнем �ервере «%s» не имеет локальной от�леживаемой ветки"
 
-#: remote.c:1669
+#: remote.c:1759
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "ветка «%s» не имеет внешнего �ервера дл� отправки"
 
-#: remote.c:1679
+#: remote.c:1769
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "�пецификаторы пути дл� отправки «%s» не включают в �еб� «%s»"
 
-#: remote.c:1692
+#: remote.c:1782
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "отправка не имеет точки назначени� (push.default вы�тавлен в «nothing»)"
 
-#: remote.c:1714
+#: remote.c:1804
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "не удало�ь выполнить «simple» отправку в един�твенную точку назначени�"
 
-#: remote.c:1840
+#: remote.c:1933
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr ""
 
-#: remote.c:1853
+#: remote.c:1946
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr ""
 
-#: remote.c:2016
+#: remote.c:2109
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "Ваша ветка базирует�� на «%s», но выше�то�щий репозиторий и�чез.\n"
 
-#: remote.c:2020
+#: remote.c:2113
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
-msgstr "(дл� и�правлени� запу�тите «git branch --unset-upstream»)\n"
+msgstr " (дл� и�правлени� запу�тите «git branch --unset-upstream»)\n"
 
-#: remote.c:2023
+#: remote.c:2116
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Ваша ветка обновлена в �оответ�твии � «%s».\n"
 
-#: remote.c:2027
+#: remote.c:2120
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Ваша ветка и «%s» указывают на разные коммиты.\n"
 
-#: remote.c:2030
+#: remote.c:2123
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (и�пользуйте «%s» дл� про�мотра опи�ани�)\n"
 
-#: remote.c:2034
+#: remote.c:2127
 #, 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"
@@ -5161,11 +6090,11 @@ msgstr[1] "Ваша ветка опережает «%s» на %d коммита.
 msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
 msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
 
-#: remote.c:2040
+#: remote.c:2133
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  (и�пользуйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
 
-#: remote.c:2043
+#: remote.c:2136
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5175,11 +6104,11 @@ msgstr[1] "Ваша ветка от�тает от «%s» на %d коммита
 msgstr[2] "Ваша ветка от�тает от «%s» на %d коммитов и может быть перемотана вперед.\n"
 msgstr[3] "Ваша ветка от�тает от «%s» на %d коммитов и может быть перемотана вперед.\n"
 
-#: remote.c:2051
+#: remote.c:2144
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  (и�пользуйте «git pull», чтобы обновить вашу локальную ветку)\n"
 
-#: remote.c:2054
+#: remote.c:2147
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5192,11 +6121,11 @@ msgstr[1] "Ваша ветка и «%s» разделили�ь\nи теперь
 msgstr[2] "Ваша ветка и «%s» разделили�ь\nи теперь имеют %d и %d разных коммитов в каждой �оответ�твенно.\n"
 msgstr[3] "Ваша ветка и «%s» разделили�ь\nи теперь имеют %d и %d разных коммитов в каждой �оответ�твенно.\n"
 
-#: remote.c:2064
+#: remote.c:2157
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  (и�пользуйте «git pull», чтобы �лить внешнюю ветку в вашу)\n"
 
-#: remote.c:2247
+#: remote.c:2349
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr ""
@@ -5211,7 +6140,7 @@ msgstr ""
 msgid "duplicate replace ref: %s"
 msgstr ""
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr ""
@@ -5274,8 +6203,8 @@ msgstr ""
 msgid "Recorded preimage for '%s'"
 msgstr ""
 
-#: rerere.c:881 submodule.c:2024 builtin/log.c:1750
-#: builtin/submodule--helper.c:1417 builtin/submodule--helper.c:1427
+#: rerere.c:881 submodule.c:2082 builtin/log.c:1992
+#: builtin/submodule--helper.c:1878 builtin/submodule--helper.c:1890
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "не удало�ь �оздать каталог «%s»"
@@ -5309,223 +6238,240 @@ msgstr ""
 msgid "unable to open rr-cache directory"
 msgstr ""
 
-#: revision.c:2476
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr ""
+
+#: reset.c:70 reset.c:76 sequencer.c:3460
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "не удало�ь найти дерево дл� %s"
+
+#: revision.c:2336
+msgid "--unpacked=<packfile> no longer supported"
+msgstr ""
+
+#: revision.c:2356
+#, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr ""
+
+#: revision.c:2694
 msgid "your current branch appears to be broken"
 msgstr "похоже, ваша текуща� ветка повреждена"
 
-#: revision.c:2479
+#: revision.c:2697
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "ваша текуща� ветка «%s» еще не �одержит ни одного коммита"
 
-#: revision.c:2679
-msgid "--first-parent is incompatible with --bisect"
-msgstr "опцию --first-parent нельз� и�пользовать одновременно � --bisect"
-
-#: revision.c:2683
+#: revision.c:2907
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr ""
 
-#: run-command.c:763
+#: run-command.c:764
 msgid "open /dev/null failed"
 msgstr "�бой открыти� /dev/null"
 
-#: run-command.c:1269
+#: run-command.c:1271
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr ""
 
-#: run-command.c:1333
+#: run-command.c:1335
 #, 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:141
+#: send-pack.c:146
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "неожиданный пу�той пакет при чтении �тату�а внешней ра�паковки"
 
-#: send-pack.c:143
+#: send-pack.c:148
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "не удало�ь разобрать �тату� внешней ра�паковки: %s"
 
-#: send-pack.c:145
+#: send-pack.c:150
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "�бой при внешней ра�паковке %s"
 
-#: send-pack.c:306
+#: send-pack.c:374
 msgid "failed to sign the push certificate"
 msgstr "�бой подпи�ани� �ертификата отправки"
 
-#: send-pack.c:420
+#: send-pack.c:467
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr ""
+
+#: send-pack.c:476
 msgid "the receiving end does not support --signed push"
 msgstr "принимающа� �торона не поддерживает отправку � опцией --signed"
 
-#: send-pack.c:422
+#: send-pack.c:478
 msgid ""
 "not sending a push certificate since the receiving end does not support "
 "--signed push"
 msgstr "не отправл�ем �ертификат дл� отправки, так как принимающа� �торона не поддерживает отправку � опцией --signed"
 
-#: send-pack.c:434
+#: send-pack.c:490
 msgid "the receiving end does not support --atomic push"
 msgstr "принимающа� �торона не поддерживает отправку � опцией --atomic"
 
-#: send-pack.c:439
+#: send-pack.c:495
 msgid "the receiving end does not support push options"
 msgstr "принимающа� �торона не поддерживает отправку � опци�ми"
 
-#: sequencer.c:187
+#: sequencer.c:195
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "неправильный режим очи�тки �ообщени� коммита «%s»"
 
-#: sequencer.c:292
+#: sequencer.c:323
 #, c-format
 msgid "could not delete '%s'"
 msgstr "не удало�ь удалить «%s»"
 
-#: sequencer.c:318
+#: sequencer.c:343 builtin/rebase.c:755 builtin/rebase.c:1596 builtin/rm.c:385
+#, c-format
+msgid "could not remove '%s'"
+msgstr "не удало�ь удалить «%s»"
+
+#: sequencer.c:353
 msgid "revert"
 msgstr "обратить изменени�"
 
-#: sequencer.c:320
+#: sequencer.c:355
 msgid "cherry-pick"
 msgstr "копировать коммит"
 
-#: sequencer.c:322
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:357
+msgid "rebase"
+msgstr ""
 
-#: sequencer.c:324
+#: sequencer.c:359
 #, c-format
 msgid "unknown action: %d"
 msgstr ""
 
-#: sequencer.c:382
+#: sequencer.c:418
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
 msgstr "по�ле разрешени� конфликтов, пометьте и�правленные пути\n� помощью «git add <пути>» или «git rm <пути>»"
 
-#: sequencer.c:385
+#: sequencer.c:421
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
 "and commit the result with 'git commit'"
 msgstr "по�ле разрешени� конфликтов, пометьте и�правленные пути\n� помощью «git add <пути>» или «git rm <пути>»\nи �делайте коммит � помощью «git commit»"
 
-#: sequencer.c:398 sequencer.c:2801
+#: sequencer.c:434 sequencer.c:3062
 #, c-format
 msgid "could not lock '%s'"
 msgstr "не удало�ь заблокировать «%s»"
 
-#: sequencer.c:405
+#: sequencer.c:436 sequencer.c:2861 sequencer.c:3066 sequencer.c:3080
+#: sequencer.c:3337 sequencer.c:5326 strbuf.c:1168 wrapper.c:631
+#, c-format
+msgid "could not write to '%s'"
+msgstr "не удало�ь запи�ать в «%s»"
+
+#: sequencer.c:441
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "не удало�ь запи�ать eol в «%s»"
 
-#: sequencer.c:410 sequencer.c:2684 sequencer.c:2807 sequencer.c:2821
-#: sequencer.c:3084
+#: sequencer.c:446 sequencer.c:2866 sequencer.c:3068 sequencer.c:3082
+#: sequencer.c:3345
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "не удало�ь завершить «%s»"
 
-#: sequencer.c:433 sequencer.c:978 sequencer.c:1652 sequencer.c:2704
-#: sequencer.c:3066 sequencer.c:3175 builtin/am.c:245 builtin/commit.c:760
-#: builtin/merge.c:1115 builtin/rebase.c:567
-#, c-format
-msgid "could not read '%s'"
-msgstr "не удало�ь прочитать «%s»"
-
-#: sequencer.c:459
+#: sequencer.c:485
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "ваши локальные изменени� будут перезапи�аны %s."
 
-#: sequencer.c:463
+#: sequencer.c:489
 msgid "commit your changes or stash them to proceed."
 msgstr "дл� продолжени� закоммитьте ваши изменени� или �пр�чьте их."
 
-#: sequencer.c:495
+#: sequencer.c:521
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: перемотка вперед"
 
-#: sequencer.c:534 builtin/tag.c:555
+#: sequencer.c:560 builtin/tag.c:566
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "�еправильное значение режима очи�тки %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
-#: sequencer.c:629
+#. "rebase".
+#: sequencer.c:670
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: �е удало�ь запи�ать файл индек�а"
 
-#: sequencer.c:646
+#: sequencer.c:687
 msgid "unable to update cache tree"
 msgstr "не удало�ь обновить дерево к�ша"
 
-#: sequencer.c:660
+#: sequencer.c:701
 msgid "could not resolve HEAD commit"
 msgstr "не удало�ь ра�познать HEAD коммит"
 
-#: sequencer.c:740
+#: sequencer.c:781
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr ""
 
-#: sequencer.c:751
+#: sequencer.c:792
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr ""
 
-#: sequencer.c:788 wrapper.c:227 wrapper.c:397 builtin/am.c:706
-#: builtin/am.c:798 builtin/merge.c:1112 builtin/rebase.c:1035
+#: 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
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "не удало�ь открыть «%s» дл� чтени�"
 
-#: sequencer.c:798
+#: sequencer.c:839
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr ""
 
-#: sequencer.c:803
+#: sequencer.c:844
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr ""
 
-#: sequencer.c:808
+#: sequencer.c:849
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr ""
 
-#: sequencer.c:812
+#: sequencer.c:853
 #, c-format
 msgid "unknown variable '%s'"
 msgstr ""
 
-#: sequencer.c:817
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr ""
 
-#: sequencer.c:819
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr ""
 
-#: sequencer.c:821
+#: sequencer.c:862
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr ""
 
-#: sequencer.c:881
-#, c-format
-msgid "invalid date format '%s' in '%s'"
-msgstr ""
-
-#: sequencer.c:898
+#: sequencer.c:927
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5542,15 +6488,11 @@ msgid ""
 "  git rebase --continue\n"
 msgstr "у ва� имеют�� проиндек�ированные изменени� в рабочем каталоге. Е�ли �ти изменени� должны быть объеденены � предыдущим коммитом, то запу�тите:\n\n  git commit --amend %s\n\nЕ�ли же они должны быть помещены в новый коммит, то запу�тите:\n\n  git commit %s\n\nВ любом �лучае, по�ле того как вы закончите, продолжить перемещение можно выполнив:\n\n  git rebase --continue\n"
 
-#: sequencer.c:992
-msgid "writing root commit"
-msgstr "запи�ь коневого коммита"
-
-#: sequencer.c:1213
+#: sequencer.c:1208
 msgid "'prepare-commit-msg' hook failed"
 msgstr "ошибка при вызове перехватчика «prepare-commit-msg»"
 
-#: sequencer.c:1220
+#: sequencer.c:1214
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5565,7 +6507,7 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr "Ваше им� или �лектронна� почта на�троены автоматиче�ки на о�новании вашего\nимени пользовател� и имени машины. Пожалуй�та, проверьте, что они \nопределены правильно.\nВы можете отключить �то уведомление у�тановив их напр�мую. Запу�тите �ледующую\nкоманду и �ледуйте ин�трукци�м вашего тек�тового редактора, дл�\nредактировани� вашего файла конфигурации:\n\n    git config --global --edit\n\nПо�ле �того, изменить автор�тво �той коммита можно будет � помощью команды:\n\n    git commit --amend --reset-author\n"
 
-#: sequencer.c:1233
+#: sequencer.c:1227
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -5579,305 +6521,354 @@ msgid ""
 "    git commit --amend --reset-author\n"
 msgstr "Ваше им� или �лектронна� почта на�троены автоматиче�ки на о�новании вашего\nимени пользовател� и имени машины. Пожалуй�та, проверьте, что они \nопределены правильно.\nВы можете отключить �то уведомление у�тановив их напр�мую:\n\n    git config --global user.name \"Ваше Им�\"\n    git config --global user.email you@example.com\n\nПо�ле �того, изменить автор�тво �той коммита можно будет � помощью команды:\n\n    git commit --amend --reset-author\n"
 
-#: sequencer.c:1275
+#: sequencer.c:1269
 msgid "couldn't look up newly created commit"
 msgstr "нельз� запро�ить ново�озданный коммит"
 
-#: sequencer.c:1277
+#: sequencer.c:1271
 msgid "could not parse newly created commit"
 msgstr "нельз� разобрать ново�озданный коммит"
 
-#: sequencer.c:1323
+#: sequencer.c:1317
 msgid "unable to resolve HEAD after creating commit"
 msgstr "не удало�ь найти HEAD по�ле �оздани� коммита"
 
-#: sequencer.c:1325
+#: sequencer.c:1319
 msgid "detached HEAD"
 msgstr "отделённый HEAD"
 
-#: sequencer.c:1329
+#: sequencer.c:1323
 msgid " (root-commit)"
 msgstr " (корневой коммит)"
 
-#: sequencer.c:1350
+#: sequencer.c:1344
 msgid "could not parse HEAD"
 msgstr "не удало�ь разобрать HEAD"
 
-#: sequencer.c:1352
+#: sequencer.c:1346
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s не �вл�ет�� коммитом!"
 
-#: sequencer.c:1356 builtin/commit.c:1551
+#: sequencer.c:1350 sequencer.c:1425 builtin/commit.c:1577
 msgid "could not parse HEAD commit"
 msgstr "не удало�ь разобрать HEAD коммит"
 
-#: sequencer.c:1408 sequencer.c:2001
+#: sequencer.c:1403 sequencer.c:2100
 msgid "unable to parse commit author"
 msgstr "не удало�ь разобрать автора коммита"
 
-#: sequencer.c:1418 builtin/am.c:1572 builtin/merge.c:688
+#: sequencer.c:1414 builtin/am.c:1566 builtin/merge.c:701
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree не удало�ь запи�ать дерево"
 
-#: sequencer.c:1435 sequencer.c:1496
+#: sequencer.c:1447 sequencer.c:1565
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "не удало�ь прочитать �ообщение коммита из «%s»"
 
-#: sequencer.c:1462 builtin/am.c:1594 builtin/commit.c:1650
-#: builtin/merge.c:882 builtin/merge.c:906
+#: sequencer.c:1476 sequencer.c:1508
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr ""
+
+#: sequencer.c:1482
+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
 msgid "failed to write commit object"
 msgstr "�бой запи�и объекта коммита"
 
-#: sequencer.c:1523
+#: sequencer.c:1548 sequencer.c:4283 t/helper/test-fast-rebase.c:198
+#, c-format
+msgid "could not update %s"
+msgstr "не удало�ь обновить %s"
+
+#: sequencer.c:1597
 #, c-format
 msgid "could not parse commit %s"
 msgstr "не удало�ь разобрать коммит %s"
 
-#: sequencer.c:1528
+#: sequencer.c:1602
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "не удало�ь разобрать родитель�кий коммит %s"
 
-#: sequencer.c:1602 sequencer.c:1712
+#: sequencer.c:1685 sequencer.c:1796
 #, c-format
 msgid "unknown command: %d"
 msgstr "неизве�тна� команда: %d"
 
-#: sequencer.c:1659 sequencer.c:1684
+#: sequencer.c:1743 sequencer.c:1768
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Это объединение %d коммитов."
 
-#: sequencer.c:1669
+#: sequencer.c:1753
 msgid "need a HEAD to fixup"
 msgstr "нужен HEAD дл� и�правлени�"
 
-#: sequencer.c:1671 sequencer.c:3111
+#: sequencer.c:1755 sequencer.c:3372
 msgid "could not read HEAD"
 msgstr "не удало�ь прочитать HEAD"
 
-#: sequencer.c:1673
+#: sequencer.c:1757
 msgid "could not read HEAD's commit message"
 msgstr "не удало�ь прочитать �ообщение коммита текущего HEAD"
 
-#: sequencer.c:1679
+#: sequencer.c:1763
 #, c-format
 msgid "cannot write '%s'"
 msgstr "не удало�ь запи�ать «%s»"
 
-#: sequencer.c:1686 git-rebase--preserve-merges.sh:441
+#: sequencer.c:1770 git-rebase--preserve-merges.sh:486
 msgid "This is the 1st commit message:"
 msgstr "Это 1-е �ообщение коммита:"
 
-#: sequencer.c:1694
+#: sequencer.c:1778
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "не удало�ь прочитать �ообщение коммита дл� %s"
 
-#: sequencer.c:1701
+#: sequencer.c:1785
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "Это �ообщение коммита номер #%d:"
 
-#: sequencer.c:1707
+#: sequencer.c:1791
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "Сообщение коммита номер #%d будет пропущено:"
 
-#: sequencer.c:1795
+#: sequencer.c:1879
 msgid "your index file is unmerged."
 msgstr "ваш индек� не �лит."
 
-#: sequencer.c:1802
+#: sequencer.c:1886
 msgid "cannot fixup root commit"
 msgstr "нельз� и�править корневой коммит"
 
-#: sequencer.c:1821
+#: sequencer.c:1905
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "коммит %s — �то коммит-�ли�ние, но опци� -m не указана."
 
-#: sequencer.c:1829 sequencer.c:1837
+#: sequencer.c:1913 sequencer.c:1921
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "у коммита %s нет предка %d"
 
-#: sequencer.c:1843
+#: sequencer.c:1927
 #, 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:1862
+#: sequencer.c:1946
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: не удало�ь разобрать родитель�кий коммит дл� %s"
 
-#: sequencer.c:1927
+#: sequencer.c:2011
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "не удало�ь переименовать «%s» в «%s»"
 
-#: sequencer.c:1982
+#: sequencer.c:2071
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "не удало�ь обратить изменени� коммита %s… %s"
 
-#: sequencer.c:1983
+#: sequencer.c:2072
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "не удало�ь применить коммит %s… %s"
 
-#: sequencer.c:2042
+#: sequencer.c:2092
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr ""
+
+#: sequencer.c:2150
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: �бой чтени� индек�а"
 
-#: sequencer.c:2049
+#: sequencer.c:2157
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: �бой обновлени� индек�а"
 
-#: sequencer.c:2118
+#: sequencer.c:2234
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "параметр %s не принимает аргументы: «%s»"
 
-#: sequencer.c:2127
+#: sequencer.c:2243
 #, c-format
 msgid "missing arguments for %s"
 msgstr "пропущены аргументы дл� %s"
 
-#: sequencer.c:2164
+#: sequencer.c:2274
 #, c-format
-msgid "could not parse '%.*s'"
+msgid "could not parse '%s'"
 msgstr ""
 
-#: sequencer.c:2226
+#: sequencer.c:2335
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "неправильна� �трока %d: %.*s"
 
-#: sequencer.c:2237
+#: sequencer.c:2346
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "нельз� выполнить «%s» без указани� предыдущего коммита"
 
-#: sequencer.c:2285 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "не удало�ь прочитать «%s»."
+#: sequencer.c:2432
+msgid "cancelling a cherry picking in progress"
+msgstr ""
+
+#: sequencer.c:2441
+msgid "cancelling a revert in progress"
+msgstr ""
 
-#: sequencer.c:2360
+#: sequencer.c:2485
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "пожалуй�та и�правьте �то � помощью «git rebase --edit-todo»."
 
-#: sequencer.c:2362
+#: sequencer.c:2487
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "непригодна� дл� и�пользовани� карта � ин�трукци�ми: «%s»"
 
-#: sequencer.c:2367
+#: sequencer.c:2492
 msgid "no commits parsed."
 msgstr "коммиты не разобраны."
 
-#: sequencer.c:2378
+#: sequencer.c:2503
 msgid "cannot cherry-pick during a revert."
 msgstr "нельз� �копировать коммит во врем� проце��а обращени� коммита."
 
-#: sequencer.c:2380
+#: sequencer.c:2505
 msgid "cannot revert during a cherry-pick."
 msgstr "нельз� обратить изменени� коммита во врем� копировани� коммита."
 
-#: sequencer.c:2462
+#: sequencer.c:2583
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "неправильное значение %s: %s"
 
-#: sequencer.c:2549
+#: sequencer.c:2690
 msgid "unusable squash-onto"
 msgstr "непригодный дл� и�пользовани� уплотнить-над"
 
-#: sequencer.c:2565
+#: sequencer.c:2710
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "и�порченна� карта � опци�ми: «%s»"
 
-#: sequencer.c:2648 sequencer.c:4227
+#: sequencer.c:2803 sequencer.c:4636
 msgid "empty commit set passed"
 msgstr "передан пу�той набор коммитов"
 
-#: sequencer.c:2656
-msgid "a cherry-pick or revert is already in progress"
-msgstr "копирование или обращение изменений коммита уже выполн�ют��"
+#: sequencer.c:2820
+msgid "revert is already in progress"
+msgstr ""
+
+#: sequencer.c:2822
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr ""
 
-#: sequencer.c:2657
-msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
-msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»"
+#: sequencer.c:2825
+msgid "cherry-pick is already in progress"
+msgstr ""
+
+#: sequencer.c:2827
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr ""
 
-#: sequencer.c:2660
+#: sequencer.c:2841
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "не удало�ь �оздать каталог дл� указател� �ледовани� коммитов «%s»"
 
-#: sequencer.c:2674
+#: sequencer.c:2856
 msgid "could not lock HEAD"
 msgstr "не удало�ь заблокировать HEAD"
 
-#: sequencer.c:2729 sequencer.c:3979
+#: sequencer.c:2916 sequencer.c:4371
 msgid "no cherry-pick or revert in progress"
 msgstr "копирование или обращение изменений коммита уже выполн�ют��"
 
-#: sequencer.c:2731
+#: sequencer.c:2918 sequencer.c:2929
 msgid "cannot resolve HEAD"
 msgstr "не удало�ь определить HEAD"
 
-#: sequencer.c:2733 sequencer.c:2768
+#: sequencer.c:2920 sequencer.c:2964
 msgid "cannot abort from a branch yet to be born"
 msgstr "нельз� отменить изменени� � ветки, котора� еще не �оздана"
 
-#: sequencer.c:2754 builtin/grep.c:732
+#: sequencer.c:2950 builtin/grep.c:756
 #, c-format
 msgid "cannot open '%s'"
 msgstr "не удало�ь открыть «%s»"
 
-#: sequencer.c:2756
+#: sequencer.c:2952
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "не удало�ь прочитать «%s»: %s"
 
-#: sequencer.c:2757
+#: sequencer.c:2953
 msgid "unexpected end of file"
 msgstr "неожиданный конец файла"
 
-#: sequencer.c:2763
+#: sequencer.c:2959
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "�охраненный файл � HEAD перед копированием коммита «%s» поврежден"
 
-#: sequencer.c:2774
+#: sequencer.c:2970
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "Похоже, что вы переме�тили HEAD. Перемотка не выполн�ет��, проверьте �вой указатель HEAD!"
 
-#: sequencer.c:2903 sequencer.c:3894
+#: sequencer.c:3011
+msgid "no revert in progress"
+msgstr ""
+
+#: sequencer.c:3020
+msgid "no cherry-pick in progress"
+msgstr ""
+
+#: sequencer.c:3030
+msgid "failed to skip the commit"
+msgstr ""
+
+#: sequencer.c:3037
+msgid "there is nothing to skip"
+msgstr ""
+
+#: sequencer.c:3040
 #, c-format
-msgid "could not update %s"
-msgstr "не удало�ь обновить %s"
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
 
-#: sequencer.c:2941 sequencer.c:3874
+#: sequencer.c:3202 sequencer.c:4263
 msgid "cannot read HEAD"
 msgstr "не удало�ь прочитать HEAD"
 
-#: sequencer.c:2958
+#: sequencer.c:3219
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr ""
 
-#: sequencer.c:2966
+#: sequencer.c:3227
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -5889,27 +6880,27 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:2976
+#: sequencer.c:3237
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr ""
 
-#: sequencer.c:2983
+#: sequencer.c:3244
 #, c-format
 msgid "Could not merge %.*s"
 msgstr ""
 
-#: sequencer.c:2997 sequencer.c:3001 builtin/difftool.c:633
+#: sequencer.c:3258 sequencer.c:3262 builtin/difftool.c:640
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "не удало�ь �копировать «%s» в «%s»"
 
-#: sequencer.c:3023 sequencer.c:3446 builtin/rebase.c:839
-#: builtin/rebase.c:1580 builtin/rebase.c:1940 builtin/rebase.c:1995
-msgid "could not read index"
-msgstr "не удало�ь прочитать индек�"
+#: sequencer.c:3274
+#, c-format
+msgid "Executing: %s\n"
+msgstr ""
 
-#: sequencer.c:3028
+#: sequencer.c:3289
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -5919,11 +6910,11 @@ msgid ""
 "\n"
 msgstr "ошибка выполнени�: %s\n%sВы можете и�править ошибку, а затем запу�тить\n\n  git rebase --continue\n\n"
 
-#: sequencer.c:3034
+#: sequencer.c:3295
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "и были �деланы изменени� в индек�е и/или в рабочем каталоге\n"
 
-#: sequencer.c:3040
+#: sequencer.c:3301
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -5934,108 +6925,120 @@ msgid ""
 "\n"
 msgstr "у�пешное выполнение: %s\nно о�тали�ь изменени� в индек�е и/или в рабочем каталоге\nСделайте коммит или �пр�чьте ваши изменени�, а затем выполните\n\n  git rebase --continue\n\n"
 
-#: sequencer.c:3101
+#: sequencer.c:3362
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr ""
 
-#: sequencer.c:3155
+#: sequencer.c:3416
 msgid "writing fake root commit"
 msgstr "запи�ь поддельного корневого коммита"
 
-#: sequencer.c:3160
+#: sequencer.c:3421
 msgid "writing squash-onto"
 msgstr "запить уплотнить-над"
 
-#: sequencer.c:3198 builtin/rebase.c:844 builtin/rebase.c:850
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "не удало�ь найти дерево дл� %s"
-
-#: sequencer.c:3216 builtin/rebase.c:863
-msgid "could not write index"
-msgstr "не удало�ь запи�ать индек�"
-
-#: sequencer.c:3243
+#: sequencer.c:3505
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "не удало�ь ра�познать «%s»"
 
-#: sequencer.c:3271
+#: sequencer.c:3538
 msgid "cannot merge without a current revision"
 msgstr "нельз� �лить без текущей редакции"
 
-#: sequencer.c:3293
+#: sequencer.c:3560
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr ""
 
-#: sequencer.c:3302
+#: sequencer.c:3569
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr ""
 
-#: sequencer.c:3314
+#: sequencer.c:3581
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr ""
 
-#: sequencer.c:3329
+#: sequencer.c:3597
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "не удало�ь получить �ообщение коммита дл� «%s»"
 
-#: sequencer.c:3478
+#: sequencer.c:3780
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "не удало�ь даже попытать�� �лить «%.*s»"
 
-#: sequencer.c:3494
+#: sequencer.c:3796
 msgid "merge: Unable to write new index file"
 msgstr "�ли�ние: �е удало�ь запи�ать файл индек�а"
 
-#: sequencer.c:3562 builtin/rebase.c:711
+#: sequencer.c:3870
+msgid "Cannot autostash"
+msgstr "�е удало�ь автоматиче�ки �пр�тать изменени�"
+
+#: sequencer.c:3873
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr ""
+
+#: sequencer.c:3879
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr ""
+
+#: sequencer.c:3882
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr ""
+
+#: sequencer.c:3886
+msgid "could not reset --hard"
+msgstr ""
+
+#: sequencer.c:3911
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Применены автоматиче�ки �пр�танные изменени�.\n"
 
-#: sequencer.c:3574
+#: sequencer.c:3923
 #, c-format
 msgid "cannot store %s"
 msgstr "не удало�ь �охранить %s"
 
-#: sequencer.c:3577 builtin/rebase.c:727
+#: sequencer.c:3926
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 "Применение автоматиче�ки �пр�танных изменений вызвало конфликты.\nВаши изменени� �пр�таны и в безопа�но�ти.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
+msgstr ""
 
-#: sequencer.c:3638
-#, c-format
-msgid "could not checkout %s"
+#: sequencer.c:3931
+msgid "Applying autostash resulted in conflicts."
 msgstr ""
 
-#: sequencer.c:3652
-#, c-format
-msgid "%s: not a valid OID"
+#: sequencer.c:3932
+msgid "Autostash exists; creating a new stash entry."
 msgstr ""
 
-#: sequencer.c:3657 git-rebase--preserve-merges.sh:724
+#: sequencer.c:4025 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
 msgstr "не удало�ь отделить HEAD"
 
-#: sequencer.c:3672
+#: sequencer.c:4040
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr ""
 
-#: sequencer.c:3674
+#: sequencer.c:4042
 #, c-format
 msgid "Stopped at %s\n"
 msgstr ""
 
-#: sequencer.c:3682
+#: sequencer.c:4050
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6048,120 +7051,124 @@ msgid ""
 "    git rebase --continue\n"
 msgstr ""
 
-#: sequencer.c:3759
+#: sequencer.c:4096
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr ""
+
+#: sequencer.c:4141
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "О�тановлено на %s …  %.*s\n"
 
-#: sequencer.c:3837
+#: sequencer.c:4212
 #, c-format
 msgid "unknown command %d"
 msgstr "неизве�тна� команда %d"
 
-#: sequencer.c:3882
+#: sequencer.c:4271
 msgid "could not read orig-head"
 msgstr "не удало�ь прочитать orig-head"
 
-#: sequencer.c:3887
+#: sequencer.c:4276
 msgid "could not read 'onto'"
 msgstr "не удало�ь прочитать «onto»"
 
-#: sequencer.c:3901
+#: sequencer.c:4290
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "не удало�ь обновить HEAD на %s"
 
-#: sequencer.c:3991
+#: sequencer.c:4350
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr ""
+
+#: sequencer.c:4383
 msgid "cannot rebase: You have unstaged changes."
 msgstr "не удало�ь выполнить перемещение коммитов: У ва� е�ть непроиндек�ированные изменени�."
 
-#: sequencer.c:4000
+#: sequencer.c:4392
 msgid "cannot amend non-existing commit"
 msgstr "не удало�ь и�править не�уще�твующий коммит"
 
-#: sequencer.c:4002
+#: sequencer.c:4394
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "недопу�тимый файл: «%s»"
 
-#: sequencer.c:4004
+#: sequencer.c:4396
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "недопу�тимое �одержимое: «%s»"
 
-#: sequencer.c:4007
+#: sequencer.c:4399
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
 "first and then run 'git rebase --continue' again."
 msgstr "\nУ ва� имеют�� незакоммиченные изменени� в рабочем каталоге. Сделайте коммит, а затем запу�тите «git rebase --continue» �нова."
 
-#: sequencer.c:4043 sequencer.c:4081
+#: sequencer.c:4435 sequencer.c:4474
 #, c-format
 msgid "could not write file: '%s'"
 msgstr ""
 
-#: sequencer.c:4096
+#: sequencer.c:4490
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "не удало�ь удалить CHERRY_PICK_HEAD"
 
-#: sequencer.c:4103
+#: sequencer.c:4497
 msgid "could not commit staged changes."
 msgstr "не удало�ь закоммитить проиндек�ированные изменени�."
 
-#: sequencer.c:4204
+#: sequencer.c:4613
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: не удало�ь �копировать коммит %s"
 
-#: sequencer.c:4208
+#: sequencer.c:4617
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: плоха� редакци�"
 
-#: sequencer.c:4243
+#: sequencer.c:4652
 msgid "can't revert as initial commit"
 msgstr "нельз� возвратить изначальный коммит"
 
-#: sequencer.c:4686
+#: sequencer.c:5129
 msgid "make_script: unhandled options"
 msgstr "make_script: не обработанные опции"
 
-#: sequencer.c:4689
+#: sequencer.c:5132
 msgid "make_script: error preparing revisions"
 msgstr "make_script: ошибка при обновлении редакций"
 
-#: sequencer.c:4847
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr "Вы можете и�править �то � помощью «git rebase --edit-todo», а потом запу�тив «git rebase --continue».\nИли вы можете прервать проце�� перемещени�, выполнив «git rebase --abort»\n"
-
-#: sequencer.c:4959 sequencer.c:4976
+#: sequencer.c:5374 sequencer.c:5391
 msgid "nothing to do"
 msgstr ""
 
-#: sequencer.c:4990
+#: sequencer.c:5410
 msgid "could not skip unnecessary pick commands"
 msgstr ""
 
-#: sequencer.c:5073
+#: sequencer.c:5504
 msgid "the script was already rearranged."
 msgstr "�ценарий уже был пере�троен."
 
-#: setup.c:123
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "«%s» вне репозитори�"
+msgid "'%s' is outside repository at '%s'"
+msgstr ""
 
-#: setup.c:173
+#: setup.c:185
 #, 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: нет такого пути в рабочем каталоге.\nИ�пользуйте «git <команда> -- <путь>…» дл� указани� путей, которые не �уще�твуют локально."
 
-#: setup.c:186
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6169,12 +7176,12 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr "неоднозначный аргумент «%s»: неизве�тна� редакци� или не путь в рабочем каталоге.\nИ�пользуйте «--» дл� отделени� путей от редакций, вот так:\n«git <команда> [<редакци�>…] -- [<файл>…]»"
 
-#: setup.c:235
+#: setup.c:264
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr ""
 
-#: setup.c:254
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6182,387 +7189,547 @@ msgid ""
 "'git <command> [<revision>...] -- [<file>...]'"
 msgstr "неоднозначный аргумент «%s»: �вл�ет�� одновременно и редакцией и именем файла.\nИ�пользуйте «--» дл� отделени� путей от редакций, вот так:\n«git <команда> [<редакци�>…] -- [<файл>…]»"
 
-#: setup.c:390
+#: setup.c:419
 msgid "unable to set up work tree using invalid config"
 msgstr ""
 
-#: setup.c:394
+#: setup.c:423
 msgid "this operation must be run in a work tree"
 msgstr ""
 
-#: setup.c:540
+#: setup.c:661
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Ожидаема� вер�и� git репозитори� <= %d, а обнаружена %d"
 
-#: setup.c:548
+#: setup.c:669
 msgid "unknown repository extensions found:"
 msgstr "обнаружены неизве�тные ра�ширени� репозитори�:"
 
-#: setup.c:567
+#: setup.c:681
+msgid "repo version is 0, but v1-only extensions found:"
+msgstr ""
+
+#: setup.c:700
 #, c-format
 msgid "error opening '%s'"
 msgstr "ошибка открыти� «%s»"
 
-#: setup.c:569
+#: setup.c:702
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "файл �лишком большой как дл� .git файла: «%s»"
 
-#: setup.c:571
+#: setup.c:704
 #, c-format
 msgid "error reading %s"
 msgstr "ошибка чтени� %s"
 
-#: setup.c:573
+#: setup.c:706
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "неправильный формат файла gitfile: %s"
 
-#: setup.c:575
+#: setup.c:708
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "нет пути в gitfile: %s"
 
-#: setup.c:577
+#: setup.c:710
 #, c-format
 msgid "not a git repository: %s"
 msgstr "не �вл�ет�� репозиторием git: %s"
 
-#: setup.c:676
+#: setup.c:812
 #, c-format
 msgid "'$%s' too big"
 msgstr "«$%s» �лишком большой"
 
-#: setup.c:690
+#: setup.c:826
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "не �вл�ет�� репозиторием git: «%s»"
 
-#: setup.c:719 setup.c:721 setup.c:752
+#: setup.c:855 setup.c:857 setup.c:888
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "не удало�ь выполнить chdir в «%s»"
 
-#: setup.c:724 setup.c:780 setup.c:790 setup.c:829 setup.c:837
+#: setup.c:860 setup.c:916 setup.c:926 setup.c:965 setup.c:973
 msgid "cannot come back to cwd"
 msgstr "не удало�ь вернуть�� в cwd"
 
-#: setup.c:851
+#: setup.c:987
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "не удало�ь выполнить stat дл� «%*s%s%s»"
 
-#: setup.c:1083
+#: setup.c:1225
 msgid "Unable to read current working directory"
 msgstr "�е удало�ь прочитать текущий рабочий каталог"
 
-#: setup.c:1092 setup.c:1098
+#: setup.c:1234 setup.c:1240
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "не удало�ь изменить на «%s»"
 
-#: setup.c:1103
+#: setup.c:1245
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "не найден git репозиторий (или один из родитель�ких каталогов): %s"
 
-#: setup.c:1109
+#: setup.c:1251
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
 "Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
 msgstr "не найден git репозиторий (или один из его каталогов вплоть до точки монтировани� %s)\nО�танавливаю пои�к на границе файловой �и�темы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не у�тановлен)."
 
-#: setup.c:1220
+#: setup.c:1362
 #, 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:1264
+#: setup.c:1409
 msgid "open /dev/null or dup failed"
 msgstr "�бой открыти� /dev/null или дублировани� де�криптора"
 
-#: setup.c:1279
+#: setup.c:1424
 msgid "fork failed"
 msgstr "�бой при выполнении fork"
 
-#: setup.c:1284
+#: setup.c:1429
 msgid "setsid failed"
 msgstr "�бой при выполнении setsid"
 
-#: sha1-file.c:453
+#: sha1-file.c:480
 #, c-format
 msgid "object directory %s does not exist; check .git/objects/info/alternates"
 msgstr ""
 
-#: sha1-file.c:504
+#: sha1-file.c:531
 #, c-format
 msgid "unable to normalize alternate object path: %s"
 msgstr ""
 
-#: sha1-file.c:576
+#: sha1-file.c:603
 #, c-format
 msgid "%s: ignoring alternate object stores, nesting too deep"
 msgstr ""
 
-#: sha1-file.c:583
+#: sha1-file.c:610
 #, c-format
 msgid "unable to normalize object directory: %s"
 msgstr ""
 
-#: sha1-file.c:626
+#: sha1-file.c:653
 msgid "unable to fdopen alternates lockfile"
 msgstr ""
 
-#: sha1-file.c:644
+#: sha1-file.c:671
 msgid "unable to read alternates file"
 msgstr ""
 
-#: sha1-file.c:651
+#: sha1-file.c:678
 msgid "unable to move new alternates file into place"
 msgstr ""
 
-#: sha1-file.c:686
+#: sha1-file.c:713
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "путь «%s» не �уще�твует"
 
-#: sha1-file.c:712
+#: sha1-file.c:734
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "��ылаемый репозиторий «%s» как �в�занное �о�то�ние, пока не поддерживает��."
 
-#: sha1-file.c:718
+#: sha1-file.c:740
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "��ылаемый репозиторий «%s» не �вл�ет�� локальным."
 
-#: sha1-file.c:724
+#: sha1-file.c:746
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "��ылаемый репозиторий «%s» �вл�ет�� ча�тичным"
 
-#: sha1-file.c:732
+#: sha1-file.c:754
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "��ылаемый репозиторий «%s» �вл�ет�� �ращенным"
 
-#: sha1-file.c:846
+#: sha1-file.c:814
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr ""
+
+#: sha1-file.c:964
 #, c-format
 msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
 msgstr ""
 
-#: sha1-file.c:871
+#: sha1-file.c:985
 msgid "mmap failed"
 msgstr ""
 
-#: sha1-file.c:1035
+#: sha1-file.c:1149
 #, c-format
 msgid "object file %s is empty"
 msgstr ""
 
-#: sha1-file.c:1159 sha1-file.c:2297
+#: sha1-file.c:1284 sha1-file.c:2477
 #, c-format
 msgid "corrupt loose object '%s'"
 msgstr ""
 
-#: sha1-file.c:1161 sha1-file.c:2301
+#: sha1-file.c:1286 sha1-file.c:2481
 #, c-format
 msgid "garbage at end of loose object '%s'"
 msgstr ""
 
-#: sha1-file.c:1203
+#: sha1-file.c:1328
 msgid "invalid object type"
 msgstr ""
 
-#: sha1-file.c:1287
+#: sha1-file.c:1412
 #, c-format
 msgid "unable to unpack %s header with --allow-unknown-type"
 msgstr ""
 
-#: sha1-file.c:1290
+#: sha1-file.c:1415
 #, c-format
 msgid "unable to unpack %s header"
 msgstr ""
 
-#: sha1-file.c:1296
+#: sha1-file.c:1421
 #, c-format
 msgid "unable to parse %s header with --allow-unknown-type"
 msgstr ""
 
-#: sha1-file.c:1299
+#: sha1-file.c:1424
 #, c-format
 msgid "unable to parse %s header"
 msgstr ""
 
-#: sha1-file.c:1490
+#: sha1-file.c:1651
 #, c-format
 msgid "failed to read object %s"
 msgstr ""
 
-#: sha1-file.c:1494
+#: sha1-file.c:1655
 #, c-format
 msgid "replacement %s not found for %s"
 msgstr ""
 
-#: sha1-file.c:1498
+#: sha1-file.c:1659
 #, c-format
 msgid "loose object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: sha1-file.c:1502
+#: sha1-file.c:1663
 #, c-format
 msgid "packed object %s (stored in %s) is corrupt"
 msgstr ""
 
-#: sha1-file.c:1604
+#: sha1-file.c:1768
 #, c-format
 msgid "unable to write file %s"
 msgstr ""
 
-#: sha1-file.c:1611
+#: sha1-file.c:1775
 #, c-format
 msgid "unable to set permission to '%s'"
 msgstr ""
 
-#: sha1-file.c:1618
+#: sha1-file.c:1782
 msgid "file write error"
 msgstr ""
 
-#: sha1-file.c:1637
+#: sha1-file.c:1802
 msgid "error when closing loose object file"
 msgstr ""
 
-#: sha1-file.c:1702
+#: sha1-file.c:1867
 #, c-format
 msgid "insufficient permission for adding an object to repository database %s"
 msgstr ""
 
-#: sha1-file.c:1704
+#: sha1-file.c:1869
 msgid "unable to create temporary file"
 msgstr ""
 
-#: sha1-file.c:1728
+#: sha1-file.c:1893
 msgid "unable to write loose object file"
 msgstr ""
 
-#: sha1-file.c:1734
+#: sha1-file.c:1899
 #, c-format
 msgid "unable to deflate new object %s (%d)"
 msgstr ""
 
-#: sha1-file.c:1738
+#: sha1-file.c:1903
 #, c-format
 msgid "deflateEnd on object %s failed (%d)"
 msgstr ""
 
-#: sha1-file.c:1742
+#: sha1-file.c:1907
 #, c-format
 msgid "confused by unstable object source data for %s"
 msgstr ""
 
-#: sha1-file.c:1752 builtin/pack-objects.c:920
+#: sha1-file.c:1917 builtin/pack-objects.c:1086
 #, c-format
 msgid "failed utime() on %s"
 msgstr ""
 
-#: sha1-file.c:1827
+#: sha1-file.c:1994
 #, c-format
 msgid "cannot read object for %s"
 msgstr ""
 
-#: sha1-file.c:1867
+#: sha1-file.c:2045
 msgid "corrupt commit"
 msgstr ""
 
-#: sha1-file.c:1875
+#: sha1-file.c:2053
 msgid "corrupt tag"
 msgstr ""
 
-#: sha1-file.c:1974
+#: sha1-file.c:2153
 #, c-format
 msgid "read error while indexing %s"
 msgstr ""
 
-#: sha1-file.c:1977
+#: sha1-file.c:2156
 #, c-format
 msgid "short read while indexing %s"
 msgstr ""
 
-#: sha1-file.c:2050 sha1-file.c:2059
+#: sha1-file.c:2229 sha1-file.c:2239
 #, c-format
 msgid "%s: failed to insert into database"
 msgstr ""
 
-#: sha1-file.c:2065
+#: sha1-file.c:2245
 #, c-format
 msgid "%s: unsupported file type"
 msgstr ""
 
-#: sha1-file.c:2089
+#: sha1-file.c:2269
 #, c-format
 msgid "%s is not a valid object"
 msgstr ""
 
-#: sha1-file.c:2091
+#: sha1-file.c:2271
 #, c-format
 msgid "%s is not a valid '%s' object"
 msgstr "%s не �вл�ет�� дей�твительным объектом «%s»"
 
-#: sha1-file.c:2118 builtin/index-pack.c:154
+#: sha1-file.c:2298 builtin/index-pack.c:192
 #, c-format
 msgid "unable to open %s"
 msgstr "не удало�ь открыть %s"
 
-#: sha1-file.c:2308 sha1-file.c:2360
+#: sha1-file.c:2488 sha1-file.c:2541
 #, c-format
 msgid "hash mismatch for %s (expected %s)"
-msgstr "не�оответ�твие хеш-�уммы %s (ожидает�� %s)"
+msgstr "не�оответ�твие х�ш-кода %s (ожидает�� %s)"
 
-#: sha1-file.c:2332
+#: sha1-file.c:2512
 #, c-format
 msgid "unable to mmap %s"
 msgstr ""
 
-#: sha1-file.c:2337
+#: sha1-file.c:2517
 #, c-format
 msgid "unable to unpack header of %s"
 msgstr ""
 
-#: sha1-file.c:2343
+#: sha1-file.c:2523
 #, c-format
 msgid "unable to parse header of %s"
 msgstr ""
 
-#: sha1-file.c:2354
+#: sha1-file.c:2534
 #, c-format
 msgid "unable to unpack contents of %s"
 msgstr ""
 
-#: sha1-name.c:490
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "�окращённый SHA1 идентификатор %s неоднозначен"
 
-#: sha1-name.c:501
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "Возможно, вы имели в виду:"
 
-#: sha1-name.c:800
+#: sha1-name.c:796
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
 "may be created by mistake. For example,\n"
 "\n"
-"  git checkout -b $br $(git rev-parse ...)\n"
+"  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 "Обычно Git не �оздает ��ылки, оканчивающие�� на 40 ше�тнадцатеричных\n�имволов, потому, что они будут игнорировать��, когда вы про�то\nукажете �то 40-�имвольное ше�тнадцатеричное чи�ло. Такие ��ылки\nмогли быть �озданы по ошибке. �апример, � помощью:\n\n  git checkout -b $br $(git rev-parse …)\n\n, е�ли «$br» оказал�� пу�тым, то ��ылка � 40-�имвольным\nше�тнадцатеричным чи�лом будет �оздана. Пожалуй�та, про�мотрите �ти\n��ылки и, возможно, удалите их. Вы можете отключить �то �ообщение\nзапу�тив «git config advice.objectNameWarning false»"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr ""
+
+#: sha1-name.c:1784
+msgid "relative path syntax can't be used outside working tree"
+msgstr ""
+
+#: sha1-name.c:1922
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr ""
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:848
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u ГиБ"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:850
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u ГиБ/�"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:858
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u МиБ"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:860
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u МиБ/�"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:867
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u КиБ"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:869
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u КиБ/�"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:875
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u байт"
+msgstr[1] "%u байта"
+msgstr[2] "%u байтов"
+msgstr[3] "%u байта"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:877
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u байт/�"
+msgstr[1] "%u байта/�"
+msgstr[2] "%u байтов/�"
+msgstr[3] "%u байта/�"
+
+#: strbuf.c:1166 wrapper.c:199 wrapper.c:369 builtin/am.c:719
+#: builtin/rebase.c:864
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "не удало�ь открыть «%s» дл� запи�и"
+
+#: strbuf.c:1175
+#, c-format
+msgid "could not edit '%s'"
+msgstr ""
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "игнорирую подозрительный подмодуль � именем: %s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "нельз� и�пользовать отрицательные значени� дл� submodule.fetchjobs"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "неправильное значение %s"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "�е удало�ь обновить .gitmodules запи�ь %s"
 
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
@@ -6592,62 +7759,137 @@ msgstr "в пу�том подмодуле «%s»"
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Спецификатор пути «%s» в подмодуле «%.*s»"
 
-#: submodule.c:910
+#: submodule.c:434
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr ""
+
+#: submodule.c:816
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+
+#: submodule.c:919
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "запи�ь подмодул� «%s» (%s) �вл�ет�� %s, а не �вл�ет�� коммитом"
 
-#: submodule.c:1147 builtin/branch.c:672 builtin/submodule--helper.c:1988
+#: submodule.c:1004
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+
+#: submodule.c:1127
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr ""
+
+#: submodule.c:1156 builtin/branch.c:680 builtin/submodule--helper.c:2469
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "�е удало�ь определить HEAD как дей�твительную ��ылку."
 
-#: submodule.c:1481
+#: submodule.c:1167
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr ""
+
+#: submodule.c:1170
 #, c-format
-msgid "Could not access submodule '%s'"
+msgid "Unable to push submodule '%s'\n"
 msgstr ""
 
-#: submodule.c:1651
+#: submodule.c:1462
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr ""
+
+#: submodule.c:1492
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr ""
+
+#: submodule.c:1646
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+
+#: submodule.c:1671
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "«%s» не ра�познан как репозиторий git"
 
-#: submodule.c:1789
+#: submodule.c:1688
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr ""
+
+#: submodule.c:1729
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr ""
+
+#: submodule.c:1804
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "не удало�ь запу�тить «git status» в подмодуле «%s»"
 
-#: submodule.c:1802
+#: submodule.c:1817
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "не удало�ь запу�тить «git status» в подмодуле «%s»"
 
-#: submodule.c:1817
+#: submodule.c:1832
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr ""
 
-#: submodule.c:1907
+#: submodule.c:1859 submodule.c:2169
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "не удало�ь рекур�ивно зайти в подмодуль «%s»"
+
+#: submodule.c:1880
+msgid "could not reset submodule index"
+msgstr ""
+
+#: submodule.c:1922
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "подмодуль «%s» имеет изменённый индек�"
 
-#: submodule.c:1959
+#: submodule.c:1974
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr ""
 
-#: submodule.c:2008
+#: submodule.c:2042
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr ""
+
+#: submodule.c:2063
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "relocate_gitdir дл� подмодул� «%s» � указанием более одного рабочего дерева не поддерживает��"
 
-#: submodule.c:2020 submodule.c:2076
+#: submodule.c:2075 submodule.c:2134
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "не удало�ь запро�ить им� подмодул� «%s»"
 
-#: submodule.c:2027
+#: submodule.c:2079
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr ""
+
+#: submodule.c:2086
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -6655,544 +7897,544 @@ msgid ""
 "'%s'\n"
 msgstr "Перемещение каталога git дл� «%s%s» из\n«%s» в\n«%s»\n"
 
-#: submodule.c:2111
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "не удало�ь рекур�ивно зайти в подмодуль «%s»"
-
-#: submodule.c:2155
+#: submodule.c:2214
 msgid "could not start ls-files in .."
 msgstr "не удало�ь выполнить stat ls-files в .."
 
-#: submodule.c:2194
+#: submodule.c:2254
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree вернул неожиданный код %d"
 
-#: submodule-config.c:232
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "игнорирую подозрительный подмодуль � именем: %s"
-
-#: submodule-config.c:299
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "нельз� и�пользовать отрицательные значени� дл� submodule.fetchjobs"
-
-#: submodule-config.c:397
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-
-#: submodule-config.c:486
-#, c-format
-msgid "invalid value for %s"
-msgstr "неправильное значение %s"
-
-#: submodule-config.c:755
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr " �е удало�ь обновить .gitmodules запи�ь %s"
-
-#: trailer.c:238
+#: trailer.c:236
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "�бой при запу�ке команды завершител� «%s»"
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: trailer.c:483 trailer.c:488 trailer.c:493 trailer.c:547 trailer.c:551
+#: trailer.c:555
 #, c-format
 msgid "unknown value '%s' for key '%s'"
 msgstr "неизве�тное значение «%s» дл� ключа «%s»"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:537 trailer.c:542 builtin/remote.c:299 builtin/remote.c:324
 #, c-format
 msgid "more than one %s"
 msgstr "больше одного %s"
 
-#: trailer.c:730
+#: trailer.c:728
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "пу�та� по�ледн�� лек�ема в завершителе «%.*s»"
 
-#: trailer.c:750
+#: trailer.c:748
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "не удало�ь прочитать входной файл «%s»"
 
-#: trailer.c:753
+#: trailer.c:751
 msgid "could not read from stdin"
 msgstr "не удало�ь прочитать из �тандартного ввода"
 
-#: trailer.c:1011 wrapper.c:701
+#: trailer.c:1009 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
 msgstr "не удало�ь выполнить stat дл� %s"
 
-#: trailer.c:1013
+#: trailer.c:1011
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "файл %s не �вл�ет�� обычным файлом"
 
-#: trailer.c:1015
+#: trailer.c:1013
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "файл %s не до�тупен на запи�ь пользователю"
 
-#: trailer.c:1027
+#: trailer.c:1025
 msgid "could not open temporary file"
 msgstr "не удало�ь �оздать временный файл"
 
-#: trailer.c:1067
+#: trailer.c:1065
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "не удало�ь переименовать временный файл в %s"
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Будет у�тановлен выше�то�щий репозиторий дл� «%s» на «%s» � «%s»\n"
-
-#: transport.c:142
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr ""
-
-#: transport.c:208
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "тран�порт: неправильный параметр глубины «%s»"
-
-#: transport.c:259
-msgid "see protocol.version in 'git help config' for more details"
-msgstr ""
-
-#: transport.c:260
-msgid "server options require protocol version 2 or later"
-msgstr ""
-
-#: transport.c:625
-msgid "could not parse transport.color.* config"
-msgstr "не удало�ь разобрать опцию transport.color.*"
-
-#: transport.c:698
-msgid "support for protocol v2 not implemented yet"
-msgstr ""
-
-#: transport.c:825
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr ""
-
-#: transport.c:891
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr ""
-
-#: transport.c:945
-msgid "git-over-rsync is no longer supported"
-msgstr ""
-
-#: transport.c:1040
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr "Подмодули по указанным пут�м �одержат изменени�, которые не найдены ни на одном из внешних репозиториев:\n"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог � помощью команды cd и выполнить\n\n\tgit push\n\nдл� их отправки на внешний репозиторий.\n"
-
-#: transport.c:1052
-msgid "Aborting."
-msgstr "Прерываю."
-
-#: transport.c:1193
-msgid "failed to push all needed submodules"
-msgstr ""
-
-#: transport.c:1326 transport-helper.c:645
-msgid "operation not supported by protocol"
-msgstr ""
-
-#: transport.c:1430
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr ""
-
-#: transport-helper.c:51 transport-helper.c:80
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
 msgstr ""
 
-#: transport-helper.c:134
+#: transport-helper.c:145
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr ""
 
-#: transport-helper.c:150 transport-helper.c:559
+#: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
 msgstr ""
 
-#: transport-helper.c:201
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr ""
 
-#: transport-helper.c:207
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
 msgstr ""
 
-#: transport-helper.c:274 transport-helper.c:414
+#: transport-helper.c:287 transport-helper.c:429
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr ""
 
-#: transport-helper.c:403
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
 msgstr ""
 
-#: transport-helper.c:481
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
 msgstr ""
 
-#: transport-helper.c:504
+#: transport-helper.c:520
 msgid "error while running fast-import"
 msgstr ""
 
-#: transport-helper.c:533 transport-helper.c:1099
+#: transport-helper.c:549 transport-helper.c:1236
 #, c-format
 msgid "could not read ref %s"
 msgstr ""
 
-#: transport-helper.c:578
+#: transport-helper.c:594
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr ""
 
-#: transport-helper.c:600
+#: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
 msgstr ""
 
-#: transport-helper.c:602
+#: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr ""
 
-#: transport-helper.c:648
+#: transport-helper.c:661 transport.c:1446
+msgid "operation not supported by protocol"
+msgstr ""
+
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr ""
 
-#: transport-helper.c:720
+#: transport-helper.c:745
+msgid "'option' without a matching 'ok/error' directive"
+msgstr ""
+
+#: transport-helper.c:788
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr ""
 
-#: transport-helper.c:773
+#: transport-helper.c:845
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr ""
 
-#: transport-helper.c:834
+#: transport-helper.c:928
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr ""
 
-#: transport-helper.c:837
+#: transport-helper.c:931
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr ""
 
-#: transport-helper.c:840
+#: transport-helper.c:934
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr ""
 
-#: transport-helper.c:847
+#: transport-helper.c:939
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr ""
+
+#: transport-helper.c:943
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr ""
+
+#: transport-helper.c:950
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr ""
 
-#: transport-helper.c:939
+#: transport-helper.c:1050
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr ""
 
-#: transport-helper.c:944
+#: transport-helper.c:1055
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr ""
 
-#: transport-helper.c:991
+#: transport-helper.c:1102
 msgid "couldn't run fast-export"
 msgstr ""
 
-#: transport-helper.c:996
+#: transport-helper.c:1107
 msgid "error while running fast-export"
 msgstr ""
 
-#: transport-helper.c:1021
+#: transport-helper.c:1132
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
+msgstr ""
+
+#: transport-helper.c:1213
+#, c-format
+msgid "unsupported object format '%s'"
 msgstr ""
 
-#: transport-helper.c:1085
+#: transport-helper.c:1222
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr ""
 
-#: transport-helper.c:1238
+#: transport-helper.c:1374
 #, c-format
 msgid "read(%s) failed"
 msgstr ""
 
-#: transport-helper.c:1265
+#: transport-helper.c:1401
 #, c-format
 msgid "write(%s) failed"
 msgstr ""
 
-#: transport-helper.c:1314
+#: transport-helper.c:1450
 #, c-format
 msgid "%s thread failed"
 msgstr ""
 
-#: transport-helper.c:1318
+#: transport-helper.c:1454
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr ""
 
-#: transport-helper.c:1337 transport-helper.c:1341
+#: transport-helper.c:1473 transport-helper.c:1477
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr ""
 
-#: transport-helper.c:1378
+#: transport-helper.c:1514
 #, c-format
 msgid "%s process failed to wait"
 msgstr ""
 
-#: transport-helper.c:1382
+#: transport-helper.c:1518
 #, c-format
 msgid "%s process failed"
 msgstr ""
 
-#: transport-helper.c:1400 transport-helper.c:1409
+#: transport-helper.c:1536 transport-helper.c:1545
 msgid "can't start thread for copying data"
 msgstr ""
 
-#: tree-walk.c:33
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Будет у�тановлен выше�то�щий репозиторий дл� «%s» на «%s» � «%s»\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr ""
+
+#: transport.c:220
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "тран�порт: неправильный параметр глубины «%s»"
+
+#: transport.c:269
+msgid "see protocol.version in 'git help config' for more details"
+msgstr ""
+
+#: transport.c:270
+msgid "server options require protocol version 2 or later"
+msgstr ""
+
+#: transport.c:727
+msgid "could not parse transport.color.* config"
+msgstr "не удало�ь разобрать опцию transport.color.*"
+
+#: transport.c:802
+msgid "support for protocol v2 not implemented yet"
+msgstr ""
+
+#: transport.c:936
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr ""
+
+#: transport.c:1002
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr ""
+
+#: transport.c:1055
+msgid "git-over-rsync is no longer supported"
+msgstr ""
+
+#: transport.c:1157
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "Подмодули по указанным пут�м �одержат изменени�, которые не найдены ни на одном из внешних репозиториев:\n"
+
+#: transport.c:1161
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог � помощью команды cd и выполнить\n\n\tgit push\n\nдл� их отправки на внешний репозиторий.\n"
+
+#: transport.c:1169
+msgid "Aborting."
+msgstr "Прерываю."
+
+#: transport.c:1315
+msgid "failed to push all needed submodules"
+msgstr ""
+
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "�лишком  короткий объект дерева"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "неправильный режим в запи�и дерева"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "пу�тое им� файла в запи�и дерева"
 
-#: tree-walk.c:116
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "�лишком  короткий файл дерева"
 
-#: unpack-trees.c:111
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%sPlease commit your changes or stash them before you switch branches."
 msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при переключении на �о�то�ние:\n%%sСделайте коммит или �пр�чьте ваши изменени� перед переключением веток."
 
-#: unpack-trees.c:113
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
 "%%s"
 msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при переключении на �о�то�ние:\n%%s"
 
-#: unpack-trees.c:116
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%sPlease commit your changes or stash them before you merge."
 msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при �ли�нии:\n%%sСделайте коммит или �пр�чьте ваши изменени� перед �ли�нием веток."
 
-#: unpack-trees.c:118
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
 "%%s"
 msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при �ли�нии:\n%%s"
 
-#: unpack-trees.c:121
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%sPlease commit your changes or stash them before you %s."
 msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при %s:\n%%sСделайте коммит или �пр�чьте ваши изменени� перед %s."
 
-#: unpack-trees.c:123
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
 "%%s"
 msgstr "Ваши локальные изменени� в указанных файлах будут перезапи�аны при %s:\n%%s"
 
-#: unpack-trees.c:128
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
 "%s"
 msgstr "Обновление указанных каталогов приведет к потере неот�леживаемых файлов в них:\n%s"
 
-#: unpack-trees.c:132
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при переключении на �о�то�ние:\n%%sПереме�тите �ти файлы или удалите их перед переключением веток."
 
-#: unpack-trees.c:134
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при переключении на �о�то�ние:\n%%s"
 
-#: unpack-trees.c:137
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при �ли�нии:\n%%sПереме�тите �ти файлы или удалите их перед переключением веток."
 
-#: unpack-trees.c:139
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при �ли�нии:\n%%s"
 
-#: unpack-trees.c:142
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереме�тите �ти файлы или удалите их перед %s."
 
-#: unpack-trees.c:144
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
 
-#: unpack-trees.c:150
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by checkout:\n"
 "%%sPlease move or remove them before you switch branches."
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при переключении на �о�то�ние:\n%%sПереме�тите �ти файлы или удалите их перед переключением веток."
 
-#: unpack-trees.c:152
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by checkout:\n"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при переключении на �о�то�ние:\n%%s"
 
-#: unpack-trees.c:155
+#: unpack-trees.c:157
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%sPlease move or remove them before you merge."
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при �ли�нии:\n%%sПереме�тите �ти файлы или удалите их перед переключением веток."
 
-#: unpack-trees.c:157
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при �ли�нии:\n%%s"
 
-#: unpack-trees.c:160
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%sPlease move or remove them before you %s."
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при %s:\n%%sПереме�тите �ти файлы или удалите их перед %s."
 
-#: unpack-trees.c:162
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
 "%%s"
 msgstr "Указанные неот�леживаемые файлы в рабочем каталоге будут перезапи�аны при %s:\n%%s"
 
-#: unpack-trees.c:170
+#: unpack-trees.c:172
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Запи�ь «%s» ча�тично �овпадает � «%s».  �е удало�ь назначить �оответ�твие."
 
-#: unpack-trees.c:173
+#: unpack-trees.c:175
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
 "%s"
-msgstr "�е удало�ь обновить ча�тичное �о�то�ние: �ледующие �лементы не по�ледней вер�ии:\n%s"
+msgstr "�е удоло�ь обновить подмодуль:\n%s"
 
-#: unpack-trees.c:175
+#: unpack-trees.c:178
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout update:\n"
+"The following paths are not up to date and were left despite sparse patterns:\n"
 "%s"
-msgstr "Указанные файлы из рабочего каталога будут перезапи�аны при обновлении ча�тичного �о�то�ни�:\n%s"
+msgstr ""
 
-#: unpack-trees.c:177
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
-msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении ча�тичного �о�то�ни�:\n%s"
+msgstr ""
 
-#: unpack-trees.c:179
+#: unpack-trees.c:182
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse patterns:\n"
 "%s"
-msgstr "�е удоло�ь обновить подмодуль:\n%s"
+msgstr ""
 
-#: unpack-trees.c:256
+#: unpack-trees.c:262
 #, c-format
 msgid "Aborting\n"
 msgstr "Прерываю\n"
 
-#: unpack-trees.c:318
-msgid "Checking out files"
-msgstr "Ра�паковка файлов"
+#: unpack-trees.c:289
+#, 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:350
+msgid "Updating files"
+msgstr ""
+
+#: unpack-trees.c:382
 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
+msgid "Updating index flags"
+msgstr ""
+
+#: upload-pack.c:1550
+msgid "expected flush after fetch arguments"
+msgstr ""
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "�еправильна� им� URL �хемы или пропущен �уффик� «://»"
@@ -7222,179 +8464,221 @@ msgstr "неправильный номер порта"
 msgid "invalid '..' path segment"
 msgstr "неправильна� ча�ть пути «..»"
 
-#: worktree.c:255 builtin/am.c:2097
+#: walker.c:170
+msgid "Fetching objects"
+msgstr ""
+
+#: worktree.c:236 builtin/am.c:2103
 #, c-format
 msgid "failed to read '%s'"
 msgstr "не удало�ь прочитать «%s»"
 
-#: worktree.c:301
+#: worktree.c:283
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr ""
 
-#: worktree.c:312
+#: worktree.c:294
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr ""
 
-#: worktree.c:324
+#: worktree.c:306
 #, c-format
 msgid "'%s' does not exist"
 msgstr "«%s» не �уще�твует"
 
-#: worktree.c:330
+#: worktree.c:312
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr ""
 
-#: worktree.c:338
+#: worktree.c:321
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr ""
 
-#: wrapper.c:223 wrapper.c:393
+#: worktree.c:587
+msgid "not a directory"
+msgstr ""
+
+#: worktree.c:596
+msgid ".git is not a file"
+msgstr ""
+
+#: worktree.c:598
+msgid ".git file broken"
+msgstr ""
+
+#: worktree.c:600
+msgid ".git file incorrect"
+msgstr ""
+
+#: worktree.c:670
+msgid "not a valid path"
+msgstr ""
+
+#: worktree.c:676
+msgid "unable to locate repository; .git is not a file"
+msgstr ""
+
+#: worktree.c:679
+msgid "unable to locate repository; .git file broken"
+msgstr ""
+
+#: worktree.c:685
+msgid "gitdir unreadable"
+msgstr ""
+
+#: worktree.c:689
+msgid "gitdir incorrect"
+msgstr ""
+
+#: wrapper.c:197 wrapper.c:367
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "не удало�ь открыть «%s» дл� чтени� и запи�и"
 
-#: wrapper.c:424 wrapper.c:624
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr "«%s» недо�тупно"
 
-#: wrapper.c:632
+#: wrapper.c:607
 msgid "unable to get current working directory"
 msgstr "не удало�ь получить текущий рабочий каталог"
 
-#: wt-status.c:156
+#: wt-status.c:158
 msgid "Unmerged paths:"
 msgstr "�е �литые пути:"
 
-#: wt-status.c:183 wt-status.c:210
+#: wt-status.c:187 wt-status.c:219
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  (и�пользуйте «git restore --staged <файл>…», чтобы убрать из индек�а)"
+
+#: wt-status.c:190 wt-status.c:222
 #, c-format
-msgid "  (use \"git reset %s <file>...\" to unstage)"
-msgstr "  (и�пользуйте «git reset %s <файл>…», чтобы убрать из индек�а)"
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr "  (и�пользуйте «git restore --source=%s --staged <файл>…», чтобы убрать из индек�а)"
 
-#: wt-status.c:185 wt-status.c:212
+#: wt-status.c:193 wt-status.c:225
 msgid "  (use \"git rm --cached <file>...\" to unstage)"
 msgstr "  (и�пользуйте «git rm --cached <файл>…», чтобы убрать из индек�а)"
 
-#: wt-status.c:189
+#: wt-status.c:197
 msgid "  (use \"git add <file>...\" to mark resolution)"
 msgstr "  (и�пользуйте «git add <файл>…», чтобы пометить разрешение конфликта)"
 
-#: wt-status.c:191 wt-status.c:195
+#: wt-status.c:199 wt-status.c:203
 msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
 msgstr "  (и�пользуйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
 
-#: wt-status.c:193
+#: wt-status.c:201
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  (и�пользуйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
 
-#: wt-status.c:204 wt-status.c:1064
+#: wt-status.c:211 wt-status.c:1070
 msgid "Changes to be committed:"
 msgstr "Изменени�, которые будут включены в коммит:"
 
-#: wt-status.c:222 wt-status.c:1073
+#: wt-status.c:234 wt-status.c:1079
 msgid "Changes not staged for commit:"
 msgstr "Изменени�, которые не в индек�е дл� коммита:"
 
-#: wt-status.c:226
+#: wt-status.c:238
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr "  (и�пользуйте «git add <файл>…», чтобы добавить файл в индек�)"
 
-#: wt-status.c:228
+#: wt-status.c:240
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr "  (и�пользуйте «git add/rm <файл>…», чтобы добавить или удалить файл из индек�а)"
 
-#: wt-status.c:229
-msgid ""
-"  (use \"git checkout -- <file>...\" to discard changes in working "
-"directory)"
-msgstr "  (и�пользуйте «git checkout -- <файл>…», чтобы отменить изменени�\n   в рабочем каталоге)"
+#: wt-status.c:241
+msgid "  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr "  (и�пользуйте «git restore <файл>…», чтобы отменить изменени� в рабочем каталоге)"
 
-#: wt-status.c:231
+#: wt-status.c:243
 msgid "  (commit or discard the untracked or modified content in submodules)"
 msgstr "  (�делайте коммит или отмените изменени� в неот�леживаемом или измененном �одержимом в подмодул�х)"
 
-#: wt-status.c:243
+#: wt-status.c:254
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  (и�пользуйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
 
-#: wt-status.c:258
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr "оба удалены:"
 
-#: wt-status.c:260
+#: wt-status.c:268
 msgid "added by us:"
 msgstr "добавлено нами:"
 
-#: wt-status.c:262
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "удалено ими:"
 
-#: wt-status.c:264
+#: wt-status.c:272
 msgid "added by them:"
 msgstr "добавлено ими:"
 
-#: wt-status.c:266
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr "удалено нами:"
 
-#: wt-status.c:268
+#: wt-status.c:276
 msgid "both added:"
 msgstr "оба добавлены:"
 
-#: wt-status.c:270
+#: wt-status.c:278
 msgid "both modified:"
 msgstr "оба изменены:"
 
-#: wt-status.c:280
+#: wt-status.c:288
 msgid "new file:"
 msgstr "новый файл:"
 
-#: wt-status.c:282
+#: wt-status.c:290
 msgid "copied:"
 msgstr "�копировано:"
 
-#: wt-status.c:284
+#: wt-status.c:292
 msgid "deleted:"
 msgstr "удалено:"
 
-#: wt-status.c:286
+#: wt-status.c:294
 msgid "modified:"
 msgstr "изменено:"
 
-#: wt-status.c:288
+#: wt-status.c:296
 msgid "renamed:"
 msgstr "переименовано:"
 
-#: wt-status.c:290
+#: wt-status.c:298
 msgid "typechange:"
 msgstr "изменен тип:"
 
-#: wt-status.c:292
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "неизве�тно:"
 
-#: wt-status.c:294
+#: wt-status.c:302
 msgid "unmerged:"
 msgstr "не �литые:"
 
-#: wt-status.c:374
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "новые коммиты, "
 
-#: wt-status.c:376
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "изменено �одержимое, "
 
-#: wt-status.c:378
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr "неот�леживаемое �одержимое, "
 
-#: wt-status.c:896
+#: wt-status.c:903
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
@@ -7403,69 +8687,77 @@ msgstr[1] "У ва� �ейча� �пр�таны %d запи�и"
 msgstr[2] "У ва� �ейча� �пр�тано %d запи�ей"
 msgstr[3] "У ва� �ейча� �пр�таны %d запи�и"
 
-#: wt-status.c:928
+#: wt-status.c:934
 msgid "Submodules changed but not updated:"
 msgstr "Измененные, но не обновленные подмодули:"
 
-#: wt-status.c:930
+#: wt-status.c:936
 msgid "Submodule changes to be committed:"
 msgstr "Изменени� в подмодул�х, которые будут закоммичены:"
 
-#: wt-status.c:1012
+#: wt-status.c:1018
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
 msgstr "�е измен�йте или удал�йте �троку выше �той.\nВ�ё, что ниже — будет проигнорировано."
 
-#: wt-status.c:1119
+#: wt-status.c:1110
+#, 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 ""
+
+#: wt-status.c:1140
 msgid "You have unmerged paths."
 msgstr "У ва� е�ть не �литые пути."
 
-#: wt-status.c:1122
+#: wt-status.c:1143
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (разрешите конфликты, затем запу�тите «git commit»)"
 
-#: wt-status.c:1124
+#: wt-status.c:1145
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (и�пользуйте «git merge --abort», чтобы о�тановить операцию �ли�ни�)"
 
-#: wt-status.c:1128
+#: wt-status.c:1149
 msgid "All conflicts fixed but you are still merging."
 msgstr "В�е конфликты и�правлены, но вы в�е еще в проце��е �ли�ни�."
 
-#: wt-status.c:1131
+#: wt-status.c:1152
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (и�пользуйте «git commit», чтобы завершить �ли�ние)"
 
-#: wt-status.c:1140
+#: wt-status.c:1161
 msgid "You are in the middle of an am session."
 msgstr "Вы в проце��е �е��ии am."
 
-#: wt-status.c:1143
+#: wt-status.c:1164
 msgid "The current patch is empty."
 msgstr "Текущий патч пу�той."
 
-#: wt-status.c:1147
+#: wt-status.c:1168
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (разрешите конфликты, затем запу�тите «git am --continue»)"
 
-#: wt-status.c:1149
+#: wt-status.c:1170
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (и�пользуйте «git am --skip», чтобы пропу�тить �тот патч)"
 
-#: wt-status.c:1151
+#: wt-status.c:1172
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  (и�пользуйте «git am --abort», чтобы во��тановить оригинальную ветку)"
 
-#: wt-status.c:1284
+#: wt-status.c:1305
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo от�ут�твует."
 
-#: wt-status.c:1286
+#: wt-status.c:1307
 msgid "No commands done."
 msgstr "Команды не выполнены."
 
-#: wt-status.c:1289
+#: wt-status.c:1310
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
@@ -7474,16 +8766,16 @@ msgstr[1] "По�ледн�� команда выполнена (%d команд
 msgstr[2] "По�ледн�� команда выполнена (%d команд выполнено):"
 msgstr[3] "По�ледн�� команда выполнена (%d команд выполнено):"
 
-#: wt-status.c:1300
+#: wt-status.c:1321
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (�мотрите дополнительно в файле %s)"
 
-#: wt-status.c:1305
+#: wt-status.c:1326
 msgid "No commands remaining."
 msgstr "Команд больше не о�тало�ь."
 
-#: wt-status.c:1308
+#: wt-status.c:1329
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
@@ -7492,170 +8784,175 @@ msgstr[1] "СледующаÑ� команда длÑ� выполнениÑ� (%d кÐ
 msgstr[2] "Следующа� команда дл� выполнени� (%d команд о�тало�ь):"
 msgstr[3] "Следующа� команда дл� выполнени� (%d команд о�тало�ь):"
 
-#: wt-status.c:1316
+#: wt-status.c:1337
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
-msgstr "  (и�пользуйте «git rebase --edit-todo», чтобы про�мотреть и изменить)"
+msgstr "  (и�пользуйте «git rebase --edit-todo», чтобы про�мотреть или изменить их)"
 
-#: wt-status.c:1328
+#: wt-status.c:1349
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "Вы �ейча� перемещаете ветку «%s» над «%s»."
 
-#: wt-status.c:1333
+#: wt-status.c:1354
 msgid "You are currently rebasing."
 msgstr "Вы �ейча� перемещаете ветку."
 
-#: wt-status.c:1346
+#: wt-status.c:1367
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (разрешите конфликты, затем запу�тите «git rebase --continue»)"
 
-#: wt-status.c:1348
+#: wt-status.c:1369
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (и�пользуйте «git rebase --skip», чтобы пропу�тить �тот патч)"
 
-#: wt-status.c:1350
+#: wt-status.c:1371
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  (и�пользуйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
 
-#: wt-status.c:1357
+#: wt-status.c:1378
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (в�е конфликты разрешены: запу�тите «git rebase --continue»)"
 
-#: wt-status.c:1361
+#: wt-status.c:1382
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "Вы �ейча� раздел�ете коммит при перемещении ветки  «%s» над «%s»."
 
-#: wt-status.c:1366
+#: wt-status.c:1387
 msgid "You are currently splitting a commit during a rebase."
 msgstr "Вы �ейча� раздел�ете коммит при перемещении ветки."
 
-#: wt-status.c:1369
+#: wt-status.c:1390
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
-msgstr "(Как только ваш рабочий каталог будет чи�тый, запу�тите «git rebase --continue»)"
+msgstr "  (Как только ваш рабочий каталог будет чи�тый, запу�тите «git rebase --continue»)"
 
-#: wt-status.c:1373
+#: wt-status.c:1394
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "Вы �ейча� редактируете коммит при перемещении ветки  «%s» над «%s»."
 
-#: wt-status.c:1378
+#: wt-status.c:1399
 msgid "You are currently editing a commit during a rebase."
 msgstr "Вы �ейча� редактируете коммит при перемещении ветки."
 
-#: wt-status.c:1381
+#: wt-status.c:1402
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  (и�пользуйте «git commit --amend», чтобы и�править текущий коммит)"
 
-#: wt-status.c:1383
+#: wt-status.c:1404
 msgid "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  (и�пользуйте «git rebase --continue», когда будете довольны изменени�ми)"
 
-#: wt-status.c:1394
+#: wt-status.c:1415
 msgid "Cherry-pick currently in progress."
 msgstr ""
 
-#: wt-status.c:1397
+#: wt-status.c:1418
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "Вы копируете коммит %s."
 
-#: wt-status.c:1404
+#: wt-status.c:1425
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (разрешите конфликты, затем запу�тите «git cherry-pick --continue»)"
 
-#: wt-status.c:1407
+#: wt-status.c:1428
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr ""
 
-#: wt-status.c:1410
+#: wt-status.c:1431
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  (в�е конфликты разрешены: запу�тите «git cherry-pick --continue»)"
 
-#: wt-status.c:1412
+#: wt-status.c:1433
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr ""
+
+#: wt-status.c:1435
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  (и�пользуйте «git cherry-pick --abort», чтобы отменить копировани� коммита)"
 
-#: wt-status.c:1422
+#: wt-status.c:1445
 msgid "Revert currently in progress."
 msgstr ""
 
-#: wt-status.c:1425
+#: wt-status.c:1448
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Вы �ейча� обращаете изменени� коммита %s."
 
-#: wt-status.c:1431
+#: wt-status.c:1454
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (разрешите конфликты, затем запу�тите «git revert --continue»)"
 
-#: wt-status.c:1434
+#: wt-status.c:1457
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr ""
 
-#: wt-status.c:1437
+#: wt-status.c:1460
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (в�е конфликты разрешены: запу�тите «git revert --continue»)"
 
-#: wt-status.c:1439
+#: wt-status.c:1462
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr ""
+
+#: wt-status.c:1464
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (и�пользуйте «git revert --abort», чтобы отменить операцию обращени� изменений коммита)"
 
-#: wt-status.c:1449
+#: wt-status.c:1474
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "Вы �ейча� в проце��е двоичного пои�ка, начатого � ветки «%s»."
 
-#: wt-status.c:1453
+#: wt-status.c:1478
 msgid "You are currently bisecting."
 msgstr "Вы �ейча� в проце��е двоичного пои�ка."
 
-#: wt-status.c:1456
+#: wt-status.c:1481
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  (и�пользуйте «git bisect reset», чтобы вернуть�� на и�ходную ветку)"
 
-#: wt-status.c:1665
+#: wt-status.c:1492
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+
+#: wt-status.c:1731
 msgid "On branch "
 msgstr "�а ветке "
 
-#: wt-status.c:1672
+#: wt-status.c:1738
 msgid "interactive rebase in progress; onto "
 msgstr "интерактивное перемещение в проце��е; над "
 
-#: wt-status.c:1674
+#: wt-status.c:1740
 msgid "rebase in progress; onto "
 msgstr "перемещение в проце��е; над "
 
-#: wt-status.c:1679
-msgid "HEAD detached at "
-msgstr "HEAD отделён на "
-
-#: wt-status.c:1681
-msgid "HEAD detached from "
-msgstr "HEAD отделён начина� � "
-
-#: wt-status.c:1684
+#: wt-status.c:1750
 msgid "Not currently on any branch."
 msgstr "Сейча� ни на одной из веток"
 
-#: wt-status.c:1701
+#: wt-status.c:1767
 msgid "Initial commit"
 msgstr "�ачальный коммит"
 
-#: wt-status.c:1702
+#: wt-status.c:1768
 msgid "No commits yet"
 msgstr "Еще нет коммитов"
 
-#: wt-status.c:1716
+#: wt-status.c:1782
 msgid "Untracked files"
 msgstr "�еот�леживаемые файлы"
 
-#: wt-status.c:1718
+#: wt-status.c:1784
 msgid "Ignored files"
 msgstr "Игнорируемые файлы"
 
-#: wt-status.c:1722
+#: wt-status.c:1788
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -7663,216 +8960,225 @@ msgid ""
 "new files yourself (see 'git help status')."
 msgstr "%.2f �екунды зан�л вывод �пи�ка неот�леживаемых файлов. «status -uno» возможно может у�корить �то, но будьте внимательны, и не забудьте добавить новые файлы вручную (�мотрите «git help status» дл� подробно�тей)."
 
-#: wt-status.c:1728
+#: wt-status.c:1794
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "�еот�леживаемые файлы не показаны%s"
 
-#: wt-status.c:1730
+#: wt-status.c:1796
 msgid " (use -u option to show untracked files)"
-msgstr "(и�пользуйте опцию «-u», чтобы показать неот�леживаемые файлы)"
+msgstr " (и�пользуйте опцию «-u», чтобы показать неот�леживаемые файлы)"
 
-#: wt-status.c:1736
+#: wt-status.c:1802
 msgid "No changes"
 msgstr "�ет изменений"
 
-#: wt-status.c:1741
+#: wt-status.c:1807
 #, c-format
 msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "нет изменений добавленных дл� коммита\n(и�пользуйте «git add» и/или «git commit -a»)\n"
 
-#: wt-status.c:1744
+#: wt-status.c:1811
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "нет изменений добавленных дл� коммита\n"
 
-#: wt-status.c:1747
+#: wt-status.c:1815
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "ничего не добавлено в коммит, но е�ть неот�леживаемые файлы (и�пользуйте «git add», чтобы от�леживать их)\n"
 
-#: wt-status.c:1750
+#: wt-status.c:1819
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "ничего не добавлено в коммит, но е�ть неот�леживаемые файлы\n"
 
-#: wt-status.c:1753
+#: wt-status.c:1823
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "нечего коммитить (�оздайте/�копируйте файлы, затем запу�тите «git add», чтобы от�леживать их)\n"
 
-#: wt-status.c:1756 wt-status.c:1761
+#: wt-status.c:1827 wt-status.c:1833
 #, c-format
 msgid "nothing to commit\n"
 msgstr "нечего коммитить\n"
 
-#: wt-status.c:1759
+#: wt-status.c:1830
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "нечего коммитить (и�пользуйте опцию «-u», чтобы показать неот�леживаемые файлы)\n"
 
-#: wt-status.c:1763
+#: wt-status.c:1835
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
 
-#: wt-status.c:1876
+#: wt-status.c:1940
 msgid "No commits yet on "
-msgstr "Еще нет коммитов в"
+msgstr "Еще нет коммитов в "
 
-#: wt-status.c:1880
+#: wt-status.c:1944
 msgid "HEAD (no branch)"
 msgstr "HEAD (нет ветки)"
 
-#: wt-status.c:1911
+#: wt-status.c:1975
 msgid "different"
 msgstr "отличает��"
 
-#: wt-status.c:1913 wt-status.c:1921
+#: wt-status.c:1977 wt-status.c:1985
 msgid "behind "
-msgstr "позади"
+msgstr "позади "
 
-#: wt-status.c:1916 wt-status.c:1919
+#: wt-status.c:1980 wt-status.c:1983
 msgid "ahead "
 msgstr "впереди "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2443
+#: wt-status.c:2505
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "не удало�ь выполнить %s: У ва� е�ть непроиндек�ированные изменени�."
 
-#: wt-status.c:2449
+#: wt-status.c:2511
 msgid "additionally, your index contains uncommitted changes."
 msgstr "к тому же, в вашем индек�е е�ть незакоммиченные изменени�."
 
-#: wt-status.c:2451
+#: wt-status.c:2513
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "не удало�ь выполнить %s: В вашем индек�е е�ть незакоммиченные изменени�."
 
-#: builtin/add.c:25
+#: compat/precompose_utf8.c:58 builtin/clone.c:457
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "�бой от�оединени� «%s»"
+
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<опции>] [--] <�пецификатор-пути>…"
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "неожиданный �тату� утилиты �равнени� %c"
 
-#: builtin/add.c:89 builtin/commit.c:285
+#: builtin/add.c:93 builtin/commit.c:285
 msgid "updating files failed"
 msgstr "�бой при обновлении файлов"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "удалить «%s»\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr "�епроиндек�ированные изменени� по�ле обновлени� индек�а:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:896
+#: builtin/add.c:272 builtin/rev-parse.c:908
 msgid "Could not read the index"
 msgstr "�е удало�ь прочитать индек�"
 
-#: builtin/add.c:245
+#: builtin/add.c:283
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "�е удало�ь открыть «%s» дл� запи�и."
 
-#: builtin/add.c:249
+#: builtin/add.c:287
 msgid "Could not write patch"
 msgstr "�е удало�ь запи�ать патч"
 
-#: builtin/add.c:252
+#: builtin/add.c:290
 msgid "editing patch failed"
 msgstr "�бой при редактировании патча"
 
-#: builtin/add.c:255
+#: builtin/add.c:293
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�е удало�ь выполнить stat дл� «%s»"
 
-#: builtin/add.c:257
+#: builtin/add.c:295
 msgid "Empty patch. Aborted."
 msgstr "Пу�той патч. Операци� прервана."
 
-#: builtin/add.c:262
+#: builtin/add.c:300
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "�е удало�ь применить «%s»"
 
-#: builtin/add.c:270
+#: builtin/add.c:308
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "Следующие пути игнорируют�� одним из ваших файлов .gitignore:\n"
 
-#: builtin/add.c:290 builtin/clean.c:908 builtin/fetch.c:137 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:221 builtin/push.c:560
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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
 msgid "dry run"
 msgstr "пробный запу�к"
 
-#: builtin/add.c:293
+#: builtin/add.c:331
 msgid "interactive picking"
 msgstr "интерактивный выбор"
 
-#: builtin/add.c:294 builtin/checkout.c:1379 builtin/reset.c:306
+#: builtin/add.c:332 builtin/checkout.c:1547 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "интерактивный выбор блоков"
 
-#: builtin/add.c:295
+#: builtin/add.c:333
 msgid "edit current diff and apply"
 msgstr "отредактировать текущий файл �пи�ка изменений и применить его"
 
-#: builtin/add.c:296
+#: builtin/add.c:334
 msgid "allow adding otherwise ignored files"
 msgstr "разрешить добавление игнорируемых иначе файлов"
 
-#: builtin/add.c:297
+#: builtin/add.c:335
 msgid "update tracked files"
 msgstr "обновить от�леживаемые файлы"
 
-#: builtin/add.c:298
+#: builtin/add.c:336
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "перенормализировать концы �трок (EOL) от�леживаемых файлов (подразумевает -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:337
 msgid "record only the fact that the path will be added later"
 msgstr "запи�ать только факт, что путь будет добавлен позже"
 
-#: builtin/add.c:300
+#: builtin/add.c:338
 msgid "add changes from all tracked and untracked files"
 msgstr "добавить изменени� из в�ех от�леживаемых и неот�леживаемых файлов"
 
-#: builtin/add.c:303
+#: builtin/add.c:341
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)"
 
-#: builtin/add.c:305
+#: builtin/add.c:343
 msgid "don't add, only refresh the index"
 msgstr "не добавл�ть, только обновить индек�"
 
-#: builtin/add.c:306
+#: builtin/add.c:344
 msgid "just skip files which cannot be added because of errors"
 msgstr "пропу�кать файлы, которые не могут быть добавлены из-за ошибок"
 
-#: builtin/add.c:307
+#: builtin/add.c:345
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "удо�товерить��, что даже недо�тающие файлы будут проигнорированы при  пробном запу�ке"
 
-#: builtin/add.c:309 builtin/update-index.c:1001
+#: builtin/add.c:347 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "переопределить бит выполнени� на указанных файлах"
 
-#: builtin/add.c:311
+#: builtin/add.c:349
 msgid "warn when adding an embedded repository"
 msgstr "предупреждать при добавлении в�троенного git репозитори�"
 
-#: builtin/add.c:326
+#: builtin/add.c:351
+msgid "backend for `git stash -p`"
+msgstr ""
+
+#: builtin/add.c:369
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -7890,399 +9196,434 @@ msgid ""
 "See \"git help submodule\" for more information."
 msgstr "Вы добавили другой репозиторий git внутри текущего репозитори�\nКлоны внешнего репозитори� не будут �одержать внутренний\nрепозиторий и не будут знать как его получить.\nЕ�ли вы хотели добавить подмодуль, то запу�тите:\n\n\tgit submodule add <url> %s\n\nЕ�ли бы добавили �тот путь по ошибке, то вы можете удалить его\nиз индек�а � помощью:\n\n\tgit rm --cached %s\n\nДл� дополнительной информации �мотрите «git help submodule»."
 
-#: builtin/add.c:354
+#: builtin/add.c:397
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "добавление в�троенного git репозитори�: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "И�пользуйте -f, е�ли вы дей�твительно хотите добавить их.\n"
+#: builtin/add.c:416
+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:379
+#: builtin/add.c:425
 msgid "adding files failed"
 msgstr "ошибка при добавлении файлов"
 
-#: builtin/add.c:419
+#: builtin/add.c:453 builtin/commit.c:345
+msgid "--pathspec-from-file is incompatible with --interactive/--patch"
+msgstr ""
+
+#: builtin/add.c:470
+msgid "--pathspec-from-file is incompatible with --edit"
+msgstr ""
+
+#: builtin/add.c:482
 msgid "-A and -u are mutually incompatible"
 msgstr "-A и -u нельз� и�пользовать одновременно"
 
-#: builtin/add.c:426
+#: builtin/add.c:485
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "Опци� --ignore-missing может и�пользовать�� только вме�те � --dry-run"
 
-#: builtin/add.c:430
+#: builtin/add.c:489
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "параметр --chmod «%s» должен быть -x или +x"
 
-#: builtin/add.c:445
+#: builtin/add.c:507 builtin/checkout.c:1715 builtin/commit.c:351
+#: builtin/reset.c:328 builtin/rm.c:272 builtin/stash.c:1502
+msgid "--pathspec-from-file is incompatible with pathspec arguments"
+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
+msgid "--pathspec-file-nul requires --pathspec-from-file"
+msgstr ""
+
+#: builtin/add.c:518
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "�ичего не указано, ничего не добавлено.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Возможно, вы имели в виду «git add .»?\n"
+#: builtin/add.c:520
+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:348
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "не удало�ь разобрать �ценарий автор�тва"
 
-#: builtin/am.c:432
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "«%s» был удален перехватчиком applypatch-msg"
 
-#: builtin/am.c:474
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "�еправильна� �трока ввода: «%s»."
 
-#: builtin/am.c:512
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "�е удало�ь �копировать заметку из «%s» в «%s»"
 
-#: builtin/am.c:538
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "�бой при выполнении fseek"
 
-#: builtin/am.c:726
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "не удало�ь разобрать патч «%s»"
 
-#: builtin/am.c:791
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "Только �ери� патчей StGIT может быть применена за раз"
 
-#: builtin/am.c:839
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "недопу�тима� метка даты/времени"
 
-#: builtin/am.c:844 builtin/am.c:856
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "недопу�тима� �трока даты"
 
-#: builtin/am.c:851
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "недопу�тимое �мещение ча�ового по��а"
 
-#: builtin/am.c:944
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "Сбой определени� формата патча."
 
-#: builtin/am.c:949 builtin/clone.c:409
+#: builtin/am.c:953 builtin/clone.c:410
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "не удало�ь �оздать каталог «%s»"
 
-#: builtin/am.c:954
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "�е удало�ь разделить патчи на ча�ти."
 
-#: builtin/am.c:1084 builtin/commit.c:371
-msgid "unable to write index file"
-msgstr "не удало�ь запи�ать индек�"
-
-#: builtin/am.c:1098
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "Когда вы у�траните �ту проблему, запу�тите «%s --continue»."
 
-#: builtin/am.c:1099
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "Е�ли вы хотите пропу�тить �тот патч, то запу�тите «%s --skip»."
 
-#: builtin/am.c:1100
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "Чтобы вернуть�� на предыдущую ветку и о�тановить применение изменений, запу�тите «%s --abort»."
 
-#: builtin/am.c:1183
+#: builtin/am.c:1174
 msgid ""
 "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr ""
 
-#: builtin/am.c:1211
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr "Патч пу�той."
 
-#: builtin/am.c:1277
+#: builtin/am.c:1267
 #, c-format
-msgid "invalid ident line: %.*s"
-msgstr "неправильна� �трока идентификации: %.*s"
+msgid "missing author line in commit %s"
+msgstr ""
 
-#: builtin/am.c:1299
+#: builtin/am.c:1270
 #, c-format
-msgid "unable to parse commit %s"
-msgstr "не удало�ь разобрать коммит %s"
+msgid "invalid ident line: %.*s"
+msgstr "неправильна� �трока идентификации: %.*s"
 
-#: builtin/am.c:1495
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "В репозитории от�ут�твуют двоичные объекты, необходимые дл� отката к трехходовому �ли�нию."
 
-#: builtin/am.c:1497
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr "И�пользую индек� дл� рекон�трукции базового дерева…"
 
-#: builtin/am.c:1516
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
 msgstr "Вы вручную измен�ли патч?\nОн не накладывает�� без ошибок на двоичные объекты, запи�анные в его заголовке."
 
-#: builtin/am.c:1522
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "Откат к применению изменений к базовому коммиту � помощью трехходового �ли�ни�…"
 
-#: builtin/am.c:1548
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "�е удало�ь �лить изменени�."
 
-#: builtin/am.c:1580
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr "применение к пу�той и�тории"
 
-#: builtin/am.c:1627 builtin/am.c:1631
+#: builtin/am.c:1626 builtin/am.c:1630
 #, c-format
 msgid "cannot resume: %s does not exist."
-msgstr "нельз� продолжнить: %s не �уще�твует "
+msgstr "нельз� продолжнить: %s не �уще�твует."
 
-#: builtin/am.c:1647
-msgid "cannot be interactive without stdin connected to a terminal."
-msgstr "не удало�ь и�пользовать интерактивное поведение, без stdin подключенного к терминалу."
-
-#: builtin/am.c:1652
+#: builtin/am.c:1648
 msgid "Commit Body is:"
 msgstr "Тело коммита:"
 
 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 #. in your translation. The program will only accept English
 #. input at this point.
-#: builtin/am.c:1662
+#: builtin/am.c:1658
+#, 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:1712
+#: builtin/am.c:1704 builtin/commit.c:395
+msgid "unable to write index file"
+msgstr "не удало�ь запи�ать индек�"
+
+#: builtin/am.c:1708
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Индек� изменён: нельз� примен�ть патчи (изменено: %s)"
 
-#: builtin/am.c:1752 builtin/am.c:1820
+#: builtin/am.c:1748 builtin/am.c:1816
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Применение: %.*s"
 
-#: builtin/am.c:1769
+#: builtin/am.c:1765
 msgid "No changes -- Patch already applied."
 msgstr "�ет изменений — Патч уже применен."
 
-#: builtin/am.c:1775
+#: builtin/am.c:1771
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Ошибка применени� изменений на %s %.*s"
 
-#: builtin/am.c:1779
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1775
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
 
-#: builtin/am.c:1823
+#: builtin/am.c:1819
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
 "already introduced the same changes; you might want to skip this patch."
 msgstr "�ет изменений — возможно, вы забыли вызвать «git add»?\nЕ�ли ничего не о�тало�ь дл� индек�ации, то, �корее в�его, что-то другое уже �делало те же изменени�; возможно, вам �ледует пропу�тить �тот патч."
 
-#: builtin/am.c:1830
+#: builtin/am.c:1826
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as such.\n"
 "You might run `git rm` on a file to accept \"deleted by them\" for it."
 msgstr "У ва� е�ть не �литые пути в индек�е.\nВы должны выполнить «git add» дл� каждого файла � разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запу�тить «git rm» � именем файла, чтобы пометить его как «удалено ими»."
 
-#: builtin/am.c:1937 builtin/am.c:1941 builtin/am.c:1953 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1933 builtin/am.c:1937 builtin/am.c:1949 builtin/reset.c:347
+#: builtin/reset.c:355
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "�е удало�ь разобрать объект «%s»."
 
-#: builtin/am.c:1989
+#: builtin/am.c:1985
 msgid "failed to clean index"
 msgstr "не удало�ь очи�тить индек�"
 
-#: builtin/am.c:2033
+#: builtin/am.c:2029
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr "Похоже, что вы переме�тили HEAD � момента по�ледней ошибки выполнени� «am».\nПеремотка на ORIG_HEAD не выполн�ет��"
 
-#: builtin/am.c:2130
+#: builtin/am.c:2136
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "�еправильное значение дл� --patch-format: %s"
 
-#: builtin/am.c:2166
+#: builtin/am.c:2178
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr ""
+
+#: builtin/am.c:2182
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr ""
+
+#: builtin/am.c:2213
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]"
 
-#: builtin/am.c:2167
+#: builtin/am.c:2214
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<опции>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2173
+#: builtin/am.c:2220
 msgid "run interactively"
 msgstr "запу�тить в интерактивном режиме"
 
-#: builtin/am.c:2175
+#: builtin/am.c:2222
 msgid "historical option -- no-op"
 msgstr "и�ториче�ка� опци� — ничего не делает"
 
-#: builtin/am.c:2177
+#: builtin/am.c:2224
 msgid "allow fall back on 3way merging if needed"
 msgstr "разрешить откатить�� к трехходовому �ли�нию, е�ли нужно"
 
-#: builtin/am.c:2178 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:306 builtin/stash.c:805
+#: builtin/am.c:2225 builtin/init-db.c:560 builtin/prune-packed.c:16
+#: builtin/repack.c:335 builtin/stash.c:815
 msgid "be quiet"
 msgstr "тихий режим"
 
-#: builtin/am.c:2180
-msgid "add a Signed-off-by line to the commit message"
-msgstr "добавить �троку Signed-off-by к �ообщению коммита"
+#: builtin/am.c:2227
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr ""
 
-#: builtin/am.c:2183
+#: builtin/am.c:2230
 msgid "recode into utf8 (default)"
 msgstr "перекодировать в utf8 (по умолчанию)"
 
-#: builtin/am.c:2185
+#: builtin/am.c:2232
 msgid "pass -k flag to git-mailinfo"
 msgstr "передать флаг -k в git-mailinfo"
 
-#: builtin/am.c:2187
+#: builtin/am.c:2234
 msgid "pass -b flag to git-mailinfo"
 msgstr "передать флаг -b в git-mailinfo"
 
-#: builtin/am.c:2189
+#: builtin/am.c:2236
 msgid "pass -m flag to git-mailinfo"
 msgstr "передать флаг -m в git-mailinfo"
 
-#: builtin/am.c:2191
+#: builtin/am.c:2238
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "передать флаг --keep-cr в git-mailsplit дл� формата mbox"
 
-#: builtin/am.c:2194
+#: builtin/am.c:2241
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "не передавать --keep-cr флаг в git-mailsplit вне зави�имо�ти от am.keepcr"
 
-#: builtin/am.c:2197
+#: builtin/am.c:2244
 msgid "strip everything before a scissors line"
 msgstr "обрезать в�е до �троки обрезки"
 
-#: builtin/am.c:2199 builtin/am.c:2202 builtin/am.c:2205 builtin/am.c:2208
-#: builtin/am.c:2211 builtin/am.c:2214 builtin/am.c:2217 builtin/am.c:2220
-#: builtin/am.c:2226
+#: 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
 msgid "pass it through git-apply"
 msgstr "передать его в git-apply"
 
-#: builtin/am.c:2216 builtin/commit.c:1348 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:879 builtin/merge.c:247
-#: builtin/pull.c:158 builtin/pull.c:217 builtin/rebase.c:1412
-#: builtin/repack.c:317 builtin/repack.c:321 builtin/repack.c:323
-#: builtin/show-branch.c:651 builtin/show-ref.c:172 builtin/tag.c:397
-#: parse-options.h:141 parse-options.h:162 parse-options.h:311
+#: 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/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
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2222 builtin/branch.c:653 builtin/for-each-ref.c:38
-#: builtin/replace.c:554 builtin/tag.c:431 builtin/verify-tag.c:39
+#: builtin/am.c:2269 builtin/branch.c:661 builtin/bugreport.c:136
+#: builtin/for-each-ref.c:38 builtin/replace.c:556 builtin/tag.c:438
+#: builtin/verify-tag.c:38
 msgid "format"
 msgstr "формат"
 
-#: builtin/am.c:2223
+#: builtin/am.c:2270
 msgid "format the patch(es) are in"
 msgstr "формат, в котором наход�т�� патчи"
 
-#: builtin/am.c:2229
+#: builtin/am.c:2276
 msgid "override error message when patch failure occurs"
 msgstr "переопределить �ообщение об ошибке, е�ли не удало�ь наложить изменени�"
 
-#: builtin/am.c:2231
+#: builtin/am.c:2278
 msgid "continue applying patches after resolving a conflict"
 msgstr "продолжить применение изменений по�ле разрешени� конфиликта"
 
-#: builtin/am.c:2234
+#: builtin/am.c:2281
 msgid "synonyms for --continue"
 msgstr "�иноним дл� --continue"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2284
 msgid "skip the current patch"
 msgstr "пропу�тить текущий патч"
 
-#: builtin/am.c:2240
+#: builtin/am.c:2287
 msgid "restore the original branch and abort the patching operation."
 msgstr "во��тановить оригинальную ветку и отменить операцию применени� изменений."
 
-#: builtin/am.c:2243
+#: builtin/am.c:2290
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr ""
 
-#: builtin/am.c:2246
-msgid "show the patch being applied."
+#: builtin/am.c:2294
+msgid "show the patch being applied"
 msgstr ""
 
-#: builtin/am.c:2250
+#: builtin/am.c:2299
 msgid "lie about committer date"
 msgstr "�оврать о дате коммитера"
 
-#: builtin/am.c:2252
+#: builtin/am.c:2301
 msgid "use current timestamp for author date"
 msgstr "и�пользовать текущее врем� как врем� автор�тва"
 
-#: builtin/am.c:2254 builtin/commit-tree.c:120 builtin/commit.c:1491
-#: builtin/merge.c:282 builtin/pull.c:192 builtin/rebase.c:489
-#: builtin/rebase.c:1453 builtin/revert.c:116 builtin/tag.c:412
+#: 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
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2255 builtin/rebase.c:490 builtin/rebase.c:1454
+#: builtin/am.c:2304 builtin/rebase.c:537 builtin/rebase.c:1395
 msgid "GPG-sign commits"
 msgstr "подпи�ать коммиты � помощью GPG"
 
-#: builtin/am.c:2258
+#: builtin/am.c:2307
 msgid "(internal use for git-rebase)"
 msgstr "(внутреннее и�пользование дл� git-rebase)"
 
-#: builtin/am.c:2276
+#: builtin/am.c:2325
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
 msgstr "Опци� -b/--binary уже долгое врем� ничего не делает и будет удалена � �ледующих вер�и�х Git. Пожалуй�та, не и�пользуйте ее."
 
-#: builtin/am.c:2283
+#: builtin/am.c:2332
 msgid "failed to read the index"
 msgstr "�бой чтени� индек�а"
 
-#: builtin/am.c:2298
+#: builtin/am.c:2347
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "предыдущий каталог перемещени� %s еще �уще�твует, но передан mbox."
 
-#: builtin/am.c:2322
+#: builtin/am.c:2371
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
 "Use \"git am --abort\" to remove it."
 msgstr "�айден забытый каталог %s.\nИ�пользуйте «git am --abort», чтобы удалить его."
 
-#: builtin/am.c:2328
+#: builtin/am.c:2377
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Операци� разрешени� конфликтов не в проце��е выполнени�, не продолжаем."
 
+#: builtin/am.c:2387
+msgid "interactive mode requires patches on the command line"
+msgstr ""
+
 #: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
 msgstr "git apply [<опции>] [<патч>…]"
@@ -8317,118 +9658,128 @@ msgstr "git archive: ошибка протокола"
 msgid "git archive: expected a flush"
 msgstr "git archive: ожидал�� �бро� буфера"
 
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
 #: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <плохое-определение> <хорошее-определение>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr ""
 
-#: builtin/bisect--helper.c:26
+#: builtin/bisect--helper.c:24
 msgid ""
 "git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
 "<bad_term>"
 msgstr ""
 
-#: builtin/bisect--helper.c:27
+#: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
 "<bad_term>"
 msgstr ""
 
-#: builtin/bisect--helper.c:28
+#: builtin/bisect--helper.c:26
 msgid "git bisect--helper --bisect-next-check <good_term> <bad_term> [<term>]"
 msgstr ""
 
-#: builtin/bisect--helper.c:29
+#: builtin/bisect--helper.c:27
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | "
 "--term-new]"
 msgstr ""
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:28
 msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> "
-"--term-{new,bad}=<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>...]"
+msgstr "git bisect--helper --bisect-start [--term-{new,bad}=<термин> --term-{old,good}=<термин>] [--no-checkout] [--first-parent] [<плоха�-редаци�> [<хороша�-редаци�>…]] [--] [<пути>…]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-next"
+msgstr ""
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-auto-next"
+msgstr ""
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-state (bad|new) [<rev>]"
+msgstr ""
+
+#: builtin/bisect--helper.c:33
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr ""
+
+#: builtin/bisect--helper.c:108
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:115
+#, c-format
+msgid "could not write to file '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:154
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "«%s» не �вл�ет�� допу�тимым определением"
 
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:158
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "нельз� и�пользовать в�троенную команду «%s» как определение"
 
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:168
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "нельз� изменить значение определени� «%s»"
 
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:178
 msgid "please use two different terms"
 msgstr "и�пользуйте два разных определени�"
 
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "не удало�ь открыть файл BISECT_TERMS"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:194
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr ""
 
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:202
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:211
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
 msgstr ""
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:255
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr ""
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:260
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:272
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:298
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr ""
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:325
 #, 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:289
+#: builtin/bisect--helper.c:329
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -8436,7 +9787,7 @@ msgid ""
 "You can use \"git bisect %s\" and \"git bisect %s\" for that."
 msgstr ""
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:349
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr ""
@@ -8444,131 +9795,167 @@ msgstr ""
 #. 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:329
+#: builtin/bisect--helper.c:357
 msgid "Are you sure [Y/n]? "
 msgstr "Вы уверены [Y - да/n - нет]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:418
 msgid "no terms defined"
 msgstr "определени� не заданы"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:421
 #, 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:389
+#: builtin/bisect--helper.c:431
 #, 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:475
+#: builtin/bisect--helper.c:498
+msgid "revision walk setup failed\n"
+msgstr ""
+
+#: builtin/bisect--helper.c:520
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr ""
+
+#: builtin/bisect--helper.c:639 builtin/bisect--helper.c:652
+msgid "'' is not a valid term"
+msgstr ""
+
+#: builtin/bisect--helper.c:662
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr ""
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:666
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr ""
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:697
 msgid "bad HEAD - I need a HEAD"
 msgstr ""
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:712
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr ""
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:733
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "нельз� выполнить двоичный пои�к на дереве по�ле cg-seek"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:736
 msgid "bad HEAD - strange symbolic ref"
 msgstr ""
 
-#: builtin/bisect--helper.c:627
-msgid "perform 'git bisect next'"
-msgstr "выполнить «git bisect next»"
+#: builtin/bisect--helper.c:756
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:814
+msgid "You need to start by \"git bisect start\"\n"
+msgstr ""
+
+#. 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
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "Вы уверены, что хотите, чтобы � �делал �то [Y] - да/[n] - нет? "
 
-#: builtin/bisect--helper.c:629
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "запи�ать определени� в .git/BISECT_TERMS"
+#: builtin/bisect--helper.c:843
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr ""
 
-#: builtin/bisect--helper.c:631
-msgid "cleanup the bisection state"
-msgstr "очи�тить �о�то�ние двоичного пои�ка"
+#: builtin/bisect--helper.c:856
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr ""
 
-#: builtin/bisect--helper.c:633
-msgid "check for expected revs"
-msgstr "проверить ожидаемые редакции"
+#: builtin/bisect--helper.c:868 builtin/bisect--helper.c:879
+#, c-format
+msgid "Bad rev input: %s"
+msgstr ""
 
-#: builtin/bisect--helper.c:635
+#: builtin/bisect--helper.c:924
 msgid "reset the bisection state"
 msgstr ""
 
-#: builtin/bisect--helper.c:637
+#: builtin/bisect--helper.c:926
 msgid "write out the bisection state in BISECT_LOG"
 msgstr ""
 
-#: builtin/bisect--helper.c:639
+#: builtin/bisect--helper.c:928
 msgid "check and set terms in a bisection state"
 msgstr ""
 
-#: builtin/bisect--helper.c:641
+#: builtin/bisect--helper.c:930
 msgid "check whether bad or good terms exist"
 msgstr ""
 
-#: builtin/bisect--helper.c:643
+#: builtin/bisect--helper.c:932
 msgid "print out the bisect terms"
 msgstr ""
 
-#: builtin/bisect--helper.c:645
+#: builtin/bisect--helper.c:934
 msgid "start the bisect session"
 msgstr ""
 
-#: builtin/bisect--helper.c:647
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "обновить BISECT_HEAD вме�то перехода на текущий коммит"
+#: builtin/bisect--helper.c:936
+msgid "find the next bisection commit"
+msgstr ""
 
-#: builtin/bisect--helper.c:649
-msgid "no log for BISECT_WRITE"
+#: builtin/bisect--helper.c:938
+msgid ""
+"verify the next bisection state then checkout the next bisection commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:666
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms требует указани� двух параметров"
+#: builtin/bisect--helper.c:940
+msgid "mark the state of ref (or refs)"
+msgstr ""
 
-#: builtin/bisect--helper.c:670
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state не требует указани� параметров"
+#: builtin/bisect--helper.c:942
+msgid "no log for BISECT_WRITE"
+msgstr ""
 
-#: builtin/bisect--helper.c:677
+#: builtin/bisect--helper.c:957
 msgid "--bisect-reset requires either no argument or a commit"
 msgstr ""
 
-#: builtin/bisect--helper.c:681
+#: builtin/bisect--helper.c:961
 msgid "--bisect-write requires either 4 or 5 arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:687
+#: builtin/bisect--helper.c:967
 msgid "--check-and-set-terms requires 3 arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:693
+#: builtin/bisect--helper.c:973
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr ""
 
-#: builtin/bisect--helper.c:699
+#: builtin/bisect--helper.c:979
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr ""
 
+#: builtin/bisect--helper.c:988
+msgid "--bisect-next requires 0 arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:994
+msgid "--bisect-auto-next requires 0 arguments"
+msgstr ""
+
 #: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<опции>] [<опции-редакции>] [<редакци�>] [--] <файл>"
@@ -8577,133 +9964,146 @@ msgstr "git blame [<опции>] [<опции-редакции>] [<редакцÐ
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<опции-rev-list> документированы в git-rev-list(1)"
 
-#: builtin/blame.c:407
+#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
 msgstr "ожидает�� цвет: %s"
 
-#: builtin/blame.c:414
+#: builtin/blame.c:417
 msgid "must end with a color"
 msgstr "должно заканчивать�� на цвет"
 
-#: builtin/blame.c:701
+#: builtin/blame.c:730
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr ""
 
-#: builtin/blame.c:719
+#: builtin/blame.c:748
 msgid "invalid value for blame.coloring"
 msgstr ""
 
-#: builtin/blame.c:794
+#: builtin/blame.c:847
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr ""
+
+#: builtin/blame.c:869
 msgid "Show blame entries as we find them, incrementally"
 msgstr "Показать запи�и автор�тва по�тепенно, в проце��е нахождени�"
 
-#: builtin/blame.c:795
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "�е показывать SHA-1 дл� коммитов, не вход�щих в границы запро�а (По умолчанию: отключено)"
+#: builtin/blame.c:870
+msgid "Do not show object names of boundary commits (Default: off)"
+msgstr ""
 
-#: builtin/blame.c:796
+#: builtin/blame.c:871
 msgid "Do not treat root commits as boundaries (Default: off)"
 msgstr "�е во�принимать корневые коммиты как граничные (По умолчанию: отключено)"
 
-#: builtin/blame.c:797
+#: builtin/blame.c:872
 msgid "Show work cost statistics"
 msgstr "Показать �тати�тику ра�ходов на выполнение запро�а"
 
-#: builtin/blame.c:798
+#: builtin/blame.c:873
 msgid "Force progress reporting"
 msgstr "Принудительно выводить прогре�� выполнени�"
 
-#: builtin/blame.c:799
+#: builtin/blame.c:874
 msgid "Show output score for blame entries"
 msgstr "Показать оценку дл� запи�ей автор�тва"
 
-#: builtin/blame.c:800
+#: builtin/blame.c:875
 msgid "Show original filename (Default: auto)"
 msgstr "Показать оригинальное им� файла (По умолчанию: автоматиче�ки)"
 
-#: builtin/blame.c:801
+#: builtin/blame.c:876
 msgid "Show original linenumber (Default: off)"
 msgstr "Показать оригинальные номера �трок (По умолчанию: отключено)"
 
-#: builtin/blame.c:802
+#: builtin/blame.c:877
 msgid "Show in a format designed for machine consumption"
 msgstr "Показать в формате дл� программного разбора"
 
-#: builtin/blame.c:803
+#: builtin/blame.c:878
 msgid "Show porcelain format with per-line commit information"
 msgstr "Показать в машиночитаемом формате, � по�трочной информацией о коммите"
 
-#: builtin/blame.c:804
+#: builtin/blame.c:879
 msgid "Use the same output mode as git-annotate (Default: off)"
 msgstr "И�пользовать такой же формат вывода, как и git-annotate (По умолчанию: отключено)"
 
-#: builtin/blame.c:805
+#: builtin/blame.c:880
 msgid "Show raw timestamp (Default: off)"
 msgstr "Показать необработанные временные метки (По умолчанию: отключено)"
 
-#: builtin/blame.c:806
+#: builtin/blame.c:881
 msgid "Show long commit SHA1 (Default: off)"
 msgstr "Показать длинный SHA1 идентификатор коммита (По умолчанию: отключено)"
 
-#: builtin/blame.c:807
+#: builtin/blame.c:882
 msgid "Suppress author name and timestamp (Default: off)"
 msgstr "�е показывать им� автора и временные метки (По умолчанию: отключено)"
 
-#: builtin/blame.c:808
+#: builtin/blame.c:883
 msgid "Show author email instead of name (Default: off)"
 msgstr "Показать почту автора вме�то имени (По умолчанию: отключено)"
 
-#: builtin/blame.c:809
+#: builtin/blame.c:884
 msgid "Ignore whitespace differences"
 msgstr "Игнорировать различи� в пробелах"
 
-#: builtin/blame.c:810
+#: builtin/blame.c:885 builtin/log.c:1813
+msgid "rev"
+msgstr ""
+
+#: builtin/blame.c:885
+msgid "Ignore <rev> when blaming"
+msgstr ""
+
+#: builtin/blame.c:886
+msgid "Ignore revisions from <file>"
+msgstr ""
+
+#: builtin/blame.c:887
 msgid "color redundant metadata from previous line differently"
 msgstr ""
 
-#: builtin/blame.c:811
+#: builtin/blame.c:888
 msgid "color lines by age"
 msgstr ""
 
-#: builtin/blame.c:818
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "И�пользовать �к�перементальную �ври�тику, чтобы улучшить файлы �пи�ка изменений"
-
-#: builtin/blame.c:820
+#: builtin/blame.c:889
 msgid "Spend extra cycles to find better match"
 msgstr "Потратить больше времени, дл� нахождени� лучших �овпадений"
 
-#: builtin/blame.c:821
+#: builtin/blame.c:890
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "И�пользовать редакции из <файла> вме�то вызова git-rev-list"
 
-#: builtin/blame.c:822
+#: builtin/blame.c:891
 msgid "Use <file>'s contents as the final image"
 msgstr "И�пользовать �одержимое <файла> как финальный �нимок"
 
-#: builtin/blame.c:823 builtin/blame.c:824
+#: builtin/blame.c:892 builtin/blame.c:893
 msgid "score"
 msgstr "мин-длина"
 
-#: builtin/blame.c:823
+#: builtin/blame.c:892
 msgid "Find line copies within and across files"
 msgstr "�айти копирование �трок в пределах и между файлами"
 
-#: builtin/blame.c:824
+#: builtin/blame.c:893
 msgid "Find line movements within and across files"
 msgstr "�айти перемещени� �трок в пределах и между файлами"
 
-#: builtin/blame.c:825
-msgid "n,m"
-msgstr "начало,конец"
+#: builtin/blame.c:894
+msgid "range"
+msgstr ""
 
-#: builtin/blame.c:825
-msgid "Process only line range n,m, counting from 1"
-msgstr "Обработать только �троки в диапазоне начало,конец, начина� � 1"
+#: builtin/blame.c:895
+msgid "Process only line range <start>,<end> or function :<funcname>"
+msgstr ""
 
-#: builtin/blame.c:876
+#: builtin/blame.c:947
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress нельз� и�пользовать одновременно � --incremental или машиночитаемым (porcelain) форматом"
 
@@ -8714,11 +10114,11 @@ msgstr "--progress нельзÑ� иÑ�пользовать одновременнÐ
 #. among various forms of relative timestamps, but
 #. your language may need more or fewer display
 #. columns.
-#: builtin/blame.c:927
+#: builtin/blame.c:998
 msgid "4 years, 11 months ago"
 msgstr "4 года и 11 ме��цев назад"
 
-#: builtin/blame.c:1031
+#: builtin/blame.c:1114
 #, c-format
 msgid "file %s has only %lu line"
 msgid_plural "file %s has only %lu lines"
@@ -8727,13 +10127,13 @@ msgstr[1] "файл %s �одержит только %lu �троки"
 msgstr[2] "файл %s �одержит только %lu �трок"
 msgstr[3] "файл %s �одержит только %lu �троки"
 
-#: builtin/blame.c:1077
+#: builtin/blame.c:1159
 msgid "Blaming lines"
 msgstr "Про�мотр авторов �трок"
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<опции>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr ""
 
 #: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -8759,147 +10159,147 @@ msgstr "git branch [<опции>] [-r | -a] [--points-at]"
 msgid "git branch [<options>] [-r | -a] [--format]"
 msgstr "git branch [<опции>] [-r | -a] [--format]"
 
-#: builtin/branch.c:151
+#: builtin/branch.c:154
 #, c-format
 msgid ""
 "deleting branch '%s' that has been merged to\n"
 "         '%s', but not yet merged to HEAD."
 msgstr "удаление ветки «%s», котора� была �лита �\n         «%s», но не �лита � HEAD."
 
-#: builtin/branch.c:155
+#: builtin/branch.c:158
 #, c-format
 msgid ""
 "not deleting branch '%s' that is not yet merged to\n"
 "         '%s', even though it is merged to HEAD."
 msgstr "не удаление ветки «%s», котора� еще не �лита �\n         «%s», хот� уже �лита � HEAD."
 
-#: builtin/branch.c:169
+#: builtin/branch.c:172
 #, c-format
 msgid "Couldn't look up commit object for '%s'"
 msgstr "�е удало�ь найти объект коммита дл� «%s»"
 
-#: builtin/branch.c:173
+#: builtin/branch.c:176
 #, c-format
 msgid ""
 "The branch '%s' is not fully merged.\n"
 "If you are sure you want to delete it, run 'git branch -D %s'."
 msgstr "Ветка «%s» не �лита полно�тью.\nЕ�ли вы уверены, что хотите ее удалить, запу�тите «git branch -D %s»."
 
-#: builtin/branch.c:186
+#: builtin/branch.c:189
 msgid "Update of config-file failed"
 msgstr "�е удало�ь обновить файл конфигурации"
 
-#: builtin/branch.c:217
+#: builtin/branch.c:220
 msgid "cannot use -a with -d"
 msgstr "нельз� и�пользовать одновременно ключи -a и -d"
 
-#: builtin/branch.c:223
+#: builtin/branch.c:226
 msgid "Couldn't look up commit object for HEAD"
 msgstr "�е удало�ь найти объект коммита дл� HEAD"
 
-#: builtin/branch.c:237
+#: builtin/branch.c:240
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "�ельз� удалить ветку «%s» т.к. она активна на «%s»"
 
-#: builtin/branch.c:252
+#: builtin/branch.c:255
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "внешн�� от�леживаема� ветка «%s» не найдена."
 
-#: builtin/branch.c:253
+#: builtin/branch.c:256
 #, c-format
 msgid "branch '%s' not found."
 msgstr "ветка «%s» не найдена."
 
-#: builtin/branch.c:268
+#: builtin/branch.c:271
 #, c-format
 msgid "Error deleting remote-tracking branch '%s'"
 msgstr "Ошибка удалени� внешней от�леживаемой ветки «%s»"
 
-#: builtin/branch.c:269
+#: builtin/branch.c:272
 #, c-format
 msgid "Error deleting branch '%s'"
 msgstr "Ошибка удалени� ветки «%s»"
 
-#: builtin/branch.c:276
+#: builtin/branch.c:279
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "Внешн�� от�леживаема� ветка %s удалена (была %s).\n"
 
-#: builtin/branch.c:277
+#: builtin/branch.c:280
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Ветка %s удалена (была %s).\n"
 
-#: builtin/branch.c:421 builtin/tag.c:60
+#: builtin/branch.c:429 builtin/tag.c:61
 msgid "unable to parse format string"
 msgstr "не удало�ь разобрать �троку формата"
 
-#: builtin/branch.c:452
+#: builtin/branch.c:460
 msgid "could not resolve HEAD"
-msgstr ""
+msgstr "не удало�ь получить HEAD"
 
-#: builtin/branch.c:458
+#: builtin/branch.c:466
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
-msgstr ""
+msgstr "HEAD (%s) указывает за пределы refs/heads/"
 
-#: builtin/branch.c:473
+#: builtin/branch.c:481
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Производит�� перемещение ветки %s на %s"
 
-#: builtin/branch.c:477
+#: builtin/branch.c:485
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Производит�� двоичный пои�к в ветке %s на %s"
 
-#: builtin/branch.c:494
+#: builtin/branch.c:502
 msgid "cannot copy the current branch while not on any."
 msgstr "невозможно �копировать текущую ветку, е�ли вы не находите�ь ни на одной из веток."
 
-#: builtin/branch.c:496
+#: builtin/branch.c:504
 msgid "cannot rename the current branch while not on any."
 msgstr "невозможно переименовать текущую ветку, е�ли вы не находите�ь ни на одной из них."
 
-#: builtin/branch.c:507
+#: builtin/branch.c:515
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "�едей�твительное им� ветки: «%s»"
 
-#: builtin/branch.c:534
+#: builtin/branch.c:544
 msgid "Branch rename failed"
 msgstr "Сбой переименовани� ветки"
 
-#: builtin/branch.c:536
+#: builtin/branch.c:546
 msgid "Branch copy failed"
 msgstr "Сбой копировани� ветки"
 
-#: builtin/branch.c:540
+#: builtin/branch.c:550
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Создана копи� неправильно названной ветки «%s»"
 
-#: builtin/branch.c:543
+#: builtin/branch.c:553
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Переименована неправильно названна� ветка «%s»"
 
-#: builtin/branch.c:549
+#: builtin/branch.c:559
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "Ветка переименована в %s, но HEAD не обновлен!"
 
-#: builtin/branch.c:558
+#: builtin/branch.c:568
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Ветка переименована, но произошел �бой обновлени� файла конфигурации"
 
-#: builtin/branch.c:560
+#: builtin/branch.c:570
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Ветка �копирована, но произошел �бой обновлени� файла конфигурации"
 
-#: builtin/branch.c:576
+#: builtin/branch.c:586
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -8907,308 +10307,439 @@ msgid ""
 "Lines starting with '%c' will be stripped.\n"
 msgstr "Измените опи�ание дл� ветки:\n  %s\nСтроки, начинающие�� � «%c» будут вырезаны.\n"
 
-#: builtin/branch.c:610
+#: builtin/branch.c:620
 msgid "Generic options"
 msgstr "Общие параметры"
 
-#: builtin/branch.c:612
+#: builtin/branch.c:622
 msgid "show hash and subject, give twice for upstream branch"
-msgstr "показывать хеш-�умму и тему, укажите дважды дл� выше�то�щей ветки"
+msgstr "показывать х�ш-код и тему, укажите дважды дл� выше�то�щей ветки"
 
-#: builtin/branch.c:613
+#: builtin/branch.c:623
 msgid "suppress informational messages"
 msgstr "не выводить информационные �ообщени�"
 
-#: builtin/branch.c:614
+#: builtin/branch.c:624
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "у�тановить режим от�леживани� выше�то�щей ветки (�м. git-pull(1))"
 
-#: builtin/branch.c:616
+#: builtin/branch.c:626
 msgid "do not use"
 msgstr "не и�пользуйте"
 
-#: builtin/branch.c:618 builtin/rebase.c:485
+#: builtin/branch.c:628 builtin/rebase.c:532
 msgid "upstream"
 msgstr "выше�то�ща�"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:628
 msgid "change the upstream info"
 msgstr "изменить информацию о выше�то�щей ветке"
 
-#: builtin/branch.c:619
-msgid "Unset the upstream info"
-msgstr "Убрать информацию о выше�то�щей ветке"
+#: builtin/branch.c:629
+msgid "unset the upstream info"
+msgstr ""
 
-#: builtin/branch.c:620
+#: builtin/branch.c:630
 msgid "use colored output"
 msgstr "и�пользовать цветной вывод"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:631
 msgid "act on remote-tracking branches"
 msgstr "выполнить дей�тви� на от�леживаемых внешних ветках"
 
-#: builtin/branch.c:623 builtin/branch.c:625
+#: builtin/branch.c:633 builtin/branch.c:635
 msgid "print only branches that contain the commit"
-msgstr "вывод только веток, которые �одержат коммит"
+msgstr "выве�ти только ветки, которые �одержат коммит"
 
-#: builtin/branch.c:624 builtin/branch.c:626
+#: builtin/branch.c:634 builtin/branch.c:636
 msgid "print only branches that don't contain the commit"
-msgstr "вывод только веток, которые не �одержат коммит"
+msgstr "выве�ти только ветки, которые не �одержат коммит"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:639
 msgid "Specific git-branch actions:"
 msgstr "Специфичные дл� git-branch дей�тви�:"
 
-#: builtin/branch.c:630
+#: builtin/branch.c:640
 msgid "list both remote-tracking and local branches"
-msgstr "показать �пи�ок и от�леживаемых и локальных веток"
+msgstr "выве�ти �пи�ки от�леживаемых и локальных веток"
 
-#: builtin/branch.c:632
+#: builtin/branch.c:642
 msgid "delete fully merged branch"
 msgstr "удалить полно�тью �литую ветку"
 
-#: builtin/branch.c:633
+#: builtin/branch.c:643
 msgid "delete branch (even if not merged)"
 msgstr "удалить ветку (даже никуда не �литую)"
 
-#: builtin/branch.c:634
+#: builtin/branch.c:644
 msgid "move/rename a branch and its reflog"
 msgstr "переме�тить/переименовать ветки и ее журнал ��ылок"
 
-#: builtin/branch.c:635
+#: builtin/branch.c:645
 msgid "move/rename a branch, even if target exists"
 msgstr "переме�тить/переименовать ветку, даже е�ли целевое им� уже �уще�твует"
 
-#: builtin/branch.c:636
+#: builtin/branch.c:646
 msgid "copy a branch and its reflog"
 msgstr "�копировать ветку и её журнал ��ылок"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:647
 msgid "copy a branch, even if target exists"
 msgstr "�копировать ветку, даже е�ли целевое им� уже �уще�твует"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:648
 msgid "list branch names"
-msgstr "показать �пи�ок имен веток"
+msgstr "показать �пи�ок имён веток"
 
-#: builtin/branch.c:639
+#: builtin/branch.c:649
 msgid "show current branch name"
-msgstr ""
+msgstr "выве�ти им� текущей ветки"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:650
 msgid "create the branch's reflog"
 msgstr "�оздать журнал ��ылок ветки"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:652
 msgid "edit the description for the branch"
 msgstr "изменить опи�ание ветки"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:653
 msgid "force creation, move/rename, deletion"
 msgstr "принудительное �оздание, перемещение или удаление ветки"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:654
 msgid "print only branches that are merged"
 msgstr "вывод только �литых веток"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:655
 msgid "print only branches that are not merged"
 msgstr "вывод только не �литых веток"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:656
 msgid "list branches in columns"
 msgstr "показать �пи�ок веток по �толбцам"
 
-#: builtin/branch.c:649 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:658 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:427
+#: builtin/tag.c:434
 msgid "object"
 msgstr "объект"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:659
 msgid "print only branches of the object"
 msgstr "вывод только веток, определенного объекта"
 
-#: builtin/branch.c:652 builtin/for-each-ref.c:48 builtin/tag.c:434
+#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:441
 msgid "sorting and filtering are case insensitive"
 msgstr "�ортировка и фильтраци� не зави��т от реги�тра"
 
-#: builtin/branch.c:653 builtin/for-each-ref.c:38 builtin/tag.c:432
-#: builtin/verify-tag.c:39
+#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:439
+#: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "и�пользовать формат дл� вывода"
 
-#: builtin/branch.c:676 builtin/clone.c:748
+#: builtin/branch.c:684 builtin/clone.c:790
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD не найден в refs/heads!"
 
-#: builtin/branch.c:700
+#: builtin/branch.c:708
 msgid "--column and --verbose are incompatible"
 msgstr "--column и --verbose нельз� и�пользовать одновременно"
 
-#: builtin/branch.c:715 builtin/branch.c:769 builtin/branch.c:778
+#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
 msgid "branch name required"
 msgstr "требует�� им� ветки"
 
-#: builtin/branch.c:745
+#: builtin/branch.c:753
 msgid "Cannot give description to detached HEAD"
 msgstr "�ельз� дать опи�ание отделённому HEAD"
 
-#: builtin/branch.c:750
+#: builtin/branch.c:758
 msgid "cannot edit description of more than one branch"
 msgstr "нельз� изменить опи�ание более одной ветки за раз"
 
-#: builtin/branch.c:757
+#: builtin/branch.c:765
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Еще нет коммита на ветке «%s»."
 
-#: builtin/branch.c:760
+#: builtin/branch.c:768
 #, c-format
 msgid "No branch named '%s'."
 msgstr "�ет ветки � именем «%s»."
 
-#: builtin/branch.c:775
+#: builtin/branch.c:783
 msgid "too many branches for a copy operation"
 msgstr "�лишком много веток дл� операции копировани�"
 
-#: builtin/branch.c:784
+#: builtin/branch.c:792
 msgid "too many arguments for a rename operation"
 msgstr "�лишком много аргументов дл� операции переименовани�"
 
-#: builtin/branch.c:789
+#: builtin/branch.c:797
 msgid "too many arguments to set new upstream"
 msgstr "�лишком много аргументов дл� указани� новой выше�то�щей ветки"
 
-#: builtin/branch.c:793
+#: builtin/branch.c:801
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr "невозможно у�тановить выше�то�щий репозиторий дл� HEAD на %s, так как он не указывает ни на одну ветку."
 
-#: builtin/branch.c:796 builtin/branch.c:819
+#: builtin/branch.c:804 builtin/branch.c:827
 #, c-format
 msgid "no such branch '%s'"
 msgstr "нет такой ветки «%s»"
 
-#: builtin/branch.c:800
+#: builtin/branch.c:808
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "ветка «%s» не �уще�твует"
 
-#: builtin/branch.c:813
+#: builtin/branch.c:821
 msgid "too many arguments to unset upstream"
 msgstr "�лишком много аргументов дл� �бро�а указани� выше�то�щей ветки"
 
-#: builtin/branch.c:817
+#: builtin/branch.c:825
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "невозможно убрать выше�то�щий репозиторий дл� HEAD, так как он не указывает ни на одну ветку."
 
-#: builtin/branch.c:823
+#: builtin/branch.c:831
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Ветка «%s» не имеет информации о выше�то�щей ветке"
 
-#: builtin/branch.c:833
-msgid "-a and -r options to 'git branch' do not make sense with a branch name"
-msgstr "параметры -a и -r дл� «git branch» не имеют �мы�ла � указанием имени ветки"
+#: builtin/branch.c:841
+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:836
+#: builtin/branch.c:845
 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/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr ""
+
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
-msgstr "%s в пор�дке\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr ""
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr ""
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr ""
+
+#: builtin/bugreport.c:80
+msgid "not run from a git repository - no hooks to show\n"
+msgstr ""
+
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr ""
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+
+#: builtin/bugreport.c:135
+msgid "specify a destination for the bugreport file"
+msgstr ""
+
+#: builtin/bugreport.c:137
+msgid "specify a strftime format suffix for the filename"
+msgstr ""
+
+#: builtin/bugreport.c:159
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:166
+msgid "System Info"
+msgstr ""
+
+#: builtin/bugreport.c:169
+msgid "Enabled Hooks"
+msgstr ""
+
+#: builtin/bugreport.c:176
+#, c-format
+msgid "couldn't create a new file at '%s'"
+msgstr ""
+
+#: builtin/bugreport.c:179
+#, c-format
+msgid "unable to write to %s"
+msgstr ""
+
+#: builtin/bugreport.c:189
+#, 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 ""
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr ""
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr ""
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3480
+msgid "do not show progress meter"
+msgstr "не выводить прогре�� выполнени�"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:69 builtin/pack-objects.c:3482
+msgid "show progress meter"
+msgstr "показать прогре�� выполнени�"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3484
+msgid "show progress meter during object writing phase"
+msgstr "показать прогре�� выполнени� во врем� запи�и объектов"
+
+#: builtin/bundle.c:74 builtin/pack-objects.c:3487
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "похоже на --all-progress при включенном прогре��е выполнени�"
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr ""
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr "Требует�� репозиторий дл� �оздани� пакета."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:107
+msgid "do not show bundle details"
+msgstr ""
+
+#: builtin/bundle.c:122
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s в пор�дке\n"
+
+#: builtin/bundle.c:163
 msgid "Need a repository to unbundle."
 msgstr "Требует�� репозиторий дл� ра�паковки."
 
-#: builtin/cat-file.c:593
+#: builtin/bundle.c:171 builtin/remote.c:1700
+msgid "be verbose; must be placed before a subcommand"
+msgstr "быть много�ловнее; должно �то�ть перед подкомандой"
+
+#: builtin/bundle.c:193 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "�еизве�тна� подкоманда: %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-unknown-type] | -s [--allow-unknown-type] | -e | -p | <тип> | --textconv | --filters) [--path=<путь>] <объект>"
 
-#: builtin/cat-file.c:594
+#: builtin/cat-file.c:599
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
-"--filters]"
-msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
+msgstr ""
 
-#: builtin/cat-file.c:615
+#: builtin/cat-file.c:620
 msgid "only one batch option may be specified"
 msgstr ""
 
-#: builtin/cat-file.c:633
+#: builtin/cat-file.c:638
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<тип> может быть одним из: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:634
+#: builtin/cat-file.c:639
 msgid "show object type"
 msgstr "показать тип объекта"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:640
 msgid "show object size"
 msgstr "показать размер объекта"
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:642
 msgid "exit with zero when there's no error"
 msgstr "выйти � нулевым кодом возврата, е�ли нет ошибки"
 
-#: builtin/cat-file.c:638
+#: builtin/cat-file.c:643
 msgid "pretty-print object's content"
 msgstr "�труктурированный вывод �одержимого объекта"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:645
 msgid "for blob objects, run textconv on object's content"
-msgstr "запу�тить texconv на �одержимом двоичных объектов "
+msgstr "запу�тить texconv на �одержимом двоичных объектов"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:647
 msgid "for blob objects, run filters on object's content"
-msgstr "запу�к фильтров на �одержимом двоичных объектов "
+msgstr "запу�к фильтров на �одержимом двоичных объектов"
 
-#: builtin/cat-file.c:643 git-submodule.sh:936
+#: builtin/cat-file.c:648
 msgid "blob"
 msgstr "двоичный объект"
 
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:649
 msgid "use a specific path for --textconv/--filters"
 msgstr "и�пользовать определенный путь дл� --textconv/--filters"
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:651
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "разрешить -s и -t работать � повреждёнными объектами"
 
-#: builtin/cat-file.c:647
+#: builtin/cat-file.c:652
 msgid "buffer --batch output"
 msgstr "буфферировать вывод --batch"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:654
 msgid "show info and content of objects fed from the standard input"
 msgstr "показать информацию и �одержимое объектов, переданных из �тандартного ввода"
 
-#: builtin/cat-file.c:653
+#: builtin/cat-file.c:658
 msgid "show info about objects fed from the standard input"
 msgstr "показать информацию об объектах, переданных из �тандартного ввода"
 
-#: builtin/cat-file.c:657
+#: builtin/cat-file.c:662
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "переходить по �имвольным ��ылкам внутри дерева (и�пользует�� � опци�ми --batch и --batch-check)"
 
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:664
 msgid "show all objects with --batch or --batch-check"
 msgstr "показать в�е объекты � опци�ми --batch или --batch-check"
 
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:666
 msgid "do not order --batch-all-objects output"
 msgstr ""
 
@@ -9236,8 +10767,8 @@ msgstr "прочитать имена файлов из �тандартного
 msgid "terminate input and output records by a NUL character"
 msgstr "окончание ввода и вывода запи�ей по �УЛЕВОМУ �имволу"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1355 builtin/gc.c:538
-#: builtin/worktree.c:499
+#: builtin/check-ignore.c:21 builtin/checkout.c:1500 builtin/gc.c:541
+#: builtin/worktree.c:561
 msgid "suppress progress reporting"
 msgstr "не выводить прогре�� выполнени�"
 
@@ -9249,27 +10780,27 @@ msgstr "показать не �овпадающие введенные пути
 msgid "ignore index when checking"
 msgstr "игнорировать индек� при проверке"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "нельз� указывать пути вме�те � параметром --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "-z имеет �мы�л только вме�те � параметром --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "не указан путь"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet можно и�пользовать только при указании одного пути"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "нельз� и�пользовать одновременно --quiet и --verbose"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching можно и�пользовать только вме�те � --verbose"
 
@@ -9290,117 +10821,104 @@ msgstr "не удало�ь разобрать контакт: %s"
 msgid "no contacts specified"
 msgstr "не указаны контакты"
 
-#: builtin/checkout-index.c:131
+#: builtin/checkout-index.c:139
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<опции>] [--] [<файл>…]"
 
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:156
 msgid "stage should be between 1 and 3 or all"
 msgstr "индек� должен быть между 1 и 3 или all"
 
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:173
 msgid "check out all files in the index"
 msgstr "переключить�� на �о�то�ние в�ех файлов из индек�а"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:174
 msgid "force overwrite of existing files"
 msgstr "принудительна� перезапи�ь �уще�твующих файлов"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:176
 msgid "no warning for existing files and files not in index"
 msgstr "не выводить предупреждени� дл� �уще�твующих и непроиндек�ированных файлов"
 
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:178
 msgid "don't checkout new files"
 msgstr "не �оздавать новые файлы"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:180
 msgid "update stat information in the index file"
 msgstr "обновить �тати�тику до�тупа в файле индек�а"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:184
 msgid "read list of paths from the standard input"
 msgstr "прочитать �пи�ок путей из �тандартного ввода"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:186
 msgid "write the content to temporary files"
 msgstr "запи�ать �одержимое во временные файлы"
 
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1372 builtin/submodule--helper.c:1375
-#: builtin/submodule--helper.c:1383 builtin/submodule--helper.c:1856
-#: builtin/worktree.c:672
+#: 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 "�трока"
 
-#: builtin/checkout-index.c:179
+#: builtin/checkout-index.c:188
 msgid "when creating files, prepend <string>"
 msgstr "добавить �переди <�троку> при �оздании файлов"
 
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:190
 msgid "copy out the files from named stage"
 msgstr "копировать файлы из указанного индек�а"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:31
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<опции>] <ветка>"
 
-#: builtin/checkout.c:33
+#: builtin/checkout.c:32
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<опции>] [<ветка>] -- <файл>…"
 
-#: builtin/checkout.c:151 builtin/checkout.c:190
+#: builtin/checkout.c:37
+msgid "git switch [<options>] [<branch>]"
+msgstr ""
+
+#: builtin/checkout.c:42
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<опции>] [--source=<ветка>] <файл>…"
+
+#: builtin/checkout.c:188 builtin/checkout.c:227
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "путь «%s» не имеет нашей вер�ии"
 
-#: builtin/checkout.c:153 builtin/checkout.c:192
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "путь «%s» не имеет их вер�ии"
 
-#: builtin/checkout.c:169
+#: builtin/checkout.c:206
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "путь «%s» не имеет в�ех необходимых вер�ий"
 
-#: builtin/checkout.c:219
+#: builtin/checkout.c:258
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "путь «%s» не имеет необходимых вер�ий"
 
-#: builtin/checkout.c:237
+#: builtin/checkout.c:275
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "путь «%s»: не удало�ь �лить"
 
-#: builtin/checkout.c:253
+#: builtin/checkout.c:291
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "�е удало�ь добавить результат �ли�ни� «%s»"
 
-#: builtin/checkout.c:331 builtin/checkout.c:334 builtin/checkout.c:337
-#: builtin/checkout.c:340
-#, c-format
-msgid "'%s' cannot be used with updating paths"
-msgstr "«%s» нельз� и�пользовать при обновлении путей"
-
-#: builtin/checkout.c:343 builtin/checkout.c:346
-#, c-format
-msgid "'%s' cannot be used with %s"
-msgstr "«%s» нельз� и�пользовать одновременно � %s"
-
-#: builtin/checkout.c:349
-#, c-format
-msgid "Cannot update paths and switch to branch '%s' at the same time."
-msgstr "�ельз� обновл�ть пути и переключать�� на ветку «%s» одновременно."
-
-#: builtin/checkout.c:396 builtin/checkout.c:403
-#, c-format
-msgid "path '%s' is unmerged"
-msgstr "путь «%s» не �лит"
-
-#: builtin/checkout.c:442
+#: builtin/checkout.c:396
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
@@ -9409,7 +10927,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: builtin/checkout.c:447
+#: builtin/checkout.c:401
 #, c-format
 msgid "Updated %d path from %s"
 msgid_plural "Updated %d paths from %s"
@@ -9418,7 +10936,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: builtin/checkout.c:454
+#: builtin/checkout.c:408
 #, c-format
 msgid "Updated %d path from the index"
 msgid_plural "Updated %d paths from the index"
@@ -9427,66 +10945,97 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: builtin/checkout.c:695
+#: builtin/checkout.c:431 builtin/checkout.c:434 builtin/checkout.c:437
+#: builtin/checkout.c:441
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "«%s» нельз� и�пользовать при обновлении путей"
+
+#: builtin/checkout.c:444 builtin/checkout.c:447
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "«%s» нельз� и�пользовать одновременно � %s"
+
+#: builtin/checkout.c:451
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "�ельз� обновл�ть пути и переключать�� на ветку «%s» одновременно."
+
+#: builtin/checkout.c:455
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr ""
+
+#: builtin/checkout.c:459
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr ""
+
+#: builtin/checkout.c:464 builtin/checkout.c:469
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr ""
+
+#: builtin/checkout.c:541 builtin/checkout.c:548
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "путь «%s» не �лит"
+
+#: builtin/checkout.c:716
 msgid "you need to resolve your current index first"
 msgstr "�начала нужно разрешить конфликты в вашем текущем индек�е"
 
-#: builtin/checkout.c:744
+#: builtin/checkout.c:770
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
 "%s"
 msgstr ""
 
-#: builtin/checkout.c:751
-#, c-format
-msgid "staged changes in the following files may be lost: %s"
-msgstr ""
-
-#: builtin/checkout.c:848
+#: builtin/checkout.c:866
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�е удало�ь �оздать журнал ��ылок дл� «%s»: %s\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:908
 msgid "HEAD is now at"
 msgstr "HEAD �ейча� на"
 
-#: builtin/checkout.c:894 builtin/clone.c:701
+#: builtin/checkout.c:912 builtin/clone.c:721 t/helper/test-fast-rebase.c:202
 msgid "unable to update HEAD"
 msgstr "не удало�ь обновить HEAD"
 
-#: builtin/checkout.c:898
+#: builtin/checkout.c:916
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Сбро� ветки «%s»\n"
 
-#: builtin/checkout.c:901
+#: builtin/checkout.c:919
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Уже на «%s»\n"
 
-#: builtin/checkout.c:905
+#: builtin/checkout.c:923
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Переключение и �бро� ветки «%s»\n"
 
-#: builtin/checkout.c:907 builtin/checkout.c:1283
+#: builtin/checkout.c:925 builtin/checkout.c:1356
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Переключено на новую ветку «%s»\n"
 
-#: builtin/checkout.c:909
+#: builtin/checkout.c:927
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Переключено на ветку «%s»\n"
 
-#: builtin/checkout.c:960
+#: builtin/checkout.c:978
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … и еще %d.\n"
 
-#: builtin/checkout.c:966
+#: builtin/checkout.c:984
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -9503,7 +11052,7 @@ msgstr[1] "Предупреждение: вы о�тавл�ете позади
 msgstr[2] "Предупреждение: вы о�тавл�ете позади %d коммитов не �оединенные ни � одной из ваших веток:\n\n%s\n"
 msgstr[3] "Предупреждение: вы о�тавл�ете позади %d коммитов не �оединенные ни � одной из ваших веток:\n\n%s\n"
 
-#: builtin/checkout.c:985
+#: builtin/checkout.c:1003
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -9522,228 +11071,357 @@ msgstr[1] "Е�ли вы хотите �охранить их � помощью
 msgstr[2] "Е�ли вы хотите �охранить их � помощью �оздани� новой ветки, то �ейча� �амое врем�\n�делать �то � помощью:\n\n git branch <им�-новой-ветки> %s\n"
 msgstr[3] "Е�ли вы хотите �охранить их � помощью �оздани� новой ветки, то �ейча� �амое врем�\n�делать �то � помощью:\n\n git branch <им�-новой-ветки> %s\n"
 
-#: builtin/checkout.c:1017
+#: builtin/checkout.c:1038
 msgid "internal error in revision walk"
 msgstr "внутренн�� ошибка при хождении по редакци�м"
 
-#: builtin/checkout.c:1021
+#: builtin/checkout.c:1042
 msgid "Previous HEAD position was"
 msgstr "Предыдуща� позици� HEAD была"
 
-#: builtin/checkout.c:1052 builtin/checkout.c:1278
+#: builtin/checkout.c:1082 builtin/checkout.c:1351
 msgid "You are on a branch yet to be born"
 msgstr "Вы находите�ь на еще не �озданной ветке"
 
-#: builtin/checkout.c:1173
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "ожидает�� только одна ��ылка, а передано %d."
-
-#: builtin/checkout.c:1209
+#: builtin/checkout.c:1164
 #, 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:1222 builtin/worktree.c:290 builtin/worktree.c:448
+#: builtin/checkout.c:1171
+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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+
+#: builtin/checkout.c:1181
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr ""
+
+#: builtin/checkout.c:1247
+msgid "only one reference expected"
+msgstr ""
+
+#: builtin/checkout.c:1264
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "ожидает�� только одна ��ылка, а передано %d."
+
+#: builtin/checkout.c:1310 builtin/worktree.c:342 builtin/worktree.c:510
 #, c-format
 msgid "invalid reference: %s"
 msgstr "неправильна� ��ылка: %s"
 
-#: builtin/checkout.c:1251
+#: builtin/checkout.c:1323 builtin/checkout.c:1689
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "в дереве нет такой ��ылки: %s"
 
-#: builtin/checkout.c:1292
+#: builtin/checkout.c:1370
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1372
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1373 builtin/checkout.c:1381
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1376
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr ""
+
+#: builtin/checkout.c:1392
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1396
+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
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1404
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1408
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+
+#: builtin/checkout.c:1412
+msgid "you are switching branch while bisecting"
+msgstr ""
+
+#: builtin/checkout.c:1419
 msgid "paths cannot be used with switching branches"
 msgstr "нельз� и�пользовать пути при переключении веток"
 
-#: builtin/checkout.c:1295 builtin/checkout.c:1299 builtin/checkout.c:1303
+#: builtin/checkout.c:1422 builtin/checkout.c:1426 builtin/checkout.c:1430
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "нельз� и�пользовать «%s» при переключении веток"
 
-#: builtin/checkout.c:1307 builtin/checkout.c:1310 builtin/checkout.c:1315
-#: builtin/checkout.c:1318
+#: builtin/checkout.c:1434 builtin/checkout.c:1437 builtin/checkout.c:1440
+#: builtin/checkout.c:1445 builtin/checkout.c:1450
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "«%s» нельз� и�пользовать одновременно � «%s»"
 
-#: builtin/checkout.c:1323
+#: builtin/checkout.c:1447
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr ""
+
+#: builtin/checkout.c:1455
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�ельз� переключить ветку на не коммит «%s»"
 
-#: builtin/checkout.c:1356 builtin/checkout.c:1358 builtin/clone.c:118
-#: builtin/remote.c:169 builtin/remote.c:171 builtin/worktree.c:492
-#: builtin/worktree.c:494
-msgid "branch"
-msgstr "ветка"
+#: builtin/checkout.c:1462
+msgid "missing branch or commit argument"
+msgstr ""
 
-#: builtin/checkout.c:1357
-msgid "create and checkout a new branch"
-msgstr "�оздать и переключить�� на новую ветку"
+#: 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 "принудительно выводить прогре��"
 
-#: builtin/checkout.c:1359
-msgid "create/reset and checkout a branch"
-msgstr "�оздать/�бро�ить и перключить�� на новую ветку"
+#: builtin/checkout.c:1505
+msgid "perform a 3-way merge with the new branch"
+msgstr "выполнить трехходовое �ли�ние � новой веткой"
 
-#: builtin/checkout.c:1360
-msgid "create reflog for new branch"
-msgstr "�оздать журнал ��ылок дл� новой ветки"
+#: builtin/checkout.c:1506 builtin/log.c:1800 parse-options.h:322
+msgid "style"
+msgstr "�тиль"
+
+#: builtin/checkout.c:1507
+msgid "conflict style (merge or diff3)"
+msgstr "�тиль конфликтов �ли�ни� (merge или diff3)"
 
-#: builtin/checkout.c:1361 builtin/worktree.c:496
+#: builtin/checkout.c:1519 builtin/worktree.c:558
 msgid "detach HEAD at named commit"
 msgstr "от�оединить HEAD на указанном коммите"
 
-#: builtin/checkout.c:1362
+#: builtin/checkout.c:1520
 msgid "set upstream info for new branch"
 msgstr "у�тановить информацию о выше�то�щей ветке дл� новой ветки"
 
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1522
+msgid "force checkout (throw away local modifications)"
+msgstr "принудительное переключение на �о�то�ние (отбра�ывает в�е локальные изменени�)"
+
+#: builtin/checkout.c:1524
 msgid "new-branch"
 msgstr "нова�-ветка"
 
-#: builtin/checkout.c:1364
+#: builtin/checkout.c:1524
 msgid "new unparented branch"
 msgstr "нова� ветка без родителей"
 
-#: builtin/checkout.c:1366
+#: builtin/checkout.c:1526 builtin/merge.c:300
+msgid "update ignored files (default)"
+msgstr "обновить игнорируемые файлы (по умолчанию)"
+
+#: builtin/checkout.c:1529
+msgid "do not check if another worktree is holding the given ref"
+msgstr "не провер�ть, что другое дерево уже �одержит указанную ��ылку"
+
+#: builtin/checkout.c:1542
 msgid "checkout our version for unmerged files"
 msgstr "переключить�� на нашу вер�ию дл� не �литых файлов"
 
-#: builtin/checkout.c:1369
+#: builtin/checkout.c:1545
 msgid "checkout their version for unmerged files"
 msgstr "переключить�� на их вер�ию дл� не �литых файлов"
 
-#: builtin/checkout.c:1371
-msgid "force checkout (throw away local modifications)"
-msgstr "принудительное переключение на �о�то�ние (отбра�ывает в�е локальные изменени�)"
-
-#: builtin/checkout.c:1373
-msgid "perform a 3-way merge with the new branch"
-msgstr "выполнить трехходовое �ли�ние � новой веткой"
-
-#: builtin/checkout.c:1375 builtin/merge.c:284
-msgid "update ignored files (default)"
-msgstr "обновить игнорируемые файлы (по умолчанию)"
-
-#: builtin/checkout.c:1377 builtin/log.c:1594 parse-options.h:317
-msgid "style"
-msgstr "�тиль"
-
-#: builtin/checkout.c:1378
-msgid "conflict style (merge or diff3)"
-msgstr "�тиль конфликтов �ли�ни� (merge или diff3)"
-
-#: builtin/checkout.c:1381
+#: builtin/checkout.c:1549
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "не ограничивать �пецификаторы пути только ча�тичными запи��ми"
 
-#: builtin/checkout.c:1383
-msgid "do not second guess 'git checkout <no-such-branch>'"
-msgstr ""
-
-#: builtin/checkout.c:1385
-msgid "do not check if another worktree is holding the given ref"
-msgstr "не провер�ть, что другое дерево уже �одержит указанную ��ылку"
-
-#: builtin/checkout.c:1389 builtin/clone.c:88 builtin/fetch.c:141
-#: builtin/merge.c:281 builtin/pull.c:136 builtin/push.c:575
-#: builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "принудительно выводить прогре��"
-
-#: builtin/checkout.c:1390
-msgid "use overlay mode (default)"
+#: builtin/checkout.c:1604
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
 msgstr ""
 
-#: builtin/checkout.c:1422
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B и --orphan нельз� и�пользовать одновременно"
-
-#: builtin/checkout.c:1425
+#: builtin/checkout.c:1608
 msgid "-p and --overlay are mutually exclusive"
 msgstr ""
 
-#: builtin/checkout.c:1442
+#: builtin/checkout.c:1645
 msgid "--track needs a branch name"
 msgstr "--track требует им� ветки"
 
-#: builtin/checkout.c:1447
-msgid "missing branch name; try -b"
-msgstr "пропущено им� ветки; попробуйте -b"
+#: builtin/checkout.c:1650
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr ""
 
-#: builtin/checkout.c:1484
+#: builtin/checkout.c:1682
+#, c-format
+msgid "could not resolve %s"
+msgstr ""
+
+#: builtin/checkout.c:1698
 msgid "invalid path specification"
 msgstr "недопу�тимый �пецификатор пути"
 
-#: builtin/checkout.c:1491
+#: builtin/checkout.c:1705
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "«%s» не �вл�ет�� коммитом, по�тому невозможно �оздать из него ветку «%s»"
 
-#: builtin/checkout.c:1495
+#: builtin/checkout.c:1709
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
 
-#: builtin/checkout.c:1499
+#: builtin/checkout.c:1718
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr ""
+
+#: builtin/checkout.c:1721 builtin/reset.c:325 builtin/stash.c:1499
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr ""
+
+#: builtin/checkout.c:1734
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr "git checkout: --ours/--theirs, --force and --merge нельз� и�пользовать одновременно при применении �о�то�ни� индек�а."
 
-#: builtin/checkout.c:1519
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
+#: builtin/checkout.c:1739
+msgid "you must specify path(s) to restore"
 msgstr ""
 
-#: builtin/clean.c:28
+#: 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
+msgid "branch"
+msgstr "ветка"
+
+#: builtin/checkout.c:1766
+msgid "create and checkout a new branch"
+msgstr "�оздать и переключить�� на новую ветку"
+
+#: builtin/checkout.c:1768
+msgid "create/reset and checkout a branch"
+msgstr "�оздать/�бро�ить и перключить�� на новую ветку"
+
+#: builtin/checkout.c:1769
+msgid "create reflog for new branch"
+msgstr "�оздать журнал ��ылок дл� новой ветки"
+
+#: builtin/checkout.c:1771
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr ""
+
+#: builtin/checkout.c:1772
+msgid "use overlay mode (default)"
+msgstr ""
+
+#: builtin/checkout.c:1817
+msgid "create and switch to a new branch"
+msgstr ""
+
+#: builtin/checkout.c:1819
+msgid "create/reset and switch to a branch"
+msgstr ""
+
+#: builtin/checkout.c:1821
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr ""
+
+#: builtin/checkout.c:1823
+msgid "throw away local modifications"
+msgstr ""
+
+#: builtin/checkout.c:1857
+msgid "which tree-ish to checkout from"
+msgstr ""
+
+#: builtin/checkout.c:1859
+msgid "restore the index"
+msgstr ""
+
+#: builtin/checkout.c:1861
+msgid "restore the working tree (default)"
+msgstr ""
+
+#: builtin/checkout.c:1863
+msgid "ignore unmerged entries"
+msgstr ""
+
+#: builtin/checkout.c:1864
+msgid "use overlay mode"
+msgstr ""
+
+#: 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 <шаблон>] [-x | -X] [--] <пути>…"
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Удаление %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Будет удалено %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Пропу�к репозитори� %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Будет пропущен репозиторий %s\n"
 
-#: builtin/clean.c:36
+#: builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "�бой удалени� %s"
 
-#: builtin/clean.c:299 git-add--interactive.perl:579
+#: builtin/clean.c:38
+#, c-format
+msgid "could not lstat %s\n"
+msgstr ""
+
+#: builtin/clean.c:302 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -9752,7 +11430,7 @@ msgid ""
 "           - (empty) select nothing\n"
 msgstr "Справка по выделению:\n1          - выбрать указанный �лемент\nfoo        - выбрать �лемент � указанным префик�ом\n           - (пу�то) не выбирать ничего\n"
 
-#: builtin/clean.c:303 git-add--interactive.perl:588
+#: builtin/clean.c:306 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -9765,8 +11443,8 @@ msgid ""
 "           - (empty) finish selecting\n"
 msgstr "Справка по выделению:\n1          - выбрать один �лемент\n3-5        - выбрать диапазон �лементов\n2-3,6-9    - выбрать не�колько диапазонов\nfoo        - выбрать �лемент � указанным префик�ом\n-…       - убрать выделение � указанных �лементов\n*          - выбрать в�е �лементы\n           - (пу�то) завершить выделение\n"
 
-#: builtin/clean.c:519 git-add--interactive.perl:554
-#: git-add--interactive.perl:559
+#: builtin/clean.c:521 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "Хм (%s)?\n"
@@ -9776,27 +11454,22 @@ msgstr "Хм (%s)?\n"
 msgid "Input ignore patterns>> "
 msgstr "Шаблоны игнорировани� ввода>> "
 
-#: builtin/clean.c:698
+#: builtin/clean.c:696
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "ПРЕДУПРЕЖДЕ�ИЕ: �е удало�ь найти �лементы �оответ�твующие: %s"
 
-#: builtin/clean.c:719
+#: builtin/clean.c:717
 msgid "Select items to delete"
 msgstr "Укажите �лементы дл� удалени�"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:760
+#: builtin/clean.c:758
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Удалить %s [y - да/N - нет]? "
 
-#: builtin/clean.c:785 git-add--interactive.perl:1717
-#, c-format
-msgid "Bye.\n"
-msgstr "До �видани�.\n"
-
-#: builtin/clean.c:793
+#: builtin/clean.c:789
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -9807,15 +11480,7 @@ msgid ""
 "?                   - help for prompt selection"
 msgstr "clean               - начать очи�тку\nfilter by pattern   - и�ключить удаление �лементов\nselect by numbers   - и�ключить удаление �лементов по номерам\nask each            - запрашивать подтверждение на удаление каждого �лемента (как «rm -i»)\nquit                - прекратить очи�тку\nhelp                - �тот �кран\n?                   - �правка по выделению"
 
-#: builtin/clean.c:820 git-add--interactive.perl:1793
-msgid "*** Commands ***"
-msgstr "*** Команды ***"
-
-#: builtin/clean.c:821 git-add--interactive.perl:1790
-msgid "What now"
-msgstr "Что теперь"
-
-#: builtin/clean.c:829
+#: builtin/clean.c:825
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "Удалить �ледующие �лементы:"
@@ -9823,387 +11488,406 @@ msgstr[1] "Удалить �ледующие �лементы:"
 msgstr[2] "Удалить �ледующие �лементы:"
 msgstr[3] "Удалить �ледующие �лементы:"
 
-#: builtin/clean.c:845
+#: builtin/clean.c:841
 msgid "No more files to clean, exiting."
 msgstr "Больше нет файлов дл� очи�тки, выходим."
 
-#: builtin/clean.c:907
+#: builtin/clean.c:903
 msgid "do not print names of files removed"
 msgstr "не выводить имена удал�емых файлов"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:905
 msgid "force"
 msgstr "принудительно"
 
-#: builtin/clean.c:910
+#: builtin/clean.c:906
 msgid "interactive cleaning"
 msgstr "интерактивна� очи�тка"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:908
 msgid "remove whole directories"
 msgstr "удалить каталоги полно�тью"
 
-#: builtin/clean.c:913 builtin/describe.c:546 builtin/describe.c:548
-#: builtin/grep.c:897 builtin/log.c:171 builtin/log.c:173
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: 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/show-ref.c:179
 msgid "pattern"
 msgstr "шаблон"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:910
 msgid "add <pattern> to ignore rules"
 msgstr "добавить <шаблон> в правила игнорировани�"
 
-#: builtin/clean.c:915
+#: builtin/clean.c:911
 msgid "remove ignored files, too"
 msgstr "также удалить игнорируемые файлы"
 
-#: builtin/clean.c:917
+#: builtin/clean.c:913
 msgid "remove only ignored files"
 msgstr "удалить только игнорируемые файлы"
 
-#: builtin/clean.c:935
-msgid "-x and -X cannot be used together"
-msgstr "нельз� и�пользовать одновременно -x и -X"
-
-#: builtin/clean.c:939
+#: builtin/clean.c:929
 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:942
+#: builtin/clean.c:932
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr "clean.requireForce у�тановлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очи�тки"
 
-#: builtin/clone.c:44
+#: builtin/clean.c:944
+msgid "-x and -X cannot be used together"
+msgstr "нельз� и�пользовать одновременно -x и -X"
+
+#: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
 
-#: builtin/clone.c:90
+#: builtin/clone.c:94
 msgid "don't create a checkout"
 msgstr "не переключать рабочую копию на HEAD"
 
-#: builtin/clone.c:91 builtin/clone.c:93 builtin/init-db.c:489
+#: builtin/clone.c:95 builtin/clone.c:97 builtin/init-db.c:555
 msgid "create a bare repository"
 msgstr "�оздать голый репозиторий"
 
-#: builtin/clone.c:95
+#: builtin/clone.c:99
 msgid "create a mirror repository (implies bare)"
 msgstr "�оздать зеркало репозитори� (включает в �еб� и параметр bare)"
 
-#: builtin/clone.c:97
+#: builtin/clone.c:101
 msgid "to clone from a local repository"
 msgstr "дл� клонировани� из локального репозитори�"
 
-#: builtin/clone.c:99
+#: builtin/clone.c:103
 msgid "don't use local hardlinks, always copy"
 msgstr "не и�пользовать же�ткие ��ылки, в�егда копировать файлы"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:105
 msgid "setup as shared repository"
 msgstr "на�троить как общедо�тупный репозиторий"
 
-#: builtin/clone.c:104
+#: builtin/clone.c:107
 msgid "pathspec"
 msgstr "�пецификатор-пути"
 
-#: builtin/clone.c:104
+#: builtin/clone.c:107
 msgid "initialize submodules in the clone"
 msgstr "инициализировать подмодули в клоне"
 
-#: builtin/clone.c:107
+#: builtin/clone.c:111
 msgid "number of submodules cloned in parallel"
 msgstr "количе�тво подмодулей, которые будут клонированы парралельно"
 
-#: builtin/clone.c:108 builtin/init-db.c:486
+#: builtin/clone.c:112 builtin/init-db.c:552
 msgid "template-directory"
 msgstr "каталог-шаблонов"
 
-#: builtin/clone.c:109 builtin/init-db.c:487
+#: builtin/clone.c:113 builtin/init-db.c:553
 msgid "directory from which templates will be used"
 msgstr "каталог, шаблоны из которого будут и�пользованы"
 
-#: builtin/clone.c:111 builtin/clone.c:113 builtin/submodule--helper.c:1379
-#: builtin/submodule--helper.c:1859
+#: builtin/clone.c:115 builtin/clone.c:117 builtin/submodule--helper.c:1831
+#: builtin/submodule--helper.c:2336
 msgid "reference repository"
 msgstr "��ылаемый репозиторий"
 
-#: builtin/clone.c:115 builtin/submodule--helper.c:1381
-#: builtin/submodule--helper.c:1861
+#: builtin/clone.c:119 builtin/submodule--helper.c:1833
+#: builtin/submodule--helper.c:2338
 msgid "use --reference only while cloning"
 msgstr "и�пользуйте --reference только при клонировании"
 
-#: builtin/clone.c:116 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3306 builtin/repack.c:329
+#: builtin/clone.c:120 builtin/column.c:27 builtin/init-db.c:563
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3546 builtin/repack.c:358
 msgid "name"
 msgstr "им�"
 
-#: builtin/clone.c:117
+#: builtin/clone.c:121
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "и�пользовать <им�> вме�то «origin» дл� от�леживани� выше�то�щего репозитори�"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:123
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "переключить�� на <ветку>, вме�то HEAD внешнего репозитори�"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:125
 msgid "path to git-upload-pack on the remote"
 msgstr "путь к git-upload-pack на внешнем репозитории"
 
-#: builtin/clone.c:122 builtin/fetch.c:142 builtin/grep.c:836
-#: builtin/pull.c:225
+#: builtin/clone.c:126 builtin/fetch.c:173 builtin/grep.c:860
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "глубина"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:127
 msgid "create a shallow clone of that depth"
 msgstr "�делать ча�тичный клон указанной глубины"
 
-#: builtin/clone.c:124 builtin/fetch.c:144 builtin/pack-objects.c:3295
+#: builtin/clone.c:128 builtin/fetch.c:175 builtin/pack-objects.c:3535
+#: builtin/pull.c:211
 msgid "time"
 msgstr "врем�"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:129
 msgid "create a shallow clone since a specific time"
 msgstr "�делать ча�тичный клон до определенного времени"
 
-#: builtin/clone.c:126 builtin/fetch.c:146 builtin/fetch.c:169
-#: builtin/rebase.c:1389
+#: builtin/clone.c:130 builtin/fetch.c:177 builtin/fetch.c:200
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1317
 msgid "revision"
 msgstr "редакци�"
 
-#: builtin/clone.c:127 builtin/fetch.c:147
+#: builtin/clone.c:131 builtin/fetch.c:178 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "углубить и�торию ча�тичного клона и�ключа� редакцию"
 
-#: builtin/clone.c:129
+#: builtin/clone.c:133 builtin/submodule--helper.c:1843
+#: builtin/submodule--helper.c:2352
 msgid "clone only one branch, HEAD or --branch"
 msgstr "клонировать только одну ветку, HEAD или --branch"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:135
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "не клонировать метки, а также на�троить, чтобы не клонировали�ь и в дальнейшем"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:137
 msgid "any cloned submodules will be shallow"
 msgstr "в�е �клонированные подмодули будут ча�тичными клонами"
 
-#: builtin/clone.c:134 builtin/init-db.c:495
+#: builtin/clone.c:138 builtin/init-db.c:561
 msgid "gitdir"
 msgstr "каталог-git"
 
-#: builtin/clone.c:135 builtin/init-db.c:496
+#: builtin/clone.c:139 builtin/init-db.c:562
 msgid "separate git dir from working tree"
 msgstr "разме�тить каталог git отдельно от рабочей копии"
 
-#: builtin/clone.c:136
+#: builtin/clone.c:140
 msgid "key=value"
 msgstr "ключ=значение"
 
-#: builtin/clone.c:137
+#: builtin/clone.c:141
 msgid "set config inside the new repository"
 msgstr "у�тановить параметры внутри нового репозитори�"
 
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:172
+#: 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
 msgid "server-specific"
 msgstr "зави�ит-от-�ервера"
 
-#: builtin/clone.c:139 builtin/fetch.c:164 builtin/ls-remote.c:76
-#: builtin/push.c:585 builtin/send-pack.c:173
+#: 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
 msgid "option to transmit"
 msgstr "передаваемые опции"
 
-#: builtin/clone.c:140 builtin/fetch.c:165 builtin/pull.c:238
-#: builtin/push.c:586
+#: builtin/clone.c:144 builtin/fetch.c:196 builtin/pull.c:234
+#: builtin/push.c:585
 msgid "use IPv4 addresses only"
 msgstr "и�пользовать только IPv4 адре�а"
 
-#: builtin/clone.c:142 builtin/fetch.c:167 builtin/pull.c:241
-#: builtin/push.c:588
+#: builtin/clone.c:146 builtin/fetch.c:198 builtin/pull.c:237
+#: builtin/push.c:587
 msgid "use IPv6 addresses only"
 msgstr "и�пользовать только IPv6 адре�а"
 
-#: builtin/clone.c:280
+#: builtin/clone.c:150
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr ""
+
+#: builtin/clone.c:152
+msgid "initialize sparse-checkout file to include only files at root"
+msgstr ""
+
+#: builtin/clone.c:288
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
 msgstr "Им� каталога не может быть угадано.\nУкажите им� каталога � помощью параметра командной �троки"
 
-#: builtin/clone.c:333
+#: builtin/clone.c:341
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "информаци�: �е удало�ь добавить альтернативу дл� «%s»: %s\n"
 
-#: builtin/clone.c:405
-#, c-format
-msgid "failed to open '%s'"
-msgstr "не удало�ь открыть «%s»"
-
-#: builtin/clone.c:413
+#: builtin/clone.c:414
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s уже �уще�твует и не �вл�ет�� каталогом"
 
-#: builtin/clone.c:427
-#, c-format
-msgid "failed to stat %s\n"
-msgstr "не удало�ь выполнить stat %s\n"
-
-#: builtin/clone.c:444
+#: builtin/clone.c:432
 #, c-format
-msgid "failed to unlink '%s'"
-msgstr "�бой от�оединени� «%s»"
+msgid "failed to start iterator over '%s'"
+msgstr ""
 
-#: builtin/clone.c:449
+#: builtin/clone.c:463
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "не удало�ь �оздать ��ылку «%s»"
 
-#: builtin/clone.c:453
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "не удало�ь копировать файл в «%s»"
 
-#: builtin/clone.c:479
+#: builtin/clone.c:472
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr ""
+
+#: builtin/clone.c:499
 #, c-format
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: builtin/clone.c:493
+#: builtin/clone.c:513
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
-"and retry the checkout with 'git checkout -f HEAD'\n"
-msgstr "Клонирование прошло у�пешно, но во врем� переключени� �о�то�ни� произошла ошибка.\nС помощь команды «git status» вы можете про�мотреть, какие файлы были обновлены,\nа � помощью «git checkout -f HEAD» можно повторить попытку переключени� на ветку \n"
+"and retry with 'git restore --source=HEAD :/'\n"
+msgstr "Клонирование прошло у�пешно, но во врем� переключени� на �о�то�ние произошла ошибка.\nС помощь команды «git status» вы можете про�мотреть какие файлы были обновлены,\nа повторить попытку перехода на вер�ию можно � помощью «git restore --source=HEAD :/»\n"
 
-#: builtin/clone.c:570
+#: builtin/clone.c:590
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "�е удало�ь найти внешнюю ветку %s дл� клонировани�."
 
-#: builtin/clone.c:689
+#: builtin/clone.c:709
 #, c-format
 msgid "unable to update %s"
 msgstr "не удало�ь обновить %s"
 
-#: builtin/clone.c:739
+#: builtin/clone.c:757
+msgid "failed to initialize sparse-checkout"
+msgstr ""
+
+#: builtin/clone.c:780
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
-msgstr "внешний HEAD ��ылает�� на не�уще�твующую ��ылку, нельз� переключить�� на такую вер�ию.\n"
+msgstr "внешний HEAD ��ылает�� на не�уще�твующую ��ылку, нельз� переключить�� на такое �о�то�ние.\n"
 
-#: builtin/clone.c:770
+#: builtin/clone.c:812
 msgid "unable to checkout working tree"
 msgstr "не удало�ь переключить�� на вер�ию в рабочем каталоге"
 
-#: builtin/clone.c:815
+#: builtin/clone.c:887
 msgid "unable to write parameters to config file"
 msgstr "не удало�ь запи�ать параметры в файл конфигурации"
 
-#: builtin/clone.c:878
+#: builtin/clone.c:950
 msgid "cannot repack to clean up"
 msgstr "не удало�ь выполнить перепаковку дл� очи�тки"
 
-#: builtin/clone.c:880
+#: builtin/clone.c:952
 msgid "cannot unlink temporary alternates file"
 msgstr "не удало�ь от�оединить временные альтернативные файлы"
 
-#: builtin/clone.c:920 builtin/receive-pack.c:1952
+#: builtin/clone.c:992 builtin/receive-pack.c:2493
 msgid "Too many arguments."
 msgstr "Слишком много аргументов."
 
-#: builtin/clone.c:924
+#: builtin/clone.c:996
 msgid "You must specify a repository to clone."
 msgstr "Вы должны указать репозиторий дл� клонировани�."
 
-#: builtin/clone.c:937
+#: builtin/clone.c:1009
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare и --origin %s нельз� и�пользовать одновременно."
 
-#: builtin/clone.c:940
+#: builtin/clone.c:1012
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare и --separate-git-dir нельз� и�пользовать одновременно."
 
-#: builtin/clone.c:953
+#: builtin/clone.c:1025
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "репозиторий «%s» не �уще�твует"
 
-#: builtin/clone.c:959 builtin/fetch.c:1610
+#: builtin/clone.c:1029 builtin/fetch.c:1841
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "глубина %s не �вл�ет�� положительным чи�лом"
 
-#: builtin/clone.c:969
+#: builtin/clone.c:1039
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "целевой путь «%s» уже �уще�твует и не �вл�ет�� пу�тым каталогом."
 
-#: builtin/clone.c:979
+#: builtin/clone.c:1045
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr ""
+
+#: builtin/clone.c:1059
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "рабочий каталог «%s» уже �уще�твует."
 
-#: builtin/clone.c:994 builtin/clone.c:1015 builtin/difftool.c:264
-#: builtin/worktree.c:296 builtin/worktree.c:328
+#: builtin/clone.c:1074 builtin/clone.c:1095 builtin/difftool.c:271
+#: builtin/log.c:1987 builtin/worktree.c:354 builtin/worktree.c:386
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "не удало�ь �оздать родитель�кие каталоги дл� «%s»"
 
-#: builtin/clone.c:999
+#: builtin/clone.c:1079
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "не удало�ь �оздать рабочий каталог «%s»"
 
-#: builtin/clone.c:1019
+#: builtin/clone.c:1099
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Клонирование в голый репозиторий «%s»…\n"
 
-#: builtin/clone.c:1021
+#: builtin/clone.c:1101
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Клонирование в «%s»…\n"
 
-#: builtin/clone.c:1045
+#: builtin/clone.c:1125
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-"
 "if-able"
 msgstr "клонирование � параметром --recursive нельз� и�пользовать одновременно ни � --reference, ни � --reference-if-able"
 
-#: builtin/clone.c:1106
+#: builtin/clone.c:1169 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "«%s» не �вл�ет�� допу�тимым именем внешнего репозитори�."
+
+#: builtin/clone.c:1210
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth игнорирует�� на локальных клонах; вме�то �того и�пользуйте file://."
 
-#: builtin/clone.c:1108
+#: builtin/clone.c:1212
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since игнорирует�� на локальных клонах; и�пользуйте file:// вме�то �того."
 
-#: builtin/clone.c:1110
+#: builtin/clone.c:1214
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude игнорирует�� на локальных клонах; и�пользуйте file:// вме�то �того."
 
-#: builtin/clone.c:1112
+#: builtin/clone.c:1216
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr ""
 
-#: builtin/clone.c:1115
+#: builtin/clone.c:1219
 msgid "source repository is shallow, ignoring --local"
 msgstr "и�ходный репозиторий �вл�ет�� ча�тичным, --local игнорирует��"
 
-#: builtin/clone.c:1120
+#: builtin/clone.c:1224
 msgid "--local is ignored"
 msgstr "--local игнорирует��"
 
-#: builtin/clone.c:1197 builtin/clone.c:1205
+#: builtin/clone.c:1311 builtin/clone.c:1319
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Внешн�� ветка %s не найдена в выше�то�щем репозитории %s"
 
-#: builtin/clone.c:1208
+#: builtin/clone.c:1322
 msgid "You appear to have cloned an empty repository."
 msgstr "Похоже, что вы клонировали пу�той репозиторий."
 
@@ -10239,6 +11923,107 @@ msgstr "Ра��то�ние от�тупа между колонками"
 msgid "--command must be the first argument"
 msgstr "параметр --command должен быть первым"
 
+#: builtin/commit-graph.c:13 builtin/commit-graph.c:22
+msgid ""
+"git commit-graph verify [--object-dir <objdir>] [--shallow] "
+"[--[no-]progress]"
+msgstr ""
+
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+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:184 builtin/log.c:1769
+msgid "dir"
+msgstr "каталог"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "The object directory to store the graph"
+msgstr "Каталог объектов дл� �охранени� графа"
+
+#: builtin/commit-graph.c:83
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr ""
+
+#: builtin/commit-graph.c:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "�е удало�ь открыть файл commit-graph «%s»"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr ""
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr ""
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr ""
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "начать �о в�ех ��ылок"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "и�кать коммиты в pack-indexes, перечи�ленных на �тандартном вводе"
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr "начать � коммитов, перечи�ленных на �тандартном вводе"
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr "включить в�е коммиты, которые уже е�ть в файле commit-graph"
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr ""
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr ""
+
+#: builtin/commit-graph.c:228
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:230
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr ""
+
+#: builtin/commit-graph.c:232
+msgid "only expire files older than a given date-time"
+msgstr ""
+
+#: builtin/commit-graph.c:234
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr ""
+
+#: builtin/commit-graph.c:255
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "и�пользуйте что-то одно из --reachable, --stdin-commits и --stdin-packs"
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr ""
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -10250,7 +12035,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr ""
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:520
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:555
 #, c-format
 msgid "not a valid object name %s"
 msgstr ""
@@ -10258,17 +12043,17 @@ msgstr ""
 #: builtin/commit-tree.c:93
 #, c-format
 msgid "git commit-tree: failed to open '%s'"
-msgstr ""
+msgstr "git commit-tree: �бой при открытии «%s»"
 
 #: builtin/commit-tree.c:96
 #, c-format
 msgid "git commit-tree: failed to read '%s'"
-msgstr ""
+msgstr "git commit-tree: �бой при чтении «%s»"
 
 #: builtin/commit-tree.c:98
 #, c-format
 msgid "git commit-tree: failed to close '%s'"
-msgstr ""
+msgstr "git commit-tree: �бой при закрытии «%s»"
 
 #: builtin/commit-tree.c:111
 msgid "parent"
@@ -10278,32 +12063,32 @@ msgstr ""
 msgid "id of a parent commit object"
 msgstr ""
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1480 builtin/merge.c:268
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1473
-#: builtin/tag.c:406
+#: 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
 msgid "message"
 msgstr "�ообщение"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1480
+#: builtin/commit-tree.c:115 builtin/commit.c:1504
 msgid "commit message"
 msgstr "�ообщение коммита"
 
 #: builtin/commit-tree.c:118
 msgid "read commit log message from file"
-msgstr ""
+msgstr "прочитать �ообщение коммита из файла"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1492 builtin/merge.c:283
-#: builtin/pull.c:193 builtin/revert.c:117
+#: builtin/commit-tree.c:121 builtin/commit.c:1516 builtin/merge.c:298
+#: builtin/pull.c:176 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "подпи�ать коммит � помощью GPG"
 
 #: builtin/commit-tree.c:133
 msgid "must give exactly one tree"
-msgstr ""
+msgstr "необходимо указать одно дерево"
 
 #: builtin/commit-tree.c:140
 msgid "git commit-tree: failed to read"
-msgstr ""
+msgstr "git commit-tree: �бой при чтении"
 
 #: builtin/commit.c:41
 msgid "git commit [<options>] [--] <pathspec>..."
@@ -10330,138 +12115,155 @@ msgid ""
 msgstr "Копируемый коммит теперь пу�т, возможно по�ле разрешени� конфликтов.\nЕ�ли вы в�е равно хотите �делать пу�той коммит, и�пользуйте:\n\n    git commit --allow-empty\n\n"
 
 #: builtin/commit.c:63
-msgid "Otherwise, please use 'git reset'\n"
-msgstr "В противном �лучае, и�пользуйте «git reset»\n"
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "В противном �лучае, и�пользуйте «git rebase --skip»\n"
 
 #: builtin/commit.c:66
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr ""
+
+#: builtin/commit.c:69
 msgid ""
+"and then use:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
 "If you wish to skip this commit, use:\n"
 "\n"
-"    git reset\n"
+"    git cherry-pick --skip\n"
 "\n"
-"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
-"the remaining commits.\n"
-msgstr "Е�ли вы хотите пропу�тит �тот коммит, и�пользуйте команду:\n\n    git reset\n\nПо�ле �того «git cherry-pick --continue» продолжит копирование о�тавших�� коммитов.\n"
+msgstr ""
 
 #: builtin/commit.c:312
 msgid "failed to unpack HEAD tree object"
 msgstr "�бой ра�паковки объекта дерева HEAD"
 
-#: builtin/commit.c:353
+#: builtin/commit.c:348
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr ""
+
+#: builtin/commit.c:361
+msgid "No paths with --include/--only does not make sense."
+msgstr "Указание путей каталогов � опци�ми --include/--only не имеет �мы�ла."
+
+#: builtin/commit.c:373
 msgid "unable to create temporary index"
 msgstr "не удало�ь �оздать временный индек�"
 
-#: builtin/commit.c:359
+#: builtin/commit.c:382
 msgid "interactive add failed"
 msgstr "�бой интерактивного добавлени�"
 
-#: builtin/commit.c:373
+#: builtin/commit.c:397
 msgid "unable to update temporary index"
 msgstr "не удало�ь обновить временный индек�"
 
-#: builtin/commit.c:375
+#: builtin/commit.c:399
 msgid "Failed to update main cache tree"
 msgstr "Сбой при обновлении о�новного к�ша дерева"
 
-#: builtin/commit.c:400 builtin/commit.c:423 builtin/commit.c:469
+#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
 msgid "unable to write new_index file"
 msgstr "не удало�ь запи�ать файл new_index"
 
-#: builtin/commit.c:452
+#: builtin/commit.c:476
 msgid "cannot do a partial commit during a merge."
 msgstr "нельз� �оздать ча�тичный коммит во врем� �ли�ни�."
 
-#: builtin/commit.c:454
+#: builtin/commit.c:478
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "нельз� �оздать ча�тичный коммит во врем� копировани� коммита."
 
-#: builtin/commit.c:462
+#: builtin/commit.c:480
+msgid "cannot do a partial commit during a rebase."
+msgstr ""
+
+#: builtin/commit.c:488
 msgid "cannot read the index"
 msgstr "не удало�ь прочитать индек�"
 
-#: builtin/commit.c:481
+#: builtin/commit.c:507
 msgid "unable to write temporary index file"
 msgstr "не удало�ь запи�ать временный файл индек�а"
 
-#: builtin/commit.c:579
+#: builtin/commit.c:605
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "у коммита «%s» от�ут�твует автор в заголовке"
 
-#: builtin/commit.c:581
+#: builtin/commit.c:607
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "у коммита «%s» �трока автора в неправильном формате"
 
-#: builtin/commit.c:600
+#: builtin/commit.c:626
 msgid "malformed --author parameter"
 msgstr "параметр --author в неправильном формате"
 
-#: builtin/commit.c:653
+#: builtin/commit.c:679
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "нельз� выбрать �имвол комментари�, который\nне и�пользует�� в текущем �ообщении коммита"
 
-#: builtin/commit.c:691 builtin/commit.c:724 builtin/commit.c:1069
+#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1097
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "не удало�ь запро�ить коммит %s"
 
-#: builtin/commit.c:703 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:425
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(чтение файла журнала из �тандартного ввода)\n"
 
-#: builtin/commit.c:705
+#: builtin/commit.c:731
 msgid "could not read log from standard input"
 msgstr "не удало�ь прочитать файл журнала из �тандартного ввода"
 
-#: builtin/commit.c:709
+#: builtin/commit.c:735
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "не удало�ь прочитать файл журнала «%s»"
 
-#: builtin/commit.c:740 builtin/commit.c:756
+#: builtin/commit.c:766 builtin/commit.c:782
 msgid "could not read SQUASH_MSG"
 msgstr "не удало�ь прочитать SQUASH_MSG"
 
-#: builtin/commit.c:747
+#: builtin/commit.c:773
 msgid "could not read MERGE_MSG"
 msgstr "не удало�ь прочитать MERGE_MSG"
 
-#: builtin/commit.c:807
+#: builtin/commit.c:833
 msgid "could not write commit template"
 msgstr "не удало�ь запи�ать шаблон опи�ани� коммита"
 
-#: builtin/commit.c:826
-#, c-format
+#: builtin/commit.c:853
 msgid ""
 "\n"
 "It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d MERGE_HEAD\n"
 "and try again.\n"
-msgstr "\nПохоже, что вы пытаете�ь закоммитить �ли�ние.\nЕ�ли �то ошибка, пожалуй�та удалите файл\n\t%s\nи попробуйте �нова.\n"
+msgstr ""
 
-#: builtin/commit.c:831
-#, c-format
+#: builtin/commit.c:858
 msgid ""
 "\n"
 "It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
+"If this is not correct, please run\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
 "and try again.\n"
-msgstr "\nПохоже, что вы пытаете�ь закоммитить при копировании коммита.\nЕ�ли �то не так, то удалите файл\n\t%s\nи попробуйте �нова.\n"
+msgstr ""
 
-#: builtin/commit.c:844
+#: 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 "Пожалуй�та, введите �ообщение коммита дл� ваших изменений. Строки,\nначинающие�� � «%c» будут проигнорированы, а пу�тое �ообщение\nотмен�ет проце�� коммита.\n"
 
-#: builtin/commit.c:852
+#: builtin/commit.c:876
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -10469,583 +12271,541 @@ msgid ""
 "An empty message aborts the commit.\n"
 msgstr "Пожалуй�та, введите �ообщение коммита дл� ваших изменений. Строки,\nначинающие�� � «%c» будут о�тавлены; вы можете удалить их вручную,\nе�ли хотите. Пу�тое �ообщение отмен�ет проце�� коммита.\n"
 
-#: builtin/commit.c:869
+#: builtin/commit.c:893
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s�втор:     %.*s <%.*s>"
 
-#: builtin/commit.c:877
+#: builtin/commit.c:901
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sДата:      %s"
 
-#: builtin/commit.c:884
+#: builtin/commit.c:908
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sКоммитер:  %.*s <%.*s>"
 
-#: builtin/commit.c:902
+#: builtin/commit.c:926
 msgid "Cannot read index"
 msgstr "�е удало�ь прочитать индек�"
 
-#: builtin/commit.c:969
+#: builtin/commit.c:997
 msgid "Error building trees"
 msgstr "Ошибка при по�троении деревьев"
 
-#: builtin/commit.c:983 builtin/tag.c:269
+#: builtin/commit.c:1011 builtin/tag.c:276
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "Пожалуй�та, укажите �ообщение, при указании опций -m или -F.\n"
 
-#: builtin/commit.c:1027
+#: builtin/commit.c:1055
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author «%s» не в формате «Им� <почта>» и не �овпадает � �уще�твующим автором"
 
-#: builtin/commit.c:1041
+#: builtin/commit.c:1069
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "�едопу�тимый режим показа игнорируемых файлов «%s»"
 
-#: builtin/commit.c:1059 builtin/commit.c:1284
+#: builtin/commit.c:1087 builtin/commit.c:1331
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "�еправильный режим неот�леживаемых файлов «%s»"
 
-#: builtin/commit.c:1097
+#: builtin/commit.c:1127
 msgid "--long and -z are incompatible"
 msgstr "--long и -z нельз� и�пользовать одновременно"
 
-#: builtin/commit.c:1130
+#: builtin/commit.c:1171
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "Указание одновременно опций --reset-author и --author не имеет �мы�ла"
 
-#: builtin/commit.c:1139
+#: builtin/commit.c:1180
 msgid "You have nothing to amend."
 msgstr "�ечего и�правл�ть."
 
-#: builtin/commit.c:1142
+#: builtin/commit.c:1183
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "Вы в проце��е �ли�ни� —  �ейча� нельз� и�правл�ть."
 
-#: builtin/commit.c:1144
+#: builtin/commit.c:1185
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "Вы в проце��е копировани� коммита —  �ейча� нельз� и�правл�ть."
 
-#: builtin/commit.c:1147
+#: builtin/commit.c:1187
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr ""
+
+#: builtin/commit.c:1190
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Опции --squash и --fixup не могут и�пользовать�� одновременно"
 
-#: builtin/commit.c:1157
+#: builtin/commit.c:1200
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "Может и�пользовать�� только одна из опций -c/-C/-F/--fixup."
 
-#: builtin/commit.c:1159
+#: builtin/commit.c:1202
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr ""
 
-#: builtin/commit.c:1167
+#: builtin/commit.c:1211
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author может и�пользовать�� только одновременно � опци�ми -C, -c или --amend."
 
-#: builtin/commit.c:1184
+#: builtin/commit.c:1229
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "Может и�пользовать�� только одна из опций --include/--only/--all/--interactive/--patch."
 
-#: builtin/commit.c:1186
-msgid "No paths with --include/--only does not make sense."
-msgstr "Указание путей каталогов � опци�ми --include/--only не имеет �мы�ла."
-
-#: builtin/commit.c:1192
+#: builtin/commit.c:1235
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr ""
 
-#: builtin/commit.c:1319 builtin/commit.c:1503
+#: builtin/commit.c:1366 builtin/commit.c:1527
 msgid "show status concisely"
 msgstr "кратко показать �тату�"
 
-#: builtin/commit.c:1321 builtin/commit.c:1505
+#: builtin/commit.c:1368 builtin/commit.c:1529
 msgid "show branch information"
 msgstr "показать информацию о вер�ии"
 
-#: builtin/commit.c:1323
+#: builtin/commit.c:1370
 msgid "show stash information"
 msgstr "показать информацию о �пр�танном"
 
-#: builtin/commit.c:1325 builtin/commit.c:1507
+#: builtin/commit.c:1372 builtin/commit.c:1531
 msgid "compute full ahead/behind values"
 msgstr ""
 
-#: builtin/commit.c:1327
+#: builtin/commit.c:1374
 msgid "version"
 msgstr "вер�и�"
 
-#: builtin/commit.c:1327 builtin/commit.c:1509 builtin/push.c:561
-#: builtin/worktree.c:643
+#: builtin/commit.c:1374 builtin/commit.c:1533 builtin/push.c:560
+#: builtin/worktree.c:725
 msgid "machine-readable output"
 msgstr "машиночитаемый вывод"
 
-#: builtin/commit.c:1330 builtin/commit.c:1511
+#: builtin/commit.c:1377 builtin/commit.c:1535
 msgid "show status in long format (default)"
 msgstr "показать �тату� в длинном формате (по умолчанию)"
 
-#: builtin/commit.c:1333 builtin/commit.c:1514
+#: builtin/commit.c:1380 builtin/commit.c:1538
 msgid "terminate entries with NUL"
 msgstr "завершать запи�и �УЛЕВЫМ байтом"
 
-#: builtin/commit.c:1335 builtin/commit.c:1339 builtin/commit.c:1517
-#: builtin/fast-export.c:1085 builtin/fast-export.c:1088 builtin/rebase.c:1465
-#: parse-options.h:331
+#: 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:1406 parse-options.h:336
 msgid "mode"
 msgstr "режим"
 
-#: builtin/commit.c:1336 builtin/commit.c:1517
+#: builtin/commit.c:1383 builtin/commit.c:1541
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "показать неот�леживаемые файлы, опциональные режимы: all (в�е), normal (как обычно), no (нет). (По умолчанию: all)"
 
-#: builtin/commit.c:1340
+#: builtin/commit.c:1387
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr "показывать игнорируемые файлы, � опциональным режимом: traditional (традиционный), matching (только �овпадающие), no (не показывать). (По умолчанию: traditional)"
 
-#: builtin/commit.c:1342 parse-options.h:179
+#: builtin/commit.c:1389 parse-options.h:192
 msgid "when"
 msgstr "когда"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1390
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr "игнорировать изменени� в подмодул�х, опционально когда: all (в�егда), dirty (изменённые), untracked (неот�леживаемые). (По умолчанию: all)"
 
-#: builtin/commit.c:1345
+#: builtin/commit.c:1392
 msgid "list untracked files in columns"
 msgstr "показать неот�леживаемые файлы по �толбцам"
 
-#: builtin/commit.c:1346
+#: builtin/commit.c:1393
 msgid "do not detect renames"
 msgstr "не определ�ть переименовани�"
 
-#: builtin/commit.c:1348
+#: builtin/commit.c:1395
 msgid "detect renames, optionally set similarity index"
 msgstr "определ�ть переименовани�, опционально у�танавливать рейтинг �ход�тва"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1415
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�еподдерживаема� комбинаци� аргументов отображени� игнорируемых и неот�леживаемых файлов"
 
-#: builtin/commit.c:1473
+#: builtin/commit.c:1497
 msgid "suppress summary after successful commit"
 msgstr "не выводить �водку изменений по�ле у�пешного коммита"
 
-#: builtin/commit.c:1474
+#: builtin/commit.c:1498
 msgid "show diff in commit message template"
 msgstr "добавить �пи�ок изменений в шаблон �ообщени� коммита"
 
-#: builtin/commit.c:1476
+#: builtin/commit.c:1500
 msgid "Commit message options"
 msgstr "Опции �ообщени� коммита"
 
-#: builtin/commit.c:1477 builtin/merge.c:272 builtin/tag.c:408
+#: builtin/commit.c:1501 builtin/merge.c:285 builtin/tag.c:415
 msgid "read message from file"
 msgstr "прочитать �ообщение из файла"
 
-#: builtin/commit.c:1478
+#: builtin/commit.c:1502
 msgid "author"
 msgstr "автор"
 
-#: builtin/commit.c:1478
+#: builtin/commit.c:1502
 msgid "override author for commit"
 msgstr "подменить автора коммита"
 
-#: builtin/commit.c:1479 builtin/gc.c:539
+#: builtin/commit.c:1503 builtin/gc.c:542
 msgid "date"
 msgstr "дата"
 
-#: builtin/commit.c:1479
+#: builtin/commit.c:1503
 msgid "override date for commit"
 msgstr "подменить дату коммита"
 
-#: builtin/commit.c:1481 builtin/commit.c:1482 builtin/commit.c:1483
-#: builtin/commit.c:1484 parse-options.h:323 ref-filter.h:92
+#: builtin/commit.c:1505 builtin/commit.c:1506 builtin/commit.c:1507
+#: builtin/commit.c:1508 parse-options.h:328 ref-filter.h:87
 msgid "commit"
 msgstr "коммит"
 
-#: builtin/commit.c:1481
+#: builtin/commit.c:1505
 msgid "reuse and edit message from specified commit"
 msgstr "и�пользовать и отредактировать �ообщение от указанного коммита"
 
-#: builtin/commit.c:1482
+#: builtin/commit.c:1506
 msgid "reuse message from specified commit"
 msgstr "и�пользовать �ообщение указанного коммита"
 
-#: builtin/commit.c:1483
+#: builtin/commit.c:1507
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "и�пользовать форматированное �ообщение автоуплотнени� дл� и�правлени� указанного коммита"
 
-#: builtin/commit.c:1484
+#: builtin/commit.c:1508
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "и�пользовать форматированное �ообщение автоуплотнени� дл� уплотнени� указанного коммита"
 
-#: builtin/commit.c:1485
+#: builtin/commit.c:1509
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "коммит теперь за моим автор�твом (и�пользует�� � -C/-c/--amend)"
 
-#: builtin/commit.c:1486 builtin/log.c:1541 builtin/merge.c:285
-#: builtin/pull.c:162 builtin/revert.c:109
-msgid "add Signed-off-by:"
-msgstr "добавить Signed-off-by:"
+#: builtin/commit.c:1510 builtin/log.c:1744 builtin/merge.c:301
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr ""
 
-#: builtin/commit.c:1487
+#: builtin/commit.c:1511
 msgid "use specified template file"
 msgstr "и�пользовать указанный файл шаблона"
 
-#: builtin/commit.c:1488
+#: builtin/commit.c:1512
 msgid "force edit of commit"
 msgstr "принудительно редактировать коммит"
 
-#: builtin/commit.c:1490
+#: builtin/commit.c:1514
 msgid "include status in commit message template"
 msgstr "включить �тату� файлов в шаблон �ообщени� коммита"
 
-#: builtin/commit.c:1495
+#: builtin/commit.c:1519
 msgid "Commit contents options"
 msgstr "Опции �одержимого коммита"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1520
 msgid "commit all changed files"
 msgstr "закоммитить в�е измененные файлы"
 
-#: builtin/commit.c:1497
+#: builtin/commit.c:1521
 msgid "add specified files to index for commit"
 msgstr "добавить указанные файлы в индек� дл� коммита"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1522
 msgid "interactively add files"
 msgstr "интерактивное добавление файлов"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1523
 msgid "interactively add changes"
 msgstr "интерактивное добавление изменений"
 
-#: builtin/commit.c:1500
+#: builtin/commit.c:1524
 msgid "commit only specified files"
 msgstr "закоммитить только указанные файлы"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1525
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "пропу�тить перехватчик pre-commit и commit-msg"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1526
 msgid "show what would be committed"
 msgstr "показать, что будет закоммичено"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1539
 msgid "amend previous commit"
 msgstr "и�править предыдущий коммит"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1540
 msgid "bypass post-rewrite hook"
 msgstr "пропу�тить перехватчик post-rewrite"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1547
 msgid "ok to record an empty change"
 msgstr "разрешить запи�ь пу�того коммита"
 
-#: builtin/commit.c:1523
+#: builtin/commit.c:1549
 msgid "ok to record a change with an empty message"
 msgstr "разрешить запи�ь изменений � пу�тым �ообщением"
 
-#: builtin/commit.c:1596
+#: builtin/commit.c:1622
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Файл MERGE_HEAD поврежден (%s)"
 
-#: builtin/commit.c:1603
+#: builtin/commit.c:1629
 msgid "could not read MERGE_MODE"
 msgstr "не удало�ь прочитать MERGE_MODE"
 
-#: builtin/commit.c:1622
+#: builtin/commit.c:1650
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "не удало�ь открыть �ообщение коммита: %s"
 
-#: builtin/commit.c:1629
+#: builtin/commit.c:1657
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Отмена коммита из-за пу�того �ообщени� коммита.\n"
 
-#: builtin/commit.c:1634
+#: builtin/commit.c:1662
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Отмена коммита; вы не изменили �ообщение.\n"
 
-#: builtin/commit.c:1668
+#: builtin/commit.c:1696
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
-"not exceeded, and then \"git reset HEAD\" to recover."
-msgstr "репозиторий был обновлен, но не удало�ь запи�ать файл new_index. Удо�товерьте�ь, что на ди�ке е�ть �вободное ме�то и квота не и�черпана, а по�ле �того запу�тите «git reset HEAD» дл� во��тановлени�."
-
-#: builtin/commit-graph.c:10
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <каталог-объектов>]"
-
-#: builtin/commit-graph.c:11 builtin/commit-graph.c:23
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <каталог-объектов>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:18
-msgid "git commit-graph verify [--object-dir <objdir>]"
-msgstr "git commit-graph verify [--object-dir <каталог-объектов>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:28
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append] [--reachable"
-"|--stdin-packs|--stdin-commits]"
-msgstr "git commit-graph write [--object-dir <каталог-объектов>] [--append] [--reachable|--stdin-packs|--stdin-commits]"
-
-#: builtin/commit-graph.c:51 builtin/commit-graph.c:89
-#: builtin/commit-graph.c:147 builtin/commit-graph.c:205 builtin/fetch.c:153
-#: builtin/log.c:1561
-msgid "dir"
-msgstr "каталог"
-
-#: builtin/commit-graph.c:52 builtin/commit-graph.c:90
-#: builtin/commit-graph.c:148 builtin/commit-graph.c:206
-msgid "The object directory to store the graph"
-msgstr "Каталог объектов дл� �охранени� графа"
-
-#: builtin/commit-graph.c:68 builtin/commit-graph.c:105
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "�е удало�ь открыть файл commit-graph «%s»"
-
-#: builtin/commit-graph.c:150
-msgid "start walk at all refs"
-msgstr "начать �о в�ех ��ылок"
-
-#: builtin/commit-graph.c:152
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "и�кать коммиты в pack-indexes, перечи�ленных на �тандартном вводе"
-
-#: builtin/commit-graph.c:154
-msgid "start walk at commits listed by stdin"
-msgstr "начать � коммитов, перечи�ленных на �тандартном вводе"
-
-#: builtin/commit-graph.c:156
-msgid "include all commits already in the commit-graph file"
-msgstr "включить в�е коммиты, которые уже е�ть в файле commit-graph"
-
-#: builtin/commit-graph.c:165
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "и�пользуйте что-то одно из --reachable, --stdin-commits и --stdin-packs"
+"not exceeded, and then \"git restore --staged :/\" to recover."
+msgstr "репозиторий был обновлен, но не удало�ь запи�ать файл new_index. Удо�товерьте�ь, что на ди�ке е�ть �вободное ме�то и квота не и�черпана, а по�ле �того запу�тите «git restore --staged :/» дл� во��тановлени�."
 
 #: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<опции>]"
 
-#: builtin/config.c:103
+#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr ""
 
-#: builtin/config.c:115
+#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr ""
 
-#: builtin/config.c:124
+#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Размещение файла конфигурации"
 
-#: builtin/config.c:125
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr "и�пользовать глобальный файл конфигурации"
 
-#: builtin/config.c:126
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr "и�пользовать �и�темный файл конфигурации"
 
-#: builtin/config.c:127
+#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "и�пользовать файл конфигурации репозитори�"
 
-#: builtin/config.c:128
+#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr ""
 
-#: builtin/config.c:129
+#: builtin/config.c:135
 msgid "use given config file"
 msgstr "и�пользовать указанный файл конфигурации"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr "идент-двоичн-объекта"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "прочитать на�тройки из указанного двоичного объекта"
 
-#: builtin/config.c:131
+#: builtin/config.c:137
 msgid "Action"
 msgstr "Дей�твие"
 
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "получить значение: им� [шаблон-значений]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr ""
 
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "получить в�е значени�: ключ [шаблон-значений]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr ""
 
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "получить значени� по шаблону: шаблон-имен [шаблон-значений]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr ""
 
-#: builtin/config.c:135
+#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "получить значение, �пецифичное дл� URL: раздел[.переменна�] URL"
 
-#: builtin/config.c:136
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "заменить в�е �оответ�твующие переменные: им� значение [шаблон-значений]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr ""
 
-#: builtin/config.c:137
+#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "добавить новую переменную: им� значение"
 
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "удалить переменную: им� [шаблон-значений]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr ""
 
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "удалить в�е �овпадающие: им� [шаблон-значений]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr ""
 
-#: builtin/config.c:140
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "переименовать раздел: �тарое-им� новое-им�"
 
-#: builtin/config.c:141
+#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "удалить раздел: им�"
 
-#: builtin/config.c:142
+#: builtin/config.c:148
 msgid "list all"
 msgstr "показать ве�ь �пи�ок"
 
-#: builtin/config.c:143
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr "открыть в редакторе"
 
-#: builtin/config.c:144
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "найти на�троенный цвет: раздел [по-умолчанию]"
 
-#: builtin/config.c:145
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "проверить, �уще�твует ли на�троенный цвет: раздел [stdout-е�ть-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:153
 msgid "Type"
 msgstr "Тип"
 
-#: builtin/config.c:147
+#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr ""
 
-#: builtin/config.c:148
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "значение — �то «true» (правда) или «false» (ложь)"
 
-#: builtin/config.c:149
+#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "значение — �то де��тичное чи�ло"
 
-#: builtin/config.c:150
+#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "значение — �то --bool или --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr ""
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "значение — �то путь (к файлу или каталогу)"
 
-#: builtin/config.c:152
+#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "значение - �то дата окончани� �рока дей�тви�"
 
-#: builtin/config.c:153
+#: builtin/config.c:161
 msgid "Other"
 msgstr "Другое"
 
-#: builtin/config.c:154
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "завершать значени� �УЛЕВЫМ байтом"
 
-#: builtin/config.c:155
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "показывать только имена переменных"
 
-#: builtin/config.c:156
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "учитывать директивы include (включени� файлов) при запро�е"
 
-#: builtin/config.c:157
+#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "показать и�точник на�тройки (файл, �тандартный ввод, двоичный объект, командна� �трока)"
 
-#: builtin/config.c:158
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+
+#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr ""
 
-#: builtin/config.c:158
+#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr ""
 
-#: builtin/config.c:172
+#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr ""
 
-#: builtin/config.c:174
+#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr ""
 
-#: builtin/config.c:308
+#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr ""
 
-#: builtin/config.c:344
+#: builtin/config.c:377
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr ""
 
-#: builtin/config.c:401
+#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr ""
 
-#: builtin/config.c:443
+#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "не удало�ь разобрать значение цвета по умолчанию"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr ""
 
-#: builtin/config.c:499
+#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr ""
 
-#: builtin/config.c:502
+#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr ""
 
-#: builtin/config.c:587
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -11055,81 +12815,89 @@ msgid ""
 "#\temail = %s\n"
 msgstr "# Это файл конфигурации пользовател� Git.\n[user]\n# Пожалуй�та, адаптируйте и ра�комментируйте �ледующие �троки:\n#\tuser = %s\n#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr ""
 
-#: builtin/config.c:616
+#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local можно и�пользовать только внутри git репозитори�"
 
-#: builtin/config.c:619
+#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr ""
 
-#: builtin/config.c:638
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr ""
+
+#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr ""
 
-#: builtin/config.c:658
+#: builtin/config.c:708
 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 ""
 
-#: builtin/config.c:688
+#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr ""
 
-#: builtin/config.c:693
+#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr ""
 
-#: builtin/config.c:706
+#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr ""
 
-#: builtin/config.c:712
+#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and "
 "--list"
 msgstr ""
 
-#: builtin/config.c:718
+#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr ""
 
-#: builtin/config.c:731
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr ""
+
+#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr ""
 
-#: builtin/config.c:734
+#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr ""
 
-#: builtin/config.c:744
+#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr ""
 
-#: builtin/config.c:746
+#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr ""
 
-#: builtin/config.c:760
+#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "не удало�ь �оздать файл конфигурации %s"
 
-#: builtin/config.c:773
+#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
 "       Use a regexp, --add or --replace-all to change %s."
 msgstr "нельз� перезапи�ать не�колько значений одним\n       И�пользуйте регул�рные выражени�, параметры --add или --replace-all, чтобы изменить %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr ""
@@ -11142,11 +12910,37 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "вывод размеров в удобочитаемом дл� человека виде"
 
-#: builtin/describe.c:27
+#: builtin/credential-cache--daemon.c:226
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr "Права до�тупа к вашему каталогу �окетов �лишком �вободны; друге пользователи могуи читать ваши зак�шированные пароли до�тупа. Обдумайте запу�к команды:\n\n\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:275
+msgid "print debugging messages to stderr"
+msgstr "вывод отладочных �ообщений на stderr"
+
+#: builtin/credential-cache--daemon.c:315
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr ""
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr ""
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr ""
+
+#: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<опции>] [<указатель-коммита>…]"
 
-#: builtin/describe.c:28
+#: builtin/describe.c:27
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<опции>] --dirty"
 
@@ -11162,659 +12956,840 @@ msgstr "легкове�ный"
 msgid "annotated"
 msgstr "аннотированный"
 
-#: builtin/describe.c:273
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "аннотированна� метка %s не до�тупна"
 
-#: builtin/describe.c:277
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "аннотированна� метка %s не �одержит в�троенного названи�"
-
-#: builtin/describe.c:279
+#: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "метка «%s» уже зде�ь «%s»"
+msgid "tag '%s' is externally known as '%s'"
+msgstr ""
 
-#: builtin/describe.c:323
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "нет меток, точно �оответ�твующих «%s»"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "�ет точных �овпадений по ��ылкам или тегам, ищу опи�ани�\n"
 
-#: builtin/describe.c:379
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "пои�к окончен на %s\n"
 
-#: builtin/describe.c:405
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
 "However, there were unannotated tags: try --tags."
 msgstr "�ет аннотированных меток, которые могут опи�ать «%s».\n�о имеют�� неаннотированные метки: попробуйте добавить параметр --tags."
 
-#: builtin/describe.c:409
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
 "Try --always, or create some tags."
 msgstr "�ет меток, которые могут опи�ать «%s….\nПопробуйте добавить параметр --always или �оздать какие-нибудь метки."
 
-#: builtin/describe.c:439
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "по�ещено %lu коммитов\n"
 
-#: builtin/describe.c:442
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
 "gave up search at %s\n"
 msgstr "более %i меток найдено; показано по�ледние %i\nо�тановлен пои�к по�ле %s\n"
 
-#: builtin/describe.c:510
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "опи�ать %s\n"
 
-#: builtin/describe.c:513
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�едопу�тимое им� объекта %s"
 
-#: builtin/describe.c:521
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s не �вл�ет�� коммитом или двоичным объектом"
 
-#: builtin/describe.c:535
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "пои�к метки, котора� идет по�ле коммита"
 
-#: builtin/describe.c:536
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "вывод отладочной информации �тратегии пои�ка на �тандартный вывод"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "и�пользовать любую ��ылку"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "и�пользовать любую метку, даже неаннотированную"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "в�егда и�пользовать длинный формат вывода"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "�ледовать только за первым родителем"
 
-#: builtin/describe.c:543
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "выводить только точные �овпадени�"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "ра��матривать по�ледние <n> меток (по умолчанию: 10)"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "ра��матривать только метки по <шаблону>"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "не учитывать метки, которые �оответ�твуют <шаблону>"
 
-#: builtin/describe.c:551 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "е�ли не найдено, показать �окращенный номер редакции коммита"
 
-#: builtin/describe.c:552 builtin/describe.c:555
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "пометка"
 
-#: builtin/describe.c:553
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "добавить <пометку> при изменённом рабочем каталоге (по умолчанию: «-dirty»)"
 
-#: builtin/describe.c:556
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)"
 
-#: builtin/describe.c:574
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long не�овме�тимо � --abbrev=0"
 
-#: builtin/describe.c:603
+#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Имена не найдены, не могу ничего опи�ать."
 
-#: builtin/describe.c:654
+#: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty не�овме�тимо � указанием указателей коммитов"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken не�овме�тимо � указанием указателей коммитов"
 
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr ""
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr ""
+
+#: builtin/diff.c:91
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "«%s»: не �вл�ет�� обычным файлом или �имвольной ��ылкой"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:258
 #, c-format
 msgid "invalid option: %s"
 msgstr "неправильный параметр: %s"
 
-#: builtin/diff.c:350
+#: builtin/diff.c:375
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr ""
+
+#: builtin/diff.c:485
 msgid "Not a git repository"
 msgstr "�е найден git репозиторий"
 
-#: builtin/diff.c:394
+#: builtin/diff.c:530 builtin/grep.c:681
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "передан неправильный объект «%s»."
 
-#: builtin/diff.c:403
+#: builtin/diff.c:541
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "передано больше двух двоичных объектов: «%s»"
 
-#: builtin/diff.c:408
+#: builtin/diff.c:546
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "передан необработанный объект «%s»."
 
+#: builtin/diff.c:580
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr ""
+
 #: builtin/difftool.c:30
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]"
 
-#: builtin/difftool.c:253
+#: builtin/difftool.c:260
 #, c-format
 msgid "failed: %d"
 msgstr "�бой: %d"
 
-#: builtin/difftool.c:295
+#: builtin/difftool.c:302
 #, c-format
 msgid "could not read symlink %s"
 msgstr "не удало�ь прочитать �имвольную ��ылку %s"
 
-#: builtin/difftool.c:297
+#: builtin/difftool.c:304
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "не удало�ь прочитать файл �имвольной ��ылки %s"
 
-#: builtin/difftool.c:305
+#: builtin/difftool.c:312
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "не удало�ь прочитать объект %s дл� �имвольной ��ылки %s"
 
-#: builtin/difftool.c:406
+#: builtin/difftool.c:412
 msgid ""
 "combined diff formats('-c' and '--cc') are not supported in\n"
 "directory diff mode('-d' and '--dir-diff')."
 msgstr "комбинированные форматы файлов �пи�ка изменений(«-c» и «--cc») не поддерживают�� в режиме �равнени� каталогов(«-d» и «--dir-diff»)."
 
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "оба файла изменены: «%s» и «%s»."
 
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
 msgid "working tree file has been left."
 msgstr "рабочий каталог был покинут."
 
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "временные файлы уже наход�т�� в «%s»."
 
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
 msgid "you may want to cleanup or recover these."
 msgstr "возможно вы хотите их удалить или во��тановить."
 
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "и�пользовать «diff.guitool» вме�то «diff.tool»"
 
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
 msgid "perform a full-directory diff"
 msgstr "выполнить пофайловое �равнение в�его каталога"
 
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
 msgid "do not prompt before launching a diff tool"
 msgstr "не �прашивать перед запу�ком утилиты �равнени�"
 
-#: builtin/difftool.c:698
+#: builtin/difftool.c:705
 msgid "use symlinks in dir-diff mode"
 msgstr "и�пользовать �имвольные ��ылки в режиме �равнени� каталога"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
 msgid "tool"
 msgstr ""
 
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
 msgid "use the specified diff tool"
 msgstr "и�пользовать указанную утилиту �равнени�"
 
-#: builtin/difftool.c:702
+#: builtin/difftool.c:709
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "выве�ти �пи�ок утилит, которые можно и�пользовать � параметром «--tool»"
 
-#: builtin/difftool.c:705
+#: builtin/difftool.c:712
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit"
 " code"
 msgstr "выходить из «git-difftool», е�ли вызванна� утилита �равнени� вернула не нулевой код возврата"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
 msgid "specify a custom command for viewing diffs"
 msgstr "и�пользовать о�обую команду дл� про�мотра изменений"
 
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
 msgid "passed to `diff`"
 msgstr ""
 
-#: builtin/difftool.c:724
+#: builtin/difftool.c:731
 msgid "difftool requires worktree or --no-index"
 msgstr ""
 
-#: builtin/difftool.c:731
+#: builtin/difftool.c:738
 msgid "--dir-diff is incompatible with --no-index"
 msgstr ""
 
-#: builtin/difftool.c:734
+#: builtin/difftool.c:741
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr ""
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:749
 msgid "no <tool> given for --tool=<tool>"
 msgstr "не передана <утилита> дл� --tool=<утилита>"
 
-#: builtin/difftool.c:749
+#: builtin/difftool.c:756
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "не передана <команда> дл� --extcmd=<команда>"
 
+#: 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
+msgid "type"
+msgstr "тип"
+
+#: builtin/env--helper.c:46
+msgid "default for git_env_*(...) to fall back on"
+msgstr ""
+
+#: builtin/env--helper.c:48
+msgid "be quiet only use git_env_*() value as exit code"
+msgstr ""
+
+#: builtin/env--helper.c:67
+#, c-format
+msgid ""
+"option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+
+#: builtin/env--helper.c:82
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not "
+"`%s`"
+msgstr ""
+
 #: builtin/fast-export.c:29
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [опции-rev-list]"
 
-#: builtin/fast-export.c:1084
+#: builtin/fast-export.c:868
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr ""
+
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr ""
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "показать прогре�� по�ле <n> объектов"
 
-#: builtin/fast-export.c:1086
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "выбор обработки подпи�анных меток"
 
-#: builtin/fast-export.c:1089
+#: builtin/fast-export.c:1202
 msgid "select handling of tags that tag filtered objects"
 msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты"
 
-#: builtin/fast-export.c:1092
+#: builtin/fast-export.c:1205
+msgid "select handling of commit messages in an alternate encoding"
+msgstr ""
+
+#: builtin/fast-export.c:1208
 msgid "Dump marks to this file"
 msgstr "Запи�ать пометки в �тот файл"
 
-#: builtin/fast-export.c:1094
+#: builtin/fast-export.c:1210
 msgid "Import marks from this file"
 msgstr "Импортировать пометки из �того файла"
 
-#: builtin/fast-export.c:1096
+#: builtin/fast-export.c:1214
+msgid "Import marks from this file if it exists"
+msgstr ""
+
+#: builtin/fast-export.c:1216
 msgid "Fake a tagger when tags lack one"
 msgstr "Подделать автора метки, е�ли у метки он от�ут�твует"
 
-#: builtin/fast-export.c:1098
+#: builtin/fast-export.c:1218
 msgid "Output full tree for each commit"
 msgstr "Выве�ти полное дерево дл� каждого коммита"
 
-#: builtin/fast-export.c:1100
+#: builtin/fast-export.c:1220
 msgid "Use the done feature to terminate the stream"
 msgstr "И�пользовать пометку завершени� в конце потока"
 
-#: builtin/fast-export.c:1101
+#: builtin/fast-export.c:1221
 msgid "Skip output of blob data"
 msgstr "Пропу�тить вывод данных двоичных объектов"
 
-#: builtin/fast-export.c:1102 builtin/log.c:1609
+#: builtin/fast-export.c:1222 builtin/log.c:1816
 msgid "refspec"
 msgstr "�пецификатор ��ылки"
 
-#: builtin/fast-export.c:1103
+#: builtin/fast-export.c:1223
 msgid "Apply refspec to exported refs"
 msgstr "Применить �пецификатор ��ылки к �к�портируемым ��ылкам"
 
-#: builtin/fast-export.c:1104
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "�делать вывод анонимным"
 
-#: builtin/fast-export.c:1106
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr ""
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr ""
+
+#: builtin/fast-export.c:1229
 msgid "Reference parents which are not in fast-export stream by object id"
 msgstr ""
 
-#: builtin/fast-export.c:1108
+#: builtin/fast-export.c:1231
 msgid "Show original object ids of blobs/commits"
 msgstr ""
 
-#: builtin/fetch.c:28
+#: builtin/fast-export.c:1233
+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
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr ""
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr ""
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr ""
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+
+#: builtin/fetch-pack.c:241
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr ""
+
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<опции>] [<репозиторий> [<�пецификатор-��ылки>…]]"
 
-#: builtin/fetch.c:29
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<опции>] <группа>"
 
-#: builtin/fetch.c:30
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]"
 
-#: builtin/fetch.c:31
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<опции>]"
 
-#: builtin/fetch.c:115 builtin/pull.c:202
+#: builtin/fetch.c:119
+msgid "fetch.parallel cannot be negative"
+msgstr ""
+
+#: builtin/fetch.c:142 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "извлечь �о в�ех внешних репозиториев"
 
-#: builtin/fetch.c:117 builtin/pull.c:205
+#: builtin/fetch.c:144 builtin/pull.c:245
+msgid "set upstream for git pull/fetch"
+msgstr ""
+
+#: builtin/fetch.c:146 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "допи�ать к .git/FETCH_HEAD вме�то перезапи�и"
 
-#: builtin/fetch.c:119 builtin/pull.c:208
+#: builtin/fetch.c:148 builtin/pull.c:191
 msgid "path to upload pack on remote end"
 msgstr "путь к программе упаковки пакета на машине � внешним репозиторием"
 
-#: builtin/fetch.c:120
+#: builtin/fetch.c:149
 msgid "force overwrite of local reference"
 msgstr ""
 
-#: builtin/fetch.c:122
+#: builtin/fetch.c:151
 msgid "fetch from multiple remotes"
 msgstr "извлечь � не�кольких внешних репозиториев"
 
-#: builtin/fetch.c:124 builtin/pull.c:212
+#: builtin/fetch.c:153 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "извлечь в�е метки и �в�занные объекты"
 
-#: builtin/fetch.c:126
+#: builtin/fetch.c:155
 msgid "do not fetch all tags (--no-tags)"
 msgstr "не извлекать в�е метки (--no-tags)"
 
-#: builtin/fetch.c:128
+#: builtin/fetch.c:157
 msgid "number of submodules fetched in parallel"
 msgstr "количе�тво подмодулей, которые будут �качаны парралельно"
 
-#: builtin/fetch.c:130 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:198
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "почи�тить от�леживаемые внешние ветки, которых уже нет на внешнем репозитории"
 
-#: builtin/fetch.c:132
+#: builtin/fetch.c:161
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr ""
 
-#: builtin/fetch.c:133 builtin/fetch.c:156 builtin/pull.c:139
+#: builtin/fetch.c:162 builtin/fetch.c:187 builtin/pull.c:122
 msgid "on-demand"
 msgstr "по требованию"
 
-#: builtin/fetch.c:134
+#: builtin/fetch.c:163
 msgid "control recursive fetching of submodules"
 msgstr "управление рекур�ивным извлечением подмодулей"
 
-#: builtin/fetch.c:138 builtin/pull.c:223
+#: builtin/fetch.c:168
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr ""
+
+#: builtin/fetch.c:169 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "о�тавить загруженный пакет данных"
 
-#: builtin/fetch.c:140
+#: builtin/fetch.c:171
 msgid "allow updating of HEAD ref"
 msgstr "разрешить обновление ��ылки HEAD"
 
-#: builtin/fetch.c:143 builtin/fetch.c:149 builtin/pull.c:226
+#: builtin/fetch.c:174 builtin/fetch.c:180 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
-msgstr "улугубить и�торию ча�тичного клона"
+msgstr "углубить и�торию ча�тичного клона"
 
-#: builtin/fetch.c:145
+#: builtin/fetch.c:176 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr "углубить и�торию ча�тичного клона о�новыва��ь на времени"
 
-#: builtin/fetch.c:151 builtin/pull.c:229
+#: builtin/fetch.c:182 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "преобразовать в полный репозиторий"
 
-#: builtin/fetch.c:154
+#: builtin/fetch.c:185
 msgid "prepend this to submodule path output"
 msgstr "при�оедин�ть �то �переди к выводу путей подмодул�"
 
-#: builtin/fetch.c:157
+#: builtin/fetch.c:188
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "на�троить по умолчанию рекур�ивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)"
 
-#: builtin/fetch.c:161 builtin/pull.c:232
+#: builtin/fetch.c:192 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "принимать ��ылки, которые обновл�ют .git/shallow"
 
-#: builtin/fetch.c:162 builtin/pull.c:234
+#: builtin/fetch.c:193 builtin/pull.c:226
 msgid "refmap"
 msgstr "�оответ�твие-��ылок"
 
-#: builtin/fetch.c:163 builtin/pull.c:235
+#: builtin/fetch.c:194 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "указать �оответ�твие ��ылок при извлечении"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:201 builtin/pull.c:240
 msgid "report that we have only objects reachable from this object"
 msgstr ""
 
-#: builtin/fetch.c:469
+#: builtin/fetch.c:204 builtin/fetch.c:206
+msgid "run 'maintenance --auto' after fetching"
+msgstr ""
+
+#: builtin/fetch.c:208 builtin/pull.c:243
+msgid "check for forced-updates on all updated branches"
+msgstr ""
+
+#: builtin/fetch.c:210
+msgid "write the commit-graph after fetching"
+msgstr ""
+
+#: builtin/fetch.c:212
+msgid "accept refspecs from stdin"
+msgstr ""
+
+#: builtin/fetch.c:523
 msgid "Couldn't find remote ref HEAD"
 msgstr "�е удало�ь найти ��ылку HEAD на внешнем репозитории"
 
-#: builtin/fetch.c:608
+#: builtin/fetch.c:677
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "опци� fetch.output �одержит неправильное значение дл� %s"
 
-#: builtin/fetch.c:705
+#: builtin/fetch.c:775
 #, c-format
 msgid "object %s not found"
 msgstr "объект %s не найден"
 
-#: builtin/fetch.c:709
+#: builtin/fetch.c:779
 msgid "[up to date]"
 msgstr "[актуально]"
 
-#: builtin/fetch.c:722 builtin/fetch.c:738 builtin/fetch.c:801
+#: builtin/fetch.c:792 builtin/fetch.c:808 builtin/fetch.c:880
 msgid "[rejected]"
 msgstr "[отклонено]"
 
-#: builtin/fetch.c:723
+#: builtin/fetch.c:793
 msgid "can't fetch in current branch"
 msgstr "нельз� извлечь текущую ветку"
 
-#: builtin/fetch.c:733
+#: builtin/fetch.c:803
 msgid "[tag update]"
 msgstr "[обновление метки]"
 
-#: builtin/fetch.c:734 builtin/fetch.c:771 builtin/fetch.c:784
-#: builtin/fetch.c:796
+#: builtin/fetch.c:804 builtin/fetch.c:841 builtin/fetch.c:863
+#: builtin/fetch.c:875
 msgid "unable to update local ref"
 msgstr "не удало�ь обновить локальную ��ылку"
 
-#: builtin/fetch.c:738
+#: builtin/fetch.c:808
 msgid "would clobber existing tag"
 msgstr ""
 
-#: builtin/fetch.c:760
+#: builtin/fetch.c:830
 msgid "[new tag]"
 msgstr "[нова� метка]"
 
-#: builtin/fetch.c:763
+#: builtin/fetch.c:833
 msgid "[new branch]"
 msgstr "[нова� ветка]"
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:836
 msgid "[new ref]"
 msgstr "[нова� ��ылка]"
 
-#: builtin/fetch.c:796
+#: builtin/fetch.c:875
 msgid "forced update"
 msgstr "принудительное обновление"
 
-#: builtin/fetch.c:801
+#: builtin/fetch.c:880
 msgid "non-fast-forward"
 msgstr "без перемотки вперед"
 
-#: builtin/fetch.c:847
+#: builtin/fetch.c:901
+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
+#, 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"
+msgstr ""
+
+#: builtin/fetch.c:939
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s не отправил в�е необходимые объекты\n"
 
-#: builtin/fetch.c:868
+#: builtin/fetch.c:960
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "%s отклонено из-за того, что ча�тичные корни не разрешено обновл�ть"
 
-#: builtin/fetch.c:959 builtin/fetch.c:1081
+#: builtin/fetch.c:1053 builtin/fetch.c:1191
 #, c-format
 msgid "From %.*s\n"
 msgstr "Из %.*s\n"
 
-#: builtin/fetch.c:970
+#: builtin/fetch.c:1064
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
 " 'git remote prune %s' to remove any old, conflicting branches"
 msgstr "не удало�ь обновить некоторые локальные ��ылки; попробуйте запу�тить «git remote prune %s», чтобы почи�тить �тарые, конфликтующие ветки"
 
-#: builtin/fetch.c:1051
+#: builtin/fetch.c:1161
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s будет ви��щей веткой)"
 
-#: builtin/fetch.c:1052
+#: builtin/fetch.c:1162
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s �тала ви��щей веткой)"
 
-#: builtin/fetch.c:1084
+#: builtin/fetch.c:1194
 msgid "[deleted]"
 msgstr "[удалено]"
 
-#: builtin/fetch.c:1085 builtin/remote.c:1036
+#: builtin/fetch.c:1195 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(нет)"
 
-#: builtin/fetch.c:1108
+#: builtin/fetch.c:1218
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Отказ получени� в текущую ветку %s не голого репозитори�"
 
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1237
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "�еправильное значение «%2$s» дл� параметра «%1$s» дл� %3$s"
 
-#: builtin/fetch.c:1130
+#: builtin/fetch.c:1240
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Параметр «%s» игнорирует�� дл� %s\n"
 
-#: builtin/fetch.c:1434
+#: builtin/fetch.c:1448
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr ""
+
+#: builtin/fetch.c:1463
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr ""
+
+#: builtin/fetch.c:1465
+msgid "not setting upstream for a remote tag"
+msgstr ""
+
+#: builtin/fetch.c:1467
+msgid "unknown branch type"
+msgstr ""
+
+#: builtin/fetch.c:1469
+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
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Извлечение из %s\n"
 
-#: builtin/fetch.c:1436 builtin/remote.c:100
+#: builtin/fetch.c:1608 builtin/fetch.c:1663 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "�е удало�ь извлечь %s"
 
-#: builtin/fetch.c:1482
-msgid ""
-"--filter can only be used with the remote configured in "
-"extensions.partialClone"
+#: builtin/fetch.c:1620
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr ""
 
-#: builtin/fetch.c:1506
+#: builtin/fetch.c:1724
 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:1543
+#: builtin/fetch.c:1760
 msgid "You need to specify a tag name."
 msgstr "Вам нужно указать им� метки."
 
-#: builtin/fetch.c:1594
+#: builtin/fetch.c:1825
 msgid "Negative depth in --deepen is not supported"
 msgstr "Отрицательна� грубина дл� --deepen не поддерживает��"
 
-#: builtin/fetch.c:1596
+#: builtin/fetch.c:1827
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen и --depth нельз� и�пользовать одновременно"
 
-#: builtin/fetch.c:1601
+#: builtin/fetch.c:1832
 msgid "--depth and --unshallow cannot be used together"
 msgstr "нельз� и�пользовать одновременно --depth и --unshallow"
 
-#: builtin/fetch.c:1603
+#: builtin/fetch.c:1834
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow не имеет �мы�ла на полном репозитории"
 
-#: builtin/fetch.c:1619
+#: builtin/fetch.c:1851
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all не принимает им� репозитори� как аргумент"
 
-#: builtin/fetch.c:1621
+#: builtin/fetch.c:1853
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all не имеет �мы�ла при указании �пецификаторов ��ылок"
 
-#: builtin/fetch.c:1630
+#: builtin/fetch.c:1862
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "�ет такого внешнего репозитори� или группы: %s"
 
-#: builtin/fetch.c:1637
+#: builtin/fetch.c:1869
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "Получение группы и указание �пецификаций ��ылок не имеет �мы�ла"
 
-#: builtin/fetch.c:1653
+#: builtin/fetch.c:1887
 msgid ""
 "--filter can only be used with the remote configured in "
 "extensions.partialclone"
 msgstr ""
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:1891
+msgid "--stdin can only be used when fetching from one remote"
+msgstr ""
+
+#: 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 <�ообщение>] [--log[=<n>] | --no-log] [--file <файл>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "отправить в журнал <n> запи�ей из короткого журнала"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "�окращение дл� --log (у�таревшее)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "тек�т"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "и�пользовать <тек�т> как начальное �ообщение"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "файл дл� чтени�"
 
@@ -11827,8 +13802,8 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <объект>]"
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<коммит>]]"
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr ""
 
 #: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
@@ -11854,7 +13829,7 @@ msgstr "выводить указатели меÑ�та заполнениÑ� в Ð
 msgid "show only <n> matched refs"
 msgstr "показать только <n> �овпадающих ��ылок"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:433
+#: builtin/for-each-ref.c:39 builtin/tag.c:440
 msgid "respect format colors"
 msgstr "и�пользовать цвета из формата"
 
@@ -11878,272 +13853,288 @@ msgstr "вывод только ��ылок, которые �одержат к
 msgid "print only refs which don't contain the commit"
 msgstr "вывод только ��ылок, которые не �одержат коммит"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr ""
+
+#: builtin/for-each-repo.c:37
+msgid "config"
+msgstr ""
+
+#: builtin/for-each-repo.c:38
+msgid "config key storing a list of repository paths"
+msgstr ""
+
+#: builtin/for-each-repo.c:46
+msgid "missing --config=<config>"
+msgstr ""
+
+#: builtin/fsck.c:69 builtin/fsck.c:148 builtin/fsck.c:149
 msgid "unknown"
 msgstr ""
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:101 builtin/fsck.c:121
 #, c-format
 msgid "error in %s %s: %s"
 msgstr ""
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:115
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr ""
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:144 builtin/fsck.c:147
 #, c-format
 msgid "broken link from %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:156
 msgid "wrong object type in link"
 msgstr ""
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:172
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
 "              to %7s %s"
 msgstr ""
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:283
 #, c-format
 msgid "missing %s %s"
 msgstr ""
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:310
 #, c-format
 msgid "unreachable %s %s"
 msgstr ""
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:330
 #, c-format
 msgid "dangling %s %s"
 msgstr ""
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:340
 msgid "could not create lost-found"
 msgstr ""
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:351
 #, c-format
 msgid "could not finish '%s'"
 msgstr "не удало�ь закончить '%s'"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:368
 #, c-format
 msgid "Checking %s"
 msgstr ""
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr ""
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:425
 #, c-format
 msgid "Checking %s %s"
 msgstr ""
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:430
 msgid "broken links"
 msgstr ""
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:439
 #, c-format
 msgid "root %s"
 msgstr ""
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:447
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr ""
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:476
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr ""
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:501
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr ""
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:515
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr ""
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:549
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr ""
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:556
 #, c-format
 msgid "%s: not a commit"
 msgstr ""
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:610
 msgid "notice: No default references"
 msgstr ""
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:625
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr ""
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:638
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr ""
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:658
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr ""
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:673
 msgid "Checking object directory"
 msgstr ""
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:676
 msgid "Checking object directories"
 msgstr "Проверка каталогов объектов"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:691
 #, c-format
 msgid "Checking %s link"
 msgstr ""
 
-#: builtin/fsck.c:705 builtin/index-pack.c:841
+#: builtin/fsck.c:696 builtin/index-pack.c:865
 #, c-format
 msgid "invalid %s"
 msgstr "неправильный %s"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:703
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr ""
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:709
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr ""
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:713
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr ""
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:725
 msgid "Checking cache tree"
 msgstr ""
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:730
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:739
 msgid "non-tree in cache-tree"
 msgstr ""
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:770
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<опции>] [<объект>…]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:776
 msgid "show unreachable objects"
 msgstr "показать недо�тупные объекты"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:777
 msgid "show dangling objects"
 msgstr "показать объекты, на которые нет ��ылок"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:778
 msgid "report tags"
 msgstr "выве�ти отчет по меткам"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:779
 msgid "report root nodes"
 msgstr "выве�ти отчет по корневым узлам"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:780
 msgid "make index objects head nodes"
 msgstr "во�принимать объекты в индек�е как корневые узлы"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:781
 msgid "make reflogs head nodes (default)"
 msgstr "�оздать корневые узлы журналов ��ылок (по умолчанию)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:782
 msgid "also consider packs and alternate objects"
 msgstr "также провер�ть пакеты и альтернативные объекты"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:783
 msgid "check only connectivity"
 msgstr "только проверить �оединение"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:784
 msgid "enable more strict checking"
 msgstr "и�пользовать более �трогую проверку"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:786
 msgid "write dangling objects in .git/lost-found"
 msgstr "запи�ать объекты на которые нет ��ылок в .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:787 builtin/prune.c:134
 msgid "show progress"
 msgstr "показать прогре�� выполнени�"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:788
 msgid "show verbose names for reachable objects"
 msgstr "показать подробные имена дл� недо�тупных объектов"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:224
+#: builtin/fsck.c:847 builtin/index-pack.c:261
 msgid "Checking objects"
 msgstr "Проверка объектов"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:875
 #, c-format
 msgid "%s: object missing"
 msgstr ""
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:886
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr ""
 
-#: builtin/gc.c:34
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<опции>]"
 
-#: builtin/gc.c:90
+#: builtin/gc.c:94
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "�е удало�ь выполнить fstat %s: %s"
 
-#: builtin/gc.c:126
+#: builtin/gc.c:130
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr ""
 
-#: builtin/gc.c:476 builtin/init-db.c:55
+#: builtin/gc.c:479 builtin/init-db.c:58
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "не удало�ь выполнить stat дл� «%s»"
 
-#: builtin/gc.c:485 builtin/notes.c:240 builtin/tag.c:519
+#: builtin/gc.c:488 builtin/notes.c:240 builtin/tag.c:530
 #, c-format
 msgid "cannot read '%s'"
 msgstr "не удало�ь прочитать «%s»"
 
-#: builtin/gc.c:492
+#: builtin/gc.c:495
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -12153,64 +14144,196 @@ msgid ""
 "%s"
 msgstr "По�ледний запу�к gc �ообщил �ледующее. Пожалуй�та, и�правьте ошибку и удалите %s.\n�втоматиче�ка� очи�тка репозитори� не будет производить��, пока �тот файл не удалён.\n\n%s"
 
-#: builtin/gc.c:540
+#: builtin/gc.c:543
 msgid "prune unreferenced objects"
 msgstr "почи�тить объекты, на которые нет ��ылок"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:545
 msgid "be more thorough (increased runtime)"
 msgstr "провер�ть более внимательно (занимает больше времени)"
 
-#: builtin/gc.c:543
+#: builtin/gc.c:546
 msgid "enable auto-gc mode"
 msgstr "включить режим auto-gc"
 
-#: builtin/gc.c:546
+#: builtin/gc.c:549
 msgid "force running gc even if there may be another gc running"
 msgstr "принудительно запу�тить gc, даже е�ть друга� копи� gc уже запущена"
 
-#: builtin/gc.c:549
+#: builtin/gc.c:552
 msgid "repack all other packs except the largest pack"
 msgstr ""
 
-#: builtin/gc.c:566
+#: builtin/gc.c:569
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr ""
 
-#: builtin/gc.c:577
+#: builtin/gc.c:580
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr ""
 
-#: builtin/gc.c:597
+#: builtin/gc.c:600
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "�втоматиче�ка� упаковка репозитори� в фоне, дл� оптимальной производительно�ти.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:602
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "�втоматиче�ка� упаковка репозитори�, дл� оптимальной производительно�ти.\n"
 
-#: builtin/gc.c:600
+#: builtin/gc.c:603
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "Смотрите «git help gc» руковод�тва по ручной очи�тке.\n"
 
-#: builtin/gc.c:640
+#: builtin/gc.c:643
 #, 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:693
+#: builtin/gc.c:698
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove "
 "them."
 msgstr "Имеет�� �лишком много объектов, на которые нет ��ылок; запу�тите «git prune» дл� их удалени�."
 
-#: builtin/grep.c:29
+#: builtin/gc.c:708
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+
+#: builtin/gc.c:738
+msgid "--no-schedule is not allowed"
+msgstr ""
+
+#: builtin/gc.c:743
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr ""
+
+#: builtin/gc.c:862
+msgid "failed to write commit-graph"
+msgstr ""
+
+#: builtin/gc.c:901
+msgid "failed to fill remotes"
+msgstr ""
+
+#: builtin/gc.c:1024
+msgid "failed to start 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1041
+msgid "failed to finish 'git pack-objects' process"
+msgstr ""
+
+#: builtin/gc.c:1093
+msgid "failed to write multi-pack-index"
+msgstr ""
+
+#: builtin/gc.c:1111
+msgid "'git multi-pack-index expire' failed"
+msgstr ""
+
+#: builtin/gc.c:1172
+msgid "'git multi-pack-index repack' failed"
+msgstr ""
+
+#: builtin/gc.c:1181
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr ""
+
+#: builtin/gc.c:1279
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr ""
+
+#: builtin/gc.c:1309
+#, c-format
+msgid "task '%s' failed"
+msgstr ""
+
+#: builtin/gc.c:1389
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr ""
+
+#: builtin/gc.c:1394
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr ""
+
+#: builtin/gc.c:1409
+msgid "run tasks based on the state of the repository"
+msgstr ""
+
+#: builtin/gc.c:1410
+msgid "frequency"
+msgstr ""
+
+#: builtin/gc.c:1411
+msgid "run tasks based on frequency"
+msgstr ""
+
+#: builtin/gc.c:1414
+msgid "do not report progress or other information over stderr"
+msgstr ""
+
+#: builtin/gc.c:1415
+msgid "task"
+msgstr ""
+
+#: builtin/gc.c:1416
+msgid "run a specific task"
+msgstr ""
+
+#: builtin/gc.c:1433
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr ""
+
+#: builtin/gc.c:1467
+msgid "failed to run 'git config'"
+msgstr ""
+
+#: builtin/gc.c:1512
+msgid "another process is scheduling background maintenance"
+msgstr ""
+
+#: builtin/gc.c:1525
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1544
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr ""
+
+#: builtin/gc.c:1550
+msgid "failed to open stdin of 'crontab'"
+msgstr ""
+
+#: builtin/gc.c:1592
+msgid "'crontab' died"
+msgstr ""
+
+#: builtin/gc.c:1605
+msgid "failed to add repo to global config"
+msgstr ""
+
+#: builtin/gc.c:1615
+msgid "git maintenance <subcommand> [<options>]"
+msgstr ""
+
+#: builtin/gc.c:1634
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr ""
+
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<опции>] [-e] <шаблон> [<редакци�>…] [[--] <путь>…]"
 
@@ -12227,258 +14350,258 @@ msgstr "указано недопуÑ�тимое количеÑ�тво потокÐ
 #. TRANSLATORS: %s is the configuration
 #. variable for tweaking threads, currently
 #. grep.threads
-#: builtin/grep.c:287 builtin/index-pack.c:1514 builtin/index-pack.c:1705
-#: builtin/pack-objects.c:2720
+#: builtin/grep.c:287 builtin/index-pack.c:1576 builtin/index-pack.c:1766
+#: builtin/pack-objects.c:2936
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "нет поддержки потоков, игнорирование %s"
 
-#: builtin/grep.c:466 builtin/grep.c:590 builtin/grep.c:631
+#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "не удало�ь прочитать дерево (%s)"
 
-#: builtin/grep.c:646
+#: builtin/grep.c:655
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "не удало�ь выполнить grep из объекта типа %s"
 
-#: builtin/grep.c:712
+#: builtin/grep.c:736
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "параметр «%c» ожидает чи�ловое значение"
 
-#: builtin/grep.c:811
+#: builtin/grep.c:835
 msgid "search in index instead of in the work tree"
 msgstr "и�кать в индек�е, а не в рабочем каталоге"
 
-#: builtin/grep.c:813
+#: builtin/grep.c:837
 msgid "find in contents not managed by git"
 msgstr "и�кать в �одержимом не управл�емым git"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:839
 msgid "search in both tracked and untracked files"
 msgstr "и�кать и в от�леживаемых, и в неот�леживаемых файлах"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:841
 msgid "ignore files specified via '.gitignore'"
 msgstr "игнорировать файлы указанные в «.gitignore»"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:843
 msgid "recursively search in each submodule"
 msgstr "рекур�ивный пои�к по в�ем подмодул�м"
 
-#: builtin/grep.c:822
+#: builtin/grep.c:846
 msgid "show non-matching lines"
 msgstr "и�кать в не�овпадающих �троках"
 
-#: builtin/grep.c:824
+#: builtin/grep.c:848
 msgid "case insensitive matching"
 msgstr "без учета реги�тра"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:850
 msgid "match patterns only at word boundaries"
 msgstr "и�кать �овпадени� шаблона только на границах �лов"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:852
 msgid "process binary files as text"
 msgstr "обработка двоичных файлов как тек�та"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:854
 msgid "don't match patterns in binary files"
 msgstr "не и�кать �овпадени� шаблона в двоичных файлах"
 
-#: builtin/grep.c:833
+#: builtin/grep.c:857
 msgid "process binary files with textconv filters"
 msgstr "обрабатывать�� двоичные файлы � помощью фильтров textconv"
 
-#: builtin/grep.c:835
+#: builtin/grep.c:859
 msgid "search in subdirectories (default)"
 msgstr ""
 
-#: builtin/grep.c:837
+#: builtin/grep.c:861
 msgid "descend at most <depth> levels"
 msgstr "на глубине мак�иму <глубина> уровней"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:865
 msgid "use extended POSIX regular expressions"
 msgstr "и�пользовать ра�ширенные регул�рные выражени� POSIX"
 
-#: builtin/grep.c:844
+#: builtin/grep.c:868
 msgid "use basic POSIX regular expressions (default)"
 msgstr "и�пользовать базовые регул�рные выражени� POSIX (по умолчанию)"
 
-#: builtin/grep.c:847
+#: builtin/grep.c:871
 msgid "interpret patterns as fixed strings"
 msgstr "интерпретировать шаблоны как фик�ированные �троки"
 
-#: builtin/grep.c:850
+#: builtin/grep.c:874
 msgid "use Perl-compatible regular expressions"
 msgstr "и�пользовать Perl-�овме�тимые регул�рные выражени�"
 
-#: builtin/grep.c:853
+#: builtin/grep.c:877
 msgid "show line numbers"
 msgstr "выве�ти номера �трок"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:878
 msgid "show column number of first match"
 msgstr ""
 
-#: builtin/grep.c:855
+#: builtin/grep.c:879
 msgid "don't show filenames"
 msgstr "не выводить имена файлов"
 
-#: builtin/grep.c:856
+#: builtin/grep.c:880
 msgid "show filenames"
 msgstr "выводить имена файлов"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:882
 msgid "show filenames relative to top directory"
 msgstr "выводить имена файлов отно�ительно каталога репозитори�"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:884
 msgid "show only filenames instead of matching lines"
 msgstr "выводить только имена файлов, а не �овпадающие �троки"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:886
 msgid "synonym for --files-with-matches"
 msgstr "�иноним дл� --files-with-matches"
 
-#: builtin/grep.c:865
+#: builtin/grep.c:889
 msgid "show only the names of files without match"
 msgstr "выводить только не�овпадающие имена файлов"
 
-#: builtin/grep.c:867
+#: builtin/grep.c:891
 msgid "print NUL after filenames"
 msgstr "выводить двоичный �ОЛЬ по�ле �пи�ка имен файлов"
 
-#: builtin/grep.c:870
+#: builtin/grep.c:894
 msgid "show only matching parts of a line"
 msgstr ""
 
-#: builtin/grep.c:872
+#: builtin/grep.c:896
 msgid "show the number of matches instead of matching lines"
 msgstr "выводить количе�тво �овпадений, а не �овпадающие �троки"
 
-#: builtin/grep.c:873
+#: builtin/grep.c:897
 msgid "highlight matches"
 msgstr "под�вечивать �овпадени�"
 
-#: builtin/grep.c:875
+#: builtin/grep.c:899
 msgid "print empty line between matches from different files"
 msgstr "выводить пу�тую �троку по�ле �овпадений из разных файлов"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:901
 msgid "show filename only once above matches from same file"
 msgstr "выводить им� файла только раз на не�колько �овпадений в одном файле"
 
-#: builtin/grep.c:880
+#: builtin/grep.c:904
 msgid "show <n> context lines before and after matches"
 msgstr "показать <n> �трок контек�та перед и по�ле �овпадени�"
 
-#: builtin/grep.c:883
+#: builtin/grep.c:907
 msgid "show <n> context lines before matches"
 msgstr "показать <n> �трок контек�та перед �овпадением"
 
-#: builtin/grep.c:885
+#: builtin/grep.c:909
 msgid "show <n> context lines after matches"
 msgstr "показать <n> �трок контек�та по�ле �овпадени�"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:911
 msgid "use <n> worker threads"
 msgstr "и�пользовать <кол> рабочих потоков"
 
-#: builtin/grep.c:888
+#: builtin/grep.c:912
 msgid "shortcut for -C NUM"
 msgstr "тоже, что и -C КОЛИЧЕСТВО"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:915
 msgid "show a line with the function name before matches"
 msgstr "показать �троку � именем функции перед �овпадением"
 
-#: builtin/grep.c:893
+#: builtin/grep.c:917
 msgid "show the surrounding function"
 msgstr "показать окружающую функцию"
 
-#: builtin/grep.c:896
+#: builtin/grep.c:920
 msgid "read patterns from file"
 msgstr "прочитать шаблоны из файла"
 
-#: builtin/grep.c:898
+#: builtin/grep.c:922
 msgid "match <pattern>"
 msgstr "пои�к �оответ�твий � <шаблоном>"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:924
 msgid "combine patterns specified with -e"
 msgstr "объединить шаблоны указанные � помощью -e"
 
-#: builtin/grep.c:912
+#: builtin/grep.c:936
 msgid "indicate hit with exit status without output"
 msgstr "ничего не выводить, указать на �овпадение � помощью кода выхода"
 
-#: builtin/grep.c:914
+#: builtin/grep.c:938
 msgid "show only matches from files that match all patterns"
 msgstr "показать только �овпадени� из файлов в которых �овпадают в�е шаблоны"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:940
 msgid "show parse tree for grep expression"
 msgstr "показать дерево разбора дл� выражени� пои�ка"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:944
 msgid "pager"
 msgstr "пейджер"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:944
 msgid "show matching files in the pager"
 msgstr "показать �овпадающие файлы � помощью программы-пейджера"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:948
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "разрешить вызов grep(1) (игнорирует�� в �той �борке)"
 
-#: builtin/grep.c:988
+#: builtin/grep.c:1014
 msgid "no pattern given"
 msgstr ""
 
-#: builtin/grep.c:1024
+#: builtin/grep.c:1050
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index или --untracked нельз� и�пользовать одновременно � указанием ревизии"
 
-#: builtin/grep.c:1032
+#: builtin/grep.c:1058
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "не удало�ь определить редакцию: %s"
 
-#: builtin/grep.c:1063
+#: builtin/grep.c:1088
+msgid "--untracked not supported with --recurse-submodules"
+msgstr ""
+
+#: builtin/grep.c:1092
 msgid "invalid option combination, ignoring --threads"
 msgstr ""
 
-#: builtin/grep.c:1066 builtin/pack-objects.c:3403
+#: builtin/grep.c:1095 builtin/pack-objects.c:3655
 msgid "no threads support, ignoring --threads"
 msgstr "нет поддержки потоков, игнорирование --threads"
 
-#: builtin/grep.c:1069 builtin/index-pack.c:1511 builtin/pack-objects.c:2717
+#: builtin/grep.c:1098 builtin/index-pack.c:1573 builtin/pack-objects.c:2933
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "указано неправильное количе�тво потоков (%d)"
 
-#: builtin/grep.c:1092
+#: builtin/grep.c:1132
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager работает только в рабочем каталоге"
 
-#: builtin/grep.c:1115
-msgid "option not supported with --recurse-submodules"
-msgstr ""
-
-#: builtin/grep.c:1121
+#: builtin/grep.c:1158
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr ""
 
-#: builtin/grep.c:1127
+#: builtin/grep.c:1164
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr ""
 
-#: builtin/grep.c:1135
+#: builtin/grep.c:1172
 msgid "both --cached and trees are given"
 msgstr ""
 
@@ -12493,10 +14616,6 @@ msgid "git hash-object  --stdin-paths"
 msgstr "git hash-object  --stdin-paths"
 
 #: builtin/hash-object.c:98
-msgid "type"
-msgstr "тип"
-
-#: builtin/hash-object.c:98
 msgid "object type"
 msgstr "тип объекта"
 
@@ -12515,133 +14634,133 @@ msgstr "�охранить файл без и�пользовани� фильт
 #: builtin/hash-object.c:104
 msgid ""
 "just hash any random garbage to create corrupt objects for debugging Git"
-msgstr "хешировать любой му�ор и �оздавать поврежденные объекты дл� отладки Git"
+msgstr "х�шировать любой му�ор и �оздавать поврежденные объекты дл� отладки Git"
 
 #: builtin/hash-object.c:105
 msgid "process file as it were from this path"
 msgstr "обработать файл так, будто он находит�� по указанному пути"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "выве�ти �пи�ок в�ех до�тупных команд"
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "и�ключить руковод�тва"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr "выве�ти �пи�ок полезных руковод�тв"
 
-#: builtin/help.c:49
+#: builtin/help.c:50
 msgid "print all configuration variable names"
 msgstr ""
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr "открыть руковод�тво в формате man"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr "открыть руковод�тво в веб-браузере"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "открыть руковод�тво в формате info"
 
-#: builtin/help.c:56
+#: builtin/help.c:57
 msgid "print command description"
 msgstr ""
 
-#: builtin/help.c:61
+#: builtin/help.c:62
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<команда>]"
 
-#: builtin/help.c:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "неопознанный формат руковод�тва «%s»"
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "Сбой при запу�ке emacsclient."
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "Сбой при определении вер�ии emacsclient."
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "вер�и� emacsclient «%d» �лишком �тара� (< 22)."
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "�бой при запу�ке «%s»"
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
 "Please consider using 'man.<tool>.cmd' instead."
 msgstr "«%s»: путь дл� неподдерживаемой программы про�мотра man.\nВме�то �того и�пользуйте «man.<программа>.cmd»."
 
-#: builtin/help.c:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
 "Please consider using 'man.<tool>.path' instead."
 msgstr "«%s»: команда дл� неподдерживаемой программы про�мотра man.\nВме�то �того и�пользуйте «man.<программа>.path»."
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "«%s»: неизве�тна� программа про�мотра man."
 
-#: builtin/help.c:367
+#: builtin/help.c:453
 msgid "no man viewer handled the request"
 msgstr "программа про�мотра man не обработала запро�"
 
-#: builtin/help.c:375
+#: builtin/help.c:461
 msgid "no info viewer handled the request"
 msgstr "программа про�мотра info не обработала запро�"
 
-#: builtin/help.c:434 builtin/help.c:445 git.c:335
+#: builtin/help.c:520 builtin/help.c:531 git.c:337
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "«%s» — �то �окращение дл� «%s»"
 
-#: builtin/help.c:448 git.c:364
+#: builtin/help.c:534 git.c:369
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr ""
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:563 builtin/help.c:593
 #, c-format
 msgid "usage: %s%s"
 msgstr "и�пользование: %s%s"
 
-#: builtin/help.c:491
+#: builtin/help.c:577
 msgid "'git help config' for more information"
 msgstr ""
 
-#: builtin/index-pack.c:184
+#: builtin/index-pack.c:221
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "не�оответ�твие типа объекта на %s"
 
-#: builtin/index-pack.c:204
+#: builtin/index-pack.c:241
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "ожидаемый объект не получен на %s"
 
-#: builtin/index-pack.c:207
+#: builtin/index-pack.c:244
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "объект %s: ожидаемый тип %s, получен %s"
 
-#: builtin/index-pack.c:257
+#: builtin/index-pack.c:294
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
@@ -12650,73 +14769,73 @@ msgstr[1] "не удало�ь заполнить %d байта"
 msgstr[2] "не удало�ь заполнить %d байтов"
 msgstr[3] "не удало�ь заполнить %d байтов"
 
-#: builtin/index-pack.c:267
+#: builtin/index-pack.c:304
 msgid "early EOF"
 msgstr "неожиданный конец файла"
 
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:305
 msgid "read error on input"
 msgstr "ошибка чтени� ввода"
 
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:317
 msgid "used more bytes than were available"
 msgstr "и�пользовано больше байт, чем было до�тупно"
 
-#: builtin/index-pack.c:287 builtin/pack-objects.c:600
+#: builtin/index-pack.c:324 builtin/pack-objects.c:619
 msgid "pack too large for current definition of off_t"
 msgstr "пакет �лишком большой дл� текущего определени� off_t"
 
-#: builtin/index-pack.c:290 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:327 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "размер пакета превышает мак�имальный допу�тимый"
 
-#: builtin/index-pack.c:305 builtin/repack.c:250
+#: builtin/index-pack.c:342 builtin/repack.c:286
 #, c-format
 msgid "unable to create '%s'"
 msgstr "не удало�ь �оздать «%s»"
 
-#: builtin/index-pack.c:311
+#: builtin/index-pack.c:348
 #, c-format
 msgid "cannot open packfile '%s'"
 msgstr "не удало�ь открыть файл пакета «%s»"
 
-#: builtin/index-pack.c:325
+#: builtin/index-pack.c:362
 msgid "pack signature mismatch"
 msgstr "не�оответ�твие подпи�и пакета"
 
-#: builtin/index-pack.c:327
+#: builtin/index-pack.c:364
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "вер�и� пакета %<PRIu32> не поддерживает��"
 
-#: builtin/index-pack.c:345
+#: builtin/index-pack.c:382
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "пакет �одержит плохой объект по �мещению %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:465
+#: builtin/index-pack.c:488
 #, c-format
 msgid "inflate returned %d"
 msgstr "программа �жати� вернула %d"
 
-#: builtin/index-pack.c:514
+#: builtin/index-pack.c:537
 msgid "offset value overflow for delta base object"
 msgstr "переполнение значени� �мещени� у базового объекта дельты"
 
-#: builtin/index-pack.c:522
+#: builtin/index-pack.c:545
 msgid "delta base offset is out of bound"
 msgstr "�мещение базовой дельты вышло за допу�тимые пределы"
 
-#: builtin/index-pack.c:530
+#: builtin/index-pack.c:553
 #, c-format
 msgid "unknown object type %d"
 msgstr "неизве�тный тип объекта %d"
 
-#: builtin/index-pack.c:561
+#: builtin/index-pack.c:584
 msgid "cannot pread pack file"
 msgstr "не удало�ь выполнить pread дл� файла пакета"
 
-#: builtin/index-pack.c:563
+#: builtin/index-pack.c:586
 #, c-format
 msgid "premature end of pack file, %<PRIuMAX> byte missing"
 msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -12725,88 +14844,88 @@ msgstr[1] "преждевременное окончание файла паке
 msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов от�ут�твует"
 msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов от�ут�твует"
 
-#: builtin/index-pack.c:589
+#: builtin/index-pack.c:612
 msgid "serious inflate inconsistency"
 msgstr "�ерьезное не�оответ�твие при ра�паковке"
 
-#: builtin/index-pack.c:734 builtin/index-pack.c:740 builtin/index-pack.c:763
-#: builtin/index-pack.c:802 builtin/index-pack.c:811
+#: 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
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "��ЙДЕ�� КОЛЛИЗИЯ SHA1 С %s !"
 
-#: builtin/index-pack.c:737 builtin/pack-objects.c:153
-#: builtin/pack-objects.c:213 builtin/pack-objects.c:307
+#: builtin/index-pack.c:760 builtin/pack-objects.c:171
+#: builtin/pack-objects.c:231 builtin/pack-objects.c:326
 #, c-format
 msgid "unable to read %s"
 msgstr "не удало�ь прочитать %s"
 
-#: builtin/index-pack.c:800
+#: builtin/index-pack.c:824
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "не удало�ь прочитать информацию �уще�твующего объекта %s"
 
-#: builtin/index-pack.c:808
+#: builtin/index-pack.c:832
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "не удало�ь прочитать �уще�твующий объект %s"
 
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:846
 #, c-format
 msgid "invalid blob object %s"
 msgstr "неправильный файл двоичного объекта %s"
 
-#: builtin/index-pack.c:825 builtin/index-pack.c:844
+#: builtin/index-pack.c:849 builtin/index-pack.c:868
 msgid "fsck error in packed object"
 msgstr ""
 
-#: builtin/index-pack.c:846
+#: builtin/index-pack.c:870
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "�е в�е дочерние объекты %s до�тижимы"
 
-#: builtin/index-pack.c:918 builtin/index-pack.c:949
+#: builtin/index-pack.c:931 builtin/index-pack.c:978
 msgid "failed to apply delta"
 msgstr "�бой при применении дельты"
 
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1161
 msgid "Receiving objects"
 msgstr "Получение объектов"
 
-#: builtin/index-pack.c:1117
+#: builtin/index-pack.c:1161
 msgid "Indexing objects"
 msgstr "Индек�ирование объектов"
 
-#: builtin/index-pack.c:1151
+#: builtin/index-pack.c:1195
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "пакет поврежден (не�оответ�твие SHA1)"
 
-#: builtin/index-pack.c:1156
+#: builtin/index-pack.c:1200
 msgid "cannot fstat packfile"
 msgstr "не удало�ь выполнить fstat дл� файла пакета"
 
-#: builtin/index-pack.c:1159
+#: builtin/index-pack.c:1203
 msgid "pack has junk at the end"
 msgstr "файл пакета �одержит му�ор в конце"
 
-#: builtin/index-pack.c:1171
+#: builtin/index-pack.c:1215
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "безумна� путаница в parse_pack_objects()"
 
-#: builtin/index-pack.c:1194
+#: builtin/index-pack.c:1238
 msgid "Resolving deltas"
 msgstr "Определение изменений"
 
-#: builtin/index-pack.c:1204 builtin/pack-objects.c:2489
+#: builtin/index-pack.c:1249 builtin/pack-objects.c:2697
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "не удало�ь �оздать поток: %s"
 
-#: builtin/index-pack.c:1245
+#: builtin/index-pack.c:1282
 msgid "confusion beyond insanity"
 msgstr "безумна� путаница"
 
-#: builtin/index-pack.c:1251
+#: builtin/index-pack.c:1288
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
@@ -12815,12 +14934,12 @@ msgstr[1] "завершено � %d локальными объектами"
 msgstr[2] "завершено � %d локальными объектами"
 msgstr[3] "завершено � %d локальными объектами"
 
-#: builtin/index-pack.c:1263
+#: builtin/index-pack.c:1300
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "�еожиданна� контрольна� �умма в конце %s (ди�к поврежден?)"
 
-#: builtin/index-pack.c:1267
+#: builtin/index-pack.c:1304
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
@@ -12829,59 +14948,59 @@ msgstr[1] "пакет Ñ�одержит %d неразрешенные дельтÑ
 msgstr[2] "пакет �одержит %d неразрешенных дельт"
 msgstr[3] "пакет �одержит %d неразрешенных дельт"
 
-#: builtin/index-pack.c:1291
+#: builtin/index-pack.c:1328
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "нельз� �жать при�оединенный объект (%d)"
 
-#: builtin/index-pack.c:1368
+#: builtin/index-pack.c:1424
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "локальный объект %s поврежден"
 
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1444
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "им� пакета «%s» не оканчивает�� на «.pack»"
 
-#: builtin/index-pack.c:1407
+#: builtin/index-pack.c:1469
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1415
+#: builtin/index-pack.c:1477
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr ""
 
-#: builtin/index-pack.c:1439
+#: builtin/index-pack.c:1501
 msgid "error while closing pack file"
 msgstr "ошибка при закрытии файла пакета"
 
-#: builtin/index-pack.c:1453
+#: builtin/index-pack.c:1515
 msgid "cannot store pack file"
 msgstr "не удало�ь �охранить файл пакета"
 
-#: builtin/index-pack.c:1461
+#: builtin/index-pack.c:1523
 msgid "cannot store index file"
 msgstr "не удало�ь �охранить файл индек�а"
 
-#: builtin/index-pack.c:1505 builtin/pack-objects.c:2728
+#: builtin/index-pack.c:1567 builtin/pack-objects.c:2944
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "плохой pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1573
+#: builtin/index-pack.c:1631
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "�е удало�ь открыть �уще�твующий файл пакета «%s»"
 
-#: builtin/index-pack.c:1575
+#: builtin/index-pack.c:1633
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "�е удало�ь открыть �уще�твующий файл индек�а дл� «%s»"
 
-#: builtin/index-pack.c:1623
+#: builtin/index-pack.c:1681
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
@@ -12890,7 +15009,7 @@ msgstr[1] "не дельты: %d объекта"
 msgstr[2] "не дельты: %d объектов"
 msgstr[3] "не дельты: %d объектов"
 
-#: builtin/index-pack.c:1630
+#: builtin/index-pack.c:1688
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
@@ -12899,698 +15018,761 @@ msgstr[1] "длина цепочки = %d: %lu объекта"
 msgstr[2] "длина цепочки = %d: %lu объектов"
 msgstr[3] "длина цепочки = %d: %lu объектов"
 
-#: builtin/index-pack.c:1667
+#: builtin/index-pack.c:1728
 msgid "Cannot come back to cwd"
 msgstr "�е удало�ь вернуть�� в текущий рабочий каталог"
 
-#: builtin/index-pack.c:1716 builtin/index-pack.c:1719
-#: builtin/index-pack.c:1735 builtin/index-pack.c:1739
+#: builtin/index-pack.c:1777 builtin/index-pack.c:1780
+#: builtin/index-pack.c:1796 builtin/index-pack.c:1800
 #, c-format
 msgid "bad %s"
 msgstr "плохой %s"
 
-#: builtin/index-pack.c:1755
+#: builtin/index-pack.c:1806 builtin/init-db.c:392 builtin/init-db.c:625
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr ""
+
+#: builtin/index-pack.c:1821
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin нельз� и�пользовать без --stdin"
 
-#: builtin/index-pack.c:1757
+#: builtin/index-pack.c:1823
 msgid "--stdin requires a git repository"
 msgstr "опци� --stdin требует наличи� репозитори� git"
 
-#: builtin/index-pack.c:1763
+#: builtin/index-pack.c:1825
+msgid "--object-format cannot be used with --stdin"
+msgstr ""
+
+#: builtin/index-pack.c:1831
 msgid "--verify with no packfile name given"
 msgstr "--verify без указани� имени файла пакета"
 
-#: builtin/index-pack.c:1811 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1892 builtin/unpack-objects.c:582
 msgid "fsck error in pack objects"
-msgstr ""
+msgstr "ошибка fsck в упакованных объектах"
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:64
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "не удало�ь выполнить stat дл� шаблона «%s»"
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:69
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "не удало�ь выполнить opendir дл� «%s»"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:81
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "не удало�ь выполнить readlink дл� «%s»"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:83
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "не удало�ь �оздать �имвольную ��ылку «%s» на «%s»"
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:89
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "не удало�ь �копировать файл «%s» в «%s»"
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:93
 #, c-format
 msgid "ignoring template %s"
 msgstr "игнорирование шаблона %s"
 
-#: builtin/init-db.c:121
+#: builtin/init-db.c:124
 #, c-format
 msgid "templates not found in %s"
 msgstr ""
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:139
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "не копирую шаблоны из «%s»: %s"
 
-#: builtin/init-db.c:334
+#: builtin/init-db.c:275
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr ""
+
+#: builtin/init-db.c:367
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "не удает�� обработать файл типа %d"
 
-#: builtin/init-db.c:337
+#: builtin/init-db.c:370
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "не удает�� переме�тить файл %s в %s"
 
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:386
+msgid "attempt to reinitialize repository with different hash"
+msgstr ""
+
+#: builtin/init-db.c:410 builtin/init-db.c:413
 #, c-format
 msgid "%s already exists"
 msgstr "%s уже �уще�твует"
 
-#: builtin/init-db.c:413
+#: builtin/init-db.c:445
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr ""
+
+#: builtin/init-db.c:476
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "Переинициализирован �уще�твующий общий репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:414
+#: builtin/init-db.c:477
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "Переинициализирован �уще�твующий репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:418
+#: builtin/init-db.c:481
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "Инициализирован пу�той общий репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:419
+#: builtin/init-db.c:482
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "Инициализирован пу�той репозиторий Git в %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:531
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] "
 "[--shared[=<permissions>]] [<directory>]"
 msgstr "git init [-q | --quiet] [--bare] [--template=<каталог-шаблонов>] [--shared[=<права-до�тупа>]] [<каталог>]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:557
 msgid "permissions"
 msgstr "права-до�тупа"
 
-#: builtin/init-db.c:492
+#: builtin/init-db.c:558
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "укажите, е�ли репозиторий git будет и�пользовать�� не�колькими пользовател�ми"
 
-#: builtin/init-db.c:526 builtin/init-db.c:531
+#: builtin/init-db.c:564
+msgid "override the name of the initial branch"
+msgstr ""
+
+#: builtin/init-db.c:565 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "х�ш-код"
+
+#: builtin/init-db.c:566 builtin/show-index.c:22 builtin/verify-pack.c:75
+msgid "specify the hash algorithm to use"
+msgstr "указание какой алгоритм х�шировани� и�пользовать"
+
+#: builtin/init-db.c:573
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr ""
+
+#: builtin/init-db.c:602 builtin/init-db.c:607
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "не удало�ь выполнить mkdir %s"
 
-#: builtin/init-db.c:535
+#: builtin/init-db.c:611 builtin/init-db.c:666
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "не удало�ь выполнить chdir в %s"
 
-#: builtin/init-db.c:556
+#: builtin/init-db.c:638
 #, 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:584
+#: builtin/init-db.c:690
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "�е удало�ь получить до�туп к рабочему каталогу «%s»"
 
-#: builtin/interpret-trailers.c:15
+#: builtin/init-db.c:695
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr ""
+
+#: 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 <ключ>[(=|:)<значение>])…] [<файл>…]"
 
-#: builtin/interpret-trailers.c:94
+#: builtin/interpret-trailers.c:95
 msgid "edit files in place"
 msgstr "редактировать файлы на ме�те"
 
-#: builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
 msgstr "удал�ть пу�тые завершители"
 
-#: builtin/interpret-trailers.c:98
+#: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
 msgstr "где поме�тить новый завершитель"
 
-#: builtin/interpret-trailers.c:100
+#: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
 msgstr "дей�твие, е�ли завершитель уже �уще�твует"
 
-#: builtin/interpret-trailers.c:102
+#: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
 msgstr "дей�твие, е�ли завершитель не �уще�твует"
 
-#: builtin/interpret-trailers.c:104
+#: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
 msgstr "выве�ти только завершители"
 
-#: builtin/interpret-trailers.c:105
+#: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
 msgstr "не примен�ть правила из файла конфигурации"
 
-#: builtin/interpret-trailers.c:106
+#: builtin/interpret-trailers.c:107
 msgid "join whitespace-continued values"
 msgstr "объединить значени� разделенные пробелом"
 
-#: builtin/interpret-trailers.c:107
+#: builtin/interpret-trailers.c:108
 msgid "set parsing options"
 msgstr "указание опций разбора"
 
-#: builtin/interpret-trailers.c:109
+#: builtin/interpret-trailers.c:110
 msgid "do not treat --- specially"
-msgstr ""
+msgstr "не во�принимать --- по-о�обенному"
 
-#: builtin/interpret-trailers.c:110
+#: builtin/interpret-trailers.c:111
 msgid "trailer"
 msgstr "завершитель"
 
-#: builtin/interpret-trailers.c:111
+#: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "завершители дл� добавлени�"
 
-#: builtin/interpret-trailers.c:120
+#: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
 msgstr "--trailer одновременно � --only-input не имеет �мы�ла"
 
-#: builtin/interpret-trailers.c:130
+#: builtin/interpret-trailers.c:133
 msgid "no input file given for in-place editing"
 msgstr "ничего не передано, дл� редактировани� файлов на ме�те"
 
-#: builtin/log.c:55
+#: builtin/log.c:58
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
 
-#: builtin/log.c:56
+#: builtin/log.c:59
 msgid "git show [<options>] <object>..."
 msgstr "git show [<опции>] <объект>…"
 
-#: builtin/log.c:104
+#: builtin/log.c:112
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "неправильный параметр дл� --decorate: %s"
 
-#: builtin/log.c:168
+#: builtin/log.c:179
 msgid "show source"
 msgstr "показать и�точник"
 
-#: builtin/log.c:169
+#: builtin/log.c:180
 msgid "Use mail map file"
 msgstr "И�пользовать файл �оответ�тви� почтовых адре�ов"
 
-#: builtin/log.c:171
+#: builtin/log.c:183
 msgid "only decorate refs that match <pattern>"
 msgstr "декорировать только ��ылки �оответ�твующие <шаблону>"
 
-#: builtin/log.c:173
+#: builtin/log.c:185
 msgid "do not decorate refs that match <pattern>"
 msgstr "не декорировать ��ылки �оответ�твующие <шаблону>"
 
-#: builtin/log.c:174
+#: builtin/log.c:186
 msgid "decorate options"
 msgstr "опции формата вывода ��ылок"
 
-#: builtin/log.c:177
-msgid "Process line range n,m in file, counting from 1"
-msgstr "Обработать диапазон �трок n,m из файла, начина� � 1"
+#: builtin/log.c:189
+msgid ""
+"Trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
 
-#: builtin/log.c:275
+#: builtin/log.c:212
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr ""
+
+#: builtin/log.c:302
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Финальный вывод: %d %s\n"
 
-#: builtin/log.c:529
+#: builtin/log.c:564
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: плохой файл"
 
-#: builtin/log.c:544 builtin/log.c:638
+#: builtin/log.c:579 builtin/log.c:674
 #, c-format
 msgid "could not read object %s"
 msgstr ""
 
-#: builtin/log.c:663
+#: builtin/log.c:699
 #, c-format
 msgid "unknown type: %d"
 msgstr ""
 
-#: builtin/log.c:784
+#: builtin/log.c:848
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr ""
+
+#: builtin/log.c:855
 msgid "format.headers without value"
 msgstr "в format.headers не указано значение"
 
-#: builtin/log.c:885
-msgid "name of output directory is too long"
-msgstr "�лишком длинное им� выходного каталога"
-
-#: builtin/log.c:901
+#: builtin/log.c:984
 #, c-format
 msgid "cannot open patch file %s"
 msgstr ""
 
-#: builtin/log.c:918
+#: builtin/log.c:1001
 msgid "need exactly one range"
 msgstr ""
 
-#: builtin/log.c:928
+#: builtin/log.c:1011
 msgid "not a range"
 msgstr ""
 
-#: builtin/log.c:1051
+#: builtin/log.c:1175
 msgid "cover letter needs email format"
 msgstr ""
 
-#: builtin/log.c:1057
+#: builtin/log.c:1181
 msgid "failed to create cover-letter file"
 msgstr ""
 
-#: builtin/log.c:1136
+#: builtin/log.c:1262
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "ошибка в поле in-reply-to: %s"
 
-#: builtin/log.c:1163
+#: builtin/log.c:1289
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<опции>] [<начина�-�> | <диапазон-редакций>]"
 
-#: builtin/log.c:1221
+#: builtin/log.c:1347
 msgid "two output directories?"
 msgstr ""
 
-#: builtin/log.c:1332 builtin/log.c:2076 builtin/log.c:2078 builtin/log.c:2090
+#: builtin/log.c:1498 builtin/log.c:2318 builtin/log.c:2320 builtin/log.c:2332
 #, c-format
 msgid "unknown commit %s"
 msgstr ""
 
-#: builtin/log.c:1342 builtin/replace.c:58 builtin/replace.c:207
+#: builtin/log.c:1509 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:1347
+#: builtin/log.c:1518
 msgid "could not find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1351
+#: builtin/log.c:1528
 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:1371
+#: builtin/log.c:1551
 msgid "failed to find exact merge base"
 msgstr ""
 
-#: builtin/log.c:1382
+#: builtin/log.c:1568
 msgid "base commit should be the ancestor of revision list"
 msgstr "базовый коммит должен быть предком �пи�ка редакций"
 
-#: builtin/log.c:1386
+#: builtin/log.c:1578
 msgid "base commit shouldn't be in revision list"
 msgstr "базовый коммит не должен быть в �пи�ке редакций"
 
-#: builtin/log.c:1439
+#: builtin/log.c:1636
 msgid "cannot get patch id"
 msgstr "не удало�ь получить идентификатор патча"
 
-#: builtin/log.c:1491
-msgid "failed to infer range-diff ranges"
+#: builtin/log.c:1693
+msgid "failed to infer range-diff origin of current series"
+msgstr ""
+
+#: builtin/log.c:1695
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
 msgstr ""
 
-#: builtin/log.c:1536
+#: builtin/log.c:1739
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "выводить [PATCH n/m] даже когда один патч"
 
-#: builtin/log.c:1539
+#: builtin/log.c:1742
 msgid "use [PATCH] even with multiple patches"
 msgstr "выводить [PATCH] даже когда не�колько патчей"
 
-#: builtin/log.c:1543
+#: builtin/log.c:1746
 msgid "print patches to standard out"
 msgstr "выводить патчи на �тандартный вывод"
 
-#: builtin/log.c:1545
+#: builtin/log.c:1748
 msgid "generate a cover letter"
 msgstr "�оздать �опроводительное пи�ьмо"
 
-#: builtin/log.c:1547
+#: builtin/log.c:1750
 msgid "use simple number sequence for output file names"
 msgstr "и�пользовать про�тую по�ледовательно�ть чи�ел дл� имен выходных файлов"
 
-#: builtin/log.c:1548
+#: builtin/log.c:1751
 msgid "sfx"
 msgstr "�уффик�"
 
-#: builtin/log.c:1549
+#: builtin/log.c:1752
 msgid "use <sfx> instead of '.patch'"
 msgstr "и�пользовать �уффик� <�уффик�> вме�то «.patch»"
 
-#: builtin/log.c:1551
+#: builtin/log.c:1754
 msgid "start numbering patches at <n> instead of 1"
 msgstr "начать нумерацию патчей � <n>, а не � 1"
 
-#: builtin/log.c:1553
+#: builtin/log.c:1756
 msgid "mark the series as Nth re-roll"
 msgstr "пометить �ерию как �нную попытку"
 
-#: builtin/log.c:1555
+#: builtin/log.c:1758
+msgid "max length of output filename"
+msgstr ""
+
+#: builtin/log.c:1760
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "И�пользовать [RFC PATCH] вме�то [PATCH]"
 
-#: builtin/log.c:1558
+#: builtin/log.c:1763
+msgid "cover-from-description-mode"
+msgstr ""
+
+#: builtin/log.c:1764
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr ""
+
+#: builtin/log.c:1766
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "И�пользовать [<префик�>] вме�то [PATCH]"
 
-#: builtin/log.c:1561
+#: builtin/log.c:1769
 msgid "store resulting files in <dir>"
 msgstr "�охранить результирующие файлы в <каталог>"
 
-#: builtin/log.c:1564
+#: builtin/log.c:1772
 msgid "don't strip/add [PATCH]"
 msgstr "не обрезать/добавл�ть [PATCH]"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1775
 msgid "don't output binary diffs"
 msgstr "не выводить двоичные изменени�"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1777
 msgid "output all-zero hash in From header"
-msgstr "выводить нулевую хеш-�умму в заголовке From"
+msgstr "выводить нулевой х�ш-код в заголовке From"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1779
 msgid "don't include a patch matching a commit upstream"
 msgstr "не включать патч, е�ли коммит уже е�ть в выше�то�щей ветке"
 
-#: builtin/log.c:1573
+#: builtin/log.c:1781
 msgid "show patch format instead of default (patch + stat)"
 msgstr "выводить в формате патча, а не в �тандартном (патч + �тати�тика)"
 
-#: builtin/log.c:1575
+#: builtin/log.c:1783
 msgid "Messaging"
 msgstr "Передача �ообщений"
 
-#: builtin/log.c:1576
+#: builtin/log.c:1784
 msgid "header"
 msgstr "заголовок"
 
-#: builtin/log.c:1577
+#: builtin/log.c:1785
 msgid "add email header"
 msgstr "добавить заголовок �ообщени�"
 
-#: builtin/log.c:1578 builtin/log.c:1580
+#: builtin/log.c:1786 builtin/log.c:1787
 msgid "email"
 msgstr "почта"
 
-#: builtin/log.c:1578
+#: builtin/log.c:1786
 msgid "add To: header"
 msgstr "добавить заголовок To:"
 
-#: builtin/log.c:1580
+#: builtin/log.c:1787
 msgid "add Cc: header"
 msgstr "добавить заголовок Cc:"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1788
 msgid "ident"
 msgstr "идентификатор"
 
-#: builtin/log.c:1583
+#: builtin/log.c:1789
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "у�тановить адре� отправител� на <идентификатор> (или на идентификатор коммитера, е�ли от�ут�твует)"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1791
 msgid "message-id"
 msgstr "идентификатор-�ообщени�"
 
-#: builtin/log.c:1586
+#: builtin/log.c:1792
 msgid "make first mail a reply to <message-id>"
 msgstr "�делать первое пи�ьмо ответом на <идентификатор-�ообщени�>"
 
-#: builtin/log.c:1587 builtin/log.c:1590
+#: builtin/log.c:1793 builtin/log.c:1796
 msgid "boundary"
 msgstr "вложение"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1794
 msgid "attach the patch"
 msgstr "приложить патч"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1797
 msgid "inline the patch"
 msgstr "включить патч в тек�т пи�ьма"
 
-#: builtin/log.c:1595
+#: builtin/log.c:1801
 msgid "enable message threading, styles: shallow, deep"
 msgstr "включить в пи�ьмах иерархично�ть, �тили: shallow (ча�тичную), deep (глубокую)"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1803
 msgid "signature"
 msgstr "подпи�ь"
 
-#: builtin/log.c:1598
+#: builtin/log.c:1804
 msgid "add a signature"
 msgstr "добавить подпи�ь"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1805
 msgid "base-commit"
 msgstr "базовый коммит"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1806
 msgid "add prerequisite tree info to the patch series"
 msgstr "добавить информацию о требовании дерева к �ерии патчей"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1809
 msgid "add a signature from a file"
 msgstr "добавить подпи�ь из файла"
 
-#: builtin/log.c:1603
+#: builtin/log.c:1810
 msgid "don't print the patch filenames"
 msgstr "не выводить имена файлов патчей"
 
-#: builtin/log.c:1605
+#: builtin/log.c:1812
 msgid "show progress while generating patches"
 msgstr "показать прогре�� выполнени� во �оздани� патчей"
 
-#: builtin/log.c:1606
-msgid "rev"
-msgstr ""
-
-#: builtin/log.c:1607
+#: builtin/log.c:1814
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1610
+#: builtin/log.c:1817
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1612
+#: builtin/log.c:1819
 msgid "percentage by which creation is weighted"
 msgstr ""
 
-#: builtin/log.c:1687
+#: builtin/log.c:1905
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "неправильна� �трока идентификации: %s"
 
-#: builtin/log.c:1702
+#: builtin/log.c:1920
 msgid "-n and -k are mutually exclusive"
 msgstr ""
 
-#: builtin/log.c:1704
+#: builtin/log.c:1922
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr ""
 
-#: builtin/log.c:1712
+#: builtin/log.c:1930
 msgid "--name-only does not make sense"
 msgstr "--name-only не имеет �мы�ла"
 
-#: builtin/log.c:1714
+#: builtin/log.c:1932
 msgid "--name-status does not make sense"
 msgstr "--name-status не имеет �мы�ла"
 
-#: builtin/log.c:1716
+#: builtin/log.c:1934
 msgid "--check does not make sense"
 msgstr "--check не имеет �мы�ла"
 
-#: builtin/log.c:1748
-msgid "standard output, or directory, which one?"
-msgstr "�тандартный вывод или каталог?"
+#: builtin/log.c:1956
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr ""
 
-#: builtin/log.c:1837
+#: builtin/log.c:2079
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1841
+#: builtin/log.c:2083
 msgid "Interdiff:"
 msgstr ""
 
-#: builtin/log.c:1842
+#: builtin/log.c:2084
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr ""
 
-#: builtin/log.c:1848
+#: builtin/log.c:2090
 msgid "--creation-factor requires --range-diff"
 msgstr ""
 
-#: builtin/log.c:1852
+#: builtin/log.c:2094
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr ""
 
-#: builtin/log.c:1860
+#: builtin/log.c:2102
 msgid "Range-diff:"
 msgstr ""
 
-#: builtin/log.c:1861
+#: builtin/log.c:2103
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr ""
 
-#: builtin/log.c:1872
+#: builtin/log.c:2114
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "не удало�ь прочитать файл подпи�и «%s»"
 
-#: builtin/log.c:1908
+#: builtin/log.c:2150
 msgid "Generating patches"
 msgstr "Создание патчей"
 
-#: builtin/log.c:1952
+#: builtin/log.c:2194
 msgid "failed to create output files"
 msgstr ""
 
-#: builtin/log.c:2011
+#: builtin/log.c:2253
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<выше�то�ща�-ветка> [<редакци�> [<ограничение>]]]"
 
-#: builtin/log.c:2065
+#: builtin/log.c:2307
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> "
 "manually.\n"
 msgstr "�е удало�ь найти от�леживаемую внешнюю ветку, укажите <выше�то�щую-ветку> вручную.\n"
 
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:471
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<опции>] [<файл>…]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:527
 msgid "identify the file status with tags"
 msgstr "выводить имена файлов � метками"
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:529
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "и�пользовать �имволы в нижнем реги�тре дл� «предположительно без изменений» файлов"
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:531
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "и�пользовать �имволы нижнего реги�тра дл� файлов «fsmonitor clean»"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:533
 msgid "show cached files in the output (default)"
 msgstr "показывать к�шированные файлы при выводе (по умолчанию)"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:535
 msgid "show deleted files in the output"
 msgstr "показывать удаленные файлы при выводе"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:537
 msgid "show modified files in the output"
 msgstr "показывать измененные файлы при выводе"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:539
 msgid "show other files in the output"
 msgstr "показывать другие файлы при выводе"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:541
 msgid "show ignored files in the output"
 msgstr "показывать игнорируемые файлы при выводе"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:544
 msgid "show staged contents' object name in the output"
 msgstr "показывать им� индек�ированного объекта на выводе"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
 msgid "show files on the filesystem that need to be removed"
 msgstr "показывать файлы в файловой �и�теме, которые должны быть удалены"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
 msgid "show 'other' directories' names only"
 msgstr "показывать только имена у «других» каталогов"
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:550
 msgid "show line endings of files"
 msgstr "показать концы �трок файлов"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:552
 msgid "don't show empty directories"
 msgstr "не показывать пу�тые каталоги"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:555
 msgid "show unmerged files in the output"
 msgstr "показывать не �литые файлы на выводе"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:557
 msgid "show resolve-undo information"
 msgstr "показывать информации о разрешении конфликтов и отмене"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:559
 msgid "skip files matching pattern"
 msgstr "пропу�тить файлы, �оответ�твующие шаблону"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:562
 msgid "exclude patterns are read from <file>"
 msgstr "прочитать шаблоны и�ключени� из <файл>"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:565
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "прочитать дополнительные покаталожные шаблоны и�ключени� из <файл>"
 
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:567
 msgid "add the standard git exclusions"
 msgstr "добавить �тандартные и�ключени� git"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:571
 msgid "make the output relative to the project top directory"
 msgstr "выводить пути отно�ительно корневого каталога проекта"
 
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:574
 msgid "recurse through submodules"
 msgstr "рекур�ивно по подмодул�м"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "е�ли какой-либо <файл> не в индек�е, �читать �то ошибкой"
 
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
 msgid "tree-ish"
 msgstr "указатель-дерева"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:578
 msgid "pretend that paths removed since <tree-ish> are still present"
 msgstr "притворить��, что пути удалены, т.к. <указатель-дерева> еще �уще�твует"
 
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:580
 msgid "show debugging data"
 msgstr "показать отладочную информацию"
 
@@ -13605,7 +15787,7 @@ msgstr "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<запу�к>]
 msgid "do not print remote URL"
 msgstr "не выводить URL внешних репозиториев"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1458
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1398
 msgid "exec"
 msgstr "запу�к"
 
@@ -13678,476 +15860,488 @@ msgstr "выве�ти полное дерево; не только текущи
 msgid "empty mbox: '%s'"
 msgstr "пу�той mbox: «%s»"
 
-#: builtin/merge.c:54
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <коммит> <коммит>…"
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <коммит>…"
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <коммит>…"
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <коммит> <коммит>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <��ылка> [<коммит>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "выве�ти в�ех общих предков"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "выве�ти предков дл� одного многоходового �ли�ни�"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "выве�ти �пи�ок редаций, которые не до�тижимы из друг друга"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "�вл�ет�� первым предком второго указанного коммита?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "найти журнале ��ылок <��ылка> где именно <коммит> разветвил��"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr "git merge-file [<опции>] [-L им�1 [-L orig [-L им�2]]] <файл1> <ориг-файл> <файл2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "выве�ти результат на �тандартный вывод"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "и�пользовать diff3 �ли�ние"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "при возникновении конфликтов, и�пользовать нашу вер�ию"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "при возникновении конфликтов, и�пользовать их вер�ию"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "при возникновении конфликтов, и�пользовать обе вер�ии"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "при возникновении конфликтов, и�пользовать �тот размер маркера"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "не предупреждать о конфликтах"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "у�тановить метки дл� файл1/ориг-файл/файл2"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "неизве�тна� опци� %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "не удало�ь разобрать объект «%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] "невозможно обработать больше %d базы. Игнорирую %s."
+msgstr[1] "невозможно обработать больше %d баз. Игнорирую %s."
+msgstr[2] "невозможно обработать больше %d баз. Игнорирую %s."
+msgstr[3] "невозможно обработать больше %d базы. Игнорирую %s."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "не обрабатываю ничего, кроме �ли�ни� двух указателей на ветки."
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "не удало�ь ра�познать ��ылку «%s»"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Сли�ние %s и %s\n"
+
+#: builtin/merge.c:57
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<опции>] [<коммит>…]"
 
-#: builtin/merge.c:55
+#: builtin/merge.c:58
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:56
+#: builtin/merge.c:59
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:116
+#: builtin/merge.c:122
 msgid "switch `m' requires a value"
 msgstr "при указании параметра «m» требует�� указать значение"
 
-#: builtin/merge.c:139
+#: builtin/merge.c:145
 #, c-format
 msgid "option `%s' requires a value"
 msgstr ""
 
-#: builtin/merge.c:185
+#: builtin/merge.c:198
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�е удало�ь найти �тратегию �ли�ни� «%s».\n"
 
-#: builtin/merge.c:186
+#: builtin/merge.c:199
 #, c-format
 msgid "Available strategies are:"
 msgstr "До�тупные �тратегии:"
 
-#: builtin/merge.c:191
+#: builtin/merge.c:204
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "До�тупные пользователь�кие �тратегии:"
 
-#: builtin/merge.c:242 builtin/pull.c:150
+#: builtin/merge.c:255 builtin/pull.c:133
 msgid "do not show a diffstat at the end of the merge"
 msgstr "не выводить �тати�тику изменений по�ле окончани� �ли�ни�"
 
-#: builtin/merge.c:245 builtin/pull.c:153
+#: builtin/merge.c:258 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr "выве�ти �тати�тику изменений по�ле окончани� �ли�ни�"
 
-#: builtin/merge.c:246 builtin/pull.c:156
+#: builtin/merge.c:259 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(�иноним дл� --stat)"
 
-#: builtin/merge.c:248 builtin/pull.c:159
+#: builtin/merge.c:261 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "добавить (мак�имум <n>) запи�ей из короткого журнала в �ообщение коммита у �ли�ни�"
 
-#: builtin/merge.c:251 builtin/pull.c:165
+#: builtin/merge.c:264 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr "�оздать один коммит, вме�то выполнени� �ли�ни�"
 
-#: builtin/merge.c:253 builtin/pull.c:168
+#: builtin/merge.c:266 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "�делать коммит, е�ли �ли�ние прошло у�пешно (по умолчанию)"
 
-#: builtin/merge.c:255 builtin/pull.c:171
+#: builtin/merge.c:268 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "отредактировать �ообщение перед выполнением коммита"
 
-#: builtin/merge.c:257
+#: builtin/merge.c:270
 msgid "allow fast-forward (default)"
 msgstr "разрешить перемотку вперед (по умолчанию)"
 
-#: builtin/merge.c:259 builtin/pull.c:178
+#: builtin/merge.c:272 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "отменить выполнение �ли�ни�, е�ли перемотка вперед невозможна"
 
-#: builtin/merge.c:263 builtin/pull.c:181
+#: builtin/merge.c:276 builtin/pull.c:164
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "проверить, что указанный коммит имеет верную �лектронную подпи�ь GPG"
 
-#: builtin/merge.c:264 builtin/notes.c:787 builtin/pull.c:185
-#: builtin/rebase.c:492 builtin/rebase.c:1471 builtin/revert.c:113
+#: builtin/merge.c:277 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:539 builtin/rebase.c:1412 builtin/revert.c:114
 msgid "strategy"
 msgstr "�тратеги�"
 
-#: builtin/merge.c:265 builtin/pull.c:186
+#: builtin/merge.c:278 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "и�пользуема� �тратеги� �ли�ни�"
 
-#: builtin/merge.c:266 builtin/pull.c:189
+#: builtin/merge.c:279 builtin/pull.c:172
 msgid "option=value"
 msgstr "опци�=значение"
 
-#: builtin/merge.c:267 builtin/pull.c:190
+#: builtin/merge.c:280 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "опции дл� выбранной �тратегии �ли�ни�"
 
-#: builtin/merge.c:269
+#: builtin/merge.c:282
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�ообщение коммита дл� �ли�ни� (дл� �ли�ни� без перемотки вперед)"
 
-#: builtin/merge.c:276
+#: builtin/merge.c:289
 msgid "abort the current in-progress merge"
 msgstr "отменить выполнение прои�ход�щего �ли�ни�"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:291
+msgid "--abort but leave index and working tree alone"
+msgstr ""
+
+#: builtin/merge.c:293
 msgid "continue the current in-progress merge"
 msgstr "продолжить выполнение прои�ход�щего �ли�ни�"
 
-#: builtin/merge.c:280 builtin/pull.c:197
+#: builtin/merge.c:295 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "разрешить �ли�ние не�в�занных и�торий изменений"
 
-#: builtin/merge.c:286
-msgid "verify commit-msg hook"
-msgstr "проверить перехватчик commit-msg"
+#: builtin/merge.c:302
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr ""
 
-#: builtin/merge.c:311
+#: builtin/merge.c:319
 msgid "could not run stash."
 msgstr "не удало�ь выполнить stash."
 
-#: builtin/merge.c:316
+#: builtin/merge.c:324
 msgid "stash failed"
 msgstr "�бой при выполнении stash"
 
-#: builtin/merge.c:321
+#: builtin/merge.c:329
 #, c-format
 msgid "not a valid object: %s"
 msgstr "неправильный объект: %s"
 
-#: builtin/merge.c:343 builtin/merge.c:360
+#: builtin/merge.c:351 builtin/merge.c:368
 msgid "read-tree failed"
 msgstr "�бой при выполнении read-tree"
 
-#: builtin/merge.c:390
+#: builtin/merge.c:398
 msgid " (nothing to squash)"
 msgstr " (нечего уплотн�ть)"
 
-#: builtin/merge.c:401
+#: builtin/merge.c:409
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Уплотнение коммита — не обновл�� HEAD\n"
 
-#: builtin/merge.c:451
+#: builtin/merge.c:459
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "�ет �ообщени� �ли�ни� — не обновл�ем HEAD\n"
 
-#: builtin/merge.c:502
+#: builtin/merge.c:510
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "«%s» не указывает на коммит"
 
-#: builtin/merge.c:589
+#: builtin/merge.c:597
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�еправильна� �трока branch.%s.mergeoptions: %s"
 
-#: builtin/merge.c:712
+#: builtin/merge.c:723
 msgid "Not handling anything other than two heads merge."
 msgstr "�е обрабатываю ничего, кроме �ли�ни� двух указателей на ветки."
 
-#: builtin/merge.c:726
+#: builtin/merge.c:736
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "�еизве�тный параметр merge-recursive: -X%s"
 
-#: builtin/merge.c:741
+#: builtin/merge.c:755 t/helper/test-fast-rebase.c:209
 #, c-format
 msgid "unable to write %s"
 msgstr "не удало�ь запи�ать %s"
 
-#: builtin/merge.c:793
+#: builtin/merge.c:807
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�е удало�ь проче�ть из «%s»"
 
-#: builtin/merge.c:802
+#: builtin/merge.c:816
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "�е выполн�ю коммит �ли�ни�; и�пользуйте «git commit» дл� завершени� �ли�ни�.\n"
 
-#: builtin/merge.c:808
+#: builtin/merge.c:822
 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:813
+#: builtin/merge.c:827
 msgid "An empty message aborts the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:816
+#: builtin/merge.c:830
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
 "the commit.\n"
 msgstr ""
 
-#: builtin/merge.c:857
+#: builtin/merge.c:883
 msgid "Empty commit message."
 msgstr "Пу�тое �ообщение коммита."
 
-#: builtin/merge.c:876
+#: builtin/merge.c:898
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Прекра�но.\n"
 
-#: builtin/merge.c:936
+#: builtin/merge.c:959
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "�е удало�ь прове�ти автоматиче�кое �ли�ние; и�правьте конфликты и �делайте коммит результата.\n"
 
-#: builtin/merge.c:975
+#: builtin/merge.c:998
 msgid "No current branch."
 msgstr "�ет текущей ветки."
 
-#: builtin/merge.c:977
+#: builtin/merge.c:1000
 msgid "No remote for the current branch."
 msgstr "У текущей ветки нет внешнего репозитори�."
 
-#: builtin/merge.c:979
+#: builtin/merge.c:1002
 msgid "No default upstream defined for the current branch."
 msgstr "Дл� текущей ветки не указана выше�то�ща� ветка по умолчанию."
 
-#: builtin/merge.c:984
+#: builtin/merge.c:1007
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "�е указана внешн�� от�леживаема� ветка дл� %s на %s"
 
-#: builtin/merge.c:1041
+#: builtin/merge.c:1064
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Плохое значение «%s» в переменной окружени� «%s»"
 
-#: builtin/merge.c:1144
+#: builtin/merge.c:1167
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "не �вл�ет�� тем, что можно �лить в %s: %s"
 
-#: builtin/merge.c:1178
+#: builtin/merge.c:1201
 msgid "not something we can merge"
 msgstr "не �вл�ет�� тем, что можно �лить"
 
-#: builtin/merge.c:1281
+#: builtin/merge.c:1311
 msgid "--abort expects no arguments"
 msgstr "опци� --abort не принимает аргументы"
 
-#: builtin/merge.c:1285
+#: builtin/merge.c:1315
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "�ет �ли�ни�, которое можно отменить (от�ут�твует файл MERGE_HEAD)."
 
-#: builtin/merge.c:1297
+#: builtin/merge.c:1333
+msgid "--quit expects no arguments"
+msgstr ""
+
+#: builtin/merge.c:1346
 msgid "--continue expects no arguments"
 msgstr "опци� --continue не принимает аргументы"
 
-#: builtin/merge.c:1301
+#: builtin/merge.c:1350
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Сейча� не прои�ходит �ли�ние (от�ут�твует файл MERGE_HEAD)."
 
-#: builtin/merge.c:1317
+#: builtin/merge.c:1366
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr "Вы не завершили �ли�ние (при�ут�твует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед �ли�нием."
 
-#: builtin/merge.c:1324
+#: builtin/merge.c:1373
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
 msgstr "Вы не завершили копирование коммита (при�ут�твует файл CHERRY_PICK_HEAD).\nПожалуй�та, закоммитьте ваши изменени�, перед �ли�нием."
 
-#: builtin/merge.c:1327
+#: builtin/merge.c:1376
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "Вы не завершили копирование коммита (при�ут�твует файл CHERRY_PICK_HEAD)."
 
-#: builtin/merge.c:1341
+#: builtin/merge.c:1390
 msgid "You cannot combine --squash with --no-ff."
 msgstr "�ельз� и�пользовать одновременно --squash и --no-ff."
 
-#: builtin/merge.c:1349
+#: builtin/merge.c:1392
+msgid "You cannot combine --squash with --commit."
+msgstr ""
+
+#: builtin/merge.c:1408
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Коммит не указан и параметр merge.defaultToUpstream не у�тановлен."
 
-#: builtin/merge.c:1366
+#: builtin/merge.c:1425
 msgid "Squash commit into empty head not supported yet"
 msgstr "Уплотнение коммита в пу�тую ветку еще не поддерживает��"
 
-#: builtin/merge.c:1368
+#: builtin/merge.c:1427
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "Коммит, не �вл�ющий�� перемоткой вперед, нет �мы�ла делать в пу�тую ветку."
 
-#: builtin/merge.c:1373
+#: builtin/merge.c:1432
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s не �вл�ет�� тем, что можно �лить"
 
-#: builtin/merge.c:1375
+#: builtin/merge.c:1434
 msgid "Can merge only exactly one commit into empty head"
 msgstr "Можно только один коммит в пу�тую ветку."
 
-#: builtin/merge.c:1454
+#: builtin/merge.c:1515
 msgid "refusing to merge unrelated histories"
 msgstr "отказ �ли�ни� не�в�занных и�торий изменений"
 
-#: builtin/merge.c:1463
+#: builtin/merge.c:1524
 msgid "Already up to date."
 msgstr "Уже обновлено."
 
-#: builtin/merge.c:1473
+#: builtin/merge.c:1534
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Обновление %s..%s\n"
 
-#: builtin/merge.c:1515
+#: builtin/merge.c:1580
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Попытка тривиального �ли�ни� в индек�е…\n"
 
-#: builtin/merge.c:1522
+#: builtin/merge.c:1587
 #, c-format
 msgid "Nope.\n"
 msgstr "�е вышло.\n"
 
-#: builtin/merge.c:1547
+#: builtin/merge.c:1612
 msgid "Already up to date. Yeeah!"
 msgstr "Уже обновлено. Круто!"
 
-#: builtin/merge.c:1553
+#: builtin/merge.c:1618
 msgid "Not possible to fast-forward, aborting."
 msgstr "Перемотка вперед невозможна, отмена."
 
-#: builtin/merge.c:1576 builtin/merge.c:1655
+#: builtin/merge.c:1646 builtin/merge.c:1711
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Перемотка дерева к и�ходному �о�то�нию…\n"
 
-#: builtin/merge.c:1580
+#: builtin/merge.c:1650
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Попытка �ли�ни� � помощью �тратегии %s…\n"
 
-#: builtin/merge.c:1646
+#: builtin/merge.c:1702
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "�и одна �тратеги� �ли�ни� не обработала �ли�ние.\n"
 
-#: builtin/merge.c:1648
+#: builtin/merge.c:1704
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Сбой при �ли�нии � помощью �тратегии %s.\n"
 
-#: builtin/merge.c:1657
+#: builtin/merge.c:1713
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "И�пользую %s дл� подготовки ручного разрешени� конфликтов.\n"
 
-#: builtin/merge.c:1669
+#: builtin/merge.c:1727
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "�втоматиче�кое �ли�ние прошло у�пешно; как и запрашивали, о�тановлено перед выполнением коммита\n"
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <коммит> <коммит>…"
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <коммит>…"
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <коммит>…"
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <коммит> <коммит>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <��ылка> [<коммит>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "выве�ти в�ех общих предков"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "выве�ти предков дл� одного многоходового �ли�ни�"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "выве�ти �пи�ок редаций, которые не до�тижимы из друг друга"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "�вл�ет�� первым предком второго указанного коммита?"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "найти журнале ��ылок <��ылка> где именно <коммит> разветвил��"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr "git merge-file [<опции>] [-L им�1 [-L orig [-L им�2]]] <файл1> <ориг-файл> <файл2>"
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr "выве�ти результат на �тандартный вывод"
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "и�пользовать diff3 �ли�ние"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "при возникновении конфликтов, и�пользовать нашу вер�ию"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "при возникновении конфликтов, и�пользовать их вер�ию"
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr "при возникновении конфликтов, и�пользовать обе вер�ии"
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr "при возникновении конфликтов, и�пользовать �тот размер маркера"
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "не предупреждать о конфликтах"
-
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "у�тановить метки дл� файл1/ориг-файл/файл2"
-
-#: builtin/merge-recursive.c:46
-#, c-format
-msgid "unknown option %s"
-msgstr "неизве�тна� опци� %s"
-
-#: builtin/merge-recursive.c:52
-#, c-format
-msgid "could not parse object '%s'"
-msgstr "не удало�ь разобрать объект «%s»"
-
-#: builtin/merge-recursive.c:56
-#, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "невозможно обработать больше %d базы. Игнорирую %s."
-msgstr[1] "невозможно обработать больше %d баз. Игнорирую %s."
-msgstr[2] "невозможно обработать больше %d баз. Игнорирую %s."
-msgstr[3] "невозможно обработать больше %d базы. Игнорирую %s."
-
-#: builtin/merge-recursive.c:64
-msgid "not handling anything other than two heads merge."
-msgstr "не обрабатываю ничего, кроме �ли�ни� двух указателей на ветки."
-
-#: builtin/merge-recursive.c:70 builtin/merge-recursive.c:72
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "не удало�ь ра�познать ��ылку «%s»"
-
-#: builtin/merge-recursive.c:78
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "Сли�ние %s и %s\n"
-
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
 msgstr "git mktree [-z] [--missing] [--batch]"
@@ -14165,20 +16359,32 @@ msgid "allow creation of more than one tree"
 msgstr "допу�тить �оздание более одного дерева"
 
 #: builtin/multi-pack-index.c:9
-msgid "git multi-pack-index [--object-dir=<dir>] (write|verify)"
+msgid ""
+"git multi-pack-index [<options>] (write|verify|expire|repack --batch-"
+"size=<size>)"
 msgstr ""
 
-#: builtin/multi-pack-index.c:22
+#: builtin/multi-pack-index.c:26
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr ""
 
-#: builtin/multi-pack-index.c:40 builtin/prune-packed.c:67
+#: builtin/multi-pack-index.c:29
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+msgstr ""
+
+#: builtin/multi-pack-index.c:50 builtin/prune-packed.c:25
 msgid "too many arguments"
 msgstr ""
 
-#: builtin/multi-pack-index.c:51
+#: builtin/multi-pack-index.c:60
+msgid "--batch-size option is only for 'repack' subcommand"
+msgstr ""
+
+#: builtin/multi-pack-index.c:69
 #, c-format
-msgid "unrecognized verb: %s"
+msgid "unrecognized subcommand: %s"
 msgstr ""
 
 #: builtin/mv.c:18
@@ -14207,113 +16413,117 @@ msgstr "принудительно перемещать/переименоват
 msgid "skip move/rename errors"
 msgstr "пропу�кать ошибки при перемещении/переименовании"
 
-#: builtin/mv.c:169
+#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "целевой путь «%s» не �вл�ет�� каталогом"
 
-#: builtin/mv.c:180
+#: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Проверка переименовани� из «%s» в «%s»\n"
 
-#: builtin/mv.c:184
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr "плохой и�точник"
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 msgid "can not move directory into itself"
 msgstr "нельз� переме�тить каталог в �амого �еб�"
 
-#: builtin/mv.c:190
+#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr "нельз� переме�тить каталог в файл"
 
-#: builtin/mv.c:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr "и�ходный каталог пу�т"
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 msgid "not under version control"
 msgstr "не под вер�ионным контролем"
 
 #: builtin/mv.c:227
+msgid "conflicted"
+msgstr ""
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "целевой путь уже �уще�твует"
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "перезапи�ь «%s»"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "�е удало�ь перезапи�ать"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr "не�колько и�точников дл� одного целевого пути"
 
-#: builtin/mv.c:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "целевой каталог не �уще�твует"
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, откуда=%s, куда=%s"
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Переименование %s в %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:516
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:484
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "�бой при переименовании «%s»"
 
-#: builtin/name-rev.c:355
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<опции>] <коммит>…"
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<опции>] --all"
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<опции>] --stdin"
 
-#: builtin/name-rev.c:415
-msgid "print only names (no SHA-1)"
-msgstr "выводить только имена (без SHA-1)"
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr ""
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "и�пользовать только метки дл� именовани� коммитов"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
-msgstr "и�пользовать только ��ылки, �оответ�твующие <шаблону> "
+msgstr "и�пользовать только ��ылки, �оответ�твующие <шаблону>"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "игнорировать ��ылки, �оответ�твующие <шаблону>"
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "выве�ти �пи�ок в�ех коммитов, до�тижимых �о в�ех ��ылок"
 
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "прочитать из �тандартного ввода"
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "разрешить вывод «undefined», е�ли не найдено (по умолчанию)"
 
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "разыменовывать введенные метки (дл� внутреннего и�пользовани�)"
 
@@ -14453,7 +16663,7 @@ msgstr "не удало�ь запи�ать объект заметки"
 msgid "the note contents have been left in %s"
 msgstr "�одержимое заметки о�тало�ь в %s"
 
-#: builtin/notes.c:242 builtin/tag.c:522
+#: builtin/notes.c:242 builtin/tag.c:533
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "не удало�ь открыть или прочитать «%s»"
@@ -14673,7 +16883,7 @@ msgid ""
 "--abort'.\n"
 msgstr "�е удало�ь автоматиче�ки �лить заметки. И�правьте конфликты в %s и закоммитьте результат � помощью «git notes merge --commit», или прервите проце�� �ли�ни� � помощью «git notes merge --abort».\n"
 
-#: builtin/notes.c:897 builtin/tag.c:535
+#: builtin/notes.c:897 builtin/tag.c:546
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "�е удало�ь разрешить «%s» как ��ылку."
@@ -14691,7 +16901,7 @@ msgstr "попытка удалениÑ� неÑ�ущеÑ�твующей заметÐ
 msgid "read object names from the standard input"
 msgstr "прочитать имена объектов из �тандартного ввода"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:165
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:220
 msgid "do not remove, show only"
 msgstr "не удал�ть, только показать �пи�ок"
 
@@ -14707,387 +16917,375 @@ msgstr "��ылка-на-заметку"
 msgid "use notes from <notes-ref>"
 msgstr "и�пользовать заметку из <��ылка-на-заметку>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1611
+#: builtin/notes.c:1034 builtin/stash.c:1604
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "неизве�тна� подкоманда: %s"
 
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:54
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<опции>…] [< <�пи�ок-��ылок> | < <�пи�ок-объектов>]"
 
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:55
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<опции>…] <им�-базы> [< <�пи�ок-��ылок> | < <�пи�ок-объектов>]"
 
-#: builtin/pack-objects.c:424
+#: builtin/pack-objects.c:443
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:435
+#: builtin/pack-objects.c:454
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:566
+#: builtin/pack-objects.c:585
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr ""
 
-#: builtin/pack-objects.c:777
+#: builtin/pack-objects.c:796
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:790
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr ""
-
-#: builtin/pack-objects.c:798
-msgid "unable to seek in reused packfile"
-msgstr ""
-
-#: builtin/pack-objects.c:809
-msgid "unable to read from reused packfile"
-msgstr ""
-
-#: builtin/pack-objects.c:837
+#: builtin/pack-objects.c:1004
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "отключение запи�и битовых карт, так как карты были разбиты на ча�ти из-за pack.packSizeLimit"
 
-#: builtin/pack-objects.c:850
+#: builtin/pack-objects.c:1017
 msgid "Writing objects"
 msgstr "Запи�ь объектов"
 
-#: builtin/pack-objects.c:912 builtin/update-index.c:89
+#: builtin/pack-objects.c:1078 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "не удало�ь выполнить stat %s"
 
-#: builtin/pack-objects.c:965
+#: builtin/pack-objects.c:1131
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr ""
 
-#: builtin/pack-objects.c:1161
+#: builtin/pack-objects.c:1348
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "отключение запи�и битовых карт, так как некоторые объекты не были упакованы"
 
-#: builtin/pack-objects.c:1589
+#: builtin/pack-objects.c:1796
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1598
+#: builtin/pack-objects.c:1805
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr ""
 
-#: builtin/pack-objects.c:1867
+#: builtin/pack-objects.c:2086
 msgid "Counting objects"
 msgstr "Под�чет объектов"
 
-#: builtin/pack-objects.c:1997
-#, c-format
-msgid "unable to get size of %s"
-msgstr "не удало�ь получить размер %s"
-
-#: builtin/pack-objects.c:2012
+#: builtin/pack-objects.c:2231
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "не удало�ь разобрать заголовок объекта %s"
 
-#: builtin/pack-objects.c:2082 builtin/pack-objects.c:2098
-#: builtin/pack-objects.c:2108
+#: builtin/pack-objects.c:2301 builtin/pack-objects.c:2317
+#: builtin/pack-objects.c:2327
 #, c-format
 msgid "object %s cannot be read"
 msgstr ""
 
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2112
+#: builtin/pack-objects.c:2304 builtin/pack-objects.c:2331
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr ""
 
-#: builtin/pack-objects.c:2122
+#: builtin/pack-objects.c:2341
 msgid "suboptimal pack - out of memory"
 msgstr ""
 
-#: builtin/pack-objects.c:2448
+#: builtin/pack-objects.c:2656
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "При �жатии изменений и�пользует�� до %d потоков"
 
-#: builtin/pack-objects.c:2580
+#: builtin/pack-objects.c:2795
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2667
+#: builtin/pack-objects.c:2883
 msgid "Compressing objects"
 msgstr "Сжатие объектов"
 
-#: builtin/pack-objects.c:2673
+#: builtin/pack-objects.c:2889
 msgid "inconsistency with delta count"
 msgstr ""
 
-#: builtin/pack-objects.c:2754
+#: builtin/pack-objects.c:2961
+#, 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
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+
+#: builtin/pack-objects.c:2993
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2760
+#: builtin/pack-objects.c:2999
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
 " %s"
 msgstr ""
 
-#: builtin/pack-objects.c:2858
+#: builtin/pack-objects.c:3097
 msgid "invalid value for --missing"
 msgstr "недопу�тимое значение дл� --missing"
 
-#: builtin/pack-objects.c:2917 builtin/pack-objects.c:3025
+#: builtin/pack-objects.c:3156 builtin/pack-objects.c:3264
 msgid "cannot open pack index"
 msgstr ""
 
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:3187
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr ""
 
-#: builtin/pack-objects.c:3033
+#: builtin/pack-objects.c:3272
 msgid "unable to force loose object"
 msgstr ""
 
-#: builtin/pack-objects.c:3125
+#: builtin/pack-objects.c:3365
 #, c-format
 msgid "not a rev '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3128
+#: builtin/pack-objects.c:3368
 #, c-format
 msgid "bad revision '%s'"
 msgstr ""
 
-#: builtin/pack-objects.c:3153
+#: builtin/pack-objects.c:3393
 msgid "unable to add recent objects"
 msgstr ""
 
-#: builtin/pack-objects.c:3206
+#: builtin/pack-objects.c:3446
 #, c-format
 msgid "unsupported index version %s"
 msgstr "неподдерживаема� вер�и� индек�а %s"
 
-#: builtin/pack-objects.c:3210
+#: builtin/pack-objects.c:3450
 #, c-format
 msgid "bad index version '%s'"
 msgstr "плоха� вер�и� индек�а «%s»"
 
-#: builtin/pack-objects.c:3240
-msgid "do not show progress meter"
-msgstr "не выводить прогре�� выполнени�"
-
-#: builtin/pack-objects.c:3242
-msgid "show progress meter"
-msgstr "показать прогре�� выполнени�"
-
-#: builtin/pack-objects.c:3244
-msgid "show progress meter during object writing phase"
-msgstr "показать прогре�� выполнени� во врем� запи�и объектов"
-
-#: builtin/pack-objects.c:3247
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "похоже на --all-progress при включенном прогре��е выполнени�"
-
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3488
 msgid "<version>[,<offset>]"
 msgstr ""
 
-#: builtin/pack-objects.c:3249
+#: builtin/pack-objects.c:3489
 msgid "write the pack index file in the specified idx format version"
 msgstr "запи�ать файл индек�а пакета в указанной вер�ии формата"
 
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3492
 msgid "maximum size of each output pack file"
 msgstr "мак�имальный размер каждого выходного файла пакета"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3494
 msgid "ignore borrowed objects from alternate object store"
 msgstr "игнорировать чужие объекты, вз�тые из альтернативного хранилища объектов"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3496
 msgid "ignore packed objects"
 msgstr "игнорировать упакованные объекты"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3498
 msgid "limit pack window by objects"
 msgstr "ограничить окно пакета по количе�тву объектов"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3500
 msgid "limit pack window by memory in addition to object limit"
 msgstr "дополнительно к количе�тву объектов ограничить окно пакета по пам�ти"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3502
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "мак�имальна� разрешенна� длина цепочки дельт в результирующем пакете"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3504
 msgid "reuse existing deltas"
 msgstr "и�пользовать повторно �уще�твующие дельты"
 
-#: builtin/pack-objects.c:3266
+#: builtin/pack-objects.c:3506
 msgid "reuse existing objects"
 msgstr "и�пользовать повторно �уще�твующие объекты"
 
-#: builtin/pack-objects.c:3268
+#: builtin/pack-objects.c:3508
 msgid "use OFS_DELTA objects"
 msgstr "и�пользовать объекты OFS_DELTA"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3510
 msgid "use threads when searching for best delta matches"
 msgstr "и�пользовать многопоточно�ть при пои�ке лучших �овпадений дельт"
 
-#: builtin/pack-objects.c:3272
+#: builtin/pack-objects.c:3512
 msgid "do not create an empty pack output"
 msgstr "не �оздавать пу�тые выходные пакеты"
 
-#: builtin/pack-objects.c:3274
+#: builtin/pack-objects.c:3514
 msgid "read revision arguments from standard input"
 msgstr "прочитать аргументы редакций из �тандартного ввода"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3516
 msgid "limit the objects to those that are not yet packed"
 msgstr "ограничить�� объектами, которые еще не упакованы"
 
-#: builtin/pack-objects.c:3279
+#: builtin/pack-objects.c:3519
 msgid "include objects reachable from any reference"
 msgstr "включить объекты, которые до�тижимы по любой из ��ылок"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3522
 msgid "include objects referred by reflog entries"
 msgstr "включить объекты, на которые ��ылают�� запи�и журнала ��ылок"
 
-#: builtin/pack-objects.c:3285
+#: builtin/pack-objects.c:3525
 msgid "include objects referred to by the index"
 msgstr "включить объекты, на которые ��ылает�� индек�"
 
-#: builtin/pack-objects.c:3288
+#: builtin/pack-objects.c:3528
 msgid "output pack to stdout"
 msgstr "выве�ти пакет на  �тандартный вывод"
 
-#: builtin/pack-objects.c:3290
+#: builtin/pack-objects.c:3530
 msgid "include tag objects that refer to objects to be packed"
 msgstr "включить объекты меток, которые ��ылают�� на упаковываемые объекты"
 
-#: builtin/pack-objects.c:3292
+#: builtin/pack-objects.c:3532
 msgid "keep unreachable objects"
 msgstr "�охран�ть ��ылки на недо�тупные объекты"
 
-#: builtin/pack-objects.c:3294
+#: builtin/pack-objects.c:3534
 msgid "pack loose unreachable objects"
 msgstr "паковать недо�тижимые объекты"
 
-#: builtin/pack-objects.c:3296
+#: builtin/pack-objects.c:3536
 msgid "unpack unreachable objects newer than <time>"
 msgstr "ра�паковать недо�тупные объекты, которые новее, чем <врем�>"
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3539
 msgid "use the sparse reachability algorithm"
 msgstr ""
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3541
 msgid "create thin packs"
 msgstr "�оздавать тонкие пакеты"
 
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3543
 msgid "create packs suitable for shallow fetches"
 msgstr "�оздавать пакеты, подход�щие дл� ча�тичных извлечений"
 
-#: builtin/pack-objects.c:3305
+#: builtin/pack-objects.c:3545
 msgid "ignore packs that have companion .keep file"
 msgstr "игнорировать пакеты, р�дом � которыми лежит .keep файл"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3547
 msgid "ignore this pack"
 msgstr "игнорировать �тот пакет"
 
-#: builtin/pack-objects.c:3309
+#: builtin/pack-objects.c:3549
 msgid "pack compression level"
 msgstr "уровень �жати� пакета"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3551
 msgid "do not hide commits by grafts"
 msgstr "не �крывать коммиты �ращени�ми"
 
-#: builtin/pack-objects.c:3313
+#: builtin/pack-objects.c:3553
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "по возможно�ти и�пользовать индек� в битовых картах, дл� у�корени� под�чета объектов"
 
-#: builtin/pack-objects.c:3315
+#: builtin/pack-objects.c:3555
 msgid "write a bitmap index together with the pack index"
 msgstr "запи�ь индек�а в битовых картах вме�те � индек�ом пакета"
 
-#: builtin/pack-objects.c:3318
+#: builtin/pack-objects.c:3559
+msgid "write a bitmap index if possible"
+msgstr ""
+
+#: builtin/pack-objects.c:3563
 msgid "handling for missing objects"
 msgstr "обработка от�ут�твующих объектов"
 
-#: builtin/pack-objects.c:3321
+#: builtin/pack-objects.c:3566
 msgid "do not pack objects in promisor packfiles"
 msgstr "не упаковывать объекты в promisor файлы пакетов"
 
-#: builtin/pack-objects.c:3323
+#: builtin/pack-objects.c:3568
 msgid "respect islands during delta compression"
 msgstr ""
 
-#: builtin/pack-objects.c:3348
+#: builtin/pack-objects.c:3570
+msgid "protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:3571
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+
+#: builtin/pack-objects.c:3600
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "глубина цепочки изменений %d �лишком больша�, и�пользую принудительно %d"
 
-#: builtin/pack-objects.c:3353
+#: builtin/pack-objects.c:3605
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "ли�ит pack.deltaCacheLimit �лишком вы�окий, и�пользую принудительно %d"
 
-#: builtin/pack-objects.c:3407
+#: builtin/pack-objects.c:3659
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr ""
 
-#: builtin/pack-objects.c:3409
+#: builtin/pack-objects.c:3661
 msgid "minimum pack size limit is 1 MiB"
 msgstr ""
 
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:3666
 msgid "--thin cannot be used to build an indexable pack"
 msgstr ""
 
-#: builtin/pack-objects.c:3417
+#: builtin/pack-objects.c:3669
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr ""
 
-#: builtin/pack-objects.c:3423
+#: builtin/pack-objects.c:3675
 msgid "cannot use --filter without --stdout"
 msgstr ""
 
-#: builtin/pack-objects.c:3484
+#: builtin/pack-objects.c:3735
 msgid "Enumerating objects"
 msgstr "Перечи�ление объектов"
 
-#: builtin/pack-objects.c:3514
+#: builtin/pack-objects.c:3766
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
-msgstr "В�его %<PRIu32> (изменени� %<PRIu32>), повторно и�пользовано %<PRIu32> (изменени� %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr "В�его %<PRIu32> (изменений %<PRIu32>), повторно и�пользовано %<PRIu32> (изменений %<PRIu32>), повторно и�пользовано пакетов %<PRIu32>"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -15101,98 +17299,110 @@ msgstr "паковать в�ё"
 msgid "prune loose refs (default)"
 msgstr "почи�тить �лабые ��ылки (по умолчанию)"
 
-#: builtin/prune-packed.c:9
+#: 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-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "Удаление дублирующих�� объектов"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <врем�>] [--] [<редакци�>…]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "выве�ти �пи�ок удаленных объектов"
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "удалить объекты �тарее чем <дата-окончани�>"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "ограничить обход объектами вне promisor файлов пакетов"
 
-#: builtin/prune.c:150
+#: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
 msgstr "нельз� почи�тить неи�пользуемые объекты в precious-objects репозитории"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "�еправильное значение %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<опции>] [<репозиторий> [<�пецификатор-��ылки>…]]"
 
-#: builtin/pull.c:140
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "управление рекур�ивным извлечением подмодулей"
 
-#: builtin/pull.c:144
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Опции, �в�занные �о �ли�нием"
 
-#: builtin/pull.c:147
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "забрать изменени� � помощью перемещени�, а не �ли�ни�"
 
-#: builtin/pull.c:175 builtin/rebase.c:447 builtin/revert.c:125
+#: builtin/pull.c:158 builtin/rebase.c:490 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "разрешить перемотку вперед"
 
-#: builtin/pull.c:184
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "автоматиче�ки выполн�ть stash/stash pop до и по�ле перемещени�"
+#: builtin/pull.c:167 parse-options.h:339
+msgid "automatically stash/stash pop before and after"
+msgstr ""
 
-#: builtin/pull.c:200
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Опции, �в�занные � извлечением изменений"
 
-#: builtin/pull.c:210
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "принудительна� перезапи�ь локальной ветки"
 
-#: builtin/pull.c:218
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "количе�тво подмодулей, которые будут получены парралельно"
 
-#: builtin/pull.c:313
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "�еправильное значение дл� pull.ff: %s"
 
-#: builtin/pull.c:430
+#: 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
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "�ет претендентов дл� перемещени� �реди ��ылок, которые вы только что получили."
 
-#: builtin/pull.c:432
+#: builtin/pull.c:460
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "�ет претендентов дл� �ли�ни� �реди ��ылок, которые вы только что получили."
 
-#: builtin/pull.c:433
+#: builtin/pull.c:461
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "Обычно �то означает, что вы передали �пецификацию ��ылки � помощью шаблона и �тот шаблон ни � чем не �овпал на внешнем репозитории."
 
-#: builtin/pull.c:436
+#: builtin/pull.c:464
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -15200,74 +17410,69 @@ msgid ""
 "for your current branch, you must specify a branch on the command line."
 msgstr "Вы попро�или получить изменени� �о внешнего репозитори� «%s», но не указали ветку. Так как �то не репозиторий по умолчанию дл�  вашей текущей ветки, вы должны указать ветку в командной �троке."
 
-#: builtin/pull.c:441 builtin/rebase.c:1321 git-parse-remote.sh:73
+#: builtin/pull.c:469 builtin/rebase.c:1246
 msgid "You are not currently on a branch."
 msgstr "Вы �ейча� ни на одной из веток."
 
-#: builtin/pull.c:443 builtin/pull.c:458 git-parse-remote.sh:79
+#: builtin/pull.c:471 builtin/pull.c:486
 msgid "Please specify which branch you want to rebase against."
 msgstr "Пожалуй�та, укажите на какую ветку вы хотите переме�тить изменени�."
 
-#: builtin/pull.c:445 builtin/pull.c:460 git-parse-remote.sh:82
+#: builtin/pull.c:473 builtin/pull.c:488
 msgid "Please specify which branch you want to merge with."
 msgstr "Пожалуй�та, укажите � какой веткой вы хотите �лить изменени�."
 
-#: builtin/pull.c:446 builtin/pull.c:461
+#: builtin/pull.c:474 builtin/pull.c:489
 msgid "See git-pull(1) for details."
 msgstr "Дл� дополнительной информации, �мотрите git-pull(1)."
 
-#: builtin/pull.c:448 builtin/pull.c:454 builtin/pull.c:463
-#: builtin/rebase.c:1327 git-parse-remote.sh:64
+#: builtin/pull.c:476 builtin/pull.c:482 builtin/pull.c:491
+#: builtin/rebase.c:1252
 msgid "<remote>"
 msgstr "<внешний-репозиторий>"
 
-#: builtin/pull.c:448 builtin/pull.c:463 builtin/pull.c:468
-#: git-parse-remote.sh:65
+#: builtin/pull.c:476 builtin/pull.c:491 builtin/pull.c:496
 msgid "<branch>"
 msgstr "<ветка>"
 
-#: builtin/pull.c:456 builtin/rebase.c:1319 git-parse-remote.sh:75
+#: builtin/pull.c:484 builtin/rebase.c:1244
 msgid "There is no tracking information for the current branch."
 msgstr "У текущей ветки нет информации об от�леживании."
 
-#: builtin/pull.c:465 git-parse-remote.sh:95
+#: builtin/pull.c:493
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "Е�ли вы хотите указать информацию о от�леживаемой ветке, выполните:"
 
-#: builtin/pull.c:470
+#: builtin/pull.c:498
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
 "from the remote, but no such ref was fetched."
 msgstr "Ваша конфигураци� указывает, что нужно �лить изменени� �о ��ылкой\n«%s» из внешнего репозитори�, но така� ��ылка не была получена."
 
-#: builtin/pull.c:574
+#: builtin/pull.c:609
 #, c-format
 msgid "unable to access commit %s"
 msgstr ""
 
-#: builtin/pull.c:854
+#: builtin/pull.c:915
 msgid "ignoring --verify-signatures for rebase"
 msgstr "игнорирование --verify-signatures при перемещении"
 
-#: builtin/pull.c:909
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash можно и�пользовать только вме�те � --rebase."
-
-#: builtin/pull.c:917
+#: builtin/pull.c:972
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "Обновление еще не начавшей�� ветки � изменени�ми, добавленными в индек�."
 
-#: builtin/pull.c:921
+#: builtin/pull.c:976
 msgid "pull with rebase"
 msgstr "получение � перемещением"
 
-#: builtin/pull.c:922
+#: builtin/pull.c:977
 msgid "please commit or stash them."
 msgstr "�делайте коммит или �пр�чьте их."
 
-#: builtin/pull.c:947
+#: builtin/pull.c:1002
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -15275,7 +17480,7 @@ msgid ""
 "commit %s."
 msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\n� коммита %s."
 
-#: builtin/pull.c:953
+#: builtin/pull.c:1008
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -15286,15 +17491,15 @@ msgid ""
 "to recover."
 msgstr "�е удало�ь перемотать вперёд изменени� в вашем рабочем каталоге.\nПо�ле того, как вы убедите�ь, что вы �охранили в�ё необходимое из вывода\n$ git diff %s\n, запу�тите\n$ git reset --hard\nдл� во��тановлени� и�ходного �о�то�ни�."
 
-#: builtin/pull.c:968
+#: builtin/pull.c:1023
 msgid "Cannot merge multiple branches into empty head."
 msgstr "�ельз� �лить не�колько веток в пу�той указатель на ветку."
 
-#: builtin/pull.c:972
+#: builtin/pull.c:1027
 msgid "Cannot rebase onto multiple branches."
 msgstr "�евозможно переме�тить над не�колькими ветками."
 
-#: builtin/pull.c:979
+#: builtin/pull.c:1041
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "невозможно выполнить перемещение � запи�анными локальными изменени�ми в подмодул�х"
 
@@ -15306,17 +17511,17 @@ msgstr "git push [<опции>] [<репозиторий> [<�пецификат
 msgid "tag shorthand without <tag>"
 msgstr "указано �окращение tag, но не указана �ама <метка>"
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "опци� --delete принимает только про�тые целевые имена ��ылок"
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
 msgstr "\nЧтобы выбрать любую из опций на по�то�нной о�нове, �мотрите push.default в «git help config»."
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -15331,7 +17536,7 @@ msgid ""
 "%s"
 msgstr ""
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -15341,7 +17546,7 @@ msgid ""
 "    git push %s HEAD:<name-of-remote-branch>\n"
 msgstr "Вы �ейча� не находите�ь ни на одной из веток.\nЧтобы отправить и�торию, ведущую к текущему (отделённый HEAD) �о�то�нию, и�пользуйте\n\n    git push %s HEAD:<им�-внешней-ветки>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:194
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -15350,13 +17555,13 @@ msgid ""
 "    git push --set-upstream %s %s\n"
 msgstr "Текуща� ветка %s не имеет выше�то�щей ветки.\nЧтобы отправить текущую ветку и у�тановить внешнюю ветку как выше�то�щую дл� �той ветки, и�пользуйте\n\n    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:202
 #, c-format
 msgid ""
 "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "Ваша текуща� ветка %s имеет не�колько выше�то�щих веток, отказ в отправке изменений."
 
-#: builtin/push.c:210
+#: builtin/push.c:205
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -15364,11 +17569,11 @@ msgid ""
 "to update which remote branch."
 msgstr "Вы �ейча� отправл�ете изменени� на внешний репозиторий «%s», который не �вл�ет�� выше�то�щим дл� вашей текущей ветки «%s», без указани� того, что отправл�ть и в какую внешнюю ветку."
 
-#: builtin/push.c:269
+#: 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:276
+#: builtin/push.c:267
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -15376,7 +17581,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr "Обновлени� были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней ча�ти. Заберите и �лейте внешние изменени� \n(например, � помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДл� дополнительной информации, �мотрите «Note about fast-forwards»\nв «git push --help»."
 
-#: builtin/push.c:282
+#: builtin/push.c:273
 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"
@@ -15384,7 +17589,7 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr "Обновлени� были отклонены, так как верхушка отправл�емой ветки\nпозади ее внешней ча�ти. Переключите�ь на ветку и заберите внешние\nизменени� (например, � помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДл� дополнительной информации, �мотрите «Note about fast-forwards»\nв «git push --help»."
 
-#: builtin/push.c:288
+#: builtin/push.c:279
 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"
@@ -15393,86 +17598,81 @@ msgid ""
 "See the 'Note about fast-forwards' in 'git push --help' for details."
 msgstr "Обновлени� были отклонены, так как внешний репозиторий �одержит\nизменени�, которых у ва� нет в вашем локальном репозитории.\nОбычно, �то �в�занно � тем, что кто-то уже отправил изменени� в \nто же ме�то. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и �лить изменени� из внешнего репозитори� �ебе\n(например, � помощью «git pull …»).\nДл� дополнительной информации, �мотрите «Note about fast-forwards»\nв «git push --help»."
 
-#: builtin/push.c:295
+#: builtin/push.c:286
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "Обновлени� были отклонены, так как метка уже �уще�твует во внешнем репозитории."
 
-#: builtin/push.c:298
+#: builtin/push.c:289
 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 "Вы не можете обновить внешнюю ��ылку, котора� указывает на объект, не �вл�ющий�� коммитом или обновить внешнюю ��ылку так, чтобы она указывала на объект, не �вл�ющий�� коммитом, без указани� опции «--force».\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:294
+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 ""
+
+#: builtin/push.c:364
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Отправка в %s\n"
 
-#: builtin/push.c:364
+#: builtin/push.c:371
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "не удало�ь отправить некоторые ��ылки в «%s»"
 
-#: builtin/push.c:398
-#, c-format
-msgid "bad repository '%s'"
-msgstr "плохой репозитори� «%s»"
-
-#: builtin/push.c:399
-msgid ""
-"No configured push destination.\n"
-"Either specify the URL from the command-line or configure a remote repository using\n"
-"\n"
-"    git remote add <name> <url>\n"
-"\n"
-"and then push using the remote name\n"
-"\n"
-"    git push <name>\n"
-msgstr "�е на�троена точка назначени� дл� отправки.\nЛибо укажите URL � помощью командной �троки, либо на�тройте внешний репозиторий � помощью\n\n    git remote add <им�> <адре�>\n\nа затем отправьте изменени� � помощью имени внешнего репозитори�\n\n    git push <им�>\n"
-
-#: builtin/push.c:554
+#: builtin/push.c:553
 msgid "repository"
 msgstr "репозиторий"
 
-#: builtin/push.c:555 builtin/send-pack.c:164
+#: builtin/push.c:554 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "отправить в�е ��ылки"
 
-#: builtin/push.c:556 builtin/send-pack.c:166
+#: builtin/push.c:555 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "�делать зеркало в�ех ��ылок"
 
-#: builtin/push.c:558
+#: builtin/push.c:557
 msgid "delete refs"
 msgstr "удалить ��ылки"
 
-#: builtin/push.c:559
+#: builtin/push.c:558
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "отправить метки (нельз� и�пользовать вме�те � --all или --mirror)"
 
-#: builtin/push.c:562 builtin/send-pack.c:167
+#: builtin/push.c:561 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "принудительное обновление"
 
-#: builtin/push.c:564 builtin/send-pack.c:181
+#: builtin/push.c:562 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
 msgstr ""
 
-#: builtin/push.c:565 builtin/send-pack.c:182
+#: builtin/push.c:563 builtin/send-pack.c:205
 msgid "require old value of ref to be at this value"
 msgstr "требовать, чтобы �тарое значение ��ылки было ожидаемым"
 
-#: builtin/push.c:568
+#: builtin/push.c:566 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr ""
+
+#: builtin/push.c:569
 msgid "control recursive pushing of submodules"
 msgstr "управление рекур�ивной отправкой подмодулей"
 
-#: builtin/push.c:570 builtin/send-pack.c:175
+#: builtin/push.c:570 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "и�пользовать тонкие пакеты"
 
-#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:571 builtin/push.c:572 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr "путь к программе упаковки на �ервере"
 
@@ -15492,43 +17692,60 @@ msgstr "пропу�тить перехватчик pre-push"
 msgid "push missing but relevant tags"
 msgstr "отправить пропущенные, но нужные метки"
 
-#: builtin/push.c:582 builtin/send-pack.c:169
+#: builtin/push.c:581 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "подпи�ать отправку � помощью GPG"
 
-#: builtin/push.c:584 builtin/send-pack.c:176
+#: builtin/push.c:583 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
 msgstr "запро�ить выполнение атомарной транзакции на внешней �тороне"
 
-#: builtin/push.c:602
+#: builtin/push.c:601
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete не�овме�тимо �  --all, --mirror и --tags"
 
-#: builtin/push.c:604
+#: builtin/push.c:603
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete не имеет �мы�ла без указани� ��ылок"
 
-#: builtin/push.c:607
+#: builtin/push.c:623
+#, c-format
+msgid "bad repository '%s'"
+msgstr "плохой репозитори� «%s»"
+
+#: builtin/push.c:624
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote repository using\n"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr "�е на�троена точка назначени� дл� отправки.\nЛибо укажите URL � помощью командной �троки, либо на�тройте внешний репозиторий � помощью\n\n    git remote add <им�> <адре�>\n\nа затем отправьте изменени� � помощью имени внешнего репозитори�\n\n    git push <им�>\n"
+
+#: builtin/push.c:639
 msgid "--all and --tags are incompatible"
 msgstr "--all и --tags нельз� и�пользовать одновременно"
 
-#: builtin/push.c:609
+#: builtin/push.c:641
 msgid "--all can't be combined with refspecs"
 msgstr "--all нельз� и�пользовать вме�те �о �пецификаторами ��ылок"
 
-#: builtin/push.c:613
+#: builtin/push.c:645
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror и --tags нельз� и�пользовать одновременно"
 
-#: builtin/push.c:615
+#: builtin/push.c:647
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror нельз� и�пользовать вме�те �о �пецификаторами ��ылок"
 
-#: builtin/push.c:618
+#: builtin/push.c:650
 msgid "--all and --mirror are incompatible"
 msgstr "--all и --mirror нельз� и�пользовать одновременно"
 
-#: builtin/push.c:637
+#: builtin/push.c:657
 msgid "push options must not have new line characters"
 msgstr "опции дл� отправки не должны �одержать �имволы перевода �трок"
 
@@ -15544,24 +17761,32 @@ msgstr ""
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr ""
 
-#: builtin/range-diff.c:21
+#: builtin/range-diff.c:22
 msgid "Percentage by which creation is weighted"
 msgstr ""
 
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:24
 msgid "use simple diff colors"
 msgstr ""
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:26
+msgid "notes"
+msgstr ""
+
+#: builtin/range-diff.c:26
+msgid "passed to 'git log'"
+msgstr ""
+
+#: builtin/range-diff.c:50 builtin/range-diff.c:54
 #, c-format
 msgid "no .. in range: '%s'"
 msgstr ""
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:64
 msgid "single arg format must be symmetric range"
 msgstr ""
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:79
 msgid "need two commit ranges"
 msgstr ""
 
@@ -15640,232 +17865,213 @@ msgstr "отладка unpack-trees"
 msgid "suppress feedback messages"
 msgstr ""
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr ""
+
+#: builtin/rebase.c:35
 msgid ""
-"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] "
-"[<branch>]"
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
 msgstr ""
 
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root "
 "[<branch>]"
 msgstr ""
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr ""
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:193 builtin/rebase.c:217 builtin/rebase.c:244
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "непригодный дл� и�пользовани� �пи�ок дел: «%s»"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr ""
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr ""
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:310
 #, c-format
 msgid "could not create temporary %s"
 msgstr ""
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:316
 msgid "could not mark as interactive"
 msgstr ""
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:369
 msgid "could not generate todo list"
 msgstr ""
 
-#: builtin/rebase.c:382
+#: builtin/rebase.c:411
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr ""
 
-#: builtin/rebase.c:437
+#: builtin/rebase.c:480
 msgid "git rebase--interactive [<options>]"
 msgstr ""
 
-#: builtin/rebase.c:449
-msgid "keep empty commits"
-msgstr "о�тавить пу�тые коммиты"
+#: builtin/rebase.c:493 builtin/rebase.c:1388
+msgid "keep commits which start empty"
+msgstr ""
 
-#: builtin/rebase.c:451 builtin/revert.c:127
+#: builtin/rebase.c:497 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "разрешить коммиты � пу�тыми �ообщени�ми"
 
-#: builtin/rebase.c:452
+#: builtin/rebase.c:499
 msgid "rebase merge commits"
 msgstr ""
 
-#: builtin/rebase.c:454
+#: builtin/rebase.c:501
 msgid "keep original branch points of cousins"
 msgstr ""
 
-#: builtin/rebase.c:456
+#: builtin/rebase.c:503
 msgid "move commits that begin with squash!/fixup!"
 msgstr ""
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:504
 msgid "sign commits"
 msgstr ""
 
-#: builtin/rebase.c:459 builtin/rebase.c:1397
+#: builtin/rebase.c:506 builtin/rebase.c:1327
 msgid "display a diffstat of what changed upstream"
 msgstr ""
 
-#: builtin/rebase.c:461
+#: builtin/rebase.c:508
 msgid "continue rebase"
 msgstr "продолжить перемещение"
 
-#: builtin/rebase.c:463
+#: builtin/rebase.c:510
 msgid "skip commit"
 msgstr ""
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:511
 msgid "edit the todo list"
 msgstr ""
 
-#: builtin/rebase.c:466
+#: builtin/rebase.c:513
 msgid "show the current patch"
 msgstr ""
 
-#: builtin/rebase.c:469
+#: builtin/rebase.c:516
 msgid "shorten commit ids in the todo list"
 msgstr "выве�ти короткие идентификаторы коммитов в �пи�ке дей�твий"
 
-#: builtin/rebase.c:471
+#: builtin/rebase.c:518
 msgid "expand commit ids in the todo list"
 msgstr "выве�ти полные идентификаторы коммитов в �пи�ке дей�твий"
 
-#: builtin/rebase.c:473
+#: builtin/rebase.c:520
 msgid "check the todo list"
 msgstr "проверить �пи�ок дел"
 
-#: builtin/rebase.c:475
+#: builtin/rebase.c:522
 msgid "rearrange fixup/squash lines"
 msgstr "пере�тавить �троки fixup/squash"
 
-#: builtin/rebase.c:477
+#: builtin/rebase.c:524
 msgid "insert exec commands in todo list"
 msgstr "в�тавить команды и�полнени� коммитов в �пи�ке дей�твий"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:525
 msgid "onto"
 msgstr ""
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:528
 msgid "restrict-revision"
 msgstr ""
 
-#: builtin/rebase.c:481
+#: builtin/rebase.c:528
 msgid "restrict revision"
 msgstr ""
 
-#: builtin/rebase.c:483
+#: builtin/rebase.c:530
 msgid "squash-onto"
 msgstr ""
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:531
 msgid "squash onto"
 msgstr ""
 
-#: builtin/rebase.c:486
+#: builtin/rebase.c:533
 msgid "the upstream commit"
 msgstr ""
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:535
 msgid "head-name"
 msgstr ""
 
-#: builtin/rebase.c:488
+#: builtin/rebase.c:535
 msgid "head name"
 msgstr ""
 
-#: builtin/rebase.c:493
+#: builtin/rebase.c:540
 msgid "rebase strategy"
 msgstr ""
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:541
 msgid "strategy-opts"
 msgstr ""
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:542
 msgid "strategy options"
 msgstr ""
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:543
 msgid "switch-to"
 msgstr ""
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:544
 msgid "the branch or commit to checkout"
 msgstr ""
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
 msgid "onto-name"
 msgstr ""
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
 msgid "onto name"
 msgstr ""
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "cmd"
 msgstr ""
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "the command to run"
 msgstr ""
 
-#: builtin/rebase.c:502 builtin/rebase.c:1480
+#: builtin/rebase.c:549 builtin/rebase.c:1421
 msgid "automatically re-schedule any `exec` that fails"
 msgstr ""
 
-#: builtin/rebase.c:518
+#: builtin/rebase.c:565
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "--[no-]rebase-cousins не имеет �мы�ла без указани� --rebase-merges"
 
-#: builtin/rebase.c:534 builtin/rebase.c:1787
+#: builtin/rebase.c:581
 #, c-format
-msgid "%s requires an interactive rebase"
+msgid "%s requires the merge backend"
 msgstr ""
 
-#: builtin/rebase.c:586
+#: builtin/rebase.c:624
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr ""
 
-#: builtin/rebase.c:601
+#: builtin/rebase.c:641
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:626
+#: builtin/rebase.c:666
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr ""
 
-#: builtin/rebase.c:702
-#, c-format
-msgid "Could not read '%s'"
-msgstr ""
-
-#: builtin/rebase.c:720
-#, c-format
-msgid "Cannot store %s"
-msgstr ""
-
-#: builtin/rebase.c:817
-msgid "could not determine HEAD revision"
-msgstr ""
-
-#: builtin/rebase.c:940
+#: builtin/rebase.c:811 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"
@@ -15873,7 +18079,7 @@ msgid ""
 "To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
 msgstr "Разрешите в�е конфликты вручную, пометьте их разрешёнными � помощью «git add/rm <конфликтующие-файлы>», а затем запу�тите «git rebase --continue».\nЕ�ли вы хотите пропу�тить �тот коммит, то запу�тите «git rebase --skip».\nЧтобы вернуть�� на �о�то�ние до «git rebase», запу�тите «git rebase --abort»."
 
-#: builtin/rebase.c:1021
+#: builtin/rebase.c:894
 #, c-format
 msgid ""
 "\n"
@@ -15885,7 +18091,12 @@ msgid ""
 "As a result, git cannot rebase them."
 msgstr ""
 
-#: builtin/rebase.c:1313
+#: builtin/rebase.c:1220
+#, c-format
+msgid "unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask\"."
+msgstr ""
+
+#: builtin/rebase.c:1238
 #, c-format
 msgid ""
 "%s\n"
@@ -15896,7 +18107,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/rebase.c:1329
+#: builtin/rebase.c:1254
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -15905,174 +18116,201 @@ msgid ""
 "\n"
 msgstr ""
 
-#: builtin/rebase.c:1359
+#: builtin/rebase.c:1284
 msgid "exec commands cannot contain newlines"
 msgstr ""
 
-#: builtin/rebase.c:1363
+#: builtin/rebase.c:1288
 msgid "empty exec command"
 msgstr ""
 
-#: builtin/rebase.c:1390
+#: builtin/rebase.c:1318
 msgid "rebase onto given branch instead of upstream"
 msgstr ""
 
-#: builtin/rebase.c:1392
+#: builtin/rebase.c:1320
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr ""
+
+#: builtin/rebase.c:1322
 msgid "allow pre-rebase hook to run"
 msgstr ""
 
-#: builtin/rebase.c:1394
+#: builtin/rebase.c:1324
 msgid "be quiet. implies --no-stat"
 msgstr ""
 
-#: builtin/rebase.c:1400
+#: builtin/rebase.c:1330
 msgid "do not show diffstat of what changed upstream"
 msgstr ""
 
-#: builtin/rebase.c:1403
-msgid "add a Signed-off-by: line to each commit"
+#: builtin/rebase.c:1333
+msgid "add a Signed-off-by trailer to each commit"
+msgstr ""
+
+#: builtin/rebase.c:1336
+msgid "make committer date match author date"
 msgstr ""
 
-#: builtin/rebase.c:1405 builtin/rebase.c:1409 builtin/rebase.c:1411
-msgid "passed to 'git am'"
+#: builtin/rebase.c:1338
+msgid "ignore author date and use current date"
 msgstr ""
 
-#: builtin/rebase.c:1413 builtin/rebase.c:1415
+#: builtin/rebase.c:1340
+msgid "synonym of --reset-author-date"
+msgstr ""
+
+#: builtin/rebase.c:1342 builtin/rebase.c:1346
 msgid "passed to 'git apply'"
 msgstr ""
 
-#: builtin/rebase.c:1417 builtin/rebase.c:1420
+#: builtin/rebase.c:1344
+msgid "ignore changes in whitespace"
+msgstr ""
+
+#: builtin/rebase.c:1348 builtin/rebase.c:1351
 msgid "cherry-pick all commits, even if unchanged"
 msgstr ""
 
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1353
 msgid "continue"
 msgstr ""
 
-#: builtin/rebase.c:1425
+#: builtin/rebase.c:1356
 msgid "skip current patch and continue"
 msgstr ""
 
-#: builtin/rebase.c:1427
+#: builtin/rebase.c:1358
 msgid "abort and check out the original branch"
 msgstr ""
 
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1361
 msgid "abort but keep HEAD where it is"
 msgstr ""
 
-#: builtin/rebase.c:1431
+#: builtin/rebase.c:1362
 msgid "edit the todo list during an interactive rebase"
 msgstr ""
 
-#: builtin/rebase.c:1434
+#: builtin/rebase.c:1365
 msgid "show the patch file being applied or merged"
 msgstr ""
 
-#: builtin/rebase.c:1437
+#: builtin/rebase.c:1368
+msgid "use apply strategies to rebase"
+msgstr ""
+
+#: builtin/rebase.c:1372
 msgid "use merging strategies to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1441
+#: builtin/rebase.c:1376
 msgid "let the user edit the list of commits to rebase"
 msgstr ""
 
-#: builtin/rebase.c:1445
+#: builtin/rebase.c:1380
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr ""
 
-#: builtin/rebase.c:1449
-msgid "preserve empty commits during rebase"
+#: builtin/rebase.c:1385
+msgid "how to handle commits that become empty"
 msgstr ""
 
-#: builtin/rebase.c:1451
+#: builtin/rebase.c:1392
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr ""
 
-#: builtin/rebase.c:1457
-msgid "automatically stash/stash pop before and after"
-msgstr ""
-
-#: builtin/rebase.c:1459
+#: builtin/rebase.c:1399
 msgid "add exec lines after each commit of the editable list"
 msgstr ""
 
-#: builtin/rebase.c:1463
+#: builtin/rebase.c:1403
 msgid "allow rebasing commits with empty messages"
 msgstr ""
 
-#: builtin/rebase.c:1466
+#: builtin/rebase.c:1407
 msgid "try to rebase merges instead of skipping them"
 msgstr ""
 
-#: builtin/rebase.c:1469
+#: builtin/rebase.c:1410
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr ""
 
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1412
 msgid "use the given merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1473 builtin/revert.c:114
+#: builtin/rebase.c:1414 builtin/revert.c:115
 msgid "option"
 msgstr "опци�"
 
-#: builtin/rebase.c:1474
+#: builtin/rebase.c:1415
 msgid "pass the argument through to the merge strategy"
 msgstr ""
 
-#: builtin/rebase.c:1477
+#: builtin/rebase.c:1418
 msgid "rebase all reachable commits up to the root(s)"
 msgstr ""
 
-#: builtin/rebase.c:1498
+#: builtin/rebase.c:1423
+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 ""
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1446
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "Похоже, что выполн�ет�� «git am». �евозможно выполнить перемещение."
 
-#: builtin/rebase.c:1545
+#: builtin/rebase.c:1487
 msgid ""
 "git rebase --preserve-merges is deprecated. Use --rebase-merges instead."
 msgstr ""
 
-#: builtin/rebase.c:1549
+#: builtin/rebase.c:1492
+msgid "cannot combine '--keep-base' with '--onto'"
+msgstr ""
+
+#: builtin/rebase.c:1494
+msgid "cannot combine '--keep-base' with '--root'"
+msgstr ""
+
+#: builtin/rebase.c:1498
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr ""
+
+#: builtin/rebase.c:1501
 msgid "No rebase in progress?"
 msgstr "�ет перемещени� в проце��е?"
 
-#: builtin/rebase.c:1553
+#: builtin/rebase.c:1505
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "Дей�твие --edit-todo может и�пользовать�� только при интерактивном перемещении."
 
-#: builtin/rebase.c:1576
+#: builtin/rebase.c:1528 t/helper/test-fast-rebase.c:123
 msgid "Cannot read HEAD"
 msgstr "�е удало�ь прочитать HEAD"
 
-#: builtin/rebase.c:1588
+#: builtin/rebase.c:1540
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
 msgstr "Вы должны отредактировать в�е\nконфликты �ли�ни�, а потом пометить\nих как разрешенные � помощью git add"
 
-#: builtin/rebase.c:1607
+#: builtin/rebase.c:1559
 msgid "could not discard worktree changes"
 msgstr ""
 
-#: builtin/rebase.c:1626
+#: builtin/rebase.c:1578
 #, c-format
 msgid "could not move back to %s"
 msgstr ""
 
-#: builtin/rebase.c:1637 builtin/rm.c:369
-#, c-format
-msgid "could not remove '%s'"
-msgstr "не удало�ь удалить «%s»"
-
-#: builtin/rebase.c:1663
+#: builtin/rebase.c:1624
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -16085,167 +18323,140 @@ msgid ""
 "valuable there.\n"
 msgstr ""
 
-#: builtin/rebase.c:1684
+#: builtin/rebase.c:1652
 msgid "switch `C' expects a numerical value"
 msgstr ""
 
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1694
 #, c-format
 msgid "Unknown mode: %s"
 msgstr ""
 
-#: builtin/rebase.c:1747
+#: builtin/rebase.c:1733
 msgid "--strategy requires --merge or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1796
-msgid "cannot combine am options with either interactive or merge options"
+#: builtin/rebase.c:1763
+msgid "cannot combine apply options with merge options"
 msgstr ""
 
-#: builtin/rebase.c:1815
-msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
+#: builtin/rebase.c:1776
+#, c-format
+msgid "Unknown rebase backend: %s"
 msgstr ""
 
-#: builtin/rebase.c:1819
-msgid ""
-"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
+#: builtin/rebase.c:1806
+msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr ""
 
-#: builtin/rebase.c:1825
-msgid "cannot combine '--rebase-merges' with '--strategy-option'"
+#: builtin/rebase.c:1826
+msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr ""
 
-#: builtin/rebase.c:1828
-msgid "cannot combine '--rebase-merges' with '--strategy'"
+#: builtin/rebase.c:1830
+msgid ""
+"error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 
-#: builtin/rebase.c:1852
+#: builtin/rebase.c:1854
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1858
+#: builtin/rebase.c:1860
 msgid "Could not create new root commit"
 msgstr ""
 
-#: builtin/rebase.c:1876
+#: builtin/rebase.c:1886
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr ""
+
+#: builtin/rebase.c:1889
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr ""
 
-#: builtin/rebase.c:1883
+#: builtin/rebase.c:1897
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1908
+#: builtin/rebase.c:1923
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr ""
 
-#: builtin/rebase.c:1916 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1933
+#: builtin/rebase.c:1931 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:2414
 #, c-format
 msgid "No such ref: %s"
 msgstr "�ет такой ��ылки: %s"
 
-#: builtin/rebase.c:1927
+#: builtin/rebase.c:1942
 msgid "Could not resolve HEAD to a revision"
 msgstr ""
 
-#: builtin/rebase.c:1968
-msgid "Cannot autostash"
-msgstr "�е удало�ь автоматиче�ки �пр�тать изменени�"
-
-#: builtin/rebase.c:1971
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1977
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr ""
-
-#: builtin/rebase.c:1980
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr ""
-
-#: builtin/rebase.c:1983
-msgid "could not reset --hard"
-msgstr ""
-
-#: builtin/rebase.c:1984 builtin/reset.c:114
-#, c-format
-msgid "HEAD is now at %s"
-msgstr "HEAD �ейча� на %s"
-
-#: builtin/rebase.c:2000
+#: builtin/rebase.c:1963
 msgid "Please commit or stash them."
 msgstr "Сделайте коммит или �пр�чьте их."
 
-#: builtin/rebase.c:2027
-#, c-format
-msgid "could not parse '%s'"
-msgstr ""
-
-#: builtin/rebase.c:2040
+#: builtin/rebase.c:1999
 #, c-format
 msgid "could not switch to %s"
 msgstr ""
 
-#: builtin/rebase.c:2051
+#: builtin/rebase.c:2010
 msgid "HEAD is up to date."
 msgstr "HEAD уже в актуальном �о�то�нии."
 
-#: builtin/rebase.c:2053
+#: builtin/rebase.c:2012
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr ""
 
-#: builtin/rebase.c:2061
+#: builtin/rebase.c:2020
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD уже в актуальном �о�то�нии, принудительное перемещение."
 
-#: builtin/rebase.c:2063
+#: builtin/rebase.c:2022
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr ""
 
-#: builtin/rebase.c:2071
+#: builtin/rebase.c:2030
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Перехватчик pre-rebase отказал в перемещении."
 
-#: builtin/rebase.c:2078
+#: builtin/rebase.c:2037
 #, c-format
 msgid "Changes to %s:\n"
 msgstr ""
 
-#: builtin/rebase.c:2081
+#: builtin/rebase.c:2040
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr ""
 
-#: builtin/rebase.c:2106
+#: builtin/rebase.c:2065
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr ""
 
-#: builtin/rebase.c:2115
+#: builtin/rebase.c:2074
 msgid "Could not detach HEAD"
 msgstr ""
 
-#: builtin/rebase.c:2124
+#: builtin/rebase.c:2083
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr ""
 
-#: builtin/receive-pack.c:33
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <каталог-git>"
 
-#: builtin/receive-pack.c:833
+#: builtin/receive-pack.c:1276
 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"
@@ -16262,7 +18473,7 @@ msgid ""
 "'receive.denyCurrentBranch' configuration variable to 'refuse'."
 msgstr "По умолчанию, обновл�ть текущую ветку в репозитории � рабочей\nкопией (не голом) запрещено, так как �то �делает �о�то�ние индек�а\nи рабочего каталога противоречивым, и вам прийдет�� выполнить\n«git reset --hard», чтобы �о�то�ние рабочего каталога �нова\n�оответ�твовало HEAD.\n\nВы можете у�тановить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но �то не рекомендует��, е�ли только\nвы не намерены обновить его рабочий каталог �по�обом подобным\nвышеопи�анному.\n\nЧтобы пропу�тить �то �ообщение и в�е равно о�тавить поведение\nпо умолчанию, у�тановите значение опции «receive.denyCurrentBranch»\nв «refuse»."
 
-#: builtin/receive-pack.c:853
+#: builtin/receive-pack.c:1296
 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"
@@ -16274,11 +18485,11 @@ msgid ""
 "To squelch this message, you can set it to 'refuse'."
 msgstr "По умолчанию, удаление текущей ветки запрещено, так как по�ледующий\n«git clone» не �может получить никаких файлов, что приведет к путанице.\n\nВы можете у�тановить значение опции «receive.denyDeleteCurrent»\nв «warn» или «ignore», во внешнем репозитории,  чтобы разрешить\nудаление текущей ветки � или без предупреждающего �ообщени�.\n\nЧтобы пропу�тить �то �ообщение, вы можете у�тановить значение опции\nв «refuse»."
 
-#: builtin/receive-pack.c:1940
+#: builtin/receive-pack.c:2481
 msgid "quiet"
 msgstr "тихий режим"
 
-#: builtin/receive-pack.c:1954
+#: builtin/receive-pack.c:2495
 msgid "You must specify a directory."
 msgstr "Вы должны указать каталог."
 
@@ -16299,210 +18510,218 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr ""
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "«%s» не �вл�ет�� допу�тимой меткой даты/времени"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:606
 #, c-format
 msgid "Marking reachable objects..."
 msgstr ""
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:644
 #, c-format
 msgid "%s points nowhere!"
 msgstr ""
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:696
 msgid "no reflog specified to delete"
 msgstr ""
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:705
 #, c-format
 msgid "not a reflog: %s"
 msgstr ""
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:710
 #, c-format
 msgid "no reflog for '%s'"
 msgstr ""
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:756
 #, c-format
 msgid "invalid ref format: %s"
 msgstr ""
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:765
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr ""
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: 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 <ветка>] [-m <ма�тер-ветка>] [-f] [--tags | --no-tags] [--mirror=<fetch|push>] <им�> <адре�>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <�тарое-название> <новое-название>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <им�>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <им�> (-a | --auto | -d | --delete | <ветка>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <им�>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <им�>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<группа> | <им�-внешнего-репозитори�>)…]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <им�> <ветка>…"
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <им�>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <им�> <новый-url> [<�тарый-url>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <им�> <новый-url>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <им�> <url>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<опции>] <им�> <url>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <им�> <ветка>…"
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <им�> <ветка>…"
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<опции>] <им�>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<опции>] <им�>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<опции>] [<группа> | <им�-внешнего-репозитори�>]…"
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Обновление %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
 msgstr "ключ --mirror небезопа�ен и не рекомендует�� к и�пользованию;\nи�пользуйте вме�то него --mirror=fetch или --mirror=push"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "неизве�тный аргумент дл� mirror: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "извлечь внешние ветки"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "импортировать в�е метки и а��оциированные объекты при извлечении"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "или не извлекать метки вообще (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "от�леживаемые ветки"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "ма�тер ветка"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "на�троить внешний репозиторий как зеркало дл� отправки или извлечени� изменений"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "указание ма�тер ветки не имеет �мы�ла � параметром --mirror"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "указание от�леживаемых веток имеет �мы�л только при зеркальном извлечении"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr "внешний репозиторий %s уже �уще�твует"
 
-#: builtin/remote.c:198 builtin/remote.c:640
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "«%s» не �вл�ет�� допу�тимым именем внешнего репозитори�."
-
-#: builtin/remote.c:238
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "�е удало�ь на�троить ма�тер ветку «%s»"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:355
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "�е удало�ь извлечь карту дл� �пецификатора ��ылки %s"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr "(�оответ�твующа�)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:466
 msgid "(delete)"
 msgstr "(удаленна�)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr ""
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:946
 #, c-format
 msgid "No such remote: '%s'"
 msgstr ""
 
-#: builtin/remote.c:646
+#: builtin/remote.c:710
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "�е удало�ь переименовать �екцию конфигурации � «%s» на «%s»"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -16510,17 +18729,17 @@ msgid ""
 "\tPlease update the configuration manually if necessary."
 msgstr "�е обновл�ю не�тандартную �пецификатор ��ылки дл� извлечени�\n\t%s\n\tПожалуй�та, е�ли требует��, обновите конфигурацию вручную."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "не удало�ь удалить «%s»"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
 msgstr "не удало�ь �оздать «%s»"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -16532,148 +18751,148 @@ msgstr[1] "Примечание: �екоторые ветки вне иерар
 msgstr[2] "Примечание: �екоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, и�пользуйте:"
 msgstr[3] "Примечание: �екоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, и�пользуйте:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "�е удало�ь удалить �екцию файла конфигурации «%s»"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:999
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " нова� (�ледующее извлечение �охранит ее в remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " от�леживает��"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " недей�твительна (и�пользуйте «git remote prune», чтобы удалить)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переме�тить более чем над 1 веткой"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "перемещает�� интерактивно над внешней веткой %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1058
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr ""
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "перемещает�� над внешней веткой %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr " будет �лита � внешней веткой %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "будет �лита � внешней веткой %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    и � внешней веткой %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
 msgid "create"
 msgstr "�оздана"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr "удалена"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "уже актуальна"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
 msgstr "возможна перемотка вперед"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "локальна� ветка у�тарела"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s будет принудительно отправлена в %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s будет отправлена в %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s будет принудительно отправлена в %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s будет отправлена в %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr "не опрашивать внешние репозитории"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "* внешний репозиторий %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL дл� извлечени�: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr "(нет URL)"
 
 #. TRANSLATORS: the colon ':' should align
 #. with the one in " Fetch URL: %s"
 #. translation.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "    URL дл� отправки: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD ветка: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr "(не запрашивал��)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "(неизве�тно)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
 #, c-format
 msgid "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD ветка (HEAD внешнего репозитори� неоднозначный, может быть одним из):\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -16682,11 +18901,11 @@ msgstr[1] "  Внешние ветки:%s"
 msgstr[2] "  Внешние ветки:%s"
 msgstr[3] "  Внешние ветки:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr " (�тату� не запрашивал��)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  Локальна� ветка, на�троенна� дл� «git pull»:"
@@ -16694,11 +18913,11 @@ msgstr[1] "  Локальные ветки, на�троенные дл� «git
 msgstr[2] "  Локальные ветки, на�троенные дл� «git pull»:"
 msgstr[3] "  Локальные ветки, на�троенные дл� «git pull»:"
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr " Локальные ��ылки, зеркалируемые � помощью «git push»"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1303
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
@@ -16707,266 +18926,250 @@ msgstr[1] "  Локальные ��ылки, на�троенные дл� «gi
 msgstr[2] "  Локальные ��ылки, на�троенные дл� «git push»%s:"
 msgstr[3] "  Локальные ��ылки, на�троенные дл� «git push»%s:"
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "у�тановить refs/remotes/<им�>/HEAD в зави�имо�ти от внешнего репозитори�"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "удалить refs/remotes/<им�>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr "�е удало�ь определить внешний HEAD"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "�е�колько внешних HEAD веток. Укажите �вно одну из них:"
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr "�е удало�ь удалить %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�едопу�тима� ��ылка: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr "�е удало�ь на�троить %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s будет ви��щей веткой!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s �тала ви��щей веткой!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "Очи�тка %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [будет удалена] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [удалена] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr "почи�тить внешние репозитории по�ле извлечени�"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr "�ет такого внешнего репозитори� «%s»"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "добавить ветку"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr "не указан внешний репозиторий"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
 msgid "query push URLs rather than fetch URLs"
 msgstr "запро�ить URL отправки, вме�то URL извлечени�"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "вернуть в�е URL"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "URL не на�троены дл� внешнего репозитори� «%s»"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "управление URL отправки"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "добавить URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "удалить URL"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
 msgstr "--add нельз� и�пользовать одновременно � --delete"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "�еправильный шаблон �тарого URL: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
 msgstr "�е найдены �овпадени� URL: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
 msgstr "�ельз� удалить в�е URL не-отправки"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "быть много�ловнее; должно �то�ть перед подкомандой"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "�еизве�тна� подкоманда: %s"
-
-#: builtin/repack.c:22
+#: builtin/repack.c:25
 msgid "git repack [<options>]"
 msgstr "git repack [<опции>]"
 
-#: builtin/repack.c:27
+#: builtin/repack.c:30
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
 msgstr "Инкрементальные перепаковки не �овме�тимы � индек�ами в битовых картах.  И�пользуйте опцию --no-write-bitmap-index или отключите параметр конфигурации pack.writebitmaps."
 
-#: builtin/repack.c:200
+#: builtin/repack.c:197
 msgid "could not start pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:239 builtin/repack.c:414
+#: builtin/repack.c:268 builtin/repack.c:447
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr ""
 
-#: builtin/repack.c:256
+#: builtin/repack.c:295
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr ""
 
-#: builtin/repack.c:294
+#: builtin/repack.c:323
 msgid "pack everything in a single pack"
 msgstr "упаковать в�ё в один пакет"
 
-#: builtin/repack.c:296
+#: builtin/repack.c:325
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "тоже, что и -a, но дополнительно отбро�ить недо�тижимые объекты"
 
-#: builtin/repack.c:299
+#: builtin/repack.c:328
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "удалите лишние пакеты и запу�тите git-prune-packed"
 
-#: builtin/repack.c:301
+#: builtin/repack.c:330
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "передать опцию --no-reuse-delta в git-pack-objects"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:332
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "передать опцию --no-reuse-object в git-pack-objects"
 
-#: builtin/repack.c:305
+#: builtin/repack.c:334
 msgid "do not run git-update-server-info"
 msgstr "не запу�кать git-update-server-info"
 
-#: builtin/repack.c:308
+#: builtin/repack.c:337
 msgid "pass --local to git-pack-objects"
 msgstr "передать опцию --local в git-pack-objects"
 
-#: builtin/repack.c:310
+#: builtin/repack.c:339
 msgid "write bitmap index"
 msgstr "запи�ь индек�а в битовых картах"
 
-#: builtin/repack.c:312
+#: builtin/repack.c:341
 msgid "pass --delta-islands to git-pack-objects"
 msgstr ""
 
-#: builtin/repack.c:313
+#: builtin/repack.c:342
 msgid "approxidate"
 msgstr "примерна�-дата"
 
-#: builtin/repack.c:314
+#: builtin/repack.c:343
 msgid "with -A, do not loosen objects older than this"
 msgstr "� опцией -A, не отбра�ывать объекты �тарее, чем указано"
 
-#: builtin/repack.c:316
+#: builtin/repack.c:345
 msgid "with -a, repack unreachable objects"
 msgstr "� параметром -a, перепаковать недо�тупные объекты"
 
-#: builtin/repack.c:318
+#: builtin/repack.c:347
 msgid "size of the window used for delta compression"
 msgstr "размер окна, и�пользуемый дл� компре��ии дельт"
 
-#: builtin/repack.c:319 builtin/repack.c:325
+#: builtin/repack.c:348 builtin/repack.c:354
 msgid "bytes"
 msgstr "количе�тво-байт"
 
-#: builtin/repack.c:320
+#: builtin/repack.c:349
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "тоже, что и выше, но ограничить размер пам�ти, а не количе�тво запи�ей"
 
-#: builtin/repack.c:322
+#: builtin/repack.c:351
 msgid "limits the maximum delta depth"
 msgstr "ограничение на мак�имальную глубину дельт"
 
-#: builtin/repack.c:324
+#: builtin/repack.c:353
 msgid "limits the maximum number of threads"
 msgstr "ограничение на мак�имальное количе�тво потоков"
 
-#: builtin/repack.c:326
+#: builtin/repack.c:355
 msgid "maximum size of each packfile"
 msgstr "мак�имальный размер каждого из файлов пакета"
 
-#: builtin/repack.c:328
+#: builtin/repack.c:357
 msgid "repack objects in packs marked with .keep"
 msgstr "переупаковать объекты в пакеты, помеченные файлом .keep"
 
-#: builtin/repack.c:330
+#: builtin/repack.c:359
 msgid "do not repack this pack"
 msgstr ""
 
-#: builtin/repack.c:340
+#: builtin/repack.c:369
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "нельз� удал�ть пакеты в precious-objects репозитории"
 
-#: builtin/repack.c:344
+#: builtin/repack.c:373
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable и -A нельз� и�пользовать одновременно"
 
-#: builtin/repack.c:423
+#: builtin/repack.c:456
 msgid "Nothing new to pack."
 msgstr ""
 
-#: builtin/repack.c:484
+#: builtin/repack.c:486
 #, 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"
+msgid "missing required file: %s"
 msgstr ""
 
-#: builtin/repack.c:532
+#: builtin/repack.c:488
 #, c-format
-msgid "failed to remove '%s'"
-msgstr "�бой удалени� «%s»"
+msgid "could not unlink: %s"
+msgstr ""
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
@@ -17066,8 +19269,8 @@ msgstr ""
 msgid "unable to write object to database"
 msgstr ""
 
-#: builtin/replace.c:322 builtin/replace.c:377 builtin/replace.c:422
-#: builtin/replace.c:452
+#: 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 ""
@@ -17086,124 +19289,124 @@ msgstr ""
 msgid "new object is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:383
+#: builtin/replace.c:384
 #, c-format
 msgid "could not parse %s as a commit"
 msgstr ""
 
-#: builtin/replace.c:414
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "плоха� метка �ли�ни� в коммите «%s»"
 
-#: builtin/replace.c:416
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "повреждённа� метка �ли�ни� в коммите «%s»"
 
-#: builtin/replace.c:428
+#: builtin/replace.c:430
 #, 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:467
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr ""
 
-#: builtin/replace.c:468
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "подпи�ь будет удалена в замененном коммите!"
 
-#: builtin/replace.c:478
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "не удало�ь запи�ать замену дл� коммита: «%s»"
 
-#: builtin/replace.c:486
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr ""
 
-#: builtin/replace.c:490
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr ""
 
-#: builtin/replace.c:525
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
 "%s"
 msgstr ""
 
-#: builtin/replace.c:546
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "выве�ти �пи�ок замен�емых ��ылок"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "удаление замен�емых ��ылок"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "изменение �уще�твующего объекта"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "изменение родител� коммита"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr ""
 
-#: builtin/replace.c:551
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "замена ��ылки, е�ли она �уще�твует"
 
-#: builtin/replace.c:553
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "не делать �труктурированный вывод �одержимого дл� --edit"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "и�пользовать �тот формат"
 
-#: builtin/replace.c:567
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr ""
 
-#: builtin/replace.c:575
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr ""
 
-#: builtin/replace.c:579
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr ""
 
-#: builtin/replace.c:585
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:591
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr ""
 
-#: builtin/replace.c:597
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr ""
 
-#: builtin/replace.c:603
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr ""
 
-#: builtin/replace.c:609
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr ""
 
-#: builtin/replace.c:615
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr ""
 
@@ -17230,113 +19433,123 @@ msgid ""
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<коммит>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<указатель-дерева>] [--] <пути>…"
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr ""
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<указатель-дерева>] [--] [<пути>…]"
+msgid ""
+"git reset [-q] [--pathspec-from-file [--pathspec-file-nul]] [<tree-ish>]"
+msgstr ""
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr ""
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "�мешанный"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "м�гкий"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "же�ткий"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "�ли�нием"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "о�тавлением"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "У ва� нет верного HEAD."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "�е удало�ь найти дерево у HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "�е удало�ь найти дерево у %s."
 
-#: builtin/reset.c:193
+#: builtin/reset.c:116
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD �ейча� на %s"
+
+#: builtin/reset.c:195
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "�ельз� выполнить �бро� в режиме «%s» во врем� �ли�ни�."
 
-#: builtin/reset.c:293 builtin/stash.c:514 builtin/stash.c:589
-#: builtin/stash.c:613
+#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:594
+#: builtin/stash.c:618
 msgid "be quiet, only report errors"
 msgstr "тихий режим, выводить только ошибки"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "�бро�ить HEAD и индек�"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "�бро�ить только HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "�бро�ить HEAD, индек� и рабочий каталог"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "�бро�ить HEAD, но о�тавить локальные изменени�"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 msgid "record only the fact that removed paths will be added later"
 msgstr "запи�ать только факт того, что удаленные пути будут добавлены позже"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:344
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "�е удало�ь ра�познать «%s» как дей�твительную редакцию."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:352
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "�е удало�ь ра�познать «%s» как дей�твительное дерево."
 
-#: builtin/reset.c:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch нельз� и�пользовать одновременно � --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "и�пользование опции --mixed � пут�ми у�тарело; и�пользуйте «git reset -- <пути>» instead."
 
-#: builtin/reset.c:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�ельз� выполнить �бро� в режиме «%s» вме�те � указанием пути."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "�бро� «%s» разрешен только � голым репозиторием"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
 msgstr "-N можно и�пользовать вме�те � --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "�епроиндек�ированные изменени� по�ле �бро�а:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:416
 #, c-format
 msgid ""
 "\n"
@@ -17345,53 +19558,48 @@ msgid ""
 "to make this the default.\n"
 msgstr ""
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "�е удало�ь �бро�ить файл индек�а на редакцию «%s»."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "�е удало�ь запи�ать новый файл индек�а."
 
-#: builtin/rev-list.c:405
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr ""
 
-#: builtin/rev-list.c:466
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "фильтраци� объектов требует указани� параметра --objects"
 
-#: builtin/rev-list.c:469
-#, c-format
-msgid "invalid sparse value '%s'"
-msgstr "недопу�тимое ча�тичное значение «%s»"
-
-#: builtin/rev-list.c:510
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list не поддерживает отображение заметок"
 
-#: builtin/rev-list.c:513
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "нельз� и�пользовать --use-bitmap-index одновременно � фильтрацией объектов"
+#: builtin/rev-list.c:615
+msgid "marked counting is incompatible with --objects"
+msgstr ""
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "передавать далее «--» как аргумент"
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "о�тановить разбор по�ле первого аргумента не �вл�ющего�� опцией"
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "выводить аргументы в длинном формате"
 
-#: builtin/rev-parse.c:551
+#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -17438,47 +19646,51 @@ msgstr "продолжить по�ледовательно�ть копиров
 msgid "cancel revert or cherry-pick sequence"
 msgstr "отмена по�ледовательно�ти копировани� или обращени� изменений коммитов"
 
-#: builtin/revert.c:106
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr ""
+
+#: builtin/revert.c:107
 msgid "don't automatically commit"
 msgstr "не коммитить автоматиче�ки"
 
-#: builtin/revert.c:107
+#: builtin/revert.c:108
 msgid "edit the commit message"
 msgstr "изменить �ообщение коммита"
 
-#: builtin/revert.c:110
+#: builtin/revert.c:111
 msgid "parent-number"
 msgstr "номер-родител�"
 
-#: builtin/revert.c:111
+#: builtin/revert.c:112
 msgid "select mainline parent"
 msgstr "выбор о�новного родител�"
 
-#: builtin/revert.c:113
+#: builtin/revert.c:114
 msgid "merge strategy"
 msgstr "�тратеги� �ли�ни�"
 
-#: builtin/revert.c:115
+#: builtin/revert.c:116
 msgid "option for merge strategy"
 msgstr "опци� дл� �тратегии �ли�ни�"
 
-#: builtin/revert.c:124
+#: builtin/revert.c:125
 msgid "append commit name"
 msgstr "добавить им� коммита"
 
-#: builtin/revert.c:126
+#: builtin/revert.c:127
 msgid "preserve initially empty commits"
 msgstr "�охранить изначально пу�тые коммиты"
 
-#: builtin/revert.c:128
+#: builtin/revert.c:129
 msgid "keep redundant, empty commits"
 msgstr "о�тавить избыточные, пу�тые коммиты"
 
-#: builtin/revert.c:227
+#: builtin/revert.c:239
 msgid "revert failed"
 msgstr "�бой обращени� изменений коммита"
 
-#: builtin/revert.c:240
+#: builtin/revert.c:252
 msgid "cherry-pick failed"
 msgstr "�бой при копировании коммита"
 
@@ -17526,36 +19738,40 @@ msgstr[1] "Ñ�ледующие файлы Ñ�одержат локальные иÐ
 msgstr[2] "�ледующие файлы �одержат локальные изменени�:"
 msgstr[3] "�ледующие файлы �одержат локальные изменени�:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "не выводить �пи�ок удаленных файлов"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "удалить только из индек�а"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "пропу�тить проверку актуально�ти"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "разрешить рекур�ивное удаление"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "выход � нулевым кодом возврата, даже е�ли ничего не найдено"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:282
+msgid "No pathspec was given. Which files should I remove?"
+msgstr ""
+
+#: builtin/rm.c:305
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr ""
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "не удал�ю рекур�ивно «%s» без указани� опции -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: не удало�ь удалить %s"
@@ -17566,55 +19782,76 @@ msgid ""
 "  --all and explicit <ref> specification are mutually exclusive."
 msgstr "git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [--atomic] [<�ервер>:]<каталог> [<��ылка>…]\n  --all и �вный �пецификатор <��ылки> взаимно и�ключающие."
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr "им� внешнего репозитори�"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "протокол без �охранени� �о�то�ни� дл� RPC"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "прочитать ��ылки из �тандартного ввода"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr "выве�ти �тату� от �крипта внешнего �ервера"
 
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
 
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<опции>]"
 
-#: builtin/shortlog.c:264
+#: builtin/shortlog.c:135
+msgid "using multiple --group options with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:145
+msgid "using --group=trailer with stdin is not supported"
+msgstr ""
+
+#: builtin/shortlog.c:335
+#, c-format
+msgid "unknown group type: %s"
+msgstr ""
+
+#: builtin/shortlog.c:363
 msgid "Group by committer rather than author"
 msgstr "Группировать по коммитеру, а не по автору"
 
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:366
 msgid "sort output according to the number of commits per author"
 msgstr "от�ортировать вывод по количе�тву коммитов у автора"
 
-#: builtin/shortlog.c:268
+#: builtin/shortlog.c:368
 msgid "Suppress commit descriptions, only provides commit count"
 msgstr "�е выводить опи�ани� коммитов, а только их количе�тво"
 
-#: builtin/shortlog.c:270
+#: builtin/shortlog.c:370
 msgid "Show the email address of each author"
 msgstr "Показать почту каждого из авторов"
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:371
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:272
+#: builtin/shortlog.c:372
 msgid "Linewrap output"
 msgstr "Перено� �трок на выводе"
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:374
+msgid "field"
+msgstr ""
+
+#: builtin/shortlog.c:375
+msgid "Group by field"
+msgstr ""
+
+#: builtin/shortlog.c:403
 msgid "too many arguments given outside repository"
 msgstr ""
 
@@ -17639,90 +19876,90 @@ msgstr[1] "игнорирование %s; невозможно обработаÑ
 msgstr[2] "игнорирование %s; невозможно обработать больше %d ��ылок"
 msgstr[3] "игнорирование %s; невозможно обработать больше %d ��ылки"
 
-#: builtin/show-branch.c:549
+#: builtin/show-branch.c:548
 #, c-format
 msgid "no matching refs with %s"
 msgstr "нет �овпадающих запи�ей � %s"
 
-#: builtin/show-branch.c:646
+#: builtin/show-branch.c:645
 msgid "show remote-tracking and local branches"
 msgstr "показать �пи�ок и от�леживаемых внешних и локальных веток"
 
-#: builtin/show-branch.c:648
+#: builtin/show-branch.c:647
 msgid "show remote-tracking branches"
 msgstr "показать �пи�ок от�леживаемых внешних веток"
 
-#: builtin/show-branch.c:650
+#: builtin/show-branch.c:649
 msgid "color '*!+-' corresponding to the branch"
 msgstr "окрашивать «*!+-» в �оответ�твии � веткой"
 
-#: builtin/show-branch.c:652
+#: builtin/show-branch.c:651
 msgid "show <n> more commits after the common ancestor"
 msgstr "показать <n> коммитов по�ле общего предка"
 
-#: builtin/show-branch.c:654
+#: builtin/show-branch.c:653
 msgid "synonym to more=-1"
 msgstr "�иноним дл� more=-1"
 
-#: builtin/show-branch.c:655
+#: builtin/show-branch.c:654
 msgid "suppress naming strings"
 msgstr "не выводить именованные �троки"
 
-#: builtin/show-branch.c:657
+#: builtin/show-branch.c:656
 msgid "include the current branch"
 msgstr "включить в вывод текущую ветку"
 
-#: builtin/show-branch.c:659
+#: builtin/show-branch.c:658
 msgid "name commits with their object names"
 msgstr "именовать коммиты их именами объектов"
 
-#: builtin/show-branch.c:661
+#: builtin/show-branch.c:660
 msgid "show possible merge bases"
 msgstr "выве�ти возможные базы �ли�ни�"
 
-#: builtin/show-branch.c:663
+#: builtin/show-branch.c:662
 msgid "show refs unreachable from any other ref"
 msgstr "выве�ти ��ылки, недо�тупные из любых других ��ылок"
 
-#: builtin/show-branch.c:665
+#: builtin/show-branch.c:664
 msgid "show commits in topological order"
 msgstr "выве�ти коммиты в топологиче�ком пор�дке"
 
-#: builtin/show-branch.c:668
+#: builtin/show-branch.c:667
 msgid "show only commits not on the first branch"
 msgstr "выве�ти только коммиты, от�ут�твующие в первой ветке"
 
-#: builtin/show-branch.c:670
+#: builtin/show-branch.c:669
 msgid "show merges reachable from only one tip"
 msgstr "выве�ти �ли�ни�, до�тижимые только из одной из верхушек"
 
-#: builtin/show-branch.c:672
+#: builtin/show-branch.c:671
 msgid "topologically sort, maintaining date order where possible"
 msgstr "топологиче�ка� �ортировка, � �охранением пор�дка дат, е�ли возможно"
 
-#: builtin/show-branch.c:675
+#: builtin/show-branch.c:674
 msgid "<n>[,<base>]"
 msgstr "<n>[,<база>]"
 
-#: builtin/show-branch.c:676
+#: builtin/show-branch.c:675
 msgid "show <n> most recent ref-log entries starting at base"
 msgstr "показать <n> по�ледних запи�ей в журнале ��ылок, начина� � базы"
 
-#: builtin/show-branch.c:712
+#: 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:736
+#: builtin/show-branch.c:735
 msgid "no branches given, and HEAD is not valid"
 msgstr "не указаны ветки и HEAD не дей�твительный"
 
-#: builtin/show-branch.c:739
+#: builtin/show-branch.c:738
 msgid "--reflog option needs one branch name"
 msgstr "параметр --reflog требует указани� имени одной ветки"
 
-#: builtin/show-branch.c:742
+#: builtin/show-branch.c:741
 #, c-format
 msgid "only %d entry can be shown at one time."
 msgid_plural "only %d entries can be shown at one time."
@@ -17731,12 +19968,12 @@ msgstr[1] "только %d запиÑ�и могут быть показаны оÐ
 msgstr[2] "только %d запи�ей могут быть показаны одновременно."
 msgstr[3] "только %d запи�и могут быть показаны одновременно."
 
-#: builtin/show-branch.c:746
+#: builtin/show-branch.c:745
 #, c-format
 msgid "no such ref %s"
 msgstr "нет такой ��ылки %s"
 
-#: builtin/show-branch.c:832
+#: builtin/show-branch.c:831
 #, c-format
 msgid "cannot handle more than %d rev."
 msgid_plural "cannot handle more than %d revs."
@@ -17745,16 +19982,24 @@ msgstr[1] "невозможно обработать больше %d редакÑ
 msgstr[2] "невозможно обработать больше %d редакций."
 msgstr[3] "невозможно обработать больше %d редакции."
 
-#: builtin/show-branch.c:836
+#: builtin/show-branch.c:835
 #, c-format
 msgid "'%s' is not a valid ref."
 msgstr "«%s» не �вл�ет�� допу�тимой ��ылкой на коммит."
 
-#: builtin/show-branch.c:839
+#: builtin/show-branch.c:838
 #, c-format
 msgid "cannot find commit %s (%s)"
 msgstr "не удало�ь найти коммит %s (%s)"
 
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr ""
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr ""
+
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | "
@@ -17787,7 +20032,7 @@ msgstr "разыменовать метки в идентификаторы об
 
 #: builtin/show-ref.c:173
 msgid "only show SHA1 hash using <n> digits"
-msgstr "и�пользовать <n> �имволов дл� вывода SHA-1 хеш-�уммы"
+msgstr "и�пользовать <n> �имволов дл� вывода х�ш-кода SHA-1"
 
 #: builtin/show-ref.c:177
 msgid "do not print results to stdout (useful with --verify)"
@@ -17797,15 +20042,86 @@ msgstr "не печатать результат на Ñ�тандартный вÑ
 msgid "show refs from stdin that aren't in local repository"
 msgstr "выве�ти ��ылки �о �тандартного ввода, которых нет в локальном репозитории"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: builtin/sparse-checkout.c:21
+msgid "git sparse-checkout (init|list|set|add|reapply|disable) <options>"
+msgstr ""
+
+#: builtin/sparse-checkout.c:50
+msgid "git sparse-checkout list"
+msgstr ""
+
+#: builtin/sparse-checkout.c:76
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:228
+msgid "failed to create directory for sparse-checkout file"
+msgstr ""
+
+#: builtin/sparse-checkout.c:269
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr ""
+
+#: builtin/sparse-checkout.c:271
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr ""
+
+#: builtin/sparse-checkout.c:288
+msgid "git sparse-checkout init [--cone]"
+msgstr ""
+
+#: builtin/sparse-checkout.c:307
+msgid "initialize the sparse-checkout in cone mode"
+msgstr ""
+
+#: builtin/sparse-checkout.c:344
+#, c-format
+msgid "failed to open '%s'"
+msgstr "не удало�ь открыть «%s»"
+
+#: builtin/sparse-checkout.c:401
+#, c-format
+msgid "could not normalize path %s"
+msgstr ""
+
+#: builtin/sparse-checkout.c:413
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr ""
+
+#: builtin/sparse-checkout.c:438
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr ""
+
+#: builtin/sparse-checkout.c:492 builtin/sparse-checkout.c:516
+msgid "unable to load existing sparse-checkout patterns"
+msgstr ""
+
+#: builtin/sparse-checkout.c:561
+msgid "read patterns from standard in"
+msgstr ""
+
+#: builtin/sparse-checkout.c:576
+msgid "git sparse-checkout reapply"
+msgstr ""
+
+#: builtin/sparse-checkout.c:595
+msgid "git sparse-checkout disable"
+msgstr ""
+
+#: builtin/sparse-checkout.c:623
+msgid "error while refreshing working directory"
+msgstr ""
+
+#: builtin/stash.c:22 builtin/stash.c:38
 msgid "git stash list [<options>]"
 msgstr "git stash list [<опции>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:23 builtin/stash.c:43
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<опциии>] [<�пр�танные-изменени�>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:24 builtin/stash.c:48
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<�пр�танные-изменени�>]"
 
@@ -17813,209 +20129,217 @@ msgstr "git stash drop [-q|--quiet] [<�пр�танные-изменени�>]"
 msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<�пр�танные-изменени�>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:26 builtin/stash.c:63
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <им�-ветки> [<�пр�танные-изменени�>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
+#: builtin/stash.c:27 builtin/stash.c:68
 msgid "git stash clear"
 msgstr "git stash clear"
 
-#: builtin/stash.c:28 builtin/stash.c:77
+#: builtin/stash.c:28
 msgid ""
 "git stash [push [-p|--patch] [-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 <�ообщение>]\n          [--] [<�пецификатор-пути>…]]"
+msgstr ""
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: builtin/stash.c:32 builtin/stash.c:85
 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:52
+#: builtin/stash.c:53
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<�пр�танные-изменени�>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:58
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<�пр�танные-изменени�>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:73
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <�ообщение>] [-q|--quiet] <коммит>"
 
-#: builtin/stash.c:127
+#: builtin/stash.c:78
+msgid ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <message>]\n"
+"          [--] [<pathspec>...]]"
+msgstr "git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n          [-u|--include-untracked] [-a|--all] [-m|--message <�ообщение>]\n          [--] [<�пецификатор-пути>…]]"
+
+#: builtin/stash.c:128
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "«%s» не �вл�ет�� коммитом �о �пр�танными изменени�ми"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:148
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Передано �лишком много редакций:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162
 msgid "No stash entries found."
 msgstr "�е найдены �пр�танные изменени�."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:176
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s не �вл�ет�� допу�тимой ��ылкой на коммит"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash очи�тка � параметрами не реализована"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:404
 msgid "cannot apply a stash in the middle of a merge"
 msgstr "нельз� применить �пр�танные изменени� во врем� выполнени� �ли�ни�"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:415
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "не удало�ь �генерировать �пи�ок изменений %s^!."
 
-#: builtin/stash.c:421
-msgid "conflicts in index.Try without --index."
-msgstr "конфликты в индек�е. Попробуйте без --index."
+#: builtin/stash.c:422
+msgid "conflicts in index. Try without --index."
+msgstr ""
 
-#: builtin/stash.c:427
+#: builtin/stash.c:428
 msgid "could not save index tree"
 msgstr "не удало�ь �охранить дерево индек�а"
 
-#: builtin/stash.c:434
+#: builtin/stash.c:437
 msgid "could not restore untracked files from stash"
 msgstr "невозможно во��тановить неот�леживаемые файлы из �пр�танных файлов"
 
-#: builtin/stash.c:448
+#: builtin/stash.c:451
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Сли�ние %s и %s"
 
-#: builtin/stash.c:458 git-legacy-stash.sh:680
+#: builtin/stash.c:461
 msgid "Index was not unstashed."
 msgstr "Индек� не был извлечён из �пр�танных изменений."
 
-#: builtin/stash.c:516 builtin/stash.c:615
+#: builtin/stash.c:522 builtin/stash.c:620
 msgid "attempt to recreate the index"
 msgstr "попытка пере�оздани� индек�а"
 
-#: builtin/stash.c:549
+#: builtin/stash.c:566
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Отброшено %s (%s)"
 
-#: builtin/stash.c:552
+#: builtin/stash.c:569
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: �е удало�ь отбро�ить запи�ь из �пр�танных изменений"
 
-#: builtin/stash.c:577
+#: builtin/stash.c:582
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "«%s» не �вл�ет�� ��ылкой на �пр�танные изменени�"
 
-#: builtin/stash.c:627 git-legacy-stash.sh:694
+#: builtin/stash.c:632
 msgid "The stash entry is kept in case you need it again."
 msgstr "Спр�танные изменени� �охранены, на �лучай е�ли они �нова вам понадоб�т��."
 
-#: builtin/stash.c:650 git-legacy-stash.sh:712
+#: builtin/stash.c:655
 msgid "No branch name specified"
 msgstr "�е указано им� ветки"
 
-#: builtin/stash.c:789 builtin/stash.c:826
+#: builtin/stash.c:799 builtin/stash.c:836
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "�е удоло�ь обновить %s � %s"
 
-#: builtin/stash.c:807 builtin/stash.c:1474 builtin/stash.c:1510
+#: builtin/stash.c:817 builtin/stash.c:1471 builtin/stash.c:1536
 msgid "stash message"
 msgstr "опи�ание �пр�танных изменений"
 
-#: builtin/stash.c:817
+#: builtin/stash.c:827
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "«git stash store» требует указани� одного аргумента <коммит>"
 
-#: builtin/stash.c:1039 git-legacy-stash.sh:217
+#: builtin/stash.c:1042
 msgid "No changes selected"
 msgstr "Изменени� не выбраны"
 
-#: builtin/stash.c:1135 git-legacy-stash.sh:150
+#: builtin/stash.c:1142
 msgid "You do not have the initial commit yet"
 msgstr "У ва� еще нет начального коммита"
 
-#: builtin/stash.c:1162 git-legacy-stash.sh:165
+#: builtin/stash.c:1169
 msgid "Cannot save the current index state"
 msgstr "�е удало�ь �охранить текущее �о�то�ние индек�а"
 
-#: builtin/stash.c:1171 git-legacy-stash.sh:180
+#: builtin/stash.c:1178
 msgid "Cannot save the untracked files"
 msgstr "�евозможно �охранить неот�леживаемые файлы"
 
-#: builtin/stash.c:1182 builtin/stash.c:1191 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1189 builtin/stash.c:1198
 msgid "Cannot save the current worktree state"
 msgstr "�е удало�ь �охранить текущее �о�то�ние рабочего каталога"
 
-#: builtin/stash.c:1219 git-legacy-stash.sh:233
+#: builtin/stash.c:1226
 msgid "Cannot record working tree state"
 msgstr "�е удало�ь запи�ать �о�то�ние рабочего каталога"
 
-#: builtin/stash.c:1268 git-legacy-stash.sh:337
+#: builtin/stash.c:1275
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "�ельз� и�пользовать --patch и --include-untracked или --all одновременно"
 
-#: builtin/stash.c:1284
+#: builtin/stash.c:1291
 msgid "Did you forget to 'git add'?"
 msgstr "Возможно, вы забыли выполнить «git add»?"
 
-#: builtin/stash.c:1299 git-legacy-stash.sh:345
+#: builtin/stash.c:1306
 msgid "No local changes to save"
 msgstr "�ет локальных изменений дл� �охранени�"
 
-#: builtin/stash.c:1306 git-legacy-stash.sh:350
+#: builtin/stash.c:1313
 msgid "Cannot initialize stash"
 msgstr "�е удало�ь инициализировать �пр�танные изменени�"
 
-#: builtin/stash.c:1321 git-legacy-stash.sh:354
+#: builtin/stash.c:1328
 msgid "Cannot save the current status"
 msgstr "�е удало�ь �охранить текущий �тату�"
 
-#: builtin/stash.c:1326
+#: builtin/stash.c:1333
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Рабочий каталог и �о�то�ние индек�а �охранены %s"
 
-#: builtin/stash.c:1430 git-legacy-stash.sh:384
+#: builtin/stash.c:1423
 msgid "Cannot remove worktree changes"
 msgstr "�е удало�ь удалить изменени� рабочего каталога"
 
-#: builtin/stash.c:1465 builtin/stash.c:1501
+#: builtin/stash.c:1462 builtin/stash.c:1527
 msgid "keep index"
 msgstr ""
 
-#: builtin/stash.c:1467 builtin/stash.c:1503
+#: builtin/stash.c:1464 builtin/stash.c:1529
 msgid "stash in patch mode"
 msgstr ""
 
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1465 builtin/stash.c:1530
 msgid "quiet mode"
 msgstr ""
 
-#: builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:1467 builtin/stash.c:1532
 msgid "include untracked files in stash"
 msgstr ""
 
-#: builtin/stash.c:1472 builtin/stash.c:1508
+#: builtin/stash.c:1469 builtin/stash.c:1534
 msgid "include ignore files"
 msgstr ""
 
-#: builtin/stash.c:1568
-#, c-format
-msgid "could not exec %s"
+#: builtin/stash.c:1569
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
 msgstr ""
 
 #: builtin/stripspace.c:18
@@ -18034,393 +20358,502 @@ msgstr "пропу�тить и удалить в�е �троки, начина
 msgid "prepend comment character and space to each line"
 msgstr "добавить перед каждой �трокой �имвол комметари� и пробел"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1942
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:2423
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Ожидало�ь полное им� ��ылки, а получено %s"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr ""
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "не удало�ь обрезать один компонент url «%s»"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1367
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1819
 msgid "alternative anchor for relative paths"
 msgstr "альтернативный �имвол дл� отно�ительных путей"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:627
-#: builtin/submodule--helper.c:650
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:629
+#: builtin/submodule--helper.c:652
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "URL дл� подмодул� по пути «%s» не найден в .gitmodules"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:524
 #, c-format
 msgid "Entering '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:527
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:546
+#: builtin/submodule--helper.c:549
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested submodules of %s\n"
 "."
 msgstr ""
 
-#: builtin/submodule--helper.c:562
+#: builtin/submodule--helper.c:565
 msgid "Suppress output of entering each submodule command"
 msgstr ""
 
-#: builtin/submodule--helper.c:564 builtin/submodule--helper.c:1049
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1487
 msgid "Recurse into nested submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:569
+#: builtin/submodule--helper.c:572
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr ""
 
-#: builtin/submodule--helper.c:596
+#: builtin/submodule--helper.c:599
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr ""
 
-#: builtin/submodule--helper.c:664
+#: builtin/submodule--helper.c:666
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "Сбой реги�трации адре�а дл� пути подмодул� «%s»"
 
-#: builtin/submodule--helper.c:668
+#: builtin/submodule--helper.c:670
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "Подмодуль «%s» (%s) зареги�трирован по пути «%s»\n"
 
-#: builtin/submodule--helper.c:678
+#: builtin/submodule--helper.c:680
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "внимание: предполагаемый режим обновлени� дл� подмодул� «%s»\n"
 
-#: builtin/submodule--helper.c:685
+#: builtin/submodule--helper.c:687
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "Сбой реги�трации режима обновлени� дл� пути подмодул� «%s»"
 
-#: builtin/submodule--helper.c:707
+#: builtin/submodule--helper.c:709
 msgid "Suppress output for initializing a submodule"
 msgstr "�е выводить информацию о инициализации подмодул�"
 
-#: builtin/submodule--helper.c:712
+#: builtin/submodule--helper.c:714
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr ""
 
-#: builtin/submodule--helper.c:784 builtin/submodule--helper.c:910
+#: builtin/submodule--helper.c:787 builtin/submodule--helper.c:922
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "не найдено �оответ�твие подмодулей в .gitmodules дл� пути «%s»"
 
-#: builtin/submodule--helper.c:823
+#: builtin/submodule--helper.c:835
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "не удало�ь найти HEAD ��ылку внутри подмодул� «%s»"
 
-#: builtin/submodule--helper.c:850 builtin/submodule--helper.c:1019
+#: builtin/submodule--helper.c:862 builtin/submodule--helper.c:1457
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "не удало�ь перейти вглубь подмодул� «%s»"
 
-#: builtin/submodule--helper.c:874 builtin/submodule--helper.c:1185
+#: builtin/submodule--helper.c:886 builtin/submodule--helper.c:1623
 msgid "Suppress submodule status output"
 msgstr "�е выводить �тату� подмодул�"
 
-#: builtin/submodule--helper.c:875
+#: builtin/submodule--helper.c:887
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr "И�пользовать коммит хран�щий�� в индек�е вме�то коммита хран�щего�� в HEAD подмодул�"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:888
 msgid "recurse into nested submodules"
 msgstr "проходить вглубь вложенных подмодулей"
 
-#: builtin/submodule--helper.c:881
+#: builtin/submodule--helper.c:893
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<путь>…]"
 
-#: builtin/submodule--helper.c:905
+#: builtin/submodule--helper.c:917
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <путь>"
 
-#: builtin/submodule--helper.c:969
+#: builtin/submodule--helper.c:989
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr ""
+
+#: builtin/submodule--helper.c:992
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr ""
+
+#: builtin/submodule--helper.c:1005
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: builtin/submodule--helper.c:1055
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1059
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr ""
+
+#: builtin/submodule--helper.c:1300
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:1302
+msgid "to compare the commit in the index with that in the submodule HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:1304
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1306
+msgid "limit the summary size"
+msgstr ""
+
+#: builtin/submodule--helper.c:1311
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr ""
+
+#: builtin/submodule--helper.c:1335
+msgid "could not fetch a revision for HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:1340
+msgid "--cached and --files are mutually exclusive"
+msgstr ""
+
+#: builtin/submodule--helper.c:1407
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:975
+#: builtin/submodule--helper.c:1413
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:989
+#: builtin/submodule--helper.c:1427
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1000
+#: builtin/submodule--helper.c:1438
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1047
+#: builtin/submodule--helper.c:1485
 msgid "Suppress output of synchronizing submodule url"
 msgstr ""
 
-#: builtin/submodule--helper.c:1054
+#: builtin/submodule--helper.c:1492
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<путь>]"
 
-#: builtin/submodule--helper.c:1108
+#: builtin/submodule--helper.c:1546
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
 "really want to remove it including all of its history)"
 msgstr ""
 
-#: builtin/submodule--helper.c:1120
+#: builtin/submodule--helper.c:1558
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr ""
 
-#: builtin/submodule--helper.c:1128
+#: builtin/submodule--helper.c:1566
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1130
+#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1141
+#: builtin/submodule--helper.c:1579
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr ""
 
-#: builtin/submodule--helper.c:1157
+#: builtin/submodule--helper.c:1595
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr ""
 
-#: builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:1624
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr ""
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1625
 msgid "Unregister all submodules"
 msgstr ""
 
-#: builtin/submodule--helper.c:1192
+#: builtin/submodule--helper.c:1630
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<путь>…]]"
 
-#: builtin/submodule--helper.c:1206
+#: builtin/submodule--helper.c:1644
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "И�пользуйте «--all», е�ли вы дей�твительно хотите деинициализировать в�е подмодули"
 
-#: builtin/submodule--helper.c:1301 builtin/submodule--helper.c:1304
+#: builtin/submodule--helper.c:1713
+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 ""
+
+#: builtin/submodule--helper.c:1752 builtin/submodule--helper.c:1755
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "подмодулю «%s» не удало�ь добавить альтернативу: %s"
 
-#: builtin/submodule--helper.c:1340
+#: builtin/submodule--helper.c:1791
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "Значение «%s» дл� параметра submodule.alternateErrorStrategy не рапознано"
 
-#: builtin/submodule--helper.c:1347
+#: builtin/submodule--helper.c:1798
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "Значение «%s» дл� параметра submodule.alternateLocation не рапознано"
 
-#: builtin/submodule--helper.c:1370
+#: builtin/submodule--helper.c:1822
 msgid "where the new submodule will be cloned to"
 msgstr "куда должен быть �клонирован новый подмодуль"
 
-#: builtin/submodule--helper.c:1373
+#: builtin/submodule--helper.c:1825
 msgid "name of the new submodule"
 msgstr "им� нового подмодул�"
 
-#: builtin/submodule--helper.c:1376
+#: builtin/submodule--helper.c:1828
 msgid "url where to clone the submodule from"
 msgstr "url откуда должен был �клонирован новый подмодуль"
 
-#: builtin/submodule--helper.c:1384
+#: builtin/submodule--helper.c:1836
 msgid "depth for shallow clones"
 msgstr "глубина дл� ча�тичного клона"
 
-#: builtin/submodule--helper.c:1387 builtin/submodule--helper.c:1871
+#: builtin/submodule--helper.c:1839 builtin/submodule--helper.c:2348
 msgid "force cloning progress"
 msgstr "принудительно выводить прогре�� клонировани�"
 
-#: builtin/submodule--helper.c:1392
+#: builtin/submodule--helper.c:1841 builtin/submodule--helper.c:2350
+msgid "disallow cloning into non-empty directory"
+msgstr ""
+
+#: builtin/submodule--helper.c:1848
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
-msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <им�>] [--depth <глубина>] --url <url> --path <путь>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:1873
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr ""
 
-#: builtin/submodule--helper.c:1423
+#: builtin/submodule--helper.c:1884
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "не удало�ь клонировать «%s» в подмодуль по пути «%s»"
 
-#: builtin/submodule--helper.c:1437
+#: builtin/submodule--helper.c:1888
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:1900
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "не удало�ь получить каталог дл� подмодул� «%s»"
 
-#: builtin/submodule--helper.c:1473
+#: builtin/submodule--helper.c:1936
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1477
+#: builtin/submodule--helper.c:1940
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:1570
+#: builtin/submodule--helper.c:2041
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Подмодуль по пути «%s» не инициализирован"
 
-#: builtin/submodule--helper.c:1574
+#: builtin/submodule--helper.c:2045
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Возможно, вы хотели и�пользовать «update --init»?"
 
-#: builtin/submodule--helper.c:1604
+#: builtin/submodule--helper.c:2075
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Пропу�к не �литого подмодул� %s"
 
-#: builtin/submodule--helper.c:1633
+#: builtin/submodule--helper.c:2104
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Пропу�к подмодул� «%s»"
 
-#: builtin/submodule--helper.c:1777
+#: builtin/submodule--helper.c:2254
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "�е удало�ь клонировать «%s». Запланирована повторна� попытка"
 
-#: builtin/submodule--helper.c:1788
+#: builtin/submodule--helper.c:2265
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "�е удало�ь клонировать «%s» �о второй попытки, отмена"
 
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:2092
+#: builtin/submodule--helper.c:2327 builtin/submodule--helper.c:2573
 msgid "path into the working tree"
 msgstr "путь в рабочем каталоге"
 
-#: builtin/submodule--helper.c:1853
+#: builtin/submodule--helper.c:2330
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "путь в рабочем каталоге, в пределах границ подмодул�"
 
-#: builtin/submodule--helper.c:1857
+#: builtin/submodule--helper.c:2334
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout или none"
 
-#: builtin/submodule--helper.c:1863
+#: builtin/submodule--helper.c:2340
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "Создать ча�тичный клон, ограниченный указанным количе�твом редакций"
 
-#: builtin/submodule--helper.c:1866
+#: builtin/submodule--helper.c:2343
 msgid "parallel jobs"
 msgstr "параллельные задачи"
 
-#: builtin/submodule--helper.c:1868
+#: builtin/submodule--helper.c:2345
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "должен ли изначальный проце�� клонировани� �ледовать рекомендации о ча�тично�ти"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2346
 msgid "don't print cloning progress"
 msgstr "вы выводить прогре�� клонировани�"
 
-#: builtin/submodule--helper.c:1876
-msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
-msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]"
+#: builtin/submodule--helper.c:2357
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr ""
 
-#: builtin/submodule--helper.c:1889
+#: builtin/submodule--helper.c:2370
 msgid "bad value for update parameter"
 msgstr "плохое значение дл� параметра update"
 
-#: builtin/submodule--helper.c:1937
+#: builtin/submodule--helper.c:2418
 #, 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:2060
+#: builtin/submodule--helper.c:2541
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr ""
 
-#: builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2574
 msgid "recurse into submodules"
 msgstr "рекур�ивно по подмодул�м"
 
-#: builtin/submodule--helper.c:2099
+#: builtin/submodule--helper.c:2580
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<опции>] [<путь>…]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2636
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2639
 msgid "unset the config in the .gitmodules file"
 msgstr ""
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2644
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <им�> [<значение>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2645
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <им�>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2646
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: builtin/submodule--helper.c:2665 git-submodule.sh:150
 #, sh-format
 msgid "please make sure that the .gitmodules file is in the working tree"
 msgstr ""
 
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:685
+#: builtin/submodule--helper.c:2681
+msgid "Suppress output for setting url of a submodule"
+msgstr ""
+
+#: builtin/submodule--helper.c:2685
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2718
+msgid "set the default tracking branch to master"
+msgstr ""
+
+#: builtin/submodule--helper.c:2720
+msgid "set the default tracking branch"
+msgstr ""
+
+#: builtin/submodule--helper.c:2724
+msgid "git submodule--helper set-branch [-q|--quiet] (-d|--default) <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2725
+msgid ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:2732
+msgid "--branch or --default required"
+msgstr ""
+
+#: builtin/submodule--helper.c:2735
+msgid "--branch and --default are mutually exclusive"
+msgstr ""
+
+#: builtin/submodule--helper.c:2792 git.c:438 git.c:711
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s не поддерживает параметр --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2798
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "«%s» не �вл�ет�� подкомандой submodule--helper"
@@ -18445,11 +20878,11 @@ msgstr "удалить �имвольные ��ылки"
 msgid "shorten ref output"
 msgstr "укороченный вывод ��ылок"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
 msgid "reason"
 msgstr "причина"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "причина обновлени�"
 
@@ -18466,24 +20899,24 @@ msgstr "git tag -d <им�-метки>…"
 #: builtin/tag.c:28
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
-msgstr "git tag -l [-n[<количе�тво>]] [--contains <коммит>] [--no-contains <коммит>] [--points-at <объект>]\n\t\t[--format=<формат>] [--[no-]merged [<коммит>]] [<шаблон>…]"
+"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] [<pattern>...]"
+msgstr ""
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<формат>] <им�-метки>…"
 
-#: builtin/tag.c:88
+#: builtin/tag.c:89
 #, c-format
 msgid "tag '%s' not found."
 msgstr "метка  «%s» не найдена."
 
-#: builtin/tag.c:104
+#: builtin/tag.c:105
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Метка «%s» удалена (была %s)\n"
 
-#: builtin/tag.c:134
+#: builtin/tag.c:135
 #, c-format
 msgid ""
 "\n"
@@ -18492,7 +20925,7 @@ msgid ""
 "Lines starting with '%c' will be ignored.\n"
 msgstr "\nВведите �ообщение дл� метки:\n  %s\nСтроки, начинающие�� � «%c» будут проигнорированы.\n"
 
-#: builtin/tag.c:138
+#: builtin/tag.c:139
 #, c-format
 msgid ""
 "\n"
@@ -18501,15 +20934,15 @@ msgid ""
 "Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
 msgstr "\nВведите �ообщение дл� метки:\n  %s\nСтроки, начинающие�� � «%c» будут о�тавлены; вы можете удалить их вручную, е�ли хотите.\n"
 
-#: builtin/tag.c:192
+#: builtin/tag.c:198
 msgid "unable to sign the tag"
 msgstr "не удало�ь подпи�ать метку"
 
-#: builtin/tag.c:194
+#: builtin/tag.c:200
 msgid "unable to write tag file"
 msgstr "не удало�ь запи�ать файл метки"
 
-#: builtin/tag.c:210
+#: builtin/tag.c:216
 #, c-format
 msgid ""
 "You have created a nested tag. The object referred to by your new tag is\n"
@@ -18518,382 +20951,386 @@ msgid ""
 "\tgit tag -f %s %s^{}"
 msgstr ""
 
-#: builtin/tag.c:226
+#: builtin/tag.c:232
 msgid "bad object type."
 msgstr "неправильный тип объекта"
 
-#: builtin/tag.c:278
+#: builtin/tag.c:285
 msgid "no tag message?"
 msgstr "нет опи�ани� метки?"
 
-#: builtin/tag.c:285
+#: builtin/tag.c:292
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Сообщение метки было о�тавлено в %s\n"
 
-#: builtin/tag.c:396
+#: builtin/tag.c:403
 msgid "list tag names"
 msgstr "�пи�ок названий меток"
 
-#: builtin/tag.c:398
+#: builtin/tag.c:405
 msgid "print <n> lines of each tag message"
 msgstr "печатать <n> �трок опи�ани� от каждой метки"
 
-#: builtin/tag.c:400
+#: builtin/tag.c:407
 msgid "delete tags"
 msgstr "удалить метки"
 
-#: builtin/tag.c:401
+#: builtin/tag.c:408
 msgid "verify tags"
 msgstr "проверить метки"
 
-#: builtin/tag.c:403
+#: builtin/tag.c:410
 msgid "Tag creation options"
 msgstr "�а�тройки �оздани� метки"
 
-#: builtin/tag.c:405
+#: builtin/tag.c:412
 msgid "annotated tag, needs a message"
 msgstr "дл� аннотированной метки нужно �ообщение"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:414
 msgid "tag message"
 msgstr "опи�ание метки"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:416
 msgid "force edit of tag message"
 msgstr ""
 
-#: builtin/tag.c:410
+#: builtin/tag.c:417
 msgid "annotated and GPG-signed tag"
 msgstr "аннотированна� и подпи�анна� � помощью GPG метка"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:420
 msgid "use another key to sign the tag"
 msgstr "и�пользовать другой ключ дл� подпи�ани� метки"
 
-#: builtin/tag.c:414
+#: builtin/tag.c:421
 msgid "replace the tag if exists"
 msgstr "замена метки, е�ли она �уще�твует"
 
-#: builtin/tag.c:415 builtin/update-ref.c:369
+#: builtin/tag.c:422 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "�оздать журнал ��ылок"
 
-#: builtin/tag.c:417
+#: builtin/tag.c:424
 msgid "Tag listing options"
 msgstr "�а�тройки вывода �пи�ка меток"
 
-#: builtin/tag.c:418
+#: builtin/tag.c:425
 msgid "show tag list in columns"
 msgstr "показать �пи�ок меток по �толбцам"
 
-#: builtin/tag.c:419 builtin/tag.c:421
+#: builtin/tag.c:426 builtin/tag.c:428
 msgid "print only tags that contain the commit"
 msgstr "вывод только меток, которые �одержат коммит"
 
-#: builtin/tag.c:420 builtin/tag.c:422
+#: builtin/tag.c:427 builtin/tag.c:429
 msgid "print only tags that don't contain the commit"
 msgstr "вывод только меток, которые не �одержат коммит"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:430
 msgid "print only tags that are merged"
 msgstr "вывод только �литых меток"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:431
 msgid "print only tags that are not merged"
 msgstr "вывод только не �литых меток"
 
-#: builtin/tag.c:428
+#: builtin/tag.c:435
 msgid "print only tags of the object"
 msgstr "вывод только меток, определенного объекта"
 
-#: builtin/tag.c:472
+#: builtin/tag.c:483
 msgid "--column and -n are incompatible"
 msgstr "--column и -n нельз� и�пользовать одновременно"
 
-#: builtin/tag.c:494
+#: builtin/tag.c:505
 msgid "-n option is only allowed in list mode"
 msgstr "опцию -n можно и�пользовать только в режиме �пи�ка"
 
-#: builtin/tag.c:496
+#: builtin/tag.c:507
 msgid "--contains option is only allowed in list mode"
 msgstr "опцию --contains можно и�пользовать только в режиме �пи�ка"
 
-#: builtin/tag.c:498
+#: builtin/tag.c:509
 msgid "--no-contains option is only allowed in list mode"
 msgstr "опцию --no-contains можно и�пользовать только в режиме �пи�ка"
 
-#: builtin/tag.c:500
+#: builtin/tag.c:511
 msgid "--points-at option is only allowed in list mode"
 msgstr "опцию --points-at можно и�пользовать только в режиме �пи�ка"
 
-#: builtin/tag.c:502
+#: builtin/tag.c:513
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "опции --merged и --no-merged можно и�пользовать только в режиме �пи�ка"
 
-#: builtin/tag.c:513
+#: builtin/tag.c:524
 msgid "only one -F or -m option is allowed."
 msgstr "-F и -m нельз� и�пользовать одновременно."
 
-#: builtin/tag.c:532
+#: builtin/tag.c:543
 msgid "too many params"
 msgstr "передано �лишком много параметров"
 
-#: builtin/tag.c:538
+#: builtin/tag.c:549
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "«%s» не �вл�ет�� допу�тимым именем метки."
 
-#: builtin/tag.c:543
+#: builtin/tag.c:554
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "метка «%s» уже �уще�твует"
 
-#: builtin/tag.c:574
+#: builtin/tag.c:585
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Метка «%s» обновлена (была %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "Ра�паковка объектов"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "не удало�ь �оздать каталог %s"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "не удало�ь �оздать файл %s"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "не удало�ь удалить файл %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "не удало�ь удалить каталог %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Проверка mtime в «%s» "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr "информаци� �тати�тики каталога не измен�ет�� по�ле добавлени� нового файла"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr "информаци� �тати�тики каталога не измен�ет�� по�ле добавлени� нового каталога"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr "информаци� �тати�тики каталога измен�ет�� по�ле добавлени� нового файла"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "информаци� �тати�тики каталога измен�ет�� по�ле добавлени� нового файла внутри подкаталога"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr "информаци� �тати�тики каталога не измен�ет�� по�ле удалени� файла"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr "информаци� �тати�тики каталога не измен�ет�� по�ле удалени� каталога"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<опции>] [--] [<файл>…]"
 
-#: builtin/update-index.c:971
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "продолжить обновление, даже е�ли индек� требует обновлени�"
 
-#: builtin/update-index.c:974
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "обновление: игнорировать подмодули"
 
-#: builtin/update-index.c:977
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "не игнорировать новые файлы"
 
-#: builtin/update-index.c:979
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "разрешить файлам замен�ть каталоги и наоборот"
 
-#: builtin/update-index.c:981
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "замечать файлы от�ут�твующие в рабочем каталоге"
 
-#: builtin/update-index.c:983
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "обновить, даже е�ли в индек�е имеют�� не �литые запи�и"
 
-#: builtin/update-index.c:986
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "обновить информацию о �тату�е файлов"
 
-#: builtin/update-index.c:990
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "как --refresh, но игнорировать на�тройку assume-unchanged"
 
-#: builtin/update-index.c:994
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<режим до�тупа>,<объект>,<путь>"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "добавить указанную запи�ь в индек�"
 
-#: builtin/update-index.c:1005
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "пометить файлы как «не измененные»"
 
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "убрать пометку assumed-unchanged"
 
-#: builtin/update-index.c:1011
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "пометить файлы как «только в индек�е»"
 
-#: builtin/update-index.c:1014
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "убрать пометку skip-worktree"
 
-#: builtin/update-index.c:1017
+#: builtin/update-index.c:1020
+msgid "do not touch index-only entries"
+msgstr ""
+
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "только добавить в индек�; не добавл�ть �одержимое в базу данных объектов"
 
-#: builtin/update-index.c:1019
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "удалить указанные пути, даже е�ли они �уще�твуют в рабочем каталоге"
 
-#: builtin/update-index.c:1021
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "� опцией --stdin: �троки на вводе отдел�ют�� �УЛЕВЫМ байтом"
 
-#: builtin/update-index.c:1023
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "прочитать �пи�ок обновл�емых путей из �тандартного ввода"
 
-#: builtin/update-index.c:1027
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "добавить запи�и из �тандартного ввода в индек�"
 
-#: builtin/update-index.c:1031
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "заново заполнить индек� #2 и #3 дл� указанных путей"
 
-#: builtin/update-index.c:1035
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "обновить только запи�и, которые отличают�� от HEAD"
 
-#: builtin/update-index.c:1039
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "игнорировать файлы, от�ут�твующие в рабочем каталоге"
 
-#: builtin/update-index.c:1042
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "выве�ти выполн�емые дей�тви� на �тандартный вывод"
 
-#: builtin/update-index.c:1044
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(дл� машинной обработки) забыть �охраненные неразрешенные конфликты"
 
-#: builtin/update-index.c:1048
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "запи�ать индек� в указанном формате"
 
-#: builtin/update-index.c:1050
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "разрешить или запретить раздельный индек�"
 
-#: builtin/update-index.c:1052
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "включить/отключить к�ш неот�леживаемых файлов"
 
-#: builtin/update-index.c:1054
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "проверить, что файлова� �и�тема поддерживает к�ш неот�леживаемых файлов"
 
-#: builtin/update-index.c:1056
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "включить к�ш неот�леживаемых файлов без проверки файловой �и�темы"
 
-#: builtin/update-index.c:1058
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "запи�ать индек�, даже е�ли он не помечен как измененный"
 
-#: builtin/update-index.c:1060
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "включить или выключить мониторинг файловой �и�темы"
 
-#: builtin/update-index.c:1062
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "пометить файл как дей�твительный в мониторе файловой �и�темы"
 
-#: builtin/update-index.c:1065
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "�н�ть пометку дей�твительно�ти мониторе файловой �и�темы"
 
-#: builtin/update-index.c:1168
+#: 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:1177
+#: 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:1188
+#: 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 у�тановлен true; удалите или измените его, е�ли вы дей�твительно хотите удалить к�ш неот�леживаемых файлов"
 
-#: builtin/update-index.c:1192
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "К�ш неот�леживаемых файлов отключен"
 
-#: builtin/update-index.c:1200
+#: 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 у�тановлен false; удалите или измените его, е�ли вы дей�твительно хотите включить к�ш неот�леживаемых файлов"
 
-#: builtin/update-index.c:1204
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "К�ш неот�леживаемых файлов включен дл� «%s»"
 
-#: builtin/update-index.c:1212
+#: 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:1216
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "мониторинг файловой �и�темы включён"
 
-#: builtin/update-index.c:1219
+#: 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:1223
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "мониторинг файловой �и�темы выключён"
 
@@ -18909,19 +21346,19 @@ msgstr "git update-ref [<опции>]    <имÑ�-Ñ�Ñ�ылки> <новое-знÐ
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<опции>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "удалить ��ылку"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
 msgstr "обновить <им�-��ылки> а не то, на что она указывает"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr "ввод отделённый �УЛЕВЫМИ �имволами"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr "прочитать обновлени� из �тандартного ввода"
 
@@ -18953,308 +21390,312 @@ msgstr "не провер�ть <каталог>/.git/ е�ли <каталог>
 msgid "interrupt transfer after <n> seconds of inactivity"
 msgstr "прервать передачу по�ле <кол> �екунд про�то�"
 
-#: builtin/verify-commit.c:20
+#: builtin/verify-commit.c:19
 msgid "git verify-commit [-v | --verbose] <commit>..."
 msgstr "git verify-commit [-v | --verbose] <коммит>…"
 
-#: builtin/verify-commit.c:76
+#: builtin/verify-commit.c:68
 msgid "print commit contents"
 msgstr "выве�ти �одержимое коммита"
 
-#: builtin/verify-commit.c:77 builtin/verify-tag.c:38
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
 msgid "print raw gpg status output"
 msgstr "выводить �ырой вывод �тату�а от gpg"
 
-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <пакет>…"
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "быть много�ловнее"
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "выве�ти только �тати�тику"
 
-#: builtin/verify-tag.c:19
+#: builtin/verify-tag.c:18
 msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
 msgstr "git verify-tag [-v | --verbose] [--format=<формат>] <метка>…"
 
-#: builtin/verify-tag.c:37
+#: builtin/verify-tag.c:36
 msgid "print tag contents"
 msgstr "выве�ти �одержимое метки"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:17
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<опции>] <путь> [<указатель-коммита>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:18
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<опции>]"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:19
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<опции>] <путь>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:20
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <рабочий-каталог> <новый-путь>"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:21
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<опции>]"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:22
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<опции>] <рабочий-каталог>"
 
-#: builtin/worktree.c:24
+#: builtin/worktree.c:23
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <путь>"
 
-#: builtin/worktree.c:61 builtin/worktree.c:891
+#: builtin/worktree.c:60 builtin/worktree.c:973
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "не удало�ь удалить «%s»"
 
-#: builtin/worktree.c:80
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Удаление рабочих каталогов/%s: не �вл�ет�� каталогом"
+#: builtin/worktree.c:85
+msgid "not a valid directory"
+msgstr ""
 
-#: builtin/worktree.c:86
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Удаление рабочих каталогов/%s: файл gitdir не �уще�твует"
+#: builtin/worktree.c:91
+msgid "gitdir file does not exist"
+msgstr ""
 
-#: builtin/worktree.c:91 builtin/worktree.c:100
+#: builtin/worktree.c:96 builtin/worktree.c:105
 #, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Удаление рабочих каталогов/%s: не удало�ь прочитать файл gitdir (%s)"
+msgid "unable to read gitdir file (%s)"
+msgstr ""
 
-#: builtin/worktree.c:110
+#: builtin/worktree.c:115
 #, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr "Удаление рабочего каталога/%s: прочитано мало данных (ожидало�ь %<PRIuMAX> байт, прочитано %<PRIuMAX>)"
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr ""
 
-#: builtin/worktree.c:118
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Удаление рабочих каталогов/%s: недей�твительный файл gitdir"
+#: builtin/worktree.c:123
+msgid "invalid gitdir file"
+msgstr ""
 
-#: builtin/worktree.c:127
+#: builtin/worktree.c:131
+msgid "gitdir file points to non-existent location"
+msgstr ""
+
+#: builtin/worktree.c:146
 #, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Удаление рабочих каталогов/%s: gitdir указывает на не�уще�твующее ра�положение"
+msgid "Removing %s/%s: %s"
+msgstr ""
 
-#: builtin/worktree.c:166
+#: builtin/worktree.c:221
 msgid "report pruned working trees"
 msgstr "выве�ти �пи�ок удаленных рабочих каталогов"
 
-#: builtin/worktree.c:168
+#: builtin/worktree.c:223
 msgid "expire working trees older than <time>"
 msgstr "удалить рабочие каталоги �тарее чем <дата-окончани�>"
 
-#: builtin/worktree.c:235
+#: builtin/worktree.c:293
 #, c-format
 msgid "'%s' already exists"
 msgstr "«%s» уже �уще�твует"
 
-#: builtin/worktree.c:252
+#: builtin/worktree.c:302
 #, c-format
-msgid "unable to re-add worktree '%s'"
+msgid "unusable worktree destination '%s'"
 msgstr ""
 
-#: builtin/worktree.c:257
+#: builtin/worktree.c:307
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:259
+#: builtin/worktree.c:309
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 
-#: builtin/worktree.c:302
+#: builtin/worktree.c:360
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "не удало�ь �оздать каталог «%s»"
 
-#: builtin/worktree.c:432 builtin/worktree.c:438
+#: builtin/worktree.c:494 builtin/worktree.c:500
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr ""
 
-#: builtin/worktree.c:434
+#: builtin/worktree.c:496
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr ""
 
-#: builtin/worktree.c:443
+#: builtin/worktree.c:505
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr ""
 
-#: builtin/worktree.c:449
+#: builtin/worktree.c:511
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr ""
 
-#: builtin/worktree.c:490
+#: builtin/worktree.c:552
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "переключить�� на <ветка> даже е�ли она уже активна в другом рабоче�м каталоге"
 
-#: builtin/worktree.c:493
+#: builtin/worktree.c:555
 msgid "create a new branch"
 msgstr "�оздать новую ветку"
 
-#: builtin/worktree.c:495
+#: builtin/worktree.c:557
 msgid "create or reset a branch"
 msgstr "�оздать или перейти на ветку"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:559
 msgid "populate the new working tree"
 msgstr "наполнить новый рабочий каталог"
 
-#: builtin/worktree.c:498
+#: builtin/worktree.c:560
 msgid "keep the new working tree locked"
 msgstr "держать рабочий каталог заблокированным"
 
-#: builtin/worktree.c:501
+#: builtin/worktree.c:563
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "на�троить режим от�леживани� ветки (�мотрите git-branch(1))"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:566
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "пытать�� найти �оответ�твие имени новой ветки � именем внешней ветки"
 
-#: builtin/worktree.c:512
+#: builtin/worktree.c:574
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B и --detach нельз� и�пользовать одновременно"
 
-#: builtin/worktree.c:573
+#: builtin/worktree.c:635
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "--[no-]track можно и�пользовать только когда вы �оздаёте новую ветку"
 
-#: builtin/worktree.c:673
+#: builtin/worktree.c:758
 msgid "reason for locking"
 msgstr "причина блокировки"
 
-#: builtin/worktree.c:685 builtin/worktree.c:718 builtin/worktree.c:792
-#: builtin/worktree.c:919
+#: builtin/worktree.c:770 builtin/worktree.c:803 builtin/worktree.c:877
+#: builtin/worktree.c:1001
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "«%s» не �вл�ет�� рабочим каталогом"
 
-#: builtin/worktree.c:687 builtin/worktree.c:720
+#: builtin/worktree.c:772 builtin/worktree.c:805
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован"
 
-#: builtin/worktree.c:692
+#: builtin/worktree.c:777
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "«%s» уже заблокирован, причина: %s"
 
-#: builtin/worktree.c:694
+#: builtin/worktree.c:779
 #, c-format
 msgid "'%s' is already locked"
 msgstr "«%s» уже заблокирован"
 
-#: builtin/worktree.c:722
+#: builtin/worktree.c:807
 #, c-format
 msgid "'%s' is not locked"
 msgstr "«%s» не заблокирован"
 
-#: builtin/worktree.c:763
+#: builtin/worktree.c:848
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr ""
 
-#: builtin/worktree.c:771
+#: builtin/worktree.c:856
 msgid "force move even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:794 builtin/worktree.c:921
+#: builtin/worktree.c:879 builtin/worktree.c:1003
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr ""
 
-#: builtin/worktree.c:799
+#: builtin/worktree.c:884
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr ""
 
-#: builtin/worktree.c:805
-#, c-format
-msgid "target '%s' already exists"
-msgstr ""
-
-#: builtin/worktree.c:813
+#: builtin/worktree.c:897
 #, 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:815
+#: builtin/worktree.c:899
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:818
+#: builtin/worktree.c:902
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr ""
 
-#: builtin/worktree.c:823
+#: builtin/worktree.c:907
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr ""
 
-#: builtin/worktree.c:871
+#: builtin/worktree.c:953
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr ""
 
-#: builtin/worktree.c:875
+#: builtin/worktree.c:957
 #, c-format
-msgid "'%s' is dirty, use --force to delete it"
+msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr ""
 
-#: builtin/worktree.c:880
+#: builtin/worktree.c:962
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr ""
 
-#: builtin/worktree.c:903
+#: builtin/worktree.c:985
 msgid "force removal even if worktree is dirty or locked"
 msgstr ""
 
-#: builtin/worktree.c:926
+#: builtin/worktree.c:1008
 #, 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:928
+#: builtin/worktree.c:1010
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
 msgstr ""
 
-#: builtin/worktree.c:931
+#: builtin/worktree.c:1013
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr ""
 
+#: builtin/worktree.c:1037
+#, c-format
+msgid "repair: %s: %s"
+msgstr ""
+
+#: builtin/worktree.c:1040
+#, c-format
+msgid "error: %s: %s"
+msgstr ""
+
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<префик�>/]"
@@ -19271,25 +21712,29 @@ msgstr "вывеÑ�ти объект дерева длÑ� подкаталога Ñ
 msgid "only useful for debugging"
 msgstr "и�пользует�� только при отладке"
 
-#: credential-cache--daemon.c:223
+#: http-fetch.c:114
 #, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr "Права до�тупа к вашему каталогу �окетов �лишком �вободны; друге пользователи могуи читать ваши зак�шированные пароли до�тупа. Обдумайте запу�к команды:\n\n\tchmod 0700 %s"
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr ""
 
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "вывод отладочных �ообщений на stderr"
+#: http-fetch.c:122
+msgid "not a git repository"
+msgstr ""
+
+#: t/helper/test-fast-rebase.c:141
+msgid "unhandled options"
+msgstr ""
 
-#: t/helper/test-reach.c:152
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr ""
+
+#: t/helper/test-reach.c:154
 #, c-format
 msgid "commit %s is not marked reachable"
 msgstr ""
 
-#: t/helper/test-reach.c:162
+#: t/helper/test-reach.c:164
 msgid "too many commits marked reachable"
 msgstr ""
 
@@ -19301,7 +21746,7 @@ msgstr ""
 msgid "exit immediately after advertising capabilities"
 msgstr ""
 
-#: git.c:27
+#: git.c:28
 msgid ""
 "git [--version] [--help] [-C <path>] [-c <name>=<value>]\n"
 "           [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n"
@@ -19310,146 +21755,147 @@ msgid ""
 "           <command> [<args>]"
 msgstr "git [--version] [--help] [-C <путь>] [-c <им�>=<значение>]\n           [--exec-path[=<путь>]] [--html-path] [--man-path] [--info-path]\n           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--bare]\n           [--git-dir=<путь>] [--work-tree=<путь>] [--namespace=<им�>]\n           <команда> [<аргументы>]"
 
-#: git.c:34
+#: git.c:35
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
-"to read about a specific subcommand or concept."
-msgstr "«git help -а» и «git help -g» выводит �пи�ок до�тупных подкоманд и\nнекоторые руковод�тва по темам. Запу�тите «git help <команда>» или\n«git help <термин>», чтобы проче�ть о конкретных подкоманде или теме."
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
 
-#: git.c:185
+#: git.c:187
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr ""
 
-#: git.c:199
+#: git.c:201
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr ""
 
-#: git.c:213
+#: git.c:215
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr ""
 
-#: git.c:227
+#: git.c:229
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr ""
 
-#: git.c:249
+#: git.c:251
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr ""
 
-#: git.c:287
+#: git.c:289
 #, c-format
 msgid "no directory given for -C\n"
 msgstr ""
 
-#: git.c:313
+#: git.c:315
 #, c-format
 msgid "unknown option: %s\n"
 msgstr ""
 
-#: git.c:359
+#: git.c:364
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr ""
 
-#: git.c:368
+#: git.c:373
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
 "You can use '!git' in the alias to do this"
 msgstr ""
 
-#: git.c:376
+#: git.c:380
 #, c-format
 msgid "empty alias for %s"
 msgstr ""
 
-#: git.c:379
+#: git.c:383
 #, c-format
 msgid "recursive alias: %s"
 msgstr ""
 
-#: git.c:459
+#: git.c:465
 msgid "write failure on standard output"
 msgstr ""
 
-#: git.c:461
+#: git.c:467
 msgid "unknown write failure on standard output"
 msgstr ""
 
-#: git.c:463
+#: git.c:469
 msgid "close failed on standard output"
 msgstr ""
 
-#: git.c:797
+#: git.c:820
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr ""
 
-#: git.c:847
+#: git.c:870
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr ""
 
-#: git.c:860
+#: git.c:883
 #, c-format
 msgid ""
 "usage: %s\n"
 "\n"
 msgstr ""
 
-#: git.c:880
+#: git.c:903
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr ""
 
-#: git.c:892
+#: git.c:915
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr ""
 
-#: http.c:378
+#: http.c:399
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "отрицательное значение http.postbuffer; и�пользую �тандартное значение %d"
 
-#: http.c:399
+#: http.c:420
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Делегаци� проверки полномочий не поддерживает�� � cURL < 7.22.0"
 
-#: http.c:408
+#: http.c:429
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "Public key pinning не поддерживает�� � cURL < 7.44.0"
 
-#: http.c:876
+#: http.c:910
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr ""
 
-#: http.c:949
+#: http.c:989
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr ""
 
-#: http.c:1085
+#: http.c:1132
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr ""
 
-#: http.c:1092
+#: http.c:1139
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr ""
 
-#: http.c:1096
+#: http.c:1143
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr ""
 
-#: http.c:1965
+#: http.c:2025
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -19457,152 +21903,193 @@ msgid ""
 "   redirect: %s"
 msgstr "не удало�ь обновить базовый url из переадре�ации:\n  запрошено: %s\n   переадре�овано: %s"
 
-#: remote-curl.c:157
+#: remote-curl.c:183
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr ""
 
-#: remote-curl.c:254
+#: remote-curl.c:307
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
 msgstr ""
 
-#: remote-curl.c:355
+#: remote-curl.c:408
 msgid "invalid server response; expected service, got flush packet"
 msgstr ""
 
-#: remote-curl.c:386
+#: remote-curl.c:439
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr ""
 
-#: remote-curl.c:446
+#: remote-curl.c:499
 #, c-format
 msgid "repository '%s' not found"
 msgstr ""
 
-#: remote-curl.c:450
+#: remote-curl.c:503
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr ""
 
-#: remote-curl.c:454
+#: remote-curl.c:507
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "«%s» недо�тупно: %s"
 
-#: remote-curl.c:460
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
 msgstr "переадре�аци� на %s"
 
-#: remote-curl.c:584
+#: remote-curl.c:642
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr ""
 
-#: remote-curl.c:664
-msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+#: remote-curl.c:654
+msgid "remote server sent stateless separator"
 msgstr ""
 
 #: remote-curl.c:724
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+
+#: remote-curl.c:754
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr ""
+
+#: remote-curl.c:756
+msgid "remote-curl: unexpected response end packet"
+msgstr ""
+
+#: remote-curl.c:832
 #, c-format
 msgid "RPC failed; %s"
 msgstr ""
 
-#: remote-curl.c:764
+#: remote-curl.c:872
 msgid "cannot handle pushes this big"
 msgstr ""
 
-#: remote-curl.c:879
+#: remote-curl.c:987
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr ""
 
-#: remote-curl.c:883
+#: remote-curl.c:991
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr ""
 
-#: remote-curl.c:1014
+#: remote-curl.c:1041
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr ""
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr ""
+
+#: remote-curl.c:1132
 msgid "dumb http transport does not support shallow capabilities"
 msgstr ""
 
-#: remote-curl.c:1028
+#: remote-curl.c:1147
 msgid "fetch failed."
 msgstr ""
 
-#: remote-curl.c:1076
+#: remote-curl.c:1193
 msgid "cannot fetch by sha1 over smart http"
 msgstr ""
 
-#: remote-curl.c:1120 remote-curl.c:1126
+#: remote-curl.c:1237 remote-curl.c:1243
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr ""
 
-#: remote-curl.c:1138 remote-curl.c:1252
+#: remote-curl.c:1255 remote-curl.c:1373
 #, c-format
 msgid "http transport does not support %s"
 msgstr ""
 
-#: remote-curl.c:1174
+#: remote-curl.c:1291
 msgid "git-http-push failed"
 msgstr ""
 
-#: remote-curl.c:1360
+#: remote-curl.c:1479
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr ""
 
-#: remote-curl.c:1392
+#: remote-curl.c:1511
 msgid "remote-curl: error reading command stream from git"
 msgstr ""
 
-#: remote-curl.c:1399
+#: remote-curl.c:1518
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr ""
 
-#: remote-curl.c:1439
+#: remote-curl.c:1559
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr ""
 
-#: list-objects-filter-options.h:61
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr ""
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr ""
+
+#: list-objects-filter-options.h:91
 msgid "args"
 msgstr "аргументы"
 
-#: list-objects-filter-options.h:62
+#: list-objects-filter-options.h:92
 msgid "object filtering"
 msgstr "фильтраци� объектов"
 
-#: parse-options.h:170
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "дата-окончани�"
 
-#: parse-options.h:184
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "ничего не делает (о�тавлено дл� обратной �овме�тимо�ти)"
 
-#: parse-options.h:304
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "быть много�ловнее"
 
-#: parse-options.h:306
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "тихий режим"
 
-#: parse-options.h:312
-msgid "use <n> digits to display SHA-1s"
-msgstr "и�пользовать <n> цифр дл� вывода SHA-1"
+#: parse-options.h:317
+msgid "use <n> digits to display object names"
+msgstr ""
 
-#: parse-options.h:331
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "как удал�ть пробелы и #комментарии из �ообщени� коммита"
 
-#: ref-filter.h:101
+#: parse-options.h:337
+msgid "read pathspec from file"
+msgstr ""
+
+#: parse-options.h:338
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL "
+"character"
+msgstr ""
+
+#: ref-filter.h:96
 msgid "key"
 msgstr "ключ"
 
-#: ref-filter.h:101
+#: ref-filter.h:96
 msgid "field name to sort on"
 msgstr "им� пол�, по которому выполнить �ортировку"
 
@@ -19610,6 +22097,14 @@ msgstr "им� пол�, по которому выполнить �ортиро
 msgid "update the index with reused conflict resolution if possible"
 msgstr "обновить индек� � помощью переи�пользовани� разрешени� конфликта, е�ли возможно"
 
+#: wt-status.h:80
+msgid "HEAD detached at "
+msgstr "HEAD отделён на "
+
+#: wt-status.h:81
+msgid "HEAD detached from "
+msgstr "HEAD отделён начина� � "
+
 #: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Добавление �одержимого файла в индек�"
@@ -19647,681 +22142,691 @@ msgid "List, create, or delete branches"
 msgstr "Вывод �пи�ка, �оздание или удаление веток"
 
 #: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr ""
+
+#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Перемещение объектов и ��ылок по архиву"
 
-#: command-list.h:60
+#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr "Вывод �одержимого или типа и информации о размере дл� объектов репозитори�"
 
-#: command-list.h:61
+#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Вывод информации из gitattributes"
 
-#: command-list.h:62
+#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Отладка файлов gitignore / exclude"
 
-#: command-list.h:63
+#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Вывод каноничных имён и адре�ов �лектронной почты контактов"
 
-#: command-list.h:64
+#: command-list.h:65
 msgid "Switch branches or restore working tree files"
 msgstr "Переключение веток или во��тановление файлов в рабочем каталоге"
 
-#: command-list.h:65
+#: command-list.h:66
 msgid "Copy files from the index to the working tree"
 msgstr "Копирование файлов из индек�а в рабочий каталог"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Ensures that a reference name is well formed"
 msgstr "Удо�товерить��, что им� ��ылки правильно �формировано"
 
-#: command-list.h:67
+#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Пои�к коммитов которые еще не применены выше�то�щим репозиторием"
 
-#: command-list.h:68
+#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Применение изменений, �деланных в каком-то �уще�твующем коммите"
 
-#: command-list.h:69
+#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Графиче�ка� альтернатива дл� git-commit"
 
-#: command-list.h:70
+#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Удаление неот�леживаемых файлов из рабочего каталога"
 
-#: command-list.h:71
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Клонирование репозитори� в новый каталог"
 
-#: command-list.h:72
+#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Вывод данных по колонкам"
 
-#: command-list.h:73
+#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Запи�ь изменений в репозиторий"
 
-#: command-list.h:74
+#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Запи�ь и проверка commit-graph файлов Git"
 
-#: command-list.h:75
+#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Создание нового объекта коммита"
 
-#: command-list.h:76
+#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Получение и у�тановка глобальных опций или опций репозитори�"
 
-#: command-list.h:77
+#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Под�чет количе�тва неупакованных объектов и их потреблени� ди�ка"
 
-#: command-list.h:78
+#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Получение и �охранение учетных запи�ей пользовател�"
 
-#: command-list.h:79
+#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Помощник дл� временного хранени� паролей в пам�ти"
 
-#: command-list.h:80
+#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Помощник дл� хранени� учетных запи�ей на ди�ке"
 
-#: command-list.h:81
+#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Эк�порт един�твенного коммита в виде рабочей копии CVS"
 
-#: command-list.h:82
+#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Спа�ение ваших данных из другой СКВ которую люди люб�т ненавидеть"
 
-#: command-list.h:83
+#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Эмул�тор �ервера CVS дл� Git"
 
-#: command-list.h:84
+#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Очень про�той �ервер дл� Git репозиториев"
 
-#: command-list.h:85
+#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr "При�воение объекту удобочитаемое им� на о�нове до�тупной ��ылки"
 
-#: command-list.h:86
+#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "Вывод разницы между коммитами, коммитом и рабочим каталогом и т.д."
 
-#: command-list.h:87
+#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Сравнение �едержимого файлов в рабочем каталоге � файлами в индек�е"
 
-#: command-list.h:88
+#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Сравнение дерева файлов � рабочим каталогом или индек�ом"
 
-#: command-list.h:89
+#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr "Сравнение �одержимого и режима двоичных объектов, найденных по двум объектам дерева"
 
-#: command-list.h:90
+#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Показ изменений � помощью ра�про�траненных утилит �равнени�"
 
-#: command-list.h:91
+#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Эк�порт данных Git"
 
-#: command-list.h:92
+#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Внутренний интерфей� дл� бы�трого импорта данных Git"
 
-#: command-list.h:93
+#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Загрузка объектов и ��ылок из другого репозитори�"
 
-#: command-list.h:94
+#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Получение недо�тающих объектов из другого репозитори�"
 
-#: command-list.h:95
+#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Перезапи�ь веток"
 
-#: command-list.h:96
+#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Создание �ообщени� коммита дл� �ли�ни�"
 
-#: command-list.h:97
+#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Вывод информации о каждой ��ылке"
 
-#: command-list.h:98
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr ""
+
+#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Подготовка патчей дл� отправки по �лектронной почте"
 
-#: command-list.h:99
+#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "Проверка �в�зно�ти и валидно�ти объектов в базе данных"
 
-#: command-list.h:100
+#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Очи�тка ненужных файлов и оптимизаци� локального репозитори�"
 
-#: command-list.h:101
+#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "Извлечение идентификатора коммита из архива, �озданного � помощью git-archive"
 
-#: command-list.h:102
+#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Вывод �трок, �оответ�твующих шаблону"
 
-#: command-list.h:103
+#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Портативный графиче�кий интерфей� дл� Git"
 
-#: command-list.h:104
+#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "Вычи�ление идентификатора объекта и возможное �оздание двоичного объекта из файла"
 
-#: command-list.h:105
+#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Отображение �правочной информации о Git"
 
-#: command-list.h:106
+#: command-list.h:108
 msgid "Server side implementation of Git over HTTP"
 msgstr "Серверна� реализаци� протокола Git над HTTP"
 
-#: command-list.h:107
+#: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Загрузка из внешнего репозитори� Git � помощью HTTP"
 
-#: command-list.h:108
+#: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Отправка объектов в другой репозиторий � помощью HTTP/DAV"
 
-#: command-list.h:109
+#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "Отправка коллекции патчей из �тандартного ввода в папку IMAP"
 
-#: command-list.h:110
+#: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
 msgstr "По�троение файла индек�а дл� �уще�твующего упакованного архива"
 
-#: command-list.h:111
+#: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Создание пу�того репозитори� Git или переинициализаци� �уще�твующего"
 
-#: command-list.h:112
+#: command-list.h:114
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Мгновенный про�мотр вашего рабочего репозитори� в gitweb"
 
-#: command-list.h:113
+#: command-list.h:115
 msgid "Add or parse structured information in commit messages"
 msgstr "Добавление или разбор �труктурированной информации в �ообщени�х коммита"
 
-#: command-list.h:114
+#: command-list.h:116
 msgid "The Git repository browser"
 msgstr "Браузер репозитори� Git"
 
-#: command-list.h:115
+#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Вывод и�тории коммитов"
 
-#: command-list.h:116
+#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr "Вывод информации о файлах в индек�е и в рабочем каталоге"
 
-#: command-list.h:117
+#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Вывод �пи�ка ��ылок во внешнем репозитории"
 
-#: command-list.h:118
+#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Вывод �одержимого объекта дерева"
 
-#: command-list.h:119
+#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "Извлекает патч и автор�тво из одного �ообщени� �лектронной почты"
 
-#: command-list.h:120
+#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Про�та� программа UNIX дл� разбора файла mbox"
 
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr ""
+
+#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "Объединение одной или не�кольких и�торий разработки вме�те"
 
-#: command-list.h:122
+#: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "Пои�к подход�щих общих предков дл� возможного �ли�ни�"
 
-#: command-list.h:123
+#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Запу�к трёхходового �ли�ни� файлов"
 
-#: command-list.h:124
+#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "Запу�к �ли�ни� дл� файлов, которые требуют �ли�ни�"
 
-#: command-list.h:125
+#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "Стандартна� программа-помощник дл� и�пользовани� �овме�тно � git-merge-index"
 
-#: command-list.h:126
+#: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "Запу�к ин�трументов разрешени� конфликтов �ли�ни�"
 
-#: command-list.h:127
+#: command-list.h:130
 msgid "Show three-way merge without touching index"
 msgstr "Вывод трёхходового �ли�ние без затрагивани� индек�а"
 
-#: command-list.h:128
+#: command-list.h:131
 msgid "Write and verify multi-pack-indexes"
 msgstr "Запи�ь и проверка файлов multi-pack-index"
 
-#: command-list.h:129
+#: command-list.h:132
 msgid "Creates a tag object"
 msgstr "Создание объектов меток"
 
-#: command-list.h:130
+#: command-list.h:133
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "По�троение объекта дерева из тек�та формата ls-tree"
 
-#: command-list.h:131
+#: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "Перемещение или переименование файла, каталога или �имвольной ��ылки"
 
-#: command-list.h:132
+#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Пои�к �имвольных имён дл� указанных редакций"
 
-#: command-list.h:133
+#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Добавление или про�мотр заметок объекта"
 
-#: command-list.h:134
+#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Импорт и отправка в репозитории Perforce"
 
-#: command-list.h:135
+#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Создание упакованного архива объектов"
 
-#: command-list.h:136
+#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Пои�к избыточных файлов пакетов"
 
-#: command-list.h:137
+#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Упаковка указателей на ветки и меток дл� �ффективного до�тупа к репозиторию"
 
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr "Подпрограммы дл� помощи разбора параметров до�тупа внешнего репозитори�"
-
-#: command-list.h:139
+#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Вычи�ление уникального идентификатора дл� патча"
 
-#: command-list.h:140
+#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "Очи�тка в�ех недо�тижимых объектов из базы данных объектов"
 
-#: command-list.h:141
+#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr "Удаление дополнительных объектов, которые уже �одержат�� в файлах пакетов"
 
-#: command-list.h:142
+#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "Извлечение изменений и объединение � другим репозиторием или локальной веткой"
 
-#: command-list.h:143
+#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Обновление внешних ��ылок и �в�занных объектов"
 
-#: command-list.h:144
+#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Применение упор�доченного �пи�ка патчей над текущей веткой"
 
-#: command-list.h:145
+#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "Сравнение двух диапазонов коммитов (например двух вер�ий ветки)"
 
-#: command-list.h:146
+#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Чтение информации о дереве в индек�"
 
-#: command-list.h:147
+#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Повторное применение коммитов над верхушкой другой ветки"
 
-#: command-list.h:148
+#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Получение того, что было отправлено в репозиторий"
 
-#: command-list.h:149
+#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Управление информацией журнала ��ылок"
 
-#: command-list.h:150
+#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Управление набором от�леживаемых репозиториев"
 
-#: command-list.h:151
+#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Упаковка неупакованных объектов в репозитории"
 
-#: command-list.h:152
+#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Создание, вывод �пи�ка, удаление ��ылок дл� замены объектов"
 
-#: command-list.h:153
+#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Генераци� �водки пред�то�щих изменений"
 
-#: command-list.h:154
+#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Повторное и�пользование запи�анных разрешений конфликтов при �ли�ни�х"
 
-#: command-list.h:155
+#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Сбро� текущего �о�то�ни� HEAD на указанное �о�то�ние"
 
-#: command-list.h:156
+#: command-list.h:158
+msgid "Restore working tree files"
+msgstr ""
+
+#: command-list.h:159
 msgid "Revert some existing commits"
 msgstr "Обращение изменений �уще�твующих коммитов"
 
-#: command-list.h:157
+#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Вывод �пи�ка объектов коммита в обратном хронологиче�ком пор�дке"
 
-#: command-list.h:158
+#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "Разбор и обработка параметров"
 
-#: command-list.h:159
+#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "Удаление файлов из рабочего каталога и индек�а"
 
-#: command-list.h:160
+#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Отправка коллекции патчей на �лектронную почту"
 
-#: command-list.h:161
+#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Отправка объектов в другой репозиторий � помощью протокола Git"
 
-#: command-list.h:162
+#: command-list.h:165
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Ограниченна� оболочка входа в �и�тему дл� до�тупа Git через SSH"
 
-#: command-list.h:163
+#: command-list.h:166
 msgid "Summarize 'git log' output"
 msgstr "Обобщение вывода «git log»"
 
-#: command-list.h:164
+#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "Вывод различных типов объектов"
 
-#: command-list.h:165
+#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "Вывод веток и их коммитов"
 
-#: command-list.h:166
+#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "Вывод индек�а упакованного архива"
 
-#: command-list.h:167
+#: command-list.h:170
 msgid "List references in a local repository"
 msgstr "Вывод ��ылок в локальном репозитории"
 
-#: command-list.h:168
+#: command-list.h:171
 msgid "Git's i18n setup code for shell scripts"
 msgstr "Код на�тройки интернационализации дл� �ценариев оболочки Git"
 
-#: command-list.h:169
+#: command-list.h:172
 msgid "Common Git shell script setup code"
 msgstr "Общий код на�тройки дл� �ценариев оболочки Git"
 
-#: command-list.h:170
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr ""
+
+#: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "Спр�тать изменени� в изменённом рабочем каталоге"
 
-#: command-list.h:171
+#: command-list.h:175
 msgid "Add file contents to the staging area"
 msgstr "Добавление �одержимого файлов в индек�"
 
-#: command-list.h:172
+#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Вывод �о�то�ни� рабочего каталога"
 
-#: command-list.h:173
+#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Удаление ненужных пробелов"
 
-#: command-list.h:174
+#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Инициализаци�, обновление или про�мотр подмодулей"
 
-#: command-list.h:175
+#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Двух�торонние операции между репозитори�ми Subversion и Git"
 
-#: command-list.h:176
+#: command-list.h:180
+msgid "Switch branches"
+msgstr ""
+
+#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Чтение, изменение и удаление �имволиче�ких ��ылок"
 
-#: command-list.h:177
+#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "Создание, вывод �пи�ка, удаление или проверка метки, подпи�анной � помощью GPG"
 
-#: command-list.h:178
+#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "Создание временного файла � �одержимым двоичного объекта"
 
-#: command-list.h:179
+#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Ра�паковка объектов из упакованного архива"
 
-#: command-list.h:180
+#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Реги�траци� �одержимого файла из рабочего каталога в индек�"
 
-#: command-list.h:181
+#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr "Безопа�ное обновление имени объекта хран�щего�� в ��ылке"
 
-#: command-list.h:182
+#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Обновление файла �о в�помогательной информацией дл� глупых �ерверов"
 
-#: command-list.h:183
+#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Отправка архива обратно в git-archive"
 
-#: command-list.h:184
+#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Отправка упакованных объектов обратно в git-fetch-pack"
 
-#: command-list.h:185
+#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Вывод логиче�кой переменной Git"
 
-#: command-list.h:186
+#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Проверка подпи�и GPG коммитов"
 
-#: command-list.h:187
+#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Проверка файлов упакованных архивов Git"
 
-#: command-list.h:188
+#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Проверка подпи�и GPG меток"
 
-#: command-list.h:189
+#: command-list.h:194
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Веб интерфей� Git (веб-интерфей� дл� Git репозиториев)"
 
-#: command-list.h:190
+#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr "Вывод журнала � изменени�ми, которые вводил каждый из коммитов"
 
-#: command-list.h:191
+#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "Управление не�колькими рабочими каталогами"
 
-#: command-list.h:192
+#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "Создание объекта дерева из текущего индек�а"
 
-#: command-list.h:193
+#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "Определение атрибутов дл� путей файлов или каталогов"
 
-#: command-list.h:194
+#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Интерфей� коммандной �троки Git и �оглашени�"
 
-#: command-list.h:195
+#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "Учебник по �дру Git дл� разработчиков"
 
-#: command-list.h:196
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr ""
+
+#: command-list.h:202
 msgid "Git for CVS users"
 msgstr "Git дл� пользователей CVS"
 
-#: command-list.h:197
+#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "Под�тройка вывода �пи�ка изменений"
 
-#: command-list.h:198
+#: command-list.h:204
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "Полезный минимум команд дл� каждодневного и�пользовани� Git"
 
-#: command-list.h:199
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr ""
+
+#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "Гло��арий Git"
 
-#: command-list.h:200
+#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Перехватчики и�пользуемые Git"
 
-#: command-list.h:201
+#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Указание �пециально игнорируемых файлов"
 
-#: command-list.h:202
+#: command-list.h:209
 msgid "Defining submodule properties"
 msgstr "Определение �вой�тв подмодулей"
 
-#: command-list.h:203
+#: command-list.h:210
 msgid "Git namespaces"
 msgstr "Про�тран�тва имён Git"
 
-#: command-list.h:204
+#: command-list.h:211
+msgid "Helper programs to interact with remote repositories"
+msgstr ""
+
+#: command-list.h:212
 msgid "Git Repository Layout"
 msgstr "Содержимое репозитори� Git"
 
-#: command-list.h:205
+#: command-list.h:213
 msgid "Specifying revisions and ranges for Git"
 msgstr "Указание редакций и диапазонов дл� Git"
 
-#: command-list.h:206
+#: command-list.h:214
+msgid "Mounting one repository inside another"
+msgstr ""
+
+#: command-list.h:215
 msgid "A tutorial introduction to Git: part two"
 msgstr "Обучающее введение в Git: ча�ть втора�"
 
-#: command-list.h:207
+#: command-list.h:216
 msgid "A tutorial introduction to Git"
 msgstr "Обучающее введение в Git"
 
-#: command-list.h:208
+#: command-list.h:217
 msgid "An overview of recommended workflows with Git"
 msgstr "Обзор рекомендуемых по�ледовательно�тей выполн�емых дей�твий � Git"
 
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Вам нужно начать � помощью «git bisect start»"
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Вы уверены, что хотите, чтобы � �делал �то [Y - да/n - нет]? "
-
-#: git-bisect.sh:101
+#: git-bisect.sh:48
 #, sh-format
 msgid "Bad rev input: $arg"
 msgstr "Плохой ввод номера редакции: $arg"
 
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Плохой ввод номера редакции: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Плохой ввод номера редакции: $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "«git bisect $TERM_BAD» может принимать только один аргумент."
-
-#: git-bisect.sh:209
+#: git-bisect.sh:82
 msgid "No logfile given"
 msgstr "�е передан файл журнала"
 
-#: git-bisect.sh:210
+#: git-bisect.sh:83
 #, sh-format
 msgid "cannot read $file for replaying"
 msgstr "не удало�ь прочитать $file дл� повтора изменений"
 
-#: git-bisect.sh:232
+#: git-bisect.sh:105
 msgid "?? what are you talking about?"
 msgstr "?? вы о чем?"
 
-#: git-bisect.sh:241
+#: git-bisect.sh:115
 msgid "bisect run failed: no command provided."
 msgstr "�бой при выполнении двоичного пои�ка: не передана команда."
 
-#: git-bisect.sh:246
+#: git-bisect.sh:120
 #, sh-format
 msgid "running $command"
 msgstr "запу�каю $command"
 
-#: git-bisect.sh:253
+#: git-bisect.sh:127
 #, sh-format
 msgid ""
 "bisect run failed:\n"
 "exit code $res from '$command' is < 0 or >= 128"
 msgstr "не удало�ь выполнить двоичный пои�к:\nкод завершени� $res от «$command» оказал�� < 0 или >= 128"
 
-#: git-bisect.sh:279
+#: git-bisect.sh:152
 msgid "bisect run cannot continue any more"
 msgstr "bisect run больше не может продолжать"
 
-#: git-bisect.sh:285
+#: git-bisect.sh:158
 #, sh-format
 msgid ""
 "bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
-msgstr "не удало�ь выполнить двоичный пои�к:\n«bisect_state $state» завершил�� � кодом ошибки $res"
+"'bisect-state $state' exited with error code $res"
+msgstr ""
 
-#: git-bisect.sh:292
+#: git-bisect.sh:165
 msgid "bisect run success"
 msgstr "bisect run выполнен у�пешно"
 
-#: git-bisect.sh:300
+#: git-bisect.sh:173
 msgid "We are not bisecting."
 msgstr "Вы �ейча� не в проце��е бинарного пои�ка."
 
@@ -20363,136 +22868,46 @@ msgstr "Попытка про�того �ли�ни� � $pretty_name"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "Про�тое �ли�ние не удало�ь, попытка автоматиче�кого �ли�ни�."
 
-#: git-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "�е удало�ь удалить временный индек� (не должно �лучать��)"
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "�е удало�ь обновить $ref_stash � помощью $w_commit"
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "ошибка: неизве�тный параметр дл� «stash push»: $option"
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Рабочий каталог и �о�то�ние индек�а �охранены $stash_msg"
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "неизве�тна� опци�: $opt"
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Передано �лишком много редакций: $REV"
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference не �вл�ет�� дей�твительной ��ылкой"
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "«$args» не похоже на коммит �о �пр�танными изменени�ми"
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "«$args» не �вл�ет�� ��ылкой на �пр�танные изменени�"
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr "не удало�ь обновить индек�"
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "�ельз� применить �пр�танные изменени� во врем� выполнени� �ли�ни�"
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr "Конфликты в индек�е. Попробуйте без --index."
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr "�е удало�ь �охранить дерево индек�а"
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr "�евозможно во��тановить неот�леживаемые файлы из �пр�танных изменений"
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr "�евозможно убрать из индек�а измененные файлы"
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "Отброшено ${REV} ($s)"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: �е удало�ь отбро�ить запи�ь из �пр�танных изменений"
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(Чтобы во��тановить их, наберите «git stash apply»)"
-
-#: git-submodule.sh:200
+#: git-submodule.sh:179
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "Отно�ительный путь можно и�пользовать только наход��ь на вершине рабочего каталога"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:189
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "URL репозитори�: «$repo» должен быть аб�олютным или начинать�� � ./|../"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:208
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "«$sm_path» уже �одержит�� в индек�е"
 
-#: git-submodule.sh:232
+#: 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:239
+#: git-submodule.sh:218
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr ""
 
-#: git-submodule.sh:245
-#, 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 "Следующие пути игнорируют�� одним из ваших файлов .gitignore:\n$sm_path\nИ�пользуйте опцию -f, е�ли вы дей�твительно хотите его добавить."
-
-#: git-submodule.sh:268
+#: git-submodule.sh:249
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "Добавл�ю �уще�твующий репозиторий из «$sm_path» в индек�"
 
-#: git-submodule.sh:270
+#: 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:278
+#: 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:280
+#: git-submodule.sh:261
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -20501,137 +22916,124 @@ msgid ""
 "or you are unsure what this means choose another name with the '--name' option."
 msgstr "Е�ли вы хотите повторно и�пользовать локальный каталог git вме�то повторного клонировани� из\n  $realrepo\nто и�пользуйте параметр «--force». Е�ли же локальный каталог git не �вл�ет�� нужным репозиторием или е�ли вы не уверены, что �то значит, то укажите другое им� дл� подмодул� � помощью параметра «--name»."
 
-#: git-submodule.sh:286
+#: git-submodule.sh:267
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "Во��тановление локального каталога git дл� подмодул� «$sm_name»."
 
-#: git-submodule.sh:298
+#: git-submodule.sh:279
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "�е удало�ь переключить�� на �о�то�ние у подмодул� «$sm_path»"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:284
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Сбой добавлени� подмодул� «$sm_path»"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:293
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "�е удало�ь зареги�трировать подмодуль «$sm_path»"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:568
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "�е удало�ь найти текущую редакцию дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:578
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "�е удало�ь выполнить извлечение дл� подмодул� по пути «$sm_path»"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:583
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr "�е удало�ь найти текущую редакцию ${remote_name}/${branch} дл� подмодул� по пути «$sm_path»"
 
-#: git-submodule.sh:606
+#: git-submodule.sh:601
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
 "$sha1:"
 msgstr ""
 
-#: git-submodule.sh:612
+#: 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:619
+#: git-submodule.sh:614
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "�е удало�ь переключить�� на �о�то�ние «$sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:615
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: забрано �о�то�ние «$sha1»"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:619
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "�е удало�ь переме�тить «$sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:620
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:625
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "�е удало�ь выполнить �ли�ние � «$sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:626
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Подмодуль по пути «$displaypath»: �лито � «$sha1»"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:631
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "Сбой выполнени� «$command $sha1» дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:632
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:663
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "�е удало�ь выполнить рекур�ивно дл� подмодул� по пути «$displaypath»"
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr "Опцию --cached нельз� и�пользовать одновременно � опцией --files"
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "неизве�тный режим $mod_dst"
+#: git-rebase--preserve-merges.sh:109
+msgid "Applied autostash."
+msgstr "Применены автоматиче�ки �пр�танные изменени�."
 
-#: git-submodule.sh:902
+#: git-rebase--preserve-merges.sh:112
 #, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr "  Предупреждение: $display_name не �одержит коммит $sha1_src"
+msgid "Cannot store $stash_sha1"
+msgstr "�е удало�ь �охранить $stash_sha1"
 
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr "  Предупреждение: $display_name не �одержит коммит $sha1_dst"
-
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr "  Предупреждение: $display_name не �одержит коммиты $sha1_src и $sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Дл� дополнительной информации, �мотрите git-${cmd}(1)."
+#: 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Ваши изменени� �пр�таны и в безопа�но�ти.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
 
-#: git-rebase--preserve-merges.sh:136
+#: git-rebase--preserve-merges.sh:191
 #, sh-format
 msgid "Rebasing ($new_count/$total)"
 msgstr "Перемещение ($new_count/$total)"
 
-#: git-rebase--preserve-merges.sh:152
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -20652,7 +23054,7 @@ msgid ""
 "These lines can be re-ordered; they are executed from top to bottom.\n"
 msgstr "\nКоманды:\np, pick <коммит> = и�пользовать коммит\nr, reword <коммит> = и�пользовать коммит, но изменить �ообщение коммита\ne, edit <коммит> = и�пользовать коммит, но о�тановить�� дл� и�правлени�\ns, squash <коммит> = и�пользовать коммит, но объединить � предыдущим коммитом\nf, fixup <коммит> = как «squash», но пропу�тить �ообщение коммита\nx, exec <команда> = выполнить команду (о�таток �троки) � помощью командной оболочки\nd, drop <коммит> = удалить коммит\nl, label <метка> = дать им� текущему HEAD\nt, reset <метка> = �бро�ить HEAD к указанной метке\nm, merge [-C <коммит> | -c <коммит>] <метка> [# <�трока>]\n. �оздать �ли�ние и�пользу� �ообщение коммита оригинального\n. �ли�ни� (или и�пользовать указанную �троку, е�ли оригинальное\n. �ли�ние не указано). И�пользуйте -c <коммит> чтобы изменить\n. �ообщение коммита.\n\nЭти �троки можно перемещать; они будут выполнены �верху вниз.\n"
 
-#: git-rebase--preserve-merges.sh:215
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -20664,61 +23066,61 @@ msgid ""
 "\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:240
+#: git-rebase--preserve-merges.sh:285
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1: не �вл�ет�� коммитом, который можно вз�ть"
 
-#: git-rebase--preserve-merges.sh:279
+#: git-rebase--preserve-merges.sh:324
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "�едопу�тимое им� коммита: $sha1"
 
-#: git-rebase--preserve-merges.sh:309
+#: git-rebase--preserve-merges.sh:354
 msgid "Cannot write current commit's replacement sha1"
 msgstr "�е удало�ь запи�ать замену sha1 текущего коммита"
 
-#: git-rebase--preserve-merges.sh:360
+#: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Перемотка вперед до $sha1"
 
-#: git-rebase--preserve-merges.sh:362
+#: git-rebase--preserve-merges.sh:407
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "�е удало�ь перемотать вперед до $sha1"
 
-#: git-rebase--preserve-merges.sh:371
+#: git-rebase--preserve-merges.sh:416
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "�е удало�ь переме�тить HEAD на $first_parent"
 
-#: git-rebase--preserve-merges.sh:376
+#: git-rebase--preserve-merges.sh:421
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
 msgstr "�ельз� уплотнить �ли�ние: $sha1"
 
-#: git-rebase--preserve-merges.sh:394
+#: git-rebase--preserve-merges.sh:439
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "Ошибка при повторении �ли�ни� $sha1"
 
-#: git-rebase--preserve-merges.sh:403
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "�е удало�ь вз�ть $sha1"
 
-#: git-rebase--preserve-merges.sh:412
+#: git-rebase--preserve-merges.sh:457
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "Это �ообщение коммита номер #${n}:"
 
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:462
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "Сообщение коммита номер #${n} будет пропущено:"
 
-#: git-rebase--preserve-merges.sh:428
+#: 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."
@@ -20727,22 +23129,22 @@ msgstr[1] "Это объединение $count коммитов"
 msgstr[2] "Это объединение $count коммитов"
 msgstr[3] "Это объединение $count коммитов"
 
-#: git-rebase--preserve-merges.sh:437
+#: git-rebase--preserve-merges.sh:482
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "�е удало�ь запи�ать $fixup_msg"
 
-#: git-rebase--preserve-merges.sh:440
+#: git-rebase--preserve-merges.sh:485
 msgid "This is a combination of 2 commits."
 msgstr "Это объединение 2 коммитов"
 
-#: git-rebase--preserve-merges.sh:481 git-rebase--preserve-merges.sh:524
-#: git-rebase--preserve-merges.sh:527
+#: 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:556
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -20751,31 +23153,31 @@ msgid ""
 "you are able to reword the commit."
 msgstr "�е удало�ь и�править коммит по�ле у�пешного перехода на $sha1… $rest\nЭто произошло, �корее в�его, из-за пу�того �ообщени� коммита или из-за перехватчика перед коммитом. Е�ли же �то произошло из-за перехватчика перед коммитом, то вам нужно решить � ним проблему и повторить попытку �нова."
 
-#: git-rebase--preserve-merges.sh:571
+#: git-rebase--preserve-merges.sh:616
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "О�тановлено на $sha1_abbrev… $rest"
 
-#: git-rebase--preserve-merges.sh:586
+#: git-rebase--preserve-merges.sh:631
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "�ельз� �делать «$squash_style» без указани� предыдущего коммита"
 
-#: git-rebase--preserve-merges.sh:628
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Выполнение: $rest"
 
-#: git-rebase--preserve-merges.sh:636
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "�е удало�ь выполнить: $rest"
 
-#: git-rebase--preserve-merges.sh:638
+#: git-rebase--preserve-merges.sh:683
 msgid "and made changes to the index and/or the working tree"
 msgstr "и были �деланы изменени� в индек�е и/или в рабочем каталоге"
 
-#: git-rebase--preserve-merges.sh:640
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -20783,7 +23185,7 @@ msgid ""
 msgstr "Вы можете и�править ошибку, а затем запу�тить\n\n\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:653
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -20793,25 +23195,25 @@ msgid ""
 "\tgit rebase --continue"
 msgstr "У�пешное выполнение: $rest\nно о�тали�ь изменени� в индек�е и/или в рабочем каталоге\nСделайте коммит или �пр�чьте ваши изменени�, а затем выполните\n\n\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:664
+#: git-rebase--preserve-merges.sh:709
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "�еопознанна� команда: $command $sha1 $rest"
 
-#: git-rebase--preserve-merges.sh:665
+#: 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:700
+#: git-rebase--preserve-merges.sh:745
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "У�пешно перемещён и обновлён $head_name."
 
-#: git-rebase--preserve-merges.sh:757
+#: git-rebase--preserve-merges.sh:802
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "�е удало�ь удалить CHERRY_PICK_HEAD"
 
-#: git-rebase--preserve-merges.sh:762
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -20829,43 +23231,43 @@ msgid ""
 "  git rebase --continue\n"
 msgstr "У ва� имеют�� проиндек�ированные изменени� в рабочем каталоге.\nЕ�ли �ти изменени� должны быть объеденены � предыдущим коммитом, то запу�тите:\n\n  git commit --amend $gpg_sign_opt_quoted\n\nЕ�ли же они должны быть помещены в новый коммит, то запу�тите:\n\n  git commit $gpg_sign_opt_quoted\n\nВ любом �лучае, по�ле того как вы закончите, продолжить перемещение можно выполнив:\n\n  git rebase --continue\n"
 
-#: git-rebase--preserve-merges.sh:779
+#: git-rebase--preserve-merges.sh:824
 msgid "Error trying to find the author identity to amend commit"
 msgstr "Произошла ошибка при пои�ке автора дл� и�правлени� коммита"
 
-#: git-rebase--preserve-merges.sh:784
+#: 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:789 git-rebase--preserve-merges.sh:793
+#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
 msgid "Could not commit staged changes."
 msgstr "�е удало�ь закоммитить проиндек�ированные изменени�."
 
-#: git-rebase--preserve-merges.sh:824 git-rebase--preserve-merges.sh:910
+#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
 msgid "Could not execute editor"
 msgstr "�е удало�ь запу�тить редактор"
 
-#: git-rebase--preserve-merges.sh:845
+#: git-rebase--preserve-merges.sh:890
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "�е удало�ь перейти на вер�ию $switch_to"
 
-#: git-rebase--preserve-merges.sh:852
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr "�ет указател� HEAD?"
 
-#: git-rebase--preserve-merges.sh:853
+#: git-rebase--preserve-merges.sh:898
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "�е удало�ь �оздать временный каталог $state_dir"
 
-#: git-rebase--preserve-merges.sh:856
+#: git-rebase--preserve-merges.sh:901
 msgid "Could not mark as interactive"
 msgstr "�е удало�ь пометить как интерактивный"
 
-#: git-rebase--preserve-merges.sh:888
+#: git-rebase--preserve-merges.sh:933
 #, sh-format
 msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -20874,7 +23276,11 @@ msgstr[1] "Перемещение $shortrevisions над $shortonto ($todocount
 msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
 msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
 
-#: git-rebase--preserve-merges.sh:942 git-rebase--preserve-merges.sh:947
+#: 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 "�е удало�ь инициализировать перезапи�анные коммиты"
 
@@ -20936,59 +23342,12 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "�е удало�ь определить аб�олютный путь к каталогу git"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:196
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:197
-msgid "staged"
-msgstr "в индек�е"
-
-#: git-add--interactive.perl:197
-msgid "unstaged"
-msgstr "не в индек�е"
-
-#: git-add--interactive.perl:253 git-add--interactive.perl:278
-msgid "binary"
-msgstr "двоичный"
-
-#: git-add--interactive.perl:262 git-add--interactive.perl:316
-msgid "nothing"
-msgstr "ничего"
-
-#: git-add--interactive.perl:298 git-add--interactive.perl:313
-msgid "unchanged"
-msgstr "нет изменений"
-
-#: git-add--interactive.perl:609
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "добавлен %d путь\n"
-msgstr[1] "добавлено %d пути\n"
-msgstr[2] "добавлено %d путей\n"
-msgstr[3] "добавлено %d пути\n"
-
-#: git-add--interactive.perl:612
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "обновлён %d путь\n"
-msgstr[1] "обновлено %d пути\n"
-msgstr[2] "обновлено %d путей\n"
-msgstr[3] "обновлено %d пути\n"
-
-#: git-add--interactive.perl:615
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "обращены изменени� %d пути\n"
-msgstr[1] "обращены изменени� %d путей\n"
-msgstr[2] "обращены изменени� %d путей\n"
-msgstr[3] "обращены изменени� %d путей\n"
-
-#: git-add--interactive.perl:618
+#: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
@@ -20997,67 +23356,44 @@ msgstr[1] "тронуты %d пути\n"
 msgstr[2] "тронуты %d путей\n"
 msgstr[3] "тронуты %d пути\n"
 
-#: git-add--interactive.perl:627
-msgid "Update"
-msgstr "Обновить"
-
-#: git-add--interactive.perl:639
-msgid "Revert"
-msgstr "Обратить изменени�"
-
-#: git-add--interactive.perl:662
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "примечание: %s теперь неот�леживаемый.\n"
-
-#: git-add--interactive.perl:673
-msgid "Add untracked"
-msgstr "Добавить неот�леживаемый"
-
-#: git-add--interactive.perl:679
-msgid "No untracked files.\n"
-msgstr "�ет неот�леживаемых файлов.\n"
-
-#: git-add--interactive.perl:1033
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "Е�ли патч примен�ет�� без ошибок, то изменённый блок будет �разу помечен дл� индек�ировани�."
 
-#: git-add--interactive.perl:1036
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr "Е�ли патч примен�ет�� без ошибок, то изменённый блок будет �разу помечен дл� пр�тань�."
 
-#: git-add--interactive.perl:1039
+#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "Е�ли патч примен�ет�� без ошибок, то изменённый блок будет �разу помечен дл� убирани� из индек�а."
 
-#: git-add--interactive.perl:1042 git-add--interactive.perl:1051
+#: 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."
 msgstr "Е�ли патч примен�ет�� без ошибок, то изменённый блок будет �разу помечен дл� применени�."
 
-#: git-add--interactive.perl:1045 git-add--interactive.perl:1048
+#: 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."
 msgstr "Е�ли патч примен�ет�� без ошибок, то изменённый блок будет �разу помечен дл� отмены изменений."
 
-#: git-add--interactive.perl:1085
+#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "не удало�ь открыть файл редактировани� блока изменений дл� запи�и: %s"
 
-#: git-add--interactive.perl:1086
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Ручной режим редактировани� блока изменений — �мотрите ниже дл� небольшого руковод�тва.\n"
-
-#: git-add--interactive.perl:1092
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -21066,32 +23402,12 @@ msgid ""
 "Lines starting with %s will be removed.\n"
 msgstr "---\nЧтобы удалить «%s» �троки, �делайте их ' ' �троками (контек�т).\nЧтобы удалить «%s» �троки, удалите их.\nСтроки, начинающие�� � %s будут удалены.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1100
-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"
-
-#: git-add--interactive.perl:1114
+#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "не удало�ь открыть файл редактировани� блока изменений дл� чтени�: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1213
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]?"
-" "
-msgstr "Изменённый вами блок не примен�ет��. Редактировать �нова (ответ «y» означает «нет»!) [y/n]? "
-
-#: git-add--interactive.perl:1222
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -21100,7 +23416,7 @@ msgid ""
 "d - do not stage this hunk or any of the later hunks in the file"
 msgstr "y - проиндек�ировать блок изменений\nn - не индек�ировать �тот блок изменений\nq - выход; не индек�ировать �тот и по�ледующие блоки\na - проиндек�ировать �тот и в�е по�ледующие блоки файла\nd - не индек�ировать �тот и по�ледующие блоки файла"
 
-#: git-add--interactive.perl:1228
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -21109,7 +23425,7 @@ msgid ""
 "d - do not stash this hunk or any of the later hunks in the file"
 msgstr "y - �пр�тать изменени� блока\nq - выход; не пр�тать изменени� �того и по�ледующих блоков\na - �пр�тать �тот и в�е по�ледующие блоки файла\nd - не пр�тать �тот и по�ледующие блоки файла"
 
-#: git-add--interactive.perl:1234
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -21118,7 +23434,7 @@ msgid ""
 "d - do not unstage this hunk or any of the later hunks in the file"
 msgstr "y - убрать из индек�а �тот блок изменений\nn - не убирать из индек�а �тот блок изменений\nq - выход; не убирать из индек�а �тот и по�ледующие блоки\na - убрать из индек�а �тот и в�е по�ледующие блоки файла\nd - не убирать из индек�а �тот и по�ледующие блоки файла"
 
-#: git-add--interactive.perl:1240
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -21127,7 +23443,7 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr "y - применить блок изменений к индек�у\nn - не примен�ть �тот блок изменений к индек�у\nq - выход; не примен�ть �тот и по�ледующие блоки\na - применить �тот блок и в�е по�ледующие блоки файла\nd - не примен�ть �тот и по�ледующие блоки файла"
 
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -21136,7 +23452,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr "y - отменить изменени� �того блока в рабочем каталоге\nn - не отмен�ть изменени� �того блока в рабочем каталоге\nq - выход; не отмен�ть изменени� �того блока и в�ех по�ледующих\na - отменить изменени� �того и в�ех по�ледующих блоков файла\nd - не отмен�ть изменени� �того и в�ех по�ледующих блоков файла"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -21145,7 +23461,7 @@ msgid ""
 "d - do not discard this hunk or any of the later hunks in the file"
 msgstr "y - отменить изменени� �того блока в индек�е и рабочем каталоге\nn - не отмен�ть изменени� �того блока в индек�е и рабочем каталоге\nq - выход; не отмен�ть изменени� �того блока и в�ех по�ледующих\na - отменить изменени� �того и в�ех по�ледующих блоков файла\nd - не отмен�ть изменени� �того и в�ех по�ледующих блоков файла"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -21154,7 +23470,16 @@ msgid ""
 "d - do not apply this hunk or any of the later hunks in the file"
 msgstr "y - применить блок изменений к индек�у и рабочему каталогу\nn - не примен�ть �тот блок изменений к индек�у и рабочему каталогу\nq - выход; не примен�ть �тот и по�ледующие блоки\na - применить �тот блок и в�е по�ледующие блоки файла\nd - не примен�ть �тот и по�ледующие блоки файла"
 
-#: git-add--interactive.perl:1273
+#: git-add--interactive.perl:1299
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -21167,158 +23492,45 @@ msgid ""
 "? - print help\n"
 msgstr "g - выбрать блок изменений на который нужно перейти\n/ - пои�к блока изменений � помощью регул�рного выражени�\nj - не принимать решение по �тому блоку, перейти на �ледующий без решени�\nJ - не принимать решение по �тому блоку, перейти на �ледующий\nk - не принимать решение по �тому блоку, перейти на предыдущий без решени�\nK - не принимать решение по �тому блоку, перейти на предыдущий\ns - разделить текущий блок на блоки меньшего размера\ne - вручную отредактировать текущий блок\n? - выве�ти �правку\n"
 
-#: git-add--interactive.perl:1304
+#: git-add--interactive.perl:1345
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Выбранные блоки не примен�ют�� без ошибок к индек�у!\n"
 
-#: git-add--interactive.perl:1305
-msgid "Apply them to the worktree anyway? "
-msgstr "В�е равно применить их к рабочему каталогу?"
-
-#: git-add--interactive.perl:1308
-msgid "Nothing was applied.\n"
-msgstr "�ичего не применено.\n"
-
-#: git-add--interactive.perl:1319
+#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "игнорирую не �литое: %s\n"
 
-#: git-add--interactive.perl:1328
-msgid "Only binary files changed.\n"
-msgstr "Только изменени� двоичных файлов.\n"
-
-#: git-add--interactive.perl:1330
-msgid "No changes.\n"
-msgstr "�ет изменений.\n"
-
-#: git-add--interactive.perl:1338
-msgid "Patch update"
-msgstr "Обновление патча"
-
-#: git-add--interactive.perl:1390
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Проиндек�ировать изменение режима до�тупа [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1391
+#: git-add--interactive.perl:1479
 #, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Проиндек�ировать удаление [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1392
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Проиндек�ировать �тот блок изменений [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1395
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Спр�тать изменение режима до�тупа [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1396
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Спр�тать удаление файла [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1397
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Спр�тать �тот блок изменений [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1400
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "Убрать изменени� режима до�тупа из индек�а [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1401
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "Убрать удаление из индек�а [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1402
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Убрать из индек�а �тот блок измений [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1405
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "Применить изменение режима до�тупа к индек�у [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1406
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Применить удаление к индек�у [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1407
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "Применить �тот блок к индек�у [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1410
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "Отменить изменени� режима до�тупа в рабочем каталоге [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1411
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "Отменить удаление в рабочем каталоге [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1412
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "Отменить изменени� �того блока в рабочем каталоге [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1415
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Отменить изменени� режима до�тупа в индек�е и рабочем каталоге [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1416
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Отменить удаление в индек�е и рабочем каталоге [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1417
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Отменить изменени� �того блока в индек�е и рабочем каталоге [y,n,q,a,d%s,?]? "
+msgid "Apply mode change to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
 
-#: git-add--interactive.perl:1420
+#: git-add--interactive.perl:1480
 #, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Применить изменени� режима до�тупа к индек�у и рабочему каталогу [y,n,q,a,d%s,?]? "
+msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
 
-#: git-add--interactive.perl:1421
+#: git-add--interactive.perl:1481
 #, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Применить удаление к индек�у и рабочему каталогу [y,n,q,a,d%s,?]? "
+msgid "Apply addition to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
 
-#: git-add--interactive.perl:1422
+#: git-add--interactive.perl:1482
 #, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "Применить изменени� �того блока к индек�у и рабочему каталогу [y,n,q,a,d%s,?]? "
+msgid "Apply this hunk to worktree [y,n,q,a,d%s,?]? "
+msgstr ""
 
-#: git-add--interactive.perl:1522
+#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
 msgstr ""
 
-#: git-add--interactive.perl:1529
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "на какой блок перейти (нажмите <ввод> чтобы увидеть еще)? "
-
-#: git-add--interactive.perl:1531
-msgid "go to which hunk? "
-msgstr "на какой блок перейти? "
-
-#: git-add--interactive.perl:1540
+#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "�еверный номер: «%s»\n"
 
-#: git-add--interactive.perl:1545
+#: git-add--interactive.perl:1622
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
@@ -21327,36 +23539,32 @@ msgstr[1] "Про�тите, но только %d блока изменений
 msgstr[2] "Про�тите, но только %d блоков изменений до�тупно.\n"
 msgstr[3] "Про�тите, но только %d блока изменений до�тупно.\n"
 
-#: git-add--interactive.perl:1571
+#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
 msgstr ""
 
-#: git-add--interactive.perl:1575
-msgid "search for regex? "
-msgstr "и�кать � помощью регул�рного выражени�? "
-
-#: git-add--interactive.perl:1588
+#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Регул�рное выражение дл� пои�ка в неверном формате %s: %s\n"
 
-#: git-add--interactive.perl:1598
+#: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
 msgstr "�е найдены блоки, которые �оответ�твуют указанному шаблону\n"
 
-#: git-add--interactive.perl:1610 git-add--interactive.perl:1632
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr "�ет предыдущего блока\n"
 
-#: git-add--interactive.perl:1619 git-add--interactive.perl:1638
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr "�е �ледующего блока\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1650
+#: git-add--interactive.perl:1736
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
@@ -21365,17 +23573,13 @@ msgstr[1] "Разбито на %d блока изменений.\n"
 msgstr[2] "Разбито на %d блоков изменений.\n"
 msgstr[3] "Разбито на %d блока изменений.\n"
 
-#: git-add--interactive.perl:1660
+#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr ""
 
-#: git-add--interactive.perl:1706
-msgid "Review diff"
-msgstr "Про�мотреть изменени�"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1725
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -21385,18 +23589,19 @@ msgid ""
 "add untracked - add contents of untracked files to the staged set of changes\n"
 msgstr "status        - показать пути � изменени�ми\nupdate        - добавить �о�то�ние рабочего каталога индек�\nrevert        - вернуть проиндек�ированный набор изменений к HEAD вер�ии\npatch         - выбрать и выборочно обновить блоки\ndiff          - про�мотреть изменени� между HEAD и индек�ом\nadd untracked - добавить �одержимое неот�леживаемых файлов в индек�\n"
 
-#: git-add--interactive.perl:1742 git-add--interactive.perl:1747
-#: git-add--interactive.perl:1750 git-add--interactive.perl:1757
-#: git-add--interactive.perl:1761 git-add--interactive.perl:1767
+#: 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
 msgid "missing --"
 msgstr "от�ут�твует --"
 
-#: git-add--interactive.perl:1763
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "неизве�тный режим дл� --patch: %s"
 
-#: git-add--interactive.perl:1769 git-add--interactive.perl:1775
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "недопу�тимый аргумент %s, ожидает�� --"
@@ -21409,65 +23614,72 @@ msgstr "локальный ча�овой по�� отличает�� от GMT
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "локальный �двиг времени больше или равен 24 ча�а\n"
 
-#: git-send-email.perl:219 git-send-email.perl:225
+#: git-send-email.perl:223 git-send-email.perl:229
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "редактор был завершен � ошибкой, отмен�ю в�ё"
 
-#: git-send-email.perl:302
+#: git-send-email.perl:312
 #, perl-format
 msgid "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "«%s» �одержит промежуточную вер�ию пи�ьма, которое вы готовите.\n"
 
-#: git-send-email.perl:307
+#: git-send-email.perl:317
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "«%s.final» �одержит подготовленное пи�ьмо.\n"
 
-#: git-send-email.perl:326
+#: git-send-email.perl:410
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases не �овме�тимо � другими опци�ми\n"
 
-#: git-send-email.perl:395 git-send-email.perl:656
+#: git-send-email.perl:484
+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
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "�ельз� запу�кать git format-patch вне репозитори�\n"
 
-#: git-send-email.perl:398
+#: git-send-email.perl:492
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
 msgstr ""
 
-#: git-send-email.perl:470
+#: git-send-email.perl:505
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "�еизве�тное поле --suppress-cc: «%s»\n"
 
-#: git-send-email.perl:501
+#: git-send-email.perl:536
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "�еизве�тный параметр --confirm: «%s»\n"
 
-#: git-send-email.perl:529
+#: git-send-email.perl:564
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "предупреждение: �окращение дл� sendmail � кавычками не поддерживает��: %s\n"
 
-#: git-send-email.perl:531
+#: git-send-email.perl:566
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "предупреждение: «:include:» не поддерживает��: %s\n"
 
-#: git-send-email.perl:533
+#: git-send-email.perl:568
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживает��: %s\n"
 
-#: git-send-email.perl:538
+#: git-send-email.perl:573
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "предупреждение: �трока sendmail не ра�познана: %s\n"
 
-#: git-send-email.perl:622
+#: git-send-email.perl:657
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -21477,36 +23689,36 @@ msgid ""
 "    * Giving --format-patch option if you mean a range.\n"
 msgstr "Файл «%s» �уще�твует, но �то также может быть и\nдиапазоном коммитов дл� которых нужно �делать патчи. \nУ�траните неоднозначно�ть…\n\n    * Указав \"./%s\" е�ли вы имеете в виду им� файла; или\n    * Передав опцию --format-patch е�ли вы имеете в виду диапазон коммитов.\n"
 
-#: git-send-email.perl:643
+#: git-send-email.perl:678
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "�е удало�ь выполнить opendir %s: %s"
 
-#: git-send-email.perl:667
+#: git-send-email.perl:702
 #, perl-format
 msgid ""
 "fatal: %s: %s\n"
 "warning: no patches were sent\n"
 msgstr "критиче�ка� ошибка: %s: %s\nпредупреждение: патчи не были отправлены\n"
 
-#: git-send-email.perl:678
+#: git-send-email.perl:713
 msgid ""
 "\n"
 "No patch files specified!\n"
 "\n"
 msgstr "\nФайл � патчем не указан!\n\n"
 
-#: git-send-email.perl:691
+#: git-send-email.perl:726
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "�ет �троки � темой в %s?"
 
-#: git-send-email.perl:701
+#: git-send-email.perl:736
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "�е удало�ь открыть дл� запи�и %s: %s"
 
-#: git-send-email.perl:712
+#: git-send-email.perl:747
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -21515,37 +23727,37 @@ msgid ""
 "Clear the body content if you don't wish to send a summary.\n"
 msgstr "Строки, начинающие�� � «GIT:» будут удалены.\nВозможно будет полезно включить �тати�тику добавлений\nи удалений или таблицу �одержимого к �оздаваемому патчу.\n\nОчи�тите �одержимое, е�ли вы не хотите отправл�ть пи�ьмо �о �водкой изменений.\n"
 
-#: git-send-email.perl:736
+#: git-send-email.perl:771
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "�е удало�ь открыть %s: %s"
 
-#: git-send-email.perl:753
+#: git-send-email.perl:788
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "�е удало�ь открыть %s.final: %s"
 
-#: git-send-email.perl:796
+#: git-send-email.perl:831
 msgid "Summary email is empty, skipping it\n"
 msgstr "Пи�ьмо �о �водкой изменений пу�тое, попу�каю его\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:831
+#: git-send-email.perl:866
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "Вы уверены, что хотите и�пользовать <%s> [y/N]? "
 
-#: git-send-email.perl:886
+#: git-send-email.perl:921
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
 msgstr "Следующие файлы 8 битные, но не �одержат Content-Transfer-Encoding.\n"
 
-#: git-send-email.perl:891
+#: git-send-email.perl:926
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? "
 
-#: git-send-email.perl:899
+#: git-send-email.perl:934
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -21553,20 +23765,20 @@ msgid ""
 "has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
 msgstr "Отказываю�ь отправить, т.к. патч\n\t%s\n�одержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, е�ли вы  дей�твительно хотите отправить его.\n"
 
-#: git-send-email.perl:918
+#: git-send-email.perl:953
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "Кому должны быть отправлены пи�ьма (е�ли нужно)?"
 
-#: git-send-email.perl:936
+#: git-send-email.perl:971
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "критиче�ка� ошибка: �окращение «%s» ра�крывает�� �амо в �еб�\n"
 
-#: git-send-email.perl:948
+#: git-send-email.perl:983
 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:1006 git-send-email.perl:1014
+#: git-send-email.perl:1041 git-send-email.perl:1049
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "ошибка: не удало�ь выделить дей�твительный адре� из: %s\n"
@@ -21574,16 +23786,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:1018
+#: git-send-email.perl:1053
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "Что нужно �делать � �тим адре�ом? ([q] - выход|[d] - отбро�ить|[e] - редактировать): "
 
-#: git-send-email.perl:1335
+#: git-send-email.perl:1370
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "путь CA «%s» не �уще�твует"
 
-#: git-send-email.perl:1418
+#: git-send-email.perl:1453
 msgid ""
 "    The Cc list above has been expanded by additional\n"
 "    addresses found in the patch commit message. By default\n"
@@ -21600,128 +23812,128 @@ msgstr "    СпиÑ�ок Cc (получателей копии пиÑ�ьма) бÑ
 #. 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:1433
+#: git-send-email.perl:1468
 msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
 msgstr "Отправить �то пи�ьмо? ([y] - да|[n] - нет|[e] - изменить|[q] - выход|[a] - в�е): "
 
-#: git-send-email.perl:1436
+#: git-send-email.perl:1471
 msgid "Send this email reply required"
 msgstr "Отправка �того ответа на пи�ьмо об�зательна"
 
-#: git-send-email.perl:1464
+#: git-send-email.perl:1499
 msgid "The required SMTP server is not properly defined."
 msgstr "Требуемый SMTP �ервер не был правильно объ�влен."
 
-#: git-send-email.perl:1511
+#: git-send-email.perl:1546
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Сервер не поддерживает STARTTLS! %s"
 
-#: git-send-email.perl:1516 git-send-email.perl:1520
+#: git-send-email.perl:1551 git-send-email.perl:1555
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "Ошибка STARTTLS! %s"
 
-#: git-send-email.perl:1529
+#: git-send-email.perl:1564
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "�е удало�ь инициализировать SMTP. Проверьте ваши на�тройки и попробуйте запу�тить в параметром --smtp-debug."
 
-#: git-send-email.perl:1547
+#: git-send-email.perl:1582
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "�е удало�ь отправить %s\n"
 
-#: git-send-email.perl:1550
+#: git-send-email.perl:1585
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Имитаци� отправки %s\n"
 
-#: git-send-email.perl:1550
+#: git-send-email.perl:1585
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Отправлено %s\n"
 
-#: git-send-email.perl:1552
+#: git-send-email.perl:1587
 msgid "Dry-OK. Log says:\n"
 msgstr "Имитаци� OK. Журнал �одержит:\n"
 
-#: git-send-email.perl:1552
+#: git-send-email.perl:1587
 msgid "OK. Log says:\n"
 msgstr "OK. Журнал �одержит:\n"
 
-#: git-send-email.perl:1564
+#: git-send-email.perl:1599
 msgid "Result: "
 msgstr "Результат: "
 
-#: git-send-email.perl:1567
+#: git-send-email.perl:1602
 msgid "Result: OK\n"
 msgstr "Результат: OK\n"
 
-#: git-send-email.perl:1585
+#: git-send-email.perl:1620
 #, perl-format
 msgid "can't open file %s"
 msgstr "не удало�ь открыть файл %s"
 
-#: git-send-email.perl:1632 git-send-email.perl:1652
+#: git-send-email.perl:1667 git-send-email.perl:1687
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) Добавление cc: %s �о �троки «%s»\n"
 
-#: git-send-email.perl:1638
+#: git-send-email.perl:1673
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) Добавление to: %s �о �троки «%s»\n"
 
-#: git-send-email.perl:1691
+#: git-send-email.perl:1730
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) Добавление cc: %s �о �троки «%s»\n"
 
-#: git-send-email.perl:1726
+#: git-send-email.perl:1765
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) Добавление cc: %s �о �троки «%s»\n"
 
-#: git-send-email.perl:1837
+#: git-send-email.perl:1876
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �е удало�ь выполнить «%s»"
 
-#: git-send-email.perl:1844
+#: git-send-email.perl:1883
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) Добавление %s: %s из: «%s»\n"
 
-#: git-send-email.perl:1848
+#: git-send-email.perl:1887
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) не удало�ь закрыть поток к «%s»"
 
-#: git-send-email.perl:1878
+#: git-send-email.perl:1917
 msgid "cannot send message as 7bit"
 msgstr "не удало�ь отправить �ообщение в 7 битной кодировке"
 
-#: git-send-email.perl:1886
+#: git-send-email.perl:1925
 msgid "invalid transfer encoding"
 msgstr "недопу�тима� кодировка передачи"
 
-#: git-send-email.perl:1927 git-send-email.perl:1979 git-send-email.perl:1989
+#: git-send-email.perl:1966 git-send-email.perl:2018 git-send-email.perl:2028
 #, perl-format
 msgid "unable to open %s: %s\n"
 msgstr "не удало�ь открыть %s: %s\n"
 
-#: git-send-email.perl:1930
+#: git-send-email.perl:1969
 #, perl-format
 msgid "%s: patch contains a line longer than 998 characters"
 msgstr "%s: патч �одержит �троку длиннее чем 998 �имволов"
 
-#: git-send-email.perl:1947
+#: git-send-email.perl:1986
 #, 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:1951
+#: git-send-email.perl:1990
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
-msgstr "Вы дей�твительно хотите отправить %s? [y - да|N - нет]: "
+msgstr "Вы дей�твительно хотите отправить %s? [y] - да, [N] - нет: "
diff --git a/po/sv.po b/po/sv.po
index 25f245e3ee..7e088249e3 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
 # Swedish translations for Git.
-# Copyright (C) 2010-2019 Peter Krefting <peter@softwolves.pp.se>
+# Copyright (C) 2010-2021 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, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019.
+# Peter Krefting <peter@softwolves.pp.se>, 2010-2021.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git 2.24.0\n"
+"Project-Id-Version: git 2.33.0\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-10-28 13:19+0800\n"
-"PO-Revision-Date: 2019-10-30 23:18+0100\n"
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"PO-Revision-Date: 2021-08-14 21:14+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,49 +16,777 @@ 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 2.91.7\n"
+"X-Generator: Gtranslator 3.30.1\n"
 
-#: advice.c:109
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Vadå (%s)?"
+
+#: 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 "kunde inte läsa indexet"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "binär"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "ingenting"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "oändrad"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Uppdatera"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr "kunde inte köa \"%s\""
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+msgid "could not write index"
+msgstr "kunde inte skriva indexet"
+
+#: add-interactive.c:706 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
+#, 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
+#, 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
+msgid "Revert"
+msgstr "Återställ"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "kunde inte tolka HEAD^{tree}"
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Inga ospårade filer.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Lägg till ospårad"
+
+#: add-interactive.c:895 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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "ignorerar ej sammanslagen: %s"
+
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Endast binära filer ändrade.\n"
+
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "Inga ändringar.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Uppdatera patch"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Granska diff"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "visa sökvägar med ändringar"
+
+#: add-interactive.c:1012
+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
+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
+msgid "pick hunks and update selectively"
+msgstr "välj stycken och uppdatera selektivt"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "visa skillnad mellan HEAD och index"
+
+#: add-interactive.c:1020
+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
+msgid "Prompt help:"
+msgstr "Kommandoradshjälp:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "markera en post"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "markera intervall av poster"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "markera flera intervall"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "markera post baserad på unikt prefix"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "avmarkera angivna poster"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "välj alla poster"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(tomt) avsluta markering"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "markera en numrerad post"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(tomt) markera ingenting"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Kommandon ***"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Vad nu"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "köad"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "ej köad"
+
+#: 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 "sökväg"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "kunde inte uppdatera indexet"
+
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "Hej då.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "Köa stycket [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 ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att köas "
+"omedelbart."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - köa stycket\n"
+"n - köa inte stycket\n"
+"q - avsluta; köa inte stycket eller något av de följande\n"
+"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
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "Stash:a stycket [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 ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att läggas till "
+"i \"stash\" omedelbart."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - \"stash\":a stycket\n"
+"n - \"stash\":a inte stycket\n"
+"q - avsluta; \"stash\":a inte stycket eller något av de följande\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:85
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att tas bort "
+"från kön omedelbart."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - ta bort stycket från kön\n"
+"n - ta inte bort stycket från kön\n"
+"q - avsluta; ta inte bort stycket eller något av de följande från kön\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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 ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
+"för applicering omedelbart."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applicera stycket på indexet\n"
+"n - applicera inte stycket på indexet\n"
+"q - avsluta; applicera inte stycket eller något av de följande\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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 ""
+"Om patchen kan appliceras rent kommer det redigerade stycket att markeras "
+"för kasta omedelbart."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - förkasta stycket från arbetskatalogen\n"
+"n - förkasta inte stycket från arbetskatalogen\n"
+"q - avsluta; förkasta inte stycket eller något av de följande\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - förkasta stycket från indexet och arbetskatalogen\n"
+"n - förkasta inte stycket från indexet och arbetskatalogen\n"
+"q - avsluta; förkasta inte stycket eller något av de följande\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applicera stycket på indexet och arbetskatalogen\n"
+"n - applicera inte stycket på indexet och arbetskatalogen\n"
+"q - avsluta; applicera inte stycket eller något av de följande\n"
+"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:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - applicera stycket på arbetskatalogen\n"
+"n - applicera inte stycket på arbetskatalogen\n"
+"q - avsluta; applicera inte stycket eller något av de följande\n"
+"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:343
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "kunde inte tolka styckehuvudet \"%.*s\""
+
+#: 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:420
+msgid "could not parse diff"
+msgstr "kunde inte tolka diff"
+
+#: add-patch.c:439
+msgid "could not parse colored diff"
+msgstr "kunde inte tolka färgad diff"
+
+#: add-patch.c:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr "misslyckades att köra \"%s\""
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "omaka utdata från interactive.diffFilter"
+
+#: add-patch.c:613
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Alla rader i indata måste ha en motsvarande rad i utdata från\n"
+"ditt filter."
+
+#: add-patch.c:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"förväntade sammanhangsrad %d i\n"
+"%.*s"
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"stycken överlappar inte:\n"
+"%.*s\n"
+"\tavslutas inte med:\n"
+"%.*s"
+
+#: 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:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"Ta bort \"%c\" rader genom att göra dem \" \"-rader (sammanhang).\n"
+"Ta bort \"%c\" rader genom att radera dem.\n"
+"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: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 ""
+"Om patchen inte kan appliceras rent kommer du få en möjlighet att\n"
+"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:1133
+msgid "could not parse hunk header"
+msgstr "kunde inte tolka styckehuvud"
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr "\"git apply --cached\" misslyckades"
+
+#. 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.
+#.
+#. 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:1247 git-add--interactive.perl:1242
+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:1290
+msgid "The selected hunks do not apply to the index!"
+msgstr "Markerade stycken kan inte appliceras på indexet!"
+
+#: add-patch.c:1291 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Applicera dem på arbetskatalogen trots det? "
+
+#: add-patch.c:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Ingenting applicerades.\n"
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - lämna stycket obestämt, se nästa obestämda stycke\n"
+"J - lämna stycket obestämt, se nästa stycke\n"
+"k - lämna stycket obestämt, se föregående obestämda stycke\n"
+"K - lämna stycket obestämt, se föregående stycke\n"
+"g - välj ett stycke att gå till\n"
+"/ - sök efter stycke som motsvarar angivet reguljärt uttryck\n"
+"s - dela aktuellt stycke i mindre styckens\n"
+"e - redigera aktuellt stycke manuellt\n"
+"? - visa hjälp\n"
+
+#: add-patch.c:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr "Inget föregående stycke"
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr "Inget följande stycke"
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr "Inga andra stycken att gå till"
+
+#: add-patch.c:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "gå till vilket stycke (<ret> för att se fler)? "
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "gå till vilket stycke? "
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Ogiltigt siffervärde: \"%s\""
+
+#: 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:1575
+msgid "No other hunks to search"
+msgstr "Inga andra stycken att söka efter"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "sök efter reguljärt uttryck? "
+
+#: 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:1613
+msgid "No hunk matches the given pattern"
+msgstr "Inga stycken motsvarar givet mönster"
+
+#: add-patch.c:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "Beklagar, kan inte dela stycket"
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Dela i %d stycken."
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr "Beklagar, kan inte redigera stycket"
+
+#: add-patch.c:1680
+msgid "'git apply' failed"
+msgstr "\"git apply\" misslyckades"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Slå av meddelandet med \"git config advice.%s false\""
+
+#: advice.c:161
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%stips: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:252
 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:164
+#: advice.c:254
 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:166
+#: advice.c:256
 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:168
+#: advice.c:258
 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:170
+#: advice.c:260
 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:172
+#: advice.c:262
 #, 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:180
+#: 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."
@@ -66,23 +794,41 @@ 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:188
+#: advice.c:278
 msgid "Exiting because of an unresolved conflict."
 msgstr "Avslutar på grund av olöst konflikgt."
 
-#: advice.c:193 builtin/merge.c:1332
+#: advice.c:283 builtin/merge.c:1375
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
 
-#: advice.c:195
+#: advice.c:285
 msgid "Please, commit your changes before merging."
 msgstr "Checka in dina ändringar innan du utför sammanslagningen."
 
-#: advice.c:196
+#: advice.c:286
 msgid "Exiting because of unfinished merge."
 msgstr "Avslutar på grund av ofullbordad sammanslagning."
 
-#: advice.c:202
+#: 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 ""
+"Följande sökvägsangivelser motsvarar inte någon kvalificerad sökväg, men "
+"motsvarar\n"
+"indexposter utanför den nuvarande glesa utcheckningen:\n"
+
+#: advice.c:303
+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."
+
+#: advice.c:310
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -133,82 +879,78 @@ msgstr "kommandorad avslutas med \\"
 msgid "unclosed quote"
 msgstr "citat ej stängt"
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "okänt alternativ för whitespace: \"%s\""
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "okänt alternativ för ignore-whitespace: \"%s\""
 
-#: apply.c:135
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject och --3way kan inte användas samtidigt."
 
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached och --3way kan inte användas samtidigt."
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
 msgstr "--3way utanför arkiv"
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
 msgstr "--index utanför arkiv"
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
 msgstr "--cached utanför arkiv"
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec returnerade %d för indata: %s"
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "kan inte hitta filnamn i patchen på rad %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: dålig git-diff - förväntade /dev/null, fick %s på rad %d"
 
-#: apply.c:928
+#: apply.c:927
 #, c-format
 msgid "git apply: bad git-diff - inconsistent new filename on line %d"
 msgstr "git apply: dålig git-diff - motsägande nytt filnamn på rad %d"
 
-#: apply.c:929
+#: apply.c:928
 #, c-format
 msgid "git apply: bad git-diff - inconsistent old filename on line %d"
 msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d"
 
-#: apply.c:934
+#: apply.c:933
 #, c-format
 msgid "git apply: bad git-diff - expected /dev/null on line %d"
 msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d"
 
-#: apply.c:963
+#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "ogiltigt läge på rad %d: %s"
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "huvudet är inkonsekvent mellan rad %d och %d"
 
-#: apply.c:1372
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -224,92 +966,92 @@ msgstr[1] ""
 "sökvägskomponenter\n"
 "tas bort (rad %d)"
 
-#: apply.c:1385
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
 
-#: apply.c:1481
+#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
-msgstr "recount: förväntade rad: %.*s"
+msgstr "recount: oväntad rad: %.*s"
 
-#: apply.c:1550
+#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "patch-fragment utan huvud på rad %d: %.*s"
 
-#: apply.c:1753
+#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "ny fil beror på gammalt innehåll"
 
-#: apply.c:1755
+#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "borttagen fil har fortfarande innehåll"
 
-#: apply.c:1789
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "trasig patch på rad %d"
 
-#: apply.c:1826
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "nya filen %s beror på gammalt innehåll"
 
-#: apply.c:1828
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "borttagna filen %s har fortfarande innehåll"
 
-#: apply.c:1831
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** varning: filen %s blir tom men har inte tagits bort"
 
-#: apply.c:1978
+#: apply.c:1977
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "trasig binärpatch på rad %d: %.*s"
 
-#: apply.c:2015
+#: apply.c:2014
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "binärpatchen på rad %d känns inte igen"
 
-#: apply.c:2177
+#: apply.c:2176
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "patch med bara skräp på rad %d"
 
-#: apply.c:2263
+#: apply.c:2262
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "kunde inte läsa symboliska länken %s"
 
-#: apply.c:2267
+#: apply.c:2266
 #, c-format
 msgid "unable to open or read %s"
 msgstr "kunde inte öppna eller läsa %s"
 
-#: apply.c:2926
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "felaktig inledning på rad: \"%c\""
 
-#: apply.c:3047
+#: 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] "Stycke %d lyckades på %d (offset %d rad)."
 msgstr[1] "Stycke %d lyckades på %d (offset %d rader)."
 
-#: apply.c:3059
+#: apply.c:3068
 #, 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:3065
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -318,25 +1060,25 @@ msgstr ""
 "vid sökning efter:\n"
 "%.*s"
 
-#: apply.c:3087
+#: apply.c:3096
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "saknar binära patchdata för \"%s\""
 
-#: apply.c:3095
+#: apply.c:3104
 #, 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:3142
+#: apply.c:3151
 #, 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:3152
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
@@ -344,429 +1086,466 @@ msgstr ""
 "patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
 "innehållet."
 
-#: apply.c:3160
+#: apply.c:3170
 #, 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:3178
+#: apply.c:3188
 #, 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:3191
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "binärpatchen kan inte tillämpas på \"%s\""
 
-#: apply.c:3197
+#: apply.c:3208
 #, 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:3218
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "patch misslyckades: %s:%ld"
 
-#: apply.c:3341
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
 msgstr "kan inte checka ut %s"
 
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
+#: 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 "misslyckades läsa %s"
 
-#: apply.c:3401
+#: apply.c:3412
 #, 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:3430 apply.c:3673
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "sökvägen %s har ändrat namn/tagits bort"
 
-#: apply.c:3516 apply.c:3688
+#: apply.c:3527 apply.c:3702
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s: finns inte i indexet"
 
-#: apply.c:3525 apply.c:3696
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: motsvarar inte indexet"
 
-#: apply.c:3560
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr ""
-"arkivet saknar objekt som behövs för att falla tillbaka på 3-"
-"vägssammanslagning."
+#: apply.c:3571
+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:3563
+#: apply.c:3574
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "Faller tillbaka på trevägssammanslagning...\n"
+msgid "Performing three-way merge...\n"
+msgstr "Utför trevägssammanslagning...\n"
 
-#: apply.c:3579 apply.c:3583
+#: apply.c:3590 apply.c:3594
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
 
-#: apply.c:3595
+#: apply.c:3606
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "Misslyckades utföra trevägssammanslagning...\n"
 
-#: apply.c:3609
+#: apply.c:3620
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
 
-#: apply.c:3614
+#: apply.c:3625
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "Tillämpade patchen på  \"%s\" rent.\n"
 
-#: apply.c:3640
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Faller tillbaka på direkt tillämpning...\n"
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr "patch för borttagning lämnar kvar filinnehåll"
 
-#: apply.c:3713
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: fel typ"
 
-#: apply.c:3715
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s har typen %o, förväntade %o"
 
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: 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 "ogiltig sökväg \"%s\""
 
-#: apply.c:3924
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: finns redan i indexet"
 
-#: apply.c:3927
+#: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s: finns redan i arbetskatalogen"
 
-#: apply.c:3947
+#: apply.c:3976
 #, 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:3952
+#: apply.c:3981
 #, 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:3972
+#: apply.c:4001
 #, 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:3976
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: patchen kan inte tillämpas"
 
-#: apply.c:3991
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
 msgstr "Kontrollerar patchen %s..."
 
-#: apply.c:4083
+#: apply.c:4112
 #, 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:4090
+#: apply.c:4119
 #, 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:4093
+#: apply.c:4122
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
 
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-
-#: apply.c:4102
+#: apply.c:4131
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "kunde inte lägga till %s till temporärt index"
 
-#: apply.c:4112
+#: apply.c:4141
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "kunde inte skriva temporärt index till %s"
 
-#: apply.c:4250
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "kan inte ta bort %s från indexet"
 
-#: apply.c:4284
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "trasig patch för undermodulen %s"
 
-#: apply.c:4290
+#: apply.c:4319
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "kan inte ta status på nyligen skapade filen \"%s\""
 
-#: apply.c:4298
+#: apply.c:4327
 #, 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:4304 apply.c:4449
+#: apply.c:4333 apply.c:4478
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "kan inte lägga till cachepost för %s"
 
-#: apply.c:4347
+#: apply.c:4376 builtin/bisect--helper.c:525
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "misslyckades skriva till \"%s\""
 
-#: apply.c:4351
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
 msgstr "stänger filen \"%s\""
 
-#: apply.c:4421
+#: apply.c:4450
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "kan inte skriva filen \"%s\" läge %o"
 
-#: apply.c:4519
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "Tillämpade patchen %s rent."
 
-#: apply.c:4527
+#: apply.c:4556
 msgid "internal error"
 msgstr "internt fel"
 
-#: apply.c:4530
+#: apply.c:4559
 #, 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:4541
+#: apply.c:4570
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "trunkerar .rej-filnamnet till %.*s.rej"
 
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
 
-#: apply.c:4563
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Stycke %d tillämpades rent."
 
-#: apply.c:4567
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "Refuserar stycke %d."
 
-#: apply.c:4686
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "Ignorerar patch \"%s\"."
 
-#: apply.c:4694
+#: apply.c:4733
 msgid "unrecognized input"
 msgstr "indata känns inte igen"
 
-#: apply.c:4714
+#: apply.c:4753
 msgid "unable to read index file"
 msgstr "kan inte läsa indexfilen"
 
-#: apply.c:4871
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "kan inte öppna patchen \"%s\": %s"
 
-#: apply.c:4898
+#: apply.c:4937
 #, 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:4904 apply.c:4919
+#: apply.c:4943 apply.c:4958
 #, 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:4912
+#: 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 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:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
 msgid "Unable to write new index file"
 msgstr "Kunde inte skriva ny indexfil"
 
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "sökväg"
-
-#: apply.c:4956
+#: apply.c:4995
 msgid "don't apply changes matching the given path"
 msgstr "tillämpa inte ändringar som motsvarar given sökväg"
 
-#: apply.c:4959
+#: apply.c:4998
 msgid "apply changes matching the given path"
 msgstr "tillämpa ändringar som motsvarar given sökväg"
 
-#: apply.c:4961 builtin/am.c:2206
+#: apply.c:5000 builtin/am.c:2318
 msgid "num"
 msgstr "antal"
 
-#: apply.c:4962
+#: apply.c:5001
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar"
 
-#: apply.c:4965
+#: apply.c:5004
 msgid "ignore additions made by the patch"
 msgstr "ignorera tillägg gjorda av patchen"
 
-#: apply.c:4967
+#: apply.c:5006
 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:4971
+#: apply.c:5010
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "visa antal tillagda och borttagna rader decimalt"
 
-#: apply.c:4973
+#: apply.c:5012
 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:4975
+#: apply.c:5014
 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:4977
+#: apply.c:5016
 msgid "make sure the patch is applicable to the current index"
 msgstr "se till att patchen kan tillämpas på aktuellt index"
 
-#: apply.c:4979
+#: apply.c:5018
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "markera nya filer med \"git add --intent-to-add\""
 
-#: apply.c:4981
+#: apply.c:5020
 msgid "apply a patch without touching the working tree"
 msgstr "tillämpa en patch utan att röra arbetskatalogen"
 
-#: apply.c:4983
+#: apply.c:5022
 msgid "accept a patch that touches outside the working area"
 msgstr "godta en patch som rör filer utanför arbetskatalogen"
 
-#: apply.c:4986
+#: apply.c:5025
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "tillämpa också patchen (använd med --stat/--summary/--check)"
 
-#: apply.c:4988
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas"
+#: apply.c:5027
+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:4990
+#: apply.c:5029
 msgid "build a temporary index based on embedded index information"
 msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
 
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
 msgid "paths are separated with NUL character"
 msgstr "sökvägar avdelas med NUL-tecken"
 
-#: apply.c:4995
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
 msgstr "se till att åtminstone <n> rader sammanhang är lika"
 
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
+#: 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 "åtgärd"
 
-#: apply.c:4997
+#: apply.c:5036
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "detektera nya eller ändrade rader som har fel i blanktecken"
 
-#: apply.c:5000 apply.c:5003
+#: apply.c:5039 apply.c:5042
 msgid "ignore changes in whitespace when finding context"
 msgstr "ignorera ändringar i blanktecken för sammanhang"
 
-#: apply.c:5006
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr "tillämpa patchen baklänges"
 
-#: apply.c:5008
+#: apply.c:5047
 msgid "don't expect at least one line of context"
 msgstr "förvänta inte minst en rad sammanhang"
 
-#: apply.c:5010
+#: apply.c:5049
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "lämna refuserade stycken i motsvarande *.rej-filer"
 
-#: apply.c:5012
+#: apply.c:5051
 msgid "allow overlapping hunks"
 msgstr "tillåt överlappande stycken"
 
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 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 "var pratsam"
 
-#: apply.c:5015
+#: apply.c:5054
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut"
 
-#: apply.c:5018
+#: apply.c:5057
 msgid "do not trust the line counts in the hunk headers"
 msgstr "lite inte på antalet linjer i styckehuvuden"
 
-#: apply.c:5020 builtin/am.c:2194
+#: apply.c:5059 builtin/am.c:2306
 msgid "root"
 msgstr "rot"
 
-#: apply.c:5021
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr "lägg till <rot> i alla filnamn"
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "kan inte strömma blob:en %s"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "filens läge stöds ej: 0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "kunde inte starta filtret \"%s\""
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "kan inte omdirigera handtag"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "filtret \"%s\" rapporterade fel"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "sökvägen är inte giltig UTF-8: %s"
+
+#: archive-zip.c:322
+#, c-format
+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:365 builtin/pack-objects.c:368
+#, c-format
+msgid "deflate error (%d)"
+msgstr "fel i deflate (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<flaggor>] <träd-igt> [<sökväg>...]"
@@ -786,183 +1565,157 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: 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:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
+#: builtin/merge.c:1144
+#, c-format
+msgid "could not read '%s'"
+msgstr "kunde inte läsa \"%s\""
+
+#: 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 "sökvägsangivelsen \"%s\" motsvarade inte några filer"
 
-#: archive.c:396
+#: archive.c:451
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "ingen sådan referens: %.*s"
 
-#: archive.c:401
+#: archive.c:457
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "objektnamnet är inte giltigt: %s"
 
-#: archive.c:414
+#: archive.c:470
 #, c-format
 msgid "not a tree object: %s"
 msgstr "inte ett trädobjekt: %s"
 
-#: archive.c:426
+#: archive.c:482
 msgid "current working directory is untracked"
 msgstr "aktuell arbetskatalog är inte spårad"
 
-#: archive.c:457
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "Hittar inte filen: %s"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Inte en vanlig fil: %s"
+
+#: archive.c:552
 msgid "fmt"
 msgstr "fmt"
 
-#: archive.c:457
+#: archive.c:552
 msgid "archive format"
 msgstr "arkivformat"
 
-#: archive.c:458 builtin/log.c:1581
+#: archive.c:553 builtin/log.c:1775
 msgid "prefix"
 msgstr "prefix"
 
-#: archive.c:459
+#: archive.c:554
 msgid "prepend prefix to each pathname in the archive"
 msgstr "lägg till prefix till varje sökväg i arkivet"
 
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:186
+#: 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 "fil"
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr "ta med ospårade filer i arkivet"
+
+#: archive.c:559 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr "skriv arkivet till filen"
 
-#: archive.c:463
+#: archive.c:561
 msgid "read .gitattributes in working directory"
 msgstr "läs .gitattributes i arbetskatalogen"
 
-#: archive.c:464
+#: archive.c:562
 msgid "report archived files on stderr"
 msgstr "rapportera arkiverade filer på standard fel"
 
-#: archive.c:465
-msgid "store only"
-msgstr "endast spara"
+#: archive.c:564
+msgid "set compression level"
+msgstr "välj komprimeringsgrad"
 
-#: archive.c:466
-msgid "compress faster"
-msgstr "komprimera snabbare"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "komprimera bättre"
-
-#: archive.c:477
+#: archive.c:567
 msgid "list supported archive formats"
 msgstr "visa understödda arkivformat"
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: 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 "arkiv"
 
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "hämta arkivet från fjärrarkivet <arkiv>"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
 #: builtin/notes.c:498
 msgid "command"
 msgstr "kommando"
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "sökväg till kommandot git-upload-archive på fjärren"
 
-#: archive.c:489
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr "Oväntad flagga --remote"
 
-#: archive.c:491
+#: 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:493
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr "Oväntad flagga --output"
 
-#: archive.c:515
+#: 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
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Okänt arkivformat \"%s\""
 
-#: archive.c:522
+#: archive.c:616
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "kan inte strömma blob:en %s"
-
-#: archive-tar.c:266 archive-zip.c:363
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "filens läge stöds ej: 0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr "kan inte läsa %s"
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "kunde inte starta filtret \"%s\""
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "kan inte omdirigera handtag"
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "filtret \"%s\" rapporterade fel"
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "sökvägen är inte giltig UTF-8: %s"
-
-#: archive-zip.c:318
-#, c-format
-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:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
-#, c-format
-msgid "deflate error (%d)"
-msgstr "fel i deflate (%d)"
-
-#: archive-zip.c:609
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "tidsstämpeln för stor för detta system: %<PRIuMAX>"
-
-#: attr.c:213
+#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%-*s är inte ett giltigt namn på attribut"
 
-#: attr.c:370
+#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s inte tillåtet: %s:%d"
 
-#: attr.c:410
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -970,22 +1723,22 @@ msgstr ""
 "Negativa mönster ignoreras i git-attribut\n"
 "Använd '\\!' för att inleda med ett utropstecken."
 
-#: bisect.c:468
+#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
 
-#: bisect.c:678
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Det finns inte mer att göra \"bisect\" på!\n"
 
-#: bisect.c:733
+#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "Namnet på incheckningen är inte giltigt: %s"
 
-#: bisect.c:758
+#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -994,7 +1747,7 @@ msgstr ""
 "Sammanslagningsbasen %s är trasig.\n"
 "Det betyder att felet har rättats mellan %s och [%s].\n"
 
-#: bisect.c:763
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1003,7 +1756,7 @@ msgstr ""
 "Sammanslagningsbasen %s är ny.\n"
 "Egenskapen har ändrats mellan %s och [%s].\n"
 
-#: bisect.c:768
+#: bisect.c:801
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1012,7 +1765,7 @@ msgstr ""
 "Sammanslagningsbasen %s är %s.\n"
 "Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
 
-#: bisect.c:776
+#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1023,7 +1776,7 @@ msgstr ""
 "git bisect kan inte fungera korrekt i detta fall.\n"
 "Kanske du skrev fel %s- och %s-revisioner?\n"
 
-#: bisect.c:789
+#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1035,45 +1788,45 @@ msgstr ""
 "%s.\n"
 "Vi fortsätter ändå."
 
-#: bisect.c:822
+#: bisect.c:861
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "Bisect: en sammanslagningsbas måste testas\n"
 
-#: bisect.c:865
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr "en %s-revision behövs"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
 msgstr "kunde inte skapa filen \"%s\""
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
 msgstr "kunde inte läsa filen \"%s\""
 
-#: bisect.c:958
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "misslyckades läsa bisect-referenser"
 
-#: bisect.c:977
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s var både %s och %s\n"
 
-#: bisect.c:985
+#: bisect.c:1066
 #, 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 ""
 "Ingen testbar incheckning hittades.\n"
-"Kanske du startade med felaktiga sökvägsparametrar?\n"
+"Kanske du startade med felaktiga sökvägsargument?\n"
 
-#: bisect.c:1004
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1083,48 +1836,48 @@ msgstr[1] "(ungefär %d steg)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1101
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisect: %d revision kvar att testa efter denna %s\n"
 msgstr[1] "Bisect: %d revisioner kvar att testa efter denna %s\n"
 
-#: blame.c:2700
+#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents och --reverse fungerar inte så bra tillsammans."
 
-#: blame.c:2714
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr "kan inte använda --contents med namn på slutgiltigt incheckningsobjekt"
 
-#: blame.c:2735
+#: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr ""
 "--reverse och --first-parent tillsammans kräver att du anger senaste "
 "incheckningen"
 
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
-#: builtin/shortlog.c:192
+#: 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 "misslyckades skapa revisionstraversering"
 
-#: blame.c:2762
+#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "--reverse --first-parent tillsammans kräver ett intervall på första-förälder-"
 "kedjan"
 
-#: blame.c:2773
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "sökvägen %s i %s finns inte"
 
-#: blame.c:2784
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "kan inte läsa objektet %s för sökvägen %s"
@@ -1243,7 +1996,7 @@ msgstr ""
 "som redan finns på fjärren kan du behöva köra \"git fetch\"\n"
 "för att hämta den.\n"
 "\n"
-"Om du har tänkt sända in en ny lokal gren som skall\n"
+"Om du har tänkt sända in en ny lokal gren som ska\n"
 "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."
 
@@ -1262,406 +2015,366 @@ msgstr "Objektnamnet är tvetydigt: \"%s\"."
 msgid "Not a valid branch point: '%s'."
 msgstr "Avgreningspunkten är inte giltig: \"%s\"."
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "\"%s\" är redan utcheckad på \"%s\""
 
-#: branch.c:387
+#: branch.c:389
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
 
-#: bundle.c:36
+#: bundle.c:44
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "okänd hashningsalgoritm för paket (bundle): \"%s\""
+
+#: bundle.c:48
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "okänd kapabilitet \"%s\""
+
+#: bundle.c:74
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' ser inte ut som en v2-bundle-fil"
+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)"
 
-#: bundle.c:64
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "okänt huvud: %s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
-#: builtin/commit.c:791
+#: 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 "kunde inte öppna \"%s\""
 
-#: bundle.c:143
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
 
-#: bundle.c:146
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
 msgstr "behöver ett arkiv för att verifiera ett paket (bundle)."
 
-#: bundle.c:197
+#: 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:"
 
-#: bundle.c:204
+#: bundle.c:264
 msgid "The bundle records a complete history."
 msgstr "Paketet (bundlen) beskriver en komplett historik."
 
-#: bundle.c:206
+#: 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:"
 
-#: bundle.c:272
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "kan inte duplicera pakethandtag"
 
-#: bundle.c:279
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Kunde inte starta pack-objects"
 
-#: bundle.c:290
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "pack-objects misslyckades"
 
-#: bundle.c:332
-msgid "rev-list died"
-msgstr "rev-list dog"
-
-#: bundle.c:381
+#: 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:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
+#: bundle.c:504
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "version %d för paket (bundle) stöds ej"
+
+#: 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"
+
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "okänt argument: %s"
 
-#: bundle.c:468
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
 msgstr "Vägrar skapa ett tomt paket (bundle)."
 
-#: bundle.c:478
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "kan inte skapa \"%s\""
 
-#: bundle.c:503
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack dog"
 
-#: color.c:296
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "felaktigt färgvärde: %.*s"
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
+msgstr "avslutande stycke-id förekommer tidigare än förväntat"
 
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
+#: chunk-format.c:126
 #, c-format
-msgid "could not parse %s"
-msgstr "kunde inte tolka %s"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "felaktigt stycke-offset %<PRIx64> och %<PRIx64>"
 
-#: commit.c:52
+#: chunk-format.c:133
 #, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s är inte en incheckning!"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "dubblerat stycke-ID %<PRIx32> upptäckt"
 
-#: commit.c:192
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Stöd för <GIT_DIR>/info/grafts avråds från och\n"
-"kommer tas bort i en framtida version av Git.\n"
-"\n"
-"Använd \"git replace --convert-graft-file\"\n"
-"för att omvandla grafts till ersättningsreferenser.\n"
-"\n"
-"Slå av detta meddelande genom att skriva\n"
-"\"git config advice.graftFileDeprecated false\""
-
-#: commit.c:1128
-#, 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:1131
-#, 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:1134
+#: chunk-format.c:147
 #, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Incheckning %s har inte någon GPG-signatur."
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "avslutande stycke har id %<PRIx32> som inte är noll"
 
-#: commit.c:1137
+#: color.c:329
 #, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
+msgid "invalid color value: %.*s"
+msgstr "felaktigt färgvärde: %.*s"
 
-#: commit.c:1391
-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 ""
-"Varning: incheckningsmeddelandet är inte korrekt UTF-8.\n"
-"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
-"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr "felaktig hashnings-version"
 
-#: commit-graph.c:127
+#: commit-graph.c:262
 msgid "commit-graph file is too small"
 msgstr "incheckningsgraffilen %s är för liten"
 
-#: commit-graph.c:192
+#: commit-graph.c:355
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "incheckningsgrafens signatur %X stämmer inte med signaturen %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:362
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "incheckningsgrafens version %X stämmer inte med versionen %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "incheckningsgrafens hashversion %X stämmer inte med versionen %X"
 
-#: commit-graph.c:229
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr ""
-"incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "
-"ofullständig"
-
-#: commit-graph.c:240
+#: commit-graph.c:386
 #, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "incheckningsgraffilen är för liten för att innehålla %u stycken"
 
-#: commit-graph.c:283
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
-
-#: commit-graph.c:347
+#: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
 msgstr "incheckningsgrafen har inga bas-graf-stycken"
 
-#: commit-graph.c:357
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr "incheckningsgrafens kedja stämmer inte"
 
-#: commit-graph.c:404
+#: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "ogiltig incheckingsgrafkedja: rad \"%s\" är inte ett hash-värde"
 
-#: commit-graph.c:430
+#: commit-graph.c:564
 msgid "unable to find all commit-graph files"
 msgstr "kan inte hitta alla incheckingsgraffiler"
 
-#: commit-graph.c:561 commit-graph.c:621
+#: commit-graph.c:745 commit-graph.c:782
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "ogiltig incheckningsposition. incheckningsgrafen är troligtvis trasig"
 
-#: commit-graph.c:582
+#: commit-graph.c:766
 #, c-format
 msgid "could not find commit %s"
 msgstr "kunde inte hitta incheckningen %s"
 
-#: commit-graph.c:855 builtin/am.c:1287
+#: commit-graph.c:799
+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:1341
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
-#: commit-graph.c:859
-#, c-format
-msgid "unable to get tree for %s"
-msgstr "kunde inte hämta trädet på %s"
-
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "kunde inte hämta typ för objektet %s"
 
-#: commit-graph.c:1049
+#: commit-graph.c:1368
 msgid "Loading known commits in commit graph"
 msgstr "Läser in kända incheckningar i incheckningsgraf"
 
-#: commit-graph.c:1066
+#: commit-graph.c:1385
 msgid "Expanding reachable commits in commit graph"
 msgstr "Expanderar nåbara incheckningar i incheckningsgraf"
 
-#: commit-graph.c:1085
+#: commit-graph.c:1405
 msgid "Clearing commit marks in commit graph"
 msgstr "Rensar incheckningsmärken i incheckningsgraf"
 
-#: commit-graph.c:1104
+#: commit-graph.c:1424
+msgid "Computing commit graph topological levels"
+msgstr "Beräknar topografiska nivåer för incheckningsgraf"
+
+#: commit-graph.c:1477
 msgid "Computing commit graph generation numbers"
 msgstr "Beräknar generationsvärden för incheckningsgraf"
 
-#: commit-graph.c:1179
+#: commit-graph.c:1558
+msgid "Computing commit changed paths Bloom filters"
+msgstr "Beräknar Bloom-filter för sökvägar ändrade av incheckningen"
+
+#: commit-graph.c:1635
+msgid "Collecting referenced commits"
+msgstr "Samlar refererade incheckningar"
+
+#: 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] "Söker incheckningar för incheckingsgraf i %d paket"
 msgstr[1] "Söker incheckningar för incheckingsgraf i %d paket"
 
-#: commit-graph.c:1192
+#: commit-graph.c:1673
 #, c-format
 msgid "error adding pack %s"
 msgstr "fel vid tillägg av paketet %s"
 
-#: commit-graph.c:1196
+#: commit-graph.c:1677
 #, c-format
 msgid "error opening index for %s"
 msgstr "fel vid öppning av indexet för %s"
 
-#: commit-graph.c:1220
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"
-msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"
-
-#: commit-graph.c:1240
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "ogiltigt inchecknings-objekt-id %s"
-
-#: commit-graph.c:1255
+#: commit-graph.c:1714
 msgid "Finding commits for commit graph among packed objects"
 msgstr "Söker incheckningar för incheckingsgraf i packade objekt"
 
-#: commit-graph.c:1270
-msgid "Counting distinct commits in commit graph"
-msgstr "Räknar olika incheckningar i incheckningsgraf"
-
-#: commit-graph.c:1300
+#: commit-graph.c:1732
 msgid "Finding extra edges in commit graph"
 msgstr "Söker ytterligare kanter i incheckingsgraf"
 
-#: commit-graph.c:1346
+#: commit-graph.c:1781
 msgid "failed to write correct number of base graph ids"
 msgstr "kunde inte skriva korrekt antal bas-graf-id:n"
 
-#: commit-graph.c:1379 midx.c:810
+#: commit-graph.c:1812 midx.c:911
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "kunde inte skapa inledande kataloger för %s"
 
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr "kan inte skapa temporärt graflager"
+
+#: commit-graph.c:1830
 #, c-format
-msgid "unable to create '%s'"
-msgstr "kunde inte skapa \"%s\""
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "kan inte justera delade behörigheter för \"%s\""
 
-#: commit-graph.c:1451
+#: 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] "Skriver ut incheckningsgraf i %d pass"
 msgstr[1] "Skriver ut incheckningsgraf i %d pass"
 
-#: commit-graph.c:1492
+#: commit-graph.c:1923
 msgid "unable to open commit-graph chain file"
 msgstr "Kunde inte öppna incheckningsgrafkedjefilen"
 
-#: commit-graph.c:1504
+#: commit-graph.c:1939
 msgid "failed to rename base commit-graph file"
 msgstr "kunde inte byta namn på bas-incheckingsgraffilen"
 
-#: commit-graph.c:1524
+#: commit-graph.c:1959
 msgid "failed to rename temporary commit-graph file"
 msgstr "kunde inte byta namn på temporär incheckningsgraffil"
 
-#: commit-graph.c:1635
+#: commit-graph.c:2092
 msgid "Scanning merged commits"
 msgstr "Söker sammanslagna incheckningar"
 
-#: commit-graph.c:1646
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "oväntat duplicerat inchecknings-id %s"
-
-#: commit-graph.c:1670
+#: commit-graph.c:2136
 msgid "Merging commit-graph"
 msgstr "Slår ihop incheckningsgraf"
 
-#: commit-graph.c:1860
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
+#: commit-graph.c:2244
+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:1871
+#: commit-graph.c:2351
 msgid "too many commits to write graph"
 msgstr "för många incheckningar för att skriva graf"
 
-#: commit-graph.c:1961
+#: commit-graph.c:2449
 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:1971
+#: commit-graph.c:2459
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "incheckningsgrafen har felaktig OID-ordning: %s så %s"
 
-#: commit-graph.c:1981 commit-graph.c:1996
+#: commit-graph.c:2469 commit-graph.c:2484
 #, 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:1988
+#: commit-graph.c:2476
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "kunde inte tolka incheckning %s från incheckningsgraf"
 
-#: commit-graph.c:2006
+#: commit-graph.c:2494
 msgid "Verifying commits in commit graph"
 msgstr "Bekräftar incheckningar i incheckningsgrafen"
 
-#: commit-graph.c:2020
+#: commit-graph.c:2509
 #, 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:2027
+#: commit-graph.c:2516
 #, 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:2037
+#: commit-graph.c:2526
 #, 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:2046
+#: commit-graph.c:2535
 #, 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:2059
+#: commit-graph.c:2549
 #, 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:2064
+#: commit-graph.c:2554
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1669,7 +2382,7 @@ msgstr ""
 "incheckningsgrafen har generationsnummer noll för incheckningen %s, men icke-"
 "noll på annan plats"
 
-#: commit-graph.c:2068
+#: commit-graph.c:2558
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1677,23 +2390,88 @@ msgstr ""
 "incheckningsgrafen har generationsnummer skilt från noll för incheckningen "
 "%s, men noll på annan plats"
 
-#: commit-graph.c:2083
+#: commit-graph.c:2575
 #, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "incheckningsgrafens generation för incheckningen %s är %u != %u"
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr ""
+"incheckningsgrafens generation för incheckningen %s är %<PRIuMAX> < "
+"%<PRIuMAX>"
 
-#: commit-graph.c:2089
+#: commit-graph.c:2581
 #, 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: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 "kunde inte tolka %s"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s är inte en incheckning!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Stöd för <GIT_DIR>/info/grafts avråds från och\n"
+"kommer tas bort i en framtida version av Git.\n"
+"\n"
+"Använd \"git replace --convert-graft-file\"\n"
+"för att omvandla grafts till ersättningsreferenser.\n"
+"\n"
+"Slå av detta meddelande genom att skriva\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#: commit.c:1237
+#, 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
+#, 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
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Incheckning %s har inte någon GPG-signatur."
+
+#: commit.c:1247
+#, 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
+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 ""
+"Varning: incheckningsmeddelandet är inte korrekt UTF-8.\n"
+"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
+"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"
+
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "minnet slut"
 
-#: config.c:124
+#: config.c:126
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1708,296 +2486,341 @@ msgstr ""
 "\t%s\n"
 "Det kan bero på cirkulära inkluderingar."
 
-#: config.c:140
+#: config.c:142
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "kunde inte expandera inkluderingssökväg \"%s\""
 
-#: config.c:151
+#: config.c:153
 msgid "relative config includes must come from files"
 msgstr "relativa konfigureringsinkluderingar måste komma från filer"
 
-#: config.c:197
+#: config.c:199
 msgid "relative config include conditionals must come from files"
 msgstr "relativa konfigureringsinkluderingsvillkor måste komma från filer"
 
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "felaktigt konfigurationsformat: %s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "miljövariabelnamn saknas för konfigurationen \"%.*s\""
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "miljövariabeln \"%s\" saknas för konfigurationen \"%.*s\""
+
+#: config.c:442
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "nyckeln innehåller inte ett stycke: %s"
 
-#: config.c:382
+#: config.c:448
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "nyckeln innehåller inte variabelnamn: %s"
 
-#: config.c:406 sequencer.c:2401
+#: config.c:472 sequencer.c:2785
 #, c-format
 msgid "invalid key: %s"
 msgstr "felaktig nyckel: %s"
 
-#: config.c:412
+#: config.c:478
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "ogiltig nyckel (nyradstecken): %s"
 
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "tom konfigurationsnyckel"
+
+#: config.c:529 config.c:541
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "falsk konfigureringsparameter: %s"
 
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
 #, c-format
 msgid "bogus format in %s"
 msgstr "felaktigt format i %s"
 
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "felaktigt antal i %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "för många poster i %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "konfigurationsnyckel saknas för %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "konfigurationsvärde saknas för %s"
+
+#: config.c:995
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "felaktig konfigurationsfil rad %d i blob:en %s"
 
-#: config.c:825
+#: config.c:999
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "felaktig konfigurationsfil rad %d i filen %s"
 
-#: config.c:829
+#: config.c:1003
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "felaktig konfigurationsfil rad %d i standard in"
 
-#: config.c:833
+#: config.c:1007
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "felaktig konfigurationsfil rad %d i undermoduls-blob:en %s"
 
-#: config.c:837
+#: config.c:1011
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "felaktig konfigurationsfil rad %d i kommandoraden %s"
 
-#: config.c:841
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "felaktig konfigurationsfil rad %d i %s"
 
-#: config.c:978
+#: config.c:1152
 msgid "out of range"
 msgstr "utanför intervallet"
 
-#: config.c:978
+#: config.c:1152
 msgid "invalid unit"
 msgstr "ogiltig enhet"
 
-#: config.c:979
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\": %s"
 
-#: config.c:998
+#: config.c:1163
 #, 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:1001
+#: config.c:1166
 #, 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:1004
+#: config.c:1169
 #, 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:1007
+#: config.c:1172
 #, 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:1010
+#: config.c:1175
 #, 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:1013
+#: config.c:1178
 #, 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:1108
+#: config.c:1257
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "felaktigt booleskt konfigurationsvärde \"%s\" för \"%s\""
+
+#: config.c:1275
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "misslyckades expandera användarkatalog i: \"%s\""
 
-#: config.c:1117
+#: config.c:1284
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
 
-#: config.c:1208
+#: config.c:1377
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "förkortningslängd utanför intervallet: %d"
 
-#: config.c:1222 config.c:1233
+#: config.c:1391 config.c:1402
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "felaktigt zlib-komprimeringsgrad %d"
 
-#: config.c:1325
+#: config.c:1494
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar kan bara vara ett tecken"
 
-#: config.c:1358
+#: config.c:1527
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "felaktigt läge för skapande av objekt: %s"
 
-#: config.c:1425
+#: config.c:1599
 #, c-format
 msgid "malformed value for %s"
 msgstr "felformat värde för %s"
 
-#: config.c:1451
+#: config.c:1625
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "felformat värde för %s: %s"
 
-#: config.c:1452
+#: config.c:1626
 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:1513 builtin/pack-objects.c:3394
+#: config.c:1687 builtin/pack-objects.c:4084
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "felaktig paketkomprimeringsgrad %d"
 
-#: config.c:1634
+#: config.c:1809
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "kunde inte läsa konfigurerings-blobobjektet \"%s\""
 
-#: config.c:1637
+#: config.c:1812
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "referensen \"%s\" pekar inte på en blob"
 
-#: config.c:1654
+#: config.c:1829
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "kan inte slå upp konfigurerings-bloben \"%s\""
 
-#: config.c:1684
+#: config.c:1874
 #, c-format
 msgid "failed to parse %s"
 msgstr "kunde inte tolka %s"
 
-#: config.c:1740
+#: config.c:1930
 msgid "unable to parse command-line config"
 msgstr "kan inte tolka kommandoradskonfiguration"
 
-#: config.c:2091
+#: config.c:2294
 msgid "unknown error occurred while reading the configuration files"
 msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
 
-#: config.c:2261
+#: config.c:2468
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "Felaktigt %s: \"%s\""
 
-#: config.c:2306
+#: config.c:2513
 #, 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:2352
+#: config.c:2559
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
 
-#: config.c:2354
+#: config.c:2561
 #, 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:2435
+#: config.c:2645
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "felaktigt sektionsnamn \"%s\""
 
-#: config.c:2467
+#: config.c:2677
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s har flera värden"
 
-#: config.c:2496
+#: config.c:2706
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "kan inte skriva nya konfigurationsfilen \"%s\""
 
-#: config.c:2748 config.c:3072
+#: config.c:2958 config.c:3285
 #, c-format
 msgid "could not lock config file %s"
 msgstr "kunde inte låsa konfigurationsfilen %s"
 
-#: config.c:2759
+#: config.c:2969
 #, c-format
 msgid "opening %s"
 msgstr "öppnar %s"
 
-#: config.c:2794 builtin/config.c:328
+#: config.c:3006 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "ogiltigt mönster: %s"
 
-#: config.c:2819
+#: config.c:3031
 #, c-format
 msgid "invalid config file %s"
 msgstr "ogiltig konfigurationsfil: \"%s\""
 
-#: config.c:2832 config.c:3085
+#: config.c:3044 config.c:3298
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat misslyckades på %s"
 
-#: config.c:2843
+#: config.c:3055
 #, 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:2852 config.c:3090
+#: config.c:3065 config.c:3303
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod misslyckades på %s"
 
-#: config.c:2937 config.c:3187
+#: config.c:3150 config.c:3400
 #, c-format
 msgid "could not write config file %s"
 msgstr "kunde inte skriva konfigurationsfilen %s"
 
-#: config.c:2971
+#: config.c:3184
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "kunde inte ställa in \"%s\" till \"%s\""
 
-#: config.c:2973 builtin/remote.c:782
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr "kunde inte ta bort inställning för \"%s\""
 
-#: config.c:3063
+#: config.c:3276
 #, c-format
 msgid "invalid section name: %s"
 msgstr "felaktigt namn på stycke: %s"
 
-#: config.c:3230
+#: config.c:3443
 #, c-format
 msgid "missing value for '%s'"
 msgstr "värde saknas för \"%s\""
@@ -2023,72 +2846,81 @@ msgstr ""
 msgid "server doesn't support '%s'"
 msgstr "Servern stöder inte \"%s\""
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "servern stöder inte funktionen \"%s\""
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
 msgstr "förväntade \"flush\" efter förmågor"
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "ignorerar förmågor efter första raden \"%s\""
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "protokollfel: förväntade inte capabilities^{}"
 
-#: connect.c:273
+#: connect.c:306
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "protokollfel: förväntade \"shallow sha-1\" fick \"%s\""
 
-#: connect.c:275
+#: connect.c:308
 msgid "repository on the other end cannot be shallow"
 msgstr "arkivet på andra sidan kan inte vara grunt"
 
-#: connect.c:313
+#: connect.c:347
 msgid "invalid packet"
 msgstr "ogiltigt paket"
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "protokollfel: förväntade inte \"%s\""
 
-#: connect.c:441
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "okänt objektformat \"%s\" angavs av servern"
+
+#: connect.c:526
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "ogiltigt svar på ls-refs: %s"
 
-#: connect.c:445
+#: connect.c:530
 msgid "expected flush after ref listing"
-msgstr "oväntad \"flush\" efter ref-listan"
+msgstr "förväntade \"flush\" efter ref-listan"
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "förväntade svarsavslutningspaket efter ref-listan"
 
-#: connect.c:544
+#: connect.c:666
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "protokollet \"%s\" stöds inte"
 
-#: connect.c:595
+#: connect.c:717
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "kunde inte sätta SO_KEEPALIVE på uttaget"
 
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
 #, c-format
 msgid "Looking up %s ... "
 msgstr "Slår upp %s..."
 
-#: connect.c:639
+#: connect.c:761
 #, 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:643 connect.c:714
+#: connect.c:765 connect.c:836
 #, c-format
 msgid ""
 "done.\n"
@@ -2097,7 +2929,7 @@ msgstr ""
 "klart.\n"
 "Ansluter till %s (port %s)..."
 
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2107,89 +2939,93 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
 msgid "done."
 msgstr "klart."
 
-#: connect.c:702
+#: connect.c:824
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "kunde inte slå upp %s (%s)"
 
-#: connect.c:708
+#: connect.c:830
 #, c-format
 msgid "unknown port %s"
 msgstr "okänd port %s"
 
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "konstigt värdnamn \"%s\" blockerat"
 
-#: connect.c:847
+#: connect.c:969
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "konstig port \"%s\" blockerad"
 
-#: connect.c:857
+#: connect.c:979
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "kan inte starta mellanserver (proxy) %s"
 
-#: connect.c:928
+#: connect.c:1050
 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:1123
+#: connect.c:1190
+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
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh-varianten \"simple\" stöder inte -4"
 
-#: connect.c:1135
+#: connect.c:1259
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh-varianten \"simple\" stöder inte -6"
 
-#: connect.c:1152
+#: connect.c:1276
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh-varianten \"simple\" stöder inte val av port"
 
-#: connect.c:1264
+#: connect.c:1388
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "konstigt sökvägsnamn \"%s\" blockerat"
 
-#: connect.c:1311
+#: connect.c:1436
 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:88 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "Kontrollerar konnektivitet"
 
-#: connected.c:100
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
 msgstr "Kunde inte köra \"git rev-list\""
 
-#: connected.c:120
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr "kunde inte skriva till rev-list"
 
-#: connected.c:127
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "kunde inte stänga rev-list:s standard in"
 
-#: convert.c:194
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "felaktig crlf_action %d"
 
-#: convert.c:207
+#: convert.c:196
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF skulle ersättas av LF i %s"
 
-#: convert.c:209
+#: convert.c:198
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2198,12 +3034,12 @@ msgstr ""
 "CRLF kommer att ersättas av LF i %s.\n"
 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"
 
-#: convert.c:217
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF skulle ersättas av CRLF i %s"
 
-#: convert.c:219
+#: convert.c:208
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2212,26 +3048,26 @@ msgstr ""
 "LF kommer att ersättas av CRLF i %s.\n"
 "Filen kommer att ha sina ursprungliga radbrytningar i din arbetskatalog"
 
-#: convert.c:280
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "BOM är förbjudet i \"%s\" om kodat som %s"
 
-#: convert.c:287
+#: convert.c:280
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
-"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%s som "
+"Filen \"%s\" innehåller byte order mark (BOM). Använd UTF-%.*s som "
 "teckenkodning i arbetskatalogen."
 
-#: convert.c:305
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr "BOM krävs om \"%s\" kodas som %s"
 
-#: convert.c:307
+#: convert.c:295
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2240,51 +3076,51 @@ msgstr ""
 "Filen \"%s\" saknar byte order mark (BOM). Använd UTF-%sBE eller UTF-%sLE "
 "(beroende på byteordning) som teckenkodning i arbetskatalogen."
 
-#: convert.c:425 convert.c:496
+#: convert.c:408 convert.c:479
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "misslyckades omkoda \"%s\" från %s till %s"
 
-#: convert.c:468
+#: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr ""
 "omkodning av \"%s\" från %s till %s och tillbaka ger inte samma resultat"
 
-#: convert.c:674
+#: convert.c:654
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "kan inte grena (fork) för att köra externt filter \"%s\""
 
-#: convert.c:694
+#: convert.c:674
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "kunde inte skicka indata till externt filter \"%s\""
 
-#: convert.c:701
+#: convert.c:681
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "externt filter \"%s\" misslyckades %d"
 
-#: convert.c:736 convert.c:739
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "läsning från externt filter \"%s\" misslyckades"
 
-#: convert.c:742 convert.c:797
+#: convert.c:722 convert.c:777
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "externt filter \"%s\" misslyckades"
 
-#: convert.c:845
+#: convert.c:826
 msgid "unexpected filter type"
 msgstr "oväntad filtertyp"
 
-#: convert.c:856
+#: convert.c:837
 msgid "path name too long for external filter"
 msgstr "sökvägen för lång för externt filter"
 
-#: convert.c:930
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2293,20 +3129,48 @@ msgstr ""
 "externt filter \"%s\" är inte längre tillgängligt trots att alla sökvägar "
 "inte har filtrerats"
 
-#: convert.c:1229
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false är inte giltig teckenkodning för arbetskatalogen"
 
-#: convert.c:1417 convert.c:1451
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s: \"clean\"-filtret \"%s\" misslyckades"
 
-#: convert.c:1495
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: \"smudge\"-filtret \"%s\" misslyckades"
 
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "hoppar över uppslag av inloggningsuppgifter för nyckel: credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "vägrar arbeta med inloggningsuppgifter utan värdfält"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr "vägrar arbeta med inloggningsuppgifter utan protokollfält"
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "url innehåller radbrytning i komponenten %s: %s"
+
+#: credential.c:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url saknar protokoll: %s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "kan inte tolka url för inloggingsuppgifter: %s"
+
 #: date.c:138
 msgid "in the future"
 msgstr "i framtiden"
@@ -2399,20 +3263,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"
 
-#: diffcore-order.c:24
+#: diff-merges.c:70
 #, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "kunde inte läsa orderfilen \"%s\""
+msgid "unknown value for --diff-merges: %s"
+msgstr "okänt värde för --diff-merges: %s"
 
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "Utför onöjaktig namnbytesdetektering"
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base fungerar inte med intervall"
 
-#: diff-no-index.c:238
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr "--merge-base fungerar bara med incheckningar"
+
+#: diff-lib.c:576
+msgid "unable to get HEAD"
+msgstr "kan inte hämta HEAD"
+
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr "ingen sammanslagningsbas hittades"
+
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr "flera sammanslagningsbaser hittades"
+
+#: 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"
@@ -2420,25 +3300,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:155
+#: diff.c:156
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
 
-#: diff.c:160
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Okänd dirstat-parameter \"%s\"\n"
 
-#: diff.c:296
+#: diff.c:297
 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:324
+#: diff.c:325
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -2448,7 +3328,7 @@ msgstr ""
 "\", \"ignore-space-at-eol\", \"ignore-all-space\", \"allow-indentation-change"
 "\""
 
-#: diff.c:332
+#: diff.c:333
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -2456,12 +3336,12 @@ msgstr ""
 "color-moved-ws: allow-indentation-change kan inte kombineras med andra "
 "blankstegslägen"
 
-#: diff.c:405
+#: diff.c:410
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
 
-#: diff.c:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -2470,35 +3350,50 @@ msgstr ""
 "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
 "%s"
 
-#: diff.c:4218
+#: diff.c:4282
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "extern diff dog, stannar vid %s"
 
-#: diff.c:4563
+#: diff.c:4634
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
-msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
+msgstr "--name-only, --name-status, --check och -s är ömsesidigt uteslutande"
 
-#: diff.c:4566
+#: diff.c:4637
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G, -S och --find-object är ömsesidigt uteslutande"
 
-#: diff.c:4644
+#: diff.c:4640
+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"
+
+#: diff.c:4643
+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"
+
+#: diff.c:4722
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow kräver exakt en sökvägsangivelse"
 
-#: diff.c:4692
+#: diff.c:4770
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "ogiltigt värde för --stat: %s"
 
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
-#: parse-options.c:199 parse-options.c:203
+#: 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
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s förväntar ett numeriskt värde"
 
-#: diff.c:4729
+#: diff.c:4807
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2507,42 +3402,42 @@ msgstr ""
 "Misslyckades tolka argument till flaggan --dirstat/-X;\n"
 "%s"
 
-#: diff.c:4814
+#: diff.c:4892
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "okänd ändringsklass \"%c\" i --diff-filter=%s"
 
-#: diff.c:4838
+#: diff.c:4916
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "okänt värde efter ws-error-highlight=%.*s"
 
-#: diff.c:4852
+#: diff.c:4930
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "kunde inte slå upp \"%s\""
 
-#: diff.c:4902 diff.c:4908
+#: diff.c:4980 diff.c:4986
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s förväntar formen <n>/<m>"
 
-#: diff.c:4920
+#: diff.c:4998
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s förväntar ett tecken, fick \"%s\""
 
-#: diff.c:4941
+#: diff.c:5019
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "felaktigt argument till --color-moved: %s"
 
-#: diff.c:4960
+#: diff.c:5038
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "ogiltigt läge %s\" i --color-moved-ws"
 
-#: diff.c:5000
+#: diff.c:5078
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2550,149 +3445,154 @@ msgstr ""
 "flaggan diff-algorithm godtar\"myers\", \"minimal\", \"patience\" och "
 "\"histogram\""
 
-#: diff.c:5036 diff.c:5056
+#: diff.c:5114 diff.c:5134
 #, c-format
 msgid "invalid argument to %s"
 msgstr "ogiltigt argument för %s"
 
-#: diff.c:5194
+#: diff.c:5238
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "ogiltigt reguljärt uttryck angavs för -I: \"%s\""
+
+#: diff.c:5287
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "misslyckades tolka argument till flaggan --submodule: \"%s\""
 
-#: diff.c:5250
+#: diff.c:5343
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "felaktigt argument --word-diff: %s"
 
-#: diff.c:5273
+#: diff.c:5379
 msgid "Diff output format options"
 msgstr "Formatflaggor för diff-utdata"
 
-#: diff.c:5275 diff.c:5281
+#: diff.c:5381 diff.c:5387
 msgid "generate patch"
 msgstr "skapar patch"
 
-#: diff.c:5278 builtin/log.c:172
+#: diff.c:5384 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "undertryck diff-utdata"
 
-#: diff.c:5283 diff.c:5397 diff.c:5404
+#: diff.c:5389 diff.c:5503 diff.c:5510
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5284 diff.c:5287
+#: diff.c:5390 diff.c:5393
 msgid "generate diffs with <n> lines context"
 msgstr "skapa diffar med <n> rader sammanhang"
 
-#: diff.c:5289
+#: diff.c:5395
 msgid "generate the diff in raw format"
 msgstr "generera diff i råformat"
 
-#: diff.c:5292
+#: diff.c:5398
 msgid "synonym for '-p --raw'"
 msgstr "synonym till \"-p --raw\""
 
-#: diff.c:5296
+#: diff.c:5402
 msgid "synonym for '-p --stat'"
 msgstr "synonym till \"-p --stat\""
 
-#: diff.c:5300
+#: diff.c:5406
 msgid "machine friendly --stat"
 msgstr "maskinläsbar --stat"
 
-#: diff.c:5303
+#: diff.c:5409
 msgid "output only the last line of --stat"
 msgstr "skriv bara ut den sista raden för --stat"
 
-#: diff.c:5305 diff.c:5313
+#: diff.c:5411 diff.c:5419
 msgid "<param1,param2>..."
 msgstr "<param1,param2>..."
 
-#: diff.c:5306
+#: diff.c:5412
 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:5310
+#: diff.c:5416
 msgid "synonym for --dirstat=cumulative"
 msgstr "synonym för --dirstat=cumulative"
 
-#: diff.c:5314
+#: diff.c:5420
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "synonym för --dirstat=filer,param1,param2..."
 
-#: diff.c:5318
+#: diff.c:5424
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "varna om ändringar introducerar konfliktmarkörer eller blankstegsfel"
 
-#: diff.c:5321
+#: diff.c:5427
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "kortfattad summering såsom skapade, namnbyten och ändrade lägen"
 
-#: diff.c:5324
+#: diff.c:5430
 msgid "show only names of changed files"
 msgstr "visa endast namnen på ändrade filer"
 
-#: diff.c:5327
+#: diff.c:5433
 msgid "show only names and status of changed files"
 msgstr "visa endast namn och status för ändrade filer"
 
-#: diff.c:5329
+#: diff.c:5435
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<bredd>[,<namn-bredd>[,<antal>]]"
 
-#: diff.c:5330
+#: diff.c:5436
 msgid "generate diffstat"
 msgstr "skapa diffstat"
 
-#: diff.c:5332 diff.c:5335 diff.c:5338
+#: diff.c:5438 diff.c:5441 diff.c:5444
 msgid "<width>"
 msgstr "<bredd>"
 
-#: diff.c:5333
+#: diff.c:5439
 msgid "generate diffstat with a given width"
 msgstr "generera en diffstat med given bredd"
 
-#: diff.c:5336
+#: diff.c:5442
 msgid "generate diffstat with a given name width"
 msgstr "generera en diffstat med given namnbredd"
 
-#: diff.c:5339
+#: diff.c:5445
 msgid "generate diffstat with a given graph width"
 msgstr "generera en diffstat med given grafbredd"
 
-#: diff.c:5341
+#: diff.c:5447
 msgid "<count>"
 msgstr "<antal>"
 
-#: diff.c:5342
+#: diff.c:5448
 msgid "generate diffstat with limited lines"
 msgstr "generera diffstat med begränsade rader"
 
-#: diff.c:5345
+#: diff.c:5451
 msgid "generate compact summary in diffstat"
 msgstr "skapa kompakt översikt i diffstat"
 
-#: diff.c:5348
+#: diff.c:5454
 msgid "output a binary diff that can be applied"
 msgstr "skapa en binärdiff som kan appliceras"
 
-#: diff.c:5351
+#: diff.c:5457
 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:5353
+#: diff.c:5459
 msgid "show colored diff"
 msgstr "visa färgad diff"
 
-#: diff.c:5354
+#: diff.c:5460
 msgid "<kind>"
 msgstr "<typ>"
 
-#: diff.c:5355
+#: diff.c:5461
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
@@ -2700,7 +3600,7 @@ msgstr ""
 "ljusmarkera blankstegsfel i \"context\" (sammanhang), \"old\" (gamla) eller "
 "\"new\" (nya) rader i diffen"
 
-#: diff.c:5358
+#: diff.c:5464
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2708,87 +3608,87 @@ msgstr ""
 "skriv inte om sökvägsnamn och använd NUL-tecken som fältseparerare i --raw "
 "eller --numstat"
 
-#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
 msgid "<prefix>"
 msgstr "<prefix>"
 
-#: diff.c:5362
+#: diff.c:5468
 msgid "show the given source prefix instead of \"a/\""
 msgstr "visa givet källprefix istället för \"a/\""
 
-#: diff.c:5365
+#: diff.c:5471
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "visa givet målprefix istället för \"b/\""
 
-#: diff.c:5368
+#: diff.c:5474
 msgid "prepend an additional prefix to every line of output"
 msgstr "lägg till ytterligare prefix på alla rader i utdata"
 
-#: diff.c:5371
+#: diff.c:5477
 msgid "do not show any source or destination prefix"
 msgstr "visa inte käll- eller målprefix"
 
-#: diff.c:5374
+#: diff.c:5480
 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:5378 diff.c:5383 diff.c:5388
+#: diff.c:5484 diff.c:5489 diff.c:5494
 msgid "<char>"
 msgstr "<tecken>"
 
-#: diff.c:5379
+#: diff.c:5485
 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:5384
+#: diff.c:5490
 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:5389
+#: diff.c:5495
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "ange tecken för att ange sammanhang istället för \" \""
 
-#: diff.c:5392
+#: diff.c:5498
 msgid "Diff rename options"
 msgstr "Diff-namnbytesflaggor"
 
-#: diff.c:5393
+#: diff.c:5499
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5394
+#: diff.c:5500
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "dela upp kompletta omskrivningar till ta bort och skapa-par"
 
-#: diff.c:5398
+#: diff.c:5504
 msgid "detect renames"
 msgstr "detektera namnändringar"
 
-#: diff.c:5402
+#: diff.c:5508
 msgid "omit the preimage for deletes"
 msgstr "ta bort för-version för borttagningar"
 
-#: diff.c:5405
+#: diff.c:5511
 msgid "detect copies"
 msgstr "detektera kopior"
 
-#: diff.c:5409
+#: diff.c:5515
 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:5411
+#: diff.c:5517
 msgid "disable rename detection"
 msgstr "inaktivera detektering av namnbyten"
 
-#: diff.c:5414
+#: diff.c:5520
 msgid "use empty blobs as rename source"
 msgstr "använd tomma blob:ar som namnändringskälla"
 
-#: diff.c:5416
+#: diff.c:5522
 msgid "continue listing the history of a file beyond renames"
 msgstr "fortsätt lista historiken för en fil bortom namnändringar"
 
-#: diff.c:5419
+#: diff.c:5525
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -2796,159 +3696,163 @@ msgstr ""
 "förhindra namnbyte/kopie-detektering om antalet namnbyten/kopior överskriver "
 "given gräns"
 
-#: diff.c:5421
+#: diff.c:5527
 msgid "Diff algorithm options"
 msgstr "Alternativ för diff-algoritm"
 
-#: diff.c:5423
+#: diff.c:5529
 msgid "produce the smallest possible diff"
 msgstr "skapa minsta möjliga diff"
 
-#: diff.c:5426
+#: diff.c:5532
 msgid "ignore whitespace when comparing lines"
 msgstr "ignorera blanktecken vid radjämförelse"
 
-#: diff.c:5429
+#: diff.c:5535
 msgid "ignore changes in amount of whitespace"
 msgstr "ignorera ändringar i antal blanktecken vid radjämförelse"
 
-#: diff.c:5432
+#: diff.c:5538
 msgid "ignore changes in whitespace at EOL"
 msgstr "ignorera blanktecken vid radslut"
 
-#: diff.c:5435
+#: diff.c:5541
 msgid "ignore carrier-return at the end of line"
 msgstr "ignorera CR-tecken vid radslut"
 
-#: diff.c:5438
+#: diff.c:5544
 msgid "ignore changes whose lines are all blank"
 msgstr "ignorera ändringar i rader som är helt blanka"
 
-#: diff.c:5441
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr "<reguttr>"
+
+#: diff.c:5547
+msgid "ignore changes whose all lines match <regex>"
+msgstr "ignorera ändringar där samtliga rader motsvarar <reguttr>"
+
+#: diff.c:5550
 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:5444
+#: diff.c:5553
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"patience diff\""
 
-#: diff.c:5448
+#: diff.c:5557
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"histogram diff\""
 
-#: diff.c:5450
+#: diff.c:5559
 msgid "<algorithm>"
 msgstr "<algoritm>"
 
-#: diff.c:5451
+#: diff.c:5560
 msgid "choose a diff algorithm"
 msgstr "välj en diff-algoritm"
 
-#: diff.c:5453
+#: diff.c:5562
 msgid "<text>"
 msgstr "<text>"
 
-#: diff.c:5454
+#: diff.c:5563
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "skapa diffar med algoritmen \"anchored diff\""
 
-#: diff.c:5456 diff.c:5465 diff.c:5468
+#: diff.c:5565 diff.c:5574 diff.c:5577
 msgid "<mode>"
 msgstr "<läge>"
 
-#: diff.c:5457
+#: diff.c:5566
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "visa orddiff, där <läge> avgränsar ändrade ord"
 
-#: diff.c:5459 diff.c:5462 diff.c:5507
-msgid "<regex>"
-msgstr "<reguttr>"
-
-#: diff.c:5460
+#: diff.c:5569
 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:5463
+#: diff.c:5572
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "motsvarar --word-diff=color --word-diff-regex=<reguttr>"
 
-#: diff.c:5466
+#: diff.c:5575
 msgid "moved lines of code are colored differently"
 msgstr "flyttade kodrader färgas på annat sätt"
 
-#: diff.c:5469
+#: diff.c:5578
 msgid "how white spaces are ignored in --color-moved"
 msgstr "hur blanktecken ignoreras i --color-moved"
 
-#: diff.c:5472
+#: diff.c:5581
 msgid "Other diff options"
 msgstr "Andra diff-flaggor"
 
-#: diff.c:5474
+#: diff.c:5583
 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:5478
+#: diff.c:5587
 msgid "treat all files as text"
 msgstr "hantera alla filer som text"
 
-#: diff.c:5480
+#: diff.c:5589
 msgid "swap two inputs, reverse the diff"
 msgstr "växla två indatafiler, vänd diffen"
 
-#: diff.c:5482
+#: diff.c:5591
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "avsluta med 1 vid ändringar, annars 0"
 
-#: diff.c:5484
+#: diff.c:5593
 msgid "disable all output of the program"
 msgstr "slå av alla utdata från programmet"
 
-#: diff.c:5486
+#: diff.c:5595
 msgid "allow an external diff helper to be executed"
 msgstr "tillåt köra en extern diff-hjälpare"
 
-#: diff.c:5488
+#: diff.c:5597
 msgid "run external text conversion filters when comparing binary files"
 msgstr "kör externt textkonverteringsfiler när binärfiler jämförs"
 
-#: diff.c:5490
+#: diff.c:5599
 msgid "<when>"
 msgstr "<när>"
 
-#: diff.c:5491
+#: diff.c:5600
 msgid "ignore changes to submodules in the diff generation"
 msgstr "ignorera ändringar i undermoduler när diffen skapas"
 
-#: diff.c:5494
+#: diff.c:5603
 msgid "<format>"
 msgstr "<format>"
 
-#: diff.c:5495
+#: diff.c:5604
 msgid "specify how differences in submodules are shown"
 msgstr "ange hur ändringar i undermoduler visas"
 
-#: diff.c:5499
+#: diff.c:5608
 msgid "hide 'git add -N' entries from the index"
 msgstr "dölj \"git add -N\"-poster från indexet"
 
-#: diff.c:5502
+#: diff.c:5611
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "tolka \"git add -N\"-poster som äkta i indexet"
 
-#: diff.c:5504
+#: diff.c:5613
 msgid "<string>"
 msgstr "<sträng>"
 
-#: diff.c:5505
+#: diff.c:5614
 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:5508
+#: diff.c:5617
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -2956,118 +3860,165 @@ msgstr ""
 "se efter ändringar som ändrar antalet förekomster av angivet reguljärt "
 "uttryck"
 
-#: diff.c:5511
+#: diff.c:5620
 msgid "show all changes in the changeset with -S or -G"
 msgstr "visa alla ändringar i ändringsuppsättningen med -S eller -G"
 
-#: diff.c:5514
+#: diff.c:5623
 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:5517
+#: diff.c:5626
 msgid "control the order in which files appear in the output"
 msgstr "styr ordningen i vilken filer visas i utdata"
 
-#: diff.c:5518
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr "<sökväg>"
+
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr "visa ändringen i angiven sökväg först"
+
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr "hoppa över utdata fram till angiven sökväg"
+
+#: diff.c:5633
 msgid "<object-id>"
 msgstr "<objekt-id>"
 
-#: diff.c:5519
+#: diff.c:5634
 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:5521
+#: diff.c:5636
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5522
+#: diff.c:5637
 msgid "select files by diff type"
 msgstr "välj filter efter diff-typ"
 
-#: diff.c:5524
+#: diff.c:5639
 msgid "<file>"
 msgstr "<fil>"
 
-#: diff.c:5525
+#: diff.c:5640
 msgid "Output to a specific file"
 msgstr "Skriv utdata till en specifik fil"
 
-#: diff.c:6180
-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 ""
-"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:6183
+#: diff.c:6301
 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:6186
+#: diff.c:6304
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr ""
 "du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
 
-#: dir.c:549
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "kunde inte läsa orderfilen \"%s\""
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr "Utför onöjaktig namnbytesdetektering"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Sökvägen \"%s\" finns inte i diffen"
+
+#: 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:938
+#: dir.c:733 dir.c:762 dir.c:775
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "okänt mönster: %s"
+
+#: dir.c:790 dir.c:804
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "okänt negativt mönster: %s"
+
+#: 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:830
+msgid "disabling cone pattern matching"
+msgstr "inaktiverar konmönstermatchning"
+
+#: dir.c:1214
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "kan inte använda %s som exkluderingsfil"
 
-#: dir.c:1877
+#: dir.c:2351
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "kunde inte öppna katalogen \"%s\""
 
-#: dir.c:2128
+#: dir.c:2653
 msgid "failed to get kernel name and information"
 msgstr "misslyckades hämta kärnans namn och information"
 
-#: dir.c:2252
+#: dir.c:2777
 msgid "untracked cache is disabled on this system or location"
 msgstr "ospårad cache är inaktiverad på systemet eller platsen"
 
-#: dir.c:3056
+#: dir.c:3610
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "indexfilen trasig i arkivet %s"
 
-#: dir.c:3101 dir.c:3106
+#: dir.c:3657 dir.c:3662
 #, c-format
 msgid "could not create directories for %s"
 msgstr "kunde inte skapa kataloger för %s"
 
-#: dir.c:3135
+#: dir.c:3691
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
-msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c"
+msgstr "tips: Väntar på att textredigeringsprogrammet ska stänga filen...%c"
 
-#: entry.c:178
+#: entry.c:176
 msgid "Filtering content"
 msgstr "Filtrerar innehåll"
 
-#: entry.c:476
+#: entry.c:497
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "kunde inte ta status på filen \"%s\""
 
-#: environment.c:148
+#: environment.c:152
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "felaktig git-namnrymdssökväg \"%s\""
 
-#: environment.c:330
+#: environment.c:334
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "kunde inte ställa in GIT_DIR till \"%s\""
@@ -3077,251 +4028,281 @@ msgstr "kunde inte ställa in GIT_DIR till \"%s\""
 msgid "too many args to run %s"
 msgstr "för många flaggor för att köra %s"
 
-#: fetch-pack.c:150
+#: fetch-pack.c:182
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: förväntade grund lista"
 
-#: fetch-pack.c:153
+#: fetch-pack.c:185
 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:164
+#: fetch-pack.c:196
 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:184
+#: fetch-pack.c:216
 #, 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:195
+#: fetch-pack.c:227
 msgid "unable to write to remote"
 msgstr "kunde inte skriva till fjärren"
 
-#: fetch-pack.c:257
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc kräver \"multi_ack_detailed\""
 
-#: fetch-pack.c:356 fetch-pack.c:1280
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "ogiltig \"shallow\"-rad: %s"
 
-#: fetch-pack.c:362 fetch-pack.c:1286
+#: fetch-pack.c:389 fetch-pack.c:1429
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "ogiltig \"unshallow\"-rad: %s"
 
-#: fetch-pack.c:364 fetch-pack.c:1288
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
 msgstr "objektet hittades inte: %s"
 
-#: fetch-pack.c:367 fetch-pack.c:1291
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
 msgstr "fel i objekt: %s"
 
-#: fetch-pack.c:369 fetch-pack.c:1293
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
 msgstr "ingen \"shallow\" hittades: %s"
 
-#: fetch-pack.c:372 fetch-pack.c:1297
+#: fetch-pack.c:399 fetch-pack.c:1440
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "förväntade shallow/unshallow, fick %s"
 
-#: fetch-pack.c:414
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr "fick %s %d %s"
 
-#: fetch-pack.c:431
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
 msgstr "ogiltig incheckning %s"
 
-#: fetch-pack.c:462
+#: fetch-pack.c:487
 msgid "giving up"
 msgstr "ger upp"
 
-#: fetch-pack.c:475 progress.c:312
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
 msgstr "klart"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "fick %s (%d) %s"
 
-#: fetch-pack.c:533
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr "Markerar %s som komplett"
 
-#: fetch-pack.c:742
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr "har redan %s (%s)"
 
-#: fetch-pack.c:781
+#: fetch-pack.c:849
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
 
-#: fetch-pack.c:789
+#: fetch-pack.c:857
 msgid "protocol error: bad pack header"
 msgstr "protokollfel: felaktigt packhuvud"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:951
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-patch: kunde inte grena av %s"
 
-#: fetch-pack.c:873
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-patch: ogiltig utdata från index-pack"
+
+#: fetch-pack.c:974
 #, c-format
 msgid "%s failed"
 msgstr "%s misslyckades"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
 msgstr "fel i sidbands-avmultiplexare"
 
-#: fetch-pack.c:907
+#: fetch-pack.c:1019
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Serverversionen är %.*s"
 
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
+#: 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 "Servern stöder %s"
 
-#: fetch-pack.c:914
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
 msgstr "Servern stöder inte klienter med grunda arkiv"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:1089
 msgid "Server does not support --shallow-since"
 msgstr "Servern stöder inte --shallow-since"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1094
 msgid "Server does not support --shallow-exclude"
 msgstr "Servern stöder inte --shallow-exclude"
 
-#: fetch-pack.c:983
+#: fetch-pack.c:1098
 msgid "Server does not support --deepen"
 msgstr "Servern stöder inte --deepen"
 
-#: fetch-pack.c:1000
+#: fetch-pack.c:1100
+msgid "Server does not support this repository's object format"
+msgstr "Servern stöder inte det här arkivets objektformat"
+
+#: fetch-pack.c:1113
 msgid "no common commits"
 msgstr "inga gemensamma incheckningar"
 
-#: fetch-pack.c:1012 fetch-pack.c:1468
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr "källarkivet är grunt, tillåter inte kloning."
+
+#: fetch-pack.c:1128 fetch-pack.c:1660
 msgid "git fetch-pack: fetch failed."
-msgstr "git fetch-patch: hämtning misslyckades."
+msgstr "git fetch-pack: hämtning misslyckades."
+
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "omaka algoritmer: klient %s; server %s"
 
-#: fetch-pack.c:1150
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "servern stöder inte algoritmen \"%s\""
+
+#: fetch-pack.c:1279
 msgid "Server does not support shallow requests"
 msgstr "Servern stöder inte grunda förfrågningar"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1286
 msgid "Server supports filter"
 msgstr "Servern stöder filter"
 
-#: fetch-pack.c:1180
+#: fetch-pack.c:1329 fetch-pack.c:2043
 msgid "unable to write request to remote"
 msgstr "kunde inte skriva anrop till fjärren"
 
-#: fetch-pack.c:1198
+#: fetch-pack.c:1347
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "fel vid läsning av styckehuvudet \"%s\""
 
-#: fetch-pack.c:1204
+#: fetch-pack.c:1353
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "förväntade \"%s\", tog emot \"%s\""
 
-#: fetch-pack.c:1243
+#: fetch-pack.c:1387
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
-msgstr "förväntade bekräftelserad: \"%s\""
+msgstr "oväntad bekräftelserad: \"%s\""
 
-#: fetch-pack.c:1248
+#: fetch-pack.c:1392
 #, c-format
 msgid "error processing acks: %d"
 msgstr "fel vid hantering av bekräftelser: %d"
 
-#: fetch-pack.c:1258
+#: fetch-pack.c:1402
 msgid "expected packfile to be sent after 'ready'"
 msgstr "väntade att paketfil skulle sändas efter \"ready\""
 
-#: fetch-pack.c:1260
+#: fetch-pack.c:1404
 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:1302
+#: fetch-pack.c:1445
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "fel vid hantering av grund (\"shallow\") info: %d"
 
-#: fetch-pack.c:1349
+#: fetch-pack.c:1494
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "förväntade wanted-ref, fick %s"
 
-#: fetch-pack.c:1354
+#: fetch-pack.c:1499
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "oväntad wanted-ref: \"%s\""
 
-#: fetch-pack.c:1359
+#: fetch-pack.c:1504
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "fel vid hantering av önskade referenser: %d"
 
-#: fetch-pack.c:1693
+#: fetch-pack.c:1534
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: förväntade svarsavslutningspaket"
+
+#: fetch-pack.c:1939
 msgid "no matching remote head"
 msgstr "inget motsvarande fjärrhuvud"
 
-#: fetch-pack.c:1716 builtin/clone.c:685
+#: fetch-pack.c:1962 builtin/clone.c:697
 msgid "remote did not send all necessary objects"
 msgstr "fjärren sände inte alla nödvändiga objekt"
 
-#: fetch-pack.c:1743
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr "oväntat \"ready\" från fjärr"
+
+#: fetch-pack.c:2088
 #, c-format
 msgid "no such remote ref %s"
 msgstr "ingen sådan fjärreferens: %s"
 
-#: fetch-pack.c:1746
+#: fetch-pack.c:2091
 #, 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:321
-msgid "gpg failed to sign the data"
-msgstr "gpg misslyckades signera data"
-
-#: gpg-interface.c:347
+#: gpg-interface.c:273
 msgid "could not create temporary file"
 msgstr "kunde inte skapa temporära fil"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "misslyckades skriva fristående signatur till \"%s\""
 
-#: graph.c:97
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg misslyckades signera data"
+
+#: 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:668
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -3329,18 +4310,18 @@ msgstr ""
 "angivet mönster innehåller NULL-byte (via -f <fil>). Detta stöds endast med -"
 "P under PCRE v2"
 
-#: grep.c:2124
+#: grep.c:1895
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "\"%s\" kunde inte läsa %s"
 
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
-#: 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 "misslyckades ta status på \"%s\""
 
-#: grep.c:2152
+#: grep.c:1923
 #, c-format
 msgid "'%s': short read"
 msgstr "\"%s\": kort läsning"
@@ -3390,48 +4371,48 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Lågnivåkommandon / frågare"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Lågnivåkommandon / synka arkiv"
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Lågnivåkommandon / interna hjälpare"
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "git-kommandon tillgängliga i \"%s\""
 
-#: help.c:305
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "git-kommandon från andra platser i din $PATH"
 
-#: help.c:314
+#: help.c:316
 msgid "These are common Git commands used in various situations:"
 msgstr "Dessa vanliga Git-kommandon används i olika situationer:"
 
-#: help.c:363 git.c:98
+#: help.c:365 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "okänd kommandolisttyp \"%s\""
 
-#: help.c:403
-msgid "The common Git guides are:"
-msgstr "De vanliga Git-vägledningarna är:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Vägledningar för Git-koncept:"
 
-#: help.c:512
+#: help.c:429
 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:517
+#: help.c:434
 msgid "External commands"
 msgstr "Externa kommandon"
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr "Kommadoalias"
 
-#: help.c:596
+#: help.c:527
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -3440,32 +4421,32 @@ msgstr ""
 "\"%s\" verkar vara ett git-kommando, men vi kan inte\n"
 "köra det. Kanske git-%s är trasigt?"
 
-#: help.c:655
+#: help.c:543 help.c:631
+#, 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
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls."
 
-#: help.c:677
+#: help.c:613
 #, 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:682
+#: help.c:618
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "Fortsätter under förutsättningen att du menade \"%s\"."
 
-#: help.c:687
+#: help.c:623
 #, 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:695
-#, 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:699
+#: help.c:635
 msgid ""
 "\n"
 "The most similar command is"
@@ -3479,16 +4460,16 @@ msgstr[1] ""
 "\n"
 "Mest lika kommandon är"
 
-#: help.c:714
+#: help.c:675
 msgid "git version [<options>]"
 msgstr "git version [<flaggor>]"
 
-#: help.c:783
+#: help.c:730
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:787
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3502,7 +4483,15 @@ msgstr[1] ""
 "\n"
 "Menade du ett av dessa?"
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Författar-identitet okänd\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Incheckar-identitet okänd\n"
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3528,91 +4517,100 @@ msgstr ""
 "Kör utan --global för att endast ändra i aktuellt arkiv.\n"
 "\n"
 
-#: ident.c:379
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
 msgstr "ingen e-post angavs och autodetektering är inaktiverad"
 
-#: ident.c:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "kunde inte autodetektera e-postadress (fick \"%s\")"
 
-#: ident.c:401
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
 msgstr "inget namn angavs och autodetektering är inaktiverad"
 
-#: ident.c:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "kunde inte autodetektera namn (fick \"%s\")"
 
-#: ident.c:415
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "tomt ident-namn (för <%s>) ej tillåtet"
 
-#: ident.c:421
+#: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "namnet består enbart av ej tillåtna tecken: %s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:454 builtin/commit.c:647
 #, c-format
 msgid "invalid date format: %s"
 msgstr "felaktigt datumformat: %s"
 
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
-
-#: list-objects.c:140
-#, c-format
-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:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "kunde inte läsa in rot-trädet för incheckningen %s"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "kunde inte nå gles blob på \"%s\""
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "kunde inte tolka gles filterdata i %s"
-
-#: list-objects-filter-options.c:58
+#: list-objects-filter-options.c:83
 msgid "expected 'tree:<depth>'"
 msgstr "förväntade \"tree:<djup>\""
 
-#: list-objects-filter-options.c:73
+#: list-objects-filter-options.c:98
 msgid "sparse:path filters support has been dropped"
 msgstr "sparse:sökväg-filter stöds inte längre"
 
-#: list-objects-filter-options.c:86
+#: list-objects-filter-options.c:105
+#, c-format
+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
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "felaktig filterspecifikation: \"%s\""
 
-#: list-objects-filter-options.c:102
+#: list-objects-filter-options.c:140
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
 msgstr "måste använda specialsekvens i delfilter-spec: \"%c\""
 
-#: list-objects-filter-options.c:144
+#: list-objects-filter-options.c:182
 msgid "expected something after combine:"
 msgstr "förväntade någonting efter combine:"
 
-#: list-objects-filter-options.c:226
+#: list-objects-filter-options.c:264
 msgid "multiple filter-specs cannot be combined"
 msgstr "flera filterspecifikationer kan inte kombineras"
 
-#: lockfile.c:151
+#: list-objects-filter-options.c:376
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "kunde inte uppgradera arkivformat till att stöda delvis klon"
+
+#: list-objects-filter.c:532
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "kunde inte nå gles blob på \"%s\""
+
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "kunde inte tolka gles filterdata i %s"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "posten \"%s\" i trädet %s har träd-läge, men är inte ett träd"
+
+#: list-objects.c:140
+#, c-format
+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: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"
+
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3632,168 +4630,396 @@ msgstr ""
 "tidigare:\n"
 "ta bort filen manuellt för att fortsätta."
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Kunde inte skapa \"%s.lock\": %s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "misslyckades läsa cachen"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "ogiltigt värde \"%s\" för lsrefs.unborn"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "kunde inte skriva ny indexfil"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "förväntade \"flush\" efter ls-refs-argument"
+
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "citerad CRLF upptäcktes"
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "felaktig funktion \"%s\" för \"%s\""
+
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
+
+#: merge-ort.c:1578 merge-recursive.c:1208
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
+
+#: merge-ort.c:1587 merge-recursive.c:1215
+#, 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-recursive.c:367
+#: merge-ort.c:1597 merge-ort.c:1604
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "Obs: Snabbspolar undermodulen %s till %s"
+
+#: merge-ort.c:1625
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "Misslyckades slå ihop undermodulen %s"
+
+#: merge-ort.c:1632
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"Misslyckades slå ihop undermodulen %s, men en möjlig lösning finns:\n"
+"%s\n"
+
+#: 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 ""
+"Om detta är riktigt lägger du bara till det i indexet, till\n"
+"exempel så här:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"vilket godtar lösningen.\n"
+
+#: merge-ort.c:1649
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"Misslyckades slå ihop undermodulen %s, men flera möjliga sammanslagningar "
+"finns:\n"
+"%s"
+
+#: merge-ort.c:1868 merge-recursive.c:1358
+msgid "Failed to execute internal merge"
+msgstr "Misslyckades exekvera intern sammanslagning"
+
+#: merge-ort.c:1873 merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "Kunde inte lägga till %s till databasen"
+
+#: merge-ort.c:1880 merge-recursive.c:1396
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Slår ihop %s automatiskt"
+
+#: 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 ""
+"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: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 ""
+"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: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 ""
+"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska namnbytas till; "
+"den har namnbytts till flera andra kataloger, utan att någon destination "
+"fick en majoritet av filerna."
+
+#: 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 ""
+"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
+"bytt namn."
+
+#: 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 ""
+"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
+"flyttar den till %s."
+
+#: 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 ""
+"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: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 ""
+"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: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 ""
+"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
+"bytte namn i %s; flyttar den till %s."
+
+#: merge-ort.c:2569
+#, 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: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 ""
+"KONFLIKT (namnbyte involverad i krock): namnbyte av %s -> %s har "
+"innehållskonflikter OCH krockar med en annan sökväg; detta kan leda till "
+"nästlade konfliktmarkörer."
+
+#: 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 ""
+"KONFLIKT (namnbyte/radera): %s namnbytt till %s i %s, men borttagen i %s."
+
+#: merge-ort.c:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
+msgstr "kan inte läsa objektet %s"
+
+#: merge-ort.c:3185 merge-recursive.c:3011
+#, c-format
+msgid "object %s is not a blob"
+msgstr "objektet %s är inte en blob"
+
+#: merge-ort.c:3613
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"KONFLIKT (fil/katalog): katalogen är i vägen för %s från %s; flyttar den "
+"till %s istället."
+
+#: 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 ""
+"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte bägge "
+"så att de kan protokollföras någonstans."
+
+#: 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 ""
+"KONFLIKT (olika typer): %s hade olika typer på varje sida; namnbytte den ena "
+"så att de kan protokollföras någonstans."
+
+#: merge-ort.c:3796 merge-recursive.c:3087
+msgid "content"
+msgstr "innehåll"
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr "tillägg/tillägg"
+
+#: merge-ort.c:3800 merge-recursive.c:3136
+msgid "submodule"
+msgstr "undermodul"
+
+#: merge-ort.c:3802 merge-recursive.c:3137
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %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 ""
+"KONFLIKT (ändra/radera): %s raderad i %s och ändrad i %s. Versionen %s av %s "
+"lämnad i trädet."
+
+#: 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 ""
+"Observera: %s är inte à jour och i vägen för att checka ut version i "
+"konflikt; gammal upplaga har nytt namn %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:4487
+#, 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:3702
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Dina lokala ändringar av följande filer skulle skrivas över av "
+"sammanslagning:\n"
+"  %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "Redan à jour."
+
+#: merge-recursive.c:352
 msgid "(bad commit)\n"
 msgstr "(felaktig incheckning)\n"
 
-#: merge-recursive.c:390
+#: merge-recursive.c:375
 #, 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:399
+#: merge-recursive.c:384
 #, 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:885
+#: merge-recursive.c:872
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "misslyckades skapa sökvägen \"%s\"%s"
 
-#: merge-recursive.c:896
+#: merge-recursive.c:883
 #, 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:910 merge-recursive.c:929
+#: merge-recursive.c:897 merge-recursive.c:916
 msgid ": perhaps a D/F conflict?"
 msgstr ": kanske en K/F-konflikt?"
 
-#: merge-recursive.c:919
+#: merge-recursive.c:906
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "vägrar förlora ospårad fil vid \"%s\""
 
-#: merge-recursive.c:960 builtin/cat-file.c:41
+#: merge-recursive.c:947 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "kan inte läsa objektet %s: \"%s\""
 
-#: merge-recursive.c:965
+#: merge-recursive.c:952
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "blob förväntades för %s \"%s\""
 
-#: merge-recursive.c:990
+#: merge-recursive.c:977
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "misslyckades öppna \"%s\": %s"
 
-#: merge-recursive.c:1001
+#: merge-recursive.c:988
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "misslyckades skapa symboliska länken \"%s\": %s"
 
-#: merge-recursive.c:1006
+#: merge-recursive.c:993
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
-msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
-
-#: merge-recursive.c:1199
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "Misslyckades slå ihop undermodulen %s (ej utcheckad)"
-
-#: merge-recursive.c:1206
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "Misslyckades slå ihop undermodulen %s (incheckningar saknas)"
-
-#: merge-recursive.c:1213
-#, 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)"
+msgstr "vet inte hur %06o %s \"%s\" ska hanteras"
 
-#: merge-recursive.c:1221 merge-recursive.c:1233
+#: merge-recursive.c:1223 merge-recursive.c:1235
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "Snabbspolar undermodulen %s till följande incheckning:"
 
-#: merge-recursive.c:1224 merge-recursive.c:1236
+#: merge-recursive.c:1226 merge-recursive.c:1238
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Snabbspolar undermodulen %s"
 
-#: merge-recursive.c:1259
+#: merge-recursive.c:1261
 #, 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:1263
+#: merge-recursive.c:1265
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "Misslyckades slå ihop undermodulen %s (ej snabbspolning)"
 
-#: merge-recursive.c:1264
+#: merge-recursive.c:1266
 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:1267
-#, 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 ""
-"Om detta är riktigt lägger du bara till det i indexet, till\n"
-"exempel så här:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"vilket godtar lösningen.\n"
-
-#: merge-recursive.c:1276
+#: merge-recursive.c:1278
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr ""
 "Misslyckades slå ihop undermodulen %s (flera sammanslagningar hittades)"
 
-#: merge-recursive.c:1349
-msgid "Failed to execute internal merge"
-msgstr "Misslyckades exekvera intern sammanslagning"
-
-#: merge-recursive.c:1354
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Kunde inte lägga till %s till databasen"
-
-#: merge-recursive.c:1386
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Slår ihop %s automatiskt"
-
-#: merge-recursive.c:1410
+#: merge-recursive.c:1420
 #, 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:1482
+#: merge-recursive.c:1492
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3802,7 +5028,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:1487
+#: merge-recursive.c:1497
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3811,7 +5037,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:1494
+#: merge-recursive.c:1504
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3820,7 +5046,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:1499
+#: merge-recursive.c:1509
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3829,40 +5055,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:1534
+#: merge-recursive.c:1544
 msgid "rename"
 msgstr "namnbyte"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1544
 msgid "renamed"
 msgstr "namnbytt"
 
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "Vägrar förlora lortig fil vid \"%s\""
 
-#: merge-recursive.c:1624
+#: merge-recursive.c:1605
 #, 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:1682
+#: merge-recursive.c:1663
 #, 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:1713
+#: merge-recursive.c:1694
 #, 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:1718
+#: merge-recursive.c:1699
 #, 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:1737
+#: merge-recursive.c:1726
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3871,46 +5097,28 @@ msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
 "namnbyte \"%s\"->\"%s\" i \"%s\"%s"
 
-#: merge-recursive.c:1742
+#: merge-recursive.c:1731
 msgid " (left unresolved)"
 msgstr " (lämnad olöst)"
 
-#: merge-recursive.c:1851
+#: merge-recursive.c:1823
 #, 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:2056
+#: merge-recursive.c:2086
 #, 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."
 msgstr ""
-"KONFLIKT (namnändrad delad katalog): Osäker på var %s skall placeras då "
+"KONFLIKT (namnändrad delad katalog): Osäker på var %s ska placeras då "
 "katalogen %s bytte namn till flera andra kataloger, utan att någon "
 "destination fick en majoritet av filerna."
 
-#: merge-recursive.c:2088
-#, 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 ""
-"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-recursive.c:2098
-#, 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 ""
-"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-recursive.c:2190
+#: merge-recursive.c:2220
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3919,317 +5127,285 @@ msgstr ""
 "KONFLIKT (namnbyte/namnbyte): Namnbytt katalog %s->%s i %s. Namnbytt katalog "
 "%s->%s i %s"
 
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr ""
-"VARNING: Undviker att applicera namnändring %s -> %s på %s, då %s själv har "
-"bytt namn."
-
-#: merge-recursive.c:2961
-#, c-format
-msgid "cannot read object %s"
-msgstr "kan inte läsa objektet %s"
-
-#: merge-recursive.c:2964
-#, c-format
-msgid "object %s is not a blob"
-msgstr "objektet %s är inte en blob"
-
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modify"
 msgstr "ändra"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modified"
 msgstr "ändrad"
 
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "innehåll"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "tillägg/tillägg"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3114
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
 
-#: merge-recursive.c:3089 git-submodule.sh:937
-msgid "submodule"
-msgstr "undermodul"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3167
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Lägger till som %s istället"
 
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"Uppdaterad sökväg: %s lade till %s inuti en katalog som bytte namn i %s; "
-"flyttar den till %s."
-
-#: merge-recursive.c:3206
-#, 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 ""
-"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-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-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-recursive.c:3213
-#, 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 ""
-"KONFLIKT (filplacering): %s bytte namn till %s i %s, inuti en katalog som "
-"bytte namn i %s; flyttar den till %s."
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3371
 #, c-format
 msgid "Removing %s"
 msgstr "Tar bort %s"
 
-#: merge-recursive.c:3350
+#: merge-recursive.c:3394
 msgid "file/directory"
 msgstr "fil/katalog"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3399
 msgid "directory/file"
 msgstr "katalog/fil"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3406
 #, 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:3371
+#: merge-recursive.c:3415
 #, c-format
 msgid "Adding %s"
 msgstr "Lägger till %s"
 
-#: merge-recursive.c:3380
+#: merge-recursive.c:3424
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "KONFLIKT (tillägg/tillägg): Sammanslagningskonflikt i %s"
 
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr "Redan à jour!"
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3477
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "sammanslagning av träden %s och %s misslyckades"
 
-#: merge-recursive.c:3537
+#: merge-recursive.c:3571
 msgid "Merging:"
 msgstr "Slår ihop:"
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3584
 #, 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:3600
+#: merge-recursive.c:3634
 msgid "merge returned no commit"
 msgstr "sammanslagningen returnerade ingen incheckning"
 
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Dina lokala ändringar av följande filer skulle skrivas över av "
-"sammanslagning:\n"
-"  %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3799
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Kunde inte tolka objektet \"%s\""
 
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
 msgid "Unable to write index."
 msgstr "Kunde inte skriva indexet."
 
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "misslyckades läsa cachen"
+
+#: 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 "kunde inte skriva ny indexfil"
+
+#: midx.c:74
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "multi-pack-indexets OID-utbredning har fel storlek"
+
+#: midx.c:105
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "multi-pack-indexfilen %s är för liten"
 
-#: midx.c:84
+#: midx.c:121
 #, 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:89
+#: midx.c:126
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-indexversionen %d stöds inte"
 
-#: midx.c:94
+#: midx.c:131
 #, c-format
-msgid "hash version %u does not match"
-msgstr "hash-versionen %u stämmer inte"
-
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr "felaktigt offset för stycke (för stort)"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "avslutande multi-pack-index-stycke-id förekommer tidigare än förväntat"
+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:145
+#: midx.c:148
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "multi-pack-index saknar krävd paketnamn-stycke"
 
-#: midx.c:147
+#: midx.c:150
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "multi-pack-index saknar krävt OID-utbredningsstycke"
 
-#: midx.c:149
+#: midx.c:152
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "multi-pack-index saknar krävt OID-uppslagnignsstycke"
 
-#: midx.c:151
+#: midx.c:154
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "multi-pack-index saknar krävt objekt-offsetstycke"
 
-#: midx.c:165
+#: midx.c:170
 #, 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:210
+#: midx.c:214
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "bad pack-int-id: %u (%u paket totalt)"
 
-#: midx.c:260
+#: midx.c:264
 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:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "fel när paketfiler från multi-pack-index skulle förberedas"
-
-#: midx.c:469
+#: midx.c:490
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "misslyckades läsa paketfilen \"%s\""
 
-#: midx.c:475
+#: midx.c:496
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "misslyckades öppna paketindexet \"%s\""
 
-#: midx.c:535
+#: midx.c:564
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "misslyckades hitta objekt %d i paketfilen"
 
-#: midx.c:864
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr "kan inte spara reverse-index-fil"
+
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "ignorerar befintlig multi-pack-index; felaktig kontrollsumma"
+
+#: midx.c:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Lägger till paketfiler till multi-pack-index"
+
+#: midx.c:989
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "såg inte paketfilen %s som skulle kastas"
 
-#: midx.c:1035
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "okänt föredraget paket: %s"
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "föredraget paket \"%s\" har löpt ut"
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr "inga paketfiler att indexera."
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "misslyckades ta bort %s"
+
+#: midx.c:1166
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "misslyckades städa multi-pack-index på %s"
 
-#: midx.c:1090
+#: midx.c:1225
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "multi-pack-indexfilen finns, men kunde inte tolkas"
+
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr "felaktig kontrollsumma"
+
+#: midx.c:1236
 msgid "Looking for referenced packfiles"
 msgstr "Ser efter refererade packfiler"
 
-#: midx.c:1105
+#: midx.c:1251
 #, 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:1109
-msgid "Verifying OID order in MIDX"
-msgstr "Bekräftar OID-ordning i MIDX"
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr "midx saknar oid"
 
-#: midx.c:1118
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Bekräftar OID-ordning i multi-pack-index"
+
+#: midx.c:1274
 #, 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:1137
+#: midx.c:1294
 msgid "Sorting objects by packfile"
 msgstr "Sorterar objekt efter packfil"
 
-#: midx.c:1143
+#: midx.c:1301
 msgid "Verifying object offsets"
 msgstr "Bekräftar offset för objekt"
 
-#: midx.c:1159
+#: midx.c:1317
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "misslyckades läsa paketpost för oid[%d] = %s"
 
-#: midx.c:1165
+#: midx.c:1323
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "misslyckades läsa paketindex för paketfil %s"
 
-#: midx.c:1174
+#: midx.c:1332
 #, 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:1349
+#: midx.c:1357
+msgid "Counting referenced objects"
+msgstr "Räknar refererade objekt"
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Ser efter och tar bort orefererade packfiler"
+
+#: midx.c:1558
 msgid "could not start pack-objects"
 msgstr "kunde inte starta pack-objects"
 
-#: midx.c:1368
+#: midx.c:1578
 msgid "could not finish pack-objects"
 msgstr "kunde inte avsluta pack-objects"
 
-#: name-hash.c:537
+#: name-hash.c:542
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "misslyckades skapa lazy_dir-tråd: %s"
 
-#: name-hash.c:559
+#: name-hash.c:564
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "misslyckades skapa lazy_name-tråd: %s"
 
-#: name-hash.c:565
+#: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "misslyckades utföra join på lazy_name-tråd: %s"
@@ -4274,6 +5450,359 @@ 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
+#, 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:584
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "kunde inte normalisera supplerande objektsökväg: %s"
+
+#: object-file.c:658
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s: ignorerar supplerande objektlager, för djup nästling"
+
+#: object-file.c:665
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "kan inte normalisera objektkatalogen: %s"
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr "kan inte utföra \"fdopen\" på suppleantlåsfil"
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr "kan inte läsa \"alternates\"-filen"
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr "kan inte flytta ny \"alternates\"-fil på plats"
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "sökvägen \"%s\" finns inte"
+
+#: object-file.c:789
+#, 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:795
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
+
+#: object-file.c:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "referensarkivet \"%s\" är grunt"
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "referensarkivet \"%s\" är ympat"
+
+#: object-file.c:869
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "felaktig rad vid tolkning av supplerande referenser: %s"
+
+#: object-file.c:1019
+#, 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:1054
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap misslyckades%s"
+
+#: object-file.c:1218
+#, c-format
+msgid "object file %s is empty"
+msgstr "objektfilen %s är tom"
+
+#: object-file.c:1353 object-file.c:2548
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "trasigt löst objekt \"%s\""
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "skräp i slutet av löst objekt \"%s\""
+
+#: object-file.c:1397
+msgid "invalid object type"
+msgstr "felaktig objekttyp"
+
+#: object-file.c:1481
+#, 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:1484
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "kan inte packa upp %s-huvudet"
+
+#: object-file.c:1490
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
+
+#: object-file.c:1493
+#, c-format
+msgid "unable to parse %s header"
+msgstr "kan inte tolka %s-huvud"
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr "misslyckades läsa objektet %s"
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "ersättningen %s hittades inte för %s"
+
+#: object-file.c:1725
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "löst objekt %s (lagrat i %s) är trasigt"
+
+#: object-file.c:1729
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "packat objekt %s (lagrat i %s) är trasigt"
+
+#: object-file.c:1834
+#, c-format
+msgid "unable to write file %s"
+msgstr "kunde inte skriva filen %s"
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "kan inte sätta behörigheten till \"%s\""
+
+#: object-file.c:1848
+msgid "file write error"
+msgstr "fel vid skrivning av fil"
+
+#: object-file.c:1868
+msgid "error when closing loose object file"
+msgstr "fel vid stängning av fil för löst objekt"
+
+#: object-file.c:1933
+#, 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:1935
+msgid "unable to create temporary file"
+msgstr "kan inte skapa temporär fil"
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr "kunde inte skriva fil för löst objekt"
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
+
+#: object-file.c:1973
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "förvirrad av instabil objektkälldata för %s"
+
+#: object-file.c:1983 builtin/pack-objects.c:1237
+#, c-format
+msgid "failed utime() on %s"
+msgstr "\"utime()\" misslyckades på %s"
+
+#: object-file.c:2060
+#, c-format
+msgid "cannot read object for %s"
+msgstr "kan inte läsa objekt för %s"
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr "trasik incheckning"
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr "trasig tagg"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr "läsfel vid indexering av %s"
+
+#: object-file.c:2222
+#, c-format
+msgid "short read while indexing %s"
+msgstr "för lite lästes vid indexering av %s"
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: misslyckades lägga in i databasen"
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: filtypen stöds ej"
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s är inte ett giltigt objekt"
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s är inte ett giltigt \"%s\"-objekt"
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "kan inte öppna %s"
+
+#: object-file.c:2559 object-file.c:2612
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "hash stämmer inte för %s (förväntade %s)"
+
+#: object-file.c:2583
+#, c-format
+msgid "unable to mmap %s"
+msgstr "kan inte utföra \"mmap\" för %s"
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "kan inte packa upp huvud för %s"
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "kan inte tolka huvud för %s"
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "kan inte tolka innehåll i %s"
+
+#: object-name.c:480
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "kort objekt-ID %s är tvetydigt"
+
+#: object-name.c:491
+msgid "The candidates are:"
+msgstr "Kandidaterna är:"
+
+#: 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 ""
+"Git skapar normalt aldrig referenser som slutar med 40 hexadecimala\n"
+"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n"
+"referenser kan skapas av misstag. Till exempel, för\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n"
+"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: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:918
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "loggen för \"%.*s\" har bara %d poster"
+
+#: 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:1702
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+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:1711
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "sökvägen \"%s\" finns inte i \"%.*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 ""
+"sökvägen \"%s\" finns i indexet men inte i etapp %d\n"
+"tips: Menade du \":%d:%s\"?"
+
+#: 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 ""
+"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: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: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: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:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "felaktigt objektnamn \"%.*s\"."
+
 #: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
@@ -4284,35 +5813,115 @@ msgstr "ogiltig objekttyp \"%s\""
 msgid "object %s is a %s, not a %s"
 msgstr "objektet %s är en %s, inte en %s"
 
-#: object.c:233
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "objektet %s har okänd typ-id %d"
 
-#: object.c:246
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "kunde inte tolka objektet: %s"
 
-#: object.c:266 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "hashvärde stämmer inte överens %s"
 
-#: packfile.c:641
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr "kan inte hämta storlek på %s"
+
+#: pack-bitmap.c:1571 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"
+
+#: pack-revindex.c:221
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "reverse-index-filen %s är för liten"
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "reverse-index-filen %s är trasig"
+
+#: pack-revindex.c:234
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "reverse-index-filen %s har okänd signatur"
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "reverse-index-filen %s har versionen %<PRIu32> som inte stöds"
+
+#: pack-revindex.c:243
+#, c-format
+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
+msgid "cannot both write and verify reverse index"
+msgstr "kan inte både skriva och bekräfta reverse-index"
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr "kunde inte ta status: %s"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "kunde inte göra %s läsbar"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "kunde inte skriva kontraktsfilen \"%s\""
+
+#: packfile.c:625
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "offset före slutet av packfilen (trasig .idx?)"
 
-#: packfile.c:1887
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "paketfilen %s kunde inte kopplas%s"
+
+#: packfile.c:1934
 #, 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:1891
+#: packfile.c:1938
 #, 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
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "flaggan \"%s\" antar ett numeriskt värde"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "trasigt utlöpsdatum: \"%s\""
+
+#: parse-options-cb.c:54
+#, 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
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "felformat objektnamn \"%s\""
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4328,7 +5937,7 @@ msgstr "%s är inkompatibel med %s"
 msgid "%s : incompatible with something else"
 msgstr "%s: inkompatibelt med något annat"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s tar inget värde"
@@ -4338,41 +5947,46 @@ msgstr "%s tar inget värde"
 msgid "%s isn't available"
 msgstr "%s är inte tillgängligt"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, 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:389
+#: parse-options.c:386
 #, 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:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr "menade du \"--%s\" (med två bindestreck?)"
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "menade du \"--%s\" (med två bindestreck)?"
+
+#: parse-options.c:668 parse-options.c:988
+#, c-format
+msgid "alias of --%s"
+msgstr "alias för --%s"
 
-#: parse-options.c:860
+#: parse-options.c:879
 #, c-format
 msgid "unknown option `%s'"
 msgstr "okänd flagga \"%s\""
 
-#: parse-options.c:862
+#: parse-options.c:881
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "okänd flagga \"%c\""
 
-#: parse-options.c:864
+#: parse-options.c:883
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "okänd icke-ascii-flagga i strängen: \"%s\""
 
-#: parse-options.c:888
+#: parse-options.c:907
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:907
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr "användning: %s"
@@ -4380,74 +5994,48 @@ msgstr "användning: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:913
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
 msgstr "     eller: %s"
 
-#: parse-options.c:916
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:955
+#: parse-options.c:974
 msgid "-NUM"
 msgstr "-TAL"
 
-#: parse-options.c:969
-#, c-format
-msgid "alias of --%s"
-msgstr "alias för --%s"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "flaggan \"%s\" antar ett numeriskt värde"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "trasigt utlöpsdatum: \"%s\""
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr ""
-"flaggan \"%s\" antar \"always\" (alltid), \"auto\" eller \"never\" (aldrig)"
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "felformat objektnamn \"%s\""
-
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "Kunde inte göra %s skrivbar för gruppen"
 
-#: pathspec.c:128
+#: pathspec.c:151
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "Specialtecknet \"\\\" tillåts inte som sista tecken i attributvärde"
 
-#: pathspec.c:146
+#: pathspec.c:169
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Endast en \"attr:\"-angivelse tillåten."
 
-#: pathspec.c:149
+#: pathspec.c:172
 msgid "attr spec must not be empty"
 msgstr "attr-angivelse kan inte vara tom"
 
-#: pathspec.c:192
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "ogiltigt attributnamn %s"
 
-#: pathspec.c:257
+#: pathspec.c:280
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr ""
 "de globala sökvägsinställningarna \"glob\" och \"noglob\" är inkompatibla"
 
-#: pathspec.c:264
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4455,50 +6043,55 @@ msgstr ""
 "den globala sökvägsinställningen \"literal\" är inkompatibel med alla andra "
 "globala sökvägsinställningar"
 
-#: pathspec.c:304
+#: pathspec.c:327
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "ogiltig parameter för sökvägsuttrycket för \"prefix\""
 
-#: pathspec.c:325
+#: pathspec.c:348
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "Felaktigt sökvägsuttryck \"%.*s\" i \"%s\""
 
-#: pathspec.c:330
+#: pathspec.c:353
 #, 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:368
+#: pathspec.c:391
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "Ej implementerat sökvägsuttryckmagi \"%c\" i \"%s\""
 
-#: pathspec.c:427
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: \"literal\" och \"glob\" är inkompatibla"
 
-#: pathspec.c:440
+#: pathspec.c:466
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: \"%s\" är utanför arkivet"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: \"%s\" är utanför arkivet på \"%s\""
 
-#: pathspec.c:514
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "\"%s\" (minnesstöd: \"%c\")"
 
-#: pathspec.c:524
+#: pathspec.c:552
 #, 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:591
+#: pathspec.c:619
 #, 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
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "linjen er felaktigt citerad: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "kan inte skriva flush-paket"
@@ -4508,142 +6101,177 @@ msgid "unable to write delim packet"
 msgstr "kan inte skriva delim-paket"
 
 #: pkt-line.c:106
+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:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:265
 msgid "protocol error: impossibly long line"
 msgstr "protokollfel: omöjligt lång rad"
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr "paketskrivning med format misslyckades"
 
-#: pkt-line.c:196
+#: pkt-line.c:204
 msgid "packet write failed - data exceeds max packet size"
 msgstr "paketskrivning misslyckades - data överskrider maximal paketstorlek"
 
-#: pkt-line.c:203 pkt-line.c:210
-msgid "packet write failed"
-msgstr "paketskrivning misslyckades"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "paketskrivning misslyckades: %s"
 
-#: pkt-line.c:295
+#: pkt-line.c:328 pkt-line.c:329
 msgid "read error"
 msgstr "läsfel"
 
-#: pkt-line.c:303
+#: pkt-line.c:339 pkt-line.c:340
 msgid "the remote end hung up unexpectedly"
 msgstr "fjärren lade på oväntat"
 
-#: pkt-line.c:331
+#: pkt-line.c:369 pkt-line.c:371
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "protokollfel: felaktig radlängdstecken: %.4s"
 
-#: pkt-line.c:341 pkt-line.c:346
+#: 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 "protokollfel: felaktig radlängd: %d"
 
-#: pkt-line.c:362
+#: pkt-line.c:413 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "fjärrfel: %s"
 
-#: preload-index.c:119
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr "Uppdaterar indexet"
 
-#: preload-index.c:138
+#: preload-index.c:144
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "kunde inte skapa trådad lstat: %s"
 
-#: pretty.c:966
+#: pretty.c:988
 msgid "unable to parse --pretty format"
 msgstr "kunde inte tolka format för --pretty"
 
-#: promisor-remote.c:25
-msgid "Remote with no URL"
-msgstr "Fjärr utan URL"
+#: 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: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: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:61
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "kontraktsfjärr kan inte börja med \"/\": %s"
 
-#: range-diff.c:71
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: förväntade \"flush\" efter argument"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Tar bort duplicerade objekt"
+
+#: range-diff.c:78
 msgid "could not start `log`"
 msgstr "kunde inte starta \"log\""
 
-#: range-diff.c:73
+#: range-diff.c:80
 msgid "could not read `log` output"
 msgstr "kunde inte läsa utdata från \"log\""
 
-#: range-diff.c:92 sequencer.c:4985
+#: range-diff.c:101 sequencer.c:5550
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "kunde inte tolka incheckningen \"%s\""
 
-#: range-diff.c:118
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"kunde inte tolka första raden i \"log\"-updata: börjar inte med \"commit \": "
+"\"%s\""
+
+#: range-diff.c:140
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "kunde inte tolka git-huvudet \"%.*s\""
 
-#: range-diff.c:275
+#: range-diff.c:307
 msgid "failed to generate diff"
 msgstr "misslyckades skapa diff"
 
-#: range-diff.c:507 range-diff.c:509
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only och --right-only är ömsesidigt uteslutande"
+
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "kunde inte tolka loggen för \"%s\""
 
-#: read-cache.c:680
+#: read-cache.c:710
 #, 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:696
+#: read-cache.c:726
 msgid "cannot create an empty blob in the object database"
 msgstr "kan inte skapa tom blob i objektdatabasen"
 
-#: read-cache.c:718
+#: read-cache.c:748
 #, 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:723
+#: read-cache.c:753
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "\"%s\" har inte någon utcheckad incheckning"
 
-#: read-cache.c:775
+#: read-cache.c:805
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "kan inte indexera filen \"%s\""
 
-#: read-cache.c:794
+#: read-cache.c:824
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "kan inte lägga till \"%s\" till indexet"
 
-#: read-cache.c:805
+#: read-cache.c:835
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "kan inte ta status på \"%s\""
 
-#: read-cache.c:1314
+#: read-cache.c:1358
 #, 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:1520
+#: read-cache.c:1573
 msgid "Refresh index"
 msgstr "Uppdatera indexet"
 
-#: read-cache.c:1635
+#: read-cache.c:1705
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4652,7 +6280,7 @@ msgstr ""
 "index.version satt, men värdet är ogiltigt.\n"
 "Använder version %i"
 
-#: read-cache.c:1645
+#: read-cache.c:1715
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4661,150 +6289,165 @@ msgstr ""
 "GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
 "Använder version %i"
 
-#: read-cache.c:1701
+#: read-cache.c:1771
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "felaktig signatur 0x%08x"
 
-#: read-cache.c:1704
+#: read-cache.c:1774
 #, c-format
 msgid "bad index version %d"
 msgstr "felaktig indexversion %d"
 
-#: read-cache.c:1713
+#: read-cache.c:1783
 msgid "bad index file sha1 signature"
 msgstr "felaktig sha1-signatur för indexfil"
 
-#: read-cache.c:1743
+#: read-cache.c:1817
 #, 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:1745
+#: read-cache.c:1819
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "ignorerar filtillägget %.4s"
 
-#: read-cache.c:1782
+#: read-cache.c:1856
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "okänt format 0x%08x på indexpost"
 
-#: read-cache.c:1798
+#: read-cache.c:1872
 #, 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:1855
+#: read-cache.c:1929
 msgid "unordered stage entries in index"
 msgstr "osorterade köposter i index"
 
-#: read-cache.c:1858
+#: read-cache.c:1932
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "flera köposter för den sammanslagna filen \"%s\""
 
-#: read-cache.c:1861
+#: read-cache.c:1935
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "osorterade köposter för \"%s\""
 
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: 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 "indexfilen trasig"
 
-#: read-cache.c:2108
+#: read-cache.c:2185
 #, 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:2121
+#: read-cache.c:2198
 #, 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:2154
+#: read-cache.c:2231
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s: öppning av indexfilen misslyckades"
 
-#: read-cache.c:2158
+#: read-cache.c:2235
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s: kan inte ta startus på det öppna indexet"
 
-#: read-cache.c:2162
+#: read-cache.c:2239
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s: indexfilen mindre än förväntat"
 
-#: read-cache.c:2166
+#: read-cache.c:2243
 #, 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:2208
+#: read-cache.c:2286
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "kunde inte skapa load_index_extensions-tråden: %s"
 
-#: read-cache.c:2235
+#: read-cache.c:2313
 #, 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:2267
+#: read-cache.c:2351
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "kunde inte uppdatera delat index \"%s\""
 
-#: read-cache.c:2314
+#: read-cache.c:2398
 #, 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:3010 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
 #, c-format
 msgid "could not close '%s'"
 msgstr "kunde inte stänga \"%s\""
 
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
+#: read-cache.c:3075
+msgid "failed to convert to a sparse-index"
+msgstr "misslyckades omvandla till glest index"
+
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
 #, c-format
 msgid "could not stat '%s'"
 msgstr "kunde inte ta status på \"%s\""
 
-#: read-cache.c:3126
+#: read-cache.c:3159
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "kunde inte öppna git-katalog: %s"
 
-#: read-cache.c:3138
+#: read-cache.c:3171
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "misslyckades ta bort länken: %s"
 
-#: read-cache.c:3163
+#: read-cache.c:3200
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "kan inte rätta behörighetsbitar på \"%s\""
 
-#: read-cache.c:3312
+#: read-cache.c:3349
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: kan inte återgå till kö 0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
+"continue\".\n"
+"Avbryt ombaseringen med \"git rebase --abort\".\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4812,7 +6455,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"
@@ -4821,7 +6467,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 ""
@@ -4833,6 +6479,13 @@ msgstr ""
 "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 [-C | -c] <incheckning> = som \"squash\" men behåll bara "
+"loggmeddelandet\n"
+"                   från föregående incheckning, såvida inte -C används, då "
+"används\n"
+"                   istället bara den här incheckningens meddelande; -c är "
+"samma\n"
+"                   som -C, men öppnar redigeringsprogrammet\n"
 "f, fixup <incheckning> = som \"squash\", men förkasta "
 "incheckningsmeddelandet\n"
 "x, exec <kommando> = kör kommando (resten av raden) i skalet\n"
@@ -4843,19 +6496,19 @@ msgstr ""
 "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"
+".       enrads, om inget incheckningsmeddelande angavs); använd\n"
+".       -c <incheckning> för att skriva om meddelandet.\n"
 "\n"
 "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:66
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 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:65 git-rebase--preserve-merges.sh:228
+#: 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"
@@ -4864,7 +6517,7 @@ msgstr ""
 "Ta inte bort rader. Använd \"drop\" för att specifikt förkasta en "
 "incheckning.\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4872,7 +6525,7 @@ msgstr ""
 "\n"
 "Om du tar bort en rad KOMMER DEN INCHECKNINGEN ATT FÖRLORAS.\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4886,7 +6539,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4896,22 +6549,19 @@ msgstr ""
 "Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Observera att tomma incheckningar är utkommenterade"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
+#: 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 "kunde inte skriva \"%s\""
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "kunde inte kopiera \"%s\" till \"%s\"."
+msgid "could not write '%s'."
+msgstr "kunde inte skriva \"%s\"."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:196
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -4920,7 +6570,7 @@ msgstr ""
 "Varning: vissa incheckningar kan av misstag ha tappats.\n"
 "Tappade incheckningar (nyaste först):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:203
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4940,124 +6590,14 @@ msgstr ""
 "\" (fel).\n"
 "\n"
 
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "\"%s\" pekar inte på ett giltigt objekt!"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "ignorerar dinglande symbolisk referens %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "ignorerar trasig referens %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "kunde inte öppna \"%s\" för skrivning: %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "Kunde inte läsa referensen \"%s\""
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "referensen \"%s\" finns redan"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "oväntat objekt-id vid skrivning \"%s\""
-
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "kunde inte skriva till \"%s\""
-
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1004
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "kunde inte öppna \"%s\" för skrivning"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "oväntat objekt-id vid borttagning \"%s\""
-
-#: refs.c:998
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "loggen för referensen %s har lucka efter %s"
-
-#: refs.c:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "loggen för referensen %s slutade oväntat på %s"
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "loggen för %s är tom"
-
-#: refs.c:1155
+#: 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 "refusing to update ref with bad name '%s'"
-msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
-
-#: refs.c:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "update_ref misslyckades för referensen \"%s\": %s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "referensuppdateringar förbjudna i karantänmiljö"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "\"%s\" finns; kan inte skapa \"%s\""
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "kan inte hantera \"%s\" och \"%s\" samtidigt"
-
-#: refs/files-backend.c:1234
-#, c-format
-msgid "could not remove reference %s"
-msgstr "kunde inte ta bort referensen %s"
-
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "kunde inte ta bort referensen %s: %s"
-
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "kunde inte ta bort referenser: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "felaktig referensspecifikation: \"%s\""
+msgid "could not read '%s'."
+msgstr "kunde inte läsa \"%s\"."
 
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
 msgstr "försvunnen"
 
@@ -5076,281 +6616,410 @@ msgstr "bakom %d"
 msgid "ahead %d, behind %d"
 msgstr "före %d, bakom %d"
 
-#: ref-filter.c:165
+#: ref-filter.c:230
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "förväntat format: %%(color:<color>)"
 
-#: ref-filter.c:167
+#: ref-filter.c:232
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "okänd färg: %%(color:%s)"
 
-#: ref-filter.c:189
+#: ref-filter.c:254
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "Heltalsvärde förväntades refname:lstrip=%s"
 
-#: ref-filter.c:193
+#: ref-filter.c:258
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "Heltalsvärde förväntades refname:rstrip=%s"
 
-#: ref-filter.c:195
+#: ref-filter.c:260
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "okänt %%(%s)-argument: %s"
 
-#: ref-filter.c:250
+#: ref-filter.c:315
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) tar inte argument"
 
-#: ref-filter.c:272
+#: ref-filter.c:339
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "okänt %%(objectsize)-argument: %s"
 
-#: ref-filter.c:280
+#: ref-filter.c:347
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) tar inte argument"
 
-#: ref-filter.c:292
+#: ref-filter.c:359
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) tar inte argument"
 
-#: ref-filter.c:301
+#: ref-filter.c:372
+#, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "okänt %%(subject)-argument: %s"
+
+#: ref-filter.c:391
 #, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) tar inte argument"
+msgid "expected %%(trailers:key=<value>)"
+msgstr "förvändate %%(trailers:nyckel=<värde>)"
 
-#: ref-filter.c:323
+#: ref-filter.c:393
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "okänt %%(trailers)-argument: %s"
 
-#: ref-filter.c:352
+#: ref-filter.c:424
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "positivt värde förväntat contents:lines=%s"
 
-#: ref-filter.c:354
+#: ref-filter.c:426
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "okänt %%(contents)-argument: %s"
 
-#: ref-filter.c:369
+#: ref-filter.c:441
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "positivt värde förväntat \"%s\" i %%(%s)"
+
+#: ref-filter.c:445
 #, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "positivt värde förväntat objectname:short=%s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "okänt argument \"%s\" i %%(%s)"
 
-#: ref-filter.c:373
+#: ref-filter.c:459
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "okänt %%(objectname)-argument: %s"
+msgid "unrecognized email option: %s"
+msgstr "okänd e-postalternativ: %s"
 
-#: ref-filter.c:403
+#: ref-filter.c:489
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "förväntat format: %%(align:<bredd>,<position>)"
 
-#: ref-filter.c:415
+#: ref-filter.c:501
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "okänd position:%s"
 
-#: ref-filter.c:422
+#: ref-filter.c:508
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "okänd bredd:%s"
 
-#: ref-filter.c:431
+#: ref-filter.c:517
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "okänt %%(align)-argument: %s"
 
-#: ref-filter.c:439
+#: ref-filter.c:525
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "positiv bredd förväntad med atomen %%(align)"
 
-#: ref-filter.c:457
+#: ref-filter.c:543
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "okänt %%(if)-argument: %s"
 
-#: ref-filter.c:559
+#: ref-filter.c:645
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "felformat fältnamn: %.*s"
 
-#: ref-filter.c:586
+#: ref-filter.c:672
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "okänt fältnamn: %.*s"
 
-#: ref-filter.c:590
+#: ref-filter.c:676
 #, 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:714
+#: ref-filter.c:801
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
 
-#: ref-filter.c:777
+#: ref-filter.c:865
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
 
-#: ref-filter.c:779
+#: ref-filter.c:867
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "format: atomen %%(then) använd mer än en gång"
 
-#: ref-filter.c:781
+#: ref-filter.c:869
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "format: atomen %%(then) använd efter %%(else)"
 
-#: ref-filter.c:809
+#: ref-filter.c:897
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
 
-#: ref-filter.c:811
+#: ref-filter.c:899
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
 
-#: ref-filter.c:813
+#: ref-filter.c:901
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "format: atomen %%(else) använd mer än en gång"
 
-#: ref-filter.c:828
+#: ref-filter.c:916
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "format: atomen %%(end) använd utan motsvarande atom"
 
-#: ref-filter.c:885
+#: ref-filter.c:973
 #, c-format
 msgid "malformed format string %s"
 msgstr "felformad formatsträng %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1621
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(ingen gren, ombaserar %s)"
+
+#: ref-filter.c:1624
 #, c-format
-msgid "no branch, rebasing %s"
-msgstr "ingen gren, ombaserar %s"
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(ingen gren, ombaserar frånkopplat HEAD %s)"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1627
 #, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "ingen gren, ombaserar frånkopplat HEAD %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "(ingen gren, \"bisect\" startad på %s)"
 
-#: ref-filter.c:1494
+#: ref-filter.c:1631
 #, c-format
-msgid "no branch, bisect started on %s"
-msgstr "ingen gren, \"bisect\" startad på %s"
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD frånkopplat vid %s)"
 
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "ingen gren"
+#: ref-filter.c:1634
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD frånkopplat från %s)"
+
+#: ref-filter.c:1637
+msgid "(no branch)"
+msgstr "(ingen gren)"
 
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1669 ref-filter.c:1880
 #, c-format
 msgid "missing object %s for %s"
 msgstr "objektet %s saknas för %s"
 
-#: ref-filter.c:1550
+#: ref-filter.c:1679
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer misslyckades på %s för %s"
 
-#: ref-filter.c:2004
+#: ref-filter.c:2064
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "felformat objekt vid \"%s\""
 
-#: ref-filter.c:2093
+#: ref-filter.c:2153
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "ignorerar referens med trasigt namn %s"
 
-#: ref-filter.c:2389
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "format: atomen %%(end) saknas"
-
-#: ref-filter.c:2489
+#: ref-filter.c:2158 refs.c:676
 #, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "flaggan \"%s\" är inkompatibel med --merged"
+msgid "ignoring broken ref %s"
+msgstr "ignorerar trasig referens %s"
 
-#: ref-filter.c:2492
+#: ref-filter.c:2502
 #, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "flaggan \"%s\" är inkompatibel med --no-merged"
+msgid "format: %%(end) atom missing"
+msgstr "format: atomen %%(end) saknas"
 
-#: ref-filter.c:2502
+#: ref-filter.c:2596
 #, c-format
 msgid "malformed object name %s"
 msgstr "felformat objektnamn %s"
 
-#: ref-filter.c:2507
+#: ref-filter.c:2601
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "flaggan \"%s\" måste peka på en incheckning"
 
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "\"%s\" pekar inte på ett giltigt objekt!"
+
+#: 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 ""
+"Använder \"%s\" som namn för den inledande grenen. Detta förvalda grennamn\n"
+"kan ändras i framtiden. För att välja vilket namn som ska användas på\n"
+"den inledande grenen i alla nya arkiv, och dölja denna varning, kör du:\n"
+"\n"
+"\tgit config --global init.defaultBranch <namn>\n"
+"\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
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "kunde inte hämta \"%s\""
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "felaktigt namn på gren: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "ignorerar dinglande symbolisk referens %s"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "loggen för referensen %s har lucka efter %s"
+
+#: refs.c:929
+#, 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
+#, c-format
+msgid "log for %s is empty"
+msgstr "loggen för %s är tom"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "vägrar uppdatera referens med trasigt namn \"%s\""
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref misslyckades för referensen \"%s\": %s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "flera uppdateringar för referensen \"%s\" tillåts inte"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "referensuppdateringar förbjudna i karantänmiljö"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "referensuppdateringar avbrutna av krok"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "\"%s\" finns; kan inte skapa \"%s\""
+
+#: refs.c:2248 refs.c:2283
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "could not delete references: %s"
+msgstr "kunde inte ta bort referenser: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "felaktig referensspecifikation: \"%s\""
+
+#: remote.c:351
 #, 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:413
+#: remote.c:399
 msgid "more than one receivepack given, using the first"
 msgstr "mer än en receivepack angavs, använder den första"
 
-#: remote.c:421
+#: remote.c:407
 msgid "more than one uploadpack given, using the first"
 msgstr "mer än en uploadpack angavs, använder den första"
 
-#: remote.c:611
+#: remote.c:590
 #, 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:615
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s spårar vanligtvis %s, inte %s"
 
-#: remote.c:619
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s spårar både %s och %s"
 
-#: remote.c:687
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "nyckeln \"%s\" i mönstret innehåller ingen \"*\""
 
-#: remote.c:697
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "värdet \"%s\" i mönstret innehåller ingen \"*\""
 
-#: remote.c:1003
+#: remote.c:1083
 #, c-format
 msgid "src refspec %s does not match any"
 msgstr "käll-referensspecifikationen %s motsvarar ingen"
 
-#: remote.c:1008
+#: remote.c:1088
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "käll-referensspecifikationen %s motsvarar mer än en"
@@ -5359,7 +7028,7 @@ msgstr "käll-referensspecifikationen %s motsvarar mer än en"
 #. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
 #. the <src>.
 #.
-#: remote.c:1023
+#: remote.c:1103
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5382,7 +7051,7 @@ msgstr ""
 "\n"
 "Inget av dem fungerade, så vi gav upp. Ange fullständig referens."
 
-#: remote.c:1043
+#: remote.c:1123
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5393,7 +7062,7 @@ msgstr ""
 "Var det meningen att skapa en ny gren genom att sända\n"
 "till \"%s:refs/heads/%s\"?"
 
-#: remote.c:1048
+#: remote.c:1128
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5404,7 +7073,7 @@ msgstr ""
 "Var det meningen att skapa en ny tagg genom att sända\n"
 "till \"%s:refs/tags/%s\"?"
 
-#: remote.c:1053
+#: remote.c:1133
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5415,7 +7084,7 @@ msgstr ""
 "Var det meningen att tagga ett nytt träd genom att sända\n"
 "till \"%s:refs/tags/%s\"?"
 
-#: remote.c:1058
+#: remote.c:1138
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5426,114 +7095,114 @@ msgstr ""
 "Var det meningen att tagga en ny blob genom att sända\n"
 "till \"%s:refs/tags/%s\"?"
 
-#: remote.c:1094
+#: remote.c:1174
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s kan inte slås upp till en gren"
 
-#: remote.c:1105
+#: remote.c:1185
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "kan inte ta bort \"%s\": fjärreferensen finns inte"
 
-#: remote.c:1117
+#: remote.c:1197
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "fjärr-referensspecifikationen \"%s\" motsvarar mer än en"
 
-#: remote.c:1124
+#: remote.c:1204
 #, 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:1627 remote.c:1728
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
 msgstr "HEAD pekar inte på en gren"
 
-#: remote.c:1636
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "okänd gren: \"%s\""
 
-#: remote.c:1639
+#: remote.c:1736
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "ingen standarduppström angiven för grenen \"%s\""
 
-#: remote.c:1645
+#: remote.c:1742
 #, 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:1660
+#: remote.c:1757
 #, 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:1672
+#: remote.c:1769
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "grenen \"%s\" har ingen fjärr för \"push\""
 
-#: remote.c:1682
+#: remote.c:1779
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
 
-#: remote.c:1695
+#: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
 
-#: remote.c:1717
+#: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "\"enkel push\" motsvarar flera olika mål"
 
-#: remote.c:1843
+#: remote.c:1943
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "Kunde inte hitta fjärr-referensen %s"
 
-#: remote.c:1856
+#: remote.c:1956
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* Ignorerar märklig referens \"%s\" lokalt"
 
-#: remote.c:2019
+#: remote.c:2119
 #, 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:2023
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  (använd \"git branch --unset-upstream\" för att rätta)\n"
 
-#: remote.c:2026
+#: remote.c:2126
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "Din gren är à jour med \"%s\".\n"
 
-#: remote.c:2030
+#: remote.c:2130
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "Din gren och \"%s\" pekar på olika incheckningar.\n"
 
-#: remote.c:2033
+#: remote.c:2133
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (använd \"%s\" för detaljer)\n"
 
-#: remote.c:2037
+#: 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] "Din gren ligger före \"%s\" med %d incheckning.\n"
 msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n"
 
-#: remote.c:2043
+#: remote.c:2143
 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:2046
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5543,11 +7212,11 @@ msgstr[0] ""
 msgstr[1] ""
 "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
 
-#: remote.c:2054
+#: remote.c:2154
 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:2057
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5562,11 +7231,11 @@ msgstr[1] ""
 "Din gren och \"%s\" har divergerat,\n"
 "och har %d respektive %d olika incheckningar.\n"
 
-#: remote.c:2067
+#: remote.c:2167
 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:2250
+#: remote.c:2359
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "kan inte tolka förväntat objektnamn \"%s\""
@@ -5581,131 +7250,140 @@ msgstr "felaktig ersättningsreferensnamn: %s"
 msgid "duplicate replace ref: %s"
 msgstr "duplicerat ersättningsreferensnamn: %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "ersättningsdjupet för högt för objektet %s"
 
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
 msgid "corrupt MERGE_RR"
 msgstr "trasig MERGE_RR"
 
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
 msgstr "kunde inte skriva rerere-post"
 
-#: rerere.c:495
+#: rerere.c:479
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
 msgstr "fel vid skrivning av \"%s\" (%s)"
 
-#: rerere.c:498
+#: rerere.c:482
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "misslyckades spola \"%s\""
 
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
 #, c-format
 msgid "could not parse conflict hunks in '%s'"
 msgstr "kunde inte tolka konflikt-stycket i \"%s\""
 
-#: rerere.c:684
+#: rerere.c:668
 #, c-format
 msgid "failed utime() on '%s'"
 msgstr "\"utime()\" misslyckades på \"%s\""
 
-#: rerere.c:694
+#: rerere.c:678
 #, c-format
 msgid "writing '%s' failed"
 msgstr "misslyckades skriva \"%s\""
 
-#: rerere.c:714
+#: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
 msgstr "Köade \"%s\" med sparad lösning."
 
-#: rerere.c:753
+#: rerere.c:737
 #, c-format
 msgid "Recorded resolution for '%s'."
 msgstr "Sparade lösning för \"%s\"."
 
-#: rerere.c:788
+#: rerere.c:772
 #, c-format
 msgid "Resolved '%s' using previous resolution."
 msgstr "Löste \"%s\" med tidigare lösning."
 
-#: rerere.c:803
+#: rerere.c:787
 #, c-format
 msgid "cannot unlink stray '%s'"
 msgstr "kan inte ta bort lös länk \"%s\""
 
-#: rerere.c:807
+#: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
 msgstr "Sparade förhandsbild för \"%s\""
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: 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 "kunde inte skapa katalogen \"%s\""
 
-#: rerere.c:1057
+#: rerere.c:1041
 #, c-format
 msgid "failed to update conflicted state in '%s'"
 msgstr "misslyckades uppdatera tillstånd för sammanslagningsproblem i \"%s\""
 
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
 #, c-format
 msgid "no remembered resolution for '%s'"
 msgstr "inget sparat sammanslagningsresultat för \"%s\""
 
-#: rerere.c:1077
+#: rerere.c:1061
 #, c-format
 msgid "cannot unlink '%s'"
 msgstr "kan inte ta bort länken \"%s\""
 
-#: rerere.c:1087
+#: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
 msgstr "Uppdaterade förhandsbild för \"%s\""
 
-#: rerere.c:1096
+#: rerere.c:1080
 #, c-format
 msgid "Forgot resolution for '%s'\n"
 msgstr "Glömde lösning för \"%s\"\n"
 
-#: rerere.c:1199
+#: rerere.c:1191
 msgid "unable to open rr-cache directory"
 msgstr "kan inte uppdatera katalogen rr-cache"
 
-#: revision.c:2509
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "kunde inte bestämma HEAD-revision"
+
+#: reset.c:69 reset.c:75 sequencer.c:3689
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "kunde inte hitta trädet för %s."
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<paketfil> stöds inte längre"
+
+#: revision.c:2684
 msgid "your current branch appears to be broken"
 msgstr "din nuvarande gren verkar vara trasig"
 
-#: revision.c:2512
+#: revision.c:2687
 #, 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:2720
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent är inkompatibelt med --bisect"
-
-#: revision.c:2724
+#: revision.c:2893
 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:763
+#: run-command.c:766
 msgid "open /dev/null failed"
 msgstr "misslyckades öppna /dev/null"
 
-#: run-command.c:1269
+#: run-command.c:1274
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "kan inte skapa asynkron tråd: %s"
 
-#: run-command.c:1333
+#: run-command.c:1344
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -5714,29 +7392,41 @@ 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:142
+#: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "oväntat flush-paket vid läsning av fjärruppackningsstatus"
 
-#: send-pack.c:144
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "kunde inte tolka fjärruppackningsstatus: %s"
 
-#: send-pack.c:146
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "fjärruppackning misslyckades: %s"
 
-#: send-pack.c:307
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "misslyckades underteckna push-certifikatet"
 
-#: send-pack.c:421
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: kunde inte starta (fork) underprocessen för fetch"
+
+#: send-pack.c:455
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "sänd-förhandling misslyckades; fortsätter ändå med sändningen"
+
+#: send-pack.c:526
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "mottagarsidan stöder inte arkivets hashningsalgoritm"
+
+#: send-pack.c:535
 msgid "the receiving end does not support --signed push"
 msgstr "mottagarsidan stöder inte push med --signed"
 
-#: send-pack.c:423
+#: send-pack.c:537
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5744,47 +7434,47 @@ msgstr ""
 "sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
 "signed"
 
-#: send-pack.c:435
+#: send-pack.c:544
 msgid "the receiving end does not support --atomic push"
 msgstr "mottagarsidan stöder inte push med --atomic"
 
-#: send-pack.c:440
+#: send-pack.c:549
 msgid "the receiving end does not support push options"
 msgstr "mottagarsidan stöder inte push-flaggor"
 
-#: sequencer.c:187
+#: sequencer.c:196
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "felaktigt incheckningsmeddelandestädningsläge \"%s\""
 
-#: sequencer.c:292
+#: sequencer.c:324
 #, c-format
 msgid "could not delete '%s'"
 msgstr "kunde inte ta bort \"%s\""
 
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
 #, c-format
 msgid "could not remove '%s'"
 msgstr "kunde inte ta bort \"%s\""
 
-#: sequencer.c:321
+#: sequencer.c:354
 msgid "revert"
 msgstr "revert"
 
-#: sequencer.c:323
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:358
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
+#: sequencer.c:360
 #, c-format
 msgid "unknown action: %d"
 msgstr "okänd funktion: %d"
 
-#: sequencer.c:385
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5792,7 +7482,7 @@ msgstr ""
 "efter att ha löst konflikterna, markera de rättade sökvägarna\n"
 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
 
-#: sequencer.c:388
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5802,110 +7492,109 @@ msgstr ""
 "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
 "och checka in resultatet med \"git commit\""
 
-#: sequencer.c:401 sequencer.c:2847
+#: sequencer.c:435 sequencer.c:3271
 #, c-format
 msgid "could not lock '%s'"
 msgstr "kunde inte låsa \"%s\""
 
-#: sequencer.c:408
+#: 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 "kunde inte skriva till \"%s\""
+
+#: sequencer.c:442
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "kunde inte skriva radslut till \"%s\""
 
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
-#: sequencer.c:3130
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "misslyckades färdigställa \"%s\""
 
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
-#: builtin/rebase.c:568
-#, c-format
-msgid "could not read '%s'"
-msgstr "kunde inte läsa \"%s\""
-
-#: sequencer.c:462
+#: sequencer.c:486
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "dina lokala ändringar skulle skrivas över av %s."
 
-#: sequencer.c:466
+#: sequencer.c:490
 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:498
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: snabbspola"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:561 builtin/tag.c:609
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Felaktigt städningsläge %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:631
+#: sequencer.c:671
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s: Kunde inte skriva ny indexfil"
 
-#: sequencer.c:648
+#: sequencer.c:685
 msgid "unable to update cache tree"
 msgstr "kan inte uppdatera cacheträd"
 
-#: sequencer.c:662
+#: sequencer.c:699
 msgid "could not resolve HEAD commit"
 msgstr "kunde inte bestämma HEAD:s incheckning"
 
-#: sequencer.c:742
+#: sequencer.c:779
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "ingen nyckel i  \"%.*s\""
 
-#: sequencer.c:753
+#: sequencer.c:790
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "kan inte ta bort citering av värdet \"%s\""
 
-#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
+#: 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 "kunde inte öppna \"%s\" för läsning"
 
-#: sequencer.c:800
+#: sequencer.c:837
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "\"GIT_AUTHOR_NAME\" har redan angivits"
 
-#: sequencer.c:805
+#: sequencer.c:842
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "\"GIT_AUTHOR_EMAIL\" har redan angivits"
 
-#: sequencer.c:810
+#: sequencer.c:847
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "\"GIT_AUTHOR_DATE\" har redan angivits"
 
-#: sequencer.c:814
+#: sequencer.c:851
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "okänd variabel \"%s\""
 
-#: sequencer.c:819
+#: sequencer.c:856
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "\"GIT_AUTHOR_NAME\" saknas"
 
-#: sequencer.c:821
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "\"GIT_AUTHOR_EMAIL\" saknas"
 
-#: sequencer.c:823
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "\"GIT_AUTHOR_DATE\" saknas"
 
-#: sequencer.c:872
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5922,11 +7611,11 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 "du har köade ändringar i din arbetskatalog.\n"
-"Om ändringarna skall läggas in i föregående incheckning, kör:\n"
+"Om ändringarna ska läggas in i föregående incheckning, kör:\n"
 "\n"
 "  git commit --amend %s\n"
 "\n"
-"Om de skall checkas in i en egen incheckning, kör:\n"
+"Om de ska checkas in i en egen incheckning, kör:\n"
 "\n"
 "  git commit %s\n"
 "\n"
@@ -5934,11 +7623,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1146
+#: sequencer.c:1212
 msgid "'prepare-commit-msg' hook failed"
 msgstr "kroken \"prepare-commit-msg\" misslyckades"
 
-#: sequencer.c:1153
+#: 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"
@@ -5965,7 +7654,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1166
+#: 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"
@@ -5990,327 +7679,345 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1208
+#: sequencer.c:1273
 msgid "couldn't look up newly created commit"
 msgstr "kunde inte slå upp en precis skapad incheckning"
 
-#: sequencer.c:1210
+#: sequencer.c:1275
 msgid "could not parse newly created commit"
 msgstr "kunde inte tolka en precis skapad incheckning"
 
-#: sequencer.c:1256
+#: sequencer.c:1321
 msgid "unable to resolve HEAD after creating commit"
 msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
 
-#: sequencer.c:1258
+#: sequencer.c:1323
 msgid "detached HEAD"
 msgstr "frånkopplad HEAD"
 
-#: sequencer.c:1262
+#: sequencer.c:1327
 msgid " (root-commit)"
 msgstr " (rotincheckning)"
 
-#: sequencer.c:1283
+#: sequencer.c:1348
 msgid "could not parse HEAD"
 msgstr "kunde inte tolka HEAD"
 
-#: sequencer.c:1285
+#: sequencer.c:1350
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s är inte en incheckning!"
 
-#: sequencer.c:1289 builtin/commit.c:1571
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
 msgid "could not parse HEAD commit"
 msgstr "kunde inte tolka HEAD:s incheckning"
 
-#: sequencer.c:1341 sequencer.c:1933
+#: sequencer.c:1410 sequencer.c:2295
 msgid "unable to parse commit author"
 msgstr "kunde inte tolka incheckningens författare"
 
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree misslyckades skriva ett träd"
 
-#: sequencer.c:1369 sequencer.c:1429
+#: sequencer.c:1454 sequencer.c:1574
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "kunde inte läsa incheckningsmeddelande från \"%s\""
 
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "ogiltig författar-identitet \"%s\""
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr "trasig författare: saknar datuminformation"
+
+#: 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 "kunde inte skriva incheckningsobjekt"
 
-#: sequencer.c:1456
+#: 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 "kunde inte uppdatera %s"
+
+#: sequencer.c:1606
 #, c-format
 msgid "could not parse commit %s"
 msgstr "kunde inte tolka incheckningen %s"
 
-#: sequencer.c:1461
+#: sequencer.c:1611
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "kunde inte tolka föräldraincheckningen %s"
 
-#: sequencer.c:1535 sequencer.c:1645
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
 msgid "unknown command: %d"
 msgstr "okänt kommando: %d"
 
-#: sequencer.c:1592 sequencer.c:1617
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "Det här är 1:a incheckningsmeddelandet:"
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Det här är incheckningsmeddelande %d:"
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Incheckningsmeddelande %d kommer hoppas över:"
+
+#: sequencer.c:1740
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "Det här är en kombination av %d incheckningar."
 
-#: sequencer.c:1602
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "kan inte skriva \"%s\""
+
+#: sequencer.c:1934
 msgid "need a HEAD to fixup"
 msgstr "behöver en HEAD-incheckning att rätta"
 
-#: sequencer.c:1604 sequencer.c:3157
+#: sequencer.c:1936 sequencer.c:3582
 msgid "could not read HEAD"
 msgstr "kunde inte läsa HEAD"
 
-#: sequencer.c:1606
+#: sequencer.c:1938
 msgid "could not read HEAD's commit message"
 msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
 
-#: sequencer.c:1612
-#, c-format
-msgid "cannot write '%s'"
-msgstr "kan inte skriva \"%s\""
-
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
-msgid "This is the 1st commit message:"
-msgstr "Det här är 1:a incheckningsmeddelandet:"
-
-#: sequencer.c:1627
+#: sequencer.c:1962
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "kunde inte läsa incheckningsmeddelande för %s"
 
-#: sequencer.c:1634
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "Det här är incheckningsmeddelande %d:"
-
-#: sequencer.c:1640
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-
-#: sequencer.c:1728
+#: sequencer.c:2072
 msgid "your index file is unmerged."
 msgstr "din indexfil har inte slagits ihop."
 
-#: sequencer.c:1735
+#: sequencer.c:2079
 msgid "cannot fixup root commit"
 msgstr "kan inte göra \"fixup\" på rotincheckning"
 
-#: sequencer.c:1754
+#: sequencer.c:2098
 #, 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:1762 sequencer.c:1770
+#: sequencer.c:2106 sequencer.c:2114
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "incheckning %s har inte förälder %d"
 
-#: sequencer.c:1776
+#: sequencer.c:2120
 #, 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:1795
+#: sequencer.c:2139
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s: kan inte tolka föräldraincheckningen %s"
 
-#: sequencer.c:1860
+#: sequencer.c:2205
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "kunde inte byta namn på \"%s\" till \"%s\""
 
-#: sequencer.c:1915
+#: sequencer.c:2265
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "kunde inte ångra %s... %s"
 
-#: sequencer.c:1916
+#: sequencer.c:2266
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "kunde inte tillämpa %s... %s"
 
-#: sequencer.c:1983
+#: sequencer.c:2287
+#, 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
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s: misslyckades läsa indexet"
 
-#: sequencer.c:1990
+#: sequencer.c:2352
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s: misslyckades uppdatera indexet"
 
-#: sequencer.c:2066
+#: sequencer.c:2425
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s tar inte argument: \"%s\""
 
-#: sequencer.c:2075
+#: sequencer.c:2434
 #, c-format
 msgid "missing arguments for %s"
 msgstr "argument saknas för %s"
 
-#: sequencer.c:2112
+#: sequencer.c:2477
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "kunde inte tolka \"%.*s\""
+msgid "could not parse '%s'"
+msgstr "kunde inte tolka \"%s\""
 
-#: sequencer.c:2166
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "ogiltig rad %d: %.*s"
 
-#: sequencer.c:2177
+#: sequencer.c:2549
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
 
-#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "kunde inte läsa \"%s\"."
-
-#: sequencer.c:2261
+#: sequencer.c:2635
 msgid "cancelling a cherry picking in progress"
 msgstr "avbryter pågående \"cherry-pick\""
 
-#: sequencer.c:2268
+#: sequencer.c:2644
 msgid "cancelling a revert in progress"
 msgstr "avbryter pågående \"revert\""
 
-#: sequencer.c:2302
+#: sequencer.c:2690
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "rätta det med \"git rebase --edit-todo\"."
 
-#: sequencer.c:2304
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "oanvändbart manus: \"%s\""
 
-#: sequencer.c:2309
+#: sequencer.c:2697
 msgid "no commits parsed."
 msgstr "inga incheckningar lästes."
 
-#: sequencer.c:2320
+#: sequencer.c:2708
 msgid "cannot cherry-pick during a revert."
 msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
 
-#: sequencer.c:2322
+#: sequencer.c:2710
 msgid "cannot revert during a cherry-pick."
 msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
 
-#: sequencer.c:2404
+#: sequencer.c:2788
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "felaktigt värde för %s: %s"
 
-#: sequencer.c:2491
+#: sequencer.c:2897
 msgid "unusable squash-onto"
 msgstr "oanvändbar squash-onto"
 
-#: sequencer.c:2507
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "trasigt manus: \"%s\""
 
-#: sequencer.c:2590 sequencer.c:4308
+#: sequencer.c:3012 sequencer.c:4868
 msgid "empty commit set passed"
 msgstr "den angivna uppsättningen incheckningar är tom"
 
-#: sequencer.c:2606
+#: sequencer.c:3029
 msgid "revert is already in progress"
 msgstr "en \"revert\" pågår redan"
 
-#: sequencer.c:2608
+#: sequencer.c:3031
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "testa \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2611
+#: sequencer.c:3034
 msgid "cherry-pick is already in progress"
 msgstr "en \"cherry-pick\" pågår redan"
 
-#: sequencer.c:2613
+#: sequencer.c:3036
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "testa \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2627
+#: sequencer.c:3050
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
 
-#: sequencer.c:2642
+#: sequencer.c:3065
 msgid "could not lock HEAD"
 msgstr "kunde inte låsa HEAD"
 
-#: sequencer.c:2702 sequencer.c:4057
+#: sequencer.c:3125 sequencer.c:4581
 msgid "no cherry-pick or revert in progress"
 msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
 
-#: sequencer.c:2704 sequencer.c:2715
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
 msgstr "kan inte bestämma HEAD"
 
-#: sequencer.c:2706 sequencer.c:2750
+#: sequencer.c:3129 sequencer.c:3173
 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:2736 builtin/grep.c:736
+#: sequencer.c:3159 builtin/grep.c:758
 #, c-format
 msgid "cannot open '%s'"
 msgstr "kan inte öppna \"%s\""
 
-#: sequencer.c:2738
+#: sequencer.c:3161
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "kan inte läsa \"%s\": %s"
 
-#: sequencer.c:2739
+#: sequencer.c:3162
 msgid "unexpected end of file"
 msgstr "oväntat filslut"
 
-#: sequencer.c:2745
+#: sequencer.c:3168
 #, 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:2756
+#: sequencer.c:3179
 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:2797
+#: sequencer.c:3220
 msgid "no revert in progress"
 msgstr "ingen \"revers\" pågår"
 
-#: sequencer.c:2805
+#: sequencer.c:3229
 msgid "no cherry-pick in progress"
 msgstr "ingen \"cherry-pick\" pågår"
 
-#: sequencer.c:2815
+#: sequencer.c:3239
 msgid "failed to skip the commit"
 msgstr "kunde inte hoppa över incheckningen"
 
-#: sequencer.c:2822
+#: sequencer.c:3246
 msgid "there is nothing to skip"
 msgstr "ingenting att hoppa över"
 
-#: sequencer.c:2825
+#: sequencer.c:3249
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6319,21 +8026,16 @@ msgstr ""
 "har du redan checkat in?\n"
 "testa \"git %s --continue\""
 
-#: sequencer.c:2949 sequencer.c:3969
-#, c-format
-msgid "could not update %s"
-msgstr "kunde inte uppdatera %s"
-
-#: sequencer.c:2987 sequencer.c:3949
+#: sequencer.c:3411 sequencer.c:4472
 msgid "cannot read HEAD"
 msgstr "kan inte läsa HEAD"
 
-#: sequencer.c:3004
+#: sequencer.c:3428
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "kan inte kopiera in \"%s\" till \"%s\""
 
-#: sequencer.c:3012
+#: sequencer.c:3436
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6352,27 +8054,27 @@ msgstr ""
 "\n"
 "\tgit rebase --continue\n"
 
-#: sequencer.c:3022
+#: sequencer.c:3446
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Kunde inte tillämpa %s... %.*s"
 
-#: sequencer.c:3029
+#: sequencer.c:3453
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Kunde inte slå ihop %.*s"
 
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "kunde inte kopiera in \"%s\" till \"%s\""
 
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
-msgid "could not read index"
-msgstr "kunde inte läsa indexet"
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Kör: %s\n"
 
-#: sequencer.c:3074
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6387,11 +8089,11 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3080
+#: sequencer.c:3504
 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:3086
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6408,111 +8110,123 @@ msgstr ""
 "\tgit rebase --continue\n"
 "\n"
 
-#: sequencer.c:3147
+#: sequencer.c:3572
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "ogiltigt etikettnamn: \"%.*s\""
 
-#: sequencer.c:3201
+#: sequencer.c:3645
 msgid "writing fake root commit"
 msgstr "skriver fejkad rotincheckning"
 
-#: sequencer.c:3206
+#: sequencer.c:3650
 msgid "writing squash-onto"
 msgstr "skriver squash-onto"
 
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "kunde inte hitta trädet för %s."
-
-#: sequencer.c:3262 builtin/rebase.c:874
-msgid "could not write index"
-msgstr "kunde inte skriva indexet"
-
-#: sequencer.c:3289
+#: sequencer.c:3734
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "kunde inte upplösa \"%s\""
 
-#: sequencer.c:3320
+#: sequencer.c:3767
 msgid "cannot merge without a current revision"
 msgstr "kan inte slå ihop utan en aktuell incheckning"
 
-#: sequencer.c:3342
+#: sequencer.c:3789
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "kan inte tolka \"%.*s\""
 
-#: sequencer.c:3351
+#: sequencer.c:3798
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "inget att slå samman: \"%.*s\""
 
-#: sequencer.c:3363
+#: sequencer.c:3810
 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:3378
+#: sequencer.c:3826
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "kunde inte läsa incheckningsmeddelande för \"%s\""
 
-#: sequencer.c:3538
+#: sequencer.c:4009
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "kunde inte ens försöka slå ihop \"%.*s\""
 
-#: sequencer.c:3554
+#: sequencer.c:4025
 msgid "merge: Unable to write new index file"
 msgstr "sammanslagning: Kunde inte skriva ny indexfil"
 
-#: sequencer.c:3623 builtin/rebase.c:712
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr "Kan inte utföra \"autostash\""
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Oväntat svar från stash: \"%s\""
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Kunde inte skapa katalog för \"%s\""
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Skapade autostash: %s\n"
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr "kunde inte utföra \"reset --hard\""
+
+#: sequencer.c:4140
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "Tillämpade autostash.\n"
 
-#: sequencer.c:3635
+#: sequencer.c:4152
 #, c-format
 msgid "cannot store %s"
 msgstr "kan inte spara %s"
 
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
+#: sequencer.c:4155
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
-"Tillämpning av autostash gav konflikter.\n"
+"%s\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"
 
-#: sequencer.c:3699
-#, c-format
-msgid "could not checkout %s"
-msgstr "kunde inte checka ut %s"
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
+msgstr "Tillämpning av autostash gav konflikter."
 
-#: sequencer.c:3713
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s: inte ett giltigt OID"
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
+msgstr "Autostash finns; skapar ny stash-post."
 
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
 msgstr "kunde inte koppla från HEAD"
 
-#: sequencer.c:3733
+#: sequencer.c:4248
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Stoppade på HEAD\n"
 
-#: sequencer.c:3735
+#: sequencer.c:4250
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Stoppade på %s\n"
 
-#: sequencer.c:3743
+#: sequencer.c:4258
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6533,48 +8247,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3827
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Ombaserar (%d/%d)%s"
+
+#: sequencer.c:4350
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Stoppade på %s... %.*s\n"
 
-#: sequencer.c:3898
+#: sequencer.c:4421
 #, c-format
 msgid "unknown command %d"
 msgstr "okänt kommando %d"
 
-#: sequencer.c:3957
+#: sequencer.c:4480
 msgid "could not read orig-head"
 msgstr "kunde inte läsa orig-head"
 
-#: sequencer.c:3962
+#: sequencer.c:4485
 msgid "could not read 'onto'"
 msgstr "kunde inte läsa \"onto\""
 
-#: sequencer.c:3976
+#: sequencer.c:4499
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "kunde inte uppdatera HEAD till %s"
 
-#: sequencer.c:4069
+#: sequencer.c:4559
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "Lyckades ombasera och uppdatera %s.\n"
+
+#: sequencer.c:4611
 msgid "cannot rebase: You have unstaged changes."
 msgstr "kan inte ombasera: Du har oköade ändringar."
 
-#: sequencer.c:4078
+#: sequencer.c:4620
 msgid "cannot amend non-existing commit"
 msgstr "kan inte lägga till incheckning som inte finns"
 
-#: sequencer.c:4080
+#: sequencer.c:4622
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "ogiltig fil: \"%s\""
 
-#: sequencer.c:4082
+#: sequencer.c:4624
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "ogiltigt innehåll: \"%s\""
 
-#: sequencer.c:4085
+#: sequencer.c:4627
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6584,69 +8308,59 @@ 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:4121 sequencer.c:4159
+#: sequencer.c:4663 sequencer.c:4702
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "kunde inte skriva fil: \"%s\""
 
-#: sequencer.c:4174
+#: sequencer.c:4718
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
 
-#: sequencer.c:4181
+#: sequencer.c:4725
 msgid "could not commit staged changes."
 msgstr "kunde inte checka in köade ändringar."
 
-#: sequencer.c:4285
+#: sequencer.c:4845
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: kan inte göra \"cherry-pick\" på typen \"%s\""
 
-#: sequencer.c:4289
+#: sequencer.c:4849
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: felaktig revision"
 
-#: sequencer.c:4324
+#: sequencer.c:4884
 msgid "can't revert as initial commit"
 msgstr "kan inte ångra som första incheckning"
 
-#: sequencer.c:4774
+#: sequencer.c:5361
 msgid "make_script: unhandled options"
 msgstr "make_script: flaggor som inte stöds"
 
-#: sequencer.c:4777
+#: sequencer.c:5364
 msgid "make_script: error preparing revisions"
 msgstr "make_script: fel när revisioner skulle förberedas"
 
-#: sequencer.c:4935
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
-"continue\".\n"
-"Avbryt ombaseringen med \"git rebase --abort\".\n"
-
-#: sequencer.c:5047 sequencer.c:5064
+#: sequencer.c:5614 sequencer.c:5631
 msgid "nothing to do"
 msgstr "inget att göra"
 
-#: sequencer.c:5078
+#: sequencer.c:5650
 msgid "could not skip unnecessary pick commands"
 msgstr "kunde inte hoppa över onödiga \"pick\"-kommandon"
 
-#: sequencer.c:5166
+#: sequencer.c:5750
 msgid "the script was already rearranged."
 msgstr "skriptet har redan omordnats."
 
-#: setup.c:124
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "\"%s\" är utanför arkivet"
+msgid "'%s' is outside repository at '%s'"
+msgstr "\"%s\" är utanför arkivet på \"%s\""
 
-#: setup.c:174
+#: setup.c:185
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6656,7 +8370,7 @@ msgstr ""
 "Använd \"git <kommando> -- <sökväg>..\" för att ange sökvägar som inte finns "
 "lokalt."
 
-#: setup.c:187
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6668,12 +8382,12 @@ msgstr ""
 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
 "\"git <kommando> [<revision>...] -- [<fil>...]\""
 
-#: setup.c:236
+#: setup.c:264
 #, 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:255
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6684,92 +8398,100 @@ msgstr ""
 "Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
 "\"git <kommando> [<revision>...] -- [<fil>...]\""
 
-#: setup.c:391
+#: setup.c:419
 msgid "unable to set up work tree using invalid config"
 msgstr "kan inte skapa arbetskatalog med felaktig konfiguration"
 
-#: setup.c:395
+#: setup.c:423 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:541
+#: setup.c:658
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "Förväntade git-arkivversion <= %d, hittade %d"
 
-#: setup.c:549
-msgid "unknown repository extensions found:"
-msgstr "okända arkivutökningar hittades:"
+#: setup.c:666
+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:568
+#: 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] "arkivversionen är 0, men utökning som bara finns i v1 upptäcktes:"
+msgstr[1] "arkivversionen är 0, men utökningar som bara finns i v1 upptäcktes:"
+
+#: setup.c:701
 #, c-format
 msgid "error opening '%s'"
 msgstr "fel vid öppning av \"%s\""
 
-#: setup.c:570
+#: setup.c:703
 #, 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:572
+#: setup.c:705
 #, c-format
 msgid "error reading %s"
 msgstr "fel vid läsning av %s"
 
-#: setup.c:574
+#: setup.c:707
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "ogiltigt gitfilformat: %s"
 
-#: setup.c:576
+#: setup.c:709
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "ingen sökväg i gitfil: %s"
 
-#: setup.c:578
+#: setup.c:711
 #, c-format
 msgid "not a git repository: %s"
 msgstr "inte ett git-arkiv: %s"
 
-#: setup.c:677
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
 msgstr "\"$%s\" för stor"
 
-#: setup.c:691
+#: setup.c:827
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "inte ett git-arkiv: \"%s\""
 
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c:856 setup.c:858 setup.c:889
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "kan inte byta katalog (chdir) till \"%s\""
 
-#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
 msgid "cannot come back to cwd"
 msgstr "kan inte gå tillbaka till arbetskatalogen (cwd)"
 
-#: setup.c:852
+#: setup.c:988
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "misslyckades ta status på \"%*ss%s%s\""
 
-#: setup.c:1090
+#: setup.c:1231
 msgid "Unable to read current working directory"
 msgstr "Kan inte läsa aktuell arbetskatalog"
 
-#: setup.c:1099 setup.c:1105
+#: setup.c:1240 setup.c:1246
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "kan inte byta till \"%s\""
 
-#: setup.c:1110
+#: setup.c:1251
 #, 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:1116
+#: setup.c:1257
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6779,7 +8501,7 @@ msgstr ""
 "monteringspunkten %s)\n"
 "Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
 
-#: setup.c:1227
+#: setup.c:1381
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6788,342 +8510,69 @@ 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:1271
+#: setup.c:1430
 msgid "open /dev/null or dup failed"
 msgstr "misslyckades öppna /dev/null eller \"dup\""
 
-#: setup.c:1286
+#: setup.c:1445
 msgid "fork failed"
 msgstr "\"fork\" misslyckades"
 
-#: setup.c:1291
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
 msgid "setsid failed"
 msgstr "\"setsid\" misslyckades"
 
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "objektkatalogen %s finns inte; se .git/objects/info/alternates"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "kunde inte normalisera alternativ objektsökväg: %s"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s: ignorerar alternativa objektlagringar, för djup nästling"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "kan inte normalisera objektkatalogen: %s"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "kan inte utföra \"fdopen\" på låsfil för \"alternates\""
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "kan inte läsa \"alternates\"-filen"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "kan inte flytta ny \"alternates\"-fil på plats"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "sökvägen \"%s\" finns inte"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "referensarkivet \"%s\" är grunt"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "referensarkivet \"%s\" är ympat"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "felaktig rad vid tolkning av alternativa referenser: %s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "försök att utföra \"mmap\" på %<PRIuMAX> över gränsen %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap misslyckades"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "objektfilen %s är tom"
-
-#: sha1-file.c:1252 sha1-file.c:2392
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "trasigt löst objekt \"%s\""
-
-#: sha1-file.c:1254 sha1-file.c:2396
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "skräp i slutet av löst objekt \"%s\""
-
-#: sha1-file.c:1296
-msgid "invalid object type"
-msgstr "felaktig objekttyp"
-
-#: sha1-file.c:1380
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "kan inte packa upp %s-huvud med --allow-unknown-type"
-
-#: sha1-file.c:1383
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "kan inte packa upp %s-huvudet"
-
-#: sha1-file.c:1389
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "kan inte tolka %s-huvud med --allow-unknown-type"
-
-#: sha1-file.c:1392
-#, c-format
-msgid "unable to parse %s header"
-msgstr "kan inte tolka %s-huvud"
-
-#: sha1-file.c:1584
-#, c-format
-msgid "failed to read object %s"
-msgstr "misslyckades läsa objektet %s"
-
-#: sha1-file.c:1588
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "ersättningen %s hittades inte för %s"
-
-#: sha1-file.c:1592
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "löst objekt %s (lagrat i %s) är trasigt"
-
-#: sha1-file.c:1596
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "packat objekt %s (lagrat i %s) är trasigt"
-
-#: sha1-file.c:1699
-#, c-format
-msgid "unable to write file %s"
-msgstr "kunde inte skriva filen %s"
-
-#: sha1-file.c:1706
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "kan inte sätta behörigheten till \"%s\""
-
-#: sha1-file.c:1713
-msgid "file write error"
-msgstr "fel vid skrivning av fil"
-
-#: sha1-file.c:1732
-msgid "error when closing loose object file"
-msgstr "fel vid stängning av fil för löst objekt"
-
-#: sha1-file.c:1797
-#, 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"
-
-#: sha1-file.c:1799
-msgid "unable to create temporary file"
-msgstr "kan inte skapa temporär fil"
-
-#: sha1-file.c:1823
-msgid "unable to write loose object file"
-msgstr "kunde inte skriva fil för löst objekt"
-
-#: sha1-file.c:1829
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "kan inte utföra \"deflate\" på nytt objekt %s (%d)"
-
-#: sha1-file.c:1833
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "\"deflateend\" på objektet %s misslyckades (%d)"
-
-#: sha1-file.c:1837
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "förvirrad av instabil objektkälldata för %s"
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
+msgstr "försöker använda glest index utan \"cone\"-läge"
 
-#: sha1-file.c:1847 builtin/pack-objects.c:925
-#, c-format
-msgid "failed utime() on %s"
-msgstr "\"utime()\" misslyckades på %s"
+#: sparse-index.c:176
+msgid "unable to update cache-tree, staying full"
+msgstr "kan inte uppdatera cacheträd, behåller fullt läge"
 
-#: sha1-file.c:1922
+#: sparse-index.c:263
 #, c-format
-msgid "cannot read object for %s"
-msgstr "kan inte läsa objekt för %s"
-
-#: sha1-file.c:1962
-msgid "corrupt commit"
-msgstr "trasik incheckning"
-
-#: sha1-file.c:1970
-msgid "corrupt tag"
-msgstr "trasig tagg"
-
-#: sha1-file.c:2069
-#, c-format
-msgid "read error while indexing %s"
-msgstr "läsfel vid indexering av %s"
-
-#: sha1-file.c:2072
-#, c-format
-msgid "short read while indexing %s"
-msgstr "för lite lästes vid indexering av %s"
-
-#: sha1-file.c:2145 sha1-file.c:2154
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s: misslyckades lägga in i databasen"
-
-#: sha1-file.c:2160
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: filtypen stöds ej"
-
-#: sha1-file.c:2184
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s är inte ett giltigt objekt"
-
-#: sha1-file.c:2186
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s är inte ett giltigt \"%s\"-objekt"
-
-#: sha1-file.c:2213 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "kan inte öppna %s"
-
-#: sha1-file.c:2403 sha1-file.c:2455
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "hash stämmer inte för %s (förväntade %s)"
-
-#: sha1-file.c:2427
-#, c-format
-msgid "unable to mmap %s"
-msgstr "kan inte utföra \"mmap\" för %s"
-
-#: sha1-file.c:2432
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "kan inte packa upp huvud för %s"
-
-#: sha1-file.c:2438
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "kan inte tolka huvud för %s"
-
-#: sha1-file.c:2449
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "kan inte tolka innehåll i %s"
-
-#: sha1-name.c:487
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "kort SHA1 %s är tvetydig"
-
-#: sha1-name.c:498
-msgid "The candidates are:"
-msgstr "Kandidaterna är:"
-
-#: sha1-name.c:797
-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 ""
-"Git skapar normalt aldrig referenser som slutar med 40 hexadecimala\n"
-"tecken, då detta ignoreras när du anger 40-hex enbart. Dessa\n"
-"referenser kan skapas av misstag. Till exempel, för\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"där \"$br\" på något sätt blivit tomt och en 40-hex-referens skapats.\n"
-"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
-"genom att köra \"git config advice.objectNameWarning false\""
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "indexposten är en katalog, men inte gles (%08x)"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:822
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u,%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
+#: 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:832
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u,%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: 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:841
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u,%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
+#: 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:849
+#: strbuf.c:877
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7131,13 +8580,48 @@ msgstr[0] "%u byte"
 msgstr[1] "%u bytes"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
+#: strbuf.c:879
 #, c-format
 msgid "%u byte/s"
 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:738
+#: builtin/rebase.c:866
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "kunde inte öppna \"%s\" för skrivning"
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr "kunde inte redigera \"%s\""
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "ignorerar misstänkt undermodulnamn: %s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "ogiltigt värde för %s"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Kunde inte uppdatera .gitmodules-posten %s"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7158,61 +8642,137 @@ msgstr "Kunde inte ta bort .gitmodules-posten för %s"
 msgid "staging updated .gitmodules failed"
 msgstr "misslyckades köa uppdaterad .gitmodules"
 
-#: submodule.c:327
+#: submodule.c:328
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "i ej utcheckad undermodul \"%s\""
 
-#: submodule.c:358
+#: submodule.c:359
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
 
-#: submodule.c:910
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "felaktigt argument till --ignore-submodules: %s"
+
+#: submodule.c:805
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"Undermodulen i incheckning %s på sökvägen: \"%s\" krockar med en undermodul "
+"med samma namn. Hoppar över den."
+
+#: submodule.c:908
 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:993
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"kunde inte köra \"git rev-list <incheckningar> --not --remotes -n 1\" i "
+"undermodulen \"%s\""
+
+#: submodule.c:1116
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "process för undermodulen \"%s\" misslyckades"
+
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "Misslyckades slå upp HEAD som giltig referens."
 
-#: submodule.c:1481
+#: submodule.c:1156
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "Sänder undermodulen \"%s\"\n"
+
+#: submodule.c:1159
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Kunde inte sända undermodulen \"%s\"\n"
+
+#: submodule.c:1451
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "Hämtar undermodulen %s%s\n"
+
+#: submodule.c:1485
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "kunde inte komma åt undermodulen \"%s\""
+msgid "Could not access submodule '%s'\n"
+msgstr "Kunde inte komma åt undermodulen \"%s\"\n"
 
-#: submodule.c:1651
+#: submodule.c:1640
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Fel vid hämtning av undermodul:\n"
+"%s"
+
+#: submodule.c:1665
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "\"%s\" känns inte igen som ett git-arkiv"
 
-#: submodule.c:1789
+#: submodule.c:1682
+#, 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:1723
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "\"git status --porcelain=2\" misslyckades i undermodulen \"%s\""
+
+#: submodule.c:1798
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
 
-#: submodule.c:1802
+#: submodule.c:1811
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
 
-#: submodule.c:1817
+#: submodule.c:1826
 #, 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:1907
+#: submodule.c:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "kunde inte rekursera in i undermodulen \"%s\""
+
+#: submodule.c:1874
+msgid "could not reset submodule index"
+msgstr "kunde inte återställa indexet i undermodul"
+
+#: submodule.c:1916
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "undermodulen \"%s\" har ett smutsigt index"
 
-#: submodule.c:1959
+#: submodule.c:1968
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Undermoduler \"%s\" kunde inte uppdateras."
 
-#: submodule.c:2007
+#: submodule.c:2036
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "undermodul-gitkatalogen \"%s\" är inuti gitkatalogen \"%.*s\""
+
+#: submodule.c:2057
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7220,12 +8780,17 @@ msgstr ""
 "relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
 "stöds ej"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2069 submodule.c:2128
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
 
-#: submodule.c:2026
+#: submodule.c:2073
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "vägrar flytta \"%s\" till en befintlig gitkatalog"
+
+#: submodule.c:2080
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7236,205 +8801,89 @@ msgstr ""
 "\"%s\" till\n"
 "\"%s\"\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "kunde inte rekursera in i undermodulen \"%s\""
-
-#: submodule.c:2153
+#: submodule.c:2208
 msgid "could not start ls-files in .."
 msgstr "kunde inte starta ls-files i .."
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree returnerade en oväntad returkod %d"
 
-#: submodule-config.c:236
+#: symlinks.c:244
 #, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "ignorerar misstänkt undermodulnamn: %s"
+msgid "failed to lstat '%s'"
+msgstr "misslyckades ta status (lstat) på \"%s\""
 
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "ignorerar \"%s\" som kan tolkas som en kommandoradsflagga: %s"
-
-#: submodule-config.c:490
-#, c-format
-msgid "invalid value for %s"
-msgstr "ogiltigt värde för %s"
-
-#: submodule-config.c:761
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Kunde inte uppdatera .gitmodules-posten %s"
-
-#: trailer.c:238
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
-msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""
+msgstr "misslyckades utföra släpradskommandot \"%s\""
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: 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 "okänt värde \"%s\" för nyckeln \"%s\""
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: 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 "mer än en %s"
 
-#: trailer.c:730
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "tom släpradssymbol i släpraden \"%.*s\""
 
-#: trailer.c:750
+#: trailer.c:763
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "kunde inte läsa indatafilen \"%s\""
 
-#: trailer.c:753
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
 msgid "could not read from stdin"
 msgstr "kunde inte läsa från standard in"
 
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1024 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
 msgstr "kunde inte ta status på %s"
 
-#: trailer.c:1013
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "filen %s är inte en normal fil"
 
-#: trailer.c:1015
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "filen %s är inte skrivbar av användaren"
 
-#: trailer.c:1027
+#: trailer.c:1040
 msgid "could not open temporary file"
 msgstr "kunde inte öppna temporär fil"
 
-#: trailer.c:1067
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "kunde inte byta namn på temporär fil till %s"
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "kunde inte läsa paketet (bundlen) \"%s\""
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "transport: ogiltig flagga för depth: \"%s\""
-
-#: transport.c:266
-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:267
-msgid "server options require protocol version 2 or later"
-msgstr "serverflaggor kräver protokollversion 2 eller senare"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "kunde inte tolka inställningen för transport.color.*"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "stöd för protokoll v2 ännu ej implementerat"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "okänt värde för inställningen \"%s\": %s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "transporten \"%s\" tillåts inte"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync stöds inte längre"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr ""
-"Följande undermodulsökvägar innehåller ändringar som\n"
-"inte kan hittas av fjärrarna:\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Testa\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"eller cd till sökvägen och använd\n"
-"\n"
-"\tgit push\n"
-"\n"
-"för att sända dem till fjärren.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Avbryter."
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "kunde inte sända alla nödvändiga undermoduler"
-
-#: transport.c:1345 transport-helper.c:655
-msgid "operation not supported by protocol"
-msgstr "funktionen stöds inte av protokollet"
-
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
 msgstr "komplett skrivning till fjärrhjälpare misslyckades"
 
-#: transport-helper.c:144
+#: transport-helper.c:145
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "kan inte hitta fjärrhjälpare för \"%s\""
 
-#: transport-helper.c:160 transport-helper.c:569
+#: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
 msgstr "kunde inte duplicera utdata-filhandtag"
 
-#: transport-helper.c:211
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7443,158 +8892,273 @@ msgstr ""
 "okänd krävd förmåga (capability) %s; fjärrhjälparen behöver antagligen en "
 "nyare version av Git"
 
-#: transport-helper.c:217
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
 msgstr ""
 "fjärrhjälparen behöver implementera förmåga för referensspecifikationer "
 "(refspec)"
 
-#: transport-helper.c:284 transport-helper.c:424
+#: transport-helper.c:287 transport-helper.c:429
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s sade oväntat: \"%s\""
 
-#: transport-helper.c:413
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s låste också %s"
 
-#: transport-helper.c:491
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
 msgstr "kunde inte köra fast-import"
 
-#: transport-helper.c:514
+#: transport-helper.c:520
 msgid "error while running fast-import"
 msgstr "fel när fast-import kördes"
 
-#: transport-helper.c:543 transport-helper.c:1132
+#: transport-helper.c:549 transport-helper.c:1247
 #, c-format
 msgid "could not read ref %s"
 msgstr "kunde inte läsa referensen %s"
 
-#: transport-helper.c:588
+#: transport-helper.c:594
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "okänt svar på ansluntning: %s"
 
-#: transport-helper.c:610
+#: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
 msgstr "protkollet stöder inte att sätta sökväg till fjärrtjänst"
 
-#: transport-helper.c:612
+#: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr "felaktig sökväg till fjärrtjänst"
 
-#: transport-helper.c:658
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr "funktionen stöds inte av protokollet"
+
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "kan inte ansluta till undertjänsten %s"
 
-#: transport-helper.c:734
+#: transport-helper.c:693 transport.c:400
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only kräver protokoll v2"
+
+#: transport-helper.c:755
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "\"option\" utan mostsvarande \"ok/error\"-direktiv"
+
+#: transport-helper.c:798
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "förväntade ok/error, hjälpprogrammet svarade \"%s\""
 
-#: transport-helper.c:787
+#: transport-helper.c:855
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "hjälparen returnerade oväntad status %s"
 
-#: transport-helper.c:848
+#: transport-helper.c:938
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "hjälparen %s stöder inte dry-run"
 
-#: transport-helper.c:851
+#: transport-helper.c:941
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "hjälparen %s stöder inte --signed"
 
-#: transport-helper.c:854
+#: transport-helper.c:944
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "hjälparen %s stöder inte --signed=if-asked"
 
-#: transport-helper.c:859
+#: transport-helper.c:949
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "hjälparen %s stöder inte --atomic"
 
-#: transport-helper.c:865
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "hjälparen %s stöder inte --%s"
+
+#: transport-helper.c:960
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "hjälparen %s stöder inte \"push-option\""
 
-#: transport-helper.c:963
+#: transport-helper.c:1060
 msgid "remote-helper doesn't support push; refspec needed"
 msgstr "fjärrhjälparen stöder inte push; referensspecifikation krävs"
 
-#: transport-helper.c:968
+#: transport-helper.c:1065
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "hjälparen %s stöder inte \"force\""
 
-#: transport-helper.c:1015
+#: transport-helper.c:1112
 msgid "couldn't run fast-export"
 msgstr "kunde inte köra fast-export"
 
-#: transport-helper.c:1020
+#: transport-helper.c:1117
 msgid "error while running fast-export"
 msgstr "fel vid körning av fast-export"
 
-#: transport-helper.c:1045
+#: transport-helper.c:1142
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 "Inga gemensamma referenser och inga angavs; gör inget.\n"
-"Du kanske borde ange en gren såsom \"master\".\n"
+"Du kanske borde ange en gren.\n"
+
+#: transport-helper.c:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "objektformatet \"%s\" stöds ej"
 
-#: transport-helper.c:1118
+#: transport-helper.c:1233
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "felformat svar i referenslistan: %s"
 
-#: transport-helper.c:1270
+#: transport-helper.c:1385
 #, c-format
 msgid "read(%s) failed"
 msgstr "läs(%s) misslyckades"
 
-#: transport-helper.c:1297
+#: transport-helper.c:1412
 #, c-format
 msgid "write(%s) failed"
 msgstr "skriv(%s) misslyckades"
 
-#: transport-helper.c:1346
+#: transport-helper.c:1461
 #, c-format
 msgid "%s thread failed"
 msgstr "%s-tråden misslyckades"
 
-#: transport-helper.c:1350
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s-tråden misslyckades ansluta: %s"
 
-#: transport-helper.c:1369 transport-helper.c:1373
+#: transport-helper.c:1484 transport-helper.c:1488
 #, 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:1410
+#: transport-helper.c:1525
 #, c-format
 msgid "%s process failed to wait"
 msgstr "processen %s misslyckades vänta"
 
-#: transport-helper.c:1414
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed"
 msgstr "processen %s misslyckades"
 
-#: transport-helper.c:1432 transport-helper.c:1441
+#: transport-helper.c:1547 transport-helper.c:1556
 msgid "can't start thread for copying data"
 msgstr "kan inte skapa tråd för kopiering av data"
 
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Skulle sätta uppströms för \"%s\" till \"%s\" från \"%s\"\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "kunde inte läsa paketet (bundlen) \"%s\""
+
+#: transport.c:223
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: ogiltig flagga för depth: \"%s\""
+
+#: transport.c:275
+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:276
+msgid "server options require protocol version 2 or later"
+msgstr "serverflaggor kräver protokollversion 2 eller senare"
+
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr "servern stöder inte wait-for-done"
+
+#: transport.c:755
+msgid "could not parse transport.color.* config"
+msgstr "kunde inte tolka inställningen för transport.color.*"
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr "stöd för protokoll v2 ännu ej implementerat"
+
+#: transport.c:965
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "okänt värde för inställningen \"%s\": %s"
+
+#: transport.c:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "transporten \"%s\" tillåts inte"
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync stöds inte längre"
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Följande undermodulsökvägar innehåller ändringar som\n"
+"inte kan hittas av fjärrarna:\n"
+
+#: transport.c:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Testa\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"eller cd till sökvägen och använd\n"
+"\n"
+"\tgit push\n"
+"\n"
+"för att sända dem till fjärren.\n"
+"\n"
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr "Avbryter."
+
+#: transport.c:1346
+msgid "failed to push all needed submodules"
+msgstr "kunde inte sända alla nödvändiga undermoduler"
+
 #: tree-walk.c:33
 msgid "too-short tree object"
 msgstr "trädobjekt för kort"
@@ -7611,7 +9175,7 @@ msgstr "tomt filnamn i trädpost"
 msgid "too-short tree file"
 msgstr "trädfil för kort"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7620,7 +9184,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:112
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7629,7 +9193,7 @@ msgstr ""
 "Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7639,7 +9203,7 @@ msgstr ""
 "sammanslagning:\n"
 "%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
 
-#: unpack-trees.c:117
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7649,7 +9213,7 @@ msgstr ""
 "sammanslagning:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7658,7 +9222,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:122
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7667,7 +9231,7 @@ msgstr ""
 "Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7677,7 +9241,7 @@ msgstr ""
 "dem:\n"
 "%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7686,7 +9250,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:133
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7695,7 +9259,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7705,7 +9269,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%sFlytta eller ta bort dem innan du slår samman."
 
-#: unpack-trees.c:138
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7715,7 +9279,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7724,7 +9288,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:143
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7733,7 +9297,7 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:149
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7744,7 +9308,7 @@ msgstr ""
 "utcheckningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:151
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7755,7 +9319,7 @@ msgstr ""
 "utcheckningen:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7765,7 +9329,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%sFlytta eller ta bort dem innan du byter gren."
 
-#: unpack-trees.c:156
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7775,7 +9339,7 @@ msgstr ""
 "sammanslagningen:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7784,7 +9348,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:161
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7793,61 +9357,70 @@ msgstr ""
 "Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
 "%%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
 
-#: unpack-trees.c:172
+#: unpack-trees.c:177
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
 "%s"
 msgstr ""
-"Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"
+"Kan inte uppdatera undermodul:\n"
 "%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Följande filer i arbetskatalogen skulle skrivas över av uppdatering av gles "
-"utcheckning:\n"
+"Följande sökvägar är inte àjour och lämnades till trots för gles-mönster:\n"
 "%s"
 
-#: unpack-trees.c:176
+#: unpack-trees.c:182
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
-"Följande filer i arbetskatalogen skulle tas bort av uppdatering av gles "
-"utcheckning:\n"
+"Följande sökvägar har inte slagits ihop och lämnades till trots för gles-"
+"mönster:\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:184
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Kan inte uppdatera undermodul:\n"
+"Följande sökvägar fanns redan och har därför inte uppdaterats till trots för "
+"gles-mönster:\n"
 "%s"
 
-#: unpack-trees.c:255
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "Avbryter\n"
 
-#: unpack-trees.c:317
+#: unpack-trees.c:291
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Du bör köra \"git sparse-checkout reapply\" efter att ha fixat sökvägarna "
+"ovan.\n"
+
+#: unpack-trees.c:352
 msgid "Updating files"
 msgstr "Uppdaterar filer"
 
-#: unpack-trees.c:349
+#: 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"
@@ -7857,6 +9430,19 @@ msgstr ""
 "sökvägar på ett okänsligt filsystem) och endast en från samma\n"
 "kollisionsgrupp finns i arbetskatalogen:\n"
 
+#: unpack-trees.c:1618
+msgid "Updating index flags"
+msgstr "Uppdaterar indexflaggor"
+
+#: unpack-trees.c:2718
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "arbetskatalog och ospårad incheckning har dublettposter: %s"
+
+#: upload-pack.c:1548
+msgid "expected flush after fetch arguments"
+msgstr "förväntade \"flush\" efter \"fetch\"-argument"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "ogiltig URL-schemanamn eller saknat \"://\"-suffix"
@@ -7886,27 +9472,31 @@ msgstr "felaktigt portnummer"
 msgid "invalid '..' path segment"
 msgstr "felaktigt \"..\"-sökvägssegment"
 
-#: worktree.c:258 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Hämtar objekt"
+
+#: worktree.c:236 builtin/am.c:2152
 #, c-format
 msgid "failed to read '%s'"
 msgstr "misslyckades läsa \"%s\""
 
-#: worktree.c:304
+#: worktree.c:303
 #, 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:314
 #, 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:326
 #, c-format
 msgid "'%s' does not exist"
 msgstr "\"%s\" finns inte"
 
-#: worktree.c:333
+#: worktree.c:332
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "\"%s\" är inte en .git-fil, felkod %d"
@@ -7916,17 +9506,83 @@ msgstr "\"%s\" är inte en .git-fil, felkod %d"
 msgid "'%s' does not point back to '%s'"
 msgstr "\"%s\" pekar inte tillbaka till \"%s\""
 
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:603
+msgid "not a directory"
+msgstr "inte en katalog"
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr ".git är inte en fil"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr ".git-filen är trasig"
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr ".git-filen är felaktig"
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr "inte en giltig sökväg"
+
+#: worktree.c:728
+msgid "unable to locate repository; .git is not a file"
+msgstr "hittar inte arkivet; .git är inte en fil"
+
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "hittar inte arkivet; .git-filen hänvisar inte till ett arkiv"
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr "hittar inte arkivet; .git-filen är trasig"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr "gitdir är oläsbar"
+
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr "gitdir är felaktig"
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr "inte i en giltig katalog"
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "gitdir-filen existerar inte"
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "kunde inte läsa gitdir-filen (%s)"
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "kort läsning (förväntade %<PRIuMAX> byte, läste %<PRIuMAX>)"
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "ogiltig gitdir-fil"
+
+#: worktree.c:817
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir-filen pekar på en ickeexisterande plats"
+
+#: wrapper.c:197 wrapper.c:367
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
 
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr "kan inte komma åt \"%s\""
 
-#: wrapper.c:596
+#: wrapper.c:607
 msgid "unable to get current working directory"
 msgstr "kan inte hämta aktuell arbetskatalog"
 
@@ -7961,23 +9617,23 @@ 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:1074
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr "Ändringar att checka in:"
 
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
 msgstr "Ändringar ej i incheckningskön:"
 
 #: wt-status.c:238
 msgid "  (use \"git add <file>...\" to update what will be committed)"
 msgstr ""
-"  (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
+"  (använd \"git add <fil>...\" för att uppdatera vad som ska checkas in)"
 
 #: wt-status.c:240
 msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
 msgstr ""
-"  (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
+"  (använd \"git add/rm <fil>...\" för att uppdatera vad som ska checkas in)"
 
 #: wt-status.c:241
 msgid ""
@@ -7994,97 +9650,96 @@ msgstr ""
 #: wt-status.c:254
 #, c-format
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
-msgstr ""
-"  (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"
+msgstr "  (använd \"git %s <fil>...\" för att ta med i det som ska checkas in)"
 
-#: wt-status.c:268
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr "borttaget av bägge:"
 
-#: wt-status.c:270
+#: wt-status.c:268
 msgid "added by us:"
 msgstr "tillagt av oss:"
 
-#: wt-status.c:272
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "borttaget av dem:"
 
-#: wt-status.c:274
+#: wt-status.c:272
 msgid "added by them:"
 msgstr "tillagt av dem:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr "borttaget av oss:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "both added:"
 msgstr "tillagt av bägge:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "both modified:"
 msgstr "ändrat av bägge:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "new file:"
 msgstr "ny fil:"
 
-#: wt-status.c:292
+#: wt-status.c:290
 msgid "copied:"
 msgstr "kopierad:"
 
-#: wt-status.c:294
+#: wt-status.c:292
 msgid "deleted:"
 msgstr "borttagen:"
 
-#: wt-status.c:296
+#: wt-status.c:294
 msgid "modified:"
 msgstr "ändrad:"
 
-#: wt-status.c:298
+#: wt-status.c:296
 msgid "renamed:"
 msgstr "namnbytt:"
 
-#: wt-status.c:300
+#: wt-status.c:298
 msgid "typechange:"
 msgstr "typbyte:"
 
-#: wt-status.c:302
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "okänd:"
 
-#: wt-status.c:304
+#: wt-status.c:302
 msgid "unmerged:"
 msgstr "osammanslagen:"
 
-#: wt-status.c:384
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "nya incheckningar, "
 
-#: wt-status.c:386
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "ändrat innehåll, "
 
-#: wt-status.c:388
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr "ospårat innehåll, "
 
-#: wt-status.c:906
+#: wt-status.c:958
 #, 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:938
+#: wt-status.c:989
 msgid "Submodules changed but not updated:"
 msgstr "Undermoduler ändrade men inte uppdaterade:"
 
-#: wt-status.c:940
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr "Undermodulers ändringar att checka in:"
 
-#: wt-status.c:1022
+#: wt-status.c:1073
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -8092,7 +9747,7 @@ msgstr ""
 "Raden ovan får inte ändras eller tas bort.\n"
 "Allt under den kommer tas bort."
 
-#: wt-status.c:1114
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -8103,107 +9758,107 @@ 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:1144
+#: wt-status.c:1195
 msgid "You have unmerged paths."
 msgstr "Du har ej sammanslagna sökvägar."
 
-#: wt-status.c:1147
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (rätta konflikter och kör \"git commit\")"
 
-#: wt-status.c:1149
+#: wt-status.c:1200
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  (använd \"git merge --abort\" för att avbryta sammanslagningen)"
 
-#: wt-status.c:1153
+#: wt-status.c:1204
 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:1156
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  (använd \"git commit\" för att slutföra sammanslagningen)"
 
-#: wt-status.c:1165
+#: wt-status.c:1216
 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:1168
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr "Aktuell patch är tom."
 
-#: wt-status.c:1172
+#: wt-status.c:1223
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git am --continue\")"
 
-#: wt-status.c:1174
+#: wt-status.c:1225
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  (använd \"git am --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:1176
+#: wt-status.c:1227
 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:1309
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo saknas."
 
-#: wt-status.c:1311
+#: wt-status.c:1362
 msgid "No commands done."
 msgstr "Inga kommandon utförda."
 
-#: wt-status.c:1314
+#: wt-status.c:1365
 #, 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:1325
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (se fler i filen %s)"
 
-#: wt-status.c:1330
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "Inga kommandon återstår."
 
-#: wt-status.c:1333
+#: 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] "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:1341
+#: wt-status.c:1392
 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:1353
+#: wt-status.c:1404
 #, 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:1358
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr "Du håller på med en ombasering."
 
-#: wt-status.c:1371
+#: wt-status.c:1422
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git rebase --continue\")"
 
-#: wt-status.c:1373
+#: wt-status.c:1424
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  (använd \"git rebase --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:1375
+#: wt-status.c:1426
 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:1382
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  (alla konflikter rättade: kör \"git rebase --continue\")"
 
-#: wt-status.c:1386
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -8211,142 +9866,159 @@ msgstr ""
 "Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
 "ovanpå \"%s\"."
 
-#: wt-status.c:1391
+#: wt-status.c:1442
 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:1394
+#: wt-status.c:1445
 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:1398
+#: wt-status.c:1449
 #, 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:1403
+#: wt-status.c:1454
 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:1406
+#: wt-status.c:1457
 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:1408
+#: wt-status.c:1459
 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:1419
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick pågår."
 
-#: wt-status.c:1422
+#: wt-status.c:1473
 #, 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:1429
+#: wt-status.c:1480
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
 
-#: wt-status.c:1432
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (kör \"git cherry-pick --continue\" för att fortsätta)"
 
-#: wt-status.c:1435
+#: wt-status.c:1486
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  (alla konflikter rättade: kör \"git cherry-pick --continue\")"
 
-#: wt-status.c:1437
+#: wt-status.c:1488
 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:1439
+#: wt-status.c:1490
 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:1449
+#: wt-status.c:1500
 msgid "Revert currently in progress."
 msgstr "Ångring pågår."
 
-#: wt-status.c:1452
+#: wt-status.c:1503
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "Du håller på med att ångra incheckningen %s."
 
-#: wt-status.c:1458
+#: wt-status.c:1509
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  (rätta konflikter och kör sedan \"git revert --continue\")"
 
-#: wt-status.c:1461
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (kör \"git revert --continue\" för att fortsätta)"
 
-#: wt-status.c:1464
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  (alla konflikter rättade: kör \"git revert --continue\")"
 
-#: wt-status.c:1466
+#: wt-status.c:1517
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  (använd \"git revert --skip\" för att hoppa över patchen)"
 
-#: wt-status.c:1468
+#: wt-status.c:1519
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  (använd \"git revert --abort\" för att avbryta ångrandet)"
 
-#: wt-status.c:1478
+#: wt-status.c:1529
 #, 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:1482
+#: wt-status.c:1533
 msgid "You are currently bisecting."
 msgstr "Du håller på med en \"bisect\"."
 
-#: wt-status.c:1485
+#: wt-status.c:1536
 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:1694
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Du är i en gles utcheckning."
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "Du är i en gles utcheckning med %d%% spårade filer på plats."
+
+#: wt-status.c:1794
 msgid "On branch "
 msgstr "PÃ¥ grenen "
 
-#: wt-status.c:1701
+#: wt-status.c:1801
 msgid "interactive rebase in progress; onto "
 msgstr "interaktiv ombasering pågår; ovanpå "
 
-#: wt-status.c:1703
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
 msgstr "ombasering pågår; ovanpå "
 
-#: wt-status.c:1713
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr "HEAD frånkopplad vid "
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr "HEAD frånkopplad från "
+
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr "Inte på någon gren för närvarande."
 
-#: wt-status.c:1730
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr "Första incheckning"
 
-#: wt-status.c:1731
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr "Inga incheckningar ännu"
 
-#: wt-status.c:1745
+#: wt-status.c:1845
 msgid "Untracked files"
 msgstr "Ospårade filer"
 
-#: wt-status.c:1747
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "Ignorerade filer"
 
-#: wt-status.c:1751
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8358,32 +10030,32 @@ msgstr ""
 "lägga till nya filer själv (se \"git help status\")."
 
 # %s är nästa sträng eller tom.
-#: wt-status.c:1757
+#: wt-status.c:1857
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "Ospårade filer visas ej%s"
 
-#: wt-status.c:1759
+#: wt-status.c:1859
 msgid " (use -u option to show untracked files)"
 msgstr " (använd flaggan -u för att visa ospårade filer)"
 
-#: wt-status.c:1765
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "Inga ändringar"
 
-#: wt-status.c:1770
+#: wt-status.c:1870
 #, 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:1773
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "inga ändringar att checka in\n"
 
-#: wt-status.c:1776
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8392,191 +10064,218 @@ msgstr ""
 "inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
 "\")\n"
 
-#: wt-status.c:1779
+#: wt-status.c:1882
 #, 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:1782
+#: wt-status.c:1886
 #, 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:1785 wt-status.c:1790
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr "inget att checka in\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1893
 #, 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:1792
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "inget att checka in, arbetskatalogen ren\n"
 
-#: wt-status.c:1905
+#: wt-status.c:2003
 msgid "No commits yet on "
 msgstr "Inga incheckningar ännu på "
 
-#: wt-status.c:1909
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr "HEAD (ingen gren)"
 
-#: wt-status.c:1940
+#: wt-status.c:2038
 msgid "different"
 msgstr "olika"
 
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "efter "
 
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "före "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2569
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "kan inte %s: Du har oköade ändringar."
 
-#: wt-status.c:2476
+#: wt-status.c:2575
 msgid "additionally, your index contains uncommitted changes."
 msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
 
-#: wt-status.c:2478
+#: wt-status.c:2577
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#: compat/simple-ipc/ipc-unix-socket.c:182
+msgid "could not send IPC command"
+msgstr "kunde inte sända IPC-kommando"
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr "kunde inte läsa IPC-svar"
+
+#: compat/simple-ipc/ipc-unix-socket.c:866
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "kunde inte ta status \"accept_thread\" \"%s\""
+
+#: compat/simple-ipc/ipc-unix-socket.c:878
+#, 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
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "misslyckades ta bort länken \"%s\""
 
-#: builtin/add.c:25
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<flaggor>] [--] <sökväg>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "kan inte utföra chmod %cx \"%s\""
+
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "diff-status %c förväntades inte"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
 msgstr "misslyckades uppdatera filer"
 
-#: builtin/add.c:99
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
 msgstr "ta bort \"%s\"\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:198
 msgid "Unstaged changes after refreshing the index:"
 msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
 
-#: builtin/add.c:234 builtin/rev-parse.c:897
+#: builtin/add.c:307 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "Kunde inte läsa indexet"
 
-#: builtin/add.c:245
+#: builtin/add.c:318
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Kunde inte öppna \"%s\" för skrivning."
 
-#: builtin/add.c:249
+#: builtin/add.c:322
 msgid "Could not write patch"
 msgstr "Kunde inte skriva patch"
 
-#: builtin/add.c:252
+#: builtin/add.c:325
 msgid "editing patch failed"
 msgstr "redigering av patch misslyckades"
 
-#: builtin/add.c:255
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Kunde inte ta status på \"%s\""
 
-#: builtin/add.c:257
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr "Tom patch. Avbryter."
 
-#: builtin/add.c:262
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Kunde inte tillämpa \"%s\""
 
-#: builtin/add.c:270
+#: builtin/add.c:343
 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:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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 "testkörning"
 
-#: builtin/add.c:293
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr "plocka interaktivt"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "välj stycken interaktivt"
 
-#: builtin/add.c:295
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr "redigera aktuell diff och applicera"
 
-#: builtin/add.c:296
+#: builtin/add.c:369
 msgid "allow adding otherwise ignored files"
 msgstr "tillåt lägga till annars ignorerade filer"
 
-#: builtin/add.c:297
+#: builtin/add.c:370
 msgid "update tracked files"
 msgstr "uppdatera spårade filer"
 
-#: builtin/add.c:298
+#: builtin/add.c:371
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
 
-#: builtin/add.c:299
+#: builtin/add.c:372
 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:300
+#: builtin/add.c:373
 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:303
+#: builtin/add.c:376
 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:305
+#: builtin/add.c:378
 msgid "don't add, only refresh the index"
 msgstr "lägg inte till, uppdatera endast indexet"
 
-#: builtin/add.c:306
+#: builtin/add.c:379
 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:307
+#: builtin/add.c:380
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "se om - även saknade - filer ignoreras i testkörning"
 
-#: builtin/add.c:309 builtin/update-index.c:1002
+#: builtin/add.c:382 builtin/update-index.c:1006
 msgid "override the executable bit of the listed files"
 msgstr "överstyr exekveringsbiten för angivna filer"
 
-#: builtin/add.c:311
+#: builtin/add.c:384
 msgid "warn when adding an embedded repository"
 msgstr "varna när ett inbyggt arkiv läggs till"
 
-#: builtin/add.c:326
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr "bakända för \"git stash -p\""
+
+#: builtin/add.c:404
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8607,146 +10306,178 @@ msgstr ""
 "\n"
 "Se \"git help submodule\" för ytterligare information."
 
-#: builtin/add.c:354
+#: builtin/add.c:432
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "lägger till inbäddat git-arkiv: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Använd -f om du verkligen vill lägga till dem.\n"
+#: builtin/add.c: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 ""
+"Använd -f om du verkligen vill lägga till dem.\n"
+"Slå av detta meddelande med\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:460
 msgid "adding files failed"
 msgstr "misslyckades lägga till filer"
 
-#: builtin/add.c:419
+#: 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:426
+#: 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:430
+#: builtin/add.c:526
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
-msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
+msgstr "--chmod parametern \"%s\" måste antingen vara -x eller +x"
+
+#: 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 "--pathspec-from-file är inkompatibelt med sökvägsangivelsesparametrar"
+
+#: 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 "--pathspec-file-nul kräver --pathspec-from-file"
 
-#: builtin/add.c:445
+#: builtin/add.c:555
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "Inget angivet, inget tillagt.\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Kanske menade du att skriva \"git add .\"?\n"
+#: 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 ""
+"Tänkte du kanske säga \"git add .\"?\n"
+"Slå av detta meddelande genom att köra\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:347
+#: builtin/am.c:365
 msgid "could not parse author script"
 msgstr "kunde inte tolka författarskript"
 
-#: builtin/am.c:431
+#: builtin/am.c:455
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "\"%s\" togs bort av kroken applypatch-msg"
 
-#: builtin/am.c:473
+#: builtin/am.c:497
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Felaktig indatarad: \"%s\"."
 
-#: builtin/am.c:511
+#: builtin/am.c:535
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
 
-#: builtin/am.c:537
+#: builtin/am.c:561
 msgid "fseek failed"
 msgstr "\"fseek\" misslyckades"
 
-#: builtin/am.c:725
+#: builtin/am.c:749
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "kunde inte tolka patchen \"%s\""
 
-#: builtin/am.c:790
+#: builtin/am.c:814
 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:838
+#: builtin/am.c:862
 msgid "invalid timestamp"
 msgstr "ogiltig tidsstämpel"
 
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:867 builtin/am.c:879
 msgid "invalid Date line"
 msgstr "ogiltig \"Date\"-rad"
 
-#: builtin/am.c:850
+#: builtin/am.c:874
 msgid "invalid timezone offset"
 msgstr "ogiltig tidszons-offset"
 
-#: builtin/am.c:943
+#: builtin/am.c:967
 msgid "Patch format detection failed."
 msgstr "Misslyckades detektera patchformat."
 
-#: builtin/am.c:948 builtin/clone.c:406
+#: builtin/am.c:972 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "misslyckades skapa katalogen \"%s\""
 
-#: builtin/am.c:953
+#: builtin/am.c:977
 msgid "Failed to split patches."
 msgstr "Misslyckades dela patchar."
 
-#: builtin/am.c:1084
+#: builtin/am.c:1126
 #, 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:1085
+#: builtin/am.c:1127
 #, 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:1086
+#: builtin/am.c:1128
 #, 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:1169
+#: builtin/am.c:1223
 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:1197
+#: builtin/am.c:1251
 msgid "Patch is empty."
 msgstr "Patchen är tom."
 
-#: builtin/am.c:1262
+#: builtin/am.c:1316
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "saknad \"author\"-rad i incheckningen %s"
 
-#: builtin/am.c:1265
+#: builtin/am.c:1319
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "ogiltig ident-rad: %.*s"
 
-#: builtin/am.c:1484
+#: builtin/am.c:1538
 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:1486
+#: builtin/am.c:1540
 msgid "Using index info to reconstruct a base tree..."
 msgstr "Använder indexinfo för att återskapa ett basträd..."
 
-#: builtin/am.c:1505
+#: builtin/am.c:1559
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8754,25 +10485,25 @@ msgstr ""
 "Har du handredigerat din patch?\n"
 "Den kan inte tillämpas på blobbar som antecknats i dess index."
 
-#: builtin/am.c:1511
+#: builtin/am.c:1565
 msgid "Falling back to patching base and 3-way merge..."
 msgstr ""
 "Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
 
-#: builtin/am.c:1537
+#: builtin/am.c:1591
 msgid "Failed to merge in the changes."
 msgstr "Misslyckades slå ihop ändringarna."
 
-#: builtin/am.c:1569
+#: builtin/am.c:1623
 msgid "applying to an empty history"
 msgstr "tillämpar på en tom historik"
 
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1675 builtin/am.c:1679
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "kan inte återuppta: %s finns inte."
 
-#: builtin/am.c:1638
+#: builtin/am.c:1697
 msgid "Commit Body is:"
 msgstr "Incheckningskroppen är:"
 
@@ -8780,40 +10511,41 @@ msgstr "Incheckningskroppen är:"
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1648
+#: builtin/am.c:1707
 #, 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:1695 builtin/commit.c:374
+#: builtin/am.c:1753 builtin/commit.c:408
 msgid "unable to write index file"
 msgstr "kan inte skriva indexfil"
 
-#: builtin/am.c:1699
+#: builtin/am.c:1757
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
 
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1797 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "Tillämpar: %.*s"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1814
 msgid "No changes -- Patch already applied."
 msgstr "Inga ändringar -- Patchen har redan tillämpats."
 
-#: builtin/am.c:1762
+#: builtin/am.c:1820
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Patch misslyckades på %s %.*s"
 
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
+#: builtin/am.c:1824
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
 msgstr ""
-"Använd \"git am --show-current-patch\" för att se patchen som misslyckades"
+"Använd \"git am --show-current-patch=diff\" för att se patchen som "
+"misslyckades"
 
-#: builtin/am.c:1810
+#: 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"
@@ -8823,7 +10555,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:1817
+#: 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 "
@@ -8835,17 +10567,17 @@ msgstr ""
 "lösta.\n"
 "Du kan köra \"git rm\" för att godta \"borttagen av dem\" för den."
 
-#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
-#: builtin/reset.c:337
+#: 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 "Kan inte tolka objektet \"%s\"."
 
-#: builtin/am.c:1976
+#: builtin/am.c:2034
 msgid "failed to clean index"
 msgstr "misslyckades städa upp indexet"
 
-#: builtin/am.c:2020
+#: builtin/am.c:2078
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -8853,143 +10585,159 @@ msgstr ""
 "Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
 "Återställer inte till ORIG_HEAD"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2185
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Felaktigt värde för --patch-format: %s"
 
-#: builtin/am.c:2153
+#: builtin/am.c:2227
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "Felaktigt värde för --show-current-patch: %s"
+
+#: builtin/am.c:2231
+#, 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"
+
+#: builtin/am.c:2262
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2154
+#: builtin/am.c:2263
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2160
+#: builtin/am.c:2269
 msgid "run interactively"
 msgstr "kör interaktivt"
 
-#: builtin/am.c:2162
+#: builtin/am.c:2271
 msgid "historical option -- no-op"
 msgstr "historisk flagga -- no-op"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2273
 msgid "allow fall back on 3way merging if needed"
 msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
 
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:297 builtin/stash.c:812
+#: 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 "var tyst"
 
-#: builtin/am.c:2167
-msgid "add a Signed-off-by line to the commit message"
-msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
+#: builtin/am.c:2276
+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:2170
+#: builtin/am.c:2279
 msgid "recode into utf8 (default)"
 msgstr "koda om till utf8 (standard)"
 
-#: builtin/am.c:2172
+#: builtin/am.c:2281
 msgid "pass -k flag to git-mailinfo"
 msgstr "sänd flaggan -k till git-mailinfo"
 
-#: builtin/am.c:2174
+#: builtin/am.c:2283
 msgid "pass -b flag to git-mailinfo"
 msgstr "sänd flaggan -b till git-mailinfo"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2285
 msgid "pass -m flag to git-mailinfo"
 msgstr "sänd flaggan -m till git-mailinfo"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2287
 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:2181
+#: builtin/am.c:2290
 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:2184
+#: builtin/am.c:2293
 msgid "strip everything before a scissors line"
 msgstr "ta bort allting före en saxlinje"
 
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr "sänd det genom 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 "sänd det genom git-apply"
 
-#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
-#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:150 parse-options.h:171 parse-options.h:312
+#: 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: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:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: 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 "format"
 
-#: builtin/am.c:2210
+#: builtin/am.c:2322
 msgid "format the patch(es) are in"
 msgstr "format för patch(ar)"
 
-#: builtin/am.c:2216
+#: builtin/am.c:2328
 msgid "override error message when patch failure occurs"
 msgstr "överstyr felmeddelanden när patchfel uppstår"
 
-#: builtin/am.c:2218
+#: builtin/am.c:2330
 msgid "continue applying patches after resolving a conflict"
 msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2333
 msgid "synonyms for --continue"
 msgstr "synonymer till --continue"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2336
 msgid "skip the current patch"
 msgstr "hoppa över den aktuella grenen"
 
-#: builtin/am.c:2227
-msgid "restore the original branch and abort the patching operation."
-msgstr "återställ originalgrenen och avbryt patchningen."
+#: builtin/am.c:2339
+msgid "restore the original branch and abort the patching operation"
+msgstr "återställ originalgrenen och avbryt patchningen"
 
-#: builtin/am.c:2230
-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:2342
+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:2233
-msgid "show the patch being applied."
-msgstr "visa patchen som tillämpas."
+#: builtin/am.c:2346
+msgid "show the patch being applied"
+msgstr "visa patchen som tillämpas"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2351
 msgid "lie about committer date"
 msgstr "ljug om incheckningsdatum"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2353
 msgid "use current timestamp for author date"
 msgstr "använd nuvarande tidsstämpel för författardatum"
 
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
-#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
+#: 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 "nyckel-id"
 
-#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
 msgstr "GPG-signera incheckningar"
 
-#: builtin/am.c:2245
+#: builtin/am.c:2359
 msgid "(internal use for git-rebase)"
 msgstr "(används internt av git-rebase)"
 
-#: builtin/am.c:2263
+#: 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."
@@ -8997,16 +10745,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:2270
+#: builtin/am.c:2384
 msgid "failed to read the index"
 msgstr "misslyckades läsa indexet"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2399
 #, 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:2309
+#: builtin/am.c:2423
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9015,11 +10763,11 @@ msgstr ""
 "Kvarbliven katalog %s hittades.\n"
 "Använd \"git am --abort\" för att ta bort den."
 
-#: builtin/am.c:2315
+#: builtin/am.c:2429
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "Lösningsoperation pågår inte, vi återupptar inte."
 
-#: builtin/am.c:2325
+#: builtin/am.c:2439
 msgid "interactive mode requires patches on the command line"
 msgstr "interaktivt läge kräver patchar på kommandoraden"
 
@@ -9057,93 +10805,93 @@ msgstr "git archive: protokollfel"
 msgid "git archive: expected a flush"
 msgstr "git archive: förväntade en tömning (flush)"
 
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
 #: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<incheckning>]"
 
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-"
-"för-rätt> <term-för-fel>"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-rätt> "
-"<term-för-fel>"
-
-#: builtin/bisect--helper.c:28
+#: 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:29
+#: 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:30
+#: builtin/bisect--helper.c:26
 msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<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>...]"
 msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<fel> [<rätt>...]] [--] [<sökvägar>...]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
+"=<term>] [--no-checkout] [--first-parent] [<dålig> [<bra>...]] [--] "
+"[<sökvägar>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+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-state (bad|new) [<incheckning>]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<incheckning>...]"
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <filnamn>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<incheckning>|<intervall>)...]"
+
+#: builtin/bisect--helper.c:107
+#, 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
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "kunde inte skriva till filen \"%s\""
+
+#: builtin/bisect--helper.c:155
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "\"%s\" är inte en giltig term"
 
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:159
 #, 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:100
+#: builtin/bisect--helper.c:169
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "kan inte ändra betydelsen av termen \"%s\""
 
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:179
 msgid "please use two different terms"
 msgstr "termerna måste vara olika"
 
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "kunde inte öppna filen BISECT_TERMS"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:195
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Vi utför ingen bisect för tillfället.\n"
 
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:203
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "\"%s\" är inte en giltig incheckning"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:212
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9151,27 +10899,27 @@ msgstr ""
 "Kunde inte checka ut original-HEAD \"%s\". Försök \"git bisect reset "
 "<incheckning>\"."
 
-#: builtin/bisect--helper.c:215
+#: builtin/bisect--helper.c:256
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "Felaktigt argument till bisect_write: %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:261
 #, 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:232
+#: builtin/bisect--helper.c:273
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "kunde inte öppna filen \"%s\""
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:299
 #, 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:285
+#: builtin/bisect--helper.c:326
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9180,7 +10928,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:289
+#: builtin/bisect--helper.c:330
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9191,7 +10939,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:321
+#: builtin/bisect--helper.c:350
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "utför bisect med endast en %s incheckning"
@@ -9200,15 +10948,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:329
+#: builtin/bisect--helper.c:358
 msgid "Are you sure [Y/n]? "
 msgstr "Är du säker [Y=ja/N=nej]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:419
 msgid "no terms defined"
 msgstr "inga termer angivna"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:422
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9217,7 +10965,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:389
+#: builtin/bisect--helper.c:432
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9226,268 +10974,314 @@ 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:475
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+msgid "revision walk setup failed\n"
+msgstr "misslyckades starta revisionstraversering\n"
+
+#: builtin/bisect--helper.c:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "kunde inte öppna \"%s\" för tillägg"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr "\"\" är inte en giltig term"
+
+#: builtin/bisect--helper.c:663
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "okänd flagga: %s"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:667
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "\"%s\" verkar inte vara en giltig revision"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:698
 msgid "bad HEAD - I need a HEAD"
 msgstr "felaktigt HEAD - Jag behöver ett HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:713
 #, 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:547
+#: builtin/bisect--helper.c:734
 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:550
+#: builtin/bisect--helper.c:737
 msgid "bad HEAD - strange symbolic ref"
 msgstr "felaktigt HEAD - konstig symbolisk referens"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:757
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "ogiltig referens: \"%s\""
 
-#: builtin/bisect--helper.c:630
-msgid "perform 'git bisect next'"
-msgstr "utför 'git bisect next'"
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Du måste starta med \"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:826
+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:844
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Anropa \"--bisect-state\" med minst ett argument."
 
-#: builtin/bisect--helper.c:632
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "skriv termerna i .git/BISECT_TERMS"
+#: builtin/bisect--helper.c:857
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "\"git bisect %s\" kan bara ta ett argument."
 
-#: builtin/bisect--helper.c:634
-msgid "cleanup the bisection state"
-msgstr "städar upp bisect-tillstånd"
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Felaktig rev-indata: %s"
 
-#: builtin/bisect--helper.c:636
-msgid "check for expected revs"
-msgstr "kontrollera för förväntade versioner"
+#: builtin/bisect--helper.c:889
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Felaktig rev-indata (ej incheckning): %s"
 
-#: builtin/bisect--helper.c:638
-msgid "reset the bisection state"
-msgstr "återställ bisect-tillstånd"
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr "Vi utför ingen bisect för tillfället."
+
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "\"%s\"?? vad menar du?"
 
-#: builtin/bisect--helper.c:640
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "skriver bisect-tillståndet i BISECT_LOG"
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "kan inte läsa filen \"%s\" för återuppspelning"
 
-#: builtin/bisect--helper.c:642
-msgid "check and set terms in a bisection state"
-msgstr "visa och ange termer för bisect-tillstånd"
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr "återställ bisect-tillstånd"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:1058
 msgid "check whether bad or good terms exist"
 msgstr "se efter om termer för rätt och fel finns"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:1060
 msgid "print out the bisect terms"
 msgstr "skriv ut termer för bisect"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:1062
 msgid "start the bisect session"
 msgstr "påbörja bisect-körningen"
 
-#: builtin/bisect--helper.c:650
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
+#: builtin/bisect--helper.c:1064
+msgid "find the next bisection commit"
+msgstr "hitta nästa incheckning i bisect"
 
-#: builtin/bisect--helper.c:652
-msgid "no log for BISECT_WRITE"
-msgstr "ingen logg för BISECT_WRITE"
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr "markera tillståndet för en eller flera referenser"
 
-#: builtin/bisect--helper.c:669
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms kräver två argument"
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr "lista \"bisect\"-stegen som utförts så långt"
 
-#: builtin/bisect--helper.c:673
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state tar inga argument"
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
+msgstr "spela upp \"bisect\"-processen från angiven fil"
 
-#: builtin/bisect--helper.c:680
-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:1072
+msgid "skip some commits for checkout"
+msgstr "hoppa över ett par incheckningar"
 
-#: builtin/bisect--helper.c:684
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write kräver antingen 4 eller 5 argument"
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "ingen logg för BISECT_WRITE"
 
-#: builtin/bisect--helper.c:690
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms kräver tre argument"
+#: builtin/bisect--helper.c:1089
+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:696
+#: builtin/bisect--helper.c:1094
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check kräver 2 eller 3 argument"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:1100
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms kräver noll eller ett argument"
 
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next kräver 0 argument"
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log kräver 0 argument"
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr "ingen loggfil angiven"
+
+#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
 
-#: builtin/blame.c:36
+#: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<rev-flaggor> dokumenteras i git-rev-list(1)"
 
-#: builtin/blame.c:409
+#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
 msgstr "förväntade en färg: %s"
 
-#: builtin/blame.c:416
+#: builtin/blame.c:417
 msgid "must end with a color"
 msgstr "måste sluta med en färg"
 
-#: builtin/blame.c:729
+#: builtin/blame.c:728
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "felaktig färg \"%s\" i color.blame.repeatedLines"
 
-#: builtin/blame.c:747
+#: builtin/blame.c:746
 msgid "invalid value for blame.coloring"
 msgstr "ogiltigt värde för blame.coloring"
 
-#: builtin/blame.c:822
+#: builtin/blame.c:845
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "kan inte hitta revision %s att ignorera"
 
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
-msgstr "Visa klandringsposter när vi hittar dem, interaktivt"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "visa klandringsposter när vi hittar dem, interaktivt"
 
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)"
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "visa inte objektnamn för gränsincheckningar (Standard: av)"
 
-#: builtin/blame.c:846
-msgid "Do not treat root commits as boundaries (Default: off)"
-msgstr "Behandla inte rotincheckningar som gränser (Standard: av)"
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "vehandla inte rotincheckningar som gränser (Standard: av)"
 
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "Visa statistik över arbetskostnad"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "visa statistik över arbetskostnad"
 
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "Tvinga förloppsrapportering"
+#: 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 "tvinga förloppsrapportering"
 
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr "Visa utdatapoäng för klandringsposter"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "visa utdatapoäng för klandringsposter"
 
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
-msgstr "Visa originalfilnamn (Standard: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "visa originalfilnamn (Standard: auto)"
 
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
-msgstr "Visa ursprungligt radnummer (Standard: av)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "visa ursprungligt radnummer (Standard: av)"
 
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
-msgstr "Visa i ett format avsett för maskinkonsumtion"
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
+msgstr "visa i ett format avsett för maskinkonsumtion"
 
-#: builtin/blame.c:853
-msgid "Show porcelain format with per-line commit information"
-msgstr "Visa porslinsformat med per-rad-incheckningsinformation"
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
+msgstr "visa porslinsformat med per-rad-incheckningsinformation"
 
-#: builtin/blame.c:854
-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:877
+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:855
-msgid "Show raw timestamp (Default: off)"
-msgstr "Visa rå tidsstämpel (Standard: av)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "visa rå tidsstämpel (Standard: av)"
 
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
-msgstr "Visa lång inchecknings-SHA1 (Standard: av)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "visa lång inchecknings-SHA1 (Standard: av)"
 
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
-msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "undertryck författarnamn och tidsstämpel (Standard: av)"
 
-#: builtin/blame.c:858
-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:881
+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:859
-msgid "Ignore whitespace differences"
-msgstr "Ignorera ändringar i blanksteg"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "ignorera ändringar i blanksteg"
 
-#: builtin/blame.c:860 builtin/log.c:1630
+#: builtin/blame.c:883 builtin/log.c:1823
 msgid "rev"
-msgstr "rev"
+msgstr "incheckning"
 
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "ignorera <rev> vid klandren"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "ignorera <incheckning> vid klandringen"
 
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr "ignorera revisioner från <fil>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "ignorera incheckningar från <fil>"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:885
 msgid "color redundant metadata from previous line differently"
 msgstr "färglägg redundant metadata från tidigare rader annorlunda"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:886
 msgid "color lines by age"
 msgstr "färglägg rader efter ålder"
 
-#: builtin/blame.c:870
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Använd en experimentell algoritm för att förbättra diffar"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr "slösa extra cykler med att hitta bättre träff"
 
-#: builtin/blame.c:872
-msgid "Spend extra cycles to find better match"
-msgstr "Slösa extra cykler med att hitta bättre träff"
-
-#: builtin/blame.c:873
-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:888
+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:874
-msgid "Use <file>'s contents as the final image"
-msgstr "Använd <fil>s innehåll som slutgiltig bild"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "använd <fil>s innehåll som slutgiltig bild"
 
-#: builtin/blame.c:875 builtin/blame.c:876
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "poäng"
 
-#: builtin/blame.c:875
-msgid "Find line copies within and across files"
-msgstr "Hitta kopierade rader inuti och mellan filer"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
+msgstr "hitta kopierade rader inuti och mellan filer"
 
-#: builtin/blame.c:876
-msgid "Find line movements within and across files"
-msgstr "Hitta flyttade rader inuti och mellan filer"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "hitta flyttade rader inuti och mellan filer"
 
-#: builtin/blame.c:877
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "intervall"
 
-#: builtin/blame.c:877
-msgid "Process only line range n,m, counting from 1"
-msgstr "Behandla endast radintervallet n,m, med början på 1"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr ""
+"behandla endast intervallet <start>,<slut> eller funktionen :<funknamn>"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:945
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress kan inte användas med --incremental eller porslinsformat"
 
@@ -9499,24 +11293,24 @@ msgstr "--progress kan inte användas med --incremental eller porslinsformat"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr "4 år, 11 månader sedan"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1112
 #, 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:1133
+#: builtin/blame.c:1157
 msgid "Blaming lines"
 msgstr "Klandra rader"
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<flaggor>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<flaggor>] [-r | -a] [--merged] [--no-merged]"
 
 #: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -9578,118 +11372,108 @@ msgstr ""
 msgid "Update of config-file failed"
 msgstr "Misslyckades uppdatera konfigurationsfil"
 
-#: builtin/branch.c:220
+#: builtin/branch.c:223
 msgid "cannot use -a with -d"
 msgstr "kan inte ange -a med -d"
 
-#: builtin/branch.c:226
+#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
 
-#: builtin/branch.c:240
+#: builtin/branch.c:244
 #, 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:255
+#: builtin/branch.c:259
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "fjärrspårande grenen \"%s\" hittades inte."
 
-#: builtin/branch.c:256
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
 msgstr "grenen \"%s\" hittades inte."
 
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Fel vid borttagning av grenen \"%s\""
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
 #, 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:280
+#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Tog bort grenen %s (var %s).\n"
 
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:440 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "kan inte tolka formatsträng"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:471
 msgid "could not resolve HEAD"
 msgstr "kunde inte slå upp HEAD"
 
-#: builtin/branch.c:466
+#: builtin/branch.c:477
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) pekar utenför refs/heads/"
 
-#: builtin/branch.c:481
+#: builtin/branch.c:492
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "Grenen %s ombaseras på %s"
 
-#: builtin/branch.c:485
+#: builtin/branch.c:496
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "Grenen %s är i en \"bisect\" på %s"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:513
 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:504
+#: builtin/branch.c:515
 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:515
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Felaktigt namn på gren: \"%s\""
 
-#: builtin/branch.c:542
+#: builtin/branch.c:555
 msgid "Branch rename failed"
 msgstr "Misslyckades byta namn på gren"
 
-#: builtin/branch.c:544
+#: builtin/branch.c:557
 msgid "Branch copy failed"
 msgstr "Misslyckades kopiera gren"
 
-#: builtin/branch.c:548
+#: builtin/branch.c:561
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
 
-#: builtin/branch.c:551
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
 
-#: builtin/branch.c:557
+#: builtin/branch.c:570
 #, 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:566
+#: builtin/branch.c:579
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
 
-#: builtin/branch.c:568
+#: builtin/branch.c:581
 msgid "Branch is copied, but update of config-file failed"
 msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -9700,211 +11484,211 @@ msgstr ""
 "  %s\n"
 "Rader som inleds med \"%c\" ignoreras.\n"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr "Allmänna flaggor"
 
-#: builtin/branch.c:620
+#: builtin/branch.c:633
 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:621
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr "undertryck informationsmeddelanden"
 
-#: builtin/branch.c:622
+#: 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:624
+#: builtin/branch.c:637
 msgid "do not use"
 msgstr "använd ej"
 
-#: builtin/branch.c:626 builtin/rebase.c:486
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr "uppströms"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr "ändra uppströmsinformationen"
 
-#: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "Ta bort uppströmsinformationen"
+#: builtin/branch.c:640
+msgid "unset the upstream info"
+msgstr "ta bort uppströmsinformationen"
 
-#: builtin/branch.c:628
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr "använd färgad utdata"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
 msgstr "arbeta på fjärrspårande grenar"
 
-#: 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 "visa endast grenar som innehåller incheckningen"
 
-#: 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 "visa endast grenar som inte innehåller incheckningen"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
-msgstr "Specifika git-branch-åtgärder:"
+msgstr "Specifika git-branch åtgärder:"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:651
 msgid "list both remote-tracking and local branches"
 msgstr "visa både fjärrspårande och lokala grenar"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr "ta bort helt sammanslagen gren"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:654
 msgid "delete branch (even if not merged)"
 msgstr "ta bort gren (även om inte helt sammanslagen)"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:655
 msgid "move/rename a branch and its reflog"
 msgstr "flytta/ta bort en gren och dess reflogg"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:656
 msgid "move/rename a branch, even if target exists"
 msgstr "flytta/ta bort en gren, även om målet finns"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:657
 msgid "copy a branch and its reflog"
 msgstr "kopiera en gren och dess reflogg"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:658
 msgid "copy a branch, even if target exists"
 msgstr "kopiera en gren, även om målet finns"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr "lista namn på grenar"
 
-#: builtin/branch.c:647
+#: builtin/branch.c:660
 msgid "show current branch name"
 msgstr "visa namn på aktuell gren"
 
-#: builtin/branch.c:648
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr "skapa grenens reflogg"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr "redigera beskrivning för grenen"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:664
 msgid "force creation, move/rename, deletion"
 msgstr "tvinga skapande, flytt/namnändring, borttagande"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:665
 msgid "print only branches that are merged"
 msgstr "visa endast sammanslagna grenar"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:666
 msgid "print only branches that are not merged"
 msgstr "visa endast ej sammanslagna grenar"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:667
 msgid "list branches in columns"
 msgstr "visa grenar i spalter"
 
-#: builtin/branch.c:657 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:433
+#: builtin/tag.c:477
 msgid "object"
 msgstr "objekt"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:670
 msgid "print only branches of the object"
 msgstr "visa endast grenar för objektet"
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
 msgid "sorting and filtering are case insensitive"
 msgstr "sortering och filtrering skiljer gemener och VERSALER"
 
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: 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 "format att använda för utdata"
 
-#: builtin/branch.c:684 builtin/clone.c:760
+#: builtin/branch.c:695 builtin/clone.c:794
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD hittades inte under refs/heads!"
 
-#: builtin/branch.c:708
+#: builtin/branch.c:719
 msgid "--column and --verbose are incompatible"
 msgstr "--column och --verbose är inkompatibla"
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
 msgid "branch name required"
 msgstr "grennamn krävs"
 
-#: builtin/branch.c:753
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
 msgstr "Kan inte beskriva frånkopplad HEAD"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:771
 msgid "cannot edit description of more than one branch"
 msgstr "kan inte redigera beskrivning för mer än en gren"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:778
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "Inga incheckningar på grenen \"%s\" ännu."
 
-#: builtin/branch.c:768
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Ingen gren vid namnet \"%s\"."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:796
 msgid "too many branches for a copy operation"
 msgstr "för många grenar för kopiering"
 
-#: builtin/branch.c:792
+#: builtin/branch.c:805
 msgid "too many arguments for a rename operation"
 msgstr "för många flaggor för namnbyte"
 
-#: builtin/branch.c:797
+#: builtin/branch.c:810
 msgid "too many arguments to set new upstream"
 msgstr "för många flaggor för att byta uppström"
 
-#: builtin/branch.c:801
+#: builtin/branch.c:814
 #, 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:804 builtin/branch.c:827
+#: builtin/branch.c:817 builtin/branch.c:840
 #, c-format
 msgid "no such branch '%s'"
 msgstr "okänd gren \"%s\""
 
-#: builtin/branch.c:808
+#: builtin/branch.c:821
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "grenen \"%s\" finns inte"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:834
 msgid "too many arguments to unset upstream"
 msgstr "för många flaggor för att ta bort uppström"
 
-#: builtin/branch.c:825
+#: builtin/branch.c:838
 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:831
+#: builtin/branch.c:844
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "Grenen \"%s\" har ingen uppströmsinformation"
 
-#: builtin/branch.c:841
+#: 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>?"
@@ -9912,7 +11696,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:845
+#: builtin/branch.c:858
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -9920,20 +11704,166 @@ msgstr ""
 "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
 "eller --set-upstream-to istället."
 
-#: builtin/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "git version:\n"
+
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
-msgstr "%s är okej\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() misslyckades med felet \"%s\" (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "kompilatorinfo:"
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "libc-info:"
+
+#: builtin/bugreport.c:80
+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/bundle.c:58
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <fil>] [-s|--suffix <format>]"
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"Tack för att du skriver en buggraport för Git!\n"
+"Om du svarar på följande frågor är det lättare för oss att första "
+"problemet.\n"
+"Skriv gärna på engelska\n"
+"\n"
+"Vad gjorde du innan felet uppstod? (Steg för att återskapa problemet)\n"
+"\n"
+"Vad förväntade du skulle hända? (Förväntat beteende)\n"
+"\n"
+"Vad hände istället? (Faktiskt beteende)\n"
+"\n"
+"Vad är skillnaden mellan det du förväntade dig och vad som faktiskt hände?\n"
+"\n"
+"Något mer du vill lägga till:\n"
+"\n"
+"Se över resten av felrapporten nedan.\n"
+"Du kan ta bort rader du inte vill dela.\n"
+
+#: builtin/bugreport.c:136
+msgid "specify a destination for the bugreport file"
+msgstr "ange mål för buggrapporteringsfilen"
+
+#: builtin/bugreport.c:138
+msgid "specify a strftime format suffix for the filename"
+msgstr "ange ett filändelse i strftime-format"
+
+#: builtin/bugreport.c:160
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "kunde inte skapa inledande kataloger för \"%s\""
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr "Systeminfo"
+
+#: builtin/bugreport.c:170
+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
+#, c-format
+msgid "unable to write to %s"
+msgstr "kunde inte skriva till %s"
+
+#: builtin/bugreport.c:190
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Skapade ny rapport på \"%s\"\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<flaggor>] <fil> <git-rev-list-flaggor>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<flaggor>] <fil>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <fil> [<refnamn>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <fil> [<refnamn>...]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr "visa inte förloppsindikator"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+msgid "show progress meter"
+msgstr "visa förloppsindikator"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+msgid "show progress meter during object writing phase"
+msgstr "visa förloppsindikator under objektskrivningsfasen"
+
+#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "som --all-progress när förloppsindikatorn visas"
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr "ange formatversion för paket (bundle)."
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr "Behöver ett arkiv för att skapa ett paket (bundle)."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr "visa inte paketdetaljer"
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s är okej\n"
+
+#: builtin/bundle.c:179
 msgid "Need a repository to unbundle."
 msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
 
-#: builtin/cat-file.c:595
+#: builtin/bundle.c:191 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:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Okänt underkommando: %s"
+
+#: 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>"
@@ -9941,80 +11871,80 @@ 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:596
+#: builtin/cat-file.c:597
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"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:617
+#: builtin/cat-file.c:618
 msgid "only one batch option may be specified"
 msgstr "endast en buntflagga kan anges"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<typ> kan vara en av: blob, tree, commit, tag"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object type"
 msgstr "visa objekttyp"
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
 msgid "show object size"
 msgstr "visa objektstorlek"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 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:640
+#: builtin/cat-file.c:641
 msgid "pretty-print object's content"
 msgstr "visa objektets innehåll snyggt"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
 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:644
+#: builtin/cat-file.c:645
 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:645 git-submodule.sh:936
+#: builtin/cat-file.c:646
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
 msgid "use a specific path for --textconv/--filters"
 msgstr "använd specifik sökväg för --textconv/--filters"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 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:649
+#: builtin/cat-file.c:650
 msgid "buffer --batch output"
 msgstr "buffra utdata från --batch"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:652
 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:655
+#: builtin/cat-file.c:656
 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:659
+#: builtin/cat-file.c:660
 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:661
+#: builtin/cat-file.c:662
 msgid "show all objects with --batch or --batch-check"
 msgstr "visa alla objekt med --batch eller --batch-check"
 
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:664
 msgid "do not order --batch-all-objects output"
 msgstr "ordna inte --batch-all-objects output"
 
@@ -10042,8 +11972,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:1433 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "undertryck förloppsrapportering"
 
@@ -10055,27 +11985,27 @@ msgstr "visa indatasökvägar som inte träffas"
 msgid "ignore index when checking"
 msgstr "ignorera index vid kontroll"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "kan inte ange sökvägsnamn med --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z kan endast användas tillsammans med --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "ingen sökväg angavs"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "kan inte använda både --quiet och --verbose"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching är endast giltig med --verbose"
 
@@ -10096,165 +12026,171 @@ msgstr "kunde inte tolka kontakt: %s"
 msgid "no contacts specified"
 msgstr "inga kontakter angavs"
 
-#: builtin/checkout-index.c:131
+#: builtin/checkout--worker.c:110
+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: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 "sträng"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "när filer skapas, lägg till <sträng> först"
+
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"
 
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr "etapp måste vara mellan 1 och 3 eller \"all\""
 
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "checka ut alla filer i indexet"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "tvinga överskrivning av befintliga filer"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr "ingen varning för existerande filer och filer ej i indexet"
 
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "checka inte ut nya filer"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "uppdatera stat-information i indexfilen"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "läs listan över sökvägar från standard in"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "skriv innehåll till temporära filer"
 
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:679
-msgid "string"
-msgstr "sträng"
-
-#: builtin/checkout-index.c:179
-msgid "when creating files, prepend <string>"
-msgstr "när filer skapas, lägg till <sträng> först"
-
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "kopiera ut filer från namngiven etapp"
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<flaggor>] <gren>"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
 
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<flaggor>] [<gren>]"
 
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<flaggor>] [--source=<gren>] <fil>..."
 
-#: builtin/checkout.c:173 builtin/checkout.c:212
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "sökvägen \"%s\" har inte vår version"
 
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "sökvägen \"%s\" har inte deras version"
 
-#: builtin/checkout.c:191
+#: builtin/checkout.c:208
 #, 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:241
+#: builtin/checkout.c:261
 #, 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:259
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "sökväg \"%s\": kan inte slå ihop"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
 
-#: builtin/checkout.c:375
+#: builtin/checkout.c:411
 #, 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:380
+#: builtin/checkout.c:416
 #, 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:387
+#: builtin/checkout.c:423
 #, 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:410 builtin/checkout.c:413 builtin/checkout.c:416
-#: builtin/checkout.c:420
+#: 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\" kan inte användas vid uppdatering av sökvägar"
 
-#: builtin/checkout.c:423 builtin/checkout.c:426
+#: builtin/checkout.c:459 builtin/checkout.c:462
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "\"%s\" kan inte användas med %s"
 
-#: builtin/checkout.c:430
+#: builtin/checkout.c:466
 #, 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:434
+#: builtin/checkout.c:470
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "varken \"%s\" eller \"%s\" har angivits"
 
-#: builtin/checkout.c:438
+#: builtin/checkout.c:474
 #, 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:443 builtin/checkout.c:448
+#: builtin/checkout.c:479 builtin/checkout.c:484
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "\"%s\" eller \"%s\" kan inte användas med %s"
 
-#: builtin/checkout.c:507 builtin/checkout.c:514
+#: builtin/checkout.c:558 builtin/checkout.c:565
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "sökvägen \"%s\" har inte slagits ihop"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:734
 msgid "you need to resolve your current index first"
 msgstr "du måste lösa ditt befintliga index först"
 
-#: builtin/checkout.c:730
+#: builtin/checkout.c:788
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10263,50 +12199,50 @@ msgstr ""
 "kan inte fortsätta med köade ändringar i följande filer:\n"
 "%s"
 
-#: builtin/checkout.c:833
+#: builtin/checkout.c:881
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:923
 msgid "HEAD is now at"
 msgstr "HEAD är nu på"
 
-#: builtin/checkout.c:879 builtin/clone.c:713
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "kan inte uppdatera HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:931
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "Återställ gren \"%s\"\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:934
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "Redan på \"%s\"\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:938
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "Växlade till och nollställde grenen \"%s\"\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:940 builtin/checkout.c:1371
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "Växlade till en ny gren \"%s\"\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:942
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "Växlade till grenen \"%s\"\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:993
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... och %d till.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:999
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10329,7 +12265,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: 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"
@@ -10356,28 +12292,19 @@ msgstr[1] ""
 " git branch <nytt_grennamn> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1053
 msgid "internal error in revision walk"
 msgstr "internt fel vid genomgång av revisioner (revision walk)"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1057
 msgid "Previous HEAD position was"
 msgstr "Tidigare position för HEAD var"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
 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:1176
-msgid "only one reference expected"
-msgstr "endast en referens förväntades"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "endast en referens förväntades, %d gavs."
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1179
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10386,37 +12313,71 @@ 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:1243 builtin/worktree.c:290 builtin/worktree.c:455
+#: 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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Om du menade checka ut en spårad fjärrgren på t.ex \"origin\", kan du\n"
+"göra det genom att ange hela namnet med flaggan --track:\n"
+"\n"
+"    git checkout --track origin/<namn>\n"
+"\n"
+"Om du alltid vill att utcheckningar med tvetydiga <namn> ska\n"
+"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:1196
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "\"%s\" motsvarar flera (%d) spårade fjärrgrenar"
+
+#: builtin/checkout.c:1262
+msgid "only one reference expected"
+msgstr "endast en referens förväntades"
+
+#: builtin/checkout.c:1279
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "endast en referens förväntades, %d gavs."
+
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "felaktig referens: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "referensen är inte ett träd: %s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1385
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "förväntade gren, fick taggen \"%s\""
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1387
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "förväntade gren, fick fjärrgrenen \"%s\""
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "förväntade gren, fick \"%s\""
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1391
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "förväntade gren, fick incheckningen \"%s\""
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1407
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10424,7 +12385,7 @@ msgstr ""
 "kan inte växla gren vid sammanslagning\n"
 "Överväg \"git merge --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1411
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10432,7 +12393,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:1333
+#: builtin/checkout.c:1415
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10440,7 +12401,7 @@ msgstr ""
 "kan inte växla gren vid ombasering\n"
 "Överväg \"git rebase --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1419
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10448,7 +12409,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:1341
+#: builtin/checkout.c:1423
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10456,139 +12417,139 @@ msgstr ""
 "kan inte växla gren i en \"revert\"\n"
 "Överväg \"git revert --quit\" eller \"git worktree add\"."
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1427
 msgid "you are switching branch while bisecting"
 msgstr "då växlar grenar medan du gör en \"bisect\""
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1434
 msgid "paths cannot be used with switching branches"
 msgstr "sökvägar kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "\"%s\" kan inte användas vid byte av gren"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: 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\" kan inte användas med \"%s\""
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "\"%s\" kan inte ta <startpunkt>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1470
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1477
 msgid "missing branch or commit argument"
 msgstr "saknar gren- eller incheckingsargument"
 
-#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
-#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
-#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "tvinga förloppsrapportering"
-
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1520
 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:1439 builtin/log.c:1618 parse-options.h:318
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
 msgid "style"
 msgstr "stil"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1522
 msgid "conflict style (merge or diff3)"
 msgstr "konfliktstil (merge eller diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:503
+#: builtin/checkout.c:1534 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "koppla från HEAD vid namngiven incheckning"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1535
 msgid "set upstream info for new branch"
 msgstr "sätt uppströmsinformation för ny gren"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1537
 msgid "force checkout (throw away local modifications)"
 msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new-branch"
 msgstr "ny-gren"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new unparented branch"
 msgstr "ny gren utan förälder"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1541 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr "uppdatera ignorerade filer (standard)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1544
 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:1475
+#: builtin/checkout.c:1557
 msgid "checkout our version for unmerged files"
 msgstr "checka ut vår version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1560
 msgid "checkout their version for unmerged files"
 msgstr "checka ut deras version för ej sammanslagna filer"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1564
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "begränsa inte sökvägar till endast glesa poster"
 
-#: builtin/checkout.c:1533
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c och --orphan är ömsesidigt uteslutande"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1626
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p och --overlay är ömsesidigt uteslutande"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1663
 msgid "--track needs a branch name"
 msgstr "--track behöver ett namn på en gren"
 
-#: builtin/checkout.c:1578
-msgid "missing branch name; try -b"
-msgstr "grennamn saknas; försök med -b"
+#: builtin/checkout.c:1668
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "grennamn saknas; försök med -%c"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1700
 #, c-format
 msgid "could not resolve %s"
 msgstr "kunde inte upplösa %s"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "du måste ange katalog(er) att återställa"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1716
 msgid "invalid path specification"
 msgstr "felaktig sökvägsangivelse"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1723
 #, 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:1642
+#: builtin/checkout.c:1727
 #, 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:1646
+#: builtin/checkout.c:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file är inkompatibelt med --detach"
+
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file är inkompatibelt med --patch"
+
+#: builtin/checkout.c:1752
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10596,135 +12557,107 @@ msgstr ""
 "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n"
 "du checkar ut från indexet."
 
-#: builtin/checkout.c:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"\"%s\" motsvarar mer än en spårad fjärrgren.\n"
-"Vi hittade %d fjärrar med en motsvarande referens. Så vi förösökte\n"
-"istället tolka argumentet som en sökväg, men misslyckades också där!\n"
-"\n"
-"Om du menade checka ut en spårad fjärrgren på t.ex \"origin\", kan du\n"
-"göra det genom att ange hela namnet med flaggan --track:\n"
-"\n"
-"    git checkout --track origin/<namn>\n"
-"\n"
-"Om du alltid vill att utcheckningar med tvetydiga <namn> skall\n"
-"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:1757
+msgid "you must specify path(s) to restore"
+msgstr "du måste ange katalog(er) att återställa"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
-#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: 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 "gren"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1784
 msgid "create and checkout a new branch"
 msgstr "skapa och checka ut en ny gren"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1786
 msgid "create/reset and checkout a branch"
 msgstr "skapa/nollställ och checka ut en gren"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1787
 msgid "create reflog for new branch"
 msgstr "skapa reflogg för ny gren"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1789
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "förutspå \"git checkout <gren-saknas>\" (förval)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1790
 msgid "use overlay mode (default)"
 msgstr "använd överläggsläge (standard)"
 
-#: builtin/checkout.c:1743
+#: builtin/checkout.c:1835
 msgid "create and switch to a new branch"
 msgstr "skapa och växla till en ny gren"
 
-#: builtin/checkout.c:1745
+#: builtin/checkout.c:1837
 msgid "create/reset and switch to a branch"
 msgstr "skapa/nollställ och växla till en gren"
 
-#: builtin/checkout.c:1747
+#: builtin/checkout.c:1839
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "förutspå \"git checkout <gren-saknas>\""
 
-#: builtin/checkout.c:1749
+#: builtin/checkout.c:1841
 msgid "throw away local modifications"
 msgstr "kasta bort lokala ändringar"
 
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1875
 msgid "which tree-ish to checkout from"
 msgstr "vilken träd-igt att checka ut från"
 
-#: builtin/checkout.c:1783
+#: builtin/checkout.c:1877
 msgid "restore the index"
 msgstr "återställ indexet"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1879
 msgid "restore the working tree (default)"
 msgstr "återställ arbetskatalogen (förval)"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1881
 msgid "ignore unmerged entries"
 msgstr "ignorera ej sammanslagna poster"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1882
 msgid "use overlay mode"
 msgstr "använd överläggsläge"
 
-#: builtin/clean.c:28
+#: 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 <mönster>] [-x | -X] [--] "
 "<sökvägar>..."
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "Tar bort %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Skulle ta bort %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "Hoppar över arkivet %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Skulle hoppa över arkivet %s\n"
 
-#: builtin/clean.c:36
-#, c-format
-msgid "failed to remove %s"
-msgstr "misslyckades ta bort %s"
-
-#: builtin/clean.c:37
+#: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "kunde inte ta status (\"lstat\") på %s\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10737,7 +12670,7 @@ msgstr ""
 "foo        - markera post baserad på unikt prefix\n"
 "           - (tomt) markera ingenting\n"
 
-#: builtin/clean.c:305 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10758,38 +12691,33 @@ msgstr ""
 "*          - välj alla poster\n"
 "           - (tomt) avsluta markering\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 "Vadå (%s)?\n"
 
-#: builtin/clean.c:663
+#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "Ange ignoreringsmönster>>"
 
-#: builtin/clean.c:700
+#: builtin/clean.c:693
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "VARNING: Hittar inte poster som motsvarar: %s"
 
-#: builtin/clean.c:721
+#: builtin/clean.c:714
 msgid "Select items to delete"
 msgstr "Välj poster att ta bort"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Ta bort %s [Y=ja / N=nej]? "
 
-#: builtin/clean.c:787 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Hej då.\n"
-
-#: builtin/clean.c:795
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10807,64 +12735,52 @@ msgstr ""
 "help                - denna skärm\n"
 "?                   - hjälp för kommandoval"
 
-#: builtin/clean.c:822 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Kommandon ***"
-
-#: builtin/clean.c:823 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Vad nu"
-
-#: builtin/clean.c:831
+#: builtin/clean.c:822
 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:847
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "Inga fler filer att städa, avslutar."
 
-#: builtin/clean.c:909
+#: builtin/clean.c:900
 msgid "do not print names of files removed"
 msgstr "skriv inte ut namn på borttagna filer"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:902
 msgid "force"
 msgstr "tvinga"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "städa interaktivt"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "ta bort hela kataloger"
 
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: 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 "mönster"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr "lägg till <mönster> till ignoreringsregler"
 
-#: builtin/clean.c:917
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "ta även bort ignorerade filer"
 
-#: builtin/clean.c:919
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "ta endast bort ignorerade filer"
 
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x och -X kan inte användas samtidigt"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -10872,7 +12788,7 @@ msgstr ""
 "clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
 "städa"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -10880,162 +12796,177 @@ msgstr ""
 "clean.requireForce har standardvärdet true och varken -i, -n eller -f "
 "angavs; vägrar städa"
 
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+msgstr "-x och -X kan inte användas samtidigt"
+
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "klona inte grunt arkiv"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "skapa inte någon utcheckning"
 
-#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "skapa ett naket (\"bare\") arkiv"
 
-#: builtin/clone.c:97
+#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
 
-#: builtin/clone.c:99
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "för att klona från ett lokalt arkiv"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "skapa inte lokala hårda länkar, kopiera alltid"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "skapa som ett delat arkiv"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "sökvägsangivelse"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "initiera undermoduler i klonen"
 
-#: builtin/clone.c:109
+#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr "antal undermoduler som klonas parallellt"
 
-#: builtin/clone.c:110 builtin/init-db.c:486
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "mallkatalog"
 
-#: builtin/clone.c:111 builtin/init-db.c:487
+#: 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:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: 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 "referensarkiv"
 
-#: builtin/clone.c:117 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: 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 "använd --reference endast under kloningen"
 
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:320
+#: 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 "namn"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "använd <namn> istället för \"origin\" för att spåra uppströms"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "checka ut <gren> istället för fjärrens HEAD"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "sökväg till git-upload-pack på fjärren"
 
-#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "djup"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr "skapa en grund klon på detta djup"
 
-#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/pull.c:211
 msgid "time"
 msgstr "tid"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr "skapa en grund klon från en angiven tidpunkt"
 
-#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
-#: builtin/rebase.c:1417
+#: 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 "revision"
 
-#: builtin/clone.c:129 builtin/fetch.c:172
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "fördjupa historik för grund klon, exkludera revisionen"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
 msgid "clone only one branch, HEAD or --branch"
 msgstr "klona endast en gren, HEAD eller --branch"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "klona inga taggar och gör att senare hämtningar inte följer dem"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "klonade undermoduler kommer vara grunda"
 
-#: builtin/clone.c:136 builtin/init-db.c:495
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitkat"
 
-#: builtin/clone.c:137 builtin/init-db.c:496
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "separera gitkatalogen från arbetskatalogen"
 
-#: builtin/clone.c:138
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "nyckel=värde"
 
-#: builtin/clone.c:139
+#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr "ställ in konfiguration i det nya arkivet"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:172
+#: 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 "serverspecifik"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:173
+#: 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 ""
 "inget att checka in\n"
 "flagga att sända"
 
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
-#: builtin/push.c:573
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "använd endast IPv4-adresser"
 
-#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
-#: builtin/push.c:575
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "använd endast IPv6-adresser"
 
-#: builtin/clone.c:148
+#: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "klonade undermoduler kommer använda sin fjärrspårningsgren"
 
-#: builtin/clone.c:284
+#: 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"
+
+#: builtin/clone.c:292
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -11043,42 +12974,42 @@ msgstr ""
 "Kunde inte gissa katalognamn.\n"
 "Ange en katalog på kommandoraden"
 
-#: builtin/clone.c:337
+#: builtin/clone.c:345
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
-msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"
+msgstr "info: Kan inte skapa suppleant för \"%s\": %s\n"
 
-#: builtin/clone.c:410
+#: builtin/clone.c:418
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s finns och är ingen katalog"
 
-#: builtin/clone.c:427
+#: builtin/clone.c:436
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "misslyckades starta iterator över \"%s\""
 
-#: builtin/clone.c:457
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "misslyckades skapa länken \"%s\""
 
-#: builtin/clone.c:461
+#: builtin/clone.c:471
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "misslyckades kopiera filen till \"%s\""
 
-#: builtin/clone.c:466
+#: builtin/clone.c:476
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "misslyckades iterera över \"%s\""
 
-#: builtin/clone.c:491
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr "klart.\n"
 
-#: builtin/clone.c:505
+#: builtin/clone.c:517
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11086,135 +13017,153 @@ 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:582
+#: builtin/clone.c:594
 #, 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:701
+#: builtin/clone.c:713
 #, c-format
 msgid "unable to update %s"
 msgstr "kan inte uppdatera %s"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "misslyckades initiera sparse-checkout"
+
+#: builtin/clone.c:784
 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:782
+#: builtin/clone.c:816
 msgid "unable to checkout working tree"
 msgstr "kunde inte checka ut arbetskatalogen"
 
-#: builtin/clone.c:832
+#: builtin/clone.c:894
 msgid "unable to write parameters to config file"
 msgstr "kunde inte skriva parametrar till konfigurationsfilen"
 
-#: builtin/clone.c:895
+#: builtin/clone.c:957
 msgid "cannot repack to clean up"
 msgstr "kan inte packa om för att städa upp"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:959
 msgid "cannot unlink temporary alternates file"
 msgstr "kunde inte ta bort temporär \"alternates\"-fil"
 
-#: builtin/clone.c:937 builtin/receive-pack.c:1948
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
 msgid "Too many arguments."
 msgstr "För många argument."
 
-#: builtin/clone.c:941
+#: builtin/clone.c:1005
 msgid "You must specify a repository to clone."
 msgstr "Du måste ange ett arkiv att klona."
 
-#: builtin/clone.c:954
+#: builtin/clone.c:1018
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "flaggorna --bare och --origin %s är inkompatibla."
 
-#: builtin/clone.c:957
+#: builtin/clone.c:1021
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
 
-#: builtin/clone.c:970
+#: builtin/clone.c:1035
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "arkivet \"%s\" finns inte"
 
-#: builtin/clone.c:976 builtin/fetch.c:1790
+#: builtin/clone.c:1039 builtin/fetch.c:2014
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "djupet %s är inte ett positivt tal"
 
-#: builtin/clone.c:986
+#: builtin/clone.c:1049
 #, 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:996
+#: builtin/clone.c:1055
+#, 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
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "arbetsträdet \"%s\" finns redan."
 
-#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
-#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
+#: 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 "kunde inte skapa inledande kataloger för \"%s\""
 
-#: builtin/clone.c:1016
+#: builtin/clone.c:1089
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "kunde inte skapa arbetskatalogen \"%s\""
 
-#: builtin/clone.c:1036
+#: builtin/clone.c:1109
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "Klonar till ett naket arkiv \"%s\"...\n"
 
-#: builtin/clone.c:1038
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "Klonar till \"%s\"...\n"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1135
 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:1123
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
+
+#: builtin/clone.c:1229
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1125
+#: builtin/clone.c:1231
 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:1127
+#: builtin/clone.c:1233
 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:1129
+#: builtin/clone.c:1235
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter ignoreras i lokala kloningar; använd file:// istället."
 
-#: builtin/clone.c:1132
+#: builtin/clone.c:1240
 msgid "source repository is shallow, ignoring --local"
 msgstr "källarkivet är grunt, ignorerar --local"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr "--local ignoreras"
 
-#: builtin/clone.c:1212 builtin/clone.c:1220
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "fjärrtransport rapporterade fel"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
 
-#: builtin/clone.c:1223
+#: builtin/clone.c:1347
 msgid "You appear to have cloned an empty repository."
 msgstr "Du verkar ha klonat ett tomt arkiv."
 
@@ -11231,25 +13180,129 @@ msgid "layout to use"
 msgstr "utseende att använda"
 
 #: builtin/column.c:30
-msgid "Maximum width"
-msgstr "Maximal bredd"
+msgid "maximum width"
+msgstr "maximal bredd"
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "Spaltfyllnad i vänsterkanten"
+msgid "padding space on left border"
+msgstr "spaltfyllnad i vänsterkanten"
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "Spaltfyllnad i högerkanten"
+msgid "padding space on right border"
+msgstr "spaltfyllnad i högerkanten"
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "Spaltfyllnad mellan spalter"
+msgid "padding space between columns"
+msgstr "spaltfyllnad mellan spalter"
 
 #: builtin/column.c:51
 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
+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
+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 <objkat>] [--append] [--"
+"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:1779
+msgid "dir"
+msgstr "kat"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr "objektkatalogen där grafen ska lagras"
+
+#: builtin/commit-graph.c:83
+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
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "okänt argument för --split, %s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "oväntat icke-hexadecimalt objekt-ID: %s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "ogiltigt objekt: %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "starta traversering vid alla referenser"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "sök paketindex listade på standard in efter incheckningar"
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr "börja gå genom incheckningar listade på standard in"
+
+#: builtin/commit-graph.c:219
+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
+msgid "enable computation for changed paths"
+msgstr "aktivera beräkning av ändrade sökvägar"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "tillåt skriva en inkrementell incheckningsgraffil"
+
+#: builtin/commit-graph.c:228
+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
+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
+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
+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
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "använd som mest en av --reachable, --stdin-commits och --stdin-packs"
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr "Hämtar incheckningar från indata"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -11263,7 +13316,7 @@ 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:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
 #, c-format
 msgid "not a valid object name %s"
 msgstr "objektnamnet är inte giltigt: %s"
@@ -11291,13 +13344,13 @@ msgstr "förälder"
 msgid "id of a parent commit object"
 msgstr "id på ett förälderincheckningsobjekt"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: 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 "meddelande"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
 msgid "commit message"
 msgstr "incheckningsmeddelande"
 
@@ -11305,8 +13358,8 @@ msgstr "incheckningsmeddelande"
 msgid "read commit log message from file"
 msgstr "läs incheckningsloggmeddelande från fil"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: 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 "GPG-signera incheckning"
 
@@ -11351,10 +13404,14 @@ msgstr ""
 "\n"
 
 #: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Använd annars \"git rebase --skip\"\n"
+
+#: builtin/commit.c:66
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "Använd annars \"git cherry-pick --skip\"\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:69
 msgid ""
 "and then use:\n"
 "\n"
@@ -11376,61 +13433,73 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:315
+#: builtin/commit.c:324
 msgid "failed to unpack HEAD tree object"
 msgstr "misslyckades packa upp HEAD:s trädobjekt"
 
-#: builtin/commit.c:356
+#: 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
+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
 msgid "unable to create temporary index"
 msgstr "kunde inte skapa temporär indexfil"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr "interaktiv tilläggning misslyckades"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:410
 msgid "unable to update temporary index"
 msgstr "kan inte uppdatera temporärt index"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:412
 msgid "Failed to update main cache tree"
 msgstr "Misslyckades uppdatera huvud-cacheträdet"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
 msgid "unable to write new_index file"
 msgstr "kunde inte skriva filen new_index"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:489
 msgid "cannot do a partial commit during a merge."
 msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
 
-#: builtin/commit.c:457
+#: builtin/commit.c:491
 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:465
+#: builtin/commit.c:493
+msgid "cannot do a partial commit during a rebase."
+msgstr "kan inte utföra en delvis incheckning under en ombasering."
+
+#: builtin/commit.c:501
 msgid "cannot read the index"
 msgstr "kan inte läsa indexet"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:520
 msgid "unable to write temporary index file"
 msgstr "kunde inte skriva temporär indexfil"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:618
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "incheckningen \"%s\" saknar författarhuvud"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr "felformad \"--author\"-flagga"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:692
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11438,78 +13507,71 @@ msgstr ""
 "kunde inte välja ett kommentarstecken som inte använts\n"
 "i det befintliga incheckningsmeddelandet"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "kunde inte slå upp incheckningen %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:758 builtin/shortlog.c:413
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "(läser loggmeddelande från standard in)\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:760
 msgid "could not read log from standard input"
 msgstr "kunde inte läsa logg från standard in"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:764
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "kunde inte läsa loggfilen \"%s\""
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "kan inte kombinera -m med --fixup:%s"
+
+#: builtin/commit.c:813 builtin/commit.c:829
 msgid "could not read SQUASH_MSG"
 msgstr "kunde inte läsa SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:820
 msgid "could not read MERGE_MSG"
 msgstr "kunde inte läsa MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:880
 msgid "could not write commit template"
 msgstr "kunde inte skriva incheckningsmall"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:893
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
 msgstr ""
-"\n"
-"Det verkar som du checkar in en sammanslagning.\n"
-"Om det inte stämmer tar du bort filen\n"
-"\t%s\n"
-"och försöker igen.\n"
+"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
+"med \"%c\" kommer ignoreras.\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:895
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"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"
-"Det verkar som du checkar in en cherry-pick.\n"
-"Om det inte stämmer tar du bort filen\n"
-"\t%s\n"
-"och försöker igen.\n"
+"Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
+"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
+"incheckningen.\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:899
 #, 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 ""
 "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n"
-"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
-"incheckningen.\n"
+"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11520,144 +13582,203 @@ msgstr ""
 "med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n"
 "Ett tomt meddelande avbryter incheckningen.\n"
 
-#: builtin/commit.c:872
+#: 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"
+"Det verkar som du checkar in en sammanslagning.\n"
+"Om det inte stämmer kör du\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"och försöker igen.\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"
+"Det verkar som du checkar in en cherry-pick.\n"
+"Om det inte stämmer kör du\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"och försöker igen.\n"
+
+#: builtin/commit.c:947
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sFörfattare: %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:955
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sDatum:      %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:962
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sIncheckare: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:980
 msgid "Cannot read index"
 msgstr "Kan inte läsa indexet"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "kan inte sända släprader till --trailers"
+
+#: builtin/commit.c:1065
 msgid "Error building trees"
 msgstr "Fel vid byggande av träd"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1079 builtin/tag.c:319
 #, 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:1030
+#: builtin/commit.c:1123
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr ""
-"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
+"--author '%s' är inte 'Namn <epost>' och motsvarar ingen befintlig författare"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1137
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Ogiltigt ignorerat läge \"%s\""
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1155 builtin/commit.c:1448
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "Ogiltigt läge för ospårade filer: \"%s\""
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1195
 msgid "--long and -z are incompatible"
 msgstr "--long och -z är inkompatibla"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1226
+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:1228
+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:1231
+#, 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\""
+
+#: builtin/commit.c:1233
+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:1252
 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:1155
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Du har inget att utöka."
 
-#: builtin/commit.c:1158
+#: 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:1160
+#: 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:1163
+#: 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:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
 
-#: builtin/commit.c:1173
+#: 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:1175
+#: 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:1183
+#: 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:1200
+#: 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:1202
-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:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "okänd flagga: --fixup=%s:%s"
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1352
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "sökvägarna \"%s ...\" med -a ger ingen mening"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1483 builtin/commit.c:1652
 msgid "show status concisely"
 msgstr "visa koncis status"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show branch information"
 msgstr "visa information om gren"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1487
 msgid "show stash information"
 msgstr "visa information om stash"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1489 builtin/commit.c:1656
 msgid "compute full ahead/behind values"
 msgstr "beräkna fullständiga före-/efter-värden"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1491
 msgid "version"
 msgstr "version"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
-#: builtin/worktree.c:650
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "maskinläsbar utdata"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1494 builtin/commit.c:1660
 msgid "show status in long format (default)"
 msgstr "visa status i långt format (standard)"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "terminate entries with NUL"
 msgstr "terminera poster med NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
+#: 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 "läge"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1500 builtin/commit.c:1666
 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:1360
+#: builtin/commit.c:1504
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11665,11 +13786,11 @@ msgstr ""
 "visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
 "traditional)"
 
-#: builtin/commit.c:1362 parse-options.h:188
+#: builtin/commit.c:1506 parse-options.h:193
 msgid "when"
 msgstr "när"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1507
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11677,172 +13798,194 @@ msgstr ""
 "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
 "(Default: all)"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1509
 msgid "list untracked files in columns"
 msgstr "visa ospårade filer i spalter"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1510
 msgid "do not detect renames"
 msgstr "detektera inte namnändringar"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1512
 msgid "detect renames, optionally set similarity index"
 msgstr "detektera namnändringar, möjligen sätt likhetsindex"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1535
 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:1493
+#: builtin/commit.c:1617
 msgid "suppress summary after successful commit"
 msgstr "undertryck sammanfattning efter framgångsrik incheckning"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1618
 msgid "show diff in commit message template"
 msgstr "visa diff i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1620
 msgid "Commit message options"
 msgstr "Alternativ för incheckningsmeddelande"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
 msgid "read message from file"
 msgstr "läs meddelande från fil"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "author"
 msgstr "författare"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "override author for commit"
 msgstr "överstyr författare för incheckningen"
 
-#: builtin/commit.c:1499 builtin/gc.c:538
+#: builtin/commit.c:1623 builtin/gc.c:550
 msgid "date"
 msgstr "datum"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1623
 msgid "override date for commit"
 msgstr "överstyr datum för incheckningen"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
 msgstr "incheckning"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1625
 msgid "reuse and edit message from specified commit"
 msgstr "återanvänd och redigera meddelande från angiven incheckning"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1626
 msgid "reuse message from specified commit"
 msgstr "återanvänd meddelande från angiven incheckning"
 
-#: builtin/commit.c:1503
-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):]incheckning"
+
+#: builtin/commit.c:1631
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
 msgstr ""
-"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
+"använd autosquash-formaterat meddelande för att fixa/omformulera angiven "
+"incheckning"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1632
 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:1505
+#: builtin/commit.c:1633
 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:1506 builtin/log.c:1565 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "lägg till Signed-off-by:"
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "släprad"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1634
+msgid "add custom trailer(s)"
+msgstr "använd skräddarsydd(a) släprad(er)"
+
+#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "lägg till Signed-off-by-släprad"
+
+#: builtin/commit.c:1636
 msgid "use specified template file"
 msgstr "använd angiven mallfil"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1637
 msgid "force edit of commit"
 msgstr "tvinga redigering av incheckning"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1639
 msgid "include status in commit message template"
 msgstr "inkludera status i mallen för incheckningsmeddelandet"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1644
 msgid "Commit contents options"
 msgstr "Alternativ för incheckningens innehåll"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1645
 msgid "commit all changed files"
 msgstr "checka in alla ändrade filer"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1646
 msgid "add specified files to index for commit"
 msgstr "lägg till angivna filer till indexet för incheckning"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1647
 msgid "interactively add files"
 msgstr "lägg till filer interaktivt"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1648
 msgid "interactively add changes"
 msgstr "lägg till ändringar interaktivt"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1649
 msgid "commit only specified files"
 msgstr "checka endast in angivna filer"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1650
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "förbigå pre-commit- och commit-msg-krokar"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1651
 msgid "show what would be committed"
 msgstr "visa vad som skulle checkas in"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1664
 msgid "amend previous commit"
 msgstr "lägg till föregående incheckning"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1665
 msgid "bypass post-rewrite hook"
 msgstr "förbigå post-rewrite-krok"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1672
 msgid "ok to record an empty change"
 msgstr "ok att registrera en tom ändring"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1674
 msgid "ok to record a change with an empty message"
 msgstr "ok att registrera en ändring med tomt meddelande"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1750
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Trasig MERGE_HEAD-fil (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1757
 msgid "could not read MERGE_MODE"
 msgstr "kunde inte läsa MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1778
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "kunde inte läsa incheckningsmeddelande: %s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1785
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1790
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1801
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "Avbryter på grund av tom incheckningsmeddelandekropp.\n"
+
+#: 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"
@@ -11853,284 +13996,223 @@ msgstr ""
 "att kvoten inte har överskridits, och kör sedan\n"
 "\"git restore --staged :/\" för att återställa."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <objkat>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <objkat>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-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:29
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <objkat>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <delnings-flaggor>"
-
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
-#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
-#: builtin/log.c:1585
-msgid "dir"
-msgstr "kat"
-
-#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
-#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
-msgid "The object directory to store the graph"
-msgstr "Objektkatalogen där grafen skall lagras"
-
-#: builtin/commit-graph.c:58
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr "om inchecknignsgrafen är delad, kontrollera bara spetsfilen"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:125
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Kunde inte öppna incheckningsgrafen \"%s\""
-
-#: builtin/commit-graph.c:173
-msgid "start walk at all refs"
-msgstr "starta traversering vid alla referenser"
-
-#: builtin/commit-graph.c:175
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "sök paketindex listade på standard in efter incheckningar"
-
-#: builtin/commit-graph.c:177
-msgid "start walk at commits listed by stdin"
-msgstr "börja gå genom incheckningar listade på standard in"
-
-#: builtin/commit-graph.c:179
-msgid "include all commits already in the commit-graph file"
-msgstr "ta med alla incheckningar redan i filen commit-graph"
-
-#: builtin/commit-graph.c:182
-msgid "allow writing an incremental commit-graph file"
-msgstr "tillåt skriva en inkrementell incheckningsgraffil"
-
-#: builtin/commit-graph.c:184 builtin/commit-graph.c:188
-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:186
-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:204
-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"
-
 #: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<flaggor>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "okänt argument för --type, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "endast en typ åt gången"
 
-#: builtin/config.c:124
+#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Konfigurationsfilens plats"
 
-#: builtin/config.c:125
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr "använd global konfigurationsfil"
 
-#: builtin/config.c:126
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr "använd systemets konfigurationsfil"
 
-#: builtin/config.c:127
+#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "använd arkivets konfigurationsfil"
 
-#: builtin/config.c:128
+#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "använd arbetskatalogens konfigurationsfil"
 
-#: builtin/config.c:129
+#: builtin/config.c:135
 msgid "use given config file"
 msgstr "använd angiven konfigurationsfil"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "läs konfiguration från givet blob-objekt"
 
-#: builtin/config.c:131
+#: builtin/config.c:137
 msgid "Action"
 msgstr "Åtgärd"
 
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "hämta värde: namn [värde-reguttr]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "hämta värde: namn [värde-mönster]"
 
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "hämta alla värden: nyckel [värde-reguttr]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "hämta alla värden: nyckel [värde-mönster]"
 
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "hämta värden för reguttr: namn-reguttr [värde-mönster]"
 
-#: builtin/config.c:135
+#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
 
-#: builtin/config.c:136
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "ersätt alla motsvarande variabler: namn värde [värde-mönster]"
 
-#: builtin/config.c:137
+#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "lägg till en ny variabel: namn värde"
 
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "ta bort en variabel: namn [värde-reguttr]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "ta bort en variabel: namn [värde-mönster]"
 
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "ta bort alla träffar: namn [värde-reguttr]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "ta bort alla träffar: namn [värde-mönster]"
 
-#: builtin/config.c:140
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "byt namn på sektion: gammalt-namn nytt-namn"
 
-#: builtin/config.c:141
+#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "ta bort en sektion: namn"
 
-#: builtin/config.c:142
+#: builtin/config.c:148
 msgid "list all"
 msgstr "visa alla"
 
-#: builtin/config.c:143
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "använd stränglikhet vid när värden jämförs med \"värde-mönster\""
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr "öppna textredigeringsprogram"
 
-#: builtin/config.c:144
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "hitta den inställda färgen: slot [default]"
 
-#: builtin/config.c:145
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "hitta färginställningen: slot [stdout-is-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:153
 msgid "Type"
 msgstr "Typ"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "värdet har givits denna typ"
 
-#: builtin/config.c:148
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "värdet är \"true\" eller \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "värdet är ett decimalt tal"
 
-#: builtin/config.c:150
+#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "värdet är --bool eller --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "värdet är --bool eller sträng"
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "värdet är en sökväg (fil- eller katalognamn)"
 
-#: builtin/config.c:152
+#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "värdet är ett utgångsdatum"
 
-#: builtin/config.c:153
+#: builtin/config.c:161
 msgid "Other"
 msgstr "Andra"
 
-#: builtin/config.c:154
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "terminera värden med NUL-byte"
 
-#: builtin/config.c:155
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "visa endast variabelnamn"
 
-#: builtin/config.c:156
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "respektera inkluderingsdirektiv vid uppslag"
 
-#: builtin/config.c:157
+#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"visa omfång för konfiguration (arbetskatalog, lokalt, globalt, system, "
+"kommando)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "värde"
 
-#: builtin/config.c:158
+#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "med --get, använd standardvärde vid saknad post"
 
-#: builtin/config.c:172
+#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "fel antal argument, skulle vara %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "fel antal argument, skulle vara från %d till %d"
 
-#: builtin/config.c:308
+#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "felaktigt nyckelmönster: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:377
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "misslyckades formatera standardkonfigurationsvärde: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "kan inte tolka färgen \"%s\""
 
-#: builtin/config.c:443
+#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "kan inte tolka standardfärgvärde"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "inte i en git-katalog"
 
-#: builtin/config.c:499
+#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "skriva till standard in stöds inte"
 
-#: builtin/config.c:502
+#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "skriva konfigurations-blobbar stöds inte"
 
-#: builtin/config.c:587
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12145,23 +14227,27 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "endast en konfigurationsfil åt gången"
 
-#: builtin/config.c:616
+#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local kan bara användas inuti ett git-arkiv"
 
-#: builtin/config.c:619
+#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob kan bara användas inuti ett git-arkiv"
 
-#: builtin/config.c:638
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree kan bara användas inuti ett git-arkiv"
+
+#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME inte satt"
 
-#: builtin/config.c:658
+#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12171,52 +14257,56 @@ msgstr ""
 "konfigurationsutöknignen worktreeConfig har aktiverats. Läsa stycket\n"
 "\"KONFIGURATIONSFIL\" i \"git help worktree\" för detaljer"
 
-#: builtin/config.c:688
+#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color och variabeltyp stämmer inte överens"
 
-#: builtin/config.c:693
+#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "endast en åtgärd åt gången"
 
-#: builtin/config.c:706
+#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only gäller bara för --list eller --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr ""
 "--show-origin gäller bara för --get, --get-all, --get-regexp och --list"
 
-#: builtin/config.c:718
+#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default gäller bara för --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value gäller endast med \"värde-mönster\""
+
+#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "kan inte konfigurationsfil \"%s\""
 
-#: builtin/config.c:734
+#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "fel vid hantering av konfigurationsfil(er)"
 
-#: builtin/config.c:744
+#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "redigering av standard in stöds ej"
 
-#: builtin/config.c:746
+#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "redigering av blobbar stöds ej"
 
-#: builtin/config.c:760
+#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "kan inte skapa konfigurationsfilen \"%s\""
 
-#: builtin/config.c:773
+#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12225,7 +14315,7 @@ msgstr ""
 "kan inte skriva över flera värden med ett ensamt värde\n"
 "       Använd en regexp, --add eller --replace-all för att ändra %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "ingen sådan sektion: %s"
@@ -12238,6 +14328,37 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "skriv storlekar i människoläsbart format"
 
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Behörigheten på din uttags-katalog (socket) är för lös; andra\n"
+"användare kan läsa dina cachade inloggningsuppgifter. Du bör köra:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+msgstr "skriv felsökningsmeddelanden på standard fel"
+
+#: builtin/credential-cache--daemon.c:316
+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
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "\"credential-cache\" ej tillgänglig; stöd för unix-uttag saknas"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "kunde inte erhålla låset för lagring av inlogginsuppgifter på %d ms"
+
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
@@ -12246,50 +14367,45 @@ msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<flaggor>] --dirty"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "head"
 msgstr "huvud"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "lättviktig"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr "annoterad"
 
-#: builtin/describe.c:275
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "den annoterade taggen %s inte tillgänglig"
 
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "den annoterade taggen %s har inget inbäddat namn"
-
 #: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "taggen \"%s\" är utanför känd som \"%s\""
 
-#: builtin/describe.c:325
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "ingen tagg motsvarar \"%s\" exakt"
 
-#: builtin/describe.c:327
+#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr ""
 "Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n"
 
-#: builtin/describe.c:381
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "avslutade sökning på %s\n"
 
-#: builtin/describe.c:407
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12298,7 +14414,7 @@ msgstr ""
 "Inga annoterade taggar kan beskriva \"%s\".\n"
 "Det finns dock oannoterade taggar: testa --tags."
 
-#: builtin/describe.c:411
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12307,12 +14423,12 @@ msgstr ""
 "Inga taggar kan beskriva \"%s\".\n"
 "Testa --always, eller skapa några taggar."
 
-#: builtin/describe.c:441
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "traverserade %lu incheckningar\n"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12321,143 +14437,161 @@ msgstr ""
 "mer än %i taggar hittades; listar de %i senaste\n"
 "gav upp sökningen vid %s\n"
 
-#: builtin/describe.c:512
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "beskriva %s\n"
 
-#: builtin/describe.c:515
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Objektnamnet är inte giltigt: %s"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s är varken incheckning eller blob"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "hitta taggen som kommer efter incheckningen"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "felsök sökstrategin på standard fel"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "använd alla referenser"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "använd alla taggar, även oannoterade"
 
-#: builtin/describe.c:541
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "använd alltid långt format"
 
-#: builtin/describe.c:542
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "följ endast första föräldern"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "skriv endast ut exakta träffar"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "överväg de <n> nyaste taggarna (standard: 10)"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "överväg endast taggar som motsvarar <mönster>"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "överväg inte taggar som motsvarar <mönster>"
 
-#: builtin/describe.c:553 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "visa förkortade incheckningsobjekt som standard"
 
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "märke"
 
-#: builtin/describe.c:555
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
 
-#: builtin/describe.c:576
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long är inkompatibel med --abbrev=0"
 
-#: builtin/describe.c:605
+#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "Inga namn hittades, kan inte beskriva något."
 
-#: builtin/describe.c:656
+#: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
 
-#: builtin/describe.c:658
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
 
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin och --merge-base är ömsesidigt uteslutande"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base fungerar endast med två incheckningar"
+
+#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "\"%s\": inte en normal fil eller symbolisk länk"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "ogiltig flagga: %s"
 
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: ingen sammanslagningsbas"
+
+#: builtin/diff.c:486
 msgid "Not a git repository"
 msgstr "Inte ett git-arkiv"
 
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "objektet \"%s\" som angavs är felaktigt."
 
-#: builtin/diff.c:403
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "mer än två blobbar angavs: \"%s\""
 
-#: builtin/diff.c:408
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "ej hanterat objekt \"%s\" angavs."
 
-#: builtin/difftool.c:30
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: flera sammanslagningsbaser, använder %s"
+
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr ""
 "git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
 
-#: builtin/difftool.c:260
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
 msgstr "misslyckades: %d"
 
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink %s"
 msgstr "kunde inte läsa symboliska länken %s"
 
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "kunde inte läsa symbolisk länk-fil %s"
 
-#: builtin/difftool.c:312
+#: builtin/difftool.c:313
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "kunde inte läsa objektet %s för symboliska länken %s"
@@ -12470,53 +14604,53 @@ msgstr ""
 "kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
 "katalogdiffläge (\"-d\" och \"--dir-diff\")."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
 
-#: builtin/difftool.c:636
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "filen i arbetskatalogen lämnades kvar."
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "temporära filer finns i \"%s\"."
 
-#: builtin/difftool.c:648
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr "du kanske vill städa eller rädda dem."
 
-#: builtin/difftool.c:697
+#: builtin/difftool.c:699
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:701
 msgid "perform a full-directory diff"
 msgstr "utför diff för hela katalogen"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:703
 msgid "do not prompt before launching a diff tool"
 msgstr "fråga inte vid start av diff-verktyg"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:708
 msgid "use symlinks in dir-diff mode"
 msgstr "använd symboliska länkar i katalogdiffläge"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:709
 msgid "tool"
 msgstr "verktyg"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:710
 msgid "use the specified diff tool"
 msgstr "använd angivet diff-verktyg"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:712
 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:713
+#: builtin/difftool.c:715
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12524,31 +14658,31 @@ msgstr ""
 "låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
 "skilt från noll"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:718
 msgid "specify a custom command for viewing diffs"
 msgstr "ange eget kommando för att visa diffar"
 
-#: builtin/difftool.c:717
+#: builtin/difftool.c:719
 msgid "passed to `diff`"
 msgstr "sändes till \"diff\""
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:734
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool kräver en arbetskatalog eller --no-index"
 
-#: builtin/difftool.c:739
+#: builtin/difftool.c:741
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff är inkompatibelt med --no-index"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:744
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool och --extcmd är ömsesidigt uteslutande"
 
-#: builtin/difftool.c:750
+#: builtin/difftool.c:752
 msgid "no <tool> given for --tool=<tool>"
 msgstr "inget <verktyg> angavs för --tool=<verktyg>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:759
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "inget <kommando> angavs för --extcmd=<kommando>"
 
@@ -12556,26 +14690,26 @@ 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:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
 msgid "type"
 msgstr "typ"
 
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "standard för git_env_*(...) att falla tillbaka på"
 
-#: builtin/env--helper.c:43
+#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "var tyst, använd bara git_env_*() som resultatvärde"
 
-#: builtin/env--helper.c:62
+#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
 "flaggan \"--default\" förväntar ett sanningsvärde med \"--type=bool\", inte "
 "\"%s\""
 
-#: builtin/env--helper.c:77
+#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
@@ -12588,180 +14722,245 @@ msgstr ""
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-flaggor]"
 
-#: builtin/fast-export.c:852
+#: builtin/fast-export.c:868
 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:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "symbolen för --anonymize-map kan inte vara tom"
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "visa förlopp efter <n> objekt"
 
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "välj hantering av signerade taggar"
 
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
 msgid "select handling of tags that tag filtered objects"
 msgstr "välj hantering av taggar som har taggfiltrerade objekt"
 
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "välj hantering av incheckningsmeddelanden i alternativ teckenkodning"
 
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
-msgstr "Dumpa märken till filen"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "dumpa märken till filen"
 
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
-msgstr "Importera märken från filen"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "importera märken från filen"
 
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
-msgstr "Importera märken från filen, om den finns"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "importera märken från filen, om den finns"
 
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "Fejka taggare när taggen saknar en"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "fejka taggare när taggen saknar en"
 
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
-msgstr "Skriv ut hela trädet för varje incheckning"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "skriv ut hela trädet för varje incheckning"
 
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
-msgstr "Använd done-funktionen för att avsluta strömmen"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "använd done-funktionen för att avsluta strömmen"
 
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
-msgstr "Hoppa över skrivning av blob-data"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "hoppa över skrivning av blob-data"
 
-#: builtin/fast-export.c:1177 builtin/log.c:1633
+#: builtin/fast-export.c:1222 builtin/log.c:1826
 msgid "refspec"
 msgstr "referensspecifikation"
 
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr "Applicera referensspecifikation på exporterade referenser"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "applicera referensspecifikation på exporterade referenser"
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "anonymisera utdata"
 
-#: builtin/fast-export.c:1181
-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:1225
+msgid "from:to"
+msgstr "från:till"
 
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
-msgstr "Visa ursprungliga objekt-id för blobbar/incheckningar"
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "konvertera <från> till <till> i anonymiserad utdata"
 
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
-msgstr "Märk taggar med märke-id"
+#: builtin/fast-export.c:1229
+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:1220
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "visa ursprungliga objekt-id för blobbar/incheckningar"
+
+#: builtin/fast-export.c:1233
+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/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "Saknar från-märken för undermodulen \"%s\""
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "Saknar till-märken för undermodulen \"%s\""
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "Förväntade \"mark\"-kommando, fick %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "Förväntade \"to\"-kommando, fick %s"
+
+#: builtin/fast-import.c:3322
+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
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "funktionen \"%s\" förbjuden i indata utan --allow-unsafe-features"
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "LÃ¥sfil skapad men inte rapporterad: %s"
+
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<flaggor>] <grupp>"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<flaggor>]"
 
-#: builtin/fetch.c:115
+#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel kan inte vara negativt"
 
-#: builtin/fetch.c:138 builtin/pull.c:204
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "hämta från alla fjärrar"
 
-#: builtin/fetch.c:140 builtin/pull.c:248
+#: builtin/fetch.c:147 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
 msgstr "ställ in uppström för git pull/fetch"
 
-#: builtin/fetch.c:142 builtin/pull.c:207
+#: builtin/fetch.c:149 builtin/pull.c:188
 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:144 builtin/pull.c:210
+#: builtin/fetch.c:151
+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
 msgid "path to upload pack on remote end"
 msgstr "sökväg till upload pack på fjärren"
 
-#: builtin/fetch.c:145
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr "tvinga överskrivning av lokal referens"
 
-#: builtin/fetch.c:147
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "hämta från flera fjärrar"
 
-#: builtin/fetch.c:149 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "hämta alla taggar och associerade objekt"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr "hämta inte alla taggar (--no-tags)"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "antal undermoduler som hämtas parallellt"
 
-#: builtin/fetch.c:155 builtin/pull.c:217
+#: builtin/fetch.c:164
+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
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "rensa fjärrspårande grenar ej längre på fjärren"
 
-#: builtin/fetch.c:157
+#: builtin/fetch.c:168
 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:158 builtin/fetch.c:181 builtin/pull.c:141
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:159
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
 msgstr "styr rekursiv hämtning av undermoduler"
 
-#: builtin/fetch.c:163 builtin/pull.c:225
+#: builtin/fetch.c:175
+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
 msgid "keep downloaded pack"
 msgstr "behåll hämtade paket"
 
-#: builtin/fetch.c:165
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "tillåt uppdatering av HEAD-referens"
 
-#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "fördjupa historik för grund klon"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:183 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr "fördjupa historik för grund klon baserad på tid"
 
-#: builtin/fetch.c:176 builtin/pull.c:231
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "konvertera till komplett arkiv"
 
-#: builtin/fetch.c:179
+#: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
 msgstr "lägg till i början av undermodulens sökvägsutdata"
 
-#: builtin/fetch.c:182
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -12769,90 +14968,102 @@ msgstr ""
 "standard för rekursiv hämtning av undermoduler (lägre prioritet än "
 "konfigurationsfiler)"
 
-#: builtin/fetch.c:186 builtin/pull.c:234
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "tar emot referenser som uppdaterar .git/shallow"
 
-#: builtin/fetch.c:187 builtin/pull.c:236
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr "referenskarta"
 
-#: builtin/fetch.c:188 builtin/pull.c:237
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "ange referenskarta för \"fetch\""
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:208 builtin/pull.c:240
 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:198
-msgid "run 'gc --auto' after fetching"
-msgstr "kör \"gc --auto\" efter hämtning"
+#: builtin/fetch.c:210
+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
+msgid "run 'maintenance --auto' after fetching"
+msgstr "kör \"maintenance --auto\" efter hämtning"
 
-#: builtin/fetch.c:200 builtin/pull.c:246
+#: builtin/fetch.c:217 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr "se efter tvingade uppdateringar i alla uppdaterade grenar"
 
-#: builtin/fetch.c:510
+#: builtin/fetch.c:219
+msgid "write the commit-graph after fetching"
+msgstr "skriv incheckingsgrafen efter hämtning"
+
+#: builtin/fetch.c:221
+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:650
+#: builtin/fetch.c:757
 #, 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:748
+#: builtin/fetch.c:856
 #, c-format
 msgid "object %s not found"
 msgstr "objektet %s hittades inte"
 
-#: builtin/fetch.c:752
+#: builtin/fetch.c:860
 msgid "[up to date]"
 msgstr "[àjour]"
 
-#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr "[refuserad]"
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:874
 msgid "can't fetch in current branch"
 msgstr "kan inte hämta i aktuell gren"
 
-#: builtin/fetch.c:776
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr "[uppdaterad tagg]"
 
-#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
-#: builtin/fetch.c:848
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
 msgid "unable to update local ref"
 msgstr "kunde inte uppdatera lokal ref"
 
-#: builtin/fetch.c:781
+#: builtin/fetch.c:889
 msgid "would clobber existing tag"
 msgstr "skulle skriva över befintlig tagg"
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr "[ny tagg]"
 
-#: builtin/fetch.c:806
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr "[ny gren]"
 
-#: builtin/fetch.c:809
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr "[ny ref]"
 
-#: builtin/fetch.c:848
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr "tvingad uppdatering"
 
-#: builtin/fetch.c:853
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
 msgstr "ej snabbspolad"
 
-#: builtin/fetch.c:874
+#: 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"
@@ -12863,7 +15074,7 @@ msgstr ""
 "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:878
+#: builtin/fetch.c:1069
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -12876,22 +15087,22 @@ msgstr ""
 "showForcedUpdates\n"
 "false\" för att undvika testet.\n"
 
-#: builtin/fetch.c:908
+#: builtin/fetch.c:1101
 #, 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:929
+#: builtin/fetch.c:1129
 #, 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:1020 builtin/fetch.c:1157
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr "Från %.*s\n"
 
-#: builtin/fetch.c:1031
+#: builtin/fetch.c:1228
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -12900,56 +15111,56 @@ msgstr ""
 "vissa lokala referenser kunde inte uppdateras; testa att köra\n"
 " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt"
 
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1327
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   (%s kommer bli dinglande)"
 
-#: builtin/fetch.c:1128
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s har blivit dinglande)"
 
-#: builtin/fetch.c:1160
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr "[borttagen]"
 
-#: builtin/fetch.c:1161 builtin/remote.c:1036
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(ingen)"
 
-#: builtin/fetch.c:1184
+#: builtin/fetch.c:1384
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
 
-#: builtin/fetch.c:1203
+#: builtin/fetch.c:1403
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
 
-#: builtin/fetch.c:1206
+#: builtin/fetch.c:1406
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Flaggan \"%s\" ignoreras för %s\n"
 
-#: builtin/fetch.c:1414
-msgid "multiple branch detected, incompatible with --set-upstream"
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "flera grenar upptäcktes, inkompatibelt med --set-upstream"
 
-#: builtin/fetch.c:1429
+#: builtin/fetch.c:1633
 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:1431
+#: builtin/fetch.c:1635
 msgid "not setting upstream for a remote tag"
 msgstr "ställer inte in uppström för en fjärrtag"
 
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1637
 msgid "unknown branch type"
 msgstr "okänd grentyp"
 
-#: builtin/fetch.c:1435
+#: builtin/fetch.c:1639
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
@@ -12957,67 +15168,79 @@ msgstr ""
 "hittade ingen källgren.\n"
 "du måste ange exakt en gren med flaggan --set-upstream."
 
-#: builtin/fetch.c:1561 builtin/fetch.c:1623
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr "Hämtar %s\n"
 
-#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Kunde inte hämta %s"
 
-#: builtin/fetch.c:1583
+#: builtin/fetch.c:1790
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "kunde inte hämta \"%s\" (felkod: %d)\n"
 
-#: builtin/fetch.c:1685
+#: 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 ""
 "Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
-"fjärrarkiv som nya incheckningar skall hämtas från."
+"fjärrarkiv som nya incheckningar ska hämtas från."
 
-#: builtin/fetch.c:1722
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr "Du måste ange namnet på en tagg."
 
-#: builtin/fetch.c:1774
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only behöver en eller flera --negotiate-tip=*"
+
+#: builtin/fetch.c:1998
 msgid "Negative depth in --deepen is not supported"
 msgstr "Negativa djup stöds inte i --deepen"
 
-#: builtin/fetch.c:1776
+#: builtin/fetch.c:2000
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen och --depth är ömsesidigt uteslutande"
 
-#: builtin/fetch.c:1781
+#: builtin/fetch.c:2005
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth och --unshallow kan inte användas samtidigt"
 
-#: builtin/fetch.c:1783
+#: builtin/fetch.c:2007
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "--unshallow kan inte användas på ett komplett arkiv"
 
-#: builtin/fetch.c:1799
+#: builtin/fetch.c:2024
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all tar inte namnet på ett arkiv som argument"
 
-#: builtin/fetch.c:1801
+#: builtin/fetch.c:2026
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all kan inte anges med referensspecifikationer"
 
-#: builtin/fetch.c:1810
+#: builtin/fetch.c:2035
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Fjärren eller fjärrgruppen finns inte: %s"
 
-#: builtin/fetch.c:1817
+#: builtin/fetch.c:2042
 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:1835
+#: builtin/fetch.c:2058
+msgid "must supply remote when using --negotiate-only"
+msgstr "måste ange fjärr när --negotiate-only anges"
+
+#: builtin/fetch.c:2063
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "Protokollet stöder inte --negotiate-only, avslutar."
+
+#: builtin/fetch.c:2082
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -13025,29 +15248,37 @@ msgstr ""
 "--filter kan endast användas med fjärren konfigurerad i extensions."
 "partialclone"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2086
+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:2090
+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"
+
+#: 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 <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 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:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "alias för --log (avråds)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "text"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "inled meddelande med <text>"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "fil att läsa från"
 
@@ -13060,84 +15291,101 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <objekt>]"
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<incheckning>]]"
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr ""
+"git for-each-ref [--merged [<incheckning>]] [--no-merged <incheckning>]]"
 
 #: builtin/for-each-ref.c:13
 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:28
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
 msgstr "citera platshållare passande för skal"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr "citera platshållare passande för perl"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr "citera platshållare passande för python"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr "citera platshållare passande för Tcl"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "visa endast <n> träffade refs"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
 msgid "respect format colors"
 msgstr "använd formatfärger"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "visa endast referenser som pekar på objektet"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "visa endast referenser som slagits samman"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
 msgstr "visa endast referenser som ej slagits samman"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
 msgstr "visa endast referenser som innehåller incheckningen"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
 msgstr "visa endast referenser som inte innehåller incheckningen"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<konfig> <kommandoargument>"
+
+#: builtin/for-each-repo.c:34
+msgid "config"
+msgstr "konfig"
+
+#: 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:43
+msgid "missing --config=<config>"
+msgstr "saknar --config=<konfig>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "okänd"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "fel i %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "varning i %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: 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:168
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "fel objekttyp i länk"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13146,244 +15394,244 @@ msgstr ""
 "trasig länk från %7s %s\n"
 "            till %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "saknat %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "onåbart %s %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "hängande %s %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "kunde inte skapa lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "kunde inte avsluta \"%s\""
 
-#: builtin/fsck.c:377
+#: 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:415
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "Kontrollerar konnektivitet (%d objekt)"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "Kontrollerar %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "trasiga länkar"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "roten %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "taggad %s %s (%s) i %s"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s: objekt trasigt eller saknas"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s: ogiltig reflog-post %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "Kontrollerar reflog %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s: ogiltig sha1-pekare %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s: inte en incheckning!"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "obs: Inga förvalda referenser"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:606
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: objektet trasigt eller saknas: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:619
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s: objektet kunde inte tolkas: %s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:639
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "ogiltig sha1-fil: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:654
 msgid "Checking object directory"
 msgstr "Kontrollerar objektkatalog"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:657
 msgid "Checking object directories"
 msgstr "Kontrollerar objektkataloger"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:672
 #, c-format
 msgid "Checking %s link"
 msgstr "Kontrollerar %s-länk"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:677 builtin/index-pack.c:864
 #, c-format
 msgid "invalid %s"
 msgstr "ogiltigt %s"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:684
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s pekar på något konstigt (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:690
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s: frånkopplat HEAD pekar på ingenting"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:694
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "obs: %s pekar på en ofödd gren (%s)"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:706
 msgid "Checking cache tree"
 msgstr "Kontrollerar cacheträd"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:711
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s: ogiltig sha1-pekare i cacheträd"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:720
 msgid "non-tree in cache-tree"
 msgstr "icke-träd i cacheträd"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:751
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<flaggor>] [<objekt>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:757
 msgid "show unreachable objects"
 msgstr "visa onåbara objekt"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:758
 msgid "show dangling objects"
 msgstr "visa dinglande objekt"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:759
 msgid "report tags"
 msgstr "rapportera taggar"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:760
 msgid "report root nodes"
 msgstr "rapportera rotnoder"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:761
 msgid "make index objects head nodes"
 msgstr "gör indexojekt till huvudnoder"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:762
 msgid "make reflogs head nodes (default)"
 msgstr "gör refloggar till huvudnoder (standard)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:763
 msgid "also consider packs and alternate objects"
-msgstr "ta även hänsyn till paket och alternativa objekt"
+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:794
+#: builtin/fsck.c:764
 msgid "check only connectivity"
 msgstr "kontrollera endast konnektivitet"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:765 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "aktivera striktare kontroll"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:767
 msgid "write dangling objects in .git/lost-found"
 msgstr "skriv dinglande objekt i .git/lost-found"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:768 builtin/prune.c:134
 msgid "show progress"
 msgstr "visa förlopp"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:769
 msgid "show verbose names for reachable objects"
 msgstr "visa ordrika namn för nåbara objekt"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:828 builtin/index-pack.c:262
 msgid "Checking objects"
 msgstr "Kontrollerar objekt"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:856
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: objekt saknas"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:867
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "ogiltig parameter: förväntade sha1, fick \"%s\""
 
-#: builtin/gc.c:35
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<flaggor>]"
 
-#: builtin/gc.c:90
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Misslyckades ta status (fstat) på %s: %s"
 
-#: builtin/gc.c:126
+#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "misslyckades tolka \"%s\" värde \"%s\""
 
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "kan inte ta status på \"%s\""
 
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: 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:491
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13398,52 +15646,52 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:539
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
 msgstr "rensa ej refererade objekt"
 
-#: builtin/gc.c:541
+#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr "var mer grundlig (ökar körtiden)"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "aktivera auto-gc-läge"
 
-#: builtin/gc.c:545
+#: builtin/gc.c:557
 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:548
+#: builtin/gc.c:560
 msgid "repack all other packs except the largest pack"
 msgstr "packa om alla paket förutom det största paketet"
 
-#: builtin/gc.c:565
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "kunde inte tolka värdet %s för gc.logexpiry"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:587
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "kunde inte tolka värdet %s för prune expiry"
 
-#: builtin/gc.c:596
+#: builtin/gc.c:607
 #, 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:598
+#: builtin/gc.c:609
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:610
 #, 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:639
+#: builtin/gc.c:650
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13451,23 +15699,186 @@ msgstr ""
 "gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
 "är fallet)"
 
-#: builtin/gc.c:694
+#: builtin/gc.c:705
 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/grep.c:29
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<uppgift>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule tillåts inte"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "okänt argument för --schedule, %s"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "kunde inte skriva incheckningsgraf"
+
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr "kunde inte förhämta fjärrar"
+
+#: builtin/gc.c:1022
+msgid "failed to start 'git pack-objects' process"
+msgstr "kunde inte starta \"git pack-objects\"-process"
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr "kunde inte avsluta \"git pack-objects\"-process"
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr "kunde inte skriva multi-pack-index"
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr "\"git multi-pack-index expire\" misslyckades"
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr "\"git multi-pack-index repack\" misslyckades"
+
+#: builtin/gc.c:1179
+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
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "låsfilen \"%s\" finns, hoppar över underhåll"
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr "uppgiften \"%s\" misslyckades"
+
+#: builtin/gc.c:1395
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "\"%s\" är inte en giltig uppgift"
+
+#: builtin/gc.c:1400
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "uppgiften \"%s\" kan inte väljas flera gånger"
+
+#: builtin/gc.c:1415
+msgid "run tasks based on the state of the repository"
+msgstr "kör uppgifter baserad på arkivets tillstånd"
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr "frekvens"
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr "kör uppgifter baserat på frekvens"
+
+#: builtin/gc.c:1420
+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
+msgid "task"
+msgstr "uppgift"
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr "utför en specifik uppgift"
+
+#: builtin/gc.c:1439
+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
+msgid "failed to run 'git config'"
+msgstr "misslyckades köra \"git config\""
+
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "misslyckades expandera sökvägen \"%s\""
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr "misslyckades starta launchctl"
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "misslyckades skapa kataloger för \"%s\""
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "misslyckades starta tjänsten %s"
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
+msgstr "misslyckades skapa temporär xml-fil"
+
+#: builtin/gc.c:1835
+msgid "failed to start schtasks"
+msgstr "misslyckades starta schtasks"
+
+#: builtin/gc.c:1879
+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
+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
+msgid "failed to open stdin of 'crontab'"
+msgstr "misslyckades öppna standard in för \"crontab\""
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr "\"crontab\" dog"
+
+#: builtin/gc.c:1976
+msgid "another process is scheduling background maintenance"
+msgstr "en annan process schemalägger bakgrundsunderhåll"
+
+#: builtin/gc.c:2000
+msgid "failed to add repo to global config"
+msgstr "misslyckades lägga till arkiv till global konfiguration"
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <underkommando> [<flaggor>]"
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "felaktigt underkommando: %s"
+
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
 
-#: builtin/grep.c:225
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: misslyckades skapa tråd. %s"
 
-#: builtin/grep.c:279
+#: builtin/grep.c:277
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "felaktigt antal trådar angivet (%d) för %s"
@@ -13476,258 +15887,258 @@ msgstr "felaktigt antal trådar angivet (%d) för %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: 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 "trådstöd saknas, ignorerar %s"
 
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "kunde inte läsa träd (%s)"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:658
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "kunde inte \"grep\" från objekt av typen %s"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:738
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "flaggan \"%c\" antar ett numeriskt värde"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:837
 msgid "search in index instead of in the work tree"
 msgstr "sök i indexet istället för i arbetskatalogen"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:839
 msgid "find in contents not managed by git"
 msgstr "sök i innehåll som inte hanteras av git"
 
-#: builtin/grep.c:819
+#: builtin/grep.c:841
 msgid "search in both tracked and untracked files"
 msgstr "sök i både spårade och ospårade filer"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:843
 msgid "ignore files specified via '.gitignore'"
 msgstr "ignorera filer angivna i \".gitignore\""
 
-#: builtin/grep.c:823
+#: builtin/grep.c:845
 msgid "recursively search in each submodule"
 msgstr "sök varje undermodul rekursivt"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:848
 msgid "show non-matching lines"
 msgstr "visa rader som inte träffas"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:850
 msgid "case insensitive matching"
 msgstr "skiftlägesokänslig sökning"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:852
 msgid "match patterns only at word boundaries"
-msgstr "matcha endast mönster vid ordgränser"
+msgstr "träffa endast mönster vid ordgränser"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:854
 msgid "process binary files as text"
 msgstr "hantera binärfiler som text"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:856
 msgid "don't match patterns in binary files"
 msgstr "träffa inte mönster i binärfiler"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:859
 msgid "process binary files with textconv filters"
 msgstr "hantera binärfiler med textconv-filter"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:861
 msgid "search in subdirectories (default)"
 msgstr "sök i underkataloger (standard)"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:863
 msgid "descend at most <depth> levels"
 msgstr "gå som mest ned <djup> nivåer"
 
-#: builtin/grep.c:845
+#: builtin/grep.c:867
 msgid "use extended POSIX regular expressions"
 msgstr "använd utökade POSIX-reguljära uttryck"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:870
 msgid "use basic POSIX regular expressions (default)"
 msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:873
 msgid "interpret patterns as fixed strings"
 msgstr "tolka mönster som fixerade strängar"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:876
 msgid "use Perl-compatible regular expressions"
 msgstr "använd Perlkompatibla reguljära uttryck"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:879
 msgid "show line numbers"
 msgstr "visa radnummer"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:880
 msgid "show column number of first match"
 msgstr "visa kolumnnummer för första träff"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:881
 msgid "don't show filenames"
 msgstr "visa inte filnamn"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:882
 msgid "show filenames"
 msgstr "visa filnamn"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:884
 msgid "show filenames relative to top directory"
 msgstr "visa filnamn relativa till toppkatalogen"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:886
 msgid "show only filenames instead of matching lines"
 msgstr "visa endast filnamn istället för träffade rader"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:888
 msgid "synonym for --files-with-matches"
 msgstr "synonym för --files-with-matches"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:891
 msgid "show only the names of files without match"
 msgstr "visa endast namn på filer utan träffar"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:893
 msgid "print NUL after filenames"
 msgstr "skriv NUL efter filnamn"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:896
 msgid "show only matching parts of a line"
 msgstr "visa endast träffade delar av rader"
 
-#: builtin/grep.c:876
+#: builtin/grep.c:898
 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:877
+#: builtin/grep.c:899
 msgid "highlight matches"
 msgstr "ljusmarkera träffar"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:901
 msgid "print empty line between matches from different files"
 msgstr "skriv tomma rader mellan träffar från olika filer"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:903
 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:884
+#: builtin/grep.c:906
 msgid "show <n> context lines before and after matches"
 msgstr "visa <n> rader sammanhang före och efter träffar"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:909
 msgid "show <n> context lines before matches"
 msgstr "visa <n> rader sammanhang före träffar"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:911
 msgid "show <n> context lines after matches"
 msgstr "visa <n> rader sammanhang efter träffar"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:913
 msgid "use <n> worker threads"
 msgstr "använd <n> jobbtrådar"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:914
 msgid "shortcut for -C NUM"
 msgstr "genväg för -C NUM"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:917
 msgid "show a line with the function name before matches"
 msgstr "visa en rad med funktionsnamnet före träffen"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:919
 msgid "show the surrounding function"
 msgstr "visa den omkringliggande funktionen"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:922
 msgid "read patterns from file"
 msgstr "läs mönster från fil"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:924
 msgid "match <pattern>"
 msgstr "träffa <mönster>"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:926
 msgid "combine patterns specified with -e"
 msgstr "kombinera mönster som anges med -e"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:938
 msgid "indicate hit with exit status without output"
 msgstr "ange träff med slutstatuskod utan utdata"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:940
 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:920
-msgid "show parse tree for grep expression"
-msgstr "visa analysträd för grep-uttryck"
-
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "pager"
 msgstr "bläddrare"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "show matching files in the pager"
 msgstr "visa träffade filer i filbläddraren"
 
-#: builtin/grep.c:928
+#: builtin/grep.c:947
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
 
-#: builtin/grep.c:992
+#: builtin/grep.c:1013
 msgid "no pattern given"
 msgstr "inget mönster angavs"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1049
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index och --untracked kan inte användas med revisioner"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1057
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "kan inte slå upp revision: %s"
 
-#: builtin/grep.c:1067
+#: builtin/grep.c:1087
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked stöds inte med --recurse-submodules"
+
+#: builtin/grep.c:1091
 msgid "invalid option combination, ignoring --threads"
 msgstr "ogiltig kombination av flaggor, ignorerar --threads"
 
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
 msgid "no threads support, ignoring --threads"
 msgstr "trådstöd saknas, ignorerar --threads"
 
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "felaktigt antal trådar angivet (%d)"
 
-#: builtin/grep.c:1096
+#: builtin/grep.c:1131
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
 
-#: builtin/grep.c:1119
-msgid "option not supported with --recurse-submodules"
-msgstr "flaggan stöds inte med --recurse-submodules"
-
-#: builtin/grep.c:1125
+#: builtin/grep.c:1157
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached och --untracked kan inte användas med --no-index"
 
-#: builtin/grep.c:1131
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked kan inte användas med --cached"
+
+#: builtin/grep.c:1166
 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:1139
+#: builtin/grep.c:1174
 msgid "both --cached and trees are given"
 msgstr "både --cached och träd angavs"
 
@@ -13769,66 +16180,66 @@ msgstr ""
 msgid "process file as it were from this path"
 msgstr "hantera filen som om den kom från sökvägen"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "visa alla tillgängliga kommandon"
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "uteslut vägledningar"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr "lista användbara vägledningar"
 
-#: builtin/help.c:49
+#: builtin/help.c:50
 msgid "print all configuration variable names"
 msgstr "visa namn på alla konfigurationsvariabler"
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr "visa manualsida"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr "visa manual i webbläsare"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "visa info-sida"
 
-#: builtin/help.c:56
+#: builtin/help.c:57
 msgid "print command description"
 msgstr "visa kommandobeskrivning"
 
-#: builtin/help.c:61
+#: 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:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "okänt hjälpformat: \"%s\""
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "Misslyckades starta emacsclient."
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "Kunde inte tolka emacsclient-version."
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient version \"%d\" för gammal (< 22)."
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "exec misslyckades för \"%s\""
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -13837,7 +16248,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:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -13846,396 +16257,424 @@ msgstr ""
 "\"%s\": kommando för man-visare som stöds.\n"
 "Använd \"man.<verktyg>.path\" istället."
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "\"%s\": okänd man-visare."
 
-#: builtin/help.c:367
+#: builtin/help.c:452
 msgid "no man viewer handled the request"
 msgstr "ingen man-visare hanterade förfrågan"
 
-#: builtin/help.c:375
+#: builtin/help.c:459
 msgid "no info viewer handled the request"
 msgstr "ingen info-visare hanterade förfrågan"
 
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "\"%s\" är ett alias för \"%s\""
 
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:531 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "felaktig alias.%s-sträng: %s"
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:561 builtin/help.c:591
 #, c-format
 msgid "usage: %s%s"
 msgstr "användning: %s%s"
 
-#: builtin/help.c:491
+#: builtin/help.c:575
 msgid "'git help config' for more information"
 msgstr "\"git help config\" för mer information"
 
-#: builtin/index-pack.c:185
+#: builtin/index-pack.c:222
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "objekttyp stämmer inte överens vid %s"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:242
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "emottog inte det förväntade objektet %s"
 
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:245
 #, 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:258
+#: builtin/index-pack.c:295
 #, 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:268
+#: builtin/index-pack.c:305
 msgid "early EOF"
 msgstr "tidigt filslut"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:306
 msgid "read error on input"
 msgstr "indataläsfel"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:318
 msgid "used more bytes than were available"
 msgstr "använde fler byte än tillgängligt"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:325 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:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:328 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:312
+#: 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:326
+#: builtin/index-pack.c:363
 msgid "pack signature mismatch"
 msgstr "paketsignatur stämmer inte överens"
 
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:365
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "paketversion %<PRIu32> stöds ej"
 
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:381
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
 
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:487
 #, c-format
 msgid "inflate returned %d"
 msgstr "inflate returnerade %d"
 
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:536
 msgid "offset value overflow for delta base object"
 msgstr "indexvärdespill för deltabasobjekt"
 
-#: builtin/index-pack.c:523
+#: builtin/index-pack.c:544
 msgid "delta base offset is out of bound"
 msgstr "deltabasindex utanför gränsen"
 
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:552
 #, c-format
 msgid "unknown object type %d"
 msgstr "okänd objekttyp %d"
 
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:583
 msgid "cannot pread pack file"
 msgstr "kan inte utföra \"pread\" på paketfil"
 
-#: builtin/index-pack.c:564
+#: 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] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
 msgstr[1] "för tidigt slut på paketfilen, %<PRIuMAX> byte saknas"
 
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:611
 msgid "serious inflate inconsistency"
 msgstr "allvarlig inflate-inkonsekvens"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: 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 "SHA1-KOLLISION UPPTÄCKT VID %s !"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: 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 "kunde inte läsa %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "kan inte läsa information om befintligt objekt %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:831
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "kan inte läsa befintligt objekt %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:845
 #, c-format
 msgid "invalid blob object %s"
 msgstr "ogiltigt blob-objekt %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
 msgid "fsck error in packed object"
 msgstr "fsck-fel i packat objekt"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:869
 #, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
 msgid "failed to apply delta"
 msgstr "misslyckades tillämpa delta"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Receiving objects"
 msgstr "Tar emot objekt"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Indexing objects"
 msgstr "Skapar index för objekt"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1194
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "paketet är trasigt (SHA1 stämmer inte)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1199
 msgid "cannot fstat packfile"
 msgstr "kan inte utföra \"fstat\" på paketfil"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1202
 msgid "pack has junk at the end"
 msgstr "paket har skräp i slutet"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1214
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "förvirrad bortom vanvett i parse_pack_objects()"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1237
 msgid "Resolving deltas"
 msgstr "Analyserar delta"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "kunde inte skapa tråd: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1281
 msgid "confusion beyond insanity"
 msgstr "förvirrad bortom vanvett"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1287
 #, 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:1264
+#: builtin/index-pack.c:1299
 #, 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:1268
+#: builtin/index-pack.c:1303
 #, 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:1292
+#: builtin/index-pack.c:1327
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "lokalt objekt %s är trasigt"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1444
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "paketfilnamnet \"%s\" slutar inte med \".%s\""
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1468
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "kan inte ta skriva %s-fil \"%s\""
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1476
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "kan inte stänga skriven %s-fil \"%s\""
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1502
 msgid "error while closing pack file"
 msgstr "fel vid stängning av paketfil"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1516
 msgid "cannot store pack file"
 msgstr "kan inte spara paketfil"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1524
 msgid "cannot store index file"
 msgstr "kan inte spara indexfil"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "felaktig pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1649
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "Kan inte öppna befintlig paketfil \"%s\""
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1651
 #, 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:1643
+#: builtin/index-pack.c:1699
 #, 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:1650
+#: builtin/index-pack.c:1706
 #, 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:1689
+#: builtin/index-pack.c:1748
 msgid "Cannot come back to cwd"
 msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: 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 "felaktig %s"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1831 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:1850
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin kan inte användas med --stdin"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1852
 msgid "--stdin requires a git repository"
 msgstr "--stdin kräver ett git-arkiv"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format kan inte användas med --stdin"
+
+#: builtin/index-pack.c:1869
 msgid "--verify with no packfile name given"
 msgstr "--verify angavs utan paketfilnamn"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "fsck-fel i packat objekt"
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "kan inte ta status på mallen \"%s\""
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "kan inte öppna katalogen (opendir) \"%s\""
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "kan inte läsa länk (readlink) \"%s\""
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "kan inte skapa symbolisk länk \"%s\" \"%s\""
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "kan inte kopiera \"%s\" till \"%s\""
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "ignorerar mallen %s"
 
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "mallarna hittades inte i %s"
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "kopierade inte mallar från \"%s\": %s"
 
-#: builtin/init-db.c:334
+#: 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:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "kan inte hantera filtyp %d"
 
-#: builtin/init-db.c:337
+#: 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:354 builtin/init-db.c:357
+#: 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:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s finns redan"
 
-#: builtin/init-db.c:413
+#: 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: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:414
+#: 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:418
+#: 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:419
+#: 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:468
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -14243,25 +16682,41 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<mallkatalog>] [--"
 "shared[=<behörigheter>]] [<katalog>]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "behörigheter"
 
-#: builtin/init-db.c:492
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
-msgstr "ange att git-arkivet skall delas bland flera användare"
+msgstr "ange att git-arkivet ska delas bland flera användare"
+
+#: builtin/init-db.c:551
+msgid "override the name of the initial branch"
+msgstr "överstyr namnet på första gren"
+
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "hash"
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir och --bare är ömsesidigt uteslutande"
 
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: 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:538
+#: 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:559
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -14270,11 +16725,15 @@ msgstr ""
 "%s (eller --work-tree=<katalog>) inte tillåtet utan att ange %s (eller --git-"
 "dir=<katalog>)"
 
-#: builtin/init-db.c:587
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "Kan inte komma åt arbetskatalogen \"%s\""
 
+#: builtin/init-db.c:684
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir är inkompatibelt med naket arkiv"
+
 #: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -14293,7 +16752,7 @@ msgstr "ta bort tomma släprader"
 
 #: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
-msgstr "var nya släprader skall placeras"
+msgstr "var nya släprader ska placeras"
 
 #: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
@@ -14323,10 +16782,6 @@ msgstr "välj tolkningsalternativ"
 msgid "do not treat --- specially"
 msgstr "tolka inte --- speciellt"
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "släprad"
-
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "släprad(er) att lägga till"
@@ -14339,121 +16794,130 @@ msgstr "--trailer med --only-input ger ingen mening"
 msgid "no input file given for in-place editing"
 msgstr "ingen indatafil angiven för redigering på plats"
 
-#: builtin/log.c:55
+#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [<flaggor>] <objekt>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "ogiltig flagga för --decorate: %s"
 
-#: builtin/log.c:173
+#: builtin/log.c:180
 msgid "show source"
 msgstr "visa källkod"
 
-#: builtin/log.c:174
-msgid "Use mail map file"
-msgstr "Använd e-postmappningsfil"
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "använd e-postmappningsfil"
 
-#: builtin/log.c:176
+#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr "dekorera endast referenser som motsvarar <mönster>"
 
-#: builtin/log.c:178
+#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr "dekorera inte referenser som motsvarar <mönster>"
 
-#: builtin/log.c:179
+#: builtin/log.c:187
 msgid "decorate options"
 msgstr "dekoreringsflaggor"
 
-#: builtin/log.c:182
-msgid "Process line range n,m in file, counting from 1"
-msgstr "Behandla radintervallet n,m i filen, med början på 1"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"spåra utvecklingen av radintervallet <start>,<slut> eller funktionen :"
+"<funknamn> i <fil>"
+
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<intervall>:<fil> kan inte användas med sökvägsspecifikation"
 
-#: builtin/log.c:280
+#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Slututdata: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: felaktig fil"
 
-#: builtin/log.c:549 builtin/log.c:644
+#: builtin/log.c:586 builtin/log.c:676
 #, c-format
 msgid "could not read object %s"
 msgstr "kunde inte läsa objektet %s"
 
-#: builtin/log.c:669
+#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr "okänd typ: %d"
 
-#: builtin/log.c:792
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: ogiltigt omslag från beskrivningsläge"
+
+#: builtin/log.c:853
 msgid "format.headers without value"
 msgstr "format.headers utan värde"
 
-#: builtin/log.c:909
-msgid "name of output directory is too long"
-msgstr "namnet på utdatakatalogen är för långt"
-
-#: builtin/log.c:925
+#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "kan inte öppna patchfilen %s"
 
-#: builtin/log.c:942
+#: builtin/log.c:999
 msgid "need exactly one range"
 msgstr "behöver precis ett intervall"
 
-#: builtin/log.c:952
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr "inte ett intervall"
 
-#: builtin/log.c:1075
+#: builtin/log.c:1173
 msgid "cover letter needs email format"
 msgstr "omslagsbrevet behöver e-postformat"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
 msgstr "misslyckades skapa fil för omslagsbrev"
 
-#: builtin/log.c:1160
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "tokigt in-reply-to: %s"
 
-#: builtin/log.c:1187
+#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
 
-#: builtin/log.c:1245
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "två utdatakataloger?"
 
-#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
 #, c-format
 msgid "unknown commit %s"
 msgstr "okänd incheckning %s"
 
-#: builtin/log.c:1366 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 "misslyckades slå upp \"%s\" som en giltig referens"
 
-#: builtin/log.c:1371
+#: builtin/log.c:1522
 msgid "could not find exact merge base"
 msgstr "kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1375
+#: 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"
@@ -14463,376 +16927,401 @@ 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:1395
+#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr "kunde inte hitta exakt sammanslagningsbas"
 
-#: builtin/log.c:1406
+#: builtin/log.c:1572
 msgid "base commit should be the ancestor of revision list"
 msgstr "basincheckningen bör vara förfader till revisionslistan"
 
-#: builtin/log.c:1410
+#: builtin/log.c:1582
 msgid "base commit shouldn't be in revision list"
 msgstr "basincheckningen bör inte vara i revisionslistan"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr "kan inte hämta patch-id"
 
-#: builtin/log.c:1515
-msgid "failed to infer range-diff ranges"
-msgstr "misslyckades räkna ut intervall range-diff"
+#: builtin/log.c:1703
+msgid "failed to infer range-diff origin of current series"
+msgstr "misslyckades räkna ut intervalldiff-ursprung för aktuell serie"
 
-#: builtin/log.c:1560
+#: builtin/log.c:1705
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "använd \"%s\" som intervalldiff-ursprung för aktuell serie"
+
+#: builtin/log.c:1749
 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:1563
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr "använd [PATCH] även för flera patchar"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "skriv patcharna på standard ut"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr "generera ett följebrev"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1760
 msgid "use simple number sequence for output file names"
 msgstr "använd enkel nummersekvens för utdatafilnamn"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1573
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr "använd <sfx> istället för \".patch\""
 
-#: builtin/log.c:1575
+#: builtin/log.c:1764
 msgid "start numbering patches at <n> instead of 1"
 msgstr "börja numrera patchar på <n> istället för 1"
 
-#: builtin/log.c:1577
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "antal iterationer"
+
+#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr "markera serien som N:te försök"
 
-#: builtin/log.c:1579
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Använd  [RFC PATCH] istället för [PATCH]"
+#: builtin/log.c:1768
+msgid "max length of output filename"
+msgstr "maximal längd för utdatafilnamn"
 
-#: builtin/log.c:1582
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Använd [<prefix>] istället för [PATCH]"
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "använd [RFC PATCH] istället för [PATCH]"
+
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr "cover-from-description-läge"
+
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "skapa delar av omslagsbrevet baserat på grenbeskrivelsen"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "använd [<prefix>] istället för [PATCH]"
+
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "spara filerna i <katalog>"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr "ta inte bort eller lägg till [PATCH]"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1785
 msgid "don't output binary diffs"
 msgstr "skriv inte binära diffar"
 
-#: builtin/log.c:1593
+#: builtin/log.c:1787
 msgid "output all-zero hash in From header"
 msgstr "använd hashvärde med nollor i From-huvud"
 
-#: builtin/log.c:1595
+#: builtin/log.c:1789
 msgid "don't include a patch matching a commit upstream"
 msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1791
 msgid "show patch format instead of default (patch + stat)"
 msgstr "visa patchformat istället för standard (patch + stat)"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1793
 msgid "Messaging"
 msgstr "E-post"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1794
 msgid "header"
 msgstr "huvud"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "lägg till e-posthuvud"
 
-#: builtin/log.c:1602 builtin/log.c:1604
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "epost"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "lägg till mottagarhuvud (\"To:\")"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "lägg till kopiehuvud (\"Cc:\")"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "ident"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1799
 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:1609
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "meddelande-id"
 
-#: builtin/log.c:1610
+#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr "gör det första brevet ett svar till <meddelande-id>"
 
-#: builtin/log.c:1611 builtin/log.c:1614
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "gräns"
 
-#: builtin/log.c:1612
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "bifoga patchen"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "gör patchen ett inline-objekt"
 
-#: builtin/log.c:1619
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr "aktivera brevtrådning, typer: shallow, deep"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "signatur"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "lägg till signatur"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "basincheckning"
 
-#: builtin/log.c:1624
+#: builtin/log.c:1816
 msgid "add prerequisite tree info to the patch series"
 msgstr "lägg till förhandskrävd trädinfo i patchserien"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "lägg till signatur från fil"
 
-#: builtin/log.c:1627
+#: builtin/log.c:1820
 msgid "don't print the patch filenames"
 msgstr "visa inte filnamn för patchar"
 
-#: builtin/log.c:1629
+#: builtin/log.c:1822
 msgid "show progress while generating patches"
 msgstr "visa förloppsindikator medan patchar skapas"
 
-#: builtin/log.c:1631
+#: builtin/log.c:1824
 msgid "show changes against <rev> in cover letter or single patch"
 msgstr "visa ändringar mot <rev> i omslagsbrev eller ensam patch"
 
-#: builtin/log.c:1634
+#: builtin/log.c:1827
 msgid "show changes against <refspec> in cover letter or single patch"
 msgstr "visa ändringar mot <refspec> i omslagsbrev eller ensam patch"
 
-#: builtin/log.c:1636
+#: builtin/log.c:1829 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "procent som skapelse vägs med"
 
-#: builtin/log.c:1711
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "ogiltig ident-rad: %s"
 
-#: builtin/log.c:1726
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
 msgstr "-n och -k kan inte användas samtidigt"
 
-#: builtin/log.c:1728
+#: builtin/log.c:1933
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
 msgstr "kan inte använda --name-only"
 
-#: builtin/log.c:1738
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
 msgstr "kan inte använda --name-status"
 
-#: builtin/log.c:1740
+#: builtin/log.c:1945
 msgid "--check does not make sense"
 msgstr "kan inte använda --check"
 
-#: builtin/log.c:1773
-msgid "standard output, or directory, which one?"
-msgstr "standard ut, eller katalog, vilken skall det vara?"
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout, --output, och --output-directory är ömsesidigt uteslutande"
 
-#: builtin/log.c:1877
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff kräver --cover-letter eller ensam patch"
 
-#: builtin/log.c:1881
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:1882
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff mot v%d:"
 
-#: builtin/log.c:1888
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor kräver --range-diff"
 
-#: builtin/log.c:1892
+#: builtin/log.c:2104
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff kräver --cover-letter eller ensam patch"
 
-#: builtin/log.c:1900
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr "Intervall-diff:"
 
-#: builtin/log.c:1901
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Intervall-diff mot v%d:"
 
-#: builtin/log.c:1912
+#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "kunde inte läsa signaturfil \"%s\""
 
-#: builtin/log.c:1948
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "Skapar patchar"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2204
 msgid "failed to create output files"
 msgstr "misslyckades skapa utdatafiler"
 
-#: builtin/log.c:2051
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2317
 #, 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:470
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<flaggor>] [<fil>...]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:619
 msgid "identify the file status with tags"
 msgstr "identifiera filstatus med taggar"
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:621
 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:530
+#: builtin/ls-files.c:623
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "använd små bokstäver för \"fsmonitor clean\"-filer"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:625
 msgid "show cached files in the output (default)"
 msgstr "visa cachade filer i utdata (standard)"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:627
 msgid "show deleted files in the output"
 msgstr "visa borttagna filer i utdata"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:629
 msgid "show modified files in the output"
 msgstr "visa modifierade filer i utdata"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:631
 msgid "show other files in the output"
 msgstr "visa andra filer i utdata"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:633
 msgid "show ignored files in the output"
 msgstr "visa ignorerade filer i utdata"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:636
 msgid "show staged contents' object name in the output"
 msgstr "visa köat innehålls objektnamn i utdata"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:638
 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:547
+#: builtin/ls-files.c:640
 msgid "show 'other' directories' names only"
 msgstr "visa endast namn för \"andra\" kataloger"
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:642
 msgid "show line endings of files"
 msgstr "visa radslut i filer"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:644
 msgid "don't show empty directories"
 msgstr "visa inte tomma kataloger"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:647
 msgid "show unmerged files in the output"
 msgstr "visa ej sammanslagna filer i utdata"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr "visa \"resolve-undo\"-information"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:651
 msgid "skip files matching pattern"
 msgstr "hoppa över filer som motsvarar mönster"
 
-#: builtin/ls-files.c:561
+#: 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:564
+#: builtin/ls-files.c:657
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
 
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
 msgstr "lägg till git:s standardexkluderingar"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:663
 msgid "make the output relative to the project top directory"
 msgstr "gör utdata relativ till projektets toppkatalog"
 
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:668
 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:576
+#: builtin/ls-files.c:669
 msgid "tree-ish"
 msgstr "träd-igt"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:670
 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:579
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr "visa felsökningsutdata"
 
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+msgstr "undertyck dublettposter"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -14843,39 +17332,39 @@ msgstr ""
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<arkiv> [<referenser>...]]"
 
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "visa inte fjärr-URL"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
+#: 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 "sökväg till git-upload-pack på fjärren"
 
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "begränsa till taggar"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "begränsa till huvuden"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "visa inte avskalade taggar"
 
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "ta hänsyn till url.<bas>.insteadOf"
 
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "avsluta med felkod 2 om motsvarande referenser inte hittas"
 
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "visa underliggande referens och objektet det pekar på"
 
@@ -14915,197 +17404,349 @@ msgstr "använd fullständiga sökvägsnamn"
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "visa hela trädet; inte bara aktuell katalog (implicerar --full-name)"
 
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<flaggor>] <meddelande> <patch> < epost >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "behåll ärenderad"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr "behåll hakparanterser som inte är \"patch\" i ärenderaden"
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+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.commitEncoding"
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr "inaktivera omkodning av metadata"
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr "teckenkodning"
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr "omkoda metadata till denna teckenkodning"
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr "använd saxar"
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr "<åtgärd>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "åtgärd när citerad vagnretur hittas"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "använd huvuden i brevkroppen"
+
 #: builtin/mailsplit.c:241
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "tom mbox: \"%s\""
 
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<flaggor>] [<incheckning>...]"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..."
 
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <incheckning>..."
 
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <incheckning>..."
 
-#: builtin/merge.c:118
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <incheckning> <incheckning>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <ref> [<incheckning>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "skriv ut alla gemensamma anfäder"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "hitta anfader för enkel n-vägssammanslagning"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "visa revisioner som inte kan nås från andra"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "är den första anfader till den andra?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "se var <incheckning> grenades av från referensloggen från <ref>"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> "
+"<origfil> <fil2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "sänd resultat till standard ut"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "använd diff3-baserad sammanslagning"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "för konflikter, använd vår version"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "för konflikter, använd deras version"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "för konflikter, använd en förenad version"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "för konflikter, använd denna markörstorlek"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "varna inte om konflikter"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "sätt etiketter för fil1/origfil/fil2"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "okänd flagga %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "kunde inte tolka objektet \"%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] "kan inte hantera mer än %d bas. Ignorerar %s."
+msgstr[1] "kan inte hantera mer än %d baser. Ignorerar %s."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "hanterar inte något annat än en sammanslagning av två huvuden."
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "kunde inte bestämma referensen \"%s\""
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Slår ihop %s med %s\n"
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<flaggor>] [<incheckning>...]"
+
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
 msgstr "flaggan \"m\" behöver ett värde"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:146
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "flaggan \"%s\" behöver ett värde"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:199
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr "Tillgängliga strategier är:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:205
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "Tillgängliga skräddarsydda strategier är:"
 
-#: builtin/merge.c:244 builtin/pull.c:152
+#: builtin/merge.c:256 builtin/pull.c:133
 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:247 builtin/pull.c:155
+#: builtin/merge.c:259 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr "visa en diffstat när sammanslagningen är färdig"
 
-#: builtin/merge.c:248 builtin/pull.c:158
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(synonym till --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:262 builtin/pull.c:142
 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:253 builtin/pull.c:167
+#: builtin/merge.c:265 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr "skapa en ensam incheckning istället för en sammanslagning"
 
-#: builtin/merge.c:255 builtin/pull.c:170
+#: builtin/merge.c:267 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
 
-#: builtin/merge.c:257 builtin/pull.c:173
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "redigera meddelande innan incheckning"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
 msgstr "tillåt snabbspolning (standard)"
 
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:273 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "avbryt om snabbspolning inte är möjlig"
 
-#: builtin/merge.c:265 builtin/pull.c:183
+#: builtin/merge.c:277 builtin/pull.c:164
 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:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:493 builtin/rebase.c:1501 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 "strategi"
 
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "sammanslagningsstrategi att använda"
 
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr "alternativ=värde"
 
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "alternativ för vald sammanslagningsstrategi"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:283
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:290
 msgid "abort the current in-progress merge"
 msgstr "avbryt den pågående sammanslagningen"
 
-#: builtin/merge.c:280
+#: builtin/merge.c:292
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort men lämna index och arbetskatalog ensamma"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:294
 msgid "continue the current in-progress merge"
 msgstr "fortsätt den pågående sammanslagningen"
 
-#: builtin/merge.c:284 builtin/pull.c:199
+#: builtin/merge.c:296 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "tillåt sammanslagning av orelaterade historier"
 
-#: builtin/merge.c:290
+#: builtin/merge.c:303
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "förbigå pre-merge-commit- och commit-msg-krokar"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:320
 msgid "could not run stash."
 msgstr "kunde köra stash."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:325
 msgid "stash failed"
 msgstr "stash misslyckades"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:330
 #, c-format
 msgid "not a valid object: %s"
 msgstr "inte ett giltigt objekt: %s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr "read-tree misslyckades"
 
-#: builtin/merge.c:386
-msgid " (nothing to squash)"
-msgstr " (inget att platta till)"
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
+msgstr "Redan à jour. (inget att platta till)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:464
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "\"%s\" verkar inte peka på en incheckning"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
 
-#: builtin/merge.c:705
+#: builtin/merge.c:729
 msgid "Not handling anything other than two heads merge."
 msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
 
-#: builtin/merge.c:719
+#: builtin/merge.c:742
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Felaktig flagga för merge-recursive: -X%s"
 
-#: builtin/merge.c:734
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "kunde inte skriva %s"
 
-#: builtin/merge.c:786
+#: builtin/merge.c:813
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Kunde inte läsa från \"%s\""
 
-#: builtin/merge.c:795
+#: builtin/merge.c:822
 #, 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:801
+#: 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"
@@ -15116,11 +17757,11 @@ msgstr ""
 "temagren.\n"
 "\n"
 
-#: builtin/merge.c:806
+#: builtin/merge.c:833
 msgid "An empty message aborts the commit.\n"
 msgstr "Ett tomt meddelande avbryter incheckningen.\n"
 
-#: builtin/merge.c:809
+#: builtin/merge.c:836
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -15129,73 +17770,73 @@ msgstr ""
 "Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
 "avbryter incheckningen.\n"
 
-#: builtin/merge.c:862
+#: builtin/merge.c:889
 msgid "Empty commit message."
 msgstr "Tomt incheckningsmeddelande."
 
-#: builtin/merge.c:877
+#: builtin/merge.c:904
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Underbart.\n"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:965
 #, 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:977
+#: builtin/merge.c:1004
 msgid "No current branch."
 msgstr "Inte på någon gren."
 
-#: builtin/merge.c:979
+#: builtin/merge.c:1006
 msgid "No remote for the current branch."
 msgstr "Ingen fjärr för aktuell gren."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:1008
 msgid "No default upstream defined for the current branch."
 msgstr "Ingen standarduppström angiven för aktuell gren."
 
-#: builtin/merge.c:986
+#: builtin/merge.c:1013
 #, 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:1043
+#: builtin/merge.c:1070
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1173
 #, 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:1180
+#: builtin/merge.c:1207
 msgid "not something we can merge"
 msgstr "inte något vi kan slå ihop"
 
-#: builtin/merge.c:1283
+#: builtin/merge.c:1317
 msgid "--abort expects no arguments"
 msgstr "--abort tar inga argument"
 
-#: builtin/merge.c:1287
+#: builtin/merge.c:1321
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1296
+#: builtin/merge.c:1339
 msgid "--quit expects no arguments"
 msgstr "--quit tar inga argument"
 
-#: builtin/merge.c:1309
+#: builtin/merge.c:1352
 msgid "--continue expects no arguments"
 msgstr "--continue tar inga argument"
 
-#: builtin/merge.c:1313
+#: builtin/merge.c:1356
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
 
-#: builtin/merge.c:1329
+#: builtin/merge.c:1372
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15203,7 +17844,7 @@ msgstr ""
 "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
 "Checka in dina ändringar innan du slår ihop."
 
-#: builtin/merge.c:1336
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15211,211 +17852,133 @@ 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:1339
+#: builtin/merge.c:1382
 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:1353
+#: builtin/merge.c:1396
 msgid "You cannot combine --squash with --no-ff."
 msgstr "Du kan inte kombinera --squash med --no-ff."
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1398
 msgid "You cannot combine --squash with --commit."
 msgstr "Du kan inte kombinera --squash med --commit."
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1414
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
 
-#: builtin/merge.c:1388
+#: builtin/merge.c:1431
 msgid "Squash commit into empty head not supported yet"
 msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1433
 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:1395
+#: builtin/merge.c:1438
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - inte något vi kan slå ihop"
 
-#: builtin/merge.c:1397
+#: builtin/merge.c:1440
 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:1476
+#: builtin/merge.c:1521
 msgid "refusing to merge unrelated histories"
 msgstr "vägrar slå samman orelaterad historik"
 
-#: builtin/merge.c:1485
-msgid "Already up to date."
-msgstr "Redan à jour."
-
-#: builtin/merge.c:1495
+#: builtin/merge.c:1540
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "Uppdaterar %s..%s\n"
 
-#: builtin/merge.c:1537
+#: builtin/merge.c:1587
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
 
-#: builtin/merge.c:1544
+#: builtin/merge.c:1594
 #, c-format
 msgid "Nope.\n"
 msgstr "Nej.\n"
 
-#: builtin/merge.c:1569
-msgid "Already up to date. Yeeah!"
-msgstr "Redan à jour. Toppen!"
-
-#: builtin/merge.c:1575
+#: builtin/merge.c:1625
 msgid "Not possible to fast-forward, aborting."
 msgstr "Kan inte snabbspola, avbryter."
 
-#: builtin/merge.c:1598 builtin/merge.c:1663
+#: builtin/merge.c:1653 builtin/merge.c:1719
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "Återspolar trädet till orört...\n"
 
-#: builtin/merge.c:1602
+#: builtin/merge.c:1657
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "Försöker sammanslagningsstrategin %s...\n"
 
-#: builtin/merge.c:1654
+#: builtin/merge.c:1709
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
 
-#: builtin/merge.c:1656
+#: builtin/merge.c:1711
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "Sammanslagning med strategin %s misslyckades.\n"
 
-#: builtin/merge.c:1665
+#: builtin/merge.c:1721
 #, 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:1677
+#: builtin/merge.c:1735
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Automatisk sammanslagning lyckades; stoppar före incheckning som önskat\n"
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <incheckning> <incheckning>..."
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <incheckning>..."
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <incheckning>..."
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <incheckning> <incheckning>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <ref> [<incheckning>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "skriv ut alla gemensamma anfäder"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "hitta anfader för enkel n-vägssammanslagning"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "visa revisioner som inte kan nås från andra"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "är den första anfader till den andra?"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "se var <incheckning> grenades av från referensloggen från <ref>"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-"git merge-file [<alternativ>] [-L <namn1> [-L <orig> [-L <namn2>]]] <fil1> "
-"<origfil> <fil2>"
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
 
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr "sänd resultat till standard ut"
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "använd diff3-baserad sammanslagning"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "för konflikter, använd vår version"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "för konflikter, använd deras version"
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr "för konflikter, använd en förenad version"
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr "för konflikter, använd denna markörstorlek"
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "varna inte om konflikter"
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "varning: taggindata godkänns inte av fsck: %s"
 
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "sätt etiketter för fil1/origfil/fil2"
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "fel: taggindata godkänns inte av fsck: %s"
 
-#: builtin/merge-recursive.c:47
+#: builtin/mktag.c:41
 #, c-format
-msgid "unknown option %s"
-msgstr "okänd flagga %s"
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) skulle aldrig utlösa detta återanrop"
 
-#: builtin/merge-recursive.c:53
+#: builtin/mktag.c:56
 #, c-format
-msgid "could not parse object '%s'"
-msgstr "kunde inte tolka objektet \"%s\""
+msgid "could not read tagged object '%s'"
+msgstr "kunde inte läsa det taggade objektet \"%s\""
 
-#: builtin/merge-recursive.c:57
+#: builtin/mktag.c:59
 #, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "kan inte hantera mer än %d bas. Ignorerar %s."
-msgstr[1] "kan inte hantera mer än %d baser. Ignorerar %s."
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "objektet \"%s\" taggat som \"%s\", men är av typen \"%s\""
 
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr "hanterar inte något annat än en sammanslagning av två huvuden."
+#: builtin/mktag.c:97
+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/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "kunde inte bestämma referensen \"%s\""
+#: builtin/mktag.c:100
+msgid "tag on stdin did not refer to a valid object"
+msgstr "taggen på stdin pekar inte på ett giltigt objekt"
 
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "Slår ihop %s med %s\n"
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "kunde inte skriva tagg-filen"
 
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
@@ -15433,35 +17996,43 @@ msgstr "tillåt saknade objekt"
 msgid "allow creation of more than one tree"
 msgstr "tillåt skapa mer än ett träd"
 
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
-msgstr ""
-"git multi-pack-index [--object-dir=<kat>] (write|verify|expire|repack --"
-"batch-size=<storlek>)"
+#: 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>]"
+
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<flaggor>] verify"
+
+#: builtin/multi-pack-index.c:16
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<flaggor>] expire"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:19
+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
 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:25
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr "föredraget paket"
+
+#: builtin/multi-pack-index.c:70
+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
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
 msgstr ""
 "vid ompackning, samla mindre paketfiler i en bunt som är större än denna "
-"storlekt"
-
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
-msgid "too many arguments"
-msgstr "för många argument"
-
-#: builtin/multi-pack-index.c:52
-msgid "--batch-size option is only for 'repack' subcommand"
-msgstr "flaggan --batch-size används bara i underkommandot \"repack\""
+"storlek"
 
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:179
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "okänt underkommando: %s"
@@ -15493,113 +18064,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:169
+#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "destinationen \"%s\" är ingen katalog"
 
-#: builtin/mv.c:180
+#: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
 
-#: builtin/mv.c:184
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr "felaktig källa"
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 msgid "can not move directory into itself"
 msgstr "kan inte flytta katalog till sig själv"
 
-#: builtin/mv.c:190
+#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr "kan inte flytta katalog över fil"
 
-#: builtin/mv.c:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr "källkatalogen är tom"
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 msgid "not under version control"
 msgstr "inte versionshanterad"
 
 #: builtin/mv.c:227
+msgid "conflicted"
+msgstr "i konflikt"
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "destinationen finns"
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "skriver över \"%s\""
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "Kan inte skriva över"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr "flera källor för samma mål"
 
-#: builtin/mv.c:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "destinationskatalogen finns inte"
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, källa=%s, mål=%s"
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "Byter namn på %s till %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "misslyckades byta namn på \"%s\""
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<flaggor>] <incheckning>..."
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<flaggor>] --all"
 
-#: builtin/name-rev.c:358
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<flaggor>] --stdin"
 
-#: builtin/name-rev.c:415
-msgid "print only names (no SHA-1)"
-msgstr "skriv endast namn (ingen SHA-1)"
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr "skriv endast referensbaserade namn (inga objektnamn)"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "använd endast taggar för att namnge incheckningar"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "använd endast referenser som motsvarar <mönster>"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "ignorera referenser som motsvarar <mönster>"
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "lista alla incheckningar som kan nås alla referenser"
 
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "läs från standard in"
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "tillåt att skriva \"odefinierade\" namn (standard)"
 
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "avreferera taggar i indata (används internt)"
 
@@ -15746,7 +18321,7 @@ msgstr "kunde inte skriva anteckningsobjekt"
 msgid "the note contents have been left in %s"
 msgstr "anteckningens innehåll har lämnats kvar i %s"
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:576
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "kunde inte öppna eller läsa \"%s\""
@@ -15789,8 +18364,9 @@ 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
-msgid "too many parameters"
-msgstr "för många parametrar"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
+msgstr "för många argument"
 
 #: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
@@ -15849,8 +18425,8 @@ msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
 
 #: builtin/notes.c:517
-msgid "too few parameters"
-msgstr "för få parametrar"
+msgid "too few arguments"
+msgstr "för få argument"
 
 #: builtin/notes.c:538
 #, c-format
@@ -15980,7 +18556,7 @@ 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:545
+#: builtin/notes.c:897 builtin/tag.c:589
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
@@ -15998,7 +18574,7 @@ msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel"
 msgid "read object names from the standard input"
 msgstr "läs objektnamn från standard in"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "ta inte bort, bara visa"
 
@@ -16014,142 +18590,159 @@ msgstr "anteckningar-ref"
 msgid "use notes from <notes-ref>"
 msgstr "använd anteckningar från <anteckningsref>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1735
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "okänt underkommando: %s"
 
-#: builtin/pack-objects.c:52
+#: 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:53
+#: 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:428
+#: 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: kunde inte hitta %s, förväntat på position %<PRIuMAX> i "
+"paketet %s"
+
+#: 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:439
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "trasigt packat objekt för %s"
 
-#: builtin/pack-objects.c:570
+#: 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:781
+#: 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:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "packfil är ogiltig: %s"
-
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:1036
 #, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "kan inte öppna packfil för återanvändning: %s"
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "förväntade objekt på position %<PRIuMAX> i paketet %s"
 
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "kan inte söka i återanvänd packfil"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "kan inte läsa från återanvänd packfil"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:1155
 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:854
+#: builtin/pack-objects.c:1168
 msgid "Writing objects"
 msgstr "Skriver objekt"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "misslyckades ta status på %s"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1281
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "skrev %<PRIu32> objekt medan %<PRIu32> förväntades"
 
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1523
 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:1592
+#: builtin/pack-objects.c:1971
 #, 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:1601
+#: builtin/pack-objects.c:1980
 #, 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:1870
+#: builtin/pack-objects.c:2261
 msgid "Counting objects"
 msgstr "Räknar objekt"
 
-#: builtin/pack-objects.c:2000
-#, c-format
-msgid "unable to get size of %s"
-msgstr "kan inte hämta storlek på %s"
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c:2426
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "kunde inte tolka objekthuvud för %s"
 
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
 #, c-format
 msgid "object %s cannot be read"
 msgstr "objektet %s kunde inte läsas"
 
-#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
 #, 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:2125
+#: builtin/pack-objects.c:2536
 msgid "suboptimal pack - out of memory"
 msgstr "icke-optimalt pack - minnet slut"
 
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2851
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "Deltakomprimering använder upp till %d trådar"
 
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2990
 #, 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:2659
+#: builtin/pack-objects.c:3076
 msgid "Compressing objects"
 msgstr "Komprimerar objekt"
 
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:3082
 msgid "inconsistency with delta count"
 msgstr "deltaräknaren är inkonsekvent"
 
-#: builtin/pack-objects.c:2742
+#: 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 ""
+"värdet på uploadpack.blobpackfileuri måste vara på formen '<objekt-hash> "
+"<paket-hash> <uri>' (fick '%s')"
+
+#: builtin/pack-objects.c:3164
+#, 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:3199
+#, 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:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "kunde inte hitta paketet \"%s\""
+
+#: builtin/pack-objects.c:3378
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16158,7 +18751,7 @@ msgstr ""
 "förväntade kant-objekt-id, fick skräp:\n"
 " %s"
 
-#: builtin/pack-objects.c:2748
+#: builtin/pack-objects.c:3384
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16167,247 +18760,269 @@ msgstr ""
 "förväntade objekt-id, fick skräp:\n"
 " %s"
 
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:3482
 msgid "invalid value for --missing"
 msgstr "ogiltigt värde för --missing"
 
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
 msgid "cannot open pack index"
 msgstr "kan inte öppna paketfilen"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3572
 #, 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:3021
+#: builtin/pack-objects.c:3658
 msgid "unable to force loose object"
 msgstr "kan inte tvinga lösa objekt"
 
-#: builtin/pack-objects.c:3113
+#: builtin/pack-objects.c:3788
 #, c-format
 msgid "not a rev '%s'"
 msgstr "inte en referens \"%s\""
 
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "felaktig revision \"%s\""
 
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3819
 msgid "unable to add recent objects"
 msgstr "kan inte lägga till nya objekt"
 
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3872
 #, c-format
 msgid "unsupported index version %s"
 msgstr "indexversionen %s stöds ej"
 
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3876
 #, c-format
 msgid "bad index version '%s'"
 msgstr "felaktig indexversion \"%s\""
 
-#: builtin/pack-objects.c:3228
-msgid "do not show progress meter"
-msgstr "visa inte förloppsindikator"
-
-#: builtin/pack-objects.c:3230
-msgid "show progress meter"
-msgstr "visa förloppsindikator"
-
-#: builtin/pack-objects.c:3232
-msgid "show progress meter during object writing phase"
-msgstr "visa förloppsindikator under objektskrivningsfasen"
-
-#: builtin/pack-objects.c:3235
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "som --all-progress när förloppsindikatorn visas"
-
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3915
 msgid "<version>[,<offset>]"
 msgstr "<version>[,<offset>]"
 
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3916
 msgid "write the pack index file in the specified idx format version"
 msgstr "skriv paketindexfilen i angiven indexformatversion"
 
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3919
 msgid "maximum size of each output pack file"
 msgstr "maximal storlek på varje utdatapaketfil"
 
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3921
 msgid "ignore borrowed objects from alternate object store"
-msgstr "ignorera lånade objekt från alternativa objektlager"
+msgstr "ignorera lånade objekt från supplerande objektlager"
 
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3923
 msgid "ignore packed objects"
 msgstr "ignorera packade objekt"
 
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3925
 msgid "limit pack window by objects"
 msgstr "begränsa paketfönster efter objekt"
 
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3927
 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:3250
+#: builtin/pack-objects.c:3929
 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:3252
+#: builtin/pack-objects.c:3931
 msgid "reuse existing deltas"
 msgstr "återanvänd befintliga delta"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3933
 msgid "reuse existing objects"
 msgstr "återanvänd befintliga objekt"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3935
 msgid "use OFS_DELTA objects"
 msgstr "använd OFS_DELTA-objekt"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3937
 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:3260
+#: builtin/pack-objects.c:3939
 msgid "do not create an empty pack output"
 msgstr "försök inte skapa tom paketutdata"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3941
 msgid "read revision arguments from standard input"
 msgstr "läs revisionsargument från standard in"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3943
 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:3267
+#: builtin/pack-objects.c:3946
 msgid "include objects reachable from any reference"
 msgstr "inkludera objekt som kan nås från någon referens"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3949
 msgid "include objects referred by reflog entries"
 msgstr "inkludera objekt som refereras från referensloggposter"
 
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3952
 msgid "include objects referred to by the index"
 msgstr "inkludera objekt som refereras från indexet"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr "läs paket från standard in"
+
+#: builtin/pack-objects.c:3957
 msgid "output pack to stdout"
 msgstr "skriv paket på standard ut"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3959
 msgid "include tag objects that refer to objects to be packed"
-msgstr "inkludera taggobjekt som refererar objekt som skall packas"
+msgstr "inkludera taggobjekt som refererar objekt som ska packas"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3961
 msgid "keep unreachable objects"
 msgstr "behåll onåbara objekt"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3963
 msgid "pack loose unreachable objects"
 msgstr "packa lösa onåbara objekt"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3965
 msgid "unpack unreachable objects newer than <time>"
 msgstr "packa upp onåbara objekt nyare än <tid>"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3968
 msgid "use the sparse reachability algorithm"
 msgstr "använd gles-nåbarhetsalgoritmen"
 
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3970
 msgid "create thin packs"
 msgstr "skapa tunna paket"
 
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3972
 msgid "create packs suitable for shallow fetches"
 msgstr "skapa packfiler lämpade för grunda hämtningar"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3974
 msgid "ignore packs that have companion .keep file"
 msgstr "ignorera paket som har tillhörande .keep-fil"
 
-#: builtin/pack-objects.c:3295
+#: builtin/pack-objects.c:3976
 msgid "ignore this pack"
 msgstr "ignorera detta paket"
 
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3978
 msgid "pack compression level"
 msgstr "komprimeringsgrad för paket"
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3980
 msgid "do not hide commits by grafts"
 msgstr "göm inte incheckningar med ympningar (\"grafts\")"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3982
 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:3303
+#: builtin/pack-objects.c:3984
 msgid "write a bitmap index together with the pack index"
 msgstr "använd bitkartindex tillsammans med packindexet"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3988
 msgid "write a bitmap index if possible"
 msgstr "skriv bitkartindex om möjligt"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3992
 msgid "handling for missing objects"
 msgstr "hantering av saknade objekt"
 
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3995
 msgid "do not pack objects in promisor packfiles"
 msgstr "packa inte objekt i kontraktspackfiler"
 
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3997
 msgid "respect islands during delta compression"
 msgstr "respektera öar under deltakomprimering"
 
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr "protokoll"
+
+#: builtin/pack-objects.c:4000
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr ""
+"uteslut redan konfigurerade uploadpack.blobpackfileuri med detta protokoll"
+
+#: builtin/pack-objects.c:4033
 #, 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:3350
+#: builtin/pack-objects.c:4038
 #, 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:3404
+#: builtin/pack-objects.c:4094
 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 skall överföras"
+"--max-pack-size kan inte användas för att bygga ett paket som ska överföras"
 
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:4096
 msgid "minimum pack size limit is 1 MiB"
 msgstr "minsta packstorlek är 1 MiB"
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:4101
 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:3414
+#: builtin/pack-objects.c:4104
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
-msgstr "--keep-unreachable och -unpack-unreachable kan inte användas samtidigt"
+msgstr "--keep-unreachable och --unpack-unreachable kan inte användas samtidigt"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:4110
 msgid "cannot use --filter without --stdout"
 msgstr "kan inte använda --filter utan --stdout"
 
-#: builtin/pack-objects.c:3481
+#: builtin/pack-objects.c:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr "kan inte använda --filter med --stdin-packs"
+
+#: builtin/pack-objects.c:4116
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "kan inte använda intern revisionslista med --stdin-packs"
+
+#: builtin/pack-objects.c:4175
 msgid "Enumerating objects"
 msgstr "Räknar upp objekt"
 
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:4212
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>), "
+"paket-återanvända %<PRIu32>"
+
+#: 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 ""
-"Totalt %<PRIu32> (delta %<PRIu32>), återanvände %<PRIu32> (delta %<PRIu32>)"
+"\"git pack-redundant\" har nominerats för borttagning.\n"
+"Om du fortfarande använder kommandot, lägg till flaggan\n"
+"\"--i-still-use-this\" på kommandoraden och berätta för\n"
+"oss att du fortfarande använder det på e-post till\n"
+"<git@vger.kernel.org>. Tack.\n"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16421,81 +19036,77 @@ msgstr "packa allt"
 msgid "prune loose refs (default)"
 msgstr "ta bort lösa referenser (standard)"
 
-#: builtin/prune-packed.c:9
+#: 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-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "Tar bort duplicerade objekt"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "rapportera borttagna objekt"
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "låt tid gå ut för objekt äldre än <tid>"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "begränsa vandring av objekt utanför kontraktspackfiler."
 
-#: builtin/prune.c:150
+#: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
 msgstr "kan inte rensa i ett \"precious-objekt\"-arkiv"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Felaktigt värde för %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
 
-#: builtin/pull.c:142
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "styrning för rekursiv hämtning av undermoduler"
 
-#: builtin/pull.c:146
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Alternativ gällande sammanslagning"
 
-#: builtin/pull.c:149
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
 
-#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "tillåt snabbspolning"
 
-#: builtin/pull.c:186
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "utför automatiskt stash/stash pop före och efter ombasering"
+#: builtin/pull.c:167 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:202
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Alternativ gällande hämtningar"
 
-#: builtin/pull.c:212
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "tvinga överskrivning av lokal gren"
 
-#: builtin/pull.c:220
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "antal undermoduler som hämtas parallellt"
 
-#: builtin/pull.c:320
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Felaktigt värde för pull.ff: %s"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16503,14 +19114,14 @@ msgstr ""
 "Det finns ingen kandidat för ombasering bland referenserna du precis har "
 "hämtat."
 
-#: builtin/pull.c:439
+#: builtin/pull.c:447
 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:440
+#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16518,7 +19129,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:443
+#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16529,42 +19140,41 @@ 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:448 builtin/rebase.c:1347 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1248
 msgid "You are not currently on a branch."
 msgstr "Du är inte på någon gren för närvarande."
 
-#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
 msgid "Please specify which branch you want to rebase against."
 msgstr "Ange vilken gren du vill ombasera mot."
 
-#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
 msgid "Please specify which branch you want to merge with."
 msgstr "Ange vilken gren du vill slå samman med."
 
-#: builtin/pull.c:453 builtin/pull.c:468
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
 msgstr "Se git-pull(1) för detaljer."
 
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1353 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr "<fjärr>"
 
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "<gren>"
 
-#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1246
 msgid "There is no tracking information for the current branch."
 msgstr "Det finns ingen spårningsinformation för aktuell gren."
 
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: builtin/pull.c:480
 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:477
+#: builtin/pull.c:485
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16573,32 +19183,57 @@ 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:587
+#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr "kunde inte komma åt incheckningen %s"
 
-#: builtin/pull.c:867
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "ignorera --verify-signatures för ombasering"
 
-#: builtin/pull.c:922
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash är endast giltig med --rebase."
-
 #: 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 ""
+"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"
+"\n"
+"  git config pull.rebase false  # sammanslagning (förvald strategi)\n"
+"  git config pull.rebase true   # ombasering\n"
+"  git config pull.ff only       # endast snabbspolning\n"
+"\n"
+"Du kan ersätta \"git config\" med \"git config --global\" för att välja en\n"
+"förvald inställning för alla arkiv. Du kan också ange --rebase, --no-rebase\n"
+"eller --ff-only på kommandoraden för att överstyra det konfigurerade\n"
+"förvalet vid körning.\n"
+
+#: builtin/pull.c:990
 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:934
+#: builtin/pull.c:994
 msgid "pull with rebase"
 msgstr "pull med ombasering"
 
-#: builtin/pull.c:935
+#: builtin/pull.c:995
 msgid "please commit or stash them."
 msgstr "checka in eller använd \"stash\" på dem."
 
-#: builtin/pull.c:960
+#: builtin/pull.c:1020
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16609,7 +19244,7 @@ msgstr ""
 "snabbspolar din arbetskatalog från\n"
 "incheckningen %s."
 
-#: builtin/pull.c:966
+#: builtin/pull.c:1026
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16626,15 +19261,15 @@ msgstr ""
 "$ git reset --hard\n"
 "för att återgå."
 
-#: builtin/pull.c:981
+#: builtin/pull.c:1041
 msgid "Cannot merge multiple branches into empty head."
 msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
 
-#: builtin/pull.c:985
+#: builtin/pull.c:1045
 msgid "Cannot rebase onto multiple branches."
 msgstr "Kan inte ombasera ovanpå flera grenar."
 
-#: builtin/pull.c:992
+#: builtin/pull.c:1065
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
 
@@ -16646,11 +19281,11 @@ msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
 msgid "tag shorthand without <tag>"
 msgstr "taggförkortning utan <tagg>"
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete godtar endast enkla målreferensnamn"
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16659,7 +19294,7 @@ msgstr ""
 "För att välja ett av alternativen permanent, se push.default i \"git help "
 "config\"."
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16684,7 +19319,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16699,7 +19334,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<namn-på-fjärrgren>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16712,12 +19347,19 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: 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:210
+#: 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"
@@ -16726,16 +19368,9 @@ msgid ""
 msgstr ""
 "Du sänder till fjärren \"%s\", som inte är uppströms för den\n"
 "aktuella grenen \"%s\", utan att tala om för mig vad som\n"
-"skall sändas för att uppdatera fjärrgrenen."
-
-#: builtin/push.c:269
-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\"."
+"ska sändas för att uppdatera fjärrgrenen."
 
-#: builtin/push.c:276
+#: 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"
@@ -16747,7 +19382,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:282
+#: 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"
@@ -16759,7 +19394,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:288
+#: 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"
@@ -16773,11 +19408,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:295
+#: 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:298
+#: 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"
@@ -16788,99 +19423,115 @@ msgstr ""
 "pekar på något som inte är en incheckning, utan att använda flaggan\n"
 "\"--force\".\n"
 
-#: builtin/push.c:359
+#: 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 ""
+"Uppdateringar avvisades då änden på den fjärrspårande grenen\n"
+"har uppdaterats sedan senaste utcheckning. Integrera\n"
+"fjärrändringarna lokalt (t.ex \"git pull ....\") innan du\n"
+"tvingar en uppdatering.\n"
+
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "Sänder till %s\n"
 
-#: builtin/push.c:366
+#: 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:541
+#: builtin/push.c:544
 msgid "repository"
 msgstr "arkiv"
 
-#: builtin/push.c:542 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "sänd alla referenser"
 
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "spegla alla referenser"
 
-#: builtin/push.c:545
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "ta bort referenser"
 
-#: builtin/push.c:546
+#: 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:549 builtin/send-pack.c:167
+#: builtin/push.c:552 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "tvinga uppdateringar"
 
-#: builtin/push.c:551 builtin/send-pack.c:181
+#: builtin/push.c:553 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
 msgstr "<refnamn>:<förvänta>"
 
-#: builtin/push.c:552 builtin/send-pack.c:182
+#: builtin/push.c:554 builtin/send-pack.c:205
 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:555
+#: builtin/push.c:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "kräv att fjärruppdateringar har integrerats lokalt"
+
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "styr rekursiv insändning av undermoduler"
 
-#: builtin/push.c:557 builtin/send-pack.c:175
+#: builtin/push.c:561 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "använd tunna paket"
 
-#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr "program för att ta emot paket"
 
-#: builtin/push.c:560
+#: 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:563
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "ta bort lokalt borttagna referenser"
 
-#: builtin/push.c:565
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "förbigå pre-push-krok"
 
-#: builtin/push.c:566
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "sänd in saknade men relevanta taggar"
 
-#: builtin/push.c:569 builtin/send-pack.c:169
+#: builtin/push.c:572 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "GPG-signera insändningen"
 
-#: builtin/push.c:571 builtin/send-pack.c:176
+#: builtin/push.c:574 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
 msgstr "begär atomiska transaktioner på fjärrsidan"
 
-#: builtin/push.c:589
+#: builtin/push.c:592
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete är inkompatibel med --all, --mirror och --tags"
 
-#: builtin/push.c:591
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete kan inte användas utan referenser"
 
-#: builtin/push.c:611
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "felaktigt arkiv \"%s\""
 
-#: builtin/push.c:612
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -16901,61 +19552,73 @@ msgstr ""
 "\n"
 "    git push <namn>\n"
 
-#: builtin/push.c:627
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
 msgstr "--all och --tags är inkompatibla"
 
-#: builtin/push.c:629
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all kan inte kombineras med referensspecifikationer"
 
-#: builtin/push.c:633
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror och --tags är inkompatibla"
 
-#: builtin/push.c:635
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror kan inte kombineras med referensspecifikationer"
 
-#: builtin/push.c:638
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
 msgstr "--all och --mirror är inkompatibla"
 
-#: builtin/push.c:642
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "push-flaggor kan inte innehålla radbrytning"
 
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 "git range-diff [<flaggor>] <gammal-bas>..<gammal-ända> <ny-bas>..<ny-ända>"
 
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<flaggor>] <gammal-bas>..<ny-ända>"
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<flaggor>] <bas> <gammal-ända> <ny-ända>"
 
-#: builtin/range-diff.c:21
-msgid "Percentage by which creation is weighted"
-msgstr "Procent som skapelse vägs med"
-
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "använd enkla diff-färger"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "anteckningar"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "sänds till \"git log\""
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "visa endast utdata för det första intervallet"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "visa endast utdata för det andra intervallet"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
-msgid "no .. in range: '%s'"
-msgstr ".. saknas i intervall: \"%s\""
+msgid "not a commit range: '%s'"
+msgstr "inte ett incheckningsintervall: \"%s\""
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "ensamt argument måste vara symmetriskt intervall"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "behöver två incheckningsintervall"
 
@@ -17037,7 +19700,11 @@ msgstr "felsök unpack-trees"
 msgid "suppress feedback messages"
 msgstr "undertryck återkopplingsmeddelanden"
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Du måste lösa ditt befintliga index först"
+
+#: builtin/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -17045,226 +19712,203 @@ msgstr ""
 "git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas> | --keep-base] "
 "[<uppström> [<gren>]]"
 
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [flaggor] [--exec <kmd>] [--onto <nybas>] --root [<gren>]"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: 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:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "kunde inte skriva \"%s\"."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "inget HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:311
 #, c-format
 msgid "could not create temporary %s"
 msgstr "kunde inte skapa temporär %s"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:317
 msgid "could not mark as interactive"
 msgstr "kunde inte markera som interaktiv"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:370
 msgid "could not generate todo list"
 msgstr "Kunde inte skapa attgöra-lista"
 
-#: builtin/rebase.c:383
+#: builtin/rebase.c:412
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "en basincheckning måste anges med --upstream eller --onto"
 
-#: builtin/rebase.c:438
+#: builtin/rebase.c:481
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<flaggor>]"
 
-#: builtin/rebase.c:450
-msgid "keep empty commits"
-msgstr "behåll tomma incheckningar"
+#: 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:452 builtin/revert.c:128
+#: builtin/rebase.c:498 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "tillåt incheckningar med tomt meddelande"
 
-#: builtin/rebase.c:453
+#: builtin/rebase.c:500
 msgid "rebase merge commits"
 msgstr "ombasera sammanslagningar"
 
-#: builtin/rebase.c:455
+#: builtin/rebase.c:502
 msgid "keep original branch points of cousins"
 msgstr "behåll ursprungliga förgreningspunkter för kusiner"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:504
 msgid "move commits that begin with squash!/fixup!"
 msgstr "flytta incheckningar som inleds med squash!/fixup!"
 
-#: builtin/rebase.c:458
+#: builtin/rebase.c:505
 msgid "sign commits"
 msgstr "signera incheckningar"
 
-#: builtin/rebase.c:460 builtin/rebase.c:1427
+#: 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:462
+#: builtin/rebase.c:509
 msgid "continue rebase"
 msgstr "fortsätt ombasering"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:511
 msgid "skip commit"
 msgstr "hoppa över incheckning"
 
-#: builtin/rebase.c:465
+#: builtin/rebase.c:512
 msgid "edit the todo list"
 msgstr "redigera attgöra-listan"
 
-#: builtin/rebase.c:467
+#: builtin/rebase.c:514
 msgid "show the current patch"
 msgstr "visa nuvarande patch"
 
-#: builtin/rebase.c:470
+#: builtin/rebase.c:517
 msgid "shorten commit ids in the todo list"
 msgstr "förkorta inchecknings-id i todo-listan"
 
-#: builtin/rebase.c:472
+#: builtin/rebase.c:519
 msgid "expand commit ids in the todo list"
 msgstr "utöka inchecknings-id i todo-listan"
 
-#: builtin/rebase.c:474
+#: builtin/rebase.c:521
 msgid "check the todo list"
 msgstr "kontrollera todo-listan"
 
-#: builtin/rebase.c:476
+#: builtin/rebase.c:523
 msgid "rearrange fixup/squash lines"
 msgstr "ordna om fixup-/squash-rader"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:525
 msgid "insert exec commands in todo list"
 msgstr "lägg in exec-kommandon i todo-listan"
 
-#: builtin/rebase.c:479
+#: builtin/rebase.c:526
 msgid "onto"
 msgstr "ovanpå"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict-revision"
 msgstr "restrict-revision"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict revision"
 msgstr "begränsa revision"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:531
 msgid "squash-onto"
 msgstr "squash-onto"
 
-#: builtin/rebase.c:485
+#: builtin/rebase.c:532
 msgid "squash onto"
 msgstr "tryck ihop ovanpå"
 
-#: builtin/rebase.c:487
+#: builtin/rebase.c:534
 msgid "the upstream commit"
 msgstr "uppströmsincheckningen"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head-name"
 msgstr "head-name"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head name"
 msgstr "namn på huvud"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:541
 msgid "rebase strategy"
 msgstr "sammanslagningsstrategi"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:542
 msgid "strategy-opts"
 msgstr "strategy-opts"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:543
 msgid "strategy options"
 msgstr "strategiflaggor"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:544
 msgid "switch-to"
 msgstr "switch-to"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
 msgid "the branch or commit to checkout"
 msgstr "gren eller inchecking att checka ut"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto-name"
 msgstr "onto-name"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto name"
 msgstr "på-namn"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "cmd"
 msgstr "kmd"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "the command to run"
 msgstr "kommando att köra"
 
-#: builtin/rebase.c:503 builtin/rebase.c:1510
+#: 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:519
+#: 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:535
+#: builtin/rebase.c:582
 #, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s kräver en interaktiv ombasering"
+msgid "%s requires the merge backend"
+msgstr "%s kräver \"merge\"-bakändan"
 
-#: builtin/rebase.c:587
+#: builtin/rebase.c:625
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "kunde inte hämta \"onto\": \"%s\""
 
-#: builtin/rebase.c:602
+#: builtin/rebase.c:642
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "ogiltigt orig-head: \"%s\""
 
-#: builtin/rebase.c:627
+#: builtin/rebase.c:667
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "ignorera ogiltigt allow_rerere_autoupdate: \"%s\""
 
-#: builtin/rebase.c:703
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Kunde inte läsa \"%s\""
-
-#: builtin/rebase.c:721
-#, c-format
-msgid "Cannot store %s"
-msgstr "Kan inte spara %s"
-
-#: builtin/rebase.c:828
-msgid "could not determine HEAD revision"
-msgstr "kunde inte bestämma HEAD-revision"
-
-#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
+#: 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"
@@ -17278,7 +19922,7 @@ msgstr ""
 "För att avbryta och återgå till där du var före ombaseringen, kör \"git "
 "rebase --abort\"."
 
-#: builtin/rebase.c:1032
+#: builtin/rebase.c:896
 #, c-format
 msgid ""
 "\n"
@@ -17297,7 +19941,15 @@ msgstr ""
 "\n"
 "Därför kan inte git ombasera dessa."
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1222
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"okänd tom-typ \"%s\"; giltiga värden är \"drop\", \"keep\" och \"ask\"."
+
+#: builtin/rebase.c:1240
 #, c-format
 msgid ""
 "%s\n"
@@ -17314,7 +19966,7 @@ msgstr ""
 "    git rebase '<gren>'\n"
 "\n"
 
-#: builtin/rebase.c:1355
+#: builtin/rebase.c:1256
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17327,170 +19979,182 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<gren> %s\n"
 "\n"
 
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1286
 msgid "exec commands cannot contain newlines"
 msgstr "exec-kommandon kan inte innehålla nyradstecken"
 
-#: builtin/rebase.c:1389
+#: builtin/rebase.c:1290
 msgid "empty exec command"
 msgstr "tomt exec-kommando"
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1319
 msgid "rebase onto given branch instead of upstream"
 msgstr "ombasera mot given grenen istället för uppström"
 
-#: builtin/rebase.c:1420
+#: builtin/rebase.c:1321
 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:1422
+#: builtin/rebase.c:1323
 msgid "allow pre-rebase hook to run"
 msgstr "tillåt pre-rebase-krok att köra"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1325
 msgid "be quiet. implies --no-stat"
 msgstr "var tyst. implicerar --no-stat"
 
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1331
 msgid "do not show diffstat of what changed upstream"
 msgstr "visa inte en diffstat för vad som ändrats uppströms"
 
-#: builtin/rebase.c:1433
-msgid "add a Signed-off-by: line to each commit"
-msgstr "lägg \"Signed-off-by:\"-rad till varje incheckning"
+#: builtin/rebase.c:1334
+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
+msgid "make committer date match author date"
+msgstr "sätt incheckningsdatum till författardatum"
+
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr "ignorera författardatum och använd nuvarande"
 
-#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
-msgid "passed to 'git am'"
-msgstr "sänds till \"git am\""
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr "synonym för --reset-author-date"
 
-#: builtin/rebase.c:1443 builtin/rebase.c:1445
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
 msgid "passed to 'git apply'"
 msgstr "sänds till \"git apply\""
 
-#: builtin/rebase.c:1447 builtin/rebase.c:1450
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr "ignorera ändringar i blanksteg"
+
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "utför cherry-pick på alla incheckningar, även om oändrad"
 
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1354
 msgid "continue"
 msgstr "fortsätt"
 
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1357
 msgid "skip current patch and continue"
 msgstr "hoppa över nuvarande patch och fortsätt"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1359
 msgid "abort and check out the original branch"
 msgstr "avbryt och checka ut ursprungsgrenen"
 
-#: builtin/rebase.c:1460
+#: builtin/rebase.c:1362
 msgid "abort but keep HEAD where it is"
 msgstr "avbryt men behåll HEAD där det är"
 
-#: builtin/rebase.c:1461
+#: builtin/rebase.c:1363
 msgid "edit the todo list during an interactive rebase"
 msgstr "redigera attgöra-listan under interaktiv ombasering."
 
-#: builtin/rebase.c:1464
+#: builtin/rebase.c:1366
 msgid "show the patch file being applied or merged"
 msgstr "visa patchen som tillämpas eller slås samman"
 
-#: builtin/rebase.c:1467
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "använd appliceringstrategier för ombasering"
+
+#: builtin/rebase.c:1373
 msgid "use merging strategies to rebase"
-msgstr "använd sammanslagningsstrategier för sammanslagning"
+msgstr "använd sammanslagningsstrategier för ombasering"
 
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1377
 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:1475
+#: builtin/rebase.c:1381
 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:1479
-msgid "preserve empty commits during rebase"
-msgstr "behåll tomma incheckningar under ombasering"
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
+msgstr "hur incheckningar som blir tomma ska hanteras"
 
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1393
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "flytta incheckningar som börjar med squash!/fixup! under -i"
 
-#: builtin/rebase.c:1487
-msgid "automatically stash/stash pop before and after"
-msgstr "utför automatiskt stash/stash pop före och efter"
-
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1400
 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:1493
+#: builtin/rebase.c:1404
 msgid "allow rebasing commits with empty messages"
 msgstr "tillåt ombasering av incheckningar med tomt meddelande"
 
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1408
 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:1499
+#: builtin/rebase.c:1411
 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:1501
+#: builtin/rebase.c:1413
 msgid "use the given merge strategy"
 msgstr "använd angiven sammanslagningsstrategi"
 
-#: builtin/rebase.c:1503 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
 msgid "option"
 msgstr "alternativ"
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1416
 msgid "pass the argument through to the merge strategy"
 msgstr "sänd flaggan till sammanslagningsstrategin"
 
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1419
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "ombasera alla nåbara incheckningar upp till roten/rötterna"
 
-#: builtin/rebase.c:1524
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"stödet för rebase.useBuiltin har tagits bort!\n"
-"Se posten för det i \"git help config\" för detaljer."
+#: builtin/rebase.c:1424
+msgid "apply all changes, even those already present upstream"
+msgstr "applicera alla ändringar, även de som redan finns uppströms"
 
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1442
 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:1571
+#: 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:1576
+#: builtin/rebase.c:1488
 msgid "cannot combine '--keep-base' with '--onto'"
 msgstr "kan inte kombinera \"--keep-base\" med \"--onto\""
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1490
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr "kan inte kombinera \"--keep-base\" med \"--root\""
 
-#: builtin/rebase.c:1582
+#: builtin/rebase.c:1494
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "kan inte kombinera \"--root\" med \"--fork-point\""
+
+#: builtin/rebase.c:1497
 msgid "No rebase in progress?"
 msgstr "Ingen ombasering pågår?"
 
-#: builtin/rebase.c:1586
+#: builtin/rebase.c:1501
 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:1609
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Kan inte läsa HEAD"
 
-#: builtin/rebase.c:1621
+#: builtin/rebase.c:1536
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17498,16 +20162,16 @@ msgstr ""
 "Du måste redigera alla sammanslagningskonflikter och\n"
 "därefter markera dem som lösta med git add"
 
-#: builtin/rebase.c:1640
+#: builtin/rebase.c:1555
 msgid "could not discard worktree changes"
 msgstr "kunde inte kasta ändringar i arbetskatalogen"
 
-#: builtin/rebase.c:1659
+#: builtin/rebase.c:1574
 #, c-format
 msgid "could not move back to %s"
 msgstr "kunde inte flytta tillbaka till %s"
 
-#: builtin/rebase.c:1704
+#: builtin/rebase.c:1620
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17528,168 +20192,143 @@ msgstr ""
 "och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
 "något av värde där.\n"
 
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1648
 msgid "switch `C' expects a numerical value"
 msgstr "flaggan \"C\" förväntar ett numeriskt värde"
 
-#: builtin/rebase.c:1766
+#: builtin/rebase.c:1690
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Okänt läge: %s"
 
-#: builtin/rebase.c:1788
+#: builtin/rebase.c:1729
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy kräver --merge eller --interactive"
 
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1759
+msgid "cannot combine apply options with merge options"
+msgstr "kan inte kombinera apply-flaggor med merge-flaggor"
+
+#: builtin/rebase.c:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Okänd rebase-bakända: %s"
+
+#: builtin/rebase.c:1802
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec kräver --exec eller --interactive"
 
-#: builtin/rebase.c:1840
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"kan inte kombinera am-flaggor med varken interaktiv- eller "
-"sammanslagningsflaggor"
-
-#: builtin/rebase.c:1859
+#: builtin/rebase.c:1822
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "kan inte kombinera \"--preserve-merges\" med \"--rebase-merges\""
 
-#: builtin/rebase.c:1863
+#: 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:1887
+#: builtin/rebase.c:1850
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "felaktig uppström \"%s\""
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1856
 msgid "Could not create new root commit"
 msgstr "kunde inte skapa ny rotincheckning"
 
-#: builtin/rebase.c:1919
+#: builtin/rebase.c:1882
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "\"%s\": behöver precis en sammanslagningsbas med gren"
 
-#: builtin/rebase.c:1922
+#: builtin/rebase.c:1885
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "\"%s\": behöver precis en sammanslagningsbas"
 
-#: builtin/rebase.c:1930
+#: builtin/rebase.c:1893
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "Pekar inte på en giltig incheckning: \"%s\""
 
-#: builtin/rebase.c:1955
+#: builtin/rebase.c:1921
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "ödesdigert: ingen sådan gren/incheckning: \"%s\""
 
-#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
 #, c-format
 msgid "No such ref: %s"
 msgstr "Ingen sådan referens: %s"
 
-#: builtin/rebase.c:1974
+#: builtin/rebase.c:1940
 msgid "Could not resolve HEAD to a revision"
 msgstr "Kunde inte bestämma HEAD:s incheckning"
 
-#: builtin/rebase.c:2012
-msgid "Cannot autostash"
-msgstr "Kan inte utföra \"autostash\""
-
-#: builtin/rebase.c:2015
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Oväntat svar från stash: \"%s\""
-
-#: builtin/rebase.c:2021
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Kunde inte skapa katalog för \"%s\""
-
-#: builtin/rebase.c:2024
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "Skapade autostash: %s\n"
-
-#: builtin/rebase.c:2027
-msgid "could not reset --hard"
-msgstr "kunde inte utföra \"reset --hard\""
-
-#: builtin/rebase.c:2036
+#: builtin/rebase.c:1961
 msgid "Please commit or stash them."
 msgstr "Checka in eller använd \"stash\" på dem."
 
-#: builtin/rebase.c:2063
-#, c-format
-msgid "could not parse '%s'"
-msgstr "kunde inte tolka \"%s\""
-
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:1997
 #, c-format
 msgid "could not switch to %s"
 msgstr "kunde inte växla till %s"
 
-#: builtin/rebase.c:2087
+#: builtin/rebase.c:2008
 msgid "HEAD is up to date."
 msgstr "HEAD är à jour."
 
-#: builtin/rebase.c:2089
+#: builtin/rebase.c:2010
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "Aktuell gren %s är à jour.\n"
 
-#: builtin/rebase.c:2097
+#: builtin/rebase.c:2018
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD är à jour, ombasering framtvingad."
 
-#: builtin/rebase.c:2099
+#: builtin/rebase.c:2020
 #, 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:2107
+#: builtin/rebase.c:2028
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Kroken pre-rebase vägrade ombaseringen."
 
-#: builtin/rebase.c:2114
+#: builtin/rebase.c:2035
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Ändringar till %s:\n"
 
-#: builtin/rebase.c:2117
+#: builtin/rebase.c:2038
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Ändringar från %s till %s:\n"
 
-#: builtin/rebase.c:2142
+#: builtin/rebase.c:2063
 #, 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:2151
+#: builtin/rebase.c:2072
 msgid "Could not detach HEAD"
 msgstr "Kunde inte koppla från HEAD"
 
-#: builtin/rebase.c:2160
+#: builtin/rebase.c:2081
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Snabbspolade %s till %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <git-katalog>"
 
-#: builtin/receive-pack.c:830
+#: 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"
@@ -17719,7 +20358,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:850
+#: 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"
@@ -17740,11 +20379,11 @@ msgstr ""
 "\n"
 "För att undvika detta meddelande kan du sätta det till \"refuse\"."
 
-#: builtin/receive-pack.c:1936
+#: builtin/receive-pack.c:2478
 msgid "quiet"
 msgstr "tyst"
 
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:2492
 msgid "You must specify a directory."
 msgstr "Du måste ange en katalog."
 
@@ -17770,49 +20409,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <referens>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "\"%s\" är inte en giltig tidsstämpel"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:609
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "Markerar nåbara objekt..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:647
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s pekar ingenstans!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:699
 msgid "no reflog specified to delete"
 msgstr "ingen referenslogg att ta bort angavs"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:708
 #, c-format
 msgid "not a reflog: %s"
 msgstr "inte en referenslogg: %s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:713
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "ingen referenslogg för \"%s\""
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:759
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "felaktigt referensformat: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:768
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -17820,82 +20459,82 @@ msgstr ""
 "git remote add [-t <gren>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <namn> <url>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <gammal> <ny>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <namn>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <namn> (-a | --auto | -d | --delete | <gren>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <namn>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <namn>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<grupp> | <fjärr>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <namn> <gren>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <namn>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <namn> <nyurl> [<gammalurl>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <namn> <nyurl>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <namn> <url>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<flaggor>] <namn> <url>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <namn> <gren>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <namn> <gren>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<flaggor>] <namn>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<flaggor>] <namn>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<flaggor>] [<grupp> | <fjärr>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "Uppdaterar %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -17903,82 +20542,93 @@ msgstr ""
 "--mirror är farlig och föråldrad; använd\n"
 "\t --mirror=fetch eller --mirror=push istället"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "okänt argument till mirror: %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "hämta fjärrgrenarna"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "importera alla taggar och associerade objekt vid hämtning"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "eller hämta inte några taggar alls (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "gren(ar) att spåra"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "huvudgren"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "ställ in arkiv som spegel att sända eller ta emot från"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "att ange en master-gren ger ingen mening med --mirror"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 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:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr "fjärrarkivet %s finns redan."
 
-#: builtin/remote.c:198 builtin/remote.c:640
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
-
-#: builtin/remote.c:238
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Kunde inte skapa master \"%s\""
 
-#: builtin/remote.c:344
+#: builtin/remote.c:355
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "Kunde inte hämta mappning för referensspecifikation %s"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
-msgstr "(matchande)"
+msgstr "(träffande)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:466
 msgid "(delete)"
 msgstr "(ta bort)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "kunde inte ställa in \"%s\""
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Konfigurationen för %s för remote.pushDefault i:\n"
+"\t%s:%d\n"
+"anger nu den icke-existerande fjärren \"%s\""
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Ingen sådan fjärr: \"%s\""
 
-#: builtin/remote.c:646
+#: builtin/remote.c:710
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
 
-#: builtin/remote.c:666
+#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -17989,17 +20639,17 @@ msgstr ""
 "\t%s\n"
 "\tUppdatera konfigurationen manuellt om nödvändigt."
 
-#: builtin/remote.c:702
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "misslyckades ta bort \"%s\""
 
-#: builtin/remote.c:736
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
 msgstr "misslyckades skapa \"%s\""
 
-#: builtin/remote.c:802
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18013,118 +20663,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:816
+#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
 
-#: builtin/remote.c:917
+#: builtin/remote.c:999
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " ny (nästa hämtning sparar i remotes/%s)"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " spårad"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
 #, 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:974
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "ombaseras interaktivt på fjärren %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1058
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "ombaseras interaktivt (med sammanslagningar) på fjärren %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "ombaseras på fjärren %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr " sammanslås med fjärren %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "sammanslås med fjärren %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    och med fjärren %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
 msgid "create"
 msgstr "skapa"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr "ta bort"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "àjour"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
 msgstr "kan snabbspolas"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "lokal föråldrad"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s tvingar till %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s sänder till %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s tvingar till %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s sänder till %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr "fråga inte fjärrar"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "* fjärr %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  Hämt-URL: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr "(ingen URL)"
 
@@ -18132,193 +20782,184 @@ msgstr "(ingen URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  Sänd-URL: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD-gren: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr "(inte förfrågad)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "(okänd)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
 #, 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:1195
+#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  Fjärrgren:%s"
 msgstr[1] "  Fjärrgrenar:%s"
 
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr " (status inte förfrågad)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
 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:1215
+#: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  Lokala referenser speglas av \"git push\""
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1303
 #, 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:1242
+#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "ta bort refs/remotes/<namn>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr "Kan inte bestämma HEAD på fjärren"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
 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:1271
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr "Kunde inte ta bort %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Inte en giltig referens: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr "Kunde inte ställa in %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s kommer bli dinglande!"
 
-#: builtin/remote.c:1300
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s har blivit dinglande!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "Rensar %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [skulle rensa] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [rensad] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr "rensa fjärrar efter hämtning"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Ingen sådan fjärr \"%s\""
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "lägg till gren"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr "ingen fjärr angavs"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
 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:1480
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "returnera alla URL:er"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "ingen URL:er angivna för fjärren \"%s\""
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "manipulera URL:ar för sändning"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "lägg till URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "ta bort URL:ar"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete ger ingen mening"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Felaktig gammalt URL-mönster: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Ingen sådan URL hittades: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
 msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "var pratsam; måste skrivas före ett underkommando"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Okänt underkommando: %s"
-
-#: builtin/repack.c:23
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr "git repack [<flaggor>]"
 
-#: builtin/repack.c:28
+#: builtin/repack.c:31
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18327,134 +20968,143 @@ msgstr ""
 "Använd --no-write-bitmap-index eller inaktivera inställningen\n"
 "pack.writebitmaps"
 
-#: builtin/repack.c:191
+#: builtin/repack.c:198
 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:230 builtin/repack.c:409
+#: builtin/repack.c:270 builtin/repack.c:630
 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:247
+#: builtin/repack.c:294
 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:285
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr "kunde inte öppna indexet för %s"
+
+#: builtin/repack.c:368
+#, 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
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "paketet %s för stort att rulla upp"
+
+#: builtin/repack.c:460
 msgid "pack everything in a single pack"
 msgstr "packa allt i ett enda paket"
 
-#: builtin/repack.c:287
+#: builtin/repack.c:462
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "samma som -a, och gör onåbara objekt lösa"
 
-#: builtin/repack.c:290
+#: builtin/repack.c:465
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "ta bort överflödiga paket, och kör git-prune-packed"
 
-#: builtin/repack.c:292
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "sänd --no-reuse-delta till git-pack-objects"
 
-#: builtin/repack.c:294
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "sänd --no-reuse-object till git-pack-objects"
 
-#: builtin/repack.c:296
+#: builtin/repack.c:471
 msgid "do not run git-update-server-info"
 msgstr "kör inte git-update-server-info"
 
-#: builtin/repack.c:299
+#: builtin/repack.c:474
 msgid "pass --local to git-pack-objects"
 msgstr "sänd --local till git-pack-objects"
 
-#: builtin/repack.c:301
+#: builtin/repack.c:476
 msgid "write bitmap index"
 msgstr "skriv bitkartindex"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:478
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "sänd --delta-islands till git-pack-objects"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:479
 msgid "approxidate"
 msgstr "cirkadatum"
 
-#: builtin/repack.c:305
+#: builtin/repack.c:480
 msgid "with -A, do not loosen objects older than this"
 msgstr "med -A, lös inte upp objekt äldre än detta"
 
-#: builtin/repack.c:307
+#: builtin/repack.c:482
 msgid "with -a, repack unreachable objects"
 msgstr "med -a, packa om onåbara objekt"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:484
 msgid "size of the window used for delta compression"
 msgstr "storlek på fönster använt för deltakomprimering"
 
-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:486
 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:313
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr "begränsa maximalt deltadjup"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:490
 msgid "limits the maximum number of threads"
 msgstr "begränsar maximalt antal trådar"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:492
 msgid "maximum size of each packfile"
 msgstr "maximal storlek på varje paketfil"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:494
 msgid "repack objects in packs marked with .keep"
 msgstr "packa om objekt i paket märkta med .keep"
 
-#: builtin/repack.c:321
+#: builtin/repack.c:496
 msgid "do not repack this pack"
 msgstr "packa inte om detta paket"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr "hitta ett geometrisk förlopp med faktor <N>"
+
+#: builtin/repack.c:508
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "kan inte ta bort paket i ett \"precious-objects\"-arkiv"
 
-#: builtin/repack.c:335
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable och -A kan inte användas samtidigt"
 
-#: builtin/repack.c:418
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric är inkompatibel med -A, -a"
+
+#: builtin/repack.c:639
 msgid "Nothing new to pack."
 msgstr "Inget nytt att packa."
 
-#: builtin/repack.c:479
+#: builtin/repack.c:669
 #, 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 ""
-"VARNING: Namnen på några paket har bytts genom att\n"
-"VARNING: lägga till old- före namnen, för att byta\n"
-"VARNING: dem mot den nya versionen av filen. Men\n"
-"VARNING: operationen misslyckades, och försöket att\n"
-"VARNING: byta tillbaka till det ursprungliga\n"
-"VARNING: namnet misslyckades också.\n"
-"VARNING: Byt namn på dem i %s manuellt:\n"
+msgid "missing required file: %s"
+msgstr "nödvändig fil saknas: %s"
 
-#: builtin/repack.c:527
+#: builtin/repack.c:671
 #, c-format
-msgid "failed to remove '%s'"
-msgstr "misslyckades ta bort \"%s\""
+msgid "could not unlink: %s"
+msgstr "kunde inte ta bort: \"%s\""
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
@@ -18559,8 +21209,8 @@ msgstr "kan inte utföra \"fstat\" på %s"
 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:423
-#: builtin/replace.c:453
+#: 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\""
@@ -18584,17 +21234,17 @@ msgstr "nytt objekt är samma som det gamla: \"%s\""
 msgid "could not parse %s as a commit"
 msgstr "kunde inte tolka %s som incheckning"
 
-#: builtin/replace.c:415
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "felaktig sammanslagningstagg i incheckningen \"%s\""
 
-#: builtin/replace.c:417
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "felformad sammanslagningstagg i incheckningen \"%s\""
 
-#: builtin/replace.c:429
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18603,31 +21253,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:468
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "den ursprungliga incheckningen \"%s\" har en gpg-signatur"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "signaturen kommer att tas bort i ersättningsincheckningen!"
 
-#: builtin/replace.c:479
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "kunde inte skriva ersättningsincheckning för: \"%s\""
 
-#: builtin/replace.c:487
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "ympning för \"%s\" behövs inte"
 
-#: builtin/replace.c:491
+#: builtin/replace.c:492
 #, 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:526
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -18636,71 +21286,71 @@ msgstr ""
 "kunde inte konvertera följande ympning(ar):\n"
 "%s"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "visa ersättningsreferenser"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "ta bort ersättningsreferenser"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "redigera befintligt objekt"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "ändra en inchecknings föräldrar"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "konvertera befintlig ympningsfil"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "ersätt referensen om den finns"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "använd inte snygg visning av innehåll för --edit"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "använd detta format"
 
-#: builtin/replace.c:568
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "--format kan inte användas utanför listning"
 
-#: builtin/replace.c:576
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "-f kan endast användas vid skrivning av ersättning"
 
-#: builtin/replace.c:580
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw kan bara användas med --edit"
 
-#: builtin/replace.c:586
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d behöver minst ett argument"
 
-#: builtin/replace.c:592
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "fel antal argument"
 
-#: builtin/replace.c:598
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e tar exakt ett argument"
 
-#: builtin/replace.c:604
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g tar minst ett argument"
 
-#: builtin/replace.c:610
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file tar inga argument"
 
-#: builtin/replace.c:616
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "endast ett mönster kan anges med -l"
 
@@ -18708,15 +21358,15 @@ 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\""
@@ -18728,119 +21378,125 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
 msgstr "git reset [-q] [<träd-igt>] [--] <sökvägar>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+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
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
 msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "blandad"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "mjuk"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "hård"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "sammanslagning"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "behåll"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "Du har inte en giltig HEAD."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "Kunde inte hitta trädet för HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "Kunde inte hitta trädet för %s."
 
-#: builtin/reset.c:114
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD är nu på %s"
 
-#: builtin/reset.c:193
+#: builtin/reset.c:195
 #, 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:293 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
 msgid "be quiet, only report errors"
 msgstr "var tyst, rapportera endast fel"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "återställ HEAD och index"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "återställ endast HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "återställ HEAD, index och arbetskatalog"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "återställ HEAD men behåll lokala ändringar"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 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:326
+#: builtin/reset.c:344
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
 
-#: builtin/reset.c:334
+#: builtin/reset.c:352
 #, 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:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 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:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "Kan inte göra %s återställning med sökvägar."
 
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, 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:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
 msgstr "-N kan endast användas med --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "Oköade ändringar efter återställning:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:416
 #, c-format
 msgid ""
 "\n"
@@ -18854,48 +21510,60 @@ msgstr ""
 "konfigurationsvariabeln\n"
 "reset.quiet till true för att göra detta till förval.\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
 
-#: builtin/reset.c:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "Kunde inte skriva ny indexfil."
 
-#: builtin/rev-list.c:411
+#: builtin/rev-list.c:541
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "kan inte kombinera --exclude-promisor-objects och --missing"
 
-#: builtin/rev-list.c:472
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "objektfiltrering kräver --objects"
 
-#: builtin/rev-list.c:522
+#: 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:525
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
+#: builtin/rev-list.c:679
+msgid "marked counting is incompatible with --objects"
+msgstr "markerad räkning är inkompatibelt med --objects"
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "behåll \"--\" sänt som argument"
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "sluta tolka efter första argument som inte är flagga"
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "utdata fast i lång form"
 
-#: builtin/rev-parse.c:551
+#: 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"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -18910,6 +21578,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>..."
@@ -18988,19 +21700,19 @@ msgstr "behåll incheckningar som börjar som tomma"
 msgid "keep redundant, empty commits"
 msgstr "behåll redundanta, tomma incheckningar"
 
-#: builtin/revert.c:232
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr "\"revert\" misslyckades"
 
-#: builtin/revert.c:245
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr "\"cherry-pick\" misslyckades"
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<flaggor>] [--] <fil>..."
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -19012,7 +21724,7 @@ msgstr[0] ""
 msgstr[1] ""
 "följande filer har köat innehåll som skiljer sig både från filen och HEAD:"
 
-#: builtin/rm.c:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -19020,13 +21732,13 @@ msgstr ""
 "\n"
 "(använd -f för att tvinga borttagning)"
 
-#: 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] "följande fil har ändringar köade i indexet:"
 msgstr[1] "följande filer har ändringar köade i indexet:"
 
-#: 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)"
@@ -19034,43 +21746,47 @@ msgstr ""
 "\n"
 "(använd --cached för att behålla filen eller -f för att tvinga borttagning)"
 
-#: 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] "följande fil har lokala ändringar:"
 msgstr[1] "följande filer har lokala ändringar:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:244
 msgid "do not list removed files"
 msgstr "lista inte borttagna filer"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr "ta bara bort från indexet"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
 msgstr "överstyr àjour-testet"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr "tillåt rekursiv borttagning"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:249
 msgid "exit with a zero status even if nothing matched"
 msgstr "avsluta med nollstatus även om inget träffades"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:283
+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
 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:307
+#: builtin/rm.c:331
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "tar inte bort \"%s\" rekursivt utan -r"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: kan inte ta bort %s"
@@ -19087,55 +21803,76 @@ msgstr ""
 "[<ref>...]\n"
 "  --all och explicit angiven <ref> är ömsesidigt uteslutande."
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr "fjärrnamn"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "använd tillståndslöst RPC-protokoll"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "läs referenser från standard in"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr "visa status från fjärrhjälpare"
 
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
 
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<flaggor>]"
 
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "Gruppera efter incheckare istället för författare"
+#: 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"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "att använda --group=trailer stöds inte med standard in"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "okänd grupptyp: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "gruppera efter incheckare istället för författare"
 
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "sortera utdata enligt antal incheckningar per författare"
 
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "Undertryck beskrivningar, visa bara antal incheckningar"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "undertryck beskrivningar, visa bara antal incheckningar"
 
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "Visa e-postadress för varje författare"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "visa e-postadress för varje författare"
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr "Radbryt utdata"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "radbryt utdata"
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "föt"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "gruppera efter fält"
+
+#: builtin/shortlog.c:391
 msgid "too many arguments given outside repository"
 msgstr "för många flaggor givna utanför arkivet"
 
@@ -19275,6 +22012,14 @@ msgstr "\"%s\" är inte en giltig referens."
 msgid "cannot find commit %s (%s)"
 msgstr "hittar inte incheckning %s (%s)"
 
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "hashningsalgoritm"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "okänd hashningsalgoritm"
+
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -19319,41 +22064,119 @@ msgstr "visa inte resultat på standard ut (användbart med --verify)"
 msgid "show refs from stdin that aren't in local repository"
 msgstr "visa referenser från standard in som inte finns i lokalt arkiv"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: 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) <flaggor>"
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:72
+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
+msgid "failed to create directory for sparse-checkout file"
+msgstr "misslyckades skapa katalog för \"sparse-checkout\"-filen"
+
+#: builtin/sparse-checkout.c:268
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr "kunde inte uppgradera arkivformat för att aktivera worktreeConfig"
+
+#: builtin/sparse-checkout.c:270
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "misslyckades ändra inställningen extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "initiera sparse-checkout i konläge"
+
+#: builtin/sparse-checkout.c:312
+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
+#, c-format
+msgid "failed to open '%s'"
+msgstr "misslyckades öppna \"%s\""
+
+#: builtin/sparse-checkout.c:413
+#, c-format
+msgid "could not normalize path %s"
+msgstr "kunde inte normalisera sökvägen \"%s\""
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <mönster>)"
+
+#: builtin/sparse-checkout.c:450
+#, 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:504 builtin/sparse-checkout.c:528
+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:573
+msgid "read patterns from standard in"
+msgstr "läs mönster från standard in"
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:607
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:638
+msgid "error while refreshing working directory"
+msgstr "fel vid uppdatering av arbetskatalog"
+
+#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<flaggor>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<flaggor>] [<stash>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
-#: 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] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <grennamn> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28 builtin/stash.c:77
+#: 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"
+"          [--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 <meddelande>]\n"
+"          [--pathspec-from-file=<fil> [--pathspec-file-nul]]\n"
 "          [--] [<sökväg>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: 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>]"
@@ -19361,189 +22184,228 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<meddelande>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <meddelande>] [-q|--quiet] <incheckning>"
 
-#: builtin/stash.c:127
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <meddelande>]\n"
+"          [--] [<sökväg>...]]"
+
+#: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "\"%s\" är inte en \"stash\"-liknande incheckning"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "För många revisioner angivna:%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Inga \"stash\"-poster hittades."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s är inte en giltigt referens"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
-msgstr "\"git stash clear\" med parametrar har inte implementerats"
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
+msgstr "\"git stash clear\" med argument har inte implementerats"
+
+#: 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 ""
+"VARNING: En ospårad fil är i vägen för en spårad fil! Byter namn\n"
+"            %s -> %s\n"
+"         för att lämna plats.\n"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:492
 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:414
+#: builtin/stash.c:503
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "kunde inte skapa diff %s^!."
 
-#: builtin/stash.c:421
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:510
+msgid "conflicts in index. Try without --index."
 msgstr "konflikter i indexet. Testa utan --index."
 
-#: builtin/stash.c:427
+#: builtin/stash.c:516
 msgid "could not save index tree"
 msgstr "kunde inte spara indexträd"
 
-#: builtin/stash.c:436
+#: 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:450
+#: builtin/stash.c:539
 #, c-format
 msgid "Merging %s with %s"
 msgstr "Slår ihop %s med %s"
 
-#: builtin/stash.c:460 git-legacy-stash.sh:680
+#: builtin/stash.c:549
 msgid "Index was not unstashed."
 msgstr "Indexet har inte tagits upp ur \"stash\":en"
 
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:591 builtin/stash.c:689
 msgid "attempt to recreate the index"
 msgstr "försök återskapa indexet"
 
-#: builtin/stash.c:555
+#: builtin/stash.c:635
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "Kastade %s (%s)"
 
-#: builtin/stash.c:558
+#: builtin/stash.c:638
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Kunde inte kasta \"stash\"-post"
 
-#: builtin/stash.c:583
+#: builtin/stash.c:651
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "\"%s\" är inte en \"stash\"-referens"
 
-#: builtin/stash.c:633 git-legacy-stash.sh:694
+#: builtin/stash.c:701
 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:656 git-legacy-stash.sh:712
+#: builtin/stash.c:724
 msgid "No branch name specified"
 msgstr "Inget grennamn angavs"
 
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "misslyckades tolka träd"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "misslyckades packa upp träd"
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr "ta med ospårade filer i \"stash\""
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr "visa bara ospårade filer i \"stash\""
+
+#: builtin/stash.c:929 builtin/stash.c:966
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Kan inte uppdatera %s med %s"
 
-#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
 msgid "stash message"
 msgstr "\"stash\"-meddelande"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:957
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" kräver ett <incheckning>-argument"
 
-#: builtin/stash.c:1046 git-legacy-stash.sh:217
+#: builtin/stash.c:1171
 msgid "No changes selected"
 msgstr "Inga ändringar valda"
 
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1271
 msgid "You do not have the initial commit yet"
 msgstr "Du har inte den första incheckningen ännu"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1298
 msgid "Cannot save the current index state"
 msgstr "Kan inte spara aktuellt tillstånd för indexet"
 
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1307
 msgid "Cannot save the untracked files"
 msgstr "Kan inte spara ospårade filer"
 
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1318 builtin/stash.c:1327
 msgid "Cannot save the current worktree state"
 msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
 
-#: builtin/stash.c:1229 git-legacy-stash.sh:233
+#: builtin/stash.c:1355
 msgid "Cannot record working tree state"
 msgstr "Kan inte registrera tillstånd för arbetskatalog"
 
-#: builtin/stash.c:1278 git-legacy-stash.sh:337
+#: builtin/stash.c:1404
 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:1294
+#: builtin/stash.c:1422
 msgid "Did you forget to 'git add'?"
 msgstr "Glömde du använda \"git add\"?"
 
-#: builtin/stash.c:1309 git-legacy-stash.sh:345
+#: builtin/stash.c:1437
 msgid "No local changes to save"
 msgstr "Inga lokala ändringar att spara"
 
-#: builtin/stash.c:1316 git-legacy-stash.sh:350
+#: builtin/stash.c:1444
 msgid "Cannot initialize stash"
 msgstr "Kan inte initiera \"stash\""
 
-#: builtin/stash.c:1331 git-legacy-stash.sh:354
+#: builtin/stash.c:1459
 msgid "Cannot save the current status"
 msgstr "Kan inte spara aktuell status"
 
-#: builtin/stash.c:1336
+#: builtin/stash.c:1464
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "Sparade arbetskatalogen och indexstatus %s"
 
-#: builtin/stash.c:1426 git-legacy-stash.sh:384
+#: builtin/stash.c:1554
 msgid "Cannot remove worktree changes"
 msgstr "Kan inte ta bort ändringar i arbetskatalogen"
 
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1593 builtin/stash.c:1658
 msgid "keep index"
 msgstr "behåll indexet"
 
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1595 builtin/stash.c:1660
 msgid "stash in patch mode"
 msgstr "\"stash\" i \"patch\"-läge"
 
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1596 builtin/stash.c:1661
 msgid "quiet mode"
 msgstr "tyst läge"
 
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1598 builtin/stash.c:1663
 msgid "include untracked files in stash"
 msgstr "ta med ospårade filer i \"stash\""
 
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1600 builtin/stash.c:1665
 msgid "include ignore files"
 msgstr "ta med ignorerade filer"
 
-#: builtin/stash.c:1564
-#, c-format
-msgid "could not exec %s"
-msgstr "kunde inte köra %s"
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"stödet för stash.useBuiltin har tagits bort!\n"
+"Se posten för det i \"git help config\" för detaljer."
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -19561,40 +22423,41 @@ 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:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "Förväntade fullt referensnamn, fick %s"
 
-#: builtin/submodule--helper.c:62
+#: 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:100
+#: 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:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
 msgid "alternative anchor for relative paths"
 msgstr "alternativa ankare för relativa sökvägar"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:416
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: 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 "Hittade ingen url för undermodulsökvägen \"%s\" i .gitmodules"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:526
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "GÃ¥r in i \"%s\"\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:529
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -19603,7 +22466,7 @@ msgstr ""
 "run_command returnerade icke-nollstatus för %s\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:551
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -19614,19 +22477,20 @@ msgstr ""
 "undermoduler för %s\n"
 "."
 
-#: builtin/submodule--helper.c:563
-msgid "Suppress output of entering each submodule command"
-msgstr "Dölj utdata från för varje undermodulskommando som startas"
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
+msgstr "dölj utdata från för varje undermodulskommando som startas"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
-msgid "Recurse into nested submodules"
-msgstr "Rekursera in i nästlade undermoduler"
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
+msgstr "rekursera in i nästlade undermoduler"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:574
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [--] [<kommando>]"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:601
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -19635,102 +22499,153 @@ msgstr ""
 "kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sin eget "
 "officiella uppström."
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:668
 #, 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:669
+#: builtin/submodule--helper.c:672
 #, 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:679
+#: builtin/submodule--helper.c:682
 #, 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:686
+#: builtin/submodule--helper.c:689
 #, 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:708
-msgid "Suppress output for initializing a submodule"
-msgstr "Dölj utdata från initiering av undermodul"
+#: builtin/submodule--helper.c:711
+msgid "suppress output for initializing a submodule"
+msgstr "dölj utdata från initiering av undermodul"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:716
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<flaggor>] [<sökväg>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, 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:824
+#: builtin/submodule--helper.c:837
 #, 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:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "misslyckades rekursera in i undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
-msgid "Suppress submodule status output"
-msgstr "Hindra statusutskrift för undermodul"
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
+msgstr "hindra statusutskrift för undermodul"
 
-#: builtin/submodule--helper.c:876
+#: 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 ""
-"Visa incheckning från indexet istället för den som lagrats i undermodulens "
+"visa incheckning från indexet istället för den som lagrats i undermodulens "
 "HEAD"
 
-#: builtin/submodule--helper.c:877
-msgid "recurse into nested submodules"
-msgstr "rekursera in i nästlade undermoduler"
-
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <sökväg>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(submodule)"
+
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(submodule)->%s(blob)"
+
+#: builtin/submodule--helper.c:1007
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "kunde inte hasha objekt från \"%s\""
+
+#: builtin/submodule--helper.c:1061
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "okänt läge %o\n"
+
+#: builtin/submodule--helper.c:1302
+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:1304
+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:1306
+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:1308
+msgid "limit the summary size"
+msgstr "begränsa översiktsstorleken"
+
+#: builtin/submodule--helper.c:1313
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr ""
+"git submodule--helper summary [<flaggor>] [<incheckning>] [--] [<sökväg>]"
+
+#: builtin/submodule--helper.c:1337
+msgid "could not fetch a revision for HEAD"
+msgstr "kunde inte hämta en version för HEAD"
+
+#: builtin/submodule--helper.c:1342
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached och --files är ömsesidigt uteslutande"
+
+#: builtin/submodule--helper.c:1409
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "Synkroniserar undermodul-url för \"%s\"\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:1415
 #, 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:990
+#: builtin/submodule--helper.c:1429
 #, 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:1001
+#: builtin/submodule--helper.c:1440
 #, 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:1048
-msgid "Suppress output of synchronizing submodule url"
-msgstr "Dölj utdata från synkroniering av undermodul-url"
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
+msgstr "dölj utdata från synkronisering av undermodul-url"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1494
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<sökväg>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1548
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -19739,7 +22654,7 @@ msgstr ""
 "Undermodulsarbetskatalogen \"%s\" innehåller en .git-katalog (använd \"rm -rf"
 "\" om du verkligen vill ta bort den och all dess historik)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1560
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -19748,175 +22663,204 @@ msgstr ""
 "Undermodulens arbetskatalog \"%s\" har lokala ändringar; \"-f\" kastar bort "
 "dem"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "Rensade katalogen \"%s\"\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1570
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "Kunde inte ta bort undermodulens arbetskatalog \"%s\"\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1581
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "kunde inte skapa tom undermodulskatalog %s"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1597
 #, 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:1187
-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 ""
-"Ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
+"ta bort undermodulers arbetskataloger även om de innehåller lokala ändringar"
 
-#: builtin/submodule--helper.c:1188
-msgid "Unregister all submodules"
-msgstr "Avregistrera alla undermoduler"
+#: builtin/submodule--helper.c:1627
+msgid "unregister all submodules"
+msgstr "avregistrera alla undermoduler"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1632
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<sökväg>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1646
 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:1302 builtin/submodule--helper.c:1305
+#: 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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"En suppleant beräknad från överprojektets suppleant är ogiltig.\n"
+"För att i så fall låta Git klona utan ett suppleant, sätt\n"
+"submodule.alternateErrorStrategy till \"info\" eller, likvärdigt, klona\n"
+"med \"--reference-if-able\" istället för \"--reference\"."
+
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
-msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s"
+msgstr "undermodulen \"%s\" kan inte lägga till suppleant: %s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1768
 #, 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:1348
+#: builtin/submodule--helper.c:1775
 #, 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:1371
+#: builtin/submodule--helper.c:1800
+#, 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:1841
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
+
+#: builtin/submodule--helper.c:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "katalogen inte tom: \"%s\""
+
+#: builtin/submodule--helper.c:1858
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
+
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
 msgid "where the new submodule will be cloned to"
-msgstr "var den nya undermodulen skall klonas till"
+msgstr "var den nya undermodulen ska klonas till"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
 msgid "name of the new submodule"
 msgstr "namn på den nya undermodulen"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
 msgid "url where to clone the submodule from"
 msgstr "URL att klona undermodulen från"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
 msgid "depth for shallow clones"
 msgstr "djup för grunda kloner"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
 msgid "force cloning progress"
 msgstr "tvinga kloningsförlopp"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+msgid "disallow cloning into non-empty directory"
+msgstr "förhindra kloning till icke-tom katalog"
+
+#: builtin/submodule--helper.c:1916
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
-"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
-
-#: builtin/submodule--helper.c:1424
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "misslyckades klona \"%s\" till undermodulsökvägen \"%s\""
-
-#: builtin/submodule--helper.c:1438
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
+"<arkiv>] [--name <namn>] [--depth <djup>] [--single-branch] --url <url> --"
+"path <sökväg>"
 
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1953
 #, 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:1478
+#: builtin/submodule--helper.c:1957
 #, 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:1571
+#: builtin/submodule--helper.c:2058
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "Undermodulsökvägen \"%s\" har inte initierats"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:2062
 msgid "Maybe you want to use 'update --init'?"
 msgstr "Kanske menade du att använda \"update --init\"?"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:2092
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "Hoppar över ej sammanslagen undermodul %s"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:2121
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "Hoppar över undermodulen \"%s\""
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:2271
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:2282
 #, 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:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
 msgid "path into the working tree"
 msgstr "sökväg inuti arbetskatalogen"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:2347
 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:1858
+#: builtin/submodule--helper.c:2351
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout eller none"
 
-#: builtin/submodule--helper.c:1864
-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:2357
+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:1867
+#: builtin/submodule--helper.c:2360
 msgid "parallel jobs"
 msgstr "parallella jobb"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2362
 msgid "whether the initial clone should follow the shallow recommendation"
-msgstr "om den första klonen skall följa rekommendation för grund kloning"
+msgstr "om den första klonen ska följa rekommendation för grund kloning"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2363
 msgid "don't print cloning progress"
 msgstr "skriv inte klonförlopp"
 
-#: builtin/submodule--helper.c:1877
+#: builtin/submodule--helper.c:2374
 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:1890
+#: builtin/submodule--helper.c:2387
 msgid "bad value for update parameter"
 msgstr "felaktigt värde för parametern update"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:2435
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -19925,50 +22869,143 @@ 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:2061
+#: builtin/submodule--helper.c:2558
 #, 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:2094
+#: builtin/submodule--helper.c:2591
 msgid "recurse into submodules"
 msgstr "rekursera ner i undermoduler"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2597
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dir [<flaggor>] [<sökväg>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2653
 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:2159
+#: builtin/submodule--helper.c:2656
 msgid "unset the config in the .gitmodules file"
 msgstr "ta bort konfigurationen från .gitmodules-filen"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2661
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <namn> [<värde>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2662
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <namn>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2663
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: 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 "se till att .gitmodules finns i arbetskatalogen"
 
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
+#: builtin/submodule--helper.c:2698
+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:2702
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <sökväg> <nyurl>"
+
+#: builtin/submodule--helper.c:2735
+msgid "set the default tracking branch to master"
+msgstr "välj master som förvald spårad gren"
+
+#: builtin/submodule--helper.c:2737
+msgid "set the default tracking branch"
+msgstr "välj förvald spårad gren"
+
+#: builtin/submodule--helper.c:2741
+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:2742
+msgid ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <branch> <path>"
+msgstr ""
+"git submodule--helper set-branch [-q|--quiet] (-b|--branch) <gren> <sökväg>"
+
+#: builtin/submodule--helper.c:2749
+msgid "--branch or --default required"
+msgstr "--branch eller --default krävs"
+
+#: builtin/submodule--helper.c:2752
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch och --default är ömsesidigt uteslutande"
+
+#: builtin/submodule--helper.c:2815
+#, 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:2818
+#, 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:2828
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr "En git-katalog för \"%s\" hittades lokalt med fjärr(ar):"
+
+#: 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 ""
+"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\".\n"
+
+#: builtin/submodule--helper.c:2842
+#, 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:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "Kan inte checka ut undermodulen \"%s\""
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr "gren från arkivet att checka ut vid kloning"
+
+#: builtin/submodule--helper.c:2910
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "tillåt lägga till en annars ignorerad undermodulsökväg"
+
+#: builtin/submodule--helper.c:2917
+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>"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s stöder inte --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2991
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -19981,24 +23018,24 @@ msgstr "git symbolic-ref [<flaggor>] <namn> [<ref>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <namn>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr ""
 "undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "ta bort symbolisk referens"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "förkorta ref-utdata"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr "skäl"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "skäl till uppdateringen"
 
@@ -20018,27 +23055,29 @@ msgstr "git tag -d <taggnamn>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--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>] [--[no-]merged [<incheckning>]] [<mönster>...]"
+"\t\t[--format=<format>] [--merged <incheckning>] [--no-merged <incheckning>] "
+"[<mönster>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<format>] <taggnamn>..."
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "taggen \"%s\" hittades inte."
 
-#: builtin/tag.c:105
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Tog bort tagg \"%s\" (var %s)\n"
 
-#: builtin/tag.c:135
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -20051,7 +23090,7 @@ msgstr ""
 "  %s\n"
 "Rader som inleds med \"%c\" ignoreras.\n"
 
-#: builtin/tag.c:139
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -20066,15 +23105,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:198
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "kunde inte signera taggen"
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "kunde inte skriva tagg-filen"
-
-#: 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"
@@ -20087,339 +23122,339 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:232
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "felaktig objekttyp."
 
-#: builtin/tag.c:284
+#: builtin/tag.c:328
 msgid "no tag message?"
 msgstr "inget taggmeddelande?"
 
-#: builtin/tag.c:291
+#: builtin/tag.c:335
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "Taggmeddelandet har lämnats i %s\n"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr "lista taggnamn"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr "visa <n> rader från varje taggmeddelande"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr "ta bort taggar"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr "verifiera taggar"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr "Alternativ för att skapa taggar"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr "annoterad tagg, behöver meddelande"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:457
 msgid "tag message"
 msgstr "taggmeddelande"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:459
 msgid "force edit of tag message"
 msgstr "tvinga redigering av incheckningsmeddelande"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr "annoterad och GPG-signerad tagg"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr "använd annan nyckel för att signera taggen"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
 msgstr "ersätt taggen om den finns"
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "skapa en reflog"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr "Alternativ för listning av taggar"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr "lista taggar i spalter"
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that contain the commit"
 msgstr "visa endast taggar som innehåller incheckningen"
 
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:470 builtin/tag.c:472
 msgid "print only tags that don't contain the commit"
 msgstr "visa endast taggar som inte innehåller incheckningen"
 
-#: builtin/tag.c:429
+#: builtin/tag.c:473
 msgid "print only tags that are merged"
 msgstr "visa endast taggar som slagits samman"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:474
 msgid "print only tags that are not merged"
 msgstr "visa endast taggar som ej slagits samman"
 
-#: builtin/tag.c:434
+#: builtin/tag.c:478
 msgid "print only tags of the object"
 msgstr "visa endast taggar för objektet"
 
-#: builtin/tag.c:482
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
 msgstr "--column och -n är inkompatibla"
 
-#: builtin/tag.c:504
+#: 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:506
+#: 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:508
+#: 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:510
+#: 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:512
+#: 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:523
+#: 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:542
-msgid "too many params"
-msgstr "för många parametrar"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:592
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "\"%s\" är inte ett giltigt taggnamn."
 
-#: builtin/tag.c:553
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "taggen \"%s\" finns redan"
 
-#: builtin/tag.c:584
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "Packar upp objekt"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "misslyckades skapa katalogen %s"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "misslyckades skapa filen %s"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "misslyckades ta bort filen %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "misslyckades ta bort katalogen %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "Testar mtime i \"%s\" "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 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:166
+#: builtin/update-index.c:167
 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:179
+#: builtin/update-index.c:180
 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:190
+#: builtin/update-index.c:191
 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:201
+#: builtin/update-index.c:202
 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:214
+#: builtin/update-index.c:215
 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:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<flaggor>] [--] [<fil>...]"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:976
 msgid "continue refresh even when index needs update"
 msgstr "fortsätt uppdatera även när index inte är àjour"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr "refresh: ignorera undermoduler"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
 msgid "do not ignore new files"
 msgstr "ignorera inte nya filer"
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:984
 msgid "let files replace directories and vice-versa"
 msgstr "låt filer ersätta kataloger och omvänt"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
 msgid "notice files missing from worktree"
 msgstr "lägg märke till filer som saknas i arbetskatalogen"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:988
 msgid "refresh even if index contains unmerged entries"
 msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:991
 msgid "refresh stat information"
 msgstr "uppdatera statusinformation"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "som --refresh, men ignorera assume-unchanged-inställning"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr "<läge>,<objekt>,<sökväg>"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1000
 msgid "add the specified entry to the index"
 msgstr "lägg till angiven post i indexet"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1010
 msgid "mark files as \"not changing\""
 msgstr "markera filer som \"ändras inte\""
 
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
 msgstr "rensa \"assume-unchanged\"-biten"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
 msgstr "markera filer som \"endast index\""
 
-#: builtin/update-index.c:1015
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
 msgstr "töm \"skip-worktree\"-biten"
 
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr "rör inte \"endast index\"-poster"
+
+#: builtin/update-index.c:1024
 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:1020
+#: builtin/update-index.c:1026
 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:1022
+#: builtin/update-index.c:1028
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "med --stdin: indatarader termineras med null-byte"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1030
 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:1028
+#: builtin/update-index.c:1034
 msgid "add entries from standard input to the index"
 msgstr "lägg poster från standard in till indexet"
 
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1038
 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:1036
+#: builtin/update-index.c:1042
 msgid "only update entries that differ from HEAD"
 msgstr "uppdatera endast poster som skiljer sig från HEAD"
 
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1046
 msgid "ignore files missing from worktree"
 msgstr "ignorera filer som saknas i arbetskatalogen"
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1049
 msgid "report actions to standard output"
 msgstr "rapportera åtgärder på standard ut"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1051
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(för porslin) glöm sparade olösta konflikter"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr "skriv index i detta format"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
 msgstr "aktivera eller inaktivera delat index"
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1059
 msgid "enable/disable untracked cache"
 msgstr "aktivera/inaktivera ospårad cache"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1061
 msgid "test if the filesystem supports untracked cache"
 msgstr "testa om filsystemet stöder ospårad cache"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1063
 msgid "enable untracked cache without testing the filesystem"
 msgstr "aktivera ospårad cache utan att testa filsystemet"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1065
 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:1061
+#: builtin/update-index.c:1067
 msgid "enable or disable file system monitor"
 msgstr "aktivera eller inaktivera filsystemsövervakning"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1069
 msgid "mark files as fsmonitor valid"
 msgstr "markera filer som \"fsmonitor valid\""
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c:1072
 msgid "clear fsmonitor valid bit"
 msgstr "töm \"fsmonitor valid\"-bit"
 
-#: builtin/update-index.c:1169
+#: builtin/update-index.c:1175
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20427,7 +23462,7 @@ msgstr ""
 "core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
 "vill aktivera delat index"
 
-#: builtin/update-index.c:1178
+#: builtin/update-index.c:1184
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20435,7 +23470,7 @@ msgstr ""
 "core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
 "vill inaktivera delat index"
 
-#: builtin/update-index.c:1190
+#: 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"
@@ -20443,11 +23478,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:1194
+#: builtin/update-index.c:1200
 msgid "Untracked cache disabled"
 msgstr "Ospårad cache är inaktiverad"
 
-#: builtin/update-index.c:1202
+#: 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"
@@ -20455,26 +23490,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:1206
+#: builtin/update-index.c:1212
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "Ospårad cache är aktiverad för \"%s\""
 
-#: builtin/update-index.c:1214
+#: builtin/update-index.c:1220
 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:1218
+#: builtin/update-index.c:1224
 msgid "fsmonitor enabled"
 msgstr "fsmonitor aktiverat"
 
-#: builtin/update-index.c:1221
+#: builtin/update-index.c:1227
 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:1225
+#: builtin/update-index.c:1231
 msgid "fsmonitor disabled"
 msgstr "fsmonitor inaktiverat"
 
@@ -20490,19 +23525,19 @@ msgstr "git update-ref [<flaggor>]    <refnamn> <gammaltvärde> [<nyttvärde>]"
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<flaggor>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "ta bort referensen"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
 msgstr "uppdatera <refnamn> inte det den pekar på"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr "standard in har NUL-terminerade argument"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr "läs uppdateringar från standard in"
 
@@ -20546,246 +23581,237 @@ msgstr "visa innehåll för incheckning"
 msgid "print raw gpg status output"
 msgstr "visa råa gpg-statusdata"
 
-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..."
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "pratsam"
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 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:17
+#: builtin/worktree.c:18
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<flaggor>] <sökväg> [<incheckning-igt>]"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<flaggor>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<flaggor>] <sökväg>"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <arbetskatalog> <ny-sökväg>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<flaggor>]"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<flaggor>] <arbetskatalog>"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <sökväg>"
 
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:61 builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "misslyckades ta bort \"%s\""
 
-#: builtin/worktree.c:79
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Tar bort worktrees/%s: inte en giltig katalog"
-
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr ""
-"Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste "
-"%<PRIuMAX>)"
-
-#: builtin/worktree.c:117
+#: builtin/worktree.c:74
 #, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
+msgid "Removing %s/%s: %s"
+msgstr "Tar bort %s/%s: %s"
 
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "rapportera borttagna arbetskataloger"
 
-#: builtin/worktree.c:167
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
 
-#: builtin/worktree.c:234
+#: builtin/worktree.c:219
 #, c-format
 msgid "'%s' already exists"
 msgstr "\"%s\" finns redan"
 
-#: builtin/worktree.c:251
+#: builtin/worktree.c:228
 #, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "kunde inte lägga in arbetskatalogen \"%s\" igen"
+msgid "unusable worktree destination '%s'"
+msgstr "oanvändbar mål för arbetskatalog \"%s\""
 
-#: builtin/worktree.c:256
+#: builtin/worktree.c:233
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 "\"%s\" är en saknad men låst arbetskatalog;\n"
-"använd \"add -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller "
+"använd \"%s -f -f\" för att överstyra, eller \"unlock\" och \"prune\" eller "
 "\"remove\" för att rensa"
 
-#: builtin/worktree.c:258
+#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 "\"%s\" är en saknad men redan registrerad arbetskatalog;\n"
-"använd \"add -f\" för att överstyra, eller \"prune\" eller \"remove\" för "
-"att rensa"
+"använd \"%s -f\" för att överstyra, eller \"prune\" eller \"remove\" för att "
+"rensa"
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:286
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "kunde inte skapa katalogen \"%s\""
 
-#: builtin/worktree.c:439 builtin/worktree.c:445
+#: builtin/worktree.c:308
+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:441
+#: 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:450
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "Förbereder arbetskatalog (checkar ut \"%s\")"
 
-#: builtin/worktree.c:456
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "Förbereder arbetskatalog (frånkopplat HEAD %s)"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr ""
 "checka ut <gren> även om den redan är utcheckad i en annan arbetskatalog"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "skapa en ny gren"
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "skapa eller återställ en gren"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "befolka den nya arbetskatalogen"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "låt arbetskatalogen förbli låst"
 
-#: builtin/worktree.c:508
+#: 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:511
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
-msgstr "försök matcha namn på ny gren mot en fjärrspårande gren"
+msgstr "försök träffa namn på ny gren mot en fjärrspårande gren"
 
-#: builtin/worktree.c:519
+#: builtin/worktree.c:506
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b, -B och --detach är ömsesidigt uteslutande"
 
-#: builtin/worktree.c:580
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr "--reason kräver --lock"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "lagt till med --lock"
+
+#: 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:680
-msgid "reason for locking"
-msgstr "orsak till lås"
+#: 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:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: 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:702
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose och --porcelain är ömsesidigt uteslutande"
+
+#: 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:694 builtin/worktree.c:727
+#: 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:699
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "\"%s\" är redan låst, orsak: %s"
 
-#: builtin/worktree.c:701
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "\"%s\" är redan låst"
 
-#: builtin/worktree.c:729
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "\"%s\" är inte låst"
 
-#: builtin/worktree.c:770
+#: 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:778
+#: 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:801 builtin/worktree.c:928
+#: 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:806
+#: 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:812
-#, c-format
-msgid "target '%s' already exists"
-msgstr "målet \"%s\" finns redan"
-
-#: builtin/worktree.c:820
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -20794,7 +23820,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:822
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -20802,38 +23828,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:825
+#: 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:830
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "misslyckades flytta \"%s\" till \"%s\""
 
-#: builtin/worktree.c:878
+#: 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:882
+#: 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:887
+#: 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:910
+#: 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:933
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -20842,7 +23868,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:935
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -20850,11 +23876,21 @@ 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:938
+#: 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:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr "reparera: %s: %s"
+
+#: builtin/worktree.c:1011
+#, c-format
+msgid "error: %s: %s"
+msgstr "fel: %s: %s"
+
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -20871,57 +23907,14 @@ msgstr "visa trädobjekt för underkatalogen <prefix>"
 msgid "only useful for debugging"
 msgstr "endast användbart vid felsökning"
 
-#: fast-import.c:3118
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "Förväntade \"mark\"-kommando, fick %s"
-
-#: fast-import.c:3123
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "Förväntade \"to\"-kommando, fick %s"
-
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"Behörigheten på din uttags-katalog (socket) är för lös; andra\n"
-"användare kan läsa dina cachade inloggningsuppgifter. Du bör köra:\n"
-"\n"
-"\tchmod 0700 %s"
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "skriv felsökningsmeddelanden på standard fel"
-
-#: t/helper/test-reach.c:152
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "incheckning %s är inte märkt nåbar"
-
-#: t/helper/test-reach.c:162
-msgid "too many commits marked reachable"
-msgstr "för många incheckningar markerade nåbara"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<flaggor>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "avsluta omedelbart efter kungörelse av kapabiliteter"
-
-#: git.c:27
+#: git.c:28
 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"
 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "           <command> [<args>]"
 msgstr ""
 "git [--version] [--help] [-C <sökväg>] [-c <namn>=<värde>]\n"
@@ -20930,9 +23923,10 @@ msgstr ""
 "           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
 "bare]\n"
 "           [--git-dir=<sökväg>] [--work-tree=<sökväg>] [--namespace=<namn>]\n"
+"           [--super-prefix=<sökväg>] [--config-env=<namn>=<miljövar>]\n"
 "           <kommando> [<flaggor>]"
 
-#: git.c:34
+#: 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"
@@ -20944,47 +23938,52 @@ 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:186
+#: git.c:188
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "ingen katalog angavs för --git-dir\n"
 
-#: git.c:200
+#: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "ingen namnrymd angavs för --namespace\n"
 
-#: git.c:214
+#: git.c:216
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "ingen katalog angavs för --work-tree\n"
 
-#: git.c:228
+#: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "inget prefix angavs för --super-prefix\n"
 
-#: git.c:250
+#: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c förväntar en konfigurationssträng\n"
 
-#: git.c:288
+#: git.c:260
+#, c-format
+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:314
+#: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "okänd flagga: %s\n"
 
-#: git.c:360
+#: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr "vid expandering av aliaset \"%s\": \"%s\""
 
-#: git.c:369
+#: git.c:384
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -20993,39 +23992,39 @@ msgstr ""
 "aliaset \"%s\" ändrar miljövariabler.\n"
 "Du kan använda \"!git\" i aliaset för att göra det"
 
-#: git.c:376
+#: git.c:391
 #, c-format
 msgid "empty alias for %s"
 msgstr "tomt alias för %s"
 
-#: git.c:379
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr "rekursivt alias: %s"
 
-#: git.c:459
+#: git.c:476
 msgid "write failure on standard output"
 msgstr "skrivfel på standard ut"
 
-#: git.c:461
+#: git.c:478
 msgid "unknown write failure on standard output"
 msgstr "okänt skrivfel på standard ut"
 
-#: git.c:463
+#: git.c:480
 msgid "close failed on standard output"
 msgstr "stäng misslyckades på standard ut"
 
-#: git.c:792
+#: git.c:833
 #, 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:842
+#: git.c:883
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "kan inte hantera %s som inbyggd"
 
-#: git.c:855
+#: git.c:896
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -21034,54 +24033,204 @@ msgstr ""
 "användning: %s\n"
 "\n"
 
-#: git.c:875
+#: git.c:916
 #, 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:887
+#: git.c:928
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "misslyckades köra kommandot \"%s\": %s\n"
 
-#: http.c:378
+#: http-fetch.c:118
+#, 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
+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"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "fel när revisioner skulle förberedas"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "incheckning %s är inte märkt nåbar"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "för många incheckningar markerade nåbara"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<flaggor>]"
+
+#: t/helper/test-serve-v2.c:19
+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
+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
+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
+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
+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
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<namn>] [<igenkänningstecken>]"
+
+#: t/helper/test-simple-ipc.c:687
+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
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<namn>] [<trådar>] [<antal-byte>] "
+"[<buntstorlek>]"
+
+#: t/helper/test-simple-ipc.c:696
+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
+msgid "named-pipe name"
+msgstr "namn på namngivet rör"
+
+#: t/helper/test-simple-ipc.c:700
+msgid "number of threads in server thread pool"
+msgstr "antal trådar i serverns trådpool"
+
+#: t/helper/test-simple-ipc.c:701
+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
+msgid "number of bytes"
+msgstr "antal byte"
+
+#: t/helper/test-simple-ipc.c:704
+msgid "number of requests per thread"
+msgstr "antal frågor per tråd"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr "byte"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr "ballasttecken"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr "igenkänningstecken"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "command token to send to the server"
+msgstr "igenkänningstecken för kommando att sända till servern"
+
+#: http.c:399
 #, 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:399
+#: http.c:420
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
 
-#: http.c:408
+#: 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:878
+#: http.c:910
 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:951
+#: 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:1088
+#: http.c:1132
 #, 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:1095
+#: http.c:1139
 #, 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:1099
+#: http.c:1143
 #, 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:1968
+#: http.c:2034
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21092,152 +24241,192 @@ msgstr ""
 "        bad om: %s\n"
 "  omdirigering: %s"
 
-#: remote-curl.c:166
+#: remote-curl.c:183
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "felaktig citering på värde för push-option: \"%s\""
 
-#: remote-curl.c:263
+#: remote-curl.c:307
 #, 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:364
+#: remote-curl.c:408
 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:395
+#: remote-curl.c:439
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "ogiltigt svar från servern; fick \"%s\""
 
-#: remote-curl.c:455
+#: remote-curl.c:499
 #, c-format
 msgid "repository '%s' not found"
 msgstr "arkivet \"%s\" hittades inte"
 
-#: remote-curl.c:459
+#: remote-curl.c:503
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Autentisering misslyckades \"%s\""
 
-#: remote-curl.c:463
+#: remote-curl.c:507
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "kan inte komma åt \"%s\": %s"
 
-#: remote-curl.c:469
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
 msgstr "omdirigerar till %s"
 
-#: remote-curl.c:593
+#: remote-curl.c:644
 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:673
+#: remote-curl.c:656
+msgid "remote server sent unexpected response end packet"
+msgstr "fjärrservern sände oväntat svarsavslutningspaketet"
+
+#: 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:733
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: felaktig radlängdstecken: %.4s"
+
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: oväntat svarsavslutningspaketet"
+
+#: remote-curl.c:834
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC misslyckades; %s"
 
-#: remote-curl.c:773
+#: remote-curl.c:874
 msgid "cannot handle pushes this big"
 msgstr "kan inte hantera så stora sändningar"
 
-#: remote-curl.c:888
+#: remote-curl.c:989
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "kan inte packa upp anrop; zlib-deflate-fel %d"
 
-#: remote-curl.c:892
+#: remote-curl.c:993
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "kan inte packa upp anrop; zlib-slutfel %d"
 
-#: remote-curl.c:1023
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "%d byte av längd-huvudet togs emot"
+
+#: remote-curl.c:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "%d byte av kroppen väntas fortfarande"
+
+#: remote-curl.c:1134
 msgid "dumb http transport does not support shallow capabilities"
 msgstr "dum http-transport stöder inte grunda arkiv"
 
-#: remote-curl.c:1037
+#: remote-curl.c:1149
 msgid "fetch failed."
 msgstr "mottagning misslyckades."
 
-#: remote-curl.c:1085
+#: remote-curl.c:1195
 msgid "cannot fetch by sha1 over smart http"
 msgstr "kan inte hämta med sha1 över smart http"
 
-#: remote-curl.c:1129 remote-curl.c:1135
+#: remote-curl.c:1239 remote-curl.c:1245
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "protokollfel: förväntade sha/ref, fick \"%s\""
 
-#: remote-curl.c:1147 remote-curl.c:1261
+#: remote-curl.c:1257 remote-curl.c:1375
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http-transporten stöder inte %s"
 
-#: remote-curl.c:1183
+#: remote-curl.c:1293
 msgid "git-http-push failed"
 msgstr "git-http-push misslyckades"
 
-#: remote-curl.c:1367
+#: remote-curl.c:1481
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: användning: git remote-curl <fjärr> [<url>]"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1513
 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:1406
+#: remote-curl.c:1520
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl: försökte ta emot utan lokalt arkiv"
 
-#: remote-curl.c:1446
+#: remote-curl.c:1561
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: okänt kommando \"%s\" från git"
 
-#: list-objects-filter-options.h:85
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "ingen kompilatorinformation tillgänglig\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "ingen libc-information tillgänglig\n"
+
+#: list-objects-filter-options.h:94
 msgid "args"
 msgstr "argument"
 
-#: list-objects-filter-options.h:86
+#: list-objects-filter-options.h:95
 msgid "object filtering"
 msgstr "objektfiltrering"
 
-#: parse-options.h:179
+#: parse-options.h:184
 msgid "expiry-date"
 msgstr "giltig-till"
 
-#: parse-options.h:193
+#: parse-options.h:198
 msgid "no-op (backward compatibility)"
 msgstr "ingen funktion (bakåtkompatibilitet)"
 
-#: parse-options.h:305
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "var mer pratsam"
 
-#: parse-options.h:307
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "var mer tyst"
 
-#: parse-options.h:313
-msgid "use <n> digits to display SHA-1s"
-msgstr "använd <n> siffror för att visa SHA-1:or"
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
+msgstr "använd <n> siffror för att visa objektnamn"
 
-#: parse-options.h:332
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
-msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
+msgstr "hur blanksteg och #kommentarer ska tas bort från meddelande"
+
+#: parse-options.h:338
+msgid "read pathspec from file"
+msgstr "läs sökvägsangivelse från fil"
+
+#: parse-options.h:339
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "med --pathspec-from-file, sökvägsangivelser avdelas med NUL-tecken"
 
-#: ref-filter.h:101
+#: ref-filter.h:99
 msgid "key"
 msgstr "nyckel"
 
-#: ref-filter.h:101
+#: ref-filter.h:99
 msgid "field name to sort on"
 msgstr "fältnamn att sortera på"
 
@@ -21245,14 +24434,6 @@ msgstr "fältnamn att sortera på"
 msgid "update the index with reused conflict resolution if possible"
 msgstr "uppdatera indexet med återanvänd konfliktlösning om möjligt"
 
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "HEAD frånkopplad vid "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD frånkopplad från "
-
 #: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Lägg filinnehåll till indexet"
@@ -21290,670 +24471,657 @@ msgid "List, create, or delete branches"
 msgstr "Visa, skapa eller ta bort grenar"
 
 #: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "Samla information från användaren för att sända en felrapport"
+
+#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Flytta objekt och referenser efter arkiv"
 
-#: command-list.h:60
+#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr ""
 "Visa innehåller eller typ- och storleksinformation för objekt i arkivet"
 
-#: command-list.h:61
+#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Visa information från gitattributes"
 
-#: command-list.h:62
+#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Felsök gitignore / exkluderings-filer"
 
-#: command-list.h:63
+#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "Visa kanoniska namn och e-postadresser för kontakter"
 
-#: command-list.h:64
+#: command-list.h:65
 msgid "Switch branches or restore working tree files"
 msgstr "Byt till en ny gren eller återställ filer i arbetskatalogen"
 
-#: command-list.h:65
+#: command-list.h:66
 msgid "Copy files from the index to the working tree"
 msgstr "Kopiera filer från indexet till arbetskatalogen"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Ensures that a reference name is well formed"
 msgstr "Se till att referensen är välformad"
 
-#: command-list.h:67
+#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "Hitta incheckningar som ännu inte applicerats uppströms"
 
-#: command-list.h:68
+#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "Applicera ändringarna introducerade av befintliga incheckningar"
 
-#: command-list.h:69
+#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Grafiskt alternativ till git-commit"
 
-#: command-list.h:70
+#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Ta bort ospårade filer från arbetskatalogen"
 
-#: command-list.h:71
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Klona ett arkiv till en ny katalog"
 
-#: command-list.h:72
+#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Visa data i kolumner"
 
-#: command-list.h:73
+#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Protokollför ändringar i arkivet"
 
-#: command-list.h:74
+#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Skriv och verifiera Git-incheckningsgraffiler"
 
-#: command-list.h:75
+#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Skapa ett nytt incheckningsobjekt"
 
-#: command-list.h:76
+#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Läs och skriv alternativ för arkiv eller globalt"
 
-#: command-list.h:77
+#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "Räkna antal opackade objekt och mängd diskutrymme"
 
-#: command-list.h:78
+#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Hämta och spara användarreferenser"
 
-#: command-list.h:79
+#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Hjälpprogram för att tillfälligt lagra lösenord i minnet"
 
-#: command-list.h:80
+#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Hjälpprogram för att lagra användarreferenser på disk"
 
-#: command-list.h:81
+#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Exportera en enkel incheckning i en CVS-utcheckning"
 
-#: command-list.h:82
+#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Rädda dina data ut ur andra SCM folk älskar att hata"
 
-#: command-list.h:83
+#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "En CVS-serveremulator för Git"
 
-#: command-list.h:84
+#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "En riktigt enkel server för Git-arkiv"
 
-#: command-list.h:85
+#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr "Ge ett objekt användarläsbara namn baserade på en tillgänglig referens"
 
-#: command-list.h:86
+#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "Visa ändringar mellan incheckningar, med arbetskatalogen, osv"
 
-#: command-list.h:87
+#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "Jämför filer i arbetskatalogen och indexet"
 
-#: command-list.h:88
+#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "Jämför en träd med arbetskatalogen eller indexet"
 
-#: command-list.h:89
+#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr "Visar innehåll och läge för blobbar som hittats via två trädobjekt"
 
-#: command-list.h:90
+#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Visa ändringar med vanliga diff-verktyg"
 
-#: command-list.h:91
+#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Exporterare för Git-data"
 
-#: command-list.h:92
+#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Bakända för snabba Git-dataimporterare"
 
-#: command-list.h:93
+#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Hämta objekt och referenser från annat arkiv"
 
-#: command-list.h:94
+#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Ta emot saknade objekt från annat arkiv"
 
-#: command-list.h:95
+#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Skriv om grenar"
 
-#: command-list.h:96
+#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Skapa incheckningsmeddelande för en sammanslagning"
 
-#: command-list.h:97
+#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Visa information för varje referens"
 
-#: command-list.h:98
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "Kör ett Git-kommando på en lista över arkiv"
+
+#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Förbered patchar för insändning via e-post"
 
-#: command-list.h:99
+#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "Bekräftar konnektivitet och validitet för objektet i databasen"
 
-#: command-list.h:100
+#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "Städa onödiga filer och optimera det lokala arkivet"
 
-#: command-list.h:101
+#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "Hämta inchecknings-id från ett arkiv skapat med git-archive"
 
-#: command-list.h:102
+#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "Visa rader som motsvarar mönster"
 
-#: command-list.h:103
+#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Ett portabelt grafiskt gränssnitt för Git"
 
-#: command-list.h:104
+#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "Beräkna objekt-id och möjligen skapa en blob från en fil"
 
-#: command-list.h:105
+#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Visa hjälpinformation om Git"
 
-#: command-list.h:106
+#: command-list.h:108
 msgid "Server side implementation of Git over HTTP"
 msgstr "Serversideimplementation av Git över HTTP"
 
-#: command-list.h:107
+#: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Hämta objekt och referenser från annat Git-arkiv över HTTP"
 
-#: command-list.h:108
+#: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "Sänd objekt över HTTP/DAV till ett annat arkiv"
 
-#: command-list.h:109
+#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "Sänd en samling patchar från stdin till en IMAP-mapp"
 
-#: command-list.h:110
+#: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
 msgstr "SKapa pack-indexfiler för ett befintligt packat arkiv"
 
-#: command-list.h:111
+#: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt"
 
-#: command-list.h:112
+#: command-list.h:114
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Omedelbart bläddra i din arbetskatalog med gitweb"
 
-#: command-list.h:113
+#: command-list.h:115
 msgid "Add or parse structured information in commit messages"
 msgstr ""
 "Lägg till eller tolka strukturerad information i incheckningsmeddelanden"
 
-#: command-list.h:114
+#: command-list.h:116
 msgid "The Git repository browser"
 msgstr "Bläddraren för Git-arkiv"
 
-#: command-list.h:115
+#: command-list.h:117
 msgid "Show commit logs"
 msgstr "Visa incheckningsloggar"
 
-#: command-list.h:116
+#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr "Visa information om filer i indexet och arbetskatalogen"
 
-#: command-list.h:117
+#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "Lista referenser i ett fjärrarkiv"
 
-#: command-list.h:118
+#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "Visa innehållet i ett trädobjekt"
 
-#: command-list.h:119
+#: command-list.h:121
 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:120
+#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Enkelt program för att dela en UNIX mbox"
 
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Utför uppgifter för att optimera Git-arkivdata"
+
+#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "Slå ihop två eller flera utvecklingshistorier"
 
-#: command-list.h:122
+#: command-list.h:125
 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:123
+#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Kör en trevägs-filsammanslagning"
 
-#: command-list.h:124
+#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "Kör en sammanslagning för filer som behöver det"
 
-#: command-list.h:125
+#: command-list.h:128
 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:126
+#: 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:127
+#: command-list.h:130
 msgid "Show three-way merge without touching index"
 msgstr "Visa trevägssammanslagning utan att röra indexet"
 
-#: command-list.h:128
+#: command-list.h:131
 msgid "Write and verify multi-pack-indexes"
 msgstr "Skriv och verifiera multi-pack-index"
 
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "Skapar ett taggobjekt"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "skapar ett taggobjekt med extra validering"
 
-#: command-list.h:130
+#: command-list.h:133
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "Bygg ett trädobjekt från ls-tree-formaterad text"
 
-#: command-list.h:131
+#: command-list.h:134
 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:132
+#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "Hitta symboliska namn för givna referenser"
 
-#: command-list.h:133
+#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Lägg till eller inspektera objektanteckningar"
 
-#: command-list.h:134
+#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "Importera från eller sänd till Perforce-arkiv"
 
-#: command-list.h:135
+#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "Skapa ett packat arkiv med objekt"
 
-#: command-list.h:136
+#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Hitta redundanta pack-filer"
 
-#: command-list.h:137
+#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "Packa huvuden och taggar för effektiv arkivåtkomst"
 
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr ""
-"Rutiner för att göra det lättare att tolka åtkomstparametrar för fjärrarkiv"
-
-#: command-list.h:139
+#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "Beräkna unik ID för en patch"
 
-#: command-list.h:140
+#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "Ta bort alla onåbara objekt från objektdatabasen"
 
-#: command-list.h:141
+#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr "Ta bort extraobjekt som redan finns i pack-filerna"
 
-#: command-list.h:142
+#: command-list.h:144
 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:143
+#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "Uppdatera fjärr-referenser och tillhörande objekt"
 
-#: command-list.h:144
+#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "Tillämpar en quilt-patchuppsättning på aktiv gren"
 
-#: command-list.h:145
+#: command-list.h:147
 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:146
+#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "Läser trädinformation in i indexet"
 
-#: command-list.h:147
+#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "Applicera incheckningar på nytt ovanpå en annan bastopp"
 
-#: command-list.h:148
+#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Ta emot det som sänds till arkivet"
 
-#: command-list.h:149
+#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Hantera referenslogg-information"
 
-#: command-list.h:150
+#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "Hantera uppsättningen spårade arkiv"
 
-#: command-list.h:151
+#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "Packa opackade objekt i ett arkiv"
 
-#: command-list.h:152
+#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "Skapa, visa, ta bort referenser för att ersätta objekt"
 
-#: command-list.h:153
+#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "Skapar en sammanfattning av väntande ändringar"
 
-#: command-list.h:154
+#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "Återanvänd sparad lösning av sammanslagningskonflikter"
 
-#: command-list.h:155
+#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "Återställ aktuell HEAD till angivet tillstånd"
 
-#: command-list.h:156
+#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Återställ filer i arbetskatalogen"
 
-#: command-list.h:157
+#: command-list.h:159
 msgid "Revert some existing commits"
 msgstr "Återställ några befintliga incheckningar"
 
-#: command-list.h:158
+#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "Visa incheckningsobjekt i omvänd kronologisk ordning"
 
-#: command-list.h:159
+#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "Plocka ut och massera parametrar"
 
-#: command-list.h:160
+#: command-list.h:162
 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:161
+#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "Sänd en uppsättning patchar som e-post"
 
-#: command-list.h:162
+#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "Sänd objekt över Git-protokollet till annat arkiv"
 
-#: command-list.h:163
+#: command-list.h:165
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "Begränsat inloggningsskal för SSH-åtkomst till bara Git"
 
-#: command-list.h:164
+#: command-list.h:166
 msgid "Summarize 'git log' output"
 msgstr "Summera \"git log\"-utdata"
 
-#: command-list.h:165
+#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "Visa olika sorters objekt"
 
-#: command-list.h:166
+#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "Visa grenar och deras incheckningar"
 
-#: command-list.h:167
+#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "Skapa packat arkivindex"
 
-#: command-list.h:168
+#: command-list.h:170
 msgid "List references in a local repository"
 msgstr "Visa referenser i ett lokalt arkiv"
 
-#: command-list.h:169
+#: command-list.h:171
 msgid "Git's i18n setup code for shell scripts"
 msgstr "Git:s i18n-startkod för skalskript"
 
-#: command-list.h:170
+#: command-list.h:172
 msgid "Common Git shell script setup code"
 msgstr "Gemensam skriptstartkod för Git"
 
-#: command-list.h:171
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr "Initiera och modifiera sparse-checkout"
+
+#: 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:172
+#: command-list.h:175
 msgid "Add file contents to the staging area"
 msgstr "Lägg filinnehållet till indexet"
 
-#: command-list.h:173
+#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "Visa status för arbetskatalogen"
 
-#: command-list.h:174
+#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Ta bort onödiga blanksteg"
 
-#: command-list.h:175
+#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "Initiera, uppdatera eller inspektera undermoduler"
 
-#: command-list.h:176
+#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Dubbelriktad verkan mellan ett Subversion-arkiv och Git"
 
-#: command-list.h:177
+#: command-list.h:180
 msgid "Switch branches"
 msgstr "Byt gren"
 
-#: command-list.h:178
+#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "Läs, modifiera eller ta bort symbolisk referens"
 
-#: command-list.h:179
+#: command-list.h:182
 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:180
+#: command-list.h:183
 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:181
+#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "Packa upp objekt från ett pakat arkiv"
 
-#: command-list.h:182
+#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "Registrera filinnehållet från arbetskatalogen i indexet"
 
-#: command-list.h:183
+#: command-list.h:186
 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:184
+#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "Uppdatera tilläggsinfofil för att hjälpa dumma servrar"
 
-#: command-list.h:185
+#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "Sänd arkivet tillbaka till git-archive"
 
-#: command-list.h:186
+#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "Sänd packade objekt tillbaka till git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Visa en logisk Git-variabel"
 
-#: command-list.h:188
+#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Kontrollera GPG-signaturer för incheckningar"
 
-#: command-list.h:189
+#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "Bekräfta packade Git-arkivfiler"
 
-#: command-list.h:190
+#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Kontrollera GPG-signaturer i taggar"
 
-#: command-list.h:191
+#: 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:192
+#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr "Visa loggar med differenser varje incheckning introducerar"
 
-#: command-list.h:193
+#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "Hantera ytterligare arbetskataloger"
 
-#: command-list.h:194
+#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "Skapa ett trädobjekt från aktuellt index"
 
-#: command-list.h:195
+#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "Definierar attribut per sökväg"
 
-#: command-list.h:196
+#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Gits kommandoradsgränssnitt och -konventioner"
 
-#: command-list.h:197
+#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "Grundläggande Git-handledning för utvecklare"
 
-#: command-list.h:198
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Tillhandahåll användarnamn och lösenord till Git"
+
+#: command-list.h:202
 msgid "Git for CVS users"
 msgstr "Git för CVS-användare"
 
-#: command-list.h:199
+#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "Justrea diff-utdata"
 
-#: command-list.h:200
+#: command-list.h:204
 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:201
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Ofta ställda frågor om att använda Git"
+
+#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "En Git-ordlista"
 
-#: command-list.h:202
+#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Krokar som används av Git"
 
-#: command-list.h:203
+#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "Ange avsiktligen ospårade filer att ignorera"
 
-#: command-list.h:204
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "Kopplar författar-/incheckarnamn och/eller -e-postadresser"
+
+#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "Ange egenskaper för undermoduler"
 
-#: command-list.h:205
+#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Git-namnrymder"
 
-#: command-list.h:206
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Hjälpprogram för att interagera med fjärrarkiv"
+
+#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Gits arkivlayout"
 
-#: command-list.h:207
+#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Ange versioner och intervall i Git"
 
-#: command-list.h:208
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "Monterar ett arkiv inuti ett annat"
+
+#: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "Introduktion till Git: del två"
 
-#: command-list.h:209
+#: command-list.h:217
 msgid "A tutorial introduction to Git"
 msgstr "Introduktion till Git"
 
-#: command-list.h:210
+#: command-list.h:218
 msgid "An overview of recommended workflows with Git"
 msgstr "Översikt över rekommenderade arbetsflöden med Git"
 
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Du måste starta med \"git bisect start\""
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Vill du att jag ska göra det åt dig [Y=ja/N=nej]? "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "Felaktig rev-indata: $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "Felaktig rev-indata: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "Felaktig rev-indata: $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument."
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "Ingen loggfil angiven"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "kan inte läsa $file för uppspelning"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? vad menar du?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
 msgid "bisect run failed: no command provided."
 msgstr "bisect-körning misslyckades: inget kommando gavs."
 
-#: git-bisect.sh:246
+#: git-bisect.sh:73
 #, sh-format
 msgid "running $command"
 msgstr "kör $command"
 
-#: git-bisect.sh:253
+#: git-bisect.sh:80
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -21962,27 +25130,23 @@ msgstr ""
 "\"bisect\"-körningen misslyckades:\n"
 "felkod $res från \"$command\" är < 0 eller >= 128"
 
-#: git-bisect.sh:279
+#: git-bisect.sh:105
 msgid "bisect run cannot continue any more"
 msgstr "\"bisect\"-körningen kan inte fortsätta längre"
 
-#: git-bisect.sh:285
+#: git-bisect.sh:111
 #, sh-format
 msgid ""
 "bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
 msgstr ""
 "\"bisect\"-körningen misslyckades:\n"
-"\"bisect_state $state\" avslutades med felkoden $res"
+"\"bisect-state $state\" avslutades med felkoden $res"
 
-#: git-bisect.sh:292
+#: git-bisect.sh:118
 msgid "bisect run success"
 msgstr "\"bisect\"-körningen lyckades"
 
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "Vi utför ingen bisect för tillfället."
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -22023,187 +25187,51 @@ 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-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Kan inte uppdatera $ref_stash med $w_commit"
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "fel: okänd flagga för \"stash push\": $option"
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "okänd flagga: $opt"
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "För många revisioner angivna: $REV"
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference är inte en giltig referens"
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "\"$args\" är inte en \"stash\"-referens"
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr "kan inte uppdatera indexet"
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr "Konflikter i indexet. Testa utan --index."
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr "Kunde inte spara indexträd"
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr "Kunde inte återställa ospårade filer från stash-post"
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr "Kan inte ta bort ändrade filer ur kön"
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "Kastade ${REV} ($s)"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(För att återställa dem, skriv \"git stash apply\")"
-
-#: git-submodule.sh:200
+#: 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:210
+#: 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:229
+#: git-submodule.sh:208
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "\"$sm_path\" finns redan i indexet"
 
-#: git-submodule.sh:232
+#: 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:239
+#: 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:245
-#, 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 ""
-"Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
-"$sm_path\n"
-"Använd -f om du verkligen vill lägga till den."
-
-#: git-submodule.sh:268
-#, 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:270
-#, 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:278
-#, 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:280
-#, 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:286
-#, 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:298
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Kan inte checka ut undermodulen \"$sm_path\""
-
-#: git-submodule.sh:303
+#: git-submodule.sh:248
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "Misslyckades lägga till undermodulen \"$sm_path\""
 
-#: git-submodule.sh:312
+#: git-submodule.sh:257
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "Misslyckades registrera undermodulen \"$sm_path\""
 
-#: git-submodule.sh:573
+#: git-submodule.sh:532
 #, 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:583
+#: git-submodule.sh:542
 #, 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:588
+#: git-submodule.sh:547
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22212,7 +25240,7 @@ msgstr ""
 "Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
 "undermodulsökvägen \"$sm_path\""
 
-#: git-submodule.sh:606
+#: git-submodule.sh:565
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22221,7 +25249,7 @@ msgstr ""
 "Kan inte hämta i undermodulsökväg \"$displaypath\"; försökte hämta $sha1 "
 "direkt:"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:571
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22230,83 +25258,52 @@ msgstr ""
 "Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
 "Direkt hämtning av incheckningen misslyckades."
 
-#: git-submodule.sh:619
+#: git-submodule.sh:578
 #, 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:620
+#: git-submodule.sh:579
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
 
-#: git-submodule.sh:624
+#: git-submodule.sh:583
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:625
+#: git-submodule.sh:584
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
 
-#: git-submodule.sh:630
+#: git-submodule.sh:589
 #, 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:631
+#: git-submodule.sh:590
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
 
-#: git-submodule.sh:636
+#: git-submodule.sh:595
 #, 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:637
+#: git-submodule.sh:596
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
 
-#: git-submodule.sh:668
+#: git-submodule.sh:627
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr "Flaggan --cached kan inte användas med flaggan --files"
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "oväntat läge $mod_dst"
-
-#: git-submodule.sh:902
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr "  Varning: $display_name innehåller inte incheckningen $sha1_src"
-
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr "  Varning: $display_name innehåller inte incheckningen $sha1_dst"
-
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr ""
-"  Varning: $display_name innehåller inte incheckningarna $sha1_src och "
-"$sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Se git-${cmd}(1) för detaljer."
-
 #: git-rebase--preserve-merges.sh:109
 msgid "Applied autostash."
 msgstr "Tillämpade autostash."
@@ -22316,12 +25313,22 @@ msgstr "Tillämpade autostash."
 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:207
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -22362,7 +25369,7 @@ msgstr ""
 "\n"
 "Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
 
-#: git-rebase--preserve-merges.sh:270
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -22381,83 +25388,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:295
+#: 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:334
+#: git-rebase--preserve-merges.sh:324
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "Felaktigt incheckningsnamn: $sha1"
 
-#: git-rebase--preserve-merges.sh:364
+#: 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:415
+#: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "Snabbspolade till $sha1"
 
-#: git-rebase--preserve-merges.sh:417
+#: 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:426
+#: 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:431
+#: 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:449
+#: 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:458
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "Kunde inte välja $sha1"
 
-#: git-rebase--preserve-merges.sh:467
+#: 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:472
+#: 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:483
+#: 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:492
+#: git-rebase--preserve-merges.sh:482
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Kan inte skriva $fixup_msg"
 
-#: git-rebase--preserve-merges.sh:495
+#: 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:536 git-rebase--preserve-merges.sh:579
-#: git-rebase--preserve-merges.sh:582
+#: 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:611
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -22471,31 +25478,31 @@ msgstr ""
 "pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
 "du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
 
-#: git-rebase--preserve-merges.sh:626
+#: 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:641
+#: 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:683
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr "Kör: $rest"
 
-#: git-rebase--preserve-merges.sh:691
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "Körning misslyckades: $rest"
 
-#: git-rebase--preserve-merges.sh:693
+#: 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:695
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -22506,7 +25513,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:708
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -22521,25 +25528,25 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:719
+#: 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:720
+#: 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:755
+#: 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:812
+#: 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:817
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -22558,11 +25565,11 @@ msgid ""
 msgstr ""
 "Du har köade ändringar i din arbetskatalog.\n"
 "Om det är meningen att ändringarna\n"
-"skall läggas in i föregående incheckning, kör:\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 skall checkas in i en egen incheckning, kör:\n"
+"Om de ska checkas in i en egen incheckning, kör:\n"
 "\n"
 "  git commit $gpg_sign_opt_quoted\n"
 "\n"
@@ -22570,11 +25577,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--preserve-merges.sh:834
+#: 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:839
+#: 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."
@@ -22582,40 +25589,44 @@ 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:844 git-rebase--preserve-merges.sh:848
+#: 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:879 git-rebase--preserve-merges.sh:965
+#: 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:900
+#: 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:907
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr "Inget HEAD?"
 
-#: git-rebase--preserve-merges.sh:908
+#: 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:911
+#: git-rebase--preserve-merges.sh:901
 msgid "Could not mark as interactive"
 msgstr "Kunde inte markera som interaktiv"
 
-#: git-rebase--preserve-merges.sh:943
+#: 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:997 git-rebase--preserve-merges.sh:1002
+#: 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"
 
@@ -22680,52 +25691,11 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "Kunde inte bestämma absolut sökväg till git-katalogen"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "köad"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "ej köad"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "binär"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "ingenting"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "oändrad"
-
-#: git-add--interactive.perl:623
-#, 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"
-
-#: git-add--interactive.perl:626
-#, 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"
-
-#: git-add--interactive.perl:629
-#, 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"
-
 #: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
@@ -22733,28 +25703,7 @@ msgid_plural "touched %d paths\n"
 msgstr[0] "rörde %d sökväg\n"
 msgstr[1] "rörde %d sökvägar\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Uppdatera"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Återställ"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "observera: %s spåras inte längre.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Lägg till ospårad"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Inga ospårade filer.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -22762,7 +25711,7 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "köas omedelbart."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -22770,7 +25719,7 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "läggas till i \"stash\" omedelbart."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -22778,8 +25727,8 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "tas bort från kön omedelbart."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: 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."
@@ -22787,8 +25736,8 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "markeras för applicering omedelbart."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: 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."
@@ -22796,16 +25745,12 @@ msgstr ""
 "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
 "markeras för kasta omedelbart."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "misslyckades öppna styckeredigeringsfil för skrivning: %s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "Manuellt styckeredigeringsläge -- se nederst för snabbguide.\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -22818,36 +25763,12 @@ msgstr ""
 "Ta bort \"%s\" rader genom att radera dem.\n"
 "Rader som börjar med %s kommer att tas bort.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-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 ""
-"Om patchen inte kan appliceras rent kommer du få en möjlighet att\n"
-"redigera den igen. Om alla rader i ett stycke tas bort avbryts\n"
-"redigeringen och stycket lämnas oförändrat.\n"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "misslyckades öppna styckesredigeringsfil för läsning: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Ditt redigerade stycke kan inte appliceras. Redigera igen (\"nej\" kastar!) "
-"[y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -22861,7 +25782,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:1252
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -22875,7 +25796,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:1258
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -22889,7 +25810,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:1264
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -22903,7 +25824,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:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -22917,7 +25838,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:1276
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -22931,7 +25852,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:1282
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -22945,7 +25866,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:1294
+#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -22959,7 +25880,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:1309
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -22981,226 +25902,90 @@ msgstr ""
 "e - redigera aktuellt stycke manuellt\n"
 "? - visa hjälp\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1345
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "Markerade stycken kan inte appliceras på indexet!\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Applicera dem på arbetskatalogen trots det? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "Ingenting applicerades.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "ignorerar ej sammanslagen: %s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "Endast binära filer ändrade.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Inga ändringar.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Uppdatera patch"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "Köa ändrat läge [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "Köa borttagning [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "Köa stycket [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "Stash:a ändrat läge [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Stash:a borttagning [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "Stash:a stycket [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, 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,?]? "
-
-#: git-add--interactive.perl:1437
-#, 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,?]? "
-
-#: git-add--interactive.perl:1438
-#, 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,?]? "
-
-#: git-add--interactive.perl:1441
-#, 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,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "Applicera borttagning på indexet [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, 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,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, 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,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, 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,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, 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,?]? "
-
-#: git-add--interactive.perl:1451
-#, 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,?]? "
-
-#: git-add--interactive.perl:1452
-#, 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,?]? "
-
-#: git-add--interactive.perl:1453
-#, 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,?]? "
-
-#: git-add--interactive.perl:1456
-#, 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,?]? "
-
-#: git-add--interactive.perl:1457
-#, 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,?]? "
-
-#: git-add--interactive.perl:1458
-#, 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,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1479
 #, 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:1467
+#: git-add--interactive.perl:1480
 #, 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:1468
+#: git-add--interactive.perl:1481
+#, 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
 #, 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:1568
+#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
 msgstr "Inga andra stycken att gå till\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "gå till vilket stycke (<ret> för att se fler)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "gå till vilket stycke? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Ogiltigt siffervärde: \"%s\"\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1622
 #, 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:1617
+#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
 msgstr "Inga andra stycken att söka efter\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "sök efter reguljärt uttryck? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "Felaktigt format på reguljärt sökuttryck %s: %s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
 msgstr "Inga stycken motsvarar givet mönster\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr "Inget föregående stycke\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr "Inget följande stycke\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr "Beklagar, kan inte dela stycket\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1736
 #, 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:1706
+#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Beklagar, kan inte redigera stycket\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Granska diff"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23217,56 +26002,73 @@ 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:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: 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
 msgid "missing --"
 msgstr "saknad --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "okänt läge för --patch: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "felaktigt argument %s, förväntar --"
 
-#: git-send-email.perl:138
+#: git-send-email.perl:129
 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:136 git-send-email.perl:142
 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:223 git-send-email.perl:229
+#: git-send-email.perl:214
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "ödesdigert: kommandot \"%s\" dog med slutkoden %d"
+
+#: git-send-email.perl:227
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
 
-#: git-send-email.perl:310
+#: git-send-email.perl:316
 #, 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:315
+#: git-send-email.perl:321
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
 
-#: git-send-email.perl:408
+#: git-send-email.perl:450
 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:481 git-send-email.perl:683
+#: 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 ""
+"ödesdigert: hittade konfigurationsflaggor för \"sendmail\"\n"
+"git-send-email konfigureras med \"sendemail.*\"-flaggor - lägg märke till \"e"
+"\".\n"
+"Sätt sendemail.forbidSendmailVariables till false för att inaktivera denna "
+"kontroll.\n"
+
+#: git-send-email.perl:530 git-send-email.perl:746
 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:484
+#: git-send-email.perl:533
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -23274,37 +26076,37 @@ msgstr ""
 "\"batch-size\" och \"relogin\" måste anges tillsammans (via kommandorad "
 "eller konfigurationsflagga)\n"
 
-#: git-send-email.perl:497
+#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
 
-#: git-send-email.perl:528
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Okänd inställning i --confirm: \"%s\"\n"
 
-#: git-send-email.perl:556
+#: git-send-email.perl:617
 #, 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:558
+#: git-send-email.perl:619
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "varning: \":include:\" stöds inte: %s\n"
 
-#: git-send-email.perl:560
+#: git-send-email.perl:621
 #, 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:565
+#: git-send-email.perl:626
 #, 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:649
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -23319,21 +26121,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:670
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Misslyckades utföra opendir %s: %s"
 
-#: git-send-email.perl:694
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"ödesdigert: %s: %s\n"
-"varning: inga patchar har sänts\n"
-
-#: git-send-email.perl:705
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -23343,17 +26136,17 @@ msgstr ""
 "Inga patchfiler angavs!\n"
 "\n"
 
-#: git-send-email.perl:718
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Ingen ärenderad i %s?"
 
-#: git-send-email.perl:728
+#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Kunde inte öppna för skrivning %s: %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -23367,38 +26160,38 @@ msgstr ""
 "\n"
 "Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
 
-#: git-send-email.perl:763
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Misslyckades öppna %s: %s"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Misslyckades öppna %s.final: %s"
 
-#: git-send-email.perl:823
+#: git-send-email.perl:886
 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:858
+#: git-send-email.perl:935
 #, 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:913
+#: git-send-email.perl:990
 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:918
+#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
-msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? "
+msgstr "Vilken åttabitarsteckenkodning ska jag ange [UTF-8]? "
 
-#: git-send-email.perl:926
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -23411,21 +26204,21 @@ msgstr ""
 "har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
 "vill sända.\n"
 
-#: git-send-email.perl:945
+#: git-send-email.perl:1022
 msgid "To whom should the emails be sent (if anyone)?"
-msgstr "Till vem skall breven sändas (om någon)?"
+msgstr "Till vem ska breven sändas (om någon)?"
 
-#: git-send-email.perl:963
+#: git-send-email.perl:1040
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
 
-#: git-send-email.perl:975
+#: git-send-email.perl:1052
 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:1033 git-send-email.perl:1041
+#: git-send-email.perl:1114 git-send-email.perl:1122
 #, 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"
@@ -23433,16 +26226,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:1045
+#: git-send-email.perl:1126
 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:1362
+#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA-sökvägen \"%s\" finns inte"
 
-#: git-send-email.perl:1445
+#: 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"
@@ -23469,124 +26262,139 @@ 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:1460
+#: git-send-email.perl:1544
 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:1463
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr "Svar krävs på frågan \"Sända brevet?\""
 
-#: git-send-email.perl:1491
+#: git-send-email.perl:1581
 msgid "The required SMTP server is not properly defined."
 msgstr "Nödvändig SMTP-server har inte angivits korrekt."
 
-#: git-send-email.perl:1538
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Servern stöder inte SMARTTLS! %s"
 
-#: git-send-email.perl:1543 git-send-email.perl:1547
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS misslyckades! %s"
 
-#: git-send-email.perl:1556
+#: git-send-email.perl:1646
 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:1574
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Misslyckades sända %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Test-Sände %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Sände %s\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "Test-OK. Loggen säger:\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK. Loggen säger:\n"
 
-#: git-send-email.perl:1591
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Resultat: "
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Resultat: OK\n"
 
-#: git-send-email.perl:1612
+#: git-send-email.perl:1709
 #, perl-format
 msgid "can't open file %s"
 msgstr "kan inte öppna filen %s"
 
-#: git-send-email.perl:1659 git-send-email.perl:1679
+#: git-send-email.perl:1756 git-send-email.perl:1776
 #, 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:1665
+#: git-send-email.perl:1762
 #, 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:1718
+#: git-send-email.perl:1819
 #, 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:1753
+#: git-send-email.perl:1854
 #, 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:1864
+#: git-send-email.perl:1965
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Kunde inte köra \"%s\""
 
-#: git-send-email.perl:1871
+#: git-send-email.perl:1972
 #, 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:1875
+#: git-send-email.perl:1976
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) misslyckades stänga röret till \"%s\""
 
-#: git-send-email.perl:1905
+#: git-send-email.perl:2006
 msgid "cannot send message as 7bit"
 msgstr "kan inte sända brev som sjubitars"
 
-#: git-send-email.perl:1913
+#: git-send-email.perl:2014
 msgid "invalid transfer encoding"
 msgstr "ogiltig överföringskondning"
 
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: 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 ""
+"ödesdigert: %s: refuserad av sendemail-validate-kroken\n"
+"%s\n"
+"varning: inga patchar har sänts\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 "kunde inte öppna %s: %s\n"
 
-#: git-send-email.perl:1957
+#: git-send-email.perl:2064
 #, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s: patchen innehåller en rad längre än 998 tecken"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"ödesdigert: %s:%d är längre än 998 tecken\n"
+"varning: inga patchar har sänts\n"
 
-#: git-send-email.perl:1974
+#: git-send-email.perl:2082
 #, perl-format
 msgid "Skipping %s with backup suffix '%s'.\n"
 msgstr ""
@@ -23594,11 +26402,556 @@ msgstr ""
 "säkerhetskopior.\n"
 
 #. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1978
+#: git-send-email.perl:2086
 #, perl-format
 msgid "Do you really want to send %s? [y|N]: "
 msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 
+#~ 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."
+
+#~ msgid "both"
+#~ msgstr "båda"
+
+#~ msgid "one"
+#~ msgstr "en"
+
+#~ msgid "Already up to date!"
+#~ msgstr "Redan à jour!"
+
+#~ msgid "Already up to date. Yeeah!"
+#~ msgstr "Redan à jour. Toppen!"
+
+#~ msgid "--batch-size option is only for 'repack' subcommand"
+#~ msgstr "flaggan --batch-size används bara i underkommandot \"repack\""
+
+#~ msgid "Percentage by which creation is weighted"
+#~ msgstr "Procent som skapelse vägs med"
+
+#~ msgid ""
+#~ "the rebase.useBuiltin support has been removed!\n"
+#~ "See its entry in 'git help config' for details."
+#~ msgstr ""
+#~ "stödet för rebase.useBuiltin har tagits bort!\n"
+#~ "Se posten för det i \"git help config\" för detaljer."
+
+#~ msgid "%s: patch contains a line longer than 998 characters"
+#~ msgstr "%s: patchen innehåller en rad längre än 998 tecken"
+
+#~ msgid "repository contains replace objects; skipping commit-graph"
+#~ msgstr "arkivet innehåller replace-objekt; hoppar över incheckningsgraf"
+
+#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
+#~ msgstr ""
+#~ "arkivet innehåller ympningar (avråds från); hoppar över incheckningsgraf"
+
+#~ msgid "repository is shallow; skipping commit-graph"
+#~ msgstr "källarkivet är grunt; hoppar över incheckningsgraf"
+
+#~ msgid "commit-graph improper chunk offset %08x%08x"
+#~ msgstr "felaktigt offset för stycke %08x%08x i incheckningsgraffilen"
+
+#~ msgid "commit-graph chunk id %08x appears multiple times"
+#~ msgstr "incheckningsgrafens stycke-id %08x förekommer flera gånger"
+
+#~ msgid "invalid chunk offset (too large)"
+#~ msgstr "felaktigt offset för stycke (för stort)"
+
+#~ msgid "Writing chunks to multi-pack-index"
+#~ msgstr "Skriver stycken till multi-pack-index"
+
+#~ msgid "rev-list died"
+#~ msgstr "rev-list dog"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
+#~ "<good_term> <bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-write [--no-log] <tillstånd> <revision> <term-"
+#~ "för-rätt> <term-för-fel>"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+#~ "<bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-check-and-set-terms <kommadno> <term-för-"
+#~ "rätt> <term-för-fel>"
+
+#~ msgid "git bisect--helper --bisect-auto-next"
+#~ msgstr "git bisect--helper --bisect-auto-next"
+
+#~ msgid "write out the bisection state in BISECT_LOG"
+#~ msgstr "skriver bisect-tillståndet i BISECT_LOG"
+
+#~ msgid "check and set terms in a bisection state"
+#~ msgstr "visa och ange termer för bisect-tillstånd"
+
+#~ msgid ""
+#~ "verify the next bisection state then checkout the next bisection commit"
+#~ msgstr ""
+#~ "kontrollera nästa bisect-tillstånd och checka så ut nästa bisect-"
+#~ "incheckning"
+
+#~ msgid "--bisect-write requires either 4 or 5 arguments"
+#~ msgstr "--bisect-write kräver antingen 4 eller 5 argument"
+
+#~ msgid "--check-and-set-terms requires 3 arguments"
+#~ msgstr "--check-and-set-terms kräver tre argument"
+
+#~ msgid "--bisect-auto-next requires 0 arguments"
+#~ msgstr "--bisect-auto-next kräver 0 argument"
+
+#~ msgid "Force progress reporting"
+#~ msgstr "Tvinga förloppsrapportering"
+
+#~ msgid "Error deleting remote-tracking branch '%s'"
+#~ msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
+
+#~ msgid "Error deleting branch '%s'"
+#~ msgstr "Fel vid borttagning av grenen \"%s\""
+
+#~ msgid "show parse tree for grep expression"
+#~ msgstr "visa analysträd för grep-uttryck"
+
+#~ msgid "too many parameters"
+#~ msgstr "för många parametrar"
+
+#~ msgid "too few parameters"
+#~ msgstr "för få parametrar"
+
+#~ msgid "Recurse into nested submodules"
+#~ msgstr "Rekursera in i nästlade undermoduler"
+
+#~ msgid "too many params"
+#~ msgstr "för många parametrar"
+
+#~ msgid "Bad rev input: $arg"
+#~ msgstr "Felaktig rev-indata: $arg"
+
+#~ msgid "Counting distinct commits in commit graph"
+#~ msgstr "Räknar olika incheckningar i incheckningsgraf"
+
+#~ msgid "the commit graph format cannot write %d commits"
+#~ msgstr "formatet på incheckningsgrafen kan inte visa %d incheckningar"
+
+#~ msgid "store only"
+#~ msgstr "endast spara"
+
+#~ msgid "compress faster"
+#~ msgstr "komprimera snabbare"
+
+#~ msgid "compress better"
+#~ msgstr "komprimera bättre"
+
+#~ msgid "unexpected duplicate commit id %s"
+#~ msgstr "oväntat duplicerat inchecknings-id %s"
+
+#~ msgid "error preparing packfile from multi-pack-index"
+#~ msgstr "fel när paketfiler från multi-pack-index skulle förberedas"
+
+#~ msgid "%s: not a valid OID"
+#~ msgstr "%s: inte ett giltigt OID"
+
+#~ msgid "invalid committer '%s'"
+#~ msgstr "ogiltig incheckare %s"
+
+#~ msgid "invalid committer: %s"
+#~ msgstr "ogiltig incheckare: %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 <term-för-fel> <term-för-rätt>"
+
+#~ msgid "git bisect--helper --bisect-autostart"
+#~ msgstr "git bisect--helper --bisect-autostart"
+
+#~ msgid "perform 'git bisect next'"
+#~ msgstr "utför 'git bisect next'"
+
+#~ msgid "write the terms to .git/BISECT_TERMS"
+#~ msgstr "skriv termerna i .git/BISECT_TERMS"
+
+#~ msgid "cleanup the bisection state"
+#~ msgstr "städar upp bisect-tillstånd"
+
+#~ msgid "check for expected revs"
+#~ msgstr "kontrollera för förväntade versioner"
+
+#~ msgid "start the bisection if it has not yet been started"
+#~ msgstr "påbörja bisect om det inte redan har startats"
+
+#~ msgid "--write-terms requires two arguments"
+#~ msgstr "--write-terms kräver två argument"
+
+#~ msgid "--bisect-clean-state requires no arguments"
+#~ msgstr "--bisect-clean-state tar inga argument"
+
+#~ msgid "--bisect-autostart does not accept arguments"
+#~ msgstr "--bisect-autostart tar inga argument"
+
+#~ msgid "n,m"
+#~ msgstr "n,m"
+
+#~ msgid "Process line range n,m in file, counting from 1"
+#~ msgstr "Behandla radintervallet n,m i filen, med början på 1"
+
+#~ msgid "name of output directory is too long"
+#~ msgstr "namnet på utdatakatalogen är för långt"
+
+#~ msgid "standard output, or directory, which one?"
+#~ msgstr "standard ut, eller katalog, vilken ska det vara?"
+
+#~ 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 ""
+#~ "VARNING: Namnen på några paket har bytts genom att\n"
+#~ "VARNING: lägga till old- före namnen, för att byta\n"
+#~ "VARNING: dem mot den nya versionen av filen. Men\n"
+#~ "VARNING: operationen misslyckades, och försöket att\n"
+#~ "VARNING: byta tillbaka till det ursprungliga\n"
+#~ "VARNING: namnet misslyckades också.\n"
+#~ "VARNING: Byt namn på dem i %s manuellt:\n"
+
+#~ msgid "failed to remove '%s'"
+#~ msgstr "misslyckades ta bort \"%s\""
+
+#~ msgid "Routines to help parsing remote repository access parameters"
+#~ msgstr ""
+#~ "Rutiner för att göra det lättare att tolka åtkomstparametrar för "
+#~ "fjärrarkiv"
+
+#~ msgid "Bad rev input: $bisected_head"
+#~ msgstr "Felaktig rev-indata: $bisected_head"
+
+#~ msgid "Bad rev input: $rev"
+#~ msgstr "Felaktig rev-indata: $rev"
+
+#~ msgid "See git-${cmd}(1) for details."
+#~ msgstr "Se git-${cmd}(1) för detaljer."
+
+#~ msgid "unknown hash algorithm length"
+#~ msgstr "okänd hashningsalgoritmlängd"
+
+#~ msgid ""
+#~ "commit-graph chunk lookup table entry missing; file may be incomplete"
+#~ msgstr ""
+#~ "incheckningsgrafen saknar post i styckeuppslagningstabell; filen kan vara "
+#~ "ofullständig"
+
+#~ msgid "Writing changed paths Bloom filters index"
+#~ msgstr "Skriver Bloom-filterindex för ändrade sökvägar"
+
+#~ msgid "hash version %u does not match"
+#~ msgstr "hash-versionen %u stämmer inte"
+
+#~ msgid "Remote with no URL"
+#~ msgstr "Fjärr utan URL"
+
+#~ msgid "%%(subject) does not take arguments"
+#~ msgstr "%%(subject) tar inte argument"
+
+#~ msgid "positive value expected objectname:short=%s"
+#~ msgstr "positivt värde förväntat objectname:short=%s"
+
+#~ msgid "unrecognized %%(objectname) argument: %s"
+#~ msgstr "okänt %%(objectname)-argument: %s"
+
+#~ msgid "option `%s' is incompatible with --merged"
+#~ msgstr "flaggan \"%s\" är inkompatibel med --merged"
+
+#~ msgid "option `%s' is incompatible with --no-merged"
+#~ msgstr "flaggan \"%s\" är inkompatibel med --no-merged"
+
+#~ msgid "could not open '%s' for writing: %s"
+#~ msgstr "kunde inte öppna \"%s\" för skrivning: %s"
+
+#~ msgid "could not read ref '%s'"
+#~ msgstr "Kunde inte läsa referensen \"%s\""
+
+#~ msgid "ref '%s' already exists"
+#~ msgstr "referensen \"%s\" finns redan"
+
+#~ msgid "unexpected object ID when writing '%s'"
+#~ msgstr "oväntat objekt-id vid skrivning \"%s\""
+
+#~ msgid "unexpected object ID when deleting '%s'"
+#~ msgstr "oväntat objekt-id vid borttagning \"%s\""
+
+#~ msgid "The hash algorithm %s is not supported in this build."
+#~ msgstr "Hashningsalgoritmen %s stöds inte i detta bygge."
+
+#~ msgid "could not open the file BISECT_TERMS"
+#~ msgstr "kunde inte öppna filen BISECT_TERMS"
+
+#~ msgid "update BISECT_HEAD instead of checking out the current commit"
+#~ msgstr ""
+#~ "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
+
+#~ msgid "print only names (no SHA-1)"
+#~ msgstr "skriv endast namn (ingen SHA-1)"
+
+#~ msgid "passed to 'git am'"
+#~ msgstr "sänds till \"git am\""
+
+#~ msgid "The --cached option cannot be used with the --files option"
+#~ msgstr "Flaggan --cached kan inte användas med flaggan --files"
+
+#~ msgid "  Warn: $display_name doesn't contain commit $sha1_src"
+#~ msgstr "  Varning: $display_name innehåller inte incheckningen $sha1_src"
+
+#~ msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
+#~ msgstr "  Varning: $display_name innehåller inte incheckningen $sha1_dst"
+
+#~ msgid ""
+#~ "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+#~ msgstr ""
+#~ "  Varning: $display_name innehåller inte incheckningarna $sha1_src och "
+#~ "$sha1_dst"
+
+#~ msgid "Finding commits for commit graph from %d ref"
+#~ msgid_plural "Finding commits for commit graph from %d refs"
+#~ msgstr[0] "Söker incheckningar för incheckingsgraf från %d referens"
+#~ msgstr[1] "Söker incheckningar för incheckingsgraf från %d referenser"
+
+#~ msgid "invalid commit object id: %s"
+#~ msgstr "ogiltigt inchecknings-objekt-id %s"
+
+#~ msgid "Removing worktrees/%s: not a valid directory"
+#~ msgstr "Tar bort worktrees/%s: inte en giltig katalog"
+
+#~ msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+#~ msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
+
+#~ msgid "Removing worktrees/%s: invalid gitdir file"
+#~ msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
+
+#~ msgid "unable to re-add worktree '%s'"
+#~ msgstr "kunde inte lägga in arbetskatalogen \"%s\" igen"
+
+#~ msgid "target '%s' already exists"
+#~ msgstr "målet \"%s\" finns redan"
+
+#~ msgid ""
+#~ "Cannot update sparse checkout: the following entries are not up to date:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The following working tree files would be overwritten by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Följande filer i arbetskatalogen skulle skrivas över av uppdatering av "
+#~ "gles utcheckning:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "The following working tree files would be removed by sparse checkout "
+#~ "update:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Följande filer i arbetskatalogen skulle tas bort av uppdatering av gles "
+#~ "utcheckning:\n"
+#~ "%s"
+
+#~ msgid "annotated tag %s has no embedded name"
+#~ msgstr "den annoterade taggen %s har inget inbäddat namn"
+
+#~ msgid "automatically stash/stash pop before and after rebase"
+#~ msgstr "utför automatiskt stash/stash pop före och efter ombasering"
+
+#~ msgid "--[no-]autostash option is only valid with --rebase."
+#~ msgstr "--[no-]autostash är endast giltig med --rebase."
+
+#~ msgid "(DEPRECATED) keep empty commits"
+#~ msgstr "(FÖRÅLDRAD) behåll tomma incheckningar"
+
+#~ msgid "Could not read '%s'"
+#~ msgstr "Kunde inte läsa \"%s\""
+
+#~ msgid "Cannot store %s"
+#~ msgstr "Kan inte spara %s"
+
+#~ msgid "set sparse-checkout patterns"
+#~ msgstr "ställ in filter för gles utcheckning"
+
+#~ msgid "disable sparse-checkout"
+#~ msgstr "inaktivera gles utcheckning"
+
+#~ msgid "could not exec %s"
+#~ msgstr "kunde inte köra %s"
+
+#~ msgid "Cannot remove temporary index (can't happen)"
+#~ msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
+
+#~ msgid "Cannot update $ref_stash with $w_commit"
+#~ msgstr "Kan inte uppdatera $ref_stash med $w_commit"
+
+#~ msgid "error: unknown option for 'stash push': $option"
+#~ msgstr "fel: okänd flagga för \"stash push\": $option"
+
+#~ msgid "Saved working directory and index state $stash_msg"
+#~ msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
+
+#~ msgid "unknown option: $opt"
+#~ msgstr "okänd flagga: $opt"
+
+#~ msgid "Too many revisions specified: $REV"
+#~ msgstr "För många revisioner angivna: $REV"
+
+#~ msgid "$reference is not a valid reference"
+#~ msgstr "$reference är inte en giltig referens"
+
+#~ msgid "'$args' is not a stash-like commit"
+#~ msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
+
+#~ msgid "'$args' is not a stash reference"
+#~ msgstr "\"$args\" är inte en \"stash\"-referens"
+
+#~ msgid "unable to refresh index"
+#~ msgstr "kan inte uppdatera indexet"
+
+#~ msgid "Cannot apply a stash in the middle of a merge"
+#~ msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
+
+#~ msgid "Conflicts in index. Try without --index."
+#~ msgstr "Konflikter i indexet. Testa utan --index."
+
+#~ msgid "Could not save index tree"
+#~ msgstr "Kunde inte spara indexträd"
+
+#~ msgid "Could not restore untracked files from stash entry"
+#~ msgstr "Kunde inte återställa ospårade filer från stash-post"
+
+#~ msgid "Cannot unstage modified files"
+#~ msgstr "Kan inte ta bort ändrade filer ur kön"
+
+#~ msgid "Dropped ${REV} ($s)"
+#~ msgstr "Kastade ${REV} ($s)"
+
+#~ msgid "${REV}: Could not drop stash entry"
+#~ msgstr "${REV}: Kunde inte kasta \"stash\"-post"
+
+#~ msgid "(To restore them type \"git stash apply\")"
+#~ msgstr "(För att återställa dem, skriv \"git stash apply\")"
+
+#~ msgid "{drop,keep,ask}"
+#~ msgstr "{drop,keep,ask}"
+
+#~ msgid "Stage mode change [y,n,a,q,d%s,?]? "
+#~ msgstr "Köa ändrat läge [y,n,a,q,d%s,?]? "
+
+#~ msgid "Stage deletion [y,n,a,q,d%s,?]? "
+#~ msgstr "Köa borttagning [y,n,a,q,d%s,?]? "
+
+#~ msgid "Stage this hunk [y,n,a,q,d%s,?]? "
+#~ msgstr "Köa stycket [y,n,a,q,d%s,?]? "
+
+#~ msgid ""
+#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
+#~ "marked for staging.\n"
+#~ msgstr ""
+#~ "Om patchen kan appliceras rent kommer det redigerade stycket att\n"
+#~ "köas omedelbart.\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 - köa stycket\n"
+#~ "n - köa inte stycket\n"
+#~ "q - avsluta; köa inte stycket eller något av de följande\n"
+#~ "a - köa detta och alla följande stycken\n"
+#~ "d - köa inte stycket eller något av de stycken som följer\n"
+
+#~ msgid "could not copy '%s' to '%s'."
+#~ msgstr "kunde inte kopiera \"%s\" till \"%s\"."
+
+#~ msgid "malformed ident line"
+#~ msgstr "felaktig ident-rad"
+
+#~ msgid "could not parse '%.*s'"
+#~ msgstr "kunde inte tolka \"%.*s\""
+
+#~ msgid "could not checkout %s"
+#~ msgstr "kunde inte checka ut %s"
+
+#~ msgid "filename in tree entry contains backslash: '%s'"
+#~ msgstr "filnamnet i trädet innehåller omvänt snedstreck: \"%s\""
+
+#~ msgid "Use -f if you really want to add them.\n"
+#~ msgstr "Använd -f om du verkligen vill lägga till dem.\n"
+
+#~ msgid "Maybe you wanted to say 'git add .'?\n"
+#~ msgstr "Kanske menade du att skriva \"git add .\"?\n"
+
+#~ msgid "packfile is invalid: %s"
+#~ msgstr "packfil är ogiltig: %s"
+
+#~ msgid "unable to open packfile for reuse: %s"
+#~ msgstr "kan inte öppna packfil för återanvändning: %s"
+
+#~ msgid "unable to seek in reused packfile"
+#~ msgstr "kan inte söka i återanvänd packfil"
+
+#~ msgid "unable to read from reused packfile"
+#~ msgstr "kan inte läsa från återanvänd packfil"
+
+#~ msgid "no HEAD?"
+#~ msgstr "inget HEAD?"
+
+#~ msgid "preserve empty commits during rebase"
+#~ msgstr "behåll tomma incheckningar under ombasering"
+
+#~ msgid "cannot combine --use-bitmap-index with object filtering"
+#~ msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
+
+#~ 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 ""
+#~ "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n"
+#~ "$sm_path\n"
+#~ "Använd -f om du verkligen vill lägga till den."
+
+#~ msgid "Use an experimental heuristic to improve diffs"
+#~ msgstr "Använd en experimentell algoritm för att förbättra diffar"
+
+#~ msgid "git commit-graph [--object-dir <objdir>]"
+#~ msgstr "git commit-graph [--object-dir <objkat>]"
+
+#~ msgid "git commit-graph read [--object-dir <objdir>]"
+#~ msgstr "git commit-graph read [--object-dir <objkat>]"
+
 #~ msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 #~ msgstr ""
 #~ "okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep"
@@ -23692,12 +27045,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "Server supports ofs-delta"
 #~ msgstr "Servern stöder \"ofs-delta\""
 
-#~ msgid "(HEAD detached at %s)"
-#~ msgstr "(HEAD frånkopplat vid %s)"
-
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD frånkopplat från %s)"
-
 #~ msgid "Checking out files"
 #~ msgstr "Checkar ut filer"
 
@@ -23705,9 +27052,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgstr ""
 #~ "kan inte vara interaktiv om standard in inte är ansluten till en terminal."
 
-#~ msgid "failed to open '%s'"
-#~ msgstr "misslyckades öppna \"%s\""
-
 #~ msgid "failed to stat %s\n"
 #~ msgstr "misslyckades ta status på %s\n"
 
@@ -23729,9 +27073,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "unrecognized verb: %s"
 #~ msgstr "okänt verb: %s"
 
-#~ msgid "hash version %X does not match version %X"
-#~ msgstr "hash-versionen %X stämmer inte med versionen %X"
-
 #~ msgid "option '%s' requires a value"
 #~ msgstr "flaggan \"%s\" behöver ett värde"
 
@@ -23894,9 +27235,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "make rebase script"
 #~ msgstr "skapa ombaseringsskript"
 
-#~ msgid "No such remote: %s"
-#~ msgstr "Inget sådant fjärrarkiv: %s"
-
 #~ msgid "cannot move a locked working tree"
 #~ msgstr "kan inte flytta en låst arbetskatalog"
 
@@ -23962,7 +27300,7 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ "\t%.*s"
 
 #~ msgid "BUG: returned path string doesn't match cwd?"
-#~ msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
+#~ msgstr "BUG: returnerad sökvägssträng motsvarar inte cwd?"
 
 #~ msgid "Error in object"
 #~ msgstr "Fel i objekt"
@@ -24032,11 +27370,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgstr ""
 #~ "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
 
-#~ msgid "%"
-#~ msgid_plural "%"
-#~ msgstr[0] "%"
-#~ msgstr[1] "%"
-
 #~ msgid "%s, %"
 #~ msgid_plural "%s, %"
 #~ msgstr[0] "%s. %"
@@ -24124,9 +27457,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "commit object"
 #~ msgstr "incheckningsobjekt"
 
-#~ msgid "tree object"
-#~ msgstr "trädobjekt"
-
 #~ msgid "blob object"
 #~ msgstr "blob-objekt"
 
@@ -24167,9 +27497,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "insanely long object directory %.*s"
 #~ msgstr "tokigt lång objektkatalog %.*s"
 
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
-
 #~ msgid "tag name too long: %.*s..."
 #~ msgstr "taggnamnet för långt: %.*s..."
 
@@ -24224,18 +27551,12 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "Cannot cherry-pick during another cherry-pick."
 #~ msgstr "Kan inte utföra \"cherry-pick\" under en annan \"cherry-pick\"."
 
-#~ msgid "Could not parse line %d."
-#~ msgstr "Kan inte tolka rad %d."
-
 #~ msgid "Could not open %s"
 #~ msgstr "Kunde inte öppna %s"
 
 #~ msgid "Could not format %s."
 #~ msgstr "Kunde inte formatera %s."
 
-#~ msgid "%s: %s"
-#~ msgstr "%s: %s"
-
 #~ msgid "You need to set your committer info first"
 #~ msgstr "Du måste ställa in din incheckarinformation först"
 
@@ -24276,9 +27597,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ "felaktigt numeriskt konfigurationsvärde \"%s\" för \"%s\" i %s: ogiltig "
 #~ "enhet"
 
-#~ msgid "This is the 2nd commit message:"
-#~ msgstr "Det här är 2:a incheckningsmeddelandet:"
-
 #~ msgid "This is the 3rd commit message:"
 #~ msgstr "Det här är 3:e incheckningsmeddelandet:"
 
@@ -24315,9 +27633,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "This is the ${n}rd commit message:"
 #~ msgstr "Det här är ${n}:e incheckningsmeddelandet:"
 
-#~ msgid "The 1st commit message will be skipped:"
-#~ msgstr "1:a incheckningsmeddelandet kommer hoppas över:"
-
 #~ msgid "The 2nd commit message will be skipped:"
 #~ msgstr "2:a incheckningsmeddelandet kommer hoppas över:"
 
@@ -24404,9 +27719,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"
 
@@ -24428,9 +27740,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "removing '%s' failed"
 #~ msgstr "misslyckades ta bort \"%s\""
 
-#~ msgid "Please call 'bisect_state' with at least one argument."
-#~ msgstr "Anropa \"bisect_state\" med minst ett argument."
-
 #~ msgid ""
 #~ "If you want to reuse this local git directory instead of cloning again "
 #~ "from"
@@ -24582,9 +27891,6 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "false|true|preserve"
 #~ msgstr "false|true|preserve"
 
-#~ msgid "unsupported sort specification '%s'"
-#~ msgstr "sorteringsangivelsen \"%s\" stöds ej"
-
 #~ msgid "unsupported sort specification '%s' in variable '%s'"
 #~ msgstr "sorteringsangivelsen \"%s\" i variabeln \"%s\" stöds ej"
 
@@ -24928,15 +28234,9 @@ msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
 #~ msgid "--detach cannot be used with -b/-B/--orphan"
 #~ msgstr "--detcah kan inte användas med -b/-B/--orphan"
 
-#~ msgid "--detach cannot be used with -t"
-#~ msgstr "--detach kan inte användas med -t"
-
 #~ msgid "--orphan and -b|-B are mutually exclusive"
 #~ msgstr "--orphan och -b|-B kan inte användas samtidigt"
 
-#~ msgid "--orphan cannot be used with -t"
-#~ msgstr "--orphan kan inte användas med -t"
-
 #~ msgid "git checkout: -f and -m are incompatible"
 #~ msgstr "git checkout: -f och -m är inkompatibla"
 
diff --git a/po/tr.po b/po/tr.po
new file mode 100644
index 0000000000..84b8be361f
--- /dev/null
+++ b/po/tr.po
@@ -0,0 +1,26503 @@
+# Turkish translations for Git
+# Git Türkçe çevirileri
+# Copyright (C) 2020-2021 Emir SARI <emir_sari@msn.com>
+# This file is distributed under the same license as the Git package.
+# Emir SARI <emir_sari@msn.com>, 2020-2021
+#
+# ######################################################### #
+#     Git Türkçe kavramlar dizini / Git Turkish Glossary    #
+#                                                           #
+# İngilizce                   | Türkçe                      #
+# ––––––––––––––––––––––––––––––––––––––––––––––––––––––––––#
+# 3-way merge                 | 3 yönlü birleştirme         #
+# bare repository             | çıplak depo                 #
+# blame                       | genel bakış                 #
+# blob object                 | ikili nesne                 #
+# branch                      | dal                         #
+# bundle                      | demet                       #
+# checkout                    | çıkış yapım/yapmak          #
+# chunk                       | iri parça                   #
+# clone                       | klon(lamak)                 #
+# commit (ad)                 | iÅŸleme                      #
+# commit (eyl.)               | iÅŸlemek                     #
+# commitish                   | iÅŸlememsi                   #
+# conflict                    | çakışma                     #
+# dangling object             | sallanan nesne              #
+# detached HEAD               | ayrık HEAD                  #
+# dirty                       | kirli                       #
+# evil merge                  | uÄŸursuz birleÅŸtirme         #
+# fast-forward                | ileri sarım/sarmak          #
+# fetch                       | getirme(k)                  #
+# fixup                       | düzeltmek                   #
+# graft                       | aşı                         #
+# hash                        | saÄŸlama                     #
+# head                        | dal ucu                     #
+# hunk                        | parça                       #
+# inflate                     | söndürmek                   #
+# init                        | ilklendirmek                #
+# mark                        | im(lemek)                   #
+# merge                       | birleÅŸtirme(k)              #
+# octopus                     | ahtapot                     #
+# overlay                     | yerpaylaşım                 #
+# pack                        | paket                       #
+# parent                      | üst öge                     #
+# patch                       | yama                        #
+# pathspec                    | yol belirteci               #
+# pattern                     | dizgi                       #
+# porcelain                   | okunabilir                  #
+# prune                       | budamak                     #
+# pseudoref                   | yalancıktan başvuru         #
+# pull                        | çekme(k)                    #
+# push                        | itme(k)                     #
+# rebase                      | yeniden temellendirme(k)    #
+# record                      | kayıt yaz(mak)              #
+# ref                         | baÅŸvuru                     #
+# reflog                      | başvuru günlüğü             #
+# refspec                     | baÅŸvuru belirteci           #
+# register                    | kayıt yap(mak)              #
+# remote                      | uzak konum                  #
+# remote repository           | uzak depo                   #
+# remote-tracking branch      | uzak izleme dalı            #
+# repository                  | depo                        #
+# resolve                     | çözüm/çözmek                #
+# revert                      | geri al(mak)                #
+# rewind                      | geri sar(mak)               #
+# save                        | kaydet(mek)                 #
+# shallow clone               | sığ klon                    #
+# shallow repository          | sığ depo                    #
+# sparse-checkout             | aralıklı çıkış              #
+# squash                      | tıkıştır(mak)               #
+# stage                       | hazırla(mak)                #
+# staging area                | (işleme) hazırlama alanı    #
+# stash                       | zula(lamak)                 #
+# string                      | dizi                        #
+# subdirectory                | altdizin                    #
+# submodule                   | altmodül                    #
+# symlink                     | sembolik baÄŸ                #
+# symref                      | sembolik baÅŸvuru            #
+# tag                         | etiket                      #
+# template                    | ÅŸablon                      #
+# topic branch                | kiÅŸisel dal                 #
+# trailer                     | artbilgi                    #
+# tree                        | ağaç                        #
+# treeish                     | ağacımsı                    #
+# unstage                     | hazırlıktan çıkar(mak)      #
+# upstream                    | üstkaynak                   #
+# worktree/working tree       | çalışma ağacı               #
+# ######################################################### #
+#
+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-08-14 07:56+0800\n"
+"PO-Revision-Date: 2021-08-03 18:00+0300\n"
+"Last-Translator: Emir SARI <emir_sari@msn.com>\n"
+"Language-Team: Turkish (https://github.com/bitigchi/git-po/)\n"
+"Language: tr\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"
+
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Pardon (%s)?"
+
+#: 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 "indeks okunamadı"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "ikili"
+
+#: add-interactive.c:642 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
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "deÄŸiÅŸtirilmemiÅŸ"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "Güncelle"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr "'%s' hazırlanamadı"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+msgid "could not write index"
+msgstr "indeks yazılamadı"
+
+#: add-interactive.c:706 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
+#, 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
+#, 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
+msgid "Revert"
+msgstr "Geri al"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "HEAD^{tree} ayrıştırılamadı"
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "Ä°zlenmeyen dosya yok.\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "Ä°zlenmeyenleri ekle"
+
+#: add-interactive.c:895 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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "birleştirilmeyenler yok sayılıyor: %s"
+
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "Yalnızca ikili dosyalar değiştirildi.\n"
+
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "DeÄŸiÅŸiklik yok.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Yama güncellemesi"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "diff'i gözden geçir"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "değiştirilmiş yolları göster"
+
+#: add-interactive.c:1012
+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
+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
+msgid "pick hunks and update selectively"
+msgstr "parçaları seç ve seçerek güncelle"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "HEAD ve indeks arasındaki diff'i gör"
+
+#: add-interactive.c:1020
+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
+msgid "Prompt help:"
+msgstr "İstem yardımı:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "tek bir öge seç"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "bir öge erimi seç"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "birden çok erim seç"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "benzersiz öneke dayanarak öge seç"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "belirtilen ögelerin seçimini kaldır"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "tüm ögeleri seç"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(boş) seçimi bitir"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "numaralandırılmış bir öge seç"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(boş) hiçbir şey seçme"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Komutlar ***"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Åžimdi ne olacak"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "hazırlanmış"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "hazırlanmamış"
+
+#: 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 "yol"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "indeks yenilenemedi"
+
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "Güle güle.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:39
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal hazırlama için "
+"imlenecektir."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parçayı hazırla\n"
+"n - bu parçayı hazırlama\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini hazırlama\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:61
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal zulalama için "
+"imlenecektir."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parçayı zulala\n"
+"n - bu parçayı zulalama\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini zulalama\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:85
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Eğer yama sorunsuzca uygulanırsa, düzenlenen parça derhal hazırlıktan "
+"çıkarım için imlenecektir."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parçayı hazırlıktan çıkar\n"
+"n - bu parçayı hazırlıktan çıkarma\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini hazırlıktan çıkarma\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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 ""
+"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal uygulama için "
+"imlenecektir."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parçayı indekse uygula\n"
+"n - bu parçayı indekse uygulama\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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 ""
+"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal ıskartaya çıkarım "
+"için imlenecektir."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parçayı çalışma ağacından at\n"
+"n - bu parçayı çalışma ağacından atma\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini atma\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parçayı çalışma ağacından ve indeksten at\n"
+"n - bu parçayı çalışma ağacından ve indeksten atma\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini atma\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parçayı indekse ve çalışma ağacına uygula\n"
+"n - bu parçayı indekse ve çalışma ağacına uygulama\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n"
+"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:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - bu parçayı çalışma ağacına uygula\n"
+"n - bu parçayı çalışma ağacına uygulama\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n"
+"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:343
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "parça üstbilgisi '%.*s' ayrıştırılamadı"
+
+#: 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:420
+msgid "could not parse diff"
+msgstr "diff ayrıştırılamadı"
+
+#: add-patch.c:439
+msgid "could not parse colored diff"
+msgstr "renklendirilmiş diff ayrıştırılamadı"
+
+#: add-patch.c:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr "'%s' çalıştırılamadı"
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "interactive.diffFilter ögesinden eşleşmeyen çıktı"
+
+#: add-patch.c:613
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"Süzgeciniz kendisinin girdi ve çıktı satırları arasında\n"
+"birebir karşılık sağlamalıdır."
+
+#: add-patch.c:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"şurada bağlam satırı #%d bekleniyordu:\n"
+"%.*s"
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"parçalar üst üste binmiyor:\n"
+"%.*s\n"
+"\tÅŸununla bitmiyor:\n"
+"%.*s"
+
+#: 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:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"'%c' satır kaldırmak için onları ' ' satır yapın (bağlam).\n"
+"'%c' satır kaldırmak için onları silin.\n"
+"%c kaldırılacak.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: 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 ""
+"Eğer sorunsuzca uygulanamazsa yeniden düzenlemeniz için bir olanak\n"
+"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:1133
+msgid "could not parse hunk header"
+msgstr "parça üstbilgisi ayrıştırılamadı"
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' başarısız oldu"
+
+#. 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.
+#.
+#. 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:1247 git-add--interactive.perl:1242
+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:1290
+msgid "The selected hunks do not apply to the index!"
+msgstr "Seçili parçalar indekse uygulanamıyor!"
+
+#: add-patch.c:1291 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Çalışma ağacına yine de uygulansın mı? "
+
+#: add-patch.c:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "Hiçbir şey uygulanmadı.\n"
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - bu parça için sonra karar ver, bir sonraki karar verilmemiş parçayı gör\n"
+"J - bu parça için sonra karar ver, bir sonraki parçayı gör\n"
+"k - bu parça için sonra karar ver, bir önceki karar verilmemiş parçayı gör\n"
+"K - bu parça için sonra karar ver, bir önceki parçayı gör\n"
+"g - gidilecek bir parça seç\n"
+"/ - verilen düzenli ifade ile eşleşen bir parça ara\n"
+"s - geçerli parçayı daha ufak parçalara böl\n"
+"e - geçerli parçayı el ile düzenle\n"
+"? - yardımı yazdır\n"
+
+#: add-patch.c:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr "Öncesinde parça yok"
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr "Sonrasında parça yok"
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr "Gidilecek başka bir parça yok"
+
+#: add-patch.c:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "hangi parçaya gidilsin (daha fazla görmek için <ret>)? "
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "hangi parçaya gidilsin? "
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Geçersiz sayı: '%s'"
+
+#: 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:1575
+msgid "No other hunks to search"
+msgstr "Aranacak başka parça yok"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "düzenli ifade aransın mı? "
+
+#: add-patch.c:1596
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "Hatalı oluşturulmuş düzenli ifade %s: %s"
+
+#: 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:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "Üzgünüm, bu parça bölünemiyor"
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr "%d parçaya bölündü."
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr "Üzgünüm, bu parça düzenlenemiyor"
+
+#: add-patch.c:1680
+msgid "'git apply' failed"
+msgstr "'git apply' başarısız oldu"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Bu iletiyi \"git config advice.%s false\" ile devre dışı bırakın"
+
+#: advice.c:161
+#, c-format
+msgid "%shint: %.*s%s\n"
+msgstr "%sipucu: %.*s%s\n"
+
+#: advice.c:252
+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
+msgid "Committing is not possible because you have unmerged files."
+msgstr "İşleme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
+
+#: advice.c:256
+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
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "Çekme yapılamaz; birleştirmesi tamamlanmamış dosyalarınız var."
+
+#: advice.c:260
+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
+#, 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
+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 ""
+"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
+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:1375
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "Birleştirmenizi sonuçlandırmadınız (MERGE_HEAD mevcut)."
+
+#: advice.c:285
+msgid "Please, commit your changes before merging."
+msgstr "Birleştirme öncesinde değişikliklerinizi işleyin."
+
+#: advice.c:286
+msgid "Exiting because of unfinished merge."
+msgstr "Tamamlanmamış birleştirmeden dolayı çıkılıyor."
+
+#: 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 ""
+"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"
+
+#: advice.c:303
+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."
+
+#: advice.c:310
+#, c-format
+msgid ""
+"Note: switching to '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by switching back to a branch.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+"  git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
+"\n"
+msgstr ""
+"Not: Şuraya geçiliyor: '%s'.\n"
+"\n"
+"Şu anda 'ayrık HEAD' durumundasınız. Oraya buraya bakabilir, deneysel\n"
+"değişiklikler yapıp gönderebilir veya başka bir dala geçerek yaptığınız\n"
+"tüm işlemeleri başka hiçbir dala etki etmeden geri alabilirsiniz.\n"
+"\n"
+"Yaptığınız işlemeleri korumak için yeni bir dal oluşturmak isterseniz bunu\n"
+"şimdi veya daha sonra switch komutuna -c ekleyerek yapabilirsiniz. Örnek:\n"
+"\n"
+"\tgit switch -c <yeni-dal-adı>\n"
+"\n"
+"Bu iÅŸlemi ÅŸununla geri alabilirsiniz:\n"
+"\n"
+"\tgit switch -\n"
+"\n"
+"Bu öğüdü advice.detachedHead yapılandırma değişkenini false yaparak\n"
+"kapatabilirsiniz.\n"
+"\n"
+
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "komut satırı \\ ile bitiyor"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "kapatılmamış tırnak"
+
+#: apply.c:70
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "tanımlanamayan boşluk seçeneği '%s'"
+
+#: apply.c:86
+#, c-format
+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:800
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "Zaman damgası düzenli ifadesi %s hazırlanamıyor"
+
+#: apply.c:809
+#, c-format
+msgid "regexec returned %d for input: %s"
+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 "
+
+#: apply.c:921
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: hatalı git-diff - /dev/null bekleniyordu, %s alındı, satır %d"
+
+#: apply.c:927
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply: hatalı git-diff - %d. satırda tutarsız yeni dosya adı"
+
+#: apply.c:928
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply: hatalı git-diff - %d. satırda tutarsız eski dosya adı"
+
+#: apply.c:933
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: hatalı git-diff - %d. satırda /dev/null bekleniyordu"
+
+#: apply.c:962
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "%d. satırda geçersiz kip: %s"
+
+#: apply.c:1281
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "tutarsız üstbilgi satırları %d ve %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] ""
+"%d öncü yol adı bileşeni kaldırılırken git diff üstbilgisi dosya adı "
+"bilgisine iye değil (%d. satır)"
+msgstr[1] ""
+"%d öncü yol adı bileşeni kaldırılırken git diff üstbilgisi dosya adı "
+"bilgisine iye değil (%d. satır)"
+
+#: apply.c:1384
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "git diff üstbilgisi dosya adı bilgisine iye değil (%d. satır)"
+
+#: apply.c:1480
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: beklenmedik satır: %.*s"
+
+#: apply.c:1549
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "%d. satırda üstbilgisi olmayan yama parçacığı: %.*s"
+
+#: apply.c:1752
+msgid "new file depends on old contents"
+msgstr "yeni dosyanın eski içeriğe bağımlılığı var"
+
+#: apply.c:1754
+msgid "deleted file still has contents"
+msgstr "silinen dosya içinde hâlâ bir şeyler var"
+
+#: apply.c:1788
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "hasarlı yama, %d. satır"
+
+#: apply.c:1825
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "%s yeni dosyasının eski içeriğe bağımlılığı var"
+
+#: apply.c:1827
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "%s silinen dosyasının içinde hâlâ bir şeyler var"
+
+#: apply.c:1830
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** uyarı: %s dosyası boş duruma gelir; ancak silinmez"
+
+#: apply.c:1977
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "hasarlı ikili yama, %d. satır: %.*s"
+
+#: apply.c:2014
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "tanımlanamayan ikili yama, %d. satır"
+
+#: apply.c:2176
+#, 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
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "%s sembolik bağı okunamıyor"
+
+#: apply.c:2266
+#, c-format
+msgid "unable to open or read %s"
+msgstr "%s açılamıyor veya okunamıyor"
+
+#: apply.c:2935
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "geçersiz satır başlangıcı: '%c'"
+
+#: 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] "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
+#, 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
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"ÅŸunu ararken:\n"
+"%.*s"
+
+#: apply.c:3096
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "'%s' için ikili yama verisi eksik"
+
+#: apply.c:3104
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "ikili yama '%s' üzerine uygulanamıyor"
+
+#: apply.c:3208
+#, 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
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "yama başarısız oldu: %s:%ld"
+
+#: apply.c:3352
+#, 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
+#, c-format
+msgid "failed to read %s"
+msgstr "%s okunamadı"
+
+#: apply.c:3412
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "'%s' bir sembolik bağın ötesinden okunuyor"
+
+#: apply.c:3441 apply.c:3687
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "%s yolu yeniden adlandırıldı/silindi"
+
+#: apply.c:3527 apply.c:3702
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: indekste bulunmuyor"
+
+#: apply.c:3536 apply.c:3710 apply.c:3954
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: indeks ile eÅŸleÅŸmiyor"
+
+#: apply.c:3571
+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
+#, c-format
+msgid "Performing three-way merge...\n"
+msgstr "3 yönlü birleştirme gerçekleştiriliyor...\n"
+
+#: apply.c:3590 apply.c:3594
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "'%s' ögesinin geçerli içeriği okunamıyor"
+
+#: apply.c:3606
+#, c-format
+msgid "Failed to perform three-way merge...\n"
+msgstr "3 yönlü birleştirme gerçekleştirilemedi...\n"
+
+#: apply.c:3620
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "'%s' üzerine yama çakışmalarla birlikte uygulandı.\n"
+
+#: apply.c:3625
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "'%s' üzerine yama sorunsuzca uygulandı.\n"
+
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "Doğrudan uygulamaya geri çekiliniyor...\n"
+
+#: apply.c:3654
+msgid "removal patch leaves file contents"
+msgstr "kaldırma yaması dosya içeriğini bırakır"
+
+#: apply.c:3727
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: yanlış tür"
+
+#: apply.c:3729
+#, 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:863 read-cache.c:892
+#: read-cache.c:1353
+#, c-format
+msgid "invalid path '%s'"
+msgstr "geçersiz yol '%s'"
+
+#: apply.c:3952
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: indekste halihazırda var"
+
+#: apply.c:3956
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: çalışma dizininde halihazırda var"
+
+#: apply.c:3976
+#, 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 "
+
+#: apply.c:3981
+#, 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
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "etkilenen dosya '%s' bir sembolik bağın ötesinde"
+
+#: apply.c:4005
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: yama uygulanamıyor"
+
+#: apply.c:4020
+#, c-format
+msgid "Checking patch %s..."
+msgstr "%s yaması denetleniyor..."
+
+#: apply.c:4112
+#, 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
+#, 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
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "sha1 bilgisi eksik veya yararsız (%s)."
+
+#: apply.c:4131
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "%s geçici indekse eklenemedi"
+
+#: apply.c:4141
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "geçici indeks şuraya yazılamadı: %s"
+
+#: apply.c:4279
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "%s indeksten kaldırılamıyor"
+
+#: apply.c:4313
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "%s altmodülü için hasarlı yama"
+
+#: apply.c:4319
+#, 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
+#, 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
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "%s için önbellek girdisi eklenemiyor"
+
+#: apply.c:4376 builtin/bisect--helper.c:525
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "şuraya yazılamadı: '%s'"
+
+#: apply.c:4380
+#, c-format
+msgid "closing file '%s'"
+msgstr "'%s' dosyası kapatılıyor"
+
+#: apply.c:4450
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "'%s' dosyası yazılamıyor, %o kipi"
+
+#: apply.c:4548
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "%s yaması sorunsuzca uygulandı."
+
+#: apply.c:4556
+msgid "internal error"
+msgstr "iç hata"
+
+#: apply.c:4559
+#, 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
+#, 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
+#, c-format
+msgid "cannot open %s"
+msgstr "%s açılamıyor"
+
+#: apply.c:4592
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Parça #%d sorunsuzca uygulandı."
+
+#: apply.c:4596
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "Parça %d geri çevrildi."
+
+#: apply.c:4725
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "'%s' yaması atlandı."
+
+#: apply.c:4733
+msgid "unrecognized input"
+msgstr "tanımlanamayan girdi"
+
+#: apply.c:4753
+msgid "unable to read index file"
+msgstr "indeks dosyası okunamıyor"
+
+#: apply.c:4910
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "'%s' yaması açılamıyor: %s"
+
+#: apply.c:4937
+#, 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
+#, 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
+#, 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:678 builtin/mv.c:304 builtin/rm.c:423
+msgid "Unable to write new index file"
+msgstr "Yeni indeks dosyası yazılamıyor"
+
+#: apply.c:4995
+msgid "don't apply changes matching the given path"
+msgstr "verilen yol ile eÅŸleÅŸen deÄŸiÅŸiklikleri uygulama"
+
+#: apply.c:4998
+msgid "apply changes matching the given path"
+msgstr "verilen yol ile eÅŸleÅŸen deÄŸiÅŸiklikleri uygula"
+
+#: apply.c:5000 builtin/am.c:2318
+msgid "num"
+msgstr "sayı"
+
+#: apply.c:5001
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "geleneksel diff yollarından <sayı> öncü eğik çizgiyi kaldır"
+
+#: apply.c:5004
+msgid "ignore additions made by the patch"
+msgstr "yamanın yaptığı eklemeleri yok say"
+
+#: apply.c:5006
+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
+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
+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
+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
+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
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "yeni dosyaları `git add --intent-to-add` ile imle"
+
+#: apply.c:5020
+msgid "apply a patch without touching the working tree"
+msgstr "çalışma ağacına dokunmadan bir yama uygula"
+
+#: apply.c:5022
+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
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "ek olarak yamayı da uygula (--stat/--summary/--check ile kullan)"
+
+#: apply.c:5027
+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
+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
+msgid "paths are separated with NUL character"
+msgstr "yollar NUL karakteri ile ayrılır"
+
+#: apply.c:5034
+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: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 "eylem"
+
+#: apply.c:5036
+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
+msgid "ignore changes in whitespace when finding context"
+msgstr "baÄŸlam bulurken boÅŸluk deÄŸiÅŸikliklerini yok say"
+
+#: apply.c:5045
+msgid "apply the patch in reverse"
+msgstr "yamayı tersten uygula"
+
+#: apply.c:5047
+msgid "don't expect at least one line of context"
+msgstr "en az bir satır bağlam bekleme"
+
+#: apply.c:5049
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "reddedilmiş parçaları ilgili *.rej dosyalarında bırak"
+
+#: apply.c:5051
+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: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 "ayrıntı ver"
+
+#: apply.c:5054
+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
+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:2306
+msgid "root"
+msgstr "kök"
+
+#: apply.c:5060
+msgid "prepend <root> to all filenames"
+msgstr "tüm dosya adlarının başına <kök> ekle"
+
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "%s ikili nesnesi akıtılamıyor"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "desteklenmeyen dosya kipi: 0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "'%s' süzgeci başlatılamıyor"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "açıklayıcı yeniden yönlendirilemiyor"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "'%s' süzgeci hata bildirdi"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "yol geçerli UTF-8 değil: %s"
+
+#: archive-zip.c:322
+#, c-format
+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:365 builtin/pack-objects.c:368
+#, c-format
+msgid "deflate error (%d)"
+msgstr "söndürme hatası (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "zaman damgası bu sistem için çok büyük: %<PRIuMAX>"
+
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<seçenekler>] <ağacımsı> [<yol>...]"
+
+#: archive.c:15
+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 <depo> [--exec <komut>] [<sçnklr>] <ağacımsı> [<yol>...]"
+
+#: archive.c:17
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <depo> [--exec <komut>] --list"
+
+#: archive.c:188
+#, c-format
+msgid "cannot read %s"
+msgstr "%s okunamıyor"
+
+#: 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 "'%s' okunamadı"
+
+#: 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 "yol belirteci '%s' hiçbir dosya ile eşleşmedi"
+
+#: archive.c:451
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "böyle bir başvuru yok: %.*s"
+
+#: archive.c:457
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "geçerli bir nesne adı değil: %s"
+
+#: archive.c:470
+#, c-format
+msgid "not a tree object: %s"
+msgstr "bir ağaç nesnesi değil: %s"
+
+#: archive.c:482
+msgid "current working directory is untracked"
+msgstr "geçerli çalışma dizini izlenmiyor"
+
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "Dosya bulunamadı: %s"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Normal bir dosya deÄŸil: %s"
+
+#: archive.c:552
+msgid "fmt"
+msgstr "biçim"
+
+#: archive.c:552
+msgid "archive format"
+msgstr "arşiv biçimi"
+
+#: archive.c:553 builtin/log.c:1775
+msgid "prefix"
+msgstr "önek"
+
+#: archive.c:554
+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: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 "dosya"
+
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr "izlenmeyen dosyaları arşive ekle"
+
+#: archive.c:559 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "arÅŸivi bu dosyaya yaz"
+
+#: archive.c:561
+msgid "read .gitattributes in working directory"
+msgstr "çalışma dizinindeki .gitattributes'u oku"
+
+#: archive.c:562
+msgid "report archived files on stderr"
+msgstr "arşivlenmiş dosyaları stderr'de raporla"
+
+#: archive.c:564
+msgid "set compression level"
+msgstr "sıkıştırma düzeyini ayarla"
+
+#: archive.c:567
+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:1898 builtin/submodule--helper.c:2352
+#: builtin/submodule--helper.c:2902
+msgid "repo"
+msgstr "depo"
+
+#: archive.c:570 builtin/archive.c:92
+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:717
+#: builtin/notes.c:498
+msgid "command"
+msgstr "komut"
+
+#: archive.c:572 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "uzak konum komutu git-upload-archive'e olan yol"
+
+#: archive.c:579
+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:583
+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
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Bilinmeyen arşiv biçimi '%s'"
+
+#: archive.c:616
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "'%s' biçimi için desteklenmeyen argüman: -%d"
+
+#: attr.c:202
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s geçerli bir öznitelik adı değil"
+
+#: attr.c:363
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "%s izin verilmiyor: %s:%d"
+
+#: attr.c:403
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Negatif dizgiler git özniteliklerinde yok sayılır.\n"
+"Gerçek öncü ünlem için '\\!' kullanın."
+
+#: bisect.c:489
+#, 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
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "Daha fazla ikili arama yapılamıyor!\n"
+
+#: bisect.c:766
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "Geçerli bir işleme adı değil: %s"
+
+#: bisect.c:791
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"Birleştirme temeli %s hatalı.\n"
+"Bu demek oluyor ki hata %s ve [%s] arasında düzeltilmiş.\n"
+
+#: bisect.c:796
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"BirleÅŸtirme temeli %s yeni.\n"
+"Özellik %s ve [%s] arasında değişmiş.\n"
+
+#: bisect.c:801
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"BirleÅŸtirme temeli %s, %s.\n"
+"Bu demek oluyor ki ilk '%s' işlemesi %s ve [%s] arasında.\n"
+
+#: bisect.c:809
+#, 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 ""
+"Bazı %s revizyonları %s revizyonunun atası değil.\n"
+"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
+#, 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 ""
+"%s ve [%s] arasındaki birleştirme temeli atlanmalı.\n"
+"%s işlemesinin %s ve [%s] arasında olduğundan emin olamıyoruz.\n"
+"Yine de sürdüreceğiz."
+
+#: bisect.c:861
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "İkili arama: Birleştirme temelleri sınanmalı\n"
+
+#: bisect.c:911
+#, c-format
+msgid "a %s revision is needed"
+msgstr "bir %s revizyonu gerekiyor"
+
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#, c-format
+msgid "could not create file '%s'"
+msgstr "'%s' dosyası oluşturulamadı"
+
+#: bisect.c:987 builtin/merge.c:153
+#, c-format
+msgid "could not read file '%s'"
+msgstr "'%s' dosyası okunamadı"
+
+#: bisect.c:1027
+msgid "reading bisect refs failed"
+msgstr "ikili arama başvurularını okuma başarısız oldu"
+
+#: bisect.c:1057
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s hem %s hem %s idi\n"
+
+#: bisect.c:1066
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path arguments?\n"
+msgstr ""
+"Sınanabilir bir işleme bulunamadı.\n"
+"Hatalı yol argümanları ile mi başladınız?\n"
+
+#: bisect.c:1095
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(aşağı yukarı %d adım)"
+msgstr[1] "(aşağı yukarı %d adım)"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1101
+#, 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] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n"
+msgstr[1] "İkili arama: Şundan sonra sınanacak %d revizyon kaldı: %s\n"
+
+#: blame.c:2776
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents ve --reverse birlikte pek iyi gitmiyor."
+
+#: blame.c:2790
+msgid "cannot use --contents with final commit object name"
+msgstr "--contents son işleme nesnesi adı ile kullanılamıyor"
+
+#: blame.c:2811
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse ve --first-parent birlikte en son iÅŸlemenin belirtilmesini "
+"gerektiriyor"
+
+#: 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 "revizyonda gezinme ayarlaması başarısız oldu"
+
+#: blame.c:2838
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent birlikte ilk üst öge zincirinin yanında erim "
+"gerektiriyor"
+
+#: blame.c:2849
+#, c-format
+msgid "no such path %s in %s"
+msgstr "şurada %s yolu bulunamadı: %s"
+
+#: blame.c:2860
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "%s ikili nesnesi %s yolunda okunamıyor"
+
+#: branch.c:53
+#, c-format
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+msgstr ""
+"\n"
+"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\"."
+
+#: branch.c:67
+#, c-format
+msgid "Not setting branch %s as its own upstream."
+msgstr "%s dalı kendi üst kaynağı olarak ayarlanamaz."
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+"'%s' dalı '%s' uzak dalını yeniden temellendirme ile %s konumundan izlemek "
+"üzere ayarlandı."
+
+#: branch.c:94
+#, 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ı."
+
+#: branch.c:98
+#, 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ı"
+
+#: 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:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"'%s' dalı '%s' uzak başvurusunu yeniden temellendirme ile izlemek üzere "
+"ayarlandı."
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "'%s' dalı '%s' uzak başvurusunu izlemek üzere ayarlandı."
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+"'%s' dalı '%s' yerel başvurusunu yeniden temellendirme ile izlemek üzere "
+"ayarlandı."
+
+#: branch.c:110
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "'%s' dalı '%s' yerel başvurusunu izlemek üzere ayarlandı."
+
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "Üstkaynak dal yapılandırması yazılamıyor"
+
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "İzlenmiyor: %s başvurusu için belirsiz bilgi"
+
+#: branch.c:189
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' geçerli bir dal adı değil."
+
+#: branch.c:208
+#, 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."
+
+#: branch.c:233
+#, 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."
+
+#: branch.c:235
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "istenen üstkaynak dalı '%s' mevcut değil"
+
+#: branch.c:237
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"Eğer çalışmanızı uzak konumda halihazırda var olan bir dal\n"
+"üzerine temellendirmeyi tasarlıyorsanız önce \"git fetch\"\n"
+"çalıştırarak onu getirmeniz gerekebilir.\n"
+"\n"
+"EÄŸer uzak konumdaki eÅŸini izleyecek yerel bir dal itmeyi\n"
+"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
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "Geçerli bir nesne adı değil: '%s'."
+
+#: branch.c:301
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Belirsiz nesne adı: '%s'."
+
+#: branch.c:306
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Geçerli bir dal noktası değil: '%s'."
+
+#: branch.c:366
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' çıkışı '%s' konumunda halihazırda yapılmış"
+
+#: branch.c:389
+#, 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:44
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "bilinmeyen demet sağlama algoritması: %s"
+
+#: bundle.c:48
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "bilinmeyen yetenek '%s'"
+
+#: 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:113
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "tanımlanamayan üstbilgi: %s%s (%d)"
+
+#: 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 "'%s' açılamadı"
+
+#: bundle.c:198
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Depo aşağıdaki önkoşul işlemelere iye değil:"
+
+#: bundle.c:201
+msgid "need a repository to verify a bundle"
+msgstr "bir demeti doğrulamak için bir depo gerekiyor"
+
+#: 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:264
+msgid "The bundle records a complete history."
+msgstr "Demet tam bir geçmiş kaydını yazar."
+
+#: 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:333
+msgid "unable to dup bundle descriptor"
+msgstr "demet açıklayıcısı çoğaltılamıyor"
+
+#: bundle.c:340
+msgid "Could not spawn pack-objects"
+msgstr "pack-objects ortaya çıkarılamadı"
+
+#: bundle.c:351
+msgid "pack-objects died"
+msgstr "pack-objects sonlandı"
+
+#: 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:504
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "desteklenmeyen demet sürümü %d"
+
+#: 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:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "tanımlanamayan argüman: %s"
+
+#: bundle.c:553
+msgid "Refusing to create empty bundle."
+msgstr "BoÅŸ demet oluÅŸturma reddediliyor."
+
+#: bundle.c:563
+#, c-format
+msgid "cannot create '%s'"
+msgstr "'%s' oluşturulamıyor"
+
+#: bundle.c:588
+msgid "index-pack died"
+msgstr "index-pack sonlandı"
+
+#: 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: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:133
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "yinelenmiş iri parça numarası %<PRIx32> bulundu"
+
+#: 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
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "geçersiz renk değeri: %.*s"
+
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr "geçersiz sağlama sürümü"
+
+#: commit-graph.c:262
+msgid "commit-graph file is too small"
+msgstr "commit-graph dosyası pek küçük"
+
+#: commit-graph.c:355
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "commit-graph imzası %X, %X ile eşleşmiyor"
+
+#: commit-graph.c:362
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "commit-graph sürümü %x, %X ile eşleşmiyor"
+
+#: commit-graph.c:369
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "commit-graph sağlama sürümü %X, %X ile eşleşmiyor"
+
+#: commit-graph.c:386
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "commit-graph dosyası %u iri parça tutmak için pek küçük"
+
+#: commit-graph.c:482
+msgid "commit-graph has no base graphs chunk"
+msgstr "commit-graph temel grafiği iri parçasına iye değil"
+
+#: commit-graph.c:492
+msgid "commit-graph chain does not match"
+msgstr "commit-graph zinciri eÅŸleÅŸmiyor"
+
+#: commit-graph.c:540
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "geçersiz commit-graph zinciri: '%s'. satır bir sağlama değil"
+
+#: commit-graph.c:564
+msgid "unable to find all commit-graph files"
+msgstr "tüm commit-graph dosyaları bulunamıyor"
+
+#: commit-graph.c:745 commit-graph.c:782
+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üş."
+
+#: commit-graph.c:766
+#, c-format
+msgid "could not find commit %s"
+msgstr "%s işlemesi bulunamadı"
+
+#: commit-graph.c:799
+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:1341
+#, 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:3057
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "%s nesnesinin türü alınamıyor"
+
+#: commit-graph.c:1368
+msgid "Loading known commits in commit graph"
+msgstr "İşleme grafiğindeki bilinen işlemeler yükleniyor"
+
+#: commit-graph.c:1385
+msgid "Expanding reachable commits in commit graph"
+msgstr "İşleme grafiğindeki ulaşılabilir işlemeler genişletiliyor"
+
+#: commit-graph.c:1405
+msgid "Clearing commit marks in commit graph"
+msgstr "Ä°ÅŸleme grafiÄŸindeki iÅŸleme imleri temizleniyor"
+
+#: commit-graph.c:1424
+msgid "Computing commit graph topological levels"
+msgstr "İşleme grafiği ilingesel düzeyleri hesaplanıyor"
+
+#: commit-graph.c:1477
+msgid "Computing commit graph generation numbers"
+msgstr "İşleme grafiği kuşak sayıları hesaplanıyor"
+
+#: commit-graph.c:1558
+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
+msgid "Collecting referenced commits"
+msgstr "Başvurulmuş işlemeler toplanıyor"
+
+#: 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] "%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
+#, c-format
+msgid "error adding pack %s"
+msgstr "%s paketi eklenirken hata"
+
+#: commit-graph.c:1677
+#, c-format
+msgid "error opening index for %s"
+msgstr "%s için indeks açılırken hata"
+
+#: commit-graph.c:1714
+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
+msgid "Finding extra edges in commit graph"
+msgstr "İşleme grafiğindeki ek sınırlar bulunuyor"
+
+#: commit-graph.c:1781
+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:911
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "%s öncü dizinleri oluşturulamıyor"
+
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr "geçici grafik katmanı oluşturulamıyor"
+
+#: commit-graph.c:1830
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "'%s' için paylaşılan izinler ayarlanamıyor"
+
+#: 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] "İş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
+msgid "unable to open commit-graph chain file"
+msgstr "commit-graph zincir dosyası açılamıyor"
+
+#: commit-graph.c:1939
+msgid "failed to rename base commit-graph file"
+msgstr "temel commit-graph dosyası yeniden adlandırılamadı"
+
+#: commit-graph.c:1959
+msgid "failed to rename temporary commit-graph file"
+msgstr "geçici commit-graph dosyası yeniden adlandırılamadı"
+
+#: commit-graph.c:2092
+msgid "Scanning merged commits"
+msgstr "Birleştirilen işlemeler taranıyor"
+
+#: commit-graph.c:2136
+msgid "Merging commit-graph"
+msgstr "commit-graph birleÅŸtiriliyor"
+
+#: commit-graph.c:2244
+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
+msgid "too many commits to write graph"
+msgstr "grafik yazımı için çok fazla işleme"
+
+#: commit-graph.c:2449
+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:2459
+#, 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:2469 commit-graph.c:2484
+#, 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:2476
+#, 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:2494
+msgid "Verifying commits in commit graph"
+msgstr "İşleme grafiğindeki işlemeler doğrulanıyor"
+
+#: commit-graph.c:2509
+#, 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:2516
+#, 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:2526
+#, 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:2535
+#, 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:2549
+#, 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:2554
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+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:2558
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+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:2575
+#, 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:2581
+#, 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: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 "%s ayrıştırılamadı"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s bir iÅŸleme deÄŸil!"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"<GIT_DIR>/info/grafts desteği artık kullanılmamalı\n"
+"ve ileriki bir Git sürümünde kaldırılacak.\n"
+"\n"
+"Aşıları değiştirme başvurularına dönüştürmek için\n"
+"lütfen \"git replace --convert-graft-file\" kullanın.\n"
+"\n"
+"\"git config advice.graftFileDeprecated false\"\n"
+"kullanarak bu iletiyi kapatabilirsiniz."
+
+#: commit.c:1237
+#, 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
+#, 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
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "%s işlemesinin bir GPG imzası yok."
+
+#: commit.c:1247
+#, 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
+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 ""
+"Uyarı: İşleme iletisi UTF-8'e uymuyor.\n"
+"İletiyi düzelttikten sonra bunu değiştirmek isteyebilir veya\n"
+"i18n.commitencoding yapılandırma değişkenini projenizin kullandığı\n"
+"kodlama ile deÄŸiÅŸtirmek isteyebilirsiniz.\n"
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "bellek tükendi"
+
+#: config.c:126
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"aşağıdaki içerilirken olabilecek en çok içerme derinliği (%d) aşıldı:\n"
+"\t%s\n"
+"içerme konumu:\n"
+"\t%s\n"
+"Bu dairesel içermelerden dolayı olabilir."
+
+#: config.c:142
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "içerme yolu '%s' genişletilemedi"
+
+#: config.c:153
+msgid "relative config includes must come from files"
+msgstr "göreceli yapılandırma içermeleri dosyalardan gelmeli"
+
+#: config.c:199
+msgid "relative config include conditionals must come from files"
+msgstr "göreceli yapılandırma içerme koşulluları dosyalardan gelmeli"
+
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "geçersiz yapılandırma biçimi: %s"
+
+#: config.c:400
+#, 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
+#, 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
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "anahtar, bir bölüm içermiyor: %s"
+
+#: config.c:448
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "anahtar, bir değişken adı içermiyor: %s"
+
+#: config.c:472 sequencer.c:2785
+#, c-format
+msgid "invalid key: %s"
+msgstr "geçersiz anahtar: %s"
+
+#: config.c:478
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "geçersiz anahtar (yenisatır): %s"
+
+#: config.c:511
+msgid "empty config key"
+msgstr "boş yapılandırma anahtarı"
+
+#: config.c:529 config.c:541
+#, 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
+#, c-format
+msgid "bogus format in %s"
+msgstr "%s içinde düzmece biçim"
+
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "%s içinde düzmece sayım"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "%s içinde çok fazla girdi"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "%s yapılandırma anahtarı eksik"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "%s yapılandırma değeri eksik"
+
+#: config.c:995
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "hatalı yapılandırma satırı %d (%s içinde)"
+
+#: config.c:1152
+msgid "out of range"
+msgstr "erim dışı"
+
+#: config.c:1152
+msgid "invalid unit"
+msgstr "geçersiz birim"
+
+#: config.c:1153
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "şuradaki kullanıcı dizini genişletilemedi: '%s'"
+
+#: config.c:1284
+#, 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
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "kısaltma uzunluğu erim dışında: %d"
+
+#: config.c:1391 config.c:1402
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "hatalı zlib sıkıştırma düzeyi %d"
+
+#: config.c:1494
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar yalnızca bir karakter olmalı"
+
+#: config.c:1527
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "nesne oluşturma için geçersiz kip: %s"
+
+#: config.c:1599
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s için hatalı oluşturulmuş değer"
+
+#: config.c:1625
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s için hatalı oluşturulmuş değer: %s"
+
+#: config.c:1626
+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:4084
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "hatalı paket sıkıştırma düzeyi %d"
+
+#: config.c:1809
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "'%s' yapılandırma ikili nesnesi yüklenemiyor"
+
+#: config.c:1812
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "'%s' baÅŸvurusu ikili bir nesneye iÅŸaret etmiyor"
+
+#: config.c:1829
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "'%s' yapılandırma ikili nesnesi çözülemiyor"
+
+#: config.c:1874
+#, c-format
+msgid "failed to parse %s"
+msgstr "%s ayrıştırılamadı"
+
+#: config.c:1930
+msgid "unable to parse command-line config"
+msgstr "komut satırı yapılandırması ayrıştırılamıyor"
+
+#: config.c:2294
+msgid "unknown error occurred while reading the configuration files"
+msgstr "yapılandırma dosyaları okunurken beklenmedik bir hata oluştu"
+
+#: config.c:2468
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Geçersiz %s: '%s'"
+
+#: config.c:2513
+#, 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:2559
+#, 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:2561
+#, 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:2645
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "geçersiz bölüm adı '%s'"
+
+#: config.c:2677
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s birden çok değere iye"
+
+#: config.c:2706
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "yeni yapılandırma dosyası %s yazılamadı"
+
+#: config.c:2958 config.c:3285
+#, c-format
+msgid "could not lock config file %s"
+msgstr "%s yapılandırma dosyası kilitlenemedi"
+
+#: config.c:2969
+#, c-format
+msgid "opening %s"
+msgstr "%s açılıyor"
+
+#: config.c:3006 builtin/config.c:361
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "geçersiz dizgi: %s"
+
+#: config.c:3031
+#, c-format
+msgid "invalid config file %s"
+msgstr "geçersiz yapılandırma dosyası %s"
+
+#: config.c:3044 config.c:3298
+#, c-format
+msgid "fstat on %s failed"
+msgstr "%s üzerinde fstat başarısız oldu"
+
+#: config.c:3055
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "'%s'%s mmap yapılamıyor"
+
+#: config.c:3065 config.c:3303
+#, c-format
+msgid "chmod on %s failed"
+msgstr "%s üzerinde chmod başarısız oldu"
+
+#: config.c:3150 config.c:3400
+#, c-format
+msgid "could not write config file %s"
+msgstr "%s yapılandırma dosyası yazılamadı"
+
+#: config.c:3184
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "'%s', '%s' olarak ayarlanamadı"
+
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#, c-format
+msgid "could not unset '%s'"
+msgstr "'%s' ayarı kapatılamadı"
+
+#: config.c:3276
+#, c-format
+msgid "invalid section name: %s"
+msgstr "geçersiz bölüm adı: %s"
+
+#: config.c:3443
+#, c-format
+msgid "missing value for '%s'"
+msgstr "'%s' için değer eksik"
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr "uzak uç ilk iletişimle birlikte hattı kapattı"
+
+#: connect.c:63
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"Uzak konum deposu okunamadı.\n"
+"\n"
+"Lütfen doğru erişim haklarına iye olduğunuzdan ve\n"
+"deponun var olduÄŸundan emin olun."
+
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "sunucu '%s' desteklemiyor"
+
+#: connect.c:118
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "sunucu '%s' özelliğini desteklemiyor"
+
+#: connect.c:129
+msgid "expected flush after capabilities"
+msgstr "yeteneklerden sonra floÅŸ bekleniyordu"
+
+#: connect.c:263
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "'%s' ilk satırından sonra yetenekler yok sayılıyor"
+
+#: connect.c:284
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "protokol hatası: beklenmedik yetenekler^{}"
+
+#: connect.c:306
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "protokol hatası: sığ sha-1 bekleniyordu, '%s' alındı"
+
+#: connect.c:308
+msgid "repository on the other end cannot be shallow"
+msgstr "diğer uçtaki depo sığ olamaz"
+
+#: connect.c:347
+msgid "invalid packet"
+msgstr "geçersiz paket"
+
+#: connect.c:367
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "protokol hatası: beklenmedik '%s'"
+
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "sunucu tarafından bilinmeyen nesne biçimi '%s' belirtildi"
+
+#: connect.c:526
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "geçersiz ls-refs yanıtı: %s"
+
+#: connect.c:530
+msgid "expected flush after ref listing"
+msgstr "baÅŸvuru listelemesinden sonra floÅŸ bekleniyordu"
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "başvuru listelemesinden sonra yanıt sonu paketi bekleniyordu"
+
+#: connect.c:666
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "'%s' protokolü desteklenmiyor"
+
+#: connect.c:717
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "soket üzerinde SO_KEEPALIVE ayarlanamıyor"
+
+#: connect.c:757 connect.c:820
+#, c-format
+msgid "Looking up %s ... "
+msgstr "%s adresi aranıyor..."
+
+#: connect.c:761
+#, 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
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"bitti.\n"
+"%s adresine bağlanılıyor (kapı %s)..."
+
+#: connect.c:787 connect.c:864
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"%s adresine bağlanılıyor:\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:793 connect.c:870
+msgid "done."
+msgstr "bitti."
+
+#: connect.c:824
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "%s aranamıyor (%s)"
+
+#: connect.c:830
+#, c-format
+msgid "unknown port %s"
+msgstr "bilinmeyen kapı %s"
+
+#: connect.c:967 connect.c:1299
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "garip makine adı '%s' engellendi"
+
+#: connect.c:969
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "garip kapı '%s' engellendi"
+
+#: connect.c:979
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "vekil %s başlatılamıyor"
+
+#: connect.c:1050
+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
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "git:// makinelerinde ve depo yollarında yenisatır karakteri yasak"
+
+#: connect.c:1247
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh değişik biçimi 'simple' -4 desteklemiyor"
+
+#: connect.c:1259
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh değişik biçimi 'simple' -6 desteklemiyor"
+
+#: connect.c:1276
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh değişik biçimi 'simple' kapı ayarlamayı desteklemiyor"
+
+#: connect.c:1388
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "garip yol adı '%s' engellendi"
+
+#: connect.c:1436
+msgid "unable to fork"
+msgstr "çatallanamıyor"
+
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+msgid "Checking connectivity"
+msgstr "Bağlantı denetleniyor"
+
+#: connected.c:120
+msgid "Could not run 'git rev-list'"
+msgstr "'git rev-list' çalıştırılamadı"
+
+#: connected.c:144
+msgid "failed write to rev-list"
+msgstr "rev-list yazılamadı"
+
+#: connected.c:149
+msgid "failed to close rev-list's stdin"
+msgstr "rev-list'in stdin'i kapatılamadı"
+
+#: convert.c:183
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "izin verilmeyen crlf_action %d"
+
+#: convert.c:196
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "CRLF %s içinde LF ile değiştirilecek"
+
+#: 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"
+msgstr ""
+"CRLF %s içinde LF ile değiştirilecek.\n"
+"Dosya sizin çalışma dizininizde kendi orijinal satır sonlarına iye olacak."
+
+#: convert.c:206
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF %s içinde CRLF ile değiştirilecek"
+
+#: 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"
+msgstr ""
+"LF %s içinde CRLF ile değiştirilecek.\n"
+"Dosya sizin çalışma dizininizde kendi orijinal satır sonlarına iye olacak."
+
+#: convert.c:273
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "BOM '%s' içinde yasaklı, eğer %s olarak kodlanmışsa"
+
+#: convert.c:280
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"'%s' dosyası bir bayt sıra imi (BOM) içeriyor. Lütfen çalışma ağacı "
+"kodlaması için UTF-%.*s kullanın."
+
+#: convert.c:293
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "BOM '%s' içinde gerekli, eğer %s olarak kodlanmışsa"
+
+#: 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 ""
+"'%s' dosyasında bir bayt sıra imi (BOM) eksik. Lütfen çalışma ağacı "
+"kodlaması için UTF-%sBE veya UTF-%sLE (bayt sırasına göre) kullanın."
+
+#: convert.c:408 convert.c:479
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "'%s', %s değerinden %s değerine kodlanamadı"
+
+#: convert.c:451
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr ""
+"'%s' kodlamasını %s -> %s biçiminde yapıp tersine döndürmek aynı şey değil"
+
+#: convert.c:654
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "'%s' dış süzgecini çalıştırmak için çatallama yapılamıyor"
+
+#: convert.c:674
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "girdi '%s' dış süzgecine beslenemiyor"
+
+#: convert.c:681
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "'%s' dış süzgeci %d için başarısız oldu"
+
+#: convert.c:716 convert.c:719
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "'%s' dış süzgecinden okuma başarısız oldu"
+
+#: convert.c:722 convert.c:777
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "'%s' dış süzgeci başarısız oldu"
+
+#: convert.c:826
+msgid "unexpected filter type"
+msgstr "beklenmedik süzgeç türü"
+
+#: convert.c:837
+msgid "path name too long for external filter"
+msgstr "dış süzgeç için yol adı pek uzun"
+
+#: convert.c:935
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr ""
+"'%s' dış süzgeci artık kullanılamıyor; ancak tüm yolların süzümü bitmedi"
+
+#: 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: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:1492
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s: is süzgeci %s başarısız oldu"
+
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "şu anahtar için yetki araması atlanıyor: credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "anamakine bilgisi eksik yetki ile çalışma reddediliyor"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr "protokol bilgisi eksik yetki ile çalışma reddediliyor"
+
+#: credential.c:394
+#, 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
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url'nin şeması yok: %s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "yetki url'si ayrıştırılamıyor: %s"
+
+#: date.c:138
+msgid "in the future"
+msgstr "gelecekte"
+
+#: date.c:144
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> saniye önce"
+msgstr[1] "%<PRIuMAX> saniye önce"
+
+#: date.c:151
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> dakika önce"
+msgstr[1] "%<PRIuMAX> dakika önce"
+
+#: date.c:158
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> saat önce"
+msgstr[1] "%<PRIuMAX> saat önce"
+
+#: date.c:165
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> gün önce"
+msgstr[1] "%<PRIuMAX> gün önce"
+
+#: date.c:171
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> hafta önce"
+msgstr[1] "%<PRIuMAX> hafta önce"
+
+#: date.c:178
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> ay önce"
+msgstr[1] "%<PRIuMAX> ay önce"
+
+#: date.c:189
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> yıl"
+msgstr[1] "%<PRIuMAX> yıl"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:192
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, %<PRIuMAX> ay önce"
+msgstr[1] "%s, %<PRIuMAX> ay önce"
+
+#: date.c:197 date.c:202
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> yıl önce"
+msgstr[1] "%<PRIuMAX> yıl önce"
+
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr "Delta adası imleri yayılıyor"
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr "hatalı ağaç nesnesi %s"
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%s': %s"
+msgstr "'%s' için delta adası düzenli ifadesi yüklenemedi: %s"
+
+#: delta-islands.c:390
+#, c-format
+msgid "island regex from config has too many capture groups (max=%d)"
+msgstr ""
+"yapılandırmanın delta adası düzenli ifadesinde çok fazla yakalama grubu var "
+"(en çok %d)"
+
+#: delta-islands.c:467
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "%d delta adası imlendi, bitti.\n"
+
+#: 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:557
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base erimlerle çalışmaz"
+
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr "--merge-base yalnızca işlemelerle çalışır"
+
+#: diff-lib.c:576
+msgid "unable to get HEAD"
+msgstr "HEAD alınamıyor"
+
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr "bir birleştirme temeli bulunamadı"
+
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr "birden çok birleştirme temeli bulundu"
+
+#: 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:262
+msgid ""
+"Not a git repository. Use --no-index to compare two paths outside a working "
+"tree"
+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
+#, 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
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  Bilinmeyen dirstat parametresi '%s'\n"
+
+#: diff.c:297
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"\"color-moved\" ayarı 'no', 'default', 'blocks', 'zebra', 'dimmed-zebra', "
+"'plain' seçeneklerinden biri olmalıdır"
+
+#: diff.c:325
+#, 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 ""
+"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
+msgid ""
+"color-moved-ws: allow-indentation-change cannot be combined with other "
+"whitespace modes"
+msgstr ""
+"color-moved-ws: allow-indentation-change diÄŸer boÅŸluk kipleri ile birlikte "
+"kullanılamaz"
+
+#: diff.c:410
+#, 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
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"'diff.dirstat' yapılandırma değişkeninde hatalar bulundu:\n"
+"%s"
+
+#: diff.c:4282
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "dış diff sonlandı, %s konumunda durdu"
+
+#: diff.c:4634
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check ve -s birlikte kullanılmaz"
+
+#: diff.c:4637
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G, -S ve --find-object birlikte kullanılmaz"
+
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+"-G ve --pickaxe-regex birlikte kullanılamaz, --pickaxe-regex'i -S ile "
+"kullanın"
+
+#: diff.c:4643
+msgid ""
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr ""
+"--pickaxe-all ve --find-object birlikte kullanılamaz, --pickaxe-all'u -G ve -"
+"S ile kullanın"
+
+#: diff.c:4722
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow tam olarak yalnızca bir yol belirteci gerektiriyor"
+
+#: diff.c:4770
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "geçersiz --stat değeri: %s"
+
+#: 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
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s bir sayısal değer bekliyor"
+
+#: diff.c:4807
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"--dirstat/-X seçenek parametresi ayrıştırılamadı:\n"
+"%s"
+
+#: diff.c:4892
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "şurada bilinmeyen değişiklik sınıfı '%c': --diff-filter=%s"
+
+#: diff.c:4916
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "ÅŸundan sonra bilinmeyen deÄŸer: ws-error-highlight=%.*s"
+
+#: diff.c:4930
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "'%s' çözülemiyor"
+
+#: diff.c:4980 diff.c:4986
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s <n>/<m> biçimi bekliyor"
+
+#: diff.c:4998
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s bir karakter bekliyor, '%s' aldı"
+
+#: diff.c:5019
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "hatalı --color-moved argümanı: %s"
+
+#: diff.c:5038
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "--color-moved-ws içinde geçersiz kip '%s'"
+
+#: diff.c:5078
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"diff-algorithm seçeneği şunları kabul eder: \"myers\", \"minimal\", "
+"\"patience\" ve \"histogram\""
+
+#: diff.c:5114 diff.c:5134
+#, c-format
+msgid "invalid argument to %s"
+msgstr "%s için geçersiz argüman"
+
+#: diff.c:5238
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "-I'ya geçersiz düzenli ifade verildi: '%s'"
+
+#: diff.c:5287
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "--submodule seçenek parametresi ayrıştırılamadı: '%s'"
+
+#: diff.c:5343
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "hatalı --word-diff argümanı: %s"
+
+#: diff.c:5379
+msgid "Diff output format options"
+msgstr "Diff çıktısı biçimlendirme seçenekleri"
+
+#: diff.c:5381 diff.c:5387
+msgid "generate patch"
+msgstr "yama oluÅŸtur"
+
+#: diff.c:5384 builtin/log.c:179
+msgid "suppress diff output"
+msgstr "diff çıktısını gizle"
+
+#: diff.c:5389 diff.c:5503 diff.c:5510
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5390 diff.c:5393
+msgid "generate diffs with <n> lines context"
+msgstr "diff'leri <n> satır bağlamlı oluştur"
+
+#: diff.c:5395
+msgid "generate the diff in raw format"
+msgstr "diff'i ham biçimde oluştur"
+
+#: diff.c:5398
+msgid "synonym for '-p --raw'"
+msgstr "'-p --raw eşanlamlısı"
+
+#: diff.c:5402
+msgid "synonym for '-p --stat'"
+msgstr "'-p --stat eşanlamlısı"
+
+#: diff.c:5406
+msgid "machine friendly --stat"
+msgstr "makinede okunabilen --stat"
+
+#: diff.c:5409
+msgid "output only the last line of --stat"
+msgstr "--stat'ın yalnızca son satırını çıktı ver"
+
+#: diff.c:5411 diff.c:5419
+msgid "<param1,param2>..."
+msgstr "<param1,param2>..."
+
+#: diff.c:5412
+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:5416
+msgid "synonym for --dirstat=cumulative"
+msgstr "--dirstat=cumulative eşanlamlısı"
+
+#: diff.c:5420
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "--dirstat=files,param1,param2... eşanlamlısı"
+
+#: diff.c:5424
+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:5427
+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:5430
+msgid "show only names of changed files"
+msgstr "yalnızca değiştirilen dosyaların adlarını göster"
+
+#: diff.c:5433
+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:5435
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<genişlik>[,<ad-genişlik>[,<sayım>]]"
+
+#: diff.c:5436
+msgid "generate diffstat"
+msgstr "diffstat oluÅŸtur"
+
+#: diff.c:5438 diff.c:5441 diff.c:5444
+msgid "<width>"
+msgstr "<geniÅŸlik>"
+
+#: diff.c:5439
+msgid "generate diffstat with a given width"
+msgstr "diffstat'ı verilmiş bir genişlik ile oluştur"
+
+#: diff.c:5442
+msgid "generate diffstat with a given name width"
+msgstr "diffstat'ı verilmiş bir ad genişliği ile oluştur"
+
+#: diff.c:5445
+msgid "generate diffstat with a given graph width"
+msgstr "diffstat'ı verilmiş bir grafik genişliği ile oluştur"
+
+#: diff.c:5447
+msgid "<count>"
+msgstr "<sayım>"
+
+#: diff.c:5448
+msgid "generate diffstat with limited lines"
+msgstr "diffstat'ı kısıtlı satırlarla oluştur"
+
+#: diff.c:5451
+msgid "generate compact summary in diffstat"
+msgstr "diffstat içinde ufak özet oluştur"
+
+#: diff.c:5454
+msgid "output a binary diff that can be applied"
+msgstr "uygulanabilir bir ikili diff çıktısı ver"
+
+#: diff.c:5457
+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:5459
+msgid "show colored diff"
+msgstr "renkli diff göster"
+
+#: diff.c:5460
+msgid "<kind>"
+msgstr "<çeşit>"
+
+#: diff.c:5461
+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:5464
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"--raw veya --numstat içinde yol adlarını tahrip etme ve çıktı alanı "
+"sonlandırıcıları olarak NUL'ları kullan"
+
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+msgid "<prefix>"
+msgstr "<önek>"
+
+#: diff.c:5468
+msgid "show the given source prefix instead of \"a/\""
+msgstr "\"a/\" yerine verilmiş kaynak önekini göster"
+
+#: diff.c:5471
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "\"b/\"yerine verilmiş kaynak önekini göster"
+
+#: diff.c:5474
+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:5477
+msgid "do not show any source or destination prefix"
+msgstr "hiçbir kaynak ve hedef önekini gösterme"
+
+#: diff.c:5480
+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:5484 diff.c:5489 diff.c:5494
+msgid "<char>"
+msgstr "<karakter>"
+
+#: diff.c:5485
+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:5490
+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:5495
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "bağlam belirtmek için ' ' yerine kullanılacak karakteri belirle"
+
+#: diff.c:5498
+msgid "Diff rename options"
+msgstr "Diff yeniden adlandırma seçenekleri"
+
+#: diff.c:5499
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5500
+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:5504
+msgid "detect renames"
+msgstr "yeniden adlandırmaları algıla"
+
+#: diff.c:5508
+msgid "omit the preimage for deletes"
+msgstr "silmeler için öngörüntüyü atla"
+
+#: diff.c:5511
+msgid "detect copies"
+msgstr "kopyaları algıla"
+
+#: diff.c:5515
+msgid "use unmodified files as source to find copies"
+msgstr "değiştirilmemiş dosyaları kopyaları bulmak için kaynak olarak kullan"
+
+#: diff.c:5517
+msgid "disable rename detection"
+msgstr "yeniden adlandırma algılamasını devre dışı bırak"
+
+#: diff.c:5520
+msgid "use empty blobs as rename source"
+msgstr "boş ikili nesneleri yeniden adlandırma kaynağı olarak kullan"
+
+#: diff.c:5522
+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:5525
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+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:5527
+msgid "Diff algorithm options"
+msgstr "Diff algoritma seçenekleri"
+
+#: diff.c:5529
+msgid "produce the smallest possible diff"
+msgstr "olabilecek en küçük diff'i üret"
+
+#: diff.c:5532
+msgid "ignore whitespace when comparing lines"
+msgstr "satırları karşılaştırırken boşlukları yok say"
+
+#: diff.c:5535
+msgid "ignore changes in amount of whitespace"
+msgstr "boşluk sayısındaki değişiklikleri yok say"
+
+#: diff.c:5538
+msgid "ignore changes in whitespace at EOL"
+msgstr "satır sonundaki boşluk değişikliklerini yok say"
+
+#: diff.c:5541
+msgid "ignore carrier-return at the end of line"
+msgstr "satır sonundaki satırbaşı karakterini yok say"
+
+#: diff.c:5544
+msgid "ignore changes whose lines are all blank"
+msgstr "satırlarının tümü boş olan değişiklikleri yok say"
+
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr "<ifade>"
+
+#: diff.c:5547
+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:5550
+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:5553
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "diff'i \"patience diff\" algoritmasını kullanarak oluştur"
+
+#: diff.c:5557
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "diff'i \"histogram diff\" algoritmasını kullanarak oluştur"
+
+#: diff.c:5559
+msgid "<algorithm>"
+msgstr "<algoritma>"
+
+#: diff.c:5560
+msgid "choose a diff algorithm"
+msgstr "bir diff algoritması seç"
+
+#: diff.c:5562
+msgid "<text>"
+msgstr "<metin>"
+
+#: diff.c:5563
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "diff'i \"anchored diff\" algoritmasını kullanarak oluştur"
+
+#: diff.c:5565 diff.c:5574 diff.c:5577
+msgid "<mode>"
+msgstr "<kip>"
+
+#: diff.c:5566
+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:5569
+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:5572
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "ÅŸuna eÅŸdeÄŸer: --word-diff=color --word-diff-regex=<ifade>"
+
+#: diff.c:5575
+msgid "moved lines of code are colored differently"
+msgstr "taşınan kod satırları farklı renklendirilir"
+
+#: diff.c:5578
+msgid "how white spaces are ignored in --color-moved"
+msgstr "boşluklar --color-moved içinde nasıl yok sayılır"
+
+#: diff.c:5581
+msgid "Other diff options"
+msgstr "Diğer diff seçenekleri"
+
+#: diff.c:5583
+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:5587
+msgid "treat all files as text"
+msgstr "tüm dosyaları metin olarak varsay"
+
+#: diff.c:5589
+msgid "swap two inputs, reverse the diff"
+msgstr "iki girdiyi değiştir, diff'i tersine döndür"
+
+#: diff.c:5591
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "ayrımlar varsa 1 ile, yoksa 0 ile çık"
+
+#: diff.c:5593
+msgid "disable all output of the program"
+msgstr "tüm program çıktısını devre dışı bırak"
+
+#: diff.c:5595
+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:5597
+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:5599
+msgid "<when>"
+msgstr "<ne-zaman>"
+
+#: diff.c:5600
+msgid "ignore changes to submodules in the diff generation"
+msgstr "diff oluştururken altmodüllere olan değişiklikleri yok say"
+
+#: diff.c:5603
+msgid "<format>"
+msgstr "<biçim>"
+
+#: diff.c:5604
+msgid "specify how differences in submodules are shown"
+msgstr "altmodüllerdeki değişikliklerin nasıl gösterileceğini belirt"
+
+#: diff.c:5608
+msgid "hide 'git add -N' entries from the index"
+msgstr "indeksten 'git add -N' girdilerini gizle"
+
+#: diff.c:5611
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "indekste 'git add -N' girdilerine gerçekmiş gibi davran"
+
+#: diff.c:5613
+msgid "<string>"
+msgstr "<dizi>"
+
+#: diff.c:5614
+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:5617
+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:5620
+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:5623
+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:5626
+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:5627 diff.c:5630
+msgid "<path>"
+msgstr "<yol>"
+
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr "öncelikle belirtilen yoldaki değişikliği göster"
+
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr "belirtilen yola olan çıktıyı atla"
+
+#: diff.c:5633
+msgid "<object-id>"
+msgstr "<nesne-no>"
+
+#: diff.c:5634
+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:5636
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5637
+msgid "select files by diff type"
+msgstr "dosyaları diff türüne göre seç"
+
+#: diff.c:5639
+msgid "<file>"
+msgstr "<dosya>"
+
+#: diff.c:5640
+msgid "Output to a specific file"
+msgstr "belirli bir dosyaya çıktı ver"
+
+#: diff.c:6298
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr ""
+"Geniş kapsamlı yeniden adlandırma algılaması çok fazla dosya olmasından "
+"dolayı atlandı."
+
+#: diff.c:6301
+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:6304
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"%s değişkeninizi en azından %d olarak ayarlamak ve komutu yeniden denemek "
+"isteyebilirsiniz."
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "orderfile '%s' okunamadı"
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr "Kesin olmayan yeniden adlandırma algılaması gerçekleştiriliyor"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "diff'te '%s' diye bir yol yok"
+
+#: 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:733 dir.c:762 dir.c:775
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "tanımlanamayan dizgi: '%s'"
+
+#: dir.c:790 dir.c:804
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "tanımlanamayan negatif dizgi: '%s'"
+
+#: 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:830
+msgid "disabling cone pattern matching"
+msgstr "koni dizgi eşleşmesi devre dışı bırakılıyor"
+
+#: dir.c:1214
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "%s bir 'exclude' dosyası olarak kullanılamıyor"
+
+#: dir.c:2351
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "'%s' dizini açılamadı"
+
+#: dir.c:2653
+msgid "failed to get kernel name and information"
+msgstr "çekirdek adı ve bilgisi alınamadı"
+
+#: dir.c:2777
+msgid "untracked cache is disabled on this system or location"
+msgstr "izlenmeyen önbellek bu sistemde veya konumda devre dışı bırakılmış"
+
+#: dir.c:3610
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "%s deposundaki indeks dosyası hasarlı"
+
+#: dir.c:3657 dir.c:3662
+#, c-format
+msgid "could not create directories for %s"
+msgstr "%s için dizinler oluşturulamadı"
+
+#: dir.c:3691
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "git dizini '%s' konumundan '%s' konumuna göç ettirilemedi"
+
+#: editor.c:74
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "İpucu: Düzenleyicinizin dosyayı kapatması bekleniyor...%c"
+
+#: entry.c:176
+msgid "Filtering content"
+msgstr "İçerik süzülüyor"
+
+#: entry.c:497
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "'%s' dosyasının bilgileri alınamadı"
+
+#: environment.c:152
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "hatalı git ad alanı yolu \"%s\""
+
+#: environment.c:334
+#, 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
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: sığ bir liste bekleniyordu"
+
+#: fetch-pack.c:185
+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
+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
+#, 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
+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
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "geçersiz sığ satır: %s"
+
+#: fetch-pack.c:389 fetch-pack.c:1429
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "geçersiz sığ olmayan satır: %s"
+
+#: fetch-pack.c:391 fetch-pack.c:1431
+#, c-format
+msgid "object not found: %s"
+msgstr "nesne bulunamadı: %s"
+
+#: fetch-pack.c:394 fetch-pack.c:1434
+#, c-format
+msgid "error in object: %s"
+msgstr "nesne içinde hata: %s"
+
+#: fetch-pack.c:396 fetch-pack.c:1436
+#, c-format
+msgid "no shallow found: %s"
+msgstr "sığ bulunamadı: %s"
+
+#: fetch-pack.c:399 fetch-pack.c:1440
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "sığ/sığ olmayan bekleniyordu, %s alındı"
+
+#: fetch-pack.c:439
+#, c-format
+msgid "got %s %d %s"
+msgstr "%s %d %s alındı"
+
+#: fetch-pack.c:456
+#, c-format
+msgid "invalid commit %s"
+msgstr "geçersiz işleme %s"
+
+#: fetch-pack.c:487
+msgid "giving up"
+msgstr "vazgeçiliyor"
+
+#: fetch-pack.c:500 progress.c:339
+msgid "done"
+msgstr "bitti"
+
+#: fetch-pack.c:512
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "%s (%d) %s alındı"
+
+#: fetch-pack.c:548
+#, c-format
+msgid "Marking %s as complete"
+msgstr "%s tamam olarak imleniyor"
+
+#: fetch-pack.c:763
+#, c-format
+msgid "already have %s (%s)"
+msgstr "%s halihazırda var (%s)"
+
+#: fetch-pack.c:849
+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
+msgid "protocol error: bad pack header"
+msgstr "protokol hatası: hatalı paket üstbilgisi"
+
+#: fetch-pack.c:951
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: %s ayrı çatallanamıyor"
+
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack: geçersiz index-pack çıktısı"
+
+#: fetch-pack.c:974
+#, c-format
+msgid "%s failed"
+msgstr "%s başarısız oldu"
+
+#: fetch-pack.c:976
+msgid "error in sideband demultiplexer"
+msgstr "yanbant çoğullama çözücüsünde hata"
+
+#: fetch-pack.c:1019
+#, 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: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 "Sunucu %s destekliyor"
+
+#: fetch-pack.c:1029
+msgid "Server does not support shallow clients"
+msgstr "Sunucu sığ istemcileri desteklemiyor"
+
+#: fetch-pack.c:1089
+msgid "Server does not support --shallow-since"
+msgstr "Sunucu --shallow-since desteklemiyor"
+
+#: fetch-pack.c:1094
+msgid "Server does not support --shallow-exclude"
+msgstr "Sunucu --shallow-exclude desteklemiyor"
+
+#: fetch-pack.c:1098
+msgid "Server does not support --deepen"
+msgstr "Sunucu --deepen desteklemiyor"
+
+#: fetch-pack.c:1100
+msgid "Server does not support this repository's object format"
+msgstr "Sunucu bu deponun nesne türünü desteklemiyor"
+
+#: fetch-pack.c:1113
+msgid "no common commits"
+msgstr "ortak iÅŸleme yok"
+
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr "kaynak depo sığ, klonlama için reddet"
+
+#: fetch-pack.c:1128 fetch-pack.c:1660
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: getirme başarısız"
+
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "eÅŸleÅŸmeyen algoritmalar: istemci %s; sunucu %s"
+
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "sunucu '%s' algoritmasını desteklemiyor"
+
+#: fetch-pack.c:1279
+msgid "Server does not support shallow requests"
+msgstr "Sunucu sığ istekleri desteklemiyor"
+
+#: fetch-pack.c:1286
+msgid "Server supports filter"
+msgstr "Sunucu süzgeç destekliyor"
+
+#: fetch-pack.c:1329 fetch-pack.c:2043
+msgid "unable to write request to remote"
+msgstr "uzak konuma istek yazılamıyor"
+
+#: fetch-pack.c:1347
+#, c-format
+msgid "error reading section header '%s'"
+msgstr "bölüm üstbilgisi '%s' okunurken hata"
+
+#: fetch-pack.c:1353
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "'%s' bekleniyordu, '%s' alındı"
+
+#: fetch-pack.c:1387
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "beklenmedik alındı satırı: '%s'"
+
+#: fetch-pack.c:1392
+#, c-format
+msgid "error processing acks: %d"
+msgstr "alındılar işlenirken hata: %d"
+
+#: fetch-pack.c:1402
+msgid "expected packfile to be sent after 'ready'"
+msgstr "paket dosyasının 'ready'den sonra gönderilmesi gerekiyordu"
+
+#: fetch-pack.c:1404
+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
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "sığ bilgi işlenirken hata: %d"
+
+#: fetch-pack.c:1494
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "wanted-ref bekleniyordu, '%s' alındı"
+
+#: fetch-pack.c:1499
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "beklenmedik wanted-ref: '%s'"
+
+#: fetch-pack.c:1504
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "aranan baÅŸvurular iÅŸlenirken hata: %d"
+
+#: fetch-pack.c:1534
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: yanıt sonu paketi bekleniyordu"
+
+#: fetch-pack.c:1939
+msgid "no matching remote head"
+msgstr "eÅŸleÅŸen uzak dal ucu yok"
+
+#: fetch-pack.c:1962 builtin/clone.c:697
+msgid "remote did not send all necessary objects"
+msgstr "uzak konum gereken tüm nesneleri göndermedi"
+
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr "uzak konumdan beklenmedik 'ready'"
+
+#: fetch-pack.c:2088
+#, c-format
+msgid "no such remote ref %s"
+msgstr "böyle bir uzak başvuru yok: %s"
+
+#: fetch-pack.c:2091
+#, 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
+msgid "could not create temporary file"
+msgstr "geçici dosya oluşturulamadı"
+
+#: gpg-interface.c:276
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "şuna ayrık imza yazılamadı: '%s'"
+
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg veriyi imzalayamadı"
+
+#: graph.c:98
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "log.graphColors içindeki '%.*s' geçersiz renk yok sayıldı"
+
+#: grep.c:531
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"verilen dizgi NULL baytı içeriyor (-f <dosya> aracılığıyla). Bu yalnızca "
+"PCRE v2 altında -P ile desteklenir"
+
+#: grep.c:1895
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': %s okunamıyor"
+
+#: 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 "'%s' dosyasının bilgileri alınamadı"
+
+#: grep.c:1923
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': kısa okuma"
+
+#: help.c:23
+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
+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
+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
+msgid "grow, mark and tweak your common history"
+msgstr "ortak geçmişinizi büyütün, imleyin ve geliştirin"
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "birlikte çalışın (ayrıca bkz: git help workflows)"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "Ana Komutlar"
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "Yan Komutlar / Yönlendiriciler"
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "Yan Komutlar / Sorgucular"
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "Başkaları ile Etkileşim"
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "Düşük Düzeyli Komutlar / Yönlendiriciler"
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "Düşük Düzeyli Komutlar / Sorgucular"
+
+#: help.c:37
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "Düşük Düzeyli Komutlar / Depo Eşitleme"
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "Düşük Düzeyli Komutlar / İç Yardımcılar"
+
+#: help.c:300
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "'%s' içindeki kullanılabilir git komutları"
+
+#: help.c:307
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "$PATH içindeki başka yerlerden kullanılabilen git komutları"
+
+#: help.c:316
+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
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "desteklenmeyen komut listeleme türü '%s'"
+
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Git konsept kılavuzları şunlardır:"
+
+#: help.c:429
+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
+msgid "External commands"
+msgstr "Dış komutlar"
+
+#: help.c:449
+msgid "Command aliases"
+msgstr "Komut armaları"
+
+#: help.c:527
+#, 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' 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
+#, 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
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "Tüh. Sisteminiz hiçbir Git komutu bildirmiyor."
+
+#: help.c:613
+#, 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
+#, 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
+#, 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
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"Buna en yakın komut:"
+msgstr[1] ""
+"\n"
+"Buna en yakın komutlar:"
+
+#: help.c:675
+msgid "git version [<options>]"
+msgstr "git version [<seçenekler>]"
+
+#: help.c:730
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: help.c:734
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Åžunu mu demek istediniz?"
+msgstr[1] ""
+"\n"
+"Åžunlardan birini mi demek istediniz?"
+
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Yazar kimliÄŸi bilinmiyor\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Ä°ÅŸleyici kimliÄŸi bilinmiyor\n"
+
+#: ident.c:362
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Lütfen bana kim olduğunuzu söyleyin.\n"
+"\n"
+"Hesabınızın öntanımlı kimliğini ayarlamak için\n"
+"\n"
+"\tgit config --global user.name \"Adınız\"\n"
+"\tgit config --global user.email \"siz@e-posta.com\"\n"
+"\n"
+"komutlarını çalıştırın.\n"
+"Kimliğinizi yalnızca bu depo için geçerli kılmak isterseniz --global\n"
+"değişkenini kullanmayın.\n"
+"\n"
+
+#: ident.c:397
+msgid "no email was given and auto-detection is disabled"
+msgstr "bir e-posta verilmedi ve kendiliğinden algılama devre dışı"
+
+#: ident.c:402
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "e-posta adresi kendiliğinden algılanamıyor ('%s' alındı)"
+
+#: ident.c:419
+msgid "no name was given and auto-detection is disabled"
+msgstr "bir ad verilmedi ve kendiliğinden algılama devre dışı"
+
+#: ident.c:425
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "ad kendiliğinden algılanamıyor ('%s' alındı)"
+
+#: ident.c:433
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "boş tanımlayıcı adına (<%s> için) izin verilmiyor"
+
+#: ident.c:439
+#, c-format
+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
+#, c-format
+msgid "invalid date format: %s"
+msgstr "geçersiz tarih biçimi: %s"
+
+#: list-objects-filter-options.c:83
+msgid "expected 'tree:<depth>'"
+msgstr "'tree:<derinlik>' bekleniyordu"
+
+#: list-objects-filter-options.c:98
+msgid "sparse:path filters support has been dropped"
+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>' 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
+#, c-format
+msgid "invalid filter-spec '%s'"
+msgstr "geçersiz filter-spec '%s'"
+
+#: list-objects-filter-options.c:140
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "sub-filter-spec içinde kaçış karakteri olmalı: '%c'"
+
+#: list-objects-filter-options.c:182
+msgid "expected something after combine:"
+msgstr "birlikte kullanımdan sonra bir şeyler bekleniyordu:"
+
+#: list-objects-filter-options.c:264
+msgid "multiple filter-specs cannot be combined"
+msgstr "çoklu filter-specs birlikte kullanılamaz"
+
+#: list-objects-filter-options.c:376
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "depo biçimi kısımsal klonları desteklemesi için yükseltilemiyor"
+
+#: list-objects-filter.c:532
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "'%s' içindeki aralıklı ikili nesneye erişilemiyor"
+
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "%s içindeki aralıklı süzgeç verisi ayrıştırılamıyor"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "'%s' girdisi (%s ağacında) ağaç kipine iye; ancak bir ağaç değil"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr ""
+"'%s' girdisi (%s ağacında) ikili nesne kipine iye; ancak bir ikili geniş "
+"nesne deÄŸil"
+
+#: 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"
+
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"'%s.lock' oluşturulamıyor: %s.\n"
+"\n"
+"Bu depoda başka bir git işlemi çalışıyor gibi görünüyor, örneğin\n"
+"'git commit' kullanılarak açılmış bir düzenleyici. Lütfen tüm işlemlerin\n"
+"sonlandırıldığından emin olun ve yeniden deneyin. Eğer hâlâ başarısız\n"
+"oluyorsa bir git işlemi bu depo içinde daha önceden çakılmış olabilir:\n"
+"Sürdürmek için dosyayı el ile kaldırın."
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "'%s.lock' oluşturulamıyor: %s"
+
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "lsrefs.unborn için '%s' geçersiz değeri"
+
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "ls-refs argümanlarından sonra floş bekleniyordu"
+
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "alıntılanmış CRLF algılandı"
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "hatalı eylem '%s', '%s' için"
+
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "%s altmodülü birleştirilemedi (çıkış yapılmadı)"
+
+#: merge-ort.c:1578 merge-recursive.c:1208
+#, 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:1587 merge-recursive.c:1215
+#, 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:1597 merge-ort.c:1604
+#, 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:1625
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "'%s' altmodülünü birleştirilemedi"
+
+#: merge-ort.c:1632
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"%s altmodülü birleştirilemedi; ancak olası bir birleştirme çözümü mevcut:\n"
+"%s\n"
+
+#: 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 ""
+"Eğer bu doğruysa yalnızca indekse ekleyin, örneğin:\n"
+"\n"
+"\tgit update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"komutu bu öneriyi kabul edecektir.\n"
+
+#: merge-ort.c:1649
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"%s altmodülü birleştirilemedi; ancak birden çok olası birleştirmeler "
+"mevcut:\n"
+"%s"
+
+#: merge-ort.c:1868 merge-recursive.c:1358
+msgid "Failed to execute internal merge"
+msgstr "İç birleştirme çalıştırılamadı"
+
+#: merge-ort.c:1873 merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "%s veritabanına eklenemedi"
+
+#: merge-ort.c:1880 merge-recursive.c:1396
+#, c-format
+msgid "Auto-merging %s"
+msgstr "%s kendiliÄŸinden birleÅŸtiriliyor"
+
+#: 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 ""
+"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s konumundaki mevcut dosya/dizin "
+"örtülü yeniden adlandırmanın aşağıdaki yolları oraya koymasına engel oluyor: "
+"%s."
+
+#: 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 ""
+"ÇAKIŞMA (örtülü dizin yeniden adlandırma): %s için birden çok yol "
+"eşlemlenemiyor; örtülü dizin yeniden adlandırmaları aşağıdaki yolları oraya "
+"koymayı denedi: %s."
+
+#: 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 ""
+"ÇAKIŞMA: (dizin yeniden adlandırma ayrılması): %s ögesinin nereye yeniden "
+"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:2241 merge-recursive.c:2464
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+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: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 ""
+"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: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 ""
+"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: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 ""
+"Ç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: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 ""
+"Ç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:2569
+#, 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: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 ""
+"ÇAKIŞMA (yeniden adlandırma çarpışması): %s -> %s yeniden adlandırmasının "
+"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:2683 merge-ort.c:2707
+#, 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:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
+msgstr "%s nesnesi okunamıyor"
+
+#: merge-ort.c:3185 merge-recursive.c:3011
+#, c-format
+msgid "object %s is not a blob"
+msgstr "%s nesnesi ikili bir nesne deÄŸil"
+
+#: merge-ort.c:3613
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+msgstr ""
+"ÇAKIŞMA (dosya/dizin): Dizin, şuradan %s yolunda: %s; bunun yerine %s "
+"konumuna taşınıyor."
+
+#: 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 ""
+"ÇAKIŞMA (belirgin türler): %s ögesinin her bir yanında değişik türler vardı; "
+"ikisi de yeniden adlandırıldı; böylelikle başka bir yerde kayıtları "
+"yazılabilir."
+
+#: 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 ""
+"ÇAKIŞMA (belirgin türler): %s ögesinin her bir yanında değişik türler vardı; "
+"bir tanesi yeniden adlandırıldı; böylelikle her birinin başka bir yerde "
+"kayıtları yazılabilir."
+
+#: merge-ort.c:3796 merge-recursive.c:3087
+msgid "content"
+msgstr "içerik"
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr "ekle/ekle"
+
+#: merge-ort.c:3800 merge-recursive.c:3136
+msgid "submodule"
+msgstr "altmodül"
+
+#: merge-ort.c:3802 merge-recursive.c:3137
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "ÇAKIŞMA (%s): %s içinde birleştirme çakışması"
+
+#: 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 ""
+"Ç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:4120
+#, 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ı."
+
+#. 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 "ş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:3702
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
+"yazılacak:\n"
+"\t%s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "Tümü güncel."
+
+#: merge-recursive.c:352
+msgid "(bad commit)\n"
+msgstr "(hatalı işleme)\n"
+
+#: merge-recursive.c:375
+#, 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:384
+#, 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:872
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "'%s'%s yolu oluşturulamadı"
+
+#: merge-recursive.c:883
+#, 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:897 merge-recursive.c:916
+msgid ": perhaps a D/F conflict?"
+msgstr ": bir D/F çakışması olabilir mi?"
+
+#: merge-recursive.c:906
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "'%s' konumundaki izlenmeyen dosyayı kaybetme reddediliyor"
+
+#: merge-recursive.c:947 builtin/cat-file.c:41
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "%s '%s' nesnesi okunamıyor"
+
+#: merge-recursive.c:952
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' için ikili nesne bekleniyordu"
+
+#: merge-recursive.c:977
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "'%s' açılamadı: %s"
+
+#: merge-recursive.c:988
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "'%s' için sembolik bağ oluşturulamadı: %s"
+
+#: merge-recursive.c:993
+#, 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:1223 merge-recursive.c:1235
+#, 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:1226 merge-recursive.c:1238
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "%s altmodülü ileri sarılıyor"
+
+#: merge-recursive.c:1261
+#, 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:1265
+#, 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:1266
+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:1278
+#, 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:1420
+#, 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:1492
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+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:1497
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+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:1504
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+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:1509
+#, 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 ""
+"Ç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:1544
+msgid "rename"
+msgstr "yeniden adlandır"
+
+#: merge-recursive.c:1544
+msgid "renamed"
+msgstr "yeniden adlandırıldı"
+
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "%s konumundaki kirli dosyayı kaybetme reddediliyor"
+
+#: merge-recursive.c:1605
+#, 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:1663
+#, 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:1694
+#, 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:1699
+#, 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:1726
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+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:1731
+msgid " (left unresolved)"
+msgstr " (çözülmeden bırakıldı)"
+
+#: merge-recursive.c:1823
+#, 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:2086
+#, 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."
+msgstr ""
+"ÇAKIŞMA: (dizin yeniden adlandırma ayrılması): %s ögesinin nereye "
+"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:2220
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+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:3075
+msgid "modify"
+msgstr "deÄŸiÅŸtir"
+
+#: merge-recursive.c:3075
+msgid "modified"
+msgstr "deÄŸiÅŸtirilmiÅŸ"
+
+#: merge-recursive.c:3114
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "%s atlandı (mevcut ile aynı biçimde birleştirildi)"
+
+#: merge-recursive.c:3167
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Bunun yerine %s olarak ekleniyor"
+
+#: merge-recursive.c:3371
+#, c-format
+msgid "Removing %s"
+msgstr "%s kaldırılıyor"
+
+#: merge-recursive.c:3394
+msgid "file/directory"
+msgstr "dosya/dizin"
+
+#: merge-recursive.c:3399
+msgid "directory/file"
+msgstr "dizin/dosya"
+
+#: merge-recursive.c:3406
+#, 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:3415
+#, c-format
+msgid "Adding %s"
+msgstr "%s ekleniyor"
+
+#: merge-recursive.c:3424
+#, 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:3477
+#, 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:3571
+msgid "Merging:"
+msgstr "BirleÅŸtiriliyor:"
+
+#: merge-recursive.c:3584
+#, 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:3634
+msgid "merge returned no commit"
+msgstr "birleştirme herhangi bir işleme döndürmedi"
+
+#: merge-recursive.c:3799
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "'%s' nesnesi ayrıştırılamadı"
+
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
+msgid "Unable to write index."
+msgstr "İndeks yazılamıyor."
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "önbellek okunamadı"
+
+#: 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 "yeni indeks dosyası yazılamıyor"
+
+#: midx.c:74
+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
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "multi-pack-index dosyası %s pek küçük"
+
+#: midx.c:121
+#, 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
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "multi-pack-index sürümü %d tanımlanamıyor"
+
+#: midx.c:131
+#, 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
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "multi-pack-index'ten gerekli pack-name iri parçası eksik"
+
+#: midx.c:150
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "multi-pack-index'ten gerekli OID fanout iri parçası eksik"
+
+#: midx.c:152
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "multi-pack-index'ten gerekli OID arama iri parçası eksik"
+
+#: midx.c:154
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "multi-pack-index'ten gerekli nesne ofsetleri iri parçası eksik"
+
+#: midx.c:170
+#, 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
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "hatalı pack-int-id: %u (%u toplam paket)"
+
+#: midx.c:264
+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
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "paket dosyası '%s' eklenemedi"
+
+#: midx.c:496
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "pack-index '%s' açılamadı"
+
+#: midx.c:564
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "%d nesnesi paket dosyasında bulunamadı"
+
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr "ters indeks dosyası depolanamıyor"
+
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "mevcut multi-pack-index yok sayılıyor; sağlama toplamı uyumsuzluğu"
+
+#: midx.c:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr "Paket dosyaları multi-pack-index'e ekleniyor"
+
+#: midx.c:989
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "bırakılacak pack-file %s görülmedi"
+
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "bilinmeyen tercih edilen paket: '%s'"
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "tercih edilen '%s' paketinin süresi geçmiş"
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr "indekslenecek paket dosyası yok."
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "%s kaldırılamadı"
+
+#: midx.c:1166
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "multi-pack-index %s konumunda temizlenemedi"
+
+#: midx.c:1225
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "multi-pack-index dosyası mevcut, ancak ayrıştırılamadı"
+
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr "yanlış sağlama toplamı"
+
+#: midx.c:1236
+msgid "Looking for referenced packfiles"
+msgstr "Başvurulmuş paket dosyaları aranıyor"
+
+#: midx.c:1251
+#, 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:1256
+msgid "the midx contains no oid"
+msgstr "midx bir oid içermiyor"
+
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
+msgstr "multi-pack-index içindeki OID sırası doğrulanıyor"
+
+#: midx.c:1274
+#, 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:1294
+msgid "Sorting objects by packfile"
+msgstr "Nesneler paket dosyasına göre sıralanıyor"
+
+#: midx.c:1301
+msgid "Verifying object offsets"
+msgstr "Nesne ofsetleri doğrulanıyor"
+
+#: midx.c:1317
+#, 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:1323
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "paket dosyası %s için pack-index yüklenemedi"
+
+#: midx.c:1332
+#, 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:1357
+msgid "Counting referenced objects"
+msgstr "Başvurulmuş nesneler sayılıyor"
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "Başvurulmamış paket dosyaları bulunuyor ve siliniyor"
+
+#: midx.c:1558
+msgid "could not start pack-objects"
+msgstr "pack-objects başlatılamadı"
+
+#: midx.c:1578
+msgid "could not finish pack-objects"
+msgstr "pack-objects bitirilemedi"
+
+#: name-hash.c:542
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "lazy_dir iş parçacığı oluşturulamıyor: %s"
+
+#: name-hash.c:564
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "lazy_name oluşturulamıyor: %s"
+
+#: name-hash.c:570
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "lazy_name iş parçacığı ucu birleştirilemiyor: %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."
+msgstr ""
+"Bir önceki not birleştirmenizi sonuçlandırmadınız (%s var).\n"
+"Lütfen başka bir not birleştirmesine başlamadan önce 'git notes merge --"
+"commit' veya 'git notes merge --abort' kullanarak bir önceki birleştirmeyi "
+"iÅŸleyin/durdurun."
+
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "Notlar birleştirmenizi sonuçlandırmadınız (%s var)."
+
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "İlklendirilmemiş/Başvurulmamış not ağacı işlenemiyor"
+
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Hatalı notes.rewriteMode değeri: '%s'"
+
+#: notes-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "%s içindeki notları yeniden yazma reddediliyor (refs/notes/ dışında)"
+
+#. 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 "Hatalı %s değeri: '%s'"
+
+#: object-file.c:526
+#, 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:584
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "alternatif nesne yolu olağanlaştırılamıyor: %s"
+
+#: object-file.c:658
+#, 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:665
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "nesne dizini olağanlaştırılamıyor: %s"
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr "alternatifler kilit dosyası fdopen yapılamıyor"
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr "alternatifler dosyası okunamıyor"
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr "yeni alternatifler dosyası yerine taşınamıyor"
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "'%s' diye bir yol yok"
+
+#: object-file.c:789
+#, 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:795
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "BaÅŸvuru deposu '%s' yerel bir depo deÄŸil."
+
+#: object-file.c:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "başvuru deposu '%s' sığ"
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "başvuru deposu '%s' aşılı"
+
+#: object-file.c:869
+#, 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:1019
+#, 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:1054
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap başarısız%s"
+
+#: object-file.c:1218
+#, c-format
+msgid "object file %s is empty"
+msgstr "nesne dosyası %s boş"
+
+#: object-file.c:1353 object-file.c:2548
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "hasar görmüş gevşek nesne '%s'"
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "gevşek nesne '%s' sonunda anlamsız veri"
+
+#: object-file.c:1397
+msgid "invalid object type"
+msgstr "geçersiz nesne türü"
+
+#: object-file.c:1481
+#, 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:1484
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "%s üstbilgisi açılamıyor"
+
+#: object-file.c:1490
+#, 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"
+
+#: object-file.c:1493
+#, c-format
+msgid "unable to parse %s header"
+msgstr "%s üstbilgisi ayrıştırılamıyor"
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr "%s nesnesi okunamadı"
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "%s yedeği %s için bulunamadı"
+
+#: object-file.c:1725
+#, 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:1729
+#, 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:1834
+#, c-format
+msgid "unable to write file %s"
+msgstr "%s dosyası yazılamıyor"
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "'%s' ögesine izin ayarlanamıyor"
+
+#: object-file.c:1848
+msgid "file write error"
+msgstr "dosya yazım hatası"
+
+#: object-file.c:1868
+msgid "error when closing loose object file"
+msgstr "gevşek nesne dosyası kapatılırken hata"
+
+#: object-file.c:1933
+#, 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:1935
+msgid "unable to create temporary file"
+msgstr "geçici dosya oluşturulamıyor"
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr "gevşek nesne dosyası yazılamıyor"
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "yeni nesne %s söndürülemiyor (%d)"
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "%s nesnesi üzerinde deflateEnd başarısız oldu (%d)"
+
+#: object-file.c:1973
+#, 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:1983 builtin/pack-objects.c:1237
+#, c-format
+msgid "failed utime() on %s"
+msgstr "%s üzerinde utime() başarısız"
+
+#: object-file.c:2060
+#, c-format
+msgid "cannot read object for %s"
+msgstr "%s için nesne okunamıyor"
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr "hasar görmüş işleme"
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr "hasar görmüş etiket"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr "%s indekslenirken okuma hatası"
+
+#: object-file.c:2222
+#, c-format
+msgid "short read while indexing %s"
+msgstr "%s indekslenirken kısa read"
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s: veritabanına ekleme başarısız"
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: desteklenmeyen dosya türü"
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s geçerli bir nesne değil"
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s geçerli bir '%s' nesnesi değil"
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "%s açılamıyor"
+
+#: object-file.c:2559 object-file.c:2612
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s için sağlama uyuşmazlığı (%s bekleniyordu)"
+
+#: object-file.c:2583
+#, c-format
+msgid "unable to mmap %s"
+msgstr "%s mmap yapılamadı"
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "%s üstbilgisi açılamıyor"
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "%s üstbilgisi ayrıştırılamıyor"
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "%s içeriği açılamıyor"
+
+#: object-name.c:480
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "kısa nesne ID'si %s belirsiz"
+
+#: object-name.c:491
+msgid "The candidates are:"
+msgstr "Adaylar:"
+
+#: 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 ""
+"Git normalde hiçbir zaman 40 onaltılı karakterlerle biten bir başvuru\n"
+"oluşturmaz; çünkü 40 onaltılı bir başvuru, onu belirlediğiniz zaman yok\n"
+"sayılacaktır. Bu başvurular yanlışlıkla oluşturulmuş olabilir. Örneğin:\n"
+"\n"
+"\tgit switch -c $br $(git rev-parse ...)\n"
+"\n"
+"komutunda \"$br\" bir şekilde boş kalmış ve 40 onaltılı bir başvuru\n"
+"oluşturulmuş. Lütfen bu başvuruları inceleyin ve gerekirse silin. Bu "
+"iletiyi\n"
+"kapatmak için \"git config advice.objectNameWarning\" yapın."
+
+#: 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:918
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' günlüğünde yalnızca %d girdi var"
+
+#: 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:1702
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+msgstr ""
+"'%s' yolu mevcut; ancak '%s' deÄŸil\n"
+"İpucu: Şunu mu demek istediniz: '%.*s:%s', nam-ı diğer '%.*s:./%s'?"
+
+#: 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:1739
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+msgstr ""
+"'%s' yolu indekste; ancak %d numaralı alanda değil\n"
+"Ä°pucu: Åžunu mu demek istediniz: ':%d:%s'?"
+
+#: 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 ""
+"'%s' yolu indekste; ancak '%s' deÄŸil\n"
+"İpucu: Şunu mu demek istediniz: '%d:%s', nam-ı diğer ':%d:./%s'?"
+
+#: 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: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: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:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "geçersiz nesne adı: '%.*s'"
+
+#: object.c:53
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "geçersiz nesne türü \"%s\""
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "%s nesnesi bir %s, %s deÄŸil"
+
+#: 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:263
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "nesne ayrıştırılamıyor: %s"
+
+#: object.c:283 object.c:295
+#, c-format
+msgid "hash mismatch %s"
+msgstr "sağlama uyuşmazlığı %s"
+
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr "%s boyutu alınamıyor"
+
+#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "%s ögesinin disk kullanımı alınamıyor"
+
+#: pack-revindex.c:221
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "reverse-index dosyası %s pek küçük"
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "reverse-index dosyası %s hasar görmüş"
+
+#: pack-revindex.c:234
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "%s reverse-index dosyasının bilinmeyen bir imzası var"
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "%s reverse-index dosyasının sürümü %<PRIu32> desteklenmiyor"
+
+#: pack-revindex.c:243
+#, c-format
+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
+msgid "cannot both write and verify reverse index"
+msgstr "ters indeks dosyası hem yazılıp hem doğrulanamıyor"
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr "dosya bilgileri alınamadı: %s"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "%s, yazılabilir yapılamadı"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "vaat dosyası '%s' yazılamadı"
+
+#: packfile.c:625
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "ofset paket dosyasının sonundan önce (bozuk .idx?)"
+
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "paket dosyası %s eşlemlenemiyor%s"
+
+#: packfile.c:1934
+#, 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:1938
+#, 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
+#, 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
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "hatalı oluşturulmuş son kullanım tarihi '%s'"
+
+#: parse-options-cb.c:54
+#, 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
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "hatalı oluşturulmuş nesne adı '%s'"
+
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s bir deÄŸer gerektiriyor"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s, %s ile uyumsuz"
+
+#: parse-options.c:78
+#, 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
+#, c-format
+msgid "%s takes no value"
+msgstr "%s bir değer almıyor"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s kullanılabilir değil"
+
+#: parse-options.c:217
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "alias of --%s"
+msgstr "şunun arması: --%s"
+
+#: parse-options.c:879
+#, c-format
+msgid "unknown option `%s'"
+msgstr "bilinmeyen seçenek '%s'"
+
+#: parse-options.c:881
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "bilinmeyen anahtar '%c'"
+
+#: parse-options.c:883
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "dizi içinde bilinmeyen ascii dışı seçenek: '%s'"
+
+#: parse-options.c:907
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:926
+#, c-format
+msgid "usage: %s"
+msgstr "kullanım: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:932
+#, c-format
+msgid "   or: %s"
+msgstr "    veya: %s"
+
+#: parse-options.c:935
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+#: parse-options.c:974
+msgid "-NUM"
+msgstr "-SAYI"
+
+#: path.c:915
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "%s grup ile yazılabilir yapılamadı"
+
+#: pathspec.c:151
+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
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Yalnızca bir 'attr:' belirtimine izin verilir."
+
+#: pathspec.c:172
+msgid "attr spec must not be empty"
+msgstr "attr belirteci boş olmamalı"
+
+#: pathspec.c:215
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "geçersiz öznitelik adı %s"
+
+#: pathspec.c:280
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "global 'glob' ve 'noglob' yol belirteci ayarları birbiriyle uyumsuz"
+
+#: pathspec.c:287
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"global 'literal' yol belirteci ayarı diğer tüm global yol belirteci "
+"ayarlarıyla uyumsuz"
+
+#: pathspec.c:327
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "yol belirteci sihri 'prefix' için geçersiz parametre"
+
+#: pathspec.c:348
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "Geçersiz yol belirteci sihri '%.*s' (%s içinde)"
+
+#: pathspec.c:353
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "'%s' içindeki yol belirteci sihrinin sonunda eksik ')'"
+
+#: pathspec.c:391
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Yerine getirilmemiş yol belirteci sihri '%c' ('%s' içinde)"
+
+#: pathspec.c:450
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' ve 'glob' birbiriyle uyumsuz"
+
+#: pathspec.c:466
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: '%s', '%s' konumunda depo dışında"
+
+#: pathspec.c:542
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (belleten: '%c')"
+
+#: pathspec.c:552
+#, 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
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "yol belirteci '%s' bir sembolik bağın ötesinde"
+
+#: pathspec.c:664
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "satırda hatalı tırnaklar: %s"
+
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "floş paketi yazılamıyor"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "sınırlandıran paket yazılamıyor"
+
+#: pkt-line.c:106
+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
+msgid "protocol error: impossibly long line"
+msgstr "protokol hatası: olanaksız uzun satır"
+
+#: pkt-line.c:169 pkt-line.c:171
+msgid "packet write with format failed"
+msgstr "biçimlendirilmiş paket yazımı başarısız"
+
+#: pkt-line.c:204
+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"
+
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "paket yazımı başarısız: %s"
+
+#: pkt-line.c:328 pkt-line.c:329
+msgid "read error"
+msgstr "okuma hatası"
+
+#: pkt-line.c:339 pkt-line.c:340
+msgid "the remote end hung up unexpectedly"
+msgstr "uzak konum beklenmedik bir biçimde hattı kapattı"
+
+#: pkt-line.c:369 pkt-line.c:371
+#, 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
+#, 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
+#, c-format
+msgid "remote error: %s"
+msgstr "uzak konum hatası: %s"
+
+#: preload-index.c:125
+msgid "Refreshing index"
+msgstr "Ä°ndeks yenileniyor"
+
+#: preload-index.c:144
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "iş parçacıklarına ayrılmış 'lstat' oluşturulamıyor: %s"
+
+#: pretty.c:988
+msgid "unable to parse --pretty format"
+msgstr "--pretty biçimi ayrıştırılamıyor"
+
+#: promisor-remote.c:31
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: getirme altişlemi çatallanamıyor"
+
+#: 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: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:54
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "vaatçi uzak konum adı '/' ile başlayamaz: %s"
+
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: argümanlardan sonra floş bekleniyordu"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "Yinelenmiş nesneler kaldırılıyor"
+
+#: range-diff.c:78
+msgid "could not start `log`"
+msgstr "'log' başlatılamadı"
+
+#: range-diff.c:80
+msgid "could not read `log` output"
+msgstr "'log' çıktısı okunamadı"
+
+#: range-diff.c:101 sequencer.c:5550
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "'%s' işlemesi ayrıştırılamadı"
+
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+msgstr ""
+"'log' çıktısının ilk satırı ayrıştırılamadı: 'commit ' ile başlamıyor: '%s'"
+
+#: range-diff.c:140
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "git üstbilgisi '%.*s' ayrıştırılamadı"
+
+#: range-diff.c:307
+msgid "failed to generate diff"
+msgstr "diff oluşturulamadı"
+
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only ve --right-only birlikte kullanılmaz"
+
+#: range-diff.c:562 range-diff.c:564
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "'%s' günlüğü ayrıştırılamadı"
+
+#: read-cache.c:710
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "dosya arması '%s' eklenmeyecek ('%s' indekste halihazırda var)"
+
+#: read-cache.c:726
+msgid "cannot create an empty blob in the object database"
+msgstr "nesne veritabanında boş ikili bir nesne oluşturulamıyor"
+
+#: read-cache.c:748
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr ""
+"%s: yalnızca sıradan dosyalar, sembolik bağlar ve git dizinleri eklenebilir"
+
+#: read-cache.c:753
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' çıkışı yapılmış bir işlemeye iye değil"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "'%s' dosyası indekslenemiyor"
+
+#: read-cache.c:824
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "'%s' indekse eklenemiyor"
+
+#: read-cache.c:835
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "'%s' dosyasının bilgileri alınamıyor"
+
+#: read-cache.c:1358
+#, 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:1573
+msgid "Refresh index"
+msgstr "Ä°ndeks yenileniyor"
+
+#: read-cache.c:1705
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version ayarlanmış; ancak değer geçersiz.\n"
+"%i sürümü kullanılıyor"
+
+#: read-cache.c:1715
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION ayarlanmış; ancak değer geçersiz.\n"
+"%i sürümü kullanılıyor"
+
+#: read-cache.c:1771
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "hatalı imza 0x%08x"
+
+#: read-cache.c:1774
+#, c-format
+msgid "bad index version %d"
+msgstr "hatalı indeks sürümü %d"
+
+#: read-cache.c:1783
+msgid "bad index file sha1 signature"
+msgstr "hatalı indeks dosyası sha1 imzası"
+
+#: read-cache.c:1817
+#, 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:1819
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "%.4s uzantısı yok sayılıyor"
+
+#: read-cache.c:1856
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "bilinmeyen indeks girdisi biçimi 0x%08x"
+
+#: read-cache.c:1872
+#, 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:1929
+msgid "unordered stage entries in index"
+msgstr "indekste sırasız hazırlama alanı girdileri"
+
+#: read-cache.c:1932
+#, 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:1935
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "'%s' için sırasız hazırlama alanı girdileri"
+
+#: 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 "indeks dosyası hasar görmüş"
+
+#: read-cache.c:2185
+#, 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:2198
+#, 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:2231
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s: indeks dosyası açılamadı"
+
+#: read-cache.c:2235
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s: açık indeksin bilgileri alınamıyor"
+
+#: read-cache.c:2239
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s: indeks dosyası beklenenden daha küçük"
+
+#: read-cache.c:2243
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s: indeks dosyası eşlemlenemiyor%s"
+
+#: read-cache.c:2286
+#, 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:2313
+#, 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:2351
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "paylaşılan indeks '%s' tazelenemedi"
+
+#: read-cache.c:2398
+#, 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:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#, c-format
+msgid "could not close '%s'"
+msgstr "'%s' kapatılamadı"
+
+#: read-cache.c:3075
+msgid "failed to convert to a sparse-index"
+msgstr "bir sparse-index'e dönüştürülemedi"
+
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
+#, c-format
+msgid "could not stat '%s'"
+msgstr "'%s' bilgileri alınamadı"
+
+#: read-cache.c:3159
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "git dizini açılamıyor: %s"
+
+#: read-cache.c:3171
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "bağlantı kesilemiyor: %s"
+
+#: read-cache.c:3200
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "'%s' üzerindeki izin bitleri onarılamıyor"
+
+#: read-cache.c:3349
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s: #0 numaralı hazırlama alanına bırakılamıyor"
+
+#: rebase-interactive.c:11
+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 ""
+"Bunu 'git rebase --edit-todo' ile düzeltebilir ve ardından 'git rebase --"
+"continue' yapabilirsiniz.\n"
+"Yeniden temellendirmeyi durdurmak isterseniz 'git rebase --abort' yapın.\n"
+
+#: rebase-interactive.c:33
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"rebase.missingCommitsCheck seçeneği için tanımlanamayan %s ayarı. Yok "
+"sayılıyor."
+
+#: rebase-interactive.c:42
+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 [-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"
+"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ştirmek için dur\n"
+"s, squash <işleme> = işlemeyi kullan; ancak önceki işleme içine karıştır\n"
+"f, fixup [-C | -c] <işleme> = \"squash\" gibi; ancak yalnızca bir önceki\n"
+"                   işlemenin günlük iletisini tutar (-C kullanılmadıysa,\n"
+"                   o zaman yalnızca bu işlemenin iletisini tutar; -c, -C\n"
+"                   ile aynıdır; ancak ek olarak düzenleyiciyi açar)\n"
+"x, exec <komut> = komutu (satırın geri kalanı) kabuk kullanarak çalıştır\n"
+"b, break = burada dur (daha sonra sürdürmek için 'git rebase --continue')\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> [# <teksatı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"
+
+#: rebase-interactive.c:66
+#, c-format
+msgid "Rebase %s onto %s (%d command)"
+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
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"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
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Buradaki bir satırı kaldırırsanız İŞLEME KAYBOLUR.\n"
+
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Sürmekte olan bir etkileşimli yeniden temellendirmenin yapılacaklar "
+"dosyasını düzenlemektesiniz.\n"
+"Düzenlemenin ardından yeniden temellendirmeyi sürdürmek için şunu kullanın:\n"
+"\tgit rebase --continue\n"
+"\n"
+
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"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:3836
+#: sequencer.c:3862 sequencer.c:5656 builtin/fsck.c:328 builtin/rebase.c:271
+#, 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
+#, c-format
+msgid "could not write '%s'."
+msgstr "'%s' yazılamadı."
+
+#: rebase-interactive.c:196
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Uyarı: Bazı işlemeler yanlışlıkla bırakılmış olabilir.\n"
+"Bırakılan işlemeler: (yeniden eskiye):\n"
+
+#: rebase-interactive.c:203
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Bu iletiden kaçınmak için, bir işlemeyi kaldırırken açıkça \"drop\" "
+"kullanın.\n"
+"Uyarıların düzeyini değiştirmek için 'git config rebase.missingCommitsCheck' "
+"kullanın.\n"
+"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
+#, c-format
+msgid "could not read '%s'."
+msgstr "'%s' okunamadı."
+
+#: ref-filter.c:42 wt-status.c:2036
+msgid "gone"
+msgstr "gitti"
+
+#: ref-filter.c:43
+#, c-format
+msgid "ahead %d"
+msgstr "%d önünde"
+
+#: ref-filter.c:44
+#, c-format
+msgid "behind %d"
+msgstr "%d arkasında"
+
+#: ref-filter.c:45
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "%d önünde, %d arkasında"
+
+#: ref-filter.c:230
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "beklenen biçim: %%(color:<renk>)"
+
+#: ref-filter.c:232
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "tanımlanamayan renk: %%(color:%s)"
+
+#: ref-filter.c:254
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "Tamsayı değeri şunu bekliyordu: refname:lstrip=%s"
+
+#: ref-filter.c:258
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "Tamsayı değeri şunu bekliyordu: refname:rstrip=%s"
+
+#: ref-filter.c:260
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "tanımlanamayan %%(%s) argümanı: %s"
+
+#: ref-filter.c:315
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) argüman almıyor"
+
+#: ref-filter.c:339
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "tanımlanamayan %%(objectsize) argümanı: %s"
+
+#: ref-filter.c:347
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) argüman almıyor"
+
+#: ref-filter.c:359
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) argüman almıyor"
+
+#: ref-filter.c:372
+#, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "tanımlanamayan %%(subject) argümanı: %s"
+
+#: ref-filter.c:391
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "%%(trailers:key=<deÄŸer>) bekleniyordu"
+
+#: ref-filter.c:393
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "bilinmeyen %%(trailers) argümanı: %s"
+
+#: ref-filter.c:424
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "pozitif deÄŸer ÅŸunu bekliyordu: contents:lines=%s"
+
+#: ref-filter.c:426
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "tanımlanamayan %%(contents) argümanı: %s"
+
+#: ref-filter.c:441
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "pozitif deÄŸer ÅŸurada '%s' bekliyordu: %%(%s)"
+
+#: ref-filter.c:445
+#, c-format
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "şurada tanımlanamayan argüman '%s': %%(%s)"
+
+#: ref-filter.c:459
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "tanımlanamayan e-posta seçeneği: %s"
+
+#: ref-filter.c:489
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "beklenen biçim: %%(align:<genişlik>,<konum>)"
+
+#: ref-filter.c:501
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "tanımlanamayan konum:%s"
+
+#: ref-filter.c:508
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "tanımlanamayan genişlik:%s"
+
+#: ref-filter.c:517
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "tanımlanamayan %%(align) argümanı: %s"
+
+#: ref-filter.c:525
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "pozitif genişlik %%(align) ögeciği ile birlikte bekleniyordu"
+
+#: ref-filter.c:543
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "tanımlanamayan %%(if) argümanı: %s"
+
+#: ref-filter.c:645
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "hatalı oluşturulmuş alan adı: %.*s"
+
+#: ref-filter.c:672
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "bilinmeyen alan adı: %.*s"
+
+#: ref-filter.c:676
+#, 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:801
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "biçim: %%(if) ögeciği bir %%(then) ögeciği olmadan kullanıldı"
+
+#: ref-filter.c:865
+#, 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:867
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "biçim: %%(then) ögeciği birden çok kez kullanıldı"
+
+#: ref-filter.c:869
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "biçim: %%(then) ögeciği %%(else) ögeciğinden sonra kullanıldı"
+
+#: ref-filter.c:897
+#, 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:899
+#, 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:901
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "biçim: %%(else) ögeciği birden çok kez kullanıldı"
+
+#: ref-filter.c:916
+#, 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:973
+#, c-format
+msgid "malformed format string %s"
+msgstr "hatalı oluşturulmuş biçim dizisi %s"
+
+#: ref-filter.c:1621
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(dal yok, %s yeniden temellendiriliyor)"
+
+#: ref-filter.c:1624
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "(dal yok, ayrık HEAD %s yeniden temellendiriliyor)"
+
+#: ref-filter.c:1627
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(dal yok, ikili arama %s üzerinde başladı)"
+
+#: ref-filter.c:1631
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD, %s konumunda ayrıldı)"
+
+#: ref-filter.c:1634
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD, %s ögesinden ayrıldı)"
+
+#: ref-filter.c:1637
+msgid "(no branch)"
+msgstr "(dal yok)"
+
+#: ref-filter.c:1669 ref-filter.c:1880
+#, c-format
+msgid "missing object %s for %s"
+msgstr "eksik nesne %s (%s için)"
+
+#: ref-filter.c:1679
+#, 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:2064
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "'%s' konumunda hatalı oluşturulmuş nesne"
+
+#: ref-filter.c:2153
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "bozuk ada iye %s başvurusu yok sayılıyor"
+
+#: ref-filter.c:2158 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "bozuk başvuru %s yok sayılıyor"
+
+#: ref-filter.c:2502
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "biçim: %%(end) ögeciği eksik"
+
+#: ref-filter.c:2596
+#, c-format
+msgid "malformed object name %s"
+msgstr "hatalı oluşturulmuş nesne adı %s"
+
+#: ref-filter.c:2601
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "'%s' bir iÅŸlemeye iÅŸaret etmeli"
+
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s geçerli bir nesneye işaret etmiyor!"
+
+#: 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 ""
+"Başlangıç dal adı olarak %s kullanılıyor. Bu öntanımlı dal adı\n"
+"değiştirilebilir. Bu iletiyi kapatmak ve yeni depolarınızda kullanılacak\n"
+"başlangıç dal adını yapılandırmak için şu komutu kullanın:\n"
+"\n"
+"\tgit config --global init.defaultBranch <ad>\n"
+"\n"
+"'master' yerine kullanılan diğer yaygın dal adları 'main', 'trunk' ve/veya\n"
+"'development'tır. Yeni oluşturulan dal şu komutla yeniden adlandırılabilir:\n"
+"\n"
+"\tgit branch -m <ad>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "'%s' alınamadı"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "geçersiz dal adı: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "sarkan sembolik başvuru %s yok sayılıyor"
+
+#: refs.c:922
+#, 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
+#, 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
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s için olan günlük boş"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "hatalı ada iye '%s' başvurusunu güncelleme reddediliyor"
+
+#: refs.c:1157
+#, 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
+#, 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
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "başvuru güncellemeleri karantina ortamı içinde yasak"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "başvuru güncellemeleri kanca tarafından iptal edildi"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' mevcut; '%s' oluşturulamıyor"
+
+#: refs.c:2248 refs.c:2283
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "could not delete references: %s"
+msgstr "baÅŸvurular silinemedi: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "geçersiz başvuru belirteci '%s'"
+
+#: remote.c:351
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "uzak konum yapılandırma stenografisi '/' ile başlayamaz: %s"
+
+#: remote.c:399
+msgid "more than one receivepack given, using the first"
+msgstr "birden fazla receivepack verildi, birincisi kullanılıyor"
+
+#: remote.c:407
+msgid "more than one uploadpack given, using the first"
+msgstr "birden fazla uploadpack verildi, birincisi kullanılıyor"
+
+#: remote.c:590
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "Hem %s hem %s ÅŸuraya getirilemiyor: %s"
+
+#: remote.c:594
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s genelde %s ögesini izler, %s değil"
+
+#: remote.c:598
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s hem %s hem %s ögelerini izler"
+
+#: remote.c:666
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "dizginin '%s' anahtarında '*' yoktu"
+
+#: remote.c:676
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "dizginin '%s' deÄŸerinde '*' yok"
+
+#: remote.c:1083
+#, 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
+#, c-format
+msgid "src refspec %s matches more than one"
+msgstr "kaynak başvuru belirteci %s birden fazlası ile eşleşiyor"
+
+#. TRANSLATORS: "matches '%s'%" is the <dst> part of "git push
+#. <remote> <src>:<dst>" push, and "being pushed ('%s')" is
+#. the <src>.
+#.
+#: remote.c:1103
+#, 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"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"Sağladığınız kaynak tam bir başvuru belirteci değil (örneğin \"refs/\"\n"
+"ile başlamıyor. Bununla ne demek istediğinizi bulabilmek için:\n"
+"\n"
+"- Uzak konumda '%s' ile eşleşen bir başvuru aradık.\n"
+"- İtilen <kaynak>'ın ('%s') \"refs/{heads,tags}/\" içinde bir\n"
+"  başvuru olup olmadığına baktık. Eğer öyleyse uzak konum tarafında\n"
+"  eşleşen bir refs/{heads,tags}/ öneki ekledik.\n"
+"\n"
+"Hiçbiri işe yaramadı, biz de bıraktık. Başvuruyu tam olarak "
+"nitelendirmelisiniz."
+
+#: remote.c:1123
+#, 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 ""
+"Başvuru belirtecinin <kaynak> kısmı bir işleme nesnesi.\n"
+"'%s:refs/heads/%s' konumuna iterek yeni bir dal mı\n"
+"oluÅŸturmak istediniz?"
+
+#: remote.c:1128
+#, 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 ""
+"Başvuru belirtecinin <kaynak> kısmı bir etiket nesnesi.\n"
+"'%s:refs/tags/%s' konumuna iterek yeni bir etiket mi\n"
+"oluÅŸturmak istediniz?"
+
+#: remote.c:1133
+#, 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 ""
+"Başvuru belirtecinin <kaynak> kısmı bir ağaç nesnesi.\n"
+"'%s:refs/tags/%s' konumuna iterek yeni bir ağaç mı\n"
+"etiketlemek istediniz?"
+
+#: remote.c:1138
+#, 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 ""
+"Başvuru belirtecinin <kaynak> kısmı ikili bir nesne.\n"
+"'%s:refs/tags/%s' konumuna iterek yeni ikili bir nesne mi\n"
+"etiketlemek istediniz?"
+
+#: remote.c:1174
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s dala çözülemiyor"
+
+#: remote.c:1185
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "'%s' silinemiyor: uzak baÅŸvuru yok"
+
+#: remote.c:1197
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "birden çok hedef başvuru belirteci %s eşleşmesi"
+
+#: remote.c:1204
+#, 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
+msgid "HEAD does not point to a branch"
+msgstr "HEAD bir dala iÅŸaret etmiyor"
+
+#: remote.c:1733
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "böyle bir dal yok: '%s'"
+
+#: remote.c:1736
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "'%s' dalı için üstkaynak yapılandırılmamış"
+
+#: remote.c:1742
+#, 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
+#, 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
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "'%s' dalının itme için uzak konumu yok"
+
+#: remote.c:1779
+#, 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
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "itilecek bir hedef yok (push.default: 'nothing')"
+
+#: remote.c:1814
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "tek bir konuma 'simple' itme çözülemiyor"
+
+#: remote.c:1943
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "%s uzak başvurusu bulunamadı"
+
+#: remote.c:1956
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* Eğlenceli başvuru '%s' yerel olarak yok sayılıyor"
+
+#: remote.c:2119
+#, 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
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  (düzeltmek için \"git branch --unset-upstream\" kullan)\n"
+
+#: remote.c:2126
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Dalınız '%s' ile güncel.\n"
+
+#: remote.c:2130
+#, 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
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  (ayrıntılar için \"%s\" kullanın)\n"
+
+#: 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] "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
+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
+#, 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] "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
+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
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"Sizin dalınız ve '%s' birbirinden uzaklaşmış ve sırasıyla\n"
+"her birinde %d ve %d iÅŸleme var.\n"
+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
+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
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "beklenen nesne adı '%s' ayrıştırılamıyor"
+
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "hatalı değiştirme başvurusu adı: %s"
+
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "yinelenmiÅŸ deÄŸiÅŸtirme baÅŸvurusu: %s"
+
+#: replace-object.c:82
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "%s nesnesi için değiştirme derinliği pek yüksek"
+
+#: rerere.c:201 rerere.c:210 rerere.c:213
+msgid "corrupt MERGE_RR"
+msgstr "hasar görmüş MERGE_RR"
+
+#: rerere.c:248 rerere.c:253
+msgid "unable to write rerere record"
+msgstr "rerere kaydı yazılamıyor"
+
+#: rerere.c:479
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "'%s' yazılırken hatalar vardı (%s)"
+
+#: rerere.c:482
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "'%s' floş yapılamadı"
+
+#: rerere.c:487 rerere.c:1023
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "'%s' içindeki çakışan parçalar ayrıştırılamadı"
+
+#: rerere.c:668
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "'%s' üzerinde utime() başarısız"
+
+#: rerere.c:678
+#, c-format
+msgid "writing '%s' failed"
+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ı"
+
+#: rerere.c:737
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "'%s' için çözüm kaydedildi."
+
+#: rerere.c:772
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "'%s' bir önceki çözüm kullanılarak çözüldü."
+
+#: rerere.c:787
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "'%s' başıboşunun bağlantısı kesilemiyor"
+
+#: rerere.c:791
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "'%s' için öngörüntü kaydedildi"
+
+#: 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 "'%s' dizini oluşturulamadı"
+
+#: rerere.c:1041
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "'%s' içindeki çakışan durum güncellenemedi"
+
+#: rerere.c:1052 rerere.c:1059
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "'%s' için hatırlanan çözüm yok"
+
+#: rerere.c:1061
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "'%s' bağlantısı kesilemiyor"
+
+#: rerere.c:1071
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "'%s' için öngörüntü güncellendi"
+
+#: rerere.c:1080
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "'%s' için çözüm unutuldu\n"
+
+#: rerere.c:1191
+msgid "unable to open rr-cache directory"
+msgstr "rr-cache dizini açılamıyor"
+
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "HEAD revizyonu saptanamadı"
+
+#: reset.c:69 reset.c:75 sequencer.c:3689
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "%s ögesinin ağacı bulunamadı"
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<paketdosyası> artık desteklenmiyor"
+
+#: revision.c:2684
+msgid "your current branch appears to be broken"
+msgstr "geçerli dalınız bozuk gibi görünüyor"
+
+#: revision.c:2687
+#, 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:2893
+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:766
+msgid "open /dev/null failed"
+msgstr "/dev/null açılamadı"
+
+#: run-command.c:1274
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "async iş parçacığı oluşturulamadı: %s"
+
+#: 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 ""
+"'%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"
+
+#: send-pack.c:152
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "uzak konum açım durumu ayrıştırılamadı: %s"
+
+#: send-pack.c:154
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "uzak konum açımı başarısız: %s"
+
+#: send-pack.c:378
+msgid "failed to sign the push certificate"
+msgstr "itme sertifikası imzalanamadı"
+
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack: getirme altişlemi çatallanamıyor"
+
+#: send-pack.c:455
+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:526
+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:535
+msgid "the receiving end does not support --signed push"
+msgstr "alıcı uç --signed itmeyi desteklemiyor"
+
+#: send-pack.c:537
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"alıcı uç --signed itmeyi desteklemediğinden dolayı bir itme sertifikası "
+"gönderilmiyor"
+
+#: send-pack.c:544
+msgid "the receiving end does not support --atomic push"
+msgstr "alıcı uç --atomic itmeyi desteklemiyor"
+
+#: send-pack.c:549
+msgid "the receiving end does not support push options"
+msgstr "alıcı uç itme seçeneklerini desteklemiyor"
+
+#: sequencer.c:196
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "geçersiz işleme iletisi temizleme kipi '%s'"
+
+#: sequencer.c:324
+#, 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
+#, c-format
+msgid "could not remove '%s'"
+msgstr "'%s' kaldırılamadı"
+
+#: sequencer.c:354
+msgid "revert"
+msgstr "geri al"
+
+#: sequencer.c:356
+msgid "cherry-pick"
+msgstr "seç-al"
+
+#: sequencer.c:358
+msgid "rebase"
+msgstr "yeniden temellendirme"
+
+#: sequencer.c:360
+#, c-format
+msgid "unknown action: %d"
+msgstr "bilinmeyen eylem: %d"
+
+#: sequencer.c:419
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"çakışmaları çözdükten sonra doğrusu verilen yolları 'git add <yollar>'\n"
+"veya 'git rm <yollar>' ile imleyin"
+
+#: sequencer.c:422
+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 ""
+"ç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"
+
+#: sequencer.c:435 sequencer.c:3271
+#, c-format
+msgid "could not lock '%s'"
+msgstr "'%s' kilitlenemedi"
+
+#: 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 "şuraya yazılamadı: '%s'"
+
+#: sequencer.c:442
+#, 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:3555
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "'%s' tamamlanamadı"
+
+#: sequencer.c:486
+#, 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
+msgid "commit your changes or stash them to proceed."
+msgstr "İlerlemek için değişikliklerinizi işleyin veya zulalayın."
+
+#: sequencer.c:522
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: ileri sar"
+
+#: sequencer.c:561 builtin/tag.c:609
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Geçersiz temizlik kipi %s"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c:671
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Yeni indeks dosyası yazılamıyor"
+
+#: sequencer.c:685
+msgid "unable to update cache tree"
+msgstr "önbellek ağacı güncellenemiyor"
+
+#: sequencer.c:699
+msgid "could not resolve HEAD commit"
+msgstr "HEAD işlemesi çözülemedi"
+
+#: sequencer.c:779
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "'%.*s' içinde bir anahtar yok"
+
+#: sequencer.c:790
+#, 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:729
+#: builtin/am.c:821 builtin/merge.c:1141 builtin/rebase.c:910
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "'%s' okuma için açılamadı"
+
+#: sequencer.c:837
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "'GIT_AUTHOR_NAME' halihazırda verilmiş"
+
+#: sequencer.c:842
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "'GIT_AUTHOR_EMAIL' halihazırda verilmiş"
+
+#: sequencer.c:847
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "'GIT_AUTHOR_DATE' halihazırda verilmiş"
+
+#: sequencer.c:851
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "bilinmeyen deÄŸiÅŸken '%s'"
+
+#: sequencer.c:856
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "'GIT_AUTHOR_NAME' eksik"
+
+#: sequencer.c:858
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "'GIT_AUTHOR_EMAIL' eksik"
+
+#: sequencer.c:860
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "'GIT_AUTHOR_DATE' eksik"
+
+#: sequencer.c:925
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Çalışma ağacınızda hazırlanmış değişiklikleriniz var.\n"
+"Eğer bu değişikliklerin bir önceki işlemeye eklenmesi\n"
+"gerekiyorsa şu komutu çalıştırın:\n"
+"\n"
+"\tgit commit --amend %s\n"
+"\n"
+"Yeni bir işleme yapmak istiyorsanız şu komutu çalıştırın:\n"
+"\n"
+"\tgit commit %s\n"
+"\n"
+"Her iki durumda da işiniz bittikten sonra şu komut ile sürdürün:\n"
+"\n"
+"\tgit rebase --continue\n"
+
+#: sequencer.c:1212
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' başarısız oldu"
+
+#: 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"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Adınız ve e-posta adresiniz kullanıcı adınız ve makine adı temel alınarak\n"
+"kendiliğinden yapılandırıldı. Lütfen doğru olup olmadığını denetleyin.\n"
+"Bu iletiyi onları el ile belirterek gizleyebilirsiniz. Aşağıdaki komutu\n"
+"çalıştırın ve yapılandırma dosyanızı düzenlemek için düzenleyicinizdeki\n"
+"yönergeleri izleyin:\n"
+"\n"
+"\tgit config --global --edit\n"
+"\n"
+"Bundan sonra bu işleme için kullanılan kimliği düzeltmek isteyebilirsiniz:\n"
+"\n"
+"\tgit commit --amend --reset-author\n"
+
+#: 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"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"Adınız ve e-posta adresiniz kullanıcı adınız ve makine adı temel alınarak\n"
+"kendiliğinden yapılandırıldı. Lütfen doğru olup olmadığını denetleyin.\n"
+"Bu iletiyi onları el ile belirterek gizleyebilirsiniz:\n"
+"\n"
+"\tgit config --global user.name \"Adınız\"\n"
+"\tgit config --global user.email \"siz@e-posta.com\"\n"
+"\n"
+"Bundan sonra bu işleme için kullanılan kimliği düzeltmek isteyebilirsiniz:\n"
+"\n"
+"\tgit commit --amend --reset-author\n"
+
+#: sequencer.c:1273
+msgid "couldn't look up newly created commit"
+msgstr "yeni yapılan işleme aranamadı"
+
+#: sequencer.c:1275
+msgid "could not parse newly created commit"
+msgstr "yeni yapılan işleme ayrıştırılamadı"
+
+#: sequencer.c:1321
+msgid "unable to resolve HEAD after creating commit"
+msgstr "HEAD, işleme yapıldıktan sonra çözülemiyor"
+
+#: sequencer.c:1323
+msgid "detached HEAD"
+msgstr "ayrık HEAD"
+
+#: sequencer.c:1327
+msgid " (root-commit)"
+msgstr " (kök işleme)"
+
+#: sequencer.c:1348
+msgid "could not parse HEAD"
+msgstr "HEAD ayrıştırılamadı"
+
+#: sequencer.c:1350
+#, 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:1705
+msgid "could not parse HEAD commit"
+msgstr "HEAD işlemesi ayrıştırılamadı"
+
+#: sequencer.c:1410 sequencer.c:2295
+msgid "unable to parse commit author"
+msgstr "işleme yazarı ayrıştırılamıyor"
+
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree bir ağaca yazamadı"
+
+#: sequencer.c:1454 sequencer.c:1574
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "'%s' konumundan işleme iletisi okunamıyor"
+
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "geçersiz yazar kimliği '%s'"
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr "hasar görmüş yazar: tarih bilgisi eksik"
+
+#: 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 "işleme nesnesi yazılamadı"
+
+#: 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 "%s güncellenemedi"
+
+#: sequencer.c:1606
+#, c-format
+msgid "could not parse commit %s"
+msgstr "%s işlemesi ayrıştırılamadı"
+
+#: sequencer.c:1611
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "üst işleme %s ayrıştırılamadı"
+
+#: sequencer.c:1694 sequencer.c:1975
+#, c-format
+msgid "unknown command: %d"
+msgstr "bilinmeyen komut: %d"
+
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "Birinci iÅŸleme iletisi bu:"
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "Ä°ÅŸleme iletisi #%d bu:"
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "Birinci iÅŸlemenin iletisi atlanacak:"
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "Ä°ÅŸleme iletisi #%d atlanacak:"
+
+#: sequencer.c:1740
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Bu %d iÅŸlemenin bir birleÅŸimi."
+
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "'%s' yazılamıyor"
+
+#: sequencer.c:1934
+msgid "need a HEAD to fixup"
+msgstr "düzeltmek için bir HEAD gerekiyor"
+
+#: sequencer.c:1936 sequencer.c:3582
+msgid "could not read HEAD"
+msgstr "HEAD okunamadı"
+
+#: sequencer.c:1938
+msgid "could not read HEAD's commit message"
+msgstr "HEAD'in işleme iletisi okunamadı"
+
+#: sequencer.c:1962
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "%s işleme iletisi okunamadı"
+
+#: sequencer.c:2072
+msgid "your index file is unmerged."
+msgstr "indeks dosyanız birleştirilmemiş"
+
+#: sequencer.c:2079
+msgid "cannot fixup root commit"
+msgstr "kök işleme düzeltilemiyor"
+
+#: sequencer.c:2098
+#, 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
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "%s işlemesinin %d diye bir üst ögesi yok"
+
+#: sequencer.c:2120
+#, 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
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: üst işleme %s ayrıştırılamıyor"
+
+#: sequencer.c:2205
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "'%s', '%s' olarak yeniden adlandırılamadı"
+
+#: sequencer.c:2265
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "%s geri alınamadı... %s"
+
+#: sequencer.c:2266
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "%s uygulanamadı... %s"
+
+#: sequencer.c:2287
+#, 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
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: indeks okunamadı"
+
+#: sequencer.c:2352
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: indeks yenilenemedi"
+
+#: sequencer.c:2425
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s argüman kabul etmiyor: '%s'"
+
+#: sequencer.c:2434
+#, c-format
+msgid "missing arguments for %s"
+msgstr "%s için eksik argüman"
+
+#: sequencer.c:2477
+#, c-format
+msgid "could not parse '%s'"
+msgstr "'%s' ayrıştırılamadı"
+
+#: sequencer.c:2538
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "geçersiz satır %d: %.*s"
+
+#: sequencer.c:2549
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "öncesinde bir işleme olmadan '%s' yapılamıyor"
+
+#: sequencer.c:2635
+msgid "cancelling a cherry picking in progress"
+msgstr "sürmekte olan bir seç-al iptal ediliyor"
+
+#: sequencer.c:2644
+msgid "cancelling a revert in progress"
+msgstr "sürmekte olan bir geri al iptal ediliyor"
+
+#: sequencer.c:2690
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "lütfen bunu 'git rebase --edit-todo' kullanarak onarın."
+
+#: sequencer.c:2692
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "kullanılabilir olmayan yönerge tablosu: '%s'"
+
+#: sequencer.c:2697
+msgid "no commits parsed."
+msgstr "Hiçbir işleme ayrıştırılmadı."
+
+#: sequencer.c:2708
+msgid "cannot cherry-pick during a revert."
+msgstr "bir geri al sırasında seç-al yapılamıyor"
+
+#: sequencer.c:2710
+msgid "cannot revert during a cherry-pick."
+msgstr "bir seç-al sırasında geri al yapılamıyor"
+
+#: sequencer.c:2788
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "%s için geçersiz değer: %s"
+
+#: sequencer.c:2897
+msgid "unusable squash-onto"
+msgstr "kullanılabilir olmayan squash-onto"
+
+#: sequencer.c:2917
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "hatalı oluşturulmuş seçenekler tablosu: '%s'"
+
+#: sequencer.c:3012 sequencer.c:4868
+msgid "empty commit set passed"
+msgstr "boş işleme seti aktarıldı"
+
+#: sequencer.c:3029
+msgid "revert is already in progress"
+msgstr "geri al halihazırda sürüyor"
+
+#: sequencer.c:3031
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "\"git revert (--continue | %s--abort | --quit)\" deneyin"
+
+#: sequencer.c:3034
+msgid "cherry-pick is already in progress"
+msgstr "seç-al halihazırda sürüyor"
+
+#: sequencer.c:3036
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "\"git cherry-pick (--continue | %s--abort | --quit)\" deneyin"
+
+#: sequencer.c:3050
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "ardıştırıcı dizini '%s' oluşturulamadı"
+
+#: sequencer.c:3065
+msgid "could not lock HEAD"
+msgstr "HEAD kilitlenemedi"
+
+#: sequencer.c:3125 sequencer.c:4581
+msgid "no cherry-pick or revert in progress"
+msgstr "süren bir seç-al veya geri al yok"
+
+#: sequencer.c:3127 sequencer.c:3138
+msgid "cannot resolve HEAD"
+msgstr "HEAD çözülemiyor"
+
+#: sequencer.c:3129 sequencer.c:3173
+msgid "cannot abort from a branch yet to be born"
+msgstr "daha doğmamış bir daldan iptal edilemiyor"
+
+#: sequencer.c:3159 builtin/grep.c:758
+#, c-format
+msgid "cannot open '%s'"
+msgstr "'%s' açılamıyor"
+
+#: sequencer.c:3161
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "'%s' okunamıyor: %s"
+
+#: sequencer.c:3162
+msgid "unexpected end of file"
+msgstr "beklenmedik dosya sonu"
+
+#: sequencer.c:3168
+#, 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
+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
+msgid "no revert in progress"
+msgstr "süren bir geri al yok"
+
+#: sequencer.c:3229
+msgid "no cherry-pick in progress"
+msgstr "süren bir seç-al yok"
+
+#: sequencer.c:3239
+msgid "failed to skip the commit"
+msgstr "işleme atlanamadı"
+
+#: sequencer.c:3246
+msgid "there is nothing to skip"
+msgstr "atlanacak bir ÅŸey yok"
+
+#: sequencer.c:3249
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"İşlemeyi yaptınız mı?\n"
+"\"git %s --continue\" deneyin.\""
+
+#: sequencer.c:3411 sequencer.c:4472
+msgid "cannot read HEAD"
+msgstr "HEAD okunamıyor"
+
+#: sequencer.c:3428
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "'%s', '%s' konumuna kopyalanamıyor"
+
+#: sequencer.c:3436
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"Ä°ÅŸlemeyi ÅŸimdi ÅŸu komutla deÄŸiÅŸtirebilirsiniz:\n"
+"\n"
+"\tgit commit --amend %s\n"
+"\n"
+"Değişikliklerinizden memnunsanız şu komutla sürdürün:\n"
+"\n"
+"\tgit rebase --continue\n"
+
+#: sequencer.c:3446
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "%s uygulanamıyor... %.*s"
+
+#: sequencer.c:3453
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "%.*s birleÅŸtirilemedi"
+
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "'%s', '%s' konumuna kopyalanamadı"
+
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr "Çalıştırılıyor: %s\n"
+
+#: sequencer.c:3498
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"Çalıştırma başarısız: %s\n"
+"%sSorunu çözüp sürdürmek için şunu çalıştırın:\n"
+"\n"
+"\tgit rebase --continue\n"
+"\n"
+
+#: sequencer.c:3504
+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
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"Çalıştırma başarılı oldu: %s,\n"
+"ancak indeksinize ve/veya çalışma ağacınıza 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\n"
+"\n"
+
+#: sequencer.c:3572
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "izin verilmeyen etiket adı: '%.*s'"
+
+#: sequencer.c:3645
+msgid "writing fake root commit"
+msgstr "sahte kök işlemesi yazılıyor"
+
+#: sequencer.c:3650
+msgid "writing squash-onto"
+msgstr "squash-onto yazılıyor"
+
+#: sequencer.c:3734
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "'%s' çözülemedi"
+
+#: sequencer.c:3767
+msgid "cannot merge without a current revision"
+msgstr "güncel bir revizyon olmadan birleştirilemiyor"
+
+#: sequencer.c:3789
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "'%.*s' ayrıştırılamıyor"
+
+#: sequencer.c:3798
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "birleÅŸtirilecek bir ÅŸey yok: '%.*s'"
+
+#: sequencer.c:3810
+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:3826
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "'%s' işlemesinin işleme iletisi alınamadı"
+
+#: sequencer.c:4009
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "şunu birleştirme girişiminde bulunulamadı bile: '%.*s'"
+
+#: sequencer.c:4025
+msgid "merge: Unable to write new index file"
+msgstr "merge: Yeni indeks dosyası yazılamıyor"
+
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr "Kendiliğinden zulalanamıyor"
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Beklenmedik zula yanıtı: '%s'"
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "'%s' için dizin oluşturulamadı"
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "Zula kendiliÄŸinden oluÅŸturuldu: %s\n"
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr "'reset --hard' yapılamadı"
+
+#: sequencer.c:4140
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Kendiliğinden zulalama uygulandı.\n"
+
+#: sequencer.c:4152
+#, c-format
+msgid "cannot store %s"
+msgstr "%s depolanamıyor"
+
+#: sequencer.c:4155
+#, 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"
+"Değişiklikleriniz zulada güvende.\n"
+"Ä°stediÄŸiniz zaman \"git stash pop\" veya \"git stash drop\" yapabilirsiniz.\n"
+
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
+msgstr "Kendiliğinden zulalama çakışmalara neden oldu."
+
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
+msgstr "KendiliÄŸinden zulalama mevcut; yeni bir zula girdisi oluÅŸturuluyor."
+
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+msgid "could not detach HEAD"
+msgstr "HEAD ayrılamadı"
+
+#: sequencer.c:4248
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "HEAD'de duruldu\n"
+
+#: sequencer.c:4250
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "%s konumunda duruldu\n"
+
+#: sequencer.c:4258
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"todo komutu çalıştırılamadı.\n"
+"\n"
+"\t%.*s\n"
+"Yeniden zamanlandı; sürdürmeden önce komutu düzenlemek için lütfen\n"
+"önce yapılacaklar listesini düzenleyin:\n"
+"\n"
+"\tgit rebase --edit-todo\n"
+"\tgit rebase --continue\n"
+
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "Yeniden temellendiriliyor: (%d/%d)%s"
+
+#: sequencer.c:4350
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "%s konumunda durdu... %.*s\n"
+
+#: sequencer.c:4421
+#, c-format
+msgid "unknown command %d"
+msgstr "bilinmeyen komut %d"
+
+#: sequencer.c:4480
+msgid "could not read orig-head"
+msgstr "orig-head okunamadı"
+
+#: sequencer.c:4485
+msgid "could not read 'onto'"
+msgstr "'onto' okunamadı"
+
+#: sequencer.c:4499
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "HEAD şu konuma güncellenemedi: %s"
+
+#: sequencer.c:4559
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "%s başarıyla yeniden temellendirildi ve güncellendi.\n"
+
+#: sequencer.c:4611
+msgid "cannot rebase: You have unstaged changes."
+msgstr "Yeniden temellendirilemiyor: Hazırlanmamış değişiklikleriniz var."
+
+#: sequencer.c:4620
+msgid "cannot amend non-existing commit"
+msgstr "var olmayan iÅŸleme deÄŸiÅŸtirilemiyor"
+
+#: sequencer.c:4622
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "geçersiz dosya: '%s'"
+
+#: sequencer.c:4624
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "geçersiz içerik: '%s'"
+
+#: sequencer.c:4627
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Ç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:4663 sequencer.c:4702
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "dosya yazılamadı: '%s'"
+
+#: sequencer.c:4718
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "CHERRY_PICK_HEAD kaldırılamadı"
+
+#: sequencer.c:4725
+msgid "could not commit staged changes."
+msgstr "Hazırlanmış değişiklikler işlenemedi."
+
+#: sequencer.c:4845
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: Bir %s seçip alınamıyor"
+
+#: sequencer.c:4849
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s hatalı revizyon"
+
+#: sequencer.c:4884
+msgid "can't revert as initial commit"
+msgstr "ilk işleme geri alınamaz"
+
+#: sequencer.c:5361
+msgid "make_script: unhandled options"
+msgstr "make_script: ele alınmayan seçenekler"
+
+#: sequencer.c:5364
+msgid "make_script: error preparing revisions"
+msgstr "make_script: revizyonlar hazırlanırken hata"
+
+#: sequencer.c:5614 sequencer.c:5631
+msgid "nothing to do"
+msgstr "yapılacak bir şey yok"
+
+#: sequencer.c:5650
+msgid "could not skip unnecessary pick commands"
+msgstr "gerekli olmayan seçim komutları atlanamadı"
+
+#: sequencer.c:5750
+msgid "the script was already rearranged."
+msgstr "betik halihazırda yeniden düzenlenmişti"
+
+#: setup.c:133
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s', '%s' konumunda depo dışında"
+
+#: setup.c:185
+#, 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: Ç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
+#, 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 ""
+"Belirsiz argüman '%s': Çalışma ağacında olmayan bilinmeyen revizyon veya "
+"yol.\n"
+"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
+"'git <komut> [<revizyon>...] -- [<dosya>...]'"
+
+#: setup.c:264
+#, 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
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"Belirsiz argüman '%s': Hem revizyon hem dosya adı.\n"
+"Yolları revizyonlardan ayırmak için '--' kullanın, şöyle:\n"
+"'git <komut> [<revizyon>...] -- [<dosya>...]'"
+
+#: setup.c:419
+msgid "unable to set up work tree using invalid config"
+msgstr "geçersiz yapılandırma kullanılarak çalışma ağacı kurulamıyor"
+
+#: setup.c:423 builtin/rev-parse.c:895
+msgid "this operation must be run in a work tree"
+msgstr "bu işlem bir çalışma ağacı içinde çalıştırılmalı"
+
+#: setup.c:658
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Beklenen git repo sürümü <= %d, %d bulundu"
+
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "bilinmeyen depo geniÅŸletmesi bulundu:"
+msgstr[1] "bilinmeyen depo geniÅŸletmeleri bulundu:"
+
+#: setup.c:680
+msgid "repo version is 0, but v1-only extension found:"
+msgid_plural "repo version is 0, but v1-only extensions found:"
+msgstr[0] "depo sürümü 0; ancak v1'e özel genişletme bulundu:"
+msgstr[1] "depo sürümü 0; ancak v1'e özel genişletmeler bulundu:"
+
+#: setup.c:701
+#, c-format
+msgid "error opening '%s'"
+msgstr "'%s' açılırken hata"
+
+#: setup.c:703
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "bir .git dosyası olabilmek için çok büyük: '%s'"
+
+#: setup.c:705
+#, c-format
+msgid "error reading %s"
+msgstr "%s okunurken hata"
+
+#: setup.c:707
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "geçersiz gitfile biçimi: %s"
+
+#: setup.c:709
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "gitfile içinde yol yok: %s"
+
+#: setup.c:711
+#, c-format
+msgid "not a git repository: %s"
+msgstr "bir git deposu deÄŸil: %s"
+
+#: setup.c:813
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' çok büyük"
+
+#: setup.c:827
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "bir git deposu deÄŸil: '%s'"
+
+#: setup.c:856 setup.c:858 setup.c:889
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "'%s' konumuna chdir yapılamıyor"
+
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+msgid "cannot come back to cwd"
+msgstr "cwd'ye geri dönülemiyor"
+
+#: setup.c:988
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "'%*s%s%s' bilgileri alınamadı"
+
+#: setup.c:1231
+msgid "Unable to read current working directory"
+msgstr "Şu anki çalışma dizini okunamıyor"
+
+#: setup.c:1240 setup.c:1246
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "ÅŸuraya deÄŸiÅŸtirilemiyor: '%s'"
+
+#: setup.c:1251
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "bir git deposu (veya üst dizinlerinden birisi) değil: %s"
+
+#: setup.c:1257
+#, 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 ""
+"Bir git deposu veya (%s bağlama noktasına kadar olan üstü) değil\n"
+"Dosya sistemi sınırında duruluyor (GIT_DISCOVERY_ACROSS_FILESYSTEM "
+"ayarlanmamış)."
+
+#: 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."
+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:1430
+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:1445
+msgid "fork failed"
+msgstr "çatallama başarısız"
+
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
+msgid "setsid failed"
+msgstr "setsid başarısız"
+
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
+msgstr "koni kipi olmadan sparse-index kullanılmaya çalışılıyor"
+
+#: sparse-index.c:176
+msgid "unable to update cache-tree, staying full"
+msgstr "önbellek ağacı güncellenemiyor, dolu kalınıyor"
+
+#: sparse-index.c:263
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "indeks girdisi bir dizin; ancak aralıklı değil (%08x)"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:850
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: strbuf.c:852
+#, c-format
+msgid "%u.%2.2u GiB/s"
+msgstr "%u.%2.2u GiB/sn"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte
+#: strbuf.c:860
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: strbuf.c:862
+#, c-format
+msgid "%u.%2.2u MiB/s"
+msgstr "%u.%2.2u MiB/sn"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte
+#: strbuf.c:869
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: strbuf.c:871
+#, c-format
+msgid "%u.%2.2u KiB/s"
+msgstr "%u.%2.2u KiB/sn"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte
+#: strbuf.c:877
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u bayt"
+msgstr[1] "%u bayt"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:879
+#, c-format
+msgid "%u byte/s"
+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:738
+#: builtin/rebase.c:866
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "'%s' yazma için açılamadı"
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr "'%s' düzenlenemedi"
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "kuşku doğuran altmodül yok sayılıyor: %s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs için negatif değerlere izin verilmiyor"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"'%s' bir komut satırı seçeneği olarak yorumlanabileceğinden yok sayılıyor: %s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s için geçersiz değer"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr ".gitmodules girdisi %s güncellenemedi"
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"Birleştirilmemiş .gitmodules değiştirilemiyor, önce birleştirme "
+"çakışmalarını çözün"
+
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr ".gitmodules içinde path=%s olan bölüm bulunamadı"
+
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "%s için .gitmodules girdisi kaldırılamadı"
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr "güncellenmiş .gitmodules'u hazırlama başarısız oldu"
+
+#: submodule.c:328
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "içi doldurulmamış '%s' altmodülünde"
+
+#: submodule.c:359
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "Yol belirteci '%s' '%.*s' altmodülünde"
+
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "hatalı --ignore-submodules argümanı: %s"
+
+#: submodule.c:805
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr ""
+"%s işlemesinde '%s' yolunda bulunan altmodül, aynı adlı bir altmodülle "
+"çarpışıyor. Atlanıyor."
+
+#: submodule.c:908
+#, 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:993
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+msgstr ""
+"'%s' altmodülünde 'git rev-list <commits> --not --remotes -n 1' "
+"çalıştırılamadı"
+
+#: submodule.c:1116
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "'%s' altmodülü için işlem başarısız oldu"
+
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "HEAD geçerli bir başvuru olarak çözülemedi."
+
+#: submodule.c:1156
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "'%s' altmodülü itiliyor\n"
+
+#: submodule.c:1159
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "'%s' altmodülü itilemiyor\n"
+
+#: submodule.c:1451
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "%s%s altmodülü getiriliyor\n"
+
+#: submodule.c:1485
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "'%s' altmodülüne erişilemedi\n"
+
+#: submodule.c:1640
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Altmodül getirilirken hata:\n"
+"%s"
+
+#: submodule.c:1665
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' bir git deposu olarak tanımlanamadı"
+
+#: submodule.c:1682
+#, 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:1723
+#, 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:1798
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "'%s' altmodülü içinde 'git status' başlatılamadı"
+
+#: submodule.c:1811
+#, 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:1826
+#, 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:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "'%s' altmodülüne özyinelenemedi"
+
+#: submodule.c:1874
+msgid "could not reset submodule index"
+msgstr "altmodül indeksi sıfırlanamadı"
+
+#: submodule.c:1916
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "'%s' altmodülü indeksi kirli"
+
+#: submodule.c:1968
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "'%s' altmodülü güncellenemedi."
+
+#: submodule.c:2036
+#, 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:2057
+#, 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:2069 submodule.c:2128
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "'%s' altmodülü adı aranamadı"
+
+#: submodule.c:2073
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "'%s' ögesini mevcut bir git dizinine taşıma reddediliyor"
+
+#: submodule.c:2080
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"'%s%s' git dizini göç ettiriliyor:\n"
+"ÅŸuradan: '%s'\n"
+"ÅŸuraya: '%s'\n"
+
+#: submodule.c:2208
+msgid "could not start ls-files in .."
+msgstr "ls-files şurada başlatılamadı .."
+
+#: submodule.c:2248
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree beklenmedik bir biçimde %d kodu ile çıktı"
+
+#: symlinks.c:244
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "'%s', lstat yapılamadı"
+
+#: trailer.c:244
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "'%s' artbilgi komutunu çalıştırma başarısız oldu"
+
+#: 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 "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
+#, c-format
+msgid "more than one %s"
+msgstr "birden çok %s"
+
+#: trailer.c:743
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "'%.*s' artbilgisi içinde boş artbilgi jetonu"
+
+#: trailer.c:763
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "'%s' girdi dosyası okunamadı"
+
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+msgid "could not read from stdin"
+msgstr "stdin'den okunamadı"
+
+#: trailer.c:1024 wrapper.c:676
+#, c-format
+msgid "could not stat %s"
+msgstr "%s dosya bilgileri alınamadı"
+
+#: trailer.c:1026
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "%s dosyası sıradan bir dosya değil"
+
+#: trailer.c:1028
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "%s dosyası kullanıcı tarafından yazılabilir değil"
+
+#: trailer.c:1040
+msgid "could not open temporary file"
+msgstr "geçici dosya açılamadı"
+
+#: trailer.c:1080
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "geçici dosya adı %s olarak değiştirilemedi"
+
+#: transport-helper.c:62 transport-helper.c:91
+msgid "full write to remote helper failed"
+msgstr "uzak konum yardımcısına tam yazım başarısız"
+
+#: transport-helper.c:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "'%s' için uzak konum yardımcısı bulunamadı"
+
+#: transport-helper.c:161 transport-helper.c:575
+msgid "can't dup helper output fd"
+msgstr "uzak konum yardımcısı çıktısı için dosya açıklayıcısı çoğaltılamıyor"
+
+#: transport-helper.c:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr ""
+"bilinmeyen zorunlu %s yeteneği; bu uzak konum yardımcısı büyük olasılıkla "
+"Git'in daha yeni bir sürümüne gereksinim duyuyor"
+
+#: transport-helper.c:220
+msgid "this remote helper should implement refspec capability"
+msgstr "bu uzak konum yardımcısı refspec yapabilirliğini yerine getirmeli"
+
+#: transport-helper.c:287 transport-helper.c:429
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s beklenmedik bir biçimde şunu söyledi: '%s'"
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s ayrıca şunu kilitledi: %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "fast-import çalıştırılamadı"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "fast-import çalıştırılırken hata"
+
+#: transport-helper.c:549 transport-helper.c:1247
+#, c-format
+msgid "could not read ref %s"
+msgstr "%s başvurusu okunamadı"
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "'connect'e bilinmeyen yanıt: %s"
+
+#: transport-helper.c:616
+msgid "setting remote service path not supported by protocol"
+msgstr "uzak servis yolu ayarlama protokol tarafından desteklenmiyor"
+
+#: transport-helper.c:618
+msgid "invalid remote service path"
+msgstr "geçersiz uzak konum servis yolu"
+
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr "işlem protokol tarafından desteklenmiyor"
+
+#: transport-helper.c:664
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "%s altservisine bağlanılamıyor"
+
+#: transport-helper.c:693 transport.c:400
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only protokolün ikinci sürümünü gerektiriyor"
+
+#: transport-helper.c:755
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "eÅŸleÅŸen bir 'tamam/hata' direktifi olmadan 'option'"
+
+#: transport-helper.c:798
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "tamam/hata bekleniyordu, yardımcı şunu söyledi: '%s'"
+
+#: transport-helper.c:855
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "yardımcı %s beklenmedik durumu bildirdi"
+
+#: transport-helper.c:938
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "%s yardımcısı 'dry-run' desteklemiyor"
+
+#: transport-helper.c:941
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "%s yardımcısı --signed desteklemiyor"
+
+#: transport-helper.c:944
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "%s yardımcısı --signed=if-asked desteklemiyor"
+
+#: transport-helper.c:949
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "%s yardımcısı --atomic desteklemiyor"
+
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "%s yardımcısı --%s desteklemiyor"
+
+#: transport-helper.c:960
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "%s yardımcısı 'push-option' desteklemiyor"
+
+#: transport-helper.c:1060
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-helper itme desteklemiyor; baÅŸvuru belirteci gerekli"
+
+#: transport-helper.c:1065
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "%s yardımcısı 'force' desteklemiyor"
+
+#: transport-helper.c:1112
+msgid "couldn't run fast-export"
+msgstr "fast-export çalıştırılamadı"
+
+#: transport-helper.c:1117
+msgid "error while running fast-export"
+msgstr "fast-export çalıştırılırken hata"
+
+#: 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 ""
+"Ortak başvuru yok ve hiç belirtilmemiş; bir şey yapılmayacak.\n"
+"Belki de bir dal belirtmelisiniz.\n"
+
+#: transport-helper.c:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "desteklenmeyen nesne biçimi '%s'"
+
+#: transport-helper.c:1233
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "başvuru listesinde hatalı oluşturulmuş yanıt: %s"
+
+#: transport-helper.c:1385
+#, c-format
+msgid "read(%s) failed"
+msgstr "read(%s) başarısız oldu"
+
+#: transport-helper.c:1412
+#, c-format
+msgid "write(%s) failed"
+msgstr "write(%s) başarısız oldu"
+
+#: transport-helper.c:1461
+#, c-format
+msgid "%s thread failed"
+msgstr "%s iş parçacığı başarısız oldu"
+
+#: transport-helper.c:1465
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s iş parçacığı eklenemedi: %s"
+
+#: transport-helper.c:1484 transport-helper.c:1488
+#, 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
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s iÅŸlemi bekleyemedi"
+
+#: transport-helper.c:1529
+#, c-format
+msgid "%s process failed"
+msgstr "%s işlemi başarısız oldu"
+
+#: transport-helper.c:1547 transport-helper.c:1556
+msgid "can't start thread for copying data"
+msgstr "veri kopyalama için iş parçacığı başlatılamıyor"
+
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "'%s' üst kaynağı '%s' (kaynak: '%s') olarak ayarlanacak\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "'%s' demeti okunamadı"
+
+#: transport.c:223
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: Geçersiz derinlik seçeneği '%s'"
+
+#: transport.c:275
+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:276
+msgid "server options require protocol version 2 or later"
+msgstr "sunucu seçenekleri protokol sürüm 2 veya sonrasını gerektirir"
+
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr "Sunucu, wait-for-done desteklemiyor"
+
+#: transport.c:755
+msgid "could not parse transport.color.* config"
+msgstr "transport.color.* yapılandırması ayrıştırılamadı"
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr "protokol v2 desteği henüz yerine getirilmedi"
+
+#: transport.c:965
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "'%s' yapılandırması için bilinmeyen değer: %s"
+
+#: transport.c:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "'%s' taşıyıcısına izin verilmiyor"
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync artık desteklenmiyor"
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"Aşağıdaki altmodül yolları başka hiçbir uzak konumda bulunamayan\n"
+"değişiklikler içeriyor:\n"
+
+#: transport.c:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Lütfen\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"deneyin veya bir uzak konuma itmek için yola cd yapıp\n"
+"\n"
+"\tgit push\n"
+"\n"
+"kullanın.\n"
+"\n"
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr "Ä°ptal ediliyor"
+
+#: transport.c:1346
+msgid "failed to push all needed submodules"
+msgstr "gereken tüm altmodüller itilemedi"
+
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr "ağaç nesnesi çok kısa"
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr "ağaç girdisinde hatalı oluşturulmuş kip"
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr "ağaç girdisinde boş dosya adı"
+
+#: tree-walk.c:118
+msgid "too-short tree file"
+msgstr "ağaç dosyası çok kısa"
+
+#: unpack-trees.c:115
+#, 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 ""
+"Çı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
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Çıkış ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
+"%%s"
+
+#: unpack-trees.c:120
+#, 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 ""
+"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
+"yazılacak:\n"
+"%%sLütfen birleştirmeden önce değişikliklerinizi işleyin veya zulalayın."
+
+#: unpack-trees.c:122
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Birleştirme ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine "
+"yazılacak:\n"
+"%%s"
+
+#: 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 ""
+"%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
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s ile aşağıdaki dosyalardaki yerel değişikliklerin üzerine yazılacak:\n"
+"%%s"
+
+#: unpack-trees.c:132
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Aşağıdaki dizinleri güncellemek içlerindeki izlenmeyen dosyaları kaybeder:\n"
+"%s"
+
+#: 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 ""
+"Çı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
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"%%s"
+
+#: 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 ""
+"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
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"%%s"
+
+#: 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 ""
+"%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
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyaları kaldırılacak:\n"
+"%%s"
+
+#: 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 ""
+"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
+"yazılacak:\n"
+"%%sLütfen dal değiştirmeden önce onları taşıyın veya kaldırın."
+
+#: unpack-trees.c:156
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Çıkış ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
+"yazılacak:\n"
+"%%s"
+
+#: 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 ""
+"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
+"yazılacak:\n"
+"%%sLütfen birleştirmeden önce onları taşıyın veya kaldırın."
+
+#: unpack-trees.c:161
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Birleştirme ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine "
+"yazılacak:\n"
+"%%s"
+
+#: 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 ""
+"%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
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"%s ile aşağıdaki izlenmeyen çalışma ağacı dosyalarının üzerine yazılacak:\n"
+"%%s"
+
+#: unpack-trees.c:174
+#, 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
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"Altmodül güncellenemiyor:\n"
+"%s"
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Aşağıdaki yollar güncel değil ve seyrek dizgilere rağmen terk edilmiş:\n"
+"%s"
+
+#: unpack-trees.c:182
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"Aşağıdaki yollar birleştirilmemiş ve seyrek dizgilere rağmen terk edilmiş:\n"
+"%s"
+
+#: unpack-trees.c:184
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"Aşağıdaki yollar halihazırda vardı ve buna göre, seyrek dizgilere rağmen "
+"güncellenmedi:\n"
+"%s"
+
+#: unpack-trees.c:264
+#, c-format
+msgid "Aborting\n"
+msgstr "Ä°ptal ediliyor\n"
+
+#: unpack-trees.c:291
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+msgstr ""
+"Yukarıdaki yolları onardıktan sonra 'git sparse-checkout reapply' yapmak "
+"isteyebilirsiniz.\n"
+
+#: unpack-trees.c:352
+msgid "Updating files"
+msgstr "Dosyalar güncelleniyor"
+
+#: 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 ""
+"Aşağıdaki yollar birbiriyle çarpıştı (örn. BÜYÜK/küçük harf duyarlı\n"
+"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:1618
+msgid "Updating index flags"
+msgstr "İndeks bayrakları güncelleniyor"
+
+#: unpack-trees.c:2718
+#, 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
+msgid "expected flush after fetch arguments"
+msgstr "getir argümanlarından sonra floş bekleniyordu"
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "geçersiz URL şeması veya eksik '://' eki"
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "geçersiz %XX kaçış sırası"
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "ana bilgisayar eksik ve ÅŸema 'file:' deÄŸil"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "bir 'file:' URL'sinin kapı numarası olmayabilir"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "ana bilgisayar adında geçersiz karakter"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "geçersiz kapı numarası"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "geçersiz '..' yol kesimi"
+
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "Nesneler getiriliyor"
+
+#: worktree.c:236 builtin/am.c:2152
+#, c-format
+msgid "failed to read '%s'"
+msgstr "'%s' okunamadı"
+
+#: worktree.c:303
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "ana çalışma ağacındaki '%s' depo dizini değil"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "'%s' dosyası çalışma ağacı konumuna olan tam yolu içermiyor"
+
+#: worktree.c:326
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' mevcut deÄŸil"
+
+#: worktree.c:332
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' bir .git dosyası değil, hata kodu %d"
+
+#: worktree.c:341
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' ÅŸuna geri iÅŸaret etmiyor: '%s'"
+
+#: worktree.c:603
+msgid "not a directory"
+msgstr "bir dizin deÄŸil"
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr ".git bir dosya deÄŸil"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr ".git dosyası bozuk"
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr ".git dosyası doğru değil"
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr "geçerli bir yol değil"
+
+#: worktree.c:728
+msgid "unable to locate repository; .git is not a file"
+msgstr "depo konumu bulunamıyor: .git bir dosya değil"
+
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "depo konumu bulunamıyor: .git dosyası bir depoya başvurmuyor"
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr "depo konumu bulunamıyor: .git dosyası bozuk"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr "okunamayan gitdir"
+
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr "doÄŸru olmayan gitdir"
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr "geçerli bir dizin değil"
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "gitdir dosyası mevcut değil"
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "gitdir dosyası (%s) okunamıyor"
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "az okundu (%<PRIuMAX> bayt bekleniyordu, %<PRIuMAX> okundu)"
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "geçersiz gitdir dosyası"
+
+#: worktree.c:817
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir dosyası var olmayan bir konuma işaret ediyor"
+
+#: wrapper.c:197 wrapper.c:367
+#, 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
+#, c-format
+msgid "unable to access '%s'"
+msgstr "'%s' eriÅŸilemiyor"
+
+#: wrapper.c:607
+msgid "unable to get current working directory"
+msgstr "geçerli çalışma dizini alınamıyor"
+
+#: wt-status.c:158
+msgid "Unmerged paths:"
+msgstr "BirleÅŸtirilmemiÅŸ yollar:"
+
+#: wt-status.c:187 wt-status.c:219
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr ""
+"  (hazırlıktan çıkarmak için \"git restore --staged <dosya>...\" kullanın)"
+
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr ""
+"  (hazırlıktan çıkarmak için \"git restore --source=%s --staged <dosya>...\" "
+"kullanın)"
+
+#: wt-status.c:193 wt-status.c:225
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  (hazırlıktan çıkarmak için \"git rm --cached <dosya>...\" kullanın)"
+
+#: wt-status.c:197
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  (hazırlığı bitirmek için \"git add <dosya>...\" kullanın)"
+
+#: wt-status.c:199 wt-status.c:203
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+"  (hazırlığı bitirmek için uygun bir biçimde \"git add/rm <dosya>...\" "
+"kullanın)"
+
+#: wt-status.c:201
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  (hazırlığı bitirmek için \"git rm <dosya>...\" kullanın)"
+
+#: wt-status.c:211 wt-status.c:1125
+msgid "Changes to be committed:"
+msgstr "Ä°ÅŸlenecek deÄŸiÅŸiklikler:"
+
+#: wt-status.c:234 wt-status.c:1134
+msgid "Changes not staged for commit:"
+msgstr "İşleme için hazırlanmamış değişiklikler:"
+
+#: wt-status.c:238
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  (işlenecekleri güncellemek için \"git add <dosya>...\" kullanın)"
+
+#: wt-status.c:240
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr "  (işlenecekleri güncellemek için \"git add/rm <dosya>...\" kullanın)"
+
+#: wt-status.c:241
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr ""
+"  (çalışma dizinindeki değişiklikleri atmak için \"git restore <dosya>...\" "
+"kullanın)"
+
+#: wt-status.c:243
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr "  (altmodüllerdeki izlenmeyen/değiştirilen içeriği gönder veya at)"
+
+#: wt-status.c:254
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  (işlenecekler arasına koymak için \"git %s <dosya>...\" kullanın)"
+
+#: wt-status.c:266
+msgid "both deleted:"
+msgstr "ikimiz de sildik:"
+
+#: wt-status.c:268
+msgid "added by us:"
+msgstr "biz ekledik:"
+
+#: wt-status.c:270
+msgid "deleted by them:"
+msgstr "onlar sildi:"
+
+#: wt-status.c:272
+msgid "added by them:"
+msgstr "onlar ekledi:"
+
+#: wt-status.c:274
+msgid "deleted by us:"
+msgstr "biz sildik:"
+
+#: wt-status.c:276
+msgid "both added:"
+msgstr "ikimiz de ekledik:"
+
+#: wt-status.c:278
+msgid "both modified:"
+msgstr "ikimiz de deÄŸiÅŸtirdik:"
+
+#: wt-status.c:288
+msgid "new file:"
+msgstr "yeni dosya:"
+
+#: wt-status.c:290
+msgid "copied:"
+msgstr "kopyalandı:"
+
+#: wt-status.c:292
+msgid "deleted:"
+msgstr "silindi:"
+
+#: wt-status.c:294
+msgid "modified:"
+msgstr "deÄŸiÅŸtirildi:"
+
+#: wt-status.c:296
+msgid "renamed:"
+msgstr "yeniden adlandırıldı:"
+
+#: wt-status.c:298
+msgid "typechange:"
+msgstr "türü değiştirildi:"
+
+#: wt-status.c:300
+msgid "unknown:"
+msgstr "bilinmiyor"
+
+#: wt-status.c:302
+msgid "unmerged:"
+msgstr "birleÅŸtirilmedi:"
+
+#: wt-status.c:382
+msgid "new commits, "
+msgstr "yeni iÅŸlemeler, "
+
+#: wt-status.c:384
+msgid "modified content, "
+msgstr "değiştirilen içerik, "
+
+#: wt-status.c:386
+msgid "untracked content, "
+msgstr "izlenmeyen içerik, "
+
+#: wt-status.c:958
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Zulanızda şu anda %d girdi var"
+msgstr[1] "Zulanızda şu anda %d girdi var"
+
+#: wt-status.c:989
+msgid "Submodules changed but not updated:"
+msgstr "Değiştirilen; ancak güncellenmeyen altmodüller:"
+
+#: wt-status.c:991
+msgid "Submodule changes to be committed:"
+msgstr "İşlenecek altmodül değişiklikleri:"
+
+#: wt-status.c:1073
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"Yukarıdaki satırı değiştirmeyin veya kaldırmayın.\n"
+"Altındaki her şey yok sayılacaktır."
+
+#: wt-status.c:1165
+#, 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 ""
+"\n"
+"Dal önünde/arkasında değerlerini hesaplama %.2f saniye sürdü.\n"
+"Bundan kaçınmak için --no-ahead-behind kullanabilirsiniz.\n"
+
+#: wt-status.c:1195
+msgid "You have unmerged paths."
+msgstr "Birleştirilmemiş yollarınız var."
+
+#: wt-status.c:1198
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  (çakışmaları onar ve \"git commit\" çalıştır)"
+
+#: wt-status.c:1200
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  (birleştirmeyi iptal etmek için \"git merge --abort\" kullanın)"
+
+#: wt-status.c:1204
+msgid "All conflicts fixed but you are still merging."
+msgstr "Tüm çakışmalar onarıldı; ancak siz hâlâ birleştiriyorsunuz."
+
+#: wt-status.c:1207
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  (birleştirmeyi sonuçlandırmak için \"git commit\" kullanın)"
+
+#: wt-status.c:1216
+msgid "You are in the middle of an am session."
+msgstr "Bir 'am' oturumunun tam ortasındasınız."
+
+#: wt-status.c:1219
+msgid "The current patch is empty."
+msgstr "Mevcut yama boÅŸ."
+
+#: wt-status.c:1223
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  (çakışmaları onar ve ardından \"git am --continue\" çalıştır)"
+
+#: wt-status.c:1225
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  (bu yamayı atlamak için \"git am --skip\" kullanın"
+
+#: wt-status.c:1227
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  (ilk dalı eski durumuna getirmek için \"git am --abort\" kullanın)"
+
+#: wt-status.c:1360
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo eksik"
+
+#: wt-status.c:1362
+msgid "No commands done."
+msgstr "Yerine getirilen bir komut yok."
+
+#: wt-status.c:1365
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "Son yerine getirilen komut (toplamda %d komut):"
+msgstr[1] "Son yerine getirilen komutlar (toplamda %d komut):"
+
+#: wt-status.c:1376
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  (ek bilgi için %s dosyasına bakın)"
+
+#: wt-status.c:1381
+msgid "No commands remaining."
+msgstr "Kalan komut yok."
+
+#: 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] "Sıradaki yerine getirilecek komut (%d kalan komut):"
+msgstr[1] "Sıradaki yerine getirilecek komutlar (%d kalan komut):"
+
+#: wt-status.c:1392
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  (görüntüleme ve düzenleme için \"git rebase --edit-todo\" kullanın)"
+
+#: wt-status.c:1404
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Şu anda '%s' dalını '%s' üzerine yeniden temellendiriyorsunuz."
+
+#: wt-status.c:1409
+msgid "You are currently rebasing."
+msgstr "Şu anda yeniden temellendirme yapmaktasınız."
+
+#: wt-status.c:1422
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  (çakışmaları çözün ve ardından \"git rebase --continue\" çalıştır)"
+
+#: wt-status.c:1424
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  (bu yamayı atlamak için \"git rebase --skip\" kullanın)"
+
+#: wt-status.c:1426
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  (ilk dalı çıkış yapmak için \"git rebase --abort\" kullanın)"
+
+#: wt-status.c:1433
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  (tüm çakışmalar onarıldı: \"git rebase --continue\" çalıştır)"
+
+#: wt-status.c:1437
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
+"parçalara bölüyorsunuz."
+
+#: wt-status.c:1442
+msgid "You are currently splitting a commit during a rebase."
+msgstr ""
+"Şu anda yeniden temellendirme sırasında bir işlemeyi parçalara bölüyorsunuz."
+
+#: wt-status.c:1445
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+"  (Çalışma dizininiz temizlendiğinde \"git rebase --continue\" çalıştır)"
+
+#: wt-status.c:1449
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Şu anda '%s' dalını '%s' üzerine yeniden temellendirirken bir işlemeyi "
+"düzenliyorsunuz."
+
+#: wt-status.c:1454
+msgid "You are currently editing a commit during a rebase."
+msgstr "Şu anda yeniden temellendirme sırasında bir işlemeyi düzenliyorsunuz."
+
+#: wt-status.c:1457
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  (geçerli işlemeyi değiştirmek için \"git commit --amend\" kullanın)"
+
+#: wt-status.c:1459
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+"  (değişikliklerinizden memnunsanız \"git rebase --continue\" kullanın)"
+
+#: wt-status.c:1470
+msgid "Cherry-pick currently in progress."
+msgstr "Seç-al şu anda sürmekte."
+
+#: wt-status.c:1473
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Şu anda %s işlemesini seç-al yapıyorsunuz."
+
+#: wt-status.c:1480
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  (çakışmaları onar ve \"git cherry-pick --continue\" çalıştır)"
+
+#: wt-status.c:1483
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  (sürdürmek için \"git cherry-pick --continue\" çalıştır)"
+
+#: wt-status.c:1486
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr "  (tüm çakışmalar onarıldı: \"git cherry-pick --continue\" çalıştır)"
+
+#: wt-status.c:1488
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  (bu yamayı atlamak için \"git cherry-pick --skip\" kullanın)"
+
+#: wt-status.c:1490
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr "  (seç-al işlemini iptal için \"git cherry-pick --abort\" kullanın)"
+
+#: wt-status.c:1500
+msgid "Revert currently in progress."
+msgstr "Geriye al şu anda sürmekte."
+
+#: wt-status.c:1503
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Şu anda %s işlemesini geri alıyorsunuz."
+
+#: wt-status.c:1509
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  (çakışmaları onar ve \"git revert --continue\" çalıştır)"
+
+#: wt-status.c:1512
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  (sürdürmek için \"git revert --continue\" çalıştır)"
+
+#: wt-status.c:1515
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  (tüm çakışmalar onarıldı: \"git revert --continue\" çalıştır)"
+
+#: wt-status.c:1517
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  (bu yamayı atlamak için \"git revert --skip\" kullanın)"
+
+#: wt-status.c:1519
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  (geri al işlemini iptal için \"git revert --abort\" kullanın)"
+
+#: wt-status.c:1529
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Şu anda ikili arama yapıyorsunuz, '%s' dalından başlandı."
+
+#: wt-status.c:1533
+msgid "You are currently bisecting."
+msgstr "Şu anda ikili arama yapıyorsunuz"
+
+#: wt-status.c:1536
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  (ilk dala dönmek için \"git bisect reset\" kullanın)"
+
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Bir aralıklı çıkış içindesiniz."
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "İzlenen dosyaların %%%d mevcut olduğu aralıklı bir çıkıştasınız."
+
+#: wt-status.c:1794
+msgid "On branch "
+msgstr "Ãœzerinde bulunulan dal: "
+
+#: wt-status.c:1801
+msgid "interactive rebase in progress; onto "
+msgstr "şunun üzerine etkileşimli yeniden temellendirme sürmekte: "
+
+#: wt-status.c:1803
+msgid "rebase in progress; onto "
+msgstr "şunun üzerine yeniden temellendirme sürmekte: "
+
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr "HEAD şurada ayrıldı: "
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr "HEAD şundan ayrıldı: "
+
+#: wt-status.c:1813
+msgid "Not currently on any branch."
+msgstr "Şu anda bir dal üzerinde değil."
+
+#: wt-status.c:1830
+msgid "Initial commit"
+msgstr "Ä°lk iÅŸleme"
+
+#: wt-status.c:1831
+msgid "No commits yet"
+msgstr "Henüz bir işleme yok"
+
+#: wt-status.c:1845
+msgid "Untracked files"
+msgstr "Ä°zlenmeyen dosyalar"
+
+#: wt-status.c:1847
+msgid "Ignored files"
+msgstr "Yok sayılan dosyalar"
+
+#: 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 ""
+"İzlenmeyen dosyaların ortaya dökülmesi %.2f saniye sürdü. 'status -uno'\n"
+"bunu hızlandırabilir; ancak yeni dosyaları eklemeyi unutmamanız\n"
+"konusunda dikkatli olmalısınız (ek bilgi için 'git help status')."
+
+#: wt-status.c:1857
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Ä°zlenmeyen dosyalar listelenmiyor%s"
+
+#: wt-status.c:1859
+msgid " (use -u option to show untracked files)"
+msgstr " (izlenmeyen dosyaları göstermek için -u seçeneğini kullanın)"
+
+#: wt-status.c:1865
+msgid "No changes"
+msgstr "DeÄŸiÅŸiklik yok"
+
+#: wt-status.c:1870
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"Ä°ÅŸlemeye eklenen deÄŸiÅŸiklik yok (\"git add\" ve/veya \"git commit -a\" "
+"kullanın)\n"
+
+#: wt-status.c:1874
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "Ä°ÅŸlemeye eklenen deÄŸiÅŸiklik yok\n"
+
+#: wt-status.c:1878
+#, 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"
+"\"git add\" kullanın)\n"
+
+#: wt-status.c:1882
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "iÅŸlemeye bir ÅŸey eklenmedi; ancak izlenmeyen dosyalar var\n"
+
+#: wt-status.c:1886
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"İşlenecek bir şey yok (dosyalar oluşturun/kopyalayın ve izlemek için \"git "
+"add\" kullanın)\n"
+
+#: wt-status.c:1890 wt-status.c:1896
+#, c-format
+msgid "nothing to commit\n"
+msgstr "Ä°ÅŸlenecek bir ÅŸey yok\n"
+
+#: wt-status.c:1893
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"İşlenecek bir şey yok (izlenmeyen dosyaları göstermek için -u kullanın)\n"
+
+#: wt-status.c:1898
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "İşlenecek bir şey yok, çalışma ağacı temiz\n"
+
+#: wt-status.c:2003
+msgid "No commits yet on "
+msgstr "Şurada henüz bir işleme yok: "
+
+#: wt-status.c:2007
+msgid "HEAD (no branch)"
+msgstr "HEAD (dal yok)"
+
+#: wt-status.c:2038
+msgid "different"
+msgstr "deÄŸiÅŸik"
+
+#: wt-status.c:2040 wt-status.c:2048
+msgid "behind "
+msgstr "şunun arkasında: "
+
+#: wt-status.c:2043 wt-status.c:2046
+msgid "ahead "
+msgstr "şunun önünde: "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2569
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "%s yapılamıyor: Hazırlanmamış değişiklikleriniz var."
+
+#: wt-status.c:2575
+msgid "additionally, your index contains uncommitted changes."
+msgstr "Ek olarak, indeksiniz işlenmemiş değişiklikler içeriyor."
+
+#: wt-status.c:2577
+#, 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:182
+msgid "could not send IPC command"
+msgstr "IPC komutu gönderilemedi"
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr "IPC yanıtı okunamadı"
+
+#: compat/simple-ipc/ipc-unix-socket.c:866
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "accept_thread '%s' başlatılamadı"
+
+#: compat/simple-ipc/ipc-unix-socket.c:878
+#, 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
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "'%s' bağlantısı kesilemedi"
+
+#: builtin/add.c:26
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<seçenekler>] [--] <yol-blrtç>..."
+
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "%cx '%s' chmod yapılamıyor"
+
+#: builtin/add.c:99
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "beklenmedik diff durumu %c"
+
+#: builtin/add.c:104 builtin/commit.c:297
+msgid "updating files failed"
+msgstr "dosyaları güncelleme başarısız"
+
+#: builtin/add.c:114
+#, c-format
+msgid "remove '%s'\n"
+msgstr "kaldır: '%s'\n"
+
+#: builtin/add.c:198
+msgid "Unstaged changes after refreshing the index:"
+msgstr "İndeksi yeniledikten sonra hazırlanmamış değişiklikler:"
+
+#: builtin/add.c:307 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
+msgid "Could not write patch"
+msgstr "Yama yazılamadı"
+
+#: builtin/add.c:325
+msgid "editing patch failed"
+msgstr "yamayı düzenleme başarısız"
+
+#: builtin/add.c:328
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "'%s' dosya bilgileri alınamadı"
+
+#: builtin/add.c:330
+msgid "Empty patch. Aborted."
+msgstr "BoÅŸ yama. Ä°ptal edildi."
+
+#: builtin/add.c:335
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "'%s' uygulanamadı"
+
+#: builtin/add.c:343
+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: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 "sınama turu"
+
+#: builtin/add.c:366
+msgid "interactive picking"
+msgstr "etkileşimli seçim"
+
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+msgid "select hunks interactively"
+msgstr "parçaları etkileşimli olarak seç"
+
+#: builtin/add.c:368
+msgid "edit current diff and apply"
+msgstr "geçerli diff'i düzenle ve uygula"
+
+#: builtin/add.c:369
+msgid "allow adding otherwise ignored files"
+msgstr "başka türlü yok sayılan dosyaların eklenmesine izin ver"
+
+#: builtin/add.c:370
+msgid "update tracked files"
+msgstr "izlenen dosyaları güncelle"
+
+#: builtin/add.c:371
+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
+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
+msgid "add changes from all tracked and untracked files"
+msgstr "tüm izlenen/izlenmeyen dosyalardan değişiklikleri ekle"
+
+#: builtin/add.c:376
+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
+msgid "don't add, only refresh the index"
+msgstr "ekleme, yalnızca indeksi yenile"
+
+#: builtin/add.c:379
+msgid "just skip files which cannot be added because of errors"
+msgstr "yalnızca hatalardan dolayı eklenemeyen dosyaları atla"
+
+#: builtin/add.c:380
+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
+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
+msgid "warn when adding an embedded repository"
+msgstr "gömülü bir depo eklenirken uyar"
+
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr "'git stash -p' için arka uç"
+
+#: builtin/add.c:404
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"Mevcut deponuzun içine başka bir git deposu eklediniz.\n"
+"Dış deponun klonları gömülen deponun içeriğini içermez ve onları\n"
+"nasıl alabileceğini bilemez. Eğer bir altmodül eklemek istediyseniz\n"
+"şunu kullanın:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Eğer bu yolu yanlışlıkla eklediyseniz aşağıdaki komutla indeksten\n"
+"kaldırabilirsiniz:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Ek bilgi için: \"git help submodule\"."
+
+#: builtin/add.c:432
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "gömülü git deposu ekleniyor: %s"
+
+#: 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 ""
+"Gerçekten eklemek istiyorsanız -f kullanın.\n"
+"Bu iletiyi 'git config advice.addIgnoredFile false'\n"
+"kullanarak kapatabilirsiniz."
+
+#: builtin/add.c:460
+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
+#, 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: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 "--pathspec-from-file yol belirteci argümanları ile uyumsuz"
+
+#: 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 "--pathspec-file-nul, --pathspec-from-file gerektiriyor"
+
+#: builtin/add.c:555
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Hiçbir şey belirtilmedi, hiçbir şey eklenmedi.\n"
+
+#: 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 ""
+"'git add .' mı demek istediniz?\n"
+"Bu iletiyi 'git config advice.addEmptyPathspec false'\n"
+"yaparak kapatabilirsiniz."
+
+#: builtin/am.c:365
+msgid "could not parse author script"
+msgstr "yazar betiği ayrıştırılamadı"
+
+#: builtin/am.c:455
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' applypatch-msg kancası tarafından silindi"
+
+#: builtin/am.c:497
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "Hatalı oluşturulmuş girdi satırı: '%s'."
+
+#: builtin/am.c:535
+#, 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:561
+msgid "fseek failed"
+msgstr "fseek başarısız oldu"
+
+#: builtin/am.c:749
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "'%s' yaması ayrıştırılamadı"
+
+#: builtin/am.c:814
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Bir kerede yalnızca bir StGIT yama serisi uygulanabilir"
+
+#: builtin/am.c:862
+msgid "invalid timestamp"
+msgstr "geçersiz zaman damgası"
+
+#: builtin/am.c:867 builtin/am.c:879
+msgid "invalid Date line"
+msgstr "geçersiz tarih satırı"
+
+#: builtin/am.c:874
+msgid "invalid timezone offset"
+msgstr "geçersiz zaman dilimi ofseti"
+
+#: builtin/am.c:967
+msgid "Patch format detection failed."
+msgstr "Yama biçimi algılaması başarısız."
+
+#: builtin/am.c:972 builtin/clone.c:414
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "'%s' dizini oluşturulamadı"
+
+#: builtin/am.c:977
+msgid "Failed to split patches."
+msgstr "Yamalar parçalanıp bölünemedi."
+
+#: builtin/am.c:1126
+#, 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:1127
+#, 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:1128
+#, 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:1223
+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:1251
+msgid "Patch is empty."
+msgstr "Yama boÅŸ."
+
+#: builtin/am.c:1316
+#, c-format
+msgid "missing author line in commit %s"
+msgstr "%s işlemesinde yazar satırı eksik"
+
+#: builtin/am.c:1319
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "geçersiz tanımlama satırı: %.*s"
+
+#: builtin/am.c:1538
+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:1540
+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:1559
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Yamanızı elle mi düzenlediniz?\n"
+"Kendi indeksinde kaydı yazılan ikili nesnelere uygulanamıyor."
+
+#: builtin/am.c:1565
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Temeli yamalamaya ve 3 yönlü birleştirmeye geri çekiliniyor..."
+
+#: builtin/am.c:1591
+msgid "Failed to merge in the changes."
+msgstr "DeÄŸiÅŸiklikler birleÅŸtirilemedi."
+
+#: builtin/am.c:1623
+msgid "applying to an empty history"
+msgstr "boş bir geçmişe uygulanıyor"
+
+#: builtin/am.c:1675 builtin/am.c:1679
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "sürdürülemiyor: %s yok"
+
+#: builtin/am.c:1697
+msgid "Commit Body is:"
+msgstr "İşleme gövdesi:"
+
+#. 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:1707
+#, 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:1753 builtin/commit.c:408
+msgid "unable to write index file"
+msgstr "indeks dosyası yazılamıyor"
+
+#: builtin/am.c:1757
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Kirli indeks: Yamalar uygulanamıyor (kirli: %s)"
+
+#: builtin/am.c:1797 builtin/am.c:1865
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Uygulanıyor: %.*s"
+
+#: builtin/am.c:1814
+msgid "No changes -- Patch already applied."
+msgstr "Değişiklik yok -- Yama halihazırda uygulandı."
+
+#: builtin/am.c:1820
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "Yama şurada başarısız oldu: %s %.*s"
+
+#: builtin/am.c:1824
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr ""
+"Başarısız olan yamayı görmek için 'git am --show-current-patch=diff' kullanın"
+
+#: builtin/am.c:1868
+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 ""
+"Değişiklik yok - 'git add' yapmayı mı unuttunuz?\n"
+"Hazırlanacak başka bir şey kalmadıysa büyük olasılıkla başka bir şey\n"
+"aynı değişiklikleri uygulamış olabilir; bu yamayı atlamak isteyebilirsiniz."
+
+#: builtin/am.c:1875
+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 ""
+"İndeksinizde hâlâ birleştirilmemiş yollar var.\n"
+"Çakışmaları çözülen tüm dosyaları 'git add' ile çözüldü olarak "
+"imlemelisiniz.\n"
+"Bir dosyanın \"onlar sildi\" olduğunu kabul etmek için dosya ile 'git rm' "
+"yapabilirsiniz."
+
+#: 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 "'%s' nesnesi ayrıştırılamadı."
+
+#: builtin/am.c:2034
+msgid "failed to clean index"
+msgstr "indeks temizlenemedi"
+
+#: builtin/am.c:2078
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+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:2185
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "Geçersiz --patch-format değeri: %s"
+
+#: builtin/am.c:2227
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "--show-current-patch için geçersiz değer: %s"
+
+#: builtin/am.c:2231
+#, 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"
+
+#: builtin/am.c:2262
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<seçenekler>] [(<mbox> | <posta-dizin>)...]"
+
+#: builtin/am.c:2263
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<seçenekler>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2269
+msgid "run interactively"
+msgstr "etkileşimli olarak çalıştır"
+
+#: builtin/am.c:2271
+msgid "historical option -- no-op"
+msgstr "tarihi seçenek -- no-op"
+
+#: builtin/am.c:2273
+msgid "allow fall back on 3way merging if needed"
+msgstr "gerekirse 3 yönlü birleştirmeye geri çekilmeye izin ver"
+
+#: 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 "sessiz ol"
+
+#: builtin/am.c:2276
+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:2279
+msgid "recode into utf8 (default)"
+msgstr "utf8 olarak yeniden kodla (öntanımlı)"
+
+#: builtin/am.c:2281
+msgid "pass -k flag to git-mailinfo"
+msgstr "'git-mailinfo'ya -k bayrağını geçir"
+
+#: builtin/am.c:2283
+msgid "pass -b flag to git-mailinfo"
+msgstr "'git-mailinfo'ya -b bayrağını geçir"
+
+#: builtin/am.c:2285
+msgid "pass -m flag to git-mailinfo"
+msgstr "'git-mailinfo'ya -m bayrağını geçir"
+
+#: builtin/am.c:2287
+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:2290
+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:2293
+msgid "strip everything before a scissors line"
+msgstr "bir kesim çizgisinden önceki her şeyi çıkar"
+
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr "git-mailinfo içerisinden geçir"
+
+#: 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 "git-apply aracılığıyla geçir"
+
+#: 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: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: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 "biçim"
+
+#: builtin/am.c:2322
+msgid "format the patch(es) are in"
+msgstr "yama biçimi"
+
+#: builtin/am.c:2328
+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:2330
+msgid "continue applying patches after resolving a conflict"
+msgstr "bir çakışmayı çözdükten sonra yamaları uygulamayı sürdür"
+
+#: builtin/am.c:2333
+msgid "synonyms for --continue"
+msgstr "--continue eşanlamlıları"
+
+#: builtin/am.c:2336
+msgid "skip the current patch"
+msgstr "geçerli yamayı atla"
+
+#: builtin/am.c:2339
+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:2342
+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:2346
+msgid "show the patch being applied"
+msgstr "uygulanmakta olan yamayı göster"
+
+#: builtin/am.c:2351
+msgid "lie about committer date"
+msgstr "işleyici tarihi hakkında yalan söyle"
+
+#: builtin/am.c:2353
+msgid "use current timestamp for author date"
+msgstr "yazar tarihi için geçerli zaman damgasını kullan"
+
+#: 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 "key-id"
+
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+msgid "GPG-sign commits"
+msgstr "GPG imzalı işlemeler"
+
+#: builtin/am.c:2359
+msgid "(internal use for git-rebase)"
+msgstr "(git-rebase için iç kullanım)"
+
+#: 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 ""
+"-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:2384
+msgid "failed to read the index"
+msgstr "indeks okunamadı"
+
+#: builtin/am.c:2399
+#, 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:2423
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"Başıboş %s dizini bulundu.\n"
+"Kaldırmak için \"git am --abort\" kullanın."
+
+#: builtin/am.c:2429
+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:2439
+msgid "interactive mode requires patches on the command line"
+msgstr "etkileşimli kip yamanın komut satırında olmasını gerektirir"
+
+#: builtin/apply.c:8
+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
+msgid "could not redirect output"
+msgstr "çıktı yeniden yönlendirilemedi"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive: URL'si olmayan uzak konum"
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive: ACK/NAK bekleniyordu, floş paketi alındı"
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive NACK %s"
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr "git archive: Protokol hatası"
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr "git archive: FloÅŸ bekleniyordu"
+
+#: builtin/bisect--helper.c:23
+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 | --"
+"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>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{new,bad}=<terim> --term-{old,good}"
+"=<terim>] [--no-checkout] [--first-parent] [<kötü> [<iyi>...]] [--] "
+"[<yollar>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+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-state (bad|new) [<rev>]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+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 <dosyaadı>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<erim>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "'%s' dosyası '%s' kipinde açılamıyor"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "'%s' dosyasına yazılamadı"
+
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' geçerli bir terim değil"
+
+#: builtin/bisect--helper.c:159
+#, 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:169
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "'%s' teriminin anlamı değiştirilemiyor"
+
+#: builtin/bisect--helper.c:179
+msgid "please use two different terms"
+msgstr "lütfen iki değişik terim kullanın"
+
+#: builtin/bisect--helper.c:195
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "İkili arama yapılmıyor.\n"
+
+#: builtin/bisect--helper.c:203
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' geçerli bir işleme değil"
+
+#: builtin/bisect--helper.c:212
+#, 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:256
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "Hatalı bisect_write argümanı: %s"
+
+#: builtin/bisect--helper.c:261
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "'%s' revizyonunun oid'si alınamadı"
+
+#: builtin/bisect--helper.c:273
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "'%s' dosyası açılamadı"
+
+#: builtin/bisect--helper.c:299
+#, 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: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 ""
+"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: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 ""
+"\"git bisect start\" ile başlamalısınız.\n"
+"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:350
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "yalnızca bir %s işlemesi ile ikili arama yapılıyor"
+
+#. 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:358
+msgid "Are you sure [Y/n]? "
+msgstr "Emin misiniz [Y/n]? "
+
+#: builtin/bisect--helper.c:419
+msgid "no terms defined"
+msgstr "hiçbir terim tanımlanmadı"
+
+#: 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 ""
+"Mevcut terimleriniz eski durum için %s ve\n"
+"yeni durum için %s.\n"
+
+#: 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 ""
+"'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:499 builtin/bisect--helper.c:1023
+msgid "revision walk setup failed\n"
+msgstr "revizyonda gezinme ayarlaması başarısız oldu\n"
+
+#: builtin/bisect--helper.c:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "'%s' iliştirme için açılamadı"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr "'' geçerli bir terim değil"
+
+#: builtin/bisect--helper.c:663
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "tanımlanamayan seçenek: '%s'"
+
+#: builtin/bisect--helper.c:667
+#, 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:698
+msgid "bad HEAD - I need a HEAD"
+msgstr "hatalı HEAD - Bana bir HEAD gerek"
+
+#: builtin/bisect--helper.c:713
+#, 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:734
+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:737
+msgid "bad HEAD - strange symbolic ref"
+msgstr "hatalı HEAD - tuhaf sembolik başvuru"
+
+#: builtin/bisect--helper.c:757
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "geçersiz başvuru: '%s'"
+
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "\"git bisect start\" ile başlamalısınız\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:826
+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:844
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "Lütfen '--bisect-state'i en az bir argümanla çağırın"
+
+#: builtin/bisect--helper.c:857
+#, 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:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "Hatalı revizyon girdisi: %s"
+
+#: builtin/bisect--helper.c:889
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "Hatalı revizyon girdisi (bir işleme değil): %s"
+
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr "İkili arama yapmıyoruz."
+
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? ney ney?"
+
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "'%s' dosyası yeniden oynatım için okunamıyor"
+
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr "ikili arama durumunu sıfırla"
+
+#: builtin/bisect--helper.c:1058
+msgid "check whether bad or good terms exist"
+msgstr "iyi veya kötü terimlerin olup olmadığını denetle"
+
+#: builtin/bisect--helper.c:1060
+msgid "print out the bisect terms"
+msgstr "ikili arama terimlerini yazdır"
+
+#: builtin/bisect--helper.c:1062
+msgid "start the bisect session"
+msgstr "ikili arama oturumunu baÅŸlat"
+
+#: builtin/bisect--helper.c:1064
+msgid "find the next bisection commit"
+msgstr "bir sonraki ikili arama iÅŸlemesini bul"
+
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr "başvurunun (veya başvuruların) durumunu imle"
+
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr "ÅŸu ana kadarki ikili arama durumunu listele"
+
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
+msgstr "verilen dosyadan ikili arama iÅŸlemini yeniden oynat"
+
+#: builtin/bisect--helper.c:1072
+msgid "skip some commits for checkout"
+msgstr "çıkış için birkaç işlemeyi atla"
+
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "BISECT_WRITE için günlük yok"
+
+#: builtin/bisect--helper.c:1089
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset bir argüman veya işleme gerektirmiyor"
+
+#: builtin/bisect--helper.c:1094
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check 2 veya 3 argüman gerektiriyor"
+
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms 0 veya 1 argüman gerektiriyor"
+
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next 0 argüman gerektiriyor"
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log 0 argüman gerektiriyor"
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr "hiçbir günlük dosyası verilmedi"
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<seçenekler>] [<rev-sçnk>] [<rev>] [--] <dosya>"
+
+#: builtin/blame.c:37
+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
+#, c-format
+msgid "expecting a color: %s"
+msgstr "bir renk bekleniyor: %s"
+
+#: builtin/blame.c:417
+msgid "must end with a color"
+msgstr "bir renk ile bitmeli"
+
+#: builtin/blame.c:728
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "color.blame.repeatedLines içinde geçersiz renk '%s'"
+
+#: builtin/blame.c:746
+msgid "invalid value for blame.coloring"
+msgstr "blame.coloring için geçersiz değer"
+
+#: builtin/blame.c:845
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "yok saymak için %s revizyonu bulunamıyor"
+
+#: builtin/blame.c:867
+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
+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
+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
+msgid "show work cost statistics"
+msgstr "iş maliyet istatistiklerini göster"
+
+#: 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 "durum belirtmeyi zorla"
+
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "genel bakış girdileri için çıktı skorunu göster"
+
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "orijinal dosya adını göster (Öntanımlı: Otomatik)"
+
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "orijinal satır numarasını göster (Öntanımlı: Kapalı)"
+
+#: builtin/blame.c:875
+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
+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
+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
+msgid "show raw timestamp (Default: off)"
+msgstr "ham zaman damgasını göster (Öntanımlı: Kapalı)"
+
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "uzun işleme SHA1'ini göster (Öntanımlı: Kapalı)"
+
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "yazar adını ve zaman damgasını gizle (Öntanımlı: Kapalı)"
+
+#: builtin/blame.c:881
+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
+msgid "ignore whitespace differences"
+msgstr "boşluk ayrımlarını yok say"
+
+#: builtin/blame.c:883 builtin/log.c:1823
+msgid "rev"
+msgstr "revizyon"
+
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "suçlarken <revizyon>'u yok say"
+
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "<dosya>'dan olan revizyonları yok say"
+
+#: builtin/blame.c:885
+msgid "color redundant metadata from previous line differently"
+msgstr "bir önceki dosyadan gereksiz üstveriyi başka biçimde renklendir"
+
+#: builtin/blame.c:886
+msgid "color lines by age"
+msgstr "satırları yaşına göre renklendir"
+
+#: builtin/blame.c:887
+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
+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
+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
+msgid "score"
+msgstr "skor"
+
+#: builtin/blame.c:890
+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
+msgid "find line movements within and across files"
+msgstr "satır hareketlerini dosyaların içinde ve aralarında ara"
+
+#: builtin/blame.c:892
+msgid "range"
+msgstr "erim"
+
+#: builtin/blame.c:893
+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
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress, --incremental veya okunabilir biçimlerle kullanılamaz"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:996
+msgid "4 years, 11 months ago"
+msgstr "4 yıl 11 ay önce"
+
+#: builtin/blame.c:1112
+#, 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
+msgid "Blaming lines"
+msgstr "Genel bakış satırları"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<seçenekler>] [-r | -a] [--merged] [--no-merged]"
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<seçenekler>] [-l] [-f] <dal-adı> [<başlama-noktası>]"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<seçenekler>] [-r] (-d | -D) <dal-adı>..."
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<seçenekler>] (-m | -M) [<eski-dal>] <yeni-dal>"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<seçenekler>] (-c | -C) [<eski-dal>] <yeni-dal>"
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<seçenekler>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<seçenekler>] [-r | -a] [--format]"
+
+#: builtin/branch.c:154
+#, 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ş"
+
+#: builtin/branch.c:158
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD."
+msgstr ""
+"'%s' dalı silinmiyor: Bu dal HEAD'e birleştirilmiş olmasına rağmen\n"
+"         '%s' dalına birleştirilmemiş."
+
+#: builtin/branch.c:172
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "'%s' için işleme nesnesi aranamadı"
+
+#: builtin/branch.c:176
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"'%s' 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
+msgid "Update of config-file failed"
+msgstr "config-file güncellemesi başarısız"
+
+#: builtin/branch.c:223
+msgid "cannot use -a with -d"
+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ı"
+
+#: builtin/branch.c:244
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "'%s' dalı silinemiyor, şurada çıkış yapılmış: '%s'"
+
+#: builtin/branch.c:259
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "uzak izleme dalı '%s' bulunamadı"
+
+#: builtin/branch.c:260
+#, c-format
+msgid "branch '%s' not found."
+msgstr "'%s' dalı bulunamadı"
+
+#: builtin/branch.c:291
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Uzak izleme dalı %s silindi (%s idi).\n"
+
+#: builtin/branch.c:292
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "%s dalı silindi (%s idi).\n"
+
+#: builtin/branch.c:440 builtin/tag.c:63
+msgid "unable to parse format string"
+msgstr "biçim dizisi ayrıştırılamıyor"
+
+#: builtin/branch.c:471
+msgid "could not resolve HEAD"
+msgstr "HEAD çözülemedi"
+
+#: builtin/branch.c:477
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s), refs/heads/ dışına işaret ediyor"
+
+#: builtin/branch.c:492
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "%s dalı %s konumunda yeniden temellendiriliyor"
+
+#: builtin/branch.c:496
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "%s dalı %s konumunda ikili aranıyor"
+
+#: builtin/branch.c:513
+msgid "cannot copy the current branch while not on any."
+msgstr "bir dalın üzerinde değilken geçerli dal kopyalanamaz"
+
+#: builtin/branch.c:515
+msgid "cannot rename the current branch while not on any."
+msgstr "bir dalın üzerinde değilken geçerli dal yeniden adlandırılamaz"
+
+#: builtin/branch.c:526
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Geçersiz dal adı: '%s'"
+
+#: builtin/branch.c:555
+msgid "Branch rename failed"
+msgstr "Dal yeniden adlandırması başarısız"
+
+#: builtin/branch.c:557
+msgid "Branch copy failed"
+msgstr "Dal kopyalaması başarısız"
+
+#: builtin/branch.c:561
+#, 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
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "Yanlış adlandırılan '%s' dalı yeniden adlandırıldı"
+
+#: builtin/branch.c:570
+#, 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
+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
+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
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+"  %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Lütfen dal açıklamasını düzenleyin:\n"
+"\t%s\n"
+"'%c' ile başlayan satırlar çıkarılacaktır.\n"
+
+#: builtin/branch.c:631
+msgid "Generic options"
+msgstr "Genel seçenekler"
+
+#: builtin/branch.c:633
+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
+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:637
+msgid "do not use"
+msgstr "kullanma"
+
+#: builtin/branch.c:639 builtin/rebase.c:533
+msgid "upstream"
+msgstr "üstkaynak"
+
+#: builtin/branch.c:639
+msgid "change the upstream info"
+msgstr "üstkaynak bilgisini değiştir"
+
+#: builtin/branch.c:640
+msgid "unset the upstream info"
+msgstr "üstkaynak bilgisini kaldır"
+
+#: builtin/branch.c:641
+msgid "use colored output"
+msgstr "renklendirilmiş çıktı kullan"
+
+#: builtin/branch.c:642
+msgid "act on remote-tracking branches"
+msgstr "uzak izleme dallarında iş yap"
+
+#: builtin/branch.c:644 builtin/branch.c:646
+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
+msgid "print only branches that don't contain the commit"
+msgstr "yalnızca işlemeyi içermeyen dalları yazdır"
+
+#: builtin/branch.c:650
+msgid "Specific git-branch actions:"
+msgstr "Özel git-branch eylemleri:"
+
+#: builtin/branch.c:651
+msgid "list both remote-tracking and local branches"
+msgstr "hem uzak izleme hem de yerel dalları listele"
+
+#: builtin/branch.c:653
+msgid "delete fully merged branch"
+msgstr "tümüyle birleştirilen dalı sil"
+
+#: builtin/branch.c:654
+msgid "delete branch (even if not merged)"
+msgstr "dalı sil (birleştirilmemiş olsa bile)"
+
+#: builtin/branch.c:655
+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
+msgid "move/rename a branch, even if target exists"
+msgstr "bir dalı taşı/yeniden adlandır, hedef var olsa bile"
+
+#: builtin/branch.c:657
+msgid "copy a branch and its reflog"
+msgstr "bir dalı ve onun başvuru günlüğünü kopyala"
+
+#: builtin/branch.c:658
+msgid "copy a branch, even if target exists"
+msgstr "bir dalı kopyala, hedef var olsa bile"
+
+#: builtin/branch.c:659
+msgid "list branch names"
+msgstr "dal adlarını listele"
+
+#: builtin/branch.c:660
+msgid "show current branch name"
+msgstr "geçerli dal adını göster"
+
+#: builtin/branch.c:661
+msgid "create the branch's reflog"
+msgstr "dalın başvuru günlüğünü oluştur"
+
+#: builtin/branch.c:663
+msgid "edit the description for the branch"
+msgstr "dalın açıklamasını düzenle"
+
+#: builtin/branch.c:664
+msgid "force creation, move/rename, deletion"
+msgstr "zorla oluştur, taşı/yeniden adlandır, sil"
+
+#: builtin/branch.c:665
+msgid "print only branches that are merged"
+msgstr "yalnızca birleştirilen dalları yazdır"
+
+#: builtin/branch.c:666
+msgid "print only branches that are not merged"
+msgstr "yalnızca birleştirilmeyen dalları yazdır"
+
+#: builtin/branch.c:667
+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
+msgid "object"
+msgstr "nesne"
+
+#: builtin/branch.c:670
+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
+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/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
+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
+msgid "branch name required"
+msgstr "dal adı gerekli"
+
+#: builtin/branch.c:766
+msgid "Cannot give description to detached HEAD"
+msgstr "Ayrılmış HEAD'e açıklama verilemiyor"
+
+#: builtin/branch.c:771
+msgid "cannot edit description of more than one branch"
+msgstr "birden çok dalın açıklaması düzenlenemiyor"
+
+#: builtin/branch.c:778
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "'%s' dalında henüz bir işleme yok."
+
+#: builtin/branch.c:781
+#, c-format
+msgid "No branch named '%s'."
+msgstr "'%s' adında bir dal yok."
+
+#: builtin/branch.c:796
+msgid "too many branches for a copy operation"
+msgstr "bir kopyalama işlemi için çok fazla dal"
+
+#: builtin/branch.c:805
+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
+msgid "too many arguments to set new upstream"
+msgstr "yeni üstkaynak ayarlamak için çok fazla argüman"
+
+#: builtin/branch.c:814
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+"HEAD'in üst kaynağı %s olarak ayarlanamadı; çünkü herhangi bir dala işaret "
+"etmiyor."
+
+#: builtin/branch.c:817 builtin/branch.c:840
+#, c-format
+msgid "no such branch '%s'"
+msgstr "'%s' diye bir dal yok"
+
+#: builtin/branch.c:821
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "'%s' diye bir dal mevcut deÄŸil"
+
+#: builtin/branch.c:834
+msgid "too many arguments to unset upstream"
+msgstr "üst kaynağı kaldırmak için çok fazla argüman"
+
+#: builtin/branch.c:838
+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
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "'%s' dalının üstkaynak bilgisi yok"
+
+#: 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>?"
+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
+msgid ""
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr ""
+"--set-upstream seçeneği artık desteklenmiyor. Lütfen --track veya --set-"
+"upstream-to kullanın."
+
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "git sürümü:\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() '%s' hatasını verip çıktı (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "derleyici bilgisi: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "libc bilgisi: "
+
+#: builtin/bugreport.c:80
+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
+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
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"Hata bildiriminiz için teşekkürler!\n"
+"Yaşadığınız sorunu daha iyi anlayabilmemiz için lütfen aşağıdaki\n"
+"soruları yanıtlayın.\n"
+"\n"
+"Hata oluşmadan önce ne yapıyordunuz? (hata oluşturma adımları)\n"
+"\n"
+"Ne olmasını bekliyordunuz? (beklenen davranış)\n"
+"\n"
+"Bunun yerine ne oldu? (gözlenen davranış)\n"
+"\n"
+"Olmasını istediğinizle gerçekte olan arasındaki ayrım nedir?\n"
+"\n"
+"Eklemek istediÄŸiniz baÅŸka bir ÅŸey:\n"
+"\n"
+"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
+msgid "specify a destination for the bugreport file"
+msgstr "hata raporu dosyası için bir konum belirtin"
+
+#: builtin/bugreport.c:138
+msgid "specify a strftime format suffix for the filename"
+msgstr "dosya adı için bir strftime biçimli ek belirtin"
+
+#: builtin/bugreport.c:160
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "'%s' için öncü dizinler oluşturulamadı"
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr "Sistem Bilgisi"
+
+#: builtin/bugreport.c:170
+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
+#, c-format
+msgid "unable to write to %s"
+msgstr "%s dosyasına yazılamıyor"
+
+#: builtin/bugreport.c:190
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "Hata raporu '%s' dosyasına yazıldı.\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<seçenekler>] <dosya> <git-rev-liste argümanlar>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<seçenekler>] <dosya>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <dosya> [<başvuru-adı>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <dosya> [<başvuru-adı>...]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr "ilerleme çubuğunu gösterme"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+msgid "show progress meter"
+msgstr "ilerleme çubuğunu göster"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+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:3914
+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
+msgid "specify bundle format version"
+msgstr "demet biçim sürümünü belirt"
+
+#: builtin/bundle.c:96
+msgid "Need a repository to create a bundle."
+msgstr "Bir demet oluşturmak için bir depo gerekli."
+
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr "demet ayrıntılarını gösterme"
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s tamam\n"
+
+#: builtin/bundle.c:179
+msgid "Need a repository to unbundle."
+msgstr "Demeti çözmek için bir depo gerekli"
+
+#: builtin/bundle.c:191 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:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Bilinmeyen altkomut: %s"
+
+#: 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>"
+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:597
+msgid ""
+"git cat-file (--batch[=<format>] | --batch-check[=<format>]) [--follow-"
+"symlinks] [--textconv | --filters]"
+msgstr ""
+"git cat-file (--batch[=<biçim>] | --batch-check[=<biçim>]) [--follow-"
+"symlinks] [--textconv | --filters]"
+
+#: builtin/cat-file.c:618
+msgid "only one batch option may be specified"
+msgstr "yalnızca bir toplu iş seçeneği belirtilebilir"
+
+#: builtin/cat-file.c:636
+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:637
+msgid "show object type"
+msgstr "nesne türünü göster"
+
+#: builtin/cat-file.c:638
+msgid "show object size"
+msgstr "nesne boyutunu göster"
+
+#: builtin/cat-file.c:640
+msgid "exit with zero when there's no error"
+msgstr "hata yoksa sıfır koduyla çık"
+
+#: builtin/cat-file.c:641
+msgid "pretty-print object's content"
+msgstr "nesne içeriğini okunabilir biçimde göster"
+
+#: builtin/cat-file.c:643
+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:645
+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:646
+msgid "blob"
+msgstr "ikili nesne"
+
+#: builtin/cat-file.c:647
+msgid "use a specific path for --textconv/--filters"
+msgstr "--textconv/--filters için belirli bir yol kullan"
+
+#: builtin/cat-file.c:649
+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:650
+msgid "buffer --batch output"
+msgstr "--batch çıktısını arabelleğe al"
+
+#: builtin/cat-file.c:652
+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:656
+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:660
+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:662
+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:664
+msgid "do not order --batch-all-objects output"
+msgstr "--batch-all-objects çıktısını sıralama"
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <öznitelik>...] [--] <yol-adı>..."
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <öznitelik>...]"
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr "tüm dosya özniteliklerini bildir"
+
+#: builtin/check-attr.c:22
+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
+msgid "read file names from stdin"
+msgstr "dosya adlarını stdin'den oku"
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+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:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
+msgid "suppress progress reporting"
+msgstr "ilerleme bildirimini gizle"
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr "eşleşmeyen girdi yollarını göster"
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr "denetlerken indeksi yok say"
+
+#: builtin/check-ignore.c:165
+msgid "cannot specify pathnames with --stdin"
+msgstr "yol adları --stdin ile belirtilemiyor"
+
+#: builtin/check-ignore.c:168
+msgid "-z only makes sense with --stdin"
+msgstr "-z yalnızca --stdin ile bir anlam ifade eder"
+
+#: builtin/check-ignore.c:170
+msgid "no path specified"
+msgstr "bir yol belirtilmedi"
+
+#: builtin/check-ignore.c:174
+msgid "--quiet is only valid with a single pathname"
+msgstr "--quiet yalnızca tek bir yol adı ile geçerlidir"
+
+#: builtin/check-ignore.c:176
+msgid "cannot have both --quiet and --verbose"
+msgstr "hem --quiet hem --verbose birlikte kullanılamaz"
+
+#: builtin/check-ignore.c:179
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching yalnızca --verbose ile geçerlidir"
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<seçenekler>] <kişi>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "stdin'den kiÅŸileri de oku"
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "kişi ayrıştırılamadı: %s"
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "kiÅŸi belirtilmedi"
+
+#: builtin/checkout--worker.c:110
+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: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 "dizi"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "dosyalar oluştururken başına <dizi> ekle"
+
+#: builtin/checkout-index.c:152
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<seçenekler>] [--] [<dosya>...]"
+
+#: builtin/checkout-index.c:169
+msgid "stage should be between 1 and 3 or all"
+msgstr "stage 1 ve 3 arasında veya tümü olmalıdır"
+
+#: builtin/checkout-index.c:187
+msgid "check out all files in the index"
+msgstr "indeksteki tüm dosyaları çıkış yap"
+
+#: builtin/checkout-index.c:188
+msgid "force overwrite of existing files"
+msgstr "mevcut dosyaların üzerine yazılmasını zorla"
+
+#: builtin/checkout-index.c:190
+msgid "no warning for existing files and files not in index"
+msgstr "mevcut dosyalar ve indekste olmayan dosyalar için uyarma"
+
+#: builtin/checkout-index.c:192
+msgid "don't checkout new files"
+msgstr "yeni dosyaları çıkış yapma"
+
+#: builtin/checkout-index.c:194
+msgid "update stat information in the index file"
+msgstr "indeks dosyasındaki dosya bilgilerini güncelle"
+
+#: builtin/checkout-index.c:198
+msgid "read list of paths from the standard input"
+msgstr "yolların listesini standart girdi'den oku"
+
+#: builtin/checkout-index.c:200
+msgid "write the content to temporary files"
+msgstr "içeriği geçici dosyalara yaz"
+
+#: builtin/checkout-index.c:204
+msgid "copy out the files from named stage"
+msgstr "dosyaları adı verilen alandan kopyala"
+
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<seçenekler>] <dal>"
+
+#: builtin/checkout.c:34
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<seçenekler>] [<dal>] -- <dosya>..."
+
+#: builtin/checkout.c:39
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<seçenekler>] [<dal>]"
+
+#: builtin/checkout.c:44
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<seçenekler>] [--source=<dal>] <dosya>..."
+
+#: builtin/checkout.c:190 builtin/checkout.c:229
+#, 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
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "'%s' yolu onlardaki sürüme iye değil"
+
+#: builtin/checkout.c:208
+#, 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
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "'%s' yolu gereken sürümlere iye değil"
+
+#: builtin/checkout.c:278
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "'%s' yolu: BirleÅŸtirilemiyor"
+
+#: builtin/checkout.c:294
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "'%s' için birleştirme sonuçları eklenemiyor"
+
+#: builtin/checkout.c:411
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "%d birleştirme çakışması yeniden oluşturuldu"
+msgstr[1] "%d birleştirme çakışması yeniden oluşturuldu"
+
+#: builtin/checkout.c:416
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "%d yol şuradan güncellendi: %s"
+msgstr[1] "%d yol şuradan güncellendi: %s"
+
+#: builtin/checkout.c:423
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "%d yol indeksten güncellendi"
+msgstr[1] "%d yol indeksten güncellendi"
+
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' güncellenmekte olan yollarla kullanılamaz"
+
+#: builtin/checkout.c:459 builtin/checkout.c:462
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s', %s ile birlikte kullanılamaz"
+
+#: builtin/checkout.c:466
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "Aynı anda hem yolları güncelleyip hem de '%s' dalına geçilemiyor."
+
+#: builtin/checkout.c:470
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "ne '%s' ne de '%s' belirtilmiÅŸ"
+
+#: builtin/checkout.c:474
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "'%s', '%s' ögesinin belirtilmediği durumlarda kullanılmalıdır"
+
+#: builtin/checkout.c:479 builtin/checkout.c:484
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' veya '%s', %s ile birlikte kullanılamaz"
+
+#: builtin/checkout.c:558 builtin/checkout.c:565
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "'%s' yolu birleÅŸtirilmemiÅŸ"
+
+#: builtin/checkout.c:734
+msgid "you need to resolve your current index first"
+msgstr "önce geçerli indeksinizi çözmelisiniz"
+
+#: builtin/checkout.c:788
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"aşağıdaki dosyalardaki hazırlanan değişikliklerle sürdürülemiyor:\n"
+"%s"
+
+#: builtin/checkout.c:881
+#, 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:923
+msgid "HEAD is now at"
+msgstr "HEAD konumu:"
+
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+msgid "unable to update HEAD"
+msgstr "HEAD güncellenemiyor"
+
+#: builtin/checkout.c:931
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "'%s' dalı sıfırlandı.\n"
+
+#: builtin/checkout.c:934
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Halihazırda '%s' üzerinde\n"
+
+#: builtin/checkout.c:938
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "'%s' dalına geçildi ve sıfırlandı.\n"
+
+#: builtin/checkout.c:940 builtin/checkout.c:1371
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Yeni '%s' dalına geçildi.\n"
+
+#: builtin/checkout.c:942
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "'%s' dalına geçildi.\n"
+
+#: builtin/checkout.c:993
+#, c-format
+msgid " ... and %d more.\n"
+msgstr "... ve %d daha.\n"
+
+#: builtin/checkout.c:999
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+"Uyarı: Arkanızda dallarınızdan hiçbirine bağlı olmayın %d işleme\n"
+"bırakıyorsunuz:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Uyarı: Arkanızda dallarınızdan hiçbirine bağlı olmayın %d işleme\n"
+"bırakıyorsunuz:\n"
+"\n"
+"%s\n"
+
+#: 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"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+"Eğer bunu yeni bir dal oluşturup tutmak istiyorsanız şimdi bunu yapmak\n"
+"için iyi bir zaman olabilir:\n"
+"\n"
+"\tgit branch <yeni-dal-adı> %s\n"
+"\n"
+msgstr[1] ""
+"Eğer bunları yeni bir dal oluşturup tutmak istiyorsanız şimdi bunu yapmak\n"
+"için iyi bir zaman olabilir:\n"
+"\n"
+"\tgit branch <yeni-dal-adı> %s\n"
+"\n"
+
+#: builtin/checkout.c:1053
+msgid "internal error in revision walk"
+msgstr "revizyonlarda gezinirken iç hata"
+
+#: builtin/checkout.c:1057
+msgid "Previous HEAD position was"
+msgstr "Önceki HEAD konumu şuydu:"
+
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
+msgid "You are on a branch yet to be born"
+msgstr "Henüz doğmamış bir dal üzerindesiniz"
+
+#: 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 ""
+"'%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: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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Eğer bir uzak izleme dalını çıkış yapmak istediyseniz örn. 'origin',\n"
+"bunu adı --track seçeneği ile tam olarak nitelendirip yapabilirsiniz.\n"
+"\n"
+"\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.defaultRemote=origin\n"
+"ayarını yapmayı düşünün."
+
+#: builtin/checkout.c:1196
+#, 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:1262
+msgid "only one reference expected"
+msgstr "yalnızca bir başvuru bekleniyordu"
+
+#: builtin/checkout.c:1279
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "yalnızca bir başvuru bekleniyordu, %d verildi"
+
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#, c-format
+msgid "invalid reference: %s"
+msgstr "geçersiz başvuru: %s"
+
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "baÅŸvuru bir aÄŸaca deÄŸil: %s"
+
+#: builtin/checkout.c:1385
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "bir dal bekleniyordu, '%s' etiketi alındı"
+
+#: builtin/checkout.c:1387
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "bir dal bekleniyordu, '%s' uzak dalı alındı"
+
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "bir dal bekleniyordu, '%s' alındı"
+
+#: builtin/checkout.c:1391
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "bir dal bekleniyordu, '%s' işlemesi alındı"
+
+#: builtin/checkout.c:1407
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"BirleÅŸtirme yaparken dal deÄŸiÅŸtirilemiyor.\n"
+"\"git merge --quit\" veya \"git worktree add\" yapmayı düşünün."
+
+#: 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 ""
+"Bir \"am\" oturumunun ortasında dal değiştirilemiyor.\n"
+"\"git am --quit\" veya \"git worktree add\" yapmayı düşünün."
+
+#: builtin/checkout.c:1415
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"Yeniden temellendirme yaparken dal deÄŸiÅŸtirilemiyor.\n"
+"\"git rebase --quit\" veya \"git worktree add\" yapmayı düşünün."
+
+#: builtin/checkout.c:1419
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"Seç-al yaparken dal değiştirilemiyor.\n"
+"\"git cherry-pick --quit\" veya \"git worktree add\" yapmayı düşünün."
+
+#: builtin/checkout.c:1423
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"Geriye al yaparken dal deÄŸiÅŸtirilemiyor.\n"
+"\"git revert --quit\" veya \"git worktree add\" yapmayı düşünün."
+
+#: builtin/checkout.c:1427
+msgid "you are switching branch while bisecting"
+msgstr "ikili arama yaparken dal deÄŸiÅŸtiriyorsunuz"
+
+#: builtin/checkout.c:1434
+msgid "paths cannot be used with switching branches"
+msgstr "dal değiştirilirken yollar kullanılamaz"
+
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "dal değiştirilirken '%s' kullanılamaz"
+
+#: 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', '%s' ile birlikte kullanılamaz"
+
+#: builtin/checkout.c:1462
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s', <başlama-noktası> alamaz"
+
+#: builtin/checkout.c:1470
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "Dal, işleme olmayan '%s' ögesine değiştirilemez"
+
+#: builtin/checkout.c:1477
+msgid "missing branch or commit argument"
+msgstr "dal veya işleme argümanı eksik"
+
+#: builtin/checkout.c:1520
+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:1521 builtin/log.c:1810 parse-options.h:323
+msgid "style"
+msgstr "stil"
+
+#: builtin/checkout.c:1522
+msgid "conflict style (merge or diff3)"
+msgstr "çakışma stili (birleştirme veya diff3)"
+
+#: builtin/checkout.c:1534 builtin/worktree.c:488
+msgid "detach HEAD at named commit"
+msgstr "adı verilen işlemede HEAD'i ayır"
+
+#: builtin/checkout.c:1535
+msgid "set upstream info for new branch"
+msgstr "yeni dal için üstkaynak bilgisi ayarla"
+
+#: builtin/checkout.c:1537
+msgid "force checkout (throw away local modifications)"
+msgstr "zorla çıkış yap (yerel değişiklikleri çöpe at)"
+
+#: builtin/checkout.c:1539
+msgid "new-branch"
+msgstr "yeni dal"
+
+#: builtin/checkout.c:1539
+msgid "new unparented branch"
+msgstr "yeni üst ögesi olmayan dal"
+
+#: builtin/checkout.c:1541 builtin/merge.c:301
+msgid "update ignored files (default)"
+msgstr "yok sayılan dosyaları güncelle (öntanımlı)"
+
+#: builtin/checkout.c:1544
+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:1557
+msgid "checkout our version for unmerged files"
+msgstr "birleştirilmeyen dosyalar için bizdeki sürümü çıkış yap"
+
+#: builtin/checkout.c:1560
+msgid "checkout their version for unmerged files"
+msgstr "birleştirilmeyen dosyalar için onlardaki sürümünü çıkış yap"
+
+#: builtin/checkout.c:1564
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "yol belirteçlerini yalnızca aralıklı girdilere kısıtlama"
+
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c ve --orphan birlikte kullanılmaz"
+
+#: builtin/checkout.c:1626
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p ve --overlay birlikte kullanılmaz"
+
+#: builtin/checkout.c:1663
+msgid "--track needs a branch name"
+msgstr "--track için bir dal adı gerekli"
+
+#: builtin/checkout.c:1668
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "eksik dal adı; -%c deneyin"
+
+#: builtin/checkout.c:1700
+#, c-format
+msgid "could not resolve %s"
+msgstr "%s çözülemedi"
+
+#: builtin/checkout.c:1716
+msgid "invalid path specification"
+msgstr "geçersiz yol belirtimi"
+
+#: builtin/checkout.c:1723
+#, 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:1727
+#, 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:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file, --detach ile uyumsuz"
+
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file, --patch ile uyumsuz"
+
+#: builtin/checkout.c:1752
+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"
+
+#: builtin/checkout.c:1757
+msgid "you must specify path(s) to restore"
+msgstr "eski durumuna getirilecek yolları belirtmelisiniz"
+
+#: 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 "dal"
+
+#: builtin/checkout.c:1784
+msgid "create and checkout a new branch"
+msgstr "yeni bir dal oluştur ve çıkış yap"
+
+#: builtin/checkout.c:1786
+msgid "create/reset and checkout a branch"
+msgstr "bir dal oluştur/sıfırla ve çıkış yap"
+
+#: builtin/checkout.c:1787
+msgid "create reflog for new branch"
+msgstr "yeni dal için başvuru günlüğü oluştur"
+
+#: builtin/checkout.c:1789
+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:1790
+msgid "use overlay mode (default)"
+msgstr "yerpaylaşım kipini kullan (öntanımlı)"
+
+#: builtin/checkout.c:1835
+msgid "create and switch to a new branch"
+msgstr "yeni bir dal oluştur ve ona geç"
+
+#: builtin/checkout.c:1837
+msgid "create/reset and switch to a branch"
+msgstr "bir dal oluştur/sıfırla ve ona geç"
+
+#: builtin/checkout.c:1839
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "'git switch <böyle-bir-dal-yok>'a temkinli yaklaş"
+
+#: builtin/checkout.c:1841
+msgid "throw away local modifications"
+msgstr "yerel değişiklikleri çöpe at"
+
+#: builtin/checkout.c:1875
+msgid "which tree-ish to checkout from"
+msgstr "çıkış yapılacak ağacımsı"
+
+#: builtin/checkout.c:1877
+msgid "restore the index"
+msgstr "indeksi eski durumuna getir"
+
+#: builtin/checkout.c:1879
+msgid "restore the working tree (default)"
+msgstr "çalışma ağacını eski durumuna getir"
+
+#: builtin/checkout.c:1881
+msgid "ignore unmerged entries"
+msgstr "birleÅŸtirilmemiÅŸ girdileri yok say"
+
+#: builtin/checkout.c:1882
+msgid "use overlay mode"
+msgstr "yerpaylaşım kipini kullan"
+
+#: 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 <dizgi>] [-x | -X] [--] <yollar>..."
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Removing %s\n"
+msgstr "%s kaldırılıyor\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Would remove %s\n"
+msgstr "%s kaldırılacak\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "%s dizini atlanıyor\n"
+
+#: builtin/clean.c:36
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "%s dizini atlanacak\n"
+
+#: builtin/clean.c:38
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "%s 'lstat' yapılamadı\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a numbered item\n"
+"foo        - select item based on unique prefix\n"
+"           - (empty) select nothing\n"
+msgstr ""
+"İstem yardımı:\n"
+"1          - numaralandırılmış bir öge seç\n"
+"foo        - benzersiz öneke dayanarak bir öge seç\n"
+"           - (boş) hiçbir şey seçme\n"
+
+#: builtin/clean.c:304 git-add--interactive.perl:602
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a single item\n"
+"3-5        - select a range of items\n"
+"2-3,6-9    - select multiple ranges\n"
+"foo        - select item based on unique prefix\n"
+"-...       - unselect specified items\n"
+"*          - choose all items\n"
+"           - (empty) finish selecting\n"
+msgstr ""
+"İstem yardımı: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"
+"-...       - belirtilen ögelerin seçimini kaldır\n"
+"*          - tüm ögeleri seç\n"
+"           - (boş) seçimi bitir\n"
+
+#: builtin/clean.c:519 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Pardon (%s)?\n"
+
+#: builtin/clean.c:659
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Girdi için yok sayma dizgileri>> "
+
+#: builtin/clean.c:693
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "UYARI: Şununla eşleşen ögeler bulunamıyor: %s"
+
+#: builtin/clean.c:714
+msgid "Select items to delete"
+msgstr "Silinecek ögeleri seçin"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:755
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "%s kaldırılsın mı [y/N]? "
+
+#: builtin/clean.c:786
+msgid ""
+"clean               - start cleaning\n"
+"filter by pattern   - exclude items from deletion\n"
+"select by numbers   - select items to be deleted by numbers\n"
+"ask each            - confirm each deletion (like \"rm -i\")\n"
+"quit                - stop cleaning\n"
+"help                - this screen\n"
+"?                   - help for prompt selection"
+msgstr ""
+"clean               - temizliÄŸe baÅŸla\n"
+"filter by pattern   - silinmeyecek ögeleri belirle\n"
+"select by numbers   - silinecek ögeleri sayıları ile seç\n"
+"ask each            - her silmeyi onayla (\"rm -i\" gibi)\n"
+"quit                - temizliÄŸi durdur\n"
+"help                - bu ekranı görüntüle\n"
+"?                   - istem seçimi için yardım"
+
+#: builtin/clean.c:822
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "Aşağıdaki öge kaldırılacak:"
+msgstr[1] "Aşağıdaki ögeler kaldırılacak:"
+
+#: builtin/clean.c:838
+msgid "No more files to clean, exiting."
+msgstr "Temizlenecek başka dosya yok, çıkılıyor."
+
+#: builtin/clean.c:900
+msgid "do not print names of files removed"
+msgstr "kaldırılan dosyaların adlarını yazdırma"
+
+#: builtin/clean.c:902
+msgid "force"
+msgstr "zorla"
+
+#: builtin/clean.c:903
+msgid "interactive cleaning"
+msgstr "etkileÅŸimli temizlik"
+
+#: builtin/clean.c:905
+msgid "remove whole directories"
+msgstr "dizinleri tümüyle kaldır"
+
+#: 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 "dizgi"
+
+#: builtin/clean.c:907
+msgid "add <pattern> to ignore rules"
+msgstr "yok sayma kurallarına <dizgi> ekle"
+
+#: builtin/clean.c:908
+msgid "remove ignored files, too"
+msgstr "yok sayılan dosyalar da kaldırıldı"
+
+#: builtin/clean.c:910
+msgid "remove only ignored files"
+msgstr "yalnızca yok sayılan dosyaları kaldır"
+
+#: builtin/clean.c:925
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce 'true' olarak ayarlanmış ve ne -i ne -n ne de -f "
+"verilmiÅŸ; temizleme reddediliyor"
+
+#: builtin/clean.c:928
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce öntanımlı olarak 'true' ve ne -i ne -n ne de -f verilmiş; "
+"temizleme reddediliyor"
+
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+msgstr "-x ve -X birlikte kullanılamaz"
+
+#: builtin/clone.c:45
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<seçenekler>] [--] <depo> [<dizin>]"
+
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "sığ depoyu klonlama"
+
+#: builtin/clone.c:98
+msgid "don't create a checkout"
+msgstr "çıkış yapma!"
+
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+msgid "create a bare repository"
+msgstr "çıplak bir depo oluştur"
+
+#: builtin/clone.c:103
+msgid "create a mirror repository (implies bare)"
+msgstr "bir yansı depo oluştur (çıplak ima eder)"
+
+#: builtin/clone.c:105
+msgid "to clone from a local repository"
+msgstr "bir yerel depodan klonla"
+
+#: builtin/clone.c:107
+msgid "don't use local hardlinks, always copy"
+msgstr "yerel sabit bağları kullanma, her zaman kopyala"
+
+#: builtin/clone.c:109
+msgid "setup as shared repository"
+msgstr "paylaşılan depo ayarla"
+
+#: builtin/clone.c:111
+msgid "pathspec"
+msgstr "yol belirteci"
+
+#: builtin/clone.c:111
+msgid "initialize submodules in the clone"
+msgstr "klon içerisindeki altmodülleri ilklendir"
+
+#: builtin/clone.c:115
+msgid "number of submodules cloned in parallel"
+msgstr "paralelde klonlanan altmodüllerin sayısı"
+
+#: builtin/clone.c:116 builtin/init-db.c:539
+msgid "template-directory"
+msgstr "ÅŸablon dizini"
+
+#: 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:1899
+#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+msgid "reference repository"
+msgstr "baÅŸvuru deposu"
+
+#: 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 "--reference'ı yalnızca klonlarken kullan"
+
+#: builtin/clone.c:124 builtin/column.c:27 builtin/init-db.c:550
+#: builtin/merge-file.c:46 builtin/pack-objects.c:3975 builtin/repack.c:495
+#: t/helper/test-simple-ipc.c:696 t/helper/test-simple-ipc.c:698
+msgid "name"
+msgstr "ad"
+
+#: builtin/clone.c:125
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "üstkaynağı izlemek için 'origin' yerine <ad> kullan"
+
+#: builtin/clone.c:127
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "uzak konumun HEAD'i yerine <dal>'ı çıkış yap"
+
+#: builtin/clone.c:129
+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:862
+#: builtin/pull.c:208
+msgid "depth"
+msgstr "derinlik"
+
+#: builtin/clone.c:131
+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:3964
+#: builtin/pull.c:211
+msgid "time"
+msgstr "zaman"
+
+#: builtin/clone.c:133
+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
+msgid "revision"
+msgstr "revizyon"
+
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+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:1911
+#: builtin/submodule--helper.c:2369
+msgid "clone only one branch, HEAD or --branch"
+msgstr "yalnızca bir dal klonla, HEAD veya --branch"
+
+#: builtin/clone.c:139
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "etiket klonlama ve sonraki getirmeler de onları izlemesin"
+
+#: builtin/clone.c:141
+msgid "any cloned submodules will be shallow"
+msgstr "klonlanan altmodüller sığ olacak"
+
+#: builtin/clone.c:142 builtin/init-db.c:548
+msgid "gitdir"
+msgstr "git dizini"
+
+#: 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"
+
+#: builtin/clone.c:144
+msgid "key=value"
+msgstr "anahtar=deÄŸer"
+
+#: builtin/clone.c:145
+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:575 builtin/send-pack.c:196
+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:575 builtin/send-pack.c:197
+msgid "option to transmit"
+msgstr "iletme seçeneği"
+
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: 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:578
+msgid "use IPv6 addresses only"
+msgstr "yalnızca IPv6 adresleri kullan"
+
+#: builtin/clone.c:154
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "klonlanan herhangi bir altmodül kendi uzak izleme dallarını kullanacak"
+
+#: builtin/clone.c:156
+msgid "initialize sparse-checkout file to include only files at root"
+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
+#, 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
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s var ve bir dizin deÄŸil"
+
+#: builtin/clone.c:436
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "yineleyici '%s' üzerinden çalıştırılamadı"
+
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "'%s' bağı oluşturulamadı"
+
+#: builtin/clone.c:471
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "dosya şuraya kopyalanamadı: '%s'"
+
+#: builtin/clone.c:476
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "'%s' üzerinde yinelenemedi"
+
+#: builtin/clone.c:503
+#, c-format
+msgid "done.\n"
+msgstr "bitti.\n"
+
+#: 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 ""
+"Klonlama başarılı oldu; ancak çıkış yapılamadı.\n"
+"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
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "Klonlanacak %s uzak dal bulunamadı."
+
+#: builtin/clone.c:713
+#, c-format
+msgid "unable to update %s"
+msgstr "%s güncellenemiyor"
+
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "sparse-checkout ilklendirilemedi"
+
+#: builtin/clone.c:784
+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
+msgid "unable to checkout working tree"
+msgstr "çalışma ağacı çıkış yapılamıyor"
+
+#: builtin/clone.c:894
+msgid "unable to write parameters to config file"
+msgstr "parametreler yapılandırma dosyasına yazılamıyor"
+
+#: builtin/clone.c:957
+msgid "cannot repack to clean up"
+msgstr "temizlik için yeniden paketlenemiyor"
+
+#: builtin/clone.c:959
+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:2490
+msgid "Too many arguments."
+msgstr "Çok fazla argüman."
+
+#: builtin/clone.c:1005
+msgid "You must specify a repository to clone."
+msgstr "Klonlamak için bir depo belirtmelisiniz."
+
+#: builtin/clone.c:1018
+#, 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."
+
+#: builtin/clone.c:1035
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "'%s' deposu mevcut deÄŸil"
+
+#: builtin/clone.c:1039 builtin/fetch.c:2014
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "%s derinliği pozitif bir sayı değil"
+
+#: builtin/clone.c:1049
+#, 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
+#, 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
+#, 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:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "şunun öncü dizinleri oluşturulamadı: '%s'"
+
+#: builtin/clone.c:1089
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "'%s' çalışma ağacı dizini oluşturulamadı"
+
+#: builtin/clone.c:1109
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "'%s' çıplak deposuna klonlanıyor...\n"
+
+#: builtin/clone.c:1111
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Klonlama konumu: '%s'...\n"
+
+#: builtin/clone.c:1135
+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
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' geçerli bir uzak konum adı değil"
+
+#: builtin/clone.c:1229
+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
+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
+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
+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
+msgid "source repository is shallow, ignoring --local"
+msgstr "kaynak depo sığ, --local yok sayılıyor"
+
+#: builtin/clone.c:1245
+msgid "--local is ignored"
+msgstr "--local yok sayıldı"
+
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "uzak konum taşıması hata bildirdi"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "%s uzak dalı %s üstkaynağında bulunamadı"
+
+#: builtin/clone.c:1347
+msgid "You appear to have cloned an empty repository."
+msgstr "Boş bir depoyu klonlamış görünüyorsunuz."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<seçenekler>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "yapılandırma değişkenlerini ara"
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "kullanılacak yerleşim"
+
+#: builtin/column.c:30
+msgid "maximum width"
+msgstr "olabilecek en çok genişlik"
+
+#: builtin/column.c:31
+msgid "padding space on left border"
+msgstr "sol kenardaki dolgu boÅŸluÄŸu"
+
+#: builtin/column.c:32
+msgid "padding space on right border"
+msgstr "saÄŸ kenardaki dolgu boÅŸluÄŸu"
+
+#: builtin/column.c:33
+msgid "padding space between columns"
+msgstr "sütunlar arasındaki dolgu boşluğu"
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "--command ilk argüman olmalı"
+
+#: 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 <nsndzn>] [--shallow] [--[no-]progress]"
+
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+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 <nsndzn>] [--append] [--"
+"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:1779
+msgid "dir"
+msgstr "dizin"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr "Grafiğin depolanacağı nesne dizini"
+
+#: builtin/commit-graph.c:83
+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
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "commit-graph '%s' açılamadı"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "tanımlanamayan --split argümanı, %s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "beklenmedik onaltılık olmayan nesne kimliği: %s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "geçersiz nesne: %s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "tüm başvurularda gezinmeyi başlat"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "stdin tarafından listelenen paket indekslerini tara"
+
+#: builtin/commit-graph.c:217
+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
+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
+msgid "enable computation for changed paths"
+msgstr "değiştirilen yollar için hesaplamayı etkinleştir"
+
+#: builtin/commit-graph.c:224
+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
+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
+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
+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
+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
+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
+msgid "Collecting commits from input"
+msgstr "Girdiden işlemeler toplanıyor"
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <üst-öge>)...] [-S[<değer-no>]] [(-m <ileti>)...] [(-F "
+"<dosya>)...] <ağaç>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+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:562
+#, 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
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree: '%s' okunamadı"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree: '%s' kapatılamadı"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "üst öge"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "bir üst işleme ögesinin no'su"
+
+#: 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 "ileti"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
+msgid "commit message"
+msgstr "iÅŸleme iletisi"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "işleme günlük iletisini dosyadan oku"
+
+#: 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 "iÅŸlemeyi GPG ile imzala"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "bir tam ağaç vermeli"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree: okunamadı"
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<seçenekler>] [--] <yol-blrtç>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<seçenekler>] [--] <yol-blrtç>..."
+
+#: builtin/commit.c:51
+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 ""
+"En son yapılan işlemeyi değiştirmek istediniz; ancak bu onu\n"
+"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
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+msgstr ""
+"Bir önceki seç-al büyük olasılıkla çakışma çözümünden dolayı şu anda boş.\n"
+"Yine de göndermek isterseniz şunu kullanın:\n"
+"\n"
+"\tgit commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "Aksi durumda, lütfen 'git rebase --skip' kullanın.\n"
+
+#: builtin/commit.c:66
+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
+msgid ""
+"and then use:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+msgstr ""
+"ve sonra geri kalan işlemeleri seç-al yapmayı sürdürmek için:\n"
+"\n"
+"\tgit cherry-pick --continue\n"
+"\n"
+"kullanın.\n"
+"Bu işlemeyi atlamak isterseniz şunu kullanın:\n"
+"\n"
+"\tgit cherry-pick --skip\n"
+"\n"
+
+#: builtin/commit.c:324
+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
+msgid "No paths with --include/--only does not make sense."
+msgstr "--include/--only içermeyen yollar bir anlam ifade etmiyor."
+
+#: builtin/commit.c:386
+msgid "unable to create temporary index"
+msgstr "geçici indeks oluşturulamıyor"
+
+#: builtin/commit.c:395
+msgid "interactive add failed"
+msgstr "etkileşimli ekleme başarısız"
+
+#: builtin/commit.c:410
+msgid "unable to update temporary index"
+msgstr "geçici indeks güncellenemiyor"
+
+#: builtin/commit.c:412
+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
+msgid "unable to write new_index file"
+msgstr "new_index dosyası yazılamıyor"
+
+#: builtin/commit.c:489
+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
+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
+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
+msgid "cannot read the index"
+msgstr "indeks okunamıyor"
+
+#: builtin/commit.c:520
+msgid "unable to write temporary index file"
+msgstr "geçici indeks dosyası yazılamıyor"
+
+#: builtin/commit.c:618
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "'%s' işlemesinde yazar üstbilgisi yok"
+
+#: builtin/commit.c:620
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "'%s' işlemesindeki yazar satırı hatalı oluşturulmuş"
+
+#: builtin/commit.c:639
+msgid "malformed --author parameter"
+msgstr "hatalı oluşturulmuş --author parametresi"
+
+#: builtin/commit.c:692
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+"mevcut işleme iletisinde kullanılmayan bir yorum\n"
+"karakteri seçilemiyor"
+
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "%s işlemesi aranamadı"
+
+#: builtin/commit.c:758 builtin/shortlog.c:413
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(günlük iletisi standart girdi'den okunuyor)\n"
+
+#: builtin/commit.c:760
+msgid "could not read log from standard input"
+msgstr "günlük standart girdi'den okunamadı"
+
+#: builtin/commit.c:764
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "günlük dosyası '%s' okunamadı"
+
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "--fixup:%s ile -m birlikte kullanılamaz"
+
+#: builtin/commit.c:813 builtin/commit.c:829
+msgid "could not read SQUASH_MSG"
+msgstr "SQUASH_MSG okunamadı"
+
+#: builtin/commit.c:820
+msgid "could not read MERGE_MSG"
+msgstr "MERGE_MSG okunamadı"
+
+#: builtin/commit.c:880
+msgid "could not write commit template"
+msgstr "işleme şablonu yazılamadı"
+
+#: builtin/commit.c:893
+#, 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:895
+#, 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: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 ""
+"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:903
+#, 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: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"
+"Görünüşe bakılırsa bir birleştirmeyi işliyorsunuz.\n"
+"Eğer bu doğru değilse lütfen şunu çalıştırın:\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"ve yeniden deneyin.\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"
+"Görünüşe göre bir seç-al işliyorsunuz.\n"
+"Eğer bu doğru değilse lütfen şunu çalıştırın:\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"ve yeniden deneyin.\n"
+
+#: builtin/commit.c:947
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr "%sYazar:     %.*s <%.*s>"
+
+#: builtin/commit.c:955
+#, c-format
+msgid "%sDate:      %s"
+msgstr "%sTarih:     %s"
+
+#: builtin/commit.c:962
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sÄ°ÅŸleyici:  %.*s <%.*s>"
+
+#: builtin/commit.c:980
+msgid "Cannot read index"
+msgstr "İndeks okunamıyor"
+
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "--trailers'a artbilgiler geçirilemiyor"
+
+#: builtin/commit.c:1065
+msgid "Error building trees"
+msgstr "Ağaçlar yapılırken hata"
+
+#: builtin/commit.c:1079 builtin/tag.c:319
+#, 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:1123
+#, 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:1137
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Geçersiz yok sayılanları göster kipi '%s'"
+
+#: builtin/commit.c:1155 builtin/commit.c:1448
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Geçersiz izlenmeyen dosyaları göster kipi '%s'"
+
+#: builtin/commit.c:1195
+msgid "--long and -z are incompatible"
+msgstr "--long ve -z birbiriyle uyumsuz"
+
+#: builtin/commit.c:1226
+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:1228
+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:1231
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr ""
+"--fixup'ın ileti değiştirme seçeneği '%s' yolu ile birlikte kullanılamıyor"
+
+#: builtin/commit.c:1233
+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:1252
+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:1261
+msgid "You have nothing to amend."
+msgstr "DeÄŸiÅŸtirecek bir ÅŸeyiniz yok."
+
+#: 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: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: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:1271
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "--squash ve --fixup seçenekleri birlikte kullanılamaz"
+
+#: 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: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: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: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:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "bilinmeyen seçenek: --fixup=%s:%s"
+
+#: builtin/commit.c:1352
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "'%s ...' yolları -a ile bir anlam ifade etmiyor"
+
+#: builtin/commit.c:1483 builtin/commit.c:1652
+msgid "show status concisely"
+msgstr "durumu kısaca göster"
+
+#: builtin/commit.c:1485 builtin/commit.c:1654
+msgid "show branch information"
+msgstr "dal bilgisini göster"
+
+#: builtin/commit.c:1487
+msgid "show stash information"
+msgstr "zula bilgisini göster"
+
+#: builtin/commit.c:1489 builtin/commit.c:1656
+msgid "compute full ahead/behind values"
+msgstr "tam önünde/arkasında değerlerini hesapla"
+
+#: builtin/commit.c:1491
+msgid "version"
+msgstr "sürüm"
+
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
+msgid "machine-readable output"
+msgstr "makine tarafından okunabilir çıktı"
+
+#: builtin/commit.c:1494 builtin/commit.c:1660
+msgid "show status in long format (default)"
+msgstr "durumu uzun biçimde göster (öntanımlı)"
+
+#: builtin/commit.c:1497 builtin/commit.c:1663
+msgid "terminate entries with NUL"
+msgstr "girdileri NUL ile sonlandır"
+
+#: 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 "kip"
+
+#: builtin/commit.c:1500 builtin/commit.c:1666
+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:1504
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+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:1506 parse-options.h:193
+msgid "when"
+msgstr "ne zaman"
+
+#: builtin/commit.c:1507
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+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:1509
+msgid "list untracked files in columns"
+msgstr "izlenmeyen dosyaları sütunlarla göster"
+
+#: builtin/commit.c:1510
+msgid "do not detect renames"
+msgstr "yeniden adlandırmaları algılama"
+
+#: builtin/commit.c:1512
+msgid "detect renames, optionally set similarity index"
+msgstr ""
+"yeniden adlandırmaları algıla, isteğe bağlı olarak benzerlik indeksi ayarla"
+
+#: builtin/commit.c:1535
+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:1617
+msgid "suppress summary after successful commit"
+msgstr "başarılı işlemenin ardından özeti gizle"
+
+#: builtin/commit.c:1618
+msgid "show diff in commit message template"
+msgstr "diff'i işleme iletisi şablonunda göster"
+
+#: builtin/commit.c:1620
+msgid "Commit message options"
+msgstr "İşleme iletisi seçenekleri"
+
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+msgid "read message from file"
+msgstr "iletiyi dosyadan oku"
+
+#: builtin/commit.c:1622
+msgid "author"
+msgstr "yazar"
+
+#: builtin/commit.c:1622
+msgid "override author for commit"
+msgstr "işleme yazarını geçersiz kıl"
+
+#: builtin/commit.c:1623 builtin/gc.c:550
+msgid "date"
+msgstr "tarih"
+
+#: builtin/commit.c:1623
+msgid "override date for commit"
+msgstr "işleme tarihini geçersiz kıl"
+
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
+msgid "commit"
+msgstr "iÅŸleme"
+
+#: builtin/commit.c:1625
+msgid "reuse and edit message from specified commit"
+msgstr "belirtilen işlemenin iletisini düzenle ve yeniden kullan"
+
+#: builtin/commit.c:1626
+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:1631
+msgid "[(amend|reword):]commit"
+msgstr "[(amend|reword):]iÅŸleme"
+
+#: builtin/commit.c:1631
+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:1632
+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:1633
+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:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "artbilgi"
+
+#: builtin/commit.c:1634
+msgid "add custom trailer(s)"
+msgstr "özel artbilgiler ekle"
+
+#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
+#: builtin/pull.c:145 builtin/revert.c:110
+msgid "add a Signed-off-by trailer"
+msgstr "bir Signed-off-by artbilgisi ekle"
+
+#: builtin/commit.c:1636
+msgid "use specified template file"
+msgstr "belirtilen şablon dosyasını kullan"
+
+#: builtin/commit.c:1637
+msgid "force edit of commit"
+msgstr "işlemeyi zorla düzenle"
+
+#: builtin/commit.c:1639
+msgid "include status in commit message template"
+msgstr "işleme iletisi şablonunda durumu içer"
+
+#: builtin/commit.c:1644
+msgid "Commit contents options"
+msgstr "İşleme içeriği seçenekleri"
+
+#: builtin/commit.c:1645
+msgid "commit all changed files"
+msgstr "değiştirilen tüm dosyaları gönder"
+
+#: builtin/commit.c:1646
+msgid "add specified files to index for commit"
+msgstr "belirtilen dosyaları işleme için indekse ekle"
+
+#: builtin/commit.c:1647
+msgid "interactively add files"
+msgstr "dosyaları etkileşimli olarak ekle"
+
+#: builtin/commit.c:1648
+msgid "interactively add changes"
+msgstr "deÄŸiÅŸiklikleri etkileÅŸimli olarak ekle"
+
+#: builtin/commit.c:1649
+msgid "commit only specified files"
+msgstr "yalnızca belirtilen dosyaları gönder"
+
+#: builtin/commit.c:1650
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "pre-commit ve commit-msg kancalarını atla"
+
+#: builtin/commit.c:1651
+msgid "show what would be committed"
+msgstr "neyin işleneceğini göster"
+
+#: builtin/commit.c:1664
+msgid "amend previous commit"
+msgstr "önceki işlemeyi değiştir"
+
+#: builtin/commit.c:1665
+msgid "bypass post-rewrite hook"
+msgstr "post-rewrite kancasını atla"
+
+#: builtin/commit.c:1672
+msgid "ok to record an empty change"
+msgstr "boş bir değişikliğin kaydı yazılabilir"
+
+#: builtin/commit.c:1674
+msgid "ok to record a change with an empty message"
+msgstr "boş iletili bir değişikliğin kaydı yazılabilir"
+
+#: builtin/commit.c:1750
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Hasar görmüş MERGE_HEAD dosyası (%s)"
+
+#: builtin/commit.c:1757
+msgid "could not read MERGE_MODE"
+msgstr "MERGE_MODE okunamadı"
+
+#: builtin/commit.c:1778
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "işleme iletisi okunamadı: %s"
+
+#: builtin/commit.c:1785
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "İşleme iletisinin boş olmasından dolayı iptal ediliyor.\n"
+
+#: builtin/commit.c:1790
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "İşleme iptal ediliyor; iletiyi düzenlenmedi.\n"
+
+#: builtin/commit.c:1801
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "İşleme iletisi gövdesinin boş olmasından dolayı iptal ediliyor.\n"
+
+#: 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 ""
+"Depo güncellendi; ancak new_index dosyası yazılamıyor.\n"
+"Diskin dolu olup olmadığını ve kotanızı aşıp aşmadığınızı denetleyin,\n"
+"sonra kurtarmak için \"git restore --staged :/\" kullanın."
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<seçenekler>]"
+
+#: builtin/config.c:109 builtin/env--helper.c:27
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "tanımlanamayan --type argümanı, %s"
+
+#: builtin/config.c:121
+msgid "only one type at a time"
+msgstr "bir kerede yalnızca bir tür"
+
+#: builtin/config.c:130
+msgid "Config file location"
+msgstr "Yapılandırma dosyası konumu"
+
+#: builtin/config.c:131
+msgid "use global config file"
+msgstr "global yapılandırma dosyası kullan"
+
+#: builtin/config.c:132
+msgid "use system config file"
+msgstr "sistem yapılandırma dosyası kullan"
+
+#: builtin/config.c:133
+msgid "use repository config file"
+msgstr "depo yapılandırma dosyası kullan"
+
+#: builtin/config.c:134
+msgid "use per-worktree config file"
+msgstr "her çalışma ağacına özel bir yapılandırma dosyası kullan"
+
+#: builtin/config.c:135
+msgid "use given config file"
+msgstr "verilen yapılandırma dosyasını kullan"
+
+#: builtin/config.c:136
+msgid "blob-id"
+msgstr "ikili nesne numarası"
+
+#: builtin/config.c:136
+msgid "read config from given blob object"
+msgstr "verilen ikili nesneden yapılandırmayı oku"
+
+#: builtin/config.c:137
+msgid "Action"
+msgstr "Eylem"
+
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "deÄŸer al: ad [deÄŸer-dizgisi]"
+
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "tüm değerleri al: anahtar [değer-dizgisi]"
+
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "düzenli ifade için değerleri al: düzenli ifade adı [değer-dizgisi]"
+
+#: builtin/config.c:141
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "URL için özel olan değeri al: bölüm[.var] URL"
+
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "tüm eşleşen değişkenleri değiştir: ad değer [değer-dizgisi]"
+
+#: builtin/config.c:143
+msgid "add a new variable: name value"
+msgstr "yeni bir deÄŸiÅŸken ekle: ad deÄŸer"
+
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "bir değişken kaldır: ad [değer-dizgisi]"
+
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+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"
+
+#: builtin/config.c:147
+msgid "remove a section: name"
+msgstr "bir bölümü kaldır: ad"
+
+#: builtin/config.c:148
+msgid "list all"
+msgstr "tümünü listele"
+
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "değerleri 'değer-dizgisi' ile karşılaştırırken dizi eşitliği kullan"
+
+#: builtin/config.c:150
+msgid "open an editor"
+msgstr "bir düzenleyici aç"
+
+#: builtin/config.c:151
+msgid "find the color configured: slot [default]"
+msgstr "yapılandırılan rengi bul: yuva [öntanımlı]"
+
+#: builtin/config.c:152
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "renk ayarını bul: yuva [stdout tty]"
+
+#: builtin/config.c:153
+msgid "Type"
+msgstr "Tür"
+
+#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "value is given this type"
+msgstr "değer bu türde verildi"
+
+#: builtin/config.c:155
+msgid "value is \"true\" or \"false\""
+msgstr "değer \"true\" (doğru) veya \"false\" (yanlış)"
+
+#: builtin/config.c:156
+msgid "value is decimal number"
+msgstr "değer ondalık sayı"
+
+#: builtin/config.c:157
+msgid "value is --bool or --int"
+msgstr "deÄŸer --bool veya --int"
+
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "deÄŸer --bool veya dizi"
+
+#: builtin/config.c:159
+msgid "value is a path (file or directory name)"
+msgstr "değer bir yol (dosya veya dizin adı)"
+
+#: builtin/config.c:160
+msgid "value is an expiry date"
+msgstr "değer bir son kullanım tarihi"
+
+#: builtin/config.c:161
+msgid "Other"
+msgstr "DiÄŸer"
+
+#: builtin/config.c:162
+msgid "terminate values with NUL byte"
+msgstr "değerleri NUL baytı ile sonlandır"
+
+#: builtin/config.c:163
+msgid "show variable names only"
+msgstr "yalnızca değişken adlarını göster"
+
+#: builtin/config.c:164
+msgid "respect include directives on lookup"
+msgstr "arama sırasında içerme yönergelerine uy"
+
+#: builtin/config.c:165
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr ""
+"yapılandırmanın kökenini göster (dosya, stdin, ikili nesne, komut satırı)"
+
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"yapılandırmanın kapsamını göster (çalışma ağacı, yerel, global, sistem, "
+"komut)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
+msgid "value"
+msgstr "deÄŸer"
+
+#: builtin/config.c:167
+msgid "with --get, use default value when missing entry"
+msgstr "--get ile girdi verilmemişse öntanımlı değeri kullan"
+
+#: builtin/config.c:181
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "yanlış argüman sayısı, %d olmalı"
+
+#: builtin/config.c:183
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "yanlış argüman sayısı, %d ile %d arasında olmalı"
+
+#: builtin/config.c:339
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "geçersiz anahtar dizgisi: %s"
+
+#: builtin/config.c:377
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "öntanımlı yapılandırma değeri biçimlendirilemedi: %s"
+
+#: builtin/config.c:441
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "renk ayrıştırılamıyor: '%s'"
+
+#: builtin/config.c:483
+msgid "unable to parse default color value"
+msgstr "öntanımlı renk değeri ayrıştırılamıyor"
+
+#: builtin/config.c:536 builtin/config.c:833
+msgid "not in a git directory"
+msgstr "bir git dizininde deÄŸil"
+
+#: builtin/config.c:539
+msgid "writing to stdin is not supported"
+msgstr "stdin'e yazma desteklenmiyor"
+
+#: builtin/config.c:542
+msgid "writing config blobs is not supported"
+msgstr "yapılandırma ikili nesneleri yazımı desteklenmiyor"
+
+#: builtin/config.c:627
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# Bu Git'in kullanıcıya özel yapılandırma dosyasıdır.\n"
+"[kullanıcı]\n"
+"Lütfen aşağıdaki satırları yorumdan çıkarın ve özelleştirin:\n"
+"#\tad = %s\n"
+"#\te-posta = %s\n"
+
+#: builtin/config.c:652
+msgid "only one config file at a time"
+msgstr "bir kerede yalnızca bir yapılandırma dosyası"
+
+#: builtin/config.c:658
+msgid "--local can only be used inside a git repository"
+msgstr "--local yalnızca bir git deposu içinde kullanılabilir"
+
+#: builtin/config.c:660
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob yalnızca bir git deposu içinde kullanılabilir"
+
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree yalnızca bir git deposu içinde kullanılabilir"
+
+#: builtin/config.c:684
+msgid "$HOME not set"
+msgstr "$HOME ayarlanmamış"
+
+#: builtin/config.c:708
+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, worktreeConfig yapılandırma genişletmesi etkinleştirilmediği\n"
+"sürece birden çok çalışma ağacı ile birlikte kullanılamaz. Ayrıntılar için\n"
+"lütfen \"git help worktree\" içindeki \"CONFIGURATION FILE\" bölümünü okuyun."
+
+#: builtin/config.c:743
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color ve değişken türü tutarsız"
+
+#: builtin/config.c:748
+msgid "only one action at a time"
+msgstr "bir kerede yalnızca bir eylem"
+
+#: builtin/config.c:761
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only yalnızca şunlara uygulanabilir: --list, --get-regexp"
+
+#: builtin/config.c:767
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr ""
+"--show-origin yalnızca şunlara uygulanabilir: --get, --get-all, --get-regexp "
+"ve --list"
+
+#: builtin/config.c:773
+msgid "--default is only applicable to --get"
+msgstr "--default yalnızca şuna uygulanabilir: --get"
+
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value yalnızca 'değer-dizgisi' ile uygulanır"
+
+#: builtin/config.c:822
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "'%s' yapılandırma dosyası okunamıyor"
+
+#: builtin/config.c:825
+msgid "error processing config file(s)"
+msgstr "yapılandırma dosyaları işlenirken hata"
+
+#: builtin/config.c:835
+msgid "editing stdin is not supported"
+msgstr "stdin'i düzenleme desteklenmiyor"
+
+#: builtin/config.c:837
+msgid "editing blobs is not supported"
+msgstr "ikili nesneleri düzenleme desteklenmiyor"
+
+#: builtin/config.c:851
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "%s yapılandırma dosyası oluşturulamıyor"
+
+#: builtin/config.c:864
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"Tek bir değer ile birden çok değerin üzerine yazılamıyor.\n"
+"       %s değerini değiştirmek için bir düzenli ifade, --add veya --replace-"
+"all kullanın."
+
+#: builtin/config.c:943 builtin/config.c:954
+#, c-format
+msgid "no such section: %s"
+msgstr "böyle bir bölüm yok: %s"
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr "yazdırma boyutları kişi tarafından okunabilir biçimde"
+
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Soket dizininizdeki izinler çok gevşek; diğer kullanıcılar sizin\n"
+"önbelleğe alınmış yetkilerinizi okuyabilirler. Şunu çalıştırmayı düşünün:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+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"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache kullanılamıyor; unix soket desteği yok"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "kimlik depo kilidi %d ms içinde alınamadı"
+
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<seçenekler>] [<işlememsi>...]"
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<seçenekler>] --dirty"
+
+#: builtin/describe.c:63
+msgid "head"
+msgstr "dal ucu"
+
+#: builtin/describe.c:63
+msgid "lightweight"
+msgstr "hafif"
+
+#: builtin/describe.c:63
+msgid "annotated"
+msgstr "ek açıklamalı"
+
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "%s ek açıklamalı etiketi mevcut değil"
+
+#: builtin/describe.c:281
+#, c-format
+msgid "tag '%s' is externally known as '%s'"
+msgstr "'%s' etiketi dışarıda '%s' olarak biliniyor"
+
+#: builtin/describe.c:328
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "'%s' ile herhangi bir etiket tam olarak eÅŸleÅŸmiyor"
+
+#: builtin/describe.c:330
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+"Kesin olarak eşleşen başvuru veya etiket yok, betimlemek için aranıyor\n"
+
+#: builtin/describe.c:397
+#, c-format
+msgid "finished search at %s\n"
+msgstr "arama ÅŸurada bitirildi: %s\n"
+
+#: builtin/describe.c:424
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"Hiçbir ek açıklamalı etiket şunu betimleyemiyor: '%s'.\n"
+"Bunun yanında ek açıklaması olmayan etiketler vardı, --tags deneyin."
+
+#: builtin/describe.c:428
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"Şunu hiçbir etiket betimleyemez: '%s'.\n"
+"--always deneyin veya birkaç etiket oluşturun."
+
+#: builtin/describe.c:458
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "%lu iÅŸleme katedildi\n"
+
+#: builtin/describe.c:461
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+"%i etiketten fazla etiket bulundu; en son %i listelendi\n"
+"şu konumda arama bırakıldı: %s\n"
+
+#: builtin/describe.c:529
+#, c-format
+msgid "describe %s\n"
+msgstr "şunu tanımla: %s\n"
+
+#: builtin/describe.c:532
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "%s geçerli bir nesne adı değil"
+
+#: builtin/describe.c:540
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s ne bir iÅŸleme ne de ikili nesne"
+
+#: builtin/describe.c:554
+msgid "find the tag that comes after the commit"
+msgstr "işlemenin ardından gelen etiketi bul"
+
+#: builtin/describe.c:555
+msgid "debug search strategy on stderr"
+msgstr "stderr'deki arama stratejisini ayıkla"
+
+#: builtin/describe.c:556
+msgid "use any ref"
+msgstr "herhangi bir baÅŸvuruyu kullan"
+
+#: builtin/describe.c:557
+msgid "use any tag, even unannotated"
+msgstr "herhangi bir etiketi kullan, ek açıklaması olmasa bile"
+
+#: builtin/describe.c:558
+msgid "always use long format"
+msgstr "her zaman uzun biçimi kullan"
+
+#: builtin/describe.c:559
+msgid "only follow first parent"
+msgstr "yalnızca ilk üst ögeyi izle"
+
+#: builtin/describe.c:562
+msgid "only output exact matches"
+msgstr "yalnızca kesin eşleşmeleri çıktı ver"
+
+#: builtin/describe.c:564
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "<n> en son etiketi dikkate al (öntanımlı: 10)"
+
+#: builtin/describe.c:566
+msgid "only consider tags matching <pattern>"
+msgstr "yalnızca <dizgi> ile eşleşen etiketleri dikkate al"
+
+#: builtin/describe.c:568
+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
+msgid "show abbreviated commit object as fallback"
+msgstr "kısaltılmış işleme nesnesini geri çekilinecek nesne olarak göster"
+
+#: builtin/describe.c:571 builtin/describe.c:574
+msgid "mark"
+msgstr "im"
+
+#: builtin/describe.c:572
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "<im>'i kirli çalışma ağacına iliştir (öntanımlı: \"-dirty\")"
+
+#: builtin/describe.c:575
+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/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base yalnızca iki işleme ile kullanılabilir"
+
+#: builtin/diff.c:92
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s': Sıradan bir dosya veya sembolik bağ değil"
+
+#: builtin/diff.c:259
+#, c-format
+msgid "invalid option: %s"
+msgstr "geçersiz seçenek: %s"
+
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: birleÅŸtirme temeli yok"
+
+#: builtin/diff.c:486
+msgid "Not a git repository"
+msgstr "Bir git deposu deÄŸil"
+
+#: builtin/diff.c:532 builtin/grep.c:684
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "geçersiz nesne '%s' verildi"
+
+#: builtin/diff.c:543
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "ikiden çok ikili nesne verildi: '%s'"
+
+#: builtin/diff.c:548
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "ele alınmayan nesne '%s' verildi"
+
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s: çoklu birleştirme temelleri, %s kullanılıyor"
+
+#: builtin/difftool.c:31
+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
+#, c-format
+msgid "could not read symlink %s"
+msgstr "%s sembolik bağı okunamadı"
+
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "%s sembolik bağ dosyası okunamadı"
+
+#: builtin/difftool.c:313
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "%s nesnesi %s sembolik bağı için okunamadı"
+
+#: builtin/difftool.c:413
+msgid ""
+"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."
+
+#: builtin/difftool.c:637
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "Her iki dosya da deÄŸiÅŸtirildi: '%s' ve '%s'."
+
+#: builtin/difftool.c:639
+msgid "working tree file has been left."
+msgstr "Çalışma ağacı dosyası bırakıldı."
+
+#: builtin/difftool.c:650
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "'%s' konumunda geçici dosyalar var."
+
+#: builtin/difftool.c:651
+msgid "you may want to cleanup or recover these."
+msgstr "Bunları temizlemek veya kurtarmak isteyebilirsiniz."
+
+#: builtin/difftool.c:699
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "'diff.tool' yerine 'diff.guitool' kullan"
+
+#: builtin/difftool.c:701
+msgid "perform a full-directory diff"
+msgstr "bir tam dizin diff'i gerçekleştir"
+
+#: builtin/difftool.c:703
+msgid "do not prompt before launching a diff tool"
+msgstr "bir diff aracı çalıştırmadan önce sorma"
+
+#: builtin/difftool.c:708
+msgid "use symlinks in dir-diff mode"
+msgstr "dir-diff kipinde sembolik baÄŸlar kullan"
+
+#: builtin/difftool.c:709
+msgid "tool"
+msgstr "araç"
+
+#: builtin/difftool.c:710
+msgid "use the specified diff tool"
+msgstr "belirtilen diff aracını kullan"
+
+#: builtin/difftool.c:712
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "'--tool' ile birlikte kullanılabilecek diff araçlarının listesini çıkar"
+
+#: builtin/difftool.c:715
+msgid ""
+"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:718
+msgid "specify a custom command for viewing diffs"
+msgstr "diff'leri görüntülemek için özel bir komut belirle"
+
+#: builtin/difftool.c:719
+msgid "passed to `diff`"
+msgstr "'diff'e aktarıldı"
+
+#: builtin/difftool.c:734
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool, çalışma ağacı veya --no-index gerektiriyor"
+
+#: builtin/difftool.c:741
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff, --no-index ile uyumsuz"
+
+#: builtin/difftool.c:744
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui, --tool ve --extcmd birlikte kullanılamaz"
+
+#: builtin/difftool.c:752
+msgid "no <tool> given for --tool=<tool>"
+msgstr "--tool=<araç> için bir <araç> verilmedi"
+
+#: builtin/difftool.c:759
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "--extcmd=<komut> için bir <komut> verilmedi"
+
+#: builtin/env--helper.c:6
+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
+msgid "type"
+msgstr "tür"
+
+#: builtin/env--helper.c:46
+msgid "default for git_env_*(...) to fall back on"
+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"
+
+#: builtin/env--helper.c:67
+#, c-format
+msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
+msgstr ""
+"--default seçeneği, --type=bool ile birlikte bir Boole değeri bekliyor, '%s' "
+"deÄŸil"
+
+#: builtin/env--helper.c:82
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%s`"
+msgstr ""
+"--default seçeneği, --type=ulong ile birlikte bir imzalanmamış uzun değer "
+"bekliyor, '%s' deÄŸil"
+
+#: builtin/fast-export.c:29
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [rev-list-opts]"
+
+#: builtin/fast-export.c:868
+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
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map jetonu boÅŸ olamaz"
+
+#: builtin/fast-export.c:1197
+msgid "show progress after <n> objects"
+msgstr "<n> nesneden sonra ilerlemeyi göster"
+
+#: builtin/fast-export.c:1199
+msgid "select handling of signed tags"
+msgstr "imzalanan etiketlerin nasıl ele alınacağını seçin"
+
+#: builtin/fast-export.c:1202
+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
+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
+msgid "dump marks to this file"
+msgstr "imleri bu dosyaya boÅŸalt"
+
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "imleri bu dosyadan içe aktar"
+
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "eğer varsa bu dosyadan imleri içe aktar"
+
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "etiketlerin bir etiketleyicisi yoksa varmış gibi davran"
+
+#: builtin/fast-export.c:1218
+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
+msgid "use the done feature to terminate the stream"
+msgstr "akışı sonlandırmak için 'done' özelliğini kullan"
+
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "ikili nesne verisi çıktısını atla"
+
+#: builtin/fast-export.c:1222 builtin/log.c:1826
+msgid "refspec"
+msgstr "baÅŸvuru belirteci"
+
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "başvuru belirtecini dışa aktarılan başvurulara uygula"
+
+#: builtin/fast-export.c:1224
+msgid "anonymize output"
+msgstr "çıktı kimliğini gizle"
+
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "kimden:kime"
+
+#: builtin/fast-export.c:1226
+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
+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
+msgid "show original object ids of blobs/commits"
+msgstr "ikili nesnelerin/işlemelerin orijinal nesne numaralarını göster"
+
+#: builtin/fast-export.c:1233
+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
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "'%s' altmodülü için '(on)-dan' imleri eksik"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "'%s' altmodülü için '(o)-na' imleri eksik"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "'mark' komutu bekleniyordu, %s alındı"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "'to' komutu bekleniyordu, %s alındı"
+
+#: builtin/fast-import.c:3322
+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
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "'%s' özelliği --allow-unsafe-features olmadan girdide yasaklı"
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "Kilit dosyası oluşturuldu; ancak raporlanmadı: %s"
+
+#: builtin/fetch.c:35
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
+
+#: builtin/fetch.c:36
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<seçenekler>] <grup>"
+
+#: builtin/fetch.c:37
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<seçenekler>] [(<depo> | <grup>)...]"
+
+#: builtin/fetch.c:38
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<seçenekler>]"
+
+#: builtin/fetch.c:122
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel negatif olamaz"
+
+#: builtin/fetch.c:145 builtin/pull.c:185
+msgid "fetch from all remotes"
+msgstr "tüm uzak konumlardan getir"
+
+#: builtin/fetch.c:147 builtin/pull.c:245
+msgid "set upstream for git pull/fetch"
+msgstr "git pull/fetch için üstkaynak ayarla"
+
+#: builtin/fetch.c:149 builtin/pull.c:188
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr ".git/FETCH_HEAD'in üzerine yazmak yerine ona iliştir"
+
+#: builtin/fetch.c:151
+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
+msgid "path to upload pack on remote end"
+msgstr "uzak uçtaki yükleme paketine olan yol"
+
+#: builtin/fetch.c:154
+msgid "force overwrite of local reference"
+msgstr "yerel başvurunun üzerine zorla yaz"
+
+#: builtin/fetch.c:156
+msgid "fetch from multiple remotes"
+msgstr "birden çok uzak konumdan getir"
+
+#: builtin/fetch.c:158 builtin/pull.c:195
+msgid "fetch all tags and associated objects"
+msgstr "tüm etiketleri ve ilişkilendirilen nesneleri getir"
+
+#: builtin/fetch.c:160
+msgid "do not fetch all tags (--no-tags)"
+msgstr "tüm etiketleri getirme (--no-tags)"
+
+#: builtin/fetch.c:162
+msgid "number of submodules fetched in parallel"
+msgstr "paralelde getirilen altmodüllerin sayısı"
+
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr ""
+"başvuru belirtecini tüm başvuruları refs/prefetch/'e yerleştirecek biçimde "
+"deÄŸiÅŸtir"
+
+#: builtin/fetch.c:166 builtin/pull.c:198
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "artık uzak konumda olmayan uzak izleme dallarını buda"
+
+#: builtin/fetch.c:168
+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
+msgid "on-demand"
+msgstr "istek üzerine"
+
+#: builtin/fetch.c:170
+msgid "control recursive fetching of submodules"
+msgstr "altmodüllerin özyineli getirilmesini denetle"
+
+#: builtin/fetch.c:175
+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
+msgid "keep downloaded pack"
+msgstr "indirilen paketi tut"
+
+#: builtin/fetch.c:178
+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
+msgid "deepen history of shallow clone"
+msgstr "sığ klonun geçmişini derinleştir"
+
+#: builtin/fetch.c:183 builtin/pull.c:212
+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
+msgid "convert to a complete repository"
+msgstr "tam bir depoya dönüştür"
+
+#: builtin/fetch.c:192
+msgid "prepend this to submodule path output"
+msgstr "bunu altmodül yol çıktısının başına ekle"
+
+#: builtin/fetch.c:195
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+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
+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
+msgid "refmap"
+msgstr "ilgili baÅŸvuru"
+
+#: builtin/fetch.c:201 builtin/pull.c:227
+msgid "specify fetch refmap"
+msgstr "getirme ile ilgili başvuruları belirt"
+
+#: builtin/fetch.c:208 builtin/pull.c:240
+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
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr ""
+"bir paket dosyasını getirme; bunun yerine pazarlık ipuçlarının atalarını "
+"yazdır"
+
+#: builtin/fetch.c:213 builtin/fetch.c:215
+msgid "run 'maintenance --auto' after fetching"
+msgstr "getirme sonrasında 'maintenance --auto' çalıştır"
+
+#: builtin/fetch.c:217 builtin/pull.c:243
+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
+msgid "write the commit-graph after fetching"
+msgstr "getirdikten sonra iÅŸleme grafiÄŸini yaz"
+
+#: builtin/fetch.c:221
+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:757
+#, 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
+#, c-format
+msgid "object %s not found"
+msgstr "%s nesnesi bulunamadı"
+
+#: builtin/fetch.c:860
+msgid "[up to date]"
+msgstr "[güncel]"
+
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+msgid "[rejected]"
+msgstr "[reddedildi]"
+
+#: builtin/fetch.c:874
+msgid "can't fetch in current branch"
+msgstr "geçerli dalda getirme yapılamıyor"
+
+#: builtin/fetch.c:884
+msgid "[tag update]"
+msgstr "[etiket güncellemesi]"
+
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
+msgid "unable to update local ref"
+msgstr "yerel başvuru güncellenemiyor"
+
+#: builtin/fetch.c:889
+msgid "would clobber existing tag"
+msgstr "var olan etiketi deÄŸiÅŸtirecektir"
+
+#: builtin/fetch.c:911
+msgid "[new tag]"
+msgstr "[yeni etiket]"
+
+#: builtin/fetch.c:914
+msgid "[new branch]"
+msgstr "[yeni dal]"
+
+#: builtin/fetch.c:917
+msgid "[new ref]"
+msgstr "[yeni baÅŸvuru]"
+
+#: builtin/fetch.c:956
+msgid "forced update"
+msgstr "zorlanmış güncelleme"
+
+#: builtin/fetch.c:961
+msgid "non-fast-forward"
+msgstr "ileri sarım değil"
+
+#: 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 ""
+"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
+#, 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"
+msgstr ""
+"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
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s tüm gerekli nesneleri göndermedi\n"
+
+#: builtin/fetch.c:1129
+#, c-format
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "%s reddedildi; çünkü sığ köklerin güncellenmesine izin verilmiyor"
+
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#, c-format
+msgid "From %.*s\n"
+msgstr "Åžu konumdan: %.*s\n"
+
+#: 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 ""
+"bazı yerel başvurular güncellenemedi; 'git remote prune %s'\n"
+"kullanarak eski ve çakışan dalları kaldırmayı deneyin"
+
+#: builtin/fetch.c:1327
+#, c-format
+msgid "   (%s will become dangling)"
+msgstr "   (%s sarkacak)"
+
+#: builtin/fetch.c:1328
+#, c-format
+msgid "   (%s has become dangling)"
+msgstr "   (%s sarkmaya başladı)"
+
+#: builtin/fetch.c:1360
+msgid "[deleted]"
+msgstr "[silindi]"
+
+#: builtin/fetch.c:1361 builtin/remote.c:1118
+msgid "(none)"
+msgstr "(hiçbiri)"
+
+#: builtin/fetch.c:1384
+#, 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"
+
+#: builtin/fetch.c:1403
+#, c-format
+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
+#, c-format
+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
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "birden çok dal algılandı, --set-upstream ile uyumsuz"
+
+#: builtin/fetch.c:1633
+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
+msgid "not setting upstream for a remote tag"
+msgstr "bir uzak konum etiketi için üstkaynak ayarlanmıyor"
+
+#: builtin/fetch.c:1637
+msgid "unknown branch type"
+msgstr "bilinmeyen dal türü"
+
+#: builtin/fetch.c:1639
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"Kaynak dal bulunamadı.\n"
+"--set-upstream seçeneği ile tam olarak bir dal belirtmeniz gerekiyor."
+
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#, c-format
+msgid "Fetching %s\n"
+msgstr "%s getiriliyor\n"
+
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "%s getirilemedi"
+
+#: builtin/fetch.c:1790
+#, c-format
+msgid "could not fetch '%s' (exit code: %d)\n"
+msgstr "'%s' getirilemedi (çıkış kodu: %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 ""
+"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."
+
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr ""
+"--negotiate-only'nin bir veya daha çok --negotiate-tip=* gereksinimi var"
+
+#: builtin/fetch.c:1998
+msgid "Negative depth in --deepen is not supported"
+msgstr "--deepen için negatif derinlik desteklenmiyor"
+
+#: builtin/fetch.c:2000
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen ve --depth birlikte kullanılamaz"
+
+#: builtin/fetch.c:2005
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth ve --unshallow birlikte kullanılamaz"
+
+#: builtin/fetch.c:2007
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "tam bir depo üzerinde --unshallow bir anlam ifade etmiyor"
+
+#: builtin/fetch.c:2024
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all bir depo argümanı almıyor"
+
+#: builtin/fetch.c:2026
+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:2035
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "Böyle bir uzak konum veya uzak konum grubu yok: %s"
+
+#: builtin/fetch.c:2042
+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"
+
+#: builtin/fetch.c:2058
+msgid "must supply remote when using --negotiate-only"
+msgstr "--negotiate-only kullanırken uzak konum sağlanmalıdır"
+
+#: builtin/fetch.c:2063
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "Protokol, --negotiate-only desteklemiyor, çıkılıyor."
+
+#: builtin/fetch.c:2082
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr ""
+"--filter yalnızca extensions.partialclone içinde yapılandırılmış uzak konum "
+"ile kullanılabilir."
+
+#: builtin/fetch.c:2086
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic yalnızca bir uzak konumdan getirirken kullanılabilir"
+
+#: builtin/fetch.c:2090
+msgid "--stdin can only be used when fetching from one remote"
+msgstr ""
+"--stdin seçeneği yalnızca bir uzak konumdan getirilirken kullanılabilir"
+
+#: 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 <ileti>] [--log[=<n>] | --no-log] [--file <dosya>]"
+
+#: builtin/fmt-merge-msg.c:18
+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
+msgid "alias for --log (deprecated)"
+msgstr "--log için arma (kullanılmamalı)"
+
+#: builtin/fmt-merge-msg.c:24
+msgid "text"
+msgstr "metin"
+
+#: builtin/fmt-merge-msg.c:25
+msgid "use <text> as start of message"
+msgstr "iletinin başlangıcı olarak <metin> kullan"
+
+#: builtin/fmt-merge-msg.c:26
+msgid "file to read from"
+msgstr "okunacak dosya"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<seçenekler>] [<dizgi>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <nesne>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr "git for-each-ref [--merged [<iÅŸleme>]] [--no-merged [<iÅŸleme>]]"
+
+#: builtin/for-each-ref.c:13
+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
+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
+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
+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
+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
+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
+msgid "respect format colors"
+msgstr "biçim renklerine uy"
+
+#: builtin/for-each-ref.c:44
+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
+msgid "print only refs that are merged"
+msgstr "yalnızca birleştirilen başvuruları yazdır"
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs that are not merged"
+msgstr "yalnızca birleştirilmemiş başvuruları yazdır"
+
+#: builtin/for-each-ref.c:48
+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
+msgid "print only refs which don't contain the commit"
+msgstr "yalnızca işlemeyi içermeyen başvuruları yazdır"
+
+#: builtin/for-each-repo.c:9
+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:34
+msgid "config"
+msgstr "yapılandırma"
+
+#: 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:43
+msgid "missing --config=<config>"
+msgstr "--config=<yapılandırma> eksik"
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
+msgid "unknown"
+msgstr "bilinmeyen"
+
+#. 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 "%s %s içinde hata: %s"
+
+#. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
+#: builtin/fsck.c:94
+#, c-format
+msgid "warning in %s %s: %s"
+msgstr "%s %s içinde uyarı: %s"
+
+#: 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:136
+msgid "wrong object type in link"
+msgstr "bağda yanlış nesne türü"
+
+#: builtin/fsck.c:152
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+"şuradan kırık bağ: %7s %s\n"
+"           ÅŸuraya: %7s %s"
+
+#: builtin/fsck.c:264
+#, c-format
+msgid "missing %s %s"
+msgstr "eksik %s %s"
+
+#: builtin/fsck.c:291
+#, c-format
+msgid "unreachable %s %s"
+msgstr "ulaşılamayan %s %s"
+
+#: builtin/fsck.c:311
+#, c-format
+msgid "dangling %s %s"
+msgstr "sarkan %s %s"
+
+#: builtin/fsck.c:321
+msgid "could not create lost-found"
+msgstr "lost-found oluşturulamadı"
+
+#: builtin/fsck.c:332
+#, c-format
+msgid "could not finish '%s'"
+msgstr "'%s' bitirilemedi"
+
+#: builtin/fsck.c:349
+#, c-format
+msgid "Checking %s"
+msgstr "%s denetleniyor"
+
+#: builtin/fsck.c:387
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "BaÄŸlanabilirlik denetleniyor (%d nesne)"
+
+#: builtin/fsck.c:406
+#, c-format
+msgid "Checking %s %s"
+msgstr "%s %s denetleniyor"
+
+#: builtin/fsck.c:411
+msgid "broken links"
+msgstr "kırık bağlar"
+
+#: builtin/fsck.c:420
+#, c-format
+msgid "root %s"
+msgstr "kök %s"
+
+#: builtin/fsck.c:428
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "%s %s (%s) ÅŸurada etiketlendi: %s"
+
+#: builtin/fsck.c:457
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s: nesne hasar görmüş veya kayıp"
+
+#: 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:496
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "Başvuru günlüğü denetleniyor: %s->%s"
+
+#: builtin/fsck.c:530
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s: geçersiz sha1 işaretçisi %s"
+
+#: builtin/fsck.c:537
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s: bir iÅŸleme deÄŸil"
+
+#: builtin/fsck.c:591
+msgid "notice: No default references"
+msgstr "Uyarı: Öntanımlı başvurular yok"
+
+#: builtin/fsck.c:606
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s: nesne hasar görmüş veya kayıp: %s"
+
+#: builtin/fsck.c:619
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s: nesne ayrıştırılamadı: %s"
+
+#: builtin/fsck.c:639
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "hatalı sha1 dosyası: %s"
+
+#: builtin/fsck.c:654
+msgid "Checking object directory"
+msgstr "Nesne dizini denetleniyor"
+
+#: builtin/fsck.c:657
+msgid "Checking object directories"
+msgstr "Nesne dizinleri denetleniyor"
+
+#: builtin/fsck.c:672
+#, c-format
+msgid "Checking %s link"
+msgstr "%s baÄŸ denetleniyor"
+
+#: builtin/fsck.c:677 builtin/index-pack.c:864
+#, c-format
+msgid "invalid %s"
+msgstr "geçersiz %s"
+
+#: builtin/fsck.c:684
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s garip bir ÅŸeye iÅŸaret ediyor (%s)"
+
+#: builtin/fsck.c:690
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s: ayrık HEAD bir şeye işaret etmiyor"
+
+#: builtin/fsck.c:694
+#, 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:706
+msgid "Checking cache tree"
+msgstr "Önbellek ağacı denetleniyor"
+
+#: builtin/fsck.c:711
+#, 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:720
+msgid "non-tree in cache-tree"
+msgstr "cache-tree içinde ağaç olmayan öge"
+
+#: builtin/fsck.c:751
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<seçenekler>] [<nesne>...]"
+
+#: builtin/fsck.c:757
+msgid "show unreachable objects"
+msgstr "ulaşılamayan nesneleri göster"
+
+#: builtin/fsck.c:758
+msgid "show dangling objects"
+msgstr "sarkan nesneleri göster"
+
+#: builtin/fsck.c:759
+msgid "report tags"
+msgstr "etiketleri bildir"
+
+#: builtin/fsck.c:760
+msgid "report root nodes"
+msgstr "kök düğümleri bildir"
+
+#: builtin/fsck.c:761
+msgid "make index objects head nodes"
+msgstr "indeks nesnelerini dal ucu düğümü yap"
+
+#: builtin/fsck.c:762
+msgid "make reflogs head nodes (default)"
+msgstr "başvuru günlüklerini dal ucu düğümü yap (öntanımlı)"
+
+#: builtin/fsck.c:763
+msgid "also consider packs and alternate objects"
+msgstr "ek olarak paketleri ve alternatif nesneleri de dikkate al"
+
+#: builtin/fsck.c:764
+msgid "check only connectivity"
+msgstr "yalnızca bağlanabilirliği denetle"
+
+#: builtin/fsck.c:765 builtin/mktag.c:75
+msgid "enable more strict checking"
+msgstr "daha kesin denetlemeyi etkinleÅŸtir"
+
+#: builtin/fsck.c:767
+msgid "write dangling objects in .git/lost-found"
+msgstr "sarkan nesneleri .git/lost-found'a yaz"
+
+#: builtin/fsck.c:768 builtin/prune.c:134
+msgid "show progress"
+msgstr "ilerlemeyi göster"
+
+#: builtin/fsck.c:769
+msgid "show verbose names for reachable objects"
+msgstr "ulaşılabilir nesneler için ayrıntılı adları göster"
+
+#: builtin/fsck.c:828 builtin/index-pack.c:262
+msgid "Checking objects"
+msgstr "Nesneler denetleniyor"
+
+#: builtin/fsck.c:856
+#, c-format
+msgid "%s: object missing"
+msgstr "%s: nesne kayıp"
+
+#: builtin/fsck.c:867
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "geçersiz parametre: sha1 bekleniyordu, '%s' alındı"
+
+#: builtin/gc.c:39
+msgid "git gc [<options>]"
+msgstr "git gc [<seçenekler>]"
+
+#: builtin/gc.c:93
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "%s fstat yapılamadı: %s"
+
+#: builtin/gc.c:129
+#, c-format
+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
+#, 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
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"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"
+"\n"
+"%s"
+
+#: builtin/gc.c:551
+msgid "prune unreferenced objects"
+msgstr "baÅŸvurulmayan nesneleri buda"
+
+#: builtin/gc.c:553
+msgid "be more thorough (increased runtime)"
+msgstr "biraz daha titiz ol (artırılmış işleyiş süresi)"
+
+#: builtin/gc.c:554
+msgid "enable auto-gc mode"
+msgstr "auto-gc kipini etkinleÅŸtir"
+
+#: builtin/gc.c:557
+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
+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
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr "gc.logexpiry değeri %s ayrıştırılamadı"
+
+#: builtin/gc.c:587
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "'prune expiry' değeri %s ayrıştırılamadı"
+
+#: builtin/gc.c:607
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
+msgstr ""
+"gc %s makinesinde halihazırda çalışıyor (pid %<PRIuMAX> - çalışmıyorsa --"
+"force kullanın)"
+
+#: builtin/gc.c:705
+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
+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
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule kullanımına izin yok"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "tanımlanamayan --schedule argümanı, %s"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "commit-graph yazılamadı"
+
+#: builtin/gc.c:905
+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ı"
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr "'git pack-objects' iÅŸlemi bitirilemedi"
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr "multi-pack-index yazılamadı"
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' başarısız oldu"
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' başarısız oldu"
+
+#: builtin/gc.c:1179
+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
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "kilit dosyası '%s' mevcut, bakım atlanıyor"
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr "'%s' görevi başarısız oldu"
+
+#: builtin/gc.c:1395
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' geçerli bir görev değil"
+
+#: builtin/gc.c:1400
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "'%s' görevi birden çok kez seçilemez"
+
+#: builtin/gc.c:1415
+msgid "run tasks based on the state of the repository"
+msgstr "görevleri deponun durumuna göre çalıştır"
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr "sıklık"
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr "görevleri sıklığa göre çalıştır"
+
+#: builtin/gc.c:1420
+msgid "do not report progress or other information over stderr"
+msgstr "stderr üzerinden ilerlemeyi veya başka bir bilgiyi raporlama"
+
+#: builtin/gc.c:1421
+msgid "task"
+msgstr "görev"
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr "belirli bir görevi çalıştır"
+
+#: builtin/gc.c:1439
+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
+msgid "failed to run 'git config'"
+msgstr "'git config' çalıştırılamadı"
+
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "'%s' yolu oluşturulamadı"
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr "launchctl başlatılamadı"
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "'%s' için dizinler oluşturulamadı"
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "%s servisi özyüklenemedi"
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
+msgstr "geçici xml dosyası oluşturulamadı"
+
+#: builtin/gc.c:1835
+msgid "failed to start schtasks"
+msgstr "schtasks başlatılamadı"
+
+#: builtin/gc.c:1879
+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
+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
+msgid "failed to open stdin of 'crontab'"
+msgstr "'crontab' stdin'i açılamadı"
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr "'crontab' beklenmedik bir biçimde sonlandı"
+
+#: builtin/gc.c:1976
+msgid "another process is scheduling background maintenance"
+msgstr "başka bir işlem arka plan bakımı zamanının ayarlıyor"
+
+#: builtin/gc.c:2000
+msgid "failed to add repo to global config"
+msgstr "depo, global yapılandırmaya eklenemedi"
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <altkomut> [<seçenekler>]"
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "geçersiz altkomut: %s"
+
+#: builtin/grep.c:30
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<seçenekler>] [-e] <dizgi> [<rev>...] [[--] <yol>...]"
+
+#: builtin/grep.c:223
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: iş parçacığı oluşturulamadı: %s"
+
+#: builtin/grep.c:277
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "geçersiz belirtilen iş parçacığı sayısı (%d), %s için"
+
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: 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 "iş parçacığı desteği yok, %s yok sayılıyor"
+
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "ağaç okunamıyor (%s)"
+
+#: builtin/grep.c:658
+#, 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:738
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "'%c' anahtarı sayısal bir değer bekliyor"
+
+#: builtin/grep.c:837
+msgid "search in index instead of in the work tree"
+msgstr "çalışma ağacı yerine indekste ara"
+
+#: builtin/grep.c:839
+msgid "find in contents not managed by git"
+msgstr "git tarafından yönetilmeyen içerikte bul"
+
+#: builtin/grep.c:841
+msgid "search in both tracked and untracked files"
+msgstr "hem izlenen hem izlenmeyen dosyalar içinde ara"
+
+#: builtin/grep.c:843
+msgid "ignore files specified via '.gitignore'"
+msgstr "'.gitignore'da belirtilen dosyaları yok say"
+
+#: builtin/grep.c:845
+msgid "recursively search in each submodule"
+msgstr "her altmodülde özyineli olarak ara"
+
+#: builtin/grep.c:848
+msgid "show non-matching lines"
+msgstr "eşleşmeyen satırları göster"
+
+#: builtin/grep.c:850
+msgid "case insensitive matching"
+msgstr "BÜYÜK/küçük harf duyarsız eşleşme"
+
+#: builtin/grep.c:852
+msgid "match patterns only at word boundaries"
+msgstr "yalnızca sözcük sınırlarındaki dizgileri eşleştir"
+
+#: builtin/grep.c:854
+msgid "process binary files as text"
+msgstr "ikili dosyaları metin olarak işle"
+
+#: builtin/grep.c:856
+msgid "don't match patterns in binary files"
+msgstr "ikili dosyalardaki dizgileri eÅŸleÅŸtirme"
+
+#: builtin/grep.c:859
+msgid "process binary files with textconv filters"
+msgstr "ikili dosyaları textconv süzgeçleri ile işle"
+
+#: builtin/grep.c:861
+msgid "search in subdirectories (default)"
+msgstr "altdizinlerde ara (öntanımlı)"
+
+#: builtin/grep.c:863
+msgid "descend at most <depth> levels"
+msgstr "en çok <derinlik> düzey in"
+
+#: builtin/grep.c:867
+msgid "use extended POSIX regular expressions"
+msgstr "genişletilmiş POSIX düzenli ifadelerini kullan"
+
+#: builtin/grep.c:870
+msgid "use basic POSIX regular expressions (default)"
+msgstr "temel POSIX düzenli ifadelerini kullan (öntanımlı)"
+
+#: builtin/grep.c:873
+msgid "interpret patterns as fixed strings"
+msgstr "dizgileri sabit diziler olarak yorumla"
+
+#: builtin/grep.c:876
+msgid "use Perl-compatible regular expressions"
+msgstr "Perl uyumlu düzenli ifadeler kullan"
+
+#: builtin/grep.c:879
+msgid "show line numbers"
+msgstr "satır numaralarını göster"
+
+#: builtin/grep.c:880
+msgid "show column number of first match"
+msgstr "ilk eşleşmenin sütun numarasını göster"
+
+#: builtin/grep.c:881
+msgid "don't show filenames"
+msgstr "dosya adlarını gösterme"
+
+#: builtin/grep.c:882
+msgid "show filenames"
+msgstr "dosya adlarını göster"
+
+#: builtin/grep.c:884
+msgid "show filenames relative to top directory"
+msgstr "dosya adlarını en üst dizine göreceli olarak göster"
+
+#: builtin/grep.c:886
+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:888
+msgid "synonym for --files-with-matches"
+msgstr "--files-with-matches eşanlamlısı"
+
+#: builtin/grep.c:891
+msgid "show only the names of files without match"
+msgstr "eşleşme olmadan yalnızca dosya adlarını göster"
+
+#: builtin/grep.c:893
+msgid "print NUL after filenames"
+msgstr "dosya adlarından sonra NUL yazdır"
+
+#: builtin/grep.c:896
+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:898
+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:899
+msgid "highlight matches"
+msgstr "eÅŸleÅŸmeleri vurgula"
+
+#: builtin/grep.c:901
+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:903
+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:906
+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:909
+msgid "show <n> context lines before matches"
+msgstr "eşleşmelerden önce <n> satır bağlam göster"
+
+#: builtin/grep.c:911
+msgid "show <n> context lines after matches"
+msgstr "eşleşmelerden sonra <n> satır bağlam göster"
+
+#: builtin/grep.c:913
+msgid "use <n> worker threads"
+msgstr "<n> iş parçacığı kullan"
+
+#: builtin/grep.c:914
+msgid "shortcut for -C NUM"
+msgstr "-C NUM için kısayol"
+
+#: builtin/grep.c:917
+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:919
+msgid "show the surrounding function"
+msgstr "çevresindeki işlevi göster"
+
+#: builtin/grep.c:922
+msgid "read patterns from file"
+msgstr "dizgileri dosyadan oku"
+
+#: builtin/grep.c:924
+msgid "match <pattern>"
+msgstr "<dizgi> ile eÅŸleÅŸ"
+
+#: builtin/grep.c:926
+msgid "combine patterns specified with -e"
+msgstr "-e ile belirtilen dizgileri birleÅŸtir"
+
+#: builtin/grep.c:938
+msgid "indicate hit with exit status without output"
+msgstr "çıkış durumu ile olan eşleşmelerde çıktı verme"
+
+#: builtin/grep.c:940
+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:943
+msgid "pager"
+msgstr "sayfalayıcı"
+
+#: builtin/grep.c:943
+msgid "show matching files in the pager"
+msgstr "sayfalayıcıda eşleşen dosyaları göster"
+
+#: builtin/grep.c:947
+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:1013
+msgid "no pattern given"
+msgstr "bir dizgi verilmedi"
+
+#: builtin/grep.c:1049
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index veya --untracked revizyonlarla birlikte kullanılamaz"
+
+#: builtin/grep.c:1057
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "revizyon çözülemiyor: %s"
+
+#: builtin/grep.c:1087
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked, --recurse-submodules ile desteklenmiyor"
+
+#: builtin/grep.c:1091
+msgid "invalid option combination, ignoring --threads"
+msgstr "geçersiz seçenek birleştirmesi, --threads yok sayılıyor"
+
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+msgid "no threads support, ignoring --threads"
+msgstr "iş parçacığı desteği yok, --threads yok sayılıyor"
+
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "geçersiz belirtilen iş parçacığı sayısı (%d)"
+
+#: builtin/grep.c:1131
+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:1157
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached veya --untracked, --no-index ile birlikte kullanılamıyor"
+
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked, --cached ile birlikte kullanılamıyor"
+
+#: builtin/grep.c:1166
+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:1174
+msgid "both --cached and trees are given"
+msgstr "hem --cached hem ağaçlar verilmiş"
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <tür>] [-w] [--path=<dosya> | --no-filters] [--stdin] "
+"[--] <dosya>..."
+
+#: builtin/hash-object.c:86
+msgid "git hash-object  --stdin-paths"
+msgstr "git hash-object  --stdin-paths"
+
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr "nesne türü"
+
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr "nesneyi nesne veritabanına yaz"
+
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr "nesneyi stdin'den oku"
+
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr "dosyayı süzgeçler olmadan olduğu gibi depola"
+
+#: builtin/hash-object.c:104
+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
+msgid "process file as it were from this path"
+msgstr "dosyayı sanki bu yoldanmış gibi işle"
+
+#: builtin/help.c:47
+msgid "print all available commands"
+msgstr "tüm kullanılabilir komutları yazdır"
+
+#: builtin/help.c:48
+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
+msgid "show man page"
+msgstr "man sayfasını göster"
+
+#: builtin/help.c:53
+msgid "show manual in web browser"
+msgstr "kılavuzu web tarayıcısında göster"
+
+#: builtin/help.c:55
+msgid "show info page"
+msgstr "bilgi sayfasını göster"
+
+#: builtin/help.c:57
+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:163
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "tanımlanamayan yardım biçimi '%s'"
+
+#: builtin/help.c:190
+msgid "Failed to start emacsclient."
+msgstr "emacsclient başlatılamadı."
+
+#: builtin/help.c:203
+msgid "Failed to parse emacsclient version."
+msgstr "emacsclient sürümü ayrıştırılamadı."
+
+#: builtin/help.c:211
+#, 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
+#, c-format
+msgid "failed to exec '%s'"
+msgstr "'%s' çalıştırılamadı"
+
+#: builtin/help.c:307
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s': desteklenmeyen man görüntüleyicisi yolu.\n"
+"Bunun yerine 'man.<araç>.cmd' kullanmayı düşünün."
+
+#: builtin/help.c:319
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': desteklenmeyen man görüntüleyicisi komutu.\n"
+"Bunun yerine 'man.<araç>.path' kullanmayı düşünün."
+
+#: builtin/help.c:436
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s': Bilinmeyen man görüntüleyicisi."
+
+#: builtin/help.c:452
+msgid "no man viewer handled the request"
+msgstr "isteğe hiçbir man görüntüleyicisi ele almadı"
+
+#: builtin/help.c:459
+msgid "no info viewer handled the request"
+msgstr "isteğe hiçbir bilgi görüntüleyicisi ele almadı"
+
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s', '%s' olarak armalanmış"
+
+#: builtin/help.c:531 git.c:380
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr "hatalı alias.%s dizisi: %s"
+
+#: builtin/help.c:561 builtin/help.c:591
+#, c-format
+msgid "usage: %s%s"
+msgstr "kullanım: %s%s"
+
+#: builtin/help.c:575
+msgid "'git help config' for more information"
+msgstr "ek bilgi için: 'git help config'"
+
+#: builtin/index-pack.c:222
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "%s konumunda nesne türü uyuşmazlığı"
+
+#: builtin/index-pack.c:242
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "beklenen nesne %s alınmadı"
+
+#: builtin/index-pack.c:245
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "nesne %s: beklenen tür %s, bulunan %s"
+
+#: builtin/index-pack.c:295
+#, 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
+msgid "early EOF"
+msgstr "erken dosya sonu"
+
+#: builtin/index-pack.c:306
+msgid "read error on input"
+msgstr "girdide okuma hatası"
+
+#: builtin/index-pack.c:318
+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: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
+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
+msgid "pack signature mismatch"
+msgstr "paket imzası uyuşmazlığı"
+
+#: builtin/index-pack.c:365
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "paket sürümü %<PRIu32> desteklenmiyor"
+
+#: builtin/index-pack.c:381
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "paketin %<PRIuMAX> ofsetinde hatalı nesne var: %s"
+
+#: builtin/index-pack.c:487
+#, c-format
+msgid "inflate returned %d"
+msgstr "şişirme programı %d döndürdü"
+
+#: builtin/index-pack.c:536
+msgid "offset value overflow for delta base object"
+msgstr "delta tabanı nesnesi için ofset değeri taşımı"
+
+#: builtin/index-pack.c:544
+msgid "delta base offset is out of bound"
+msgstr "delta tabanı ofseti sınırlar dışında"
+
+#: builtin/index-pack.c:552
+#, c-format
+msgid "unknown object type %d"
+msgstr "bilinmeyen nesne türü %d"
+
+#: builtin/index-pack.c:583
+msgid "cannot pread pack file"
+msgstr "paket dosyası 'pread' yapılamıyor"
+
+#: 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] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik"
+msgstr[1] "zamansız paket dosyası sonu, %<PRIuMAX> bayt eksik"
+
+#: builtin/index-pack.c:611
+msgid "serious inflate inconsistency"
+msgstr "ciddi şişirme programı tutarsızlığı"
+
+#: 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 "%s İLE SHA1 ÇARPIŞMASI BULUNDU!"
+
+#: 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 "%s okunamıyor"
+
+#: builtin/index-pack.c:823
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "mevcut %s nesne bilgisi okunamıyor"
+
+#: builtin/index-pack.c:831
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "mevcut %s nesnesi okunamıyor"
+
+#: builtin/index-pack.c:845
+#, c-format
+msgid "invalid blob object %s"
+msgstr "geçersiz %s ikili nesnesi"
+
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
+msgid "fsck error in packed object"
+msgstr "paketlenmiş nesne içinde fsck hatası"
+
+#: builtin/index-pack.c:869
+#, 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:930 builtin/index-pack.c:977
+msgid "failed to apply delta"
+msgstr "delta uygulanamadı"
+
+#: builtin/index-pack.c:1160
+msgid "Receiving objects"
+msgstr "Nesneler alınıyor"
+
+#: builtin/index-pack.c:1160
+msgid "Indexing objects"
+msgstr "Nesneler indeksleniyor"
+
+#: builtin/index-pack.c:1194
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "paket hasar görmüş (SHA1 uyumsuzluğu)"
+
+#: builtin/index-pack.c:1199
+msgid "cannot fstat packfile"
+msgstr "paket dosyası fstat yapılamıyor"
+
+#: builtin/index-pack.c:1202
+msgid "pack has junk at the end"
+msgstr "paket sonunda döküntüler var"
+
+#: builtin/index-pack.c:1214
+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:1237
+msgid "Resolving deltas"
+msgstr "Deltalar çözülüyor"
+
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "iş parçacığı oluşturulamadı: %s"
+
+#: builtin/index-pack.c:1281
+msgid "confusion beyond insanity"
+msgstr "karmaşa akıl almaz düzeyde"
+
+#: builtin/index-pack.c:1287
+#, 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:1299
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "%s için beklenmedik kuyruk sağlaması (disk hasarı?)"
+
+#: builtin/index-pack.c:1303
+#, 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:1327
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "iliştirilen nesne söndürülemedi (%d)"
+
+#: builtin/index-pack.c:1423
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "yerel nesne %s hasarlı"
+
+#: builtin/index-pack.c:1444
+#, c-format
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "paket dosyası adı '%s', '.%s' ile bitmiyor"
+
+#: builtin/index-pack.c:1468
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "%s dosyası '%s' yazılamıyor"
+
+#: builtin/index-pack.c:1476
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "yazılmış %s dosyası '%s' kapatılamıyor"
+
+#: builtin/index-pack.c:1502
+msgid "error while closing pack file"
+msgstr "paket dosyası kapatılırken hata"
+
+#: builtin/index-pack.c:1516
+msgid "cannot store pack file"
+msgstr "paket dosyası depolanamıyor"
+
+#: builtin/index-pack.c:1524
+msgid "cannot store index file"
+msgstr "indeks dosyası depolanamıyor"
+
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "hatalı pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1649
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "Mevcut paket dosyası '%s' açılamıyor"
+
+#: builtin/index-pack.c:1651
+#, 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:1699
+#, 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:1706
+#, 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:1748
+msgid "Cannot come back to cwd"
+msgstr "Şu anki çalışma dizinine geri gelinemiyor"
+
+#: 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 "hatalı %s"
+
+#: builtin/index-pack.c:1831 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:1850
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin, --stdin olmadan kullanılamaz"
+
+#: builtin/index-pack.c:1852
+msgid "--stdin requires a git repository"
+msgstr "--stdin bir git dizini gerektirir"
+
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format, --stdin olmadan kullanılamaz"
+
+#: builtin/index-pack.c:1869
+msgid "--verify with no packfile name given"
+msgstr "--verify ile bir paket dosyası adı verilmedi"
+
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+msgid "fsck error in pack objects"
+msgstr "paket nesnelerinde fsck hatası"
+
+#: builtin/init-db.c:63
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "'%s' şablonunun bilgileri alınamıyor"
+
+#: builtin/init-db.c:68
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "'%s' opendir yapılamıyor"
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "'%s' readlink yapılamıyor"
+
+#: builtin/init-db.c:82
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "'%s', '%s' ögesine sembolik bağla bağlanamıyor"
+
+#: builtin/init-db.c:88
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "'%s' şuraya kopyalanamıyor: '%s'"
+
+#: builtin/init-db.c:92
+#, c-format
+msgid "ignoring template %s"
+msgstr "%s şablonu yok sayılıyor"
+
+#: builtin/init-db.c:123
+#, c-format
+msgid "templates not found in %s"
+msgstr "şablonlar %s içinde bulunamadı"
+
+#: builtin/init-db.c:138
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "şablonlar '%s' konumundan kopyalanmıyor: %s"
+
+#: 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:354
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "%d dosya türü ele alınamıyor"
+
+#: 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:373
+msgid "attempt to reinitialize repository with different hash"
+msgstr "depoyu baÅŸka bir saÄŸlama ile yeniden ilklendirme deneniyor"
+
+#: 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:432
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: --initial-branch=%s yok sayıldı"
+
+#: 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: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: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: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:518
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<ÅŸablon-dizini>] [--"
+"shared[=<izinler>]] [<dizin>]"
+
+#: builtin/init-db.c:544
+msgid "permissions"
+msgstr "izinler"
+
+#: 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: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:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "saÄŸlama"
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir ve --bare birlikte kullanılamaz"
+
+#: builtin/init-db.c:591 builtin/init-db.c:596
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "%s mkdir yapılamıyor"
+
+#: 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:627
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (veya --work-tree=<dizin>), %s (veya --git-dir=<dizin>) belirlenmeden "
+"izin verilmiyor"
+
+#: 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:684
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir, çıplak depo ile uyumsuz"
+
+#: 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 "
+"<jeton>[(=|:)<deÄŸer>])...] [<dosya>...]"
+
+#: builtin/interpret-trailers.c:95
+msgid "edit files in place"
+msgstr "dosyaları yerinde düzenle"
+
+#: builtin/interpret-trailers.c:96
+msgid "trim empty trailers"
+msgstr "boş artbilgileri kırp"
+
+#: builtin/interpret-trailers.c:99
+msgid "where to place the new trailer"
+msgstr "yeni artbilgiler nereye yerleÅŸtirilecek"
+
+#: builtin/interpret-trailers.c:101
+msgid "action if trailer already exists"
+msgstr "artbilgi halihazırda varsa yapılacak eylem"
+
+#: builtin/interpret-trailers.c:103
+msgid "action if trailer is missing"
+msgstr "artbilgi eksikse yapılacak eylem"
+
+#: builtin/interpret-trailers.c:105
+msgid "output only the trailers"
+msgstr "yalnızca artbilgileri çıktı ver"
+
+#: builtin/interpret-trailers.c:106
+msgid "do not apply config rules"
+msgstr "yapılandırma kurallarını uygulama"
+
+#: builtin/interpret-trailers.c:107
+msgid "join whitespace-continued values"
+msgstr "boşluk ile sürdürülen değerleri uç uca ekle"
+
+#: builtin/interpret-trailers.c:108
+msgid "set parsing options"
+msgstr "ayrıştırma seçeneklerini ayarla"
+
+#: builtin/interpret-trailers.c:110
+msgid "do not treat --- specially"
+msgstr "ayırma çizgilerine (---) özel davranma"
+
+#: builtin/interpret-trailers.c:112
+msgid "trailer(s) to add"
+msgstr "eklenecek artbilgi(ler)"
+
+#: builtin/interpret-trailers.c:123
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer ile --only-input bir anlam ifade etmiyor"
+
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
+msgstr "yerinde düzenleme için girdi dosyası verilmedi"
+
+#: builtin/log.c:59
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]"
+
+#: builtin/log.c:60
+msgid "git show [<options>] <object>..."
+msgstr "git show [<seçenekler>] <nesne>..."
+
+#: builtin/log.c:113
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "geçersiz --decorate seçeneği: %s"
+
+#: builtin/log.c:180
+msgid "show source"
+msgstr "kaynağı göster"
+
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "posta eşlem dosyasını kullan"
+
+#: builtin/log.c:184
+msgid "only decorate refs that match <pattern>"
+msgstr "yalnızca <dizgi> ile eşleşen başvuruları süsle"
+
+#: builtin/log.c:186
+msgid "do not decorate refs that match <pattern>"
+msgstr "<dizgi> ile eşleşen başvuruları süsleme"
+
+#: builtin/log.c:187
+msgid "decorate options"
+msgstr "süsleme seçenekleri"
+
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"<dosya> içindeki <başlangıç>,<bitiş> satır eriminin veya :<işlevadı> "
+"iÅŸlevinin evrimini izle"
+
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<erim>:<dosya>, yol belirteci ile kullanılamıyor"
+
+#: builtin/log.c:306
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "Son çıktı: %d %s\n"
+
+#: builtin/log.c:571
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: hatalı dosya"
+
+#: builtin/log.c:586 builtin/log.c:676
+#, c-format
+msgid "could not read object %s"
+msgstr "%s nesnesi okunamadı"
+
+#: builtin/log.c:701
+#, c-format
+msgid "unknown type: %d"
+msgstr "bilinmeyen tür: %d"
+
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: açıklama kipinden geçersiz kapak sayfası"
+
+#: builtin/log.c:853
+msgid "format.headers without value"
+msgstr "format.headers deÄŸere iye deÄŸil"
+
+#: builtin/log.c:982
+#, c-format
+msgid "cannot open patch file %s"
+msgstr "%s yama dosyası okunamıyor"
+
+#: builtin/log.c:999
+msgid "need exactly one range"
+msgstr "bir tam erim gerekiyor"
+
+#: builtin/log.c:1009
+msgid "not a range"
+msgstr "bir erim deÄŸil"
+
+#: builtin/log.c:1173
+msgid "cover letter needs email format"
+msgstr "ön yazı için e-posta biçimi gerekli"
+
+#: builtin/log.c:1179
+msgid "failed to create cover-letter file"
+msgstr "cover-letter dosyası oluşturulamadı"
+
+#: builtin/log.c:1266
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "akıl almaz in-reply-to: %s"
+
+#: builtin/log.c:1293
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<seçenekler>] [<-beri> | <revizyon-erimi>]"
+
+#: builtin/log.c:1351
+msgid "two output directories?"
+msgstr "iki çıktı dizini?"
+
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#, c-format
+msgid "unknown commit %s"
+msgstr "bilinmeyen iÅŸleme %s"
+
+#: 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 "'%s' geçerli bir başvuru olarak çözülemedi"
+
+#: builtin/log.c:1522
+msgid "could not find exact merge base"
+msgstr "kesin birleştirme temeli bulunamadı"
+
+#: 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"
+"Or you could specify base commit by --base=<base-commit-id> manually"
+msgstr ""
+"Üstkaynak alınamadı; taban işlemesinin kaydını kendiliğinden yazmak\n"
+"istiyorsanız lütfen git branch --set-upstream-to kullanarak bir uzak dalı\n"
+"izleyin. Bunun dışında taban işlemesini kendiniz --base=<taban-işlemesi-no>\n"
+"kullanarak el ile belirtebilirsiniz."
+
+#: builtin/log.c:1555
+msgid "failed to find exact merge base"
+msgstr "kesin birleştirme temeli bulunamadı"
+
+#: builtin/log.c:1572
+msgid "base commit should be the ancestor of revision list"
+msgstr "taban işlemesi revizyon listesinin atası olmalı"
+
+#: builtin/log.c:1582
+msgid "base commit shouldn't be in revision list"
+msgstr "taban işlemesi revizyon listesinde olmamalı"
+
+#: builtin/log.c:1640
+msgid "cannot get patch id"
+msgstr "yama numarası alınamıyor"
+
+#: builtin/log.c:1703
+msgid "failed to infer range-diff origin of current series"
+msgstr "geçerli dizinin range-diff kökeninden bir anlam çıkartılamadı"
+
+#: builtin/log.c:1705
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "geçerli dizinin range-diff kökeni olarak '%s' kullanılıyor"
+
+#: builtin/log.c:1749
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "bir yamayla bile olsa [PATCH n/m] kullan"
+
+#: builtin/log.c:1752
+msgid "use [PATCH] even with multiple patches"
+msgstr "birden çok yama bile olsa [PATCH] kullan"
+
+#: builtin/log.c:1756
+msgid "print patches to standard out"
+msgstr "yamaları standart çıktıya yazdır"
+
+#: builtin/log.c:1758
+msgid "generate a cover letter"
+msgstr "bir ön yazı oluştur"
+
+#: builtin/log.c:1760
+msgid "use simple number sequence for output file names"
+msgstr "çıktı dosya adları için yalın sayı dizisi oluştur"
+
+#: builtin/log.c:1761
+msgid "sfx"
+msgstr "sonek"
+
+#: builtin/log.c:1762
+msgid "use <sfx> instead of '.patch'"
+msgstr "'.patch' yerine <sonek> kullan"
+
+#: builtin/log.c:1764
+msgid "start numbering patches at <n> instead of 1"
+msgstr "yamaları 1 yerine <n>'de numaralandırmaya başla"
+
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "reroll-count"
+
+#: builtin/log.c:1766
+msgid "mark the series as Nth re-roll"
+msgstr "diziyi n. deneme olarak imle"
+
+#: builtin/log.c:1768
+msgid "max length of output filename"
+msgstr "çıktı dosya adının olabilecek en çok uzunluğu"
+
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "[PATCH] yerine [RFC PATCH] kullan"
+
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr "açıklama kipinden kapak sayfası kipi"
+
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "ön yazının bazı kısımlarını dalın açıklamasından oluştur"
+
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "[PATCH] yerine [<önek>] kullan"
+
+#: builtin/log.c:1779
+msgid "store resulting files in <dir>"
+msgstr "ortaya çıkan dosyaları <dizin>'de depola"
+
+#: builtin/log.c:1782
+msgid "don't strip/add [PATCH]"
+msgstr "[PATCH]'i soyma/ekleme"
+
+#: builtin/log.c:1785
+msgid "don't output binary diffs"
+msgstr "ikili diff'leri çıktı verme"
+
+#: builtin/log.c:1787
+msgid "output all-zero hash in From header"
+msgstr "From başlığında tümü sıfırdan oluşan sağlama çıktısı ver"
+
+#: builtin/log.c:1789
+msgid "don't include a patch matching a commit upstream"
+msgstr "üstkaynaktaki bir işleme ile eşleşen bir yamayı içerme"
+
+#: builtin/log.c:1791
+msgid "show patch format instead of default (patch + stat)"
+msgstr "öntanımlı yerine yama biçimini göster (patch + stat)"
+
+#: builtin/log.c:1793
+msgid "Messaging"
+msgstr "Ä°letileÅŸme"
+
+#: builtin/log.c:1794
+msgid "header"
+msgstr "üstbilgi"
+
+#: builtin/log.c:1795
+msgid "add email header"
+msgstr "e-posta üstbilgisi ekle"
+
+#: builtin/log.c:1796 builtin/log.c:1797
+msgid "email"
+msgstr "e-posta"
+
+#: builtin/log.c:1796
+msgid "add To: header"
+msgstr "To: üstbilgisi ekle"
+
+#: builtin/log.c:1797
+msgid "add Cc: header"
+msgstr "Cc: üstbilgisi ekle"
+
+#: builtin/log.c:1798
+msgid "ident"
+msgstr "tanımlayıcı"
+
+#: builtin/log.c:1799
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+"From adresini <tanımlayıcı> olarak ayarla (veya yoksa işleyici tanımlayıcısı)"
+
+#: builtin/log.c:1801
+msgid "message-id"
+msgstr "ileti no"
+
+#: builtin/log.c:1802
+msgid "make first mail a reply to <message-id>"
+msgstr "ilk postayı <ileti no>'ya bir yanıt yap"
+
+#: builtin/log.c:1803 builtin/log.c:1806
+msgid "boundary"
+msgstr "sınır"
+
+#: builtin/log.c:1804
+msgid "attach the patch"
+msgstr "yamayı ekle"
+
+#: builtin/log.c:1807
+msgid "inline the patch"
+msgstr "yamayı iletiye koy"
+
+#: builtin/log.c:1811
+msgid "enable message threading, styles: shallow, deep"
+msgstr "iletileri kataloglamayı etkinleştir, stiller: shallow, deep"
+
+#: builtin/log.c:1813
+msgid "signature"
+msgstr "imza"
+
+#: builtin/log.c:1814
+msgid "add a signature"
+msgstr "imza ekle"
+
+#: builtin/log.c:1815
+msgid "base-commit"
+msgstr "taban iÅŸleme"
+
+#: builtin/log.c:1816
+msgid "add prerequisite tree info to the patch series"
+msgstr "yama dizisine önkoşul ağaç bilgisini ekle"
+
+#: builtin/log.c:1819
+msgid "add a signature from a file"
+msgstr "dosyadan bir imza ekle"
+
+#: builtin/log.c:1820
+msgid "don't print the patch filenames"
+msgstr "yama dosya adlarını yazdırma"
+
+#: builtin/log.c:1822
+msgid "show progress while generating patches"
+msgstr "yamalar oluşturulurken ilerlemeyi göster"
+
+#: builtin/log.c:1824
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr "<rev> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
+
+#: builtin/log.c:1827
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr ""
+"<bşvr-blrtç> karşısındaki değişiklikleri ön yazıda veya tek bir yamada göster"
+
+#: builtin/log.c:1829 builtin/range-diff.c:28
+msgid "percentage by which creation is weighted"
+msgstr "oluşumun tartıldığı yüzde"
+
+#: builtin/log.c:1916
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "geçersiz tanımlayıcı satırı: %s"
+
+#: builtin/log.c:1931
+msgid "-n and -k are mutually exclusive"
+msgstr "-n ve -k birlikte kullanılamaz"
+
+#: builtin/log.c:1933
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr "--subject-prefix/--rfc ve -k birlikte kullanılamaz"
+
+#: builtin/log.c:1941
+msgid "--name-only does not make sense"
+msgstr "--name-only bir anlam ifade etmiyor"
+
+#: builtin/log.c:1943
+msgid "--name-status does not make sense"
+msgstr "--name-status bir anlam ifade etmiyor"
+
+#: builtin/log.c:1945
+msgid "--check does not make sense"
+msgstr "--check bir anlam ifade etmiyor"
+
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout, --output ve --output-directory  birlikte kullanılamaz"
+
+#: builtin/log.c:2089
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff, --cover-letter veya tek yama gerektiriyor"
+
+#: builtin/log.c:2093
+msgid "Interdiff:"
+msgstr "Interdiff:"
+
+#: builtin/log.c:2094
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr "Interdiff v%d karşısında:"
+
+#: builtin/log.c:2100
+msgid "--creation-factor requires --range-diff"
+msgstr "--creation-factor, --range-diff gerektiriyor"
+
+#: builtin/log.c:2104
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff, --cover-letter veya tek yama gerektiriyor"
+
+#: builtin/log.c:2112
+msgid "Range-diff:"
+msgstr "Range-diff:"
+
+#: builtin/log.c:2113
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr "Range-diff v%d karşısında:"
+
+#: builtin/log.c:2124
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "'%s' imza dosyası okunamıyor"
+
+#: builtin/log.c:2160
+msgid "Generating patches"
+msgstr "Yamalar oluÅŸturuluyor"
+
+#: builtin/log.c:2204
+msgid "failed to create output files"
+msgstr "çıktı dosyaları oluşturulamadı"
+
+#: builtin/log.c:2263
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<üstkaynak> [<dal-ucu> [<sınır>]]]"
+
+#: builtin/log.c:2317
+#, 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
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<seçenekler>] [<dosya>...]"
+
+#: builtin/ls-files.c:619
+msgid "identify the file status with tags"
+msgstr "dosya durumunu etiketlerle tanımla"
+
+#: builtin/ls-files.c:621
+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
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "'fsmonitor clean' dosyalarını küçük harflerle göster"
+
+#: builtin/ls-files.c:625
+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
+msgid "show deleted files in the output"
+msgstr "silinen dosyaları çıktıda göster"
+
+#: builtin/ls-files.c:629
+msgid "show modified files in the output"
+msgstr "değiştirilen dosyaları çıktıda göster"
+
+#: builtin/ls-files.c:631
+msgid "show other files in the output"
+msgstr "diğer dosyaları çıktıda göster"
+
+#: builtin/ls-files.c:633
+msgid "show ignored files in the output"
+msgstr "yok sayılan dosyaları çıktıda göster"
+
+#: builtin/ls-files.c:636
+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
+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
+msgid "show 'other' directories' names only"
+msgstr "'diğer' dizinlerin yalnızca adını göster"
+
+#: builtin/ls-files.c:642
+msgid "show line endings of files"
+msgstr "dosyaların satır sonlarını göster"
+
+#: builtin/ls-files.c:644
+msgid "don't show empty directories"
+msgstr "boş dizinleri gösterme"
+
+#: builtin/ls-files.c:647
+msgid "show unmerged files in the output"
+msgstr "birleştirilmemiş dosyaları çıktıda göster"
+
+#: builtin/ls-files.c:649
+msgid "show resolve-undo information"
+msgstr "'resolve-undo' bilgisini göster"
+
+#: builtin/ls-files.c:651
+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:657
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "ek dizin başı hariç tutma dizgilerini <dosya>'dan oku"
+
+#: builtin/ls-files.c:659
+msgid "add the standard git exclusions"
+msgstr "standart git hariç tutmalarını ekle"
+
+#: builtin/ls-files.c:663
+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
+msgid "recurse through submodules"
+msgstr "altmodüller içinden özyinele"
+
+#: builtin/ls-files.c:668
+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
+msgid "tree-ish"
+msgstr "ağacımsı"
+
+#: builtin/ls-files.c:670
+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
+msgid "show debugging data"
+msgstr "hata ayıklama verisini göster"
+
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+msgstr "yinelenen girdileri sustur"
+
+#: 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>...]]"
+msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\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
+msgid "exec"
+msgstr "çalıştır"
+
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
+msgid "path of git-upload-pack on the remote host"
+msgstr "uzak konum makinesindeki git-upload-pack yolu"
+
+#: builtin/ls-remote.c:66
+msgid "limit to tags"
+msgstr "etiketlere kısıtla"
+
+#: builtin/ls-remote.c:67
+msgid "limit to heads"
+msgstr "uç işlemelere kısıtla"
+
+#: builtin/ls-remote.c:68
+msgid "do not show peeled tags"
+msgstr "soyulmuş etiketleri gösterme"
+
+#: builtin/ls-remote.c:70
+msgid "take url.<base>.insteadOf into account"
+msgstr "url.<temel>.insteadOf'u dikkate al"
+
+#: builtin/ls-remote.c:73
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "eşleşen başvuru bulunamazsa 2 numaralı çıkış koduyla çık"
+
+#: builtin/ls-remote.c:76
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "işaret ettiği nesneye ek olarak altında yatan başvuruyu göster"
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<seçenekler>] <ağacımsı> [<yol>...]"
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr "yalnızca ağaçları göster"
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr "altağaçlara özyinele"
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr "özyinelerken ağaçları göster"
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr "girdileri NUL baytı ile sonlandır"
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr "nesne boyutunu içer"
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr "yalnızca dosya adlarını listele"
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr "tam yol adlarını kullan"
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr "yalnızca geçerli dizini değil tüm ağacı listele (--full-name ima eder)"
+
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<seçenekler>] <ileti> <yama> < mail >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "konuyu tut"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr "yama olmayan ayraçları konuda tut"
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr "Message-ID'yi iÅŸleme iletisinin sonuna kopyala"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "üstveriyi i18n.commitEncoding olarak yeniden kodla"
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr "üstverinin karakter seti yeniden kodlamasını devre dışı bırak"
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr "kodlama"
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr "üstveriyi bu kodlama olacak biçimde yeniden kodla"
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr "makas kullan"
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr "<eylem>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "alıntılanmış CR bulunduğu zaman yapılacak eylem"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "ileti gövdesinde üstbilgi kullan"
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "boÅŸ mbox: '%s'"
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <iÅŸleme> <iÅŸleme>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <iÅŸleme>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <iÅŸleme>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <iÅŸleme> <iÅŸleme>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <baÅŸvuru> [<iÅŸleme>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "tüm ortak ataları çıktı ver"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "tek bir n yönlü birleştirme için ataları bul"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "başkaları tarafından ulaşılabilir revizyonları listele"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "ilki diğerlerinin atası mı?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "<işleme>'nin nerede <başvuru>'nun günlüğünden çatallandığını bul"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<seçenekler>] [-L <ad1> [-L <orij> [-L <ad2>]]] <dosya1> "
+"<orij-dosya> <dosya2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "sonuçları standart çıktıya gönder"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "diff3 tabanlı birleştirme kullan"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "çakışmalarda bizim sürümü kullan"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "çakışmalarda onların sürümünü kullan"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "çakışmalarda birlik olmuş bir sürüm kullan"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "çakışmalarda bu imleyici boyutunu kullan"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "çakışmalar hakkında uyarma"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "file1/orig-file/file2 için etiketler yapıştır"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "bilinmeyen seçenek %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "'%s' nesnesi ayrıştırılamadı"
+
+#: 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] "%d tabandan fazlası ele alınamıyor. %s yok sayılıyor."
+msgstr[1] "%d tabandan fazlası ele alınamıyor. %s yok sayılıyor."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "iki dal ucu birleÅŸtirmesinden baÅŸka bir ÅŸey iÅŸlenmiyor"
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "'%s' başvurusu çözülemedi"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "%s, %s ile birleÅŸtiriliyor\n"
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<seçenekler>] [<işleme>...]"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "'m' anahtarı bir değer gerektiriyor"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "'%s' seçeneği bir değer gerektiriyor"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "Birleştirme stratejisi '%s' bulunamadı.\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "Kullanılabilir stratejiler:"
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Kullanılabilir özel stratejiler:"
+
+#: builtin/merge.c:256 builtin/pull.c:133
+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
+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
+msgid "(synonym to --stat)"
+msgstr "(--stat eşanlamlısı)"
+
+#: builtin/merge.c:262 builtin/pull.c:142
+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
+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
+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
+msgid "edit message before committing"
+msgstr "göndermeden önce iletiyi düzenle"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "ileri sarıma izin ver (öntanımlı)"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+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
+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
+msgid "strategy"
+msgstr "strateji"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "kullanılacak birleştirme stratejisi"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "seçenek=değer"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "seçili birleştirme stratejisi için seçenekler"
+
+#: builtin/merge.c:283
+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
+msgid "abort the current in-progress merge"
+msgstr "ilerlemekte olan geçerli birleştirmeyi iptal et"
+
+#: builtin/merge.c:292
+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
+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
+msgid "allow merging unrelated histories"
+msgstr "birbiriyle ilişkisi olmayan geçmişlerin birleştirilmesine izin ver"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "pre-merge-commit ve commit-msg kancalarını atla"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "zula yapılamadı"
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "zulalama başarısız oldu"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "geçerli bir nesne değil: %s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "read-tree başarısız oldu"
+
+#: builtin/merge.c:400
+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
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Tıkıştırma işlemesi -- HEAD güncellenmiyor\n"
+
+#: builtin/merge.c:464
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "Birleştirme iletisi yok -- HEAD güncellenmiyor\n"
+
+#: builtin/merge.c:515
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' bir iÅŸlemeye iÅŸaret etmiyor"
+
+#: builtin/merge.c:603
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Hatalı branch.%s.mergeoptions dizisi: %s"
+
+#: builtin/merge.c:729
+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:742
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive için geçersiz seçenek: -X%s"
+
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#, c-format
+msgid "unable to write %s"
+msgstr "%s yazılamıyor"
+
+#: builtin/merge.c:813
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "Şu konumdan okunamadı: '%s'"
+
+#: builtin/merge.c:822
+#, 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: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"
+"\n"
+msgstr ""
+"Bu birleştirmenin neden gerekli olduğunu açıklamak için bir işleme iletisi\n"
+"girin, özellikle güncellenmiş bir üstkaynağı kişisel dala birleştiriyorsa.\n"
+"\n"
+
+#: builtin/merge.c:833
+msgid "An empty message aborts the commit.\n"
+msgstr "BoÅŸ bir ileti iÅŸlemeyi iptal eder.\n"
+
+#: builtin/merge.c:836
+#, c-format
+msgid ""
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"'%c' ile başlayan satırlar yok sayılacaktır. Boş bir ileti işlemeyi\n"
+"iptal eder.\n"
+
+#: builtin/merge.c:889
+msgid "Empty commit message."
+msgstr "BoÅŸ iÅŸleme iletisi."
+
+#: builtin/merge.c:904
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Harika.\n"
+
+#: builtin/merge.c:965
+#, 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:1004
+msgid "No current branch."
+msgstr "Geçerli dal yok."
+
+#: builtin/merge.c:1006
+msgid "No remote for the current branch."
+msgstr "Geçerli dal için uzak konum yok."
+
+#: builtin/merge.c:1008
+msgid "No default upstream defined for the current branch."
+msgstr "Geçerli dal için öntanımlı üstkaynak tanımlanmamış."
+
+#: builtin/merge.c:1013
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "%s için %s konumundan uzak izleme dalı yok"
+
+#: builtin/merge.c:1070
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Hatalı değer '%s', '%s' ortamında"
+
+#: builtin/merge.c:1173
+#, 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:1207
+msgid "not something we can merge"
+msgstr "birleÅŸtirebileceÄŸimiz bir ÅŸey deÄŸil"
+
+#: builtin/merge.c:1317
+msgid "--abort expects no arguments"
+msgstr "--abort bir argüman beklemez"
+
+#: builtin/merge.c:1321
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "Ä°ptal edilecek bir birleÅŸtirme yok (MERGE_HEAD eksik)."
+
+#: builtin/merge.c:1339
+msgid "--quit expects no arguments"
+msgstr "--quit bir argüman beklemez"
+
+#: builtin/merge.c:1352
+msgid "--continue expects no arguments"
+msgstr "--continue bir argüman beklemez"
+
+#: builtin/merge.c:1356
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "Ä°lerlemekte olan bir birleÅŸtirme yok (MERGE_HEAD eksik)."
+
+#: builtin/merge.c:1372
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1379
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+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:1382
+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:1396
+msgid "You cannot combine --squash with --no-ff."
+msgstr "--squash ile --no-ff birlikte kullanılamaz."
+
+#: builtin/merge.c:1398
+msgid "You cannot combine --squash with --commit."
+msgstr "--squash ile --commit birlikte kullanılamaz."
+
+#: builtin/merge.c:1414
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "Belirtilen bir işleme yok ve merge.defaultToUpstream ayarlanmamış."
+
+#: builtin/merge.c:1431
+msgid "Squash commit into empty head not supported yet"
+msgstr "İşlemeyi boş dal ucuna tıkıştırma henüz desteklenmiyor"
+
+#: builtin/merge.c:1433
+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:1438
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - birleÅŸtirebileceÄŸimiz bir ÅŸey deÄŸil"
+
+#: builtin/merge.c:1440
+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:1521
+msgid "refusing to merge unrelated histories"
+msgstr "birbiriyle ilişkisi olmayan geçmişleri birleştirme reddediliyor"
+
+#: builtin/merge.c:1540
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Güncelleniyor: %s..%s\n"
+
+#: builtin/merge.c:1587
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Gerçekten önemsiz indeks içi birleştirme deneniyor...\n"
+
+#: builtin/merge.c:1594
+#, c-format
+msgid "Nope.\n"
+msgstr "Yok.\n"
+
+#: builtin/merge.c:1625
+msgid "Not possible to fast-forward, aborting."
+msgstr "İleri sarma olanaklı değil, iptal ediliyor."
+
+#: builtin/merge.c:1653 builtin/merge.c:1719
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Ağaç bozulmamış durumuna geri sarılıyor...\n"
+
+#: builtin/merge.c:1657
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "%s birleÅŸtirme stratejisi deneniyor...\n"
+
+#: builtin/merge.c:1709
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Birleştirmeyi hiçbir birleştirme stratejisi işlemedi\n"
+
+#: builtin/merge.c:1711
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "%s stratejisi ile birleştirme başarısız oldu.\n"
+
+#: builtin/merge.c:1721
+#, c-format
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "El ile çözümü hazırlamak için %s stratejisi kullanılıyor.\n"
+
+#: builtin/merge.c:1735
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Otomatik birleştirme iyi geçti; istendiği üzere gönderme öncesinde durdu.\n"
+
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "uyarı: etiket girdisi fsck'den geçemiyor: %s"
+
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "hata: etiket girdisi fsck'den geçemiyor: %s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) hiçbir zaman bu geri çağırmayı tetiklememeli"
+
+#: builtin/mktag.c:56
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "etiketlenmiş nesne '%s' okunamadı"
+
+#: builtin/mktag.c:59
+#, c-format
+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
+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
+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
+msgid "unable to write tag file"
+msgstr "etiket dosyası yazılamıyor"
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr "girdi NUL ile sonlandırıldı"
+
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr "eksik nesnelere izin ver"
+
+#: builtin/mktree.c:156
+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>]"
+
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<seçenekler>] verify"
+
+#: builtin/multi-pack-index.c:16
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<seçenekler>] expire"
+
+#: builtin/multi-pack-index.c:19
+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
+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
+msgid "preferred-pack"
+msgstr "preferred-pack"
+
+#: builtin/multi-pack-index.c:70
+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
+msgid ""
+"during repack, collect pack-files of smaller size into a batch that is "
+"larger than this size"
+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:179
+#, 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>"
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "%s dizini indekste ve altmodül değil mi?"
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"İlerlemek için lütfen değişikliklerinizi .gitmodules'e hazırlayın veya "
+"zulalayın"
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s indekste"
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "hedef var olsa bile zorla taşı/yeniden adlandır"
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr "taşı/yeniden adlandır hatalarını atla"
+
+#: builtin/mv.c:170
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "'%s' hedefi bir dizin deÄŸil"
+
+#: builtin/mv.c:181
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "'%s'->'%s' yeniden adlandırması denetleniyor\n"
+
+#: builtin/mv.c:185
+msgid "bad source"
+msgstr "hatalı kaynak"
+
+#: builtin/mv.c:188
+msgid "can not move directory into itself"
+msgstr "dizin kendi içine taşınamıyor"
+
+#: builtin/mv.c:191
+msgid "cannot move directory over file"
+msgstr "dizin dosya üzerinden taşınamıyor"
+
+#: builtin/mv.c:200
+msgid "source directory is empty"
+msgstr "kaynak dizin boÅŸ"
+
+#: builtin/mv.c:225
+msgid "not under version control"
+msgstr "sürüm denetimi altında değil"
+
+#: builtin/mv.c:227
+msgid "conflicted"
+msgstr "çakışmalı"
+
+#: builtin/mv.c:230
+msgid "destination exists"
+msgstr "hedef mevcut"
+
+#: builtin/mv.c:238
+#, c-format
+msgid "overwriting '%s'"
+msgstr "üzerine yazılıyor: '%s'"
+
+#: builtin/mv.c:241
+msgid "Cannot overwrite"
+msgstr "Üzerine yazılamıyor"
+
+#: builtin/mv.c:244
+msgid "multiple sources for the same target"
+msgstr "aynı hedef için birden çok kaynak"
+
+#: builtin/mv.c:246
+msgid "destination directory does not exist"
+msgstr "hedef dizin mevcut deÄŸil"
+
+#: builtin/mv.c:253
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, kaynak=%s, hedef:%s"
+
+#: builtin/mv.c:274
+#, 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
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "'%s' yeniden adlandırılamadı"
+
+#: builtin/name-rev.c:465
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<seçenekler>] <işleme>..."
+
+#: builtin/name-rev.c:466
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<seçenekler>] --all"
+
+#: builtin/name-rev.c:467
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<seçenekler>] --stdin"
+
+#: builtin/name-rev.c:524
+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
+msgid "only use tags to name the commits"
+msgstr "işlemeleri adlandırmak için yalnızca etiketleri kullan"
+
+#: builtin/name-rev.c:527
+msgid "only use refs matching <pattern>"
+msgstr "yalnızca <dizgi> ile eşleşen başvuruları kullan"
+
+#: builtin/name-rev.c:529
+msgid "ignore refs matching <pattern>"
+msgstr "<dizgi> ile eşleşen başvuruları yok say"
+
+#: builtin/name-rev.c:531
+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
+msgid "read from stdin"
+msgstr "stdin'den oku"
+
+#: builtin/name-rev.c:533
+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
+msgid "dereference tags in the input (internal use)"
+msgstr "girdide etiketlerin başvurularını kaldır (iç kullanım)"
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <not-bÅŸvr>] [list [<nesne>]]"
+
+#: 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 <not-bÅŸvr>] add [-f] [--allow-empty] [-m <ileti> | -F "
+"<dosya> | (-c | -C) <nesne>] [<nesne>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <not-bÅŸvr>] copy [-f] <nesneden> <nesneye>"
+
+#: 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 <not-bÅŸvr>] append [--allow-empty] [-m <ileti> | -F <dosya> "
+"| (-c | -C) <nesne>] [<nesne>]"
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <not-bÅŸvr>] edit [--allow-empty] [<nesne>]"
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <not-bÅŸvr>] show [<nesne>]"
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <not-bÅŸvr>] merge [-v | -q] [-s <strateji>] <not-bÅŸvr>"
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <not-bÅŸvr>] remove [<nesne>...]"
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <not-bÅŸvr>] prune [-n] [-v]"
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <not-bÅŸvr>] get-ref"
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<nesne>]]"
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<seçenekler>] [<nesne>]"
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<seçenekler>] <nesneden> <nesneye>"
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<nesneden> <nesneye>]..."
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<seçenekler>] [<nesne>]"
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<nesne>]"
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr "git notes show [<nesne>]"
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<seçenekler>] <not-bşvr>"
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<seçenekler>]"
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<seçenekler>]"
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<nesne>]"
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<seçenekler>]"
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr "Aşağıdaki nesneler için not yaz/düzenle:"
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "'%s' nesnesi için 'show' başlatılamıyor"
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr "'show' çıktısı okunamadı"
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "'%s' nesnesi için 'show' bitirilemedi"
+
+#: builtin/notes.c:197
+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
+msgid "unable to write note object"
+msgstr "not nesnesi yazılamıyor"
+
+#: builtin/notes.c:208
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "'%s' nesnesi okunamadı."
+
+#: builtin/notes.c:268
+#, 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
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "hatalı oluşturulmuş girdi satırı: '%s'"
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+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
+#, 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
+msgid "too many arguments"
+msgstr "çok fazla argüman"
+
+#: builtin/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
+msgstr "%s nesnesi için not bulunamadı."
+
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr "not içeriği dizi olarak"
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr "not içeriği bir dosyada"
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr "belirtilen not nesnesini düzenle ve yeniden kullan"
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr "belirtilen not nesnesini yeniden kullan"
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr "boş not depolamasına izin ver"
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr "var olan notları başkalarıyla değiştir"
+
+#: builtin/notes.c:448
+#, c-format
+msgid ""
+"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+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
+#, 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
+#, 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
+msgid "read objects from stdin"
+msgstr "nesneleri stdin'den oku"
+
+#: builtin/notes.c:499
+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
+msgid "too few arguments"
+msgstr "pek az argüman"
+
+#: builtin/notes.c:538
+#, c-format
+msgid ""
+"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
+"existing notes"
+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
+#, 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
+#, 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 ""
+"'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
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "NOTES_MERGE_PARTIAL baÅŸvurusu silinemedi"
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "NOTES_MERGE_REF baÅŸvurusu silinemedi"
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "'git remove merge' çalışma ağacı kaldırılamadı"
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "NOTES_MERGE_PARTIAL başvurusu okunamadı"
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden bulunamadı."
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "işleme, NOTES_MERGE_PARTIAL ögesinden ayrıştırılamadı"
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "NOTES_MERGE_REF çözülemedi"
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr "not birleştirilmesi tamamlanamadı"
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "bilinmeyen not birleÅŸtirme stratejisi %s"
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr "Genel seçenekler"
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr "Birleştirme seçenekleri"
+
+#: builtin/notes.c:788
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"not çakışmalarını verilen stratejiyi kullanarak çöz (el ile/bizimkionlarınki/"
+"birlik olmuÅŸ/cat_sort_uniq)"
+
+#: builtin/notes.c:790
+msgid "Committing unmerged notes"
+msgstr "BirleÅŸtirilmemiÅŸ notlar iÅŸleniyor"
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "birleştirilmemiş notları işleyerek not birleştirmesini tamamla"
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr "Notlar birleştirmesi çözümü iptal ediliyor"
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr "not birleÅŸtirmesini iptal et"
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "--commit, --abort veya -s/--strategy karıştırılamıyor"
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr "birleştirmek için bir not başvurusu belirtilmeli"
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "bilinmeyen -s/--strategy: %s"
+
+#: builtin/notes.c:873
+#, 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
+#, 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
+#, 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 ""
+"Kendiliğinden not birleştirmesi başarısız oldu. %s içindeki çakışmaları "
+"çö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
+#, 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
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "%s nesnesinin notu yok\n"
+
+#: builtin/notes.c:912
+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
+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:146
+msgid "do not remove, show only"
+msgstr "kaldırma, yalnızca göster"
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr "budanmış notları kaldır"
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr "not baÅŸvurusu"
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr "notları <not-bşvr>'ndan kullan"
+
+#: builtin/notes.c:1034 builtin/stash.c:1735
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr "bilinmeyen altkomut: %s"
+
+#: 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: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:572
+#, c-format
+msgid ""
+"write_reuse_object: could not locate %s, expected at offset %<PRIuMAX> in "
+"pack %s"
+msgstr ""
+"write_reuse_object: %s bulunamıyor, %<PRIuMAX> ofsetinde bekleniyordu (%s "
+"paketinde)"
+
+#: 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:591
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr "%s için hasar görmüş paketlenmiş nesne"
+
+#: 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:941
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "%u nesne sipariÅŸ verildi, %<PRIu32> bekleniyordu"
+
+#: 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:1155
+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:1168
+msgid "Writing objects"
+msgstr "Nesneler yazılıyor"
+
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#, c-format
+msgid "failed to stat %s"
+msgstr "%s bilgileri alınamıyor"
+
+#: builtin/pack-objects.c:1281
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "%<PRIu32> nesne yazıldı (%<PRIu32> bekleniyordu)"
+
+#: builtin/pack-objects.c:1523
+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:1971
+#, 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:1980
+#, 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:2261
+msgid "Counting objects"
+msgstr "Nesneler sayılıyor"
+
+#: builtin/pack-objects.c:2426
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "%s nesne üstbilgisi ayrıştırılamıyor"
+
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
+#, c-format
+msgid "object %s cannot be read"
+msgstr "%s nesnesi okunamıyor"
+
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#, 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:2536
+msgid "suboptimal pack - out of memory"
+msgstr "standart altı paket - bellek yetersiz"
+
+#: builtin/pack-objects.c:2851
+#, 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:2990
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr "%s etiketinden ulaşılabilir nesneler paketlenemiyor"
+
+#: builtin/pack-objects.c:3076
+msgid "Compressing objects"
+msgstr "Nesneler sıkıştırılıyor"
+
+#: builtin/pack-objects.c:3082
+msgid "inconsistency with delta count"
+msgstr "delta sayımında tutarsızlık"
+
+#: 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 ""
+"uploadpack.blobpackfileuri değeri '<nesne-sağlaması> <paket-sağlaması> <uri> "
+"biçiminde olmalıdır ('%s' alındı)"
+
+#: builtin/pack-objects.c:3164
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"nesne halihazırda başka bir uploadpack.blobpackfileuri içinde yapılandırıldı "
+"('%s' alındı)"
+
+#: builtin/pack-objects.c:3199
+#, 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:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "'%s' paketi bulunamadı"
+
+#: builtin/pack-objects.c:3378
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+"sınır nesnesi numarası bekleniyordu, anlamsız veri alındı:\n"
+" %s"
+
+#: builtin/pack-objects.c:3384
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"nesne numarası bekleniyordu, anlamsız veri alındı:\n"
+"%s"
+
+#: builtin/pack-objects.c:3482
+msgid "invalid value for --missing"
+msgstr "--missing için geçersiz değer"
+
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+msgid "cannot open pack index"
+msgstr "paket indeksi açılamıyor"
+
+#: builtin/pack-objects.c:3572
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr "%s konumundaki gevÅŸek nesne incelenemedi"
+
+#: builtin/pack-objects.c:3658
+msgid "unable to force loose object"
+msgstr "gevşek nesne zorlanamıyor"
+
+#: builtin/pack-objects.c:3788
+#, c-format
+msgid "not a rev '%s'"
+msgstr "bir revizyon deÄŸil: '%s'"
+
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#, c-format
+msgid "bad revision '%s'"
+msgstr "hatalı revizyon: '%s'"
+
+#: builtin/pack-objects.c:3819
+msgid "unable to add recent objects"
+msgstr "en son nesneler eklenemiyor"
+
+#: builtin/pack-objects.c:3872
+#, c-format
+msgid "unsupported index version %s"
+msgstr "desteklenmeyen indeks sürümü %s"
+
+#: builtin/pack-objects.c:3876
+#, c-format
+msgid "bad index version '%s'"
+msgstr "hatalı indeks sürümü '%s'"
+
+#: builtin/pack-objects.c:3915
+msgid "<version>[,<offset>]"
+msgstr "<sürüm>[,<ofset>]"
+
+#: builtin/pack-objects.c:3916
+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:3919
+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:3921
+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:3923
+msgid "ignore packed objects"
+msgstr "paketlenmiÅŸ nesneleri yok say"
+
+#: builtin/pack-objects.c:3925
+msgid "limit pack window by objects"
+msgstr "paket penceresini nesnelerle sınırla"
+
+#: builtin/pack-objects.c:3927
+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:3929
+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:3931
+msgid "reuse existing deltas"
+msgstr "var olan deltaları yeniden kullan"
+
+#: builtin/pack-objects.c:3933
+msgid "reuse existing objects"
+msgstr "var olan nesneleri yeniden kullan"
+
+#: builtin/pack-objects.c:3935
+msgid "use OFS_DELTA objects"
+msgstr "OFS_DELTA nesneleri kullan"
+
+#: builtin/pack-objects.c:3937
+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:3939
+msgid "do not create an empty pack output"
+msgstr "boş bir paket çıktısı oluşturma"
+
+#: builtin/pack-objects.c:3941
+msgid "read revision arguments from standard input"
+msgstr "revizyon argümanlarını standart girdi'den oku"
+
+#: builtin/pack-objects.c:3943
+msgid "limit the objects to those that are not yet packed"
+msgstr "nesneleri henüz paketlenmeyenlere kısıtla"
+
+#: builtin/pack-objects.c:3946
+msgid "include objects reachable from any reference"
+msgstr "herhangi bir başvurudan ulaşılabilir olan nesneleri içer"
+
+#: builtin/pack-objects.c:3949
+msgid "include objects referred by reflog entries"
+msgstr "başvuru günlüğü tarafından başvurulan nesneleri içer"
+
+#: builtin/pack-objects.c:3952
+msgid "include objects referred to by the index"
+msgstr "indeks tarafından başvurulan nesneleri içer"
+
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr "paketleri stdin'den oku"
+
+#: builtin/pack-objects.c:3957
+msgid "output pack to stdout"
+msgstr "paketi stdout'a çıktı ver"
+
+#: builtin/pack-objects.c:3959
+msgid "include tag objects that refer to objects to be packed"
+msgstr "paketlenecek nesnelere başvuran etiket nesnelerini içer"
+
+#: builtin/pack-objects.c:3961
+msgid "keep unreachable objects"
+msgstr "ulaşılamayan nesneleri tut"
+
+#: builtin/pack-objects.c:3963
+msgid "pack loose unreachable objects"
+msgstr "ulaşılamayan gevşek nesneleri paketle"
+
+#: builtin/pack-objects.c:3965
+msgid "unpack unreachable objects newer than <time>"
+msgstr "<zaman>'dan daha yeni ulaşılamayan nesneleri aç"
+
+#: builtin/pack-objects.c:3968
+msgid "use the sparse reachability algorithm"
+msgstr "aralıklı ulaşılabilirlik algoritmasını kullan"
+
+#: builtin/pack-objects.c:3970
+msgid "create thin packs"
+msgstr "ince paketler oluÅŸtur"
+
+#: builtin/pack-objects.c:3972
+msgid "create packs suitable for shallow fetches"
+msgstr "sığ getirmelere uygun paketler oluştur"
+
+#: builtin/pack-objects.c:3974
+msgid "ignore packs that have companion .keep file"
+msgstr "eşlik eden .keep dosyasına iye paketleri yok say"
+
+#: builtin/pack-objects.c:3976
+msgid "ignore this pack"
+msgstr "bu paketi yok say"
+
+#: builtin/pack-objects.c:3978
+msgid "pack compression level"
+msgstr "paket sıkıştırma düzeyi"
+
+#: builtin/pack-objects.c:3980
+msgid "do not hide commits by grafts"
+msgstr "aşılarla gelen işlemeleri gizleme"
+
+#: builtin/pack-objects.c:3982
+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:3984
+msgid "write a bitmap index together with the pack index"
+msgstr "paket indeksiyle birlikte bir biteÅŸlem indeksi de yaz"
+
+#: builtin/pack-objects.c:3988
+msgid "write a bitmap index if possible"
+msgstr "eğer olanaklıysa bir biteşlem indeksi yaz"
+
+#: builtin/pack-objects.c:3992
+msgid "handling for missing objects"
+msgstr "eksik nesneler için işlem"
+
+#: builtin/pack-objects.c:3995
+msgid "do not pack objects in promisor packfiles"
+msgstr "nesneleri vaatçi paket dosyalarıyla paketleme"
+
+#: builtin/pack-objects.c:3997
+msgid "respect islands during delta compression"
+msgstr "delta sıkıştırması sırasında adalara uy"
+
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr "protokol"
+
+#: builtin/pack-objects.c:4000
+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:4033
+#, 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:4038
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "pack.deltaCacheLimit çok yüksek, %d zorlanıyor"
+
+#: builtin/pack-objects.c:4094
+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:4096
+msgid "minimum pack size limit is 1 MiB"
+msgstr "olabilecek en küçük paket boyutu limiti 1 MiB'dır"
+
+#: builtin/pack-objects.c:4101
+msgid "--thin cannot be used to build an indexable pack"
+msgstr "--thin bir indekslenebilir paket yapımında kullanılamaz"
+
+#: builtin/pack-objects.c:4104
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr "--keep-unreachable ve --unpack-unreachable birbiriyle uyumsuz"
+
+#: builtin/pack-objects.c:4110
+msgid "cannot use --filter without --stdout"
+msgstr "--filter, --stdout olmadan kullanılamaz"
+
+#: builtin/pack-objects.c:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr "--filter, --stdin-packs ile birlikte kullanılamıyor"
+
+#: builtin/pack-objects.c:4116
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "iç revizyon listeleri, --stdin-packs ile birlikte kullanılamıyor"
+
+#: builtin/pack-objects.c:4175
+msgid "Enumerating objects"
+msgstr "Nesneler ortaya dökülüyor"
+
+#: builtin/pack-objects.c:4212
+#, c-format
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Toplam %<PRIu32> (delta %<PRIu32>), yeniden kullanılan %<PRIu32> (delta "
+"%<PRIu32>), yeniden kullanılan paket %<PRIu32>"
+
+#: 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 ""
+"'git pack-redundant' komutu kaldırma için aday\n"
+"gösterildi. Bu komutu hâlâ kullanıyorsanız lütfen\n"
+"komut satırında '--i-still-use-this' ek seçeneğini\n"
+"kullanın ve bunu hâlâ kullandığınızı\n"
+"<git@vger.kernel.org> adresine bir e-posta atarak\n"
+"bize haber verin. SaÄŸ olun.\n"
+
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<seçenekler>]"
+
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr "her ÅŸeyi paketle"
+
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr "gevşek başvuruları buda (öntanımlı)"
+
+#: 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
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr ""
+"git prune [-n] [-v] [--progress] [--expire <zaman>] [--] [<dal-ucu>...]"
+
+#: builtin/prune.c:133
+msgid "report pruned objects"
+msgstr "budanmış nesneleri bildir"
+
+#: builtin/prune.c:136
+msgid "expire objects older than <time>"
+msgstr "<zaman>'dan daha eski nesnelerin hükmünü kaldır"
+
+#: builtin/prune.c:138
+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
+msgid "cannot prune in a precious-objects repo"
+msgstr "bir precious-objects deposu içinde budama yapılamıyor"
+
+#: builtin/pull.c:45 builtin/pull.c:47
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "%s için geçersiz değer: %s"
+
+#: builtin/pull.c:67
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
+
+#: builtin/pull.c:123
+msgid "control for recursive fetching of submodules"
+msgstr "altmodüllerin özyineli getirilmesi için denetleme"
+
+#: builtin/pull.c:127
+msgid "Options related to merging"
+msgstr "Birleştirme ile ilgili seçenekler"
+
+#: builtin/pull.c:130
+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
+msgid "allow fast-forward"
+msgstr "ileri sarıma izin ver"
+
+#: builtin/pull.c:167 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
+msgid "Options related to fetching"
+msgstr "Getirme ile ilgili seçenekler"
+
+#: builtin/pull.c:193
+msgid "force overwrite of local branch"
+msgstr "zorla yerel dalın üzerine yaz"
+
+#: builtin/pull.c:201
+msgid "number of submodules pulled in parallel"
+msgstr "paralelde çekilen altmodüllerin sayısı"
+
+#: builtin/pull.c:317
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "pull.ff için geçersiz değer: %s"
+
+#: builtin/pull.c:445
+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
+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
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+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
+#, 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 ""
+"'%s' uzak konumundan çekme yapmak istediniz; ancak bir dal belirtmediniz.\n"
+"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
+msgid "You are not currently on a branch."
+msgstr "Şu anda bir dal üzerinde değilsiniz."
+
+#: builtin/pull.c:458 builtin/pull.c:473
+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
+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
+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
+msgid "<remote>"
+msgstr "<uzak-konum>"
+
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+msgid "<branch>"
+msgstr "<dal>"
+
+#: builtin/pull.c:471 builtin/rebase.c:1246
+msgid "There is no tracking information for the current branch."
+msgstr "Geçerli dal için izleme bilgisi yok."
+
+#: builtin/pull.c:480
+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
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+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
+#, c-format
+msgid "unable to access commit %s"
+msgstr "%s iÅŸlemesine eriÅŸilemedi"
+
+#: builtin/pull.c:902
+msgid "ignoring --verify-signatures for rebase"
+msgstr "yeniden temellendirme için --verify-signatures yok sayılıyor"
+
+#: 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 ""
+"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"
+"\n"
+"\tgit config pull.rebase false  # birleştir (öntanımlı strateji)\n"
+"\tgit config pull.rebase true   # yeniden temellendir\n"
+"\tgit config pull.ff only       # yalnızca ileri sarım\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"
+
+#: builtin/pull.c:990
+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:994
+msgid "pull with rebase"
+msgstr "yeniden temellendirme ile çekim"
+
+#: builtin/pull.c:995
+msgid "please commit or stash them."
+msgstr "Lütfen onları işleyin veya zulalayın."
+
+#: builtin/pull.c:1020
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"Getirme geçerli dal ucunu güncelledi.\n"
+"Çalışma ağacınız %s işlemesinden\n"
+"ileri sarılıyor."
+
+#: builtin/pull.c:1026
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"Çalışma ağacınız ileri sarılamıyor.\n"
+"$ git diff %s\n"
+"çıktısından gerekli olacağını düşündüğünüz ögeleri\n"
+"kaydettiğinizden emin olduktan sonra kurtarma için\n"
+"$ git reset --hard\n"
+"komutunu çalıştırın."
+
+#: builtin/pull.c:1041
+msgid "Cannot merge multiple branches into empty head."
+msgstr "Boş dal ucuna birden çok dal birleştirilemez."
+
+#: builtin/pull.c:1045
+msgid "Cannot rebase onto multiple branches."
+msgstr "Birden çok dala yeniden temellendirme yapılamaz."
+
+#: builtin/pull.c:1065
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+"yerelde kaydı yazılmış altmodül değişiklikleriyle yeniden temellendirme "
+"yapılamaz"
+
+#: builtin/push.c:19
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr "git push [<seçenekler>] [<depo> [<bşvr-blrtç>...]]"
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr "stenografiyi <etiket> olmadan etiketle"
+
+#: builtin/push.c:119
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete yalnızca düz hedef başvuru adlarını kabul eder"
+
+#: builtin/push.c:164
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"Bu seçeneklerden birini kalıcı olarak seçmek için 'git help config' içinde "
+"push.default girdisine bakın."
+
+#: builtin/push.c:167
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch.  To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+msgstr ""
+"Geçerli dalınızın üstkaynak dalı, geçerli dalınızın adıyla\n"
+"eşleşmiyor. Uzak konumdaki üstkaynağa gitmek için şunu kullanın:\n"
+"\n"
+"\tgit push %s HEAD:%s\n"
+"\n"
+"Uzak konumdaki aynı adlı dala itmek içinse şunu kullanın:\n"
+"\n"
+"\tgit push %s HEAD\n"
+"%s"
+
+#: builtin/push.c:182
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+"    git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"Şu anda bir dal üzerinde değilsiniz.\n"
+"Geçerli duruma (ayrık HEAD) yol açan geçmişi şimdi itmek\n"
+"için şunu kullanın:\n"
+"\n"
+"\tgit push %s HEAD:<uzak-konum-dalının-adı>\n"
+
+#: builtin/push.c:191
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+msgstr ""
+"Geçerli %s dalının bir üstkaynak dalı yok.\n"
+"Geçerli dalı itmek ve uzak konumu üstkaynak olarak ayarlamak\n"
+"için şunu kullanın:\n"
+"\n"
+"\tgit push --set-upstream %s %s\n"
+
+#: 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: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"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+"'%s' uzak konumuna hangi uzak dalı güncellemek için neyin\n"
+"itileceğini belirtmeden itiyorsunuz; ancak o geçerli '%s'\n"
+"dalınızın üstkaynağı değil."
+
+#: 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 ""
+"Güncellemeler reddedildi; çünkü geçerli dalınızın ucu kendisinin\n"
+"uzak konum karşıtından geride. Yeniden itmeden önce uzak konumdaki\n"
+"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: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 ""
+"Güncellemeler reddedildi; çünkü itilmiş bir dal ucu kendisinin\n"
+"uzak konum karşıtından geride. Yeniden itmeden önce bu dalı çıkış\n"
+"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: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"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"Güncellemeler reddedildi; çünkü uzak konumda henüz yerelde sizde olmayan\n"
+"değişiklikler var. Bu genelde başka bir deponun aynı başvuruya itmesinden\n"
+"dolayı olur. Yeniden itmeden önce uzak konumdaki değişiklikleri entegre\n"
+"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: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: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 ""
+"İşleme olmayan bir nesneye işaret eden uzak başvuruyu güncelleyemez\n"
+"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: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"
+
+#: builtin/push.c:355
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Ä°tme konumu: %s\n"
+
+#: builtin/push.c:362
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "bazı başvurular '%s' konumuna itilemedi"
+
+#: builtin/push.c:544
+msgid "repository"
+msgstr "depo"
+
+#: builtin/push.c:545 builtin/send-pack.c:189
+msgid "push all refs"
+msgstr "tüm başvuruları it"
+
+#: builtin/push.c:546 builtin/send-pack.c:191
+msgid "mirror all refs"
+msgstr "tüm başvuruları yansıla"
+
+#: builtin/push.c:548
+msgid "delete refs"
+msgstr "başvuruları sil"
+
+#: 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:552 builtin/send-pack.c:192
+msgid "force updates"
+msgstr "zorla güncelle"
+
+#: builtin/push.c:553 builtin/send-pack.c:204
+msgid "<refname>:<expect>"
+msgstr "<başvuruadı>:<bekle>"
+
+#: builtin/push.c:554 builtin/send-pack.c:205
+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:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "uzak güncellemelerin yerele entegre edilmesini gerektir"
+
+#: builtin/push.c:560
+msgid "control recursive pushing of submodules"
+msgstr "altmodüllerin özyineli itilmesini denetle"
+
+#: builtin/push.c:561 builtin/send-pack.c:199
+msgid "use thin pack"
+msgstr "ince paket kullan"
+
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
+msgid "receive pack program"
+msgstr "paket programını al"
+
+#: builtin/push.c:564
+msgid "set upstream for git pull/status"
+msgstr "git pull/status için üstkaynak ayarla"
+
+#: builtin/push.c:567
+msgid "prune locally removed refs"
+msgstr "yerelde kaldırılan başvuruları buda"
+
+#: builtin/push.c:569
+msgid "bypass pre-push hook"
+msgstr "pre-push kancasını atla"
+
+#: builtin/push.c:570
+msgid "push missing but relevant tags"
+msgstr "eksik; ancak ilgili etiketleri it"
+
+#: builtin/push.c:572 builtin/send-pack.c:193
+msgid "GPG sign the push"
+msgstr "itmeyi GPG ile imzala"
+
+#: builtin/push.c:574 builtin/send-pack.c:200
+msgid "request atomic transaction on remote side"
+msgstr "uzak tarafta atomsal iÅŸlem iste"
+
+#: builtin/push.c:592
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete; --all, --mirror ve --tags ile uyumsuz"
+
+#: builtin/push.c:594
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete bir baÅŸvuru olmadan anlam ifade etmiyor"
+
+#: builtin/push.c:614
+#, c-format
+msgid "bad repository '%s'"
+msgstr "hatalı depo '%s'"
+
+#: 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"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"Yapılandırılan itme hedefi yok.\n"
+"Ya URL'yi komut satırından belirtin ya da şunu kullanarak bir uzak konum "
+"deposu yapılandırın:\n"
+"\n"
+"\tgit remote add <ad> <url>\n"
+"\n"
+"ardından uzak konum adını kullanarak itin:\n"
+"\n"
+"\tgit push <ad>\n"
+
+#: builtin/push.c:630
+msgid "--all and --tags are incompatible"
+msgstr "--all ve --tags birbiriyle uyumsuz"
+
+#: builtin/push.c:632
+msgid "--all can't be combined with refspecs"
+msgstr "--all başvuru belirteçleriyle birleştirilemez"
+
+#: builtin/push.c:636
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror ve --tags birbiriyle uyumsuz"
+
+#: builtin/push.c:638
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror başvuru belirteçleriyle birleştirilemez"
+
+#: builtin/push.c:641
+msgid "--all and --mirror are incompatible"
+msgstr "--all ve --mirror birbiriyle uyumsuz"
+
+#: builtin/push.c:648
+msgid "push options must not have new line characters"
+msgstr "itme seçeneklerinde yeni satır karakterleri olmamalı"
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr ""
+"git range-diff [<seçenekler>] <old-base>..<old-tip> <new-base>..<new-tip>"
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<seçenekler>] <old-tip>...<new-tip>"
+
+#: builtin/range-diff.c:11
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<seçenekler>] <base> <old-tip> <new-tip>"
+
+#: builtin/range-diff.c:30
+msgid "use simple diff colors"
+msgstr "yalın diff renklerini kullan"
+
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "notlar"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "'git log'a aktarıldı"
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "yalnızca ilk erimle ilişkili çıktıyı yay"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "yalnızca ikinci erimle ilişkili çıktıyı yay"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "bir iÅŸleme erimi deÄŸil: '%s'"
+
+#: builtin/range-diff.c:74
+msgid "single arg format must be symmetric range"
+msgstr "tekli argüman biçimi simetrik erim olmalı"
+
+#: builtin/range-diff.c:89
+msgid "need two commit ranges"
+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>]])"
+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>]])"
+
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr "ortaya çıkan indeksi <dosya>'ya yaz"
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr "yalnızca indeksi boşalt"
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr "BirleÅŸtiriliyor"
+
+#: builtin/read-tree.c:131
+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
+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
+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
+msgid "same as -m, but discard unmerged entries"
+msgstr "-m ile aynı; ancak birleştirilmeyen girdileri atar"
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr "<altdizin>/"
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "ağacı indekse <altdizin>/ altında oku"
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr "birleştirme sonucuyla çalışma ağacını güncelleştir"
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:145
+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
+msgid "don't check the working tree after merging"
+msgstr "birleştirmeden sonra çalışma ağacını denetleme"
+
+#: builtin/read-tree.c:149
+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
+msgid "skip applying sparse checkout filter"
+msgstr "aralıklı çıkış süzgeci uygulamayı atla"
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr "unpack-trees hatalarını ayıkla"
+
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "geribildirim iletilerini gizle"
+
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "Öncelikle geçerli indeksinizi çözmelisiniz"
+
+#: builtin/rebase.c:35
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+"git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel> | --keep-"
+"base] [<üstkaynak> [<dal>]]"
+
+#: builtin/rebase.c:37
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [options] [--exec <komut>] [--onto <yeni-temel>] --root "
+"[<dal>]"
+
+#: 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 "kullanılamaz yapılacaklar listesi: '%s'"
+
+#: builtin/rebase.c:311
+#, c-format
+msgid "could not create temporary %s"
+msgstr "geçici %s oluşturulamadı"
+
+#: builtin/rebase.c:317
+msgid "could not mark as interactive"
+msgstr "etkileÅŸimli olarak imlenemedi"
+
+#: builtin/rebase.c:370
+msgid "could not generate todo list"
+msgstr "yapılacaklar listesi oluşturulamadı"
+
+#: builtin/rebase.c:412
+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
+#, c-format
+msgid "%s requires the merge backend"
+msgstr "%s birleÅŸtirme arka ucunu gerektiriyor"
+
+#: builtin/rebase.c:625
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "'onto' alınamadı: '%s'"
+
+#: builtin/rebase.c:642
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "geçersiz orig-head: '%s'"
+
+#: builtin/rebase.c:667
+#, 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
+msgid ""
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+"Tüm çakışmaları el ile çözün, onları \"git add/rm <çakışan-dosyalar>\"\n"
+"ile tamam olarak imleyin, ardından \"git rebase --continue\" çalıştırın.\n"
+"Bunun yerine bu işlemeyi atlayabilirsiniz: \"git rebase --skip\" yapın.\n"
+"İptal edip \"git rebase\" öncesine geri dönmek için \"git rebase --abort\"\n"
+"çalıştırın."
+
+#: builtin/rebase.c:896
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+"    %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"Git, yamaları bu revizyonları yeniden oynatmak için hazırlarken bir\n"
+"hatayla karşılaştı:\n"
+"\n"
+"\t%s\n"
+"\n"
+"Bunun sonucu olarak git onları yeniden temellendiremiyor."
+
+#: builtin/rebase.c:1222
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr ""
+"tanımlanamayan boş tür '%s'; geçerli türler: \"drop\", \"keep\" ve \"ask\""
+
+#: builtin/rebase.c:1240
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+msgstr ""
+"%s\n"
+"Lütfen hangi dala karşı yeniden temellendirmek istediğinizi belirtin.\n"
+"Ayrıntılar için: git-rebase(1)\n"
+"\n"
+"\tgit rebase '<dal>'\n"
+"\n"
+
+#: builtin/rebase.c:1256
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
+"Eğer bu dal için izleme bilgisi ayarlamak istiyorsanız şunu kullanın:\n"
+"\n"
+"\tgit branch --set-upstream-to=%s/<dal> %s\n"
+"\n"
+
+#: builtin/rebase.c:1286
+msgid "exec commands cannot contain newlines"
+msgstr "'exec' komutları yenisatırlar içeremez"
+
+#: builtin/rebase.c:1290
+msgid "empty exec command"
+msgstr "boÅŸ 'exec' komutu"
+
+#: builtin/rebase.c:1319
+msgid "rebase onto given branch instead of upstream"
+msgstr "üstkaynak yerine verilen dalın üzerine yeniden temellendir"
+
+#: builtin/rebase.c:1321
+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
+msgid "allow pre-rebase hook to run"
+msgstr "pre-rebase kancasının çalışmasına izin ver"
+
+#: builtin/rebase.c:1325
+msgid "be quiet. implies --no-stat"
+msgstr "sessiz ol (--no-stat ima eder)"
+
+#: builtin/rebase.c:1331
+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
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "her iÅŸlemeye bir Signed-off-by artbilgisi ekle"
+
+#: builtin/rebase.c:1337
+msgid "make committer date match author date"
+msgstr "işleyici tarihi ile yazar tarihini aynı yap"
+
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr "yazar tarihini yok say ve geçerli tarihi kullan"
+
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr "--reset-author-date eşanlamlısı"
+
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
+msgid "passed to 'git apply'"
+msgstr "'git apply'a aktarıldı"
+
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr "boÅŸluk deÄŸiÅŸikliklerini yok say"
+
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
+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
+msgid "continue"
+msgstr "sürdür"
+
+#: builtin/rebase.c:1357
+msgid "skip current patch and continue"
+msgstr "geçerli yamayı atla ve sürdür"
+
+#: builtin/rebase.c:1359
+msgid "abort and check out the original branch"
+msgstr "iptal et ve orijinal dalı çıkış yap"
+
+#: builtin/rebase.c:1362
+msgid "abort but keep HEAD where it is"
+msgstr "iptal et; ancak HEAD'i olduğu yerde bırak"
+
+#: builtin/rebase.c:1363
+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
+msgid "show the patch file being applied or merged"
+msgstr "yama dosyası uygulanırken veya birleştirilirken göster"
+
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "yeniden temellendirmek için \"apply\" stratejilerini kullan"
+
+#: builtin/rebase.c:1373
+msgid "use merging strategies to rebase"
+msgstr "yeniden temellendirmek için birleştirme stratejilerini kullan"
+
+#: builtin/rebase.c:1377
+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
+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
+msgid "how to handle commits that become empty"
+msgstr "boşalan işlemelerin nasıl ele alınacağı"
+
+#: builtin/rebase.c:1393
+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
+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
+msgid "allow rebasing commits with empty messages"
+msgstr "boÅŸ iletili iÅŸlemelerin yeniden temellendirilmesine izin ver"
+
+#: builtin/rebase.c:1408
+msgid "try to rebase merges instead of skipping them"
+msgstr "birleştirmeleri atlamak yerine onları yeniden temellendirmeyi dene"
+
+#: builtin/rebase.c:1411
+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
+msgid "use the given merge strategy"
+msgstr "verilen birleÅŸtirme stratejisini kullan"
+
+#: builtin/rebase.c:1415 builtin/revert.c:115
+msgid "option"
+msgstr "seçenek"
+
+#: builtin/rebase.c:1416
+msgid "pass the argument through to the merge strategy"
+msgstr "argümanı birleştirme stratejisine aktar"
+
+#: builtin/rebase.c:1419
+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
+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
+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: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
+msgid "No rebase in progress?"
+msgstr "Sürmekte olan bir yeniden temellendirme yok"
+
+#: builtin/rebase.c:1501
+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:122
+msgid "Cannot read HEAD"
+msgstr "HEAD okunamıyor"
+
+#: builtin/rebase.c:1536
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"Önce tüm birleştirme çakışmalarını düzenlemeli ve onları\n"
+"git add kullanarak tamamlandı olarak imlemelisiniz."
+
+#: builtin/rebase.c:1555
+msgid "could not discard worktree changes"
+msgstr "çalışma ağacı değişiklikleri atılamadı"
+
+#: builtin/rebase.c:1574
+#, c-format
+msgid "could not move back to %s"
+msgstr "%s konumuna geri taşınamadı"
+
+#: 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"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+"Görünüşe bakılırsa bir %s dizini zaten var ve merak\n"
+"ediyorum acaba siz başka bir yeniden temellendirmenin ortasında mısınız?\n"
+"Durum buysa lütfen şunu deneyin:\n"
+"\t%s\n"
+"Eğer başka bir şeyse, lütfen\n"
+"\t%s\n"
+"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
+msgid "switch `C' expects a numerical value"
+msgstr "'C' anahtarı sayısal bir değer bekliyor"
+
+#: builtin/rebase.c:1690
+#, c-format
+msgid "Unknown mode: %s"
+msgstr "Bilinmeyen kip: %s"
+
+#: builtin/rebase.c:1729
+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:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "Bilinmeyen yeniden temellendirme arka ucu: %s"
+
+#: builtin/rebase.c:1802
+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
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "geçersiz üstkaynak '%s'"
+
+#: builtin/rebase.c:1856
+msgid "Could not create new root commit"
+msgstr "Yeni kök işleme oluşturulamadı"
+
+#: builtin/rebase.c:1882
+#, 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
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "'%s': tam olarak bir birleÅŸtirme temeli gerekiyor"
+
+#: builtin/rebase.c:1893
+#, 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
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "onulmaz: böyle bir dal/işleme yok: '%s'"
+
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
+#, c-format
+msgid "No such ref: %s"
+msgstr "Böyle bir başvuru yok: %s"
+
+#: builtin/rebase.c:1940
+msgid "Could not resolve HEAD to a revision"
+msgstr "HEAD bir revizyona çözülemedi"
+
+#: builtin/rebase.c:1961
+msgid "Please commit or stash them."
+msgstr "Lütfen onları işleyin veya zulalayın."
+
+#: builtin/rebase.c:1997
+#, c-format
+msgid "could not switch to %s"
+msgstr "şuraya geçilemedi: %s"
+
+#: builtin/rebase.c:2008
+msgid "HEAD is up to date."
+msgstr "HEAD güncel."
+
+#: builtin/rebase.c:2010
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "Geçerli dal %s güncel.\n"
+
+#: builtin/rebase.c:2018
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD güncel, yeniden temellendirme zorla yapıldı."
+
+#: builtin/rebase.c:2020
+#, 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
+msgid "The pre-rebase hook refused to rebase."
+msgstr "'pre-rebase' kancası yeniden temellendirmeyi reddetti."
+
+#: builtin/rebase.c:2035
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "%s için olan değişiklikler:\n"
+
+#: builtin/rebase.c:2038
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "%s -> %s deÄŸiÅŸiklikleri:\n"
+
+#: builtin/rebase.c:2063
+#, 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
+msgid "Could not detach HEAD"
+msgstr "HEAD ayrılamadı"
+
+#: builtin/rebase.c:2081
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "%s, %s konumuna ileri sarıldı.\n"
+
+#: builtin/receive-pack.c:34
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dizini>"
+
+#: 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"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+"Ö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: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"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+"Ö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"
+"\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:2478
+msgid "quiet"
+msgstr "sessiz"
+
+#: builtin/receive-pack.c:2492
+msgid "You must specify a directory."
+msgstr "Bir dizin belirtmelisiniz."
+
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<zaman>] [--expire-unreachable=<zaman>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<baÅŸvurular>..."
+
+#: 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] "
+"<baÅŸvurular>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <baÅŸvuru>"
+
+#: builtin/reflog.c:568 builtin/reflog.c:573
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' geçerli bir zaman damgası değil"
+
+#: builtin/reflog.c:609
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "Ulaşılabilir nesneler imleniyor..."
+
+#: builtin/reflog.c:647
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s hiçbir yere işaret etmiyor!"
+
+#: builtin/reflog.c:699
+msgid "no reflog specified to delete"
+msgstr "silmek için bir başvuru günlüğü belirtilmedi"
+
+#: builtin/reflog.c:708
+#, c-format
+msgid "not a reflog: %s"
+msgstr "bir başvuru günlüğü değil: %s"
+
+#: builtin/reflog.c:713
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "'%s' için başvuru günlüğü yok"
+
+#: builtin/reflog.c:759
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "geçersiz başvuru biçimi: %s"
+
+#: builtin/reflog.c:768
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
+#: builtin/remote.c:17
+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 <dal>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<getir|it>] <ad> <url>"
+
+#: builtin/remote.c:19 builtin/remote.c:39
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <eski> <yeni>"
+
+#: builtin/remote.c:20 builtin/remote.c:44
+msgid "git remote remove <name>"
+msgstr "git remote remove <ad>"
+
+#: builtin/remote.c:21 builtin/remote.c:49
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <ad> (-a | --auto | -d | --delete | <dal>)"
+
+#: builtin/remote.c:22
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <ad>"
+
+#: builtin/remote.c:23
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <ad>"
+
+#: builtin/remote.c:24
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<grup> | <uzak-k>)...]"
+
+#: builtin/remote.c:25
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <ad> <dal>..."
+
+#: builtin/remote.c:26 builtin/remote.c:75
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <ad>"
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <ad> <yeni-url> [<eski-url>]"
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <ad> <yeni-url>"
+
+#: builtin/remote.c:29 builtin/remote.c:82
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <ad> <url>"
+
+#: builtin/remote.c:34
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<seçenekler>] <ad> <url>"
+
+#: builtin/remote.c:54
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <ad> <dal>..."
+
+#: builtin/remote.c:55
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <ad> <dal>..."
+
+#: builtin/remote.c:60
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<seçenekler>] <ad>"
+
+#: builtin/remote.c:65
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<seçenekler>] <ad>"
+
+#: builtin/remote.c:70
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<seçenekler>] [<grup> | <uzak-konum>]..."
+
+#: builtin/remote.c:99
+#, c-format
+msgid "Updating %s"
+msgstr "%s güncelleniyor"
+
+#: 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."
+
+#: builtin/remote.c:148
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "bilinmeyen yansı argümanı: %s"
+
+#: builtin/remote.c:164
+msgid "fetch the remote branches"
+msgstr "uzak konum dallarını getir"
+
+#: builtin/remote.c:166
+msgid "import all tags and associated objects when fetching"
+msgstr "getirirken tüm etiketleri ve ilişkili nesneleri içe aktar"
+
+#: builtin/remote.c:169
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "veya hiçbir etiketi getirme (--no-tags)"
+
+#: builtin/remote.c:171
+msgid "branch(es) to track"
+msgstr "izlenecek dal(lar)"
+
+#: builtin/remote.c:172
+msgid "master branch"
+msgstr "ana dal"
+
+#: builtin/remote.c:174
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+"uzak konum deposunu ona itilecek veya ondan getirilecek bir yansı olarak "
+"ayarla"
+
+#: builtin/remote.c:186
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "--mirror ile bir ana dal belirtmek anlam ifade etmiyor"
+
+#: builtin/remote.c:188
+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
+#, c-format
+msgid "remote %s already exists."
+msgstr "%s uzak konumu halihazırda var."
+
+#: builtin/remote.c:240
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "'%s' ana dalı ayarlanamadı"
+
+#: builtin/remote.c:355
+#, 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
+msgid "(matching)"
+msgstr "(eÅŸleÅŸiyor)"
+
+#: builtin/remote.c:466
+msgid "(delete)"
+msgstr "(sil)"
+
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "'%s' ayarlanamadı"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Şuradaki %s yapılandırması remote.pushDefault:\n"
+"\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
+#, c-format
+msgid "No such remote: '%s'"
+msgstr "Böyle bir uzak konum yok: '%s'"
+
+#: builtin/remote.c:710
+#, 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
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"Öntanımlı olmayan getirme başvuru belirteci güncellenmiyor.\n"
+"\t%s\n"
+"\tLütfen gerekirse yapılandırmayı el ile güncelleyin."
+
+#: builtin/remote.c:770
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "'%s' silinmesi başarısız"
+
+#: builtin/remote.c:804
+#, c-format
+msgid "creating '%s' failed"
+msgstr "'%s' oluşturulması başarısız"
+
+#: builtin/remote.c:882
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] ""
+"Not: refs/remotes hiyerarşisi dışındaki bir dal kaldırılmadı;\n"
+"onu silmek için şunu kullanın:"
+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
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "'%s' yapılandırsa bölümü kaldırılamadı"
+
+#: builtin/remote.c:999
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " yeni (bir sonraki getirme uzak konumlarda depolayacak/%s"
+
+#: builtin/remote.c:1002
+msgid " tracked"
+msgstr " izlendi"
+
+#: builtin/remote.c:1004
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " eskimiş (kaldırmak için 'git remote prune' kullanın)"
+
+#: builtin/remote.c:1006
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:1047
+#, 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
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "%s uzak konumuna etkileÅŸimli olarak yeniden temellendirir"
+
+#: builtin/remote.c:1058
+#, 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
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "%s uzak konumuna yeniden temellendirir"
+
+#: builtin/remote.c:1065
+#, c-format
+msgid " merges with remote %s"
+msgstr " %s uzak konumu ile birleÅŸtirir"
+
+#: builtin/remote.c:1068
+#, c-format
+msgid "merges with remote %s"
+msgstr "%s uzak konumu ile birleÅŸtirir"
+
+#: builtin/remote.c:1071
+#, c-format
+msgid "%-*s    and with remote %s\n"
+msgstr "%-*s    ve %s uzak konumu ile birlikte\n"
+
+#: builtin/remote.c:1114
+msgid "create"
+msgstr "oluÅŸtur"
+
+#: builtin/remote.c:1117
+msgid "delete"
+msgstr "sil"
+
+#: builtin/remote.c:1121
+msgid "up to date"
+msgstr "güncel"
+
+#: builtin/remote.c:1124
+msgid "fast-forwardable"
+msgstr "ileri sarılabilir"
+
+#: builtin/remote.c:1127
+msgid "local out of date"
+msgstr "yerelin tarihi geçmiş"
+
+#: builtin/remote.c:1134
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr "    %-*s ÅŸuna zorluyor: %-*s (%s)"
+
+#: builtin/remote.c:1137
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr "    %-*s ÅŸuna itiyor: %-*s (%s)"
+
+#: builtin/remote.c:1141
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr "    %-*s ÅŸuna zorluyor: %s"
+
+#: builtin/remote.c:1144
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr "    %-*s ÅŸuna itiyor: %s"
+
+#: builtin/remote.c:1212
+msgid "do not query remotes"
+msgstr "uzak konumları sorgulama"
+
+#: builtin/remote.c:1239
+#, c-format
+msgid "* remote %s"
+msgstr "* uzak konum %s"
+
+#: builtin/remote.c:1240
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr "  URL'yi getir: %s"
+
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+msgid "(no URL)"
+msgstr "(URL yok)"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1255 builtin/remote.c:1257
+#, c-format
+msgid "  Push  URL: %s"
+msgstr "     URL'yi it: %s"
+
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#, c-format
+msgid "  HEAD branch: %s"
+msgstr "     HEAD dalı: %s"
+
+#: builtin/remote.c:1259
+msgid "(not queried)"
+msgstr "(sorgulanmadı"
+
+#: builtin/remote.c:1261
+msgid "(unknown)"
+msgstr "(bilinmiyor)"
+
+#: builtin/remote.c:1265
+#, 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
+#, 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
+msgid " (status not queried)"
+msgstr " (durum sorgulanmadı)"
+
+#: builtin/remote.c:1289
+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
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr "  Yerel başvurular 'git pull' tarafından yansılanacak"
+
+#: builtin/remote.c:1303
+#, 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
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "refs/remotes/<ad>/HEAD'i uzak konuma göre ayarla"
+
+#: builtin/remote.c:1326
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "refs/remotes/<ad>/HEAD'i sil"
+
+#: builtin/remote.c:1341
+msgid "Cannot determine remote HEAD"
+msgstr "Uzak konum HEAD'i belirlenemiyor"
+
+#: builtin/remote.c:1343
+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
+#, c-format
+msgid "Could not delete %s"
+msgstr "%s silinemedi"
+
+#: builtin/remote.c:1361
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "Geçerli bir başvuru değil: %s"
+
+#: builtin/remote.c:1363
+#, c-format
+msgid "Could not setup %s"
+msgstr "%s ayarlanamadı"
+
+#: builtin/remote.c:1381
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %s sarkacak!"
+
+#: builtin/remote.c:1382
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %s sarkmaya başladı!"
+
+#: builtin/remote.c:1392
+#, c-format
+msgid "Pruning %s"
+msgstr "%s budanıyor"
+
+#: builtin/remote.c:1393
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: builtin/remote.c:1409
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * %s [budanacak]"
+
+#: builtin/remote.c:1412
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * %s [budandı]"
+
+#: builtin/remote.c:1457
+msgid "prune remotes after fetching"
+msgstr "getirme sonrasında uzak konumları buda"
+
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#, c-format
+msgid "No such remote '%s'"
+msgstr "Böyle bir uzak konum yok '%s'"
+
+#: builtin/remote.c:1539
+msgid "add branch"
+msgstr "dal ekle"
+
+#: builtin/remote.c:1546
+msgid "no remote specified"
+msgstr "uzak konum belirtilmedi"
+
+#: builtin/remote.c:1563
+msgid "query push URLs rather than fetch URLs"
+msgstr "itme URL'lerinden çok getirme URL'lerini sorgula"
+
+#: builtin/remote.c:1565
+msgid "return all URLs"
+msgstr "tüm URL'leri döndür"
+
+#: builtin/remote.c:1595
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "'%s' uzak konumu için URL yapılandırılmamış"
+
+#: builtin/remote.c:1621
+msgid "manipulate push URLs"
+msgstr "itme URL'lerini deÄŸiÅŸtir"
+
+#: builtin/remote.c:1623
+msgid "add URL"
+msgstr "URL ekle"
+
+#: builtin/remote.c:1625
+msgid "delete URLs"
+msgstr "URL'leri sil"
+
+#: builtin/remote.c:1632
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete bir anlam ifade etmiyor"
+
+#: builtin/remote.c:1673
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "Geçersiz eski URL dizgisi: %s"
+
+#: builtin/remote.c:1681
+#, c-format
+msgid "No such URL found: %s"
+msgstr "Böyle bir URL bulunamadı: %s"
+
+#: builtin/remote.c:1683
+msgid "Will not delete all non-push URLs"
+msgstr "Tüm itme olmayan URL'ler silinmeyecek"
+
+#: builtin/repack.c:26
+msgid "git repack [<options>]"
+msgstr "git repack [<seçenekler>]"
+
+#: 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 ""
+"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."
+
+#: builtin/repack.c:198
+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
+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
+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
+#, c-format
+msgid "cannot open index for %s"
+msgstr "%s için indeks açılamıyor"
+
+#: builtin/repack.c:368
+#, 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
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "%s paketi, sarmak için pek büyük"
+
+#: builtin/repack.c:460
+msgid "pack everything in a single pack"
+msgstr "her şeyi tek bir pakete sığdır"
+
+#: builtin/repack.c:462
+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
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "gereksiz paketleri kaldır ve 'git-prune-packed' çalıştır"
+
+#: builtin/repack.c:467
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "'git-pack-objects'e --no-reuse-delta geçir"
+
+#: builtin/repack.c:469
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "'git-pack-objects'e --no-reuse-object geçir"
+
+#: builtin/repack.c:471
+msgid "do not run git-update-server-info"
+msgstr "'git-update-server-info' çalıştırma"
+
+#: builtin/repack.c:474
+msgid "pass --local to git-pack-objects"
+msgstr "--local'ı 'git-pack-objects'e geçir"
+
+#: builtin/repack.c:476
+msgid "write bitmap index"
+msgstr "biteÅŸlem indeksi yaz"
+
+#: builtin/repack.c:478
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "--delta-islands'ı 'git-pack-objects'e geçir"
+
+#: builtin/repack.c:479
+msgid "approxidate"
+msgstr "yaklaşık tarih"
+
+#: builtin/repack.c:480
+msgid "with -A, do not loosen objects older than this"
+msgstr "-A ile, bundan daha eski nesneleri bırakma"
+
+#: builtin/repack.c:482
+msgid "with -a, repack unreachable objects"
+msgstr "-a ile, ulaşılamayan nesneleri yeniden paketle"
+
+#: builtin/repack.c:484
+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
+msgid "bytes"
+msgstr "baytlar"
+
+#: builtin/repack.c:486
+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
+msgid "limits the maximum delta depth"
+msgstr "olabilecek en büyük delta derinliğini kısıtlar"
+
+#: builtin/repack.c:490
+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
+msgid "maximum size of each packfile"
+msgstr "her paket dosyasının olabilecek en büyük boyutu"
+
+#: builtin/repack.c:494
+msgid "repack objects in packs marked with .keep"
+msgstr "nesneleri .keep ile imlenmiÅŸ paketlerde yeniden paketle"
+
+#: builtin/repack.c:496
+msgid "do not repack this pack"
+msgstr "bu paketi yeniden paketleme"
+
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr "<N> faktörlü bir geometrik ilerleme bul"
+
+#: builtin/repack.c:508
+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
+msgid "Nothing new to pack."
+msgstr "Paketlenecek yeni bir ÅŸey yok."
+
+#: builtin/repack.c:669
+#, c-format
+msgid "missing required file: %s"
+msgstr "gereken dosya eksik: %s"
+
+#: builtin/repack.c:671
+#, c-format
+msgid "could not unlink: %s"
+msgstr "bağlantı kaldırılamadı: %s"
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <nesne> <deÄŸiÅŸim>"
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <nesne>"
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <işleme> [<üst-öge>...]"
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --convert-graft-file"
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr "git replace -d <nesne>..."
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<biçim>] [-l [<dizgi>]]"
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"geçersiz değiştirme biçimi '%s'\n"
+"geçerli biçimler: 'short' (kısa), 'medium' (orta) ve 'long' (uzun)"
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "değiştirme başvurusu '%s' bulunamadı"
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "DeÄŸiÅŸtirme baÅŸvurusu '%s' silindi"
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "'%s' geçerli bir başvuru adı değil"
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "değiştirme başvurusu '%s' halihazırda mevcut"
+
+#: builtin/replace.c:178
+#, 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 ""
+"Nesneler aynı türden olmalıdır.\n"
+"'%s', '%s' türünden değiştirilmiş bir nesneye işaret ederken\n"
+"'%s' ise yerine geçecek '%s' türünden bir nesneye işaret ediyor."
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "%s yazma için açılamıyor"
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr "cat-file hata bildirdi"
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "%s okuma için açılamıyor"
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr "mktree ortaya çıkarılamıyor"
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr "mktree'den okunamıyor"
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr "mktree hata bildirdi"
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr "mktree bir nesne adı döndürmedi"
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr "%s 'fstat' yapılamıyor"
+
+#: builtin/replace.c:303
+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
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "%s için nesne türü alınamadı"
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr "nesne dosyasını düzenleme başarısız"
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "yeni nesne eskisiyle aynı: '%s'"
+
+#: builtin/replace.c:384
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "%s, bir işleme olarak ayrıştırılamadı"
+
+#: builtin/replace.c:416
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "'%s' işlemesinde hatalı birleştirme etiketi"
+
+#: builtin/replace.c:418
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "'%s' işlemesinde hatalı oluşturulmuş birleştirme etiketi"
+
+#: builtin/replace.c:430
+#, c-format
+msgid ""
+"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
+"instead of --graft"
+msgstr ""
+"'%s' orijinal işlemesi atılmış olan '%s' birleştirme etiketini içeriyor; --"
+"graft yerine --edit kullanın"
+
+#: builtin/replace.c:469
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr "'%s' orijinal işlemesinin bir gpg imzası var"
+
+#: builtin/replace.c:470
+msgid "the signature will be removed in the replacement commit!"
+msgstr "imza, yerine geçecek işlemede kaldırılacak"
+
+#: builtin/replace.c:480
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "şunun yerine geçecek işleme yazılamadı: '%s'"
+
+#: builtin/replace.c:488
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "'%s' için aşı gereksiz"
+
+#: builtin/replace.c:492
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "yeni işleme eskisiyle aynı: '%s'"
+
+#: builtin/replace.c:527
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"aşağıdaki aşı(lar) dönüştürülemedi:\n"
+"%s"
+
+#: builtin/replace.c:548
+msgid "list replace refs"
+msgstr "değiştirme başvurularını listele"
+
+#: builtin/replace.c:549
+msgid "delete replace refs"
+msgstr "değiştirme başvurularını sil"
+
+#: builtin/replace.c:550
+msgid "edit existing object"
+msgstr "geçerli nesneyi düzenle"
+
+#: builtin/replace.c:551
+msgid "change a commit's parents"
+msgstr "bir işlemenin üst ögelerini değiştir"
+
+#: builtin/replace.c:552
+msgid "convert existing graft file"
+msgstr "mevcut aşı dosyasını dönüştür"
+
+#: builtin/replace.c:553
+msgid "replace the ref if it exists"
+msgstr "baÅŸvuru mevcutsa onu deÄŸiÅŸtir"
+
+#: builtin/replace.c:555
+msgid "do not pretty-print contents for --edit"
+msgstr "--edit içeriğini hoş biçimde gösterme"
+
+#: builtin/replace.c:556
+msgid "use this format"
+msgstr "bu biçimi kullan"
+
+#: builtin/replace.c:569
+msgid "--format cannot be used when not listing"
+msgstr "--format, listelemiyorken kullanılamaz"
+
+#: builtin/replace.c:577
+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
+msgid "--raw only makes sense with --edit"
+msgstr "--raw yalnızca --edit ile anlam ifade eder"
+
+#: builtin/replace.c:587
+msgid "-d needs at least one argument"
+msgstr "-d için en azından bir argüman gerekli"
+
+#: builtin/replace.c:593
+msgid "bad number of arguments"
+msgstr "hatalı argüman sayısı"
+
+#: builtin/replace.c:599
+msgid "-e needs exactly one argument"
+msgstr "-e için tam olarak bir argüman gerekli"
+
+#: builtin/replace.c:605
+msgid "-g needs at least one argument"
+msgstr "-g için en azından bir argüman gerekli"
+
+#: builtin/replace.c:611
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file argüman almaz"
+
+#: builtin/replace.c:617
+msgid "only one pattern can be given with -l"
+msgstr "-l ile yalnızca bir dizgi verilebilir"
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <yol>... | status | remaining | diff | gc]"
+
+#: builtin/rerere.c:58
+msgid "register clean resolutions in index"
+msgstr "indeksteki temiz çözümlerin kaydını yap"
+
+#: builtin/rerere.c:77
+msgid "'git rerere forget' without paths is deprecated"
+msgstr "yol olmadan 'git rerere forget' kullanım dışı"
+
+#: 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
+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
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<ağacımsı>] [--] <yol-blrtç>..."
+
+#: 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]] [<ağacımsı>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<ağacımsı>] [--] [<yol-blrtç>...]"
+
+#: builtin/reset.c:41
+msgid "mixed"
+msgstr "karışık"
+
+#: builtin/reset.c:41
+msgid "soft"
+msgstr "yumuÅŸak"
+
+#: builtin/reset.c:41
+msgid "hard"
+msgstr "sert"
+
+#: builtin/reset.c:41
+msgid "merge"
+msgstr "birleÅŸtir"
+
+#: builtin/reset.c:41
+msgid "keep"
+msgstr "tut"
+
+#: builtin/reset.c:83
+msgid "You do not have a valid HEAD."
+msgstr "Geçerli bir HEAD'iniz yok."
+
+#: builtin/reset.c:85
+msgid "Failed to find tree of HEAD."
+msgstr "HEAD ağacı bulunamadı."
+
+#: builtin/reset.c:91
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "%s ağacı bulunamadı."
+
+#: builtin/reset.c:116
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD ÅŸimdi ÅŸurada: %s"
+
+#: builtin/reset.c:195
+#, 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
+msgid "be quiet, only report errors"
+msgstr "sessiz ol, yalnızca hataları bildir"
+
+#: builtin/reset.c:297
+msgid "reset HEAD and index"
+msgstr "HEAD'i ve indeksi sıfırla"
+
+#: builtin/reset.c:298
+msgid "reset only HEAD"
+msgstr "yalnızca HEAD'i sıfırla"
+
+#: builtin/reset.c:300 builtin/reset.c:302
+msgid "reset HEAD, index and working tree"
+msgstr "HEAD'i, indeksi ve çalışma ağacını sıfırla"
+
+#: builtin/reset.c:304
+msgid "reset HEAD but keep local changes"
+msgstr "HEAD'i sıfırla; ancak yerel değişiklikleri tut"
+
+#: builtin/reset.c:310
+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
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "'%s' geçerli bir revizyon olarak çözülemedi."
+
+#: builtin/reset.c:352
+#, 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
+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
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "Belirtilmiş yol varken %s sıfırlaması yapılamıyor."
+
+#: builtin/reset.c:388
+#, 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
+msgid "Unstaged changes after reset:"
+msgstr "Sıfırlama sonrasında hazırlanmamış değişiklikler:"
+
+#: builtin/reset.c:416
+#, 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 ""
+"\n"
+"Sıfırlama sonrasında hazırlanmamış değişiklikleri ortaya dökme %.2f saniye\n"
+"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
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "İndeks dosyası '%s' revizyonuna sıfırlanamadı."
+
+#: builtin/reset.c:439
+msgid "Could not write new index file."
+msgstr "Yeni indeks dosyası yazılamadı."
+
+#: builtin/rev-list.c:541
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "--exclude-promisor-objects ve --missing birlikte kullanılamıyor"
+
+#: builtin/rev-list.c:602
+msgid "object filtering requires --objects"
+msgstr "nesne süzme --objects gerektiriyor"
+
+#: 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:679
+msgid "marked counting is incompatible with --objects"
+msgstr "imlenmiş sayım, --objects ile uyumsuz"
+
+#: builtin/rev-parse.c:409
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<seçenekler>] -- [<argümanlar>...]"
+
+#: builtin/rev-parse.c:414
+msgid "keep the `--` passed as an arg"
+msgstr "'--'i geçirilen bir argüman olarak tut"
+
+#: builtin/rev-parse.c:416
+msgid "stop parsing after the first non-option argument"
+msgstr "seçenek olmayan ilk argümandan sonra ayrıştırmayı durdur"
+
+#: builtin/rev-parse.c:419
+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"
+"   or: git rev-parse --sq-quote [<arg>...]\n"
+"   or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+"git rev-parse --parseopt [<seçenekler>] -- [<argümanlar>...]\n"
+"\tor: git rev-parse --sq-quote [<argümanlar>...]\n"
+"\tor: git rev-parse [<seçenekler>] [<argümanlar>...]\n"
+"\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>..."
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr "git revert <altkomut>"
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<seçenekler>] <işlememsi>..."
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <altkomut>"
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "'%s' seçeneği sıfırdan büyük bir sayı bekliyor"
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s: %s, %s ile birlikte kullanılamaz"
+
+#: builtin/revert.c:102
+msgid "end revert or cherry-pick sequence"
+msgstr "geri al veya seç-al dizisini sonlandır"
+
+#: builtin/revert.c:103
+msgid "resume revert or cherry-pick sequence"
+msgstr "geri al veya seç-al dizisini sürdür"
+
+#: builtin/revert.c:104
+msgid "cancel revert or cherry-pick sequence"
+msgstr "geri al veya seç-al dizisini iptal et"
+
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "geçerli işlemeyi atla ve sürdür"
+
+#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr "kendiliğinden gönderme"
+
+#: builtin/revert.c:108
+msgid "edit the commit message"
+msgstr "işleme iletisini düzenle"
+
+#: builtin/revert.c:111
+msgid "parent-number"
+msgstr "üst öge numarası"
+
+#: builtin/revert.c:112
+msgid "select mainline parent"
+msgstr "ana üst ögeyi seç"
+
+#: builtin/revert.c:114
+msgid "merge strategy"
+msgstr "birleÅŸtirme stratejisi"
+
+#: builtin/revert.c:116
+msgid "option for merge strategy"
+msgstr "birleştirme stratejisi için seçenek"
+
+#: builtin/revert.c:125
+msgid "append commit name"
+msgstr "işleme adını iliştir"
+
+#: builtin/revert.c:127
+msgid "preserve initially empty commits"
+msgstr "başlangıçta boş olan işlemeleri koru"
+
+#: builtin/revert.c:129
+msgid "keep redundant, empty commits"
+msgstr "gereksiz, boÅŸ iÅŸlemeleri tut"
+
+#: builtin/revert.c:237
+msgid "revert failed"
+msgstr "geri al başarısız"
+
+#: builtin/revert.c:250
+msgid "cherry-pick failed"
+msgstr "seç-al başarısız"
+
+#: builtin/rm.c:20
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<seçenekler>] [--] <dosya>..."
+
+#: builtin/rm.c:208
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] ""
+"Aşağıdaki dosyanın hem HEAD'den hem de dosyadan farklı hazırlanmış\n"
+"içeriği mevcut:"
+msgstr[1] ""
+"Aşağıdaki dosyaların hem HEAD'den hem de dosyadan farklı hazırlanmış\n"
+"içeriği mevcut:"
+
+#: builtin/rm.c:213
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(zorla kaldırmak için -f kullanın)"
+
+#: 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] "Aşağıdaki dosyanın indekste hazırlanmış değişiklikleri mevcut:"
+msgstr[1] "Aşağıdaki dosyaların indekste hazırlanmış değişiklikleri mevcut:"
+
+#: builtin/rm.c:221 builtin/rm.c:230
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"(dosyayı tutmak için --cached, zorla kaldırmak için -f kullanın)"
+
+#: builtin/rm.c:227
+msgid "the following file has local modifications:"
+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
+msgid "do not list removed files"
+msgstr "kaldırılan dosyaları listeleme"
+
+#: builtin/rm.c:245
+msgid "only remove from the index"
+msgstr "yalnızca indeksten kaldır"
+
+#: builtin/rm.c:246
+msgid "override the up-to-date check"
+msgstr "güncellik denetlemesini geçersiz kıl"
+
+#: builtin/rm.c:247
+msgid "allow recursive removal"
+msgstr "özyineli kaldırmaya izin ver"
+
+#: builtin/rm.c:249
+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
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "Yol belirteci verilmedi. Hangi dosyaları kaldırmalıyım?"
+
+#: builtin/rm.c:310
+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
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "'%s', -r olmadan özyineli olarak kaldırılmıyor"
+
+#: builtin/rm.c:379
+#, 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."
+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."
+
+#: builtin/send-pack.c:188
+msgid "remote name"
+msgstr "uzak konum adı"
+
+#: builtin/send-pack.c:201
+msgid "use stateless RPC protocol"
+msgstr "durumsuz RPC protokolünü kullan"
+
+#: builtin/send-pack.c:202
+msgid "read refs from stdin"
+msgstr "başvuruları stdin'den oku"
+
+#: builtin/send-pack.c:203
+msgid "print status from remote helper"
+msgstr "uzak konum yardımcısından durum yazdır"
+
+#: builtin/shortlog.c:16
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<seçenekler>] [<revizyon-erimi>] [[--] <yol>...]"
+
+#: builtin/shortlog.c:17
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<seçenekler>]"
+
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "stdin ile çoklu --group seçenekleri kullanımı desteklenmiyor"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "stdin ile --group=trailer kullanımı desteklenmiyor"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "bilinmeyen grup türü: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "yazar yerine iÅŸleyici ile grupla"
+
+#: builtin/shortlog.c:354
+msgid "sort output according to the number of commits per author"
+msgstr "çıktıyı yazar başına olan işleme sayısına göre sırala"
+
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "işleme açıklamalarını gizle, yalnızca işleme sayısını ver"
+
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "her yazarın e-posta adresini göster"
+
+#: builtin/shortlog.c:359
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "çıktıyı kaydır"
+
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "alan"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "alan ile grupla"
+
+#: builtin/shortlog.c:391
+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>)...]"
+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>)...]"
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<temel>]] [--list] [<baÅŸvuru>]"
+
+#: 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] "%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
+#, c-format
+msgid "no matching refs with %s"
+msgstr "%s ile eÅŸleÅŸen baÅŸvuru yok"
+
+#: builtin/show-branch.c:645
+msgid "show remote-tracking and local branches"
+msgstr "uzak izleme dallarını ve yerel dalları göster"
+
+#: builtin/show-branch.c:647
+msgid "show remote-tracking branches"
+msgstr "uzak izleme dallarını göster"
+
+#: builtin/show-branch.c:649
+msgid "color '*!+-' corresponding to the branch"
+msgstr "'*!+-'i dala göre renklendir"
+
+#: builtin/show-branch.c:651
+msgid "show <n> more commits after the common ancestor"
+msgstr "ortak atadan sonra <n> işleme daha göster"
+
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
+msgstr "more=-+ eşanlamlısı"
+
+#: builtin/show-branch.c:654
+msgid "suppress naming strings"
+msgstr "adlandırma dizilerini gizle"
+
+#: builtin/show-branch.c:656
+msgid "include the current branch"
+msgstr "geçerli dalı içer"
+
+#: builtin/show-branch.c:658
+msgid "name commits with their object names"
+msgstr "işlemeleri kendi nesne adlarıyla adlandır"
+
+#: builtin/show-branch.c:660
+msgid "show possible merge bases"
+msgstr "olası birleştirme temellerini göster"
+
+#: builtin/show-branch.c:662
+msgid "show refs unreachable from any other ref"
+msgstr "başka başvurudan erişilemeyen başvuruları göster"
+
+#: builtin/show-branch.c:664
+msgid "show commits in topological order"
+msgstr "işlemeleri ilingesel sırada göster"
+
+#: builtin/show-branch.c:667
+msgid "show only commits not on the first branch"
+msgstr "yalnızca birinci dalda olmayan işlemeleri göster"
+
+#: builtin/show-branch.c:669
+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
+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
+msgid "<n>[,<base>]"
+msgstr "<n>[,<temel>]"
+
+#: builtin/show-branch.c:675
+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
+msgid "no branches given, and HEAD is not valid"
+msgstr "dal verilmedi ve HEAD geçersiz"
+
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
+msgstr "--reflog seçeneği için bir dal adı gerekli"
+
+#: builtin/show-branch.c:741
+#, 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
+#, c-format
+msgid "no such ref %s"
+msgstr "böyle bir başvuru yok: %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] "%d revizyondan başkası ele alınamıyor."
+msgstr[1] "%d revizyondan başkası ele alınamıyor."
+
+#: builtin/show-branch.c:835
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' geçerli bir başvuru değil."
+
+#: builtin/show-branch.c:838
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "%s işlemesi bulunamıyor (%s)"
+
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "sağlama algoritması"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "bilinmeyen sağlama algoritması '%s'"
+
+#: 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] [--] [<dizgi>...]"
+
+#: builtin/show-ref.c:13
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<dizgi>]"
+
+#: builtin/show-ref.c:162
+msgid "only show tags (can be combined with heads)"
+msgstr "yalnızca etiketleri göster (dal uçlarıyla birlikte kullanılabilir)"
+
+#: builtin/show-ref.c:163
+msgid "only show heads (can be combined with tags)"
+msgstr "yalnızca dal uçlarını göster (etiketlerle birlikte kullanılabilir)"
+
+#: builtin/show-ref.c:164
+msgid "stricter reference checking, requires exact ref path"
+msgstr "daha sıkı başvuru denetlemesi; kesin başvuru yolu gerektirir"
+
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "süzülüp dışarıda kalsa bile HEAD başvurusunu göster"
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr "etiketleri nesne numaralarına çevir"
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr "SHA1 sağlamasını yalnızca <n> basamak kullanarak göster"
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "sonuçları stdout'a yazdırma (--verify ile birlikte kullanışlı)"
+
+#: builtin/show-ref.c:179
+msgid "show refs from stdin that aren't in local repository"
+msgstr "stdin'den yerel bir depoda olmayan başvuruları göster"
+
+#: 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) <seçenekler>"
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:72
+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
+msgid "failed to create directory for sparse-checkout file"
+msgstr "aralıklı çıkış dosyası için dizin oluşturulamadı"
+
+#: builtin/sparse-checkout.c:268
+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
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "extensions.worktreeConfig yapılandırması ayarlanamadı"
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "aralıklı çıkışı koni kipinde ilklendir"
+
+#: builtin/sparse-checkout.c:312
+msgid "toggle the use of a sparse index"
+msgstr "bir aralıklı indeksin kullanımını aç/kapa"
+
+#: 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
+#, c-format
+msgid "failed to open '%s'"
+msgstr "'%s' açılamadı"
+
+#: builtin/sparse-checkout.c:413
+#, c-format
+msgid "could not normalize path %s"
+msgstr "'%s' yolu olağanlaştırılamadı"
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <dizgiler>)"
+
+#: builtin/sparse-checkout.c:450
+#, 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:504 builtin/sparse-checkout.c:528
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "mevcut aralıklı çıkış dizgileri yüklenemiyor"
+
+#: builtin/sparse-checkout.c:573
+msgid "read patterns from standard in"
+msgstr "dizgileri stdin'den oku"
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:607
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:638
+msgid "error while refreshing working directory"
+msgstr "çalışma dizini yenilenirken hata"
+
+#: builtin/stash.c:24 builtin/stash.c:40
+msgid "git stash list [<options>]"
+msgstr "git stash list [<seçenekler>]"
+
+#: builtin/stash.c:25 builtin/stash.c:45
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<seçenekler>] [<zula>]"
+
+#: builtin/stash.c:26 builtin/stash.c:50
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<zula>]"
+
+#: builtin/stash.c:27
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash ( pop | apply ) [--index] [-q|--quiet] [<zula>]"
+
+#: builtin/stash.c:28 builtin/stash.c:65
+msgid "git stash branch <branchname> [<stash>]"
+msgstr "git stash branch <dal-adı> [<zula>]"
+
+#: 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"
+"          [--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 <ileti>]\n"
+"          [--pathspec-from-file=<dosya> [--pathspec-file-nul]]\n"
+"          [--] [<yol-blrtç>...]]"
+
+#: 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 ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [<ileti>]"
+
+#: builtin/stash.c:55
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<zula>]"
+
+#: builtin/stash.c:60
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<zula>]"
+
+#: builtin/stash.c:75
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <ileti>] [-q|--quiet] <iÅŸleme>"
+
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <ileti>]\n"
+"          [--] [<yol-blrtç>...]]"
+
+#: builtin/stash.c:130
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' zulaya benzer bir iÅŸleme deÄŸil"
+
+#: builtin/stash.c:150
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "Çok fazla revizyon belirtildi:%s"
+
+#: builtin/stash.c:164
+msgid "No stash entries found."
+msgstr "Zula girdisi bulunamadı."
+
+#: builtin/stash.c:178
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s geçerli bir başvuru değil"
+
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
+msgstr "parametreli git stash clear henüz kullanılabilir değil"
+
+#: 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 ""
+"UYARI: İzlenmeyen dosya, izlenen dosyanın önüne çıktı!\n"
+"Yer açmak için\n"
+"            %s -> %s\n"
+"         yeniden adlandırılıyor.\n"
+
+#: builtin/stash.c:492
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "bir birleştirmenin ortasında zula uygulanamıyor"
+
+#: builtin/stash.c:503
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "diff oluşturulamadı: %s^!."
+
+#: builtin/stash.c:510
+msgid "conflicts in index. Try without --index."
+msgstr "İndekste çakışmalar var. --index olmadan deneyin."
+
+#: builtin/stash.c:516
+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
+#, c-format
+msgid "Merging %s with %s"
+msgstr "%s, %s ile birleÅŸtiriliyor"
+
+#: builtin/stash.c:549
+msgid "Index was not unstashed."
+msgstr "İndeks zuladan çıkartılmamıştı."
+
+#: builtin/stash.c:591 builtin/stash.c:689
+msgid "attempt to recreate the index"
+msgstr "indeks yeniden oluşturulmaya çalışılıyor"
+
+#: builtin/stash.c:635
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "%s bırakıldı (%s)"
+
+#: builtin/stash.c:638
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s: Zula girdisi bırakılamadı"
+
+#: builtin/stash.c:651
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' bir zula baÅŸvurusu deÄŸil"
+
+#: builtin/stash.c:701
+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
+msgid "No branch name specified"
+msgstr "Dal adı belirtilmedi"
+
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "ağaç ayrıştırılamadı"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "ağaçların paketi açılamadı"
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr "zulada izlenmeyen dosyaları içer"
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr "zulada yalnızca izlenmeyen dosyaları göster"
+
+#: builtin/stash.c:929 builtin/stash.c:966
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "%s, %s ile güncellenemiyor"
+
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+msgid "stash message"
+msgstr "zula iletisi"
+
+#: builtin/stash.c:957
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" bir <işleme> argümanı gerektirir"
+
+#: builtin/stash.c:1171
+msgid "No changes selected"
+msgstr "Değişiklik seçilmedi"
+
+#: builtin/stash.c:1271
+msgid "You do not have the initial commit yet"
+msgstr "Henüz ilk işleme yapılmamış"
+
+#: builtin/stash.c:1298
+msgid "Cannot save the current index state"
+msgstr "Geçerli indeks durumu kaydedilemiyor"
+
+#: builtin/stash.c:1307
+msgid "Cannot save the untracked files"
+msgstr "Ä°zlenmeyen dosyalar kaydedilemiyor"
+
+#: builtin/stash.c:1318 builtin/stash.c:1327
+msgid "Cannot save the current worktree state"
+msgstr "Geçerli çalışma ağacı durumu kaydedilemiyor"
+
+#: builtin/stash.c:1355
+msgid "Cannot record working tree state"
+msgstr "Çalışma ağacı durumu kaydı yazılamıyor"
+
+#: builtin/stash.c:1404
+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:1422
+msgid "Did you forget to 'git add'?"
+msgstr "'git add' yapmayı mı unuttunuz?"
+
+#: builtin/stash.c:1437
+msgid "No local changes to save"
+msgstr "Kaydedilecek yerel deÄŸiÅŸiklik yok"
+
+#: builtin/stash.c:1444
+msgid "Cannot initialize stash"
+msgstr "Zula ilklendirilemiyor"
+
+#: builtin/stash.c:1459
+msgid "Cannot save the current status"
+msgstr "Geçerli durum kaydedilemiyor"
+
+#: builtin/stash.c:1464
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "Çalışma dizini ve indeks durumu %s kaydedildi"
+
+#: builtin/stash.c:1554
+msgid "Cannot remove worktree changes"
+msgstr "Çalışma ağacı değişiklikleri kaldırılamıyor"
+
+#: builtin/stash.c:1593 builtin/stash.c:1658
+msgid "keep index"
+msgstr "indeksi tut"
+
+#: builtin/stash.c:1595 builtin/stash.c:1660
+msgid "stash in patch mode"
+msgstr "yama kipinde zula"
+
+#: builtin/stash.c:1596 builtin/stash.c:1661
+msgid "quiet mode"
+msgstr "sessiz kip"
+
+#: builtin/stash.c:1598 builtin/stash.c:1663
+msgid "include untracked files in stash"
+msgstr "zulada izlenmeyen dosyaları içer"
+
+#: builtin/stash.c:1600 builtin/stash.c:1665
+msgid "include ignore files"
+msgstr "yok sayma dosyalarını içer"
+
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"stash.useBuiltin desteği kaldırıldı!\n"
+"Ayrıntılar için 'git help config' içindeki girdisine bakın."
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
+msgstr "yorum karakteri ile başlayan tüm satırları atla ve kaldır"
+
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
+msgstr "her satırın başına yorum karakteri ve boşluk koy"
+
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Tam bir başvuru adı bekleniyordu, %s alındı"
+
+#: 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: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:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
+msgid "alternative anchor for relative paths"
+msgstr "göreceli yollar için alternatif tutturucu"
+
+#: builtin/submodule--helper.c:416
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<yol>] [<yol>...]"
+
+#: 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 ".gitmodules içinde '%s' altmodül yolu için url bulunamadı"
+
+#: builtin/submodule--helper.c:526
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "Giriliyor: '%s'\n"
+
+#: builtin/submodule--helper.c:529
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"run_command, %s için sıfır olmayan durum döndürdü\n"
+"."
+
+#: builtin/submodule--helper.c:551
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"run_command, %s ögesinin iç içe geçmiş altmodülleri içinde özyinelerken "
+"sıfır olmayan durum döndürdü"
+
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
+msgstr "her bir altmodül komutu girişinin çıktısını gizle"
+
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
+msgstr "iç içe geçmiş altmodüle özyinele"
+
+#: builtin/submodule--helper.c:574
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <komut>"
+
+#: builtin/submodule--helper.c:601
+#, 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:668
+#, 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:672
+#, 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:682
+#, 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:689
+#, 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:711
+msgid "suppress output for initializing a submodule"
+msgstr "bir altmodül ilklendirmesi çıktısını gizle"
+
+#: builtin/submodule--helper.c:716
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<seçenekler>] [<yol>]"
+
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#, 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:837
+#, 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:864 builtin/submodule--helper.c:1459
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "'%s' altmodülüne özyinelenemedi"
+
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
+msgstr "altmodül durum çıktısını gizle"
+
+#: builtin/submodule--helper.c:889
+msgid ""
+"use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"altmodül HEAD'i içinde depolanan işleme yerine indekste depolanan işlemeyi "
+"kullan"
+
+#: builtin/submodule--helper.c:895
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<yol>...]"
+
+#: builtin/submodule--helper.c:919
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <yol>"
+
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(ikili nesne)->%s(altmodül)"
+
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(altmodül)->%s(ikili nesne)"
+
+#: builtin/submodule--helper.c:1007
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "'%s' üzerinden nesne sağlaması yapılamadı"
+
+#: builtin/submodule--helper.c:1061
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "beklenmedik kip %o\n"
+
+#: builtin/submodule--helper.c:1302
+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:1304
+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:1306
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "'ignore_config' değeri 'all' olan altmodülleri atla"
+
+#: builtin/submodule--helper.c:1308
+msgid "limit the summary size"
+msgstr "özet boyutunu sınırla"
+
+#: builtin/submodule--helper.c:1313
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<seçenekler>] [<işleme>] [--] [<yol>]"
+
+#: builtin/submodule--helper.c:1337
+msgid "could not fetch a revision for HEAD"
+msgstr "HEAD için bir revizyon getirilemedi"
+
+#: builtin/submodule--helper.c:1342
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached ve --files birlikte kullanılamaz"
+
+#: builtin/submodule--helper.c:1409
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "'%s' için altmodül url'si eşitleniyor\n"
+
+#: builtin/submodule--helper.c:1415
+#, 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:1429
+#, 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:1440
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "'%s' altmodülü için uzak konum güncellenemedi"
+
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
+msgstr "altmodül url'si eşitleme çıktısını gizle"
+
+#: builtin/submodule--helper.c:1494
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<yol>]"
+
+#: 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)"
+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)"
+
+#: builtin/submodule--helper.c:1560
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+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:1568
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "'%s' dizini temizlendi\n"
+
+#: builtin/submodule--helper.c:1570
+#, 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:1581
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "boş altmodül dizini %s oluşturulamadı"
+
+#: builtin/submodule--helper.c:1597
+#, 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:1626
+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:1627
+msgid "unregister all submodules"
+msgstr "tüm altmodüllerin kaydını kaldır"
+
+#: builtin/submodule--helper.c:1632
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<yol>...]]"
+
+#: builtin/submodule--helper.c:1646
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr ""
+"Tüm altmodüllerin ilklendirmesini gerçekten geri almak istiyorsanız '--all' "
+"kullanın"
+
+#: builtin/submodule--helper.c: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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Bir süperprojenin alternatifinden hesaplanan bir alternatif geçersiz.\n"
+"Böyle bir durumda Git'in alternatifsiz klonlamasına izin vermek için\n"
+"submodule.alternateErrorStrategy ayarını 'info'ya ayarlayın veya\n"
+"--reference yerine --reference-if-able kullanarak klonlayın."
+
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "'%s' altmodülü alternatif ekleyemiyor: %s"
+
+#: builtin/submodule--helper.c:1768
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "'%s' submodule.alternateErrorStrategy değeri tanımlanamadı"
+
+#: builtin/submodule--helper.c:1775
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "'%s' submodule.alternateLocation değeri tanımlanamadı"
+
+#: builtin/submodule--helper.c:1800
+#, 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:1841
+#, 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:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "dizin boÅŸ deÄŸil: '%s'"
+
+#: builtin/submodule--helper.c:1858
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "'%s' için altmodül dizini alınamadı"
+
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+msgid "where the new submodule will be cloned to"
+msgstr "yeni altmodülün nereye klonlanacağı"
+
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+msgid "name of the new submodule"
+msgstr "yeni altmodülün adı"
+
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+msgid "url where to clone the submodule from"
+msgstr "altmodülün klonlanacağı url konumu"
+
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+msgid "depth for shallow clones"
+msgstr "sığ klonların derinliği"
+
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
+msgid "force cloning progress"
+msgstr "zorla klonla"
+
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+msgid "disallow cloning into non-empty directory"
+msgstr "boÅŸ olmayan dizine klonlamaya izin verme"
+
+#: builtin/submodule--helper.c:1916
+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=<yol>] [--quiet] [--reference <depo>] "
+"[--name <ad>] [--depth <derinlik>] [--single-branch] --url <url> --path <yol>"
+
+#: builtin/submodule--helper.c:1953
+#, 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:1957
+#, 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:2058
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Altmodül yolu '%s' ilklendirilmedi"
+
+#: builtin/submodule--helper.c:2062
+msgid "Maybe you want to use 'update --init'?"
+msgstr "'update --init' mi kullanmak istersiniz?"
+
+#: builtin/submodule--helper.c:2092
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Birleştirilmemiş altmodül %s atlanıyor"
+
+#: builtin/submodule--helper.c:2121
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "'%s' altmodülü atlanıyor"
+
+#: builtin/submodule--helper.c:2271
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "'%s' klonlanamadı. Yeniden deneme zamanlandı."
+
+#: builtin/submodule--helper.c:2282
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "'%s' ikinci bir kez klonlanamadı, iptal ediliyor"
+
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+msgid "path into the working tree"
+msgstr "çalışma ağacına giden yol"
+
+#: builtin/submodule--helper.c:2347
+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:2351
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout veya none"
+
+#: builtin/submodule--helper.c:2357
+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:2360
+msgid "parallel jobs"
+msgstr "paralel iÅŸler"
+
+#: builtin/submodule--helper.c:2362
+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:2363
+msgid "don't print cloning progress"
+msgstr "klonlama işlemini yazdırma"
+
+#: builtin/submodule--helper.c:2374
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<yol>] [<yol>...]"
+
+#: builtin/submodule--helper.c:2387
+msgid "bad value for update parameter"
+msgstr "güncelleme parametresi için hatalı değer"
+
+#: builtin/submodule--helper.c:2435
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+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:2558
+#, 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:2591
+msgid "recurse into submodules"
+msgstr "altmodüllere özyinele"
+
+#: builtin/submodule--helper.c:2597
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<seçenekler>] [<yol>...]"
+
+#: builtin/submodule--helper.c:2653
+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:2656
+msgid "unset the config in the .gitmodules file"
+msgstr ".gitmodules dosyasındaki yapılandırmayı kaldır"
+
+#: builtin/submodule--helper.c:2661
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <ad> [<deÄŸer>]"
+
+#: builtin/submodule--helper.c:2662
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <ad>"
+
+#: builtin/submodule--helper.c:2663
+msgid "git submodule--helper config --check-writeable"
+msgstr "git submodule--helper config --check-writeable"
+
+#: 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 ".gitmodules dosyasının çalışma ağacında olduğundan lütfen emin ol"
+
+#: builtin/submodule--helper.c:2698
+msgid "suppress output for setting url of a submodule"
+msgstr "bir altmodül url ayarlanması çıktısını gizle"
+
+#: builtin/submodule--helper.c:2702
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <yol> <yeniurl>"
+
+#: builtin/submodule--helper.c:2735
+msgid "set the default tracking branch to master"
+msgstr "öntanımlı izleme dalını master olarak ayarla"
+
+#: builtin/submodule--helper.c:2737
+msgid "set the default tracking branch"
+msgstr "öntanımlı izleme dalını ayarla"
+
+#: builtin/submodule--helper.c:2741
+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:2742
+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:2749
+msgid "--branch or --default required"
+msgstr "--branch veya --default gerekli"
+
+#: builtin/submodule--helper.c:2752
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch ve --default birlikte kullanılamaz"
+
+#: builtin/submodule--helper.c:2815
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "'%s' konumundaki mevcut repo indekse ekleniyor\n"
+
+#: builtin/submodule--helper.c:2818
+#, 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:2828
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr "'%s' için bir git deposu yerelde şu uzak konumlarla bulundu:"
+
+#: 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 ""
+"EÄŸer bu yerel git dizinini\n"
+"  %s\n"
+"konumundan yeniden klonlama yerine kullanmak isterseniz '--force'\n"
+"seçeneğini kullanın. Eğer bu yerel git dizini doğru depo değilse veya bunun\n"
+"ne anlama geldiğinden emin değilseniz '--name' seçeneği ile başka bir ad\n"
+"seçin.\n"
+
+#: builtin/submodule--helper.c:2842
+#, 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:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "'%s' altmodülü çıkış yapılamıyor"
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr "klonlamada çıkış yapılacak depo dalı"
+
+#: builtin/submodule--helper.c:2910
+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:2917
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr ""
+"git submodule--helper add-clone [<seçenekler>...] --url <url> --path <yol> --"
+"name <ad>"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s, --super-prefix desteklemiyor"
+
+#: builtin/submodule--helper.c:2991
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' geçerli bir submodule--helper altkomutu değil"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<seçenekler>] <ad> [<başvuru>]"
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <ad>"
+
+#: builtin/symbolic-ref.c:42
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "sembolik olmayan (ayrık) başvurular için hata iletisini gizle"
+
+#: builtin/symbolic-ref.c:43
+msgid "delete symbolic ref"
+msgstr "sembolik baÅŸvuruyu sil"
+
+#: builtin/symbolic-ref.c:44
+msgid "shorten ref output"
+msgstr "başvuru çıktısını kısalt"
+
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+msgid "reason"
+msgstr "neden"
+
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+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>]"
+msgstr ""
+"git tag [-a | -s | -u <anahtar-no>] [-f] [-m <ileti> | -F <dosya>]\n"
+"\t\t<etiket-adı> [<dal-ucu>]"
+
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <etiket-adı>..."
+
+#: 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>...]"
+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>...]"
+
+#: builtin/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<biçim>] <etiket-adı>..."
+
+#: builtin/tag.c:100
+#, c-format
+msgid "tag '%s' not found."
+msgstr "'%s' etiketi bulunamadı."
+
+#: builtin/tag.c:135
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "'%s' etiketi silindi (%s idi)\n"
+
+#: builtin/tag.c:170
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"Etiket için bir ileti yazın:\n"
+"  %s\n"
+"'%c' ile başlayan satırlar yok sayılacaktır.\n"
+
+#: builtin/tag.c:174
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"Etiket için bir ileti yazın:\n"
+"  %s\n"
+"'%c' ile başlayan satırlar tutulacaktır; isterseniz onları "
+"kaldırabilirsiniz.\n"
+
+#: builtin/tag.c:241
+msgid "unable to sign the tag"
+msgstr "etiket imzalanamıyor"
+
+#: builtin/tag.c:259
+#, 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 ""
+"İç içe geçmiş bir etiket oluşturdunuz. Sizin yeni etiketinizce başvurulan\n"
+"nesne zaten bir etiket. Ä°ÅŸaret ettiÄŸi nesneyi etiketlemek istediyseniz:\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:275
+msgid "bad object type."
+msgstr "hatalı nesne türü"
+
+#: builtin/tag.c:328
+msgid "no tag message?"
+msgstr "etiket iletisi yok mu?"
+
+#: builtin/tag.c:335
+#, 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
+msgid "list tag names"
+msgstr "etiket adlarını listele"
+
+#: builtin/tag.c:448
+msgid "print <n> lines of each tag message"
+msgstr "her etiket iletisinin <n> satırını listele"
+
+#: builtin/tag.c:450
+msgid "delete tags"
+msgstr "etiketleri sil"
+
+#: builtin/tag.c:451
+msgid "verify tags"
+msgstr "etiketleri doÄŸrula"
+
+#: builtin/tag.c:453
+msgid "Tag creation options"
+msgstr "Etiket oluşturma seçenekleri"
+
+#: builtin/tag.c:455
+msgid "annotated tag, needs a message"
+msgstr "açıklama eklenmiş etiket için bir ileti gerek"
+
+#: builtin/tag.c:457
+msgid "tag message"
+msgstr "etiket iletisi"
+
+#: builtin/tag.c:459
+msgid "force edit of tag message"
+msgstr "etiket iletisini zorla düzenle"
+
+#: builtin/tag.c:460
+msgid "annotated and GPG-signed tag"
+msgstr "açıklama eklenmiş ve GPG imzalı etiket"
+
+#: builtin/tag.c:463
+msgid "use another key to sign the tag"
+msgstr "etiketi imzalamak için başka bir anahtar kullanın"
+
+#: builtin/tag.c:464
+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
+msgid "create a reflog"
+msgstr "bir başvuru günlüğü oluştur"
+
+#: builtin/tag.c:467
+msgid "Tag listing options"
+msgstr "Etiket listeleme seçenekleri"
+
+#: builtin/tag.c:468
+msgid "show tag list in columns"
+msgstr "etiket listesini sütunlarla göster"
+
+#: builtin/tag.c:469 builtin/tag.c:471
+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
+msgid "print only tags that don't contain the commit"
+msgstr "yalnızca işleme içermeyen etiketleri yazdır"
+
+#: builtin/tag.c:473
+msgid "print only tags that are merged"
+msgstr "yalnızca birleştirilen etiketleri yazdır"
+
+#: builtin/tag.c:474
+msgid "print only tags that are not merged"
+msgstr "yalnızca birleştirilmeyen etiketleri yazdır"
+
+#: builtin/tag.c:478
+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:592
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' geçerli bir etiket adı değil."
+
+#: builtin/tag.c:597
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "'%s' etiketi halihazırda var"
+
+#: builtin/tag.c:628
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "'%s' etiketi güncellendi (%s idi)\n"
+
+#: builtin/unpack-objects.c:504
+msgid "Unpacking objects"
+msgstr "Nesneler açılıyor"
+
+#: builtin/update-index.c:84
+#, c-format
+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
+#, c-format
+msgid "failed to delete file %s"
+msgstr "%s dosyası silinemedi"
+
+#: builtin/update-index.c:115 builtin/update-index.c:221
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "%s dizini silinemedi"
+
+#: builtin/update-index.c:140
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "'%s' içindeki mtime sınanıyor "
+
+#: builtin/update-index.c:154
+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
+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
+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
+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
+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
+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
+msgid " OK"
+msgstr " Tamam"
+
+#: builtin/update-index.c:591
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<seçenekler>] [--] [<dosya>...]"
+
+#: builtin/update-index.c:976
+msgid "continue refresh even when index needs update"
+msgstr "indeksin güncellenmesi gerekse bile yenilemeyi sürdür"
+
+#: builtin/update-index.c:979
+msgid "refresh: ignore submodules"
+msgstr "refresh: altmodülleri yok say"
+
+#: builtin/update-index.c:982
+msgid "do not ignore new files"
+msgstr "yeni dosyaları yok sayma"
+
+#: builtin/update-index.c:984
+msgid "let files replace directories and vice-versa"
+msgstr "dosyaların dizinlerin yerine geçmesine ve tersine izin ver"
+
+#: builtin/update-index.c:986
+msgid "notice files missing from worktree"
+msgstr "çalışma ağacından eksik olan dosyaları fark et"
+
+#: builtin/update-index.c:988
+msgid "refresh even if index contains unmerged entries"
+msgstr "indekste birleÅŸtirilmemiÅŸ girdiler olsa bile yenile"
+
+#: builtin/update-index.c:991
+msgid "refresh stat information"
+msgstr "dosya durum bilgisini yenile"
+
+#: builtin/update-index.c:995
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "--refresh gibi; ancak assume-unchanged ayarını yok sayar"
+
+#: builtin/update-index.c:999
+msgid "<mode>,<object>,<path>"
+msgstr "<kip>,<nesne>,<yol>"
+
+#: builtin/update-index.c:1000
+msgid "add the specified entry to the index"
+msgstr "belirtilen girdiyi indekse ekle"
+
+#: builtin/update-index.c:1010
+msgid "mark files as \"not changing\""
+msgstr "dosyaları \"not changing\" olarak imle"
+
+#: builtin/update-index.c:1013
+msgid "clear assumed-unchanged bit"
+msgstr "assumed-unchanged kısmını temizle"
+
+#: builtin/update-index.c:1016
+msgid "mark files as \"index-only\""
+msgstr "dosyaları \"index-only\" olarak imle"
+
+#: builtin/update-index.c:1019
+msgid "clear skip-worktree bit"
+msgstr "skip-worktree kısmını atla"
+
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr "'index-only' girdilerine dokunma"
+
+#: builtin/update-index.c:1024
+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
+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
+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
+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
+msgid "add entries from standard input to the index"
+msgstr "indekse standart girdi'den girdiler ekle"
+
+#: builtin/update-index.c:1038
+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
+msgid "only update entries that differ from HEAD"
+msgstr "yalnızca HEAD'den farklı olan girdileri güncelle"
+
+#: builtin/update-index.c:1046
+msgid "ignore files missing from worktree"
+msgstr "çalışma ağacından eksik olan dosyaları yok say"
+
+#: builtin/update-index.c:1049
+msgid "report actions to standard output"
+msgstr "eylemleri standart çıktı'ya bildir"
+
+#: builtin/update-index.c:1051
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(okunabilir veri için) kaydedilmiş çözülmeyen çakışmaları unut"
+
+#: builtin/update-index.c:1055
+msgid "write index in this format"
+msgstr "indeksi bu biçimle yaz"
+
+#: builtin/update-index.c:1057
+msgid "enable or disable split index"
+msgstr "bölünmüş indeksi etkinleştir veya devre dışı bırak"
+
+#: builtin/update-index.c:1059
+msgid "enable/disable untracked cache"
+msgstr "izlenmeyen önbelleği etkinleştir/devre dışı bırak"
+
+#: builtin/update-index.c:1061
+msgid "test if the filesystem supports untracked cache"
+msgstr "dosya sisteminin izlenmeyen önbellek destekleyip desteklemediğini sına"
+
+#: builtin/update-index.c:1063
+msgid "enable untracked cache without testing the filesystem"
+msgstr "dosya sistemini sınamadan izlenmeyen önbelleği etkinleştir"
+
+#: builtin/update-index.c:1065
+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
+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
+msgid "mark files as fsmonitor valid"
+msgstr "dosyaları dosya sistemi monitöründe geçerli olarak imle"
+
+#: builtin/update-index.c:1072
+msgid "clear fsmonitor valid bit"
+msgstr "dosya sistemi monitöründe geçerli kısmını temizle"
+
+#: 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 '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
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+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
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+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
+msgid "Untracked cache disabled"
+msgstr "İzlenmeyen önbellek devre dışı bırakıldı"
+
+#: 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 '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
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "İzlenmeyen önbellek '%s' için etkinleştirildi"
+
+#: builtin/update-index.c:1220
+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
+msgid "fsmonitor enabled"
+msgstr "dosya sistemi monitörü etkin"
+
+#: builtin/update-index.c:1227
+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
+msgid "fsmonitor disabled"
+msgstr "dosya sistemi monitörü devre dışı"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<seçenekler>] -d <bşvr-adı> [<eski-değer>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
+msgstr ""
+"git update-ref [<seçenekler>]    <bşvr-adı> <yeni-değer> [<eski-değer>]"
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<seçenekler>] --stdin [-z]"
+
+#: builtin/update-ref.c:500
+msgid "delete the reference"
+msgstr "baÅŸvuruyu sil"
+
+#: builtin/update-ref.c:502
+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
+msgid "stdin has NUL-terminated arguments"
+msgstr "stdin'de NUL ile sonlandırılan argümanlar var"
+
+#: builtin/update-ref.c:504
+msgid "read updates from stdin"
+msgstr "güncellemeleri stdin'den oku"
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr "git update-server-info [--force]"
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr "bilgi dosyalarını en baştan güncelle"
+
+#: builtin/upload-pack.c:11
+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
+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:27
+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
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "aktarımı <n> saniye hareketsizlikten sonra kes"
+
+#: builtin/verify-commit.c:19
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <iÅŸleme>..."
+
+#: builtin/verify-commit.c:68
+msgid "print commit contents"
+msgstr "işleme içeriğini yazdır"
+
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
+msgstr "ham gpg durum çıktısını yazdır"
+
+#: builtin/verify-pack.c:59
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paket>..."
+
+#: builtin/verify-pack.c:70
+msgid "verbose"
+msgstr "ayrıntılı anlatım"
+
+#: builtin/verify-pack.c:72
+msgid "show statistics only"
+msgstr "yalnızca istatistikleri göster"
+
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<biçim>] <etiket>..."
+
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr "etiket içeriğini yazdır"
+
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<seçenekler>] <yol> [<işlememsi>]"
+
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<seçenekler>]"
+
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<seçenekler>] <yol>"
+
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <ç-ağacı> <yeni-yol>"
+
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<seçenekler>]"
+
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<seçenekler>] <ç-ağacı>"
+
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <yol>"
+
+#: builtin/worktree.c:61 builtin/worktree.c:944
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "'%s' silinemedi"
+
+#: builtin/worktree.c:74
+#, c-format
+msgid "Removing %s/%s: %s"
+msgstr "%s/%s kaldırılıyor: %s"
+
+#: builtin/worktree.c:147
+msgid "report pruned working trees"
+msgstr "budanan çalışma ağaçlarını bildir"
+
+#: builtin/worktree.c:149
+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:219
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s' halihazırda var"
+
+#: builtin/worktree.c:228
+#, c-format
+msgid "unusable worktree destination '%s'"
+msgstr "kullanılamayan çalışma ağacı konumu '%s'"
+
+#: 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 ""
+"'%s' eksik; ancak kilitli bir çalışma ağacı;\n"
+"geçersiz kılmak için '%s -f -f', temizlemek için 'unlock', 'prune' veya "
+"'remove' kullanın"
+
+#: 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 ""
+"'%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:286
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "'%s' dizini oluşturulamadı"
+
+#: builtin/worktree.c:308
+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: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: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:437
+#, c-format
+msgid "Preparing worktree (detached HEAD %s)"
+msgstr "Çalışma ağacı hazırlanıyor (ayrık HEAD %s)"
+
+#: builtin/worktree.c:482
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr "diğer çalışma ağacında çıkış yapılmış olsa bile <dal> çıkışını yap"
+
+#: builtin/worktree.c:485
+msgid "create a new branch"
+msgstr "yeni bir dal oluÅŸtur"
+
+#: builtin/worktree.c:487
+msgid "create or reset a branch"
+msgstr "yeni bir dal oluştur veya sıfırla"
+
+#: builtin/worktree.c:489
+msgid "populate the new working tree"
+msgstr "yeni çalışma ağacını doldur"
+
+#: builtin/worktree.c:490
+msgid "keep the new working tree locked"
+msgstr "yeni çalışma ağacını kilitli tut"
+
+#: 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: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:506
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b, -B ve --detach birlikte kullanılamaz"
+
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr "--reason, --lock gerektiriyor"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "--lock ile eklendi"
+
+#: 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:691
+msgid "show extended annotations and reasons, if available"
+msgstr "varsa genişletilmiş açıklamaları ve nedenleri göster"
+
+#: 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:702
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose ve --porcelain birlikte kullanılamaz"
+
+#: 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: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:748
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' halihazırda kilitli, nedeni: %s"
+
+#: builtin/worktree.c:750
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' halihazırda kilitli"
+
+#: builtin/worktree.c:778
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' kilitli deÄŸil"
+
+#: 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: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: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:855
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "hedef adı şuradan anlaşılamadı: '%s'"
+
+#: 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 ""
+"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:870
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+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: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:878
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "'%s' -> '%s' taşıması başarısız"
+
+#: 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: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: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: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:979
+#, c-format
+msgid ""
+"cannot remove a locked working tree, lock reason: %s\n"
+"use 'remove -f -f' to override or unlock first"
+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:981
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+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: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:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr "ÅŸunu onar %s: %s"
+
+#: builtin/worktree.c:1011
+#, c-format
+msgid "error: %s: %s"
+msgstr "hata: %s: %s"
+
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<önek>/]"
+
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
+msgstr "<önek>/"
+
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "bir <önek> altdizini için ağaç nesnesi yaz"
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr "yalnızca hata ayıklama için yararlı"
+
+#: git.c:28
+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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <yol>] [-c <ad>=<deÄŸer>]\n"
+"           [--exec-path[=<yol>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<yol>] [--work-tree=<yol>] [--namespace=<ad>]\n"
+"           [--super-prefix=<yol>] [--config-env=<ad>=<ortamdeÄŸiÅŸkeni>]\n"
+"           <komut> [<argümanlar>]"
+
+#: 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"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"'git help -a' ve 'git help -g' kullanılabilir komutları ve bazı konsept\n"
+"kılavuzlarını listeler. Belirli bir komut veya konsept üzerine bilgi almak\n"
+"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
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "--git-dir için 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"
+msgstr "--super-prefix için önek verilmedi\n"
+
+#: git.c:252
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "-c bir yapılandırma dizisi bekliyor\n"
+
+#: git.c:260
+#, c-format
+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"
+msgstr "bilinmeyen seçenek: %s\n"
+
+#: git.c:375
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "'%s' arması genişletirilirken: '%s'"
+
+#: git.c:384
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"'%s' arması ortam değişkenlerini değiştirir.\n"
+"Bunu yapmak için armada '!git' kullanabilirsiniz."
+
+#: git.c:391
+#, c-format
+msgid "empty alias for %s"
+msgstr "%s için boş arma"
+
+#: git.c:394
+#, c-format
+msgid "recursive alias: %s"
+msgstr "özyineli arma: %s"
+
+#: git.c:476
+msgid "write failure on standard output"
+msgstr "standart çıktı'da yazma hatası"
+
+#: git.c:478
+msgid "unknown write failure on standard output"
+msgstr "standart çıktı'da bilinmeyen yazma hatası"
+
+#: git.c:480
+msgid "close failed on standard output"
+msgstr "standart çıktı'da kapatma başarısız"
+
+#: git.c:833
+#, 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
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "%s bir yerleşik olarak ele alınamıyor"
+
+#: git.c:896
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"kullanım: %s\n"
+"\n"
+
+#: git.c:916
+#, 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
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "'%s' komutu çalıştırılamadı: %s\n"
+
+#: http-fetch.c:118
+#, 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
+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"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "revizyonlar hazırlanırken hata"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "%s işlemesi ulaşılabilir olarak imlenmedi"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "çok fazla işleme ulaşılabilir olarak imlenmiş"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<seçenekler>]"
+
+#: t/helper/test-serve-v2.c:19
+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
+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
+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
+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
+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
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<ad>] [<jeton>]"
+
+#: t/helper/test-simple-ipc.c:687
+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
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<ad>] [<iş-parçacığı>] [<bayt-sayısı>] "
+"[<parti-boyutu>]"
+
+#: t/helper/test-simple-ipc.c:696
+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
+msgid "named-pipe name"
+msgstr "named-pipe adı"
+
+#: t/helper/test-simple-ipc.c:700
+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
+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
+msgid "number of bytes"
+msgstr "bayt sayısı"
+
+#: t/helper/test-simple-ipc.c:704
+msgid "number of requests per thread"
+msgstr "iş parçacığı başına düşen istek sayısı"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr "bayt"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr "dengeleyici karakter"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr "jeton"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "command token to send to the server"
+msgstr "sunucuya gönderilecek komut jetonu"
+
+#: http.c:399
+#, 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
+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:910
+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
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "Desteklenmeyen SSL arka ucu '%s'. Desteklenen SSL arka uçları:"
+
+#: http.c:1139
+#, 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
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "SSL arka ucu '%s' olarak ayarlanamadı: Halihazırda ayarlanmış"
+
+#: http.c:2034
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"yeniden yönlendirerek url tabanı güncellenemiyor:\n"
+" ÅŸu istendi: %s\n"
+"   yönlenen: %s"
+
+#: remote-curl.c:183
+#, c-format
+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
+#, 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
+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
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "geçersiz sunucu yanıtı; '%s' alındı"
+
+#: remote-curl.c:499
+#, c-format
+msgid "repository '%s' not found"
+msgstr "'%s' deposu bulunamadı"
+
+#: remote-curl.c:503
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "'%s' için kimlik doğrulaması başarısız"
+
+#: remote-curl.c:507
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "'%s' eriÅŸilemiyor: %s"
+
+#: remote-curl.c:513
+#, c-format
+msgid "redirecting to %s"
+msgstr "şuraya yeniden yönlendiriliyor: %s"
+
+#: remote-curl.c:644
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "dosya sonuna dikkat edilmiyorsa dosya sonu olmamalıdır"
+
+#: remote-curl.c:656
+msgid "remote server sent unexpected response end packet"
+msgstr "uzak sunucu beklenmedik yanıt sonu paketi gönderdi"
+
+#: remote-curl.c:726
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr ""
+"rpc sonrası verisi geri sarılamıyor - http.postBuffer'ı artırmayı deneyin"
+
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: hatalı satır uzunluğu karakteri: %.4s"
+
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: beklenmedik yanıt sonu paketi"
+
+#: remote-curl.c:834
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC başarısız oldu; %s"
+
+#: remote-curl.c:874
+msgid "cannot handle pushes this big"
+msgstr "bu kadar büyük itmeler ele alınamıyor"
+
+#: remote-curl.c:989
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "istek söndürülemiyor; 'zlib deflate' hatası %d"
+
+#: remote-curl.c:993
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "istek söndürülemiyor; 'zlib end' hatası %d"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "üstbilginin %d baytı alındı"
+
+#: remote-curl.c:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "gövdenin %d baytı hâlâ bekleniyor"
+
+#: remote-curl.c:1134
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "programlanamayan http taşıyıcısı sığ işlevleri desteklemiyor"
+
+#: remote-curl.c:1149
+msgid "fetch failed."
+msgstr "getirme başarısız."
+
+#: remote-curl.c:1195
+msgid "cannot fetch by sha1 over smart http"
+msgstr "akıllı http üzerinden sha1 ile getirme yapılamıyor"
+
+#: remote-curl.c:1239 remote-curl.c:1245
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "protokol hatası: sha/ref bekleniyordu, '%s' alındı"
+
+#: remote-curl.c:1257 remote-curl.c:1375
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http taşıyıcısı %s desteklemiyor"
+
+#: remote-curl.c:1293
+msgid "git-http-push failed"
+msgstr "git-http-push başarısız"
+
+#: remote-curl.c:1481
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl: kullanım: git remote-curl <uzak-konum> [<url>]"
+
+#: remote-curl.c:1513
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl: git'ten komut akışı okunurken hata"
+
+#: remote-curl.c:1520
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl: yerel bir depo olmadan getirme yapılmaya çalışıldı"
+
+#: remote-curl.c:1561
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl: git'ten bilinmeyen komut '%s'"
+
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "derleyici bilgisi mevcut deÄŸil\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "libc bilgisi mevcut deÄŸil\n"
+
+#: list-objects-filter-options.h:94
+msgid "args"
+msgstr "argümanlar"
+
+#: list-objects-filter-options.h:95
+msgid "object filtering"
+msgstr "nesne süzümü"
+
+#: parse-options.h:184
+msgid "expiry-date"
+msgstr "son kullanım tarihi"
+
+#: parse-options.h:198
+msgid "no-op (backward compatibility)"
+msgstr "işlem yok (geriye dönük uyumluluk için)"
+
+#: parse-options.h:310
+msgid "be more verbose"
+msgstr "daha ayrıntılı anlat"
+
+#: parse-options.h:312
+msgid "be more quiet"
+msgstr "daha sessiz ol"
+
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
+msgstr "nesne adlarını görüntülemek için <n> basamak kullan"
+
+#: parse-options.h:337
+msgid "how to strip spaces and #comments from message"
+msgstr "iletiden boşlukları ve #yorumları çıkart"
+
+#: parse-options.h:338
+msgid "read pathspec from file"
+msgstr "yol belirtecini dosyadan oku"
+
+#: parse-options.h:339
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"--pathspec-from-file ile, yol belirteci ögeleri NUL karakteri ile ayrılır"
+
+#: ref-filter.h:99
+msgid "key"
+msgstr "anahtar"
+
+#: ref-filter.h:99
+msgid "field name to sort on"
+msgstr "üzerine sıralanacak alan adı"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"eğer olanaklıysa indeksi yeniden kullanılmış çakışma çözümü ile güncelle"
+
+#: command-list.h:50
+msgid "Add file contents to the index"
+msgstr "Dosya içeriğini indekse ekle"
+
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr "Bir posta kutusundan bir dizi yama uygula"
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr "İşleme bilgisini dosya içi açıklama olarak ekle"
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr "Ä°ndekse ve/veya dosyalara bir yama uygula"
+
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr "Git'e bir GNU Arch deposu içe aktar"
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr "Ad verilmiş ağaçtan bir dosyalar arşivi oluştur"
+
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "Hatalara neden olan iÅŸlemeyi bulmada ikili arama kullan"
+
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr "Dosya satırlarını son değiştiren revizyon/yazarı göster"
+
+#: command-list.h:58
+msgid "List, create, or delete branches"
+msgstr "Dal oluÅŸtur, sil veya listele"
+
+#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "Hata raporu bildirimi için veri topla"
+
+#: command-list.h:60
+msgid "Move objects and refs by archive"
+msgstr "Nesneleri ve başvuruları arşive göre taşı"
+
+#: command-list.h:61
+msgid "Provide content or type and size information for repository objects"
+msgstr "Depo nesneleri için içerik veya tür/boyut bilgisi sağla"
+
+#: command-list.h:62
+msgid "Display gitattributes information"
+msgstr "gitattributes bilgisini görüntüle"
+
+#: command-list.h:63
+msgid "Debug gitignore / exclude files"
+msgstr "gitignore / exclude dosyalarında hata ayıkla"
+
+#: command-list.h:64
+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 "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
+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"
+
+#: command-list.h:69
+msgid "Apply the changes introduced by some existing commits"
+msgstr "Mevcut bazı işlemelerin getirdiği değişiklikleri uygula"
+
+#: command-list.h:70
+msgid "Graphical alternative to git-commit"
+msgstr "git-commit için grafik tabanlı alternatif"
+
+#: command-list.h:71
+msgid "Remove untracked files from the working tree"
+msgstr "İzlenmeyen dosyaları çalışma ağacından kaldır"
+
+#: command-list.h:72
+msgid "Clone a repository into a new directory"
+msgstr "Bir depoyu yeni bir dizine klonla"
+
+#: command-list.h:73
+msgid "Display data in columns"
+msgstr "Verileri sütunlarla göster"
+
+#: command-list.h:74
+msgid "Record changes to the repository"
+msgstr "Değişikliklerin kaydını depoya yaz"
+
+#: command-list.h:75
+msgid "Write and verify Git commit-graph files"
+msgstr "Git commit-graph dosyalarını doğrula ve yaz"
+
+#: command-list.h:76
+msgid "Create a new commit object"
+msgstr "Yeni bir iÅŸleme nesnesi oluÅŸtur"
+
+#: command-list.h:77
+msgid "Get and set repository or global options"
+msgstr "Depoyu veya global seçenekleri al ve ayarla"
+
+#: command-list.h:78
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "Açılmamış nesne sayısını ve disk kullanımını hesapla"
+
+#: command-list.h:79
+msgid "Retrieve and store user credentials"
+msgstr "Kullanıcı yetkilerini al ve depola"
+
+#: command-list.h:80
+msgid "Helper to temporarily store passwords in memory"
+msgstr "Parolaları geçici olarak bellekte saklamak için yardımcı"
+
+#: command-list.h:81
+msgid "Helper to store credentials on disk"
+msgstr "Yetkileri diskte saklamak için yardımcı"
+
+#: command-list.h:82
+msgid "Export a single commit to a CVS checkout"
+msgstr "Bir CVS çıkışına tek bir işlemeyi dışa aktar"
+
+#: command-list.h:83
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr "'TiskindiÄŸiniz' baÅŸka bir KDY'den verileri kurtar"
+
+#: command-list.h:84
+msgid "A CVS server emulator for Git"
+msgstr "Git için bir SCV sunucusu öykünücüsü"
+
+#: command-list.h:85
+msgid "A really simple server for Git repositories"
+msgstr "Git depoları için gerçekten yalın bir sunucu"
+
+#: command-list.h:86
+msgid "Give an object a human readable name based on an available ref"
+msgstr "Uygun bir başvuruyu temel alıp nesneye okunabilir ad ver"
+
+#: command-list.h:87
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "İşlemeler, işleme ve ağaçlar vb. arası değişiklikler"
+
+#: command-list.h:88
+msgid "Compares files in the working tree and the index"
+msgstr "İndeksteki ve çalışma ağacındaki dosyaları sıkıştır"
+
+#: command-list.h:89
+msgid "Compare a tree to the working tree or index"
+msgstr "Bir ağacı çalışma ağacı veya indeks ile karşılaştır"
+
+#: command-list.h:90
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr ""
+"İki ağaç nesnesi aracılığıyla bulunan ikililerin içerik ve kipini karşılaştır"
+
+#: command-list.h:91
+msgid "Show changes using common diff tools"
+msgstr "Değişiklikleri yaygın diff araçlarıyla göster"
+
+#: command-list.h:92
+msgid "Git data exporter"
+msgstr "Git veri dışa aktarıcısı"
+
+#: command-list.h:93
+msgid "Backend for fast Git data importers"
+msgstr "Hızlı Git veri dışa aktarıcıları için arka uç"
+
+#: command-list.h:94
+msgid "Download objects and refs from another repository"
+msgstr "Başka bir depodan nesneleri ve başvuruları indir"
+
+#: command-list.h:95
+msgid "Receive missing objects from another repository"
+msgstr "BaÅŸka bir depodan eksik nesneleri al"
+
+#: command-list.h:96
+msgid "Rewrite branches"
+msgstr "Dalları yeniden yaz"
+
+#: command-list.h:97
+msgid "Produce a merge commit message"
+msgstr "Bir birleÅŸtirme iÅŸlemesi iletisi oluÅŸtur"
+
+#: command-list.h:98
+msgid "Output information on each ref"
+msgstr "Her başvuru üzerine bilgi çıktı ver"
+
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "Listedeki depolar üzerinde bir Git komutu çalıştır"
+
+#: command-list.h:100
+msgid "Prepare patches for e-mail submission"
+msgstr "E-posta teslimi için yamaları hazırla"
+
+#: command-list.h:101
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr "Veritab. nesnelerin bağlanırlığını ve geçerliliğini sına"
+
+#: command-list.h:102
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "Gereksiz dosyaları temizle ve yerel depoyu eniyile"
+
+#: command-list.h:103
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "İşleme iletisini bir git-archive arşivinden çıkartıp al"
+
+#: command-list.h:104
+msgid "Print lines matching a pattern"
+msgstr "Bir dizgi ile eşleşen satırları yazdır"
+
+#: command-list.h:105
+msgid "A portable graphical interface to Git"
+msgstr "Git için taşınabilir bir grafik arabirim"
+
+#: command-list.h:106
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr "Sağlamayı hesapla ve isteğe göre dosyadan ikili oluştur"
+
+#: command-list.h:107
+msgid "Display help information about Git"
+msgstr "Git yardım bilgisini görüntüle"
+
+#: command-list.h:108
+msgid "Server side implementation of Git over HTTP"
+msgstr "Git'in HTTP üzerinden sunucu tarafı uygulaması"
+
+#: command-list.h:109
+msgid "Download from a remote Git repository via HTTP"
+msgstr "HTTP üzerinden uzak bir Git deposundan indir"
+
+#: command-list.h:110
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "Nesneleri HTTP/DAV üzerinden başka bir depoya it"
+
+#: command-list.h:111
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "stdin'den bir IMAP klasörüne bir yama derlemesi gönder"
+
+#: command-list.h:112
+msgid "Build pack index file for an existing packed archive"
+msgstr "Mevcut paketli bir arşiv için paket indeks dosyası yap"
+
+#: command-list.h:113
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "Boş bir Git deposu oluştur veya olanı yeniden ilklendir"
+
+#: command-list.h:114
+msgid "Instantly browse your working repository in gitweb"
+msgstr "gitweb'deki çalışma deposuna anında göz at"
+
+#: command-list.h:115
+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
+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
+msgid "List references in a remote repository"
+msgstr "Uzak bir depodaki başvuruları listele"
+
+#: command-list.h:120
+msgid "List the contents of a tree object"
+msgstr "Bir ağaç nesnesinin içeriğini listele"
+
+#: command-list.h:121
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "E-posta iletisinden yama ve yazar bilgisini çıkart"
+
+#: command-list.h:122
+msgid "Simple UNIX mbox splitter program"
+msgstr "Yalın UNIX mbox bölücü yazılımı"
+
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "Git depo verisini eniyilemek için görevler çalıştır"
+
+#: command-list.h:124
+msgid "Join two or more development histories together"
+msgstr "İki veya daha fazla geliştirme geçmişini birleştir"
+
+#: command-list.h:125
+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
+msgid "Run a three-way file merge"
+msgstr "Bir 3 yönlü dosya birleştirmesi çalıştır"
+
+#: command-list.h:127
+msgid "Run a merge for files needing merging"
+msgstr "Birleştirilmesi gereken dosyaları birleştir"
+
+#: command-list.h:128
+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: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
+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
+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
+msgid "Find symbolic names for given revs"
+msgstr "Verilen revizyonlar için sembolik adları bul"
+
+#: command-list.h:136
+msgid "Add or inspect object notes"
+msgstr "Nesne notları ekle veya incele"
+
+#: command-list.h:137
+msgid "Import from and submit to Perforce repositories"
+msgstr "Perforce depolarından içe aktar ve onlara gönder"
+
+#: command-list.h:138
+msgid "Create a packed archive of objects"
+msgstr "PaketlenmiÅŸ bir nesne arÅŸivi oluÅŸtur"
+
+#: command-list.h:139
+msgid "Find redundant pack files"
+msgstr "Gereksiz paket dosyalarını bul"
+
+#: command-list.h:140
+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
+msgid "Compute unique ID for a patch"
+msgstr "Bir yama için eşi olmayan numara hesapla"
+
+#: command-list.h:142
+msgid "Prune all unreachable objects from the object database"
+msgstr "Ulaşılamayan tüm nesneleri nesne veritabanından buda"
+
+#: command-list.h:143
+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
+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
+msgid "Update remote refs along with associated objects"
+msgstr "İlişkin nesnelerle birlikte uzak başvuruları da güncelle"
+
+#: command-list.h:146
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "Geçerli dala bir \"Quilt\" yama seti uygula"
+
+#: command-list.h:147
+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
+msgid "Reads tree information into the index"
+msgstr "Ağaç bilgisini indekse okur"
+
+#: command-list.h:149
+msgid "Reapply commits on top of another base tip"
+msgstr "İşlemeleri başka bir temel ucu üzerine uygula"
+
+#: command-list.h:150
+msgid "Receive what is pushed into the repository"
+msgstr "Depoya ne itildiyse al"
+
+#: command-list.h:151
+msgid "Manage reflog information"
+msgstr "Başvuru günlüğü bilgisini yönet"
+
+#: command-list.h:152
+msgid "Manage set of tracked repositories"
+msgstr "İzlenen depolar setini yönet"
+
+#: command-list.h:153
+msgid "Pack unpacked objects in a repository"
+msgstr "Bir depodaki paketlenmemiÅŸ nesneleri paketle"
+
+#: command-list.h:154
+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
+msgid "Generates a summary of pending changes"
+msgstr "Bekleyen değişikliklerin bir özetini çıkart"
+
+#: command-list.h:156
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "Çakışan birleştirmelerin kayıtlı çözümlerini yen. kullan"
+
+#: command-list.h:157
+msgid "Reset current HEAD to the specified state"
+msgstr "Geçerli HEAD'i belirtilen duruma sıfırla"
+
+#: command-list.h:158
+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
+msgid "Lists commit objects in reverse chronological order"
+msgstr "İşleme nesnelerini ters kronolojik sırada listele"
+
+#: command-list.h:161
+msgid "Pick out and massage parameters"
+msgstr "Parametreleri al ve üzerinde çalış"
+
+#: command-list.h:162
+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
+msgid "Send a collection of patches as emails"
+msgstr "Bir yama derlemesini e-posta olarak gönder"
+
+#: command-list.h:164
+msgid "Push objects over Git protocol to another repository"
+msgstr "Nesneleri Git protokolü üzerinden başka bir depoya it"
+
+#: command-list.h:165
+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
+msgid "Summarize 'git log' output"
+msgstr "'git log' çıktısını özetle"
+
+#: command-list.h:167
+msgid "Show various types of objects"
+msgstr "Çeşitli türlerden nesneleri göster"
+
+#: command-list.h:168
+msgid "Show branches and their commits"
+msgstr "Dalları ve onların işlemelerini göster"
+
+#: command-list.h:169
+msgid "Show packed archive index"
+msgstr "Paketlenmiş arşiv indeksini göster"
+
+#: command-list.h:170
+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: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
+msgid "Remove unnecessary whitespace"
+msgstr "Gereksiz boşlukları kaldır"
+
+#: command-list.h:178
+msgid "Initialize, update or inspect submodules"
+msgstr "Altmodülleri ilklendir, güncelle veya incele"
+
+#: command-list.h:179
+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
+msgid "Switch branches"
+msgstr "Dal deÄŸiÅŸtir"
+
+#: command-list.h:181
+msgid "Read, modify and delete symbolic refs"
+msgstr "Sembolik başvuruları oku, düzenle ve sil"
+
+#: command-list.h:182
+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
+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
+msgid "Unpack objects from a packed archive"
+msgstr "Paketlenmiş bir arşivden nesneleri çıkar"
+
+#: command-list.h:185
+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
+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
+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
+msgid "Send archive back to git-archive"
+msgstr "Arşivi git-archive'e geri gönder"
+
+#: command-list.h:189
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "Nesneleri git-fetch-pack'e paketlenmiş olarak geri gönder"
+
+#: command-list.h:190
+msgid "Show a Git logical variable"
+msgstr "Bir mantıksal Git değişkeni göster"
+
+#: command-list.h:191
+msgid "Check the GPG signature of commits"
+msgstr "İşlemelerin GPG imzasını denetle"
+
+#: command-list.h:192
+msgid "Validate packed Git archive files"
+msgstr "Paketlenmiş Git arşiv dosyalarını doğrula"
+
+#: command-list.h:193
+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
+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
+msgid "Manage multiple working trees"
+msgstr "Birden çok çalışma ağacını yönet"
+
+#: command-list.h:197
+msgid "Create a tree object from the current index"
+msgstr "Geçerli indeksten bir ağaç nesnesi oluştur"
+
+#: command-list.h:198
+msgid "Defining attributes per path"
+msgstr "Öznitelikleri yola göre tanımla"
+
+#: command-list.h:199
+msgid "Git command-line interface and conventions"
+msgstr "Git komut satırı arabirimi ve kuralları"
+
+#: command-list.h:200
+msgid "A Git core tutorial for developers"
+msgstr "Geliştiriciler için Git çekirdeği eğitmeni"
+
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "Git'e kullanıcı adları ve parolalar belirt"
+
+#: command-list.h:202
+msgid "Git for CVS users"
+msgstr "CVS kullanıcıları için Git"
+
+#: command-list.h:203
+msgid "Tweaking diff output"
+msgstr "diff çıktısı için ince ayarlar"
+
+#: command-list.h:204
+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
+msgid "Frequently asked questions about using Git"
+msgstr "Git kullanımı hakkında sıkça sorulan sorular"
+
+#: command-list.h:206
+msgid "A Git Glossary"
+msgstr "Git Kavram Dizini"
+
+#: command-list.h:207
+msgid "Hooks used by Git"
+msgstr "Git tarafından kullanılan kancalar"
+
+#: command-list.h:208
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "Özellikle yok sayılması istenen dosyaları belirt"
+
+#: command-list.h:209
+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
+msgid "Defining submodule properties"
+msgstr "Altmodül özelliklerini tanımlama"
+
+#: command-list.h:211
+msgid "Git namespaces"
+msgstr "Git ad alanları"
+
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "Uzak depolar ile etkileşim için yardımcı programlar"
+
+#: command-list.h:213
+msgid "Git Repository Layout"
+msgstr "Git Depo YerleÅŸimi"
+
+#: command-list.h:214
+msgid "Specifying revisions and ranges for Git"
+msgstr "Git için revizyonları ve erimleri belirtme"
+
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "Bir depoyu bir başkasının içine bağlama"
+
+#: 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ÅŸ"
+
+#: 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 "
+"merge"
+msgstr ""
+"Hata: Birleştirme ile aşağıdaki dosyalara olan değişikliklerin üzerine "
+"yazılacak"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "Otomatikleştirilmiş birleştirme işe yaramadı."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr "Bir ahtapot birleştirmesi yapılmamalı."
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "$pretty_name ile olan ortak işleme bulunamıyor"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "$pretty_name ile her şey güncel"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Ä°leri sarma konumu: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+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"
+
+#: 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:248
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr "'$sm_path' altmodülü eklenemedi"
+
+#: git-submodule.sh:257
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "'$sm_path' altmodülü kaydı yapılamadı"
+
+#: git-submodule.sh:532
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr "'$displaypath' altmodül yolunda geçerli revizyon bulunamadı"
+
+#: git-submodule.sh:542
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr "'$sm_path' altmodül yolunda getirme yapılamadı"
+
+#: git-submodule.sh:547
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"'$sm_path' altmodül yolunda geçerli ${remote_name}/${branch} revizyonu "
+"bulunamadı"
+
+#: git-submodule.sh:565
+#, 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:571
+#, 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:578
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr "'$displaypath' altmodül yolunda '$sha1' çıkışı yapılamadı"
+
+#: git-submodule.sh:579
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "Altmodül yolu '$displaypath': '$sha1' çıkışı yaptı"
+
+#: git-submodule.sh:583
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr "'$sha1', '$displaypath' altmodül yolunda yeniden temellendirilemedi"
+
+#: git-submodule.sh:584
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "Altmodül yolu '$displaypath': '$sha1' içine yeniden temellendirildi"
+
+#: git-submodule.sh:589
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "'$sha1', '$displaypath' altmodül yolunda birleştirilemedi"
+
+#: git-submodule.sh:590
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "Altmodül yolu '$displaypath': '$sha1' içinde birleştirildi"
+
+#: git-submodule.sh:595
+#, 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:596
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Altmodül yolu '$displaypath': '$command $sha1'"
+
+#: git-submodule.sh:627
+#, 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
+#, 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
+#, 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"
+
+#: 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
+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
+#, 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
+#, 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
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Ek olarak, indeksinizde iÅŸlenmemiÅŸ deÄŸiÅŸiklikleriniz var."
+
+#: git-sh-setup.sh:373
+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
+msgid "Unable to determine absolute path of git directory"
+msgstr "Git dizininin kesin yolu algılanamıyor"
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:212
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%12s %12s %s"
+
+#: git-add--interactive.perl:632
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "%d yola dokunuldu\n"
+msgstr[1] "%d yola dokunuldu\n"
+
+#: git-add--interactive.perl:1056
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal hazırlama\n"
+"için imlenecektir."
+
+#: git-add--interactive.perl:1059
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal zulalama\n"
+"için imlenecektir."
+
+#: git-add--interactive.perl:1062
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+"Eğer yama sorunsuzca uygulanırsa, düzenlenen parça derhal hazırlıktan\n"
+"çıkarılma için imlenecektir."
+
+#: 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."
+msgstr ""
+"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal uygulama\n"
+"için imlenecektir."
+
+#: 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."
+msgstr ""
+"Eğer yama sorunsuzca uygulanırsa düzenlenen parça derhal ıskartaya\n"
+"çıkarım için imlenecektir."
+
+#: git-add--interactive.perl:1114
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "parça düzenleme dosyası yazım için açılamadı: %s"
+
+#: git-add--interactive.perl:1121
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"'%s' satır kaldırmak için onları ' ' satır yapın (bağlam).\n"
+"'%s' satır kaldırmak için onları silin.\n"
+"%s ile başlayan satırlar kaldırılacaktır.\n"
+
+#: git-add--interactive.perl:1143
+#, perl-format
+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
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parçayı hazırla\n"
+"n - bu parçayı hazırlama\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini hazırlama\n"
+"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
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parçayı zulala\n"
+"n - bu parçayı zulalama\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini zulalama\n"
+"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
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parçayı hazırlıktan çıkar\n"
+"n - bu parçayı hazırlıktan çıkarma\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini hazırlıktan çıkarma\n"
+"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
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parçayı indekse uygula\n"
+"n - bu parçayı indekse uygulama\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n"
+"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
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parçayı çalışma ağacından at\n"
+"n - bu parçayı çalışma ağacından atma\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini atma\n"
+"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
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parçayı çalışma ağacından ve indeksten at\n"
+"n - bu parçayı çalışma ağacından ve indeksten atma\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini atma\n"
+"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
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parçayı indekse ve çalışma ağacına uygula\n"
+"n - bu parçayı indekse ve çalışma ağacına uygulama\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n"
+"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
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - bu parçayı çalışma ağacına uygula\n"
+"n - bu parçayı çalışma ağacına uygulama\n"
+"q - çık; bu parçayı veya kalanlardan herhangi birini uygulama\n"
+"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
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - gidilecek bir parça seç\n"
+"/ - verilen düzenli ifade ile eşleşen bir parça ara\n"
+"j - bu parça için sonra karar ver, bir sonraki karar verilmemiş parçayı gör\n"
+"J - bu parça için sonra karar ver, bir sonraki parçayı gör\n"
+"k - bu parça için sonra karar ver, bir önceki karar verilmemiş parçayı gör\n"
+"K - bu parça için sonra karar ver, bir önceki parçayı gör\n"
+"s - geçerli parçayı daha ufak parçalara böl\n"
+"e - geçerli parçayı el ile düzenle\n"
+"? - yardımı yazdır\n"
+
+#: git-add--interactive.perl:1345
+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
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "birleştirilmeyenler yok sayılıyor: %s\n"
+
+#: git-add--interactive.perl:1479
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "No other hunks to goto\n"
+msgstr "Gidilecek başka parça yok\n"
+
+#: git-add--interactive.perl:1617
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "Geçersiz sayı: '%s'\n"
+
+#: git-add--interactive.perl:1622
+#, 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
+msgid "No other hunks to search\n"
+msgstr "Aranacak başka parça yok\n"
+
+#: git-add--interactive.perl:1674
+#, 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
+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
+msgid "No previous hunk\n"
+msgstr "Öncesinde parça yok\n"
+
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+msgid "No next hunk\n"
+msgstr "Sonrasında parça yok\n"
+
+#: git-add--interactive.perl:1730
+msgid "Sorry, cannot split this hunk\n"
+msgstr "Üzgünüm, bu parça bölünemiyor\n"
+
+#: git-add--interactive.perl:1736
+#, 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
+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
+msgid ""
+"status        - show paths with changes\n"
+"update        - add working tree state to the staged set of changes\n"
+"revert        - revert staged set of changes back to the HEAD version\n"
+"patch         - pick hunks and update selectively\n"
+"diff          - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+"status        - değişiklik içeren yolları göster\n"
+"update        - çalışma ağacı durumunu hazırlanan değişiklik setine ekle\n"
+"revert        - hazırlanan değişiklik setini HEAD sürümüne geri al\n"
+"patch         - parçaları seç ve seçici olarak güncelle\n"
+"diff          - HEAD ve indeks arasındaki diff'i (ayrımları) görüntüle\n"
+"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
+msgid "missing --"
+msgstr "-- eksik"
+
+#: git-add--interactive.perl:1866
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "bilinmeyen --patch kipi: %s"
+
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "geçersiz argüman %s, -- bekleniyor"
+
+#: git-send-email.perl:129
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr "yerel dilim GMT'den bir dakikadan az bir aralıkla ayrımlı\n"
+
+#: git-send-email.perl:136 git-send-email.perl:142
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "yerel saat ofseti 24 saate eşit veya daha büyük\n"
+
+#: git-send-email.perl:214
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "onulmaz: '%s' komutu %d çıkış koduyla sonlandı"
+
+#: git-send-email.perl:227
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "düzenleyici düzgünce çıkmadı, her şey iptal ediliyor"
+
+#: git-send-email.perl:316
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr "'%s' yazmakta olduğunuz e-postanın orta düzey bir sürümünü içeriyor.\n"
+
+#: git-send-email.perl:321
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' yazılan e-postayı içeriyor.\n"
+
+#: git-send-email.perl:450
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases diğer seçeneklerle uyumsuz\n"
+
+#: 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 ""
+"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"
+
+#: git-send-email.perl:530 git-send-email.perl:746
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "'git format-patch' bir deponun dışından çalıştırılamıyor\n"
+
+#: git-send-email.perl:533
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr ""
+"'batch-size' ve 'relogin' birlikte belirtilmeli (komut satırı veya "
+"yapılandırma seçeneklerinden)\n"
+
+#: git-send-email.perl:546
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "Bilinmeyen --suppress-cc alanı: '%s'\n"
+
+#: git-send-email.perl:577
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Bilinmeyen --confirm ayarı: '%s'\n"
+
+#: git-send-email.perl:617
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr "uyarı: tırnak içine alınmış sendmail arması desteklenmiyor: %s\n"
+
+#: git-send-email.perl:619
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "uyarı: ':include:' desteklenmiyor: %s\n"
+
+#: git-send-email.perl:621
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "uyarı: '/file' veya '|pipe' yeniden yönlendirmesi desteklenmiyor: %s\n"
+
+#: git-send-email.perl:626
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "uyarı: sendmail satırı tanımlanamadı: %s\n"
+
+#: git-send-email.perl:711
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for.  Please disambiguate by...\n"
+"\n"
+"    * Saying \"./%s\" if you mean a file; or\n"
+"    * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"'%s' dosyası mevcut; ancak aynı zamanda yama üretilecek işlemelerin\n"
+"bir erimi de olabilir. Lütfen şunları kullanarak açıklık getirin:\n"
+"\n"
+"\t* Bir dosya demek istiyorsanız \"./%s\" diyerek veya\n"
+"\t* Bir erim demek istiyorsanız --format-patch seçeneğini vererek\n"
+
+#: git-send-email.perl:732
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "%s opendir yapılamadı: %s"
+
+#: git-send-email.perl:767
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"Hiçbir yama dosyası belirtilmedi!\n"
+"\n"
+
+#: git-send-email.perl:780
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "%s içinde konu satırı yok mu?"
+
+#: git-send-email.perl:791
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "%s yazma için açılamadı: %s"
+
+#: git-send-email.perl:802
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+"\"GIT:\" ile başlayan satırlar kaldırılacaktır.\n"
+"Yazdığınız yama için genel bir diffstat veya içerik tablosu\n"
+"eklemeyi düşünün.\n"
+"\n"
+"Bir özet göndermek istemiyorsanız gövde kısmını temizleyin.\n"
+
+#: git-send-email.perl:826
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "%s açılamadı: %s"
+
+#: git-send-email.perl:843
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "%s.final açılamadı: %s"
+
+#: git-send-email.perl:886
+msgid "Summary email is empty, skipping it\n"
+msgstr "Özet e-postası boş, atlanıyor\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:935
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "<%s> kullanmak istediÄŸinizden emin misiniz [y/N]? "
+
+#: git-send-email.perl:990
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Aşağıdaki dosyalar 8 bit; ancak Content-Transfer-Encoding desteklemiyorlar.\n"
+
+#: git-send-email.perl:995
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "Hangi 8 bit kodlamayı beyan etmeliyim [UTF-8]? "
+
+#: git-send-email.perl:1003
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+"Gönderme reddediliyor; çünkü\n"
+"\t%s\n"
+"içinde '*** SUBJECT HERE ***' konu şablonu var. Yine de göndermek "
+"istiyorsanız --force kullanın.\n"
+
+#: git-send-email.perl:1022
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "E-postalar kime gönderilmeli (eğer gerekliyse)?"
+
+#: git-send-email.perl:1040
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "onulmaz: '%s' arması kendisine genişliyor\n"
+
+#: git-send-email.perl:1052
+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)?"
+
+#: git-send-email.perl:1114 git-send-email.perl:1122
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "hata: şuradan geçerli bir adres çıkartılamadı: %s\n"
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1126
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr "Bu adresle ne yapılsın? ([q] çık|[d] bırak|düz[e]nle): "
+
+#: git-send-email.perl:1446
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "CA yolu \"%s\" mevcut deÄŸil"
+
+#: 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"
+"    send-email prompts before sending whenever this occurs.\n"
+"    This behavior is controlled by the sendemail.confirm\n"
+"    configuration setting.\n"
+"\n"
+"    For additional information, run 'git send-email --help'.\n"
+"    To retain the current behavior, but squelch this message,\n"
+"    run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+"    Yukarıdaki Cc listesi yama işleme iletisinde bulunan adresler\n"
+"    kullanılarak genişletilmiştir. Bu gerçekleştiğinde send-email\n"
+"    öntanımlı olarak iletiyi göndermeden önce sorar. Bu davranış\n"
+"    sendemail.confirm yapılandırma ayarıyla denetlenir.\n"
+"\n"
+"    Ek bilgi için 'git send-email --help' çalıştırın.\n"
+"    Geçerli davranışı korumak; ancak bu iletiyi susturmak için\n"
+"    'git config --global sendemail.confirm auto' çalıştırın.\n"
+"\n"
+
+#. TRANSLATORS: Make sure to include [y] [n] [e] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1544
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr ""
+"Bu e-posta gönderilsin mi? ([y] evet|[n] hayır|düz[e]nle|[q] çık|[a] tümü): "
+
+#: git-send-email.perl:1547
+msgid "Send this email reply required"
+msgstr "Bu e-postayı yanıt gerektirme seçeneğiyle gönder"
+
+#: git-send-email.perl:1581
+msgid "The required SMTP server is not properly defined."
+msgstr "Gerekli SMTP sunucusu düzgünce tanımlanmamış."
+
+#: git-send-email.perl:1628
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "Sunucu STARTTLS desteklemiyor! %s"
+
+#: git-send-email.perl:1633 git-send-email.perl:1637
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS başarısız oldu! %s"
+
+#: git-send-email.perl:1646
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"SMTP düzgünce başlatılamıyor. Yapılandırmayı denetleyin ve --smtp-debug "
+"yapın."
+
+#: git-send-email.perl:1664
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "%s gönderilemedi\n"
+
+#: git-send-email.perl:1667
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "%s gönderilir gibi yapıldı\n"
+
+#: git-send-email.perl:1667
+#, perl-format
+msgid "Sent %s\n"
+msgstr "%s gönderildi\n"
+
+#: git-send-email.perl:1669
+msgid "Dry-OK. Log says:\n"
+msgstr "Sınama tamam. Günlük çıktısı:\n"
+
+#: git-send-email.perl:1669
+msgid "OK. Log says:\n"
+msgstr "Tamam. Günlük çıktısı:\n"
+
+#: git-send-email.perl:1688
+msgid "Result: "
+msgstr "Sonuç: "
+
+#: git-send-email.perl:1691
+msgid "Result: OK\n"
+msgstr "Sonuç: Tamam\n"
+
+#: git-send-email.perl:1709
+#, perl-format
+msgid "can't open file %s"
+msgstr "%s dosyası açılamıyor"
+
+#: git-send-email.perl:1756 git-send-email.perl:1776
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Cc: %s, '%s' satırından ekleniyor\n"
+
+#: git-send-email.perl:1762
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) To: %s, '%s' satırından ekleniyor\n"
+
+#: git-send-email.perl:1819
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(non-mbox) Cc: %s, '%s' satırından ekleniyor\n"
+
+#: git-send-email.perl:1854
+#, 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:1965
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) '%s' çalıştırılamadı"
+
+#: git-send-email.perl:1972
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) %s: %s, '%s' konumundan ekleniyor\n"
+
+#: git-send-email.perl:1976
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) şuraya olan veri yolu kapatılamadı: '%s'"
+
+#: git-send-email.perl:2006
+msgid "cannot send message as 7bit"
+msgstr "ileti 7 bit olarak gönderilemiyor"
+
+#: git-send-email.perl:2014
+msgid "invalid transfer encoding"
+msgstr "geçersiz aktarım kodlaması"
+
+#: 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 ""
+"onulmaz: %s: sendemail-validate kancası tarafından reddedildi\n"
+"%s\n"
+"uyarı: hiçbir yama gönderilmedi\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 "%s açılamıyor: %s\n"
+
+#: git-send-email.perl:2064
+#, perl-format
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"onulmaz: %s:%d, 998 karakterden uzun\n"
+"uyarı: hiçbir yama gönderilmedi\n"
+
+#: git-send-email.perl:2082
+#, 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:2086
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "%s ögesini gerçekten göndermek istiyor musunuz? [y|N]: "
+
+#~ msgid "unable to write stateless separator packet"
+#~ msgstr "durumsuz ayırıcı paketi yazılamıyor"
+
+#~ 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 "uzak sunucu durumsuz ayırıcı gönderdi"
diff --git a/po/vi.po b/po/vi.po
index a00211f689..40b9996c40 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,14 +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.
+# Trần Ng�c Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021.
+# �oàn Trần Công Danh <congdanhqx@gmail.com>, 2020.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: git v2.24.0\n"
+"Project-Id-Version: git 2.33.0-rc2\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-10-28 13:19+0800\n"
-"PO-Revision-Date: 2019-10-29 14:35+0700\n"
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"PO-Revision-Date: 2021-08-14 14:53+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"
@@ -18,49 +19,780 @@ 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-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-Basepath: ..\n"
-"X-Generator: Gtranslator 2.91.7\n"
+"X-Generator: Poedit 3.0\n"
 
-#: advice.c:109
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "Hả (%s)?"
+
+#: 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 "không thể đ�c bảng mục lục"
+
+#: add-interactive.c:584 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
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "không có gì"
+
+#: add-interactive.c:643 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
+msgid "Update"
+msgstr "Cập nhật"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, 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:88 sequencer.c:3707
+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
+#, 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
+#, 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
+#, 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
+msgid "Revert"
+msgstr "Hoàn nguyên"
+
+#: add-interactive.c:775
+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
+#, 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
+#, 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
+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
+#, 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
+#, 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:1752 git-add--interactive.perl:1369
+#, 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:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "Không có thay đổi nào.\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "Cập nhật miếng vá"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "Xem xét lại diff"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "hiển thị đư�ng dẫn với các thay đổi"
+
+#: add-interactive.c:1012
+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
+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
+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
+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
+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
+msgid "Prompt help:"
+msgstr "Trợ giúp v� nhắc:"
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "ch�n một mục đơn"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "ch�n một vùng các mục"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "ch�n nhi�u vùng"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+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
+msgid "unselect specified items"
+msgstr "b� ch�n các mục đã cho"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "ch�n tất cả các mục"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "(để trống) hoàn tất ch�n lựa"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "tùy ch�n mục bằng số"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "(để trống) không ch�n gì"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** Lệnh ***"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "Gi� thì sao"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "đã đưa lên bệ phóng"
+
+#: add-interactive.c:1144 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: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 "đư�ng-dẫn"
+
+#: add-interactive.c:1151
+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:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "Tạm biệt.\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:39
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"staging."
+msgstr ""
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
+"để chuyển lên bệ phóng."
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\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 sau này trong tập tin\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 trong tập "
+"tin\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 "Thay đổi chế độ tạm cất đi [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 "Xóa tạm cất [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:61
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"stashing."
+msgstr ""
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
+"để tạm cất."
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - tạm cất khúc này\n"
+"n - đừng tạm cất khúc này\n"
+"q - thoát; đừng tạm cất khúc này cũng như bất kỳ cái nào còn lại\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:85
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be marked for "
+"unstaging."
+msgstr ""
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
+"để b� ra kh�i bệ phóng."
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - đưa ra kh�i bệ phóng khúc này\n"
+"n - đừng đưa ra kh�i bệ phóng khúc này\n"
+"q - thoát; đừ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\n"
+"a - đưa ra kh�i bệ phóng khúc này và tất cả các khúc sau này trong tập tin\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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 ""
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
+"để áp dụng."
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - áp dụng khúc này vào mục lục\n"
+"n - đừng áp dụng khúc này vào mục lục\n"
+"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: 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 ""
+"Nếu miếng vá được áp dụng sạch sẽ, khúc đã sửa sẽ ngay lập tức được đánh dấu "
+"để loại b�."
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - loại b� khúc này kh�i cây làm việc\n"
+"n - đừng loại b� khúc kh�i cây làm việc\n"
+"q - thoát; đừng loại b� khúc này cũng như bất kỳ cái nào còn lại\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - loại b� khúc này kh�i mục lục và cây làm việc\n"
+"n - đừng loại b� khúc kh�i mục lục và cây làm việc\n"
+"q - thoát; đừng loại b� khúc này cũng như bất kỳ cái nào còn lại\n"
+"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
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - áp dụng khúc này vào mục lục và cây làm việc\n"
+"n - đừng áp dụng khúc vào mục lục và cây làm việc\n"
+"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n"
+"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:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - áp dụng khúc này vào cây làm việc\n"
+"n - đừng áp dụng khúc vào cây làm việc\n"
+"q - thoát; đừng áp dụng khúc này cũng như bất kỳ cái nào còn lại\n"
+"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: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: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:420
+msgid "could not parse diff"
+msgstr "không thể phân tích cú pháp khác biệt"
+
+#: 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:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr "gặp lỗi khi chạy “%s�"
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "đầu ra không khớp từ interactive.diffFilter"
+
+#: add-patch.c:613
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+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:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"cần dòng ngữ cảnh #%d trong\n"
+"%.*s"
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"các khối không chồng đè lên nhau:\n"
+"%.*s\n"
+"\tkhông được kết thúc bằng:\n"
+"%.*s"
+
+#: 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:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"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�, 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: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ếu miếng vá không được áp dụng sạch sẽ, bạn sẽ có một cơ hội\n"
+"để 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: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:1178
+msgid "'git apply --cached' failed"
+msgstr "“git apply --cached� gặp lỗi"
+
+#. 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.
+#.
+#. 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:1247 git-add--interactive.perl:1242
+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: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:1291 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "Vẫn áp dụng chúng cho cây làm việc? "
+
+#: add-patch.c:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "�ã không áp dụng gì cả.\n"
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - để lại khúc này là chưa quyết định, xem khúc chưa quyết định kế tiếp\n"
+"J - để lại khúc này là chưa quyết định, xem khúc kế tiếp\n"
+"k - để lại khúc này là chưa quyết định, xem khúc chưa quyết định kế trước\n"
+"K - để lại khúc này là chưa quyết định, xem khúc kế trước\n"
+"g - ch�n một khúc muốn tới\n"
+"/ - tìm một khúc khớp với biểu thức chính quy đưa ra\n"
+"s - chia khúc hiện tại thành các khúc nh� hơn\n"
+"e - sửa bằng tay khúc hiện hành\n"
+"? - hiển thị trợ giúp\n"
+
+#: add-patch.c:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr "Không có khúc kế trước"
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr "Không có khúc kế tiếp"
+
+#: 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:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "nhảy đến khúc nào (<ret> để xem thêm)? "
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "nhảy đến khúc nào? "
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "Số không hợp lệ: “%s�"
+
+#: 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:1575
+msgid "No other hunks to search"
+msgstr "Không còn khúc nào để mà tìm kiếm"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "tìm kiếm cho biểu thức chính quy? "
+
+#: 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: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:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "Rất tiếc, không thể chia nh� khúc này"
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr "Chi nh� thành %d khúc."
+
+#: 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:1680
+msgid "'git apply' failed"
+msgstr "“git apply� gặp lỗi"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"Tắt l�i nhắn này bằng \"git config advice.%s false\""
+
+#: advice.c:161
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%sgợi ý: %.*s%s\n"
 
-#: advice.c:162
+#: advice.c:252
 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:164
+#: advice.c:254
 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."
 
-#: advice.c:166
+#: advice.c:256
 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."
 
-#: advice.c:168
+#: advice.c:258
 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."
 
-#: advice.c:170
+#: advice.c:260
 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."
 
-#: advice.c:172
+#: advice.c:262
 #, 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:180
+#: 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."
@@ -68,23 +800,41 @@ 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:188
+#: advice.c:278
 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:193 builtin/merge.c:1332
+#: advice.c:283 builtin/merge.c:1375
 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:195
+#: advice.c:285
 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:196
+#: advice.c:286
 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:202
+#: 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 ""
+"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"
+
+#: advice.c:303
+msgid ""
+"Disable or modify the sparsity rules if you intend to update such entries."
+msgstr ""
+"Vô hiệu hóa hoặc sửa đổi các quy tắc sparsity nếu bạn có ý định cập nhật các "
+"mục như vậy."
+
+#: advice.c:310
 #, c-format
 msgid ""
 "Note: switching to '%s'.\n"
@@ -115,9 +865,9 @@ msgstr ""
 "\n"
 "Nếu bạn muốn tạo một nhánh mới để giữ lại các lần chuyển giao bạn tạo,\n"
 "bạn có thể làm thế (ngay bây gi� hay sau này) bằng cách dùng tùy ch�n\n"
-"dòng lệnh -b. Ví dụ:\n"
+"dòng lệnh -c. Ví dụ:\n"
 "\n"
-"  git checkout -c <tên-nhánh-mới>\n"
+"  git switch -c <tên-nhánh-mới>\n"
 "\n"
 "Hoàn lại thao tác này bằng:\n"
 "\n"
@@ -134,85 +884,81 @@ msgstr "cmdline kết thúc với \\"
 msgid "unclosed quote"
 msgstr "chưa có dấu nháy đóng"
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "không nhận ra tùy ch�n v� khoảng trắng “%s�"
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 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:135
+#: 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:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached và --3way không thể dùng cùng nhau."
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
 msgstr "--3way ở ngoài một kho chứa"
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
 msgstr "--index ở ngoài một kho chứa"
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
 msgstr "--cached ở ngoài một kho chứa"
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr ""
 "Không thể chuẩn bị biểu thức chính qui dấu vết th�i gian (timestamp regexp) "
 "%s"
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "thi hành biểu thức chính quy trả v� %d cho đầu vào: %s"
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "không thể tìm thấy tên tập tin trong miếng vá tại dòng %d"
 
-#: apply.c: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 sai - cần /dev/null, nhưng lại nhận được %s trên dòng %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 sai - tên tập tin mới không nhất quán trên dòng %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 sai - tên tập tin cũ không nhất quán trên dòng %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 sai - cần “/dev/null� trên dòng %d"
 
-#: apply.c:963
+#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "chế độ không hợp lệ trên dòng %d: %s"
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "phần đầu mâu thuẫn dòng %d và %d"
 
-#: apply.c:1372
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -224,91 +970,91 @@ msgstr[0] ""
 "phần đầu diff cho git  thiếu thông tin tên tập tin khi gỡ b� đi %d trong "
 "thành phần dẫn đầu tên của đư�ng dẫn (dòng %d)"
 
-#: apply.c:1385
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "phần đầu diff cho git thiếu thông tin tên tập tin (dòng %d)"
 
-#: apply.c:1481
+#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "chi tiết: dòng không cần: %.*s"
 
-#: apply.c:1550
+#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "miếng vá phân mảnh mà không có phần đầu tại dòng %d: %.*s"
 
-#: apply.c:1753
+#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "tập tin mới phụ thuộc vào nội dung cũ"
 
-#: apply.c:1755
+#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "tập tin đã xóa vẫn còn nội dung"
 
-#: apply.c:1789
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "miếng vá h�ng tại dòng %d"
 
-#: apply.c:1826
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "tập tin mới %s phụ thuộc vào nội dung cũ"
 
-#: apply.c:1828
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "tập tin đã xóa %s vẫn còn nội dung"
 
-#: apply.c:1831
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** cảnh báo: tập tin %s trở nên trống rỗng nhưng không bị xóa"
 
-#: apply.c:1978
+#: apply.c:1977
 #, 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:2015
+#: apply.c:2014
 #, 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:2177
+#: apply.c:2176
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "vá chỉ với “rác� tại dòng %d"
 
-#: apply.c:2263
+#: apply.c:2262
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "không thể đ�c liên kết m�m %s"
 
-#: apply.c:2267
+#: apply.c:2266
 #, c-format
 msgid "unable to open or read %s"
 msgstr "không thể mở hay đ�c %s"
 
-#: apply.c:2926
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "sai khởi đầu dòng: “%c�"
 
-#: apply.c:3047
+#: 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] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)."
 
-#: apply.c:3059
+#: apply.c:3068
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
-msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
+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:3065
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -317,456 +1063,495 @@ msgstr ""
 "trong khi đang tìm kiếm cho:\n"
 "%.*s"
 
-#: apply.c:3087
+#: apply.c:3096
 #, 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:3095
+#: apply.c:3104
 #, 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:3142
+#: apply.c:3151
 #, 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:3152
+#: apply.c:3162
 #, 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:3160
+#: apply.c:3170
 #, 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:3178
+#: apply.c:3188
 #, 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:3191
+#: apply.c:3201
 #, 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:3197
+#: apply.c:3208
 #, 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:3218
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "gặp lỗi khi vá: %s:%ld"
 
-#: apply.c:3341
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
 msgstr "không thể lấy ra %s"
 
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
+#: 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 "gặp lỗi khi đ�c %s"
 
-#: apply.c:3401
+#: apply.c:3412
 #, 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:3430 apply.c:3673
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "đư�ng dẫn %s đã bị xóa hoặc đổi tên"
 
-#: apply.c:3516 apply.c:3688
+#: apply.c:3527 apply.c:3702
 #, 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:3525 apply.c:3696
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s: không khớp trong mục lục"
 
-#: apply.c:3560
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr "kho thiếu đối tượng blob cần thiết để trở v� trên “3-way merge�."
+#: apply.c:3571
+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:3563
+#: apply.c:3574
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "�ang trở lại hòa trộn “3-đư�ng�…\n"
+msgid "Performing three-way merge...\n"
+msgstr "�ang thực hiện hòa trộn “3-đư�ng�…\n"
 
-#: apply.c:3579 apply.c:3583
+#: apply.c:3590 apply.c:3594
 #, 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:3595
+#: apply.c:3606
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "Gặp lỗi khi quay trở lại để hòa trộn kiểu “three-way�…\n"
+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:3609
+#: apply.c:3620
 #, 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:3614
+#: apply.c:3625
 #, 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:3640
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "�ang trở lại ứng dụng chi phối…\n"
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr "loại b� miếng vá để lại nội dung tập tin"
 
-#: apply.c:3713
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s: sai kiểu"
 
-#: apply.c:3715
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s có kiểu %o, cần %o"
 
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: 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 "đư�ng dẫn không hợp lệ “%s�"
 
-#: apply.c:3924
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s: đã có từ trước trong bảng mục lục"
 
-#: apply.c:3927
+#: apply.c:3956
 #, 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:3947
+#: apply.c:3976
 #, 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:3952
+#: apply.c:3981
 #, 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:3972
+#: apply.c:4001
 #, 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:3976
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s: miếng vá không được áp dụng"
 
-#: apply.c:3991
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
 msgstr "�ang kiểm tra miếng vá %s…"
 
-#: apply.c:4083
+#: apply.c:4112
 #, 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:4090
+#: apply.c:4119
 #, 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:4093
+#: apply.c:4122
 #, 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:4098 builtin/checkout.c:279 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry gặp lỗi đối với đư�ng dẫn “%s�"
-
-#: apply.c:4102
+#: apply.c:4131
 #, 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:4112
+#: apply.c:4141
 #, 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:4250
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "không thể gỡ b� %s từ mục lục"
 
-#: apply.c:4284
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "miếng vá sai h�ng cho mô-đun-con %s"
 
-#: apply.c:4290
+#: apply.c:4319
 #, 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:4298
+#: apply.c:4327
 #, 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:4304 apply.c:4449
+#: apply.c:4333 apply.c:4478
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "không thể thêm mục nhớ đệm cho %s"
 
-#: apply.c:4347
+#: apply.c:4376 builtin/bisect--helper.c:525
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "gặp lỗi khi ghi vào “%s�"
 
-#: apply.c:4351
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
 msgstr "đang đóng tập tin “%s�"
 
-#: apply.c:4421
+#: apply.c:4450
 #, 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:4519
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�ã áp dụng miếng vá %s một cách sạch sẽ."
 
-#: apply.c:4527
+#: apply.c:4556
 msgid "internal error"
 msgstr "lá»—i ná»™i bá»™"
 
-#: apply.c:4530
+#: apply.c:4559
 #, 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:4541
+#: apply.c:4570
 #, 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:4549 builtin/fetch.c:898 builtin/fetch.c:1194
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
 msgstr "không mở được “%s�"
 
-#: apply.c:4563
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "Khối nhớ #%d được áp dụng g�n gàng."
 
-#: apply.c:4567
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "�oạn dữ liệu #%d bị từ chối."
 
-#: apply.c:4686
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "B� qua đư�ng dẫn “%s�."
 
-#: apply.c:4694
+#: apply.c:4733
 msgid "unrecognized input"
 msgstr "không thừa nhận đầu vào"
 
-#: apply.c:4714
+#: apply.c:4753
 msgid "unable to read index file"
 msgstr "không thể đ�c tập tin lưu bảng mục lục"
 
-#: apply.c:4871
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "không thể mở miếng vá “%s�: %s"
 
-#: apply.c:4898
+#: apply.c:4937
 #, 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:4904 apply.c:4919
+#: apply.c:4943 apply.c:4958
 #, 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:4912
+#: 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 dòng được áp dụng sau khi sửa các lỗi khoảng trắng."
 
-#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
 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:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "đư�ng-dẫn"
-
-#: apply.c:4956
+#: apply.c:4995
 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:4959
+#: apply.c:4998
 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:4961 builtin/am.c:2206
+#: apply.c:5000 builtin/am.c:2318
 msgid "num"
 msgstr "số"
 
-#: apply.c:4962
+#: apply.c:5001
 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:4965
+#: apply.c:5004
 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:4967
+#: apply.c:5006
 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:4971
+#: apply.c:5010
 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:4973
+#: apply.c:5012
 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:4975
+#: apply.c:5014
 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:4977
+#: apply.c:5016
 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:4979
+#: apply.c:5018
 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:4981
+#: apply.c:5020
 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:4983
+#: apply.c:5022
 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:4986
+#: apply.c:5025
 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:4988
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được"
+#: apply.c:5027
+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:4990
+#: apply.c:5029
 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:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
 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:4995
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
-msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
+msgstr "đảm bảo rằng có ít nhất <n> dòng ngữ cảnh khớp"
 
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
+#: 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 "hành động"
 
-#: apply.c:4997
+#: apply.c:5036
 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:5000 apply.c:5003
+#: apply.c:5039 apply.c:5042
 msgid "ignore changes in whitespace when finding context"
-msgstr "l� đi sự thay đổi do khoảng trắng gây ra khi quét nội dung"
+msgstr "l� đi sự thay đổi do khoảng trắng gây ra khi tìm ngữ cảnh"
 
-#: apply.c:5006
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr "áp dụng miếng vá theo chi�u ngược"
 
-#: apply.c:5008
+#: apply.c:5047
 msgid "don't expect at least one line of context"
-msgstr "đừng hy v�ng có ít nhất một dòng nội dung"
+msgstr "đừng hy v�ng có ít nhất một dòng ngữ cảnh"
 
-#: apply.c:5010
+#: apply.c:5049
 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:5012
+#: apply.c:5051
 msgid "allow overlapping hunks"
 msgstr "cho phép chồng khối nhớ"
 
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 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 "chi tiết"
 
-#: apply.c:5015
+#: apply.c:5054
 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:5018
+#: apply.c:5057
 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:5020 builtin/am.c:2194
+#: apply.c:5059 builtin/am.c:2306
 msgid "root"
 msgstr "gốc"
 
-#: apply.c:5021
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr "treo thêm <root> vào tất cả các tên tập tin"
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+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)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "không thể bắt đầu bộ l�c “%s�"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "không thể chuyển hướng mô tả"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "bộ l�c “%s� đã báo cáo lỗi"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "đư�ng dẫn không hợp lệ UTF-8: %s"
+
+#: archive-zip.c:322
+#, c-format
+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:365 builtin/pack-objects.c:368
+#, c-format
+msgid "deflate error (%d)"
+msgstr "lỗi giải nén (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "dấu vết th�i gian là quá lớn cho hệ thống này: %<PRIuMAX>"
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
 msgstr "git archive [<các tùy ch�n>] <tree-ish> [</đư�ng/dẫn>…]"
@@ -786,183 +1571,157 @@ msgstr ""
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: 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:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
+#: builtin/merge.c:1144
+#, c-format
+msgid "could not read '%s'"
+msgstr "không thể đ�c “%s�"
+
+#: 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 "đặc tả đư�ng dẫn “%s� không khớp với bất kỳ tập tin nào"
 
-#: archive.c:396
+#: archive.c:451
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "không có tham chiếu nào như thế: %.*s"
 
-#: archive.c:401
+#: archive.c:457
 #, 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:414
+#: archive.c:470
 #, c-format
 msgid "not a tree object: %s"
 msgstr "không phải là đối tượng cây: “%s�"
 
-#: archive.c:426
+#: archive.c:482
 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:457
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "Không tìm thấy tập tin: %s"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "Không phải một tập tin thư�ng: %s"
+
+#: archive.c:552
 msgid "fmt"
 msgstr "định_dạng"
 
-#: archive.c:457
+#: archive.c:552
 msgid "archive format"
 msgstr "định dạng lưu trữ"
 
-#: archive.c:458 builtin/log.c:1581
+#: archive.c:553 builtin/log.c:1775
 msgid "prefix"
 msgstr "ti�n_tố"
 
-#: archive.c:459
+#: archive.c:554
 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:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:186
+#: 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 "tập_tin"
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:556
+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
 msgid "write the archive to this file"
 msgstr "ghi kho lưu vào tập tin này"
 
-#: archive.c:463
+#: archive.c:561
 msgid "read .gitattributes in working directory"
 msgstr "đ�c .gitattributes trong thư mục làm việc"
 
-#: archive.c:464
+#: archive.c:562
 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:465
-msgid "store only"
-msgstr "chỉ lưu (không nén)"
+#: archive.c:564
+msgid "set compression level"
+msgstr "đặt mức nén"
 
-#: archive.c:466
-msgid "compress faster"
-msgstr "nén nhanh hơn"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "nén nh� hơn"
-
-#: archive.c:477
+#: archive.c:567
 msgid "list supported archive formats"
 msgstr "liệt kê các kiểu nén được hỗ trợ"
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: 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 "kho"
 
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
 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:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
 #: builtin/notes.c:498
 msgid "command"
 msgstr "lệnh"
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
 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:489
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr "Gặp tùy ch�n không cần --remote"
 
-#: archive.c:491
+#: 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:493
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr "Gặp tùy ch�n không cần --output"
 
-#: archive.c:515
+#: 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
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "Không hiểu định dạng “%s�"
 
-#: archive.c:522
+#: archive.c:616
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "Tham số không được hỗ trợ cho định dạng “%s�: -%d"
 
-#: archive-tar.c:125 archive-zip.c:345
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "không thể stream blob “%s�"
-
-#: archive-tar.c:266 archive-zip.c:363
-#, 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)"
-
-#: archive-tar.c:293 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr "không thể đ�c %s"
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "không thể bắt đầu bộ l�c “%s�"
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "không thể chuyển hướng mô tả"
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "bộ l�c “%s� đã báo cáo lỗi"
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "đư�ng dẫn không hợp lệ UTF-8: %s"
-
-#: archive-zip.c:318
-#, c-format
-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:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
-#, c-format
-msgid "deflate error (%d)"
-msgstr "lỗi giải nén (%d)"
-
-#: archive-zip.c:609
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "dấu vết th�i gian là quá lớn cho hệ thống này: %<PRIuMAX>"
-
-#: attr.c:213
+#: attr.c:202
 #, 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:370
+#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "%s không được phép: %s:%d"
 
-#: attr.c:410
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -970,22 +1729,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:468
+#: bisect.c:489
 #, 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:678
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "Chúng tôi không bisect thêm nữa!\n"
 
-#: bisect.c:733
+#: bisect.c:766
 #, 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:758
+#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -994,7 +1753,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:763
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1003,7 +1762,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:768
+#: bisect.c:801
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1012,7 +1771,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:776
+#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1023,7 +1782,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:789
+#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1035,45 +1794,45 @@ msgstr ""
 "%s.\n"
 "Chúng tôi vẫn cứ tiếp tục."
 
-#: bisect.c:822
+#: bisect.c:861
 #, 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:865
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr "cần một điểm xét duyệt %s"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
 msgstr "không thể tạo tập tin “%s�"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
 msgstr "không thể đ�c tập tin “%s�"
 
-#: bisect.c:958
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "việc đ�c tham chiếu bisect gặp lỗi"
 
-#: bisect.c:977
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s là cả %s và %s\n"
 
-#: bisect.c:985
+#: bisect.c:1066
 #, 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 ""
 "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:1004
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1082,46 +1841,46 @@ msgstr[0] "(ước chừng %d bước)"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1101
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "Bisecting: còn %d điểm xét duyệt để kiểm sau %s này\n"
 
-#: blame.c:2700
+#: 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:2714
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr "không thể dùng --contents với tên đối tượng chuyển giao cuối cùng"
 
-#: blame.c:2735
+#: blame.c:2811
 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:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
-#: builtin/shortlog.c:192
+#: 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 "cài đặt việc di chuyển qua các điểm xét duyệt gặp lỗi"
 
-#: blame.c:2762
+#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr ""
 "cùng sử dụng --reverse --first-parent yêu cầu vùng cùng với chuỗi cha-mẹ-đầu-"
 "tiên"
 
-#: blame.c:2773
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "không có đư�ng dẫn %s trong “%s�"
 
-#: blame.c:2784
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "không thể đ�c blob %s cho đư�ng dẫn “%s�"
@@ -1257,417 +2016,378 @@ msgstr "Tên đối tượng chưa rõ ràng: “%s�."
 msgid "Not a valid branch point: '%s'."
 msgstr "Nhánh không hợp lệ: “%s�."
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "“%s� đã được lấy ra tại “%s� rồi"
 
-#: branch.c:387
+#: branch.c:389
 #, 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:36
+#: 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:48
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "không hiểu dung lượng “%s�"
+
+#: bundle.c:74
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "“%s� không giống như tập tin v2 bundle (định dạng dump của git)"
+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:64
+#: 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:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
-#: builtin/commit.c:791
+#: 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 "không thể mở “%s�"
 
-#: bundle.c:143
+#: 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:146
+#: 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:197
+#: 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:204
+#: 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:206
+#: 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:272
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
 msgstr "không thể nhân đôi bộ mô tả bundle"
 
-#: bundle.c:279
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "Không thể sản sinh đối tượng gói"
 
-#: bundle.c:290
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "đối tượng gói đã chết"
 
-#: bundle.c:332
-msgid "rev-list died"
-msgstr "rev-list đã chết"
-
-#: bundle.c:381
+#: 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:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
+#: bundle.c:504
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "phiên bản bundle %d không được hỗ trợ"
+
+#: 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:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "đối số không được thừa nhận: %s"
 
-#: bundle.c:468
+#: 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:478
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "không thể tạo “%s�"
 
-#: bundle.c:503
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "mục lục gói đã chết"
 
-#: color.c:296
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "giá trị màu không hợp lệ: %.*s"
-
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 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:52
-#, 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:192
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"Việc hỗ trợ cho <GIT_DIR>/info/grafts đã lạc hậu\n"
-"và sẽ bị xóa b� ở phiên bản Git tương lai.\n"
-"\n"
-"Vui lòng dùng \"git replace --convert-graft-file\"\n"
-"để chuyển đổi các graft thành các tham chiếu thay thế.\n"
-"\n"
-"Tắt l�i nhắn này bằng cách chạy\n"
-"\"git config advice.graftFileDeprecated false\""
+#: 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"
 
-#: commit.c:1128
+#: chunk-format.c:126
 #, 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."
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "bù mảnh không đúng cách %<PRIx64> và %<PRIx64>"
 
-#: commit.c:1131
+#: chunk-format.c:133
 #, 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."
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "tìm thấy ID của mảnh bị trùng lặp %<PRIx32>"
 
-#: commit.c:1134
+#: chunk-format.c:147
 #, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "Lần chuyển giao %s không có chữ ký GPG."
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "mảnh cuối cùng có id không bằng không %<PRIx32>"
 
-#: commit.c:1137
+#: color.c:329
 #, 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"
+msgid "invalid color value: %.*s"
+msgstr "giá trị màu không hợp lệ: %.*s"
 
-#: commit.c:1391
-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 ""
-"Cảnh báo: ghi chú cho lần chuyển giao không hợp chuẩn UTF-8.\n"
-"Bạn có lẽ muốn tu bổ nó sau khi sửa l�i chú thích, hoặc là đặt biến\n"
-"cấu hình i18n.commitencoding thành bảng mã mà dự án của bạn muốn dùng.\n"
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr "phiên bản băm không hợp lệ"
 
-#: commit-graph.c:127
+#: commit-graph.c:262
 msgid "commit-graph file is too small"
 msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nh�"
 
-#: commit-graph.c:192
+#: commit-graph.c:355
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "chữ ký đồ-thị-các-lần-chuyển-giao %X không khớp chữ ký %X"
 
-#: commit-graph.c:199
+#: commit-graph.c:362
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
 
-#: commit-graph.c:206
+#: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "phiên bản đồ-thị-các-lần-chuyển-giao %X không khớp phiên bản %X"
 
-#: commit-graph.c:229
-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"
-
-#: commit-graph.c:240
-#, 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"
-
-#: commit-graph.c:283
+#: commit-graph.c:386
 #, 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 "commit-graph file is too small to hold %u chunks"
+msgstr "tập tin đồ-thị-các-lần-chuyển-giao quá nh� để giữ %u mảnh dữ liệu"
 
-#: commit-graph.c:347
+#: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
 msgstr "đồ-thị-các-lần-chuyển-giao có không có mảnh các đồ h�a cơ sở"
 
-#: commit-graph.c:357
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr "móc xích đồ-thị-các-lần-chuyển-giao không khớp"
 
-#: commit-graph.c:404
+#: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr ""
-"móc xích đồ-thị-các-lần-chuyển-giao không hợp lệ: dòng '%s' không phải là "
+"móc xích đồ-thị-các-lần-chuyển-giao không hợp lệ: dòng “%s� không phải là "
 "một mã băm"
 
-#: commit-graph.c:430
+#: commit-graph.c:564
 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:561 commit-graph.c:621
+#: commit-graph.c:745 commit-graph.c:782
 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:582
+#: commit-graph.c:766
 #, 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:855 builtin/am.c:1287
+#: commit-graph.c:799
+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:1341
 #, 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:859
-#, c-format
-msgid "unable to get tree for %s"
-msgstr "không thể lấy cây cho %s"
-
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
 #, 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:1049
+#: commit-graph.c:1368
 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:1066
+#: commit-graph.c:1385
 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:1085
+#: commit-graph.c:1405
 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:1104
+#: commit-graph.c:1424
+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
 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:1179
+#: commit-graph.c:1558
+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
+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
 #, 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:1192
+#: commit-graph.c:1673
 #, c-format
 msgid "error adding pack %s"
 msgstr "gặp lỗi thêm gói %s"
 
-#: commit-graph.c:1196
+#: commit-graph.c:1677
 #, c-format
 msgid "error opening index for %s"
 msgstr "gặp lỗi khi mở mục lục cho “%s�"
 
-#: commit-graph.c:1220
-#, c-format
-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"
-
-#: commit-graph.c:1240
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "mã số đối tượng lần chuyển giao không hợp lệ: %s"
-
-#: commit-graph.c:1255
+#: commit-graph.c:1714
 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:1270
-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"
-
-#: commit-graph.c:1300
+#: commit-graph.c:1732
 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:1346
+#: commit-graph.c:1781
 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:1379 midx.c:810
+#: commit-graph.c:1812 midx.c:911
 #, 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:1391 builtin/index-pack.c:306 builtin/repack.c:241
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr "không thể tạo lớp sơ đồ tạm th�i"
+
+#: commit-graph.c:1830
 #, c-format
-msgid "unable to create '%s'"
-msgstr "không thể tạo “%s�"
+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:1451
+#: 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] "�ang ghi ra đồ thị các lần chuyển giao trong lần %d"
 
-#: commit-graph.c:1492
+#: commit-graph.c:1923
 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:1504
+#: commit-graph.c:1939
 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:1524
+#: commit-graph.c:1959
 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:1635
+#: commit-graph.c:2092
 msgid "Scanning merged commits"
 msgstr "�ang quét các lần chuyển giao đã hòa trộn"
 
-#: commit-graph.c:1646
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "gặp mã số tích lần chuyển giao bị trùng lặp “%s�"
-
-#: commit-graph.c:1670
+#: commit-graph.c:2136
 msgid "Merging commit-graph"
 msgstr "�ang hòa trộn đồ-thị-các-lần-chuyển-giao"
 
-#: commit-graph.c:1860
-#, 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"
+#: commit-graph.c:2244
+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:1871
+#: commit-graph.c:2351
 msgid "too many commits to write graph"
 msgstr "có quá nhi�u lần chuyển giao để ghi đồ thị"
 
-#: commit-graph.c:1961
+#: commit-graph.c:2449
 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:1971
+#: commit-graph.c:2459
 #, 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:1981 commit-graph.c:1996
+#: commit-graph.c:2469 commit-graph.c:2484
 #, 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:1988
+#: commit-graph.c:2476
 #, 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:2006
+#: commit-graph.c:2494
 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:2020
+#: commit-graph.c:2509
 #, 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:2027
+#: commit-graph.c:2516
 #, 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:2037
+#: commit-graph.c:2526
 #, 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:2046
+#: commit-graph.c:2535
 #, 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:2059
+#: commit-graph.c:2549
 #, 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:2064
+#: commit-graph.c:2554
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
@@ -1675,7 +2395,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:2068
+#: commit-graph.c:2558
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
@@ -1683,23 +2403,87 @@ 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:2083
+#: commit-graph.c:2575
 #, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "tạo đồ-thị-các-lần-chuyển-giao cho lần chuyển giao %s là %u != %u"
+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:2089
+#: commit-graph.c:2581
 #, 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: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 "không thể phân tích cú pháp %s"
+
+#: commit.c:54
+#, 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
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"Việc hỗ trợ cho <GIT_DIR>/info/grafts đã lạc hậu\n"
+"và sẽ bị xóa b� ở phiên bản Git tương lai.\n"
+"\n"
+"Vui lòng dùng \"git replace --convert-graft-file\"\n"
+"để chuyển đổi các graft thành các tham chiếu thay thế.\n"
+"\n"
+"Tắt l�i nhắn này bằng cách chạy\n"
+"\"git config advice.graftFileDeprecated false\""
+
+#: commit.c:1237
+#, 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
+#, 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
+#, 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
+#, 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
+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 ""
+"Cảnh báo: ghi chú cho lần chuyển giao không hợp chuẩn UTF-8.\n"
+"Bạn có lẽ muốn tu bổ nó sau khi sửa l�i chú thích, hoặc là đặt biến\n"
+"cấu hình i18n.commitencoding thành bảng mã mà dự án của bạn muốn dùng.\n"
+
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "hết bộ nhớ"
 
-#: config.c:124
+#: config.c:126
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1714,291 +2498,335 @@ msgstr ""
 "\t%s\n"
 "Nguyên nhân có thể là gồm quẩn vòng."
 
-#: config.c:140
+#: config.c:142
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "không thể khai triển đư�ng dẫn “%s�"
 
-#: config.c:151
+#: config.c:153
 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:197
+#: config.c:199
 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:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "định dạng cấu hình không hợp lệ: %s"
+
+#: config.c:400
+#, 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'"
+
+#: config.c:405
+#, 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'"
+
+#: config.c:442
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "khóa không chứa một phần: %s"
 
-#: config.c:382
+#: config.c:448
 #, c-format
 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:406 sequencer.c:2401
+#: config.c:472 sequencer.c:2785
 #, c-format
 msgid "invalid key: %s"
 msgstr "khóa không đúng: %s"
 
-#: config.c:412
+#: config.c:478
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "khóa không hợp lệ (dòng mới): %s"
 
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "khóa cấu hình trống rỗng"
+
+#: config.c:529 config.c:541
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "tham số cấu hình không có thực: %s"
 
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
 #, c-format
 msgid "bogus format in %s"
 msgstr "định dạng không có thực trong %s"
 
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "số lượng không có thực trong %s"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "quá nhi�u mục tin trong %s"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "thiếu khóa cấu hình “%s�"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "thiếu giá trị cấu hình “%s�"
+
+#: config.c:995
 #, 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:825
+#: config.c:999
 #, 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:829
+#: config.c:1003
 #, 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:833
+#: config.c:1007
 #, 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:837
+#: config.c:1011
 #, 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:841
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "cấu hình sai tại dòng %d trong %s"
 
-#: config.c:978
+#: config.c:1152
 msgid "out of range"
 msgstr "nằm ngoài phạm vi"
 
-#: config.c:978
+#: config.c:1152
 msgid "invalid unit"
 msgstr "đơn vị không hợp lệ"
 
-#: config.c:979
+#: config.c:1153
 #, 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:998
+#: config.c:1163
 #, 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:1001
+#: config.c:1166
 #, 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:1004
+#: config.c:1169
 #, 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:1007
+#: config.c:1172
 #, 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:1010
+#: config.c:1175
 #, 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:1013
+#: config.c:1178
 #, 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:1108
+#: config.c:1257
+#, 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
 #, 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:1117
+#: config.c:1284
 #, 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:1208
+#: config.c:1377
 #, 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:1222 config.c:1233
+#: config.c:1391 config.c:1402
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "mức nén zlib %d là sai"
 
-#: config.c:1325
+#: config.c:1494
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar chỉ được có một ký tự"
 
-#: config.c:1358
+#: config.c:1527
 #, 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:1425
+#: config.c:1599
 #, c-format
 msgid "malformed value for %s"
 msgstr "giá trị cho %s sai dạng"
 
-#: config.c:1451
+#: config.c:1625
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "giá trị cho %s sai dạng: %s"
 
-#: config.c:1452
+#: config.c:1626
 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:1513 builtin/pack-objects.c:3394
+#: config.c:1687 builtin/pack-objects.c:4084
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "mức nén gói %d không hợp lệ"
 
-#: config.c:1634
+#: config.c:1809
 #, 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:1637
+#: config.c:1812
 #, 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:1654
+#: config.c:1829
 #, 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:1684
+#: config.c:1874
 #, c-format
 msgid "failed to parse %s"
 msgstr "gặp lỗi khi phân tích cú pháp %s"
 
-#: config.c:1740
+#: config.c:1930
 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:2091
+#: config.c:2294
 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:2261
+#: config.c:2468
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "%s không hợp lệ: “%s�"
 
-#: config.c:2306
+#: config.c:2513
 #, 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:2352
+#: config.c:2559
 #, 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:2354
+#: config.c:2561
 #, 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:2435
+#: config.c:2645
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "tên của phần không hợp lệ “%s�"
 
-#: config.c:2467
+#: config.c:2677
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s có đa giá trị"
 
-#: config.c:2496
+#: config.c:2706
 #, 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:2748 config.c:3072
+#: config.c:2958 config.c:3285
 #, 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:2759
+#: config.c:2969
 #, c-format
 msgid "opening %s"
 msgstr "đang mở “%s�"
 
-#: config.c:2794 builtin/config.c:328
+#: config.c:3006 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "mẫu không hợp lệ: %s"
 
-#: config.c:2819
+#: config.c:3031
 #, c-format
 msgid "invalid config file %s"
 msgstr "tập tin cấu hình “%s� không hợp lệ"
 
-#: config.c:2832 config.c:3085
+#: config.c:3044 config.c:3298
 #, c-format
 msgid "fstat on %s failed"
 msgstr "fstat trên %s gặp lỗi"
 
-#: config.c:2843
+#: config.c:3055
 #, 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:2852 config.c:3090
+#: config.c:3065 config.c:3303
 #, c-format
 msgid "chmod on %s failed"
 msgstr "chmod trên %s gặp lỗi"
 
-#: config.c:2937 config.c:3187
+#: config.c:3150 config.c:3400
 #, c-format
 msgid "could not write config file %s"
 msgstr "không thể ghi tập tin cấu hình “%s�"
 
-#: config.c:2971
+#: config.c:3184
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "không thể đặt “%s� thành “%s�"
 
-#: config.c:2973 builtin/remote.c:782
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr "không thể thôi đặt “%s�"
 
-#: config.c:3063
+#: config.c:3276
 #, c-format
 msgid "invalid section name: %s"
 msgstr "tên của phần không hợp lệ: %s"
 
-#: config.c:3230
+#: config.c:3443
 #, c-format
 msgid "missing value for '%s'"
 msgstr "thiếu giá trị cho cho “%s�"
@@ -2024,72 +2852,81 @@ msgstr ""
 msgid "server doesn't support '%s'"
 msgstr "máy chủ không hỗ trợ “%s�"
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "máy chủ không hỗ trợ tính năng “%s�"
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
 msgstr "cần đẩy dữ liệu lên đĩa sau các capabilities"
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "b� qua capabilities sau dòng đầu tiên “%s�"
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "lỗi giao thức: không cần capabilities^{}"
 
-#: connect.c:273
+#: connect.c:306
 #, 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:275
+#: connect.c:308
 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:313
+#: connect.c:347
 msgid "invalid packet"
 msgstr "gói không hợp lệ"
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "lỗi giao thức: không cần “%s�"
 
-#: connect.c:441
+#: connect.c:497
+#, 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
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "trả v� của ls-refs không hợp lệ: %s"
 
-#: connect.c:445
+#: connect.c:530
 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:544
+#: connect.c:533
+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
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "giao thức “%s� chưa được hỗ trợ"
 
-#: connect.c:595
+#: connect.c:717
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "không thể đặt SO_KEEPALIVE trên ổ cắm"
 
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
 #, c-format
 msgid "Looking up %s ... "
 msgstr "�ang tìm kiếm %s … "
 
-#: connect.c:639
+#: connect.c:761
 #, 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:643 connect.c:714
+#: connect.c:765 connect.c:836
 #, c-format
 msgid ""
 "done.\n"
@@ -2098,7 +2935,7 @@ msgstr ""
 "xong.\n"
 "�ang kết nối đến %s (cổng %s) … "
 
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2108,87 +2945,91 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
 msgid "done."
 msgstr "hoàn tất."
 
-#: connect.c:702
+#: connect.c:824
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "không thể tìm thấy %s (%s)"
 
-#: connect.c:708
+#: connect.c:830
 #, c-format
 msgid "unknown port %s"
 msgstr "không hiểu cổng %s"
 
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "đã khóa tên máy lạ “%s�"
 
-#: connect.c:847
+#: connect.c:969
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "đã khóa cổng lạ “%s�"
 
-#: connect.c:857
+#: connect.c:979
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "không thể khởi chạy ủy nhiệm “%s�"
 
-#: connect.c:928
+#: connect.c:1050
 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:1123
+#: connect.c:1190
+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
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh biến thể “simple� không hỗ trợ -4"
 
-#: connect.c:1135
+#: connect.c:1259
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh biến thể “simple� không hỗ trợ -6"
 
-#: connect.c:1152
+#: connect.c:1276
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh biến thể “simple� không hỗ trợ đặt cổng"
 
-#: connect.c:1264
+#: connect.c:1388
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "đã khóa tên đư�ng dẫn lạ “%s�"
 
-#: connect.c:1311
+#: connect.c:1436
 msgid "unable to fork"
 msgstr "không thể rẽ nhánh tiến trình con"
 
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "�ang kiểm tra kết nối"
 
-#: connected.c:100
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
 msgstr "Không thể chạy “git rev-list�"
 
-#: connected.c:120
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr "gặp lỗi khi ghi vào rev-list"
 
-#: connected.c:127
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list"
 
-#: convert.c:194
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
 msgstr "crlf_action %d không hợp lệ"
 
-#: convert.c:207
+#: convert.c:196
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "CRLF nên được thay bằng LF trong %s"
 
-#: convert.c:209
+#: convert.c:198
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2197,12 +3038,12 @@ msgstr ""
 "CRLF sẽ bị thay thế bằng LF trong %s.\n"
 "Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn"
 
-#: convert.c:217
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "LF nên thay bằng CRLF trong %s"
 
-#: convert.c:219
+#: convert.c:208
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2211,26 +3052,26 @@ msgstr ""
 "LF sẽ bị thay thế bằng CRLF trong %s.\n"
 "Tập tin sẽ có kiểu xuống dòng như bản gốc trong thư mục làm việc của bạn"
 
-#: convert.c:280
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "BOM bị cấm trong “%s� nếu được mã hóa là %s"
 
-#: convert.c:287
+#: convert.c:280
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
 msgstr ""
-"Tập tin “%s� có chứa ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%s như là "
-"bảng mã cây làm việc."
+"Tập tin “%s� có chứa ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%.*s như "
+"là bảng mã cây làm việc."
 
-#: convert.c:305
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr "BOM là bắt buộc trong “%s� nếu được mã hóa là %s"
 
-#: convert.c:307
+#: convert.c:295
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2239,50 +3080,50 @@ msgstr ""
 "Tập tin “%s� còn thiếu ký hiệu thứ tự byte (BOM). Vui lòng dùng UTF-%sBE hay "
 "UTF-%sLE (còn phục thuộc vào thứ tự byte) như là bảng mã cây làm việc."
 
-#: convert.c:425 convert.c:496
+#: convert.c:408 convert.c:479
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "gặp lỗi khi mã hóa “%s�  từ “%s� sang “%s�"
 
-#: convert.c:468
+#: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "mã hóa “%s� từ %s thành %s và ngược trở lại không phải là cùng"
 
-#: convert.c:674
+#: convert.c:654
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "không thể rẽ nhánh tiến trình để chạy bộ l�c bên ngoài “%s�"
 
-#: convert.c:694
+#: convert.c:674
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "không thể cấp đầu vào cho bộ l�c bên ngoài “%s�"
 
-#: convert.c:701
+#: convert.c:681
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "chạy bộ l�c bên ngoài “%s� gặp lỗi %d"
 
-#: convert.c:736 convert.c:739
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "đ�c từ bộ l�c bên ngoài “%s� gặp lỗi"
 
-#: convert.c:742 convert.c:797
+#: convert.c:722 convert.c:777
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "gặp lỗi khi chạy bộ l�c bên ngoài “%s�"
 
-#: convert.c:845
+#: convert.c:826
 msgid "unexpected filter type"
 msgstr "gặp kiểu bộ l�c thừa"
 
-#: convert.c:856
+#: convert.c:837
 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:930
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
@@ -2291,20 +3132,48 @@ 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:1229
+#: 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:1417 convert.c:1451
+#: 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:1495
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s: smudge bộ l�c %s gặp lỗi"
 
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "b� qua tìm kiếm giấy chứng chực cho khóa: credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "từ chối làm việc với giấy chứng thực thiếu trư�ng máy chủ"
+
+#: credential.c:114
+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
+#, 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
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "url không có lược đồ: %s"
+
+#: credential.c:511
+#, 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"
+
 #: date.c:138
 msgid "in the future"
 msgstr "ở th�i tương lai"
@@ -2389,20 +3258,36 @@ msgstr ""
 msgid "Marked %d islands, done.\n"
 msgstr "�ã đánh dấu %d island, xong.\n"
 
-#: diffcore-order.c:24
+#: diff-merges.c:70
 #, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "gặp lỗi khi đ�c tập-tin-thứ-tự “%s�"
+msgid "unknown value for --diff-merges: %s"
+msgstr "không hiểu giá trị cho --diff-merges: %s"
 
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "�ang thực hiện dò tìm đổi tên không chính xác"
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base không hoạt động với phạm vi"
+
+#: diff-lib.c:559
+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:576
+msgid "unable to get HEAD"
+msgstr "không thể lấy HEAD"
+
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr "không tìm thấy cơ sở để hòa trộn"
+
+#: diff-lib.c:585
+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"
@@ -2410,25 +3295,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:155
+#: diff.c:156
 #, 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:160
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  Không hiểu đối số dirstat “%s�\n"
 
-#: diff.c:296
+#: diff.c:297
 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:324
+#: diff.c:325
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -2438,7 +3323,7 @@ msgstr ""
 "change�, “ignore-space-at-eol�, “ignore-all-space�, “allow-indentation-"
 "change�"
 
-#: diff.c:332
+#: diff.c:333
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
@@ -2446,12 +3331,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:405
+#: diff.c:410
 #, 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:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -2460,35 +3345,49 @@ msgstr ""
 "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat�:\n"
 "%s"
 
-#: diff.c:4218
+#: diff.c:4282
 #, 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:4563
+#: diff.c:4634
 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:4566
+#: diff.c:4637
 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:4644
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr ""
+"-G và --pickaxe-regex là loại trừ lẫn nhau, dùng --pickaxe-regex với -S"
+
+#: diff.c:4643
+msgid ""
+"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all "
+"with -G and -S"
+msgstr ""
+"tùy ch�n --pickaxe-all và --find-object loại từ lẫn nhau, hãy dùng --pickaxe-"
+"all với -G và -S"
+
+#: diff.c:4722
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow cần chính xác một đặc tả đư�ng dẫn"
 
-#: diff.c:4692
+#: diff.c:4770
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "giá trị --stat không hợp lệ: “%s�"
 
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
-#: parse-options.c:199 parse-options.c:203
+#: 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
 #, 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:4729
+#: diff.c:4807
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2497,42 +3396,42 @@ msgstr ""
 "Gặp lỗi khi phân tích đối số tùy ch�n --dirstat/-X:\n"
 "%s"
 
-#: diff.c:4814
+#: diff.c:4892
 #, 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:4838
+#: diff.c:4916
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "không hiểu giá trị sau ws-error-highlight=%.*s"
 
-#: diff.c:4852
+#: diff.c:4930
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "không thể phân giải “%s�"
 
-#: diff.c:4902 diff.c:4908
+#: diff.c:4980 diff.c:4986
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s cần dạng <n>/<m>"
 
-#: diff.c:4920
+#: diff.c:4998
 #, 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:4941
+#: diff.c:5019
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "đối số --color-moved sai: %s"
 
-#: diff.c:4960
+#: diff.c:5038
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "chế độ “%s� không hợp lệ trong --color-moved-ws"
 
-#: diff.c:5000
+#: diff.c:5078
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
@@ -2540,158 +3439,163 @@ msgstr ""
 "tùy ch�n  diff-algorithm chấp nhận \"myers\", \"minimal\", \"patience\" và "
 "\"histogram\""
 
-#: diff.c:5036 diff.c:5056
+#: diff.c:5114 diff.c:5134
 #, c-format
 msgid "invalid argument to %s"
 msgstr "tham số cho %s không hợp lệ"
 
-#: diff.c:5194
+#: diff.c:5238
+#, 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:5287
 #, 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:5250
+#: diff.c:5343
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "đối số --word-diff sai: %s"
 
-#: diff.c:5273
+#: diff.c:5379
 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:5275 diff.c:5281
+#: diff.c:5381 diff.c:5387
 msgid "generate patch"
 msgstr "tạo miếng vá"
 
-#: diff.c:5278 builtin/log.c:172
+#: diff.c:5384 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "chặn m�i kết xuất từ diff"
 
-#: diff.c:5283 diff.c:5397 diff.c:5404
+#: diff.c:5389 diff.c:5503 diff.c:5510
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5284 diff.c:5287
+#: diff.c:5390 diff.c:5393
 msgid "generate diffs with <n> lines context"
 msgstr "tạo khác biệt với <n> dòng ngữ cảnh"
 
-#: diff.c:5289
+#: diff.c:5395
 msgid "generate the diff in raw format"
 msgstr "tạo khác biệt ở định dạng thô"
 
-#: diff.c:5292
+#: diff.c:5398
 msgid "synonym for '-p --raw'"
 msgstr "đồng nghĩa với “-p --raw�"
 
-#: diff.c:5296
+#: diff.c:5402
 msgid "synonym for '-p --stat'"
 msgstr "đồng nghĩa với “-p --stat�"
 
-#: diff.c:5300
+#: diff.c:5406
 msgid "machine friendly --stat"
 msgstr "--stat thuận tiện cho máy đ�c"
 
-#: diff.c:5303
+#: diff.c:5409
 msgid "output only the last line of --stat"
 msgstr "chỉ xuất những dòng cuối của --stat"
 
-#: diff.c:5305 diff.c:5313
+#: diff.c:5411 diff.c:5419
 msgid "<param1,param2>..."
 msgstr "<tham_số_1,tham_số_2>…"
 
-#: diff.c:5306
+#: diff.c:5412
 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:5310
+#: diff.c:5416
 msgid "synonym for --dirstat=cumulative"
 msgstr "đồng nghĩa với --dirstat=cumulative"
 
-#: diff.c:5314
+#: diff.c:5420
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "đồng nghĩa với --dirstat=files,param1,param2…"
 
-#: diff.c:5318
+#: diff.c:5424
 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:5321
+#: diff.c:5427
 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:5324
+#: diff.c:5430
 msgid "show only names of changed files"
 msgstr "chỉ hiển thị tên của các tập tin đổi"
 
-#: diff.c:5327
+#: diff.c:5433
 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:5329
+#: diff.c:5435
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<rộng>[,<name-width>[,<số-lượng>]]"
 
-#: diff.c:5330
+#: diff.c:5436
 msgid "generate diffstat"
 msgstr "tạo diffstat"
 
-#: diff.c:5332 diff.c:5335 diff.c:5338
+#: diff.c:5438 diff.c:5441 diff.c:5444
 msgid "<width>"
 msgstr "<rá»™ng>"
 
-#: diff.c:5333
+#: diff.c:5439
 msgid "generate diffstat with a given width"
 msgstr "tạo diffstat với độ rộng đã cho"
 
-#: diff.c:5336
+#: diff.c:5442
 msgid "generate diffstat with a given name width"
 msgstr "tạo diffstat với tên độ rộng đã cho"
 
-#: diff.c:5339
+#: diff.c:5445
 msgid "generate diffstat with a given graph width"
 msgstr "tạo diffstat với độ rộng đồ thị đã cho"
 
-#: diff.c:5341
+#: diff.c:5447
 msgid "<count>"
 msgstr "<số_lượng>"
 
-#: diff.c:5342
+#: diff.c:5448
 msgid "generate diffstat with limited lines"
 msgstr "tạo diffstat với các dòng bị giới hạn"
 
-#: diff.c:5345
+#: diff.c:5451
 msgid "generate compact summary in diffstat"
 msgstr "tạo tổng hợp xúc tích trong diffstat"
 
-#: diff.c:5348
+#: diff.c:5454
 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:5351
+#: diff.c:5457
 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:5353
+#: diff.c:5459
 msgid "show colored diff"
 msgstr "hiển thị thay đổi được tô màu"
 
-#: diff.c:5354
+#: diff.c:5460
 msgid "<kind>"
 msgstr "<kiểu>"
 
-#: diff.c:5355
+#: diff.c:5461
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr ""
-"tô sang các lỗi v� khoảng trắng trong các dòng “context�, “old� và “new� "
+"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:5358
+#: diff.c:5464
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2699,89 +3603,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:5361 diff.c:5364 diff.c:5367 diff.c:5473
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
 msgid "<prefix>"
 msgstr "<ti�n_tố>"
 
-#: diff.c:5362
+#: diff.c:5468
 msgid "show the given source prefix instead of \"a/\""
 msgstr "hiển thị ti�n tố nguồn đã cho thay cho \"a/\""
 
-#: diff.c:5365
+#: diff.c:5471
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "hiển thị ti�n tố đích đã cho thay cho \"b/\""
 
-#: diff.c:5368
+#: diff.c:5474
 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:5371
+#: diff.c:5477
 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:5374
+#: diff.c:5480
 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:5378 diff.c:5383 diff.c:5388
+#: diff.c:5484 diff.c:5489 diff.c:5494
 msgid "<char>"
 msgstr "<ký_tự>"
 
-#: diff.c:5379
+#: diff.c:5485
 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:5384
+#: diff.c:5490
 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:5389
+#: diff.c:5495
 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:5392
+#: diff.c:5498
 msgid "Diff rename options"
 msgstr "Tùy ch�n khác biệt đổi tên"
 
-#: diff.c:5393
+#: diff.c:5499
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5394
+#: diff.c:5500
 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:5398
+#: diff.c:5504
 msgid "detect renames"
 msgstr "dò tìm các tên thay đổi"
 
-#: diff.c:5402
+#: diff.c:5508
 msgid "omit the preimage for deletes"
 msgstr "b� qua preimage (ti�n ảnh??) cho các việc xóa"
 
-#: diff.c:5405
+#: diff.c:5511
 msgid "detect copies"
 msgstr "dò bản sao"
 
-#: diff.c:5409
+#: diff.c:5515
 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:5411
+#: diff.c:5517
 msgid "disable rename detection"
 msgstr "tắt dò tìm đổi tên"
 
-#: diff.c:5414
+#: diff.c:5520
 msgid "use empty blobs as rename source"
-msgstr "dung các blob trống rống như là nguồn đổi tên"
+msgstr "dùng các blob trống rống như là nguồn đổi tên"
 
-#: diff.c:5416
+#: diff.c:5522
 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:5419
+#: diff.c:5525
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
@@ -2789,156 +3693,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:5421
+#: diff.c:5527
 msgid "Diff algorithm options"
 msgstr "Tùy ch�n thuật toán khác biệt"
 
-#: diff.c:5423
+#: diff.c:5529
 msgid "produce the smallest possible diff"
 msgstr "sản sinh khác biệt ít nhất có thể"
 
-#: diff.c:5426
+#: diff.c:5532
 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:5429
+#: diff.c:5535
 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:5432
+#: diff.c:5538
 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:5435
+#: diff.c:5541
 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:5438
+#: diff.c:5544
 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:5441
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr "<regex>"
+
+#: diff.c:5547
+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:5550
 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:5444
+#: diff.c:5553
 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:5448
+#: diff.c:5557
 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:5450
+#: diff.c:5559
 msgid "<algorithm>"
 msgstr "<thuật toán>"
 
-#: diff.c:5451
+#: diff.c:5560
 msgid "choose a diff algorithm"
 msgstr "ch�n một thuật toán khác biệt"
 
-#: diff.c:5453
+#: diff.c:5562
 msgid "<text>"
 msgstr "<văn bản>"
 
-#: diff.c:5454
+#: diff.c:5563
 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:5456 diff.c:5465 diff.c:5468
+#: diff.c:5565 diff.c:5574 diff.c:5577
 msgid "<mode>"
 msgstr "<chế độ>"
 
-#: diff.c:5457
+#: diff.c:5566
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr ""
-"hiển thị khác biệt từ, sử dung <chế độ> để b� giới hạn các từ bị thay đổi"
-
-#: diff.c:5459 diff.c:5462 diff.c:5507
-msgid "<regex>"
-msgstr "<regex>"
+"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:5460
+#: diff.c:5569
 msgid "use <regex> to decide what a word is"
 msgstr "dùng <regex> để quyết định từ là cái gì"
 
-#: diff.c:5463
+#: diff.c:5572
 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:5466
+#: diff.c:5575
 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:5469
+#: diff.c:5578
 msgid "how white spaces are ignored in --color-moved"
-msgstr "b� qua khoảng trắng như thế nào trong --color-moved"
+msgstr "cách b� qua khoảng trắng trong --color-moved"
 
-#: diff.c:5472
+#: diff.c:5581
 msgid "Other diff options"
 msgstr "Các tùy ch�n khác biệt khác"
 
-#: diff.c:5474
+#: diff.c:5583
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr ""
-"khi chạy từ thư mục con, thự thi các thay đổi bên ngoài và hiển thị các "
+"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:5478
+#: diff.c:5587
 msgid "treat all files as text"
 msgstr "coi m�i tập tin là dạng văn bản thư�ng"
 
-#: diff.c:5480
+#: diff.c:5589
 msgid "swap two inputs, reverse the diff"
 msgstr "tráo đổi hai đầu vào, đảo ngược khác biệt"
 
-#: diff.c:5482
+#: diff.c:5591
 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:5484
+#: diff.c:5593
 msgid "disable all output of the program"
 msgstr "tắt m�i kết xuất của chương trình"
 
-#: diff.c:5486
+#: diff.c:5595
 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:5488
+#: diff.c:5597
 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:5490
+#: diff.c:5599
 msgid "<when>"
 msgstr "<khi>"
 
-#: diff.c:5491
+#: diff.c:5600
 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:5494
+#: diff.c:5603
 msgid "<format>"
 msgstr "<định dạng>"
 
-#: diff.c:5495
+#: diff.c:5604
 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:5499
+#: diff.c:5608
 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:5502
+#: diff.c:5611
 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:5504
+#: diff.c:5613
 msgid "<string>"
 msgstr "<chuá»—i>"
 
-#: diff.c:5505
+#: diff.c:5614
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
@@ -2946,7 +3854,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:5508
+#: diff.c:5617
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
@@ -2954,23 +3862,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:5511
+#: diff.c:5620
 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:5514
+#: diff.c:5623
 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:5517
+#: diff.c:5626
 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:5518
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr "<đư�ng-dẫn>"
+
+#: diff.c:5628
+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:5631
+msgid "skip the output to the specified path"
+msgstr "b� qua đầu ra đến đư�ng dẫn đã cho"
+
+#: diff.c:5633
 msgid "<object-id>"
 msgstr "<mã-số-đối-tượng>"
 
-#: diff.c:5519
+#: diff.c:5634
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
@@ -2978,33 +3898,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:5521
+#: diff.c:5636
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)…[*]]"
 
-#: diff.c:5522
+#: diff.c:5637
 msgid "select files by diff type"
 msgstr "ch�n các tập tin theo kiểu khác biệt"
 
-#: diff.c:5524
+#: diff.c:5639
 msgid "<file>"
 msgstr "<tập_tin>"
 
-#: diff.c:5525
+#: diff.c:5640
 msgid "Output to a specific file"
 msgstr "Xuất ra một tập tin cụ thể"
 
-#: diff.c:6180
-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:6298
+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:6183
+#: diff.c:6301
 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:6186
+#: diff.c:6304
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
@@ -3012,64 +3931,97 @@ msgstr ""
 "bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần "
 "nữa."
 
-#: dir.c:549
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "gặp lỗi khi đ�c tập-tin-thứ-tự “%s�"
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr "�ang thực hiện dò tìm đổi tên không chính xác"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "Không có đư�ng dẫn %s trong diff"
+
+#: 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:938
+#: 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: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: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:830
+msgid "disabling cone pattern matching"
+msgstr "vô hiệu khớp mẫu nón"
+
+#: dir.c:1214
 #, 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:1877
+#: dir.c:2351
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "không thể mở thư mục “%s�"
 
-#: dir.c:2128
+#: dir.c:2653
 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:2252
+#: dir.c:2777
 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:3056
+#: dir.c:3610
 #, 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:3101 dir.c:3106
+#: dir.c:3657 dir.c:3662
 #, c-format
 msgid "could not create directories for %s"
 msgstr "không thể tạo thư mục cho %s"
 
-#: dir.c:3135
+#: dir.c:3691
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "không thể di cư thư mục git từ “%s� sang “%s�"
+msgstr "không thể di d�i thư mục git từ “%s� sang “%s�"
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "gợi ý: Ch� trình biên soạn của bạn đóng tập tin…%c"
 
-#: entry.c:178
+#: entry.c:176
 msgid "Filtering content"
 msgstr "Nội dung l�c"
 
-#: entry.c:476
+#: entry.c:497
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "không thể lấy thống kê tập tin “%s�"
 
-#: environment.c:148
+#: environment.c:152
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "đư�ng dẫn không gian tên git \"%s\" sai"
 
-#: environment.c:330
+#: environment.c:334
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "không thể đặt GIT_DIR thành “%s�"
@@ -3079,251 +4031,281 @@ msgstr "không thể đặt GIT_DIR thành “%s�"
 msgid "too many args to run %s"
 msgstr "quá nhi�u tham số để chạy %s"
 
-#: fetch-pack.c:150
+#: fetch-pack.c:182
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack: cần danh sách shallow"
 
-#: fetch-pack.c:153
+#: fetch-pack.c:185
 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:164
+#: fetch-pack.c:196
 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:184
+#: fetch-pack.c:216
 #, 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:195
+#: fetch-pack.c:227
 msgid "unable to write to remote"
 msgstr "không thể ghi lên máy phục vụ"
 
-#: fetch-pack.c:257
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc cần multi_ack_detailed"
 
-#: fetch-pack.c:356 fetch-pack.c:1280
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "dòng shallow không hợp lệ: %s"
 
-#: fetch-pack.c:362 fetch-pack.c:1286
+#: fetch-pack.c:389 fetch-pack.c:1429
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "dòng unshallow không hợp lệ: %s"
 
-#: fetch-pack.c:364 fetch-pack.c:1288
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
 msgstr "không tìm thấy đối tượng: %s"
 
-#: fetch-pack.c:367 fetch-pack.c:1291
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
 msgstr "lỗi trong đối tượng: %s"
 
-#: fetch-pack.c:369 fetch-pack.c:1293
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
 msgstr "không tìm shallow nào: %s"
 
-#: fetch-pack.c:372 fetch-pack.c:1297
+#: fetch-pack.c:399 fetch-pack.c:1440
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
 
-#: fetch-pack.c:414
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr "nhận %s %d - %s"
 
-#: fetch-pack.c:431
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
 msgstr "lần chuyển giao %s không hợp lệ"
 
-#: fetch-pack.c:462
+#: fetch-pack.c:487
 msgid "giving up"
 msgstr "chịu thua"
 
-#: fetch-pack.c:475 progress.c:312
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
 msgstr "xong"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "nhận %s (%d) %s"
 
-#: fetch-pack.c:533
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr "�ánh dấu %s là đã hoàn thành"
 
-#: fetch-pack.c:742
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr "đã sẵn có %s (%s)"
 
-#: fetch-pack.c:781
+#: fetch-pack.c:849
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
 
-#: fetch-pack.c:789
+#: fetch-pack.c:857
 msgid "protocol error: bad pack header"
 msgstr "lỗi giao thức: phần đầu gói bị sai"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:951
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack: không thể rẽ nhánh %s"
 
-#: fetch-pack.c:873
+#: fetch-pack.c:957
+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
 #, c-format
 msgid "%s failed"
 msgstr "%s gặp lỗi"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
 msgstr "có lỗi trong sideband demultiplexer"
 
-#: fetch-pack.c:907
+#: fetch-pack.c:1019
 #, c-format
 msgid "Server version is %.*s"
 msgstr "Phiên bản máy chủ là %.*s"
 
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
+#: 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 "Máy chủ hỗ trợ %s"
 
-#: fetch-pack.c:914
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
 msgstr "Máy chủ không hỗ trợ máy khách shallow"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:1089
 msgid "Server does not support --shallow-since"
 msgstr "Máy chủ không hỗ trợ --shallow-since"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1094
 msgid "Server does not support --shallow-exclude"
 msgstr "Máy chủ không hỗ trợ --shallow-exclude"
 
-#: fetch-pack.c:983
+#: fetch-pack.c:1098
 msgid "Server does not support --deepen"
 msgstr "Máy chủ không hỗ trợ --deepen"
 
-#: fetch-pack.c:1000
+#: fetch-pack.c:1100
+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
 msgid "no common commits"
 msgstr "không có lần chuyển giao chung nào"
 
-#: fetch-pack.c:1012 fetch-pack.c:1468
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+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:1660
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack: fetch gặp lỗi."
 
-#: fetch-pack.c:1150
+#: fetch-pack.c:1242
+#, 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
+#, 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
 msgid "Server does not support shallow requests"
 msgstr "Máy chủ không hỗ trợ yêu cầu shallow"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1286
 msgid "Server supports filter"
 msgstr "Máy chủ hỗ trợ bộ l�c"
 
-#: fetch-pack.c:1180
+#: fetch-pack.c:1329 fetch-pack.c:2043
 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:1198
+#: fetch-pack.c:1347
 #, 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:1204
+#: fetch-pack.c:1353
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "cần “%s�, nhưng lại nhận “%s�"
 
-#: fetch-pack.c:1243
+#: fetch-pack.c:1387
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "gặp dòng không được thừa nhận: “%s�"
 
-#: fetch-pack.c:1248
+#: fetch-pack.c:1392
 #, 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:1258
+#: fetch-pack.c:1402
 msgid "expected packfile to be sent after 'ready'"
 msgstr "cần tập tin gói để gửi sau “ready�"
 
-#: fetch-pack.c:1260
+#: fetch-pack.c:1404
 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:1302
+#: fetch-pack.c:1445
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "lỗi xử lý thông tin shallow: %d"
 
-#: fetch-pack.c:1349
+#: fetch-pack.c:1494
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "cần wanted-ref, nhưng lại nhận được “%s�"
 
-#: fetch-pack.c:1354
+#: fetch-pack.c:1499
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
-msgstr "không cần wanted-ref: “%s�"
+msgstr "wanted-ref không được mong đợi: “%s�"
 
-#: fetch-pack.c:1359
+#: fetch-pack.c:1504
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "lỗi khi xử lý wanted refs: %d"
 
-#: fetch-pack.c:1693
+#: fetch-pack.c:1534
+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:1939
 msgid "no matching remote head"
 msgstr "không khớp phần đầu máy chủ"
 
-#: fetch-pack.c:1716 builtin/clone.c:685
+#: fetch-pack.c:1962 builtin/clone.c:697
 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:1743
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr "gặp 'ready' đột xuất từ máy chủ"
+
+#: fetch-pack.c:2088
 #, 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:1746
+#: fetch-pack.c:2091
 #, 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:321
-msgid "gpg failed to sign the data"
-msgstr "gpg gặp lỗi khi ký dữ liệu"
-
-#: gpg-interface.c:347
+#: gpg-interface.c:273
 msgid "could not create temporary file"
 msgstr "không thể tạo tập tin tạm th�i"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s�"
 
-#: graph.c:97
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg gặp lỗi khi ký dữ liệu"
+
+#: 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:668
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
@@ -3331,18 +4313,18 @@ msgstr ""
 "mẫu đã cho có chứa NULL byte (qua -f <file>). �i�u này chỉ được hỗ trợ với -"
 "P dÆ°á»›i PCRE v2"
 
-#: grep.c:2124
+#: grep.c:1895
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "“%s�: không thể đ�c %s"
 
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
-#: 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 "gặp lỗi khi lấy thống kê v� “%s�"
 
-#: grep.c:2152
+#: grep.c:1923
 #, c-format
 msgid "'%s': short read"
 msgstr "“%s�: đ�c ngắn"
@@ -3392,48 +4374,48 @@ msgid "Low-level Commands / Interrogators"
 msgstr "Lệnh/bộ h�i ở mức thấp"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "Lệnh/�ồng bộ kho ở mức thấp"
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
 msgstr "Lệnh/Hỗ trợ nội tại ở mức thấp"
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "các lệnh git sẵn có trong thư mục “%s�:"
 
-#: help.c:305
+#: help.c:307
 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:314
+#: help.c:316
 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:363 git.c:98
+#: help.c:365 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:403
-msgid "The common Git guides are:"
-msgstr "Các chỉ dẫn chung v� Git là:"
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Các chỉ dẫn khái niệm v� Git là:"
 
-#: help.c:512
+#: help.c:429
 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:517
+#: help.c:434
 msgid "External commands"
 msgstr "Các lệnh bên ngoài"
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr "Các bí danh lệnh"
 
-#: help.c:596
+#: help.c:527
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -3442,31 +4424,31 @@ 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:655
+#: help.c:543 help.c:631
+#, 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
 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:677
+#: help.c:613
 #, 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:682
+#: help.c:618
 #, 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:687
+#: help.c:623
 #, 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:695
-#, 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:699
+#: help.c:635
 msgid ""
 "\n"
 "The most similar command is"
@@ -3477,16 +4459,16 @@ msgstr[0] ""
 "\n"
 "Những lệnh giống nhất là"
 
-#: help.c:714
+#: help.c:675
 msgid "git version [<options>]"
 msgstr "git version [<các tùy ch�n>]"
 
-#: help.c:783
+#: help.c:730
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s: %s - %s"
 
-#: help.c:787
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3497,7 +4479,15 @@ msgstr[0] ""
 "\n"
 "Có phải ý bạn là một trong số những cái này không?"
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "Chưa biết định danh tác giả\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "Chưa biết định danh ngư�i chuyển giao\n"
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3523,91 +4513,100 @@ msgstr ""
 "B� tùy ch�n --global nếu chỉ định danh riêng cho kho này.\n"
 "\n"
 
-#: ident.c:379
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
 msgstr "không đưa ra địa chỉ thư điện tử và auto-detection bị tắt"
 
-#: ident.c:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "không thể tự dò tìm địa chỉ thư điện tử (nhận “%s�)"
 
-#: ident.c:401
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
 msgstr "chưa chỉ ra tên và tự-động-dò-tìm bị tắt"
 
-#: ident.c:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "không thể dò-tìm-tự động tên (đã nhận “%s�)"
 
-#: ident.c:415
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "không cho phép tên định danh là rỗng (cho <%s>)"
 
-#: ident.c:421
+#: ident.c:439
 #, c-format
 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:436 builtin/commit.c:611
+#: ident.c:454 builtin/commit.c:647
 #, c-format
 msgid "invalid date format: %s"
 msgstr "ngày tháng không hợp lệ: %s"
 
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "mục “%s� trong cây %s có nút cây, nhưng không phải là một cây"
-
-#: list-objects.c:140
-#, c-format
-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:375
-#, 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�"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "không thể truy cập các blob rải rác trong '%s'"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "không thể phân tích dữ liệu bộ l�c rải rác trong %s"
-
-#: list-objects-filter-options.c:58
+#: list-objects-filter-options.c:83
 msgid "expected 'tree:<depth>'"
 msgstr "cần “tree:<depth>�"
 
-#: list-objects-filter-options.c:73
+#: list-objects-filter-options.c:98
 msgid "sparse:path filters support has been dropped"
 msgstr "việc hỗ trợ bộ l�c sparse:đư�ng/dẫn đã bị b�"
 
-#: list-objects-filter-options.c:86
+#: list-objects-filter-options.c:105
+#, c-format
+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
 #, c-format
 msgid "invalid filter-spec '%s'"
 msgstr "đặc tả bộ l�c không hợp lệ “%s�"
 
-#: list-objects-filter-options.c:102
+#: list-objects-filter-options.c:140
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
-msgstr "phải thoát char trong sub-filter-spec: '%c'"
+msgstr "phải thoát char trong sub-filter-spec: “%c�"
 
-#: list-objects-filter-options.c:144
+#: list-objects-filter-options.c:182
 msgid "expected something after combine:"
 msgstr "mong đợi một cái gì đó sau khi kết hợp:"
 
-#: list-objects-filter-options.c:226
+#: list-objects-filter-options.c:264
 msgid "multiple filter-specs cannot be combined"
 msgstr "không thể tổ hợp nhi�u đặc tả kiểu l�c"
 
-#: lockfile.c:151
+#: list-objects-filter-options.c:376
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "không thể nâng cấp định định dạng kho chứa để hỗ trợ nhân bản cục bộ"
+
+#: list-objects-filter.c:532
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "không thể truy cập các blob rải rác trong “%s�"
+
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "không thể phân tích dữ liệu bộ l�c rải rác trong %s"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "mục “%s� trong cây %s có nút cây, nhưng không phải là một cây"
+
+#: list-objects.c:140
+#, c-format
+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: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�"
+
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3626,168 +4625,395 @@ msgstr ""
 "một tiến trình git có lẽ đã đổ vỡ khi thực hiện ở kho này trước đó:\n"
 "gõ b� tập tin một cách thủ công để tiếp tục."
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "Không thể tạo “%s.lock�: %s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "gặp lỗi khi đ�c bộ nhớ đệm"
+#: 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"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
-#: builtin/stash.c:264
-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"
+#: ls-refs.c:167
+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)"
+
+#: mailinfo.c:1050
+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
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "thao tác sai “%s� cho “%s�"
+
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, 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:1578 merge-recursive.c:1208
+#, 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:1587 merge-recursive.c:1215
+#, 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:1597 merge-ort.c:1604
+#, 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:1625
+#, 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:1632
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+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: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 ""
+"Nếu đây là đúng đơn giản thêm nó vào mục lục ví dụ\n"
+"bằng cách dùng:\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"cái mà sẽ chấp nhận gợi ý này.\n"
+
+#: merge-ort.c:1649
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+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-recursive.c:367
+#: merge-ort.c:1868 merge-recursive.c:1358
+msgid "Failed to execute internal merge"
+msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
+
+#: merge-ort.c:1873 merge-recursive.c:1363
+#, 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:1880 merge-recursive.c:1396
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Tự-động-hòa-trộn %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 ""
+"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: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 ""
+"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: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 ""
+"XUNG �ỘT: (thư mục đổi tên chia tách): Không rõ ràng nơi để đổi tên %s "
+"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:2241 merge-recursive.c:2464
+#, c-format
+msgid ""
+"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
+"renamed."
+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: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 ""
+"�ư�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: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 ""
+"�ư�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: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 ""
+"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: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 ""
+"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:2569
+#, 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: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 ""
+"XUNG �ỘT (đổi tên liên quan đến va chạm): đổi tên %s -> %s xung đột nội dung "
+"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:2683 merge-ort.c:2707
+#, 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:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
+msgstr "không thể đ�c đối tượng %s"
+
+#: merge-ort.c:3185 merge-recursive.c:3011
+#, 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:3613
+#, c-format
+msgid ""
+"CONFLICT (file/directory): directory in the way of %s from %s; moving it to "
+"%s instead."
+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: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 ""
+"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: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 ""
+"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:3796 merge-recursive.c:3087
+msgid "content"
+msgstr "ná»™i dung"
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr "thêm/thêm"
+
+#: merge-ort.c:3800 merge-recursive.c:3136
+msgid "submodule"
+msgstr "mô-đun-con"
+
+#: merge-ort.c:3802 merge-recursive.c:3137
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "XUNG �ỘT (%s): Xung đột hòa trộn trong %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 ""
+"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:4120
+#, c-format
+msgid ""
+"Note: %s not up to date and in way of checking out conflicted version; old "
+"copy renamed to %s"
+msgstr ""
+"Lưu ý: %s không được cập nhật và theo cách lấy ra phiên bản xung đột; bản "
+"sao cũ được đổi tên thành %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:4487
+#, 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:3702
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"  %s"
+msgstr ""
+"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
+"hòa trộn:\n"
+"  %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "�ã cập nhật rồi."
+
+#: merge-recursive.c:352
 msgid "(bad commit)\n"
 msgstr "(commit sai)\n"
 
-#: merge-recursive.c:390
+#: merge-recursive.c:375
 #, 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:399
+#: merge-recursive.c:384
 #, 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:885
+#: merge-recursive.c:872
 #, 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:896
+#: merge-recursive.c:883
 #, 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:910 merge-recursive.c:929
+#: merge-recursive.c:897 merge-recursive.c:916
 msgid ": perhaps a D/F conflict?"
 msgstr ": có lẽ là một xung đột D/F?"
 
-#: merge-recursive.c:919
+#: merge-recursive.c:906
 #, 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:960 builtin/cat-file.c:41
+#: merge-recursive.c:947 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:965
+#: merge-recursive.c:952
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "mong đợi đối tượng blob cho %s “%s�"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:977
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "gặp lỗi khi mở “%s�: %s"
 
-#: merge-recursive.c:1001
+#: merge-recursive.c:988
 #, 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:1006
+#: merge-recursive.c:993
 #, 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:1199
-#, 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-recursive.c:1206
-#, 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-recursive.c:1213
-#, 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-recursive.c:1221 merge-recursive.c:1233
+#: merge-recursive.c:1223 merge-recursive.c:1235
 #, 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:1224 merge-recursive.c:1236
+#: merge-recursive.c:1226 merge-recursive.c:1238
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "Chuyển-tiếp-nhanh mô-đun-con “%s�"
 
-#: merge-recursive.c:1259
+#: merge-recursive.c:1261
 #, 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:1263
+#: merge-recursive.c:1265
 #, 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:1264
+#: merge-recursive.c:1266
 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:1267
-#, 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 ""
-"Nếu đây là đúng đơn giản thêm nó vào mục lục ví dụ\n"
-"bằng cách dùng:\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"cái mà sẽ chấp nhận gợi ý này.\n"
-
-#: merge-recursive.c:1276
+#: merge-recursive.c:1278
 #, 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:1349
-msgid "Failed to execute internal merge"
-msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-
-#: merge-recursive.c:1354
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-
-#: merge-recursive.c:1386
-#, c-format
-msgid "Auto-merging %s"
-msgstr "Tự-động-hòa-trộn %s"
-
-#: merge-recursive.c:1410
+#: merge-recursive.c:1420
 #, 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:1482
+#: merge-recursive.c:1492
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3796,7 +5022,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:1487
+#: merge-recursive.c:1497
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3805,7 +5031,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:1494
+#: merge-recursive.c:1504
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3814,7 +5040,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:1499
+#: merge-recursive.c:1509
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3823,45 +5049,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:1534
+#: merge-recursive.c:1544
 msgid "rename"
 msgstr "đổi tên"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1544
 msgid "renamed"
 msgstr "đã đổi tên"
 
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
 #, 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:1624
+#: merge-recursive.c:1605
 #, 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:1682
+#: merge-recursive.c:1663
 #, 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:1713
+#: merge-recursive.c:1694
 #, 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:1718
+#: merge-recursive.c:1699
 #, 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:1737
+#: merge-recursive.c:1726
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3870,17 +5096,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:1742
+#: merge-recursive.c:1731
 msgid " (left unresolved)"
 msgstr " (cần giải quyết)"
 
-#: merge-recursive.c:1851
+#: merge-recursive.c:1823
 #, 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:2056
+#: merge-recursive.c:2086
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3891,25 +5117,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:2088
-#, 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 ""
-"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-recursive.c:2098
-#, 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 ""
-"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-recursive.c:2190
+#: merge-recursive.c:2220
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3918,317 +5126,285 @@ 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:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-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-recursive.c:2961
-#, c-format
-msgid "cannot read object %s"
-msgstr "không thể đ�c đối tượng %s"
-
-#: merge-recursive.c:2964
-#, c-format
-msgid "object %s is not a blob"
-msgstr "đối tượng %s không phải là một blob"
-
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modify"
 msgstr "sửa đổi"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modified"
 msgstr "đã sửa"
 
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "ná»™i dung"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "thêm/thêm"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3114
 #, 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:3089 git-submodule.sh:937
-msgid "submodule"
-msgstr "mô-đun-con"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "XUNG �ỘT (%s): Xung đột hòa trộn trong %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3167
 #, c-format
 msgid "Adding as %s instead"
 msgstr "Thay vào đó thêm vào %s"
 
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-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-recursive.c:3206
-#, 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 ""
-"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-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-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-recursive.c:3213
-#, 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 ""
-"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-recursive.c:3327
+#: merge-recursive.c:3371
 #, c-format
 msgid "Removing %s"
 msgstr "�ang xóa %s"
 
-#: merge-recursive.c:3350
+#: merge-recursive.c:3394
 msgid "file/directory"
 msgstr "tập-tin/thư-mục"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3399
 msgid "directory/file"
 msgstr "thư-mục/tập-tin"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3406
 #, 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:3371
+#: merge-recursive.c:3415
 #, c-format
 msgid "Adding %s"
 msgstr "Thêm \"%s\""
 
-#: merge-recursive.c:3380
+#: merge-recursive.c:3424
 #, 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:3424
-msgid "Already up to date!"
-msgstr "�ã cập nhật rồi!"
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3477
 #, 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:3537
+#: merge-recursive.c:3571
 msgid "Merging:"
 msgstr "�ang trộn:"
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3584
 #, 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:3600
+#: merge-recursive.c:3634
 msgid "merge returned no commit"
 msgstr "hòa trộn không trả v� lần chuyển giao nào"
 
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"Các thay đổi nội bộ của bạn với các tập tin sau đây sẽ bị ghi đè bởi lệnh "
-"hòa trộn:\n"
-"  %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3799
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "Không thể phân tích đối tượng “%s�"
 
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
 msgid "Unable to write index."
 msgstr "Không thể ghi bảng mục lục."
 
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "gặp lỗi khi đ�c bộ nhớ đệm"
+
+#: 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 "không thể ghi tập tin lưu bảng mục lục mới"
+
+#: midx.c:74
+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
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "tập tin đồ thị multi-pack-index %s quá nh�"
 
-#: midx.c:84
+#: midx.c:121
 #, 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:89
+#: midx.c:126
 #, 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:94
+#: midx.c:131
 #, c-format
-msgid "hash version %u does not match"
-msgstr "phiên bản băm “%u� không khớp"
-
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr "khoảng bù đoạn không hợp lệ (quá lớn)"
+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:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "mã mảnh kết thúc multi-pack-index xuất hiện sớm hơn bình thư�ng"
-
-#: midx.c:145
+#: midx.c:148
 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:147
+#: midx.c:150
 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:149
+#: midx.c:152
 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:151
+#: midx.c:154
 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:165
+#: midx.c:170
 #, 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:210
+#: midx.c:214
 #, 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:260
+#: midx.c:264
 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:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "lỗi chuẩn bị tập tin gói từ multi-pack-index"
-
-#: midx.c:469
+#: midx.c:490
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "gặp lỗi khi thêm tập tin gói “%s�"
 
-#: midx.c:475
+#: midx.c:496
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "gặp lỗi khi mở pack-index “%s�"
 
-#: midx.c:535
+#: midx.c:564
 #, 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:864
+#: midx.c:880 builtin/index-pack.c:1533
+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:920
+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:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr "�ang thêm tập tin gói từ multi-pack-index"
+
+#: midx.c:989
 #, 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:1035
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "không hiểu \"preferred pack\": %s"
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "\"preferred pack\" “%s� đã hết hạn"
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr "không có tập tin gói để đánh mục lục."
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "gặp lỗi khi gỡ b� %s"
+
+#: midx.c:1166
 #, 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:1090
+#: midx.c:1225
+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:1233
+msgid "incorrect checksum"
+msgstr "tổng kiểm không đúng"
+
+#: midx.c:1236
 msgid "Looking for referenced packfiles"
 msgstr "�ang khóa cho các gói bị tham chiếu"
 
-#: midx.c:1105
+#: midx.c:1251
 #, 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:1109
-msgid "Verifying OID order in MIDX"
-msgstr "Thẩm tra thứ tự OID trong MIDX"
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr "midx chẳng chứa oid nào"
+
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
+msgstr "Thẩm tra thứ tự OID trong multi-pack-index"
 
-#: midx.c:1118
+#: midx.c:1274
 #, 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:1137
+#: midx.c:1294
 msgid "Sorting objects by packfile"
 msgstr "�ang sắp xếp các đối tượng theo tập tin gói"
 
-#: midx.c:1143
+#: midx.c:1301
 msgid "Verifying object offsets"
 msgstr "�ang thẩm tra các khoảng bù đối tượng"
 
-#: midx.c:1159
+#: midx.c:1317
 #, 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:1165
+#: midx.c:1323
 #, 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:1174
+#: midx.c:1332
 #, 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:1349
+#: midx.c:1357
+msgid "Counting referenced objects"
+msgstr "�ang đếm các đối tượng được tham chiếu"
+
+#: midx.c:1367
+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:1558
 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:1368
+#: midx.c:1578
 msgid "could not finish pack-objects"
 msgstr "không thể hoàn thiện các đối tượng gói"
 
-#: name-hash.c:537
+#: name-hash.c:542
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "không thể tạo tuyến lazy_dir: %s"
 
-#: name-hash.c:559
+#: name-hash.c:564
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "không thể tạo tuyến lazy_name: %s"
 
-#: name-hash.c:565
+#: name-hash.c:570
 #, c-format
 msgid "unable to join lazy_name thread: %s"
 msgstr "không thể gia nhập tuyến lazy_name: %s"
@@ -4275,6 +5451,362 @@ 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
+#, 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:584
+#, 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:658
+#, 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:665
+#, 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:708
+msgid "unable to fdopen alternates lockfile"
+msgstr "không thể fdopen tập tin khóa thay thế"
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr "không thể đ�c tập tin thay thế"
+
+#: object-file.c:733
+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:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "đư�ng dẫn “%s� không tồn tại"
+
+#: object-file.c:789
+#, 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:795
+#, 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:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "kho tham chiếu “%s� là nông"
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "kho tham chiếu “%s� bị cấy ghép"
+
+#: object-file.c:869
+#, 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:1019
+#, 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:1054
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap gặp lỗi%s"
+
+#: object-file.c:1218
+#, c-format
+msgid "object file %s is empty"
+msgstr "tập tin đối tượng %s trống rỗng"
+
+#: object-file.c:1353 object-file.c:2548
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "đối tượng mất h�ng “%s�"
+
+#: object-file.c:1355 object-file.c:2552
+#, 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:1397
+msgid "invalid object type"
+msgstr "kiểu đối tượng không hợp lệ"
+
+#: object-file.c:1481
+#, 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:1484
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "không thể giải gói phần đầu %s"
+
+#: object-file.c:1490
+#, 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:1493
+#, 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:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr "gặp lỗi khi đ�c đối tượng “%s�"
+
+#: object-file.c:1721
+#, 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:1725
+#, 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:1729
+#, 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:1834
+#, c-format
+msgid "unable to write file %s"
+msgstr "không thể ghi tập tin %s"
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "không thể đặt quy�n thành “%s�"
+
+#: object-file.c:1848
+msgid "file write error"
+msgstr "lỗi ghi tập tin"
+
+#: object-file.c:1868
+msgid "error when closing loose object file"
+msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
+
+#: object-file.c:1933
+#, 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:1935
+msgid "unable to create temporary file"
+msgstr "không thể tạo tập tin tạm th�i"
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr "không thể ghi tập tin đối tượng đã mất"
+
+#: object-file.c:1965
+#, 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:1969
+#, 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:1973
+#, 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:1983 builtin/pack-objects.c:1237
+#, c-format
+msgid "failed utime() on %s"
+msgstr "gặp lỗi utime() trên “%s�"
+
+#: object-file.c:2060
+#, c-format
+msgid "cannot read object for %s"
+msgstr "không thể đ�c đối tượng cho %s"
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr "lần chuyển giao sai h�ng"
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr "thẻ sai h�ng"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr "gặp lỗi đ�c khi đánh mục lục %s"
+
+#: object-file.c:2222
+#, c-format
+msgid "short read while indexing %s"
+msgstr "không đ�c ngắn khi đánh mục lục %s"
+
+#: object-file.c:2295 object-file.c:2305
+#, 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:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s: kiểu tập tin không được hỗ trợ"
+
+#: object-file.c:2335
+#, 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:2337
+#, 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:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "không thể mở %s"
+
+#: object-file.c:2559 object-file.c:2612
+#, 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:2583
+#, c-format
+msgid "unable to mmap %s"
+msgstr "không thể mmap %s"
+
+#: object-file.c:2588
+#, 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:2594
+#, 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:2605
+#, 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: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:491
+msgid "The candidates are:"
+msgstr "Các ứng cử là:"
+
+#: 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 ""
+"Git thư�ng không bao gi� tạo tham chiếu mà nó kết thúc với 40 ký tự hex\n"
+"bởi vì nó sẽ bị b� qua khi bạn chỉ định 40-hex. Những tham chiếu này\n"
+"có lẽ được tạo ra bởi một sai sót nào đó. Ví dụ,\n"
+"\n"
+"  git switch -c $br $(git rev-parse …)\n"
+"\n"
+"với \"$br\" không hiểu lý do vì sao trống rỗng và một tham chiếu 40-hex được "
+"tạo ra.\n"
+"Xin hãy kiểm tra những tham chiếu này và có thể xóa chúng đi. Tắt l�i nhắn "
+"này\n"
+"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
+
+#: 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: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: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:1702
+#, c-format
+msgid ""
+"path '%s' exists, but not '%s'\n"
+"hint: Did you mean '%.*s:%s' aka '%.*s:./%s'?"
+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: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:1739
+#, c-format
+msgid ""
+"path '%s' is in the index, but not at stage %d\n"
+"hint: Did you mean ':%d:%s'?"
+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:1755
+#, c-format
+msgid ""
+"path '%s' is in the index, but not '%s'\n"
+"hint: Did you mean ':%d:%s' aka ':%d:./%s'?"
+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: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: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: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:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "“%.*s� không phải là tên đối tượng hợp lệ."
+
 #: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
@@ -4285,36 +5817,115 @@ 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:233
+#: 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:246
+#: 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:266 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "mã băm không khớp %s"
 
-#: packfile.c:641
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr "không thể lấy kích cỡ của %s"
+
+#: pack-bitmap.c:1571 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"
+
+#: pack-revindex.c:221
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "tập tin reverse-index %s quá nh�"
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "tập tin reverse-index %s bị h�ng"
+
+#: pack-revindex.c:234
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "tập tin reverse-index %s có chữ ký chưa biết"
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "tệp chỉ mục ngược %s có phiên bản không được hỗ trợ %<PRIu32>"
+
+#: pack-revindex.c:243
+#, c-format
+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
+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
+#, c-format
+msgid "could not stat: %s"
+msgstr "không thể lấy thông tin thống kê: %s"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "gặp lỗi làm cho %s đ�c được"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "không thể ghi tập tin promisor “%s�"
+
+#: packfile.c:625
 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:1887
+#: packfile.c:655
+#, 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:1934
 #, 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:1891
+#: packfile.c:1938
 #, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "tên đối tượng dị hình “%s�"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4330,7 +5941,7 @@ msgstr "%s là xung khắc với %s"
 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:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s k nhận giá trị"
@@ -4340,41 +5951,46 @@ msgstr "%s k nhận giá trị"
 msgid "%s isn't available"
 msgstr "%s không sẵn có"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, 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:389
+#: parse-options.c:386
 #, 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:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
 #, 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?)"
+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:860
+#: parse-options.c:668 parse-options.c:988
+#, c-format
+msgid "alias of --%s"
+msgstr "bí danh của --%s"
+
+#: parse-options.c:879
 #, c-format
 msgid "unknown option `%s'"
 msgstr "không hiểu tùy ch�n “%s�"
 
-#: parse-options.c:862
+#: parse-options.c:881
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "không hiểu tùy ch�n “%c�"
 
-#: parse-options.c:864
+#: parse-options.c:883
 #, 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:888
+#: parse-options.c:907
 msgid "..."
 msgstr "…"
 
-#: parse-options.c:907
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr "cách dùng: %s"
@@ -4382,74 +5998,49 @@ msgstr "cách dùng: %s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:913
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
 msgstr "     hoặc: %s"
 
-#: parse-options.c:916
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:955
+#: parse-options.c:974
 msgid "-NUM"
 msgstr "-S�"
 
-#: parse-options.c:969
-#, c-format
-msgid "alias of --%s"
-msgstr "bí danh của --%s"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, 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
-#, 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
-#, 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:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "tên đối tượng dị hình “%s�"
-
-#: path.c:897
+#: path.c:915
 #, 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:128
+#: pathspec.c:151
 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:146
+#: pathspec.c:169
 msgid "Only one 'attr:' specification is allowed."
 msgstr "Chỉ có một đặc tả “attr:� là được phép."
 
-#: pathspec.c:149
+#: pathspec.c:172
 msgid "attr spec must not be empty"
 msgstr "đặc tả attr phải không được để trống"
 
-#: pathspec.c:192
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "tên thuộc tính không hợp lệ %s"
 
-#: pathspec.c:257
+#: pathspec.c:280
 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:264
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
@@ -4457,50 +6048,55 @@ 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:304
+#: pathspec.c:327
 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:325
+#: pathspec.c:348
 #, 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:330
+#: pathspec.c:353
 #, 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:368
+#: pathspec.c:391
 #, 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:427
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s: “literal� và “glob� xung khắc nhau"
 
-#: pathspec.c:440
+#: pathspec.c:466
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s: “%s� ngoài một kho chứa"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s: “%s� ngoài một kho chứa tại “%s�"
 
-#: pathspec.c:514
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "“%s� (mnemonic: “%c�)"
 
-#: pathspec.c:524
+#: pathspec.c:552
 #, 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:591
+#: pathspec.c:619
 #, 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
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "dòng được trích dẫn sai: %s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "không thể đẩy dữ liệu của gói lên đĩa"
@@ -4510,143 +6106,178 @@ msgid "unable to write delim packet"
 msgstr "không thể ghi gói delim"
 
 #: pkt-line.c:106
+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:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:265
 msgid "protocol error: impossibly long line"
 msgstr "lỗi giao thức: không thể làm được dòng dài"
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr "gặp lỗi khi ghi gói có định dạng"
 
-#: pkt-line.c:196
+#: pkt-line.c:204
 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"
 
-#: pkt-line.c:203 pkt-line.c:210
-msgid "packet write failed"
-msgstr "gặp lỗi khi ghi gói"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "gặp lỗi khi ghi gói: %s"
 
-#: pkt-line.c:295
+#: pkt-line.c:328 pkt-line.c:329
 msgid "read error"
 msgstr "lỗi đ�c"
 
-#: pkt-line.c:303
+#: pkt-line.c:339 pkt-line.c:340
 msgid "the remote end hung up unexpectedly"
 msgstr "máy chủ bị treo bất ng�"
 
-#: pkt-line.c:331
+#: pkt-line.c:369 pkt-line.c:371
 #, 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:341 pkt-line.c:346
+#: 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 "lỗi giao thức: chi�u dài dòng bị sai %d"
 
-#: pkt-line.c:362
+#: pkt-line.c:413 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "lỗi máy chủ: %s"
 
-#: preload-index.c:119
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr "Làm mới bảng mục lục"
 
-#: preload-index.c:138
+#: preload-index.c:144
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "không thể tạo tuyến trình lstat: %s"
 
-#: pretty.c:966
+#: pretty.c:988
 msgid "unable to parse --pretty format"
 msgstr "không thể phân tích định dạng --pretty"
 
-#: promisor-remote.c:25
-msgid "Remote with no URL"
-msgstr "Máy chủ không có địa chỉ URL"
+#: 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: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: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:61
+#: 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"
+msgstr "tên máy chủ hứa hẹn không thể bắt đầu bằng “/�: %s"
+
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info: cần đẩy dữ liệu lên đĩa sau các tham số"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "�ang gỡ các đối tượng trùng lặp"
 
-#: range-diff.c:71
+#: range-diff.c:78
 msgid "could not start `log`"
 msgstr "không thể lấy thông tin thống kê v� “log“"
 
-#: range-diff.c:73
+#: range-diff.c:80
 msgid "could not read `log` output"
 msgstr "không thể đ�c kết xuất “log�"
 
-#: range-diff.c:92 sequencer.c:4985
+#: range-diff.c:101 sequencer.c:5550
 #, 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:118
+#: range-diff.c:115
+#, c-format
+msgid ""
+"could not parse first line of `log` output: did not start with 'commit ': "
+"'%s'"
+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
 #, 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:275
+#: range-diff.c:307
 msgid "failed to generate diff"
 msgstr "gặp lỗi khi tạo khác biệt"
 
-#: range-diff.c:507 range-diff.c:509
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only và --right-only loại từ lẫn nhau"
+
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "không thể phân tích nhật ký cho “%s�"
 
-#: read-cache.c:680
+#: read-cache.c:710
 #, 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:696
+#: read-cache.c:726
 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:718
+#: read-cache.c:748
 #, 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:723
+#: read-cache.c:753
 #, 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:775
+#: read-cache.c:805
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "không thể đánh mục lục tập tin “%s�"
 
-#: read-cache.c:794
+#: read-cache.c:824
 #, 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:805
+#: read-cache.c:835
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "không thể lấy thống kê “%s�"
 
-#: read-cache.c:1314
+#: read-cache.c:1358
 #, 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:1520
+#: read-cache.c:1573
 msgid "Refresh index"
 msgstr "Làm tươi mới bảng mục lục"
 
-#: read-cache.c:1635
+#: read-cache.c:1705
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4655,7 +6286,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:1645
+#: read-cache.c:1715
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4664,150 +6295,165 @@ 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:1701
+#: read-cache.c:1771
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "chữ ký sai 0x%08x"
 
-#: read-cache.c:1704
+#: read-cache.c:1774
 #, c-format
 msgid "bad index version %d"
 msgstr "phiên bản mục lục sai %d"
 
-#: read-cache.c:1713
+#: read-cache.c:1783
 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:1743
+#: read-cache.c:1817
 #, 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:1745
+#: read-cache.c:1819
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "đang l� đi phần mở rộng %.4s"
 
-#: read-cache.c:1782
+#: read-cache.c:1856
 #, 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:1798
+#: read-cache.c:1872
 #, 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:1855
+#: read-cache.c:1929
 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:1858
+#: read-cache.c:1932
 #, 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:1861
+#: read-cache.c:1935
 #, 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:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: 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 "tập tin ghi bảng mục lục bị h�ng"
 
-#: read-cache.c:2108
+#: read-cache.c:2185
 #, 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:2121
+#: read-cache.c:2198
 #, 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:2154
+#: read-cache.c:2231
 #, 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:2158
+#: read-cache.c:2235
 #, 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:2162
+#: read-cache.c:2239
 #, 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:2166
+#: read-cache.c:2243
 #, 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:2208
+#: read-cache.c:2286
 #, 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:2235
+#: read-cache.c:2313
 #, 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:2267
+#: read-cache.c:2351
 #, 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:2314
+#: read-cache.c:2398
 #, 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:3010 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
 #, c-format
 msgid "could not close '%s'"
 msgstr "không thể đóng “%s�"
 
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
+#: read-cache.c:3075
+msgid "failed to convert to a sparse-index"
+msgstr "gặp lỗi khi chuyển đổi sang \"sparse-index\""
+
+#: read-cache.c:3146 sequencer.c:2684 sequencer.c:4440
 #, c-format
 msgid "could not stat '%s'"
 msgstr "không thể lấy thông tin thống kê v� “%s�"
 
-#: read-cache.c:3126
+#: read-cache.c:3159
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "không thể mở thư mục git: %s"
 
-#: read-cache.c:3138
+#: read-cache.c:3171
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "không thể b� liên kết (unlink): “%s�"
 
-#: read-cache.c:3163
+#: read-cache.c:3200
 #, 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:3312
+#: read-cache.c:3349
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s: không thể xóa b� stage #0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Bạn có thể sửa nó bằng “git rebase --edit-todo� và sau đó chạy “git rebase --"
+"continue�.\n"
+"Hoặc là bạn có thể bãi b� việc cải tổ bằng “git rebase --abort�.\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr ""
 "không nhận ra cài đặt %s cho tùy ch�n rebase.missingCommitsCheck. Nên b� qua."
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4815,7 +6461,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"
@@ -4824,7 +6473,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 ""
@@ -4833,14 +6482,19 @@ msgstr ""
 "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ế "
+"s, squash <commit> = dùng lần chuyển giao, nhưng trộn 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 nhật ký "
-"của lần chuyển giao này\n"
+"f, fixup [-C | -c] <commit> = giống như \"squash\", nhưng chỉ giữ lại phần "
+"l�i nhắn\n"
+"                   nhật ký của lần chuyển giao kế trước, trừ phi -C được "
+"dùng, trong trư�ng hợp\n"
+"                   chỉ giữ ghi chú của lần chuyển giao này; -c giống như -C "
+"nhÆ°ng\n"
+"                   mở trình biên soạn\n"
 "x, exec <commit> = chạy lệnh (phần còn lại của dòng) dùng hệ v�\n"
 "b, break = dừng tại đây (tiếp tục cải tổ sau này bằng “git rebase --"
 "continue�)\n"
-"d, drop <commit> = xóa lần chuyển giao\n"
+"d, drop <commit> = xóa b� 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"
@@ -4850,16 +6504,16 @@ msgstr ""
 ".       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"
+"Những dòng này có thể được thay đổi thứ tự; chúng chạy từ trên đỉnh xuống "
+"dưới đáy.\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:66
 #, c-format
 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:65 git-rebase--preserve-merges.sh:228
+#: 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"
@@ -4868,7 +6522,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:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4876,7 +6530,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:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4890,7 +6544,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4900,22 +6554,19 @@ 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:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
+#: 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 "không thể ghi “%s�"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "không thể chép “%s� sang “%s�."
+msgid "could not write '%s'."
+msgstr "không thể ghi “%s�."
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:196
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -4924,7 +6575,7 @@ msgstr ""
 "Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình c�.\n"
 "Các lần chuyển giao bị xóa (từ mới đến cũ):\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:203
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4942,124 +6593,14 @@ msgstr ""
 "Cánh ứng xử có thể là: ignore, warn, error.\n"
 "\n"
 
-#: refs.c:262
-#, 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:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "đang l� đi tham chiếu m�m thừa %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "đang l� đi tham chiếu h�ng %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "không thể mở “%s� để ghi: %s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "không thể đ�c tham chiếu “%s�"
-
-#: refs.c:820
+#: 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 "ref '%s' already exists"
-msgstr "tham chiếu “%s� đã có từ trước rồi"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "không cần ID đối tượng khi ghi “%s�"
-
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "không thể ghi vào “%s�"
-
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1004
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "không thể mở “%s� để ghi"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "gặp ID đối tượng không cần khi xóa “%s�"
-
-#: refs.c:998
-#, 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:1004
-#, 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:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "nhật ký cho %s trống rỗng"
-
-#: refs.c:1155
-#, 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:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "update_ref bị lỗi cho ref “%s�: %s"
-
-#: refs.c:2023
-#, 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:2055
-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:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "“%s� sẵn có; không thể tạo “%s�"
-
-#: refs.c:2157 refs.c:2192
-#, 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:1234
-#, c-format
-msgid "could not remove reference %s"
-msgstr "không thể gỡ b� tham chiếu: %s"
-
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
-#, 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:1251 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "không thể xóa b� tham chiếu: %s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "refspec không hợp lệ “%s�"
+msgid "could not read '%s'."
+msgstr "không thể đ�c “%s�."
 
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
 msgstr "đã ra đi"
 
@@ -5078,122 +6619,132 @@ msgstr "đằng sau %d"
 msgid "ahead %d, behind %d"
 msgstr "trÆ°á»›c %d, sau %d"
 
-#: ref-filter.c:165
+#: ref-filter.c:230
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "cần định dạng: %%(color:<color>)"
 
-#: ref-filter.c:167
+#: ref-filter.c:232
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "không nhận ra màu: %%(màu:%s)"
 
-#: ref-filter.c:189
+#: ref-filter.c:254
 #, 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:193
+#: ref-filter.c:258
 #, 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:195
+#: ref-filter.c:260
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "đối số không được thừa nhận %%(%s): %s"
 
-#: ref-filter.c:250
+#: ref-filter.c:315
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) không nhận các đối số"
 
-#: ref-filter.c:272
+#: ref-filter.c:339
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "tham số không được thừa nhận %%(objectname): %s"
 
-#: ref-filter.c:280
+#: ref-filter.c:347
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) không nhận các đối số"
 
-#: ref-filter.c:292
+#: ref-filter.c:359
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) không nhận các đối số"
 
-#: ref-filter.c:301
+#: ref-filter.c:372
 #, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) không nhận các đối số"
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "tham số không được thừa nhận %%(subject): %s"
 
-#: ref-filter.c:323
+#: ref-filter.c:391
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "cần %%(trailers:key=<giá trị>)"
+
+#: ref-filter.c:393
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "không hiểu tham số %%(trailers): %s"
 
-#: ref-filter.c:352
+#: ref-filter.c:424
 #, 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:354
+#: ref-filter.c:426
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "đối số không được thừa nhận %%(contents): %s"
 
-#: ref-filter.c:369
+#: ref-filter.c:441
 #, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "cần nội dung mang giá trị dương:shot=%s"
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "cần giá trị dương “%s� trong %%(%s)"
 
-#: ref-filter.c:373
+#: ref-filter.c:445
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "đối số không được thừa nhận %%(objectname): %s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "đối số “%s� không được thừa nhận trong %%(%s)"
 
-#: ref-filter.c:403
+#: ref-filter.c:459
+#, 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:489
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "cần định dạng: %%(align:<width>,<position>)"
 
-#: ref-filter.c:415
+#: ref-filter.c:501
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "vị trí không được thừa nhận:%s"
 
-#: ref-filter.c:422
+#: ref-filter.c:508
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "chi�u rộng không được thừa nhận:%s"
 
-#: ref-filter.c:431
+#: ref-filter.c:517
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "đối số không được thừa nhận %%(align): %s"
 
-#: ref-filter.c:439
+#: ref-filter.c:525
 #, 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:457
+#: ref-filter.c:543
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "đối số không được thừa nhận %%(if): %s"
 
-#: ref-filter.c:559
+#: ref-filter.c:645
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "tên trư�ng dị hình: %.*s"
 
-#: ref-filter.c:586
+#: ref-filter.c:672
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "không hiểu tên trư�ng: %.*s"
 
-#: ref-filter.c:590
+#: ref-filter.c:676
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
@@ -5201,159 +6752,278 @@ 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:714
+#: ref-filter.c:801
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)"
 
-#: ref-filter.c:777
+#: ref-filter.c:865
 #, 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:779
+#: ref-filter.c:867
 #, 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:781
+#: ref-filter.c:869
 #, 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:809
+#: ref-filter.c:897
 #, 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:811
+#: ref-filter.c:899
 #, 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:813
+#: ref-filter.c:901
 #, 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:828
+#: ref-filter.c:916
 #, 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:885
+#: ref-filter.c:973
 #, c-format
 msgid "malformed format string %s"
 msgstr "chuỗi định dạng dị hình %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1621
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(không nhánh, đang cải tổ %s)"
+
+#: ref-filter.c:1624
+#, 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:1627
 #, c-format
-msgid "no branch, rebasing %s"
-msgstr "không nhánh, đang cải tổ %s"
+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:1491
+#: ref-filter.c:1631
 #, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "không nhánh, đang cải tổ HEAD %s đã tách r�i"
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD được tách r�i tại %s)"
 
-#: ref-filter.c:1494
+#: ref-filter.c:1634
 #, 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"
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD được tách r�i từ %s)"
 
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "không nhánh"
+#: ref-filter.c:1637
+msgid "(no branch)"
+msgstr "(không nhánh)"
 
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1669 ref-filter.c:1880
 #, c-format
 msgid "missing object %s for %s"
 msgstr "thiếu đối tượng %s cho %s"
 
-#: ref-filter.c:1550
+#: ref-filter.c:1679
 #, 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:2004
+#: ref-filter.c:2064
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "đối tượng dị hình tại “%s�"
 
-#: ref-filter.c:2093
+#: ref-filter.c:2153
 #, 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:2389
-#, c-format
-msgid "format: %%(end) atom missing"
-msgstr "định dạng: thiếu nguyên tử %%(end)"
-
-#: ref-filter.c:2489
+#: ref-filter.c:2158 refs.c:676
 #, c-format
-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 "ignoring broken ref %s"
+msgstr "đang l� đi tham chiếu h�ng %s"
 
-#: ref-filter.c:2492
+#: ref-filter.c:2502
 #, c-format
-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 "format: %%(end) atom missing"
+msgstr "định dạng: thiếu nguyên tử %%(end)"
 
-#: ref-filter.c:2502
+#: ref-filter.c:2596
 #, c-format
 msgid "malformed object name %s"
 msgstr "tên đối tượng dị hình %s"
 
-#: ref-filter.c:2507
+#: ref-filter.c:2601
 #, 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"
 
-#: remote.c:366
+#: refs.c:264
+#, 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
+#, 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 ""
+"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"
+"\n"
+"\tgit branch -m <tên>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "không thể lấy v� “%s�"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "tên nhánh không hợp lệ: %s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "đang l� đi tham chiếu m�m thừa %s"
+
+#: refs.c:922
+#, 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
+#, 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
+#, c-format
+msgid "log for %s is empty"
+msgstr "nhật ký cho %s trống rỗng"
+
+#: refs.c:1086
+#, 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
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "update_ref bị lỗi cho ref “%s�: %s"
+
+#: refs.c:2051
+#, 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
+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
+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
+#, 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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "could not delete references: %s"
+msgstr "không thể xóa b� tham chiếu: %s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "refspec không hợp lệ “%s�"
+
+#: remote.c:351
 #, 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:413
+#: remote.c:399
 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:421
+#: remote.c:407
 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:611
+#: remote.c:590
 #, 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:615
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s thư�ng theo dõi %s, không phải %s"
 
-#: remote.c:619
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s theo dõi cả %s và %s"
 
-#: remote.c:687
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "khóa “%s� của mẫu k có “*�"
 
-#: remote.c:697
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "giá trị “%s� của mẫu k có “*�"
 
-#: remote.c:1003
+#: remote.c:1083
 #, 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:1008
+#: remote.c:1088
 #, c-format
 msgid "src refspec %s matches more than one"
 msgstr "refspec %s nguồn khớp nhi�u hơn một"
@@ -5362,7 +7032,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:1023
+#: remote.c:1103
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5387,7 +7057,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:1043
+#: remote.c:1123
 #, c-format
 msgid ""
 "The <src> part of the refspec is a commit object.\n"
@@ -5398,7 +7068,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:1048
+#: remote.c:1128
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tag object.\n"
@@ -5409,7 +7079,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:1053
+#: remote.c:1133
 #, c-format
 msgid ""
 "The <src> part of the refspec is a tree object.\n"
@@ -5420,7 +7090,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:1058
+#: remote.c:1138
 #, c-format
 msgid ""
 "The <src> part of the refspec is a blob object.\n"
@@ -5431,115 +7101,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:1094
+#: remote.c:1174
 #, 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:1105
+#: remote.c:1185
 #, 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:1117
+#: remote.c:1197
 #, c-format
 msgid "dst refspec %s matches more than one"
 msgstr "dst refspec %s khớp nhi�u hơn một"
 
-#: remote.c:1124
+#: remote.c:1204
 #, 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:1627 remote.c:1728
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
 msgstr "HEAD không chỉ đến một nhánh nào cả"
 
-#: remote.c:1636
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "không có nhánh nào như thế: “%s�"
 
-#: remote.c:1639
+#: remote.c:1736
 #, 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:1645
+#: remote.c:1742
 #, 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:1660
+#: remote.c:1757
 #, 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:1672
+#: remote.c:1769
 #, 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:1682
+#: remote.c:1779
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "đẩy refspecs cho “%s� không bao gồm “%s�"
 
-#: remote.c:1695
+#: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "đẩy lên mà không có đích (push.default là “nothing�)"
 
-#: remote.c:1717
+#: remote.c:1814
 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:1843
+#: remote.c:1943
 #, 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:1856
+#: remote.c:1956
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* �ang b� qua tham chiếu thú vị nội bộ “%s�"
 
-#: remote.c:2019
+#: remote.c:2119
 #, 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:2023
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "   (dùng \" git branch --unset-upstream\" để sửa)\n"
 
-#: remote.c:2026
+#: remote.c:2126
 #, 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:2030
+#: remote.c:2130
 #, 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:2033
+#: remote.c:2133
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  (dùng \"%s\" để biết thêm chi tiết)\n"
 
-#: remote.c:2037
+#: 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] "Nhánh của bạn đứng trước “%s� %d lần chuyển giao.\n"
 
-#: remote.c:2043
+#: remote.c:2143
 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:2046
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5548,11 +7218,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:2054
+#: remote.c:2154
 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:2057
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5565,13 +7235,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:2067
+#: remote.c:2167
 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:2250
+#: remote.c:2359
 #, 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�"
@@ -5586,131 +7256,140 @@ msgstr "tên tham chiếu thay thế bị sai: %s"
 msgid "duplicate replace ref: %s"
 msgstr "tham chiếu thay thế bị trùng: %s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "độ sâu thay thế quá cao cho đối tượng %s"
 
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
 msgid "corrupt MERGE_RR"
 msgstr "MERGE_RR sai h�ng"
 
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
 msgstr "không thể ghi bản ghi rerere"
 
-#: rerere.c:495
+#: rerere.c:479
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
 msgstr "gặp lỗi đ�c khi đang ghi “%s� (%s)"
 
-#: rerere.c:498
+#: rerere.c:482
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "gặp lỗi khi đẩy dữ liệu “%s� lên đĩa"
 
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
 #, c-format
 msgid "could not parse conflict hunks in '%s'"
 msgstr "không thể phân tích các mảnh xung đột trong “%s�"
 
-#: rerere.c:684
+#: rerere.c:668
 #, c-format
 msgid "failed utime() on '%s'"
 msgstr "gặp lỗi utime() trên “%s�"
 
-#: rerere.c:694
+#: rerere.c:678
 #, c-format
 msgid "writing '%s' failed"
 msgstr "gặp lỗi khi đang ghi “%s�"
 
-#: rerere.c:714
+#: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
 msgstr "�ã tạm cất “%s� sử dụng cách phân giải kế trước."
 
-#: rerere.c:753
+#: rerere.c:737
 #, c-format
 msgid "Recorded resolution for '%s'."
 msgstr "Cách giải quyết đã ghi lại cho “%s�."
 
-#: rerere.c:788
+#: rerere.c:772
 #, c-format
 msgid "Resolved '%s' using previous resolution."
 msgstr "�ã phân giải giải “%s� sử dụng cách giải quyết kế trước."
 
-#: rerere.c:803
+#: rerere.c:787
 #, c-format
 msgid "cannot unlink stray '%s'"
 msgstr "không thể unlink stray “%s�"
 
-#: rerere.c:807
+#: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
 msgstr "Preimage đã được ghi lại cho “%s�"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: 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 "không thể tạo thư mục “%s�"
 
-#: rerere.c:1057
+#: rerere.c:1041
 #, c-format
 msgid "failed to update conflicted state in '%s'"
 msgstr "gặp lỗi khi chạy cập nhật trạng thái bị xung đột trong “%s�"
 
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
 #, c-format
 msgid "no remembered resolution for '%s'"
 msgstr "đừng nhó các giải quyết cho “%s�"
 
-#: rerere.c:1077
+#: rerere.c:1061
 #, c-format
 msgid "cannot unlink '%s'"
 msgstr "không thể unlink “%s�"
 
-#: rerere.c:1087
+#: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
 msgstr "�ã cập nhật preimage cho “%s�"
 
-#: rerere.c:1096
+#: rerere.c:1080
 #, c-format
 msgid "Forgot resolution for '%s'\n"
 msgstr "Quên phân giải cho “%s�\n"
 
-#: rerere.c:1199
+#: rerere.c:1191
 msgid "unable to open rr-cache directory"
 msgstr "không thể mở thư mục rr-cache"
 
-#: revision.c:2509
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "không thể dò tìm điểm xét duyệt HEAD"
+
+#: reset.c:69 reset.c:75 sequencer.c:3689
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "gặp lỗi khi tìm cây của %s"
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> không còn được hỗ trợ nữa"
+
+#: revision.c:2684
 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:2512
+#: revision.c:2687
 #, 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:2720
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent xung khắc với --bisect"
-
-#: revision.c:2724
+#: revision.c:2893
 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:763
+#: run-command.c:766
 msgid "open /dev/null failed"
 msgstr "gặp lỗi khi mở “/dev/null�"
 
-#: run-command.c:1269
+#: run-command.c:1274
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "không thể tạo tuyến async: %s"
 
-#: run-command.c:1333
+#: run-command.c:1344
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -5719,30 +7398,42 @@ 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“."
 
-#: send-pack.c:142
+#: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr ""
 "gặp gói flush không cần trong khi đ�c tình trạng giải nén gói trên máy chủ"
 
-#: send-pack.c:144
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "không thể phân tích tình trạng unpack máy chủ: %s"
 
-#: send-pack.c:146
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "máy chủ gặp lỗi unpack: %s"
 
-#: send-pack.c:307
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "gặp lỗi khi ký chứng thực đẩy"
 
-#: send-pack.c:421
+#: send-pack.c:433
+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
+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:526
+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:535
 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:423
+#: send-pack.c:537
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
@@ -5750,47 +7441,47 @@ 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:435
+#: send-pack.c:544
 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:440
+#: send-pack.c:549
 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:187
+#: sequencer.c:196
 #, 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:292
+#: sequencer.c:324
 #, c-format
 msgid "could not delete '%s'"
 msgstr "không thể xóa b� “%s�"
 
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
 #, c-format
 msgid "could not remove '%s'"
 msgstr "không thể gỡ b� “%s�"
 
-#: sequencer.c:321
+#: sequencer.c:354
 msgid "revert"
 msgstr "hoàn nguyên"
 
-#: sequencer.c:323
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr "cherry-pick"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:358
+msgid "rebase"
+msgstr "rebase"
 
-#: sequencer.c:327
+#: sequencer.c:360
 #, c-format
 msgid "unknown action: %d"
 msgstr "không nhận ra thao tác: %d"
 
-#: sequencer.c:385
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5798,7 +7489,7 @@ msgstr ""
 "sau khi giải quyết các xung đột, đánh dấu đư�ng dẫn đã sửa\n"
 "với lệnh “git add </các/đư�ng/dẫn>� hoặc “git rm </các/đư�ng/dẫn>�"
 
-#: sequencer.c:388
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5808,110 +7499,109 @@ msgstr ""
 "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�"
 
-#: sequencer.c:401 sequencer.c:2847
+#: sequencer.c:435 sequencer.c:3271
 #, c-format
 msgid "could not lock '%s'"
 msgstr "không thể khóa “%s�"
 
-#: sequencer.c:408
+#: 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 "không thể ghi vào “%s�"
+
+#: sequencer.c:442
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "không thể ghi eol vào “%s�"
 
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
-#: sequencer.c:3130
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "gặp lỗi khi hoàn thành “%s�"
 
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
-#: builtin/rebase.c:568
-#, c-format
-msgid "could not read '%s'"
-msgstr "không thể đ�c “%s�"
-
-#: sequencer.c:462
+#: sequencer.c:486
 #, 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:466
+#: sequencer.c:490
 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:498
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s: chuyển-tiếp-nhanh"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:561 builtin/tag.c:609
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "Chế độ d�n dẹp không hợp lệ %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:631
+#: sequencer.c:671
 #, 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:648
+#: sequencer.c:685
 msgid "unable to update cache tree"
 msgstr "không thể cập nhật cây bộ nhớ đệm"
 
-#: sequencer.c:662
+#: sequencer.c:699
 msgid "could not resolve HEAD commit"
 msgstr "không thể phân giải lần chuyển giao HEAD"
 
-#: sequencer.c:742
+#: sequencer.c:779
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "không có khóa hiện diện trong “%.*s�"
 
-#: sequencer.c:753
+#: sequencer.c:790
 #, 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:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
+#: 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 "không thể mở “%s� để đ�c"
 
-#: sequencer.c:800
+#: sequencer.c:837
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "“GIT_AUTHOR_NAME� đã sẵn đưa ra rồi"
 
-#: sequencer.c:805
+#: sequencer.c:842
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "“GIT_AUTHOR_EMAIL� đã sẵn đưa ra rồi"
 
-#: sequencer.c:810
+#: sequencer.c:847
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "“GIT_AUTHOR_DATE� đã sẵn đưa ra rồi"
 
-#: sequencer.c:814
+#: sequencer.c:851
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "không hiểu biến “%s�"
 
-#: sequencer.c:819
+#: sequencer.c:856
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "thiếu “GIT_AUTHOR_NAME�"
 
-#: sequencer.c:821
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "thiếu “GIT_AUTHOR_EMAIL�"
 
-#: sequencer.c:823
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "thiếu “GIT_AUTHOR_DATE�"
 
-#: sequencer.c:872
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5940,11 +7630,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1146
+#: sequencer.c:1212
 msgid "'prepare-commit-msg' hook failed"
 msgstr "móc “prepare-commit-msg� bị lỗi"
 
-#: sequencer.c:1153
+#: 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"
@@ -5975,7 +7665,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1166
+#: 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"
@@ -6003,328 +7693,346 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1208
+#: sequencer.c:1273
 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:1210
+#: sequencer.c:1275
 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:1256
+#: sequencer.c:1321
 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:1258
+#: sequencer.c:1323
 msgid "detached HEAD"
 msgstr "đã r�i kh�i HEAD"
 
-#: sequencer.c:1262
+#: sequencer.c:1327
 msgid " (root-commit)"
 msgstr " (root-commit)"
 
-#: sequencer.c:1283
+#: sequencer.c:1348
 msgid "could not parse HEAD"
 msgstr "không thể phân tích HEAD"
 
-#: sequencer.c:1285
+#: sequencer.c:1350
 #, 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:1289 builtin/commit.c:1571
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
 msgid "could not parse HEAD commit"
 msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
 
-#: sequencer.c:1341 sequencer.c:1933
+#: sequencer.c:1410 sequencer.c:2295
 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:1352 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
 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:1369 sequencer.c:1429
+#: sequencer.c:1454 sequencer.c:1574
 #, 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:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "định danh tác giả không hợp lệ “%s�"
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr "tác giả sai h�ng: thiếu thông tin này tháng"
+
+#: 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 "gặp lỗi khi ghi đối tượng chuyển giao"
 
-#: sequencer.c:1456
+#: 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 "không thể cập nhật %s"
+
+#: sequencer.c:1606
 #, c-format
 msgid "could not parse commit %s"
 msgstr "không thể phân tích lần chuyển giao %s"
 
-#: sequencer.c:1461
+#: sequencer.c:1611
 #, 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:1535 sequencer.c:1645
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
 msgid "unknown command: %d"
 msgstr "không hiểu câu lệnh %d"
 
-#: sequencer.c:1592 sequencer.c:1617
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+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
+#, 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
+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
+#, 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
 #, 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:1602
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "không thể ghi “%s�"
+
+#: sequencer.c:1934
 msgid "need a HEAD to fixup"
 msgstr "cần một HEAD để sửa"
 
-#: sequencer.c:1604 sequencer.c:3157
+#: sequencer.c:1936 sequencer.c:3582
 msgid "could not read HEAD"
 msgstr "không thể đ�c HEAD"
 
-#: sequencer.c:1606
+#: sequencer.c:1938
 msgid "could not read HEAD's commit message"
 msgstr "không thể đ�c phần chú thích (message) của HEAD"
 
-#: sequencer.c:1612
-#, c-format
-msgid "cannot write '%s'"
-msgstr "không thể ghi “%s�"
-
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
-msgid "This is the 1st commit message:"
-msgstr "�ây là chú thích cho lần chuyển giao thứ nhất:"
-
-#: sequencer.c:1627
+#: sequencer.c:1962
 #, 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:1634
-#, 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:1640
-#, 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:1728
+#: sequencer.c:2072
 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:1735
+#: sequencer.c:2079
 msgid "cannot fixup root commit"
 msgstr "không thể sửa chữa lần chuyển giao gốc"
 
-#: sequencer.c:1754
+#: sequencer.c:2098
 #, 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:1762 sequencer.c:1770
+#: sequencer.c:2106 sequencer.c:2114
 #, 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:1776
+#: sequencer.c:2120
 #, 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:1795
+#: sequencer.c:2139
 #, 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:1860
+#: sequencer.c:2205
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "không thể đổi tên “%s� thành “%s�"
 
-#: sequencer.c:1915
+#: sequencer.c:2265
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "không thể hoàn nguyên %s… %s"
 
-#: sequencer.c:1916
+#: sequencer.c:2266
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "không thể áp dụng miếng vá %s… %s"
 
-#: sequencer.c:1983
+#: sequencer.c:2287
+#, 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
 #, 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:1990
+#: sequencer.c:2352
 #, 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:2066
+#: sequencer.c:2425
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s không nhận các đối số: “%s�"
 
-#: sequencer.c:2075
+#: sequencer.c:2434
 #, c-format
 msgid "missing arguments for %s"
 msgstr "thiếu đối số cho %s"
 
-#: sequencer.c:2112
+#: sequencer.c:2477
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "không thể phân tích cú pháp “%.*s�"
+msgid "could not parse '%s'"
+msgstr "không thể phân tích cú pháp “%s�"
 
-#: sequencer.c:2166
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "dòng không hợp lệ %d: %.*s"
 
-#: sequencer.c:2177
+#: sequencer.c:2549
 #, 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:2225 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "không thể đ�c “%s�."
-
-#: sequencer.c:2261
+#: sequencer.c:2635
 msgid "cancelling a cherry picking in progress"
 msgstr "đang hủy b� thao tác cherry pick đang thực hiện"
 
-#: sequencer.c:2268
+#: sequencer.c:2644
 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:2302
+#: sequencer.c:2690
 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:2304
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "bảng chỉ thị không thể dùng được: %s"
 
-#: sequencer.c:2309
+#: sequencer.c:2697
 msgid "no commits parsed."
 msgstr "không có lần chuyển giao nào được phân tích."
 
-#: sequencer.c:2320
+#: sequencer.c:2708
 msgid "cannot cherry-pick during a revert."
 msgstr "không thể cherry-pick trong khi hoàn nguyên."
 
-#: sequencer.c:2322
+#: sequencer.c:2710
 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:2404
+#: sequencer.c:2788
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "giá trị cho %s không hợp lệ: %s"
 
-#: sequencer.c:2491
+#: sequencer.c:2897
 msgid "unusable squash-onto"
 msgstr "squash-onto không dùng được"
 
-#: sequencer.c:2507
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "bảng tùy ch�n dị hình: “%s�"
 
-#: sequencer.c:2590 sequencer.c:4308
+#: sequencer.c:3012 sequencer.c:4868
 msgid "empty commit set passed"
 msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
 
-#: sequencer.c:2606
+#: sequencer.c:3029
 msgid "revert is already in progress"
 msgstr "có thao tác hoàn nguyên đang được thực hiện"
 
-#: sequencer.c:2608
+#: sequencer.c:3031
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "hãy thử \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2611
+#: sequencer.c:3034
 msgid "cherry-pick is already in progress"
 msgstr "có thao tác “cherry-pick� đang được thực hiện"
 
-#: sequencer.c:2613
+#: sequencer.c:3036
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "hãy thử \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2627
+#: sequencer.c:3050
 #, 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:2642
+#: sequencer.c:3065
 msgid "could not lock HEAD"
 msgstr "không thể khóa HEAD"
 
-#: sequencer.c:2702 sequencer.c:4057
+#: sequencer.c:3125 sequencer.c:4581
 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:2704 sequencer.c:2715
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
 msgstr "không thể phân giải HEAD"
 
-#: sequencer.c:2706 sequencer.c:2750
+#: sequencer.c:3129 sequencer.c:3173
 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:2736 builtin/grep.c:736
+#: sequencer.c:3159 builtin/grep.c:758
 #, c-format
 msgid "cannot open '%s'"
 msgstr "không mở được “%s�"
 
-#: sequencer.c:2738
+#: sequencer.c:3161
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "không thể đ�c “%s�: %s"
 
-#: sequencer.c:2739
+#: sequencer.c:3162
 msgid "unexpected end of file"
 msgstr "gặp kết thúc tập tin đột xuất"
 
-#: sequencer.c:2745
+#: sequencer.c:3168
 #, 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:2756
+#: sequencer.c:3179
 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:2797
+#: sequencer.c:3220
 msgid "no revert in progress"
 msgstr "không có tiến trình hoàn nguyên nào"
 
-#: sequencer.c:2805
+#: sequencer.c:3229
 msgid "no cherry-pick in progress"
 msgstr "không có cherry-pick đang được thực hiện"
 
-#: sequencer.c:2815
+#: sequencer.c:3239
 msgid "failed to skip the commit"
 msgstr "gặp lỗi khi b� qua đối tượng chuyển giao"
 
-#: sequencer.c:2822
+#: sequencer.c:3246
 msgid "there is nothing to skip"
 msgstr "ở đây không có gì để mà b� qua cả"
 
-#: sequencer.c:2825
+#: sequencer.c:3249
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6333,21 +8041,16 @@ msgstr ""
 "bạn đã sẵn sàng chuyển giao chưa?\n"
 "thá»­ \"git %s --continue\""
 
-#: sequencer.c:2949 sequencer.c:3969
-#, c-format
-msgid "could not update %s"
-msgstr "không thể cập nhật %s"
-
-#: sequencer.c:2987 sequencer.c:3949
+#: sequencer.c:3411 sequencer.c:4472
 msgid "cannot read HEAD"
 msgstr "không thể đ�c HEAD"
 
-#: sequencer.c:3004
+#: sequencer.c:3428
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "không thể chép “%s� sang “%s�"
 
-#: sequencer.c:3012
+#: sequencer.c:3436
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6366,27 +8069,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3022
+#: sequencer.c:3446
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "Không thể áp dụng %s… %.*s"
 
-#: sequencer.c:3029
+#: sequencer.c:3453
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "Không hòa trộn %.*s"
 
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "không thể chép “%s� sang “%s�"
 
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
-msgid "could not read index"
-msgstr "không thể đ�c bảng mục lục"
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr "�ang thực thi: %s\n"
 
-#: sequencer.c:3074
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6401,11 +8104,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3080
+#: sequencer.c:3504
 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:3086
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6422,112 +8125,124 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3147
+#: sequencer.c:3572
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "tên nhãn dị hình: “%.*s�"
 
-#: sequencer.c:3201
+#: sequencer.c:3645
 msgid "writing fake root commit"
 msgstr "ghi lần chuyển giao gốc giả"
 
-#: sequencer.c:3206
+#: sequencer.c:3650
 msgid "writing squash-onto"
 msgstr "Ä‘ang ghi squash-onto"
 
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "gặp lỗi khi tìm cây của %s"
-
-#: sequencer.c:3262 builtin/rebase.c:874
-msgid "could not write index"
-msgstr "không thể ghi bảng mục lục"
-
-#: sequencer.c:3289
+#: sequencer.c:3734
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "không thể phân giải “%s�"
 
-#: sequencer.c:3320
+#: sequencer.c:3767
 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:3342
+#: sequencer.c:3789
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "không thể phân tích “%.*s�"
 
-#: sequencer.c:3351
+#: sequencer.c:3798
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "chẳng có gì để hòa trộn: “%.*s�"
 
-#: sequencer.c:3363
+#: sequencer.c:3810
 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:3378
+#: sequencer.c:3826
 #, 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:3538
+#: sequencer.c:4009
 #, 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:3554
+#: sequencer.c:4025
 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:3623 builtin/rebase.c:712
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr "Không thể autostash"
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "Gặp đáp ứng stash không cần: “%s�"
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "Không thể tạo thư mục cho “%s�"
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "�ã tạo autostash: %s\n"
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr "không thể reset --hard"
+
+#: sequencer.c:4140
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "�ã áp dụng autostash.\n"
 
-#: sequencer.c:3635
+#: sequencer.c:4152
 #, c-format
 msgid "cannot store %s"
 msgstr "không thử lưu “%s�"
 
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
+#: sequencer.c:4155
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
-"�p dụng autostash có hiệu quả trong các xung đột.\n"
+"%s\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"
 
-#: sequencer.c:3699
-#, c-format
-msgid "could not checkout %s"
-msgstr "không thể lấy ra %s"
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
+msgstr "�p dụng autostash có hiệu quả trong các xung đột."
 
-#: sequencer.c:3713
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s không phải là một OID hợp lệ"
+#: sequencer.c:4161
+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:3718 git-rebase--preserve-merges.sh:779
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
 msgstr "không thể tách r�i HEAD"
 
-#: sequencer.c:3733
+#: sequencer.c:4248
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "Dừng lại ở HEAD\n"
 
-#: sequencer.c:3735
+#: sequencer.c:4250
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "Dừng lại ở %s\n"
 
-#: sequencer.c:3743
+#: sequencer.c:4258
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6548,48 +8263,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3827
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "�ang cải tổ (%d/%d)%s"
+
+#: sequencer.c:4350
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "Dừng lại ở %s…  %.*s\n"
 
-#: sequencer.c:3898
+#: sequencer.c:4421
 #, c-format
 msgid "unknown command %d"
 msgstr "không hiểu câu lệnh %d"
 
-#: sequencer.c:3957
+#: sequencer.c:4480
 msgid "could not read orig-head"
 msgstr "không thể đ�c orig-head"
 
-#: sequencer.c:3962
+#: sequencer.c:4485
 msgid "could not read 'onto'"
 msgstr "không thể đ�c “onto�."
 
-#: sequencer.c:3976
+#: sequencer.c:4499
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "không thể cập nhật HEAD thành %s"
 
-#: sequencer.c:4069
+#: sequencer.c:4559
+#, 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:4611
 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:4078
+#: sequencer.c:4620
 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:4080
+#: sequencer.c:4622
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "tập tin không hợp lệ: “%s�"
 
-#: sequencer.c:4082
+#: sequencer.c:4624
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "nội dung không hợp lệ: “%s�"
 
-#: sequencer.c:4085
+#: sequencer.c:4627
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6599,69 +8324,59 @@ 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:4121 sequencer.c:4159
+#: sequencer.c:4663 sequencer.c:4702
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "không thể ghi tập tin: “%s�"
 
-#: sequencer.c:4174
+#: sequencer.c:4718
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "không thể xóa b� CHERRY_PICK_HEAD"
 
-#: sequencer.c:4181
+#: sequencer.c:4725
 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:4285
+#: sequencer.c:4845
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s: không thể cherry-pick một %s"
 
-#: sequencer.c:4289
+#: sequencer.c:4849
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s: điểm xét duyệt sai"
 
-#: sequencer.c:4324
+#: sequencer.c:4884
 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:4774
+#: sequencer.c:5361
 msgid "make_script: unhandled options"
 msgstr "make_script: các tùy ch�n được không xử lý"
 
-#: sequencer.c:4777
+#: sequencer.c:5364
 msgid "make_script: error preparing revisions"
 msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
 
-#: sequencer.c:4935
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"Bạn có thể sửa nó bằng “git rebase --edit-todo� và sau đó chạy “git rebase --"
-"continue�.\n"
-"Hoặc là bạn có thể bãi b� việc cải tổ bằng “git rebase --abort�.\n"
-
-#: sequencer.c:5047 sequencer.c:5064
+#: sequencer.c:5614 sequencer.c:5631
 msgid "nothing to do"
 msgstr "không có gì để làm"
 
-#: sequencer.c:5078
+#: sequencer.c:5650
 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:5166
+#: sequencer.c:5750
 msgid "the script was already rearranged."
 msgstr "văn lệnh đã sẵn được sắp đặt rồi."
 
-#: setup.c:124
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "“%s� ở ngoài một kho chứa"
+msgid "'%s' is outside repository at '%s'"
+msgstr "“%s� ngoài một kho chứa tại “%s�"
 
-#: setup.c:174
+#: setup.c:185
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6671,7 +8386,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:187
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6683,12 +8398,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:236
+#: setup.c:264
 #, 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:255
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6699,92 +8414,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:391
+#: setup.c:419
 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:395
+#: setup.c:423 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:541
+#: setup.c:658
 #, 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:549
-msgid "unknown repository extensions found:"
-msgstr "tìm thấy phần mở rộng kho chưa biết:"
+#: setup.c:666
+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:568
+#: 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] "phiên bản kho là 0, nhưng lại tìm thấy phần mở rộng chỉ v1:"
+
+#: setup.c:701
 #, c-format
 msgid "error opening '%s'"
 msgstr "gặp lỗi khi mở “%s�"
 
-#: setup.c:570
+#: setup.c:703
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "tập tin .git là quá lớn: “%s�"
 
-#: setup.c:572
+#: setup.c:705
 #, c-format
 msgid "error reading %s"
 msgstr "gặp lỗi khi đ�c %s"
 
-#: setup.c:574
+#: setup.c:707
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "định dạng tập tin git không hợp lệ: %s"
 
-#: setup.c:576
+#: setup.c:709
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "không có đư�ng dẫn trong tập tin git: %s"
 
-#: setup.c:578
+#: setup.c:711
 #, c-format
 msgid "not a git repository: %s"
 msgstr "không phải là kho git: %s"
 
-#: setup.c:677
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
 msgstr "“$%s� quá lớn"
 
-#: setup.c:691
+#: setup.c:827
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "không phải là kho git: “%s�"
 
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c:856 setup.c:858 setup.c:889
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "không thể chdir (chuyển đổi thư mục) sang “%s�"
 
-#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
 msgid "cannot come back to cwd"
 msgstr "không thể quay lại cwd"
 
-#: setup.c:852
+#: setup.c:988
 #, 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:1090
+#: setup.c:1231
 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:1099 setup.c:1105
+#: setup.c:1240 setup.c:1246
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "không thể chuyển sang “%s�"
 
-#: setup.c:1110
+#: setup.c:1251
 #, 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:1116
+#: setup.c:1257
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -6794,7 +8515,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:1227
+#: setup.c:1381
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6803,357 +8524,118 @@ 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:1271
+#: setup.c:1430
 msgid "open /dev/null or dup failed"
 msgstr "gặp lỗi khi mở “/dev/null� hay dup"
 
-#: setup.c:1286
+#: setup.c:1445
 msgid "fork failed"
 msgstr "gặp lỗi khi rẽ nhánh tiến trình"
 
-#: setup.c:1291
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
 msgid "setsid failed"
 msgstr "setsid gặp lỗi"
 
-#: sha1-file.c:452
-#, 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"
-
-#: sha1-file.c:503
-#, 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�"
-
-#: sha1-file.c:575
-#, 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"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "không thể chuẩn hóa thư mục đối tượng: “%s�"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "không thể fdopen tập tin khóa thay thế"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "không thể đ�c tập tin thay thế"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "không thể di chuyển tập tin thay thế vào chỗ"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "đư�ng dẫn “%s� không tồn tại"
-
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "kho tham chiếu “%s� như là lấy ra liên kết vẫn chưa được hỗ trợ."
-
-#: sha1-file.c:717
-#, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "kho tham chiếu “%s� không phải là một kho nội bộ."
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "kho tham chiếu “%s� là nông"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "kho tham chiếu “%s� bị cấy ghép"
-
-#: sha1-file.c:791
-#, 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"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "đang cố để mmap %<PRIuMAX> vượt quá giới hạn %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap gặp lỗi"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "tập tin đối tượng %s trống rỗng"
-
-#: sha1-file.c:1252 sha1-file.c:2392
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "đối tượng mất h�ng “%s�"
-
-#: sha1-file.c:1254 sha1-file.c:2396
-#, 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�"
-
-#: sha1-file.c:1296
-msgid "invalid object type"
-msgstr "kiểu đối tượng không hợp lệ"
-
-#: sha1-file.c:1380
-#, 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"
-
-#: sha1-file.c:1383
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "không thể giải gói phần đầu %s"
-
-#: sha1-file.c:1389
-#, 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"
-
-#: sha1-file.c:1392
-#, c-format
-msgid "unable to parse %s header"
-msgstr "không thể phân tích phần đầu của “%s�"
-
-#: sha1-file.c:1584
-#, c-format
-msgid "failed to read object %s"
-msgstr "gặp lỗi khi đ�c đối tượng “%s�"
-
-#: sha1-file.c:1588
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "c%s thay thế không được tìm thấy cho %s"
-
-#: sha1-file.c:1592
-#, 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"
-
-#: sha1-file.c:1596
-#, 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"
-
-#: sha1-file.c:1699
-#, c-format
-msgid "unable to write file %s"
-msgstr "không thể ghi tập tin %s"
-
-#: sha1-file.c:1706
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "không thể đặt quy�n thành “%s�"
-
-#: sha1-file.c:1713
-msgid "file write error"
-msgstr "lỗi ghi tập tin"
-
-#: sha1-file.c:1732
-msgid "error when closing loose object file"
-msgstr "gặp lỗi trong khi đóng tập tin đối tượng"
-
-#: sha1-file.c:1797
-#, 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"
-
-#: sha1-file.c:1799
-msgid "unable to create temporary file"
-msgstr "không thể tạo tập tin tạm th�i"
-
-#: sha1-file.c:1823
-msgid "unable to write loose object file"
-msgstr "không thể ghi tập tin đối tượng đã mất"
-
-#: sha1-file.c:1829
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "không thể xả nén đối tượng mới %s (%d)"
-
-#: sha1-file.c:1833
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "deflateEnd trên đối tượng %s gặp lỗi (%d)"
-
-#: sha1-file.c:1837
-#, 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"
-
-#: sha1-file.c:1847 builtin/pack-objects.c:925
-#, c-format
-msgid "failed utime() on %s"
-msgstr "gặp lỗi utime() trên “%s�"
-
-#: sha1-file.c:1922
-#, c-format
-msgid "cannot read object for %s"
-msgstr "không thể đ�c đối tượng cho %s"
-
-#: sha1-file.c:1962
-msgid "corrupt commit"
-msgstr "lần chuyển giao sai h�ng"
-
-#: sha1-file.c:1970
-msgid "corrupt tag"
-msgstr "thẻ sai h�ng"
-
-#: sha1-file.c:2069
-#, c-format
-msgid "read error while indexing %s"
-msgstr "gặp lỗi đ�c khi đánh mục lục %s"
-
-#: sha1-file.c:2072
-#, c-format
-msgid "short read while indexing %s"
-msgstr "không đ�c ngắn khi đánh mục lục %s"
-
-#: sha1-file.c:2145 sha1-file.c:2154
-#, 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"
+#: sparse-index.c:162
+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"
 
-#: sha1-file.c:2160
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s: kiểu tập tin không được hỗ trợ"
-
-#: sha1-file.c:2184
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s không phải là một đối tượng hợp lệ"
+#: sparse-index.c:176
+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"
 
-#: sha1-file.c:2186
+#: sparse-index.c:263
 #, 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ệ"
-
-#: sha1-file.c:2213 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "không thể mở %s"
-
-#: sha1-file.c:2403 sha1-file.c:2455
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "mã băm không khớp cho %s (cần %s)"
-
-#: sha1-file.c:2427
-#, c-format
-msgid "unable to mmap %s"
-msgstr "không thể mmap %s"
-
-#: sha1-file.c:2432
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "không thể giải gói phần đầu của “%s�"
-
-#: sha1-file.c:2438
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "không thể phân tích phần đầu của “%s�"
-
-#: sha1-file.c:2449
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "không thể giải gói nội dung của “%s�"
-
-#: sha1-name.c:487
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "tóm lược SHA1 %s chưa rõ ràng"
-
-#: sha1-name.c:498
-msgid "The candidates are:"
-msgstr "Các ứng cử là:"
-
-#: sha1-name.c:797
-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 ""
-"Git thư�ng không bao gi� tạo tham chiếu mà nó kết thúc với 40 ký tự hex\n"
-"bởi vì nó sẽ bị b� qua khi bạn chỉ định 40-hex. Những tham chiếu này\n"
-"có lẽ được tạo ra bởi một sai sót nào đó. Ví dụ,\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"với \"$br\" không hiểu lý do vì sao trống rỗng và một tham chiếu 40-hex được "
-"tạo ra.\n"
-"Xin hãy kiểm tra những tham chiếu này và có thể xóa chúng đi. Tắt l�i nhắn "
-"này\n"
-"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
+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)"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:822
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
+#: strbuf.c:852
 #, c-format
 msgid "%u.%2.2u GiB/s"
 msgstr "%u.%2.2u GiB/giây"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte
-#: strbuf.c:832
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: strbuf.c:862
 #, c-format
 msgid "%u.%2.2u MiB/s"
 msgstr "%u.%2.2u MiB/giây"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte
-#: strbuf.c:841
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
+#: strbuf.c:871
 #, c-format
 msgid "%u.%2.2u KiB/s"
 msgstr "%u.%2.2u KiB/giây"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte
-#: strbuf.c:849
+#: strbuf.c:877
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u byte"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
+#: strbuf.c:879
 #, c-format
 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:738
+#: builtin/rebase.c:866
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "không thể mở “%s� để ghi"
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr "không thể sửa “%s�"
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+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"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr ""
+"đang b� qua “%s� cái mà có thể được phiên dịch như là một tùy ch�n dòng "
+"lệnh: %s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "giá trị cho %s không hợp lệ"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "Không thể cập nhật mục .gitmodules %s"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr ""
@@ -7174,62 +8656,138 @@ 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:327
+#: submodule.c:328
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "trong mô-đun-con không có gì “%s�"
 
-#: submodule.c:358
+#: submodule.c:359
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "�ặc tả đư�ng dẫn “%s� thì ở trong mô-đun-con “%.*s�"
 
-#: submodule.c:910
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "đối số --ignore-submodules sai: %s"
+
+#: submodule.c:805
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+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:908
 #, 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:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:993
+#, c-format
+msgid ""
+"Could not run 'git rev-list <commits> --not --remotes -n 1' command in "
+"submodule %s"
+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:1116
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "xử lý cho mô-đun-con “%s� gặp lỗi"
+
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
 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:1481
+#: submodule.c:1156
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "�ẩy lên mô-đun-con “%s�\n"
+
+#: submodule.c:1159
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "Không thể đẩy lên mô-đun-con “%s�\n"
+
+#: submodule.c:1451
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "�ang lấy v� mô-đun-con %s%s\n"
+
+#: submodule.c:1485
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "Không thể truy cập mô-đun-con “%s�\n"
+
+#: submodule.c:1640
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "Không thể truy cập mô-đun-con “%s�"
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"Có lỗi khi lấy v� mô-đun-con:\n"
+" “%s�"
 
-#: submodule.c:1651
+#: submodule.c:1665
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "không nhận ra “%s� là một kho git"
 
-#: submodule.c:1789
+#: submodule.c:1682
+#, 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:1723
+#, 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:1798
 #, 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:1802
+#: submodule.c:1811
 #, 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:1817
+#: submodule.c:1826
 #, 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:1907
+#: submodule.c:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "không thể đệ quy vào trong mô-đun-con “%s�"
+
+#: submodule.c:1874
+msgid "could not reset submodule index"
+msgstr "không thể đặt lại mục lục của mô-đun-con"
+
+#: submodule.c:1916
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "mô-đun-con “%s� có mục lục còn bẩn"
 
-#: submodule.c:1959
+#: submodule.c:1968
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "Mô-đun-con “%s� không thể được cập nhật."
 
-#: submodule.c:2007
+#: submodule.c:2036
+#, 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:2057
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -7237,12 +8795,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:2019 submodule.c:2074
+#: submodule.c:2069 submodule.c:2128
 #, 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:2026
+#: submodule.c:2073
+#, 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:2080
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7253,207 +8816,89 @@ msgstr ""
 "“%s� sang\n"
 "“%s�\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "không thể đệ quy vào trong mô-đun-con “%s�"
-
-#: submodule.c:2153
+#: submodule.c:2208
 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:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree trả v� mã không như mong đợi %d"
 
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "đang l� đi tên mô-đun-con mập m�: %s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr ""
-"đang b� qua “%s� cái mà có thể được phiên dịch như là một tùy ch�n dòng "
-"lệnh: %s"
-
-#: submodule-config.c:490
-#, c-format
-msgid "invalid value for %s"
-msgstr "giá trị cho %s không hợp lệ"
-
-#: submodule-config.c:761
+#: symlinks.c:244
 #, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "Không thể cập nhật mục .gitmodules %s"
+msgid "failed to lstat '%s'"
+msgstr "gặp lỗi khi lstat “%s�"
 
-#: trailer.c:238
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "chạy lệnh kéo theo “%s� gặp lỗi"
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: 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 "không hiểu giá trị “%s� cho khóa “%s�"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: 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 "nhi�u hơn một %s"
 
-#: trailer.c:730
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
 msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s�"
 
-#: trailer.c:750
+#: trailer.c:763
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "không đ�c được tập tin đầu vào “%s�"
 
-#: trailer.c:753
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
 msgid "could not read from stdin"
 msgstr "không thể đ�c từ đầu vào tiêu chuẩn"
 
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1024 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
 msgstr "không thể lấy thông tin thống kê v� %s"
 
-#: trailer.c:1013
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "\"%s\" không phải là tập tin bình thư�ng"
 
-#: trailer.c:1015
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "tập tin %s ngư�i dùng không thể ghi được"
 
-#: trailer.c:1027
+#: trailer.c:1040
 msgid "could not open temporary file"
 msgstr "không thể tạo tập tin tạm th�i"
 
-#: trailer.c:1067
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "không thể đổi tên tập tin tạm th�i thành %s"
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Không thể đặt thượng nguồn của “%s� thành “%s� của “%s�\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "không thể đ�c bó “%s�"
-
-#: transport.c:214
-#, 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:266
-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:267
-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:632
-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:705
-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:831
-#, 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:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "không cho phép phương thức vận chuyển “%s�"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "git-over-rsync không còn được hỗ trợ nữa"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-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:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"Hãy thử\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"hoặc cd đến đư�ng dẫn và dùng\n"
-"\n"
-"\tgit push\n"
-"\n"
-"để đẩy chúng lên máy phục vụ.\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "Bãi b�."
-
-#: transport.c:1201
-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"
-
-#: transport.c:1345 transport-helper.c:655
-msgid "operation not supported by protocol"
-msgstr "thao tác không được gia thức hỗ trợ"
-
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
 msgstr "ghi đầy đủ lên bộ hỗ trợ máy chủ gặp lỗi"
 
-#: transport-helper.c:144
+#: transport-helper.c:145
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "không thể tìm thấy bộ hỗ trợ máy chủ cho “%s�"
 
-#: transport-helper.c:160 transport-helper.c:569
+#: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
 msgstr "không thể nhân đôi fd dầu ra bộ hỗ trợ"
 
-#: transport-helper.c:211
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
@@ -7462,157 +8907,272 @@ msgstr ""
 "không hiểu capability bắt buộc %s; bộ hỗ trợ máy chủ này gần như chắc chắn "
 "là cần phiên bản Git mới hơn"
 
-#: transport-helper.c:217
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
 msgstr "bộ hỗ trợ máy chủ này cần phải thực thi capability đặc tả tham chiếu"
 
-#: transport-helper.c:284 transport-helper.c:424
+#: transport-helper.c:287 transport-helper.c:429
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s said bất ng�: “%s�"
 
-#: transport-helper.c:413
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s cũng khóa %s"
 
-#: transport-helper.c:491
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
 msgstr "không thể chạy fast-import"
 
-#: transport-helper.c:514
+#: transport-helper.c:520
 msgid "error while running fast-import"
 msgstr "gặp lỗi trong khi chạy fast-import"
 
-#: transport-helper.c:543 transport-helper.c:1132
+#: transport-helper.c:549 transport-helper.c:1247
 #, c-format
 msgid "could not read ref %s"
 msgstr "không thể đ�c tham chiếu %s"
 
-#: transport-helper.c:588
+#: transport-helper.c:594
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "không hiểu đáp ứng để kết nối: %s"
 
-#: transport-helper.c:610
+#: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
 msgstr "giao thức này không hỗ trợ cài đặt đư�ng dẫn dịch vụ máy chủ"
 
-#: transport-helper.c:612
+#: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr "đư�ng dẫn dịch vụ máy chủ không hợp lệ"
 
-#: transport-helper.c:658
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr "thao tác không được gia thức hỗ trợ"
+
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "không thể kết nối đến dịch vụ phụ %s"
 
-#: transport-helper.c:734
+#: transport-helper.c:693 transport.c:400
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only cần giao thức v2"
+
+#: transport-helper.c:755
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "“option� không có chỉ thị “ok/error� tương ứng"
+
+#: transport-helper.c:798
 #, c-format
 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:787
+#: transport-helper.c:855
 #, 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:848
+#: transport-helper.c:938
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "helper %s không hỗ trợ dry-run"
 
-#: transport-helper.c:851
+#: transport-helper.c:941
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "helper %s không hỗ trợ --signed"
 
-#: transport-helper.c:854
+#: transport-helper.c:944
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "helper %s không hỗ trợ --signed=if-asked"
 
-#: transport-helper.c:859
+#: transport-helper.c:949
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "helper %s không hỗ trợ --atomic"
 
-#: transport-helper.c:865
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "helper %s không hỗ trợ --%s"
+
+#: transport-helper.c:960
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "helper %s không hỗ trợ “push-option�"
 
-#: transport-helper.c:963
+#: transport-helper.c:1060
 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:968
+#: transport-helper.c:1065
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "helper %s không hỗ trợ “force�"
 
-#: transport-helper.c:1015
+#: transport-helper.c:1112
 msgid "couldn't run fast-export"
 msgstr "không thể chạy fast-export"
 
-#: transport-helper.c:1020
+#: transport-helper.c:1117
 msgid "error while running fast-export"
 msgstr "gặp lỗi trong khi chạy fast-export"
 
-#: transport-helper.c:1045
+#: transport-helper.c:1142
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 "Không có các tham chiếu trong phần chung và chưa chỉ định; nên không làm gì "
 "cả.\n"
-"Tuy nhiên bạn nên chỉ định một nhánh như “master� chẳng hạn.\n"
+"Tuy nhiên bạn nên chỉ định một nhánh.\n"
+
+#: transport-helper.c:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "không hỗ trợ định dạng đối tượng “%s�"
 
-#: transport-helper.c:1118
+#: transport-helper.c:1233
 #, 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:1270
+#: transport-helper.c:1385
 #, c-format
 msgid "read(%s) failed"
 msgstr "read(%s) gặp lỗi"
 
-#: transport-helper.c:1297
+#: transport-helper.c:1412
 #, c-format
 msgid "write(%s) failed"
 msgstr "write(%s) gặp lỗi"
 
-#: transport-helper.c:1346
+#: transport-helper.c:1461
 #, c-format
 msgid "%s thread failed"
 msgstr "tuyến trình %s gặp lỗi"
 
-#: transport-helper.c:1350
+#: transport-helper.c:1465
 #, 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:1369 transport-helper.c:1373
+#: transport-helper.c:1484 transport-helper.c:1488
 #, 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:1410
+#: transport-helper.c:1525
 #, c-format
 msgid "%s process failed to wait"
 msgstr "xử lý %s gặp lỗi khi đợi"
 
-#: transport-helper.c:1414
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed"
 msgstr "xử lý %s gặp lỗi"
 
-#: transport-helper.c:1432 transport-helper.c:1441
+#: transport-helper.c:1547 transport-helper.c:1556
 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"
 
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Không thể đặt thượng nguồn của “%s� thành “%s� của “%s�\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "không thể đ�c bó “%s�"
+
+#: transport.c:223
+#, 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:275
+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:276
+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:403
+msgid "server does not support wait-for-done"
+msgstr "máy chủ không hỗ trợ wait-for-done"
+
+#: transport.c:755
+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:830
+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:965
+#, 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:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "không cho phép phương thức vận chuyển “%s�"
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr "git-over-rsync không còn được hỗ trợ nữa"
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+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:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Hãy thử\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"hoặc cd đến đư�ng dẫn và dùng\n"
+"\n"
+"\tgit push\n"
+"\n"
+"để đẩy chúng lên máy phục vụ.\n"
+"\n"
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr "Bãi b�."
+
+#: transport.c:1346
+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"
+
 #: tree-walk.c:33
 msgid "too-short tree object"
 msgstr "đối tượng cây quá ngắn"
@@ -7629,7 +9189,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:110
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7640,7 +9200,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:112
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7650,7 +9210,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7661,7 +9221,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:117
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7671,7 +9231,7 @@ msgstr ""
 "hòa trộn:\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7681,7 +9241,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:122
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7691,7 +9251,7 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7701,7 +9261,7 @@ msgstr ""
 "trong nó:\n"
 "%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7711,7 +9271,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:133
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7721,7 +9281,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7731,7 +9291,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:138
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7741,7 +9301,7 @@ msgstr ""
 "trá»™n:\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7750,7 +9310,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:143
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7759,7 +9319,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:149
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7770,7 +9330,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:151
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7781,7 +9341,7 @@ msgstr ""
 "checkout:\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7791,7 +9351,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:156
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7801,7 +9361,7 @@ msgstr ""
 "hòa trộn:\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7811,7 +9371,7 @@ msgstr ""
 "%s:\n"
 "%%sVui lòng di chuyển hay gỡ b� chúng trước khi bạn %s."
 
-#: unpack-trees.c:161
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7821,61 +9381,71 @@ msgstr ""
 "%s:\n"
 "%%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:174
 #, 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:172
+#: unpack-trees.c:177
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\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"
+"Không thể cập nhật mô-đun-con:\n"
 "%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\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"
+"Các đư�ng dẫn sau đây không được cập nhật và vẫn được để lại bất chấp các "
+"mẫu sparse:\n"
 "%s"
 
-#: unpack-trees.c:176
+#: unpack-trees.c:182
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\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"
+"Các đư�ng dẫn theo sau đây chưa được hòa trộn và để bất chấp các mẫu "
+"sparse:\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:184
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"Không thể cập nhật mô-đun-con:\n"
+"Các đư�ng dẫn sau đây đã sẵn hiện diện và như vậy không được cập nhật bất "
+"cấp các mẫu sparse:\n"
 "%s"
 
-#: unpack-trees.c:255
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "Bãi b�\n"
 
-#: unpack-trees.c:317
+#: unpack-trees.c:291
+#, c-format
+msgid ""
+"After fixing the above paths, you may want to run `git sparse-checkout "
+"reapply`.\n"
+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
 msgid "Updating files"
 msgstr "�ang cập nhật các tập tin"
 
-#: unpack-trees.c:349
+#: 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"
@@ -7885,6 +9455,20 @@ 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:1618
+msgid "Updating index flags"
+msgstr "�ang cập nhật các c� mục lục"
+
+#: unpack-trees.c:2718
+#, 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
+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"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "tên lược đồ URL không hợp lệ, hoặc thiếu hậu tố “://�"
@@ -7914,28 +9498,32 @@ msgstr "tên cổng không hợp lệ"
 msgid "invalid '..' path segment"
 msgstr "đoạn đư�ng dẫn “..� không hợp lệ"
 
-#: worktree.c:258 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "�ang lấy v� các đối tượng"
+
+#: worktree.c:236 builtin/am.c:2152
 #, c-format
 msgid "failed to read '%s'"
 msgstr "gặp lỗi khi đ�c “%s�"
 
-#: worktree.c:304
+#: worktree.c:303
 #, 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:314
 #, 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:326
 #, c-format
 msgid "'%s' does not exist"
 msgstr "\"%s\" không tồn tại"
 
-#: worktree.c:333
+#: worktree.c:332
 #, 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"
@@ -7945,17 +9533,83 @@ msgstr "“%s� không phải là tập tin .git, mã lỗi %d"
 msgid "'%s' does not point back to '%s'"
 msgstr "“%s� không chỉ ngược đến “%s�"
 
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:603
+msgid "not a directory"
+msgstr "không phải thư mục"
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr ".git không phải là một tập tin"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr "tệp .git bị h�ng"
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr "tập tin .git không chính xác"
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr "không phải là một đư�ng dẫn hợp lệ"
+
+#: worktree.c:728
+msgid "unable to locate repository; .git is not a file"
+msgstr "không thể phân bổ kho chứa; .git không phải là một tập tin"
+
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "không thể phân bổ kho chứa; tập tin .git tham chiếu đến một kho"
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr "không thể phân bổ kho chứa; tập tin .git bị h�ng"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr "gitdir không thể đ�c được"
+
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr "gitdir không chính xác"
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr "không phải thư mục hợp lệ"
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "tập tin gitdir không tồn tại"
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "không thể đ�c tập tin gitdir (%s)"
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "đ�c ngắn (cần %<PRIuMAX> byte, đ�c %<PRIuMAX>)"
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "tập tin gitdir (thư mục git) không hợp lệ"
+
+#: worktree.c:817
+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
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "không thể mở “%s� để đ�c và ghi"
 
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr "không thể truy cập “%s�"
 
-#: wrapper.c:596
+#: wrapper.c:607
 msgid "unable to get current working directory"
 msgstr "không thể lấy thư mục làm việc hiện hành"
 
@@ -7992,11 +9646,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:1074
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr "Những thay đổi sẽ được chuyển giao:"
 
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
 msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
 
@@ -8028,93 +9682,93 @@ msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr ""
 "  (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)"
 
-#: wt-status.c:268
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr "bị xóa bởi cả hai:"
 
-#: wt-status.c:270
+#: wt-status.c:268
 msgid "added by us:"
 msgstr "được thêm vào bởi chúng ta:"
 
-#: wt-status.c:272
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "bị xóa đi bởi h�:"
 
-#: wt-status.c:274
+#: wt-status.c:272
 msgid "added by them:"
 msgstr "được thêm vào bởi h�:"
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr "bị xóa bởi chúng ta:"
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "both added:"
 msgstr "được thêm vào bởi cả hai:"
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "both modified:"
 msgstr "bị sửa bởi cả hai:"
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "new file:"
 msgstr "tập tin mới:"
 
-#: wt-status.c:292
+#: wt-status.c:290
 msgid "copied:"
 msgstr "đã chép:"
 
-#: wt-status.c:294
+#: wt-status.c:292
 msgid "deleted:"
 msgstr "đã xóa:"
 
-#: wt-status.c:296
+#: wt-status.c:294
 msgid "modified:"
 msgstr "đã sửa:"
 
-#: wt-status.c:298
+#: wt-status.c:296
 msgid "renamed:"
 msgstr "đã đổi tên:"
 
-#: wt-status.c:300
+#: wt-status.c:298
 msgid "typechange:"
 msgstr "đổi-kiểu:"
 
-#: wt-status.c:302
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "không hiểu:"
 
-#: wt-status.c:304
+#: wt-status.c:302
 msgid "unmerged:"
 msgstr "chưa hòa trộn:"
 
-#: wt-status.c:384
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "lần chuyển giao mới, "
 
-#: wt-status.c:386
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "nội dung bị sửa đổi, "
 
-#: wt-status.c:388
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr "nội dung chưa được theo dõi, "
 
-#: wt-status.c:906
+#: wt-status.c:958
 #, 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:938
+#: wt-status.c:989
 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:940
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
 
-#: wt-status.c:1022
+#: wt-status.c:1073
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -8122,7 +9776,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:1114
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -8131,111 +9785,111 @@ msgid ""
 msgstr ""
 "\n"
 "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"
+"Bạn có thể dùng “--no-ahead-behind� tránh phải đi�u này.\n"
 
-#: wt-status.c:1144
+#: wt-status.c:1195
 msgid "You have unmerged paths."
 msgstr "Bạn có những đư�ng dẫn chưa được hòa trộn."
 
-#: wt-status.c:1147
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  (sửa các xung đột rồi chạy \"git commit\")"
 
-#: wt-status.c:1149
+#: wt-status.c:1200
 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:1153
+#: wt-status.c:1204
 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:1156
+#: wt-status.c:1207
 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:1165
+#: wt-status.c:1216
 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:1168
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr "Miếng vá hiện tại bị trống rỗng."
 
-#: wt-status.c:1172
+#: wt-status.c:1223
 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:1174
+#: wt-status.c:1225
 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:1176
+#: wt-status.c:1227
 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:1309
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
 msgstr "thiếu git-rebase-todo."
 
-#: wt-status.c:1311
+#: wt-status.c:1362
 msgid "No commands done."
 msgstr "Không thực hiện lệnh nào."
 
-#: wt-status.c:1314
+#: wt-status.c:1365
 #, 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:1325
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  (xem thêm trong %s)"
 
-#: wt-status.c:1330
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "Không có lệnh nào còn lại."
 
-#: wt-status.c:1333
+#: 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] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
 
-#: wt-status.c:1341
+#: wt-status.c:1392
 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:1353
+#: wt-status.c:1404
 #, 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:1358
+#: wt-status.c:1409
 msgid "You are currently rebasing."
-msgstr "Bạn hiện nay đang thực hiện việc “rebase� (“cải tổ�)."
+msgstr "Bạn hiện nay đang thực hiện việc “rebase� (cải tổ)."
 
-#: wt-status.c:1371
+#: wt-status.c:1422
 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:1373
+#: wt-status.c:1424
 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:1375
+#: wt-status.c:1426
 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:1382
+#: wt-status.c:1433
 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:1386
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -8243,150 +9897,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:1391
+#: wt-status.c:1442
 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:1394
+#: wt-status.c:1445
 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:1398
+#: wt-status.c:1449
 #, 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:1403
+#: wt-status.c:1454
 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:1406
+#: wt-status.c:1457
 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:1408
+#: wt-status.c:1459
 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:1419
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr "Cherry-pick hiện tại đang được thực hiện."
 
-#: wt-status.c:1422
+#: wt-status.c:1473
 #, 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:1429
+#: wt-status.c:1480
 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:1432
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  (chạy lệnh \"git cherry-pick --continue\" để tiếp tục)"
 
-#: wt-status.c:1435
+#: wt-status.c:1486
 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:1437
+#: wt-status.c:1488
 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:1439
+#: wt-status.c:1490
 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:1449
+#: wt-status.c:1500
 msgid "Revert currently in progress."
 msgstr "Hoàn nguyên hiện tại đang thực hiện."
 
-#: wt-status.c:1452
+#: wt-status.c:1503
 #, 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:1458
+#: wt-status.c:1509
 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:1461
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  (chạy lệnh \"git revert --continue\" để tiếp tục)"
 
-#: wt-status.c:1464
+#: wt-status.c:1515
 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:1466
+#: wt-status.c:1517
 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:1468
+#: wt-status.c:1519
 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:1478
+#: wt-status.c:1529
 #, 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:1482
+#: wt-status.c:1533
 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:1485
+#: wt-status.c:1536
 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:1694
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "Bạn đang trong lần lấy ra sparse."
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr ""
+"Bạn đang ở trong lần lấy ra sparser %d%% của các tập tin được theo dõi hiện "
+"tại."
+
+#: wt-status.c:1794
 msgid "On branch "
 msgstr "Trên nhánh "
 
-#: wt-status.c:1701
+#: wt-status.c:1801
 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:1703
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
 msgstr "rebase đang được thực hiện: lên trên "
 
-#: wt-status.c:1713
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr "HEAD được tách r�i tại "
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr "HEAD được tách r�i từ "
+
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr "Hiện tại chẳng ở nhánh nào cả."
 
-#: wt-status.c:1730
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr "Lần chuyển giao khởi tạo"
 
-#: wt-status.c:1731
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr "Vẫn chưa chuyển giao"
 
-#: wt-status.c:1745
+#: wt-status.c:1845
 msgid "Untracked files"
 msgstr "Những tập tin chưa được theo dõi"
 
-#: wt-status.c:1747
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "Những tập tin bị l� đi"
 
-#: wt-status.c:1751
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8398,32 +10071,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:1757
+#: wt-status.c:1857
 #, 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:1759
+#: wt-status.c:1859
 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:1765
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "Không có thay đổi nào"
 
-#: wt-status.c:1770
+#: wt-status.c:1870
 #, 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:1773
+#: wt-status.c:1874
 #, 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:1776
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
@@ -8432,205 +10105,232 @@ 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:1779
+#: wt-status.c:1882
 #, 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:1782
+#: wt-status.c:1886
 #, 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:1785 wt-status.c:1790
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr "không có gì để chuyển giao\n"
 
-#: wt-status.c:1788
+#: wt-status.c:1893
 #, 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:1792
+#: wt-status.c:1898
 #, 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:1905
+#: wt-status.c:2003
 msgid "No commits yet on "
 msgstr "Vẫn không thực hiện lệnh chuyển giao nào "
 
-#: wt-status.c:1909
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr "HEAD (không nhánh)"
 
-#: wt-status.c:1940
+#: wt-status.c:2038
 msgid "different"
 msgstr "khác"
 
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "đằng sau "
 
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "phía trước "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2569
 #, 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:2476
+#: wt-status.c:2575
 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:2478
+#: wt-status.c:2577
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr ""
 "không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#: compat/simple-ipc/ipc-unix-socket.c:182
+msgid "could not send IPC command"
+msgstr "không thể gửi lệnh IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr "không thể đ�c đáp ứng IPC"
+
+#: compat/simple-ipc/ipc-unix-socket.c:866
+#, 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:878
+#, 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
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "gặp lỗi khi b� liên kết (unlink) “%s�"
 
-#: builtin/add.c:25
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<các tùy ch�n>] [--]  <pathspec>…"
 
-#: builtin/add.c:84
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "không thể chmod %cx '%s'"
+
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "trạng thái lệnh diff không như mong đợi %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
 msgstr "cập nhật tập tin gặp lỗi"
 
-#: builtin/add.c:99
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
 msgstr "gỡ b� “%s�\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:198
 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:234 builtin/rev-parse.c:897
+#: builtin/add.c:307 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:245
+#: builtin/add.c:318
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "Không thể mở “%s� để ghi."
 
-#: builtin/add.c:249
+#: builtin/add.c:322
 msgid "Could not write patch"
 msgstr "Không thể ghi ra miếng vá"
 
-#: builtin/add.c:252
+#: builtin/add.c:325
 msgid "editing patch failed"
 msgstr "gặp lỗi khi sửa miếng vá"
 
-#: builtin/add.c:255
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "Không thể lấy thông tin thống kê v� “%s�"
 
-#: builtin/add.c:257
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr "Miếng vá trống rỗng. Nên b� qua."
 
-#: builtin/add.c:262
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "Không thể áp dụng miếng vá “%s�"
 
-#: builtin/add.c:270
+#: builtin/add.c:343
 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:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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 "chạy thử"
 
-#: builtin/add.c:293
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr "sửa bằng cách tương tác"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "ch�n “hunks� theo kiểu tương tác"
 
-#: builtin/add.c:295
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr "sửa diff hiện nay và áp dụng nó"
 
-#: builtin/add.c:296
+#: builtin/add.c:369
 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:297
+#: builtin/add.c:370
 msgid "update tracked files"
 msgstr "cập nhật các tập tin được theo dõi"
 
-#: builtin/add.c:298
+#: builtin/add.c:371
 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:299
+#: builtin/add.c:372
 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:300
+#: builtin/add.c:373
 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:303
+#: builtin/add.c:376
 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:305
+#: builtin/add.c:378
 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:306
+#: builtin/add.c:379
 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:307
+#: builtin/add.c:380
 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:309 builtin/update-index.c:1002
+#: builtin/add.c:382 builtin/update-index.c:1006
 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:311
+#: builtin/add.c:384
 msgid "warn when adding an embedded repository"
 msgstr "cảnh báo khi thêm một kho nhúng"
 
-#: builtin/add.c:326
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr "ứng dụng chạy phía sau cho “git stash -p�"
+
+#: builtin/add.c:404
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8661,146 +10361,178 @@ msgstr ""
 "\n"
 "Xem \"git help submodule\" để biết thêm chi tiết."
 
-#: builtin/add.c:354
+#: builtin/add.c:432
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "thêm cần một kho git nhúng: %s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "Sử dụng tùy ch�n -f nếu bạn thực sự muốn thêm chúng vào.\n"
+#: builtin/add.c: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 ""
+"Sử dụng -f nếu bạn thực sự muốn thêm chúng.\n"
+"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:379
+#: builtin/add.c:460
 msgid "adding files failed"
 msgstr "thêm tập tin gặp lỗi"
 
-#: builtin/add.c:419
+#: 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:426
+#: 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:430
+#: builtin/add.c:526
 #, 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:445
+#: 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 "--pathspec-from-file xung khắc với các tham số đặc tả đư�ng dẫn"
+
+#: 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 "--pathspec-file-nul cần --pathspec-from-file"
+
+#: builtin/add.c:555
 #, 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:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Có lẽ ý bạn là “git add .� phải không?\n"
+#: builtin/add.c:557
+msgid ""
+"Maybe you wanted to say 'git add .'?\n"
+"Turn this message off by running\n"
+"\"git config advice.addEmptyPathspec false\""
+msgstr ""
+"Có lẽ bạn muốn chạy “git add .�?\n"
+"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:347
+#: builtin/am.c:365
 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:431
+#: builtin/am.c:455
 #, 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:473
+#: builtin/am.c:497
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "Dòng đầu vào dị hình: “%s�."
 
-#: builtin/am.c:511
+#: builtin/am.c:535
 #, 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:537
+#: builtin/am.c:561
 msgid "fseek failed"
 msgstr "fseek gặp lỗi"
 
-#: builtin/am.c:725
+#: builtin/am.c:749
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "không thể phân tích cú pháp “%s�"
 
-#: builtin/am.c:790
+#: builtin/am.c:814
 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:838
+#: builtin/am.c:862
 msgid "invalid timestamp"
 msgstr "dấu th�i gian không hợp lệ"
 
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:867 builtin/am.c:879
 msgid "invalid Date line"
 msgstr "dòng Ngày tháng không hợp lệ"
 
-#: builtin/am.c:850
+#: builtin/am.c:874
 msgid "invalid timezone offset"
 msgstr "độ lệch múi gi� không hợp lệ"
 
-#: builtin/am.c:943
+#: builtin/am.c:967
 msgid "Patch format detection failed."
 msgstr "Dò tìm định dạng miếng vá gặp lỗi."
 
-#: builtin/am.c:948 builtin/clone.c:406
+#: builtin/am.c:972 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "tạo thư mục \"%s\" gặp lỗi"
 
-#: builtin/am.c:953
+#: builtin/am.c:977
 msgid "Failed to split patches."
 msgstr "Gặp lỗi khi chia nh� các miếng vá."
 
-#: builtin/am.c:1084
+#: builtin/am.c:1126
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
-msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"."
+msgstr "Khi bạn đã giải quyết xong trục trặc này, hãy chạy \"%s --continue\"."
 
-#: builtin/am.c:1085
+#: builtin/am.c:1127
 #, 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:1086
+#: builtin/am.c:1128
 #, 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:1169
+#: builtin/am.c:1223
 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:1197
+#: builtin/am.c:1251
 msgid "Patch is empty."
 msgstr "Miếng vá trống rỗng."
 
-#: builtin/am.c:1262
+#: builtin/am.c:1316
 #, 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:1265
+#: builtin/am.c:1319
 #, c-format
 msgid "invalid ident line: %.*s"
-msgstr "dòng thụt l� không hợp lệ: %.*s"
+msgstr "dòng định danh không hợp lệ: %.*s"
 
-#: builtin/am.c:1484
+#: builtin/am.c:1538
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
-msgstr "Kho thiếu đối tượng blob cần thiết để trở v� trên “3-way merge�."
+msgstr "Kho thiếu đối tượng blob cần thiết để thực hiện “3-way merge�."
 
-#: builtin/am.c:1486
+#: builtin/am.c:1540
 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:1505
+#: builtin/am.c:1559
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8808,24 +10540,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:1511
+#: builtin/am.c:1565
 msgid "Falling back to patching base and 3-way merge..."
-msgstr "�ang trở lại để vá cơ sở và “hòa trộn 3-đư�ng�…"
+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:1537
+#: builtin/am.c:1591
 msgid "Failed to merge in the changes."
 msgstr "Gặp lỗi khi trộn vào các thay đổi."
 
-#: builtin/am.c:1569
+#: builtin/am.c:1623
 msgid "applying to an empty history"
 msgstr "áp dụng vào một lịch sử trống rỗng"
 
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1675 builtin/am.c:1679
 #, 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:1638
+#: builtin/am.c:1697
 msgid "Commit Body is:"
 msgstr "Thân của lần chuyển giao là:"
 
@@ -8833,41 +10565,41 @@ 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:1648
+#: builtin/am.c:1707
 #, 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:1695 builtin/commit.c:374
+#: builtin/am.c:1753 builtin/commit.c:408
 msgid "unable to write index file"
 msgstr "không thể ghi tập tin lưu mục lục"
 
-#: builtin/am.c:1699
+#: builtin/am.c:1757
 #, 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:1739 builtin/am.c:1807
+#: builtin/am.c:1797 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "�p dụng: %.*s"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1814
 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:1762
+#: builtin/am.c:1820
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "Gặp lỗi khi vá tại %s %.*s"
 
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
-msgstr "Dùng “git am --show-current-patch� để xem miếng vá bị lỗi"
+#: builtin/am.c:1824
+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:1810
+#: 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"
@@ -8878,7 +10610,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:1817
+#: 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 "
@@ -8891,17 +10623,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:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
-#: builtin/reset.c:337
+#: 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 "Không thể phân tích đối tượng “%s�."
 
-#: builtin/am.c:1976
+#: builtin/am.c:2034
 msgid "failed to clean index"
 msgstr "gặp lỗi khi d�n bảng mục lục"
 
-#: builtin/am.c:2020
+#: builtin/am.c:2078
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
@@ -8909,144 +10641,160 @@ 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:2117
+#: builtin/am.c:2185
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "Giá trị không hợp lệ cho --patch-format: %s"
 
-#: builtin/am.c:2153
+#: builtin/am.c:2227
+#, 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:2231
+#, 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"
+
+#: builtin/am.c:2262
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<các tùy ch�n>] [(<mbox>|<Maildir>)…]"
 
-#: builtin/am.c:2154
+#: builtin/am.c:2263
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<các tùy ch�n>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2160
+#: builtin/am.c:2269
 msgid "run interactively"
 msgstr "chạy kiểu tương tác"
 
-#: builtin/am.c:2162
+#: builtin/am.c:2271
 msgid "historical option -- no-op"
 msgstr "tùy ch�n lịch sử -- không-toán-tử"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2273
 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:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:297 builtin/stash.c:812
+#: 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 "im lặng"
 
-#: builtin/am.c:2167
-msgid "add a Signed-off-by line to the commit message"
-msgstr "thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
+#: builtin/am.c:2276
+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:2170
+#: builtin/am.c:2279
 msgid "recode into utf8 (default)"
 msgstr "chuyển mã thành utf8 (mặc định)"
 
-#: builtin/am.c:2172
+#: builtin/am.c:2281
 msgid "pass -k flag to git-mailinfo"
 msgstr "chuyển c� -k cho git-mailinfo"
 
-#: builtin/am.c:2174
+#: builtin/am.c:2283
 msgid "pass -b flag to git-mailinfo"
 msgstr "chuyển c� -b cho git-mailinfo"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2285
 msgid "pass -m flag to git-mailinfo"
 msgstr "chuyển c� -m cho git-mailinfo"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2287
 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:2181
+#: builtin/am.c:2290
 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:2184
+#: builtin/am.c:2293
 msgid "strip everything before a scissors line"
 msgstr "cắt m�i thứ trước dòng scissors"
 
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr "chuyển nó qua 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 "chuyển nó qua git-apply"
 
-#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
-#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:150 parse-options.h:171 parse-options.h:312
+#: 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: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:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: 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 "định dạng"
 
-#: builtin/am.c:2210
+#: builtin/am.c:2322
 msgid "format the patch(es) are in"
 msgstr "định dạng (các) miếng vá theo"
 
-#: builtin/am.c:2216
+#: builtin/am.c:2328
 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:2218
+#: builtin/am.c:2330
 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:2221
+#: builtin/am.c:2333
 msgid "synonyms for --continue"
 msgstr "đồng nghĩa với --continue"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2336
 msgid "skip the current patch"
 msgstr "b� qua miếng vá hiện hành"
 
-#: builtin/am.c:2227
-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:2339
+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:2230
-msgid "abort the patching operation but keep HEAD where it is."
-msgstr "b� qua thao tác vá nhưng vẫn giữ HEAD chỉ đến nó."
+#: builtin/am.c:2342
+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:2233
-msgid "show the patch being applied."
-msgstr "hiển thị miếng vá đã được áp dụng rồi."
+#: builtin/am.c:2346
+msgid "show the patch being applied"
+msgstr "hiển thị miếng vá đã được áp dụng rồi"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2351
 msgid "lie about committer date"
 msgstr "nói dối v� ngày chuyển giao"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2353
 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:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
-#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
+#: 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 "mã-số-khóa"
 
-#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
 msgstr "Các lần chuyển giao ký-GPG"
 
-#: builtin/am.c:2245
+#: builtin/am.c:2359
 msgid "(internal use for git-rebase)"
 msgstr "(dùng nội bộ cho git-rebase)"
 
-#: builtin/am.c:2263
+#: 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."
@@ -9054,16 +10802,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:2270
+#: builtin/am.c:2384
 msgid "failed to read the index"
 msgstr "gặp lỗi đ�c bảng mục lục"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2399
 #, 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:2309
+#: builtin/am.c:2423
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -9072,13 +10820,13 @@ 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:2315
+#: builtin/am.c:2429
 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:2325
+#: builtin/am.c:2439
 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"
+msgstr "chế độ tương tác yêu cầu có các miếng vá trên dòng lệnh"
 
 #: builtin/apply.c:8
 msgid "git apply [<options>] [<patch>...]"
@@ -9114,43 +10862,15 @@ msgstr "git archive: lỗi giao thức"
 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:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
 #: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<lần_chuyển_giao>]"
 
-#: builtin/bisect--helper.c:26
-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>"
-
-#: builtin/bisect--helper.c:27
-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>"
-
-#: builtin/bisect--helper.c:28
+#: 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:29
+#: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
@@ -9158,48 +10878,76 @@ msgstr ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:26
 msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<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>...]"
 msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<term>][--no-checkout] [<sai> [<đúng>…]] [--] [</các/đư�ng/dẫn>…]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<term> --term-{old,good}"
+"=<term>] [--no-checkout] [--first-parent] [<bad> [<good>…]] [--] [</các/"
+"đư�ng/dẫn>…]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+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-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-state (good|old) [<lần_chuyển_giao>…]"
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <tên_tập_tin>"
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<rev>|<vùng>)...]"
+
+#: builtin/bisect--helper.c:107
+#, 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
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "không thể ghi vào tập tin “%s�"
+
+#: builtin/bisect--helper.c:155
 #, 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:90
+#: builtin/bisect--helper.c:159
 #, 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:100
+#: builtin/bisect--helper.c:169
 #, 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:111
+#: builtin/bisect--helper.c:179
 msgid "please use two different terms"
 msgstr "vui lòng dùng hai th�i kỳ khác nhau"
 
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "không thể mở tập tin BISECT_TERMS"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:195
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "Chúng tôi đang không bisect.\n"
 
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:203
 #, 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:174
+#: builtin/bisect--helper.c:212
 #, c-format
 msgid ""
 "could not check out original HEAD '%s'. Try 'git bisect reset <commit>'."
@@ -9207,27 +10955,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:215
+#: builtin/bisect--helper.c:256
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "�ối số bisect_write sai: %s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:261
 #, 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:232
+#: builtin/bisect--helper.c:273
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "không thể mở tập tin “%s�"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:299
 #, 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:285
+#: builtin/bisect--helper.c:326
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9236,7 +10984,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:289
+#: builtin/bisect--helper.c:330
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9247,7 +10995,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:321
+#: builtin/bisect--helper.c:350
 #, 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"
@@ -9256,15 +11004,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:329
+#: builtin/bisect--helper.c:358
 msgid "Are you sure [Y/n]? "
 msgstr "Bạn có chắc chắn chưa [Y/n]? "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:419
 msgid "no terms defined"
 msgstr "chưa định nghĩa th�i kỳ nào"
 
-#: builtin/bisect--helper.c:379
+#: builtin/bisect--helper.c:422
 #, c-format
 msgid ""
 "Your current terms are %s for the old state\n"
@@ -9273,7 +11021,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:389
+#: builtin/bisect--helper.c:432
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9282,270 +11030,315 @@ 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:475
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+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:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "không thể mở “%s� để nối thêm"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr "� không phải một th�i hạn hợp lệ"
+
+#: builtin/bisect--helper.c:663
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "tùy ch�n không được thừa nhận: “%s�"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:667
 #, 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:511
+#: builtin/bisect--helper.c:698
 msgid "bad HEAD - I need a HEAD"
 msgstr "sai HEAD - Tôi cần một HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:713
 #, 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:547
+#: builtin/bisect--helper.c:734
 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:550
+#: builtin/bisect--helper.c:737
 msgid "bad HEAD - strange symbolic ref"
 msgstr "sai HEAD - tham chiếu m�m kỳ lạ"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:757
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "refspec không hợp lệ: “%s�"
 
-#: builtin/bisect--helper.c:630
-msgid "perform 'git bisect next'"
-msgstr "thực hiện “git bisect next�"
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "Bạn cần khởi đầu bằng \"git bisect start\"\n"
 
-#: builtin/bisect--helper.c:632
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "ghi th�i kỳ vào .git/BISECT_TERMS"
+#. 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:826
+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:634
-msgid "cleanup the bisection state"
-msgstr "d�n dẹp tình trạng di chuyển nửa bước"
+#: builtin/bisect--helper.c:844
+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:636
-msgid "check for expected revs"
-msgstr "kiểm tra cho điểm xem xét cần dùng"
+#: builtin/bisect--helper.c:857
+#, 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:638
-msgid "reset the bisection state"
-msgstr "đặt lại trạng di chuyển nửa bước"
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "�ầu vào rev sai: %s"
+
+#: builtin/bisect--helper.c:889
+#, 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:921
+msgid "We are not bisecting."
+msgstr "Chúng tôi không bisect."
 
-#: builtin/bisect--helper.c:640
-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"
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? bạn đang nói gì thế?"
 
-#: builtin/bisect--helper.c:642
-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"
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "không thể đ�c tập tin '%s' để thao diễn lại"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr "đặt lại trạng di chuyển nửa bước"
+
+#: builtin/bisect--helper.c:1058
 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:646
+#: builtin/bisect--helper.c:1060
 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:648
+#: builtin/bisect--helper.c:1062
 msgid "start the bisect session"
 msgstr "bắt đầu phiên di chuyển nửa bước"
 
-#: builtin/bisect--helper.c:650
-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"
+#: builtin/bisect--helper.c:1064
+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:652
-msgid "no log for BISECT_WRITE"
-msgstr "không có nhật ký cho BISECT_WRITE"
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr "đánh dấu trạng thái ref (hoặc refs)"
 
-#: builtin/bisect--helper.c:669
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms cần hai tham số"
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr "liệt kê các bước bisection đi quá xa"
 
-#: builtin/bisect--helper.c:673
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state không nhận đối số"
+#: builtin/bisect--helper.c:1070
+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:680
+#: builtin/bisect--helper.c:1072
+msgid "skip some commits for checkout"
+msgstr "b� qua một số lần chuyển giao để lấy ra"
+
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "không có nhật ký cho BISECT_WRITE"
+
+#: builtin/bisect--helper.c:1089
 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:684
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write cần 4 hoặc 5 tham số"
-
-#: builtin/bisect--helper.c:690
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms cần 3 tham số"
-
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:1094
 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:702
+#: builtin/bisect--helper.c:1100
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms cần 0 hoặc 1 tham số"
 
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next cần 0 tham số"
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log cần 0 tham số"
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr "chưa chỉ ra tập tin ghi nhật ký"
+
+#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<các tùy ch�n>] [<rev-opts>] [<rev>] [--] <tập-tin>"
 
-#: builtin/blame.c:36
+#: builtin/blame.c:37
 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:409
+#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
 msgstr "cần một màu: %s"
 
-#: builtin/blame.c:416
+#: builtin/blame.c:417
 msgid "must end with a color"
 msgstr "phải kết thúc bằng một màu"
 
-#: builtin/blame.c:729
+#: builtin/blame.c:728
 #, 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:747
+#: builtin/blame.c:746
 msgid "invalid value for blame.coloring"
 msgstr "màu không hợp lệ cho blame.coloring"
 
-#: builtin/blame.c:822
+#: builtin/blame.c:845
 #, 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:844
-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:867
+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:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
 msgstr ""
-"Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)"
+"đừ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:846
-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:869
+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:847
-msgid "Show work cost statistics"
-msgstr "Hiển thị thống kê công sức làm việc"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "hiển thị thống kê công sức làm việc"
 
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "Ép buộc báo cáo tiến triển công việc"
+#: 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 "ép buộc báo cáo tiến triển công việc"
 
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr "Hiển thị kết xuất điểm số có các mục tin “blame�"
+#: builtin/blame.c:872
+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:850
-msgid "Show original filename (Default: auto)"
-msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "hiển thị tên tập tin gốc (Mặc định: auto)"
 
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
-msgstr "Hiển thị số dòng gốc (Mặc định: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "hiển thị số dòng gốc (Mặc định: off)"
 
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
-msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy"
+#: builtin/blame.c:875
+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:853
-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:876
+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:854
-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:877
+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:855
-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:878
+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:856
-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:879
+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:857
-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:880
+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:858
-msgid "Show author email instead of name (Default: off)"
-msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)"
+#: builtin/blame.c:881
+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:859
-msgid "Ignore whitespace differences"
-msgstr "B� qua các khác biệt do khoảng trắng gây ra"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "b� qua các khác biệt do khoảng trắng gây ra"
 
-#: builtin/blame.c:860 builtin/log.c:1630
+#: builtin/blame.c:883 builtin/log.c:1823
 msgid "rev"
 msgstr "rev"
 
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
-msgstr "B� qua <rev> khi blame"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "b� qua <rev> khi blame"
 
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
-msgstr "B� qua các điểm xét duyệt từ <tập tin>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "b� qua các điểm xét duyệt từ <tập tin>"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:885
 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:863
+#: builtin/blame.c:886
 msgid "color lines by age"
 msgstr "các dòng màu theo tuổi"
 
-#: builtin/blame.c:870
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "Dùng một ph�ng đoán thử nghiệm để tăng cư�ng các diff"
-
-#: builtin/blame.c:872
-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:887
+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:873
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr ""
-"Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì g�i “git-rev-list�"
+"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:874
-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:889
+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:875 builtin/blame.c:876
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "điểm số"
 
-#: builtin/blame.c:875
-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:890
+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:876
-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:891
+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:877
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "vùng"
 
-#: builtin/blame.c:877
-msgid "Process only line range n,m, counting from 1"
-msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1"
+#: builtin/blame.c:893
+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:929
+#: builtin/blame.c:945
 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"
@@ -9558,23 +11351,23 @@ msgstr ""
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr "4 năm, 11 tháng trước"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1112
 #, 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:1133
+#: builtin/blame.c:1157
 msgid "Blaming lines"
 msgstr "Các dòng blame"
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<các tùy ch�n>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<các tùy ch�n>] [-r | -a] [--merged] [ --no-merged]"
 
 #: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -9636,117 +11429,107 @@ msgstr ""
 msgid "Update of config-file failed"
 msgstr "Cập nhật tập tin cấu hình gặp lỗi"
 
-#: builtin/branch.c:220
+#: builtin/branch.c:223
 msgid "cannot use -a with -d"
 msgstr "không thể dùng tùy ch�n -a với -d"
 
-#: builtin/branch.c:226
+#: builtin/branch.c:230
 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:240
+#: builtin/branch.c:244
 #, 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:255
+#: builtin/branch.c:259
 #, 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:256
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
 msgstr "không tìm thấy nhánh “%s�."
 
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s�"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Gặp lỗi khi xóa b� nhánh “%s�"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
 #, 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:280
+#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "Nhánh “%s� đã bị xóa (từng là %s)\n"
 
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:440 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:460
+#: builtin/branch.c:471
 msgid "could not resolve HEAD"
 msgstr "không thể phân giải HEAD"
 
-#: builtin/branch.c:466
+#: builtin/branch.c:477
 #, 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:481
+#: builtin/branch.c:492
 #, 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:485
+#: builtin/branch.c:496
 #, 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:502
+#: builtin/branch.c:513
 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:504
+#: builtin/branch.c:515
 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:515
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "Tên nhánh không hợp lệ: “%s�"
 
-#: builtin/branch.c:542
+#: builtin/branch.c:555
 msgid "Branch rename failed"
 msgstr "Gặp lỗi khi đổi tên nhánh"
 
-#: builtin/branch.c:544
+#: builtin/branch.c:557
 msgid "Branch copy failed"
 msgstr "Gặp lỗi khi sao chép nhánh"
 
-#: builtin/branch.c:548
+#: builtin/branch.c:561
 #, 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:551
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "�ã đổi tên nhánh khuyết danh “%s� đi"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:570
 #, 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:566
+#: builtin/branch.c:579
 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:568
+#: builtin/branch.c:581
 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:584
+#: builtin/branch.c:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -9757,180 +11540,180 @@ msgstr ""
 "  %s\n"
 "Những dòng được bắt đầu bằng “%c� sẽ được cắt b�.\n"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr "Tùy ch�n chung"
 
-#: builtin/branch.c:620
+#: builtin/branch.c:633
 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:621
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr "không xuất các thông tin"
 
-#: builtin/branch.c:622
+#: 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:624
+#: builtin/branch.c:637
 msgid "do not use"
 msgstr "không dùng"
 
-#: builtin/branch.c:626 builtin/rebase.c:486
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr "thượng nguồn"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr "thay đổi thông tin thượng nguồn"
 
-#: builtin/branch.c:627
-msgid "Unset the upstream info"
-msgstr "B� đặt thông tin thượng nguồn"
+#: builtin/branch.c:640
+msgid "unset the upstream info"
+msgstr "b� đặt thông tin thượng nguồn"
 
-#: builtin/branch.c:628
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr "tô màu kết xuất"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
 msgstr "thao tác trên nhánh “remote-tracking�"
 
-#: 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 "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao"
 
-#: 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 "chỉ hiển thị những nhánh mà nó không chứa lần chuyển giao"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
 msgstr "Hành động git-branch:"
 
-#: builtin/branch.c:638
+#: builtin/branch.c:651
 msgid "list both remote-tracking and local branches"
 msgstr "liệt kê cả nhánh “remote-tracking� và nội bộ"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr "xóa một toàn bộ nhánh đã hòa trộn"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:654
 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:642
+#: builtin/branch.c:655
 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:643
+#: builtin/branch.c:656
 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:644
+#: builtin/branch.c:657
 msgid "copy a branch and its reflog"
 msgstr "sao chép một nhánh và reflog của nó"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:658
 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:646
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr "liệt kê các tên nhánh"
 
-#: builtin/branch.c:647
+#: builtin/branch.c:660
 msgid "show current branch name"
 msgstr "hiển thị nhánh hiện hành"
 
-#: builtin/branch.c:648
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr "tạo reflog của nhánh"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr "sửa mô tả cho nhánh"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:664
 msgid "force creation, move/rename, deletion"
 msgstr "buộc tạo, di chuyển/đổi tên, xóa"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:665
 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:653
+#: builtin/branch.c:666
 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:654
+#: builtin/branch.c:667
 msgid "list branches in columns"
 msgstr "liệt kê các nhánh trong các cột"
 
-#: builtin/branch.c:657 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:433
+#: builtin/tag.c:477
 msgid "object"
 msgstr "đối tượng"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:670
 msgid "print only branches of the object"
 msgstr "chỉ hiển thị các nhánh của đối tượng"
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
 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:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: 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 "định dạng sẽ dùng cho đầu ra"
 
-#: builtin/branch.c:684 builtin/clone.c:760
+#: builtin/branch.c:695 builtin/clone.c:794
 msgid "HEAD not found below refs/heads!"
 msgstr "Không tìm thấy HEAD ở dưới refs/heads!"
 
-#: builtin/branch.c:708
+#: 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:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
 msgid "branch name required"
 msgstr "cần chỉ ra tên nhánh"
 
-#: builtin/branch.c:753
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
 msgstr "Không thể đưa ra mô tả HEAD đã tách r�i"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:771
 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:765
+#: builtin/branch.c:778
 #, 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:768
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
 msgstr "Không có nhánh nào có tên “%s�."
 
-#: builtin/branch.c:783
+#: builtin/branch.c:796
 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:792
+#: builtin/branch.c:805
 msgid "too many arguments for a rename operation"
 msgstr "quá nhi�u tham số cho thao tác đổi tên"
 
-#: builtin/branch.c:797
+#: builtin/branch.c:810
 msgid "too many arguments to set new upstream"
 msgstr "quá nhi�u tham số để đặt thượng nguồn mới"
 
-#: builtin/branch.c:801
+#: builtin/branch.c:814
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
@@ -9938,30 +11721,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:804 builtin/branch.c:827
+#: builtin/branch.c:817 builtin/branch.c:840
 #, c-format
 msgid "no such branch '%s'"
 msgstr "không có nhánh nào như thế “%s�"
 
-#: builtin/branch.c:808
+#: builtin/branch.c:821
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "chưa có nhánh “%s�"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:834
 msgid "too many arguments to unset upstream"
 msgstr "quá nhi�u tham số để b� đặt thượng nguồn"
 
-#: builtin/branch.c:825
+#: builtin/branch.c:838
 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:831
+#: builtin/branch.c:844
 #, 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:841
+#: 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>?"
@@ -9970,7 +11753,7 @@ msgstr ""
 "nhánh.\n"
 "Có phải ý bạn là dùng: -a|-r --list <mẫu>?"
 
-#: builtin/branch.c:845
+#: builtin/branch.c:858
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
@@ -9978,20 +11761,166 @@ 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/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "phiên bản git:\n"
+
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
-msgstr "“%s� tốt\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() gặp lỗi “%s� (%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "thông tin trình biên dịch: "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "thông tin libc: "
+
+#: builtin/bugreport.c:80
+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
+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
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"Cảm ơn bạn đã tạo một báo cáo lỗi Git!\n"
+"Vui lòng trả l�i các câu h�i sau để giúp chúng tôi hiểu vấn đ� của bạn.\n"
+"\n"
+"Bạn đã làm gì trước khi lỗi xảy ra? (Các bước để tái tạo sự cố của bạn)\n"
+"\n"
+"�i�u bạn mong muốn xảy ra? (Hành vi dự kiến)\n"
+"\n"
+"�i�u gì đã xảy ra thay thế? (Hành vi thực tế)\n"
+"\n"
+"Có gì khác biệt giữa những gì bạn mong đợi và những gì thực sự xảy ra?\n"
+"\n"
+"Bất kỳ thứ gì khác bạn muốn thêm:\n"
+"\n"
+"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
+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
+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
+#, 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
+msgid "System Info"
+msgstr "Thông tin hệ thống"
+
+#: builtin/bugreport.c:170
+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
+#, c-format
+msgid "unable to write to %s"
+msgstr "không thể ghi vào %s"
+
+#: builtin/bugreport.c:190
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "�ã tạo báo cáo mới tại “%s�\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<các tùy ch�n>] <tập_tin> <git-rev-list args>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<các tùy ch�n>] <tập-tin>"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <tập tin> [<tên tham chiếu>…]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+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:3907
+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:3909
+msgid "show progress meter"
+msgstr "hiển thị bộ đo tiến trình"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+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:3914
+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
+msgid "specify bundle format version"
+msgstr "chỉ điịnh định dạng cho bundle"
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
 msgstr "Cần một kho chứa để có thể tạo một bundle."
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr "không hiển thị chi tiết bundle (bó)"
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr "“%s� tốt\n"
+
+#: builtin/bundle.c:179
 msgid "Need a repository to unbundle."
 msgstr "Cần một kho chứa để có thể giải nén một bundle."
 
-#: builtin/cat-file.c:595
+#: builtin/bundle.c:191 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:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Không hiểu câu lệnh con: %s"
+
+#: 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>"
@@ -9999,80 +11928,80 @@ 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:596
+#: builtin/cat-file.c:597
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"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[=<định dạng>] | --batch-check[=<định dạng>]) [--follow-"
+"symlinks] [--textconv | --filters]"
 
-#: builtin/cat-file.c:617
+#: builtin/cat-file.c:618
 msgid "only one batch option may be specified"
 msgstr "chỉ một tùy ch�n batch được chỉ ra"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 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:636
+#: builtin/cat-file.c:637
 msgid "show object type"
 msgstr "hiển thị kiểu đối tượng"
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
 msgid "show object size"
 msgstr "hiển thị kích thước đối tượng"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 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:640
+#: builtin/cat-file.c:641
 msgid "pretty-print object's content"
 msgstr "in nội dung đối tượng dạng dễ đ�c"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
 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:644
+#: builtin/cat-file.c:645
 msgid "for blob objects, run filters on object's content"
 msgstr "với đối tượng blob, chạy lệnh filters trên nội dung của đối tượng"
 
-#: builtin/cat-file.c:645 git-submodule.sh:936
+#: builtin/cat-file.c:646
 msgid "blob"
 msgstr "blob"
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
 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:648
+#: builtin/cat-file.c:649
 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:649
+#: builtin/cat-file.c:650
 msgid "buffer --batch output"
 msgstr "đệm kết xuất --batch"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:652
 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:655
+#: builtin/cat-file.c:656
 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:659
+#: builtin/cat-file.c:660
 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:661
+#: builtin/cat-file.c:662
 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:663
+#: builtin/cat-file.c:664
 msgid "do not order --batch-all-objects output"
 msgstr "đừng sắp xếp đầu ra --batch-all-objects"
 
@@ -10100,8 +12029,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:1433 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "chặn các báo cáo tiến trình hoạt động"
 
@@ -10113,27 +12042,27 @@ msgstr "hiển thị những Ä‘Æ°á»�ng dẫn đầu vào không khá»›p vá»›i máº
 msgid "ignore index when checking"
 msgstr "b� qua mục lục khi kiểm tra"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "không thể chỉ định các tên đư�ng dẫn với --stdin"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z chỉ hợp lý với --stdin"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "chưa chỉ ra đư�ng dẫn"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "--quiet chỉ hợp lệ với tên đư�ng dẫn đơn"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "không thể dùng cả hai tùy ch�n --quiet và --verbose"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "tùy-ch�n --non-matching chỉ hợp lệ khi dùng với --verbose"
 
@@ -10154,164 +12083,170 @@ msgstr "không thể phân tích danh bạ: “%s�"
 msgid "no contacts specified"
 msgstr "chưa chỉ ra danh bạ"
 
-#: builtin/checkout-index.c:131
+#: builtin/checkout--worker.c:110
+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: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 "chuá»—i"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "khi tạo các tập tin, nối thêm <chuỗi>"
+
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<các tùy ch�n>] [--] [<tập-tin>…]"
 
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr "stage nên giữa 1 và 3 hay all"
 
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "lấy ra toàn bộ các tập tin trong bảng mục lục"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "ép buộc ghi đè lên tập tin đã sẵn có từ trước"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr ""
 "không cảnh báo cho những tập tin tồn tại và không có trong bảng mục lục"
 
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "không checkout các tập tin mới"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "cập nhật thông tin thống kê trong tập tin lưu bảng mục lục mới"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "đ�c danh sách đư�ng dẫn từ đầu vào tiêu chuẩn"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "ghi nội dung vào tập tin tạm"
 
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:679
-msgid "string"
-msgstr "chuá»—i"
-
-#: builtin/checkout-index.c:179
-msgid "when creating files, prepend <string>"
-msgstr "khi tạo các tập tin, nối thêm <chuỗi>"
-
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "sao chép ra các tập tin từ bệ phóng có tên"
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<các tùy ch�n>] <nhánh>"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<các tùy ch�n>] [<nhánh>] -- <tập-tin>…"
 
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<các tùy ch�n>] [<nhánh>]"
 
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
-msgstr "git restore [<các tùy ch�n>] [--source=<nhánh>] <tập tin>..."
+msgstr "git restore [<các tùy ch�n>] [--source=<nhánh>] <tập tin>…"
 
-#: builtin/checkout.c:173 builtin/checkout.c:212
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, 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:175 builtin/checkout.c:214
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, 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:191
+#: builtin/checkout.c:208
 #, 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:241
+#: builtin/checkout.c:261
 #, 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:259
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "đư�ng dẫn “%s�: không thể hòa trộn"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:294
 #, 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:375
+#: builtin/checkout.c:411
 #, 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:380
+#: builtin/checkout.c:416
 #, 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:387
+#: builtin/checkout.c:423
 #, 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:410 builtin/checkout.c:413 builtin/checkout.c:416
-#: builtin/checkout.c:420
+#: 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 "không được dùng “%s� với các đư�ng dẫn cập nhật"
 
-#: builtin/checkout.c:423 builtin/checkout.c:426
+#: builtin/checkout.c:459 builtin/checkout.c:462
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "không được dùng “%s� với %s"
 
-#: builtin/checkout.c:430
+#: builtin/checkout.c:466
 #, 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:434
+#: builtin/checkout.c:470
 #, c-format
 msgid "neither '%s' or '%s' is specified"
-msgstr "không chỉ định '%s' không '%s'"
+msgstr "không chỉ định “%s� cũng không “%s�"
 
-#: builtin/checkout.c:438
+#: builtin/checkout.c:474
 #, 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:443 builtin/checkout.c:448
+#: builtin/checkout.c:479 builtin/checkout.c:484
 #, 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"
+msgstr "“%s� hay “%s� không thể được sử dụng với %s"
 
-#: builtin/checkout.c:507 builtin/checkout.c:514
+#: builtin/checkout.c:558 builtin/checkout.c:565
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "đư�ng dẫn “%s� không được hòa trộn"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:734
 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:730
+#: builtin/checkout.c:788
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10321,50 +12256,50 @@ msgstr ""
 "sau:\n"
 "%s"
 
-#: builtin/checkout.c:833
+#: builtin/checkout.c:881
 #, 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:875
+#: builtin/checkout.c:923
 msgid "HEAD is now at"
 msgstr "HEAD hiện gi� tại"
 
-#: builtin/checkout.c:879 builtin/clone.c:713
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "không thể cập nhật HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:931
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�ặt lại nhánh “%s�\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:934
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "�ã sẵn sàng trên “%s�\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:938
 #, 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:892 builtin/checkout.c:1289
+#: builtin/checkout.c:940 builtin/checkout.c:1371
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "�ã chuyển đến nhánh mới “%s�\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:942
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "�ã chuyển đến nhánh “%s�\n"
 
-#: builtin/checkout.c:945
+#: builtin/checkout.c:993
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " … và nhi�u hơn %d.\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:999
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10383,7 +12318,7 @@ msgstr[0] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: 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"
@@ -10404,28 +12339,19 @@ msgstr[0] ""
 " git branch <tên_nhánh_mới> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1053
 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:1009
+#: builtin/checkout.c:1057
 msgid "Previous HEAD position was"
 msgstr "Vị trí trước kia của HEAD là"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
 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:1176
-msgid "only one reference expected"
-msgstr "chỉ cần một tham chiếu"
-
-#: builtin/checkout.c:1193
-#, 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:1230
+#: builtin/checkout.c:1179
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10434,37 +12360,71 @@ 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:1243 builtin/worktree.c:290 builtin/worktree.c:455
+#: 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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"Nếu ý bạn là lấy ra nhánh máy chủ được theo dõi, ví dụ “origin�,\n"
+"bạn có thể làm như vậy bằng cách chỉ định đầy đủ tên với tùy ch�n --track:\n"
+"\n"
+"    git checkout --track origin/<tên>\n"
+"\n"
+"Nếu bạn muốn luôn lấy ra từ một <tên> một máy chủ ưa thích\n"
+"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:1196
+#, 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:1262
+msgid "only one reference expected"
+msgstr "chỉ cần một tham chiếu"
+
+#: builtin/checkout.c:1279
+#, 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:1325 builtin/worktree.c:268 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "tham chiếu không hợp lệ: %s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
 #, 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:1303
+#: builtin/checkout.c:1385
 #, 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:1305
+#: builtin/checkout.c:1387
 #, 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:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
 #, 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:1309
+#: builtin/checkout.c:1391
 #, 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:1325
+#: builtin/checkout.c:1407
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10472,7 +12432,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:1329
+#: builtin/checkout.c:1411
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10480,7 +12440,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:1333
+#: builtin/checkout.c:1415
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10488,7 +12448,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:1337
+#: builtin/checkout.c:1419
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10496,7 +12456,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:1341
+#: builtin/checkout.c:1423
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10504,143 +12464,143 @@ 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:1345
+#: builtin/checkout.c:1427
 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:1352
+#: builtin/checkout.c:1434
 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:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
 #, 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:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: 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� không thể được dùng với “%s�"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "“%s� không thể nhận <điểm-đầu>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1470
 #, 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:1395
+#: builtin/checkout.c:1477
 msgid "missing branch or commit argument"
 msgstr "thiếu tham số là nhánh hoặc lần chuyển giao"
 
-#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
-#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
-#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "ép buộc báo cáo tiến triển công việc"
-
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1520
 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:1439 builtin/log.c:1618 parse-options.h:318
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
 msgid "style"
 msgstr "kiểu"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1522
 msgid "conflict style (merge or diff3)"
 msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:503
+#: builtin/checkout.c:1534 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:1453
+#: builtin/checkout.c:1535
 msgid "set upstream info for new branch"
 msgstr "đặt thông tin thượng nguồn cho nhánh mới"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1537
 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:1457
+#: builtin/checkout.c:1539
 msgid "new-branch"
 msgstr "nhánh-mới"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new unparented branch"
 msgstr "nhánh không cha mới"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1541 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr "cập nhật các tập tin bị b� qua (mặc định)"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1544
 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:1475
+#: builtin/checkout.c:1557
 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:1478
+#: builtin/checkout.c:1560
 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:1482
+#: builtin/checkout.c:1564
 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:1533
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "Các tùy ch�n -b, -B và --orphan loại từ lẫn nhau"
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c, -%c và --orphan loại từ lẫn nhau"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1626
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p và --overlay loại từ lẫn nhau"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1663
 msgid "--track needs a branch name"
 msgstr "--track cần tên một nhánh"
 
-#: builtin/checkout.c:1578
-msgid "missing branch name; try -b"
-msgstr "thiếu tên nhánh; hãy thử -b"
+#: builtin/checkout.c:1668
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "thiếu tên nhánh; hãy thử -%c"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1700
 #, c-format
 msgid "could not resolve %s"
 msgstr "không thể phân giải “%s�"
 
-#: builtin/checkout.c:1623
-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:1631
+#: builtin/checkout.c:1716
 msgid "invalid path specification"
 msgstr "đư�ng dẫn đã cho không hợp lệ"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1723
 #, 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:1642
+#: builtin/checkout.c:1727
 #, 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:1646
+#: builtin/checkout.c:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file xung khắc với --detach"
+
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file xung khắc với --patch"
+
+#: builtin/checkout.c:1752
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
@@ -10648,136 +12608,107 @@ 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:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"“%s� khớp hơn một nhánh máy chủ được theo dõi.\n"
-"Chúng tôi tìm thấy %d máy chủ với một tham chiếu khớp. Do đó chúng tôi cố "
-"để\n"
-"phân giải tham số như là một đư�ng dẫn, nhưng cũng gặp lỗi!\n"
-"\n"
-"Nếu ý bạn là lấy ra nhánh máy chủ được theo dõi, ví dụ “origin�,\n"
-"bạn có thể làm như vậy bằng cách chỉ định đầy đủ tên với tùy ch�n --track:\n"
-"\n"
-"    git checkout --track origin/<tên>\n"
-"\n"
-"Nếu bạn muốn luôn lấy ra từ một <tên> một náy chủ ưa thích\n"
-"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:1757
+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:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
-#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: 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 "nhánh"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1784
 msgid "create and checkout a new branch"
 msgstr "tạo và checkout một nhánh mới"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1786
 msgid "create/reset and checkout a branch"
 msgstr "tạo/đặt_lại và checkout một nhánh"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1787
 msgid "create reflog for new branch"
 msgstr "tạo reflog cho nhánh mới"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1789
 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 "đoán thứ hai “git checkout <không-nhánh-nào-như-vậy>� (mặc định)"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1790
 msgid "use overlay mode (default)"
 msgstr "dùng chế độ che phủ (mặc định)"
 
-#: builtin/checkout.c:1743
+#: builtin/checkout.c:1835
 msgid "create and switch to a new branch"
 msgstr "tạo và chuyển đến một nhánh mới"
 
-#: builtin/checkout.c:1745
+#: builtin/checkout.c:1837
 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:1747
+#: builtin/checkout.c:1839
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
 
-#: builtin/checkout.c:1749
+#: builtin/checkout.c:1841
 msgid "throw away local modifications"
 msgstr "vứt b� các sửa đổi địa phương"
 
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1875
 msgid "which tree-ish to checkout from"
 msgstr "lấy ra từ tree-ish nào"
 
-#: builtin/checkout.c:1783
+#: builtin/checkout.c:1877
 msgid "restore the index"
 msgstr "phục hồi bảng mục lục"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1879
 msgid "restore the working tree (default)"
 msgstr "phục hồi cây làm việc (mặc định)"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1881
 msgid "ignore unmerged entries"
 msgstr "b� qua những thứ chưa hòa trộn: %s"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1882
 msgid "use overlay mode"
 msgstr "dùng chế độ che phủ"
 
-#: builtin/clean.c:28
+#: 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 <mẫu>] [-x | -X] [--] </các/đư�ng/"
 "dẫn>…"
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "�ang gỡ b� %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "Có thể gỡ b� %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "�ang b� qua kho chứa %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "Nên b� qua kho chứa %s\n"
 
-#: builtin/clean.c:36
-#, c-format
-msgid "failed to remove %s"
-msgstr "gặp lỗi khi gỡ b� %s"
-
-#: builtin/clean.c:37
+#: builtin/clean.c:38
 #, c-format
 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:301 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10790,7 +12721,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:305 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10811,38 +12742,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: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:663
+#: builtin/clean.c:659
 #, 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:700
+#: builtin/clean.c:693
 #, 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:721
+#: builtin/clean.c:714
 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:762
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "Xóa b� “%s� [y/N]? "
 
-#: builtin/clean.c:787 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "Tạm biệt.\n"
-
-#: builtin/clean.c:795
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10860,63 +12786,51 @@ msgstr ""
 "help                - hiển thị chính trợ giúp này\n"
 "?                   - trợ giúp dành cho ch�n bằng cách nhắc"
 
-#: builtin/clean.c:822 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** Lệnh ***"
-
-#: builtin/clean.c:823 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "Gi� thì sao"
-
-#: builtin/clean.c:831
+#: builtin/clean.c:822
 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:847
+#: builtin/clean.c:838
 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:909
+#: builtin/clean.c:900
 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:911
+#: builtin/clean.c:902
 msgid "force"
 msgstr "ép buộc"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "d�n bằng kiểu tương tác"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "gỡ b� toàn bộ thư mục"
 
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: 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 "mẫu"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr "thêm <mẫu> vào trong qui tắc b� qua"
 
-#: builtin/clean.c:917
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "đồng th�i gỡ b� cả các tập tin bị b� qua"
 
-#: builtin/clean.c:919
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "chỉ gỡ b� những tập tin bị b� qua"
 
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x và -X không thể dùng cùng nhau"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:925
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
@@ -10924,7 +12838,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:944
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -10932,162 +12846,177 @@ msgstr ""
 "clean.requireForce mặc định được đặt là true và không đưa ra tùy ch�n -i, -n "
 "mà cũng không -f; từ chối lệnh d�n dẹp (clean)"
 
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+msgstr "-x và -X không thể dùng cùng nhau"
+
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<các tùy ch�n>] [--] <kho> [<t.mục>]"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "đừng nhân bản từ kho nông"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "không tạo một checkout"
 
-#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "tạo kho thuần"
 
-#: builtin/clone.c:97
+#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr "tạo kho bản sao (ý là kho thuần)"
 
-#: builtin/clone.c:99
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "để nhân bản từ kho nội bộ"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "không sử dụng liên kết cứng nội bộ, luôn sao chép"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "cài đặt đây là kho chia sẻ"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "đặc-tả-đư�ng-dẫn"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "khởi tạo mô-đun-con trong bản sao"
 
-#: builtin/clone.c:109
+#: builtin/clone.c:115
 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:110 builtin/init-db.c:486
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "thư-mục-mẫu"
 
-#: builtin/clone.c:111 builtin/init-db.c:487
+#: 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:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: 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 "kho tham chiếu"
 
-#: builtin/clone.c:117 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: 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 "chỉ dùng --reference khi nhân bản"
 
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:320
+#: 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 "tên"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "dùng <tên> thay cho “origin� để theo dõi thượng nguồn"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "lấy ra <nhánh> thay cho HEAD của máy chủ"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:129
 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:124 builtin/fetch.c:167 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "độ-sâu"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:131
 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:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/pull.c:211
 msgid "time"
 msgstr "th�i-gian"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:133
 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:128 builtin/fetch.c:171 builtin/fetch.c:194
-#: builtin/rebase.c:1417
+#: 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 "điểm xét duyệt"
 
-#: builtin/clone.c:129 builtin/fetch.c:172
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 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:131
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
 msgid "clone only one branch, HEAD or --branch"
 msgstr "chỉ nhân bản một nhánh, HEAD hoặc --branch"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr ""
 "đứng có nhân bản bất kỳ nhánh nào, và làm cho những lần lấy v� sau không "
 "theo chúng nữa"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:141
 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:136 builtin/init-db.c:495
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "gitdir"
 
-#: builtin/clone.c:137 builtin/init-db.c:496
+#: 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"
 
-#: builtin/clone.c:138
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "khóa=giá_trị"
 
-#: builtin/clone.c:139
+#: builtin/clone.c:145
 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:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:172
+#: 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 "đặc-tả-máy-phục-vụ"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:173
+#: 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 "tùy ch�n để chuyển giao"
 
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
-#: builtin/push.c:573
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "chỉ dùng địa chỉ IPv4"
 
-#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
-#: builtin/push.c:575
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "chỉ dùng địa chỉ IPv6"
 
-#: builtin/clone.c:148
+#: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "m�i mô-đun-con nhân bản sẽ dung nhánh theo dõi máy chủ của chúng"
 
-#: builtin/clone.c:284
+#: builtin/clone.c:156
+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"
@@ -11095,42 +13024,42 @@ msgstr ""
 "Không đoán được thư mục tên là gì.\n"
 "Vui lòng chỉ định tên một thư mục trên dòng lệnh"
 
-#: builtin/clone.c:337
+#: builtin/clone.c:345
 #, 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:410
+#: builtin/clone.c:418
 #, 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:427
+#: builtin/clone.c:436
 #, 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:457
+#: builtin/clone.c:467
 #, 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:461
+#: builtin/clone.c:471
 #, 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:466
+#: builtin/clone.c:476
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "gặp lỗi khi lặp qua “%s�"
 
-#: builtin/clone.c:491
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr "hoàn tất.\n"
 
-#: builtin/clone.c:505
+#: builtin/clone.c:517
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11138,97 +13067,107 @@ msgid ""
 msgstr ""
 "Việc nhân bản thành công, nhưng checkout gặp lỗi.\n"
 "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"
+"và thử lấy ra với lệnh “git restore --source=HEAD :/�\n"
 
-#: builtin/clone.c:582
+#: builtin/clone.c:594
 #, 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:701
+#: builtin/clone.c:713
 #, c-format
 msgid "unable to update %s"
 msgstr "không thể cập nhật %s"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "gặp lỗi khi khởi tạo sparse-checkout"
+
+#: builtin/clone.c:784
 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:782
+#: builtin/clone.c:816
 msgid "unable to checkout working tree"
 msgstr "không thể lấy ra (checkout) cây làm việc"
 
-#: builtin/clone.c:832
+#: builtin/clone.c:894
 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:895
+#: builtin/clone.c:957
 msgid "cannot repack to clean up"
 msgstr "không thể đóng gói để d�n dẹp"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:959
 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:937 builtin/receive-pack.c:1948
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
 msgid "Too many arguments."
 msgstr "Có quá nhi�u đối số."
 
-#: builtin/clone.c:941
+#: builtin/clone.c:1005
 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:954
+#: builtin/clone.c:1018
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "tùy ch�n --bare và --origin %s xung khắc nhau."
 
-#: builtin/clone.c:957
+#: 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:970
+#: builtin/clone.c:1035
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "kho chứa “%s� chưa tồn tại"
 
-#: builtin/clone.c:976 builtin/fetch.c:1790
+#: builtin/clone.c:1039 builtin/fetch.c:2014
 #, 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:986
+#: builtin/clone.c:1049
 #, 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:996
+#: builtin/clone.c:1055
+#, 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
 #, 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:1011 builtin/clone.c:1032 builtin/difftool.c:271
-#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
+#: 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 "không thể tạo các thư mục dẫn đầu của “%s�"
 
-#: builtin/clone.c:1016
+#: builtin/clone.c:1089
 #, 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:1036
+#: builtin/clone.c:1109
 #, 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:1038
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "�ang nhân bản thành “%s�…\n"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1135
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
@@ -11236,41 +13175,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:1123
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#, 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
 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:1125
+#: builtin/clone.c:1231
 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:1127
+#: builtin/clone.c:1233
 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:1129
+#: builtin/clone.c:1235
 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:1132
+#: builtin/clone.c:1240
 msgid "source repository is shallow, ignoring --local"
 msgstr "kho nguồn là nông, nên b� qua --local"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr "--local bị l� đi"
 
-#: builtin/clone.c:1212 builtin/clone.c:1220
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "vận chuyển máy mạng đã báo cáo lỗi"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
 #, 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:1223
+#: builtin/clone.c:1347
 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."
 
@@ -11287,25 +13235,139 @@ msgid "layout to use"
 msgstr "bố cục để dùng"
 
 #: builtin/column.c:30
-msgid "Maximum width"
-msgstr "�ộ rộng tối đa"
+msgid "maximum width"
+msgstr "độ rộng tối đa"
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
-msgstr "Chèn thêm khoảng trống vào bên trái"
+msgid "padding space on left border"
+msgstr "chèn thêm khoảng trống vào bên trái"
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
-msgstr "Chèn thêm khoảng trắng vào bên phải"
+msgid "padding space on right border"
+msgstr "chèn thêm khoảng trắng vào bên phải"
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
-msgstr "Chèn thêm khoảng trắng giữa các cột"
+msgid "padding space between columns"
+msgstr "chèn thêm khoảng trắng giữa các cột"
 
 #: builtin/column.c:51
 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
+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
+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 </thư/mục/đối/tượng>] [--append][--"
+"split[=<chiến lược>]] [--reachable|--stdin-packs|--stdin-commits][--changed-"
+"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:1779
+msgid "dir"
+msgstr "tmục"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr "thư mục đối tượng để lưu đồ thị"
+
+#: builtin/commit-graph.c:83
+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
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "Không thể mở đồ thị chuyển giao “%s�"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "đối số --split không được thừa nhận, %s"
+
+#: builtin/commit-graph.c:155
+#, 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
+#, c-format
+msgid "invalid object: %s"
+msgstr "đối tượng không hợp lệ: %s"
+
+#: builtin/commit-graph.c:213
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+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
+msgid "Collecting commits from input"
+msgstr "Sưu tập các lần chuyển giao từ đầu vào"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -11319,7 +13381,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "cha mẹ bị trùng lặp %s đã bị b� qua"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:562
 #, c-format
 msgid "not a valid object name %s"
 msgstr "không phải là tên đối tượng hợp lệ “%s�"
@@ -11347,13 +13409,13 @@ msgstr "cha-mẹ"
 msgid "id of a parent commit object"
 msgstr "mã số của đối tượng chuyển giao cha mẹ"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: 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 "chú thích"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
 msgid "commit message"
 msgstr "chú thích của lần chuyển giao"
 
@@ -11361,8 +13423,8 @@ msgstr "chú thích của lần chuyển giao"
 msgid "read commit log message from file"
 msgstr "đ�c chú thích nhật ký lần chuyển giao từ tập tin"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: 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 "Ký lần chuyển giao dùng GPG"
 
@@ -11411,10 +13473,14 @@ msgstr ""
 "\n"
 
 #: builtin/commit.c:63
+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
 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:66
+#: builtin/commit.c:69
 msgid ""
 "and then use:\n"
 "\n"
@@ -11436,63 +13502,76 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:315
+#: builtin/commit.c:324
 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:356
+#: 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
+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
 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:362
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr "gặp lỗi khi thêm bằng cách tương"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:410
 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:378
+#: builtin/commit.c:412
 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:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
 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:455
+#: builtin/commit.c:489
 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:457
+#: builtin/commit.c:491
 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:465
+#: builtin/commit.c:493
+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
 msgid "cannot read the index"
 msgstr "không đ�c được bảng mục lục"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:520
 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:582
+#: builtin/commit.c:618
 #, 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:584
+#: builtin/commit.c:620
 #, 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:603
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr "đối số cho --author bị dị hình"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:692
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
@@ -11500,79 +13579,73 @@ 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:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
 #, 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:706 builtin/shortlog.c:319
+#: builtin/commit.c:758 builtin/shortlog.c:413
 #, 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:708
+#: builtin/commit.c:760
 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:712
+#: builtin/commit.c:764
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "không đ�c được tệp nhật ký “%s�"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "không thể kết hợp “-m� với “--fixup�:%s"
+
+#: builtin/commit.c:813 builtin/commit.c:829
 msgid "could not read SQUASH_MSG"
 msgstr "không thể đ�c SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:820
 msgid "could not read MERGE_MSG"
 msgstr "không thể đ�c MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:880
 msgid "could not write commit template"
 msgstr "không thể ghi mẫu chuyển giao"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:893
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
 msgstr ""
-"\n"
-"Nó trông giống với việc bạn đang chuyển giao một lần hòa trộn.\n"
-"Nếu không phải vậy, xin hãy gỡ b� tập tin\n"
-"\t%s\n"
-"và thử lại.\n"
+"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:834
+#: builtin/commit.c:895
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"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"
-"Nó trông giống với việc bạn đang chuyển giao một lần cherry-pick.\n"
-"Nếu không phải vậy, xin hãy gỡ b� tập tin\n"
-"\t%s\n"
-"và thử lại.\n"
+"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:847
+#: builtin/commit.c:899
 #, 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 ""
 "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"
+"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:855
+#: builtin/commit.c:903
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -11584,152 +13657,214 @@ msgstr ""
 "bắt đầu bằng “%c� sẽ được b� qua; bạn có thể xóa chúng đi nếu muốn thế.\n"
 "Phần chú thích này nếu trống rỗng sẽ hủy b� lần chuyển giao.\n"
 
-#: builtin/commit.c:872
+#: 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"
+"Nó trông giống với việc bạn đang chuyển giao một lần hòa trộn.\n"
+"Nếu không phải vậy, xin hãy chạy\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"và thử lại.\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"
+"Nó trông giống với việc bạn đang chuyển giao một lần cherry-pick.\n"
+"Nếu không phải vậy, xin hãy chạy\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"và thử lại.\n"
+
+#: builtin/commit.c:947
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%sTác giả:           %.*s <%.*s>"
 
-#: builtin/commit.c:880
+#: builtin/commit.c:955
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%sNgày tháng:        %s"
 
-#: builtin/commit.c:887
+#: builtin/commit.c:962
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%sNgư�i chuyển giao: %.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:980
 msgid "Cannot read index"
 msgstr "Không đ�c được bảng mục lục"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "không thể chuyển phần đuôi cho “--trailers�"
+
+#: builtin/commit.c:1065
 msgid "Error building trees"
 msgstr "Gặp lỗi khi xây dựng cây"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1079 builtin/tag.c:319
 #, 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:1030
+#: builtin/commit.c:1123
 #, 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:1044
+#: builtin/commit.c:1137
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "Chế độ b� qua không hợp lệ “%s�"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1155 builtin/commit.c:1448
 #, 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:1102
+#: builtin/commit.c:1195
 msgid "--long and -z are incompatible"
-msgstr "hai tùy ch�n -long và -z không tương thích với nhau"
+msgstr "hai tùy ch�n --long và -z không tương thích với nhau"
+
+#: builtin/commit.c:1226
+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:1228
+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:1231
+#, 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:1233
+msgid ""
+"reword option of --fixup is mutually exclusive with --patch/--interactive/--"
+"all/--include/--only"
+msgstr ""
+"tùy ch�n \"reword\" của --fixup là loại trừ qua lại với --patch/--"
+"interactive/--all/--include/--only"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1252
 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:1155
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "Không có gì để mà “tu bổ� cả."
 
-#: builtin/commit.c:1158
+#: 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:1160
+#: 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:1163
+#: 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: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:1173
+#: 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:1175
+#: 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:1183
+#: 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:1200
+#: 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:1202
-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:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "không hiểu tùy ch�n: --fixup=%s:%s"
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1352
 #, 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:1339 builtin/commit.c:1523
+#: builtin/commit.c:1483 builtin/commit.c:1652
 msgid "show status concisely"
 msgstr "hiển thị trạng thái ở dạng súc tích"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show branch information"
 msgstr "hiển thị thông tin nhánh"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1487
 msgid "show stash information"
 msgstr "hiển thị thông tin v� tạm cất"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1489 builtin/commit.c:1656
 msgid "compute full ahead/behind values"
 msgstr "tính đầy đủ giá trị trước/sau"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1491
 msgid "version"
 msgstr "phiên bản"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
-#: builtin/worktree.c:650
+#: builtin/commit.c:1491 builtin/commit.c:1658 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:1350 builtin/commit.c:1531
+#: builtin/commit.c:1494 builtin/commit.c:1660
 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:1353 builtin/commit.c:1534
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "terminate entries with NUL"
 msgstr "chấm dứt các mục bằng NUL"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
+#: 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 "chế độ"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr ""
 "hiển thị các tập tin chưa được theo dõi  dấu vết, các chế độ tùy ch�n:  all, "
 "normal, no. (Mặc định: all)"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1504
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
@@ -11737,11 +13872,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:1362 parse-options.h:188
+#: builtin/commit.c:1506 parse-options.h:193
 msgid "when"
 msgstr "khi"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1507
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
@@ -11749,176 +13884,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:1365
+#: builtin/commit.c:1509
 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:1366
+#: builtin/commit.c:1510
 msgid "do not detect renames"
 msgstr "không dò tìm các tên thay đổi"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1512
 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:1388
+#: builtin/commit.c:1535
 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:1493
+#: builtin/commit.c:1617
 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:1494
+#: builtin/commit.c:1618
 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:1496
+#: builtin/commit.c:1620
 msgid "Commit message options"
 msgstr "Các tùy ch�n ghi chú commit"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
 msgid "read message from file"
 msgstr "đ�c chú thích từ tập tin"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "author"
 msgstr "tác giả"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "override author for commit"
 msgstr "ghi đè tác giả cho commit"
 
-#: builtin/commit.c:1499 builtin/gc.c:538
+#: builtin/commit.c:1623 builtin/gc.c:550
 msgid "date"
 msgstr "ngày tháng"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1623
 msgid "override date for commit"
 msgstr "ghi đè ngày tháng cho lần chuyển giao"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
 msgstr "lần_chuyển_giao"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1625
 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:1502
+#: builtin/commit.c:1626
 msgid "reuse message from specified commit"
 msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
 
-#: builtin/commit.c:1503
-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):]commit"
+
+#: builtin/commit.c:1631
+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 lần chuyển giao đã chỉ ra"
+"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:1504
+#: builtin/commit.c:1632
 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:1505
+#: builtin/commit.c:1633
 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:1506 builtin/log.c:1565 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "(nên dùng) thêm dòng Signed-off-by:"
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "bộ dò vết"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1634
+msgid "add custom trailer(s)"
+msgstr "thêm đuôi tự ch�n"
+
+#: builtin/commit.c:1635 builtin/log.c:1754 builtin/merge.c:302
+#: builtin/pull.c:145 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:1636
 msgid "use specified template file"
 msgstr "sử dụng tập tin mẫu đã cho"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1637
 msgid "force edit of commit"
 msgstr "ép buộc sửa lần commit"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1639
 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:1515
+#: builtin/commit.c:1644
 msgid "Commit contents options"
 msgstr "Các tùy nội dung ghi chú commit"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1645
 msgid "commit all changed files"
 msgstr "chuyển giao tất cả các tập tin có thay đổi"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1646
 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:1518
+#: builtin/commit.c:1647
 msgid "interactively add files"
 msgstr "thêm các tập-tin bằng tương tác"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1648
 msgid "interactively add changes"
 msgstr "thêm các thay đổi bằng tương tác"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1649
 msgid "commit only specified files"
 msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1650
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "vòng qua móc (hook) pre-commit và commit-msg"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1651
 msgid "show what would be committed"
 msgstr "hiển thị xem cái gì có thể được chuyển giao"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1664
 msgid "amend previous commit"
 msgstr "“tu bổ� (amend) lần commit trước"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1665
 msgid "bypass post-rewrite hook"
 msgstr "vòng qua móc (hook) post-rewrite"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1672
 msgid "ok to record an empty change"
 msgstr "ok để ghi lại một thay đổi trống rỗng"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1674
 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:1616
+#: builtin/commit.c:1750
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "Tập tin MERGE_HEAD sai h�ng (%s)"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1757
 msgid "could not read MERGE_MODE"
 msgstr "không thể đ�c MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1778
 #, 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:1649
+#: builtin/commit.c:1785
 #, 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:1654
+#: builtin/commit.c:1790
 #, 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:1688
+#: builtin/commit.c:1801
+#, 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:1837
 msgid ""
 "repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -11929,296 +14087,225 @@ msgstr ""
 "có bị đầy quá hay quota (hạn nghạch đĩa cứng) bị vượt quá,\n"
 "và sau đó \"git restore --staged :/\" để khắc phục."
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <objdir>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-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:29
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir </thư/mục/đối/tượng>] [--append|--"
-"split] [--reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <các "
-"tùy ch�n chia tách>"
-
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
-#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
-#: builtin/log.c:1585
-msgid "dir"
-msgstr "tmục"
-
-#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
-#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
-msgid "The object directory to store the graph"
-msgstr "Thư mục đối tượng để lưu đồ thị"
-
-#: builtin/commit-graph.c:58
-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:80 builtin/commit-graph.c:125
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "Không thể mở đồ thị chuyển giao “%s�"
-
-#: builtin/commit-graph.c:173
-msgid "start walk at all refs"
-msgstr "bắt đầu di chuyển tại m�i tham chiếu"
-
-#: builtin/commit-graph.c:175
-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:177
-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:179
-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:182
-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:184 builtin/commit-graph.c:188
-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:186
-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:204
-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/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<các tùy ch�n>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "đối số không được thừa nhận --type, %s"
 
-#: builtin/config.c:115
+#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "chỉ một kiểu một lần"
 
-#: builtin/config.c:124
+#: builtin/config.c:130
 msgid "Config file location"
 msgstr "Vị trí tập tin cấu hình"
 
-#: builtin/config.c:125
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr "dùng tập tin cấu hình toàn cục"
 
-#: builtin/config.c:126
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr "sử dụng tập tin cấu hình hệ thống"
 
-#: builtin/config.c:127
+#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "dùng tập tin cấu hình của kho"
 
-#: builtin/config.c:128
+#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "dùng tập tin cấu hình per-worktree"
 
-#: builtin/config.c:129
+#: builtin/config.c:135
 msgid "use given config file"
 msgstr "sử dụng tập tin cấu hình đã cho"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr "blob-id"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "đ�c cấu hình từ đối tượng blob đã cho"
 
-#: builtin/config.c:131
+#: builtin/config.c:137
 msgid "Action"
 msgstr "Hành động"
 
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "lấy giá-trị: tên [value-regex]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "lấy giá trị: tên [value-pattern]"
 
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "lấy tất cả giá-trị: khóa [value-regex]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "lấy tất cả giá trị: khóa [value-pattern]"
 
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "lấy giá trị cho regexp: name-regex [value-regex]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "lấy giá trị cho regexp: name-regex [value-pattern]"
 
-#: builtin/config.c:135
+#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "lấy đặc tả giá trị cho URL: phần[.biến] URL"
 
-#: builtin/config.c:136
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value-pattern]"
 
-#: builtin/config.c:137
+#: builtin/config.c:143
 msgid "add a new variable: name value"
 msgstr "thêm biến mới: tên giá-trị"
 
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "gỡ b� biến: tên [value-regex]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "gỡ b� biến: tên [value-pattern]"
 
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "gỡ b� m�i cái khớp: tên [value-regex]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "gỡ b� m�i cái khớp: tên [value-pattern]"
 
-#: builtin/config.c:140
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "đổi tên phần: tên-cũ tên-mới"
 
-#: builtin/config.c:141
+#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "gỡ b� phần: tên"
 
-#: builtin/config.c:142
+#: builtin/config.c:148
 msgid "list all"
 msgstr "liệt kê tất"
 
-#: builtin/config.c:143
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "sử dụng so sánh bằng chuỗi khi so sánh các giá trị với “value-pattern�"
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr "mở một trình biên soạn"
 
-#: builtin/config.c:144
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "tìm cấu hình màu sắc: slot [mặc định]"
 
-#: builtin/config.c:145
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "tìm các cài đặt v� màu sắc: slot [stdout-là-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:153
 msgid "Type"
 msgstr "Kiểu"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "giá trị được đưa kiểu này"
 
-#: builtin/config.c:148
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "giá trị là \"true\" hoặc \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "giá trị ở dạng số thập phân"
 
-#: builtin/config.c:150
+#: builtin/config.c:157
 msgid "value is --bool or --int"
 msgstr "giá trị là --bool hoặc --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "giá trị là --bool hoặc chuỗi"
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "giá trị là đư�ng dẫn (tên tập tin hay thư mục)"
 
-#: builtin/config.c:152
+#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "giá trị là một ngày hết hạn"
 
-#: builtin/config.c:153
+#: builtin/config.c:161
 msgid "Other"
 msgstr "Khác"
 
-#: builtin/config.c:154
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "chấm dứt giá trị với byte NUL"
 
-#: builtin/config.c:155
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "chỉ hiển thị các tên biến"
 
-#: builtin/config.c:156
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "tôn tr�ng kể cà các hướng trong tìm kiếm"
 
-#: builtin/config.c:157
+#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr ""
 "hiển thị nguyên gốc của cấu hình (tập tin, đầu vào tiêu chuẩn, blob, dòng "
 "lệnh)"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"hiển thị phạm vi của cấu hình (cây làm việc, cục bộ, toàn cầu, hệ thống, "
+"lệnh)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "giá trị"
 
-#: builtin/config.c:158
+#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "với --get, dùng giá trị mặc định khi thiếu mục tin"
 
-#: builtin/config.c:172
+#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "sai số lượng tham số, phải là %d"
 
-#: builtin/config.c:174
+#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "sai số lượng tham số, phải từ %d đến %d"
 
-#: builtin/config.c:308
+#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "mẫu khóa không hợp lệ: %s"
 
-#: builtin/config.c:344
+#: builtin/config.c:377
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "gặp lỗi khi định dạng giá trị cấu hình mặc định: %s"
 
-#: builtin/config.c:401
+#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "không thể phân tích màu “%s�"
 
-#: builtin/config.c:443
+#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "không thể phân tích giá trị màu mặc định"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "không trong thư mục git"
 
-#: builtin/config.c:499
+#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "việc ghi ra đầu ra tiêu chuẩn là không được hỗ trợ"
 
-#: builtin/config.c:502
+#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "không hỗ trợ ghi cấu hình các blob"
 
-#: builtin/config.c:587
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12233,23 +14320,27 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "chỉ một tập tin cấu hình một lần"
 
-#: builtin/config.c:616
+#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
 msgstr "--local chỉ có thể được dùng bên trong một kho git"
 
-#: builtin/config.c:619
+#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
 msgstr "--blob chỉ có thể được dùng bên trong một kho git"
 
-#: builtin/config.c:638
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+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:658
+#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12259,19 +14350,19 @@ msgstr ""
 "worktreeConfig được bật. Vui lòng đ�c phần \"CONFIGURATION FILE\"\n"
 "trong \"git help worktree\" để biết thêm chi tiết"
 
-#: builtin/config.c:688
+#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color và kiểu biến là không mạch lạc"
 
-#: builtin/config.c:693
+#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "chỉ một thao tác mỗi lần"
 
-#: builtin/config.c:706
+#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only chỉ được áp dụng cho --list hoặc --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
@@ -12279,33 +14370,37 @@ msgstr ""
 "--show-origin chỉ được áp dụng cho --get, --get-all, --get-regexp, hoặc --"
 "list"
 
-#: builtin/config.c:718
+#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default chỉ được áp dụng cho --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value chỉ áp dụng với “value-pattern�"
+
+#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "không thể đ�c tập tin cấu hình “%s�"
 
-#: builtin/config.c:734
+#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "gặp lỗi khi xử lý các tập tin cấu hình"
 
-#: builtin/config.c:744
+#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "sửa chữa đầu ra tiêu chuẩn là không được hỗ trợ"
 
-#: builtin/config.c:746
+#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "việc sửa chữa các blob là không được hỗ trợ"
 
-#: builtin/config.c:760
+#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "không thể tạo tập tin cấu hình “%s�"
 
-#: builtin/config.c:773
+#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12314,7 +14409,7 @@ msgstr ""
 "không thể ghi đè nhi�u giá trị với một giá trị đơn\n"
 "      Dùng một biểu thức chính quy, --add hay --replace-all để thay đổi %s."
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "không có đoạn: %s"
@@ -12327,6 +14422,36 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "hiển thị kích cỡ theo định dạng dành cho ngư�i đ�c"
 
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Quy�n hạn trên thư mục gói mạng của bạn không chính xác; ngư�i dùng\n"
+"khác có lẽ có thể đ�c được chứng thư được lưu đệm của bạn. Cân nhắc chạy:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
+
+#: builtin/credential-cache--daemon.c:316
+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
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache không sẵn có; không hỗ trợ unix socket"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "không thể lấy khóa lưu trữ ủy nhiệm %d ms"
+
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<các tùy ch�n>] <commit-ish>*"
@@ -12335,49 +14460,44 @@ msgstr "git describe [<các tùy ch�n>] <commit-ish>*"
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<các tùy ch�n>] --dirty"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "head"
 msgstr "phía trước"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "hạng nhẹ"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr "có diễn giải"
 
-#: builtin/describe.c:275
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "thẻ đã được ghi chú %s không sẵn để dùng"
 
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "thẻ được chú giải %s không có tên nhúng"
-
 #: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "thẻ “%s� đã thực sự ở đây “%s� rồi"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "ở bên ngoài, thẻ “%s� đã được biết đến là “%s�"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "không có thẻ nào khớp chính xác với “%s�"
 
-#: builtin/describe.c:327
+#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "Không có tham chiếu hay thẻ khớp đúng, đang tìm kiếm mô tả\n"
 
-#: builtin/describe.c:381
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "việc tìm kiếm đã kết thúc tại %s\n"
 
-#: builtin/describe.c:407
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12386,7 +14506,7 @@ msgstr ""
 "Không có thẻ được chú giải nào được mô tả là “%s�.\n"
 "Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags."
 
-#: builtin/describe.c:411
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12395,12 +14515,12 @@ msgstr ""
 "Không có thẻ có thể mô tả “%s�.\n"
 "Hãy thử --always, hoặc tạo một số thẻ."
 
-#: builtin/describe.c:441
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "đã xuyên %lu qua lần chuyển giao\n"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12409,144 +14529,162 @@ msgstr ""
 "tìm thấy nhi�u hơn %i thẻ; đã liệt kê %i cái gần\n"
 "đây nhất b� đi tìm kiếm tại %s\n"
 
-#: builtin/describe.c:512
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "mô tả %s\n"
 
-#: builtin/describe.c:515
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "Không phải tên đối tượng %s hợp lệ"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s không phải là một lần commit cũng không phải blob"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "tìm các thẻ mà nó đến trước lần chuyển giao"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "chiến lược tìm kiếm gỡ lỗi trên đầu ra lỗi chuẩn stderr"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "dùng ref bất kỳ"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "dùng thẻ bất kỳ, cả khi “unannotated�"
 
-#: builtin/describe.c:541
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "luôn dùng định dạng dài"
 
-#: builtin/describe.c:542
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "chỉ theo cha mẹ đầu tiên"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "chỉ xuất những gì khớp chính xác"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:568
 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:553 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
 
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "dấu"
 
-#: builtin/describe.c:555
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:575
 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:576
+#: 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:605
+#: 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:656
+#: 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:658
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken là xung khắc với commit-ishes"
 
-#: builtin/diff.c:84
+#: 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/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base chỉ hoạt động với hai lần chuyển giao"
+
+#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "“%s�: không phải tập tin bình thư�ng hay liên kết m�m"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "tùy ch�n không hợp lệ: %s"
 
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s…%s: không có cơ sở hòa trộn"
+
+#: builtin/diff.c:486
 msgid "Not a git repository"
 msgstr "Không phải là kho git"
 
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "đối tượng đã cho “%s� không hợp lệ."
 
-#: builtin/diff.c:403
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "đã cho nhi�u hơn hai đối tượng blob: “%s�"
 
-#: builtin/diff.c:408
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "đã cho đối tượng không thể nắm giữ “%s�."
 
-#: builtin/difftool.c:30
+#: builtin/diff.c:582
+#, 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"
+
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 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:260
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
 msgstr "gặp lỗi: %d"
 
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink %s"
 msgstr "không thể đ�c liên kết m�m %s"
 
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
 #, 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:312
+#: builtin/difftool.c:313
 #, 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"
@@ -12559,53 +14697,53 @@ msgstr ""
 "các định dạng diff tổ hợp(“-c� và “--cc�) chưa được hỗ trợ trong\n"
 "chế độ diff thư mục(“-d� và “--dir-diff�)."
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "cả hai tập tin đã bị sửa: “%s� và “%s�."
 
-#: builtin/difftool.c:636
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "cây làm việc ở bên trái."
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "các tập tin tạm đã sẵn có trong “%s�."
 
-#: builtin/difftool.c:648
+#: builtin/difftool.c:651
 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:697
+#: builtin/difftool.c:699
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:701
 msgid "perform a full-directory diff"
 msgstr "thực hiện một diff toàn thư mục"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:703
 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:706
+#: builtin/difftool.c:708
 msgid "use symlinks in dir-diff mode"
 msgstr "dùng liên kết m�m trong diff-thư-mục"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:709
 msgid "tool"
 msgstr "công cụ"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:710
 msgid "use the specified diff tool"
 msgstr "dùng công cụ diff đã cho"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:712
 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:713
+#: builtin/difftool.c:715
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
@@ -12613,31 +14751,31 @@ msgstr ""
 "làm cho “git-difftool� thoát khi g�i công cụ diff trả v� mã không phải số "
 "không"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:718
 msgid "specify a custom command for viewing diffs"
 msgstr "chỉ định một lệnh tùy ý để xem diff"
 
-#: builtin/difftool.c:717
+#: builtin/difftool.c:719
 msgid "passed to `diff`"
 msgstr "chuyển cho “diff�"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:734
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool cần cây làm việc hoặc --no-index"
 
-#: builtin/difftool.c:739
+#: builtin/difftool.c:741
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff xung khắc với --no-index"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:744
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui, --tool và --extcmd loại từ lẫn nhau"
 
-#: builtin/difftool.c:750
+#: builtin/difftool.c:752
 msgid "no <tool> given for --tool=<tool>"
 msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:759
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
 
@@ -12645,215 +14783,280 @@ 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:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
 msgid "type"
 msgstr "kiểu"
 
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
-msgstr "mặc định cho git_env_*(...) để quay v�"
+msgstr "mặc định cho git_env_*(…) để quay v�"
 
-#: builtin/env--helper.c:43
+#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "im lặng chỉ khi dung giá trị git_env_*() làm mã thoát"
 
-#: builtin/env--helper.c:62
+#: builtin/env--helper.c:67
 #, c-format
 msgid "option `--default' expects a boolean value with `--type=bool`, not `%s`"
 msgstr ""
-"tùy ch�n `--default' cần một giá trị logic với `--type=bool`, không phải `%s`"
+"tùy ch�n “--default� cần một giá trị logic với “--type=bool“, không phải “%s“"
 
-#: builtin/env--helper.c:77
+#: builtin/env--helper.c:82
 #, c-format
 msgid ""
 "option `--default' expects an unsigned long value with `--type=ulong`, not `"
 "%s`"
 msgstr ""
-"tùy ch�n `--default' cần một giá trị số nguyên dài không dấu với `--"
-"type=ulong`, không phải `%s`"
+"tùy ch�n “--default� cần một giá trị số nguyên dài không dấu với “--"
+"type=ulong“, không phải “%s“"
 
 #: builtin/fast-export.c:29
 msgid "git fast-export [rev-list-opts]"
 msgstr "git fast-export [rev-list-opts]"
 
-#: builtin/fast-export.c:852
+#: builtin/fast-export.c:868
 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:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map thẻ không thể là rỗng"
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "hiển thị tiến triển sau <n> đối tượng"
 
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "ch�n đi�u khiển của thẻ đã ký"
 
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
 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:1160
+#: builtin/fast-export.c:1205
 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:1163
-msgid "Dump marks to this file"
-msgstr "�ổ các đánh dấu này vào tập-tin"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "đổ các đánh dấu này vào tập-tin"
 
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
-msgstr "Nhập vào đánh dấu từ tập tin này"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "nhập vào đánh dấu từ tập tin này"
 
-#: builtin/fast-export.c:1169
-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:1214
+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:1171
-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:1216
+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:1173
-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:1218
+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:1175
-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:1220
+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:1176
-msgid "Skip output of blob data"
-msgstr "B� qua kết xuất của dữ liệu blob"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "b� qua kết xuất của dữ liệu blob"
 
-#: builtin/fast-export.c:1177 builtin/log.c:1633
+#: builtin/fast-export.c:1222 builtin/log.c:1826
 msgid "refspec"
 msgstr "refspec"
 
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
-msgstr "�p dụng refspec cho refs đã xuất"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "áp dụng refspec cho refs đã xuất"
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "kết xuất anonymize"
 
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "từ:đến"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "chuyển đổi <from> sang <to> đầu ra ẩn danh"
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
 msgstr ""
-"Các cha mẹ tham chiếu cái mà k trong luồng dữ liệu fast-export bởi mã id đối "
-"tượng"
+"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:1183
-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:1231
+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:1185
-msgid "Label tags with mark ids"
-msgstr "Gắn nhãn thẻ ID dấu"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
+msgstr "gắn thẻ với các mã ID đánh dấu"
 
-#: builtin/fast-export.c:1220
+#: 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/fetch.c:34
+#: builtin/fast-import.c:3088
+#, 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
+#, 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
+#, 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
+#, 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
+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
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr ""
+"tính năng “%s� bị cấm chỉ trong đầu vào mà không có --allow-unsafe-features"
+
+#: builtin/fetch-pack.c:242
+#, c-format
+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
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<các tùy ch�n>] [<kho-chứa> [<refspec>…]]"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<các tùy ch�n>] [<nhóm>"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<các tùy ch�n>] [(<kho> | <nhóm>)…]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<các tùy ch�n>]"
 
-#: builtin/fetch.c:115
+#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel không thể âm"
 
-#: builtin/fetch.c:138 builtin/pull.c:204
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "lấy v� từ tất cả các máy chủ"
 
-#: builtin/fetch.c:140 builtin/pull.c:248
+#: builtin/fetch.c:147 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
 msgstr "đặt thượng nguồn cho git pull/fetch"
 
-#: builtin/fetch.c:142 builtin/pull.c:207
+#: builtin/fetch.c:149 builtin/pull.c:188
 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:144 builtin/pull.c:210
+#: builtin/fetch.c:151
+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
 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:145
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr "ép buộc ghi đè lên tham chiếu nội bộ"
 
-#: builtin/fetch.c:147
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "lấy từ nhi�u máy chủ cùng lúc"
 
-#: builtin/fetch.c:149 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:195
 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:151
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr "không lấy tất cả các thẻ (--no-tags)"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "số lượng mô-đun-con được lấy đồng th�i"
 
-#: builtin/fetch.c:155 builtin/pull.c:217
+#: builtin/fetch.c:164
+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
 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:157
+#: builtin/fetch.c:168
 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:158 builtin/fetch.c:181 builtin/pull.c:141
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "khi-cần"
 
-#: builtin/fetch.c:159
+#: builtin/fetch.c:170
 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:163 builtin/pull.c:225
+#: builtin/fetch.c:175
+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
 msgid "keep downloaded pack"
 msgstr "giữ lại gói đã tải v�"
 
-#: builtin/fetch.c:165
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "cho phép cập nhật th.chiếu HEAD"
 
-#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "làm sâu hơn lịch sử của bản sao"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:183 builtin/pull.c:212
 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:176 builtin/pull.c:231
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "chuyển đổi hoàn toàn sang kho git"
 
-#: builtin/fetch.c:179
+#: builtin/fetch.c:192
 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:182
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
@@ -12861,91 +15064,104 @@ 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:186 builtin/pull.c:234
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
 
-#: builtin/fetch.c:187 builtin/pull.c:236
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr "refmap"
 
-#: builtin/fetch.c:188 builtin/pull.c:237
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "chỉ ra refmap cần lấy v�"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:208 builtin/pull.c:240
 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:198
-msgid "run 'gc --auto' after fetching"
-msgstr "chạy 'gc --auto' sau khi lấy v�"
+#: builtin/fetch.c:210
+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
+msgid "run 'maintenance --auto' after fetching"
+msgstr "chạy “maintenance --auto� sau khi lấy v�"
 
-#: builtin/fetch.c:200 builtin/pull.c:246
+#: builtin/fetch.c:217 builtin/pull.c:243
 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:510
+#: builtin/fetch.c:219
+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
+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:650
+#: builtin/fetch.c:757
 #, 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:748
+#: builtin/fetch.c:856
 #, c-format
 msgid "object %s not found"
 msgstr "không tìm thấy đối tượng %s"
 
-#: builtin/fetch.c:752
+#: builtin/fetch.c:860
 msgid "[up to date]"
 msgstr "[đã cập nhật]"
 
-#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr "[Bị từ chối]"
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:874
 msgid "can't fetch in current branch"
 msgstr "không thể fetch (lấy) v� nhánh hiện hành"
 
-#: builtin/fetch.c:776
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr "[cập nhật thẻ]"
 
-#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
-#: builtin/fetch.c:848
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
 msgid "unable to update local ref"
 msgstr "không thể cập nhật tham chiếu nội bộ"
 
-#: builtin/fetch.c:781
+#: builtin/fetch.c:889
 msgid "would clobber existing tag"
 msgstr "nên xóa chồng các thẻ có sẵn"
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr "[thẻ mới]"
 
-#: builtin/fetch.c:806
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr "[nhánh mới]"
 
-#: builtin/fetch.c:809
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr "[ref (tham chiếu) mới]"
 
-#: builtin/fetch.c:848
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr "cưỡng bức cập nhật"
 
-#: builtin/fetch.c:853
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
 msgstr "không-phải-chuyển-tiếp-nhanh"
 
-#: builtin/fetch.c:874
+#: 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"
@@ -12953,9 +15169,9 @@ msgid ""
 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"
-"'--show-forced-updates' hoặc chạy 'git config fetch.showForcedUpdates true'."
+"“--show-forced-updates� hoặc chạy “git config fetch.showForcedUpdates true�."
 
-#: builtin/fetch.c:878
+#: builtin/fetch.c:1069
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -12964,26 +15180,26 @@ msgid ""
 " 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"
-"'--no-show-forced-updates' hoặc chạy 'git config fetch.showForcedUpdates "
-"false'\n"
+"“--no-show-forced-updates� hoặc chạy “git config fetch.showForcedUpdates "
+"false�\n"
 "để tránh kiểm tra này.\n"
 
-#: builtin/fetch.c:908
+#: builtin/fetch.c:1101
 #, 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:929
+#: builtin/fetch.c:1129
 #, 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:1020 builtin/fetch.c:1157
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr "Từ %.*s\n"
 
-#: builtin/fetch.c:1031
+#: builtin/fetch.c:1228
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -12992,58 +15208,58 @@ 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:1127
+#: builtin/fetch.c:1327
 #, 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:1128
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   (%s đã trở thành không đầu (không được quản lý))"
 
-#: builtin/fetch.c:1160
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr "[đã xóa]"
 
-#: builtin/fetch.c:1161 builtin/remote.c:1036
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr "(không)"
 
-#: builtin/fetch.c:1184
+#: builtin/fetch.c:1384
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr ""
 "Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
 "trần (bare)"
 
-#: builtin/fetch.c:1203
+#: builtin/fetch.c:1403
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "Tùy ch�n \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
 
-#: builtin/fetch.c:1206
+#: builtin/fetch.c:1406
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "Tùy ch�n \"%s\" bị b� qua với %s\n"
 
-#: builtin/fetch.c:1414
-msgid "multiple branch detected, incompatible with --set-upstream"
+#: builtin/fetch.c:1618
+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:1429
+#: builtin/fetch.c:1633
 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:1431
+#: builtin/fetch.c:1635
 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:1433
+#: builtin/fetch.c:1637
 msgid "unknown branch type"
 msgstr "không hiểu kiểu nhánh"
 
-#: builtin/fetch.c:1435
+#: builtin/fetch.c:1639
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
@@ -13051,22 +15267,22 @@ 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."
 
-#: builtin/fetch.c:1561 builtin/fetch.c:1623
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr "�ang lấy “%s� v�\n"
 
-#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "Không thể lấy“%s� v�"
 
-#: builtin/fetch.c:1583
+#: builtin/fetch.c:1790
 #, 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:1685
+#: 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."
@@ -13074,44 +15290,56 @@ 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:1722
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr "Bạn phải định rõ tên thẻ."
 
-#: builtin/fetch.c:1774
+#: builtin/fetch.c:1994
+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:1998
 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:1776
+#: builtin/fetch.c:2000
 msgid "--deepen and --depth are mutually exclusive"
-msgstr "Các tùy ch�n--deepen và --depth loại từ lẫn nhau"
+msgstr "Các tùy ch�n --deepen và --depth loại từ lẫn nhau"
 
-#: builtin/fetch.c:1781
+#: builtin/fetch.c:2005
 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:1783
+#: builtin/fetch.c:2007
 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:1799
+#: builtin/fetch.c:2024
 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:1801
+#: builtin/fetch.c:2026
 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:1810
+#: builtin/fetch.c:2035
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "Không có nhóm máy chủ hay máy chủ như thế: %s"
 
-#: builtin/fetch.c:1817
+#: builtin/fetch.c:2042
 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:1835
+#: builtin/fetch.c:2058
+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:2063
+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:2082
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
@@ -13119,30 +15347,38 @@ msgstr ""
 "--filter chỉ có thể được dùng với máy chủ được cấu hình bằng extensions."
 "partialclone"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2086
+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:2090
+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ủ"
+
+#: 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 <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-"
 "tin>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 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:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "bí danh cho --log (không được dùng)"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "văn bản"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 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:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "tập tin để đ�c dữ liệu từ đó"
 
@@ -13155,8 +15391,10 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <đối tượng>]"
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<lần-chuyển-giao>]]"
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr ""
+"git for-each-ref [--merged [<lần-chuyển-giao>]] [--no-merged [<lần-chuyển-"
+"giao>]]"
 
 #: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
@@ -13164,76 +15402,92 @@ msgstr ""
 "git for-each-ref [--contains [<lần-chuyển-giao>]] [--no-contains [<lần-"
 "chuyển-giao>]]"
 
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
 msgstr "trích dẫn để phù hợp cho hệ v� (shell)"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr "trích dẫn để phù hợp cho perl"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr "trích dẫn để phù hợp cho python"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr "trích dẫn để phù hợp cho Tcl"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "hiển thị chỉ <n> tham chiếu khớp"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
 msgid "respect format colors"
 msgstr "các màu định dạng lưu tâm"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "chỉ hiển thị các tham chiếu mà nó chỉ đến đối tượng đã cho"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "chỉ hiển thị những tham chiếu mà nó được hòa trộn"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
 msgstr "chỉ hiển thị những tham chiếu mà nó không được hòa trộn"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
 msgstr "chỉ hiển thị những tham chiếu mà nó chứa lần chuyển giao"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
 msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<config> <command-args>"
+
+#: builtin/for-each-repo.c:34
+msgid "config"
+msgstr "config"
+
+#: 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:43
+msgid "missing --config=<config>"
+msgstr "thiếu --config=<config>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "không hiểu"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "lá»—i trong %s %s: %s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "có cảnh báo trong %s %s: %s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: 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:168
+#: 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:184
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13242,240 +15496,240 @@ msgstr ""
 "liên kết gãy từ %7s %s \n"
 "              tá»›i %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "thiếu %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "không tiếp cận được %s %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "dangling %s %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "không thể tạo lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "không thể hoàn thành “%s�"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "�ang kiểm tra %s"
 
-#: builtin/fsck.c:415
+#: 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:434
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "�ang kiểm tra %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "các liên kết bị gẫy"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "gốc %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "đã đánh thẻ %s %s (%s) trong %s"
 
-#: builtin/fsck.c:484
+#: 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:509
+#: 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:523
+#: 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:557
+#: 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:564
+#: 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:619
+#: 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:634
+#: builtin/fsck.c:606
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s: thiếu đối tượng hoặc h�ng: %s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:619
 #, 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:667
+#: builtin/fsck.c:639
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "tập tin sha1 sai: %s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:654
 msgid "Checking object directory"
 msgstr "�ang kiểm tra thư mục đối tượng"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:657
 msgid "Checking object directories"
 msgstr "�ang kiểm tra các thư mục đối tượng"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:672
 #, c-format
 msgid "Checking %s link"
 msgstr "�ang lấy liên kết %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:677 builtin/index-pack.c:864
 #, c-format
 msgid "invalid %s"
 msgstr "%s không hợp lệ"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:684
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s chỉ đến thứ gì đó xa lạ (%s)"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:690
 #, 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:722
+#: builtin/fsck.c:694
 #, 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:734
+#: builtin/fsck.c:706
 msgid "Checking cache tree"
 msgstr "�ang kiểm tra cây nhớ tạm"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:711
 #, 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:750
+#: builtin/fsck.c:720
 msgid "non-tree in cache-tree"
 msgstr "non-tree trong cache-tree"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:751
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<các tùy ch�n>] [<đối-tượng>…]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:757
 msgid "show unreachable objects"
 msgstr "hiển thị các đối tượng không thể đ�c được"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:758
 msgid "show dangling objects"
 msgstr "hiển thị các đối tượng không được quản lý"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:759
 msgid "report tags"
 msgstr "báo cáo các thẻ"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:760
 msgid "report root nodes"
 msgstr "báo cáo node gốc"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:761
 msgid "make index objects head nodes"
 msgstr "tạo “index objects head nodes�"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:762
 msgid "make reflogs head nodes (default)"
 msgstr "tạo “reflogs head nodes� (mặc định)"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:763
 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:794
+#: builtin/fsck.c:764
 msgid "check only connectivity"
 msgstr "chỉ kiểm tra kết nối"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:765 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "cho phép kiểm tra hạn chế hơn"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:767
 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:798 builtin/prune.c:132
+#: builtin/fsck.c:768 builtin/prune.c:134
 msgid "show progress"
 msgstr "hiển thị quá trình"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:769
 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:859 builtin/index-pack.c:225
+#: builtin/fsck.c:828 builtin/index-pack.c:262
 msgid "Checking objects"
 msgstr "�ang kiểm tra các đối tượng"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:856
 #, c-format
 msgid "%s: object missing"
 msgstr "%s: thiếu đối tượng"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:867
 #, 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�"
 
-#: builtin/gc.c:35
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<các tùy ch�n>]"
 
-#: builtin/gc.c:90
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "Gặp lỗi khi lấy thông tin thống kê v� tập tin %s: %s"
 
-#: builtin/gc.c:126
+#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "gặp lỗi khi phân tích “%s� giá trị “%s�"
 
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 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:484 builtin/notes.c:240 builtin/tag.c:529
+#: 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:491
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13490,54 +15744,54 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:539
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
 msgstr "xóa b� các đối tượng không được tham chiếu"
 
-#: builtin/gc.c:541
+#: builtin/gc.c:553
 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:542
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "bật chế độ auto-gc"
 
-#: builtin/gc.c:545
+#: builtin/gc.c:557
 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:548
+#: builtin/gc.c:560
 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:565
+#: builtin/gc.c:576
 #, 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:576
+#: builtin/gc.c:587
 #, 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:596
+#: builtin/gc.c:607
 #, 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:598
+#: builtin/gc.c:609
 #, 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:599
+#: builtin/gc.c:610
 #, 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:639
+#: builtin/gc.c:650
 #, c-format
 msgid ""
 "gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -13545,23 +15799,184 @@ 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:694
+#: builtin/gc.c:705
 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/grep.c:29
+#: builtin/gc.c:715
+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
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule không được phép"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "đối số --schedule không được thừa nhận %s"
+
+#: builtin/gc.c:869
+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
+msgid "failed to prefetch remotes"
+msgstr "gặp lỗi khi tải trước các máy chủ"
+
+#: builtin/gc.c:1022
+msgid "failed to start 'git pack-objects' process"
+msgstr "gặp lỗi khi lấy thông tin thống kê v� tiến trình “git pack-objects�"
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr "gặp lỗi khi hoàn tất tiến trình “git pack-objects�"
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr "gặp lỗi khi ghi multi-pack-index"
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr "gặp lỗi khi chạy “git multi-pack-index expire�"
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr "gặp lỗi khi chạy “git multi-pack-index repack�"
+
+#: builtin/gc.c:1179
+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
+#, 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
+#, c-format
+msgid "task '%s' failed"
+msgstr "gặp lỗi khi thực hiện nhiệm vụ “%s�"
+
+#: builtin/gc.c:1395
+#, 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
+#, 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
+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
+msgid "frequency"
+msgstr "tần số"
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr "chạy nhiệm vụ dựa trên tần suất"
+
+#: builtin/gc.c:1420
+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
+msgid "task"
+msgstr "tác vụ"
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr "chạy một nhiệm vụ cụ thể"
+
+#: builtin/gc.c:1439
+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
+msgid "failed to run 'git config'"
+msgstr "gặp lỗi khi chạy “git config�"
+
+#: builtin/gc.c:1547
+#, 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
+msgid "failed to start launchctl"
+msgstr "gặp lỗi khi khởi chạy launchctl"
+
+#: builtin/gc.c:1613
+#, 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
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "gặp lỗi khi mồi dịch vụ %s"
+
+#: builtin/gc.c:1745
+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
+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
+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
+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
+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
+msgid "'crontab' died"
+msgstr "“crontab� đã chết"
+
+#: builtin/gc.c:1976
+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
+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
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance run <lệnh_con> [<các tùy ch�n>]"
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "lện con không hợp lệ: %s"
+
+#: builtin/grep.c:30
 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:225
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
 
-#: builtin/grep.c:279
+#: builtin/grep.c:277
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
@@ -13570,259 +15985,259 @@ msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: 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 "không hỗ trợ đa tuyến, b� qua %s"
 
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "không thể đ�c cây (%s)"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:658
 #, 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:716
+#: builtin/grep.c:738
 #, 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:815
+#: builtin/grep.c:837
 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:817
+#: builtin/grep.c:839
 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:819
+#: builtin/grep.c:841
 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:821
+#: builtin/grep.c:843
 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:823
+#: builtin/grep.c:845
 msgid "recursively search in each submodule"
 msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:848
 msgid "show non-matching lines"
 msgstr "hiển thị những dòng không khớp với mẫu"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:850
 msgid "case insensitive matching"
 msgstr "phân biệt HOA/thư�ng"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:852
 msgid "match patterns only at word boundaries"
 msgstr "chỉ khớp mẫu tại đư�ng ranh giới từ"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:854
 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:834
+#: builtin/grep.c:856
 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:837
+#: builtin/grep.c:859
 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:839
+#: builtin/grep.c:861
 msgid "search in subdirectories (default)"
 msgstr "tìm kiếm trong thư mục con (mặc định)"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:863
 msgid "descend at most <depth> levels"
 msgstr "hạ xuống ít nhất là mức <sâu>"
 
-#: builtin/grep.c:845
+#: builtin/grep.c:867
 msgid "use extended POSIX regular expressions"
 msgstr "dùng biểu thức chính qui POSIX có mở rộng"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:870
 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:851
+#: builtin/grep.c:873
 msgid "interpret patterns as fixed strings"
 msgstr "diễn dịch các mẫu như là chuỗi cố định"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:876
 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:857
+#: builtin/grep.c:879
 msgid "show line numbers"
 msgstr "hiển thị số của dòng"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:880
 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:859
+#: builtin/grep.c:881
 msgid "don't show filenames"
 msgstr "không hiển thị tên tập tin"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:882
 msgid "show filenames"
 msgstr "hiển thị các tên tập tin"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:884
 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:864
+#: builtin/grep.c:886
 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:866
+#: builtin/grep.c:888
 msgid "synonym for --files-with-matches"
 msgstr "đồng nghĩa với --files-with-matches"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:891
 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:871
+#: builtin/grep.c:893
 msgid "print NUL after filenames"
 msgstr "thêm NUL vào sau tên tập tin"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:896
 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:876
+#: builtin/grep.c:898
 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:877
+#: builtin/grep.c:899
 msgid "highlight matches"
 msgstr "tô sáng phần khớp mẫu"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:901
 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:881
+#: builtin/grep.c:903
 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:884
+#: builtin/grep.c:906
 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:887
+#: builtin/grep.c:909
 msgid "show <n> context lines before matches"
 msgstr "hiển thị <n> dòng nội dung trước khớp"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:911
 msgid "show <n> context lines after matches"
 msgstr "hiển thị <n> dòng nội dung sau khớp"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:913
 msgid "use <n> worker threads"
 msgstr "dùng <n> tuyến trình làm việc"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:914
 msgid "shortcut for -C NUM"
 msgstr "dạng viết tắt của -C S�"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:917
 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:897
+#: builtin/grep.c:919
 msgid "show the surrounding function"
 msgstr "hiển thị hàm bao quanh"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:922
 msgid "read patterns from file"
 msgstr "đ�c mẫu từ tập-tin"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:924
 msgid "match <pattern>"
 msgstr "match <mẫu>"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:926
 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:916
+#: builtin/grep.c:938
 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:918
+#: builtin/grep.c:940
 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:920
-msgid "show parse tree for grep expression"
-msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep� (tìm kiếm)"
-
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "pager"
 msgstr "dàn trang"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 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:928
+#: builtin/grep.c:947
 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:992
+#: builtin/grep.c:1013
 msgid "no pattern given"
 msgstr "chưa chỉ ra mẫu"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1049
 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:1036
+#: builtin/grep.c:1057
 #, 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:1067
+#: builtin/grep.c:1087
+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:1091
 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:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
 msgid "no threads support, ignoring --threads"
 msgstr "không hỗ trợ đa tuyến, b� qua --threads"
 
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "số tuyến chỉ ra không hợp lệ (%d)"
 
-#: builtin/grep.c:1096
+#: builtin/grep.c:1131
 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:1119
-msgid "option not supported with --recurse-submodules"
-msgstr "tùy ch�n không được hỗ trợ với --recurse-submodules"
-
-#: builtin/grep.c:1125
+#: builtin/grep.c:1157
 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:1131
+#: builtin/grep.c:1160
+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:1166
 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:1139
+#: builtin/grep.c:1174
 msgid "both --cached and trees are given"
 msgstr "cả hai --cached và các cây phải được chỉ ra"
 
@@ -13863,66 +16278,66 @@ msgstr "chỉ cần băm rác ngẫu nhiên để tạo má»™t đối tượng há
 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:46
+#: builtin/help.c:47
 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:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "hướng dẫn loại trừ"
 
-#: builtin/help.c:48
+#: 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:49
+#: 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:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr "hiển thị trang man"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 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:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "hiện trang info"
 
-#: builtin/help.c:56
+#: builtin/help.c:57
 msgid "print command description"
 msgstr "hiển thị mô tả lệnh"
 
-#: builtin/help.c:61
+#: 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:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "không nhận ra định dạng trợ giúp “%s�"
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "Gặp lỗi khi khởi chạy emacsclient."
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "Gặp lỗi khi phân tích phiên bản emacsclient."
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "phiên bản của emacsclient “%d� quá cũ (< 22)."
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "gặp lỗi khi thực thi “%s�"
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -13931,7 +16346,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:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -13940,390 +16355,418 @@ 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:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "“%s�: không rõ chương trình xem man."
 
-#: builtin/help.c:367
+#: builtin/help.c:452
 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:375
+#: builtin/help.c:459
 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:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "“%s� được đặt bí danh thành “%s�"
 
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:531 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "chuá»—i alias.%s sai: %s"
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:561 builtin/help.c:591
 #, c-format
 msgid "usage: %s%s"
 msgstr "cách dùng: %s%s"
 
-#: builtin/help.c:491
+#: builtin/help.c:575
 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:185
+#: builtin/index-pack.c:222
 #, 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:205
+#: builtin/index-pack.c:242
 #, 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:208
+#: builtin/index-pack.c:245
 #, 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:258
+#: builtin/index-pack.c:295
 #, 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:268
+#: builtin/index-pack.c:305
 msgid "early EOF"
 msgstr "gặp kết thúc tập tin EOF quá sớm"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:306
 msgid "read error on input"
 msgstr "lỗi đ�c ở đầu vào"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:318
 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:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:325 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:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:328 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:312
+#: 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:326
+#: builtin/index-pack.c:363
 msgid "pack signature mismatch"
 msgstr "chữ ký cho gói không khớp"
 
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:365
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
 
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:381
 #, 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:466
+#: builtin/index-pack.c:487
 #, c-format
 msgid "inflate returned %d"
 msgstr "xả nén trả v� %d"
 
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:536
 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:523
+#: builtin/index-pack.c:544
 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:531
+#: builtin/index-pack.c:552
 #, c-format
 msgid "unknown object type %d"
 msgstr "không hiểu kiểu đối tượng %d"
 
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:583
 msgid "cannot pread pack file"
 msgstr "không thể chạy hàm pread cho tập tin gói"
 
-#: builtin/index-pack.c:564
+#: 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] "tập tin gói bị kết thúc sớm, thiếu %<PRIuMAX> byte"
 
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:611
 msgid "serious inflate inconsistency"
 msgstr "sự mâu thuẫn xả nén nghiêm tr�ng"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: 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 "SỰ VA CHẠM SHA1 �à XẢY RA VỚI %s!"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: 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 "không thể đ�c %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:823
 #, 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:809
+#: builtin/index-pack.c:831
 #, 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:823
+#: builtin/index-pack.c:845
 #, c-format
 msgid "invalid blob object %s"
 msgstr "đối tượng blob không hợp lệ %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
 msgid "fsck error in packed object"
 msgstr "lỗi fsck trong đối tượng đóng gói"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:869
 #, 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:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
 msgid "failed to apply delta"
 msgstr "gặp lỗi khi áp dụng delta"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Receiving objects"
 msgstr "�ang nhận v� các đối tượng"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Indexing objects"
 msgstr "Các đối tượng bảng mục lục"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1194
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "gói bị sai h�ng (SHA1 không khớp)"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1199
 msgid "cannot fstat packfile"
 msgstr "không thể lấy thông tin thống kê packfile"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1202
 msgid "pack has junk at the end"
 msgstr "pack có phần thừa ở cuối"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1214
 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:1195
+#: builtin/index-pack.c:1237
 msgid "Resolving deltas"
 msgstr "�ang phân giải các delta"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "không thể tạo tuyến: %s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1281
 msgid "confusion beyond insanity"
 msgstr "lộn xộn hơn cả điên rồ"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1287
 #, 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:1264
+#: builtin/index-pack.c:1299
 #, 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:1268
+#: builtin/index-pack.c:1303
 #, 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:1292
+#: builtin/index-pack.c:1327
 #, 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:1388
+#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "đối tượng nội bộ %s bị h�ng"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1444
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "tên tập tin tập tin gói “%s� không được kết thúc bằng đuôi “.pack�"
+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:1427
+#: builtin/index-pack.c:1468
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "không thể ghi %s tập tin “%s�"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1476
 #, 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:1459
+#: builtin/index-pack.c:1502
 msgid "error while closing pack file"
 msgstr "gặp lỗi trong khi đóng tập tin gói"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1516
 msgid "cannot store pack file"
 msgstr "không thể lưu tập tin gói"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1524
 msgid "cannot store index file"
 msgstr "không thể lưu trữ tập tin ghi mục lục"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "sai pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1649
 #, 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:1595
+#: builtin/index-pack.c:1651
 #, 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:1643
+#: builtin/index-pack.c:1699
 #, 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:1650
+#: builtin/index-pack.c:1706
 #, 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:1689
+#: builtin/index-pack.c:1748
 msgid "Cannot come back to cwd"
 msgstr "Không thể quay lại cwd"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: 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 "%s sai"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1831 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:1850
 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:1779
+#: builtin/index-pack.c:1852
 msgid "--stdin requires a git repository"
 msgstr "--stdin cần một kho git"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format không thể được dùng với --stdin"
+
+#: builtin/index-pack.c:1869
 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:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "lỗi fsck trong các đối tượng gói"
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "không thể lấy thông tin thống kê v� mẫu “%s�"
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "không thể opendir() “%s�"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "không thể readlink “%s�"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "không thể tạo liên kết m�m (symlink) “%s� “%s�"
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "không thể sao chép “%s� sang “%s�"
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "đang l� đi mẫu “%s�"
 
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "các mẫu không được tìm thấy trong %s"
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "không sao chép các mẫu từ “%s�: %s"
 
-#: builtin/init-db.c:334
+#: 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: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:337
+#: 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:354 builtin/init-db.c:357
+#: 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:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s đã có từ trước rồi"
 
-#: builtin/init-db.c:413
+#: 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: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:414
+#: 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:418
+#: 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:419
+#: 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:468
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -14331,25 +16774,41 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<thư-mục-tạm>] [--shared[=<các-"
 "quy�n>]] [thư-mục]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "các quy�n"
 
-#: builtin/init-db.c:492
+#: 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:529 builtin/init-db.c:534
+#: 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:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "băm"
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "Các tùy ch�n --separate-git-dir và --bare loại từ lẫn nhau"
+
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "không thể mkdir (tạo thư mục): %s"
 
-#: builtin/init-db.c:538
+#: 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:559
+#: builtin/init-db.c:627
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
@@ -14358,11 +16817,15 @@ 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:587
+#: 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:684
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir xung khắc với kho thuần"
+
 #: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -14411,10 +16874,6 @@ msgstr "đặt các tùy ch�n phân tích cú pháp"
 msgid "do not treat --- specially"
 msgstr "không coi --- là đặc biệt"
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "bộ dò vết"
-
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
 msgstr "bộ dò vết cần thêm"
@@ -14427,121 +16886,130 @@ msgstr "--trailer cùng với --only-input không hợp lý"
 msgid "no input file given for in-place editing"
 msgstr "không đưa ra tập tin đầu vào để sửa tại-chỗ"
 
-#: builtin/log.c:55
+#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<các tùy ch�n>] [<vùng-xem-xét>] [[--] </đư�ng/dẫn>…]"
 
-#: builtin/log.c:56
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [<các tùy ch�n>] <đối-tượng>…"
 
-#: builtin/log.c:109
+#: 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:173
+#: builtin/log.c:180
 msgid "show source"
 msgstr "hiển thị mã nguồn"
 
-#: builtin/log.c:174
-msgid "Use mail map file"
-msgstr "Sử dụng tập tin ánh xạ thư"
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "sử dụng tập tin ánh xạ thư"
 
-#: builtin/log.c:176
+#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr "chỉ tô sáng các tham chiếu khớp với <mẫu>"
 
-#: builtin/log.c:178
+#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr "không tô sáng các tham chiếu khớp với <mẫu>"
 
-#: builtin/log.c:179
+#: builtin/log.c:187
 msgid "decorate options"
 msgstr "các tùy ch�n trang trí"
 
-#: builtin/log.c:182
-msgid "Process line range n,m in file, counting from 1"
-msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr ""
+"theo dõi sự tiến hóa của phạm vi <start><end> dòng, hoặc chức năng:"
+"<funcname> trong <file>"
+
+#: builtin/log.c:213
+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:280
+#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "Kết xuất cuối cùng: %d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: sai tập tin"
 
-#: builtin/log.c:549 builtin/log.c:644
+#: builtin/log.c:586 builtin/log.c:676
 #, c-format
 msgid "could not read object %s"
 msgstr "không thể đ�c đối tượng %s"
 
-#: builtin/log.c:669
+#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr "không nhận ra kiểu: %d"
 
-#: builtin/log.c:792
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s: bao b�c không hợp lệ từ chế độ mô tả"
+
+#: builtin/log.c:853
 msgid "format.headers without value"
 msgstr "format.headers không có giá trị cụ thể"
 
-#: builtin/log.c:909
-msgid "name of output directory is too long"
-msgstr "tên của thư mục kết xuất quá dài"
-
-#: builtin/log.c:925
+#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "không thể mở tập tin miếng vá: %s"
 
-#: builtin/log.c:942
+#: builtin/log.c:999
 msgid "need exactly one range"
 msgstr "cần chính xác một vùng"
 
-#: builtin/log.c:952
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr "không phải là một vùng"
 
-#: builtin/log.c:1075
+#: builtin/log.c:1173
 msgid "cover letter needs email format"
 msgstr "“cover letter� cần cho định dạng thư"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1179
 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:1160
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "in-reply-to điên rồ: %s"
 
-#: builtin/log.c:1187
+#: builtin/log.c:1293
 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:1245
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "hai thư mục kết xuất?"
 
-#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
 #, c-format
 msgid "unknown commit %s"
 msgstr "không hiểu lần chuyển giao %s"
 
-#: builtin/log.c:1366 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 "gặp lỗi khi phân giải “%s� như là một tham chiếu hợp lệ"
 
-#: builtin/log.c:1371
+#: builtin/log.c:1522
 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:1375
+#: 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"
@@ -14552,271 +17020,294 @@ 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:1395
+#: builtin/log.c:1555
 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:1406
+#: builtin/log.c:1572
 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:1410
+#: builtin/log.c:1582
 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:1463
+#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr "không thể lấy mã miếng vá"
 
-#: builtin/log.c:1515
-msgid "failed to infer range-diff ranges"
-msgstr "gặp lỗi khi suy luận range-diff (vùng khác biệt)"
+#: builtin/log.c:1703
+msgid "failed to infer range-diff origin of current series"
+msgstr ""
+"gặp lỗi khi suy luận range-diff (vùng khác biệt) gốc của sê-ri hiện tại"
+
+#: builtin/log.c:1705
+#, 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:1560
+#: builtin/log.c:1749
 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:1563
+#: builtin/log.c:1752
 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:1567
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "hiển thị miếng vá ra đầu ra chuẩn"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr "tạo bì thư"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1760
 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:1572
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "sfx"
 
-#: builtin/log.c:1573
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr "sử dụng <sfx> thay cho “.patch�"
 
-#: builtin/log.c:1575
+#: builtin/log.c:1764
 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:1577
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "đếm reroll"
+
+#: builtin/log.c:1766
 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:1579
-msgid "Use [RFC PATCH] instead of [PATCH]"
-msgstr "Dùng [RFC V�] thay cho [V�]"
+#: builtin/log.c:1768
+msgid "max length of output filename"
+msgstr "chi�u dài tên tập tin đầu ra tối đa"
 
-#: builtin/log.c:1582
-msgid "Use [<prefix>] instead of [PATCH]"
-msgstr "Dùng [<ti�n-tố>] thay cho [V�]"
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "dùng [V� RFC] thay cho [V�]"
+
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr "cover-from-description-mode"
+
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "tạo ra các phần của một lá thư bao gồm dựa trên mô tả của nhánh"
+
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "dùng [<ti�n-tố>] thay cho [V�]"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "lưu các tập tin kết quả trong <t.mục>"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr "không strip/add [V�]"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1785
 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:1593
+#: builtin/log.c:1787
 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:1595
+#: builtin/log.c:1789
 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:1597
+#: builtin/log.c:1791
 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:1599
+#: builtin/log.c:1793
 msgid "Messaging"
 msgstr "L�i nhắn"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1794
 msgid "header"
 msgstr "đầu đ� thư"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "thêm đầu đ� thư"
 
-#: builtin/log.c:1602 builtin/log.c:1604
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "thư điện tử"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "thêm To: đầu đ� thư"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "thêm Cc: đầu đ� thư"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "thụt l�"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1799
 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:1609
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "message-id"
 
-#: builtin/log.c:1610
+#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr "dùng thư đầu tiên để trả l�i <message-id>"
 
-#: builtin/log.c:1611 builtin/log.c:1614
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "ranh giá»›i"
 
-#: builtin/log.c:1612
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "đính kèm miếng vá"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "dùng miếng vá làm nội dung"
 
-#: builtin/log.c:1619
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr "cho phép luồng l�i nhắn, kiểu: “shallow�, “deep�"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "chữ ký"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "thêm chữ ký"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "lần_chuyển_giao_n�n"
 
-#: builtin/log.c:1624
+#: builtin/log.c:1816
 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:1626
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "thêm chữ ký từ một tập tin"
 
-#: builtin/log.c:1627
+#: builtin/log.c:1820
 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:1629
+#: builtin/log.c:1822
 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:1631
+#: builtin/log.c:1824
 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:1634
+#: builtin/log.c:1827
 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:1636
+#: builtin/log.c:1829 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:1711
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
-msgstr "dòng thụt l� không hợp lệ: %s"
+msgstr "dòng định danh không hợp lệ: %s"
 
-#: builtin/log.c:1726
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
-msgstr "-n và  -k loại từ lẫn nhau"
+msgstr "-n và -k loại trừ lẫn nhau"
 
-#: builtin/log.c:1728
+#: builtin/log.c:1933
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc và -k xung khắc nhau"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
 msgstr "--name-only không hợp lý"
 
-#: builtin/log.c:1738
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
 msgstr "--name-status không hợp lý"
 
-#: builtin/log.c:1740
+#: builtin/log.c:1945
 msgid "--check does not make sense"
 msgstr "--check không hợp lý"
 
-#: builtin/log.c:1773
-msgid "standard output, or directory, which one?"
-msgstr "đầu ra chuẩn, hay thư mục, ch�n cái nào?"
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr ""
+"Các tùy ch�n --stdout, --output, và --output-directory loại từ lẫn nhau"
 
-#: builtin/log.c:1877
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff cần --cover-letter hoặc vá đơn"
 
-#: builtin/log.c:1881
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr "Interdiff:"
 
-#: builtin/log.c:1882
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "Interdiff dựa trên v%d:"
 
-#: builtin/log.c:1888
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor yêu cầu --range-diff"
 
-#: builtin/log.c:1892
+#: builtin/log.c:2104
 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:1900
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr "Range-diff:"
 
-#: builtin/log.c:1901
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "Range-diff dựa trên v%d:"
 
-#: builtin/log.c:1912
+#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "không thể đ�c tập tin chữ ký “%s�"
 
-#: builtin/log.c:1948
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "�ang tạo các miếng vá"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2204
 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:2051
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -14824,113 +17315,117 @@ 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:470
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<các tùy ch�n>] [<tập-tin>…]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:619
 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:528
+#: builtin/ls-files.c:621
 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:530
+#: builtin/ls-files.c:623
 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:532
+#: builtin/ls-files.c:625
 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:534
+#: builtin/ls-files.c:627
 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:536
+#: builtin/ls-files.c:629
 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:538
+#: builtin/ls-files.c:631
 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:540
+#: builtin/ls-files.c:633
 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:543
+#: builtin/ls-files.c:636
 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:545
+#: builtin/ls-files.c:638
 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:547
+#: builtin/ls-files.c:640
 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:549
+#: builtin/ls-files.c:642
 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:551
+#: builtin/ls-files.c:644
 msgid "don't show empty directories"
 msgstr "không hiển thị thư mục rỗng"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:647
 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:556
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr "hiển thị thông tin resolve-undo"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:651
 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:561
+#: 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:564
+#: builtin/ls-files.c:657
 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:566
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
 msgstr "thêm loại trừ tiêu chuẩn kiểu git"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:663
 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:573
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
 msgstr "đệ quy xuyên qua mô-đun con"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:668
 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:576
+#: builtin/ls-files.c:669
 msgid "tree-ish"
 msgstr "tree-ish"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:670
 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:579
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr "hiển thị dữ liệu gỡ lỗi"
 
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+msgstr "chặn các mục tin trùng lặp"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -14941,39 +17436,39 @@ msgstr ""
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<kho> [<các tham chiếu>…]]"
 
-#: builtin/ls-remote.c:59
+#: 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:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
 msgid "exec"
 msgstr "thá»±c thi"
 
-#: 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 "đư�ng dẫn của git-upload-pack trên máy chủ"
 
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "giới hạn tới các thẻ"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "giới hạn cho các đầu"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "không hiển thị thẻ bị peel (g�t b�)"
 
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "lấy url.<base>.insteadOf vào trong tài khoản"
 
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "thoát với mã là 2 nếu không tìm thấy tham chiếu nào khớp"
 
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "hiển thị tham chiếu nằm dưới để thêm vào đối tượng được chỉ bởi nó"
 
@@ -15013,198 +17508,349 @@ msgstr "dùng tên đư�ng dẫn đầy đủ"
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "liệt kê cây mục tin; không chỉ thư mục hiện hành (ngụ ý --full-name)"
 
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<các tùy ch�n>] <msg> <patch> < mail >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "giữ lại phần chủ đ�"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr "giữ không dấu ngoặc vá trong chủ đ�"
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr "sao chép Message-ID vào cuối của ghi chú lần chuyển giao"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "mã hóa lại siêu dữ liệu thành i18n.commitEncoding"
+
+#: builtin/mailinfo.c:67
+msgid "disable charset re-coding of metadata"
+msgstr "vô hiệu hóa mã hóa lại bộ ký tự của siêu dữ liệu"
+
+#: builtin/mailinfo.c:69
+msgid "encoding"
+msgstr "bảng mã"
+
+#: builtin/mailinfo.c:70
+msgid "re-code metadata to this encoding"
+msgstr "mã hóa lại siêu dữ liệu vào bảng mã này"
+
+#: builtin/mailinfo.c:72
+msgid "use scissors"
+msgstr "dùng \"scissor\""
+
+#: builtin/mailinfo.c:73
+msgid "<action>"
+msgstr "<hành động>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "hành động khi CR được trích dẫn được tìm thấy"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "sử dụng phần đầu trong nội dung thư"
+
 #: builtin/mailsplit.c:241
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "mbox trống rỗng: “%s�"
 
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<các tùy ch�n>] [<commit>…]"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <lần_chuyển_giao> <lần_chuyển_giao>…"
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <lần_chuyển_giao>…"
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <lần_chuyển_giao>…"
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <commit> <lần_chuyển_giao>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <tham-chiếu> [<lần_chuyển_giao>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "xuất ra tất cả các ông bà, tổ tiên chung"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "tìm tổ tiên của hòa trộn n-way đơn"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "liệt kê các “rev� mà nó không thể đ�c được từ cái khác"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "là cha mẹ đầu tiên của cái khác?"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "tìm xem <commit> được rẽ nhánh ở đâu từ reflog của <th.chiếu>"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<các tùy ch�n>] [-L <tên1> [-L <gốc> [-L <tên2>]]] <tập-"
+"tin1> <tập-tin-gốc> <tập-tin2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "gửi kết quả vào đầu ra tiêu chuẩn"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "dùng kiểu hòa dựa trên diff3"
+
+#: builtin/merge-file.c:37
+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
+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
+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
+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
+msgid "do not warn about conflicts"
+msgstr "không cảnh báo v� các xung đột xảy ra"
 
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/merge-file.c:47
+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"
 
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "không hiểu tùy ch�n %s"
 
-#: builtin/merge.c:118
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "không thể phân tích đối tượng “%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] "không thể xử lý nhi�u hơn %d n�n. B� qua %s."
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "không xử lý gì ngoài hai head hòa trộn."
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "không thể phân giải tham chiếu %s"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "�ang hòa trộn %s với %s\n"
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<các tùy ch�n>] [<commit>…]"
+
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
 msgstr "switch “m� yêu cầu một giá trị"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:146
 #, 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:187
+#: builtin/merge.c:199
 #, 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:188
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr "Các chiến lược sẵn sàng là:"
 
-#: builtin/merge.c:193
+#: builtin/merge.c:205
 #, 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:244 builtin/pull.c:152
+#: builtin/merge.c:256 builtin/pull.c:133
 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:247 builtin/pull.c:155
+#: builtin/merge.c:259 builtin/pull.c:136
 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:248 builtin/pull.c:158
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "(đồng nghĩa với --stat)"
 
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:262 builtin/pull.c:142
 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:253 builtin/pull.c:167
+#: builtin/merge.c:265 builtin/pull.c:148
 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:255 builtin/pull.c:170
+#: builtin/merge.c:267 builtin/pull.c:151
 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:257 builtin/pull.c:173
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "sửa chú thích trước khi chuyển giao"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
 msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
 
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:273 builtin/pull.c:161
 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:265 builtin/pull.c:183
+#: builtin/merge.c:277 builtin/pull.c:164
 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:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:493 builtin/rebase.c:1501 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 "chiến lược"
 
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "chiến lược hòa trộn sẽ dùng"
 
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr "tùy_ch�n=giá_trị"
 
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:281 builtin/pull.c:173
 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:271
+#: builtin/merge.c:283
 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:278
+#: builtin/merge.c:290
 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:280
+#: builtin/merge.c:292
 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:282
+#: builtin/merge.c:294
 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:284 builtin/pull.c:199
+#: builtin/merge.c:296 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "cho phép hòa trộn lịch sử không liên quan"
 
-#: builtin/merge.c:290
+#: builtin/merge.c:303
 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:307
+#: builtin/merge.c:320
 msgid "could not run stash."
 msgstr "không thể chạy stash."
 
-#: builtin/merge.c:312
+#: builtin/merge.c:325
 msgid "stash failed"
 msgstr "lệnh tạm cất gặp lỗi"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:330
 #, 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:339 builtin/merge.c:356
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr "read-tree gặp lỗi"
 
-#: builtin/merge.c:386
-msgid " (nothing to squash)"
-msgstr " (không có gì để squash)"
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
+msgstr "�ã cập nhật rồi. (không có gì để squash)"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "Squash commit -- không cập nhật HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:464
 #, 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:498
+#: builtin/merge.c:515
 #, 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:585
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "Chuá»—i branch.%s.mergeoptions sai: %s"
 
-#: builtin/merge.c:705
+#: builtin/merge.c:729
 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:719
+#: builtin/merge.c:742
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "Không hiểu tùy ch�n cho merge-recursive: -X%s"
 
-#: builtin/merge.c:734
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "không thể ghi %s"
 
-#: builtin/merge.c:786
+#: builtin/merge.c:813
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "Không thể đ�c từ “%s�"
 
-#: builtin/merge.c:795
+#: builtin/merge.c:822
 #, 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:801
+#: 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"
@@ -15216,11 +17862,11 @@ msgstr ""
 "topic.\n"
 "\n"
 
-#: builtin/merge.c:806
+#: builtin/merge.c:833
 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:809
+#: builtin/merge.c:836
 #, c-format
 msgid ""
 "Lines starting with '%c' will be ignored, and an empty message aborts\n"
@@ -15229,75 +17875,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:862
+#: builtin/merge.c:889
 msgid "Empty commit message."
 msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
 
-#: builtin/merge.c:877
+#: builtin/merge.c:904
 #, c-format
 msgid "Wonderful.\n"
 msgstr "Tuyệt v�i.\n"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:965
 #, 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:977
+#: builtin/merge.c:1004
 msgid "No current branch."
 msgstr "Không phải nhánh hiện hành."
 
-#: builtin/merge.c:979
+#: builtin/merge.c:1006
 msgid "No remote for the current branch."
 msgstr "Không có máy chủ cho nhánh hiện hành."
 
-#: builtin/merge.c:981
+#: builtin/merge.c:1008
 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:986
+#: builtin/merge.c:1013
 #, 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:1043
+#: builtin/merge.c:1070
 #, 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:1146
+#: builtin/merge.c:1173
 #, 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:1180
+#: builtin/merge.c:1207
 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:1283
+#: builtin/merge.c:1317
 msgid "--abort expects no arguments"
 msgstr "--abort không nhận các đối số"
 
-#: builtin/merge.c:1287
+#: builtin/merge.c:1321
 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:1296
+#: builtin/merge.c:1339
 msgid "--quit expects no arguments"
 msgstr "--quit không nhận các đối số"
 
-#: builtin/merge.c:1309
+#: builtin/merge.c:1352
 msgid "--continue expects no arguments"
 msgstr "--continue không nhận đối số"
 
-#: builtin/merge.c:1313
+#: builtin/merge.c:1356
 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:1329
+#: builtin/merge.c:1372
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15305,7 +17951,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:1336
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15313,213 +17959,138 @@ 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:1339
+#: builtin/merge.c:1382
 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:1353
+#: builtin/merge.c:1396
 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:1355
+#: builtin/merge.c:1398
 msgid "You cannot combine --squash with --commit."
 msgstr "Bạn không thể kết hợp --squash với --commit."
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1414
 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:1388
+#: builtin/merge.c:1431
 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:1390
+#: builtin/merge.c:1433
 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:1395
+#: builtin/merge.c:1438
 #, 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:1397
+#: builtin/merge.c:1440
 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:1476
+#: builtin/merge.c:1521
 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:1485
-msgid "Already up to date."
-msgstr "�ã cập nhật rồi."
-
-#: builtin/merge.c:1495
+#: builtin/merge.c:1540
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "�ang cập nhật %s..%s\n"
 
-#: builtin/merge.c:1537
+#: builtin/merge.c:1587
 #, 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:1544
+#: builtin/merge.c:1594
 #, c-format
 msgid "Nope.\n"
 msgstr "Không.\n"
 
-#: builtin/merge.c:1569
-msgid "Already up to date. Yeeah!"
-msgstr "�ã cập nhật rồi. Yeeah!"
-
-#: builtin/merge.c:1575
+#: builtin/merge.c:1625
 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:1598 builtin/merge.c:1663
+#: builtin/merge.c:1653 builtin/merge.c:1719
 #, 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:1602
+#: builtin/merge.c:1657
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�ang thử chiến lược hòa trộn %s…\n"
 
-#: builtin/merge.c:1654
+#: builtin/merge.c:1709
 #, 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:1656
+#: builtin/merge.c:1711
 #, 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:1665
+#: builtin/merge.c:1721
 #, 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:1677
+#: builtin/merge.c:1735
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr ""
 "Hòa trộn tự động đã trở nên tốt; bị dừng trước khi việc chuyển giao được yêu "
 "cầu\n"
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <lần_chuyển_giao> <lần_chuyển_giao>…"
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
 
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <lần_chuyển_giao>…"
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <lần_chuyển_giao>…"
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <commit> <lần_chuyển_giao>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <tham-chiếu> [<lần_chuyển_giao>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "xuất ra tất cả các ông bà, tổ tiên chung"
-
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "tìm tổ tiên của hòa trộn n-way đơn"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "liệt kê các “rev� mà nó không thể đ�c được từ cái khác"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "là cha mẹ đầu tiên của cái khác?"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "tìm xem <commit> được rẽ nhánh ở đâu từ reflog của <th.chiếu>"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-"git merge-file [<các tùy ch�n>] [-L <tên1> [-L <gốc> [-L <tên2>]]] <tập-"
-"tin1> <tập-tin-gốc> <tập-tin2>"
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr "gửi kết quả vào đầu ra tiêu chuẩn"
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "dùng kiểu hòa dựa trên diff3"
-
-#: builtin/merge-file.c:37
-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
-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
-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
-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
-msgid "do not warn about conflicts"
-msgstr "không cảnh báo v� các xung đột xảy ra"
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "cảnh báo: đầu vào thẻ không qua kiểm tra fsck: %s"
 
-#: builtin/merge-file.c:47
-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"
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "lỗi: đầu vào thẻ không vượt qua fsck: %s"
 
-#: builtin/merge-recursive.c:47
+#: builtin/mktag.c:41
 #, c-format
-msgid "unknown option %s"
-msgstr "không hiểu tùy ch�n %s"
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) không bao gi� nên kích hoạt cuộc g�i ngược này"
 
-#: builtin/merge-recursive.c:53
+#: builtin/mktag.c:56
 #, c-format
-msgid "could not parse object '%s'"
-msgstr "không thể phân tích đối tượng “%s�"
+msgid "could not read tagged object '%s'"
+msgstr "không thể đ�c đối tượng được đánh thẻ %s"
 
-#: builtin/merge-recursive.c:57
+#: builtin/mktag.c:59
 #, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "không thể xử lý nhi�u hơn %d n�n. B� qua %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/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr "không xử lý gì ngoài hai head hòa trộn."
+#: builtin/mktag.c:97
+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/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "không thể phân giải tham chiếu %s"
+#: builtin/mktag.c:100
+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/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "�ang hòa trộn %s với %s\n"
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "không thể ghi vào tập tin lưu thẻ"
 
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
@@ -15537,19 +18108,35 @@ msgstr "cho phép thiếu đối tượng"
 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:9
-msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
-msgstr ""
-"git multi-pack-index [--object-dir=<thư/mục>] (write|verify|expire|repack --"
-"batch-size=<cỡ>)"
+#: 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ỡ>]"
+
+#: builtin/multi-pack-index.c:13
+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
+msgid "git multi-pack-index [<options>] expire"
+msgstr "git multi-pack-index [<các tùy ch�n>] expire"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:19
+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
 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:25
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr "preferred-pack"
+
+#: builtin/multi-pack-index.c:70
+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
 msgid ""
 "during repack, collect pack-files of smaller size into a batch that is "
 "larger than this size"
@@ -15557,15 +18144,7 @@ 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:43 builtin/prune-packed.c:67
-msgid "too many arguments"
-msgstr "có quá nhi�u đối số"
-
-#: builtin/multi-pack-index.c:52
-msgid "--batch-size option is only for 'repack' subcommand"
-msgstr "tùy ch�n --batch-size chỉ cho lệnh con 'repack'"
-
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:179
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "không hiểu câu lệnh con: %s"
@@ -15597,114 +18176,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:169
+#: builtin/mv.c:170
 #, 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:180
+#: builtin/mv.c:181
 #, 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:184
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr "nguồn sai"
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 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:190
+#: builtin/mv.c:191
 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:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr "thư mục nguồn là trống rỗng"
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 msgid "not under version control"
 msgstr "không nằm dưới sự quản lý mã nguồn"
 
 #: builtin/mv.c:227
+msgid "conflicted"
+msgstr "bị xung đột"
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "đích đã tồn tại sẵn rồi"
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "đang ghi đè lên “%s�"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "Không thể ghi đè"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr "nhi�u nguồn cho cùng một đích"
 
-#: builtin/mv.c:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "thư mục đích không tồn tại"
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s, nguồn=%s, đích=%s"
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�ổi tên %s thành %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "gặp lỗi khi đổi tên “%s�"
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<các tùy ch�n>] <commit>…"
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<các tùy ch�n>] --all"
 
-#: builtin/name-rev.c:358
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<các tùy ch�n>] --stdin"
 
-#: builtin/name-rev.c:415
-msgid "print only names (no SHA-1)"
-msgstr "chỉ hiển thị tên (không SHA-1)"
+#: builtin/name-rev.c:524
+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:416
+#: builtin/name-rev.c:525
 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:418
+#: builtin/name-rev.c:527
 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:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "b� qua các tham chiếu khớp với <mẫu>"
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 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:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "đ�c từ đầu vào tiêu chuẩn"
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 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:430
+#: builtin/name-rev.c:539
 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ộ)"
 
@@ -15850,7 +18433,7 @@ msgstr "không thể ghi đối tượng ghi chú (note)"
 msgid "the note contents have been left in %s"
 msgstr "nội dung ghi chú còn lại %s"
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:576
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "không thể mở hay đ�c “%s�"
@@ -15893,8 +18476,9 @@ 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
-msgid "too many parameters"
-msgstr "quá nhi�u đối số"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
+msgstr "có quá nhi�u đối số"
 
 #: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
@@ -15953,7 +18537,7 @@ 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
-msgid "too few parameters"
+msgid "too few arguments"
 msgstr "quá ít đối số"
 
 #: builtin/notes.c:538
@@ -16084,7 +18668,7 @@ 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:545
+#: builtin/notes.c:897 builtin/tag.c:589
 #, 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ệ."
@@ -16102,7 +18686,7 @@ msgstr "cố gắng gỡ b� một note chưa từng tồn tại không phải
 msgid "read object names from the standard input"
 msgstr "đ�c tên đối tượng từ thiết bị nhập chuẩn"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "không gỡ b�, chỉ hiển thị"
 
@@ -16118,145 +18702,163 @@ msgstr "notes-ref"
 msgid "use notes from <notes-ref>"
 msgstr "dùng “notes� từ <notes-ref>"
 
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1735
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "không hiểu câu lệnh con: %s"
 
-#: builtin/pack-objects.c:52
+#: 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:53
+#: 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:428
+#: 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: không thể phân bổ %s, cần tại vị trí bù %<PRIuMAX> trong "
+"gói %s"
+
+#: 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:439
+#: 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:570
+#: 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:781
+#: 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:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "tập tin gói không hợp lệ: %s"
-
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:1036
 #, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "không thể mở tập tin gói để dùng lại: %s"
-
-#: builtin/pack-objects.c:802
-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"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "không thể đ�c từ tập tin gói dùng lại"
+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:841
+#: builtin/pack-objects.c:1155
 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:854
+#: builtin/pack-objects.c:1168
 msgid "Writing objects"
 msgstr "�ang ghi lại các đối tượng"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1229 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:970
+#: builtin/pack-objects.c:1281
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "đã ghi %<PRIu32> đối tượng trong khi cần %<PRIu32>"
 
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1523
 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:1592
+#: builtin/pack-objects.c:1971
 #, 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:1601
+#: builtin/pack-objects.c:1980
 #, 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:1870
+#: builtin/pack-objects.c:2261
 msgid "Counting objects"
 msgstr "�ang đếm các đối tượng"
 
-#: builtin/pack-objects.c:2000
-#, c-format
-msgid "unable to get size of %s"
-msgstr "không thể lấy kích cỡ của %s"
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c:2426
 #, 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:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
 #, c-format
 msgid "object %s cannot be read"
 msgstr "không thể đ�c đối tượng %s"
 
-#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
 #, 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:2125
+#: builtin/pack-objects.c:2536
 msgid "suboptimal pack - out of memory"
 msgstr "suboptimal pack - hết bộ nhớ"
 
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2851
 #, 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:2572
+#: builtin/pack-objects.c:2990
 #, 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:2659
+#: builtin/pack-objects.c:3076
 msgid "Compressing objects"
 msgstr "�ang nén các đối tượng"
 
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:3082
 msgid "inconsistency with delta count"
 msgstr "mâu thuẫn với số lượng delta"
 
-#: builtin/pack-objects.c:2742
+#: 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 ""
+"giá trị của uploadpack.blobpackfileuri phải có dạng “<object-hash> <pack-"
+"hash> <uri>� (nhận “%s�)"
+
+#: builtin/pack-objects.c:3164
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr ""
+"đối tượng đã được cấu hình trong một uploadpack.blobpackfileuri khác (đã "
+"nhận “%s�)"
+
+#: builtin/pack-objects.c:3199
+#, 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:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "không thể tìm thấy gói “%s�"
+
+#: builtin/pack-objects.c:3378
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16265,7 +18867,7 @@ msgstr ""
 "cần ID đối tượng cạnh, nhận được rác:\n"
 " %s"
 
-#: builtin/pack-objects.c:2748
+#: builtin/pack-objects.c:3384
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16274,247 +18876,269 @@ msgstr ""
 "cần ID đối tượng, nhận được rác:\n"
 " %s"
 
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:3482
 msgid "invalid value for --missing"
 msgstr "giá trị cho --missing không hợp lệ"
 
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
 msgid "cannot open pack index"
 msgstr "không thể mở mục lục của gói"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3572
 #, 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:3021
+#: builtin/pack-objects.c:3658
 msgid "unable to force loose object"
 msgstr "không thể buộc mất đối tượng"
 
-#: builtin/pack-objects.c:3113
+#: builtin/pack-objects.c:3788
 #, c-format
 msgid "not a rev '%s'"
 msgstr "không phải một rev “%s�"
 
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "điểm xem xét sai “%s�"
 
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3819
 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:3194
+#: builtin/pack-objects.c:3872
 #, 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:3198
+#: builtin/pack-objects.c:3876
 #, c-format
 msgid "bad index version '%s'"
 msgstr "phiên bản mục lục sai “%s�"
 
-#: builtin/pack-objects.c:3228
-msgid "do not show progress meter"
-msgstr "không hiển thị bộ đo tiến trình"
-
-#: builtin/pack-objects.c:3230
-msgid "show progress meter"
-msgstr "hiển thị bộ đo tiến trình"
-
-#: builtin/pack-objects.c:3232
-msgid "show progress meter during object writing phase"
-msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
-
-#: builtin/pack-objects.c:3235
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
-
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3915
 msgid "<version>[,<offset>]"
 msgstr "<phiên bản>[,offset]"
 
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3916
 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:3240
+#: builtin/pack-objects.c:3919
 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:3242
+#: builtin/pack-objects.c:3921
 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:3244
+#: builtin/pack-objects.c:3923
 msgid "ignore packed objects"
 msgstr "b� qua các đối tượng đóng gói"
 
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3925
 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:3248
+#: builtin/pack-objects.c:3927
 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:3250
+#: builtin/pack-objects.c:3929
 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:3252
+#: builtin/pack-objects.c:3931
 msgid "reuse existing deltas"
 msgstr "dùng lại các delta sẵn có"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3933
 msgid "reuse existing objects"
 msgstr "dùng lại các đối tượng sẵn có"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3935
 msgid "use OFS_DELTA objects"
 msgstr "dùng các đối tượng OFS_DELTA"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3937
 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:3260
+#: builtin/pack-objects.c:3939
 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:3262
+#: builtin/pack-objects.c:3941
 msgid "read revision arguments from standard input"
 msgstr "đ�c tham số “revision� từ thiết bị nhập chuẩn"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3943
 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:3267
+#: builtin/pack-objects.c:3946
 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:3270
+#: builtin/pack-objects.c:3949
 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:3273
+#: builtin/pack-objects.c:3952
 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:3276
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr "đ�c các gói từ đầu vào tiêu chuẩn"
+
+#: builtin/pack-objects.c:3957
 msgid "output pack to stdout"
 msgstr "xuất gói ra đầu ra tiêu chuẩn"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3959
 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:3280
+#: builtin/pack-objects.c:3961
 msgid "keep unreachable objects"
 msgstr "giữ lại các đối tượng không thể đ�c được"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3963
 msgid "pack loose unreachable objects"
 msgstr "pack mất các đối tượng không thể đ�c được"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3965
 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:3287
+#: builtin/pack-objects.c:3968
 msgid "use the sparse reachability algorithm"
 msgstr "sử dụng thuật toán “sparse reachability�"
 
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3970
 msgid "create thin packs"
 msgstr "tạo gói nhẹ"
 
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3972
 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:3293
+#: builtin/pack-objects.c:3974
 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:3295
+#: builtin/pack-objects.c:3976
 msgid "ignore this pack"
 msgstr "b� qua gói này"
 
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3978
 msgid "pack compression level"
 msgstr "mức nén gói"
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3980
 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:3301
+#: builtin/pack-objects.c:3982
 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:3303
+#: builtin/pack-objects.c:3984
 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:3307
+#: builtin/pack-objects.c:3988
 msgid "write a bitmap index if possible"
 msgstr "ghi mục lục ánh xạ nếu được"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3992
 msgid "handling for missing objects"
 msgstr "xử lý cho thiếu đối tượng"
 
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3995
 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:3316
+#: builtin/pack-objects.c:3997
 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:3345
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr "giao thức"
+
+#: builtin/pack-objects.c:4000
+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:4033
 #, 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:3350
+#: builtin/pack-objects.c:4038
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "pack.deltaCacheLimit là quá cao, ép dùng %d"
 
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:4094
 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:3406
+#: builtin/pack-objects.c:4096
 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:3411
+#: builtin/pack-objects.c:4101
 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:3414
+#: builtin/pack-objects.c:4104
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable và --unpack-unreachable xung khắc nhau"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:4110
 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:3481
+#: builtin/pack-objects.c:4112
+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:4116
+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:4175
 msgid "Enumerating objects"
 msgstr "�ánh số các đối tượng"
 
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:4212
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
-msgstr "Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>)"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"Tổng %<PRIu32> (delta %<PRIu32>), dùng lại %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+
+#: 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 ""
+"'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"
+"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"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16528,81 +19152,77 @@ msgstr "đóng gói m�i thứ"
 msgid "prune loose refs (default)"
 msgstr "prune (cắt cụt) những tham chiếu bị mất (mặc định)"
 
-#: builtin/prune-packed.c:9
+#: 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-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "�ang gỡ các đối tượng trùng lặp"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <th�i-gian>] [--] [<head>…]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "báo cáo các đối tượng đã prune"
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 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:136
+#: builtin/prune.c:138
 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:150
+#: builtin/prune.c:152
 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"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "Giá trị không hợp lệ %s: %s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<các tùy ch�n>] [<kho-chứa> [<refspec>…]]"
 
-#: builtin/pull.c:142
+#: builtin/pull.c:123
 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:146
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "Các tùy ch�n liên quan đến hòa trộn"
 
-#: builtin/pull.c:149
+#: builtin/pull.c:130
 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:177 builtin/rebase.c:448 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "cho phép chuyển-tiếp-nhanh"
 
-#: builtin/pull.c:186
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)"
+#: builtin/pull.c:167 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:202
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "Các tùy ch�n liên quan đến lệnh lấy v�"
 
-#: builtin/pull.c:212
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "ép buộc ghi đè lên nhánh nội bộ"
 
-#: builtin/pull.c:220
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "số lượng mô-đun-con được đẩy lên đồng th�i"
 
-#: builtin/pull.c:320
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "Giá trị không hợp lệ cho pull.ff: %s"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
@@ -16610,14 +19230,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:439
+#: builtin/pull.c:447
 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:440
+#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
@@ -16626,7 +19246,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:443
+#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16638,43 +19258,42 @@ 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:448 builtin/rebase.c:1347 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1248
 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:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
 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:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
 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:453 builtin/pull.c:468
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
 msgstr "Xem git-pull(1) để biết thêm chi tiết."
 
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1353 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr "<máy chủ>"
 
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "<nhánh>"
 
-#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1246
 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:472 git-parse-remote.sh:95
+#: builtin/pull.c:480
 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:477
+#: builtin/pull.c:485
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16683,34 +19302,63 @@ 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:587
+#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr "không thể truy cập lần chuyển giao “%s�"
 
-#: builtin/pull.c:867
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "b� qua --verify-signatures khi rebase"
 
-#: builtin/pull.c:922
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "tùy ch�n --[no-]autostash chỉ hợp lệ khi dùng với --rebase."
-
 #: builtin/pull.c: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 ""
+"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"
+"\n"
+"  git config pull.rebase false  # merge (chiến lược mặc định)\n"
+"  git config pull.rebase true   # rebase\n"
+"  git config pull.ff only       # fast-forward only\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"
+"lần g�i.\n"
+
+#: builtin/pull.c:990
 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:934
+#: builtin/pull.c:994
 msgid "pull with rebase"
 msgstr "pull vá»›i rebase"
 
-#: builtin/pull.c:935
+#: builtin/pull.c:995
 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:960
+#: builtin/pull.c:1020
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16721,7 +19369,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:966
+#: builtin/pull.c:1026
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16739,15 +19387,15 @@ msgstr ""
 "$ git reset --hard\n"
 "để khôi phục lại."
 
-#: builtin/pull.c:981
+#: builtin/pull.c:1041
 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:985
+#: builtin/pull.c:1045
 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:992
+#: builtin/pull.c:1065
 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ộ"
@@ -16760,11 +19408,11 @@ msgstr "git push [<các tùy ch�n>] [<kho-chứa> [<refspec>…]]"
 msgid "tag shorthand without <tag>"
 msgstr "dùng tốc ký thẻ không có <thẻ>"
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete chỉ chấp nhận các tên tham chiếu dạng thư�ng"
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16773,7 +19421,7 @@ msgstr ""
 "�ể ch�n mỗi tùy ch�n một cách cố định, xem push.default trong “git help "
 "config�."
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16798,7 +19446,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16813,7 +19461,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<tên-của-nhánh-máy-chủ>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16827,12 +19475,19 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: 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:210
+#: 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"
@@ -16844,14 +19499,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:269
-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:276
+#: 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"
@@ -16864,7 +19512,7 @@ msgstr ""
 "Xem “Note about fast-forwards� trong “git push --help� để có thông tin chi "
 "tiết."
 
-#: builtin/push.c:282
+#: 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"
@@ -16878,7 +19526,7 @@ msgstr ""
 "Xem “Note about fast-forwards� trong “git push --help� để có thông tin chi "
 "tiết."
 
-#: builtin/push.c:288
+#: 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"
@@ -16893,11 +19541,11 @@ msgstr ""
 "Xem “Note about fast-forwards� trong “git push --help� để có thông tin chi "
 "tiết."
 
-#: builtin/push.c:295
+#: 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:298
+#: 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"
@@ -16909,99 +19557,115 @@ 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:359
+#: 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 ""
+"Việc cập nhật bị từ chối bởi vì đầu mút của nhánh theo dõi máy chủ\n"
+"đã được cập nhật kể từ sau lần lấy ra cuối cùng. Bạn có lẽ muốn\n"
+"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:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "�ang đẩy lên %s\n"
 
-#: builtin/push.c:366
+#: 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:541
+#: builtin/push.c:544
 msgid "repository"
 msgstr "kho"
 
-#: builtin/push.c:542 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "đẩy tất cả các tham chiếu"
 
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "mirror tất cả các tham chiếu"
 
-#: builtin/push.c:545
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "xóa các tham chiếu"
 
-#: builtin/push.c:546
+#: 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:549 builtin/send-pack.c:167
+#: builtin/push.c:552 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "ép buộc cập nhật"
 
-#: builtin/push.c:551 builtin/send-pack.c:181
+#: builtin/push.c:553 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
 msgstr "<tên-tham-chiếu>:<cần>"
 
-#: builtin/push.c:552 builtin/send-pack.c:182
+#: builtin/push.c:554 builtin/send-pack.c:205
 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:555
+#: builtin/push.c:557 builtin/send-pack.c:208
+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: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:557 builtin/send-pack.c:175
+#: builtin/push.c:561 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "tạo gói nhẹ"
 
-#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr "chương trình nhận gói"
 
-#: builtin/push.c:560
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "đặt thượng nguồn cho git pull/status"
 
-#: builtin/push.c:563
+#: 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:565
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "vòng qua móc ti�n-đẩy (pre-push)"
 
-#: builtin/push.c:566
+#: 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:569 builtin/send-pack.c:169
+#: builtin/push.c:572 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "ký lần đẩy dùng GPG"
 
-#: builtin/push.c:571 builtin/send-pack.c:176
+#: builtin/push.c:574 builtin/send-pack.c:200
 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:589
+#: builtin/push.c:592
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete là xung khắc với các tùy ch�n --all, --mirror và --tags"
 
-#: builtin/push.c:591
+#: 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:611
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "repository (kho) sai “%s�"
 
-#: builtin/push.c:612
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -17022,61 +19686,73 @@ msgstr ""
 "\n"
 "    git push <tên>\n"
 
-#: builtin/push.c:627
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
 msgstr "--all và --tags xung khắc nhau"
 
-#: builtin/push.c:629
+#: 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:633
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror và --tags xung khắc nhau"
 
-#: builtin/push.c:635
+#: 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:638
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
 msgstr "--all và --mirror xung khắc nhau"
 
-#: builtin/push.c:642
+#: 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"
 
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr ""
 "git range-diff [<các tùy ch�n>] <old-base>..<old-tip> <new-base>..<new-tip>"
 
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<các tùy ch�n>] <old-tip>…<new-tip>"
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<các tùy ch�n>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c:21
-msgid "Percentage by which creation is weighted"
-msgstr "Tỷ lệ phần trăm cái tạo là weighted"
-
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "dùng màu diff đơn giản"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "ghi chú"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "chuyển cho “git log�"
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "chỉ phát ra kết xuất liên quan đến vùng đầu tiên"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "chỉ phát ra kết xuất liên quan đến vùng thứ hai"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
-msgid "no .. in range: '%s'"
-msgstr "không có .. trong vùng: “%s�"
+msgid "not a commit range: '%s'"
+msgstr "không phải là vùng chuyển giao: “%s�"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "định dạng đối số đơn phải là một vùng đối xứng"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "cần hai vùng lần chuyển giao"
 
@@ -17160,7 +19836,11 @@ msgstr "gỡ lỗi “unpack-trees�"
 msgid "suppress feedback messages"
 msgstr "không xuất các thông tin phản hồi"
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+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/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
@@ -17168,227 +19848,204 @@ msgstr ""
 "git rebase [-i] [các tùy ch�n] [--exec <lệnh>] [--onto <newbase> | --keep-"
 "base] [<upstream>] [<nhánh>]]"
 
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [các tùy ch�n] [--exec <lệnh>] [--onto <newbase>] --root "
 "[<nhánh>]"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: 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:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "không thể ghi “%s�."
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "không HEAD?"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:311
 #, c-format
 msgid "could not create temporary %s"
 msgstr "không thể tạo %s tạm th�i"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:317
 msgid "could not mark as interactive"
 msgstr "không thể đánh dấu là tương tác"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:370
 msgid "could not generate todo list"
 msgstr "không thể tạo danh sách cần làm"
 
-#: builtin/rebase.c:383
+#: builtin/rebase.c:412
 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:438
+#: builtin/rebase.c:481
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<các tùy ch�n>]"
 
-#: builtin/rebase.c:450
-msgid "keep empty commits"
-msgstr "giữ lại các lần chuyển giao rỗng"
+#: 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:452 builtin/revert.c:128
+#: 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:453
+#: 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:455
+#: 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:457
+#: 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:458
+#: builtin/rebase.c:505
 msgid "sign commits"
 msgstr "ký các lần chuyển giao"
 
-#: builtin/rebase.c:460 builtin/rebase.c:1427
+#: 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:462
+#: builtin/rebase.c:509
 msgid "continue rebase"
 msgstr "tiếp tục cải tổ"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:511
 msgid "skip commit"
 msgstr "b� qua lần chuyển giao"
 
-#: builtin/rebase.c:465
+#: builtin/rebase.c:512
 msgid "edit the todo list"
 msgstr "sửa danh sách cần làm"
 
-#: builtin/rebase.c:467
+#: builtin/rebase.c:514
 msgid "show the current patch"
 msgstr "hiển thị miếng vá hiện hành"
 
-#: builtin/rebase.c:470
+#: 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:472
+#: 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:474
+#: builtin/rebase.c:521
 msgid "check the todo list"
 msgstr "kiểm tra danh sách cần làm"
 
-#: builtin/rebase.c:476
+#: 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:478
+#: 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:479
+#: builtin/rebase.c:526
 msgid "onto"
 msgstr "lên trên"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict-revision"
 msgstr "điểm-xét-duyệt-hạn-chế"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict revision"
 msgstr "điểm xét duyệt hạn chế"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:531
 msgid "squash-onto"
 msgstr "squash-lên-trên"
 
-#: builtin/rebase.c:485
+#: builtin/rebase.c:532
 msgid "squash onto"
 msgstr "squash lên trên"
 
-#: builtin/rebase.c:487
+#: builtin/rebase.c:534
 msgid "the upstream commit"
 msgstr "lần chuyển giao thượng nguồn"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head-name"
 msgstr "tên-đầu"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head name"
 msgstr "tên đầu"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:541
 msgid "rebase strategy"
 msgstr "chiến lược cải tổ"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:542
 msgid "strategy-opts"
 msgstr "tùy-ch�n-chiến-lược"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:543
 msgid "strategy options"
 msgstr "các tùy ch�n chiến lược"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:544
 msgid "switch-to"
 msgstr "chuyển-đến"
 
-#: builtin/rebase.c:498
+#: 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:499
+#: builtin/rebase.c:546
 msgid "onto-name"
 msgstr "onto-name"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto name"
 msgstr "tên lên trên"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "cmd"
 msgstr "lệnh"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "the command to run"
 msgstr "lệnh muốn chạy"
 
-#: builtin/rebase.c:503 builtin/rebase.c:1510
+#: 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:519
+#: 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:535
+#: builtin/rebase.c:582
 #, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s cần một cải tổ kiểu tương tác"
+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:587
+#: builtin/rebase.c:625
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "không thể đặt lấy “onto�: “%s�"
 
-#: builtin/rebase.c:602
+#: builtin/rebase.c:642
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "orig-head không hợp lệ: “%s�"
 
-#: builtin/rebase.c:627
+#: builtin/rebase.c:667
 #, 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:703
-#, c-format
-msgid "Could not read '%s'"
-msgstr "Không thể đ�c “%s�"
-
-#: builtin/rebase.c:721
-#, c-format
-msgid "Cannot store %s"
-msgstr "Không thể lưu “%s�"
-
-#: builtin/rebase.c:828
-msgid "could not determine HEAD revision"
-msgstr "không thể dò tìm điểm xét duyệt HEAD"
-
-#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
+#: 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"
@@ -17403,7 +20060,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:1032
+#: builtin/rebase.c:896
 #, c-format
 msgid ""
 "\n"
@@ -17422,7 +20079,16 @@ msgstr ""
 "\n"
 "Kết quả là git không thể cải tổ lại chúng."
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1222
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+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
 #, c-format
 msgid ""
 "%s\n"
@@ -17439,7 +20105,7 @@ msgstr ""
 "    git rebase “<nhánh>�\n"
 "\n"
 
-#: builtin/rebase.c:1355
+#: builtin/rebase.c:1256
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17453,175 +20119,188 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<nhánh> %s\n"
 "\n"
 
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1286
 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:1389
+#: builtin/rebase.c:1290
 msgid "empty exec command"
 msgstr "lệnh thực thi trống rỗng"
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1319
 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:1420
+#: builtin/rebase.c:1321
 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:1422
+#: builtin/rebase.c:1323
 msgid "allow pre-rebase hook to run"
 msgstr "cho phép móc (hook) pre-rebase được chạy"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1325
 msgid "be quiet. implies --no-stat"
 msgstr "hãy im lặng. ý là --no-stat"
 
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1331
 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:1433
-msgid "add a Signed-off-by: line to each commit"
-msgstr "thêm dòng Signed-off-by: cho từng lần chuyển giao"
+#: builtin/rebase.c:1334
+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
+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:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
-msgid "passed to 'git am'"
-msgstr "chuyển cho “git am�"
+#: builtin/rebase.c:1339
+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
+msgid "synonym of --reset-author-date"
+msgstr "đồng nghĩa với --reset-author-date"
 
-#: builtin/rebase.c:1443 builtin/rebase.c:1445
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
 msgid "passed to 'git apply'"
 msgstr "chuyển cho “git apply�"
 
-#: builtin/rebase.c:1447 builtin/rebase.c:1450
+#: builtin/rebase.c:1345
+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
 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:1452
+#: builtin/rebase.c:1354
 msgid "continue"
 msgstr "tiếp tục"
 
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1357
 msgid "skip current patch and continue"
 msgstr "b� qua miếng vá hiện hành và tiếp tục"
 
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1359
 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:1460
+#: builtin/rebase.c:1362
 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:1461
+#: builtin/rebase.c:1363
 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:1464
+#: builtin/rebase.c:1366
 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:1467
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "dùng chiến lược áp dụng để cải tổ"
+
+#: builtin/rebase.c:1373
 msgid "use merging strategies to rebase"
 msgstr "dùng chiến lược hòa trộn để cải tổ"
 
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1377
 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:1475
+#: builtin/rebase.c:1381
 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:1479
-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ổ"
+#: builtin/rebase.c:1386
+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:1481
+#: builtin/rebase.c:1393
 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:1487
-msgid "automatically stash/stash pop before and after"
-msgstr "tự động stash/stash pop trước và sau"
-
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1400
 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:1493
+#: builtin/rebase.c:1404
 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:1496
+#: builtin/rebase.c:1408
 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:1499
+#: builtin/rebase.c:1411
 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:1501
+#: builtin/rebase.c:1413
 msgid "use the given merge strategy"
 msgstr "dùng chiến lược hòa trộn đã cho"
 
-#: builtin/rebase.c:1503 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
 msgid "option"
 msgstr "tùy ch�n"
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1416
 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:1507
+#: builtin/rebase.c:1419
 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:1524
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
+#: builtin/rebase.c:1424
+msgid "apply all changes, even those already present upstream"
 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."
+"áp dụng m�i thay đổi, ngay cả khi những thứ đó đã sẵn có ở thượng nguồn"
 
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1442
 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."
+"Hình như đang trong quá trình thực hiện lệnh “git am�. Không thể rebase."
 
-#: builtin/rebase.c:1571
+#: 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:1576
+#: 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:1578
+#: builtin/rebase.c:1490
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr "không thể kết hợp “--keep-base� với “--root�"
 
-#: builtin/rebase.c:1582
+#: 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:1497
 msgid "No rebase in progress?"
 msgstr "Không có tiến trình rebase nào phải không?"
 
-#: builtin/rebase.c:1586
+#: builtin/rebase.c:1501
 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:1609
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "Không thể đ�c HEAD"
 
-#: builtin/rebase.c:1621
+#: builtin/rebase.c:1536
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17629,16 +20308,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:1640
+#: builtin/rebase.c:1555
 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:1659
+#: builtin/rebase.c:1574
 #, c-format
 msgid "could not move back to %s"
 msgstr "không thể quay trở lại %s"
 
-#: builtin/rebase.c:1704
+#: builtin/rebase.c:1620
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17659,165 +20338,141 @@ 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:1725
+#: builtin/rebase.c:1648
 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:1766
+#: builtin/rebase.c:1690
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "Không hiểu chế độ: %s"
 
-#: builtin/rebase.c:1788
+#: builtin/rebase.c:1729
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy cần --merge hay --interactive"
 
-#: builtin/rebase.c:1828
+#: 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:1772
+#, 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
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec cần --exec hay --interactive"
 
-#: builtin/rebase.c:1840
-msgid "cannot combine am options with either interactive or merge options"
-msgstr ""
-"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"
-
-#: builtin/rebase.c:1859
+#: 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:1863
+#: 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:1887
+#: builtin/rebase.c:1850
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "thượng nguồn không hợp lệ “%s�"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1856
 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:1919
+#: builtin/rebase.c:1882
 #, 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:1922
+#: builtin/rebase.c:1885
 #, 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:1930
+#: builtin/rebase.c:1893
 #, 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:1955
+#: builtin/rebase.c:1921
 #, 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ế"
 
-#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
 #, c-format
 msgid "No such ref: %s"
 msgstr "Không có tham chiếu nào như thế: %s"
 
-#: builtin/rebase.c:1974
+#: builtin/rebase.c:1940
 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:2012
-msgid "Cannot autostash"
-msgstr "Không thể autostash"
-
-#: builtin/rebase.c:2015
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "Gặp đáp ứng stash không cần: “%s�"
-
-#: builtin/rebase.c:2021
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "Không thể tạo thư mục cho “%s�"
-
-#: builtin/rebase.c:2024
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "�ã tạo autostash: %s\n"
-
-#: builtin/rebase.c:2027
-msgid "could not reset --hard"
-msgstr "không thể reset --hard"
-
-#: builtin/rebase.c:2036
+#: builtin/rebase.c:1961
 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:2063
-#, c-format
-msgid "could not parse '%s'"
-msgstr "không thể phân tích cú pháp “%s�"
-
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:1997
 #, c-format
 msgid "could not switch to %s"
 msgstr "không thể chuyển đến %s"
 
-#: builtin/rebase.c:2087
+#: builtin/rebase.c:2008
 msgid "HEAD is up to date."
 msgstr "HEAD đã cập nhật."
 
-#: builtin/rebase.c:2089
+#: builtin/rebase.c:2010
 #, 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:2097
+#: builtin/rebase.c:2018
 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:2099
+#: builtin/rebase.c:2020
 #, 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:2107
+#: builtin/rebase.c:2028
 msgid "The pre-rebase hook refused to rebase."
 msgstr "Móc (hook) pre-rebase từ chối rebase."
 
-#: builtin/rebase.c:2114
+#: builtin/rebase.c:2035
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "Thay đổi thành %s:\n"
 
-#: builtin/rebase.c:2117
+#: builtin/rebase.c:2038
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "Thay đổi từ %s thành %s:\n"
 
-#: builtin/rebase.c:2142
+#: builtin/rebase.c:2063
 #, 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:2151
+#: builtin/rebase.c:2072
 msgid "Could not detach HEAD"
 msgstr "Không thể tách r�i HEAD"
 
-#: builtin/rebase.c:2160
+#: builtin/rebase.c:2081
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "Chuyển-tiếp-nhanh %s đến %s.\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <thư-mục-git>"
 
-#: builtin/receive-pack.c:830
+#: 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"
@@ -17847,7 +20502,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:850
+#: 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"
@@ -17868,11 +20523,11 @@ msgstr ""
 "\n"
 "�ể chấm dứt l�i nhắn này, bạn hãy đặt nó thành “refuse�."
 
-#: builtin/receive-pack.c:1936
+#: builtin/receive-pack.c:2478
 msgid "quiet"
 msgstr "im lặng"
 
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:2492
 msgid "You must specify a directory."
 msgstr "Bạn phải chỉ định thư mục."
 
@@ -17898,49 +20553,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <tham_chiếu>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, 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:605
+#: builtin/reflog.c:609
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "�ánh dấu các đối tượng tiếp cận được…"
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:647
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s chẳng chỉ đến đâu cả!"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:699
 msgid "no reflog specified to delete"
 msgstr "chưa chỉ ra reflog để xóa"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:708
 #, c-format
 msgid "not a reflog: %s"
 msgstr "không phải một reflog: %s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:713
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "không reflog cho “%s�"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:759
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "định dạng tham chiếu không hợp lệ: %s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:768
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -17948,82 +20603,82 @@ msgstr ""
 "git remote add [-t <nhánh>] [-m <master>] [-f] [--tags|--no-tags] [--"
 "mirror=<fetch|push>] <tên> <url>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <tên-cũ> <tên-mới>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <tên>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <tên> (-a | --auto | -d | --delete | <nhánh>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <tên>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <tên>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr ""
 "git remote [-v | --verbose] update [-p | --prune] [(<nhóm> | <máy-chủ>)…]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <tên> <nhánh>…"
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote set-url [--push] [--all] <tên>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <tên> <url-mới> [<url-cũ>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <tên> <url-mới>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <tên> <url>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<các tùy ch�n>] <tên> <url>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <tên> <nhánh>…"
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <tên> <nhánh>…"
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<các tùy ch�n>] <tên>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<các tùy ch�n>] <tên>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<các tùy ch�n>] [<nhóm> | <máy-chủ>]…"
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "�ang cập nhật %s"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -18031,82 +20686,93 @@ msgstr ""
 "--mirror nguy hiểm và không dùng nữa; xin hãy\n"
 "\t sử dụng tùy ch�n --mirror=fetch hoặc --mirror=push để thay thế"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "không hiểu tham số máy bản sao (mirror): %s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "lấy v� các nhánh từ máy chủ"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "nhập vào tất cả các đối tượng thẻ và thành phần liên quan khi lấy v�"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "hoặc không lấy v� bất kỳ thẻ nào (--no-tags)"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "các nhánh để theo dõi"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "nhánh master"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "đặt máy chủ (remote) như là một máy bản sao để push hay fetch từ đó"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "đang chỉ định một nhánh master không hợp lý với tùy ch�n --mirror"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 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:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr "máy chủ %s đã tồn tại rồi."
 
-#: builtin/remote.c:198 builtin/remote.c:640
-#, 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/remote.c:238
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "Không thể cài đặt nhánh master “%s�"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:355
 #, 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:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr "(khá»›p)"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:466
 msgid "(delete)"
 msgstr "(xóa)"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "không thể đặt “%s�"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"Cấu hình %s remote.pushDefault trong:\n"
+"\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
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "Không có máy chủ nào như vậy: “%s�"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:710
 #, 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:666
+#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -18117,17 +20783,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:702
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "gặp lỗi khi xóa “%s�"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
 msgstr "gặp lỗi khi tạo “%s�"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -18139,119 +20805,119 @@ msgstr[0] ""
 "Ä‘i;\n"
 "để xóa đi, sử dụng:"
 
-#: builtin/remote.c:816
+#: builtin/remote.c:896
 #, 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:917
+#: builtin/remote.c:999
 #, 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:920
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " được theo dõi"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " cũ rích (dùng “git remote prune� để gỡ b�)"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
 #, 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:974
+#: builtin/remote.c:1056
 #, 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:976
+#: builtin/remote.c:1058
 #, 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:979
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "thực hiện rebase trên máy chủ %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr " hòa trộn với máy chủ %s"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "hòa trộn với máy chủ %s"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    và với máy chủ %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
 msgid "create"
 msgstr "tạo"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr "xóa"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "đã cập nhật"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
 msgstr "có-thể-chuyển-tiếp-nhanh"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "dữ liệu nội bộ đã cũ"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s ép buộc thành %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s đẩy lên thành %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s ép buộc thành %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s đẩy lên thành %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr "không truy vấn các máy chủ"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "* máy chủ %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  URL để lấy v�: %s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr "(không có URL)"
 
@@ -18259,190 +20925,181 @@ msgstr "(không có URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  URL để đẩy lên: %s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  Nhánh HEAD: %s"
 
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr "(không yêu cầu)"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "(không hiểu)"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
 #, 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:1195
+#: builtin/remote.c:1277
 #, 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:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr " (trạng thái không được yêu cầu)"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
 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:1215
+#: builtin/remote.c:1297
 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:1221
+#: builtin/remote.c:1303
 #, 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:1242
+#: builtin/remote.c:1324
 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:1244
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "xóa refs/remotes/<tên>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr "Không thể xác định được HEAD máy chủ"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
 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:1271
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr "Không thể xóa b� %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "Không phải là tham chiếu hợp lệ: %s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr "Không thể cài đặt %s"
 
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
 #, 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:1300
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s đã trở thành không đầu (không được quản lý)!"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "�ang xén bớt %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [nên xén bớt] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [đã bị xén] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr "cắt máy chủ sau khi lấy v�"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr "Không có máy chủ nào có tên “%s�"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "thêm nhánh"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr "chưa chỉ ra máy chủ nào"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
 msgid "query push URLs rather than fetch URLs"
 msgstr "truy vấn đẩy URL thay vì lấy"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "trả v� m�i URL"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
 #, 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:1534
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "đẩy các “URL� bằng tay"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "thêm URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "xóa URLs"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete không hợp lý"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
 msgstr "Không tìm thấy URL như vậy: %s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
 msgstr "Sẽ không xóa những địa chỉ URL không-push"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "chi tiết; phải được đặt trước một lệnh-con"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "Không hiểu câu lệnh con: %s"
-
-#: builtin/repack.c:23
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr "git repack [<các tùy ch�n>]"
 
-#: builtin/repack.c:28
+#: builtin/repack.c:31
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18450,137 +21107,146 @@ 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:191
+#: builtin/repack.c:198
 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:230 builtin/repack.c:409
+#: builtin/repack.c:270 builtin/repack.c:630
 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:247
+#: builtin/repack.c:294
 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:285
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr "không thể mở mục lục cho “%s�"
+
+#: builtin/repack.c:368
+#, 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
+#, 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
 msgid "pack everything in a single pack"
 msgstr "đóng gói m�i thứ trong một gói đơn"
 
-#: builtin/repack.c:287
+#: builtin/repack.c:462
 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:290
+#: builtin/repack.c:465
 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:292
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "chuyển --no-reuse-delta cho git-pack-objects"
 
-#: builtin/repack.c:294
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "chuyển --no-reuse-object cho git-pack-objects"
 
-#: builtin/repack.c:296
+#: builtin/repack.c:471
 msgid "do not run git-update-server-info"
 msgstr "không chạy git-update-server-info"
 
-#: builtin/repack.c:299
+#: builtin/repack.c:474
 msgid "pass --local to git-pack-objects"
 msgstr "chuyển --local cho git-pack-objects"
 
-#: builtin/repack.c:301
+#: builtin/repack.c:476
 msgid "write bitmap index"
 msgstr "ghi mục lục ánh xạ"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:478
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "chuyển --delta-islands cho git-pack-objects"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:479
 msgid "approxidate"
 msgstr "ngày ước tính"
 
-#: builtin/repack.c:305
+#: builtin/repack.c:480
 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:307
+#: builtin/repack.c:482
 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:309
+#: builtin/repack.c:484
 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:310 builtin/repack.c:316
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr "byte"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:486
 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:313
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr "giới hạn độ sâu tối đa của “delta�"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:490
 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:317
+#: builtin/repack.c:492
 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:319
+#: builtin/repack.c:494
 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:321
+#: builtin/repack.c:496
 msgid "do not repack this pack"
 msgstr "đừng đóng gói lại gói này"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:498
+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
 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:335
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable và -A xung khắc nhau"
 
-#: builtin/repack.c:418
+#: 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
 msgid "Nothing new to pack."
 msgstr "Không có gì mới để mà đóng gói."
 
-#: builtin/repack.c:479
+#: builtin/repack.c:669
 #, 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 ""
-"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 "missing required file: %s"
+msgstr "thiếu tập tin cần thiết: %s"
 
-#: builtin/repack.c:527
+#: builtin/repack.c:671
 #, c-format
-msgid "failed to remove '%s'"
-msgstr "gặp lỗi khi gỡ b� “%s�"
+msgid "could not unlink: %s"
+msgstr "không thể b� liên kết: %s"
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
@@ -18685,8 +21351,8 @@ msgstr "không thể fstat %s"
 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:423
-#: builtin/replace.c:453
+#: 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�"
@@ -18710,17 +21376,17 @@ msgstr "đối tượng mới là giống với cái cũ: “%s�"
 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:415
+#: builtin/replace.c:416
 #, 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:417
+#: builtin/replace.c:418
 #, 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:429
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
@@ -18729,31 +21395,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:468
+#: builtin/replace.c:469
 #, 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:469
+#: builtin/replace.c:470
 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:479
+#: builtin/replace.c:480
 #, 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:487
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "graft cho “%s� không cần thiết"
 
-#: builtin/replace.c:491
+#: builtin/replace.c:492
 #, 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:526
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -18762,71 +21428,71 @@ msgstr ""
 "không thể chuyển đổi các graft sau đây:\n"
 "%s"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "liệt kê các refs thay thế"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "xóa tham chiếu thay thế"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "sửa đối tượng sẵn có"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "thay đổi cha mẹ của lần chuyển giao"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "chuyển đổi các tập tin graft sẵn có"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "thay thế tham chiếu nếu nó đã sẵn có"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "đừng in đẹp các nội dung cho --edit"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "dùng định dạng này"
 
-#: builtin/replace.c:568
+#: builtin/replace.c:569
 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:576
+#: builtin/replace.c:577
 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:580
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw chỉ hợp lý với --edit"
 
-#: builtin/replace.c:586
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d cần ít nhất một tham số"
 
-#: builtin/replace.c:592
+#: builtin/replace.c:593
 msgid "bad number of arguments"
-msgstr "số đối số không đúng"
+msgstr "số lượng đối số không đúng"
 
-#: builtin/replace.c:598
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e cần chính các là một đối số"
 
-#: builtin/replace.c:604
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-q cần ít nhất một tham số"
 
-#: builtin/replace.c:610
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file không nhận đối số"
 
-#: builtin/replace.c:616
+#: builtin/replace.c:617
 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"
 
@@ -18835,15 +21501,15 @@ 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�"
@@ -18855,120 +21521,126 @@ msgstr ""
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<tree-ish>] [--] </các/đư�ng/dẫn>…"
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<tree-ish>] [--] <đặc/tả/đư�ng/dẫn>…"
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<tree-ish>] [--] [</các/đư�ng/dẫn>…]"
+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
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<tree-ish>] [--] [<đặc/tả/đư�ng/dẫn>…]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "pha trá»™n"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "m�m"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "cứng"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "hòa trộn"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "giữ lại"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "Bạn không có HEAD nào hợp lệ."
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "Gặp lỗi khi tìm cây của HEAD."
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, 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:114
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD hiện gi� tại %s"
 
-#: builtin/reset.c:193
+#: builtin/reset.c:195
 #, 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:293 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
 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:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "đặt lại (reset) HEAD và bảng mục lục"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "chỉ đặt lại (reset) HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 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:302
+#: builtin/reset.c:304
 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:308
+#: builtin/reset.c:310
 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:326
+#: builtin/reset.c:344
 #, 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:334
+#: builtin/reset.c:352
 #, 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:343
+#: 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:353
+#: builtin/reset.c:371
 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:355
+#: builtin/reset.c:373
 #, 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:370
+#: builtin/reset.c:388
 #, 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:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
 msgstr "-N chỉ được dùng khi có --mixed"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "Những thay đổi được đưa ra kh�i bệ phóng sau khi reset:"
 
-#: builtin/reset.c:398
+#: builtin/reset.c:416
 #, c-format
 msgid ""
 "\n"
@@ -18979,51 +21651,64 @@ 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:408
+#: builtin/reset.c:434
 #, 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:412
+#: builtin/reset.c:439
 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:411
+#: builtin/rev-list.c:541
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "không thể tổ hợp --exclude-promisor-objects và --missing"
 
-#: builtin/rev-list.c:472
+#: 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:522
+#: 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:525
-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"
+#: builtin/rev-list.c:679
+msgid "marked counting is incompatible with --objects"
+msgstr "được đánh dấu đếm là xung khắc với --objects"
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<các tùy ch�n>] -- [<các tham số>…]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "giữ lại “--� chuyển sang làm tham số"
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "dừng phân tích sau đối số đầu tiên không có tùy ch�n"
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "kết xuất trong định dạng gậy dài"
 
-#: builtin/rev-parse.c:551
+#: 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"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -19037,6 +21722,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>…"
@@ -19115,19 +21844,19 @@ msgstr "cấm khởi tạo lần chuyển giao trống rỗng"
 msgid "keep redundant, empty commits"
 msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
 
-#: builtin/revert.c:232
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr "hoàn nguyên gặp lỗi"
 
-#: builtin/revert.c:245
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr "cherry-pick gặp lỗi"
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<các tùy ch�n>] [--] <tập-tin>…"
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -19138,7 +21867,7 @@ msgstr[0] ""
 "các tập tin sau đây có khác biệt nội dung đã đưa lên bệ phóng\n"
 "từ cả tập tin và cả HEAD:"
 
-#: builtin/rm.c:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -19146,12 +21875,12 @@ msgstr ""
 "\n"
 "(dùng -f để buộc gỡ b�)"
 
-#: 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] "các tập tin sau đây có thay đổi trạng thái trong bảng mục lục:"
 
-#: 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)"
@@ -19159,42 +21888,46 @@ msgstr ""
 "\n"
 "(dùng tùy ch�n --cached để giữ tập tin, hoặc -f để ép buộc gỡ b�)"
 
-#: 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] "những tập tin sau đây có những thay đổi nội bộ:"
 
-#: builtin/rm.c:242
+#: builtin/rm.c:244
 msgid "do not list removed files"
 msgstr "không liệt kê các tập tin đã gỡ b�"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr "chỉ gỡ b� từ mục lục"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
 msgstr "ghi đè lên kiểm tra cập nhật"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr "cho phép gỡ b� đệ qui"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:249
 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:289
+#: builtin/rm.c:283
+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
 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:307
+#: builtin/rm.c:331
 #, 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:346
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm: không thể gỡ b� %s"
@@ -19211,55 +21944,77 @@ msgstr ""
 "chiếu>…]\n"
 "  --all và đặc tả <ref> rõ ràng là loại trừ lẫn nhau."
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr "tên máy dịch vụ"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "dùng giao thức RPC không ổn định"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "đ�c tham chiếu từ đầu vào tiêu chuẩn"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
 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ụ"
 
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<các tùy ch�n>] [<vùng-xét-duyệt>] [[--] [<đư�ng/dẫn>…]]"
 
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<các tùy ch�n>]"
 
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "Nhóm theo ngư�i chuyển giao thay vì tác giả"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr ""
+"việc dùng nhi�u tùy ch�n --group với đầu ra tiêu chuẩn là không được hỗ trợ"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "việc dùng --group=trailer với đầu ra tiêu chuẩn là không được hỗ trợ"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "không nhận ra kiểu nhóm: %s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "nhóm theo ngư�i chuyển giao thay vì tác giả"
 
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả"
 
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "Chặn m�i mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "chặn m�i mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao"
 
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
-msgstr "Hiển thị thư điện tử cho từng tác giả"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "hiển thị thư điện tử cho từng tác giả"
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
-msgstr "Ngắt dòng khi quá dài"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "ngắt dòng khi quá dài"
+
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "trư�ng"
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "nhóm theo trư�ng"
+
+#: builtin/shortlog.c:391
 msgid "too many arguments given outside repository"
 msgstr "quá nhi�u tham số đưa ra ngoài kho chứa"
 
@@ -19396,6 +22151,14 @@ msgstr "“%s� không phải tham chiếu hợp lệ."
 msgid "cannot find commit %s (%s)"
 msgstr "không thể tìm thấy lần chuyển giao %s (%s)"
 
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "thuật-toán-băm"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "Không hiểu thuật toán băm dữ liệu"
+
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -19444,41 +22207,120 @@ msgstr ""
 "hiển thị các tham chiếu từ đầu vào tiêu chuẩn (stdin) cái mà không ở kho nội "
 "bá»™"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: 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) <các-tùy-ch�n>"
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:72
+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
+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
+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
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "gặp lỗi khi đặt cài đặt extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "khởi tạo sparse-checkout trong chế độ nón"
+
+#: builtin/sparse-checkout.c:312
+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
+#, c-format
+msgid "failed to open '%s'"
+msgstr "gặp lỗi khi mở “%s�"
+
+#: builtin/sparse-checkout.c:413
+#, c-format
+msgid "could not normalize path %s"
+msgstr "không thể thư�ng hóa đư�ng dẫn “%s�"
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <các mẫu>)"
+
+#: builtin/sparse-checkout.c:450
+#, 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:504 builtin/sparse-checkout.c:528
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "không thể tải các mẫu sparse-checkout"
+
+#: builtin/sparse-checkout.c:573
+msgid "read patterns from standard in"
+msgstr "đ�c các mẫu từ đầu vào tiêu chuẩn"
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:607
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:638
+msgid "error while refreshing working directory"
+msgstr "gặp lỗi khi đ�c lại thư mục làm việc"
+
+#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<các tùy ch�n>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<các tùy ch�n>] <stash>"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
-#: 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] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <tên-nhánh> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28 builtin/stash.c:77
+#: 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"
+"          [--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"
+"          [--pathspec-from-file=<tập_tin> [--pathspec-file-nul]]\n"
 "          [--] [<đặc/tả/đư�ng/dẫn>…]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: 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>]"
@@ -19486,190 +22328,228 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<ghi chú>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <ghi chú>] [-q|--quiet] <commit>"
 
-#: builtin/stash.c:127
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <l�i nhắn>]\n"
+"          [--] [<đặc/tả/đư�ng/dẫn>…]]"
+
+#: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "“%s� không phải là lần chuyển giao kiểu-stash (cất đi)"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "Chỉ ra quá nhi�u điểm xét duyệt: %s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "Không tìm thấy các mục tạm cất (stash) nào."
 
-#: builtin/stash.c:175
+#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "“%s� không phải một tham chiếu hợp lệ"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:227
+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
+#, c-format
+msgid ""
+"WARNING: Untracked file in way of tracked file!  Renaming\n"
+"            %s -> %s\n"
+"         to make room.\n"
 msgstr ""
-"git stash clear với các tham số là chưa được thực hiện (không nhận đối số)"
+"CẢNH B�O: Tệp chưa được theo dõi theo cách của tệp được theo dõi!  �ổi tên\n"
+"            %s -> %s\n"
+"         để như�ng chỗ.\n"
 
-#: builtin/stash.c:403
+#: builtin/stash.c:492
 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:414
+#: builtin/stash.c:503
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "không thể tạo diff %s^!."
 
-#: builtin/stash.c:421
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:510
+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:427
+#: builtin/stash.c:516
 msgid "could not save index tree"
 msgstr "không thể ghi lại cây chỉ mục"
 
-#: builtin/stash.c:436
+#: 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:450
+#: builtin/stash.c:539
 #, c-format
 msgid "Merging %s with %s"
 msgstr "�ang hòa trộn %s với %s"
 
-#: builtin/stash.c:460 git-legacy-stash.sh:680
+#: builtin/stash.c:549
 msgid "Index was not unstashed."
 msgstr "Bảng mục lục đã không được b� stash."
 
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:591 builtin/stash.c:689
 msgid "attempt to recreate the index"
 msgstr "gặp lỗi đ�c bảng mục lục"
 
-#: builtin/stash.c:555
+#: builtin/stash.c:635
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "�ã xóa %s (%s)"
 
-#: builtin/stash.c:558
+#: builtin/stash.c:638
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s: Không thể xóa b� mục stash"
 
-#: builtin/stash.c:583
+#: builtin/stash.c:651
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "�%s� không phải tham chiếu đến stash"
 
-#: builtin/stash.c:633 git-legacy-stash.sh:694
+#: builtin/stash.c:701
 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:656 git-legacy-stash.sh:712
+#: builtin/stash.c:724
 msgid "No branch name specified"
 msgstr "Chưa chỉ ra tên của nhánh"
 
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "gặp lỗi khi phân tích cây"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "gặp lỗi khi tháo dỡ cây"
+
+#: builtin/stash.c:839
+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
+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:929 builtin/stash.c:966
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "Không thể cập nhật %s với %s"
 
-#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
 msgid "stash message"
 msgstr "phần chú thích cho stash"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:957
 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:1046 git-legacy-stash.sh:217
+#: builtin/stash.c:1171
 msgid "No changes selected"
 msgstr "Chưa có thay đổi nào được ch�n"
 
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1271
 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:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1298
 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:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1307
 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:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1318 builtin/stash.c:1327
 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:1229 git-legacy-stash.sh:233
+#: builtin/stash.c:1355
 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:1278 git-legacy-stash.sh:337
+#: builtin/stash.c:1404
 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:1294
+#: builtin/stash.c:1422
 msgid "Did you forget to 'git add'?"
 msgstr "Có lẽ bạn đã quên “git add � phải không?"
 
-#: builtin/stash.c:1309 git-legacy-stash.sh:345
+#: builtin/stash.c:1437
 msgid "No local changes to save"
 msgstr "Không có thay đổi nội bộ nào được ghi lại"
 
-#: builtin/stash.c:1316 git-legacy-stash.sh:350
+#: builtin/stash.c:1444
 msgid "Cannot initialize stash"
 msgstr "Không thể khởi tạo stash"
 
-#: builtin/stash.c:1331 git-legacy-stash.sh:354
+#: builtin/stash.c:1459
 msgid "Cannot save the current status"
 msgstr "Không thể ghi lại trạng thái hiện hành"
 
-#: builtin/stash.c:1336
+#: builtin/stash.c:1464
 #, 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:1426 git-legacy-stash.sh:384
+#: builtin/stash.c:1554
 msgid "Cannot remove worktree changes"
 msgstr "Không thể gỡ b� các thay đổi cây-làm-việc"
 
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1593 builtin/stash.c:1658
 msgid "keep index"
 msgstr "giữ nguyên bảng mục lục"
 
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1595 builtin/stash.c:1660
 msgid "stash in patch mode"
 msgstr "cất đi ở chế độ miếng vá"
 
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1596 builtin/stash.c:1661
 msgid "quiet mode"
 msgstr "chế độ im lặng"
 
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1598 builtin/stash.c:1663
 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:1468 builtin/stash.c:1504
+#: builtin/stash.c:1600 builtin/stash.c:1665
 msgid "include ignore files"
 msgstr "bao gồm các tập tin bị b� qua"
 
-#: builtin/stash.c:1564
-#, c-format
-msgid "could not exec %s"
-msgstr "không thể thực thi %s"
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"việc hỗ trợ stash.useBuiltin đã bị xóa!\n"
+"Xem mục tin của nó trong “git help config� để biết chi tiết."
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -19687,40 +22567,41 @@ 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:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
 #, 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:62
+#: 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:100
+#: 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:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
 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:413
+#: builtin/submodule--helper.c:416
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=</đư�ng/dẫn>] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: 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 "Không tìm thấy url cho đư�ng dẫn mô-đun-con “%s� trong .gitmodules"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:526
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "�ang vào “%s�\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:529
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -19729,7 +22610,7 @@ msgstr ""
 "run_command trả v� trạng thái khác không cho %s\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:551
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -19740,19 +22621,20 @@ msgstr ""
 "con lồng nhau của %s\n"
 "."
 
-#: builtin/submodule--helper.c:563
-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:567
+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:565 builtin/submodule--helper.c:1050
-msgid "Recurse into nested submodules"
-msgstr "�ệ quy vào trong các mô-đun-con lồng nhau"
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
+msgstr "đệ quy vào trong mô-đun-con lồng nhau"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:574
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--]  <lệnh>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:601
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
@@ -19761,105 +22643,159 @@ 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:665
+#: builtin/submodule--helper.c:668
 #, 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:669
+#: builtin/submodule--helper.c:672
 #, 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:679
+#: builtin/submodule--helper.c:682
 #, 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:686
+#: builtin/submodule--helper.c:689
 #, 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:708
-msgid "Suppress output for initializing a submodule"
-msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con"
+#: builtin/submodule--helper.c:711
+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:713
+#: builtin/submodule--helper.c:716
 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:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, 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:824
+#: builtin/submodule--helper.c:837
 #, 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:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
 #, 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:875 builtin/submodule--helper.c:1186
-msgid "Suppress submodule status output"
-msgstr "Chặn két xuất tình trạng mô-đun-con"
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
+msgstr "chặn kết xuất v� tình trạng mô-đun-con"
 
-#: builtin/submodule--helper.c:876
+#: 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 ""
-"Dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-"
+"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:877
-msgid "recurse into nested submodules"
-msgstr "đệ quy vào trong mô-đun-con lồng nhau"
-
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr ""
 "git submodule status [--quiet] [--cached] [--recursive] [</đư�ng/dẫn>…]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name </đư�ng/dẫn>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr ""
+"* %s %s(blob)->%s(\n"
+")"
+
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(mô-đun-con)->%s(blob)"
+
+#: builtin/submodule--helper.c:1007
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "không thể băm đối tượng từ “%s�"
+
+#: builtin/submodule--helper.c:1061
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "gặp chế độ không như mong ch� %o\n"
+
+#: builtin/submodule--helper.c:1302
+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:1304
+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:1306
+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:1308
+msgid "limit the summary size"
+msgstr "giới hạn kích cỡ tổng hợp"
+
+#: builtin/submodule--helper.c:1313
+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:1337
+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:1342
+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:1409
 #, 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:976
+#: builtin/submodule--helper.c:1415
 #, 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:990
+#: builtin/submodule--helper.c:1429
 #, 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:1001
+#: builtin/submodule--helper.c:1440
 #, 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:1048
-msgid "Suppress output of synchronizing submodule url"
-msgstr "Chặn kết xuất cho đồng bộ url mô-đun-con"
+#: builtin/submodule--helper.c:1487
+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:1055
+#: builtin/submodule--helper.c:1494
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [</đư�ng/dẫn>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1548
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -19868,7 +22804,7 @@ msgstr ""
 "Cây làm việc mô-đun-con “%s� có chứa thư mục .git (dùng “rm -rf� nếu bạn "
 "thực sự muốn gỡ b� nó cùng với toàn bộ lịch sử của chúng)"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1560
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
@@ -19877,176 +22813,208 @@ 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:1129
+#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "�ã xóa thư mục “%s�\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1570
 #, 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:1142
+#: builtin/submodule--helper.c:1581
 #, 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:1158
+#: builtin/submodule--helper.c:1597
 #, 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:1187
-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
+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:1188
-msgid "Unregister all submodules"
-msgstr "B� đăng ký tất cả các trong mô-đun-con"
+#: builtin/submodule--helper.c:1627
+msgid "unregister all submodules"
+msgstr "b� đăng ký tất cả các trong mô-đun-con"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1632
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--]  [</đư�ng/dẫn>…]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1646
 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:1302 builtin/submodule--helper.c:1305
+#: 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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"Một cái thay thế được tính toán từ một thay thế của siêu dự án là không hợp "
+"lệ.\n"
+"�ể cho Git thực hiện nhân bản mà không có cái thay thế như trong trư�ng hợp "
+"này, đặt\n"
+"submodule.alternateErrorStrategy thành “info� hoặc, tương đương, nhân bản "
+"bằng\n"
+"“--reference-if-able� thay vì dùng “--reference�."
+
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
 #, 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:1341
+#: builtin/submodule--helper.c:1768
 #, 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:1348
+#: builtin/submodule--helper.c:1775
 #, 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:1371
+#: builtin/submodule--helper.c:1800
+#, 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:1841
+#, 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:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "thư mục không trống: “%s�"
+
+#: builtin/submodule--helper.c:1858
+#, 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:1890 builtin/submodule--helper.c:2894
 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:1374
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
 msgid "name of the new submodule"
 msgstr "tên của mô-đun-con mới"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
 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:1385
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
 msgid "depth for shallow clones"
 msgstr "chi�u sâu lịch sử khi tạo bản sao"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
 msgid "force cloning progress"
 msgstr "ép buộc tiến trình nhân bản"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+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:1916
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<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>] [--url <url>] [</đư�ng/dẫn>…]"
-
-#: builtin/submodule--helper.c:1424
-#, 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:1438
-#, 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:1474
+#: builtin/submodule--helper.c:1953
 #, 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:1478
+#: builtin/submodule--helper.c:1957
 #, 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:1571
+#: builtin/submodule--helper.c:2058
 #, 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:1575
+#: builtin/submodule--helper.c:2062
 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:1605
+#: builtin/submodule--helper.c:2092
 #, 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:1634
+#: builtin/submodule--helper.c:2121
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "B� qua mô-đun-con “%s�"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:2271
 #, 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:1789
+#: builtin/submodule--helper.c:2282
 #, 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:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
 msgid "path into the working tree"
 msgstr "đư�ng dẫn đến cây làm việc"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:2347
 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:1858
+#: builtin/submodule--helper.c:2351
 msgid "rebase, merge, checkout or none"
 msgstr "rebase, merge, checkout hoặc không làm gì cả"
 
-#: builtin/submodule--helper.c:1864
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2357
+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"
+"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:1867
+#: builtin/submodule--helper.c:2360
 msgid "parallel jobs"
 msgstr "công việc đồng th�i"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2362
 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:1870
+#: builtin/submodule--helper.c:2363
 msgid "don't print cloning progress"
 msgstr "đừng in tiến trình nhân bản"
 
-#: builtin/submodule--helper.c:1877
+#: builtin/submodule--helper.c:2374
 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:1890
+#: builtin/submodule--helper.c:2387
 msgid "bad value for update parameter"
 msgstr "giá trị cho  tham số cập nhật bị sai"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:2435
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -20055,50 +23023,143 @@ 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:2061
+#: builtin/submodule--helper.c:2558
 #, 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:2094
+#: builtin/submodule--helper.c:2591
 msgid "recurse into submodules"
 msgstr "đệ quy vào trong mô-đun-con"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2597
 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:2156
+#: builtin/submodule--helper.c:2653
 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:2159
+#: builtin/submodule--helper.c:2656
 msgid "unset the config in the .gitmodules file"
 msgstr "b� đặt cấu hình trong tập tin .gitmodules"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2661
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <tên> [<giá trị>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2662
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <tên>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2663
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: 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 "hãy đảm bảo rằng tập tin .gitmodules có trong cây làm việc"
 
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
+#: builtin/submodule--helper.c:2698
+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:2702
+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:2735
+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:2737
+msgid "set the default tracking branch"
+msgstr "đặt nhánh theo dõi mặc định"
+
+#: builtin/submodule--helper.c:2741
+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:2742
+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:2749
+msgid "--branch or --default required"
+msgstr "cần --branch hoặc --default"
+
+#: builtin/submodule--helper.c:2752
+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:2815
+#, 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:2818
+#, 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:2828
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+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ủ:"
+
+#: 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 ""
+"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"
+"  %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\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�.\n"
+
+#: builtin/submodule--helper.c:2842
+#, 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:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "không thể lấy ra mô-đun-con “%s�"
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr "nhánh của kho để lấy ra khi nhân bản"
+
+#: builtin/submodule--helper.c:2910
+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:2917
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr ""
+"git submodule--helper add-clone [<các tùy ch�n>...] --url <url> --path </"
+"đư�ng/dẫn> --name <tên>"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s không hỗ trợ --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2991
 #, 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ệ"
@@ -20111,23 +23172,23 @@ msgstr "git symbolic-ref [<các tùy ch�n>] <tên> [<t.chiếu>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <tên>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "chặn các thông tin lỗi cho các tham chiếu “không-m�m� (bị tách ra)"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "xóa tham chiếu m�m"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "làm ngắn kết xuất ref (tham chiếu)"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr "lý do"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "lý do cập nhật"
 
@@ -20147,27 +23208,29 @@ 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>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--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>] [--[no-]merged [<lần_chuyển_giao>]] [<mẫu>…]"
+"\t\t[--format=<định_dạng>] [--merged <lần_chuyển_giao>] [--no-merged "
+"[<lần_chuyển_giao>]] [<mẫu>…]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<định_dạng>]  <tên-thẻ>…"
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "không tìm thấy tìm thấy thẻ “%s�."
 
-#: builtin/tag.c:105
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "Thẻ đã bị xóa “%s� (từng là %s)\n"
 
-#: builtin/tag.c:135
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -20180,7 +23243,7 @@ msgstr ""
 "  %s\n"
 "Những dòng được bắt đầu bằng “%c� sẽ được b� qua.\n"
 
-#: builtin/tag.c:139
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -20195,15 +23258,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:198
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "không thể ký thẻ"
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "không thể ghi vào tập tin lưu thẻ"
-
-#: 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"
@@ -20216,343 +23275,343 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:232
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "kiểu đối tượng sai."
 
-#: builtin/tag.c:284
+#: builtin/tag.c:328
 msgid "no tag message?"
 msgstr "không có chú thích gì cho cho thẻ à?"
 
-#: builtin/tag.c:291
+#: builtin/tag.c:335
 #, 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:402
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr "chỉ liệt kê tên các thẻ"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr "hiển thị <n> dòng cho mỗi ghi chú"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr "xóa thẻ"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr "thẩm tra thẻ"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr "Tùy ch�n tạo thẻ"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr "để chú giải cho thẻ, cần một l�i ghi chú"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:457
 msgid "tag message"
 msgstr "phần chú thích cho thẻ"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:459
 msgid "force edit of tag message"
 msgstr "ép buộc sửa thẻ lần commit"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr "thẻ chú giải và ký kiểu GPG"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr "dùng kháo khác để ký thẻ"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
 msgstr "thay thế nếu thẻ đó đã có trước"
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "tạo một reflog"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr "Các tùy ch�n liệt kê thẻ"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr "hiển thị danh sách thẻ trong các cột"
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:469 builtin/tag.c:471
 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:426 builtin/tag.c:428
+#: builtin/tag.c:470 builtin/tag.c:472
 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:429
+#: builtin/tag.c:473
 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:430
+#: builtin/tag.c:474
 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:434
+#: builtin/tag.c:478
 msgid "print only tags of the object"
 msgstr "chỉ hiển thị các thẻ của đối tượng"
 
-#: builtin/tag.c:482
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
 msgstr "--column và -n xung khắc nhau"
 
-#: builtin/tag.c:504
+#: 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:506
+#: 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:508
+#: 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:510
+#: 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:512
+#: 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:523
+#: 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:542
-msgid "too many params"
-msgstr "quá nhi�u đối số"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:592
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "“%s� không phải thẻ hợp lệ."
 
-#: builtin/tag.c:553
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "thẻ “%s� đã tồn tại rồi"
 
-#: builtin/tag.c:584
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "�ã cập nhật thẻ “%s� (trước là %s)\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "�ang giải nén các đối tượng"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "tạo thư mục \"%s\" gặp lỗi"
 
-#: builtin/update-index.c:99
+#: 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:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "gặp lỗi khi xóa tập tin %s"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "gặp lỗi khi xóa thư mục %s"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "�ang kiểm thử mtime trong “%s� "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 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:166
+#: builtin/update-index.c:167
 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:179
+#: builtin/update-index.c:180
 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:190
+#: builtin/update-index.c:191
 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:201
+#: builtin/update-index.c:202
 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:214
+#: builtin/update-index.c:215
 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:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " �ồng ý"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<các tùy ch�n>] [--] [<tập-tin>…]"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:976
 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:975
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr "refresh: l� đi mô-đun-con"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
 msgid "do not ignore new files"
 msgstr "không b� qua các tập tin mới tạo"
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:984
 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:982
+#: builtin/update-index.c:986
 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:984
+#: builtin/update-index.c:988
 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:987
+#: builtin/update-index.c:991
 msgid "refresh stat information"
 msgstr "lấy lại thông tin thống kê"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
 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:995
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr "<chế_độ>,<đối_tượng>,<đư�ng_dẫn>"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1000
 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:1006
+#: builtin/update-index.c:1010
 msgid "mark files as \"not changing\""
 msgstr "đánh dấu các tập tin là \"không thay đổi\""
 
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
 msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
 msgstr "đánh dấu các tập tin là “chỉ-đ�c�"
 
-#: builtin/update-index.c:1015
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
 msgstr "xóa bít skip-worktree"
 
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr "đừng động vào các mục index-only"
+
+#: builtin/update-index.c:1024
 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:1020
+#: builtin/update-index.c:1026
 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:1022
+#: builtin/update-index.c:1028
 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:1024
+#: builtin/update-index.c:1030
 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:1028
+#: builtin/update-index.c:1034
 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:1032
+#: builtin/update-index.c:1038
 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:1036
+#: builtin/update-index.c:1042
 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:1040
+#: builtin/update-index.c:1046
 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:1043
+#: builtin/update-index.c:1049
 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:1045
+#: builtin/update-index.c:1051
 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:1049
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr "ghi mục lục ở định dạng này"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
 msgstr "bật/tắt chia cắt bảng mục lục"
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1059
 msgid "enable/disable untracked cache"
 msgstr "bật/tắt bộ đệm không theo vết"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1061
 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:1057
+#: builtin/update-index.c:1063
 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:1059
+#: builtin/update-index.c:1065
 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:1061
+#: builtin/update-index.c:1067
 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:1063
+#: builtin/update-index.c:1069
 msgid "mark files as fsmonitor valid"
 msgstr "đánh dấu các tập tin là hợp lệ fsmonitor"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c:1072
 msgid "clear fsmonitor valid bit"
 msgstr "xóa bít hợp lệ fsmonitor"
 
-#: builtin/update-index.c:1169
+#: builtin/update-index.c:1175
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
@@ -20560,7 +23619,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:1178
+#: builtin/update-index.c:1184
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
@@ -20568,7 +23627,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:1190
+#: 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"
@@ -20576,11 +23635,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:1194
+#: builtin/update-index.c:1200
 msgid "Untracked cache disabled"
 msgstr "Nhớ đệm không theo vết bị tắt"
 
-#: builtin/update-index.c:1202
+#: 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"
@@ -20588,29 +23647,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:1206
+#: builtin/update-index.c:1212
 #, 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:1214
+#: builtin/update-index.c:1220
 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:1218
+#: builtin/update-index.c:1224
 msgid "fsmonitor enabled"
 msgstr "fsmonitor được bật"
 
-#: builtin/update-index.c:1221
+#: builtin/update-index.c:1227
 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:1225
+#: builtin/update-index.c:1231
 msgid "fsmonitor disabled"
 msgstr "fsmonitor bị tắt"
 
@@ -20626,19 +23685,19 @@ msgstr "git update-ref [<các tùy ch�n>]    <refname> <biến-mới> [<biến
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<các tùy ch�n>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "xóa tham chiếu"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
 msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr "đầu vào tiêu chuẩn có các đối số được chấm dứt bởi NUL"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr "đ�c cập nhật từ đầu vào tiêu chuẩn"
 
@@ -20682,15 +23741,15 @@ msgstr "hiển thị nội dung của lần chuyển giao"
 msgid "print raw gpg status output"
 msgstr "in kết xuất trạng thái gpg dạng thô"
 
-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <gói>…"
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "chi tiết"
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "chỉ hiển thị thống kê"
 
@@ -20702,221 +23761,215 @@ 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:17
+#: builtin/worktree.c:18
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<các tùy ch�n>] </đư�ng/dẫn> [<commit-ish>]"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<các tùy ch�n>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<các tùy ch�n>] </đư�ng/dẫn>"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <worktree> </đư�ng/dẫn/mới>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<các tùy ch�n>]"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<các tùy ch�n>] <worktree>"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock </đư�ng/dẫn>"
 
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:61 builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "gặp lỗi khi xóa “%s�"
 
-#: builtin/worktree.c:79
-#, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "Gỡ b� cây làm việc/%s: không phải là thư mục hợp lệ"
-
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "Gỡ b� cây làm việc/%s: không có tập tin gitdir"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "Gỡ b� cây làm việc/%s: không thể đ�c tập tin gitdir (%s)"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr "Gỡ b� cây làm việc/%s: đ�c ngắn (cần %<PRIuMAX> byte, đ�c %<PRIuMAX>)"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "Gỡ b� cây làm việc/%s: tập tin gitdir không hợp lệ"
-
-#: builtin/worktree.c:126
+#: builtin/worktree.c:74
 #, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "Gỡ b� cây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại"
+msgid "Removing %s/%s: %s"
+msgstr "�ang xóa %s/%s: %s"
 
-#: builtin/worktree.c:165
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "báo cáo các cây làm việc đã prune"
 
-#: builtin/worktree.c:167
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "các cây làm việc hết hạn cũ hơn khoảng <th�i gian>"
 
-#: builtin/worktree.c:234
+#: builtin/worktree.c:219
 #, c-format
 msgid "'%s' already exists"
 msgstr "“%s� đã có từ trước rồi"
 
-#: builtin/worktree.c:251
+#: builtin/worktree.c:228
 #, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "không thể thêm-lại cây “%s�"
+msgid "unusable worktree destination '%s'"
+msgstr "đích cây làm việc không sử dụng được “%s�"
 
-#: builtin/worktree.c:256
+#: builtin/worktree.c:233
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
 "“%s� bị mất nhưng cây làm việc bị khóa;\n"
-"dùng “add -f -f� để ghi đè, hoặc “unlock� và “prune� hay “remove� để xóa"
+"dùng “%s -f -f� để ghi đè, hoặc “unlock� và “prune� hay “remove� để xóa"
 
-#: builtin/worktree.c:258
+#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
 "“%s� bị mất nhưng cây làm việc đã được đăng ký;\n"
-"dùng “add -f� để ghi đè, hoặc “prune� hay “remove� để xóa"
+"dùng “%s -f� để ghi đè, hoặc “prune� hay “remove� để xóa"
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:286
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "không thể tạo thư mục của “%s�"
 
-#: builtin/worktree.c:439 builtin/worktree.c:445
+#: builtin/worktree.c:308
+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:441
+#: 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:450
+#: 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:456
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "�ang chuẩn bị cây làm việc (HEAD đã tách r�i “%s�)"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "lấy ra <nhánh> ngay cả khi nó đã được lấy ra ở cây làm việc khác"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "tạo nhánh mới"
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "tạo hay đặt lại một nhánh"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "di chuyển cây làm việc mới"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "giữ cây làm việc mới bị khóa"
 
-#: builtin/worktree.c:508
+#: 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:511
+#: 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:519
+#: builtin/worktree.c:506
 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:580
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr "--reason cần --lock"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "được thêm với --lock"
+
+#: 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:680
-msgid "reason for locking"
-msgstr "lý do khóa"
+#: 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:693
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr ""
+"thêm chú thích kiểu 'prunable' cho các cây làm việc hết hạn cũ hơn khoảng "
+"<th�i gian>"
 
-#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: builtin/worktree.c:702
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose và --porcelain loại từ lẫn nhau"
+
+#: 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:694 builtin/worktree.c:727
+#: 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:699
+#: 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:701
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "“%s� đã được khóa rồi"
 
-#: builtin/worktree.c:729
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "“%s� chưa bị khóa"
 
-#: builtin/worktree.c:770
+#: 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:778
+#: 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:801 builtin/worktree.c:928
+#: 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:806
+#: 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:812
-#, c-format
-msgid "target '%s' already exists"
-msgstr "đích “%s� đã tồn tại rồi"
-
-#: builtin/worktree.c:820
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -20925,7 +23978,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:822
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -20933,38 +23986,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:825
+#: 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:830
+#: 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:878
+#: 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:882
+#: 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:887
+#: 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:910
+#: 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:933
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -20973,7 +24026,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:935
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -20981,11 +24034,21 @@ 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:938
+#: 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:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr "sửa chữa: %s: %s"
+
+#: builtin/worktree.c:1011
+#, c-format
+msgid "error: %s: %s"
+msgstr "lá»—i: %s: %s"
+
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<ti�n-tố>/]"
@@ -21002,57 +24065,14 @@ msgstr "ghi đối tượng cây (tree) cho <ti�n tố> thư mục con"
 msgid "only useful for debugging"
 msgstr "chỉ hữu ích khi cần gỡ lỗi"
 
-#: fast-import.c:3118
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "Cần lệnh 'mark', nhưng lại nhận được %s"
-
-#: fast-import.c:3123
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "Cần lệnh 'to', nhưng lại nhận được %s"
-
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"Quy�n hạn trên thư mục gói mạng của bạn không chính xác; ngư�i dùng\n"
-"khác có lẽ có thể đ�c được chứng thư được lưu đệm của bạn. Cân nhắc chạy:\n"
-"\n"
-"\tchmod 0700 %s"
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
-
-#: t/helper/test-reach.c:152
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "lần chuyển giao %s chưa được đánh dấu là tiếp cận được"
-
-#: t/helper/test-reach.c:162
-msgid "too many commits marked reachable"
-msgstr "có quá nhi�u lần chuyển giao được đánh dấu là tiếp cận được"
-
-#: t/helper/test-serve-v2.c:7
-msgid "test-tool serve-v2 [<options>]"
-msgstr "test-tool serve-v2 [<các tùy ch�n>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "thoát ngay sau khi khởi tạo quảng cáo capabilities"
-
-#: git.c:27
+#: git.c:28
 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"
 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "           <command> [<args>]"
 msgstr ""
 "git [--version] [--help] [-C </đư�ng/dẫn/>] [-c <tên>=<giá trị>]\n"
@@ -21062,9 +24082,10 @@ msgstr ""
 "bare]\n"
 "           [--git-dir=</đư�ng/dẫn/>] [--work-tree=</đư�ng/dẫn/>] [--"
 "namespace=<tên>]\n"
+"           [--super-prefix=</đư�ng/dẫn/>] [--config-env=<tên>=<envvar>]\n"
 "           <lệnh> [<các tham số>]"
 
-#: git.c:34
+#: 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"
@@ -21074,49 +24095,54 @@ msgstr ""
 "“git help -a� và “git help -g� liệt kê các câu lệnh con sẵn có và một số\n"
 "hướng dẫn v� khái niệm. Xem “git help <lệnh>� hay “git help <khái-niệm>�\n"
 "để xem các đặc tả cho lệnh hay khái niệm cụ thể.\n"
-"Xem 'git help git' để biết tổng quan của hệ thống."
+"Xem “git help git� để biết tổng quan của hệ thống."
 
-#: git.c:186
+#: git.c:188
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "chưa chỉ ra thư mục cho --git-dir\n"
 
-#: git.c:200
+#: 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:214
+#: 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:228
+#: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "chưa đưa ra ti�n tố cho --super-prefix\n"
 
-#: git.c:250
+#: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "-c cần một chuỗi cấu hình\n"
 
-#: git.c:288
+#: git.c:260
+#, c-format
+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:314
+#: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "không hiểu tùy ch�n: %s\n"
 
-#: git.c:360
+#: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr "trong khi triển khai bí danh “%s�: “%s�"
 
-#: git.c:369
+#: git.c:384
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -21125,40 +24151,40 @@ msgstr ""
 "bí danh “%s� thay đổi biến môi trư�ng.\n"
 "Bạn có thể sử dụng “!git� trong đặt bí danh để làm việc này"
 
-#: git.c:376
+#: git.c:391
 #, c-format
 msgid "empty alias for %s"
 msgstr "làm trống bí danh cho %s"
 
-#: git.c:379
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr "đệ quy các bí danh: %s"
 
-#: git.c:459
+#: git.c:476
 msgid "write failure on standard output"
 msgstr "lỗi ghi nghiêm trong trên đầu ra tiêu chuẩn"
 
-#: git.c:461
+#: git.c:478
 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:463
+#: git.c:480
 msgid "close failed on standard output"
 msgstr "gặp lỗi khi đóng đầu ra tiêu chuẩn"
 
-#: git.c:792
+#: git.c:833
 #, 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:842
+#: git.c:883
 #, 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:855
+#: git.c:896
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -21167,57 +24193,206 @@ msgstr ""
 "cách dùng: %s\n"
 "\n"
 
-#: git.c:875
+#: git.c:916
 #, 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:887
+#: git.c:928
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "gặp lỗi khi chạy lệnh “%s�: %s\n"
 
-#: http.c:378
+#: http-fetch.c:118
+#, 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
+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ý"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "gặp lỗi khi chuẩn bị các điểm xét duyệt"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "lần chuyển giao %s chưa được đánh dấu là tiếp cận được"
+
+#: t/helper/test-reach.c:164
+msgid "too many commits marked reachable"
+msgstr "có quá nhi�u lần chuyển giao được đánh dấu là tiếp cận được"
+
+#: t/helper/test-serve-v2.c:7
+msgid "test-tool serve-v2 [<options>]"
+msgstr "test-tool serve-v2 [<các tùy ch�n>]"
+
+#: t/helper/test-serve-v2.c:19
+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
+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
+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
+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
+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
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<tên>] [<thẻ>]"
+
+#: t/helper/test-simple-ipc.c:687
+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
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+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
+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
+msgid "named-pipe name"
+msgstr "tên named-pipe"
+
+#: t/helper/test-simple-ipc.c:700
+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
+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
+msgid "number of bytes"
+msgstr "số lượng byte"
+
+#: t/helper/test-simple-ipc.c:704
+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
+msgid "byte"
+msgstr "byte"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr "ký tự ballast"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr "thẻ bài"
+
+#: t/helper/test-simple-ipc.c:707
+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
 #, 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:399
+#: http.c:420
 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:408
+#: 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:878
+#: http.c:910
 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:951
+#: 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:1088
+#: http.c:1132
 #, 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:1095
+#: http.c:1139
 #, 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:1099
+#: http.c:1143
 #, 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:1968
+#: http.c:2034
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -21228,154 +24403,196 @@ msgstr ""
 "      h�i cho: %s\n"
 " chuyển hướng: %s"
 
-#: remote-curl.c:166
+#: remote-curl.c:183
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "sai trích dẫn trong giá trị push-option :“%s�"
 
-#: remote-curl.c:263
+#: remote-curl.c:307
 #, 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:364
+#: remote-curl.c:408
 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:395
+#: remote-curl.c:439
 #, 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:455
+#: remote-curl.c:499
 #, c-format
 msgid "repository '%s' not found"
 msgstr "không tìm thấy kho “%s�"
 
-#: remote-curl.c:459
+#: remote-curl.c:503
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "Xác thực gặp lỗi cho “%s�"
 
-#: remote-curl.c:463
+#: remote-curl.c:507
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "không thể truy cập “%s�: %s"
 
-#: remote-curl.c:469
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
 msgstr "chuyển hướng đến %s"
 
-#: remote-curl.c:593
+#: remote-curl.c:644
 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:673
+#: remote-curl.c:656
+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: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:733
+#: remote-curl.c:756
+#, 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:758
+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:834
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC gặp lỗi; %s"
 
-#: remote-curl.c:773
+#: remote-curl.c:874
 msgid "cannot handle pushes this big"
 msgstr "không thể xử lý đẩy cái lớn này"
 
-#: remote-curl.c:888
+#: remote-curl.c:989
 #, 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:892
+#: remote-curl.c:993
 #, 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:1023
+#: remote-curl.c:1043
+#, 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:1045
+#, 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:1134
 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:1037
+#: remote-curl.c:1149
 msgid "fetch failed."
 msgstr "lấy v� gặp lỗi."
 
-#: remote-curl.c:1085
+#: remote-curl.c:1195
 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:1129 remote-curl.c:1135
+#: remote-curl.c:1239 remote-curl.c:1245
 #, 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:1147 remote-curl.c:1261
+#: remote-curl.c:1257 remote-curl.c:1375
 #, c-format
 msgid "http transport does not support %s"
 msgstr "vận chuyển http không hỗ trợ %s"
 
-#: remote-curl.c:1183
+#: remote-curl.c:1293
 msgid "git-http-push failed"
 msgstr "git-http-push gặp lỗi"
 
-#: remote-curl.c:1367
+#: remote-curl.c:1481
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl: usage: git remote-curl <máy chủ> [<url>]"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1513
 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:1406
+#: remote-curl.c:1520
 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:1446
+#: remote-curl.c:1561
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl: không hiểu lệnh “%s� từ git"
 
-#: list-objects-filter-options.h:85
+#: 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"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "không có thông tin v� libc\n"
+
+#: list-objects-filter-options.h:94
 msgid "args"
 msgstr "các_tham_số"
 
-#: list-objects-filter-options.h:86
+#: list-objects-filter-options.h:95
 msgid "object filtering"
 msgstr "l�c đối tượng"
 
-#: parse-options.h:179
+#: parse-options.h:184
 msgid "expiry-date"
 msgstr "ngày hết hạn"
 
-#: parse-options.h:193
+#: parse-options.h:198
 msgid "no-op (backward compatibility)"
 msgstr "no-op (tương thích ngược)"
 
-#: parse-options.h:305
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "chi tiết hơn nữa"
 
-#: parse-options.h:307
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "im lặng hơn nữa"
 
-#: parse-options.h:313
-msgid "use <n> digits to display SHA-1s"
-msgstr "sử dụng <n> chữ số để hiển thị SHA-1s"
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
+msgstr "sử dụng <n> chữ số để hiển thị tên đối tượng"
 
-#: parse-options.h:332
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "làm thế nào để cắt b� khoảng trắng và #ghichú từ mẩu tin nhắn"
 
-#: ref-filter.h:101
+#: parse-options.h:338
+msgid "read pathspec from file"
+msgstr "đ�c đặc tả đư�ng dẫn từ tập tin"
+
+#: parse-options.h:339
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr ""
+"với --pathspec-from-file, các phần tử đặc tả đư�ng dẫn bị ngăn cách bởi ký "
+"tá»± NULL"
+
+#: ref-filter.h:99
 msgid "key"
 msgstr "khóa"
 
-#: ref-filter.h:101
+#: ref-filter.h:99
 msgid "field name to sort on"
 msgstr "tên trư�ng cần sắp xếp"
 
@@ -21383,14 +24600,6 @@ msgstr "tên trư�ng cần sắp xếp"
 msgid "update the index with reused conflict resolution if possible"
 msgstr "cập nhật bảng mục lục với phân giải xung đột dùng lại nếu được"
 
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "HEAD được tách r�i tại "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "HEAD được tách r�i từ "
-
 #: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "Thêm nội dung tập tin vào bảng mục lục"
@@ -21431,680 +24640,668 @@ msgid "List, create, or delete branches"
 msgstr "Liệt kê, tạo hay là xóa các nhánh"
 
 #: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "Sưu tập thông tin ngư�i dùng để báo cáo lỗi"
+
+#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "Di chuyển các đối tượng và tham chiếu theo kho lưu"
 
-#: command-list.h:60
+#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr "Cung cấp nội dung hoặc thông tin v� kiểu và cỡ cho các đối tượng kho"
 
-#: command-list.h:61
+#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "Hiển thị thông tin gitattributes"
 
-#: command-list.h:62
+#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "Gỡ lỗi các tập tin gitignore / exclude"
 
-#: command-list.h:63
+#: command-list.h:64
 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:64
+#: command-list.h:65
 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:65
+#: command-list.h:66
 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:66
+#: 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:67
+#: 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"
 
-#: command-list.h:68
+#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "�p dụng các thay đổi được đưa ra bởi một số lần chuyển giao sẵn có"
 
-#: command-list.h:69
+#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "Tương tác đồ h�a với git-commit"
 
-#: command-list.h:70
+#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "Gỡ b� các tập tin không được theo dõi từ cây làm việc"
 
-#: command-list.h:71
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "Nhân bản một kho chứa đến một thư mục mới"
 
-#: command-list.h:72
+#: command-list.h:73
 msgid "Display data in columns"
 msgstr "Hiển thị dữ liệu dạng các cột"
 
-#: command-list.h:73
+#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "Ghi các thay đổi vào kho chứa"
 
-#: command-list.h:74
+#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "Ghi và thẩm tra các tập tin đồ h�a các lần chuyển giao Git"
 
-#: command-list.h:75
+#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "Tạo một đối tượng chuyển giao"
 
-#: command-list.h:76
+#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "Lấy và đặt kho hoặc các tùy ch�n toàn cục"
 
-#: command-list.h:77
+#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr ""
 "�ếm số lượng đối tượng chưa được đóng gói và mức tiêu dùng đĩa của chúng"
 
-#: command-list.h:78
+#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "Nhận và lưu chứng nhận của ngư�i dùng"
 
-#: command-list.h:79
+#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "Bộ hỗ trợ để lưu mật khẩu tạm th�i trong bộ nhớ"
 
-#: command-list.h:80
+#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "Bộ hỗ trợ để lưu chứng nhận vào đĩa"
 
-#: command-list.h:81
+#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "Xuất một lần chuyển giao thành một lần lấy ra CVS"
 
-#: command-list.h:82
+#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "Xem xét giá trị dữ liệu của bạn kh�i ngư�i khác yêu SCM để ghét"
 
-#: command-list.h:83
+#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Một bộ mô ph�ng máy dịch vụ CVS cho Git"
 
-#: command-list.h:84
+#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "Một máy phục vụ thực sự đơn giản dành cho kho Git"
 
-#: command-list.h:85
+#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr ""
 "�ưa ra một đối tượng dựa trên một tên ở dạng con ngư�i đ�c được trên một "
 "tham chiếu sẵn có"
 
-#: command-list.h:86
+#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr ""
 "Hiển thị các thay đổi giữa những lần chuyển giao, giữa một lần chuyển giao "
 "và cây làm việc, v.v.."
 
-#: command-list.h:87
+#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "So sánh các tập tin trong cây làm việc và bảng mục lục"
 
-#: command-list.h:88
+#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "So sánh các cây trong cây làm việc hoặc bảng mục lục"
 
-#: command-list.h:89
+#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr ""
 "So sánh nội dung và chế độ của các blob tìm thấy thông qua hai đối tượng cây"
 
-#: command-list.h:90
+#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "Hiển thị các thay đổi sử dụng các công cụ diff chung"
 
-#: command-list.h:91
+#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Bộ xuất dữ liệu Git"
 
-#: command-list.h:92
+#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Ứng dụng chạy phía sau cho bộ nhập nhanh dữ liệu Git"
 
-#: command-list.h:93
+#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "Tải v� các đối tượng và tham chiếu từ kho chứa khác"
 
-#: command-list.h:94
+#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "Tải v� các đối tượng còn thiếu từ kho chứa khác"
 
-#: command-list.h:95
+#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "Những nhánh ghi lại"
 
-#: command-list.h:96
+#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "Sản sinh một ghi chú lần chuyển giao hòa trộn"
 
-#: command-list.h:97
+#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "Xuất thông tin cho từng tham chiếu"
 
-#: command-list.h:98
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "Chạy lệnh Git trên danh sách các kho chứa"
+
+#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "Chuẩn bị các miếng vá để gửi qua thư điện tử"
 
-#: command-list.h:99
+#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr ""
 "Thẩm tra lại tính kết nối và tính hiệu lực cảu các đối tượng trong cơ sở dữ "
 "liệu"
 
-#: command-list.h:100
+#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "D�n dẹp các tập tin không cần thiết và tối ưu kho nội bộ"
 
-#: command-list.h:101
+#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr ""
 "Rút trích mã số lần chuyển giao từ một kho nén đã được tạo bởi git-archive"
 
-#: command-list.h:102
+#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "In ra những dòng khớp với một mẫu"
 
-#: command-list.h:103
+#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "Một giao diện đồ h�a khả chuyển cho Git"
 
-#: command-list.h:104
+#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "Tính toán ID đối tượng và tùy ch�n là tạo một blob từ một tập tin"
 
-#: command-list.h:105
+#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "Hiển thị thông tin trợ giúp v� Git"
 
-#: command-list.h:106
+#: command-list.h:108
 msgid "Server side implementation of Git over HTTP"
 msgstr "Thi hành phía máy chủ của Git qua HTTP"
 
-#: command-list.h:107
+#: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
 msgstr "Tải v� từ một kho chứa Git trên mạng thông qua HTTP"
 
-#: command-list.h:108
+#: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "�ẩy các đối tượng lên thông qua HTTP/DAV đến kho chứa khác"
 
-#: command-list.h:109
+#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr ""
 "Gửi một bộ sưu tập các miếng vá từ đầu vào tiêu chuẩn đến một thư mục IMAP"
 
-#: command-list.h:110
+#: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
 msgstr "Xây dựng tập tin mục lục gói cho một kho nén đã đóng gói sẵn có"
 
-#: command-list.h:111
+#: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "Tạo một kho git mới hay khởi tạo lại một kho đã tồn tại từ trước"
 
-#: command-list.h:112
+#: command-list.h:114
 msgid "Instantly browse your working repository in gitweb"
 msgstr "Duyệt ngay kho làm việc của bạn trong gitweb"
 
-#: command-list.h:113
+#: command-list.h:115
 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:114
+#: command-list.h:116
 msgid "The Git repository browser"
 msgstr "Bộ duyện kho Git"
 
-#: command-list.h:115
+#: 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:116
+#: command-list.h:118
 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:117
+#: command-list.h:119
 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:118
+#: command-list.h:120
 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:119
+#: command-list.h:121
 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:120
+#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "Chương trình phân tách UNIX mbox đơn giản"
 
-#: command-list.h:121
+#: command-list.h:123
+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
 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:122
+#: command-list.h:125
 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:123
+#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "Chạy một hòa trộn tập tin “3-đư�ng�"
 
-#: command-list.h:124
+#: command-list.h:127
 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:125
+#: command-list.h:128
 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:126
+#: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr ""
 "Chạy công cụ phân giải xung đột hòa trộn để mà giải quyết các xung đột hòa "
 "trá»™n"
 
-#: command-list.h:127
+#: 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:128
+#: 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:129
-msgid "Creates a tag object"
-msgstr "Tạo một đối tượng thẻ"
+#: 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:130
+#: command-list.h:133
 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:131
+#: command-list.h:134
 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:132
+#: command-list.h:135
 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:133
+#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "Thêm hoặc đi�u tra đối tượng ghi chú"
 
-#: command-list.h:134
+#: command-list.h:137
 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:135
+#: command-list.h:138
 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:136
+#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "Tìm các tập tin gói dư thừa"
 
-#: command-list.h:137
+#: command-list.h:140
 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:138
-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"
-
-#: command-list.h:139
+#: command-list.h:141
 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:140
+#: command-list.h:142
 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:141
+#: command-list.h:143
 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:142
+#: command-list.h:144
 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:143
+#: command-list.h:145
 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:144
+#: command-list.h:146
 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:145
+#: command-list.h:147
 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:146
+#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "��c thông tin cây vào trong mục lục"
 
-#: command-list.h:147
+#: command-list.h:149
 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:148
+#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "Nhận cái mà được đẩy vào trong kho"
 
-#: command-list.h:149
+#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "Quản lý thông tin reflog"
 
-#: command-list.h:150
+#: command-list.h:152
 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:151
+#: command-list.h:153
 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:152
+#: command-list.h:154
 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:153
+#: command-list.h:155
 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:154
+#: command-list.h:156
 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:155
+#: command-list.h:157
 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:156
+#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "Hoàn nguyên các tập tin cây làm việc"
 
-#: command-list.h:157
+#: 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:158
+#: command-list.h:160
 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:159
+#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "Cậy ra và xử lý các tham số"
 
-#: command-list.h:160
+#: command-list.h:162
 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:161
+#: command-list.h:163
 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:162
+#: command-list.h:164
 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:163
+#: command-list.h:165
 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:164
+#: command-list.h:166
 msgid "Summarize 'git log' output"
 msgstr "Kết xuất “git log� dạng tóm tắt"
 
-#: command-list.h:165
+#: command-list.h:167
 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:166
+#: command-list.h:168
 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:167
+#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "Hiển thị các muc lục kho nén đã đóng gói"
 
-#: command-list.h:168
+#: command-list.h:170
 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:169
+#: 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:170
+#: 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:171
+#: 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: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:172
+#: 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:173
+#: 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:174
+#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "Xóa b� các khoảng trắng không cần thiết"
 
-#: command-list.h:175
+#: command-list.h:178
 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:176
+#: command-list.h:179
 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:177
+#: command-list.h:180
 msgid "Switch branches"
 msgstr "Các nhánh chuyển"
 
-#: command-list.h:178
+#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "��c, sửa và xóa tham chiếu m�m"
 
-#: command-list.h:179
+#: command-list.h:182
 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:180
+#: command-list.h:183
 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:181
+#: command-list.h:184
 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:182
+#: command-list.h:185
 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:183
+#: command-list.h:186
 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:184
+#: command-list.h:187
 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:185
+#: command-list.h:188
 msgid "Send archive back to git-archive"
-msgstr "Gửi trở lại kho lưu đến git-archive"
+msgstr "Gửi kho lưu trở lại cho git-archive"
 
-#: command-list.h:186
+#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
-msgstr "Gửi trở lại các đối tượng đã đóng gói cho git-fetch-pack"
+msgstr "Gửi các đối tượng đã đóng gói trở lại cho git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "Hiển thị một biến Git luận lý"
 
-#: command-list.h:188
+#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "Kiểm tra ký lần chuyển giao dùng GPG"
 
-#: command-list.h:189
+#: command-list.h:192
 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:190
+#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "Kiểm tra chữ ký GPG của các thẻ"
 
-#: command-list.h:191
+#: 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:192
+#: command-list.h:195
 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:193
+#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "Quản lý nhi�u cây làm việc"
 
-#: command-list.h:194
+#: command-list.h:197
 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:195
+#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "�ịnh nghĩa các thuộc tính cho mỗi đư�ng dẫn"
 
-#: command-list.h:196
+#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Giao diện dòng lệnh Git và quy ước"
 
-#: command-list.h:197
+#: command-list.h:200
 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:198
+#: command-list.h:201
+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
 msgid "Git for CVS users"
 msgstr "Git dành cho những ngư�i dùng CVS"
 
-#: command-list.h:199
+#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "Chỉnh kết xuất diff"
 
-#: command-list.h:200
+#: command-list.h:204
 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:201
+#: command-list.h:205
+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
 msgid "A Git Glossary"
 msgstr "Thuật ngữ chuyên môn Git"
 
-#: command-list.h:202
+#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Các móc được sử dụng bởi Git"
 
-#: command-list.h:203
+#: command-list.h:208
 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:204
+#: command-list.h:209
+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
 msgid "Defining submodule properties"
 msgstr "�ịnh nghĩa thuộc tính mô-đun-con"
 
-#: command-list.h:205
+#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Không gian tên Git"
 
-#: command-list.h:206
+#: command-list.h:212
+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
 msgid "Git Repository Layout"
 msgstr "Bố cục kho Git"
 
-#: command-list.h:207
+#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
 
-#: command-list.h:208
+#: command-list.h:215
+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: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:209
+#: command-list.h:217
 msgid "A tutorial introduction to Git"
 msgstr "Hướng dẫn cách dùng Git"
 
-#: command-list.h:210
+#: 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:54
-msgid "You need to start by \"git bisect start\""
-msgstr "Bạn cần khởi đầu bằng \"git bisect start\""
-
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "Bạn có muốn tôi thực hiện đi�u này cho bạn không [Y/n]? "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "�ầu vào rev sai: $arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "�ầu vào rev sai: $bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "�ầu vào rev sai: $rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "“git bisect $TERM_BAD� có thể lấy chỉ một đối số."
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "Chưa chỉ ra tập tin ghi nhật ký"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "không thể đ�c $file để thao diễn lại"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? bạn đang nói gì thế?"
-
-#: git-bisect.sh:241
+#: 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:246
+#: git-bisect.sh:73
 #, sh-format
 msgid "running $command"
 msgstr "đang chạy lệnh $command"
 
-#: git-bisect.sh:253
+#: git-bisect.sh:80
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -22113,27 +25310,23 @@ 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:279
+#: 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:285
+#: git-bisect.sh:111
 #, sh-format
 msgid ""
 "bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'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"
+"�bisect-state $state� đã thoát ra với mã lỗi $res"
 
-#: git-bisect.sh:292
+#: git-bisect.sh:118
 msgid "bisect run success"
 msgstr "bisect chạy thành công"
 
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "Chúng tôi không bisect."
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -22174,195 +25367,58 @@ 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-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "Không thể gỡ b� bảng mục lục tạm th�i (không thể xảy ra)"
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "Không thể cập nhật $ref_stash với $w_commit"
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "lỗi: không hiểu tùy ch�n cho “stash push�: $option"
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "�ã ghi lại thư mục làm việc và trạng thái mục lục $stash_msg"
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "không hiểu tùy ch�n: $opt"
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "Chỉ ra quá nhi�u điểm xét duyệt: $REV"
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference không phải là tham chiếu hợp lệ"
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "“$args� không phải là lần chuyển giao kiểu-stash (cất đi)"
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "�$args� không phải tham chiếu đến stash"
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr "không thể làm tươi mới bảng mục lục"
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy ch�n --index."
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr "Không thể ghi lại cây chỉ mục"
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr "Không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr "Không thể b� ra kh�i bệ phóng các tập tin đã được sửa chữa"
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "�ã xóa ${REV} ($s)"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}: Không thể xóa b� mục stash"
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr "(�ể phục hồi lại chúng hãy gõ \"git stash apply\")"
-
-#: git-submodule.sh:200
+#: 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:210
+#: 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:229
+#: 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:232
+#: 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:239
+#: 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:245
-#, 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 ""
-"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."
-
-#: git-submodule.sh:268
-#, 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:270
-#, 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:278
-#, 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:280
-#, 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:286
-#, 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:298
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "Không thể lấy ra mô-đun-con “$sm_path�"
-
-#: git-submodule.sh:303
+#: git-submodule.sh:248
 #, 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:312
+#: git-submodule.sh:257
 #, 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:573
+#: git-submodule.sh:532
 #, 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:583
+#: git-submodule.sh:542
 #, 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:588
+#: git-submodule.sh:547
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -22371,7 +25427,7 @@ 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:606
+#: git-submodule.sh:565
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
@@ -22380,7 +25436,7 @@ 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:612
+#: git-submodule.sh:571
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22389,85 +25445,54 @@ 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:619
+#: git-submodule.sh:578
 #, 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:620
+#: git-submodule.sh:579
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: đã checkout “$sha1�"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:583
 #, 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:625
+#: git-submodule.sh:584
 #, 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:630
+#: git-submodule.sh:589
 #, 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:631
+#: git-submodule.sh:590
 #, 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:636
+#: git-submodule.sh:595
 #, 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:637
+#: git-submodule.sh:596
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "�ư�ng dẫn mô-đun-con “$displaypath�: “$command $sha1�"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:627
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "Gặp lỗi khi đệ quy vào trong đư�ng dẫn mô-đun-con “$displaypath�"
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr "Tùy ch�n --cached không thể dùng cùng với tùy ch�n --files"
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "chế độ không như mong ch� $mod_dst"
-
-#: git-submodule.sh:902
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr "  Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
-
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr "  Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
-
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr ""
-"  Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và "
-"$sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "Xem git-${cmd}(1) để biết thêm chi tiết."
-
 #: git-rebase--preserve-merges.sh:109
 msgid "Applied autostash."
 msgstr "�ã áp dụng autostash."
@@ -22477,12 +25502,23 @@ msgstr "�ã áp dụng autostash."
 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:207
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -22525,7 +25561,7 @@ msgstr ""
 "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:270
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -22544,82 +25580,82 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:295
+#: 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:334
+#: 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:364
+#: 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:415
+#: 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:417
+#: 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:426
+#: 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:431
+#: 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:449
+#: 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:458
+#: 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:467
+#: 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:472
+#: 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:483
+#: 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:492
+#: git-rebase--preserve-merges.sh:482
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "Không thể $fixup_msg"
 
-#: git-rebase--preserve-merges.sh:495
+#: 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:536 git-rebase--preserve-merges.sh:579
-#: git-rebase--preserve-merges.sh:582
+#: 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:611
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -22635,31 +25671,31 @@ msgstr ""
 "này\n"
 "trước khi bạn có thể làm việc lại với lần chuyển giao."
 
-#: git-rebase--preserve-merges.sh:626
+#: 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:641
+#: 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:683
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
-msgstr "Thá»±c thi: $rest"
+msgstr "�ang thực thi: $rest"
 
-#: git-rebase--preserve-merges.sh:691
+#: 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:693
+#: 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:695
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -22670,7 +25706,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:708
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -22685,25 +25721,25 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:719
+#: 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:720
+#: 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:755
+#: 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:812
+#: 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:817
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -22734,11 +25770,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--preserve-merges.sh:834
+#: 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:839
+#: 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."
@@ -22747,39 +25783,43 @@ msgstr ""
 "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:844 git-rebase--preserve-merges.sh:848
+#: 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:879 git-rebase--preserve-merges.sh:965
+#: 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:900
+#: git-rebase--preserve-merges.sh:890
 #, sh-format
 msgid "Could not checkout $switch_to"
-msgstr "Không thể checkout $switch_to"
+msgstr "Không thể lấy ra $switch_to"
 
-#: git-rebase--preserve-merges.sh:907
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr "Không HEAD?"
 
-#: git-rebase--preserve-merges.sh:908
+#: 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:911
+#: 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:943
+#: 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:997 git-rebase--preserve-merges.sh:1002
+#: 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"
 
@@ -22850,77 +25890,18 @@ 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"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "đã đưa lên bệ phóng"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "chưa đưa lên bệ phóng"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "nhị phân"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "không có gì"
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "không thay đổi"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "đã thêm %d đư�ng dẫn\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "đã cập nhật %d đư�ng dẫn\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "đã hoàn nguyên %d đư�ng dẫn\n"
-
 #: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "%d đư�ng dẫn đã touch (chạm)\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "Cập nhật"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "Hoàn nguyên"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "chú ý: %s gi� đã b� theo dõi.\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "Thêm các cái chưa được theo dõi"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "Không có tập tin nào chưa được theo dõi.\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
@@ -22928,7 +25909,7 @@ 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."
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
@@ -22936,7 +25917,7 @@ 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 để tạm cất."
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
@@ -22944,8 +25925,8 @@ 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 để b� chuyển lên bệ phóng."
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: 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."
@@ -22953,8 +25934,8 @@ 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 để áp dụng."
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: 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."
@@ -22962,16 +25943,12 @@ 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 để loại b�."
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "gặp lỗi khi tập tin sửa khúc để ghi: %s"
 
-#: git-add--interactive.perl:1110
-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"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -22984,36 +25961,12 @@ msgstr ""
 "�ể xóa b� dòng “%s�, xóa chúng đi.\n"
 "Những dòng bắt đầu bằng %s sẽ bị loại b�.\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-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ếu miếng vá không được áp dụng sạch sẽ, bạn sẽ có một cơ hội\n"
-"để 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"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "gặp lỗi khi mở tập tin khúc để đ�c: %s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr ""
-"Hunk đã sửa của bạn không được áp dụng. Sửa lại lần nữa (nói \"n\" để loại "
-"b�!) [y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -23028,7 +25981,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:1252
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -23042,7 +25995,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:1258
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -23058,7 +26011,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:1264
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -23072,7 +26025,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:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -23086,7 +26039,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:1276
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -23100,7 +26053,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:1282
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -23114,7 +26067,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:1294
+#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -23128,7 +26081,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:1309
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -23150,224 +26103,88 @@ msgstr ""
 "e - sửa bằng tay khúc hiện hành\n"
 "? - in trợ giúp\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1345
 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:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "Vẫn áp dụng chúng cho cây làm việc? "
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "�ã không áp dụng gì cả.\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1360
 #, 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:1364
-msgid "Only binary files changed.\n"
-msgstr "Chỉ có các tập tin nhị phân là thay đổi.\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "Không có thay đổi nào.\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "Cập nhật miếng vá"
-
-#: git-add--interactive.perl:1426
-#, 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,?]? "
-
-#: git-add--interactive.perl:1427
-#, 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,?]? "
-
-#: git-add--interactive.perl:1428
-#, 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,?]? "
-
-#: git-add--interactive.perl:1431
-#, 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,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "Xóa tạm cất [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, 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,?]? "
-
-#: git-add--interactive.perl:1436
-#, 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,?]? "
-
-#: git-add--interactive.perl:1437
-#, 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,?]? "
-
-#: git-add--interactive.perl:1438
-#, 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,?]? "
-
-#: git-add--interactive.perl:1441
-#, 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,?]? "
-
-#: git-add--interactive.perl:1442
-#, 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,?]? "
-
-#: git-add--interactive.perl:1443
-#, 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,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, 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,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, 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,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, 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,?]? "
-
-#: git-add--interactive.perl:1451
-#, 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,?]? "
-
-#: git-add--interactive.perl:1452
-#, 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,?]? "
-
-#: git-add--interactive.perl:1453
-#, 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,?]? "
-
-#: git-add--interactive.perl:1456
-#, 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,?]? "
-
-#: git-add--interactive.perl:1457
-#, 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,?]? "
-
-#: git-add--interactive.perl:1458
-#, 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,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1479
 #, 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:1467
+#: git-add--interactive.perl:1480
 #, 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:1468
+#: git-add--interactive.perl:1481
+#, 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
 #, 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:1568
+#: git-add--interactive.perl:1599
 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:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "nhảy đến khúc nào (<ret> để xem thêm)? "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "nhảy đến khúc nào? "
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "Số không hợp lệ: “%s�\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1622
 #, 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:1617
+#: git-add--interactive.perl:1657
 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:1621
-msgid "search for regex? "
-msgstr "tìm kiếm cho biểu thức chính quy? "
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1674
 #, 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:1644
+#: git-add--interactive.perl:1684
 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:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr "Không có khúc kế trước\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr "Không có khúc kế tiếp\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1730
 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:1696
+#: git-add--interactive.perl:1736
 #, 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:1706
+#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "Rất tiếc, không thể sửa khúc này\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "Xem xét lại diff"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -23387,55 +26204,70 @@ 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:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: 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
 msgid "missing --"
 msgstr "thiếu --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "không hiểu chế độ --patch: %s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, 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:129
 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:136 git-send-email.perl:142
 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:223 git-send-email.perl:229
+#: git-send-email.perl:214
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "lỗi nghiêm tr�ng: lệnh '%s' chết với mã thoát %d"
+
+#: git-send-email.perl:227
 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:310
+#: git-send-email.perl:316
 #, 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:315
+#: git-send-email.perl:321
 #, 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:408
+#: git-send-email.perl:450
 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:481 git-send-email.perl:683
+#: 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 ""
+"lỗi nghiêm tr�ng: tìm thấy các tùy ch�n cấu hình cho “sendmail�\n"
+"git-send-email được cấu hình với các tùy ch�n sendemail.* - chú ý “e�.\n"
+"�ặt sendemail.forbidSendmailVariables thành false để tắt kiểm tra này.\n"
+
+#: git-send-email.perl:530 git-send-email.perl:746
 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:484
+#: git-send-email.perl:533
 msgid ""
 "`batch-size` and `relogin` must be specified together (via command-line or "
 "configuration option)\n"
@@ -23443,37 +26275,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:497
+#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "Không hiểu trư�ng --suppress-cc: “%s�\n"
 
-#: git-send-email.perl:528
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "Không hiểu cài đặt --confirm: “%s�\n"
 
-#: git-send-email.perl:556
+#: git-send-email.perl:617
 #, 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:558
+#: git-send-email.perl:619
 #, 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:560
+#: git-send-email.perl:621
 #, 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:565
+#: git-send-email.perl:626
 #, 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:649
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -23488,21 +26320,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:670
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "Gặp lỗi khi mở thư mục “%s�: %s"
 
-#: git-send-email.perl:694
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"nghiêm tr�ng: %s: %s\n"
-"cảnh báo: không có miếng vá nào được gửi đi\n"
-
-#: git-send-email.perl:705
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -23512,17 +26335,17 @@ msgstr ""
 "Chưa chỉ định các tập tin miếng vá!\n"
 "\n"
 
-#: git-send-email.perl:718
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "Không có dòng chủ đ� trong %s?"
 
-#: git-send-email.perl:728
+#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "Gặp lỗi khi mở “%s� để ghi: %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -23536,27 +26359,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:763
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "Gặp lỗi khi mở “%s�: %s"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "Gặp lỗi khi mở %s.final: %s"
 
-#: git-send-email.perl:823
+#: git-send-email.perl:886
 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:858
+#: git-send-email.perl:935
 #, 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:913
+#: git-send-email.perl:990
 msgid ""
 "The following files are 8bit, but do not declare a Content-Transfer-"
 "Encoding.\n"
@@ -23564,11 +26387,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:918
+#: git-send-email.perl:995
 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:926
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -23581,20 +26404,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:945
+#: git-send-email.perl:1022
 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:963
+#: git-send-email.perl:1040
 #, 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:975
+#: git-send-email.perl:1052
 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:1033 git-send-email.perl:1041
+#: git-send-email.perl:1114 git-send-email.perl:1122
 #, 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"
@@ -23602,16 +26425,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:1045
+#: git-send-email.perl:1126
 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:1362
+#: git-send-email.perl:1446
 #, 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:1445
+#: 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"
@@ -23638,135 +26461,704 @@ 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:1460
+#: git-send-email.perl:1544
 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:1463
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr "Gửi thư này trả l�i yêu cầu"
 
-#: git-send-email.perl:1491
+#: git-send-email.perl:1581
 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:1538
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "Máy chủ không hỗ trợ STARTTLS! %s"
 
-#: git-send-email.perl:1543 git-send-email.perl:1547
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS gặp lỗi! %s"
 
-#: git-send-email.perl:1556
+#: git-send-email.perl:1646
 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:1574
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "Gặp lỗi khi gửi %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "Thá»­ gá»­i %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "Gá»­i %s\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "Dry-OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK. Nhật ký nói rằng:\n"
 
-#: git-send-email.perl:1591
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "Kết quả: "
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "Kết quả: Tốt\n"
 
-#: git-send-email.perl:1612
+#: git-send-email.perl:1709
 #, perl-format
 msgid "can't open file %s"
 msgstr "không thể mở tập tin “%s�"
 
-#: git-send-email.perl:1659 git-send-email.perl:1679
+#: git-send-email.perl:1756 git-send-email.perl:1776
 #, 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:1665
+#: git-send-email.perl:1762
 #, 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:1718
+#: git-send-email.perl:1819
 #, 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:1753
+#: git-send-email.perl:1854
 #, 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:1864
+#: git-send-email.perl:1965
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) Không thể thực thi “%s�"
 
-#: git-send-email.perl:1871
+#: git-send-email.perl:1972
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) �ang thêm %s: %s từ: “%s�\n"
 
-#: git-send-email.perl:1875
+#: git-send-email.perl:1976
 #, 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:1905
+#: git-send-email.perl:2006
 msgid "cannot send message as 7bit"
 msgstr "không thể lấy gửi thư dạng 7 bít"
 
-#: git-send-email.perl:1913
+#: git-send-email.perl:2014
 msgid "invalid transfer encoding"
 msgstr "bảng mã truy�n không hợp lệ"
 
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: 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 ""
+"nghiêm tr�ng: %s: bị từ chối bởi móc sendemail-validate\n"
+"%s\n"
+"cảnh báo: không có miếng vá nào được gửi đi\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 "không thể mở %s: %s\n"
 
-#: git-send-email.perl:1957
+#: git-send-email.perl:2064
 #, 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 ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+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:1974
+#: git-send-email.perl:2082
 #, 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:1978
+#: git-send-email.perl:2086
 #, 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 "unable to write stateless separator packet"
+#~ msgstr "không thể ghi gói phân tách không trạng thái"
+
+#~ msgid "git merge --abort"
+#~ msgstr "git merge --abort"
+
+#~ msgid "git merge --continue"
+#~ msgstr "git merge --continue"
+
+#~ msgid "git stash clear"
+#~ msgstr "git stash clear"
+
+#~ msgid "remote server sent stateless separator"
+#~ msgstr "máy phục vụ từ xa gửi các bộ ngăn cách không tình trạng"
+
+#~ msgid "--cached and --3way cannot be used together."
+#~ msgstr "--cached và --3way không thể dùng cùng nhau."
+
+#~ msgid "both"
+#~ msgstr "cả hai"
+
+#~ msgid "one"
+#~ msgstr "má»™t"
+
+#, 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 "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�"
@@ -23777,14 +27169,12 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgid "error building trees"
 #~ msgstr "gặp lỗi khi xây dựng cây"
 
-#, c-format
 #~ 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"
 
-#, c-format
 #~ 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: "
@@ -23803,7 +27193,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgid "cannot combine '--rebase-merges' with '--strategy-option'"
 #~ msgstr "không thể kết hợp “--rebase-merges� với “--strategy-option�"
 
-#, c-format
 #~ msgid "invalid sparse value '%s'"
 #~ msgstr "giá trị sparse không hợp lệ “%s�"
 
@@ -23817,7 +27206,7 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ 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 "
+#~ "hoặc chạy “git config fetch.showForcedUpdates false� để tránh kiểm tra "
 #~ "này.\n"
 
 #~ msgid ""
@@ -23838,7 +27227,7 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ "�ể 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."
+#~ "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"
@@ -23864,12 +27253,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgid "Server supports ofs-delta"
 #~ msgstr "Máy chủ hỗ trợ ofs-delta"
 
-#~ msgid "(HEAD detached at %s)"
-#~ msgstr "(HEAD được tách r�i tại %s)"
-
-#~ msgid "(HEAD detached from %s)"
-#~ msgstr "(HEAD được tách r�i từ %s)"
-
 #~ msgid "Checking out files"
 #~ msgstr "�ang lấy ra các tập tin"
 
@@ -23877,9 +27260,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ 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 open '%s'"
-#~ msgstr "gặp lỗi khi mở “%s�"
-
 #~ msgid "failed to stat %s\n"
 #~ msgstr "gặp lỗi khi lấy thông tin thống kê v� %s\n"
 
@@ -23901,9 +27281,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgid "unrecognized verb: %s"
 #~ msgstr "verb không được thừa nhận: %s"
 
-#~ msgid "hash version %X does not match version %X"
-#~ msgstr "phiên bản băm “%X� không có phiên bản khớp %X"
-
 #~ msgid "option '%s' requires a value"
 #~ msgstr "tùy ch�n “%s� yêu cầu một giá trị"
 
@@ -24070,9 +27447,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgid "make rebase script"
 #~ msgstr "tạo văn lệnh rebase"
 
-#~ msgid "No such remote: %s"
-#~ msgstr "Không có máy chủ nào như thế: %s"
-
 #~ 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"
 
@@ -24255,10 +27629,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgid "Or you can abort the rebase with 'git rebase --abort'."
 #~ msgstr "Hoặc là bạn có thể bãi b� lần cải tổ với lệnh “git rebase --abort�."
 
-#~ msgid "%"
-#~ msgid_plural "%"
-#~ msgstr[0] "%"
-
 #~ msgid "%s, %"
 #~ msgid_plural "%s, %"
 #~ msgstr[0] "%s, %"
@@ -24308,9 +27678,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgid "commit object"
 #~ msgstr "đối tượng lần chuyển giao"
 
-#~ msgid "tree object"
-#~ msgstr "đối tượng cây"
-
 #~ msgid "blob object"
 #~ msgstr "đối tượng blob"
 
@@ -24351,9 +27718,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgid "insanely long object directory %.*s"
 #~ msgstr "thư mục đối tượng dài một cách điên rồ %.*s"
 
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<các-tùy-ch�n>] <tin-nhắn> HEAD <commit>"
-
 #~ msgid "tag name too long: %.*s..."
 #~ msgstr "tên thẻ quá dài: %.*s…"
 
@@ -24406,18 +27770,12 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgstr ""
 #~ "Không thể thực hiện việc cherry-pick trong khi khi đang cherry-pick khác."
 
-#~ msgid "Could not parse line %d."
-#~ msgstr "Không phân tích được dòng %d."
-
 #~ 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 "%s: %s"
-#~ msgstr "%s: %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 đã"
 
@@ -24456,9 +27814,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ "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 2nd commit message:"
-#~ msgstr "�ây là chú thích cho lần chuyển giao thứ 2:"
-
 #~ msgid "This is the 3rd commit message:"
 #~ msgstr "�ây là chú thích cho lần chuyển giao thứ 3:"
 
@@ -24495,9 +27850,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgid "This is the ${n}rd commit message:"
 #~ msgstr "�ây là chú thích cho lần chuyển giao thứ ${n}:"
 
-#~ 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:"
-
 #~ msgid "The 2nd commit message will be skipped:"
 #~ msgstr "Chú thích cho lần chuyển giao thứ 2 sẽ bị b� qua:"
 
@@ -24582,9 +27934,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ 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"
 
@@ -24607,9 +27956,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ msgid "removing '%s' failed"
 #~ msgstr "gặp lỗi khi xóa b� “%s�"
 
-#~ msgid "Please call 'bisect_state' with at least one argument."
-#~ msgstr "Hãy g�i lệnhl “bisect_state� với ít nhất một đối số."
-
 #~ msgid ""
 #~ "If you want to reuse this local git directory instead of cloning again "
 #~ "from"
@@ -24752,9 +28098,6 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ 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'"
-#~ msgstr "không hỗ trợ đặc tả sắp xếp “%s�"
-
 #~ msgid "unsupported sort specification '%s' in variable '%s'"
 #~ msgstr "không hỗ trợ đặc tả sắp xếp “%s� trong biến “%s�"
 
@@ -25101,15 +28444,9 @@ msgstr "Bạn có thực sự muốn gửi %s? [y|N](có/KHÔNG): "
 #~ 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 "--detach cannot be used with -t"
-#~ msgstr "--detach không thể được sử dụng với tùy ch�n -t"
-
 #~ msgid "--orphan and -b|-B are mutually exclusive"
 #~ msgstr "Tùy ch�n --orphan và -b|-B loại từ lẫn nhau"
 
-#~ msgid "--orphan cannot be used with -t"
-#~ msgstr "--orphan không thể được sử dụng với tùy ch�n -t"
-
 #~ msgid "git checkout: -f and -m are incompatible"
 #~ msgstr "git checkout: hai tùy ch�n -f và -m xung khắc nhau"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ba03b1088f..abbf74cda7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -28,8 +28,9 @@
 #   bare repository                  |  纯仓库
 #   bisect                           |  二分查找
 #   blob object                      |  数�对象
+#   bloom filter                     |  布隆过滤器
 #   branch                           |  分支
-#   bundle                           |  包
+#   bundle                           |  归档包
 #   bypass                           |  绕过
 #   cache                            |  索引（的别称）
 #   chain                            |  （�交）链
@@ -91,6 +92,7 @@
 #   plumbing                         |  管件（Git 底层核心命令的别称）
 #   porcelain                        |  瓷件（Git 上层�装命令的别称）
 #   precious-objects repo            |  ��仓库
+#   promisor                         |  承诺者
 #   prune                            |  清除
 #   pull                             |  拉，拉�
 #   push                             |  推，推�
@@ -113,7 +115,7 @@
 #   shallow repository               |  浅（克隆）仓库
 #   signed tag                       |  签�标签
 #   smart HTTP protocol              |  智能 HTTP �议
-#   squash                           |  压缩
+#   squash                           |  挤压
 #   stage                            |  n. 暂存区（�索引）; v. 暂存
 #   stash                            |  n. 贮�区; v. 贮�
 #   submodule                        |  �模组
@@ -123,7 +125,7 @@
 #   tagger                           |  打标签者
 #   topic branch                     |  主题分支
 #   track                            |  跟踪
-#   trailer                          |  尾部署�
+#   trailer                          |  尾注
 #   tree                             |  树（工作区或树对象）
 #   tree object                      |  树对象
 #   tree-ish (also treeish)          |  树对象（或�以解�为一树对象）
@@ -139,8 +141,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2019-10-28 13:19+0800\n"
-"PO-Revision-Date: 2019-10-30 14:58+0800\n"
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"PO-Revision-Date: 2021-08-14 17:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "Language: zh_CN\n"
@@ -149,37 +151,750 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: advice.c:109
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "嗯（%s）？"
+
+#: 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 "�能读�索引"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "二进制"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "æ— "
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "没有修改"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "æ›´æ–°"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr "�能暂存 '%s'"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+msgid "could not write index"
+msgstr "�能写入索引"
+
+#: add-interactive.c:706 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
+#, 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
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "对路径 '%s' 的 make_cache_entry �作失败"
+
+#: add-interactive.c:759 git-add--interactive.perl:653
+msgid "Revert"
+msgstr "还原"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "�能解� HEAD^{tree}"
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "没有未跟踪的文件。\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "添加未跟踪的"
+
+#: add-interactive.c:895 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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "忽略未�入的：%s"
+
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "�有二进制文件被修改。\n"
+
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "没有修改。\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "补�更新"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "检视 diff"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "显示��更的路径"
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr "将工作区状�添加到暂存区修改集中"
+
+#: add-interactive.c:1014
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "将暂存的修改集��为 HEAD 版本"
+
+#: add-interactive.c:1016
+msgid "pick hunks and update selectively"
+msgstr "挑选数��并有选择地更新"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "显示 HEAD 和索引的差异"
+
+#: add-interactive.c:1020
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "将未跟踪文件的内容添加到暂存区修改集中"
+
+#: add-interactive.c:1028 add-interactive.c:1077
+msgid "Prompt help:"
+msgstr "帮助："
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "选择一个�目"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "选择一系列�目"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "选择多个范围"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "基于唯一�缀选择�目"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "�选指定的�目"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "选择所有�目"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "（空）结�选择"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "选择一个编��目"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "（空）�选择任何内容"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** 命令 ***"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "请选择"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "缓存"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "未缓存"
+
+#: 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 "路径"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "�能刷新索引"
+
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "��。\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "暂存该� [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 "如果补�能正确地应用，编辑�将立�标记为暂存。"
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 暂存该�\n"
+"n - ��暂存该�\n"
+"q - 退出。�暂存该����的全部�\n"
+"a - 暂存该�和本文件中��的全部�\n"
+"d - �暂存该�和本文件中��的全部�\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 "贮�模��更 [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 "贮�删除动作 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "贮�该� [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 "如果补�能正确地应用，编辑�将立�标记为贮�。"
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 贮�该�\n"
+"n - ��贮�该�\n"
+"q - 退出。�贮�该����的全部�\n"
+"a - 贮�该�和本文件中��的全部�\n"
+"d - �贮�该�和本文件中��的全部�\n"
+
+#: add-patch.c:80 git-add--interactive.perl:1443
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "�消暂存该� [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 "如果补�能正确地应用，编辑�将立�标记为未暂存。"
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - �消暂存该�\n"
+"n - ���消暂存该�\n"
+"q - 退出。���消暂存该����的全部�\n"
+"a - �消暂存该�和本文件中��的全部�\n"
+"d - ���消暂存该�和本文件中��的全部�\n"
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "将该�应用到索引 [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 "如果补�能正确地应用，编辑�将立�标记为应用。"
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在索引中应用该�\n"
+"n - ��在索引中应用该�\n"
+"q - 退出。��应用该����的全部�\n"
+"a - 应用该�和本文件中��的全部�\n"
+"d - ��应用该�和本文件中��的全部�\n"
+
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "从工作区中丢弃该� [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 "如果补�能正确地应用，编辑�将立�标记为丢弃。"
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在工作区中丢弃该�\n"
+"n - ��在工作区中丢弃该�\n"
+"q - 退出。��丢弃该����的全部�\n"
+"a - 丢弃该�和本文件中��的全部�\n"
+"d - ��丢弃该�和本文件中��的全部�\n"
+
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在索引和工作区中丢弃该�\n"
+"n - ��在索引和工作区中丢弃该�\n"
+"q - 退出。��丢弃该����的全部�\n"
+"a - 丢弃该�和本文件中��的全部�\n"
+"d - ��丢弃该�和本文件中��的全部�\n"
+
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在索引和工作区中应用该�\n"
+"n - ��在索引和工作区中应用该�\n"
+"q - 退出。��应用该����的全部�\n"
+"a - 应用该�和本文件中��的全部�\n"
+"d - ��应用该�和本文件中��的全部�\n"
+
+#: add-patch.c:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在工作区中应用该�\n"
+"n - ��在工作区中应用该�\n"
+"q - 退出。��应用该����的全部�\n"
+"a - 应用该�和本文件中��的全部�\n"
+"d - ��应用该�和本文件中��的全部�\n"
+
+#: add-patch.c:343
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "无法解�数��头信� '%.*s'"
+
+#: add-patch.c:362 add-patch.c:366
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "无法解�彩色数��头信� '%.*s'"
+
+#: add-patch.c:420
+msgid "could not parse diff"
+msgstr "�能解�差异信�"
+
+#: add-patch.c:439
+msgid "could not parse colored diff"
+msgstr "�能解�彩色差异信�"
+
+#: add-patch.c:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr "�行 '%s' 失败"
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "interactive.diffFilter 的输出�匹�"
+
+#: 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:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"预期上下文行 #%d 于\n"
+"%.*s"
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"����：\n"
+"%.*s\n"
+"\t�是结尾于：\n"
+"%.*s"
+
+#: 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:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"�删除 '%c' 开始的行，使其�为 ' ' 开始的行（上下文）。\n"
+"�删除 '%c' 开始的行，删除它们。\n"
+"以 %c 开始的行将被删除。\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: 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"
+
+#: add-patch.c:1133
+msgid "could not parse hunk header"
+msgstr "无法解�数��头信�"
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr "'git apply --cached' 失败"
+
+#. 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.
+#.
+#. 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:1247 git-add--interactive.perl:1242
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr "您的编辑��能被应用。�新编辑（选择 \"no\" 丢弃�） [y/n]? "
+
+#: add-patch.c:1290
+msgid "The selected hunks do not apply to the index!"
+msgstr "选中的��能应用到索引�"
+
+#: add-patch.c:1291 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "无论如何都�应用到工作区么？"
+
+#: add-patch.c:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "未应用。\n"
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - 维�该�未决状�，查看下一个未决�\n"
+"J - 维�该�未决状�，查看下一个�\n"
+"k - 维�该�未决状�，查看上一个未决�\n"
+"K - 维�该�未决状�，查看上一个�\n"
+"g - 选择跳转到一个�\n"
+"/ - 查找和给定正则表达�匹�的�\n"
+"s - 拆分当��为更�的�\n"
+"e - 手动编辑当��\n"
+"? - 显示帮助\n"
+
+#: add-patch.c:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr "没有�一个�"
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr "没有下一个�"
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr "没有其它�供跳转的�"
+
+#: add-patch.c:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "跳转到哪个�（<回车> 查看更多）？ "
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "跳转到哪个�？"
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "无效数字：'%s'"
+
+#: 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:1575
+msgid "No other hunks to search"
+msgstr "没有其它�供查找的�"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "使用正则表达��索？"
+
+#: add-patch.c:1596
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "错误的正则表达� %s：%s"
+
+#: add-patch.c:1613
+msgid "No hunk matches the given pattern"
+msgstr "没有和给定模�相匹�的�"
+
+#: add-patch.c:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "对�起，�能拆分这个�"
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr "拆分为 %d �。"
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr "对�起，�能编辑这个�"
+
+#: add-patch.c:1680
+msgid "'git apply' failed"
+msgstr "'git apply' 失败"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"使用 \"git config advice.%s false\" �关闭此消�"
+
+#: advice.c:161
 #, c-format
 msgid "%shint: %.*s%s\n"
 msgstr "%s�示：%.*s%s\n"
 
-#: advice.c:162
+#: advice.c:252
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "无法拣选，因为您有未�并的文件。"
 
-#: advice.c:164
+#: advice.c:254
 msgid "Committing is not possible because you have unmerged files."
 msgstr "无法�交，因为您有未�并的文件。"
 
-#: advice.c:166
+#: advice.c:256
 msgid "Merging is not possible because you have unmerged files."
 msgstr "无法�并，因为您有未�并的文件。"
 
-#: advice.c:168
+#: advice.c:258
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "无法拉�，因为您有未�并的文件。"
 
-#: advice.c:170
+#: advice.c:260
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "无法回退，因为您有未�并的文件。"
 
-#: advice.c:172
+#: advice.c:262
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "无法 %s，因为您有未�并的文件。"
 
-#: advice.c:180
+#: 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."
@@ -187,23 +902,37 @@ msgstr ""
 "请在工作区改正文件，然�酌情使用 'git add/rm <文件>' 命令标记\n"
 "解决方案并�交。"
 
-#: advice.c:188
+#: advice.c:278
 msgid "Exiting because of an unresolved conflict."
 msgstr "因为存在未解决的冲�而退出。"
 
-#: advice.c:193 builtin/merge.c:1332
+#: advice.c:283 builtin/merge.c:1375
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未结�您的�并（存在 MERGE_HEAD）。"
 
-#: advice.c:195
+#: advice.c:285
 msgid "Please, commit your changes before merging."
 msgstr "请在�并�先�交您的修改。"
 
-#: advice.c:196
+#: advice.c:286
 msgid "Exiting because of unfinished merge."
 msgstr "因为存在未完�的�并而退出。"
 
-#: advice.c:202
+#: 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 ""
+"以下路径规格�匹�任何适�的路径，但它们和当�稀�检出之外的索引�目匹�：\n"
+
+#: 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"
@@ -250,82 +979,78 @@ msgstr "命令行以 \\ 结尾"
 msgid "unclosed quote"
 msgstr "未关闭的引�"
 
-#: apply.c:69
+#: apply.c:70
 #, c-format
 msgid "unrecognized whitespace option '%s'"
 msgstr "未能识别的空白字符选项 '%s'"
 
-#: apply.c:85
+#: apply.c:86
 #, c-format
 msgid "unrecognized whitespace ignore option '%s'"
 msgstr "未能识别的空白字符忽略选项 '%s'"
 
-#: apply.c:135
+#: apply.c:136
 msgid "--reject and --3way cannot be used together."
 msgstr "--reject 和 --3way �能�时使用。"
 
-#: apply.c:137
-msgid "--cached and --3way cannot be used together."
-msgstr "--cached 和 --3way �能�时使用。"
-
-#: apply.c:140
+#: apply.c:139
 msgid "--3way outside a repository"
 msgstr "--3way 在一个仓库之外"
 
-#: apply.c:151
+#: apply.c:150
 msgid "--index outside a repository"
 msgstr "--index 在一个仓库之外"
 
-#: apply.c:154
+#: apply.c:153
 msgid "--cached outside a repository"
 msgstr "--cached 在一个仓库之外"
 
-#: apply.c:801
+#: apply.c:800
 #, c-format
 msgid "Cannot prepare timestamp regexp %s"
 msgstr "无法准备时间戳正则表达� %s"
 
-#: apply.c:810
+#: apply.c:809
 #, c-format
 msgid "regexec returned %d for input: %s"
 msgstr "regexec 返回 %d，输入为：%s"
 
-#: apply.c:884
+#: apply.c:883
 #, c-format
 msgid "unable to find filename in patch at line %d"
 msgstr "�能在补�的第 %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 - 应为 /dev/null，但在第 %2$d 行得到 %1$s"
 
-#: 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 - 第 %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 - 第 %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 - 第 %d 行处应为 /dev/null"
 
-#: apply.c:963
+#: apply.c:962
 #, c-format
 msgid "invalid mode on line %d: %s"
 msgstr "第 %d 行包�无效文件模�：%s"
 
-#: apply.c:1282
+#: apply.c:1281
 #, c-format
 msgid "inconsistent header lines %d and %d"
 msgstr "�一致的文件头，%d 行和 %d 行"
 
-#: apply.c:1372
+#: apply.c:1371
 #, c-format
 msgid ""
 "git diff header lacks filename information when removing %d leading pathname "
@@ -336,92 +1061,92 @@ msgid_plural ""
 msgstr[0] "当移除 %d 个�导路径� git diff 头缺�文件�信�（第 %d 行）"
 msgstr[1] "当移除 %d 个�导路径� git diff 头缺�文件�信�（第 %d 行）"
 
-#: apply.c:1385
+#: apply.c:1384
 #, c-format
 msgid "git diff header lacks filename information (line %d)"
 msgstr "git diff 的头信�中缺�文件�信�（第 %d 行）"
 
-#: apply.c:1481
+#: apply.c:1480
 #, c-format
 msgid "recount: unexpected line: %.*s"
 msgstr "recount：�外的行：%.*s"
 
-#: apply.c:1550
+#: apply.c:1549
 #, c-format
 msgid "patch fragment without header at line %d: %.*s"
 msgstr "第 %d 行的补�片段没有头信�：%.*s"
 
-#: apply.c:1753
+#: apply.c:1752
 msgid "new file depends on old contents"
 msgstr "新文件�赖旧内容"
 
-#: apply.c:1755
+#: apply.c:1754
 msgid "deleted file still has contents"
 msgstr "删除的文件�有内容"
 
-#: apply.c:1789
+#: apply.c:1788
 #, c-format
 msgid "corrupt patch at line %d"
 msgstr "补�在第 %d 行��"
 
-#: apply.c:1826
+#: apply.c:1825
 #, c-format
 msgid "new file %s depends on old contents"
 msgstr "新文件 %s �赖旧内容"
 
-#: apply.c:1828
+#: apply.c:1827
 #, c-format
 msgid "deleted file %s still has contents"
 msgstr "删除的文件 %s �有内容"
 
-#: apply.c:1831
+#: apply.c:1830
 #, c-format
 msgid "** warning: file %s becomes empty but is not deleted"
 msgstr "** 警告：文件 %s �为空文件但并未删除"
 
-#: apply.c:1978
+#: apply.c:1977
 #, c-format
 msgid "corrupt binary patch at line %d: %.*s"
 msgstr "二进制补�在第 %d 行��：%.*s"
 
-#: apply.c:2015
+#: apply.c:2014
 #, c-format
 msgid "unrecognized binary patch at line %d"
 msgstr "未能识别的二进制补��于第 %d 行"
 
-#: apply.c:2177
+#: apply.c:2176
 #, c-format
 msgid "patch with only garbage at line %d"
 msgstr "补�文件的第 %d 行�有垃圾数�"
 
-#: apply.c:2263
+#: apply.c:2262
 #, c-format
 msgid "unable to read symlink %s"
 msgstr "无法读�符�链接 %s"
 
-#: apply.c:2267
+#: apply.c:2266
 #, c-format
 msgid "unable to open or read %s"
 msgstr "�能打开或读� %s"
 
-#: apply.c:2926
+#: apply.c:2935
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "无效的行首字符：'%c'"
 
-#: apply.c:3047
+#: 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] "� #%d �功应用于 %d（�移 %d 行）"
 msgstr[1] "� #%d �功应用于 %d（�移 %d 行）"
 
-#: apply.c:3059
+#: apply.c:3068
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文�少到（%ld/%ld）以在第 %d 行应用补�片段"
 
-#: apply.c:3065
+#: apply.c:3074
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -430,451 +1155,488 @@ msgstr ""
 "当查询：\n"
 "%.*s"
 
-#: apply.c:3087
+#: apply.c:3096
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "缺失 '%s' 的二进制补�数�"
 
-#: apply.c:3095
+#: apply.c:3104
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "�能��应用一个缺少到 '%s' 的��数��的二进制补�"
 
-#: apply.c:3142
+#: apply.c:3151
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "�能在 '%s' 上应用没有完整索引行的二进制补�"
 
-#: apply.c:3152
+#: apply.c:3162
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "补�应用到 '%s'（%s），但是和当�内容�匹�。"
 
-#: apply.c:3160
+#: apply.c:3170
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "补�应用到空文件 '%s'，但其并�空文件"
 
-#: apply.c:3178
+#: apply.c:3188
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "无法读� '%2$s' 必需的目标文件 %1$s"
 
-#: apply.c:3191
+#: apply.c:3201
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "二进制补�未应用到 '%s'"
 
-#: apply.c:3197
+#: apply.c:3208
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "到 '%s' 的二进制补�产生了�正确的结果（应为 %s，�为 %s）"
 
-#: apply.c:3218
+#: apply.c:3229
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "打补�失败：%s:%ld"
 
-#: apply.c:3341
+#: apply.c:3352
 #, c-format
 msgid "cannot checkout %s"
 msgstr "�能检出 %s"
 
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
+#: 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 "无法读� %s"
 
-#: apply.c:3401
+#: apply.c:3412
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "读��于符�链接中的 '%s'"
 
-#: apply.c:3430 apply.c:3673
+#: apply.c:3441 apply.c:3687
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路径 %s 已�被�命�/删除"
 
-#: apply.c:3516 apply.c:3688
+#: apply.c:3527 apply.c:3702
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：�存在于索引中"
 
-#: apply.c:3525 apply.c:3696
+#: apply.c:3536 apply.c:3710 apply.c:3954
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引�匹�"
 
-#: apply.c:3560
-msgid "repository lacks the necessary blob to fall back on 3-way merge."
-msgstr "仓库缺�必�的数�对象以进行三方�并。"
+#: apply.c:3571
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr "仓库缺�执行三方�并所必需的数�对象。"
 
-#: apply.c:3563
+#: apply.c:3574
 #, c-format
-msgid "Falling back to three-way merge...\n"
-msgstr "回�到三方�并...\n"
+msgid "Performing three-way merge...\n"
+msgstr "执行三方�并...\n"
 
-#: apply.c:3579 apply.c:3583
+#: apply.c:3590 apply.c:3594
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "无法读� '%s' 的当�内容"
 
-#: apply.c:3595
+#: apply.c:3606
 #, c-format
-msgid "Failed to fall back on three-way merge...\n"
-msgstr "无法回�到三方�并...\n"
+msgid "Failed to perform three-way merge...\n"
+msgstr "无法执行三方�并...\n"
 
-#: apply.c:3609
+#: apply.c:3620
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "应用补�到 '%s' 存在冲�。\n"
 
-#: apply.c:3614
+#: apply.c:3625
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "�功应用补�到 '%s'。\n"
 
-#: apply.c:3640
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "回�到直接应用...\n"
+
+#: apply.c:3654
 msgid "removal patch leaves file contents"
 msgstr "移除补��留下了文件内容"
 
-#: apply.c:3713
+#: apply.c:3727
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：错误类型"
 
-#: apply.c:3715
+#: apply.c:3729
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的类型是 %o，应为 %o"
 
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: 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 "无效路径 '%s'"
 
-#: apply.c:3924
+#: apply.c:3952
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已�存在于索引中"
 
-#: apply.c:3927
+#: apply.c:3956
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已�存在于工作区中"
 
-#: apply.c:3947
+#: apply.c:3976
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s 的新模�（%1$o）和旧模�（%3$o）�匹�"
 
-#: apply.c:3952
+#: apply.c:3981
 #, 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:3972
+#: apply.c:4001
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "�影�的文件 '%s' �于符�链接中"
 
-#: apply.c:3976
+#: apply.c:4005
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：补�未应用"
 
-#: apply.c:3991
+#: apply.c:4020
 #, c-format
 msgid "Checking patch %s..."
 msgstr "正在检查补� %s..."
 
-#: apply.c:4083
+#: apply.c:4112
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "�模组 %s 的 sha1 信�缺失或无效"
 
-#: apply.c:4090
+#: apply.c:4119
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模��更，但它�在当� HEAD 中"
 
-#: apply.c:4093
+#: apply.c:4122
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 信�缺失或无效（%s）。"
 
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
-#, c-format
-msgid "make_cache_entry failed for path '%s'"
-msgstr "对路径 '%s' 的 make_cache_entry �作失败"
-
-#: apply.c:4102
+#: apply.c:4131
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "�能在临时索引中添加 %s"
 
-#: apply.c:4112
+#: apply.c:4141
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "�能把临时索引写入到 %s"
 
-#: apply.c:4250
+#: apply.c:4279
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "�能从索引中移除 %s"
 
-#: apply.c:4284
+#: apply.c:4313
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "�模组 %s ��的补�"
 
-#: apply.c:4290
+#: apply.c:4319
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "�能对新建文件 '%s' 调用 stat"
 
-#: apply.c:4298
+#: apply.c:4327
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "�能为新建文件 %s 创建�端存储"
 
-#: apply.c:4304 apply.c:4449
+#: apply.c:4333 apply.c:4478
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "无法为 %s 添加缓存�目"
 
-#: apply.c:4347
+#: apply.c:4376 builtin/bisect--helper.c:525
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "写入 '%s' 失败"
 
-#: apply.c:4351
+#: apply.c:4380
 #, c-format
 msgid "closing file '%s'"
 msgstr "关闭文件 '%s'"
 
-#: apply.c:4421
+#: apply.c:4450
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "�能写文件 '%s' �� %o"
 
-#: apply.c:4519
+#: apply.c:4548
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "�功应用补� %s。"
 
-#: apply.c:4527
+#: apply.c:4556
 msgid "internal error"
 msgstr "内部错误"
 
-#: apply.c:4530
+#: apply.c:4559
 #, 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:4541
+#: apply.c:4570
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 文件�为 %.*s.rej"
 
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
 #, c-format
 msgid "cannot open %s"
 msgstr "�能打开 %s"
 
-#: apply.c:4563
+#: apply.c:4592
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "第 #%d 个片段�功应用。"
 
-#: apply.c:4567
+#: apply.c:4596
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒�第 #%d 个片段。"
 
-#: apply.c:4686
+#: apply.c:4725
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略过补� '%s'。"
 
-#: apply.c:4694
+#: apply.c:4733
 msgid "unrecognized input"
 msgstr "未能识别的输入"
 
-#: apply.c:4714
+#: apply.c:4753
 msgid "unable to read index file"
 msgstr "无法读�索引文件"
 
-#: apply.c:4871
+#: apply.c:4910
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "�能打开补� '%s'：%s"
 
-#: apply.c:4898
+#: apply.c:4937
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下�有 %d 个空白字符误用"
 msgstr[1] "抑制下�有 %d 个空白字符误用"
 
-#: apply.c:4904 apply.c:4919
+#: apply.c:4943 apply.c:4958
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d 行新增了空白字符误用。"
 msgstr[1] "%d 行新增了空白字符误用。"
 
-#: apply.c:4912
+#: 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 行。"
 msgstr[1] "修�空白错误�，应用了 %d 行。"
 
-#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
 msgid "Unable to write new index file"
 msgstr "无法写入新索引文件"
 
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
-msgid "path"
-msgstr "路径"
-
-#: apply.c:4956
+#: apply.c:4995
 msgid "don't apply changes matching the given path"
 msgstr "��应用与给出路径�匹�的�更"
 
-#: apply.c:4959
+#: apply.c:4998
 msgid "apply changes matching the given path"
 msgstr "应用与给出路径�匹�的�更"
 
-#: apply.c:4961 builtin/am.c:2206
+#: apply.c:5000 builtin/am.c:2318
 msgid "num"
 msgstr "æ•°å­—"
 
-#: apply.c:4962
+#: apply.c:5001
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "从传统的 diff 路径中移除指定数�的�导斜线"
 
-#: apply.c:4965
+#: apply.c:5004
 msgid "ignore additions made by the patch"
 msgstr "忽略补�中的添加的文件"
 
-#: apply.c:4967
+#: apply.c:5006
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "�应用补�，而是显示输入的差异统计（diffstat）"
 
-#: apply.c:4971
+#: apply.c:5010
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以�进制数显示添加和删除的行数"
 
-#: apply.c:4973
+#: apply.c:5012
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "�应用补�，而是显示输入的概�"
 
-#: apply.c:4975
+#: apply.c:5014
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "�应用补�，而是查看补�是��应用"
 
-#: apply.c:4977
+#: apply.c:5016
 msgid "make sure the patch is applicable to the current index"
 msgstr "确认补��以应用到当�索引"
 
-#: apply.c:4979
+#: apply.c:5018
 msgid "mark new files with `git add --intent-to-add`"
 msgstr "使用命令 `git add --intent-to-add` 标记新增文件"
 
-#: apply.c:4981
+#: apply.c:5020
 msgid "apply a patch without touching the working tree"
 msgstr "应用补�而�修改工作区"
 
-#: apply.c:4983
+#: apply.c:5022
 msgid "accept a patch that touches outside the working area"
 msgstr "接�修改工作区之外文件的补�"
 
-#: apply.c:4986
+#: apply.c:5025
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "还应用此补�（与 --stat/--summary/--check 选项�时使用）"
 
-#: apply.c:4988
-msgid "attempt three-way merge if a patch does not apply"
-msgstr "如果一个补��能应用则�试三方�并"
+#: apply.c:5027
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr "�试三路�并，如果失败则回�至正常补�模�"
 
-#: apply.c:4990
+#: apply.c:5029
 msgid "build a temporary index based on embedded index information"
 msgstr "创建一个临时索引基于嵌入的索引信�"
 
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
 msgid "paths are separated with NUL character"
 msgstr "路径以 NUL 字符分隔"
 
-#: apply.c:4995
+#: apply.c:5034
 msgid "ensure at least <n> lines of context match"
 msgstr "确�至少匹� <n> 行上下文"
 
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
-#: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
+#: 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 "动作"
 
-#: apply.c:4997
+#: apply.c:5036
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "检查新增和修改的行中间的空白字符滥用"
 
-#: apply.c:5000 apply.c:5003
+#: apply.c:5039 apply.c:5042
 msgid "ignore changes in whitespace when finding context"
 msgstr "查找上下文时忽略空白字符的�更"
 
-#: apply.c:5006
+#: apply.c:5045
 msgid "apply the patch in reverse"
 msgstr "��应用补�"
 
-#: apply.c:5008
+#: apply.c:5047
 msgid "don't expect at least one line of context"
 msgstr "无需至少一行上下文"
 
-#: apply.c:5010
+#: apply.c:5049
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "将拒�的补�片段�存在对应的 *.rej 文件中"
 
-#: apply.c:5012
+#: apply.c:5051
 msgid "allow overlapping hunks"
 msgstr "�许��的补�片段"
 
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 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 "冗长输出"
 
-#: apply.c:5015
+#: apply.c:5054
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "�许�正确的文件末尾�行符"
 
-#: apply.c:5018
+#: apply.c:5057
 msgid "do not trust the line counts in the hunk headers"
 msgstr "�信任补�片段的头信�中的行�"
 
-#: apply.c:5020 builtin/am.c:2194
+#: apply.c:5059 builtin/am.c:2306
 msgid "root"
 msgstr "根目录"
 
-#: apply.c:5021
+#: apply.c:5060
 msgid "prepend <root> to all filenames"
 msgstr "为所有文件��添加 <根目录>"
 
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "�能打开数�对象 %s"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "�支�的文件模�：0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "无法�动 '%s' 过滤器"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "无法�定��述符"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "'%s' 过滤器报告了错误"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "路径�是有效的 UTF-8：%s"
+
+#: archive-zip.c:322
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "路径太长（%d 字符，SHA1：%s）：%s"
+
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#, c-format
+msgid "deflate error (%d)"
+msgstr "压缩错误 (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "对于本系统时间戳太大：%<PRIuMAX>"
+
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<选项>] <树或�交> [<路径>...]"
+msgstr "git archive [<选项>] <树对象> [<路径>...]"
 
 #: archive.c:15
 msgid "git archive --list"
@@ -884,189 +1646,163 @@ msgstr "git archive --list"
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
 msgstr ""
-"git archive --remote <仓库> [--exec <命令>] [<选项>] <树或�交> [<路径>...]"
+"git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
 
 #: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: 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:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
+#: builtin/merge.c:1144
+#, c-format
+msgid "could not read '%s'"
+msgstr "�能读� '%s'"
+
+#: 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 "路径规格 '%s' 未匹�任何文件"
 
-#: archive.c:396
+#: archive.c:451
 #, c-format
 msgid "no such ref: %.*s"
 msgstr "无此引用：%.*s"
 
-#: archive.c:401
+#: archive.c:457
 #, c-format
 msgid "not a valid object name: %s"
 msgstr "�是一个有效的对象�：%s"
 
-#: archive.c:414
+#: archive.c:470
 #, c-format
 msgid "not a tree object: %s"
 msgstr "�是一个树对象：%s"
 
-#: archive.c:426
+#: archive.c:482
 msgid "current working directory is untracked"
 msgstr "当�工作目录未被跟踪"
 
-#: archive.c:457
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "文件未找到：%s"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "�是一个常规文件：%s"
+
+#: archive.c:552
 msgid "fmt"
 msgstr "格�"
 
-#: archive.c:457
+#: archive.c:552
 msgid "archive format"
 msgstr "归档格�"
 
-#: archive.c:458 builtin/log.c:1581
+#: archive.c:553 builtin/log.c:1775
 msgid "prefix"
 msgstr "�缀"
 
-#: archive.c:459
+#: archive.c:554
 msgid "prepend prefix to each pathname in the archive"
 msgstr "为归档中�个路径�加上�缀"
 
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
-#: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:186
+#: 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 "文件"
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr "将未跟踪文件添加到归档"
+
+#: archive.c:559 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr "归档写入此文件"
 
-#: archive.c:463
+#: archive.c:561
 msgid "read .gitattributes in working directory"
 msgstr "读�工作区中的 .gitattributes"
 
-#: archive.c:464
+#: archive.c:562
 msgid "report archived files on stderr"
 msgstr "在标准错误上报告归档文件"
 
-#: archive.c:465
-msgid "store only"
-msgstr "�存储"
-
-#: archive.c:466
-msgid "compress faster"
-msgstr "压缩速度更快"
-
-#: archive.c:474
-msgid "compress better"
-msgstr "压缩效果更好"
+#: archive.c:564
+msgid "set compression level"
+msgstr "设置压缩级别"
 
-#: archive.c:477
+#: archive.c:567
 msgid "list supported archive formats"
 msgstr "列出支�的归档格�"
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: 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 "仓库"
 
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:570 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "从远程仓库（<仓库>）��归档文件"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
 #: builtin/notes.c:498
 msgid "command"
 msgstr "命令"
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:572 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "远程 git-upload-archive 命令的路径"
 
-#: archive.c:489
+#: archive.c:579
 msgid "Unexpected option --remote"
 msgstr "未知�数 --remote"
 
-#: archive.c:491
+#: archive.c:581
 msgid "Option --exec can only be used together with --remote"
 msgstr "选项 --exec �能和 --remote �时使用"
 
-#: archive.c:493
+#: archive.c:583
 msgid "Unexpected option --output"
 msgstr "未知�数 --output"
 
-#: archive.c:515
+#: archive.c:585
+msgid "Options --add-file and --remote cannot be used together"
+msgstr "选项 --add-file 和 --remote �能�时使用"
+
+#: archive.c:607
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "未知归档格� '%s'"
 
-#: archive.c:522
+#: archive.c:616
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "�数�支�此格� '%s'：-%d"
 
-#: archive-tar.c:125 archive-zip.c:345
-#, c-format
-msgid "cannot stream blob %s"
-msgstr "�能打开数�对象 %s"
-
-#: archive-tar.c:266 archive-zip.c:363
-#, c-format
-msgid "unsupported file mode: 0%o (SHA1: %s)"
-msgstr "�支�的文件模�：0%o (SHA1: %s)"
-
-#: archive-tar.c:293 archive-zip.c:353
-#, c-format
-msgid "cannot read %s"
-msgstr "�能读� %s"
-
-#: archive-tar.c:465
-#, c-format
-msgid "unable to start '%s' filter"
-msgstr "无法�动 '%s' 过滤器"
-
-#: archive-tar.c:468
-msgid "unable to redirect descriptor"
-msgstr "无法�定��述符"
-
-#: archive-tar.c:475
-#, c-format
-msgid "'%s' filter reported error"
-msgstr "'%s' 过滤器报告了错误"
-
-#: archive-zip.c:314
-#, c-format
-msgid "path is not valid UTF-8: %s"
-msgstr "路径�是有效的 UTF-8：%s"
-
-#: archive-zip.c:318
-#, c-format
-msgid "path too long (%d chars, SHA1: %s): %s"
-msgstr "路径太长（%d 字符，SHA1：%s）：%s"
-
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
-#, c-format
-msgid "deflate error (%d)"
-msgstr "压缩错误 (%d)"
-
-#: archive-zip.c:609
-#, c-format
-msgid "timestamp too large for this system: %<PRIuMAX>"
-msgstr "对于本系统时间戳太大：%<PRIuMAX>"
-
-#: attr.c:213
+#: attr.c:202
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s �是一个有效的属性�"
 
-#: attr.c:370
+#: attr.c:363
 #, c-format
 msgid "%s not allowed: %s:%d"
 msgstr "��许 %s：%s:%d"
 
-#: attr.c:410
+#: attr.c:403
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -1074,22 +1810,22 @@ msgstr ""
 "负值模版在 git attributes 中被忽略\n"
 "当字符串确实�以感��开始时，使用 '\\!'。"
 
-#: bisect.c:468
+#: bisect.c:489
 #, c-format
 msgid "Badly quoted content in file '%s': %s"
 msgstr "文件 '%s' 包�错误的引用格�：%s"
 
-#: bisect.c:678
+#: bisect.c:699
 #, c-format
 msgid "We cannot bisect more!\n"
 msgstr "我们无法进行更多的二分查找�\n"
 
-#: bisect.c:733
+#: bisect.c:766
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "�是一个有效的�交� %s"
 
-#: bisect.c:758
+#: bisect.c:791
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -1098,7 +1834,7 @@ msgstr ""
 "�并基线 %s 是�的。\n"
 "这�味�介于 %s 和 [%s] 之间的 bug 已�被修�。\n"
 
-#: bisect.c:763
+#: bisect.c:796
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1107,7 +1843,7 @@ msgstr ""
 "�并基线 %s 是新的。\n"
 "介于 %s 和 [%s] 之间的属性已�被修改。\n"
 
-#: bisect.c:768
+#: bisect.c:801
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1116,7 +1852,7 @@ msgstr ""
 "�并基线 %s 是 %s。\n"
 "这�味�第一个 '%s' �交�于 %s 和 [%s] 之间。\n"
 
-#: bisect.c:776
+#: bisect.c:809
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1127,7 +1863,7 @@ msgstr ""
 "这�情况下 git 二分查找无法正常工作。\n"
 "您�能弄错了 %s 和 %s 版本？\n"
 
-#: bisect.c:789
+#: bisect.c:822
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1138,45 +1874,45 @@ msgstr ""
 "所以我们无法确认第一个 %s �交是�介于 %s 和 %s 之间。\n"
 "我们�旧继续。"
 
-#: bisect.c:822
+#: bisect.c:861
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "二分查找中：�并基线必须是�过测试的\n"
 
-#: bisect.c:865
+#: bisect.c:911
 #, c-format
 msgid "a %s revision is needed"
 msgstr "需�一个 %s 版本"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
 #, c-format
 msgid "could not create file '%s'"
 msgstr "�能创建文件 '%s'"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:987 builtin/merge.c:153
 #, c-format
 msgid "could not read file '%s'"
 msgstr "�能读�文件 '%s'"
 
-#: bisect.c:958
+#: bisect.c:1027
 msgid "reading bisect refs failed"
 msgstr "读�二分查找引用失败"
 
-#: bisect.c:977
+#: bisect.c:1057
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s �时为 %s 和 %s\n"
 
-#: bisect.c:985
+#: bisect.c:1066
 #, 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 ""
 "没有�现�测试的�交。\n"
 "�能您在�行时使用了错误的路径�数？\n"
 
-#: bisect.c:1004
+#: bisect.c:1095
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1186,44 +1922,44 @@ msgstr[1] "（大概 %d 步）"
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #.
-#: bisect.c:1010
+#: bisect.c:1101
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "二分查找中：在此之�，还剩 %d 个版本待测试 %s\n"
 msgstr[1] "二分查找中：在此之�，还剩 %d 个版本待测试 %s\n"
 
-#: blame.c:2700
+#: blame.c:2776
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents 和 --reverse �能混用。"
 
-#: blame.c:2714
+#: blame.c:2790
 msgid "cannot use --contents with final commit object name"
 msgstr "�能将 --contents 和最终的�交对象�共用"
 
-#: blame.c:2735
+#: blame.c:2811
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需�指定最新的�交"
 
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
-#: builtin/shortlog.c:192
+#: 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 "版本�历设置失败"
 
-#: blame.c:2762
+#: blame.c:2838
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr "--reverse 和 --first-parent 共用，需�第一祖先链上的�交范围"
 
-#: blame.c:2773
+#: blame.c:2849
 #, c-format
 msgid "no such path %s in %s"
 msgstr "在 %2$s 中无此路径 %1$s"
 
-#: blame.c:2784
+#: blame.c:2860
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "�能为路径 %2$s 读�数�对象 %1$s"
@@ -1351,424 +2087,447 @@ msgstr "歧义的对象�：'%s'。"
 msgid "Not a valid branch point: '%s'."
 msgstr "无效的分支点：'%s'。"
 
-#: branch.c:364
+#: branch.c:366
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' 已�检出到 '%s'"
 
-#: branch.c:387
+#: branch.c:389
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作区 %s 的 HEAD 指�没有被更新"
 
-#: bundle.c:36
+#: bundle.c:44
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "未能识别的归档包哈希算法：%s"
+
+#: bundle.c:48
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "未知能力 '%s'"
+
+#: bundle.c:74
 #, c-format
-msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' ��是一个 v2 版本的包文件"
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' ��是一个 v2 或 v3 版本的归档包文件"
 
-#: bundle.c:64
+#: bundle.c:113
 #, c-format
 msgid "unrecognized header: %s%s (%d)"
 msgstr "未能识别的包头：%s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
-#: builtin/commit.c:791
+#: 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 "�能打开 '%s'"
 
-#: bundle.c:143
+#: bundle.c:198
 msgid "Repository lacks these prerequisite commits:"
 msgstr "仓库中缺少这些必备的�交："
 
-#: bundle.c:146
+#: bundle.c:201
 msgid "need a repository to verify a bundle"
-msgstr "需�一个仓库�校验一个包"
+msgstr "需�一个仓库�校验一个归档包"
 
-#: bundle.c:197
+#: bundle.c:257
 #, c-format
 msgid "The bundle contains this ref:"
 msgid_plural "The bundle contains these %d refs:"
-msgstr[0] "这个包中�有这个引用："
-msgstr[1] "这个包中�有 %d 个引用："
+msgstr[0] "这个归档包中�有这个引用："
+msgstr[1] "这个归档包中�有 %d 个引用："
 
-#: bundle.c:204
+#: bundle.c:264
 msgid "The bundle records a complete history."
-msgstr "这个包记录一个完整历�。"
+msgstr "这个归档包记录一个完整历�。"
 
-#: bundle.c:206
+#: bundle.c:266
 #, c-format
 msgid "The bundle requires this ref:"
 msgid_plural "The bundle requires these %d refs:"
-msgstr[0] "这个包需�这个引用："
-msgstr[1] "这个包需� %d 个引用："
+msgstr[0] "这个归档包需�这个引用："
+msgstr[1] "这个归档包需� %d 个引用："
 
-#: bundle.c:272
+#: bundle.c:333
 msgid "unable to dup bundle descriptor"
-msgstr "无法�制 bundle �述符"
+msgstr "无法�制归档包�述符"
 
-#: bundle.c:279
+#: bundle.c:340
 msgid "Could not spawn pack-objects"
 msgstr "�能生� pack-objects 进程"
 
-#: bundle.c:290
+#: bundle.c:351
 msgid "pack-objects died"
 msgstr "pack-objects 终止"
 
-#: bundle.c:332
-msgid "rev-list died"
-msgstr "rev-list 终止"
-
-#: bundle.c:381
+#: bundle.c:400
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list 选项排除"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
+#: bundle.c:504
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "�支�的归档包版本 %d"
+
+#: bundle.c:506
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "�能写入，归档包版本 %d �支�算法 %s"
+
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "未能识别的�数：%s"
 
-#: bundle.c:468
+#: bundle.c:553
 msgid "Refusing to create empty bundle."
-msgstr "�能创建空包。"
+msgstr "�能创建空的归档包。"
 
-#: bundle.c:478
+#: bundle.c:563
 #, c-format
 msgid "cannot create '%s'"
 msgstr "�能创建 '%s'"
 
-#: bundle.c:503
+#: bundle.c:588
 msgid "index-pack died"
 msgstr "index-pack 终止"
 
-#: color.c:296
-#, c-format
-msgid "invalid color value: %.*s"
-msgstr "无效的颜色值：%.*s"
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
+msgstr "终止� ID 比预期更早出现"
 
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
+#: chunk-format.c:126
 #, c-format
-msgid "could not parse %s"
-msgstr "�能解� %s"
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "�正确的��移 %<PRIx64> 和 %<PRIx64>"
 
-#: commit.c:52
+#: chunk-format.c:133
 #, c-format
-msgid "%s %s is not a commit!"
-msgstr "%s %s �是一个�交�"
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "�现��的�ID %<PRIx32>"
 
-#: commit.c:192
-msgid ""
-"Support for <GIT_DIR>/info/grafts is deprecated\n"
-"and will be removed in a future Git version.\n"
-"\n"
-"Please use \"git replace --convert-graft-file\"\n"
-"to convert the grafts into replace refs.\n"
-"\n"
-"Turn this message off by running\n"
-"\"git config advice.graftFileDeprecated false\""
-msgstr ""
-"对 <GIT_DIR>/info/grafts 的支�已被弃用，并将在\n"
-"未�的Git版本中被移除。\n"
-"\n"
-"请使用 \"git replace --convert-graft-file\" 将\n"
-"grafts 转�为替�引用。\n"
-"\n"
-"设置 \"git config advice.graftFileDeprecated false\"\n"
-"�关闭本消�"
-
-#: commit.c:1128
-#, c-format
-msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
-msgstr "�交 %s 有一个��信的声称�自 %s 的 GPG 签�。"
-
-#: commit.c:1131
+#: chunk-format.c:147
 #, c-format
-msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "�交 %s 有一个错误的声称�自 %s 的 GPG 签�。"
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "最终�有�零 ID %<PRIx32>"
 
-#: commit.c:1134
+#: color.c:329
 #, c-format
-msgid "Commit %s does not have a GPG signature."
-msgstr "�交 %s 没有 GPG 签�。"
-
-#: commit.c:1137
-#, c-format
-msgid "Commit %s has a good GPG signature by %s\n"
-msgstr "�交 %s 有一个�自 %s 的好的 GPG 签�。\n"
+msgid "invalid color value: %.*s"
+msgstr "无效的颜色值：%.*s"
 
-#: commit.c:1391
-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 ""
-"警告：�交说明�符� UTF-8 字符编�。\n"
-"您�以通过修补�交�改正�交说明，或者将�置�� i18n.commitencoding\n"
-"设置为您项目所用的字符编�。\n"
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr "无效的哈希版本"
 
-#: commit-graph.c:127
+#: commit-graph.c:262
 msgid "commit-graph file is too small"
 msgstr "�交图形文件太�"
 
-#: commit-graph.c:192
+#: commit-graph.c:355
 #, c-format
 msgid "commit-graph signature %X does not match signature %X"
 msgstr "�交图形签� %X 和签� %X �匹�"
 
-#: commit-graph.c:199
+#: commit-graph.c:362
 #, c-format
 msgid "commit-graph version %X does not match version %X"
 msgstr "�交图形版本 %X 和版本 %X �匹�"
 
-#: commit-graph.c:206
+#: commit-graph.c:369
 #, c-format
 msgid "commit-graph hash version %X does not match version %X"
 msgstr "�交图形哈希版本 %X 和版本 %X �匹�"
 
-#: commit-graph.c:229
-msgid "commit-graph chunk lookup table entry missing; file may be incomplete"
-msgstr "�交图形�查找表�目丢失，文件�能�完整"
-
-#: commit-graph.c:240
+#: commit-graph.c:386
 #, c-format
-msgid "commit-graph improper chunk offset %08x%08x"
-msgstr "�交图形�正确的��移 %08x%08x"
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "�交图形文件太�，容�下 %u 个�"
 
-#: commit-graph.c:283
-#, c-format
-msgid "commit-graph chunk id %08x appears multiple times"
-msgstr "�交图形� id %08x 出现了多次"
-
-#: commit-graph.c:347
+#: commit-graph.c:482
 msgid "commit-graph has no base graphs chunk"
 msgstr "�交图形没有基础图形�"
 
-#: commit-graph.c:357
+#: commit-graph.c:492
 msgid "commit-graph chain does not match"
 msgstr "�交图形链�匹�"
 
-#: commit-graph.c:404
+#: commit-graph.c:540
 #, c-format
 msgid "invalid commit-graph chain: line '%s' not a hash"
 msgstr "无效的�交图形链：行 '%s' �是一个哈希值"
 
-#: commit-graph.c:430
+#: commit-graph.c:564
 msgid "unable to find all commit-graph files"
 msgstr "无法找到所有�交图形文件"
 
-#: commit-graph.c:561 commit-graph.c:621
+#: commit-graph.c:745 commit-graph.c:782
 msgid "invalid commit position. commit-graph is likely corrupt"
 msgstr "无效的�交�置。�交图形�能已��"
 
-#: commit-graph.c:582
+#: commit-graph.c:766
 #, c-format
 msgid "could not find commit %s"
 msgstr "无法找到�交 %s"
 
-#: commit-graph.c:855 builtin/am.c:1287
+#: 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 "�能解��交 %s"
 
-#: commit-graph.c:859
-#, c-format
-msgid "unable to get tree for %s"
-msgstr "无法得到 %s 的树对象"
-
-#: commit-graph.c:1017 builtin/pack-objects.c:2641
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
 #, c-format
 msgid "unable to get type of object %s"
 msgstr "无法获得对象 %s 类型"
 
-#: commit-graph.c:1049
+#: commit-graph.c:1368
 msgid "Loading known commits in commit graph"
 msgstr "正在加载�交图中的已知�交"
 
-#: commit-graph.c:1066
+#: commit-graph.c:1385
 msgid "Expanding reachable commits in commit graph"
 msgstr "正在扩展�交图中的�达�交"
 
-#: commit-graph.c:1085
+#: commit-graph.c:1405
 msgid "Clearing commit marks in commit graph"
 msgstr "正在清除�交图中的�交标记"
 
-#: commit-graph.c:1104
+#: 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:1179
+#: commit-graph.c:1558
+msgid "Computing commit changed paths Bloom filters"
+msgstr "计算�交�更路径的布隆过滤器"
+
+#: commit-graph.c:1635
+msgid "Collecting referenced commits"
+msgstr "正在收集引用的�交"
+
+#: 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] "正在 %d 个包中查找�交图的�交"
 msgstr[1] "正在 %d 个包中查找�交图的�交"
 
-#: commit-graph.c:1192
+#: commit-graph.c:1673
 #, c-format
 msgid "error adding pack %s"
 msgstr "添加包 %s 出错"
 
-#: commit-graph.c:1196
+#: commit-graph.c:1677
 #, c-format
 msgid "error opening index for %s"
 msgstr "为 %s 打开索引出错"
 
-#: commit-graph.c:1220
-#, c-format
-msgid "Finding commits for commit graph from %d ref"
-msgid_plural "Finding commits for commit graph from %d refs"
-msgstr[0] "正在从 %d 个引用中查找�交图的�交"
-msgstr[1] "正在从 %d 个引用中查找�交图的�交"
-
-#: commit-graph.c:1240
-#, c-format
-msgid "invalid commit object id: %s"
-msgstr "无效的�交对象 ID：%s"
-
-#: commit-graph.c:1255
+#: commit-graph.c:1714
 msgid "Finding commits for commit graph among packed objects"
 msgstr "正在打包对象中查找�交图的�交"
 
-#: commit-graph.c:1270
-msgid "Counting distinct commits in commit graph"
-msgstr "正在计算�交图中��的�交"
-
-#: commit-graph.c:1300
+#: commit-graph.c:1732
 msgid "Finding extra edges in commit graph"
 msgstr "正在查找�交图中�外的边"
 
-#: commit-graph.c:1346
+#: commit-graph.c:1781
 msgid "failed to write correct number of base graph ids"
 msgstr "无法写入正确数�的基础图形 ID"
 
-#: commit-graph.c:1379 midx.c:810
+#: commit-graph.c:1812 midx.c:911
 #, c-format
 msgid "unable to create leading directories of %s"
 msgstr "�能为 %s 创建先导目录"
 
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr "无法创建临时图层"
+
+#: commit-graph.c:1830
 #, c-format
-msgid "unable to create '%s'"
-msgstr "�能创建 '%s'"
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "无法为 '%s' 调整共享��"
 
-#: commit-graph.c:1451
+#: 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] "正在用 %d 步写出�交图"
 msgstr[1] "正在用 %d 步写出�交图"
 
-#: commit-graph.c:1492
+#: commit-graph.c:1923
 msgid "unable to open commit-graph chain file"
 msgstr "无法打开�交图形链文件"
 
-#: commit-graph.c:1504
+#: commit-graph.c:1939
 msgid "failed to rename base commit-graph file"
 msgstr "无法�命�基础�交图形文件"
 
-#: commit-graph.c:1524
+#: commit-graph.c:1959
 msgid "failed to rename temporary commit-graph file"
 msgstr "无法�命�临时�交图形文件"
 
-#: commit-graph.c:1635
+#: commit-graph.c:2092
 msgid "Scanning merged commits"
 msgstr "正在扫��并�交"
 
-#: commit-graph.c:1646
-#, c-format
-msgid "unexpected duplicate commit id %s"
-msgstr "�外的���交 ID %s"
-
-#: commit-graph.c:1670
+#: commit-graph.c:2136
 msgid "Merging commit-graph"
 msgstr "正在�并�交图形"
 
-#: commit-graph.c:1860
-#, c-format
-msgid "the commit graph format cannot write %d commits"
-msgstr "�交图格��能写入 %d 个�交"
+#: commit-graph.c:2244
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr "正�试写�交图，但是 'core.commitGraph' 被�用"
 
-#: commit-graph.c:1871
+#: commit-graph.c:2351
 msgid "too many commits to write graph"
 msgstr "�交太多�能画图"
 
-#: commit-graph.c:1961
+#: commit-graph.c:2449
 msgid "the commit-graph file has incorrect checksum and is likely corrupt"
 msgstr "�交图文件的校验�错误，�能已���"
 
-#: commit-graph.c:1971
+#: commit-graph.c:2459
 #, c-format
 msgid "commit-graph has incorrect OID order: %s then %s"
 msgstr "�交图形的对象 ID 顺��正确：%s 然� %s"
 
-#: commit-graph.c:1981 commit-graph.c:1996
+#: commit-graph.c:2469 commit-graph.c:2484
 #, c-format
 msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
 msgstr "�交图形有�正确的扇出值：fanout[%d] = %u != %u"
 
-#: commit-graph.c:1988
+#: commit-graph.c:2476
 #, c-format
 msgid "failed to parse commit %s from commit-graph"
 msgstr "无法从�交图形中解��交 %s"
 
-#: commit-graph.c:2006
+#: commit-graph.c:2494
 msgid "Verifying commits in commit graph"
 msgstr "正在校验�交图中的�交"
 
-#: commit-graph.c:2020
+#: commit-graph.c:2509
 #, c-format
 msgid "failed to parse commit %s from object database for commit-graph"
 msgstr "无法从�交图形的对象库中解��交 %s"
 
-#: commit-graph.c:2027
+#: commit-graph.c:2516
 #, c-format
 msgid "root tree OID for commit %s in commit-graph is %s != %s"
 msgstr "�交图形中的�交 %s 的根树对象 ID 是 %s != %s"
 
-#: commit-graph.c:2037
+#: commit-graph.c:2526
 #, c-format
 msgid "commit-graph parent list for commit %s is too long"
 msgstr "�交 %s 的�交图形父�交列表太长了"
 
-#: commit-graph.c:2046
+#: commit-graph.c:2535
 #, c-format
 msgid "commit-graph parent for %s is %s != %s"
 msgstr "%s 的�交图形父�交是 %s != %s"
 
-#: commit-graph.c:2059
+#: commit-graph.c:2549
 #, c-format
 msgid "commit-graph parent list for commit %s terminates early"
 msgstr "�交 %s 的�交图形父�交列表过早终止"
 
-#: commit-graph.c:2064
+#: commit-graph.c:2554
 #, c-format
 msgid ""
 "commit-graph has generation number zero for commit %s, but non-zero elsewhere"
 msgstr "�交图形中�交 %s 的世代�是零，但其它地方�零"
 
-#: commit-graph.c:2068
+#: commit-graph.c:2558
 #, c-format
 msgid ""
 "commit-graph has non-zero generation number for commit %s, but zero elsewhere"
 msgstr "�交图形中�交 %s 的世代��零，但其它地方是零"
 
-#: commit-graph.c:2083
+#: commit-graph.c:2575
 #, c-format
-msgid "commit-graph generation for commit %s is %u != %u"
-msgstr "�交图形中的�交 %s 的世代�是 %u != %u"
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "�交图形中的�交 %s 的世代�是 %<PRIuMAX> < %<PRIuMAX>"
 
-#: commit-graph.c:2089
+#: commit-graph.c:2581
 #, 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: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 "�能解� %s"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s �是一个�交�"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"对 <GIT_DIR>/info/grafts 的支�已过时，并将在\n"
+"未�的Git版本中被移除。\n"
+"\n"
+"请使用 \"git replace --convert-graft-file\" 将\n"
+"grafts 转�为替�引用。\n"
+"\n"
+"设置 \"git config advice.graftFileDeprecated false\"\n"
+"�关闭本消�"
+
+#: commit.c:1237
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "�交 %s 有一个��信的声称�自 %s 的 GPG 签�。"
+
+#: commit.c:1241
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "�交 %s 有一个错误的声称�自 %s 的 GPG 签�。"
+
+#: commit.c:1244
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "�交 %s 没有 GPG 签�。"
+
+#: commit.c:1247
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "�交 %s 有一个�自 %s 的好的 GPG 签�。\n"
+
+#: 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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"警告：�交说明�符� UTF-8 字符编�。\n"
+"您�以通过修补�交�改正�交说明，或者将�置�� i18n.commitencoding\n"
+"设置为您项目所用的字符编�。\n"
+
 #: compat/obstack.c:406 compat/obstack.c:408
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: config.c:124
+#: config.c:126
 #, c-format
 msgid ""
 "exceeded maximum include depth (%d) while including\n"
@@ -1783,289 +2542,333 @@ msgstr ""
 "\t%2$s\n"
 "这�能是因为循环包�。"
 
-#: config.c:140
+#: config.c:142
 #, c-format
 msgid "could not expand include path '%s'"
 msgstr "无法扩展包�路径 '%s'"
 
-#: config.c:151
+#: config.c:153
 msgid "relative config includes must come from files"
 msgstr "相对路径的�置文件引用必须�自于文件"
 
-#: config.c:197
+#: config.c:199
 msgid "relative config include conditionals must come from files"
 msgstr "相对路径的�置文件�件引用必须�自于文件"
 
-#: config.c:376
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "无效的�置格�：%s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "�置 '%.*s' 缺少环境���称"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "缺少环境�� '%s' 于�置 '%.*s' "
+
+#: config.c:442
 #, c-format
 msgid "key does not contain a section: %s"
 msgstr "键�没有包�一个�节�称：%s"
 
-#: config.c:382
+#: config.c:448
 #, c-format
 msgid "key does not contain variable name: %s"
 msgstr "键�没有包����：%s"
 
-#: config.c:406 sequencer.c:2401
+#: config.c:472 sequencer.c:2785
 #, c-format
 msgid "invalid key: %s"
 msgstr "无效键�：%s"
 
-#: config.c:412
+#: config.c:478
 #, c-format
 msgid "invalid key (newline): %s"
 msgstr "无效键�（有�行符）：%s"
 
-#: config.c:448 config.c:460
+#: config.c:511
+msgid "empty config key"
+msgstr "空的�置键�"
+
+#: config.c:529 config.c:541
 #, c-format
 msgid "bogus config parameter: %s"
 msgstr "伪�置�数：%s"
 
-#: config.c:495
+#: config.c:555 config.c:572 config.c:579 config.c:588
 #, c-format
 msgid "bogus format in %s"
 msgstr "%s 中格�错误"
 
-#: config.c:821
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "%s 中错误计数"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "%s 中太多的�目"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "缺失�置键� %s"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "缺失�置�值 %s"
+
+#: config.c:995
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "数�对象 %2$s 中错误的�置行 %1$d"
 
-#: config.c:825
+#: config.c:999
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "文件 %2$s 中错误的�置行 %1$d"
 
-#: config.c:829
+#: config.c:1003
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "标准输入中错误的�置行 %d"
 
-#: config.c:833
+#: config.c:1007
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "�模组数�对象 %2$s 中错误的�置行 %1$d"
 
-#: config.c:837
+#: config.c:1011
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "命令行 %2$s 中错误的�置行 %1$d"
 
-#: config.c:841
+#: config.c:1015
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "在 %2$s 中错误的�置行 %1$d"
 
-#: config.c:978
+#: config.c:1152
 msgid "out of range"
 msgstr "超出范围"
 
-#: config.c:978
+#: config.c:1152
 msgid "invalid unit"
 msgstr "无效的��"
 
-#: config.c:979
+#: config.c:1153
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "�置�� '%2$s' 的数字�值 '%1$s' 设置错误：%3$s"
 
-#: config.c:998
+#: config.c:1163
 #, 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:1001
+#: config.c:1166
 #, 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:1004
+#: config.c:1169
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "标准输入中�置�� '%2$s' 错误的�值 '%1$s'：%3$s"
 
-#: config.c:1007
+#: config.c:1172
 #, 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:1010
+#: config.c:1175
 #, 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:1013
+#: config.c:1178
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "在 %3$s 中�置�� '%2$s' 错误的�值 '%1$s'：%4$s"
 
-#: config.c:1108
+#: config.c:1257
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "'%2$s' 的错误的布尔�值 '%1$s'"
+
+#: config.c:1275
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "无法扩展用户目录：'%s'"
 
-#: config.c:1117
+#: config.c:1284
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%2$s' 的值 '%1$s' �是一个有效的时间戳"
 
-#: config.c:1208
+#: config.c:1377
 #, c-format
 msgid "abbrev length out of range: %d"
 msgstr "缩写长度超出范围：%d"
 
-#: config.c:1222 config.c:1233
+#: config.c:1391 config.c:1402
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "错误的 zlib 压缩级别 %d"
 
-#: config.c:1325
+#: config.c:1494
 msgid "core.commentChar should only be one character"
 msgstr "core.commentChar 应该是一个字符"
 
-#: config.c:1358
+#: config.c:1527
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "无效的对象创建模�：%s"
 
-#: config.c:1425
+#: config.c:1599
 #, c-format
 msgid "malformed value for %s"
 msgstr "%s 的�值格�错误"
 
-#: config.c:1451
+#: config.c:1625
 #, c-format
 msgid "malformed value for %s: %s"
 msgstr "%s 的�值格�错误：%s"
 
-#: config.c:1452
+#: config.c:1626
 msgid "must be one of nothing, matching, simple, upstream or current"
 msgstr "必须是其中之一：nothing�matching�simple�upstream 或 current"
 
-#: config.c:1513 builtin/pack-objects.c:3394
+#: config.c:1687 builtin/pack-objects.c:4084
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "错误的打包压缩级别 %d"
 
-#: config.c:1634
+#: config.c:1809
 #, c-format
 msgid "unable to load config blob object '%s'"
 msgstr "无法从数�对象 '%s' 加载�置"
 
-#: config.c:1637
+#: config.c:1812
 #, c-format
 msgid "reference '%s' does not point to a blob"
 msgstr "引用 '%s' 没有指�一个数�对象"
 
-#: config.c:1654
+#: config.c:1829
 #, c-format
 msgid "unable to resolve config blob '%s'"
 msgstr "�能解��置对象 '%s'"
 
-#: config.c:1684
+#: config.c:1874
 #, c-format
 msgid "failed to parse %s"
 msgstr "解� %s 失败"
 
-#: config.c:1740
+#: config.c:1930
 msgid "unable to parse command-line config"
 msgstr "无法解�命令行中的�置"
 
-#: config.c:2091
+#: config.c:2294
 msgid "unknown error occurred while reading the configuration files"
 msgstr "在读��置文件时�到未知错误"
 
-#: config.c:2261
+#: config.c:2468
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "无效 %s：'%s'"
 
-#: config.c:2306
+#: config.c:2513
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 的�值 '%d' 应该介于 0 和 100 之间"
 
-#: config.c:2352
+#: config.c:2559
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "无法解�命令行�置中的 '%s'"
 
-#: config.c:2354
+#: config.c:2561
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "在文件 '%2$s' 的第 %3$d 行�现错误的�置�� '%1$s'"
 
-#: config.c:2435
+#: config.c:2645
 #, c-format
 msgid "invalid section name '%s'"
 msgstr "无效的�节�称 '%s'"
 
-#: config.c:2467
+#: config.c:2677
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s 有多个�值"
 
-#: config.c:2496
+#: config.c:2706
 #, c-format
 msgid "failed to write new configuration file %s"
 msgstr "写入新的�置文件 %s 失败"
 
-#: config.c:2748 config.c:3072
+#: config.c:2958 config.c:3285
 #, c-format
 msgid "could not lock config file %s"
 msgstr "�能�定�置文件 %s"
 
-#: config.c:2759
+#: config.c:2969
 #, c-format
 msgid "opening %s"
 msgstr "打开 %s"
 
-#: config.c:2794 builtin/config.c:328
+#: config.c:3006 builtin/config.c:361
 #, c-format
 msgid "invalid pattern: %s"
 msgstr "无效模�：%s"
 
-#: config.c:2819
+#: config.c:3031
 #, c-format
 msgid "invalid config file %s"
 msgstr "无效的�置文件 %s"
 
-#: config.c:2832 config.c:3085
+#: config.c:3044 config.c:3298
 #, c-format
 msgid "fstat on %s failed"
 msgstr "对 %s 调用 fstat 失败"
 
-#: config.c:2843
+#: config.c:3055
 #, c-format
-msgid "unable to mmap '%s'"
-msgstr "�能 mmap '%s'"
+msgid "unable to mmap '%s'%s"
+msgstr "�能 mmap '%s'%s"
 
-#: config.c:2852 config.c:3090
+#: config.c:3065 config.c:3303
 #, c-format
 msgid "chmod on %s failed"
 msgstr "对 %s 调用 chmod 失败"
 
-#: config.c:2937 config.c:3187
+#: config.c:3150 config.c:3400
 #, c-format
 msgid "could not write config file %s"
 msgstr "�能写入�置文件 %s"
 
-#: config.c:2971
+#: config.c:3184
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "�能设置 '%s' 为 '%s'"
 
-#: config.c:2973 builtin/remote.c:782
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
 #, c-format
 msgid "could not unset '%s'"
 msgstr "�能�消设置 '%s'"
 
-#: config.c:3063
+#: config.c:3276
 #, c-format
 msgid "invalid section name: %s"
 msgstr "无效的�节�称：%s"
 
-#: config.c:3230
+#: config.c:3443
 #, c-format
 msgid "missing value for '%s'"
 msgstr "%s 的�值缺失"
@@ -2090,72 +2893,81 @@ msgstr ""
 msgid "server doesn't support '%s'"
 msgstr "�务器�支� '%s'"
 
-#: connect.c:103
+#: connect.c:118
 #, c-format
 msgid "server doesn't support feature '%s'"
 msgstr "�务器�支�特性 '%s'"
 
-#: connect.c:114
+#: connect.c:129
 msgid "expected flush after capabilities"
 msgstr "在能力之�应为一个 flush 包"
 
-#: connect.c:233
+#: connect.c:263
 #, c-format
 msgid "ignoring capabilities after first line '%s'"
 msgstr "忽略第一行 '%s' 之�的能力字段"
 
-#: connect.c:252
+#: connect.c:284
 msgid "protocol error: unexpected capabilities^{}"
 msgstr "�议错误：�外的 capabilities^{}"
 
-#: connect.c:273
+#: connect.c:306
 #, c-format
 msgid "protocol error: expected shallow sha-1, got '%s'"
 msgstr "�议错误：预期浅克隆 sha-1，�得到 '%s'"
 
-#: connect.c:275
+#: connect.c:308
 msgid "repository on the other end cannot be shallow"
 msgstr "�一端的仓库�能是浅克隆仓库"
 
-#: connect.c:313
+#: connect.c:347
 msgid "invalid packet"
 msgstr "无效数�包"
 
-#: connect.c:333
+#: connect.c:367
 #, c-format
 msgid "protocol error: unexpected '%s'"
 msgstr "�议错误：�外的 '%s'"
 
-#: connect.c:441
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "�务器给出未知的对象格� '%s'"
+
+#: connect.c:526
 #, c-format
 msgid "invalid ls-refs response: %s"
 msgstr "无效的 ls-refs �应：%s"
 
-#: connect.c:445
+#: connect.c:530
 msgid "expected flush after ref listing"
 msgstr "在引用列表之�应该有一个 flush 包"
 
-#: connect.c:544
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "在引用列表之�应该有�应结�包"
+
+#: connect.c:666
 #, c-format
 msgid "protocol '%s' is not supported"
 msgstr "�支� '%s' �议"
 
-#: connect.c:595
+#: connect.c:717
 msgid "unable to set SO_KEEPALIVE on socket"
 msgstr "无法为 socket 设置 SO_KEEPALIVE"
 
-#: connect.c:635 connect.c:698
+#: connect.c:757 connect.c:820
 #, c-format
 msgid "Looking up %s ... "
 msgstr "查找 %s ..."
 
-#: connect.c:639
+#: connect.c:761
 #, 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:643 connect.c:714
+#: connect.c:765 connect.c:836
 #, c-format
 msgid ""
 "done.\n"
@@ -2164,7 +2976,7 @@ msgstr ""
 "完�。\n"
 "连接到 %s（端� %s）... "
 
-#: connect.c:665 connect.c:742
+#: connect.c:787 connect.c:864
 #, c-format
 msgid ""
 "unable to connect to %s:\n"
@@ -2174,87 +2986,91 @@ msgstr ""
 "%s"
 
 #. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
-#: connect.c:671 connect.c:748
+#: connect.c:793 connect.c:870
 msgid "done."
 msgstr "完�。"
 
-#: connect.c:702
+#: connect.c:824
 #, c-format
 msgid "unable to look up %s (%s)"
 msgstr "无法查找 %s（%s）"
 
-#: connect.c:708
+#: connect.c:830
 #, c-format
 msgid "unknown port %s"
 msgstr "未知端� %s"
 
-#: connect.c:845 connect.c:1175
+#: connect.c:967 connect.c:1299
 #, c-format
 msgid "strange hostname '%s' blocked"
 msgstr "已阻止奇怪的主机� '%s'"
 
-#: connect.c:847
+#: connect.c:969
 #, c-format
 msgid "strange port '%s' blocked"
 msgstr "已阻止奇怪的端�� '%s'"
 
-#: connect.c:857
+#: connect.c:979
 #, c-format
 msgid "cannot start proxy %s"
 msgstr "�能�动代� %s"
 
-#: connect.c:928
+#: connect.c:1050
 msgid "no path specified; see 'git help pull' for valid url syntax"
 msgstr "未指定路径，执行 'git help pull' 查看有效的 url 语法"
 
-#: connect.c:1123
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "在 git:// 主机和仓库路径中�止使用�行符"
+
+#: connect.c:1247
 msgid "ssh variant 'simple' does not support -4"
 msgstr "ssh �体 'simple' �支� -4"
 
-#: connect.c:1135
+#: connect.c:1259
 msgid "ssh variant 'simple' does not support -6"
 msgstr "ssh �体 'simple' �支� -6"
 
-#: connect.c:1152
+#: connect.c:1276
 msgid "ssh variant 'simple' does not support setting port"
 msgstr "ssh �体 'simple' �支�设置端�"
 
-#: connect.c:1264
+#: connect.c:1388
 #, c-format
 msgid "strange pathname '%s' blocked"
 msgstr "已阻止奇怪的路径� '%s'"
 
-#: connect.c:1311
+#: connect.c:1436
 msgid "unable to fork"
 msgstr "无法 fork"
 
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "正在检查连通性"
 
-#: connected.c:100
+#: connected.c:120
 msgid "Could not run 'git rev-list'"
 msgstr "�能执行 'git rev-list'"
 
-#: connected.c:120
+#: connected.c:144
 msgid "failed write to rev-list"
 msgstr "写入 rev-list 失败"
 
-#: connected.c:127
+#: connected.c:149
 msgid "failed to close rev-list's stdin"
 msgstr "关闭 rev-list 的标准输入失败"
 
-#: convert.c:194
+#: convert.c:183
 #, c-format
 msgid "illegal crlf_action %d"
-msgstr "�法的 crlf 动作 %d"
+msgstr "�法的 crlf_action %d"
 
-#: convert.c:207
+#: convert.c:196
 #, c-format
 msgid "CRLF would be replaced by LF in %s"
 msgstr "%s 中的 CRLF 将被 LF 替�"
 
-#: convert.c:209
+#: convert.c:198
 #, c-format
 msgid ""
 "CRLF will be replaced by LF in %s.\n"
@@ -2263,12 +3079,12 @@ msgstr ""
 "%s 中的 CRLF 将被 LF 替�。<\n"
 "在工作区中该文件���原有的�行符。"
 
-#: convert.c:217
+#: convert.c:206
 #, c-format
 msgid "LF would be replaced by CRLF in %s"
 msgstr "文件 %s 中的 LF 将被 CRLF 替�"
 
-#: convert.c:219
+#: convert.c:208
 #, c-format
 msgid ""
 "LF will be replaced by CRLF in %s.\n"
@@ -2277,24 +3093,25 @@ msgstr ""
 "%s 中的 LF 将被 CRLF 替�。\n"
 "在工作区中该文件���原有的�行符"
 
-#: convert.c:280
+#: convert.c:273
 #, c-format
 msgid "BOM is prohibited in '%s' if encoded as %s"
 msgstr "如果使用 %2$s 编�，�止在 '%1$s' 中使用 BOM"
 
-#: convert.c:287
+#: convert.c:280
 #, c-format
 msgid ""
-"The file '%s' contains a byte order mark (BOM). Please use UTF-%s as working-"
-"tree-encoding."
-msgstr "文件 '%s' 包�一个字节顺�标记（BOM）。请使用 UTF-%s 作为工作区编�。"
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr ""
+"文件 '%s' 包�一个字节顺�标记（BOM）。请使用 UTF-%.*s 作为工作区编�。"
 
-#: convert.c:305
+#: convert.c:293
 #, c-format
 msgid "BOM is required in '%s' if encoded as %s"
 msgstr "如果编�为 %2$s，需�在 '%1$s' 中使用 BOM"
 
-#: convert.c:307
+#: convert.c:295
 #, c-format
 msgid ""
 "The file '%s' is missing a byte order mark (BOM). Please use UTF-%sBE or UTF-"
@@ -2303,70 +3120,98 @@ msgstr ""
 "文件 '%s' 缺失一个字节顺�标记（BOM）。请使用 UTF-%sBE or UTF-%sLE（�决于字"
 "节�）作为工作区编�。"
 
-#: convert.c:425 convert.c:496
+#: convert.c:408 convert.c:479
 #, c-format
 msgid "failed to encode '%s' from %s to %s"
 msgstr "无法对 '%s' 进行从 %s 到 %s 的编�"
 
-#: convert.c:468
+#: convert.c:451
 #, c-format
 msgid "encoding '%s' from %s to %s and back is not the same"
 msgstr "将'%s' 的编�从 %s 到 %s �回转��一致"
 
-#: convert.c:674
+#: convert.c:654
 #, c-format
 msgid "cannot fork to run external filter '%s'"
 msgstr "�能 fork 以执行外部过滤器 '%s'"
 
-#: convert.c:694
+#: convert.c:674
 #, c-format
 msgid "cannot feed the input to external filter '%s'"
 msgstr "�能将输入传递给外部过滤器 '%s'"
 
-#: convert.c:701
+#: convert.c:681
 #, c-format
 msgid "external filter '%s' failed %d"
 msgstr "外部过滤器 '%s' 失败� %d"
 
-#: convert.c:736 convert.c:739
+#: convert.c:716 convert.c:719
 #, c-format
 msgid "read from external filter '%s' failed"
 msgstr "从外部过滤器 '%s' 读�失败"
 
-#: convert.c:742 convert.c:797
+#: convert.c:722 convert.c:777
 #, c-format
 msgid "external filter '%s' failed"
 msgstr "外部过滤器 '%s' 失败"
 
-#: convert.c:845
+#: convert.c:826
 msgid "unexpected filter type"
 msgstr "�外的过滤类型"
 
-#: convert.c:856
+#: convert.c:837
 msgid "path name too long for external filter"
 msgstr "外部过滤器的路径�太长"
 
-#: convert.c:930
+#: convert.c:935
 #, c-format
 msgid ""
 "external filter '%s' is not available anymore although not all paths have "
 "been filtered"
 msgstr "外部过滤器 '%s' ���用，但并�所有路径都已过滤"
 
-#: convert.c:1229
+#: convert.c:1236
 msgid "true/false are no valid working-tree-encodings"
 msgstr "true/false �是有效的工作区编�"
 
-#: convert.c:1417 convert.c:1451
+#: convert.c:1416 convert.c:1449
 #, c-format
 msgid "%s: clean filter '%s' failed"
 msgstr "%s：clean 过滤器 '%s' 失败"
 
-#: convert.c:1495
+#: convert.c:1492
 #, c-format
 msgid "%s: smudge filter %s failed"
 msgstr "%s：smudge 过滤器 %s 失败"
 
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "跳过凭�查询：credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "拒�使用缺少主机字段的凭�"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr "拒�使用缺少�议字段的凭�"
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "URL 的 %s 组件中包��行符：%s"
+
+#: credential.c:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "URL 没有 scheme：%s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "�能解�凭� URL：%s"
+
 #: date.c:138
 msgid "in the future"
 msgstr "在将�"
@@ -2459,46 +3304,62 @@ msgstr "�自 config 的数�岛正则表达�有太多的�获组（最多
 msgid "Marked %d islands, done.\n"
 msgstr "已标记 %d 个数�岛，结�。\n"
 
-#: diffcore-order.c:24
+#: diff-merges.c:70
 #, c-format
-msgid "failed to read orderfile '%s'"
-msgstr "读�排�文件 '%s' 失败"
+msgid "unknown value for --diff-merges: %s"
+msgstr "未知的 --diff-merges �值：%s"
 
-#: diffcore-rename.c:543
-msgid "Performing inexact rename detection"
-msgstr "正在进行�精确的�命�探测"
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base �适用于范围"
+
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr "--merge-base 仅适用于�交"
+
+#: diff-lib.c:576
+msgid "unable to get HEAD"
+msgstr "�能解� HEAD"
 
-#: diff-no-index.c:238
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr "未找到�并基线"
+
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr "找到了多��并基线"
+
+#: 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 比较工作区之外的两个路径"
+msgstr "�是 git 仓库。使用 --no-index 比较工作区之外的两个路径"
 
 #  译者：注����导空格
-#: diff.c:155
+#: diff.c:156
 #, c-format
 msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
 msgstr "  无法解� dirstat 截止（cut-off）百分比 '%s'\n"
 
 #  译者：注����导空格
-#: diff.c:160
+#: diff.c:161
 #, c-format
 msgid "  Unknown dirstat parameter '%s'\n"
 msgstr "  未知的 dirstat �数 '%s'\n"
 
-#: diff.c:296
+#: diff.c:297
 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:324
+#: diff.c:325
 #, c-format
 msgid ""
 "unknown color-moved-ws mode '%s', possible values are 'ignore-space-change', "
@@ -2507,18 +3368,18 @@ msgstr ""
 "未知的 color-moved-ws 模� '%s'，�能的�值有 'ignore-space-change'�'ignore-"
 "space-at-eol'�'ignore-all-space'�'allow-indentation-change'"
 
-#: diff.c:332
+#: diff.c:333
 msgid ""
 "color-moved-ws: allow-indentation-change cannot be combined with other "
 "whitespace modes"
 msgstr "color-moved-ws：allow-indentation-change �能与其它空白字符模�共用"
 
-#: diff.c:405
+#: diff.c:410
 #, c-format
 msgid "Unknown value for 'diff.submodule' config variable: '%s'"
 msgstr "�置�� 'diff.submodule' 未知的�值：'%s'"
 
-#: diff.c:465
+#: diff.c:470
 #, c-format
 msgid ""
 "Found errors in 'diff.dirstat' config variable:\n"
@@ -2527,35 +3388,46 @@ msgstr ""
 "�现�置�� 'diff.dirstat' 中的错误：\n"
 "%s"
 
-#: diff.c:4218
+#: diff.c:4282
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 退出，�止在 %s"
 
-#: diff.c:4563
+#: diff.c:4634
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only�--name-status�--check 和 -s 是互斥的"
 
-#: diff.c:4566
+#: diff.c:4637
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G�-S 和 --find-object 是互斥的"
 
-#: diff.c:4644
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr "-G 和 --pickaxe-regex 互斥，使用 --pickaxe-regex 和 -S"
+
+#: diff.c:4643
+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"
+
+#: diff.c:4722
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明确�求�跟一个路径规格"
 
-#: diff.c:4692
+#: diff.c:4770
 #, c-format
 msgid "invalid --stat value: %s"
 msgstr "无效的 --stat 值：%s"
 
-#: diff.c:4697 diff.c:4702 diff.c:4707 diff.c:4712 diff.c:5225
-#: parse-options.c:199 parse-options.c:203
+#: 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
 #, c-format
 msgid "%s expects a numerical value"
 msgstr "%s 期望一个数字值"
 
-#: diff.c:4729
+#: diff.c:4807
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -2564,195 +3436,200 @@ msgstr ""
 "无法解� --dirstat/-X 选项的�数：\n"
 "%s"
 
-#: diff.c:4814
+#: diff.c:4892
 #, c-format
 msgid "unknown change class '%c' in --diff-filter=%s"
 msgstr "--diff-filter=%2$s 中未知的�更类 '%1$c'"
 
-#: diff.c:4838
+#: diff.c:4916
 #, c-format
 msgid "unknown value after ws-error-highlight=%.*s"
 msgstr "ws-error-highlight=%.*s 之�未知的值"
 
-#: diff.c:4852
+#: diff.c:4930
 #, c-format
 msgid "unable to resolve '%s'"
 msgstr "�能解� '%s'"
 
-#: diff.c:4902 diff.c:4908
+#: diff.c:4980 diff.c:4986
 #, c-format
 msgid "%s expects <n>/<m> form"
 msgstr "%s 期望 <n>/<m> 格�"
 
-#: diff.c:4920
+#: diff.c:4998
 #, c-format
 msgid "%s expects a character, got '%s'"
 msgstr "%s 期望一个字符，得到 '%s'"
 
-#: diff.c:4941
+#: diff.c:5019
 #, c-format
 msgid "bad --color-moved argument: %s"
 msgstr "�的 --color-moved �数：%s"
 
-#: diff.c:4960
+#: diff.c:5038
 #, c-format
 msgid "invalid mode '%s' in --color-moved-ws"
 msgstr "--color-moved-ws 中的无效模� '%s' "
 
-#: diff.c:5000
+#: diff.c:5078
 msgid ""
 "option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
 "\"histogram\""
 msgstr ""
 "diff-algorithm 选项有 \"myers\"�\"minimal\"�\"patience\" 和 \"histogram\""
 
-#: diff.c:5036 diff.c:5056
+#: diff.c:5114 diff.c:5134
 #, c-format
 msgid "invalid argument to %s"
 msgstr "%s 的�数无效"
 
-#: diff.c:5194
+#: diff.c:5238
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "选项 -I 的正则表达�无效：'%s'"
+
+#: diff.c:5287
 #, c-format
 msgid "failed to parse --submodule option parameter: '%s'"
 msgstr "无法解� --submodule 选项的�数：'%s'"
 
-#: diff.c:5250
+#: diff.c:5343
 #, c-format
 msgid "bad --word-diff argument: %s"
 msgstr "�的 --word-diff �数：%s"
 
-#: diff.c:5273
+#: diff.c:5379
 msgid "Diff output format options"
 msgstr "差异输出格�化选项"
 
-#: diff.c:5275 diff.c:5281
+#: diff.c:5381 diff.c:5387
 msgid "generate patch"
 msgstr "生�补�"
 
-#: diff.c:5278 builtin/log.c:172
+#: diff.c:5384 builtin/log.c:179
 msgid "suppress diff output"
 msgstr "�显示差异输出"
 
-#: diff.c:5283 diff.c:5397 diff.c:5404
+#: diff.c:5389 diff.c:5503 diff.c:5510
 msgid "<n>"
 msgstr "<n>"
 
-#: diff.c:5284 diff.c:5287
+#: diff.c:5390 diff.c:5393
 msgid "generate diffs with <n> lines context"
 msgstr "生�� <n> 行上下文的差异"
 
-#: diff.c:5289
+#: diff.c:5395
 msgid "generate the diff in raw format"
 msgstr "生�原始格�的差异"
 
-#: diff.c:5292
+#: diff.c:5398
 msgid "synonym for '-p --raw'"
 msgstr "和 '-p --raw' �义"
 
-#: diff.c:5296
+#: diff.c:5402
 msgid "synonym for '-p --stat'"
 msgstr "和 '-p --stat' �义"
 
-#: diff.c:5300
+#: diff.c:5406
 msgid "machine friendly --stat"
 msgstr "机器�好的 --stat"
 
-#: diff.c:5303
+#: diff.c:5409
 msgid "output only the last line of --stat"
 msgstr "�输出 --stat 的最�一行"
 
-#: diff.c:5305 diff.c:5313
+#: diff.c:5411 diff.c:5419
 msgid "<param1,param2>..."
 msgstr "<�数1,�数2>..."
 
-#: diff.c:5306
+#: diff.c:5412
 msgid ""
 "output the distribution of relative amount of changes for each sub-directory"
 msgstr "输出�个�目录相对�更的分布"
 
-#: diff.c:5310
+#: diff.c:5416
 msgid "synonym for --dirstat=cumulative"
 msgstr "和 --dirstat=cumulative �义"
 
-#: diff.c:5314
+#: diff.c:5420
 msgid "synonym for --dirstat=files,param1,param2..."
 msgstr "是 --dirstat=files,param1,param2... 的�义�"
 
-#: diff.c:5318
+#: diff.c:5424
 msgid "warn if changes introduce conflict markers or whitespace errors"
 msgstr "如果�更中引入冲�定界符或空白错误，给出警告"
 
-#: diff.c:5321
+#: diff.c:5427
 msgid "condensed summary such as creations, renames and mode changes"
 msgstr "精简摘�，例如创建��命�和模��更"
 
-#: diff.c:5324
+#: diff.c:5430
 msgid "show only names of changed files"
 msgstr "�显示�更文件的文件�"
 
-#: diff.c:5327
+#: diff.c:5433
 msgid "show only names and status of changed files"
 msgstr "�显示�更文件的文件�和状�"
 
-#: diff.c:5329
+#: diff.c:5435
 msgid "<width>[,<name-width>[,<count>]]"
 msgstr "<宽度>[,<文件�宽度>[,<次数>]]"
 
-#: diff.c:5330
+#: diff.c:5436
 msgid "generate diffstat"
 msgstr "生�差异统计（diffstat）"
 
-#: diff.c:5332 diff.c:5335 diff.c:5338
+#: diff.c:5438 diff.c:5441 diff.c:5444
 msgid "<width>"
 msgstr "<宽度>"
 
-#: diff.c:5333
+#: diff.c:5439
 msgid "generate diffstat with a given width"
 msgstr "使用给定的长度生�差异统计"
 
-#: diff.c:5336
+#: diff.c:5442
 msgid "generate diffstat with a given name width"
 msgstr "使用给定的文件�长度生�差异统计"
 
-#: diff.c:5339
+#: diff.c:5445
 msgid "generate diffstat with a given graph width"
 msgstr "使用给定的图形长度生�差异统计"
 
-#: diff.c:5341
+#: diff.c:5447
 msgid "<count>"
 msgstr "<次数>"
 
-#: diff.c:5342
+#: diff.c:5448
 msgid "generate diffstat with limited lines"
 msgstr "生�有�行数的差异统计"
 
-#: diff.c:5345
+#: diff.c:5451
 msgid "generate compact summary in diffstat"
 msgstr "生�差异统计的简�摘�"
 
-#: diff.c:5348
+#: diff.c:5454
 msgid "output a binary diff that can be applied"
 msgstr "输出一个�以应用的二进制差异"
 
-#: diff.c:5351
+#: diff.c:5457
 msgid "show full pre- and post-image object names on the \"index\" lines"
 msgstr "在 \"index\" 行显示完整的��对象�称"
 
-#: diff.c:5353
+#: diff.c:5459
 msgid "show colored diff"
 msgstr "显示带颜色的差异"
 
-#: diff.c:5354
+#: diff.c:5460
 msgid "<kind>"
 msgstr "<类型>"
 
-#: diff.c:5355
+#: diff.c:5461
 msgid ""
 "highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
 "diff"
 msgstr "对于差异中的上下文�旧的和新的行，加亮显示错误的空白字符"
 
-#: diff.c:5358
+#: diff.c:5464
 msgid ""
 "do not munge pathnames and use NULs as output field terminators in --raw or "
 "--numstat"
@@ -2760,358 +3637,407 @@ msgstr ""
 "在 --raw 或者 --numstat 中，�对路径字符转�并使用 NUL 字符�为输出字段的分隔"
 "符"
 
-#: diff.c:5361 diff.c:5364 diff.c:5367 diff.c:5473
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
 msgid "<prefix>"
 msgstr "<�缀>"
 
-#: diff.c:5362
+#: diff.c:5468
 msgid "show the given source prefix instead of \"a/\""
 msgstr "显示给定的��缀�代 \"a/\""
 
-#: diff.c:5365
+#: diff.c:5471
 msgid "show the given destination prefix instead of \"b/\""
 msgstr "显示给定的目标�缀�代 \"b/\""
 
-#: diff.c:5368
+#: diff.c:5474
 msgid "prepend an additional prefix to every line of output"
 msgstr "输出的�一行附加�缀"
 
-#: diff.c:5371
+#: diff.c:5477
 msgid "do not show any source or destination prefix"
 msgstr "�显示任何�和目标�缀"
 
-#: diff.c:5374
+#: diff.c:5480
 msgid "show context between diff hunks up to the specified number of lines"
 msgstr "显示指定行数的差异�间的上下文"
 
-#: diff.c:5378 diff.c:5383 diff.c:5388
+#: diff.c:5484 diff.c:5489 diff.c:5494
 msgid "<char>"
 msgstr "<字符>"
 
-#: diff.c:5379
+#: diff.c:5485
 msgid "specify the character to indicate a new line instead of '+'"
 msgstr "指定一个字符�代 '+' �表示新的一行"
 
-#: diff.c:5384
+#: diff.c:5490
 msgid "specify the character to indicate an old line instead of '-'"
 msgstr "指定一个字符�代 '-' �表示旧的一行"
 
-#: diff.c:5389
+#: diff.c:5495
 msgid "specify the character to indicate a context instead of ' '"
 msgstr "指定一个字符�代 ' ' �表示一行上下文"
 
-#: diff.c:5392
+#: diff.c:5498
 msgid "Diff rename options"
 msgstr "差异�命�选项"
 
-#: diff.c:5393
+#: diff.c:5499
 msgid "<n>[/<m>]"
 msgstr "<n>[/<m>]"
 
-#: diff.c:5394
+#: diff.c:5500
 msgid "break complete rewrite changes into pairs of delete and create"
 msgstr "将完全�写的�更打破为�对的删除和创建"
 
-#: diff.c:5398
+#: diff.c:5504
 msgid "detect renames"
 msgstr "检测�命�"
 
-#: diff.c:5402
+#: diff.c:5508
 msgid "omit the preimage for deletes"
 msgstr "�略删除�作的差异输出"
 
-#: diff.c:5405
+#: diff.c:5511
 msgid "detect copies"
 msgstr "检测拷�"
 
-#: diff.c:5409
+#: diff.c:5515
 msgid "use unmodified files as source to find copies"
 msgstr "使用未修改的文件�为�现拷�的�"
 
-#: diff.c:5411
+#: diff.c:5517
 msgid "disable rename detection"
 msgstr "�用�命�探测"
 
-#: diff.c:5414
+#: diff.c:5520
 msgid "use empty blobs as rename source"
 msgstr "使用空的数�对象�为�命�的�"
 
-#: diff.c:5416
+#: diff.c:5522
 msgid "continue listing the history of a file beyond renames"
 msgstr "继续列出文件�命�以外的历�记录"
 
-#: diff.c:5419
+#: diff.c:5525
 msgid ""
 "prevent rename/copy detection if the number of rename/copy targets exceeds "
 "given limit"
 msgstr "如果�命�/拷�目标超过给定的�制，�止�命�/拷�检测"
 
-#: diff.c:5421
+#: diff.c:5527
 msgid "Diff algorithm options"
 msgstr "差异算法选项"
 
-#: diff.c:5423
+#: diff.c:5529
 msgid "produce the smallest possible diff"
 msgstr "生�尽�能�的差异"
 
-#: diff.c:5426
+#: diff.c:5532
 msgid "ignore whitespace when comparing lines"
 msgstr "行比较时忽略空白字符"
 
-#: diff.c:5429
+#: diff.c:5535
 msgid "ignore changes in amount of whitespace"
 msgstr "忽略空白字符的�更"
 
-#: diff.c:5432
+#: diff.c:5538
 msgid "ignore changes in whitespace at EOL"
 msgstr "忽略行尾的空白字符�更"
 
-#: diff.c:5435
+#: diff.c:5541
 msgid "ignore carrier-return at the end of line"
 msgstr "忽略行尾的回车符（CR）"
 
-#: diff.c:5438
+#: diff.c:5544
 msgid "ignore changes whose lines are all blank"
 msgstr "忽略整行都是空白的�更"
 
-#: diff.c:5441
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr "<正则>"
+
+#: diff.c:5547
+msgid "ignore changes whose all lines match <regex>"
+msgstr "忽略所有行都和正则表达�匹�的�更"
+
+#: diff.c:5550
 msgid "heuristic to shift diff hunk boundaries for easy reading"
 msgstr "���转�差异边界以便阅读"
 
-#: diff.c:5444
+#: diff.c:5553
 msgid "generate diff using the \"patience diff\" algorithm"
 msgstr "使用 \"patience diff\" 算法生�差异"
 
-#: diff.c:5448
+#: diff.c:5557
 msgid "generate diff using the \"histogram diff\" algorithm"
 msgstr "使用 \"histogram diff\" 算法生�差异"
 
-#: diff.c:5450
+#: diff.c:5559
 msgid "<algorithm>"
 msgstr "<算法>"
 
-#: diff.c:5451
+#: diff.c:5560
 msgid "choose a diff algorithm"
 msgstr "选择一个差异算法"
 
-#: diff.c:5453
+#: diff.c:5562
 msgid "<text>"
 msgstr "<文本>"
 
-#: diff.c:5454
+#: diff.c:5563
 msgid "generate diff using the \"anchored diff\" algorithm"
 msgstr "使用 \"anchored diff\" 算法生�差异"
 
-#: diff.c:5456 diff.c:5465 diff.c:5468
+#: diff.c:5565 diff.c:5574 diff.c:5577
 msgid "<mode>"
 msgstr "<模�>"
 
-#: diff.c:5457
+#: diff.c:5566
 msgid "show word diff, using <mode> to delimit changed words"
 msgstr "显示��差异，使用 <模�> 分隔�更的��"
 
-#: diff.c:5459 diff.c:5462 diff.c:5507
-msgid "<regex>"
-msgstr "<正则>"
-
-#: diff.c:5460
+#: diff.c:5569
 msgid "use <regex> to decide what a word is"
 msgstr "使用 <正则表达�> 确定何为一个�"
 
-#: diff.c:5463
+#: diff.c:5572
 msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
 msgstr "相当于 --word-diff=color --word-diff-regex=<正则>"
 
-#: diff.c:5466
+#: diff.c:5575
 msgid "moved lines of code are colored differently"
 msgstr "移动的代�行用��方��色"
 
-#: diff.c:5469
+#: diff.c:5578
 msgid "how white spaces are ignored in --color-moved"
 msgstr "在 --color-moved 下如何忽略空白字符"
 
-#: diff.c:5472
+#: diff.c:5581
 msgid "Other diff options"
 msgstr "其它差异选项"
 
-#: diff.c:5474
+#: diff.c:5583
 msgid "when run from subdir, exclude changes outside and show relative paths"
 msgstr "当从�目录�行，排除目录之外的�更并显示相对路径"
 
-#: diff.c:5478
+#: diff.c:5587
 msgid "treat all files as text"
 msgstr "把所有文件当�文本处�"
 
-#: diff.c:5480
+#: diff.c:5589
 msgid "swap two inputs, reverse the diff"
 msgstr "交�两个输入，�转差异"
 
-#: diff.c:5482
+#: diff.c:5591
 msgid "exit with 1 if there were differences, 0 otherwise"
 msgstr "有差异时退出�为 1，�则为 0"
 
-#: diff.c:5484
+#: diff.c:5593
 msgid "disable all output of the program"
 msgstr "�用本程�的所有输出"
 
-#: diff.c:5486
+#: diff.c:5595
 msgid "allow an external diff helper to be executed"
 msgstr "�许执行一个外置的差异助手"
 
-#: diff.c:5488
+#: diff.c:5597
 msgid "run external text conversion filters when comparing binary files"
 msgstr "当比较二进制文件时，�行外部的文本转�过滤器"
 
-#: diff.c:5490
+#: diff.c:5599
 msgid "<when>"
 msgstr "<何时>"
 
-#: diff.c:5491
+#: diff.c:5600
 msgid "ignore changes to submodules in the diff generation"
 msgstr "在生�差异时，忽略�模组的更改"
 
-#: diff.c:5494
+#: diff.c:5603
 msgid "<format>"
 msgstr "<格�>"
 
-#: diff.c:5495
+#: diff.c:5604
 msgid "specify how differences in submodules are shown"
 msgstr "指定�模组的差异如何显示"
 
-#: diff.c:5499
+#: diff.c:5608
 msgid "hide 'git add -N' entries from the index"
 msgstr "��索引中 'git add -N' �目"
 
-#: diff.c:5502
+#: diff.c:5611
 msgid "treat 'git add -N' entries as real in the index"
 msgstr "将索引中 'git add -N' �目当�真实的"
 
-#: diff.c:5504
+#: diff.c:5613
 msgid "<string>"
 msgstr "<字符串>"
 
-#: diff.c:5505
+#: diff.c:5614
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "string"
 msgstr "查找改�了指定字符串出现次数的差异"
 
-#: diff.c:5508
+#: diff.c:5617
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "regex"
 msgstr "查找改�指定正则匹�出现次数的差异"
 
-#: diff.c:5511
+#: diff.c:5620
 msgid "show all changes in the changeset with -S or -G"
 msgstr "显示使用 -S 或 -G 的�更集的所有�更"
 
-#: diff.c:5514
+#: diff.c:5623
 msgid "treat <string> in -S as extended POSIX regular expression"
 msgstr "将 -S 的 <string> 当�扩展的 POSIX 正则表达�"
 
-#: diff.c:5517
+#: diff.c:5626
 msgid "control the order in which files appear in the output"
 msgstr "控制输出中的文件显示顺�"
 
-#: diff.c:5518
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr "<路径>"
+
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr "先显示指定路径的�更"
+
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr "跳过指定路径的输出"
+
+#: diff.c:5633
 msgid "<object-id>"
 msgstr "<对象 ID>"
 
-#: diff.c:5519
+#: diff.c:5634
 msgid ""
 "look for differences that change the number of occurrences of the specified "
 "object"
 msgstr "查找改�指定对象出现次数的差异"
 
-#: diff.c:5521
+#: diff.c:5636
 msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
 msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
 
-#: diff.c:5522
+#: diff.c:5637
 msgid "select files by diff type"
 msgstr "通过差异类型选择文件"
 
-#: diff.c:5524
+#: diff.c:5639
 msgid "<file>"
 msgstr "<文件>"
 
-#: diff.c:5525
+#: diff.c:5640
 msgid "Output to a specific file"
 msgstr "输出到一个指定的文件"
 
-#: diff.c:6180
-msgid "inexact rename detection was skipped due to too many files."
-msgstr "因为文件太多，略过�严格的�命�检查。"
+#: diff.c:6298
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr "由于文件太多，跳过详尽的�命�检查。"
 
-#: diff.c:6183
+#: diff.c:6301
 msgid "only found copies from modified paths due to too many files."
-msgstr "因为文件太多，�在修改的路径中查找拷�。"
+msgstr "由于文件太多，�在修改的路径中找到了拷�。"
 
-#: diff.c:6186
+#: diff.c:6304
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "您�能想�将�� %s 设置为至少 %d 并�次执行此命令。"
 
-#: dir.c:549
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "读�排�文件 '%s' 失败"
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr "正在进行�精确的�命�探测"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "在差异中无此路径 '%s'"
+
+#: dir.c:593
 #, c-format
 msgid "pathspec '%s' did not match any file(s) known to git"
 msgstr "路径规格 '%s' 未匹�任何 git 已知文件"
 
-#: dir.c:938
+#: dir.c:733 dir.c:762 dir.c:775
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "未识别的模�：'%s'"
+
+#: dir.c:790 dir.c:804
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "未识别的��模�：'%s'"
+
+#: dir.c:820
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "您的 sparse-checkout 文件�能有问题：��的模� '%s'"
+
+#: dir.c:830
+msgid "disabling cone pattern matching"
+msgstr "�止 cone 模�匹�"
+
+#: dir.c:1214
 #, c-format
 msgid "cannot use %s as an exclude file"
 msgstr "�能将 %s 用作排除文件"
 
-#: dir.c:1877
+#: dir.c:2351
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "�能打开目录 '%s'"
 
-#: dir.c:2128
+#: dir.c:2653
 msgid "failed to get kernel name and information"
 msgstr "无法获得内核�称和信�"
 
-#: dir.c:2252
+#: dir.c:2777
 msgid "untracked cache is disabled on this system or location"
 msgstr "缓存未跟踪文件在本系统或�置中被�用"
 
-#: dir.c:3056
+#: dir.c:3610
 #, c-format
 msgid "index file corrupt in repo %s"
 msgstr "仓库 %s 中的索引文件��"
 
-#: dir.c:3101 dir.c:3106
+#: dir.c:3657 dir.c:3662
 #, c-format
 msgid "could not create directories for %s"
 msgstr "�能为 %s 创建目录"
 
-#: dir.c:3135
+#: dir.c:3691
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "�能从 '%s' �移 git 目录到 '%s'"
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "�示：等待您的编辑器关闭文件...%c"
 
-#: entry.c:178
+#: entry.c:176
 msgid "Filtering content"
 msgstr "过滤内容"
 
-#: entry.c:476
+#: entry.c:497
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "�能对文件 '%s' 调用 stat"
 
-#: environment.c:148
+#: environment.c:152
 #, c-format
 msgid "bad git namespace path \"%s\""
 msgstr "错误的 git �字空间路径 \"%s\""
 
-#: environment.c:330
+#: environment.c:334
 #, c-format
 msgid "could not set GIT_DIR to '%s'"
 msgstr "�能设置 GIT_DIR 为 '%s'"
@@ -3121,268 +4047,299 @@ msgstr "�能设置 GIT_DIR 为 '%s'"
 msgid "too many args to run %s"
 msgstr "执行 %s 的�数太多"
 
-#: fetch-pack.c:150
+#: fetch-pack.c:182
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：应为 shallow 列表"
 
-#: fetch-pack.c:153
+#: fetch-pack.c:185
 msgid "git fetch-pack: expected a flush packet after shallow list"
 msgstr "git fetch-pack：在浅克隆列表之�期望一个 flush 包"
 
-#: fetch-pack.c:164
+#: fetch-pack.c:196
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack：期望 ACK/NAK，�得到 flush 包"
 
-#: fetch-pack.c:184
+#: fetch-pack.c:216
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack：应为 ACK/NAK，�得到 '%s'"
 
-#: fetch-pack.c:195
+#: fetch-pack.c:227
 msgid "unable to write to remote"
 msgstr "无法写到远程"
 
-#: fetch-pack.c:257
+#: fetch-pack.c:288
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc 需� multi_ack_detailed"
 
-#: fetch-pack.c:356 fetch-pack.c:1280
+#: fetch-pack.c:383 fetch-pack.c:1423
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "无效的 shallow 信�：%s"
 
-#: fetch-pack.c:362 fetch-pack.c:1286
+#: fetch-pack.c:389 fetch-pack.c:1429
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "无效的 unshallow 信�：%s"
 
-#: fetch-pack.c:364 fetch-pack.c:1288
+#: fetch-pack.c:391 fetch-pack.c:1431
 #, c-format
 msgid "object not found: %s"
 msgstr "对象未找到：%s"
 
-#: fetch-pack.c:367 fetch-pack.c:1291
+#: fetch-pack.c:394 fetch-pack.c:1434
 #, c-format
 msgid "error in object: %s"
 msgstr "对象中出错：%s"
 
-#: fetch-pack.c:369 fetch-pack.c:1293
+#: fetch-pack.c:396 fetch-pack.c:1436
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未�现 shallow：%s"
 
-#: fetch-pack.c:372 fetch-pack.c:1297
+#: fetch-pack.c:399 fetch-pack.c:1440
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "应为 shallow/unshallow，�得到 %s"
 
-#: fetch-pack.c:414
+#: fetch-pack.c:439
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
-#: fetch-pack.c:431
+#: fetch-pack.c:456
 #, c-format
 msgid "invalid commit %s"
 msgstr "无效�交 %s"
 
-#: fetch-pack.c:462
+#: fetch-pack.c:487
 msgid "giving up"
 msgstr "放弃"
 
-#: fetch-pack.c:475 progress.c:312
+#: fetch-pack.c:500 progress.c:339
 msgid "done"
 msgstr "完�"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:512
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
-#: fetch-pack.c:533
+#: fetch-pack.c:548
 #, c-format
 msgid "Marking %s as complete"
 msgstr "标记 %s 为完�"
 
-#: fetch-pack.c:742
+#: fetch-pack.c:763
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已�有 %s（%s）"
 
-#: fetch-pack.c:781
+#: fetch-pack.c:849
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：无法派生 sideband 多路输出"
 
-#: fetch-pack.c:789
+#: fetch-pack.c:857
 msgid "protocol error: bad pack header"
 msgstr "�议错误：�的包头"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:951
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：无法派生进程 %s"
 
-#: fetch-pack.c:873
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack：无效的 index-pack 输出"
+
+#: fetch-pack.c:974
 #, c-format
 msgid "%s failed"
 msgstr "%s 失败"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:976
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路输出出错"
 
-#: fetch-pack.c:907
+#: fetch-pack.c:1019
 #, c-format
 msgid "Server version is %.*s"
 msgstr "�务器版本 %.*s"
 
-#: fetch-pack.c:912 fetch-pack.c:918 fetch-pack.c:921 fetch-pack.c:927
-#: fetch-pack.c:931 fetch-pack.c:935 fetch-pack.c:939 fetch-pack.c:943
-#: fetch-pack.c:947 fetch-pack.c:951 fetch-pack.c:955 fetch-pack.c:959
-#: fetch-pack.c:965 fetch-pack.c:971 fetch-pack.c:976 fetch-pack.c:981
+#: 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 "�务器支� %s"
 
-#: fetch-pack.c:914
+#: fetch-pack.c:1029
 msgid "Server does not support shallow clients"
-msgstr "�务器�支� shalllow 客户端"
+msgstr "�务器�支�浅客户端"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:1089
 msgid "Server does not support --shallow-since"
 msgstr "�务器�支� --shallow-since"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1094
 msgid "Server does not support --shallow-exclude"
 msgstr "�务器�支� --shallow-exclude"
 
-#: fetch-pack.c:983
+#: fetch-pack.c:1098
 msgid "Server does not support --deepen"
 msgstr "�务器�支� --deepen"
 
-#: fetch-pack.c:1000
+#: fetch-pack.c:1100
+msgid "Server does not support this repository's object format"
+msgstr "�务器�支�这个仓库的对象格�"
+
+#: fetch-pack.c:1113
 msgid "no common commits"
 msgstr "没有共�的�交"
 
-#: fetch-pack.c:1012 fetch-pack.c:1468
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr "�仓库是浅克隆，拒�克隆。"
+
+#: fetch-pack.c:1128 fetch-pack.c:1660
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：获�失败。"
 
-#: fetch-pack.c:1150
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "�匹�的算法：客户端 %s，�务端 %s"
+
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "�务器�支�算法 '%s'"
+
+#: fetch-pack.c:1279
 msgid "Server does not support shallow requests"
-msgstr "�务器�支� shalllow 请求"
+msgstr "�务器�支�浅克隆请求"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1286
 msgid "Server supports filter"
 msgstr "�务器支� filter"
 
-#: fetch-pack.c:1180
+#: fetch-pack.c:1329 fetch-pack.c:2043
 msgid "unable to write request to remote"
 msgstr "无法将请求写到远程"
 
-#: fetch-pack.c:1198
+#: fetch-pack.c:1347
 #, c-format
 msgid "error reading section header '%s'"
 msgstr "读�节标题 '%s' 出错"
 
-#: fetch-pack.c:1204
+#: fetch-pack.c:1353
 #, c-format
 msgid "expected '%s', received '%s'"
 msgstr "预期 '%s'，得到 '%s'"
 
-#: fetch-pack.c:1243
+#: fetch-pack.c:1387
 #, c-format
 msgid "unexpected acknowledgment line: '%s'"
 msgstr "�外的确认行：'%s'"
 
-#: fetch-pack.c:1248
+#: fetch-pack.c:1392
 #, c-format
 msgid "error processing acks: %d"
 msgstr "处� ack 出错：%d"
 
-#: fetch-pack.c:1258
+#: fetch-pack.c:1402
 msgid "expected packfile to be sent after 'ready'"
 msgstr "预期在 'ready' 之��� packfile"
 
-#: fetch-pack.c:1260
+#: fetch-pack.c:1404
 msgid "expected no other sections to be sent after no 'ready'"
 msgstr "在没有 'ready' �应该��其它�节"
 
-#: fetch-pack.c:1302
+#: fetch-pack.c:1445
 #, c-format
 msgid "error processing shallow info: %d"
 msgstr "处�浅克隆信�出错：%d"
 
-#: fetch-pack.c:1349
+#: fetch-pack.c:1494
 #, c-format
 msgid "expected wanted-ref, got '%s'"
 msgstr "预期 wanted-ref，得到 '%s'"
 
-#: fetch-pack.c:1354
+#: fetch-pack.c:1499
 #, c-format
 msgid "unexpected wanted-ref: '%s'"
 msgstr "�外的 wanted-ref：'%s'"
 
-#: fetch-pack.c:1359
+#: fetch-pack.c:1504
 #, c-format
 msgid "error processing wanted refs: %d"
 msgstr "处��获�的引用出错：%d"
 
-#: fetch-pack.c:1693
+#: fetch-pack.c:1534
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack：预期�应结�包"
+
+#: fetch-pack.c:1939
 msgid "no matching remote head"
 msgstr "没有匹�的远程分支"
 
-#: fetch-pack.c:1716 builtin/clone.c:685
+#: fetch-pack.c:1962 builtin/clone.c:697
 msgid "remote did not send all necessary objects"
 msgstr "远程没有��所有必需的对象"
 
-#: fetch-pack.c:1743
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr "�自远程的�外的 'ready'"
+
+#: fetch-pack.c:2088
 #, c-format
 msgid "no such remote ref %s"
 msgstr "没有这样的远程引用 %s"
 
-#: fetch-pack.c:1746
+#: fetch-pack.c:2091
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "�务器��许请求未公开的对象 %s"
 
-#: gpg-interface.c:321
-msgid "gpg failed to sign the data"
-msgstr "gpg 无法为数�签�"
-
-#: gpg-interface.c:347
+#: gpg-interface.c:273
 msgid "could not create temporary file"
 msgstr "�能创建临时文件"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:276
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "无法将分离�签�写入 '%s'"
 
-#: graph.c:97
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg 数�签�失败"
+
+#: 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:668
+#: grep.c:531
 msgid ""
 "given pattern contains NULL byte (via -f <file>). This is only supported "
 "with -P under PCRE v2"
 msgstr ""
-"给定的模�包� NULL 字符（通过 -f <文件> �数）。�有 PCRE v2 下的 -P 支�此功能"
+"给定的模�包� NULL 字符（通过 -f <文件> �数）。�有 PCRE v2 下的 -P 支�此"
+"功能"
 
-#: grep.c:2124
+#: grep.c:1895
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：无法读� %s"
 
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
-#: 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 "对 '%s' 调用 stat 失败"
 
-#: grep.c:2152
+#: grep.c:1923
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'：读��完整"
@@ -3432,48 +4389,48 @@ msgid "Low-level Commands / Interrogators"
 msgstr "低级命令/询问者"
 
 #: help.c:37
-msgid "Low-level Commands / Synching Repositories"
+msgid "Low-level Commands / Syncing Repositories"
 msgstr "低级命令/�步仓库"
 
 #: help.c:38
 msgid "Low-level Commands / Internal Helpers"
 msgstr "低级命令/内部助手"
 
-#: help.c:298
+#: help.c:300
 #, c-format
 msgid "available git commands in '%s'"
 msgstr "在 '%s' 下�用的 git 命令"
 
-#: help.c:305
+#: help.c:307
 msgid "git commands available from elsewhere on your $PATH"
 msgstr "在 $PATH 路径中的其他地方�用的 git 命令"
 
-#: help.c:314
+#: help.c:316
 msgid "These are common Git commands used in various situations:"
 msgstr "这些是��场�常�的 Git 命令："
 
-#: help.c:363 git.c:98
+#: help.c:365 git.c:100
 #, c-format
 msgid "unsupported command listing type '%s'"
 msgstr "�支�的命令列表类型 '%s'"
 
-#: help.c:403
-msgid "The common Git guides are:"
-msgstr "最常用的 Git �导有："
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Git 概念�导有："
 
-#: help.c:512
+#: help.c:429
 msgid "See 'git help <command>' to read about a specific subcommand"
 msgstr "执行　'git help <command>' �查看特定�命令"
 
-#: help.c:517
+#: help.c:434
 msgid "External commands"
 msgstr "外部命令"
 
-#: help.c:532
+#: help.c:449
 msgid "Command aliases"
 msgstr "命令别�"
 
-#: help.c:596
+#: help.c:527
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -3482,31 +4439,31 @@ msgstr ""
 "'%s' �是一个 git 命令，但�无法�行。\n"
 "�能是 git-%s ��？"
 
-#: help.c:655
+#: help.c:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git：'%s' �是一个 git 命令。�� 'git --help'。"
+
+#: help.c:591
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "唉呀，您的系统中未�现 Git 命令。"
 
-#: help.c:677
+#: help.c:613
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "警告：您�行了一个并�存在的 Git 命令 '%s'。"
 
-#: help.c:682
+#: help.c:618
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "�定你想�的是 '%s' 并继续。"
 
-#: help.c:687
+#: help.c:623
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "�定你想�的是 '%2$s'，在 %1$0.1f 秒钟�继续。"
 
-#: help.c:695
-#, c-format
-msgid "git: '%s' is not a git command. See 'git --help'."
-msgstr "git：'%s' �是一个 git 命令。�� 'git --help'。"
-
-#: help.c:699
+#: help.c:635
 msgid ""
 "\n"
 "The most similar command is"
@@ -3520,16 +4477,16 @@ msgstr[1] ""
 "\n"
 "最相似的命令是"
 
-#: help.c:714
+#: help.c:675
 msgid "git version [<options>]"
 msgstr "git version [<选项>]"
 
-#: help.c:783
+#: help.c:730
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s：%s - %s"
 
-#: help.c:787
+#: help.c:734
 msgid ""
 "\n"
 "Did you mean this?"
@@ -3543,7 +4500,15 @@ msgstr[1] ""
 "\n"
 "您指的是这其中的�一个么？"
 
-#: ident.c:349
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "作者身份未知\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "�交者身份未知\n"
+
+#: ident.c:362
 msgid ""
 "\n"
 "*** Please tell me who you are.\n"
@@ -3568,91 +4533,100 @@ msgstr ""
 "�设置您账�的缺�身份标识。\n"
 "如果仅在本仓库设置身份标识，则�略 --global �数。\n"
 
-#: ident.c:379
+#: ident.c:397
 msgid "no email was given and auto-detection is disabled"
 msgstr "未�供邮件地�且自动探测被�用"
 
-#: ident.c:384
+#: ident.c:402
 #, c-format
 msgid "unable to auto-detect email address (got '%s')"
 msgstr "无法自动探测邮件地�（得到 '%s'）"
 
-#: ident.c:401
+#: ident.c:419
 msgid "no name was given and auto-detection is disabled"
 msgstr "未�供姓�且自动探测被�用"
 
-#: ident.c:407
+#: ident.c:425
 #, c-format
 msgid "unable to auto-detect name (got '%s')"
 msgstr "无法自动探测姓�（得到 '%s'）"
 
-#: ident.c:415
+#: ident.c:433
 #, c-format
 msgid "empty ident name (for <%s>) not allowed"
 msgstr "��许空的姓�（对于 <%s>）"
 
-#: ident.c:421
+#: ident.c:439
 #, c-format
 msgid "name consists only of disallowed characters: %s"
 msgstr "姓�中仅包��用字符：%s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:454 builtin/commit.c:647
 #, c-format
 msgid "invalid date format: %s"
 msgstr "无效的日期格�：%s"
 
-#: list-objects.c:127
-#, c-format
-msgid "entry '%s' in tree %s has tree mode, but is not a tree"
-msgstr "树 %2$s 中的�目 '%1$s' 具有树的属性，但�是一个树对象"
-
-#: list-objects.c:140
-#, c-format
-msgid "entry '%s' in tree %s has blob mode, but is not a blob"
-msgstr "树 %2$s 中的�目 '%1$s' 具有数�对象的属性，但�是一个数�对象"
-
-#: list-objects.c:375
-#, c-format
-msgid "unable to load root tree for commit %s"
-msgstr "无法为�交 %s 加载根树"
-
-#: list-objects-filter.c:492
-#, c-format
-msgid "unable to access sparse blob in '%s'"
-msgstr "�能访问 '%s' 中的稀�数�对象"
-
-#: list-objects-filter.c:495
-#, c-format
-msgid "unable to parse sparse filter data in %s"
-msgstr "无法解� %s 中的稀�过滤器数�"
-
-#: list-objects-filter-options.c:58
+#: list-objects-filter-options.c:83
 msgid "expected 'tree:<depth>'"
 msgstr "期望 'tree:<深度>'"
 
-#: list-objects-filter-options.c:73
+#: list-objects-filter-options.c:98
 msgid "sparse:path filters support has been dropped"
 msgstr "sparse:path 过滤器支�已被删除"
 
-#: list-objects-filter-options.c:86
+#: list-objects-filter-options.c:105
+#, c-format
+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'"
 
-#: list-objects-filter-options.c:102
+#: list-objects-filter-options.c:140
 #, c-format
 msgid "must escape char in sub-filter-spec: '%c'"
 msgstr "必须对 sub-filter-spec 中的字符进行转义：'%c'"
 
-#: list-objects-filter-options.c:144
+#: list-objects-filter-options.c:182
 msgid "expected something after combine:"
 msgstr "期望在组��有一些东西："
 
-#: list-objects-filter-options.c:226
+#: list-objects-filter-options.c:264
 msgid "multiple filter-specs cannot be combined"
 msgstr "�能混用多�过滤规格"
 
-#: lockfile.c:151
+#: list-objects-filter-options.c:376
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "无法�级仓库格�以支�部分克隆"
+
+#: list-objects-filter.c:532
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "�能访问 '%s' 中的稀�数�对象"
+
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "无法解� %s 中的稀�过滤器数�"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "树 %2$s 中的�目 '%1$s' 具有树的模�，但�是一个树对象"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "树 %2$s 中的�目 '%1$s' 具有数�对象的模�，但�是一个数�对象"
+
+#: list-objects.c:398
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "无法为�交 %s 加载根树"
+
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -3670,159 +4644,375 @@ msgstr ""
 "�能之�有一个 git 进程在这个仓库中异常退出：\n"
 "手动删除这个文件�继续。"
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "�能创建 '%s.lock'：%s"
 
-#: merge.c:41
-msgid "failed to read the cache"
-msgstr "读�缓存失败"
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "lsrefs.unborn 的�值 '%s' 无效"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
-#: builtin/stash.c:264
-msgid "unable to write new index file"
-msgstr "无法写新的索引文件"
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "在 ls-refs �数�应该有一个 flush 包"
+
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "检测到被引用的 CRLF"
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "'%2$s' 的错误动作 '%1$s'"
+
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "无法�并�模组 %s （没有检出）"
+
+#: merge-ort.c:1578 merge-recursive.c:1208
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "无法�并�模组 %s（�交�存在）"
+
+#: merge-ort.c:1587 merge-recursive.c:1215
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "无法�并�模组 %s （�交未跟��并基线）"
+
+#: merge-ort.c:1597 merge-ort.c:1604
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "注�：快进�模组 %s 到 %s"
+
+#: merge-ort.c:1625
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "无法�并�模组 %s"
+
+#: merge-ort.c:1632
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"无法�并�模组 %s，但是存在一个�能的�并方案：\n"
+"%s\n"
+
+#: 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 ""
+"如果这个正确，将其添加到索引，例如使用命令：\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"以接�此建议。\n"
+
+#: merge-ort.c:1649
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"无法�并�模组 %s，但是存在多个�能的�并：\n"
+"%s"
+
+#: merge-ort.c:1868 merge-recursive.c:1358
+msgid "Failed to execute internal merge"
+msgstr "无法执行内部�并"
+
+#: merge-ort.c:1873 merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "�能添加 %s 至对象库"
+
+#: merge-ort.c:1880 merge-recursive.c:1396
+#, c-format
+msgid "Auto-merging %s"
+msgstr "自动�并 %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 ""
+"冲�（��目录�命�）：处于��目录�命�的现存文件/目录 %s，将以下路径放"
+"在：%s。"
+
+#: 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 ""
+"冲�（��目录�命�）：无法映射一个以上路径到 %s，��目录�命��试将这些路"
+"径放置于此：%s"
+
+#: 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 ""
+"冲�（分割的目录�命�）：�清楚�命� %s 到哪里，因为它被�命�到多个其他目"
+"录中，没有一个目标目录中包�多数文件。"
+
+#: 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 "警告：��应用 %s -> %s 的�命�到 %s，因为 %s 本身已被�命�。"
+
+#: 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 ""
+"路径已更新：%s 添加到 %s，�于一个被�命�到 %s 的目录中，将其移动到 %s。"
+
+#: 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 ""
+"路径已更新：%1$s �命�为 %3$s 中的 %2$s，而该目录被�命�到 %4$s 中，将其移"
+"动到 %5$s。"
+
+#: 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 ""
+"冲�（文件�置）：%s 添加到 %s，�于一个被�命�为 %s 的目录中，建议将其移动"
+"到 %s。"
+
+#: 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 ""
+"冲�（文件�置）：%1$s �命�为 %3$s 中的 %2$s，而该目录被�命�到 %4$s 中，"
+"建议将其移动到 %5$s。"
+
+#: merge-ort.c:2569
+#, 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: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 ""
+"冲�（�命��入冲�）：�命� %s -> %s 有内容冲�并且和�外一个路径碰撞，这"
+"�能导致嵌套的冲�标签。"
+
+#: 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 "冲�（�命�/删除）：%1$s 在 %3$s 中�命�为 %2$s，但在 %4$s 中删除。"
 
-#: merge-recursive.c:367
+#: merge-ort.c:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
+msgstr "�能读�对象 %s"
+
+#: merge-ort.c:3185 merge-recursive.c:3011
+#, c-format
+msgid "object %s is not a blob"
+msgstr "对象 %s �是一个数�对象"
+
+#: merge-ort.c:3613
+#, 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: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 ""
+"冲�（��类型）：%s 在两侧有��的类型，将两者都�命�以便它们能记录在���"
+"置。"
+
+#: 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 ""
+"冲�（��类型）：%s 在两侧有��的类型，将其中之一�命�以便它们能记录在��"
+"�置。"
+
+#: merge-ort.c:3796 merge-recursive.c:3087
+msgid "content"
+msgstr "内容"
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr "添加/添加"
+
+#: merge-ort.c:3800 merge-recursive.c:3136
+msgid "submodule"
+msgstr "�模组"
+
+#: merge-ort.c:3802 merge-recursive.c:3137
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "冲�（%s）：�并冲�于 %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 ""
+"冲�（修改/删除）：%1$s 在 %2$s 中被删除，在 %3$s 中被修改。%5$s 的 %4$s 版本"
+"在树中被�留。"
+
+#: 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 "注�：%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:4487
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "无法收集树 %s�%s�%s 的�并信�"
+
+#: 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 ""
+"您对下列文件的本地修改将被�并�作覆盖：\n"
+"  %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "已�是最新的。"
+
+#: merge-recursive.c:352
 msgid "(bad commit)\n"
 msgstr "（��交）\n"
 
-#: merge-recursive.c:390
+#: merge-recursive.c:375
 #, c-format
 msgid "add_cacheinfo failed for path '%s'; merge aborting."
 msgstr "add_cacheinfo 对路径 '%s' 执行失败，�并终止。"
 
-#: merge-recursive.c:399
+#: merge-recursive.c:384
 #, c-format
 msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
 msgstr "add_cacheinfo 无法刷新路径 '%s'，�并终止。"
 
-#: merge-recursive.c:885
+#: merge-recursive.c:872
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "创建路径 '%s'%s 失败"
 
-#: merge-recursive.c:896
+#: merge-recursive.c:883
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "删除 %s 以便为�目录留出空间\n"
 
-#: merge-recursive.c:910 merge-recursive.c:929
+#: merge-recursive.c:897 merge-recursive.c:916
 msgid ": perhaps a D/F conflict?"
 msgstr "：�能是一个目录/文件冲�？"
 
-#: merge-recursive.c:919
+#: merge-recursive.c:906
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "拒�丢弃 '%s' 中的未跟踪文件"
 
-#: merge-recursive.c:960 builtin/cat-file.c:41
+#: merge-recursive.c:947 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "�能读�对象 %s '%s'"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:952
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' 应为数�对象"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:977
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "打开 '%s' 失败：%s"
 
-#: merge-recursive.c:1001
+#: merge-recursive.c:988
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "创建符�链接 '%s' 失败：%s"
 
-#: merge-recursive.c:1006
+#: merge-recursive.c:993
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "�知�如何处� %06o %s '%s'"
 
-#: merge-recursive.c:1199
-#, c-format
-msgid "Failed to merge submodule %s (not checked out)"
-msgstr "无法�并�模组 %s （没有检出）"
-
-#: merge-recursive.c:1206
-#, c-format
-msgid "Failed to merge submodule %s (commits not present)"
-msgstr "无法�并�模组 %s（�交�存在）"
-
-#: merge-recursive.c:1213
-#, c-format
-msgid "Failed to merge submodule %s (commits don't follow merge-base)"
-msgstr "无法�并�模组 %s （�交未跟��并基线）"
-
-#: merge-recursive.c:1221 merge-recursive.c:1233
+#: merge-recursive.c:1223 merge-recursive.c:1235
 #, c-format
 msgid "Fast-forwarding submodule %s to the following commit:"
 msgstr "�模组 %s 快进到如下�交："
 
-#: merge-recursive.c:1224 merge-recursive.c:1236
+#: merge-recursive.c:1226 merge-recursive.c:1238
 #, c-format
 msgid "Fast-forwarding submodule %s"
 msgstr "快进�模组 %s"
 
-#: merge-recursive.c:1259
+#: merge-recursive.c:1261
 #, c-format
 msgid "Failed to merge submodule %s (merge following commits not found)"
 msgstr "无法�并�模组 %s （没�现�并跟�的�交）"
 
-#: merge-recursive.c:1263
+#: merge-recursive.c:1265
 #, c-format
 msgid "Failed to merge submodule %s (not fast-forward)"
 msgstr "无法�并�模组 %s（�快进）"
 
-#: merge-recursive.c:1264
+#: merge-recursive.c:1266
 msgid "Found a possible merge resolution for the submodule:\n"
 msgstr "找到�模组的一个�能的�并方案：\n"
 
-#: merge-recursive.c:1267
-#, 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 ""
-"如果这个正确，将其添加到索引，例如使用命令：\n"
-"\n"
-"  git update-index --cacheinfo 160000 %s \"%s\"\n"
-"\n"
-"以接�此建议。\n"
-
-#: merge-recursive.c:1276
+#: merge-recursive.c:1278
 #, c-format
 msgid "Failed to merge submodule %s (multiple merges found)"
 msgstr "无法�并�模组 %s （�现多个�并）"
 
-#: merge-recursive.c:1349
-msgid "Failed to execute internal merge"
-msgstr "无法执行内部�并"
-
-#: merge-recursive.c:1354
-#, c-format
-msgid "Unable to add %s to database"
-msgstr "�能添加 %s 至对象库"
-
-#: merge-recursive.c:1386
-#, c-format
-msgid "Auto-merging %s"
-msgstr "自动�并 %s"
-
-#: merge-recursive.c:1410
+#: merge-recursive.c:1420
 #, c-format
 msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
 msgstr "错误：拒�丢失未跟踪文件 '%s'，而是写入 %s。"
 
-#: merge-recursive.c:1482
+#: merge-recursive.c:1492
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3831,7 +5021,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本被�留。"
 
-#: merge-recursive.c:1487
+#: merge-recursive.c:1497
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3840,7 +5030,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本被�留。"
 
-#: merge-recursive.c:1494
+#: merge-recursive.c:1504
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -3849,7 +5039,7 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
 "本�留在 %8$s 中。"
 
-#: merge-recursive.c:1499
+#: merge-recursive.c:1509
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -3858,40 +5048,40 @@ msgstr ""
 "冲�（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
 "%7$s 版本�留在 %9$s 中。"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1544
 msgid "rename"
 msgstr "�命�"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1544
 msgid "renamed"
 msgstr "�命�"
 
-#: merge-recursive.c:1614 merge-recursive.c:2472 merge-recursive.c:3117
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
 #, c-format
 msgid "Refusing to lose dirty file at %s"
 msgstr "拒�丢失�文件 '%s'"
 
-#: merge-recursive.c:1624
+#: merge-recursive.c:1605
 #, c-format
 msgid "Refusing to lose untracked file at %s, even though it's in the way."
 msgstr "拒�在 '%s' 处失去未跟踪文件，�使它存在于�命�中。"
 
-#: merge-recursive.c:1682
+#: merge-recursive.c:1663
 #, 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:1713
+#: merge-recursive.c:1694
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s 是 %s 中的一个目录而以 %s 为�被添加"
 
-#: merge-recursive.c:1718
+#: merge-recursive.c:1699
 #, c-format
 msgid "Refusing to lose untracked file at %s; adding as %s instead"
 msgstr "拒�丢失未跟踪文件 '%s'，而是添加为 %s"
 
-#: merge-recursive.c:1737
+#: merge-recursive.c:1726
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -3900,18 +5090,18 @@ msgstr ""
 "冲�（�命�/�命�）：在分支 \"%3$s\" 中�命� \"%1$s\"->\"%2$s\"，在分支 "
 "\"%6$s\" 中�命� \"%4$s\"->\"%5$s\"%7$s"
 
-#: merge-recursive.c:1742
+#: merge-recursive.c:1731
 msgid " (left unresolved)"
 msgstr "（留下未解决）"
 
-#: merge-recursive.c:1851
+#: merge-recursive.c:1823
 #, 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:2056
+#: merge-recursive.c:2086
 #, c-format
 msgid ""
 "CONFLICT (directory rename split): Unclear where to place %s because "
@@ -3921,25 +5111,7 @@ msgstr ""
 "冲�（分割的目录�命�）：�清楚 %s 应该放在哪里，因为目录 %s 被�命�到多个"
 "其它目录，没有目录包�大部分文件。"
 
-#: merge-recursive.c:2088
-#, 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 ""
-"冲�（��目录�命�）：处于��目录�命�的现存文件/目录 %s，将以下路径放"
-"在：%s。"
-
-#: merge-recursive.c:2098
-#, 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 ""
-"冲�（��目录�命�）：无法映射一个以上路径到 %s，��目录�命��试将这些路"
-"径放置于此：%s"
-
-#: merge-recursive.c:2190
+#: merge-recursive.c:2220
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
@@ -3948,314 +5120,286 @@ msgstr ""
 "冲�（�命�/�命�）：在 %3$s 中�命�目录 %1$s->%2$s，在 %6$s 中�命�目录 "
 "%4$s->%5$s"
 
-#: merge-recursive.c:2435
-#, c-format
-msgid ""
-"WARNING: Avoiding applying %s -> %s rename to %s, because %s itself was "
-"renamed."
-msgstr "警告：��应用 %s -> %s 的�命�到 %s，因为 %s 本身已被�命�。"
-
-#: merge-recursive.c:2961
-#, c-format
-msgid "cannot read object %s"
-msgstr "�能读�对象 %s"
-
-#: merge-recursive.c:2964
-#, c-format
-msgid "object %s is not a blob"
-msgstr "对象 %s �是一个数�对象"
-
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modify"
 msgstr "修改"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3075
 msgid "modified"
 msgstr "修改"
 
-#: merge-recursive.c:3040
-msgid "content"
-msgstr "内容"
-
-#: merge-recursive.c:3044
-msgid "add/add"
-msgstr "添加/添加"
-
-#: merge-recursive.c:3067
+#: merge-recursive.c:3114
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "略过 %s（已��过相��并）"
 
-#: merge-recursive.c:3089 git-submodule.sh:937
-msgid "submodule"
-msgstr "�模组"
-
-#: merge-recursive.c:3090
-#, c-format
-msgid "CONFLICT (%s): Merge conflict in %s"
-msgstr "冲�（%s）：�并冲�于 %s"
-
-#: merge-recursive.c:3120
+#: merge-recursive.c:3167
 #, c-format
 msgid "Adding as %s instead"
 msgstr "而是以 %s 为�添加"
 
-#: merge-recursive.c:3203
-#, c-format
-msgid ""
-"Path updated: %s added in %s inside a directory that was renamed in %s; "
-"moving it to %s."
-msgstr ""
-"路径已更新：%s 添加到 %s，�于一个被�命�到 %s 的目录中，将其移动到 %s。"
-
-#: merge-recursive.c:3206
-#, 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 ""
-"冲�（文件�置）：%s 添加到 %s，�于一个被�命�为 %s 的目录中，建议将其移动"
-"到 %s。"
-
-#: merge-recursive.c:3210
-#, c-format
-msgid ""
-"Path updated: %s renamed to %s in %s, inside a directory that was renamed in "
-"%s; moving it to %s."
-msgstr ""
-"路径已更新：%1$s �命�为 %3$s 中的 %2$s，而该目录被�命�到 %4$s 中，将其移"
-"动到 %5$s。"
-
-#: merge-recursive.c:3213
-#, 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 ""
-"冲�（文件�置）：%1$s �命�为 %3$s 中的 %2$s，而该目录被�命�到 %4$s 中，"
-"建议将其移动到 %5$s。"
-
-#: merge-recursive.c:3327
+#: merge-recursive.c:3371
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: merge-recursive.c:3350
+#: merge-recursive.c:3394
 msgid "file/directory"
 msgstr "文件/目录"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3399
 msgid "directory/file"
 msgstr "目录/文件"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3406
 #, 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:3371
+#: merge-recursive.c:3415
 #, c-format
 msgid "Adding %s"
 msgstr "添加 %s"
 
-#: merge-recursive.c:3380
+#: merge-recursive.c:3424
 #, c-format
 msgid "CONFLICT (add/add): Merge conflict in %s"
 msgstr "冲�（add/add）：�并冲�于 %s"
 
-#: merge-recursive.c:3424
-msgid "Already up to date!"
-msgstr "已�是最新的�"
-
-#: merge-recursive.c:3433
+#: merge-recursive.c:3477
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "无法�并树 %s 和 %s"
 
-#: merge-recursive.c:3537
+#: merge-recursive.c:3571
 msgid "Merging:"
 msgstr "�并："
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3584
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "�现 %u 个共�祖先："
 msgstr[1] "�现 %u 个共�祖先："
 
-#: merge-recursive.c:3600
+#: merge-recursive.c:3634
 msgid "merge returned no commit"
 msgstr "�并未返回�交"
 
-#: merge-recursive.c:3659
-#, c-format
-msgid ""
-"Your local changes to the following files would be overwritten by merge:\n"
-"  %s"
-msgstr ""
-"您对下列文件的本地修改将被�并�作覆盖：\n"
-"  %s"
-
-#: merge-recursive.c:3756
+#: merge-recursive.c:3799
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "�能解�对象 '%s'"
 
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
 msgid "Unable to write index."
 msgstr "�能写入索引。"
 
-#: midx.c:68
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "读�缓存失败"
+
+#: 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 "无法写新的索引文件"
+
+#: midx.c:74
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "多包索引的对象ID扇出表大�错误"
+
+#: midx.c:105
 #, c-format
 msgid "multi-pack-index file %s is too small"
 msgstr "多包索引文件 %s 太�"
 
-#: midx.c:84
+#: midx.c:121
 #, c-format
 msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
 msgstr "多包索引签� 0x%08x 和签� 0x%08x �匹�"
 
-#: midx.c:89
+#: midx.c:126
 #, c-format
 msgid "multi-pack-index version %d not recognized"
 msgstr "multi-pack-index 版本 %d �能被识别"
 
-#: midx.c:94
+#: midx.c:131
 #, c-format
-msgid "hash version %u does not match"
-msgstr "散列版本 %u �匹�"
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr "多包索引哈希版本 %u 和版本 %u �匹�"
 
-#: midx.c:108
-msgid "invalid chunk offset (too large)"
-msgstr "无效的��移（太大）"
-
-#: midx.c:132
-msgid "terminating multi-pack-index chunk id appears earlier than expected"
-msgstr "终止多包索引� id 出现时间早于预期"
-
-#: midx.c:145
+#: midx.c:148
 msgid "multi-pack-index missing required pack-name chunk"
 msgstr "多包索引缺少必需的包��"
 
-#: midx.c:147
+#: midx.c:150
 msgid "multi-pack-index missing required OID fanout chunk"
 msgstr "多包索引缺少必需的对象 ID 扇出�"
 
-#: midx.c:149
+#: midx.c:152
 msgid "multi-pack-index missing required OID lookup chunk"
 msgstr "多包索引缺少必需的对象 ID 查询�"
 
-#: midx.c:151
+#: midx.c:154
 msgid "multi-pack-index missing required object offsets chunk"
 msgstr "多包索引缺少必需的对象�移�"
 
-#: midx.c:165
+#: midx.c:170
 #, c-format
 msgid "multi-pack-index pack names out of order: '%s' before '%s'"
 msgstr "多包索引包�无�：'%s' 在 '%s' 之�"
 
-#: midx.c:210
+#: midx.c:214
 #, c-format
 msgid "bad pack-int-id: %u (%u total packs)"
 msgstr "错的 pack-int-id：%u（共有 %u 个包）"
 
-#: midx.c:260
+#: midx.c:264
 msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
 msgstr "多包索引存储一个64��移，但是 off_t 太�"
 
-#: midx.c:288
-msgid "error preparing packfile from multi-pack-index"
-msgstr "从多包索引准备 packfile 出错"
-
-#: midx.c:469
+#: midx.c:490
 #, c-format
 msgid "failed to add packfile '%s'"
 msgstr "添加包文件 '%s' 失败"
 
-#: midx.c:475
+#: midx.c:496
 #, c-format
 msgid "failed to open pack-index '%s'"
 msgstr "打开包索引 '%s' 失败"
 
-#: midx.c:535
+#: midx.c:564
 #, c-format
 msgid "failed to locate object %d in packfile"
 msgstr "在包文件中定�对象 %d 失败"
 
-#: midx.c:864
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr "无法存储��索引文件"
+
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "忽略已存在的多包索引，校验��匹�"
+
+#: midx.c:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr "添加包文件到多包索引"
+
+#: midx.c:989
 #, c-format
 msgid "did not see pack-file %s to drop"
 msgstr "没有看到�丢弃的包文件 %s"
 
-#: midx.c:1035
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "未知的首选包：'%s'"
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "首选包 '%s' 已过期"
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr "没有�索引的包文件。"
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "删除 %s 失败"
+
+#: midx.c:1166
 #, c-format
 msgid "failed to clear multi-pack-index at %s"
 msgstr "清��于 %s 的多包索引失败"
 
-#: midx.c:1090
+#: midx.c:1225
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "多包索引文件存在，但无法解�"
+
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr "�正确的校验�"
+
+#: midx.c:1236
 msgid "Looking for referenced packfiles"
 msgstr "正在查找引用的包文件"
 
-#: midx.c:1105
+#: midx.c:1251
 #, c-format
 msgid ""
 "oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 msgstr "对象 ID 扇出无�：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
 
-#: midx.c:1109
-msgid "Verifying OID order in MIDX"
-msgstr "正在校验 MIDX 中的对象 ID 顺�"
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr "midx �包� oid"
 
-#: midx.c:1118
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
+msgstr "校验多包索引中的 OID 顺�"
+
+#: midx.c:1274
 #, c-format
 msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
 msgstr "对象 ID 查询无�：oid[%d] = %s >= %s = oid[%d]"
 
-#: midx.c:1137
+#: midx.c:1294
 msgid "Sorting objects by packfile"
 msgstr "通过包文件为对象排�"
 
-#: midx.c:1143
+#: midx.c:1301
 msgid "Verifying object offsets"
 msgstr "校验对象�移"
 
-#: midx.c:1159
+#: midx.c:1317
 #, c-format
 msgid "failed to load pack entry for oid[%d] = %s"
 msgstr "为 oid[%d] = %s 加载包�目失败"
 
-#: midx.c:1165
+#: midx.c:1323
 #, c-format
 msgid "failed to load pack-index for packfile %s"
 msgstr "为包文件 %s 加载包索引失败"
 
-#: midx.c:1174
+#: midx.c:1332
 #, c-format
 msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
 msgstr "oid[%d] = %s 错误的对象�移：%<PRIx64> != %<PRIx64>"
 
-#: midx.c:1349
+#: midx.c:1357
+msgid "Counting referenced objects"
+msgstr "正在对引用对象计数"
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "正在查找和删除未引用的包文件"
+
+#: midx.c:1558
 msgid "could not start pack-objects"
 msgstr "�能开始 pack-objects"
 
-#: midx.c:1368
+#: midx.c:1578
 msgid "could not finish pack-objects"
 msgstr "�能结� pack-objects"
 
-#: name-hash.c:537
+#: name-hash.c:542
 #, c-format
 msgid "unable to create lazy_dir thread: %s"
 msgstr "�能创建 lazy_dir 线程：%s"
 
-#: name-hash.c:559
+#: name-hash.c:564
 #, c-format
 msgid "unable to create lazy_name thread: %s"
 msgstr "�能创建 lazy_name 线程：%s"
 
-#: name-hash.c:565
+#: 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
@@ -4296,6 +5440,357 @@ msgstr "拒�� %s（在 refs/notes/ 之外）写入注解"
 msgid "Bad %s value: '%s'"
 msgstr "�的 %s 值：'%s'"
 
+#: object-file.c:526
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "对象目录 %s �存在，检查 .git/objects/info/alternates"
+
+#: object-file.c:584
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "无法规范化备用对象路径：%s"
+
+#: object-file.c:658
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s：忽略备用对象库，嵌套太深"
+
+#: object-file.c:665
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "无法规范化对象目录: %s"
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr "无法 fdopen 替��文件"
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr "无法读�替代文件"
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr "无法将新的替代文件移动到�"
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "路径 '%s' �存在"
+
+#: object-file.c:789
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "尚�支�将�考仓库 '%s' 作为一个链接检出。"
+
+#: object-file.c:795
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "�考仓库 '%s' �是一个本地仓库。"
+
+#: object-file.c:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "�考仓库 '%s' 是一个浅克隆"
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "�考仓库 '%s' 已被移�"
+
+#: object-file.c:869
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解�备用引用时无效的行：%s"
+
+#: object-file.c:1019
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "�试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
+
+#: object-file.c:1054
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap 失败%s"
+
+#: object-file.c:1218
+#, c-format
+msgid "object file %s is empty"
+msgstr "对象文件 %s 为空"
+
+#: object-file.c:1353 object-file.c:2548
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "��的�散对象 '%s'"
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "�散对象 '%s' ��有垃圾数�"
+
+#: object-file.c:1397
+msgid "invalid object type"
+msgstr "无效的对象类型"
+
+#: object-file.c:1481
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "无法用 --allow-unknown-type �数解开 %s 头信�"
+
+#: object-file.c:1484
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "无法解开 %s 头部"
+
+#: object-file.c:1490
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "无法用 --allow-unknown-type �数解� %s 头信�"
+
+#: object-file.c:1493
+#, c-format
+msgid "unable to parse %s header"
+msgstr "无法解� %s 头部"
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr "读�对象 %s 失败"
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "找�到 %2$s 的替代 %1$s"
+
+#: object-file.c:1725
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "�散对象 %s（�存在 %s）已��"
+
+#: object-file.c:1729
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "打包对象 %s（�存在 %s）已��"
+
+#: object-file.c:1834
+#, c-format
+msgid "unable to write file %s"
+msgstr "无法写文件 %s"
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "无法为 '%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 "���足，无法在仓库对象库 %s 中添加对象"
+
+#: object-file.c:1935
+msgid "unable to create temporary file"
+msgstr "无法创建临时文件"
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr "�能写�散对象文件"
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "�能压缩新对象 %s（%d）"
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
+
+#: object-file.c:1973
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "被 %s 的�稳定对象�数��糊涂了"
+
+#: object-file.c:1983 builtin/pack-objects.c:1237
+#, c-format
+msgid "failed utime() on %s"
+msgstr "在 %s 上调用 utime() 失败"
+
+#: object-file.c:2060
+#, c-format
+msgid "cannot read object for %s"
+msgstr "�能读�对象 %s"
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr "��的�交"
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr "��的标签"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr "索引 %s 时读�错误"
+
+#: object-file.c:2222
+#, c-format
+msgid "short read while indexing %s"
+msgstr "索引 %s 时读入�完整"
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s：�入数�库失败"
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s：�支�的文件类型"
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s �是一个有效的对象"
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s �是一个有效的 '%s' 对象"
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "�能打开 %s"
+
+#: object-file.c:2559 object-file.c:2612
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s 的哈希值�匹�（预期 %s）"
+
+#: object-file.c:2583
+#, c-format
+msgid "unable to mmap %s"
+msgstr "�能 mmap %s"
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "无法解压缩 %s 的头部"
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "无法解� %s 的头部"
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "无法解压缩 %s 的内容"
+
+#: object-name.c:480
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "短对象ID %s 存在歧义"
+
+#: object-name.c:491
+msgid "The candidates are:"
+msgstr "候选者有："
+
+#: 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 ""
+"Git 通常�会创建一个以40个�六进制字符结尾的引用，因为当您��供40\n"
+"个�六进制字符时将被忽略。这些引用�能被错误地创建。例如：\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"当 \"$br\" ��原因空白时，一个40��六进制的引用将被创建。请检查这些\n"
+"引用，�能需�删除它们。�行 \"git config advice.objectNameWarning\n"
+"false\" 命令关闭本消�通知。"
+
+#: object-name.c:910
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' 的日志仅能回到 %s"
+
+#: object-name.c:918
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' 的日志仅有 %d 个�目"
+
+#: object-name.c:1696
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "路径 '%s' 在�盘上，但是�在 '%.*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 ""
+"路径 '%s' 存在，而 '%s' �存在\n"
+"�示：您的��是 '%.*s:%s' 亦� '%.*s:./%s'？"
+
+#: object-name.c:1711
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "路径 '%s' �在 '%.*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 ""
+"路径 '%s' 在索引中，但�在暂存区 %d 中\n"
+"�示：您的��是 ':%d:%s'？"
+
+#: 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 ""
+"路径 '%s' 在索引中，但 '%s' �在\n"
+"�示：您的��是 ':%d:%s' 亦� ':%d:./%s'？"
+
+#: object-name.c:1763
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "路径 '%s' 在�盘上，但�在索引里"
+
+#: object-name.c:1765
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "路径 '%s' �存在（既�在�盘上，也�在索引中）"
+
+#: object-name.c:1778
+msgid "relative path syntax can't be used outside working tree"
+msgstr "�能在工作区之外使用相对路径语法"
+
+#: object-name.c:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "无效的对象� '%.*s'。"
+
 #: object.c:53
 #, c-format
 msgid "invalid object type \"%s\""
@@ -4306,35 +5801,114 @@ msgstr "无效的对象类型 \"%s\""
 msgid "object %s is a %s, not a %s"
 msgstr "对象 %s 是一个 %s，�是一个 %s"
 
-#: object.c:233
+#: object.c:250
 #, c-format
 msgid "object %s has unknown type id %d"
 msgstr "对象 %s 有未知的类型 id %d"
 
-#: object.c:246
+#: object.c:263
 #, c-format
 msgid "unable to parse object: %s"
 msgstr "�能解�对象：%s"
 
-#: object.c:266 object.c:277
+#: object.c:283 object.c:295
 #, c-format
 msgid "hash mismatch %s"
 msgstr "哈希值与 %s �匹�"
 
-#: packfile.c:641
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr "无法得到 %s 的大�"
+
+#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "无法得到 %s 的�盘使用�"
+
+#: pack-revindex.c:221
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "��索引文件 %s 太�"
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "��索引文件 %s ��"
+
+#: pack-revindex.c:234
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "��索引文件 %s 有错误的签�"
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "��索引文件 %s �支�的版本 %<PRIu32>"
+
+#: pack-revindex.c:243
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "��索引文件 %s 有�支�的哈希 ID %<PRIu32>"
+
+#: pack-write.c:250
+msgid "cannot both write and verify reverse index"
+msgstr "无法�时写入和校验��索引"
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr "�能调用 stat：%s"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "无法设置 %s 为�读"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "无法写入 '%s' 承诺者文件"
+
+#: packfile.c:625
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "�移�在包文件结�之�（��的 .idx？）"
 
-#: packfile.c:1887
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "包文件 %s �能被映射%s"
+
+#: packfile.c:1934
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "�移�在 %s 的包索引开始之�（��的索引？）"
 
-#: packfile.c:1891
+#: packfile.c:1938
 #, 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
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "选项 `%s' 期望一个数字值"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "格�错误的到期时间：'%s'"
+
+#: parse-options-cb.c:54
+#, 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
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "格�错误的对象� '%s'"
+
 #: parse-options.c:38
 #, c-format
 msgid "%s requires a value"
@@ -4350,7 +5924,7 @@ msgstr "%s 与 %s �兼容"
 msgid "%s : incompatible with something else"
 msgstr "%s：和其它的�兼容"
 
-#: parse-options.c:92 parse-options.c:96 parse-options.c:319
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
 #, c-format
 msgid "%s takes no value"
 msgstr "%s ��值"
@@ -4360,41 +5934,46 @@ msgstr "%s ��值"
 msgid "%s isn't available"
 msgstr "%s ��用"
 
-#: parse-options.c:219
+#: parse-options.c:217
 #, 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:389
+#: parse-options.c:386
 #, c-format
 msgid "ambiguous option: %s (could be --%s%s or --%s%s)"
 msgstr "有歧义的选项：%s（�以是 --%s%s 或 --%s%s）"
 
-#: parse-options.c:423 parse-options.c:431
+#: parse-options.c:420 parse-options.c:428
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "你的��是 `--%s`（有两个短线）？"
+
+#: parse-options.c:668 parse-options.c:988
 #, c-format
-msgid "did you mean `--%s` (with two dashes ?)"
-msgstr "你的��是 `--%s`（有两个短线？）"
+msgid "alias of --%s"
+msgstr "--%s 的别�"
 
-#: parse-options.c:860
+#: parse-options.c:879
 #, c-format
 msgid "unknown option `%s'"
 msgstr "未知选项 `%s'"
 
-#: parse-options.c:862
+#: parse-options.c:881
 #, c-format
 msgid "unknown switch `%c'"
 msgstr "未知开关 `%c'"
 
-#: parse-options.c:864
+#: parse-options.c:883
 #, c-format
 msgid "unknown non-ascii option in string: `%s'"
 msgstr "字符串中未知的� ascii 字符选项：`%s'"
 
-#: parse-options.c:888
+#: parse-options.c:907
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:907
+#: parse-options.c:926
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
@@ -4402,122 +5981,102 @@ msgstr "用法：%s"
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #.
-#: parse-options.c:913
+#: parse-options.c:932
 #, c-format
 msgid "   or: %s"
 msgstr "  或：%s"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: parse-options.c:916
+#: parse-options.c:935
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:955
+#: parse-options.c:974
 msgid "-NUM"
 msgstr "-æ•°å­—"
 
-#: parse-options.c:969
-#, c-format
-msgid "alias of --%s"
-msgstr "--%s 的别�"
-
-#: parse-options-cb.c:20 parse-options-cb.c:24
-#, c-format
-msgid "option `%s' expects a numerical value"
-msgstr "选项 `%s' 期望一个数字值"
-
-#: parse-options-cb.c:41
-#, c-format
-msgid "malformed expiration date '%s'"
-msgstr "格�错误的到期时间：'%s'"
-
-#: parse-options-cb.c:54
-#, c-format
-msgid "option `%s' expects \"always\", \"auto\", or \"never\""
-msgstr "选项 `%s' 期望 \"always\"�\"auto\" 或 \"never\""
-
-#: parse-options-cb.c:130 parse-options-cb.c:147
-#, c-format
-msgid "malformed object name '%s'"
-msgstr "格�错误的对象� '%s'"
-
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "�能设置 %s 为组�写"
 
-#: pathspec.c:128
+#: pathspec.c:151
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "转义字符 '\\' �能作为属性值的最�一个字符"
 
-#: pathspec.c:146
+#: pathspec.c:169
 msgid "Only one 'attr:' specification is allowed."
 msgstr "��许一个 'attr:' 规格。"
 
-#: pathspec.c:149
+#: pathspec.c:172
 msgid "attr spec must not be empty"
 msgstr "属性规格�能为空"
 
-#: pathspec.c:192
+#: pathspec.c:215
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "无效的属性� %s"
 
-#: pathspec.c:257
+#: pathspec.c:280
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "全局的 'glob' 和 'noglob' 路径规格设置�兼容"
 
-#: pathspec.c:264
+#: pathspec.c:287
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置�兼容"
 
-#: pathspec.c:304
+#: pathspec.c:327
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "路径规格包�无效的神奇�缀"
 
-#: pathspec.c:325
+#: pathspec.c:348
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "在路径规格 '%3$s' 中无效的神奇�缀 '%2$.*1$s'"
 
-#: pathspec.c:330
+#: pathspec.c:353
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "路径规格 '%s' 的神奇�缀结尾少了一个 ')'"
 
-#: pathspec.c:368
+#: pathspec.c:391
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "路径规格 '%2$s' 中包�未实现的神奇�缀 '%1$c'"
 
-#: pathspec.c:427
+#: pathspec.c:450
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s：'literal' 和 'glob' �兼容"
 
-#: pathspec.c:440
+#: pathspec.c:466
 #, c-format
-msgid "%s: '%s' is outside repository"
-msgstr "%s：'%s' 在仓库之外"
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s：'%s' 在�于 '%s' 的仓库之外"
 
-#: pathspec.c:514
+#: pathspec.c:542
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s'（助记符：'%c'）"
 
-#: pathspec.c:524
+#: pathspec.c:552
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s：路径规格神奇�缀�被此命令支�：%s"
 
-#: pathspec.c:591
+#: pathspec.c:619
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "路径规格 '%s' �于符�链接中"
 
+#: pathspec.c:664
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "行被错误地引用：%s"
+
 #: pkt-line.c:92
 msgid "unable to write flush packet"
 msgstr "无法写 flush 包"
@@ -4527,141 +6086,173 @@ msgid "unable to write delim packet"
 msgstr "无法写 delim 包"
 
 #: pkt-line.c:106
+msgid "unable to write response end packet"
+msgstr "无法写入�应结�数�包"
+
+#: pkt-line.c:113
 msgid "flush packet write failed"
 msgstr "flush 包写错误"
 
-#: pkt-line.c:146 pkt-line.c:232
+#: pkt-line.c:153 pkt-line.c:265
 msgid "protocol error: impossibly long line"
 msgstr "�议错误：��能的长行"
 
-#: pkt-line.c:162 pkt-line.c:164
+#: pkt-line.c:169 pkt-line.c:171
 msgid "packet write with format failed"
 msgstr "格�化包写入错误"
 
-#: pkt-line.c:196
+#: pkt-line.c:204
 msgid "packet write failed - data exceeds max packet size"
 msgstr "写数�包失败：数�超过了包的最大长度"
 
-#: pkt-line.c:203 pkt-line.c:210
-msgid "packet write failed"
-msgstr "数�包写入失败"
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "数�包写入失败：%s"
 
-#: pkt-line.c:295
+#: pkt-line.c:328 pkt-line.c:329
 msgid "read error"
 msgstr "读�错误"
 
-#: pkt-line.c:303
+#: pkt-line.c:339 pkt-line.c:340
 msgid "the remote end hung up unexpectedly"
 msgstr "远端�外挂断了"
 
-#: pkt-line.c:331
+#: pkt-line.c:369 pkt-line.c:371
 #, c-format
 msgid "protocol error: bad line length character: %.4s"
 msgstr "�议错误：错误的行长度字符串：%.4s"
 
-#: pkt-line.c:341 pkt-line.c:346
+#: 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 "�议错误：错误的行长度 %d"
 
-#: pkt-line.c:362
+#: pkt-line.c:413 sideband.c:165
 #, c-format
 msgid "remote error: %s"
 msgstr "远程错误：%s"
 
-#: preload-index.c:119
+#: preload-index.c:125
 msgid "Refreshing index"
 msgstr "正在刷新索引"
 
-#: preload-index.c:138
+#: preload-index.c:144
 #, c-format
 msgid "unable to create threaded lstat: %s"
 msgstr "无法创建线程 lstat：%s"
 
-#: pretty.c:966
+#: pretty.c:988
 msgid "unable to parse --pretty format"
 msgstr "�能解� --pretty 格�"
 
-#: promisor-remote.c:25
-msgid "Remote with no URL"
-msgstr "远程未设置 URL"
+#: promisor-remote.c:31
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote：无法派生 fetch �进程"
+
+#: promisor-remote.c:38 promisor-remote.c:40
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote：无法� fetch �进程写入"
+
+#: promisor-remote.c:44
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote：无法关闭至 fetch �进程的标准输入"
 
-#: promisor-remote.c:61
+#: promisor-remote.c:54
 #, c-format
 msgid "promisor remote name cannot begin with '/': %s"
 msgstr "promisor 远程�称�能以 '/' 开始：%s"
 
-#: range-diff.c:71
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info：在�数之�应有一个 flush"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "正在删除��对象"
+
+#: range-diff.c:78
 msgid "could not start `log`"
 msgstr "�能�动 `log`"
 
-#: range-diff.c:73
+#: range-diff.c:80
 msgid "could not read `log` output"
 msgstr "�能读� `log` 的输出"
 
-#: range-diff.c:92 sequencer.c:4985
+#: range-diff.c:101 sequencer.c:5550
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "�能解��交 '%s'"
 
-#: range-diff.c:118
+#: range-diff.c:115
+#, 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
 #, c-format
 msgid "could not parse git header '%.*s'"
 msgstr "无法解� git 头 '%.*s'"
 
-#: range-diff.c:275
+#: range-diff.c:307
 msgid "failed to generate diff"
 msgstr "生� diff 失败"
 
-#: range-diff.c:507 range-diff.c:509
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only 和 --right-only 互斥"
+
+#: range-diff.c:562 range-diff.c:564
 #, c-format
 msgid "could not parse log for '%s'"
 msgstr "�能解� '%s' 的日志"
 
-#: read-cache.c:680
+#: read-cache.c:710
 #, c-format
 msgid "will not add file alias '%s' ('%s' already exists in index)"
 msgstr "将�会添加文件别� '%s'（'%s' 已�存在于索引中）"
 
-#: read-cache.c:696
+#: read-cache.c:726
 msgid "cannot create an empty blob in the object database"
 msgstr "�能在对象数�库中创建空的数�对象"
 
-#: read-cache.c:718
+#: read-cache.c:748
 #, c-format
 msgid "%s: can only add regular files, symbolic links or git-directories"
 msgstr "%s：�能添加常规文件�符�链接或 git 目录"
 
-#: read-cache.c:723
+#: read-cache.c:753
 #, c-format
 msgid "'%s' does not have a commit checked out"
 msgstr "'%s' 没有检出一个�交"
 
-#: read-cache.c:775
+#: read-cache.c:805
 #, c-format
 msgid "unable to index file '%s'"
 msgstr "无法索引文件 '%s'"
 
-#: read-cache.c:794
+#: read-cache.c:824
 #, c-format
 msgid "unable to add '%s' to index"
 msgstr "无法在索引中添加 '%s'"
 
-#: read-cache.c:805
+#: read-cache.c:835
 #, c-format
 msgid "unable to stat '%s'"
 msgstr "无法对 %s 执行 stat"
 
-#: read-cache.c:1314
+#: read-cache.c:1358
 #, c-format
 msgid "'%s' appears as both a file and as a directory"
 msgstr "'%s' 看起�既是文件�是目录"
 
-#: read-cache.c:1520
+#: read-cache.c:1573
 msgid "Refresh index"
 msgstr "刷新索引"
 
-#: read-cache.c:1635
+#: read-cache.c:1705
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -4670,7 +6261,7 @@ msgstr ""
 "设置了 index.version，但是�值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1645
+#: read-cache.c:1715
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -4679,150 +6270,164 @@ msgstr ""
 "设置了 GIT_INDEX_VERSION，但是�值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1701
+#: read-cache.c:1771
 #, c-format
 msgid "bad signature 0x%08x"
 msgstr "�的签� 0x%08x"
 
-#: read-cache.c:1704
+#: read-cache.c:1774
 #, c-format
 msgid "bad index version %d"
 msgstr "�的索引版本 %d"
 
-#: read-cache.c:1713
+#: read-cache.c:1783
 msgid "bad index file sha1 signature"
 msgstr "�的索引文件 sha1 签�"
 
-#: read-cache.c:1743
+#: read-cache.c:1817
 #, c-format
 msgid "index uses %.4s extension, which we do not understand"
 msgstr "索引使用�被支�的 %.4s 扩展"
 
 # 	
-#: read-cache.c:1745
+#: read-cache.c:1819
 #, c-format
 msgid "ignoring %.4s extension"
 msgstr "忽略 %.4s 扩展"
 
-#: read-cache.c:1782
+#: read-cache.c:1856
 #, c-format
 msgid "unknown index entry format 0x%08x"
 msgstr "未知的索引�目格� 0x%08x"
 
-#: read-cache.c:1798
+#: read-cache.c:1872
 #, c-format
 msgid "malformed name field in the index, near path '%s'"
 msgstr "索引中�近路径 '%s' 有错误的�称字段"
 
-#: read-cache.c:1855
+#: read-cache.c:1929
 msgid "unordered stage entries in index"
 msgstr "索引中有未排�的暂存�目"
 
-#: read-cache.c:1858
+#: read-cache.c:1932
 #, c-format
 msgid "multiple stage entries for merged file '%s'"
 msgstr "�并文件 '%s' 有多个暂存�目"
 
-#: read-cache.c:1861
+#: read-cache.c:1935
 #, c-format
 msgid "unordered stage entries for '%s'"
 msgstr "'%s' 的未排�暂存�目"
 
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: 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 "索引文件��"
 
-#: read-cache.c:2108
+#: read-cache.c:2185
 #, c-format
 msgid "unable to create load_cache_entries thread: %s"
 msgstr "无法创建 load_cache_entries 线程：%s"
 
-#: read-cache.c:2121
+#: read-cache.c:2198
 #, c-format
 msgid "unable to join load_cache_entries thread: %s"
 msgstr "无法加入 load_cache_entries 线程：%s"
 
-#: read-cache.c:2154
+#: read-cache.c:2231
 #, c-format
 msgid "%s: index file open failed"
 msgstr "%s：打开索引文件失败"
 
-#: read-cache.c:2158
+#: read-cache.c:2235
 #, c-format
 msgid "%s: cannot stat the open index"
 msgstr "%s：�能对打开的索引执行 stat �作"
 
-#: read-cache.c:2162
+#: read-cache.c:2239
 #, c-format
 msgid "%s: index file smaller than expected"
 msgstr "%s：索引文件比预期的�"
 
-#: read-cache.c:2166
+#: read-cache.c:2243
 #, 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:2208
+#: read-cache.c:2286
 #, c-format
 msgid "unable to create load_index_extensions thread: %s"
 msgstr "无法创建 load_index_extensions 线程：%s"
 
-#: read-cache.c:2235
+#: read-cache.c:2313
 #, c-format
 msgid "unable to join load_index_extensions thread: %s"
 msgstr "无法加入 load_index_extensions 线程：%s"
 
-#: read-cache.c:2267
+#: read-cache.c:2351
 #, c-format
 msgid "could not freshen shared index '%s'"
 msgstr "无法刷新共享索引 '%s'"
 
-#: read-cache.c:2314
+#: read-cache.c:2398
 #, c-format
 msgid "broken index, expect %s in %s, got %s"
 msgstr "��的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
 
-#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
 #, c-format
 msgid "could not close '%s'"
 msgstr "�能关闭 '%s'"
 
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
+#: 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 "�能对 '%s' 调用 stat"
 
-#: read-cache.c:3126
+#: read-cache.c:3159
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "�能打开 git 目录：%s"
 
-#: read-cache.c:3138
+#: read-cache.c:3171
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "无法删除：%s"
 
-#: read-cache.c:3163
+#: read-cache.c:3200
 #, c-format
 msgid "cannot fix permission bits on '%s'"
 msgstr "�能修� '%s' 的���"
 
-#: read-cache.c:3312
+#: read-cache.c:3349
 #, c-format
 msgid "%s: cannot drop to stage #0"
 msgstr "%s：�能�到暂存区 #0"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"您�以用 'git rebase --edit-todo' 修正，然�执行 'git rebase --continue'。\n"
+"或者您�以用 'git rebase --abort' 终止�基。\n"
+
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
 
-#: rebase-interactive.c:35
+#: rebase-interactive.c:42
 msgid ""
 "\n"
 "Commands:\n"
@@ -4830,7 +6435,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"
@@ -4839,17 +6447,20 @@ 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"
 "命令:\n"
 "p, pick <�交> = 使用�交\n"
-"r, reword <�交> = 使用�交，但修改�交说明\n"
-"e, edit <�交> = 使用�交，进入 shell 以便进行�交修补\n"
-"s, squash <�交> = 使用�交，但��到�一个�交\n"
-"f, fixup <�交> = 类似于 \"squash\"，但丢弃�交说明日志\n"
+"r, reword <�交> = 使用�交，但编辑�交说明\n"
+"e, edit <�交> = 使用�交，但�止以便在 shell 中修补�交\n"
+"s, squash <�交> = 使用�交，但挤压到�一个�交\n"
+"f, fixup [-C | -c] <�交> = 类似于 \"squash\"，但��留�一个�交\n"
+"                   的�交说明，除�使用了 -C �数，此情况下则�\n"
+"                   �留本�交说明。使用 -c 和 -C 类似，但会打开\n"
+"                   编辑器修改�交说明\n"
 "x, exec <命令> = 使用 shell �行命令（此行剩余部分）\n"
 "b, break = 在此处�止（使用 'git rebase --continue' 继续�基）\n"
 "d, drop <�交> = 删除�交\n"
@@ -4862,14 +6473,14 @@ msgstr ""
 "\n"
 "�以对这些行�新排�，将从上至下执行。\n"
 
-#: rebase-interactive.c:56
+#: rebase-interactive.c:66
 #, c-format
 msgid "Rebase %s onto %s (%d command)"
 msgid_plural "Rebase %s onto %s (%d commands)"
 msgstr[0] "�基 %s 到 %s（%d 个�交）"
 msgstr[1] "�基 %s 到 %s（%d 个�交）"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: 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"
@@ -4877,7 +6488,7 @@ msgstr ""
 "\n"
 "��删除任�一行。使用 'drop' 显�地删除一个�交。\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -4885,7 +6496,7 @@ msgstr ""
 "\n"
 "如果您在这里删除一行，对应的�交将会丢失。\n"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -4899,7 +6510,7 @@ msgstr ""
 "    git rebase --continue\n"
 "\n"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -4909,22 +6520,19 @@ msgstr ""
 "然而，如果您删除全部内容，�基�作将会终止。\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
-msgid "Note that empty commits are commented out"
-msgstr "注�空�交已被注释掉"
-
-#: rebase-interactive.c:105 rerere.c:485 rerere.c:692 sequencer.c:3388
-#: sequencer.c:3414 sequencer.c:5084 builtin/fsck.c:356 builtin/rebase.c:235
+#: 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 "�能写入 '%s'"
 
-#: rebase-interactive.c:108
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
 #, c-format
-msgid "could not copy '%s' to '%s'."
-msgstr "�能拷� '%s' 至 '%s'。"
+msgid "could not write '%s'."
+msgstr "�能写入 '%s'。"
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:196
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -4933,7 +6541,7 @@ msgstr ""
 "警告：一些�交�能被�外丢弃。\n"
 "丢弃的�交（从新到旧）：\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:203
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -4949,124 +6557,14 @@ msgstr ""
 "�选值有：ignore�warn�error。\n"
 "\n"
 
-#: refs.c:262
-#, c-format
-msgid "%s does not point to a valid object!"
-msgstr "%s 没有指�一个有效的对象�"
-
-#: refs.c:667
-#, c-format
-msgid "ignoring dangling symref %s"
-msgstr "忽略悬空符�引用 %s"
-
-#: refs.c:669 ref-filter.c:2098
-#, c-format
-msgid "ignoring broken ref %s"
-msgstr "忽略��的引用 %s"
-
-#: refs.c:804
-#, c-format
-msgid "could not open '%s' for writing: %s"
-msgstr "无法为写入打开 '%s'：%s"
-
-#: refs.c:814 refs.c:865
-#, c-format
-msgid "could not read ref '%s'"
-msgstr "无法读�引用 '%s'"
-
-#: refs.c:820
-#, c-format
-msgid "ref '%s' already exists"
-msgstr "引用 '%s' 已�存在"
-
-#: refs.c:825
-#, c-format
-msgid "unexpected object ID when writing '%s'"
-msgstr "写入 '%s' 时�外的对象 ID"
-
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
-#, c-format
-msgid "could not write to '%s'"
-msgstr "�能写入 '%s'"
-
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1004
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "无法打开 '%s' 进行写入"
-
-#: refs.c:867
-#, c-format
-msgid "unexpected object ID when deleting '%s'"
-msgstr "删除 '%s' 时�外的对象 ID"
-
-#: refs.c:998
-#, c-format
-msgid "log for ref %s has gap after %s"
-msgstr "引用 %s 的日志在 %s 之�有缺�"
-
-#: refs.c:1004
-#, c-format
-msgid "log for ref %s unexpectedly ended on %s"
-msgstr "引用 %s 的日志�外终止于 %s "
-
-#: refs.c:1063
-#, c-format
-msgid "log for %s is empty"
-msgstr "%s 的日志为空"
-
-#: refs.c:1155
-#, c-format
-msgid "refusing to update ref with bad name '%s'"
-msgstr "拒�更新有错误�称 '%s' 的引用"
-
-#: refs.c:1231
-#, c-format
-msgid "update_ref failed for ref '%s': %s"
-msgstr "对引用 '%s' 执行 update_ref 失败：%s"
-
-#: refs.c:2023
-#, c-format
-msgid "multiple updates for ref '%s' not allowed"
-msgstr "��许对引用 '%s' 多次更新"
-
-#: refs.c:2055
-msgid "ref updates forbidden inside quarantine environment"
-msgstr "在隔离环境中�止更新引用"
-
-#: refs.c:2151 refs.c:2181
-#, c-format
-msgid "'%s' exists; cannot create '%s'"
-msgstr "'%s' 已存在，无法创建 '%s'"
-
-#: refs.c:2157 refs.c:2192
-#, c-format
-msgid "cannot process '%s' and '%s' at the same time"
-msgstr "无法�时处� '%s' 和 '%s'"
-
-#: refs/files-backend.c:1234
-#, c-format
-msgid "could not remove reference %s"
-msgstr "无法删除引用 %s"
-
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
-#: refs/packed-backend.c:1551
+#: 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 delete reference %s: %s"
-msgstr "无法删除引用 %s：%s"
-
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
-#, c-format
-msgid "could not delete references: %s"
-msgstr "无法删除引用：%s"
-
-#: refspec.c:137
-#, c-format
-msgid "invalid refspec '%s'"
-msgstr "无效的引用表达�：'%s'"
+msgid "could not read '%s'."
+msgstr "�能读� '%s'。"
 
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:2036
 msgid "gone"
 msgstr "丢失"
 
@@ -5085,289 +6583,417 @@ msgstr "�� %d"
 msgid "ahead %d, behind %d"
 msgstr "领先 %d，�� %d"
 
-#: ref-filter.c:165
+#: ref-filter.c:230
 #, c-format
 msgid "expected format: %%(color:<color>)"
 msgstr "期望的格�：%%(color:<颜色>)"
 
-#: ref-filter.c:167
+#: ref-filter.c:232
 #, c-format
 msgid "unrecognized color: %%(color:%s)"
 msgstr "未能识别的颜色：%%(color:%s)"
 
-#: ref-filter.c:189
+#: ref-filter.c:254
 #, c-format
 msgid "Integer value expected refname:lstrip=%s"
 msgstr "期望整数值 refname:lstrip=%s"
 
-#: ref-filter.c:193
+#: ref-filter.c:258
 #, c-format
 msgid "Integer value expected refname:rstrip=%s"
 msgstr "期望整数值 refname:rstrip=%s"
 
-#: ref-filter.c:195
+#: ref-filter.c:260
 #, c-format
 msgid "unrecognized %%(%s) argument: %s"
 msgstr "未能识别的 %%(%s) �数：%s"
 
-#: ref-filter.c:250
+#: ref-filter.c:315
 #, c-format
 msgid "%%(objecttype) does not take arguments"
 msgstr "%%(objecttype) �带�数"
 
-#: ref-filter.c:272
+#: ref-filter.c:339
 #, c-format
 msgid "unrecognized %%(objectsize) argument: %s"
 msgstr "未能识别的 %%(objectsize) �数：%s"
 
-#: ref-filter.c:280
+#: ref-filter.c:347
 #, c-format
 msgid "%%(deltabase) does not take arguments"
 msgstr "%%(deltabase) �带�数"
 
-#: ref-filter.c:292
+#: ref-filter.c:359
 #, c-format
 msgid "%%(body) does not take arguments"
 msgstr "%%(body) �带�数"
 
-#: ref-filter.c:301
+#: ref-filter.c:372
+#, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "未能识别的 %%(subject) �数：%s"
+
+#: ref-filter.c:391
 #, c-format
-msgid "%%(subject) does not take arguments"
-msgstr "%%(subject) �带�数"
+msgid "expected %%(trailers:key=<value>)"
+msgstr "预期 %%(trailers:key=<值>)"
 
-#: ref-filter.c:323
+#: ref-filter.c:393
 #, c-format
 msgid "unknown %%(trailers) argument: %s"
 msgstr "未知的 %%(trailers) �数：%s"
 
-#: ref-filter.c:352
+#: ref-filter.c:424
 #, c-format
 msgid "positive value expected contents:lines=%s"
 msgstr "期望一个正数 contents:lines=%s"
 
-#: ref-filter.c:354
+#: ref-filter.c:426
 #, c-format
 msgid "unrecognized %%(contents) argument: %s"
 msgstr "未能识别的 %%(contents) �数：%s"
 
-#: ref-filter.c:369
+#: ref-filter.c:441
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "期望 %%(%2$s) 中的 '%1$s' 是一个正数"
+
+#: ref-filter.c:445
 #, c-format
-msgid "positive value expected objectname:short=%s"
-msgstr "期望一个正数 objectname:short=%s"
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "未能识别 %%(%2$s) 中的�数 '%1$s'"
 
-#: ref-filter.c:373
+#: ref-filter.c:459
 #, c-format
-msgid "unrecognized %%(objectname) argument: %s"
-msgstr "未能识别的 %%(objectname) �数：%s"
+msgid "unrecognized email option: %s"
+msgstr "未识别的邮件选项：%s"
 
-#: ref-filter.c:403
+#: ref-filter.c:489
 #, c-format
 msgid "expected format: %%(align:<width>,<position>)"
 msgstr "期望的格�：%%(align:<宽度>,<�置>)"
 
-#: ref-filter.c:415
+#: ref-filter.c:501
 #, c-format
 msgid "unrecognized position:%s"
 msgstr "未能识别的�置：%s"
 
-#: ref-filter.c:422
+#: ref-filter.c:508
 #, c-format
 msgid "unrecognized width:%s"
 msgstr "未能识别的宽度：%s"
 
-#: ref-filter.c:431
+#: ref-filter.c:517
 #, c-format
 msgid "unrecognized %%(align) argument: %s"
 msgstr "未能识别的 %%(align) �数：%s"
 
-#: ref-filter.c:439
+#: ref-filter.c:525
 #, c-format
 msgid "positive width expected with the %%(align) atom"
 msgstr "元素 %%(align) 需�一个正数的宽度"
 
-#: ref-filter.c:457
+#: ref-filter.c:543
 #, c-format
 msgid "unrecognized %%(if) argument: %s"
 msgstr "未能识别的 %%(if) �数：%s"
 
-#: ref-filter.c:559
+#: ref-filter.c:645
 #, c-format
 msgid "malformed field name: %.*s"
 msgstr "格�错误的字段�：%.*s"
 
-#: ref-filter.c:586
+#: ref-filter.c:672
 #, c-format
 msgid "unknown field name: %.*s"
 msgstr "未知的字段�：%.*s"
 
-#: ref-filter.c:590
+#: ref-filter.c:676
 #, c-format
 msgid ""
 "not a git repository, but the field '%.*s' requires access to object data"
-msgstr "�是一个 git 仓库，但是字段 '%.*s' 需�访问对象数�"
+msgstr "�是 git 仓库，但是字段 '%.*s' 需�访问对象数�"
 
-#: ref-filter.c:714
+#: ref-filter.c:801
 #, c-format
 msgid "format: %%(if) atom used without a %%(then) atom"
 msgstr "格�：使用了 %%(if) 元素而没有 %%(then) 元素"
 
-#: ref-filter.c:777
+#: ref-filter.c:865
 #, c-format
 msgid "format: %%(then) atom used without an %%(if) atom"
 msgstr "格�：使用了 %%(then) 元素而没有 %%(if) 元素"
 
-#: ref-filter.c:779
+#: ref-filter.c:867
 #, c-format
 msgid "format: %%(then) atom used more than once"
 msgstr "格�：%%(then) 元素用了多次"
 
-#: ref-filter.c:781
+#: ref-filter.c:869
 #, c-format
 msgid "format: %%(then) atom used after %%(else)"
 msgstr "格�：%%(then) 元素用在了 %%(else) 之�"
 
-#: ref-filter.c:809
+#: ref-filter.c:897
 #, c-format
 msgid "format: %%(else) atom used without an %%(if) atom"
 msgstr "格�：使用了 %%(else) 元素而没有 %%(if) 元素"
 
-#: ref-filter.c:811
+#: ref-filter.c:899
 #, c-format
 msgid "format: %%(else) atom used without a %%(then) atom"
 msgstr "格�：使用了 %%(else) 元素而没有 %%(then) 元素"
 
-#: ref-filter.c:813
+#: ref-filter.c:901
 #, c-format
 msgid "format: %%(else) atom used more than once"
 msgstr "格�：%%(else) 元素用了多次"
 
-#: ref-filter.c:828
+#: ref-filter.c:916
 #, c-format
 msgid "format: %%(end) atom used without corresponding atom"
 msgstr "格�：使用了 %%(end) 元素�没有它的对应元素"
 
-#: ref-filter.c:885
+#: ref-filter.c:973
 #, c-format
 msgid "malformed format string %s"
 msgstr "错误的格�化字符串 %s"
 
-#: ref-filter.c:1488
+#: ref-filter.c:1621
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "（�分支，正�基 %s）"
+
+#: ref-filter.c:1624
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "（�分支，正�基分离头指针 %s）"
+
+#: ref-filter.c:1627
 #, c-format
-msgid "no branch, rebasing %s"
-msgstr "�分支，正�基 %s"
+msgid "(no branch, bisect started on %s)"
+msgstr "（�分支，二分查找开始于 %s）"
 
-#: ref-filter.c:1491
+#: ref-filter.c:1631
 #, c-format
-msgid "no branch, rebasing detached HEAD %s"
-msgstr "�分支，正�基分离头指针 %s"
+msgid "(HEAD detached at %s)"
+msgstr "（头指针在 %s 分离）"
 
-#: ref-filter.c:1494
+#: ref-filter.c:1634
 #, c-format
-msgid "no branch, bisect started on %s"
-msgstr "�分支，二分查找开始于 %s"
+msgid "(HEAD detached from %s)"
+msgstr "（头指针自 %s 分离）"
 
-#: ref-filter.c:1504
-msgid "no branch"
-msgstr "�分支"
+#: ref-filter.c:1637
+msgid "(no branch)"
+msgstr "（�分支）"
 
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1669 ref-filter.c:1880
 #, c-format
 msgid "missing object %s for %s"
 msgstr "缺失 %2$s 的对象 %1$s"
 
-#: ref-filter.c:1550
+#: ref-filter.c:1679
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
 
-#: ref-filter.c:2004
+#: ref-filter.c:2064
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "格�错误的对象 '%s'"
 
-#: ref-filter.c:2093
+#: ref-filter.c:2153
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "忽略带有错误�称 %s 的引用"
 
-#: ref-filter.c:2389
+#: ref-filter.c:2158 refs.c:676
 #, c-format
-msgid "format: %%(end) atom missing"
-msgstr "格�：缺少 %%(end) 元素"
-
-#: ref-filter.c:2489
-#, c-format
-msgid "option `%s' is incompatible with --merged"
-msgstr "选项 `%s' 和 --merged �兼容"
+msgid "ignoring broken ref %s"
+msgstr "忽略��的引用 %s"
 
-#: ref-filter.c:2492
+#: ref-filter.c:2502
 #, c-format
-msgid "option `%s' is incompatible with --no-merged"
-msgstr "选项 `%s' 和 --no-merged �兼容"
+msgid "format: %%(end) atom missing"
+msgstr "格�：缺少 %%(end) 元素"
 
-#: ref-filter.c:2502
+#: ref-filter.c:2596
 #, c-format
 msgid "malformed object name %s"
 msgstr "格�错误的对象� %s"
 
-#: ref-filter.c:2507
+#: ref-filter.c:2601
 #, c-format
 msgid "option `%s' must point to a commit"
 msgstr "选项 `%s' 必须指�一个�交"
 
-#: remote.c:366
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s 没有指�一个有效的对象�"
+
+#: 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 ""
+"使用 '%s' 作为�始分支的�称。这个默认分支�称�能会更改。�在新仓库中\n"
+"�置使用�始分支�，并消除这�警告，请执行：\n"
+"\n"
+"\tgit config --global init.defaultBranch <�称>\n"
+"\n"
+"除了 'master' 之外，通常选定的�字有 'main'�'trunk' 和 'development'。\n"
+"�以通过以下命令�命�刚创建的分支：\n"
+"\n"
+"\tgit branch -m <name>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "无法获� `%s`"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "无效的分支�：%s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "忽略悬空符�引用 %s"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "引用 %s 的日志在 %s 之�有缺�"
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "引用 %s 的日志�外终止于 %s "
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s 的日志为空"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "拒�更新有错误�称 '%s' 的引用"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "对引用 '%s' 执行 update_ref 失败：%s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "��许对引用 '%s' 多次更新"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔离环境中�止更新引用"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "引用更新被钩�中止"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' 已存在，无法创建 '%s'"
+
+#: refs.c:2248 refs.c:2283
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "无法�时处� '%s' 和 '%s'"
+
+#: refs/files-backend.c:1228
+#, 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
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "无法删除引用 %s：%s"
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr "无法删除引用：%s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "无效的引用规格：'%s'"
+
+#: remote.c:351
 #, c-format
 msgid "config remote shorthand cannot begin with '/': %s"
 msgstr "�置的远程短�称�能以 '/' 开始：%s"
 
-#: remote.c:413
+#: remote.c:399
 msgid "more than one receivepack given, using the first"
 msgstr "�供了一个以上的 receivepack，使用第一个"
 
-#: remote.c:421
+#: remote.c:407
 msgid "more than one uploadpack given, using the first"
 msgstr "�供了一个以上的 uploadpack，使用第一个"
 
-#: remote.c:611
+#: remote.c:590
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "�能�时获� %s 和 %s 至 %s"
 
-#: remote.c:615
+#: remote.c:594
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s 通常跟踪 %s，而� %s"
 
-#: remote.c:619
+#: remote.c:598
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s �时跟踪 %s 和 %s"
 
-#: remote.c:687
+#: remote.c:666
 #, c-format
 msgid "key '%s' of pattern had no '*'"
 msgstr "模�的键 '%s' 没有 '*'"
 
-#: remote.c:697
+#: remote.c:676
 #, c-format
 msgid "value '%s' of pattern has no '*'"
 msgstr "模�的值 '%s' 没有 '*'"
 
-#: remote.c:1003
+#: remote.c:1083
 #, c-format
 msgid "src refspec %s does not match any"
-msgstr "�引用表达� %s 没有匹�"
+msgstr "�引用规格 %s 没有匹�"
 
-#: remote.c:1008
+#: remote.c:1088
 #, 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:1023
+#: remote.c:1103
 #, c-format
 msgid ""
 "The destination you provided is not a full refname (i.e.,\n"
@@ -5389,154 +7015,154 @@ msgstr ""
 "\n"
 "都�行，所以我们已放弃。您必须给出完整的引用。"
 
-#: remote.c:1043
+#: remote.c:1123
 #, 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"
+"引用规格的 <src> 是一个�交对象。您是想创建一个新的分支而�\n"
 "'%s:refs/heads/%s' 推�么？"
 
-#: remote.c:1048
+#: remote.c:1128
 #, 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"
+"引用规格的 <src> 是一个标签对象。您是想创建一个新的标签而�\n"
 "'%s:refs/tags/%s' 推�么？"
 
-#: remote.c:1053
+#: remote.c:1133
 #, 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"
+"引用规格的 <src> 是一个树对象。您是想为这个树对象创建标签而�\n"
 "'%s:refs/tags/%s' 推�么？"
 
-#: remote.c:1058
+#: remote.c:1138
 #, 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"
+"引用规格的 <src> 是一个数�对象。您是想为这个数�对象创建标签而�\n"
 "'%s:refs/tags/%s' 推�么？"
 
-#: remote.c:1094
+#: remote.c:1174
 #, c-format
 msgid "%s cannot be resolved to branch"
 msgstr "%s 无法被解�为分支"
 
-#: remote.c:1105
+#: remote.c:1185
 #, c-format
 msgid "unable to delete '%s': remote ref does not exist"
 msgstr "无法删除 '%s'：远程引用�存在"
 
-#: remote.c:1117
+#: remote.c:1197
 #, c-format
 msgid "dst refspec %s matches more than one"
-msgstr "目标引用表达� %s 匹�超过一个"
+msgstr "目标引用规格 %s 匹�超过一个"
 
-#: remote.c:1124
+#: remote.c:1204
 #, c-format
 msgid "dst ref %s receives from more than one src"
 msgstr "目标引用 %s 接收超过一个�"
 
-#: remote.c:1627 remote.c:1728
+#: remote.c:1724 remote.c:1825
 msgid "HEAD does not point to a branch"
 msgstr "HEAD 没有指�一个分支"
 
-#: remote.c:1636
+#: remote.c:1733
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "没有此分支：'%s'"
 
-#: remote.c:1639
+#: remote.c:1736
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "尚未给分支 '%s' 设置上游"
 
-#: remote.c:1645
+#: remote.c:1742
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 
-#: remote.c:1660
+#: remote.c:1757
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "推�目标 '%s' 至远程 '%s' 没有本地跟踪分支"
 
-#: remote.c:1672
+#: remote.c:1769
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "分支 '%s' 没有设置�推�的远程�务器"
 
-#: remote.c:1682
+#: remote.c:1779
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "� '%s' 推�引用规格未包� '%s'"
 
-#: remote.c:1695
+#: remote.c:1792
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "推�无目标（push.default 是 'nothing'）"
 
-#: remote.c:1717
+#: remote.c:1814
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "无法解� 'simple' 推�至一个�独的目标"
 
-#: remote.c:1843
+#: remote.c:1943
 #, c-format
 msgid "couldn't find remote ref %s"
 msgstr "无法找到远程引用 %s"
 
-#: remote.c:1856
+#: remote.c:1956
 #, c-format
 msgid "* Ignoring funny ref '%s' locally"
 msgstr "* 在本地忽略�笑的引用 '%s'"
 
-#: remote.c:2019
+#: remote.c:2119
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "您的分支基于 '%s'，但此上游分支已��存在。\n"
 
-#: remote.c:2023
+#: remote.c:2123
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  （使用 \"git branch --unset-upstream\" �修�）\n"
 
-#: remote.c:2026
+#: remote.c:2126
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "您的分支与上游分支 '%s' 一致。\n"
 
-#: remote.c:2030
+#: remote.c:2130
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "您的分支和 '%s' 指���的�交。\n"
 
-#: remote.c:2033
+#: remote.c:2133
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  （使用 \"%s\" 查看详情）\n"
 
-#: remote.c:2037
+#: 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] "您的分支领先 '%s' 共 %d 个�交。\n"
 msgstr[1] "您的分支领先 '%s' 共 %d 个�交。\n"
 
-#: remote.c:2043
+#: remote.c:2143
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  （使用 \"git push\" ��布您的本地�交）\n"
 
-#: remote.c:2046
+#: remote.c:2146
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -5545,11 +7171,11 @@ msgstr[0] "您的分支�� '%s' 共 %d 个�交，并且�以快进。\n"
 msgstr[1] "您的分支�� '%s' 共 %d 个�交，并且�以快进。\n"
 
 #  译者：注����导空格
-#: remote.c:2054
+#: remote.c:2154
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  （使用 \"git pull\" �更新您的本地分支）\n"
 
-#: remote.c:2057
+#: remote.c:2157
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -5565,11 +7191,11 @@ msgstr[1] ""
 "并且分别有 %d 和 %d 处��的�交。\n"
 
 #  译者：注����导空格
-#: remote.c:2067
+#: remote.c:2167
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" ��并远程分支）\n"
 
-#: remote.c:2250
+#: remote.c:2359
 #, c-format
 msgid "cannot parse expected object name '%s'"
 msgstr "无法解�期望的对象� '%s'"
@@ -5584,131 +7210,140 @@ msgstr "错误的替�引用�称：%s"
 msgid "duplicate replace ref: %s"
 msgstr "��的替�引用：%s"
 
-#: replace-object.c:73
+#: replace-object.c:82
 #, c-format
 msgid "replace depth too high for object %s"
 msgstr "对象 %s 的替�层级太深"
 
-#: rerere.c:217 rerere.c:226 rerere.c:229
+#: rerere.c:201 rerere.c:210 rerere.c:213
 msgid "corrupt MERGE_RR"
 msgstr "��的 MERGE_RR"
 
-#: rerere.c:264 rerere.c:269
+#: rerere.c:248 rerere.c:253
 msgid "unable to write rerere record"
 msgstr "无法写入 rerere 记录"
 
-#: rerere.c:495
+#: rerere.c:479
 #, c-format
 msgid "there were errors while writing '%s' (%s)"
 msgstr "写入 '%s' (%s) 时出错"
 
-#: rerere.c:498
+#: rerere.c:482
 #, c-format
 msgid "failed to flush '%s'"
 msgstr "刷新 '%s' 失败"
 
-#: rerere.c:503 rerere.c:1039
+#: rerere.c:487 rerere.c:1023
 #, c-format
 msgid "could not parse conflict hunks in '%s'"
 msgstr "�能解� '%s' 中的冲��"
 
-#: rerere.c:684
+#: rerere.c:668
 #, c-format
 msgid "failed utime() on '%s'"
 msgstr "在 '%s' 上调用 utime() 失败"
 
-#: rerere.c:694
+#: rerere.c:678
 #, c-format
 msgid "writing '%s' failed"
 msgstr "写入 '%s' 失败"
 
-#: rerere.c:714
+#: rerere.c:698
 #, c-format
 msgid "Staged '%s' using previous resolution."
 msgstr "使用之�的解决方案暂存 '%s'。"
 
-#: rerere.c:753
+#: rerere.c:737
 #, c-format
 msgid "Recorded resolution for '%s'."
 msgstr "已记录 '%s' 的解决方案。"
 
-#: rerere.c:788
+#: rerere.c:772
 #, c-format
 msgid "Resolved '%s' using previous resolution."
 msgstr "使用之�的解决方案解决 '%s'。"
 
-#: rerere.c:803
+#: rerere.c:787
 #, c-format
 msgid "cannot unlink stray '%s'"
 msgstr "�能删除 stray '%s'"
 
-#: rerere.c:807
+#: rerere.c:791
 #, c-format
 msgid "Recorded preimage for '%s'"
 msgstr "为 '%s' 记录 preimage"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: 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 "�能创建目录 '%s'"
 
-#: rerere.c:1057
+#: rerere.c:1041
 #, c-format
 msgid "failed to update conflicted state in '%s'"
 msgstr "更新 '%s' 中的冲�状�失败"
 
-#: rerere.c:1068 rerere.c:1075
+#: rerere.c:1052 rerere.c:1059
 #, c-format
 msgid "no remembered resolution for '%s'"
 msgstr "没有为 '%s' 记忆的解决方案"
 
-#: rerere.c:1077
+#: rerere.c:1061
 #, c-format
 msgid "cannot unlink '%s'"
 msgstr "�能删除 '%s'"
 
-#: rerere.c:1087
+#: rerere.c:1071
 #, c-format
 msgid "Updated preimage for '%s'"
 msgstr "已为 '%s' 更新 preimage"
 
-#: rerere.c:1096
+#: rerere.c:1080
 #, c-format
 msgid "Forgot resolution for '%s'\n"
 msgstr "忘记 '%s' 的解决方案\n"
 
-#: rerere.c:1199
+#: rerere.c:1191
 msgid "unable to open rr-cache directory"
 msgstr "�能打开 rr-cache 目录"
 
-#: revision.c:2509
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "�能确定 HEAD 版本"
+
+#: reset.c:69 reset.c:75 sequencer.c:3689
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "无法找到 %s 指�的树。"
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "��支� --unpacked=<packfile>"
+
+#: revision.c:2684
 msgid "your current branch appears to be broken"
 msgstr "您的当�分支好�被��"
 
-#: revision.c:2512
+#: revision.c:2687
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的当�分支 '%s' 尚无任何�交"
 
-#: revision.c:2720
-msgid "--first-parent is incompatible with --bisect"
-msgstr "--first-parent 与 --bisect �兼容"
-
-#: revision.c:2724
+#: revision.c:2893
 msgid "-L does not yet support diff formats besides -p and -s"
 msgstr "-L 尚�支� -p 和 -s 之外的差异格�"
 
-#: run-command.c:763
+#: run-command.c:766
 msgid "open /dev/null failed"
 msgstr "�能打开 /dev/null"
 
-#: run-command.c:1269
+#: run-command.c:1274
 #, c-format
 msgid "cannot create async thread: %s"
 msgstr "�能创建 async 线程：%s"
 
-#: run-command.c:1333
+#: run-command.c:1344
 #, c-format
 msgid ""
 "The '%s' hook was ignored because it's not set as executable.\n"
@@ -5717,75 +7352,87 @@ msgstr ""
 "因为没有将钩� '%s' 设置为�执行，钩�被忽略。您�以通过\n"
 "�置 `git config advice.ignoredHook false` �关闭这�警告。"
 
-#: send-pack.c:142
+#: send-pack.c:150
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "读�远程解包状�时收到�外的 flush 包"
 
-#: send-pack.c:144
+#: send-pack.c:152
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "�能解�远程解包状�：%s"
 
-#: send-pack.c:146
+#: send-pack.c:154
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "远程解包失败：%s"
 
-#: send-pack.c:307
+#: send-pack.c:378
 msgid "failed to sign the push certificate"
 msgstr "为推��书签�失败"
 
-#: send-pack.c:421
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack：无法派生 fetch �进程"
+
+#: 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 "接收端�支�这个仓库的哈希算法"
+
+#: send-pack.c:535
 msgid "the receiving end does not support --signed push"
-msgstr "接收端�支�签�推�"
+msgstr "接收端�支�签�推�（--signed）"
 
-#: send-pack.c:423
+#: send-pack.c:537
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
-msgstr "未��推��书，因为接收端�支�签�推�"
+msgstr "未��推��书，因为接收端�支�签�推�（--signed）"
 
-#: send-pack.c:435
+#: send-pack.c:544
 msgid "the receiving end does not support --atomic push"
-msgstr "接收端�支�原�推�"
+msgstr "接收端�支�原�推�（--atomic）"
 
-#: send-pack.c:440
+#: send-pack.c:549
 msgid "the receiving end does not support push options"
 msgstr "接收端�支�推�选项"
 
-#: sequencer.c:187
+#: sequencer.c:196
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "无效的�交信�清�模� '%s'"
 
-#: sequencer.c:292
+#: sequencer.c:324
 #, c-format
 msgid "could not delete '%s'"
 msgstr "无法删除 '%s'"
 
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
 #, c-format
 msgid "could not remove '%s'"
 msgstr "无法删除 '%s'"
 
-#: sequencer.c:321
+#: sequencer.c:354
 msgid "revert"
 msgstr "还原"
 
-#: sequencer.c:323
+#: sequencer.c:356
 msgid "cherry-pick"
 msgstr "拣选"
 
-#: sequencer.c:325
-msgid "rebase -i"
-msgstr "rebase -i"
+#: sequencer.c:358
+msgid "rebase"
+msgstr "�基"
 
-#: sequencer.c:327
+#: sequencer.c:360
 #, c-format
 msgid "unknown action: %d"
 msgstr "未知动作：%d"
 
-#: sequencer.c:385
+#: sequencer.c:419
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -5793,7 +7440,7 @@ msgstr ""
 "冲�解决完毕�，用 'git add <路径>' 或 'git rm <路径>'\n"
 "命令标记修正�的文件"
 
-#: sequencer.c:388
+#: sequencer.c:422
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -5802,110 +7449,109 @@ msgstr ""
 "冲�解决完毕�，用 'git add <路径>' 或 'git rm <路径>'\n"
 "对修正�的文件�标记，然�用 'git commit' �交"
 
-#: sequencer.c:401 sequencer.c:2847
+#: sequencer.c:435 sequencer.c:3271
 #, c-format
 msgid "could not lock '%s'"
 msgstr "�能�定 '%s'"
 
-#: sequencer.c:408
+#: 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 "�能写入 '%s'"
+
+#: sequencer.c:442
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "�能将�行符写入 '%s'"
 
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
-#: sequencer.c:3130
+#: sequencer.c:447 sequencer.c:3075 sequencer.c:3277 sequencer.c:3291
+#: sequencer.c:3555
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "无法完� '%s'"
 
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
-#: builtin/rebase.c:568
-#, c-format
-msgid "could not read '%s'"
-msgstr "�能读� '%s'"
-
-#: sequencer.c:462
+#: sequencer.c:486
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "您的本地修改将被%s覆盖。"
 
-#: sequencer.c:466
+#: sequencer.c:490
 msgid "commit your changes or stash them to proceed."
 msgstr "�交您的修改或贮���继续。"
 
-#: sequencer.c:498
+#: sequencer.c:522
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s：快进"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:561 builtin/tag.c:609
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清�模� %s"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #.
-#: sequencer.c:631
+#: sequencer.c:671
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：无法写入新索引文件"
 
-#: sequencer.c:648
+#: sequencer.c:685
 msgid "unable to update cache tree"
 msgstr "�能更新缓存树"
 
-#: sequencer.c:662
+#: sequencer.c:699
 msgid "could not resolve HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: sequencer.c:742
+#: sequencer.c:779
 #, c-format
 msgid "no key present in '%.*s'"
 msgstr "在 '%.*s' 中没有 key"
 
-#: sequencer.c:753
+#: sequencer.c:790
 #, c-format
 msgid "unable to dequote value of '%s'"
 msgstr "无法为 '%s' 的值去引�"
 
-#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
+#: 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 "无法打开 '%s' 进行读�"
 
-#: sequencer.c:800
+#: sequencer.c:837
 msgid "'GIT_AUTHOR_NAME' already given"
 msgstr "已�给出 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:805
+#: sequencer.c:842
 msgid "'GIT_AUTHOR_EMAIL' already given"
 msgstr "已�给出 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:810
+#: sequencer.c:847
 msgid "'GIT_AUTHOR_DATE' already given"
 msgstr "已�给出 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:814
+#: sequencer.c:851
 #, c-format
 msgid "unknown variable '%s'"
 msgstr "未知�� '%s'"
 
-#: sequencer.c:819
+#: sequencer.c:856
 msgid "missing 'GIT_AUTHOR_NAME'"
 msgstr "缺少 'GIT_AUTHOR_NAME'"
 
-#: sequencer.c:821
+#: sequencer.c:858
 msgid "missing 'GIT_AUTHOR_EMAIL'"
 msgstr "缺少 'GIT_AUTHOR_EMAIL'"
 
-#: sequencer.c:823
+#: sequencer.c:860
 msgid "missing 'GIT_AUTHOR_DATE'"
 msgstr "缺少 'GIT_AUTHOR_DATE'"
 
-#: sequencer.c:872
+#: sequencer.c:925
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -5922,7 +7568,7 @@ msgid ""
 "  git rebase --continue\n"
 msgstr ""
 "您的工作区中存在已暂存的修改\n"
-"如果这些修改需�被并入�一个�交，执行：\n"
+"如果这些修改需�被挤压到�一个�交，执行：\n"
 "\n"
 "  git commit --amend %s\n"
 "\n"
@@ -5934,11 +7580,11 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1146
+#: sequencer.c:1212
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' 钩�失败"
 
-#: sequencer.c:1153
+#: 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"
@@ -5962,7 +7608,7 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1166
+#: 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"
@@ -5985,326 +7631,344 @@ msgstr ""
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1208
+#: sequencer.c:1273
 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的�交"
 
-#: sequencer.c:1210
+#: sequencer.c:1275
 msgid "could not parse newly created commit"
 msgstr "�能解�新创建的�交"
 
-#: sequencer.c:1256
+#: sequencer.c:1321
 msgid "unable to resolve HEAD after creating commit"
 msgstr "创建�交�，�能解� HEAD"
 
-#: sequencer.c:1258
+#: sequencer.c:1323
 msgid "detached HEAD"
 msgstr "分离头指针"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: sequencer.c:1262
+#: sequencer.c:1327
 msgid " (root-commit)"
 msgstr "（根�交）"
 
-#: sequencer.c:1283
+#: sequencer.c:1348
 msgid "could not parse HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:1285
+#: sequencer.c:1350
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s �是一个�交�"
 
-#: sequencer.c:1289 builtin/commit.c:1571
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
 msgid "could not parse HEAD commit"
 msgstr "�能解� HEAD �交"
 
-#: sequencer.c:1341 sequencer.c:1933
+#: sequencer.c:1410 sequencer.c:2295
 msgid "unable to parse commit author"
 msgstr "�能解��交作者"
 
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree 无法写入树对象"
 
-#: sequencer.c:1369 sequencer.c:1429
+#: sequencer.c:1454 sequencer.c:1574
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "�能从 '%s' 读��交说明"
 
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "无效的作者身份 '%s'"
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr "��的作者：缺失日期信�"
+
+#: 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 "写�交对象失败"
 
-#: sequencer.c:1456
+#: 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 "�能更新 %s"
+
+#: sequencer.c:1606
 #, c-format
 msgid "could not parse commit %s"
 msgstr "�能解��交 %s"
 
-#: sequencer.c:1461
+#: sequencer.c:1611
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "�能解�父�交 %s"
 
-#: sequencer.c:1535 sequencer.c:1645
+#: sequencer.c:1694 sequencer.c:1975
 #, c-format
 msgid "unknown command: %d"
 msgstr "未知命令：%d"
 
-#: sequencer.c:1592 sequencer.c:1617
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "这是第一个�交说明："
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "这是�交说明 #%d："
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "第一个�交说明将被跳过："
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "�交说明 #%d 将被跳过："
+
+#: sequencer.c:1740
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "这是一个 %d 个�交的组�。"
 
-#: sequencer.c:1602
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "�能写 '%s'"
+
+#: sequencer.c:1934
 msgid "need a HEAD to fixup"
 msgstr "需�一个 HEAD �修�"
 
-#: sequencer.c:1604 sequencer.c:3157
+#: sequencer.c:1936 sequencer.c:3582
 msgid "could not read HEAD"
 msgstr "�能读� HEAD"
 
-#: sequencer.c:1606
+#: sequencer.c:1938
 msgid "could not read HEAD's commit message"
 msgstr "�能读� HEAD 的�交说明"
 
-#: sequencer.c:1612
-#, c-format
-msgid "cannot write '%s'"
-msgstr "�能写 '%s'"
-
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
-msgid "This is the 1st commit message:"
-msgstr "这是第一个�交说明："
-
-#: sequencer.c:1627
+#: sequencer.c:1962
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "�能读� %s 的�交说明"
 
-#: sequencer.c:1634
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr "这是�交说明 #%d："
-
-#: sequencer.c:1640
-#, c-format
-msgid "The commit message #%d will be skipped:"
-msgstr "�交说明 #%d 将被跳过："
-
-#: sequencer.c:1728
+#: sequencer.c:2072
 msgid "your index file is unmerged."
 msgstr "您的索引文件未完��并。"
 
-#: sequencer.c:1735
+#: sequencer.c:2079
 msgid "cannot fixup root commit"
 msgstr "�能修�根�交"
 
-#: sequencer.c:1754
+#: sequencer.c:2098
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "�交 %s 是一个�并�交但未�供 -m 选项。"
 
-#: sequencer.c:1762 sequencer.c:1770
+#: sequencer.c:2106 sequencer.c:2114
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "�交 %s 没有第 %d 个父�交"
 
-#: sequencer.c:1776
+#: sequencer.c:2120
 #, 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:1795
+#: sequencer.c:2139
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：�能解�父�交 %s"
 
-#: sequencer.c:1860
+#: sequencer.c:2205
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "�能将 '%s' �命�为 '%s'"
 
-#: sequencer.c:1915
+#: sequencer.c:2265
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "�能还原 %s... %s"
 
-#: sequencer.c:1916
+#: sequencer.c:2266
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "�能应用 %s... %s"
 
-#: sequencer.c:1983
+#: sequencer.c:2287
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "丢弃 %s %s -- 补�内容已在上游\n"
+
+#: sequencer.c:2345
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读�索引"
 
-#: sequencer.c:1990
+#: sequencer.c:2352
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"
 
-#: sequencer.c:2066
+#: sequencer.c:2425
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s �接��数：'%s'"
 
-#: sequencer.c:2075
+#: sequencer.c:2434
 #, c-format
 msgid "missing arguments for %s"
 msgstr "缺少 %s 的�数"
 
-#: sequencer.c:2112
+#: sequencer.c:2477
 #, c-format
-msgid "could not parse '%.*s'"
-msgstr "无法解� '%.*s'"
+msgid "could not parse '%s'"
+msgstr "无法解� '%s'"
 
-#: sequencer.c:2166
+#: sequencer.c:2538
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "无效行 %d：%.*s"
 
-#: sequencer.c:2177
+#: sequencer.c:2549
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "没有父�交的情况下�能 '%s'"
 
-#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
-#, c-format
-msgid "could not read '%s'."
-msgstr "�能读� '%s'。"
-
-#: sequencer.c:2261
+#: sequencer.c:2635
 msgid "cancelling a cherry picking in progress"
 msgstr "正在�消一个进行中的拣选"
 
-#: sequencer.c:2268
+#: sequencer.c:2644
 msgid "cancelling a revert in progress"
 msgstr "正在�消一个进行中的还原"
 
-#: sequencer.c:2302
+#: sequencer.c:2690
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "请用 'git rebase --edit-todo' �修改。"
 
-#: sequencer.c:2304
+#: sequencer.c:2692
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "��用的指令清�：'%s'"
 
-#: sequencer.c:2309
+#: sequencer.c:2697
 msgid "no commits parsed."
 msgstr "没有解��交。"
 
-#: sequencer.c:2320
+#: sequencer.c:2708
 msgid "cannot cherry-pick during a revert."
 msgstr "�能在回退中执行拣选。"
 
-#: sequencer.c:2322
+#: sequencer.c:2710
 msgid "cannot revert during a cherry-pick."
 msgstr "�能在拣选中执行回退。"
 
-#: sequencer.c:2404
+#: sequencer.c:2788
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s 的值无效：%s"
 
-#: sequencer.c:2491
+#: sequencer.c:2897
 msgid "unusable squash-onto"
 msgstr "��用的 squash-onto"
 
-#: sequencer.c:2507
+#: sequencer.c:2917
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "格�错误的选项清�：'%s'"
 
-#: sequencer.c:2590 sequencer.c:4308
+#: sequencer.c:3012 sequencer.c:4868
 msgid "empty commit set passed"
 msgstr "�供了空的�交集"
 
-#: sequencer.c:2606
+#: sequencer.c:3029
 msgid "revert is already in progress"
 msgstr "一个还原�作已在进行"
 
-#: sequencer.c:2608
+#: sequencer.c:3031
 #, c-format
 msgid "try \"git revert (--continue | %s--abort | --quit)\""
 msgstr "�试 \"git revert (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2611
+#: sequencer.c:3034
 msgid "cherry-pick is already in progress"
 msgstr "拣选�作已在进行"
 
-#: sequencer.c:2613
+#: sequencer.c:3036
 #, c-format
 msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
 msgstr "�试 \"git cherry-pick (--continue | %s--abort | --quit)\""
 
-#: sequencer.c:2627
+#: sequencer.c:3050
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "�能创建�列目录 '%s'"
 
-#: sequencer.c:2642
+#: sequencer.c:3065
 msgid "could not lock HEAD"
 msgstr "�能�定 HEAD"
 
-#: sequencer.c:2702 sequencer.c:4057
+#: sequencer.c:3125 sequencer.c:4581
 msgid "no cherry-pick or revert in progress"
 msgstr "拣选或还原�作并未进行"
 
-#: sequencer.c:2704 sequencer.c:2715
+#: sequencer.c:3127 sequencer.c:3138
 msgid "cannot resolve HEAD"
 msgstr "�能解� HEAD"
 
-#: sequencer.c:2706 sequencer.c:2750
+#: sequencer.c:3129 sequencer.c:3173
 msgid "cannot abort from a branch yet to be born"
 msgstr "�能从尚未建立的分支终止"
 
-#: sequencer.c:2736 builtin/grep.c:736
+#: sequencer.c:3159 builtin/grep.c:758
 #, c-format
 msgid "cannot open '%s'"
 msgstr "�能打开 '%s'"
 
-#: sequencer.c:2738
+#: sequencer.c:3161
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "�能读� '%s'：%s"
 
-#: sequencer.c:2739
+#: sequencer.c:3162
 msgid "unexpected end of file"
 msgstr "�外的文件结�"
 
-#: sequencer.c:2745
+#: sequencer.c:3168
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "�存拣选�交�的 HEAD 文件 '%s' ��"
 
-#: sequencer.c:2756
+#: sequencer.c:3179
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "您好�移动了 HEAD。未能回退，检查您的 HEAD�"
 
-#: sequencer.c:2797
+#: sequencer.c:3220
 msgid "no revert in progress"
 msgstr "没有正在进行的还原"
 
-#: sequencer.c:2805
+#: sequencer.c:3229
 msgid "no cherry-pick in progress"
 msgstr "没有正在进行的拣选"
 
-#: sequencer.c:2815
+#: sequencer.c:3239
 msgid "failed to skip the commit"
 msgstr "无法跳过这个�交"
 
-#: sequencer.c:2822
+#: sequencer.c:3246
 msgid "there is nothing to skip"
 msgstr "没有�跳过的"
 
-#: sequencer.c:2825
+#: sequencer.c:3249
 #, c-format
 msgid ""
 "have you committed already?\n"
@@ -6313,21 +7977,16 @@ msgstr ""
 "您已��交了么？\n"
 "试试 \"git %s --continue\""
 
-#: sequencer.c:2949 sequencer.c:3969
-#, c-format
-msgid "could not update %s"
-msgstr "�能更新 %s"
-
-#: sequencer.c:2987 sequencer.c:3949
+#: sequencer.c:3411 sequencer.c:4472
 msgid "cannot read HEAD"
 msgstr "�能读� HEAD"
 
-#: sequencer.c:3004
+#: sequencer.c:3428
 #, c-format
 msgid "unable to copy '%s' to '%s'"
 msgstr "无法拷� '%s' 至 '%s'"
 
-#: sequencer.c:3012
+#: sequencer.c:3436
 #, c-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -6346,28 +8005,27 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:3022
+#: sequencer.c:3446
 #, c-format
 msgid "Could not apply %s... %.*s"
 msgstr "�能应用 %s... %.*s"
 
-#: sequencer.c:3029
+#: sequencer.c:3453
 #, c-format
 msgid "Could not merge %.*s"
 msgstr "�能�并 %.*s"
 
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "�能拷� '%s' 至 '%s'"
 
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
-msgid "could not read index"
-msgstr "�能读�索引"
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr "正在执行：%s\n"
 
-#  译者：注����导空格
-#: sequencer.c:3074
+#: sequencer.c:3498
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -6382,11 +8040,11 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3080
+#: sequencer.c:3504
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "并且修改索引和/或工作区\n"
 
-#: sequencer.c:3086
+#: sequencer.c:3510
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -6403,111 +8061,123 @@ msgstr ""
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3147
+#: sequencer.c:3572
 #, c-format
 msgid "illegal label name: '%.*s'"
 msgstr "�法的标签�称：'%.*s'"
 
-#: sequencer.c:3201
+#: sequencer.c:3645
 msgid "writing fake root commit"
 msgstr "写伪根�交"
 
-#: sequencer.c:3206
+#: sequencer.c:3650
 msgid "writing squash-onto"
 msgstr "写入 squash-onto"
 
-#: sequencer.c:3244 builtin/rebase.c:855 builtin/rebase.c:861
-#, c-format
-msgid "failed to find tree of %s"
-msgstr "无法找到 %s 指�的树。"
-
-#: sequencer.c:3262 builtin/rebase.c:874
-msgid "could not write index"
-msgstr "�能写入索引"
-
-#: sequencer.c:3289
+#: sequencer.c:3734
 #, c-format
 msgid "could not resolve '%s'"
 msgstr "无法解� '%s'"
 
-#: sequencer.c:3320
+#: sequencer.c:3767
 msgid "cannot merge without a current revision"
 msgstr "没有当�版本�能�并"
 
-#: sequencer.c:3342
+#: sequencer.c:3789
 #, c-format
 msgid "unable to parse '%.*s'"
 msgstr "无法解� '%.*s'"
 
-#: sequencer.c:3351
+#: sequencer.c:3798
 #, c-format
 msgid "nothing to merge: '%.*s'"
 msgstr "无�用�并：'%.*s'"
 
-#: sequencer.c:3363
+#: sequencer.c:3810
 msgid "octopus merge cannot be executed on top of a [new root]"
 msgstr "章鱼�并�能在一个新的根�交上执行"
 
-#: sequencer.c:3378
+#: sequencer.c:3826
 #, c-format
 msgid "could not get commit message of '%s'"
 msgstr "�能获� '%s' 的�交说明"
 
-#: sequencer.c:3538
+#: sequencer.c:4009
 #, c-format
 msgid "could not even attempt to merge '%.*s'"
 msgstr "甚至�能�试�并 '%.*s'"
 
-#: sequencer.c:3554
+#: sequencer.c:4025
 msgid "merge: Unable to write new index file"
 msgstr "�并：无法写入新索引文件"
 
-#: sequencer.c:3623 builtin/rebase.c:712
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr "无法自动贮�"
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "�外的贮��应：'%s'"
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "�能为 '%s' 创建目录"
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "创建了自动贮�：%s\n"
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr "无法硬性�置（reset --hard）"
+
+#: sequencer.c:4140
 #, c-format
 msgid "Applied autostash.\n"
-msgstr "已应用 autostash。\n"
+msgstr "已应用自动贮�。\n"
 
-#: sequencer.c:3635
+#: sequencer.c:4152
 #, c-format
 msgid "cannot store %s"
 msgstr "�能存储 %s"
 
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
+#: sequencer.c:4155
 #, c-format
 msgid ""
-"Applying autostash resulted in conflicts.\n"
+"%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 ""
-"应用 autostash 导致冲�。\n"
-"您的修改安全地�存在贮�区中。\n"
+"%s\n"
+"您的修改在贮�区中很安全。\n"
 "您�以在任何时候�行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: sequencer.c:3699
-#, c-format
-msgid "could not checkout %s"
-msgstr "�能检出 %s"
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
+msgstr "应用自动贮�导致冲�。"
 
-#: sequencer.c:3713
-#, c-format
-msgid "%s: not a valid OID"
-msgstr "%s：�是一个有效的对象 ID"
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
+msgstr "自动贮�已�存在；正在创建一个新的贮��目。"
 
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
 msgid "could not detach HEAD"
 msgstr "�能分离头指针"
 
-#: sequencer.c:3733
+#: sequencer.c:4248
 #, c-format
 msgid "Stopped at HEAD\n"
 msgstr "�止在 HEAD\n"
 
-#: sequencer.c:3735
+#: sequencer.c:4250
 #, c-format
 msgid "Stopped at %s\n"
 msgstr "�止在 %s\n"
 
-#: sequencer.c:3743
+#: sequencer.c:4258
 #, c-format
 msgid ""
 "Could not execute the todo command\n"
@@ -6527,48 +8197,58 @@ msgstr ""
 "    git rebase --edit-todo\n"
 "    git rebase --continue\n"
 
-#: sequencer.c:3827
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "正在�基（%d/%d）%s"
+
+#: sequencer.c:4350
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "�止在 %s... %.*s\n"
 
-#: sequencer.c:3898
+#: sequencer.c:4421
 #, c-format
 msgid "unknown command %d"
 msgstr "未知命令 %d"
 
-#: sequencer.c:3957
+#: sequencer.c:4480
 msgid "could not read orig-head"
 msgstr "�能读� orig-head"
 
-#: sequencer.c:3962
+#: sequencer.c:4485
 msgid "could not read 'onto'"
 msgstr "�能读� 'onto'"
 
-#: sequencer.c:3976
+#: sequencer.c:4499
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "�能更新 HEAD 为 %s"
 
-#: sequencer.c:4069
+#: sequencer.c:4559
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "�功�基并更新 %s。\n"
+
+#: sequencer.c:4611
 msgid "cannot rebase: You have unstaged changes."
 msgstr "�能�基：您有未暂存的�更。"
 
-#: sequencer.c:4078
+#: sequencer.c:4620
 msgid "cannot amend non-existing commit"
 msgstr "�能修补�存在的�交"
 
-#: sequencer.c:4080
+#: sequencer.c:4622
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "无效文件：'%s'"
 
-#: sequencer.c:4082
+#: sequencer.c:4624
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "无效内容：'%s'"
 
-#: sequencer.c:4085
+#: sequencer.c:4627
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -6577,68 +8257,59 @@ msgstr ""
 "\n"
 "您的工作区中有未�交的�更。请先�交然��次�行 'git rebase --continue'。"
 
-#: sequencer.c:4121 sequencer.c:4159
+#: sequencer.c:4663 sequencer.c:4702
 #, c-format
 msgid "could not write file: '%s'"
 msgstr "�能写入文件：'%s'"
 
-#: sequencer.c:4174
+#: sequencer.c:4718
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "�能删除 CHERRY_PICK_HEAD"
 
-#: sequencer.c:4181
+#: sequencer.c:4725
 msgid "could not commit staged changes."
 msgstr "�能�交暂存的修改。"
 
-#: sequencer.c:4285
+#: sequencer.c:4845
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：�能拣选一个%s"
 
-#: sequencer.c:4289
+#: sequencer.c:4849
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：错误的版本"
 
-#: sequencer.c:4324
+#: sequencer.c:4884
 msgid "can't revert as initial commit"
 msgstr "�能作为�始�交回退"
 
-#: sequencer.c:4774
+#: sequencer.c:5361
 msgid "make_script: unhandled options"
 msgstr "make_script：有未能处�的选项"
 
-#: sequencer.c:4777
+#: sequencer.c:5364
 msgid "make_script: error preparing revisions"
 msgstr "make_script：准备版本时错误"
 
-#: sequencer.c:4935
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'.\n"
-"Or you can abort the rebase with 'git rebase --abort'.\n"
-msgstr ""
-"您�以用 'git rebase --edit-todo' 修正，然�执行 'git rebase --continue'。\n"
-"或者您�以用 'git rebase --abort' 终止�基。\n"
-
-#: sequencer.c:5047 sequencer.c:5064
+#: sequencer.c:5614 sequencer.c:5631
 msgid "nothing to do"
 msgstr "无事��"
 
-#: sequencer.c:5078
+#: sequencer.c:5650
 msgid "could not skip unnecessary pick commands"
 msgstr "无法跳过�必�的拣选"
 
-#: sequencer.c:5166
+#: sequencer.c:5750
 msgid "the script was already rearranged."
 msgstr "脚本已��新编排。"
 
-#: setup.c:124
+#: setup.c:133
 #, c-format
-msgid "'%s' is outside repository"
-msgstr "'%s' 在仓库之外"
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' 在�于 '%s' 的仓库之外"
 
-#: setup.c:174
+#: setup.c:185
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -6647,7 +8318,7 @@ msgstr ""
 "%s：工作区中无此路径。\n"
 "使用命令 'git <命令> -- <路径>...' �指定本地�存在的路径。"
 
-#: setup.c:187
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -6658,12 +8329,12 @@ msgstr ""
 "使用 '--' �分隔版本和路径，例如：\n"
 "'git <命令> [<版本>...] -- [<文件>...]'"
 
-#: setup.c:236
+#: setup.c:264
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "选项 '%s' 必须在其他�选项�数之�"
 
-#: setup.c:255
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -6674,101 +8345,109 @@ msgstr ""
 "使用 '--' �分隔版本和路径，例如：\n"
 "'git <命令> [<版本>...] -- [<文件>...]'"
 
-#: setup.c:391
+#: setup.c:419
 msgid "unable to set up work tree using invalid config"
 msgstr "无法使用无效�置�创建工作区"
 
-#: setup.c:395
+#: setup.c:423 builtin/rev-parse.c:895
 msgid "this operation must be run in a work tree"
 msgstr "该�作必须在一个工作区中�行"
 
-#: setup.c:541
+#: setup.c:658
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 仓库版本 <= %d，�得到 %d"
 
-#: setup.c:549
-msgid "unknown repository extensions found:"
-msgstr "�现未知的仓库扩展："
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "�现未知的仓库扩展："
+msgstr[1] "�现未知的仓库扩展："
+
+#: 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] "仓库的版本是 0，但是�现仅用于 v1 的扩展："
+msgstr[1] "仓库的版本是 0，但是�现仅用于 v1 的扩展："
 
-#: setup.c:568
+#: setup.c:701
 #, c-format
 msgid "error opening '%s'"
 msgstr "打开 '%s' 出错"
 
-#: setup.c:570
+#: setup.c:703
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "文件太大，无法作为 .git 文件：'%s'"
 
-#: setup.c:572
+#: setup.c:705
 #, c-format
 msgid "error reading %s"
 msgstr "读� %s 出错"
 
-#: setup.c:574
+#: setup.c:707
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "无效的 gitfile 格�：%s"
 
-#: setup.c:576
+#: setup.c:709
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "在 gitfile 中没有路径：%s"
 
-#: setup.c:578
+#: setup.c:711
 #, c-format
 msgid "not a git repository: %s"
-msgstr "�是一个 git 仓库：%s"
+msgstr "�是 git 仓库：%s"
 
-#: setup.c:677
+#: setup.c:813
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' 太大"
 
-#: setup.c:691
+#: setup.c:827
 #, c-format
 msgid "not a git repository: '%s'"
-msgstr "�是一个 git 仓库：'%s'"
+msgstr "�是 git 仓库：'%s'"
 
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c:856 setup.c:858 setup.c:889
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "�能切�目录到 '%s'"
 
-#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
 msgid "cannot come back to cwd"
 msgstr "无法返回当�工作目录"
 
-#: setup.c:852
+#: setup.c:988
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "获� '%*s%s%s' 状�（stat）失败"
 
-#: setup.c:1090
+#: setup.c:1231
 msgid "Unable to read current working directory"
 msgstr "�能读�当�工作目录"
 
-#: setup.c:1099 setup.c:1105
+#: setup.c:1240 setup.c:1246
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "�能切�到 '%s'"
 
-#: setup.c:1110
+#: setup.c:1251
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
-msgstr "�是一个 git 仓库（或者任何父目录）：%s"
+msgstr "�是 git 仓库（或者任何父目录）：%s"
 
-#: setup.c:1116
+#: 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 ""
-"�是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
+"�是 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
 "�止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
-#: setup.c:1227
+#: setup.c:1381
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -6777,340 +8456,69 @@ msgstr ""
 "�数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
 "文件属主必须始终拥有读写��。"
 
-#: setup.c:1271
+#: setup.c:1430
 msgid "open /dev/null or dup failed"
 msgstr "�能打开或者�制 /dev/null"
 
-#: setup.c:1286
+#: setup.c:1445
 msgid "fork failed"
 msgstr "fork 失败"
 
-#: setup.c:1291
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
 msgid "setsid failed"
 msgstr "setsid 失败"
 
-#: sha1-file.c:452
-#, c-format
-msgid "object directory %s does not exist; check .git/objects/info/alternates"
-msgstr "对象目录 %s �存在，检查 .git/objects/info/alternates"
-
-#: sha1-file.c:503
-#, c-format
-msgid "unable to normalize alternate object path: %s"
-msgstr "无法规范化备用对象路径：%s"
-
-#: sha1-file.c:575
-#, c-format
-msgid "%s: ignoring alternate object stores, nesting too deep"
-msgstr "%s：忽略备用对象库，嵌套太深"
-
-#: sha1-file.c:582
-#, c-format
-msgid "unable to normalize object directory: %s"
-msgstr "无法规范化对象目录: %s"
-
-#: sha1-file.c:625
-msgid "unable to fdopen alternates lockfile"
-msgstr "无法 fdopen 替��文件"
-
-#: sha1-file.c:643
-msgid "unable to read alternates file"
-msgstr "无法读�替代文件"
-
-#: sha1-file.c:650
-msgid "unable to move new alternates file into place"
-msgstr "无法将新的替代文件移动到�"
-
-#: sha1-file.c:685
-#, c-format
-msgid "path '%s' does not exist"
-msgstr "路径 '%s' �存在"
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
+msgstr "�试在没有 cone 模�下使用稀�索引"
 
-#: sha1-file.c:711
-#, c-format
-msgid "reference repository '%s' as a linked checkout is not supported yet."
-msgstr "尚�支�将�考仓库 '%s' 作为一个链接检出。"
+#: sparse-index.c:176
+msgid "unable to update cache-tree, staying full"
+msgstr "�能更新缓存树，��完整"
 
-#: sha1-file.c:717
+#: sparse-index.c:263
 #, c-format
-msgid "reference repository '%s' is not a local repository."
-msgstr "�考仓库 '%s' �是一个本地仓库。"
-
-#: sha1-file.c:723
-#, c-format
-msgid "reference repository '%s' is shallow"
-msgstr "�考仓库 '%s' 是一个浅克隆"
-
-#: sha1-file.c:731
-#, c-format
-msgid "reference repository '%s' is grafted"
-msgstr "�考仓库 '%s' 已被移�"
-
-#: sha1-file.c:791
-#, c-format
-msgid "invalid line while parsing alternate refs: %s"
-msgstr "解�备用引用时无效的行：%s"
-
-#: sha1-file.c:943
-#, c-format
-msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
-msgstr "�试 mmap %<PRIuMAX>，超过了最大值 %<PRIuMAX>"
-
-#: sha1-file.c:964
-msgid "mmap failed"
-msgstr "mmap 失败"
-
-#: sha1-file.c:1128
-#, c-format
-msgid "object file %s is empty"
-msgstr "对象文件 %s 为空"
-
-#: sha1-file.c:1252 sha1-file.c:2392
-#, c-format
-msgid "corrupt loose object '%s'"
-msgstr "��的�散对象 '%s'"
-
-#: sha1-file.c:1254 sha1-file.c:2396
-#, c-format
-msgid "garbage at end of loose object '%s'"
-msgstr "�散对象 '%s' ��有垃圾数�"
-
-#: sha1-file.c:1296
-msgid "invalid object type"
-msgstr "无效的对象类型"
-
-#: sha1-file.c:1380
-#, c-format
-msgid "unable to unpack %s header with --allow-unknown-type"
-msgstr "无法用 --allow-unknown-type �数解开 %s 头信�"
-
-#: sha1-file.c:1383
-#, c-format
-msgid "unable to unpack %s header"
-msgstr "无法解开 %s 头部"
-
-#: sha1-file.c:1389
-#, c-format
-msgid "unable to parse %s header with --allow-unknown-type"
-msgstr "无法用 --allow-unknown-type �数解� %s 头信�"
-
-#: sha1-file.c:1392
-#, c-format
-msgid "unable to parse %s header"
-msgstr "无法解� %s 头部"
-
-#: sha1-file.c:1584
-#, c-format
-msgid "failed to read object %s"
-msgstr "读�对象 %s 失败"
-
-#: sha1-file.c:1588
-#, c-format
-msgid "replacement %s not found for %s"
-msgstr "找�到 %2$s 的替代 %1$s"
-
-#: sha1-file.c:1592
-#, c-format
-msgid "loose object %s (stored in %s) is corrupt"
-msgstr "�散对象 %s（�存在 %s）已��"
-
-#: sha1-file.c:1596
-#, c-format
-msgid "packed object %s (stored in %s) is corrupt"
-msgstr "打包对象 %s（�存在 %s）已��"
-
-#: sha1-file.c:1699
-#, c-format
-msgid "unable to write file %s"
-msgstr "无法写文件 %s"
-
-#: sha1-file.c:1706
-#, c-format
-msgid "unable to set permission to '%s'"
-msgstr "无法为 '%s' 设置��"
-
-#: sha1-file.c:1713
-msgid "file write error"
-msgstr "文件写错误"
-
-#: sha1-file.c:1732
-msgid "error when closing loose object file"
-msgstr "关闭�散对象文件时出错"
-
-#: sha1-file.c:1797
-#, c-format
-msgid "insufficient permission for adding an object to repository database %s"
-msgstr "���足，无法在仓库对象库 %s 中添加对象"
-
-#: sha1-file.c:1799
-msgid "unable to create temporary file"
-msgstr "无法创建临时文件"
-
-#: sha1-file.c:1823
-msgid "unable to write loose object file"
-msgstr "�能写�散对象文件"
-
-#: sha1-file.c:1829
-#, c-format
-msgid "unable to deflate new object %s (%d)"
-msgstr "�能压缩新对象 %s（%d）"
-
-#: sha1-file.c:1833
-#, c-format
-msgid "deflateEnd on object %s failed (%d)"
-msgstr "在对象 %s 上调用 deflateEnd 失败（%d）"
-
-#: sha1-file.c:1837
-#, c-format
-msgid "confused by unstable object source data for %s"
-msgstr "被 %s 的�稳定对象�数��糊涂了"
-
-#: sha1-file.c:1847 builtin/pack-objects.c:925
-#, c-format
-msgid "failed utime() on %s"
-msgstr "在 %s 上调用 utime() 失败"
-
-#: sha1-file.c:1922
-#, c-format
-msgid "cannot read object for %s"
-msgstr "�能读�对象 %s"
-
-#: sha1-file.c:1962
-msgid "corrupt commit"
-msgstr "��的�交"
-
-#: sha1-file.c:1970
-msgid "corrupt tag"
-msgstr "��的标签"
-
-#: sha1-file.c:2069
-#, c-format
-msgid "read error while indexing %s"
-msgstr "索引 %s 时读�错误"
-
-#: sha1-file.c:2072
-#, c-format
-msgid "short read while indexing %s"
-msgstr "索引 %s 时读入�完整"
-
-#: sha1-file.c:2145 sha1-file.c:2154
-#, c-format
-msgid "%s: failed to insert into database"
-msgstr "%s：�入数�库失败"
-
-#: sha1-file.c:2160
-#, c-format
-msgid "%s: unsupported file type"
-msgstr "%s：�支�的文件类型"
-
-#: sha1-file.c:2184
-#, c-format
-msgid "%s is not a valid object"
-msgstr "%s �是一个有效的对象"
-
-#: sha1-file.c:2186
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s �是一个有效的 '%s' 对象"
-
-#: sha1-file.c:2213 builtin/index-pack.c:155
-#, c-format
-msgid "unable to open %s"
-msgstr "�能打开 %s"
-
-#: sha1-file.c:2403 sha1-file.c:2455
-#, c-format
-msgid "hash mismatch for %s (expected %s)"
-msgstr "%s 的哈希值�匹�（预期 %s）"
-
-#: sha1-file.c:2427
-#, c-format
-msgid "unable to mmap %s"
-msgstr "�能 mmap %s"
-
-#: sha1-file.c:2432
-#, c-format
-msgid "unable to unpack header of %s"
-msgstr "无法解压缩 %s 的头部"
-
-#: sha1-file.c:2438
-#, c-format
-msgid "unable to parse header of %s"
-msgstr "无法解� %s 的头部"
-
-#: sha1-file.c:2449
-#, c-format
-msgid "unable to unpack contents of %s"
-msgstr "无法解压缩 %s 的内容"
-
-#: sha1-name.c:487
-#, c-format
-msgid "short SHA1 %s is ambiguous"
-msgstr "短 SHA1 %s 存在歧义"
-
-#: sha1-name.c:498
-msgid "The candidates are:"
-msgstr "候选者有："
-
-#: sha1-name.c:797
-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 ""
-"Git 通常�会创建一个以40个�六进制字符结尾的引用，因为当您��供40\n"
-"个�六进制字符时将被忽略。这些引用�能被错误地创建。例如：\n"
-"\n"
-"  git switch -c $br $(git rev-parse ...)\n"
-"\n"
-"当 \"$br\" ��原因空白时，一个40��六进制的引用将被创建。请检查这些\n"
-"引用，�能需�删除它们。�行 \"git config advice.objectNameWarning\n"
-"false\" 命令关闭本消�通知。"
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "索引�目是一个目录，但�是稀�的 (%08x)"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte
-#: strbuf.c:822
+#: strbuf.c:850
 #, c-format
 msgid "%u.%2.2u GiB"
 msgstr "%u.%2.2u GiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
-#: strbuf.c:824
+#: 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:832
+#: strbuf.c:860
 #, c-format
 msgid "%u.%2.2u MiB"
 msgstr "%u.%2.2u MiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
-#: strbuf.c:834
+#: 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:841
+#: strbuf.c:869
 #, c-format
 msgid "%u.%2.2u KiB"
 msgstr "%u.%2.2u KiB"
 
 #. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
-#: strbuf.c:843
+#: 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:849
+#: strbuf.c:877
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
@@ -7118,13 +8526,48 @@ msgstr[0] "%u 字节"
 msgstr[1] "%u 字节"
 
 #. TRANSLATORS: IEC 80000-13:2008 byte/second
-#: strbuf.c:851
+#: strbuf.c:879
 #, c-format
 msgid "%u byte/s"
 msgid_plural "%u bytes/s"
 msgstr[0] "%u 字节/秒"
 msgstr[1] "%u 字节/秒"
 
+#: 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 "无法打开 '%s' 进行写入"
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr "�能编辑 '%s'"
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "忽略�疑的�模组�称：%s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs ��许为负值"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "忽略�能被解�为命令行选项的 '%s'：%s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s 的值无效"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "�能更新 .gitmodules �目 %s"
+
 #: submodule.c:114 submodule.c:143
 msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
 msgstr "无法修改未�并的 .gitmodules，先解决�并冲�"
@@ -7143,72 +8586,149 @@ msgstr "无法移除 %s 的 .gitmodules �目"
 msgid "staging updated .gitmodules failed"
 msgstr "将更新� .gitmodules 添加暂存区失败"
 
-#: submodule.c:327
+#: submodule.c:328
 #, c-format
 msgid "in unpopulated submodule '%s'"
 msgstr "�于未检出的�模组 '%s'"
 
-#: submodule.c:358
+#: submodule.c:359
 #, c-format
 msgid "Pathspec '%s' is in submodule '%.*s'"
 msgstr "路径规格 '%s' 在�模组 '%.*s' 中"
 
-#: submodule.c:910
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "�的 --ignore-submodules �数：%s"
+
+#: submodule.c:805
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr "�交 %s 中�于路径 '%s' 的�模组和��的�模组冲�。 跳过它。"
+
+#: submodule.c:908
 #, c-format
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "�模组�目 '%s'（%s）是一个 %s，�是一个�交"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:993
+#, 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:1116
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "处��模组 '%s' 失败"
+
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解�为有效引用。"
 
-#: submodule.c:1481
+#: submodule.c:1156
 #, c-format
-msgid "Could not access submodule '%s'"
-msgstr "无法访问�模组 '%s'"
+msgid "Pushing submodule '%s'\n"
+msgstr "正在推��模组 '%s'\n"
 
-#: submodule.c:1651
+#: submodule.c:1159
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "无法推��模组 '%s'\n"
+
+#: submodule.c:1451
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "正在获��模组 %s%s\n"
+
+#: submodule.c:1485
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "无法访问�模组 '%s'\n"
+
+#: submodule.c:1640
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"获��模组时的错误：\n"
+"%s"
+
+#: submodule.c:1665
 #, c-format
 msgid "'%s' not recognized as a git repository"
-msgstr "无法将 '%s' 识别为一个 git 仓库"
+msgstr "无法将 '%s' 识别为 git 仓库"
+
+#: submodule.c:1682
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "无法在�模组 %s 中执行 'git status --porcelain=2'"
 
-#: submodule.c:1789
+#: submodule.c:1723
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "在�模组 %s 中执行 'git status --porcelain=2' 失败"
+
+#: submodule.c:1798
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "无法在�模组 '%s' 中�动 'git status'"
 
-#: submodule.c:1802
+#: submodule.c:1811
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "无法在�模组 '%s' 中执行 'git status'"
 
-#: submodule.c:1817
+#: submodule.c:1826
 #, c-format
 msgid "Could not unset core.worktree setting in submodule '%s'"
 msgstr "无法在�模组 '%s' 中�消 core.worktree 的设置"
 
-#: submodule.c:1907
+#: submodule.c:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "无法递归进�模组路径 '%s'"
+
+#: submodule.c:1874
+msgid "could not reset submodule index"
+msgstr "无法�置�模组索引"
+
+#: submodule.c:1916
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "�模组 '%s' 中有�索引"
 
-#: submodule.c:1959
+#: submodule.c:1968
 #, c-format
 msgid "Submodule '%s' could not be updated."
 msgstr "�模组 '%s' 无法被更新。"
 
-#: submodule.c:2007
+#: submodule.c:2036
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "�模组 git 目录 '%s' �于 git 目录 '%.*s' 中"
+
+#: submodule.c:2057
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "�支�对有多个工作区的�模组 '%s' 执行 relocate_gitdir"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2069 submodule.c:2128
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "�能查询�模组 '%s' 的�称"
 
-#: submodule.c:2026
+#: submodule.c:2073
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "�止移动 '%s' 到现存 git 目录中"
+
+#: submodule.c:2080
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -7219,359 +8739,358 @@ msgstr ""
 "'%s' �移至\n"
 "'%s'\n"
 
-#: submodule.c:2109
-#, c-format
-msgid "could not recurse into submodule '%s'"
-msgstr "无法递归进�模组路径 '%s'"
-
-#: submodule.c:2153
+#: submodule.c:2208
 msgid "could not start ls-files in .."
 msgstr "无法在 .. 中�动 ls-files"
 
-#: submodule.c:2192
+#: submodule.c:2248
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree 返回未知返回值 %d"
 
-#: submodule-config.c:236
-#, c-format
-msgid "ignoring suspicious submodule name: %s"
-msgstr "忽略�疑的�模组�称：%s"
-
-#: submodule-config.c:303
-msgid "negative values not allowed for submodule.fetchjobs"
-msgstr "submodule.fetchjobs ��许为负值"
-
-#: submodule-config.c:401
-#, c-format
-msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
-msgstr "忽略�能被解�为命令行选项的 '%s'：%s"
-
-#: submodule-config.c:490
+#: symlinks.c:244
 #, c-format
-msgid "invalid value for %s"
-msgstr "%s 的值无效"
-
-#: submodule-config.c:761
-#, c-format
-msgid "Could not update .gitmodules entry %s"
-msgstr "�能更新 .gitmodules �目 %s"
+msgid "failed to lstat '%s'"
+msgstr "无法执行 lstat '%s'"
 
-#: trailer.c:238
+#: trailer.c:244
 #, c-format
 msgid "running trailer command '%s' failed"
 msgstr "执行 trailer 命令 '%s' 失败"
 
-#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
-#: trailer.c:557
+#: 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 "键 '%2$s' 的未知�值 '%1$s'"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: 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 "多于一个 %s"
 
-#: trailer.c:730
+#: trailer.c:743
 #, c-format
 msgid "empty trailer token in trailer '%.*s'"
-msgstr "签� '%.*s' 的键为空"
+msgstr "尾注 '%.*s' 的键为空"
 
-#: trailer.c:750
+#: trailer.c:763
 #, c-format
 msgid "could not read input file '%s'"
 msgstr "�能读�输入文件 '%s'"
 
-#: trailer.c:753
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
 msgid "could not read from stdin"
 msgstr "�能自标准输入读�"
 
-#: trailer.c:1011 wrapper.c:665
+#: trailer.c:1024 wrapper.c:676
 #, c-format
 msgid "could not stat %s"
 msgstr "�能对 %s 调用 stat"
 
-#: trailer.c:1013
+#: trailer.c:1026
 #, c-format
 msgid "file %s is not a regular file"
 msgstr "文件 %s �是一个正规文件"
 
-#: trailer.c:1015
+#: trailer.c:1028
 #, c-format
 msgid "file %s is not writable by user"
 msgstr "文件 %s 用户��写"
 
-#: trailer.c:1027
+#: trailer.c:1040
 msgid "could not open temporary file"
 msgstr "�能打开临时文件"
 
-#: trailer.c:1067
+#: trailer.c:1080
 #, c-format
 msgid "could not rename temporary file to %s"
 msgstr "�能�命�临时文件为 %s"
 
-#: transport.c:116
-#, c-format
-msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "将�设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
-
-#: transport.c:145
-#, c-format
-msgid "could not read bundle '%s'"
-msgstr "无法读� bundle '%s'"
-
-#: transport.c:214
-#, c-format
-msgid "transport: invalid depth option '%s'"
-msgstr "传输：无效的深度选项 '%s'"
-
-#: transport.c:266
-msgid "see protocol.version in 'git help config' for more details"
-msgstr "查看 'git help config' 中的 protocol.version 获�更多信�"
-
-#: transport.c:267
-msgid "server options require protocol version 2 or later"
-msgstr "�务端选项需�版本 2 �议或更高"
-
-#: transport.c:632
-msgid "could not parse transport.color.* config"
-msgstr "�能解� transport.color.* �置"
-
-#: transport.c:705
-msgid "support for protocol v2 not implemented yet"
-msgstr "�议 v2 的支�尚未实现"
-
-#: transport.c:831
-#, c-format
-msgid "unknown value for config '%s': %s"
-msgstr "�置 '%s' 的�值未知：%s"
-
-#: transport.c:897
-#, c-format
-msgid "transport '%s' not allowed"
-msgstr "传输 '%s' ��许"
-
-#: transport.c:949
-msgid "git-over-rsync is no longer supported"
-msgstr "��支� git-over-rsync"
-
-#: transport.c:1044
-#, c-format
-msgid ""
-"The following submodule paths contain changes that can\n"
-"not be found on any remote:\n"
-msgstr "下列�模组路径所包�的修改在任何远程�中都找�到：\n"
-
-#: transport.c:1048
-#, c-format
-msgid ""
-"\n"
-"Please try\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"or cd to the path and use\n"
-"\n"
-"\tgit push\n"
-"\n"
-"to push them to a remote.\n"
-"\n"
-msgstr ""
-"\n"
-"请�试\n"
-"\n"
-"\tgit push --recurse-submodules=on-demand\n"
-"\n"
-"或者进入到�目录执行\n"
-"\n"
-"\tgit push\n"
-"\n"
-"以推�至远程。\n"
-"\n"
-
-#: transport.c:1056
-msgid "Aborting."
-msgstr "正在终止。"
-
-#: transport.c:1201
-msgid "failed to push all needed submodules"
-msgstr "�能推�全部需�的�模组"
-
-#: transport.c:1345 transport-helper.c:655
-msgid "operation not supported by protocol"
-msgstr "�议�支�该�作"
-
-#: transport-helper.c:61 transport-helper.c:90
+#: transport-helper.c:62 transport-helper.c:91
 msgid "full write to remote helper failed"
 msgstr "完整写入远程助手失败"
 
-#: transport-helper.c:144
+#: transport-helper.c:145
 #, c-format
 msgid "unable to find remote helper for '%s'"
 msgstr "无法为 '%s' 找到远程助手"
 
-#: transport-helper.c:160 transport-helper.c:569
+#: transport-helper.c:161 transport-helper.c:575
 msgid "can't dup helper output fd"
 msgstr "无法�制助手输出文件�柄"
 
-#: transport-helper.c:211
+#: transport-helper.c:214
 #, c-format
 msgid ""
 "unknown mandatory capability %s; this remote helper probably needs newer "
 "version of Git"
 msgstr "未知的强制能力 %s，该远程助手�能需�新版本的Git"
 
-#: transport-helper.c:217
+#: transport-helper.c:220
 msgid "this remote helper should implement refspec capability"
 msgstr "远程助手需�实现 refspec 能力"
 
-#: transport-helper.c:284 transport-helper.c:424
+#: transport-helper.c:287 transport-helper.c:429
 #, c-format
 msgid "%s unexpectedly said: '%s'"
 msgstr "%s �外地说：'%s'"
 
-#: transport-helper.c:413
+#: transport-helper.c:417
 #, c-format
 msgid "%s also locked %s"
 msgstr "%s 也�定了 %s"
 
-#: transport-helper.c:491
+#: transport-helper.c:497
 msgid "couldn't run fast-import"
 msgstr "�能执行 fast-import"
 
-#: transport-helper.c:514
+#: transport-helper.c:520
 msgid "error while running fast-import"
 msgstr "执行 fast-import 出错"
 
-#: transport-helper.c:543 transport-helper.c:1132
+#: transport-helper.c:549 transport-helper.c:1247
 #, c-format
 msgid "could not read ref %s"
 msgstr "无法读�引用 %s"
 
-#: transport-helper.c:588
+#: transport-helper.c:594
 #, c-format
 msgid "unknown response to connect: %s"
 msgstr "连接时未知的�应：%s"
 
-#: transport-helper.c:610
+#: transport-helper.c:616
 msgid "setting remote service path not supported by protocol"
 msgstr "�议�支�设置远程�务路径"
 
-#: transport-helper.c:612
+#: transport-helper.c:618
 msgid "invalid remote service path"
 msgstr "无效的远程�务路径"
 
-#: transport-helper.c:658
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr "�议�支�该�作"
+
+#: transport-helper.c:664
 #, c-format
 msgid "can't connect to subservice %s"
 msgstr "�能连接到��务 %s"
 
-#: transport-helper.c:734
+#: transport-helper.c:693 transport.c:400
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only 需��议 v2"
+
+#: transport-helper.c:755
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' 缺�一个匹�的 'ok/error' 指令"
+
+#: transport-helper.c:798
 #, c-format
 msgid "expected ok/error, helper said '%s'"
 msgstr "预期 ok/error，助手说 '%s'"
 
-#: transport-helper.c:787
+#: transport-helper.c:855
 #, c-format
 msgid "helper reported unexpected status of %s"
 msgstr "助手报告 %s 的�外状�"
 
-#: transport-helper.c:848
+#: transport-helper.c:938
 #, c-format
 msgid "helper %s does not support dry-run"
 msgstr "助手 %s �支� dry-run"
 
-#: transport-helper.c:851
+#: transport-helper.c:941
 #, c-format
 msgid "helper %s does not support --signed"
 msgstr "助手 %s �支� --signed"
 
-#: transport-helper.c:854
+#: transport-helper.c:944
 #, c-format
 msgid "helper %s does not support --signed=if-asked"
 msgstr "助手 %s �支� --signed=if-asked"
 
-#: transport-helper.c:859
+#: transport-helper.c:949
 #, c-format
 msgid "helper %s does not support --atomic"
 msgstr "助手 %s �支� --atomic"
 
-#: transport-helper.c:865
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "助手 %s �支� --%s"
+
+#: transport-helper.c:960
 #, c-format
 msgid "helper %s does not support 'push-option'"
 msgstr "助手 %s �支� 'push-option'"
 
-#: transport-helper.c:963
+#: transport-helper.c:1060
 msgid "remote-helper doesn't support push; refspec needed"
-msgstr "remote-heper �支� push，需�引用表达�"
+msgstr "remote-heper �支�推�，需�引用规格"
 
-#: transport-helper.c:968
+#: transport-helper.c:1065
 #, c-format
 msgid "helper %s does not support 'force'"
 msgstr "助手 %s �支� 'force'"
 
-#: transport-helper.c:1015
+#: transport-helper.c:1112
 msgid "couldn't run fast-export"
 msgstr "无法执行 fast-export"
 
-#: transport-helper.c:1020
+#: transport-helper.c:1117
 msgid "error while running fast-export"
 msgstr "执行 fast-export 时出错"
 
-#: transport-helper.c:1045
+#: transport-helper.c:1142
 #, c-format
 msgid ""
 "No refs in common and none specified; doing nothing.\n"
-"Perhaps you should specify a branch such as 'master'.\n"
+"Perhaps you should specify a branch.\n"
 msgstr ""
 "没有共�的引用并且也没有指定，什么也�会�。\n"
-"�能您应该指定一个分支如 'master'。\n"
+"也许您应该指定一个分支。\n"
 
-#: transport-helper.c:1118
+#: transport-helper.c:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "�支�的对象格� '%s'"
+
+#: transport-helper.c:1233
 #, c-format
 msgid "malformed response in ref list: %s"
 msgstr "引用列表中格�错误的�应：%s"
 
-#: transport-helper.c:1270
+#: transport-helper.c:1385
 #, c-format
 msgid "read(%s) failed"
 msgstr "读�（%s）失败"
 
-#: transport-helper.c:1297
+#: transport-helper.c:1412
 #, c-format
 msgid "write(%s) failed"
 msgstr "写（%s）失败"
 
-#: transport-helper.c:1346
+#: transport-helper.c:1461
 #, c-format
 msgid "%s thread failed"
 msgstr "%s 线程失败"
 
-#: transport-helper.c:1350
+#: transport-helper.c:1465
 #, c-format
 msgid "%s thread failed to join: %s"
 msgstr "%s 线程等待失败：%s"
 
-#: transport-helper.c:1369 transport-helper.c:1373
+#: transport-helper.c:1484 transport-helper.c:1488
 #, c-format
 msgid "can't start thread for copying data: %s"
 msgstr "�能�动线程�拷�数�：%s"
 
-#: transport-helper.c:1410
+#: transport-helper.c:1525
 #, c-format
 msgid "%s process failed to wait"
 msgstr "%s 进程等待失败"
 
-#: transport-helper.c:1414
+#: transport-helper.c:1529
 #, c-format
 msgid "%s process failed"
 msgstr "%s 进程失败"
 
-#: transport-helper.c:1432 transport-helper.c:1441
+#: transport-helper.c:1547 transport-helper.c:1556
 msgid "can't start thread for copying data"
 msgstr "�能�动线程�拷�数�"
 
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "将�设置 '%1$s' 的上游为 '%3$s' 的 '%2$s'\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "无法读�归档包 '%s'"
+
+#: transport.c:223
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "传输：无效的深度选项 '%s'"
+
+#: transport.c:275
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "查看 'git help config' 中的 protocol.version 获�更多信�"
+
+#: transport.c:276
+msgid "server options require protocol version 2 or later"
+msgstr "�务端选项需�版本 2 �议或更高"
+
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr "�务器�支� wait-for-done"
+
+#: transport.c:755
+msgid "could not parse transport.color.* config"
+msgstr "�能解� transport.color.* �置"
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr "�议 v2 的支�尚未实现"
+
+#: transport.c:965
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "�置 '%s' 的�值未知：%s"
+
+#: transport.c:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "传输 '%s' ��许"
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr "��支� git-over-rsync"
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "下列�模组路径所包�的修改在任何远程�中都找�到：\n"
+
+#: transport.c:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"请�试\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"或者进入到�目录执行\n"
+"\n"
+"\tgit push\n"
+"\n"
+"以推�至远程。\n"
+"\n"
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr "正在终止。"
+
+#: transport.c:1346
+msgid "failed to push all needed submodules"
+msgstr "�能推�全部需�的�模组"
+
 #: tree-walk.c:33
 msgid "too-short tree object"
 msgstr "太短的树对象"
@@ -7588,7 +9107,7 @@ msgstr "树对象�目中空的文件�"
 msgid "too-short tree file"
 msgstr "太短的树文件"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7597,7 +9116,7 @@ msgstr ""
 "您对下列文件的本地修改将被检出�作覆盖：\n"
 "%%s请在切�分支��交或贮�您的修改。"
 
-#: unpack-trees.c:112
+#: unpack-trees.c:117
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -7606,7 +9125,7 @@ msgstr ""
 "您对下列文件的本地修改将被检出�作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7615,7 +9134,7 @@ msgstr ""
 "您对下列文件的本地修改将被�并�作覆盖：\n"
 "%%s请在�并��交或贮�您的修改。"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:122
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -7624,7 +9143,7 @@ msgstr ""
 "您对下列文件的本地修改将被�并�作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7633,7 +9152,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s请在 %s 之��交或贮�您的修改。"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:127
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -7642,7 +9161,7 @@ msgstr ""
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:132
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -7651,7 +9170,7 @@ msgstr ""
 "更新如下目录将会丢失其中未跟踪的文件：\n"
 "%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7660,7 +9179,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被删除：\n"
 "%%s请在切�分支之�移动或删除。"
 
-#: unpack-trees.c:133
+#: unpack-trees.c:138
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -7669,7 +9188,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7678,7 +9197,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被删除：\n"
 "%%s请在�并�移动或删除。"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:143
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -7687,7 +9206,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7696,7 +9215,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被删除：\n"
 "%%s请在 %s �移动或删除。"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:148
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -7705,7 +9224,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:149
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7715,7 +9234,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被覆盖：\n"
 "%%s请在切�分支�移动或删除。"
 
-#: unpack-trees.c:151
+#: unpack-trees.c:156
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -7725,7 +9244,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为检出�作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7734,7 +9253,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被覆盖：\n"
 "%%s请在�并�移动或删除。"
 
-#: unpack-trees.c:156
+#: unpack-trees.c:161
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -7743,7 +9262,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为�并�作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7752,7 +9271,7 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被覆盖：\n"
 "%%s请在 %s �移动或删除。"
 
-#: unpack-trees.c:161
+#: unpack-trees.c:166
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -7761,59 +9280,66 @@ msgstr ""
 "工作区中下列未跟踪的文件将会因为 %s �作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:174
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "�目 '%s' 和 '%s' ��。无法�并。"
 
-#: unpack-trees.c:172
+#: unpack-trees.c:177
 #, c-format
 msgid ""
-"Cannot update sparse checkout: the following entries are not up to date:\n"
+"Cannot update submodule:\n"
 "%s"
 msgstr ""
-"无法更新稀�检出：如下�目�是最新：\n"
+"无法更新�模组：\n"
 "%s"
 
-#: unpack-trees.c:174
+#: unpack-trees.c:180
 #, c-format
 msgid ""
-"The following working tree files would be overwritten by sparse checkout "
-"update:\n"
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"工作区中下列文件将被稀�检出更新所覆盖：\n"
+"尽管存在稀�检出模�，以下路径�是最新，因而�留：\n"
 "%s"
 
-#: unpack-trees.c:176
+#: unpack-trees.c:182
 #, c-format
 msgid ""
-"The following working tree files would be removed by sparse checkout "
-"update:\n"
+"The following paths are unmerged and were left despite sparse patterns:\n"
 "%s"
 msgstr ""
-"工作区中下列文件将被稀�检出更新所删除：\n"
+"尽管存在稀�检出模�，以下路径处于未�并状�，因而�留：\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:184
 #, c-format
 msgid ""
-"Cannot update submodule:\n"
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
 "%s"
 msgstr ""
-"无法更新�模组：\n"
+"尽管存在稀�检出模�，以下路径已�存在，因而未更新：\n"
 "%s"
 
-#: unpack-trees.c:255
+#: unpack-trees.c:264
 #, c-format
 msgid "Aborting\n"
 msgstr "正在终止\n"
 
-#: unpack-trees.c:317
+#: unpack-trees.c:291
+#, 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
 msgid "Updating files"
 msgstr "正在更新文件"
 
-#: unpack-trees.c:349
+#: 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"
@@ -7822,6 +9348,19 @@ msgstr ""
 "以下路径�生碰撞（如：在�区分大�写的文件系统上的区分大�写的路径），\n"
 "并且碰撞组中�有一个文件存在工作区中：\n"
 
+#: unpack-trees.c:1618
+msgid "Updating index flags"
+msgstr "正在更新索引标志"
+
+#: unpack-trees.c:2718
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "工作树和未跟踪�交具有���目：%s"
+
+#: upload-pack.c:1548
+msgid "expected flush after fetch arguments"
+msgstr "在 fetch �数之�应该有一个 flush 包"
+
 #: urlmatch.c:163
 msgid "invalid URL scheme name or missing '://' suffix"
 msgstr "无效的 URL 方案�称或丢失 '://' �缀"
@@ -7851,27 +9390,31 @@ msgstr "无效的端��"
 msgid "invalid '..' path segment"
 msgstr "无效的 '..' 路径片段"
 
-#: worktree.c:258 builtin/am.c:2084
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "正在获�对象"
+
+#: worktree.c:236 builtin/am.c:2152
 #, c-format
 msgid "failed to read '%s'"
 msgstr "读� '%s' 失败"
 
-#: worktree.c:304
+#: worktree.c:303
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "在主工作区的 '%s' �是仓库目录"
 
-#: worktree.c:315
+#: worktree.c:314
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "文件 '%s' �包�工作区的�对路径"
 
-#: worktree.c:327
+#: worktree.c:326
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' �存在"
 
-#: worktree.c:333
+#: worktree.c:332
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' �是一个 .git 文件，错误� %d"
@@ -7881,17 +9424,83 @@ msgstr "'%s' �是一个 .git 文件，错误� %d"
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' 没有指回到 '%s'"
 
-#: wrapper.c:186 wrapper.c:356
+#: worktree.c:603
+msgid "not a directory"
+msgstr "�是一个目录"
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr ".git �是一个文件"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr ".git 文件��"
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr ".git 文件�正确"
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr "�是一个有效的路径"
+
+#: worktree.c:728
+msgid "unable to locate repository; .git is not a file"
+msgstr "无法定�仓库，.git �是一个文件"
+
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "无法定�仓库，.git 文件没有指�一个仓库"
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr "无法定�仓库，.git 文件��"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr "gitdir ��读"
+
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr "gitdir �正确"
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr "�是一个有效的目录"
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "gitdir 文件�存在"
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "无法读� gitdir 文件（%s）"
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "读�过短（期望 %<PRIuMAX> 字节，读� %<PRIuMAX>）"
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "无效的 gitdir 文件"
+
+#: worktree.c:817
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir 文件指�一个�存在的�置"
+
+#: wrapper.c:197 wrapper.c:367
 #, c-format
 msgid "could not open '%s' for reading and writing"
 msgstr "无法打开 '%s' 进行读写"
 
-#: wrapper.c:387 wrapper.c:588
+#: wrapper.c:398 wrapper.c:599
 #, c-format
 msgid "unable to access '%s'"
 msgstr "�能访问 '%s'"
 
-#: wrapper.c:596
+#: wrapper.c:607
 msgid "unable to get current working directory"
 msgstr "�能获�当�工作目录"
 
@@ -7930,11 +9539,11 @@ msgstr "  （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
 
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1125
 msgid "Changes to be committed:"
 msgstr "��交的�更："
 
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1134
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备�交的�更："
 
@@ -7965,97 +9574,97 @@ msgstr "  （�交或丢弃�模组中未跟踪或修改的内容）"
 msgid "  (use \"git %s <file>...\" to include in what will be committed)"
 msgstr "  （使用 \"git %s <文件>...\" 以包���交的内容）"
 
-#: wt-status.c:268
+#: wt-status.c:266
 msgid "both deleted:"
 msgstr "�方删除："
 
-#: wt-status.c:270
+#: wt-status.c:268
 msgid "added by us:"
 msgstr "由我们添加："
 
-#: wt-status.c:272
+#: wt-status.c:270
 msgid "deleted by them:"
 msgstr "由他们删除："
 
-#: wt-status.c:274
+#: wt-status.c:272
 msgid "added by them:"
 msgstr "由他们添加："
 
-#: wt-status.c:276
+#: wt-status.c:274
 msgid "deleted by us:"
 msgstr "由我们删除："
 
-#: wt-status.c:278
+#: wt-status.c:276
 msgid "both added:"
 msgstr "�方添加："
 
-#: wt-status.c:280
+#: wt-status.c:278
 msgid "both modified:"
 msgstr "�方修改："
 
-#: wt-status.c:290
+#: wt-status.c:288
 msgid "new file:"
 msgstr "新文件："
 
-#: wt-status.c:292
+#: wt-status.c:290
 msgid "copied:"
 msgstr "拷�："
 
-#: wt-status.c:294
+#: wt-status.c:292
 msgid "deleted:"
 msgstr "删除："
 
-#: wt-status.c:296
+#: wt-status.c:294
 msgid "modified:"
 msgstr "修改："
 
-#: wt-status.c:298
+#: wt-status.c:296
 msgid "renamed:"
 msgstr "�命�："
 
-#: wt-status.c:300
+#: wt-status.c:298
 msgid "typechange:"
 msgstr "类型�更："
 
-#: wt-status.c:302
+#: wt-status.c:300
 msgid "unknown:"
 msgstr "未知："
 
-#: wt-status.c:304
+#: wt-status.c:302
 msgid "unmerged:"
 msgstr "未�并："
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:384
+#: wt-status.c:382
 msgid "new commits, "
 msgstr "新�交, "
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:386
+#: wt-status.c:384
 msgid "modified content, "
 msgstr "修改的内容, "
 
 #  译者：末尾两个字节�能被删�，如果翻译为中文标点会出现�个汉字
-#: wt-status.c:388
+#: wt-status.c:386
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
-#: wt-status.c:906
+#: wt-status.c:958
 #, 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:938
+#: wt-status.c:989
 msgid "Submodules changed but not updated:"
 msgstr "�模组已修改但尚未更新："
 
-#: wt-status.c:940
+#: wt-status.c:991
 msgid "Submodule changes to be committed:"
 msgstr "��交的�模组�更："
 
-#: wt-status.c:1022
+#: wt-status.c:1073
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -8063,7 +9672,7 @@ msgstr ""
 "��改动或删除上�的一行。\n"
 "其下所有内容都将被忽略。"
 
-#: wt-status.c:1114
+#: wt-status.c:1165
 #, c-format
 msgid ""
 "\n"
@@ -8074,77 +9683,77 @@ msgstr ""
 "花了 %.2f 秒�计算出分支的领先/��范围。\n"
 "为��，您�以使用 '--no-ahead-behind'。\n"
 
-#: wt-status.c:1144
+#: wt-status.c:1195
 msgid "You have unmerged paths."
 msgstr "您有尚未�并的路径。"
 
 #  译者：注����导空格
-#: wt-status.c:1147
+#: wt-status.c:1198
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解决冲�并�行 \"git commit\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1149
+#: wt-status.c:1200
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  （使用 \"git merge --abort\" 终止�并）"
 
-#: wt-status.c:1153
+#: wt-status.c:1204
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有冲�已解决但您�处于�并中。"
 
 #  译者：注����导空格
-#: wt-status.c:1156
+#: wt-status.c:1207
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" 结��并）"
 
-#: wt-status.c:1165
+#: wt-status.c:1216
 msgid "You are in the middle of an am session."
 msgstr "您正处于 am �作过程中。"
 
-#: wt-status.c:1168
+#: wt-status.c:1219
 msgid "The current patch is empty."
 msgstr "当�的补�为空。"
 
 #  译者：注����导空格
-#: wt-status.c:1172
+#: wt-status.c:1223
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解决冲�，然��行 \"git am --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1174
+#: wt-status.c:1225
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1176
+#: wt-status.c:1227
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  （使用 \"git am --abort\" ��原有分支）"
 
-#: wt-status.c:1309
+#: wt-status.c:1360
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo 丢失。"
 
-#: wt-status.c:1311
+#: wt-status.c:1362
 msgid "No commands done."
 msgstr "没有命令被执行。"
 
-#: wt-status.c:1314
+#: wt-status.c:1365
 #, 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:1325
+#: wt-status.c:1376
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  （更多��文件 %s）"
 
-#: wt-status.c:1330
+#: wt-status.c:1381
 msgid "No commands remaining."
 msgstr "未剩下任何命令。"
 
-#: wt-status.c:1333
+#: wt-status.c:1384
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
@@ -8152,189 +9761,206 @@ msgstr[0] "接下��执行的命令（剩余 %d �命令）："
 msgstr[1] "接下��执行的命令（剩余 %d �命令）："
 
 #  译者：注����导空格
-#: wt-status.c:1341
+#: wt-status.c:1392
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  （使用 \"git rebase --edit-todo\" �查看和编辑）"
 
-#: wt-status.c:1353
+#: wt-status.c:1404
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' �基到 '%s' 的�作。"
 
-#: wt-status.c:1358
+#: wt-status.c:1409
 msgid "You are currently rebasing."
 msgstr "您在执行�基�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1371
+#: wt-status.c:1422
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  （解决冲�，然��行 \"git rebase --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1373
+#: wt-status.c:1424
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  （使用 \"git rebase --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1375
+#: wt-status.c:1426
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
 
 #  译者：注����导空格
-#: wt-status.c:1382
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  （所有冲�已解决：�行 \"git rebase --continue\"）"
 
-#: wt-status.c:1386
+#: wt-status.c:1437
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' �基到 '%s' 的�作时拆分�交。"
 
-#: wt-status.c:1391
+#: wt-status.c:1442
 msgid "You are currently splitting a commit during a rebase."
 msgstr "您在执行�基�作时拆分�交。"
 
 #  译者：注����导空格
-#: wt-status.c:1394
+#: wt-status.c:1445
 msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  （一旦您工作目录�交干净�，�行 \"git rebase --continue\"）"
 
-#: wt-status.c:1398
+#: wt-status.c:1449
 #, c-format
 msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' �基到 '%s' 的�作时编辑�交。"
 
-#: wt-status.c:1403
+#: wt-status.c:1454
 msgid "You are currently editing a commit during a rebase."
 msgstr "您在执行�基�作时编辑�交。"
 
 #  译者：注����导空格
-#: wt-status.c:1406
+#: wt-status.c:1457
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  （使用 \"git commit --amend\" 修补当��交）"
 
 #  译者：注����导空格
-#: wt-status.c:1408
+#: wt-status.c:1459
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  （当您对您的修改满��执行 \"git rebase --continue\"）"
 
-#: wt-status.c:1419
+#: wt-status.c:1470
 msgid "Cherry-pick currently in progress."
 msgstr "拣选�作正在进行中。"
 
-#: wt-status.c:1422
+#: wt-status.c:1473
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "您在执行拣选�交 %s 的�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1429
+#: wt-status.c:1480
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  （解决冲�并�行 \"git cherry-pick --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1432
+#: wt-status.c:1483
 msgid "  (run \"git cherry-pick --continue\" to continue)"
 msgstr "  （执行 \"git cherry-pick --continue\" 以继续）"
 
 #  译者：注����导空格
-#: wt-status.c:1435
+#: wt-status.c:1486
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  （所有冲�已解决：�行 \"git cherry-pick --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1437
+#: wt-status.c:1488
 msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
 msgstr "  （使用 \"git cherry-pick --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1439
+#: wt-status.c:1490
 msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  （使用 \"git cherry-pick --abort\" 以�消拣选�作）"
 
-#: wt-status.c:1449
+#: wt-status.c:1500
 msgid "Revert currently in progress."
 msgstr "还原�作正在行中。"
 
-#: wt-status.c:1452
+#: wt-status.c:1503
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "您在执行�转�交 %s 的�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1458
+#: wt-status.c:1509
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  （解决冲�并执行 \"git revert --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1461
+#: wt-status.c:1512
 msgid "  (run \"git revert --continue\" to continue)"
 msgstr "  （执行 \"git revert --continue\" 以继续）"
 
 #  译者：注����导空格
-#: wt-status.c:1464
+#: wt-status.c:1515
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  （所有冲�已解决：执行 \"git revert --continue\"）"
 
 #  译者：注����导空格
-#: wt-status.c:1466
+#: wt-status.c:1517
 msgid "  (use \"git revert --skip\" to skip this patch)"
 msgstr "  （使用 \"git revert --skip\" 跳过此补�）"
 
 #  译者：注����导空格
-#: wt-status.c:1468
+#: wt-status.c:1519
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  （使用 \"git revert --abort\" 以�消�转�交�作）"
 
-#: wt-status.c:1478
+#: wt-status.c:1529
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "您在执行从分支 '%s' 开始的二分查找�作。"
 
-#: wt-status.c:1482
+#: wt-status.c:1533
 msgid "You are currently bisecting."
 msgstr "您在执行二分查找�作。"
 
 #  译者：注����导空格
-#: wt-status.c:1485
+#: wt-status.c:1536
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
 
-#: wt-status.c:1694
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "您处于一个稀�检出中。"
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "您处于稀�检出状�，包� %d%% 的跟踪文件"
+
+#: wt-status.c:1794
 msgid "On branch "
 msgstr "�于分支 "
 
-#: wt-status.c:1701
+#: wt-status.c:1801
 msgid "interactive rebase in progress; onto "
 msgstr "交互��基�作正在进行中；至 "
 
-#: wt-status.c:1703
+#: wt-status.c:1803
 msgid "rebase in progress; onto "
 msgstr "�基�作正在进行中；至 "
 
-#: wt-status.c:1713
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr "头指针分离于 "
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr "头指针分离自 "
+
+#: wt-status.c:1813
 msgid "Not currently on any branch."
 msgstr "当��在任何分支上。"
 
-#: wt-status.c:1730
+#: wt-status.c:1830
 msgid "Initial commit"
 msgstr "�始�交"
 
-#: wt-status.c:1731
+#: wt-status.c:1831
 msgid "No commits yet"
 msgstr "尚无�交"
 
-#: wt-status.c:1745
+#: wt-status.c:1845
 msgid "Untracked files"
 msgstr "未跟踪的文件"
 
-#: wt-status.c:1747
+#: wt-status.c:1847
 msgid "Ignored files"
 msgstr "忽略的文件"
 
-#: wt-status.c:1751
+#: wt-status.c:1851
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -8344,226 +9970,250 @@ msgstr ""
 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能�高速度，\n"
 "但您需��心��忘了添加新文件（�� 'git help status'）。"
 
-#: wt-status.c:1757
+#: wt-status.c:1857
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1759
+#: wt-status.c:1859
 msgid " (use -u option to show untracked files)"
 msgstr "（使用 -u �数显示未跟踪的文件）"
 
-#: wt-status.c:1765
+#: wt-status.c:1865
 msgid "No changes"
 msgstr "没有修改"
 
-#: wt-status.c:1770
+#: wt-status.c:1870
 #, 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:1773
+#: wt-status.c:1874
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入�交\n"
 
-#: wt-status.c:1776
+#: wt-status.c:1878
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "�交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1779
+#: wt-status.c:1882
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "�交为空，但是存在尚未跟踪的文件\n"
 
-#  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1782
+#: wt-status.c:1886
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "无文件��交（创建/拷�文件并使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1890 wt-status.c:1896
 #, c-format
 msgid "nothing to commit\n"
 msgstr "无文件��交\n"
 
-#  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1788
+#: wt-status.c:1893
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "无文件��交（使用 -u 显示未跟踪的文件）\n"
 
-#  译者：中文字符串拼接，�删除�导空格
-#: wt-status.c:1792
+#: wt-status.c:1898
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "无文件��交，干净的工作区\n"
 
-#: wt-status.c:1905
+#: wt-status.c:2003
 msgid "No commits yet on "
 msgstr "尚无�交在 "
 
-#: wt-status.c:1909
+#: wt-status.c:2007
 msgid "HEAD (no branch)"
 msgstr "HEAD（�分支）"
 
-#: wt-status.c:1940
+#: wt-status.c:2038
 msgid "different"
 msgstr "��"
 
 #  译者：注����尾空格
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:2040 wt-status.c:2048
 msgid "behind "
 msgstr "�� "
 
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:2043 wt-status.c:2046
 msgid "ahead "
 msgstr "领先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2569
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "�能%s：您有未暂存的�更。"
 
-#: wt-status.c:2476
+#: wt-status.c:2575
 msgid "additionally, your index contains uncommitted changes."
 msgstr "�外，您的索引中包�未�交的�更。"
 
-#: wt-status.c:2478
+#: wt-status.c:2577
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "�能%s：您的索引中包�未�交的�更。"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#: compat/simple-ipc/ipc-unix-socket.c:182
+msgid "could not send IPC command"
+msgstr "无法�� IPC 命令"
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr "无法读� IPC �应"
+
+#: compat/simple-ipc/ipc-unix-socket.c:866
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "无法�动 accept_thread '%s'"
+
+#: compat/simple-ipc/ipc-unix-socket.c:878
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "无法�动 '%s' 的 worker[0]"
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:461
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "删除 '%s' 失败"
 
-#: builtin/add.c:25
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<选项>] [--] <路径规格>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "�能 chmod %cx '%s'"
+
+#: builtin/add.c:99
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "�外的差异状� %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:104 builtin/commit.c:297
 msgid "updating files failed"
 msgstr "更新文件失败"
 
-#: builtin/add.c:99
+#: builtin/add.c:114
 #, c-format
 msgid "remove '%s'\n"
 msgstr "删除 '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:198
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之�尚未被暂存的�更："
 
-#: builtin/add.c:234 builtin/rev-parse.c:897
+#: builtin/add.c:307 builtin/rev-parse.c:993
 msgid "Could not read the index"
 msgstr "�能读�索引"
 
-#: builtin/add.c:245
+#: builtin/add.c:318
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "无法为写入打开 '%s'。"
 
-#: builtin/add.c:249
+#: builtin/add.c:322
 msgid "Could not write patch"
 msgstr "�能生�补�"
 
-#: builtin/add.c:252
+#: builtin/add.c:325
 msgid "editing patch failed"
 msgstr "编辑补�失败"
 
-#: builtin/add.c:255
+#: builtin/add.c:328
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "�能对 '%s' 调用 stat"
 
-#: builtin/add.c:257
+#: builtin/add.c:330
 msgid "Empty patch. Aborted."
 msgstr "空补�。异常终止。"
 
-#: builtin/add.c:262
+#: builtin/add.c:335
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "�能应用 '%s'"
 
-#: builtin/add.c:270
+#: builtin/add.c:343
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根�您的一个 .gitignore 文件而被忽略：\n"
 
-#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: 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 "演习"
 
-#: builtin/add.c:293
+#: builtin/add.c:366
 msgid "interactive picking"
 msgstr "交互�拣选"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "交互�挑选数��"
 
-#: builtin/add.c:295
+#: builtin/add.c:368
 msgid "edit current diff and apply"
 msgstr "编辑当�差异并应用"
 
-#: builtin/add.c:296
+#: builtin/add.c:369
 msgid "allow adding otherwise ignored files"
 msgstr "�许添加忽略的文件"
 
-#: builtin/add.c:297
+#: builtin/add.c:370
 msgid "update tracked files"
 msgstr "更新已跟踪的文件"
 
-#: builtin/add.c:298
+#: builtin/add.c:371
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "对已跟踪文件（暗� -u）�新归一�行符"
 
-#: builtin/add.c:299
+#: builtin/add.c:372
 msgid "record only the fact that the path will be added later"
 msgstr "�记录，该路径���添加"
 
-#: builtin/add.c:300
+#: builtin/add.c:373
 msgid "add changes from all tracked and untracked files"
 msgstr "添加所有改�的已跟踪文件和未跟踪文件"
 
-#: builtin/add.c:303
+#: builtin/add.c:376
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作区中移除的路径（和 --no-all 相�）"
 
-#: builtin/add.c:305
+#: builtin/add.c:378
 msgid "don't add, only refresh the index"
 msgstr "�添加，�刷新索引"
 
-#: builtin/add.c:306
+#: builtin/add.c:379
 msgid "just skip files which cannot be added because of errors"
 msgstr "跳过因出错�能添加的文件"
 
-#: builtin/add.c:307
+#: builtin/add.c:380
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "检查在演习模�下文件（�使�存在）是�被忽略"
 
-#: builtin/add.c:309 builtin/update-index.c:1002
+#: builtin/add.c:382 builtin/update-index.c:1006
 msgid "override the executable bit of the listed files"
 msgstr "覆盖列表里文件的�执行�"
 
-#: builtin/add.c:311
+#: builtin/add.c:384
 msgid "warn when adding an embedded repository"
 msgstr "创建一个嵌入�仓库时给予警告"
 
-#: builtin/add.c:326
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr "`git stash -p` 的�端"
+
+#: builtin/add.c:404
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -8580,9 +10230,8 @@ msgid ""
 "\n"
 "See \"git help submodule\" for more information."
 msgstr ""
-"您在当�仓库中添加了�外一个Git仓库。克隆外层的仓库将�包�嵌入仓库的内容，并"
-"且�知�该如何获�它。\n"
-"如果您�添加一个�模组，使用：\n"
+"您在当�仓库中添加了�一个Git仓库。克隆外层的仓库将�包�嵌入仓库的\n"
+"内容，并且�知�该如何获�它。如果您�添加一个�模组，使用：\n"
 "\n"
 "\tgit submodule add <url> %s\n"
 "\n"
@@ -8592,142 +10241,174 @@ msgstr ""
 "\n"
 "�� \"git help submodule\" 获�更多信�。"
 
-#: builtin/add.c:354
+#: builtin/add.c:432
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "正在添加嵌入� git 仓库：%s"
 
-#: builtin/add.c:372
-#, c-format
-msgid "Use -f if you really want to add them.\n"
-msgstr "使用 -f �数如果您确实�添加它们。\n"
+#: 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 ""
+"如果您确实�添加它们，使用 -f �数。\n"
+"�行下�的命令�关闭本消�\n"
+"\"git config advice.addIgnoredFile false\""
 
-#: builtin/add.c:379
+#: builtin/add.c:460
 msgid "adding files failed"
 msgstr "添加文件失败"
 
-#: builtin/add.c:419
+#: 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:426
+#: builtin/add.c:522
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "选项 --ignore-missing �能和 --dry-run �时使用"
 
-#: builtin/add.c:430
+#: builtin/add.c:526
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "�数 --chmod �值 '%s' 必须是 -x 或 +x"
 
-#: builtin/add.c:445
+#: 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 "--pathspec-from-file 与路径表达��数�兼容"
+
+#: 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 "--pathspec-file-nul 需� --pathspec-from-file"
+
+#: builtin/add.c:555
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "没有指定文件，也没有文件被添加。\n"
 
-#: builtin/add.c:446
-#, c-format
-msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "也许您想�执行 'git add .'？\n"
+#: 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 ""
+"也许您想�执行 'git add .'？\n"
+"�行下�的命令�关闭本消�\n"
+"\"git config advice.addEmptyPathspec false\""
 
-#: builtin/am.c:347
+#: builtin/am.c:365
 msgid "could not parse author script"
 msgstr "�能解�作者脚本"
 
-#: builtin/am.c:431
+#: builtin/am.c:455
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' 被 applypatch-msg 钩�删除"
 
-#: builtin/am.c:473
+#: builtin/am.c:497
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "�法的输入行：'%s'。"
 
-#: builtin/am.c:511
+#: builtin/am.c:535
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "从 '%s' 拷�注解到 '%s' 时失败"
 
-#: builtin/am.c:537
+#: builtin/am.c:561
 msgid "fseek failed"
 msgstr "fseek 失败"
 
-#: builtin/am.c:725
+#: builtin/am.c:749
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "无法解�补� '%s'"
 
-#: builtin/am.c:790
+#: builtin/am.c:814
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次�能有一个 StGIT 补�队列被应用"
 
-#: builtin/am.c:838
+#: builtin/am.c:862
 msgid "invalid timestamp"
 msgstr "无效的时间戳"
 
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:867 builtin/am.c:879
 msgid "invalid Date line"
 msgstr "无效的日期行"
 
-#: builtin/am.c:850
+#: builtin/am.c:874
 msgid "invalid timezone offset"
 msgstr "无效的时区�移值"
 
-#: builtin/am.c:943
+#: builtin/am.c:967
 msgid "Patch format detection failed."
 msgstr "补�格�探测失败。"
 
-#: builtin/am.c:948 builtin/clone.c:406
+#: builtin/am.c:972 builtin/clone.c:414
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "创建目录 '%s' 失败"
 
-#: builtin/am.c:953
+#: builtin/am.c:977
 msgid "Failed to split patches."
 msgstr "拆分补�失败。"
 
-#: builtin/am.c:1084
+#: builtin/am.c:1126
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
 
-#: builtin/am.c:1085
+#: builtin/am.c:1127
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想�跳过这一补�，则执行 \"%s --skip\"。"
 
-#: builtin/am.c:1086
+#: builtin/am.c:1128
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若��原至原始分支并�止补��作，执行 \"%s --abort\"。"
 
-#: builtin/am.c:1169
+#: builtin/am.c:1223
 msgid "Patch sent with format=flowed; space at the end of lines might be lost."
 msgstr "补�使用 format=flowed 格���，行尾的空格�能会丢失。"
 
-#: builtin/am.c:1197
+#: builtin/am.c:1251
 msgid "Patch is empty."
 msgstr "补�为空。"
 
-#: builtin/am.c:1262
+#: builtin/am.c:1316
 #, c-format
 msgid "missing author line in commit %s"
 msgstr "在�交 %s 中缺失作者行"
 
-#: builtin/am.c:1265
+#: builtin/am.c:1319
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "无效的身份标识：%.*s"
 
-#: builtin/am.c:1484
+#: builtin/am.c:1538
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "仓库缺�必�的数�对象以进行三方�并。"
 
-#: builtin/am.c:1486
+#: builtin/am.c:1540
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引��建一个（三方�并的）基础目录树..."
 
-#: builtin/am.c:1505
+#: builtin/am.c:1559
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -8735,65 +10416,64 @@ msgstr ""
 "您是�曾手动编辑过您的补�？\n"
 "无法应用补�到索引中的数�对象上。"
 
-#: builtin/am.c:1511
+#: builtin/am.c:1565
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回�到基础版本上打补��进行三方�并..."
 
-#: builtin/am.c:1537
+#: builtin/am.c:1591
 msgid "Failed to merge in the changes."
 msgstr "无法�并�更。"
 
-#: builtin/am.c:1569
+#: builtin/am.c:1623
 msgid "applying to an empty history"
 msgstr "正应用到一个空历�上"
 
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1675 builtin/am.c:1679
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "无法继续：%s �存在。"
 
-#: builtin/am.c:1638
+#: builtin/am.c:1697
 msgid "Commit Body is:"
 msgstr "�交内容为："
 
-#  译者：注����尾空格
 #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
 #. in your translation. The program will only accept English
 #. input at this point.
 #.
-#: builtin/am.c:1648
+#: builtin/am.c:1707
 #, 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:1695 builtin/commit.c:374
+#: builtin/am.c:1753 builtin/commit.c:408
 msgid "unable to write index file"
 msgstr "无法写入索引文件"
 
-#: builtin/am.c:1699
+#: builtin/am.c:1757
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "�索引：�能应用补�（�文件：%s）"
 
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1797 builtin/am.c:1865
 #, c-format
 msgid "Applying: %.*s"
 msgstr "应用：%.*s"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1814
 msgid "No changes -- Patch already applied."
 msgstr "没有�更 —— 补�已�应用过。"
 
-#: builtin/am.c:1762
+#: builtin/am.c:1820
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打补�失败于 %s %.*s"
 
-#: builtin/am.c:1766
-msgid "Use 'git am --show-current-patch' to see the failed patch"
-msgstr "用 'git am --show-current-patch' 命令查看失败的补�"
+#: builtin/am.c:1824
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "用 'git am --show-current-patch=diff' 命令查看失败的补�"
 
-#: builtin/am.c:1810
+#: 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"
@@ -8803,7 +10483,7 @@ msgstr ""
 "如果没有什么�添加到暂存区的，则很�能是其它�交已�引入了相�的�更。\n"
 "您也许想�跳过这个补�。"
 
-#: builtin/am.c:1817
+#: 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 "
@@ -8814,159 +10494,175 @@ msgstr ""
 "您应该对已�冲�解决的�一个文件执行 'git add' �标记已�完�。 \n"
 "你�以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
 
-#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
-#: builtin/reset.c:337
+#: 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 "�能解�对象 '%s'。"
 
-#: builtin/am.c:1976
+#: builtin/am.c:2034
 msgid "failed to clean index"
 msgstr "清空索引失败"
 
-#: builtin/am.c:2020
+#: builtin/am.c:2078
 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:2117
+#: builtin/am.c:2185
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "无效的 --patch-format 值：%s"
 
-#: builtin/am.c:2153
+#: builtin/am.c:2227
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "无效的 --show-current-patch 值：%s"
+
+#: builtin/am.c:2231
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s 和 --show-current-patch=%s �兼容"
+
+#: builtin/am.c:2262
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2154
+#: builtin/am.c:2263
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<选项>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2160
+#: builtin/am.c:2269
 msgid "run interactively"
 msgstr "以交互�方��行"
 
-#: builtin/am.c:2162
+#: builtin/am.c:2271
 msgid "historical option -- no-op"
 msgstr "�的�数 —— 无作用"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2273
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必�，�许使用三方�并。"
 
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:297 builtin/stash.c:812
+#: 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 "�默模�"
 
-#: builtin/am.c:2167
-msgid "add a Signed-off-by line to the commit message"
-msgstr "在�交说明中添加一个 Signed-off-by 签�"
+#: builtin/am.c:2276
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "在�交说明中添加 Signed-off-by 尾注"
 
-#: builtin/am.c:2170
+#: builtin/am.c:2279
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字符集（默认）"
 
-#: builtin/am.c:2172
+#: builtin/am.c:2281
 msgid "pass -k flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -k �数"
 
-#: builtin/am.c:2174
+#: builtin/am.c:2283
 msgid "pass -b flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -b �数"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2285
 msgid "pass -m flag to git-mailinfo"
 msgstr "� git-mailinfo 传递 -m �数"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2287
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "针对 mbox 格�，� git-mailsplit 传递 --keep-cr �数"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2290
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "�� git-mailsplit 传递 --keep-cr �数，覆盖 am.keepcr 的设置"
 
-#: builtin/am.c:2184
+#: builtin/am.c:2293
 msgid "strip everything before a scissors line"
 msgstr "丢弃�切线�的所有内容"
 
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr "传递给 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 "传递给 git-apply"
 
-#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
-#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:150 parse-options.h:171 parse-options.h:312
+#: 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: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:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: 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 "格�"
 
-#: builtin/am.c:2210
+#: builtin/am.c:2322
 msgid "format the patch(es) are in"
 msgstr "补�的格�"
 
-#: builtin/am.c:2216
+#: builtin/am.c:2328
 msgid "override error message when patch failure occurs"
 msgstr "打补�失败时显示的错误信�"
 
-#: builtin/am.c:2218
+#: builtin/am.c:2330
 msgid "continue applying patches after resolving a conflict"
 msgstr "冲�解决�继续应用补�"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2333
 msgid "synonyms for --continue"
 msgstr "和 --continue �义"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2336
 msgid "skip the current patch"
 msgstr "跳过当�补�"
 
-#: builtin/am.c:2227
-msgid "restore the original branch and abort the patching operation."
-msgstr "��原始分支并终止打补��作。"
+#: builtin/am.c:2339
+msgid "restore the original branch and abort the patching operation"
+msgstr "��原始分支并终止打补��作"
 
-#: builtin/am.c:2230
-msgid "abort the patching operation but keep HEAD where it is."
-msgstr "终止补��作但�� HEAD ��。"
+#: builtin/am.c:2342
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "终止补��作但�� HEAD ��"
 
-#: builtin/am.c:2233
-msgid "show the patch being applied."
-msgstr "显示正在应用的补�。"
+#: builtin/am.c:2346
+msgid "show the patch being applied"
+msgstr "显示正在应用的补�"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2351
 msgid "lie about committer date"
 msgstr "将作者日期作为�交日期"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2353
 msgid "use current timestamp for author date"
 msgstr "用当�时间作为作者日期"
 
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
-#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
+#: 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 "key-id"
 
-#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
 msgid "GPG-sign commits"
 msgstr "使用 GPG 签��交"
 
-#: builtin/am.c:2245
+#: builtin/am.c:2359
 msgid "(internal use for git-rebase)"
 msgstr "（内部使用，用于 git-rebase）"
 
-#: builtin/am.c:2263
+#: 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."
@@ -8974,16 +10670,16 @@ msgstr ""
 "�数 -b/--binary 已�很长时间��任何实质�作了，并且将被移除。\n"
 "请���使用它了。"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2384
 msgid "failed to read the index"
 msgstr "读�索引失败"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2399
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之�的�基目录 %s �然存在，但��供了 mbox。"
 
-#: builtin/am.c:2309
+#: builtin/am.c:2423
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -8992,11 +10688,11 @@ msgstr ""
 "�现了错误的 %s 目录。\n"
 "使用 \"git am --abort\" 删除它。"
 
-#: builtin/am.c:2315
+#: builtin/am.c:2429
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决�作未进行，我们�会继续。"
 
-#: builtin/am.c:2325
+#: builtin/am.c:2439
 msgid "interactive mode requires patches on the command line"
 msgstr "交互�模�需�命令行上�供补�"
 
@@ -9034,42 +10730,15 @@ msgstr "git archive：�议错误"
 msgid "git archive: expected a flush"
 msgstr "git archive：应有一个 flush 包"
 
-#: builtin/bisect--helper.c:22
-msgid "git bisect--helper --next-all [--no-checkout]"
-msgstr "git bisect--helper --next-all [--no-checkout]"
-
 #: builtin/bisect--helper.c:23
-msgid "git bisect--helper --write-terms <bad_term> <good_term>"
-msgstr "git bisect--helper --write-terms <�-术语> <好-术语>"
-
-#: builtin/bisect--helper.c:24
-msgid "git bisect--helper --bisect-clean-state"
-msgstr "git bisect--helper --bisect-clean-state"
-
-#: builtin/bisect--helper.c:25
 msgid "git bisect--helper --bisect-reset [<commit>]"
 msgstr "git bisect--helper --bisect-reset [<�交>]"
 
-#: builtin/bisect--helper.c:26
-msgid ""
-"git bisect--helper --bisect-write [--no-log] <state> <revision> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-write [--no-log] <状�> <版本> <好-术语> <�-术语"
-">"
-
-#: builtin/bisect--helper.c:27
-msgid ""
-"git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
-"<bad_term>"
-msgstr ""
-"git bisect--helper --bisect-check-and-set-terms <命令> <好-术语> <�-术语>"
-
-#: builtin/bisect--helper.c:28
+#: 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:29
+#: builtin/bisect--helper.c:25
 msgid ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
@@ -9077,74 +10746,101 @@ msgstr ""
 "git bisect--helper --bisect-terms [--term-good | --term-old | --term-bad | --"
 "term-new]"
 
-#: builtin/bisect--helper.c:30
+#: builtin/bisect--helper.c:26
 msgid ""
-"git bisect--helper --bisect-start [--term-{old,good}=<term> --term-{new,bad}"
-"=<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>...]"
 msgstr ""
-"git bisect--helper --bisect-start [--term-{old,good}=<术语> --term-{new,bad}"
-"=<术语>][--no-checkout] [<�> [<好>...]] [--] [<路径>...]"
+"git bisect--helper --bisect-start [--term-{new,bad}=<术语> --term-{old,good}"
+"=<术语>] [--no-checkout] [--first-parent] [<�> [<好>...]] [--] [<路径>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+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-state (bad|new) [<版本>]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<版本>...]"
 
-#: builtin/bisect--helper.c:86
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <文件>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<版本>|<范围>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "�能以 '%2$s' 模�打开文件 '%1$s'"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "�能写入文件 '%s'"
+
+#: builtin/bisect--helper.c:155
 #, c-format
 msgid "'%s' is not a valid term"
 msgstr "'%s' �是一个有效的术语"
 
-#: builtin/bisect--helper.c:90
+#: builtin/bisect--helper.c:159
 #, c-format
 msgid "can't use the builtin command '%s' as a term"
 msgstr "�能使用内置命令 '%s' 作为术语"
 
-#: builtin/bisect--helper.c:100
+#: builtin/bisect--helper.c:169
 #, c-format
 msgid "can't change the meaning of the term '%s'"
 msgstr "�能修改术语 '%s' 的�义"
 
-#: builtin/bisect--helper.c:111
+#: builtin/bisect--helper.c:179
 msgid "please use two different terms"
 msgstr "请使用两个��的术语"
 
-#: builtin/bisect--helper.c:118
-msgid "could not open the file BISECT_TERMS"
-msgstr "�能打开文件 BISECT_TERMS"
-
-#: builtin/bisect--helper.c:155
+#: builtin/bisect--helper.c:195
 #, c-format
 msgid "We are not bisecting.\n"
 msgstr "我们没有在二分查找。\n"
 
-#: builtin/bisect--helper.c:163
+#: builtin/bisect--helper.c:203
 #, c-format
 msgid "'%s' is not a valid commit"
 msgstr "'%s' �是一个有效的�交"
 
-#: builtin/bisect--helper.c:174
+#: builtin/bisect--helper.c:212
 #, 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:215
+#: builtin/bisect--helper.c:256
 #, c-format
 msgid "Bad bisect_write argument: %s"
 msgstr "�的 bisect_write �数：%s"
 
-#: builtin/bisect--helper.c:220
+#: builtin/bisect--helper.c:261
 #, c-format
 msgid "couldn't get the oid of the rev '%s'"
 msgstr "无法获�版本 '%s' 的对象 ID"
 
-#: builtin/bisect--helper.c:232
+#: builtin/bisect--helper.c:273
 #, c-format
 msgid "couldn't open the file '%s'"
 msgstr "无法打开文件 '%s'"
 
-#: builtin/bisect--helper.c:258
+#: builtin/bisect--helper.c:299
 #, c-format
 msgid "Invalid command: you're currently in a %s/%s bisect"
 msgstr "无效的命令：您当�正处于一个 %s/%s 二分查找中"
 
-#: builtin/bisect--helper.c:285
+#: builtin/bisect--helper.c:326
 #, c-format
 msgid ""
 "You need to give me at least one %s and %s revision.\n"
@@ -9153,7 +10849,7 @@ msgstr ""
 "您需�给我至少一个 %s 和一个 %s 版本。\n"
 "为此您�以用 \"git bisect %s\" 和 \"git bisect %s\"。"
 
-#: builtin/bisect--helper.c:289
+#: builtin/bisect--helper.c:330
 #, c-format
 msgid ""
 "You need to start by \"git bisect start\".\n"
@@ -9164,32 +10860,31 @@ msgstr ""
 "然�需��供我至少一个 %s 和一个 %s 版本。\n"
 "为此您�以用 \"git bisect %s\" 和 \"git bisect %s\" 命令。"
 
-#: builtin/bisect--helper.c:321
+#: builtin/bisect--helper.c:350
 #, c-format
 msgid "bisecting only with a %s commit"
 msgstr "在�有一个 %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:329
+#: builtin/bisect--helper.c:358
 msgid "Are you sure [Y/n]? "
 msgstr "您确认么[Y/n]？ "
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:419
 msgid "no terms defined"
 msgstr "未定义术语"
 
-#: builtin/bisect--helper.c:379
+#: 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 "您当�针对旧状�的术语是 %s，对新状�的术语是 %s。\n"
 
-#: builtin/bisect--helper.c:389
+#: builtin/bisect--helper.c:432
 #, c-format
 msgid ""
 "invalid argument %s for 'git bisect terms'.\n"
@@ -9198,268 +10893,313 @@ msgstr ""
 "命令 'git bisect terms' 的�数 %s 无效。\n"
 "支�的选项有：--term-good|--term-old 和 --term-bad|--term-new。"
 
-#: builtin/bisect--helper.c:475
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+msgid "revision walk setup failed\n"
+msgstr "版本�历设置失败\n"
+
+#: builtin/bisect--helper.c:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "无法打开 '%s' 进行追加"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr "'' �是一个有效的术语"
+
+#: builtin/bisect--helper.c:663
 #, c-format
 msgid "unrecognized option: '%s'"
 msgstr "未识别的选项：'%s'"
 
-#: builtin/bisect--helper.c:479
+#: builtin/bisect--helper.c:667
 #, c-format
 msgid "'%s' does not appear to be a valid revision"
 msgstr "'%s' 看起��是一个有效的版本"
 
-#: builtin/bisect--helper.c:511
+#: builtin/bisect--helper.c:698
 msgid "bad HEAD - I need a HEAD"
 msgstr "�的 HEAD - 我需�一个 HEAD"
 
-#: builtin/bisect--helper.c:526
+#: builtin/bisect--helper.c:713
 #, c-format
 msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
 msgstr "检出 '%s' 失败。�试 'git bisect start <有效分支>'。"
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:734
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "�会在�了 cg-seek 的树上�二分查找"
 
-#: builtin/bisect--helper.c:550
+#: builtin/bisect--helper.c:737
 msgid "bad HEAD - strange symbolic ref"
 msgstr "�的 HEAD - 奇怪的符�引用"
 
-#: builtin/bisect--helper.c:574
+#: builtin/bisect--helper.c:757
 #, c-format
 msgid "invalid ref: '%s'"
 msgstr "无效的引用：'%s'"
 
-#: builtin/bisect--helper.c:630
-msgid "perform 'git bisect next'"
-msgstr "执行 'git bisect next'"
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "您需�执行 \"git bisect start\" �开始\n"
 
-#: builtin/bisect--helper.c:632
-msgid "write the terms to .git/BISECT_TERMS"
-msgstr "将术语写入 .git/BISECT_TERMS"
+#. 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:826
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "您想让我为您这样�么[Y/n]？ "
 
-#: builtin/bisect--helper.c:634
-msgid "cleanup the bisection state"
-msgstr "清除二分查找状�"
+#: builtin/bisect--helper.c:844
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "请使用至少一个�数调用 `--bisect-state`"
 
-#: builtin/bisect--helper.c:636
-msgid "check for expected revs"
-msgstr "检查预期的版本"
+#: builtin/bisect--helper.c:857
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' �能带一个�数。"
 
-#: builtin/bisect--helper.c:638
-msgid "reset the bisection state"
-msgstr "清除二分查找状�"
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "�的版本输入：%s"
+
+#: builtin/bisect--helper.c:889
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "�的版本输入（�是�交）：%s"
+
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr "我们没有在二分查找。"
 
-#: builtin/bisect--helper.c:640
-msgid "write out the bisection state in BISECT_LOG"
-msgstr "将二分查找的状�写入 BISECT_LOG"
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "'%s'?? 您在说什么?"
 
-#: builtin/bisect--helper.c:642
-msgid "check and set terms in a bisection state"
-msgstr "在一个二分查找状�中检查和设置术语"
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "�能读�文件 '%s' ��放"
 
-#: builtin/bisect--helper.c:644
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr "清除二分查找状�"
+
+#: builtin/bisect--helper.c:1058
 msgid "check whether bad or good terms exist"
 msgstr "检查�的或好的术语是�存在"
 
-#: builtin/bisect--helper.c:646
+#: builtin/bisect--helper.c:1060
 msgid "print out the bisect terms"
 msgstr "打�二分查找术语"
 
-#: builtin/bisect--helper.c:648
+#: builtin/bisect--helper.c:1062
 msgid "start the bisect session"
 msgstr "�动二分查找过程"
 
-#: builtin/bisect--helper.c:650
-msgid "update BISECT_HEAD instead of checking out the current commit"
-msgstr "更新 BISECT_HEAD 而�检出当��交"
+#: builtin/bisect--helper.c:1064
+msgid "find the next bisection commit"
+msgstr "查询下一个二分查找�交"
 
-#: builtin/bisect--helper.c:652
-msgid "no log for BISECT_WRITE"
-msgstr "BISECT_WRITE 无日志"
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr "标记引用的状�"
 
-#: builtin/bisect--helper.c:669
-msgid "--write-terms requires two arguments"
-msgstr "--write-terms 需�两个�数"
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr "列出到目�为止的二分查找步骤"
 
-#: builtin/bisect--helper.c:673
-msgid "--bisect-clean-state requires no arguments"
-msgstr "--bisect-clean-state �带�数"
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
+msgstr "从给定文件�放二分查找进程"
 
-#: builtin/bisect--helper.c:680
-msgid "--bisect-reset requires either no argument or a commit"
-msgstr "--bisect-reset 无需�数或者需�一个�交"
+#: builtin/bisect--helper.c:1072
+msgid "skip some commits for checkout"
+msgstr "跳过�检出的一些�交"
 
-#: builtin/bisect--helper.c:684
-msgid "--bisect-write requires either 4 or 5 arguments"
-msgstr "--bisect-write 需� 4 或 5 个�数"
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "BISECT_WRITE 无日志"
 
-#: builtin/bisect--helper.c:690
-msgid "--check-and-set-terms requires 3 arguments"
-msgstr "--check-and-set-terms 需� 3 个�数"
+#: builtin/bisect--helper.c:1089
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset 无需�数或者需�一个�交"
 
-#: builtin/bisect--helper.c:696
+#: builtin/bisect--helper.c:1094
 msgid "--bisect-next-check requires 2 or 3 arguments"
 msgstr "--bisect-next-check 需� 2 或 3 个�数"
 
-#: builtin/bisect--helper.c:702
+#: builtin/bisect--helper.c:1100
 msgid "--bisect-terms requires 0 or 1 argument"
 msgstr "--bisect-terms 需� 0 或 1 个�数"
 
-#: builtin/blame.c:31
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next 需� 0 个�数"
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log 需� 0 个�数"
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr "未�供日志文件"
+
+#: builtin/blame.c:32
 msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
 msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
 
-#: builtin/blame.c:36
+#: builtin/blame.c:37
 msgid "<rev-opts> are documented in git-rev-list(1)"
 msgstr "<版本选项> 的文档记录在 git-rev-list(1) 中"
 
-#: builtin/blame.c:409
+#: builtin/blame.c:410
 #, c-format
 msgid "expecting a color: %s"
 msgstr "期望一个颜色：%s"
 
-#: builtin/blame.c:416
+#: builtin/blame.c:417
 msgid "must end with a color"
 msgstr "必须以一个颜色结尾"
 
-#: builtin/blame.c:729
+#: builtin/blame.c:728
 #, c-format
 msgid "invalid color '%s' in color.blame.repeatedLines"
 msgstr "设置 color.blame.repeatedLines 中的无效颜色 '%s'"
 
-#: builtin/blame.c:747
+#: builtin/blame.c:746
 msgid "invalid value for blame.coloring"
 msgstr "设置 blame.coloring 中的无效�值"
 
-#: builtin/blame.c:822
+#: builtin/blame.c:845
 #, c-format
 msgid "cannot find revision %s to ignore"
 msgstr "�能找到�忽略的版本 %s"
 
-#: builtin/blame.c:844
-msgid "Show blame entries as we find them, incrementally"
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
 msgstr "增��地显示�现的 blame �目"
 
-#: builtin/blame.c:845
-msgid "Show blank SHA-1 for boundary commits (Default: off)"
-msgstr "边界�交显示空的 SHA-1（默认：关闭）"
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "�显示边界�交的对象�（默认：关闭）"
 
-#: builtin/blame.c:846
-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 "�把根�交作为边界（默认：关闭）"
 
-#: builtin/blame.c:847
-msgid "Show work cost statistics"
-msgstr "显示命令消耗统计"
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "显示工作消耗统计"
 
-#: builtin/blame.c:848
-msgid "Force progress reporting"
-msgstr "强制进度显示"
+#: 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 "强制显示进度报告"
 
-#: builtin/blame.c:849
-msgid "Show output score for blame entries"
-msgstr "显示判断 blame �目�移的得分诊断信�"
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "显示 blame �目的输出得分"
 
-#: builtin/blame.c:850
-msgid "Show original filename (Default: auto)"
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
 msgstr "显示原始文件�（默认：自动）"
 
-#: builtin/blame.c:851
-msgid "Show original linenumber (Default: off)"
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
 msgstr "显示原始的行�（默认：关闭）"
 
-#: builtin/blame.c:852
-msgid "Show in a format designed for machine consumption"
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
 msgstr "显示为一个适�机器读�的格�"
 
-#: builtin/blame.c:853
-msgid "Show porcelain format with per-line commit information"
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
 msgstr "为�一行显示机器适用的�交信�"
 
-#: builtin/blame.c:854
-msgid "Use the same output mode as git-annotate (Default: off)"
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
 msgstr "使用和 git-annotate 相�的输出模�（默认：关闭）"
 
-#: builtin/blame.c:855
-msgid "Show raw timestamp (Default: off)"
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
 msgstr "显示原始时间戳（默认：关闭）"
 
-#: builtin/blame.c:856
-msgid "Show long commit SHA1 (Default: off)"
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
 msgstr "显示长的 SHA1 �交�（默认：关闭）"
 
-#: builtin/blame.c:857
-msgid "Suppress author name and timestamp (Default: off)"
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
 msgstr "��作者�字和时间戳（默认：关闭）"
 
-#: builtin/blame.c:858
-msgid "Show author email instead of name (Default: off)"
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
 msgstr "显示作者的邮箱而�是�字（默认：关闭）"
 
-#: builtin/blame.c:859
-msgid "Ignore whitespace differences"
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
 msgstr "忽略空白差异"
 
-#: builtin/blame.c:860 builtin/log.c:1630
+#: builtin/blame.c:883 builtin/log.c:1823
 msgid "rev"
 msgstr "版本"
 
-#: builtin/blame.c:860
-msgid "Ignore <rev> when blaming"
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
 msgstr "在执行 blame �作时忽略 <版本>"
 
-#: builtin/blame.c:861
-msgid "Ignore revisions from <file>"
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
 msgstr "忽略�自 <文件> 中的版本"
 
-#: builtin/blame.c:862
+#: builtin/blame.c:885
 msgid "color redundant metadata from previous line differently"
 msgstr "使用颜色间隔输出与�一行��的��元信�"
 
-#: builtin/blame.c:863
+#: builtin/blame.c:886
 msgid "color lines by age"
 msgstr "��时间�色"
 
-#: builtin/blame.c:870
-msgid "Use an experimental heuristic to improve diffs"
-msgstr "使用一个试验性的���算法改进差异显示"
-
-#: builtin/blame.c:872
-msgid "Spend extra cycles to find better match"
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
 msgstr "花费�外的循环�找到更好的匹�"
 
-#: builtin/blame.c:873
-msgid "Use revisions from <file> instead of calling git-rev-list"
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
 msgstr "使用�自 <文件> 的修订集而�是调用 git-rev-list"
 
-#: builtin/blame.c:874
-msgid "Use <file>'s contents as the final image"
-msgstr "使用 <文件> 的内容作为最终的图片"
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "使用 <文件> 的内容作为最终的镜�"
 
-#: builtin/blame.c:875 builtin/blame.c:876
+#: builtin/blame.c:890 builtin/blame.c:891
 msgid "score"
 msgstr "得分"
 
-#: builtin/blame.c:875
-msgid "Find line copies within and across files"
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
 msgstr "找到文件内�跨文件的行拷�"
 
-#: builtin/blame.c:876
-msgid "Find line movements within and across files"
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
 msgstr "找到文件内�跨文件的行移动"
 
-#: builtin/blame.c:877
-msgid "n,m"
-msgstr "n,m"
+#: builtin/blame.c:892
+msgid "range"
+msgstr "范围"
 
-#: builtin/blame.c:877
-msgid "Process only line range n,m, counting from 1"
-msgstr "�处�行范围在 n 和 m 之间的，从 1 开始"
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr "�处�在 <开始>,<结�> 范围内的行，或者函数：<函数�>"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:945
 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
@@ -9469,24 +11209,24 @@ msgstr "--progress �能和 --incremental 或 --porcelain �时使用"
 #. your language may need more or fewer display
 #. columns.
 #.
-#: builtin/blame.c:980
+#: builtin/blame.c:996
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 个月�"
 
-#: builtin/blame.c:1087
+#: builtin/blame.c:1112
 #, 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:1133
+#: builtin/blame.c:1157
 msgid "Blaming lines"
 msgstr "追踪代�行"
 
 #: builtin/branch.c:29
-msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
-msgstr "git branch [<选项>] [-r | -a] [--merged | --no-merged]"
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<选项>] [-r | -a] [--merged] [--no-merged]"
 
 #: builtin/branch.c:30
 msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
@@ -9550,117 +11290,107 @@ msgstr ""
 msgid "Update of config-file failed"
 msgstr "更新�置文件失败"
 
-#: builtin/branch.c:220
+#: builtin/branch.c:223
 msgid "cannot use -a with -d"
 msgstr "�能将 -a 和 -d �时使用"
 
-#: builtin/branch.c:226
+#: builtin/branch.c:230
 msgid "Couldn't look up commit object for HEAD"
 msgstr "无法查询 HEAD 指�的�交对象"
 
-#: builtin/branch.c:240
+#: builtin/branch.c:244
 #, c-format
 msgid "Cannot delete branch '%s' checked out at '%s'"
 msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
 
-#: builtin/branch.c:255
+#: builtin/branch.c:259
 #, c-format
 msgid "remote-tracking branch '%s' not found."
 msgstr "未能找到远程跟踪分支 '%s'。"
 
-#: builtin/branch.c:256
+#: builtin/branch.c:260
 #, c-format
 msgid "branch '%s' not found."
 msgstr "分支 '%s' 未�现。"
 
-#: builtin/branch.c:271
-#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "无法删除远程跟踪分支 '%s'"
-
-#: builtin/branch.c:272
-#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "无法删除分支 '%s'"
-
-#: builtin/branch.c:279
+#: builtin/branch.c:291
 #, c-format
 msgid "Deleted remote-tracking branch %s (was %s).\n"
 msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:280
+#: builtin/branch.c:292
 #, c-format
 msgid "Deleted branch %s (was %s).\n"
 msgstr "已删除分支 %s（曾为 %s）。\n"
 
-#: builtin/branch.c:429 builtin/tag.c:61
+#: builtin/branch.c:440 builtin/tag.c:63
 msgid "unable to parse format string"
 msgstr "�能解�格�化字符串"
 
-#: builtin/branch.c:460
+#: builtin/branch.c:471
 msgid "could not resolve HEAD"
 msgstr "�能解� HEAD �交"
 
-#: builtin/branch.c:466
+#: builtin/branch.c:477
 #, c-format
 msgid "HEAD (%s) points outside of refs/heads/"
 msgstr "HEAD (%s) 指� refs/heads/ 之外"
 
-#: builtin/branch.c:481
+#: builtin/branch.c:492
 #, c-format
 msgid "Branch %s is being rebased at %s"
 msgstr "分支 %s 正被�基到 %s"
 
-#: builtin/branch.c:485
+#: builtin/branch.c:496
 #, c-format
 msgid "Branch %s is being bisected at %s"
 msgstr "分支 %s 正被二分查找于 %s"
 
-#: builtin/branch.c:502
+#: builtin/branch.c:513
 msgid "cannot copy the current branch while not on any."
 msgstr "无法拷�当�分支因为�处于任何分支上。"
 
-#: builtin/branch.c:504
+#: builtin/branch.c:515
 msgid "cannot rename the current branch while not on any."
 msgstr "无法�命�当�分支因为�处于任何分支上。"
 
-#: builtin/branch.c:515
+#: builtin/branch.c:526
 #, c-format
 msgid "Invalid branch name: '%s'"
 msgstr "无效的分支�：'%s'"
 
-#: builtin/branch.c:542
+#: builtin/branch.c:555
 msgid "Branch rename failed"
 msgstr "分支�命�失败"
 
-#: builtin/branch.c:544
+#: builtin/branch.c:557
 msgid "Branch copy failed"
 msgstr "分支拷�失败"
 
-#: builtin/branch.c:548
+#: builtin/branch.c:561
 #, c-format
 msgid "Created a copy of a misnamed branch '%s'"
 msgstr "已为错误命�的分支 '%s' 创建了一个副本"
 
-#: builtin/branch.c:551
+#: builtin/branch.c:564
 #, c-format
 msgid "Renamed a misnamed branch '%s' away"
 msgstr "已将错误命�的分支 '%s' �命�"
 
-#: builtin/branch.c:557
+#: builtin/branch.c:570
 #, c-format
 msgid "Branch renamed to %s, but HEAD is not updated!"
 msgstr "分支�命�为 %s，但 HEAD 没有更新�"
 
-#: builtin/branch.c:566
+#: builtin/branch.c:579
 msgid "Branch is renamed, but update of config-file failed"
 msgstr "分支被�命�，但更新�置文件失败"
 
-#: builtin/branch.c:568
+#: builtin/branch.c:581
 msgid "Branch is copied, but update of config-file failed"
 msgstr "分支已拷�，但更新�置文件失败"
 
-#: builtin/branch.c:584
+#: builtin/branch.c:597
 #, c-format
 msgid ""
 "Please edit the description for the branch\n"
@@ -9671,209 +11401,209 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被过滤。\n"
 
-#: builtin/branch.c:618
+#: builtin/branch.c:631
 msgid "Generic options"
 msgstr "通用选项"
 
-#: builtin/branch.c:620
+#: builtin/branch.c:633
 msgid "show hash and subject, give twice for upstream branch"
 msgstr "显示哈希值和主题，若�数出现两次则显示上游分支"
 
-#: builtin/branch.c:621
+#: builtin/branch.c:634
 msgid "suppress informational messages"
 msgstr "�显示信�"
 
-#: builtin/branch.c:622
+#: builtin/branch.c:635
 msgid "set up tracking mode (see git-pull(1))"
 msgstr "设置跟踪模�（�� git-pull(1)）"
 
-#: builtin/branch.c:624
+#: builtin/branch.c:637
 msgid "do not use"
 msgstr "��使用"
 
-#: builtin/branch.c:626 builtin/rebase.c:486
+#: builtin/branch.c:639 builtin/rebase.c:533
 msgid "upstream"
 msgstr "上游"
 
-#: builtin/branch.c:626
+#: builtin/branch.c:639
 msgid "change the upstream info"
 msgstr "改�上游信�"
 
-#: builtin/branch.c:627
-msgid "Unset the upstream info"
+#: builtin/branch.c:640
+msgid "unset the upstream info"
 msgstr "�消上游信�的设置"
 
-#: builtin/branch.c:628
+#: builtin/branch.c:641
 msgid "use colored output"
 msgstr "使用彩色输出"
 
-#: builtin/branch.c:629
+#: builtin/branch.c:642
 msgid "act on remote-tracking branches"
 msgstr "作用于远程跟踪分支"
 
-#: 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 "�打�包�该�交的分支"
 
-#: 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 "�打��包�该�交的分支"
 
-#: builtin/branch.c:637
+#: builtin/branch.c:650
 msgid "Specific git-branch actions:"
 msgstr "具体的 git-branch 动作："
 
-#: builtin/branch.c:638
+#: builtin/branch.c:651
 msgid "list both remote-tracking and local branches"
 msgstr "列出远程跟踪�本地分支"
 
-#: builtin/branch.c:640
+#: builtin/branch.c:653
 msgid "delete fully merged branch"
 msgstr "删除完全�并的分支"
 
-#: builtin/branch.c:641
+#: builtin/branch.c:654
 msgid "delete branch (even if not merged)"
 msgstr "删除分支（�使没有�并）"
 
-#: builtin/branch.c:642
+#: builtin/branch.c:655
 msgid "move/rename a branch and its reflog"
 msgstr "移动/�命�一个分支，以�它的引用日志"
 
-#: builtin/branch.c:643
+#: builtin/branch.c:656
 msgid "move/rename a branch, even if target exists"
 msgstr "移动/�命�一个分支，�使目标已存在"
 
-#: builtin/branch.c:644
+#: builtin/branch.c:657
 msgid "copy a branch and its reflog"
 msgstr "拷�一个分支和它的引用日志"
 
-#: builtin/branch.c:645
+#: builtin/branch.c:658
 msgid "copy a branch, even if target exists"
 msgstr "拷�一个分支，�使目标已存在"
 
-#: builtin/branch.c:646
+#: builtin/branch.c:659
 msgid "list branch names"
 msgstr "列出分支�"
 
-#: builtin/branch.c:647
+#: builtin/branch.c:660
 msgid "show current branch name"
 msgstr "显示当�分支�"
 
-#: builtin/branch.c:648
+#: builtin/branch.c:661
 msgid "create the branch's reflog"
 msgstr "创建分支的引用日志"
 
-#: builtin/branch.c:650
+#: builtin/branch.c:663
 msgid "edit the description for the branch"
 msgstr "标记分支的�述"
 
-#: builtin/branch.c:651
+#: builtin/branch.c:664
 msgid "force creation, move/rename, deletion"
 msgstr "强制创建�移动/�命��删除"
 
-#: builtin/branch.c:652
+#: builtin/branch.c:665
 msgid "print only branches that are merged"
 msgstr "�打�已��并的分支"
 
-#: builtin/branch.c:653
+#: builtin/branch.c:666
 msgid "print only branches that are not merged"
 msgstr "�打�尚未�并的分支"
 
-#: builtin/branch.c:654
+#: builtin/branch.c:667
 msgid "list branches in columns"
 msgstr "以列的方�显示分支"
 
-#: builtin/branch.c:657 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:433
+#: builtin/tag.c:477
 msgid "object"
 msgstr "对象"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:670
 msgid "print only branches of the object"
 msgstr "�打�指�该对象的分支"
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
 msgid "sorting and filtering are case insensitive"
 msgstr "排�和过滤属于大�写��感"
 
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: 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 "输出格�"
 
-#: builtin/branch.c:684 builtin/clone.c:760
+#: builtin/branch.c:695 builtin/clone.c:794
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有�于 /refs/heads 之下�"
 
-#: builtin/branch.c:708
+#: builtin/branch.c:719
 msgid "--column and --verbose are incompatible"
 msgstr "--column 和 --verbose �兼容"
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:734 builtin/branch.c:790 builtin/branch.c:799
 msgid "branch name required"
 msgstr "必须�供分支�"
 
-#: builtin/branch.c:753
+#: builtin/branch.c:766
 msgid "Cannot give description to detached HEAD"
 msgstr "�能�分离头指针�供�述"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:771
 msgid "cannot edit description of more than one branch"
 msgstr "�能为一个以上的分支编辑�述"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:778
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚无�交。"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:781
 #, c-format
 msgid "No branch named '%s'."
 msgstr "没有分支 '%s'。"
 
-#: builtin/branch.c:783
+#: builtin/branch.c:796
 msgid "too many branches for a copy operation"
 msgstr "为拷��作�供了太多的分支�"
 
-#: builtin/branch.c:792
+#: builtin/branch.c:805
 msgid "too many arguments for a rename operation"
 msgstr "为�命��作�供了太多的�数"
 
-#: builtin/branch.c:797
+#: builtin/branch.c:810
 msgid "too many arguments to set new upstream"
 msgstr "为设置新上游�供了太多的�数"
 
-#: builtin/branch.c:801
+#: builtin/branch.c:814
 #, 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:804 builtin/branch.c:827
+#: builtin/branch.c:817 builtin/branch.c:840
 #, c-format
 msgid "no such branch '%s'"
 msgstr "没有此分支 '%s'"
 
-#: builtin/branch.c:808
+#: builtin/branch.c:821
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' �存在"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:834
 msgid "too many arguments to unset upstream"
 msgstr "为�消上游设置�作�供了太多的�数"
 
-#: builtin/branch.c:825
+#: builtin/branch.c:838
 msgid "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "无法�消 HEAD 的上游设置因为它没有指�一个分支"
 
-#: builtin/branch.c:831
+#: builtin/branch.c:844
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 没有上游信�"
 
-#: builtin/branch.c:841
+#: 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>?"
@@ -9881,27 +11611,171 @@ msgstr ""
 "'git branch' 的 -a 和 -r 选项�带一个分支�。\n"
 "您是�想�使用：-a|-r --list <模�>？"
 
-#: builtin/branch.c:845
+#: builtin/branch.c:858
 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/bundle.c:45
+#: builtin/bugreport.c:15
+msgid "git version:\n"
+msgstr "git 版本：\n"
+
+#: builtin/bugreport.c:21
 #, c-format
-msgid "%s is okay\n"
-msgstr "%s �以\n"
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() 失败，错误为 '%s'（%d）\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "编译器信�："
 
-#: builtin/bundle.c:58
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "libc 信�："
+
+#: builtin/bugreport.c:80
+msgid "not run from a git repository - no hooks to show\n"
+msgstr "�是在 git 仓库中执行 - 没有�显示的钩�\n"
+
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <文件>] [-s|--suffix <格�>]"
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"感谢您填写 Git 错误报告�\n"
+"请填写以下问�，以帮助我们了解您的问题。\n"
+"\n"
+"在错误�生之�，您�了什么？（�现问题的步骤）\n"
+"\n"
+"您期望�生什么？（预期行为）\n"
+"\n"
+"实际�生了什么？（实际行为）\n"
+"\n"
+"您所期望的与实际�生的有什么��？\n"
+"\n"
+"您想�补充的其它内容：\n"
+"\n"
+"请检查下�错误报告中余下的内容。\n"
+"您�以删除任何您�想共享的内容。\n"
+
+#: builtin/bugreport.c:136
+msgid "specify a destination for the bugreport file"
+msgstr "指定错误报告文件的目标�置"
+
+#: builtin/bugreport.c:138
+msgid "specify a strftime format suffix for the filename"
+msgstr "指定文件的 strftime 格��缀"
+
+#: builtin/bugreport.c:160
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "�能为 '%s' 创建先导目录"
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr "系统信�"
+
+#: builtin/bugreport.c:170
+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
+#, c-format
+msgid "unable to write to %s"
+msgstr "无法写入 %s"
+
+#: builtin/bugreport.c:190
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "在 '%s' 创建了新报告。\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<选项>] <文件> <git-rev-list �数>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<选项>] <文件>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <文件> [<引用�>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <文件> [<引用�>...]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr "�显示进度表"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+msgid "show progress meter"
+msgstr "显示进度表"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+msgid "show progress meter during object writing phase"
+msgstr "在对象写入阶段显示进度表"
+
+#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "当进度表显示时类似于 --all-progress"
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr "指定归档包的格�版本"
+
+#: builtin/bundle.c:96
 msgid "Need a repository to create a bundle."
-msgstr "需�一个仓库�创建包。"
+msgstr "需�一个仓库�创建归档包。"
+
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr "�显示归档包的细节"
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s �以\n"
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:179
 msgid "Need a repository to unbundle."
-msgstr "需�一个仓库�解包。"
+msgstr "需�一个仓库�解开归档包。"
+
+#: builtin/bundle.c:191 builtin/remote.c:1700
+msgid "be verbose; must be placed before a subcommand"
+msgstr "冗长输出；必须置于�命令之�"
+
+#: builtin/bundle.c:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "未知�命令：%s"
 
-#: builtin/cat-file.c:595
+#: 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>"
@@ -9909,79 +11783,79 @@ msgstr ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
 
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:597
 msgid ""
-"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
-"filters]"
+"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[=<格�>] | --batch-check[=<格�>]) [--follow-symlinks] "
+"[--textconv | --filters]"
 
-#: builtin/cat-file.c:617
+#: builtin/cat-file.c:618
 msgid "only one batch option may be specified"
 msgstr "�能指定一个批处�选项"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:636
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<类型> �以是其中之一：blob�tree�commit�tag"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:637
 msgid "show object type"
 msgstr "显示对象类型"
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:638
 msgid "show object size"
 msgstr "显示对象大�"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:640
 msgid "exit with zero when there's no error"
 msgstr "当没有错误时退出并返回零"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:641
 msgid "pretty-print object's content"
 msgstr "美观地打�对象的内容"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:643
 msgid "for blob objects, run textconv on object's content"
 msgstr "对于数�对象，对其内容�文本转�"
 
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:645
 msgid "for blob objects, run filters on object's content"
 msgstr "对于数�对象，对其内容�过滤"
 
-#: builtin/cat-file.c:645 git-submodule.sh:936
+#: builtin/cat-file.c:646
 msgid "blob"
 msgstr "数�对象"
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:647
 msgid "use a specific path for --textconv/--filters"
 msgstr "对于 --textconv/--filters 使用一个特定的路径"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:649
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "�许 -s 和 -t 对��的对象生效"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:650
 msgid "buffer --batch output"
 msgstr "缓冲 --batch 的输出"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:652
 msgid "show info and content of objects fed from the standard input"
 msgstr "显示从标准输入�供的对象的信�和内容"
 
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:656
 msgid "show info about objects fed from the standard input"
 msgstr "显示从标准输入�供的对象的信�"
 
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:660
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "跟�树内符�链接（和 --batch 或 --batch-check 共用）"
 
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:662
 msgid "show all objects with --batch or --batch-check"
 msgstr "使用 --batch 或 --batch-check �数显示所有对象"
 
-#: builtin/cat-file.c:663
+#: builtin/cat-file.c:664
 msgid "do not order --batch-all-objects output"
 msgstr "��对 --batch-all-objects 的输出排�"
 
@@ -10009,8 +11883,8 @@ msgstr "从标准输入读出文件�"
 msgid "terminate input and output records by a NUL character"
 msgstr "输入和输出的记录使用 NUL 字符终结"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
 msgid "suppress progress reporting"
 msgstr "�显示进度报告"
 
@@ -10022,27 +11896,27 @@ msgstr "显示未匹�的输入路径"
 msgid "ignore index when checking"
 msgstr "检查时忽略索引"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:165
 msgid "cannot specify pathnames with --stdin"
 msgstr "�能�时指定路径� --stdin �数"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:168
 msgid "-z only makes sense with --stdin"
 msgstr "-z 需�和 --stdin �数共用�有�义"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:170
 msgid "no path specified"
 msgstr "未指定路径"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:174
 msgid "--quiet is only valid with a single pathname"
 msgstr "�数 --quiet �在�供一个路径�时有效"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:176
 msgid "cannot have both --quiet and --verbose"
 msgstr "�能�时�供 --quiet 和 --verbose �数"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:179
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching 选项�在使用 --verbose 时有效"
 
@@ -10063,165 +11937,171 @@ msgstr "�能解��系地�：%s"
 msgid "no contacts specified"
 msgstr "未指定�系地�"
 
-#: builtin/checkout-index.c:131
+#: builtin/checkout--worker.c:110
+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: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 "字符串"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "在创建文件时，在��加上 <字符串>"
+
+#: builtin/checkout-index.c:152
 msgid "git checkout-index [<options>] [--] [<file>...]"
 msgstr "git checkout-index [<选项>] [--] [<文件>...]"
 
-#: builtin/checkout-index.c:148
+#: builtin/checkout-index.c:169
 msgid "stage should be between 1 and 3 or all"
 msgstr "索引值应该�值 1 到 3 或者 all"
 
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:187
 msgid "check out all files in the index"
 msgstr "检出索引区的所有文件"
 
-#: builtin/checkout-index.c:165
+#: builtin/checkout-index.c:188
 msgid "force overwrite of existing files"
 msgstr "强制覆盖现有的文件"
 
-#: builtin/checkout-index.c:167
+#: builtin/checkout-index.c:190
 msgid "no warning for existing files and files not in index"
 msgstr "存在或�在索引中的文件都没有警告"
 
-#: builtin/checkout-index.c:169
+#: builtin/checkout-index.c:192
 msgid "don't checkout new files"
 msgstr "�检出新文件"
 
-#: builtin/checkout-index.c:171
+#: builtin/checkout-index.c:194
 msgid "update stat information in the index file"
 msgstr "更新索引中文件的状�信�"
 
-#: builtin/checkout-index.c:175
+#: builtin/checkout-index.c:198
 msgid "read list of paths from the standard input"
 msgstr "从标准输入读�路径列表"
 
-#: builtin/checkout-index.c:177
+#: builtin/checkout-index.c:200
 msgid "write the content to temporary files"
 msgstr "将内容写入临时文件"
 
-#: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:679
-msgid "string"
-msgstr "字符串"
-
-#: builtin/checkout-index.c:179
-msgid "when creating files, prepend <string>"
-msgstr "在创建文件时，在��加上 <字符串>"
-
-#: builtin/checkout-index.c:181
+#: builtin/checkout-index.c:204
 msgid "copy out the files from named stage"
 msgstr "从指定暂存区中拷出文件"
 
-#: builtin/checkout.c:31
+#: builtin/checkout.c:33
 msgid "git checkout [<options>] <branch>"
 msgstr "git checkout [<选项>] <分支>"
 
-#: builtin/checkout.c:32
+#: builtin/checkout.c:34
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
 
-#: builtin/checkout.c:37
+#: builtin/checkout.c:39
 msgid "git switch [<options>] [<branch>]"
 msgstr "git switch [<选项>] [<分支>]"
 
-#: builtin/checkout.c:42
+#: builtin/checkout.c:44
 msgid "git restore [<options>] [--source=<branch>] <file>..."
 msgstr "git restore [<选项>] [--source=<分支>] <文件>..."
 
-#: builtin/checkout.c:173 builtin/checkout.c:212
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "路径 '%s' 没有我们的版本"
 
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:192 builtin/checkout.c:231
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "路径 '%s' 没有他们的版本"
 
-#: builtin/checkout.c:191
+#: builtin/checkout.c:208
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "路径 '%s' 没有全部必需的版本"
 
-#: builtin/checkout.c:241
+#: builtin/checkout.c:261
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "路径 '%s' 没有必需的版本"
 
-#: builtin/checkout.c:259
+#: builtin/checkout.c:278
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "path '%s'：无法�并"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:294
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加�并结果"
 
-#: builtin/checkout.c:375
+#: builtin/checkout.c:411
 #, c-format
 msgid "Recreated %d merge conflict"
 msgid_plural "Recreated %d merge conflicts"
 msgstr[0] "�新创建了 %d 个�并冲�"
 msgstr[1] "�新创建了 %d 个�并冲�"
 
-#: builtin/checkout.c:380
+#: builtin/checkout.c:416
 #, 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:387
+#: builtin/checkout.c:423
 #, 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:410 builtin/checkout.c:413 builtin/checkout.c:416
-#: builtin/checkout.c:420
+#: 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' �能在更新路径时使用"
 
-#: builtin/checkout.c:423 builtin/checkout.c:426
+#: builtin/checkout.c:459 builtin/checkout.c:462
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' �能和 %s �时使用"
 
-#: builtin/checkout.c:430
+#: builtin/checkout.c:466
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "�能�时更新路径并切�到分支'%s'。"
 
-#: builtin/checkout.c:434
+#: builtin/checkout.c:470
 #, c-format
 msgid "neither '%s' or '%s' is specified"
 msgstr "'%s' 或 '%s' 都没有指定"
 
-#: builtin/checkout.c:438
+#: builtin/checkout.c:474
 #, c-format
 msgid "'%s' must be used when '%s' is not specified"
 msgstr "未指定 '%2$s' 时，必须使用 '%1$s'"
 
-#: builtin/checkout.c:443 builtin/checkout.c:448
+#: builtin/checkout.c:479 builtin/checkout.c:484
 #, c-format
 msgid "'%s' or '%s' cannot be used with %s"
 msgstr "'%s' 或 '%s' �能和 %s 一起使用"
 
-#: builtin/checkout.c:507 builtin/checkout.c:514
+#: builtin/checkout.c:558 builtin/checkout.c:565
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未�并"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:734
 msgid "you need to resolve your current index first"
 msgstr "您需�先解决当�索引的冲�"
 
-#: builtin/checkout.c:730
+#: builtin/checkout.c:788
 #, c-format
 msgid ""
 "cannot continue with staged changes in the following files:\n"
@@ -10230,51 +12110,51 @@ msgstr ""
 "�能继续，下列文件有暂存的修改：\n"
 "%s"
 
-#: builtin/checkout.c:833
+#: builtin/checkout.c:881
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "�能对 '%s' 执行 reflog �作：%s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:923
 msgid "HEAD is now at"
 msgstr "HEAD 目��于"
 
-#: builtin/checkout.c:879 builtin/clone.c:713
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
 msgid "unable to update HEAD"
 msgstr "�能更新 HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:931
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "�置分支 '%s'\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:934
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已��于 '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:938
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切�并�置分支 '%s'\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:940 builtin/checkout.c:1371
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切�到一个新分支 '%s'\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:942
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切�到分支 '%s'\n"
 
 #  译者：注����导空格
-#: builtin/checkout.c:945
+#: builtin/checkout.c:993
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... �其它 %d 个。\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:999
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -10295,7 +12175,7 @@ msgstr[1] ""
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: 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"
@@ -10322,28 +12202,19 @@ msgstr[1] ""
 " git branch <新分支�> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1053
 msgid "internal error in revision walk"
 msgstr "在版本�历时�到内部错误"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1057
 msgid "Previous HEAD position was"
 msgstr "之�的 HEAD �置是"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
 msgid "You are on a branch yet to be born"
 msgstr "您�于一个尚未�始化的分支"
 
-#: builtin/checkout.c:1176
-msgid "only one reference expected"
-msgstr "预期�有一个引用"
-
-#: builtin/checkout.c:1193
-#, c-format
-msgid "only one reference expected, %d given."
-msgstr "应�有一个引用，�给出了 %d 个"
-
-#: builtin/checkout.c:1230
+#: builtin/checkout.c:1179
 #, c-format
 msgid ""
 "'%s' could be both a local file and a tracking branch.\n"
@@ -10352,37 +12223,70 @@ msgstr ""
 "'%s' 既�以是一个本地文件，也�以是一个跟踪分支。\n"
 "请使用 --（和�选的 --no-guess）�消除歧义"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455
+#: 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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"如果您想�检出一个远程跟踪分支，例如在 'origin' 上的，您�以使用分支\n"
+"全�和 --track 选项：\n"
+"\n"
+"    git checkout --track origin/<�称>\n"
+"\n"
+"如果您总是喜欢使用模糊的简短分支� <�称>，而�喜欢如 'origin' 的远程\n"
+"�称，�以在�置中设置 checkout.defaultRemote=origin。"
+
+#: builtin/checkout.c:1196
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' 匹�多个（%d 个）远程跟踪分支"
+
+#: builtin/checkout.c:1262
+msgid "only one reference expected"
+msgstr "�期望一个引用"
+
+#: builtin/checkout.c:1279
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "应�有一个引用，�给出了 %d 个"
+
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用�是一个树：%s"
 
-#: builtin/checkout.c:1303
+#: builtin/checkout.c:1385
 #, c-format
 msgid "a branch is expected, got tag '%s'"
 msgstr "期望一个分支，得到标签 '%s'"
 
-#: builtin/checkout.c:1305
+#: builtin/checkout.c:1387
 #, c-format
 msgid "a branch is expected, got remote branch '%s'"
 msgstr "期望一个分支，得到远程分支 '%s'"
 
-#: builtin/checkout.c:1306 builtin/checkout.c:1314
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
 #, c-format
 msgid "a branch is expected, got '%s'"
 msgstr "期望一个分支，得到 '%s'"
 
-#: builtin/checkout.c:1309
+#: builtin/checkout.c:1391
 #, c-format
 msgid "a branch is expected, got commit '%s'"
 msgstr "期望一个分支，得到�交 '%s'"
 
-#: builtin/checkout.c:1325
+#: builtin/checkout.c:1407
 msgid ""
 "cannot switch branch while merging\n"
 "Consider \"git merge --quit\" or \"git worktree add\"."
@@ -10390,7 +12294,7 @@ msgstr ""
 "�能在�并时切�分支\n"
 "考虑使用 \"git merge --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1329
+#: builtin/checkout.c:1411
 msgid ""
 "cannot switch branch in the middle of an am session\n"
 "Consider \"git am --quit\" or \"git worktree add\"."
@@ -10398,7 +12302,7 @@ msgstr ""
 "�能在一个 am 会�期间切�分支\n"
 "考虑使用 \"git am --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1333
+#: builtin/checkout.c:1415
 msgid ""
 "cannot switch branch while rebasing\n"
 "Consider \"git rebase --quit\" or \"git worktree add\"."
@@ -10406,7 +12310,7 @@ msgstr ""
 "�能在�基时切�分支\n"
 "考虑使用 \"git rebase --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1337
+#: builtin/checkout.c:1419
 msgid ""
 "cannot switch branch while cherry-picking\n"
 "Consider \"git cherry-pick --quit\" or \"git worktree add\"."
@@ -10414,7 +12318,7 @@ msgstr ""
 "�能在拣选时切�分支\n"
 "考虑使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1341
+#: builtin/checkout.c:1423
 msgid ""
 "cannot switch branch while reverting\n"
 "Consider \"git revert --quit\" or \"git worktree add\"."
@@ -10422,270 +12326,243 @@ msgstr ""
 "�能在还原时切�分支\n"
 "考虑使用 \"git revert --quit\" 或 \"git worktree add\"。"
 
-#: builtin/checkout.c:1345
+#: builtin/checkout.c:1427
 msgid "you are switching branch while bisecting"
 msgstr "您在执行二分查找时切�分支"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1434
 msgid "paths cannot be used with switching branches"
 msgstr "路径�能和切�分支�时使用"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' �能和切�分支�时使用"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: 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' �能和 '%s' �时使用"
 
-#: builtin/checkout.c:1380
+#: builtin/checkout.c:1462
 #, c-format
 msgid "'%s' cannot take <start-point>"
 msgstr "'%s' �带 <起始点>"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1470
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "�能切�分支到一个��交 '%s'"
 
-#: builtin/checkout.c:1395
+#: builtin/checkout.c:1477
 msgid "missing branch or commit argument"
 msgstr "缺少分支或�交�数"
 
-#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
-#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
-#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
-msgid "force progress reporting"
-msgstr "强制显示进度报告"
-
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1520
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三方�并"
 
-#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
 msgid "style"
 msgstr "风格"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1522
 msgid "conflict style (merge or diff3)"
 msgstr "冲�输出风格（merge 或 diff3）"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:503
+#: builtin/checkout.c:1534 builtin/worktree.c:488
 msgid "detach HEAD at named commit"
 msgstr "HEAD 从指定的�交分离"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1535
 msgid "set upstream info for new branch"
 msgstr "为新的分支设置上游信�"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1537
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1539
 msgid "new unparented branch"
 msgstr "新的没有父�交的分支"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1541 builtin/merge.c:301
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1544
 msgid "do not check if another worktree is holding the given ref"
 msgstr "�检查指定的引用是�被其他工作区所�用"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1557
 msgid "checkout our version for unmerged files"
 msgstr "对尚未�并的文件检出我们的版本"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1560
 msgid "checkout their version for unmerged files"
 msgstr "对尚未�并的文件检出他们的版本"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1564
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "对路径��稀�检出的�制"
 
-#: builtin/checkout.c:1533
-msgid "-b, -B and --orphan are mutually exclusive"
-msgstr "-b�-B 和 --orphan 是互斥的"
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c�-%c 和 --orphan 是互斥的"
 
-#: builtin/checkout.c:1536
+#: builtin/checkout.c:1626
 msgid "-p and --overlay are mutually exclusive"
 msgstr "-p 和 --overlay 互斥"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1663
 msgid "--track needs a branch name"
 msgstr "--track 需�一个分支�"
 
-#: builtin/checkout.c:1578
-msgid "missing branch name; try -b"
-msgstr "缺少分支�，�试 -b"
+#: builtin/checkout.c:1668
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "缺少分支�，�试 -%c"
 
-#: builtin/checkout.c:1611
+#: builtin/checkout.c:1700
 #, c-format
 msgid "could not resolve %s"
 msgstr "无法解� %s"
 
-#: builtin/checkout.c:1623
-msgid "you must specify path(s) to restore"
-msgstr "您必须指定一个���的路径"
-
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1716
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1723
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' �是一个�交，�能基于它创建分支 '%s'"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1727
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach �能接收路径�数 '%s'"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file 与 --detach �兼容"
+
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file 与 --patch �兼容"
+
+#: builtin/checkout.c:1752
 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:1666
-#, c-format
-msgid ""
-"'%s' matched more than one remote tracking branch.\n"
-"We found %d remotes with a reference that matched. So we fell back\n"
-"on trying to resolve the argument as a path, but failed there too!\n"
-"\n"
-"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"
-"    git checkout --track origin/<name>\n"
-"\n"
-"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
-"one remote, e.g. the 'origin' remote, consider setting\n"
-"checkout.defaultRemote=origin in your config."
-msgstr ""
-"'%s' 匹�了一个以上的远程跟踪分支。\n"
-"我们�现 %d 个远程仓库具有��分支。所以我们转而�试将这个�数解�为\n"
-"路径，但是也失败了�\n"
-"\n"
-"如果您想�检出一个远程跟踪分支，例如在远程仓库 'origin' 上的，您�以\n"
-"使用分支全�和 --track 选项：\n"
-"\n"
-"    git checkout --track origin/<name>\n"
-"\n"
-"如果您总是喜欢使用模糊的简短分支� <name>，而�喜欢如 'origin' 的远程\n"
-"仓库�，�以在�置中设置 checkout.defaultRemote=origin。"
+#: builtin/checkout.c:1757
+msgid "you must specify path(s) to restore"
+msgstr "您必须指定一个���的路径"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
-#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: 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 "分支"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1784
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1786
 msgid "create/reset and checkout a branch"
 msgstr "创建/�置并检出一个分支"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1787
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"
 
-#: builtin/checkout.c:1697
+#: builtin/checkout.c:1789
 msgid "second guess 'git checkout <no-such-branch>' (default)"
 msgstr "二次猜测 'git checkout <无此分支>'（默认）"
 
-#: builtin/checkout.c:1698
+#: builtin/checkout.c:1790
 msgid "use overlay mode (default)"
 msgstr "使用�加模�（默认）"
 
-#: builtin/checkout.c:1743
+#: builtin/checkout.c:1835
 msgid "create and switch to a new branch"
 msgstr "创建并切�一个新分支"
 
-#: builtin/checkout.c:1745
+#: builtin/checkout.c:1837
 msgid "create/reset and switch to a branch"
 msgstr "创建/�置并切�一个分支"
 
-#: builtin/checkout.c:1747
+#: builtin/checkout.c:1839
 msgid "second guess 'git switch <no-such-branch>'"
 msgstr "二次猜测 'git switch <无此分支>'"
 
-#: builtin/checkout.c:1749
+#: builtin/checkout.c:1841
 msgid "throw away local modifications"
 msgstr "丢弃本地修改"
 
-#: builtin/checkout.c:1781
+#: builtin/checkout.c:1875
 msgid "which tree-ish to checkout from"
 msgstr "�检出哪一个树"
 
-#: builtin/checkout.c:1783
+#: builtin/checkout.c:1877
 msgid "restore the index"
 msgstr "��索引"
 
-#: builtin/checkout.c:1785
+#: builtin/checkout.c:1879
 msgid "restore the working tree (default)"
 msgstr "��工作区（默认）"
 
-#: builtin/checkout.c:1787
+#: builtin/checkout.c:1881
 msgid "ignore unmerged entries"
 msgstr "忽略未�并�目"
 
-#: builtin/checkout.c:1788
+#: builtin/checkout.c:1882
 msgid "use overlay mode"
 msgstr "使用�加模�"
 
-#: builtin/clean.c:28
+#: 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 <模�>] [-x | -X] [--] <路径>..."
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "正删除 %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "将删除 %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "忽略仓库 %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "将忽略仓库 %s\n"
 
-#: builtin/clean.c:36
-#, c-format
-msgid "failed to remove %s"
-msgstr "删除 %s 失败"
-
-#: builtin/clean.c:37
+#: builtin/clean.c:38
 #, c-format
 msgid "could not lstat %s\n"
 msgstr "�能对 %s 调用 lstat\n"
 
-#: builtin/clean.c:301 git-add--interactive.perl:593
+#: builtin/clean.c:300 git-add--interactive.perl:593
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10698,7 +12575,7 @@ msgstr ""
 "foo        - 通过唯一�缀选择一个选项\n"
 "           - （空）什么也�选择\n"
 
-#: builtin/clean.c:305 git-add--interactive.perl:602
+#: builtin/clean.c:304 git-add--interactive.perl:602
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -10719,38 +12596,33 @@ msgstr ""
 "*          - 选择所有选项\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 "嗯（%s）？\n"
 
-#: builtin/clean.c:663
+#: builtin/clean.c:659
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "输入模版以排除�目>> "
 
-#: builtin/clean.c:700
+#: builtin/clean.c:693
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：无法找到和 %s 匹�的�目"
 
-#: builtin/clean.c:721
+#: builtin/clean.c:714
 msgid "Select items to delete"
 msgstr "选择�删除的�目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:755
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "删除 %s [y/N]？"
 
-#: builtin/clean.c:787 git-add--interactive.perl:1763
-#, c-format
-msgid "Bye.\n"
-msgstr "��。\n"
-
-#: builtin/clean.c:795
+#: builtin/clean.c:786
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -10768,231 +12640,234 @@ msgstr ""
 "help                - 显示本帮助\n"
 "?                   - 显示如何在�示符下选择的帮助"
 
-#: builtin/clean.c:822 git-add--interactive.perl:1849
-msgid "*** Commands ***"
-msgstr "*** 命令 ***"
-
-#: builtin/clean.c:823 git-add--interactive.perl:1846
-msgid "What now"
-msgstr "请选择"
-
-#: builtin/clean.c:831
+#: builtin/clean.c:822
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "将删除如下�目："
 msgstr[1] "将删除如下�目："
 
-#: builtin/clean.c:847
+#: builtin/clean.c:838
 msgid "No more files to clean, exiting."
 msgstr "没有�清�的文件，退出。"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:900
 msgid "do not print names of files removed"
 msgstr "�打�删除文件的�称"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:902
 msgid "force"
 msgstr "强制"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:903
 msgid "interactive cleaning"
 msgstr "交互�清除"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:905
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: 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 "模�"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:907
 msgid "add <pattern> to ignore rules"
 msgstr "添加 <模�> 到忽略规则"
 
-#: builtin/clean.c:917
+#: builtin/clean.c:908
 msgid "remove ignored files, too"
 msgstr "也删除忽略的文件"
 
-#: builtin/clean.c:919
+#: builtin/clean.c:910
 msgid "remove only ignored files"
 msgstr "�删除忽略的文件"
 
-#: builtin/clean.c:937
-msgid "-x and -X cannot be used together"
-msgstr "-x 和 -X �能�时使用"
-
-#: builtin/clean.c:941
+#: builtin/clean.c:925
 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:944
+#: builtin/clean.c:928
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
 msgstr ""
 "clean.requireForce 默认为 true 且未�供 -i�-n 或 -f 选项，拒�执行清�动作"
 
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+msgstr "-x 和 -X �能�时使用"
+
 #: builtin/clone.c:45
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "�克隆浅仓库"
+
+#: builtin/clone.c:98
 msgid "don't create a checkout"
 msgstr "�创建一个检出"
 
-#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
 msgid "create a bare repository"
 msgstr "创建一个纯仓库"
 
-#: builtin/clone.c:97
+#: builtin/clone.c:103
 msgid "create a mirror repository (implies bare)"
 msgstr "创建一个镜�仓库（也是纯仓库）"
 
-#: builtin/clone.c:99
+#: builtin/clone.c:105
 msgid "to clone from a local repository"
 msgstr "从本地仓库克隆"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:107
 msgid "don't use local hardlinks, always copy"
 msgstr "�使用本地硬链接，始终�制"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:109
 msgid "setup as shared repository"
 msgstr "设置为共享仓库"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "pathspec"
 msgstr "路径规格"
 
-#: builtin/clone.c:106
+#: builtin/clone.c:111
 msgid "initialize submodules in the clone"
 msgstr "在克隆时�始化�模组"
 
-#: builtin/clone.c:109
+#: builtin/clone.c:115
 msgid "number of submodules cloned in parallel"
 msgstr "并�克隆的�模组的数�"
 
-#: builtin/clone.c:110 builtin/init-db.c:486
+#: builtin/clone.c:116 builtin/init-db.c:539
 msgid "template-directory"
 msgstr "模�目录"
 
-#: builtin/clone.c:111 builtin/init-db.c:487
+#: builtin/clone.c:117 builtin/init-db.c:540
 msgid "directory from which templates will be used"
 msgstr "模�目录将被使用"
 
-#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: 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 "�考仓库"
 
-#: builtin/clone.c:117 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: 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 "仅在克隆时�考 --reference 指�的本地仓库"
 
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:320
+#: 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 "�称"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:125
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "使用 <�称> 而�是 'origin' 去跟踪上游"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:127
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "检出 <分支> 而�是远程 HEAD"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:129
 msgid "path to git-upload-pack on the remote"
 msgstr "远程 git-upload-pack 路径"
 
-#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:130 builtin/fetch.c:180 builtin/grep.c:862
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "深度"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:131
 msgid "create a shallow clone of that depth"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/pull.c:211
 msgid "time"
 msgstr "时间"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:133
 msgid "create a shallow clone since a specific time"
 msgstr "从一个特定时间创建一个浅克隆"
 
-#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
-#: builtin/rebase.c:1417
+#: 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 "版本"
 
-#: builtin/clone.c:129 builtin/fetch.c:172
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "深化浅克隆的历�，除了特定版本"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
 msgid "clone only one branch, HEAD or --branch"
 msgstr "�克隆一个分支�HEAD 或 --branch"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:139
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "��克隆任何标签，并且�续获��作也�下载它们"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:141
 msgid "any cloned submodules will be shallow"
 msgstr "�模组将以浅下载模�克隆"
 
-#: builtin/clone.c:136 builtin/init-db.c:495
+#: builtin/clone.c:142 builtin/init-db.c:548
 msgid "gitdir"
 msgstr "git目录"
 
-#: builtin/clone.c:137 builtin/init-db.c:496
+#: builtin/clone.c:143 builtin/init-db.c:549
 msgid "separate git dir from working tree"
 msgstr "git目录和工作区分离"
 
-#: builtin/clone.c:138
+#: builtin/clone.c:144
 msgid "key=value"
 msgstr "key=value"
 
-#: builtin/clone.c:139
+#: builtin/clone.c:145
 msgid "set config inside the new repository"
 msgstr "在新仓库中设置�置信�"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:172
+#: 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 "server-specific"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:173
+#: 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 "传输选项"
 
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
-#: builtin/push.c:573
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: builtin/push.c:576
 msgid "use IPv4 addresses only"
 msgstr "�使用 IPv4 地�"
 
-#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
-#: builtin/push.c:575
+#: builtin/clone.c:150 builtin/fetch.c:205 builtin/pull.c:237
+#: builtin/push.c:578
 msgid "use IPv6 addresses only"
 msgstr "�使用 IPv6 地�"
 
-#: builtin/clone.c:148
+#: builtin/clone.c:154
 msgid "any cloned submodules will use their remote-tracking branch"
 msgstr "任何克隆的�模组将使用它们的远程跟踪分支"
 
-#: builtin/clone.c:284
+#: builtin/clone.c:156
+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"
@@ -11000,42 +12875,42 @@ msgstr ""
 "无法猜到目录�。\n"
 "请在命令行指定一个目录"
 
-#: builtin/clone.c:337
+#: builtin/clone.c:345
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: �能为 '%s' 添加一个备用：%s\n"
 
-#: builtin/clone.c:410
+#: builtin/clone.c:418
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且�是一个目录"
 
-#: builtin/clone.c:427
+#: builtin/clone.c:436
 #, c-format
 msgid "failed to start iterator over '%s'"
 msgstr "无法在 '%s' 上�动迭代器"
 
-#: builtin/clone.c:457
+#: builtin/clone.c:467
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "创建链接 '%s' 失败"
 
-#: builtin/clone.c:461
+#: builtin/clone.c:471
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "拷�文件至 '%s' 失败"
 
-#: builtin/clone.c:466
+#: builtin/clone.c:476
 #, c-format
 msgid "failed to iterate over '%s'"
 msgstr "无法在 '%s' 上迭代"
 
-#: builtin/clone.c:491
+#: builtin/clone.c:503
 #, c-format
 msgid "done.\n"
 msgstr "完�。\n"
 
-#: builtin/clone.c:505
+#: builtin/clone.c:517
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -11045,130 +12920,148 @@ msgstr ""
 "您�以通过 'git status' 检查哪些已被检出，然�使用命令\n"
 "'git restore --source=HEAD :/' �试\n"
 
-#: builtin/clone.c:582
+#: builtin/clone.c:594
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "�能�现�克隆的远程分支 %s。"
 
-#: builtin/clone.c:701
+#: builtin/clone.c:713
 #, c-format
 msgid "unable to update %s"
 msgstr "�能更新 %s"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "无法�始化稀�检出"
+
+#: builtin/clone.c:784
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "远程 HEAD 指�一个�存在的引用，无法检出。\n"
 
-#: builtin/clone.c:782
+#: builtin/clone.c:816
 msgid "unable to checkout working tree"
 msgstr "�能检出工作区"
 
-#: builtin/clone.c:832
+#: builtin/clone.c:894
 msgid "unable to write parameters to config file"
 msgstr "无法将�数写入�置文件"
 
-#: builtin/clone.c:895
+#: builtin/clone.c:957
 msgid "cannot repack to clean up"
 msgstr "无法执行 repack �清�"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:959
 msgid "cannot unlink temporary alternates file"
 msgstr "无法删除临时的 alternates 文件"
 
-#: builtin/clone.c:937 builtin/receive-pack.c:1948
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
 msgid "Too many arguments."
 msgstr "太多�数。"
 
-#: builtin/clone.c:941
+#: builtin/clone.c:1005
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库�克隆。"
 
-#: builtin/clone.c:954
+#: builtin/clone.c:1018
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare 和 --origin %s 选项�兼容。"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:1021
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare 和 --separate-git-dir 选项�兼容。"
 
-#: builtin/clone.c:970
+#: builtin/clone.c:1035
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "仓库 '%s' �存在"
 
-#: builtin/clone.c:976 builtin/fetch.c:1790
+#: builtin/clone.c:1039 builtin/fetch.c:2014
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s �是一个正数"
 
-#: builtin/clone.c:986
+#: builtin/clone.c:1049
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目标路径 '%s' 已�存在，并且�是一个空目录。"
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1055
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "仓库路径 '%s' 已�存在，并且�是一个空目录。"
+
+#: builtin/clone.c:1069
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已�存在。"
 
-#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
-#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
+#: 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 "�能为 '%s' 创建先导目录"
 
-#: builtin/clone.c:1016
+#: builtin/clone.c:1089
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "�能创建工作区目录 '%s'"
 
-#: builtin/clone.c:1036
+#: builtin/clone.c:1109
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "克隆到纯仓库 '%s'...\n"
 
-#: builtin/clone.c:1038
+#: builtin/clone.c:1111
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1135
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 和 --reference 以� --reference-if-able �兼容"
 
-#: builtin/clone.c:1123
+#: builtin/clone.c:1188 builtin/remote.c:200 builtin/remote.c:705
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' �是一个有效的远程�称"
+
+#: builtin/clone.c:1229
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1125
+#: builtin/clone.c:1231
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1127
+#: builtin/clone.c:1233
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1129
+#: builtin/clone.c:1235
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter 在本地克隆时被忽略，请改用 file:// �议。"
 
-#: builtin/clone.c:1132
+#: builtin/clone.c:1240
 msgid "source repository is shallow, ignoring --local"
 msgstr "�仓库是浅克隆，忽略 --local"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1245
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c:1212 builtin/clone.c:1220
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "远程传输报告错误"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "远程分支 %s 在上游 %s 未�现"
 
-#: builtin/clone.c:1223
+#: builtin/clone.c:1347
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空仓库。"
 
@@ -11185,25 +13078,129 @@ msgid "layout to use"
 msgstr "�使用的布局"
 
 #: builtin/column.c:30
-msgid "Maximum width"
+msgid "maximum width"
 msgstr "最大宽度"
 
 #: builtin/column.c:31
-msgid "Padding space on left border"
+msgid "padding space on left border"
 msgstr "左边框的填充空间"
 
 #: builtin/column.c:32
-msgid "Padding space on right border"
+msgid "padding space on right border"
 msgstr "�边框的填充空间"
 
 #: builtin/column.c:33
-msgid "Padding space between columns"
+msgid "padding space between columns"
 msgstr "两列之间的填充空间"
 
 #: builtin/column.c:51
 msgid "--command must be the first argument"
 msgstr "--command 必须是第一个�数"
 
+#: 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 <对象目录>] [--shallow] [--"
+"[no-]progress]"
+
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+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 <对象目录>] [--append] [--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:1779
+msgid "dir"
+msgstr "目录"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr "�存图形的对象目录"
+
+#: builtin/commit-graph.c:83
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "如果�交图形被拆分，�验�头一个文件"
+
+#: builtin/commit-graph.c:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "无法打开�交图形 '%s'"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "未能识别的 --split �数，%s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "�外的��六进制对象 ID：%s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "无效对象：%s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "开始�历所有引用"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "从标准输入中的包索引文件列表中扫��交"
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr "从标准输入中的�交开始扫�"
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr "包� commit-graph 文件中已有所有�交"
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr "�用�更路径的计算"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "�许写一个增��交图形文件"
+
+#: builtin/commit-graph.c:228
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "在�基本拆分�交图形中的最大�交数"
+
+#: builtin/commit-graph.c:230
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "一个拆分�交图形的两个级别之间的最大比率"
+
+#: builtin/commit-graph.c:232
+msgid "only expire files older than a given date-time"
+msgstr "�让早于给定时间的文件过期"
+
+#: builtin/commit-graph.c:234
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr "�计算的�更路径布隆过滤器的最大数"
+
+#: builtin/commit-graph.c:255
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "�能�时使用 --reachable�--stdin-commits 或 --stdin-packs"
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr "正从标准输入收集�交"
+
 #: builtin/commit-tree.c:18
 msgid ""
 "git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
@@ -11217,7 +13214,7 @@ msgstr ""
 msgid "duplicate parent %s ignored"
 msgstr "忽略��的父�交 %s"
 
-#: builtin/commit-tree.c:56 builtin/commit-tree.c:136 builtin/log.c:525
+#: 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"
@@ -11245,13 +13242,13 @@ msgstr "父�交"
 msgid "id of a parent commit object"
 msgstr "父�交对象 ID"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: 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 "说明"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
 msgid "commit message"
 msgstr "�交说明"
 
@@ -11259,8 +13256,8 @@ msgstr "�交说明"
 msgid "read commit log message from file"
 msgstr "从文件中读��交说明"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: 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 "GPG �交签�"
 
@@ -11304,10 +13301,14 @@ msgstr ""
 "\n"
 
 #: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "�则，请使用 'git rebase --skip'\n"
+
+#: builtin/commit.c:66
 msgid "Otherwise, please use 'git cherry-pick --skip'\n"
 msgstr "�则，请使用 'git cherry-pick --skip'\n"
 
-#: builtin/commit.c:66
+#: builtin/commit.c:69
 msgid ""
 "and then use:\n"
 "\n"
@@ -11328,463 +13329,544 @@ msgstr ""
 "    git cherry-pick --skip\n"
 "\n"
 
-#: builtin/commit.c:315
+#: builtin/commit.c:324
 msgid "failed to unpack HEAD tree object"
 msgstr "解包 HEAD 树对象失败"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:360
+msgid "--pathspec-from-file with -a does not make sense"
+msgstr "--pathspec-from-file 和 -a 在一起没有�义"
+
+#: builtin/commit.c:374
+msgid "No paths with --include/--only does not make sense."
+msgstr "�数 --include/--only �跟路径没有�义。"
+
+#: builtin/commit.c:386
 msgid "unable to create temporary index"
 msgstr "�能创建临时索引"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:395
 msgid "interactive add failed"
 msgstr "交互�添加失败"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:410
 msgid "unable to update temporary index"
 msgstr "无法更新临时索引"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:412
 msgid "Failed to update main cache tree"
 msgstr "�能更新树的主缓存"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:489
 msgid "cannot do a partial commit during a merge."
 msgstr "在�并过程中�能�部分�交。"
 
-#: builtin/commit.c:457
+#: builtin/commit.c:491
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中�能�部分�交。"
 
-#: builtin/commit.c:465
+#: builtin/commit.c:493
+msgid "cannot do a partial commit during a rebase."
+msgstr "在�基过程中�能�部分�交。"
+
+#: builtin/commit.c:501
 msgid "cannot read the index"
 msgstr "无法读�索引"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:520
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:618
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "�交 '%s' 缺少作者信�"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:620
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "�交 '%s' 有格�错误的作者信�"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:639
 msgid "malformed --author parameter"
 msgstr "格�错误的 --author �数"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:692
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "无法选择一个未被当��交说明使用的注释字符"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:746 builtin/commit.c:780 builtin/commit.c:1165
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "�能查询�交 %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:758 builtin/shortlog.c:413
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读�日志信�）\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:760
 msgid "could not read log from standard input"
 msgstr "�能从标准输入中读�日志信�"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:764
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "�能读�日志文件 '%s'"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "�能将 -m 和 --fixup 组�使用：%s"
+
+#: builtin/commit.c:813 builtin/commit.c:829
 msgid "could not read SQUASH_MSG"
 msgstr "�能读� SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:820
 msgid "could not read MERGE_MSG"
 msgstr "�能读� MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:880
 msgid "could not write commit template"
 msgstr "�能写�交模版"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:893
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a merge.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
-msgstr ""
-"\n"
-"似乎您正在�一个�并�交。如果�对，请删除文件\n"
-"\t%s\n"
-"然��试。\n"
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored.\n"
+msgstr "请为您的�更输入�交说明。以 '%c' 开始的行将被忽略。\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:895
 #, c-format
 msgid ""
-"\n"
-"It looks like you may be committing a cherry-pick.\n"
-"If this is not correct, please remove the file\n"
-"\t%s\n"
-"and try again.\n"
+"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"
-"似乎您正在�一个拣选�交。如果�对，请删除文件\n"
-"\t%s\n"
-"然��试。\n"
+"请为您的�更输入�交说明。以 '%c' 开始的行将被忽略，而一个空的�交\n"
+"说明将会终止�交。\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:899
 #, 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 ""
-"请为您的�更输入�交说明。以 '%c' 开始的行将被忽略，而一个空的�交\n"
-"说明将会终止�交。\n"
+"请为您的�更输入�交说明。以 '%c' 开始的行将被�留，如果您愿�\n"
+"也�以删除它们。\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:903
 #, 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"
+"请为您的�更输入�交说明。以 '%c' 开始的行将被�留，如果您愿�\n"
 "也�以删除它们。一个空的�交说明将会终止�交。\n"
 
+#: 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"
+"似乎您正在�一个�并�交。如果�对，请�行\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"然��试。\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"
+"似乎您正在�一个拣选�交。如果�对，请�行\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"然��试。\n"
+
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:872
+#: builtin/commit.c:947
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:880
+#: builtin/commit.c:955
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  译者：为��在输出中对�，注�调整�中空格�
-#: builtin/commit.c:887
+#: builtin/commit.c:962
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s�交者：%.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:980
 msgid "Cannot read index"
 msgstr "无法读�索引"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "无法将尾注传递给 --trailers"
+
+#: builtin/commit.c:1065
 msgid "Error building trees"
 msgstr "无法创建树对象"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1079 builtin/tag.c:319
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或 -F 选项�供�交说明。\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1123
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' �是 '姓� <邮箱>' 格�，且未能在现有作者中找到匹�"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1137
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "无效的忽略模� '%s'"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1155 builtin/commit.c:1448
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未追踪文件�数 '%s'"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1195
 msgid "--long and -z are incompatible"
 msgstr "--long 和 -z 选项�兼容"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1226
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "您正处于一个�并过程中 -- 无法改写说明。"
+
+#: builtin/commit.c:1228
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "您正处于一个拣选过程中 -- 无法改写说明。"
+
+#: builtin/commit.c:1231
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr "�能将 --fixup 的改写说明选项和路径 '%s' 组�使用"
+
+#: builtin/commit.c:1233
+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:1252
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "�时使用 --reset-author 和 --author 没有�义"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1261
 msgid "You have nothing to amend."
 msgstr "您没有�修补的�交。"
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1264
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个�并过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1266
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补�交。"
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1268
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "您正处于一个�基过程中 -- 无法修补�交。"
+
+#: builtin/commit.c:1271
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup �能�时使用"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1281
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "�能用一个 -c/-C/-F/--fixup 选项。"
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1283
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "选项 -m �能和 -c/-C/-F �时使用。"
 
-#: builtin/commit.c:1183
+#: 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:1200
+#: 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:1202
-msgid "No paths with --include/--only does not make sense."
-msgstr "�数 --include/--only �跟路径没有�义。"
+#: builtin/commit.c:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "未知选项：--fixup=%s:%s"
 
-#: builtin/commit.c:1208
+#: builtin/commit.c:1352
 #, c-format
 msgid "paths '%s ...' with -a does not make sense"
 msgstr "路径  '%s ...' 和 -a 选项�时使用没有�义"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1483 builtin/commit.c:1652
 msgid "show status concisely"
 msgstr "以简�的格�显示状�"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1485 builtin/commit.c:1654
 msgid "show branch information"
 msgstr "显示分支信�"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1487
 msgid "show stash information"
 msgstr "显示贮�区信�"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1489 builtin/commit.c:1656
 msgid "compute full ahead/behind values"
 msgstr "计算完整的领先/��值"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1491
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
-#: builtin/worktree.c:650
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
 msgid "machine-readable output"
 msgstr "机器�读的输出"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1494 builtin/commit.c:1660
 msgid "show status in long format (default)"
 msgstr "以长格�显示状�（默认）"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1497 builtin/commit.c:1663
 msgid "terminate entries with NUL"
 msgstr "�目以 NUL 字符结尾"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
-#: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
+#: 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 "模�"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1500 builtin/commit.c:1666
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模��的�选�数：all�normal�no。（默认：all）"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1504
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr ""
 "显示已忽略的文件，�选模�：traditional�matching�no。（默认：traditional）"
 
-#: builtin/commit.c:1362 parse-options.h:188
+#: builtin/commit.c:1506 parse-options.h:193
 msgid "when"
 msgstr "何时"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1507
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr ""
 "忽略�模组的更改，“何时�的�选�数：all�dirty�untracked。（默认：all）"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1509
 msgid "list untracked files in columns"
 msgstr "以列的方�显示未跟踪的文件"
 
-#: builtin/commit.c:1366
+#: builtin/commit.c:1510
 msgid "do not detect renames"
 msgstr "�检测�命�"
 
-#: builtin/commit.c:1368
+#: builtin/commit.c:1512
 msgid "detect renames, optionally set similarity index"
 msgstr "检测�命�，�以设置索引相似度"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1535
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "�支�已忽略和未跟踪文件�数的组�"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1617
 msgid "suppress summary after successful commit"
 msgstr "�交�功��显示概述信�"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1618
 msgid "show diff in commit message template"
 msgstr "在�交说明模�里显示差异"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1620
 msgid "Commit message options"
 msgstr "�交说明选项"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
 msgid "read message from file"
 msgstr "从文件中读��交说明"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1622
 msgid "override author for commit"
 msgstr "�交时覆盖作者"
 
-#: builtin/commit.c:1499 builtin/gc.c:538
+#: builtin/commit.c:1623 builtin/gc.c:550
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1623
 msgid "override date for commit"
 msgstr "�交时覆盖日期"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
 msgid "commit"
 msgstr "�交"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1625
 msgid "reuse and edit message from specified commit"
 msgstr "�用并编辑指定�交的�交说明"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1626
 msgid "reuse message from specified commit"
 msgstr "�用指定�交的�交说明"
 
-#: builtin/commit.c:1503
-msgid "use autosquash formatted message to fixup specified commit"
-msgstr "使用 autosquash 格�的�交说明用以修正指定的�交"
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+#: builtin/commit.c:1631
+msgid "[(amend|reword):]commit"
+msgstr "[(amend|reword):]�交"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1631
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
+msgstr "使用自动挤压格�的�交说明对指定的�交进行修正�修补或改写说明"
+
+#: builtin/commit.c:1632
 msgid "use autosquash formatted message to squash specified commit"
-msgstr "使用 autosquash 格�的�交说明用以压缩至指定的�交"
+msgstr "使用自动挤压格�的�交说明用以挤压至指定的�交"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1633
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该�交的作者改为我（和 -C/-c/--amend �数共用）"
 
-#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
-msgid "add Signed-off-by:"
-msgstr "添加 Signed-off-by: 签�"
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "尾注"
 
-#: builtin/commit.c:1507
+#: 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
+msgid "add a Signed-off-by trailer"
+msgstr "添加 Signed-off-by 尾注"
+
+#: builtin/commit.c:1636
 msgid "use specified template file"
 msgstr "使用指定的模�文件"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1637
 msgid "force edit of commit"
 msgstr "强制编辑�交"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1639
 msgid "include status in commit message template"
 msgstr "在�交说明模�里包�状�信�"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1644
 msgid "Commit contents options"
 msgstr "�交内容选项"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1645
 msgid "commit all changed files"
 msgstr "�交所有改动的文件"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1646
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待�交"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1647
 msgid "interactively add files"
 msgstr "交互�添加文件"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1648
 msgid "interactively add changes"
 msgstr "交互�添加�更"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1649
 msgid "commit only specified files"
 msgstr "��交指定的文件"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1650
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "绕过 pre-commit 和 commit-msg 钩�"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1651
 msgid "show what would be committed"
 msgstr "显示将��交的内容"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1664
 msgid "amend previous commit"
 msgstr "修改先�的�交"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1665
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩�"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1672
 msgid "ok to record an empty change"
 msgstr "�许一个空�交"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1674
 msgid "ok to record a change with an empty message"
 msgstr "�许空的�交说明"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1750
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "��的 MERGE_HEAD 文件（%s）"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1757
 msgid "could not read MERGE_MODE"
 msgstr "�能读� MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1778
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "�能读��交说明：%s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1785
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止�交因为�交说明为空。\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1790
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止�交；您未更改�自模版的�交说明。\n"
 
-#: builtin/commit.c:1688
+#: builtin/commit.c:1801
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "因�交说明的正文为空而终止�交。\n"
+
+#: 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"
@@ -11793,284 +13875,221 @@ msgstr ""
 "仓库已更新，但无法写 new_index 文件。检查是��盘已满或\n"
 "�盘��已耗尽，然�执行 \"git restore --staged :/\" ��。"
 
-#: builtin/commit-graph.c:11
-msgid "git commit-graph [--object-dir <objdir>]"
-msgstr "git commit-graph [--object-dir <对象目录>]"
-
-#: builtin/commit-graph.c:12 builtin/commit-graph.c:24
-msgid "git commit-graph read [--object-dir <objdir>]"
-msgstr "git commit-graph read [--object-dir <对象目录>]"
-
-#: builtin/commit-graph.c:13 builtin/commit-graph.c:19
-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:29
-msgid ""
-"git commit-graph write [--object-dir <objdir>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-msgstr ""
-"git commit-graph write [--object-dir <对象目录>] [--append|--split] [--"
-"reachable|--stdin-packs|--stdin-commits] [--[no-]progress] <split options>"
-
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
-#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
-#: builtin/log.c:1585
-msgid "dir"
-msgstr "目录"
-
-#: builtin/commit-graph.c:56 builtin/commit-graph.c:108
-#: builtin/commit-graph.c:171 builtin/commit-graph.c:255
-msgid "The object directory to store the graph"
-msgstr "�存图形的对象目录"
-
-#: builtin/commit-graph.c:58
-msgid "if the commit-graph is split, only verify the tip file"
-msgstr "如果�交图形被拆分，�验�头一个文件"
-
-#: builtin/commit-graph.c:80 builtin/commit-graph.c:125
-#, c-format
-msgid "Could not open commit-graph '%s'"
-msgstr "无法打开�交图形 '%s'"
-
-#: builtin/commit-graph.c:173
-msgid "start walk at all refs"
-msgstr "开始�历所有引用"
-
-#: builtin/commit-graph.c:175
-msgid "scan pack-indexes listed by stdin for commits"
-msgstr "从标准输入中的包索引文件列表中扫��交"
-
-#: builtin/commit-graph.c:177
-msgid "start walk at commits listed by stdin"
-msgstr "从标准输入中的�交开始扫�"
-
-#: builtin/commit-graph.c:179
-msgid "include all commits already in the commit-graph file"
-msgstr "包� commit-graph 文件中已有所有�交"
-
-#: builtin/commit-graph.c:182
-msgid "allow writing an incremental commit-graph file"
-msgstr "�许写一个增��交图形文件"
-
-#: builtin/commit-graph.c:184 builtin/commit-graph.c:188
-msgid "maximum number of commits in a non-base split commit-graph"
-msgstr "在�基本拆分�交图形中的最大�交数"
-
-#: builtin/commit-graph.c:186
-msgid "maximum ratio between two levels of a split commit-graph"
-msgstr "一个拆分�交图形的两个级别之间的最大比率"
-
-#: builtin/commit-graph.c:204
-msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
-msgstr "�能�时使用 --reachable�--stdin-commits 或 --stdin-packs"
-
 #: builtin/config.c:11
 msgid "git config [<options>]"
 msgstr "git config [<选项>]"
 
-#: builtin/config.c:103 builtin/env--helper.c:23
+#: builtin/config.c:109 builtin/env--helper.c:27
 #, c-format
 msgid "unrecognized --type argument, %s"
 msgstr "未能识别的 --type �数，%s"
 
-#: builtin/config.c:115
+#: builtin/config.c:121
 msgid "only one type at a time"
 msgstr "一次�能一个类型"
 
-#: builtin/config.c:124
+#: builtin/config.c:130
 msgid "Config file location"
 msgstr "�置文件�置"
 
-#: builtin/config.c:125
+#: builtin/config.c:131
 msgid "use global config file"
 msgstr "使用全局�置文件"
 
-#: builtin/config.c:126
+#: builtin/config.c:132
 msgid "use system config file"
 msgstr "使用系统级�置文件"
 
-#: builtin/config.c:127
+#: builtin/config.c:133
 msgid "use repository config file"
 msgstr "使用仓库级�置文件"
 
-#: builtin/config.c:128
+#: builtin/config.c:134
 msgid "use per-worktree config file"
 msgstr "使用工作区级别的�置文件"
 
-#: builtin/config.c:129
+#: builtin/config.c:135
 msgid "use given config file"
 msgstr "使用指定的�置文件"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "blob-id"
 msgstr "数�对象 ID"
 
-#: builtin/config.c:130
+#: builtin/config.c:136
 msgid "read config from given blob object"
 msgstr "从给定的数�对象读��置"
 
-#: builtin/config.c:131
+#: builtin/config.c:137
 msgid "Action"
 msgstr "�作"
 
-#: builtin/config.c:132
-msgid "get value: name [value-regex]"
-msgstr "获�值：name [value-regex]"
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "获�值：�称 [值模�]"
 
-#: builtin/config.c:133
-msgid "get all values: key [value-regex]"
-msgstr "获得所有的值：key [value-regex]"
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "获得所有的值：键 [值模�]"
 
-#: builtin/config.c:134
-msgid "get values for regexp: name-regex [value-regex]"
-msgstr "根�正则表达�获得值：name-regex [value-regex]"
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "根�正则表达�获得值：�称正则 [值模�]"
 
-#: builtin/config.c:135
+#: builtin/config.c:141
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "获得 URL �值：section[.var] URL"
 
-#: builtin/config.c:136
-msgid "replace all matching variables: name value [value_regex]"
-msgstr "替�所有匹�的��：name value [value_regex]"
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "替�所有匹�的��：�称 值 [值模�]"
 
-#: builtin/config.c:137
+#: builtin/config.c:143
 msgid "add a new variable: name value"
-msgstr "添加一个新的��：name value"
+msgstr "添加一个新的��：�称 值"
 
-#: builtin/config.c:138
-msgid "remove a variable: name [value-regex]"
-msgstr "删除一个��：name [value-regex]"
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "删除一个��：�称 [值模�]"
 
-#: builtin/config.c:139
-msgid "remove all matches: name [value-regex]"
-msgstr "删除所有匹�项：name [value-regex]"
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "删除所有匹�项：�称 [值模�]"
 
-#: builtin/config.c:140
+#: builtin/config.c:146
 msgid "rename section: old-name new-name"
 msgstr "�命��节：old-name new-name"
 
-#: builtin/config.c:141
+#: builtin/config.c:147
 msgid "remove a section: name"
 msgstr "删除一个�节：name"
 
-#: builtin/config.c:142
+#: builtin/config.c:148
 msgid "list all"
 msgstr "列出所有"
 
-#: builtin/config.c:143
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "在比较值与 '值模�' 时，使用字符串字�比较"
+
+#: builtin/config.c:150
 msgid "open an editor"
 msgstr "打开一个编辑器"
 
-#: builtin/config.c:144
+#: builtin/config.c:151
 msgid "find the color configured: slot [default]"
 msgstr "获得�置的颜色：�置 [默认]"
 
-#: builtin/config.c:145
+#: builtin/config.c:152
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "获得颜色设置：�置 [stdout-is-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:153
 msgid "Type"
 msgstr "类型"
 
-#: builtin/config.c:147 builtin/env--helper.c:38
+#: builtin/config.c:154 builtin/env--helper.c:43
 msgid "value is given this type"
 msgstr "�值为该类型"
 
-#: builtin/config.c:148
+#: builtin/config.c:155
 msgid "value is \"true\" or \"false\""
 msgstr "值是 \"true\" 或 \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:156
 msgid "value is decimal number"
 msgstr "值是�进制数"
 
-#: builtin/config.c:150
+#: builtin/config.c:157
 msgid "value is --bool or --int"
-msgstr "值是 --bool or --int"
+msgstr "值是 --bool 或 --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "值是 --bool 或字符串"
+
+#: builtin/config.c:159
 msgid "value is a path (file or directory name)"
 msgstr "值是一个路径（文件或目录�）"
 
-#: builtin/config.c:152
+#: builtin/config.c:160
 msgid "value is an expiry date"
 msgstr "值是一个到期日期"
 
-#: builtin/config.c:153
+#: builtin/config.c:161
 msgid "Other"
 msgstr "其它"
 
-#: builtin/config.c:154
+#: builtin/config.c:162
 msgid "terminate values with NUL byte"
 msgstr "终止值是 NUL 字节"
 
-#: builtin/config.c:155
+#: builtin/config.c:163
 msgid "show variable names only"
 msgstr "�显示���"
 
-#: builtin/config.c:156
+#: builtin/config.c:164
 msgid "respect include directives on lookup"
 msgstr "查询时�照 include 指令递归查找"
 
-#: builtin/config.c:157
+#: builtin/config.c:165
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "显示�置的��（文件�标准输入�数�对象，或命令行）"
 
-#: builtin/config.c:158 builtin/env--helper.c:40
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr "显示�置的作用域（工作区�本地�全局�系统�命令）"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
 msgid "value"
 msgstr "�值"
 
-#: builtin/config.c:158
+#: builtin/config.c:167
 msgid "with --get, use default value when missing entry"
 msgstr "使用 --get �数，当缺少设置时使用默认值"
 
-#: builtin/config.c:172
+#: builtin/config.c:181
 #, c-format
 msgid "wrong number of arguments, should be %d"
 msgstr "错误的�数个数，应该为 %d 个"
 
-#: builtin/config.c:174
+#: builtin/config.c:183
 #, c-format
 msgid "wrong number of arguments, should be from %d to %d"
 msgstr "错误的�数个数，应该为从 %d 个到 %d 个"
 
-#: builtin/config.c:308
+#: builtin/config.c:339
 #, c-format
 msgid "invalid key pattern: %s"
 msgstr "无效键�模�：%s"
 
-#: builtin/config.c:344
+#: builtin/config.c:377
 #, c-format
 msgid "failed to format default config value: %s"
 msgstr "格�化默认�置值失败：%s"
 
-#: builtin/config.c:401
+#: builtin/config.c:441
 #, c-format
 msgid "cannot parse color '%s'"
 msgstr "无法解�颜色 '%s'"
 
-#: builtin/config.c:443
+#: builtin/config.c:483
 msgid "unable to parse default color value"
 msgstr "无法解�默认颜色值"
 
-#: builtin/config.c:496 builtin/config.c:742
+#: builtin/config.c:536 builtin/config.c:833
 msgid "not in a git directory"
 msgstr "�在 git 仓库中"
 
-#: builtin/config.c:499
+#: builtin/config.c:539
 msgid "writing to stdin is not supported"
 msgstr "�支�写到标准输入"
 
-#: builtin/config.c:502
+#: builtin/config.c:542
 msgid "writing config blobs is not supported"
 msgstr "�支�写到�置数�对象"
 
-#: builtin/config.c:587
+#: builtin/config.c:627
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -12085,23 +14104,27 @@ msgstr ""
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:611
+#: builtin/config.c:652
 msgid "only one config file at a time"
 msgstr "一次�能有一个�置文件"
 
-#: builtin/config.c:616
+#: builtin/config.c:658
 msgid "--local can only be used inside a git repository"
-msgstr "--local �能在一个仓库内使用"
+msgstr "--local �能在 git 仓库内使用"
 
-#: builtin/config.c:619
+#: builtin/config.c:660
 msgid "--blob can only be used inside a git repository"
-msgstr "--blob �能在一个仓库内使用"
+msgstr "--blob �能在 git 仓库内使用"
+
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree �能在 git 仓库内使用"
 
-#: builtin/config.c:638
+#: builtin/config.c:684
 msgid "$HOME not set"
 msgstr "$HOME 未设置"
 
-#: builtin/config.c:658
+#: builtin/config.c:708
 msgid ""
 "--worktree cannot be used with multiple working trees unless the config\n"
 "extension worktreeConfig is enabled. Please read \"CONFIGURATION FILE\"\n"
@@ -12110,51 +14133,55 @@ msgstr ""
 "�能和多个工作区一起使用 --worktree，除��用 worktreeConfig �置扩展。\n"
 "详情请阅读“git help worktree�的“CONFIGURATION FILE��节"
 
-#: builtin/config.c:688
+#: builtin/config.c:743
 msgid "--get-color and variable type are incoherent"
 msgstr "--get-color 和��类型�兼容"
 
-#: builtin/config.c:693
+#: builtin/config.c:748
 msgid "only one action at a time"
 msgstr "一次�能有一个动作"
 
-#: builtin/config.c:706
+#: builtin/config.c:761
 msgid "--name-only is only applicable to --list or --get-regexp"
 msgstr "--name-only 仅适用于 --list 或 --get-regexp"
 
-#: builtin/config.c:712
+#: builtin/config.c:767
 msgid ""
 "--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
 "list"
 msgstr "--show-origin 仅适用于 --get�--get-all�--get-regexp 和 --list"
 
-#: builtin/config.c:718
+#: builtin/config.c:773
 msgid "--default is only applicable to --get"
 msgstr "--default 仅适用于 --get"
 
-#: builtin/config.c:731
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value 仅适用于有 '值模�'"
+
+#: builtin/config.c:822
 #, c-format
 msgid "unable to read config file '%s'"
 msgstr "无法读��置文件 '%s'"
 
-#: builtin/config.c:734
+#: builtin/config.c:825
 msgid "error processing config file(s)"
 msgstr "处��置文件出错"
 
-#: builtin/config.c:744
+#: builtin/config.c:835
 msgid "editing stdin is not supported"
 msgstr "�支�编辑标准输入"
 
-#: builtin/config.c:746
+#: builtin/config.c:837
 msgid "editing blobs is not supported"
 msgstr "�支�编辑数�对象"
 
-#: builtin/config.c:760
+#: builtin/config.c:851
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "�能创建�置文件 %s"
 
-#: builtin/config.c:773
+#: builtin/config.c:864
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -12163,7 +14190,7 @@ msgstr ""
 "无法用一个值覆盖多个值\n"
 "       使用一个正则表达��--add 或 --replace-all �修改 %s。"
 
-#: builtin/config.c:847 builtin/config.c:858
+#: builtin/config.c:943 builtin/config.c:954
 #, c-format
 msgid "no such section: %s"
 msgstr "无此�节：%s"
@@ -12176,6 +14203,36 @@ msgstr "git count-objects [-v] [-H | --human-readable]"
 msgid "print sizes in human readable format"
 msgstr "以用户�读的格�显示大�"
 
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"您的 socket 目录��过于宽�，其他用户�能会读�您缓存的认�信�。考虑执"
+"行：\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+msgstr "输出调试信�到标准错误"
+
+#: builtin/credential-cache--daemon.c:316
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr "credential-cache--daemon ��用，�支� unix 套接字"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache ��用，�支� unix 套接字"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "无法在 %d ms 获得凭�存储�"
+
 #: builtin/describe.c:26
 msgid "git describe [<options>] [<commit-ish>...]"
 msgstr "git describe [<选项>] [<�交�>...]"
@@ -12184,49 +14241,44 @@ msgstr "git describe [<选项>] [<�交�>...]"
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<选项>] --dirty"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "head"
 msgstr "头"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "轻�级的"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr "附注的"
 
-#: builtin/describe.c:275
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "附注标签 %s 无效"
 
-#: builtin/describe.c:279
-#, c-format
-msgid "annotated tag %s has no embedded name"
-msgstr "附注标签 %s 没有嵌入�称"
-
 #: builtin/describe.c:281
 #, c-format
-msgid "tag '%s' is really '%s' here"
-msgstr "标签 '%s' 的确是在 '%s'"
+msgid "tag '%s' is externally known as '%s'"
+msgstr "标签 '%s' 在外部被认为是 '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "没有标签准确匹� '%s'"
 
-#: builtin/describe.c:327
+#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "没有精确匹�到引用或标签，继续�索进行�述\n"
 
-#: builtin/describe.c:381
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "完��索 %s\n"
 
-#: builtin/describe.c:407
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -12235,7 +14287,7 @@ msgstr ""
 "没有附注标签能�述 '%s'。\n"
 "然而，存在未附注标签：�试 --tags。"
 
-#: builtin/describe.c:411
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -12244,12 +14296,12 @@ msgstr ""
 "没有标签能�述 '%s'。\n"
 "�试 --always，或者创建一些标签。"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "已�历 %lu 个�交\n"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -12258,142 +14310,160 @@ msgstr ""
 "�现多于 %i 个标签，列出最近的 %i 个\n"
 "在 %s 放弃�索\n"
 
-#: builtin/describe.c:512
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "�述 %s\n"
 
-#: builtin/describe.c:515
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "�是一个有效的对象� %s"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s 既�是�交也�是数�对象"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "寻找该�交之�的标签"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "在标准错误上调试�索策略"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "使用任�引用"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "使用任�标签，�使未附带注释"
 
-#: builtin/describe.c:541
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "始终使用长�交�格�"
 
-#: builtin/describe.c:542
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "�跟�第一个父�交"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "�输出精确匹�"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "考虑最近 <n> 个标签（默认：10）"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "�考虑匹� <模�> 的标签"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "�考虑匹� <模�> 的标签"
 
-#: builtin/describe.c:553 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "显示简写的�交�作为�备"
 
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "标记"
 
-#: builtin/describe.c:555
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "对于�工作区，追加 <标记>（默认：\"-dirty\"）"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "对于��的工作区，追加 <标记>（默认：\"-broken\"）"
 
-#: builtin/describe.c:576
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long 与 --abbrev=0 �兼容"
 
-#: builtin/describe.c:605
+#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "没有�现�称，无法�述任何东西。"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty 与�交��兼容"
 
-#: builtin/describe.c:658
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken 与�交��兼容"
 
-#: builtin/diff.c:84
+#: builtin/diff-tree.c:155
+msgid "--stdin and --merge-base are mutually exclusive"
+msgstr "--stdin 和 --merge-base 是互斥的"
+
+#: builtin/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base 仅适用于两个�交"
+
+#: builtin/diff.c:92
 #, c-format
 msgid "'%s': not a regular file or symlink"
 msgstr "'%s'：�是一个正规文件或符�链接"
 
-#: builtin/diff.c:235
+#: builtin/diff.c:259
 #, c-format
 msgid "invalid option: %s"
 msgstr "无效选项：%s"
 
-#: builtin/diff.c:350
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s：无�并基线"
+
+#: builtin/diff.c:486
 msgid "Not a git repository"
-msgstr "�是一个 git 仓库"
+msgstr "�是 git 仓库"
 
-#: builtin/diff.c:394
+#: builtin/diff.c:532 builtin/grep.c:684
 #, c-format
 msgid "invalid object '%s' given."
 msgstr "�供了无效对象 '%s'。"
 
-#: builtin/diff.c:403
+#: builtin/diff.c:543
 #, c-format
 msgid "more than two blobs given: '%s'"
 msgstr "�供了超过两个数�对象：'%s'"
 
-#: builtin/diff.c:408
+#: builtin/diff.c:548
 #, c-format
 msgid "unhandled object '%s' given."
 msgstr "无法处�的对象 '%s'。"
 
-#: builtin/difftool.c:30
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s：多��并基线，使用 %s"
+
+#: builtin/difftool.c:31
 msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
 msgstr "git difftool [<选项>] [<�交> [<�交>]] [--] [<路径>...]"
 
-#: builtin/difftool.c:260
+#: builtin/difftool.c:261
 #, c-format
 msgid "failed: %d"
 msgstr "失败：%d"
 
-#: builtin/difftool.c:302
+#: builtin/difftool.c:303
 #, c-format
 msgid "could not read symlink %s"
 msgstr "无法读�符�链接 %s"
 
-#: builtin/difftool.c:304
+#: builtin/difftool.c:305
 #, c-format
 msgid "could not read symlink file %s"
 msgstr "无法读�符�链接文件 %s"
 
-#: builtin/difftool.c:312
+#: builtin/difftool.c:313
 #, c-format
 msgid "could not read object %s for symlink %s"
 msgstr "无法读�符�链接 %2$s 指�的对象 %1$s"
@@ -12406,83 +14476,83 @@ msgstr ""
 "�支�在目录比较模�（'-d' 和 '--dir-diff'）中采用组�差异格�（'-c' 和 '--"
 "cc'）。"
 
-#: builtin/difftool.c:634
+#: builtin/difftool.c:637
 #, c-format
 msgid "both files modified: '%s' and '%s'."
 msgstr "两个文件都被修改：'%s' 和 '%s'。"
 
-#: builtin/difftool.c:636
+#: builtin/difftool.c:639
 msgid "working tree file has been left."
 msgstr "工作区文件被留了下�。"
 
-#: builtin/difftool.c:647
+#: builtin/difftool.c:650
 #, c-format
 msgid "temporary files exist in '%s'."
 msgstr "临时文件存在于 '%s'。"
 
-#: builtin/difftool.c:648
+#: builtin/difftool.c:651
 msgid "you may want to cleanup or recover these."
 msgstr "您�能想�清�或者��它们。"
 
-#: builtin/difftool.c:697
+#: builtin/difftool.c:699
 msgid "use `diff.guitool` instead of `diff.tool`"
 msgstr "使用 `diff.guitool` 代替 `diff.tool`"
 
-#: builtin/difftool.c:699
+#: builtin/difftool.c:701
 msgid "perform a full-directory diff"
 msgstr "执行一个全目录差异比较"
 
-#: builtin/difftool.c:701
+#: builtin/difftool.c:703
 msgid "do not prompt before launching a diff tool"
 msgstr "�动差异比较工具之���示"
 
-#: builtin/difftool.c:706
+#: builtin/difftool.c:708
 msgid "use symlinks in dir-diff mode"
 msgstr "在 dir-diff 模�中使用符�链接"
 
-#: builtin/difftool.c:707
+#: builtin/difftool.c:709
 msgid "tool"
 msgstr "工具"
 
-#: builtin/difftool.c:708
+#: builtin/difftool.c:710
 msgid "use the specified diff tool"
 msgstr "使用指定的差异比较工具"
 
-#: builtin/difftool.c:710
+#: builtin/difftool.c:712
 msgid "print a list of diff tools that may be used with `--tool`"
 msgstr "显示�以用在 `--tool` �数�的差异工具列表"
 
-#: builtin/difftool.c:713
+#: builtin/difftool.c:715
 msgid ""
 "make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
 "code"
 msgstr "当执行 diff 工具返回�零退出�时，使 'git-difftool' 退出"
 
-#: builtin/difftool.c:716
+#: builtin/difftool.c:718
 msgid "specify a custom command for viewing diffs"
 msgstr "指定一个用于查看差异的自定义命令"
 
-#: builtin/difftool.c:717
+#: builtin/difftool.c:719
 msgid "passed to `diff`"
 msgstr "传递给 `diff`"
 
-#: builtin/difftool.c:732
+#: builtin/difftool.c:734
 msgid "difftool requires worktree or --no-index"
 msgstr "difftool �求工作区或者 --no-index"
 
-#: builtin/difftool.c:739
+#: builtin/difftool.c:741
 msgid "--dir-diff is incompatible with --no-index"
 msgstr "--dir-diff 和 --no-index �兼容"
 
-#: builtin/difftool.c:742
+#: builtin/difftool.c:744
 msgid "--gui, --tool and --extcmd are mutually exclusive"
 msgstr "--gui�--tool 和 --extcmd 互斥"
 
-#: builtin/difftool.c:750
+#: builtin/difftool.c:752
 msgid "no <tool> given for --tool=<tool>"
 msgstr "没有为 --tool=<工具> �数�供 <工具>"
 
-#: builtin/difftool.c:757
+#: builtin/difftool.c:759
 msgid "no <cmd> given for --extcmd=<cmd>"
 msgstr "没有为 --extcmd=<命令> �数�供 <命令>"
 
@@ -12490,297 +14560,372 @@ msgstr "没有为 --extcmd=<命令> �数�供 <命令>"
 msgid "git env--helper --type=[bool|ulong] <options> <env-var>"
 msgstr "git env--helper --type=[bool|ulong] <选项> <环境��>"
 
-#: builtin/env--helper.c:37 builtin/hash-object.c:98
+#: builtin/env--helper.c:42 builtin/hash-object.c:98
 msgid "type"
 msgstr "类型"
 
-#: builtin/env--helper.c:41
+#: builtin/env--helper.c:46
 msgid "default for git_env_*(...) to fall back on"
 msgstr "git_env_*(...) 的默认值"
 
-#: builtin/env--helper.c:43
+#: builtin/env--helper.c:48
 msgid "be quiet only use git_env_*() value as exit code"
 msgstr "安�模�，�使用 git_env_*() 的值作为退出�"
 
-#: builtin/env--helper.c:62
+#: 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:77
+#: 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:852
+#: builtin/fast-export.c:868
 msgid "Error: Cannot export nested tags unless --mark-tags is specified."
 msgstr "错误：除�指定 --mark-tags，�则无法导出嵌套标签。"
 
-#: builtin/fast-export.c:1152
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map �值�能为空"
+
+#: builtin/fast-export.c:1197
 msgid "show progress after <n> objects"
 msgstr "在 <n> 个对象之�显示进度"
 
-#: builtin/fast-export.c:1154
+#: builtin/fast-export.c:1199
 msgid "select handling of signed tags"
 msgstr "选择如何处�签�标签"
 
-#: builtin/fast-export.c:1157
+#: builtin/fast-export.c:1202
 msgid "select handling of tags that tag filtered objects"
 msgstr "选择当标签指�被过滤对象时该标签的处�方�"
 
-#: builtin/fast-export.c:1160
+#: builtin/fast-export.c:1205
 msgid "select handling of commit messages in an alternate encoding"
 msgstr "选择使用备用编�处��交说明"
 
-#: builtin/fast-export.c:1163
-msgid "Dump marks to this file"
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
 msgstr "把标记存储到这个文件"
 
-#: builtin/fast-export.c:1165
-msgid "Import marks from this file"
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
 msgstr "从这个文件导入标记"
 
-#: builtin/fast-export.c:1169
-msgid "Import marks from this file if it exists"
-msgstr "从该文件导入标记（如果存在的�）"
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "如果文件存在，从该文件导入标记"
 
-#: builtin/fast-export.c:1171
-msgid "Fake a tagger when tags lack one"
-msgstr "当标签缺少标记者字段时，�装�供一个"
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "当标签缺少标记人字段时，�装�供一个"
 
-#: builtin/fast-export.c:1173
-msgid "Output full tree for each commit"
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
 msgstr "�次�交都输出整个树"
 
-#: builtin/fast-export.c:1175
-msgid "Use the done feature to terminate the stream"
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
 msgstr "使用 done 功能�终止�"
 
-#: builtin/fast-export.c:1176
-msgid "Skip output of blob data"
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
 msgstr "跳过数�对象的输出"
 
-#: builtin/fast-export.c:1177 builtin/log.c:1633
+#: builtin/fast-export.c:1222 builtin/log.c:1826
 msgid "refspec"
 msgstr "引用规格"
 
-#: builtin/fast-export.c:1178
-msgid "Apply refspec to exported refs"
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
 msgstr "对导出的引用应用引用规格"
 
-#: builtin/fast-export.c:1179
+#: builtin/fast-export.c:1224
 msgid "anonymize output"
 msgstr "匿�输出"
 
-#: builtin/fast-export.c:1181
-msgid "Reference parents which are not in fast-export stream by object id"
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "from:to"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "在匿�输出中将 <from> 转�为 <to>"
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
 msgstr "引用父对象 ID �在 fast-export �中"
 
-#: builtin/fast-export.c:1183
-msgid "Show original object ids of blobs/commits"
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
 msgstr "显示数�对象/�交的原始对象 ID"
 
-#: builtin/fast-export.c:1185
-msgid "Label tags with mark ids"
+#: builtin/fast-export.c:1233
+msgid "label tags with mark ids"
 msgstr "对带有标记 ID 的标签�标记"
 
-#: builtin/fast-export.c:1220
+#: 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/fetch.c:34
+#: builtin/fast-import.c:3088
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "�模组 '%s' 缺少 from 标记"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "�模组 '%s' 缺少 to 标记"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "预期 'mark' 命令，得到 %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "预期 'to' 命令，得到 %s"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "�模组�写选项的预期格�为 name:filename"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "�带 --allow-unsafe-features 的输入中�止使用功能 '%s'"
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "Lockfile 已创建但未报告：%s"
+
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<选项>] <组>"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<选项>]"
 
-#: builtin/fetch.c:115
+#: builtin/fetch.c:122
 msgid "fetch.parallel cannot be negative"
 msgstr "fetch.parallel �能为负数"
 
-#: builtin/fetch.c:138 builtin/pull.c:204
+#: builtin/fetch.c:145 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "从所有的远程抓�"
 
-#: builtin/fetch.c:140 builtin/pull.c:248
+#: builtin/fetch.c:147 builtin/pull.c:245
 msgid "set upstream for git pull/fetch"
 msgstr "为 git pull/fetch 设置上游"
 
-#: builtin/fetch.c:142 builtin/pull.c:207
+#: builtin/fetch.c:149 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而�是覆盖它"
 
-#: builtin/fetch.c:144 builtin/pull.c:210
+#: builtin/fetch.c:151
+msgid "use atomic transaction to update references"
+msgstr "使用原�事务更新引用"
+
+#: builtin/fetch.c:153 builtin/pull.c:191
 msgid "path to upload pack on remote end"
 msgstr "上传包到远程的路径"
 
-#: builtin/fetch.c:145
+#: builtin/fetch.c:154
 msgid "force overwrite of local reference"
 msgstr "强制覆盖本地引用"
 
-#: builtin/fetch.c:147
+#: builtin/fetch.c:156
 msgid "fetch from multiple remotes"
 msgstr "从多个远程抓�"
 
-#: builtin/fetch.c:149 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "抓�所有的标签和关�对象"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:160
 msgid "do not fetch all tags (--no-tags)"
 msgstr "�抓�任何标签(--no-tags)"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:162
 msgid "number of submodules fetched in parallel"
 msgstr "�模组获�的并�数"
 
-#: builtin/fetch.c:155 builtin/pull.c:217
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr "修改引用规格以将所有引用放入 refs/prefetch/"
+
+#: builtin/fetch.c:166 builtin/pull.c:198
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除远程已��存在的分支的跟踪分支"
 
-#: builtin/fetch.c:157
+#: builtin/fetch.c:168
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "清除远程�存在的本地标签，并且替��更标签"
 
 #  译者：�选值，�能翻译
-#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141
+#: builtin/fetch.c:169 builtin/fetch.c:194 builtin/pull.c:122
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:159
+#: builtin/fetch.c:170
 msgid "control recursive fetching of submodules"
 msgstr "控制�模组的递归抓�"
 
-#: builtin/fetch.c:163 builtin/pull.c:225
+#: builtin/fetch.c:175
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "将获�到的引用写入 FETCH_HEAD 文件"
+
+#: builtin/fetch.c:176 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "��下载包"
 
-#: builtin/fetch.c:165
+#: builtin/fetch.c:178
 msgid "allow updating of HEAD ref"
 msgstr "�许更新 HEAD 引用"
 
-#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "深化浅克隆的历�"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:183 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr "基于时间�深化浅克隆的历�"
 
-#: builtin/fetch.c:176 builtin/pull.c:231
+#: builtin/fetch.c:189 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "转�为一个完整的仓库"
 
-#: builtin/fetch.c:179
+#: builtin/fetch.c:192
 msgid "prepend this to submodule path output"
 msgstr "在�模组路径输出的��加上此目录"
 
-#: builtin/fetch.c:182
+#: builtin/fetch.c:195
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "递归获��模组的缺�值（比�置文件优先级低）"
 
-#: builtin/fetch.c:186 builtin/pull.c:234
+#: builtin/fetch.c:199 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "接�更新 .git/shallow 的引用"
 
-#: builtin/fetch.c:187 builtin/pull.c:236
+#: builtin/fetch.c:200 builtin/pull.c:226
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:188 builtin/pull.c:237
+#: builtin/fetch.c:201 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "指定获��作的引用映射"
 
-#: builtin/fetch.c:195
+#: builtin/fetch.c:208 builtin/pull.c:240
 msgid "report that we have only objects reachable from this object"
 msgstr "报告我们�拥有从该对象开始�达的对象"
 
-#: builtin/fetch.c:198
-msgid "run 'gc --auto' after fetching"
-msgstr "获��执行 'gc --auto'"
+#: builtin/fetch.c:210
+msgid "do not fetch a packfile; instead, print ancestors of negotiation tips"
+msgstr "�获�包文件；而是打��商的祖先�交"
 
-#: builtin/fetch.c:200 builtin/pull.c:246
+#: builtin/fetch.c:213 builtin/fetch.c:215
+msgid "run 'maintenance --auto' after fetching"
+msgstr "获��执行 'maintenance --auto'"
+
+#: builtin/fetch.c:217 builtin/pull.c:243
 msgid "check for forced-updates on all updated branches"
 msgstr "在所有更新分支上检查强制更新"
 
-#: builtin/fetch.c:510
+#: builtin/fetch.c:219
+msgid "write the commit-graph after fetching"
+msgstr "抓��写�交图"
+
+#: builtin/fetch.c:221
+msgid "accept refspecs from stdin"
+msgstr "从标准输入获�引用规格"
+
+#: builtin/fetch.c:586
 msgid "Couldn't find remote ref HEAD"
 msgstr "无法�现远程 HEAD 引用"
 
-#: builtin/fetch.c:650
+#: builtin/fetch.c:757
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "�置�� fetch.output 包�无效值 %s"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:856
 #, c-format
 msgid "object %s not found"
 msgstr "对象 %s 未�现"
 
-#: builtin/fetch.c:752
+#: builtin/fetch.c:860
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
 msgid "[rejected]"
 msgstr "[已拒�]"
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:874
 msgid "can't fetch in current branch"
 msgstr "当�分支下�能执行获��作"
 
-#: builtin/fetch.c:776
+#: builtin/fetch.c:884
 msgid "[tag update]"
 msgstr "[标签更新]"
 
-#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
-#: builtin/fetch.c:848
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
 msgid "unable to update local ref"
 msgstr "�能更新本地引用"
 
-#: builtin/fetch.c:781
+#: builtin/fetch.c:889
 msgid "would clobber existing tag"
 msgstr "会破�现有的标签"
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:911
 msgid "[new tag]"
 msgstr "[新标签]"
 
-#: builtin/fetch.c:806
+#: builtin/fetch.c:914
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:809
+#: builtin/fetch.c:917
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:848
+#: builtin/fetch.c:956
 msgid "forced update"
 msgstr "强制更新"
 
-#: builtin/fetch.c:853
+#: builtin/fetch.c:961
 msgid "non-fast-forward"
 msgstr "�快进"
 
-#: builtin/fetch.c:874
+#: 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"
@@ -12790,7 +14935,7 @@ msgstr ""
 "��新�用，请使用 '--show-forced-updates' 选项或�行\n"
 "'git config fetch.showForcedUpdates true'。"
 
-#: builtin/fetch.c:878
+#: builtin/fetch.c:1069
 #, c-format
 msgid ""
 "It took %.2f seconds to check forced updates. You can use\n"
@@ -12801,22 +14946,22 @@ msgstr ""
 "花了 %.2f 秒�检查强制更新。您�以使用 '--no-show-forced-updates'\n"
 "或�行 'git config fetch.showForcedUpdates false' 以��此项检查。\n"
 
-#: builtin/fetch.c:908
+#: builtin/fetch.c:1101
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未��所有必需的对象\n"
 
-#: builtin/fetch.c:929
+#: builtin/fetch.c:1129
 #, 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:1020 builtin/fetch.c:1157
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
 #, c-format
 msgid "From %.*s\n"
 msgstr "�自 %.*s\n"
 
-#: builtin/fetch.c:1031
+#: builtin/fetch.c:1228
 #, c-format
 msgid ""
 "some local refs could not be updated; try running\n"
@@ -12826,57 +14971,57 @@ msgstr ""
 " 'git remote prune %s' �删除旧的�有冲�的分支"
 
 #  译者：注����导空格
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1327
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 将�为悬空状�）"
 
 #  译者：注����导空格
-#: builtin/fetch.c:1128
+#: builtin/fetch.c:1328
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已�为悬空状�）"
 
-#: builtin/fetch.c:1160
+#: builtin/fetch.c:1360
 msgid "[deleted]"
 msgstr "[已删除]"
 
-#: builtin/fetch.c:1161 builtin/remote.c:1036
+#: builtin/fetch.c:1361 builtin/remote.c:1118
 msgid "(none)"
 msgstr "（无）"
 
-#: builtin/fetch.c:1184
+#: builtin/fetch.c:1384
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "拒�获�到�纯仓库的当�分支 %s"
 
-#: builtin/fetch.c:1203
+#: builtin/fetch.c:1403
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
 
-#: builtin/fetch.c:1206
+#: builtin/fetch.c:1406
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "选项 \"%s\" 为 %s 所忽略\n"
 
-#: builtin/fetch.c:1414
-msgid "multiple branch detected, incompatible with --set-upstream"
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
 msgstr "检测到多分支，和 --set-upstream �兼容"
 
-#: builtin/fetch.c:1429
+#: builtin/fetch.c:1633
 msgid "not setting upstream for a remote remote-tracking branch"
 msgstr "没有为一个远程跟踪分支设置上游"
 
-#: builtin/fetch.c:1431
+#: builtin/fetch.c:1635
 msgid "not setting upstream for a remote tag"
 msgstr "没有为一个远程标签设置上游"
 
-#: builtin/fetch.c:1433
+#: builtin/fetch.c:1637
 msgid "unknown branch type"
 msgstr "未知的分支类型"
 
-#: builtin/fetch.c:1435
+#: builtin/fetch.c:1639
 msgid ""
 "no source branch found.\n"
 "you need to specify exactly one branch with the --set-upstream option."
@@ -12884,92 +15029,112 @@ msgstr ""
 "未�现�分支。\n"
 "您需�使用 --set-upstream 选项指定一个分支。"
 
-#: builtin/fetch.c:1561 builtin/fetch.c:1623
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在获� %s\n"
 
-#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "�能获� %s"
 
-#: builtin/fetch.c:1583
+#: builtin/fetch.c:1790
 #, c-format
 msgid "could not fetch '%s' (exit code: %d)\n"
 msgstr "无法获� '%s'（退出�：%d）\n"
 
-#: builtin/fetch.c:1685
+#: 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:1722
+#: builtin/fetch.c:1930
 msgid "You need to specify a tag name."
 msgstr "您需�指定一个标签�称。"
 
-#: builtin/fetch.c:1774
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only 需�一个或多个 --negotiate-tip=*"
+
+#: builtin/fetch.c:1998
 msgid "Negative depth in --deepen is not supported"
 msgstr "--deepen �支�负数深度"
 
-#: builtin/fetch.c:1776
+#: builtin/fetch.c:2000
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen 和 --depth 是互斥的"
 
-#: builtin/fetch.c:1781
+#: builtin/fetch.c:2005
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth 和 --unshallow �能�时使用"
 
-#: builtin/fetch.c:1783
+#: builtin/fetch.c:2007
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "对于一个完整的仓库，�数 --unshallow 没有�义"
 
-#: builtin/fetch.c:1799
+#: builtin/fetch.c:2024
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all �能带一个仓库�数"
 
-#: builtin/fetch.c:1801
+#: builtin/fetch.c:2026
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 带引用规格没有任何�义"
 
-#: builtin/fetch.c:1810
+#: builtin/fetch.c:2035
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "没有这样的远程或远程组：%s"
 
-#: builtin/fetch.c:1817
+#: builtin/fetch.c:2042
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "获�组并指定引用规格没有�义"
 
-#: builtin/fetch.c:1835
+#: builtin/fetch.c:2058
+msgid "must supply remote when using --negotiate-only"
+msgstr "在使用 --negotiate-only 时必须�供远程仓库"
+
+#: builtin/fetch.c:2063
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "�议�支� --negotiate-only，退出。"
+
+#: builtin/fetch.c:2082
 msgid ""
 "--filter can only be used with the remote configured in extensions."
 "partialclone"
-msgstr "��以将 --filter 用于在 extensions.partialClone 中�置的远程仓库"
+msgstr "��以将 --filter 用于在 extensions.partialclone 中�置的远程仓库"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fetch.c:2086
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic 仅在从一个远程仓库获�的时候�用"
+
+#: builtin/fetch.c:2090
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "--stdin 仅在从一个远程仓库获�的时候�用"
+
+#: 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 <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "��交说明中最多�制指定�目（�并而�的�交）的简短说明"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "�数 --log 的别�（已弃用）"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "文本"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "使用 <文本> 作为�交说明的开始"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "从文件中读�"
 
@@ -12982,83 +15147,99 @@ msgid "git for-each-ref [--points-at <object>]"
 msgstr "git for-each-ref [--points-at <对象>]"
 
 #: builtin/for-each-ref.c:12
-msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
-msgstr "git for-each-ref [(--merged | --no-merged) [<�交>]]"
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr "git for-each-ref [--merged [<�交>]] [--no-merged [<�交>]]"
 
 #: builtin/for-each-ref.c:13
 msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
 msgstr "git for-each-ref [--contains [<�交>]] [--no-contains [<�交>]]"
 
-#: builtin/for-each-ref.c:28
+#: builtin/for-each-ref.c:30
 msgid "quote placeholders suitably for shells"
 msgstr "引用��符适用于 shells"
 
-#: builtin/for-each-ref.c:30
+#: builtin/for-each-ref.c:32
 msgid "quote placeholders suitably for perl"
 msgstr "引用��符适用于 perl"
 
-#: builtin/for-each-ref.c:32
+#: builtin/for-each-ref.c:34
 msgid "quote placeholders suitably for python"
 msgstr "引用��符适用于 python"
 
-#: builtin/for-each-ref.c:34
+#: builtin/for-each-ref.c:36
 msgid "quote placeholders suitably for Tcl"
 msgstr "引用��符适用于 Tcl"
 
-#: builtin/for-each-ref.c:37
+#: builtin/for-each-ref.c:39
 msgid "show only <n> matched refs"
 msgstr "�显示 <n> 个匹�的引用"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
 msgid "respect format colors"
 msgstr "�照格�中的颜色输出"
 
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:44
 msgid "print only refs which points at the given object"
 msgstr "�打�指�给定对象的引用"
 
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:46
 msgid "print only refs that are merged"
 msgstr "�打�已��并的引用"
 
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:47
 msgid "print only refs that are not merged"
 msgstr "�打�没有�并的引用"
 
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:48
 msgid "print only refs which contain the commit"
 msgstr "�打�包�该�交的引用"
 
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:49
 msgid "print only refs which don't contain the commit"
 msgstr "�打��包�该�交的引用"
 
-#: builtin/fsck.c:88 builtin/fsck.c:160 builtin/fsck.c:161
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<�置> <命令�数>"
+
+#: builtin/for-each-repo.c:34
+msgid "config"
+msgstr "�置"
+
+#: builtin/for-each-repo.c:35
+msgid "config key storing a list of repository paths"
+msgstr "存储�仓库路径列表的�置项键�"
+
+#: builtin/for-each-repo.c:43
+msgid "missing --config=<config>"
+msgstr "缺少 --config=<�置>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
 msgid "unknown"
 msgstr "未知"
 
 #. TRANSLATORS: e.g. error in tree 01bfda: <more explanation>
-#: builtin/fsck.c:120 builtin/fsck.c:136
+#: builtin/fsck.c:78 builtin/fsck.c:100
 #, c-format
 msgid "error in %s %s: %s"
 msgstr "%s %s 错误：%s"
 
 #. TRANSLATORS: e.g. warning in tree 01bfda: <more explanation>
-#: builtin/fsck.c:131
+#: builtin/fsck.c:94
 #, c-format
 msgid "warning in %s %s: %s"
 msgstr "%s %s 警告：%s"
 
-#: builtin/fsck.c:157 builtin/fsck.c:159
+#: builtin/fsck.c:124 builtin/fsck.c:127
 #, c-format
 msgid "broken link from %7s %s"
 msgstr "�自 %7s %s 的��的链接"
 
-#: builtin/fsck.c:168
+#: builtin/fsck.c:136
 msgid "wrong object type in link"
 msgstr "链接中错误的对象类型"
 
-#: builtin/fsck.c:184
+#: builtin/fsck.c:152
 #, c-format
 msgid ""
 "broken link from %7s %s\n"
@@ -13067,240 +15248,240 @@ msgstr ""
 "��的链接�自于 %7s %s\n"
 "              到 %7s %s"
 
-#: builtin/fsck.c:295
+#: builtin/fsck.c:264
 #, c-format
 msgid "missing %s %s"
 msgstr "缺失 %s %s"
 
-#: builtin/fsck.c:321
+#: builtin/fsck.c:291
 #, c-format
 msgid "unreachable %s %s"
 msgstr "��达 %s %s"
 
-#: builtin/fsck.c:340
+#: builtin/fsck.c:311
 #, c-format
 msgid "dangling %s %s"
 msgstr "悬空 %s %s"
 
-#: builtin/fsck.c:349
+#: builtin/fsck.c:321
 msgid "could not create lost-found"
 msgstr "�能创建 lost-found"
 
-#: builtin/fsck.c:360
+#: builtin/fsck.c:332
 #, c-format
 msgid "could not finish '%s'"
 msgstr "�能完� '%s'"
 
-#: builtin/fsck.c:377
+#: builtin/fsck.c:349
 #, c-format
 msgid "Checking %s"
 msgstr "正在检查 %s"
 
-#: builtin/fsck.c:415
+#: builtin/fsck.c:387
 #, c-format
 msgid "Checking connectivity (%d objects)"
 msgstr "正在检查连通性（%d 个对象）"
 
-#: builtin/fsck.c:434
+#: builtin/fsck.c:406
 #, c-format
 msgid "Checking %s %s"
 msgstr "正在检查 %s %s"
 
-#: builtin/fsck.c:438
+#: builtin/fsck.c:411
 msgid "broken links"
 msgstr "��的链接"
 
-#: builtin/fsck.c:447
+#: builtin/fsck.c:420
 #, c-format
 msgid "root %s"
 msgstr "æ ¹ %s"
 
-#: builtin/fsck.c:455
+#: builtin/fsck.c:428
 #, c-format
 msgid "tagged %s %s (%s) in %s"
 msgstr "标记 %s %s (%s) 于 %s"
 
-#: builtin/fsck.c:484
+#: builtin/fsck.c:457
 #, c-format
 msgid "%s: object corrupt or missing"
 msgstr "%s：对象��或丢失"
 
-#: builtin/fsck.c:509
+#: builtin/fsck.c:482
 #, c-format
 msgid "%s: invalid reflog entry %s"
 msgstr "%s：无效的引用日志�目 %s"
 
-#: builtin/fsck.c:523
+#: builtin/fsck.c:496
 #, c-format
 msgid "Checking reflog %s->%s"
 msgstr "正在检查引用日志 %s->%s"
 
-#: builtin/fsck.c:557
+#: builtin/fsck.c:530
 #, c-format
 msgid "%s: invalid sha1 pointer %s"
 msgstr "%s：无效的 sha1 指针 %s"
 
-#: builtin/fsck.c:564
+#: builtin/fsck.c:537
 #, c-format
 msgid "%s: not a commit"
 msgstr "%s：�是一个�交"
 
-#: builtin/fsck.c:619
+#: builtin/fsck.c:591
 msgid "notice: No default references"
 msgstr "注�：无默认引用"
 
-#: builtin/fsck.c:634
+#: builtin/fsck.c:606
 #, c-format
 msgid "%s: object corrupt or missing: %s"
 msgstr "%s：对象��或丢失：%s"
 
-#: builtin/fsck.c:647
+#: builtin/fsck.c:619
 #, c-format
 msgid "%s: object could not be parsed: %s"
 msgstr "%s：�能解�对象：%s"
 
-#: builtin/fsck.c:667
+#: builtin/fsck.c:639
 #, c-format
 msgid "bad sha1 file: %s"
 msgstr "�的 sha1 文件：%s"
 
-#: builtin/fsck.c:682
+#: builtin/fsck.c:654
 msgid "Checking object directory"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:657
 msgid "Checking object directories"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c:700
+#: builtin/fsck.c:672
 #, c-format
 msgid "Checking %s link"
 msgstr "正在检查 %s 链接"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:677 builtin/index-pack.c:864
 #, c-format
 msgid "invalid %s"
 msgstr "无效的 %s"
 
-#: builtin/fsck.c:712
+#: builtin/fsck.c:684
 #, c-format
 msgid "%s points to something strange (%s)"
 msgstr "%s 指�奇怪的东西（%s）"
 
-#: builtin/fsck.c:718
+#: builtin/fsck.c:690
 #, c-format
 msgid "%s: detached HEAD points at nothing"
 msgstr "%s：分离头指针的指��存在"
 
-#: builtin/fsck.c:722
+#: builtin/fsck.c:694
 #, c-format
 msgid "notice: %s points to an unborn branch (%s)"
 msgstr "注�：%s 指�一个尚未诞生的分支（%s）"
 
-#: builtin/fsck.c:734
+#: builtin/fsck.c:706
 msgid "Checking cache tree"
 msgstr "正在检查缓存树"
 
-#: builtin/fsck.c:739
+#: builtin/fsck.c:711
 #, c-format
 msgid "%s: invalid sha1 pointer in cache-tree"
 msgstr "%s：cache-tree 中无效的 sha1 指针"
 
-#: builtin/fsck.c:750
+#: builtin/fsck.c:720
 msgid "non-tree in cache-tree"
 msgstr "cache-tree 中�树对象"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:751
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<选项>] [<对象>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:757
 msgid "show unreachable objects"
 msgstr "显示��达的对象"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:758
 msgid "show dangling objects"
 msgstr "显示悬空的对象"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:759
 msgid "report tags"
 msgstr "报告标签"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:760
 msgid "report root nodes"
 msgstr "报告根节点"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:761
 msgid "make index objects head nodes"
 msgstr "将索引亦作为检查的头节点"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:762
 msgid "make reflogs head nodes (default)"
 msgstr "将引用日志作为检查的头节点（默认）"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:763
 msgid "also consider packs and alternate objects"
 msgstr "也考虑包和备用对象"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:764
 msgid "check only connectivity"
 msgstr "仅检查连通性"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:765 builtin/mktag.c:75
 msgid "enable more strict checking"
 msgstr "�用更严格的检查"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:767
 msgid "write dangling objects in .git/lost-found"
 msgstr "将悬空对象写入 .git/lost-found 中"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:768 builtin/prune.c:134
 msgid "show progress"
 msgstr "显示进度"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:769
 msgid "show verbose names for reachable objects"
 msgstr "显示�达对象的详细�称"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:828 builtin/index-pack.c:262
 msgid "Checking objects"
 msgstr "正在检查对象"
 
-#: builtin/fsck.c:887
+#: builtin/fsck.c:856
 #, c-format
 msgid "%s: object missing"
 msgstr "%s：对象缺失"
 
-#: builtin/fsck.c:899
+#: builtin/fsck.c:867
 #, c-format
 msgid "invalid parameter: expected sha1, got '%s'"
 msgstr "无效的�数：期望 sha1，得到 '%s'"
 
-#: builtin/gc.c:35
+#: builtin/gc.c:39
 msgid "git gc [<options>]"
 msgstr "git gc [<选项>]"
 
-#: builtin/gc.c:90
+#: builtin/gc.c:93
 #, c-format
 msgid "Failed to fstat %s: %s"
 msgstr "对 %s 调用 fstat 失败：%s"
 
-#: builtin/gc.c:126
+#: builtin/gc.c:129
 #, c-format
 msgid "failed to parse '%s' value '%s'"
 msgstr "无法解� '%s' 值 '%s'"
 
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:487 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "�能对 '%s' 调用 stat"
 
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:496 builtin/notes.c:240 builtin/tag.c:573
 #, c-format
 msgid "cannot read '%s'"
 msgstr "�能读� '%s'"
 
-#: builtin/gc.c:491
+#: builtin/gc.c:503
 #, c-format
 msgid ""
 "The last gc run reported the following. Please correct the root cause\n"
@@ -13314,73 +15495,233 @@ msgstr ""
 "\n"
 "%s"
 
-#: builtin/gc.c:539
+#: builtin/gc.c:551
 msgid "prune unreferenced objects"
 msgstr "清除未引用的对象"
 
-#: builtin/gc.c:541
+#: builtin/gc.c:553
 msgid "be more thorough (increased runtime)"
 msgstr "更彻底（增加�行时间）"
 
-#: builtin/gc.c:542
+#: builtin/gc.c:554
 msgid "enable auto-gc mode"
 msgstr "�用自动垃圾回收模�"
 
-#: builtin/gc.c:545
+#: builtin/gc.c:557
 msgid "force running gc even if there may be another gc running"
 msgstr "强制执行 gc �使�外一个 gc 正在执行"
 
-#: builtin/gc.c:548
+#: builtin/gc.c:560
 msgid "repack all other packs except the largest pack"
 msgstr "除了最大的包之外，对所有其它包文件�新打包"
 
-#: builtin/gc.c:565
+#: builtin/gc.c:576
 #, c-format
 msgid "failed to parse gc.logexpiry value %s"
 msgstr "解� gc.logexpiry 的值 %s 失败"
 
-#: builtin/gc.c:576
+#: builtin/gc.c:587
 #, c-format
 msgid "failed to parse prune expiry value %s"
 msgstr "解�清除期�值 %s 失败"
 
-#: builtin/gc.c:596
+#: builtin/gc.c:607
 #, c-format
 msgid "Auto packing the repository in background for optimum performance.\n"
 msgstr "自动在��执行仓库打包以求最佳性能。\n"
 
-#: builtin/gc.c:598
+#: builtin/gc.c:609
 #, c-format
 msgid "Auto packing the repository for optimum performance.\n"
 msgstr "自动打包仓库以求最佳性能。\n"
 
-#: builtin/gc.c:599
+#: builtin/gc.c:610
 #, c-format
 msgid "See \"git help gc\" for manual housekeeping.\n"
 msgstr "手工维护�� \"git help gc\"。\n"
 
-#: builtin/gc.c:639
+#: builtin/gc.c:650
 #, 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:694
+#: builtin/gc.c:705
 msgid ""
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "有太多��达的�散对象，�行 'git prune' 删除它们。"
 
-#: builtin/grep.c:29
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<任务>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "--no-schedule �被�许"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "无法识别的 --schedule �数 '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "无法写入�交图"
+
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr "无法预先获�远程仓库"
+
+#: builtin/gc.c:1022
+msgid "failed to start 'git pack-objects' process"
+msgstr "无法�动 'git pack-objects' 进程"
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr "无法完� 'git pack-objects' 进程"
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr "无法写入多包索引"
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' 失败"
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' 失败"
+
+#: builtin/gc.c:1179
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr "跳过增��新打包任务，因为 core.multiPackIndex 被�用"
+
+#: builtin/gc.c:1283
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "�文件 '%s' 已存在，跳过维护"
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr "任务 '%s' 失败"
+
+#: builtin/gc.c:1395
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' �是一个有效的任务"
+
+#: builtin/gc.c:1400
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "任务 '%s' �能被多次选择"
+
+#: builtin/gc.c:1415
+msgid "run tasks based on the state of the repository"
+msgstr "基于仓库状���行任务"
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr "频率"
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr "基于频率�行任务"
+
+#: builtin/gc.c:1420
+msgid "do not report progress or other information over stderr"
+msgstr "�通过标准错误报告进度或其它信�"
+
+#: builtin/gc.c:1421
+msgid "task"
+msgstr "任务"
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr "�行一个特定的任务"
+
+#: builtin/gc.c:1439
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "最多使用 --auto 和 --schedule=<频率> 其中之一"
+
+#: builtin/gc.c:1482
+msgid "failed to run 'git config'"
+msgstr "无法�行 'git config'"
+
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "无法扩展路径 '%s'"
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr "无法�动 launchctl"
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "无法为 '%s' 创建目录"
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "无法引导�务 %s"
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
+msgstr "无法创建临时 XML 文件"
+
+#: 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 "无法执行 'crontab -l'，您的系统�能�支� 'cron'"
+
+#: builtin/gc.c:1896
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "无法�行 'crontab'，您的系统�能�支� 'cron'"
+
+#: builtin/gc.c:1900
+msgid "failed to open stdin of 'crontab'"
+msgstr "无法打开 'crontab' 的标准输入"
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr "'crontab' 终止"
+
+#: 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 "无法将仓库添加到全局�置"
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <�命令> [<选项>]"
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "无效�命令：%s"
+
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<选项>] [-e] <模�> [<版本>...] [[--] <路径>...]"
 
-#: builtin/grep.c:225
+#: builtin/grep.c:223
 #, c-format
 msgid "grep: failed to create thread: %s"
 msgstr "grep：无法创建线程：%s"
 
-#: builtin/grep.c:279
+#: builtin/grep.c:277
 #, c-format
 msgid "invalid number of threads specified (%d) for %s"
 msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
@@ -13389,259 +15730,258 @@ msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
 #. variable for tweaking threads, currently
 #. grep.threads
 #.
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: 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 "没有线程支�，忽略 %s"
 
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "无法读�树（%s）"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:658
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "无法抓��自于 %s 类型的对象"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:738
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "开关 `%c' 期望一个数字值"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:837
 msgid "search in index instead of in the work tree"
 msgstr "在索引区�索而�是在工作区"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:839
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管�的内容中查找"
 
-#  译者：中文字符串拼接，�删除�导空格
-#: builtin/grep.c:819
+#: builtin/grep.c:841
 msgid "search in both tracked and untracked files"
 msgstr "在跟踪和未跟踪的文件中�索"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:843
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包�的文件"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:845
 msgid "recursively search in each submodule"
 msgstr "在�一个�模组中递归�索"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:848
 msgid "show non-matching lines"
 msgstr "显示未匹�的行"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:850
 msgid "case insensitive matching"
 msgstr "�区分大�写匹�"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:852
 msgid "match patterns only at word boundaries"
 msgstr "�在��边界匹�模�"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:854
 msgid "process binary files as text"
 msgstr "把二进制文件当�文本处�"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:856
 msgid "don't match patterns in binary files"
 msgstr "�在二进制文件中匹�模�"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:859
 msgid "process binary files with textconv filters"
 msgstr "用 textconv 过滤器处�二进制文件"
 
-#: builtin/grep.c:839
+#: builtin/grep.c:861
 msgid "search in subdirectories (default)"
 msgstr "在�目录中寻找（默认）"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:863
 msgid "descend at most <depth> levels"
 msgstr "最多以指定的深度�下寻找"
 
-#: builtin/grep.c:845
+#: builtin/grep.c:867
 msgid "use extended POSIX regular expressions"
 msgstr "使用扩展的 POSIX 正则表达�"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:870
 msgid "use basic POSIX regular expressions (default)"
 msgstr "使用基本的 POSIX 正则表达�（默认）"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:873
 msgid "interpret patterns as fixed strings"
 msgstr "把模�解�为固定的字符串"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:876
 msgid "use Perl-compatible regular expressions"
 msgstr "使用 Perl 兼容的正则表达�"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:879
 msgid "show line numbers"
 msgstr "显示行�"
 
-#: builtin/grep.c:858
+#: builtin/grep.c:880
 msgid "show column number of first match"
 msgstr "显示第一个匹�的列�"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:881
 msgid "don't show filenames"
 msgstr "�显示文件�"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:882
 msgid "show filenames"
 msgstr "显示文件�"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:884
 msgid "show filenames relative to top directory"
 msgstr "显示相对于顶级目录的文件�"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:886
 msgid "show only filenames instead of matching lines"
 msgstr "�显示文件�而�显示匹�的行"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:888
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches �义"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:891
 msgid "show only the names of files without match"
 msgstr "�显示未匹�的文件�"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:893
 msgid "print NUL after filenames"
 msgstr "在文件��输出 NUL 字符"
 
-#: builtin/grep.c:874
+#: builtin/grep.c:896
 msgid "show only matching parts of a line"
 msgstr "�显示行中的匹�的部分"
 
-#: builtin/grep.c:876
+#: builtin/grep.c:898
 msgid "show the number of matches instead of matching lines"
 msgstr "显示总匹�行数，而�显示匹�的行"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:899
 msgid "highlight matches"
 msgstr "高亮显示匹�项"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:901
 msgid "print empty line between matches from different files"
 msgstr "在��文件的匹�项之间打�空行"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:903
 msgid "show filename only once above matches from same file"
 msgstr "�在�一文件的匹�项的上�显示一次文件�"
 
-#: builtin/grep.c:884
+#: builtin/grep.c:906
 msgid "show <n> context lines before and after matches"
 msgstr "显示匹�项��的 <n> 行上下文"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:909
 msgid "show <n> context lines before matches"
 msgstr "显示匹�项� <n> 行上下文"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:911
 msgid "show <n> context lines after matches"
 msgstr "显示匹�项� <n> 行上下文"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:913
 msgid "use <n> worker threads"
 msgstr "使用 <n> 个工作线程"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:914
 msgid "shortcut for -C NUM"
 msgstr "快�键 -C 数字"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:917
 msgid "show a line with the function name before matches"
 msgstr "在匹�的��显示一行函数�"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:919
 msgid "show the surrounding function"
 msgstr "显示所在函数的��内容"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:922
 msgid "read patterns from file"
 msgstr "从文件读�模�"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:924
 msgid "match <pattern>"
 msgstr "匹� <模�>"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:926
 msgid "combine patterns specified with -e"
 msgstr "组�用 -e �数设定的模�"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:938
 msgid "indicate hit with exit status without output"
 msgstr "�输出，而用退出�标识命中状�"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:940
 msgid "show only matches from files that match all patterns"
 msgstr "�显示匹�所有模�的文件中的匹�"
 
-#: builtin/grep.c:920
-msgid "show parse tree for grep expression"
-msgstr "显示 grep 表达�的解�树"
-
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "pager"
 msgstr "分页"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:943
 msgid "show matching files in the pager"
 msgstr "分页显示匹�的文件"
 
-#: builtin/grep.c:928
+#: builtin/grep.c:947
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "�许调用 grep(1)（本次构建忽略）"
 
-#: builtin/grep.c:992
+#: builtin/grep.c:1013
 msgid "no pattern given"
 msgstr "未�供匹�模�"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1049
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index 或 --untracked �能和版本�时使用"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1057
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "�能解�版本：%s"
 
-#: builtin/grep.c:1067
+#: builtin/grep.c:1087
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked �支�和 --recurse-submodules 共用"
+
+#: builtin/grep.c:1091
 msgid "invalid option combination, ignoring --threads"
 msgstr "无效的选项组�，忽略 --threads"
 
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
 msgid "no threads support, ignoring --threads"
 msgstr "没有线程支�，忽略 --threads"
 
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的线程数无效（%d）"
 
-#: builtin/grep.c:1096
+#: builtin/grep.c:1131
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 仅用于工作区"
 
-#: builtin/grep.c:1119
-msgid "option not supported with --recurse-submodules"
-msgstr "选项�支�和 --recurse-submodules 共用"
-
-#: builtin/grep.c:1125
+#: builtin/grep.c:1157
 msgid "--cached or --untracked cannot be used with --no-index"
 msgstr "--cached 或 --untracked �能与 --no-index �时使用"
 
-#: builtin/grep.c:1131
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked �能与 --cached �时使用"
+
+#: builtin/grep.c:1166
 msgid "--[no-]exclude-standard cannot be used for tracked contents"
 msgstr "--[no-]exclude-standard �能用于已跟踪内容"
 
-#: builtin/grep.c:1139
+#: builtin/grep.c:1174
 msgid "both --cached and trees are given"
 msgstr "�时给出了 --cached 和树对象"
 
@@ -13682,66 +16022,66 @@ msgstr "�许对任��机垃圾数��散列�创建��的对象以便
 msgid "process file as it were from this path"
 msgstr "处�文件并�设其�自于此路径"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "打�所有�用的命令"
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "排除�导"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr "显示有用的指�列表"
 
-#: builtin/help.c:49
+#: builtin/help.c:50
 msgid "print all configuration variable names"
 msgstr "打�所有�置���称"
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr "显示 man 手册"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr "在 web �览器中显示手册"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "显示 info 手册"
 
-#: builtin/help.c:56
+#: builtin/help.c:57
 msgid "print command description"
 msgstr "打�命令�述"
 
-#: builtin/help.c:61
+#: builtin/help.c:62
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
 
-#: builtin/help.c:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "未能识别的帮助格� '%s'"
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "无法�动 emacsclient。"
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "无法解� emacsclient 版本。"
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太�（< 22）。"
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "执行 '%s' 失败"
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -13750,7 +16090,7 @@ msgstr ""
 "'%s'：�支�的 man 手册查看器的路径。\n"
 "请使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -13759,396 +16099,424 @@ msgstr ""
 "'%s': 支�的 man 手册查看器命令。\n"
 "请使用 'man.<工具>.path'。"
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 查看器。"
 
-#: builtin/help.c:367
+#: builtin/help.c:452
 msgid "no man viewer handled the request"
 msgstr "没有 man 查看器处�此请求"
 
-#: builtin/help.c:375
+#: builtin/help.c:459
 msgid "no info viewer handled the request"
 msgstr "没有 info 查看器处�此请求"
 
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' 是 '%s' 的别�"
 
-#: builtin/help.c:448 git.c:365
+#: builtin/help.c:531 git.c:380
 #, c-format
 msgid "bad alias.%s string: %s"
 msgstr "�的 alias.%s 字符串：%s"
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:561 builtin/help.c:591
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: builtin/help.c:491
+#: builtin/help.c:575
 msgid "'git help config' for more information"
 msgstr "'git help config' 获�更多信�"
 
-#: builtin/index-pack.c:185
+#: builtin/index-pack.c:222
 #, c-format
 msgid "object type mismatch at %s"
 msgstr "%s 的对象类型�匹�"
 
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:242
 #, c-format
 msgid "did not receive expected object %s"
 msgstr "未能获�预期的对象 %s"
 
-#: builtin/index-pack.c:208
+#: builtin/index-pack.c:245
 #, c-format
 msgid "object %s: expected type %s, found %s"
 msgstr "对象 %s：应为类型 %s，�是 %s"
 
-#: builtin/index-pack.c:258
+#: builtin/index-pack.c:295
 #, c-format
 msgid "cannot fill %d byte"
 msgid_plural "cannot fill %d bytes"
 msgstr[0] "无法填充 %d 字节"
 msgstr[1] "无法填充 %d 字节"
 
-#: builtin/index-pack.c:268
+#: builtin/index-pack.c:305
 msgid "early EOF"
 msgstr "过早的文件结�符（EOF）"
 
-#: builtin/index-pack.c:269
+#: builtin/index-pack.c:306
 msgid "read error on input"
 msgstr "输入上的读错误"
 
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:318
 msgid "used more bytes than were available"
 msgstr "用掉了超过�用的字节"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:325 builtin/pack-objects.c:756
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超过了当� off_t 的定义"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:328 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "包超过了最大�许值"
 
-#: builtin/index-pack.c:312
+#: 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:326
+#: builtin/index-pack.c:363
 msgid "pack signature mismatch"
 msgstr "包签��匹�"
 
-#: builtin/index-pack.c:328
+#: builtin/index-pack.c:365
 #, c-format
 msgid "pack version %<PRIu32> unsupported"
 msgstr "�支�包版本 %<PRIu32>"
 
-#: builtin/index-pack.c:346
+#: builtin/index-pack.c:381
 #, c-format
 msgid "pack has bad object at offset %<PRIuMAX>: %s"
 msgstr "包中有错误的对象�于�移� %<PRIuMAX>：%s"
 
-#: builtin/index-pack.c:466
+#: builtin/index-pack.c:487
 #, c-format
 msgid "inflate returned %d"
 msgstr "解压缩返回 %d"
 
-#: builtin/index-pack.c:515
+#: builtin/index-pack.c:536
 msgid "offset value overflow for delta base object"
 msgstr "�移值覆盖了 delta 基准对象"
 
-#: builtin/index-pack.c:523
+#: builtin/index-pack.c:544
 msgid "delta base offset is out of bound"
 msgstr "delta 基准�移越界"
 
-#: builtin/index-pack.c:531
+#: builtin/index-pack.c:552
 #, c-format
 msgid "unknown object type %d"
 msgstr "未知对象类型 %d"
 
-#: builtin/index-pack.c:562
+#: builtin/index-pack.c:583
 msgid "cannot pread pack file"
 msgstr "无法读�包文件"
 
-#: builtin/index-pack.c:564
+#: 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] "包文件过早结�，缺少 %<PRIuMAX> 字节"
 msgstr[1] "包文件过早结�，缺少 %<PRIuMAX> 字节"
 
-#: builtin/index-pack.c:590
+#: builtin/index-pack.c:611
 msgid "serious inflate inconsistency"
 msgstr "解压缩严�的�一致"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: 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 "�现 %s 出现 SHA1 冲��"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: 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 "�能读 %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:823
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "�能读�现存对象信� %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:831
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "�能读�现存对象 %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:845
 #, c-format
 msgid "invalid blob object %s"
 msgstr "无效的数�对象 %s"
 
-#: builtin/index-pack.c:826 builtin/index-pack.c:845
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
 msgid "fsck error in packed object"
 msgstr "对打包对象 fsck 检查出错"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:869
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s 的所有�对象并�都�达"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
 msgid "failed to apply delta"
 msgstr "应用 delta 失败"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Receiving objects"
 msgstr "接收对象中"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1160
 msgid "Indexing objects"
 msgstr "索引对象中"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1194
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "包冲�（SHA1 �匹�）"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1199
 msgid "cannot fstat packfile"
 msgstr "�能对包文件调用 fstat"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1202
 msgid "pack has junk at the end"
 msgstr "包的结尾有垃圾数�"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1214
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() 中�到���喻的问题"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1237
 msgid "Resolving deltas"
 msgstr "处� delta 中"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "�能创建线程：%s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1281
 msgid "confusion beyond insanity"
 msgstr "���喻"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1287
 #, 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:1264
+#: builtin/index-pack.c:1299
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "对 %s 的尾部校验出现�外（�盘��？）"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1303
 #, 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:1292
+#: builtin/index-pack.c:1327
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "�能压缩附加对象（%d）"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1423
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "本地对象 %s 已��"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1444
 #, c-format
-msgid "packfile name '%s' does not end with '.pack'"
-msgstr "包文件� '%s' 没有以 '.pack' 结尾"
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "包文件� '%s' 没有以 '.%s' 结尾"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1468
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "无法写入 %s 文件 '%s'"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1476
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "无法关闭已写入的 %s 文件 '%s'"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1502
 msgid "error while closing pack file"
 msgstr "关闭包文件时出错"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1516
 msgid "cannot store pack file"
 msgstr "无法存储包文件"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1524
 msgid "cannot store index file"
 msgstr "无法存储索引文件"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "�的 pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1649
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "无法打开现存包文件 '%s'"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1651
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "无法为 %s 打开包索引文件"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1699
 #, 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:1650
+#: builtin/index-pack.c:1706
 #, 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:1689
+#: builtin/index-pack.c:1748
 msgid "Cannot come back to cwd"
 msgstr "无法返回当�工作目录"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: 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 "错误选项 %s"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "未知的哈希算法 '%s'"
+
+#: builtin/index-pack.c:1850
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin �能和 --stdin �时使用"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1852
 msgid "--stdin requires a git repository"
-msgstr "--stdin 需�一个 git 仓库"
+msgstr "--stdin 需� git 仓库"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format �能和 --stdin �时使用"
+
+#: builtin/index-pack.c:1869
 msgid "--verify with no packfile name given"
 msgstr "--verify 没有�供包文件��数"
 
-#: builtin/index-pack.c:1833 builtin/unpack-objects.c:580
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
 msgid "fsck error in pack objects"
 msgstr "在打包对象中 fsck 检查出错"
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "�能对模版 '%s' 调用 stat"
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "�能打开目录 '%s'"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "�能读�链接 '%s'"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "�能自 '%s' 到 '%s' 创建符�链接"
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "�能拷� '%s' 至 '%s'"
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "忽略模版 %s"
 
-#: builtin/init-db.c:121
+#: builtin/init-db.c:123
 #, c-format
 msgid "templates not found in %s"
 msgstr "没有在 %s 中找到模版"
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "没有从 '%s' �制模版：%s"
 
-#: builtin/init-db.c:334
+#: builtin/init-db.c:263
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "无效的�始分支�：'%s'"
+
+#: builtin/init-db.c:354
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "�能处� %d 类型的文件"
 
-#: builtin/init-db.c:337
+#: builtin/init-db.c:357
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "�能移动 %s 至 %s"
 
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:373
+msgid "attempt to reinitialize repository with different hash"
+msgstr "�试用��的哈希算法�新�始化仓库"
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s 已�存在"
 
-#: builtin/init-db.c:413
+#: builtin/init-db.c:432
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init：已忽略 --initial-branch=%s"
+
+#: 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:414
+#: 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:418
+#: 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:419
+#: 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:468
+#: builtin/init-db.c:518
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
@@ -14156,36 +16524,56 @@ msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<模�目录>] [--shared[=<��>]] "
 "[<目录>]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:544
 msgid "permissions"
 msgstr "��"
 
-#: builtin/init-db.c:492
+#: builtin/init-db.c:545
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 仓库是多个用户之间共享的"
 
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: builtin/init-db.c:551
+msgid "override the name of the initial branch"
+msgstr "覆盖�始分支�称"
+
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "hash"
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir 和 --bare 是互斥的"
+
+#: builtin/init-db.c:591 builtin/init-db.c:596
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "�能创建目录 %s"
 
-#: builtin/init-db.c:538
+#: builtin/init-db.c:600 builtin/init-db.c:655
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "�能切�目录到 %s"
 
-#: builtin/init-db.c:559
+#: 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:587
+#: builtin/init-db.c:679
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "�能访问工作区 '%s'"
 
+#: builtin/init-db.c:684
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir �能用于纯仓库"
+
 #: builtin/interpret-trailers.c:16
 msgid ""
 "git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
@@ -14200,23 +16588,23 @@ msgstr "在原�编辑文件"
 
 #: builtin/interpret-trailers.c:96
 msgid "trim empty trailers"
-msgstr "删除空的尾部署�"
+msgstr "删除空的尾注"
 
 #: builtin/interpret-trailers.c:99
 msgid "where to place the new trailer"
-msgstr "在哪里放置新的尾部署�"
+msgstr "在哪里放置新的尾注"
 
 #: builtin/interpret-trailers.c:101
 msgid "action if trailer already exists"
-msgstr "当尾部署�已�存在时所采�的动作"
+msgstr "当尾注已�存在时所采�的动作"
 
 #: builtin/interpret-trailers.c:103
 msgid "action if trailer is missing"
-msgstr "当尾部署�缺失时所采�的动作"
+msgstr "当尾注缺失时所采�的动作"
 
 #: builtin/interpret-trailers.c:105
 msgid "output only the trailers"
-msgstr "�输出尾部署�"
+msgstr "�输出尾注"
 
 #: builtin/interpret-trailers.c:106
 msgid "do not apply config rules"
@@ -14234,13 +16622,9 @@ msgstr "设置解�选项"
 msgid "do not treat --- specially"
 msgstr "��对 --- 特殊处�"
 
-#: builtin/interpret-trailers.c:111
-msgid "trailer"
-msgstr "尾部署�"
-
 #: builtin/interpret-trailers.c:112
 msgid "trailer(s) to add"
-msgstr "�添加的尾部署�"
+msgstr "�添加的尾注"
 
 #: builtin/interpret-trailers.c:123
 msgid "--trailer with --only-input does not make sense"
@@ -14250,121 +16634,128 @@ msgstr "--trailer 和 --only-input �时使用没有�义"
 msgid "no input file given for in-place editing"
 msgstr "没有给出�原�编辑的文件"
 
-#: builtin/log.c:55
+#: builtin/log.c:59
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:60
 msgid "git show [<options>] <object>..."
 msgstr "git show [<选项>] <对象>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:113
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "无效的 --decorate 选项：%s"
 
-#: builtin/log.c:173
+#: builtin/log.c:180
 msgid "show source"
 msgstr "显示�"
 
-#: builtin/log.c:174
-msgid "Use mail map file"
+#: builtin/log.c:181
+msgid "use mail map file"
 msgstr "使用邮件映射文件"
 
-#: builtin/log.c:176
+#: builtin/log.c:184
 msgid "only decorate refs that match <pattern>"
 msgstr "�修饰与 <模�> 匹�的引用"
 
-#: builtin/log.c:178
+#: builtin/log.c:186
 msgid "do not decorate refs that match <pattern>"
 msgstr "�修饰和 <模�> 匹�的引用"
 
-#: builtin/log.c:179
+#: builtin/log.c:187
 msgid "decorate options"
 msgstr "修饰选项"
 
-#: builtin/log.c:182
-msgid "Process line range n,m in file, counting from 1"
-msgstr "处�文件中第 n 到 m 之间的行，从 1 开始"
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr "跟踪 <文件> 中 <开始>,<结�> 范围内的行或函数 :<函数�> 的演�"
+
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<范围>:<文件> �能和路径表达�共用"
 
-#: builtin/log.c:280
+#: builtin/log.c:306
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最终输出：%d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:571
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: ��的文件"
 
-#: builtin/log.c:549 builtin/log.c:644
+#: builtin/log.c:586 builtin/log.c:676
 #, c-format
 msgid "could not read object %s"
 msgstr "�能读�对象 %s"
 
-#: builtin/log.c:669
+#: builtin/log.c:701
 #, c-format
 msgid "unknown type: %d"
 msgstr "未知类型：%d"
 
-#: builtin/log.c:792
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s：从�述生�附函的模�无效"
+
+#: builtin/log.c:853
 msgid "format.headers without value"
 msgstr "format.headers 没有值"
 
-#: builtin/log.c:909
-msgid "name of output directory is too long"
-msgstr "输出目录�太长"
-
-#: builtin/log.c:925
+#: builtin/log.c:982
 #, c-format
 msgid "cannot open patch file %s"
 msgstr "无法打开补�文件 %s"
 
-#: builtin/log.c:942
+#: builtin/log.c:999
 msgid "need exactly one range"
 msgstr "�需�一个范围"
 
-#: builtin/log.c:952
+#: builtin/log.c:1009
 msgid "not a range"
 msgstr "�是一个范围"
 
-#: builtin/log.c:1075
+#: builtin/log.c:1173
 msgid "cover letter needs email format"
 msgstr "附函需�邮件地�格�"
 
-#: builtin/log.c:1081
+#: builtin/log.c:1179
 msgid "failed to create cover-letter file"
 msgstr "无法创建附函文件"
 
-#: builtin/log.c:1160
+#: builtin/log.c:1266
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "�正常的 in-reply-to：%s"
 
-#: builtin/log.c:1187
+#: builtin/log.c:1293
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
 
-#: builtin/log.c:1245
+#: builtin/log.c:1351
 msgid "two output directories?"
 msgstr "两个输出目录？"
 
-#: builtin/log.c:1356 builtin/log.c:2116 builtin/log.c:2118 builtin/log.c:2130
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
 #, c-format
 msgid "unknown commit %s"
 msgstr "未知�交 %s"
 
-#: builtin/log.c:1366 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 "无法将 '%s' 解�为一个有效引用"
 
-#: builtin/log.c:1371
+#: builtin/log.c:1522
 msgid "could not find exact merge base"
 msgstr "�能找到准确的�并基线"
 
-#: builtin/log.c:1375
+#: 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"
@@ -14374,376 +16765,401 @@ msgstr ""
 "git branch --set-upstream-to �跟踪一个远程分支。或者你�以通过\n"
 "�数 --base=<基线�交> 手动指定一个基线�交"
 
-#: builtin/log.c:1395
+#: builtin/log.c:1555
 msgid "failed to find exact merge base"
 msgstr "无法找到准确的�并基线"
 
-#: builtin/log.c:1406
+#: builtin/log.c:1572
 msgid "base commit should be the ancestor of revision list"
 msgstr "基线�交应该是版本列表的祖先"
 
-#: builtin/log.c:1410
+#: builtin/log.c:1582
 msgid "base commit shouldn't be in revision list"
 msgstr "基线�交�应该出现在版本列表中"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1640
 msgid "cannot get patch id"
 msgstr "无法得到补� id"
 
-#: builtin/log.c:1515
-msgid "failed to infer range-diff ranges"
-msgstr "无法推断 range-diff 范围"
+#: builtin/log.c:1703
+msgid "failed to infer range-diff origin of current series"
+msgstr "无法推断当�系列的 range-diff 起始"
+
+#: builtin/log.c:1705
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "使用 '%s' 作为当�系列的 range-diff �"
 
-#: builtin/log.c:1560
+#: builtin/log.c:1749
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，�使�有一个补�"
 
-#: builtin/log.c:1563
+#: builtin/log.c:1752
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，�使有多个补�"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1756
 msgid "print patches to standard out"
 msgstr "打�补�到标准输出"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1758
 msgid "generate a cover letter"
 msgstr "生�一�附函"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1760
 msgid "use simple number sequence for output file names"
 msgstr "使用简�的数字�列作为输出文件�"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1761
 msgid "sfx"
 msgstr "�缀"
 
-#: builtin/log.c:1573
+#: builtin/log.c:1762
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <�缀> 代替 '.patch'"
 
-#: builtin/log.c:1575
+#: builtin/log.c:1764
 msgid "start numbering patches at <n> instead of 1"
 msgstr "补�以 <n> 开始编�，而�是1"
 
-#: builtin/log.c:1577
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "�制-计数"
+
+#: builtin/log.c:1766
 msgid "mark the series as Nth re-roll"
 msgstr "标记补�系列是第几次�制"
 
-#: builtin/log.c:1579
-msgid "Use [RFC PATCH] instead of [PATCH]"
+#: builtin/log.c:1768
+msgid "max length of output filename"
+msgstr "输出文件�的最大长度"
+
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1582
-msgid "Use [<prefix>] instead of [PATCH]"
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr "从分支�述获�附函的模�"
+
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "基于一个分支�述生�部分附函"
+
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<�缀>] 代替 [PATCH]"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1779
 msgid "store resulting files in <dir>"
 msgstr "把结果文件存储在 <目录>"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1782
 msgid "don't strip/add [PATCH]"
 msgstr "�删除/添加 [PATCH]"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1785
 msgid "don't output binary diffs"
 msgstr "�输出二进制差异"
 
-#: builtin/log.c:1593
+#: builtin/log.c:1787
 msgid "output all-zero hash in From header"
 msgstr "在 From 头信�中输出全为零的哈希值"
 
-#: builtin/log.c:1595
+#: builtin/log.c:1789
 msgid "don't include a patch matching a commit upstream"
 msgstr "�包�已在上游�交中的补�"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1791
 msgid "show patch format instead of default (patch + stat)"
 msgstr "显示纯补�格�而�默认的（补�+状�）"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1793
 msgid "Messaging"
 msgstr "邮件��"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1794
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1795
 msgid "add email header"
 msgstr "添加邮件头"
 
-#: builtin/log.c:1602 builtin/log.c:1604
+#: builtin/log.c:1796 builtin/log.c:1797
 msgid "email"
 msgstr "邮件地�"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1796
 msgid "add To: header"
 msgstr "添加收件人"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1797
 msgid "add Cc: header"
 msgstr "添加抄�"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1798
 msgid "ident"
 msgstr "标识"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1799
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "将 From 地�设置为 <标识>（如若��供，则用�交者 ID �为地�）"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1801
 msgid "message-id"
 msgstr "邮件标识"
 
-#: builtin/log.c:1610
+#: builtin/log.c:1802
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一�邮件作为对 <邮件标识> 的回�"
 
-#: builtin/log.c:1611 builtin/log.c:1614
+#: builtin/log.c:1803 builtin/log.c:1806
 msgid "boundary"
 msgstr "边界"
 
-#: builtin/log.c:1612
+#: builtin/log.c:1804
 msgid "attach the patch"
 msgstr "附件方�添加补�"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1807
 msgid "inline the patch"
 msgstr "内�显示补�"
 
-#: builtin/log.c:1619
+#: builtin/log.c:1811
 msgid "enable message threading, styles: shallow, deep"
 msgstr "�用邮件线索，风格：浅，深"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1813
 msgid "signature"
 msgstr "签�"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1814
 msgid "add a signature"
 msgstr "添加一个签�"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1815
 msgid "base-commit"
 msgstr "基线�交"
 
-#: builtin/log.c:1624
+#: builtin/log.c:1816
 msgid "add prerequisite tree info to the patch series"
 msgstr "为补�列表添加�置树信�"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1819
 msgid "add a signature from a file"
 msgstr "从文件添加一个签�"
 
-#: builtin/log.c:1627
+#: builtin/log.c:1820
 msgid "don't print the patch filenames"
 msgstr "��打�补�文件�"
 
-#: builtin/log.c:1629
+#: builtin/log.c:1822
 msgid "show progress while generating patches"
 msgstr "在生�补�时显示进度"
 
-#: builtin/log.c:1631
+#: builtin/log.c:1824
 msgid "show changes against <rev> in cover letter or single patch"
-msgstr "在附函或�个补�中显示和 <rev> 的差异"
+msgstr "在附函或�个补�中显示和 <版本> 的差异"
 
-#: builtin/log.c:1634
+#: builtin/log.c:1827
 msgid "show changes against <refspec> in cover letter or single patch"
-msgstr "在附函或�个补�中显示和 <refspec> 的差异"
+msgstr "在附函或�个补�中显示和 <引用规格> 的差异"
 
-#: builtin/log.c:1636
+#: builtin/log.c:1829 builtin/range-diff.c:28
 msgid "percentage by which creation is weighted"
 msgstr "创建��的百分比"
 
-#: builtin/log.c:1711
+#: builtin/log.c:1916
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包�无效的身份标识：%s"
 
-#: builtin/log.c:1726
+#: builtin/log.c:1931
 msgid "-n and -k are mutually exclusive"
 msgstr "-n 和 -k 互斥"
 
-#: builtin/log.c:1728
+#: builtin/log.c:1933
 msgid "--subject-prefix/--rfc and -k are mutually exclusive"
 msgstr "--subject-prefix/--rfc 和 -k 互斥"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1941
 msgid "--name-only does not make sense"
 msgstr "--name-only 无�义"
 
-#: builtin/log.c:1738
+#: builtin/log.c:1943
 msgid "--name-status does not make sense"
 msgstr "--name-status 无�义"
 
-#: builtin/log.c:1740
+#: builtin/log.c:1945
 msgid "--check does not make sense"
 msgstr "--check 无�义"
 
-#: builtin/log.c:1773
-msgid "standard output, or directory, which one?"
-msgstr "标准输出或目录，哪一个？"
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout�--output 和 --output-directory 是互斥的"
 
-#: builtin/log.c:1877
+#: builtin/log.c:2089
 msgid "--interdiff requires --cover-letter or single patch"
 msgstr "--interdiff 需� --cover-letter 或�一补�"
 
-#: builtin/log.c:1881
+#: builtin/log.c:2093
 msgid "Interdiff:"
 msgstr "版本间差异："
 
-#: builtin/log.c:1882
+#: builtin/log.c:2094
 #, c-format
 msgid "Interdiff against v%d:"
 msgstr "对 v%d 的版本差异："
 
-#: builtin/log.c:1888
+#: builtin/log.c:2100
 msgid "--creation-factor requires --range-diff"
 msgstr "--creation-factor 需� --range-diff"
 
-#: builtin/log.c:1892
+#: builtin/log.c:2104
 msgid "--range-diff requires --cover-letter or single patch"
 msgstr "--range-diff 需� --cover-letter 或�一补�"
 
-#: builtin/log.c:1900
+#: builtin/log.c:2112
 msgid "Range-diff:"
 msgstr "范围差异："
 
-#: builtin/log.c:1901
+#: builtin/log.c:2113
 #, c-format
 msgid "Range-diff against v%d:"
 msgstr "对 v%d 的范围差异："
 
-#: builtin/log.c:1912
+#: builtin/log.c:2124
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "无法读�签�文件 '%s'"
 
-#: builtin/log.c:1948
+#: builtin/log.c:2160
 msgid "Generating patches"
 msgstr "生�补�"
 
-#: builtin/log.c:1992
+#: builtin/log.c:2204
 msgid "failed to create output files"
 msgstr "无法创建输出文件"
 
-#: builtin/log.c:2051
+#: builtin/log.c:2263
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<头> [<�制>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2317
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "�能找到跟踪的远程分支，请手工指定 <上游>。\n"
 
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:563
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<选项>] [<文件>...]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:619
 msgid "identify the file status with tags"
 msgstr "用标签标识文件的状�"
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:621
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "使用�写字�表示 '�设未改�的' 文件"
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:623
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "使用�写字�表示 'fsmonitor clean' 文件"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:625
 msgid "show cached files in the output (default)"
 msgstr "显示缓存的文件（默认）"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:627
 msgid "show deleted files in the output"
 msgstr "显示已删除的文件"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:629
 msgid "show modified files in the output"
 msgstr "显示已修改的文件"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:631
 msgid "show other files in the output"
 msgstr "显示其它文件"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:633
 msgid "show ignored files in the output"
 msgstr "显示忽略的文件"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:636
 msgid "show staged contents' object name in the output"
 msgstr "显示暂存区内容的对象�称"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:638
 msgid "show files on the filesystem that need to be removed"
 msgstr "显示文件系统需�删除的文件"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:640
 msgid "show 'other' directories' names only"
 msgstr "�显示“其他�目录的�称"
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:642
 msgid "show line endings of files"
 msgstr "显示文件�行符格�"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:644
 msgid "don't show empty directories"
 msgstr "�显示空目录"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:647
 msgid "show unmerged files in the output"
 msgstr "显示未�并的文件"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:649
 msgid "show resolve-undo information"
 msgstr "显示 resolve-undo 信�"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:651
 msgid "skip files matching pattern"
-msgstr "匹�排除文件的模�"
+msgstr "跳过和模�匹�的文件"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:654
 msgid "exclude patterns are read from <file>"
 msgstr "从 <文件> 中读�排除模�"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:657
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "从 <文件> 读��外的�个目录的排除模�"
 
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:659
 msgid "add the standard git exclusions"
 msgstr "添加标准的 git 排除"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:663
 msgid "make the output relative to the project top directory"
 msgstr "显示相对于顶级目录的文件�"
 
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:666
 msgid "recurse through submodules"
 msgstr "在�模组中递归"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:668
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "如果任何 <文件> 都�在索引区，视为错误"
 
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:669
 msgid "tree-ish"
-msgstr "树或�交"
+msgstr "树对象"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:670
 msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr "�装自从 <树或�交> 之�删除的路径�然存在"
+msgstr "�装自从 <树对象> 之�删除的路径�然存在"
 
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:672
 msgid "show debugging data"
 msgstr "显示调试数�"
 
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+msgstr "抑制���目"
+
 #: builtin/ls-remote.c:9
 msgid ""
 "git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
@@ -14754,45 +17170,45 @@ msgstr ""
 "                     [-q | --quiet] [--exit-code] [--get-url]\n"
 "                     [--symref] [<仓库> [<引用>...]]"
 
-#: builtin/ls-remote.c:59
+#: builtin/ls-remote.c:60
 msgid "do not print remote URL"
 msgstr "�打�远程 URL"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
+#: 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 "远程主机上的 git-upload-pack 路径"
 
-#: builtin/ls-remote.c:65
+#: builtin/ls-remote.c:66
 msgid "limit to tags"
 msgstr "仅�于标签"
 
-#: builtin/ls-remote.c:66
+#: builtin/ls-remote.c:67
 msgid "limit to heads"
 msgstr "仅�于分支"
 
-#: builtin/ls-remote.c:67
+#: builtin/ls-remote.c:68
 msgid "do not show peeled tags"
 msgstr "�显示已解�的标签"
 
-#: builtin/ls-remote.c:69
+#: builtin/ls-remote.c:70
 msgid "take url.<base>.insteadOf into account"
 msgstr "�考 url.<base>.insteadOf 设置"
 
-#: builtin/ls-remote.c:72
+#: builtin/ls-remote.c:73
 msgid "exit with exit code 2 if no matching refs are found"
 msgstr "若未找到匹�的引用则以退出�2退出"
 
-#: builtin/ls-remote.c:75
+#: builtin/ls-remote.c:76
 msgid "show underlying ref in addition to the object pointed by it"
 msgstr "除了显示指�的对象外，显示指�的引用�"
 
 #: builtin/ls-tree.c:30
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<选项>] <树或�交> [<路径>...]"
+msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
 
 #: builtin/ls-tree.c:128
 msgid "only show trees"
@@ -14826,196 +17242,347 @@ msgstr "使用文件的全路径"
 msgid "list entire tree; not just current directory (implies --full-name)"
 msgstr "列出整个树；�仅仅当�目录（�� --full-name）"
 
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<选项>] <消�> <补�> < mail >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "��主题"
+
+#: 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 "拷� Message-ID 至�交说明结尾"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "将元数��新编�为 i18n.commitEncoding"
+
+#: 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 "<动作>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "找到引�中的 CR 时的�作"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "在消�正文中使用标头"
+
 #: builtin/mailsplit.c:241
 #, c-format
 msgid "empty mbox: '%s'"
 msgstr "空的 mbox：'%s'"
 
-#: builtin/merge.c:55
-msgid "git merge [<options>] [<commit>...]"
-msgstr "git merge [<选项>] [<�交>...]"
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <�交> <�交>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <�交>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <�交>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <�交> <�交>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <引用> [<�交>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "输出所有共�的祖先"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "查找一个多路�并的祖先�交"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "显示�能被其他访问到的版本"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "第一个是其他的祖先�交么？"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "根� <引用> 的引用日志查找 <�交> 的分�点"
 
-#: builtin/merge.c:56
-msgid "git merge --abort"
-msgstr "git merge --abort"
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<选项>] [-L <�字1> [-L <�始�字> [-L <�字2>]]] <文件1> <�"
+"始文件> <文件2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "将结果��到标准输出"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "使用基于 diff3 的�并"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "如果冲�，使用我们的版本"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "如果冲�，使用他们的版本"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "如果冲�，使用��版本"
 
-#: builtin/merge.c:57
-msgid "git merge --continue"
-msgstr "git merge --continue"
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "如果冲�，使用指定长度的标记"
 
-#: builtin/merge.c:118
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "��警告冲�"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "为 文件1/�始文件/文件2 设置标签"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "未知选项 %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "�能解�对象 '%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] "无法处� %d �以上的基线。忽略 %s。"
+msgstr[1] "无法处� %d �以上的基线。忽略 %s。"
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "�能处�两个头�并之外的任何�作。"
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "无法解�引用 '%s'"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "�并 %s 和 %s\n"
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<选项>] [<�交>...]"
+
+#: builtin/merge.c:123
 msgid "switch `m' requires a value"
 msgstr "开关 `m' 需�一个值"
 
-#: builtin/merge.c:141
+#: builtin/merge.c:146
 #, c-format
 msgid "option `%s' requires a value"
 msgstr "选项 `%s' 需�一个值"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:199
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "�能找到�并策略 '%s'。\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:200
 #, c-format
 msgid "Available strategies are:"
 msgstr "�用的策略有："
 
-#: builtin/merge.c:193
+#: builtin/merge.c:205
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "�用的自定义策略有："
 
-#: builtin/merge.c:244 builtin/pull.c:152
+#: builtin/merge.c:256 builtin/pull.c:133
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在�并的最��显示差异统计"
 
-#: builtin/merge.c:247 builtin/pull.c:155
+#: builtin/merge.c:259 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr "在�并的最�显示差异统计"
 
-#: builtin/merge.c:248 builtin/pull.c:158
+#: builtin/merge.c:260 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "（和 --stat �义）"
 
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:262 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在�并�交信�中添加（最多 <n> �）精简�交记录"
 
-#: builtin/merge.c:253 builtin/pull.c:167
+#: builtin/merge.c:265 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr "创建一个�独的�交而�是�一次�并"
 
-#: builtin/merge.c:255 builtin/pull.c:170
+#: builtin/merge.c:267 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果�并�功，执行一次�交（默认）"
 
-#: builtin/merge.c:257 builtin/pull.c:173
+#: builtin/merge.c:269 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "在�交�编辑�交说明"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:271
 msgid "allow fast-forward (default)"
 msgstr "�许快进（默认）"
 
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:273 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "如果�能快进就放弃�并"
 
-#: builtin/merge.c:265 builtin/pull.c:183
+#: builtin/merge.c:277 builtin/pull.c:164
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "验�指定的�交是�包�一个有效的 GPG 签�"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:493 builtin/rebase.c:1501 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 "ç­–ç•¥"
 
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:279 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "�使用的�并策略"
 
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:280 builtin/pull.c:172
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:281 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "所选的�并策略的选项"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:283
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "�并的�交说明（针对�快进��并）"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:290
 msgid "abort the current in-progress merge"
 msgstr "放弃当�正在进行的�并"
 
 #
-#: builtin/merge.c:280
+#: builtin/merge.c:292
 msgid "--abort but leave index and working tree alone"
 msgstr "--abort，但是�留索引和工作区"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:294
 msgid "continue the current in-progress merge"
 msgstr "继续当�正在进行的�并"
 
-#: builtin/merge.c:284 builtin/pull.c:199
+#: builtin/merge.c:296 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "�许�并�相关的历�"
 
-#: builtin/merge.c:290
+#: builtin/merge.c:303
 msgid "bypass pre-merge-commit and commit-msg hooks"
 msgstr "绕过 pre-merge-commit 和 commit-msg 钩�"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:320
 msgid "could not run stash."
 msgstr "�能�行贮�。"
 
-#: builtin/merge.c:312
+#: builtin/merge.c:325
 msgid "stash failed"
 msgstr "贮�失败"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:330
 #, c-format
 msgid "not a valid object: %s"
 msgstr "�是一个有效对象：%s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:352 builtin/merge.c:369
 msgid "read-tree failed"
 msgstr "读�树失败"
 
-#  译者：注����导空格
-#: builtin/merge.c:386
-msgid " (nothing to squash)"
-msgstr " （无�压缩）"
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
+msgstr "已�是最新的。（无�挤压）"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:414
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
-msgstr "压缩�交 -- 未更新 HEAD\n"
+msgstr "挤压�交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:464
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "无�并信� -- 未更新 HEAD\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:515
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 没有指�一个�交"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:603
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "�的 branch.%s.mergeoptions 字符串：%s"
 
-#: builtin/merge.c:705
+#: builtin/merge.c:729
 msgid "Not handling anything other than two heads merge."
 msgstr "未处�两个头�并之外的任何�作。"
 
-#: builtin/merge.c:719
+#: builtin/merge.c:742
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "merge-recursive 的未知选项：-X%s"
 
-#: builtin/merge.c:734
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
 #, c-format
 msgid "unable to write %s"
 msgstr "�能写 %s"
 
-#: builtin/merge.c:786
+#: builtin/merge.c:813
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "�能从 '%s' 读�"
 
-#: builtin/merge.c:795
+#: builtin/merge.c:822
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未�交�并，使用 'git commit' 完�此次�并。\n"
 
-#: builtin/merge.c:801
+#: 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"
@@ -15025,83 +17592,83 @@ msgstr ""
 "�并到主题分支。\n"
 "\n"
 
-#: builtin/merge.c:806
+#: builtin/merge.c:833
 msgid "An empty message aborts the commit.\n"
 msgstr "空的�交说明会终止�交。\n"
 
-#: builtin/merge.c:809
+#: builtin/merge.c:836
 #, 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:862
+#: builtin/merge.c:889
 msgid "Empty commit message."
 msgstr "空�交信�。"
 
-#: builtin/merge.c:877
+#: builtin/merge.c:904
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:965
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自动�并失败，修正冲�然��交修正的结果。\n"
 
-#: builtin/merge.c:977
+#: builtin/merge.c:1004
 msgid "No current branch."
 msgstr "没有当�分支。"
 
-#: builtin/merge.c:979
+#: builtin/merge.c:1006
 msgid "No remote for the current branch."
 msgstr "当�分支没有对应的远程仓库。"
 
-#: builtin/merge.c:981
+#: builtin/merge.c:1008
 msgid "No default upstream defined for the current branch."
 msgstr "当�分支没有定义默认的上游分支。"
 
-#: builtin/merge.c:986
+#: builtin/merge.c:1013
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "对于 %s 没有�自 %s 的远程跟踪分支"
 
-#: builtin/merge.c:1043
+#: builtin/merge.c:1070
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "环境 '%2$s' 中存在�的�值 '%1$s'"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1173
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "�能在 %s 中�并：%s"
 
-#: builtin/merge.c:1180
+#: builtin/merge.c:1207
 msgid "not something we can merge"
 msgstr "�能�并"
 
-#: builtin/merge.c:1283
+#: builtin/merge.c:1317
 msgid "--abort expects no arguments"
 msgstr "--abort �带�数"
 
-#: builtin/merge.c:1287
+#: builtin/merge.c:1321
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "没有�终止的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1296
+#: builtin/merge.c:1339
 msgid "--quit expects no arguments"
 msgstr "--quit �带�数"
 
-#: builtin/merge.c:1309
+#: builtin/merge.c:1352
 msgid "--continue expects no arguments"
 msgstr "--continue �带�数"
 
-#: builtin/merge.c:1313
+#: builtin/merge.c:1356
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "没有进行中的�并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1329
+#: builtin/merge.c:1372
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15109,7 +17676,7 @@ msgstr ""
 "您尚未结�您的�并（存在 MERGE_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1336
+#: builtin/merge.c:1379
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -15117,210 +17684,132 @@ msgstr ""
 "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。\n"
 "请在�并�先�交您的修改。"
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1382
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未结�您的拣选（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1353
+#: builtin/merge.c:1396
 msgid "You cannot combine --squash with --no-ff."
 msgstr "您�能将 --squash 和 --no-ff 组�使用。"
 
-#: builtin/merge.c:1355
+#: builtin/merge.c:1398
 msgid "You cannot combine --squash with --commit."
 msgstr "您�能将 --squash 和 --commit 组�使用。"
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1414
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定�交并且 merge.defaultToUpstream 未设置。"
 
-#: builtin/merge.c:1388
+#: builtin/merge.c:1431
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚�支�到空分支的压缩�交"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1433
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的�快进��交没有�义"
 
-#: builtin/merge.c:1395
+#: builtin/merge.c:1438
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - �能被�并"
 
-#: builtin/merge.c:1397
+#: builtin/merge.c:1440
 msgid "Can merge only exactly one commit into empty head"
 msgstr "�能将一个�交�并到空分支上"
 
-#: builtin/merge.c:1476
+#: builtin/merge.c:1521
 msgid "refusing to merge unrelated histories"
 msgstr "拒��并无关的历�"
 
-#: builtin/merge.c:1485
-msgid "Already up to date."
-msgstr "已�是最新的。"
-
-#: builtin/merge.c:1495
+#: builtin/merge.c:1540
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "æ›´æ–° %s..%s\n"
 
-#: builtin/merge.c:1537
+#: builtin/merge.c:1587
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "�试�常�的索引内�并...\n"
 
-#: builtin/merge.c:1544
+#: builtin/merge.c:1594
 #, c-format
 msgid "Nope.\n"
 msgstr "无。\n"
 
-#: builtin/merge.c:1569
-msgid "Already up to date. Yeeah!"
-msgstr "已�是最新的。耶�"
-
-#: builtin/merge.c:1575
+#: builtin/merge.c:1625
 msgid "Not possible to fast-forward, aborting."
 msgstr "无法快进，终止。"
 
-#: builtin/merge.c:1598 builtin/merge.c:1663
+#: builtin/merge.c:1653 builtin/merge.c:1719
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "将树回滚至原始状�...\n"
 
-#: builtin/merge.c:1602
+#: builtin/merge.c:1657
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "�试�并策略 %s...\n"
 
-#: builtin/merge.c:1654
+#: builtin/merge.c:1709
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "没有�并策略处�此�并。\n"
 
-#: builtin/merge.c:1656
+#: builtin/merge.c:1711
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s �并失败。\n"
 
-#: builtin/merge.c:1665
+#: builtin/merge.c:1721
 #, 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:1677
+#: builtin/merge.c:1735
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动�并进展顺利，按�求在�交��止\n"
 
-#: builtin/merge-base.c:32
-msgid "git merge-base [-a | --all] <commit> <commit>..."
-msgstr "git merge-base [-a | --all] <�交> <�交>..."
-
-#: builtin/merge-base.c:33
-msgid "git merge-base [-a | --all] --octopus <commit>..."
-msgstr "git merge-base [-a | --all] --octopus <�交>..."
-
-#: builtin/merge-base.c:34
-msgid "git merge-base --independent <commit>..."
-msgstr "git merge-base --independent <�交>..."
-
-#: builtin/merge-base.c:35
-msgid "git merge-base --is-ancestor <commit> <commit>"
-msgstr "git merge-base --is-ancestor <�交> <�交>"
-
-#: builtin/merge-base.c:36
-msgid "git merge-base --fork-point <ref> [<commit>]"
-msgstr "git merge-base --fork-point <引用> [<�交>]"
-
-#: builtin/merge-base.c:153
-msgid "output all common ancestors"
-msgstr "输出所有共�的祖先"
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
 
-#: builtin/merge-base.c:155
-msgid "find ancestors for a single n-way merge"
-msgstr "查找一个多路�并的祖先�交"
-
-#: builtin/merge-base.c:157
-msgid "list revs not reachable from others"
-msgstr "显示�能被其他访问到的版本"
-
-#: builtin/merge-base.c:159
-msgid "is the first one ancestor of the other?"
-msgstr "第一个是其他的祖先�交么？"
-
-#: builtin/merge-base.c:161
-msgid "find where <commit> forked from reflog of <ref>"
-msgstr "根� <引用> 的引用日志查找 <�交> 的派生处"
-
-#: builtin/merge-file.c:9
-msgid ""
-"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
-"<orig-file> <file2>"
-msgstr ""
-"git merge-file [<选项>] [-L <文件1> [-L <�始> [-L <�字2>]]] <文件1> <�始文"
-"件> <文件2>"
-
-#: builtin/merge-file.c:35
-msgid "send results to standard output"
-msgstr "将结果��到标准输出"
-
-#: builtin/merge-file.c:36
-msgid "use a diff3 based merge"
-msgstr "使用基于 diff3 的�并"
-
-#: builtin/merge-file.c:37
-msgid "for conflicts, use our version"
-msgstr "如果冲�，使用我们的版本"
-
-#: builtin/merge-file.c:39
-msgid "for conflicts, use their version"
-msgstr "如果冲�，使用他们的版本"
-
-#: builtin/merge-file.c:41
-msgid "for conflicts, use a union version"
-msgstr "如果冲�，使用��版本"
-
-#: builtin/merge-file.c:44
-msgid "for conflicts, use this marker size"
-msgstr "如果冲�，使用指定长度的标记"
-
-#: builtin/merge-file.c:45
-msgid "do not warn about conflicts"
-msgstr "��警告冲�"
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "警告：标签输入未通过 fsck：%s"
 
-#: builtin/merge-file.c:47
-msgid "set labels for file1/orig-file/file2"
-msgstr "为 文件1/�始文件/文件2 设置标签"
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "错误：标签输入未通过 fsck：%s"
 
-#: builtin/merge-recursive.c:47
+#: builtin/mktag.c:41
 #, c-format
-msgid "unknown option %s"
-msgstr "未知选项 %s"
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) 永远�应该触�这个回调"
 
-#: builtin/merge-recursive.c:53
+#: builtin/mktag.c:56
 #, c-format
-msgid "could not parse object '%s'"
-msgstr "�能解�对象 '%s'"
+msgid "could not read tagged object '%s'"
+msgstr "�能读�被标记的对象 '%s'"
 
-#: builtin/merge-recursive.c:57
+#: builtin/mktag.c:59
 #, c-format
-msgid "cannot handle more than %d base. Ignoring %s."
-msgid_plural "cannot handle more than %d bases. Ignoring %s."
-msgstr[0] "无法处� %d �以上的基线。忽略 %s。"
-msgstr[1] "无法处� %d �以上的基线。忽略 %s。"
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "对象 '%s' 被标记为 '%s'，然而是一个 '%s' 类型"
 
-#: builtin/merge-recursive.c:65
-msgid "not handling anything other than two heads merge."
-msgstr "�能处�两个头�并之外的任何�作。"
+#: builtin/mktag.c:97
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "标准输入上的标签未通过我们严格的 fsck 检查"
 
-#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
-#, c-format
-msgid "could not resolve ref '%s'"
-msgstr "无法解�引用 '%s'"
+#: builtin/mktag.c:100
+msgid "tag on stdin did not refer to a valid object"
+msgstr "标准输入上的标签未指�一个有效的对象"
 
-#: builtin/merge-recursive.c:82
-#, c-format
-msgid "Merging %s with %s\n"
-msgstr "�并 %s 和 %s\n"
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "无法写标签文件"
 
 #: builtin/mktree.c:66
 msgid "git mktree [-z] [--missing] [--batch]"
@@ -15338,33 +17827,41 @@ msgstr "�许丢失的对象"
 msgid "allow creation of more than one tree"
 msgstr "�许创建一个以上的树"
 
-#: builtin/multi-pack-index.c:9
-msgid ""
-"git multi-pack-index [--object-dir=<dir>] (write|verify|expire|repack --"
-"batch-size=<size>)"
-msgstr ""
-"git multi-pack-index [--object-dir=<目录>] (write|verify|expire|repack --"
-"batch-size=<大�>)"
+#: builtin/multi-pack-index.c:10
+msgid "git multi-pack-index [<options>] write [--preferred-pack=<pack>]"
+msgstr "git multi-pack-index [<选项>] write [--preferred-pack=<包>]"
 
-#: builtin/multi-pack-index.c:23
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<选项>] verify"
+
+#: builtin/multi-pack-index.c:16
+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>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [<选项>] repack [--batch-size=<尺寸>]"
+
+#: builtin/multi-pack-index.c:54
 msgid "object directory containing set of packfile and pack-index pairs"
 msgstr "包��对包文件和包索引的对象目录"
 
-#: builtin/multi-pack-index.c:25
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr "首选包"
+
+#: builtin/multi-pack-index.c:70
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr "在计算多包�图时打包以供�用"
+
+#: 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 "在 repack 期间，将较�尺寸的包文件收集到大于此大�的批次中"
 
-#: builtin/multi-pack-index.c:43 builtin/prune-packed.c:67
-msgid "too many arguments"
-msgstr "太多�数"
-
-#: builtin/multi-pack-index.c:52
-msgid "--batch-size option is only for 'repack' subcommand"
-msgstr "--batch-size 选项仅用于 'repack' �命令"
-
-#: builtin/multi-pack-index.c:61
+#: builtin/multi-pack-index.c:179
 #, c-format
 msgid "unrecognized subcommand: %s"
 msgstr "未识别的�命令：%s"
@@ -15395,113 +17892,117 @@ msgstr "强制移动/�命令，�使目标存在"
 msgid "skip move/rename errors"
 msgstr "跳过移动/�命�错误"
 
-#: builtin/mv.c:169
+#: builtin/mv.c:170
 #, c-format
 msgid "destination '%s' is not a directory"
 msgstr "目标 '%s' �是一个目录"
 
-#: builtin/mv.c:180
+#: builtin/mv.c:181
 #, c-format
 msgid "Checking rename of '%s' to '%s'\n"
 msgstr "检查 '%s' 到 '%s' 的�命�\n"
 
-#: builtin/mv.c:184
+#: builtin/mv.c:185
 msgid "bad source"
 msgstr "�的�"
 
-#: builtin/mv.c:187
+#: builtin/mv.c:188
 msgid "can not move directory into itself"
 msgstr "�能将目录移动到自身"
 
-#: builtin/mv.c:190
+#: builtin/mv.c:191
 msgid "cannot move directory over file"
 msgstr "�能将目录移动到文件"
 
-#: builtin/mv.c:199
+#: builtin/mv.c:200
 msgid "source directory is empty"
 msgstr "�目录为空"
 
-#: builtin/mv.c:224
+#: builtin/mv.c:225
 msgid "not under version control"
 msgstr "�在版本控制之下"
 
 #: builtin/mv.c:227
+msgid "conflicted"
+msgstr "冲�"
+
+#: builtin/mv.c:230
 msgid "destination exists"
 msgstr "目标已存在"
 
-#: builtin/mv.c:235
+#: builtin/mv.c:238
 #, c-format
 msgid "overwriting '%s'"
 msgstr "覆盖 '%s'"
 
-#: builtin/mv.c:238
+#: builtin/mv.c:241
 msgid "Cannot overwrite"
 msgstr "�能覆盖"
 
-#: builtin/mv.c:241
+#: builtin/mv.c:244
 msgid "multiple sources for the same target"
 msgstr "�一目标具有多个�"
 
-#: builtin/mv.c:243
+#: builtin/mv.c:246
 msgid "destination directory does not exist"
 msgstr "目标目录�存在"
 
-#: builtin/mv.c:250
+#: builtin/mv.c:253
 #, c-format
 msgid "%s, source=%s, destination=%s"
 msgstr "%s，�=%s，目标=%s"
 
-#: builtin/mv.c:271
+#: builtin/mv.c:274
 #, c-format
 msgid "Renaming %s to %s\n"
 msgstr "�命� %s 至 %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "�命� '%s' 失败"
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<选项>] <�交>..."
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<选项>] --all"
 
-#: builtin/name-rev.c:358
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<选项>] --stdin"
 
-#: builtin/name-rev.c:415
-msgid "print only names (no SHA-1)"
-msgstr "�打��称（无 SHA-1）"
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr "�打�基于引用的�称（�对象�）"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "�使用标签�命��交"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "�使用和 <模�> 相匹�的引用"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "忽略和 <模�> 相匹�的引用"
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "列出�以从所有引用访问的�交"
 
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "从标准输入读�"
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "�许打� `未定义` 的�称（默认）"
 
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "��解�输入中的标签（内部使用）"
 
@@ -15645,7 +18146,7 @@ msgstr "�能写注解对象"
 msgid "the note contents have been left in %s"
 msgstr "注解内容被留在 %s 中"
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:576
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "�能打开或读� '%s'"
@@ -15688,8 +18189,9 @@ 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
-msgid "too many parameters"
-msgstr "�数太多"
+#: builtin/prune-packed.c:25 builtin/tag.c:586
+msgid "too many arguments"
+msgstr "太多�数"
 
 #: builtin/notes.c:389 builtin/notes.c:678
 #, c-format
@@ -15746,7 +18248,7 @@ msgid "load rewriting config for <command> (implies --stdin)"
 msgstr "�新加载 <命令> 的�置（�� --stdin）"
 
 #: builtin/notes.c:517
-msgid "too few parameters"
+msgid "too few arguments"
 msgstr "�数太少"
 
 #: builtin/notes.c:538
@@ -15870,7 +18372,7 @@ msgstr ""
 "自动�并说明失败。修改 %s 中的冲�并且使用命令 'git notes merge --commit' �"
 "交结果，或者使用命令 'git notes merge --abort' 终止�并。\n"
 
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:589
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解� '%s' 为一个有效引用。"
@@ -15888,7 +18390,7 @@ msgstr "�试删除�存在的注解�是一个错误"
 msgid "read object names from the standard input"
 msgstr "从标准输入读�对象�称"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
 msgid "do not remove, show only"
 msgstr "�删除，�显示"
 
@@ -15904,139 +18406,154 @@ msgstr "注解引用"
 msgid "use notes from <notes-ref>"
 msgstr "从 <注解引用> 使用注解"
 
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1735
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "未知�命令：%s"
 
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:182
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:183
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<选项>...] <�缀�称> [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:428
+#: 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：无法定� %1$s，预期在包 %3$s 中的�移� %2$<PRIuMAX> 上"
+
+#: builtin/pack-objects.c:580
 #, c-format
 msgid "bad packed object CRC for %s"
 msgstr "%s 错的包对象 CRC"
 
-#: builtin/pack-objects.c:439
+#: builtin/pack-objects.c:591
 #, c-format
 msgid "corrupt packed object for %s"
 msgstr "%s ��的包对象"
 
-#: builtin/pack-objects.c:570
+#: builtin/pack-objects.c:722
 #, c-format
 msgid "recursive delta detected for object %s"
 msgstr "�现对象 %s 递归 delta"
 
-#: builtin/pack-objects.c:781
+#: builtin/pack-objects.c:941
 #, c-format
 msgid "ordered %u objects, expected %<PRIu32>"
 msgstr "排�了 %u 个对象，预期 %<PRIu32> 个"
 
-#: builtin/pack-objects.c:794
-#, c-format
-msgid "packfile is invalid: %s"
-msgstr "无效的包文件：%s"
-
-#: builtin/pack-objects.c:798
+#: builtin/pack-objects.c:1036
 #, c-format
-msgid "unable to open packfile for reuse: %s"
-msgstr "无法为�用打开包文件：%s"
+msgid "expected object at offset %<PRIuMAX> in pack %s"
+msgstr "预期对象在包文件 %2$s 的�移� %1$<PRIuMAX> 上"
 
-#: builtin/pack-objects.c:802
-msgid "unable to seek in reused packfile"
-msgstr "无法在�用的包文件中查找"
-
-#: builtin/pack-objects.c:813
-msgid "unable to read from reused packfile"
-msgstr "无法读�索引文件"
-
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:1155
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "�用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:1168
 msgid "Writing objects"
 msgstr "写入对象中"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "对 %s 调用 stat 失败"
 
-#: builtin/pack-objects.c:970
+#: builtin/pack-objects.c:1281
 #, c-format
 msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
 msgstr "写入 %<PRIu32> 个对象而预期 %<PRIu32> 个"
 
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1523
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "�用 bitmap 写入，因为一些对象将�会被打包"
 
-#: builtin/pack-objects.c:1592
+#: builtin/pack-objects.c:1971
 #, c-format
 msgid "delta base offset overflow in pack for %s"
 msgstr "%s 压缩中 delta 基准�移越界"
 
-#: builtin/pack-objects.c:1601
+#: builtin/pack-objects.c:1980
 #, c-format
 msgid "delta base offset out of bound for %s"
 msgstr "%s 的 delta 基准�移越界"
 
-#: builtin/pack-objects.c:1870
+#: builtin/pack-objects.c:2261
 msgid "Counting objects"
 msgstr "对象计数中"
 
-#: builtin/pack-objects.c:2000
-#, c-format
-msgid "unable to get size of %s"
-msgstr "�能得到 %s 的大�"
-
-#: builtin/pack-objects.c:2015
+#: builtin/pack-objects.c:2426
 #, c-format
 msgid "unable to parse object header of %s"
 msgstr "无法解�对象 %s 头信�"
 
-#: builtin/pack-objects.c:2085 builtin/pack-objects.c:2101
-#: builtin/pack-objects.c:2111
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
 #, c-format
 msgid "object %s cannot be read"
 msgstr "对象 %s 无法读�"
 
-#: builtin/pack-objects.c:2088 builtin/pack-objects.c:2115
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
 #, c-format
 msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
 msgstr "对象 %s �一致的对象长度（%<PRIuMAX> vs %<PRIuMAX>）"
 
-#: builtin/pack-objects.c:2125
+#: builtin/pack-objects.c:2536
 msgid "suboptimal pack - out of memory"
 msgstr "次优（suboptimal）打包 - 内存�足"
 
-#: builtin/pack-objects.c:2440
+#: builtin/pack-objects.c:2851
 #, c-format
 msgid "Delta compression using up to %d threads"
 msgstr "使用 %d 个线程进行压缩"
 
-#: builtin/pack-objects.c:2572
+#: builtin/pack-objects.c:2990
 #, c-format
 msgid "unable to pack objects reachable from tag %s"
 msgstr "无法为标签 %s 压缩对象"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:3076
 msgid "Compressing objects"
 msgstr "压缩对象中"
 
-#: builtin/pack-objects.c:2665
+#: builtin/pack-objects.c:3082
 msgid "inconsistency with delta count"
 msgstr "�一致的差异计数"
 
-#: builtin/pack-objects.c:2742
+#: 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 ""
+"uploadpack.blobpackfileuri 的�值必须是 '<object-hash> <pack-hash> <uri>' 格"
+"�（得到 '%s'）"
+
+#: builtin/pack-objects.c:3164
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr "对象已�在�外的 uploadpack.blobpackfileuri 中�置（得到 '%s'）"
+
+#: builtin/pack-objects.c:3199
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "无法获得包 %2$s 中对象 %1$s 的类型"
+
+#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "�能找到包 '%s'"
+
+#: builtin/pack-objects.c:3378
 #, c-format
 msgid ""
 "expected edge object ID, got garbage:\n"
@@ -16045,7 +18562,7 @@ msgstr ""
 "预期边界对象（edge object）ID，�得到垃圾数�：\n"
 " %s"
 
-#: builtin/pack-objects.c:2748
+#: builtin/pack-objects.c:3384
 #, c-format
 msgid ""
 "expected object ID, got garbage:\n"
@@ -16054,245 +18571,266 @@ msgstr ""
 "预期对象 ID，�得到垃圾数�：\n"
 " %s"
 
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:3482
 msgid "invalid value for --missing"
 msgstr "选项 --missing 的值无效"
 
-#: builtin/pack-objects.c:2905 builtin/pack-objects.c:3013
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
 msgid "cannot open pack index"
 msgstr "无法打开包文件索引"
 
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:3572
 #, c-format
 msgid "loose object at %s could not be examined"
 msgstr "无法检查 %s 处的�散对象"
 
-#: builtin/pack-objects.c:3021
+#: builtin/pack-objects.c:3658
 msgid "unable to force loose object"
 msgstr "无法强制�散对象"
 
-#: builtin/pack-objects.c:3113
+#: builtin/pack-objects.c:3788
 #, c-format
 msgid "not a rev '%s'"
 msgstr "�是一个版本 '%s'"
 
-#: builtin/pack-objects.c:3116
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
 #, c-format
 msgid "bad revision '%s'"
 msgstr "�的版本 '%s'"
 
-#: builtin/pack-objects.c:3141
+#: builtin/pack-objects.c:3819
 msgid "unable to add recent objects"
 msgstr "无法添加最近的对象"
 
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3872
 #, c-format
 msgid "unsupported index version %s"
 msgstr "�支�的索引版本 %s"
 
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3876
 #, c-format
 msgid "bad index version '%s'"
 msgstr "�的索引版本 '%s'"
 
-#: builtin/pack-objects.c:3228
-msgid "do not show progress meter"
-msgstr "�显示进度表"
-
-#: builtin/pack-objects.c:3230
-msgid "show progress meter"
-msgstr "显示进度表"
-
-#: builtin/pack-objects.c:3232
-msgid "show progress meter during object writing phase"
-msgstr "在对象写入阶段显示进度表"
-
-#: builtin/pack-objects.c:3235
-msgid "similar to --all-progress when progress meter is shown"
-msgstr "当进度表显示时类似于 --all-progress"
-
-#: builtin/pack-objects.c:3236
+#: builtin/pack-objects.c:3915
 msgid "<version>[,<offset>]"
 msgstr "<版本>[,<�移>]"
 
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3916
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格�版本�写包索引文件"
 
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3919
 msgid "maximum size of each output pack file"
 msgstr "�个输出包的最大尺寸"
 
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3921
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略从备用对象存储里借用对象"
 
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3923
 msgid "ignore packed objects"
 msgstr "忽略包对象"
 
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3925
 msgid "limit pack window by objects"
 msgstr "�制打包窗�的对象数"
 
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3927
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除对象数��制外设置打包窗�的内存�制"
 
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3929
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包�许的 delta 链的最大长度"
 
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3931
 msgid "reuse existing deltas"
 msgstr "�用已存在的 deltas"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3933
 msgid "reuse existing objects"
 msgstr "�用已存在的对象"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3935
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 对象"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3937
 msgid "use threads when searching for best delta matches"
 msgstr "使用线程查询最佳 delta 匹�"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3939
 msgid "do not create an empty pack output"
 msgstr "�创建空的包输出"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3941
 msgid "read revision arguments from standard input"
 msgstr "从标准输入读�版本��数"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3943
 msgid "limit the objects to those that are not yet packed"
 msgstr "�制那些尚未打包的对象"
 
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3946
 msgid "include objects reachable from any reference"
 msgstr "包括�以从任何引用访问到的对象"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3949
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日志引用到的对象"
 
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3952
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的对象"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr "从标准输入读�包"
+
+#: builtin/pack-objects.c:3957
 msgid "output pack to stdout"
 msgstr "输出包到标准输出"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3959
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包对象的标签对象"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3961
 msgid "keep unreachable objects"
 msgstr "维���达的对象"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3963
 msgid "pack loose unreachable objects"
 msgstr "打包�散的��达对象"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3965
 msgid "unpack unreachable objects newer than <time>"
 msgstr "将比给定 <时间> 新的无法访问的对象解包"
 
-#: builtin/pack-objects.c:3287
+#: builtin/pack-objects.c:3968
 msgid "use the sparse reachability algorithm"
 msgstr "使用稀��达性算法"
 
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3970
 msgid "create thin packs"
 msgstr "创建精简包"
 
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3972
 msgid "create packs suitable for shallow fetches"
 msgstr "创建适�浅克隆仓库获�的包"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3974
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略�有 .keep 文件的包"
 
-#: builtin/pack-objects.c:3295
+#: builtin/pack-objects.c:3976
 msgid "ignore this pack"
 msgstr "忽略该 pack"
 
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3978
 msgid "pack compression level"
 msgstr "打包压缩级别"
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3980
 msgid "do not hide commits by grafts"
 msgstr "显示被移���的�交"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3982
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的�）以�高对象计数时的速度"
 
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3984
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的�时创建 bitmap 索引"
 
-#: builtin/pack-objects.c:3307
+#: builtin/pack-objects.c:3988
 msgid "write a bitmap index if possible"
 msgstr "如果�能，写 bitmap 索引"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3992
 msgid "handling for missing objects"
 msgstr "处�丢失的对象"
 
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3995
 msgid "do not pack objects in promisor packfiles"
 msgstr "��打包 promisor 包文件中的对象"
 
-#: builtin/pack-objects.c:3316
+#: builtin/pack-objects.c:3997
 msgid "respect islands during delta compression"
 msgstr "在增�压缩时�考数�岛"
 
-#: builtin/pack-objects.c:3345
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr "�议"
+
+#: builtin/pack-objects.c:4000
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "使用此�议排除任何已�置的 uploadpack.blobpackfileuri"
+
+#: builtin/pack-objects.c:4033
 #, c-format
 msgid "delta chain depth %d is too deep, forcing %d"
 msgstr "增�链深度 %d 太深了，强制为 %d"
 
-#: builtin/pack-objects.c:3350
+#: builtin/pack-objects.c:4038
 #, c-format
 msgid "pack.deltaCacheLimit is too high, forcing %d"
 msgstr "�置 pack.deltaCacheLimit 太高了，强制为 %d"
 
-#: builtin/pack-objects.c:3404
+#: builtin/pack-objects.c:4094
 msgid "--max-pack-size cannot be used to build a pack for transfer"
 msgstr "�能使用 --max-pack-size �构建传输用的包文件"
 
-#: builtin/pack-objects.c:3406
+#: builtin/pack-objects.c:4096
 msgid "minimum pack size limit is 1 MiB"
 msgstr "最�的包文件大�是 1 MiB"
 
-#: builtin/pack-objects.c:3411
+#: builtin/pack-objects.c:4101
 msgid "--thin cannot be used to build an indexable pack"
 msgstr "--thin �能用于创建一个�索引包"
 
-#: builtin/pack-objects.c:3414
+#: builtin/pack-objects.c:4104
 msgid "--keep-unreachable and --unpack-unreachable are incompatible"
 msgstr "--keep-unreachable 和 --unpack-unreachable �兼容"
 
-#: builtin/pack-objects.c:3420
+#: builtin/pack-objects.c:4110
 msgid "cannot use --filter without --stdout"
 msgstr "�能在没有 --stdout 的情况下使用 --filter"
 
-#: builtin/pack-objects.c:3481
+#: builtin/pack-objects.c:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr "�能�时使用 --filter 和 --stdin-packs"
+
+#: builtin/pack-objects.c:4116
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "�能�时使用内部版本列表和 --stdin-packs"
+
+#: builtin/pack-objects.c:4175
 msgid "Enumerating objects"
-msgstr "枚举对象"
+msgstr "枚举对象中"
 
-#: builtin/pack-objects.c:3511
+#: builtin/pack-objects.c:4212
 #, c-format
-msgid "Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>)"
-msgstr "总共 %<PRIu32> （差异 %<PRIu32>），�用 %<PRIu32> （差异 %<PRIu32>）"
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"总共 %<PRIu32>（差异 %<PRIu32>），�用 %<PRIu32>（差异 %<PRIu32>），包�用 "
+"%<PRIu32>"
+
+#: 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 ""
+"准备移除 'git pack-redundant' 命令。如果您�旧使用这个\n"
+"命令，请在命令行中添加�外�数：'--i-still-use-this'，\n"
+"并通过��邮件到 <git@vger.kernel.org> 让我们知�您�旧\n"
+"使用它。 谢谢。\n"
 
 #: builtin/pack-refs.c:8
 msgid "git pack-refs [<options>]"
@@ -16306,98 +18844,94 @@ msgstr "打包一切"
 msgid "prune loose refs (default)"
 msgstr "清除�散的引用（默认）"
 
-#: builtin/prune-packed.c:9
+#: 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-packed.c:42
-msgid "Removing duplicate objects"
-msgstr "正在删除��对象"
-
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "报告清除的对象"
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "使早于给定时间的对象过期"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "�制�历 promisor 包以外的对象"
 
-#: builtin/prune.c:150
+#: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
 msgstr "�能在��仓库中执行清��作"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "%s 的值无效：%s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/pull.c:142
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "控制�模组的递归获�"
 
-#: builtin/pull.c:146
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "和�并相关的选项"
 
-#: builtin/pull.c:149
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "使用�基�作�代�并�作以�入修改"
 
-#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "�许快进�"
 
-#: builtin/pull.c:186
-msgid "automatically stash/stash pop before and after rebase"
-msgstr "�基�作��执行自动贮�和弹出贮�"
+#: builtin/pull.c:167 parse-options.h:340
+msgid "automatically stash/stash pop before and after"
+msgstr "在�作��执行自动贮�和弹出贮�"
 
-#: builtin/pull.c:202
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "和获�相关的�数"
 
-#: builtin/pull.c:212
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "强制覆盖本地分支"
 
-#: builtin/pull.c:220
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "并�拉�的�模组的数�"
 
-#: builtin/pull.c:320
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "pull.ff 的�值无效：%s"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:445
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "在您刚刚获�到的引用中没有�基�作的候选。"
 
-#: builtin/pull.c:439
+#: builtin/pull.c:447
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "在您刚刚获�到的引用中没有�并�作的候选。"
 
-#: builtin/pull.c:440
+#: builtin/pull.c:448
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "通常这�味�您�供了一个通�符引用规格但未能和远端匹�。"
 
-#: builtin/pull.c:443
+#: builtin/pull.c:451
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -16407,42 +18941,41 @@ msgstr ""
 "您�求从远程 '%s' 拉�，但是未指定一个分支。因为这�是当�\n"
 "分支默认的远程仓库，您必须在命令行中指定一个分支�。"
 
-#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73
+#: builtin/pull.c:456 builtin/rebase.c:1248
 msgid "You are not currently on a branch."
 msgstr "您当��在一个分支上。"
 
-#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:458 builtin/pull.c:473
 msgid "Please specify which branch you want to rebase against."
 msgstr "请指定您��基到哪一个分支。"
 
-#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:460 builtin/pull.c:475
 msgid "Please specify which branch you want to merge with."
 msgstr "请指定您��并哪一个分支。"
 
-#: builtin/pull.c:453 builtin/pull.c:468
+#: builtin/pull.c:461 builtin/pull.c:476
 msgid "See git-pull(1) for details."
 msgstr "详� git-pull(1)。"
 
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1353 git-parse-remote.sh:64
+#: builtin/pull.c:463 builtin/pull.c:469 builtin/pull.c:478
+#: builtin/rebase.c:1254
 msgid "<remote>"
 msgstr "<远程>"
 
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
-#: git-parse-remote.sh:65
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
 msgid "<branch>"
 msgstr "<分支>"
 
-#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
+#: builtin/pull.c:471 builtin/rebase.c:1246
 msgid "There is no tracking information for the current branch."
 msgstr "当�分支没有跟踪信�。"
 
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: builtin/pull.c:480
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "如果您想�为此分支创建跟踪信�，您�以执行："
 
-#: builtin/pull.c:477
+#: builtin/pull.c:485
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -16451,32 +18984,55 @@ msgstr ""
 "您的�置中指定��并远程的引用 '%s'，\n"
 "但是没有获�到这个引用。"
 
-#: builtin/pull.c:587
+#: builtin/pull.c:596
 #, c-format
 msgid "unable to access commit %s"
 msgstr "无法访问�交 %s"
 
-#: builtin/pull.c:867
+#: builtin/pull.c:902
 msgid "ignoring --verify-signatures for rebase"
 msgstr "为�基�作忽略 --verify-signatures"
 
-#: builtin/pull.c:922
-msgid "--[no-]autostash option is only valid with --rebase."
-msgstr "--[no-]autostash 选项�在使用 --rebase 时有效。"
-
 #: 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 ""
+"�建议在没有为�离分支指定�并策略时执行 pull �作。 您�以在执行下一次\n"
+"pull �作之�执行下�一�命令�抑制本消�：\n"
+"\n"
+"  git config pull.rebase false  # �并（缺�策略）\n"
+"  git config pull.rebase true   # �基\n"
+"  git config pull.ff only       # ä»…å¿«è¿›\n"
+"\n"
+"您�以将 \"git config\" 替�为 \"git config --global\" 以便为所有仓库设置\n"
+"缺�的�置项。您也�以在�次执行 pull 命令时添加 --rebase�--no-rebase，\n"
+"或者 --ff-only �数覆盖缺�设置。\n"
+
+#: builtin/pull.c:990
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未诞生的分支，�更添加至索引。"
 
-#: builtin/pull.c:934
+#: builtin/pull.c:994
 msgid "pull with rebase"
 msgstr "�基�拉�"
 
-#: builtin/pull.c:935
+#: builtin/pull.c:995
 msgid "please commit or stash them."
 msgstr "请�交或贮�它们。"
 
-#: builtin/pull.c:960
+#: builtin/pull.c:1020
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -16486,7 +19042,7 @@ msgstr ""
 "fetch 更新了当�的分支。快进您的工作区\n"
 "至�交 %s。"
 
-#: builtin/pull.c:966
+#: builtin/pull.c:1026
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -16503,15 +19059,15 @@ msgstr ""
 "$ git reset --hard\n"
 "��之�的状�。"
 
-#: builtin/pull.c:981
+#: builtin/pull.c:1041
 msgid "Cannot merge multiple branches into empty head."
 msgstr "无法将多个分支�并到空分支。"
 
-#: builtin/pull.c:985
+#: builtin/pull.c:1045
 msgid "Cannot rebase onto multiple branches."
 msgstr "无法�基到多个分支。"
 
-#: builtin/pull.c:992
+#: builtin/pull.c:1065
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本地�模组中有修改，无法�基"
 
@@ -16523,11 +19079,11 @@ msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
 msgid "tag shorthand without <tag>"
 msgstr "标签��未�供 <标签> �数"
 
-#: builtin/push.c:121
+#: builtin/push.c:119
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete �接�简�的目标引用�"
 
-#: builtin/push.c:167
+#: builtin/push.c:164
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -16535,7 +19091,7 @@ msgstr ""
 "\n"
 "为了永久地选择任一选项，�� 'git help config' 中的 push.default。"
 
-#: builtin/push.c:170
+#: builtin/push.c:167
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -16559,7 +19115,7 @@ msgstr ""
 "    git push %s HEAD\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:182
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -16573,7 +19129,7 @@ msgstr ""
 "\n"
 "    git push %s HEAD:<远程分支�字>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:191
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -16586,12 +19142,17 @@ msgstr ""
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:199
 #, c-format
 msgid "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "当�分支 %s 有多个上游分支，拒�推�。"
 
-#: builtin/push.c:210
+#: 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"
@@ -16601,12 +19162,7 @@ msgstr ""
 "您正推�至远程 '%s'（其并�当�分支 '%s' 的上游），\n"
 "而没有告诉我�推�什么�更新哪个远程分支。"
 
-#: builtin/push.c:269
-msgid ""
-"You didn't specify any refspecs to push, and push.default is \"nothing\"."
-msgstr "您没有为推�指定任何引用规格，并且 push.default 为 \"nothing\"。"
-
-#: builtin/push.c:276
+#: 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"
@@ -16617,7 +19173,7 @@ msgstr ""
 "�次推��，先与远程�更�并（如 'git pull ...'）。详�\n"
 "'git push --help' 中的 'Note about fast-forwards' �节。"
 
-#: builtin/push.c:282
+#: 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"
@@ -16628,7 +19184,7 @@ msgstr ""
 "检出该分支并整�远程�更（如 'git pull ...'），然��推�。详�\n"
 "'git push --help' 中的 'Note about fast-forwards' �节。"
 
-#: builtin/push.c:288
+#: 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"
@@ -16641,11 +19197,11 @@ msgstr ""
 "（如 'git pull ...'）。\n"
 "详� 'git push --help' 中的 'Note about fast-forwards' �节。"
 
-#: builtin/push.c:295
+#: builtin/push.c:277
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "更新被拒�，因为该标签在远程已�存在。"
 
-#: builtin/push.c:298
+#: 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"
@@ -16654,99 +19210,113 @@ msgstr ""
 "如果�使用 '--force' �数，您�能更新一个指���交对象的远程引用，\n"
 "也�能更新远程引用让其指�一个��交对象。\n"
 
-#: builtin/push.c:359
+#: 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 ""
+"更新被拒�，因为远程跟踪分支的最新�交自从上次检出之�已被更新。\n"
+"在强制更新�，您�能想将这些�更整�到本地（如 'git pull ...'）。\n"
+
+#: builtin/push.c:355
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "推�到 %s\n"
 
-#: builtin/push.c:366
+#: builtin/push.c:362
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "推�一些引用到 '%s' 失败"
 
-#: builtin/push.c:541
+#: builtin/push.c:544
 msgid "repository"
 msgstr "仓库"
 
-#: builtin/push.c:542 builtin/send-pack.c:164
+#: builtin/push.c:545 builtin/send-pack.c:189
 msgid "push all refs"
 msgstr "推�所有引用"
 
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:546 builtin/send-pack.c:191
 msgid "mirror all refs"
 msgstr "镜�所有引用"
 
-#: builtin/push.c:545
+#: builtin/push.c:548
 msgid "delete refs"
 msgstr "删除引用"
 
-#: builtin/push.c:546
+#: builtin/push.c:549
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "推�标签（�能使用 --all or --mirror）"
 
-#: builtin/push.c:549 builtin/send-pack.c:167
+#: builtin/push.c:552 builtin/send-pack.c:192
 msgid "force updates"
 msgstr "强制更新"
 
-#: builtin/push.c:551 builtin/send-pack.c:181
+#: builtin/push.c:553 builtin/send-pack.c:204
 msgid "<refname>:<expect>"
 msgstr "<引用�>:<期望值>"
 
-#: builtin/push.c:552 builtin/send-pack.c:182
+#: builtin/push.c:554 builtin/send-pack.c:205
 msgid "require old value of ref to be at this value"
 msgstr "�求引用旧的�值为设定值"
 
-#: builtin/push.c:555
+#: builtin/push.c:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "�求远程更新在本地被整�"
+
+#: builtin/push.c:560
 msgid "control recursive pushing of submodules"
 msgstr "控制�模组的递归推�"
 
-#: builtin/push.c:557 builtin/send-pack.c:175
+#: builtin/push.c:561 builtin/send-pack.c:199
 msgid "use thin pack"
 msgstr "使用精简打包"
 
-#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
-#: builtin/send-pack.c:162
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
 msgid "receive pack program"
 msgstr "接收包程�"
 
-#: builtin/push.c:560
+#: builtin/push.c:564
 msgid "set upstream for git pull/status"
 msgstr "设置 git pull/status 的上游"
 
-#: builtin/push.c:563
+#: builtin/push.c:567
 msgid "prune locally removed refs"
 msgstr "清除本地删除的引用"
 
-#: builtin/push.c:565
+#: builtin/push.c:569
 msgid "bypass pre-push hook"
 msgstr "绕过 pre-push 钩�"
 
-#: builtin/push.c:566
+#: builtin/push.c:570
 msgid "push missing but relevant tags"
 msgstr "推�缺失但有关的标签"
 
-#: builtin/push.c:569 builtin/send-pack.c:169
+#: builtin/push.c:572 builtin/send-pack.c:193
 msgid "GPG sign the push"
 msgstr "用 GPG 为推�签�"
 
-#: builtin/push.c:571 builtin/send-pack.c:176
+#: builtin/push.c:574 builtin/send-pack.c:200
 msgid "request atomic transaction on remote side"
 msgstr "需�远端支�原�事务"
 
-#: builtin/push.c:589
+#: builtin/push.c:592
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete 与 --all�--mirror � --tags �兼容"
 
-#: builtin/push.c:591
+#: builtin/push.c:594
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用没有�义"
 
-#: builtin/push.c:611
+#: builtin/push.c:614
 #, c-format
 msgid "bad repository '%s'"
 msgstr "�的仓库 '%s'"
 
-#: builtin/push.c:612
+#: builtin/push.c:615
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -16767,60 +19337,72 @@ msgstr ""
 "\n"
 "    git push <�称>\n"
 
-#: builtin/push.c:627
+#: builtin/push.c:630
 msgid "--all and --tags are incompatible"
 msgstr "--all 和 --tags �兼容"
 
-#: builtin/push.c:629
+#: builtin/push.c:632
 msgid "--all can't be combined with refspecs"
 msgstr "--all �能和引用规格�时使用"
 
-#: builtin/push.c:633
+#: builtin/push.c:636
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror 和 --tags �兼容"
 
-#: builtin/push.c:635
+#: builtin/push.c:638
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror �能和引用规格�时使用"
 
-#: builtin/push.c:638
+#: builtin/push.c:641
 msgid "--all and --mirror are incompatible"
 msgstr "--all 和 --mirror �兼容"
 
-#: builtin/push.c:642
+#: builtin/push.c:648
 msgid "push options must not have new line characters"
 msgstr "推�选项�能有�行符"
 
-#: builtin/range-diff.c:8
+#: builtin/range-diff.c:9
 msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
 msgstr "git range-diff [<选项>] <old-base>..<old-tip> <new-base>..<new-tip>"
 
-#: builtin/range-diff.c:9
+#: builtin/range-diff.c:10
 msgid "git range-diff [<options>] <old-tip>...<new-tip>"
 msgstr "git range-diff [<选项>] <old-tip>...<new-tip>"
 
-#: builtin/range-diff.c:10
+#: builtin/range-diff.c:11
 msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
 msgstr "git range-diff [<选项>] <base> <old-tip> <new-tip>"
 
-#: builtin/range-diff.c:21
-msgid "Percentage by which creation is weighted"
-msgstr "创建��的百分比"
-
-#: builtin/range-diff.c:23
+#: builtin/range-diff.c:30
 msgid "use simple diff colors"
 msgstr "使用简�差异颜色"
 
-#: builtin/range-diff.c:46 builtin/range-diff.c:50
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "注解"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "传递给 'git log'"
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "仅显示与第一个范围有关的输出"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "仅显示与第二个范围有关的输出"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
 #, c-format
-msgid "no .. in range: '%s'"
-msgstr "没有在范围中使用 ..：'%s'"
+msgid "not a commit range: '%s'"
+msgstr "�是一个�交范围：'%s'"
 
-#: builtin/range-diff.c:60
+#: builtin/range-diff.c:74
 msgid "single arg format must be symmetric range"
 msgstr "�个�数格�必须是对称范围（�包�...）"
 
-#: builtin/range-diff.c:75
+#: builtin/range-diff.c:89
 msgid "need two commit ranges"
 msgstr "需�两个�交范围"
 
@@ -16902,232 +19484,215 @@ msgstr "调试 unpack-trees"
 msgid "suppress feedback messages"
 msgstr "抑制�馈信�"
 
-#: builtin/rebase.c:32
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "您需�先解决当�索引的冲�"
+
+#: builtin/rebase.c:35
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
 "[<upstream> [<branch>]]"
-msgstr "git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<上游> [<分支>]]"
+msgstr ""
+"git rebase [-i] [options] [--exec <命令>] [--onto <新基线> | --keep-base] [<"
+"上游> [<分支>]]"
 
-#: builtin/rebase.c:34
+#: builtin/rebase.c:37
 msgid ""
 "git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
 msgstr ""
 "git rebase [-i] [选项] [--exec <命令>] [--onto <新基线>] --root [<分支>]"
 
-#: builtin/rebase.c:36
+#: builtin/rebase.c:39
 msgid "git rebase --continue | --abort | --skip | --edit-todo"
 msgstr "git rebase --continue | --abort | --skip | --edit-todo"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:194 builtin/rebase.c:218 builtin/rebase.c:245
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "��用的待办列表：'%s'"
 
-#: builtin/rebase.c:167 builtin/rebase.c:193 builtin/rebase.c:217
-#, c-format
-msgid "could not write '%s'."
-msgstr "�能写入 '%s'。"
-
-#: builtin/rebase.c:252
-msgid "no HEAD?"
-msgstr "没有 HEAD？"
-
-#: builtin/rebase.c:279
+#: builtin/rebase.c:311
 #, c-format
 msgid "could not create temporary %s"
 msgstr "无法创建临时的 %s"
 
-#: builtin/rebase.c:285
+#: builtin/rebase.c:317
 msgid "could not mark as interactive"
 msgstr "无法标记为交互�"
 
-#: builtin/rebase.c:343
+#: builtin/rebase.c:370
 msgid "could not generate todo list"
 msgstr "无法生�待办列表"
 
-#: builtin/rebase.c:383
+#: builtin/rebase.c:412
 msgid "a base commit must be provided with --upstream or --onto"
 msgstr "使用 --upstream 或 --onto 必须�供一个基线�交"
 
-#: builtin/rebase.c:438
+#: builtin/rebase.c:481
 msgid "git rebase--interactive [<options>]"
 msgstr "git rebase--interactive [<选项>]"
 
-#: builtin/rebase.c:450
-msgid "keep empty commits"
-msgstr "��空�交"
+#: builtin/rebase.c:494 builtin/rebase.c:1389
+msgid "keep commits which start empty"
+msgstr "�留�始为空的�交"
 
-#: builtin/rebase.c:452 builtin/revert.c:128
+#: builtin/rebase.c:498 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "�许�交说明为空"
 
-#: builtin/rebase.c:453
+#: builtin/rebase.c:500
 msgid "rebase merge commits"
 msgstr "对�并�交�基"
 
-#: builtin/rebase.c:455
+#: builtin/rebase.c:502
 msgid "keep original branch points of cousins"
 msgstr "��兄弟�交的原始分支点"
 
-#: builtin/rebase.c:457
+#: builtin/rebase.c:504
 msgid "move commits that begin with squash!/fixup!"
 msgstr "移动以 squash!/fixup! 开头的�交"
 
-#: builtin/rebase.c:458
+#: builtin/rebase.c:505
 msgid "sign commits"
 msgstr "签��交"
 
-#: builtin/rebase.c:460 builtin/rebase.c:1427
+#: builtin/rebase.c:507 builtin/rebase.c:1328
 msgid "display a diffstat of what changed upstream"
 msgstr "显示上游�化的差异统计"
 
-#: builtin/rebase.c:462
+#: builtin/rebase.c:509
 msgid "continue rebase"
 msgstr "继续�基"
 
-#: builtin/rebase.c:464
+#: builtin/rebase.c:511
 msgid "skip commit"
 msgstr "跳过�交"
 
-#: builtin/rebase.c:465
+#: builtin/rebase.c:512
 msgid "edit the todo list"
 msgstr "�基待办列表"
 
-#: builtin/rebase.c:467
+#: builtin/rebase.c:514
 msgid "show the current patch"
 msgstr "显示当�补�"
 
-#: builtin/rebase.c:470
+#: builtin/rebase.c:517
 msgid "shorten commit ids in the todo list"
 msgstr "缩短待办列表中的�交�"
 
-#: builtin/rebase.c:472
+#: builtin/rebase.c:519
 msgid "expand commit ids in the todo list"
 msgstr "扩展待办列表中的�交�"
 
-#: builtin/rebase.c:474
+#: builtin/rebase.c:521
 msgid "check the todo list"
 msgstr "检查待办列表"
 
-#: builtin/rebase.c:476
+#: builtin/rebase.c:523
 msgid "rearrange fixup/squash lines"
 msgstr "�新排列 fixup/squash 行"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:525
 msgid "insert exec commands in todo list"
 msgstr "在待办列表中�入 exec 执行命令"
 
-#: builtin/rebase.c:479
+#: builtin/rebase.c:526
 msgid "onto"
 msgstr "onto"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict-revision"
 msgstr "restrict-revision"
 
-#: builtin/rebase.c:482
+#: builtin/rebase.c:529
 msgid "restrict revision"
 msgstr "�制版本"
 
-#: builtin/rebase.c:484
+#: builtin/rebase.c:531
 msgid "squash-onto"
 msgstr "squash-onto"
 
-#: builtin/rebase.c:485
+#: builtin/rebase.c:532
 msgid "squash onto"
 msgstr "squash onto"
 
-#: builtin/rebase.c:487
+#: builtin/rebase.c:534
 msgid "the upstream commit"
 msgstr "上游�交"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head-name"
 msgstr "head-name"
 
-#: builtin/rebase.c:489
+#: builtin/rebase.c:536
 msgid "head name"
 msgstr "head �称"
 
-#: builtin/rebase.c:494
+#: builtin/rebase.c:541
 msgid "rebase strategy"
 msgstr "�基策略"
 
-#: builtin/rebase.c:495
+#: builtin/rebase.c:542
 msgid "strategy-opts"
 msgstr "strategy-opts"
 
-#: builtin/rebase.c:496
+#: builtin/rebase.c:543
 msgid "strategy options"
 msgstr "策略选项"
 
-#: builtin/rebase.c:497
+#: builtin/rebase.c:544
 msgid "switch-to"
 msgstr "切�到"
 
-#: builtin/rebase.c:498
+#: builtin/rebase.c:545
 msgid "the branch or commit to checkout"
 msgstr "�检出的分支或�交"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto-name"
 msgstr "onto-name"
 
-#: builtin/rebase.c:499
+#: builtin/rebase.c:546
 msgid "onto name"
 msgstr "onto name"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "cmd"
 msgstr "cmd"
 
-#: builtin/rebase.c:500
+#: builtin/rebase.c:547
 msgid "the command to run"
 msgstr "�执行的命令"
 
-#: builtin/rebase.c:503 builtin/rebase.c:1510
+#: builtin/rebase.c:550 builtin/rebase.c:1422
 msgid "automatically re-schedule any `exec` that fails"
 msgstr "自动�新安排任何失败的 `exec`"
 
-#: builtin/rebase.c:519
+#: builtin/rebase.c:566
 msgid "--[no-]rebase-cousins has no effect without --rebase-merges"
 msgstr "�使用 --rebase-merges，则 --[no-]rebase-cousins 没有效果"
 
-#: builtin/rebase.c:535
+#: builtin/rebase.c:582
 #, c-format
-msgid "%s requires an interactive rebase"
-msgstr "%s 需�交互��基"
+msgid "%s requires the merge backend"
+msgstr "%s 需��并�端"
 
-#: builtin/rebase.c:587
+#: builtin/rebase.c:625
 #, c-format
 msgid "could not get 'onto': '%s'"
 msgstr "无法获� 'onto'：'%s'"
 
-#: builtin/rebase.c:602
+#: builtin/rebase.c:642
 #, c-format
 msgid "invalid orig-head: '%s'"
 msgstr "无效的原始 head：'%s'"
 
-#: builtin/rebase.c:627
+#: builtin/rebase.c:667
 #, c-format
 msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
 msgstr "忽略无效的 allow_rerere_autoupdate：'%s'"
 
-#: builtin/rebase.c:703
-#, c-format
-msgid "Could not read '%s'"
-msgstr "�能读� '%s'"
-
-#: builtin/rebase.c:721
-#, c-format
-msgid "Cannot store %s"
-msgstr "�能存储 %s"
-
-#: builtin/rebase.c:828
-msgid "could not determine HEAD revision"
-msgstr "�能确定 HEAD 版本"
-
-#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
+#: 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"
@@ -17140,7 +19705,7 @@ msgstr ""
 "\"git rebase --skip\" 命令跳过这个�交。如果想�终止执行并回到\n"
 "\"git rebase\" 执行之�的状�，执行 \"git rebase --abort\"。"
 
-#: builtin/rebase.c:1032
+#: builtin/rebase.c:896
 #, c-format
 msgid ""
 "\n"
@@ -17158,7 +19723,14 @@ msgstr ""
 "\n"
 "因此 git 无法对其�基。"
 
-#: builtin/rebase.c:1339
+#: builtin/rebase.c:1222
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr "无法识别的空类型 '%s'；有效值有 \"drop\"�\"keep\" 和 \"ask\"。"
+
+#: builtin/rebase.c:1240
 #, c-format
 msgid ""
 "%s\n"
@@ -17175,7 +19747,7 @@ msgstr ""
 "    git rebase '<branch>'\n"
 "\n"
 
-#: builtin/rebase.c:1355
+#: builtin/rebase.c:1256
 #, c-format
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:\n"
@@ -17188,169 +19760,180 @@ msgstr ""
 "    git branch --set-upstream-to=%s/<branch> %s\n"
 "\n"
 
-#: builtin/rebase.c:1385
+#: builtin/rebase.c:1286
 msgid "exec commands cannot contain newlines"
 msgstr "exec 命令�能包��行符"
 
-#: builtin/rebase.c:1389
+#: builtin/rebase.c:1290
 msgid "empty exec command"
 msgstr "空的 exec 命令"
 
-#: builtin/rebase.c:1418
+#: builtin/rebase.c:1319
 msgid "rebase onto given branch instead of upstream"
 msgstr "�基到给定的分支而�上游"
 
-#: builtin/rebase.c:1420
+#: builtin/rebase.c:1321
 msgid "use the merge-base of upstream and branch as the current base"
 msgstr "使用上游和分支的�并基线�为当�基线"
 
-#: builtin/rebase.c:1422
+#: builtin/rebase.c:1323
 msgid "allow pre-rebase hook to run"
 msgstr "�许执行 pre-rebase 钩�"
 
-#: builtin/rebase.c:1424
+#: builtin/rebase.c:1325
 msgid "be quiet. implies --no-stat"
 msgstr "安�。暗示 --no-stat"
 
-#: builtin/rebase.c:1430
+#: builtin/rebase.c:1331
 msgid "do not show diffstat of what changed upstream"
 msgstr "�显示上游�化的差异统计"
 
-#: builtin/rebase.c:1433
-msgid "add a Signed-off-by: line to each commit"
-msgstr "为�一个�交添加一个 Signed-off-by: 签�"
+#: builtin/rebase.c:1334
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "为�一个�交添加 Signed-off-by 尾注"
 
-#: builtin/rebase.c:1435 builtin/rebase.c:1439 builtin/rebase.c:1441
-msgid "passed to 'git am'"
-msgstr "传递给 'git am'"
+#: builtin/rebase.c:1337
+msgid "make committer date match author date"
+msgstr "使�交者日期和作者日期一致"
+
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr "忽略作者日期，使用当�日期"
 
-#: builtin/rebase.c:1443 builtin/rebase.c:1445
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr "--reset-author-date 的�义�"
+
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
 msgid "passed to 'git apply'"
 msgstr "传递给 'git apply'"
 
-#: builtin/rebase.c:1447 builtin/rebase.c:1450
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr "忽略空白字符的�更"
+
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
 msgid "cherry-pick all commits, even if unchanged"
 msgstr "拣选所有�交，�使未修改"
 
-#: builtin/rebase.c:1452
+#: builtin/rebase.c:1354
 msgid "continue"
 msgstr "继续"
 
-#: builtin/rebase.c:1455
+#: builtin/rebase.c:1357
 msgid "skip current patch and continue"
 msgstr "跳过当�补�并继续"
 
-#  译者：注����导空格
-#: builtin/rebase.c:1457
+#: builtin/rebase.c:1359
 msgid "abort and check out the original branch"
 msgstr "终止并检出原有分支"
 
-#: builtin/rebase.c:1460
+#: builtin/rebase.c:1362
 msgid "abort but keep HEAD where it is"
 msgstr "终止但�� HEAD ��"
 
-#: builtin/rebase.c:1461
+#: builtin/rebase.c:1363
 msgid "edit the todo list during an interactive rebase"
 msgstr "在交互��基中编辑待办列表"
 
-#: builtin/rebase.c:1464
+#: builtin/rebase.c:1366
 msgid "show the patch file being applied or merged"
 msgstr "显示正在应用或�并的补�文件"
 
-#: builtin/rebase.c:1467
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "使用应用策略进行�基"
+
+#: builtin/rebase.c:1373
 msgid "use merging strategies to rebase"
 msgstr "使用�并策略进行�基"
 
-#: builtin/rebase.c:1471
+#: builtin/rebase.c:1377
 msgid "let the user edit the list of commits to rebase"
 msgstr "让用户编辑��基的�交列表"
 
-#: builtin/rebase.c:1475
+#: builtin/rebase.c:1381
 msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
 msgstr "（已弃用）�试�建�并�交而�忽略它们"
 
-#: builtin/rebase.c:1479
-msgid "preserve empty commits during rebase"
-msgstr "�基时�留空�交"
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
+msgstr "如何处��为空�交的�交"
 
-#: builtin/rebase.c:1481
+#: builtin/rebase.c:1393
 msgid "move commits that begin with squash!/fixup! under -i"
 msgstr "在 -i 交互模�下，移动以 squash!/fixup! 开头的�交"
 
-#: builtin/rebase.c:1487
-msgid "automatically stash/stash pop before and after"
-msgstr "在�作��执行自动贮�和弹出贮�"
-
-#: builtin/rebase.c:1489
+#: builtin/rebase.c:1400
 msgid "add exec lines after each commit of the editable list"
 msgstr "�编辑列表的�一个�交下�增加一行 exec"
 
-#: builtin/rebase.c:1493
+#: builtin/rebase.c:1404
 msgid "allow rebasing commits with empty messages"
 msgstr "�许针对空�交说明的�交�基"
 
-#: builtin/rebase.c:1496
+#: builtin/rebase.c:1408
 msgid "try to rebase merges instead of skipping them"
 msgstr "�试对�并�交�基而�是忽略它们"
 
-#: builtin/rebase.c:1499
+#: builtin/rebase.c:1411
 msgid "use 'merge-base --fork-point' to refine upstream"
 msgstr "使用 'merge-base --fork-point' �优化上游"
 
-#: builtin/rebase.c:1501
+#: builtin/rebase.c:1413
 msgid "use the given merge strategy"
 msgstr "使用给定的�并策略"
 
-#: builtin/rebase.c:1503 builtin/revert.c:115
+#: builtin/rebase.c:1415 builtin/revert.c:115
 msgid "option"
 msgstr "选项"
 
-#: builtin/rebase.c:1504
+#: builtin/rebase.c:1416
 msgid "pass the argument through to the merge strategy"
 msgstr "将�数传递给�并策略"
 
-#: builtin/rebase.c:1507
+#: builtin/rebase.c:1419
 msgid "rebase all reachable commits up to the root(s)"
 msgstr "将所有�达的�交�基到根�交"
 
-#: builtin/rebase.c:1524
-msgid ""
-"the rebase.useBuiltin support has been removed!\n"
-"See its entry in 'git help config' for details."
-msgstr ""
-"对 rebase.useBuiltin 的支�已被删除�\n"
-"详� 'git help config' 中的�目。"
+#: builtin/rebase.c:1424
+msgid "apply all changes, even those already present upstream"
+msgstr "应用所有更改，甚至那些已在上游存在的"
 
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1442
 msgid "It looks like 'git am' is in progress. Cannot rebase."
-msgstr "看起� 'git-am' 正在执行中。无法�基。"
+msgstr "看起� 'git am' 正在执行中。无法�基。"
 
-#: builtin/rebase.c:1571
+#: 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:1576
+#: builtin/rebase.c:1488
 msgid "cannot combine '--keep-base' with '--onto'"
 msgstr "�能将 '--keep-base' 和 '--onto' 组�使用"
 
-#: builtin/rebase.c:1578
+#: builtin/rebase.c:1490
 msgid "cannot combine '--keep-base' with '--root'"
 msgstr "�能将 '--keep-base' 和 '--root' 组�使用"
 
-#: builtin/rebase.c:1582
+#: builtin/rebase.c:1494
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "�能将 '--root' 和 '--fork-point' 组�使用"
+
+#: builtin/rebase.c:1497
 msgid "No rebase in progress?"
 msgstr "没有正在进行的�基？"
 
-#: builtin/rebase.c:1586
+#: builtin/rebase.c:1501
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "动作 --edit-todo �能用在交互��基过程中。"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1524 t/helper/test-fast-rebase.c:122
 msgid "Cannot read HEAD"
 msgstr "�能读� HEAD"
 
-#: builtin/rebase.c:1621
+#: builtin/rebase.c:1536
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -17358,16 +19941,16 @@ msgstr ""
 "您必须编辑所有的�并冲�，然�通过 git add\n"
 "命令将它们标记为已解决"
 
-#: builtin/rebase.c:1640
+#: builtin/rebase.c:1555
 msgid "could not discard worktree changes"
 msgstr "无法丢弃工作区�更"
 
-#: builtin/rebase.c:1659
+#: builtin/rebase.c:1574
 #, c-format
 msgid "could not move back to %s"
 msgstr "无法移回 %s"
 
-#: builtin/rebase.c:1704
+#: builtin/rebase.c:1620
 #, c-format
 msgid ""
 "It seems that there is already a %s directory, and\n"
@@ -17386,164 +19969,141 @@ msgstr ""
 "\t%s\n"
 "然���新执行。 为��丢失��数�，我已��止当��作。\n"
 
-#: builtin/rebase.c:1725
+#: builtin/rebase.c:1648
 msgid "switch `C' expects a numerical value"
 msgstr "开关 `C' 期望一个数字值"
 
-#: builtin/rebase.c:1766
+#: builtin/rebase.c:1690
 #, c-format
 msgid "Unknown mode: %s"
 msgstr "未知模�：%s"
 
-#: builtin/rebase.c:1788
+#: builtin/rebase.c:1729
 msgid "--strategy requires --merge or --interactive"
 msgstr "--strategy 需� --merge 或 --interactive"
 
-#: builtin/rebase.c:1828
+#: builtin/rebase.c:1759
+msgid "cannot combine apply options with merge options"
+msgstr "�能组�使用应用选项和�并选项"
+
+#: builtin/rebase.c:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "未知的�基�端：%s"
+
+#: builtin/rebase.c:1802
 msgid "--reschedule-failed-exec requires --exec or --interactive"
 msgstr "--reschedule-failed-exec 需� --exec 或 --interactive"
 
-#: builtin/rebase.c:1840
-msgid "cannot combine am options with either interactive or merge options"
-msgstr "�能将 am 选项与交互或�并选项�时使用"
-
-#: builtin/rebase.c:1859
+#: builtin/rebase.c:1822
 msgid "cannot combine '--preserve-merges' with '--rebase-merges'"
 msgstr "�能将 '--preserve-merges' 和 '--rebase-merges' �时使用"
 
-#: builtin/rebase.c:1863
+#: builtin/rebase.c:1826
 msgid ""
 "error: cannot combine '--preserve-merges' with '--reschedule-failed-exec'"
 msgstr ""
 "错误：�能将 '--preserve-merges' 和 '--reschedule-failed-exec' �时使用"
 
-#: builtin/rebase.c:1887
+#: builtin/rebase.c:1850
 #, c-format
 msgid "invalid upstream '%s'"
 msgstr "无效的上游 '%s'"
 
-#: builtin/rebase.c:1893
+#: builtin/rebase.c:1856
 msgid "Could not create new root commit"
 msgstr "�能创建新的根�交"
 
-#: builtin/rebase.c:1919
+#: builtin/rebase.c:1882
 #, c-format
 msgid "'%s': need exactly one merge base with branch"
 msgstr "'%s'：�需�与分支的一个�并基线"
 
-#: builtin/rebase.c:1922
+#: builtin/rebase.c:1885
 #, c-format
 msgid "'%s': need exactly one merge base"
 msgstr "'%s'：�需�一个�并基线"
 
-#: builtin/rebase.c:1930
+#: builtin/rebase.c:1893
 #, c-format
 msgid "Does not point to a valid commit '%s'"
 msgstr "没有指�一个有效的�交 '%s'"
 
-#: builtin/rebase.c:1955
+#: builtin/rebase.c:1921
 #, c-format
 msgid "fatal: no such branch/commit '%s'"
 msgstr "致命错误：无此分支/�交 '%s'"
 
-#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
 #, c-format
 msgid "No such ref: %s"
 msgstr "没有这样的引用：%s"
 
-#: builtin/rebase.c:1974
+#: builtin/rebase.c:1940
 msgid "Could not resolve HEAD to a revision"
 msgstr "无法将 HEAD 解�为一个版本"
 
-#: builtin/rebase.c:2012
-msgid "Cannot autostash"
-msgstr "无法 autostash"
-
-#: builtin/rebase.c:2015
-#, c-format
-msgid "Unexpected stash response: '%s'"
-msgstr "�外的 stash �应：'%s'"
-
-#: builtin/rebase.c:2021
-#, c-format
-msgid "Could not create directory for '%s'"
-msgstr "�能为 '%s' 创建目录"
-
-#: builtin/rebase.c:2024
-#, c-format
-msgid "Created autostash: %s\n"
-msgstr "创建了 autostash：%s\n"
-
-#: builtin/rebase.c:2027
-msgid "could not reset --hard"
-msgstr "无法 reset --hard"
-
-#: builtin/rebase.c:2036
+#: builtin/rebase.c:1961
 msgid "Please commit or stash them."
 msgstr "请�交或贮�修改。"
 
-#: builtin/rebase.c:2063
-#, c-format
-msgid "could not parse '%s'"
-msgstr "无法解� '%s'"
-
-#: builtin/rebase.c:2076
+#: builtin/rebase.c:1997
 #, c-format
 msgid "could not switch to %s"
 msgstr "无法切�到 %s"
 
-#: builtin/rebase.c:2087
+#: builtin/rebase.c:2008
 msgid "HEAD is up to date."
 msgstr "HEAD 是最新的。"
 
-#: builtin/rebase.c:2089
+#: builtin/rebase.c:2010
 #, c-format
 msgid "Current branch %s is up to date.\n"
 msgstr "当�分支 %s 是最新的。\n"
 
-#: builtin/rebase.c:2097
+#: builtin/rebase.c:2018
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD 是最新的，强制�基。"
 
-#: builtin/rebase.c:2099
+#: builtin/rebase.c:2020
 #, c-format
 msgid "Current branch %s is up to date, rebase forced.\n"
 msgstr "当�分支 %s 是最新的，强制�基。\n"
 
-#: builtin/rebase.c:2107
+#: builtin/rebase.c:2028
 msgid "The pre-rebase hook refused to rebase."
 msgstr "pre-rebase 钩�拒�了�基�作。"
 
-#: builtin/rebase.c:2114
+#: builtin/rebase.c:2035
 #, c-format
 msgid "Changes to %s:\n"
 msgstr "到 %s 的�更：\n"
 
-#: builtin/rebase.c:2117
+#: builtin/rebase.c:2038
 #, c-format
 msgid "Changes from %s to %s:\n"
 msgstr "从 %s 到 %s 的�更：\n"
 
-#: builtin/rebase.c:2142
+#: builtin/rebase.c:2063
 #, c-format
 msgid "First, rewinding head to replay your work on top of it...\n"
 msgstr "首先，回退头指针以便在其上�放您的工作...\n"
 
-#: builtin/rebase.c:2151
+#: builtin/rebase.c:2072
 msgid "Could not detach HEAD"
 msgstr "无法分离头指针"
 
-#: builtin/rebase.c:2160
+#: builtin/rebase.c:2081
 #, c-format
 msgid "Fast-forwarded %s to %s.\n"
 msgstr "快进 %s 到 %s。\n"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <仓库目录>"
 
-#: builtin/receive-pack.c:830
+#: 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"
@@ -17569,7 +20129,7 @@ msgstr ""
 "若��蔽此信�且��默认行为，设置 'receive.denyCurrentBranch'\n"
 "�置��为 'refuse'。"
 
-#: builtin/receive-pack.c:850
+#: 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"
@@ -17588,11 +20148,11 @@ msgstr ""
 "\n"
 "若��蔽此信�，您�以设置它为 'refuse'。"
 
-#: builtin/receive-pack.c:1936
+#: builtin/receive-pack.c:2478
 msgid "quiet"
 msgstr "�默模�"
 
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:2492
 msgid "You must specify a directory."
 msgstr "您必须指定一个目录。"
 
@@ -17618,49 +20178,49 @@ msgstr ""
 msgid "git reflog exists <ref>"
 msgstr "git reflog exists <引用>"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' �是一个有效的时间戳"
 
-#: builtin/reflog.c:605
+#: builtin/reflog.c:609
 #, c-format
 msgid "Marking reachable objects..."
 msgstr "正在标记�达对象..."
 
-#: builtin/reflog.c:643
+#: builtin/reflog.c:647
 #, c-format
 msgid "%s points nowhere!"
 msgstr "%s 指��存在�"
 
-#: builtin/reflog.c:695
+#: builtin/reflog.c:699
 msgid "no reflog specified to delete"
 msgstr "未指定�删除的引用日志"
 
-#: builtin/reflog.c:704
+#: builtin/reflog.c:708
 #, c-format
 msgid "not a reflog: %s"
 msgstr "�是一个引用日志：%s"
 
-#: builtin/reflog.c:709
+#: builtin/reflog.c:713
 #, c-format
 msgid "no reflog for '%s'"
 msgstr "没有 '%s' 的引用日志"
 
-#: builtin/reflog.c:755
+#: builtin/reflog.c:759
 #, c-format
 msgid "invalid ref format: %s"
 msgstr "无效的引用格�：%s"
 
-#: builtin/reflog.c:764
+#: builtin/reflog.c:768
 msgid "git reflog [ show | expire | delete | exists ]"
 msgstr "git reflog [ show | expire | delete | exists ]"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -17668,81 +20228,81 @@ msgstr ""
 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <�称> <地�>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <旧�称> <新�称>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <�称>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <�称> (-a | --auto | -d | --delete | <分支>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <�称>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <�称>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <�称> <分支>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <�称>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <�称> <新的地�> [<旧的地�>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <�称> <新的地�>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <�称> <地�>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<选项>] <�称> <地�>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <�称> <分支>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <�称> <分支>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<选项>] <�称>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<选项>] <�称>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<选项>] [<组> | <远程>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "更新 %s 中"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -17750,82 +20310,93 @@ msgstr ""
 "--mirror 选项�险且过时，请使用 --mirror=fetch\n"
 "\t 或 --mirror=push"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "未知的镜��数：%s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "抓�远程的分支"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "抓�时导入所有的标签和关�对象"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "或�抓�任何标签（--no-tags）"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "跟踪的分支"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "主线分支"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "把远程设置为用以推�或抓�的镜�"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "指定一个 master 分支并使用 --mirror 选项没有�义"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "指定�跟踪的分支�在与获�镜��时使用�有�义"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:700
 #, c-format
 msgid "remote %s already exists."
 msgstr "远程 %s 已�存在。"
 
-#: builtin/remote.c:198 builtin/remote.c:640
-#, c-format
-msgid "'%s' is not a valid remote name"
-msgstr "'%s' �是一个有效的远程�称"
-
-#: builtin/remote.c:238
+#: builtin/remote.c:240
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "无法设置 master '%s'"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:355
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "无法得到引用规格 %s 的获�列表"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:454 builtin/remote.c:462
 msgid "(matching)"
 msgstr "（匹�）"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:466
 msgid "(delete)"
 msgstr "（删除）"
 
-#: builtin/remote.c:629 builtin/remote.c:765 builtin/remote.c:864
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "�能设置 '%s'"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"�置（%s）remote.pushDefault �于：\n"
+"\t%s:%d\n"
+"现在在为�存在的远程� '%s' 命�"
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
 #, c-format
 msgid "No such remote: '%s'"
 msgstr "没有此远程仓库：'%s'"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:710
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "�能�命��置�节 '%s' 到 '%s'"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:730
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -17836,17 +20407,17 @@ msgstr ""
 "\t%s\n"
 "\t如果必�请手动更新�置。"
 
-#: builtin/remote.c:702
+#: builtin/remote.c:770
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "删除 '%s' 失败"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:804
 #, c-format
 msgid "creating '%s' failed"
 msgstr "创建 '%s' 失败"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:882
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -17856,118 +20427,118 @@ msgid_plural ""
 msgstr[0] "注�：ref/remotes 层级之外的一个分支未被移除。�删除它，使用："
 msgstr[1] "注�：ref/remotes 层级之外的一些分支未被移除。�删除它们，使用："
 
-#: builtin/remote.c:816
+#: builtin/remote.c:896
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "�能移除�置�节 '%s'"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:999
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " 新的（下一次获�将存储于 remotes/%s）"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:1002
 msgid " tracked"
 msgstr " 已跟踪"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:1004
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " 过时（使用 'git remote prune' �移除）"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1006
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1047
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "无效的 branch.%s.merge，�能�基到一个以上的分支"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1056
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "交互��基到远程 %s"
 
-#: builtin/remote.c:976
+#: builtin/remote.c:1058
 #, c-format
 msgid "rebases interactively (with merges) onto remote %s"
 msgstr "交互��基（��并�交）到远程 %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1061
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "�基到远程 %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1065
 #, c-format
 msgid " merges with remote %s"
 msgstr " 与远程 %s �并"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1068
 #, c-format
 msgid "merges with remote %s"
 msgstr "与远程 %s �并"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1071
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    以�和远程 %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1114
 msgid "create"
 msgstr "创建"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1117
 msgid "delete"
 msgstr "删除"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1121
 msgid "up to date"
 msgstr "最新"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1124
 msgid "fast-forwardable"
 msgstr "�快进"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1127
 msgid "local out of date"
 msgstr "本地已过时"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1134
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s 强制推�至 %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1137
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s 推�至 %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1141
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s 强制推�至 %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1144
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s 推�至 %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1212
 msgid "do not query remotes"
 msgstr "�查询远程"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1239
 #, c-format
 msgid "* remote %s"
 msgstr "* 远程 %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1240
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  获�地�：%s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
 msgid "(no URL)"
 msgstr "(æ—  URL)"
 
@@ -17975,32 +20546,31 @@ msgstr "(æ—  URL)"
 #. with the one in " Fetch URL: %s"
 #. translation.
 #.
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  推�地�：%s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 分支：%s"
 
-#  译者：中文字符串拼接，�删除�导空格
-#: builtin/remote.c:1177
+#: builtin/remote.c:1259
 msgid "(not queried)"
 msgstr "（未查询）"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1261
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1265
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 分支（远程 HEAD 模糊，�能是下列中的一个）：\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1277
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
@@ -18008,164 +20578,155 @@ msgstr[0] "  远程分支：%s"
 msgstr[1] "  远程分支：%s"
 
 #  译者：中文字符串拼接，�删除�导空格
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1280 builtin/remote.c:1306
 msgid " (status not queried)"
 msgstr "（状�未查询）"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1289
 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:1215
+#: builtin/remote.c:1297
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  本地引用将在 'git push' 时被镜�"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1303
 #, 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:1242
+#: builtin/remote.c:1324
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "根�远程设置 refs/remotes/<�称>/HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1326
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "删除 refs/remotes/<�称>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1341
 msgid "Cannot determine remote HEAD"
 msgstr "无法确定远程 HEAD"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1343
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1353
 #, c-format
 msgid "Could not delete %s"
 msgstr "无法删除 %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1361
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "�是一个有效引用：%s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1363
 #, c-format
 msgid "Could not setup %s"
 msgstr "�能设置 %s"
 
 #  译者：注����导空格
-#: builtin/remote.c:1299
+#: builtin/remote.c:1381
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s 将�为悬空状��"
 
 #  译者：注����导空格
-#: builtin/remote.c:1300
+#: builtin/remote.c:1382
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s 已�为悬空状��"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1392
 #, c-format
 msgid "Pruning %s"
 msgstr "修剪 %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1393
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1409
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [将删除] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1412
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [已删除] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1457
 msgid "prune remotes after fetching"
 msgstr "抓��清除远程"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
 #, c-format
 msgid "No such remote '%s'"
 msgstr "没有此远程 '%s'"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1539
 msgid "add branch"
 msgstr "添加分支"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1546
 msgid "no remote specified"
 msgstr "未指定远程"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1563
 msgid "query push URLs rather than fetch URLs"
 msgstr "查询推� URL 地�，而�获� URL 地�"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1565
 msgid "return all URLs"
 msgstr "返回所有 URL 地�"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1595
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "没有给远程仓库 '%s' 设定 URL"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1621
 msgid "manipulate push URLs"
 msgstr "�作推� URLS"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1623
 msgid "add URL"
 msgstr "添加 URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1625
 msgid "delete URLs"
 msgstr "删除 URLS"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1632
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 无�义"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1673
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "无效的旧 URL 匹�模版：%s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1681
 #, c-format
 msgid "No such URL found: %s"
 msgstr "未找到此 URL：%s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1683
 msgid "Will not delete all non-push URLs"
 msgstr "将�会删除所有�推� URL 地�"
 
-#: builtin/remote.c:1610
-msgid "be verbose; must be placed before a subcommand"
-msgstr "冗长输出；必须置于�命令之�"
-
-#: builtin/remote.c:1641
-#, c-format
-msgid "Unknown subcommand: %s"
-msgstr "未知�命令：%s"
-
-#: builtin/repack.c:23
+#: builtin/repack.c:26
 msgid "git repack [<options>]"
 msgstr "git repack [<选项>]"
 
-#: builtin/repack.c:28
+#: builtin/repack.c:31
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -18173,130 +20734,142 @@ msgstr ""
 "增� repack 和 bitmap 索引�兼容。  使用 --no-write-bitmap-index\n"
 "或�用 pack.writebitmaps �置。"
 
-#: builtin/repack.c:191
+#: builtin/repack.c:198
 msgid "could not start pack-objects to repack promisor objects"
 msgstr "无法开始 pack-objects ��新打包 promisor 对象"
 
-#: builtin/repack.c:230 builtin/repack.c:409
+#: builtin/repack.c:270 builtin/repack.c:630
 msgid "repack: Expecting full hex object ID lines only from pack-objects."
 msgstr "repack：期望�自 pack-objects 的完整�六进制对象 ID。"
 
-#: builtin/repack.c:247
+#: builtin/repack.c:294
 msgid "could not finish pack-objects to repack promisor objects"
 msgstr "无法完� pack-objects ��新打包 promisor 对象"
 
-#: builtin/repack.c:285
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr "�能打开 %s 的索引"
+
+#: builtin/repack.c:368
+#, 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
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "包 %s 太大导致数字溢出"
+
+#: builtin/repack.c:460
 msgid "pack everything in a single pack"
 msgstr "所有内容打包到一个包文件中"
 
-#: builtin/repack.c:287
+#: builtin/repack.c:462
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相�，并将��达的对象设为�散对象"
 
-#: builtin/repack.c:290
+#: builtin/repack.c:465
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "删除多余的包，�行 git-prune-packed"
 
-#: builtin/repack.c:292
+#: builtin/repack.c:467
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --no-reuse-delta"
 
-#: builtin/repack.c:294
+#: builtin/repack.c:469
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --no-reuse-object"
 
-#: builtin/repack.c:296
+#: builtin/repack.c:471
 msgid "do not run git-update-server-info"
 msgstr "��行 git-update-server-info"
 
-#: builtin/repack.c:299
+#: builtin/repack.c:474
 msgid "pass --local to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --local"
 
-#: builtin/repack.c:301
+#: builtin/repack.c:476
 msgid "write bitmap index"
 msgstr "写 bitmap 索引"
 
-#: builtin/repack.c:303
+#: builtin/repack.c:478
 msgid "pass --delta-islands to git-pack-objects"
 msgstr "� git-pack-objects 传递�数 --delta-islands"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:479
 msgid "approxidate"
 msgstr "近似日期"
 
-#: builtin/repack.c:305
+#: builtin/repack.c:480
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，��将早于给定时间的对象过期"
 
-#: builtin/repack.c:307
+#: builtin/repack.c:482
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，�新对��达对象打包"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:484
 msgid "size of the window used for delta compression"
 msgstr "用于增�压缩的窗�值"
 
-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:485 builtin/repack.c:491
 msgid "bytes"
 msgstr "字节"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:486
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上�的相似，但�制内存大�而��目数"
 
-#: builtin/repack.c:313
+#: builtin/repack.c:488
 msgid "limits the maximum delta depth"
 msgstr "�制最大增�深度"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:490
 msgid "limits the maximum number of threads"
 msgstr "�制最大线程数"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:492
 msgid "maximum size of each packfile"
 msgstr "�个包文件的最大尺寸"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:494
 msgid "repack objects in packs marked with .keep"
 msgstr "对标记为 .keep 的包中的对象�新打包"
 
-#: builtin/repack.c:321
+#: builtin/repack.c:496
 msgid "do not repack this pack"
 msgstr "��对该包文件�新打包"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr "使用因� <n> 查找几何级数"
+
+#: builtin/repack.c:508
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "�能删除��仓库中的打包文件"
 
-#: builtin/repack.c:335
+#: builtin/repack.c:512
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable 和 -A �兼容"
 
-#: builtin/repack.c:418
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric 和 -A�-a �兼容"
+
+#: builtin/repack.c:639
 msgid "Nothing new to pack."
 msgstr "没有新的�打包。"
 
-#: builtin/repack.c:479
+#: builtin/repack.c:669
 #, 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 ""
-"警告：为了将包文件替�为新版本，一些使用中的包已�\n"
-"警告：通过添加 old- �缀的方��命�。但是�作失败，\n"
-"警告：并且�试�命�改回原有文件�的�作也失败。\n"
-"警告：请手动将 %s 下的这些文件�命�：\n"
+msgid "missing required file: %s"
+msgstr "缺少需�的文件：%s"
 
-#: builtin/repack.c:527
+#: builtin/repack.c:671
 #, c-format
-msgid "failed to remove '%s'"
-msgstr "删除 '%s' 失败"
+msgid "could not unlink: %s"
+msgstr "�能删除：%s"
 
 #: builtin/replace.c:22
 msgid "git replace [-f] <object> <replacement>"
@@ -18401,8 +20974,8 @@ msgstr "无法对 %s 执行 fstat"
 msgid "unable to write object to database"
 msgstr "无法�数�库写入对象"
 
-#: builtin/replace.c:322 builtin/replace.c:378 builtin/replace.c:423
-#: builtin/replace.c:453
+#: 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'"
@@ -18426,48 +20999,48 @@ msgstr "新对象和旧对象相�：'%s'"
 msgid "could not parse %s as a commit"
 msgstr "无法将 %s 解�为一个�交"
 
-#: builtin/replace.c:415
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "�交 '%s' 中�有��的�并标签"
 
-#: builtin/replace.c:417
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "�交 '%s' 中�有格�错误的�并标签"
 
-#: builtin/replace.c:429
+#: builtin/replace.c:430
 #, 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:468
+#: builtin/replace.c:469
 #, c-format
 msgid "the original commit '%s' has a gpg signature"
 msgstr "原始�交 '%s' 中有一个 gpg 签�"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "在替�的�交中签�将被移除�"
 
-#: builtin/replace.c:479
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "�能为 '%s' 写替��交"
 
-#: builtin/replace.c:487
+#: builtin/replace.c:488
 #, c-format
 msgid "graft for '%s' unnecessary"
 msgstr "对 '%s' 移�没有必�"
 
-#: builtin/replace.c:491
+#: builtin/replace.c:492
 #, c-format
 msgid "new commit is the same as the old one: '%s'"
 msgstr "新�交和旧的一样：'%s'"
 
-#: builtin/replace.c:526
+#: builtin/replace.c:527
 #, c-format
 msgid ""
 "could not convert the following graft(s):\n"
@@ -18476,71 +21049,71 @@ msgstr ""
 "�能转�下列移�：\n"
 "%s"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "列出替�的引用"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "删除替�的引用"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "编辑现存的对象"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "修改一个�交的父�交"
 
-#: builtin/replace.c:551
+#: builtin/replace.c:552
 msgid "convert existing graft file"
 msgstr "转�现存的移�文件"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "如果存在则替�引用"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "��为 --edit �作美观显示内容"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "使用此格�"
 
-#: builtin/replace.c:568
+#: builtin/replace.c:569
 msgid "--format cannot be used when not listing"
 msgstr "�列出时�能使用 --format"
 
-#: builtin/replace.c:576
+#: builtin/replace.c:577
 msgid "-f only makes sense when writing a replacement"
 msgstr "�有写一个替�时 -f �有�义"
 
-#: builtin/replace.c:580
+#: builtin/replace.c:581
 msgid "--raw only makes sense with --edit"
 msgstr "--raw �有和 --edit 共用�有�义"
 
-#: builtin/replace.c:586
+#: builtin/replace.c:587
 msgid "-d needs at least one argument"
 msgstr "-d 需�至少一个�数"
 
-#: builtin/replace.c:592
+#: builtin/replace.c:593
 msgid "bad number of arguments"
 msgstr "错误的�数个数"
 
-#: builtin/replace.c:598
+#: builtin/replace.c:599
 msgid "-e needs exactly one argument"
 msgstr "-e 需�且仅需�一个�数"
 
-#: builtin/replace.c:604
+#: builtin/replace.c:605
 msgid "-g needs at least one argument"
 msgstr "-g 需�至少一个�数"
 
-#: builtin/replace.c:610
+#: builtin/replace.c:611
 msgid "--convert-graft-file takes no argument"
 msgstr "--convert-graft-file �带�数"
 
-#: builtin/replace.c:616
+#: builtin/replace.c:617
 msgid "only one pattern can be given with -l"
 msgstr "�能为 -l �供一个模�"
 
@@ -18548,15 +21121,15 @@ 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' 生�差异"
@@ -18567,121 +21140,126 @@ msgid ""
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<�交>]"
 
 #: builtin/reset.c:33
-msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
-msgstr "git reset [-q] [<树或�交>] [--] <路径>..."
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<树对象>] [--] <路径表达�>..."
 
 #: builtin/reset.c:34
-msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
-msgstr "git reset --patch [<树或�交>] [--] [<路径>...]"
+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
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<树对象>] [--] [<路径表达�>...]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "混�"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "软性"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "硬性"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "�并"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "��"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "您没有一个有效的 HEAD。"
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "无法找到 HEAD 指�的树。"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "无法找到 %s 指�的树。"
 
-#: builtin/reset.c:114
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD 现在�于 %s"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:193
+#: builtin/reset.c:195
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在�并过程中�能�%s�置�作。"
 
-#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595
-#: builtin/stash.c:619
+#: builtin/reset.c:295 builtin/stash.c:589 builtin/stash.c:663
+#: builtin/stash.c:687
 msgid "be quiet, only report errors"
 msgstr "安�模�，�报告错误"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "�置 HEAD 和索引"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "��置 HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "�置 HEAD�索引和工作区"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "�置 HEAD 但�存本地�更"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 msgid "record only the fact that removed paths will be added later"
 msgstr "将删除的路径标记为��添加"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:344
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "无法将 '%s' 解�为一个有效的版本。"
 
-#: builtin/reset.c:334
+#: builtin/reset.c:352
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "无法将 '%s' 解�为一个有效的树对象。"
 
-#: builtin/reset.c:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch 与 --{hard�mixed�soft} 选项�兼容"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "�能带路径进行%s�置。"
 
 #  译者：汉字之间无空格，故删除%s��空格
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "�能对纯仓库进行%s�置"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
 msgstr "-N �能和 --mixed �时使用"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "�置��消暂存的�更："
 
-#: builtin/reset.c:398
+#: builtin/reset.c:416
 #, c-format
 msgid ""
 "\n"
@@ -18693,48 +21271,60 @@ msgstr ""
 "�置�，枚举未暂存�更花费了 %.2f 秒。 您�以使用 '--quiet' ��此情况。\n"
 "将�置�� reset.quiet 设置为 true �使其�为默认值。\n"
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "�能�置索引文件至版本 '%s'。"
 
-#: builtin/reset.c:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "�能写入新的索引文件。"
 
-#: builtin/rev-list.c:411
+#: builtin/rev-list.c:541
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "�能�时使用 --exclude-promisor-objects 和 --missing 选项"
 
-#: builtin/rev-list.c:472
+#: builtin/rev-list.c:602
 msgid "object filtering requires --objects"
 msgstr "对象过滤需� --objects"
 
-#: builtin/rev-list.c:522
+#: builtin/rev-list.c:674
 msgid "rev-list does not support display of notes"
 msgstr "rev-list �支�显示注解"
 
-#: builtin/rev-list.c:525
-msgid "cannot combine --use-bitmap-index with object filtering"
-msgstr "�能将 --use-bitmap-index 和对象过滤组�使用"
+#: builtin/rev-list.c:679
+msgid "marked counting is incompatible with --objects"
+msgstr "标记计数和 --objects �兼容"
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<选项>] -- [<�数>...]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "�� `--` 作为一个�数传递"
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "�到第一个�选项�数��止解�"
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "以固定长格�输出"
 
-#: builtin/rev-parse.c:551
+#: 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"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -18748,6 +21338,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 [<选项>] <�交�>..."
@@ -18826,19 +21460,19 @@ msgstr "�留�始化的空�交"
 msgid "keep redundant, empty commits"
 msgstr "��多余的�空的�交"
 
-#: builtin/revert.c:232
+#: builtin/revert.c:237
 msgid "revert failed"
 msgstr "还原失败"
 
-#: builtin/revert.c:245
+#: builtin/revert.c:250
 msgid "cherry-pick failed"
 msgstr "拣选失败"
 
-#: builtin/rm.c:19
+#: builtin/rm.c:20
 msgid "git rm [<options>] [--] <file>..."
 msgstr "git rm [<选项>] [--] <文件>..."
 
-#: builtin/rm.c:207
+#: builtin/rm.c:208
 msgid ""
 "the following file has staged content different from both the\n"
 "file and the HEAD:"
@@ -18848,7 +21482,7 @@ msgid_plural ""
 msgstr[0] "如下文件其暂存的内容和工作区� HEAD 中的都�一样："
 msgstr[1] "如下文件其暂存的内容和工作区� HEAD 中的都�一样："
 
-#: builtin/rm.c:212
+#: builtin/rm.c:213
 msgid ""
 "\n"
 "(use -f to force removal)"
@@ -18856,13 +21490,13 @@ msgstr ""
 "\n"
 "（使用 -f 强制删除）"
 
-#: 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] "下列文件索引中有�更"
 msgstr[1] "下列文件索引中有�更"
 
-#: 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)"
@@ -18870,42 +21504,46 @@ msgstr ""
 "\n"
 "（使用 --cached �留本地文件，或用 -f 强制删除）"
 
-#: 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] "如下文件有本地修改："
 msgstr[1] "如下文件有本地修改："
 
-#: builtin/rm.c:242
+#: builtin/rm.c:244
 msgid "do not list removed files"
 msgstr "�列出删除的文件"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:245
 msgid "only remove from the index"
 msgstr "�从索引区删除"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:246
 msgid "override the up-to-date check"
 msgstr "忽略文件更新状�检查"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:247
 msgid "allow recursive removal"
 msgstr "�许递归删除"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:249
 msgid "exit with a zero status even if nothing matched"
 msgstr "�使没有匹�，也以零状�退出"
 
-#: builtin/rm.c:289
+#: builtin/rm.c:283
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "没有�供路径规格。我应该删除哪些文件？"
+
+#: builtin/rm.c:310
 msgid "please stage your changes to .gitmodules or stash them to proceed"
 msgstr "请将您的修改暂存到 .gitmodules 中或贮���继续"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:331
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "未�供 -r 选项�会递归删除 '%s'"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:379
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm：�能删除 %s"
@@ -18921,55 +21559,76 @@ msgstr ""
 "receive-pack>] [--verbose] [--thin] [--atomic] [<主机>:]<目录> [<引用>...]\n"
 "  --all 和明确的 <引用> 互斥。"
 
-#: builtin/send-pack.c:163
+#: builtin/send-pack.c:188
 msgid "remote name"
 msgstr "远程�称"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:201
 msgid "use stateless RPC protocol"
 msgstr "使用无状�的 RPC �议"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:202
 msgid "read refs from stdin"
 msgstr "从标准输入读�引用"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:203
 msgid "print status from remote helper"
 msgstr "打��自远程 helper 的状�"
 
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:16
 msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git shortlog [<选项>] [<版本范围>] [[--] <路径>...]"
 
-#: builtin/shortlog.c:15
+#: builtin/shortlog.c:17
 msgid "git log --pretty=short | git shortlog [<options>]"
 msgstr "git log --pretty=short | git shortlog [<选项>]"
 
-#: builtin/shortlog.c:264
-msgid "Group by committer rather than author"
-msgstr "按照�交者分组而�是作者"
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "�支�和标准输入一起使用多个 --group 选项"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "�支�和标准输入一起使用 --group=trailer"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "未知分组类型：%s"
 
-#: builtin/shortlog.c:266
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "按照�交者而�是作者分组"
+
+#: builtin/shortlog.c:354
 msgid "sort output according to the number of commits per author"
 msgstr "根��个作者的�交数�排�"
 
-#: builtin/shortlog.c:268
-msgid "Suppress commit descriptions, only provides commit count"
-msgstr "���交说明，��供�交数�"
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "抑制�交�述，��供�交数�"
 
-#: builtin/shortlog.c:270
-msgid "Show the email address of each author"
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
 msgstr "显示�个作者的电�邮件地�"
 
-#: builtin/shortlog.c:271
+#: builtin/shortlog.c:359
 msgid "<w>[,<i1>[,<i2>]]"
 msgstr "<w>[,<i1>[,<i2>]]"
 
-#: builtin/shortlog.c:272
-msgid "Linewrap output"
+#: builtin/shortlog.c:360
+msgid "linewrap output"
 msgstr "折行输出"
 
-#: builtin/shortlog.c:301
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "字段"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "按字段分组"
+
+#: builtin/shortlog.c:391
 msgid "too many arguments given outside repository"
 msgstr "仓库外执行�供了太多的�数"
 
@@ -19107,6 +21766,14 @@ msgstr "'%s' �是一个有效的引用。"
 msgid "cannot find commit %s (%s)"
 msgstr "�能找到�交 %s（%s）"
 
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "哈希算法"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "未知的哈希算法"
+
 #: builtin/show-ref.c:12
 msgid ""
 "git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
@@ -19151,41 +21818,118 @@ msgstr "�打�结果到标准输出（例如与 --verify �数共用）"
 msgid "show refs from stdin that aren't in local repository"
 msgstr "显示从标准输入中读入的�在本地仓库中的引用"
 
-#: builtin/stash.c:22 builtin/stash.c:37
+#: 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) <选项>"
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:72
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr "本工作区�是稀�模�（稀�检出文件�能�存在）"
+
+#: builtin/sparse-checkout.c:227
+msgid "failed to create directory for sparse-checkout file"
+msgstr "无法为稀�检出文件创建目录"
+
+#: builtin/sparse-checkout.c:268
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr "无法�级仓库格�以�用 worktreeConfig"
+
+#: builtin/sparse-checkout.c:270
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "无法设置 extensions.worktreeConfig"
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "�始化稀�检出为 cone 模�"
+
+#: 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 "无法修改 sparse-index �置"
+
+#: builtin/sparse-checkout.c:361
+#, c-format
+msgid "failed to open '%s'"
+msgstr "无法打开 '%s'"
+
+#: builtin/sparse-checkout.c:413
+#, c-format
+msgid "could not normalize path %s"
+msgstr "无法规范化路径 %s"
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <模�>)"
+
+#: builtin/sparse-checkout.c:450
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "无法为 C 语言风格的字符串 '%s' 去引�"
+
+#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "无法加载现存的稀�检出模�"
+
+#: builtin/sparse-checkout.c:573
+msgid "read patterns from standard in"
+msgstr "从标准输入读�模�"
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:607
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:638
+msgid "error while refreshing working directory"
+msgstr "刷新工作目录时出错"
+
+#: builtin/stash.c:24 builtin/stash.c:40
 msgid "git stash list [<options>]"
 msgstr "git stash list [<选项>]"
 
-#: builtin/stash.c:23 builtin/stash.c:42
+#: builtin/stash.c:25 builtin/stash.c:45
 msgid "git stash show [<options>] [<stash>]"
 msgstr "git stash show [<选项>] [<stash>]"
 
-#: builtin/stash.c:24 builtin/stash.c:47
+#: builtin/stash.c:26 builtin/stash.c:50
 msgid "git stash drop [-q|--quiet] [<stash>]"
 msgstr "git stash drop [-q|--quiet] [<stash>]"
 
-#: 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] [<stash>]"
 
-#: builtin/stash.c:26 builtin/stash.c:62
+#: builtin/stash.c:28 builtin/stash.c:65
 msgid "git stash branch <branchname> [<stash>]"
 msgstr "git stash branch <分支�> [<stash>]"
 
-#: builtin/stash.c:27 builtin/stash.c:67
-msgid "git stash clear"
-msgstr "git stash clear"
-
-#: builtin/stash.c:28 builtin/stash.c:77
+#: 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"
+"          [--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 <消�>]\n"
+"          [--pathspec-from-file=<file> [--pathspec-file-nul]]\n"
 "          [--] [<路径规格>...]]"
 
-#: builtin/stash.c:31 builtin/stash.c:84
+#: 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>]"
@@ -19193,189 +21937,228 @@ msgstr ""
 "git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
 "          [-u|--include-untracked] [-a|--all] [<消�>]"
 
-#: builtin/stash.c:52
+#: builtin/stash.c:55
 msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:57
+#: builtin/stash.c:60
 msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
 msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
 
-#: builtin/stash.c:72
+#: builtin/stash.c:75
 msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
 msgstr "git stash store [-m|--message <消�>] [-q|--quiet] <�交>"
 
-#: builtin/stash.c:127
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <消�>]\n"
+"          [--] [<路径规格>...]]"
+
+#: builtin/stash.c:130
 #, c-format
 msgid "'%s' is not a stash-like commit"
 msgstr "'%s' ��是一个贮��交"
 
-#: builtin/stash.c:147
+#: builtin/stash.c:150
 #, c-format
 msgid "Too many revisions specified:%s"
 msgstr "指定了太多的版本：%s"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:164
 msgid "No stash entries found."
 msgstr "未�现贮��目。"
 
-#: builtin/stash.c:175
+#: builtin/stash.c:178
 #, c-format
 msgid "%s is not a valid reference"
 msgstr "%s �是一个有效的引用�"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
-msgid "git stash clear with parameters is unimplemented"
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
 msgstr "git stash clear �支��数"
 
-#: builtin/stash.c:403
+#: 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 ""
+"警告：未跟踪文件出现在跟踪文件的路径上��命�\n"
+"            %s -> %s\n"
+"         以腾出空间。\n"
+
+#: builtin/stash.c:492
 msgid "cannot apply a stash in the middle of a merge"
-msgstr "无法在�并过程应用贮�"
+msgstr "无法在�并过程中应用贮�"
 
-#: builtin/stash.c:414
+#: builtin/stash.c:503
 #, c-format
 msgid "could not generate diff %s^!."
 msgstr "无法生�差异 %s^!."
 
-#: builtin/stash.c:421
-msgid "conflicts in index.Try without --index."
+#: builtin/stash.c:510
+msgid "conflicts in index. Try without --index."
 msgstr "索引中有冲�。�试�用 --index。"
 
-#: builtin/stash.c:427
+#: builtin/stash.c:516
 msgid "could not save index tree"
 msgstr "�能�存索引树"
 
-#: builtin/stash.c:436
+#: builtin/stash.c:525
 msgid "could not restore untracked files from stash"
 msgstr "无法从贮��目中��未跟踪文件"
 
-#: builtin/stash.c:450
+#: builtin/stash.c:539
 #, c-format
 msgid "Merging %s with %s"
 msgstr "正在�并 %s 和 %s"
 
-#: builtin/stash.c:460 git-legacy-stash.sh:680
+#: builtin/stash.c:549
 msgid "Index was not unstashed."
 msgstr "索引未从贮�中��。"
 
-#: builtin/stash.c:522 builtin/stash.c:621
+#: builtin/stash.c:591 builtin/stash.c:689
 msgid "attempt to recreate the index"
 msgstr "�试�建索引"
 
-#: builtin/stash.c:555
+#: builtin/stash.c:635
 #, c-format
 msgid "Dropped %s (%s)"
 msgstr "丢弃了 %s（%s）"
 
-#: builtin/stash.c:558
+#: builtin/stash.c:638
 #, c-format
 msgid "%s: Could not drop stash entry"
 msgstr "%s：无法丢弃贮��目"
 
-#: builtin/stash.c:583
+#: builtin/stash.c:651
 #, c-format
 msgid "'%s' is not a stash reference"
 msgstr "'%s' �是一个贮�引用"
 
-#: builtin/stash.c:633 git-legacy-stash.sh:694
+#: builtin/stash.c:701
 msgid "The stash entry is kept in case you need it again."
 msgstr "贮��目被�留以备您�次需�。"
 
-#: builtin/stash.c:656 git-legacy-stash.sh:712
+#: builtin/stash.c:724
 msgid "No branch name specified"
 msgstr "未指定分支�"
 
-#: builtin/stash.c:796 builtin/stash.c:833
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "无法解�树"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "无法解包目录树"
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr "在贮�中包�未跟踪文件"
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr "仅显示贮�中的未跟踪文件"
+
+#: builtin/stash.c:929 builtin/stash.c:966
 #, c-format
 msgid "Cannot update %s with %s"
 msgstr "无法用 %2$s 更新 %1$s"
 
-#: builtin/stash.c:814 builtin/stash.c:1470 builtin/stash.c:1506
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
 msgid "stash message"
 msgstr "贮�说明"
 
-#: builtin/stash.c:824
+#: builtin/stash.c:957
 msgid "\"git stash store\" requires one <commit> argument"
 msgstr "\"git stash store\" 需�一个 <�交> �数"
 
-#: builtin/stash.c:1046 git-legacy-stash.sh:217
+#: builtin/stash.c:1171
 msgid "No changes selected"
 msgstr "没有选择�更"
 
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1271
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立�始�交"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1298
 msgid "Cannot save the current index state"
 msgstr "无法�存当�索引状�"
 
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1307
 msgid "Cannot save the untracked files"
 msgstr "无法�存未跟踪文件"
 
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1318 builtin/stash.c:1327
 msgid "Cannot save the current worktree state"
 msgstr "无法�存当�工作区状�"
 
-#: builtin/stash.c:1229 git-legacy-stash.sh:233
+#: builtin/stash.c:1355
 msgid "Cannot record working tree state"
 msgstr "�能记录工作区状�"
 
-#: builtin/stash.c:1278 git-legacy-stash.sh:337
+#: builtin/stash.c:1404
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "�能�时使用�数 --patch 和 --include-untracked 或 --all"
 
-#: builtin/stash.c:1294
+#: builtin/stash.c:1422
 msgid "Did you forget to 'git add'?"
 msgstr "您是�忘了执行 'git add'？"
 
-#: builtin/stash.c:1309 git-legacy-stash.sh:345
+#: builtin/stash.c:1437
 msgid "No local changes to save"
 msgstr "没有��存的本地修改"
 
-#: builtin/stash.c:1316 git-legacy-stash.sh:350
+#: builtin/stash.c:1444
 msgid "Cannot initialize stash"
 msgstr "无法�始化贮�"
 
-#: builtin/stash.c:1331 git-legacy-stash.sh:354
+#: builtin/stash.c:1459
 msgid "Cannot save the current status"
 msgstr "无法�存当�状�"
 
-#: builtin/stash.c:1336
+#: builtin/stash.c:1464
 #, c-format
 msgid "Saved working directory and index state %s"
 msgstr "�存工作目录和索引状� %s"
 
-#: builtin/stash.c:1426 git-legacy-stash.sh:384
+#: builtin/stash.c:1554
 msgid "Cannot remove worktree changes"
 msgstr "无法删除工作区�更"
 
-#: builtin/stash.c:1461 builtin/stash.c:1497
+#: builtin/stash.c:1593 builtin/stash.c:1658
 msgid "keep index"
 msgstr "��索引"
 
-#: builtin/stash.c:1463 builtin/stash.c:1499
+#: builtin/stash.c:1595 builtin/stash.c:1660
 msgid "stash in patch mode"
 msgstr "以补�模�贮�"
 
-#: builtin/stash.c:1464 builtin/stash.c:1500
+#: builtin/stash.c:1596 builtin/stash.c:1661
 msgid "quiet mode"
 msgstr "�默模�"
 
-#: builtin/stash.c:1466 builtin/stash.c:1502
+#: builtin/stash.c:1598 builtin/stash.c:1663
 msgid "include untracked files in stash"
 msgstr "贮�中包�未跟踪文件"
 
-#: builtin/stash.c:1468 builtin/stash.c:1504
+#: builtin/stash.c:1600 builtin/stash.c:1665
 msgid "include ignore files"
 msgstr "包�忽略的文件"
 
-#: builtin/stash.c:1564
-#, c-format
-msgid "could not exec %s"
-msgstr "�能执行 %s"
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"对 stash.useBuiltin 的支�已被删除�\n"
+"详� 'git help config' 中的�目。"
 
 #: builtin/stripspace.c:18
 msgid "git stripspace [-s | --strip-comments]"
@@ -19393,40 +22176,41 @@ msgstr "跳过和移除所有的注释行"
 msgid "prepend comment character and space to each line"
 msgstr "为�一行的行首添加注释符和空格"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一个完整的引用�称，�得到 %s"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:63
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote �带�数"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:101
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "无法从 url '%s' 剥离一个组件"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
 msgid "alternative anchor for relative paths"
 msgstr "相对路径的替代锚记（anchor）"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:416
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: 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 "在 .gitmodules 中未找到�模组 '%s' 的 url"
 
-#: builtin/submodule--helper.c:522
+#: builtin/submodule--helper.c:526
 #, c-format
 msgid "Entering '%s'\n"
 msgstr "进入 '%s'\n"
 
-#: builtin/submodule--helper.c:525
+#: builtin/submodule--helper.c:529
 #, c-format
 msgid ""
 "run_command returned non-zero status for %s\n"
@@ -19435,7 +22219,7 @@ msgstr ""
 "对 %s 执行 run_command 返回�零值。\n"
 "."
 
-#: builtin/submodule--helper.c:547
+#: builtin/submodule--helper.c:551
 #, c-format
 msgid ""
 "run_command returned non-zero status while recursing in the nested "
@@ -19445,119 +22229,169 @@ msgstr ""
 "在递归 %s 的�模组执行 run_command 时返回�零值。\n"
 "."
 
-#: builtin/submodule--helper.c:563
-msgid "Suppress output of entering each submodule command"
-msgstr "阻止进入�一个�模组命令的输出"
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
+msgstr "抑制进入�一个�模组命令的输出"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
-msgid "Recurse into nested submodules"
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
 msgstr "递归进入嵌套�模组中"
 
-#: builtin/submodule--helper.c:570
+#: builtin/submodule--helper.c:574
 msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
 msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
 
-#: builtin/submodule--helper.c:597
+#: builtin/submodule--helper.c:601
 #, c-format
 msgid ""
 "could not look up configuration '%s'. Assuming this repository is its own "
 "authoritative upstream."
 msgstr "无法找到�置 '%s'。�定这个仓库是其自身的官方上游。"
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:668
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "无法为�模组 '%s' 注册 url"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:672
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "�模组 '%s'（%s）已对路径 '%s' 注册\n"
 
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:682
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "警告：建议�模组 '%s' 使用命令更新模�\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:689
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "无法为�模组 '%s' 注册更新模�"
 
-#: builtin/submodule--helper.c:708
-msgid "Suppress output for initializing a submodule"
-msgstr "阻止�模组�始化的输出"
+#: builtin/submodule--helper.c:711
+msgid "suppress output for initializing a submodule"
+msgstr "抑制�模组�始化的输出"
 
-#: builtin/submodule--helper.c:713
+#: builtin/submodule--helper.c:716
 msgid "git submodule--helper init [<options>] [<path>]"
 msgstr "git submodule--helper init [<选项>] [<路径>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "在 .gitmodules 中没有�现路径 '%s' 的�模组映射"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "无法解��模组 '%s' 的 HEAD 引用"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "递归�模组 '%s' 失败"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
-msgid "Suppress submodule status output"
-msgstr "阻止�模组状�输出"
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
+msgstr "抑制�模组状�输出"
 
-#: builtin/submodule--helper.c:876
+#: 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 "使用存储在索引中的�交，而�存储在�模组 HEAD 中的�交"
 
-#: builtin/submodule--helper.c:877
-msgid "recurse into nested submodules"
-msgstr "递归进入嵌套�模组中"
-
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <路径>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s（数�对象）->%s（�模组）"
+
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s（�模组）->%s（数�对象）"
+
+#: builtin/submodule--helper.c:1007
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "�能从 '%s' 创建哈希对象"
+
+#: builtin/submodule--helper.c:1061
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "�外的模� %o\n"
+
+#: builtin/submodule--helper.c:1302
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr "使用存储在索引中的�交，而�存储在�模组 HEAD 中的�交"
+
+#: builtin/submodule--helper.c:1304
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "比较存储在索引和�模组 HEAD 中的�交"
+
+#: builtin/submodule--helper.c:1306
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "跳过设置了 'ignore_config' 为 'all' 的�模组"
+
+#: builtin/submodule--helper.c:1308
+msgid "limit the summary size"
+msgstr "�制总结的大�"
+
+#: builtin/submodule--helper.c:1313
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<选项>] [<�交>] [--] [<路径>]"
+
+#: builtin/submodule--helper.c:1337
+msgid "could not fetch a revision for HEAD"
+msgstr "�能为 HEAD 获�一个版本"
+
+#: builtin/submodule--helper.c:1342
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached 和 --files 是互斥的"
+
+#: builtin/submodule--helper.c:1409
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "为 '%s' �步�模组 url\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:1415
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "无法为�模组路径 '%s' 注册 url"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1429
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "无法得到�模组 '%s' 的默认远程关�"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1440
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "无法为�模组 '%s' 更新远程关�"
 
-#: builtin/submodule--helper.c:1048
-msgid "Suppress output of synchronizing submodule url"
-msgstr "阻止�模组 url �步的输出"
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
+msgstr "抑制�模组 URL �步的输出"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1494
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1548
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
@@ -19566,230 +22400,346 @@ msgstr ""
 "�模组工作区 '%s' 包�一个 .git 目录（如果您确需删除它�其全部历�，使用 'rm "
 "-rf' 命令）"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1560
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr "�模组工作区 '%s' 包�本地修改；使用 '-f' 丢弃它们"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1568
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "已清除目录 '%s'\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1570
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "无法移除�模组工作区 '%s'\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1581
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "�能创建空的�模组目录 %s"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1597
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "�模组 '%s'（%s）未对路径 '%s' 注册\n"
 
-#: builtin/submodule--helper.c:1187
-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:1188
-msgid "Unregister all submodules"
+#: builtin/submodule--helper.c:1627
+msgid "unregister all submodules"
 msgstr "将所有�模组�消注册"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1632
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1646
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "如果您确实想�对所有�模组执行�消�始化，请使用 '--all'"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: 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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"从一个父项目的备用仓库中计算出的备用仓库无效。\n"
+"此场景下，设置 submodule.alternateErrorStrategy 为 'info'，以�许\n"
+"Git �使用备用仓库克隆，或者等效地使用 '--reference-if-able' 而�\n"
+"'--reference' �克隆。"
+
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "�模组 '%s' �能添加仓库备选：%s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1768
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "�能识别 submodule.alternateErrorStrategy 的�值 '%s'"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1775
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
-msgstr "�能识别 submodule.alternateLocaion 的�值 '%s'"
+msgstr "�能识别 submodule.alternateLocation 的�值 '%s'"
+
+#: builtin/submodule--helper.c:1800
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "拒�在�一个�模组的 git 目录中创建/使用 '%s'"
+
+#: builtin/submodule--helper.c:1841
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "无法克隆 '%s' 到�模组路径 '%s'"
+
+#: builtin/submodule--helper.c:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "目录�空：'%s'"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1858
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "无法得到 '%s' 的�模组目录"
+
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
 msgid "where the new submodule will be cloned to"
 msgstr "新的�模组将�克隆的路径"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
 msgid "name of the new submodule"
 msgstr "新�模组的�称"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
 msgid "url where to clone the submodule from"
 msgstr "克隆�模组的 url 地�"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
 msgid "depth for shallow clones"
 msgstr "浅克隆的深度"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
 msgid "force cloning progress"
 msgstr "强制显示克隆进度"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+msgid "disallow cloning into non-empty directory"
+msgstr "��许克隆到一个�空目录"
+
+#: builtin/submodule--helper.c:1916
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
-"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+"<repository>] [--name <name>] [--depth <depth>] [--single-branch] --url "
+"<url> --path <path>"
 msgstr ""
 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
-"[--name <�字>] [--depth <深度>] --url <url> --path <路径>"
-
-#: builtin/submodule--helper.c:1424
-#, c-format
-msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "无法克隆 '%s' 到�模组路径 '%s'"
+"[--name <�字>] [--depth <深度>] [--single-branch] --url <url> --path <路径>"
 
-#: builtin/submodule--helper.c:1438
-#, c-format
-msgid "could not get submodule directory for '%s'"
-msgstr "无法得到 '%s' 的�模组目录"
-
-#: builtin/submodule--helper.c:1474
+#: builtin/submodule--helper.c:1953
 #, c-format
 msgid "Invalid update mode '%s' for submodule path '%s'"
 msgstr "�模组 '%2$s' 的更新模� '%1$s' 无效"
 
-#: builtin/submodule--helper.c:1478
+#: builtin/submodule--helper.c:1957
 #, c-format
 msgid "Invalid update mode '%s' configured for submodule path '%s'"
 msgstr "为�模组 '%2$s' �置的更新模� '%1$s' 无效"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:2058
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "�模组 '%s' 尚未�始化"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:2062
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也许您想�执行 'update --init'？"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:2092
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略过未�并的�模组 %s"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:2121
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略过�模组 '%s'"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:2271
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "克隆 '%s' 失败。按计划�试"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:2282
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "第二次�试克隆 '%s' 失败，退出"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
 msgid "path into the working tree"
 msgstr "到工作区的路径"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:2347
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "工作区中的路径，递归嵌套�模组"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:2351
 msgid "rebase, merge, checkout or none"
 msgstr "rebase�merge�checkout 或 none"
 
-#: builtin/submodule--helper.c:1864
-msgid "Create a shallow clone truncated to the specified number of revisions"
+#: builtin/submodule--helper.c:2357
+msgid "create a shallow clone truncated to the specified number of revisions"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:2360
 msgid "parallel jobs"
 msgstr "并�任务"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:2362
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "�始克隆是�应该�守推�的浅克隆选项"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:2363
 msgid "don't print cloning progress"
 msgstr "��输出克隆进度"
 
-#: builtin/submodule--helper.c:1877
+#: builtin/submodule--helper.c:2374
 msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update-clone [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:2387
 msgid "bad value for update parameter"
 msgstr "update �数�值错误"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:2435
 #, 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:2061
+#: builtin/submodule--helper.c:2558
 #, c-format
 msgid "could not get a repository handle for submodule '%s'"
 msgstr "无法获得�模组 '%s' 的仓库�柄"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2591
 msgid "recurse into submodules"
 msgstr "在�模组中递归"
 
-#: builtin/submodule--helper.c:2100
+#: builtin/submodule--helper.c:2597
 msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
 msgstr "git submodule--helper absorb-git-dirs [<选项>] [<路径>...]"
 
-#: builtin/submodule--helper.c:2156
+#: builtin/submodule--helper.c:2653
 msgid "check if it is safe to write to the .gitmodules file"
 msgstr "检查写入 .gitmodules 文件是�安全"
 
-#: builtin/submodule--helper.c:2159
+#: builtin/submodule--helper.c:2656
 msgid "unset the config in the .gitmodules file"
 msgstr "�消 .gitmodules 文件中的设置"
 
-#: builtin/submodule--helper.c:2164
+#: builtin/submodule--helper.c:2661
 msgid "git submodule--helper config <name> [<value>]"
 msgstr "git submodule--helper config <�称> [<值>]"
 
-#: builtin/submodule--helper.c:2165
+#: builtin/submodule--helper.c:2662
 msgid "git submodule--helper config --unset <name>"
 msgstr "git submodule--helper config --unset <�称>"
 
-#: builtin/submodule--helper.c:2166
+#: builtin/submodule--helper.c:2663
 msgid "git submodule--helper config --check-writeable"
 msgstr "git submodule--helper config --check-writeable"
 
-#: builtin/submodule--helper.c:2185 git-submodule.sh:171
+#: 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 "请确认 .gitmodules 文件在工作区里"
 
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
+#: builtin/submodule--helper.c:2698
+msgid "suppress output for setting url of a submodule"
+msgstr "抑制设置�模组 URL 的输出"
+
+#: builtin/submodule--helper.c:2702
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <路径> <新地�>"
+
+#: builtin/submodule--helper.c:2735
+msgid "set the default tracking branch to master"
+msgstr "设置默认跟踪分支为 master"
+
+#: builtin/submodule--helper.c:2737
+msgid "set the default tracking branch"
+msgstr "设置默认跟踪分支"
+
+#: builtin/submodule--helper.c:2741
+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:2742
+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:2749
+msgid "--branch or --default required"
+msgstr "需� --branch 或 --default"
+
+#: builtin/submodule--helper.c:2752
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch 和 --default 是互斥的"
+
+#: builtin/submodule--helper.c:2815
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "�索引中添加�于 '%s' 的已存在的仓库\n"
+
+#: builtin/submodule--helper.c:2818
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "'%s' 已存在并且�是一个有效的 git 仓库"
+
+#: builtin/submodule--helper.c:2828
+#, c-format
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr "�现一个本地 git 目录 '%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 ""
+"如果您想��用这个本地 git 目录而��新克隆自\n"
+"  %s\n"
+"使用 '--force' 选项。如果本地 git 目录�是正确的仓库，或者如果您�确定这里\n"
+"的�义，使用 '--name' 选项指定�外的�称。\n"
+
+#: builtin/submodule--helper.c:2842
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "为�模组 '%s' �新激活本地 git 目录\n"
+
+#: builtin/submodule--helper.c:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "无法检出�模组 '%s'"
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr "克隆仓库时�检出的分支"
+
+#: builtin/submodule--helper.c:2910
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "�许添加一个被忽略的�模组路径"
+
+#: builtin/submodule--helper.c:2917
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr "git submodule--helper add-clone [<选项>...] --url <URL> --path <路径> --name <�称>"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s �支� --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2991
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' �是一个有效的 submodule--helper �命令"
@@ -19802,23 +22752,23 @@ msgstr "git symbolic-ref [<选项>] <�称> [<引用>]"
 msgid "git symbolic-ref -d [-q] <name>"
 msgstr "git symbolic-ref -d [-q] <�称>"
 
-#: builtin/symbolic-ref.c:40
+#: builtin/symbolic-ref.c:42
 msgid "suppress error message for non-symbolic (detached) refs"
 msgstr "�显示�符�（分离的）引用的错误信�"
 
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:43
 msgid "delete symbolic ref"
 msgstr "删除符�引用"
 
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:44
 msgid "shorten ref output"
 msgstr "缩短引用输出"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason"
 msgstr "原因"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
 msgid "reason of the update"
 msgstr "更新的原因"
 
@@ -19838,27 +22788,28 @@ msgstr "git tag -d <标签�>..."
 msgid ""
 "git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
 "points-at <object>]\n"
-"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+"\t\t[--format=<format>] [--merged <commit>] [--no-merged <commit>] "
+"[<pattern>...]"
 msgstr ""
 "git tag -l [-n[<数字>]] [--contains <�交>] [--no-contains <�交>] [--points-"
 "at <对象>]\n"
-"\t\t[--format=<格�>] [--[no-]merged [<�交>]] [<模�>...]"
+"\t\t[--format=<格�>] [--merged <�交>] [--no-merged <�交>] [<模�>...]"
 
 #: builtin/tag.c:30
 msgid "git tag -v [--format=<format>] <tagname>..."
 msgstr "git tag -v [--format=<格�>] <标签�>..."
 
-#: builtin/tag.c:89
+#: builtin/tag.c:100
 #, c-format
 msgid "tag '%s' not found."
 msgstr "未�现标签 '%s'。"
 
-#: builtin/tag.c:105
+#: builtin/tag.c:135
 #, c-format
 msgid "Deleted tag '%s' (was %s)\n"
 msgstr "已删除标签 '%s'（曾为 %s）\n"
 
-#: builtin/tag.c:135
+#: builtin/tag.c:170
 #, c-format
 msgid ""
 "\n"
@@ -19871,7 +22822,7 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被忽略。\n"
 
-#: builtin/tag.c:139
+#: builtin/tag.c:174
 #, c-format
 msgid ""
 "\n"
@@ -19885,15 +22836,11 @@ msgstr ""
 "  %s\n"
 "以 '%c' 开头的行将被�留，如果您愿�也�以删除它们。\n"
 
-#: builtin/tag.c:198
+#: builtin/tag.c:241
 msgid "unable to sign the tag"
 msgstr "无法签署标签"
 
-#: builtin/tag.c:200
-msgid "unable to write tag file"
-msgstr "无法写标签文件"
-
-#: 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"
@@ -19906,350 +22853,350 @@ msgstr ""
 "\n"
 "\tgit tag -f %s %s^{}"
 
-#: builtin/tag.c:232
+#: builtin/tag.c:275
 msgid "bad object type."
 msgstr "�的对象类型。"
 
-#: builtin/tag.c:284
+#: builtin/tag.c:328
 msgid "no tag message?"
 msgstr "无标签说明？"
 
-#: builtin/tag.c:291
+#: builtin/tag.c:335
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "标签说明被�留在 %s\n"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:446
 msgid "list tag names"
 msgstr "列出标签�称"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:448
 msgid "print <n> lines of each tag message"
 msgstr "�个标签信�打� <n> 行"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:450
 msgid "delete tags"
 msgstr "删除标签"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:451
 msgid "verify tags"
 msgstr "验�标签"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:453
 msgid "Tag creation options"
 msgstr "标签创建选项"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:455
 msgid "annotated tag, needs a message"
 msgstr "附注标签，需�一个说明"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:457
 msgid "tag message"
 msgstr "标签说明"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:459
 msgid "force edit of tag message"
 msgstr "强制编辑标签说明"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:460
 msgid "annotated and GPG-signed tag"
 msgstr "附注并附加 GPG 签�的标签"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:463
 msgid "use another key to sign the tag"
 msgstr "使用�外的�钥签�该标签"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:464
 msgid "replace the tag if exists"
 msgstr "如果存在，替�现有的标签"
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:465 builtin/update-ref.c:505
 msgid "create a reflog"
 msgstr "创建引用日志"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:467
 msgid "Tag listing options"
 msgstr "标签列表选项"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:468
 msgid "show tag list in columns"
 msgstr "以列的方�显示标签列表"
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:469 builtin/tag.c:471
 msgid "print only tags that contain the commit"
 msgstr "�打�包�该�交的标签"
 
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:470 builtin/tag.c:472
 msgid "print only tags that don't contain the commit"
 msgstr "�打��包�该�交的标签"
 
-#: builtin/tag.c:429
+#: builtin/tag.c:473
 msgid "print only tags that are merged"
 msgstr "�打�已��并的标签"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:474
 msgid "print only tags that are not merged"
 msgstr "�打�尚未�并的标签"
 
-#: builtin/tag.c:434
+#: builtin/tag.c:478
 msgid "print only tags of the object"
 msgstr "�打�指�该对象的标签"
 
-#: builtin/tag.c:482
+#: builtin/tag.c:526
 msgid "--column and -n are incompatible"
 msgstr "--column 和 -n �兼容"
 
-#: builtin/tag.c:504
+#: builtin/tag.c:548
 msgid "-n option is only allowed in list mode"
 msgstr "-n 选项��许用在列表显示模�"
 
-#: builtin/tag.c:506
+#: builtin/tag.c:550
 msgid "--contains option is only allowed in list mode"
 msgstr "--contains 选项��许用在列表显示模�"
 
-#: builtin/tag.c:508
+#: builtin/tag.c:552
 msgid "--no-contains option is only allowed in list mode"
 msgstr "--no-contains 选项��许用在列表显示模�"
 
-#: builtin/tag.c:510
+#: builtin/tag.c:554
 msgid "--points-at option is only allowed in list mode"
 msgstr "--points-at 选项��许用在列表显示模�"
 
-#: builtin/tag.c:512
+#: builtin/tag.c:556
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "--merged 和 --no-merged 选项��许用在列表显示模�"
 
-#: builtin/tag.c:523
+#: builtin/tag.c:567
 msgid "only one -F or -m option is allowed."
 msgstr "��许一个 -F 或 -m 选项。"
 
-#: builtin/tag.c:542
-msgid "too many params"
-msgstr "太多�数"
-
-#: builtin/tag.c:548
+#: builtin/tag.c:592
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' �是一个有效的标签�称。"
 
-#: builtin/tag.c:553
+#: builtin/tag.c:597
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "标签 '%s' 已存在"
 
-#: builtin/tag.c:584
+#: builtin/tag.c:628
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新标签 '%s'（曾为 %s）\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:504
 msgid "Unpacking objects"
 msgstr "展开对象中"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "创建目录 %s 失败"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "创建文件 %s 失败"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "删除文件 %s 失败"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "删除目录 %s 失败"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "在 '%s' 中测试 mtime "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr "添加一个新文件�，目录的状�信�未改�"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr "添加一个新目录�，目录的状�信�未改�"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr "更新一个文件�，目录的状�信�被修改"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "在�目录中添加文件�，目录的状�信�被修改"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr "删除一个文件�，目录的状�信�未改�"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr "删除一个目录�，目录的状�信�未改�"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<选项>] [--] [<文件>...]"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:976
 msgid "continue refresh even when index needs update"
 msgstr "当索引需�更新时继续刷新"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:979
 msgid "refresh: ignore submodules"
 msgstr "刷新：忽略�模组"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:982
 msgid "do not ignore new files"
 msgstr "�忽略新的文件"
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:984
 msgid "let files replace directories and vice-versa"
 msgstr "让文件替�目录（�之亦然）"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:986
 msgid "notice files missing from worktree"
 msgstr "通知文件从工作区丢失"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:988
 msgid "refresh even if index contains unmerged entries"
 msgstr "�使索引区包�未�并的�目也执行刷新"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:991
 msgid "refresh stat information"
 msgstr "刷新统计信�"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:995
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:999
 msgid "<mode>,<object>,<path>"
 msgstr "<存�模�>,<对象>,<路径>"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1000
 msgid "add the specified entry to the index"
 msgstr "添加指定的�目到索引区"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1010
 msgid "mark files as \"not changing\""
 msgstr "把文件标记为 \"没有�更\""
 
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1013
 msgid "clear assumed-unchanged bit"
 msgstr "清除 assumed-unchanged �"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1016
 msgid "mark files as \"index-only\""
 msgstr "把文件标记为 \"仅索引\""
 
-#: builtin/update-index.c:1015
+#: builtin/update-index.c:1019
 msgid "clear skip-worktree bit"
 msgstr "清除 skip-worktree �"
 
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr "��触碰仅索引�目"
+
+#: builtin/update-index.c:1024
 msgid "add to index only; do not add content to object database"
 msgstr "�添加到索引区；�添加对象到对象库"
 
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1026
 msgid "remove named paths even if present in worktree"
 msgstr "�使存在工作区里，也删除路径"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1028
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "�带 --stdin：输入的行以 null 字符终止"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1030
 msgid "read list of paths to be updated from standard input"
 msgstr "从标准输入中读�需�更新的路径列表"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1034
 msgid "add entries from standard input to the index"
 msgstr "从标准输入添加�目到索引区"
 
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1038
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "为指定文件�新生�第2和第3暂存区"
 
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1042
 msgid "only update entries that differ from HEAD"
 msgstr "�更新与 HEAD ��的�目"
 
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1046
 msgid "ignore files missing from worktree"
 msgstr "忽略工作区丢失的文件"
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1049
 msgid "report actions to standard output"
 msgstr "在标准输出显示�作"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1051
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(for porcelains) 忘记�存的未解决的冲�"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1055
 msgid "write index in this format"
 msgstr "以这�格�写入索引区"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1057
 msgid "enable or disable split index"
 msgstr "�用或�用索引拆分"
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1059
 msgid "enable/disable untracked cache"
 msgstr "�用/�用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1061
 msgid "test if the filesystem supports untracked cache"
 msgstr "测试文件系统是�支�未跟踪文件缓存"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1063
 msgid "enable untracked cache without testing the filesystem"
 msgstr "无需检测文件系统，�用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1065
 msgid "write out the index even if is not flagged as changed"
 msgstr "�使没有被标记为已更改，也�写出索引"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1067
 msgid "enable or disable file system monitor"
 msgstr "�用或�用文件系统监控"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1069
 msgid "mark files as fsmonitor valid"
 msgstr "标记文件为 fsmonitor 有效"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c:1072
 msgid "clear fsmonitor valid bit"
 msgstr "清除 fsmonitor 有效�"
 
-#: builtin/update-index.c:1169
+#: 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 被设置为 false。如果您确实��用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c:1178
+#: 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 被设置为 true。如果您确实��用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c:1190
+#: 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"
@@ -20257,11 +23204,11 @@ msgstr ""
 "core.untrackedCache 被设置为 true。如果您确实��用未跟踪文件缓存，请删除或修"
 "改它。"
 
-#: builtin/update-index.c:1194
+#: builtin/update-index.c:1200
 msgid "Untracked cache disabled"
 msgstr "缓存未跟踪文件被�用"
 
-#: builtin/update-index.c:1202
+#: 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"
@@ -20269,25 +23216,25 @@ msgstr ""
 "core.untrackedCache 被设置为 false。如果您确实��用未跟踪文件缓存，请删除或"
 "修改它。"
 
-#: builtin/update-index.c:1206
+#: builtin/update-index.c:1212
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "缓存未跟踪文件在 '%s' �用"
 
-#: builtin/update-index.c:1214
+#: builtin/update-index.c:1220
 msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr "core.fsmonitor 未设置；如果想��用 fsmonitor 请设置该选项"
 
-#: builtin/update-index.c:1218
+#: builtin/update-index.c:1224
 msgid "fsmonitor enabled"
 msgstr "fsmonitor 被�用"
 
-#: builtin/update-index.c:1221
+#: builtin/update-index.c:1227
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr "core.fsmonitor 已设置；如果想��用 fsmonitor 请移除该选项"
 
-#: builtin/update-index.c:1225
+#: builtin/update-index.c:1231
 msgid "fsmonitor disabled"
 msgstr "fsmonitor 被�用"
 
@@ -20303,19 +23250,19 @@ msgstr "git update-ref [<选项>]    <引用�> <新值> [<旧值>]"
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<选项>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:500
 msgid "delete the reference"
 msgstr "删除引用"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:502
 msgid "update <refname> not the one it points to"
 msgstr "更新 <引用�> 本身而�是它指�的引用"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:503
 msgid "stdin has NUL-terminated arguments"
 msgstr "标准输入有以 NUL 字符终止的�数"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:504
 msgid "read updates from stdin"
 msgstr "从标准输入读�更新"
 
@@ -20359,15 +23306,15 @@ msgstr "打��交内容"
 msgid "print raw gpg status output"
 msgstr "打�原始 gpg 状�输出"
 
-#: builtin/verify-pack.c:55
+#: builtin/verify-pack.c:59
 msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
 msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
 
-#: builtin/verify-pack.c:65
+#: builtin/verify-pack.c:70
 msgid "verbose"
 msgstr "冗长输出"
 
-#: builtin/verify-pack.c:67
+#: builtin/verify-pack.c:72
 msgid "show statistics only"
 msgstr "�显示统计"
 
@@ -20379,221 +23326,213 @@ msgstr "git verify-tag [-v | --verbose] [--format=<格�>] <标签>..."
 msgid "print tag contents"
 msgstr "打�标签内容"
 
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
 msgid "git worktree add [<options>] <path> [<commit-ish>]"
 msgstr "git worktree add [<选项>] <路径> [<�交>]"
 
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
 msgid "git worktree list [<options>]"
 msgstr "git worktree list [<选项>]"
 
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
 msgid "git worktree lock [<options>] <path>"
 msgstr "git worktree lock [<选项>] <路径>"
 
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
 msgid "git worktree move <worktree> <new-path>"
 msgstr "git worktree move <工作区> <新路径>"
 
-#: builtin/worktree.c:21
+#: builtin/worktree.c:22
 msgid "git worktree prune [<options>]"
 msgstr "git worktree prune [<选项>]"
 
-#: builtin/worktree.c:22
+#: builtin/worktree.c:23
 msgid "git worktree remove [<options>] <worktree>"
 msgstr "git worktree remove [<选项>] <工作区>"
 
-#: builtin/worktree.c:23
+#: builtin/worktree.c:24
 msgid "git worktree unlock <path>"
 msgstr "git worktree unlock <路径>"
 
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:61 builtin/worktree.c:944
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "删除 '%s' 失败"
 
-#: builtin/worktree.c:79
+#: builtin/worktree.c:74
 #, c-format
-msgid "Removing worktrees/%s: not a valid directory"
-msgstr "删除工作区/%s：�是一个有效的目录"
+msgid "Removing %s/%s: %s"
+msgstr "删除 %s/%s: %s"
 
-#: builtin/worktree.c:85
-#, c-format
-msgid "Removing worktrees/%s: gitdir file does not exist"
-msgstr "删除 worktrees/%s：gitdir 文件�存在"
-
-#: builtin/worktree.c:90 builtin/worktree.c:99
-#, c-format
-msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
-msgstr "删除 worktrees/%s：无法读� gitdir 文件 (%s)"
-
-#: builtin/worktree.c:109
-#, c-format
-msgid ""
-"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
-"%<PRIuMAX>)"
-msgstr "删除工作树/%s：读�过短（期望 %<PRIuMAX> 字节，读� %<PRIuMAX>）"
-
-#: builtin/worktree.c:117
-#, c-format
-msgid "Removing worktrees/%s: invalid gitdir file"
-msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-
-#: builtin/worktree.c:126
-#, c-format
-msgid "Removing worktrees/%s: gitdir file points to non-existent location"
-msgstr "删除 worktrees/%s：gitdir 文件的指��存在"
-
-#: builtin/worktree.c:165
+#: builtin/worktree.c:147
 msgid "report pruned working trees"
 msgstr "报告清除的工作区"
 
-#: builtin/worktree.c:167
+#: builtin/worktree.c:149
 msgid "expire working trees older than <time>"
 msgstr "将早于 <时间> 的工作区过期"
 
-#: builtin/worktree.c:234
+#: builtin/worktree.c:219
 #, c-format
 msgid "'%s' already exists"
 msgstr "'%s' 已�存在"
 
-#: builtin/worktree.c:251
+#: builtin/worktree.c:228
 #, c-format
-msgid "unable to re-add worktree '%s'"
-msgstr "无法�次添加工作区 '%s'"
+msgid "unusable worktree destination '%s'"
+msgstr "无法使用的工作区目标 '%s'"
 
-#: builtin/worktree.c:256
+#: builtin/worktree.c:233
 #, c-format
 msgid ""
 "'%s' is a missing but locked worktree;\n"
-"use 'add -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
+"use '%s -f -f' to override, or 'unlock' and 'prune' or 'remove' to clear"
 msgstr ""
-"'%s' 是一个丢失但�定的工作区，使用\n"
-"'add -f -f' 覆盖，或 'unlock' 和 'prune' 或 'remove' 清除"
+"'%s' 是一个丢失但�定的工作区，\n"
+"使用 '%s -f -f' 覆盖，或用 'unlock' 和 'prune' 或 'remove' 清除"
 
-#: builtin/worktree.c:258
+#: builtin/worktree.c:235
 #, c-format
 msgid ""
 "'%s' is a missing but already registered worktree;\n"
-"use 'add -f' to override, or 'prune' or 'remove' to clear"
+"use '%s -f' to override, or 'prune' or 'remove' to clear"
 msgstr ""
-"'%s' 是一个丢失但已�注册的工作区，使用\n"
-"'add -f' 覆盖，或 'prune' 或 'remove' 清除"
+"'%s' 是一个丢失但已�注册的工作区，\n"
+"使用 '%s -f' 覆盖，或用 'prune' 或 'remove' 清除"
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:286
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "�能创建目录 '%s'"
 
-#: builtin/worktree.c:439 builtin/worktree.c:445
+#: builtin/worktree.c:308
+msgid "initializing"
+msgstr "�始化"
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
 #, c-format
 msgid "Preparing worktree (new branch '%s')"
 msgstr "准备工作区（新分支 '%s'）"
 
-#: builtin/worktree.c:441
+#: builtin/worktree.c:422
 #, c-format
 msgid "Preparing worktree (resetting branch '%s'; was at %s)"
 msgstr "准备工作区（�置分支 '%s'，之�为 %s）"
 
-#: builtin/worktree.c:450
+#: builtin/worktree.c:431
 #, c-format
 msgid "Preparing worktree (checking out '%s')"
 msgstr "准备工作区（检出 '%s'）"
 
-#: builtin/worktree.c:456
+#: builtin/worktree.c:437
 #, c-format
 msgid "Preparing worktree (detached HEAD %s)"
 msgstr "准备工作区（分离头指针 %s）"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:482
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "检出 <分支>，�使已�被检出到其它工作区"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:485
 msgid "create a new branch"
 msgstr "创建一个新分支"
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:487
 msgid "create or reset a branch"
 msgstr "创建或�置一个分支"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:489
 msgid "populate the new working tree"
 msgstr "生�新的工作区"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:490
 msgid "keep the new working tree locked"
 msgstr "�定新工作区"
 
-#: builtin/worktree.c:508
+#: 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:511
+#: builtin/worktree.c:498
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "�试为新分支�匹�一个远程跟踪分支"
 
-#: builtin/worktree.c:519
+#: builtin/worktree.c:506
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b�-B 和 --detach 是互斥的"
 
-#: builtin/worktree.c:580
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr "--reason 需� --lock"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "由 --lock 添加"
+
+#: builtin/worktree.c:574
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "�能在创建新分支时使用选项 --[no-]track "
 
-#: builtin/worktree.c:680
-msgid "reason for locking"
-msgstr "�定原因"
+#: builtin/worktree.c:691
+msgid "show extended annotations and reasons, if available"
+msgstr "显示扩展的注释和原因（如果有）"
+
+#: builtin/worktree.c:693
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "�早于 <时间> 的工作区添添加“�修剪�注释"
+
+#: builtin/worktree.c:702
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose 和 --porcelain 互斥"
 
-#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: 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:694 builtin/worktree.c:727
+#: builtin/worktree.c:743 builtin/worktree.c:776
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作区无法被加�或解�"
 
-#: builtin/worktree.c:699
+#: builtin/worktree.c:748
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被�定，原因：%s"
 
-#: builtin/worktree.c:701
+#: builtin/worktree.c:750
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被�定"
 
-#: builtin/worktree.c:729
+#: builtin/worktree.c:778
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被�定"
 
-#: builtin/worktree.c:770
+#: builtin/worktree.c:819
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "�能移动或删除包��模组的工作区"
 
-#: builtin/worktree.c:778
+#: builtin/worktree.c:827
 msgid "force move even if worktree is dirty or locked"
 msgstr "强制移动，�使工作区是�的或已�定"
 
-#: builtin/worktree.c:801 builtin/worktree.c:928
+#: builtin/worktree.c:850 builtin/worktree.c:974
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一个主工作区"
 
-#: builtin/worktree.c:806
+#: builtin/worktree.c:855
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "无法从 '%s' 算出目标�称"
 
-#: builtin/worktree.c:812
-#, c-format
-msgid "target '%s' already exists"
-msgstr "目标 '%s' 已存在"
-
-#: builtin/worktree.c:820
+#: builtin/worktree.c:868
 #, c-format
 msgid ""
 "cannot move a locked working tree, lock reason: %s\n"
@@ -20602,7 +23541,7 @@ msgstr ""
 "无法移动一个�定的工作区，�定原因：%s\n"
 "使用 'move -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:822
+#: builtin/worktree.c:870
 msgid ""
 "cannot move a locked working tree;\n"
 "use 'move -f -f' to override or unlock first"
@@ -20610,36 +23549,36 @@ msgstr ""
 "无法移动一个�定的工作区，\n"
 "使用 'move -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:825
+#: builtin/worktree.c:873
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "验�失败，无法移动工作区：%s"
 
-#: builtin/worktree.c:830
+#: builtin/worktree.c:878
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "移动 '%s' 到 '%s' 失败"
 
-#: builtin/worktree.c:878
+#: builtin/worktree.c:924
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "在 '%s' 中执行 'git status' 失败"
 
-#: builtin/worktree.c:882
+#: builtin/worktree.c:928
 #, c-format
 msgid "'%s' contains modified or untracked files, use --force to delete it"
 msgstr "'%s' 包�修改或未跟踪的文件，使用 --force 删除"
 
-#: builtin/worktree.c:887
+#: builtin/worktree.c:933
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "在 '%s' 中执行 'git status' 失败，退出� %d"
 
-#: builtin/worktree.c:910
+#: builtin/worktree.c:956
 msgid "force removal even if worktree is dirty or locked"
 msgstr "强制删除，�使工作区是�的或已�定"
 
-#: builtin/worktree.c:933
+#: builtin/worktree.c:979
 #, c-format
 msgid ""
 "cannot remove a locked working tree, lock reason: %s\n"
@@ -20648,7 +23587,7 @@ msgstr ""
 "无法删除一个�定的工作区，�定原因：%s\n"
 "使用 'remove -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:935
+#: builtin/worktree.c:981
 msgid ""
 "cannot remove a locked working tree;\n"
 "use 'remove -f -f' to override or unlock first"
@@ -20656,11 +23595,21 @@ msgstr ""
 "无法删除一个�定的工作区，\n"
 "使用 'remove -f -f' 覆盖或先解�"
 
-#: builtin/worktree.c:938
+#: builtin/worktree.c:984
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "验�失败，无法删除工作区：%s"
 
+#: builtin/worktree.c:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr "修�：%s：%s"
+
+#: builtin/worktree.c:1011
+#, c-format
+msgid "error: %s: %s"
+msgstr "错误：%s：%s"
+
 #: builtin/write-tree.c:15
 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
 msgstr "git write-tree [--missing-ok] [--prefix=<�缀>/]"
@@ -20677,57 +23626,14 @@ msgstr "将 <�缀> �目录内容写到一个树对象"
 msgid "only useful for debugging"
 msgstr "�对调试有用"
 
-#: fast-import.c:3118
-#, c-format
-msgid "Expected 'mark' command, got %s"
-msgstr "预期 'mark' 命令，得到 %s"
-
-#: fast-import.c:3123
-#, c-format
-msgid "Expected 'to' command, got %s"
-msgstr "预期 'to' 命令，得到 %s"
-
-#: credential-cache--daemon.c:223
-#, c-format
-msgid ""
-"The permissions on your socket directory are too loose; other\n"
-"users may be able to read your cached credentials. Consider running:\n"
-"\n"
-"\tchmod 0700 %s"
-msgstr ""
-"您的 socket 目录��过于宽�，其他用户�能会读�您缓存的认�信�。考虑执"
-"行：\n"
-"\n"
-"\tchmod 0700 %s"
-
-#: credential-cache--daemon.c:272
-msgid "print debugging messages to stderr"
-msgstr "调试信�输出到标准错误"
-
-#: t/helper/test-reach.c:152
-#, c-format
-msgid "commit %s is not marked reachable"
-msgstr "�交 %s 没有标记为�达"
-
-#: t/helper/test-reach.c:162
-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 [<选项>]"
-
-#: t/helper/test-serve-v2.c:19
-msgid "exit immediately after advertising capabilities"
-msgstr "对能力广告之�立�退出"
-
-#: git.c:27
+#: git.c:28
 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"
 "           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
 "           <command> [<args>]"
 msgstr ""
 "git [--version] [--help] [-C <路径>] [-c <�称>=<�值>]\n"
@@ -20735,9 +23641,10 @@ msgstr ""
 "           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
 "bare]\n"
 "           [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<�称>]\n"
+"           [--super-prefix=<路径>] [--config-env=<�称>=<环境��>]\n"
 "           <命令> [<�数>]"
 
-#: git.c:34
+#: 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"
@@ -20749,47 +23656,52 @@ msgstr ""
 "帮助。\n"
 "有关系统的概述，查看 'git help git'。"
 
-#: git.c:186
+#: git.c:188
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "没有为 --git-dir �供目录\n"
 
-#: git.c:200
+#: git.c:202
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "没有为 --namespace �供命�空间\n"
 
-#: git.c:214
+#: git.c:216
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "没有为 --work-tree �供目录\n"
 
-#: git.c:228
+#: git.c:230
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "没有为 --super-prefix �供�缀\n"
 
-#: git.c:250
+#: git.c:252
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "应为 -c �供一个�置字符串\n"
 
-#: git.c:288
+#: git.c:260
+#, c-format
+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:314
+#: git.c:326
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "未知选项：%s\n"
 
-#: git.c:360
+#: git.c:375
 #, c-format
 msgid "while expanding alias '%s': '%s'"
 msgstr "在扩展别� '%s' 时：'%s'"
 
-#: git.c:369
+#: git.c:384
 #, c-format
 msgid ""
 "alias '%s' changes environment variables.\n"
@@ -20798,39 +23710,39 @@ msgstr ""
 "别� '%s' 修改环境��。您�以使用在别�中\n"
 "使用 '!git'"
 
-#: git.c:376
+#: git.c:391
 #, c-format
 msgid "empty alias for %s"
 msgstr "%s 的空别�"
 
-#: git.c:379
+#: git.c:394
 #, c-format
 msgid "recursive alias: %s"
 msgstr "递归的别�：%s"
 
-#: git.c:459
+#: git.c:476
 msgid "write failure on standard output"
 msgstr "在标准输出写入失败"
 
-#: git.c:461
+#: git.c:478
 msgid "unknown write failure on standard output"
 msgstr "到标准输出的未知写入错误"
 
-#: git.c:463
+#: git.c:480
 msgid "close failed on standard output"
 msgstr "标准输出关闭失败"
 
-#: git.c:792
+#: git.c:833
 #, c-format
 msgid "alias loop detected: expansion of '%s' does not terminate:%s"
 msgstr "检测到别�循环：'%s'的扩展未终止：%s"
 
-#: git.c:842
+#: git.c:883
 #, c-format
 msgid "cannot handle %s as a builtin"
 msgstr "�能作为内置命令处� %s"
 
-#: git.c:855
+#: git.c:896
 #, c-format
 msgid ""
 "usage: %s\n"
@@ -20839,53 +23751,201 @@ msgstr ""
 "用法：%s\n"
 "\n"
 
-#: git.c:875
+#: git.c:916
 #, c-format
 msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
 msgstr "展开别�命令 '%s' 失败，'%s' �是一个 git 命令\n"
 
-#: git.c:887
+#: git.c:928
 #, c-format
 msgid "failed to run command '%s': %s\n"
 msgstr "�行命令 '%s' 失败：%s\n"
 
-#: http.c:378
+#: http-fetch.c:118
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "--packfile 的�数必须是有效的哈希值（得到 '%s'）"
+
+#: http-fetch.c:128
+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 "未处�的选项"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "准备版本时错误"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "�交 %s 没有标记为�达"
+
+#: 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 [<选项>]"
+
+#: 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'"
+
+#: 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
+msgid "test-helper simple-ipc is-active    [<name>] [<options>]"
+msgstr "test-helper simple-ipc is-active    [<�字>] [<选项>]"
+
+#: t/helper/test-simple-ipc.c:683
+msgid "test-helper simple-ipc run-daemon   [<name>] [<threads>]"
+msgstr "test-helper simple-ipc run-daemon   [<�字>] [<线程>]"
+
+#: t/helper/test-simple-ipc.c:684
+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
+msgid "test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"
+msgstr "test-helper simple-ipc stop-daemon  [<�字>] [<最大等待>]"
+
+#: t/helper/test-simple-ipc.c:686
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<�字>] [<令牌>]"
+
+#: t/helper/test-simple-ipc.c:687
+msgid "test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"
+msgstr "test-helper simple-ipc sendbytes    [<�字>] [<字节数>] [<字节>]"
+
+#: t/helper/test-simple-ipc.c:688
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<�字>] [<线程>] [<字节计数>] [<批处�大"
+"å°�>]"
+
+#: t/helper/test-simple-ipc.c:696
+msgid "name or pathname of unix domain socket"
+msgstr "unix 域套接字的�称或路径�"
+
+#: 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 "�个线程的请求数"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr "字节"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr "ballast character"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr "令牌"
+
+#: 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"
 msgstr "http.postbuffer 为负值，默认为 %d"
 
-#: http.c:399
+#: http.c:420
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "�支�委托控制，因为 cURL < 7.22.0"
 
-#: http.c:408
+#: http.c:429
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "�支�公钥文件�定，因为 cURL < 7.44.0"
 
-#: http.c:878
+#: http.c:910
 msgid "CURLSSLOPT_NO_REVOKE not supported with cURL < 7.44.0"
 msgstr "�支� CURLSSLOPT_NO_REVOKE，因为 cURL < 7.44.0"
 
-#: http.c:951
+#: http.c:989
 msgid "Protocol restrictions not supported with cURL < 7.19.4"
 msgstr "�支��议�制，因为 cURL < 7.19.4"
 
-#: http.c:1088
+#: http.c:1132
 #, c-format
 msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
 msgstr "�支�的 SSL �端 '%s'。支�的 SSL �端："
 
-#: http.c:1095
+#: http.c:1139
 #, c-format
 msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
 msgstr "无法设置 SSL �端为 '%s'：cURL: cURL 没有使用 SSL �端构建"
 
-#: http.c:1099
+#: http.c:1143
 #, c-format
 msgid "Could not set SSL backend to '%s': already set"
 msgstr "无法将 SSL �端设置为 '%s'：已�设置"
 
-#: http.c:1968
+#: http.c:2034
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -20896,152 +23956,192 @@ msgstr ""
 "     请求：%s\n"
 "   �定�：%s"
 
-#: remote-curl.c:166
+#: remote-curl.c:183
 #, c-format
 msgid "invalid quoting in push-option value: '%s'"
 msgstr "在 push-option �值中无效的引�：'%s'"
 
-#: remote-curl.c:263
+#: remote-curl.c:307
 #, c-format
 msgid "%sinfo/refs not valid: is this a git repository?"
-msgstr "%sinfo/refs 无效：这是一个 git 仓库么？"
+msgstr "%sinfo/refs 无效：这是 git 仓库么？"
 
-#: remote-curl.c:364
+#: remote-curl.c:408
 msgid "invalid server response; expected service, got flush packet"
 msgstr "无效的�务端�应。预期�务，得到 flush 包"
 
-#: remote-curl.c:395
+#: remote-curl.c:439
 #, c-format
 msgid "invalid server response; got '%s'"
 msgstr "无效的�务端�应，得到 '%s'"
 
-#: remote-curl.c:455
+#: remote-curl.c:499
 #, c-format
 msgid "repository '%s' not found"
 msgstr "仓库 '%s' 未找到"
 
-#: remote-curl.c:459
+#: remote-curl.c:503
 #, c-format
 msgid "Authentication failed for '%s'"
 msgstr "'%s' 鉴�失败"
 
-#: remote-curl.c:463
+#: remote-curl.c:507
 #, c-format
 msgid "unable to access '%s': %s"
 msgstr "无法访问 '%s'：%s"
 
-#: remote-curl.c:469
+#: remote-curl.c:513
 #, c-format
 msgid "redirecting to %s"
 msgstr "�定�到 %s"
 
-#: remote-curl.c:593
+#: remote-curl.c:644
 msgid "shouldn't have EOF when not gentle on EOF"
 msgstr "当没有设置温和处�文件结�符（EOF）时，�应该有文件结�符"
 
-#: remote-curl.c:673
+#: remote-curl.c:656
+msgid "remote server sent unexpected response end packet"
+msgstr "远程�务器���外的�应结�数�包"
+
+#: remote-curl.c:726
 msgid "unable to rewind rpc post data - try increasing http.postBuffer"
 msgstr "无法倒回 rpc post 数� - �试增加 http.postBuffer"
 
-#: remote-curl.c:733
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl：错误的行宽字符：%.4s"
+
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl：�外�应结�包"
+
+#: remote-curl.c:834
 #, c-format
 msgid "RPC failed; %s"
 msgstr "RPC 失败。%s"
 
-#: remote-curl.c:773
+#: remote-curl.c:874
 msgid "cannot handle pushes this big"
 msgstr "�能处�这么大的推�"
 
-#: remote-curl.c:888
+#: remote-curl.c:989
 #, c-format
 msgid "cannot deflate request; zlib deflate error %d"
 msgstr "�能压缩请求，zlib 压缩错误 %d"
 
-#: remote-curl.c:892
+#: remote-curl.c:993
 #, c-format
 msgid "cannot deflate request; zlib end error %d"
 msgstr "�能压缩请求，zlib 结�错误 %d"
 
-#: remote-curl.c:1023
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "收到了 %d 字节长度的头信�"
+
+#: remote-curl.c:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "预期�然需� %d 个字节的正文"
+
+#: remote-curl.c:1134
 msgid "dumb http transport does not support shallow capabilities"
-msgstr "哑 http 传输�支� shalllow 能力"
+msgstr "哑 http 传输�支�浅克隆能力"
 
-#: remote-curl.c:1037
+#: remote-curl.c:1149
 msgid "fetch failed."
 msgstr "获�失败。"
 
-#: remote-curl.c:1085
+#: remote-curl.c:1195
 msgid "cannot fetch by sha1 over smart http"
 msgstr "无法通过智能 HTTP 获� sha1"
 
-#: remote-curl.c:1129 remote-curl.c:1135
+#: remote-curl.c:1239 remote-curl.c:1245
 #, c-format
 msgid "protocol error: expected sha/ref, got '%s'"
 msgstr "�议错误：期望 sha/ref，�得到 '%s'"
 
-#: remote-curl.c:1147 remote-curl.c:1261
+#: remote-curl.c:1257 remote-curl.c:1375
 #, c-format
 msgid "http transport does not support %s"
 msgstr "http 传输�议�支� %s"
 
-#: remote-curl.c:1183
+#: remote-curl.c:1293
 msgid "git-http-push failed"
 msgstr "git-http-push 失败"
 
-#: remote-curl.c:1367
+#: remote-curl.c:1481
 msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
 msgstr "remote-curl：用法：git remote-curl <远程> [<url>]"
 
-#: remote-curl.c:1399
+#: remote-curl.c:1513
 msgid "remote-curl: error reading command stream from git"
 msgstr "remote-curl：错误读��自 git 的命令�"
 
-#: remote-curl.c:1406
+#: remote-curl.c:1520
 msgid "remote-curl: fetch attempted without a local repo"
 msgstr "remote-curl：�试没有本地仓库下获�"
 
-#: remote-curl.c:1446
+#: remote-curl.c:1561
 #, c-format
 msgid "remote-curl: unknown command '%s' from git"
 msgstr "remote-curl：未知的�自 git 的命令 '%s'"
 
-#: list-objects-filter-options.h:85
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "编译器信���用\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "libc 信���用\n"
+
+#: list-objects-filter-options.h:94
 msgid "args"
 msgstr "�数"
 
-#: list-objects-filter-options.h:86
+#: list-objects-filter-options.h:95
 msgid "object filtering"
 msgstr "对象过滤"
 
-#: parse-options.h:179
+#: parse-options.h:184
 msgid "expiry-date"
 msgstr "到期时间"
 
-#: parse-options.h:193
+#: parse-options.h:198
 msgid "no-op (backward compatibility)"
 msgstr "空�作（��兼容）"
 
-#: parse-options.h:305
+#: parse-options.h:310
 msgid "be more verbose"
 msgstr "更加详细"
 
-#: parse-options.h:307
+#: parse-options.h:312
 msgid "be more quiet"
 msgstr "更加安�"
 
-#: parse-options.h:313
-msgid "use <n> digits to display SHA-1s"
-msgstr "用 <n> �数字显示 SHA-1 哈希值"
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
+msgstr "用 <n> �数字显示对象�"
 
-#: parse-options.h:332
+#: parse-options.h:337
 msgid "how to strip spaces and #comments from message"
 msgstr "设置如何删除�交说明里的空格和#注释"
 
-#: ref-filter.h:101
+#: parse-options.h:338
+msgid "read pathspec from file"
+msgstr "从文件读�路径表达�"
+
+#: parse-options.h:339
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "使用 --pathspec-from-file，路径表达�用空字符分隔"
+
+#: ref-filter.h:99
 msgid "key"
 msgstr "key"
 
-#: ref-filter.h:101
+#: ref-filter.h:99
 msgid "field name to sort on"
 msgstr "排�的字段�"
 
@@ -21049,14 +24149,6 @@ msgstr "排�的字段�"
 msgid "update the index with reused conflict resolution if possible"
 msgstr "如果�能，�用冲�解决更新索引"
 
-#: wt-status.h:67
-msgid "HEAD detached at "
-msgstr "头指针分离于 "
-
-#: wt-status.h:68
-msgid "HEAD detached from "
-msgstr "头指针分离自 "
-
 #: command-list.h:50
 msgid "Add file contents to the index"
 msgstr "添加文件内容至索引"
@@ -21094,669 +24186,656 @@ msgid "List, create, or delete branches"
 msgstr "列出�创建或删除分支"
 
 #: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "收集信�以供用户�交错误报告"
+
+#: command-list.h:60
 msgid "Move objects and refs by archive"
 msgstr "通过归档移动对象和引用"
 
-#: command-list.h:60
+#: command-list.h:61
 msgid "Provide content or type and size information for repository objects"
 msgstr "�供仓库对象的内容�类型或大�"
 
-#: command-list.h:61
+#: command-list.h:62
 msgid "Display gitattributes information"
 msgstr "显示 gitattributes 信�"
 
-#: command-list.h:62
+#: command-list.h:63
 msgid "Debug gitignore / exclude files"
 msgstr "调试 gitignore / exclude 文件"
 
-#: command-list.h:63
+#: command-list.h:64
 msgid "Show canonical names and email addresses of contacts"
 msgstr "显示�系人的规范�称和电�邮件"
 
-#: command-list.h:64
+#: command-list.h:65
 msgid "Switch branches or restore working tree files"
 msgstr "切�分支或��工作区文件"
 
-#: command-list.h:65
+#: command-list.h:66
 msgid "Copy files from the index to the working tree"
 msgstr "从索引拷�文件到工作区"
 
-#: command-list.h:66
+#: command-list.h:67
 msgid "Ensures that a reference name is well formed"
 msgstr "确�引用�称格�正确"
 
-#: command-list.h:67
+#: command-list.h:68
 msgid "Find commits yet to be applied to upstream"
 msgstr "查找尚未应用到上游的�交"
 
-#: command-list.h:68
+#: command-list.h:69
 msgid "Apply the changes introduced by some existing commits"
 msgstr "应用一些现存�交引入的修改"
 
-#: command-list.h:69
+#: command-list.h:70
 msgid "Graphical alternative to git-commit"
 msgstr "git-commit 的图形替代界�"
 
-#: command-list.h:70
+#: command-list.h:71
 msgid "Remove untracked files from the working tree"
 msgstr "从工作区中删除未跟踪文件"
 
-#: command-list.h:71
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "克隆仓库到一个新目录"
 
-#: command-list.h:72
+#: command-list.h:73
 msgid "Display data in columns"
 msgstr "以列的方�显示数�"
 
-#: command-list.h:73
+#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "记录�更到仓库"
 
-#: command-list.h:74
+#: command-list.h:75
 msgid "Write and verify Git commit-graph files"
 msgstr "写入和校验 Git �交图文件"
 
-#: command-list.h:75
+#: command-list.h:76
 msgid "Create a new commit object"
 msgstr "创建一个新的�交对象"
 
-#: command-list.h:76
+#: command-list.h:77
 msgid "Get and set repository or global options"
 msgstr "获�和设置仓库或者全局选项"
 
-#: command-list.h:77
+#: command-list.h:78
 msgid "Count unpacked number of objects and their disk consumption"
 msgstr "计算未打包对象的数�和�盘空间�用"
 
-#: command-list.h:78
+#: command-list.h:79
 msgid "Retrieve and store user credentials"
 msgstr "检索和存储用户密�"
 
-#: command-list.h:79
+#: command-list.h:80
 msgid "Helper to temporarily store passwords in memory"
 msgstr "在内存中临时存储密�的助手"
 
-#: command-list.h:80
+#: command-list.h:81
 msgid "Helper to store credentials on disk"
 msgstr "在�盘存储密�的助手"
 
-#: command-list.h:81
+#: command-list.h:82
 msgid "Export a single commit to a CVS checkout"
 msgstr "将一个�交导出到 CVS 检出中"
 
-#: command-list.h:82
+#: command-list.h:83
 msgid "Salvage your data out of another SCM people love to hate"
 msgstr "从�外一个人们爱�的�置管�系统中拯救你的数�"
 
-#: command-list.h:83
+#: command-list.h:84
 msgid "A CVS server emulator for Git"
 msgstr "Git 的一个 CVS �务模拟器"
 
-#: command-list.h:84
+#: command-list.h:85
 msgid "A really simple server for Git repositories"
 msgstr "一个�常简�的 Git 仓库�务器"
 
-#: command-list.h:85
+#: command-list.h:86
 msgid "Give an object a human readable name based on an available ref"
 msgstr "基于一个现存的引用为一个对象起一个�读的�称"
 
-#: command-list.h:86
+#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "显示�交之间��交和工作区之间等的差异"
 
-#: command-list.h:87
+#: command-list.h:88
 msgid "Compares files in the working tree and the index"
 msgstr "比较工作区和索引区中的文件"
 
-#: command-list.h:88
+#: command-list.h:89
 msgid "Compare a tree to the working tree or index"
 msgstr "将一个树和工作区或索引�比较"
 
-#: command-list.h:89
+#: command-list.h:90
 msgid "Compares the content and mode of blobs found via two tree objects"
 msgstr "比较两个树对象的文件内容和模�"
 
-#: command-list.h:90
+#: command-list.h:91
 msgid "Show changes using common diff tools"
 msgstr "使用常�的差异工具显示更改"
 
-#: command-list.h:91
+#: command-list.h:92
 msgid "Git data exporter"
 msgstr "Git 数�导出器"
 
-#: command-list.h:92
+#: command-list.h:93
 msgid "Backend for fast Git data importers"
 msgstr "Git 快速数�导入器�端"
 
-#: command-list.h:93
+#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "从�外一个仓库下载对象和引用"
 
-#: command-list.h:94
+#: command-list.h:95
 msgid "Receive missing objects from another repository"
 msgstr "从�一个仓库获�缺失的对象"
 
-#: command-list.h:95
+#: command-list.h:96
 msgid "Rewrite branches"
 msgstr "�写分支"
 
-#: command-list.h:96
+#: command-list.h:97
 msgid "Produce a merge commit message"
 msgstr "生�一个�并�交信�"
 
-#: command-list.h:97
+#: command-list.h:98
 msgid "Output information on each ref"
 msgstr "对�一个引用输出信� "
 
-#: command-list.h:98
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "在一个仓库列表上�行 Git 命令"
+
+#: command-list.h:100
 msgid "Prepare patches for e-mail submission"
 msgstr "准备电�邮件�交的补�"
 
-#: command-list.h:99
+#: command-list.h:101
 msgid "Verifies the connectivity and validity of the objects in the database"
 msgstr "验�仓库中对象的连通性和有效性"
 
-#: command-list.h:100
+#: command-list.h:102
 msgid "Cleanup unnecessary files and optimize the local repository"
 msgstr "清除�必�的文件和优化本地仓库"
 
-#: command-list.h:101
+#: command-list.h:103
 msgid "Extract commit ID from an archive created using git-archive"
 msgstr "从 git-archive 创建的归档文件中���交 ID"
 
-#: command-list.h:102
+#: command-list.h:104
 msgid "Print lines matching a pattern"
 msgstr "输出和模�匹�的行"
 
-#: command-list.h:103
+#: command-list.h:105
 msgid "A portable graphical interface to Git"
 msgstr "一个便�的 Git 图形客户端"
 
-#: command-list.h:104
+#: command-list.h:106
 msgid "Compute object ID and optionally creates a blob from a file"
 msgstr "从一个文件计算对象 ID，并�以创建 blob 数�对象"
 
-#: command-list.h:105
+#: command-list.h:107
 msgid "Display help information about Git"
 msgstr "显示 Git 的帮助信�"
 
-#: command-list.h:106
+#: command-list.h:108
 msgid "Server side implementation of Git over HTTP"
 msgstr "Git HTTP �议的�务端实现"
 
-#: command-list.h:107
+#: command-list.h:109
 msgid "Download from a remote Git repository via HTTP"
 msgstr "通过 HTTP 从远程 Git 仓库下载"
 
-#: command-list.h:108
+#: command-list.h:110
 msgid "Push objects over HTTP/DAV to another repository"
 msgstr "通过 HTTP/DAV 推�对象�一个仓库"
 
-#: command-list.h:109
+#: command-list.h:111
 msgid "Send a collection of patches from stdin to an IMAP folder"
 msgstr "从标准输入将一组补���到IMAP文件夹"
 
-#: command-list.h:110
+#: command-list.h:112
 msgid "Build pack index file for an existing packed archive"
 msgstr "从一个现存的包存档文件创建包索引"
 
-#: command-list.h:111
+#: command-list.h:113
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "创建一个空的 Git 仓库或�新�始化一个已存在的仓库"
 
-#: command-list.h:112
+#: command-list.h:114
 msgid "Instantly browse your working repository in gitweb"
 msgstr "在 gitweb 中�时�览您的工作仓库"
 
-#: command-list.h:113
+#: command-list.h:115
 msgid "Add or parse structured information in commit messages"
 msgstr "添加或解��交说明中的结构化信�"
 
-#: command-list.h:114
+#: command-list.h:116
 msgid "The Git repository browser"
 msgstr "Git 仓库�览器"
 
-#: command-list.h:115
+#: command-list.h:117
 msgid "Show commit logs"
 msgstr "显示�交日志"
 
-#: command-list.h:116
+#: command-list.h:118
 msgid "Show information about files in the index and the working tree"
 msgstr "显示索引和工作区中文件的信�"
 
-#: command-list.h:117
+#: command-list.h:119
 msgid "List references in a remote repository"
 msgstr "显示一个远程仓库的引用"
 
-#: command-list.h:118
+#: command-list.h:120
 msgid "List the contents of a tree object"
 msgstr "显示一个树对象的内容"
 
-#: command-list.h:119
+#: command-list.h:121
 msgid "Extracts patch and authorship from a single e-mail message"
 msgstr "从�个电�邮件中��补�和作者身份"
 
-#: command-list.h:120
+#: command-list.h:122
 msgid "Simple UNIX mbox splitter program"
 msgstr "简�的 UNIX mbox 邮箱切分程�"
 
-#: command-list.h:121
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "�行任务以优化仓库数�"
+
+#: command-list.h:124
 msgid "Join two or more development histories together"
 msgstr "�并两个或更多开�历�"
 
-#: command-list.h:122
+#: command-list.h:125
 msgid "Find as good common ancestors as possible for a merge"
 msgstr "为了�并查找尽�能好的公共祖先�交"
 
-#: command-list.h:123
+#: command-list.h:126
 msgid "Run a three-way file merge"
 msgstr "�行一个三路文件�并"
 
-#: command-list.h:124
+#: command-list.h:127
 msgid "Run a merge for files needing merging"
 msgstr "对于需��并的文件执行�并"
 
-#: command-list.h:125
+#: command-list.h:128
 msgid "The standard helper program to use with git-merge-index"
 msgstr "与 git-merge-index 一起使用的标准�导程�"
 
-#: command-list.h:126
+#: command-list.h:129
 msgid "Run merge conflict resolution tools to resolve merge conflicts"
 msgstr "�行�并冲�解决工具以解决�并冲�"
 
-#: command-list.h:127
+#: command-list.h:130
 msgid "Show three-way merge without touching index"
 msgstr "显示三路�并而�动索引"
 
-#: command-list.h:128
+#: command-list.h:131
 msgid "Write and verify multi-pack-indexes"
 msgstr "写入和校验多包索引"
 
-#: command-list.h:129
-msgid "Creates a tag object"
-msgstr "创建一个标签对象"
+#: command-list.h:132
+msgid "Creates a tag object with extra validation"
+msgstr "创建一个有�外验�的标签对象"
 
-#: command-list.h:130
+#: command-list.h:133
 msgid "Build a tree-object from ls-tree formatted text"
 msgstr "基于 ls-tree 的格�化文本创建一个树对象"
 
-#: command-list.h:131
+#: command-list.h:134
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "移动或�命�一个文件�目录或符�链接"
 
 # 查找给定版本的符��称
-#: command-list.h:132
+#: command-list.h:135
 msgid "Find symbolic names for given revs"
 msgstr "查找给定版本的符��称"
 
-#: command-list.h:133
+#: command-list.h:136
 msgid "Add or inspect object notes"
 msgstr "添加或检查对象注释"
 
-#: command-list.h:134
+#: command-list.h:137
 msgid "Import from and submit to Perforce repositories"
 msgstr "导入和�交到 Perforce 仓库中"
 
-#: command-list.h:135
+#: command-list.h:138
 msgid "Create a packed archive of objects"
 msgstr "创建对象的存档包"
 
-#: command-list.h:136
+#: command-list.h:139
 msgid "Find redundant pack files"
 msgstr "查找冗余的包文件"
 
-#: command-list.h:137
+#: command-list.h:140
 msgid "Pack heads and tags for efficient repository access"
 msgstr "打包头和标签以实现高效的仓库访问"
 
-#: command-list.h:138
-msgid "Routines to help parsing remote repository access parameters"
-msgstr "帮助解�远程仓库访问�数的例程"
-
-#: command-list.h:139
+#: command-list.h:141
 msgid "Compute unique ID for a patch"
 msgstr "计算一个补�的唯一 ID"
 
-#: command-list.h:140
+#: command-list.h:142
 msgid "Prune all unreachable objects from the object database"
 msgstr "删除对象库中所有��达对象"
 
-#: command-list.h:141
+#: command-list.h:143
 msgid "Remove extra objects that are already in pack files"
 msgstr "删除已�在包文件中的多余对象"
 
-#: command-list.h:142
+#: command-list.h:144
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "获�并整��外的仓库或一个本地分支"
 
-#: command-list.h:143
+#: command-list.h:145
 msgid "Update remote refs along with associated objects"
 msgstr "更新远程引用和相关的对象"
 
-#: command-list.h:144
+#: command-list.h:146
 msgid "Applies a quilt patchset onto the current branch"
 msgstr "将一个 quilt 补�集应用到当�分支。"
 
-#: command-list.h:145
+#: command-list.h:147
 msgid "Compare two commit ranges (e.g. two versions of a branch)"
 msgstr "比较两个�交范围（如一个分支的两个版本）"
 
-#: command-list.h:146
+#: command-list.h:148
 msgid "Reads tree information into the index"
 msgstr "将树信�读�到索引"
 
-#: command-list.h:147
+#: command-list.h:149
 msgid "Reapply commits on top of another base tip"
 msgstr "在�一个分支上�新应用�交"
 
-#: command-list.h:148
+#: command-list.h:150
 msgid "Receive what is pushed into the repository"
 msgstr "接收推�到仓库中的对象"
 
-#: command-list.h:149
+#: command-list.h:151
 msgid "Manage reflog information"
 msgstr "管� reflog 信�"
 
-#: command-list.h:150
+#: command-list.h:152
 msgid "Manage set of tracked repositories"
 msgstr "管�已跟踪仓库"
 
-#: command-list.h:151
+#: command-list.h:153
 msgid "Pack unpacked objects in a repository"
 msgstr "打包仓库中未打包对象"
 
-#: command-list.h:152
+#: command-list.h:154
 msgid "Create, list, delete refs to replace objects"
 msgstr "创建�列出�删除对象替�引用"
 
-#: command-list.h:153
+#: command-list.h:155
 msgid "Generates a summary of pending changes"
 msgstr "生�待定更改的摘�"
 
-#: command-list.h:154
+#: command-list.h:156
 msgid "Reuse recorded resolution of conflicted merges"
 msgstr "�用冲��并的解决方案记录"
 
-#: command-list.h:155
+#: command-list.h:157
 msgid "Reset current HEAD to the specified state"
 msgstr "�置当� HEAD 到指定状�"
 
-#: command-list.h:156
+#: command-list.h:158
 msgid "Restore working tree files"
 msgstr "��工作区文件"
 
-#: command-list.h:157
+#: command-list.h:159
 msgid "Revert some existing commits"
 msgstr "回退一些现存�交"
 
-#: command-list.h:158
+#: command-list.h:160
 msgid "Lists commit objects in reverse chronological order"
 msgstr "按时间顺�列出�交对象"
 
-#: command-list.h:159
+#: command-list.h:161
 msgid "Pick out and massage parameters"
 msgstr "选出并处��数"
 
-#: command-list.h:160
+#: command-list.h:162
 msgid "Remove files from the working tree and from the index"
 msgstr "从工作区和索引中删除文件"
 
-#: command-list.h:161
+#: command-list.h:163
 msgid "Send a collection of patches as emails"
 msgstr "通过电�邮件��一组补�"
 
-#: command-list.h:162
+#: command-list.h:164
 msgid "Push objects over Git protocol to another repository"
 msgstr "使用 Git �议推�对象到�一个仓库"
 
-#: command-list.h:163
+#: command-list.h:165
 msgid "Restricted login shell for Git-only SSH access"
 msgstr "��许 Git SSH 访问的��登录shell"
 
-#: command-list.h:164
+#: command-list.h:166
 msgid "Summarize 'git log' output"
 msgstr "'git log' 输出摘�"
 
-#: command-list.h:165
+#: command-list.h:167
 msgid "Show various types of objects"
 msgstr "显示��类型的对象"
 
-#: command-list.h:166
+#: command-list.h:168
 msgid "Show branches and their commits"
 msgstr "显示分支和�交"
 
-#: command-list.h:167
+#: command-list.h:169
 msgid "Show packed archive index"
 msgstr "显示打包归档索引"
 
-#: command-list.h:168
+#: command-list.h:170
 msgid "List references in a local repository"
 msgstr "显示本地仓库中的引用"
 
-#: command-list.h:169
+#: command-list.h:171
 msgid "Git's i18n setup code for shell scripts"
 msgstr "为 shell 脚本准备的 Git 国际化设置代�"
 
-#: command-list.h:170
+#: command-list.h:172
 msgid "Common Git shell script setup code"
 msgstr "常用的 Git shell 脚本设置代�"
 
-#: command-list.h:171
+#: command-list.h:173
+msgid "Initialize and modify the sparse-checkout"
+msgstr "�始化�修改稀�检出"
+
+#: command-list.h:174
 msgid "Stash the changes in a dirty working directory away"
 msgstr "贮��工作区中的修改"
 
-#: command-list.h:172
+#: command-list.h:175
 msgid "Add file contents to the staging area"
 msgstr "将文件内容添加到索引"
 
-#: command-list.h:173
+#: command-list.h:176
 msgid "Show the working tree status"
 msgstr "显示工作区状�"
 
-#: command-list.h:174
+#: command-list.h:177
 msgid "Remove unnecessary whitespace"
 msgstr "删除�必�的空白字符"
 
-#: command-list.h:175
+#: command-list.h:178
 msgid "Initialize, update or inspect submodules"
 msgstr "�始化�更新或检查�模组"
 
-#: command-list.h:176
+#: command-list.h:179
 msgid "Bidirectional operation between a Subversion repository and Git"
 msgstr "Subersion 仓库和 Git 之间的���作"
 
-#: command-list.h:177
+#: command-list.h:180
 msgid "Switch branches"
 msgstr "切�分支"
 
-#: command-list.h:178
+#: command-list.h:181
 msgid "Read, modify and delete symbolic refs"
 msgstr "读��修改和删除符�引用"
 
-#: command-list.h:179
+#: command-list.h:182
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "创建�列出�删除或校验一个 GPG 签�的标签对象"
 
-#: command-list.h:180
+#: command-list.h:183
 msgid "Creates a temporary file with a blob's contents"
 msgstr "用 blob 数�对象的内容创建一个临时文件"
 
-#: command-list.h:181
+#: command-list.h:184
 msgid "Unpack objects from a packed archive"
 msgstr "从打包文件中解压缩对象"
 
-#: command-list.h:182
+#: command-list.h:185
 msgid "Register file contents in the working tree to the index"
 msgstr "将工作区的文件内容注册到索引"
 
-#: command-list.h:183
+#: command-list.h:186
 msgid "Update the object name stored in a ref safely"
 msgstr "安全地更新存储于引用中的对象�称"
 
-#: command-list.h:184
+#: command-list.h:187
 msgid "Update auxiliary info file to help dumb servers"
 msgstr "更新辅助信�文件以帮助哑�议�务"
 
-#: command-list.h:185
+#: command-list.h:188
 msgid "Send archive back to git-archive"
 msgstr "将存档��回 git-archive"
 
-#: command-list.h:186
+#: command-list.h:189
 msgid "Send objects packed back to git-fetch-pack"
 msgstr "将对象压缩包��回 git-fetch-pack"
 
-#: command-list.h:187
+#: command-list.h:190
 msgid "Show a Git logical variable"
 msgstr "显示一个Git逻辑��"
 
-#: command-list.h:188
+#: command-list.h:191
 msgid "Check the GPG signature of commits"
 msgstr "检查 GPG �交签�"
 
-#: command-list.h:189
+#: command-list.h:192
 msgid "Validate packed Git archive files"
 msgstr "校验打包的Git存仓文件"
 
-#: command-list.h:190
+#: command-list.h:193
 msgid "Check the GPG signature of tags"
 msgstr "检查标签的 GPG 签�"
 
-#: command-list.h:191
+#: command-list.h:194
 msgid "Git web interface (web frontend to Git repositories)"
 msgstr "Git web 界�（Git 仓库的 web �端）"
 
-#: command-list.h:192
+#: command-list.h:195
 msgid "Show logs with difference each commit introduces"
 msgstr "显示�一个�交引入的差异日志"
 
-#: command-list.h:193
+#: command-list.h:196
 msgid "Manage multiple working trees"
 msgstr "管�多个工作区"
 
-#: command-list.h:194
+#: command-list.h:197
 msgid "Create a tree object from the current index"
 msgstr "从当�索引创建一个树对象"
 
-#: command-list.h:195
+#: command-list.h:198
 msgid "Defining attributes per path"
 msgstr "定义路径的属性"
 
-#: command-list.h:196
+#: command-list.h:199
 msgid "Git command-line interface and conventions"
 msgstr "Git 命令行界�和约定"
 
-#: command-list.h:197
+#: command-list.h:200
 msgid "A Git core tutorial for developers"
 msgstr "��开�人员的 Git 核心教程"
 
-#: command-list.h:198
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "为 Git �供用户�和�令"
+
+#: command-list.h:202
 msgid "Git for CVS users"
 msgstr "适� CVS 用户的 Git 帮助"
 
-#: command-list.h:199
+#: command-list.h:203
 msgid "Tweaking diff output"
 msgstr "调整差异输出"
 
-#: command-list.h:200
+#: command-list.h:204
 msgid "A useful minimum set of commands for Everyday Git"
 msgstr "�一天 Git 的一组有用的最�命令集�"
 
-#: command-list.h:201
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "关于使用 Git 的常�问题"
+
+#: command-list.h:206
 msgid "A Git Glossary"
 msgstr "Git �汇表"
 
-#: command-list.h:202
+#: command-list.h:207
 msgid "Hooks used by Git"
 msgstr "Git 使用的钩�"
 
-#: command-list.h:203
+#: command-list.h:208
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "忽略指定的未跟踪文件"
 
-#: command-list.h:204
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "映射作者/�交者的�称和/或邮件地�"
+
+#: command-list.h:210
 msgid "Defining submodule properties"
 msgstr "定义�模组属性"
 
-#: command-list.h:205
+#: command-list.h:211
 msgid "Git namespaces"
 msgstr "Git �字空间"
 
-#: command-list.h:206
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "与远程仓库交互的助手程�"
+
+#: command-list.h:213
 msgid "Git Repository Layout"
 msgstr "Git 仓库布局"
 
-#: command-list.h:207
+#: command-list.h:214
 msgid "Specifying revisions and ranges for Git"
 msgstr "指定 Git 的版本和版本范围"
 
-#: command-list.h:208
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "将一个仓库安装到�外一个仓库中"
+
+#: command-list.h:216
 msgid "A tutorial introduction to Git: part two"
 msgstr "一个 Git 教程：第二部分"
 
-#: command-list.h:209
+#: command-list.h:217
 msgid "A tutorial introduction to Git"
 msgstr "一个 Git 教程"
 
-#: command-list.h:210
+#: command-list.h:218
 msgid "An overview of recommended workflows with Git"
 msgstr "Git 推�的工作�概览"
 
-#: git-bisect.sh:54
-msgid "You need to start by \"git bisect start\""
-msgstr "您需�执行 \"git bisect start\" �开始"
-
-#  译者：注����尾空格
-#. TRANSLATORS: Make sure to include [Y] and [n] in your
-#. translation. The program will only accept English input
-#. at this point.
-#: git-bisect.sh:60
-msgid "Do you want me to do it for you [Y/n]? "
-msgstr "您想让我为您这样�么[Y/n]？ "
-
-#: git-bisect.sh:101
-#, sh-format
-msgid "Bad rev input: $arg"
-msgstr "�的输入版本：$arg"
-
-#: git-bisect.sh:121
-#, sh-format
-msgid "Bad rev input: $bisected_head"
-msgstr "�的输入版本：$bisected_head"
-
-#: git-bisect.sh:130
-#, sh-format
-msgid "Bad rev input: $rev"
-msgstr "�的输入版本：$rev"
-
-#: git-bisect.sh:139
-#, sh-format
-msgid "'git bisect $TERM_BAD' can take only one argument."
-msgstr "'git bisect $TERM_BAD' �能带一个�数。"
-
-#: git-bisect.sh:209
-msgid "No logfile given"
-msgstr "未�供日志文件"
-
-#: git-bisect.sh:210
-#, sh-format
-msgid "cannot read $file for replaying"
-msgstr "�能读� $file ��放"
-
-#: git-bisect.sh:232
-msgid "?? what are you talking about?"
-msgstr "?? 您在说什么?"
-
-#: git-bisect.sh:241
+#: git-bisect.sh:68
 msgid "bisect run failed: no command provided."
 msgstr "二分查找�行失败：没有�供命令。"
 
-#: git-bisect.sh:246
+#: git-bisect.sh:73
 #, sh-format
 msgid "running $command"
 msgstr "�行 $command"
 
-#: git-bisect.sh:253
+#: git-bisect.sh:80
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -21765,27 +24844,23 @@ msgstr ""
 "二分查找�行失败：\n"
 "命令 '$command' 的退出� $res �于 0 或大于等于 128"
 
-#: git-bisect.sh:279
+#: git-bisect.sh:105
 msgid "bisect run cannot continue any more"
 msgstr "二分查找�能继续�行"
 
-#: git-bisect.sh:285
+#: git-bisect.sh:111
 #, sh-format
 msgid ""
 "bisect run failed:\n"
-"'bisect_state $state' exited with error code $res"
+"'bisect-state $state' exited with error code $res"
 msgstr ""
 "二分查找�行失败：\n"
-"'bisect_state $state' 退出�为 $res"
+"'bisect-state $state' 退出�为 $res"
 
-#: git-bisect.sh:292
+#: git-bisect.sh:118
 msgid "bisect run success"
 msgstr "二分查找�行�功"
 
-#: git-bisect.sh:300
-msgid "We are not bisecting."
-msgstr "我们没有在二分查找。"
-
 #: git-merge-octopus.sh:46
 msgid ""
 "Error: Your local changes to the following files would be overwritten by "
@@ -21824,198 +24899,65 @@ msgstr "�试和 $pretty_name 的简��并"
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "简��并未生效，�试自动�并。"
 
-#: git-legacy-stash.sh:220
-msgid "Cannot remove temporary index (can't happen)"
-msgstr "无法删除临时索引（�应�生）"
-
-#: git-legacy-stash.sh:271
-#, sh-format
-msgid "Cannot update $ref_stash with $w_commit"
-msgstr "无法用 $w_commit 更新 $ref_stash"
-
-#: git-legacy-stash.sh:323
-#, sh-format
-msgid "error: unknown option for 'stash push': $option"
-msgstr "错误：'stash push' 的未知选项：$option"
-
-#: git-legacy-stash.sh:355
-#, sh-format
-msgid "Saved working directory and index state $stash_msg"
-msgstr "�存工作目录和索引状� $stash_msg"
-
-#: git-legacy-stash.sh:535
-#, sh-format
-msgid "unknown option: $opt"
-msgstr "未知选项: $opt"
-
-#: git-legacy-stash.sh:555
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr "指定了太多的版本：$REV"
-
-#: git-legacy-stash.sh:570
-#, sh-format
-msgid "$reference is not a valid reference"
-msgstr "$reference �是一个有效的引用"
-
-#: git-legacy-stash.sh:598
-#, sh-format
-msgid "'$args' is not a stash-like commit"
-msgstr "'$args' �是贮���交"
-
-#: git-legacy-stash.sh:609
-#, sh-format
-msgid "'$args' is not a stash reference"
-msgstr "'$args' �是一个贮�引用"
-
-#: git-legacy-stash.sh:617
-msgid "unable to refresh index"
-msgstr "无法刷新索引"
-
-#: git-legacy-stash.sh:621
-msgid "Cannot apply a stash in the middle of a merge"
-msgstr "无法在�并过程应用贮�"
-
-#: git-legacy-stash.sh:629
-msgid "Conflicts in index. Try without --index."
-msgstr "索引中有冲�。�试�使用 --index。"
-
-#: git-legacy-stash.sh:631
-msgid "Could not save index tree"
-msgstr "�能�存索引树"
-
-#: git-legacy-stash.sh:640
-msgid "Could not restore untracked files from stash entry"
-msgstr "无法从贮��目中��未跟踪文件"
-
-#: git-legacy-stash.sh:665
-msgid "Cannot unstage modified files"
-msgstr "无法将修改的文件�消暂存"
-
-#: git-legacy-stash.sh:703
-#, sh-format
-msgid "Dropped ${REV} ($s)"
-msgstr "丢弃了 ${REV} ($s)"
-
-#: git-legacy-stash.sh:704
-#, sh-format
-msgid "${REV}: Could not drop stash entry"
-msgstr "${REV}：无法丢弃贮��目"
-
-#: git-legacy-stash.sh:791
-msgid "(To restore them type \"git stash apply\")"
-msgstr "（为��数�输入 \"git stash apply\"）"
-
-#: git-submodule.sh:200
+#: git-submodule.sh:179
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "�能在工作区的顶级目录中使用相对路径"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:189
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "仓库 URL：'$repo' 必须是�对路径或以 ./|../ 起始"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:208
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' 已�存在于索引中"
 
-#: git-submodule.sh:232
+#: 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:239
+#: git-submodule.sh:218
 #, sh-format
 msgid "'$sm_path' does not have a commit checked out"
 msgstr "'$sm_path' 没有检出的�交"
 
-#: git-submodule.sh:245
-#, 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 ""
-"以下路径被您的一个 .gitignore 文件所忽略：\n"
-"$sm_path\n"
-"如果您确实想添加它，使用 -f �数。"
-
-#: git-submodule.sh:268
-#, sh-format
-msgid "Adding existing repo at '$sm_path' to the index"
-msgstr "添加�于 '$sm_path' 的现存仓库到索引"
-
-#: git-submodule.sh:270
-#, sh-format
-msgid "'$sm_path' already exists and is not a valid git repo"
-msgstr "'$sm_path' 已存在且�是一个有效的 git 仓库"
-
-#: git-submodule.sh:278
-#, sh-format
-msgid "A git directory for '$sm_name' is found locally with remote(s):"
-msgstr "本地�现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
-
-#: git-submodule.sh:280
-#, 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:286
-#, sh-format
-msgid "Reactivating local git directory for submodule '$sm_name'."
-msgstr "激活本地 git 目录到�模组 '$sm_name'。"
-
-#: git-submodule.sh:298
-#, sh-format
-msgid "Unable to checkout submodule '$sm_path'"
-msgstr "�能检出�模组 '$sm_path'"
-
-#: git-submodule.sh:303
+#: git-submodule.sh:248
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "无法添加�模组 '$sm_path'"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:257
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "无法注册�模组 '$sm_path'"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:532
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中找到当�版本"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:542
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "无法在�模组路径 '$sm_path' 中获�"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:547
 #, 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:606
+#: git-submodule.sh:565
 #, sh-format
 msgid ""
 "Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
 "$sha1:"
 msgstr "无法在�模组路径 '$displaypath' 中获�，�试直接获� $sha1："
 
-#: git-submodule.sh:612
+#: git-submodule.sh:571
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -22023,83 +24965,51 @@ msgid ""
 msgstr ""
 "获�了�模组路径 '$displaypath'，但是它没有包� $sha1。直接获�该�交失败。"
 
-#: git-submodule.sh:619
+#: git-submodule.sh:578
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中检出 '$sha1'"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:579
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "�模组路径 '$displaypath'：检出 '$sha1'"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:583
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "无法在�模组路径 '$displaypath' 中�基 '$sha1'"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:584
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "�模组路径 '$displaypath'：�基至 '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:589
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "无法�并 '$sha1' 到�模组路径 '$displaypath' 中"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:590
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "�模组路径 '$displaypath'：已�并入 '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:595
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "在�模组 '$displaypath' 中执行 '$command $sha1' 失败"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:596
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "�模组 '$displaypath'：'$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:627
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "无法递归进�模组路径 '$displaypath'"
 
-#: git-submodule.sh:830
-msgid "The --cached option cannot be used with the --files option"
-msgstr "选项 --cached �能和选项 --files �时使用"
-
-#: git-submodule.sh:882
-#, sh-format
-msgid "unexpected mode $mod_dst"
-msgstr "�外的模� $mod_dst"
-
-#  译者：注����导空格
-#: git-submodule.sh:902
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_src"
-msgstr "  警告：$display_name 未包��交 $sha1_src"
-
-#  译者：注����导空格
-#: git-submodule.sh:905
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
-msgstr "  警告：$display_name 未包��交 $sha1_dst"
-
-#  译者：注����导空格
-#: git-submodule.sh:908
-#, sh-format
-msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
-msgstr "  警告：$display_name 未包��交 $sha1_src 和 $sha1_dst"
-
-#: git-parse-remote.sh:89
-#, sh-format
-msgid "See git-${cmd}(1) for details."
-msgstr "详� git-${cmd}(1)。"
-
 #: git-rebase--preserve-merges.sh:109
 msgid "Applied autostash."
 msgstr "已应用 autostash。"
@@ -22109,12 +25019,22 @@ msgstr "已应用 autostash。"
 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:207
+#: git-rebase--preserve-merges.sh:197
 msgid ""
 "\n"
 "Commands:\n"
@@ -22139,7 +25059,7 @@ msgstr ""
 "p, pick <�交> = 使用�交\n"
 "r, reword <�交> = 使用�交，但修改�交说明\n"
 "e, edit <�交> = 使用�交，但�下�修补\n"
-"s, squash <�交> = 使用�交，但��到�一个�交\n"
+"s, squash <�交> = 使用�交，但挤压到�一个�交\n"
 "f, fixup <�交> = 类似于 \"squash\"，但丢弃�交说明日志\n"
 "x, exec <命令> = 使用 shell �行命令（此行剩余部分）\n"
 "d, drop <�交> = 删除�交\n"
@@ -22152,7 +25072,7 @@ msgstr ""
 "\n"
 "�以对这些行�新排�，将从上至下执行。\n"
 
-#: git-rebase--preserve-merges.sh:270
+#: git-rebase--preserve-merges.sh:260
 #, sh-format
 msgid ""
 "You can amend the commit now, with\n"
@@ -22171,83 +25091,83 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:295
+#: git-rebase--preserve-merges.sh:285
 #, sh-format
 msgid "$sha1: not a commit that can be picked"
 msgstr "$sha1：�是一个�以被拣选的�交"
 
-#: git-rebase--preserve-merges.sh:334
+#: git-rebase--preserve-merges.sh:324
 #, sh-format
 msgid "Invalid commit name: $sha1"
 msgstr "无效的�交�：$sha1"
 
-#: git-rebase--preserve-merges.sh:364
+#: git-rebase--preserve-merges.sh:354
 msgid "Cannot write current commit's replacement sha1"
 msgstr "�能写入当��交的替代 sha1"
 
-#: git-rebase--preserve-merges.sh:415
+#: git-rebase--preserve-merges.sh:405
 #, sh-format
 msgid "Fast-forward to $sha1"
 msgstr "快进到 $sha1"
 
-#: git-rebase--preserve-merges.sh:417
+#: git-rebase--preserve-merges.sh:407
 #, sh-format
 msgid "Cannot fast-forward to $sha1"
 msgstr "�能快进到 $sha1"
 
-#: git-rebase--preserve-merges.sh:426
+#: git-rebase--preserve-merges.sh:416
 #, sh-format
 msgid "Cannot move HEAD to $first_parent"
 msgstr "�能移动 HEAD 到 $first_parent"
 
-#: git-rebase--preserve-merges.sh:431
+#: git-rebase--preserve-merges.sh:421
 #, sh-format
 msgid "Refusing to squash a merge: $sha1"
-msgstr "拒�压缩一个�并：$sha1"
+msgstr "拒�挤压一个�并：$sha1"
 
-#: git-rebase--preserve-merges.sh:449
+#: git-rebase--preserve-merges.sh:439
 #, sh-format
 msgid "Error redoing merge $sha1"
 msgstr "无法���并 $sha1"
 
-#: git-rebase--preserve-merges.sh:458
+#: git-rebase--preserve-merges.sh:448
 #, sh-format
 msgid "Could not pick $sha1"
 msgstr "�能拣选 $sha1"
 
-#: git-rebase--preserve-merges.sh:467
+#: git-rebase--preserve-merges.sh:457
 #, sh-format
 msgid "This is the commit message #${n}:"
 msgstr "这是�交说明 #${n}："
 
-#: git-rebase--preserve-merges.sh:472
+#: git-rebase--preserve-merges.sh:462
 #, sh-format
 msgid "The commit message #${n} will be skipped:"
 msgstr "�交说明 #${n} 将被跳过："
 
-#: git-rebase--preserve-merges.sh:483
+#: 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:492
+#: git-rebase--preserve-merges.sh:482
 #, sh-format
 msgid "Cannot write $fixup_msg"
 msgstr "�能写入 $fixup_msg"
 
-#: git-rebase--preserve-merges.sh:495
+#: git-rebase--preserve-merges.sh:485
 msgid "This is a combination of 2 commits."
 msgstr "这是一个 2 个�交的组�。"
 
-#: git-rebase--preserve-merges.sh:536 git-rebase--preserve-merges.sh:579
-#: git-rebase--preserve-merges.sh:582
+#: 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:611
+#: git-rebase--preserve-merges.sh:601
 #, sh-format
 msgid ""
 "Could not amend commit after successfully picking $sha1... $rest\n"
@@ -22260,32 +25180,31 @@ msgstr ""
 "这通常是因为空的�交说明，或者 pre-commit 钩�执行失败。如果是 pre-commit\n"
 "钩�执行失败，你�能需�在�写�交说明�解决这个问题。"
 
-#: git-rebase--preserve-merges.sh:626
+#: git-rebase--preserve-merges.sh:616
 #, sh-format
 msgid "Stopped at $sha1_abbrev... $rest"
 msgstr "�止在 $sha1_abbrev... $rest"
 
-#: git-rebase--preserve-merges.sh:641
+#: git-rebase--preserve-merges.sh:631
 #, sh-format
 msgid "Cannot '$squash_style' without a previous commit"
 msgstr "没有父�交的情况下�能 '$squash_style'"
 
-#: git-rebase--preserve-merges.sh:683
+#: git-rebase--preserve-merges.sh:673
 #, sh-format
 msgid "Executing: $rest"
 msgstr "执行：$rest"
 
-#: git-rebase--preserve-merges.sh:691
+#: git-rebase--preserve-merges.sh:681
 #, sh-format
 msgid "Execution failed: $rest"
 msgstr "执行失败：$rest"
 
-#: git-rebase--preserve-merges.sh:693
+#: git-rebase--preserve-merges.sh:683
 msgid "and made changes to the index and/or the working tree"
 msgstr "并且修改索引和/或工作区"
 
-#  译者：注����导空格
-#: git-rebase--preserve-merges.sh:695
+#: git-rebase--preserve-merges.sh:685
 msgid ""
 "You can fix the problem, and then run\n"
 "\n"
@@ -22296,7 +25215,7 @@ msgstr ""
 "\tgit rebase --continue"
 
 #. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--preserve-merges.sh:708
+#: git-rebase--preserve-merges.sh:698
 #, sh-format
 msgid ""
 "Execution succeeded: $rest\n"
@@ -22310,25 +25229,25 @@ msgstr ""
 "\n"
 "\tgit rebase --continue"
 
-#: git-rebase--preserve-merges.sh:719
+#: git-rebase--preserve-merges.sh:709
 #, sh-format
 msgid "Unknown command: $command $sha1 $rest"
 msgstr "未知命令：$command $sha1 $rest"
 
-#: git-rebase--preserve-merges.sh:720
+#: 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:755
+#: git-rebase--preserve-merges.sh:745
 #, sh-format
 msgid "Successfully rebased and updated $head_name."
 msgstr "�功�基并更新 $head_name。"
 
-#: git-rebase--preserve-merges.sh:812
+#: git-rebase--preserve-merges.sh:802
 msgid "Could not remove CHERRY_PICK_HEAD"
 msgstr "�能删除 CHERRY_PICK_HEAD"
 
-#: git-rebase--preserve-merges.sh:817
+#: git-rebase--preserve-merges.sh:807
 #, sh-format
 msgid ""
 "You have staged changes in your working tree.\n"
@@ -22345,7 +25264,7 @@ msgid ""
 "\n"
 "  git rebase --continue\n"
 msgstr ""
-"您已暂存了工作区的修改。如果这些修改�压缩到�一个�交，执行：\n"
+"您已暂存了工作区的修改。如果这些修改�挤压到�一个�交，执行：\n"
 "\n"
 "  git commit --amend $gpg_sign_opt_quoted\n"
 "\n"
@@ -22357,51 +25276,55 @@ msgstr ""
 "\n"
 "  git rebase --continue\n"
 
-#: git-rebase--preserve-merges.sh:834
+#: git-rebase--preserve-merges.sh:824
 msgid "Error trying to find the author identity to amend commit"
 msgstr "在修补�交中查找作者信�时�到错误"
 
-#: git-rebase--preserve-merges.sh:839
+#: 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:844 git-rebase--preserve-merges.sh:848
+#: git-rebase--preserve-merges.sh:834 git-rebase--preserve-merges.sh:838
 msgid "Could not commit staged changes."
 msgstr "�能�交暂存的修改。"
 
-#: git-rebase--preserve-merges.sh:879 git-rebase--preserve-merges.sh:965
+#: git-rebase--preserve-merges.sh:869 git-rebase--preserve-merges.sh:955
 msgid "Could not execute editor"
 msgstr "无法�行编辑器"
 
-#: git-rebase--preserve-merges.sh:900
+#: git-rebase--preserve-merges.sh:890
 #, sh-format
 msgid "Could not checkout $switch_to"
 msgstr "�能检出 $switch_to"
 
-#: git-rebase--preserve-merges.sh:907
+#: git-rebase--preserve-merges.sh:897
 msgid "No HEAD?"
 msgstr "没有 HEAD？"
 
-#: git-rebase--preserve-merges.sh:908
+#: git-rebase--preserve-merges.sh:898
 #, sh-format
 msgid "Could not create temporary $state_dir"
 msgstr "�能创建临时 $state_dir"
 
-#: git-rebase--preserve-merges.sh:911
+#: git-rebase--preserve-merges.sh:901
 msgid "Could not mark as interactive"
 msgstr "�能标记为交互�"
 
-#: git-rebase--preserve-merges.sh:943
+#: 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:997 git-rebase--preserve-merges.sh:1002
+#: 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 "�能对�写�交进行�始化"
 
@@ -22463,52 +25386,11 @@ msgid "Unable to determine absolute path of git directory"
 msgstr "�能确定 git 目录的�对路径"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
-msgid "staged"
-msgstr "缓存"
-
-#: git-add--interactive.perl:211
-msgid "unstaged"
-msgstr "未缓存"
-
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
-msgid "binary"
-msgstr "二进制"
-
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
-msgid "nothing"
-msgstr "æ— "
-
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
-msgid "unchanged"
-msgstr "没有修改"
-
-#: git-add--interactive.perl:623
-#, perl-format
-msgid "added %d path\n"
-msgid_plural "added %d paths\n"
-msgstr[0] "增加了 %d 个路径\n"
-msgstr[1] "增加了 %d 个路径\n"
-
-#: git-add--interactive.perl:626
-#, perl-format
-msgid "updated %d path\n"
-msgid_plural "updated %d paths\n"
-msgstr[0] "更新了 %d 个路径\n"
-msgstr[1] "更新了 %d 个路径\n"
-
-#: git-add--interactive.perl:629
-#, perl-format
-msgid "reverted %d path\n"
-msgid_plural "reverted %d paths\n"
-msgstr[0] "还原了 %d 个路径\n"
-msgstr[1] "还原了 %d 个路径\n"
-
 #: git-add--interactive.perl:632
 #, perl-format
 msgid "touched %d path\n"
@@ -22516,69 +25398,44 @@ msgid_plural "touched %d paths\n"
 msgstr[0] "触碰了 %d 个路径\n"
 msgstr[1] "触碰了 %d 个路径\n"
 
-#: git-add--interactive.perl:641
-msgid "Update"
-msgstr "æ›´æ–°"
-
-#: git-add--interactive.perl:653
-msgid "Revert"
-msgstr "还原"
-
-#: git-add--interactive.perl:676
-#, perl-format
-msgid "note: %s is untracked now.\n"
-msgstr "说明：%s 现已�为未跟踪的。\n"
-
-#: git-add--interactive.perl:687
-msgid "Add untracked"
-msgstr "添加未跟踪的"
-
-#: git-add--interactive.perl:693
-msgid "No untracked files.\n"
-msgstr "没有未跟踪的文件。\n"
-
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "如果补�能干净地应用，编辑�将立�标记为暂存。"
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr "如果补�能干净地应用，编辑�将立�标记为贮�。"
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1062
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "如果补�能干净地应用，编辑�将立�标记为未暂存。"
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: 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."
 msgstr "如果补�能干净地应用，编辑�将立�标记为应用。"
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: 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."
 msgstr "如果补�能干净地应用，编辑�将立�标记为丢弃。"
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1114
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "为写入打开�编辑文件失败：%s"
 
-#: git-add--interactive.perl:1110
-msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
-msgstr "手动�编辑模� -- 查看底部的快速指�。\n"
-
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1121
 #, perl-format
 msgid ""
 "---\n"
@@ -22591,33 +25448,12 @@ msgstr ""
 "�删除 '%s' 开始的行，删除它们。\n"
 "以 %s 开始的行将被删除。\n"
 
-#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
-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"
-
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1143
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "无法读��编辑文件：%s"
 
-#. TRANSLATORS: do not translate [y/n]
-#. The program will only accept that input
-#. at this point.
-#. Consider translating (saying "no" discards!) as
-#. (saying "n" for "no" discards!) if the translation
-#. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
-msgid ""
-"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
-msgstr "您的编辑��能被应用。�新编辑（选择 \"no\" 丢弃�） [y/n]? "
-
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1251
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -22631,7 +25467,7 @@ msgstr ""
 "a - 暂存该�和本文件中��的全部�\n"
 "d - �暂存该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1257
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -22645,7 +25481,7 @@ msgstr ""
 "a - 贮�该�和本文件中��的全部�\n"
 "d - �贮�该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1263
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -22659,7 +25495,7 @@ msgstr ""
 "a - �暂存该�和本文件中��的全部�\n"
 "d - ���暂存该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1269
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -22673,7 +25509,7 @@ msgstr ""
 "a - 应用该�和本文件中��的全部�\n"
 "d - ��应用该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -22687,7 +25523,7 @@ msgstr ""
 "a - 丢弃该�和本文件中��的全部�\n"
 "d - ��丢弃该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1281
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -22701,7 +25537,7 @@ msgstr ""
 "a - 丢弃该�和本文件中��的全部�\n"
 "d - ��丢弃该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1287
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -22715,7 +25551,7 @@ msgstr ""
 "a - 应用该�和本文件中��的全部�\n"
 "d - ��应用该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1294
+#: git-add--interactive.perl:1299
 msgid ""
 "y - apply this hunk to worktree\n"
 "n - do not apply this hunk to worktree\n"
@@ -22729,7 +25565,7 @@ msgstr ""
 "a - 应用该�和本文件中��的全部�\n"
 "d - ��应用该�和本文件中��的全部�"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1314
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -22751,226 +25587,90 @@ msgstr ""
 "e - 手动编辑当��\n"
 "? - 显示帮助\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1345
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "选中的��能应用到索引�\n"
 
-#: git-add--interactive.perl:1341
-msgid "Apply them to the worktree anyway? "
-msgstr "无论如何都�应用到工作区么？"
-
-#: git-add--interactive.perl:1344
-msgid "Nothing was applied.\n"
-msgstr "未应用。\n"
-
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1360
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未�入的：%s\n"
 
-#: git-add--interactive.perl:1364
-msgid "Only binary files changed.\n"
-msgstr "�有二进制文件被修改。\n"
-
-#: git-add--interactive.perl:1366
-msgid "No changes.\n"
-msgstr "没有修改。\n"
-
-#: git-add--interactive.perl:1374
-msgid "Patch update"
-msgstr "补�更新"
-
-#: git-add--interactive.perl:1426
-#, perl-format
-msgid "Stage mode change [y,n,q,a,d%s,?]? "
-msgstr "暂存模��更 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1427
-#, perl-format
-msgid "Stage deletion [y,n,q,a,d%s,?]? "
-msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1428
-#, perl-format
-msgid "Stage this hunk [y,n,q,a,d%s,?]? "
-msgstr "暂存该� [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1431
-#, perl-format
-msgid "Stash mode change [y,n,q,a,d%s,?]? "
-msgstr "贮�模��更 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1432
-#, perl-format
-msgid "Stash deletion [y,n,q,a,d%s,?]? "
-msgstr "贮�删除动作 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1433
-#, perl-format
-msgid "Stash this hunk [y,n,q,a,d%s,?]? "
-msgstr "贮�该� [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1436
-#, perl-format
-msgid "Unstage mode change [y,n,q,a,d%s,?]? "
-msgstr "�消暂存模��更 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1437
-#, perl-format
-msgid "Unstage deletion [y,n,q,a,d%s,?]? "
-msgstr "�消暂存删除动作 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1438
-#, perl-format
-msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
-msgstr "�消暂存该� [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1441
-#, perl-format
-msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
-msgstr "将模��更应用到索引 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1442
-#, perl-format
-msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
-msgstr "将删除�作应用到索引 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1443
-#, perl-format
-msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
-msgstr "将该�应用到索引 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
-msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
-msgstr "从工作区中丢弃模��更 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
-msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
-msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
-msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
-msgstr "从工作区中丢弃该� [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1451
-#, perl-format
-msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "从索引和工作区中丢弃模��更 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1452
-#, perl-format
-msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1453
-#, perl-format
-msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
-msgstr "从索引和工作区中丢弃该� [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1456
-#, perl-format
-msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "将模��更应用到索引和工作区 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1457
-#, perl-format
-msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "将删除�作应用到索引和工作区 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1458
-#, perl-format
-msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
-msgstr "将该�应用到索引和工作区 [y,n,q,a,d%s,?]? "
-
-#: git-add--interactive.perl:1466
+#: git-add--interactive.perl:1479
 #, 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:1467
+#: git-add--interactive.perl:1480
 #, perl-format
 msgid "Apply deletion to worktree [y,n,q,a,d%s,?]? "
 msgstr "将删除�作应用到工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1468
+#: git-add--interactive.perl:1481
+#, 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
 #, 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:1568
+#: git-add--interactive.perl:1599
 msgid "No other hunks to goto\n"
 msgstr "没有其它�供跳转的�\n"
 
-#: git-add--interactive.perl:1575
-msgid "go to which hunk (<ret> to see more)? "
-msgstr "跳转到哪个�（<回车> 查看更多）？ "
-
-#: git-add--interactive.perl:1577
-msgid "go to which hunk? "
-msgstr "跳转到哪个�？"
-
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1617
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "无效数字：'%s'\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1622
 #, 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:1617
+#: git-add--interactive.perl:1657
 msgid "No other hunks to search\n"
 msgstr "没有其它�供查找的�\n"
 
-#: git-add--interactive.perl:1621
-msgid "search for regex? "
-msgstr "使用正则表达��索？"
-
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1674
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "错误的正则表达� %s：%s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1684
 msgid "No hunk matches the given pattern\n"
-msgstr "没有和给定模�相匹�的快\n"
+msgstr "没有和给定模�相匹�的�\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
 msgid "No previous hunk\n"
 msgstr "没有�一个�\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
 msgid "No next hunk\n"
 msgstr "没有下一个�\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1730
 msgid "Sorry, cannot split this hunk\n"
 msgstr "对�起，�能拆分这个�\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1736
 #, 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:1706
+#: git-add--interactive.perl:1746
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "对�起，�能编辑这个�\n"
 
-#: git-add--interactive.perl:1752
-msgid "Review diff"
-msgstr "检视 diff"
-
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1811
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -22987,91 +25687,106 @@ msgstr ""
 "diff          - 显示 HEAD 和索引间差异\n"
 "add untracked - 添加未跟踪文件的内容至暂存列表\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: 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
 msgid "missing --"
 msgstr "缺失 --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1866
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "未知的 --patch 模�：%s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "无效的�数 %s，期望是 --"
 
-#: git-send-email.perl:138
+#: git-send-email.perl:129
 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:136 git-send-email.perl:142
 msgid "local time offset greater than or equal to 24 hours\n"
 msgstr "本地时间�移�大于等于 24 �时\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 "致命错误：命令 '%s' 已终止，退出代�为 %d"
+
+#: git-send-email.perl:227
 msgid "the editor exited uncleanly, aborting everything"
 msgstr "编辑器�正常退出，终止所有�作"
 
-#: git-send-email.perl:310
+#: git-send-email.perl:316
 #, perl-format
 msgid ""
 "'%s' contains an intermediate version of the email you were composing.\n"
 msgstr "'%s' 包�您正在编写的一个中间版本的邮件。\n"
 
-#: git-send-email.perl:315
+#: git-send-email.perl:321
 #, perl-format
 msgid "'%s.final' contains the composed email.\n"
 msgstr "'%s.final' 包�编辑的邮件。\n"
 
-#: git-send-email.perl:408
+#: git-send-email.perl:450
 msgid "--dump-aliases incompatible with other options\n"
 msgstr "--dump-aliases 和其它选项�兼容\n"
 
-#: git-send-email.perl:481 git-send-email.perl:683
+#: 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 ""
+"致命错误：�现 'sendmail' �置选项\n"
+"git-send-email 通过 sendemail.* 选项进行设置，注�字� 'e'。\n"
+"设置 sendemail.forbidSendmailVariables 为 false ��用这项检查。\n"
+
+#: git-send-email.perl:530 git-send-email.perl:746
 msgid "Cannot run git format-patch from outside a repository\n"
 msgstr "�能在仓库之外�行 git format-patch\n"
 
-#: git-send-email.perl:484
+#: git-send-email.perl:533
 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:497
+#: git-send-email.perl:546
 #, perl-format
 msgid "Unknown --suppress-cc field: '%s'\n"
 msgstr "未知的 --suppress-cc 字段：'%s'\n"
 
-#: git-send-email.perl:528
+#: git-send-email.perl:577
 #, perl-format
 msgid "Unknown --confirm setting: '%s'\n"
 msgstr "未知的 --confirm 设置：'%s'\n"
 
-#: git-send-email.perl:556
+#: git-send-email.perl:617
 #, perl-format
 msgid "warning: sendmail alias with quotes is not supported: %s\n"
 msgstr "警告：�支�带引�的 sendmail 别�：%s\n"
 
-#: git-send-email.perl:558
+#: git-send-email.perl:619
 #, perl-format
 msgid "warning: `:include:` not supported: %s\n"
 msgstr "警告：�支� `:include:`：%s\n"
 
-#: git-send-email.perl:560
+#: git-send-email.perl:621
 #, perl-format
 msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
 msgstr "警告：�支� `/file` 或 `|pipe` �定�：%s\n"
 
-#: git-send-email.perl:565
+#: git-send-email.perl:626
 #, perl-format
 msgid "warning: sendmail line is not recognized: %s\n"
 msgstr "警告：�能识别的 sendmail 行：%s\n"
 
-#: git-send-email.perl:649
+#: git-send-email.perl:711
 #, perl-format
 msgid ""
 "File '%s' exists but it could also be the range of commits\n"
@@ -23086,21 +25801,12 @@ msgstr ""
 "    * 如果�义为一个文件，使用 \"./%s\"，或者\n"
 "    * 如果�义为一个范围，使用 --format-patch 选项。\n"
 
-#: git-send-email.perl:670
+#: git-send-email.perl:732
 #, perl-format
 msgid "Failed to opendir %s: %s"
 msgstr "无法打开目录 %s: %s"
 
-#: git-send-email.perl:694
-#, perl-format
-msgid ""
-"fatal: %s: %s\n"
-"warning: no patches were sent\n"
-msgstr ""
-"致命错误：%s：%s\n"
-"警告：补�未能��\n"
-
-#: git-send-email.perl:705
+#: git-send-email.perl:767
 msgid ""
 "\n"
 "No patch files specified!\n"
@@ -23110,17 +25816,17 @@ msgstr ""
 "未指定补�文件�\n"
 "\n"
 
-#: git-send-email.perl:718
+#: git-send-email.perl:780
 #, perl-format
 msgid "No subject line in %s?"
 msgstr "在 %s 中没有标题行？"
 
-#: git-send-email.perl:728
+#: git-send-email.perl:791
 #, perl-format
 msgid "Failed to open for writing %s: %s"
 msgstr "为写入打开 %s 失败: %s"
 
-#: git-send-email.perl:739
+#: git-send-email.perl:802
 msgid ""
 "Lines beginning in \"GIT:\" will be removed.\n"
 "Consider including an overall diffstat or table of contents\n"
@@ -23133,37 +25839,37 @@ msgstr ""
 "\n"
 "如果您�想��摘�，清除内容。\n"
 
-#: git-send-email.perl:763
+#: git-send-email.perl:826
 #, perl-format
 msgid "Failed to open %s: %s"
 msgstr "无法打开 %s: %s"
 
-#: git-send-email.perl:780
+#: git-send-email.perl:843
 #, perl-format
 msgid "Failed to open %s.final: %s"
 msgstr "无法打开 %s.final: %s"
 
-#: git-send-email.perl:823
+#: git-send-email.perl:886
 msgid "Summary email is empty, skipping it\n"
 msgstr "摘�邮件为空，跳过\n"
 
 #. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:858
+#: git-send-email.perl:935
 #, perl-format
 msgid "Are you sure you want to use <%s> [y/N]? "
 msgstr "您确认�使用 <%s> [y/N]？"
 
-#: git-send-email.perl:913
+#: git-send-email.perl:990
 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:918
+#: git-send-email.perl:995
 msgid "Which 8bit encoding should I declare [UTF-8]? "
 msgstr "�声明 8bit 为什么样的编�格� [UTF-8]？"
 
-#: git-send-email.perl:926
+#: git-send-email.perl:1003
 #, perl-format
 msgid ""
 "Refusing to send because the patch\n"
@@ -23175,20 +25881,20 @@ msgstr ""
 "\t%s\n"
 "包�模版标题 '*** SUBJECT HERE ***'。如果确实想���，使用�数 --force。\n"
 
-#: git-send-email.perl:945
+#: git-send-email.perl:1022
 msgid "To whom should the emails be sent (if anyone)?"
 msgstr "邮件将���给�？"
 
-#: git-send-email.perl:963
+#: git-send-email.perl:1040
 #, perl-format
 msgid "fatal: alias '%s' expands to itself\n"
 msgstr "致命错误：别� '%s' 扩展为它自己\n"
 
-#: git-send-email.perl:975
+#: git-send-email.perl:1052
 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:1033 git-send-email.perl:1041
+#: git-send-email.perl:1114 git-send-email.perl:1122
 #, perl-format
 msgid "error: unable to extract a valid address from: %s\n"
 msgstr "错误：�能从 %s 中��一个有效的邮件地�\n"
@@ -23196,16 +25902,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:1045
+#: git-send-email.perl:1126
 msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
 msgstr "如何处�这个地�？([q]uit|[d]rop|[e]dit)："
 
-#: git-send-email.perl:1362
+#: git-send-email.perl:1446
 #, perl-format
 msgid "CA path \"%s\" does not exist"
 msgstr "CA 路径 \"%s\" �存在"
 
-#: git-send-email.perl:1445
+#: 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"
@@ -23230,128 +25936,143 @@ 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:1460
+#: git-send-email.perl:1544
 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:1463
+#: git-send-email.perl:1547
 msgid "Send this email reply required"
 msgstr "���求的邮件回�"
 
-#: git-send-email.perl:1491
+#: git-send-email.perl:1581
 msgid "The required SMTP server is not properly defined."
 msgstr "�求的 SMTP �务器未被正确定义。"
 
-#: git-send-email.perl:1538
+#: git-send-email.perl:1628
 #, perl-format
 msgid "Server does not support STARTTLS! %s"
 msgstr "�务器�支� STARTTLS�%s"
 
-#: git-send-email.perl:1543 git-send-email.perl:1547
+#: git-send-email.perl:1633 git-send-email.perl:1637
 #, perl-format
 msgid "STARTTLS failed! %s"
 msgstr "STARTTLS 失败�%s"
 
-#: git-send-email.perl:1556
+#: git-send-email.perl:1646
 msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
 msgstr "无法正确地�始化 SMTP。检查�置并使用 --smtp-debug。"
 
-#: git-send-email.perl:1574
+#: git-send-email.perl:1664
 #, perl-format
 msgid "Failed to send %s\n"
 msgstr "无法�� %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Dry-Sent %s\n"
 msgstr "演习�� %s\n"
 
-#: git-send-email.perl:1577
+#: git-send-email.perl:1667
 #, perl-format
 msgid "Sent %s\n"
 msgstr "正�� %s\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "Dry-OK. Log says:\n"
 msgstr "演习�功。日志说：\n"
 
-#: git-send-email.perl:1579
+#: git-send-email.perl:1669
 msgid "OK. Log says:\n"
 msgstr "OK。日志说：\n"
 
-#: git-send-email.perl:1591
+#: git-send-email.perl:1688
 msgid "Result: "
 msgstr "结果："
 
-#: git-send-email.perl:1594
+#: git-send-email.perl:1691
 msgid "Result: OK\n"
 msgstr "结果：OK\n"
 
-#: git-send-email.perl:1612
+#: git-send-email.perl:1709
 #, perl-format
 msgid "can't open file %s"
 msgstr "无法打开文件 %s"
 
-#: git-send-email.perl:1659 git-send-email.perl:1679
+#: git-send-email.perl:1756 git-send-email.perl:1776
 #, perl-format
 msgid "(mbox) Adding cc: %s from line '%s'\n"
 msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1665
+#: git-send-email.perl:1762
 #, perl-format
 msgid "(mbox) Adding to: %s from line '%s'\n"
 msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1718
+#: git-send-email.perl:1819
 #, perl-format
 msgid "(non-mbox) Adding cc: %s from line '%s'\n"
 msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
 
-#: git-send-email.perl:1753
+#: git-send-email.perl:1854
 #, perl-format
 msgid "(body) Adding cc: %s from line '%s'\n"
 msgstr "(body) 添加 cc: %s 自行 '%s'\n"
 
-#: git-send-email.perl:1864
+#: git-send-email.perl:1965
 #, perl-format
 msgid "(%s) Could not execute '%s'"
 msgstr "(%s) �能执行 '%s'"
 
-#: git-send-email.perl:1871
+#: git-send-email.perl:1972
 #, perl-format
 msgid "(%s) Adding %s: %s from: '%s'\n"
 msgstr "(%s) 添加 %s: %s 自：'%s'\n"
 
-#: git-send-email.perl:1875
+#: git-send-email.perl:1976
 #, perl-format
 msgid "(%s) failed to close pipe to '%s'"
 msgstr "(%s) 无法关闭管�至 '%s'"
 
-#: git-send-email.perl:1905
+#: git-send-email.perl:2006
 msgid "cannot send message as 7bit"
 msgstr "�能以 7bit 形���信�"
 
-#: git-send-email.perl:1913
+#: git-send-email.perl:2014
 msgid "invalid transfer encoding"
 msgstr "无效的传�编�"
 
-#: git-send-email.perl:1954 git-send-email.perl:2006 git-send-email.perl:2016
+#: 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 ""
+"致命错误：%s：被 sendemail-validate 挂钩拒�\n"
+"%s\n"
+"警告：补�未能��\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 "�能打开 %s：%s\n"
 
-#: git-send-email.perl:1957
+#: git-send-email.perl:2064
 #, perl-format
-msgid "%s: patch contains a line longer than 998 characters"
-msgstr "%s：补�包�一个超过 998 字符的行"
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"致命错误：%s:%d 超过 998 字符\n"
+"警告：补�未能��\n"
 
-#: git-send-email.perl:1974
+#: git-send-email.perl:2082
 #, 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:1978
+#: git-send-email.perl:2086
 #, 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
new file mode 100644
index 0000000000..5d5718abb1
--- /dev/null
+++ b/po/zh_TW.po
@@ -0,0 +1,26048 @@
+# Chinese (traditional) translations for Git package
+# Git 套�軟體的�體中文翻譯。
+# 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>
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2021-08-14 07:56+0800\n"
+"PO-Revision-Date: 2021-08-14 13:55+0800\n"
+"Last-Translator: Yi-Jyun Pan <pan93412@gmail.com>\n"
+"Language-Team: Chinese (Traditional) <http://weblate.slat.org/projects/git-"
+"po/git-cli/zh_Hant/>\n"
+"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 3.0\n"
+"X-ZhConverter: �化姬 dict-f4bc617e-r910 @ 2019/11/16 20:23:12 | https://"
+"zhconvert.org\n"
+
+#: add-interactive.c:376
+#, c-format
+msgid "Huh (%s)?"
+msgstr "嗯（%s）？"
+
+#: 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 "無法讀�索引"
+
+#: add-interactive.c:584 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
+msgid "binary"
+msgstr "二進�"
+
+#: add-interactive.c:642 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
+msgid "nothing"
+msgstr "ç„¡"
+
+#: add-interactive.c:643 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
+msgid "unchanged"
+msgstr "未變更"
+
+#: add-interactive.c:680 git-add--interactive.perl:641
+msgid "Update"
+msgstr "æ›´æ–°"
+
+#: add-interactive.c:697 add-interactive.c:885
+#, c-format
+msgid "could not stage '%s'"
+msgstr "無法暫存「%s�"
+
+#: add-interactive.c:703 add-interactive.c:892 reset.c:88 sequencer.c:3707
+msgid "could not write index"
+msgstr "無法寫入索引"
+
+#: add-interactive.c:706 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
+#, 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
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "「%s�路徑執行 make_cache_entry 失敗"
+
+#: add-interactive.c:759 git-add--interactive.perl:653
+msgid "Revert"
+msgstr "還原"
+
+#: add-interactive.c:775
+msgid "Could not parse HEAD^{tree}"
+msgstr "�能解� HEAD^{樹}"
+
+#: add-interactive.c:813 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
+#, c-format
+msgid "No untracked files.\n"
+msgstr "沒有未追蹤的檔案。\n"
+
+#: add-interactive.c:868 git-add--interactive.perl:687
+msgid "Add untracked"
+msgstr "新增未追蹤的"
+
+#: add-interactive.c:895 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
+#, c-format
+msgid "ignoring unmerged: %s"
+msgstr "忽略未�併：%s"
+
+#: add-interactive.c:937 add-patch.c:1752 git-add--interactive.perl:1369
+#, c-format
+msgid "Only binary files changed.\n"
+msgstr "�有二進�檔案被修改。\n"
+
+#: add-interactive.c:939 add-patch.c:1750 git-add--interactive.perl:1371
+#, c-format
+msgid "No changes.\n"
+msgstr "沒有修改。\n"
+
+#: add-interactive.c:943 git-add--interactive.perl:1379
+msgid "Patch update"
+msgstr "修補檔更新"
+
+#: add-interactive.c:982 git-add--interactive.perl:1792
+msgid "Review diff"
+msgstr "檢視 diff"
+
+#: add-interactive.c:1010
+msgid "show paths with changes"
+msgstr "顯示有變更的路徑"
+
+#: add-interactive.c:1012
+msgid "add working tree state to the staged set of changes"
+msgstr "加入工作�狀態至暫存列表"
+
+#: add-interactive.c:1014
+msgid "revert staged set of changes back to the HEAD version"
+msgstr "還原修改的暫存集至 HEAD 版本"
+
+#: add-interactive.c:1016
+msgid "pick hunks and update selectively"
+msgstr "挑��塊並�擇性更新"
+
+#: add-interactive.c:1018
+msgid "view diff between HEAD and index"
+msgstr "檢視 HEAD �索引之間的差異"
+
+#: add-interactive.c:1020
+msgid "add contents of untracked files to the staged set of changes"
+msgstr "加入未追蹤檔案的內容至暫存列表"
+
+#: add-interactive.c:1028 add-interactive.c:1077
+msgid "Prompt help:"
+msgstr "�示說明："
+
+#: add-interactive.c:1030
+msgid "select a single item"
+msgstr "�擇單一項目"
+
+#: add-interactive.c:1032
+msgid "select a range of items"
+msgstr "�擇項目範�"
+
+#: add-interactive.c:1034
+msgid "select multiple ranges"
+msgstr "�擇多個範�"
+
+#: add-interactive.c:1036 add-interactive.c:1081
+msgid "select item based on unique prefix"
+msgstr "基於唯一�綴�擇項目"
+
+#: add-interactive.c:1038
+msgid "unselect specified items"
+msgstr "�消�擇指定項目"
+
+#: add-interactive.c:1040
+msgid "choose all items"
+msgstr "�擇所有項目"
+
+#: add-interactive.c:1042
+msgid "(empty) finish selecting"
+msgstr "（空）完���"
+
+#: add-interactive.c:1079
+msgid "select a numbered item"
+msgstr "�擇編號�的項目"
+
+#: add-interactive.c:1083
+msgid "(empty) select nothing"
+msgstr "（空）全���"
+
+#: add-interactive.c:1091 builtin/clean.c:813 git-add--interactive.perl:1896
+msgid "*** Commands ***"
+msgstr "*** 指令 ***"
+
+#: add-interactive.c:1092 builtin/clean.c:814 git-add--interactive.perl:1893
+msgid "What now"
+msgstr "請�擇"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "staged"
+msgstr "快�"
+
+#: add-interactive.c:1144 git-add--interactive.perl:213
+msgid "unstaged"
+msgstr "未快�"
+
+#: 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 "路徑"
+
+#: add-interactive.c:1151
+msgid "could not refresh index"
+msgstr "無法�新整�索引"
+
+#: add-interactive.c:1165 builtin/clean.c:778 git-add--interactive.perl:1803
+#, c-format
+msgid "Bye.\n"
+msgstr "�見。\n"
+
+#: add-patch.c:34 git-add--interactive.perl:1431
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Stage this hunk [y,n,q,a,d%s,?]? "
+msgstr "暫存此�塊 [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 "如果修補檔能乾淨地套用，編輯�塊將立�標記為暫存。"
+
+#: add-patch.c:42
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 暫存此�塊\n"
+"n - ��暫存此�塊\n"
+"q - 離開。�暫存此�塊�後�的全部�塊\n"
+"a - 暫存此�塊和本檔案中後�的全部�塊\n"
+"d - �暫存此�塊和本檔案中後�的全部�塊\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 "儲�模�變更 [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 "儲�刪除變更 [y,n,q,a,d%s,?]? "
+
+#: add-patch.c:58 git-add--interactive.perl:1439
+#, 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
+#, c-format, perl-format
+msgid "Stash this hunk [y,n,q,a,d%s,?]? "
+msgstr "儲�此�塊 [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 "如果修補檔能乾淨地套用，編輯�塊將立�標記為儲�。"
+
+#: add-patch.c:64
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 儲�此�塊\n"
+"n - ��儲�此�塊\n"
+"q - 離開。�儲�此�塊�後�的全部�塊\n"
+"a - 儲�此�塊和本檔案中後�的全部�塊\n"
+"d - �儲�此�塊和本檔案中後�的全部�塊\n"
+
+#: add-patch.c:80 git-add--interactive.perl:1443
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
+msgstr "�消暫存此�塊 [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 "如果修補檔能乾淨地套用，編輯�塊將立�標記為未暫存。"
+
+#: add-patch.c:88
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - �暫存此�塊\n"
+"n - ���暫存此�塊\n"
+"q - 離開。���暫存此�塊�後�的全部�塊\n"
+"a - �暫存此�塊和本檔案中後�的全部�塊\n"
+"d - ���暫存此�塊和本檔案中後�的全部�塊\n"
+
+#: add-patch.c:103 git-add--interactive.perl:1449
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
+msgstr "將此�塊套用到索引 [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 "如果修補檔能乾淨地套用，編輯�塊將立�標記為套用。"
+
+#: add-patch.c:111
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在索引中套用此�塊\n"
+"n - ��在索引中套用此�塊\n"
+"q - 離開。��套用此�塊�後�的全部�塊\n"
+"a - 套用此�塊和本檔案中後�的全部�塊\n"
+"d - ��套用此�塊和本檔案中後�的全部�塊\n"
+
+#: add-patch.c:126 git-add--interactive.perl:1455
+#: git-add--interactive.perl:1473
+#, 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
+#, 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
+#, 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
+#, c-format, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
+msgstr "從工作�中�棄此�塊 [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 "如果修補檔能乾淨地套用，編輯�塊將立�標記為�棄。"
+
+#: add-patch.c:134 add-patch.c:202
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在工作�中�棄此�塊\n"
+"n - ��在工作�中�棄此�塊\n"
+"q - 離開。���棄此�塊�後�的全部�塊\n"
+"a - �棄此�塊和本檔案中後�的全部�塊\n"
+"d - ���棄此�塊和本檔案中後�的全部�塊\n"
+
+#: add-patch.c:149 add-patch.c:194 git-add--interactive.perl:1461
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:157
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在索引和工作�中�棄此�塊\n"
+"n - ��在索引和工作�中�棄此�塊\n"
+"q - 離開。���棄此�塊�後�的全部�塊\n"
+"a - �棄此�塊和本檔案中後�的全部�塊\n"
+"d - ���棄此�塊和本檔案中後�的全部�塊\n"
+
+#: add-patch.c:171 add-patch.c:216 git-add--interactive.perl:1467
+#, 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
+#, 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
+#, 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
+#, 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,?]? "
+
+#: add-patch.c:179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在索引和工作�中套用此�塊\n"
+"n - ��在索引和工作�中套用此�塊\n"
+"q - 離開。��套用此�塊�後�的全部�塊\n"
+"a - 套用此�塊和本檔案中後�的全部�塊\n"
+"d - ��套用此�塊和本檔案中後�的全部�塊\n"
+
+#: add-patch.c:224
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file\n"
+msgstr ""
+"y - 在工作�中套用此�塊\n"
+"n - ��在工作�中套用此�塊\n"
+"q - 離開。��套用此�塊�後�的全部�塊\n"
+"a - 套用此�塊和本檔案中後�的全部�塊\n"
+"d - ��套用此�塊和本檔案中後�的全部�塊\n"
+
+#: add-patch.c:343
+#, c-format
+msgid "could not parse hunk header '%.*s'"
+msgstr "無法解��塊標頭 '%.*s'"
+
+#: add-patch.c:362 add-patch.c:366
+#, c-format
+msgid "could not parse colored hunk header '%.*s'"
+msgstr "無法解�上色�的�塊標頭 '%.*s'"
+
+#: add-patch.c:420
+msgid "could not parse diff"
+msgstr "無法解�差異 (diff)"
+
+#: add-patch.c:439
+msgid "could not parse colored diff"
+msgstr "無法解�上色�的差異 (diff)"
+
+#: add-patch.c:453
+#, c-format
+msgid "failed to run '%s'"
+msgstr "無法執行 '%s'"
+
+#: add-patch.c:612
+msgid "mismatched output from interactive.diffFilter"
+msgstr "interactive.diffFilter 的輸出�符"
+
+#: add-patch.c:613
+msgid ""
+"Your filter must maintain a one-to-one correspondence\n"
+"between its input and output lines."
+msgstr ""
+"您的�濾器必須在其輸入�輸出行\n"
+"維�一�一的�應關係。"
+
+#: add-patch.c:791
+#, c-format
+msgid ""
+"expected context line #%d in\n"
+"%.*s"
+msgstr ""
+"應有上下文行 #%d 於\n"
+"%.*s"
+
+#: add-patch.c:806
+#, c-format
+msgid ""
+"hunks do not overlap:\n"
+"%.*s\n"
+"\tdoes not end with:\n"
+"%.*s"
+msgstr ""
+"�塊未�疊：\n"
+"%.*s\n"
+"\t�以下述�尾：\n"
+"%.*s"
+
+#: 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:1086
+#, c-format
+msgid ""
+"---\n"
+"To remove '%c' lines, make them ' ' lines (context).\n"
+"To remove '%c' lines, delete them.\n"
+"Lines starting with %c will be removed.\n"
+msgstr ""
+"---\n"
+"�刪除 '%c' 開始的行，使其�為 ' ' 開始的行（上下文）。\n"
+"�刪除 '%c' 開始的行，刪除它們。\n"
+"以 %c 開始的行將被刪除。\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: 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"
+
+#: add-patch.c:1133
+msgid "could not parse hunk header"
+msgstr "無法解��塊標頭"
+
+#: add-patch.c:1178
+msgid "'git apply --cached' failed"
+msgstr "「git apply --cached�失敗"
+
+#. 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.
+#.
+#. 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:1247 git-add--interactive.perl:1242
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr "未套用編輯�塊。是��新編輯（輸入 “no� �棄�） [y/n]? "
+
+#: add-patch.c:1290
+msgid "The selected hunks do not apply to the index!"
+msgstr "��的�塊�會套用進索引�"
+
+#: add-patch.c:1291 git-add--interactive.perl:1346
+msgid "Apply them to the worktree anyway? "
+msgstr "無論如何都�套用到工作�嗎？"
+
+#: add-patch.c:1298 git-add--interactive.perl:1349
+msgid "Nothing was applied.\n"
+msgstr "未套用。\n"
+
+#: add-patch.c:1355
+msgid ""
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"j - 維�此�塊未決狀態，檢視下一個未決定�塊\n"
+"J - 維�此�塊未決狀態，檢視下一個�塊\n"
+"k - 維�此�塊未決狀態，檢視上一個未決定�塊\n"
+"K - 維�此�塊未決狀態，檢視上一個�塊\n"
+"g - �擇�跳轉至的�塊\n"
+"/ - 尋找符��供之正�表示�的�塊\n"
+"s - 分割目��塊為更�的�塊\n"
+"e - 手動編輯目��塊\n"
+"? - 顯示說明\n"
+
+#: add-patch.c:1517 add-patch.c:1527
+msgid "No previous hunk"
+msgstr "沒有上一個�塊"
+
+#: add-patch.c:1522 add-patch.c:1532
+msgid "No next hunk"
+msgstr "沒有下一個�塊"
+
+#: add-patch.c:1538
+msgid "No other hunks to goto"
+msgstr "沒有其它�供跳轉的�塊"
+
+#: add-patch.c:1549 git-add--interactive.perl:1606
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "�跳轉到哪個�塊（<Enter> 檢視更多）？ "
+
+#: add-patch.c:1550 git-add--interactive.perl:1608
+msgid "go to which hunk? "
+msgstr "跳轉到哪個�塊？"
+
+#: add-patch.c:1561
+#, c-format
+msgid "Invalid number: '%s'"
+msgstr "無效數字：'%s'"
+
+#: 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:1575
+msgid "No other hunks to search"
+msgstr "沒有其它�供尋找的�塊"
+
+#: add-patch.c:1581 git-add--interactive.perl:1661
+msgid "search for regex? "
+msgstr "使用正�表示��尋？"
+
+#: add-patch.c:1596
+#, c-format
+msgid "Malformed search regexp %s: %s"
+msgstr "錯誤的正�表示� %s：%s"
+
+#: add-patch.c:1613
+msgid "No hunk matches the given pattern"
+msgstr "沒有和�供模�相符�的�塊"
+
+#: add-patch.c:1620
+msgid "Sorry, cannot split this hunk"
+msgstr "��起，�能分割這個�塊"
+
+#: add-patch.c:1624
+#, c-format
+msgid "Split into %d hunks."
+msgstr "分割為 %d 個�塊。"
+
+#: add-patch.c:1628
+msgid "Sorry, cannot edit this hunk"
+msgstr "��起，�能編輯這個�塊"
+
+#: add-patch.c:1680
+msgid "'git apply' failed"
+msgstr "'git apply' 失敗"
+
+#: advice.c:145
+#, c-format
+msgid ""
+"\n"
+"Disable this message with \"git config advice.%s false\""
+msgstr ""
+"\n"
+"請使用「git config advice.%s false�來�用此訊�"
+
+#: advice.c:161
+#, c-format
+msgid "%shint: %.*s%s\n"
+msgstr "%s�示：%.*s%s\n"
+
+#: advice.c:252
+msgid "Cherry-picking is not possible because you have unmerged files."
+msgstr "無法��，因為您有未�併的檔案。"
+
+#: advice.c:254
+msgid "Committing is not possible because you have unmerged files."
+msgstr "無法�交，因為您有未�併的檔案。"
+
+#: advice.c:256
+msgid "Merging is not possible because you have unmerged files."
+msgstr "無法�併，因為您有未�併的檔案。"
+
+#: advice.c:258
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "無法拉�，因為您有未�併的檔案。"
+
+#: advice.c:260
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "無法還原�交，因為您有未�併的檔案。"
+
+#: advice.c:262
+#, c-format
+msgid "It is not possible to %s because you have unmerged files."
+msgstr "無法 %s，因為您有未�併的檔案。"
+
+#: 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."
+msgstr ""
+"請在工作�改正檔案，然後酌情使用 'git add/rm <檔案>' 指令標記\n"
+"解決方案並�交。"
+
+#: advice.c:278
+msgid "Exiting because of an unresolved conflict."
+msgstr "因為存在未解決的��而離開。"
+
+#: advice.c:283 builtin/merge.c:1375
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "您尚未��您的�併（存在 MERGE_HEAD）。"
+
+#: advice.c:285
+msgid "Please, commit your changes before merging."
+msgstr "請在�併�先�交您的修改。"
+
+#: advice.c:286
+msgid "Exiting because of unfinished merge."
+msgstr "因為存在未完�的�併而離開。"
+
+#: 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 ""
+"下列路徑�格�符�任何��路徑，\n"
+"但符�目�稀�簽出外的索引項目：\n"
+
+#: 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"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by switching back to a branch.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -c with the switch command. Example:\n"
+"\n"
+"  git switch -c <new-branch-name>\n"
+"\n"
+"Or undo this operation with:\n"
+"\n"
+"  git switch -\n"
+"\n"
+"Turn off this advice by setting config variable advice.detachedHead to "
+"false\n"
+"\n"
+msgstr ""
+"注�：正在切�到 '%s'。\n"
+"\n"
+"您正處於分離開頭指標狀態。您�以檢視��實驗性的修改��交，並且您�以在切"
+"�\n"
+"回一個分支時，�棄在此狀態下所�的�交而��分支造�影響。\n"
+"\n"
+"如果您想���建立分支來�留在此狀態下所�的�交，您�以��在 switch 指令\n"
+"中新增�數 -c 來實�（�在或�後）。例如：\n"
+"\n"
+"  git switch -c <新分支�>\n"
+"\n"
+"或者復原此動作：\n"
+"\n"
+"  git switch -\n"
+"\n"
+"��將設定變數 advice.detachedHead 設定為 false 來關閉此建議\n"
+"\n"
+
+#: alias.c:50
+msgid "cmdline ends with \\"
+msgstr "指令列以 \\ �尾"
+
+#: alias.c:51
+msgid "unclosed quote"
+msgstr "未閉�的引號"
+
+#: apply.c:70
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "無法識別的空白字元�項 '%s'"
+
+#: apply.c:86
+#, c-format
+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:800
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "無法準備時間戳正�表示� %s"
+
+#: apply.c:809
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec 返回 %d，輸入為：%s"
+
+#: apply.c:883
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr "�能在修補檔的第 %d 行找到檔案�"
+
+#: apply.c:921
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr "git apply：錯誤的 git-diff - 應為 /dev/null，但在第 %2$d 行得到 %1$s"
+
+#: apply.c:927
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr "git apply：錯誤的 git-diff - 第 %d 行上新檔案��一致"
+
+#: apply.c:928
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr "git apply：錯誤的 git-diff - 第 %d 行上舊檔案��一致"
+
+#: apply.c:933
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply：錯誤的 git-diff - 第 %d 行處應為 /dev/null"
+
+#: apply.c:962
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "第 %d 行包�無效檔案模�：%s"
+
+#: apply.c:1281
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "�一致的檔案頭，%d 行和 %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] "當移除 %d 個�導路徑後 git diff 頭缺�檔案�訊�（第 %d 行）"
+
+#: apply.c:1384
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr "git diff 的標頭訊�中缺�檔案�訊�（第 %d 行）"
+
+#: apply.c:1480
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount：�外的行：%.*s"
+
+#: apply.c:1549
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "第 %d 行的修補檔�塊沒有標頭訊�：%.*s"
+
+#: apply.c:1752
+msgid "new file depends on old contents"
+msgstr "新檔案�賴舊內容"
+
+#: apply.c:1754
+msgid "deleted file still has contents"
+msgstr "刪除的檔案�有內容"
+
+#: apply.c:1788
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "修補檔在第 %d 行發��壞"
+
+#: apply.c:1825
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "新檔案 %s �賴舊內容"
+
+#: apply.c:1827
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "刪除的檔案 %s �有內容"
+
+#: apply.c:1830
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** 警告：檔案 %s �為空檔案但並未刪除"
+
+#: apply.c:1977
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "二進�修補檔在第 %d 行�壞：%.*s"
+
+#: apply.c:2014
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "無法識別的二進�修補檔�於第 %d 行"
+
+#: apply.c:2176
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "修補檔案的第 %d 行�有垃圾資料"
+
+#: apply.c:2262
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "無法讀�符號連� %s"
+
+#: apply.c:2266
+#, c-format
+msgid "unable to open or read %s"
+msgstr "�能開啟或讀� %s"
+
+#: apply.c:2935
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "無效的行首字元：'%c'"
+
+#: 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] "�塊 #%d �功套用於 %d（�移 %d 行）。"
+
+#: apply.c:3068
+#, c-format
+msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
+msgstr "上下文減少到（%ld/%ld）以在第 %d 行套用修補檔�塊"
+
+#: apply.c:3074
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"當查詢：\n"
+"%.*s"
+
+#: apply.c:3096
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "缺少 '%s' 的二進�修補檔資料"
+
+#: apply.c:3104
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr "�能��套用一個缺少到 '%s' 的��資料�塊的二進�修補檔"
+
+#: apply.c:3151
+#, c-format
+msgid "cannot apply binary patch to '%s' without full index line"
+msgstr "�能在 '%s' 上套用沒有完整索引行的二進�修補檔"
+
+#: apply.c:3162
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr "修補檔套用到 '%s'（%s），但是和目�內容�符�。"
+
+#: apply.c:3170
+#, c-format
+msgid "the patch applies to an empty '%s' but it is not empty"
+msgstr "修補檔套用到空檔案 '%s'，但其並�空檔案"
+
+#: apply.c:3188
+#, c-format
+msgid "the necessary postimage %s for '%s' cannot be read"
+msgstr "無法讀� '%2$s' 必需的目標檔案 %1$s"
+
+#: apply.c:3201
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "二進�修補檔未套用到 '%s'"
+
+#: apply.c:3208
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr "到 '%s' 的二進�修補檔產生了�正確的�果（應為 %s，�為 %s）"
+
+#: apply.c:3229
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "打修補檔失敗：%s:%ld"
+
+#: apply.c:3352
+#, 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
+#, c-format
+msgid "failed to read %s"
+msgstr "無法讀� %s"
+
+#: apply.c:3412
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "讀��於符號連�中的 '%s'"
+
+#: apply.c:3441 apply.c:3687
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "路徑 %s 已經被�新命�/刪除"
+
+#: apply.c:3527 apply.c:3702
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s：�存在於索引中"
+
+#: apply.c:3536 apply.c:3710 apply.c:3954
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s：和索引�符�"
+
+#: apply.c:3571
+msgid "repository lacks the necessary blob to perform 3-way merge."
+msgstr "版本庫缺少用來進行三方�併所需�的資料物件。"
+
+#: apply.c:3574
+#, c-format
+msgid "Performing three-way merge...\n"
+msgstr "正在進行三方�併⋯⋯\n"
+
+#: apply.c:3590 apply.c:3594
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "無法讀� '%s' 的目�內容"
+
+#: apply.c:3606
+#, c-format
+msgid "Failed to perform three-way merge...\n"
+msgstr "無法進行三方�併⋯⋯\n"
+
+#: apply.c:3620
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "套用修補檔到 '%s' 存在��。\n"
+
+#: apply.c:3625
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "�功套用修補檔到 '%s'。\n"
+
+#: apply.c:3642
+#, c-format
+msgid "Falling back to direct application...\n"
+msgstr "回復至直接套用模�⋯⋯\n"
+
+#: apply.c:3654
+msgid "removal patch leaves file contents"
+msgstr "移除修補檔�留下了檔案內容"
+
+#: apply.c:3727
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s：錯誤類型"
+
+#: apply.c:3729
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s 的類型是 %o，應為 %o"
+
+#: 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 "無效路徑 '%s'"
+
+#: apply.c:3952
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s：已經存在於索引中"
+
+#: apply.c:3956
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s：已經存在於工作�中"
+
+#: apply.c:3976
+#, c-format
+msgid "new mode (%o) of %s does not match old mode (%o)"
+msgstr "%2$s 的新模�（%1$o）和舊模�（%3$o）�符�"
+
+#: apply.c:3981
+#, 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
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "�影響的檔案 '%s' �於符號連�中"
+
+#: apply.c:4005
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s：修補檔未套用"
+
+#: apply.c:4020
+#, c-format
+msgid "Checking patch %s..."
+msgstr "正在檢查修補檔 %s..."
+
+#: apply.c:4112
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "�模組 %s 的 sha1 訊�缺少或無效"
+
+#: apply.c:4119
+#, c-format
+msgid "mode change for %s, which is not in current HEAD"
+msgstr "%s 的模�變更，但它�在目� HEAD 中"
+
+#: apply.c:4122
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "sha1 訊�缺少或無效（%s）。"
+
+#: apply.c:4131
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "�能在暫時索引中新增 %s"
+
+#: apply.c:4141
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "�能把暫時索引寫入到 %s"
+
+#: apply.c:4279
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "�能從索引中移除 %s"
+
+#: apply.c:4313
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "�模組 %s �壞的修補檔"
+
+#: apply.c:4319
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "�能�建立檔案 '%s' 呼� stat"
+
+#: apply.c:4327
+#, c-format
+msgid "unable to create backing store for newly created file %s"
+msgstr "�能為建立檔案 %s 建立後端儲存"
+
+#: apply.c:4333 apply.c:4478
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "無法為 %s 新增快��目"
+
+#: apply.c:4376 builtin/bisect--helper.c:525
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "寫入 '%s' 失敗"
+
+#: apply.c:4380
+#, c-format
+msgid "closing file '%s'"
+msgstr "關閉檔案 '%s'"
+
+#: apply.c:4450
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "�能寫入檔案 '%s' 權� %o"
+
+#: apply.c:4548
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "�功套用修補檔 %s。"
+
+#: apply.c:4556
+msgid "internal error"
+msgstr "內部錯誤"
+
+#: apply.c:4559
+#, c-format
+msgid "Applying patch %%s with %d reject..."
+msgid_plural "Applying patch %%s with %d rejects..."
+msgstr[0] "套用 %%s 個修補檔，其中 %d 個被拒絕..."
+
+#: apply.c:4570
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "截短 .rej 檔案�為 %.*s.rej"
+
+#: apply.c:4578 builtin/fetch.c:993 builtin/fetch.c:1394
+#, c-format
+msgid "cannot open %s"
+msgstr "�能開啟 %s"
+
+#: apply.c:4592
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "�功套用第 #%d 個�塊。"
+
+#: apply.c:4596
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "拒絕第 #%d 個�塊。"
+
+#: apply.c:4725
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "略�修補檔 '%s'。"
+
+#: apply.c:4733
+msgid "unrecognized input"
+msgstr "無法識別的輸入"
+
+#: apply.c:4753
+msgid "unable to read index file"
+msgstr "無法讀�索引檔案"
+
+#: apply.c:4910
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "�能開啟修補檔 '%s'：%s"
+
+#: apply.c:4937
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "抑制下�有 %d 個空白字元誤用"
+
+#: apply.c:4943 apply.c:4958
+#, c-format
+msgid "%d line adds whitespace errors."
+msgid_plural "%d lines add whitespace errors."
+msgstr[0] "%d 行新增了空白字元誤用。"
+
+#: 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 行。"
+
+#: apply.c:4967 builtin/add.c:678 builtin/mv.c:304 builtin/rm.c:423
+msgid "Unable to write new index file"
+msgstr "無法寫入新索引檔案"
+
+#: apply.c:4995
+msgid "don't apply changes matching the given path"
+msgstr "��套用符��供路徑的變更"
+
+#: apply.c:4998
+msgid "apply changes matching the given path"
+msgstr "套用符��供路徑的變更"
+
+#: apply.c:5000 builtin/am.c:2318
+msgid "num"
+msgstr "數字"
+
+#: apply.c:5001
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "從傳統的 diff 路徑中移除指定數�的�導斜線"
+
+#: apply.c:5004
+msgid "ignore additions made by the patch"
+msgstr "忽略修補檔中的新增的檔案"
+
+#: apply.c:5006
+msgid "instead of applying the patch, output diffstat for the input"
+msgstr "�套用修補檔，而是顯示輸入的差異統計（diffstat）"
+
+#: apply.c:5010
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "以�進�數顯示新增和刪除的行數"
+
+#: apply.c:5012
+msgid "instead of applying the patch, output a summary for the input"
+msgstr "�套用修補檔，而是顯示輸入的概�"
+
+#: apply.c:5014
+msgid "instead of applying the patch, see if the patch is applicable"
+msgstr "�套用修補檔，而是檢視修補檔是��套用"
+
+#: apply.c:5016
+msgid "make sure the patch is applicable to the current index"
+msgstr "確�修補檔�以套用到目�索引"
+
+#: apply.c:5018
+msgid "mark new files with `git add --intent-to-add`"
+msgstr "使用指令 `git add --intent-to-add` 標記新增檔案"
+
+#: apply.c:5020
+msgid "apply a patch without touching the working tree"
+msgstr "套用修補檔而�修改工作�"
+
+#: apply.c:5022
+msgid "accept a patch that touches outside the working area"
+msgstr "接�修改工作�之外檔案的修補檔"
+
+#: apply.c:5025
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "還套用此修補檔（與 --stat/--summary/--check �項�時使用）"
+
+#: apply.c:5027
+msgid "attempt three-way merge, fall back on normal patch if that fails"
+msgstr "嘗試三方�併。如果失敗，則回到正常修補檔 (patch) 模�"
+
+#: apply.c:5029
+msgid "build a temporary index based on embedded index information"
+msgstr "建立一個暫時索引基於嵌入的索引訊�"
+
+#: apply.c:5032 builtin/checkout-index.c:196 builtin/ls-files.c:617
+msgid "paths are separated with NUL character"
+msgstr "路徑以 NUL 字元分隔"
+
+#: apply.c:5034
+msgid "ensure at least <n> lines of context match"
+msgstr "確�至少符� <n> 行上下文"
+
+#: 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 "動作"
+
+#: apply.c:5036
+msgid "detect new or modified lines that have whitespace errors"
+msgstr "檢查新增和修改的行中間的空白字元濫用"
+
+#: apply.c:5039 apply.c:5042
+msgid "ignore changes in whitespace when finding context"
+msgstr "尋找上下文時忽略空白字元的變更"
+
+#: apply.c:5045
+msgid "apply the patch in reverse"
+msgstr "��套用修補檔"
+
+#: apply.c:5047
+msgid "don't expect at least one line of context"
+msgstr "無需至少一行上下文"
+
+#: apply.c:5049
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "將拒絕的修補檔�塊儲存在�應的 *.rej 檔案中"
+
+#: apply.c:5051
+msgid "allow overlapping hunks"
+msgstr "�許�疊的修補檔�塊"
+
+#: 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 "詳細輸出"
+
+#: apply.c:5054
+msgid "tolerate incorrectly detected missing new-line at the end of file"
+msgstr "�許�正確的檔案末尾�行符號"
+
+#: apply.c:5057
+msgid "do not trust the line counts in the hunk headers"
+msgstr "�信任修補檔�塊的標頭訊�中的行號"
+
+#: apply.c:5059 builtin/am.c:2306
+msgid "root"
+msgstr "根目錄"
+
+#: apply.c:5060
+msgid "prepend <root> to all filenames"
+msgstr "為所有檔案��新增 <根目錄>"
+
+#: archive-tar.c:125 archive-zip.c:345
+#, c-format
+msgid "cannot stream blob %s"
+msgstr "�能開啟資料物件 %s"
+
+#: archive-tar.c:265 archive-zip.c:358
+#, c-format
+msgid "unsupported file mode: 0%o (SHA1: %s)"
+msgstr "�支�的檔案模�：0%o (SHA1: %s)"
+
+#: archive-tar.c:450
+#, c-format
+msgid "unable to start '%s' filter"
+msgstr "無法啟動 '%s' �濾器"
+
+#: archive-tar.c:453
+msgid "unable to redirect descriptor"
+msgstr "無法�定��述符"
+
+#: archive-tar.c:460
+#, c-format
+msgid "'%s' filter reported error"
+msgstr "'%s' �濾器報告了錯誤"
+
+#: archive-zip.c:318
+#, c-format
+msgid "path is not valid UTF-8: %s"
+msgstr "路徑�是有效的 UTF-8：%s"
+
+#: archive-zip.c:322
+#, c-format
+msgid "path too long (%d chars, SHA1: %s): %s"
+msgstr "路徑太長（%d 字元，SHA1：%s）：%s"
+
+#: archive-zip.c:469 builtin/pack-objects.c:365 builtin/pack-objects.c:368
+#, c-format
+msgid "deflate error (%d)"
+msgstr "壓縮錯誤 (%d)"
+
+#: archive-zip.c:603
+#, c-format
+msgid "timestamp too large for this system: %<PRIuMAX>"
+msgstr "�於本系統時間戳太大：%<PRIuMAX>"
+
+#: archive.c:14
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<�項>] <樹或�交> [<路徑>...]"
+
+#: archive.c:15
+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 <版本庫> [--exec <命令>] [<�項>] <樹或�交> [<路徑>...]"
+
+#: archive.c:17
+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:3537 sequencer.c:3665 builtin/am.c:262 builtin/commit.c:833
+#: builtin/merge.c:1144
+#, c-format
+msgid "could not read '%s'"
+msgstr "�能讀� '%s'"
+
+#: 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 "路徑�格 '%s' 未符�任何檔案"
+
+#: archive.c:451
+#, c-format
+msgid "no such ref: %.*s"
+msgstr "無此引用：%.*s"
+
+#: archive.c:457
+#, c-format
+msgid "not a valid object name: %s"
+msgstr "�是一個有效的物件�：%s"
+
+#: archive.c:470
+#, c-format
+msgid "not a tree object: %s"
+msgstr "�是一個樹狀物件：%s"
+
+#: archive.c:482
+msgid "current working directory is untracked"
+msgstr "目�工作目錄未被追蹤"
+
+#: archive.c:523
+#, c-format
+msgid "File not found: %s"
+msgstr "找�到檔案：%s"
+
+#: archive.c:525
+#, c-format
+msgid "Not a regular file: %s"
+msgstr "�是一般檔案：%s"
+
+#: archive.c:552
+msgid "fmt"
+msgstr "格�"
+
+#: archive.c:552
+msgid "archive format"
+msgstr "歸檔格�"
+
+#: archive.c:553 builtin/log.c:1775
+msgid "prefix"
+msgstr "�綴"
+
+#: archive.c:554
+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: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 "檔案"
+
+#: archive.c:556
+msgid "add untracked file to archive"
+msgstr "將未追蹤檔案加入歸檔"
+
+#: archive.c:559 builtin/archive.c:90
+msgid "write the archive to this file"
+msgstr "歸檔寫入此檔案"
+
+#: archive.c:561
+msgid "read .gitattributes in working directory"
+msgstr "讀�工作�中的 .gitattributes"
+
+#: archive.c:562
+msgid "report archived files on stderr"
+msgstr "在標準錯誤上報告歸檔檔案"
+
+#: archive.c:564
+msgid "set compression level"
+msgstr "設定壓縮級別"
+
+#: archive.c:567
+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:1898 builtin/submodule--helper.c:2352
+#: builtin/submodule--helper.c:2902
+msgid "repo"
+msgstr "版本庫"
+
+#: archive.c:570 builtin/archive.c:92
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "從�端版本庫（<版本庫>）擷�歸檔檔案"
+
+#: archive.c:571 builtin/archive.c:93 builtin/difftool.c:717
+#: builtin/notes.c:498
+msgid "command"
+msgstr "指令"
+
+#: archive.c:572 builtin/archive.c:94
+msgid "path to the remote git-upload-archive command"
+msgstr "�端 git-upload-archive 指令的路徑"
+
+#: archive.c:579
+msgid "Unexpected option --remote"
+msgstr "未知�數 --remote"
+
+#: archive.c:581
+msgid "Option --exec can only be used together with --remote"
+msgstr "�項 --exec �能和 --remote �時使用"
+
+#: archive.c:583
+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
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "未知歸檔格� '%s'"
+
+#: archive.c:616
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "�數�支�此格� '%s'：-%d"
+
+#: attr.c:202
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s �是一個有效的屬性�"
+
+#: attr.c:363
+#, c-format
+msgid "%s not allowed: %s:%d"
+msgstr "��許 %s：%s:%d"
+
+#: attr.c:403
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"��模�在 git attributes 中被忽略\n"
+"當字串確定�以驚嘆號開始時，使用 '\\!'。"
+
+#: bisect.c:489
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "檔案 '%s' 包�錯誤的引用格�：%s"
+
+#: bisect.c:699
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "我們無法進行更多的二分�尋�\n"
+
+#: bisect.c:766
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "�是一個有效的�交� %s"
+
+#: bisect.c:791
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"�併基礎 %s 是壞的。\n"
+"這�味著介於 %s 和 [%s] 之間的 bug 已經被修復。\n"
+
+#: bisect.c:796
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"�併基礎 %s 是新的。\n"
+"介於 %s 和 [%s] 之間的屬性已經被修改。\n"
+
+#: bisect.c:801
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"�併基礎 %s 是 %s。\n"
+"這�味著第一個 '%s' �交�於 %s 和 [%s] 之間。\n"
+
+#: bisect.c:809
+#, 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 ""
+"一些 %s 版本�是 %s 版本的祖先。\n"
+"這種情�下 git 二分�尋無法正常工作。\n"
+"您�能弄錯了 %s 和 %s 版本？\n"
+
+#: bisect.c:822
+#, 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 ""
+"介於 %s 和 [%s] 的�併基礎一定被忽略了。\n"
+"所以我們無法確�第一個 %s �交是�介於 %s 和 %s 之間。\n"
+"我們�舊繼續。"
+
+#: bisect.c:861
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "二分�尋中：�併基礎必須是經�測試的\n"
+
+#: bisect.c:911
+#, c-format
+msgid "a %s revision is needed"
+msgstr "需�一個 %s 版本"
+
+#: bisect.c:941 builtin/notes.c:177 builtin/tag.c:298
+#, c-format
+msgid "could not create file '%s'"
+msgstr "�能建立檔案 '%s'"
+
+#: bisect.c:987 builtin/merge.c:153
+#, c-format
+msgid "could not read file '%s'"
+msgstr "�能讀�檔案 '%s'"
+
+#: bisect.c:1027
+msgid "reading bisect refs failed"
+msgstr "讀�二分�尋引用失敗"
+
+#: bisect.c:1057
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s �時為 %s 和 %s\n"
+
+#: bisect.c:1066
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path arguments?\n"
+msgstr ""
+"沒找到能夠測試的�交。\n"
+"�能是執行傳入的路徑引數是錯誤的？\n"
+
+#: bisect.c:1095
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "（大概 %d 步）"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1101
+#, c-format
+msgid "Bisecting: %d revision left to test after this %s\n"
+msgid_plural "Bisecting: %d revisions left to test after this %s\n"
+msgstr[0] "二分�尋中：在此之後，還剩 %d 個版本待測試 %s\n"
+
+#: blame.c:2776
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents 和 --reverse �能混用。"
+
+#: blame.c:2790
+msgid "cannot use --contents with final commit object name"
+msgstr "�能將 --contents 和最終的�交物件�共用"
+
+#: blame.c:2811
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr "--reverse 和 --first-parent 共用，需�指定最新的�交"
+
+#: 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 "版本�歷設定失敗"
+
+#: blame.c:2838
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr "--reverse 和 --first-parent 共用，需�第一祖先�上的�交範�"
+
+#: blame.c:2849
+#, c-format
+msgid "no such path %s in %s"
+msgstr "在 %2$s 中無此路徑 %1$s"
+
+#: blame.c:2860
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "�能為路徑 %2$s 讀�資料物件 %1$s"
+
+#: branch.c:53
+#, c-format
+msgid ""
+"\n"
+"After fixing the error cause you may try to fix up\n"
+"the remote tracking information by invoking\n"
+"\"git branch --set-upstream-to=%s%s%s\"."
+msgstr ""
+"\n"
+"在修復錯誤後，您�以嘗試修改�端追蹤分支，��執行指令\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 作為它自己的上游。"
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr "分支 '%1$s' 設定為使用�定基底來追蹤來自 '%3$s' 的�端分支 '%2$s'。"
+
+#: branch.c:94
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "分支 '%1$s' 設定為追蹤來自 '%3$s' 的�端分支 '%2$s'。"
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr "分支 '%s' 設定為使用�定基底來追蹤本機分支 '%s'。"
+
+#: branch.c:99
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "分支 '%s' 設定為追蹤本機分支 '%s'。"
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "分支 '%s' 設定為使用�定基底來追蹤�端引用 '%s'。"
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "分支 '%s' 設定為追蹤�端引用 '%s'。"
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr "分支 '%s' 設定為使用�定基底來追蹤本機引用 '%s'。"
+
+#: branch.c:110
+#, 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 "無法寫入上游分支設定"
+
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "未追蹤：引用 %s 有歧義"
+
+#: branch.c:189
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' �是一個有效的分支�稱。"
+
+#: branch.c:208
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "一個分支� '%s' 已經存在。"
+
+#: branch.c:213
+msgid "Cannot force update the current branch."
+msgstr "無法強制更新目�分支。"
+
+#: branch.c:233
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr "無法設定追蹤訊�；起始點 '%s' �是一個分支。"
+
+#: branch.c:235
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "請求的上游分支 '%s' �存在"
+
+#: branch.c:237
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"如果您正計劃基於�端一個�存的上游分支開始你的工作，\n"
+"您�能需�執行 \"git fetch\" 來�得分支。\n"
+"\n"
+"如果您正計劃推�一個能與�應�端分支建立追蹤的新的本機分支，\n"
+"您�能需�使用 \"git push -u\" 推�分支並設定和上游的關�。"
+
+#: branch.c:281
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "�是一個有效的物件�：'%s'。"
+
+#: branch.c:301
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "歧義的物件�：'%s'。"
+
+#: branch.c:306
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "無效的分支點：'%s'。"
+
+#: branch.c:366
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' 已經簽出到 '%s'"
+
+#: branch.c:389
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "工作� %s 的 HEAD 指�沒有被更新"
+
+#: bundle.c:44
+#, c-format
+msgid "unrecognized bundle hash algorithm: %s"
+msgstr "無法識別的包雜湊演算法：%s"
+
+#: bundle.c:48
+#, c-format
+msgid "unknown capability '%s'"
+msgstr "未知功能 '%s'"
+
+#: bundle.c:74
+#, c-format
+msgid "'%s' does not look like a v2 or v3 bundle file"
+msgstr "'%s' ��是一個 v2 或 v3 版本的包檔案"
+
+#: bundle.c:113
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "無法識別的包頭：%s%s (%d)"
+
+#: 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 "�能開啟 '%s'"
+
+#: bundle.c:198
+msgid "Repository lacks these prerequisite commits:"
+msgstr "版本庫中缺少這些必備的�交："
+
+#: bundle.c:201
+msgid "need a repository to verify a bundle"
+msgstr "需�版本庫驗證一個包"
+
+#: bundle.c:257
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "這個包中�有這 %d 個引用："
+
+#: bundle.c:264
+msgid "The bundle records a complete history."
+msgstr "這個包記錄一個完整歷�。"
+
+#: bundle.c:266
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "這個包需�這 %d 個引用："
+
+#: bundle.c:333
+msgid "unable to dup bundle descriptor"
+msgstr "無法複製 bundle �述符"
+
+#: bundle.c:340
+msgid "Could not spawn pack-objects"
+msgstr "�能生� pack-objects 進程"
+
+#: bundle.c:351
+msgid "pack-objects died"
+msgstr "pack-objects 終止"
+
+#: bundle.c:400
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "引用 '%s' 被 rev-list �項排除"
+
+#: bundle.c:504
+#, c-format
+msgid "unsupported bundle version %d"
+msgstr "�支�的包版本 %d"
+
+#: bundle.c:506
+#, c-format
+msgid "cannot write bundle version %d with algorithm %s"
+msgstr "無法寫入 %2$s 演算法的包版本 %1$d"
+
+#: bundle.c:524 builtin/log.c:210 builtin/log.c:1938 builtin/shortlog.c:396
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "無法識別的�數：%s"
+
+#: bundle.c:553
+msgid "Refusing to create empty bundle."
+msgstr "�能建立空包。"
+
+#: bundle.c:563
+#, c-format
+msgid "cannot create '%s'"
+msgstr "�能建立 '%s'"
+
+#: bundle.c:588
+msgid "index-pack died"
+msgstr "index-pack 終止"
+
+#: chunk-format.c:117
+msgid "terminating chunk id appears earlier than expected"
+msgstr "終止�塊 id 出�的時間早於�期"
+
+#: chunk-format.c:126
+#, c-format
+msgid "improper chunk offset(s) %<PRIx64> and %<PRIx64>"
+msgstr "�正確的�塊�移 %<PRIx64> � %<PRIx64>"
+
+#: chunk-format.c:133
+#, c-format
+msgid "duplicate chunk ID %<PRIx32> found"
+msgstr "找到�複的�塊 ID %<PRIx32>"
+
+#: chunk-format.c:147
+#, c-format
+msgid "final chunk has non-zero id %<PRIx32>"
+msgstr "最終�塊有�零 ID %<PRIx32>"
+
+#: color.c:329
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "無效的�色值：%.*s"
+
+#: commit-graph.c:204 midx.c:47
+msgid "invalid hash version"
+msgstr "無效的雜湊版本"
+
+#: commit-graph.c:262
+msgid "commit-graph file is too small"
+msgstr "�交圖形檔案太�"
+
+#: commit-graph.c:355
+#, c-format
+msgid "commit-graph signature %X does not match signature %X"
+msgstr "�交圖形簽� %X 和簽� %X �符�"
+
+#: commit-graph.c:362
+#, c-format
+msgid "commit-graph version %X does not match version %X"
+msgstr "�交圖形版本 %X 和版本 %X �符�"
+
+#: commit-graph.c:369
+#, c-format
+msgid "commit-graph hash version %X does not match version %X"
+msgstr "�交圖形雜湊版本 %X 和版本 %X �符�"
+
+#: commit-graph.c:386
+#, c-format
+msgid "commit-graph file is too small to hold %u chunks"
+msgstr "commit-graph 檔案�夠放置 %u 個�塊"
+
+#: commit-graph.c:482
+msgid "commit-graph has no base graphs chunk"
+msgstr "�交圖形沒有基礎圖形�塊"
+
+#: commit-graph.c:492
+msgid "commit-graph chain does not match"
+msgstr "�交圖形��符�"
+
+#: commit-graph.c:540
+#, c-format
+msgid "invalid commit-graph chain: line '%s' not a hash"
+msgstr "無效的�交圖形�：行 '%s' �是一個雜湊值"
+
+#: commit-graph.c:564
+msgid "unable to find all commit-graph files"
+msgstr "無法找到所有�交圖形檔案"
+
+#: commit-graph.c:745 commit-graph.c:782
+msgid "invalid commit position. commit-graph is likely corrupt"
+msgstr "無效的�交�置。�交圖形�能已�壞"
+
+#: commit-graph.c:766
+#, c-format
+msgid "could not find commit %s"
+msgstr "無法找到�交 %s"
+
+#: 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 "�能解��交 %s"
+
+#: commit-graph.c:1337 builtin/pack-objects.c:3057
+#, c-format
+msgid "unable to get type of object %s"
+msgstr "無法�得物件 %s 類型"
+
+#: commit-graph.c:1368
+msgid "Loading known commits in commit graph"
+msgstr "正在載入�交圖中的已知�交"
+
+#: commit-graph.c:1385
+msgid "Expanding reachable commits in commit graph"
+msgstr "正在擴展�交圖中的�以�得�交"
+
+#: commit-graph.c:1405
+msgid "Clearing commit marks in commit graph"
+msgstr "正在清除�交圖中的�交標記"
+
+#: 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:1558
+msgid "Computing commit changed paths Bloom filters"
+msgstr "正在計算�交變更路徑的布隆�濾器"
+
+#: commit-graph.c:1635
+msgid "Collecting referenced commits"
+msgstr "正在收集引用�交"
+
+#: 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] "正在 %d 個包中尋找�交圖的�交"
+
+#: commit-graph.c:1673
+#, c-format
+msgid "error adding pack %s"
+msgstr "新增包 %s 發生錯誤"
+
+#: commit-graph.c:1677
+#, c-format
+msgid "error opening index for %s"
+msgstr "為 %s 開啟索引發生錯誤"
+
+#: commit-graph.c:1714
+msgid "Finding commits for commit graph among packed objects"
+msgstr "正在打包物件中尋找�交圖的�交"
+
+#: commit-graph.c:1732
+msgid "Finding extra edges in commit graph"
+msgstr "正在尋找�交圖中�外的邊"
+
+#: commit-graph.c:1781
+msgid "failed to write correct number of base graph ids"
+msgstr "無法寫入正確數�的基礎圖形 ID"
+
+#: commit-graph.c:1812 midx.c:911
+#, c-format
+msgid "unable to create leading directories of %s"
+msgstr "�能為 %s 建立先導目錄"
+
+#: commit-graph.c:1825
+msgid "unable to create temporary graph layer"
+msgstr "無法建立暫時的圖形層"
+
+#: commit-graph.c:1830
+#, c-format
+msgid "unable to adjust shared permissions for '%s'"
+msgstr "無法調整「%s�的共用權�"
+
+#: 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] "正在用 %d 步寫出�交圖"
+
+#: commit-graph.c:1923
+msgid "unable to open commit-graph chain file"
+msgstr "無法開啟�交圖形�檔案"
+
+#: commit-graph.c:1939
+msgid "failed to rename base commit-graph file"
+msgstr "無法�新命�基礎�交圖形檔案"
+
+#: commit-graph.c:1959
+msgid "failed to rename temporary commit-graph file"
+msgstr "無法�新命�暫時�交圖形檔案"
+
+#: commit-graph.c:2092
+msgid "Scanning merged commits"
+msgstr "正在掃��併�交"
+
+#: commit-graph.c:2136
+msgid "Merging commit-graph"
+msgstr "正在�併�交圖形"
+
+#: commit-graph.c:2244
+msgid "attempting to write a commit-graph, but 'core.commitGraph' is disabled"
+msgstr "嘗試寫入�交圖形，但 “core.commitGraph� 已被�用"
+
+#: commit-graph.c:2351
+msgid "too many commits to write graph"
+msgstr "�交太多�能畫圖"
+
+#: commit-graph.c:2449
+msgid "the commit-graph file has incorrect checksum and is likely corrupt"
+msgstr "�交圖檔案的總和檢查碼錯誤，�能已經�壞"
+
+#: commit-graph.c:2459
+#, c-format
+msgid "commit-graph has incorrect OID order: %s then %s"
+msgstr "�交圖形的物件 ID 順��正確：%s 然後 %s"
+
+#: commit-graph.c:2469 commit-graph.c:2484
+#, c-format
+msgid "commit-graph has incorrect fanout value: fanout[%d] = %u != %u"
+msgstr "�交圖形有�正確的扇出值：fanout[%d] = %u != %u"
+
+#: commit-graph.c:2476
+#, c-format
+msgid "failed to parse commit %s from commit-graph"
+msgstr "無法從�交圖形中解��交 %s"
+
+#: commit-graph.c:2494
+msgid "Verifying commits in commit graph"
+msgstr "正在驗證�交圖中的�交"
+
+#: commit-graph.c:2509
+#, c-format
+msgid "failed to parse commit %s from object database for commit-graph"
+msgstr "無法從�交圖形的物件庫中解��交 %s"
+
+#: commit-graph.c:2516
+#, c-format
+msgid "root tree OID for commit %s in commit-graph is %s != %s"
+msgstr "�交圖形中的�交 %s 的根樹狀物件 ID 是 %s != %s"
+
+#: commit-graph.c:2526
+#, c-format
+msgid "commit-graph parent list for commit %s is too long"
+msgstr "�交 %s 的�交圖形父�交列表太長了"
+
+#: commit-graph.c:2535
+#, c-format
+msgid "commit-graph parent for %s is %s != %s"
+msgstr "%s 的�交圖形父�交是 %s != %s"
+
+#: commit-graph.c:2549
+#, c-format
+msgid "commit-graph parent list for commit %s terminates early"
+msgstr "�交 %s 的�交圖形父�交列表�早終止"
+
+#: commit-graph.c:2554
+#, c-format
+msgid ""
+"commit-graph has generation number zero for commit %s, but non-zero elsewhere"
+msgstr "�交圖形中�交 %s 的世代號是零，但其它地方�零"
+
+#: commit-graph.c:2558
+#, c-format
+msgid ""
+"commit-graph has non-zero generation number for commit %s, but zero elsewhere"
+msgstr "�交圖形中�交 %s 的世代號�零，但其它地方是零"
+
+#: commit-graph.c:2575
+#, c-format
+msgid "commit-graph generation for commit %s is %<PRIuMAX> < %<PRIuMAX>"
+msgstr "�交 %s 的�交圖形處於 %<PRIuMAX> < %<PRIuMAX> 世代"
+
+#: commit-graph.c:2581
+#, 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: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 "�能解� %s"
+
+#: commit.c:54
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s �是一個�交�"
+
+#: commit.c:194
+msgid ""
+"Support for <GIT_DIR>/info/grafts is deprecated\n"
+"and will be removed in a future Git version.\n"
+"\n"
+"Please use \"git replace --convert-graft-file\"\n"
+"to convert the grafts into replace refs.\n"
+"\n"
+"Turn this message off by running\n"
+"\"git config advice.graftFileDeprecated false\""
+msgstr ""
+"� <GIT_DIR>/info/grafts 的支�已被棄用，並將在\n"
+"未來的Git版本中被移除。\n"
+"\n"
+"請使用 \"git replace --convert-graft-file\" 將\n"
+"grafts 轉�為�代引用。\n"
+"\n"
+"設定 \"git config advice.graftFileDeprecated false\"\n"
+"�關閉本消�"
+
+#: commit.c:1237
+#, c-format
+msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
+msgstr "�交 %s 有一個��信的�稱來自 %s 的 GPG 簽�。"
+
+#: commit.c:1241
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "�交 %s 有一個錯誤的�稱來自 %s 的 GPG 簽�。"
+
+#: commit.c:1244
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "�交 %s 沒有 GPG 簽�。"
+
+#: commit.c:1247
+#, c-format
+msgid "Commit %s has a good GPG signature by %s\n"
+msgstr "�交 %s 有一個來自 %s 的好的 GPG 簽�。\n"
+
+#: 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"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"警告：�交說明�符� UTF-8 字元編碼。\n"
+"您�以��修補�交來改正�交說明，或者將設定變數 i18n.commitencoding\n"
+"設定為您項目所用的字元編碼。\n"
+
+#: compat/obstack.c:406 compat/obstack.c:408
+msgid "memory exhausted"
+msgstr "記憶體耗盡"
+
+#: config.c:126
+#, c-format
+msgid ""
+"exceeded maximum include depth (%d) while including\n"
+"\t%s\n"
+"from\n"
+"\t%s\n"
+"This might be due to circular includes."
+msgstr ""
+"超�了最大包�深度（%1$d），當從\n"
+"\t%3$s\n"
+"包�\n"
+"\t%2$s\n"
+"這�能是因為循環包�。"
+
+#: config.c:142
+#, c-format
+msgid "could not expand include path '%s'"
+msgstr "無法擴展包�路徑 '%s'"
+
+#: config.c:153
+msgid "relative config includes must come from files"
+msgstr "相�路徑的設定檔案引用必須來自於檔案"
+
+#: config.c:199
+msgid "relative config include conditionals must come from files"
+msgstr "相�路徑的設定檔案�件引用必須來自於檔案"
+
+#: config.c:396
+#, c-format
+msgid "invalid config format: %s"
+msgstr "無效的設定檔格�：%s"
+
+#: config.c:400
+#, c-format
+msgid "missing environment variable name for configuration '%.*s'"
+msgstr "缺少「%.*s�組態設定的環境變數�稱"
+
+#: config.c:405
+#, c-format
+msgid "missing environment variable '%s' for configuration '%.*s'"
+msgstr "缺少環境變數「%s�（於「%.*s�組態設定）"
+
+#: config.c:442
+#, c-format
+msgid "key does not contain a section: %s"
+msgstr "��沒有包�一個�節�稱：%s"
+
+#: config.c:448
+#, c-format
+msgid "key does not contain variable name: %s"
+msgstr "��沒有包�變數�：%s"
+
+#: config.c:472 sequencer.c:2785
+#, c-format
+msgid "invalid key: %s"
+msgstr "無效��：%s"
+
+#: config.c:478
+#, c-format
+msgid "invalid key (newline): %s"
+msgstr "無效��（有�行符號）：%s"
+
+#: config.c:511
+msgid "empty config key"
+msgstr "空白設定�"
+
+#: config.c:529 config.c:541
+#, c-format
+msgid "bogus config parameter: %s"
+msgstr "�設定�數：%s"
+
+#: config.c:555 config.c:572 config.c:579 config.c:588
+#, c-format
+msgid "bogus format in %s"
+msgstr "%s 中格�錯誤"
+
+#: config.c:622
+#, c-format
+msgid "bogus count in %s"
+msgstr "%s 中有�計數"
+
+#: config.c:626
+#, c-format
+msgid "too many entries in %s"
+msgstr "%s 中的項目�多"
+
+#: config.c:636
+#, c-format
+msgid "missing config key %s"
+msgstr "缺少 %s 設定�"
+
+#: config.c:644
+#, c-format
+msgid "missing config value %s"
+msgstr "缺少 %s 設定值"
+
+#: config.c:995
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "資料物件 %2$s 中錯誤的設定行 %1$d"
+
+#: config.c:999
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "檔案 %2$s 中錯誤的設定行 %1$d"
+
+#: config.c:1003
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "標準輸入中錯誤的設定行 %d"
+
+#: config.c:1007
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "�模組資料物件 %2$s 中錯誤的設定行 %1$d"
+
+#: config.c:1011
+#, c-format
+msgid "bad config line %d in command line %s"
+msgstr "指令列 %2$s 中錯誤的設定行 %1$d"
+
+#: config.c:1015
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "在 %2$s 中錯誤的設定行 %1$d"
+
+#: config.c:1152
+msgid "out of range"
+msgstr "超出範�"
+
+#: config.c:1152
+msgid "invalid unit"
+msgstr "無效的單�"
+
+#: config.c:1153
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "設定變數 '%2$s' 的數字�值 '%1$s' 設定錯誤：%3$s"
+
+#: config.c:1163
+#, 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
+#, 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
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "標準輸入中設定變數 '%2$s' 錯誤的�值 '%1$s'：%3$s"
+
+#: config.c:1172
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "bad boolean config value '%s' for '%s'"
+msgstr "「%2$s�的「%1$s�布林設定值無效"
+
+#: config.c:1275
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "無法擴展使用者目錄：'%s'"
+
+#: config.c:1284
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%2$s' 的值 '%1$s' �是一個有效的時間戳"
+
+#: config.c:1377
+#, c-format
+msgid "abbrev length out of range: %d"
+msgstr "縮寫長度超出範�：%d"
+
+#: config.c:1391 config.c:1402
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "錯誤的 zlib 壓縮級別 %d"
+
+#: config.c:1494
+msgid "core.commentChar should only be one character"
+msgstr "core.commentChar 應該是一個字元"
+
+#: config.c:1527
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "無效的物件建立模�：%s"
+
+#: config.c:1599
+#, c-format
+msgid "malformed value for %s"
+msgstr "%s 的�值格�錯誤"
+
+#: config.c:1625
+#, c-format
+msgid "malformed value for %s: %s"
+msgstr "%s 的�值格�錯誤：%s"
+
+#: config.c:1626
+msgid "must be one of nothing, matching, simple, upstream or current"
+msgstr "必須是其中之一：nothing�matching�simple�upstream 或 current"
+
+#: config.c:1687 builtin/pack-objects.c:4084
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "錯誤的打包壓縮級別 %d"
+
+#: config.c:1809
+#, c-format
+msgid "unable to load config blob object '%s'"
+msgstr "無法從資料物件 '%s' 載入設定"
+
+#: config.c:1812
+#, c-format
+msgid "reference '%s' does not point to a blob"
+msgstr "引用 '%s' 沒有指�一個資料物件"
+
+#: config.c:1829
+#, c-format
+msgid "unable to resolve config blob '%s'"
+msgstr "�能解�設定物件 '%s'"
+
+#: config.c:1874
+#, c-format
+msgid "failed to parse %s"
+msgstr "解� %s 失敗"
+
+#: config.c:1930
+msgid "unable to parse command-line config"
+msgstr "無法解�指令列中的設定"
+
+#: config.c:2294
+msgid "unknown error occurred while reading the configuration files"
+msgstr "在讀�設定檔案時�到未知錯誤"
+
+#: config.c:2468
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "無效 %s：'%s'"
+
+#: config.c:2513
+#, c-format
+msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
+msgstr "splitIndex.maxPercentChange 的�值 '%d' 應該介於 0 和 100 之間"
+
+#: config.c:2559
+#, c-format
+msgid "unable to parse '%s' from command-line config"
+msgstr "無法解�指令列設定中的 '%s'"
+
+#: config.c:2561
+#, c-format
+msgid "bad config variable '%s' in file '%s' at line %d"
+msgstr "在檔案 '%2$s' 的第 %3$d 行發�錯誤的設定變數 '%1$s'"
+
+#: config.c:2645
+#, c-format
+msgid "invalid section name '%s'"
+msgstr "無效的�節�稱 '%s'"
+
+#: config.c:2677
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s 有多個�值"
+
+#: config.c:2706
+#, c-format
+msgid "failed to write new configuration file %s"
+msgstr "寫入新的設定檔案 %s 失敗"
+
+#: config.c:2958 config.c:3285
+#, c-format
+msgid "could not lock config file %s"
+msgstr "�能鎖定設定檔案 %s"
+
+#: config.c:2969
+#, c-format
+msgid "opening %s"
+msgstr "é–‹å•Ÿ %s"
+
+#: config.c:3006 builtin/config.c:361
+#, c-format
+msgid "invalid pattern: %s"
+msgstr "無效模�：%s"
+
+#: config.c:3031
+#, c-format
+msgid "invalid config file %s"
+msgstr "無效的設定檔案 %s"
+
+#: config.c:3044 config.c:3298
+#, c-format
+msgid "fstat on %s failed"
+msgstr "� %s 呼� fstat 失敗"
+
+#: config.c:3055
+#, c-format
+msgid "unable to mmap '%s'%s"
+msgstr "無法 mmap '%s'%s"
+
+#: config.c:3065 config.c:3303
+#, c-format
+msgid "chmod on %s failed"
+msgstr "� %s 呼� chmod 失敗"
+
+#: config.c:3150 config.c:3400
+#, c-format
+msgid "could not write config file %s"
+msgstr "�能寫入設定檔案 %s"
+
+#: config.c:3184
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "�能設定 '%s' 為 '%s'"
+
+#: config.c:3186 builtin/remote.c:657 builtin/remote.c:855 builtin/remote.c:863
+#, c-format
+msgid "could not unset '%s'"
+msgstr "�能�消設定 '%s'"
+
+#: config.c:3276
+#, c-format
+msgid "invalid section name: %s"
+msgstr "無效的�節�稱：%s"
+
+#: config.c:3443
+#, c-format
+msgid "missing value for '%s'"
+msgstr "%s 的�值缺少"
+
+#: connect.c:61
+msgid "the remote end hung up upon initial contact"
+msgstr "�端在�始連線時�掛斷"
+
+#: connect.c:63
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"無法讀��端版本庫。\n"
+"\n"
+"請確�您有正確的存�權�並且版本庫存在。"
+
+#: connect.c:81
+#, c-format
+msgid "server doesn't support '%s'"
+msgstr "伺�器�支� '%s'"
+
+#: connect.c:118
+#, c-format
+msgid "server doesn't support feature '%s'"
+msgstr "伺�器�支�特性 '%s'"
+
+#: connect.c:129
+msgid "expected flush after capabilities"
+msgstr "在能力之後應為一個 flush 包"
+
+#: connect.c:263
+#, c-format
+msgid "ignoring capabilities after first line '%s'"
+msgstr "忽略第一行 '%s' 之後的能力欄�"
+
+#: connect.c:284
+msgid "protocol error: unexpected capabilities^{}"
+msgstr "�定錯誤：�外的 capabilities^{}"
+
+#: connect.c:306
+#, c-format
+msgid "protocol error: expected shallow sha-1, got '%s'"
+msgstr "�定錯誤：�期淺複製 sha-1，�得到 '%s'"
+
+#: connect.c:308
+msgid "repository on the other end cannot be shallow"
+msgstr "�一端的版本庫�能是淺複製版本庫"
+
+#: connect.c:347
+msgid "invalid packet"
+msgstr "無效�包"
+
+#: connect.c:367
+#, c-format
+msgid "protocol error: unexpected '%s'"
+msgstr "�定錯誤：�外的 '%s'"
+
+#: connect.c:497
+#, c-format
+msgid "unknown object format '%s' specified by server"
+msgstr "伺�器指定的「%s�物件格�無效"
+
+#: connect.c:526
+#, c-format
+msgid "invalid ls-refs response: %s"
+msgstr "無效的 ls-refs 回應：%s"
+
+#: connect.c:530
+msgid "expected flush after ref listing"
+msgstr "在引用列表之後應該有一個 flush 包"
+
+#: connect.c:533
+msgid "expected response end packet after ref listing"
+msgstr "在引用列表後�期�有回應���包"
+
+#: connect.c:666
+#, c-format
+msgid "protocol '%s' is not supported"
+msgstr "�支� '%s' �定"
+
+#: connect.c:717
+msgid "unable to set SO_KEEPALIVE on socket"
+msgstr "無法為 socket 設定 SO_KEEPALIVE"
+
+#: connect.c:757 connect.c:820
+#, c-format
+msgid "Looking up %s ... "
+msgstr "尋找 %s ... "
+
+#: connect.c:761
+#, 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
+#, c-format
+msgid ""
+"done.\n"
+"Connecting to %s (port %s) ... "
+msgstr ""
+"完�。\n"
+"連線到 %s（埠 %s）... "
+
+#: connect.c:787 connect.c:864
+#, c-format
+msgid ""
+"unable to connect to %s:\n"
+"%s"
+msgstr ""
+"無法連線到 %s：\n"
+"%s"
+
+#. TRANSLATORS: this is the end of "Connecting to %s (port %s) ... "
+#: connect.c:793 connect.c:870
+msgid "done."
+msgstr "完�。"
+
+#: connect.c:824
+#, c-format
+msgid "unable to look up %s (%s)"
+msgstr "無法尋找 %s（%s）"
+
+#: connect.c:830
+#, c-format
+msgid "unknown port %s"
+msgstr "未知埠 %s"
+
+#: connect.c:967 connect.c:1299
+#, c-format
+msgid "strange hostname '%s' blocked"
+msgstr "已阻止奇怪的主機�稱 '%s'"
+
+#: connect.c:969
+#, c-format
+msgid "strange port '%s' blocked"
+msgstr "已阻止奇怪的埠號 '%s'"
+
+#: connect.c:979
+#, c-format
+msgid "cannot start proxy %s"
+msgstr "�能啟動代� %s"
+
+#: connect.c:1050
+msgid "no path specified; see 'git help pull' for valid url syntax"
+msgstr "未指定路徑，執行 'git help pull' 檢視有效的 url 語法"
+
+#: connect.c:1190
+msgid "newline is forbidden in git:// hosts and repo paths"
+msgstr "git:// 主機�稱和版本庫路徑中�能有�行"
+
+#: connect.c:1247
+msgid "ssh variant 'simple' does not support -4"
+msgstr "ssh 變體 'simple' �支� -4"
+
+#: connect.c:1259
+msgid "ssh variant 'simple' does not support -6"
+msgstr "ssh 變體 'simple' �支� -6"
+
+#: connect.c:1276
+msgid "ssh variant 'simple' does not support setting port"
+msgstr "ssh 變體 'simple' �支�設定埠"
+
+#: connect.c:1388
+#, c-format
+msgid "strange pathname '%s' blocked"
+msgstr "已阻止奇怪的路徑� '%s'"
+
+#: connect.c:1436
+msgid "unable to fork"
+msgstr "無法 fork"
+
+#: connected.c:108 builtin/fsck.c:189 builtin/prune.c:45
+msgid "Checking connectivity"
+msgstr "正在檢查連通性"
+
+#: connected.c:120
+msgid "Could not run 'git rev-list'"
+msgstr "�能執行 'git rev-list'"
+
+#: connected.c:144
+msgid "failed write to rev-list"
+msgstr "寫入 rev-list 失敗"
+
+#: connected.c:149
+msgid "failed to close rev-list's stdin"
+msgstr "關閉 rev-list 的標準輸入失敗"
+
+#: convert.c:183
+#, c-format
+msgid "illegal crlf_action %d"
+msgstr "�法的 crlf_action %d"
+
+#: convert.c:196
+#, c-format
+msgid "CRLF would be replaced by LF in %s"
+msgstr "%s 中的 CRLF 將被 LF �代"
+
+#: 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"
+msgstr ""
+"%s 中的 CRLF 將被 LF �代。\n"
+"在工作�中該檔案���原有的�行符號"
+
+#: convert.c:206
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "檔案 %s 中的 LF 將被 CRLF �代"
+
+#: 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"
+msgstr ""
+"%s 中的 LF 將被 CRLF �代。\n"
+"在工作�中該檔案���原有的�行符號"
+
+#: convert.c:273
+#, c-format
+msgid "BOM is prohibited in '%s' if encoded as %s"
+msgstr "如果使用 %2$s 編碼，�止在 '%1$s' 中使用 BOM"
+
+#: convert.c:280
+#, c-format
+msgid ""
+"The file '%s' contains a byte order mark (BOM). Please use UTF-%.*s as "
+"working-tree-encoding."
+msgstr "檔案 '%s' 包��元組順�標記（BOM）。請使用 UTF-%.*s 作為工作�編碼。"
+
+#: convert.c:293
+#, c-format
+msgid "BOM is required in '%s' if encoded as %s"
+msgstr "如果編碼為 %2$s，需�在 '%1$s' 中使用 BOM"
+
+#: 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 ""
+"檔案 '%s' 缺少一個�元組順�標記（BOM）。請使用 UTF-%sBE or UTF-%sLE（�決於"
+"字節�）作為工作�編碼。"
+
+#: convert.c:408 convert.c:479
+#, c-format
+msgid "failed to encode '%s' from %s to %s"
+msgstr "無法� '%s' 進行從 %s 到 %s 的編碼"
+
+#: convert.c:451
+#, c-format
+msgid "encoding '%s' from %s to %s and back is not the same"
+msgstr "將'%s' 的編碼從 %s 到 %s 來迴轉��一致"
+
+#: convert.c:654
+#, c-format
+msgid "cannot fork to run external filter '%s'"
+msgstr "�能 fork 以執行外部�濾器 '%s'"
+
+#: convert.c:674
+#, c-format
+msgid "cannot feed the input to external filter '%s'"
+msgstr "�能將輸入傳�給外部�濾器 '%s'"
+
+#: convert.c:681
+#, c-format
+msgid "external filter '%s' failed %d"
+msgstr "外部�濾器 '%s' 失敗碼 %d"
+
+#: convert.c:716 convert.c:719
+#, c-format
+msgid "read from external filter '%s' failed"
+msgstr "從外部�濾器 '%s' 讀�失敗"
+
+#: convert.c:722 convert.c:777
+#, c-format
+msgid "external filter '%s' failed"
+msgstr "外部�濾器 '%s' 失敗"
+
+#: convert.c:826
+msgid "unexpected filter type"
+msgstr "�外的�濾類型"
+
+#: convert.c:837
+msgid "path name too long for external filter"
+msgstr "外部�濾器的路徑�太長"
+
+#: convert.c:935
+#, c-format
+msgid ""
+"external filter '%s' is not available anymore although not all paths have "
+"been filtered"
+msgstr "外部�濾器 '%s' ���用，但並�所有路徑都已�濾"
+
+#: convert.c:1236
+msgid "true/false are no valid working-tree-encodings"
+msgstr "true/false �是有效的工作�編碼"
+
+#: convert.c:1416 convert.c:1449
+#, c-format
+msgid "%s: clean filter '%s' failed"
+msgstr "%s：clean �濾器 '%s' 失敗"
+
+#: convert.c:1492
+#, c-format
+msgid "%s: smudge filter %s failed"
+msgstr "%s：smudge �濾器 %s 失敗"
+
+#: credential.c:96
+#, c-format
+msgid "skipping credential lookup for key: credential.%s"
+msgstr "略��的憑證查詢：credential.%s"
+
+#: credential.c:112
+msgid "refusing to work with credential missing host field"
+msgstr "拒絕使用缺少主機欄�的憑證"
+
+#: credential.c:114
+msgid "refusing to work with credential missing protocol field"
+msgstr "拒絕使用缺少通訊�定欄�的憑證"
+
+#: credential.c:394
+#, c-format
+msgid "url contains a newline in its %s component: %s"
+msgstr "URL 的 %s 部分有�行：%s"
+
+#: credential.c:438
+#, c-format
+msgid "url has no scheme: %s"
+msgstr "URL 沒有 Scheme：%s"
+
+#: credential.c:511
+#, c-format
+msgid "credential url cannot be parsed: %s"
+msgstr "無法解�憑證 URL：%s"
+
+#: date.c:138
+msgid "in the future"
+msgstr "在將來"
+
+#: date.c:144
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> 秒��"
+
+#: date.c:151
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> 分��"
+
+#: date.c:158
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> �時�"
+
+#: date.c:165
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> 天�"
+
+#: date.c:171
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> 周�"
+
+#: date.c:178
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "%<PRIuMAX> 個月�"
+
+#: date.c:189
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> å¹´"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:192
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s %<PRIuMAX> 個月�"
+
+#: date.c:197 date.c:202
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> 年�"
+
+#: delta-islands.c:272
+msgid "Propagating island marks"
+msgstr "正在傳播資料島標記"
+
+#: delta-islands.c:290
+#, c-format
+msgid "bad tree object %s"
+msgstr "壞的樹狀物件 %s"
+
+#: delta-islands.c:334
+#, c-format
+msgid "failed to load island regex for '%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 個）"
+
+#: delta-islands.c:467
+#, c-format
+msgid "Marked %d islands, done.\n"
+msgstr "已標記 %d 個資料島，��。\n"
+
+#: diff-merges.c:70
+#, c-format
+msgid "unknown value for --diff-merges: %s"
+msgstr "--diff-merges 的值無效：%s"
+
+#: diff-lib.c:557
+msgid "--merge-base does not work with ranges"
+msgstr "--merge-base 跟範�無法���作"
+
+#: diff-lib.c:559
+msgid "--merge-base only works with commits"
+msgstr "--merge-base �能跟�交���能�作"
+
+#: diff-lib.c:576
+msgid "unable to get HEAD"
+msgstr "�能�得 HEAD"
+
+#: diff-lib.c:583
+msgid "no merge base found"
+msgstr "找�到�併基底"
+
+#: diff-lib.c:585
+msgid "multiple merge bases found"
+msgstr "找到多個�併基底"
+
+#: diff-no-index.c:237
+msgid "git diff --no-index [<options>] <path> <path>"
+msgstr "git diff --no-index [<�項>] <路徑> <路徑>"
+
+#: 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
+#, c-format
+msgid "  Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr "  無法解� dirstat 截止（cut-off）百分比 '%s'\n"
+
+#  譯者：請維��導空格
+#: diff.c:161
+#, c-format
+msgid "  Unknown dirstat parameter '%s'\n"
+msgstr "  未知的 dirstat �數 '%s'\n"
+
+#: diff.c:297
+msgid ""
+"color moved setting must be one of 'no', 'default', 'blocks', 'zebra', "
+"'dimmed-zebra', 'plain'"
+msgstr ""
+"移動的�色設定必須是 'no'�'default'�'blocks'�'zebra'�'dimmed-"
+"zebra'�'plain'"
+
+#: diff.c:325
+#, 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 ""
+"未知的 color-moved-ws 模� '%s'，�能的�值有 '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 �能與其它空白字元模�共用"
+
+#: diff.c:410
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "設定變數 'diff.submodule' 未知的�值：'%s'"
+
+#: diff.c:470
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"發�設定變數 'diff.dirstat' 中的錯誤：\n"
+"%s"
+
+#: diff.c:4282
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "外部 diff 離開，�止在 %s"
+
+#: diff.c:4634
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only�--name-status�--check 和 -s 是互斥的"
+
+#: diff.c:4637
+msgid "-G, -S and --find-object are mutually exclusive"
+msgstr "-G�-S 和 --find-object 是互斥的"
+
+#: diff.c:4640
+msgid ""
+"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"
+msgstr "-G 和 --pickaxe-regex 互斥。請使用 --pickaxe-regex �� -S"
+
+#: diff.c:4643
+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"
+
+#: diff.c:4722
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow 明確�求�跟一個路徑�格"
+
+#: diff.c:4770
+#, c-format
+msgid "invalid --stat value: %s"
+msgstr "無效的 --stat 值：%s"
+
+#: 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
+#, c-format
+msgid "%s expects a numerical value"
+msgstr "%s 期望一個數字值"
+
+#: diff.c:4807
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"無法解� --dirstat/-X �項的�數：\n"
+"%s"
+
+#: diff.c:4892
+#, c-format
+msgid "unknown change class '%c' in --diff-filter=%s"
+msgstr "--diff-filter=%2$s 中未知的變更類 '%1$c'"
+
+#: diff.c:4916
+#, c-format
+msgid "unknown value after ws-error-highlight=%.*s"
+msgstr "ws-error-highlight=%.*s 之後未知的值"
+
+#: diff.c:4930
+#, c-format
+msgid "unable to resolve '%s'"
+msgstr "�能解� '%s'"
+
+#: diff.c:4980 diff.c:4986
+#, c-format
+msgid "%s expects <n>/<m> form"
+msgstr "%s 期望 <n>/<m> 格�"
+
+#: diff.c:4998
+#, c-format
+msgid "%s expects a character, got '%s'"
+msgstr "%s 期望一個字元，得到 '%s'"
+
+#: diff.c:5019
+#, c-format
+msgid "bad --color-moved argument: %s"
+msgstr "壞的 --color-moved �數：%s"
+
+#: diff.c:5038
+#, c-format
+msgid "invalid mode '%s' in --color-moved-ws"
+msgstr "--color-moved-ws 中的無效模� '%s'"
+
+#: diff.c:5078
+msgid ""
+"option diff-algorithm accepts \"myers\", \"minimal\", \"patience\" and "
+"\"histogram\""
+msgstr ""
+"diff-algorithm �項有 \"myers\"�\"minimal\"�\"patience\" 和 \"histogram\""
+
+#: diff.c:5114 diff.c:5134
+#, c-format
+msgid "invalid argument to %s"
+msgstr "%s 的�數無效"
+
+#: diff.c:5238
+#, c-format
+msgid "invalid regex given to -I: '%s'"
+msgstr "傳入 -I 的正�表示�無效：「%s�"
+
+#: diff.c:5287
+#, c-format
+msgid "failed to parse --submodule option parameter: '%s'"
+msgstr "無法解� --submodule �項的�數：'%s'"
+
+#: diff.c:5343
+#, c-format
+msgid "bad --word-diff argument: %s"
+msgstr "壞的 --word-diff �數：%s"
+
+#: diff.c:5379
+msgid "Diff output format options"
+msgstr "差異輸出格�化�項"
+
+#: diff.c:5381 diff.c:5387
+msgid "generate patch"
+msgstr "生�修補檔"
+
+#: diff.c:5384 builtin/log.c:179
+msgid "suppress diff output"
+msgstr "�顯示差異輸出"
+
+#: diff.c:5389 diff.c:5503 diff.c:5510
+msgid "<n>"
+msgstr "<n>"
+
+#: diff.c:5390 diff.c:5393
+msgid "generate diffs with <n> lines context"
+msgstr "生�� <n> 行上下文的差異"
+
+#: diff.c:5395
+msgid "generate the diff in raw format"
+msgstr "生�原始格�的差異"
+
+#: diff.c:5398
+msgid "synonym for '-p --raw'"
+msgstr "和 '-p --raw' �義"
+
+#: diff.c:5402
+msgid "synonym for '-p --stat'"
+msgstr "和 '-p --stat' �義"
+
+#: diff.c:5406
+msgid "machine friendly --stat"
+msgstr "機器�好的 --stat"
+
+#: diff.c:5409
+msgid "output only the last line of --stat"
+msgstr "�輸出 --stat 的最後一行"
+
+#: diff.c:5411 diff.c:5419
+msgid "<param1,param2>..."
+msgstr "<�數1,�數2>..."
+
+#: diff.c:5412
+msgid ""
+"output the distribution of relative amount of changes for each sub-directory"
+msgstr "輸出�個�目錄相�變更的分布"
+
+#: diff.c:5416
+msgid "synonym for --dirstat=cumulative"
+msgstr "和 --dirstat=cumulative �義"
+
+#: diff.c:5420
+msgid "synonym for --dirstat=files,param1,param2..."
+msgstr "是 --dirstat=files,param1,param2... 的�義詞"
+
+#: diff.c:5424
+msgid "warn if changes introduce conflict markers or whitespace errors"
+msgstr "如果變更中引入��定界符或空白錯誤，給出警告"
+
+#: diff.c:5427
+msgid "condensed summary such as creations, renames and mode changes"
+msgstr "精簡摘�，例如建立��新命�和模�變更"
+
+#: diff.c:5430
+msgid "show only names of changed files"
+msgstr "�顯示變更檔案的檔案�"
+
+#: diff.c:5433
+msgid "show only names and status of changed files"
+msgstr "�顯示變更檔案的檔案�和狀態"
+
+#: diff.c:5435
+msgid "<width>[,<name-width>[,<count>]]"
+msgstr "<寬度>[,<檔案�寬度>[,<次數>]]"
+
+#: diff.c:5436
+msgid "generate diffstat"
+msgstr "生�差異統計（diffstat）"
+
+#: diff.c:5438 diff.c:5441 diff.c:5444
+msgid "<width>"
+msgstr "<寬度>"
+
+#: diff.c:5439
+msgid "generate diffstat with a given width"
+msgstr "使用�供的長度生�差異統計"
+
+#: diff.c:5442
+msgid "generate diffstat with a given name width"
+msgstr "使用�供的檔案�長度生�差異統計"
+
+#: diff.c:5445
+msgid "generate diffstat with a given graph width"
+msgstr "使用�供的圖形長度生�差異統計"
+
+#: diff.c:5447
+msgid "<count>"
+msgstr "<次數>"
+
+#: diff.c:5448
+msgid "generate diffstat with limited lines"
+msgstr "生�有�行數的差異統計"
+
+#: diff.c:5451
+msgid "generate compact summary in diffstat"
+msgstr "生�差異統計的簡潔摘�"
+
+#: diff.c:5454
+msgid "output a binary diff that can be applied"
+msgstr "輸出一個�以套用的二進�差異"
+
+#: diff.c:5457
+msgid "show full pre- and post-image object names on the \"index\" lines"
+msgstr "在 \"index\" 行顯示完整的�後物件�稱"
+
+#: diff.c:5459
+msgid "show colored diff"
+msgstr "顯示帶�色的差異"
+
+#: diff.c:5460
+msgid "<kind>"
+msgstr "<é¡žåž‹>"
+
+#: diff.c:5461
+msgid ""
+"highlight whitespace errors in the 'context', 'old' or 'new' lines in the "
+"diff"
+msgstr "�於差異中的上下文�舊的和新的行，加亮顯示錯誤的空白字元"
+
+#: diff.c:5464
+msgid ""
+"do not munge pathnames and use NULs as output field terminators in --raw or "
+"--numstat"
+msgstr ""
+"在 --raw 或者 --numstat 中，��路徑字元轉檔並使用 NUL 字元�為輸出欄�的分隔"
+"符"
+
+#: diff.c:5467 diff.c:5470 diff.c:5473 diff.c:5582
+msgid "<prefix>"
+msgstr "<�綴>"
+
+#: diff.c:5468
+msgid "show the given source prefix instead of \"a/\""
+msgstr "顯示�供的��綴�代 \"a/\""
+
+#: diff.c:5471
+msgid "show the given destination prefix instead of \"b/\""
+msgstr "顯示�供的目標�綴�代 \"b/\""
+
+#: diff.c:5474
+msgid "prepend an additional prefix to every line of output"
+msgstr "輸出的�一行附加�綴"
+
+#: diff.c:5477
+msgid "do not show any source or destination prefix"
+msgstr "�顯示任何�和目標�綴"
+
+#: diff.c:5480
+msgid "show context between diff hunks up to the specified number of lines"
+msgstr "顯示指定行數的差異�塊間的上下文"
+
+#: diff.c:5484 diff.c:5489 diff.c:5494
+msgid "<char>"
+msgstr "<å­—å…ƒ>"
+
+#: diff.c:5485
+msgid "specify the character to indicate a new line instead of '+'"
+msgstr "指定一個字元�代 '+' 來表示新的一行"
+
+#: diff.c:5490
+msgid "specify the character to indicate an old line instead of '-'"
+msgstr "指定一個字元�代 '-' 來表示舊的一行"
+
+#: diff.c:5495
+msgid "specify the character to indicate a context instead of ' '"
+msgstr "指定一個字元�代 ' ' 來表示一行上下文"
+
+#: diff.c:5498
+msgid "Diff rename options"
+msgstr "差異�新命��項"
+
+#: diff.c:5499
+msgid "<n>[/<m>]"
+msgstr "<n>[/<m>]"
+
+#: diff.c:5500
+msgid "break complete rewrite changes into pairs of delete and create"
+msgstr "將完全�寫的變更打破為��的刪除和建立"
+
+#: diff.c:5504
+msgid "detect renames"
+msgstr "檢測�新命�"
+
+#: diff.c:5508
+msgid "omit the preimage for deletes"
+msgstr "�略刪除變更的差異輸出"
+
+#: diff.c:5511
+msgid "detect copies"
+msgstr "檢測複製"
+
+#: diff.c:5515
+msgid "use unmodified files as source to find copies"
+msgstr "使用未修改的檔案�為發�複製的�"
+
+#: diff.c:5517
+msgid "disable rename detection"
+msgstr "�用�新命��測"
+
+#: diff.c:5520
+msgid "use empty blobs as rename source"
+msgstr "使用空的資料物件�為�新命�的�"
+
+#: diff.c:5522
+msgid "continue listing the history of a file beyond renames"
+msgstr "繼續列出檔案�新命�以外的歷�記錄"
+
+#: diff.c:5525
+msgid ""
+"prevent rename/copy detection if the number of rename/copy targets exceeds "
+"given limit"
+msgstr "如果�新命�/複製目標超��供的�制，�止�新命�/複製檢測"
+
+#: diff.c:5527
+msgid "Diff algorithm options"
+msgstr "差異演算法�項"
+
+#: diff.c:5529
+msgid "produce the smallest possible diff"
+msgstr "生�儘�能�的差異"
+
+#: diff.c:5532
+msgid "ignore whitespace when comparing lines"
+msgstr "行比較時忽略空白字元"
+
+#: diff.c:5535
+msgid "ignore changes in amount of whitespace"
+msgstr "忽略空白字元的變更"
+
+#: diff.c:5538
+msgid "ignore changes in whitespace at EOL"
+msgstr "忽略行尾的空白字元變更"
+
+#: diff.c:5541
+msgid "ignore carrier-return at the end of line"
+msgstr "忽略行尾的Enter符（CR）"
+
+#: diff.c:5544
+msgid "ignore changes whose lines are all blank"
+msgstr "忽略整行都是空白的變更"
+
+#: diff.c:5546 diff.c:5568 diff.c:5571 diff.c:5616
+msgid "<regex>"
+msgstr "<正則>"
+
+#: diff.c:5547
+msgid "ignore changes whose all lines match <regex>"
+msgstr "忽略整行符� <regex> 的變更"
+
+#: diff.c:5550
+msgid "heuristic to shift diff hunk boundaries for easy reading"
+msgstr "啟發�轉�差異邊界以便閱讀"
+
+#: diff.c:5553
+msgid "generate diff using the \"patience diff\" algorithm"
+msgstr "使用 \"patience diff\" 演算法生�差異"
+
+#: diff.c:5557
+msgid "generate diff using the \"histogram diff\" algorithm"
+msgstr "使用 \"histogram diff\" 演算法生�差異"
+
+#: diff.c:5559
+msgid "<algorithm>"
+msgstr "<演算法>"
+
+#: diff.c:5560
+msgid "choose a diff algorithm"
+msgstr "�擇一個差異演算法"
+
+#: diff.c:5562
+msgid "<text>"
+msgstr "<文字>"
+
+#: diff.c:5563
+msgid "generate diff using the \"anchored diff\" algorithm"
+msgstr "使用 \"anchored diff\" 演算法生�差異"
+
+#: diff.c:5565 diff.c:5574 diff.c:5577
+msgid "<mode>"
+msgstr "<模�>"
+
+#: diff.c:5566
+msgid "show word diff, using <mode> to delimit changed words"
+msgstr "顯示單詞差異，使用 <模�> 分隔變更的單詞"
+
+#: diff.c:5569
+msgid "use <regex> to decide what a word is"
+msgstr "使用 <正�表示�> 確定何為一個詞"
+
+#: diff.c:5572
+msgid "equivalent to --word-diff=color --word-diff-regex=<regex>"
+msgstr "相當於 --word-diff=color --word-diff-regex=<正則>"
+
+#: diff.c:5575
+msgid "moved lines of code are colored differently"
+msgstr "移動的程�碼行用��方�著色"
+
+#: diff.c:5578
+msgid "how white spaces are ignored in --color-moved"
+msgstr "在 --color-moved 下如何忽略空白字元"
+
+#: diff.c:5581
+msgid "Other diff options"
+msgstr "其它差異�項"
+
+#: diff.c:5583
+msgid "when run from subdir, exclude changes outside and show relative paths"
+msgstr "當從�目錄執行，排除目錄之外的變更並顯示相�路徑"
+
+#: diff.c:5587
+msgid "treat all files as text"
+msgstr "把所有檔案當�文字處�"
+
+#: diff.c:5589
+msgid "swap two inputs, reverse the diff"
+msgstr "交�兩個輸入，�轉差異"
+
+#: diff.c:5591
+msgid "exit with 1 if there were differences, 0 otherwise"
+msgstr "有差異時離開碼為 1，�則為 0"
+
+#: diff.c:5593
+msgid "disable all output of the program"
+msgstr "�用本程�的所有輸出"
+
+#: diff.c:5595
+msgid "allow an external diff helper to be executed"
+msgstr "�許執行一個外部的差異�助工具"
+
+#: diff.c:5597
+msgid "run external text conversion filters when comparing binary files"
+msgstr "當比較二進�檔案時，執行外部的文字轉��濾器"
+
+#: diff.c:5599
+msgid "<when>"
+msgstr "<何時>"
+
+#: diff.c:5600
+msgid "ignore changes to submodules in the diff generation"
+msgstr "在生�差異時，忽略�模組的更改"
+
+#: diff.c:5603
+msgid "<format>"
+msgstr "<格�>"
+
+#: diff.c:5604
+msgid "specify how differences in submodules are shown"
+msgstr "指定�模組的差異如何顯示"
+
+#: diff.c:5608
+msgid "hide 'git add -N' entries from the index"
+msgstr "隱�索引中 'git add -N' �目"
+
+#: diff.c:5611
+msgid "treat 'git add -N' entries as real in the index"
+msgstr "將索引中 'git add -N' �目當�真實的"
+
+#: diff.c:5613
+msgid "<string>"
+msgstr "<字串>"
+
+#: diff.c:5614
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"string"
+msgstr "尋找改變了指定字串出�次數的差異"
+
+#: diff.c:5617
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"regex"
+msgstr "尋找改變指定正則符�出�次數的差異"
+
+#: diff.c:5620
+msgid "show all changes in the changeset with -S or -G"
+msgstr "顯示使用 -S 或 -G 的變更集的所有變更"
+
+#: diff.c:5623
+msgid "treat <string> in -S as extended POSIX regular expression"
+msgstr "將 -S 的 <string> 當�擴展的 POSIX 正�表示�"
+
+#: diff.c:5626
+msgid "control the order in which files appear in the output"
+msgstr "控制輸出中的檔案顯示順�"
+
+#: diff.c:5627 diff.c:5630
+msgid "<path>"
+msgstr "<路徑>"
+
+#: diff.c:5628
+msgid "show the change in the specified path first"
+msgstr "先顯示指定路徑的變更"
+
+#: diff.c:5631
+msgid "skip the output to the specified path"
+msgstr "略�輸出至指定路徑"
+
+#: diff.c:5633
+msgid "<object-id>"
+msgstr "<物件 ID>"
+
+#: diff.c:5634
+msgid ""
+"look for differences that change the number of occurrences of the specified "
+"object"
+msgstr "尋找改變指定物件出�次數的差異"
+
+#: diff.c:5636
+msgid "[(A|C|D|M|R|T|U|X|B)...[*]]"
+msgstr "[(A|C|D|M|R|T|U|X|B)...[*]]"
+
+#: diff.c:5637
+msgid "select files by diff type"
+msgstr "��差異類型�擇檔案"
+
+#: diff.c:5639
+msgid "<file>"
+msgstr "<檔案>"
+
+#: diff.c:5640
+msgid "Output to a specific file"
+msgstr "輸出到一個指定的檔案"
+
+#: diff.c:6298
+msgid "exhaustive rename detection was skipped due to too many files."
+msgstr "因為檔案太多，已略�詳細�新命��測。"
+
+#: diff.c:6301
+msgid "only found copies from modified paths due to too many files."
+msgstr "因為檔案太多，�在修改的路徑中尋找複製。"
+
+#: diff.c:6304
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr "您�能想�將變數 %s 設定為至少 %d 並�次執行此指令。"
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "讀�排�檔案 '%s' 失敗"
+
+#: diffcore-rename.c:1514
+msgid "Performing inexact rename detection"
+msgstr "正在進行�精確的�新命��測"
+
+#: diffcore-rotate.c:29
+#, c-format
+msgid "No such path '%s' in the diff"
+msgstr "diff 中沒有「%s�路徑"
+
+#: dir.c:593
+#, c-format
+msgid "pathspec '%s' did not match any file(s) known to git"
+msgstr "路徑�格 '%s' 未符�任何 git 已知檔案"
+
+#: dir.c:733 dir.c:762 dir.c:775
+#, c-format
+msgid "unrecognized pattern: '%s'"
+msgstr "無法識別樣�：「%s�"
+
+#: dir.c:790 dir.c:804
+#, c-format
+msgid "unrecognized negative pattern: '%s'"
+msgstr "無法識別��模�：「%s�"
+
+#: dir.c:820
+#, c-format
+msgid "your sparse-checkout file may have issues: pattern '%s' is repeated"
+msgstr "您的稀�簽出檔案�能有�題：「%s�樣��複"
+
+#: dir.c:830
+msgid "disabling cone pattern matching"
+msgstr "�用 cone 樣�符�模�"
+
+#: dir.c:1214
+#, c-format
+msgid "cannot use %s as an exclude file"
+msgstr "�能將 %s 用作排除檔案"
+
+#: dir.c:2351
+#, c-format
+msgid "could not open directory '%s'"
+msgstr "�能開啟目錄 '%s'"
+
+#: dir.c:2653
+msgid "failed to get kernel name and information"
+msgstr "無法�得核心�稱和訊�"
+
+#: dir.c:2777
+msgid "untracked cache is disabled on this system or location"
+msgstr "快�未追蹤檔案在本系統或�置中被�用"
+
+#: dir.c:3610
+#, c-format
+msgid "index file corrupt in repo %s"
+msgstr "版本庫 %s 中的索引檔案�壞"
+
+#: dir.c:3657 dir.c:3662
+#, c-format
+msgid "could not create directories for %s"
+msgstr "�能為 %s 建立目錄"
+
+#: dir.c:3691
+#, c-format
+msgid "could not migrate git directory from '%s' to '%s'"
+msgstr "�能從 '%s' �移 git 目錄到 '%s'"
+
+#: editor.c:74
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "�示：等待您的編輯器關閉檔案...%c"
+
+#: entry.c:176
+msgid "Filtering content"
+msgstr "�濾內容"
+
+#: entry.c:497
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "�能�檔案 '%s' 呼� stat"
+
+#: environment.c:152
+#, c-format
+msgid "bad git namespace path \"%s\""
+msgstr "錯誤的 git �字空間路徑 \"%s\""
+
+#: environment.c:334
+#, 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
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack：應為 shallow 列表"
+
+#: fetch-pack.c:185
+msgid "git fetch-pack: expected a flush packet after shallow list"
+msgstr "git fetch-pack：在淺複製列表之後期望一個 flush 包"
+
+#: fetch-pack.c:196
+msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
+msgstr "git fetch-pack：期望 ACK/NAK，�得到 flush 包"
+
+#: fetch-pack.c:216
+#, c-format
+msgid "git fetch-pack: expected ACK/NAK, got '%s'"
+msgstr "git fetch-pack：應為 ACK/NAK，�得到 '%s'"
+
+#: fetch-pack.c:227
+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
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "無效的 shallow 訊�：%s"
+
+#: fetch-pack.c:389 fetch-pack.c:1429
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "無效的 unshallow 訊�：%s"
+
+#: fetch-pack.c:391 fetch-pack.c:1431
+#, c-format
+msgid "object not found: %s"
+msgstr "物件未找到：%s"
+
+#: fetch-pack.c:394 fetch-pack.c:1434
+#, c-format
+msgid "error in object: %s"
+msgstr "物件中發生錯誤：%s"
+
+#: fetch-pack.c:396 fetch-pack.c:1436
+#, c-format
+msgid "no shallow found: %s"
+msgstr "未發� shallow：%s"
+
+#: fetch-pack.c:399 fetch-pack.c:1440
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "應為 shallow/unshallow，�得到 %s"
+
+#: fetch-pack.c:439
+#, c-format
+msgid "got %s %d %s"
+msgstr "得到 %s %d %s"
+
+#: fetch-pack.c:456
+#, c-format
+msgid "invalid commit %s"
+msgstr "無效�交 %s"
+
+#: fetch-pack.c:487
+msgid "giving up"
+msgstr "放棄"
+
+#: fetch-pack.c:500 progress.c:339
+msgid "done"
+msgstr "完�"
+
+#: fetch-pack.c:512
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "得到 %s (%d) %s"
+
+#: fetch-pack.c:548
+#, c-format
+msgid "Marking %s as complete"
+msgstr "標記 %s 為完�"
+
+#: fetch-pack.c:763
+#, c-format
+msgid "already have %s (%s)"
+msgstr "已經有 %s（%s）"
+
+#: fetch-pack.c:849
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack：無法�生 sideband 多路輸出"
+
+#: fetch-pack.c:857
+msgid "protocol error: bad pack header"
+msgstr "�定錯誤：壞的包頭"
+
+#: fetch-pack.c:951
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack：無法 fork %s 處�程�"
+
+#: fetch-pack.c:957
+msgid "fetch-pack: invalid index-pack output"
+msgstr "fetch-pack：無效的 index-pack 輸出"
+
+#: fetch-pack.c:974
+#, c-format
+msgid "%s failed"
+msgstr "%s 失敗"
+
+#: fetch-pack.c:976
+msgid "error in sideband demultiplexer"
+msgstr "sideband 多路輸出發生錯誤"
+
+#: fetch-pack.c:1019
+#, 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: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 "伺�器支� %s"
+
+#: fetch-pack.c:1029
+msgid "Server does not support shallow clients"
+msgstr "伺�器�支� shallow 用戶端"
+
+#: fetch-pack.c:1089
+msgid "Server does not support --shallow-since"
+msgstr "伺�器�支� --shallow-since"
+
+#: fetch-pack.c:1094
+msgid "Server does not support --shallow-exclude"
+msgstr "伺�器�支� --shallow-exclude"
+
+#: fetch-pack.c:1098
+msgid "Server does not support --deepen"
+msgstr "伺�器�支� --deepen"
+
+#: fetch-pack.c:1100
+msgid "Server does not support this repository's object format"
+msgstr "伺�器�支�此版本庫的物件格�"
+
+#: fetch-pack.c:1113
+msgid "no common commits"
+msgstr "沒有共�的�交"
+
+#: fetch-pack.c:1122 fetch-pack.c:1469 builtin/clone.c:1238
+msgid "source repository is shallow, reject to clone."
+msgstr "來�版本庫是淺版本庫 (shallow)。拒絕複製。"
+
+#: fetch-pack.c:1128 fetch-pack.c:1660
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack：�得失敗。"
+
+#: fetch-pack.c:1242
+#, c-format
+msgid "mismatched algorithms: client %s; server %s"
+msgstr "算法�一致：用戶端 %s；伺�器 %s"
+
+#: fetch-pack.c:1246
+#, c-format
+msgid "the server does not support algorithm '%s'"
+msgstr "伺�器�支�「%s�算法"
+
+#: fetch-pack.c:1279
+msgid "Server does not support shallow requests"
+msgstr "伺�器�支� shallow 請求"
+
+#: fetch-pack.c:1286
+msgid "Server supports filter"
+msgstr "伺�器支� filter"
+
+#: fetch-pack.c:1329 fetch-pack.c:2043
+msgid "unable to write request to remote"
+msgstr "無法將請求寫到�端"
+
+#: fetch-pack.c:1347
+#, c-format
+msgid "error reading section header '%s'"
+msgstr "讀�節標題 '%s' 發生錯誤"
+
+#: fetch-pack.c:1353
+#, c-format
+msgid "expected '%s', received '%s'"
+msgstr "�期 '%s'，得到 '%s'"
+
+#: fetch-pack.c:1387
+#, c-format
+msgid "unexpected acknowledgment line: '%s'"
+msgstr "�外的確�行：'%s'"
+
+#: fetch-pack.c:1392
+#, c-format
+msgid "error processing acks: %d"
+msgstr "處� ack 發生錯誤：%d"
+
+#: fetch-pack.c:1402
+msgid "expected packfile to be sent after 'ready'"
+msgstr "�期在 'ready' 之後傳� packfile"
+
+#: fetch-pack.c:1404
+msgid "expected no other sections to be sent after no 'ready'"
+msgstr "在沒有 'ready' �應該傳�其它�節"
+
+#: fetch-pack.c:1445
+#, c-format
+msgid "error processing shallow info: %d"
+msgstr "處�淺複製訊�發生錯誤：%d"
+
+#: fetch-pack.c:1494
+#, c-format
+msgid "expected wanted-ref, got '%s'"
+msgstr "�期 wanted-ref，得到 '%s'"
+
+#: fetch-pack.c:1499
+#, c-format
+msgid "unexpected wanted-ref: '%s'"
+msgstr "�外的 wanted-ref：'%s'"
+
+#: fetch-pack.c:1504
+#, c-format
+msgid "error processing wanted refs: %d"
+msgstr "處���得的引用發生錯誤：%d"
+
+#: fetch-pack.c:1534
+msgid "git fetch-pack: expected response end packet"
+msgstr "git fetch-pack: �期�有回應���包"
+
+#: fetch-pack.c:1939
+msgid "no matching remote head"
+msgstr "沒有符�的�端分支"
+
+#: fetch-pack.c:1962 builtin/clone.c:697
+msgid "remote did not send all necessary objects"
+msgstr "�端沒有傳�所有必需的物件"
+
+#: fetch-pack.c:2065
+msgid "unexpected 'ready' from remote"
+msgstr "從�端收到��期的 ‘ready’"
+
+#: fetch-pack.c:2088
+#, c-format
+msgid "no such remote ref %s"
+msgstr "沒有這樣的�端引用 %s"
+
+#: fetch-pack.c:2091
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "伺�器��許請求未公開的物件 %s"
+
+#: gpg-interface.c:273
+msgid "could not create temporary file"
+msgstr "�能建立暫存檔"
+
+#: gpg-interface.c:276
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "無法將分離�簽�寫入 '%s'"
+
+#: gpg-interface.c:470
+msgid "gpg failed to sign the data"
+msgstr "gpg 無法為資料簽�"
+
+#: graph.c:98
+#, c-format
+msgid "ignored invalid color '%.*s' in log.graphColors"
+msgstr "已忽略 log.graphColors 中無效的 “%.*s� 色彩"
+
+#: grep.c:531
+msgid ""
+"given pattern contains NULL byte (via -f <file>). This is only supported "
+"with -P under PCRE v2"
+msgstr ""
+"�供的模�包� NULL 字元（通� -f <檔案> �數）。�有 PCRE v2 下的 -P 支�此"
+"功能"
+
+#: grep.c:1895
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s'：無法讀� %s"
+
+#: 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 "� '%s' 呼� stat 失敗"
+
+#: grep.c:1923
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s'：讀��完整"
+
+#: help.c:23
+msgid "start a working area (see also: git help tutorial)"
+msgstr "開始一個工作�（�見：git help tutorial）"
+
+#: help.c:24
+msgid "work on the current change (see also: git help everyday)"
+msgstr "在目�變更上工作（�見：git help everyday）"
+
+#: help.c:25
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "檢查歷�和狀態（�見：git help revisions）"
+
+#: help.c:26
+msgid "grow, mark and tweak your common history"
+msgstr "擴展�標記和調校您的歷�記錄"
+
+#: help.c:27
+msgid "collaborate (see also: git help workflows)"
+msgstr "��（�見：git help workflows）"
+
+#: help.c:31
+msgid "Main Porcelain Commands"
+msgstr "主�的上層指令"
+
+#: help.c:32
+msgid "Ancillary Commands / Manipulators"
+msgstr "輔助指令/動作者"
+
+#: help.c:33
+msgid "Ancillary Commands / Interrogators"
+msgstr "輔助指令/詢�者"
+
+#: help.c:34
+msgid "Interacting with Others"
+msgstr "與其它系統互動"
+
+#: help.c:35
+msgid "Low-level Commands / Manipulators"
+msgstr "低級指令/動作者"
+
+#: help.c:36
+msgid "Low-level Commands / Interrogators"
+msgstr "低級指令/詢�者"
+
+#: help.c:37
+msgid "Low-level Commands / Syncing Repositories"
+msgstr "低級指令 / �步版本庫"
+
+#: help.c:38
+msgid "Low-level Commands / Internal Helpers"
+msgstr "低級指令/內部�助工具"
+
+#: help.c:300
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "在 '%s' 下�用的 git 指令"
+
+#: help.c:307
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "在 $PATH 路徑中的其他地方�用的 git 指令"
+
+#: help.c:316
+msgid "These are common Git commands used in various situations:"
+msgstr "這些是�種場�常見的 Git 指令："
+
+#: help.c:365 git.c:100
+#, c-format
+msgid "unsupported command listing type '%s'"
+msgstr "�支�的指令列表類型 '%s'"
+
+#: help.c:405
+msgid "The Git concept guides are:"
+msgstr "Git 概念嚮導有："
+
+#: help.c:429
+msgid "See 'git help <command>' to read about a specific subcommand"
+msgstr "執行　'git help <command>' 來檢視特定�指令"
+
+#: help.c:434
+msgid "External commands"
+msgstr "外部指令"
+
+#: help.c:449
+msgid "Command aliases"
+msgstr "指令別�"
+
+#: help.c:527
+#, 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' �是一個 git 指令，但�無法執行。\n"
+"�能是 git-%s ��？"
+
+#: help.c:543 help.c:631
+#, c-format
+msgid "git: '%s' is not a git command. See 'git --help'."
+msgstr "git：'%s' �是一個 git 指令。�見 'git --help'。"
+
+#: help.c:591
+msgid "Uh oh. Your system reports no Git commands at all."
+msgstr "唉呀，您的系統中未發� Git 指令。"
+
+#: help.c:613
+#, c-format
+msgid "WARNING: You called a Git command named '%s', which does not exist."
+msgstr "警告：您執行了一個並�存在的 Git 指令 '%s'。"
+
+#: help.c:618
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "�定你想�的是 '%s' 並繼續。"
+
+#: help.c:623
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "�定你想�的是 '%2$s'，在 %1$0.1f 秒�後繼續。"
+
+#: help.c:635
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"最類似的指令有"
+
+#: help.c:675
+msgid "git version [<options>]"
+msgstr "git version [<�項>]"
+
+#: help.c:730
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s：%s - %s"
+
+#: help.c:734
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"您指的是這個嗎？"
+
+#: ident.c:353
+msgid "Author identity unknown\n"
+msgstr "作者身分未知\n"
+
+#: ident.c:356
+msgid "Committer identity unknown\n"
+msgstr "�交者身分未知\n"
+
+#: ident.c:362
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** 請告訴我你是誰。\n"
+"\n"
+"執行\n"
+"\n"
+"  git config --global user.email \"you@example.com\"\n"
+"  git config --global user.name \"Your Name\"\n"
+"\n"
+"來設定您帳號的�設身份標記。\n"
+"如果僅在本版本庫設定身份標記，則�略 --global �數。\n"
+
+#: ident.c:397
+msgid "no email was given and auto-detection is disabled"
+msgstr "未�供信件��且自動�測被�用"
+
+#: ident.c:402
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "無法自動�測信件��（得到 '%s'）"
+
+#: ident.c:419
+msgid "no name was given and auto-detection is disabled"
+msgstr "未�供姓�且自動�測被�用"
+
+#: ident.c:425
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "無法自動�測姓�（得到 '%s'）"
+
+#: ident.c:433
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "��許空的姓�（�於 <%s>）"
+
+#: ident.c:439
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "姓�中僅包��用字元：%s"
+
+#: ident.c:454 builtin/commit.c:647
+#, c-format
+msgid "invalid date format: %s"
+msgstr "無效的日期格�：%s"
+
+#: list-objects-filter-options.c:83
+msgid "expected 'tree:<depth>'"
+msgstr "期望 'tree:<深度>'"
+
+#: list-objects-filter-options.c:98
+msgid "sparse:path filters support has been dropped"
+msgstr "sparse:path �濾器支�已被刪除"
+
+#: list-objects-filter-options.c:105
+#, c-format
+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'"
+
+#: list-objects-filter-options.c:140
+#, c-format
+msgid "must escape char in sub-filter-spec: '%c'"
+msgstr "必須� sub-filter-spec 中的字元進行轉義：'%c'"
+
+#: list-objects-filter-options.c:182
+msgid "expected something after combine:"
+msgstr "期望在組�後有一些�西："
+
+#: list-objects-filter-options.c:264
+msgid "multiple filter-specs cannot be combined"
+msgstr "�能混用多種�濾�格"
+
+#: list-objects-filter-options.c:376
+msgid "unable to upgrade repository format to support partial clone"
+msgstr "無法�級版本庫格�，以致�支�部分複製"
+
+#: list-objects-filter.c:532
+#, c-format
+msgid "unable to access sparse blob in '%s'"
+msgstr "�能存� '%s' 中的稀�資料物件"
+
+#: list-objects-filter.c:535
+#, c-format
+msgid "unable to parse sparse filter data in %s"
+msgstr "無法解� %s 中的稀��濾器資料"
+
+#: list-objects.c:127
+#, c-format
+msgid "entry '%s' in tree %s has tree mode, but is not a tree"
+msgstr "樹 %2$s 中的�目 '%1$s' 具有樹的屬性，但�是一個樹狀物件"
+
+#: list-objects.c:140
+#, c-format
+msgid "entry '%s' in tree %s has blob mode, but is not a blob"
+msgstr "樹 %2$s 中的�目 '%1$s' 具有資料物件的屬性，但�是一個資料物件"
+
+#: list-objects.c:398
+#, c-format
+msgid "unable to load root tree for commit %s"
+msgstr "無法為�交 %s 載入根樹"
+
+#: lockfile.c:152
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"無法建立 '%s.lock'：%s。\n"
+"\n"
+"似乎�外一個 git 進程在這個版本庫中執行，例如：'git commit' 指令打\n"
+"開了一個編輯器。請確�所有進程都已經關閉然後�試。如果�然報錯，\n"
+"�能之�有一個 git 進程在這個版本庫中異常離開：\n"
+"手動刪除這個檔案�繼續。"
+
+#: lockfile.c:160
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "�能建立 '%s.lock'：%s"
+
+#: ls-refs.c:37
+#, c-format
+msgid "invalid value '%s' for lsrefs.unborn"
+msgstr "lsrefs.unborn 的值「%s�無效"
+
+#: ls-refs.c:167
+msgid "expected flush after ls-refs arguments"
+msgstr "在 ls-refs 引數之後應該有一個 flush 包"
+
+#: mailinfo.c:1050
+msgid "quoted CRLF detected"
+msgstr "�測到由�列�字元 (quoted) 所組�的 CRLF"
+
+#: mailinfo.c:1254 builtin/am.c:176 builtin/mailinfo.c:46
+#, c-format
+msgid "bad action '%s' for '%s'"
+msgstr "「%s�動作�「%s�無效"
+
+#: merge-ort.c:1569 merge-recursive.c:1201
+#, c-format
+msgid "Failed to merge submodule %s (not checked out)"
+msgstr "無法�併�模組 %s （沒有簽出）"
+
+#: merge-ort.c:1578 merge-recursive.c:1208
+#, c-format
+msgid "Failed to merge submodule %s (commits not present)"
+msgstr "無法�併�模組 %s（�交�存在）"
+
+#: merge-ort.c:1587 merge-recursive.c:1215
+#, c-format
+msgid "Failed to merge submodule %s (commits don't follow merge-base)"
+msgstr "無法�併�模組 %s （�交未跟隨�併基礎）"
+
+#: merge-ort.c:1597 merge-ort.c:1604
+#, c-format
+msgid "Note: Fast-forwarding submodule %s to %s"
+msgstr "注�：正在將 %s �模組快轉到 %s"
+
+#: merge-ort.c:1625
+#, c-format
+msgid "Failed to merge submodule %s"
+msgstr "無法�併 %s �模組"
+
+#: merge-ort.c:1632
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but a possible merge resolution exists:\n"
+"%s\n"
+msgstr ""
+"無法�併 %s �模組，但有找到一個�行的�併方案：\n"
+"%s\n"
+
+#: 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 ""
+"如果這個正確，將其新增到索引，例如使用指令：\n"
+"\n"
+"  git update-index --cacheinfo 160000 %s \"%s\"\n"
+"\n"
+"以接�此建議。\n"
+
+#: merge-ort.c:1649
+#, c-format
+msgid ""
+"Failed to merge submodule %s, but multiple possible merges exist:\n"
+"%s"
+msgstr ""
+"無法�併 %s �模組，但有找到幾個�行的�併方案：\n"
+"%s"
+
+#: merge-ort.c:1868 merge-recursive.c:1358
+msgid "Failed to execute internal merge"
+msgstr "無法執行內部�併"
+
+#: merge-ort.c:1873 merge-recursive.c:1363
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "�能新增 %s 至物件庫"
+
+#: merge-ort.c:1880 merge-recursive.c:1396
+#, c-format
+msgid "Auto-merging %s"
+msgstr "自動�併 %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 ""
+"��（隱�目錄�新命�）：處於隱�目錄�新命�的�存檔案/目錄 %s，將以下路徑"
+"放在：%s。"
+
+#: 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 ""
+"��（隱�目錄�新命�）：無法映射一個以上路徑到 %s，隱�目錄�新命�嘗試將這"
+"些路徑放置於此：%s"
+
+#: 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 ""
+"��（分割的目錄�新命�）：未知 %s �新命�的�置。它被�新命�為多個其他目"
+"錄，但沒有目的地�得��檔案。"
+
+#: 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 "警告：��套用 %s -> %s 的�新命�到 %s，因為 %s 本身已被�新命�。"
+
+#: 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 ""
+"路徑已更新：%s 新增到 %s，�於一個被�新命�到 %s 的目錄中，將其移動到 %s。"
+
+#: 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 ""
+"路徑已更新：%1$s �新命�為 %3$s 中的 %2$s，而該目錄被�新命�到 %4$s 中，將"
+"其移動到 %5$s。"
+
+#: 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 ""
+"��（檔案�置）：%s 新增到 %s，�於一個被�新命�為 %s 的目錄中，建議將其移"
+"動到 %s。"
+
+#: 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 ""
+"��（檔案�置）：%1$s �新命�為 %3$s 中的 %2$s，而該目錄被�新命�到 %4$s "
+"中，建議將其移動到 %5$s。"
+
+#: merge-ort.c:2569
+#, 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: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 ""
+"��（�新命�陷入相撞）：%s -> %s 這個�新命�有內容��並與其他路徑相撞，�"
+"能會因此出�巢狀��標記。"
+
+#: 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 ""
+"��（�新命�/刪除）：%1$s 已�新命�為 %3$s 中的 %2$s �在 %4$s 中被刪除。"
+
+#: merge-ort.c:3182 merge-recursive.c:3008
+#, c-format
+msgid "cannot read object %s"
+msgstr "�能讀�物件 %s"
+
+#: merge-ort.c:3185 merge-recursive.c:3011
+#, c-format
+msgid "object %s is not a blob"
+msgstr "物件 %s �是一個資料物件"
+
+#: merge-ort.c:3613
+#, 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: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 ""
+"��（類型有異）：兩方的 %s 類型皆��。已經�新命�這兩個來�，這樣就�以分"
+"別記錄這兩方檔案。"
+
+#: 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 ""
+"��（類型有異）：兩方的 %s 類型皆��。已經�新命�其中一個來�，這樣就�以"
+"分別記錄這兩方檔案。"
+
+#: merge-ort.c:3796 merge-recursive.c:3087
+msgid "content"
+msgstr "內容"
+
+#: merge-ort.c:3798 merge-recursive.c:3091
+msgid "add/add"
+msgstr "新增/新增"
+
+#: merge-ort.c:3800 merge-recursive.c:3136
+msgid "submodule"
+msgstr "�模組"
+
+#: merge-ort.c:3802 merge-recursive.c:3137
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "��（%s）：�併��於 %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 ""
+"��（修改/刪除）：%1$s 已在 %2$s 刪除和在 %3$s 修改。%5$s 的 %4$s 版本留在樹"
+"上。"
+
+#: 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 "註：%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:4487
+#, c-format
+msgid "collecting merge info failed for trees %s, %s, %s"
+msgstr "%s, %s, %s 樹的�併資訊收集失敗"
+
+#: 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 ""
+"您�下列檔案的本機修改將被�併動作覆蓋：\n"
+"  %s"
+
+#: merge-ort-wrappers.c:33 merge-recursive.c:3468 builtin/merge.c:402
+msgid "Already up to date."
+msgstr "已經是最新的。"
+
+#: merge-recursive.c:352
+msgid "(bad commit)\n"
+msgstr "（壞�交）\n"
+
+#: merge-recursive.c:375
+#, c-format
+msgid "add_cacheinfo failed for path '%s'; merge aborting."
+msgstr "add_cacheinfo �路徑 '%s' 執行失敗，�併終止。"
+
+#: merge-recursive.c:384
+#, c-format
+msgid "add_cacheinfo failed to refresh for path '%s'; merge aborting."
+msgstr "add_cacheinfo 無法�新整�路徑 '%s'，�併終止。"
+
+#: merge-recursive.c:872
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "建立路徑 '%s'%s 失敗"
+
+#: merge-recursive.c:883
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "刪除 %s 以便為�目錄留出空間\n"
+
+#: merge-recursive.c:897 merge-recursive.c:916
+msgid ": perhaps a D/F conflict?"
+msgstr "：�能是一個目錄/檔案��？"
+
+#: merge-recursive.c:906
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "拒絕�棄 '%s' 中的未追蹤檔案"
+
+#: merge-recursive.c:947 builtin/cat-file.c:41
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "�能讀�物件 %s '%s'"
+
+#: merge-recursive.c:952
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "%s '%s' 應為資料物件"
+
+#: merge-recursive.c:977
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "開啟 '%s' 失敗：%s"
+
+#: merge-recursive.c:988
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "建立符號連� '%s' 失敗：%s"
+
+#: merge-recursive.c:993
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "�知�如何處� %06o %s '%s'"
+
+#: merge-recursive.c:1223 merge-recursive.c:1235
+#, c-format
+msgid "Fast-forwarding submodule %s to the following commit:"
+msgstr "�模組 %s 快轉到如下�交："
+
+#: merge-recursive.c:1226 merge-recursive.c:1238
+#, c-format
+msgid "Fast-forwarding submodule %s"
+msgstr "快轉�模組 %s"
+
+#: merge-recursive.c:1261
+#, c-format
+msgid "Failed to merge submodule %s (merge following commits not found)"
+msgstr "無法�併�模組 %s （沒發��併跟隨的�交）"
+
+#: merge-recursive.c:1265
+#, c-format
+msgid "Failed to merge submodule %s (not fast-forward)"
+msgstr "無法�併�模組 %s（�快轉）"
+
+#: merge-recursive.c:1266
+msgid "Found a possible merge resolution for the submodule:\n"
+msgstr "找到�模組的一個�能的�併方案：\n"
+
+#: merge-recursive.c:1278
+#, c-format
+msgid "Failed to merge submodule %s (multiple merges found)"
+msgstr "無法�併�模組 %s （發�多個�併）"
+
+#: merge-recursive.c:1420
+#, c-format
+msgid "Error: Refusing to lose untracked file at %s; writing to %s instead."
+msgstr "錯誤：拒絕�失未追蹤檔案 '%s'，而是寫入 %s。"
+
+#: merge-recursive.c:1492
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"��（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本被�留。"
+
+#: merge-recursive.c:1497
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"��（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本被�留。"
+
+#: merge-recursive.c:1504
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"��（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
+"本�留在 %8$s 中。"
+
+#: merge-recursive.c:1509
+#, 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 ""
+"��（%1$s/刪除）：%2$s 在 %3$s 中被刪除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
+"%7$s 版本�留在 %9$s 中。"
+
+#: merge-recursive.c:1544
+msgid "rename"
+msgstr "�新命�"
+
+#: merge-recursive.c:1544
+msgid "renamed"
+msgstr "�新命�"
+
+#: merge-recursive.c:1595 merge-recursive.c:2501 merge-recursive.c:3164
+#, c-format
+msgid "Refusing to lose dirty file at %s"
+msgstr "拒絕�失髒檔案 '%s'"
+
+#: merge-recursive.c:1605
+#, c-format
+msgid "Refusing to lose untracked file at %s, even though it's in the way."
+msgstr "拒絕在 '%s' 處失去未追蹤檔案，�使它存在於�新命�中。"
+
+#: merge-recursive.c:1663
+#, 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:1694
+#, c-format
+msgid "%s is a directory in %s adding as %s instead"
+msgstr "%s 是 %s 中的一個目錄而已 %s 為�被新增"
+
+#: merge-recursive.c:1699
+#, c-format
+msgid "Refusing to lose untracked file at %s; adding as %s instead"
+msgstr "拒絕�失未追蹤檔案 '%s'，而是新增為 %s"
+
+#: merge-recursive.c:1726
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"��（�新命�/�新命�）：在分支 \"%3$s\" 中�新命� \"%1$s\"->\"%2$s\"，在"
+"分支 \"%6$s\" 中�新命� \"%4$s\"->\"%5$s\"%7$s"
+
+#: merge-recursive.c:1731
+msgid " (left unresolved)"
+msgstr " （留下未解決）"
+
+#: merge-recursive.c:1823
+#, 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:2086
+#, 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."
+msgstr ""
+"��（分割的目錄�新命�）：�清楚 %s 應該放在哪裡，因為目錄 %s 被�新命�到"
+"多個其它目錄，沒有目錄包�大部分檔案。"
+
+#: merge-recursive.c:2220
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename directory %s->%s in %s. Rename directory %s-"
+">%s in %s"
+msgstr ""
+"��（�新命�/�新命�）：在 %3$s 中�新命�目錄 %1$s->%2$s，在 %6$s 中�新"
+"命�目錄 %4$s->%5$s"
+
+#: merge-recursive.c:3075
+msgid "modify"
+msgstr "修改"
+
+#: merge-recursive.c:3075
+msgid "modified"
+msgstr "修改"
+
+#: merge-recursive.c:3114
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "略� %s（已經��相��併）"
+
+#: merge-recursive.c:3167
+#, c-format
+msgid "Adding as %s instead"
+msgstr "而是以 %s 為�新增"
+
+#: merge-recursive.c:3371
+#, c-format
+msgid "Removing %s"
+msgstr "刪除 %s"
+
+#: merge-recursive.c:3394
+msgid "file/directory"
+msgstr "檔案/目錄"
+
+#: merge-recursive.c:3399
+msgid "directory/file"
+msgstr "目錄/檔案"
+
+#: merge-recursive.c:3406
+#, 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:3415
+#, c-format
+msgid "Adding %s"
+msgstr "新增 %s"
+
+#: merge-recursive.c:3424
+#, c-format
+msgid "CONFLICT (add/add): Merge conflict in %s"
+msgstr "��（add/add）：�併��於 %s"
+
+#: merge-recursive.c:3477
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "無法�併樹 %s 和 %s"
+
+#: merge-recursive.c:3571
+msgid "Merging:"
+msgstr "�併："
+
+#: merge-recursive.c:3584
+#, c-format
+msgid "found %u common ancestor:"
+msgid_plural "found %u common ancestors:"
+msgstr[0] "發� %u 個共�祖先："
+
+#: merge-recursive.c:3634
+msgid "merge returned no commit"
+msgstr "�併未返回�交"
+
+#: merge-recursive.c:3799
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "�能解�物件 '%s'"
+
+#: merge-recursive.c:3817 builtin/merge.c:717 builtin/merge.c:901
+#: builtin/stash.c:473
+msgid "Unable to write index."
+msgstr "�能寫入索引。"
+
+#: merge.c:41
+msgid "failed to read the cache"
+msgstr "讀�快�失敗"
+
+#: 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 "無法寫新的索引檔案"
+
+#: midx.c:74
+msgid "multi-pack-index OID fanout is of the wrong size"
+msgstr "多包索引的物件 ID fanout 大�錯誤"
+
+#: midx.c:105
+#, c-format
+msgid "multi-pack-index file %s is too small"
+msgstr "多包索引檔案 %s 太�"
+
+#: midx.c:121
+#, c-format
+msgid "multi-pack-index signature 0x%08x does not match signature 0x%08x"
+msgstr "多包索引簽� 0x%08x 和簽� 0x%08x �符�"
+
+#: midx.c:126
+#, c-format
+msgid "multi-pack-index version %d not recognized"
+msgstr "multi-pack-index 版本 %d �能被識別"
+
+#: midx.c:131
+#, c-format
+msgid "multi-pack-index hash version %u does not match version %u"
+msgstr "multi-pack-index 雜湊版本 %u 與版本 %u �符�"
+
+#: midx.c:148
+msgid "multi-pack-index missing required pack-name chunk"
+msgstr "多包索引缺少必需的包��塊"
+
+#: midx.c:150
+msgid "multi-pack-index missing required OID fanout chunk"
+msgstr "多包索引缺少必需的物件 ID fanout �塊"
+
+#: midx.c:152
+msgid "multi-pack-index missing required OID lookup chunk"
+msgstr "多包索引缺少必需的物件 ID 查詢�塊"
+
+#: midx.c:154
+msgid "multi-pack-index missing required object offsets chunk"
+msgstr "多包索引缺少必需的物件�移�塊"
+
+#: midx.c:170
+#, c-format
+msgid "multi-pack-index pack names out of order: '%s' before '%s'"
+msgstr "多包索引包�無�：'%s' 在 '%s' 之�"
+
+#: midx.c:214
+#, c-format
+msgid "bad pack-int-id: %u (%u total packs)"
+msgstr "錯的 pack-int-id：%u（共有 %u 個包）"
+
+#: midx.c:264
+msgid "multi-pack-index stores a 64-bit offset, but off_t is too small"
+msgstr "多包索引儲存一個64��移，但是 off_t 太�"
+
+#: midx.c:490
+#, c-format
+msgid "failed to add packfile '%s'"
+msgstr "新增 packfile '%s' 失敗"
+
+#: midx.c:496
+#, c-format
+msgid "failed to open pack-index '%s'"
+msgstr "開啟包索引 '%s' 失敗"
+
+#: midx.c:564
+#, c-format
+msgid "failed to locate object %d in packfile"
+msgstr "在 packfile 中定�物件 %d 失敗"
+
+#: midx.c:880 builtin/index-pack.c:1533
+msgid "cannot store reverse index file"
+msgstr "無法儲存倒排索引檔案"
+
+#: midx.c:920
+msgid "ignoring existing multi-pack-index; checksum mismatch"
+msgstr "忽略�有的多包索引：總和檢查碼�符"
+
+#: midx.c:943
+msgid "Adding packfiles to multi-pack-index"
+msgstr "正在新增 packfile 至多包索引"
+
+#: midx.c:989
+#, c-format
+msgid "did not see pack-file %s to drop"
+msgstr "沒有看到��棄的包檔案 %s"
+
+#: midx.c:1034
+#, c-format
+msgid "unknown preferred pack: '%s'"
+msgstr "未知�好包：「%s�"
+
+#: midx.c:1039
+#, c-format
+msgid "preferred pack '%s' is expired"
+msgstr "�好包「%s�已經�期"
+
+#: midx.c:1055
+msgid "no pack files to index."
+msgstr "沒有�索引的 pack 檔案。"
+
+#: midx.c:1135 builtin/clean.c:37
+#, c-format
+msgid "failed to remove %s"
+msgstr "刪除 %s 失敗"
+
+#: midx.c:1166
+#, c-format
+msgid "failed to clear multi-pack-index at %s"
+msgstr "清��於 %s 的多包索引失敗"
+
+#: midx.c:1225
+msgid "multi-pack-index file exists, but failed to parse"
+msgstr "有 multi-pack-index 檔案，但無法解�"
+
+#: midx.c:1233
+msgid "incorrect checksum"
+msgstr "總和檢查碼�正確"
+
+#: midx.c:1236
+msgid "Looking for referenced packfiles"
+msgstr "正在尋找引用的 packfile"
+
+#: midx.c:1251
+#, c-format
+msgid ""
+"oid fanout out of order: fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+msgstr "物件 ID 扇出無�：fanout[%d] = %<PRIx32> > %<PRIx32> = fanout[%d]"
+
+#: midx.c:1256
+msgid "the midx contains no oid"
+msgstr "midx 沒有 oid"
+
+#: midx.c:1265
+msgid "Verifying OID order in multi-pack-index"
+msgstr "正在驗證多包索引中的物件 ID 順�"
+
+#: midx.c:1274
+#, c-format
+msgid "oid lookup out of order: oid[%d] = %s >= %s = oid[%d]"
+msgstr "物件 ID 查詢無�：oid[%d] = %s >= %s = oid[%d]"
+
+#: midx.c:1294
+msgid "Sorting objects by packfile"
+msgstr "�� packfile 為物件排�"
+
+#: midx.c:1301
+msgid "Verifying object offsets"
+msgstr "正在驗證物件�移"
+
+#: midx.c:1317
+#, c-format
+msgid "failed to load pack entry for oid[%d] = %s"
+msgstr "為 oid[%d] = %s 載入包�目失敗"
+
+#: midx.c:1323
+#, c-format
+msgid "failed to load pack-index for packfile %s"
+msgstr "為 packfile %s 載入包索引失敗"
+
+#: midx.c:1332
+#, c-format
+msgid "incorrect object offset for oid[%d] = %s: %<PRIx64> != %<PRIx64>"
+msgstr "oid[%d] = %s 錯誤的物件�移：%<PRIx64> != %<PRIx64>"
+
+#: midx.c:1357
+msgid "Counting referenced objects"
+msgstr "正在計算引用物件"
+
+#: midx.c:1367
+msgid "Finding and deleting unreferenced packfiles"
+msgstr "正在尋找並刪除沒有�考的 packfile"
+
+#: midx.c:1558
+msgid "could not start pack-objects"
+msgstr "�能開始 pack-objects"
+
+#: midx.c:1578
+msgid "could not finish pack-objects"
+msgstr "�能�� pack-objects"
+
+#: name-hash.c:542
+#, c-format
+msgid "unable to create lazy_dir thread: %s"
+msgstr "�能建立 lazy_dir 執行緒：%s"
+
+#: name-hash.c:564
+#, c-format
+msgid "unable to create lazy_name thread: %s"
+msgstr "�能建立 lazy_name 執行緒：%s"
+
+#: name-hash.c:570
+#, c-format
+msgid "unable to join lazy_name thread: %s"
+msgstr "�能加入 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."
+msgstr ""
+"您的�一次備註�併尚未��（存在 %s）。\n"
+"在開始一個新的備註�併之�，請使用 'git notes merge --commit' 或者 'git "
+"notes merge --abort' 來�交/終止�一次�併。"
+
+#: notes-merge.c:284
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "您尚未��備註�併（存在 %s）。"
+
+#: notes-utils.c:46
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr "�能�交未�始化/未引用的註解樹"
+
+#: notes-utils.c:105
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "壞的 notes.rewriteMode 值：'%s'"
+
+#: notes-utils.c:115
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "拒絕� %s（在 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 "壞的 %s 值：'%s'"
+
+#: object-file.c:526
+#, c-format
+msgid "object directory %s does not exist; check .git/objects/info/alternates"
+msgstr "物件目錄 %s �存在，檢查 .git/objects/info/alternates"
+
+#: object-file.c:584
+#, c-format
+msgid "unable to normalize alternate object path: %s"
+msgstr "無法�範化備用物件路徑：%s"
+
+#: object-file.c:658
+#, c-format
+msgid "%s: ignoring alternate object stores, nesting too deep"
+msgstr "%s：忽略備用物件庫，嵌套太深"
+
+#: object-file.c:665
+#, c-format
+msgid "unable to normalize object directory: %s"
+msgstr "無法�範化物件目錄: %s"
+
+#: object-file.c:708
+msgid "unable to fdopen alternates lockfile"
+msgstr "無法 fdopen �代鎖檔案"
+
+#: object-file.c:726
+msgid "unable to read alternates file"
+msgstr "無法讀�替代檔案"
+
+#: object-file.c:733
+msgid "unable to move new alternates file into place"
+msgstr "無法將新的替代檔案移動到�"
+
+#: object-file.c:768
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "路徑 '%s' �存在"
+
+#: object-file.c:789
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr "尚�支�將�考版本庫 '%s' 作為一個連�簽出。"
+
+#: object-file.c:795
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "�考版本庫 '%s' �是一個本機版本庫。"
+
+#: object-file.c:801
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "�考版本庫 '%s' 是一個淺複製"
+
+#: object-file.c:809
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "�考版本庫 '%s' 已被移�"
+
+#: object-file.c:869
+#, c-format
+msgid "invalid line while parsing alternate refs: %s"
+msgstr "解�備用引用時無效的行：%s"
+
+#: object-file.c:1019
+#, c-format
+msgid "attempting to mmap %<PRIuMAX> over limit %<PRIuMAX>"
+msgstr "嘗試 mmap %<PRIuMAX>，超�了最大值 %<PRIuMAX>"
+
+#: object-file.c:1054
+#, c-format
+msgid "mmap failed%s"
+msgstr "mmap 失敗%s"
+
+#: object-file.c:1218
+#, c-format
+msgid "object file %s is empty"
+msgstr "物件檔案 %s 為空"
+
+#: object-file.c:1353 object-file.c:2548
+#, c-format
+msgid "corrupt loose object '%s'"
+msgstr "�壞的鬆散物件 '%s'"
+
+#: object-file.c:1355 object-file.c:2552
+#, c-format
+msgid "garbage at end of loose object '%s'"
+msgstr "鬆散物件 '%s' 後�有垃圾資料"
+
+#: object-file.c:1397
+msgid "invalid object type"
+msgstr "無效的物件類型"
+
+#: object-file.c:1481
+#, c-format
+msgid "unable to unpack %s header with --allow-unknown-type"
+msgstr "無法用 --allow-unknown-type �數解開 %s 標頭訊�"
+
+#: object-file.c:1484
+#, c-format
+msgid "unable to unpack %s header"
+msgstr "無法解開 %s 頭部"
+
+#: object-file.c:1490
+#, c-format
+msgid "unable to parse %s header with --allow-unknown-type"
+msgstr "無法用 --allow-unknown-type �數解� %s 標頭訊�"
+
+#: object-file.c:1493
+#, c-format
+msgid "unable to parse %s header"
+msgstr "無法解� %s 頭部"
+
+#: object-file.c:1717
+#, c-format
+msgid "failed to read object %s"
+msgstr "讀�物件 %s 失敗"
+
+#: object-file.c:1721
+#, c-format
+msgid "replacement %s not found for %s"
+msgstr "找�到 %2$s 的替代 %1$s"
+
+#: object-file.c:1725
+#, c-format
+msgid "loose object %s (stored in %s) is corrupt"
+msgstr "鬆散物件 %s（儲存在 %s）已�壞"
+
+#: object-file.c:1729
+#, c-format
+msgid "packed object %s (stored in %s) is corrupt"
+msgstr "打包物件 %s（儲存在 %s）已�壞"
+
+#: object-file.c:1834
+#, c-format
+msgid "unable to write file %s"
+msgstr "無法寫檔案 %s"
+
+#: object-file.c:1841
+#, c-format
+msgid "unable to set permission to '%s'"
+msgstr "無法為 '%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 "權��足，無法在版本庫物件庫 %s 中新增物件"
+
+#: object-file.c:1935
+msgid "unable to create temporary file"
+msgstr "無法建立暫存檔"
+
+#: object-file.c:1959
+msgid "unable to write loose object file"
+msgstr "�能寫鬆散物件檔案"
+
+#: object-file.c:1965
+#, c-format
+msgid "unable to deflate new object %s (%d)"
+msgstr "�能壓縮新物件 %s（%d）"
+
+#: object-file.c:1969
+#, c-format
+msgid "deflateEnd on object %s failed (%d)"
+msgstr "在物件 %s 上呼� deflateEnd 失敗（%d）"
+
+#: object-file.c:1973
+#, c-format
+msgid "confused by unstable object source data for %s"
+msgstr "被 %s 的�穩定物件�資料�糊塗了"
+
+#: object-file.c:1983 builtin/pack-objects.c:1237
+#, c-format
+msgid "failed utime() on %s"
+msgstr "在 %s 上呼� utime() 失敗"
+
+#: object-file.c:2060
+#, c-format
+msgid "cannot read object for %s"
+msgstr "�能讀�物件 %s"
+
+#: object-file.c:2111
+msgid "corrupt commit"
+msgstr "�壞的�交"
+
+#: object-file.c:2119
+msgid "corrupt tag"
+msgstr "�壞的標籤"
+
+#: object-file.c:2219
+#, c-format
+msgid "read error while indexing %s"
+msgstr "索引 %s 時讀�錯誤"
+
+#: object-file.c:2222
+#, c-format
+msgid "short read while indexing %s"
+msgstr "索引 %s 時讀入�完整"
+
+#: object-file.c:2295 object-file.c:2305
+#, c-format
+msgid "%s: failed to insert into database"
+msgstr "%s：�入資料庫失敗"
+
+#: object-file.c:2311
+#, c-format
+msgid "%s: unsupported file type"
+msgstr "%s：�支�的檔案類型"
+
+#: object-file.c:2335
+#, c-format
+msgid "%s is not a valid object"
+msgstr "%s �是一個有效的物件"
+
+#: object-file.c:2337
+#, c-format
+msgid "%s is not a valid '%s' object"
+msgstr "%s �是一個有效的 '%s' 物件"
+
+#: object-file.c:2364 builtin/index-pack.c:192
+#, c-format
+msgid "unable to open %s"
+msgstr "�能開啟 %s"
+
+#: object-file.c:2559 object-file.c:2612
+#, c-format
+msgid "hash mismatch for %s (expected %s)"
+msgstr "%s 的雜湊值�符�（�期 %s）"
+
+#: object-file.c:2583
+#, c-format
+msgid "unable to mmap %s"
+msgstr "�能 mmap %s"
+
+#: object-file.c:2588
+#, c-format
+msgid "unable to unpack header of %s"
+msgstr "無法解壓縮 %s 的頭部"
+
+#: object-file.c:2594
+#, c-format
+msgid "unable to parse header of %s"
+msgstr "無法解� %s 的頭部"
+
+#: object-file.c:2605
+#, c-format
+msgid "unable to unpack contents of %s"
+msgstr "無法解壓縮 %s 的內容"
+
+#: object-name.c:480
+#, c-format
+msgid "short object ID %s is ambiguous"
+msgstr "短物件 ID %s 存在歧義"
+
+#: object-name.c:491
+msgid "The candidates are:"
+msgstr "候�者有："
+
+#: 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 ""
+"Git 通常�會建立以 40 個�六進�字元�尾的引用，\n"
+"因為當您��供 40 個�六進�字元時，其將被忽略。\n"
+"這些引用�能被�外建立。例如：\n"
+"\n"
+"  git switch -c $br $(git rev-parse ...)\n"
+"\n"
+"當「$br�因為�些原因空白時，會建立出 40 ��六進�的引用。\n"
+"請檢查這些引用，並視需�刪除。執行\n"
+"「git config advice.objectNameWarning false�命令以關閉本訊�通知"
+
+#: object-name.c:910
+#, c-format
+msgid "log for '%.*s' only goes back to %s"
+msgstr "'%.*s' 的日誌�能回到 %s"
+
+#: object-name.c:918
+#, c-format
+msgid "log for '%.*s' only has %d entries"
+msgstr "'%.*s' 的日誌�有 %d 個項目"
+
+#: object-name.c:1696
+#, c-format
+msgid "path '%s' exists on disk, but not in '%.*s'"
+msgstr "�碟上存在 '%s' 路徑，但�存在於 '%.*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 ""
+"'%s' 路徑存在，但�是 '%s'\n"
+"�示：你在說 '%.*s:%s'，� '%.*s:./%s' 嗎？"
+
+#: object-name.c:1711
+#, c-format
+msgid "path '%s' does not exist in '%.*s'"
+msgstr "'%s' 路徑�存在於 '%.*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 ""
+"'%s' 路徑在索引，但�在 %d 暫存�\n"
+"�示：你在說 ':%d:%s' 嗎？"
+
+#: 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 ""
+"'%s' 路徑在索引，但�是 '%s'\n"
+"�示：你在說 ':%d:%s'，� ':%d:%s' 嗎？"
+
+#: object-name.c:1763
+#, c-format
+msgid "path '%s' exists on disk, but not in the index"
+msgstr "�碟上存在 '%s' 路徑，但�在索引中"
+
+#: object-name.c:1765
+#, c-format
+msgid "path '%s' does not exist (neither on disk nor in the index)"
+msgstr "'%s' 路徑�存在 (既�存在�碟，也�存在索引)"
+
+#: object-name.c:1778
+msgid "relative path syntax can't be used outside working tree"
+msgstr "相�路徑與法�能用在工作�外"
+
+#: object-name.c:1916
+#, c-format
+msgid "invalid object name '%.*s'."
+msgstr "'%.*s' 物件�稱無效。"
+
+#: object.c:53
+#, c-format
+msgid "invalid object type \"%s\""
+msgstr "無效的物件類型 \"%s\""
+
+#: object.c:173
+#, c-format
+msgid "object %s is a %s, not a %s"
+msgstr "物件 %s 是一個 %s，�是一個 %s"
+
+#: object.c:250
+#, c-format
+msgid "object %s has unknown type id %d"
+msgstr "物件 %s 有未知的類型 id %d"
+
+#: object.c:263
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "�能解�物件：%s"
+
+#: object.c:283 object.c:295
+#, c-format
+msgid "hash mismatch %s"
+msgstr "雜湊值與 %s �符�"
+
+#: pack-bitmap.c:868 pack-bitmap.c:874 builtin/pack-objects.c:2411
+#, c-format
+msgid "unable to get size of %s"
+msgstr "�能得到 %s 的大�"
+
+#: pack-bitmap.c:1571 builtin/rev-list.c:92
+#, c-format
+msgid "unable to get disk usage of %s"
+msgstr "無法�得 %s 的�碟用�"
+
+#: pack-revindex.c:221
+#, c-format
+msgid "reverse-index file %s is too small"
+msgstr "%s 倒排索引檔案��"
+
+#: pack-revindex.c:226
+#, c-format
+msgid "reverse-index file %s is corrupt"
+msgstr "%s 倒排索引檔案�壞"
+
+#: pack-revindex.c:234
+#, c-format
+msgid "reverse-index file %s has unknown signature"
+msgstr "%s 倒排索引檔案有未知簽章"
+
+#: pack-revindex.c:238
+#, c-format
+msgid "reverse-index file %s has unsupported version %<PRIu32>"
+msgstr "倒排索引檔案 %s 有�支�的版本 %<PRIu32>"
+
+#: pack-revindex.c:243
+#, c-format
+msgid "reverse-index file %s has unsupported hash id %<PRIu32>"
+msgstr "倒排索引檔案 %s 有�支�的雜湊 ID %<PRIu32>"
+
+#: pack-write.c:250
+msgid "cannot both write and verify reverse index"
+msgstr "無法�時寫入和驗證倒排索引"
+
+#: pack-write.c:271
+#, c-format
+msgid "could not stat: %s"
+msgstr "無法 stat：%s"
+
+#: pack-write.c:283
+#, c-format
+msgid "failed to make %s readable"
+msgstr "無法讓 %s 能夠寫入"
+
+#: pack-write.c:522
+#, c-format
+msgid "could not write '%s' promisor file"
+msgstr "無法寫入「%s�promisor 檔案"
+
+#: packfile.c:625
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "�移�在 packfile ��之�（�壞的 .idx？）"
+
+#: packfile.c:655
+#, c-format
+msgid "packfile %s cannot be mapped%s"
+msgstr "包檔案 %s 無法映射%s"
+
+#: packfile.c:1934
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "�移�在 %s 的包索引開始之�（�壞的索引？）"
+
+#: packfile.c:1938
+#, 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
+#, c-format
+msgid "option `%s' expects a numerical value"
+msgstr "�項 `%s' 期望一個數字值"
+
+#: parse-options-cb.c:41
+#, c-format
+msgid "malformed expiration date '%s'"
+msgstr "格�錯誤的到期時間：'%s'"
+
+#: parse-options-cb.c:54
+#, 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
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "格�錯誤的物件� '%s'"
+
+#: parse-options.c:38
+#, c-format
+msgid "%s requires a value"
+msgstr "%s 需�一個值"
+
+#: parse-options.c:73
+#, c-format
+msgid "%s is incompatible with %s"
+msgstr "%s 與 %s �相容"
+
+#: parse-options.c:78
+#, c-format
+msgid "%s : incompatible with something else"
+msgstr "%s：和其它的�相容"
+
+#: parse-options.c:92 parse-options.c:96 parse-options.c:317
+#, c-format
+msgid "%s takes no value"
+msgstr "%s ��值"
+
+#: parse-options.c:94
+#, c-format
+msgid "%s isn't available"
+msgstr "%s ��用"
+
+#: parse-options.c:217
+#, 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
+#, 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
+#, c-format
+msgid "did you mean `--%s` (with two dashes)?"
+msgstr "你的��是 `--%s`（有兩個短線）嗎？"
+
+#: parse-options.c:668 parse-options.c:988
+#, c-format
+msgid "alias of --%s"
+msgstr "--%s 的別�"
+
+#: parse-options.c:879
+#, c-format
+msgid "unknown option `%s'"
+msgstr "未知�項 `%s'"
+
+#: parse-options.c:881
+#, c-format
+msgid "unknown switch `%c'"
+msgstr "未知開關 `%c'"
+
+#: parse-options.c:883
+#, c-format
+msgid "unknown non-ascii option in string: `%s'"
+msgstr "字串中未知的� ascii 字元�項：`%s'"
+
+#: parse-options.c:907
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:926
+#, c-format
+msgid "usage: %s"
+msgstr "用法：%s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:932
+#, c-format
+msgid "   or: %s"
+msgstr "   或：%s"
+
+#  譯者：為�證在輸出中�齊，注�調整�中空格�
+#: parse-options.c:935
+#, c-format
+msgid "    %s"
+msgstr "    %s"
+
+#: parse-options.c:974
+msgid "-NUM"
+msgstr "-數字"
+
+#: path.c:915
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "�能設定 %s 為組�寫"
+
+#: pathspec.c:151
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr "跳脫字元 '\\' �能作為屬性值的最後一個字元"
+
+#: pathspec.c:169
+msgid "Only one 'attr:' specification is allowed."
+msgstr "��許一個 'attr:' �格。"
+
+#: pathspec.c:172
+msgid "attr spec must not be empty"
+msgstr "屬性�格�能為空"
+
+#: pathspec.c:215
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "無效的屬性� %s"
+
+#: pathspec.c:280
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr "全域的 'glob' 和 'noglob' 路徑�格設定�相容"
+
+#: pathspec.c:287
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr "全域的 'literal' 路徑�格設定和其它的全域路徑�格設定�相容"
+
+#: pathspec.c:327
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "路徑�格包�無效的神奇�綴"
+
+#: pathspec.c:348
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "在路徑�格 '%3$s' 中無效的神奇�綴 '%2$.*1$s'"
+
+#: pathspec.c:353
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "路徑�格 '%s' 的神奇�綴�尾少了一個 ')'"
+
+#: pathspec.c:391
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "路徑�格 '%2$s' 中包�未實�的神奇�綴 '%1$c'"
+
+#: pathspec.c:450
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s：'literal' 和 'glob' �相容"
+
+#: pathspec.c:466
+#, c-format
+msgid "%s: '%s' is outside repository at '%s'"
+msgstr "%s：'%s' 在�於 '%s' 的版本庫之外"
+
+#: pathspec.c:542
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s'（助記符：'%c'）"
+
+#: pathspec.c:552
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s：路徑�格神奇�綴�被此指令支�：%s"
+
+#: pathspec.c:619
+#, c-format
+msgid "pathspec '%s' is beyond a symbolic link"
+msgstr "路徑�格 '%s' �於符號連�中"
+
+#: pathspec.c:664
+#, c-format
+msgid "line is badly quoted: %s"
+msgstr "�行�應該被括號括�：%s"
+
+#: pkt-line.c:92
+msgid "unable to write flush packet"
+msgstr "無法寫 flush 包"
+
+#: pkt-line.c:99
+msgid "unable to write delim packet"
+msgstr "無法寫 delim 包"
+
+#: pkt-line.c:106
+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
+msgid "protocol error: impossibly long line"
+msgstr "�定錯誤：��能的長行"
+
+#: pkt-line.c:169 pkt-line.c:171
+msgid "packet write with format failed"
+msgstr "格�化包寫入錯誤"
+
+#: pkt-line.c:204
+msgid "packet write failed - data exceeds max packet size"
+msgstr "寫�包失敗：資料超�了包的最大長度"
+
+#: pkt-line.c:222
+#, c-format
+msgid "packet write failed: %s"
+msgstr "�包寫入失敗：%s"
+
+#: pkt-line.c:328 pkt-line.c:329
+msgid "read error"
+msgstr "讀�錯誤"
+
+#: pkt-line.c:339 pkt-line.c:340
+msgid "the remote end hung up unexpectedly"
+msgstr "�端�外掛斷了"
+
+#: pkt-line.c:369 pkt-line.c:371
+#, 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
+#, c-format
+msgid "protocol error: bad line length %d"
+msgstr "�定錯誤：錯誤的行長度 %d"
+
+#: pkt-line.c:413 sideband.c:165
+#, c-format
+msgid "remote error: %s"
+msgstr "�端錯誤：%s"
+
+#: preload-index.c:125
+msgid "Refreshing index"
+msgstr "正在�新整�索引"
+
+#: preload-index.c:144
+#, c-format
+msgid "unable to create threaded lstat: %s"
+msgstr "無法建立執行緒 lstat：%s"
+
+#: pretty.c:988
+msgid "unable to parse --pretty format"
+msgstr "�能解� --pretty 格�"
+
+#: promisor-remote.c:31
+msgid "promisor-remote: unable to fork off fetch subprocess"
+msgstr "promisor-remote: 無法 fork fetch �處�程�"
+
+#: promisor-remote.c:38 promisor-remote.c:40
+msgid "promisor-remote: could not write to fetch subprocess"
+msgstr "promisor-remote: 無法寫入 fetch �處�程�"
+
+#: promisor-remote.c:44
+msgid "promisor-remote: could not close stdin to fetch subprocess"
+msgstr "promisor-remote: 無法關閉 fetch �處�程�的 stdin"
+
+#: promisor-remote.c:54
+#, c-format
+msgid "promisor remote name cannot begin with '/': %s"
+msgstr "promisor �端�稱�能以 '/' 開始：%s"
+
+#: protocol-caps.c:103
+msgid "object-info: expected flush after arguments"
+msgstr "object-info：引數後�期�有 flush"
+
+#: prune-packed.c:35
+msgid "Removing duplicate objects"
+msgstr "正在刪除�複物件"
+
+#: range-diff.c:78
+msgid "could not start `log`"
+msgstr "�能啟動 `log`"
+
+#: range-diff.c:80
+msgid "could not read `log` output"
+msgstr "�能讀� `log` 的輸出"
+
+#: range-diff.c:101 sequencer.c:5550
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "�能解��交 '%s'"
+
+#: range-diff.c:115
+#, 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
+#, c-format
+msgid "could not parse git header '%.*s'"
+msgstr "無法解� git 頭 '%.*s'"
+
+#: range-diff.c:307
+msgid "failed to generate diff"
+msgstr "生� diff 失敗"
+
+#: range-diff.c:559
+msgid "--left-only and --right-only are mutually exclusive"
+msgstr "--left-only 和 --right-only 互斥"
+
+#: range-diff.c:562 range-diff.c:564
+#, c-format
+msgid "could not parse log for '%s'"
+msgstr "�能解� '%s' 的日誌"
+
+#: read-cache.c:710
+#, c-format
+msgid "will not add file alias '%s' ('%s' already exists in index)"
+msgstr "將�會新增檔案別� '%s'（'%s' 已經存在於索引中）"
+
+#: read-cache.c:726
+msgid "cannot create an empty blob in the object database"
+msgstr "�能在物件資料庫中建立空的資料物件"
+
+#: read-cache.c:748
+#, c-format
+msgid "%s: can only add regular files, symbolic links or git-directories"
+msgstr "%s：�能新增一般檔案�符號連�或 git 目錄"
+
+#: read-cache.c:753
+#, c-format
+msgid "'%s' does not have a commit checked out"
+msgstr "'%s' 沒有簽出一個�交"
+
+#: read-cache.c:805
+#, c-format
+msgid "unable to index file '%s'"
+msgstr "無法索引檔案 '%s'"
+
+#: read-cache.c:824
+#, c-format
+msgid "unable to add '%s' to index"
+msgstr "無法在索引中新增 '%s'"
+
+#: read-cache.c:835
+#, c-format
+msgid "unable to stat '%s'"
+msgstr "無法� %s 執行 stat"
+
+#: read-cache.c:1358
+#, c-format
+msgid "'%s' appears as both a file and as a directory"
+msgstr "'%s' 看起來既是檔案�是目錄"
+
+#: read-cache.c:1573
+msgid "Refresh index"
+msgstr "�新整�索引"
+
+#: read-cache.c:1705
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"設定了 index.version，但是�值無效。\n"
+"使用版本 %i"
+
+#: read-cache.c:1715
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"設定了 GIT_INDEX_VERSION，但是�值無效。\n"
+"使用版本 %i"
+
+#: read-cache.c:1771
+#, c-format
+msgid "bad signature 0x%08x"
+msgstr "壞的簽� 0x%08x"
+
+#: read-cache.c:1774
+#, c-format
+msgid "bad index version %d"
+msgstr "壞的索引版本 %d"
+
+#: read-cache.c:1783
+msgid "bad index file sha1 signature"
+msgstr "壞的索引檔案 sha1 簽�"
+
+#: read-cache.c:1817
+#, c-format
+msgid "index uses %.4s extension, which we do not understand"
+msgstr "索引使用�被支�的 %.4s 擴展"
+
+#
+#: read-cache.c:1819
+#, c-format
+msgid "ignoring %.4s extension"
+msgstr "忽略 %.4s 擴展"
+
+#: read-cache.c:1856
+#, c-format
+msgid "unknown index entry format 0x%08x"
+msgstr "未知的索引�目格� 0x%08x"
+
+#: read-cache.c:1872
+#, c-format
+msgid "malformed name field in the index, near path '%s'"
+msgstr "索引中�近路徑 '%s' 有錯誤的�稱欄�"
+
+#: read-cache.c:1929
+msgid "unordered stage entries in index"
+msgstr "索引中有未排�的暫存�目"
+
+#: read-cache.c:1932
+#, c-format
+msgid "multiple stage entries for merged file '%s'"
+msgstr "�併檔案 '%s' 有多個暫存�目"
+
+#: read-cache.c:1935
+#, c-format
+msgid "unordered stage entries for '%s'"
+msgstr "'%s' 的未排�暫存�目"
+
+#: 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 "索引檔案�壞"
+
+#: read-cache.c:2185
+#, c-format
+msgid "unable to create load_cache_entries thread: %s"
+msgstr "無法建立 load_cache_entries 執行緒：%s"
+
+#: read-cache.c:2198
+#, c-format
+msgid "unable to join load_cache_entries thread: %s"
+msgstr "無法加入 load_cache_entries 執行緒：%s"
+
+#: read-cache.c:2231
+#, c-format
+msgid "%s: index file open failed"
+msgstr "%s：開啟索引檔案失敗"
+
+#: read-cache.c:2235
+#, c-format
+msgid "%s: cannot stat the open index"
+msgstr "%s：�能�開啟的索引執行 stat 動作"
+
+#: read-cache.c:2239
+#, c-format
+msgid "%s: index file smaller than expected"
+msgstr "%s：索引檔案比�期的�"
+
+#: read-cache.c:2243
+#, c-format
+msgid "%s: unable to map index file%s"
+msgstr "%s：無法 map 索引檔案%s"
+
+#: read-cache.c:2286
+#, c-format
+msgid "unable to create load_index_extensions thread: %s"
+msgstr "無法建立 load_index_extensions 執行緒：%s"
+
+#: read-cache.c:2313
+#, c-format
+msgid "unable to join load_index_extensions thread: %s"
+msgstr "無法加入 load_index_extensions 執行緒：%s"
+
+#: read-cache.c:2351
+#, c-format
+msgid "could not freshen shared index '%s'"
+msgstr "無法�新整�共享索引 '%s'"
+
+#: read-cache.c:2398
+#, c-format
+msgid "broken index, expect %s in %s, got %s"
+msgstr "�壞的索引，期望在 %2$s 中的 %1$s，得到 %3$s"
+
+#: read-cache.c:3032 strbuf.c:1173 wrapper.c:633 builtin/merge.c:1146
+#, c-format
+msgid "could not close '%s'"
+msgstr "�能關閉 '%s'"
+
+#: 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 "�能� '%s' 呼� stat"
+
+#: read-cache.c:3159
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "�能開啟 git 目錄：%s"
+
+#: read-cache.c:3171
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "無法刪除：%s"
+
+#: read-cache.c:3200
+#, c-format
+msgid "cannot fix permission bits on '%s'"
+msgstr "�能修復 '%s' 的權��"
+
+#: read-cache.c:3349
+#, c-format
+msgid "%s: cannot drop to stage #0"
+msgstr "%s：�能�到暫存� #0"
+
+#: rebase-interactive.c:11
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"您�以用 'git rebase --edit-todo' 修正，然後執行 'git rebase --continue'。\n"
+"或者您�以用 'git rebase --abort' 終止�定基底。\n"
+
+#: rebase-interactive.c:33
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "�項 rebase.missingCommitsCheck 的值 %s 無法識別。已忽略。"
+
+#: rebase-interactive.c:42
+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 [-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"
+"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 <�交> = 使用�交，但�直接修補 (amend) \n"
+"s, squash <�交> = 使用�交，但��至上個�交\n"
+"f, fixup [-C | -c] <�交> = 跟 “squash� 相似，但除�傳入「-C�\n"
+"                   �則��留上一個�交的日誌訊�。傳入 -C 表示��留這個\n"
+"                   �交的訊�；傳入 -c 與 -C 功能相�，但會開啟編輯器\n"
+"x, exec <命令> = 使用 shell 執行指令（這一行的剩餘部分）\n"
+"b, break = 在這�止（使用 'git rebase --continue' 繼續�定基底）\n"
+"d, drop <�交> = 移除�交\n"
+"l, label <標籤> = 為目� HEAD 打上指定�字標籤\n"
+"t, reset <標籤> = �設 HEAD 到指定標籤\n"
+"m, merge [-C <commit> | -c <commit>] <label> [# <oneline>]\n"
+".       建立一個�併�交，並使用原始的�併�交說明（如果沒有指定\n"
+".       原始�交，使用備註部分的 oneline 作為�交說明）。使用\n"
+".       -c <commit> �以編輯�交說明。\n"
+"\n"
+"�以�這些行�新排�，會從上至下執行。\n"
+
+#: rebase-interactive.c:66
+#, c-format
+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
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"��刪除任�一行。使用 'drop' 顯�地刪除一個�交。\n"
+
+#: rebase-interactive.c:78 git-rebase--preserve-merges.sh:222
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"如果您在這裡刪除一行，�應的�交將會�失。\n"
+
+#: rebase-interactive.c:84 git-rebase--preserve-merges.sh:861
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+"    git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"您正在修改進行中的互動��定基底待辦列表。若�在編輯��後繼續�定基底，\n"
+"請執行：\n"
+"    git rebase --continue\n"
+"\n"
+
+#: rebase-interactive.c:89 git-rebase--preserve-merges.sh:938
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"然而，如果您刪除全部內容，�定基底動作將會終止。\n"
+"\n"
+
+#: 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 "�能寫入 '%s'"
+
+#: rebase-interactive.c:119 builtin/rebase.c:203 builtin/rebase.c:229
+#: builtin/rebase.c:253
+#, c-format
+msgid "could not write '%s'."
+msgstr "�能寫入 '%s'。"
+
+#: rebase-interactive.c:196
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"警告：一些�交�能被�外�棄。\n"
+"�棄的�交（從新到舊）：\n"
+
+#: rebase-interactive.c:203
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"為��這�訊�，使用 \"drop\" 指令顯�地刪除一個�交。\n"
+"\n"
+"使用 'git config rebase.missingCommitsCheck' 來修改警告級別。\n"
+"��值有：ignore�warn�error。\n"
+"\n"
+
+#: 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 "�能讀� '%s'。"
+
+#: ref-filter.c:42 wt-status.c:2036
+msgid "gone"
+msgstr "�失"
+
+#: ref-filter.c:43
+#, c-format
+msgid "ahead %d"
+msgstr "領先 %d"
+
+#: ref-filter.c:44
+#, c-format
+msgid "behind %d"
+msgstr "�後 %d"
+
+#: ref-filter.c:45
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "領先 %d，�後 %d"
+
+#: ref-filter.c:230
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "期望的格�：%%(color:<�色>)"
+
+#: ref-filter.c:232
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "無法識別的�色：%%(color:%s)"
+
+#: ref-filter.c:254
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "期望整數值 refname:lstrip=%s"
+
+#: ref-filter.c:258
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "期望整數值 refname:rstrip=%s"
+
+#: ref-filter.c:260
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "無法識別的 %%(%s) �數：%s"
+
+#: ref-filter.c:315
+#, c-format
+msgid "%%(objecttype) does not take arguments"
+msgstr "%%(objecttype) �帶�數"
+
+#: ref-filter.c:339
+#, c-format
+msgid "unrecognized %%(objectsize) argument: %s"
+msgstr "無法識別的 %%(objectsize) �數：%s"
+
+#: ref-filter.c:347
+#, c-format
+msgid "%%(deltabase) does not take arguments"
+msgstr "%%(deltabase) �帶�數"
+
+#: ref-filter.c:359
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) �帶�數"
+
+#: ref-filter.c:372
+#, c-format
+msgid "unrecognized %%(subject) argument: %s"
+msgstr "無法識別的 %%(subject) 引數：%s"
+
+#: ref-filter.c:391
+#, c-format
+msgid "expected %%(trailers:key=<value>)"
+msgstr "�期是 %%(trailers:key=<value>)"
+
+#: ref-filter.c:393
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "未知的 %%(trailers) �數：%s"
+
+#: ref-filter.c:424
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "期望一個正數 contents:lines=%s"
+
+#: ref-filter.c:426
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "無法識別的 %%(contents) �數：%s"
+
+#: ref-filter.c:441
+#, c-format
+msgid "positive value expected '%s' in %%(%s)"
+msgstr "%%(%2$s) 中的 '%1$s' �期是正數值"
+
+#: ref-filter.c:445
+#, c-format
+msgid "unrecognized argument '%s' in %%(%s)"
+msgstr "無法識別 %%(%2$s) 中的 '%1$s' �數"
+
+#: ref-filter.c:459
+#, c-format
+msgid "unrecognized email option: %s"
+msgstr "無法識別的 email �項：%s"
+
+#: ref-filter.c:489
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "期望的格�：%%(align:<寬度>,<�置>)"
+
+#: ref-filter.c:501
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "無法識別的�置：%s"
+
+#: ref-filter.c:508
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "無法識別的寬度：%s"
+
+#: ref-filter.c:517
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "無法識別的 %%(align) �數：%s"
+
+#: ref-filter.c:525
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "元素 %%(align) 需�一個正數的寬度"
+
+#: ref-filter.c:543
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "無法識別的 %%(if) �數：%s"
+
+#: ref-filter.c:645
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "格�錯誤的欄��：%.*s"
+
+#: ref-filter.c:672
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "未知的欄��：%.*s"
+
+#: ref-filter.c:676
+#, c-format
+msgid ""
+"not a git repository, but the field '%.*s' requires access to object data"
+msgstr "�是一個 git 版本庫，但是欄� '%.*s' 需�存�物件資料"
+
+#: ref-filter.c:801
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "格�：使用了 %%(if) 元素而沒有 %%(then) 元素"
+
+#: ref-filter.c:865
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "格�：使用了 %%(then) 元素而沒有 %%(if) 元素"
+
+#: ref-filter.c:867
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "格�：%%(then) 元素用了多次"
+
+#: ref-filter.c:869
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "格�：%%(then) 元素用在了 %%(else) 之後"
+
+#: ref-filter.c:897
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "格�：使用了 %%(else) 元素而沒有 %%(if) 元素"
+
+#: ref-filter.c:899
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "格�：使用了 %%(else) 元素而沒有 %%(then) 元素"
+
+#: ref-filter.c:901
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "格�：%%(else) 元素用了多次"
+
+#: ref-filter.c:916
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "格�：使用了 %%(end) 元素�沒有它的�應元素"
+
+#: ref-filter.c:973
+#, c-format
+msgid "malformed format string %s"
+msgstr "錯誤的格�化字串 %s"
+
+#: ref-filter.c:1621
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "（無分支，�定 %s 的基底）"
+
+#: ref-filter.c:1624
+#, c-format
+msgid "(no branch, rebasing detached HEAD %s)"
+msgstr "（無分支，�定 %s 分離開頭指標的基底）"
+
+#: ref-filter.c:1627
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "（無分支，二分�尋從 %s 開始）"
+
+#: ref-filter.c:1631
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "（開頭指標分離於 %s）"
+
+#: ref-filter.c:1634
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "（開頭指標分離自 %s）"
+
+#: ref-filter.c:1637
+msgid "(no branch)"
+msgstr "（無分支）"
+
+#: ref-filter.c:1669 ref-filter.c:1880
+#, c-format
+msgid "missing object %s for %s"
+msgstr "缺少 %2$s 的物件 %1$s"
+
+#: ref-filter.c:1679
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer 失敗於 %2$s 的 %1$s"
+
+#: ref-filter.c:2064
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "格�錯誤的物件 '%s'"
+
+#: ref-filter.c:2153
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "忽略帶有錯誤�稱 %s 的引用"
+
+#: ref-filter.c:2158 refs.c:676
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "忽略�壞的引用 %s"
+
+#: ref-filter.c:2502
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "格�：缺少 %%(end) 元素"
+
+#: ref-filter.c:2596
+#, c-format
+msgid "malformed object name %s"
+msgstr "格�錯誤的物件� %s"
+
+#: ref-filter.c:2601
+#, c-format
+msgid "option `%s' must point to a commit"
+msgstr "�項 `%s' 必須指�一個�交"
+
+#: refs.c:264
+#, c-format
+msgid "%s does not point to a valid object!"
+msgstr "%s 沒有指�一個有效的物件�"
+
+#: 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 ""
+"將「%s�設定為�始分支的�稱。這個�設分支�稱�以變更。\n"
+"如果�設定所有新版本庫�使用的�始分支�稱，\n"
+"請呼�（會隱�這個警告）：\n"
+"\n"
+"\tgit config --global init.defaultBranch <name>\n"
+"\n"
+"除了 “master� 外，常用的分支�稱有 “main�, “trunk� 以�\n"
+"“development�。剛建立的分支�以用這個命令�新命�：\n"
+"\n"
+"\tgit branch -m <name>\n"
+
+#: refs.c:588
+#, c-format
+msgid "could not retrieve `%s`"
+msgstr "無法擷�「%s�"
+
+#: refs.c:598
+#, c-format
+msgid "invalid branch name: %s = %s"
+msgstr "分支�稱無效：%s = %s"
+
+#: refs.c:674
+#, c-format
+msgid "ignoring dangling symref %s"
+msgstr "忽略懸空符號引用 %s"
+
+#: refs.c:922
+#, c-format
+msgid "log for ref %s has gap after %s"
+msgstr "引用 %s 的日誌在 %s 之後有缺�"
+
+#: refs.c:929
+#, c-format
+msgid "log for ref %s unexpectedly ended on %s"
+msgstr "引用 %s 的日誌�外終止於 %s"
+
+#: refs.c:994
+#, c-format
+msgid "log for %s is empty"
+msgstr "%s 的日誌為空"
+
+#: refs.c:1086
+#, c-format
+msgid "refusing to update ref with bad name '%s'"
+msgstr "拒絕更新有錯誤�稱 '%s' 的引用"
+
+#: refs.c:1157
+#, c-format
+msgid "update_ref failed for ref '%s': %s"
+msgstr "�引用 '%s' 執行 update_ref 失敗：%s"
+
+#: refs.c:2051
+#, c-format
+msgid "multiple updates for ref '%s' not allowed"
+msgstr "��許�引用 '%s' 多次更新"
+
+#: refs.c:2131
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "在隔離環境中�止更新引用"
+
+#: refs.c:2142
+msgid "ref updates aborted by hook"
+msgstr "引用更新被掛鉤拒絕"
+
+#: refs.c:2242 refs.c:2272
+#, c-format
+msgid "'%s' exists; cannot create '%s'"
+msgstr "'%s' 已存在，無法建立 '%s'"
+
+#: refs.c:2248 refs.c:2283
+#, c-format
+msgid "cannot process '%s' and '%s' at the same time"
+msgstr "無法�時處� '%s' 和 '%s'"
+
+#: refs/files-backend.c:1228
+#, 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
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "無法刪除引用 %s：%s"
+
+#: refs/files-backend.c:1245 refs/packed-backend.c:1555
+#, c-format
+msgid "could not delete references: %s"
+msgstr "無法刪除引用：%s"
+
+#: refspec.c:170
+#, c-format
+msgid "invalid refspec '%s'"
+msgstr "無效的引用表��：'%s'"
+
+#: remote.c:351
+#, c-format
+msgid "config remote shorthand cannot begin with '/': %s"
+msgstr "設定的�端短�稱�能以 '/' 開始：%s"
+
+#: remote.c:399
+msgid "more than one receivepack given, using the first"
+msgstr "�供了一個以上的 receivepack，使用第一個"
+
+#: remote.c:407
+msgid "more than one uploadpack given, using the first"
+msgstr "�供了一個以上的 uploadpack，使用第一個"
+
+#: remote.c:590
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "�能�時�得 %s 和 %s 至 %s"
+
+#: remote.c:594
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s 通常追蹤 %s，而� %s"
+
+#: remote.c:598
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s �時追蹤 %s 和 %s"
+
+#: remote.c:666
+#, c-format
+msgid "key '%s' of pattern had no '*'"
+msgstr "模�的� '%s' 沒有 '*'"
+
+#: remote.c:676
+#, c-format
+msgid "value '%s' of pattern has no '*'"
+msgstr "模�的值 '%s' 沒有 '*'"
+
+#: remote.c:1083
+#, c-format
+msgid "src refspec %s does not match any"
+msgstr "�引用表�� %s 沒有符�"
+
+#: remote.c:1088
+#, c-format
+msgid "src refspec %s matches more than one"
+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
+#, 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"
+"\n"
+"- Looking for a ref that matches '%s' on the remote side.\n"
+"- Checking if the <src> being pushed ('%s')\n"
+"  is a ref in \"refs/{heads,tags}/\". If so we add a corresponding\n"
+"  refs/{heads,tags}/ prefix on the remote side.\n"
+"\n"
+"Neither worked, so we gave up. You must fully qualify the ref."
+msgstr ""
+"您�供的目標�是一個完整的引用�稱（�以 \"refs/\" 開頭）。我們\n"
+"試著猜測您的想法：\n"
+"\n"
+"- 在�端查詢和 '%s' 符�的引用。\n"
+"- 檢查�推�的 <src>（'%s'）是�是在 \"refs/{heads,tags}/\" 中的\n"
+"  引用。如果是，我們會在�應的�端新增 refs/{heads,tags}/ �綴。\n"
+"\n"
+"都�行，所以我們已放棄。您必須給出完整的引用。"
+
+#: remote.c:1123
+#, 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' 推�嗎？"
+
+#: remote.c:1128
+#, 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' 推�嗎？"
+
+#: remote.c:1133
+#, 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' 推�嗎？"
+
+#: remote.c:1138
+#, 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' 推�嗎？"
+
+#: remote.c:1174
+#, c-format
+msgid "%s cannot be resolved to branch"
+msgstr "%s 無法被解�為分支"
+
+#: remote.c:1185
+#, c-format
+msgid "unable to delete '%s': remote ref does not exist"
+msgstr "無法刪除 '%s'：�端引用�存在"
+
+#: remote.c:1197
+#, c-format
+msgid "dst refspec %s matches more than one"
+msgstr "目標引用表�� %s 符�超�一個"
+
+#: remote.c:1204
+#, c-format
+msgid "dst ref %s receives from more than one src"
+msgstr "目標引用 %s 接收超�一個�"
+
+#: remote.c:1724 remote.c:1825
+msgid "HEAD does not point to a branch"
+msgstr "HEAD 沒有指�一個分支"
+
+#: remote.c:1733
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "沒有此分支：'%s'"
+
+#: remote.c:1736
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "尚未給分支 '%s' 設定上游"
+
+#: remote.c:1742
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "上游分支 '%s' 沒有儲存為一個�端追蹤分支"
+
+#: remote.c:1757
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr "推�目標 '%s' 至�端 '%s' 沒有本機追蹤分支"
+
+#: remote.c:1769
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "分支 '%s' 沒有設定�推�的�端伺�器"
+
+#: remote.c:1779
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "� '%s' 推�引用�格未包� '%s'"
+
+#: remote.c:1792
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "推�無目標（push.default 是 'nothing'）"
+
+#: remote.c:1814
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "無法解� 'simple' 推�至一個單�的目標"
+
+#: remote.c:1943
+#, c-format
+msgid "couldn't find remote ref %s"
+msgstr "無法找到�端引用 %s"
+
+#: remote.c:1956
+#, c-format
+msgid "* Ignoring funny ref '%s' locally"
+msgstr "* 在本機忽略�笑的引用 '%s'"
+
+#: remote.c:2119
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "您的分支基於 '%s'，但此上游分支已經�存在。\n"
+
+#: remote.c:2123
+msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr "  （使用 \"git branch --unset-upstream\" 來修復）\n"
+
+#: remote.c:2126
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "您的分支與上游分支 '%s' 一致。\n"
+
+#: remote.c:2130
+#, c-format
+msgid "Your branch and '%s' refer to different commits.\n"
+msgstr "您的分支和 '%s' 指���的�交。\n"
+
+#: remote.c:2133
+#, c-format
+msgid "  (use \"%s\" for details)\n"
+msgstr "  （使用 \"%s\" 檢視詳情）\n"
+
+#: 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] "您的分支領先 '%s' 共 %d 個�交。\n"
+
+#: remote.c:2143
+msgid "  (use \"git push\" to publish your local commits)\n"
+msgstr "  （使用 \"git push\" 來發布您的本機�交）\n"
+
+#: remote.c:2146
+#, c-format
+msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
+msgid_plural ""
+"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
+msgstr[0] "您的分支�後 '%s' 共 %d 個�交，並且�以快轉。\n"
+
+#  譯者：請維��導空格
+#: remote.c:2154
+msgid "  (use \"git pull\" to update your local branch)\n"
+msgstr "  （使用 \"git pull\" 來更新您的本機分支）\n"
+
+#: remote.c:2157
+#, c-format
+msgid ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commit each, respectively.\n"
+msgid_plural ""
+"Your branch and '%s' have diverged,\n"
+"and have %d and %d different commits each, respectively.\n"
+msgstr[0] ""
+"您的分支和 '%s' 出�了�離，\n"
+"並且分別有 %d 和 %d 處��的�交。\n"
+
+#  譯者：請維��導空格
+#: remote.c:2167
+msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr "  （使用 \"git pull\" 來�併�端分支）\n"
+
+#: remote.c:2359
+#, c-format
+msgid "cannot parse expected object name '%s'"
+msgstr "無法解�期望的物件� '%s'"
+
+#: replace-object.c:21
+#, c-format
+msgid "bad replace ref name: %s"
+msgstr "錯誤的�代引用�稱：%s"
+
+#: replace-object.c:30
+#, c-format
+msgid "duplicate replace ref: %s"
+msgstr "�複的�代引用：%s"
+
+#: replace-object.c:82
+#, c-format
+msgid "replace depth too high for object %s"
+msgstr "物件 %s 的�代層級太深"
+
+#: rerere.c:201 rerere.c:210 rerere.c:213
+msgid "corrupt MERGE_RR"
+msgstr "�壞的 MERGE_RR"
+
+#: rerere.c:248 rerere.c:253
+msgid "unable to write rerere record"
+msgstr "無法寫入 rerere 記錄"
+
+#: rerere.c:479
+#, c-format
+msgid "there were errors while writing '%s' (%s)"
+msgstr "寫入 '%s' (%s) 時發生錯誤"
+
+#: rerere.c:482
+#, c-format
+msgid "failed to flush '%s'"
+msgstr "�新整� '%s' 失敗"
+
+#: rerere.c:487 rerere.c:1023
+#, c-format
+msgid "could not parse conflict hunks in '%s'"
+msgstr "�能解� '%s' 中的���塊"
+
+#: rerere.c:668
+#, c-format
+msgid "failed utime() on '%s'"
+msgstr "在 '%s' 上呼� utime() 失敗"
+
+#: rerere.c:678
+#, c-format
+msgid "writing '%s' failed"
+msgstr "寫入 '%s' 失敗"
+
+#: rerere.c:698
+#, c-format
+msgid "Staged '%s' using previous resolution."
+msgstr "使用之�的解決方案暫存 '%s'。"
+
+#: rerere.c:737
+#, c-format
+msgid "Recorded resolution for '%s'."
+msgstr "已記錄 '%s' 的解決方案。"
+
+#: rerere.c:772
+#, c-format
+msgid "Resolved '%s' using previous resolution."
+msgstr "使用之�的解決方案解決 '%s'。"
+
+#: rerere.c:787
+#, c-format
+msgid "cannot unlink stray '%s'"
+msgstr "�能刪除 stray '%s'"
+
+#: rerere.c:791
+#, c-format
+msgid "Recorded preimage for '%s'"
+msgstr "為 '%s' 記錄 preimage"
+
+#: 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 "�能建立目錄 '%s'"
+
+#: rerere.c:1041
+#, c-format
+msgid "failed to update conflicted state in '%s'"
+msgstr "更新 '%s' 中的��狀態失敗"
+
+#: rerere.c:1052 rerere.c:1059
+#, c-format
+msgid "no remembered resolution for '%s'"
+msgstr "沒有為 '%s' 記憶的解決方案"
+
+#: rerere.c:1061
+#, c-format
+msgid "cannot unlink '%s'"
+msgstr "�能刪除 '%s'"
+
+#: rerere.c:1071
+#, c-format
+msgid "Updated preimage for '%s'"
+msgstr "已為 '%s' 更新 preimage"
+
+#: rerere.c:1080
+#, c-format
+msgid "Forgot resolution for '%s'\n"
+msgstr "忘記 '%s' 的解決方案\n"
+
+#: rerere.c:1191
+msgid "unable to open rr-cache directory"
+msgstr "�能開啟 rr-cache 目錄"
+
+#: reset.c:42
+msgid "could not determine HEAD revision"
+msgstr "�能確定 HEAD 版本"
+
+#: reset.c:69 reset.c:75 sequencer.c:3689
+#, c-format
+msgid "failed to find tree of %s"
+msgstr "無法找到 %s 指�的樹"
+
+#: revision.c:2344
+msgid "--unpacked=<packfile> no longer supported"
+msgstr "--unpacked=<packfile> 已��支�"
+
+#: revision.c:2684
+msgid "your current branch appears to be broken"
+msgstr "您的目�分支好�被�壞"
+
+#: revision.c:2687
+#, c-format
+msgid "your current branch '%s' does not have any commits yet"
+msgstr "您的目�分支 '%s' 尚無任何�交"
+
+#: revision.c:2893
+msgid "-L does not yet support diff formats besides -p and -s"
+msgstr "-L 尚�支� -p 和 -s 之外的差異格�"
+
+#: run-command.c:766
+msgid "open /dev/null failed"
+msgstr "�能開啟 /dev/null"
+
+#: run-command.c:1274
+#, c-format
+msgid "cannot create async thread: %s"
+msgstr "�能建立 async 執行緒：%s"
+
+#: 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 ""
+"因為沒有將掛鉤 '%s' 設定為�執行，掛鉤被忽略。您�以��\n"
+"設定 `git config advice.ignoredHook false` 來關閉這�警告。"
+
+#: send-pack.c:150
+msgid "unexpected flush packet while reading remote unpack status"
+msgstr "讀��端解包狀態時收到�外的 flush 包"
+
+#: send-pack.c:152
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "�能解��端解包狀態：%s"
+
+#: send-pack.c:154
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "�端解包失敗：%s"
+
+#: send-pack.c:378
+msgid "failed to sign the push certificate"
+msgstr "為推�證書籤�失敗"
+
+#: send-pack.c:433
+msgid "send-pack: unable to fork off fetch subprocess"
+msgstr "send-pack：無法 fork 一個 fetch �處�程�"
+
+#: send-pack.c:455
+msgid "push negotiation failed; proceeding anyway with push"
+msgstr "push �商失敗。繼續使用 push 處�"
+
+#: send-pack.c:526
+msgid "the receiving end does not support this repository's hash algorithm"
+msgstr "接收端�支�此版本庫的雜湊算法"
+
+#: send-pack.c:535
+msgid "the receiving end does not support --signed push"
+msgstr "接收端�支� --signed 推�"
+
+#: send-pack.c:537
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr "未傳�推�證書，因為接收端�支� --signed 推�"
+
+#: send-pack.c:544
+msgid "the receiving end does not support --atomic push"
+msgstr "接收端�支� --atomic 推�"
+
+#: send-pack.c:549
+msgid "the receiving end does not support push options"
+msgstr "接收端�支�推��項"
+
+#: sequencer.c:196
+#, c-format
+msgid "invalid commit message cleanup mode '%s'"
+msgstr "無效的�交說明清�模� '%s'"
+
+#: sequencer.c:324
+#, c-format
+msgid "could not delete '%s'"
+msgstr "無法刪除 '%s'"
+
+#: sequencer.c:344 builtin/rebase.c:757 builtin/rebase.c:1592 builtin/rm.c:402
+#, c-format
+msgid "could not remove '%s'"
+msgstr "無法刪除 '%s'"
+
+#: sequencer.c:354
+msgid "revert"
+msgstr "復原"
+
+#: sequencer.c:356
+msgid "cherry-pick"
+msgstr "摘�"
+
+#: sequencer.c:358
+msgid "rebase"
+msgstr "rebase"
+
+#: sequencer.c:360
+#, c-format
+msgid "unknown action: %d"
+msgstr "未知動作：%d"
+
+#: sequencer.c:419
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"��解決完畢後，用 'git add <路徑>' 或 'git rm <路徑>'\n"
+"指令標記修正後的檔案"
+
+#: sequencer.c:422
+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' �交"
+
+#: sequencer.c:435 sequencer.c:3271
+#, c-format
+msgid "could not lock '%s'"
+msgstr "�能鎖定 '%s'"
+
+#: 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 "�能寫入 '%s'"
+
+#: sequencer.c:442
+#, 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:3555
+#, c-format
+msgid "failed to finalize '%s'"
+msgstr "無法完� '%s'"
+
+#: sequencer.c:486
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "您的本機修改將被%s覆蓋。"
+
+#: sequencer.c:490
+msgid "commit your changes or stash them to proceed."
+msgstr "�交您的修改或儲�後�繼續。"
+
+#: sequencer.c:522
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s：快轉"
+
+#: sequencer.c:561 builtin/tag.c:609
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "無效的清�模� %s"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase".
+#.
+#: sequencer.c:671
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s：無法寫入新索引檔案"
+
+#: sequencer.c:685
+msgid "unable to update cache tree"
+msgstr "�能更新快�樹"
+
+#: sequencer.c:699
+msgid "could not resolve HEAD commit"
+msgstr "�能解� HEAD �交"
+
+#: sequencer.c:779
+#, c-format
+msgid "no key present in '%.*s'"
+msgstr "在 '%.*s' 中沒有 key"
+
+#: sequencer.c:790
+#, c-format
+msgid "unable to dequote value of '%s'"
+msgstr "無法為 '%s' 的值去引號"
+
+#: 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 "無法開啟 '%s' 進行讀�"
+
+#: sequencer.c:837
+msgid "'GIT_AUTHOR_NAME' already given"
+msgstr "已經給出 'GIT_AUTHOR_NAME'"
+
+#: sequencer.c:842
+msgid "'GIT_AUTHOR_EMAIL' already given"
+msgstr "已經給出 'GIT_AUTHOR_EMAIL'"
+
+#: sequencer.c:847
+msgid "'GIT_AUTHOR_DATE' already given"
+msgstr "已經給出 'GIT_AUTHOR_DATE'"
+
+#: sequencer.c:851
+#, c-format
+msgid "unknown variable '%s'"
+msgstr "未知變數 '%s'"
+
+#: sequencer.c:856
+msgid "missing 'GIT_AUTHOR_NAME'"
+msgstr "缺少 'GIT_AUTHOR_NAME'"
+
+#: sequencer.c:858
+msgid "missing 'GIT_AUTHOR_EMAIL'"
+msgstr "缺少 'GIT_AUTHOR_EMAIL'"
+
+#: sequencer.c:860
+msgid "missing 'GIT_AUTHOR_DATE'"
+msgstr "缺少 'GIT_AUTHOR_DATE'"
+
+#: sequencer.c:925
+#, c-format
+msgid ""
+"you have staged changes in your working tree\n"
+"If these changes are meant to be squashed into the previous commit, run:\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"If they are meant to go into a new commit, run:\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"In both cases, once you're done, continue with:\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"您的工作�中存在已暫存的修改\n"
+"如果這些修改需�被併入�一個�交，執行：\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"如果這些修改�形�一個新�交，執行：\n"
+"\n"
+"  git commit %s\n"
+"\n"
+"無論哪種情�，當您完��交，繼續執行：\n"
+"\n"
+"  git rebase --continue\n"
+
+#: sequencer.c:1212
+msgid "'prepare-commit-msg' hook failed"
+msgstr "'prepare-commit-msg' 掛鉤失敗"
+
+#: 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"
+"You can suppress this message by setting them explicitly. Run the\n"
+"following command and follow the instructions in your editor to edit\n"
+"your configuration file:\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"您的姓�和信件��基於登入�稱和主機�稱自動設定。請檢查它們正確\n"
+"與�。您�以�其進行設定以��出�本�示訊�。執行如下指令在編輯器\n"
+"中編輯您的設定檔案：\n"
+"\n"
+"    git config --global --edit\n"
+"\n"
+"設定完畢後，您�以用下�的指令來修正本次�交所使用的使用者身份：\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:1231
+msgid ""
+"Your name and email address were configured automatically based\n"
+"on your username and hostname. Please check that they are accurate.\n"
+"You can suppress this message by setting them explicitly:\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"After doing this, you may fix the identity used for this commit with:\n"
+"\n"
+"    git commit --amend --reset-author\n"
+msgstr ""
+"您的姓�和信件��基於登入�稱和主機�稱自動設定。請檢查它們正確\n"
+"與�。您�以�其進行設定以��出�本�示訊�：\n"
+"\n"
+"    git config --global user.name \"Your Name\"\n"
+"    git config --global user.email you@example.com\n"
+"\n"
+"設定完畢後，您�以用下�的指令來修正本次�交所使用的使用者身份：\n"
+"\n"
+"    git commit --amend --reset-author\n"
+
+#: sequencer.c:1273
+msgid "couldn't look up newly created commit"
+msgstr "無法找到新建立的�交"
+
+#: sequencer.c:1275
+msgid "could not parse newly created commit"
+msgstr "�能解�新建立的�交"
+
+#: sequencer.c:1321
+msgid "unable to resolve HEAD after creating commit"
+msgstr "建立�交後，�能解� HEAD"
+
+#: sequencer.c:1323
+msgid "detached HEAD"
+msgstr "分離 HEAD"
+
+#  譯者：中文字串拼接，�刪除�導空格
+#: sequencer.c:1327
+msgid " (root-commit)"
+msgstr " (根�交)"
+
+#: sequencer.c:1348
+msgid "could not parse HEAD"
+msgstr "�能解� HEAD"
+
+#: sequencer.c:1350
+#, c-format
+msgid "HEAD %s is not a commit!"
+msgstr "HEAD %s �是一個�交�"
+
+#: sequencer.c:1354 sequencer.c:1432 builtin/commit.c:1705
+msgid "could not parse HEAD commit"
+msgstr "�能解� HEAD �交"
+
+#: sequencer.c:1410 sequencer.c:2295
+msgid "unable to parse commit author"
+msgstr "�能解��交作者"
+
+#: sequencer.c:1421 builtin/am.c:1615 builtin/merge.c:707
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree 無法寫入樹狀物件"
+
+#: sequencer.c:1454 sequencer.c:1574
+#, c-format
+msgid "unable to read commit message from '%s'"
+msgstr "�能從 '%s' 讀��交說明"
+
+#: sequencer.c:1485 sequencer.c:1517
+#, c-format
+msgid "invalid author identity '%s'"
+msgstr "無效的作者身分 '%s'"
+
+#: sequencer.c:1491
+msgid "corrupt author: missing date information"
+msgstr "作者資訊�壞：缺少日期資訊"
+
+#: 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 "寫�交物件失敗"
+
+#: 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 "�能更新 %s"
+
+#: sequencer.c:1606
+#, c-format
+msgid "could not parse commit %s"
+msgstr "�能解��交 %s"
+
+#: sequencer.c:1611
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "�能解�父�交 %s"
+
+#: sequencer.c:1694 sequencer.c:1975
+#, c-format
+msgid "unknown command: %d"
+msgstr "未知指令：%d"
+
+#: sequencer.c:1736 git-rebase--preserve-merges.sh:486
+msgid "This is the 1st commit message:"
+msgstr "這是第一個�交說明："
+
+#: sequencer.c:1737
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "這是�交說明 #%d："
+
+#: sequencer.c:1738
+msgid "The 1st commit message will be skipped:"
+msgstr "略�第 1 個�交說明："
+
+#: sequencer.c:1739
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "略�第 %d 個�交說明："
+
+#: sequencer.c:1740
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "這是整� %d 個�交的集��交。"
+
+#: sequencer.c:1887 sequencer.c:1944
+#, c-format
+msgid "cannot write '%s'"
+msgstr "�能寫 '%s'"
+
+#: sequencer.c:1934
+msgid "need a HEAD to fixup"
+msgstr "需�一個 HEAD 來修復"
+
+#: sequencer.c:1936 sequencer.c:3582
+msgid "could not read HEAD"
+msgstr "�能讀� HEAD"
+
+#: sequencer.c:1938
+msgid "could not read HEAD's commit message"
+msgstr "�能讀� HEAD 的�交說明"
+
+#: sequencer.c:1962
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "�能讀� %s 的�交說明"
+
+#: sequencer.c:2072
+msgid "your index file is unmerged."
+msgstr "您的索引檔案未完��併。"
+
+#: sequencer.c:2079
+msgid "cannot fixup root commit"
+msgstr "�能修復根�交"
+
+#: sequencer.c:2098
+#, c-format
+msgid "commit %s is a merge but no -m option was given."
+msgstr "�交 %s 是一個�併�交但未�供 -m �項。"
+
+#: sequencer.c:2106 sequencer.c:2114
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "�交 %s 沒有第 %d 個父�交"
+
+#: sequencer.c:2120
+#, 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
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s：�能解�父�交 %s"
+
+#: sequencer.c:2205
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "�能將 '%s' �新命�為 '%s'"
+
+#: sequencer.c:2265
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "�能還原 %s... %s"
+
+#: sequencer.c:2266
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "�能套用 %s... %s"
+
+#: sequencer.c:2287
+#, c-format
+msgid "dropping %s %s -- patch contents already upstream\n"
+msgstr "拋棄 %s %s -- 修補檔的內容已在上游\n"
+
+#: sequencer.c:2345
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s：無法讀�索引"
+
+#: sequencer.c:2352
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s：無法�新整�索引"
+
+#: sequencer.c:2425
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s �接��數：'%s'"
+
+#: sequencer.c:2434
+#, c-format
+msgid "missing arguments for %s"
+msgstr "缺少 %s 的�數"
+
+#: sequencer.c:2477
+#, c-format
+msgid "could not parse '%s'"
+msgstr "無法解� '%s'"
+
+#: sequencer.c:2538
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "無效行 %d：%.*s"
+
+#: sequencer.c:2549
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "沒有父�交的情�下�能 '%s'"
+
+#: sequencer.c:2635
+msgid "cancelling a cherry picking in progress"
+msgstr "正在�消一個進行中的��"
+
+#: sequencer.c:2644
+msgid "cancelling a revert in progress"
+msgstr "正在�消一個進行中的還原"
+
+#: sequencer.c:2690
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "請用 'git rebase --edit-todo' 來修改。"
+
+#: sequencer.c:2692
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "��用的指令清單：'%s'"
+
+#: sequencer.c:2697
+msgid "no commits parsed."
+msgstr "沒有解��交。"
+
+#: sequencer.c:2708
+msgid "cannot cherry-pick during a revert."
+msgstr "�能在還原�交中執行��。"
+
+#: sequencer.c:2710
+msgid "cannot revert during a cherry-pick."
+msgstr "�能在��中執行還原�交。"
+
+#: sequencer.c:2788
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "%s 的值無效：%s"
+
+#: sequencer.c:2897
+msgid "unusable squash-onto"
+msgstr "��用的 squash-onto"
+
+#: sequencer.c:2917
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "格�錯誤的�項清單：'%s'"
+
+#: sequencer.c:3012 sequencer.c:4868
+msgid "empty commit set passed"
+msgstr "�供了空的�交集"
+
+#: sequencer.c:3029
+msgid "revert is already in progress"
+msgstr "一個還原動作已在進行"
+
+#: sequencer.c:3031
+#, c-format
+msgid "try \"git revert (--continue | %s--abort | --quit)\""
+msgstr "嘗試 \"git revert (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:3034
+msgid "cherry-pick is already in progress"
+msgstr "��動作已在進行"
+
+#: sequencer.c:3036
+#, c-format
+msgid "try \"git cherry-pick (--continue | %s--abort | --quit)\""
+msgstr "嘗試 \"git cherry-pick (--continue | %s--abort | --quit)\""
+
+#: sequencer.c:3050
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "�能建立�列目錄 '%s'"
+
+#: sequencer.c:3065
+msgid "could not lock HEAD"
+msgstr "�能鎖定 HEAD"
+
+#: sequencer.c:3125 sequencer.c:4581
+msgid "no cherry-pick or revert in progress"
+msgstr "��或還原動作並未進行"
+
+#: sequencer.c:3127 sequencer.c:3138
+msgid "cannot resolve HEAD"
+msgstr "�能解� HEAD"
+
+#: sequencer.c:3129 sequencer.c:3173
+msgid "cannot abort from a branch yet to be born"
+msgstr "�能從尚未建立的分支終止"
+
+#: sequencer.c:3159 builtin/grep.c:758
+#, c-format
+msgid "cannot open '%s'"
+msgstr "�能開啟 '%s'"
+
+#: sequencer.c:3161
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "�能讀� '%s'：%s"
+
+#: sequencer.c:3162
+msgid "unexpected end of file"
+msgstr "�外的檔案��"
+
+#: sequencer.c:3168
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "儲存���交�的 HEAD 檔案 '%s' �壞"
+
+#: sequencer.c:3179
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "您好�移動了 HEAD。未能還原，檢查您的 HEAD�"
+
+#: sequencer.c:3220
+msgid "no revert in progress"
+msgstr "沒有正在進行的還原"
+
+#: sequencer.c:3229
+msgid "no cherry-pick in progress"
+msgstr "沒有正在進行的��"
+
+#: sequencer.c:3239
+msgid "failed to skip the commit"
+msgstr "無法略�這個�交"
+
+#: sequencer.c:3246
+msgid "there is nothing to skip"
+msgstr "沒有�略�的"
+
+#: sequencer.c:3249
+#, c-format
+msgid ""
+"have you committed already?\n"
+"try \"git %s --continue\""
+msgstr ""
+"您已經�交了嗎？\n"
+"試試 \"git %s --continue\""
+
+#: sequencer.c:3411 sequencer.c:4472
+msgid "cannot read HEAD"
+msgstr "�能讀� HEAD"
+
+#: sequencer.c:3428
+#, c-format
+msgid "unable to copy '%s' to '%s'"
+msgstr "無法複製 '%s' 至 '%s'"
+
+#: sequencer.c:3436
+#, c-format
+msgid ""
+"You can amend the commit now, with\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"Once you are satisfied with your changes, run\n"
+"\n"
+"  git rebase --continue\n"
+msgstr ""
+"您�在�以修補這個�交，使用\n"
+"\n"
+"  git commit --amend %s\n"
+"\n"
+"當您�變更感到滿�，執行\n"
+"\n"
+"  git rebase --continue\n"
+
+#: sequencer.c:3446
+#, c-format
+msgid "Could not apply %s... %.*s"
+msgstr "�能套用 %s... %.*s"
+
+#: sequencer.c:3453
+#, c-format
+msgid "Could not merge %.*s"
+msgstr "�能�併 %.*s"
+
+#: sequencer.c:3467 sequencer.c:3471 builtin/difftool.c:644
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "�能複製 '%s' 至 '%s'"
+
+#: sequencer.c:3483
+#, c-format
+msgid "Executing: %s\n"
+msgstr "執行：%s\n"
+
+#  譯者：請維��導空格
+#: sequencer.c:3498
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"執行失敗：%s\n"
+"%s您�以改正該�題，然後執行\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c:3504
+msgid "and made changes to the index and/or the working tree\n"
+msgstr "並且修改索引和/或工作�\n"
+
+#: sequencer.c:3510
+#, c-format
+msgid ""
+"execution succeeded: %s\n"
+"but left changes to the index and/or the working tree\n"
+"Commit or stash your changes, and then run\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+msgstr ""
+"執行�功：%s\n"
+"但是在索引和/或工作�中存在變更\n"
+"�交或儲�修改，然後執行\n"
+"\n"
+"  git rebase --continue\n"
+"\n"
+
+#: sequencer.c:3572
+#, c-format
+msgid "illegal label name: '%.*s'"
+msgstr "�法的標籤�稱：'%.*s'"
+
+#: sequencer.c:3645
+msgid "writing fake root commit"
+msgstr "寫�根�交"
+
+#: sequencer.c:3650
+msgid "writing squash-onto"
+msgstr "寫入 squash-onto"
+
+#: sequencer.c:3734
+#, c-format
+msgid "could not resolve '%s'"
+msgstr "無法解� '%s'"
+
+#: sequencer.c:3767
+msgid "cannot merge without a current revision"
+msgstr "沒有目�版本�能�併"
+
+#: sequencer.c:3789
+#, c-format
+msgid "unable to parse '%.*s'"
+msgstr "無法解� '%.*s'"
+
+#: sequencer.c:3798
+#, c-format
+msgid "nothing to merge: '%.*s'"
+msgstr "無�用�併：'%.*s'"
+
+#: sequencer.c:3810
+msgid "octopus merge cannot be executed on top of a [new root]"
+msgstr "章魚�並�能在一個新的根�交上執行"
+
+#: sequencer.c:3826
+#, c-format
+msgid "could not get commit message of '%s'"
+msgstr "�能�得 '%s' 的�交說明"
+
+#: sequencer.c:4009
+#, c-format
+msgid "could not even attempt to merge '%.*s'"
+msgstr "甚至�能嘗試�併 '%.*s'"
+
+#: sequencer.c:4025
+msgid "merge: Unable to write new index file"
+msgstr "�併：無法寫入新索引檔案"
+
+#: sequencer.c:4099
+msgid "Cannot autostash"
+msgstr "無法 autostash"
+
+#: sequencer.c:4102
+#, c-format
+msgid "Unexpected stash response: '%s'"
+msgstr "�外的 stash 回應：'%s'"
+
+#: sequencer.c:4108
+#, c-format
+msgid "Could not create directory for '%s'"
+msgstr "�能為 '%s' 建立目錄"
+
+#: sequencer.c:4111
+#, c-format
+msgid "Created autostash: %s\n"
+msgstr "建立了 autostash：%s\n"
+
+#: sequencer.c:4115
+msgid "could not reset --hard"
+msgstr "無法 reset --hard"
+
+#: sequencer.c:4140
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "已套用 autostash。\n"
+
+#: sequencer.c:4152
+#, c-format
+msgid "cannot store %s"
+msgstr "�能儲存 %s"
+
+#: sequencer.c:4155
+#, 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"
+"您的修改安全地儲存在儲��中。\n"
+"您�以在任何時候執行 \"git stash pop\" 或 \"git stash drop\"。\n"
+
+#: sequencer.c:4160
+msgid "Applying autostash resulted in conflicts."
+msgstr "因套用自動儲�而導致��。"
+
+#: sequencer.c:4161
+msgid "Autostash exists; creating a new stash entry."
+msgstr "已有自動儲�；建立新儲�項目。"
+
+#: sequencer.c:4233 git-rebase--preserve-merges.sh:769
+msgid "could not detach HEAD"
+msgstr "�能分離開頭指標"
+
+#: sequencer.c:4248
+#, c-format
+msgid "Stopped at HEAD\n"
+msgstr "�止在 HEAD\n"
+
+#: sequencer.c:4250
+#, c-format
+msgid "Stopped at %s\n"
+msgstr "�止在 %s\n"
+
+#: sequencer.c:4258
+#, c-format
+msgid ""
+"Could not execute the todo command\n"
+"\n"
+"    %.*s\n"
+"It has been rescheduled; To edit the command before continuing, please\n"
+"edit the todo list first:\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+msgstr ""
+"無法執行待辦指令\n"
+"\n"
+"    %.*s\n"
+"已被�新安排，在繼續之�編輯指令，請先編輯待辦列表：\n"
+"\n"
+"    git rebase --edit-todo\n"
+"    git rebase --continue\n"
+
+#: sequencer.c:4304
+#, c-format
+msgid "Rebasing (%d/%d)%s"
+msgstr "正在�定基底 (%d/%d)%s"
+
+#: sequencer.c:4350
+#, c-format
+msgid "Stopped at %s...  %.*s\n"
+msgstr "�止在 %s... %.*s\n"
+
+#: sequencer.c:4421
+#, c-format
+msgid "unknown command %d"
+msgstr "未知指令 %d"
+
+#: sequencer.c:4480
+msgid "could not read orig-head"
+msgstr "�能讀� orig-head"
+
+#: sequencer.c:4485
+msgid "could not read 'onto'"
+msgstr "�能讀� 'onto'"
+
+#: sequencer.c:4499
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "�能更新 HEAD 為 %s"
+
+#: sequencer.c:4559
+#, c-format
+msgid "Successfully rebased and updated %s.\n"
+msgstr "�功�定基底並更新 %s。\n"
+
+#: sequencer.c:4611
+msgid "cannot rebase: You have unstaged changes."
+msgstr "�能�定基底：您有未暫存的變更。"
+
+#: sequencer.c:4620
+msgid "cannot amend non-existing commit"
+msgstr "�能修補�存在的�交"
+
+#: sequencer.c:4622
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "無效檔案：'%s'"
+
+#: sequencer.c:4624
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "無效內容：'%s'"
+
+#: sequencer.c:4627
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"您的工作�中有未�交的變更。請先�交然後�次執行 'git rebase --continue'。"
+
+#: sequencer.c:4663 sequencer.c:4702
+#, c-format
+msgid "could not write file: '%s'"
+msgstr "�能寫入檔案：'%s'"
+
+#: sequencer.c:4718
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "�能刪除 CHERRY_PICK_HEAD"
+
+#: sequencer.c:4725
+msgid "could not commit staged changes."
+msgstr "�能�交暫存的修改。"
+
+#: sequencer.c:4845
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s：�能��一個%s"
+
+#: sequencer.c:4849
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s：錯誤的版本"
+
+#: sequencer.c:4884
+msgid "can't revert as initial commit"
+msgstr "�能作為�始�交還原�交"
+
+#: sequencer.c:5361
+msgid "make_script: unhandled options"
+msgstr "make_script：有未能處�的�項"
+
+#: sequencer.c:5364
+msgid "make_script: error preparing revisions"
+msgstr "make_script：準備版本時錯誤"
+
+#: sequencer.c:5614 sequencer.c:5631
+msgid "nothing to do"
+msgstr "無事��"
+
+#: sequencer.c:5650
+msgid "could not skip unnecessary pick commands"
+msgstr "無法略��必�的��"
+
+#: sequencer.c:5750
+msgid "the script was already rearranged."
+msgstr "腳本已經�新編排。"
+
+#: setup.c:133
+#, c-format
+msgid "'%s' is outside repository at '%s'"
+msgstr "'%s' 在�於 '%s' 的版本庫之外"
+
+#: setup.c:185
+#, 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：工作�中無此路徑。\n"
+"使用指令 'git <命令> -- <路徑>...' 來指定本機�存在的路徑。"
+
+#: setup.c:198
+#, 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 ""
+"有歧義的�數 '%s'：未知的版本或路徑�存在於工作�中。\n"
+"使用 '--' 來分隔版本和路徑，例如：\n"
+"'git <命令> [<版本>...] -- [<檔案>...]'"
+
+#: setup.c:264
+#, c-format
+msgid "option '%s' must come before non-option arguments"
+msgstr "�項 '%s' 必須在其他��項�數之�"
+
+#: setup.c:283
+#, c-format
+msgid ""
+"ambiguous argument '%s': both revision and filename\n"
+"Use '--' to separate paths from revisions, like this:\n"
+"'git <command> [<revision>...] -- [<file>...]'"
+msgstr ""
+"有歧義的�數 '%s'：��時是版本和檔案\n"
+"使用 '--' 來分隔版本和路徑，例如：\n"
+"'git <命令> [<版本>...] -- [<檔案>...]'"
+
+#: setup.c:419
+msgid "unable to set up work tree using invalid config"
+msgstr "無法使用無效設定來建立工作�"
+
+#: setup.c:423 builtin/rev-parse.c:895
+msgid "this operation must be run in a work tree"
+msgstr "該動作必須在一個工作�中執行"
+
+#: setup.c:658
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "期望 git 版本庫版本 <= %d，�得到 %d"
+
+#: setup.c:666
+msgid "unknown repository extension found:"
+msgid_plural "unknown repository extensions found:"
+msgstr[0] "找到未知的儲存庫擴充元件："
+
+#: 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] "repo 版本是 0 (v0)，但找到�支� v1 的擴充元件："
+
+#: setup.c:701
+#, c-format
+msgid "error opening '%s'"
+msgstr "開啟 '%s' 發生錯誤"
+
+#: setup.c:703
+#, c-format
+msgid "too large to be a .git file: '%s'"
+msgstr "檔案太大，無法作為 .git 檔案：'%s'"
+
+#: setup.c:705
+#, c-format
+msgid "error reading %s"
+msgstr "讀� %s 發生錯誤"
+
+#: setup.c:707
+#, c-format
+msgid "invalid gitfile format: %s"
+msgstr "無效的 gitfile 格�：%s"
+
+#: setup.c:709
+#, c-format
+msgid "no path in gitfile: %s"
+msgstr "在 gitfile 中沒有路徑：%s"
+
+#: setup.c:711
+#, c-format
+msgid "not a git repository: %s"
+msgstr "�是一個 git 版本庫：%s"
+
+#: setup.c:813
+#, c-format
+msgid "'$%s' too big"
+msgstr "'$%s' 太大"
+
+#: setup.c:827
+#, c-format
+msgid "not a git repository: '%s'"
+msgstr "�是一個 git 版本庫：'%s'"
+
+#: setup.c:856 setup.c:858 setup.c:889
+#, c-format
+msgid "cannot chdir to '%s'"
+msgstr "�能切�目錄到 '%s'"
+
+#: setup.c:861 setup.c:917 setup.c:927 setup.c:966 setup.c:974
+msgid "cannot come back to cwd"
+msgstr "無法返回目�工作目錄"
+
+#: setup.c:988
+#, c-format
+msgid "failed to stat '%*s%s%s'"
+msgstr "�得 '%*s%s%s' 狀態（stat）失敗"
+
+#: setup.c:1231
+msgid "Unable to read current working directory"
+msgstr "�能讀�目�工作目錄"
+
+#: setup.c:1240 setup.c:1246
+#, c-format
+msgid "cannot change to '%s'"
+msgstr "�能切�到 '%s'"
+
+#: setup.c:1251
+#, c-format
+msgid "not a git repository (or any of the parent directories): %s"
+msgstr "�是一個 git 版本庫（或者任何父目錄）：%s"
+
+#: 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 ""
+"�是一個 git 版本庫（或者直至掛載點 %s 的任何父目錄）\n"
+"�止在檔案系統邊界（未設定 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
+
+#: 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."
+msgstr ""
+"�數 core.sharedRepository 的檔案屬性值有�題（0%.3o）。\n"
+"檔案所有者必須始終�有讀寫權�。"
+
+#: setup.c:1430
+msgid "open /dev/null or dup failed"
+msgstr "�能開啟或者複製 /dev/null"
+
+#: setup.c:1445
+msgid "fork failed"
+msgstr "fork 失敗"
+
+#: setup.c:1450 t/helper/test-simple-ipc.c:285
+msgid "setsid failed"
+msgstr "setsid 失敗"
+
+#: sparse-index.c:162
+msgid "attempting to use sparse-index without cone mode"
+msgstr "嘗試�在 cone 模�使用稀�索引"
+
+#: sparse-index.c:176
+msgid "unable to update cache-tree, staying full"
+msgstr "無法更新快�樹，��完整"
+
+#: sparse-index.c:263
+#, c-format
+msgid "index entry is a directory, but not sparse (%08x)"
+msgstr "索引項目是資料夾，但�是稀�資料夾（%08x）"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte
+#: strbuf.c:850
+#, c-format
+msgid "%u.%2.2u GiB"
+msgstr "%u.%2.2u GiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 gibibyte/second
+#: 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:860
+#, c-format
+msgid "%u.%2.2u MiB"
+msgstr "%u.%2.2u MiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 mebibyte/second
+#: 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:869
+#, c-format
+msgid "%u.%2.2u KiB"
+msgstr "%u.%2.2u KiB"
+
+#. TRANSLATORS: IEC 80000-13:2008 kibibyte/second
+#: 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:877
+#, c-format
+msgid "%u byte"
+msgid_plural "%u bytes"
+msgstr[0] "%u �元組"
+
+#. TRANSLATORS: IEC 80000-13:2008 byte/second
+#: strbuf.c:879
+#, c-format
+msgid "%u byte/s"
+msgid_plural "%u bytes/s"
+msgstr[0] "%u �元組/秒"
+
+#: 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 "無法開啟 '%s' 進行寫入"
+
+#: strbuf.c:1177
+#, c-format
+msgid "could not edit '%s'"
+msgstr "無法編輯 '%s'"
+
+#: submodule-config.c:237
+#, c-format
+msgid "ignoring suspicious submodule name: %s"
+msgstr "忽略�疑的�模組�稱：%s"
+
+#: submodule-config.c:304
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs ��許為負值"
+
+#: submodule-config.c:402
+#, c-format
+msgid "ignoring '%s' which may be interpreted as a command-line option: %s"
+msgstr "忽略�能被解�為指令列�項的 '%s'：%s"
+
+#: submodule-config.c:499
+#, c-format
+msgid "invalid value for %s"
+msgstr "%s 的值無效"
+
+#: submodule-config.c:766
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "�能更新 .gitmodules �目 %s"
+
+#: submodule.c:114 submodule.c:143
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr "無法修改未�併的 .gitmodules，先解決�併��"
+
+#: submodule.c:118 submodule.c:147
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "無法在 .gitmodules 中找到 path=%s 的�節"
+
+#: submodule.c:154
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "無法移除 %s 的 .gitmodules �目"
+
+#: submodule.c:165
+msgid "staging updated .gitmodules failed"
+msgstr "將更新後 .gitmodules 新增暫存�失敗"
+
+#: submodule.c:328
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "�於未簽出的�模組 '%s'"
+
+#: submodule.c:359
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "路徑�格 '%s' 在�模組 '%.*s' 中"
+
+#: submodule.c:436
+#, c-format
+msgid "bad --ignore-submodules argument: %s"
+msgstr "無效 --ignore-submodules �數：%s"
+
+#: submodule.c:805
+#, c-format
+msgid ""
+"Submodule in commit %s at path: '%s' collides with a submodule named the "
+"same. Skipping it."
+msgstr "%s �交�於路徑：'%s' 的�模組與��的�模組��。略�。"
+
+#: submodule.c:908
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "�模組�目 '%s'（%s）是一個 %s，�是一個�交"
+
+#: submodule.c:993
+#, 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:1116
+#, c-format
+msgid "process for submodule '%s' failed"
+msgstr "處� '%s' �模組失敗"
+
+#: submodule.c:1145 builtin/branch.c:691 builtin/submodule--helper.c:2486
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "無法將 HEAD 解�為有效引用。"
+
+#: submodule.c:1156
+#, c-format
+msgid "Pushing submodule '%s'\n"
+msgstr "正在推� '%s' �模組\n"
+
+#: submodule.c:1159
+#, c-format
+msgid "Unable to push submodule '%s'\n"
+msgstr "無法推� '%s' �模組\n"
+
+#: submodule.c:1451
+#, c-format
+msgid "Fetching submodule %s%s\n"
+msgstr "正在抓� %s%s �模組\n"
+
+#: submodule.c:1485
+#, c-format
+msgid "Could not access submodule '%s'\n"
+msgstr "無法存��模組 '%s'\n"
+
+#: submodule.c:1640
+#, c-format
+msgid ""
+"Errors during submodule fetch:\n"
+"%s"
+msgstr ""
+"抓��模組時發生錯誤：\n"
+"%s"
+
+#: submodule.c:1665
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "無法將 '%s' 識別為一個 git 版本庫"
+
+#: submodule.c:1682
+#, c-format
+msgid "Could not run 'git status --porcelain=2' in submodule %s"
+msgstr "無法在 %s �模組執行 'git status --porcelain=2'"
+
+#: submodule.c:1723
+#, c-format
+msgid "'git status --porcelain=2' failed in submodule %s"
+msgstr "%s �模組執行 'git status --porcelain=2' 失敗"
+
+#: submodule.c:1798
+#, c-format
+msgid "could not start 'git status' in submodule '%s'"
+msgstr "無法在�模組 '%s' 中啟動 'git status'"
+
+#: submodule.c:1811
+#, c-format
+msgid "could not run 'git status' in submodule '%s'"
+msgstr "無法在�模組 '%s' 中執行 'git status'"
+
+#: submodule.c:1826
+#, c-format
+msgid "Could not unset core.worktree setting in submodule '%s'"
+msgstr "無法在�模組 '%s' 中�消 core.worktree 的設定"
+
+#: submodule.c:1853 submodule.c:2163
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "無法�迴�模組路徑 '%s'"
+
+#: submodule.c:1874
+msgid "could not reset submodule index"
+msgstr "無法�設�模組的索引"
+
+#: submodule.c:1916
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "�模組 '%s' 中有髒索引"
+
+#: submodule.c:1968
+#, c-format
+msgid "Submodule '%s' could not be updated."
+msgstr "�模組 '%s' 無法被更新。"
+
+#: submodule.c:2036
+#, c-format
+msgid "submodule git dir '%s' is inside git dir '%.*s'"
+msgstr "「%s��模組 git 目錄在「%.*s�git 路徑中"
+
+#: submodule.c:2057
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr "�支��有多個工作�的�模組 '%s' 執行 relocate_gitdir"
+
+#: submodule.c:2069 submodule.c:2128
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "�能查詢�模組 '%s' 的�稱"
+
+#: submodule.c:2073
+#, c-format
+msgid "refusing to move '%s' into an existing git dir"
+msgstr "拒絕移動「%s�至�存 git 目錄"
+
+#: submodule.c:2080
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"將 '%s%s' 的 git 目錄從\n"
+"'%s' �移至\n"
+"'%s'\n"
+
+#: submodule.c:2208
+msgid "could not start ls-files in .."
+msgstr "無法在 .. 中啟動 ls-files"
+
+#: submodule.c:2248
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree 返回未知返回值 %d"
+
+#: symlinks.c:244
+#, c-format
+msgid "failed to lstat '%s'"
+msgstr "無法 lstat “%s�"
+
+#: trailer.c:244
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "執行 trailer 指令 '%s' 失敗"
+
+#: 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 "� '%2$s' 的未知�值 '%1$s'"
+
+#: 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 "多於一個 %s"
+
+#: trailer.c:743
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "簽� '%.*s' 的�為空"
+
+#: trailer.c:763
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "�能讀�輸入檔案 '%s'"
+
+#: trailer.c:766 builtin/mktag.c:88 imap-send.c:1577
+msgid "could not read from stdin"
+msgstr "�能自標準輸入讀�"
+
+#: trailer.c:1024 wrapper.c:676
+#, c-format
+msgid "could not stat %s"
+msgstr "�能� %s 呼� stat"
+
+#: trailer.c:1026
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "檔案 %s �是一個正�檔案"
+
+#: trailer.c:1028
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "檔案 %s 使用者��寫"
+
+#: trailer.c:1040
+msgid "could not open temporary file"
+msgstr "�能開啟暫存檔"
+
+#: trailer.c:1080
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "�能�新命�暫存檔為 %s"
+
+#: transport-helper.c:62 transport-helper.c:91
+msgid "full write to remote helper failed"
+msgstr "完整寫入�端�助工具失敗"
+
+#: transport-helper.c:145
+#, c-format
+msgid "unable to find remote helper for '%s'"
+msgstr "無法為 '%s' 找到�端�助工具"
+
+#: transport-helper.c:161 transport-helper.c:575
+msgid "can't dup helper output fd"
+msgstr "無法複製�助工具輸出檔案�柄"
+
+#: transport-helper.c:214
+#, c-format
+msgid ""
+"unknown mandatory capability %s; this remote helper probably needs newer "
+"version of Git"
+msgstr "未知的強制能力 %s，該�端�助工具�能需�新版本的Git"
+
+#: transport-helper.c:220
+msgid "this remote helper should implement refspec capability"
+msgstr "�端�助工具需�實� refspec 能力"
+
+#: transport-helper.c:287 transport-helper.c:429
+#, c-format
+msgid "%s unexpectedly said: '%s'"
+msgstr "%s �外地說：'%s'"
+
+#: transport-helper.c:417
+#, c-format
+msgid "%s also locked %s"
+msgstr "%s 也鎖定了 %s"
+
+#: transport-helper.c:497
+msgid "couldn't run fast-import"
+msgstr "�能執行 fast-import"
+
+#: transport-helper.c:520
+msgid "error while running fast-import"
+msgstr "執行 fast-import 發生錯誤"
+
+#: transport-helper.c:549 transport-helper.c:1247
+#, c-format
+msgid "could not read ref %s"
+msgstr "無法讀�引用 %s"
+
+#: transport-helper.c:594
+#, c-format
+msgid "unknown response to connect: %s"
+msgstr "連線時未知的回應：%s"
+
+#: transport-helper.c:616
+msgid "setting remote service path not supported by protocol"
+msgstr "�定�支�設定�端�務路徑"
+
+#: transport-helper.c:618
+msgid "invalid remote service path"
+msgstr "無效的�端�務路徑"
+
+#: transport-helper.c:661 transport.c:1477
+msgid "operation not supported by protocol"
+msgstr "�定�支�該動作"
+
+#: transport-helper.c:664
+#, c-format
+msgid "can't connect to subservice %s"
+msgstr "�能連線到��務 %s"
+
+#: transport-helper.c:693 transport.c:400
+msgid "--negotiate-only requires protocol v2"
+msgstr "--negotiate-only 需� v2 版�定"
+
+#: transport-helper.c:755
+msgid "'option' without a matching 'ok/error' directive"
+msgstr "'option' 缺少�應的 'ok/error' 指令"
+
+#: transport-helper.c:798
+#, c-format
+msgid "expected ok/error, helper said '%s'"
+msgstr "�期 ok/error，�助工具說 '%s'"
+
+#: transport-helper.c:855
+#, c-format
+msgid "helper reported unexpected status of %s"
+msgstr "�助工具報告 %s 的�外狀態"
+
+#: transport-helper.c:938
+#, c-format
+msgid "helper %s does not support dry-run"
+msgstr "�助工具 %s �支� dry-run"
+
+#: transport-helper.c:941
+#, c-format
+msgid "helper %s does not support --signed"
+msgstr "�助工具 %s �支� --signed"
+
+#: transport-helper.c:944
+#, c-format
+msgid "helper %s does not support --signed=if-asked"
+msgstr "�助工具 %s �支� --signed=if-asked"
+
+#: transport-helper.c:949
+#, c-format
+msgid "helper %s does not support --atomic"
+msgstr "�助工具 %s �支� --atomic"
+
+#: transport-helper.c:953
+#, c-format
+msgid "helper %s does not support --%s"
+msgstr "�助工具 %s �支� --%s"
+
+#: transport-helper.c:960
+#, c-format
+msgid "helper %s does not support 'push-option'"
+msgstr "�助工具 %s �支� 'push-option'"
+
+#: transport-helper.c:1060
+msgid "remote-helper doesn't support push; refspec needed"
+msgstr "remote-heper �支� push，需�引用表��"
+
+#: transport-helper.c:1065
+#, c-format
+msgid "helper %s does not support 'force'"
+msgstr "�助工具 %s �支� 'force'"
+
+#: transport-helper.c:1112
+msgid "couldn't run fast-export"
+msgstr "無法執行 fast-export"
+
+#: transport-helper.c:1117
+msgid "error while running fast-export"
+msgstr "執行 fast-export 時發生錯誤"
+
+#: 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 ""
+"沒有共�的引用並且也沒有指定，什麼也�會�。\n"
+"您或許得指定一個分支。\n"
+
+#: transport-helper.c:1224
+#, c-format
+msgid "unsupported object format '%s'"
+msgstr "�支�的物件格�「%s�"
+
+#: transport-helper.c:1233
+#, c-format
+msgid "malformed response in ref list: %s"
+msgstr "引用列表中格�錯誤的回應：%s"
+
+#: transport-helper.c:1385
+#, c-format
+msgid "read(%s) failed"
+msgstr "讀�（%s）失敗"
+
+#: transport-helper.c:1412
+#, c-format
+msgid "write(%s) failed"
+msgstr "寫（%s）失敗"
+
+#: transport-helper.c:1461
+#, c-format
+msgid "%s thread failed"
+msgstr "%s 執行緒失敗"
+
+#: transport-helper.c:1465
+#, c-format
+msgid "%s thread failed to join: %s"
+msgstr "%s 執行緒等待失敗：%s"
+
+#: transport-helper.c:1484 transport-helper.c:1488
+#, c-format
+msgid "can't start thread for copying data: %s"
+msgstr "�能啟動執行緒來複製資料：%s"
+
+#: transport-helper.c:1525
+#, c-format
+msgid "%s process failed to wait"
+msgstr "%s 進程等待失敗"
+
+#: transport-helper.c:1529
+#, c-format
+msgid "%s process failed"
+msgstr "%s 進程失敗"
+
+#: transport-helper.c:1547 transport-helper.c:1556
+msgid "can't start thread for copying data"
+msgstr "�能啟動執行緒來複製資料"
+
+#: transport.c:116
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "將�設定 '%1$s' 的上游為 '%3$s' 的 '%2$s'\n"
+
+#: transport.c:145
+#, c-format
+msgid "could not read bundle '%s'"
+msgstr "無法讀� bundle '%s'"
+
+#: transport.c:223
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "傳輸：無效的深度�項 '%s'"
+
+#: transport.c:275
+msgid "see protocol.version in 'git help config' for more details"
+msgstr "檢視 'git help config' 中的 protocol.version �得更多訊�"
+
+#: transport.c:276
+msgid "server options require protocol version 2 or later"
+msgstr "�務端�項需�版本 2 �定或更高"
+
+#: transport.c:403
+msgid "server does not support wait-for-done"
+msgstr "伺�器�支�「等待完��(wait-for-done) 功能"
+
+#: transport.c:755
+msgid "could not parse transport.color.* config"
+msgstr "�能解� transport.color.* 設定"
+
+#: transport.c:830
+msgid "support for protocol v2 not implemented yet"
+msgstr "�定 v2 的支�尚未實�"
+
+#: transport.c:965
+#, c-format
+msgid "unknown value for config '%s': %s"
+msgstr "設定 '%s' 的�值未知：%s"
+
+#: transport.c:1031
+#, c-format
+msgid "transport '%s' not allowed"
+msgstr "傳輸 '%s' ��許"
+
+#: transport.c:1084
+msgid "git-over-rsync is no longer supported"
+msgstr "��支� git-over-rsync"
+
+#: transport.c:1187
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr "下列�模組路徑所包�的修改在任何�端�中都找�到：\n"
+
+#: transport.c:1191
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"請嘗試\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"或者進入到�目錄執行\n"
+"\n"
+"\tgit push\n"
+"\n"
+"以推�至�端。\n"
+"\n"
+
+#: transport.c:1199
+msgid "Aborting."
+msgstr "正在終止。"
+
+#: transport.c:1346
+msgid "failed to push all needed submodules"
+msgstr "�能推�全部需�的�模組"
+
+#: tree-walk.c:33
+msgid "too-short tree object"
+msgstr "太短的樹狀物件"
+
+#: tree-walk.c:39
+msgid "malformed mode in tree entry"
+msgstr "樹狀物件中的�目模�錯誤"
+
+#: tree-walk.c:43
+msgid "empty filename in tree entry"
+msgstr "樹狀物件�目中空的檔案�"
+
+#: tree-walk.c:118
+msgid "too-short tree file"
+msgstr "太短的樹檔案"
+
+#: unpack-trees.c:115
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%sPlease commit your changes or stash them before you switch branches."
+msgstr ""
+"您�下列檔案的本機修改將被簽出動作覆蓋：\n"
+"%%s請在切�分支��交或儲�您的修改。"
+
+#: unpack-trees.c:117
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"您�下列檔案的本機修改將被簽出動作覆蓋：\n"
+"%%s"
+
+#: unpack-trees.c:120
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%sPlease commit your changes or stash them before you merge."
+msgstr ""
+"您�下列檔案的本機修改將被�併動作覆蓋：\n"
+"%%s請在�併��交或儲�您的修改。"
+
+#: unpack-trees.c:122
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"您�下列檔案的本機修改將被�併動作覆蓋：\n"
+"%%s"
+
+#: 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 ""
+"您�下列檔案的本機修改將被 %s 覆蓋：\n"
+"%%s請在 %s 之��交或儲�您的修改。"
+
+#: unpack-trees.c:127
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"您�下列檔案的本機修改將被 %s 覆蓋：\n"
+"%%s"
+
+#: unpack-trees.c:132
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"更新如下目錄將會�失其中未追蹤的檔案：\n"
+"%s"
+
+#: 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 ""
+"工作�中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
+"%%s請在切�分支之�移動或刪除。"
+
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"工作�中下列未追蹤的檔案將會因為簽出動作而被刪除：\n"
+"%%s"
+
+#: 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 ""
+"工作�中下列未追蹤的檔案將會因為�併動作而被刪除：\n"
+"%%s請在�併�移動或刪除。"
+
+#: unpack-trees.c:143
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"工作�中下列未追蹤的檔案將會因為�併動作而被刪除：\n"
+"%%s"
+
+#: 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 ""
+"工作�中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
+"%%s請在 %s �移動或刪除。"
+
+#: unpack-trees.c:148
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"工作�中下列未追蹤的檔案將會因為 %s 動作而被刪除：\n"
+"%%s"
+
+#: 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 ""
+"工作�中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
+"%%s請在切�分支�移動或刪除。"
+
+#: unpack-trees.c:156
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"工作�中下列未追蹤的檔案將會因為簽出動作而被覆蓋：\n"
+"%%s"
+
+#: 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 ""
+"工作�中下列未追蹤的檔案將會因為�併動作而被覆蓋：\n"
+"%%s請在�併�移動或刪除。"
+
+#: unpack-trees.c:161
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"工作�中下列未追蹤的檔案將會因為�併動作而被覆蓋：\n"
+"%%s"
+
+#: 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 ""
+"工作�中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
+"%%s請在 %s �移動或刪除。"
+
+#: unpack-trees.c:166
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"工作�中下列未追蹤的檔案將會因為 %s 動作而被覆蓋：\n"
+"%%s"
+
+#: unpack-trees.c:174
+#, c-format
+msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
+msgstr "�目 '%s' 和 '%s' �疊。無法�併。"
+
+#: unpack-trees.c:177
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"無法更新�模組：\n"
+"%s"
+
+#: unpack-trees.c:180
+#, c-format
+msgid ""
+"The following paths are not up to date and were left despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"�使有稀�簽出樣�，以下路徑�是最新且�留下來：\n"
+"%s"
+
+#: unpack-trees.c:182
+#, c-format
+msgid ""
+"The following paths are unmerged and were left despite sparse patterns:\n"
+"%s"
+msgstr ""
+"�使有稀�簽出樣�，以下路徑未�併且�留下來：\n"
+"%s"
+
+#: unpack-trees.c:184
+#, c-format
+msgid ""
+"The following paths were already present and thus not updated despite sparse "
+"patterns:\n"
+"%s"
+msgstr ""
+"�使有稀�簽出樣�，以下路徑已經存在而因此未更新：\n"
+"%s"
+
+#: unpack-trees.c:264
+#, c-format
+msgid "Aborting\n"
+msgstr "正在終止\n"
+
+#: unpack-trees.c:291
+#, 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
+msgid "Updating files"
+msgstr "正在更新檔案"
+
+#: 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 ""
+"以下路徑發生碰撞（如：在��分大�寫的檔案系統上的�分大�寫的路徑），\n"
+"並且碰撞組中�有一個檔案存在工作�中：\n"
+
+#: unpack-trees.c:1618
+msgid "Updating index flags"
+msgstr "正在更新索引旗標"
+
+#: unpack-trees.c:2718
+#, c-format
+msgid "worktree and untracked commit have duplicate entries: %s"
+msgstr "工作�和未追蹤�交有�複項目：%s"
+
+#: upload-pack.c:1548
+msgid "expected flush after fetch arguments"
+msgstr "在 fetch 引數應為一個 flush 包"
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "無效的 URL 方案�稱或�失 '://' 後綴"
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "無效的 %XX 轉義�列"
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "缺少主機�稱且 URL 方案�是 'file:'"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "一個 'file:' URL �應該包�埠號"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "主機�稱中包�無效的字元"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "無效的埠號"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "無效的 '..' 路徑�塊"
+
+#: walker.c:170
+msgid "Fetching objects"
+msgstr "正在抓�物件"
+
+#: worktree.c:236 builtin/am.c:2152
+#, c-format
+msgid "failed to read '%s'"
+msgstr "讀� '%s' 失敗"
+
+#: worktree.c:303
+#, c-format
+msgid "'%s' at main working tree is not the repository directory"
+msgstr "在主工作�的 '%s' �是版本庫目錄"
+
+#: worktree.c:314
+#, c-format
+msgid "'%s' file does not contain absolute path to the working tree location"
+msgstr "檔案 '%s' �包�工作�的絕�路徑"
+
+#: worktree.c:326
+#, c-format
+msgid "'%s' does not exist"
+msgstr "'%s' �存在"
+
+#: worktree.c:332
+#, c-format
+msgid "'%s' is not a .git file, error code %d"
+msgstr "'%s' �是一個 .git 檔案，錯誤碼 %d"
+
+#: worktree.c:341
+#, c-format
+msgid "'%s' does not point back to '%s'"
+msgstr "'%s' 沒有指回到 '%s'"
+
+#: worktree.c:603
+msgid "not a directory"
+msgstr "�是目錄"
+
+#: worktree.c:612
+msgid ".git is not a file"
+msgstr ".git �是檔案"
+
+#: worktree.c:614
+msgid ".git file broken"
+msgstr ".git 檔案�毀"
+
+#: worktree.c:616
+msgid ".git file incorrect"
+msgstr ".git 檔案�正確"
+
+#: worktree.c:722
+msgid "not a valid path"
+msgstr "�有效路徑"
+
+#: worktree.c:728
+msgid "unable to locate repository; .git is not a file"
+msgstr "無法定�版本庫；.git �是檔案"
+
+#: worktree.c:732
+msgid "unable to locate repository; .git file does not reference a repository"
+msgstr "無法定�版本庫；.git 檔案未�考版本庫"
+
+#: worktree.c:736
+msgid "unable to locate repository; .git file broken"
+msgstr "無法定�版本庫；.git 檔案�壞"
+
+#: worktree.c:742
+msgid "gitdir unreadable"
+msgstr "無法讀� gitdir"
+
+#: worktree.c:746
+msgid "gitdir incorrect"
+msgstr "�正確的 gitdir"
+
+#: worktree.c:771
+msgid "not a valid directory"
+msgstr "�有效目錄"
+
+#: worktree.c:777
+msgid "gitdir file does not exist"
+msgstr "找�到 gitdir 檔案"
+
+#: worktree.c:782 worktree.c:791
+#, c-format
+msgid "unable to read gitdir file (%s)"
+msgstr "無法讀� gitdir 檔案 (%s)"
+
+#: worktree.c:801
+#, c-format
+msgid "short read (expected %<PRIuMAX> bytes, read %<PRIuMAX>)"
+msgstr "讀��短（�期有 %<PRIuMAX> �元組，�讀到 %<PRIuMAX>）"
+
+#: worktree.c:809
+msgid "invalid gitdir file"
+msgstr "gitdir 檔案無效"
+
+#: worktree.c:817
+msgid "gitdir file points to non-existent location"
+msgstr "gitdir 檔案指�的�置�存在"
+
+#: wrapper.c:197 wrapper.c:367
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "無法開啟 '%s' 進行讀寫"
+
+#: wrapper.c:398 wrapper.c:599
+#, c-format
+msgid "unable to access '%s'"
+msgstr "�能存� '%s'"
+
+#: wrapper.c:607
+msgid "unable to get current working directory"
+msgstr "�能�得目�工作目錄"
+
+#: wt-status.c:158
+msgid "Unmerged paths:"
+msgstr "未�併的路徑："
+
+#  譯者：請維��導空格
+#: wt-status.c:187 wt-status.c:219
+msgid "  (use \"git restore --staged <file>...\" to unstage)"
+msgstr "  （使用 \"git restore --staged <檔案>...\" 以�消暫存）"
+
+#  譯者：請維��導空格
+#: wt-status.c:190 wt-status.c:222
+#, c-format
+msgid "  (use \"git restore --source=%s --staged <file>...\" to unstage)"
+msgstr "  （使用 \"git restore --source=%s --staged <檔案>...\" 以�消暫存）"
+
+#  譯者：請維��導空格
+#: wt-status.c:193 wt-status.c:225
+msgid "  (use \"git rm --cached <file>...\" to unstage)"
+msgstr "  （使用 \"git rm --cached <檔案>...\" 以�消暫存）"
+
+#  譯者：請維��導空格
+#: wt-status.c:197
+msgid "  (use \"git add <file>...\" to mark resolution)"
+msgstr "  （使用 \"git add <檔案>...\" 標記解決方案）"
+
+#  譯者：請維��導空格
+#: wt-status.c:199 wt-status.c:203
+msgid "  (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr "  （酌情使用 \"git add/rm <檔案>...\" 標記解決方案）"
+
+#  譯者：請維��導空格
+#: wt-status.c:201
+msgid "  (use \"git rm <file>...\" to mark resolution)"
+msgstr "  （使用 \"git rm <檔案>...\" 標記解決方案）"
+
+#: wt-status.c:211 wt-status.c:1125
+msgid "Changes to be committed:"
+msgstr "��交的變更："
+
+#: wt-status.c:234 wt-status.c:1134
+msgid "Changes not staged for commit:"
+msgstr "尚未暫存以備�交的變更："
+
+#  譯者：請維��導空格
+#: wt-status.c:238
+msgid "  (use \"git add <file>...\" to update what will be committed)"
+msgstr "  （使用 \"git add <檔案>...\" 更新��交的內容）"
+
+#  譯者：請維��導空格
+#: wt-status.c:240
+msgid "  (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr "  （使用 \"git add/rm <檔案>...\" 更新��交的內容）"
+
+#  譯者：請維��導空格
+#: wt-status.c:241
+msgid ""
+"  (use \"git restore <file>...\" to discard changes in working directory)"
+msgstr "  （使用 \"git restore <檔案>...\" �棄工作�的改動）"
+
+#  譯者：請維��導空格
+#: wt-status.c:243
+msgid "  (commit or discard the untracked or modified content in submodules)"
+msgstr "  （�交或�棄�模組中未追蹤或修改的內容）"
+
+#  譯者：請維��導空格
+#: wt-status.c:254
+#, c-format
+msgid "  (use \"git %s <file>...\" to include in what will be committed)"
+msgstr "  （使用 \"git %s <檔案>...\" 以包���交的內容）"
+
+#: wt-status.c:266
+msgid "both deleted:"
+msgstr "雙方刪除："
+
+#: wt-status.c:268
+msgid "added by us:"
+msgstr "由我們新增："
+
+#: wt-status.c:270
+msgid "deleted by them:"
+msgstr "由他們刪除："
+
+#: wt-status.c:272
+msgid "added by them:"
+msgstr "由他們新增："
+
+#: wt-status.c:274
+msgid "deleted by us:"
+msgstr "由我們刪除："
+
+#: wt-status.c:276
+msgid "both added:"
+msgstr "雙方新增："
+
+#: wt-status.c:278
+msgid "both modified:"
+msgstr "雙方修改："
+
+#: wt-status.c:288
+msgid "new file:"
+msgstr "新檔案："
+
+#: wt-status.c:290
+msgid "copied:"
+msgstr "複製："
+
+#: wt-status.c:292
+msgid "deleted:"
+msgstr "刪除："
+
+#: wt-status.c:294
+msgid "modified:"
+msgstr "修改："
+
+#: wt-status.c:296
+msgid "renamed:"
+msgstr "�新命�："
+
+#: wt-status.c:298
+msgid "typechange:"
+msgstr "類型變更："
+
+#: wt-status.c:300
+msgid "unknown:"
+msgstr "未知："
+
+#: wt-status.c:302
+msgid "unmerged:"
+msgstr "未�併："
+
+#  譯者：末尾兩個�元組�能被刪減，如果翻譯為中文標點會出��個漢字
+#: wt-status.c:382
+msgid "new commits, "
+msgstr "新�交, "
+
+#  譯者：末尾兩個�元組�能被刪減，如果翻譯為中文標點會出��個漢字
+#: wt-status.c:384
+msgid "modified content, "
+msgstr "修改的內容, "
+
+#  譯者：末尾兩個�元組�能被刪減，如果翻譯為中文標點會出��個漢字
+#: wt-status.c:386
+msgid "untracked content, "
+msgstr "未追蹤的內容, "
+
+#: wt-status.c:958
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "您的儲��目�有 %d �紀錄"
+
+#: wt-status.c:989
+msgid "Submodules changed but not updated:"
+msgstr "�模組已修改但尚未更新："
+
+#: wt-status.c:991
+msgid "Submodule changes to be committed:"
+msgstr "��交的�模組變更："
+
+#: wt-status.c:1073
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"��改動或刪除上�的一行。\n"
+"其下所有內容都將被忽略。"
+
+#: wt-status.c:1165
+#, 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 ""
+"\n"
+"花了 %.2f 秒�計算出分支的領先/�後範�。\n"
+"為��，您�以使用 '--no-ahead-behind'。\n"
+
+#: wt-status.c:1195
+msgid "You have unmerged paths."
+msgstr "您有尚未�併的路徑。"
+
+#  譯者：請維��導空格
+#: wt-status.c:1198
+msgid "  (fix conflicts and run \"git commit\")"
+msgstr "  （解決��並執行 \"git commit\"）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1200
+msgid "  (use \"git merge --abort\" to abort the merge)"
+msgstr "  （使用 \"git merge --abort\" 終止�併）"
+
+#: wt-status.c:1204
+msgid "All conflicts fixed but you are still merging."
+msgstr "所有��已解決但您�處於�併中。"
+
+#  譯者：請維��導空格
+#: wt-status.c:1207
+msgid "  (use \"git commit\" to conclude merge)"
+msgstr "  （使用 \"git commit\" ���併）"
+
+#: wt-status.c:1216
+msgid "You are in the middle of an am session."
+msgstr "您正處於 am 動作�程中。"
+
+#: wt-status.c:1219
+msgid "The current patch is empty."
+msgstr "目�的修補檔為空。"
+
+#  譯者：請維��導空格
+#: wt-status.c:1223
+msgid "  (fix conflicts and then run \"git am --continue\")"
+msgstr "  （解決��，然後執行 \"git am --continue\"）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1225
+msgid "  (use \"git am --skip\" to skip this patch)"
+msgstr "  （使用 \"git am --skip\" 略�此修補檔）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1227
+msgid "  (use \"git am --abort\" to restore the original branch)"
+msgstr "  （使用 \"git am --abort\" 復原原有分支）"
+
+#: wt-status.c:1360
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo �失。"
+
+#: wt-status.c:1362
+msgid "No commands done."
+msgstr "沒有指令被執行。"
+
+#: wt-status.c:1365
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "最後一�指令已完�（%d �指令被執行）："
+
+#: wt-status.c:1376
+#, c-format
+msgid "  (see more in file %s)"
+msgstr "  （更多�見檔案 %s）"
+
+#: wt-status.c:1381
+msgid "No commands remaining."
+msgstr "未剩下任何指令。"
+
+#: 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] "接下來�執行的指令（剩餘 %d �指令）："
+
+#  譯者：請維��導空格
+#: wt-status.c:1392
+msgid "  (use \"git rebase --edit-todo\" to view and edit)"
+msgstr "  （使用 \"git rebase --edit-todo\" 來檢視和編輯）"
+
+#: wt-status.c:1404
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "您在執行將分支 '%s' �定基底到 '%s' 的動作。"
+
+#: wt-status.c:1409
+msgid "You are currently rebasing."
+msgstr "您在執行�定基底動作。"
+
+#  譯者：請維��導空格
+#: wt-status.c:1422
+msgid "  (fix conflicts and then run \"git rebase --continue\")"
+msgstr "  （解決��，然後執行 \"git rebase --continue\"）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1424
+msgid "  (use \"git rebase --skip\" to skip this patch)"
+msgstr "  （使用 \"git rebase --skip\" 略�此修補檔）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1426
+msgid "  (use \"git rebase --abort\" to check out the original branch)"
+msgstr "  （使用 \"git rebase --abort\" 以簽出原有分支）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1433
+msgid "  (all conflicts fixed: run \"git rebase --continue\")"
+msgstr "  （所有��已解決：執行 \"git rebase --continue\"）"
+
+#: wt-status.c:1437
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr "您在執行將分支 '%s' �定基底到 '%s' 的動作時分割�交。"
+
+#: wt-status.c:1442
+msgid "You are currently splitting a commit during a rebase."
+msgstr "您在執行�定基底動作時分割�交。"
+
+#  譯者：請維��導空格
+#: wt-status.c:1445
+msgid "  (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr "  （一旦您工作目錄�交乾淨後，執行 \"git rebase --continue\"）"
+
+#: wt-status.c:1449
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr "您在執行將分支 '%s' �定基底到 '%s' 的動作時編輯�交。"
+
+#: wt-status.c:1454
+msgid "You are currently editing a commit during a rebase."
+msgstr "您在執行�定基底動作時編輯�交。"
+
+#  譯者：請維��導空格
+#: wt-status.c:1457
+msgid "  (use \"git commit --amend\" to amend the current commit)"
+msgstr "  （使用 \"git commit --amend\" 修補目��交）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1459
+msgid ""
+"  (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr "  （當您�您的修改滿�後執行 \"git rebase --continue\"）"
+
+#: wt-status.c:1470
+msgid "Cherry-pick currently in progress."
+msgstr "��動作正在進行中。"
+
+#: wt-status.c:1473
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "您在執行���交 %s 的動作。"
+
+#  譯者：請維��導空格
+#: wt-status.c:1480
+msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr "  （解決��並執行 \"git cherry-pick --continue\"）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1483
+msgid "  (run \"git cherry-pick --continue\" to continue)"
+msgstr "  （執行 \"git cherry-pick --continue\" 以繼續）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1486
+msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr "  （所有��已解決：執行 \"git cherry-pick --continue\"）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1488
+msgid "  (use \"git cherry-pick --skip\" to skip this patch)"
+msgstr "  （使用 \"git cherry-pick --skip\" 略�此修補檔）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1490
+msgid "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr "  （使用 \"git cherry-pick --abort\" 以�消��動作）"
+
+#: wt-status.c:1500
+msgid "Revert currently in progress."
+msgstr "還原動作正在進行中。"
+
+#: wt-status.c:1503
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "您在執行�轉�交 %s 的動作。"
+
+#  譯者：請維��導空格
+#: wt-status.c:1509
+msgid "  (fix conflicts and run \"git revert --continue\")"
+msgstr "  （解決��並執行 \"git revert --continue\"）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1512
+msgid "  (run \"git revert --continue\" to continue)"
+msgstr "  （執行 \"git revert --continue\" 以繼續）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1515
+msgid "  (all conflicts fixed: run \"git revert --continue\")"
+msgstr "  （所有��已解決：執行 \"git revert --continue\"）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1517
+msgid "  (use \"git revert --skip\" to skip this patch)"
+msgstr "  （使用 \"git revert --skip\" 略�此修補檔）"
+
+#  譯者：請維��導空格
+#: wt-status.c:1519
+msgid "  (use \"git revert --abort\" to cancel the revert operation)"
+msgstr "  （使用 \"git revert --abort\" 以�消�轉�交動作）"
+
+#: wt-status.c:1529
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "您在執行從分支 '%s' 開始的二分�尋動作。"
+
+#: wt-status.c:1533
+msgid "You are currently bisecting."
+msgstr "您在執行二分�尋動作。"
+
+#  譯者：請維��導空格
+#: wt-status.c:1536
+msgid "  (use \"git bisect reset\" to get back to the original branch)"
+msgstr "  （使用 \"git bisect reset\" 簽出原有分支）"
+
+#: wt-status.c:1547
+msgid "You are in a sparse checkout."
+msgstr "您正在稀�簽出的工作�中。"
+
+#: wt-status.c:1550
+#, c-format
+msgid "You are in a sparse checkout with %d%% of tracked files present."
+msgstr "您處於稀�簽出狀態，包� %d%% 的追蹤檔案。"
+
+#: wt-status.c:1794
+msgid "On branch "
+msgstr "�於分支 "
+
+#: wt-status.c:1801
+msgid "interactive rebase in progress; onto "
+msgstr "互動��定基底動作正在進行中；至 "
+
+#: wt-status.c:1803
+msgid "rebase in progress; onto "
+msgstr "�定基底動作正在進行中；至 "
+
+#: wt-status.c:1808
+msgid "HEAD detached at "
+msgstr "開頭指標分離於 "
+
+#: wt-status.c:1810
+msgid "HEAD detached from "
+msgstr "開頭指標分離自 "
+
+#: wt-status.c:1813
+msgid "Not currently on any branch."
+msgstr "目��在任何分支上。"
+
+#: wt-status.c:1830
+msgid "Initial commit"
+msgstr "�始�交"
+
+#: wt-status.c:1831
+msgid "No commits yet"
+msgstr "尚無�交"
+
+#: wt-status.c:1845
+msgid "Untracked files"
+msgstr "未追蹤的檔案"
+
+#: wt-status.c:1847
+msgid "Ignored files"
+msgstr "忽略的檔案"
+
+#: 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 ""
+"耗費了 %.2f 秒以枚舉未追蹤的檔案。'status -uno' 也許能�高速度，\n"
+"但您需��心��忘了新增新檔案（�見 'git help status'）。"
+
+#: wt-status.c:1857
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "未追蹤的檔案沒有列出%s"
+
+#  譯者：中文字串拼接，�刪除�導空格
+#: wt-status.c:1859
+msgid " (use -u option to show untracked files)"
+msgstr " （使用 -u �數顯示未追蹤的檔案）"
+
+#: wt-status.c:1865
+msgid "No changes"
+msgstr "沒有修改"
+
+#: wt-status.c:1870
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr "修改尚未加入�交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
+
+#: wt-status.c:1874
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "修改尚未加入�交\n"
+
+#: wt-status.c:1878
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr "�交為空，但是存在尚未追蹤的檔案（使用 \"git add\" 建立追蹤）\n"
+
+#: wt-status.c:1882
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr "�交為空，但是存在尚未追蹤的檔案\n"
+
+#  譯者：中文字串拼接，�刪除�導空格
+#: wt-status.c:1886
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr "無檔案��交（建立/複製檔案並使用 \"git add\" 建立追蹤）\n"
+
+#: wt-status.c:1890 wt-status.c:1896
+#, c-format
+msgid "nothing to commit\n"
+msgstr "無檔案��交\n"
+
+#  譯者：中文字串拼接，�刪除�導空格
+#: wt-status.c:1893
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr "無檔案��交（使用 -u 顯示未追蹤的檔案）\n"
+
+#  譯者：中文字串拼接，�刪除�導空格
+#: wt-status.c:1898
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "沒有��交的檔案，工作�為乾淨狀態\n"
+
+#: wt-status.c:2003
+msgid "No commits yet on "
+msgstr "尚無�交在 "
+
+#: wt-status.c:2007
+msgid "HEAD (no branch)"
+msgstr "HEAD（�分支）"
+
+#: wt-status.c:2038
+msgid "different"
+msgstr "��"
+
+#  譯者：請維��尾空格
+#: wt-status.c:2040 wt-status.c:2048
+msgid "behind "
+msgstr "�後 "
+
+#: wt-status.c:2043 wt-status.c:2046
+msgid "ahead "
+msgstr "領先 "
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2569
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "�能%s：您有未暫存的變更。"
+
+#: wt-status.c:2575
+msgid "additionally, your index contains uncommitted changes."
+msgstr "�外，您的索引中包�未�交的變更。"
+
+#: wt-status.c:2577
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "�能%s：您的索引中包�未�交的變更。"
+
+#: compat/simple-ipc/ipc-unix-socket.c:182
+msgid "could not send IPC command"
+msgstr "無法傳� IPC 命令"
+
+#: compat/simple-ipc/ipc-unix-socket.c:189
+msgid "could not read IPC response"
+msgstr "無法讀� IPC 回應"
+
+#: compat/simple-ipc/ipc-unix-socket.c:866
+#, c-format
+msgid "could not start accept_thread '%s'"
+msgstr "無法啟動 accept_thread “%s�"
+
+#: compat/simple-ipc/ipc-unix-socket.c:878
+#, c-format
+msgid "could not start worker[0] for '%s'"
+msgstr "無法啟動「%s�的 worker[0]"
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:461
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "刪除 '%s' 失敗"
+
+#: builtin/add.c:26
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<�項>] [--] <路徑�格>..."
+
+#: builtin/add.c:61
+#, c-format
+msgid "cannot chmod %cx '%s'"
+msgstr "無法 chmod %cx ‘%s’"
+
+#: builtin/add.c:99
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "�外的差異狀態 %c"
+
+#: builtin/add.c:104 builtin/commit.c:297
+msgid "updating files failed"
+msgstr "更新檔案失敗"
+
+#: builtin/add.c:114
+#, c-format
+msgid "remove '%s'\n"
+msgstr "刪除 '%s'\n"
+
+#: builtin/add.c:198
+msgid "Unstaged changes after refreshing the index:"
+msgstr "�新整�索引之後尚未被暫存的變更："
+
+#: builtin/add.c:307 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
+msgid "Could not write patch"
+msgstr "�能生�修補檔"
+
+#: builtin/add.c:325
+msgid "editing patch failed"
+msgstr "編輯修補檔失敗"
+
+#: builtin/add.c:328
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "�能� '%s' 呼� stat"
+
+#: builtin/add.c:330
+msgid "Empty patch. Aborted."
+msgstr "空修補檔。異常終止。"
+
+#: builtin/add.c:335
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "�能套用 '%s'"
+
+#: builtin/add.c:343
+msgid "The following paths are ignored by one of your .gitignore files:\n"
+msgstr "下列路徑根據您的一個 .gitignore 檔案而被忽略：\n"
+
+#: 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 "測試執行"
+
+#: builtin/add.c:366
+msgid "interactive picking"
+msgstr "互動���"
+
+#: builtin/add.c:367 builtin/checkout.c:1562 builtin/reset.c:308
+msgid "select hunks interactively"
+msgstr "互動�挑�資料�塊"
+
+#: builtin/add.c:368
+msgid "edit current diff and apply"
+msgstr "編輯目�差異並套用"
+
+#: builtin/add.c:369
+msgid "allow adding otherwise ignored files"
+msgstr "�許新增忽略的檔案"
+
+#: builtin/add.c:370
+msgid "update tracked files"
+msgstr "更新已追蹤的檔案"
+
+#: builtin/add.c:371
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "�已追蹤檔案（隱� -u）�新歸一�行符號"
+
+#: builtin/add.c:372
+msgid "record only the fact that the path will be added later"
+msgstr "�記錄，該路徑�後�新增"
+
+#: builtin/add.c:373
+msgid "add changes from all tracked and untracked files"
+msgstr "新增所有改變的已追蹤檔案和未追蹤檔案"
+
+#: builtin/add.c:376
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "忽略工作�中移除的路徑（和 --no-all 相�）"
+
+#: builtin/add.c:378
+msgid "don't add, only refresh the index"
+msgstr "�新增，��新整�索引"
+
+#: builtin/add.c:379
+msgid "just skip files which cannot be added because of errors"
+msgstr "略�因發生錯誤�能新增的檔案"
+
+#: builtin/add.c:380
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "檢查在測試執行模�下檔案（�使�存在）是�被忽略"
+
+#: builtin/add.c:382 builtin/update-index.c:1006
+msgid "override the executable bit of the listed files"
+msgstr "覆蓋列表裡檔案的�執行�"
+
+#: builtin/add.c:384
+msgid "warn when adding an embedded repository"
+msgstr "建立一個嵌入�版本庫時給予警告"
+
+#: builtin/add.c:386
+msgid "backend for `git stash -p`"
+msgstr "`git stash -p` 的後端"
+
+#: builtin/add.c:404
+#, c-format
+msgid ""
+"You've added another git repository inside your current repository.\n"
+"Clones of the outer repository will not contain the contents of\n"
+"the embedded repository and will not know how to obtain it.\n"
+"If you meant to add a submodule, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"If you added this path by mistake, you can remove it from the\n"
+"index with:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"See \"git help submodule\" for more information."
+msgstr ""
+"您在目�版本庫中新增了�外一個 Git 版本庫。複製外層的版本庫將�包�嵌入版本庫"
+"的內容，並且�知�該如何�得它。\n"
+"如果您�新增一個�模組，使用：\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"如果您��心新增了這個路徑，�以用下�的指令將其從索引中刪除：\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"�見 \"git help submodule\" �得更多訊�。"
+
+#: builtin/add.c:432
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "正在新增嵌入� git 版本庫：%s"
+
+#: 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 ""
+"如果您真的想加入，請使用 -f。\n"
+"如�關閉此訊�，請執行\n"
+"\"git config advice.addIgnoredFile false\""
+
+#: builtin/add.c:460
+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
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "�數 --chmod �值 '%s' 必須是 -x 或 +x"
+
+#: 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 "--pathspec-from-file 與 <路徑�格> �數�相容"
+
+#: 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 "--pathspec-file-nul 需� --pathspec-from-file"
+
+#: builtin/add.c:555
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "沒有指定檔案，也沒有檔案被新增。\n"
+
+#: 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 ""
+"�能你��的是 'git add .'？\n"
+"如�關閉此訊�，請執行\n"
+"\"git config advice.addEmptyPathspec false\""
+
+#: builtin/am.c:365
+msgid "could not parse author script"
+msgstr "�能解�作者腳本"
+
+#: builtin/am.c:455
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' 被 applypatch-msg 掛鉤刪除"
+
+#: builtin/am.c:497
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "�法的輸入行：'%s'。"
+
+#: builtin/am.c:535
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "從 '%s' 複製註解到 '%s' 時失敗"
+
+#: builtin/am.c:561
+msgid "fseek failed"
+msgstr "fseek 失敗"
+
+#: builtin/am.c:749
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "無法解�修補檔 '%s'"
+
+#: builtin/am.c:814
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "一次�能有一個 StGIT 修補檔佇列被套用"
+
+#: builtin/am.c:862
+msgid "invalid timestamp"
+msgstr "無效的時間戳"
+
+#: builtin/am.c:867 builtin/am.c:879
+msgid "invalid Date line"
+msgstr "無效的日期行"
+
+#: builtin/am.c:874
+msgid "invalid timezone offset"
+msgstr "無效的時��移值"
+
+#: builtin/am.c:967
+msgid "Patch format detection failed."
+msgstr "修補檔格��測失敗。"
+
+#: builtin/am.c:972 builtin/clone.c:414
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "建立目錄 '%s' 失敗"
+
+#: builtin/am.c:977
+msgid "Failed to split patches."
+msgstr "分割修補檔失敗。"
+
+#: builtin/am.c:1126
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "當您解決這一�題，執行 \"%s --continue\"。"
+
+#: builtin/am.c:1127
+#, c-format
+msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
+msgstr "如果您想�略�這一修補檔，則執行 \"%s --skip\"。"
+
+#: builtin/am.c:1128
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr "若�復原至原始分支並�止修補動作，執行 \"%s --abort\"。"
+
+#: builtin/am.c:1223
+msgid "Patch sent with format=flowed; space at the end of lines might be lost."
+msgstr "修補檔使用 format=flowed 格�傳�，行尾的空格�能會�失。"
+
+#: builtin/am.c:1251
+msgid "Patch is empty."
+msgstr "修補檔為空。"
+
+#: builtin/am.c:1316
+#, c-format
+msgid "missing author line in commit %s"
+msgstr "在�交 %s 中缺少作者行"
+
+#: builtin/am.c:1319
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "無效的身份標記：%.*s"
+
+#: builtin/am.c:1538
+msgid "Repository lacks necessary blobs to fall back on 3-way merge."
+msgstr "版本庫缺�必�的資料物件以進行三方�併。"
+
+#: builtin/am.c:1540
+msgid "Using index info to reconstruct a base tree..."
+msgstr "使用索引來�建一個（三方�併的）基礎目錄樹..."
+
+#: builtin/am.c:1559
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"您是�曾手動編輯�您的修補檔？\n"
+"無法套用修補檔到索引中的資料物件上。"
+
+#: builtin/am.c:1565
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "回�到基礎版本上修補�進行三方�併..."
+
+#: builtin/am.c:1591
+msgid "Failed to merge in the changes."
+msgstr "無法�併變更。"
+
+#: builtin/am.c:1623
+msgid "applying to an empty history"
+msgstr "正套用到一個空歷�上"
+
+#: builtin/am.c:1675 builtin/am.c:1679
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "無法繼續：%s �存在。"
+
+#: builtin/am.c:1697
+msgid "Commit Body is:"
+msgstr "�交內容為："
+
+#  譯者：請維��尾空格
+#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a]
+#. in your translation. The program will only accept English
+#. input at this point.
+#.
+#: builtin/am.c:1707
+#, 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:1753 builtin/commit.c:408
+msgid "unable to write index file"
+msgstr "無法寫入索引檔案"
+
+#: builtin/am.c:1757
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "髒索引：�能套用修補檔（髒檔案：%s）"
+
+#: builtin/am.c:1797 builtin/am.c:1865
+#, c-format
+msgid "Applying: %.*s"
+msgstr "套用：%.*s"
+
+#: builtin/am.c:1814
+msgid "No changes -- Patch already applied."
+msgstr "沒有變更——修補檔已經套用�。"
+
+#: builtin/am.c:1820
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "打修補檔失敗於 %s %.*s"
+
+#: builtin/am.c:1824
+msgid "Use 'git am --show-current-patch=diff' to see the failed patch"
+msgstr "用 'git am --show-current-patch=diff' 命令檢視失敗的修補檔"
+
+#: 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 ""
+"沒有變更 —— 您是�是忘了執行 'git add'？\n"
+"如果沒有什麼�新增到暫存�的，則很�能是其它�交已經引入了相�的變更。\n"
+"您也許想�略�這個修補檔。"
+
+#: 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 "
+"such.\n"
+"You might run `git rm` on a file to accept \"deleted by them\" for it."
+msgstr ""
+"在您的索引中�存在未�併的路徑。\n"
+"您應該�已經��解決的�一個檔案執行 'git add' 來標記已經完�。 \n"
+"你�以� \"由他們刪除\" 的檔案執行 `git rm` 指令。"
+
+#: builtin/am.c: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 "�能解�物件 '%s'。"
+
+#: builtin/am.c:2034
+msgid "failed to clean index"
+msgstr "清空索引失敗"
+
+#: builtin/am.c:2078
+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:2185
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "無效的 --patch-format 值：%s"
+
+#: builtin/am.c:2227
+#, c-format
+msgid "Invalid value for --show-current-patch: %s"
+msgstr "無效的 --show-current-patch 值：%s"
+
+#: builtin/am.c:2231
+#, c-format
+msgid "--show-current-patch=%s is incompatible with --show-current-patch=%s"
+msgstr "--show-current-patch=%s 與 --show-current-patch=%s �相容"
+
+#: builtin/am.c:2262
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<�項>] [(<mbox> | <Maildir>)...]"
+
+#: builtin/am.c:2263
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<�項>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2269
+msgid "run interactively"
+msgstr "以互動�方�執行"
+
+#: builtin/am.c:2271
+msgid "historical option -- no-op"
+msgstr "�的�數 —— 無作用"
+
+#: builtin/am.c:2273
+msgid "allow fall back on 3way merging if needed"
+msgstr "如果必�，�許使用三方�併"
+
+#: 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 "�默模�"
+
+#: builtin/am.c:2276
+msgid "add a Signed-off-by trailer to the commit message"
+msgstr "在�交說明�尾加入 Signed-off-by"
+
+#: builtin/am.c:2279
+msgid "recode into utf8 (default)"
+msgstr "使用 utf8 字元集（�設）"
+
+#: builtin/am.c:2281
+msgid "pass -k flag to git-mailinfo"
+msgstr "� git-mailinfo 傳� -k �數"
+
+#: builtin/am.c:2283
+msgid "pass -b flag to git-mailinfo"
+msgstr "� git-mailinfo 傳� -b �數"
+
+#: builtin/am.c:2285
+msgid "pass -m flag to git-mailinfo"
+msgstr "� git-mailinfo 傳� -m �數"
+
+#: builtin/am.c:2287
+msgid "pass --keep-cr flag to git-mailsplit for mbox format"
+msgstr "�� mbox 格�，� git-mailsplit 傳� --keep-cr �數"
+
+#: builtin/am.c:2290
+msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
+msgstr "�� git-mailsplit 傳� --keep-cr �數，覆蓋 am.keepcr 的設定"
+
+#: builtin/am.c:2293
+msgid "strip everything before a scissors line"
+msgstr "�棄�切線�的所有內容"
+
+#: builtin/am.c:2295
+msgid "pass it through git-mailinfo"
+msgstr "�� 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 "傳�給 git-apply"
+
+#: 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: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: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 "格�"
+
+#: builtin/am.c:2322
+msgid "format the patch(es) are in"
+msgstr "修補檔的格�"
+
+#: builtin/am.c:2328
+msgid "override error message when patch failure occurs"
+msgstr "打修補檔失敗時顯示的錯誤訊�"
+
+#: builtin/am.c:2330
+msgid "continue applying patches after resolving a conflict"
+msgstr "��解決後繼續套用修補檔"
+
+#: builtin/am.c:2333
+msgid "synonyms for --continue"
+msgstr "和 --continue �義"
+
+#: builtin/am.c:2336
+msgid "skip the current patch"
+msgstr "略�目�修補檔"
+
+#: builtin/am.c:2339
+msgid "restore the original branch and abort the patching operation"
+msgstr "還原原始分支並中止修補動作"
+
+#: builtin/am.c:2342
+msgid "abort the patching operation but keep HEAD where it is"
+msgstr "終止修補動作但�� HEAD �變"
+
+#: builtin/am.c:2346
+msgid "show the patch being applied"
+msgstr "顯示正在套用的修補檔"
+
+#: builtin/am.c:2351
+msgid "lie about committer date"
+msgstr "將作者日期作為�交日期"
+
+#: builtin/am.c:2353
+msgid "use current timestamp for author date"
+msgstr "用目�時間作為作者日期"
+
+#: 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 "key-id"
+
+#: builtin/am.c:2356 builtin/rebase.c:538 builtin/rebase.c:1396
+msgid "GPG-sign commits"
+msgstr "使用 GPG 簽��交"
+
+#: builtin/am.c:2359
+msgid "(internal use for git-rebase)"
+msgstr "（內部使用，用於 git-rebase）"
+
+#: 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 ""
+"�數 -b/--binary 已經很長時間��任何實質動作了，並且將被移除。\n"
+"請���使用它了。"
+
+#: builtin/am.c:2384
+msgid "failed to read the index"
+msgstr "讀�索引失敗"
+
+#: builtin/am.c:2399
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "之�的�定基底目錄 %s �然存在，但��供了 mbox。"
+
+#: builtin/am.c:2423
+#, c-format
+msgid ""
+"Stray %s directory found.\n"
+"Use \"git am --abort\" to remove it."
+msgstr ""
+"發�了錯誤的 %s 目錄。\n"
+"使用 \"git am --abort\" 刪除它。"
+
+#: builtin/am.c:2429
+msgid "Resolve operation not in progress, we are not resuming."
+msgstr "解決動作未進行，我們�會繼續。"
+
+#: 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 [<�項>] [<修補檔>...]"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "�能建立歸檔檔案 '%s'"
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "�能�定�輸出"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive：未�供�端 URL"
+
+#: builtin/archive.c:61
+msgid "git archive: expected ACK/NAK, got a flush packet"
+msgstr "git archive：期望是 ACK/NAK，�得到 flush 包"
+
+#: builtin/archive.c:64
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive：NACK %s"
+
+#: builtin/archive.c:65
+msgid "git archive: protocol error"
+msgstr "git archive：�定錯誤"
+
+#: builtin/archive.c:69
+msgid "git archive: expected a flush"
+msgstr "git archive：應有一個 flush 包"
+
+#: builtin/bisect--helper.c:23
+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 | --"
+"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>...]"
+msgstr ""
+"git bisect--helper --bisect-start [--term-{new,bad}=<術語> --term-{old,good}"
+"=<術語>] [--no-checkout] [--first-parent] [<壞> [<好>...]] [--] [<路徑>...]"
+
+#: builtin/bisect--helper.c:28
+msgid "git bisect--helper --bisect-next"
+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-state (bad|new) [<修訂版>]"
+
+#: builtin/bisect--helper.c:30
+msgid "git bisect--helper --bisect-state (good|old) [<rev>...]"
+msgstr "git bisect--helper --bisect-state (good|old) [<修訂版>...]"
+
+#: builtin/bisect--helper.c:31
+msgid "git bisect--helper --bisect-replay <filename>"
+msgstr "git bisect--helper --bisect-replay <檔�>"
+
+#: builtin/bisect--helper.c:32
+msgid "git bisect--helper --bisect-skip [(<rev>|<range>)...]"
+msgstr "git bisect--helper --bisect-skip [(<修訂版>|<範�>)...]"
+
+#: builtin/bisect--helper.c:107
+#, c-format
+msgid "cannot open file '%s' in mode '%s'"
+msgstr "無法以 '%2$s' 模�開啟 '%1$s' 檔案"
+
+#: builtin/bisect--helper.c:114
+#, c-format
+msgid "could not write to file '%s'"
+msgstr "無法寫入 '%s' 檔案"
+
+#: builtin/bisect--helper.c:155
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' �是一個有效的術語"
+
+#: builtin/bisect--helper.c:159
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "�能使用內建指令 '%s' 作為術語"
+
+#: builtin/bisect--helper.c:169
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "�能修改術語 '%s' 的�義"
+
+#: builtin/bisect--helper.c:179
+msgid "please use two different terms"
+msgstr "請使用兩個��的術語"
+
+#: builtin/bisect--helper.c:195
+#, c-format
+msgid "We are not bisecting.\n"
+msgstr "我們沒有在二分�尋。\n"
+
+#: builtin/bisect--helper.c:203
+#, c-format
+msgid "'%s' is not a valid commit"
+msgstr "'%s' �是一個有效的�交"
+
+#: builtin/bisect--helper.c:212
+#, 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:256
+#, c-format
+msgid "Bad bisect_write argument: %s"
+msgstr "壞的 bisect_write �數：%s"
+
+#: builtin/bisect--helper.c:261
+#, c-format
+msgid "couldn't get the oid of the rev '%s'"
+msgstr "無法�得版本 '%s' 的物件 ID"
+
+#: builtin/bisect--helper.c:273
+#, c-format
+msgid "couldn't open the file '%s'"
+msgstr "無法開啟檔案 '%s'"
+
+#: builtin/bisect--helper.c:299
+#, c-format
+msgid "Invalid command: you're currently in a %s/%s bisect"
+msgstr "無效的指令：您目�正處於一個 %s/%s 二分�尋中"
+
+#: 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 ""
+"您需�給我至少一個 %s 和一個 %s 版本。\n"
+"為此您�以用 \"git bisect %s\" 和 \"git bisect %s\"。"
+
+#: 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 ""
+"您需�執行 \"git bisect start\" 來開始。\n"
+"然後需��供我至少一個 %s 和一個 %s 版本。\n"
+"為此您�以用 \"git bisect %s\" 和 \"git bisect %s\" 指令。"
+
+#: builtin/bisect--helper.c:350
+#, c-format
+msgid "bisecting only with a %s commit"
+msgstr "在�有一個 %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:358
+msgid "Are you sure [Y/n]? "
+msgstr "您確�嗎[Y/n]？ "
+
+#: builtin/bisect--helper.c:419
+msgid "no terms defined"
+msgstr "未定義術語"
+
+#: 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 "您目���舊狀態的術語是 %s，�新狀態的術語是 %s。\n"
+
+#: 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 ""
+"指令 'git bisect terms' 的�數 %s 無效。\n"
+"支�的�項有：--term-good|--term-old 和 --term-bad|--term-new。"
+
+#: builtin/bisect--helper.c:499 builtin/bisect--helper.c:1023
+msgid "revision walk setup failed\n"
+msgstr "版本�歷設定失敗\n"
+
+#: builtin/bisect--helper.c:521
+#, c-format
+msgid "could not open '%s' for appending"
+msgstr "無法開啟 '%s' 進行附加"
+
+#: builtin/bisect--helper.c:640 builtin/bisect--helper.c:653
+msgid "'' is not a valid term"
+msgstr "'' �是一個有效的術語"
+
+#: builtin/bisect--helper.c:663
+#, c-format
+msgid "unrecognized option: '%s'"
+msgstr "未識別的�項：'%s'"
+
+#: builtin/bisect--helper.c:667
+#, c-format
+msgid "'%s' does not appear to be a valid revision"
+msgstr "'%s' 看起來�是一個有效的版本"
+
+#: builtin/bisect--helper.c:698
+msgid "bad HEAD - I need a HEAD"
+msgstr "壞的 HEAD - 我需�一個 HEAD"
+
+#: builtin/bisect--helper.c:713
+#, c-format
+msgid "checking out '%s' failed. Try 'git bisect start <valid-branch>'."
+msgstr "簽出 '%s' 失敗。嘗試 'git bisect start <有效分支>'。"
+
+#: builtin/bisect--helper.c:734
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "�會在�了 cg-seek 的樹上�二分�尋"
+
+#: builtin/bisect--helper.c:737
+msgid "bad HEAD - strange symbolic ref"
+msgstr "壞的 HEAD - 奇怪的符號引用"
+
+#: builtin/bisect--helper.c:757
+#, c-format
+msgid "invalid ref: '%s'"
+msgstr "無效的引用：'%s'"
+
+#: builtin/bisect--helper.c:815
+msgid "You need to start by \"git bisect start\"\n"
+msgstr "您需�執行 \"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:826
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "您想讓我為您這樣�嗎[Y/n]？ "
+
+#: builtin/bisect--helper.c:844
+msgid "Please call `--bisect-state` with at least one argument"
+msgstr "�呼� `--bisect-state`，請傳入一個以上的引數"
+
+#: builtin/bisect--helper.c:857
+#, c-format
+msgid "'git bisect %s' can take only one argument."
+msgstr "'git bisect %s' �能有一個�數。"
+
+#: builtin/bisect--helper.c:869 builtin/bisect--helper.c:882
+#, c-format
+msgid "Bad rev input: %s"
+msgstr "<修訂版> 輸入格�錯誤：%s"
+
+#: builtin/bisect--helper.c:889
+#, c-format
+msgid "Bad rev input (not a commit): %s"
+msgstr "修訂版輸入有誤（�是�交）：%s"
+
+#: builtin/bisect--helper.c:921
+msgid "We are not bisecting."
+msgstr "我們沒有在二分�尋。"
+
+#: builtin/bisect--helper.c:971
+#, c-format
+msgid "'%s'?? what are you talking about?"
+msgstr "「%s�？？您在說什麼？"
+
+#: builtin/bisect--helper.c:983
+#, c-format
+msgid "cannot read file '%s' for replaying"
+msgstr "無法讀�「%s�檔案來�放"
+
+#: builtin/bisect--helper.c:1056
+msgid "reset the bisection state"
+msgstr "清除二分�尋狀態"
+
+#: builtin/bisect--helper.c:1058
+msgid "check whether bad or good terms exist"
+msgstr "檢查壞的或好的術語是�存在"
+
+#: builtin/bisect--helper.c:1060
+msgid "print out the bisect terms"
+msgstr "列�二分�尋術語"
+
+#: builtin/bisect--helper.c:1062
+msgid "start the bisect session"
+msgstr "啟動二分�尋�程"
+
+#: builtin/bisect--helper.c:1064
+msgid "find the next bisection commit"
+msgstr "尋找下一個二分�尋�交"
+
+#: builtin/bisect--helper.c:1066
+msgid "mark the state of ref (or refs)"
+msgstr "標記 ref (或 refs) 的狀態"
+
+#: builtin/bisect--helper.c:1068
+msgid "list the bisection steps so far"
+msgstr "列出迄今的二分�尋步驟"
+
+#: builtin/bisect--helper.c:1070
+msgid "replay the bisection process from the given file"
+msgstr "從指定檔案�放二分�尋�程"
+
+#: builtin/bisect--helper.c:1072
+msgid "skip some commits for checkout"
+msgstr "略��簽出的部分�交"
+
+#: builtin/bisect--helper.c:1074
+msgid "no log for BISECT_WRITE"
+msgstr "BISECT_WRITE 無日誌"
+
+#: builtin/bisect--helper.c:1089
+msgid "--bisect-reset requires either no argument or a commit"
+msgstr "--bisect-reset 無需�數或者需�一個�交"
+
+#: builtin/bisect--helper.c:1094
+msgid "--bisect-next-check requires 2 or 3 arguments"
+msgstr "--bisect-next-check 需� 2 或 3 個�數"
+
+#: builtin/bisect--helper.c:1100
+msgid "--bisect-terms requires 0 or 1 argument"
+msgstr "--bisect-terms 需� 0 或 1 個�數"
+
+#: builtin/bisect--helper.c:1109
+msgid "--bisect-next requires 0 arguments"
+msgstr "--bisect-next 需� 0 個引數"
+
+#: builtin/bisect--helper.c:1120
+msgid "--bisect-log requires 0 arguments"
+msgstr "--bisect-log 需� 0 個引數"
+
+#: builtin/bisect--helper.c:1125
+msgid "no logfile given"
+msgstr "未�供日誌檔案"
+
+#: builtin/blame.c:32
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<�項>] [<版本�項>] [<版本>] [--] <檔案>"
+
+#: builtin/blame.c:37
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<版本�項> 的檔案記錄在 git-rev-list(1) 中"
+
+#: builtin/blame.c:410
+#, c-format
+msgid "expecting a color: %s"
+msgstr "期望一個�色：%s"
+
+#: builtin/blame.c:417
+msgid "must end with a color"
+msgstr "必須以一個�色�尾"
+
+#: builtin/blame.c:728
+#, c-format
+msgid "invalid color '%s' in color.blame.repeatedLines"
+msgstr "設定 color.blame.repeatedLines 中的無效�色 '%s'"
+
+#: builtin/blame.c:746
+msgid "invalid value for blame.coloring"
+msgstr "設定 blame.coloring 中的無效�值"
+
+#: builtin/blame.c:845
+#, c-format
+msgid "cannot find revision %s to ignore"
+msgstr "�能找到�忽略的版本 %s"
+
+#: builtin/blame.c:867
+msgid "show blame entries as we find them, incrementally"
+msgstr "增��顯示發�的 blame �目"
+
+#: builtin/blame.c:868
+msgid "do not show object names of boundary commits (Default: off)"
+msgstr "��顯示邊界�交的物件�稱（�設值: off）"
+
+#: builtin/blame.c:869
+msgid "do not treat root commits as boundaries (Default: off)"
+msgstr "�將根�交看作邊界（�設值：off）"
+
+#: builtin/blame.c:870
+msgid "show work cost statistics"
+msgstr "顯示工作�統計"
+
+#: 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 "強制顯示進度報告"
+
+#: builtin/blame.c:872
+msgid "show output score for blame entries"
+msgstr "顯示判斷 blame �目�移的得分診斷訊�"
+
+#: builtin/blame.c:873
+msgid "show original filename (Default: auto)"
+msgstr "顯示原始檔案�稱（�設值：auto）"
+
+#: builtin/blame.c:874
+msgid "show original linenumber (Default: off)"
+msgstr "顯示原始檔案�稱（�設值：off）"
+
+#: builtin/blame.c:875
+msgid "show in a format designed for machine consumption"
+msgstr "顯示���機器讀�的格�"
+
+#: builtin/blame.c:876
+msgid "show porcelain format with per-line commit information"
+msgstr "顯示�一列��機器的�交說明"
+
+#: builtin/blame.c:877
+msgid "use the same output mode as git-annotate (Default: off)"
+msgstr "使用和 git-annotate 相�的輸出模�（�設值：off）"
+
+#: builtin/blame.c:878
+msgid "show raw timestamp (Default: off)"
+msgstr "顯示原始時間戳（�設值：off）"
+
+#: builtin/blame.c:879
+msgid "show long commit SHA1 (Default: off)"
+msgstr "顯示較長的 SHA1 �交編號（�設值：off）"
+
+#: builtin/blame.c:880
+msgid "suppress author name and timestamp (Default: off)"
+msgstr "隱�作者�字�時間戳（�設值：off）"
+
+#: builtin/blame.c:881
+msgid "show author email instead of name (Default: off)"
+msgstr "顯示作者信箱而��稱（�設值：off）"
+
+#: builtin/blame.c:882
+msgid "ignore whitespace differences"
+msgstr "忽略空白差異"
+
+#: builtin/blame.c:883 builtin/log.c:1823
+msgid "rev"
+msgstr "版本"
+
+#: builtin/blame.c:883
+msgid "ignore <rev> when blaming"
+msgstr "在執行 blame 動作時忽略 <修訂版>"
+
+#: builtin/blame.c:884
+msgid "ignore revisions from <file>"
+msgstr "忽略 <檔案> 中的修訂版"
+
+#: builtin/blame.c:885
+msgid "color redundant metadata from previous line differently"
+msgstr "使用�色間隔輸出與�一行��的�複元訊�"
+
+#: builtin/blame.c:886
+msgid "color lines by age"
+msgstr "�據時間著色"
+
+#: builtin/blame.c:887
+msgid "spend extra cycles to find better match"
+msgstr "循環更多次以找到更佳符�"
+
+#: builtin/blame.c:888
+msgid "use revisions from <file> instead of calling git-rev-list"
+msgstr "使用來自 <檔案> 的修訂集而�是呼� git-rev-list"
+
+#: builtin/blame.c:889
+msgid "use <file>'s contents as the final image"
+msgstr "將 <檔案> 的內容當�是最終 image"
+
+#: builtin/blame.c:890 builtin/blame.c:891
+msgid "score"
+msgstr "得分"
+
+#: builtin/blame.c:890
+msgid "find line copies within and across files"
+msgstr "找到檔案內�跨檔案的複製列"
+
+#: builtin/blame.c:891
+msgid "find line movements within and across files"
+msgstr "找到檔案內�跨檔案的移動列"
+
+#: builtin/blame.c:892
+msgid "range"
+msgstr "range"
+
+#: builtin/blame.c:893
+msgid "process only line range <start>,<end> or function :<funcname>"
+msgstr "�處�範�在 <開始>,<�尾> 的列，或是 :<函數�稱> 函數"
+
+#: builtin/blame.c:945
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress �能跟 --incremental 或 porcelain 格��時使用"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output.  For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:996
+msgid "4 years, 11 months ago"
+msgstr "4 年 11 個月�"
+
+#: builtin/blame.c:1112
+#, 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
+msgid "Blaming lines"
+msgstr "追蹤程�碼行"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r | -a] [--merged] [--no-merged]"
+msgstr "git branch [<�項>] [-r | -a] [--merged] [--no-merged]"
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<�項>] [-l] [-f] <分支�> [<起始點>]"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<�項>] [-r] (-d | -D) <分支�>..."
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<�項>] (-m | -M) [<舊分支>] <新分支>"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<�項>] (-c | -C) [<�分支>] <新分支>"
+
+#: builtin/branch.c:34
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<�項>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:35
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<�項>] [-r | -a] [--format]"
+
+#  譯者：��原�行格�，在輸出時 %s 的替代內容會讓字串變長
+#: builtin/branch.c:154
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+"         '%s', but not yet merged to HEAD."
+msgstr ""
+"將�刪除的分支 '%s' 已經被�併到\n"
+"         '%s'，但未�併到 HEAD。"
+
+#  譯者：��原�行格�，在輸出時 %s 的替代內容會讓字串變長
+#: builtin/branch.c:158
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+"         '%s', even though it is merged to HEAD."
+msgstr ""
+"並未刪除分支 '%s'， 雖然它已經�併到 HEAD，\n"
+"         然而�尚未被�併到分支 '%s' 。"
+
+#: builtin/branch.c:172
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "無法查詢 '%s' 指�的�交物件"
+
+#: builtin/branch.c:176
+#, c-format
+msgid ""
+"The branch '%s' is not fully merged.\n"
+"If you are sure you want to delete it, run 'git branch -D %s'."
+msgstr ""
+"分支 '%s' 沒有完全�併。\n"
+"如果您確��刪除它，執行 'git branch -D %s'。"
+
+#: builtin/branch.c:189
+msgid "Update of config-file failed"
+msgstr "更新設定檔案失敗"
+
+#: builtin/branch.c:223
+msgid "cannot use -a with -d"
+msgstr "�能將 -a 和 -d �時使用"
+
+#: builtin/branch.c:230
+msgid "Couldn't look up commit object for HEAD"
+msgstr "無法查詢 HEAD 指�的�交物件"
+
+#: builtin/branch.c:244
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "無法刪除在「%2$s�簽出的「%1$s�分支"
+
+#: builtin/branch.c:259
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "未能找到�端追蹤分支 '%s'。"
+
+#: builtin/branch.c:260
+#, c-format
+msgid "branch '%s' not found."
+msgstr "分支 '%s' 未發�。"
+
+#: builtin/branch.c:291
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "已刪除�端追蹤分支 %s（曾為 %s）。\n"
+
+#: builtin/branch.c:292
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "已刪除分支 %s（曾為 %s）。\n"
+
+#: builtin/branch.c:440 builtin/tag.c:63
+msgid "unable to parse format string"
+msgstr "�能解�格�化字串"
+
+#: builtin/branch.c:471
+msgid "could not resolve HEAD"
+msgstr "�能解� HEAD �交"
+
+#: builtin/branch.c:477
+#, c-format
+msgid "HEAD (%s) points outside of refs/heads/"
+msgstr "HEAD (%s) 指� refs/heads/ 之外"
+
+#: builtin/branch.c:492
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "分支 %s 正被�定基底到 %s"
+
+#: builtin/branch.c:496
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "分支 %s 正被二分�尋於 %s"
+
+#: builtin/branch.c:513
+msgid "cannot copy the current branch while not on any."
+msgstr "無法複製目�分支因為�處於任何分支上。"
+
+#: builtin/branch.c:515
+msgid "cannot rename the current branch while not on any."
+msgstr "無法�新命�目�分支因為�處於任何分支上。"
+
+#: builtin/branch.c:526
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "無效的分支�：'%s'"
+
+#: builtin/branch.c:555
+msgid "Branch rename failed"
+msgstr "分支�新命�失敗"
+
+#: builtin/branch.c:557
+msgid "Branch copy failed"
+msgstr "分支複製失敗"
+
+#: builtin/branch.c:561
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "已為錯誤命�的分支 '%s' 建立了一個副本"
+
+#: builtin/branch.c:564
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "已將錯誤命�的分支 '%s' �新命�"
+
+#: builtin/branch.c:570
+#, c-format
+msgid "Branch renamed to %s, but HEAD is not updated!"
+msgstr "分支�新命�為 %s，但 HEAD 沒有更新�"
+
+#: builtin/branch.c:579
+msgid "Branch is renamed, but update of config-file failed"
+msgstr "分支被�新命�，但更新設定檔案失敗"
+
+#: builtin/branch.c:581
+msgid "Branch is copied, but update of config-file failed"
+msgstr "分支已複製，但更新設定檔案失敗"
+
+#: builtin/branch.c:597
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+"  %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"請編輯分支的�述\n"
+"  %s\n"
+"以 '%c' 開頭的行將被�濾。\n"
+
+#: builtin/branch.c:631
+msgid "Generic options"
+msgstr "通用�項"
+
+#: builtin/branch.c:633
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "顯示雜湊值和主題，若�數出�兩次則顯示上游分支"
+
+#: builtin/branch.c:634
+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:637
+msgid "do not use"
+msgstr "��使用"
+
+#: builtin/branch.c:639 builtin/rebase.c:533
+msgid "upstream"
+msgstr "上游"
+
+#: builtin/branch.c:639
+msgid "change the upstream info"
+msgstr "改變上游訊�"
+
+#: builtin/branch.c:640
+msgid "unset the upstream info"
+msgstr "�消上游資訊設定"
+
+#: builtin/branch.c:641
+msgid "use colored output"
+msgstr "使用彩色輸出"
+
+#: builtin/branch.c:642
+msgid "act on remote-tracking branches"
+msgstr "作用於�端追蹤分支"
+
+#: builtin/branch.c:644 builtin/branch.c:646
+msgid "print only branches that contain the commit"
+msgstr "�列�包�該�交的分支"
+
+#: builtin/branch.c:645 builtin/branch.c:647
+msgid "print only branches that don't contain the commit"
+msgstr "�列��包�該�交的分支"
+
+#: builtin/branch.c:650
+msgid "Specific git-branch actions:"
+msgstr "具體的 git-branch 動作："
+
+#: builtin/branch.c:651
+msgid "list both remote-tracking and local branches"
+msgstr "列出�端追蹤�本機分支"
+
+#: builtin/branch.c:653
+msgid "delete fully merged branch"
+msgstr "刪除完全�併的分支"
+
+#: builtin/branch.c:654
+msgid "delete branch (even if not merged)"
+msgstr "刪除分支（�使沒有�併）"
+
+#: builtin/branch.c:655
+msgid "move/rename a branch and its reflog"
+msgstr "移動/�新命�一個分支，以�它的引用日誌"
+
+#: builtin/branch.c:656
+msgid "move/rename a branch, even if target exists"
+msgstr "移動/�新命�一個分支，�使目標已存在"
+
+#: builtin/branch.c:657
+msgid "copy a branch and its reflog"
+msgstr "複製一個分支和它的引用日誌"
+
+#: builtin/branch.c:658
+msgid "copy a branch, even if target exists"
+msgstr "複製一個分支，�使目標已存在"
+
+#: builtin/branch.c:659
+msgid "list branch names"
+msgstr "列出分支�"
+
+#: builtin/branch.c:660
+msgid "show current branch name"
+msgstr "顯示目�分支�"
+
+#: builtin/branch.c:661
+msgid "create the branch's reflog"
+msgstr "建立分支的引用日誌"
+
+#: builtin/branch.c:663
+msgid "edit the description for the branch"
+msgstr "標記分支的�述"
+
+#: builtin/branch.c:664
+msgid "force creation, move/rename, deletion"
+msgstr "強制建立�移動/�新命��刪除"
+
+#: builtin/branch.c:665
+msgid "print only branches that are merged"
+msgstr "�列�已經�併的分支"
+
+#: builtin/branch.c:666
+msgid "print only branches that are not merged"
+msgstr "�列�尚未�併的分支"
+
+#: builtin/branch.c:667
+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
+msgid "object"
+msgstr "物件"
+
+#: builtin/branch.c:670
+msgid "print only branches of the object"
+msgstr "�列�指�該物件的分支"
+
+#: builtin/branch.c:671 builtin/for-each-ref.c:50 builtin/tag.c:484
+msgid "sorting and filtering are case insensitive"
+msgstr "排�和�濾屬於大�寫��感"
+
+#: 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 "輸出格�"
+
+#: builtin/branch.c:695 builtin/clone.c:794
+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
+msgid "branch name required"
+msgstr "必須�供分支�"
+
+#: builtin/branch.c:766
+msgid "Cannot give description to detached HEAD"
+msgstr "�能�分離開頭指標�供�述"
+
+#: builtin/branch.c:771
+msgid "cannot edit description of more than one branch"
+msgstr "�能為一個以上的分支編輯�述"
+
+#: builtin/branch.c:778
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "分支 '%s' 尚無�交。"
+
+#: builtin/branch.c:781
+#, c-format
+msgid "No branch named '%s'."
+msgstr "沒有分支 '%s'。"
+
+#: builtin/branch.c:796
+msgid "too many branches for a copy operation"
+msgstr "為複製動作�供了太多的分支�"
+
+#: builtin/branch.c:805
+msgid "too many arguments for a rename operation"
+msgstr "為�新命�動作�供了太多的�數"
+
+#: builtin/branch.c:810
+msgid "too many arguments to set new upstream"
+msgstr "為設定新上游�供了太多的�數"
+
+#: builtin/branch.c:814
+#, 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
+#, c-format
+msgid "no such branch '%s'"
+msgstr "沒有此分支 '%s'"
+
+#: builtin/branch.c:821
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "分支 '%s' �存在"
+
+#: builtin/branch.c:834
+msgid "too many arguments to unset upstream"
+msgstr "為�消上游設定動作�供了太多的�數"
+
+#: builtin/branch.c:838
+msgid "could not unset upstream of HEAD when it does not point to any branch."
+msgstr "在 HEAD 的上游未指�任何分支時無法�消設定。"
+
+#: builtin/branch.c:844
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "分支 '%s' 沒有上游訊�"
+
+#: 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>?"
+msgstr ""
+"'git branch' 的 -a 和 -r �項�帶一個分支�。\n"
+"您是�想�使用：-a|-r --list <模�>？"
+
+#: builtin/branch.c:858
+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
+msgid "git version:\n"
+msgstr "git 版本：\n"
+
+#: builtin/bugreport.c:21
+#, c-format
+msgid "uname() failed with error '%s' (%d)\n"
+msgstr "uname() 失敗，錯誤：「%s�(%d)\n"
+
+#: builtin/bugreport.c:31
+msgid "compiler info: "
+msgstr "編譯器資訊： "
+
+#: builtin/bugreport.c:34
+msgid "libc info: "
+msgstr "libc 資訊： "
+
+#: builtin/bugreport.c:80
+msgid "not run from a git repository - no hooks to show\n"
+msgstr "�是從 git 版本庫執行 - 沒有�顯示的掛鉤\n"
+
+#: builtin/bugreport.c:90
+msgid "git bugreport [-o|--output-directory <file>] [-s|--suffix <format>]"
+msgstr "git bugreport [-o|--output-directory <檔案>] [-s|--suffix <格�>]"
+
+#: builtin/bugreport.c:97
+msgid ""
+"Thank you for filling out a Git bug report!\n"
+"Please answer the following questions to help us understand your issue.\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"
+"Please review the rest of the bug report below.\n"
+"You can delete any lines you don't wish to share.\n"
+msgstr ""
+"感�您填寫 Git 臭蟲報告�\n"
+"請回答下列�題，以讓我們能夠了解您的�題。\n"
+"\n"
+"臭蟲發生�，您�了什麼？（���題的步驟）\n"
+"\n"
+"你原本期望發生什麼？（期望行為）\n"
+"\n"
+"那實際上發生了什麼？（實際行為）\n"
+"\n"
+"期望行為跟實際發生的行為有什麼��？\n"
+"\n"
+"其他您想加入的：\n"
+"\n"
+"請檢閱臭蟲報告下方的剩餘部分。\n"
+"您�刪除任何您�想分享的地方。\n"
+
+#: builtin/bugreport.c:136
+msgid "specify a destination for the bugreport file"
+msgstr "請指定 bugreport 檔案的目的地"
+
+#: builtin/bugreport.c:138
+msgid "specify a strftime format suffix for the filename"
+msgstr "請指定檔案�稱的 strftime 格�後綴"
+
+#: builtin/bugreport.c:160
+#, c-format
+msgid "could not create leading directories for '%s'"
+msgstr "無法建立 '%s' 的�置目錄"
+
+#: builtin/bugreport.c:167
+msgid "System Info"
+msgstr "系統資訊"
+
+#: builtin/bugreport.c:170
+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
+#, c-format
+msgid "unable to write to %s"
+msgstr "無法寫入 %s"
+
+#: builtin/bugreport.c:190
+#, c-format
+msgid "Created new report at '%s'.\n"
+msgstr "已在「%s�建立新報告。\n"
+
+#: builtin/bundle.c:15 builtin/bundle.c:23
+msgid "git bundle create [<options>] <file> <git-rev-list args>"
+msgstr "git bundle create [<�項>] <檔案> <git-rev-list �數>"
+
+#: builtin/bundle.c:16 builtin/bundle.c:28
+msgid "git bundle verify [<options>] <file>"
+msgstr "git bundle verify [<�項>] <檔案>"
+
+#: builtin/bundle.c:17 builtin/bundle.c:33
+msgid "git bundle list-heads <file> [<refname>...]"
+msgstr "git bundle list-heads <檔案> [<�考�稱>...]"
+
+#: builtin/bundle.c:18 builtin/bundle.c:38
+msgid "git bundle unbundle <file> [<refname>...]"
+msgstr "git bundle unbundle <檔案> [<�考�稱>...]"
+
+#: builtin/bundle.c:67 builtin/pack-objects.c:3907
+msgid "do not show progress meter"
+msgstr "�顯示進度表"
+
+#: builtin/bundle.c:69 builtin/pack-objects.c:3909
+msgid "show progress meter"
+msgstr "顯示進度表"
+
+#: builtin/bundle.c:71 builtin/pack-objects.c:3911
+msgid "show progress meter during object writing phase"
+msgstr "在物件寫入階段顯示進度表"
+
+#: builtin/bundle.c:74 builtin/pack-objects.c:3914
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "當進度表顯示時類似於 --all-progress"
+
+#: builtin/bundle.c:76
+msgid "specify bundle format version"
+msgstr "指定包格�版本"
+
+#: builtin/bundle.c:96
+msgid "Need a repository to create a bundle."
+msgstr "需�一個版本庫來建立包。"
+
+#: builtin/bundle.c:109
+msgid "do not show bundle details"
+msgstr "�顯示包 (bundle) 詳細資訊"
+
+#: builtin/bundle.c:128
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s �以\n"
+
+#: builtin/bundle.c:179
+msgid "Need a repository to unbundle."
+msgstr "需�一個版本庫來解包。"
+
+#: builtin/bundle.c:191 builtin/remote.c:1700
+msgid "be verbose; must be placed before a subcommand"
+msgstr "詳細輸出；必須置於�指令之�"
+
+#: builtin/bundle.c:213 builtin/remote.c:1731
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "未知�指令：%s"
+
+#: 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>"
+msgstr ""
+"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
+"p | <類型> | --textconv | --filters) [--path=<路徑>] <物件>"
+
+#: builtin/cat-file.c:597
+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:618
+msgid "only one batch option may be specified"
+msgstr "�能指定一個批次處��項"
+
+#: builtin/cat-file.c:636
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<類型> �以是其中之一：blob�tree�commit�tag"
+
+#: builtin/cat-file.c:637
+msgid "show object type"
+msgstr "顯示物件類型"
+
+#: builtin/cat-file.c:638
+msgid "show object size"
+msgstr "顯示物件大�"
+
+#: builtin/cat-file.c:640
+msgid "exit with zero when there's no error"
+msgstr "當沒有錯誤時離開並返回零"
+
+#: builtin/cat-file.c:641
+msgid "pretty-print object's content"
+msgstr "美觀地列�物件的內容"
+
+#: builtin/cat-file.c:643
+msgid "for blob objects, run textconv on object's content"
+msgstr "�於資料物件，�其內容�文字轉�"
+
+#: builtin/cat-file.c:645
+msgid "for blob objects, run filters on object's content"
+msgstr "�於資料物件，�其內容��濾"
+
+#: builtin/cat-file.c:646
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:647
+msgid "use a specific path for --textconv/--filters"
+msgstr "�於 --textconv/--filters 使用一個特定的路徑"
+
+#: builtin/cat-file.c:649
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "�許 -s 和 -t ��壞的物件生效"
+
+#: builtin/cat-file.c:650
+msgid "buffer --batch output"
+msgstr "緩� --batch 的輸出"
+
+#: builtin/cat-file.c:652
+msgid "show info and content of objects fed from the standard input"
+msgstr "顯示從標準輸入�供的物件的訊�和內容"
+
+#: builtin/cat-file.c:656
+msgid "show info about objects fed from the standard input"
+msgstr "顯示從標準輸入�供的物件的訊�"
+
+#: builtin/cat-file.c:660
+msgid "follow in-tree symlinks (used with --batch or --batch-check)"
+msgstr "跟隨樹內符號連�（和 --batch 或 --batch-check 共用）"
+
+#: builtin/cat-file.c:662
+msgid "show all objects with --batch or --batch-check"
+msgstr "使用 --batch 或 --batch-check �數顯示所有物件"
+
+#: builtin/cat-file.c:664
+msgid "do not order --batch-all-objects output"
+msgstr "��� --batch-all-objects 的輸出排�"
+
+#: builtin/check-attr.c:13
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <屬性>...] [--] <路徑�>..."
+
+#: builtin/check-attr.c:14
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <屬性>...]"
+
+#: builtin/check-attr.c:21
+msgid "report all attributes set on file"
+msgstr "報告設定在檔案上的所有屬性"
+
+#: builtin/check-attr.c:22
+msgid "use .gitattributes only from the index"
+msgstr "�使用索引中的 .gitattributes"
+
+#: builtin/check-attr.c:23 builtin/check-ignore.c:25 builtin/hash-object.c:102
+msgid "read file names from stdin"
+msgstr "從標準輸入讀出檔案�"
+
+#: builtin/check-attr.c:25 builtin/check-ignore.c:27
+msgid "terminate input and output records by a NUL character"
+msgstr "輸入和輸出的紀錄使用 NUL 字元終�"
+
+#: builtin/check-ignore.c:21 builtin/checkout.c:1515 builtin/gc.c:549
+#: builtin/worktree.c:493
+msgid "suppress progress reporting"
+msgstr "�顯示進度報告"
+
+#: builtin/check-ignore.c:29
+msgid "show non-matching input paths"
+msgstr "顯示未符�的輸入路徑"
+
+#: builtin/check-ignore.c:31
+msgid "ignore index when checking"
+msgstr "檢查時忽略索引"
+
+#: builtin/check-ignore.c:165
+msgid "cannot specify pathnames with --stdin"
+msgstr "�能�時指定路徑� --stdin �數"
+
+#: builtin/check-ignore.c:168
+msgid "-z only makes sense with --stdin"
+msgstr "-z 需�和 --stdin �數共用�有�義"
+
+#: builtin/check-ignore.c:170
+msgid "no path specified"
+msgstr "未指定路徑"
+
+#: builtin/check-ignore.c:174
+msgid "--quiet is only valid with a single pathname"
+msgstr "�數 --quiet �在�供一個路徑�時有效"
+
+#: builtin/check-ignore.c:176
+msgid "cannot have both --quiet and --verbose"
+msgstr "�能�時�供 --quiet 和 --verbose �數"
+
+#: builtin/check-ignore.c:179
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching �項�在使用 --verbose 時有效"
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<�項>] <�繫��>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "還從標準輸入讀��繫��"
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "�能解��繫��：%s"
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "未指定�繫��"
+
+#: builtin/checkout--worker.c:110
+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: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 "字串"
+
+#: builtin/checkout--worker.c:119 builtin/checkout-index.c:202
+msgid "when creating files, prepend <string>"
+msgstr "在建立檔案時，在��加上 <字串>"
+
+#: builtin/checkout-index.c:152
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<�項>] [--] [<檔案>...]"
+
+#: builtin/checkout-index.c:169
+msgid "stage should be between 1 and 3 or all"
+msgstr "索引值應該�值 1 到 3 或者 all"
+
+#: builtin/checkout-index.c:187
+msgid "check out all files in the index"
+msgstr "簽出索引�的所有檔案"
+
+#: builtin/checkout-index.c:188
+msgid "force overwrite of existing files"
+msgstr "強制覆蓋�有的檔案"
+
+#: builtin/checkout-index.c:190
+msgid "no warning for existing files and files not in index"
+msgstr "存在或�在索引中的檔案都沒有警告"
+
+#: builtin/checkout-index.c:192
+msgid "don't checkout new files"
+msgstr "�簽出新檔案"
+
+#: builtin/checkout-index.c:194
+msgid "update stat information in the index file"
+msgstr "更新索引中檔案的狀態訊�"
+
+#: builtin/checkout-index.c:198
+msgid "read list of paths from the standard input"
+msgstr "從標準輸入讀�路徑列表"
+
+#: builtin/checkout-index.c:200
+msgid "write the content to temporary files"
+msgstr "將內容寫入暫存檔"
+
+#: builtin/checkout-index.c:204
+msgid "copy out the files from named stage"
+msgstr "從指定暫存�中拷出檔案"
+
+#: builtin/checkout.c:33
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<�項>] <分支>"
+
+#: builtin/checkout.c:34
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<�項>] [<分支>] -- <檔案>..."
+
+#: builtin/checkout.c:39
+msgid "git switch [<options>] [<branch>]"
+msgstr "git switch [<�項>] [<分支>]"
+
+#: builtin/checkout.c:44
+msgid "git restore [<options>] [--source=<branch>] <file>..."
+msgstr "git restore [<�項>] [--source=<分支>] <檔案>..."
+
+#: builtin/checkout.c:190 builtin/checkout.c:229
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "路徑 '%s' 沒有我們的版本"
+
+#: builtin/checkout.c:192 builtin/checkout.c:231
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "路徑 '%s' 沒有他們的版本"
+
+#: builtin/checkout.c:208
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "路徑 '%s' 沒有全部必需的版本"
+
+#: builtin/checkout.c:261
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "路徑 '%s' 沒有必需的版本"
+
+#: builtin/checkout.c:278
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "path '%s'：無法�併"
+
+#: builtin/checkout.c:294
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "無法為 '%s' 新增�併�果"
+
+#: builtin/checkout.c:411
+#, c-format
+msgid "Recreated %d merge conflict"
+msgid_plural "Recreated %d merge conflicts"
+msgstr[0] "�新建立了 %d 個�併��"
+
+#: builtin/checkout.c:416
+#, c-format
+msgid "Updated %d path from %s"
+msgid_plural "Updated %d paths from %s"
+msgstr[0] "從 %2$s 更新了 %1$d 個路徑"
+
+#: builtin/checkout.c:423
+#, c-format
+msgid "Updated %d path from the index"
+msgid_plural "Updated %d paths from the index"
+msgstr[0] "從索引�更新了 %d 個路徑"
+
+#: builtin/checkout.c:446 builtin/checkout.c:449 builtin/checkout.c:452
+#: builtin/checkout.c:456
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' �能在更新路徑時使用"
+
+#: builtin/checkout.c:459 builtin/checkout.c:462
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s' �能和 %s �時使用"
+
+#: builtin/checkout.c:466
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "�能�時更新路徑並切�到分支'%s'。"
+
+#: builtin/checkout.c:470
+#, c-format
+msgid "neither '%s' or '%s' is specified"
+msgstr "'%s' 或 '%s' 都沒有指定"
+
+#: builtin/checkout.c:474
+#, c-format
+msgid "'%s' must be used when '%s' is not specified"
+msgstr "未指定 '%2$s' 時，必須使用 '%1$s'"
+
+#: builtin/checkout.c:479 builtin/checkout.c:484
+#, c-format
+msgid "'%s' or '%s' cannot be used with %s"
+msgstr "'%s' 或 '%s' �能和 %s 一起使用"
+
+#: builtin/checkout.c:558 builtin/checkout.c:565
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "路徑 '%s' 未�併"
+
+#: builtin/checkout.c:734
+msgid "you need to resolve your current index first"
+msgstr "您需�先解決目�索引的��"
+
+#: builtin/checkout.c:788
+#, c-format
+msgid ""
+"cannot continue with staged changes in the following files:\n"
+"%s"
+msgstr ""
+"�能繼續，下列檔案有暫存的修改：\n"
+"%s"
+
+#: builtin/checkout.c:881
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "�能� '%s' 執行 reflog 動作：%s\n"
+
+#: builtin/checkout.c:923
+msgid "HEAD is now at"
+msgstr "HEAD 目��於"
+
+#: builtin/checkout.c:927 builtin/clone.c:725 t/helper/test-fast-rebase.c:203
+msgid "unable to update HEAD"
+msgstr "�能更新 HEAD"
+
+#: builtin/checkout.c:931
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "�設分支 '%s'\n"
+
+#: builtin/checkout.c:934
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "已經�於 '%s'\n"
+
+#: builtin/checkout.c:938
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "切�並�設分支 '%s'\n"
+
+#: builtin/checkout.c:940 builtin/checkout.c:1371
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "切�到一個新分支 '%s'\n"
+
+#: builtin/checkout.c:942
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "切�到分支 '%s'\n"
+
+#  譯者：請維��導空格
+#: builtin/checkout.c:993
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... �其它 %d 個。\n"
+
+#: builtin/checkout.c:999
+#, c-format
+msgid ""
+"Warning: you are leaving %d commit behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgid_plural ""
+"Warning: you are leaving %d commits behind, not connected to\n"
+"any of your branches:\n"
+"\n"
+"%s\n"
+msgstr[0] ""
+"警告：您正丟下 %d 個�交，未和任何分支關�：\n"
+"\n"
+"%s\n"
+
+#: 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"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgid_plural ""
+"If you want to keep them by creating a new branch, this may be a good time\n"
+"to do so with:\n"
+"\n"
+" git branch <new-branch-name> %s\n"
+"\n"
+msgstr[0] ""
+"如果您想���建立新分支儲存它，這�能是一個好時候。\n"
+"如下動作：\n"
+"\n"
+" git branch <新分支�> %s\n"
+"\n"
+
+#: builtin/checkout.c:1053
+msgid "internal error in revision walk"
+msgstr "在版本�歷時�到內部錯誤"
+
+#: builtin/checkout.c:1057
+msgid "Previous HEAD position was"
+msgstr "之�的 HEAD �置是"
+
+#: builtin/checkout.c:1097 builtin/checkout.c:1366
+msgid "You are on a branch yet to be born"
+msgstr "您�於一個尚未�始化的分支"
+
+#: 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 ""
+"'%s' 既�以是一個本機檔案，也�以是一個追蹤分支。\n"
+"請使用 --（和��的 --no-guess）來消除歧義"
+
+#: 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"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"If you'd like to always have checkouts of an ambiguous <name> prefer\n"
+"one remote, e.g. the 'origin' remote, consider setting\n"
+"checkout.defaultRemote=origin in your config."
+msgstr ""
+"如果您想�簽出一個�端追蹤分支，例如 'origin'，您�以\n"
+"使用 --track �項寫出全�：\n"
+"\n"
+"    git checkout --track origin/<name>\n"
+"\n"
+"如果您總是喜歡使用模糊的簡短分支� <name>，而�喜歡如 'origin' 的�端\n"
+"版本庫�，�以在設定中設定 checkout.defaultRemote=origin。"
+
+#: builtin/checkout.c:1196
+#, c-format
+msgid "'%s' matched multiple (%d) remote tracking branches"
+msgstr "'%s' 符�多個 (%d) �端追蹤分支"
+
+#: builtin/checkout.c:1262
+msgid "only one reference expected"
+msgstr "�期�有一個引用"
+
+#: builtin/checkout.c:1279
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "應�有一個引用，��供了 %d 個。"
+
+#: builtin/checkout.c:1325 builtin/worktree.c:268 builtin/worktree.c:436
+#, c-format
+msgid "invalid reference: %s"
+msgstr "無效引用：%s"
+
+#: builtin/checkout.c:1338 builtin/checkout.c:1707
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "引用�是一個樹：%s"
+
+#: builtin/checkout.c:1385
+#, c-format
+msgid "a branch is expected, got tag '%s'"
+msgstr "期望一個分支，得到標籤 '%s'"
+
+#: builtin/checkout.c:1387
+#, c-format
+msgid "a branch is expected, got remote branch '%s'"
+msgstr "期望一個分支，得到�端分支 '%s'"
+
+#: builtin/checkout.c:1388 builtin/checkout.c:1396
+#, c-format
+msgid "a branch is expected, got '%s'"
+msgstr "期望一個分支，得到 '%s'"
+
+#: builtin/checkout.c:1391
+#, c-format
+msgid "a branch is expected, got commit '%s'"
+msgstr "期望一個分支，得到�交 '%s'"
+
+#: builtin/checkout.c:1407
+msgid ""
+"cannot switch branch while merging\n"
+"Consider \"git merge --quit\" or \"git worktree add\"."
+msgstr ""
+"�能在�併時切�分支\n"
+"考慮使用 \"git merge --quit\" 或 \"git worktree add\"。"
+
+#: 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 ""
+"�能在 am 工作階段期間切�分支\n"
+"考慮使用 \"git am --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1415
+msgid ""
+"cannot switch branch while rebasing\n"
+"Consider \"git rebase --quit\" or \"git worktree add\"."
+msgstr ""
+"�能在�定基底時切�分支\n"
+"考慮使用 \"git rebase --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1419
+msgid ""
+"cannot switch branch while cherry-picking\n"
+"Consider \"git cherry-pick --quit\" or \"git worktree add\"."
+msgstr ""
+"�能在��時切�分支\n"
+"考慮使用 \"git cherry-pick --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1423
+msgid ""
+"cannot switch branch while reverting\n"
+"Consider \"git revert --quit\" or \"git worktree add\"."
+msgstr ""
+"�能在還原時切�分支\n"
+"考慮使用 \"git revert --quit\" 或 \"git worktree add\"。"
+
+#: builtin/checkout.c:1427
+msgid "you are switching branch while bisecting"
+msgstr "您在執行二分�尋時切�分支"
+
+#: builtin/checkout.c:1434
+msgid "paths cannot be used with switching branches"
+msgstr "路徑�能和切�分支�時使用"
+
+#: builtin/checkout.c:1437 builtin/checkout.c:1441 builtin/checkout.c:1445
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' �能和切�分支�時使用"
+
+#: 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' �能和 '%s' �時使用"
+
+#: builtin/checkout.c:1462
+#, c-format
+msgid "'%s' cannot take <start-point>"
+msgstr "'%s' �帶 <起始點>"
+
+#: builtin/checkout.c:1470
+#, c-format
+msgid "Cannot switch branch to a non-commit '%s'"
+msgstr "�能切�分支到一個��交 '%s'"
+
+#: builtin/checkout.c:1477
+msgid "missing branch or commit argument"
+msgstr "缺少分支或�交�數"
+
+#: builtin/checkout.c:1520
+msgid "perform a 3-way merge with the new branch"
+msgstr "和新的分支執行三方�併"
+
+#: builtin/checkout.c:1521 builtin/log.c:1810 parse-options.h:323
+msgid "style"
+msgstr "風格"
+
+#: builtin/checkout.c:1522
+msgid "conflict style (merge or diff3)"
+msgstr "��輸出風格（merge 或 diff3）"
+
+#: builtin/checkout.c:1534 builtin/worktree.c:488
+msgid "detach HEAD at named commit"
+msgstr "HEAD 從指定的�交分離"
+
+#: builtin/checkout.c:1535
+msgid "set upstream info for new branch"
+msgstr "為新的分支設定上游訊�"
+
+#: builtin/checkout.c:1537
+msgid "force checkout (throw away local modifications)"
+msgstr "強制簽出（�棄本機修改）"
+
+#: builtin/checkout.c:1539
+msgid "new-branch"
+msgstr "新分支"
+
+#: builtin/checkout.c:1539
+msgid "new unparented branch"
+msgstr "新的沒有父�交的分支"
+
+#: builtin/checkout.c:1541 builtin/merge.c:301
+msgid "update ignored files (default)"
+msgstr "更新忽略的檔案（�設）"
+
+#: builtin/checkout.c:1544
+msgid "do not check if another worktree is holding the given ref"
+msgstr "�檢查指定的引用是�被其他工作�所�用"
+
+#: builtin/checkout.c:1557
+msgid "checkout our version for unmerged files"
+msgstr "�尚未�併的檔案簽出我們的版本"
+
+#: builtin/checkout.c:1560
+msgid "checkout their version for unmerged files"
+msgstr "�尚未�併的檔案簽出他們的版本"
+
+#: builtin/checkout.c:1564
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "�路徑��稀�簽出的�制"
+
+#: builtin/checkout.c:1622
+#, c-format
+msgid "-%c, -%c and --orphan are mutually exclusive"
+msgstr "-%c�-%c 和 --orphan 是互斥的"
+
+#: builtin/checkout.c:1626
+msgid "-p and --overlay are mutually exclusive"
+msgstr "-p 和 --overlay 互斥"
+
+#: builtin/checkout.c:1663
+msgid "--track needs a branch name"
+msgstr "--track 需�一個分支�"
+
+#: builtin/checkout.c:1668
+#, c-format
+msgid "missing branch name; try -%c"
+msgstr "缺少分支�稱，請嘗試 -%c"
+
+#: builtin/checkout.c:1700
+#, c-format
+msgid "could not resolve %s"
+msgstr "無法解� %s"
+
+#: builtin/checkout.c:1716
+msgid "invalid path specification"
+msgstr "無效的路徑�格"
+
+#: builtin/checkout.c:1723
+#, c-format
+msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
+msgstr "'%s' �是一個�交，�能基於它建立分支 '%s'"
+
+#: builtin/checkout.c:1727
+#, c-format
+msgid "git checkout: --detach does not take a path argument '%s'"
+msgstr "git checkout：--detach �能接收路徑�數 '%s'"
+
+#: builtin/checkout.c:1736
+msgid "--pathspec-from-file is incompatible with --detach"
+msgstr "--pathspec-from-file 與 --detach �相容"
+
+#: builtin/checkout.c:1739 builtin/reset.c:325 builtin/stash.c:1630
+msgid "--pathspec-from-file is incompatible with --patch"
+msgstr "--pathspec-from-file 與 --patch �相容"
+
+#: builtin/checkout.c:1752
+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:1757
+msgid "you must specify path(s) to restore"
+msgstr "您必須指定一個�復原的路徑"
+
+#: 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 "分支"
+
+#: builtin/checkout.c:1784
+msgid "create and checkout a new branch"
+msgstr "建立並簽出一個新的分支"
+
+#: builtin/checkout.c:1786
+msgid "create/reset and checkout a branch"
+msgstr "建立/�設並簽出一個分支"
+
+#: builtin/checkout.c:1787
+msgid "create reflog for new branch"
+msgstr "為新的分支建立引用日誌"
+
+#: builtin/checkout.c:1789
+msgid "second guess 'git checkout <no-such-branch>' (default)"
+msgstr "二次猜測 'git checkout <無此分支>'（�設）"
+
+#: builtin/checkout.c:1790
+msgid "use overlay mode (default)"
+msgstr "使用疊加模�（�設）"
+
+#: builtin/checkout.c:1835
+msgid "create and switch to a new branch"
+msgstr "建立並切�一個新分支"
+
+#: builtin/checkout.c:1837
+msgid "create/reset and switch to a branch"
+msgstr "建立/�設並切�一個分支"
+
+#: builtin/checkout.c:1839
+msgid "second guess 'git switch <no-such-branch>'"
+msgstr "二次猜測 'git switch <無此分支>'"
+
+#: builtin/checkout.c:1841
+msgid "throw away local modifications"
+msgstr "�棄本機修改"
+
+#: builtin/checkout.c:1875
+msgid "which tree-ish to checkout from"
+msgstr "�簽出哪一個樹"
+
+#: builtin/checkout.c:1877
+msgid "restore the index"
+msgstr "復原索引"
+
+#: builtin/checkout.c:1879
+msgid "restore the working tree (default)"
+msgstr "復原工作�（�設）"
+
+#: builtin/checkout.c:1881
+msgid "ignore unmerged entries"
+msgstr "忽略未�併�目"
+
+#: builtin/checkout.c:1882
+msgid "use overlay mode"
+msgstr "使用疊加模�"
+
+#: 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 <模�>] [-x | -X] [--] <路徑>..."
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Removing %s\n"
+msgstr "正刪除 %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "Would remove %s\n"
+msgstr "將刪除 %s\n"
+
+#: builtin/clean.c:35
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "忽略版本庫 %s\n"
+
+#: builtin/clean.c:36
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "將忽略版本庫 %s\n"
+
+#: builtin/clean.c:38
+#, c-format
+msgid "could not lstat %s\n"
+msgstr "�能� %s 呼� lstat\n"
+
+#: builtin/clean.c:300 git-add--interactive.perl:593
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a numbered item\n"
+"foo        - select item based on unique prefix\n"
+"           - (empty) select nothing\n"
+msgstr ""
+"�助：\n"
+"1          - ��編號�擇一個�項\n"
+"foo        - ��唯一�綴�擇一個�項\n"
+"           - （空）什麼也��擇\n"
+
+#: builtin/clean.c:304 git-add--interactive.perl:602
+#, c-format
+msgid ""
+"Prompt help:\n"
+"1          - select a single item\n"
+"3-5        - select a range of items\n"
+"2-3,6-9    - select multiple ranges\n"
+"foo        - select item based on unique prefix\n"
+"-...       - unselect specified items\n"
+"*          - choose all items\n"
+"           - (empty) finish selecting\n"
+msgstr ""
+"�助：\n"
+"1          - �擇一個�項\n"
+"3-5        - �擇一個範�內的所有�項\n"
+"2-3,6-9    - �擇多個範�內的所有�項\n"
+"foo        - ��唯一�綴�擇一個�項\n"
+"-...       - ��特定的�項\n"
+"*          - �擇所有�項\n"
+"           - （空）���擇\n"
+
+#: builtin/clean.c:519 git-add--interactive.perl:568
+#: git-add--interactive.perl:573
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "嗯（%s）？\n"
+
+#: builtin/clean.c:659
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "輸入範本以排除�目>> "
+
+#: builtin/clean.c:693
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "警告：無法找到和 %s 符�的�目"
+
+#: builtin/clean.c:714
+msgid "Select items to delete"
+msgstr "�擇�刪除的�目"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:755
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "移除 %s [y/N]？ "
+
+#: builtin/clean.c:786
+msgid ""
+"clean               - start cleaning\n"
+"filter by pattern   - exclude items from deletion\n"
+"select by numbers   - select items to be deleted by numbers\n"
+"ask each            - confirm each deletion (like \"rm -i\")\n"
+"quit                - stop cleaning\n"
+"help                - this screen\n"
+"?                   - help for prompt selection"
+msgstr ""
+"clean               - 開始清�\n"
+"filter by pattern   - ��範本排除�刪除的�目\n"
+"select by numbers   - ��數字�擇�刪除的�目\n"
+"ask each            - ��刪除�一詢�（就� \"rm -i\"）\n"
+"quit                - �止刪除並離開\n"
+"help                - 顯示本�助\n"
+"?                   - 顯示如何在�示符下�擇的�助"
+
+#: builtin/clean.c:822
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "將刪除如下�目："
+
+#: builtin/clean.c:838
+msgid "No more files to clean, exiting."
+msgstr "沒有�清�的檔案，離開。"
+
+#: builtin/clean.c:900
+msgid "do not print names of files removed"
+msgstr "�列�刪除檔案的�稱"
+
+#: builtin/clean.c:902
+msgid "force"
+msgstr "強制"
+
+#: builtin/clean.c:903
+msgid "interactive cleaning"
+msgstr "互動�清除"
+
+#: builtin/clean.c:905
+msgid "remove whole directories"
+msgstr "刪除整個目錄"
+
+#: 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 "模�"
+
+#: builtin/clean.c:907
+msgid "add <pattern> to ignore rules"
+msgstr "新增 <模�> 到忽略�則"
+
+#: builtin/clean.c:908
+msgid "remove ignored files, too"
+msgstr "也刪除忽略的檔案"
+
+#: builtin/clean.c:910
+msgid "remove only ignored files"
+msgstr "�刪除忽略的檔案"
+
+#: builtin/clean.c:925
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce 設定為 true 且未�供 -i�-n 或 -f �項，拒絕執行清�動作"
+
+#: builtin/clean.c:928
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce �設為 true 且未�供 -i�-n 或 -f �項，拒絕執行清�動作"
+
+#: builtin/clean.c:940
+msgid "-x and -X cannot be used together"
+msgstr "-x 和 -X �能�時使用"
+
+#: builtin/clone.c:45
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<�項>] [--] <版本庫> [<路徑>]"
+
+#: builtin/clone.c:96
+msgid "don't clone shallow repository"
+msgstr "��複製淺版本庫"
+
+#: builtin/clone.c:98
+msgid "don't create a checkout"
+msgstr "�建立一個簽出"
+
+#: builtin/clone.c:99 builtin/clone.c:101 builtin/init-db.c:542
+msgid "create a bare repository"
+msgstr "建立一個純版本庫"
+
+#: builtin/clone.c:103
+msgid "create a mirror repository (implies bare)"
+msgstr "建立一個��版本庫（也是純版本庫）"
+
+#: builtin/clone.c:105
+msgid "to clone from a local repository"
+msgstr "從本機版本庫複製"
+
+#: builtin/clone.c:107
+msgid "don't use local hardlinks, always copy"
+msgstr "�使用本機硬連�，始終複製"
+
+#: builtin/clone.c:109
+msgid "setup as shared repository"
+msgstr "設定為共享版本庫"
+
+#: builtin/clone.c:111
+msgid "pathspec"
+msgstr "路徑�格"
+
+#: builtin/clone.c:111
+msgid "initialize submodules in the clone"
+msgstr "在複製時�始化�模組"
+
+#: builtin/clone.c:115
+msgid "number of submodules cloned in parallel"
+msgstr "並行複製的�模組數"
+
+#: builtin/clone.c:116 builtin/init-db.c:539
+msgid "template-directory"
+msgstr "範本目錄"
+
+#: 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:1899
+#: builtin/submodule--helper.c:2353 builtin/submodule--helper.c:2903
+msgid "reference repository"
+msgstr "�考版本庫"
+
+#: 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 "僅在複製時�考 --reference 指�的本機版本庫"
+
+#: 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 "�稱"
+
+#: builtin/clone.c:125
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "使用 <�稱> 而�是 'origin' 去追蹤上游"
+
+#: builtin/clone.c:127
+msgid "checkout <branch> instead of the remote's 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:862
+#: builtin/pull.c:208
+msgid "depth"
+msgstr "深度"
+
+#: builtin/clone.c:131
+msgid "create a shallow clone of that depth"
+msgstr "建立一個指定深度的淺複製"
+
+#: builtin/clone.c:132 builtin/fetch.c:182 builtin/pack-objects.c:3964
+#: builtin/pull.c:211
+msgid "time"
+msgstr "時間"
+
+#: builtin/clone.c:133
+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
+msgid "revision"
+msgstr "修訂版"
+
+#: builtin/clone.c:135 builtin/fetch.c:185 builtin/pull.c:215
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "�得更多淺複製的�去歷�記錄，除了特定版本"
+
+#: builtin/clone.c:137 builtin/submodule--helper.c:1911
+#: builtin/submodule--helper.c:2369
+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 "��複製任何標籤，之後�得也��追蹤這些標籤"
+
+#: builtin/clone.c:141
+msgid "any cloned submodules will be shallow"
+msgstr "�模組將以淺下載模�複製"
+
+#: builtin/clone.c:142 builtin/init-db.c:548
+msgid "gitdir"
+msgstr "git目錄"
+
+#: builtin/clone.c:143 builtin/init-db.c:549
+msgid "separate git dir from working tree"
+msgstr "git目錄和工作�分離"
+
+#: builtin/clone.c:144
+msgid "key=value"
+msgstr "key=value"
+
+#: builtin/clone.c:145
+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:575 builtin/send-pack.c:196
+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:575 builtin/send-pack.c:197
+msgid "option to transmit"
+msgstr "傳輸�項"
+
+#: builtin/clone.c:148 builtin/fetch.c:203 builtin/pull.c:234
+#: 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:578
+msgid "use IPv6 addresses only"
+msgstr "�使用 IPv6 ��"
+
+#: builtin/clone.c:154
+msgid "any cloned submodules will use their remote-tracking branch"
+msgstr "任何複製的�模組都將使用它們的�端追蹤分支"
+
+#: builtin/clone.c:156
+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
+#, c-format
+msgid "info: Could not add alternate for '%s': %s\n"
+msgstr "info: �能為 '%s' 新增一個備用：%s\n"
+
+#: builtin/clone.c:418
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s 存在且�是一個目錄"
+
+#: builtin/clone.c:436
+#, c-format
+msgid "failed to start iterator over '%s'"
+msgstr "無法在 '%s' 上啟動疊代器"
+
+#: builtin/clone.c:467
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "建立連� '%s' 失敗"
+
+#: builtin/clone.c:471
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "複製檔案至 '%s' 失敗"
+
+#: builtin/clone.c:476
+#, c-format
+msgid "failed to iterate over '%s'"
+msgstr "無法在 '%s' 上疊代"
+
+#: builtin/clone.c:503
+#, c-format
+msgid "done.\n"
+msgstr "完�。\n"
+
+#: 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 ""
+"複製�功，但是簽出失敗。\n"
+"您�以�� 'git status' 檢查哪些已被簽出，然後使用指令\n"
+"'git restore --source=HEAD :/' �試\n"
+
+#: builtin/clone.c:594
+#, c-format
+msgid "Could not find remote branch %s to clone."
+msgstr "找�到�複製的�端分支 %s。"
+
+#: builtin/clone.c:713
+#, c-format
+msgid "unable to update %s"
+msgstr "�能更新 %s"
+
+#: builtin/clone.c:761
+msgid "failed to initialize sparse-checkout"
+msgstr "無法�始化稀�簽出"
+
+#: builtin/clone.c:784
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr "�端 HEAD 指�一個�存在的引用，無法簽出。\n"
+
+#: builtin/clone.c:816
+msgid "unable to checkout working tree"
+msgstr "�能簽出工作�"
+
+#: builtin/clone.c:894
+msgid "unable to write parameters to config file"
+msgstr "無法將�數寫入設定檔案"
+
+#: builtin/clone.c:957
+msgid "cannot repack to clean up"
+msgstr "無法執行 repack 來清�"
+
+#: builtin/clone.c:959
+msgid "cannot unlink temporary alternates file"
+msgstr "無法刪除暫時的 alternates 檔案"
+
+#: builtin/clone.c:1001 builtin/receive-pack.c:2490
+msgid "Too many arguments."
+msgstr "太多�數。"
+
+#: builtin/clone.c:1005
+msgid "You must specify a repository to clone."
+msgstr "您必須指定�複製的版本庫。"
+
+#: builtin/clone.c:1018
+#, 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 �項�相容。"
+
+#: builtin/clone.c:1035
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "版本庫 '%s' �存在"
+
+#: builtin/clone.c:1039 builtin/fetch.c:2014
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "深度 %s �是一個正數"
+
+#: builtin/clone.c:1049
+#, c-format
+msgid "destination path '%s' already exists and is not an empty directory."
+msgstr "目標路徑 '%s' 已經存在，並且�是一個空目錄。"
+
+#: builtin/clone.c:1055
+#, c-format
+msgid "repository path '%s' already exists and is not an empty directory."
+msgstr "版本庫路徑 '%s' 已經存在，並且�是一個空目錄。"
+
+#: builtin/clone.c:1069
+#, 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:1997 builtin/worktree.c:280 builtin/worktree.c:312
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "�能為 '%s' 建立先導目錄"
+
+#: builtin/clone.c:1089
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "�能建立工作�目錄 '%s'"
+
+#: builtin/clone.c:1109
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "複製到純版本庫 '%s'...\n"
+
+#: builtin/clone.c:1111
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "正複製到 '%s'...\n"
+
+#: builtin/clone.c:1135
+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
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' �是一個有效的�端�稱"
+
+#: builtin/clone.c:1229
+msgid "--depth is ignored in local clones; use file:// instead."
+msgstr "本機複製會忽略 --depth。請改用 file:// 通訊�定。"
+
+#: builtin/clone.c:1231
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "本機複製會忽略 --shallow-since。請改用 file:// �定。"
+
+#: builtin/clone.c:1233
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "本機複製會忽略 --shallow-exclude。請改用 file:// �定。"
+
+#: builtin/clone.c:1235
+msgid "--filter is ignored in local clones; use file:// instead."
+msgstr "本機複製會忽略 --filter。請改用 file:// �定。"
+
+#: builtin/clone.c:1240
+msgid "source repository is shallow, ignoring --local"
+msgstr "�版本庫是淺複製，忽略 --local"
+
+#: builtin/clone.c:1245
+msgid "--local is ignored"
+msgstr "--local 被忽略"
+
+#: builtin/clone.c:1324 builtin/clone.c:1383
+msgid "remote transport reported error"
+msgstr "�端傳輸回報錯誤"
+
+#: builtin/clone.c:1336 builtin/clone.c:1344
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "�端分支 %s 在上游 %s 未發�"
+
+#: builtin/clone.c:1347
+msgid "You appear to have cloned an empty repository."
+msgstr "您複製的版本庫似乎是空的。"
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<�項>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "尋找設定變數"
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "�使用的�置"
+
+#: builtin/column.c:30
+msgid "maximum width"
+msgstr "最大寬度"
+
+#: builtin/column.c:31
+msgid "padding space on left border"
+msgstr "左邊框的填充空間"
+
+#: builtin/column.c:32
+msgid "padding space on right border"
+msgstr "�邊框的填充空間"
+
+#: builtin/column.c:33
+msgid "padding space between columns"
+msgstr "兩直行之間的填充空間"
+
+#: builtin/column.c:51
+msgid "--command must be the first argument"
+msgstr "--command 必須是第一個�數"
+
+#: 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 <物件目錄>] [--shallow] [--"
+"[no-]progress]"
+
+#: builtin/commit-graph.c:14 builtin/commit-graph.c:27
+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 <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 "找�到符� %s 的物件目錄"
+
+#: builtin/commit-graph.c:80 builtin/commit-graph.c:210
+#: builtin/commit-graph.c:316 builtin/fetch.c:191 builtin/log.c:1779
+msgid "dir"
+msgstr "目錄"
+
+#: builtin/commit-graph.c:81 builtin/commit-graph.c:211
+#: builtin/commit-graph.c:317
+msgid "the object directory to store the graph"
+msgstr "儲存圖形的物件目錄"
+
+#: builtin/commit-graph.c:83
+msgid "if the commit-graph is split, only verify the tip file"
+msgstr "如果�交圖形被分割，�驗證頭一個檔案"
+
+#: builtin/commit-graph.c:106
+#, c-format
+msgid "Could not open commit-graph '%s'"
+msgstr "無法開啟�交圖形 '%s'"
+
+#: builtin/commit-graph.c:142
+#, c-format
+msgid "unrecognized --split argument, %s"
+msgstr "無法識別的 --split �數，%s"
+
+#: builtin/commit-graph.c:155
+#, c-format
+msgid "unexpected non-hex object ID: %s"
+msgstr "�期望的��六進�物件 ID：%s"
+
+#: builtin/commit-graph.c:160
+#, c-format
+msgid "invalid object: %s"
+msgstr "物件無效：%s"
+
+#: builtin/commit-graph.c:213
+msgid "start walk at all refs"
+msgstr "開始�歷所有引用"
+
+#: builtin/commit-graph.c:215
+msgid "scan pack-indexes listed by stdin for commits"
+msgstr "從標準輸入中的包索引檔案列表中掃��交"
+
+#: builtin/commit-graph.c:217
+msgid "start walk at commits listed by stdin"
+msgstr "從標準輸入中的�交開始掃�"
+
+#: builtin/commit-graph.c:219
+msgid "include all commits already in the commit-graph file"
+msgstr "包� commit-graph 檔案中已有所有�交"
+
+#: builtin/commit-graph.c:221
+msgid "enable computation for changed paths"
+msgstr "啟用已變更路徑的計算"
+
+#: builtin/commit-graph.c:224
+msgid "allow writing an incremental commit-graph file"
+msgstr "�許寫一個增��交圖形檔案"
+
+#: builtin/commit-graph.c:228
+msgid "maximum number of commits in a non-base split commit-graph"
+msgstr "在�基本分割�交圖形中的最大�交數"
+
+#: builtin/commit-graph.c:230
+msgid "maximum ratio between two levels of a split commit-graph"
+msgstr "一個分割�交圖形的兩個級別之間的最大比率"
+
+#: builtin/commit-graph.c:232
+msgid "only expire files older than a given date-time"
+msgstr "�將舊於指定日期與時間的檔案設為�期"
+
+#: builtin/commit-graph.c:234
+msgid "maximum number of changed-path Bloom filters to compute"
+msgstr "變更路徑的布隆�濾器�計算的最大�"
+
+#: builtin/commit-graph.c:255
+msgid "use at most one of --reachable, --stdin-commits, or --stdin-packs"
+msgstr "�能�時使用 --reachable�--stdin-commits 或 --stdin-packs"
+
+#: builtin/commit-graph.c:287
+msgid "Collecting commits from input"
+msgstr "正在從輸入收集�交"
+
+#: builtin/commit-tree.c:18
+msgid ""
+"git commit-tree [(-p <parent>)...] [-S[<keyid>]] [(-m <message>)...] [(-F "
+"<file>)...] <tree>"
+msgstr ""
+"git commit-tree [(-p <父�交>)...] [-S[<keyid>]] [(-m <消�>)...] [(-F <檔案"
+">)...] <樹>"
+
+#: builtin/commit-tree.c:31
+#, c-format
+msgid "duplicate parent %s ignored"
+msgstr "忽略�複的父�交 %s"
+
+#: 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"
+
+#: 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
+#, c-format
+msgid "git commit-tree: failed to read '%s'"
+msgstr "git commit-tree：無法讀� '%s'"
+
+#: builtin/commit-tree.c:98
+#, c-format
+msgid "git commit-tree: failed to close '%s'"
+msgstr "git commit-tree：無法關閉 '%s'"
+
+#: builtin/commit-tree.c:111
+msgid "parent"
+msgstr "父�交"
+
+#: builtin/commit-tree.c:112
+msgid "id of a parent commit object"
+msgstr "父�交物件 ID"
+
+#: 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 "訊�"
+
+#: builtin/commit-tree.c:115 builtin/commit.c:1624
+msgid "commit message"
+msgstr "�交說明"
+
+#: builtin/commit-tree.c:118
+msgid "read commit log message from file"
+msgstr "從檔案中讀��交說明"
+
+#: 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 "GPG �交簽�"
+
+#: builtin/commit-tree.c:133
+msgid "must give exactly one tree"
+msgstr "必須精確地�供一個樹"
+
+#: builtin/commit-tree.c:140
+msgid "git commit-tree: failed to read"
+msgstr "git commit-tree：讀�失敗"
+
+#: builtin/commit.c:41
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<�項>] [--] <路徑�格>..."
+
+#: builtin/commit.c:46
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<�項>] [--] <路徑�格>..."
+
+#: builtin/commit.c:51
+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 ""
+"您�修補最近的�交，但這麼�會讓它�為空�交。您�以�複您的指令並帶上\n"
+"--allow-empty �項，或者您�用指令 \"git reset HEAD^\" 整個刪除該�交。\n"
+
+#: builtin/commit.c:56
+msgid ""
+"The previous cherry-pick is now empty, possibly due to conflict resolution.\n"
+"If you wish to commit it anyway, use:\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+msgstr ""
+"之�的��動作�在是一個空�交，�能是由��解決導致的。如果您無論如何\n"
+"也��交，使用指令：\n"
+"\n"
+"    git commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:63
+msgid "Otherwise, please use 'git rebase --skip'\n"
+msgstr "�則，請使用 'git rebase --skip'\n"
+
+#: builtin/commit.c:66
+msgid "Otherwise, please use 'git cherry-pick --skip'\n"
+msgstr "�則，請使用 'git cherry-pick --skip'\n"
+
+#: builtin/commit.c:69
+msgid ""
+"and then use:\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"to resume cherry-picking the remaining commits.\n"
+"If you wish to skip this commit, use:\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+msgstr ""
+"然後使用：\n"
+"\n"
+"    git cherry-pick --continue\n"
+"\n"
+"來繼續��剩餘�交。如果您想略�此�交，使用：\n"
+"\n"
+"    git cherry-pick --skip\n"
+"\n"
+
+#: builtin/commit.c:324
+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
+msgid "No paths with --include/--only does not make sense."
+msgstr "�數 --include/--only �跟路徑沒有�義。"
+
+#: builtin/commit.c:386
+msgid "unable to create temporary index"
+msgstr "�能建立暫時索引"
+
+#: builtin/commit.c:395
+msgid "interactive add failed"
+msgstr "互動�新增失敗"
+
+#: builtin/commit.c:410
+msgid "unable to update temporary index"
+msgstr "無法更新暫時索引"
+
+#: builtin/commit.c:412
+msgid "Failed to update main cache tree"
+msgstr "�能更新樹的主快�"
+
+#: builtin/commit.c:437 builtin/commit.c:460 builtin/commit.c:508
+msgid "unable to write new_index file"
+msgstr "無法寫 new_index 檔案"
+
+#: builtin/commit.c:489
+msgid "cannot do a partial commit during a merge."
+msgstr "在�併�程中�能�部分�交。"
+
+#: builtin/commit.c:491
+msgid "cannot do a partial commit during a cherry-pick."
+msgstr "在���程中�能�部分�交。"
+
+#: builtin/commit.c:493
+msgid "cannot do a partial commit during a rebase."
+msgstr "在�定基底�程中�能�部分�交。"
+
+#: builtin/commit.c:501
+msgid "cannot read the index"
+msgstr "無法讀�索引"
+
+#: builtin/commit.c:520
+msgid "unable to write temporary index file"
+msgstr "無法寫暫時索引檔案"
+
+#: builtin/commit.c:618
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "�交 '%s' 缺少作者訊�"
+
+#: builtin/commit.c:620
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "�交 '%s' 有格�錯誤的作者訊�"
+
+#: builtin/commit.c:639
+msgid "malformed --author parameter"
+msgstr "格�錯誤的 --author �數"
+
+#: builtin/commit.c:692
+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:1165
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "�能查詢�交 %s"
+
+#: builtin/commit.c:758 builtin/shortlog.c:413
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "（正從標準輸入中讀�日誌訊�）\n"
+
+#: builtin/commit.c:760
+msgid "could not read log from standard input"
+msgstr "�能從標準輸入中讀�日誌訊�"
+
+#: builtin/commit.c:764
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "�能讀�日誌檔案 '%s'"
+
+#: builtin/commit.c:801
+#, c-format
+msgid "cannot combine -m with --fixup:%s"
+msgstr "-m 和 --fixup:%s ����使用"
+
+#: builtin/commit.c:813 builtin/commit.c:829
+msgid "could not read SQUASH_MSG"
+msgstr "�能讀� SQUASH_MSG"
+
+#: builtin/commit.c:820
+msgid "could not read MERGE_MSG"
+msgstr "�能讀� MERGE_MSG"
+
+#: builtin/commit.c:880
+msgid "could not write commit template"
+msgstr "�能寫�交範本"
+
+#: builtin/commit.c:893
+#, 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:895
+#, 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: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 ""
+"請輸入�述您變更的�交訊�。會�留開頭是「%c�\n"
+"的行，但也�以自己移除掉這些行。\n"
+
+#: builtin/commit.c:903
+#, 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: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"
+"您似乎正在�交一個�併�交。\n"
+"如果錯誤，請執行\n"
+"\tgit update-ref -d MERGE_HEAD\n"
+"後�試。\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"
+"您似乎正在�交一個���交。\n"
+"如果錯誤，請執行\n"
+"\tgit update-ref -d CHERRY_PICK_HEAD\n"
+"後�試。\n"
+
+#  譯者：為�證在輸出中�齊，注�調整�中空格�
+#: builtin/commit.c:947
+#, c-format
+msgid "%sAuthor:    %.*s <%.*s>"
+msgstr "%s作者：  %.*s <%.*s>"
+
+#  譯者：為�證在輸出中�齊，注�調整�中空格�
+#: builtin/commit.c:955
+#, c-format
+msgid "%sDate:      %s"
+msgstr "%s日期：  %s"
+
+#  譯者：為�證在輸出中�齊，注�調整�中空格�
+#: builtin/commit.c:962
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%s�交者：%.*s <%.*s>"
+
+#: builtin/commit.c:980
+msgid "Cannot read index"
+msgstr "無法讀�索引"
+
+#: builtin/commit.c:1025
+msgid "unable to pass trailers to --trailers"
+msgstr "無法將尾部署�傳�至 --trailers"
+
+#: builtin/commit.c:1065
+msgid "Error building trees"
+msgstr "無法建立樹狀物件"
+
+#: builtin/commit.c:1079 builtin/tag.c:319
+#, c-format
+msgid "Please supply the message using either -m or -F option.\n"
+msgstr "請使用 -m 或 -F �項�供�交說明。\n"
+
+#: builtin/commit.c:1123
+#, c-format
+msgid "--author '%s' is not 'Name <email>' and matches no existing author"
+msgstr "--author '%s' �是 '姓� <信箱>' 格�，且未能在�有作者中找到符�"
+
+#: builtin/commit.c:1137
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "無效的忽略模� '%s'"
+
+#: builtin/commit.c:1155 builtin/commit.c:1448
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "無效的未追蹤檔案�數 '%s'"
+
+#: builtin/commit.c:1195
+msgid "--long and -z are incompatible"
+msgstr "--long 和 -z �項�相容"
+
+#: builtin/commit.c:1226
+msgid "You are in the middle of a merge -- cannot reword."
+msgstr "正在�併中——�能�新輸入。"
+
+#: builtin/commit.c:1228
+msgid "You are in the middle of a cherry-pick -- cannot reword."
+msgstr "正在��中——�能�新輸入。"
+
+#: builtin/commit.c:1231
+#, c-format
+msgid "cannot combine reword option of --fixup with path '%s'"
+msgstr "�能將「%s�路徑與 --fixup 的 reword �項��"
+
+#: builtin/commit.c:1233
+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:1252
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "�時使用 --reset-author 和 --author 沒有�義"
+
+#: builtin/commit.c:1261
+msgid "You have nothing to amend."
+msgstr "您沒有�修補的�交。"
+
+#: builtin/commit.c:1264
+msgid "You are in the middle of a merge -- cannot amend."
+msgstr "您正處於一個�併�程中 -- 無法修補�交。"
+
+#: builtin/commit.c:1266
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "您正處於一個���程中 -- 無法修補�交。"
+
+#: builtin/commit.c:1268
+msgid "You are in the middle of a rebase -- cannot amend."
+msgstr "您正處於�定基底的�程中 -- 無法修訂。"
+
+#: builtin/commit.c:1271
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "�項 --squash 和 --fixup �能�時使用"
+
+#: builtin/commit.c:1281
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "�能用一個 -c/-C/-F/--fixup �項。"
+
+#: builtin/commit.c:1283
+msgid "Option -m cannot be combined with -c/-C/-F."
+msgstr "�項 -m �能和 -c/-C/-F �時使用。"
+
+#: 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:1310
+msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
+msgstr "�能用一個 --include/--only/--all/--interactive/--patch �項。"
+
+#: builtin/commit.c:1338
+#, c-format
+msgid "unknown option: --fixup=%s:%s"
+msgstr "未知�項：--fixup=%s:%s"
+
+#: builtin/commit.c:1352
+#, c-format
+msgid "paths '%s ...' with -a does not make sense"
+msgstr "路徑 '%s ...' 和 -a �項�時使用沒有�義"
+
+#: builtin/commit.c:1483 builtin/commit.c:1652
+msgid "show status concisely"
+msgstr "以簡潔的格�顯示狀態"
+
+#: builtin/commit.c:1485 builtin/commit.c:1654
+msgid "show branch information"
+msgstr "顯示分支訊�"
+
+#: builtin/commit.c:1487
+msgid "show stash information"
+msgstr "顯示儲��訊�"
+
+#: builtin/commit.c:1489 builtin/commit.c:1656
+msgid "compute full ahead/behind values"
+msgstr "計算完整的領先/�後值"
+
+#: builtin/commit.c:1491
+msgid "version"
+msgstr "版本"
+
+#: builtin/commit.c:1491 builtin/commit.c:1658 builtin/push.c:551
+#: builtin/worktree.c:690
+msgid "machine-readable output"
+msgstr "機器�讀的輸出"
+
+#: builtin/commit.c:1494 builtin/commit.c:1660
+msgid "show status in long format (default)"
+msgstr "以長格�顯示狀態（�設）"
+
+#: builtin/commit.c:1497 builtin/commit.c:1663
+msgid "terminate entries with NUL"
+msgstr "�目以 NUL 字元�尾"
+
+#: 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 "模�"
+
+#: builtin/commit.c:1500 builtin/commit.c:1666
+msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
+msgstr "顯示未追蹤的檔案，「模��的���數：all�normal�no。（�設值：all）"
+
+#: builtin/commit.c:1504
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"顯示已忽略的檔案，��模�：traditional�matching�no。（�設值："
+"traditional）"
+
+#: builtin/commit.c:1506 parse-options.h:193
+msgid "when"
+msgstr "何時"
+
+#: builtin/commit.c:1507
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"忽略�模組的更改，「何時�的���數：all�dirty�untracked。（�設值：all）"
+
+#: builtin/commit.c:1509
+msgid "list untracked files in columns"
+msgstr "以列的方�顯示未追蹤的檔案"
+
+#: builtin/commit.c:1510
+msgid "do not detect renames"
+msgstr "�檢測�新命�"
+
+#: builtin/commit.c:1512
+msgid "detect renames, optionally set similarity index"
+msgstr "檢測�新命�，�以設定索引相似度"
+
+#: builtin/commit.c:1535
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "�支�已忽略和未追蹤檔案�數的組�"
+
+#: builtin/commit.c:1617
+msgid "suppress summary after successful commit"
+msgstr "�交�功後�顯示概述訊�"
+
+#: builtin/commit.c:1618
+msgid "show diff in commit message template"
+msgstr "在�交說明範本裡顯示差異"
+
+#: builtin/commit.c:1620
+msgid "Commit message options"
+msgstr "�交說明�項"
+
+#: builtin/commit.c:1621 builtin/merge.c:286 builtin/tag.c:458
+msgid "read message from file"
+msgstr "從檔案中讀��交說明"
+
+#: builtin/commit.c:1622
+msgid "author"
+msgstr "作者"
+
+#: builtin/commit.c:1622
+msgid "override author for commit"
+msgstr "�交時覆蓋作者"
+
+#: builtin/commit.c:1623 builtin/gc.c:550
+msgid "date"
+msgstr "日期"
+
+#: builtin/commit.c:1623
+msgid "override date for commit"
+msgstr "�交時覆蓋日期"
+
+#: builtin/commit.c:1625 builtin/commit.c:1626 builtin/commit.c:1632
+#: parse-options.h:329 ref-filter.h:90
+msgid "commit"
+msgstr "�交"
+
+#: builtin/commit.c:1625
+msgid "reuse and edit message from specified commit"
+msgstr "�用並編輯指定�交的�交說明"
+
+#: builtin/commit.c:1626
+msgid "reuse message from specified commit"
+msgstr "�用指定�交的�交說明"
+
+#. TRANSLATORS: Leave "[(amend|reword):]" as-is,
+#. and only translate <commit>.
+#.
+#: builtin/commit.c:1631
+msgid "[(amend|reword):]commit"
+msgstr "[(amend|reword):]commit"
+
+#: builtin/commit.c:1631
+msgid ""
+"use autosquash formatted message to fixup or amend/reword specified commit"
+msgstr "使用 autosquash 格�化後的說明來 fixup 或是 amend/reword 指定�交"
+
+#: builtin/commit.c:1632
+msgid "use autosquash formatted message to squash specified commit"
+msgstr "使用 autosquash 格�的�交說明用以壓縮至指定的�交"
+
+#: builtin/commit.c:1633
+msgid "the commit is authored by me now (used with -C/-c/--amend)"
+msgstr "�在將該�交的作者改為我（和 -C/-c/--amend �數共用）"
+
+#: builtin/commit.c:1634 builtin/interpret-trailers.c:111
+msgid "trailer"
+msgstr "尾部署�"
+
+#: 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
+msgid "add a Signed-off-by trailer"
+msgstr "在�尾加入 Signed-off-by"
+
+#: builtin/commit.c:1636
+msgid "use specified template file"
+msgstr "使用指定的範本檔案"
+
+#: builtin/commit.c:1637
+msgid "force edit of commit"
+msgstr "強制編輯�交"
+
+#: builtin/commit.c:1639
+msgid "include status in commit message template"
+msgstr "在�交說明範本裡包�狀態訊�"
+
+#: builtin/commit.c:1644
+msgid "Commit contents options"
+msgstr "�交內容�項"
+
+#: builtin/commit.c:1645
+msgid "commit all changed files"
+msgstr "�交所有改動的檔案"
+
+#: builtin/commit.c:1646
+msgid "add specified files to index for commit"
+msgstr "新增指定的檔案到索引�等待�交"
+
+#: builtin/commit.c:1647
+msgid "interactively add files"
+msgstr "互動�新增檔案"
+
+#: builtin/commit.c:1648
+msgid "interactively add changes"
+msgstr "互動�新增變更"
+
+#: builtin/commit.c:1649
+msgid "commit only specified files"
+msgstr "��交指定的檔案"
+
+#: builtin/commit.c:1650
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "繞� pre-commit 和 commit-msg 掛鉤"
+
+#: builtin/commit.c:1651
+msgid "show what would be committed"
+msgstr "顯示將��交的內容"
+
+#: builtin/commit.c:1664
+msgid "amend previous commit"
+msgstr "修改先�的�交"
+
+#: builtin/commit.c:1665
+msgid "bypass post-rewrite hook"
+msgstr "繞� post-rewrite 掛鉤"
+
+#: builtin/commit.c:1672
+msgid "ok to record an empty change"
+msgstr "�許一個空�交"
+
+#: builtin/commit.c:1674
+msgid "ok to record a change with an empty message"
+msgstr "�許空的�交說明"
+
+#: builtin/commit.c:1750
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "�壞的 MERGE_HEAD 檔案（%s）"
+
+#: builtin/commit.c:1757
+msgid "could not read MERGE_MODE"
+msgstr "�能讀� MERGE_MODE"
+
+#: builtin/commit.c:1778
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "�能讀��交說明：%s"
+
+#: builtin/commit.c:1785
+#, c-format
+msgid "Aborting commit due to empty commit message.\n"
+msgstr "終止�交因為�交說明為空。\n"
+
+#: builtin/commit.c:1790
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "終止�交；您未更改來自範本的�交說明。\n"
+
+#: builtin/commit.c:1801
+#, c-format
+msgid "Aborting commit due to empty commit message body.\n"
+msgstr "�交說明內文空白，中止�交作業。\n"
+
+#: 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 ""
+"版本庫已更新，但無法寫 new_index 檔案。檢查是��碟已滿或\n"
+"�碟��已耗盡，然後執行 \"git restore --staged :/\" 復原。"
+
+#: builtin/config.c:11
+msgid "git config [<options>]"
+msgstr "git config [<�項>]"
+
+#: builtin/config.c:109 builtin/env--helper.c:27
+#, c-format
+msgid "unrecognized --type argument, %s"
+msgstr "無法識別的 --type �數，%s"
+
+#: builtin/config.c:121
+msgid "only one type at a time"
+msgstr "一次�能一個類型"
+
+#: builtin/config.c:130
+msgid "Config file location"
+msgstr "設定檔案�置"
+
+#: builtin/config.c:131
+msgid "use global config file"
+msgstr "使用全域設定檔案"
+
+#: builtin/config.c:132
+msgid "use system config file"
+msgstr "使用系統級設定檔案"
+
+#: builtin/config.c:133
+msgid "use repository config file"
+msgstr "使用版本庫級設定檔案"
+
+#: builtin/config.c:134
+msgid "use per-worktree config file"
+msgstr "使用工作�級別的設定檔案"
+
+#: builtin/config.c:135
+msgid "use given config file"
+msgstr "使用指定的設定檔案"
+
+#: builtin/config.c:136
+msgid "blob-id"
+msgstr "資料物件 ID"
+
+#: builtin/config.c:136
+msgid "read config from given blob object"
+msgstr "從�供的資料物件讀�設定"
+
+#: builtin/config.c:137
+msgid "Action"
+msgstr "動作"
+
+#: builtin/config.c:138
+msgid "get value: name [value-pattern]"
+msgstr "�得值：name [value-pattern]"
+
+#: builtin/config.c:139
+msgid "get all values: key [value-pattern]"
+msgstr "�得所有值：key [value-pattern]"
+
+#: builtin/config.c:140
+msgid "get values for regexp: name-regex [value-pattern]"
+msgstr "根據正�表示��得值：name-regex [value-pattern]"
+
+#: builtin/config.c:141
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "�得 URL �值：section[.var] URL"
+
+#: builtin/config.c:142
+msgid "replace all matching variables: name value [value-pattern]"
+msgstr "�代所有符�的變數：name value [value-pattern]"
+
+#: builtin/config.c:143
+msgid "add a new variable: name value"
+msgstr "新增一個新的變數：name value"
+
+#: builtin/config.c:144
+msgid "remove a variable: name [value-pattern]"
+msgstr "移除一個變數：name [value-pattern]"
+
+#: builtin/config.c:145
+msgid "remove all matches: name [value-pattern]"
+msgstr "移除所有符�項目：name [value-pattern]"
+
+#: builtin/config.c:146
+msgid "rename section: old-name new-name"
+msgstr "�新命��節：old-name new-name"
+
+#: builtin/config.c:147
+msgid "remove a section: name"
+msgstr "刪除一個�節：name"
+
+#: builtin/config.c:148
+msgid "list all"
+msgstr "全部列出"
+
+#: builtin/config.c:149
+msgid "use string equality when comparing values to 'value-pattern'"
+msgstr "比較「value-pattern�的值時，使用字串相等比較"
+
+#: builtin/config.c:150
+msgid "open an editor"
+msgstr "開啟一個編輯器"
+
+#: builtin/config.c:151
+msgid "find the color configured: slot [default]"
+msgstr "�得設定的�色：設定 [�設]"
+
+#: builtin/config.c:152
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "�得�色設定：設定 [stdout-is-tty]"
+
+#: builtin/config.c:153
+msgid "Type"
+msgstr "é¡žåž‹"
+
+#: builtin/config.c:154 builtin/env--helper.c:43
+msgid "value is given this type"
+msgstr "�值為該類型"
+
+#: builtin/config.c:155
+msgid "value is \"true\" or \"false\""
+msgstr "值是 \"true\" 或 \"false\""
+
+#: builtin/config.c:156
+msgid "value is decimal number"
+msgstr "值是�進�數"
+
+#: builtin/config.c:157
+msgid "value is --bool or --int"
+msgstr "值是 --bool or --int"
+
+#: builtin/config.c:158
+msgid "value is --bool or string"
+msgstr "值是 --bool 或 string"
+
+#: builtin/config.c:159
+msgid "value is a path (file or directory name)"
+msgstr "值是一個路徑（檔案或目錄�）"
+
+#: builtin/config.c:160
+msgid "value is an expiry date"
+msgstr "值是一個到期日期"
+
+#: builtin/config.c:161
+msgid "Other"
+msgstr "其它"
+
+#: builtin/config.c:162
+msgid "terminate values with NUL byte"
+msgstr "終止值是 NUL �元組"
+
+#: builtin/config.c:163
+msgid "show variable names only"
+msgstr "�顯示變數�"
+
+#: builtin/config.c:164
+msgid "respect include directives on lookup"
+msgstr "查詢時�照 include 指令�迴尋找"
+
+#: builtin/config.c:165
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr "顯示設定的來�（檔案�標準輸入�資料物件，或指令列）"
+
+#: builtin/config.c:166
+msgid "show scope of config (worktree, local, global, system, command)"
+msgstr ""
+"顯示設定檔的作用域 (工作� worktree�本機 local�全域 global�系統 system�指"
+"令 command)"
+
+#: builtin/config.c:167 builtin/env--helper.c:45
+msgid "value"
+msgstr "�值"
+
+#: builtin/config.c:167
+msgid "with --get, use default value when missing entry"
+msgstr "使用 --get 但未指定�數時所使用的�設值"
+
+#: builtin/config.c:181
+#, c-format
+msgid "wrong number of arguments, should be %d"
+msgstr "錯誤的�數個數，應該為 %d 個"
+
+#: builtin/config.c:183
+#, c-format
+msgid "wrong number of arguments, should be from %d to %d"
+msgstr "錯誤的�數個數，應該為從 %d 個到 %d 個"
+
+#: builtin/config.c:339
+#, c-format
+msgid "invalid key pattern: %s"
+msgstr "無效��模�：%s"
+
+#: builtin/config.c:377
+#, c-format
+msgid "failed to format default config value: %s"
+msgstr "格�化�設設定值失敗：%s"
+
+#: builtin/config.c:441
+#, c-format
+msgid "cannot parse color '%s'"
+msgstr "無法解��色 '%s'"
+
+#: builtin/config.c:483
+msgid "unable to parse default color value"
+msgstr "無法解��設�色值"
+
+#: builtin/config.c:536 builtin/config.c:833
+msgid "not in a git directory"
+msgstr "�在 git 版本庫中"
+
+#: builtin/config.c:539
+msgid "writing to stdin is not supported"
+msgstr "�支�寫到標準輸入"
+
+#: builtin/config.c:542
+msgid "writing config blobs is not supported"
+msgstr "�支�寫到設定資料物件"
+
+#: builtin/config.c:627
+#, c-format
+msgid ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+msgstr ""
+"# This is Git's per-user configuration file.\n"
+"[user]\n"
+"# Please adapt and uncomment the following lines:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:652
+msgid "only one config file at a time"
+msgstr "一次�能有一個設定檔案"
+
+#: builtin/config.c:658
+msgid "--local can only be used inside a git repository"
+msgstr "--local �能在一個版本庫內使用"
+
+#: builtin/config.c:660
+msgid "--blob can only be used inside a git repository"
+msgstr "--blob �能在一個版本庫內使用"
+
+#: builtin/config.c:662
+msgid "--worktree can only be used inside a git repository"
+msgstr "--worktree �能在 git 版本庫中使用"
+
+#: builtin/config.c:684
+msgid "$HOME not set"
+msgstr "$HOME 未設定"
+
+#: builtin/config.c:708
+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，除�啟用 worktreeConfig 設定擴展。\n"
+"詳情請閱讀「git help worktree�的「CONFIGURATION FILE��節"
+
+#: builtin/config.c:743
+msgid "--get-color and variable type are incoherent"
+msgstr "--get-color 和變數類型�相容"
+
+#: builtin/config.c:748
+msgid "only one action at a time"
+msgstr "一次�能有一個動作"
+
+#: builtin/config.c:761
+msgid "--name-only is only applicable to --list or --get-regexp"
+msgstr "--name-only 僅�用於 --list 或 --get-regexp"
+
+#: builtin/config.c:767
+msgid ""
+"--show-origin is only applicable to --get, --get-all, --get-regexp, and --"
+"list"
+msgstr "--show-origin 僅�用於 --get�--get-all�--get-regexp 和 --list"
+
+#: builtin/config.c:773
+msgid "--default is only applicable to --get"
+msgstr "--default 僅�用於 --get"
+
+#: builtin/config.c:806
+msgid "--fixed-value only applies with 'value-pattern'"
+msgstr "--fixed-value 僅套用至 'value-pattern'"
+
+#: builtin/config.c:822
+#, c-format
+msgid "unable to read config file '%s'"
+msgstr "無法讀�設定檔案 '%s'"
+
+#: builtin/config.c:825
+msgid "error processing config file(s)"
+msgstr "處�設定檔案發生錯誤"
+
+#: builtin/config.c:835
+msgid "editing stdin is not supported"
+msgstr "�支�編輯標準輸入"
+
+#: builtin/config.c:837
+msgid "editing blobs is not supported"
+msgstr "�支�編輯資料物件"
+
+#: builtin/config.c:851
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "�能建立設定檔案 %s"
+
+#: builtin/config.c:864
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+"       Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"無法用一個值覆蓋多個值\n"
+"       使用一個正�表示��--add 或 --replace-all 來修改 %s。"
+
+#: builtin/config.c:943 builtin/config.c:954
+#, c-format
+msgid "no such section: %s"
+msgstr "無此�節：%s"
+
+#: builtin/count-objects.c:90
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:100
+msgid "print sizes in human readable format"
+msgstr "以使用者�讀的格�顯示大�"
+
+#: builtin/credential-cache--daemon.c:227
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"您的 socket 目錄權��於寬鬆，其他使用者�能會讀�您快�的�證訊�。考慮執"
+"行：\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: builtin/credential-cache--daemon.c:276
+msgid "print debugging messages to stderr"
+msgstr "除錯訊�輸出到標準錯誤"
+
+#: builtin/credential-cache--daemon.c:316
+msgid "credential-cache--daemon unavailable; no unix socket support"
+msgstr "credential-cache--daemon 無法使用；缺少 unix socket 支�"
+
+#: builtin/credential-cache.c:154
+msgid "credential-cache unavailable; no unix socket support"
+msgstr "credential-cache 無法使用；缺少 unix socket 支�"
+
+#: builtin/credential-store.c:66
+#, c-format
+msgid "unable to get credential storage lock in %d ms"
+msgstr "無法在 %d 毫秒內�得憑證儲存空間的鎖"
+
+#: builtin/describe.c:26
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<�項>] [<�交號>...]"
+
+#: builtin/describe.c:27
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<�項>] --dirty"
+
+#: builtin/describe.c:63
+msgid "head"
+msgstr "HEAD"
+
+#: builtin/describe.c:63
+msgid "lightweight"
+msgstr "輕�級的"
+
+#: builtin/describe.c:63
+msgid "annotated"
+msgstr "附註的"
+
+#: builtin/describe.c:277
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "附註標籤 %s 無效"
+
+#: builtin/describe.c:281
+#, c-format
+msgid "tag '%s' is externally known as '%s'"
+msgstr "「%s�標籤在外部被�為是「%s�"
+
+#: builtin/describe.c:328
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "沒有標籤準確符� '%s'"
+
+#: builtin/describe.c:330
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "沒有精確符�到引用或標籤，繼續�尋進行�述\n"
+
+#: builtin/describe.c:397
+#, c-format
+msgid "finished search at %s\n"
+msgstr "完��尋 %s\n"
+
+#: builtin/describe.c:424
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"However, there were unannotated tags: try --tags."
+msgstr ""
+"沒有附註標籤能�述 '%s'。\n"
+"然而，存在未附註標籤：嘗試 --tags。"
+
+#: builtin/describe.c:428
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"沒有標籤能�述 '%s'。\n"
+"嘗試 --always，或者建立一些標籤。"
+
+#: builtin/describe.c:458
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "已�歷 %lu 個�交\n"
+
+#: builtin/describe.c:461
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+"發�多於 %i 個標籤，列出最近的 %i 個\n"
+"在 %s 放棄�尋\n"
+
+#: builtin/describe.c:529
+#, c-format
+msgid "describe %s\n"
+msgstr "�述 %s\n"
+
+#: builtin/describe.c:532
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "�是一個有效的物件� %s"
+
+#: builtin/describe.c:540
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s 既�是�交也�是資料物件"
+
+#: builtin/describe.c:554
+msgid "find the tag that comes after the commit"
+msgstr "尋找該�交之後的標籤"
+
+#: builtin/describe.c:555
+msgid "debug search strategy on stderr"
+msgstr "在標準錯誤上除錯�尋策略"
+
+#: builtin/describe.c:556
+msgid "use any ref"
+msgstr "使用任�引用"
+
+#: builtin/describe.c:557
+msgid "use any tag, even unannotated"
+msgstr "使用任�標籤，�使未附帶備註"
+
+#: builtin/describe.c:558
+msgid "always use long format"
+msgstr "始終使用長�交號格�"
+
+#: builtin/describe.c:559
+msgid "only follow first parent"
+msgstr "�跟隨第一個父�交"
+
+#: builtin/describe.c:562
+msgid "only output exact matches"
+msgstr "�輸出精確符�"
+
+#: builtin/describe.c:564
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "考慮最近 <n> 個標籤（�設值：10）"
+
+#: builtin/describe.c:566
+msgid "only consider tags matching <pattern>"
+msgstr "�考慮符� <模�> 的標籤"
+
+#: builtin/describe.c:568
+msgid "do not consider tags matching <pattern>"
+msgstr "�考慮符� <模�> 的標籤"
+
+#: builtin/describe.c:570 builtin/name-rev.c:535
+msgid "show abbreviated commit object as fallback"
+msgstr "顯示簡寫的�交號作為後備"
+
+#: builtin/describe.c:571 builtin/describe.c:574
+msgid "mark"
+msgstr "標記"
+
+#: builtin/describe.c:572
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "�於髒工作�，追加 <標記>（�設值：�-dirty\"）"
+
+#: builtin/describe.c:575
+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/diff-tree.c:157
+msgid "--merge-base only works with two commits"
+msgstr "--merge-base �� 2 個以上的�交有用"
+
+#: builtin/diff.c:92
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s'：�是一個正�檔案或符號連�"
+
+#: builtin/diff.c:259
+#, c-format
+msgid "invalid option: %s"
+msgstr "無效�項：%s"
+
+#: builtin/diff.c:376
+#, c-format
+msgid "%s...%s: no merge base"
+msgstr "%s...%s: 無�併基底"
+
+#: builtin/diff.c:486
+msgid "Not a git repository"
+msgstr "�是一個 git 版本庫"
+
+#: builtin/diff.c:532 builtin/grep.c:684
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "�供了無效物件 '%s'。"
+
+#: builtin/diff.c:543
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "�供了超�兩個資料物件：'%s'"
+
+#: builtin/diff.c:548
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "無法處�的物件 '%s'。"
+
+#: builtin/diff.c:582
+#, c-format
+msgid "%s...%s: multiple merge bases, using %s"
+msgstr "%s...%s：多個�併基底，使用 %s"
+
+#: builtin/difftool.c:31
+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
+#, c-format
+msgid "could not read symlink %s"
+msgstr "無法讀�符號連� %s"
+
+#: builtin/difftool.c:305
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "無法讀�符號連�檔案 %s"
+
+#: builtin/difftool.c:313
+#, c-format
+msgid "could not read object %s for symlink %s"
+msgstr "無法讀�符號連� %2$s 指�的物件 %1$s"
+
+#: builtin/difftool.c:413
+msgid ""
+"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
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "兩個檔案都被修改：'%s' 和 '%s'。"
+
+#: builtin/difftool.c:639
+msgid "working tree file has been left."
+msgstr "工作�檔案被留了下來。"
+
+#: builtin/difftool.c:650
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "暫存檔存在於 '%s'。"
+
+#: builtin/difftool.c:651
+msgid "you may want to cleanup or recover these."
+msgstr "您�能想�清�或者復原它們。"
+
+#: builtin/difftool.c:699
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "使用 `diff.guitool` 代替 `diff.tool`"
+
+#: builtin/difftool.c:701
+msgid "perform a full-directory diff"
+msgstr "執行一個全目錄差異比較"
+
+#: builtin/difftool.c:703
+msgid "do not prompt before launching a diff tool"
+msgstr "啟動差異比較工具之���示"
+
+#: builtin/difftool.c:708
+msgid "use symlinks in dir-diff mode"
+msgstr "在 dir-diff 模�中使用符號連�"
+
+#: builtin/difftool.c:709
+msgid "tool"
+msgstr "工具"
+
+#: builtin/difftool.c:710
+msgid "use the specified diff tool"
+msgstr "使用指定的差異比較工具"
+
+#: builtin/difftool.c:712
+msgid "print a list of diff tools that may be used with `--tool`"
+msgstr "顯示�以用在 `--tool` �數後的差異工具列表"
+
+#: builtin/difftool.c:715
+msgid ""
+"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
+"code"
+msgstr "當執行 diff 工具返回�零離開碼時，使 'git-difftool' 離開"
+
+#: builtin/difftool.c:718
+msgid "specify a custom command for viewing diffs"
+msgstr "指定一個用於檢視差異的自訂指令"
+
+#: builtin/difftool.c:719
+msgid "passed to `diff`"
+msgstr "傳�給 `diff`"
+
+#: builtin/difftool.c:734
+msgid "difftool requires worktree or --no-index"
+msgstr "difftool �求工作�或者 --no-index"
+
+#: builtin/difftool.c:741
+msgid "--dir-diff is incompatible with --no-index"
+msgstr "--dir-diff 和 --no-index �相容"
+
+#: builtin/difftool.c:744
+msgid "--gui, --tool and --extcmd are mutually exclusive"
+msgstr "--gui�--tool 和 --extcmd 互斥"
+
+#: builtin/difftool.c:752
+msgid "no <tool> given for --tool=<tool>"
+msgstr "沒有為 --tool=<工具> �數�供 <工具>"
+
+#: builtin/difftool.c:759
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "沒有為 --extcmd=<命令> �數�供 <命令>"
+
+#: builtin/env--helper.c:6
+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
+msgid "type"
+msgstr "é¡žåž‹"
+
+#: builtin/env--helper.c:46
+msgid "default for git_env_*(...) to fall back on"
+msgstr "git_env_*(...) 的�設值"
+
+#: builtin/env--helper.c:48
+msgid "be quiet only use git_env_*() value as exit code"
+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�"
+
+#: builtin/env--helper.c:82
+#, c-format
+msgid ""
+"option `--default' expects an unsigned long value with `--type=ulong`, not `"
+"%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
+msgid "Error: Cannot export nested tags unless --mark-tags is specified."
+msgstr "錯誤：除�指定 --mark-tags，�則無法匯出嵌套標籤。"
+
+#: builtin/fast-export.c:1177
+msgid "--anonymize-map token cannot be empty"
+msgstr "--anonymize-map 的��能空白"
+
+#: builtin/fast-export.c:1197
+msgid "show progress after <n> objects"
+msgstr "在 <n> 個物件之後顯示進度"
+
+#: builtin/fast-export.c:1199
+msgid "select handling of signed tags"
+msgstr "�擇如何處�簽�標籤"
+
+#: builtin/fast-export.c:1202
+msgid "select handling of tags that tag filtered objects"
+msgstr "�擇當標籤指�被�濾物件時該標籤的處�方�"
+
+#: builtin/fast-export.c:1205
+msgid "select handling of commit messages in an alternate encoding"
+msgstr "�擇使用備用編碼處��交說明"
+
+#: builtin/fast-export.c:1208
+msgid "dump marks to this file"
+msgstr "把標記傾�到這個檔案"
+
+#: builtin/fast-export.c:1210
+msgid "import marks from this file"
+msgstr "從這個檔案匯入標記"
+
+#: builtin/fast-export.c:1214
+msgid "import marks from this file if it exists"
+msgstr "如果這個檔案存在，則從檔案匯入標記"
+
+#: builtin/fast-export.c:1216
+msgid "fake a tagger when tags lack one"
+msgstr "當標籤缺少標記者欄�時��有一個"
+
+#: builtin/fast-export.c:1218
+msgid "output full tree for each commit"
+msgstr "�次�交都輸出整棵樹"
+
+#: builtin/fast-export.c:1220
+msgid "use the done feature to terminate the stream"
+msgstr "使用 done 功能終止串�"
+
+#: builtin/fast-export.c:1221
+msgid "skip output of blob data"
+msgstr "略�資料物件資料的輸出"
+
+#: builtin/fast-export.c:1222 builtin/log.c:1826
+msgid "refspec"
+msgstr "�照�格"
+
+#: builtin/fast-export.c:1223
+msgid "apply refspec to exported refs"
+msgstr "�匯出的引用套用引用�格"
+
+#: builtin/fast-export.c:1224
+msgid "anonymize output"
+msgstr "匿�輸出"
+
+#: builtin/fast-export.c:1225
+msgid "from:to"
+msgstr "from:to"
+
+#: builtin/fast-export.c:1226
+msgid "convert <from> to <to> in anonymized output"
+msgstr "在匿�輸出中將 <from> 轉�為 <to>"
+
+#: builtin/fast-export.c:1229
+msgid "reference parents which are not in fast-export stream by object id"
+msgstr "�物件 ID �考�在 fast-export 串�中的引用父物件"
+
+#: builtin/fast-export.c:1231
+msgid "show original object ids of blobs/commits"
+msgstr "顯示資料物件��交的原始物件 ID"
+
+#: builtin/fast-export.c:1233
+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
+#, c-format
+msgid "Missing from marks for submodule '%s'"
+msgstr "「%s��模組缺少 from 標記"
+
+#: builtin/fast-import.c:3090
+#, c-format
+msgid "Missing to marks for submodule '%s'"
+msgstr "「%s��模組缺少 to 標記"
+
+#: builtin/fast-import.c:3225
+#, c-format
+msgid "Expected 'mark' command, got %s"
+msgstr "�期 'mark' 指令，得到 %s"
+
+#: builtin/fast-import.c:3230
+#, c-format
+msgid "Expected 'to' command, got %s"
+msgstr "�期 'to' 指令，得到 %s"
+
+#: builtin/fast-import.c:3322
+msgid "Expected format name:filename for submodule rewrite option"
+msgstr "期望�模組 rewrite �項的格�是 name:filename"
+
+#: builtin/fast-import.c:3377
+#, c-format
+msgid "feature '%s' forbidden in input without --allow-unsafe-features"
+msgstr "沒有 --allow-unsafe-features 時，�止在輸入中使用 '%s' 功能"
+
+#: builtin/fetch-pack.c:242
+#, c-format
+msgid "Lockfile created but not reported: %s"
+msgstr "已建立鎖定檔案，但尚未回報：%s"
+
+#: builtin/fetch.c:35
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<�項>] [<版本庫> [<引用�格>...]]"
+
+#: builtin/fetch.c:36
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<�項>] <組>"
+
+#: builtin/fetch.c:37
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<�項>] [(<版本庫> | <組>)...]"
+
+#: builtin/fetch.c:38
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<�項>]"
+
+#: builtin/fetch.c:122
+msgid "fetch.parallel cannot be negative"
+msgstr "fetch.parallel �能為負數"
+
+#: builtin/fetch.c:145 builtin/pull.c:185
+msgid "fetch from all remotes"
+msgstr "從所有的�端抓�"
+
+#: builtin/fetch.c:147 builtin/pull.c:245
+msgid "set upstream for git pull/fetch"
+msgstr "為 git pull/fetch 設定上游"
+
+#: builtin/fetch.c:149 builtin/pull.c:188
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "追加到 .git/FETCH_HEAD 而�是覆蓋它"
+
+#: builtin/fetch.c:151
+msgid "use atomic transaction to update references"
+msgstr "使用原�事務更新�考"
+
+#: builtin/fetch.c:153 builtin/pull.c:191
+msgid "path to upload pack on remote end"
+msgstr "上傳包到�端的路徑"
+
+#: builtin/fetch.c:154
+msgid "force overwrite of local reference"
+msgstr "強制覆蓋本機引用"
+
+#: builtin/fetch.c:156
+msgid "fetch from multiple remotes"
+msgstr "從多個�端抓�"
+
+#: builtin/fetch.c:158 builtin/pull.c:195
+msgid "fetch all tags and associated objects"
+msgstr "抓�所有的標籤和關�物件"
+
+#: builtin/fetch.c:160
+msgid "do not fetch all tags (--no-tags)"
+msgstr "�抓�任何標籤(--no-tags)"
+
+#: builtin/fetch.c:162
+msgid "number of submodules fetched in parallel"
+msgstr "並行�得的�模組數�"
+
+#: builtin/fetch.c:164
+msgid "modify the refspec to place all refs within refs/prefetch/"
+msgstr "修改�考�格 (refspec) 以便將所有�考 (refs) 放置在 refs/prefetch/ 中"
+
+#: builtin/fetch.c:166 builtin/pull.c:198
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "清除�端已經�存在的分支的追蹤分支"
+
+#: builtin/fetch.c:168
+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
+msgid "on-demand"
+msgstr "on-demand"
+
+#: builtin/fetch.c:170
+msgid "control recursive fetching of submodules"
+msgstr "控制�模組的�迴抓�"
+
+#: builtin/fetch.c:175
+msgid "write fetched references to the FETCH_HEAD file"
+msgstr "將�得的�考寫入 FETCH_HEAD 檔案"
+
+#: builtin/fetch.c:176 builtin/pull.c:206
+msgid "keep downloaded pack"
+msgstr "��下載包"
+
+#: builtin/fetch.c:178
+msgid "allow updating of HEAD ref"
+msgstr "�許更新 HEAD 引用"
+
+#: builtin/fetch.c:181 builtin/fetch.c:187 builtin/pull.c:209
+#: builtin/pull.c:218
+msgid "deepen history of shallow clone"
+msgstr "�得淺複製的更多�去歷�記錄"
+
+#: builtin/fetch.c:183 builtin/pull.c:212
+msgid "deepen history of shallow repository based on time"
+msgstr "基於時間來深化淺複製的歷�"
+
+#: builtin/fetch.c:189 builtin/pull.c:221
+msgid "convert to a complete repository"
+msgstr "轉�為一個完整的版本庫"
+
+#: builtin/fetch.c:192
+msgid "prepend this to submodule path output"
+msgstr "在�模組路徑輸出的��加上此目錄"
+
+#: builtin/fetch.c:195
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr "�迴�得�模組的�設值（比設定檔案優先度低）"
+
+#: builtin/fetch.c:199 builtin/pull.c:224
+msgid "accept refs that update .git/shallow"
+msgstr "接�更新 .git/shallow 的引用"
+
+#: builtin/fetch.c:200 builtin/pull.c:226
+msgid "refmap"
+msgstr "引用映射"
+
+#: builtin/fetch.c:201 builtin/pull.c:227
+msgid "specify fetch refmap"
+msgstr "指定�得動作的引用映射"
+
+#: builtin/fetch.c:208 builtin/pull.c:240
+msgid "report that we have only objects reachable from this object"
+msgstr "報告我們��有從該物件開始�以�得的物件"
+
+#: 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 "�得 (fetch) 後執行 'maintenance --auto'"
+
+#: builtin/fetch.c:217 builtin/pull.c:243
+msgid "check for forced-updates on all updated branches"
+msgstr "在所有更新分支上檢查強制更新"
+
+#: builtin/fetch.c:219
+msgid "write the commit-graph after fetching"
+msgstr "抓�後寫入分支圖"
+
+#: builtin/fetch.c:221
+msgid "accept refspecs from stdin"
+msgstr "從標準輸入中接�引用表��"
+
+#: builtin/fetch.c:586
+msgid "Couldn't find remote ref HEAD"
+msgstr "無法發��端 HEAD 引用"
+
+#: builtin/fetch.c:757
+#, c-format
+msgid "configuration fetch.output contains invalid value %s"
+msgstr "設定變數 fetch.output 包�無效值 %s"
+
+#: builtin/fetch.c:856
+#, c-format
+msgid "object %s not found"
+msgstr "物件 %s 未發�"
+
+#: builtin/fetch.c:860
+msgid "[up to date]"
+msgstr "[最新]"
+
+#: builtin/fetch.c:873 builtin/fetch.c:889 builtin/fetch.c:961
+msgid "[rejected]"
+msgstr "[已拒絕]"
+
+#: builtin/fetch.c:874
+msgid "can't fetch in current branch"
+msgstr "目�分支下�能執行�得動作"
+
+#: builtin/fetch.c:884
+msgid "[tag update]"
+msgstr "[標籤更新]"
+
+#: builtin/fetch.c:885 builtin/fetch.c:922 builtin/fetch.c:944
+#: builtin/fetch.c:956
+msgid "unable to update local ref"
+msgstr "�能更新本機引用"
+
+#: builtin/fetch.c:889
+msgid "would clobber existing tag"
+msgstr "會破壞�有的標籤"
+
+#: builtin/fetch.c:911
+msgid "[new tag]"
+msgstr "[新標籤]"
+
+#: builtin/fetch.c:914
+msgid "[new branch]"
+msgstr "[新分支]"
+
+#: builtin/fetch.c:917
+msgid "[new ref]"
+msgstr "[新引用]"
+
+#: builtin/fetch.c:956
+msgid "forced update"
+msgstr "強制更新"
+
+#: builtin/fetch.c:961
+msgid "non-fast-forward"
+msgstr "�快轉"
+
+#: 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 ""
+"�得動作通常顯示哪些分支發生了強制更新，但該檢查已被�用。\n"
+"��新啟用，請使用 '--show-forced-updates' �項或執行\n"
+"'git config fetch.showForcedUpdates true'。"
+
+#: builtin/fetch.c:1069
+#, 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"
+msgstr ""
+"花了 %.2f 秒來檢查強制更新。您�以使用 '--no-show-forced-updates'\n"
+"或執行 'git config fetch.showForcedUpdates false' 以��此項檢查。\n"
+
+#: builtin/fetch.c:1101
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s 未傳�所有必需的物件\n"
+
+#: builtin/fetch.c:1129
+#, c-format
+msgid "rejected %s because shallow roots are not allowed to be updated"
+msgstr "已拒絕 %s，��許更新淺複製"
+
+#: builtin/fetch.c:1206 builtin/fetch.c:1357
+#, c-format
+msgid "From %.*s\n"
+msgstr "來自 %.*s\n"
+
+#: 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 ""
+"一些本機引用�能被更新；嘗試執行\n"
+" 'git remote prune %s' 來刪除舊的�有��的分支"
+
+#  譯者：請維��導空格
+#: builtin/fetch.c:1327
+#, c-format
+msgid "   (%s will become dangling)"
+msgstr "   （%s 將�為懸空狀態）"
+
+#  譯者：請維��導空格
+#: builtin/fetch.c:1328
+#, c-format
+msgid "   (%s has become dangling)"
+msgstr "   （%s 已�為懸空狀態）"
+
+#: builtin/fetch.c:1360
+msgid "[deleted]"
+msgstr "[已刪除]"
+
+#: builtin/fetch.c:1361 builtin/remote.c:1118
+msgid "(none)"
+msgstr "（無）"
+
+#: builtin/fetch.c:1384
+#, c-format
+msgid "Refusing to fetch into current branch %s of non-bare repository"
+msgstr "拒絕�得到�純版本庫的目�分支 %s"
+
+#: builtin/fetch.c:1403
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "�項 \"%s\" 的值 \"%s\" �於 %s 是無效的"
+
+#: builtin/fetch.c:1406
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "�項 \"%s\" 為 %s 所忽略\n"
+
+#: builtin/fetch.c:1618
+msgid "multiple branches detected, incompatible with --set-upstream"
+msgstr "檢測到多分支，和 --set-upstream �相容"
+
+#: builtin/fetch.c:1633
+msgid "not setting upstream for a remote remote-tracking branch"
+msgstr "沒有為一個�端追蹤分支設定上游"
+
+#: builtin/fetch.c:1635
+msgid "not setting upstream for a remote tag"
+msgstr "沒有為一個�端標籤設定上游"
+
+#: builtin/fetch.c:1637
+msgid "unknown branch type"
+msgstr "未知的分支類型"
+
+#: builtin/fetch.c:1639
+msgid ""
+"no source branch found.\n"
+"you need to specify exactly one branch with the --set-upstream option."
+msgstr ""
+"未發��分支。\n"
+"您需�使用 --set-upstream �項指定一個分支。"
+
+#: builtin/fetch.c:1768 builtin/fetch.c:1831
+#, c-format
+msgid "Fetching %s\n"
+msgstr "正在�得 %s\n"
+
+#: builtin/fetch.c:1778 builtin/fetch.c:1833 builtin/remote.c:101
+#, c-format
+msgid "Could not fetch %s"
+msgstr "�能�得 %s"
+
+#: builtin/fetch.c:1790
+#, 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 "您需�指定一個標籤�稱。"
+
+#: builtin/fetch.c:1994
+msgid "--negotiate-only needs one or more --negotiate-tip=*"
+msgstr "--negotiate-only 需�一或多個 --negotiate-tip=*"
+
+#: builtin/fetch.c:1998
+msgid "Negative depth in --deepen is not supported"
+msgstr "--deepen �支�負數深度"
+
+#: builtin/fetch.c:2000
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--deepen 和 --depth 是互斥的"
+
+#: builtin/fetch.c:2005
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth 和 --unshallow �能�時使用"
+
+#: builtin/fetch.c:2007
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "�於一個完整的版本庫，�數 --unshallow 沒有�義"
+
+#: builtin/fetch.c:2024
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all �能帶一個版本庫�數"
+
+#: builtin/fetch.c:2026
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all 帶引用�格沒有任何�義"
+
+#: builtin/fetch.c:2035
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "沒有這樣的�端或�端組：%s"
+
+#: builtin/fetch.c:2042
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "�得組並指定引用�格沒有�義"
+
+#: builtin/fetch.c:2058
+msgid "must supply remote when using --negotiate-only"
+msgstr "使用 --negotiate-only 時必須�供�端"
+
+#: builtin/fetch.c:2063
+msgid "Protocol does not support --negotiate-only, exiting."
+msgstr "�定�支� --negotiate-only，��。"
+
+#: builtin/fetch.c:2082
+msgid ""
+"--filter can only be used with the remote configured in extensions."
+"partialclone"
+msgstr "��以將 --filter 用於在 extensions.partialclone 中設定的�端版本庫"
+
+#: builtin/fetch.c:2086
+msgid "--atomic can only be used when fetching from one remote"
+msgstr "--atomic �能在擷� (fetch) 一個�端時使用"
+
+#: builtin/fetch.c:2090
+msgid "--stdin can only be used when fetching from one remote"
+msgstr "--stdin �能在�得一個�端時使用"
+
+#: 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 <說明>] [--log[=<n>] | --no-log] [--file <檔案>]"
+
+#: builtin/fmt-merge-msg.c:18
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "��交說明中最多複製指定�目（�併而來的�交）的簡短說明"
+
+#: builtin/fmt-merge-msg.c:21
+msgid "alias for --log (deprecated)"
+msgstr "�數 --log 的別�（已棄用）"
+
+#: builtin/fmt-merge-msg.c:24
+msgid "text"
+msgstr "文字"
+
+#: builtin/fmt-merge-msg.c:25
+msgid "use <text> as start of message"
+msgstr "使用 <文字> 作為�交說明的開始"
+
+#: builtin/fmt-merge-msg.c:26
+msgid "file to read from"
+msgstr "從檔案中讀�"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<�項>] [<模�>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <物件>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [--merged [<commit>]] [--no-merged [<commit>]]"
+msgstr "git for-each-ref [--merged [<�交>]] [--no-merged [<�交>]]"
+
+#: builtin/for-each-ref.c:13
+msgid "git for-each-ref [--contains [<commit>]] [--no-contains [<commit>]]"
+msgstr "git for-each-ref [--contains [<�交>]] [--no-contains [<�交>]]"
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for shells"
+msgstr "引用��符�用於 shells"
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for perl"
+msgstr "引用��符�用於 perl"
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for python"
+msgstr "引用��符�用於 python"
+
+#: builtin/for-each-ref.c:36
+msgid "quote placeholders suitably for Tcl"
+msgstr "引用��符�用於 Tcl"
+
+#: builtin/for-each-ref.c:39
+msgid "show only <n> matched refs"
+msgstr "�顯示 <n> 個符�的引用"
+
+#: builtin/for-each-ref.c:41 builtin/tag.c:483
+msgid "respect format colors"
+msgstr "�照格�中的�色輸出"
+
+#: builtin/for-each-ref.c:44
+msgid "print only refs which points at the given object"
+msgstr "�列�指��供物件的引用"
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are merged"
+msgstr "�列�已經�併的引用"
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs that are not merged"
+msgstr "�列�沒有�併的引用"
+
+#: builtin/for-each-ref.c:48
+msgid "print only refs which contain the commit"
+msgstr "�列�包�該�交的引用"
+
+#: builtin/for-each-ref.c:49
+msgid "print only refs which don't contain the commit"
+msgstr "�列��包�該�交的引用"
+
+#: builtin/for-each-repo.c:9
+msgid "git for-each-repo --config=<config> <command-args>"
+msgstr "git for-each-repo --config=<設定> <命令引數>"
+
+#: builtin/for-each-repo.c:34
+msgid "config"
+msgstr "config"
+
+#: builtin/for-each-repo.c:35
+msgid "config key storing a list of repository paths"
+msgstr "儲存版本庫路徑清單的設定�"
+
+#: builtin/for-each-repo.c:43
+msgid "missing --config=<config>"
+msgstr "缺少 --config=<設定>"
+
+#: builtin/fsck.c:69 builtin/fsck.c:128 builtin/fsck.c:129
+msgid "unknown"
+msgstr "未知"
+
+#. 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 "%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 "%s %s 警告：%s"
+
+#: builtin/fsck.c:124 builtin/fsck.c:127
+#, c-format
+msgid "broken link from %7s %s"
+msgstr "來自 %7s %s 的�壞的連�"
+
+#: builtin/fsck.c:136
+msgid "wrong object type in link"
+msgstr "連�中錯誤的物件類型"
+
+#: builtin/fsck.c:152
+#, c-format
+msgid ""
+"broken link from %7s %s\n"
+"              to %7s %s"
+msgstr ""
+"�壞的連�來自於 %7s %s\n"
+"              到 %7s %s"
+
+#: builtin/fsck.c:264
+#, c-format
+msgid "missing %s %s"
+msgstr "缺少 %s %s"
+
+#: builtin/fsck.c:291
+#, c-format
+msgid "unreachable %s %s"
+msgstr "無法�得 %s %s"
+
+#: builtin/fsck.c:311
+#, c-format
+msgid "dangling %s %s"
+msgstr "懸空 %s %s"
+
+#: builtin/fsck.c:321
+msgid "could not create lost-found"
+msgstr "�能建立 lost-found"
+
+#: builtin/fsck.c:332
+#, c-format
+msgid "could not finish '%s'"
+msgstr "�能完� '%s'"
+
+#: builtin/fsck.c:349
+#, c-format
+msgid "Checking %s"
+msgstr "正在檢查 %s"
+
+#: builtin/fsck.c:387
+#, c-format
+msgid "Checking connectivity (%d objects)"
+msgstr "正在檢查連通性（%d 個物件）"
+
+#: builtin/fsck.c:406
+#, c-format
+msgid "Checking %s %s"
+msgstr "正在檢查 %s %s"
+
+#: builtin/fsck.c:411
+msgid "broken links"
+msgstr "�壞的連�"
+
+#: builtin/fsck.c:420
+#, c-format
+msgid "root %s"
+msgstr "æ ¹ %s"
+
+#: builtin/fsck.c:428
+#, c-format
+msgid "tagged %s %s (%s) in %s"
+msgstr "已標記 %s %s (%s) 於 %s"
+
+#: builtin/fsck.c:457
+#, c-format
+msgid "%s: object corrupt or missing"
+msgstr "%s：物件�壞或�失"
+
+#: builtin/fsck.c:482
+#, c-format
+msgid "%s: invalid reflog entry %s"
+msgstr "%s：無效的引用日誌�目 %s"
+
+#: builtin/fsck.c:496
+#, c-format
+msgid "Checking reflog %s->%s"
+msgstr "正在檢查引用日誌 %s->%s"
+
+#: builtin/fsck.c:530
+#, c-format
+msgid "%s: invalid sha1 pointer %s"
+msgstr "%s：無效的 sha1 指標 %s"
+
+#: builtin/fsck.c:537
+#, c-format
+msgid "%s: not a commit"
+msgstr "%s：�是一個�交"
+
+#: builtin/fsck.c:591
+msgid "notice: No default references"
+msgstr "注�：無�設引用"
+
+#: builtin/fsck.c:606
+#, c-format
+msgid "%s: object corrupt or missing: %s"
+msgstr "%s：物件�壞或�失：%s"
+
+#: builtin/fsck.c:619
+#, c-format
+msgid "%s: object could not be parsed: %s"
+msgstr "%s：�能解�物件：%s"
+
+#: builtin/fsck.c:639
+#, c-format
+msgid "bad sha1 file: %s"
+msgstr "壞的 sha1 檔案：%s"
+
+#: builtin/fsck.c:654
+msgid "Checking object directory"
+msgstr "正在檢查物件目錄"
+
+#: builtin/fsck.c:657
+msgid "Checking object directories"
+msgstr "正在檢查物件目錄"
+
+#: builtin/fsck.c:672
+#, c-format
+msgid "Checking %s link"
+msgstr "正在檢查 %s 連�"
+
+#: builtin/fsck.c:677 builtin/index-pack.c:864
+#, c-format
+msgid "invalid %s"
+msgstr "無效的 %s"
+
+#: builtin/fsck.c:684
+#, c-format
+msgid "%s points to something strange (%s)"
+msgstr "%s 指�奇怪的�西（%s）"
+
+#: builtin/fsck.c:690
+#, c-format
+msgid "%s: detached HEAD points at nothing"
+msgstr "%s：分離開頭指標的指��存在"
+
+#: builtin/fsck.c:694
+#, c-format
+msgid "notice: %s points to an unborn branch (%s)"
+msgstr "注�：%s 指�一個尚未誕生的分支（%s）"
+
+#: builtin/fsck.c:706
+msgid "Checking cache tree"
+msgstr "正在檢查快�樹"
+
+#: builtin/fsck.c:711
+#, c-format
+msgid "%s: invalid sha1 pointer in cache-tree"
+msgstr "%s：cache-tree 中無效的 sha1 指標"
+
+#: builtin/fsck.c:720
+msgid "non-tree in cache-tree"
+msgstr "cache-tree 中�樹狀物件"
+
+#: builtin/fsck.c:751
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<�項>] [<物件>...]"
+
+#: builtin/fsck.c:757
+msgid "show unreachable objects"
+msgstr "顯示無法�得的物件"
+
+#: builtin/fsck.c:758
+msgid "show dangling objects"
+msgstr "顯示懸空的物件"
+
+#: builtin/fsck.c:759
+msgid "report tags"
+msgstr "報告標籤"
+
+#: builtin/fsck.c:760
+msgid "report root nodes"
+msgstr "報告根節點"
+
+#: builtin/fsck.c:761
+msgid "make index objects head nodes"
+msgstr "將索引亦作為檢查的頭節點"
+
+#: builtin/fsck.c:762
+msgid "make reflogs head nodes (default)"
+msgstr "將引用日誌作為檢查的頭節點（�設）"
+
+#: builtin/fsck.c:763
+msgid "also consider packs and alternate objects"
+msgstr "也考慮包和備用物件"
+
+#: builtin/fsck.c:764
+msgid "check only connectivity"
+msgstr "僅檢查連通性"
+
+#: builtin/fsck.c:765 builtin/mktag.c:75
+msgid "enable more strict checking"
+msgstr "啟用更嚴格的檢查"
+
+#: builtin/fsck.c:767
+msgid "write dangling objects in .git/lost-found"
+msgstr "將懸空物件寫入 .git/lost-found 中"
+
+#: builtin/fsck.c:768 builtin/prune.c:134
+msgid "show progress"
+msgstr "顯示進度"
+
+#: builtin/fsck.c:769
+msgid "show verbose names for reachable objects"
+msgstr "顯示�以�得物件的詳細�稱"
+
+#: builtin/fsck.c:828 builtin/index-pack.c:262
+msgid "Checking objects"
+msgstr "正在檢查物件"
+
+#: builtin/fsck.c:856
+#, c-format
+msgid "%s: object missing"
+msgstr "%s：物件缺少"
+
+#: builtin/fsck.c:867
+#, c-format
+msgid "invalid parameter: expected sha1, got '%s'"
+msgstr "無效的�數：期望 sha1，得到 '%s'"
+
+#: builtin/gc.c:39
+msgid "git gc [<options>]"
+msgstr "git gc [<�項>]"
+
+#: builtin/gc.c:93
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "� %s 呼� fstat 失敗：%s"
+
+#: builtin/gc.c:129
+#, c-format
+msgid "failed to parse '%s' value '%s'"
+msgstr "無法解� '%s' 值 '%s'"
+
+#: builtin/gc.c:487 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
+#, c-format
+msgid ""
+"The last gc run reported the following. Please correct the root cause\n"
+"and remove %s.\n"
+"Automatic cleanup will not be performed until the file is removed.\n"
+"\n"
+"%s"
+msgstr ""
+"最後一次 gc 動作報告如下訊�。請檢查原因並刪除 %s。\n"
+"在該檔案被刪除之�，自動清�將�會執行。\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:551
+msgid "prune unreferenced objects"
+msgstr "清除未引用的物件"
+
+#: builtin/gc.c:553
+msgid "be more thorough (increased runtime)"
+msgstr "更徹底（增加執行時間）"
+
+#: builtin/gc.c:554
+msgid "enable auto-gc mode"
+msgstr "啟用自動垃圾回收模�"
+
+#: builtin/gc.c:557
+msgid "force running gc even if there may be another gc running"
+msgstr "強制執行 gc �使�外一個 gc 正在執行"
+
+#: builtin/gc.c:560
+msgid "repack all other packs except the largest pack"
+msgstr "除了最大的包之外，�所有其它包檔案�新打包"
+
+#: builtin/gc.c:576
+#, c-format
+msgid "failed to parse gc.logexpiry value %s"
+msgstr "解� gc.logexpiry 的值 %s 失敗"
+
+#: builtin/gc.c:587
+#, c-format
+msgid "failed to parse prune expiry value %s"
+msgstr "解�清除期�值 %s 失敗"
+
+#: builtin/gc.c:607
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr "自動在後�執行版本庫打包以求最佳性能。\n"
+
+#: builtin/gc.c:609
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "自動打包版本庫以求最佳性能。\n"
+
+#: builtin/gc.c:610
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "手動維護�見 \"git help gc\"。\n"
+
+#: builtin/gc.c:650
+#, 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
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr "有太多無法�得的鬆散物件，執行 'git prune' 刪除它們。"
+
+#: builtin/gc.c:715
+msgid ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<task>] [--schedule]"
+msgstr ""
+"git maintenance run [--auto] [--[no-]quiet] [--task=<作業>] [--schedule]"
+
+#: builtin/gc.c:745
+msgid "--no-schedule is not allowed"
+msgstr "��許 --no-schedule"
+
+#: builtin/gc.c:750
+#, c-format
+msgid "unrecognized --schedule argument '%s'"
+msgstr "無法識別的 --schedule 引數 '%s'"
+
+#: builtin/gc.c:869
+msgid "failed to write commit-graph"
+msgstr "無法寫入�交圖形"
+
+#: builtin/gc.c:905
+msgid "failed to prefetch remotes"
+msgstr "無法�先�得�端"
+
+#: builtin/gc.c:1022
+msgid "failed to start 'git pack-objects' process"
+msgstr "無法啟動 ‘git pack-objects’ 處�程�"
+
+#: builtin/gc.c:1039
+msgid "failed to finish 'git pack-objects' process"
+msgstr "無法完� ‘git pack-objects’ 處�程�"
+
+#: builtin/gc.c:1091
+msgid "failed to write multi-pack-index"
+msgstr "無法寫入多包索引"
+
+#: builtin/gc.c:1109
+msgid "'git multi-pack-index expire' failed"
+msgstr "'git multi-pack-index expire' 失敗"
+
+#: builtin/gc.c:1170
+msgid "'git multi-pack-index repack' failed"
+msgstr "'git multi-pack-index repack' 失敗"
+
+#: builtin/gc.c:1179
+msgid ""
+"skipping incremental-repack task because core.multiPackIndex is disabled"
+msgstr "略�增��新打包工作，因為 core.multiPackIndex 已被�用"
+
+#: builtin/gc.c:1283
+#, c-format
+msgid "lock file '%s' exists, skipping maintenance"
+msgstr "已存在 '%s' 鎖定檔案，略�維護"
+
+#: builtin/gc.c:1313
+#, c-format
+msgid "task '%s' failed"
+msgstr "作業 '%s' 失敗"
+
+#: builtin/gc.c:1395
+#, c-format
+msgid "'%s' is not a valid task"
+msgstr "'%s' �有效作業"
+
+#: builtin/gc.c:1400
+#, c-format
+msgid "task '%s' cannot be selected multiple times"
+msgstr "�能多次�� '%s' 作業"
+
+#: builtin/gc.c:1415
+msgid "run tasks based on the state of the repository"
+msgstr "基於版本庫狀態執行作業"
+
+#: builtin/gc.c:1416
+msgid "frequency"
+msgstr "frequency"
+
+#: builtin/gc.c:1417
+msgid "run tasks based on frequency"
+msgstr "�據頻率執行工作"
+
+#: builtin/gc.c:1420
+msgid "do not report progress or other information over stderr"
+msgstr "��在 stderr 輸出進度或其他資訊"
+
+#: builtin/gc.c:1421
+msgid "task"
+msgstr "作業"
+
+#: builtin/gc.c:1422
+msgid "run a specific task"
+msgstr "執行指定作業"
+
+#: builtin/gc.c:1439
+msgid "use at most one of --auto and --schedule=<frequency>"
+msgstr "--auto 和 --schedule=<頻率> 請任�一"
+
+#: builtin/gc.c:1482
+msgid "failed to run 'git config'"
+msgstr "無法執行 ‘git config’"
+
+#: builtin/gc.c:1547
+#, c-format
+msgid "failed to expand path '%s'"
+msgstr "無法展開「%s�路徑"
+
+#: builtin/gc.c:1576
+msgid "failed to start launchctl"
+msgstr "無法啟動 launchctl"
+
+#: builtin/gc.c:1613
+#, c-format
+msgid "failed to create directories for '%s'"
+msgstr "無法建立「%s�的目錄"
+
+#: builtin/gc.c:1674
+#, c-format
+msgid "failed to bootstrap service %s"
+msgstr "無法啟動載入 %s �務"
+
+#: builtin/gc.c:1745
+msgid "failed to create temp xml file"
+msgstr "無法建立暫存 XML 檔案"
+
+#: builtin/gc.c:1835
+msgid "failed to start schtasks"
+msgstr "無法啟動 schtasks"
+
+#: builtin/gc.c:1879
+msgid "failed to run 'crontab -l'; your system might not support 'cron'"
+msgstr "無法執行 “crontab -l�；您的系統�能�支� “cron�"
+
+#: builtin/gc.c:1896
+msgid "failed to run 'crontab'; your system might not support 'cron'"
+msgstr "無法執行 “crontab�；您的系統�能�支� “cron�"
+
+#: builtin/gc.c:1900
+msgid "failed to open stdin of 'crontab'"
+msgstr "無法開啟 ‘crontab’ 的標準輸入"
+
+#: builtin/gc.c:1942
+msgid "'crontab' died"
+msgstr "“crontab� ���作"
+
+#: 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 "無法將版本庫加至全域設定"
+
+#: builtin/gc.c:2010
+msgid "git maintenance <subcommand> [<options>]"
+msgstr "git maintenance <�命令> [<�項>]"
+
+#: builtin/gc.c:2029
+#, c-format
+msgid "invalid subcommand: %s"
+msgstr "無效�命令：%s"
+
+#: builtin/grep.c:30
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<�項>] [-e] <模�> [<版本>...] [[--] <路徑>...]"
+
+#: builtin/grep.c:223
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep：無法建立執行緒：%s"
+
+#: builtin/grep.c:277
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "為 %2$s 設定的執行緒數 (%1$d) 無效"
+
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: 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 "沒有執行緒支�，忽略 %s"
+
+#: builtin/grep.c:473 builtin/grep.c:603 builtin/grep.c:643
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "無法讀�樹（%s）"
+
+#: builtin/grep.c:658
+#, c-format
+msgid "unable to grep from object of type %s"
+msgstr "無法抓�來自於 %s 類型的物件"
+
+#: builtin/grep.c:738
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "開關 `%c' 期望一個數字值"
+
+#: builtin/grep.c:837
+msgid "search in index instead of in the work tree"
+msgstr "在索引��尋而�是在工作�"
+
+#: builtin/grep.c:839
+msgid "find in contents not managed by git"
+msgstr "在未被 git 管�的內容中尋找"
+
+#  譯者：中文字串拼接，�刪除�導空格
+#: builtin/grep.c:841
+msgid "search in both tracked and untracked files"
+msgstr "在追蹤和未追蹤的檔案中�尋"
+
+#: builtin/grep.c:843
+msgid "ignore files specified via '.gitignore'"
+msgstr "忽略 '.gitignore' 包�的檔案"
+
+#: builtin/grep.c:845
+msgid "recursively search in each submodule"
+msgstr "在�一個�模組中�迴�尋"
+
+#: builtin/grep.c:848
+msgid "show non-matching lines"
+msgstr "顯示未符�的行"
+
+#: builtin/grep.c:850
+msgid "case insensitive matching"
+msgstr "��分大�寫符�"
+
+#: builtin/grep.c:852
+msgid "match patterns only at word boundaries"
+msgstr "�在單詞邊界符�模�"
+
+#: builtin/grep.c:854
+msgid "process binary files as text"
+msgstr "把二進�檔案當�文字處�"
+
+#: builtin/grep.c:856
+msgid "don't match patterns in binary files"
+msgstr "�在二進�檔案中符�模�"
+
+#: builtin/grep.c:859
+msgid "process binary files with textconv filters"
+msgstr "用 textconv �濾器處�二進�檔案"
+
+#: builtin/grep.c:861
+msgid "search in subdirectories (default)"
+msgstr "在�目錄中尋找（�設）"
+
+#: builtin/grep.c:863
+msgid "descend at most <depth> levels"
+msgstr "最多以指定的深度�下尋找"
+
+#: builtin/grep.c:867
+msgid "use extended POSIX regular expressions"
+msgstr "使用擴展的 POSIX 正�表示�"
+
+#: builtin/grep.c:870
+msgid "use basic POSIX regular expressions (default)"
+msgstr "使用基本的 POSIX 正�表示�（�設）"
+
+#: builtin/grep.c:873
+msgid "interpret patterns as fixed strings"
+msgstr "把模�解�為固定的字串"
+
+#: builtin/grep.c:876
+msgid "use Perl-compatible regular expressions"
+msgstr "使用 Perl 相容的正�表示�"
+
+#: builtin/grep.c:879
+msgid "show line numbers"
+msgstr "顯示行號"
+
+#: builtin/grep.c:880
+msgid "show column number of first match"
+msgstr "顯示第一個符�的列號"
+
+#: builtin/grep.c:881
+msgid "don't show filenames"
+msgstr "�顯示檔案�"
+
+#: builtin/grep.c:882
+msgid "show filenames"
+msgstr "顯示檔案�"
+
+#: builtin/grep.c:884
+msgid "show filenames relative to top directory"
+msgstr "顯示相�於頂級目錄的檔案�"
+
+#: builtin/grep.c:886
+msgid "show only filenames instead of matching lines"
+msgstr "�顯示檔案�而�顯示符�的行"
+
+#: builtin/grep.c:888
+msgid "synonym for --files-with-matches"
+msgstr "和 --files-with-matches �義"
+
+#: builtin/grep.c:891
+msgid "show only the names of files without match"
+msgstr "�顯示未符�的檔案�"
+
+#: builtin/grep.c:893
+msgid "print NUL after filenames"
+msgstr "在檔案�後輸出 NUL 字元"
+
+#: builtin/grep.c:896
+msgid "show only matching parts of a line"
+msgstr "�顯示行中的符�的部分"
+
+#: builtin/grep.c:898
+msgid "show the number of matches instead of matching lines"
+msgstr "顯示總符�行數，而�顯示符�的行"
+
+#: builtin/grep.c:899
+msgid "highlight matches"
+msgstr "高亮顯示符�項"
+
+#: builtin/grep.c:901
+msgid "print empty line between matches from different files"
+msgstr "在��檔案的符�項之間列�空行"
+
+#: builtin/grep.c:903
+msgid "show filename only once above matches from same file"
+msgstr "�在�一檔案的符�項的上�顯示一次檔案�"
+
+#: builtin/grep.c:906
+msgid "show <n> context lines before and after matches"
+msgstr "顯示符�項�後的 <n> 行上下文"
+
+#: builtin/grep.c:909
+msgid "show <n> context lines before matches"
+msgstr "顯示符�項� <n> 行上下文"
+
+#: builtin/grep.c:911
+msgid "show <n> context lines after matches"
+msgstr "顯示符�項後 <n> 行上下文"
+
+#: builtin/grep.c:913
+msgid "use <n> worker threads"
+msgstr "使用 <n> 個工作執行緒"
+
+#: builtin/grep.c:914
+msgid "shortcut for -C NUM"
+msgstr "快�� -C 數字"
+
+#: builtin/grep.c:917
+msgid "show a line with the function name before matches"
+msgstr "在符�的��顯示一行函數�"
+
+#: builtin/grep.c:919
+msgid "show the surrounding function"
+msgstr "顯示所在函數的�後內容"
+
+#: builtin/grep.c:922
+msgid "read patterns from file"
+msgstr "從檔案讀�模�"
+
+#: builtin/grep.c:924
+msgid "match <pattern>"
+msgstr "符� <模�>"
+
+#: builtin/grep.c:926
+msgid "combine patterns specified with -e"
+msgstr "組�用 -e �數設定的模�"
+
+#: builtin/grep.c:938
+msgid "indicate hit with exit status without output"
+msgstr "�輸出，而用離開碼標記命中狀態"
+
+#: builtin/grep.c:940
+msgid "show only matches from files that match all patterns"
+msgstr "�顯示符�所有模�的檔案中的符�"
+
+#: builtin/grep.c:943
+msgid "pager"
+msgstr "分�"
+
+#: builtin/grep.c:943
+msgid "show matching files in the pager"
+msgstr "分�顯示符�的檔案"
+
+#: builtin/grep.c:947
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "�許呼� grep(1)（本次組建忽略）"
+
+#: builtin/grep.c:1013
+msgid "no pattern given"
+msgstr "未�供符�模�"
+
+#: builtin/grep.c:1049
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index 或 --untracked �能和版本�時使用"
+
+#: builtin/grep.c:1057
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "�能解�版本：%s"
+
+#: builtin/grep.c:1087
+msgid "--untracked not supported with --recurse-submodules"
+msgstr "--untracked �支�與 --recurse-submodules 一起使用"
+
+#: builtin/grep.c:1091
+msgid "invalid option combination, ignoring --threads"
+msgstr "無效的�項組�，忽略 --threads"
+
+#: builtin/grep.c:1094 builtin/pack-objects.c:4090
+msgid "no threads support, ignoring --threads"
+msgstr "沒有執行緒支�，忽略 --threads"
+
+#: builtin/grep.c:1097 builtin/index-pack.c:1585 builtin/pack-objects.c:3126
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "指定的執行緒數無效（%d）"
+
+#: builtin/grep.c:1131
+msgid "--open-files-in-pager only works on the worktree"
+msgstr "--open-files-in-pager 僅用於工作�"
+
+#: builtin/grep.c:1157
+msgid "--cached or --untracked cannot be used with --no-index"
+msgstr "--cached 或 --untracked �能與 --no-index �時使用"
+
+#: builtin/grep.c:1160
+msgid "--untracked cannot be used with --cached"
+msgstr "--untracked �能與 --cached 一起使用"
+
+#: builtin/grep.c:1166
+msgid "--[no-]exclude-standard cannot be used for tracked contents"
+msgstr "--[no-]exclude-standard �能用於已追蹤內容"
+
+#: builtin/grep.c:1174
+msgid "both --cached and trees are given"
+msgstr "�時給出了 --cached 和樹狀物件"
+
+#: builtin/hash-object.c:85
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <類型>] [-w] [--path=<檔案> | --no-filters] [--stdin] "
+"[--] <檔案>..."
+
+#: builtin/hash-object.c:86
+msgid "git hash-object  --stdin-paths"
+msgstr "git hash-object  --stdin-paths"
+
+#: builtin/hash-object.c:98
+msgid "object type"
+msgstr "物件類型"
+
+#: builtin/hash-object.c:99
+msgid "write the object into the object database"
+msgstr "將物件寫入物件資料庫"
+
+#: builtin/hash-object.c:101
+msgid "read the object from stdin"
+msgstr "從標準輸入讀�物件"
+
+#: builtin/hash-object.c:103
+msgid "store file as is without filters"
+msgstr "原樣儲存檔案�使用�濾器"
+
+#: builtin/hash-object.c:104
+msgid ""
+"just hash any random garbage to create corrupt objects for debugging Git"
+msgstr "�許�任�隨機垃圾資料�散列來建立�壞的物件以便除錯 Git"
+
+#: builtin/hash-object.c:105
+msgid "process file as it were from this path"
+msgstr "處�檔案並�設其來自於此路徑"
+
+#: builtin/help.c:47
+msgid "print all available commands"
+msgstr "列�所有�用的指令"
+
+#: builtin/help.c:48
+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
+msgid "show man page"
+msgstr "顯示 man 手冊"
+
+#: builtin/help.c:53
+msgid "show manual in web browser"
+msgstr "在 web �覽器中顯示手冊"
+
+#: builtin/help.c:55
+msgid "show info page"
+msgstr "顯示 info 手冊"
+
+#: builtin/help.c:57
+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:163
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "無法識別的�助格� '%s'"
+
+#: builtin/help.c:190
+msgid "Failed to start emacsclient."
+msgstr "無法啟動 emacsclient。"
+
+#: builtin/help.c:203
+msgid "Failed to parse emacsclient version."
+msgstr "無法解� emacsclient 版本。"
+
+#: builtin/help.c:211
+#, 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
+#, c-format
+msgid "failed to exec '%s'"
+msgstr "執行 '%s' 失敗"
+
+#: builtin/help.c:307
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s'：�支�的 man 手冊檢視器的路徑。\n"
+"請使用 'man.<工具>.cmd'。"
+
+#: builtin/help.c:319
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': 支�的 man 手冊檢視器指令。\n"
+"請使用 'man.<工具>.path'。"
+
+#: builtin/help.c:436
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s'：未知的 man 檢視器。"
+
+#: builtin/help.c:452
+msgid "no man viewer handled the request"
+msgstr "沒有 man 檢視器處�此請求"
+
+#: builtin/help.c:459
+msgid "no info viewer handled the request"
+msgstr "沒有 info 檢視器處�此請求"
+
+#: builtin/help.c:517 builtin/help.c:528 git.c:348
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' 是 '%s' 的別�"
+
+#: builtin/help.c:531 git.c:380
+#, c-format
+msgid "bad alias.%s string: %s"
+msgstr "壞的 alias.%s 字串：%s"
+
+#: builtin/help.c:561 builtin/help.c:591
+#, c-format
+msgid "usage: %s%s"
+msgstr "用法：%s%s"
+
+#: builtin/help.c:575
+msgid "'git help config' for more information"
+msgstr "'git help config' �得更多訊�"
+
+#: builtin/index-pack.c:222
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "%s 的物件類型�符�"
+
+#: builtin/index-pack.c:242
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "未能�得�期的物件 %s"
+
+#: builtin/index-pack.c:245
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "物件 %s：應為類型 %s，�是 %s"
+
+#: builtin/index-pack.c:295
+#, c-format
+msgid "cannot fill %d byte"
+msgid_plural "cannot fill %d bytes"
+msgstr[0] "無法填充 %d �元組"
+
+#: builtin/index-pack.c:305
+msgid "early EOF"
+msgstr "�早的檔案��符（EOF）"
+
+#: builtin/index-pack.c:306
+msgid "read error on input"
+msgstr "輸入上的讀錯誤"
+
+#: builtin/index-pack.c:318
+msgid "used more bytes than were available"
+msgstr "用掉了超��用的�元組"
+
+#: builtin/index-pack.c:325 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
+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
+msgid "pack signature mismatch"
+msgstr "包簽��符�"
+
+#: builtin/index-pack.c:365
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "�支�包版本 %<PRIu32>"
+
+#: builtin/index-pack.c:381
+#, c-format
+msgid "pack has bad object at offset %<PRIuMAX>: %s"
+msgstr "包中有錯誤的物件�於�移� %<PRIuMAX>：%s"
+
+#: builtin/index-pack.c:487
+#, c-format
+msgid "inflate returned %d"
+msgstr "解壓縮返回 %d"
+
+#: builtin/index-pack.c:536
+msgid "offset value overflow for delta base object"
+msgstr "�移值覆蓋了 delta 基準物件"
+
+#: builtin/index-pack.c:544
+msgid "delta base offset is out of bound"
+msgstr "delta 基準�移越界"
+
+#: builtin/index-pack.c:552
+#, c-format
+msgid "unknown object type %d"
+msgstr "未知物件類型 %d"
+
+#: builtin/index-pack.c:583
+msgid "cannot pread pack file"
+msgstr "無法讀�包檔案"
+
+#: 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] "包檔案�早��，缺少 %<PRIuMAX> �元組"
+
+#: builtin/index-pack.c:611
+msgid "serious inflate inconsistency"
+msgstr "解壓縮嚴�的�一致"
+
+#: 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 "發� %s 出� SHA1 ���"
+
+#: 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 "�能讀 %s"
+
+#: builtin/index-pack.c:823
+#, c-format
+msgid "cannot read existing object info %s"
+msgstr "�能讀��存物件訊� %s"
+
+#: builtin/index-pack.c:831
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "�能讀��存物件 %s"
+
+#: builtin/index-pack.c:845
+#, c-format
+msgid "invalid blob object %s"
+msgstr "無效的資料物件 %s"
+
+#: builtin/index-pack.c:848 builtin/index-pack.c:867
+msgid "fsck error in packed object"
+msgstr "�打包物件 fsck 檢查發生錯誤"
+
+#: builtin/index-pack.c:869
+#, c-format
+msgid "Not all child objects of %s are reachable"
+msgstr "%s 的所有�物件並�都�以�得"
+
+#: builtin/index-pack.c:930 builtin/index-pack.c:977
+msgid "failed to apply delta"
+msgstr "套用 delta 失敗"
+
+#: builtin/index-pack.c:1160
+msgid "Receiving objects"
+msgstr "接收物件中"
+
+#: builtin/index-pack.c:1160
+msgid "Indexing objects"
+msgstr "索引物件中"
+
+#: builtin/index-pack.c:1194
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "包��（SHA1 �符�）"
+
+#: builtin/index-pack.c:1199
+msgid "cannot fstat packfile"
+msgstr "�能� packfile 呼� fstat"
+
+#: builtin/index-pack.c:1202
+msgid "pack has junk at the end"
+msgstr "包的�尾有垃圾資料"
+
+#: builtin/index-pack.c:1214
+msgid "confusion beyond insanity in parse_pack_objects()"
+msgstr "parse_pack_objects() 中�到���喻的�題"
+
+#: builtin/index-pack.c:1237
+msgid "Resolving deltas"
+msgstr "處� delta 中"
+
+#: builtin/index-pack.c:1248 builtin/pack-objects.c:2892
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "�能建立執行緒：%s"
+
+#: builtin/index-pack.c:1281
+msgid "confusion beyond insanity"
+msgstr "���喻"
+
+#: builtin/index-pack.c:1287
+#, c-format
+msgid "completed with %d local object"
+msgid_plural "completed with %d local objects"
+msgstr[0] "完� %d 個本機物件"
+
+#: builtin/index-pack.c:1299
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "� %s 的尾部總和檢查出��外（�碟�壞？）"
+
+#: builtin/index-pack.c:1303
+#, c-format
+msgid "pack has %d unresolved delta"
+msgid_plural "pack has %d unresolved deltas"
+msgstr[0] "包有 %d 個未解決的 delta"
+
+#: builtin/index-pack.c:1327
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "�能壓縮附加物件（%d）"
+
+#: builtin/index-pack.c:1423
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "本機物件 %s 已�壞"
+
+#: builtin/index-pack.c:1444
+#, c-format
+msgid "packfile name '%s' does not end with '.%s'"
+msgstr "packfile �稱「%s�的�尾�是「.%s�"
+
+#: builtin/index-pack.c:1468
+#, c-format
+msgid "cannot write %s file '%s'"
+msgstr "無法寫入 %s 檔案 '%s'"
+
+#: builtin/index-pack.c:1476
+#, c-format
+msgid "cannot close written %s file '%s'"
+msgstr "無法關閉已寫入的 %s 檔案 '%s'"
+
+#: builtin/index-pack.c:1502
+msgid "error while closing pack file"
+msgstr "關閉包檔案時發生錯誤"
+
+#: builtin/index-pack.c:1516
+msgid "cannot store pack file"
+msgstr "無法儲存包檔案"
+
+#: builtin/index-pack.c:1524
+msgid "cannot store index file"
+msgstr "無法儲存索引檔案"
+
+#: builtin/index-pack.c:1579 builtin/pack-objects.c:3137
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "壞的 pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1649
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "無法開啟�存包檔案 '%s'"
+
+#: builtin/index-pack.c:1651
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "無法為 %s 開啟包索引檔案"
+
+#: builtin/index-pack.c:1699
+#, c-format
+msgid "non delta: %d object"
+msgid_plural "non delta: %d objects"
+msgstr[0] "� delta：%d 個物件"
+
+#: builtin/index-pack.c:1706
+#, c-format
+msgid "chain length = %d: %lu object"
+msgid_plural "chain length = %d: %lu objects"
+msgstr[0] "�長 = %d: %lu 物件"
+
+#: builtin/index-pack.c:1748
+msgid "Cannot come back to cwd"
+msgstr "無法返回目�工作目錄"
+
+#: 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 "錯誤�項 %s"
+
+#: builtin/index-pack.c:1831 builtin/init-db.c:379 builtin/init-db.c:614
+#, c-format
+msgid "unknown hash algorithm '%s'"
+msgstr "未知的「%s�雜湊算法"
+
+#: builtin/index-pack.c:1850
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin �能和 --stdin �時使用"
+
+#: builtin/index-pack.c:1852
+msgid "--stdin requires a git repository"
+msgstr "--stdin 需�一個 git 版本庫"
+
+#: builtin/index-pack.c:1854
+msgid "--object-format cannot be used with --stdin"
+msgstr "--object-format �能和 --stdin �時使用"
+
+#: builtin/index-pack.c:1869
+msgid "--verify with no packfile name given"
+msgstr "--verify 沒有�供 packfile �稱�數"
+
+#: builtin/index-pack.c:1935 builtin/unpack-objects.c:584
+msgid "fsck error in pack objects"
+msgstr "在打包物件中 fsck 檢查發生錯誤"
+
+#: builtin/init-db.c:63
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "�能�範本 '%s' 呼� stat"
+
+#: builtin/init-db.c:68
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "�能開啟目錄 '%s'"
+
+#: builtin/init-db.c:80
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "�能讀�連� '%s'"
+
+#: builtin/init-db.c:82
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "�能自 '%s' 到 '%s' 建立符號連�"
+
+#: builtin/init-db.c:88
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "�能複製 '%s' 至 '%s'"
+
+#: builtin/init-db.c:92
+#, c-format
+msgid "ignoring template %s"
+msgstr "忽略範本 %s"
+
+#: builtin/init-db.c:123
+#, c-format
+msgid "templates not found in %s"
+msgstr "沒有在 %s 中找到範本"
+
+#: builtin/init-db.c:138
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "沒有從 '%s' 複製範本：%s"
+
+#: builtin/init-db.c:263
+#, c-format
+msgid "invalid initial branch name: '%s'"
+msgstr "無效的�始分支�稱：'%s'"
+
+#: builtin/init-db.c:354
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "�能處� %d 類型的檔案"
+
+#: builtin/init-db.c:357
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "�能移動 %s 至 %s"
+
+#: builtin/init-db.c:373
+msgid "attempt to reinitialize repository with different hash"
+msgstr "嘗試以��的雜湊值�新�始化版本庫"
+
+#: builtin/init-db.c:397 builtin/init-db.c:400
+#, c-format
+msgid "%s already exists"
+msgstr "%s 已經存在"
+
+#: builtin/init-db.c:432
+#, c-format
+msgid "re-init: ignored --initial-branch=%s"
+msgstr "re-init: 忽略 --initial-branch=%s"
+
+#: 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:464
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "�新�始化已存在的 Git 版本庫於 %s%s\n"
+
+#: 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:469
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "已�始化空的 Git 版本庫於 %s%s\n"
+
+#: builtin/init-db.c:518
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<範本目錄>] [--shared[=<權�>]] "
+"[<目錄>]"
+
+#: builtin/init-db.c:544
+msgid "permissions"
+msgstr "權�"
+
+#: builtin/init-db.c:545
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr "指定 git 版本庫是多個使用者之間共享的"
+
+#: builtin/init-db.c:551
+msgid "override the name of the initial branch"
+msgstr "覆蓋�始分支的�稱"
+
+#: builtin/init-db.c:552 builtin/verify-pack.c:74
+msgid "hash"
+msgstr "雜湊"
+
+#: 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:560
+msgid "--separate-git-dir and --bare are mutually exclusive"
+msgstr "--separate-git-dir 和 --bare 互斥"
+
+#: builtin/init-db.c:591 builtin/init-db.c:596
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "�能建立目錄 %s"
+
+#: builtin/init-db.c:600 builtin/init-db.c:655
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "�能切�目錄到 %s"
+
+#: 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:679
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "�能存�工作� '%s'"
+
+#: builtin/init-db.c:684
+msgid "--separate-git-dir incompatible with bare repository"
+msgstr "--separate-git-dir 與純版本庫�相容"
+
+#: 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 <�>[(=|:)<值"
+">])...] [<檔案>...]"
+
+#: builtin/interpret-trailers.c:95
+msgid "edit files in place"
+msgstr "在原�編輯檔案"
+
+#: builtin/interpret-trailers.c:96
+msgid "trim empty trailers"
+msgstr "刪除空的尾部署�"
+
+#: builtin/interpret-trailers.c:99
+msgid "where to place the new trailer"
+msgstr "在哪裡放置新的尾部署�"
+
+#: builtin/interpret-trailers.c:101
+msgid "action if trailer already exists"
+msgstr "當尾部署�已經存在時所採�的動作"
+
+#: builtin/interpret-trailers.c:103
+msgid "action if trailer is missing"
+msgstr "當尾部署�缺少時所採�的動作"
+
+#: builtin/interpret-trailers.c:105
+msgid "output only the trailers"
+msgstr "�輸出尾部署�"
+
+#: builtin/interpret-trailers.c:106
+msgid "do not apply config rules"
+msgstr "��套用組態設定�則"
+
+#: builtin/interpret-trailers.c:107
+msgid "join whitespace-continued values"
+msgstr "連線空白折行的值"
+
+#: builtin/interpret-trailers.c:108
+msgid "set parsing options"
+msgstr "設定解��項"
+
+#: builtin/interpret-trailers.c:110
+msgid "do not treat --- specially"
+msgstr "��� --- 特殊處�"
+
+#: builtin/interpret-trailers.c:112
+msgid "trailer(s) to add"
+msgstr "�新增的尾部署�"
+
+#: builtin/interpret-trailers.c:123
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer 和 --only-input �時使用沒有�義"
+
+#: builtin/interpret-trailers.c:133
+msgid "no input file given for in-place editing"
+msgstr "沒有給出�原�編輯的檔案"
+
+#: builtin/log.c:59
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<�項>] [<版本範�>] [[--] <路徑>...]"
+
+#: builtin/log.c:60
+msgid "git show [<options>] <object>..."
+msgstr "git show [<�項>] <物件>..."
+
+#: builtin/log.c:113
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "無效的 --decorate �項：%s"
+
+#: builtin/log.c:180
+msgid "show source"
+msgstr "顯示�"
+
+#: builtin/log.c:181
+msgid "use mail map file"
+msgstr "使用信件映射檔案"
+
+#: builtin/log.c:184
+msgid "only decorate refs that match <pattern>"
+msgstr "�修飾與 <模�> 符�的引用"
+
+#: builtin/log.c:186
+msgid "do not decorate refs that match <pattern>"
+msgstr "�修飾和 <模�> 符�的引用"
+
+#: builtin/log.c:187
+msgid "decorate options"
+msgstr "修飾�項"
+
+#: builtin/log.c:190
+msgid ""
+"trace the evolution of line range <start>,<end> or function :<funcname> in "
+"<file>"
+msgstr "追蹤 <開始>,<��> 範�中橫列或 <檔案> 中> :<函數�稱> 的變化�"
+
+#: builtin/log.c:213
+msgid "-L<range>:<file> cannot be used with pathspec"
+msgstr "-L<範�>:<檔案> 和 pathspec �能�時使用"
+
+#: builtin/log.c:306
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "最終輸出：%d %s\n"
+
+#: builtin/log.c:571
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: �壞的檔案"
+
+#: builtin/log.c:586 builtin/log.c:676
+#, c-format
+msgid "could not read object %s"
+msgstr "�能讀�物件 %s"
+
+#: builtin/log.c:701
+#, c-format
+msgid "unknown type: %d"
+msgstr "未知類型：%d"
+
+#: builtin/log.c:846
+#, c-format
+msgid "%s: invalid cover from description mode"
+msgstr "%s：從�述產生附函的模�無效"
+
+#: builtin/log.c:853
+msgid "format.headers without value"
+msgstr "format.headers 沒有值"
+
+#: builtin/log.c:982
+#, c-format
+msgid "cannot open patch file %s"
+msgstr "無法開啟修補檔案 %s"
+
+#: builtin/log.c:999
+msgid "need exactly one range"
+msgstr "�需�一個範�"
+
+#: builtin/log.c:1009
+msgid "not a range"
+msgstr "�是一個範�"
+
+#: builtin/log.c:1173
+msgid "cover letter needs email format"
+msgstr "附函需�信件��格�"
+
+#: builtin/log.c:1179
+msgid "failed to create cover-letter file"
+msgstr "無法建立附函檔案"
+
+#: builtin/log.c:1266
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "�正常的 in-reply-to：%s"
+
+#: builtin/log.c:1293
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<�項>] [<從> | <版本範�>]"
+
+#: builtin/log.c:1351
+msgid "two output directories?"
+msgstr "兩個輸出目錄？"
+
+#: builtin/log.c:1502 builtin/log.c:2328 builtin/log.c:2330 builtin/log.c:2342
+#, c-format
+msgid "unknown commit %s"
+msgstr "未知�交 %s"
+
+#: 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 "無法將 '%s' 解�為一個有效引用"
+
+#: builtin/log.c:1522
+msgid "could not find exact merge base"
+msgstr "�能找到準確的�併基礎"
+
+#: 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"
+"Or you could specify base commit by --base=<base-commit-id> manually"
+msgstr ""
+"無法得到上游��，如果你想自動記錄基礎�交，請使用指令\n"
+"git branch --set-upstream-to 來追蹤一個�端分支。或者你�以��\n"
+"�數 --base=<基礎�交> 手動指定一個基礎�交"
+
+#: builtin/log.c:1555
+msgid "failed to find exact merge base"
+msgstr "無法找到準確的�併基礎"
+
+#: builtin/log.c:1572
+msgid "base commit should be the ancestor of revision list"
+msgstr "基礎�交應該是版本列表的祖先"
+
+#: builtin/log.c:1582
+msgid "base commit shouldn't be in revision list"
+msgstr "基礎�交�應該出�在版本列表中"
+
+#: builtin/log.c:1640
+msgid "cannot get patch id"
+msgstr "無法得到修補檔 id"
+
+#: builtin/log.c:1703
+msgid "failed to infer range-diff origin of current series"
+msgstr "無法推斷目�系列的 range-diff 起點"
+
+#: builtin/log.c:1705
+#, c-format
+msgid "using '%s' as range-diff origin of current series"
+msgstr "將 '%s' 當作目�系列的 range-diff 起點"
+
+#: builtin/log.c:1749
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "使用 [PATCH n/m]，�使�有一個修補檔"
+
+#: builtin/log.c:1752
+msgid "use [PATCH] even with multiple patches"
+msgstr "使用 [PATCH]，�使有多個修補檔"
+
+#: builtin/log.c:1756
+msgid "print patches to standard out"
+msgstr "列�修補檔到標準輸出"
+
+#: builtin/log.c:1758
+msgid "generate a cover letter"
+msgstr "生�一�附函"
+
+#: builtin/log.c:1760
+msgid "use simple number sequence for output file names"
+msgstr "使用簡單的數字�列作為輸出檔案�"
+
+#: builtin/log.c:1761
+msgid "sfx"
+msgstr "後綴"
+
+#: builtin/log.c:1762
+msgid "use <sfx> instead of '.patch'"
+msgstr "使用 <後綴> 代替 '.patch'"
+
+#: builtin/log.c:1764
+msgid "start numbering patches at <n> instead of 1"
+msgstr "修補檔以 <n> 開始編號，而�是1"
+
+#: builtin/log.c:1765
+msgid "reroll-count"
+msgstr "reroll-count"
+
+#: builtin/log.c:1766
+msgid "mark the series as Nth re-roll"
+msgstr "標記修補檔系列是第幾次�製"
+
+#: builtin/log.c:1768
+msgid "max length of output filename"
+msgstr "輸出檔�的最大長度"
+
+#: builtin/log.c:1770
+msgid "use [RFC PATCH] instead of [PATCH]"
+msgstr "使用 [RFC PATCH] 代替 [PATCH]"
+
+#: builtin/log.c:1773
+msgid "cover-from-description-mode"
+msgstr "從�述產生附函的模�"
+
+#: builtin/log.c:1774
+msgid "generate parts of a cover letter based on a branch's description"
+msgstr "基於分支�述產生部分附函"
+
+#: builtin/log.c:1776
+msgid "use [<prefix>] instead of [PATCH]"
+msgstr "使用 [<�綴>] 代替 [PATCH]"
+
+#: builtin/log.c:1779
+msgid "store resulting files in <dir>"
+msgstr "把�果檔案儲存在 <目錄>"
+
+#: builtin/log.c:1782
+msgid "don't strip/add [PATCH]"
+msgstr "�刪除/新增 [PATCH]"
+
+#: builtin/log.c:1785
+msgid "don't output binary diffs"
+msgstr "�輸出二進�差異"
+
+#: builtin/log.c:1787
+msgid "output all-zero hash in From header"
+msgstr "在 From 標頭訊�中輸出全為零的雜湊值"
+
+#: builtin/log.c:1789
+msgid "don't include a patch matching a commit upstream"
+msgstr "�包�已在上游�交中的修補檔"
+
+#: builtin/log.c:1791
+msgid "show patch format instead of default (patch + stat)"
+msgstr "顯示純修補檔格�而��設的（修補檔+狀態）"
+
+#: builtin/log.c:1793
+msgid "Messaging"
+msgstr "信件傳�"
+
+#: builtin/log.c:1794
+msgid "header"
+msgstr "header"
+
+#: builtin/log.c:1795
+msgid "add email header"
+msgstr "新增信件頭"
+
+#: builtin/log.c:1796 builtin/log.c:1797
+msgid "email"
+msgstr "信件��"
+
+#: builtin/log.c:1796
+msgid "add To: header"
+msgstr "新增收件人"
+
+#: builtin/log.c:1797
+msgid "add Cc: header"
+msgstr "新增抄�"
+
+#: builtin/log.c:1798
+msgid "ident"
+msgstr "標記"
+
+#: builtin/log.c:1799
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr "將 From ��設定為 <標記>（如若��供，則用�交者 ID �為��）"
+
+#: builtin/log.c:1801
+msgid "message-id"
+msgstr "信件標記"
+
+#: builtin/log.c:1802
+msgid "make first mail a reply to <message-id>"
+msgstr "使第一�信件作為� <信件標記> 的回覆"
+
+#: builtin/log.c:1803 builtin/log.c:1806
+msgid "boundary"
+msgstr "邊界"
+
+#: builtin/log.c:1804
+msgid "attach the patch"
+msgstr "附件方�新增修補檔"
+
+#: builtin/log.c:1807
+msgid "inline the patch"
+msgstr "內�顯示修補檔"
+
+#: builtin/log.c:1811
+msgid "enable message threading, styles: shallow, deep"
+msgstr "啟用信件線索，風格：淺，深"
+
+#: builtin/log.c:1813
+msgid "signature"
+msgstr "簽�"
+
+#: builtin/log.c:1814
+msgid "add a signature"
+msgstr "新增一個簽�"
+
+#: builtin/log.c:1815
+msgid "base-commit"
+msgstr "基礎�交"
+
+#: builtin/log.c:1816
+msgid "add prerequisite tree info to the patch series"
+msgstr "為修補檔列表新增�置樹訊�"
+
+#: builtin/log.c:1819
+msgid "add a signature from a file"
+msgstr "從檔案新增一個簽�"
+
+#: builtin/log.c:1820
+msgid "don't print the patch filenames"
+msgstr "��列�修補檔檔案�"
+
+#: builtin/log.c:1822
+msgid "show progress while generating patches"
+msgstr "在生�修補檔時顯示進度"
+
+#: builtin/log.c:1824
+msgid "show changes against <rev> in cover letter or single patch"
+msgstr "在附函或單個修補檔中顯示和 <rev> 的差異"
+
+#: builtin/log.c:1827
+msgid "show changes against <refspec> in cover letter or single patch"
+msgstr "在附函或單個修補檔中顯示和 <refspec> 的差異"
+
+#: builtin/log.c:1829 builtin/range-diff.c:28
+msgid "percentage by which creation is weighted"
+msgstr "建立權�的百分比"
+
+#: builtin/log.c:1916
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "包�無效的身份標記：%s"
+
+#: builtin/log.c:1931
+msgid "-n and -k are mutually exclusive"
+msgstr "-n 和 -k 互斥"
+
+#: builtin/log.c:1933
+msgid "--subject-prefix/--rfc and -k are mutually exclusive"
+msgstr "--subject-prefix/--rfc 和 -k 互斥"
+
+#: builtin/log.c:1941
+msgid "--name-only does not make sense"
+msgstr "--name-only 無�義"
+
+#: builtin/log.c:1943
+msgid "--name-status does not make sense"
+msgstr "--name-status 無�義"
+
+#: builtin/log.c:1945
+msgid "--check does not make sense"
+msgstr "--check 無�義"
+
+#: builtin/log.c:1967
+msgid "--stdout, --output, and --output-directory are mutually exclusive"
+msgstr "--stdout�--output 和 --output-directory 互斥"
+
+#: builtin/log.c:2089
+msgid "--interdiff requires --cover-letter or single patch"
+msgstr "--interdiff 需� --cover-letter 或單一修補檔"
+
+#: builtin/log.c:2093
+msgid "Interdiff:"
+msgstr "版本間差異："
+
+#: builtin/log.c:2094
+#, c-format
+msgid "Interdiff against v%d:"
+msgstr "� v%d 的版本差異："
+
+#: builtin/log.c:2100
+msgid "--creation-factor requires --range-diff"
+msgstr "--creation-factor 需� --range-diff"
+
+#: builtin/log.c:2104
+msgid "--range-diff requires --cover-letter or single patch"
+msgstr "--range-diff 需� --cover-letter 或單一修補檔"
+
+#: builtin/log.c:2112
+msgid "Range-diff:"
+msgstr "範�差異："
+
+#: builtin/log.c:2113
+#, c-format
+msgid "Range-diff against v%d:"
+msgstr "� v%d 的範�差異："
+
+#: builtin/log.c:2124
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "無法讀�簽�檔案 '%s'"
+
+#: builtin/log.c:2160
+msgid "Generating patches"
+msgstr "生�修補檔"
+
+#: builtin/log.c:2204
+msgid "failed to create output files"
+msgstr "無法建立輸出檔案"
+
+#: builtin/log.c:2263
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<上游> [<頭> [<�制>]]]"
+
+#: builtin/log.c:2317
+#, c-format
+msgid ""
+"Could not find a tracked remote branch, please specify <upstream> manually.\n"
+msgstr "�能找到追蹤的�端分支，請手動指定 <上游>。\n"
+
+#: builtin/ls-files.c:563
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<�項>] [<檔案>...]"
+
+#: builtin/ls-files.c:619
+msgid "identify the file status with tags"
+msgstr "用標籤標記檔案的狀態"
+
+#: builtin/ls-files.c:621
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "使用�寫字�表示 '�設未改變的' 檔案"
+
+#: builtin/ls-files.c:623
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "使用�寫字�表示 'fsmonitor clean' 檔案"
+
+#: builtin/ls-files.c:625
+msgid "show cached files in the output (default)"
+msgstr "顯示快�的檔案（�設）"
+
+#: builtin/ls-files.c:627
+msgid "show deleted files in the output"
+msgstr "顯示已刪除的檔案"
+
+#: builtin/ls-files.c:629
+msgid "show modified files in the output"
+msgstr "顯示已修改的檔案"
+
+#: builtin/ls-files.c:631
+msgid "show other files in the output"
+msgstr "顯示其它檔案"
+
+#: builtin/ls-files.c:633
+msgid "show ignored files in the output"
+msgstr "顯示忽略的檔案"
+
+#: builtin/ls-files.c:636
+msgid "show staged contents' object name in the output"
+msgstr "顯示暫存�內容的物件�稱"
+
+#: builtin/ls-files.c:638
+msgid "show files on the filesystem that need to be removed"
+msgstr "顯示檔案系統需�刪除的檔案"
+
+#: builtin/ls-files.c:640
+msgid "show 'other' directories' names only"
+msgstr "�顯示「其他�目錄的�稱"
+
+#: builtin/ls-files.c:642
+msgid "show line endings of files"
+msgstr "顯示檔案�行符號格�"
+
+#: builtin/ls-files.c:644
+msgid "don't show empty directories"
+msgstr "�顯示空目錄"
+
+#: builtin/ls-files.c:647
+msgid "show unmerged files in the output"
+msgstr "顯示未�併的檔案"
+
+#: builtin/ls-files.c:649
+msgid "show resolve-undo information"
+msgstr "顯示 resolve-undo 訊�"
+
+#: builtin/ls-files.c:651
+msgid "skip files matching pattern"
+msgstr "符�排除檔案的模�"
+
+#: builtin/ls-files.c:654
+msgid "exclude patterns are read from <file>"
+msgstr "從 <檔案> 中讀�排除模�"
+
+#: builtin/ls-files.c:657
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr "從 <檔案> 讀��外的�個目錄的排除模�"
+
+#: builtin/ls-files.c:659
+msgid "add the standard git exclusions"
+msgstr "新增標準的 git 排除"
+
+#: builtin/ls-files.c:663
+msgid "make the output relative to the project top directory"
+msgstr "顯示相�於頂級目錄的檔案�"
+
+#: builtin/ls-files.c:666
+msgid "recurse through submodules"
+msgstr "在�模組中�迴"
+
+#: builtin/ls-files.c:668
+msgid "if any <file> is not in the index, treat this as an error"
+msgstr "如果任何 <檔案> 都�在索引�，視為錯誤"
+
+#: builtin/ls-files.c:669
+msgid "tree-ish"
+msgstr "樹或�交"
+
+#: builtin/ls-files.c:670
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr "��自從 <樹或�交> 之後刪除的路徑�然存在"
+
+#: builtin/ls-files.c:672
+msgid "show debugging data"
+msgstr "顯示除錯資料"
+
+#: builtin/ls-files.c:674
+msgid "suppress duplicate entries"
+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>...]]"
+msgstr ""
+"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 "�列��端 URL"
+
+#: builtin/ls-remote.c:61 builtin/ls-remote.c:63 builtin/rebase.c:1399
+msgid "exec"
+msgstr "exec"
+
+#: builtin/ls-remote.c:62 builtin/ls-remote.c:64
+msgid "path of git-upload-pack on the remote host"
+msgstr "�端主機上的 git-upload-pack 路徑"
+
+#: builtin/ls-remote.c:66
+msgid "limit to tags"
+msgstr "僅�於標籤"
+
+#: builtin/ls-remote.c:67
+msgid "limit to heads"
+msgstr "僅�於分支"
+
+#: builtin/ls-remote.c:68
+msgid "do not show peeled tags"
+msgstr "�顯示已解�的標籤"
+
+#: builtin/ls-remote.c:70
+msgid "take url.<base>.insteadOf into account"
+msgstr "�考 url.<base>.insteadOf 設定"
+
+#: builtin/ls-remote.c:73
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "若未找到符�的引用則以離開碼2離開"
+
+#: builtin/ls-remote.c:76
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "除了顯示指�的物件外，顯示指�的引用�"
+
+#: builtin/ls-tree.c:30
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<�項>] <樹或�交> [<路徑>...]"
+
+#: builtin/ls-tree.c:128
+msgid "only show trees"
+msgstr "�顯示樹"
+
+#: builtin/ls-tree.c:130
+msgid "recurse into subtrees"
+msgstr "�迴到�樹"
+
+#: builtin/ls-tree.c:132
+msgid "show trees when recursing"
+msgstr "當�迴時顯示樹"
+
+#: builtin/ls-tree.c:135
+msgid "terminate entries with NUL byte"
+msgstr "�目以 NUL 字元終止"
+
+#: builtin/ls-tree.c:136
+msgid "include object size"
+msgstr "包括物件大�"
+
+#: builtin/ls-tree.c:138 builtin/ls-tree.c:140
+msgid "list only filenames"
+msgstr "�列出檔案�"
+
+#: builtin/ls-tree.c:143
+msgid "use full path names"
+msgstr "使用檔案的全路徑"
+
+#: builtin/ls-tree.c:145
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr "列出整個樹；�僅僅目�目錄（隱� --full-name）"
+
+#. TRANSLATORS: keep <> in "<" mail ">" info.
+#: builtin/mailinfo.c:14
+msgid "git mailinfo [<options>] <msg> <patch> < mail >info"
+msgstr "git mailinfo [<�項>] <訊�> <修補檔> < mail >info"
+
+#: builtin/mailinfo.c:58
+msgid "keep subject"
+msgstr "�留主旨"
+
+#: builtin/mailinfo.c:60
+msgid "keep non patch brackets in subject"
+msgstr "�留主旨中�是 PATCH 的方括號"
+
+#: builtin/mailinfo.c:62
+msgid "copy Message-ID to the end of commit message"
+msgstr "複製 Message-ID 至�交說明末尾"
+
+#: builtin/mailinfo.c:64
+msgid "re-code metadata to i18n.commitEncoding"
+msgstr "�新將中繼資料編碼為 i18n.commitEncoding 的設定值"
+
+#: 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 "<動作>"
+
+#: builtin/mailinfo.c:74
+msgid "action when quoted CR is found"
+msgstr "當找到�列� CR 字元時所�採�的行為"
+
+#: builtin/mailinfo.c:77
+msgid "use headers in message's body"
+msgstr "在訊�內文中使用標頭"
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "空的 mbox：'%s'"
+
+#: builtin/merge-base.c:32
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <�交> <�交>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <�交>..."
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <�交>..."
+
+#: builtin/merge-base.c:35
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <�交> <�交>"
+
+#: builtin/merge-base.c:36
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <引用> [<�交>]"
+
+#: builtin/merge-base.c:143
+msgid "output all common ancestors"
+msgstr "輸出所有共�的祖先"
+
+#: builtin/merge-base.c:145
+msgid "find ancestors for a single n-way merge"
+msgstr "尋找一個多路�併的祖先�交"
+
+#: builtin/merge-base.c:147
+msgid "list revs not reachable from others"
+msgstr "顯示�能被其他存�到的版本"
+
+#: builtin/merge-base.c:149
+msgid "is the first one ancestor of the other?"
+msgstr "第一個是其他的祖先�交嗎？"
+
+#: builtin/merge-base.c:151
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "根據 <引用> 的引用日誌尋找 <�交> 的�生處"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<�項>] [-L <檔案1> [-L <�始> [-L <�字2>]]] <檔案1> <�始文"
+"件> <檔案2>"
+
+#: builtin/merge-file.c:35
+msgid "send results to standard output"
+msgstr "將�果傳�到標準輸出"
+
+#: builtin/merge-file.c:36
+msgid "use a diff3 based merge"
+msgstr "使用基於 diff3 的�併"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use our version"
+msgstr "如果��，使用我們的版本"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use their version"
+msgstr "如果��，使用他們的版本"
+
+#: builtin/merge-file.c:41
+msgid "for conflicts, use a union version"
+msgstr "如果��，使用��版本"
+
+#: builtin/merge-file.c:44
+msgid "for conflicts, use this marker size"
+msgstr "如果��，使用指定長度的標記"
+
+#: builtin/merge-file.c:45
+msgid "do not warn about conflicts"
+msgstr "��警告��"
+
+#: builtin/merge-file.c:47
+msgid "set labels for file1/orig-file/file2"
+msgstr "為 檔案1/�始檔案/檔案2 設定標籤"
+
+#: builtin/merge-recursive.c:47
+#, c-format
+msgid "unknown option %s"
+msgstr "未知�項 %s"
+
+#: builtin/merge-recursive.c:53
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "�能解�物件 '%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] "無法處� %d �以上的基礎。忽略 %s。"
+
+#: builtin/merge-recursive.c:65
+msgid "not handling anything other than two heads merge."
+msgstr "�能處�兩個頭�併之外的任何動作。"
+
+#: builtin/merge-recursive.c:74 builtin/merge-recursive.c:76
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "無法解�引用 '%s'"
+
+#: builtin/merge-recursive.c:82
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "�併 %s 和 %s\n"
+
+#: builtin/merge.c:58
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<�項>] [<�交>...]"
+
+#: builtin/merge.c:123
+msgid "switch `m' requires a value"
+msgstr "開關 `m' 需�一個值"
+
+#: builtin/merge.c:146
+#, c-format
+msgid "option `%s' requires a value"
+msgstr "�項 `%s' 需�一個值"
+
+#: builtin/merge.c:199
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "�能找到�併策略 '%s'。\n"
+
+#: builtin/merge.c:200
+#, c-format
+msgid "Available strategies are:"
+msgstr "�用的策略有："
+
+#: builtin/merge.c:205
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "�用的自訂策略有："
+
+#: builtin/merge.c:256 builtin/pull.c:133
+msgid "do not show a diffstat at the end of the merge"
+msgstr "在�併的最後�顯示差異統計"
+
+#: builtin/merge.c:259 builtin/pull.c:136
+msgid "show a diffstat at the end of the merge"
+msgstr "在�併的最後顯示差異統計"
+
+#: builtin/merge.c:260 builtin/pull.c:139
+msgid "(synonym to --stat)"
+msgstr "（和 --stat �義）"
+
+#: builtin/merge.c:262 builtin/pull.c:142
+msgid "add (at most <n>) entries from shortlog to merge commit message"
+msgstr "在�併�交說明中新增（最多 <n> �）精簡�交記錄"
+
+#: builtin/merge.c:265 builtin/pull.c:148
+msgid "create a single commit instead of doing a merge"
+msgstr "建立一個單�的�交而�是�一次�併"
+
+#: builtin/merge.c:267 builtin/pull.c:151
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "如果�併�功，執行一次�交（�設）"
+
+#: builtin/merge.c:269 builtin/pull.c:154
+msgid "edit message before committing"
+msgstr "在�交�編輯�交說明"
+
+#: builtin/merge.c:271
+msgid "allow fast-forward (default)"
+msgstr "�許快轉（�設）"
+
+#: builtin/merge.c:273 builtin/pull.c:161
+msgid "abort if fast-forward is not possible"
+msgstr "如果�能快轉就放棄�併"
+
+#: builtin/merge.c:277 builtin/pull.c:164
+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
+msgid "strategy"
+msgstr "ç­–ç•¥"
+
+#: builtin/merge.c:279 builtin/pull.c:169
+msgid "merge strategy to use"
+msgstr "�使用的�併策略"
+
+#: builtin/merge.c:280 builtin/pull.c:172
+msgid "option=value"
+msgstr "option=value"
+
+#: builtin/merge.c:281 builtin/pull.c:173
+msgid "option for selected merge strategy"
+msgstr "所�的�併策略的�項"
+
+#: builtin/merge.c:283
+msgid "merge commit message (for a non-fast-forward merge)"
+msgstr "�併的�交說明（���快轉��併）"
+
+#: builtin/merge.c:290
+msgid "abort the current in-progress merge"
+msgstr "放棄目�正在進行的�併"
+
+#
+#: builtin/merge.c:292
+msgid "--abort but leave index and working tree alone"
+msgstr "--abort，但是�留索引和工作�"
+
+#: builtin/merge.c:294
+msgid "continue the current in-progress merge"
+msgstr "繼續目�正在進行的�併"
+
+#: builtin/merge.c:296 builtin/pull.c:180
+msgid "allow merging unrelated histories"
+msgstr "�許�並�相關的歷�"
+
+#: builtin/merge.c:303
+msgid "bypass pre-merge-commit and commit-msg hooks"
+msgstr "繞� pre-merge-commit 和 commit-msg 掛鉤"
+
+#: builtin/merge.c:320
+msgid "could not run stash."
+msgstr "�能執行儲�。"
+
+#: builtin/merge.c:325
+msgid "stash failed"
+msgstr "儲�失敗"
+
+#: builtin/merge.c:330
+#, c-format
+msgid "not a valid object: %s"
+msgstr "�是一個有效物件：%s"
+
+#: builtin/merge.c:352 builtin/merge.c:369
+msgid "read-tree failed"
+msgstr "讀�樹失敗"
+
+#  譯者：請維��導空格
+#: builtin/merge.c:400
+msgid "Already up to date. (nothing to squash)"
+msgstr "已經是最新的。（無需壓縮 (squash)）"
+
+#: builtin/merge.c:414
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "壓縮�交 -- 未更新 HEAD\n"
+
+#: builtin/merge.c:464
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "無�併訊� -- 未更新 HEAD\n"
+
+#: builtin/merge.c:515
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' 沒有指�一個�交"
+
+#: builtin/merge.c:603
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "壞的 branch.%s.mergeoptions 字串：%s"
+
+#: builtin/merge.c:729
+msgid "Not handling anything other than two heads merge."
+msgstr "未處�兩個頭�併之外的任何動作。"
+
+#: builtin/merge.c:742
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "merge-recursive 的未知�項：-X%s"
+
+#: builtin/merge.c:761 t/helper/test-fast-rebase.c:223
+#, c-format
+msgid "unable to write %s"
+msgstr "�能寫 %s"
+
+#: builtin/merge.c:813
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "�能從 '%s' 讀�"
+
+#: builtin/merge.c:822
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr "未�交�並，使用 'git commit' 完�此次�併。\n"
+
+#: 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"
+"\n"
+msgstr ""
+"請輸入一個�交說明以解釋此�併的必�性，尤其是將一個更新後的上游分支\n"
+"�併到主題分支。\n"
+"\n"
+
+#: builtin/merge.c:833
+msgid "An empty message aborts the commit.\n"
+msgstr "空的�交說明會終止�交。\n"
+
+#: builtin/merge.c:836
+#, 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:889
+msgid "Empty commit message."
+msgstr "空�交說明。"
+
+#: builtin/merge.c:904
+#, c-format
+msgid "Wonderful.\n"
+msgstr "太棒了。\n"
+
+#: builtin/merge.c:965
+#, c-format
+msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
+msgstr "自動�併失敗，修正��然後�交修正的�果。\n"
+
+#: builtin/merge.c:1004
+msgid "No current branch."
+msgstr "沒有目�分支。"
+
+#: builtin/merge.c:1006
+msgid "No remote for the current branch."
+msgstr "目�分支沒有�應的�端版本庫。"
+
+#: builtin/merge.c:1008
+msgid "No default upstream defined for the current branch."
+msgstr "目�分支沒有定義�設的上游分支。"
+
+#: builtin/merge.c:1013
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "�於 %s 沒有來自 %s 的�端追蹤分支"
+
+#: builtin/merge.c:1070
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "環境 '%2$s' 中存在壞的�值 '%1$s'"
+
+#: builtin/merge.c:1173
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "�能在 %s 中�併：%s"
+
+#: builtin/merge.c:1207
+msgid "not something we can merge"
+msgstr "�能�併"
+
+#: builtin/merge.c:1317
+msgid "--abort expects no arguments"
+msgstr "--abort �帶�數"
+
+#: builtin/merge.c:1321
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "沒有�終止的�併（MERGE_HEAD �失）。"
+
+#: builtin/merge.c:1339
+msgid "--quit expects no arguments"
+msgstr "--quit �帶�數"
+
+#: builtin/merge.c:1352
+msgid "--continue expects no arguments"
+msgstr "--continue �帶�數"
+
+#: builtin/merge.c:1356
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "沒有進行中的�併（MERGE_HEAD �失）。"
+
+#: builtin/merge.c:1372
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"您尚未��您的�併（存在 MERGE_HEAD）。\n"
+"請在�併�先�交您的修改。"
+
+#: builtin/merge.c:1379
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"您尚未��您的��（存在 CHERRY_PICK_HEAD）。\n"
+"請在�併�先�交您的修改。"
+
+#: builtin/merge.c:1382
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "您尚未��您的��（存在 CHERRY_PICK_HEAD）。"
+
+#: builtin/merge.c:1396
+msgid "You cannot combine --squash with --no-ff."
+msgstr "您�能將 --squash 和 --no-ff 組�使用。"
+
+#: builtin/merge.c:1398
+msgid "You cannot combine --squash with --commit."
+msgstr "您�能將 --squash 和 --commit 組�使用。"
+
+#: builtin/merge.c:1414
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr "未指定�交並且 merge.defaultToUpstream 未設定。"
+
+#: builtin/merge.c:1431
+msgid "Squash commit into empty head not supported yet"
+msgstr "尚�支�到空分支的壓縮�交"
+
+#: builtin/merge.c:1433
+msgid "Non-fast-forward commit does not make sense into an empty head"
+msgstr "到空分支的�快轉��交沒有�義"
+
+#: builtin/merge.c:1438
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - �能被�併"
+
+#: builtin/merge.c:1440
+msgid "Can merge only exactly one commit into empty head"
+msgstr "�能將一個�交�並到空分支上"
+
+#: builtin/merge.c:1521
+msgid "refusing to merge unrelated histories"
+msgstr "拒絕�併無關的歷�"
+
+#: builtin/merge.c:1540
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "æ›´æ–° %s..%s\n"
+
+#: builtin/merge.c:1587
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "嘗試�常�的索引內�併...\n"
+
+#: builtin/merge.c:1594
+#, c-format
+msgid "Nope.\n"
+msgstr "無。\n"
+
+#: builtin/merge.c:1625
+msgid "Not possible to fast-forward, aborting."
+msgstr "無法快轉，終止。"
+
+#: builtin/merge.c:1653 builtin/merge.c:1719
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "將樹回滾至原始狀態...\n"
+
+#: builtin/merge.c:1657
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "嘗試�併策略 %s...\n"
+
+#: builtin/merge.c:1709
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "沒有�併策略處�此�併。\n"
+
+#: builtin/merge.c:1711
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "使用策略 %s �併失敗。\n"
+
+#: builtin/merge.c:1721
+#, c-format
+msgid "Using the %s strategy to prepare resolving by hand.\n"
+msgstr "使用 %s 策略，準備自行解決。\n"
+
+#: builtin/merge.c:1735
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr "自動�併進展順利，按�求在�交��止\n"
+
+#: builtin/mktag.c:10
+msgid "git mktag"
+msgstr "git mktag"
+
+#: builtin/mktag.c:27
+#, c-format
+msgid "warning: tag input does not pass fsck: %s"
+msgstr "警告：標籤輸入未通� fsck：%s"
+
+#: builtin/mktag.c:38
+#, c-format
+msgid "error: tag input does not pass fsck: %s"
+msgstr "錯誤：標籤輸入未通� fsck：%s"
+
+#: builtin/mktag.c:41
+#, c-format
+msgid "%d (FSCK_IGNORE?) should never trigger this callback"
+msgstr "%d (FSCK_IGNORE?) �應觸發這個回呼函�"
+
+#: builtin/mktag.c:56
+#, c-format
+msgid "could not read tagged object '%s'"
+msgstr "無法讀�有標籤的物件「%s�"
+
+#: builtin/mktag.c:59
+#, c-format
+msgid "object '%s' tagged as '%s', but is a '%s' type"
+msgstr "「%s�已標為「%s�，但�是「%s�類型"
+
+#: builtin/mktag.c:97
+msgid "tag on stdin did not pass our strict fsck check"
+msgstr "stdin 上的標籤未通�我們的嚴格 fsck 檢查"
+
+#: builtin/mktag.c:100
+msgid "tag on stdin did not refer to a valid object"
+msgstr "標準輸入上的標籤�考的�是有效物件"
+
+#: builtin/mktag.c:103 builtin/tag.c:243
+msgid "unable to write tag file"
+msgstr "無法寫標籤檔案"
+
+#: builtin/mktree.c:66
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:154
+msgid "input is NUL terminated"
+msgstr "輸入以 NUL 字元終止"
+
+#: builtin/mktree.c:155 builtin/write-tree.c:26
+msgid "allow missing objects"
+msgstr "�許�失的物件"
+
+#: builtin/mktree.c:156
+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=<包>]"
+
+#: builtin/multi-pack-index.c:13
+msgid "git multi-pack-index [<options>] verify"
+msgstr "git multi-pack-index [<�項>] verify"
+
+#: builtin/multi-pack-index.c:16
+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>] repack [--batch-size=<size>]"
+msgstr "git multi-pack-index [<�項>] repack [--batch-size=<大�>]"
+
+#: builtin/multi-pack-index.c:54
+msgid "object directory containing set of packfile and pack-index pairs"
+msgstr "包��� packfile 和包索引的物件目錄"
+
+#: builtin/multi-pack-index.c:69
+msgid "preferred-pack"
+msgstr "�好包"
+
+#: builtin/multi-pack-index.c:70
+msgid "pack for reuse when computing a multi-pack bitmap"
+msgstr "計算多包�圖時��複使用的包"
+
+#: 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 "在 repack 期間，將較�尺寸的包檔案收集到大於此大�的批次中"
+
+#: builtin/multi-pack-index.c:179
+#, c-format
+msgid "unrecognized subcommand: %s"
+msgstr "未識別的�指令：%s"
+
+#: builtin/mv.c:18
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<�項>] <�>... <目標>"
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "目錄 %s 在索引中並且�是�模組？"
+
+#: builtin/mv.c:85
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr "請將您的修改暫存到 .gitmodules 中或儲�後�繼續"
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s 在索引中"
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "強制移動/�指令，�使目標存在"
+
+#: builtin/mv.c:127
+msgid "skip move/rename errors"
+msgstr "略�移動/�新命�錯誤"
+
+#: builtin/mv.c:170
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "目標 '%s' �是一個目錄"
+
+#: builtin/mv.c:181
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "檢查 '%s' 到 '%s' 的�新命�\n"
+
+#: builtin/mv.c:185
+msgid "bad source"
+msgstr "壞的�"
+
+#: builtin/mv.c:188
+msgid "can not move directory into itself"
+msgstr "�能將目錄移動到自身"
+
+#: builtin/mv.c:191
+msgid "cannot move directory over file"
+msgstr "�能將目錄移動到檔案"
+
+#: builtin/mv.c:200
+msgid "source directory is empty"
+msgstr "�目錄為空"
+
+#: builtin/mv.c:225
+msgid "not under version control"
+msgstr "�在版本控制之下"
+
+#: builtin/mv.c:227
+msgid "conflicted"
+msgstr "��"
+
+#: builtin/mv.c:230
+msgid "destination exists"
+msgstr "目標已存在"
+
+#: builtin/mv.c:238
+#, c-format
+msgid "overwriting '%s'"
+msgstr "覆蓋 '%s'"
+
+#: builtin/mv.c:241
+msgid "Cannot overwrite"
+msgstr "�能覆蓋"
+
+#: builtin/mv.c:244
+msgid "multiple sources for the same target"
+msgstr "�一目標具有多個�"
+
+#: builtin/mv.c:246
+msgid "destination directory does not exist"
+msgstr "目標目錄�存在"
+
+#: builtin/mv.c:253
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s，�=%s，目標=%s"
+
+#: builtin/mv.c:274
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "�新命� %s 至 %s\n"
+
+#: builtin/mv.c:280 builtin/remote.c:785 builtin/repack.c:667
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "�新命� '%s' 失敗"
+
+#: builtin/name-rev.c:465
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<�項>] <�交>..."
+
+#: builtin/name-rev.c:466
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<�項>] --all"
+
+#: builtin/name-rev.c:467
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<�項>] --stdin"
+
+#: builtin/name-rev.c:524
+msgid "print only ref-based names (no object names)"
+msgstr "�輸出基於�考的�稱 (沒有物件�稱)"
+
+#: builtin/name-rev.c:525
+msgid "only use tags to name the commits"
+msgstr "�使用標籤來命��交"
+
+#: builtin/name-rev.c:527
+msgid "only use refs matching <pattern>"
+msgstr "�使用和 <模�> 相符�的引用"
+
+#: builtin/name-rev.c:529
+msgid "ignore refs matching <pattern>"
+msgstr "忽略和 <模�> 相符�的引用"
+
+#: builtin/name-rev.c:531
+msgid "list all commits reachable from all refs"
+msgstr "列出�以從所有引用存�的�交"
+
+#: builtin/name-rev.c:532
+msgid "read from stdin"
+msgstr "從標準輸入讀�"
+
+#: builtin/name-rev.c:533
+msgid "allow to print `undefined` names (default)"
+msgstr "�許列� `未定義` 的�稱（�設）"
+
+#: builtin/name-rev.c:539
+msgid "dereference tags in the input (internal use)"
+msgstr "��解�輸入中的標籤（內部使用）"
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <註解引用>] [list [<物件>]]"
+
+#: 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 <註解引用>] add [-f] [--allow-empty] [-m <說明> | -F <檔案> "
+"| (-c | -C) <物件>] [<物件>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr "git notes [--ref <註解引用>] copy [-f] <�物件> <目標物件>"
+
+#: 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 <註解引用>] append [--allow-empty] [-m <說明> | -F <檔案> | "
+"(-c | -C) <物件>] [<物件>]"
+
+#: builtin/notes.c:32
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr "git notes [--ref <註解引用>] edit [--allow-empty] [<物件>]"
+
+#: builtin/notes.c:33
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <註解引用>] show [<物件>]"
+
+#: builtin/notes.c:34
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr "git notes [--ref <註解引用>] merge [-v | -q] [-s <策略> ] <註解引用>"
+
+#: builtin/notes.c:35
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
+
+#: builtin/notes.c:36
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <註解引用>] remove [<物件>...]"
+
+#: builtin/notes.c:38
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <註解引用>] prune [-n] [-v]"
+
+#: builtin/notes.c:39
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <註解引用>] get-ref"
+
+#: builtin/notes.c:44
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<物件>]]"
+
+#: builtin/notes.c:49
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<�項>] [<物件>]"
+
+#: builtin/notes.c:54
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<�項>] <�物件> <目標物件>"
+
+#: builtin/notes.c:55
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<�物件> <目標物件>]..."
+
+#: builtin/notes.c:60
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<�項>] [<物件>]"
+
+#: builtin/notes.c:65
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<物件>]"
+
+#: builtin/notes.c:70
+msgid "git notes show [<object>]"
+msgstr "git notes show [<物件>]"
+
+#: builtin/notes.c:75
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<�項>] <註解引用>"
+
+#: builtin/notes.c:76
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<�項>]"
+
+#: builtin/notes.c:77
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<�項>]"
+
+#: builtin/notes.c:82
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<物件>]"
+
+#: builtin/notes.c:87
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<�項>]"
+
+#: builtin/notes.c:92
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
+
+#: builtin/notes.c:97
+msgid "Write/edit the notes for the following object:"
+msgstr "為下�的物件寫/編輯說明："
+
+#: builtin/notes.c:150
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "�能為物件 '%s' 開始 'show'"
+
+#: builtin/notes.c:154
+msgid "could not read 'show' output"
+msgstr "�能讀� 'show' 的輸出"
+
+#: builtin/notes.c:162
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "無法為物件 '%s' 完� 'show'"
+
+#: builtin/notes.c:197
+msgid "please supply the note contents using either -m or -F option"
+msgstr "請�� -m 或 -F �項為註解�供內容"
+
+#: builtin/notes.c:206
+msgid "unable to write note object"
+msgstr "�能寫註解物件"
+
+#: builtin/notes.c:208
+#, c-format
+msgid "the note contents have been left in %s"
+msgstr "註解內容被留在 %s 中"
+
+#: builtin/notes.c:242 builtin/tag.c:576
+#, 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
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "無法解� '%s' 為一個有效引用。"
+
+#: builtin/notes.c:265
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "讀�物件 '%s' 失敗。"
+
+#: builtin/notes.c:268
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "�能從�資料物件 '%s' 中讀�註解資料。"
+
+#: builtin/notes.c:309
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "格�錯誤的輸入行：'%s'。"
+
+#: builtin/notes.c:324
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "從 '%s' 複製註解到 '%s' 時失敗"
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:356
+#, 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
+msgid "too many arguments"
+msgstr "太多�數"
+
+#: builtin/notes.c:389 builtin/notes.c:678
+#, c-format
+msgid "no note found for object %s."
+msgstr "未發�物件 %s 的註解。"
+
+#: builtin/notes.c:410 builtin/notes.c:576
+msgid "note contents as a string"
+msgstr "註解內容作為一個字串"
+
+#: builtin/notes.c:413 builtin/notes.c:579
+msgid "note contents in a file"
+msgstr "註解內容到一個檔案中"
+
+#: builtin/notes.c:416 builtin/notes.c:582
+msgid "reuse and edit specified note object"
+msgstr "�用和編輯指定的註解物件"
+
+#: builtin/notes.c:419 builtin/notes.c:585
+msgid "reuse specified note object"
+msgstr "�用指定的註解物件"
+
+#: builtin/notes.c:422 builtin/notes.c:588
+msgid "allow storing empty note"
+msgstr "�許儲存空白備註"
+
+#: builtin/notes.c:423 builtin/notes.c:496
+msgid "replace existing notes"
+msgstr "�代已存在的註解"
+
+#: builtin/notes.c:448
+#, 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
+#, 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
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "刪除物件 %s 的註解\n"
+
+#: builtin/notes.c:497
+msgid "read objects from stdin"
+msgstr "從標準輸入讀�物件"
+
+#: builtin/notes.c:499
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "�新載入 <命令> 的設定（隱� --stdin）"
+
+#: builtin/notes.c:517
+msgid "too few arguments"
+msgstr "太少�數"
+
+#: builtin/notes.c:538
+#, 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
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "�物件 %s 缺少註解。�能複製。"
+
+#: builtin/notes.c:603
+#, 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 ""
+"�指令 'edit' 的�項 -m/-F/-c/-C 已棄用。\n"
+"請�用 'git notes add -f -m/-F/-c/-C'。\n"
+
+#: builtin/notes.c:698
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "刪除引用 NOTES_MERGE_PARTIAL 失敗"
+
+#: builtin/notes.c:700
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "刪除引用 NOTES_MERGE_REF 失敗"
+
+#: builtin/notes.c:702
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "刪除 'git notes merge' 工作�失敗"
+
+#: builtin/notes.c:722
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "讀�引用 NOTES_MERGE_PARTIAL 失敗"
+
+#: builtin/notes.c:724
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "無法從 NOTES_MERGE_PARTIAL 中找到�交。"
+
+#: builtin/notes.c:726
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "無法從 NOTES_MERGE_PARTIAL 中解��交。"
+
+#: builtin/notes.c:739
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "解� NOTES_MERGE_REF 失敗"
+
+#: builtin/notes.c:742
+msgid "failed to finalize notes merge"
+msgstr "無法完�註解�併"
+
+#: builtin/notes.c:768
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "未知的註解�併策略 %s"
+
+#: builtin/notes.c:784
+msgid "General options"
+msgstr "通用�項"
+
+#: builtin/notes.c:786
+msgid "Merge options"
+msgstr "�併�項"
+
+#: builtin/notes.c:788
+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
+msgid "Committing unmerged notes"
+msgstr "�交未�併的註解"
+
+#: builtin/notes.c:792
+msgid "finalize notes merge by committing unmerged notes"
+msgstr "���交未�併的註解來完�註解�併"
+
+#: builtin/notes.c:794
+msgid "Aborting notes merge resolution"
+msgstr "中止註解�併的方案"
+
+#: builtin/notes.c:796
+msgid "abort notes merge"
+msgstr "中止註解�併"
+
+#: builtin/notes.c:807
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "�能混用 --commit�--abort 或 -s/--strategy"
+
+#: builtin/notes.c:812
+msgid "must specify a notes ref to merge"
+msgstr "必須指定一個註解引用來�併"
+
+#: builtin/notes.c:836
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "未知的 -s/--strategy：%s"
+
+#: builtin/notes.c:873
+#, c-format
+msgid "a notes merge into %s is already in-progress at %s"
+msgstr "�於 %2$s 的一個到 %1$s 中的註解�併正在執行中"
+
+#: builtin/notes.c:876
+#, c-format
+msgid "failed to store link to current notes ref (%s)"
+msgstr "無法儲存連�到目�的註解引用（%s）"
+
+#: builtin/notes.c:878
+#, 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 ""
+"自動�併說明失敗。修改 %s 中的��並且使用指令 'git notes merge --commit' �"
+"交�果，或者使用指令 'git notes merge --abort' 終止�併。\n"
+
+#: builtin/notes.c:897 builtin/tag.c:589
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "無法解� '%s' 為一個有效引用。"
+
+#: builtin/notes.c:900
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "物件 %s 沒有註解\n"
+
+#: builtin/notes.c:912
+msgid "attempt to remove non-existent note is not an error"
+msgstr "嘗試刪除�存在的註解�是一個錯誤"
+
+#: builtin/notes.c:915
+msgid "read object names from the standard input"
+msgstr "從標準輸入讀�物件�稱"
+
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:146
+msgid "do not remove, show only"
+msgstr "�刪除，�顯示"
+
+#: builtin/notes.c:955
+msgid "report pruned notes"
+msgstr "報告清除的註解"
+
+#: builtin/notes.c:998
+msgid "notes-ref"
+msgstr "註解引用"
+
+#: builtin/notes.c:999
+msgid "use notes from <notes-ref>"
+msgstr "從 <註解引用> 使用註解"
+
+#: builtin/notes.c:1034 builtin/stash.c:1735
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr "未知�指令：%s"
+
+#: builtin/pack-objects.c:182
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr "git pack-objects --stdout [<�項>...] [< <引用列表> | < <物件列表>]"
+
+#: builtin/pack-objects.c:183
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr "git pack-objects [<�項>...] <�綴�稱> [< <引用列表> | < <物件列表>]"
+
+#: 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：無法定� %1$s，�期在 %3$s 包中的 %2$<PRIuMAX> �移�"
+
+#: builtin/pack-objects.c:580
+#, c-format
+msgid "bad packed object CRC for %s"
+msgstr "%s 錯的包物件 CRC"
+
+#: builtin/pack-objects.c:591
+#, c-format
+msgid "corrupt packed object for %s"
+msgstr "%s �壞的包物件"
+
+#: builtin/pack-objects.c:722
+#, c-format
+msgid "recursive delta detected for object %s"
+msgstr "發�物件 %s �迴 delta"
+
+#: builtin/pack-objects.c:941
+#, c-format
+msgid "ordered %u objects, expected %<PRIu32>"
+msgstr "排�了 %u 個物件，�期 %<PRIu32> 個"
+
+#: 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:1155
+msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
+msgstr "�用 bitmap 寫入，因為 pack.packSizeLimit 設定使得包被切分為多個"
+
+#: builtin/pack-objects.c:1168
+msgid "Writing objects"
+msgstr "寫入物件中"
+
+#: builtin/pack-objects.c:1229 builtin/update-index.c:90
+#, c-format
+msgid "failed to stat %s"
+msgstr "� %s 呼� stat 失敗"
+
+#: builtin/pack-objects.c:1281
+#, c-format
+msgid "wrote %<PRIu32> objects while expecting %<PRIu32>"
+msgstr "寫入 %<PRIu32> 個物件而�期 %<PRIu32> 個"
+
+#: builtin/pack-objects.c:1523
+msgid "disabling bitmap writing, as some objects are not being packed"
+msgstr "�用 bitmap 寫入，因為一些物件將�會被打包"
+
+#: builtin/pack-objects.c:1971
+#, c-format
+msgid "delta base offset overflow in pack for %s"
+msgstr "%s 壓縮中 delta 基準�移越界"
+
+#: builtin/pack-objects.c:1980
+#, c-format
+msgid "delta base offset out of bound for %s"
+msgstr "%s 的 delta 基準�移越界"
+
+#: builtin/pack-objects.c:2261
+msgid "Counting objects"
+msgstr "物件計數中"
+
+#: builtin/pack-objects.c:2426
+#, c-format
+msgid "unable to parse object header of %s"
+msgstr "無法解�物件 %s 標頭訊�"
+
+#: builtin/pack-objects.c:2496 builtin/pack-objects.c:2512
+#: builtin/pack-objects.c:2522
+#, c-format
+msgid "object %s cannot be read"
+msgstr "物件 %s 無法讀�"
+
+#: builtin/pack-objects.c:2499 builtin/pack-objects.c:2526
+#, c-format
+msgid "object %s inconsistent object length (%<PRIuMAX> vs %<PRIuMAX>)"
+msgstr "物件 %s �一致的物件長度（%<PRIuMAX> vs %<PRIuMAX>）"
+
+#: builtin/pack-objects.c:2536
+msgid "suboptimal pack - out of memory"
+msgstr "次優（suboptimal）打包 - 記憶體�足"
+
+#: builtin/pack-objects.c:2851
+#, c-format
+msgid "Delta compression using up to %d threads"
+msgstr "使用 %d 個執行緒進行壓縮"
+
+#: builtin/pack-objects.c:2990
+#, c-format
+msgid "unable to pack objects reachable from tag %s"
+msgstr "無法為標籤 %s 壓縮物件"
+
+#: builtin/pack-objects.c:3076
+msgid "Compressing objects"
+msgstr "壓縮物件中"
+
+#: builtin/pack-objects.c:3082
+msgid "inconsistency with delta count"
+msgstr "�一致的差異計數"
+
+#: 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 ""
+"uploadpack.blobpackfileuri 的值格�必須為 '<object-hash> <pack-hash> "
+"<uri>' (收到 '%s')"
+
+#: builtin/pack-objects.c:3164
+#, c-format
+msgid ""
+"object already configured in another uploadpack.blobpackfileuri (got '%s')"
+msgstr "物件已經在其他 uploadpack.blobpackfileuri 設定� (收到 '%s')"
+
+#: builtin/pack-objects.c:3199
+#, c-format
+msgid "could not get type of object %s in pack %s"
+msgstr "無法�得 %2$s 包中 %1$s 物件的類型"
+
+#: builtin/pack-objects.c:3321 builtin/pack-objects.c:3335
+#, c-format
+msgid "could not find pack '%s'"
+msgstr "找�到「%s�包"
+
+#: builtin/pack-objects.c:3378
+#, c-format
+msgid ""
+"expected edge object ID, got garbage:\n"
+" %s"
+msgstr ""
+"�期邊界物件（edge object）ID，�得到垃圾資料：\n"
+" %s"
+
+#: builtin/pack-objects.c:3384
+#, c-format
+msgid ""
+"expected object ID, got garbage:\n"
+" %s"
+msgstr ""
+"�期物件 ID，�得到垃圾資料：\n"
+" %s"
+
+#: builtin/pack-objects.c:3482
+msgid "invalid value for --missing"
+msgstr "�項 --missing 的值無效"
+
+#: builtin/pack-objects.c:3541 builtin/pack-objects.c:3650
+msgid "cannot open pack index"
+msgstr "無法開啟包檔案索引"
+
+#: builtin/pack-objects.c:3572
+#, c-format
+msgid "loose object at %s could not be examined"
+msgstr "無法檢查 %s 處的鬆散物件"
+
+#: builtin/pack-objects.c:3658
+msgid "unable to force loose object"
+msgstr "無法強制鬆散物件"
+
+#: builtin/pack-objects.c:3788
+#, c-format
+msgid "not a rev '%s'"
+msgstr "�是一個版本 '%s'"
+
+#: builtin/pack-objects.c:3791 builtin/rev-parse.c:1061
+#, c-format
+msgid "bad revision '%s'"
+msgstr "壞的版本 '%s'"
+
+#: builtin/pack-objects.c:3819
+msgid "unable to add recent objects"
+msgstr "無法新增最近的物件"
+
+#: builtin/pack-objects.c:3872
+#, c-format
+msgid "unsupported index version %s"
+msgstr "�支�的索引版本 %s"
+
+#: builtin/pack-objects.c:3876
+#, c-format
+msgid "bad index version '%s'"
+msgstr "壞的索引版本 '%s'"
+
+#: builtin/pack-objects.c:3915
+msgid "<version>[,<offset>]"
+msgstr "<版本>[,<�移>]"
+
+#: builtin/pack-objects.c:3916
+msgid "write the pack index file in the specified idx format version"
+msgstr "用指定的 idx 格�版本來寫包索引檔案"
+
+#: builtin/pack-objects.c:3919
+msgid "maximum size of each output pack file"
+msgstr "�個輸出包的最大尺寸"
+
+#: builtin/pack-objects.c:3921
+msgid "ignore borrowed objects from alternate object store"
+msgstr "忽略從備用物件儲存裡借用物件"
+
+#: builtin/pack-objects.c:3923
+msgid "ignore packed objects"
+msgstr "忽略包物件"
+
+#: builtin/pack-objects.c:3925
+msgid "limit pack window by objects"
+msgstr "�制打包視窗的物件數"
+
+#: builtin/pack-objects.c:3927
+msgid "limit pack window by memory in addition to object limit"
+msgstr "除物件數��制外設定打包視窗的記憶體�制"
+
+#: builtin/pack-objects.c:3929
+msgid "maximum length of delta chain allowed in the resulting pack"
+msgstr "打包�許的 delta �的最大長度"
+
+#: builtin/pack-objects.c:3931
+msgid "reuse existing deltas"
+msgstr "�用已存在的 deltas"
+
+#: builtin/pack-objects.c:3933
+msgid "reuse existing objects"
+msgstr "�用已存在的物件"
+
+#: builtin/pack-objects.c:3935
+msgid "use OFS_DELTA objects"
+msgstr "使用 OFS_DELTA 物件"
+
+#: builtin/pack-objects.c:3937
+msgid "use threads when searching for best delta matches"
+msgstr "使用執行緒查詢最佳 delta 符�"
+
+#: builtin/pack-objects.c:3939
+msgid "do not create an empty pack output"
+msgstr "�建立空的包輸出"
+
+#: builtin/pack-objects.c:3941
+msgid "read revision arguments from standard input"
+msgstr "從標準輸入讀�版本號�數"
+
+#: builtin/pack-objects.c:3943
+msgid "limit the objects to those that are not yet packed"
+msgstr "�制那些尚未打包的物件"
+
+#: builtin/pack-objects.c:3946
+msgid "include objects reachable from any reference"
+msgstr "包括�以從任何引用存�到的物件"
+
+#: builtin/pack-objects.c:3949
+msgid "include objects referred by reflog entries"
+msgstr "包括被引用日誌引用到的物件"
+
+#: builtin/pack-objects.c:3952
+msgid "include objects referred to by the index"
+msgstr "包括被索引引用到的物件"
+
+#: builtin/pack-objects.c:3955
+msgid "read packs from stdin"
+msgstr "從標準輸入中讀�包"
+
+#: builtin/pack-objects.c:3957
+msgid "output pack to stdout"
+msgstr "輸出包到標準輸出"
+
+#: builtin/pack-objects.c:3959
+msgid "include tag objects that refer to objects to be packed"
+msgstr "包括那些引用了待打包物件的標籤物件"
+
+#: builtin/pack-objects.c:3961
+msgid "keep unreachable objects"
+msgstr "維�無法�得的物件"
+
+#: builtin/pack-objects.c:3963
+msgid "pack loose unreachable objects"
+msgstr "打包鬆散的無法�得物件"
+
+#: builtin/pack-objects.c:3965
+msgid "unpack unreachable objects newer than <time>"
+msgstr "將比�供 <時間> 新的無法存�的物件解包"
+
+#: builtin/pack-objects.c:3968
+msgid "use the sparse reachability algorithm"
+msgstr "使用稀��以�得性演算法"
+
+#: builtin/pack-objects.c:3970
+msgid "create thin packs"
+msgstr "建立精簡包"
+
+#: builtin/pack-objects.c:3972
+msgid "create packs suitable for shallow fetches"
+msgstr "建立��淺複製版本庫�得的包"
+
+#: builtin/pack-objects.c:3974
+msgid "ignore packs that have companion .keep file"
+msgstr "忽略�有 .keep 檔案的包"
+
+#: builtin/pack-objects.c:3976
+msgid "ignore this pack"
+msgstr "忽略該 pack"
+
+#: builtin/pack-objects.c:3978
+msgid "pack compression level"
+msgstr "打包壓縮級別"
+
+#: builtin/pack-objects.c:3980
+msgid "do not hide commits by grafts"
+msgstr "顯示被移�隱�的�交"
+
+#: builtin/pack-objects.c:3982
+msgid "use a bitmap index if available to speed up counting objects"
+msgstr "使用 bitmap 索引（如果有的話）以�高物件計數時的速度"
+
+#: builtin/pack-objects.c:3984
+msgid "write a bitmap index together with the pack index"
+msgstr "在建立包索引的�時建立 bitmap 索引"
+
+#: builtin/pack-objects.c:3988
+msgid "write a bitmap index if possible"
+msgstr "如果�能，寫 bitmap 索引"
+
+#: builtin/pack-objects.c:3992
+msgid "handling for missing objects"
+msgstr "處��失的物件"
+
+#: builtin/pack-objects.c:3995
+msgid "do not pack objects in promisor packfiles"
+msgstr "��打包 promisor packfile 中的物件"
+
+#: builtin/pack-objects.c:3997
+msgid "respect islands during delta compression"
+msgstr "在增�壓縮時�考資料島"
+
+#: builtin/pack-objects.c:3999
+msgid "protocol"
+msgstr "通訊�定"
+
+#: builtin/pack-objects.c:4000
+msgid "exclude any configured uploadpack.blobpackfileuri with this protocol"
+msgstr "排除任何設定�，使用此通訊�定的 uploadpack.blobpackfileuri"
+
+#: builtin/pack-objects.c:4033
+#, c-format
+msgid "delta chain depth %d is too deep, forcing %d"
+msgstr "增��深度 %d 太深了，強制為 %d"
+
+#: builtin/pack-objects.c:4038
+#, c-format
+msgid "pack.deltaCacheLimit is too high, forcing %d"
+msgstr "設定 pack.deltaCacheLimit 太高了，強制為 %d"
+
+#: builtin/pack-objects.c:4094
+msgid "--max-pack-size cannot be used to build a pack for transfer"
+msgstr "�能使用 --max-pack-size 來組建傳輸用的包檔案"
+
+#: builtin/pack-objects.c:4096
+msgid "minimum pack size limit is 1 MiB"
+msgstr "最�的包檔案大�是 1 MiB"
+
+#: builtin/pack-objects.c:4101
+msgid "--thin cannot be used to build an indexable pack"
+msgstr "--thin �能用於建立一個�索引包"
+
+#: builtin/pack-objects.c:4104
+msgid "--keep-unreachable and --unpack-unreachable are incompatible"
+msgstr "--keep-unreachable 和 --unpack-unreachable �相容"
+
+#: builtin/pack-objects.c:4110
+msgid "cannot use --filter without --stdout"
+msgstr "�能在沒有 --stdout 的情�下使用 --filter"
+
+#: builtin/pack-objects.c:4112
+msgid "cannot use --filter with --stdin-packs"
+msgstr "無法將 --filter � --stdin-packs ��使用"
+
+#: builtin/pack-objects.c:4116
+msgid "cannot use internal rev list with --stdin-packs"
+msgstr "無法將內部版本清單與 --stdin-packs ��使用"
+
+#: builtin/pack-objects.c:4175
+msgid "Enumerating objects"
+msgstr "枚舉物件"
+
+#: builtin/pack-objects.c:4212
+#, c-format
+msgid ""
+"Total %<PRIu32> (delta %<PRIu32>), reused %<PRIu32> (delta %<PRIu32>), pack-"
+"reused %<PRIu32>"
+msgstr ""
+"總共 %<PRIu32> (差異 %<PRIu32>)，復用 %<PRIu32> (差異 %<PRIu32>)，�用包 "
+"%<PRIu32>"
+
+#: 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 ""
+"「git pack-redundant�已被��準備移除。\n"
+"如果您�在使用這�命令，請在命令列多加一個�項\n"
+"「--i-still-use-this�，然後寄�電�信到\n"
+"<git@vger.kernel.org> 讓我們知�您還在使用。\n"
+"感�。\n"
+
+#: builtin/pack-refs.c:8
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<�項>]"
+
+#: builtin/pack-refs.c:16
+msgid "pack everything"
+msgstr "打包一切"
+
+#: builtin/pack-refs.c:17
+msgid "prune loose refs (default)"
+msgstr "清除鬆散的引用（�設）"
+
+#: 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
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <時間>] [--] [<head>...]"
+
+#: builtin/prune.c:133
+msgid "report pruned objects"
+msgstr "報告清除的物件"
+
+#: builtin/prune.c:136
+msgid "expire objects older than <time>"
+msgstr "使早於�供時間的物件�期"
+
+#: builtin/prune.c:138
+msgid "limit traversal to objects outside promisor packfiles"
+msgstr "�制�歷 promisor packfile 以外的物件"
+
+#: builtin/prune.c:152
+msgid "cannot prune in a precious-objects repo"
+msgstr "�能在��版本庫中執行清�動作"
+
+#: builtin/pull.c:45 builtin/pull.c:47
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "%s 的值無效：%s"
+
+#: builtin/pull.c:67
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr "git pull [<�項>] [<版本庫> [<引用�格>...]]"
+
+#: builtin/pull.c:123
+msgid "control for recursive fetching of submodules"
+msgstr "控制�模組的�迴�得"
+
+#: builtin/pull.c:127
+msgid "Options related to merging"
+msgstr "和�併相關的�項"
+
+#: builtin/pull.c:130
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "使用�定基底動作�代�併動作以套用修改"
+
+#: builtin/pull.c:158 builtin/rebase.c:491 builtin/revert.c:126
+msgid "allow fast-forward"
+msgstr "�許快轉�"
+
+#: builtin/pull.c:167 parse-options.h:340
+msgid "automatically stash/stash pop before and after"
+msgstr "在動作�後執行自動儲�和彈出儲�"
+
+#: builtin/pull.c:183
+msgid "Options related to fetching"
+msgstr "和�得相關的�數"
+
+#: builtin/pull.c:193
+msgid "force overwrite of local branch"
+msgstr "強制覆蓋本機分支"
+
+#: builtin/pull.c:201
+msgid "number of submodules pulled in parallel"
+msgstr "並行拉�的�模組數�"
+
+#: builtin/pull.c:317
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "pull.ff 的�值無效：%s"
+
+#: builtin/pull.c:445
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr "在您剛剛�得到的引用中沒有�定基底動作的候�。"
+
+#: builtin/pull.c:447
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr "在您剛剛�得到的引用中沒有�併動作的候�。"
+
+#: builtin/pull.c:448
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr "通常這�味著您�供了一�用字元引用�格但未能和�端符�。"
+
+#: 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 ""
+"您�求從�端 '%s' 拉�，但是未指定一個分支。因為這�是目�\n"
+"分支�設的�端版本庫，您必須在指令列中指定一個分支�。"
+
+#: builtin/pull.c:456 builtin/rebase.c:1248
+msgid "You are not currently on a branch."
+msgstr "您目��在一個分支上。"
+
+#: builtin/pull.c:458 builtin/pull.c:473
+msgid "Please specify which branch you want to rebase against."
+msgstr "請指定您��定基底到哪一個分支。"
+
+#: builtin/pull.c:460 builtin/pull.c:475
+msgid "Please specify which branch you want to merge with."
+msgstr "請指定您��併哪一個分支。"
+
+#: builtin/pull.c:461 builtin/pull.c:476
+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
+msgid "<remote>"
+msgstr "<�端>"
+
+#: builtin/pull.c:463 builtin/pull.c:478 builtin/pull.c:483
+msgid "<branch>"
+msgstr "<分支>"
+
+#: builtin/pull.c:471 builtin/rebase.c:1246
+msgid "There is no tracking information for the current branch."
+msgstr "目�分支沒有追蹤訊�。"
+
+#: builtin/pull.c:480
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr "如果您想�為此分支建立追蹤訊�，您�以執行："
+
+#: 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 ""
+"您的設定中指定��併�端的引用 '%s'，\n"
+"但是沒有�得到這個引用。"
+
+#: builtin/pull.c:596
+#, c-format
+msgid "unable to access commit %s"
+msgstr "無法存��交 %s"
+
+#: builtin/pull.c:902
+msgid "ignoring --verify-signatures for rebase"
+msgstr "為�定基底動作忽略 --verify-signatures"
+
+#: 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 ""
+"�建議在尚未指定�離分支的�併策略的情�下拉�。\n"
+"您�以在下一次呼� pull 命令�執行下述命令\n"
+"以隱�此訊�：\n"
+"\n"
+"  git config pull.rebase false  # �併（�設策略）\n"
+"  git config pull.rebase true   # �定基底\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:990
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "更新尚未誕生的分支，變更新增至索引。"
+
+#: builtin/pull.c:994
+msgid "pull with rebase"
+msgstr "�定基底�拉�"
+
+#: builtin/pull.c:995
+msgid "please commit or stash them."
+msgstr "請�交或儲�它們。"
+
+#: builtin/pull.c:1020
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"fetch 更新了目�的分支。快轉您的工作�\n"
+"至�交 %s。"
+
+#: builtin/pull.c:1026
+#, c-format
+msgid ""
+"Cannot fast-forward your working tree.\n"
+"After making sure that you saved anything precious from\n"
+"$ git diff %s\n"
+"output, run\n"
+"$ git reset --hard\n"
+"to recover."
+msgstr ""
+"您目�的工作�無法執行快轉動作。\n"
+"首先執行如下指令：\n"
+"$ git diff %s\n"
+"以確�所有有用的資料�已儲存。然後執行下�的指令\n"
+"$ git reset --hard\n"
+"復原之�的狀態。"
+
+#: builtin/pull.c:1041
+msgid "Cannot merge multiple branches into empty head."
+msgstr "無法將多個分支�併到空分支。"
+
+#: builtin/pull.c:1045
+msgid "Cannot rebase onto multiple branches."
+msgstr "無法�定基底到多個分支。"
+
+#: 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 [<�項>] [<版本庫> [<引用�格>...]]"
+
+#: builtin/push.c:111
+msgid "tag shorthand without <tag>"
+msgstr "標籤後�未�供 <標籤> �數"
+
+#: builtin/push.c:119
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete �接�簡單的目標引用�"
+
+#: builtin/push.c:164
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"為了永久地�擇任一�項，�見 'git help config' 中的 push.default。"
+
+#: builtin/push.c:167
+#, c-format
+msgid ""
+"The upstream branch of your current branch does not match\n"
+"the name of your current branch.  To push to the upstream branch\n"
+"on the remote, use\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"To push to the branch of the same name on the remote, use\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+msgstr ""
+"您目�分支的上游分支和您目�分支��符�，為推�到�端的上游分支，\n"
+"使用\n"
+"\n"
+"    git push %s HEAD:%s\n"
+"\n"
+"為推�至�端��分支，使用\n"
+"\n"
+"    git push %s HEAD\n"
+"%s"
+
+#: builtin/push.c:182
+#, c-format
+msgid ""
+"You are not currently on a branch.\n"
+"To push the history leading to the current (detached HEAD)\n"
+"state now, use\n"
+"\n"
+"    git push %s HEAD:<name-of-remote-branch>\n"
+msgstr ""
+"您目��在一個分支上。\n"
+"�在為推�目�（分離開頭指標）的歷�，使用\n"
+"\n"
+"    git push %s HEAD:<�端分支�字>\n"
+
+#: builtin/push.c:191
+#, c-format
+msgid ""
+"The current branch %s has no upstream branch.\n"
+"To push the current branch and set the remote as upstream, use\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+msgstr ""
+"目�分支 %s 沒有�應的上游分支。\n"
+"為推�目�分支並建立與�端上游的追蹤，使用\n"
+"\n"
+"    git push --set-upstream %s %s\n"
+
+#: builtin/push.c:199
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr "目�分支 %s 有多個上游分支，拒絕推�。"
+
+#: 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"
+"your current branch '%s', without telling me what to push\n"
+"to update which remote branch."
+msgstr ""
+"您正推�至�端 '%s'（其並�目�分支 '%s' 的上游），\n"
+"而沒有告訴我�推�什麼�更新哪個�端分支。"
+
+#: 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 ""
+"更新被拒絕，因為您目�分支的最新�交�後於其�應的�端分支。\n"
+"�次推��，先與�端變更�併（如 'git pull ...'）。詳見\n"
+"'git push --help' 中的 'Note about fast-forwards' �節。"
+
+#: 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 ""
+"更新被拒絕，因為推�的一個分支的最新�交�後於其�應的�端分支。\n"
+"簽出該分支並整��端變更（如 'git pull ...'），然後�推�。詳見\n"
+"'git push --help' 中的 'Note about fast-forwards' �節。"
+
+#: 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"
+"to the same ref. You may want to first integrate the remote changes\n"
+"(e.g., 'git pull ...') before pushing again.\n"
+"See the 'Note about fast-forwards' in 'git push --help' for details."
+msgstr ""
+"因為�端版本庫包�您本機尚�存在的�交，而導致更新被拒絕。這通常是因為�外\n"
+"一個版本庫已�該引用進行了推�。�次推��，您�能需�先整��端變更\n"
+"（如 'git pull ...'）。\n"
+"詳見 'git push --help' 中的 'Note about fast-forwards' �節。"
+
+#: builtin/push.c:277
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr "更新被拒絕，因為該標籤在�端已經存在。"
+
+#: 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 ""
+"如果�使用 '--force' �數，您�能更新一個指���交物件的�端引用，\n"
+"也�能更新�端引用讓其指�一個��交物件。\n"
+
+#: 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 ""
+"更新被拒，因為�端追蹤分支的最新指�繼上次簽出後有更新。\n"
+"您�能會希望先將這些變更整�至本地（例如：‘git pull …’)\n"
+"最後�強制更新。\n"
+
+#: builtin/push.c:355
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "推�到 %s\n"
+
+#: builtin/push.c:362
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "推�一些引用到 '%s' 失敗"
+
+#: builtin/push.c:544
+msgid "repository"
+msgstr "版本庫"
+
+#: builtin/push.c:545 builtin/send-pack.c:189
+msgid "push all refs"
+msgstr "推�所有引用"
+
+#: builtin/push.c:546 builtin/send-pack.c:191
+msgid "mirror all refs"
+msgstr "��所有引用"
+
+#: builtin/push.c:548
+msgid "delete refs"
+msgstr "刪除引用"
+
+#: builtin/push.c:549
+msgid "push tags (can't be used with --all or --mirror)"
+msgstr "推�標籤（�能使用 --all or --mirror）"
+
+#: builtin/push.c:552 builtin/send-pack.c:192
+msgid "force updates"
+msgstr "強制更新"
+
+#: builtin/push.c:553 builtin/send-pack.c:204
+msgid "<refname>:<expect>"
+msgstr "<引用�>:<期望值>"
+
+#: builtin/push.c:554 builtin/send-pack.c:205
+msgid "require old value of ref to be at this value"
+msgstr "�求引用舊的�值為設定值"
+
+#: builtin/push.c:557 builtin/send-pack.c:208
+msgid "require remote updates to be integrated locally"
+msgstr "需�將�端更新整�進本地"
+
+#: builtin/push.c:560
+msgid "control recursive pushing of submodules"
+msgstr "控制�模組的�迴推�"
+
+#: builtin/push.c:561 builtin/send-pack.c:199
+msgid "use thin pack"
+msgstr "使用精簡打包"
+
+#: builtin/push.c:562 builtin/push.c:563 builtin/send-pack.c:186
+#: builtin/send-pack.c:187
+msgid "receive pack program"
+msgstr "接收包程�"
+
+#: builtin/push.c:564
+msgid "set upstream for git pull/status"
+msgstr "設定 git pull/status 的上游"
+
+#: builtin/push.c:567
+msgid "prune locally removed refs"
+msgstr "清除本機刪除的引用"
+
+#: builtin/push.c:569
+msgid "bypass pre-push hook"
+msgstr "繞� pre-push 掛鉤"
+
+#: builtin/push.c:570
+msgid "push missing but relevant tags"
+msgstr "推�缺少但有關的標籤"
+
+#: builtin/push.c:572 builtin/send-pack.c:193
+msgid "GPG sign the push"
+msgstr "用 GPG 為推�簽�"
+
+#: builtin/push.c:574 builtin/send-pack.c:200
+msgid "request atomic transaction on remote side"
+msgstr "需��端支�原�事務"
+
+#: builtin/push.c:592
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete 與 --all�--mirror � --tags �相容"
+
+#: builtin/push.c:594
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete 未接任何引用沒有�義"
+
+#: builtin/push.c:614
+#, c-format
+msgid "bad repository '%s'"
+msgstr "壞的版本庫 '%s'"
+
+#: 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"
+"\n"
+"    git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+"    git push <name>\n"
+msgstr ""
+"沒有設定推�目標。\n"
+"或��指令列指定 URL，或用下�指令設定一個�端版本庫\n"
+"\n"
+"    git remote add <�稱> <��>\n"
+"\n"
+"然後使用該�端版本庫�執行推�\n"
+"\n"
+"    git push <�稱>\n"
+
+#: builtin/push.c:630
+msgid "--all and --tags are incompatible"
+msgstr "--all 和 --tags �相容"
+
+#: builtin/push.c:632
+msgid "--all can't be combined with refspecs"
+msgstr "--all �能和引用�格�時使用"
+
+#: builtin/push.c:636
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror 和 --tags �相容"
+
+#: builtin/push.c:638
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror �能和引用�格�時使用"
+
+#: builtin/push.c:641
+msgid "--all and --mirror are incompatible"
+msgstr "--all 和 --mirror �相容"
+
+#: builtin/push.c:648
+msgid "push options must not have new line characters"
+msgstr "推��項�能有�行符號"
+
+#: builtin/range-diff.c:9
+msgid "git range-diff [<options>] <old-base>..<old-tip> <new-base>..<new-tip>"
+msgstr "git range-diff [<�項>] <old-base>..<old-tip> <new-base>..<new-tip>"
+
+#: builtin/range-diff.c:10
+msgid "git range-diff [<options>] <old-tip>...<new-tip>"
+msgstr "git range-diff [<�項>] <old-tip>...<new-tip>"
+
+#: builtin/range-diff.c:11
+msgid "git range-diff [<options>] <base> <old-tip> <new-tip>"
+msgstr "git range-diff [<�項>] <base> <old-tip> <new-tip>"
+
+#: builtin/range-diff.c:30
+msgid "use simple diff colors"
+msgstr "使用簡單差異�色"
+
+#: builtin/range-diff.c:32
+msgid "notes"
+msgstr "註解"
+
+#: builtin/range-diff.c:32
+msgid "passed to 'git log'"
+msgstr "傳�給 'git log'"
+
+#: builtin/range-diff.c:35
+msgid "only emit output related to the first range"
+msgstr "�發出跟第一個範�相關的輸出"
+
+#: builtin/range-diff.c:37
+msgid "only emit output related to the second range"
+msgstr "�發出跟第二個範�相關的輸出"
+
+#: builtin/range-diff.c:60 builtin/range-diff.c:64
+#, c-format
+msgid "not a commit range: '%s'"
+msgstr "�是�交範�：「%s�"
+
+#: builtin/range-diff.c:74
+msgid "single arg format must be symmetric range"
+msgstr "單個�數格�必須是�稱範�（�包�...）"
+
+#: builtin/range-diff.c:89
+msgid "need two commit ranges"
+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>]])"
+msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<�綴>) [-"
+"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<檔案>] (--empty | <樹狀物件1> [<樹狀物件2> [<樹狀物件3>]])"
+
+#: builtin/read-tree.c:124
+msgid "write resulting index to <file>"
+msgstr "將索引�果寫入 <檔案>"
+
+#: builtin/read-tree.c:127
+msgid "only empty the index"
+msgstr "�是清空索引"
+
+#: builtin/read-tree.c:129
+msgid "Merging"
+msgstr "�併"
+
+#: builtin/read-tree.c:131
+msgid "perform a merge in addition to a read"
+msgstr "讀�之餘�執行一個�併"
+
+#: builtin/read-tree.c:133
+msgid "3-way merge if no file level merging required"
+msgstr "如果沒有檔案級�併需�，執行三方�併"
+
+#: builtin/read-tree.c:135
+msgid "3-way merge in presence of adds and removes"
+msgstr "存在新增和刪除時，也執行三方�併"
+
+#: builtin/read-tree.c:137
+msgid "same as -m, but discard unmerged entries"
+msgstr "類似於 -m，但�棄未�併的�目"
+
+#: builtin/read-tree.c:138
+msgid "<subdirectory>/"
+msgstr "<�目錄>/"
+
+#: builtin/read-tree.c:139
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "讀�樹狀物件到索引的 <�目錄>/ 下"
+
+#: builtin/read-tree.c:142
+msgid "update working tree with merge result"
+msgstr "用�併的�果更新工作�"
+
+#: builtin/read-tree.c:144
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:145
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "�許忽略檔案中設定的檔案�以被覆蓋"
+
+#: builtin/read-tree.c:148
+msgid "don't check the working tree after merging"
+msgstr "�併後�檢查工作�"
+
+#: builtin/read-tree.c:149
+msgid "don't update the index or the work tree"
+msgstr "�更新索引�和工作�"
+
+#: builtin/read-tree.c:151
+msgid "skip applying sparse checkout filter"
+msgstr "略�套用稀�簽出�濾器"
+
+#: builtin/read-tree.c:153
+msgid "debug unpack-trees"
+msgstr "除錯 unpack-trees"
+
+#: builtin/read-tree.c:157
+msgid "suppress feedback messages"
+msgstr "抑制回饋訊�"
+
+#: builtin/read-tree.c:188
+msgid "You need to resolve your current index first"
+msgstr "您需�先解決目�索引的��"
+
+#: builtin/rebase.c:35
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase> | --keep-base] "
+"[<upstream> [<branch>]]"
+msgstr ""
+"git rebase [-i] [options] [--exec <命令>] [--onto <新基礎> | --keep-base] [<"
+"上游> [<分支>]]"
+
+#: builtin/rebase.c:37
+msgid ""
+"git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]"
+msgstr ""
+"git rebase [-i] [�項] [--exec <命令>] [--onto <新基礎>] --root [<分支>]"
+
+#: 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 "��用的待辦列表：'%s'"
+
+#: builtin/rebase.c:311
+#, c-format
+msgid "could not create temporary %s"
+msgstr "無法建立暫時的 %s"
+
+#: builtin/rebase.c:317
+msgid "could not mark as interactive"
+msgstr "無法標記為互動�"
+
+#: builtin/rebase.c:370
+msgid "could not generate todo list"
+msgstr "無法生�待辦列表"
+
+#: builtin/rebase.c:412
+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
+#, c-format
+msgid "%s requires the merge backend"
+msgstr "%s 需��併後端"
+
+#: builtin/rebase.c:625
+#, c-format
+msgid "could not get 'onto': '%s'"
+msgstr "無法�得 'onto'：'%s'"
+
+#: builtin/rebase.c:642
+#, c-format
+msgid "invalid orig-head: '%s'"
+msgstr "無效的原始 head：'%s'"
+
+#: builtin/rebase.c:667
+#, c-format
+msgid "ignoring invalid allow_rerere_autoupdate: '%s'"
+msgstr "忽略無效的 allow_rerere_autoupdate：'%s'"
+
+#: 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"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
+msgstr ""
+"手動解決所有��，執行 \"git add/rm <��的檔案>\" 標記\n"
+"��已解決，然後執行 \"git rebase --continue\"。您也�以執行\n"
+"\"git rebase --skip\" 指令略�這個�交。如果想�終止執行並回到\n"
+"\"git rebase\" 執行之�的狀態，執行 \"git rebase --abort\"。"
+
+#: builtin/rebase.c:896
+#, c-format
+msgid ""
+"\n"
+"git encountered an error while preparing the patches to replay\n"
+"these revisions:\n"
+"\n"
+"    %s\n"
+"\n"
+"As a result, git cannot rebase them."
+msgstr ""
+"\n"
+"在為�放這些版本而準備修補檔時，git �到了一個錯誤：\n"
+"\n"
+"    %s\n"
+"\n"
+"因此 git 無法�其�定基底。"
+
+#: builtin/rebase.c:1222
+#, c-format
+msgid ""
+"unrecognized empty type '%s'; valid values are \"drop\", \"keep\", and \"ask"
+"\"."
+msgstr "無法識別的 '%s' 空類型；有效的數值有 \"drop\"�\"keep\" 跟 \"ask\"。"
+
+#: builtin/rebase.c:1240
+#, c-format
+msgid ""
+"%s\n"
+"Please specify which branch you want to rebase against.\n"
+"See git-rebase(1) for details.\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+msgstr ""
+"%s\n"
+"請指定您��定基底到哪個分支。\n"
+"詳見 git-rebase(1)。\n"
+"\n"
+"    git rebase '<branch>'\n"
+"\n"
+
+#: builtin/rebase.c:1256
+#, c-format
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+msgstr ""
+"如果您想�為此分支建立追蹤訊�，您�以執行：\n"
+"\n"
+"    git branch --set-upstream-to=%s/<branch> %s\n"
+"\n"
+
+#: builtin/rebase.c:1286
+msgid "exec commands cannot contain newlines"
+msgstr "exec 指令�能包��行符號"
+
+#: builtin/rebase.c:1290
+msgid "empty exec command"
+msgstr "空的 exec 指令"
+
+#: builtin/rebase.c:1319
+msgid "rebase onto given branch instead of upstream"
+msgstr "�定基底到�供的分支而�上游"
+
+#: builtin/rebase.c:1321
+msgid "use the merge-base of upstream and branch as the current base"
+msgstr "使用上游和分支的�併基礎�為目�基礎"
+
+#: builtin/rebase.c:1323
+msgid "allow pre-rebase hook to run"
+msgstr "�許執行 pre-rebase 掛鉤"
+
+#: builtin/rebase.c:1325
+msgid "be quiet. implies --no-stat"
+msgstr "安�。暗示 --no-stat"
+
+#: builtin/rebase.c:1331
+msgid "do not show diffstat of what changed upstream"
+msgstr "�顯示上游變化的差異統計"
+
+#: builtin/rebase.c:1334
+msgid "add a Signed-off-by trailer to each commit"
+msgstr "在�個�交�尾加入 Signed-off-by"
+
+#: builtin/rebase.c:1337
+msgid "make committer date match author date"
+msgstr "使�交日期與製作日期相符�"
+
+#: builtin/rebase.c:1339
+msgid "ignore author date and use current date"
+msgstr "忽略製作日期而使用日�日期"
+
+#: builtin/rebase.c:1341
+msgid "synonym of --reset-author-date"
+msgstr "和 --reset-author-date �義"
+
+#: builtin/rebase.c:1343 builtin/rebase.c:1347
+msgid "passed to 'git apply'"
+msgstr "傳�給 'git apply'"
+
+#: builtin/rebase.c:1345
+msgid "ignore changes in whitespace"
+msgstr "忽略空白字元中的變更"
+
+#: builtin/rebase.c:1349 builtin/rebase.c:1352
+msgid "cherry-pick all commits, even if unchanged"
+msgstr "��所有�交，�使未修改"
+
+#: builtin/rebase.c:1354
+msgid "continue"
+msgstr "繼續"
+
+#: builtin/rebase.c:1357
+msgid "skip current patch and continue"
+msgstr "略�目�修補檔並繼續"
+
+#  譯者：請維��導空格
+#: builtin/rebase.c:1359
+msgid "abort and check out the original branch"
+msgstr "終止並簽出原有分支"
+
+#: builtin/rebase.c:1362
+msgid "abort but keep HEAD where it is"
+msgstr "終止但�� HEAD �變"
+
+#: builtin/rebase.c:1363
+msgid "edit the todo list during an interactive rebase"
+msgstr "在互動��定基底中編輯待辦列表"
+
+#: builtin/rebase.c:1366
+msgid "show the patch file being applied or merged"
+msgstr "顯示正在套用或�併的修補檔案"
+
+#: builtin/rebase.c:1369
+msgid "use apply strategies to rebase"
+msgstr "使用套用策略進行�定基底"
+
+#: builtin/rebase.c:1373
+msgid "use merging strategies to rebase"
+msgstr "使用�併策略進行�定基底"
+
+#: builtin/rebase.c:1377
+msgid "let the user edit the list of commits to rebase"
+msgstr "讓使用者編輯��定基底的�交列表"
+
+#: builtin/rebase.c:1381
+msgid "(DEPRECATED) try to recreate merges instead of ignoring them"
+msgstr "（已棄用）嘗試�建�併�交而�忽略它們"
+
+#: builtin/rebase.c:1386
+msgid "how to handle commits that become empty"
+msgstr "處�空白�交的方�"
+
+#: builtin/rebase.c:1393
+msgid "move commits that begin with squash!/fixup! under -i"
+msgstr "在 -i 互動模�下，移動以 squash!/fixup! 開頭的�交"
+
+#: builtin/rebase.c:1400
+msgid "add exec lines after each commit of the editable list"
+msgstr "�編輯列表的�一個�交下�增加一行 exec"
+
+#: builtin/rebase.c:1404
+msgid "allow rebasing commits with empty messages"
+msgstr "�許��空�交說明的�交�定基底"
+
+#: builtin/rebase.c:1408
+msgid "try to rebase merges instead of skipping them"
+msgstr "嘗試��併�交�定基底而�是忽略它們"
+
+#: builtin/rebase.c:1411
+msgid "use 'merge-base --fork-point' to refine upstream"
+msgstr "使用 'merge-base --fork-point' 來最佳化上游"
+
+#: builtin/rebase.c:1413
+msgid "use the given merge strategy"
+msgstr "使用�供的�併策略"
+
+#: builtin/rebase.c:1415 builtin/revert.c:115
+msgid "option"
+msgstr "�項"
+
+#: builtin/rebase.c:1416
+msgid "pass the argument through to the merge strategy"
+msgstr "將�數傳�給�併策略"
+
+#: builtin/rebase.c:1419
+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 "看起來 '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' 組�使用"
+
+#: builtin/rebase.c:1494
+msgid "cannot combine '--root' with '--fork-point'"
+msgstr "�能將 '--root' 和 '--fork-point' ��使用"
+
+#: builtin/rebase.c:1497
+msgid "No rebase in progress?"
+msgstr "沒有正在進行的�定基底？"
+
+#: builtin/rebase.c:1501
+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:122
+msgid "Cannot read HEAD"
+msgstr "�能讀� HEAD"
+
+#: builtin/rebase.c:1536
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"您必須編輯所有的�併��，然後�� git add\n"
+"指令將它們標記為已解決"
+
+#: builtin/rebase.c:1555
+msgid "could not discard worktree changes"
+msgstr "無法�棄工作�變更"
+
+#: builtin/rebase.c:1574
+#, c-format
+msgid "could not move back to %s"
+msgstr "無法移回 %s"
+
+#: 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"
+"case, please try\n"
+"\t%s\n"
+"If that is not the case, please\n"
+"\t%s\n"
+"and run me again.  I am stopping in case you still have something\n"
+"valuable there.\n"
+msgstr ""
+"似乎已有一個 %s 目錄，我懷疑您正處於�外一個�定基底動作�程中。\n"
+"如果是這樣，請執行\n"
+"\t%s\n"
+"如果�是這樣，請執行\n"
+"\t%s\n"
+"然後��新執行。 為���失��資料，我已經�止目�動作。\n"
+
+#: builtin/rebase.c:1648
+msgid "switch `C' expects a numerical value"
+msgstr "開關 `C' 期望一個數字值"
+
+#: builtin/rebase.c:1690
+#, c-format
+msgid "Unknown mode: %s"
+msgstr "未知模�：%s"
+
+#: builtin/rebase.c:1729
+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:1772
+#, c-format
+msgid "Unknown rebase backend: %s"
+msgstr "未知 rebase 後端：%s"
+
+#: builtin/rebase.c:1802
+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
+#, c-format
+msgid "invalid upstream '%s'"
+msgstr "無效的上游 '%s'"
+
+#: builtin/rebase.c:1856
+msgid "Could not create new root commit"
+msgstr "�能建立新的根�交"
+
+#: builtin/rebase.c:1882
+#, c-format
+msgid "'%s': need exactly one merge base with branch"
+msgstr "'%s'：�需�與分支的一個�併基礎"
+
+#: builtin/rebase.c:1885
+#, c-format
+msgid "'%s': need exactly one merge base"
+msgstr "'%s'：�需�一個�併基礎"
+
+#: builtin/rebase.c:1893
+#, c-format
+msgid "Does not point to a valid commit '%s'"
+msgstr "沒有指�一個有效的�交 '%s'"
+
+#: builtin/rebase.c:1921
+#, c-format
+msgid "fatal: no such branch/commit '%s'"
+msgstr "致命錯誤：無此分支/�交 '%s'"
+
+#: builtin/rebase.c:1929 builtin/submodule--helper.c:39
+#: builtin/submodule--helper.c:2431
+#, c-format
+msgid "No such ref: %s"
+msgstr "沒有這樣的引用：%s"
+
+#: builtin/rebase.c:1940
+msgid "Could not resolve HEAD to a revision"
+msgstr "無法將 HEAD 解�為一個版本"
+
+#: builtin/rebase.c:1961
+msgid "Please commit or stash them."
+msgstr "請�交或儲�修改。"
+
+#: builtin/rebase.c:1997
+#, c-format
+msgid "could not switch to %s"
+msgstr "無法切�到 %s"
+
+#: builtin/rebase.c:2008
+msgid "HEAD is up to date."
+msgstr "HEAD 是最新的。"
+
+#: builtin/rebase.c:2010
+#, c-format
+msgid "Current branch %s is up to date.\n"
+msgstr "目�分支 %s 是最新的。\n"
+
+#: builtin/rebase.c:2018
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD 是最新的，強制�定基底。"
+
+#: builtin/rebase.c:2020
+#, c-format
+msgid "Current branch %s is up to date, rebase forced.\n"
+msgstr "目�分支 %s 是最新的，強制�定基底。\n"
+
+#: builtin/rebase.c:2028
+msgid "The pre-rebase hook refused to rebase."
+msgstr "pre-rebase 掛鉤拒絕了�定基底動作。"
+
+#: builtin/rebase.c:2035
+#, c-format
+msgid "Changes to %s:\n"
+msgstr "到 %s 的變更：\n"
+
+#: builtin/rebase.c:2038
+#, c-format
+msgid "Changes from %s to %s:\n"
+msgstr "從 %s 到 %s 的變更：\n"
+
+#: builtin/rebase.c:2063
+#, c-format
+msgid "First, rewinding head to replay your work on top of it...\n"
+msgstr "首先，還原開頭指標以便在其上�放您的工作...\n"
+
+#: builtin/rebase.c:2072
+msgid "Could not detach HEAD"
+msgstr "無法分離開頭指標"
+
+#: builtin/rebase.c:2081
+#, c-format
+msgid "Fast-forwarded %s to %s.\n"
+msgstr "快轉 %s 到 %s。\n"
+
+#: builtin/receive-pack.c:34
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <版本庫目錄>"
+
+#: 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"
+"with what you pushed, and will require 'git reset --hard' to match\n"
+"the work tree to HEAD.\n"
+"\n"
+"You can set the 'receive.denyCurrentBranch' configuration variable\n"
+"to 'ignore' or 'warn' in the remote repository to allow pushing into\n"
+"its current branch; however, this is not recommended unless you\n"
+"arranged to update its work tree to match what you pushed in some\n"
+"other way.\n"
+"\n"
+"To squelch this message and still keep the default behaviour, set\n"
+"'receive.denyCurrentBranch' configuration variable to 'refuse'."
+msgstr ""
+"�設�止更新�純版本庫的目�分支，因為您推�的內容將導致索引和工作�\n"
+"�一致，並且將需�執行 'git reset --hard' 將工作�符�到 HEAD。\n"
+"\n"
+"您�以在�端版本庫中設定 'receive.denyCurrentBranch' 設定變數為\n"
+"'ignore' 或 'warn' 以�許推�到目�分支。然而�推薦這麼�，除�您\n"
+"用�種方�將其工作�更新至您推�的狀態。\n"
+"\n"
+"若��鎖此訊�且���設行為，設定 'receive.denyCurrentBranch'\n"
+"設定變數為 'refuse'。"
+
+#: 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"
+"\n"
+"You can set 'receive.denyDeleteCurrent' configuration variable to\n"
+"'warn' or 'ignore' in the remote repository to allow deleting the\n"
+"current branch, with or without a warning message.\n"
+"\n"
+"To squelch this message, you can set it to 'refuse'."
+msgstr ""
+"�設�止刪除目�分支，因為下一次 'git clone' 將�會簽出任何檔案，\n"
+"導致困惑。\n"
+"\n"
+"您�以在�端版本庫中設定 'receive.denyDeleteCurrent' 設定變數為\n"
+"'warn'（顯示警告訊�）或 'ignore'（忽略警告訊�）以�許刪除目�分支。\n"
+"\n"
+"若��鎖此訊�，您�以設定它為 'refuse'。"
+
+#: builtin/receive-pack.c:2478
+msgid "quiet"
+msgstr "�默模�"
+
+#: builtin/receive-pack.c:2492
+msgid "You must specify a directory."
+msgstr "您必須指定一個目錄。"
+
+#: builtin/reflog.c:17
+msgid ""
+"git reflog expire [--expire=<time>] [--expire-unreachable=<time>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] "
+"<refs>..."
+msgstr ""
+"git reflog expire [--expire=<時間>] [--expire-unreachable=<時間>] [--"
+"rewrite] [--updateref] [--stale-fix] [--dry-run | -n] [--verbose] [--all] <引"
+"用>..."
+
+#: 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] <引"
+"用>..."
+
+#: builtin/reflog.c:25
+msgid "git reflog exists <ref>"
+msgstr "git reflog exists <引用>"
+
+#: builtin/reflog.c:568 builtin/reflog.c:573
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' �是一個有效的時間戳"
+
+#: builtin/reflog.c:609
+#, c-format
+msgid "Marking reachable objects..."
+msgstr "正在標記�以�得物件..."
+
+#: builtin/reflog.c:647
+#, c-format
+msgid "%s points nowhere!"
+msgstr "%s 指��存在�"
+
+#: builtin/reflog.c:699
+msgid "no reflog specified to delete"
+msgstr "未指定�刪除的引用日誌"
+
+#: builtin/reflog.c:708
+#, c-format
+msgid "not a reflog: %s"
+msgstr "�是一個引用日誌：%s"
+
+#: builtin/reflog.c:713
+#, c-format
+msgid "no reflog for '%s'"
+msgstr "沒有 '%s' 的引用日誌"
+
+#: builtin/reflog.c:759
+#, c-format
+msgid "invalid ref format: %s"
+msgstr "無效的引用格�：%s"
+
+#: builtin/reflog.c:768
+msgid "git reflog [ show | expire | delete | exists ]"
+msgstr "git reflog [ show | expire | delete | exists ]"
+
+#: builtin/remote.c:17
+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 <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <�稱> <��>"
+
+#: builtin/remote.c:19 builtin/remote.c:39
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <舊�稱> <新�稱>"
+
+#: builtin/remote.c:20 builtin/remote.c:44
+msgid "git remote remove <name>"
+msgstr "git remote remove <�稱>"
+
+#: builtin/remote.c:21 builtin/remote.c:49
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <�稱> (-a | --auto | -d | --delete | <分支>)"
+
+#: builtin/remote.c:22
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <�稱>"
+
+#: builtin/remote.c:23
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <�稱>"
+
+#: builtin/remote.c:24
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr "git remote [-v | --verbose] update [-p | --prune] [(<組> | <�端>)...]"
+
+#: builtin/remote.c:25
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <�稱> <分支>..."
+
+#: builtin/remote.c:26 builtin/remote.c:75
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <�稱>"
+
+#: builtin/remote.c:27 builtin/remote.c:80
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <�稱> <新的��> [<舊的��>]"
+
+#: builtin/remote.c:28 builtin/remote.c:81
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <�稱> <新的��>"
+
+#: builtin/remote.c:29 builtin/remote.c:82
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <�稱> <��>"
+
+#: builtin/remote.c:34
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<�項>] <�稱> <��>"
+
+#: builtin/remote.c:54
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <�稱> <分支>..."
+
+#: builtin/remote.c:55
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <�稱> <分支>..."
+
+#: builtin/remote.c:60
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<�項>] <�稱>"
+
+#: builtin/remote.c:65
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<�項>] <�稱>"
+
+#: builtin/remote.c:70
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<�項>] [<組> | <�端>]..."
+
+#: builtin/remote.c:99
+#, c-format
+msgid "Updating %s"
+msgstr "更新 %s 中"
+
+#: builtin/remote.c:131
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"--mirror �項�險且�時，請使用 --mirror=fetch\n"
+"\t 或 --mirror=push"
+
+#: builtin/remote.c:148
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "未知的���數：%s"
+
+#: builtin/remote.c:164
+msgid "fetch the remote branches"
+msgstr "抓��端的分支"
+
+#: builtin/remote.c:166
+msgid "import all tags and associated objects when fetching"
+msgstr "抓�時匯入所有的標籤和關�物件"
+
+#: builtin/remote.c:169
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "或�抓�任何標籤（--no-tags）"
+
+#: builtin/remote.c:171
+msgid "branch(es) to track"
+msgstr "追蹤的分支"
+
+#: builtin/remote.c:172
+msgid "master branch"
+msgstr "master 分支"
+
+#: builtin/remote.c:174
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr "把�端設定為用以推�或抓�的��"
+
+#: builtin/remote.c:186
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "指定一個 master 分支並使用 --mirror �項沒有�義"
+
+#: builtin/remote.c:188
+msgid "specifying branches to track makes sense only with fetch mirrors"
+msgstr "指定�追蹤的分支�在與�得���時使用�有�義"
+
+#: builtin/remote.c:195 builtin/remote.c:700
+#, c-format
+msgid "remote %s already exists."
+msgstr "�端 %s 已經存在。"
+
+#: builtin/remote.c:240
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "無法設定 master '%s'"
+
+#: builtin/remote.c:355
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "無法得到引用�格 %s 的�得列表"
+
+#: builtin/remote.c:454 builtin/remote.c:462
+msgid "(matching)"
+msgstr "（符�）"
+
+#: builtin/remote.c:466
+msgid "(delete)"
+msgstr "（刪除）"
+
+#: builtin/remote.c:655
+#, c-format
+msgid "could not set '%s'"
+msgstr "無法設定 '%s'"
+
+#: builtin/remote.c:660
+#, c-format
+msgid ""
+"The %s configuration remote.pushDefault in:\n"
+"\t%s:%d\n"
+"now names the non-existent remote '%s'"
+msgstr ""
+"�於下述�置的 %s 設定項 remote.pushDefault：\n"
+"\t%s:%d\n"
+"�命���存在的�端分支 '%s'"
+
+#: builtin/remote.c:691 builtin/remote.c:836 builtin/remote.c:943
+#, c-format
+msgid "No such remote: '%s'"
+msgstr "沒有此�端版本庫：'%s'"
+
+#: builtin/remote.c:710
+#, c-format
+msgid "Could not rename config section '%s' to '%s'"
+msgstr "�能�新命�設定�節 '%s' 到 '%s'"
+
+#: builtin/remote.c:730
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"沒有更新��設的�得引用�格\n"
+"\t%s\n"
+"\t如果必�請手動更新設定。"
+
+#: builtin/remote.c:770
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "刪除 '%s' 失敗"
+
+#: builtin/remote.c:804
+#, c-format
+msgid "creating '%s' failed"
+msgstr "建立 '%s' 失敗"
+
+#: builtin/remote.c:882
+msgid ""
+"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
+"to delete it, use:"
+msgid_plural ""
+"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n"
+"to delete them, use:"
+msgstr[0] "注�：ref/remotes 層級之外的一個分支未被移除。�刪除它，使用："
+
+#: builtin/remote.c:896
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "�能移除設定�節 '%s'"
+
+#: builtin/remote.c:999
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " 新的（下一次�得將儲存於 remotes/%s）"
+
+#: builtin/remote.c:1002
+msgid " tracked"
+msgstr " 已追蹤"
+
+#: builtin/remote.c:1004
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " �時（使用 'git remote prune' 來移除）"
+
+#: builtin/remote.c:1006
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:1047
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "無效的 branch.%s.merge，�能�定基底到一個以上的分支"
+
+#: builtin/remote.c:1056
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "互動��定基底到�端 %s"
+
+#: builtin/remote.c:1058
+#, c-format
+msgid "rebases interactively (with merges) onto remote %s"
+msgstr "互動��定基底（��併�交）到�端 %s"
+
+#: builtin/remote.c:1061
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "�定基底到�端 %s"
+
+#: builtin/remote.c:1065
+#, c-format
+msgid " merges with remote %s"
+msgstr " 與�端 %s �併"
+
+#: builtin/remote.c:1068
+#, c-format
+msgid "merges with remote %s"
+msgstr "與�端 %s �併"
+
+#: builtin/remote.c:1071
+#, c-format
+msgid "%-*s    and with remote %s\n"
+msgstr "%-*s    以�和�端 %s\n"
+
+#: builtin/remote.c:1114
+msgid "create"
+msgstr "建立"
+
+#: builtin/remote.c:1117
+msgid "delete"
+msgstr "刪除"
+
+#: builtin/remote.c:1121
+msgid "up to date"
+msgstr "最新"
+
+#: builtin/remote.c:1124
+msgid "fast-forwardable"
+msgstr "�快轉"
+
+#: builtin/remote.c:1127
+msgid "local out of date"
+msgstr "本機已�時"
+
+#: builtin/remote.c:1134
+#, c-format
+msgid "    %-*s forces to %-*s (%s)"
+msgstr "    %-*s 強制推�至 %-*s (%s)"
+
+#: builtin/remote.c:1137
+#, c-format
+msgid "    %-*s pushes to %-*s (%s)"
+msgstr "    %-*s 推�至 %-*s (%s)"
+
+#: builtin/remote.c:1141
+#, c-format
+msgid "    %-*s forces to %s"
+msgstr "    %-*s 強制推�至 %s"
+
+#: builtin/remote.c:1144
+#, c-format
+msgid "    %-*s pushes to %s"
+msgstr "    %-*s 推�至 %s"
+
+#: builtin/remote.c:1212
+msgid "do not query remotes"
+msgstr "�查詢�端"
+
+#: builtin/remote.c:1239
+#, c-format
+msgid "* remote %s"
+msgstr "* �端 %s"
+
+#: builtin/remote.c:1240
+#, c-format
+msgid "  Fetch URL: %s"
+msgstr "  �得��：%s"
+
+#: builtin/remote.c:1241 builtin/remote.c:1257 builtin/remote.c:1396
+msgid "(no URL)"
+msgstr "(ç„¡ URL)"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1255 builtin/remote.c:1257
+#, c-format
+msgid "  Push  URL: %s"
+msgstr "  推���：%s"
+
+#: builtin/remote.c:1259 builtin/remote.c:1261 builtin/remote.c:1263
+#, c-format
+msgid "  HEAD branch: %s"
+msgstr "  HEAD 分支：%s"
+
+#  譯者：中文字串拼接，�刪除�導空格
+#: builtin/remote.c:1259
+msgid "(not queried)"
+msgstr "（未查詢）"
+
+#: builtin/remote.c:1261
+msgid "(unknown)"
+msgstr "（未知）"
+
+#: builtin/remote.c:1265
+#, c-format
+msgid ""
+"  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr "  HEAD 分支（�端 HEAD 模糊，�能是下列中的一個）：\n"
+
+#: builtin/remote.c:1277
+#, c-format
+msgid "  Remote branch:%s"
+msgid_plural "  Remote branches:%s"
+msgstr[0] "  �端分支：%s"
+
+#  譯者：中文字串拼接，�刪除�導空格
+#: builtin/remote.c:1280 builtin/remote.c:1306
+msgid " (status not queried)"
+msgstr "（狀態未查詢）"
+
+#: builtin/remote.c:1289
+msgid "  Local branch configured for 'git pull':"
+msgid_plural "  Local branches configured for 'git pull':"
+msgstr[0] "  為 'git pull' 設定的本機分支："
+
+#: builtin/remote.c:1297
+msgid "  Local refs will be mirrored by 'git push'"
+msgstr "  本機引用將在 'git push' 時被��"
+
+#: builtin/remote.c:1303
+#, 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
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "根據�端設定 refs/remotes/<�稱>/HEAD"
+
+#: builtin/remote.c:1326
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "刪除 refs/remotes/<�稱>/HEAD"
+
+#: builtin/remote.c:1341
+msgid "Cannot determine remote HEAD"
+msgstr "無法確定�端 HEAD"
+
+#: builtin/remote.c:1343
+msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
+msgstr "多個�端 HEAD 分支。請明確地�擇一個用指令："
+
+#: builtin/remote.c:1353
+#, c-format
+msgid "Could not delete %s"
+msgstr "無法刪除 %s"
+
+#: builtin/remote.c:1361
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "�是一個有效引用：%s"
+
+#: builtin/remote.c:1363
+#, c-format
+msgid "Could not setup %s"
+msgstr "�能設定 %s"
+
+#  譯者：請維��導空格
+#: builtin/remote.c:1381
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %s 將�為懸空狀態�"
+
+#  譯者：請維��導空格
+#: builtin/remote.c:1382
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %s 已�為懸空狀態�"
+
+#: builtin/remote.c:1392
+#, c-format
+msgid "Pruning %s"
+msgstr "修剪 %s"
+
+#: builtin/remote.c:1393
+#, c-format
+msgid "URL: %s"
+msgstr "URL：%s"
+
+#: builtin/remote.c:1409
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [將刪除] %s"
+
+#: builtin/remote.c:1412
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [已刪除] %s"
+
+#: builtin/remote.c:1457
+msgid "prune remotes after fetching"
+msgstr "抓�後清除�端"
+
+#: builtin/remote.c:1521 builtin/remote.c:1577 builtin/remote.c:1647
+#, c-format
+msgid "No such remote '%s'"
+msgstr "沒有此�端 '%s'"
+
+#: builtin/remote.c:1539
+msgid "add branch"
+msgstr "新增分支"
+
+#: builtin/remote.c:1546
+msgid "no remote specified"
+msgstr "未指定�端"
+
+#: builtin/remote.c:1563
+msgid "query push URLs rather than fetch URLs"
+msgstr "查詢推� URL ��，而��得 URL ��"
+
+#: builtin/remote.c:1565
+msgid "return all URLs"
+msgstr "返回所有 URL ��"
+
+#: builtin/remote.c:1595
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "沒有給�端版本庫 '%s' 設定 URL"
+
+#: builtin/remote.c:1621
+msgid "manipulate push URLs"
+msgstr "動作推� URLS"
+
+#: builtin/remote.c:1623
+msgid "add URL"
+msgstr "新增 URL"
+
+#: builtin/remote.c:1625
+msgid "delete URLs"
+msgstr "刪除 URL"
+
+#: builtin/remote.c:1632
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete 無�義"
+
+#: builtin/remote.c:1673
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "無效的舊 URL 符�範本：%s"
+
+#: builtin/remote.c:1681
+#, c-format
+msgid "No such URL found: %s"
+msgstr "未找到此 URL：%s"
+
+#: builtin/remote.c:1683
+msgid "Will not delete all non-push URLs"
+msgstr "將�會刪除所有�推� URL ��"
+
+#: builtin/repack.c:26
+msgid "git repack [<options>]"
+msgstr "git repack [<�項>]"
+
+#: 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 ""
+"增� repack 和 bitmap 索引�相容。  使用 --no-write-bitmap-index\n"
+"或�用 pack.writebitmaps 設定。"
+
+#: builtin/repack.c:198
+msgid "could not start pack-objects to repack promisor objects"
+msgstr "無法開始 pack-objects 來�新打包 promisor 物件"
+
+#: builtin/repack.c:270 builtin/repack.c:630
+msgid "repack: Expecting full hex object ID lines only from pack-objects."
+msgstr "repack：期望來自 pack-objects 的完整�六進�物件 ID。"
+
+#: builtin/repack.c:294
+msgid "could not finish pack-objects to repack promisor objects"
+msgstr "無法完� pack-objects 來�新打包 promisor 物件"
+
+#: builtin/repack.c:309
+#, c-format
+msgid "cannot open index for %s"
+msgstr "無法開啟 %s 的索引"
+
+#: builtin/repack.c:368
+#, 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
+#, c-format
+msgid "pack %s too large to roll up"
+msgstr "%s 包太大，以致�能縮�"
+
+#: builtin/repack.c:460
+msgid "pack everything in a single pack"
+msgstr "所有內容打包到一個包檔案中"
+
+#: builtin/repack.c:462
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "和 -a 相�，並將無法�得的物件設為鬆散物件"
+
+#: builtin/repack.c:465
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "刪除多餘的包，執行 git-prune-packed"
+
+#: builtin/repack.c:467
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "� git-pack-objects 傳��數 --no-reuse-delta"
+
+#: builtin/repack.c:469
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "� git-pack-objects 傳��數 --no-reuse-object"
+
+#: builtin/repack.c:471
+msgid "do not run git-update-server-info"
+msgstr "�執行 git-update-server-info"
+
+#: builtin/repack.c:474
+msgid "pass --local to git-pack-objects"
+msgstr "� git-pack-objects 傳��數 --local"
+
+#: builtin/repack.c:476
+msgid "write bitmap index"
+msgstr "寫 bitmap 索引"
+
+#: builtin/repack.c:478
+msgid "pass --delta-islands to git-pack-objects"
+msgstr "� git-pack-objects 傳��數 --delta-islands"
+
+#: builtin/repack.c:479
+msgid "approxidate"
+msgstr "近似日期"
+
+#: builtin/repack.c:480
+msgid "with -A, do not loosen objects older than this"
+msgstr "使用 -A，��將早於�供時間的物件�期"
+
+#: builtin/repack.c:482
+msgid "with -a, repack unreachable objects"
+msgstr "使用 -a ，�新�無法�得物件打包"
+
+#: builtin/repack.c:484
+msgid "size of the window used for delta compression"
+msgstr "用於增�壓縮的視窗值"
+
+#: builtin/repack.c:485 builtin/repack.c:491
+msgid "bytes"
+msgstr "�元組"
+
+#: builtin/repack.c:486
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr "和上�的相似，但�制記憶體大�而��目數"
+
+#: builtin/repack.c:488
+msgid "limits the maximum delta depth"
+msgstr "�制最大增�深度"
+
+#: builtin/repack.c:490
+msgid "limits the maximum number of threads"
+msgstr "�制最大執行緒數"
+
+#: builtin/repack.c:492
+msgid "maximum size of each packfile"
+msgstr "�個 packfile 的最大尺寸"
+
+#: builtin/repack.c:494
+msgid "repack objects in packs marked with .keep"
+msgstr "�標記為 .keep 的包中的物件�新打包"
+
+#: builtin/repack.c:496
+msgid "do not repack this pack"
+msgstr "���該包檔案�新打包"
+
+#: builtin/repack.c:498
+msgid "find a geometric progression with factor <N>"
+msgstr "尋找因數是 <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 "--keep-unreachable 和 -A �相容"
+
+#: builtin/repack.c:527
+msgid "--geometric is incompatible with -A, -a"
+msgstr "--geometric 與 -A, -a �相容"
+
+#: builtin/repack.c:639
+msgid "Nothing new to pack."
+msgstr "沒有新的�打包。"
+
+#: builtin/repack.c:669
+#, c-format
+msgid "missing required file: %s"
+msgstr "缺少必�檔案：%s"
+
+#: builtin/repack.c:671
+#, c-format
+msgid "could not unlink: %s"
+msgstr "無法�消連�：%s"
+
+#: builtin/replace.c:22
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <物件> <�代物>"
+
+#: builtin/replace.c:23
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <物件>"
+
+#: builtin/replace.c:24
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <�交> [<父�交>...]"
+
+#: builtin/replace.c:25
+msgid "git replace [-f] --convert-graft-file"
+msgstr "git replace [-f] --convert-graft-file"
+
+#: builtin/replace.c:26
+msgid "git replace -d <object>..."
+msgstr "git replace -d <物件>..."
+
+#: builtin/replace.c:27
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<格�>] [-l [<模�>]]"
+
+#: builtin/replace.c:90
+#, c-format
+msgid ""
+"invalid replace format '%s'\n"
+"valid formats are 'short', 'medium' and 'long'"
+msgstr ""
+"無效的�代格� '%s'\n"
+"有效的格�有 'short'�'medium' 和 'long'"
+
+#: builtin/replace.c:125
+#, c-format
+msgid "replace ref '%s' not found"
+msgstr "未發��代引用 '%s'"
+
+#: builtin/replace.c:141
+#, c-format
+msgid "Deleted replace ref '%s'"
+msgstr "已刪除�代引用 '%s'"
+
+#: builtin/replace.c:153
+#, c-format
+msgid "'%s' is not a valid ref name"
+msgstr "'%s' �是一個有效的引用�"
+
+#: builtin/replace.c:158
+#, c-format
+msgid "replace ref '%s' already exists"
+msgstr "�代引用 '%s' 已經存在"
+
+#: builtin/replace.c:178
+#, 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 ""
+"物件必須屬於�一類型。\n"
+"'%s' 指� '%s' 類型的�代物件\n"
+"而 '%s' 指� '%s' 類型的�代物件。"
+
+#: builtin/replace.c:229
+#, c-format
+msgid "unable to open %s for writing"
+msgstr "無法為寫入開啟 %s"
+
+#: builtin/replace.c:242
+msgid "cat-file reported failure"
+msgstr "cat-file 報告失敗"
+
+#: builtin/replace.c:258
+#, c-format
+msgid "unable to open %s for reading"
+msgstr "無法為讀�開啟 %s"
+
+#: builtin/replace.c:272
+msgid "unable to spawn mktree"
+msgstr "無法啟動 mktree"
+
+#: builtin/replace.c:276
+msgid "unable to read from mktree"
+msgstr "無法從 mktree 讀�"
+
+#: builtin/replace.c:285
+msgid "mktree reported failure"
+msgstr "mktree 報告失敗"
+
+#: builtin/replace.c:289
+msgid "mktree did not return an object name"
+msgstr "mktree 沒有返回一個物件�"
+
+#: builtin/replace.c:298
+#, c-format
+msgid "unable to fstat %s"
+msgstr "無法� %s 執行 fstat"
+
+#: builtin/replace.c:303
+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
+#, c-format
+msgid "unable to get object type for %s"
+msgstr "無法得到 %s 的物件類型"
+
+#: builtin/replace.c:342
+msgid "editing object file failed"
+msgstr "編輯物件檔案失敗"
+
+#: builtin/replace.c:351
+#, c-format
+msgid "new object is the same as the old one: '%s'"
+msgstr "新物件和舊物件相�：'%s'"
+
+#: builtin/replace.c:384
+#, c-format
+msgid "could not parse %s as a commit"
+msgstr "無法將 %s 解�為一個�交"
+
+#: builtin/replace.c:416
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "�交 '%s' 中�有�壞的�併標籤"
+
+#: builtin/replace.c:418
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "�交 '%s' 中�有格�錯誤的�併標籤"
+
+#: builtin/replace.c:430
+#, 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
+#, c-format
+msgid "the original commit '%s' has a gpg signature"
+msgstr "原始�交 '%s' 中有一個 gpg 簽�"
+
+#: builtin/replace.c:470
+msgid "the signature will be removed in the replacement commit!"
+msgstr "在�代的�交中簽�將被移除�"
+
+#: builtin/replace.c:480
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "�能為 '%s' 寫�代�交"
+
+#: builtin/replace.c:488
+#, c-format
+msgid "graft for '%s' unnecessary"
+msgstr "� '%s' 移�沒有必�"
+
+#: builtin/replace.c:492
+#, c-format
+msgid "new commit is the same as the old one: '%s'"
+msgstr "新�交和舊的一樣：'%s'"
+
+#: builtin/replace.c:527
+#, c-format
+msgid ""
+"could not convert the following graft(s):\n"
+"%s"
+msgstr ""
+"�能轉�下列移�：\n"
+"%s"
+
+#: builtin/replace.c:548
+msgid "list replace refs"
+msgstr "列出�代的引用"
+
+#: builtin/replace.c:549
+msgid "delete replace refs"
+msgstr "刪除�代的引用"
+
+#: builtin/replace.c:550
+msgid "edit existing object"
+msgstr "編輯�存的物件"
+
+#: builtin/replace.c:551
+msgid "change a commit's parents"
+msgstr "修改一個�交的父�交"
+
+#: builtin/replace.c:552
+msgid "convert existing graft file"
+msgstr "轉��存的移�檔案"
+
+#: builtin/replace.c:553
+msgid "replace the ref if it exists"
+msgstr "如果存在則�代引用"
+
+#: builtin/replace.c:555
+msgid "do not pretty-print contents for --edit"
+msgstr "��為 --edit 動作美觀顯示內容"
+
+#: builtin/replace.c:556
+msgid "use this format"
+msgstr "使用此格�"
+
+#: builtin/replace.c:569
+msgid "--format cannot be used when not listing"
+msgstr "�列出時�能使用 --format"
+
+#: builtin/replace.c:577
+msgid "-f only makes sense when writing a replacement"
+msgstr "�有寫一個�代時 -f �有�義"
+
+#: builtin/replace.c:581
+msgid "--raw only makes sense with --edit"
+msgstr "--raw �有和 --edit 共用�有�義"
+
+#: builtin/replace.c:587
+msgid "-d needs at least one argument"
+msgstr "-d 需�至少一個�數"
+
+#: builtin/replace.c:593
+msgid "bad number of arguments"
+msgstr "錯誤的�數個數"
+
+#: builtin/replace.c:599
+msgid "-e needs exactly one argument"
+msgstr "-e 需�且僅需�一個�數"
+
+#: builtin/replace.c:605
+msgid "-g needs at least one argument"
+msgstr "-g 需�至少一個�數"
+
+#: builtin/replace.c:611
+msgid "--convert-graft-file takes no argument"
+msgstr "--convert-graft-file �帶�數"
+
+#: builtin/replace.c:617
+msgid "only one pattern can be given with -l"
+msgstr "�能為 -l �供一個模�"
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <路徑>... | status | remaining | diff | gc]"
+
+#: builtin/rerere.c:58
+msgid "register clean resolutions in index"
+msgstr "在索引中註冊乾淨的解決方案"
+
+#: builtin/rerere.c:77
+msgid "'git rerere forget' without paths is deprecated"
+msgstr "沒有路徑的 'git rerere forget' 已經�時"
+
+#: builtin/rerere.c:111
+#, c-format
+msgid "unable to generate diff for '%s'"
+msgstr "無法為 '%s' 生�差異"
+
+#: builtin/reset.c:32
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<�交>]"
+
+#: builtin/reset.c:33
+msgid "git reset [-q] [<tree-ish>] [--] <pathspec>..."
+msgstr "git reset [-q] [<樹或�交>] [--] <路徑�格>..."
+
+#: 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]] [<樹或�交>]"
+
+#: builtin/reset.c:35
+msgid "git reset --patch [<tree-ish>] [--] [<pathspec>...]"
+msgstr "git reset --patch [<樹或�交>] [--] [<路徑�格>...]"
+
+#: builtin/reset.c:41
+msgid "mixed"
+msgstr "混雜"
+
+#: builtin/reset.c:41
+msgid "soft"
+msgstr "軟性"
+
+#: builtin/reset.c:41
+msgid "hard"
+msgstr "硬性"
+
+#: builtin/reset.c:41
+msgid "merge"
+msgstr "�併"
+
+#: builtin/reset.c:41
+msgid "keep"
+msgstr "��"
+
+#: builtin/reset.c:83
+msgid "You do not have a valid HEAD."
+msgstr "您沒有一個有效的 HEAD。"
+
+#: builtin/reset.c:85
+msgid "Failed to find tree of HEAD."
+msgstr "無法找到 HEAD 指�的樹。"
+
+#: builtin/reset.c:91
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "無法找到 %s 指�的樹。"
+
+#: builtin/reset.c:116
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD �在�於 %s"
+
+#  譯者：漢字之間無空格，故刪除%s�後空格
+#: builtin/reset.c:195
+#, 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
+msgid "be quiet, only report errors"
+msgstr "安�模�，�報告錯誤"
+
+#: builtin/reset.c:297
+msgid "reset HEAD and index"
+msgstr "�設 HEAD 和索引"
+
+#: builtin/reset.c:298
+msgid "reset only HEAD"
+msgstr "��設 HEAD"
+
+#: builtin/reset.c:300 builtin/reset.c:302
+msgid "reset HEAD, index and working tree"
+msgstr "�設 HEAD�索引和工作�"
+
+#: builtin/reset.c:304
+msgid "reset HEAD but keep local changes"
+msgstr "�設 HEAD 但儲存本機變更"
+
+#: builtin/reset.c:310
+msgid "record only the fact that removed paths will be added later"
+msgstr "將刪除的路徑標記為�後新增"
+
+#: builtin/reset.c:344
+#, c-format
+msgid "Failed to resolve '%s' as a valid revision."
+msgstr "無法將 '%s' 解�為一個有效的版本。"
+
+#: builtin/reset.c:352
+#, 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
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr "--mixed 帶路徑已棄用，而是用 'git reset -- <路徑>'。"
+
+#  譯者：漢字之間無空格，故刪除%s�後空格
+#: builtin/reset.c:373
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "�能帶路徑進行%s�設。"
+
+#  譯者：漢字之間無空格，故刪除%s�後空格
+#: builtin/reset.c:388
+#, 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
+msgid "Unstaged changes after reset:"
+msgstr "�設後�消暫存的變更："
+
+#: builtin/reset.c:416
+#, 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 ""
+"\n"
+"�設後，枚舉未暫存變更花費了 %.2f 秒。 您�以使用 '--quiet' ��此情�。\n"
+"將設定變數 reset.quiet 設定為 true �使其�為�設值。\n"
+
+#: builtin/reset.c:434
+#, c-format
+msgid "Could not reset index file to revision '%s'."
+msgstr "�能�設索引檔案至版本 '%s'。"
+
+#: builtin/reset.c:439
+msgid "Could not write new index file."
+msgstr "�能寫入新的索引檔案。"
+
+#: builtin/rev-list.c:541
+msgid "cannot combine --exclude-promisor-objects and --missing"
+msgstr "�能�時使用 --exclude-promisor-objects 和 --missing �項"
+
+#: builtin/rev-list.c:602
+msgid "object filtering requires --objects"
+msgstr "物件�濾需� --objects"
+
+#: builtin/rev-list.c:674
+msgid "rev-list does not support display of notes"
+msgstr "rev-list �支�顯示註解"
+
+#: builtin/rev-list.c:679
+msgid "marked counting is incompatible with --objects"
+msgstr "--objects �相容標記計數 (marked counting)"
+
+#: builtin/rev-parse.c:409
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<�項>] -- [<�數>...]"
+
+#: builtin/rev-parse.c:414
+msgid "keep the `--` passed as an arg"
+msgstr "�� `--` 作為一個�數傳�"
+
+#: builtin/rev-parse.c:416
+msgid "stop parsing after the first non-option argument"
+msgstr "�到第一個��項�數後�止解�"
+
+#: builtin/rev-parse.c:419
+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"
+"   or: git rev-parse --sq-quote [<arg>...]\n"
+"   or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+"git rev-parse --parseopt [<�項>] -- [<�數>...]\n"
+"   或者：git rev-parse --sq-quote [<�數>...]\n"
+"   或者：git rev-parse [<�項>] [<�數>...]\n"
+"\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 [<�項>] <�交號>..."
+
+#: builtin/revert.c:25
+msgid "git revert <subcommand>"
+msgstr "git revert <�指令>"
+
+#: builtin/revert.c:30
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<�項>] <�交號>..."
+
+#: builtin/revert.c:31
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <�指令>"
+
+#: builtin/revert.c:72
+#, c-format
+msgid "option `%s' expects a number greater than zero"
+msgstr "�項 `%s' 期望一個大於零的數字"
+
+#: builtin/revert.c:92
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s：%s �能和 %s �時使用"
+
+#: builtin/revert.c:102
+msgid "end revert or cherry-pick sequence"
+msgstr "終止�轉或��動作"
+
+#: builtin/revert.c:103
+msgid "resume revert or cherry-pick sequence"
+msgstr "繼續�轉或��動作"
+
+#: builtin/revert.c:104
+msgid "cancel revert or cherry-pick sequence"
+msgstr "�消�轉或��動作"
+
+#: builtin/revert.c:105
+msgid "skip current commit and continue"
+msgstr "略�目��交並繼續"
+
+#: builtin/revert.c:107
+msgid "don't automatically commit"
+msgstr "��自動�交"
+
+#: builtin/revert.c:108
+msgid "edit the commit message"
+msgstr "編輯�交說明"
+
+#: builtin/revert.c:111
+msgid "parent-number"
+msgstr "父編號"
+
+#: builtin/revert.c:112
+msgid "select mainline parent"
+msgstr "�擇主幹父�交編號"
+
+#: builtin/revert.c:114
+msgid "merge strategy"
+msgstr "�併策略"
+
+#: builtin/revert.c:116
+msgid "option for merge strategy"
+msgstr "�併策略的�項"
+
+#: builtin/revert.c:125
+msgid "append commit name"
+msgstr "追加�交�稱"
+
+#: builtin/revert.c:127
+msgid "preserve initially empty commits"
+msgstr "�留�始化的空�交"
+
+#: builtin/revert.c:129
+msgid "keep redundant, empty commits"
+msgstr "��多餘的�空的�交"
+
+#: builtin/revert.c:237
+msgid "revert failed"
+msgstr "還原失敗"
+
+#: builtin/revert.c:250
+msgid "cherry-pick failed"
+msgstr "��失敗"
+
+#: builtin/rm.c:20
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<�項>] [--] <檔案>..."
+
+#: builtin/rm.c:208
+msgid ""
+"the following file has staged content different from both the\n"
+"file and the HEAD:"
+msgid_plural ""
+"the following files have staged content different from both the\n"
+"file and the HEAD:"
+msgstr[0] "如下檔案其暫存的內容和工作�� HEAD 中的都�一樣："
+
+#: builtin/rm.c:213
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"（使用 -f 強制刪除）"
+
+#: 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] "下列檔案有暫存在索引的變更："
+
+#: builtin/rm.c:221 builtin/rm.c:230
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"（使用 --cached �留本機檔案，或用 -f 強制刪除）"
+
+#: builtin/rm.c:227
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "如下檔案有本機修改："
+
+#: builtin/rm.c:244
+msgid "do not list removed files"
+msgstr "�列出刪除的檔案"
+
+#: builtin/rm.c:245
+msgid "only remove from the index"
+msgstr "�從索引�刪除"
+
+#: builtin/rm.c:246
+msgid "override the up-to-date check"
+msgstr "忽略檔案更新狀態檢查"
+
+#: builtin/rm.c:247
+msgid "allow recursive removal"
+msgstr "�許�迴刪除"
+
+#: builtin/rm.c:249
+msgid "exit with a zero status even if nothing matched"
+msgstr "�使沒有符�，也以零狀態離開"
+
+#: builtin/rm.c:283
+msgid "No pathspec was given. Which files should I remove?"
+msgstr "沒有�供路徑�格。我該移除哪個檔案？"
+
+#: builtin/rm.c:310
+msgid "please stage your changes to .gitmodules or stash them to proceed"
+msgstr "請將您的修改暫存到 .gitmodules 中或儲�後�繼續"
+
+#: builtin/rm.c:331
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "未�供 -r �項�會�迴刪除 '%s'"
+
+#: builtin/rm.c:379
+#, 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."
+msgstr ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<主機>:]<目錄> [<引用>...]\n"
+"  --all 和明確的 <引用> 互斥。"
+
+#: builtin/send-pack.c:188
+msgid "remote name"
+msgstr "�端�稱"
+
+#: builtin/send-pack.c:201
+msgid "use stateless RPC protocol"
+msgstr "使用無狀態的 RPC �定"
+
+#: builtin/send-pack.c:202
+msgid "read refs from stdin"
+msgstr "從標準輸入讀�引用"
+
+#: builtin/send-pack.c:203
+msgid "print status from remote helper"
+msgstr "列�來自�端 helper 的狀態"
+
+#: builtin/shortlog.c:16
+msgid "git shortlog [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git shortlog [<�項>] [<版本範�>] [[--] <路徑>...]"
+
+#: builtin/shortlog.c:17
+msgid "git log --pretty=short | git shortlog [<options>]"
+msgstr "git log --pretty=short | git shortlog [<�項>]"
+
+#: builtin/shortlog.c:123
+msgid "using multiple --group options with stdin is not supported"
+msgstr "�支�在標準輸入使用多個 --group �項"
+
+#: builtin/shortlog.c:133
+msgid "using --group=trailer with stdin is not supported"
+msgstr "�支�在標準輸入使用 --group=trailer"
+
+#: builtin/shortlog.c:323
+#, c-format
+msgid "unknown group type: %s"
+msgstr "未知群組類型：%s"
+
+#: builtin/shortlog.c:351
+msgid "group by committer rather than author"
+msgstr "��交者而�作者分組"
+
+#: builtin/shortlog.c:354
+msgid "sort output according to the number of commits per author"
+msgstr "根據�個作者的�交數�排�"
+
+#: builtin/shortlog.c:356
+msgid "suppress commit descriptions, only provides commit count"
+msgstr "隱��交說明，��供�交數�"
+
+#: builtin/shortlog.c:358
+msgid "show the email address of each author"
+msgstr "顯示�個作者的電�信件��"
+
+#: builtin/shortlog.c:359
+msgid "<w>[,<i1>[,<i2>]]"
+msgstr "<w>[,<i1>[,<i2>]]"
+
+#: builtin/shortlog.c:360
+msgid "linewrap output"
+msgstr "折行輸出"
+
+#: builtin/shortlog.c:362
+msgid "field"
+msgstr "欄�"
+
+#: builtin/shortlog.c:363
+msgid "group by field"
+msgstr "�欄�分組"
+
+#: builtin/shortlog.c:391
+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>)...]"
+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] [(<版本> | <�用字元>)...]"
+
+#: builtin/show-branch.c:17
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<起始點>]] [--list] [<引用>]"
+
+#: 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] "忽略 %s，無法處� %d 個以上的引用"
+
+#: builtin/show-branch.c:548
+#, c-format
+msgid "no matching refs with %s"
+msgstr "沒有和 %s 符�的引用"
+
+#: builtin/show-branch.c:645
+msgid "show remote-tracking and local branches"
+msgstr "顯示�端追蹤的和本機的分支"
+
+#: builtin/show-branch.c:647
+msgid "show remote-tracking branches"
+msgstr "顯示�端追蹤的分支"
+
+#: builtin/show-branch.c:649
+msgid "color '*!+-' corresponding to the branch"
+msgstr "著色 '*!+-' 到相應的分支"
+
+#: builtin/show-branch.c:651
+msgid "show <n> more commits after the common ancestor"
+msgstr "顯示共�祖先後的 <n> 個�交"
+
+#: builtin/show-branch.c:653
+msgid "synonym to more=-1"
+msgstr "和 more=-1 �義"
+
+#: builtin/show-branch.c:654
+msgid "suppress naming strings"
+msgstr "�顯示字串命�"
+
+#: builtin/show-branch.c:656
+msgid "include the current branch"
+msgstr "包括目�分支"
+
+#: builtin/show-branch.c:658
+msgid "name commits with their object names"
+msgstr "以物件�字命��交"
+
+#: builtin/show-branch.c:660
+msgid "show possible merge bases"
+msgstr "顯示�能�併的基礎"
+
+#: builtin/show-branch.c:662
+msgid "show refs unreachable from any other ref"
+msgstr "顯示沒有任何引用的的引用"
+
+#: builtin/show-branch.c:664
+msgid "show commits in topological order"
+msgstr "以拓撲順�顯示�交"
+
+#: builtin/show-branch.c:667
+msgid "show only commits not on the first branch"
+msgstr "�顯示�在第一個分支上的�交"
+
+#: builtin/show-branch.c:669
+msgid "show merges reachable from only one tip"
+msgstr "顯示僅一個分支�存�的�併�交"
+
+#: builtin/show-branch.c:671
+msgid "topologically sort, maintaining date order where possible"
+msgstr "拓撲方�排�，並儘�能地��日期順�"
+
+#: builtin/show-branch.c:674
+msgid "<n>[,<base>]"
+msgstr "<n>[,<base>]"
+
+#: builtin/show-branch.c:675
+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
+msgid "no branches given, and HEAD is not valid"
+msgstr "未�供分支，且 HEAD 無效"
+
+#: builtin/show-branch.c:738
+msgid "--reflog option needs one branch name"
+msgstr "�項 --reflog 需�一個分支�"
+
+#: builtin/show-branch.c:741
+#, 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
+#, c-format
+msgid "no such ref %s"
+msgstr "無此引用 %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] "�能處� %d 個以上的版本。"
+
+#: builtin/show-branch.c:835
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' �是一個有效的引用。"
+
+#: builtin/show-branch.c:838
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "�能找到�交 %s（%s）"
+
+#: builtin/show-index.c:21
+msgid "hash-algorithm"
+msgstr "雜湊算法"
+
+#: builtin/show-index.c:31
+msgid "Unknown hash algorithm"
+msgstr "未知的雜湊算法"
+
+#: 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] [--] [<模�>...]"
+
+#: builtin/show-ref.c:13
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<模�>]"
+
+#: builtin/show-ref.c:162
+msgid "only show tags (can be combined with heads)"
+msgstr "�顯示標籤（�以和頭共用）"
+
+#: builtin/show-ref.c:163
+msgid "only show heads (can be combined with tags)"
+msgstr "�顯示頭（�以和標籤共用）"
+
+#: builtin/show-ref.c:164
+msgid "stricter reference checking, requires exact ref path"
+msgstr "更嚴格的引用檢測，需�精確的引用路徑"
+
+#: builtin/show-ref.c:167 builtin/show-ref.c:169
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "顯示 HEAD 引用，�使被�濾掉"
+
+#: builtin/show-ref.c:171
+msgid "dereference tags into object IDs"
+msgstr "轉�標籤到物件 ID"
+
+#: builtin/show-ref.c:173
+msgid "only show SHA1 hash using <n> digits"
+msgstr "�顯示使用 <n> 個數字的 SHA1 雜湊"
+
+#: builtin/show-ref.c:177
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "�列��果到標準輸出（例如與 --verify �數共用）"
+
+#: builtin/show-ref.c:179
+msgid "show refs from stdin that aren't in local repository"
+msgstr "顯示從標準輸入中讀入的�在本機版本庫中的引用"
+
+#: 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) <�項>"
+
+#: builtin/sparse-checkout.c:46
+msgid "git sparse-checkout list"
+msgstr "git sparse-checkout list"
+
+#: builtin/sparse-checkout.c:72
+msgid "this worktree is not sparse (sparse-checkout file may not exist)"
+msgstr "這�是稀�工作�（sparse-checkout 檔案�能�存在）"
+
+#: builtin/sparse-checkout.c:227
+msgid "failed to create directory for sparse-checkout file"
+msgstr "無法建立稀�簽出檔案的目錄"
+
+#: builtin/sparse-checkout.c:268
+msgid "unable to upgrade repository format to enable worktreeConfig"
+msgstr "無法�級版本庫格�，以致無法啟用 worktreeConfig"
+
+#: builtin/sparse-checkout.c:270
+msgid "failed to set extensions.worktreeConfig setting"
+msgstr "無法設定 extensions.worktreeConfig 設定"
+
+#: builtin/sparse-checkout.c:290
+msgid "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+msgstr "git sparse-checkout init [--cone] [--[no-]sparse-index]"
+
+#: builtin/sparse-checkout.c:310
+msgid "initialize the sparse-checkout in cone mode"
+msgstr "以 cone 模��始化稀�簽出"
+
+#: 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 "無法開啟「%s�"
+
+#: builtin/sparse-checkout.c:413
+#, c-format
+msgid "could not normalize path %s"
+msgstr "無法標準化路徑 %s"
+
+#: builtin/sparse-checkout.c:425
+msgid "git sparse-checkout (set|add) (--stdin | <patterns>)"
+msgstr "git sparse-checkout (set|add) (--stdin | <樣�>)"
+
+#: builtin/sparse-checkout.c:450
+#, c-format
+msgid "unable to unquote C-style string '%s'"
+msgstr "無法去掉 '%s' C 樣�字串的引號"
+
+#: builtin/sparse-checkout.c:504 builtin/sparse-checkout.c:528
+msgid "unable to load existing sparse-checkout patterns"
+msgstr "無法載入�存的稀�簽出樣�"
+
+#: builtin/sparse-checkout.c:573
+msgid "read patterns from standard in"
+msgstr "從標準輸入讀�樣�"
+
+#: builtin/sparse-checkout.c:588
+msgid "git sparse-checkout reapply"
+msgstr "git sparse-checkout reapply"
+
+#: builtin/sparse-checkout.c:607
+msgid "git sparse-checkout disable"
+msgstr "git sparse-checkout disable"
+
+#: builtin/sparse-checkout.c:638
+msgid "error while refreshing working directory"
+msgstr "�新整�工作目錄時發生錯誤"
+
+#: builtin/stash.c:24 builtin/stash.c:40
+msgid "git stash list [<options>]"
+msgstr "git stash list [<�項>]"
+
+#: builtin/stash.c:25 builtin/stash.c:45
+msgid "git stash show [<options>] [<stash>]"
+msgstr "git stash show [<�項>] [<stash>]"
+
+#: builtin/stash.c:26 builtin/stash.c:50
+msgid "git stash drop [-q|--quiet] [<stash>]"
+msgstr "git stash drop [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:27
+msgid "git stash ( pop | apply ) [--index] [-q|--quiet] [<stash>]"
+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 <分支�> [<stash>]"
+
+#: 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"
+"          [--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 <訊�>]\n"
+"          [--pathspec-from-file=<檔案> [--pathspec-file-nul]]\n"
+"          [--] [<路徑�格>...]]"
+
+#: 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 ""
+"git stash save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [<消�>]"
+
+#: builtin/stash.c:55
+msgid "git stash pop [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash pop [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:60
+msgid "git stash apply [--index] [-q|--quiet] [<stash>]"
+msgstr "git stash apply [--index] [-q|--quiet] [<stash>]"
+
+#: builtin/stash.c:75
+msgid "git stash store [-m|--message <message>] [-q|--quiet] <commit>"
+msgstr "git stash store [-m|--message <消�>] [-q|--quiet] <�交>"
+
+#: 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 ""
+"git stash [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]\n"
+"          [-u|--include-untracked] [-a|--all] [-m|--message <消�>]\n"
+"          [--] [<路徑�格>...]]"
+
+#: builtin/stash.c:130
+#, c-format
+msgid "'%s' is not a stash-like commit"
+msgstr "'%s' ��是一個儲��交"
+
+#: builtin/stash.c:150
+#, c-format
+msgid "Too many revisions specified:%s"
+msgstr "指定了太多的版本：%s"
+
+#: builtin/stash.c:164
+msgid "No stash entries found."
+msgstr "未發�儲��目。"
+
+#: builtin/stash.c:178
+#, c-format
+msgid "%s is not a valid reference"
+msgstr "%s �是一個有效的引用�"
+
+#: builtin/stash.c:227
+msgid "git stash clear with arguments is unimplemented"
+msgstr "尚未實作傳入�數的 git stash clear"
+
+#: 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 ""
+"警告：未追蹤檔案擋�追蹤檔案的去路�已�新命�：\n"
+"            %s -> %s\n"
+"         以騰出空間留給追蹤檔案。\n"
+
+#: builtin/stash.c:492
+msgid "cannot apply a stash in the middle of a merge"
+msgstr "無法在�併�程套用儲�"
+
+#: builtin/stash.c:503
+#, c-format
+msgid "could not generate diff %s^!."
+msgstr "無法生�差異 %s^!."
+
+#: builtin/stash.c:510
+msgid "conflicts in index. Try without --index."
+msgstr "索引中有��。請試試看�用 --index。"
+
+#: builtin/stash.c:516
+msgid "could not save index tree"
+msgstr "�能儲存索引樹"
+
+#: builtin/stash.c:525
+msgid "could not restore untracked files from stash"
+msgstr "無法從儲��目中復原未追蹤檔案"
+
+#: builtin/stash.c:539
+#, c-format
+msgid "Merging %s with %s"
+msgstr "正在�併 %s 和 %s"
+
+#: builtin/stash.c:549
+msgid "Index was not unstashed."
+msgstr "索引未從儲�中復原。"
+
+#: builtin/stash.c:591 builtin/stash.c:689
+msgid "attempt to recreate the index"
+msgstr "嘗試�建索引"
+
+#: builtin/stash.c:635
+#, c-format
+msgid "Dropped %s (%s)"
+msgstr "�棄了 %s（%s）"
+
+#: builtin/stash.c:638
+#, c-format
+msgid "%s: Could not drop stash entry"
+msgstr "%s：無法�棄儲��目"
+
+#: builtin/stash.c:651
+#, c-format
+msgid "'%s' is not a stash reference"
+msgstr "'%s' �是一個儲�引用"
+
+#: builtin/stash.c:701
+msgid "The stash entry is kept in case you need it again."
+msgstr "儲��目被�留以備您�次需�。"
+
+#: builtin/stash.c:724
+msgid "No branch name specified"
+msgstr "未指定分支�"
+
+#: builtin/stash.c:808
+msgid "failed to parse tree"
+msgstr "無法解�樹"
+
+#: builtin/stash.c:819
+msgid "failed to unpack trees"
+msgstr "無法解包樹"
+
+#: builtin/stash.c:839
+msgid "include untracked files in the stash"
+msgstr "在儲��包�未追蹤檔案"
+
+#: builtin/stash.c:842
+msgid "only show untracked files in the stash"
+msgstr "�在儲��顯示未追蹤檔案"
+
+#: builtin/stash.c:929 builtin/stash.c:966
+#, c-format
+msgid "Cannot update %s with %s"
+msgstr "無法用 %2$s 更新 %1$s"
+
+#: builtin/stash.c:947 builtin/stash.c:1602 builtin/stash.c:1667
+msgid "stash message"
+msgstr "儲�說明"
+
+#: builtin/stash.c:957
+msgid "\"git stash store\" requires one <commit> argument"
+msgstr "\"git stash store\" 需�一個 <�交> �數"
+
+#: builtin/stash.c:1171
+msgid "No changes selected"
+msgstr "沒有�擇變更"
+
+#: builtin/stash.c:1271
+msgid "You do not have the initial commit yet"
+msgstr "您尚未建立�始�交"
+
+#: builtin/stash.c:1298
+msgid "Cannot save the current index state"
+msgstr "無法儲存目�索引狀態"
+
+#: builtin/stash.c:1307
+msgid "Cannot save the untracked files"
+msgstr "無法儲存未追蹤檔案"
+
+#: builtin/stash.c:1318 builtin/stash.c:1327
+msgid "Cannot save the current worktree state"
+msgstr "無法儲存目�工作�狀態"
+
+#: builtin/stash.c:1355
+msgid "Cannot record working tree state"
+msgstr "�能記錄工作�狀態"
+
+#: builtin/stash.c:1404
+msgid "Can't use --patch and --include-untracked or --all at the same time"
+msgstr "�能�時使用�數 --patch 和 --include-untracked 或 --all"
+
+#: builtin/stash.c:1422
+msgid "Did you forget to 'git add'?"
+msgstr "您是�忘了執行 'git add'？"
+
+#: builtin/stash.c:1437
+msgid "No local changes to save"
+msgstr "沒有�儲存的本機修改"
+
+#: builtin/stash.c:1444
+msgid "Cannot initialize stash"
+msgstr "無法�始化儲�"
+
+#: builtin/stash.c:1459
+msgid "Cannot save the current status"
+msgstr "無法儲存目�狀態"
+
+#: builtin/stash.c:1464
+#, c-format
+msgid "Saved working directory and index state %s"
+msgstr "儲存工作目錄和索引狀態 %s"
+
+#: builtin/stash.c:1554
+msgid "Cannot remove worktree changes"
+msgstr "無法刪除工作�變更"
+
+#: builtin/stash.c:1593 builtin/stash.c:1658
+msgid "keep index"
+msgstr "��索引"
+
+#: builtin/stash.c:1595 builtin/stash.c:1660
+msgid "stash in patch mode"
+msgstr "以修補檔模�儲�"
+
+#: builtin/stash.c:1596 builtin/stash.c:1661
+msgid "quiet mode"
+msgstr "�默模�"
+
+#: builtin/stash.c:1598 builtin/stash.c:1663
+msgid "include untracked files in stash"
+msgstr "儲�中包�未追蹤檔案"
+
+#: builtin/stash.c:1600 builtin/stash.c:1665
+msgid "include ignore files"
+msgstr "包�忽略的檔案"
+
+#: builtin/stash.c:1700
+msgid ""
+"the stash.useBuiltin support has been removed!\n"
+"See its entry in 'git help config' for details."
+msgstr ""
+"� stash.useBuiltin 的支�已被刪除�\n"
+"詳見「git help config�中的�目。"
+
+#: builtin/stripspace.c:18
+msgid "git stripspace [-s | --strip-comments]"
+msgstr "git stripspace [-s | --strip-comments]"
+
+#: builtin/stripspace.c:19
+msgid "git stripspace [-c | --comment-lines]"
+msgstr "git stripspace [-c | --comment-lines]"
+
+#: builtin/stripspace.c:37
+msgid "skip and remove all lines starting with comment character"
+msgstr "略�和移除所有的備註行"
+
+#: builtin/stripspace.c:40
+msgid "prepend comment character and space to each line"
+msgstr "為�一行的行首新增備註符和空格"
+
+#: builtin/submodule--helper.c:46 builtin/submodule--helper.c:2440
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "期望一個完整的引用�稱，�得到 %s"
+
+#: builtin/submodule--helper.c:63
+msgid "submodule--helper print-default-remote takes no arguments"
+msgstr "submodule--helper print-default-remote �帶�數"
+
+#: builtin/submodule--helper.c:101
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "無法從 url '%s' �離一個元件"
+
+#: builtin/submodule--helper.c:411 builtin/submodule--helper.c:1887
+#: builtin/submodule--helper.c:2891
+msgid "alternative anchor for relative paths"
+msgstr "相�路徑的替代錨記（anchor）"
+
+#: builtin/submodule--helper.c:416
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<路徑>] [<路徑>...]"
+
+#: 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 "在 .gitmodules 中未找到�模組 '%s' 的 url"
+
+#: builtin/submodule--helper.c:526
+#, c-format
+msgid "Entering '%s'\n"
+msgstr "進入 '%s'\n"
+
+#: builtin/submodule--helper.c:529
+#, c-format
+msgid ""
+"run_command returned non-zero status for %s\n"
+"."
+msgstr ""
+"� %s 執行 run_command 返回�零值。\n"
+"."
+
+#: builtin/submodule--helper.c:551
+#, c-format
+msgid ""
+"run_command returned non-zero status while recursing in the nested "
+"submodules of %s\n"
+"."
+msgstr ""
+"在�迴 %s 的�模組執行 run_command 時返回�零值。\n"
+"."
+
+#: builtin/submodule--helper.c:567
+msgid "suppress output of entering each submodule command"
+msgstr "隱��個�模組進入命令的輸出"
+
+#: builtin/submodule--helper.c:569 builtin/submodule--helper.c:890
+#: builtin/submodule--helper.c:1489
+msgid "recurse into nested submodules"
+msgstr "�迴進入嵌套�模組中"
+
+#: builtin/submodule--helper.c:574
+msgid "git submodule--helper foreach [--quiet] [--recursive] [--] <command>"
+msgstr "git submodule--helper foreach [--quiet] [--recursive] [--] <命令>"
+
+#: builtin/submodule--helper.c:601
+#, c-format
+msgid ""
+"could not look up configuration '%s'. Assuming this repository is its own "
+"authoritative upstream."
+msgstr "無法找到設定 '%s'。�定這個版本庫是其自身的官方上游。"
+
+#: builtin/submodule--helper.c:668
+#, c-format
+msgid "Failed to register url for submodule path '%s'"
+msgstr "無法為�模組 '%s' 註冊 url"
+
+#: builtin/submodule--helper.c:672
+#, c-format
+msgid "Submodule '%s' (%s) registered for path '%s'\n"
+msgstr "�模組 '%s'（%s）已�路徑 '%s' 註冊\n"
+
+#: builtin/submodule--helper.c:682
+#, c-format
+msgid "warning: command update mode suggested for submodule '%s'\n"
+msgstr "警告：建議�模組 '%s' 使用指令更新模�\n"
+
+#: builtin/submodule--helper.c:689
+#, c-format
+msgid "Failed to register update mode for submodule path '%s'"
+msgstr "無法為�模組 '%s' 註冊更新模�"
+
+#: builtin/submodule--helper.c:711
+msgid "suppress output for initializing a submodule"
+msgstr "隱��始化�模組的輸出"
+
+#: builtin/submodule--helper.c:716
+msgid "git submodule--helper init [<options>] [<path>]"
+msgstr "git submodule--helper init [<�項>] [<路徑>]"
+
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
+#, c-format
+msgid "no submodule mapping found in .gitmodules for path '%s'"
+msgstr "在 .gitmodules 中沒有發�路徑 '%s' 的�模組映射"
+
+#: builtin/submodule--helper.c:837
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "無法解��模組 '%s' 的 HEAD 引用"
+
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1459
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "�迴�模組 '%s' 失敗"
+
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1625
+msgid "suppress submodule status output"
+msgstr "隱��模組的狀態輸出"
+
+#: builtin/submodule--helper.c:889
+msgid ""
+"use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr "使用儲存在索引中的�交，而�儲存在�模組 HEAD 中的�交"
+
+#: builtin/submodule--helper.c:895
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路徑>...]"
+
+#: builtin/submodule--helper.c:919
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <路徑>"
+
+#: builtin/submodule--helper.c:991
+#, c-format
+msgid "* %s %s(blob)->%s(submodule)"
+msgstr "* %s %s(blob)->%s(submodule)"
+
+#: builtin/submodule--helper.c:994
+#, c-format
+msgid "* %s %s(submodule)->%s(blob)"
+msgstr "* %s %s(submodule)->%s(blob)"
+
+#: builtin/submodule--helper.c:1007
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "couldn't hash object from '%s'"
+msgstr "無法雜湊來自 '%s' 的物件"
+
+#: builtin/submodule--helper.c:1061
+#, c-format
+msgid "unexpected mode %o\n"
+msgstr "��期的模� %o\n"
+
+#: builtin/submodule--helper.c:1302
+msgid "use the commit stored in the index instead of the submodule HEAD"
+msgstr "使用儲存在索引中的�交而��模組 HEAD"
+
+#: builtin/submodule--helper.c:1304
+msgid "compare the commit in the index with that in the submodule HEAD"
+msgstr "比較索引中�交與�模組 HEAD �交的差異"
+
+#: builtin/submodule--helper.c:1306
+msgid "skip submodules with 'ignore_config' value set to 'all'"
+msgstr "'ignore_config' 值設為 'all' 時略��模組"
+
+#: builtin/submodule--helper.c:1308
+msgid "limit the summary size"
+msgstr "�制摘�大�"
+
+#: builtin/submodule--helper.c:1313
+msgid "git submodule--helper summary [<options>] [<commit>] [--] [<path>]"
+msgstr "git submodule--helper summary [<�項>] [<�交>] [--] [<路徑>]"
+
+#: builtin/submodule--helper.c:1337
+msgid "could not fetch a revision for HEAD"
+msgstr "無法�得 HEAD 的版本"
+
+#: builtin/submodule--helper.c:1342
+msgid "--cached and --files are mutually exclusive"
+msgstr "--cached 和 --files 互斥"
+
+#: builtin/submodule--helper.c:1409
+#, c-format
+msgid "Synchronizing submodule url for '%s'\n"
+msgstr "為 '%s' �步�模組 url\n"
+
+#: builtin/submodule--helper.c:1415
+#, c-format
+msgid "failed to register url for submodule path '%s'"
+msgstr "無法為�模組路徑 '%s' 註冊 url"
+
+#: builtin/submodule--helper.c:1429
+#, c-format
+msgid "failed to get the default remote for submodule '%s'"
+msgstr "無法得到�模組 '%s' 的�設�端關�"
+
+#: builtin/submodule--helper.c:1440
+#, c-format
+msgid "failed to update remote for submodule '%s'"
+msgstr "無法為�模組 '%s' 更新�端關�"
+
+#: builtin/submodule--helper.c:1487
+msgid "suppress output of synchronizing submodule url"
+msgstr "隱��模組 URL �步的輸出"
+
+#: builtin/submodule--helper.c:1494
+msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
+msgstr "git submodule--helper sync [--quiet] [--recursive] [<路徑>]"
+
+#: 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)"
+msgstr ""
+"�模組工作� '%s' 包�一個 .git 目錄（如果您確需刪除它�其全部歷�，使用 'rm "
+"-rf' 指令）"
+
+#: builtin/submodule--helper.c:1560
+#, c-format
+msgid ""
+"Submodule work tree '%s' contains local modifications; use '-f' to discard "
+"them"
+msgstr "�模組工作� '%s' 包�本機修改；使用 '-f' �棄它們"
+
+#: builtin/submodule--helper.c:1568
+#, c-format
+msgid "Cleared directory '%s'\n"
+msgstr "已清除目錄 '%s'\n"
+
+#: builtin/submodule--helper.c:1570
+#, c-format
+msgid "Could not remove submodule work tree '%s'\n"
+msgstr "無法移除�模組工作� '%s'\n"
+
+#: builtin/submodule--helper.c:1581
+#, c-format
+msgid "could not create empty submodule directory %s"
+msgstr "�能建立空的�模組目錄 %s"
+
+#: builtin/submodule--helper.c:1597
+#, c-format
+msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
+msgstr "�模組 '%s'（%s）未�路徑 '%s' 註冊\n"
+
+#: builtin/submodule--helper.c:1626
+msgid "remove submodule working trees even if they contain local changes"
+msgstr "�使有本機變更�移除�模組的工作�"
+
+#: builtin/submodule--helper.c:1627
+msgid "unregister all submodules"
+msgstr "�消註冊所有�模組"
+
+#: builtin/submodule--helper.c:1632
+msgid ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
+msgstr ""
+"git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路徑>...]]"
+
+#: builtin/submodule--helper.c:1646
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "如果您確定想��所有�模組執行�消�始化，請使用 '--all'"
+
+#: 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"
+"submodule.alternateErrorStrategy to 'info' or, equivalently, clone with\n"
+"'--reference-if-able' instead of '--reference'."
+msgstr ""
+"從上級專案的備用版本庫計算得出的備用版本庫無效。\n"
+"這種情�下，請設定 submodule.alternateErrorStrategy 為 'info'\n"
+"以�許 Git �用備用版本庫複製，亦�使用等效的 '--reference-if-able'\n"
+"而� '--reference' 複製。"
+
+#: builtin/submodule--helper.c:1729 builtin/submodule--helper.c:1732
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "�模組 '%s' �能新增版本庫備�：%s"
+
+#: builtin/submodule--helper.c:1768
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "�能識別 submodule.alternateErrorStrategy 的�值 '%s'"
+
+#: builtin/submodule--helper.c:1775
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "�能識別 submodule.alternateLocation 的�值 '%s'"
+
+#: builtin/submodule--helper.c:1800
+#, c-format
+msgid "refusing to create/use '%s' in another submodule's git dir"
+msgstr "拒絕在其他�模組的 git 路徑建立�使用「%s�"
+
+#: builtin/submodule--helper.c:1841
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "無法複製 '%s' 到�模組路徑 '%s'"
+
+#: builtin/submodule--helper.c:1846
+#, c-format
+msgid "directory not empty: '%s'"
+msgstr "目錄�是空的：「%s�"
+
+#: builtin/submodule--helper.c:1858
+#, c-format
+msgid "could not get submodule directory for '%s'"
+msgstr "無法得到 '%s' 的�模組目錄"
+
+#: builtin/submodule--helper.c:1890 builtin/submodule--helper.c:2894
+msgid "where the new submodule will be cloned to"
+msgstr "新的�模組將�複製的路徑"
+
+#: builtin/submodule--helper.c:1893 builtin/submodule--helper.c:2897
+msgid "name of the new submodule"
+msgstr "新�模組的�稱"
+
+#: builtin/submodule--helper.c:1896 builtin/submodule--helper.c:2900
+msgid "url where to clone the submodule from"
+msgstr "複製�模組的 url ��"
+
+#: builtin/submodule--helper.c:1904 builtin/submodule--helper.c:2907
+msgid "depth for shallow clones"
+msgstr "淺複製的深度"
+
+#: builtin/submodule--helper.c:1907 builtin/submodule--helper.c:2365
+#: builtin/submodule--helper.c:2909
+msgid "force cloning progress"
+msgstr "強制顯示複製進度"
+
+#: builtin/submodule--helper.c:1909 builtin/submodule--helper.c:2367
+msgid "disallow cloning into non-empty directory"
+msgstr "��許複製至�空白目錄"
+
+#: builtin/submodule--helper.c:1916
+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=<路徑>] [--quiet] [--reference <版本庫"
+">] [--name <�字>] [--depth <深度>] [--single-branch] --url <url> --path <路"
+"徑>"
+
+#: builtin/submodule--helper.c:1953
+#, c-format
+msgid "Invalid update mode '%s' for submodule path '%s'"
+msgstr "�模組 '%2$s' 的更新模� '%1$s' 無效"
+
+#: builtin/submodule--helper.c:1957
+#, c-format
+msgid "Invalid update mode '%s' configured for submodule path '%s'"
+msgstr "為�模組 '%2$s' 設定的更新模� '%1$s' 無效"
+
+#: builtin/submodule--helper.c:2058
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "�模組 '%s' 尚未�始化"
+
+#: builtin/submodule--helper.c:2062
+msgid "Maybe you want to use 'update --init'?"
+msgstr "也許您想�執行 'update --init'？"
+
+#: builtin/submodule--helper.c:2092
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "略�未�併的�模組 %s"
+
+#: builtin/submodule--helper.c:2121
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "略��模組 '%s'"
+
+#: builtin/submodule--helper.c:2271
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "複製 '%s' 失敗。已排程�試作業"
+
+#: builtin/submodule--helper.c:2282
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "第二次嘗試複製 '%s' 失敗，中止作業"
+
+#: builtin/submodule--helper.c:2344 builtin/submodule--helper.c:2590
+msgid "path into the working tree"
+msgstr "到工作�的路徑"
+
+#: builtin/submodule--helper.c:2347
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr "工作�中的路徑，�迴嵌套�模組"
+
+#: builtin/submodule--helper.c:2351
+msgid "rebase, merge, checkout or none"
+msgstr "rebase�merge�checkout 或 none"
+
+#: builtin/submodule--helper.c:2357
+msgid "create a shallow clone truncated to the specified number of revisions"
+msgstr "建立一個縮減至指定版本數的淺複製"
+
+#: builtin/submodule--helper.c:2360
+msgid "parallel jobs"
+msgstr "並行任務"
+
+#: builtin/submodule--helper.c:2362
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "�始複製是�應該�循建議的淺複製�項"
+
+#: builtin/submodule--helper.c:2363
+msgid "don't print cloning progress"
+msgstr "��輸出複製進度"
+
+#: builtin/submodule--helper.c:2374
+msgid "git submodule--helper update-clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update-clone [--prefix=<路徑>] [<路徑>...]"
+
+#: builtin/submodule--helper.c:2387
+msgid "bad value for update parameter"
+msgstr "update �數�值錯誤"
+
+#: builtin/submodule--helper.c:2435
+#, 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:2558
+#, c-format
+msgid "could not get a repository handle for submodule '%s'"
+msgstr "無法�得�模組 '%s' 的版本庫�柄"
+
+#: builtin/submodule--helper.c:2591
+msgid "recurse into submodules"
+msgstr "在�模組中�迴"
+
+#: builtin/submodule--helper.c:2597
+msgid "git submodule--helper absorb-git-dirs [<options>] [<path>...]"
+msgstr "git submodule--helper absorb-git-dirs [<�項>] [<路徑>...]"
+
+#: builtin/submodule--helper.c:2653
+msgid "check if it is safe to write to the .gitmodules file"
+msgstr "檢查寫入 .gitmodules 檔案是�安全"
+
+#: builtin/submodule--helper.c:2656
+msgid "unset the config in the .gitmodules file"
+msgstr "�消 .gitmodules 檔案中的設定"
+
+#: builtin/submodule--helper.c:2661
+msgid "git submodule--helper config <name> [<value>]"
+msgstr "git submodule--helper config <�稱> [<值>]"
+
+#: builtin/submodule--helper.c:2662
+msgid "git submodule--helper config --unset <name>"
+msgstr "git submodule--helper config --unset <�稱>"
+
+#: builtin/submodule--helper.c:2663
+msgid "git submodule--helper config --check-writeable"
+msgstr "git submodule--helper config --check-writeable"
+
+#: 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 "請確� .gitmodules 檔案在工作�裡"
+
+#: builtin/submodule--helper.c:2698
+msgid "suppress output for setting url of a submodule"
+msgstr "隱��模組設定 URL 的輸出"
+
+#: builtin/submodule--helper.c:2702
+msgid "git submodule--helper set-url [--quiet] <path> <newurl>"
+msgstr "git submodule--helper set-url [--quiet] <路徑> <新 URL>"
+
+#: builtin/submodule--helper.c:2735
+msgid "set the default tracking branch to master"
+msgstr "將�設的追蹤分支設為 master"
+
+#: builtin/submodule--helper.c:2737
+msgid "set the default tracking branch"
+msgstr "設定�設追蹤分支"
+
+#: builtin/submodule--helper.c:2741
+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:2742
+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:2749
+msgid "--branch or --default required"
+msgstr "需� --branch 或 --default"
+
+#: builtin/submodule--helper.c:2752
+msgid "--branch and --default are mutually exclusive"
+msgstr "--branch 與 --default 互斥"
+
+#: builtin/submodule--helper.c:2815
+#, c-format
+msgid "Adding existing repo at '%s' to the index\n"
+msgstr "正在將�於 '%s' 的�有版本庫加入至索引\n"
+
+#: builtin/submodule--helper.c:2818
+#, c-format
+msgid "'%s' already exists and is not a valid git repo"
+msgstr "「%s�已存在，且�是有效的 git 版本庫"
+
+#: builtin/submodule--helper.c:2828
+#, fuzzy, c-format
+#| msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgid "A git directory for '%s' is found locally with remote(s):"
+msgstr "在本機找到「%s�Git 目錄，與其�應的�端版本庫："
+
+#: 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 ""
+"如果您想�直接使用這個本機 git 目錄，而��新複製自\n"
+"  %s\n"
+"請使用 '--force' �項。如果本機 git 目錄�是正確的版本庫\n"
+"或者說您�確定，請使用 '--name' �項輸入其他�稱。\n"
+
+#: builtin/submodule--helper.c:2842
+#, c-format
+msgid "Reactivating local git directory for submodule '%s'\n"
+msgstr "正在�新啟用「%s��模組的本機 Git 目錄\n"
+
+#: builtin/submodule--helper.c:2875
+#, c-format
+msgid "unable to checkout submodule '%s'"
+msgstr "無法簽出「%s��模組"
+
+#: builtin/submodule--helper.c:2888
+msgid "branch of repository to checkout on cloning"
+msgstr "複製時�簽出的版本庫分支"
+
+#: builtin/submodule--helper.c:2910
+msgid "allow adding an otherwise ignored submodule path"
+msgstr "�許加入忽略的�模組路徑"
+
+#: builtin/submodule--helper.c:2917
+msgid ""
+"git submodule--helper add-clone [<options>...] --url <url> --path <path> --"
+"name <name>"
+msgstr ""
+"git submodule--helper add-clone [<�項>...] --url <URL> --path <路徑> --name "
+"<�稱>"
+
+#: builtin/submodule--helper.c:2985 git.c:449 git.c:724
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s �支� --super-prefix"
+
+#: builtin/submodule--helper.c:2991
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' �是一個有效的 submodule--helper �指令"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<�項>] <�稱> [<引用>]"
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <�稱>"
+
+#: builtin/symbolic-ref.c:42
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "�顯示�符號（分離的）引用的錯誤訊�"
+
+#: builtin/symbolic-ref.c:43
+msgid "delete symbolic ref"
+msgstr "刪除符號引用"
+
+#: builtin/symbolic-ref.c:44
+msgid "shorten ref output"
+msgstr "縮短引用輸出"
+
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+msgid "reason"
+msgstr "原因"
+
+#: builtin/symbolic-ref.c:45 builtin/update-ref.c:499
+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>]"
+msgstr ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <消�> | -F <檔案>]\n"
+"\t\t<標籤�> [<頭>]"
+
+#: builtin/tag.c:27
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <標籤�>..."
+
+#: 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>...]"
+msgstr ""
+"git tag -l [-n[<數字>]] [--contains <�交>] [--no-contains <�交>] [--points-"
+"at <物件>]\n"
+"\t\t[--format=<格�>] [--merged <�交>] [--no-merged <�交>] [<模�>...]"
+
+#: builtin/tag.c:30
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<格�>] <標籤�>..."
+
+#: builtin/tag.c:100
+#, c-format
+msgid "tag '%s' not found."
+msgstr "未發�標籤 '%s'。"
+
+#: builtin/tag.c:135
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "已刪除標籤 '%s'（曾為 %s）\n"
+
+#: builtin/tag.c:170
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"輸入一個標籤說明：\n"
+"  %s\n"
+"以 '%c' 開頭的行將被忽略。\n"
+
+#: builtin/tag.c:174
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+"  %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"輸入一個標籤說明：\n"
+"  %s\n"
+"以 '%c' 開頭的行將被�留，如果您願�也�以刪除它們。\n"
+
+#: builtin/tag.c:241
+msgid "unable to sign the tag"
+msgstr "無法簽署標籤"
+
+#: builtin/tag.c:259
+#, 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 ""
+"您建立了一個嵌套的標籤。您的新標籤指�的物件已經是一個標籤。如果您想�\n"
+"�其指�的目標建立標籤，使用：\n"
+"\n"
+"\tgit tag -f %s %s^{}"
+
+#: builtin/tag.c:275
+msgid "bad object type."
+msgstr "壞的物件類型。"
+
+#: builtin/tag.c:328
+msgid "no tag message?"
+msgstr "無標籤說明？"
+
+#: builtin/tag.c:335
+#, c-format
+msgid "The tag message has been left in %s\n"
+msgstr "標籤說明被�留在 %s\n"
+
+#: builtin/tag.c:446
+msgid "list tag names"
+msgstr "列出標籤�稱"
+
+#: builtin/tag.c:448
+msgid "print <n> lines of each tag message"
+msgstr "�個標籤訊�列� <n> 行"
+
+#: builtin/tag.c:450
+msgid "delete tags"
+msgstr "刪除標籤"
+
+#: builtin/tag.c:451
+msgid "verify tags"
+msgstr "驗證標籤"
+
+#: builtin/tag.c:453
+msgid "Tag creation options"
+msgstr "標籤建立�項"
+
+#: builtin/tag.c:455
+msgid "annotated tag, needs a message"
+msgstr "附註標籤，需�一個說明"
+
+#: builtin/tag.c:457
+msgid "tag message"
+msgstr "標籤說明"
+
+#: builtin/tag.c:459
+msgid "force edit of tag message"
+msgstr "強制編輯標籤說明"
+
+#: builtin/tag.c:460
+msgid "annotated and GPG-signed tag"
+msgstr "附註並附加 GPG 簽�的標籤"
+
+#: builtin/tag.c:463
+msgid "use another key to sign the tag"
+msgstr "使用�外的�鑰簽�該標籤"
+
+#: builtin/tag.c:464
+msgid "replace the tag if exists"
+msgstr "如果存在，�代�有的標籤"
+
+#: builtin/tag.c:465 builtin/update-ref.c:505
+msgid "create a reflog"
+msgstr "建立引用日誌"
+
+#: builtin/tag.c:467
+msgid "Tag listing options"
+msgstr "標籤列表�項"
+
+#: builtin/tag.c:468
+msgid "show tag list in columns"
+msgstr "以列的方�顯示標籤列表"
+
+#: builtin/tag.c:469 builtin/tag.c:471
+msgid "print only tags that contain the commit"
+msgstr "�列�包�該�交的標籤"
+
+#: builtin/tag.c:470 builtin/tag.c:472
+msgid "print only tags that don't contain the commit"
+msgstr "�列��包�該�交的標籤"
+
+#: builtin/tag.c:473
+msgid "print only tags that are merged"
+msgstr "�列�已經�併的標籤"
+
+#: builtin/tag.c:474
+msgid "print only tags that are not merged"
+msgstr "�列�尚未�併的標籤"
+
+#: builtin/tag.c:478
+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:592
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' �是一個有效的標籤�稱。"
+
+#: builtin/tag.c:597
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "標籤 '%s' 已存在"
+
+#: builtin/tag.c:628
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "已更新標籤 '%s'（曾為 %s）\n"
+
+#: builtin/unpack-objects.c:504
+msgid "Unpacking objects"
+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 失敗"
+
+#: builtin/update-index.c:108
+#, c-format
+msgid "failed to delete file %s"
+msgstr "刪除檔案 %s 失敗"
+
+#: builtin/update-index.c:115 builtin/update-index.c:221
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "刪除目錄 %s 失敗"
+
+#: builtin/update-index.c:140
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "在 '%s' 中測試 mtime "
+
+#: builtin/update-index.c:154
+msgid "directory stat info does not change after adding a new file"
+msgstr "新增一個新檔案後，目錄的狀態訊�未改變"
+
+#: builtin/update-index.c:167
+msgid "directory stat info does not change after adding a new directory"
+msgstr "新增一個新目錄後，目錄的狀態訊�未改變"
+
+#: builtin/update-index.c:180
+msgid "directory stat info changes after updating a file"
+msgstr "更新一個檔案後，目錄的狀態訊�被修改"
+
+#: builtin/update-index.c:191
+msgid "directory stat info changes after adding a file inside subdirectory"
+msgstr "在�目錄中新增檔案後，目錄的狀態訊�被修改"
+
+#: builtin/update-index.c:202
+msgid "directory stat info does not change after deleting a file"
+msgstr "刪除一個檔案後，目錄的狀態訊�未改變"
+
+#: builtin/update-index.c:215
+msgid "directory stat info does not change after deleting a directory"
+msgstr "刪除一個目錄後，目錄的狀態訊�未改變"
+
+#: builtin/update-index.c:222
+msgid " OK"
+msgstr " OK"
+
+#: builtin/update-index.c:591
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<�項>] [--] [<檔案>...]"
+
+#: builtin/update-index.c:976
+msgid "continue refresh even when index needs update"
+msgstr "當索引需�更新時繼續�新整�"
+
+#: builtin/update-index.c:979
+msgid "refresh: ignore submodules"
+msgstr "�新整�：忽略�模組"
+
+#: builtin/update-index.c:982
+msgid "do not ignore new files"
+msgstr "�忽略新的檔案"
+
+#: builtin/update-index.c:984
+msgid "let files replace directories and vice-versa"
+msgstr "讓檔案�代目錄（�之亦然）"
+
+#: builtin/update-index.c:986
+msgid "notice files missing from worktree"
+msgstr "通知檔案從工作��失"
+
+#: builtin/update-index.c:988
+msgid "refresh even if index contains unmerged entries"
+msgstr "�使索引�包�未�併的�目也執行�新整�"
+
+#: builtin/update-index.c:991
+msgid "refresh stat information"
+msgstr "�新整�統計訊�"
+
+#: builtin/update-index.c:995
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "類似於 --refresh，但是忽略 assume-unchanged 設定"
+
+#: builtin/update-index.c:999
+msgid "<mode>,<object>,<path>"
+msgstr "<存�模�>,<物件>,<路徑>"
+
+#: builtin/update-index.c:1000
+msgid "add the specified entry to the index"
+msgstr "新增指定的�目到索引�"
+
+#: builtin/update-index.c:1010
+msgid "mark files as \"not changing\""
+msgstr "把檔案標記為 \"沒有變更\""
+
+#: builtin/update-index.c:1013
+msgid "clear assumed-unchanged bit"
+msgstr "清除 assumed-unchanged �"
+
+#: builtin/update-index.c:1016
+msgid "mark files as \"index-only\""
+msgstr "把檔案標記為 \"僅索引\""
+
+#: builtin/update-index.c:1019
+msgid "clear skip-worktree bit"
+msgstr "清除 skip-worktree �"
+
+#: builtin/update-index.c:1022
+msgid "do not touch index-only entries"
+msgstr "��建立�有索引的項目"
+
+#: builtin/update-index.c:1024
+msgid "add to index only; do not add content to object database"
+msgstr "�新增到索引�；�新增物件到物件庫"
+
+#: builtin/update-index.c:1026
+msgid "remove named paths even if present in worktree"
+msgstr "�使存在工作�裡，也刪除路徑"
+
+#: builtin/update-index.c:1028
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "攜帶 --stdin：輸入的行以 null 字元終止"
+
+#: builtin/update-index.c:1030
+msgid "read list of paths to be updated from standard input"
+msgstr "從標準輸入中讀�需�更新的路徑列表"
+
+#: builtin/update-index.c:1034
+msgid "add entries from standard input to the index"
+msgstr "從標準輸入新增�目到索引�"
+
+#: builtin/update-index.c:1038
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "為指定檔案�新生�第2和第3暫存�"
+
+#: builtin/update-index.c:1042
+msgid "only update entries that differ from HEAD"
+msgstr "�更新與 HEAD ��的�目"
+
+#: builtin/update-index.c:1046
+msgid "ignore files missing from worktree"
+msgstr "忽略工作��失的檔案"
+
+#: builtin/update-index.c:1049
+msgid "report actions to standard output"
+msgstr "在標準輸出顯示動作"
+
+#: builtin/update-index.c:1051
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(for porcelains) 忘記儲存的未解決的��"
+
+#: builtin/update-index.c:1055
+msgid "write index in this format"
+msgstr "以這種格�寫入索引�"
+
+#: builtin/update-index.c:1057
+msgid "enable or disable split index"
+msgstr "啟用或�用索引分割"
+
+#: builtin/update-index.c:1059
+msgid "enable/disable untracked cache"
+msgstr "啟用/�用�未追蹤檔案的快�"
+
+#: builtin/update-index.c:1061
+msgid "test if the filesystem supports untracked cache"
+msgstr "測試檔案系統是�支�未追蹤檔案快�"
+
+#: builtin/update-index.c:1063
+msgid "enable untracked cache without testing the filesystem"
+msgstr "無需檢測檔案系統，啟用�未追蹤檔案的快�"
+
+#: builtin/update-index.c:1065
+msgid "write out the index even if is not flagged as changed"
+msgstr "�使沒有被標記為已更改，也�寫出索引"
+
+#: builtin/update-index.c:1067
+msgid "enable or disable file system monitor"
+msgstr "啟用或�用檔案系統監控"
+
+#: builtin/update-index.c:1069
+msgid "mark files as fsmonitor valid"
+msgstr "標記檔案為 fsmonitor 有效"
+
+#: builtin/update-index.c:1072
+msgid "clear fsmonitor valid bit"
+msgstr "清除 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 被設定為 false。如果您確定�啟用索引分割，請移除或修改"
+
+#: 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 被設定為 true。如果您確定��用索引分割，請移除或修改"
+
+#: 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 被設定為 true。如果您確定��用未追蹤檔案的快�，請移除或"
+"修改"
+
+#: builtin/update-index.c:1200
+msgid "Untracked cache disabled"
+msgstr "快�未追蹤檔案被�用"
+
+#: 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 被設定為 false。如果您確定�啟用未追蹤檔案快�，請移除或"
+"修改"
+
+#: builtin/update-index.c:1212
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "快�未追蹤檔案在 '%s' 啟用"
+
+#: builtin/update-index.c:1220
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr "core.fsmonitor 未設定；如果想�啟用 fsmonitor 請設定該�項"
+
+#: builtin/update-index.c:1224
+msgid "fsmonitor enabled"
+msgstr "fsmonitor 被啟用"
+
+#: builtin/update-index.c:1227
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr "core.fsmonitor 已設定；如果想��用 fsmonitor 請移除該�項"
+
+#: builtin/update-index.c:1231
+msgid "fsmonitor disabled"
+msgstr "fsmonitor 被�用"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<�項>] -d <引用�> [<舊值>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>]    <refname> <new-val> [<old-val>]"
+msgstr "git update-ref [<�項>]    <引用�> <新值> [<舊值>]"
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<�項>] --stdin [-z]"
+
+#: builtin/update-ref.c:500
+msgid "delete the reference"
+msgstr "刪除引用"
+
+#: builtin/update-ref.c:502
+msgid "update <refname> not the one it points to"
+msgstr "更新 <引用�> 本身而�是它指�的引用"
+
+#: builtin/update-ref.c:503
+msgid "stdin has NUL-terminated arguments"
+msgstr "標準輸入有以 NUL 字元終止的�數"
+
+#: builtin/update-ref.c:504
+msgid "read updates from stdin"
+msgstr "從標準輸入讀�更新"
+
+#: builtin/update-server-info.c:7
+msgid "git update-server-info [--force]"
+msgstr "git update-server-info [--force]"
+
+#: builtin/update-server-info.c:15
+msgid "update the info files from scratch"
+msgstr "從頭開始更新檔案訊�"
+
+#: builtin/upload-pack.c:11
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<�項>] <目錄>"
+
+#: builtin/upload-pack.c:23 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:27
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "如果 <目錄> �是一個 Git 目錄，��嘗試 <目錄>/.git/"
+
+#: builtin/upload-pack.c:29
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "�活動 <n> 秒�後終止傳輸"
+
+#: builtin/verify-commit.c:19
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <�交>..."
+
+#: builtin/verify-commit.c:68
+msgid "print commit contents"
+msgstr "列��交內容"
+
+#: builtin/verify-commit.c:69 builtin/verify-tag.c:37
+msgid "print raw gpg status output"
+msgstr "列�原始 gpg 狀態輸出"
+
+#: builtin/verify-pack.c:59
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <包>..."
+
+#: builtin/verify-pack.c:70
+msgid "verbose"
+msgstr "詳細輸出"
+
+#: builtin/verify-pack.c:72
+msgid "show statistics only"
+msgstr "�顯示統計"
+
+#: builtin/verify-tag.c:18
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<格�>] <標籤>..."
+
+#: builtin/verify-tag.c:36
+msgid "print tag contents"
+msgstr "列�標籤內容"
+
+#: builtin/worktree.c:18
+msgid "git worktree add [<options>] <path> [<commit-ish>]"
+msgstr "git worktree add [<�項>] <路徑> [<�交>]"
+
+#: builtin/worktree.c:19
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<�項>]"
+
+#: builtin/worktree.c:20
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<�項>] <路徑>"
+
+#: builtin/worktree.c:21
+msgid "git worktree move <worktree> <new-path>"
+msgstr "git worktree move <工作�> <新路徑>"
+
+#: builtin/worktree.c:22
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<�項>]"
+
+#: builtin/worktree.c:23
+msgid "git worktree remove [<options>] <worktree>"
+msgstr "git worktree remove [<�項>] <工作�>"
+
+#: builtin/worktree.c:24
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <路徑>"
+
+#: builtin/worktree.c:61 builtin/worktree.c:944
+#, c-format
+msgid "failed to delete '%s'"
+msgstr "刪除 '%s' 失敗"
+
+#: builtin/worktree.c:74
+#, c-format
+msgid "Removing %s/%s: %s"
+msgstr "移除 %s/%s: %s"
+
+#: builtin/worktree.c:147
+msgid "report pruned working trees"
+msgstr "報告清除的工作�"
+
+#: builtin/worktree.c:149
+msgid "expire working trees older than <time>"
+msgstr "將早於 <時間> 的工作��期"
+
+#: builtin/worktree.c:219
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s' 已經存在"
+
+#: builtin/worktree.c:228
+#, c-format
+msgid "unusable worktree destination '%s'"
+msgstr "無法使用的工作目錄目的地「%s�"
+
+#: 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 ""
+"'%s' 是個�失但被鎖定的工作�；\n"
+"使用 '%s -f -f' 覆蓋，或 'unlock' 和 'prune' 或 'remove' 清除"
+
+#: 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 ""
+"'%s' 是個�失但已註冊的工作�；\n"
+"使用 '%s -f' 覆蓋，或 'prune' 或 'remove' 清除"
+
+#: builtin/worktree.c:286
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "�能建立目錄 '%s'"
+
+#: builtin/worktree.c:308
+msgid "initializing"
+msgstr "正在�始化"
+
+#: builtin/worktree.c:420 builtin/worktree.c:426
+#, c-format
+msgid "Preparing worktree (new branch '%s')"
+msgstr "準備工作�（新分支 '%s'）"
+
+#: builtin/worktree.c:422
+#, c-format
+msgid "Preparing worktree (resetting branch '%s'; was at %s)"
+msgstr "準備工作�（�設分支 '%s'，之�為 %s）"
+
+#: builtin/worktree.c:431
+#, c-format
+msgid "Preparing worktree (checking out '%s')"
+msgstr "準備工作�（簽出 '%s'）"
+
+#: 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 "簽出 <分支>，�使已經被簽出到其它工作�"
+
+#: builtin/worktree.c:485
+msgid "create a new branch"
+msgstr "建立一個新分支"
+
+#: builtin/worktree.c:487
+msgid "create or reset a branch"
+msgstr "建立或�設一個分支"
+
+#: builtin/worktree.c:489
+msgid "populate the new working tree"
+msgstr "生�新的工作�"
+
+#: builtin/worktree.c:490
+msgid "keep the new working tree locked"
+msgstr "鎖定新工作�"
+
+#: 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:498
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "嘗試為新分支�符�一個�端追蹤分支"
+
+#: builtin/worktree.c:506
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b�-B 和 --detach 是互斥的"
+
+#: builtin/worktree.c:508
+msgid "--reason requires --lock"
+msgstr "--reason 需� --lock"
+
+#: builtin/worktree.c:512
+msgid "added with --lock"
+msgstr "已使用 --lock 加入"
+
+#: builtin/worktree.c:574
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "�能在建立新分支時使用 --[no-]track �項"
+
+#: builtin/worktree.c:691
+msgid "show extended annotations and reasons, if available"
+msgstr "如果有則顯示延伸的註釋和原因"
+
+#: builtin/worktree.c:693
+msgid "add 'prunable' annotation to worktrees older than <time>"
+msgstr "�舊於 <時間> 的工作�加上 ‘prunable’ 標示"
+
+#: builtin/worktree.c:702
+msgid "--verbose and --porcelain are mutually exclusive"
+msgstr "--verbose 和 --porcelain 互斥"
+
+#: 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:743 builtin/worktree.c:776
+msgid "The main working tree cannot be locked or unlocked"
+msgstr "主工作�無法被加鎖或解鎖"
+
+#: builtin/worktree.c:748
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' 已被鎖定，原因：%s"
+
+#: builtin/worktree.c:750
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' 已被鎖定"
+
+#: builtin/worktree.c:778
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' 未被鎖定"
+
+#: builtin/worktree.c:819
+msgid "working trees containing submodules cannot be moved or removed"
+msgstr "�能移動或刪除包��模組的工作�"
+
+#: builtin/worktree.c:827
+msgid "force move even if worktree is dirty or locked"
+msgstr "強制移動，�使工作�是髒的或已鎖定"
+
+#: builtin/worktree.c:850 builtin/worktree.c:974
+#, c-format
+msgid "'%s' is a main working tree"
+msgstr "'%s' 是一個主工作�"
+
+#: builtin/worktree.c:855
+#, c-format
+msgid "could not figure out destination name from '%s'"
+msgstr "無法從 '%s' 算出目標�稱"
+
+#: 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 ""
+"無法移動一個鎖定的工作�，鎖定原因：%s\n"
+"使用 'move -f -f' 覆蓋或先解鎖"
+
+#: builtin/worktree.c:870
+msgid ""
+"cannot move a locked working tree;\n"
+"use 'move -f -f' to override or unlock first"
+msgstr ""
+"無法移動一個鎖定的工作�，\n"
+"使用 'move -f -f' 覆蓋或先解鎖"
+
+#: builtin/worktree.c:873
+#, c-format
+msgid "validation failed, cannot move working tree: %s"
+msgstr "驗證失敗，無法移動工作�：%s"
+
+#: builtin/worktree.c:878
+#, c-format
+msgid "failed to move '%s' to '%s'"
+msgstr "移動 '%s' 到 '%s' 失敗"
+
+#: builtin/worktree.c:924
+#, c-format
+msgid "failed to run 'git status' on '%s'"
+msgstr "在 '%s' 中執行 'git status' 失敗"
+
+#: builtin/worktree.c:928
+#, c-format
+msgid "'%s' contains modified or untracked files, use --force to delete it"
+msgstr "'%s' 包�修改或未追蹤的檔案，使用 --force 刪除"
+
+#: builtin/worktree.c:933
+#, c-format
+msgid "failed to run 'git status' on '%s', code %d"
+msgstr "在 '%s' 中執行 'git status' 失敗，離開碼 %d"
+
+#: builtin/worktree.c:956
+msgid "force removal even if worktree is dirty or locked"
+msgstr "強制刪除，�使工作�是髒的或已鎖定"
+
+#: 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 ""
+"無法刪除一個鎖定的工作�，鎖定原因：%s\n"
+"使用 'remove -f -f' 覆蓋或先解鎖"
+
+#: builtin/worktree.c:981
+msgid ""
+"cannot remove a locked working tree;\n"
+"use 'remove -f -f' to override or unlock first"
+msgstr ""
+"無法刪除一個鎖定的工作�，\n"
+"使用 'remove -f -f' 覆蓋或先解鎖"
+
+#: builtin/worktree.c:984
+#, c-format
+msgid "validation failed, cannot remove working tree: %s"
+msgstr "驗證失敗，無法刪除工作�：%s"
+
+#: builtin/worktree.c:1008
+#, c-format
+msgid "repair: %s: %s"
+msgstr "修復：%s：%s"
+
+#: builtin/worktree.c:1011
+#, c-format
+msgid "error: %s: %s"
+msgstr "錯誤：%s：%s"
+
+#: builtin/write-tree.c:15
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<�綴>/]"
+
+#: builtin/write-tree.c:28
+msgid "<prefix>/"
+msgstr "<�綴>/"
+
+#: builtin/write-tree.c:29
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "將 <�綴> �目錄內容寫到一個樹狀物件"
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr "��除錯有用"
+
+#: git.c:28
+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"
+"           [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n"
+"           [--super-prefix=<path>] [--config-env=<name>=<envvar>]\n"
+"           <command> [<args>]"
+msgstr ""
+"git [--version] [--help] [-C <路徑>] [-c <�稱>=<數值>]\n"
+"           [--exec-path[=<路徑>]] [--html-path] [--man-path] [--info-path]\n"
+"           [-p | --paginate | -P | --no-pager] [--no-replace-objects] [--"
+"bare]\n"
+"           [--git-dir=<路徑>] [--work-tree=<路徑>] [--namespace=<�稱>]\n"
+"           [--super-prefix=<路徑>] [--config-env=<�稱>=<環境變數>]\n"
+"           <命令> [<引數>]"
+
+#: 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"
+"to read about a specific subcommand or concept.\n"
+"See 'git help git' for an overview of the system."
+msgstr ""
+"指令 'git help -a' 和 'git help -g' 顯示�用的�指令和一些概念說明。\n"
+"檢視 'git help <命令>' 或 'git help <概念>' 以�得�供�指令或概念\n"
+"說明。\n"
+"有關系統概述，檢視 'git help git'。"
+
+#: git.c:188
+#, c-format
+msgid "no directory given for --git-dir\n"
+msgstr "沒有為 --git-dir �供目錄\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"
+msgstr "沒有為 --super-prefix �供�綴\n"
+
+#: git.c:252
+#, c-format
+msgid "-c expects a configuration string\n"
+msgstr "應為 -c �供一個設定字串\n"
+
+#: git.c:260
+#, c-format
+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"
+msgstr "未知�項：%s\n"
+
+#: git.c:375
+#, c-format
+msgid "while expanding alias '%s': '%s'"
+msgstr "在擴展別� '%s' 時：'%s'"
+
+#: git.c:384
+#, c-format
+msgid ""
+"alias '%s' changes environment variables.\n"
+"You can use '!git' in the alias to do this"
+msgstr ""
+"別� '%s' 修改環境變數。您�以使用在別�中\n"
+"使用 '!git'"
+
+#: git.c:391
+#, c-format
+msgid "empty alias for %s"
+msgstr "%s 的空別�"
+
+#: git.c:394
+#, c-format
+msgid "recursive alias: %s"
+msgstr "�迴的別�：%s"
+
+#: git.c:476
+msgid "write failure on standard output"
+msgstr "在標準輸出寫入失敗"
+
+#: git.c:478
+msgid "unknown write failure on standard output"
+msgstr "到標準輸出的未知寫入錯誤"
+
+#: git.c:480
+msgid "close failed on standard output"
+msgstr "標準輸出關閉失敗"
+
+#: git.c:833
+#, c-format
+msgid "alias loop detected: expansion of '%s' does not terminate:%s"
+msgstr "檢測到別�循環：'%s'的擴展未終止：%s"
+
+#: git.c:883
+#, c-format
+msgid "cannot handle %s as a builtin"
+msgstr "�能作為內建指令處� %s"
+
+#: git.c:896
+#, c-format
+msgid ""
+"usage: %s\n"
+"\n"
+msgstr ""
+"用法：%s\n"
+"\n"
+
+#: git.c:916
+#, c-format
+msgid "expansion of alias '%s' failed; '%s' is not a git command\n"
+msgstr "展開別�指令 '%s' 失敗，'%s' �是一個 git 指令\n"
+
+#: git.c:928
+#, c-format
+msgid "failed to run command '%s': %s\n"
+msgstr "執行指令 '%s' 失敗：%s\n"
+
+#: http-fetch.c:118
+#, c-format
+msgid "argument to --packfile must be a valid hash (got '%s')"
+msgstr "傳入 --packfile 的�數必須是有效的雜湊 (收到 '%s')"
+
+#: http-fetch.c:128
+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 "未處��項"
+
+#: t/helper/test-fast-rebase.c:146
+msgid "error preparing revisions"
+msgstr "準備修訂版本時發生錯誤"
+
+#: t/helper/test-reach.c:154
+#, c-format
+msgid "commit %s is not marked reachable"
+msgstr "�交 %s 沒有標記為�以�得"
+
+#: 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 [<�項>]"
+
+#: 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 "通訊端 (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 "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
+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
+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
+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
+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
+msgid "test-helper simple-ipc send         [<name>] [<token>]"
+msgstr "test-helper simple-ipc send         [<name>] [<token>]"
+
+#: t/helper/test-simple-ipc.c:687
+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
+msgid ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+msgstr ""
+"test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] "
+"[<batchsize>]"
+
+#: t/helper/test-simple-ipc.c:696
+msgid "name or pathname of unix domain socket"
+msgstr "Unix 網域通訊端的�稱或路徑�稱"
+
+#: 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 "�個執行緒的請求數"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "byte"
+msgstr "�元組"
+
+#: t/helper/test-simple-ipc.c:706
+msgid "ballast character"
+msgstr "穩定 (ballast) 字元"
+
+#: t/helper/test-simple-ipc.c:707
+msgid "token"
+msgstr "代符"
+
+#: 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"
+msgstr "http.postbuffer 為負值，�設為 %d"
+
+#: http.c:420
+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:910
+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
+#, c-format
+msgid "Unsupported SSL backend '%s'. Supported SSL backends:"
+msgstr "�支�的 SSL 後端 '%s'。支�的 SSL 後端："
+
+#: http.c:1139
+#, c-format
+msgid "Could not set SSL backend to '%s': cURL was built without SSL backends"
+msgstr "無法將 SSL 後端設定為 '%s'：組建 cURL 時未加入 SSL 後端"
+
+#: http.c:1143
+#, c-format
+msgid "Could not set SSL backend to '%s': already set"
+msgstr "無法將 SSL 後端設定為 '%s'：已經設定"
+
+#: http.c:2034
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+"  asked for: %s\n"
+"   redirect: %s"
+msgstr ""
+"�能更新�定�的 url base：\n"
+"     請求：%s\n"
+"   �定�：%s"
+
+#: remote-curl.c:183
+#, c-format
+msgid "invalid quoting in push-option value: '%s'"
+msgstr "在 push-option �值中無效的引號：'%s'"
+
+#: remote-curl.c:307
+#, c-format
+msgid "%sinfo/refs not valid: is this a git repository?"
+msgstr "%sinfo/refs 無效：這是一個 git 版本庫嗎？"
+
+#: remote-curl.c:408
+msgid "invalid server response; expected service, got flush packet"
+msgstr "無效的�務端回應。�期�務，得到 flush 包"
+
+#: remote-curl.c:439
+#, c-format
+msgid "invalid server response; got '%s'"
+msgstr "無效的�務端回應，得到 '%s'"
+
+#: remote-curl.c:499
+#, c-format
+msgid "repository '%s' not found"
+msgstr "版本庫 '%s' 未找到"
+
+#: remote-curl.c:503
+#, c-format
+msgid "Authentication failed for '%s'"
+msgstr "'%s' 身份驗證失敗"
+
+#: remote-curl.c:507
+#, c-format
+msgid "unable to access '%s': %s"
+msgstr "無法存� '%s'：%s"
+
+#: remote-curl.c:513
+#, c-format
+msgid "redirecting to %s"
+msgstr "�定�到 %s"
+
+#: remote-curl.c:644
+msgid "shouldn't have EOF when not gentle on EOF"
+msgstr "當沒有設定溫和處�檔案��符（EOF）時，�應該有檔案��符"
+
+#: remote-curl.c:656
+msgid "remote server sent unexpected response end packet"
+msgstr "�端伺�器傳�了��期的回應���包"
+
+#: remote-curl.c:726
+msgid "unable to rewind rpc post data - try increasing http.postBuffer"
+msgstr "無法還原 rpc post 資料 - 嘗試增加 http.postBuffer"
+
+#: remote-curl.c:756
+#, c-format
+msgid "remote-curl: bad line length character: %.4s"
+msgstr "remote-curl: 錯誤的行長度字串：%.4s"
+
+#: remote-curl.c:758
+msgid "remote-curl: unexpected response end packet"
+msgstr "remote-curl: ��期的回應���包"
+
+#: remote-curl.c:834
+#, c-format
+msgid "RPC failed; %s"
+msgstr "RPC 失敗。%s"
+
+#: remote-curl.c:874
+msgid "cannot handle pushes this big"
+msgstr "�能處�這麼大的推�"
+
+#: remote-curl.c:989
+#, c-format
+msgid "cannot deflate request; zlib deflate error %d"
+msgstr "�能壓縮請求，zlib 壓縮錯誤 %d"
+
+#: remote-curl.c:993
+#, c-format
+msgid "cannot deflate request; zlib end error %d"
+msgstr "�能壓縮請求，zlib ��錯誤 %d"
+
+#: remote-curl.c:1043
+#, c-format
+msgid "%d bytes of length header were received"
+msgstr "收到了 %d �元組長度的標頭"
+
+#: remote-curl.c:1045
+#, c-format
+msgid "%d bytes of body are still expected"
+msgstr "�期��有 %d �元組的本文 (body)"
+
+#: remote-curl.c:1134
+msgid "dumb http transport does not support shallow capabilities"
+msgstr "啞 http 傳輸�支� shallow 能力"
+
+#: remote-curl.c:1149
+msgid "fetch failed."
+msgstr "�得失敗。"
+
+#: remote-curl.c:1195
+msgid "cannot fetch by sha1 over smart http"
+msgstr "無法��智慧 HTTP �得 sha1"
+
+#: remote-curl.c:1239 remote-curl.c:1245
+#, c-format
+msgid "protocol error: expected sha/ref, got '%s'"
+msgstr "�定錯誤：期望 sha/ref，�得到 '%s'"
+
+#: remote-curl.c:1257 remote-curl.c:1375
+#, c-format
+msgid "http transport does not support %s"
+msgstr "http 傳輸�定�支� %s"
+
+#: remote-curl.c:1293
+msgid "git-http-push failed"
+msgstr "git-http-push 失敗"
+
+#: remote-curl.c:1481
+msgid "remote-curl: usage: git remote-curl <remote> [<url>]"
+msgstr "remote-curl：用法：git remote-curl <�端> [<url>]"
+
+#: remote-curl.c:1513
+msgid "remote-curl: error reading command stream from git"
+msgstr "remote-curl：錯誤讀�來自 git 的指令�"
+
+#: remote-curl.c:1520
+msgid "remote-curl: fetch attempted without a local repo"
+msgstr "remote-curl：嘗試沒有本機版本庫下�得"
+
+#: remote-curl.c:1561
+#, c-format
+msgid "remote-curl: unknown command '%s' from git"
+msgstr "remote-curl：未知的來自 git 的指令 '%s'"
+
+#: compat/compiler.h:26
+msgid "no compiler information available\n"
+msgstr "沒有�用的編譯器資訊\n"
+
+#: compat/compiler.h:38
+msgid "no libc information available\n"
+msgstr "沒有�用的 libc 資訊\n"
+
+#: list-objects-filter-options.h:94
+msgid "args"
+msgstr "�數"
+
+#: list-objects-filter-options.h:95
+msgid "object filtering"
+msgstr "物件�濾"
+
+#: parse-options.h:184
+msgid "expiry-date"
+msgstr "到期時間"
+
+#: parse-options.h:198
+msgid "no-op (backward compatibility)"
+msgstr "空動作（�後相容）"
+
+#: parse-options.h:310
+msgid "be more verbose"
+msgstr "更加詳細"
+
+#: parse-options.h:312
+msgid "be more quiet"
+msgstr "更加安�"
+
+#: parse-options.h:318
+msgid "use <n> digits to display object names"
+msgstr "用 <n> �數字顯示物件�稱"
+
+#: parse-options.h:337
+msgid "how to strip spaces and #comments from message"
+msgstr "設定如何刪除�交說明裡的空格和 #備註"
+
+#: parse-options.h:338
+msgid "read pathspec from file"
+msgstr "從檔案讀� <路徑�格>"
+
+#: parse-options.h:339
+msgid ""
+"with --pathspec-from-file, pathspec elements are separated with NUL character"
+msgstr "如使用 --pathspec-from-file，則 <路徑�格> 元件會使用 NUL 字元分隔"
+
+#: ref-filter.h:99
+msgid "key"
+msgstr "key"
+
+#: ref-filter.h:99
+msgid "field name to sort on"
+msgstr "排�的欄��"
+
+#: rerere.h:44
+msgid "update the index with reused conflict resolution if possible"
+msgstr "如果�能，�用��解決更新索引"
+
+#: command-list.h:50
+msgid "Add file contents to the index"
+msgstr "新增檔案內容至索引"
+
+#: command-list.h:51
+msgid "Apply a series of patches from a mailbox"
+msgstr "套用信箱格�的系列修補檔"
+
+#: command-list.h:52
+msgid "Annotate file lines with commit information"
+msgstr "使用�交說明備註檔案行"
+
+#: command-list.h:53
+msgid "Apply a patch to files and/or to the index"
+msgstr "套用一個修補檔到檔案和/或索引�"
+
+#: command-list.h:54
+msgid "Import a GNU Arch repository into Git"
+msgstr "將一個 GNU Arch 版本庫匯入到 Git"
+
+#: command-list.h:55
+msgid "Create an archive of files from a named tree"
+msgstr "基於命��的樹建立檔案�存"
+
+#: command-list.h:56
+msgid "Use binary search to find the commit that introduced a bug"
+msgstr "��二分�尋定�引入 bug 的�交"
+
+#: command-list.h:57
+msgid "Show what revision and author last modified each line of a file"
+msgstr "顯示檔案�一行最後修改的版本和修改者"
+
+#: command-list.h:58
+msgid "List, create, or delete branches"
+msgstr "列出�建立或刪除分支"
+
+#: command-list.h:59
+msgid "Collect information for user to file a bug report"
+msgstr "幫使用者收集���臭蟲報告的資訊"
+
+#: command-list.h:60
+msgid "Move objects and refs by archive"
+msgstr "��歸檔移動物件和引用"
+
+#: command-list.h:61
+msgid "Provide content or type and size information for repository objects"
+msgstr "�供版本庫物件的內容�類型或大�"
+
+#: command-list.h:62
+msgid "Display gitattributes information"
+msgstr "顯示 gitattributes 訊�"
+
+#: command-list.h:63
+msgid "Debug gitignore / exclude files"
+msgstr "除錯 gitignore / exclude 檔案"
+
+#: command-list.h:64
+msgid "Show canonical names and email addresses of contacts"
+msgstr "顯示�絡人的�範�稱和電�信件"
+
+#: command-list.h:65
+msgid "Switch branches or restore working tree files"
+msgstr "切�分支或復原工作�檔案"
+
+#: command-list.h:66
+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 "尋找尚未套用到上游的�交"
+
+#: command-list.h:69
+msgid "Apply the changes introduced by some existing commits"
+msgstr "套用一些�存�交引入的修改"
+
+#: command-list.h:70
+msgid "Graphical alternative to git-commit"
+msgstr "git-commit 的圖形替代介�"
+
+#: command-list.h:71
+msgid "Remove untracked files from the working tree"
+msgstr "從工作�中刪除未追蹤檔案"
+
+#: command-list.h:72
+msgid "Clone a repository into a new directory"
+msgstr "複製版本庫至新目錄"
+
+#: command-list.h:73
+msgid "Display data in columns"
+msgstr "以列的方�顯示資料"
+
+#: command-list.h:74
+msgid "Record changes to the repository"
+msgstr "記錄變更到版本庫"
+
+#: command-list.h:75
+msgid "Write and verify Git commit-graph files"
+msgstr "寫入和驗證 Git �交圖檔案"
+
+#: command-list.h:76
+msgid "Create a new commit object"
+msgstr "建立一個新的�交物件"
+
+#: command-list.h:77
+msgid "Get and set repository or global options"
+msgstr "�得和設定版本庫或者全域�項"
+
+#: command-list.h:78
+msgid "Count unpacked number of objects and their disk consumption"
+msgstr "計算未打包物件的數�和�碟空間�用"
+
+#: command-list.h:79
+msgid "Retrieve and store user credentials"
+msgstr "檢索和儲存使用者密碼"
+
+#: command-list.h:80
+msgid "Helper to temporarily store passwords in memory"
+msgstr "在記憶體中暫時儲存密碼的�助工具"
+
+#: command-list.h:81
+msgid "Helper to store credentials on disk"
+msgstr "在�碟儲存密碼的�助工具"
+
+#: command-list.h:82
+msgid "Export a single commit to a CVS checkout"
+msgstr "將一個�交匯出到 CVS 簽出中"
+
+#: command-list.h:83
+msgid "Salvage your data out of another SCM people love to hate"
+msgstr "從�外一個人們愛�的設定管�系統中拯救你的資料"
+
+#: command-list.h:84
+msgid "A CVS server emulator for Git"
+msgstr "Git 的一個 CVS �務模擬器"
+
+#: command-list.h:85
+msgid "A really simple server for Git repositories"
+msgstr "一個�常簡單的 Git 版本庫伺�器"
+
+#: command-list.h:86
+msgid "Give an object a human readable name based on an available ref"
+msgstr "基於一個�存的引用為一個物件起一個�讀的�稱"
+
+#: command-list.h:87
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "顯示�交之間��交和工作�之間等的差異"
+
+#: command-list.h:88
+msgid "Compares files in the working tree and the index"
+msgstr "比較工作�和索引�中的檔案"
+
+#: command-list.h:89
+msgid "Compare a tree to the working tree or index"
+msgstr "將一個樹和工作�或索引�比較"
+
+#: command-list.h:90
+msgid "Compares the content and mode of blobs found via two tree objects"
+msgstr "比較兩個樹狀物件的檔案內容和模�"
+
+#: command-list.h:91
+msgid "Show changes using common diff tools"
+msgstr "使用常見的差異工具顯示更改"
+
+#: command-list.h:92
+msgid "Git data exporter"
+msgstr "Git 資料匯出器"
+
+#: command-list.h:93
+msgid "Backend for fast Git data importers"
+msgstr "Git 快速資料匯入器後端"
+
+#: command-list.h:94
+msgid "Download objects and refs from another repository"
+msgstr "從�外一個版本庫下載物件和引用"
+
+#: command-list.h:95
+msgid "Receive missing objects from another repository"
+msgstr "從�一個版本庫�得缺少的物件"
+
+#: command-list.h:96
+msgid "Rewrite branches"
+msgstr "�寫分支"
+
+#: command-list.h:97
+msgid "Produce a merge commit message"
+msgstr "生�一個�併�交說明"
+
+#: command-list.h:98
+msgid "Output information on each ref"
+msgstr "��一個引用輸出訊�"
+
+#: command-list.h:99
+msgid "Run a Git command on a list of repositories"
+msgstr "在列表中的版本庫中執行 Git 命令"
+
+#: command-list.h:100
+msgid "Prepare patches for e-mail submission"
+msgstr "準備電�信件�交的修補檔"
+
+#: command-list.h:101
+msgid "Verifies the connectivity and validity of the objects in the database"
+msgstr "驗證版本庫中物件的連通性和有效性"
+
+#: command-list.h:102
+msgid "Cleanup unnecessary files and optimize the local repository"
+msgstr "清除�必�的檔案和最佳化本機版本庫"
+
+#: command-list.h:103
+msgid "Extract commit ID from an archive created using git-archive"
+msgstr "從 git-archive 建立的歸檔檔案中擷��交 ID"
+
+#: command-list.h:104
+msgid "Print lines matching a pattern"
+msgstr "輸出和模�符�的行"
+
+#: command-list.h:105
+msgid "A portable graphical interface to Git"
+msgstr "一個便攜的 Git 圖形用戶端"
+
+#: command-list.h:106
+msgid "Compute object ID and optionally creates a blob from a file"
+msgstr "從一個檔案計算物件 ID，並�以建立 blob 資料物件"
+
+#: command-list.h:107
+msgid "Display help information about Git"
+msgstr "顯示 Git 的說明訊�"
+
+#: command-list.h:108
+msgid "Server side implementation of Git over HTTP"
+msgstr "Git HTTP �定的�務端實�"
+
+#: command-list.h:109
+msgid "Download from a remote Git repository via HTTP"
+msgstr "通� HTTP 從�端 Git 版本庫下載"
+
+#: command-list.h:110
+msgid "Push objects over HTTP/DAV to another repository"
+msgstr "通� HTTP/DAV 推�物件�一個版本庫"
+
+#: command-list.h:111
+msgid "Send a collection of patches from stdin to an IMAP folder"
+msgstr "從標準輸入將一組修補檔傳�到IMAP資料夾"
+
+#: command-list.h:112
+msgid "Build pack index file for an existing packed archive"
+msgstr "從一個�存的包存檔檔案建立包索引"
+
+#: command-list.h:113
+msgid "Create an empty Git repository or reinitialize an existing one"
+msgstr "建立一個空的 Git 版本庫或�新�始化一個已存在的版本庫"
+
+#: command-list.h:114
+msgid "Instantly browse your working repository in gitweb"
+msgstr "在 gitweb 中�時�覽您的工作版本庫"
+
+#: command-list.h:115
+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
+msgid "Show information about files in the index and the working tree"
+msgstr "顯示索引和工作�中檔案的訊�"
+
+#: command-list.h:119
+msgid "List references in a remote repository"
+msgstr "顯示一個�端版本庫的引用"
+
+#: command-list.h:120
+msgid "List the contents of a tree object"
+msgstr "顯示一個樹狀物件的內容"
+
+#: command-list.h:121
+msgid "Extracts patch and authorship from a single e-mail message"
+msgstr "從單個電�信件中擷�修補檔和作者身份"
+
+#: command-list.h:122
+msgid "Simple UNIX mbox splitter program"
+msgstr "簡單的 UNIX mbox 信箱切分程�"
+
+#: command-list.h:123
+msgid "Run tasks to optimize Git repository data"
+msgstr "執行用來最佳化 Git 版本庫資料的作業"
+
+#: command-list.h:124
+msgid "Join two or more development histories together"
+msgstr "�併兩個或更多開發歷�"
+
+#: command-list.h:125
+msgid "Find as good common ancestors as possible for a merge"
+msgstr "為了�併尋找儘�能好的公共祖先�交"
+
+#: command-list.h:126
+msgid "Run a three-way file merge"
+msgstr "執行一個三路檔案�併"
+
+#: command-list.h:127
+msgid "Run a merge for files needing merging"
+msgstr "�於需��併的檔案執行�併"
+
+#: command-list.h:128
+msgid "The standard helper program to use with git-merge-index"
+msgstr "與 git-merge-index 一起使用的標準嚮導程�"
+
+#: 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
+msgid "Build a tree-object from ls-tree formatted text"
+msgstr "基於 ls-tree 的格�化文字建立一個樹狀物件"
+
+#: command-list.h:134
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "移動或�新命�一個檔案�目錄或符號連�"
+
+# 尋找�供版本的符號�稱
+#: command-list.h:135
+msgid "Find symbolic names for given revs"
+msgstr "尋找�供版本的符號�稱"
+
+#: command-list.h:136
+msgid "Add or inspect object notes"
+msgstr "新增或檢查物件備註"
+
+#: command-list.h:137
+msgid "Import from and submit to Perforce repositories"
+msgstr "匯入和�交到 Perforce 版本庫中"
+
+#: command-list.h:138
+msgid "Create a packed archive of objects"
+msgstr "建立物件的存檔包"
+
+#: command-list.h:139
+msgid "Find redundant pack files"
+msgstr "尋找冗餘的包檔案"
+
+#: command-list.h:140
+msgid "Pack heads and tags for efficient repository access"
+msgstr "打包頭和標籤以實�高效的版本庫存�"
+
+#: command-list.h:141
+msgid "Compute unique ID for a patch"
+msgstr "計算一個修補檔的唯一 ID"
+
+#: command-list.h:142
+msgid "Prune all unreachable objects from the object database"
+msgstr "刪除物件庫中所有無法�得物件"
+
+#: command-list.h:143
+msgid "Remove extra objects that are already in pack files"
+msgstr "刪除已經在包檔案中的多餘物件"
+
+#: command-list.h:144
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "�得並整��外的版本庫或一個本機分支"
+
+#: command-list.h:145
+msgid "Update remote refs along with associated objects"
+msgstr "更新�端引用和相關的物件"
+
+#: command-list.h:146
+msgid "Applies a quilt patchset onto the current branch"
+msgstr "將一個 quilt 修補檔集�套用到目�分支"
+
+#: command-list.h:147
+msgid "Compare two commit ranges (e.g. two versions of a branch)"
+msgstr "比較兩個�交範�（如一個分支的兩個版本）"
+
+#: command-list.h:148
+msgid "Reads tree information into the index"
+msgstr "將樹訊�讀�到索引"
+
+#: command-list.h:149
+msgid "Reapply commits on top of another base tip"
+msgstr "在�一個分支上�新套用�交"
+
+#: command-list.h:150
+msgid "Receive what is pushed into the repository"
+msgstr "接收推�到版本庫中的物件"
+
+#: command-list.h:151
+msgid "Manage reflog information"
+msgstr "管� reflog 訊�"
+
+#: command-list.h:152
+msgid "Manage set of tracked repositories"
+msgstr "管�已追蹤版本庫"
+
+#: command-list.h:153
+msgid "Pack unpacked objects in a repository"
+msgstr "打包版本庫中未打包物件"
+
+#: command-list.h:154
+msgid "Create, list, delete refs to replace objects"
+msgstr "建立�列出�刪除物件�代引用"
+
+#: command-list.h:155
+msgid "Generates a summary of pending changes"
+msgstr "生�待定更改的摘�"
+
+#: command-list.h:156
+msgid "Reuse recorded resolution of conflicted merges"
+msgstr "�用���併的解決方案記錄"
+
+#: command-list.h:157
+msgid "Reset current HEAD to the specified state"
+msgstr "�設目� HEAD 到指定狀態"
+
+#: command-list.h:158
+msgid "Restore working tree files"
+msgstr "復原工作�檔案"
+
+#: command-list.h:159
+msgid "Revert some existing commits"
+msgstr "還原一些�存�交"
+
+#: command-list.h:160
+msgid "Lists commit objects in reverse chronological order"
+msgstr "按時間順�列出�交物件"
+
+#: command-list.h:161
+msgid "Pick out and massage parameters"
+msgstr "�出並處��數"
+
+#: command-list.h:162
+msgid "Remove files from the working tree and from the index"
+msgstr "從工作�和索引中刪除檔案"
+
+#: command-list.h:163
+msgid "Send a collection of patches as emails"
+msgstr "��電�信件傳�一組修補檔"
+
+#: command-list.h:164
+msgid "Push objects over Git protocol to another repository"
+msgstr "使用 Git �定推�物件到�一個版本庫"
+
+#: command-list.h:165
+msgid "Restricted login shell for Git-only SSH access"
+msgstr "��許 Git SSH 存�的��登入shell"
+
+#: command-list.h:166
+msgid "Summarize 'git log' output"
+msgstr "'git log' 輸出摘�"
+
+#: command-list.h:167
+msgid "Show various types of objects"
+msgstr "顯示�種類型的物件"
+
+#: command-list.h:168
+msgid "Show branches and their commits"
+msgstr "顯示分支和�交"
+
+#: command-list.h:169
+msgid "Show packed archive index"
+msgstr "顯示打包歸檔索引"
+
+#: command-list.h:170
+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: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
+msgid "Remove unnecessary whitespace"
+msgstr "刪除�必�的空白字元"
+
+#: command-list.h:178
+msgid "Initialize, update or inspect submodules"
+msgstr "�始化�更新或檢查�模組"
+
+#: command-list.h:179
+msgid "Bidirectional operation between a Subversion repository and Git"
+msgstr "Subversion 版本庫和 Git 之間的雙�動作"
+
+#: command-list.h:180
+msgid "Switch branches"
+msgstr "切�分支"
+
+#: command-list.h:181
+msgid "Read, modify and delete symbolic refs"
+msgstr "讀��修改和刪除符號引用"
+
+#: command-list.h:182
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr "建立�列出�刪除或驗證一個 GPG 簽�的標籤物件"
+
+#: command-list.h:183
+msgid "Creates a temporary file with a blob's contents"
+msgstr "用資料物件的內容建立暫存檔"
+
+#: command-list.h:184
+msgid "Unpack objects from a packed archive"
+msgstr "從打包檔案中解壓縮物件"
+
+#: command-list.h:185
+msgid "Register file contents in the working tree to the index"
+msgstr "將工作�的檔案內容註冊到索引"
+
+#: command-list.h:186
+msgid "Update the object name stored in a ref safely"
+msgstr "安全地更新儲存於引用中的物件�稱"
+
+#: command-list.h:187
+msgid "Update auxiliary info file to help dumb servers"
+msgstr "更新輔助訊�檔案以�助啞�定�務"
+
+#: command-list.h:188
+msgid "Send archive back to git-archive"
+msgstr "將存檔傳�回 git-archive"
+
+#: command-list.h:189
+msgid "Send objects packed back to git-fetch-pack"
+msgstr "將物件壓縮包傳�回 git-fetch-pack"
+
+#: command-list.h:190
+msgid "Show a Git logical variable"
+msgstr "顯示 Git �輯變數"
+
+#: command-list.h:191
+msgid "Check the GPG signature of commits"
+msgstr "檢查 GPG �交簽�"
+
+#: command-list.h:192
+msgid "Validate packed Git archive files"
+msgstr "驗證打包的 Git �存檔案"
+
+#: command-list.h:193
+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
+msgid "Show logs with difference each commit introduces"
+msgstr "顯示�一個�交引入的差異日誌"
+
+#: command-list.h:196
+msgid "Manage multiple working trees"
+msgstr "管�多個工作�"
+
+#: command-list.h:197
+msgid "Create a tree object from the current index"
+msgstr "從目�索引建立一個樹狀物件"
+
+#: command-list.h:198
+msgid "Defining attributes per path"
+msgstr "定義路徑的屬性"
+
+#: command-list.h:199
+msgid "Git command-line interface and conventions"
+msgstr "Git 指令列介�和約定"
+
+#: command-list.h:200
+msgid "A Git core tutorial for developers"
+msgstr "��開發人員的 Git 核心教學"
+
+#: command-list.h:201
+msgid "Providing usernames and passwords to Git"
+msgstr "將使用者�稱�密碼�供給 Git"
+
+#: command-list.h:202
+msgid "Git for CVS users"
+msgstr "�� CVS 使用者的 Git �助"
+
+#: command-list.h:203
+msgid "Tweaking diff output"
+msgstr "調整差異輸出"
+
+#: command-list.h:204
+msgid "A useful minimum set of commands for Everyday Git"
+msgstr "�一天 Git 的一組有用的最�指令集�"
+
+#: command-list.h:205
+msgid "Frequently asked questions about using Git"
+msgstr "Git 使用的常見�題"
+
+#: command-list.h:206
+msgid "A Git Glossary"
+msgstr "Git 詞彙表"
+
+#: command-list.h:207
+msgid "Hooks used by Git"
+msgstr "Git 使用的掛鉤"
+
+#: command-list.h:208
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "忽略指定的未追蹤檔案"
+
+#: command-list.h:209
+msgid "Map author/committer names and/or E-Mail addresses"
+msgstr "映射作者或�交者的�稱和（或）電�信箱地�"
+
+#: command-list.h:210
+msgid "Defining submodule properties"
+msgstr "定義�模組屬性"
+
+#: command-list.h:211
+msgid "Git namespaces"
+msgstr "Git �字空間"
+
+#: command-list.h:212
+msgid "Helper programs to interact with remote repositories"
+msgstr "用來與�端版本庫互動的�助工具"
+
+#: command-list.h:213
+msgid "Git Repository Layout"
+msgstr "Git 版本庫�置"
+
+#: command-list.h:214
+msgid "Specifying revisions and ranges for Git"
+msgstr "指定 Git 的版本和版本範�"
+
+#: command-list.h:215
+msgid "Mounting one repository inside another"
+msgstr "在�個版本庫掛載�個版本庫"
+
+#: 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 教學"
+
+#: 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 "
+"merge"
+msgstr "錯誤：您�下列檔案的本機修改將被�併動作覆蓋"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "自動�併未生效。"
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr "�應該執行章魚��併。"
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "無法找到和 $pretty_name 的基礎�交"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "已經和 $pretty_name ��一致"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "快轉至：$pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "嘗試和 $pretty_name 的簡單�併"
+
+#: git-merge-octopus.sh:102
+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:248
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr "無法新增�模組 '$sm_path'"
+
+#: git-submodule.sh:257
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "無法註冊�模組 '$sm_path'"
+
+#: git-submodule.sh:532
+#, sh-format
+msgid "Unable to find current revision in submodule path '$displaypath'"
+msgstr "無法在�模組路徑 '$displaypath' 中找到目�版本"
+
+#: git-submodule.sh:542
+#, sh-format
+msgid "Unable to fetch in submodule path '$sm_path'"
+msgstr "無法在�模組路徑 '$sm_path' 中�得"
+
+#: git-submodule.sh:547
+#, 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:565
+#, sh-format
+msgid ""
+"Unable to fetch in submodule path '$displaypath'; trying to directly fetch "
+"$sha1:"
+msgstr "無法在�模組路徑 '$displaypath' 中�得，嘗試直接�得 $sha1："
+
+#: 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 ""
+"�得了�模組路徑 '$displaypath'，但是它沒有包� $sha1。直接�得該�交失敗。"
+
+#: git-submodule.sh:578
+#, sh-format
+msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
+msgstr "無法在�模組路徑 '$displaypath' 中簽出 '$sha1'"
+
+#: git-submodule.sh:579
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "�模組路徑 '$displaypath'：簽出 '$sha1'"
+
+#: git-submodule.sh:583
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr "無法在�模組路徑 '$displaypath' 中�定基底 '$sha1'"
+
+#: git-submodule.sh:584
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "�模組路徑 '$displaypath'：�定基底至 '$sha1'"
+
+#: git-submodule.sh:589
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "無法�併 '$sha1' 到�模組路徑 '$displaypath' 中"
+
+#: git-submodule.sh:590
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "�模組路徑 '$displaypath'：已�併入 '$sha1'"
+
+#: git-submodule.sh:595
+#, sh-format
+msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
+msgstr "在�模組 '$displaypath' 中執行 '$command $sha1' 失敗"
+
+#: git-submodule.sh:596
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "�模組 '$displaypath'：'$command $sha1'"
+
+#: git-submodule.sh:627
+#, 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
+#, 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
+#, 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
+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
+#, 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
+#, sh-format
+msgid "Cannot $action: Your index contains uncommitted changes."
+msgstr "�能 $action：您的索引中包�未�交的變更。"
+
+#: git-sh-setup.sh:253
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "而且您的索引中包�未�交的變更。"
+
+#: git-sh-setup.sh:373
+msgid "You need to run this command from the toplevel of the working tree."
+msgstr "您需�在工作�的頂級目錄中執行這個指令。"
+
+#: git-sh-setup.sh:378
+msgid "Unable to determine absolute path of git directory"
+msgstr "�能確定 git 目錄的絕�路徑"
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:212
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%12s %12s %s"
+
+#: git-add--interactive.perl:632
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "建立了 %d 個路徑\n"
+
+#: git-add--interactive.perl:1056
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr "如果修補檔能乾淨地套用，編輯�塊將立�標記為暫存。"
+
+#: git-add--interactive.perl:1059
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr "如果修補檔能乾淨地套用，編輯�塊將立�標記為儲�。"
+
+#: git-add--interactive.perl:1062
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr "如果修補檔能乾淨地套用，編輯�塊將立�標記為未暫存。"
+
+#: 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."
+msgstr "如果修補檔能乾淨地套用，編輯�塊將立�標記為套用。"
+
+#: 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."
+msgstr "如果修補檔能乾淨地套用，編輯塊將立�標記為�棄。"
+
+#: git-add--interactive.perl:1114
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "為寫入開啟�塊編輯檔案失敗：%s"
+
+#: git-add--interactive.perl:1121
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"�刪除 '%s' 開始的行，使其�為 ' ' 開始的行（上下文）。\n"
+"�刪除 '%s' 開始的行，刪除它們。\n"
+"以 %s 開始的行將被刪除。\n"
+
+#: git-add--interactive.perl:1143
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "無法讀��塊編輯檔案：%s"
+
+#: git-add--interactive.perl:1251
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 暫存此�塊\n"
+"n - ��暫存此�塊\n"
+"q - 離開。�暫存此�塊�後�的全部�塊\n"
+"a - 暫存此�塊和本檔案中後�的全部�塊\n"
+"d - �暫存此�塊和本檔案中後�的全部�塊"
+
+#: git-add--interactive.perl:1257
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 儲�此�塊\n"
+"n - ��儲�此�塊\n"
+"q - 離開。�儲�此�塊�後�的全部�塊\n"
+"a - 儲�此�塊和本檔案中後�的全部�塊\n"
+"d - �儲�此�塊和本檔案中後�的全部�塊"
+
+#: git-add--interactive.perl:1263
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - �暫存此�塊\n"
+"n - ���暫存此�塊\n"
+"q - 離開。���暫存此�塊�後�的全部�塊\n"
+"a - �暫存此�塊和本檔案中後�的全部�塊\n"
+"d - ���暫存此�塊和本檔案中後�的全部�塊"
+
+#: git-add--interactive.perl:1269
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在索引中套用此�塊\n"
+"n - ��在索引中套用此�塊\n"
+"q - 離開。��套用此�塊�後�的全部�塊\n"
+"a - 套用此�塊和本檔案中後�的全部�塊\n"
+"d - ��套用此�塊和本檔案中後�的全部�塊"
+
+#: git-add--interactive.perl:1275 git-add--interactive.perl:1293
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在工作�中�棄此�塊\n"
+"n - ��在工作�中�棄此�塊\n"
+"q - 離開。���棄此�塊�後�的全部�塊\n"
+"a - �棄此�塊和本檔案中後�的全部�塊\n"
+"d - ���棄此�塊和本檔案中後�的全部�塊"
+
+#: git-add--interactive.perl:1281
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在索引和工作�中�棄此�塊\n"
+"n - ��在索引和工作�中�棄此�塊\n"
+"q - 離開。���棄此�塊�後�的全部�塊\n"
+"a - �棄此�塊和本檔案中後�的全部�塊\n"
+"d - ���棄此�塊和本檔案中後�的全部�塊"
+
+#: git-add--interactive.perl:1287
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在索引和工作�中套用此�塊\n"
+"n - ��在索引和工作�中套用此�塊\n"
+"q - 離開。��套用此�塊�後�的全部�塊\n"
+"a - 套用此�塊和本檔案中後�的全部�塊\n"
+"d - ��套用此�塊和本檔案中後�的全部�塊"
+
+#: git-add--interactive.perl:1299
+msgid ""
+"y - apply this hunk to worktree\n"
+"n - do not apply this hunk to worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - 在工作�中套用此�塊\n"
+"n - ��在工作�中套用此�塊\n"
+"q - 離開。��套用此�塊�後�的全部�塊\n"
+"a - 套用此�塊和本檔案中後�的全部�塊\n"
+"d - ��套用此�塊和本檔案中後�的全部�塊"
+
+#: git-add--interactive.perl:1314
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - �擇跳轉到一個�塊\n"
+"/ - 尋找和�供正�表示�符�的�塊\n"
+"j - 維�此�塊未決狀態，檢視下一個未決定�塊\n"
+"J - 維�此�塊未決狀態，檢視下一個�塊\n"
+"k - 維�此�塊未決狀態，檢視上一個未決定�塊\n"
+"K - 維�此�塊未決狀態，檢視上一個�塊\n"
+"s - 分割目��塊為更�的�塊\n"
+"e - 手動編輯目��塊\n"
+"? - 顯示說明\n"
+
+#: git-add--interactive.perl:1345
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "���塊�能套用到索引�\n"
+
+#: git-add--interactive.perl:1360
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "忽略未套用的：%s\n"
+
+#: git-add--interactive.perl:1479
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "No other hunks to goto\n"
+msgstr "沒有其它�供跳轉的�塊\n"
+
+#: git-add--interactive.perl:1617
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "無效數字：'%s'\n"
+
+#: git-add--interactive.perl:1622
+#, 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
+msgid "No other hunks to search\n"
+msgstr "沒有其它�供尋找的�塊\n"
+
+#: git-add--interactive.perl:1674
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "錯誤的正�表示� %s：%s\n"
+
+#: git-add--interactive.perl:1684
+msgid "No hunk matches the given pattern\n"
+msgstr "沒有和�供模�相符�的�塊\n"
+
+#: git-add--interactive.perl:1696 git-add--interactive.perl:1718
+msgid "No previous hunk\n"
+msgstr "沒有上一個�塊\n"
+
+#: git-add--interactive.perl:1705 git-add--interactive.perl:1724
+msgid "No next hunk\n"
+msgstr "沒有下一個�塊\n"
+
+#: git-add--interactive.perl:1730
+msgid "Sorry, cannot split this hunk\n"
+msgstr "��起，�能分割這個�塊\n"
+
+#: git-add--interactive.perl:1736
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] "分割為 %d 塊。\n"
+
+#: git-add--interactive.perl:1746
+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
+msgid ""
+"status        - show paths with changes\n"
+"update        - add working tree state to the staged set of changes\n"
+"revert        - revert staged set of changes back to the HEAD version\n"
+"patch         - pick hunks and update selectively\n"
+"diff          - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+"status        - 顯示�變更的路徑\n"
+"update        - 新增工作�狀態至暫存列表\n"
+"revert        - 還原修改的暫存集至 HEAD 版本\n"
+"patch         - 挑��塊並且有�擇地更新\n"
+"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
+msgid "missing --"
+msgstr "缺少 --"
+
+#: git-add--interactive.perl:1866
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "未知的 --patch 模�：%s"
+
+#: git-add--interactive.perl:1872 git-add--interactive.perl:1878
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "無效的�數 %s，期望是 --"
+
+#: git-send-email.perl:129
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr "本機時間和 GMT 有�到一分�間隔\n"
+
+#: git-send-email.perl:136 git-send-email.perl:142
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "本機時間�移�大於等於 24 �時\n"
+
+#: git-send-email.perl:214
+#, perl-format
+msgid "fatal: command '%s' died with exit code %d"
+msgstr "致命錯誤：命令「%s�中止，��碼：%d"
+
+#: git-send-email.perl:227
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "編輯器�正常離開，終止所有動作"
+
+#: git-send-email.perl:316
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr "'%s' 包�您正在編寫的一個中間版本的信件。\n"
+
+#: git-send-email.perl:321
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' 包�編輯的信件。\n"
+
+#: git-send-email.perl:450
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases 和其它�項�相容\n"
+
+#: 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 ""
+"致命錯誤：找到 'sendmail' 的設定�項\n"
+"git-send-email 已經以 sendemail.* �項設定 - 注�裡�的 'e'。\n"
+"請將 sendemail.forbidSendmailVariables 設為 false �用此檢查。\n"
+
+#: git-send-email.perl:530 git-send-email.perl:746
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "�能在版本庫之外執行 git format-patch\n"
+
+#: git-send-email.perl:533
+msgid ""
+"`batch-size` and `relogin` must be specified together (via command-line or "
+"configuration option)\n"
+msgstr "`batch-size` 和 `relogin` 必須�時定義（��指令列或者設定�項）\n"
+
+#: git-send-email.perl:546
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "未知的 --suppress-cc 欄�：'%s'\n"
+
+#: git-send-email.perl:577
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "未知的 --confirm 設定：'%s'\n"
+
+#: git-send-email.perl:617
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr "警告：�支�帶引號的 sendmail 別�：%s\n"
+
+#: git-send-email.perl:619
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "警告：�支� `:include:`：%s\n"
+
+#: git-send-email.perl:621
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "警告：�支� `/file` 或 `|pipe` �定�：%s\n"
+
+#: git-send-email.perl:626
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "警告：�能識別的 sendmail 行：%s\n"
+
+#: git-send-email.perl:711
+#, perl-format
+msgid ""
+"File '%s' exists but it could also be the range of commits\n"
+"to produce patches for.  Please disambiguate by...\n"
+"\n"
+"    * Saying \"./%s\" if you mean a file; or\n"
+"    * Giving --format-patch option if you mean a range.\n"
+msgstr ""
+"存在檔案 '%s' 但是它也�能是一個用於產生修補檔列表的�交範�。請用如下方法消"
+"除歧義：\n"
+"\n"
+"    * 如果�義為一個檔案，使用 \"./%s\"，或者\n"
+"    * 如果�義為一個範�，使用 --format-patch �項。\n"
+
+#: git-send-email.perl:732
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "無法開啟目錄 %s: %s"
+
+#: git-send-email.perl:767
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"未指定修補檔案�\n"
+"\n"
+
+#: git-send-email.perl:780
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "在 %s 中沒有標題行？"
+
+#: git-send-email.perl:791
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "為寫入開啟 %s 失敗: %s"
+
+#: git-send-email.perl:802
+msgid ""
+"Lines beginning in \"GIT:\" will be removed.\n"
+"Consider including an overall diffstat or table of contents\n"
+"for the patch you are writing.\n"
+"\n"
+"Clear the body content if you don't wish to send a summary.\n"
+msgstr ""
+"以 \"GIT:\" 開頭的行將被刪除。\n"
+"考慮包�一個整體的差異統計或者您正在寫的修補檔的目錄。\n"
+"\n"
+"如果您�想傳�摘�，清除內容。\n"
+
+#: git-send-email.perl:826
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "無法開啟 %s: %s"
+
+#: git-send-email.perl:843
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "無法開啟 %s.final: %s"
+
+#: git-send-email.perl:886
+msgid "Summary email is empty, skipping it\n"
+msgstr "摘�信件為空，略�\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:935
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "您是��使用 <%s> [y/N]？ "
+
+#: git-send-email.perl:990
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr "如下檔案� 8bit 內容，但沒有�明一個 Content-Transfer-Encoding。\n"
+
+#: git-send-email.perl:995
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "�宣告 8bit 為什麼樣的編碼格� [UTF-8]？ "
+
+#: git-send-email.perl:1003
+#, perl-format
+msgid ""
+"Refusing to send because the patch\n"
+"\t%s\n"
+"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
+"want to send.\n"
+msgstr ""
+"拒絕傳�，因為修補檔\n"
+"\t%s\n"
+"包�範本標題 '*** SUBJECT HERE ***'。如果確定想�傳�，使用�數 --force。\n"
+
+#: git-send-email.perl:1022
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "信件將�傳�給誰？"
+
+#: git-send-email.perl:1040
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "致命錯誤：別� '%s' 擴展為它自己\n"
+
+#: git-send-email.perl:1052
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr "（如果有）Message-ID 是��被用作第一�信件的 In-Reply-To ？ "
+
+#: git-send-email.perl:1114 git-send-email.perl:1122
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "錯誤：�能從 %s 中擷�一個有效的信件��\n"
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1126
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr "如何處�這個��？([q]uit|[d]rop|[e]dit)："
+
+#: git-send-email.perl:1446
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "CA 路徑 \"%s\" �存在"
+
+#: 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"
+"    send-email prompts before sending whenever this occurs.\n"
+"    This behavior is controlled by the sendemail.confirm\n"
+"    configuration setting.\n"
+"\n"
+"    For additional information, run 'git send-email --help'.\n"
+"    To retain the current behavior, but squelch this message,\n"
+"    run 'git config --global sendemail.confirm auto'.\n"
+"\n"
+msgstr ""
+"    以上的抄�列表（Cc）已經用修補檔�交說明中發�的��進行\n"
+"    了擴展。�設 send-email 會給出�示。這個行為�以��\n"
+"    sendemail.confirm 設定設定。\n"
+"\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:1544
+msgid "Send this email? ([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+msgstr "傳�這�信件？([y]es|[n]o|[e]dit|[q]uit|[a]ll): "
+
+#: git-send-email.perl:1547
+msgid "Send this email reply required"
+msgstr "傳��求的信件回復"
+
+#: git-send-email.perl:1581
+msgid "The required SMTP server is not properly defined."
+msgstr "�求的 SMTP 伺�器未被正確定義。"
+
+#: git-send-email.perl:1628
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "伺�器�支� STARTTLS�%s"
+
+#: git-send-email.perl:1633 git-send-email.perl:1637
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "STARTTLS 失敗�%s"
+
+#: git-send-email.perl:1646
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr "無法正確地�始化 SMTP。檢查設定並使用 --smtp-debug。"
+
+#: git-send-email.perl:1664
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "無法傳� %s\n"
+
+#: git-send-email.perl:1667
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "測試執行傳� %s\n"
+
+#: git-send-email.perl:1667
+#, perl-format
+msgid "Sent %s\n"
+msgstr "正傳� %s\n"
+
+#: git-send-email.perl:1669
+msgid "Dry-OK. Log says:\n"
+msgstr "測試執行�功。日誌說：\n"
+
+#: git-send-email.perl:1669
+msgid "OK. Log says:\n"
+msgstr "OK。日誌說：\n"
+
+#: git-send-email.perl:1688
+msgid "Result: "
+msgstr "�果："
+
+#: git-send-email.perl:1691
+msgid "Result: OK\n"
+msgstr "�果：OK\n"
+
+#: git-send-email.perl:1709
+#, perl-format
+msgid "can't open file %s"
+msgstr "無法開啟檔案 %s"
+
+#: git-send-email.perl:1756 git-send-email.perl:1776
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) 新增 cc：%s 自行 '%s'\n"
+
+#: git-send-email.perl:1762
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) 新增 to：%s 自行 '%s'\n"
+
+#: git-send-email.perl:1819
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(non-mbox) 新增 cc：%s 自行 '%s'\n"
+
+#: git-send-email.perl:1854
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(body) 新增 cc: %s 自行 '%s'\n"
+
+#: git-send-email.perl:1965
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) �能執行 '%s'"
+
+#: git-send-email.perl:1972
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) 新增 %s: %s 自：'%s'\n"
+
+#: git-send-email.perl:1976
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) 無法關閉管�至 '%s'"
+
+#: git-send-email.perl:2006
+msgid "cannot send message as 7bit"
+msgstr "�能以 7bit 形�傳�訊�"
+
+#: git-send-email.perl:2014
+msgid "invalid transfer encoding"
+msgstr "無效的傳�編碼"
+
+#: 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 ""
+"致命錯誤：%s：被 sendemail-validate 掛鈎拒絕\n"
+"%s\n"
+"警告：修補檔未能傳�\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 "�能開啟 %s：%s\n"
+
+#: git-send-email.perl:2064
+#, perl-format
+msgid ""
+"fatal: %s:%d is longer than 998 characters\n"
+"warning: no patches were sent\n"
+msgstr ""
+"致命錯誤：%s:%d 的字元數超� 998\n"
+"警告：修補檔未能傳�\n"
+
+#: git-send-email.perl:2082
+#, 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:2086
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "您真的�傳� %s？[y|N]："
+
+#~ 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 �能�時使用。"
+
+#~ msgid "both"
+#~ msgstr "雙方"
+
+#~ msgid "one"
+#~ msgstr "一方"
+
+#~ msgid "Already up to date!"
+#~ msgstr "已經是最新的�"
+
+#~ msgid "Already up to date. Yeeah!"
+#~ msgstr "已經是最新的。耶�"
+
+#~ msgid "--batch-size option is only for 'repack' subcommand"
+#~ msgstr "--batch-size �項僅用於 'repack' �指令"
+
+#~ msgid "Percentage by which creation is weighted"
+#~ msgstr "建立權�的百分比"
+
+#~ msgid ""
+#~ "the rebase.useBuiltin support has been removed!\n"
+#~ "See its entry in 'git help config' for details."
+#~ msgstr ""
+#~ "� rebase.useBuiltin 的支�已被刪除�\n"
+#~ "詳見 'git help config' 中的�目。"
+
+#~ msgid "%s: patch contains a line longer than 998 characters"
+#~ msgstr "%s：修補檔包�一個超� 998 字元的行"
+
+#~ msgid "repository contains replace objects; skipping commit-graph"
+#~ msgstr "版本庫有�代物件；跳��交圖形"
+
+#~ msgid "repository contains (deprecated) grafts; skipping commit-graph"
+#~ msgstr "版本庫有（廢棄的）移�項目；跳��交圖形"
+
+#~ msgid "repository is shallow; skipping commit-graph"
+#~ msgstr "版本庫是淺複製；忽略�交圖形"
+
+#~ msgid "commit-graph improper chunk offset %08x%08x"
+#~ msgstr "�交圖形�正確的�塊�移 %08x%08x"
+
+#~ msgid "commit-graph chunk id %08x appears multiple times"
+#~ msgstr "�交圖形�塊 id %08x 出�了多次"
+
+#~ msgid "invalid chunk offset (too large)"
+#~ msgstr "無效的�塊�移（太大）"
+
+#~ msgid "Writing chunks to multi-pack-index"
+#~ msgstr "寫入�塊至多包索引"
+
+#~ msgid "rev-list died"
+#~ msgstr "rev-list 終止"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-write [--no-log] <state> <revision> "
+#~ "<good_term> <bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-write [--no-log] <狀態> <版本> <好-術語> <壞-"
+#~ "術語>"
+
+#~ msgid ""
+#~ "git bisect--helper --bisect-check-and-set-terms <command> <good_term> "
+#~ "<bad_term>"
+#~ msgstr ""
+#~ "git bisect--helper --bisect-check-and-set-terms <指令> <好-術語> <壞-術語>"
+
+#~ msgid "git bisect--helper --bisect-auto-next"
+#~ msgstr "git bisect--helper --bisect-auto-next"
+
+#~ msgid "write out the bisection state in BISECT_LOG"
+#~ msgstr "將二分尋找的狀態寫入 BISECT_LOG"
+
+#~ msgid "check and set terms in a bisection state"
+#~ msgstr "在一個二分尋找狀態中檢查和設定術語"
+
+#~ msgid ""
+#~ "verify the next bisection state then checkout the next bisection commit"
+#~ msgstr "驗證下一個二分尋找狀態後，檢出下一個二分尋找�交"
+
+#~ msgid "--bisect-write requires either 4 or 5 arguments"
+#~ msgstr "--bisect-write 需� 4 或 5 個�數"
+
+#~ msgid "--check-and-set-terms requires 3 arguments"
+#~ msgstr "--check-and-set-terms 需� 3 個�數"
+
+#~ msgid "--bisect-auto-next requires 0 arguments"
+#~ msgstr "--bisect-auto-next 需� 0 個引數"
+
+#~ msgid "Force progress reporting"
+#~ msgstr "強制進度顯示"
+
+#~ msgid "Error deleting remote-tracking branch '%s'"
+#~ msgstr "無法刪除�端追蹤分支 '%s'"
+
+#~ msgid "Error deleting branch '%s'"
+#~ msgstr "無法刪除分支 '%s'"
+
+#~ msgid "show parse tree for grep expression"
+#~ msgstr "顯示 grep 表��的解�樹"
+
+#~ msgid "too many parameters"
+#~ msgstr "�數太多"
+
+#~ msgid "too few parameters"
+#~ msgstr "�數太少"
+
+#~ msgid "Recurse into nested submodules"
+#~ msgstr "�迴進入嵌套�模組中"
+
+#~ msgid "too many params"
+#~ msgstr "太多�數"
+
+#~ msgid "Bad rev input: $arg"
+#~ msgstr "壞的輸入版本：$arg"
diff --git a/preload-index.c b/preload-index.c
index ed6eaa4738..e5529a5863 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -31,6 +31,7 @@ struct thread_data {
 	struct pathspec pathspec;
 	struct progress_data *progress;
 	int offset, nr;
+	int t2_nr_lstat;
 };
 
 static void *preload_thread(void *_data)
@@ -73,6 +74,7 @@ static void *preload_thread(void *_data)
 			continue;
 		if (threaded_has_symlink_leading_path(&cache, ce->name, ce_namelen(ce)))
 			continue;
+		p->t2_nr_lstat++;
 		if (lstat(ce->name, &st))
 			continue;
 		if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY|CE_MATCH_IGNORE_FSMONITOR))
@@ -98,6 +100,7 @@ void preload_index(struct index_state *index,
 	int threads, i, work, offset;
 	struct thread_data data[MAX_PARALLEL];
 	struct progress_data pd;
+	int t2_sum_lstat = 0;
 
 	if (!HAVE_THREADS || !core_preload_index)
 		return;
@@ -107,6 +110,9 @@ void preload_index(struct index_state *index,
 		threads = 2;
 	if (threads < 2)
 		return;
+
+	trace2_region_enter("index", "preload", NULL);
+
 	trace_performance_enter();
 	if (threads > MAX_PARALLEL)
 		threads = MAX_PARALLEL;
@@ -141,10 +147,14 @@ void preload_index(struct index_state *index,
 		struct thread_data *p = data+i;
 		if (pthread_join(p->pthread, NULL))
 			die("unable to join threaded lstat");
+		t2_sum_lstat += p->t2_nr_lstat;
 	}
 	stop_progress(&pd.progress);
 
 	trace_performance_leave("preload index");
+
+	trace2_data_intmax("index", NULL, "preload/sum_lstat", t2_sum_lstat);
+	trace2_region_leave("index", "preload", NULL);
 }
 
 int repo_read_index_preload(struct repository *repo,
diff --git a/pretty.c b/pretty.c
index b32f036953..9631529c10 100644
--- a/pretty.c
+++ b/pretty.c
@@ -12,6 +12,7 @@
 #include "reflog-walk.h"
 #include "gpg-interface.h"
 #include "trailer.h"
+#include "run-command.h"
 
 static char *user_format;
 static struct cmt_fmt_map {
@@ -20,6 +21,7 @@ static struct cmt_fmt_map {
 	int is_tformat;
 	int expand_tabs_in_log;
 	int is_alias;
+	enum date_mode_type default_date_mode_type;
 	const char *user_format;
 } *commit_formats;
 static size_t builtin_formats_len;
@@ -97,7 +99,9 @@ static void setup_commit_formats(void)
 		{ "mboxrd",	CMIT_FMT_MBOXRD,	0,	0 },
 		{ "fuller",	CMIT_FMT_FULLER,	0,	8 },
 		{ "full",	CMIT_FMT_FULL,		0,	8 },
-		{ "oneline",	CMIT_FMT_ONELINE,	1,	0 }
+		{ "oneline",	CMIT_FMT_ONELINE,	1,	0 },
+		{ "reference",	CMIT_FMT_USERFORMAT,	1,	0,
+			0, DATE_SHORT, "%C(auto)%h (%s, %ad)" },
 		/*
 		 * Please update $__git_log_pretty_formats in
 		 * git-completion.bash when you add new formats.
@@ -181,6 +185,8 @@ void get_commit_format(const char *arg, struct rev_info *rev)
 	rev->commit_format = commit_format->format;
 	rev->use_terminator = commit_format->is_tformat;
 	rev->expand_tabs_in_log_default = commit_format->expand_tabs_in_log;
+	if (!rev->date_mode_explicit && commit_format->default_date_mode_type)
+		rev->date_mode.type = commit_format->default_date_mode_type;
 	if (commit_format->format == CMIT_FMT_USERFORMAT) {
 		save_user_format(rev, commit_format->user_format,
 				 commit_format->is_tformat);
@@ -469,7 +475,8 @@ void pp_user_info(struct pretty_print_context *pp,
 		}
 
 		strbuf_addstr(sb, "From: ");
-		if (needs_rfc2047_encoding(namebuf, namelen)) {
+		if (pp->encode_email_headers &&
+		    needs_rfc2047_encoding(namebuf, namelen)) {
 			add_rfc2047(sb, namebuf, namelen,
 				    encoding, RFC2047_ADDRESS);
 			max_length = 76; /* per rfc2047 */
@@ -672,8 +679,8 @@ static int mailmap_name(const char **email, size_t *email_len,
 {
 	static struct string_list *mail_map;
 	if (!mail_map) {
-		mail_map = xcalloc(1, sizeof(*mail_map));
-		read_mailmap(mail_map, NULL);
+		CALLOC_ARRAY(mail_map, 1);
+		read_mailmap(mail_map);
 	}
 	return mail_map->nr && map_user(mail_map, email, email_len, name, name_len);
 }
@@ -696,7 +703,7 @@ static size_t format_person_part(struct strbuf *sb, char part,
 	mail = s.mail_begin;
 	maillen = s.mail_end - s.mail_begin;
 
-	if (part == 'N' || part == 'E') /* mailmap lookup */
+	if (part == 'N' || part == 'E' || part == 'L') /* mailmap lookup */
 		mailmap_name(&mail, &maillen, &name, &namelen);
 	if (part == 'n' || part == 'N') {	/* name */
 		strbuf_add(sb, name, namelen);
@@ -706,6 +713,13 @@ static size_t format_person_part(struct strbuf *sb, char part,
 		strbuf_add(sb, mail, maillen);
 		return placeholder_len;
 	}
+	if (part == 'l' || part == 'L') {	/* local-part */
+		const char *at = memchr(mail, '@', maillen);
+		if (at)
+			maillen = at - mail;
+		strbuf_add(sb, mail, maillen);
+		return placeholder_len;
+	}
 
 	if (!s.date_begin)
 		goto skip;
@@ -731,6 +745,12 @@ static size_t format_person_part(struct strbuf *sb, char part,
 	case 'I':	/* date, ISO 8601 strict */
 		strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(ISO8601_STRICT)));
 		return placeholder_len;
+	case 'h':	/* date, human */
+		strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(HUMAN)));
+		return placeholder_len;
+	case 's':
+		strbuf_addstr(sb, show_ident_date(&s, DATE_MODE(SHORT)));
+		return placeholder_len;
 	}
 
 skip:
@@ -767,6 +787,7 @@ enum trunc_type {
 };
 
 struct format_commit_context {
+	struct repository *repository;
 	const struct commit *commit;
 	const struct pretty_print_context *pretty_ctx;
 	unsigned commit_header_parsed:1;
@@ -823,21 +844,22 @@ static int istitlechar(char c)
 		(c >= '0' && c <= '9') || c == '.' || c == '_';
 }
 
-static void format_sanitized_subject(struct strbuf *sb, const char *msg)
+void format_sanitized_subject(struct strbuf *sb, const char *msg, size_t len)
 {
 	size_t trimlen;
 	size_t start_len = sb->len;
 	int space = 2;
+	int i;
 
-	for (; *msg && *msg != '\n'; msg++) {
-		if (istitlechar(*msg)) {
+	for (i = 0; i < len; i++) {
+		if (istitlechar(msg[i])) {
 			if (space == 1)
 				strbuf_addch(sb, '-');
 			space = 0;
-			strbuf_addch(sb, *msg);
-			if (*msg == '.')
-				while (*(msg+1) == '.')
-					msg++;
+			strbuf_addch(sb, msg[i]);
+			if (msg[i] == '.')
+				while (msg[i+1] == '.')
+					i++;
 		} else
 			space |= 1;
 	}
@@ -1131,6 +1153,91 @@ static int format_trailer_match_cb(const struct strbuf *key, void *ud)
 	return 0;
 }
 
+int format_set_trailers_options(struct process_trailer_options *opts,
+				struct string_list *filter_list,
+				struct strbuf *sepbuf,
+				struct strbuf *kvsepbuf,
+				const char **arg,
+				char **invalid_arg)
+{
+	for (;;) {
+		const char *argval;
+		size_t arglen;
+
+		if (**arg == ')')
+			break;
+
+		if (match_placeholder_arg_value(*arg, "key", arg, &argval, &arglen)) {
+			uintptr_t len = arglen;
+
+			if (!argval)
+				return -1;
+
+			if (len && argval[len - 1] == ':')
+				len--;
+			string_list_append(filter_list, argval)->util = (char *)len;
+
+			opts->filter = format_trailer_match_cb;
+			opts->filter_data = filter_list;
+			opts->only_trailers = 1;
+		} else if (match_placeholder_arg_value(*arg, "separator", arg, &argval, &arglen)) {
+			char *fmt;
+
+			strbuf_reset(sepbuf);
+			fmt = xstrndup(argval, arglen);
+			strbuf_expand(sepbuf, fmt, strbuf_expand_literal_cb, NULL);
+			free(fmt);
+			opts->separator = sepbuf;
+		} else if (match_placeholder_arg_value(*arg, "key_value_separator", arg, &argval, &arglen)) {
+			char *fmt;
+
+			strbuf_reset(kvsepbuf);
+			fmt = xstrndup(argval, arglen);
+			strbuf_expand(kvsepbuf, fmt, strbuf_expand_literal_cb, NULL);
+			free(fmt);
+			opts->key_value_separator = kvsepbuf;
+		} else if (!match_placeholder_bool_arg(*arg, "only", arg, &opts->only_trailers) &&
+			   !match_placeholder_bool_arg(*arg, "unfold", arg, &opts->unfold) &&
+			   !match_placeholder_bool_arg(*arg, "keyonly", arg, &opts->key_only) &&
+			   !match_placeholder_bool_arg(*arg, "valueonly", arg, &opts->value_only)) {
+			if (invalid_arg) {
+				size_t len = strcspn(*arg, ",)");
+				*invalid_arg = xstrndup(*arg, len);
+			}
+			return -1;
+		}
+	}
+	return 0;
+}
+
+static size_t parse_describe_args(const char *start, struct strvec *args)
+{
+	const char *options[] = { "match", "exclude" };
+	const char *arg = start;
+
+	for (;;) {
+		const char *matched = NULL;
+		const char *argval;
+		size_t arglen = 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];
+				break;
+			}
+		}
+		if (!matched)
+			break;
+
+		if (!arglen)
+			return 0;
+		strvec_pushf(args, "--%s=%.*s", matched, (int)arglen, argval);
+	}
+	return arg - start;
+}
+
 static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 				const char *placeholder,
 				void *context)
@@ -1139,7 +1246,7 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 	const struct commit *commit = c->commit;
 	const char *msg = c->message;
 	struct commit_list *p;
-	const char *arg;
+	const char *arg, *eol;
 	size_t res;
 	char **slot;
 
@@ -1196,6 +1303,41 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		return parse_padding_placeholder(placeholder, c);
 	}
 
+	if (skip_prefix(placeholder, "(describe", &arg)) {
+		struct child_process cmd = CHILD_PROCESS_INIT;
+		struct strbuf out = STRBUF_INIT;
+		struct strbuf err = STRBUF_INIT;
+		struct pretty_print_describe_status *describe_status;
+
+		describe_status = c->pretty_ctx->describe_status;
+		if (describe_status) {
+			if (!describe_status->max_invocations)
+				return 0;
+			describe_status->max_invocations--;
+		}
+
+		cmd.git_cmd = 1;
+		strvec_push(&cmd.args, "describe");
+
+		if (*arg == ':') {
+			arg++;
+			arg += parse_describe_args(arg, &cmd.args);
+		}
+
+		if (*arg != ')') {
+			child_process_clear(&cmd);
+			return 0;
+		}
+
+		strvec_push(&cmd.args, oid_to_hex(&commit->object.oid));
+		pipe_command(&cmd, NULL, 0, &out, 0, &err, 0);
+		strbuf_rtrim(&out);
+		strbuf_addbuf(sb, &out);
+		strbuf_release(&out);
+		strbuf_release(&err);
+		return arg - placeholder + 1;
+	}
+
 	/* these depend on the commit */
 	if (!commit->object.parsed)
 		parse_object(the_repository, &commit->object.oid);
@@ -1296,9 +1438,18 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		case '?':
 			switch (c->signature_check.result) {
 			case 'G':
+				switch (c->signature_check.trust_level) {
+				case TRUST_UNDEFINED:
+				case TRUST_NEVER:
+					strbuf_addch(sb, 'U');
+					break;
+				default:
+					strbuf_addch(sb, 'G');
+					break;
+				}
+				break;
 			case 'B':
 			case 'E':
-			case 'U':
 			case 'N':
 			case 'X':
 			case 'Y':
@@ -1322,16 +1473,38 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 			if (c->signature_check.primary_key_fingerprint)
 				strbuf_addstr(sb, c->signature_check.primary_key_fingerprint);
 			break;
+		case 'T':
+			switch (c->signature_check.trust_level) {
+			case TRUST_UNDEFINED:
+				strbuf_addstr(sb, "undefined");
+				break;
+			case TRUST_NEVER:
+				strbuf_addstr(sb, "never");
+				break;
+			case TRUST_MARGINAL:
+				strbuf_addstr(sb, "marginal");
+				break;
+			case TRUST_FULLY:
+				strbuf_addstr(sb, "fully");
+				break;
+			case TRUST_ULTIMATE:
+				strbuf_addstr(sb, "ultimate");
+				break;
+			}
+			break;
 		default:
 			return 0;
 		}
 		return 2;
 	}
 
-
 	/* For the rest we have to parse the commit header. */
-	if (!c->commit_header_parsed)
+	if (!c->commit_header_parsed) {
+		msg = c->message =
+			repo_logmsg_reencode(c->repository, commit,
+					     &c->commit_encoding, "UTF-8");
 		parse_commit_header(c);
+	}
 
 	switch (placeholder[0]) {
 	case 'a':	/* author ... */
@@ -1361,7 +1534,8 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		format_subject(sb, msg + c->subject_off, " ");
 		return 1;
 	case 'f':	/* sanitized subject */
-		format_sanitized_subject(sb, msg + c->subject_off);
+		eol = strchrnul(msg + c->subject_off, '\n');
+		format_sanitized_subject(sb, msg + c->subject_off, eol - (msg + c->subject_off));
 		return 1;
 	case 'b':	/* body */
 		strbuf_addstr(sb, msg + c->body_off);
@@ -1372,42 +1546,15 @@ static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
 		struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
 		struct string_list filter_list = STRING_LIST_INIT_NODUP;
 		struct strbuf sepbuf = STRBUF_INIT;
+		struct strbuf kvsepbuf = STRBUF_INIT;
 		size_t ret = 0;
 
 		opts.no_divider = 1;
 
 		if (*arg == ':') {
 			arg++;
-			for (;;) {
-				const char *argval;
-				size_t arglen;
-
-				if (match_placeholder_arg_value(arg, "key", &arg, &argval, &arglen)) {
-					uintptr_t len = arglen;
-
-					if (!argval)
-						goto trailer_out;
-
-					if (len && argval[len - 1] == ':')
-						len--;
-					string_list_append(&filter_list, argval)->util = (char *)len;
-
-					opts.filter = format_trailer_match_cb;
-					opts.filter_data = &filter_list;
-					opts.only_trailers = 1;
-				} else if (match_placeholder_arg_value(arg, "separator", &arg, &argval, &arglen)) {
-					char *fmt;
-
-					strbuf_reset(&sepbuf);
-					fmt = xstrndup(argval, arglen);
-					strbuf_expand(&sepbuf, fmt, strbuf_expand_literal_cb, NULL);
-					free(fmt);
-					opts.separator = &sepbuf;
-				} else if (!match_placeholder_bool_arg(arg, "only", &arg, &opts.only_trailers) &&
-					   !match_placeholder_bool_arg(arg, "unfold", &arg, &opts.unfold) &&
-					   !match_placeholder_bool_arg(arg, "valueonly", &arg, &opts.value_only))
-					break;
-			}
+			if (format_set_trailers_options(&opts, &filter_list, &sepbuf, &kvsepbuf, &arg, NULL))
+				goto trailer_out;
 		}
 		if (*arg == ')') {
 			format_trailers_from_commit(sb, msg + c->subject_off, &opts);
@@ -1566,9 +1713,9 @@ static size_t format_commit_item(struct strbuf *sb, /* in UTF-8 */
 			strbuf_setlen(sb, sb->len - 1);
 	} else if (orig_len != sb->len) {
 		if (magic == ADD_LF_BEFORE_NON_EMPTY)
-			strbuf_insert(sb, orig_len, "\n", 1);
+			strbuf_insertstr(sb, orig_len, "\n");
 		else if (magic == ADD_SP_BEFORE_NON_EMPTY)
-			strbuf_insert(sb, orig_len, " ", 1);
+			strbuf_insertstr(sb, orig_len, " ");
 	}
 	return consumed + 1;
 }
@@ -1588,6 +1735,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;
 }
@@ -1610,26 +1761,23 @@ void repo_format_commit_message(struct repository *r,
 				const char *format, struct strbuf *sb,
 				const struct pretty_print_context *pretty_ctx)
 {
-	struct format_commit_context context;
+	struct format_commit_context context = {
+		.repository = r,
+		.commit = commit,
+		.pretty_ctx = pretty_ctx,
+		.wrap_start = sb->len
+	};
 	const char *output_enc = pretty_ctx->output_encoding;
 	const char *utf8 = "UTF-8";
 
-	memset(&context, 0, sizeof(context));
-	context.commit = commit;
-	context.pretty_ctx = pretty_ctx;
-	context.wrap_start = sb->len;
-	/*
-	 * convert a commit message to UTF-8 first
-	 * as far as 'format_commit_item' assumes it in UTF-8
-	 */
-	context.message = repo_logmsg_reencode(r, commit,
-					       &context.commit_encoding,
-					       utf8);
-
 	strbuf_expand(sb, format, format_commit_item, &context);
 	rewrap_message_tail(sb, &context, 0, 0, 0);
 
-	/* then convert a commit message to an actual output encoding */
+	/*
+	 * Convert output to an actual output encoding; note that
+	 * format_commit_item() will always use UTF-8, so we don't
+	 * have to bother if that's what the output wants.
+	 */
 	if (output_enc) {
 		if (same_encoding(utf8, output_enc))
 			output_enc = NULL;
@@ -1724,7 +1872,8 @@ void pp_title_line(struct pretty_print_context *pp,
 	if (pp->print_email_subject) {
 		if (pp->rev)
 			fmt_output_email_subject(sb, pp->rev);
-		if (needs_rfc2047_encoding(title.buf, title.len))
+		if (pp->encode_email_headers &&
+		    needs_rfc2047_encoding(title.buf, title.len))
 			add_rfc2047(sb, title.buf, title.len,
 						encoding, RFC2047_SUBJECT);
 		else
diff --git a/pretty.h b/pretty.h
index 4ad1fc31ff..2f16acd213 100644
--- a/pretty.h
+++ b/pretty.h
@@ -6,6 +6,7 @@
 
 struct commit;
 struct strbuf;
+struct process_trailer_options;
 
 /* Commit formats */
 enum cmit_fmt {
@@ -23,6 +24,10 @@ enum cmit_fmt {
 	CMIT_FMT_UNSPECIFIED
 };
 
+struct pretty_print_describe_status {
+	unsigned int max_invocations;
+};
+
 struct pretty_print_context {
 	/*
 	 * Callers should tweak these to change the behavior of pp_* functions.
@@ -43,6 +48,8 @@ struct pretty_print_context {
 	struct string_list *mailmap;
 	int color;
 	struct ident_split *from_ident;
+	unsigned encode_email_headers:1;
+	struct pretty_print_describe_status *describe_status;
 
 	/*
 	 * Fields below here are manipulated internally by pp_* functions and
@@ -58,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);
 
 /*
@@ -138,4 +149,18 @@ const char *format_subject(struct strbuf *sb, const char *msg,
 /* Check if "cmit_fmt" will produce an empty output. */
 int commit_format_is_empty(enum cmit_fmt);
 
+/* Make subject of commit message suitable for filename */
+void format_sanitized_subject(struct strbuf *sb, const char *msg, size_t len);
+
+/*
+ * Set values of fields in "struct process_trailer_options"
+ * according to trailers arguments.
+ */
+int format_set_trailers_options(struct process_trailer_options *opts,
+			struct string_list *filter_list,
+			struct strbuf *sepbuf,
+			struct strbuf *kvsepbuf,
+			const char **arg,
+			char **invalid_arg);
+
 #endif /* PRETTY_H */
diff --git a/progress.c b/progress.c
index 0063559aab..680c6a8bf9 100644
--- a/progress.c
+++ b/progress.c
@@ -8,12 +8,14 @@
  * published by the Free Software Foundation.
  */
 
+#define GIT_TEST_PROGRESS_ONLY
 #include "cache.h"
 #include "gettext.h"
 #include "progress.h"
 #include "strbuf.h"
 #include "trace.h"
 #include "utf8.h"
+#include "config.h"
 
 #define TP_IDX_MAX      8
 
@@ -51,7 +53,6 @@ static volatile sig_atomic_t progress_update;
  */
 int progress_testing;
 uint64_t progress_test_ns = 0;
-void progress_test_force_update(void); /* To silence -Wmissing-prototypes */
 void progress_test_force_update(void)
 {
 	progress_update = 1;
@@ -195,7 +196,7 @@ void display_throughput(struct progress *progress, uint64_t total)
 	now_ns = progress_getnanotime(progress);
 
 	if (!tp) {
-		progress->throughput = tp = xcalloc(1, sizeof(*tp));
+		progress->throughput = CALLOC_ARRAY(tp, 1);
 		tp->prev_total = tp->curr_total = total;
 		tp->prev_ns = now_ns;
 		strbuf_init(&tp->display, 0);
@@ -264,12 +265,23 @@ static struct progress *start_progress_delay(const char *title, uint64_t total,
 	progress->title_len = utf8_strwidth(title);
 	progress->split = 0;
 	set_progress_signal();
+	trace2_region_enter("progress", title, the_repository);
 	return progress;
 }
 
+static int get_default_delay(void)
+{
+	static int delay_in_secs = -1;
+
+	if (delay_in_secs < 0)
+		delay_in_secs = git_env_ulong("GIT_PROGRESS_DELAY", 2);
+
+	return delay_in_secs;
+}
+
 struct progress *start_delayed_progress(const char *title, uint64_t total)
 {
-	return start_progress_delay(title, total, 2, 0);
+	return start_progress_delay(title, total, get_default_delay(), 0);
 }
 
 struct progress *start_progress(const char *title, uint64_t total)
@@ -294,7 +306,7 @@ struct progress *start_sparse_progress(const char *title, uint64_t total)
 struct progress *start_delayed_sparse_progress(const char *title,
 					       uint64_t total)
 {
-	return start_progress_delay(title, total, 2, 1);
+	return start_progress_delay(title, total, get_default_delay(), 1);
 }
 
 static void finish_if_sparse(struct progress *progress)
@@ -307,14 +319,34 @@ static void finish_if_sparse(struct progress *progress)
 
 void stop_progress(struct progress **p_progress)
 {
+	if (!p_progress)
+		BUG("don't provide NULL to stop_progress");
+
 	finish_if_sparse(*p_progress);
 
+	if (*p_progress) {
+		trace2_data_intmax("progress", the_repository, "total_objects",
+				   (*p_progress)->total);
+
+		if ((*p_progress)->throughput)
+			trace2_data_intmax("progress", the_repository,
+					   "total_bytes",
+					   (*p_progress)->throughput->curr_total);
+
+		trace2_region_leave("progress", (*p_progress)->title, the_repository);
+	}
+
 	stop_progress_msg(p_progress, _("done"));
 }
 
 void stop_progress_msg(struct progress **p_progress, const char *msg)
 {
-	struct progress *progress = *p_progress;
+	struct progress *progress;
+
+	if (!p_progress)
+		BUG("don't provide NULL to stop_progress_msg");
+
+	progress = *p_progress;
 	if (!progress)
 		return;
 	*p_progress = NULL;
diff --git a/progress.h b/progress.h
index 847338911f..f1913acf73 100644
--- a/progress.h
+++ b/progress.h
@@ -3,6 +3,14 @@
 
 struct progress;
 
+#ifdef GIT_TEST_PROGRESS_ONLY
+
+extern int progress_testing;
+extern uint64_t progress_test_ns;
+void progress_test_force_update(void);
+
+#endif
+
 void display_throughput(struct progress *progress, uint64_t total);
 void display_progress(struct progress *progress, uint64_t n);
 struct progress *start_progress(const char *title, uint64_t total);
diff --git a/promisor-remote.c b/promisor-remote.c
index 9bd5b79d59..db2ebdc66e 100644
--- a/promisor-remote.c
+++ b/promisor-remote.c
@@ -3,57 +3,50 @@
 #include "promisor-remote.h"
 #include "config.h"
 #include "transport.h"
+#include "strvec.h"
 
-static char *repository_format_partial_clone;
-static const char *core_partial_clone_filter_default;
+struct promisor_remote_config {
+	struct promisor_remote *promisors;
+	struct promisor_remote **promisors_tail;
+};
 
-void set_repository_format_partial_clone(char *partial_clone)
-{
-	repository_format_partial_clone = xstrdup_or_null(partial_clone);
-}
-
-static int fetch_refs(const char *remote_name, struct ref *ref)
-{
-	struct remote *remote;
-	struct transport *transport;
-	int original_fetch_if_missing = fetch_if_missing;
-	int res;
-
-	fetch_if_missing = 0;
-	remote = remote_get(remote_name);
-	if (!remote->url[0])
-		die(_("Remote with no URL"));
-	transport = transport_get(remote, remote->url[0]);
-
-	transport_set_option(transport, TRANS_OPT_FROM_PROMISOR, "1");
-	transport_set_option(transport, TRANS_OPT_NO_DEPENDENTS, "1");
-	res = transport_fetch_refs(transport, ref);
-	fetch_if_missing = original_fetch_if_missing;
-
-	return res;
-}
-
-static int fetch_objects(const char *remote_name,
+static int fetch_objects(struct repository *repo,
+			 const char *remote_name,
 			 const struct object_id *oids,
 			 int oid_nr)
 {
-	struct ref *ref = NULL;
+	struct child_process child = CHILD_PROCESS_INIT;
 	int i;
+	FILE *child_in;
+
+	child.git_cmd = 1;
+	child.in = -1;
+	if (repo != the_repository)
+		prepare_other_repo_env(&child.env_array, repo->gitdir);
+	strvec_pushl(&child.args, "-c", "fetch.negotiationAlgorithm=noop",
+		     "fetch", remote_name, "--no-tags",
+		     "--no-write-fetch-head", "--recurse-submodules=no",
+		     "--filter=blob:none", "--stdin", NULL);
+	if (start_command(&child))
+		die(_("promisor-remote: unable to fork off fetch subprocess"));
+	child_in = xfdopen(child.in, "w");
+
+	trace2_data_intmax("promisor", repo, "fetch_count", oid_nr);
 
 	for (i = 0; i < oid_nr; i++) {
-		struct ref *new_ref = alloc_ref(oid_to_hex(&oids[i]));
-		oidcpy(&new_ref->old_oid, &oids[i]);
-		new_ref->exact_oid = 1;
-		new_ref->next = ref;
-		ref = new_ref;
+		if (fputs(oid_to_hex(&oids[i]), child_in) < 0)
+			die_errno(_("promisor-remote: could not write to fetch subprocess"));
+		if (fputc('\n', child_in) < 0)
+			die_errno(_("promisor-remote: could not write to fetch subprocess"));
 	}
-	return fetch_refs(remote_name, ref);
-}
 
-static struct promisor_remote *promisors;
-static struct promisor_remote **promisors_tail = &promisors;
+	if (fclose(child_in) < 0)
+		die_errno(_("promisor-remote: could not close stdin to fetch subprocess"));
+	return finish_command(&child) ? -1 : 0;
+}
 
-static struct promisor_remote *promisor_remote_new(const char *remote_name)
+static struct promisor_remote *promisor_remote_new(struct promisor_remote_config *config,
+						   const char *remote_name)
 {
 	struct promisor_remote *r;
 
@@ -65,18 +58,19 @@ static struct promisor_remote *promisor_remote_new(const char *remote_name)
 
 	FLEX_ALLOC_STR(r, name, remote_name);
 
-	*promisors_tail = r;
-	promisors_tail = &r->next;
+	*config->promisors_tail = r;
+	config->promisors_tail = &r->next;
 
 	return r;
 }
 
-static struct promisor_remote *promisor_remote_lookup(const char *remote_name,
+static struct promisor_remote *promisor_remote_lookup(struct promisor_remote_config *config,
+						      const char *remote_name,
 						      struct promisor_remote **previous)
 {
 	struct promisor_remote *r, *p;
 
-	for (p = NULL, r = promisors; r; p = r, r = r->next)
+	for (p = NULL, r = config->promisors; r; p = r, r = r->next)
 		if (!strcmp(r->name, remote_name)) {
 			if (previous)
 				*previous = p;
@@ -86,7 +80,8 @@ static struct promisor_remote *promisor_remote_lookup(const char *remote_name,
 	return NULL;
 }
 
-static void promisor_remote_move_to_tail(struct promisor_remote *r,
+static void promisor_remote_move_to_tail(struct promisor_remote_config *config,
+					 struct promisor_remote *r,
 					 struct promisor_remote *previous)
 {
 	if (r->next == NULL)
@@ -95,22 +90,19 @@ static void promisor_remote_move_to_tail(struct promisor_remote *r,
 	if (previous)
 		previous->next = r->next;
 	else
-		promisors = r->next ? r->next : r;
+		config->promisors = r->next ? r->next : r;
 	r->next = NULL;
-	*promisors_tail = r;
-	promisors_tail = &r->next;
+	*config->promisors_tail = r;
+	config->promisors_tail = &r->next;
 }
 
 static int promisor_remote_config(const char *var, const char *value, void *data)
 {
+	struct promisor_remote_config *config = data;
 	const char *name;
-	int namelen;
+	size_t namelen;
 	const char *subkey;
 
-	if (!strcmp(var, "core.partialclonefilter"))
-		return git_config_string(&core_partial_clone_filter_default,
-					 var, value);
-
 	if (parse_config_key(var, "remote", &name, &namelen, &subkey) < 0)
 		return 0;
 
@@ -122,8 +114,8 @@ static int promisor_remote_config(const char *var, const char *value, void *data
 
 		remote_name = xmemdupz(name, namelen);
 
-		if (!promisor_remote_lookup(remote_name, NULL))
-			promisor_remote_new(remote_name);
+		if (!promisor_remote_lookup(config, remote_name, NULL))
+			promisor_remote_new(config, remote_name);
 
 		free(remote_name);
 		return 0;
@@ -132,9 +124,9 @@ static int promisor_remote_config(const char *var, const char *value, void *data
 		struct promisor_remote *r;
 		char *remote_name = xmemdupz(name, namelen);
 
-		r = promisor_remote_lookup(remote_name, NULL);
+		r = promisor_remote_lookup(config, remote_name, NULL);
 		if (!r)
-			r = promisor_remote_new(remote_name);
+			r = promisor_remote_new(config, remote_name);
 
 		free(remote_name);
 
@@ -147,59 +139,63 @@ static int promisor_remote_config(const char *var, const char *value, void *data
 	return 0;
 }
 
-static int initialized;
-
-static void promisor_remote_init(void)
+static void promisor_remote_init(struct repository *r)
 {
-	if (initialized)
+	struct promisor_remote_config *config;
+
+	if (r->promisor_remote_config)
 		return;
-	initialized = 1;
+	config = r->promisor_remote_config =
+		xcalloc(sizeof(*r->promisor_remote_config), 1);
+	config->promisors_tail = &config->promisors;
 
-	git_config(promisor_remote_config, NULL);
+	repo_config(r, promisor_remote_config, config);
 
-	if (repository_format_partial_clone) {
+	if (r->repository_format_partial_clone) {
 		struct promisor_remote *o, *previous;
 
-		o = promisor_remote_lookup(repository_format_partial_clone,
+		o = promisor_remote_lookup(config,
+					   r->repository_format_partial_clone,
 					   &previous);
 		if (o)
-			promisor_remote_move_to_tail(o, previous);
+			promisor_remote_move_to_tail(config, o, previous);
 		else
-			promisor_remote_new(repository_format_partial_clone);
+			promisor_remote_new(config, r->repository_format_partial_clone);
 	}
 }
 
-static void promisor_remote_clear(void)
+void promisor_remote_clear(struct promisor_remote_config *config)
 {
-	while (promisors) {
-		struct promisor_remote *r = promisors;
-		promisors = promisors->next;
+	while (config->promisors) {
+		struct promisor_remote *r = config->promisors;
+		config->promisors = config->promisors->next;
 		free(r);
 	}
 
-	promisors_tail = &promisors;
+	config->promisors_tail = &config->promisors;
 }
 
-void promisor_remote_reinit(void)
+void repo_promisor_remote_reinit(struct repository *r)
 {
-	initialized = 0;
-	promisor_remote_clear();
-	promisor_remote_init();
+	promisor_remote_clear(r->promisor_remote_config);
+	FREE_AND_NULL(r->promisor_remote_config);
+	promisor_remote_init(r);
 }
 
-struct promisor_remote *promisor_remote_find(const char *remote_name)
+struct promisor_remote *repo_promisor_remote_find(struct repository *r,
+						  const char *remote_name)
 {
-	promisor_remote_init();
+	promisor_remote_init(r);
 
 	if (!remote_name)
-		return promisors;
+		return r->promisor_remote_config->promisors;
 
-	return promisor_remote_lookup(remote_name, NULL);
+	return promisor_remote_lookup(r->promisor_remote_config, remote_name, NULL);
 }
 
-int has_promisor_remote(void)
+int repo_has_promisor_remote(struct repository *r)
 {
-	return !!promisor_remote_find(NULL);
+	return !!repo_promisor_remote_find(r, NULL);
 }
 
 static int remove_fetched_oids(struct repository *repo,
@@ -220,7 +216,7 @@ static int remove_fetched_oids(struct repository *repo,
 
 	if (remaining_nr) {
 		int j = 0;
-		new_oids = xcalloc(remaining_nr, sizeof(*new_oids));
+		CALLOC_ARRAY(new_oids, remaining_nr);
 		for (i = 0; i < oid_nr; i++)
 			if (remaining[i])
 				oidcpy(&new_oids[j++], &old_oids[i]);
@@ -244,10 +240,13 @@ int promisor_remote_get_direct(struct repository *repo,
 	int to_free = 0;
 	int res = -1;
 
-	promisor_remote_init();
+	if (oid_nr == 0)
+		return 0;
+
+	promisor_remote_init(repo);
 
-	for (r = promisors; r; r = r->next) {
-		if (fetch_objects(r->name, remaining_oids, remaining_nr) < 0) {
+	for (r = repo->promisor_remote_config->promisors; r; r = r->next) {
+		if (fetch_objects(repo, r->name, remaining_oids, remaining_nr) < 0) {
 			if (remaining_nr == 1)
 				continue;
 			remaining_nr = remove_fetched_oids(repo, &remaining_oids,
diff --git a/promisor-remote.h b/promisor-remote.h
index 737bac3a33..edc45ab0f5 100644
--- a/promisor-remote.h
+++ b/promisor-remote.h
@@ -9,7 +9,7 @@ struct object_id;
  * Promisor remote linked list
  *
  * Information in its fields come from remote.XXX config entries or
- * from extensions.partialclone or core.partialclonefilter.
+ * from extensions.partialclone.
  */
 struct promisor_remote {
 	struct promisor_remote *next;
@@ -17,17 +17,35 @@ struct promisor_remote {
 	const char name[FLEX_ARRAY];
 };
 
-void promisor_remote_reinit(void);
-struct promisor_remote *promisor_remote_find(const char *remote_name);
-int has_promisor_remote(void);
-int promisor_remote_get_direct(struct repository *repo,
-			       const struct object_id *oids,
-			       int oid_nr);
+void repo_promisor_remote_reinit(struct repository *r);
+static inline void promisor_remote_reinit(void)
+{
+	repo_promisor_remote_reinit(the_repository);
+}
+
+void promisor_remote_clear(struct promisor_remote_config *config);
+
+struct promisor_remote *repo_promisor_remote_find(struct repository *r, const char *remote_name);
+static inline struct promisor_remote *promisor_remote_find(const char *remote_name)
+{
+	return repo_promisor_remote_find(the_repository, remote_name);
+}
+
+int repo_has_promisor_remote(struct repository *r);
+static inline int has_promisor_remote(void)
+{
+	return repo_has_promisor_remote(the_repository);
+}
 
 /*
- * This should be used only once from setup.c to set the value we got
- * from the extensions.partialclone config option.
+ * Fetches all requested objects from all promisor remotes, trying them one at
+ * a time until all objects are fetched. Returns 0 upon success, and non-zero
+ * otherwise.
+ *
+ * If oid_nr is 0, this function returns 0 (success) immediately.
  */
-void set_repository_format_partial_clone(char *partial_clone);
+int promisor_remote_get_direct(struct repository *repo,
+			       const struct object_id *oids,
+			       int oid_nr);
 
 #endif /* PROMISOR_REMOTE_H */
diff --git a/prompt.c b/prompt.c
index 6d5885d009..5ded21a017 100644
--- a/prompt.c
+++ b/prompt.c
@@ -74,3 +74,15 @@ char *git_prompt(const char *prompt, int flags)
 	}
 	return r;
 }
+
+int git_read_line_interactively(struct strbuf *line)
+{
+	int ret;
+
+	fflush(stdout);
+	ret = strbuf_getline_lf(line, stdin);
+	if (ret != EOF)
+		strbuf_trim_trailing_newline(line);
+
+	return ret;
+}
diff --git a/prompt.h b/prompt.h
index e04cced030..e294e93541 100644
--- a/prompt.h
+++ b/prompt.h
@@ -6,4 +6,6 @@
 
 char *git_prompt(const char *prompt, int flags);
 
+int git_read_line_interactively(struct strbuf *line);
+
 #endif /* PROMPT_H */
diff --git a/protocol-caps.c b/protocol-caps.c
new file mode 100644
index 0000000000..13a9e63a04
--- /dev/null
+++ b/protocol-caps.c
@@ -0,0 +1,113 @@
+#include "git-compat-util.h"
+#include "protocol-caps.h"
+#include "gettext.h"
+#include "pkt-line.h"
+#include "strvec.h"
+#include "hash.h"
+#include "object.h"
+#include "object-store.h"
+#include "string-list.h"
+#include "strbuf.h"
+
+struct requested_info {
+	unsigned size : 1;
+};
+
+/*
+ * Parses oids from the given line and collects them in the given
+ * oid_str_list. Returns 1 if parsing was successful and 0 otherwise.
+ */
+static int parse_oid(const char *line, struct string_list *oid_str_list)
+{
+	const char *arg;
+
+	if (!skip_prefix(line, "oid ", &arg))
+		return 0;
+
+	string_list_append(oid_str_list, arg);
+
+	return 1;
+}
+
+/*
+ * Validates and send requested info back to the client. Any errors detected
+ * are returned as they are detected.
+ */
+static void send_info(struct repository *r, struct packet_writer *writer,
+		      struct string_list *oid_str_list,
+		      struct requested_info *info)
+{
+	struct string_list_item *item;
+	struct strbuf send_buffer = STRBUF_INIT;
+
+	if (!oid_str_list->nr)
+		return;
+
+	if (info->size)
+		packet_writer_write(writer, "size");
+
+	for_each_string_list_item (item, oid_str_list) {
+		const char *oid_str = item->string;
+		struct object_id oid;
+		unsigned long object_size;
+
+		if (get_oid_hex(oid_str, &oid) < 0) {
+			packet_writer_error(
+				writer,
+				"object-info: protocol error, expected to get oid, not '%s'",
+				oid_str);
+			continue;
+		}
+
+		strbuf_addstr(&send_buffer, oid_str);
+
+		if (info->size) {
+			if (oid_object_info(r, &oid, &object_size) < 0) {
+				strbuf_addstr(&send_buffer, " ");
+			} else {
+				strbuf_addf(&send_buffer, " %lu", object_size);
+			}
+		}
+
+		packet_writer_write(writer, "%s",
+				    strbuf_detach(&send_buffer, NULL));
+	}
+}
+
+int cap_object_info(struct repository *r, struct strvec *keys,
+		    struct packet_reader *request)
+{
+	struct requested_info info;
+	struct packet_writer writer;
+	struct string_list oid_str_list = STRING_LIST_INIT_DUP;
+
+	packet_writer_init(&writer, 1);
+
+	while (packet_reader_read(request) == PACKET_READ_NORMAL) {
+		if (!strcmp("size", request->line)) {
+			info.size = 1;
+			continue;
+		}
+
+		if (parse_oid(request->line, &oid_str_list))
+			continue;
+
+		packet_writer_error(&writer,
+				    "object-info: unexpected line: '%s'",
+				    request->line);
+	}
+
+	if (request->status != PACKET_READ_FLUSH) {
+		packet_writer_error(
+			&writer, "object-info: expected flush after arguments");
+		die(_("object-info: expected flush after arguments"));
+	}
+
+	send_info(r, &writer, &oid_str_list, &info);
+
+	string_list_clear(&oid_str_list, 1);
+
+	packet_flush(1);
+
+	return 0;
+}
diff --git a/protocol-caps.h b/protocol-caps.h
new file mode 100644
index 0000000000..0a9f49df11
--- /dev/null
+++ b/protocol-caps.h
@@ -0,0 +1,10 @@
+#ifndef PROTOCOL_CAPS_H
+#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);
+
+#endif /* PROTOCOL_CAPS_H */
diff --git a/protocol.c b/protocol.c
index 9741f05750..c53f7df5be 100644
--- a/protocol.c
+++ b/protocol.c
@@ -17,30 +17,29 @@ static enum protocol_version parse_protocol_version(const char *value)
 enum protocol_version get_protocol_version_config(void)
 {
 	const char *value;
-	enum protocol_version retval = protocol_v0;
 	const char *git_test_k = "GIT_TEST_PROTOCOL_VERSION";
-	const char *git_test_v = getenv(git_test_k);
+	const char *git_test_v;
 
-	if (!git_config_get_string_const("protocol.version", &value)) {
+	if (!git_config_get_string_tmp("protocol.version", &value)) {
 		enum protocol_version version = parse_protocol_version(value);
 
 		if (version == protocol_unknown_version)
 			die("unknown value for config 'protocol.version': %s",
 			    value);
 
-		retval = version;
+		return version;
 	}
 
+	git_test_v = getenv(git_test_k);
 	if (git_test_v && *git_test_v) {
 		enum protocol_version env = parse_protocol_version(git_test_v);
 
 		if (env == protocol_unknown_version)
 			die("unknown value for %s: %s", git_test_k, git_test_v);
-		if (retval < env)
-			retval = env;
+		return env;
 	}
 
-	return retval;
+	return protocol_v2;
 }
 
 enum protocol_version determine_protocol_version_server(void)
@@ -74,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/prune-packed.c b/prune-packed.c
new file mode 100644
index 0000000000..261520b472
--- /dev/null
+++ b/prune-packed.c
@@ -0,0 +1,43 @@
+#include "object-store.h"
+#include "packfile.h"
+#include "progress.h"
+#include "prune-packed.h"
+
+static struct progress *progress;
+
+static int prune_subdir(unsigned int nr, const char *path, void *data)
+{
+	int *opts = data;
+	display_progress(progress, nr + 1);
+	if (!(*opts & PRUNE_PACKED_DRY_RUN))
+		rmdir(path);
+	return 0;
+}
+
+static int prune_object(const struct object_id *oid, const char *path,
+			 void *data)
+{
+	int *opts = data;
+
+	if (!has_object_pack(oid))
+		return 0;
+
+	if (*opts & PRUNE_PACKED_DRY_RUN)
+		printf("rm -f %s\n", path);
+	else
+		unlink_or_warn(path);
+	return 0;
+}
+
+void prune_packed_objects(int opts)
+{
+	if (opts & PRUNE_PACKED_VERBOSE)
+		progress = start_delayed_progress(_("Removing duplicate objects"), 256);
+
+	for_each_loose_file_in_objdir(get_object_directory(),
+				      prune_object, NULL, prune_subdir, &opts);
+
+	/* Ensure we show 100% before finishing progress */
+	display_progress(progress, 256);
+	stop_progress(&progress);
+}
diff --git a/prune-packed.h b/prune-packed.h
new file mode 100644
index 0000000000..936fa9df23
--- /dev/null
+++ b/prune-packed.h
@@ -0,0 +1,9 @@
+#ifndef PRUNE_PACKED_H
+#define PRUNE_PACKED_H
+
+#define PRUNE_PACKED_DRY_RUN 01
+#define PRUNE_PACKED_VERBOSE 02
+
+void prune_packed_objects(int);
+
+#endif
diff --git a/quote.c b/quote.c
index 24a58ba454..26719d21d1 100644
--- a/quote.c
+++ b/quote.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 #include "quote.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 int quote_path_fully = 1;
 
@@ -55,7 +55,7 @@ void sq_quote_buf_pretty(struct strbuf *dst, const char *src)
 	}
 
 	for (p = src; *p; p++) {
-		if (!isalpha(*p) && !isdigit(*p) && !strchr(ok_punct, *p)) {
+		if (!isalnum(*p) && !strchr(ok_punct, *p)) {
 			sq_quote_buf(dst, src);
 			return;
 		}
@@ -116,7 +116,7 @@ void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv)
 	}
 }
 
-static char *sq_dequote_step(char *arg, char **next)
+char *sq_dequote_step(char *arg, char **next)
 {
 	char *dst = arg;
 	char *src = arg;
@@ -153,11 +153,8 @@ static char *sq_dequote_step(char *arg, char **next)
 			}
 		/* Fallthrough */
 		default:
-			if (!next || !isspace(*src))
+			if (!next)
 				return NULL;
-			do {
-				c = *++src;
-			} while (isspace(c));
 			*dst = 0;
 			*next = src;
 			return arg;
@@ -172,7 +169,7 @@ char *sq_dequote(char *arg)
 
 static int sq_dequote_to_argv_internal(char *arg,
 				       const char ***argv, int *nr, int *alloc,
-				       struct argv_array *array)
+				       struct strvec *array)
 {
 	char *next = arg;
 
@@ -182,12 +179,20 @@ static int sq_dequote_to_argv_internal(char *arg,
 		char *dequoted = sq_dequote_step(next, &next);
 		if (!dequoted)
 			return -1;
+		if (next) {
+			char c;
+			if (!isspace(*next))
+				return -1;
+			do {
+				c = *++next;
+			} while (isspace(c));
+		}
 		if (argv) {
 			ALLOC_GROW(*argv, *nr + 1, *alloc);
 			(*argv)[(*nr)++] = dequoted;
 		}
 		if (array)
-			argv_array_push(array, dequoted);
+			strvec_push(array, dequoted);
 	} while (next);
 
 	return 0;
@@ -198,7 +203,7 @@ int sq_dequote_to_argv(char *arg, const char ***argv, int *nr, int *alloc)
 	return sq_dequote_to_argv_internal(arg, argv, nr, alloc, NULL);
 }
 
-int sq_dequote_to_argv_array(char *arg, struct argv_array *array)
+int sq_dequote_to_strvec(char *arg, struct strvec *array)
 {
 	return sq_dequote_to_argv_internal(arg, NULL, NULL, NULL, array);
 }
@@ -210,7 +215,7 @@ int sq_dequote_to_argv_array(char *arg, struct argv_array *array)
  */
 #define X8(x)   x, x, x, x, x, x, x, x
 #define X16(x)  X8(x), X8(x)
-static signed char const sq_lookup[256] = {
+static signed char const cq_lookup[256] = {
 	/*           0    1    2    3    4    5    6    7 */
 	/* 0x00 */   1,   1,   1,   1,   1,   1,   1, 'a',
 	/* 0x08 */ 'b', 't', 'n', 'v', 'f', 'r',   1,   1,
@@ -223,9 +228,9 @@ static signed char const sq_lookup[256] = {
 	/* 0x80 */ /* set to 0 */
 };
 
-static inline int sq_must_quote(char c)
+static inline int cq_must_quote(char c)
 {
-	return sq_lookup[(unsigned char)c] + quote_path_fully > 0;
+	return cq_lookup[(unsigned char)c] + quote_path_fully > 0;
 }
 
 /* returns the longest prefix not needing a quote up to maxlen if positive.
@@ -235,9 +240,9 @@ static size_t next_quote_pos(const char *s, ssize_t maxlen)
 {
 	size_t len;
 	if (maxlen < 0) {
-		for (len = 0; !sq_must_quote(s[len]); len++);
+		for (len = 0; !cq_must_quote(s[len]); len++);
 	} else {
-		for (len = 0; len < maxlen && !sq_must_quote(s[len]); len++);
+		for (len = 0; len < maxlen && !cq_must_quote(s[len]); len++);
 	}
 	return len;
 }
@@ -256,7 +261,7 @@ static size_t next_quote_pos(const char *s, ssize_t maxlen)
  *     Return value is the same as in (1).
  */
 static size_t quote_c_style_counted(const char *name, ssize_t maxlen,
-				    struct strbuf *sb, FILE *fp, int no_dq)
+				    struct strbuf *sb, FILE *fp, unsigned flags)
 {
 #undef EMIT
 #define EMIT(c)                                 \
@@ -272,6 +277,7 @@ static size_t quote_c_style_counted(const char *name, ssize_t maxlen,
 		count += (l);                           \
 	} while (0)
 
+	int no_dq = !!(flags & CQUOTE_NODQ);
 	size_t len, count = 0;
 	const char *p = name;
 
@@ -291,8 +297,8 @@ static size_t quote_c_style_counted(const char *name, ssize_t maxlen,
 		ch = (unsigned char)*p++;
 		if (maxlen >= 0)
 			maxlen -= len + 1;
-		if (sq_lookup[ch] >= ' ') {
-			EMIT(sq_lookup[ch]);
+		if (cq_lookup[ch] >= ' ') {
+			EMIT(cq_lookup[ch]);
 		} else {
 			EMIT(((ch >> 6) & 03) + '0');
 			EMIT(((ch >> 3) & 07) + '0');
@@ -309,19 +315,21 @@ static size_t quote_c_style_counted(const char *name, ssize_t maxlen,
 	return count;
 }
 
-size_t quote_c_style(const char *name, struct strbuf *sb, FILE *fp, int nodq)
+size_t quote_c_style(const char *name, struct strbuf *sb, FILE *fp, unsigned flags)
 {
-	return quote_c_style_counted(name, -1, sb, fp, nodq);
+	return quote_c_style_counted(name, -1, sb, fp, flags);
 }
 
-void quote_two_c_style(struct strbuf *sb, const char *prefix, const char *path, int nodq)
+void quote_two_c_style(struct strbuf *sb, const char *prefix, const char *path,
+		       unsigned flags)
 {
+	int nodq = !!(flags & CQUOTE_NODQ);
 	if (quote_c_style(prefix, NULL, NULL, 0) ||
 	    quote_c_style(path, NULL, NULL, 0)) {
 		if (!nodq)
 			strbuf_addch(sb, '"');
-		quote_c_style(prefix, sb, NULL, 1);
-		quote_c_style(path, sb, NULL, 1);
+		quote_c_style(prefix, sb, NULL, CQUOTE_NODQ);
+		quote_c_style(path, sb, NULL, CQUOTE_NODQ);
 		if (!nodq)
 			strbuf_addch(sb, '"');
 	} else {
@@ -352,13 +360,25 @@ void write_name_quoted_relative(const char *name, const char *prefix,
 }
 
 /* quote path as relative to the given prefix */
-char *quote_path_relative(const char *in, const char *prefix,
-			  struct strbuf *out)
+char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigned flags)
 {
 	struct strbuf sb = STRBUF_INIT;
 	const char *rel = relative_path(in, prefix, &sb);
+	int force_dq = ((flags & QUOTE_PATH_QUOTE_SP) && strchr(rel, ' '));
+
 	strbuf_reset(out);
-	quote_c_style_counted(rel, strlen(rel), out, NULL, 0);
+
+	/*
+	 * If the caller wants us to enclose the output in a dq-pair
+	 * whether quote_c_style_counted() needs to, we do it ourselves
+	 * and tell quote_c_style_counted() not to.
+	 */
+	if (force_dq)
+		strbuf_addch(out, '"');
+	quote_c_style_counted(rel, strlen(rel), out, NULL,
+			      force_dq ? CQUOTE_NODQ : 0);
+	if (force_dq)
+		strbuf_addch(out, '"');
 	strbuf_release(&sb);
 
 	return out->buf;
@@ -451,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 ca8ee3144a..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, ...);
 
 /*
@@ -42,13 +43,27 @@ void sq_quote_buf_pretty(struct strbuf *, const char *src);
 void sq_quote_argv_pretty(struct strbuf *, const char **argv);
 void sq_append_quote_argv_pretty(struct strbuf *dst, const char **argv);
 
-/* This unwraps what sq_quote() produces in place, but returns
+/*
+ * This unwraps what sq_quote() produces in place, but returns
  * NULL if the input does not look like what sq_quote would have
- * produced.
+ * produced (the full string must be a single quoted item).
  */
 char *sq_dequote(char *);
 
 /*
+ * Like sq_dequote(), but dequote a single item, and leave "next" pointing to
+ * the next character. E.g., in the string:
+ *
+ *   'one' 'two' 'three'
+ *
+ * after the first call, the return value would be the unquoted string "one",
+ * with "next" pointing to the space between "one" and "two"). The caller is
+ * responsible for advancing the pointer to the start of the next item before
+ * calling sq_dequote_step() again.
+ */
+char *sq_dequote_step(char *src, char **next);
+
+/*
  * Same as the above, but can be used to unwrap many arguments in the
  * same string separated by space. Like sq_quote, it works in place,
  * modifying arg and appending pointers into it to argv.
@@ -56,27 +71,31 @@ char *sq_dequote(char *);
 int sq_dequote_to_argv(char *arg, const char ***argv, int *nr, int *alloc);
 
 /*
- * Same as above, but store the unquoted strings in an argv_array. We will
- * still modify arg in place, but unlike sq_dequote_to_argv, the argv_array
+ * Same as above, but store the unquoted strings in a strvec. We will
+ * still modify arg in place, but unlike sq_dequote_to_argv, the strvec
  * will duplicate and take ownership of the strings.
  */
-struct argv_array;
-int sq_dequote_to_argv_array(char *arg, struct argv_array *);
+struct strvec;
+int sq_dequote_to_strvec(char *arg, struct strvec *);
 
 int unquote_c_style(struct strbuf *, const char *quoted, const char **endp);
-size_t quote_c_style(const char *name, struct strbuf *, FILE *, int no_dq);
-void quote_two_c_style(struct strbuf *, const char *, const char *, int);
+
+/* Bits in the flags parameter to quote_c_style() */
+#define CQUOTE_NODQ 01
+size_t quote_c_style(const char *name, struct strbuf *, FILE *, unsigned);
+void quote_two_c_style(struct strbuf *, const char *, const char *, unsigned);
 
 void write_name_quoted(const char *name, FILE *, int terminator);
 void write_name_quoted_relative(const char *name, const char *prefix,
 				FILE *fp, int terminator);
 
 /* quote path as relative to the given prefix */
-char *quote_path_relative(const char *in, const char *prefix,
-			  struct strbuf *out);
+char *quote_path(const char *in, const char *prefix, struct strbuf *out, unsigned flags);
+#define QUOTE_PATH_QUOTE_SP 01
 
 /* 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 7fed5a3b4b..e731525e66 100644
--- a/range-diff.c
+++ b/range-diff.c
@@ -2,7 +2,7 @@
 #include "range-diff.h"
 #include "string-list.h"
 #include "run-command.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "hashmap.h"
 #include "xdiff-interface.h"
 #include "linear-assignment.h"
@@ -11,6 +11,7 @@
 #include "pretty.h"
 #include "userdiff.h"
 #include "apply.h"
+#include "revision.h"
 
 struct patch_util {
 	/* For the search for an exact match */
@@ -25,44 +26,39 @@ 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).
  */
-static int read_patches(const char *range, struct string_list *list)
+static int read_patches(const char *range, struct string_list *list,
+			const struct strvec *other_arg)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
 	struct strbuf buf = STRBUF_INIT, contents = STRBUF_INIT;
 	struct patch_util *util = NULL;
 	int in_header = 1;
 	char *line, *current_filename = NULL;
-	int offset, len;
+	ssize_t len;
 	size_t size;
 
-	argv_array_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
-			"--reverse", "--date-order", "--decorate=no",
-			"--no-prefix",
-			/*
-			 * Choose indicators that are not used anywhere
-			 * else in diffs, but still look reasonable
-			 * (e.g. will not be confusing when debugging)
-			 */
-			"--output-indicator-new=>",
-			"--output-indicator-old=<",
-			"--output-indicator-context=#",
-			"--no-abbrev-commit", range,
-			NULL);
+	strvec_pushl(&cp.args, "log", "--no-color", "-p", "--no-merges",
+		     "--reverse", "--date-order", "--decorate=no",
+		     "--no-prefix",
+		     /*
+		      * Choose indicators that are not used anywhere
+		      * else in diffs, but still look reasonable
+		      * (e.g. will not be confusing when debugging)
+		      */
+		     "--output-indicator-new=>",
+		     "--output-indicator-old=<",
+		     "--output-indicator-context=#",
+		     "--no-abbrev-commit",
+		     "--pretty=medium",
+		     "--notes",
+		     NULL);
+	if (other_arg)
+		strvec_pushv(&cp.args, other_arg->v);
+	strvec_push(&cp.args, range);
 	cp.out = -1;
 	cp.no_stdin = 1;
 	cp.git_cmd = 1;
@@ -74,27 +70,36 @@ static int read_patches(const char *range, struct string_list *list)
 		finish_command(&cp);
 		return -1;
 	}
+	if (finish_command(&cp))
+		return -1;
 
 	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;
 				strbuf_reset(&buf);
 			}
-			util = xcalloc(sizeof(*util), 1);
+			CALLOC_ARRAY(util, 1);
 			if (get_oid(p, &util->oid)) {
 				error(_("could not parse commit '%s'"), p);
 				free(util);
+				free(current_filename);
 				string_list_clear(list, 1);
 				strbuf_release(&buf);
 				strbuf_release(&contents);
-				finish_command(&cp);
 				return -1;
 			}
 			util->matching = -1;
@@ -102,20 +107,42 @@ static int read_patches(const char *range, struct string_list *list)
 			continue;
 		}
 
+		if (!util) {
+			error(_("could not parse first line of `log` output: "
+				"did not start with 'commit ': '%s'"),
+			      line);
+			free(current_filename);
+			string_list_clear(list, 1);
+			strbuf_release(&buf);
+			strbuf_release(&contents);
+			return -1;
+		}
+
 		if (starts_with(line, "diff --git")) {
 			struct patch patch = { 0 };
 			struct strbuf root = STRBUF_INIT;
 			int linenr = 0;
+			int orig_len;
 
 			in_header = 0;
 			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);
-			if (len < 0)
-				die(_("could not parse git header '%.*s'"), (int)len, line);
+			if (len < 0) {
+				error(_("could not parse git header '%.*s'"),
+				      orig_len, line);
+				free(util);
+				free(current_filename);
+				string_list_clear(list, 1);
+				strbuf_release(&buf);
+				strbuf_release(&contents);
+				return -1;
+			}
 			strbuf_addstr(&buf, " ## ");
 			if (patch.is_new > 0)
 				strbuf_addf(&buf, "%s (new)", patch.new_name);
@@ -144,6 +171,12 @@ static int read_patches(const char *range, struct string_list *list)
 				strbuf_addstr(&buf, line);
 				strbuf_addstr(&buf, "\n\n");
 				strbuf_addstr(&buf, " ## Commit message ##\n");
+			} else if (starts_with(line, "Notes") &&
+				   line[strlen(line) - 1] == ':') {
+				strbuf_addstr(&buf, "\n\n");
+				/* strip the trailing colon */
+				strbuf_addf(&buf, " ## %.*s ##\n",
+					    (int)(strlen(line) - 1), line);
 			} else if (starts_with(line, "    ")) {
 				p = line + len - 2;
 				while (isspace(*p) && p >= line)
@@ -192,9 +225,6 @@ static int read_patches(const char *range, struct string_list *list)
 	strbuf_release(&buf);
 	free(current_filename);
 
-	if (finish_command(&cp))
-		return -1;
-
 	return 0;
 }
 
@@ -206,11 +236,9 @@ static int patch_util_cmp(const void *dummy, const struct patch_util *a,
 
 static void find_exact_matches(struct string_list *a, struct string_list *b)
 {
-	struct hashmap map;
+	struct hashmap map = HASHMAP_INIT((hashmap_cmp_fn)patch_util_cmp, NULL);
 	int i;
 
-	hashmap_init(&map, (hashmap_cmp_fn)patch_util_cmp, NULL, 0);
-
 	/* First, add the patches of a to a hash map */
 	for (i = 0; i < a->nr; i++) {
 		struct patch_util *util = a->items[i].util;
@@ -240,12 +268,13 @@ static void find_exact_matches(struct string_list *a, struct string_list *b)
 		}
 	}
 
-	hashmap_free(&map);
+	hashmap_clear(&map);
 }
 
-static void diffsize_consume(void *data, char *line, unsigned long len)
+static int diffsize_consume(void *data, char *line, unsigned long len)
 {
 	(*(int *)data)++;
+	return 0;
 }
 
 static void diffsize_hunk(void *data, long ob, long on, long nb, long nn,
@@ -414,7 +443,7 @@ static struct diff_filespec *get_filespec(const char *name, const char *p)
 {
 	struct diff_filespec *spec = alloc_filespec(name);
 
-	fill_filespec(spec, &null_oid, 0, 0100644);
+	fill_filespec(spec, null_oid(), 0, 0100644);
 	spec->data = (char *)p;
 	spec->size = strlen(p);
 	spec->should_munmap = 0;
@@ -434,12 +463,35 @@ static void patch_diff(const char *a, const char *b,
 	diff_flush(diffopt);
 }
 
+static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
+{
+	return data;
+}
+
 static void output(struct string_list *a, struct string_list *b,
-		   struct diff_options *diffopt)
+		   struct range_diff_options *range_diff_opts)
 {
 	struct strbuf buf = STRBUF_INIT, dashes = STRBUF_INIT;
 	int patch_no_width = decimal_width(1 + (a->nr > b->nr ? a->nr : b->nr));
 	int i = 0, j = 0;
+	struct diff_options opts;
+	struct strbuf indent = STRBUF_INIT;
+
+	if (range_diff_opts->diffopt)
+		memcpy(&opts, range_diff_opts->diffopt, sizeof(opts));
+	else
+		diff_setup(&opts);
+
+	if (!opts.output_format)
+		opts.output_format = DIFF_FORMAT_PATCH;
+	opts.flags.suppress_diff_headers = 1;
+	opts.flags.dual_color_diffed_diffs =
+		range_diff_opts->dual_color;
+	opts.flags.suppress_hunk_header_line_count = 1;
+	opts.output_prefix = output_prefix_cb;
+	strbuf_addstr(&indent, "    ");
+	opts.output_prefix_data = &indent;
+	diff_setup_done(&opts);
 
 	/*
 	 * We assume the user is really more interested in the second argument
@@ -460,7 +512,8 @@ static void output(struct string_list *a, struct string_list *b,
 
 		/* Show unmatched LHS commit whose predecessors were shown. */
 		if (i < a->nr && a_util->matching < 0) {
-			output_pair_header(diffopt, patch_no_width,
+			if (!range_diff_opts->right_only)
+				output_pair_header(&opts, patch_no_width,
 					   &buf, &dashes, a_util, NULL);
 			i++;
 			continue;
@@ -468,7 +521,8 @@ static void output(struct string_list *a, struct string_list *b,
 
 		/* Show unmatched RHS commits. */
 		while (j < b->nr && b_util->matching < 0) {
-			output_pair_header(diffopt, patch_no_width,
+			if (!range_diff_opts->left_only)
+				output_pair_header(&opts, patch_no_width,
 					   &buf, &dashes, NULL, b_util);
 			b_util = ++j < b->nr ? b->items[j].util : NULL;
 		}
@@ -476,62 +530,41 @@ static void output(struct string_list *a, struct string_list *b,
 		/* Show matching LHS/RHS pair. */
 		if (j < b->nr) {
 			a_util = a->items[b_util->matching].util;
-			output_pair_header(diffopt, patch_no_width,
+			output_pair_header(&opts, patch_no_width,
 					   &buf, &dashes, a_util, b_util);
-			if (!(diffopt->output_format & DIFF_FORMAT_NO_OUTPUT))
+			if (!(opts.output_format & DIFF_FORMAT_NO_OUTPUT))
 				patch_diff(a->items[b_util->matching].string,
-					   b->items[j].string, diffopt);
+					   b->items[j].string, &opts);
 			a_util->shown = 1;
 			j++;
 		}
 	}
 	strbuf_release(&buf);
 	strbuf_release(&dashes);
-}
-
-static struct strbuf *output_prefix_cb(struct diff_options *opt, void *data)
-{
-	return data;
+	strbuf_release(&indent);
 }
 
 int show_range_diff(const char *range1, const char *range2,
-		    int creation_factor, int dual_color,
-		    struct diff_options *diffopt)
+		    struct range_diff_options *range_diff_opts)
 {
 	int res = 0;
 
 	struct string_list branch1 = STRING_LIST_INIT_DUP;
 	struct string_list branch2 = STRING_LIST_INIT_DUP;
 
-	if (read_patches(range1, &branch1))
+	if (range_diff_opts->left_only && range_diff_opts->right_only)
+		res = error(_("--left-only and --right-only are mutually exclusive"));
+
+	if (!res && read_patches(range1, &branch1, range_diff_opts->other_arg))
 		res = error(_("could not parse log for '%s'"), range1);
-	if (!res && read_patches(range2, &branch2))
+	if (!res && read_patches(range2, &branch2, range_diff_opts->other_arg))
 		res = error(_("could not parse log for '%s'"), range2);
 
 	if (!res) {
-		struct diff_options opts;
-		struct strbuf indent = STRBUF_INIT;
-
-		if (diffopt)
-			memcpy(&opts, diffopt, sizeof(opts));
-		else
-			diff_setup(&opts);
-
-		if (!opts.output_format)
-			opts.output_format = DIFF_FORMAT_PATCH;
-		opts.flags.suppress_diff_headers = 1;
-		opts.flags.dual_color_diffed_diffs = dual_color;
-		opts.flags.suppress_hunk_header_line_count = 1;
-		opts.output_prefix = output_prefix_cb;
-		strbuf_addstr(&indent, "    ");
-		opts.output_prefix_data = &indent;
-		diff_setup_done(&opts);
-
 		find_exact_matches(&branch1, &branch2);
-		get_correspondences(&branch1, &branch2, creation_factor);
-		output(&branch1, &branch2, &opts);
-
-		strbuf_release(&indent);
+		get_correspondences(&branch1, &branch2,
+				    range_diff_opts->creation_factor);
+		output(&branch1, &branch2, range_diff_opts);
 	}
 
 	string_list_clear(&branch1, 1);
@@ -539,3 +572,31 @@ int show_range_diff(const char *range1, const char *range2,
 
 	return res;
 }
+
+int is_range_diff_range(const char *arg)
+{
+	char *copy = xstrdup(arg); /* setup_revisions() modifies it */
+	const char *argv[] = { "", copy, "--", NULL };
+	int i, positive = 0, negative = 0;
+	struct rev_info revs;
+
+	init_revisions(&revs, NULL);
+	if (setup_revisions(3, argv, &revs, NULL) == 1) {
+		for (i = 0; i < revs.pending.nr; i++)
+			if (revs.pending.objects[i].item->flags & UNINTERESTING)
+				negative++;
+			else
+				positive++;
+		for (i = 0; i < revs.pending.nr; i++) {
+			struct object *obj = revs.pending.objects[i].item;
+
+			if (obj->type == OBJ_COMMIT)
+				clear_commit_marks((struct commit *)obj,
+						   ALL_REV_FLAGS);
+		}
+	}
+
+	free(copy);
+	object_array_clear(&revs.pending);
+	return negative > 0 && positive > 0;
+}
diff --git a/range-diff.h b/range-diff.h
index 08a50b6e98..04ffe217be 100644
--- a/range-diff.h
+++ b/range-diff.h
@@ -2,16 +2,29 @@
 #define RANGE_DIFF_H
 
 #include "diff.h"
+#include "strvec.h"
 
 #define RANGE_DIFF_CREATION_FACTOR_DEFAULT 60
 
+struct range_diff_options {
+	int creation_factor;
+	unsigned dual_color:1;
+	unsigned left_only:1, right_only:1;
+	const struct diff_options *diffopt; /* may be NULL */
+	const struct strvec *other_arg; /* may be NULL */
+};
+
 /*
- * Compare series of commmits in RANGE1 and RANGE2, and emit to the
- * standard output.  NULL can be passed to DIFFOPT to use the built-in
- * default.
+ * Compare series of commits in `range1` and `range2`, and emit to the
+ * standard output.
  */
 int show_range_diff(const char *range1, const char *range2,
-		    int creation_factor, int dual_color,
-		    struct diff_options *diffopt);
+		    struct range_diff_options *opts);
+
+/*
+ * Determine whether the given argument is usable as a range argument of `git
+ * range-diff`, e.g. A..B.
+ */
+int is_range_diff_range(const char *arg);
 
 #endif
diff --git a/reachable.c b/reachable.c
index 8f50235b28..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,
@@ -223,21 +205,16 @@ void mark_reachable_objects(struct rev_info *revs, int mark_reflog,
 	cp.progress = progress;
 	cp.count = 0;
 
-	bitmap_git = prepare_bitmap_walk(revs);
+	bitmap_git = prepare_bitmap_walk(revs, NULL, 0);
 	if (bitmap_git) {
-		traverse_bitmap_commit_list(bitmap_git, mark_object_seen);
+		traverse_bitmap_commit_list(bitmap_git, revs, mark_object_seen);
 		free_bitmap_index(bitmap_git);
-		return;
+	} else {
+		if (prepare_revision_walk(revs))
+			die("revision walk setup failed");
+		traverse_commit_list(revs, mark_commit, mark_object, &cp);
 	}
 
-	/*
-	 * Set up the revision walk - this will move all commits
-	 * from the pending list to the commit walking list.
-	 */
-	if (prepare_revision_walk(revs))
-		die("revision walk setup failed");
-	traverse_commit_list(revs, mark_commit, mark_object, &cp);
-
 	if (mark_recent) {
 		revs->ignore_missing_links = 1;
 		if (add_unseen_recent_objects_to_traversal(revs, mark_recent))
diff --git a/read-cache.c b/read-cache.c
index 133f790fa4..9048ef9e90 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -25,6 +25,9 @@
 #include "fsmonitor.h"
 #include "thread-utils.h"
 #include "progress.h"
+#include "sparse-index.h"
+#include "csum-file.h"
+#include "promisor-remote.h"
 
 /* Mask for the name length in ce_flags in the on-disk index */
 
@@ -47,6 +50,7 @@
 #define CACHE_EXT_FSMONITOR 0x46534D4E	  /* "FSMN" */
 #define CACHE_EXT_ENDOFINDEXENTRIES 0x454F4945	/* "EOIE" */
 #define CACHE_EXT_INDEXENTRYOFFSETTABLE 0x49454F54 /* "IEOT" */
+#define CACHE_EXT_SPARSE_DIRECTORIES 0x73646972 /* "sdir" */
 
 /* changes that can be kept in $GIT_DIR/index (basically all extensions) */
 #define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
@@ -89,8 +93,10 @@ static struct mem_pool *find_mem_pool(struct index_state *istate)
 	else
 		pool_ptr = &istate->ce_mem_pool;
 
-	if (!*pool_ptr)
-		mem_pool_init(pool_ptr, 0);
+	if (!*pool_ptr) {
+		*pool_ptr = xmalloc(sizeof(**pool_ptr));
+		mem_pool_init(*pool_ptr, 0);
+	}
 
 	return *pool_ptr;
 }
@@ -99,6 +105,9 @@ static const char *alternate_index_output;
 
 static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
 {
+	if (S_ISSPARSEDIR(ce->ce_mode))
+		istate->sparse_index = 1;
+
 	istate->cache[nr] = ce;
 	add_name_hash(istate, ce);
 }
@@ -542,7 +551,7 @@ int cache_name_stage_compare(const char *name1, int len1, int stage1, const char
 	return 0;
 }
 
-static int index_name_stage_pos(const 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)
 {
 	int first, last;
 
@@ -560,10 +569,31 @@ static int index_name_stage_pos(const struct index_state *istate, const char *na
 		}
 		first = next+1;
 	}
+
+	if (istate->sparse_index &&
+	    first > 0) {
+		/* Note: first <= istate->cache_nr */
+		struct cache_entry *ce = istate->cache[first - 1];
+
+		/*
+		 * If we are in a sparse-index _and_ the entry before the
+		 * insertion position is a sparse-directory entry that is
+		 * an ancestor of 'name', then we need to expand the index
+		 * and search again. This will only trigger once, because
+		 * thereafter the index is fully expanded.
+		 */
+		if (S_ISSPARSEDIR(ce->ce_mode) &&
+		    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 -first-1;
 }
 
-int index_name_pos(const struct index_state *istate, const char *name, int namelen)
+int index_name_pos(struct index_state *istate, const char *name, int namelen)
 {
 	return index_name_stage_pos(istate, name, namelen, 0);
 }
@@ -811,8 +841,11 @@ struct cache_entry *make_empty_cache_entry(struct index_state *istate, size_t le
 	return mem_pool__ce_calloc(find_mem_pool(istate), len);
 }
 
-struct cache_entry *make_empty_transient_cache_entry(size_t len)
+struct cache_entry *make_empty_transient_cache_entry(size_t len,
+						     struct mem_pool *ce_mem_pool)
 {
+	if (ce_mem_pool)
+		return mem_pool__ce_calloc(ce_mem_pool, len);
 	return xcalloc(1, cache_entry_size(len));
 }
 
@@ -846,8 +879,11 @@ struct cache_entry *make_cache_entry(struct index_state *istate,
 	return ret;
 }
 
-struct cache_entry *make_transient_cache_entry(unsigned int mode, const struct object_id *oid,
-					       const char *path, int stage)
+struct cache_entry *make_transient_cache_entry(unsigned int mode,
+					       const struct object_id *oid,
+					       const char *path,
+					       int stage,
+					       struct mem_pool *ce_mem_pool)
 {
 	struct cache_entry *ce;
 	int len;
@@ -858,7 +894,7 @@ struct cache_entry *make_transient_cache_entry(unsigned int mode, const struct o
 	}
 
 	len = strlen(path);
-	ce = make_empty_transient_cache_entry(len);
+	ce = make_empty_transient_cache_entry(len, ce_mem_pool);
 
 	oidcpy(&ce->oid, oid);
 	memcpy(ce->name, path, len);
@@ -959,11 +995,14 @@ static int verify_dotfile(const char *rest, unsigned mode)
 
 int verify_path(const char *path, unsigned mode)
 {
-	char c;
+	char c = 0;
 
 	if (has_dos_drive_prefix(path))
 		return 0;
 
+	if (!is_valid_path(path))
+		return 0;
+
 	goto inside;
 	for (;;) {
 		if (!c)
@@ -971,6 +1010,7 @@ int verify_path(const char *path, unsigned mode)
 		if (is_dir_sep(c)) {
 inside:
 			if (protect_hfs) {
+
 				if (is_hfs_dotgit(path))
 					return 0;
 				if (S_ISLNK(mode)) {
@@ -979,6 +1019,10 @@ inside:
 				}
 			}
 			if (protect_ntfs) {
+#if defined GIT_WINDOWS_NATIVE || defined __CYGWIN__
+				if (c == '\\')
+					return 0;
+#endif
 				if (is_ntfs_dotgit(path))
 					return 0;
 				if (S_ISLNK(mode)) {
@@ -989,9 +1033,23 @@ inside:
 
 			c = *path++;
 			if ((c == '.' && !verify_dotfile(path, mode)) ||
-			    is_dir_sep(c) || c == '\0')
+			    is_dir_sep(c))
+				return 0;
+			/*
+			 * allow terminating directory separators for
+			 * sparse directory entries.
+			 */
+			if (c == '\0')
+				return S_ISDIR(mode);
+		} else if (c == '\\' && protect_ntfs) {
+			if (is_ntfs_dotgit(path))
 				return 0;
+			if (S_ISLNK(mode)) {
+				if (is_ntfs_dotgitmodules(path))
+					return 0;
+			}
 		}
+
 		c = *path++;
 	}
 }
@@ -1155,20 +1213,6 @@ static int has_dir_name(struct index_state *istate,
 				return retval;
 			}
 
-			if (istate->cache_nr > 0 &&
-				ce_namelen(istate->cache[istate->cache_nr - 1]) > len) {
-				/*
-				 * The directory prefix lines up with part of
-				 * a longer file or directory name, but sorts
-				 * after it, so this sub-directory cannot
-				 * collide with a file.
-				 *
-				 * last: xxx/yy-file (because '-' sorts before '/')
-				 * this: xxx/yy/abc
-				 */
-				return retval;
-			}
-
 			/*
 			 * This is a possible collision. Fall through and
 			 * let the regular search code handle it.
@@ -1360,7 +1404,9 @@ int add_index_entry(struct index_state *istate, struct cache_entry *ce, int opti
 static struct cache_entry *refresh_cache_ent(struct index_state *istate,
 					     struct cache_entry *ce,
 					     unsigned int options, int *err,
-					     int *changed_ret)
+					     int *changed_ret,
+					     int *t2_did_lstat,
+					     int *t2_did_scan)
 {
 	struct stat st;
 	struct cache_entry *updated;
@@ -1402,6 +1448,8 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
 		return NULL;
 	}
 
+	if (t2_did_lstat)
+		*t2_did_lstat = 1;
 	if (lstat(ce->name, &st) < 0) {
 		if (ignore_missing && errno == ENOENT)
 			return ce;
@@ -1438,6 +1486,8 @@ static struct cache_entry *refresh_cache_ent(struct index_state *istate,
 		}
 	}
 
+	if (t2_did_scan)
+		*t2_did_scan = 1;
 	if (ie_modified(istate, ce, &st, options)) {
 		if (err)
 			*err = EINVAL;
@@ -1504,6 +1554,7 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	int quiet = (flags & REFRESH_QUIET) != 0;
 	int not_new = (flags & REFRESH_IGNORE_MISSING) != 0;
 	int ignore_submodules = (flags & REFRESH_IGNORE_SUBMODULES) != 0;
+	int ignore_skip_worktree = (flags & REFRESH_IGNORE_SKIP_WORKTREE) != 0;
 	int first = 1;
 	int in_porcelain = (flags & REFRESH_IN_PORCELAIN);
 	unsigned int options = (CE_MATCH_REFRESH |
@@ -1515,6 +1566,8 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	const char *added_fmt;
 	const char *unmerged_fmt;
 	struct progress *progress = NULL;
+	int t2_sum_lstat = 0;
+	int t2_sum_scan = 0;
 
 	if (flags & REFRESH_PROGRESS && isatty(2))
 		progress = start_delayed_progress(_("Refresh index"),
@@ -1532,15 +1585,28 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 	 * we only have to do the special cases that are left.
 	 */
 	preload_index(istate, pathspec, 0);
+	trace2_region_enter("index", "refresh", NULL);
+
 	for (i = 0; i < istate->cache_nr; i++) {
 		struct cache_entry *ce, *new_entry;
 		int cache_errno = 0;
 		int changed = 0;
 		int filtered = 0;
+		int t2_did_lstat = 0;
+		int t2_did_scan = 0;
 
 		ce = istate->cache[i];
 		if (ignore_submodules && S_ISGITLINK(ce->ce_mode))
 			continue;
+		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;
@@ -1562,11 +1628,14 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 		if (filtered)
 			continue;
 
-		new_entry = refresh_cache_ent(istate, ce, options, &cache_errno, &changed);
+		new_entry = refresh_cache_ent(istate, ce, options,
+					      &cache_errno, &changed,
+					      &t2_did_lstat, &t2_did_scan);
+		t2_sum_lstat += t2_did_lstat;
+		t2_sum_scan += t2_did_scan;
 		if (new_entry == ce)
 			continue;
-		if (progress)
-			display_progress(progress, i);
+		display_progress(progress, i);
 		if (!new_entry) {
 			const char *fmt;
 
@@ -1598,10 +1667,11 @@ int refresh_index(struct index_state *istate, unsigned int flags,
 
 		replace_index_entry(istate, i, new_entry);
 	}
-	if (progress) {
-		display_progress(progress, istate->cache_nr);
-		stop_progress(&progress);
-	}
+	trace2_data_intmax("index", NULL, "refresh/sum_lstat", t2_sum_lstat);
+	trace2_data_intmax("index", NULL, "refresh/sum_scan", t2_sum_scan);
+	trace2_region_leave("index", "refresh", NULL);
+	display_progress(progress, istate->cache_nr);
+	stop_progress(&progress);
 	trace_performance_leave("refresh index");
 	return has_errors;
 }
@@ -1610,7 +1680,7 @@ struct cache_entry *refresh_cache_entry(struct index_state *istate,
 					struct cache_entry *ce,
 					unsigned int options)
 {
-	return refresh_cache_ent(istate, ce, options, NULL, NULL);
+	return refresh_cache_ent(istate, ce, options, NULL, NULL, NULL, NULL);
 }
 
 
@@ -1738,6 +1808,10 @@ static int read_index_extension(struct index_state *istate,
 	case CACHE_EXT_INDEXENTRYOFFSETTABLE:
 		/* already handled in do_read_index() */
 		break;
+	case CACHE_EXT_SPARSE_DIRECTORIES:
+		/* no content, only an indicator */
+		istate->sparse_index = 1;
+		break;
 	default:
 		if (*ext < 'A' || 'Z' < *ext)
 			return error(_("index uses %.4s extension, which we do not understand"),
@@ -1790,7 +1864,7 @@ static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool,
 		const unsigned char *cp = (const unsigned char *)name;
 		size_t strip_len, previous_len;
 
-		/* If we're at the begining of a block, ignore the previous name */
+		/* If we're at the beginning of a block, ignore the previous name */
 		strip_len = decode_varint(&cp);
 		if (previous_ce) {
 			previous_len = previous_ce->ce_namelen;
@@ -1823,7 +1897,7 @@ static struct cache_entry *create_from_disk(struct mem_pool *ce_mem_pool,
 	ce->ce_flags = flags & ~CE_NAMEMASK;
 	ce->ce_namelen = len;
 	ce->index = 0;
-	hashcpy(ce->oid.hash, ondisk->data);
+	oidread(&ce->oid, ondisk->data);
 	memcpy(ce->name, name, len);
 	ce->name[len] = '\0';
 
@@ -2004,11 +2078,12 @@ static unsigned long load_all_cache_entries(struct index_state *istate,
 {
 	unsigned long consumed;
 
+	istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool));
 	if (istate->version == 4) {
-		mem_pool_init(&istate->ce_mem_pool,
+		mem_pool_init(istate->ce_mem_pool,
 				estimate_cache_size_from_compressed(istate->cache_nr));
 	} else {
-		mem_pool_init(&istate->ce_mem_pool,
+		mem_pool_init(istate->ce_mem_pool,
 				estimate_cache_size(mmap_size, istate->cache_nr));
 	}
 
@@ -2068,12 +2143,13 @@ static unsigned long load_cache_entries_threaded(struct index_state *istate, con
 	if (istate->name_hash_initialized)
 		BUG("the name hash isn't thread safe");
 
-	mem_pool_init(&istate->ce_mem_pool, 0);
+	istate->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool));
+	mem_pool_init(istate->ce_mem_pool, 0);
 
 	/* ensure we have no more threads than we have blocks to process */
 	if (nr_threads > ieot->nr)
 		nr_threads = ieot->nr;
-	data = xcalloc(nr_threads, sizeof(*data));
+	CALLOC_ARRAY(data, nr_threads);
 
 	offset = ieot_start = 0;
 	ieot_blocks = DIV_ROUND_UP(ieot->nr, nr_threads);
@@ -2095,11 +2171,12 @@ static unsigned long load_cache_entries_threaded(struct index_state *istate, con
 		nr = 0;
 		for (j = p->ieot_start; j < p->ieot_start + p->ieot_blocks; j++)
 			nr += p->ieot->entries[j].nr;
+		p->ce_mem_pool = xmalloc(sizeof(*istate->ce_mem_pool));
 		if (istate->version == 4) {
-			mem_pool_init(&p->ce_mem_pool,
+			mem_pool_init(p->ce_mem_pool,
 				estimate_cache_size_from_compressed(nr));
 		} else {
-			mem_pool_init(&p->ce_mem_pool,
+			mem_pool_init(p->ce_mem_pool,
 				estimate_cache_size(mmap_size, nr));
 		}
 
@@ -2163,18 +2240,19 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
 
 	mmap = xmmap_gently(NULL, mmap_size, PROT_READ, MAP_PRIVATE, fd, 0);
 	if (mmap == MAP_FAILED)
-		die_errno(_("%s: unable to map index file"), path);
+		die_errno(_("%s: unable to map index file%s"), path,
+			mmap_os_err());
 	close(fd);
 
 	hdr = (const struct cache_header *)mmap;
 	if (verify_hdr(hdr, mmap_size) < 0)
 		goto unmap;
 
-	hashcpy(istate->oid.hash, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz);
+	oidread(&istate->oid, (const unsigned char *)hdr + mmap_size - the_hash_algo->rawsz);
 	istate->version = ntohl(hdr->hdr_version);
 	istate->cache_nr = ntohl(hdr->hdr_entries);
 	istate->cache_alloc = alloc_nr(istate->cache_nr);
-	istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
+	CALLOC_ARRAY(istate->cache, istate->cache_alloc);
 	istate->initialized = 1;
 
 	p.istate = istate;
@@ -2248,6 +2326,12 @@ int do_read_index(struct index_state *istate, const char *path, int must_exist)
 	trace2_data_intmax("index", the_repository, "read/cache_nr",
 			   istate->cache_nr);
 
+	if (!istate->repo)
+		istate->repo = the_repository;
+	prepare_repo_settings(istate->repo);
+	if (istate->repo->settings.command_requires_full_index)
+		ensure_full_index(istate);
+
 	return istate->cache_nr;
 
 unmap:
@@ -2301,7 +2385,7 @@ int read_index_from(struct index_state *istate, const char *path,
 	if (split_index->base)
 		discard_index(split_index->base);
 	else
-		split_index->base = xcalloc(1, sizeof(*split_index->base));
+		CALLOC_ARRAY(split_index->base, 1);
 
 	base_oid_hex = oid_to_hex(&split_index->base_oid);
 	base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_oid_hex);
@@ -2348,6 +2432,7 @@ int discard_index(struct index_state *istate)
 	cache_tree_free(&(istate->cache_tree));
 	istate->initialized = 0;
 	istate->fsmonitor_has_run_once = 0;
+	FREE_AND_NULL(istate->fsmonitor_last_update);
 	FREE_AND_NULL(istate->cache);
 	istate->cache_alloc = 0;
 	discard_split_index(istate);
@@ -2356,7 +2441,7 @@ int discard_index(struct index_state *istate)
 
 	if (istate->ce_mem_pool) {
 		mem_pool_discard(istate->ce_mem_pool, should_validate_cache_entries());
-		istate->ce_mem_pool = NULL;
+		FREE_AND_NULL(istate->ce_mem_pool);
 	}
 
 	return 0;
@@ -2421,6 +2506,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++) {
@@ -2431,6 +2517,8 @@ int repo_index_has_changes(struct repository *repo,
 		diff_flush(&opt);
 		return opt.flags.has_changes != 0;
 	} else {
+		/* TODO: audit for interaction with sparse-index. */
+		ensure_full_index(istate);
 		for (i = 0; sb && i < istate->cache_nr; i++) {
 			if (i)
 				strbuf_addch(sb, ' ');
@@ -2440,80 +2528,23 @@ int repo_index_has_changes(struct repository *repo,
 	}
 }
 
-#define WRITE_BUFFER_SIZE 8192
-static unsigned char write_buffer[WRITE_BUFFER_SIZE];
-static unsigned long write_buffer_len;
-
-static int ce_write_flush(git_hash_ctx *context, int fd)
+static int write_index_ext_header(struct hashfile *f,
+				  git_hash_ctx *eoie_f,
+				  unsigned int ext,
+				  unsigned int sz)
 {
-	unsigned int buffered = write_buffer_len;
-	if (buffered) {
-		the_hash_algo->update_fn(context, write_buffer, buffered);
-		if (write_in_full(fd, write_buffer, buffered) < 0)
-			return -1;
-		write_buffer_len = 0;
-	}
-	return 0;
-}
+	hashwrite_be32(f, ext);
+	hashwrite_be32(f, sz);
 
-static int ce_write(git_hash_ctx *context, int fd, void *data, unsigned int len)
-{
-	while (len) {
-		unsigned int buffered = write_buffer_len;
-		unsigned int partial = WRITE_BUFFER_SIZE - buffered;
-		if (partial > len)
-			partial = len;
-		memcpy(write_buffer + buffered, data, partial);
-		buffered += partial;
-		if (buffered == WRITE_BUFFER_SIZE) {
-			write_buffer_len = buffered;
-			if (ce_write_flush(context, fd))
-				return -1;
-			buffered = 0;
-		}
-		write_buffer_len = buffered;
-		len -= partial;
-		data = (char *) data + partial;
+	if (eoie_f) {
+		ext = htonl(ext);
+		sz = htonl(sz);
+		the_hash_algo->update_fn(eoie_f, &ext, sizeof(ext));
+		the_hash_algo->update_fn(eoie_f, &sz, sizeof(sz));
 	}
 	return 0;
 }
 
-static int write_index_ext_header(git_hash_ctx *context, git_hash_ctx *eoie_context,
-				  int fd, unsigned int ext, unsigned int sz)
-{
-	ext = htonl(ext);
-	sz = htonl(sz);
-	if (eoie_context) {
-		the_hash_algo->update_fn(eoie_context, &ext, 4);
-		the_hash_algo->update_fn(eoie_context, &sz, 4);
-	}
-	return ((ce_write(context, fd, &ext, 4) < 0) ||
-		(ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0;
-}
-
-static int ce_flush(git_hash_ctx *context, int fd, unsigned char *hash)
-{
-	unsigned int left = write_buffer_len;
-
-	if (left) {
-		write_buffer_len = 0;
-		the_hash_algo->update_fn(context, write_buffer, left);
-	}
-
-	/* Flush first if not enough space for hash signature */
-	if (left + the_hash_algo->rawsz > WRITE_BUFFER_SIZE) {
-		if (write_in_full(fd, write_buffer, left) < 0)
-			return -1;
-		left = 0;
-	}
-
-	/* Append the hash signature at the end */
-	the_hash_algo->final_fn(write_buffer + left, context);
-	hashcpy(hash, write_buffer + left);
-	left += the_hash_algo->rawsz;
-	return (write_in_full(fd, write_buffer, left) < 0) ? -1 : 0;
-}
-
 static void ce_smudge_racily_clean_entry(struct index_state *istate,
 					 struct cache_entry *ce)
 {
@@ -2592,11 +2623,10 @@ static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
 	}
 }
 
-static int ce_write_entry(git_hash_ctx *c, int fd, struct cache_entry *ce,
+static int ce_write_entry(struct hashfile *f, struct cache_entry *ce,
 			  struct strbuf *previous_name, struct ondisk_cache_entry *ondisk)
 {
 	int size;
-	int result;
 	unsigned int saved_namelen;
 	int stripped_name = 0;
 	static unsigned char padding[8] = { 0x00 };
@@ -2612,11 +2642,9 @@ static int ce_write_entry(git_hash_ctx *c, int fd, struct cache_entry *ce,
 	if (!previous_name) {
 		int len = ce_namelen(ce);
 		copy_cache_entry_to_ondisk(ondisk, ce);
-		result = ce_write(c, fd, ondisk, size);
-		if (!result)
-			result = ce_write(c, fd, ce->name, len);
-		if (!result)
-			result = ce_write(c, fd, padding, align_padding_size(size, len));
+		hashwrite(f, ondisk, size);
+		hashwrite(f, ce->name, len);
+		hashwrite(f, padding, align_padding_size(size, len));
 	} else {
 		int common, to_remove, prefix_size;
 		unsigned char to_remove_vi[16];
@@ -2630,13 +2658,10 @@ static int ce_write_entry(git_hash_ctx *c, int fd, struct cache_entry *ce,
 		prefix_size = encode_varint(to_remove, to_remove_vi);
 
 		copy_cache_entry_to_ondisk(ondisk, ce);
-		result = ce_write(c, fd, ondisk, size);
-		if (!result)
-			result = ce_write(c, fd, to_remove_vi, prefix_size);
-		if (!result)
-			result = ce_write(c, fd, ce->name + common, ce_namelen(ce) - common);
-		if (!result)
-			result = ce_write(c, fd, padding, 1);
+		hashwrite(f, ondisk, size);
+		hashwrite(f, to_remove_vi, prefix_size);
+		hashwrite(f, ce->name + common, ce_namelen(ce) - common);
+		hashwrite(f, padding, 1);
 
 		strbuf_splice(previous_name, common, to_remove,
 			      ce->name + common, ce_namelen(ce) - common);
@@ -2646,7 +2671,7 @@ static int ce_write_entry(git_hash_ctx *c, int fd, struct cache_entry *ce,
 		ce->ce_flags &= ~CE_STRIP_NAME;
 	}
 
-	return result;
+	return 0;
 }
 
 /*
@@ -2758,8 +2783,8 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 			  int strip_extensions)
 {
 	uint64_t start = getnanotime();
-	int newfd = tempfile->fd;
-	git_hash_ctx c, eoie_c;
+	struct hashfile *f;
+	git_hash_ctx *eoie_c = NULL;
 	struct cache_header hdr;
 	int i, err = 0, removed, extended, hdr_version;
 	struct cache_entry **cache = istate->cache;
@@ -2773,6 +2798,8 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 	struct index_entry_offset_table *ieot = NULL;
 	int nr, nr_threads;
 
+	f = hashfd(tempfile->fd, tempfile->filename.buf);
+
 	for (i = removed = extended = 0; i < entries; i++) {
 		if (cache[i]->ce_flags & CE_REMOVE)
 			removed++;
@@ -2801,9 +2828,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 	hdr.hdr_version = htonl(hdr_version);
 	hdr.hdr_entries = htonl(entries - removed);
 
-	the_hash_algo->init_fn(&c);
-	if (ce_write(&c, newfd, &hdr, sizeof(hdr)) < 0)
-		return -1;
+	hashwrite(f, &hdr, sizeof(hdr));
 
 	if (!HAVE_THREADS || git_config_get_index_threads(&nr_threads))
 		nr_threads = 1;
@@ -2838,12 +2863,8 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		}
 	}
 
-	offset = lseek(newfd, 0, SEEK_CUR);
-	if (offset < 0) {
-		free(ieot);
-		return -1;
-	}
-	offset += write_buffer_len;
+	offset = hashfile_total(f);
+
 	nr = 0;
 	previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
 
@@ -2878,14 +2899,10 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 			if (previous_name)
 				previous_name->buf[0] = 0;
 			nr = 0;
-			offset = lseek(newfd, 0, SEEK_CUR);
-			if (offset < 0) {
-				free(ieot);
-				return -1;
-			}
-			offset += write_buffer_len;
+
+			offset = hashfile_total(f);
 		}
-		if (ce_write_entry(&c, newfd, ce, previous_name, (struct ondisk_cache_entry *)&ondisk) < 0)
+		if (ce_write_entry(f, ce, previous_name, (struct ondisk_cache_entry *)&ondisk) < 0)
 			err = -1;
 
 		if (err)
@@ -2904,14 +2921,16 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		return err;
 	}
 
-	/* Write extension data here */
-	offset = lseek(newfd, 0, SEEK_CUR);
-	if (offset < 0) {
-		free(ieot);
-		return -1;
+	offset = hashfile_total(f);
+
+	/*
+	 * The extension headers must be hashed on their own for the
+	 * EOIE extension. Create a hashfile here to compute that hash.
+	 */
+	if (offset && record_eoie()) {
+		CALLOC_ARRAY(eoie_c, 1);
+		the_hash_algo->init_fn(eoie_c);
 	}
-	offset += write_buffer_len;
-	the_hash_algo->init_fn(&eoie_c);
 
 	/*
 	 * Lets write out CACHE_EXT_INDEXENTRYOFFSETTABLE first so that we
@@ -2924,8 +2943,8 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		struct strbuf sb = STRBUF_INIT;
 
 		write_ieot_extension(&sb, ieot);
-		err = write_index_ext_header(&c, &eoie_c, newfd, CACHE_EXT_INDEXENTRYOFFSETTABLE, sb.len) < 0
-			|| ce_write(&c, newfd, sb.buf, sb.len) < 0;
+		err = write_index_ext_header(f, eoie_c, CACHE_EXT_INDEXENTRYOFFSETTABLE, sb.len) < 0;
+		hashwrite(f, sb.buf, sb.len);
 		strbuf_release(&sb);
 		free(ieot);
 		if (err)
@@ -2937,9 +2956,9 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		struct strbuf sb = STRBUF_INIT;
 
 		err = write_link_extension(&sb, istate) < 0 ||
-			write_index_ext_header(&c, &eoie_c, newfd, CACHE_EXT_LINK,
-					       sb.len) < 0 ||
-			ce_write(&c, newfd, sb.buf, sb.len) < 0;
+			write_index_ext_header(f, eoie_c, CACHE_EXT_LINK,
+					       sb.len) < 0;
+		hashwrite(f, sb.buf, sb.len);
 		strbuf_release(&sb);
 		if (err)
 			return -1;
@@ -2948,8 +2967,8 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		struct strbuf sb = STRBUF_INIT;
 
 		cache_tree_write(&sb, istate->cache_tree);
-		err = write_index_ext_header(&c, &eoie_c, newfd, CACHE_EXT_TREE, sb.len) < 0
-			|| ce_write(&c, newfd, sb.buf, sb.len) < 0;
+		err = write_index_ext_header(f, eoie_c, CACHE_EXT_TREE, sb.len) < 0;
+		hashwrite(f, sb.buf, sb.len);
 		strbuf_release(&sb);
 		if (err)
 			return -1;
@@ -2958,9 +2977,9 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		struct strbuf sb = STRBUF_INIT;
 
 		resolve_undo_write(&sb, istate->resolve_undo);
-		err = write_index_ext_header(&c, &eoie_c, newfd, CACHE_EXT_RESOLVE_UNDO,
-					     sb.len) < 0
-			|| ce_write(&c, newfd, sb.buf, sb.len) < 0;
+		err = write_index_ext_header(f, eoie_c, CACHE_EXT_RESOLVE_UNDO,
+					     sb.len) < 0;
+		hashwrite(f, sb.buf, sb.len);
 		strbuf_release(&sb);
 		if (err)
 			return -1;
@@ -2969,9 +2988,9 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		struct strbuf sb = STRBUF_INIT;
 
 		write_untracked_extension(&sb, istate->untracked);
-		err = write_index_ext_header(&c, &eoie_c, newfd, CACHE_EXT_UNTRACKED,
-					     sb.len) < 0 ||
-			ce_write(&c, newfd, sb.buf, sb.len) < 0;
+		err = write_index_ext_header(f, eoie_c, CACHE_EXT_UNTRACKED,
+					     sb.len) < 0;
+		hashwrite(f, sb.buf, sb.len);
 		strbuf_release(&sb);
 		if (err)
 			return -1;
@@ -2980,12 +2999,16 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 		struct strbuf sb = STRBUF_INIT;
 
 		write_fsmonitor_extension(&sb, istate);
-		err = write_index_ext_header(&c, &eoie_c, newfd, CACHE_EXT_FSMONITOR, sb.len) < 0
-			|| ce_write(&c, newfd, sb.buf, sb.len) < 0;
+		err = write_index_ext_header(f, eoie_c, CACHE_EXT_FSMONITOR, sb.len) < 0;
+		hashwrite(f, sb.buf, sb.len);
 		strbuf_release(&sb);
 		if (err)
 			return -1;
 	}
+	if (istate->sparse_index) {
+		if (write_index_ext_header(f, eoie_c, CACHE_EXT_SPARSE_DIRECTORIES, 0) < 0)
+			return -1;
+	}
 
 	/*
 	 * CACHE_EXT_ENDOFINDEXENTRIES must be written as the last entry before the SHA1
@@ -2993,24 +3016,23 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
 	 * read.  Write it out regardless of the strip_extensions parameter as we need it
 	 * when loading the shared index.
 	 */
-	if (offset && record_eoie()) {
+	if (eoie_c) {
 		struct strbuf sb = STRBUF_INIT;
 
-		write_eoie_extension(&sb, &eoie_c, offset);
-		err = write_index_ext_header(&c, NULL, newfd, CACHE_EXT_ENDOFINDEXENTRIES, sb.len) < 0
-			|| ce_write(&c, newfd, sb.buf, sb.len) < 0;
+		write_eoie_extension(&sb, eoie_c, offset);
+		err = write_index_ext_header(f, NULL, CACHE_EXT_ENDOFINDEXENTRIES, sb.len) < 0;
+		hashwrite(f, sb.buf, sb.len);
 		strbuf_release(&sb);
 		if (err)
 			return -1;
 	}
 
-	if (ce_flush(&c, newfd, istate->oid.hash))
-		return -1;
+	finalize_hashfile(f, istate->oid.hash, CSUM_HASH_IN_STREAM);
 	if (close_tempfile_gently(tempfile)) {
-		error(_("could not close '%s'"), tempfile->filename.buf);
+		error(_("could not close '%s'"), get_tempfile_path(tempfile));
 		return -1;
 	}
-	if (stat(tempfile->filename.buf, &st))
+	if (stat(get_tempfile_path(tempfile), &st))
 		return -1;
 	istate->timestamp.sec = (unsigned int)st.st_mtime;
 	istate->timestamp.nsec = ST_MTIME_NSEC(st);
@@ -3045,16 +3067,27 @@ static int do_write_locked_index(struct index_state *istate, struct lock_file *l
 				 unsigned flags)
 {
 	int ret;
+	int was_full = !istate->sparse_index;
+
+	ret = convert_to_sparse(istate);
+
+	if (ret) {
+		warning(_("failed to convert to a sparse-index"));
+		return ret;
+	}
 
 	/*
 	 * TODO trace2: replace "the_repository" with the actual repo instance
 	 * that is associated with the given "istate".
 	 */
 	trace2_region_enter_printf("index", "do_write_index", the_repository,
-				   "%s", lock->tempfile->filename.buf);
+				   "%s", get_lock_file_path(lock));
 	ret = do_write_index(istate, lock->tempfile, 0);
 	trace2_region_leave_printf("index", "do_write_index", the_repository,
-				   "%s", lock->tempfile->filename.buf);
+				   "%s", get_lock_file_path(lock));
+
+	if (was_full)
+		ensure_full_index(istate);
 
 	if (ret)
 		return ret;
@@ -3146,15 +3179,19 @@ static int write_shared_index(struct index_state *istate,
 			      struct tempfile **temp)
 {
 	struct split_index *si = istate->split_index;
-	int ret;
+	int ret, was_full = !istate->sparse_index;
 
 	move_cache_to_base_index(istate);
+	convert_to_sparse(istate);
 
 	trace2_region_enter_printf("index", "shared/do_write_index",
-				   the_repository, "%s", (*temp)->filename.buf);
+				   the_repository, "%s", get_tempfile_path(*temp));
 	ret = do_write_index(si->base, *temp, 1);
 	trace2_region_leave_printf("index", "shared/do_write_index",
-				   the_repository, "%s", (*temp)->filename.buf);
+				   the_repository, "%s", get_tempfile_path(*temp));
+
+	if (was_full)
+		ensure_full_index(istate);
 
 	if (ret)
 		return ret;
@@ -3324,8 +3361,8 @@ int repo_read_index_unmerged(struct repository *repo)
  * We helpfully remove a trailing "/" from directories so that
  * the output of read_directory can be used as-is.
  */
-int index_name_is_other(const struct index_state *istate, const char *name,
-		int namelen)
+int index_name_is_other(struct index_state *istate, const char *name,
+			int namelen)
 {
 	int pos;
 	if (namelen && name[namelen - 1] == '/')
@@ -3343,7 +3380,7 @@ int index_name_is_other(const struct index_state *istate, const char *name,
 	return 1;
 }
 
-void *read_blob_data_from_index(const struct index_state *istate,
+void *read_blob_data_from_index(struct index_state *istate,
 				const char *path, unsigned long *size)
 {
 	int pos, len;
@@ -3402,7 +3439,7 @@ void stat_validity_update(struct stat_validity *sv, int fd)
 		stat_validity_clear(sv);
 	else {
 		if (!sv->sd)
-			sv->sd = xcalloc(1, sizeof(struct stat_data));
+			CALLOC_ARRAY(sv->sd, 1);
 		fill_stat_data(sv->sd, &st);
 	}
 }
@@ -3628,3 +3665,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 aa18ae82b7..b6cbd16a17 100644
--- a/rebase-interactive.c
+++ b/rebase-interactive.c
@@ -5,6 +5,13 @@
 #include "strbuf.h"
 #include "commit-slab.h"
 #include "config.h"
+#include "dir.h"
+
+static const char edit_todo_list_advice[] =
+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");
 
 enum missing_commit_check_level {
 	MISSING_COMMIT_CHECK_IGNORE = 0,
@@ -28,7 +35,7 @@ static enum missing_commit_check_level get_missing_commit_check_level(void)
 	return MISSING_COMMIT_CHECK_IGNORE;
 }
 
-void append_todo_help(unsigned keep_empty, int command_count,
+void append_todo_help(int command_count,
 		      const char *shortrevisions, const char *shortonto,
 		      struct strbuf *buf)
 {
@@ -37,7 +44,10 @@ void append_todo_help(unsigned keep_empty, int command_count,
 "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"
@@ -46,7 +56,7 @@ void append_todo_help(unsigned keep_empty, int command_count,
 "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");
 	unsigned edit_todo = !(shortrevisions && shortonto);
@@ -80,33 +90,33 @@ void append_todo_help(unsigned keep_empty, int command_count,
 			"the rebase will be aborted.\n\n");
 
 	strbuf_add_commented_lines(buf, msg, strlen(msg));
-
-	if (!keep_empty) {
-		msg = _("Note that empty commits are commented out");
-		strbuf_add_commented_lines(buf, msg, strlen(msg));
-	}
 }
 
 int edit_todo_list(struct repository *r, struct todo_list *todo_list,
 		   struct todo_list *new_todo, const char *shortrevisions,
 		   const char *shortonto, unsigned flags)
 {
-	const char *todo_file = rebase_path_todo();
+	const char *todo_file = rebase_path_todo(),
+		*todo_backup = rebase_path_todo_backup();
 	unsigned initial = shortrevisions && shortonto;
+	int incorrect = 0;
 
 	/* If the user is editing the todo list, we first try to parse
 	 * it.  If there is an error, we do not return, because the user
 	 * might want to fix it in the first place. */
 	if (!initial)
-		todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list);
+		incorrect = todo_list_parse_insn_buffer(r, todo_list->buf.buf, todo_list) |
+			file_exists(rebase_path_dropped());
 
 	if (todo_list_write_to_file(r, todo_list, todo_file, shortrevisions, shortonto,
 				    -1, flags | TODO_LIST_SHORTEN_IDS | TODO_LIST_APPEND_TODO_HELP))
 		return error_errno(_("could not write '%s'"), todo_file);
 
-	if (initial && copy_file(rebase_path_todo_backup(), todo_file, 0666))
-		return error(_("could not copy '%s' to '%s'."), todo_file,
-			     rebase_path_todo_backup());
+	if (!incorrect &&
+	    todo_list_write_to_file(r, todo_list, todo_backup,
+				    shortrevisions, shortonto, -1,
+				    (flags | TODO_LIST_APPEND_TODO_HELP) & ~TODO_LIST_SHORTEN_IDS) < 0)
+		return error(_("could not write '%s'."), rebase_path_todo_backup());
 
 	if (launch_sequence_editor(todo_file, &new_todo->buf, NULL))
 		return -2;
@@ -115,10 +125,23 @@ int edit_todo_list(struct repository *r, struct todo_list *todo_list,
 	if (initial && new_todo->buf.len == 0)
 		return -3;
 
-	/* For the initial edit, the todo list gets parsed in
-	 * complete_action(). */
-	if (!initial)
-		return todo_list_parse_insn_buffer(r, new_todo->buf.buf, new_todo);
+	if (todo_list_parse_insn_buffer(r, new_todo->buf.buf, new_todo)) {
+		fprintf(stderr, _(edit_todo_list_advice));
+		return -4;
+	}
+
+	if (incorrect) {
+		if (todo_list_check_against_backup(r, new_todo)) {
+			write_file(rebase_path_dropped(), "%s", "");
+			return -4;
+		}
+
+		if (incorrect > 0)
+			unlink(rebase_path_dropped());
+	} else if (todo_list_check(todo_list, new_todo)) {
+		write_file(rebase_path_dropped(), "%s", "");
+		return -4;
+	}
 
 	return 0;
 }
@@ -183,7 +206,52 @@ int todo_list_check(struct todo_list *old_todo, struct todo_list *new_todo)
 		"the level of warnings.\n"
 		"The possible behaviours are: ignore, warn, error.\n\n"));
 
+	fprintf(stderr, _(edit_todo_list_advice));
+
 leave_check:
 	clear_commit_seen(&commit_seen);
 	return res;
 }
+
+int todo_list_check_against_backup(struct repository *r, struct todo_list *todo_list)
+{
+	struct todo_list backup = TODO_LIST_INIT;
+	int res = 0;
+
+	if (strbuf_read_file(&backup.buf, rebase_path_todo_backup(), 0) > 0) {
+		todo_list_parse_insn_buffer(r, backup.buf.buf, &backup);
+		res = todo_list_check(&backup, todo_list);
+	}
+
+	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 44dbb06311..dc2cf0ee12 100644
--- a/rebase-interactive.h
+++ b/rebase-interactive.h
@@ -5,12 +5,17 @@ struct strbuf;
 struct repository;
 struct todo_list;
 
-void append_todo_help(unsigned keep_empty, int command_count,
+void append_todo_help(int command_count,
 		      const char *shortrevisions, const char *shortonto,
 		      struct strbuf *buf);
 int edit_todo_list(struct repository *r, struct todo_list *todo_list,
 		   struct todo_list *new_todo, const char *shortrevisions,
 		   const char *shortonto, unsigned flags);
+
 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
new file mode 100644
index 0000000000..f8137d859b
--- /dev/null
+++ b/rebase.c
@@ -0,0 +1,35 @@
+#include "rebase.h"
+#include "config.h"
+
+/*
+ * Parses textual value for pull.rebase, branch.<name>.rebase, etc.
+ * Unrecognised value yields REBASE_INVALID, which traditionally is
+ * treated the same way as REBASE_FALSE.
+ *
+ * The callers that care if (any) rebase is requested should say
+ *   if (REBASE_TRUE <= rebase_parse_value(string))
+ *
+ * The callers that want to differenciate an unrecognised value and
+ * false can do so by treating _INVALID and _FALSE differently.
+ */
+enum rebase_type rebase_parse_value(const char *value)
+{
+	int v = git_parse_maybe_bool(value);
+
+	if (!v)
+		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;
+	/*
+	 * Please update _git_config() in git-completion.bash when you
+	 * add new rebase modes.
+	 */
+
+	return REBASE_INVALID;
+}
diff --git a/rebase.h b/rebase.h
new file mode 100644
index 0000000000..cc723d4748
--- /dev/null
+++ b/rebase.h
@@ -0,0 +1,15 @@
+#ifndef REBASE_H
+#define REBASE_H
+
+enum rebase_type {
+	REBASE_INVALID = -1,
+	REBASE_FALSE = 0,
+	REBASE_TRUE,
+	REBASE_PRESERVE,
+	REBASE_MERGES,
+	REBASE_INTERACTIVE
+};
+
+enum rebase_type rebase_parse_value(const char *value);
+
+#endif /* REBASE */
diff --git a/ref-filter.c b/ref-filter.c
index 6867e33648..93ce2a6ef2 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -22,7 +22,7 @@
 #include "commit-reach.h"
 #include "worktree.h"
 #include "hashmap.h"
-#include "argv-array.h"
+#include "strvec.h"
 
 static struct ref_msg {
 	const char *gone;
@@ -67,6 +67,12 @@ struct refname_atom {
 	int lstrip, rstrip;
 };
 
+static struct ref_trailer_buf {
+	struct string_list filter_list;
+	struct strbuf sepbuf;
+	struct strbuf kvsepbuf;
+} ref_trailer_buf = {STRING_LIST_INIT_NODUP, STRBUF_INIT, STRBUF_INIT};
+
 static struct expand_data {
 	struct object_id oid;
 	enum object_type type;
@@ -103,6 +109,58 @@ static struct ref_to_worktree_map {
 } ref_to_worktree_map;
 
 /*
+ * The enum atom_type is used as the index of valid_atom array.
+ * In the atom parsing stage, it will be passed to used_atom.atom_type
+ * as the identifier of the atom type. We can check the type of used_atom
+ * entry by `if (used_atom[i].atom_type == ATOM_*)`.
+ */
+enum atom_type {
+	ATOM_REFNAME,
+	ATOM_OBJECTTYPE,
+	ATOM_OBJECTSIZE,
+	ATOM_OBJECTNAME,
+	ATOM_DELTABASE,
+	ATOM_TREE,
+	ATOM_PARENT,
+	ATOM_NUMPARENT,
+	ATOM_OBJECT,
+	ATOM_TYPE,
+	ATOM_TAG,
+	ATOM_AUTHOR,
+	ATOM_AUTHORNAME,
+	ATOM_AUTHOREMAIL,
+	ATOM_AUTHORDATE,
+	ATOM_COMMITTER,
+	ATOM_COMMITTERNAME,
+	ATOM_COMMITTEREMAIL,
+	ATOM_COMMITTERDATE,
+	ATOM_TAGGER,
+	ATOM_TAGGERNAME,
+	ATOM_TAGGEREMAIL,
+	ATOM_TAGGERDATE,
+	ATOM_CREATOR,
+	ATOM_CREATORDATE,
+	ATOM_SUBJECT,
+	ATOM_BODY,
+	ATOM_TRAILERS,
+	ATOM_CONTENTS,
+	ATOM_RAW,
+	ATOM_UPSTREAM,
+	ATOM_PUSH,
+	ATOM_SYMREF,
+	ATOM_FLAG,
+	ATOM_HEAD,
+	ATOM_COLOR,
+	ATOM_WORKTREEPATH,
+	ATOM_ALIGN,
+	ATOM_END,
+	ATOM_IF,
+	ATOM_THEN,
+	ATOM_ELSE,
+	ATOM_REST,
+};
+
+/*
  * An atom is a valid field atom listed below, possibly prefixed with
  * a "*" to denote deref_tag().
  *
@@ -113,6 +171,7 @@ static struct ref_to_worktree_map {
  * array.
  */
 static struct used_atom {
+	enum atom_type atom_type;
 	const char *name;
 	cmp_type type;
 	info_source source;
@@ -127,18 +186,28 @@ static struct used_atom {
 			unsigned int nobracket : 1, push : 1, push_remote : 1;
 		} remote_ref;
 		struct {
-			enum { C_BARE, C_BODY, C_BODY_DEP, C_LINES, C_SIG, C_SUB, C_TRAILERS } option;
+			enum { C_BARE, C_BODY, C_BODY_DEP, C_LENGTH, C_LINES,
+			       C_SIG, C_SUB, C_SUB_SANITIZE, C_TRAILERS } option;
 			struct process_trailer_options trailer_opts;
 			unsigned int nlines;
 		} contents;
 		struct {
+			enum { RAW_BARE, RAW_LENGTH } option;
+		} raw_data;
+		struct {
 			cmp_status cmp_status;
 			const char *str;
 		} if_then_else;
 		struct {
 			enum { O_FULL, O_LENGTH, O_SHORT } option;
 			unsigned int length;
-		} objectname;
+		} oid;
+		struct {
+			enum { O_SIZE, O_SIZE_DISK } option;
+		} objectsize;
+		struct email_option {
+			enum { EO_RAW, EO_TRIM, EO_LOCALPART } option;
+		} email_option;
 		struct refname_atom refname;
 		char *head;
 	} u;
@@ -149,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;
@@ -158,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)
@@ -196,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;
@@ -243,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)
@@ -255,15 +325,17 @@ 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) {
+		atom->u.objectsize.option = O_SIZE;
 		if (*atom->name == '*')
 			oi_deref.info.sizep = &oi_deref.size;
 		else
 			oi.info.sizep = &oi.size;
 	} else if (!strcmp(arg, "disk")) {
+		atom->u.objectsize.option = O_SIZE_DISK;
 		if (*atom->name == '*')
 			oi_deref.info.disk_sizep = &oi_deref.disk_size;
 		else
@@ -273,19 +345,19 @@ static int objectsize_atom_parser(const struct ref_format *format, struct used_a
 	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)
 		return strbuf_addf_ret(err, -1, _("%%(deltabase) does not take arguments"));
 	if (*atom->name == '*')
-		oi_deref.info.delta_base_sha1 = oi_deref.delta_base_oid.hash;
+		oi_deref.info.delta_base_oid = &oi_deref.delta_base_oid;
 	else
-		oi.info.delta_base_sha1 = oi.delta_base_oid.hash;
+		oi.info.delta_base_oid = &oi.delta_base_oid;
 	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)
@@ -294,57 +366,62 @@ 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)
-		return strbuf_addf_ret(err, -1, _("%%(subject) does not take arguments"));
-	atom->u.contents.option = C_SUB;
+	if (!arg)
+		atom->u.contents.option = C_SUB;
+	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 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)
 {
-	struct string_list params = STRING_LIST_INIT_DUP;
-	int i;
-
 	atom->u.contents.trailer_opts.no_divider = 1;
 
 	if (arg) {
-		string_list_split(&params, arg, ',', -1);
-		for (i = 0; i < params.nr; i++) {
-			const char *s = params.items[i].string;
-			if (!strcmp(s, "unfold"))
-				atom->u.contents.trailer_opts.unfold = 1;
-			else if (!strcmp(s, "only"))
-				atom->u.contents.trailer_opts.only_trailers = 1;
-			else {
-				strbuf_addf(err, _("unknown %%(trailers) argument: %s"), s);
-				string_list_clear(&params, 0);
-				return -1;
-			}
+		const char *argbuf = xstrfmt("%s)", arg);
+		char *invalid_arg = NULL;
+
+		if (format_set_trailers_options(&atom->u.contents.trailer_opts,
+		    &ref_trailer_buf.filter_list,
+		    &ref_trailer_buf.sepbuf,
+		    &ref_trailer_buf.kvsepbuf,
+		    &argbuf, &invalid_arg)) {
+			if (!invalid_arg)
+				strbuf_addf(err, _("expected %%(trailers:key=<value>)"));
+			else
+				strbuf_addf(err, _("unknown %%(trailers) argument: %s"), invalid_arg);
+			free((char *)invalid_arg);
+			return -1;
 		}
 	}
 	atom->u.contents.option = C_TRAILERS;
-	string_list_clear(&params, 0);
 	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)
 		atom->u.contents.option = C_BARE;
 	else if (!strcmp(arg, "body"))
 		atom->u.contents.option = C_BODY;
+	else if (!strcmp(arg, "size"))
+		atom->u.contents.option = C_LENGTH;
 	else if (!strcmp(arg, "signature"))
 		atom->u.contents.option = C_SIG;
 	else if (!strcmp(arg, "subject"))
 		atom->u.contents.option = C_SUB;
-	else if (skip_prefix(arg, "trailers", &arg)) {
-		skip_prefix(arg, ":", &arg);
-		if (trailers_atom_parser(format, atom, *arg ? arg : NULL, err))
+	else if (!strcmp(arg, "trailers")) {
+		if (trailers_atom_parser(format, atom, NULL, err))
+			return -1;
+	} else if (skip_prefix(arg, "trailers:", &arg)) {
+		if (trailers_atom_parser(format, atom, arg, err))
 			return -1;
 	} else if (skip_prefix(arg, "lines=", &arg)) {
 		atom->u.contents.option = C_LINES;
@@ -355,26 +432,52 @@ static int contents_atom_parser(const struct ref_format *format, struct used_ato
 	return 0;
 }
 
-static int objectname_atom_parser(const struct ref_format *format, struct used_atom *atom,
-				  const char *arg, struct strbuf *err)
+static int raw_atom_parser(struct ref_format *format, struct used_atom *atom,
+				const char *arg, struct strbuf *err)
 {
 	if (!arg)
-		atom->u.objectname.option = O_FULL;
+		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 %%(raw) argument: %s"), arg);
+	return 0;
+}
+
+static int oid_atom_parser(struct ref_format *format, struct used_atom *atom,
+			   const char *arg, struct strbuf *err)
+{
+	if (!arg)
+		atom->u.oid.option = O_FULL;
 	else if (!strcmp(arg, "short"))
-		atom->u.objectname.option = O_SHORT;
+		atom->u.oid.option = O_SHORT;
 	else if (skip_prefix(arg, "short=", &arg)) {
-		atom->u.objectname.option = O_LENGTH;
-		if (strtoul_ui(arg, 10, &atom->u.objectname.length) ||
-		    atom->u.objectname.length == 0)
-			return strbuf_addf_ret(err, -1, _("positive value expected objectname:short=%s"), arg);
-		if (atom->u.objectname.length < MINIMUM_ABBREV)
-			atom->u.objectname.length = MINIMUM_ABBREV;
+		atom->u.oid.option = O_LENGTH;
+		if (strtoul_ui(arg, 10, &atom->u.oid.length) ||
+		    atom->u.oid.length == 0)
+			return strbuf_addf_ret(err, -1, _("positive value expected '%s' in %%(%s)"), arg, atom->name);
+		if (atom->u.oid.length < MINIMUM_ABBREV)
+			atom->u.oid.length = MINIMUM_ABBREV;
 	} else
-		return strbuf_addf_ret(err, -1, _("unrecognized %%(objectname) argument: %s"), arg);
+		return strbuf_addf_ret(err, -1, _("unrecognized argument '%s' in %%(%s)"), arg, atom->name);
 	return 0;
 }
 
-static int refname_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)
+		atom->u.email_option.option = EO_RAW;
+	else if (!strcmp(arg, "trim"))
+		atom->u.email_option.option = EO_TRIM;
+	else if (!strcmp(arg, "localpart"))
+		atom->u.email_option.option = EO_LOCALPART;
+	else
+		return strbuf_addf_ret(err, -1, _("unrecognized email option: %s"), arg);
+	return 0;
+}
+
+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);
@@ -391,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;
@@ -443,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) {
@@ -458,7 +561,16 @@ static int if_atom_parser(const struct ref_format *format, struct used_atom *ato
 	return 0;
 }
 
-static int head_atom_parser(const struct ref_format *format, struct used_atom *atom,
+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(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);
@@ -469,50 +581,52 @@ 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[] = {
-	{ "refname", SOURCE_NONE, FIELD_STR, refname_atom_parser },
-	{ "objecttype", SOURCE_OTHER, FIELD_STR, objecttype_atom_parser },
-	{ "objectsize", SOURCE_OTHER, FIELD_ULONG, objectsize_atom_parser },
-	{ "objectname", SOURCE_OTHER, FIELD_STR, objectname_atom_parser },
-	{ "deltabase", SOURCE_OTHER, FIELD_STR, deltabase_atom_parser },
-	{ "tree", SOURCE_OBJ },
-	{ "parent", SOURCE_OBJ },
-	{ "numparent", SOURCE_OBJ, FIELD_ULONG },
-	{ "object", SOURCE_OBJ },
-	{ "type", SOURCE_OBJ },
-	{ "tag", SOURCE_OBJ },
-	{ "author", SOURCE_OBJ },
-	{ "authorname", SOURCE_OBJ },
-	{ "authoremail", SOURCE_OBJ },
-	{ "authordate", SOURCE_OBJ, FIELD_TIME },
-	{ "committer", SOURCE_OBJ },
-	{ "committername", SOURCE_OBJ },
-	{ "committeremail", SOURCE_OBJ },
-	{ "committerdate", SOURCE_OBJ, FIELD_TIME },
-	{ "tagger", SOURCE_OBJ },
-	{ "taggername", SOURCE_OBJ },
-	{ "taggeremail", SOURCE_OBJ },
-	{ "taggerdate", SOURCE_OBJ, FIELD_TIME },
-	{ "creator", SOURCE_OBJ },
-	{ "creatordate", SOURCE_OBJ, FIELD_TIME },
-	{ "subject", SOURCE_OBJ, FIELD_STR, subject_atom_parser },
-	{ "body", SOURCE_OBJ, FIELD_STR, body_atom_parser },
-	{ "trailers", SOURCE_OBJ, FIELD_STR, trailers_atom_parser },
-	{ "contents", SOURCE_OBJ, FIELD_STR, contents_atom_parser },
-	{ "upstream", SOURCE_NONE, FIELD_STR, remote_ref_atom_parser },
-	{ "push", SOURCE_NONE, FIELD_STR, remote_ref_atom_parser },
-	{ "symref", SOURCE_NONE, FIELD_STR, refname_atom_parser },
-	{ "flag", SOURCE_NONE },
-	{ "HEAD", SOURCE_NONE, FIELD_STR, head_atom_parser },
-	{ "color", SOURCE_NONE, FIELD_STR, color_atom_parser },
-	{ "worktreepath", SOURCE_NONE },
-	{ "align", SOURCE_NONE, FIELD_STR, align_atom_parser },
-	{ "end", SOURCE_NONE },
-	{ "if", SOURCE_NONE, FIELD_STR, if_atom_parser },
-	{ "then", SOURCE_NONE },
-	{ "else", SOURCE_NONE },
+	[ATOM_REFNAME] = { "refname", SOURCE_NONE, FIELD_STR, refname_atom_parser },
+	[ATOM_OBJECTTYPE] = { "objecttype", SOURCE_OTHER, FIELD_STR, objecttype_atom_parser },
+	[ATOM_OBJECTSIZE] = { "objectsize", SOURCE_OTHER, FIELD_ULONG, objectsize_atom_parser },
+	[ATOM_OBJECTNAME] = { "objectname", SOURCE_OTHER, FIELD_STR, oid_atom_parser },
+	[ATOM_DELTABASE] = { "deltabase", SOURCE_OTHER, FIELD_STR, deltabase_atom_parser },
+	[ATOM_TREE] = { "tree", SOURCE_OBJ, FIELD_STR, oid_atom_parser },
+	[ATOM_PARENT] = { "parent", SOURCE_OBJ, FIELD_STR, oid_atom_parser },
+	[ATOM_NUMPARENT] = { "numparent", SOURCE_OBJ, FIELD_ULONG },
+	[ATOM_OBJECT] = { "object", SOURCE_OBJ },
+	[ATOM_TYPE] = { "type", SOURCE_OBJ },
+	[ATOM_TAG] = { "tag", SOURCE_OBJ },
+	[ATOM_AUTHOR] = { "author", SOURCE_OBJ },
+	[ATOM_AUTHORNAME] = { "authorname", SOURCE_OBJ },
+	[ATOM_AUTHOREMAIL] = { "authoremail", SOURCE_OBJ, FIELD_STR, person_email_atom_parser },
+	[ATOM_AUTHORDATE] = { "authordate", SOURCE_OBJ, FIELD_TIME },
+	[ATOM_COMMITTER] = { "committer", SOURCE_OBJ },
+	[ATOM_COMMITTERNAME] = { "committername", SOURCE_OBJ },
+	[ATOM_COMMITTEREMAIL] = { "committeremail", SOURCE_OBJ, FIELD_STR, person_email_atom_parser },
+	[ATOM_COMMITTERDATE] = { "committerdate", SOURCE_OBJ, FIELD_TIME },
+	[ATOM_TAGGER] = { "tagger", SOURCE_OBJ },
+	[ATOM_TAGGERNAME] = { "taggername", SOURCE_OBJ },
+	[ATOM_TAGGEREMAIL] = { "taggeremail", SOURCE_OBJ, FIELD_STR, person_email_atom_parser },
+	[ATOM_TAGGERDATE] = { "taggerdate", SOURCE_OBJ, FIELD_TIME },
+	[ATOM_CREATOR] = { "creator", SOURCE_OBJ },
+	[ATOM_CREATORDATE] = { "creatordate", SOURCE_OBJ, FIELD_TIME },
+	[ATOM_SUBJECT] = { "subject", SOURCE_OBJ, FIELD_STR, subject_atom_parser },
+	[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 },
+	[ATOM_FLAG] = { "flag", SOURCE_NONE },
+	[ATOM_HEAD] = { "HEAD", SOURCE_NONE, FIELD_STR, head_atom_parser },
+	[ATOM_COLOR] = { "color", SOURCE_NONE, FIELD_STR, color_atom_parser },
+	[ATOM_WORKTREEPATH] = { "worktreepath", SOURCE_NONE },
+	[ATOM_ALIGN] = { "align", SOURCE_NONE, FIELD_STR, align_atom_parser },
+	[ATOM_END] = { "end", SOURCE_NONE },
+	[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
@@ -535,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)
 {
@@ -559,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
@@ -575,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);
@@ -594,6 +715,7 @@ static int parse_ref_filter_atom(const struct ref_format *format,
 	at = used_atom_cnt;
 	used_atom_cnt++;
 	REALLOC_ARRAY(used_atom, used_atom_cnt);
+	used_atom[at].atom_type = i;
 	used_atom[at].name = xmemdupz(atom, ep - atom);
 	used_atom[at].type = valid_atom[i].cmp_type;
 	used_atom[at].source = valid_atom[i].source;
@@ -618,22 +740,28 @@ static int parse_ref_filter_atom(const struct ref_format *format,
 		return -1;
 	if (*atom == '*')
 		need_tagged = 1;
-	if (!strcmp(valid_atom[i].name, "symref"))
+	if (i == ATOM_SYMREF)
 		need_symref = 1;
 	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);
@@ -654,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;
 }
 
@@ -743,7 +873,8 @@ static int if_atom_handler(struct atom_value *atomv, struct ref_formatting_state
 			   struct strbuf *unused_err)
 {
 	struct ref_formatting_stack *new_stack;
-	struct if_then_else *if_then_else = xcalloc(sizeof(struct if_then_else), 1);
+	struct if_then_else *if_then_else = xcalloc(1,
+						    sizeof(struct if_then_else));
 
 	if_then_else->str = atomv->atom->u.if_then_else.str;
 	if_then_else->cmp_status = atomv->atom->u.if_then_else.cmp_status;
@@ -755,21 +886,23 @@ 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;
@@ -780,18 +913,22 @@ static int then_atom_handler(struct atom_value *atomv, struct ref_formatting_sta
 	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;
@@ -837,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);
@@ -867,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.
@@ -887,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))
@@ -898,21 +1050,27 @@ int verify_ref_format(struct ref_format *format)
 	return 0;
 }
 
-static int grab_objectname(const char *name, const struct object_id *oid,
-			   struct atom_value *v, struct used_atom *atom)
+static const char *do_grab_oid(const char *field, const struct object_id *oid,
+			       struct used_atom *atom)
 {
-	if (starts_with(name, "objectname")) {
-		if (atom->u.objectname.option == O_SHORT) {
-			v->s = xstrdup(find_unique_abbrev(oid, DEFAULT_ABBREV));
-			return 1;
-		} else if (atom->u.objectname.option == O_FULL) {
-			v->s = xstrdup(oid_to_hex(oid));
-			return 1;
-		} else if (atom->u.objectname.option == O_LENGTH) {
-			v->s = xstrdup(find_unique_abbrev(oid, atom->u.objectname.length));
-			return 1;
-		} else
-			BUG("unknown %%(objectname) option");
+	switch (atom->u.oid.option) {
+	case O_FULL:
+		return oid_to_hex(oid);
+	case O_LENGTH:
+		return find_unique_abbrev(oid, atom->u.oid.length);
+	case O_SHORT:
+		return find_unique_abbrev(oid, DEFAULT_ABBREV);
+	default:
+		BUG("unknown %%(%s) option", field);
+	}
+}
+
+static int grab_oid(const char *name, const char *field, const struct object_id *oid,
+		    struct atom_value *v, struct used_atom *atom)
+{
+	if (starts_with(name, field)) {
+		v->s = xstrdup(do_grab_oid(field, oid, atom));
+		return 1;
 	}
 	return 0;
 }
@@ -924,23 +1082,26 @@ static void grab_common_values(struct atom_value *val, int deref, struct expand_
 
 	for (i = 0; i < used_atom_cnt; i++) {
 		const char *name = used_atom[i].name;
+		enum atom_type atom_type = used_atom[i].atom_type;
 		struct atom_value *v = &val[i];
 		if (!!deref != (*name == '*'))
 			continue;
 		if (deref)
 			name++;
-		if (!strcmp(name, "objecttype"))
+		if (atom_type == ATOM_OBJECTTYPE)
 			v->s = xstrdup(type_name(oi->type));
-		else if (!strcmp(name, "objectsize:disk")) {
-			v->value = oi->disk_size;
-			v->s = xstrfmt("%"PRIuMAX, (uintmax_t)oi->disk_size);
-		} else if (!strcmp(name, "objectsize")) {
-			v->value = oi->size;
-			v->s = xstrfmt("%"PRIuMAX , (uintmax_t)oi->size);
-		} else if (!strcmp(name, "deltabase"))
+		else if (atom_type == ATOM_OBJECTSIZE) {
+			if (used_atom[i].u.objectsize.option == O_SIZE_DISK) {
+				v->value = oi->disk_size;
+				v->s = xstrfmt("%"PRIuMAX, (uintmax_t)oi->disk_size);
+			} else if (used_atom[i].u.objectsize.option == O_SIZE) {
+				v->value = oi->size;
+				v->s = xstrfmt("%"PRIuMAX , (uintmax_t)oi->size);
+			}
+		} else if (atom_type == ATOM_DELTABASE)
 			v->s = xstrdup(oid_to_hex(&oi->delta_base_oid));
-		else if (deref)
-			grab_objectname(name, &oi->oid, v, &used_atom[i]);
+		else if (atom_type == ATOM_OBJECTNAME && deref)
+			grab_oid(name, "objectname", &oi->oid, v, &used_atom[i]);
 	}
 }
 
@@ -952,16 +1113,17 @@ static void grab_tag_values(struct atom_value *val, int deref, struct object *ob
 
 	for (i = 0; i < used_atom_cnt; i++) {
 		const char *name = used_atom[i].name;
+		enum atom_type atom_type = used_atom[i].atom_type;
 		struct atom_value *v = &val[i];
 		if (!!deref != (*name == '*'))
 			continue;
 		if (deref)
 			name++;
-		if (!strcmp(name, "tag"))
+		if (atom_type == ATOM_TAG)
 			v->s = xstrdup(tag->tag);
-		else if (!strcmp(name, "type") && tag->tagged)
+		else if (atom_type == ATOM_TYPE && tag->tagged)
 			v->s = xstrdup(type_name(tag->tagged->type));
-		else if (!strcmp(name, "object") && tag->tagged)
+		else if (atom_type == ATOM_OBJECT && tag->tagged)
 			v->s = xstrdup(oid_to_hex(&tag->tagged->oid));
 	}
 }
@@ -974,26 +1136,27 @@ static void grab_commit_values(struct atom_value *val, int deref, struct object
 
 	for (i = 0; i < used_atom_cnt; i++) {
 		const char *name = used_atom[i].name;
+		enum atom_type atom_type = used_atom[i].atom_type;
 		struct atom_value *v = &val[i];
 		if (!!deref != (*name == '*'))
 			continue;
 		if (deref)
 			name++;
-		if (!strcmp(name, "tree")) {
-			v->s = xstrdup(oid_to_hex(get_commit_tree_oid(commit)));
-		}
-		else if (!strcmp(name, "numparent")) {
+		if (atom_type == ATOM_TREE &&
+		    grab_oid(name, "tree", get_commit_tree_oid(commit), v, &used_atom[i]))
+			continue;
+		if (atom_type == ATOM_NUMPARENT) {
 			v->value = commit_list_count(commit->parents);
 			v->s = xstrfmt("%lu", (unsigned long)v->value);
 		}
-		else if (!strcmp(name, "parent")) {
+		else if (atom_type == ATOM_PARENT) {
 			struct commit_list *parents;
 			struct strbuf s = STRBUF_INIT;
 			for (parents = commit->parents; parents; parents = parents->next) {
-				struct commit *parent = parents->item;
+				struct object_id *oid = &parents->item->object.oid;
 				if (parents != commit->parents)
 					strbuf_addch(&s, ' ');
-				strbuf_addstr(&s, oid_to_hex(&parent->object.oid));
+				strbuf_addstr(&s, do_grab_oid("parent", oid, &used_atom[i]));
 			}
 			v->s = strbuf_detach(&s, NULL);
 		}
@@ -1034,28 +1197,52 @@ static const char *copy_name(const char *buf)
 	return xstrdup("");
 }
 
-static const char *copy_email(const char *buf)
+static const char *copy_email(const char *buf, struct used_atom *atom)
 {
 	const char *email = strchr(buf, '<');
 	const char *eoemail;
 	if (!email)
 		return xstrdup("");
-	eoemail = strchr(email, '>');
+	switch (atom->u.email_option.option) {
+	case EO_RAW:
+		eoemail = strchr(email, '>');
+		if (eoemail)
+			eoemail++;
+		break;
+	case EO_TRIM:
+		email++;
+		eoemail = strchr(email, '>');
+		break;
+	case EO_LOCALPART:
+		email++;
+		eoemail = strchr(email, '@');
+		if (!eoemail)
+			eoemail = strchr(email, '>');
+		break;
+	default:
+		BUG("unknown email option");
+	}
+
 	if (!eoemail)
 		return xstrdup("");
-	return xmemdupz(email, eoemail + 1 - email);
+	return xmemdupz(email, eoemail - email);
 }
 
 static char *copy_subject(const char *buf, unsigned long len)
 {
-	char *r = xmemdupz(buf, len);
+	struct strbuf sb = STRBUF_INIT;
 	int i;
 
-	for (i = 0; i < len; i++)
-		if (r[i] == '\n')
-			r[i] = ' ';
+	for (i = 0; i < len; i++) {
+		if (buf[i] == '\r' && i + 1 < len && buf[i + 1] == '\n')
+			continue; /* ignore CR in CRLF */
 
-	return r;
+		if (buf[i] == '\n')
+			strbuf_addch(&sb, ' ');
+		else
+			strbuf_addch(&sb, buf[i]);
+	}
+	return strbuf_detach(&sb, NULL);
 }
 
 static void grab_date(const char *buf, struct atom_value *v, const char *atomname)
@@ -1113,7 +1300,7 @@ static void grab_person(const char *who, struct atom_value *val, int deref, void
 			continue;
 		if (name[wholen] != 0 &&
 		    strcmp(name + wholen, "name") &&
-		    strcmp(name + wholen, "email") &&
+		    !starts_with(name + wholen, "email") &&
 		    !starts_with(name + wholen, "date"))
 			continue;
 		if (!wholine)
@@ -1124,8 +1311,8 @@ static void grab_person(const char *who, struct atom_value *val, int deref, void
 			v->s = copy_line(wholine);
 		else if (!strcmp(name + wholen, "name"))
 			v->s = copy_name(wholine);
-		else if (!strcmp(name + wholen, "email"))
-			v->s = copy_email(wholine);
+		else if (starts_with(name + wholen, "email"))
+			v->s = copy_email(wholine, &used_atom[i]);
 		else if (starts_with(name + wholen, "date"))
 			grab_date(wholine, v, name);
 	}
@@ -1142,26 +1329,35 @@ static void grab_person(const char *who, struct atom_value *val, int deref, void
 		return;
 	for (i = 0; i < used_atom_cnt; i++) {
 		const char *name = used_atom[i].name;
+		enum atom_type atom_type = used_atom[i].atom_type;
 		struct atom_value *v = &val[i];
 		if (!!deref != (*name == '*'))
 			continue;
 		if (deref)
 			name++;
 
-		if (starts_with(name, "creatordate"))
+		if (atom_type == ATOM_CREATORDATE)
 			grab_date(wholine, v, name);
-		else if (!strcmp(name, "creator"))
+		else if (atom_type == ATOM_CREATOR)
 			v->s = copy_line(wholine);
 	}
 }
 
 static void find_subpos(const char *buf,
-			const char **sub, unsigned long *sublen,
-			const char **body, unsigned long *bodylen,
-			unsigned long *nonsiglen,
-			const char **sig, unsigned long *siglen)
+			const char **sub, size_t *sublen,
+			const char **body, size_t *bodylen,
+			size_t *nonsiglen,
+			const char **sig, size_t *siglen)
 {
+	struct strbuf payload = STRBUF_INIT;
+	struct strbuf signature = STRBUF_INIT;
 	const char *eol;
+	const char *end = buf + strlen(buf);
+	const char *sigstart;
+
+	/* parse signature first; we might not even have a subject line */
+	parse_signature(buf, end - buf, &payload, &signature);
+
 	/* skip past header until we hit empty line */
 	while (*buf && *buf != '\n') {
 		eol = strchrnul(buf, '\n');
@@ -1172,31 +1368,32 @@ static void find_subpos(const char *buf,
 	/* skip any empty lines */
 	while (*buf == '\n')
 		buf++;
-
-	/* parse signature first; we might not even have a subject line */
-	*sig = buf + parse_signature(buf, strlen(buf));
-	*siglen = strlen(*sig);
+	*sig = strbuf_detach(&signature, siglen);
+	sigstart = buf + parse_signed_buffer(buf, strlen(buf));
 
 	/* subject is first non-empty line */
 	*sub = buf;
-	/* subject goes to first empty line */
-	while (buf < *sig && *buf && *buf != '\n') {
-		eol = strchrnul(buf, '\n');
-		if (*eol)
-			eol++;
-		buf = eol;
-	}
+	/* subject goes to first empty line before signature begins */
+	if ((eol = strstr(*sub, "\n\n"))) {
+		eol = eol < sigstart ? eol : sigstart;
+	/* check if message uses CRLF */
+	} else if (! (eol = strstr(*sub, "\r\n\r\n"))) {
+		/* treat whole message as subject */
+		eol = strrchr(*sub, '\0');
+	}
+	buf = eol;
 	*sublen = buf - *sub;
 	/* drop trailing newline, if present */
-	if (*sublen && (*sub)[*sublen - 1] == '\n')
+	while (*sublen && ((*sub)[*sublen - 1] == '\n' ||
+			   (*sub)[*sublen - 1] == '\r'))
 		*sublen -= 1;
 
 	/* skip any empty lines */
-	while (*buf == '\n')
+	while (*buf == '\n' || *buf == '\r')
 		buf++;
 	*body = buf;
 	*bodylen = strlen(buf);
-	*nonsiglen = *sig - buf;
+	*nonsiglen = sigstart - buf;
 }
 
 /*
@@ -1224,24 +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;
-	unsigned long sublen = 0, bodylen = 0, nonsiglen = 0, siglen = 0;
+	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, "subject") &&
-		    strcmp(name, "body") &&
-		    !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,
@@ -1251,15 +1466,21 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf)
 
 		if (atom->u.contents.option == C_SUB)
 			v->s = copy_subject(subpos, sublen);
-		else if (atom->u.contents.option == C_BODY_DEP)
+		else if (atom->u.contents.option == C_SUB_SANITIZE) {
+			struct strbuf sb = STRBUF_INIT;
+			format_sanitized_subject(&sb, subpos, sublen);
+			v->s = strbuf_detach(&sb, NULL);
+		} else if (atom->u.contents.option == C_BODY_DEP)
 			v->s = xmemdupz(bodypos, bodylen);
+		else if (atom->u.contents.option == C_LENGTH)
+			v->s = xstrfmt("%"PRIuMAX, (uintmax_t)strlen(subpos));
 		else if (atom->u.contents.option == C_BODY)
 			v->s = xmemdupz(bodypos, nonsiglen);
 		else if (atom->u.contents.option == C_SIG)
 			v->s = xmemdupz(sigpos, siglen);
 		else if (atom->u.contents.option == C_LINES) {
 			struct strbuf s = STRBUF_INIT;
-			const char *contents_end = bodylen + bodypos - siglen;
+			const char *contents_end = bodypos + nonsiglen;
 
 			/*  Size is the length of the message after removing the signature */
 			append_lines(&s, subpos, contents_end - subpos, atom->u.contents.nlines);
@@ -1273,7 +1494,9 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, void *buf)
 			v->s = strbuf_detach(&s, NULL);
 		} else if (atom->u.contents.option == C_BARE)
 			v->s = xstrdup(subpos);
+
 	}
+	free((void *)sigpos);
 }
 
 /*
@@ -1297,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);
@@ -1459,12 +1686,10 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname,
 			remote_for_branch(branch, &explicit);
 		*s = xstrdup(explicit ? remote : "");
 	} else if (atom->u.remote_ref.option == RR_REMOTE_REF) {
-		int explicit;
 		const char *merge;
 
-		merge = remote_ref_for_branch(branch, atom->u.remote_ref.push,
-					      &explicit);
-		*s = xstrdup(explicit ? merge : "");
+		merge = remote_ref_for_branch(branch, atom->u.remote_ref.push);
+		*s = xstrdup(merge ? merge : "");
 	} else
 		BUG("unhandled RR_* enum");
 }
@@ -1475,38 +1700,27 @@ char *get_head_description(void)
 	struct wt_status_state state;
 	memset(&state, 0, sizeof(state));
 	wt_status_get_state(the_repository, &state, 1);
-
-	/*
-	 * The ( character must be hard-coded and not part of a localizable
-	 * string, since the description is used as a sort key and compared
-	 * with ref names.
-	 */
-	strbuf_addch(&desc, '(');
 	if (state.rebase_in_progress ||
 	    state.rebase_interactive_in_progress) {
 		if (state.branch)
-			strbuf_addf(&desc, _("no branch, rebasing %s"),
+			strbuf_addf(&desc, _("(no branch, rebasing %s)"),
 				    state.branch);
 		else
-			strbuf_addf(&desc, _("no branch, rebasing detached HEAD %s"),
+			strbuf_addf(&desc, _("(no branch, rebasing detached HEAD %s)"),
 				    state.detached_from);
 	} else if (state.bisect_in_progress)
-		strbuf_addf(&desc, _("no branch, bisect started on %s"),
+		strbuf_addf(&desc, _("(no branch, bisect started on %s)"),
 			    state.branch);
 	else if (state.detached_from) {
 		if (state.detached_at)
-			strbuf_addstr(&desc, HEAD_DETACHED_AT);
+			strbuf_addf(&desc, _("(HEAD detached at %s)"),
+				state.detached_from);
 		else
-			strbuf_addstr(&desc, HEAD_DETACHED_FROM);
-		strbuf_addstr(&desc, state.detached_from);
-	}
-	else
-		strbuf_addstr(&desc, _("no branch"));
-	strbuf_addch(&desc, ')');
+			strbuf_addf(&desc, _("(HEAD detached from %s)"),
+				state.detached_from);
+	} else
+		strbuf_addstr(&desc, _("(no branch)"));
 
-	free(state.branch);
-	free(state.onto);
-	free(state.detached_from);
 	return strbuf_detach(&desc, NULL);
 }
 
@@ -1544,13 +1758,13 @@ static int get_object(struct ref_array_item *ref, int deref, struct object **obj
 
 	if (oi->info.contentp) {
 		*obj = parse_object_buffer(the_repository, &oi->oid, oi->type, oi->size, oi->content, &eaten);
-		if (!obj) {
+		if (!*obj) {
 			if (!eaten)
 				free(oi->content);
 			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);
@@ -1581,7 +1795,7 @@ static void lazy_init_worktree_map(void)
 	if (ref_to_worktree_map.worktrees)
 		return;
 
-	ref_to_worktree_map.worktrees = get_worktrees(0);
+	ref_to_worktree_map.worktrees = get_worktrees();
 	hashmap_init(&(ref_to_worktree_map.map), ref_to_worktree_map_cmpfnc, NULL, 0);
 	populate_worktree_map(&(ref_to_worktree_map.map), ref_to_worktree_map.worktrees);
 }
@@ -1613,7 +1827,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 	int i;
 	struct object_info empty = OBJECT_INFO_INIT;
 
-	ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));
+	CALLOC_ARRAY(ref->value, used_atom_cnt);
 
 	if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {
 		ref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING,
@@ -1625,12 +1839,14 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 	/* Fill in specials first */
 	for (i = 0; i < used_atom_cnt; i++) {
 		struct used_atom *atom = &used_atom[i];
+		enum atom_type atom_type = atom->atom_type;
 		const char *name = used_atom[i].name;
 		struct atom_value *v = &ref->value[i];
 		int deref = 0;
 		const char *refname;
 		struct branch *branch = NULL;
 
+		v->s_size = ATOM_SIZE_UNSPECIFIED;
 		v->handler = append_atom;
 		v->atom = atom;
 
@@ -1639,18 +1855,18 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 			name++;
 		}
 
-		if (starts_with(name, "refname"))
+		if (atom_type == ATOM_REFNAME)
 			refname = get_refname(atom, ref);
-		else if (!strcmp(name, "worktreepath")) {
+		else if (atom_type == ATOM_WORKTREEPATH) {
 			if (ref->kind == FILTER_REFS_BRANCHES)
 				v->s = get_worktree_path(atom, ref);
 			else
 				v->s = xstrdup("");
 			continue;
 		}
-		else if (starts_with(name, "symref"))
+		else if (atom_type == ATOM_SYMREF)
 			refname = get_symref(atom, ref);
-		else if (starts_with(name, "upstream")) {
+		else if (atom_type == ATOM_UPSTREAM) {
 			const char *branch_name;
 			/* only local branches may have an upstream */
 			if (!skip_prefix(ref->refname, "refs/heads/",
@@ -1666,7 +1882,7 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 			else
 				v->s = xstrdup("");
 			continue;
-		} else if (atom->u.remote_ref.push) {
+		} else if (atom_type == ATOM_PUSH && atom->u.remote_ref.push) {
 			const char *branch_name;
 			v->s = xstrdup("");
 			if (!skip_prefix(ref->refname, "refs/heads/",
@@ -1685,10 +1901,10 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 			free((char *)v->s);
 			fill_remote_ref_details(atom, refname, branch, &v->s);
 			continue;
-		} else if (starts_with(name, "color:")) {
+		} else if (atom_type == ATOM_COLOR) {
 			v->s = xstrdup(atom->u.color);
 			continue;
-		} else if (!strcmp(name, "flag")) {
+		} else if (atom_type == ATOM_FLAG) {
 			char buf[256], *cp = buf;
 			if (ref->flag & REF_ISSYMREF)
 				cp = copy_advance(cp, ",symref");
@@ -1701,23 +1917,24 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 				v->s = xstrdup(buf + 1);
 			}
 			continue;
-		} else if (!deref && grab_objectname(name, &ref->objectname, v, atom)) {
-			continue;
-		} else if (!strcmp(name, "HEAD")) {
+		} else if (!deref && atom_type == ATOM_OBJECTNAME &&
+			   grab_oid(name, "objectname", &ref->objectname, v, atom)) {
+				continue;
+		} else if (atom_type == ATOM_HEAD) {
 			if (atom->u.head && !strcmp(ref->refname, atom->u.head))
 				v->s = xstrdup("*");
 			else
 				v->s = xstrdup(" ");
 			continue;
-		} else if (starts_with(name, "align")) {
+		} else if (atom_type == ATOM_ALIGN) {
 			v->handler = align_atom_handler;
 			v->s = xstrdup("");
 			continue;
-		} else if (!strcmp(name, "end")) {
+		} else if (atom_type == ATOM_END) {
 			v->handler = end_atom_handler;
 			v->s = xstrdup("");
 			continue;
-		} else if (starts_with(name, "if")) {
+		} else if (atom_type == ATOM_IF) {
 			const char *s;
 			if (skip_prefix(name, "if:", &s))
 				v->s = xstrdup(s);
@@ -1725,14 +1942,20 @@ static int populate_value(struct ref_array_item *ref, struct strbuf *err)
 				v->s = xstrdup("");
 			v->handler = if_atom_handler;
 			continue;
-		} else if (!strcmp(name, "then")) {
+		} else if (atom_type == ATOM_THEN) {
 			v->handler = then_atom_handler;
 			v->s = xstrdup("");
 			continue;
-		} else if (!strcmp(name, "else")) {
+		} else if (atom_type == ATOM_ELSE) {
 			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;
 
@@ -1870,64 +2093,6 @@ static int filter_pattern_match(struct ref_filter *filter, const char *refname)
 	return match_pattern(filter, refname);
 }
 
-static int qsort_strcmp(const void *va, const void *vb)
-{
-	const char *a = *(const char **)va;
-	const char *b = *(const char **)vb;
-
-	return strcmp(a, b);
-}
-
-static void find_longest_prefixes_1(struct string_list *out,
-				  struct strbuf *prefix,
-				  const char **patterns, size_t nr)
-{
-	size_t i;
-
-	for (i = 0; i < nr; i++) {
-		char c = patterns[i][prefix->len];
-		if (!c || is_glob_special(c)) {
-			string_list_append(out, prefix->buf);
-			return;
-		}
-	}
-
-	i = 0;
-	while (i < nr) {
-		size_t end;
-
-		/*
-		* Set "end" to the index of the element _after_ the last one
-		* in our group.
-		*/
-		for (end = i + 1; end < nr; end++) {
-			if (patterns[i][prefix->len] != patterns[end][prefix->len])
-				break;
-		}
-
-		strbuf_addch(prefix, patterns[i][prefix->len]);
-		find_longest_prefixes_1(out, prefix, patterns + i, end - i);
-		strbuf_setlen(prefix, prefix->len - 1);
-
-		i = end;
-	}
-}
-
-static void find_longest_prefixes(struct string_list *out,
-				  const char **patterns)
-{
-	struct argv_array sorted = ARGV_ARRAY_INIT;
-	struct strbuf prefix = STRBUF_INIT;
-
-	argv_array_pushv(&sorted, patterns);
-	QSORT(sorted.argv, sorted.argc, qsort_strcmp);
-
-	find_longest_prefixes_1(out, &prefix, sorted.argv, sorted.argc);
-
-	argv_array_clear(&sorted);
-	strbuf_release(&prefix);
-}
-
 /*
  * This is the same as for_each_fullref_in(), but it tries to iterate
  * only over the patterns we'll care about. Note that it _doesn't_ do a full
@@ -1938,10 +2103,6 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter,
 				       void *cb_data,
 				       int broken)
 {
-	struct string_list prefixes = STRING_LIST_INIT_DUP;
-	struct string_list_item *prefix;
-	int ret;
-
 	if (!filter->match_as_path) {
 		/*
 		 * in this case, the patterns are applied after
@@ -1965,25 +2126,16 @@ static int for_each_fullref_in_pattern(struct ref_filter *filter,
 		return for_each_fullref_in("", cb, cb_data, broken);
 	}
 
-	find_longest_prefixes(&prefixes, filter->name_patterns);
-
-	for_each_string_list_item(prefix, &prefixes) {
-		ret = for_each_fullref_in(prefix->string, cb, cb_data, broken);
-		if (ret)
-			break;
-	}
-
-	string_list_clear(&prefixes, 0);
-	return ret;
+	return for_each_fullref_in_prefixes(NULL, filter->name_patterns,
+					    cb, cb_data, broken);
 }
 
 /*
- * Given a ref (sha1, refname), check if the ref belongs to the array
- * of sha1s. If the given ref is a tag, check if the given tag points
- * at one of the sha1s in the given sha1 array.
- * the given sha1_array.
+ * Given a ref (oid, refname), check if the ref belongs to the array
+ * of oids. If the given ref is a tag, check if the given tag points
+ * at one of the oids in the given oid array.
  * NEEDSWORK:
- * 1. Only a single level of inderection is obtained, we might want to
+ * 1. Only a single level of indirection is obtained, we might want to
  * change this to account for multiple levels (e.g. annotated tags
  * pointing to annotated tags pointing to a commit.)
  * 2. As the refs are cached we might know what refname peels to without
@@ -2021,6 +2173,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;
 }
@@ -2115,9 +2268,9 @@ static int ref_filter_handler(const char *refname, const struct object_id *oid,
 	 * obtain the commit using the 'oid' available and discard all
 	 * non-commits early. The actual filtering is done later.
 	 */
-	if (filter->merge_commit || filter->with_commit || filter->no_commit || filter->verbose) {
-		commit = lookup_commit_reference_gently(the_repository, oid,
-							1);
+	if (filter->reachable_from || filter->unreachable_from ||
+	    filter->with_commit || filter->no_commit || filter->verbose) {
+		commit = lookup_commit_reference_gently(the_repository, oid, 1);
 		if (!commit)
 			return 0;
 		/* We perform the filtering for the '--contains' option... */
@@ -2166,26 +2319,38 @@ 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;
 
 	if (ref_to_worktree_map.worktrees) {
-		hashmap_free_entries(&(ref_to_worktree_map.map),
+		hashmap_clear_and_free(&(ref_to_worktree_map.map),
 					struct ref_to_worktree_entry, ent);
 		free_worktrees(ref_to_worktree_map.worktrees);
 		ref_to_worktree_map.worktrees = NULL;
 	}
 }
 
-static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
+#define EXCLUDE_REACHED 0
+#define INCLUDE_REACHED 1
+static void reach_filter(struct ref_array *array,
+			 struct commit_list *check_reachable,
+			 int include_reached)
 {
 	struct rev_info revs;
 	int i, old_nr;
-	struct ref_filter *filter = ref_cbdata->filter;
-	struct ref_array *array = ref_cbdata->array;
-	struct commit **to_clear = xcalloc(sizeof(struct commit *), array->nr);
+	struct commit **to_clear;
+	struct commit_list *cr;
+
+	if (!check_reachable)
+		return;
+
+	CALLOC_ARRAY(to_clear, array->nr);
 
 	repo_init_revisions(the_repository, &revs, NULL);
 
@@ -2195,8 +2360,11 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
 		to_clear[i] = item->commit;
 	}
 
-	filter->merge_commit->object.flags |= UNINTERESTING;
-	add_pending_object(&revs, &filter->merge_commit->object, "");
+	for (cr = check_reachable; cr; cr = cr->next) {
+		struct commit *merge_commit = cr->item;
+		merge_commit->object.flags |= UNINTERESTING;
+		add_pending_object(&revs, &merge_commit->object, "");
+	}
 
 	revs.limited = 1;
 	if (prepare_revision_walk(&revs))
@@ -2211,14 +2379,19 @@ static void do_merge_filter(struct ref_filter_cbdata *ref_cbdata)
 
 		int is_merged = !!(commit->object.flags & UNINTERESTING);
 
-		if (is_merged == (filter->merge == REF_FILTER_MERGED_INCLUDE))
+		if (is_merged == include_reached)
 			array->items[array->nr++] = array->items[i];
 		else
 			free_array_item(item);
 	}
 
 	clear_commit_marks_many(old_nr, to_clear, ALL_REV_FLAGS);
-	clear_commit_marks(filter->merge_commit, ALL_REV_FLAGS);
+
+	while (check_reachable) {
+		struct commit *merge_commit = pop_commit(&check_reachable);
+		clear_commit_marks(merge_commit, ALL_REV_FLAGS);
+	}
+
 	free(to_clear);
 }
 
@@ -2270,18 +2443,43 @@ int filter_refs(struct ref_array *array, struct ref_filter *filter, unsigned int
 	clear_contains_cache(&ref_cbdata.no_contains_cache);
 
 	/*  Filters that need revision walking */
-	if (filter->merge_commit)
-		do_merge_filter(&ref_cbdata);
+	reach_filter(array, filter->reachable_from, INCLUDE_REACHED);
+	reach_filter(array, filter->unreachable_from, EXCLUDE_REACHED);
 
 	return ret;
 }
 
+static int compare_detached_head(struct ref_array_item *a, struct ref_array_item *b)
+{
+	if (!(a->kind ^ b->kind))
+		BUG("ref_kind_from_refname() should only mark one ref as HEAD");
+	if (a->kind & FILTER_REFS_DETACHED_HEAD)
+		return -1;
+	else if (b->kind & FILTER_REFS_DETACHED_HEAD)
+		return 1;
+	BUG("should have died in the xor check above");
+	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;
+}
+
 static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, struct ref_array_item *b)
 {
 	struct atom_value *va, *vb;
 	int cmp;
+	int cmp_detached_head = 0;
 	cmp_type cmp_type = used_atom[s->atom].type;
-	int (*cmp_fn)(const char *, const char *);
 	struct strbuf err = STRBUF_INIT;
 
 	if (get_ref_atom_value(a, s->atom, &va, &err))
@@ -2289,21 +2487,47 @@ static int cmp_ref_sorting(struct ref_sorting *s, struct ref_array_item *a, stru
 	if (get_ref_atom_value(b, s->atom, &vb, &err))
 		die("%s", err.buf);
 	strbuf_release(&err);
-	cmp_fn = s->ignore_case ? strcasecmp : strcmp;
-	if (s->version)
+	if (s->sort_flags & REF_SORTING_DETACHED_HEAD_FIRST &&
+	    ((a->kind | b->kind) & FILTER_REFS_DETACHED_HEAD)) {
+		cmp = compare_detached_head(a, b);
+		cmp_detached_head = 1;
+	} else if (s->sort_flags & REF_SORTING_VERSION) {
 		cmp = versioncmp(va->s, vb->s);
-	else if (cmp_type == FIELD_STR)
-		cmp = cmp_fn(va->s, vb->s);
-	else {
+	} else if (cmp_type == FIELD_STR) {
+		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;
 		else if (va->value == vb->value)
-			cmp = cmp_fn(a->refname, b->refname);
+			cmp = 0;
 		else
 			cmp = 1;
 	}
 
-	return (s->reverse) ? -cmp : cmp;
+	return (s->sort_flags & REF_SORTING_REVERSE && !cmp_detached_head)
+		? -cmp : cmp;
 }
 
 static int compare_refs(const void *a_, const void *b_, void *ref_sorting)
@@ -2317,7 +2541,21 @@ static int compare_refs(const void *a_, const void *b_, void *ref_sorting)
 		if (cmp)
 			return cmp;
 	}
-	return 0;
+	s = ref_sorting;
+	return s && s->sort_flags & REF_SORTING_ICASE ?
+		strcasecmp(a->refname, b->refname) :
+		strcmp(a->refname, b->refname);
+}
+
+void ref_sorting_set_sort_flags_all(struct ref_sorting *sorting,
+				    unsigned int mask, int on)
+{
+	for (; sorting; sorting = sorting->next) {
+		if (on)
+			sorting->sort_flags |= mask;
+		else
+			sorting->sort_flags &= ~mask;
+	}
 }
 
 void ref_array_sort(struct ref_sorting *sorting, struct ref_array *array)
@@ -2348,9 +2586,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;
@@ -2377,7 +2615,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);
@@ -2393,27 +2631,22 @@ int format_ref_array_item(struct ref_array_item *info,
 	return 0;
 }
 
-void show_ref_array_item(struct ref_array_item *info,
-			 const struct ref_format *format)
-{
-	struct strbuf final_buf = STRBUF_INIT;
-	struct strbuf error_buf = STRBUF_INIT;
-
-	if (format_ref_array_item(info, format, &final_buf, &error_buf))
-		die("%s", error_buf.buf);
-	fwrite(final_buf.buf, 1, final_buf.len, stdout);
-	strbuf_release(&error_buf);
-	strbuf_release(&final_buf);
-	putchar('\n');
-}
-
 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;
+	struct strbuf err = STRBUF_INIT;
+
 	ref_item = new_ref_array_item(name, oid);
 	ref_item->kind = ref_kind_from_refname(name);
-	show_ref_array_item(ref_item, format);
+	if (format_ref_array_item(ref_item, format, &output, &err))
+		die("%s", err.buf);
+	fwrite(output.buf, 1, output.len, stdout);
+	putchar('\n');
+
+	strbuf_release(&err);
+	strbuf_release(&output);
 	free_array_item(ref_item);
 }
 
@@ -2449,17 +2682,17 @@ void parse_ref_sorting(struct ref_sorting **sorting_tail, const char *arg)
 {
 	struct ref_sorting *s;
 
-	s = xcalloc(1, sizeof(*s));
+	CALLOC_ARRAY(s, 1);
 	s->next = *sorting_tail;
 	*sorting_tail = s;
 
 	if (*arg == '-') {
-		s->reverse = 1;
+		s->sort_flags |= REF_SORTING_REVERSE;
 		arg++;
 	}
 	if (skip_prefix(arg, "version:", &arg) ||
 	    skip_prefix(arg, "v:", &arg))
-		s->version = 1;
+		s->sort_flags |= REF_SORTING_VERSION;
 	s->atom = parse_sorting_atom(arg);
 }
 
@@ -2480,31 +2713,22 @@ int parse_opt_merge_filter(const struct option *opt, const char *arg, int unset)
 {
 	struct ref_filter *rf = opt->value;
 	struct object_id oid;
-	int no_merged = starts_with(opt->long_name, "no");
+	struct commit *merge_commit;
 
 	BUG_ON_OPT_NEG(unset);
 
-	if (rf->merge) {
-		if (no_merged) {
-			return error(_("option `%s' is incompatible with --merged"),
-				     opt->long_name);
-		} else {
-			return error(_("option `%s' is incompatible with --no-merged"),
-				     opt->long_name);
-		}
-	}
-
-	rf->merge = no_merged
-		? REF_FILTER_MERGED_OMIT
-		: REF_FILTER_MERGED_INCLUDE;
-
 	if (get_oid(arg, &oid))
 		die(_("malformed object name %s"), arg);
 
-	rf->merge_commit = lookup_commit_reference_gently(the_repository,
-							  &oid, 0);
-	if (!rf->merge_commit)
+	merge_commit = lookup_commit_reference_gently(the_repository, &oid, 0);
+
+	if (!merge_commit)
 		return error(_("option `%s' must point to a commit"), opt->long_name);
 
+	if (starts_with(opt->long_name, "no"))
+		commit_list_insert(merge_commit, &rf->unreachable_from);
+	else
+		commit_list_insert(merge_commit, &rf->reachable_from);
+
 	return 0;
 }
diff --git a/ref-filter.h b/ref-filter.h
index f1dcff4c6e..c15dee8d6b 100644
--- a/ref-filter.h
+++ b/ref-filter.h
@@ -1,7 +1,7 @@
 #ifndef REF_FILTER_H
 #define REF_FILTER_H
 
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "refs.h"
 #include "commit.h"
 #include "parse-options.h"
@@ -28,13 +28,17 @@ struct atom_value;
 struct ref_sorting {
 	struct ref_sorting *next;
 	int atom; /* index into used_atom array (internal) */
-	unsigned reverse : 1,
-		ignore_case : 1,
-		version : 1;
+	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;
 };
 
 struct ref_array_item {
 	struct object_id objectname;
+	const char *rest;
 	int flag;
 	unsigned int kind;
 	const char *symref;
@@ -54,13 +58,8 @@ struct ref_filter {
 	struct oid_array points_at;
 	struct commit_list *with_commit;
 	struct commit_list *no_commit;
-
-	enum {
-		REF_FILTER_MERGED_NONE = 0,
-		REF_FILTER_MERGED_INCLUDE,
-		REF_FILTER_MERGED_OMIT
-	} merge;
-	struct commit *merge_commit;
+	struct commit_list *reachable_from;
+	struct commit_list *unreachable_from;
 
 	unsigned int with_commit_tag_algo : 1,
 		match_as_path : 1,
@@ -78,14 +77,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) \
@@ -114,13 +115,13 @@ void ref_array_clear(struct ref_array *array);
 int verify_ref_format(struct ref_format *format);
 /*  Sort the given ref_array as per the ref_sorting provided */
 void ref_array_sort(struct ref_sorting *sort, struct ref_array *array);
+/*  Set REF_SORTING_* sort_flags for all elements of a sorting list */
+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);
-/*  Print the ref using the given format and quote_style */
-void show_ref_array_item(struct ref_array_item *info, const struct ref_format *format);
 /*  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 */
@@ -139,7 +140,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 3a25b27d8f..e9cd328369 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -112,7 +112,7 @@ struct reflog_walk_info {
 
 void init_reflog_walk(struct reflog_walk_info **info)
 {
-	*info = xcalloc(1, sizeof(struct reflog_walk_info));
+	CALLOC_ARRAY(*info, 1);
 	(*info)->complete_reflogs.strdup_strings = 1;
 }
 
@@ -181,7 +181,7 @@ int add_reflog_for_walk(struct reflog_walk_info *info,
 	}
 	free(branch);
 
-	commit_reflog = xcalloc(1, sizeof(struct commit_reflog));
+	CALLOC_ARRAY(commit_reflog, 1);
 	if (recno < 0) {
 		commit_reflog->recno = get_reflog_recno_by_time(reflogs, timestamp);
 		if (commit_reflog->recno < 0) {
diff --git a/refs.c b/refs.c
index 1ab0bb54d3..8b9f7c3a80 100644
--- a/refs.c
+++ b/refs.c
@@ -9,13 +9,15 @@
 #include "iterator.h"
 #include "refs.h"
 #include "refs/refs-internal.h"
+#include "run-command.h"
 #include "object-store.h"
 #include "object.h"
 #include "tag.h"
 #include "submodule.h"
 #include "worktree.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "repository.h"
+#include "sigchain.h"
 
 /*
  * List of all available backends
@@ -311,7 +313,7 @@ int read_ref(const char *refname, struct object_id *oid)
 	return read_ref_full(refname, RESOLVE_REF_READING, oid, NULL);
 }
 
-static int refs_ref_exists(struct ref_store *refs, const char *refname)
+int refs_ref_exists(struct ref_store *refs, const char *refname)
 {
 	return !!refs_resolve_ref_unsafe(refs, refname, RESOLVE_REF_READING, NULL, NULL);
 }
@@ -321,50 +323,6 @@ int ref_exists(const char *refname)
 	return refs_ref_exists(get_main_ref_store(the_repository), refname);
 }
 
-static int match_ref_pattern(const char *refname,
-			     const struct string_list_item *item)
-{
-	int matched = 0;
-	if (item->util == NULL) {
-		if (!wildmatch(item->string, refname, 0))
-			matched = 1;
-	} else {
-		const char *rest;
-		if (skip_prefix(refname, item->string, &rest) &&
-		    (!*rest || *rest == '/'))
-			matched = 1;
-	}
-	return matched;
-}
-
-int ref_filter_match(const char *refname,
-		     const struct string_list *include_patterns,
-		     const struct string_list *exclude_patterns)
-{
-	struct string_list_item *item;
-
-	if (exclude_patterns && exclude_patterns->nr) {
-		for_each_string_list_item(item, exclude_patterns) {
-			if (match_ref_pattern(refname, item))
-				return 0;
-		}
-	}
-
-	if (include_patterns && include_patterns->nr) {
-		int found = 0;
-		for_each_string_list_item(item, include_patterns) {
-			if (match_ref_pattern(refname, item)) {
-				found = 1;
-				break;
-			}
-		}
-
-		if (!found)
-			return 0;
-	}
-	return 1;
-}
-
 static int filter_refs(const char *refname, const struct object_id *oid,
 			   int flags, void *data)
 {
@@ -379,11 +337,11 @@ static int filter_refs(const char *refname, const struct object_id *oid,
 
 enum peel_status peel_object(const struct object_id *name, struct object_id *oid)
 {
-	struct object *o = lookup_unknown_object(name);
+	struct object *o = lookup_unknown_object(the_repository, name);
 
 	if (o->type == OBJ_NONE) {
 		int type = oid_object_info(the_repository, name, NULL);
-		if (type < 0 || !object_as_type(the_repository, o, type, 0))
+		if (type < 0 || !object_as_type(o, type, 0))
 			return PEEL_INVALID;
 	}
 
@@ -595,13 +553,62 @@ int refname_match(const char *abbrev_name, const char *full_name)
  * Given a 'prefix' expand it by the rules in 'ref_rev_parse_rules' and add
  * the results to 'prefixes'
  */
-void expand_ref_prefix(struct argv_array *prefixes, const char *prefix)
+void expand_ref_prefix(struct strvec *prefixes, const char *prefix)
 {
 	const char **p;
 	int len = strlen(prefix);
 
 	for (p = ref_rev_parse_rules; *p; p++)
-		argv_array_pushf(prefixes, *p, len, prefix);
+		strvec_pushf(prefixes, *p, len, prefix);
+}
+
+static const char default_branch_name_advice[] = N_(
+"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"
+);
+
+char *repo_default_branch_name(struct repository *r, int quiet)
+{
+	const char *config_key = "init.defaultbranch";
+	const char *config_display_key = "init.defaultBranch";
+	char *ret = NULL, *full_ref;
+	const char *env = getenv("GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME");
+
+	if (env && *env)
+		ret = xstrdup(env);
+	else if (repo_config_get_string(r, config_key, &ret) < 0)
+		die(_("could not retrieve `%s`"), config_display_key);
+
+	if (!ret) {
+		ret = xstrdup("master");
+		if (!quiet)
+			advise(_(default_branch_name_advice), ret);
+	}
+
+	full_ref = xstrfmt("refs/heads/%s", ret);
+	if (check_refname_format(full_ref, 0))
+		die(_("invalid branch name: %s = %s"), config_display_key, ret);
+	free(full_ref);
+
+	return ret;
+}
+
+const char *git_default_branch_name(int quiet)
+{
+	static char *ret;
+
+	if (!ret)
+		ret = repo_default_branch_name(the_repository, quiet);
+
+	return ret;
 }
 
 /*
@@ -610,10 +617,14 @@ void expand_ref_prefix(struct argv_array *prefixes, const char *prefix)
  * to name a branch.
  */
 static char *substitute_branch_name(struct repository *r,
-				    const char **string, int *len)
+				    const char **string, int *len,
+				    int nonfatal_dangling_mark)
 {
 	struct strbuf buf = STRBUF_INIT;
-	int ret = repo_interpret_branch_name(r, *string, *len, &buf, 0);
+	struct interpret_branch_name_options options = {
+		.nonfatal_dangling_mark = nonfatal_dangling_mark
+	};
+	int ret = repo_interpret_branch_name(r, *string, *len, &buf, &options);
 
 	if (ret == *len) {
 		size_t size;
@@ -626,19 +637,15 @@ static char *substitute_branch_name(struct repository *r,
 }
 
 int repo_dwim_ref(struct repository *r, const char *str, int len,
-		  struct object_id *oid, char **ref)
+		  struct object_id *oid, char **ref, int nonfatal_dangling_mark)
 {
-	char *last_branch = substitute_branch_name(r, &str, &len);
+	char *last_branch = substitute_branch_name(r, &str, &len,
+						   nonfatal_dangling_mark);
 	int   refs_found  = expand_ref(r, str, len, oid, ref);
 	free(last_branch);
 	return refs_found;
 }
 
-int dwim_ref(const char *str, int len, struct object_id *oid, char **ref)
-{
-	return repo_dwim_ref(the_repository, str, len, oid, ref);
-}
-
 int expand_ref(struct repository *repo, const char *str, int len,
 	       struct object_id *oid, char **ref)
 {
@@ -677,7 +684,7 @@ int repo_dwim_log(struct repository *r, const char *str, int len,
 		  struct object_id *oid, char **log)
 {
 	struct ref_store *refs = get_main_ref_store(r);
-	char *last_branch = substitute_branch_name(r, &str, &len);
+	char *last_branch = substitute_branch_name(r, &str, &len, 0);
 	const char **p;
 	int logs_found = 0;
 	struct strbuf path = STRBUF_INIT;
@@ -720,10 +727,9 @@ int dwim_log(const char *str, int len, struct object_id *oid, char **log)
 
 static int is_per_worktree_ref(const char *refname)
 {
-	return !strcmp(refname, "HEAD") ||
-		starts_with(refname, "refs/worktree/") ||
-		starts_with(refname, "refs/bisect/") ||
-		starts_with(refname, "refs/rewritten/");
+	return starts_with(refname, "refs/worktree/") ||
+	       starts_with(refname, "refs/bisect/") ||
+	       starts_with(refname, "refs/rewritten/");
 }
 
 static int is_pseudoref_syntax(const char *refname)
@@ -783,102 +789,6 @@ long get_files_ref_lock_timeout_ms(void)
 	return timeout_ms;
 }
 
-static int write_pseudoref(const char *pseudoref, const struct object_id *oid,
-			   const struct object_id *old_oid, struct strbuf *err)
-{
-	const char *filename;
-	int fd;
-	struct lock_file lock = LOCK_INIT;
-	struct strbuf buf = STRBUF_INIT;
-	int ret = -1;
-
-	if (!oid)
-		return 0;
-
-	strbuf_addf(&buf, "%s\n", oid_to_hex(oid));
-
-	filename = git_path("%s", pseudoref);
-	fd = hold_lock_file_for_update_timeout(&lock, filename, 0,
-					       get_files_ref_lock_timeout_ms());
-	if (fd < 0) {
-		strbuf_addf(err, _("could not open '%s' for writing: %s"),
-			    filename, strerror(errno));
-		goto done;
-	}
-
-	if (old_oid) {
-		struct object_id actual_old_oid;
-
-		if (read_ref(pseudoref, &actual_old_oid)) {
-			if (!is_null_oid(old_oid)) {
-				strbuf_addf(err, _("could not read ref '%s'"),
-					    pseudoref);
-				rollback_lock_file(&lock);
-				goto done;
-			}
-		} else if (is_null_oid(old_oid)) {
-			strbuf_addf(err, _("ref '%s' already exists"),
-				    pseudoref);
-			rollback_lock_file(&lock);
-			goto done;
-		} else if (!oideq(&actual_old_oid, old_oid)) {
-			strbuf_addf(err, _("unexpected object ID when writing '%s'"),
-				    pseudoref);
-			rollback_lock_file(&lock);
-			goto done;
-		}
-	}
-
-	if (write_in_full(fd, buf.buf, buf.len) < 0) {
-		strbuf_addf(err, _("could not write to '%s'"), filename);
-		rollback_lock_file(&lock);
-		goto done;
-	}
-
-	commit_lock_file(&lock);
-	ret = 0;
-done:
-	strbuf_release(&buf);
-	return ret;
-}
-
-static int delete_pseudoref(const char *pseudoref, const struct object_id *old_oid)
-{
-	const char *filename;
-
-	filename = git_path("%s", pseudoref);
-
-	if (old_oid && !is_null_oid(old_oid)) {
-		struct lock_file lock = LOCK_INIT;
-		int fd;
-		struct object_id actual_old_oid;
-
-		fd = hold_lock_file_for_update_timeout(
-				&lock, filename, 0,
-				get_files_ref_lock_timeout_ms());
-		if (fd < 0) {
-			error_errno(_("could not open '%s' for writing"),
-				    filename);
-			return -1;
-		}
-		if (read_ref(pseudoref, &actual_old_oid))
-			die(_("could not read ref '%s'"), pseudoref);
-		if (!oideq(&actual_old_oid, old_oid)) {
-			error(_("unexpected object ID when deleting '%s'"),
-			      pseudoref);
-			rollback_lock_file(&lock);
-			return -1;
-		}
-
-		unlink(filename);
-		rollback_lock_file(&lock);
-	} else {
-		unlink(filename);
-	}
-
-	return 0;
-}
-
 int refs_delete_ref(struct ref_store *refs, const char *msg,
 		    const char *refname,
 		    const struct object_id *old_oid,
@@ -887,11 +797,6 @@ int refs_delete_ref(struct ref_store *refs, const char *msg,
 	struct ref_transaction *transaction;
 	struct strbuf err = STRBUF_INIT;
 
-	if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
-		assert(refs == get_main_ref_store(the_repository));
-		return delete_pseudoref(refname, old_oid);
-	}
-
 	transaction = ref_store_transaction_begin(refs, &err);
 	if (!transaction ||
 	    ref_transaction_delete(transaction, refname, old_oid,
@@ -914,12 +819,11 @@ int delete_ref(const char *msg, const char *refname,
 			       old_oid, flags);
 }
 
-void copy_reflog_msg(struct strbuf *sb, const char *msg)
+static void copy_reflog_msg(struct strbuf *sb, const char *msg)
 {
 	char c;
 	int wasspace = 1;
 
-	strbuf_addch(sb, '\t');
 	while ((c = *msg++)) {
 		if (wasspace && isspace(c))
 			continue;
@@ -931,6 +835,15 @@ void copy_reflog_msg(struct strbuf *sb, const char *msg)
 	strbuf_rtrim(sb);
 }
 
+static char *normalize_reflog_message(const char *msg)
+{
+	struct strbuf sb = STRBUF_INIT;
+
+	if (msg && *msg)
+		copy_reflog_msg(&sb, msg);
+	return strbuf_detach(&sb, NULL);
+}
+
 int should_autocreate_reflog(const char *refname)
 {
 	switch (log_all_ref_updates) {
@@ -969,51 +882,71 @@ struct read_ref_at_cb {
 	int *cutoff_cnt;
 };
 
+static void set_read_ref_cutoffs(struct read_ref_at_cb *cb,
+		timestamp_t timestamp, int tz, const char *message)
+{
+	if (cb->msg)
+		*cb->msg = xstrdup(message);
+	if (cb->cutoff_time)
+		*cb->cutoff_time = timestamp;
+	if (cb->cutoff_tz)
+		*cb->cutoff_tz = tz;
+	if (cb->cutoff_cnt)
+		*cb->cutoff_cnt = cb->reccnt;
+}
+
 static int read_ref_at_ent(struct object_id *ooid, struct object_id *noid,
 		const char *email, timestamp_t timestamp, int tz,
 		const char *message, void *cb_data)
 {
 	struct read_ref_at_cb *cb = cb_data;
+	int reached_count;
 
-	cb->reccnt++;
 	cb->tz = tz;
 	cb->date = timestamp;
 
-	if (timestamp <= cb->at_time || cb->cnt == 0) {
-		if (cb->msg)
-			*cb->msg = xstrdup(message);
-		if (cb->cutoff_time)
-			*cb->cutoff_time = timestamp;
-		if (cb->cutoff_tz)
-			*cb->cutoff_tz = tz;
-		if (cb->cutoff_cnt)
-			*cb->cutoff_cnt = cb->reccnt - 1;
+	/*
+	 * It is not possible for cb->cnt == 0 on the first iteration because
+	 * that special case is handled in read_ref_at().
+	 */
+	if (cb->cnt > 0)
+		cb->cnt--;
+	reached_count = cb->cnt == 0 && !is_null_oid(ooid);
+	if (timestamp <= cb->at_time || reached_count) {
+		set_read_ref_cutoffs(cb, timestamp, tz, message);
 		/*
 		 * we have not yet updated cb->[n|o]oid so they still
 		 * hold the values for the previous record.
 		 */
-		if (!is_null_oid(&cb->ooid)) {
-			oidcpy(cb->oid, noid);
-			if (!oideq(&cb->ooid, noid))
-				warning(_("log for ref %s has gap after %s"),
+		if (!is_null_oid(&cb->ooid) && !oideq(&cb->ooid, noid))
+			warning(_("log for ref %s has gap after %s"),
 					cb->refname, show_date(cb->date, cb->tz, DATE_MODE(RFC2822)));
-		}
-		else if (cb->date == cb->at_time)
+		if (reached_count)
+			oidcpy(cb->oid, ooid);
+		else if (!is_null_oid(&cb->ooid) || cb->date == cb->at_time)
 			oidcpy(cb->oid, noid);
 		else if (!oideq(noid, cb->oid))
 			warning(_("log for ref %s unexpectedly ended on %s"),
 				cb->refname, show_date(cb->date, cb->tz,
 						       DATE_MODE(RFC2822)));
-		oidcpy(&cb->ooid, ooid);
-		oidcpy(&cb->noid, noid);
 		cb->found_it = 1;
-		return 1;
 	}
+	cb->reccnt++;
 	oidcpy(&cb->ooid, ooid);
 	oidcpy(&cb->noid, noid);
-	if (cb->cnt > 0)
-		cb->cnt--;
-	return 0;
+	return cb->found_it;
+}
+
+static int read_ref_at_ent_newest(struct object_id *ooid, struct object_id *noid,
+				  const char *email, timestamp_t timestamp,
+				  int tz, const char *message, void *cb_data)
+{
+	struct read_ref_at_cb *cb = cb_data;
+
+	set_read_ref_cutoffs(cb, timestamp, tz, message);
+	oidcpy(cb->oid, noid);
+	/* We just want the first entry */
+	return 1;
 }
 
 static int read_ref_at_ent_oldest(struct object_id *ooid, struct object_id *noid,
@@ -1022,14 +955,7 @@ static int read_ref_at_ent_oldest(struct object_id *ooid, struct object_id *noid
 {
 	struct read_ref_at_cb *cb = cb_data;
 
-	if (cb->msg)
-		*cb->msg = xstrdup(message);
-	if (cb->cutoff_time)
-		*cb->cutoff_time = timestamp;
-	if (cb->cutoff_tz)
-		*cb->cutoff_tz = tz;
-	if (cb->cutoff_cnt)
-		*cb->cutoff_cnt = cb->reccnt;
+	set_read_ref_cutoffs(cb, timestamp, tz, message);
 	oidcpy(cb->oid, ooid);
 	if (is_null_oid(cb->oid))
 		oidcpy(cb->oid, noid);
@@ -1054,6 +980,11 @@ int read_ref_at(struct ref_store *refs, const char *refname,
 	cb.cutoff_cnt = cutoff_cnt;
 	cb.oid = oid;
 
+	if (cb.cnt == 0) {
+		refs_for_each_reflog_ent_reverse(refs, refname, read_ref_at_ent_newest, &cb);
+		return 0;
+	}
+
 	refs_for_each_reflog_ent_reverse(refs, refname, read_ref_at_ent, &cb);
 
 	if (!cb.reccnt) {
@@ -1076,7 +1007,7 @@ struct ref_transaction *ref_store_transaction_begin(struct ref_store *refs,
 	struct ref_transaction *tr;
 	assert(err);
 
-	tr = xcalloc(1, sizeof(struct ref_transaction));
+	CALLOC_ARRAY(tr, 1);
 	tr->ref_store = refs;
 	return tr;
 }
@@ -1136,7 +1067,7 @@ struct ref_update *ref_transaction_add_update(
 		oidcpy(&update->new_oid, new_oid);
 	if (flags & REF_HAVE_OLD)
 		oidcpy(&update->old_oid, old_oid);
-	update->msg = xstrdup_or_null(msg);
+	update->msg = normalize_reflog_message(msg);
 	return update;
 }
 
@@ -1176,7 +1107,7 @@ int ref_transaction_create(struct ref_transaction *transaction,
 	if (!new_oid || is_null_oid(new_oid))
 		BUG("create called without valid new_oid");
 	return ref_transaction_update(transaction, refname, new_oid,
-				      &null_oid, flags, msg, err);
+				      null_oid(), flags, msg, err);
 }
 
 int ref_transaction_delete(struct ref_transaction *transaction,
@@ -1188,7 +1119,7 @@ int ref_transaction_delete(struct ref_transaction *transaction,
 	if (old_oid && is_null_oid(old_oid))
 		BUG("delete called with old_oid set to zeros");
 	return ref_transaction_update(transaction, refname,
-				      &null_oid, old_oid,
+				      null_oid(), old_oid,
 				      flags, msg, err);
 }
 
@@ -1214,18 +1145,13 @@ int refs_update_ref(struct ref_store *refs, const char *msg,
 	struct strbuf err = STRBUF_INIT;
 	int ret = 0;
 
-	if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
-		assert(refs == get_main_ref_store(the_repository));
-		ret = write_pseudoref(refname, new_oid, old_oid, &err);
-	} else {
-		t = ref_store_transaction_begin(refs, &err);
-		if (!t ||
-		    ref_transaction_update(t, refname, new_oid, old_oid,
-					   flags, msg, &err) ||
-		    ref_transaction_commit(t, &err)) {
-			ret = 1;
-			ref_transaction_free(t);
-		}
+	t = ref_store_transaction_begin(refs, &err);
+	if (!t ||
+	    ref_transaction_update(t, refname, new_oid, old_oid, flags, msg,
+				   &err) ||
+	    ref_transaction_commit(t, &err)) {
+		ret = 1;
+		ref_transaction_free(t);
 	}
 	if (ret) {
 		const char *str = _("update_ref failed for ref '%s': %s");
@@ -1380,7 +1306,7 @@ int parse_hide_refs_config(const char *var, const char *value, const char *secti
 		while (len && ref[len - 1] == '/')
 			ref[--len] = '\0';
 		if (!hide_refs) {
-			hide_refs = xcalloc(1, sizeof(*hide_refs));
+			CALLOC_ARRAY(hide_refs, 1);
 			hide_refs->strdup_strings = 1;
 		}
 		string_list_append(hide_refs, ref);
@@ -1638,11 +1564,124 @@ int for_each_rawref(each_ref_fn fn, void *cb_data)
 	return refs_for_each_rawref(get_main_ref_store(the_repository), fn, cb_data);
 }
 
+static int qsort_strcmp(const void *va, const void *vb)
+{
+	const char *a = *(const char **)va;
+	const char *b = *(const char **)vb;
+
+	return strcmp(a, b);
+}
+
+static void find_longest_prefixes_1(struct string_list *out,
+				  struct strbuf *prefix,
+				  const char **patterns, size_t nr)
+{
+	size_t i;
+
+	for (i = 0; i < nr; i++) {
+		char c = patterns[i][prefix->len];
+		if (!c || is_glob_special(c)) {
+			string_list_append(out, prefix->buf);
+			return;
+		}
+	}
+
+	i = 0;
+	while (i < nr) {
+		size_t end;
+
+		/*
+		* Set "end" to the index of the element _after_ the last one
+		* in our group.
+		*/
+		for (end = i + 1; end < nr; end++) {
+			if (patterns[i][prefix->len] != patterns[end][prefix->len])
+				break;
+		}
+
+		strbuf_addch(prefix, patterns[i][prefix->len]);
+		find_longest_prefixes_1(out, prefix, patterns + i, end - i);
+		strbuf_setlen(prefix, prefix->len - 1);
+
+		i = end;
+	}
+}
+
+static void find_longest_prefixes(struct string_list *out,
+				  const char **patterns)
+{
+	struct strvec sorted = STRVEC_INIT;
+	struct strbuf prefix = STRBUF_INIT;
+
+	strvec_pushv(&sorted, patterns);
+	QSORT(sorted.v, sorted.nr, qsort_strcmp);
+
+	find_longest_prefixes_1(out, &prefix, sorted.v, sorted.nr);
+
+	strvec_clear(&sorted);
+	strbuf_release(&prefix);
+}
+
+int for_each_fullref_in_prefixes(const char *namespace,
+				 const char **patterns,
+				 each_ref_fn fn, void *cb_data,
+				 unsigned int broken)
+{
+	struct string_list prefixes = STRING_LIST_INIT_DUP;
+	struct string_list_item *prefix;
+	struct strbuf buf = STRBUF_INIT;
+	int ret = 0, namespace_len;
+
+	find_longest_prefixes(&prefixes, patterns);
+
+	if (namespace)
+		strbuf_addstr(&buf, namespace);
+	namespace_len = buf.len;
+
+	for_each_string_list_item(prefix, &prefixes) {
+		strbuf_addstr(&buf, prefix->string);
+		ret = for_each_fullref_in(buf.buf, fn, cb_data, broken);
+		if (ret)
+			break;
+		strbuf_setlen(&buf, namespace_len);
+	}
+
+	string_list_clear(&prefixes, 0);
+	strbuf_release(&buf);
+	return ret;
+}
+
+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 full_path = STRBUF_INIT;
+	struct strbuf content = STRBUF_INIT;
+	int result = -1;
+	strbuf_addf(&full_path, "%s/%s", ref_store->gitdir, refname);
+
+	if (strbuf_read_file(&content, full_path.buf, 0) < 0)
+		goto done;
+
+	result = parse_loose_ref_contents(content.buf, oid, referent, type);
+
+done:
+	strbuf_release(&full_path);
+	strbuf_release(&content);
+	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)
 {
-	return ref_store->be->read_raw_ref(ref_store, refname, oid, referent, type);
+	if (!strcmp(refname, "FETCH_HEAD") || !strcmp(refname, "MERGE_HEAD")) {
+		return refs_read_special_head(ref_store, refname, oid, referent,
+					      type);
+	}
+
+	return ref_store->be->read_raw_ref(ref_store, refname, oid, referent,
+					   type);
 }
 
 /* This function needs to return a meaningful errno on failure */
@@ -1852,14 +1891,15 @@ static struct ref_store *ref_store_init(const char *gitdir,
 
 struct ref_store *get_main_ref_store(struct repository *r)
 {
-	if (r->refs)
-		return r->refs;
+	if (r->refs_private)
+		return r->refs_private;
 
 	if (!r->gitdir)
 		BUG("attempting to get main_ref_store outside of repository");
 
-	r->refs = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS);
-	return r->refs;
+	r->refs_private = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS);
+	r->refs_private = maybe_debug_wrap_ref_store(r->gitdir, r->refs_private);
+	return r->refs_private;
 }
 
 /*
@@ -1963,31 +2003,14 @@ int refs_pack_refs(struct ref_store *refs, unsigned int flags)
 	return refs->be->pack_refs(refs, flags);
 }
 
-int refs_peel_ref(struct ref_store *refs, const char *refname,
-		  struct object_id *oid)
+int peel_iterated_oid(const struct object_id *base, struct object_id *peeled)
 {
-	int flag;
-	struct object_id base;
-
-	if (current_ref_iter && current_ref_iter->refname == refname) {
-		struct object_id peeled;
-
-		if (ref_iterator_peel(current_ref_iter, &peeled))
-			return -1;
-		oidcpy(oid, &peeled);
-		return 0;
-	}
+	if (current_ref_iter &&
+	    (current_ref_iter->oid == base ||
+	     oideq(current_ref_iter->oid, base)))
+		return ref_iterator_peel(current_ref_iter, peeled);
 
-	if (refs_read_ref_full(refs, refname,
-			       RESOLVE_REF_READING, &base, &flag))
-		return -1;
-
-	return peel_object(&base, oid);
-}
-
-int peel_ref(const char *refname, struct object_id *oid)
-{
-	return refs_peel_ref(get_main_ref_store(the_repository), refname, oid);
+	return peel_object(base, peeled) ? -1 : 0;
 }
 
 int refs_create_symref(struct ref_store *refs,
@@ -1995,9 +2018,14 @@ int refs_create_symref(struct ref_store *refs,
 		       const char *refs_heads_master,
 		       const char *logmsg)
 {
-	return refs->be->create_symref(refs, ref_target,
-				       refs_heads_master,
-				       logmsg);
+	char *msg;
+	int retval;
+
+	msg = normalize_reflog_message(logmsg);
+	retval = refs->be->create_symref(refs, ref_target, refs_heads_master,
+					 msg);
+	free(msg);
+	return retval;
 }
 
 int create_symref(const char *ref_target, const char *refs_heads_master,
@@ -2030,10 +2058,58 @@ int ref_update_reject_duplicates(struct string_list *refnames,
 	return 0;
 }
 
+static int run_transaction_hook(struct ref_transaction *transaction,
+				const char *state)
+{
+	struct child_process proc = CHILD_PROCESS_INIT;
+	struct strbuf buf = STRBUF_INIT;
+	const char *hook;
+	int ret = 0, i;
+
+	hook = find_hook("reference-transaction");
+	if (!hook)
+		return ret;
+
+	strvec_pushl(&proc.args, hook, state, NULL);
+	proc.in = -1;
+	proc.stdout_to_stderr = 1;
+	proc.trace2_hook_name = "reference-transaction";
+
+	ret = start_command(&proc);
+	if (ret)
+		return ret;
+
+	sigchain_push(SIGPIPE, SIG_IGN);
+
+	for (i = 0; i < transaction->nr; i++) {
+		struct ref_update *update = transaction->updates[i];
+
+		strbuf_reset(&buf);
+		strbuf_addf(&buf, "%s %s %s\n",
+			    oid_to_hex(&update->old_oid),
+			    oid_to_hex(&update->new_oid),
+			    update->refname);
+
+		if (write_in_full(proc.in, buf.buf, buf.len) < 0) {
+			if (errno != EPIPE)
+				ret = -1;
+			break;
+		}
+	}
+
+	close(proc.in);
+	sigchain_pop(SIGPIPE);
+	strbuf_release(&buf);
+
+	ret |= finish_command(&proc);
+	return ret;
+}
+
 int ref_transaction_prepare(struct ref_transaction *transaction,
 			    struct strbuf *err)
 {
 	struct ref_store *refs = transaction->ref_store;
+	int ret;
 
 	switch (transaction->state) {
 	case REF_TRANSACTION_OPEN:
@@ -2056,7 +2132,17 @@ int ref_transaction_prepare(struct ref_transaction *transaction,
 		return -1;
 	}
 
-	return refs->be->transaction_prepare(refs, transaction, err);
+	ret = refs->be->transaction_prepare(refs, transaction, err);
+	if (ret)
+		return ret;
+
+	ret = run_transaction_hook(transaction, "prepared");
+	if (ret) {
+		ref_transaction_abort(transaction, err);
+		die(_("ref updates aborted by hook"));
+	}
+
+	return 0;
 }
 
 int ref_transaction_abort(struct ref_transaction *transaction,
@@ -2080,6 +2166,8 @@ int ref_transaction_abort(struct ref_transaction *transaction,
 		break;
 	}
 
+	run_transaction_hook(transaction, "aborted");
+
 	ref_transaction_free(transaction);
 	return ret;
 }
@@ -2108,7 +2196,10 @@ int ref_transaction_commit(struct ref_transaction *transaction,
 		break;
 	}
 
-	return refs->be->transaction_finish(refs, transaction, err);
+	ret = refs->be->transaction_finish(refs, transaction, err);
+	if (!ret)
+		run_transaction_hook(transaction, "committed");
+	return ret;
 }
 
 int refs_verify_refname_available(struct ref_store *refs,
@@ -2312,10 +2403,16 @@ int initial_ref_transaction_commit(struct ref_transaction *transaction,
 	return refs->be->initial_transaction_commit(refs, transaction, err);
 }
 
-int refs_delete_refs(struct ref_store *refs, const char *msg,
+int refs_delete_refs(struct ref_store *refs, const char *logmsg,
 		     struct string_list *refnames, unsigned int flags)
 {
-	return refs->be->delete_refs(refs, msg, refnames, flags);
+	char *msg;
+	int retval;
+
+	msg = normalize_reflog_message(logmsg);
+	retval = refs->be->delete_refs(refs, msg, refnames, flags);
+	free(msg);
+	return retval;
 }
 
 int delete_refs(const char *msg, struct string_list *refnames,
@@ -2327,7 +2424,13 @@ int delete_refs(const char *msg, struct string_list *refnames,
 int refs_rename_ref(struct ref_store *refs, const char *oldref,
 		    const char *newref, const char *logmsg)
 {
-	return refs->be->rename_ref(refs, oldref, newref, logmsg);
+	char *msg;
+	int retval;
+
+	msg = normalize_reflog_message(logmsg);
+	retval = refs->be->rename_ref(refs, oldref, newref, msg);
+	free(msg);
+	return retval;
 }
 
 int rename_ref(const char *oldref, const char *newref, const char *logmsg)
@@ -2338,7 +2441,13 @@ int rename_ref(const char *oldref, const char *newref, const char *logmsg)
 int refs_copy_existing_ref(struct ref_store *refs, const char *oldref,
 		    const char *newref, const char *logmsg)
 {
-	return refs->be->copy_ref(refs, oldref, newref, logmsg);
+	char *msg;
+	int retval;
+
+	msg = normalize_reflog_message(logmsg);
+	retval = refs->be->copy_ref(refs, oldref, newref, msg);
+	free(msg);
+	return retval;
 }
 
 int copy_existing_ref(const char *oldref, const char *newref, const char *logmsg)
diff --git a/refs.h b/refs.h
index 730d05ad91..48970dfc7e 100644
--- a/refs.h
+++ b/refs.h
@@ -1,6 +1,8 @@
 #ifndef REFS_H
 #define REFS_H
 
+#include "cache.h"
+
 struct object_id;
 struct ref_store;
 struct repository;
@@ -105,6 +107,8 @@ int refs_verify_refname_available(struct ref_store *refs,
 				  const struct string_list *skip,
 				  struct strbuf *err);
 
+int refs_ref_exists(struct ref_store *refs, const char *refname);
+
 int ref_exists(const char *refname);
 
 int should_autocreate_reflog(const char *refname);
@@ -114,16 +118,16 @@ int is_branch(const char *refname);
 int refs_init_db(struct strbuf *err);
 
 /*
- * If refname is a non-symbolic reference that refers to a tag object,
- * and the tag can be (recursively) dereferenced to a non-tag object,
- * store the object ID of the referred-to object to oid and return 0.
- * If any of these conditions are not met, return a non-zero value.
- * Symbolic references are considered unpeelable, even if they
- * ultimately resolve to a peelable tag.
+ * Return the peeled value of the oid currently being iterated via
+ * for_each_ref(), etc. This is equivalent to calling:
+ *
+ *   peel_object(oid, &peeled);
+ *
+ * with the "oid" value given to the each_ref_fn callback, except
+ * that some ref storage may be able to answer the query without
+ * actually loading the object in memory.
  */
-int refs_peel_ref(struct ref_store *refs, const char *refname,
-		  struct object_id *oid);
-int peel_ref(const char *refname, struct object_id *oid);
+int peel_iterated_oid(const struct object_id *base, struct object_id *peeled);
 
 /**
  * Resolve refname in the nested "gitlink" repository in the specified
@@ -145,16 +149,31 @@ int refname_match(const char *abbrev_name, const char *full_name);
  * Given a 'prefix' expand it by the rules in 'ref_rev_parse_rules' and add
  * the results to 'prefixes'
  */
-struct argv_array;
-void expand_ref_prefix(struct argv_array *prefixes, const char *prefix);
+struct strvec;
+void expand_ref_prefix(struct strvec *prefixes, const char *prefix);
 
 int expand_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref);
-int repo_dwim_ref(struct repository *r, const char *str, int len, struct object_id *oid, char **ref);
+int repo_dwim_ref(struct repository *r, const char *str, int len,
+		  struct object_id *oid, char **ref, int nonfatal_dangling_mark);
 int repo_dwim_log(struct repository *r, const char *str, int len, struct object_id *oid, char **ref);
-int dwim_ref(const char *str, int len, struct object_id *oid, char **ref);
+static inline int dwim_ref(const char *str, int len, struct object_id *oid,
+			   char **ref, int nonfatal_dangling_mark)
+{
+	return repo_dwim_ref(the_repository, str, len, oid, ref,
+			     nonfatal_dangling_mark);
+}
 int dwim_log(const char *str, int len, struct object_id *oid, char **ref);
 
 /*
+ * Retrieves the default branch name for newly-initialized repositories.
+ *
+ * The return value of `repo_default_branch_name()` is an allocated string. The
+ * return value of `git_default_branch_name()` is a singleton.
+ */
+const char *git_default_branch_name(int quiet);
+char *repo_default_branch_name(struct repository *r, int quiet);
+
+/*
  * A ref_transaction represents a collection of reference updates that
  * should succeed or fail together.
  *
@@ -310,19 +329,44 @@ int refs_for_each_branch_ref(struct ref_store *refs,
 int refs_for_each_remote_ref(struct ref_store *refs,
 			     each_ref_fn fn, void *cb_data);
 
+/* just iterates the head ref. */
 int head_ref(each_ref_fn fn, void *cb_data);
+
+/* iterates all refs. */
 int for_each_ref(each_ref_fn fn, void *cb_data);
+
+/**
+ * iterates all refs which have a defined prefix and strips that prefix from
+ * the passed variable refname.
+ */
 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);
+
+/**
+ * iterate all refs in "patterns" by partitioning patterns into disjoint sets
+ * and iterating the longest-common prefix of each set.
+ *
+ * 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);
+/**
+ * iterate refs from the respective area.
+ */
 int for_each_tag_ref(each_ref_fn fn, void *cb_data);
 int for_each_branch_ref(each_ref_fn fn, void *cb_data);
 int for_each_remote_ref(each_ref_fn fn, void *cb_data);
 int for_each_replace_ref(struct repository *r, each_repo_ref_fn fn, void *cb_data);
+
+/* iterates all refs that match the specified glob pattern. */
 int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data);
+
 int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
 			 const char *prefix, void *cb_data);
 
@@ -345,18 +389,6 @@ int for_each_rawref(each_ref_fn fn, void *cb_data);
 void normalize_glob_ref(struct string_list_item *item, const char *prefix,
 			const char *pattern);
 
-/*
- * Returns 0 if refname matches any of the exclude_patterns, or if it doesn't
- * match any of the include_patterns. Returns 1 otherwise.
- *
- * If pattern list is NULL or empty, matching against that list is skipped.
- * This has the effect of matching everything by default, unless the user
- * specifies rules otherwise.
- */
-int ref_filter_match(const char *refname,
-		     const struct string_list *include_patterns,
-		     const struct string_list *exclude_patterns);
-
 static inline const char *has_glob_specials(const char *pattern)
 {
 	return strpbrk(pattern, "?*[");
@@ -428,19 +460,35 @@ int delete_refs(const char *msg, struct string_list *refnames,
 int refs_delete_reflog(struct ref_store *refs, const char *refname);
 int delete_reflog(const char *refname);
 
-/* iterate over reflog entries */
+/*
+ * Callback to process a reflog entry found by the iteration functions (see
+ * below)
+ */
 typedef int each_reflog_ent_fn(
 		struct object_id *old_oid, struct object_id *new_oid,
 		const char *committer, timestamp_t timestamp,
 		int tz, const char *msg, void *cb_data);
 
+/* Iterate over reflog entries in the log for `refname`. */
+
+/* oldest entry first */
 int refs_for_each_reflog_ent(struct ref_store *refs, const char *refname,
 			     each_reflog_ent_fn fn, void *cb_data);
+
+/* youngest entry first */
 int refs_for_each_reflog_ent_reverse(struct ref_store *refs,
 				     const char *refname,
 				     each_reflog_ent_fn fn,
 				     void *cb_data);
+
+/*
+ * Iterate over reflog entries in the log for `refname` in the main ref store.
+ */
+
+/* oldest entry first */
 int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data);
+
+/* youngest entry first */
 int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data);
 
 /*
@@ -791,6 +839,41 @@ int reflog_expire(const char *refname, const struct object_id *oid,
 int ref_storage_backend_exists(const char *name);
 
 struct ref_store *get_main_ref_store(struct repository *r);
+
+/**
+ * Submodules
+ * ----------
+ *
+ * If you want to iterate the refs of a submodule you first need to add the
+ * submodules object database. You can do this by a code-snippet like
+ * this:
+ *
+ * 	const char *path = "path/to/submodule"
+ * 	if (add_submodule_odb(path))
+ * 		die("Error submodule '%s' not populated.", path);
+ *
+ * `add_submodule_odb()` will return zero on success. If you
+ * do not do this you will get an error for each ref that it does not point
+ * to a valid object.
+ *
+ * Note: As a side-effect of this you cannot safely assume that all
+ * objects you lookup are available in superproject. All submodule objects
+ * will be available the same way as the superprojects objects.
+ *
+ * Example:
+ * --------
+ *
+ * ----
+ * static int handle_remote_ref(const char *refname,
+ * 		const unsigned char *sha1, int flags, void *cb_data)
+ * {
+ * 	struct strbuf *output = cb_data;
+ * 	strbuf_addf(output, "%s\n", refname);
+ * 	return 0;
+ * }
+ *
+ */
+
 /*
  * Return the ref_store instance for the specified submodule. For the
  * main repository, use submodule==NULL; such a call cannot fail. For
diff --git a/refs/debug.c b/refs/debug.c
new file mode 100644
index 0000000000..1a7a9e11cf
--- /dev/null
+++ b/refs/debug.c
@@ -0,0 +1,443 @@
+
+#include "refs-internal.h"
+#include "trace.h"
+
+static struct trace_key trace_refs = TRACE_KEY_INIT(REFS);
+
+struct debug_ref_store {
+	struct ref_store base;
+	struct ref_store *refs;
+};
+
+extern struct ref_storage_be refs_be_debug;
+
+struct ref_store *maybe_debug_wrap_ref_store(const char *gitdir, struct ref_store *store)
+{
+	struct debug_ref_store *res;
+	struct ref_storage_be *be_copy;
+
+	if (!trace_want(&trace_refs)) {
+		return store;
+	}
+	res = xmalloc(sizeof(struct debug_ref_store));
+	be_copy = xmalloc(sizeof(*be_copy));
+	*be_copy = refs_be_debug;
+	/* we never deallocate backends, so safe to copy the pointer. */
+	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);
+	return (struct ref_store *)res;
+}
+
+static int debug_init_db(struct ref_store *refs, struct strbuf *err)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)refs;
+	int res = drefs->refs->be->init_db(drefs->refs, err);
+	trace_printf_key(&trace_refs, "init_db: %d\n", res);
+	return res;
+}
+
+static int debug_transaction_prepare(struct ref_store *refs,
+				     struct ref_transaction *transaction,
+				     struct strbuf *err)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)refs;
+	int res;
+	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);
+	return res;
+}
+
+static void print_update(int i, const char *refname,
+			 const struct object_id *old_oid,
+			 const struct object_id *new_oid, unsigned int flags,
+			 unsigned int type, const char *msg)
+{
+	char o[GIT_MAX_HEXSZ + 1] = "null";
+	char n[GIT_MAX_HEXSZ + 1] = "null";
+	if (old_oid)
+		oid_to_hex_r(o, old_oid);
+	if (new_oid)
+		oid_to_hex_r(n, new_oid);
+
+	type &= 0xf; /* see refs.h REF_* */
+	flags &= REF_HAVE_NEW | REF_HAVE_OLD | REF_NO_DEREF |
+		REF_FORCE_CREATE_REFLOG;
+	trace_printf_key(&trace_refs, "%d: %s %s -> %s (F=0x%x, T=0x%x) \"%s\"\n", i, refname,
+		o, n, flags, type, msg);
+}
+
+static void print_transaction(struct ref_transaction *transaction)
+{
+	int i;
+	trace_printf_key(&trace_refs, "transaction {\n");
+	for (i = 0; i < transaction->nr; i++) {
+		struct ref_update *u = transaction->updates[i];
+		print_update(i, u->refname, &u->old_oid, &u->new_oid, u->flags,
+			     u->type, u->msg);
+	}
+	trace_printf_key(&trace_refs, "}\n");
+}
+
+static int debug_transaction_finish(struct ref_store *refs,
+				    struct ref_transaction *transaction,
+				    struct strbuf *err)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)refs;
+	int res;
+	transaction->ref_store = drefs->refs;
+	res = drefs->refs->be->transaction_finish(drefs->refs, transaction,
+						  err);
+	print_transaction(transaction);
+	trace_printf_key(&trace_refs, "finish: %d\n", res);
+	return res;
+}
+
+static int debug_transaction_abort(struct ref_store *refs,
+				   struct ref_transaction *transaction,
+				   struct strbuf *err)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)refs;
+	int res;
+	transaction->ref_store = drefs->refs;
+	res = drefs->refs->be->transaction_abort(drefs->refs, transaction, err);
+	return res;
+}
+
+static int debug_initial_transaction_commit(struct ref_store *refs,
+					    struct ref_transaction *transaction,
+					    struct strbuf *err)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)refs;
+	int res;
+	transaction->ref_store = drefs->refs;
+	res = drefs->refs->be->initial_transaction_commit(drefs->refs,
+							  transaction, err);
+	return res;
+}
+
+static int debug_pack_refs(struct ref_store *ref_store, unsigned int flags)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	int res = drefs->refs->be->pack_refs(drefs->refs, flags);
+	trace_printf_key(&trace_refs, "pack_refs: %d\n", res);
+	return res;
+}
+
+static int debug_create_symref(struct ref_store *ref_store,
+			       const char *ref_name, const char *target,
+			       const char *logmsg)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	int res = drefs->refs->be->create_symref(drefs->refs, ref_name, target,
+						 logmsg);
+	trace_printf_key(&trace_refs, "create_symref: %s -> %s \"%s\": %d\n", ref_name,
+		target, logmsg, res);
+	return res;
+}
+
+static int debug_delete_refs(struct ref_store *ref_store, const char *msg,
+			     struct string_list *refnames, unsigned int flags)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	int res =
+		drefs->refs->be->delete_refs(drefs->refs, msg, refnames, flags);
+	int i;
+	trace_printf_key(&trace_refs, "delete_refs {\n");
+	for (i = 0; i < refnames->nr; i++)
+		trace_printf_key(&trace_refs, "%s\n", refnames->items[i].string);
+	trace_printf_key(&trace_refs, "}: %d\n", res);
+	return res;
+}
+
+static int debug_rename_ref(struct ref_store *ref_store, const char *oldref,
+			    const char *newref, const char *logmsg)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	int res = drefs->refs->be->rename_ref(drefs->refs, oldref, newref,
+					      logmsg);
+	trace_printf_key(&trace_refs, "rename_ref: %s -> %s \"%s\": %d\n", oldref, newref,
+		logmsg, res);
+	return res;
+}
+
+static int debug_copy_ref(struct ref_store *ref_store, const char *oldref,
+			  const char *newref, const char *logmsg)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	int res =
+		drefs->refs->be->copy_ref(drefs->refs, oldref, newref, logmsg);
+	trace_printf_key(&trace_refs, "copy_ref: %s -> %s \"%s\": %d\n", oldref, newref,
+		logmsg, res);
+	return res;
+}
+
+struct debug_ref_iterator {
+	struct ref_iterator base;
+	struct ref_iterator *iter;
+};
+
+static int debug_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+	struct debug_ref_iterator *diter =
+		(struct debug_ref_iterator *)ref_iterator;
+	int res = diter->iter->vtable->advance(diter->iter);
+	if (res)
+		trace_printf_key(&trace_refs, "iterator_advance: (%d)\n", res);
+	else
+		trace_printf_key(&trace_refs, "iterator_advance: %s (0)\n",
+			diter->iter->refname);
+
+	diter->base.ordered = diter->iter->ordered;
+	diter->base.refname = diter->iter->refname;
+	diter->base.oid = diter->iter->oid;
+	diter->base.flags = diter->iter->flags;
+	return res;
+}
+
+static int debug_ref_iterator_peel(struct ref_iterator *ref_iterator,
+				   struct object_id *peeled)
+{
+	struct debug_ref_iterator *diter =
+		(struct debug_ref_iterator *)ref_iterator;
+	int res = diter->iter->vtable->peel(diter->iter, peeled);
+	trace_printf_key(&trace_refs, "iterator_peel: %s: %d\n", diter->iter->refname, res);
+	return res;
+}
+
+static int debug_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+	struct debug_ref_iterator *diter =
+		(struct debug_ref_iterator *)ref_iterator;
+	int res = diter->iter->vtable->abort(diter->iter);
+	trace_printf_key(&trace_refs, "iterator_abort: %d\n", res);
+	return res;
+}
+
+static struct ref_iterator_vtable debug_ref_iterator_vtable = {
+	debug_ref_iterator_advance, debug_ref_iterator_peel,
+	debug_ref_iterator_abort
+};
+
+static struct ref_iterator *
+debug_ref_iterator_begin(struct ref_store *ref_store, const char *prefix,
+			 unsigned int flags)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	struct ref_iterator *res =
+		drefs->refs->be->iterator_begin(drefs->refs, prefix, flags);
+	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);
+	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)
+{
+	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);
+
+	if (res == 0) {
+		trace_printf_key(&trace_refs, "read_raw_ref: %s: %s (=> %s) type %x: %d\n",
+			refname, oid_to_hex(oid), referent->buf, *type, res);
+	} else {
+		trace_printf_key(&trace_refs,
+				 "read_raw_ref: %s: %d (errno %d)\n", refname,
+				 res, errno);
+	}
+	return res;
+}
+
+static struct ref_iterator *
+debug_reflog_iterator_begin(struct ref_store *ref_store)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	struct ref_iterator *res =
+		drefs->refs->be->reflog_iterator_begin(drefs->refs);
+	trace_printf_key(&trace_refs, "for_each_reflog_iterator_begin\n");
+	return res;
+}
+
+struct debug_reflog {
+	const char *refname;
+	each_reflog_ent_fn *fn;
+	void *cb_data;
+};
+
+static int debug_print_reflog_ent(struct object_id *old_oid,
+				  struct object_id *new_oid,
+				  const char *committer, timestamp_t timestamp,
+				  int tz, const char *msg, void *cb_data)
+{
+	struct debug_reflog *dbg = (struct debug_reflog *)cb_data;
+	int ret;
+	char o[GIT_MAX_HEXSZ + 1] = "null";
+	char n[GIT_MAX_HEXSZ + 1] = "null";
+	if (old_oid)
+		oid_to_hex_r(o, old_oid);
+	if (new_oid)
+		oid_to_hex_r(n, new_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);
+	return ret;
+}
+
+static int debug_for_each_reflog_ent(struct ref_store *ref_store,
+				     const char *refname, each_reflog_ent_fn fn,
+				     void *cb_data)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	struct debug_reflog dbg = {
+		.refname = refname,
+		.fn = fn,
+		.cb_data = cb_data,
+	};
+
+	int res = drefs->refs->be->for_each_reflog_ent(
+		drefs->refs, refname, &debug_print_reflog_ent, &dbg);
+	trace_printf_key(&trace_refs, "for_each_reflog: %s: %d\n", refname, res);
+	return res;
+}
+
+static int debug_for_each_reflog_ent_reverse(struct ref_store *ref_store,
+					     const char *refname,
+					     each_reflog_ent_fn fn,
+					     void *cb_data)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	struct debug_reflog dbg = {
+		.refname = refname,
+		.fn = fn,
+		.cb_data = cb_data,
+	};
+	int res = drefs->refs->be->for_each_reflog_ent_reverse(
+		drefs->refs, refname, &debug_print_reflog_ent, &dbg);
+	trace_printf_key(&trace_refs, "for_each_reflog_reverse: %s: %d\n", refname, res);
+	return res;
+}
+
+static int debug_reflog_exists(struct ref_store *ref_store, const char *refname)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	int res = drefs->refs->be->reflog_exists(drefs->refs, refname);
+	trace_printf_key(&trace_refs, "reflog_exists: %s: %d\n", refname, res);
+	return res;
+}
+
+static int debug_create_reflog(struct ref_store *ref_store, const char *refname,
+			       int force_create, 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);
+	trace_printf_key(&trace_refs, "create_reflog: %s: %d\n", refname, res);
+	return res;
+}
+
+static int debug_delete_reflog(struct ref_store *ref_store, const char *refname)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	int res = drefs->refs->be->delete_reflog(drefs->refs, refname);
+	trace_printf_key(&trace_refs, "delete_reflog: %s: %d\n", refname, res);
+	return res;
+}
+
+struct debug_reflog_expiry_should_prune {
+	reflog_expiry_prepare_fn *prepare;
+	reflog_expiry_should_prune_fn *should_prune;
+	reflog_expiry_cleanup_fn *cleanup;
+	void *cb_data;
+};
+
+static void debug_reflog_expiry_prepare(const char *refname,
+				    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);
+	prune->prepare(refname, oid, prune->cb_data);
+}
+
+static int debug_reflog_expiry_should_prune_fn(struct object_id *ooid,
+					       struct object_id *noid,
+					       const char *email,
+					       timestamp_t timestamp, int tz,
+					       const char *message, void *cb_data) {
+	struct debug_reflog_expiry_should_prune *prune = cb_data;
+
+	int result = prune->should_prune(ooid, noid, email, timestamp, tz, message, prune->cb_data);
+	trace_printf_key(&trace_refs, "reflog_expire_should_prune: %s %ld: %d\n", message, (long int) timestamp, result);
+	return result;
+}
+
+static void debug_reflog_expiry_cleanup(void *cb_data)
+{
+	struct debug_reflog_expiry_should_prune *prune = cb_data;
+	prune->cleanup(prune->cb_data);
+}
+
+static int debug_reflog_expire(struct ref_store *ref_store, 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)
+{
+	struct debug_ref_store *drefs = (struct debug_ref_store *)ref_store;
+	struct debug_reflog_expiry_should_prune prune = {
+		.prepare = prepare_fn,
+		.cleanup = cleanup_fn,
+		.should_prune = should_prune_fn,
+		.cb_data = policy_cb_data,
+	};
+	int res = drefs->refs->be->reflog_expire(drefs->refs, refname, oid,
+						 flags, &debug_reflog_expiry_prepare,
+						 &debug_reflog_expiry_should_prune_fn,
+						 &debug_reflog_expiry_cleanup,
+						 &prune);
+	trace_printf_key(&trace_refs, "reflog_expire: %s: %d\n", refname, res);
+	return res;
+}
+
+struct ref_storage_be refs_be_debug = {
+	NULL,
+	"debug",
+	NULL,
+	debug_init_db,
+	debug_transaction_prepare,
+	debug_transaction_finish,
+	debug_transaction_abort,
+	debug_initial_transaction_commit,
+
+	debug_pack_refs,
+	debug_create_symref,
+	debug_delete_refs,
+	debug_rename_ref,
+	debug_copy_ref,
+
+	debug_ref_iterator_begin,
+	debug_read_raw_ref,
+
+	debug_reflog_iterator_begin,
+	debug_for_each_reflog_ent,
+	debug_for_each_reflog_ent_reverse,
+	debug_reflog_exists,
+	debug_create_reflog,
+	debug_delete_reflog,
+	debug_reflog_expire,
+};
diff --git a/refs/files-backend.c b/refs/files-backend.c
index d60767ab73..677b7e4cdd 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -39,23 +39,16 @@
 #define REF_NEEDS_COMMIT (1 << 6)
 
 /*
- * Used as a flag in ref_update::flags when we want to log a ref
- * update but not actually perform it.  This is used when a symbolic
- * ref update is split up.
- */
-#define REF_LOG_ONLY (1 << 7)
-
-/*
  * Used as a flag in ref_update::flags when the ref_update was via an
  * update to HEAD.
  */
 #define REF_UPDATE_VIA_HEAD (1 << 8)
 
 /*
- * Used as a flag in ref_update::flags when the loose reference has
- * been deleted.
+ * Used as a flag in ref_update::flags when a reference has been
+ * deleted and the ref's parent directories may need cleanup.
  */
-#define REF_DELETED_LOOSE (1 << 9)
+#define REF_DELETED_RMDIR (1 << 9)
 
 struct ref_lock {
 	char *ref_name;
@@ -67,7 +60,6 @@ struct files_ref_store {
 	struct ref_store base;
 	unsigned int store_flags;
 
-	char *gitdir;
 	char *gitcommondir;
 
 	struct ref_cache *loose;
@@ -94,18 +86,17 @@ static struct ref_store *files_ref_store_create(const char *gitdir,
 	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);
 	refs->store_flags = flags;
 
-	refs->gitdir = xstrdup(gitdir);
 	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);
 
-	chdir_notify_reparent("files-backend $GIT_DIR",
-			      &refs->gitdir);
+	chdir_notify_reparent("files-backend $GIT_DIR", &refs->base.gitdir);
 	chdir_notify_reparent("files-backend $GIT_COMMONDIR",
 			      &refs->gitcommondir);
 
@@ -176,7 +167,7 @@ static void files_reflog_path(struct files_ref_store *refs,
 	switch (ref_type(refname)) {
 	case REF_TYPE_PER_WORKTREE:
 	case REF_TYPE_PSEUDOREF:
-		strbuf_addf(sb, "%s/logs/%s", refs->gitdir, refname);
+		strbuf_addf(sb, "%s/logs/%s", refs->base.gitdir, refname);
 		break;
 	case REF_TYPE_OTHER_PSEUDOREF:
 	case REF_TYPE_MAIN_PSEUDOREF:
@@ -198,7 +189,7 @@ static void files_ref_path(struct files_ref_store *refs,
 	switch (ref_type(refname)) {
 	case REF_TYPE_PER_WORKTREE:
 	case REF_TYPE_PSEUDOREF:
-		strbuf_addf(sb, "%s/%s", refs->gitdir, refname);
+		strbuf_addf(sb, "%s/%s", refs->base.gitdir, refname);
 		break;
 	case REF_TYPE_MAIN_PSEUDOREF:
 		if (!skip_prefix(refname, "main-worktree/", &refname))
@@ -360,7 +351,6 @@ static int files_read_raw_ref(struct ref_store *ref_store,
 	struct strbuf sb_path = STRBUF_INIT;
 	const char *path;
 	const char *buf;
-	const char *p;
 	struct stat st;
 	int fd;
 	int ret = -1;
@@ -465,37 +455,41 @@ stat_ref:
 	close(fd);
 	strbuf_rtrim(&sb_contents);
 	buf = sb_contents.buf;
-	if (starts_with(buf, "ref:")) {
-		buf += 4;
+
+	ret = parse_loose_ref_contents(buf, oid, referent, type);
+
+out:
+	save_errno = errno;
+	strbuf_release(&sb_path);
+	strbuf_release(&sb_contents);
+	errno = save_errno;
+	return ret;
+}
+
+int parse_loose_ref_contents(const char *buf, struct object_id *oid,
+			     struct strbuf *referent, unsigned int *type)
+{
+	const char *p;
+	if (skip_prefix(buf, "ref:", &buf)) {
 		while (isspace(*buf))
 			buf++;
 
 		strbuf_reset(referent);
 		strbuf_addstr(referent, buf);
 		*type |= REF_ISSYMREF;
-		ret = 0;
-		goto out;
+		return 0;
 	}
 
 	/*
-	 * Please note that FETCH_HEAD has additional
-	 * data after the sha.
+	 * FETCH_HEAD has additional data after the sha.
 	 */
 	if (parse_oid_hex(buf, oid, &p) ||
 	    (*p != '\0' && !isspace(*p))) {
 		*type |= REF_ISBROKEN;
 		errno = EINVAL;
-		goto out;
+		return -1;
 	}
-
-	ret = 0;
-
-out:
-	save_errno = errno;
-	strbuf_release(&sb_path);
-	strbuf_release(&sb_contents);
-	errno = save_errno;
-	return ret;
+	return 0;
 }
 
 static void unlock_ref(struct ref_lock *lock)
@@ -555,7 +549,7 @@ static int lock_raw_ref(struct files_ref_store *refs,
 
 	/* First lock the file so it can't change out from under us. */
 
-	*lock_p = lock = xcalloc(1, sizeof(*lock));
+	*lock_p = CALLOC_ARRAY(lock, 1);
 
 	lock->ref_name = xstrdup(refname);
 	files_ref_path(refs, &ref_file, refname);
@@ -849,7 +843,7 @@ static struct ref_iterator *files_ref_iterator_begin(
 
 	overlay_iter = overlay_ref_iterator_begin(loose_iter, packed_iter);
 
-	iter = xcalloc(1, sizeof(*iter));
+	CALLOC_ARRAY(iter, 1);
 	ref_iterator = &iter->base;
 	base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable,
 			       overlay_iter->ordered);
@@ -936,7 +930,7 @@ static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
 	files_assert_main_repository(refs, "lock_ref_oid_basic");
 	assert(err);
 
-	lock = xcalloc(1, sizeof(struct ref_lock));
+	CALLOC_ARRAY(lock, 1);
 
 	if (mustexist)
 		resolve_flags |= RESOLVE_REF_READING;
@@ -1090,7 +1084,7 @@ static void prune_ref(struct files_ref_store *refs, struct ref_to_prune *r)
 	ref_transaction_add_update(
 			transaction, r->name,
 			REF_NO_DEREF | REF_HAVE_NEW | REF_HAVE_OLD | REF_IS_PRUNING,
-			&null_oid, &r->oid, NULL);
+			null_oid(), &r->oid, NULL);
 	if (ref_transaction_commit(transaction, &err))
 		goto cleanup;
 
@@ -1327,7 +1321,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 {
 	struct files_ref_store *refs =
 		files_downcast(ref_store, REF_STORE_WRITE, "rename_ref");
-	struct object_id oid, orig_oid;
+	struct object_id orig_oid;
 	int flag = 0, logmoved = 0;
 	struct ref_lock *lock;
 	struct stat loginfo;
@@ -1395,7 +1389,7 @@ static int files_copy_or_rename_ref(struct ref_store *ref_store,
 	 */
 	if (!copy && !refs_read_ref_full(&refs->base, newrefname,
 				RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
-				&oid, NULL) &&
+				NULL, NULL) &&
 	    refs_delete_ref(&refs->base, NULL, newrefname,
 			    NULL, REF_NO_DEREF)) {
 		if (errno == EISDIR) {
@@ -1629,8 +1623,10 @@ static int log_ref_write_fd(int fd, const struct object_id *old_oid,
 	int ret = 0;
 
 	strbuf_addf(&sb, "%s %s %s", oid_to_hex(old_oid), oid_to_hex(new_oid), committer);
-	if (msg && *msg)
-		copy_reflog_msg(&sb, msg);
+	if (msg && *msg) {
+		strbuf_addch(&sb, '\t');
+		strbuf_addstr(&sb, msg);
+	}
 	strbuf_addch(&sb, '\n');
 	if (write_in_full(fd, sb.buf, sb.len) < 0)
 		ret = -1;
@@ -1828,12 +1824,12 @@ static int create_symref_locked(struct files_ref_store *refs,
 
 	if (!fdopen_lock_file(&lock->lk, "w"))
 		return error("unable to fdopen %s: %s",
-			     lock->lk.tempfile->filename.buf, strerror(errno));
+			     get_lock_file_path(&lock->lk), strerror(errno));
 
 	update_symref_reflog(refs, lock, refname, target, logmsg);
 
 	/* no error check; commit_ref will check ferror */
-	fprintf(lock->lk.tempfile->fp, "ref: %s\n", target);
+	fprintf(get_lock_file_fp(&lock->lk), "ref: %s\n", target);
 	if (commit_ref(lock) < 0)
 		return error("unable to write symref for %s: %s", refname,
 			     strerror(errno));
@@ -2156,7 +2152,7 @@ static struct ref_iterator *reflog_iterator_begin(struct ref_store *ref_store,
 		return empty_ref_iterator_begin();
 	}
 
-	iter = xcalloc(1, sizeof(*iter));
+	CALLOC_ARRAY(iter, 1);
 	ref_iterator = &iter->base;
 
 	base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable, 0);
@@ -2198,12 +2194,11 @@ static struct ref_iterator *files_reflog_iterator_begin(struct ref_store *ref_st
 		files_downcast(ref_store, REF_STORE_READ,
 			       "reflog_iterator_begin");
 
-	if (!strcmp(refs->gitdir, refs->gitcommondir)) {
+	if (!strcmp(refs->base.gitdir, refs->gitcommondir)) {
 		return reflog_iterator_begin(ref_store, refs->gitcommondir);
 	} else {
 		return merge_ref_iterator_begin(
-			0,
-			reflog_iterator_begin(ref_store, refs->gitdir),
+			0, reflog_iterator_begin(ref_store, refs->base.gitdir),
 			reflog_iterator_begin(ref_store, refs->gitcommondir),
 			reflog_iterator_select, refs);
 	}
@@ -2566,16 +2561,18 @@ static void files_transaction_cleanup(struct files_ref_store *refs,
 		}
 	}
 
-	if (backend_data->packed_transaction &&
-	    ref_transaction_abort(backend_data->packed_transaction, &err)) {
-		error("error aborting transaction: %s", err.buf);
-		strbuf_release(&err);
-	}
+	if (backend_data) {
+		if (backend_data->packed_transaction &&
+		    ref_transaction_abort(backend_data->packed_transaction, &err)) {
+			error("error aborting transaction: %s", err.buf);
+			strbuf_release(&err);
+		}
 
-	if (backend_data->packed_refs_locked)
-		packed_refs_unlock(refs->packed_ref_store);
+		if (backend_data->packed_refs_locked)
+			packed_refs_unlock(refs->packed_ref_store);
 
-	free(backend_data);
+		free(backend_data);
+	}
 
 	transaction->state = REF_TRANSACTION_CLOSED;
 }
@@ -2600,7 +2597,7 @@ static int files_transaction_prepare(struct ref_store *ref_store,
 	if (!transaction->nr)
 		goto cleanup;
 
-	backend_data = xcalloc(1, sizeof(*backend_data));
+	CALLOC_ARRAY(backend_data, 1);
 	transaction->backend_data = backend_data;
 
 	/*
@@ -2855,6 +2852,7 @@ static int files_transaction_finish(struct ref_store *ref_store,
 
 		if (update->flags & REF_DELETING &&
 		    !(update->flags & REF_LOG_ONLY)) {
+			update->flags |= REF_DELETED_RMDIR;
 			if (!(update->type & REF_ISPACKED) ||
 			    update->type & REF_ISSYMREF) {
 				/* It is a loose reference. */
@@ -2864,7 +2862,6 @@ static int files_transaction_finish(struct ref_store *ref_store,
 					ret = TRANSACTION_GENERIC_ERROR;
 					goto cleanup;
 				}
-				update->flags |= REF_DELETED_LOOSE;
 			}
 		}
 	}
@@ -2877,9 +2874,9 @@ cleanup:
 	for (i = 0; i < transaction->nr; i++) {
 		struct ref_update *update = transaction->updates[i];
 
-		if (update->flags & REF_DELETED_LOOSE) {
+		if (update->flags & REF_DELETED_RMDIR) {
 			/*
-			 * The loose reference was deleted. Delete any
+			 * The reference was deleted. Delete any
 			 * empty parent directories. (Note that this
 			 * can only work because we have already
 			 * removed the lockfile.)
diff --git a/refs/iterator.c b/refs/iterator.c
index 629e00a122..a89d132d4f 100644
--- a/refs/iterator.c
+++ b/refs/iterator.c
@@ -393,7 +393,7 @@ struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
 	if (!*prefix && !trim)
 		return iter0; /* optimization: no need to wrap iterator */
 
-	iter = xcalloc(1, sizeof(*iter));
+	CALLOC_ARRAY(iter, 1);
 	ref_iterator = &iter->base;
 
 	base_ref_iterator_init(ref_iterator, &prefix_ref_iterator_vtable, iter0->ordered);
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
index 4458a0f69c..f8aa97d799 100644
--- a/refs/packed-backend.c
+++ b/refs/packed-backend.c
@@ -200,6 +200,7 @@ struct ref_store *packed_ref_store_create(const char *path,
 	struct ref_store *ref_store = (struct ref_store *)refs;
 
 	base_ref_store_init(ref_store, &refs_be_packed);
+	ref_store->gitdir = xstrdup(path);
 	refs->store_flags = store_flags;
 
 	refs->path = xstrdup(path);
@@ -888,7 +889,7 @@ static int packed_ref_iterator_peel(struct ref_iterator *ref_iterator,
 	} else if ((iter->base.flags & (REF_ISBROKEN | REF_ISSYMREF))) {
 		return -1;
 	} else {
-		return !!peel_object(&iter->oid, peeled);
+		return peel_object(&iter->oid, peeled) ? -1 : 0;
 	}
 }
 
@@ -940,7 +941,7 @@ static struct ref_iterator *packed_ref_iterator_begin(
 	if (start == snapshot->eof)
 		return empty_ref_iterator_begin();
 
-	iter = xcalloc(1, sizeof(*iter));
+	CALLOC_ARRAY(iter, 1);
 	ref_iterator = &iter->base;
 	base_ref_iterator_init(ref_iterator, &packed_ref_iterator_vtable, 1);
 
@@ -1423,8 +1424,8 @@ static int packed_transaction_prepare(struct ref_store *ref_store,
 	 * do so itself.
 	 */
 
-	data = xcalloc(1, sizeof(*data));
-	string_list_init(&data->updates, 0);
+	CALLOC_ARRAY(data, 1);
+	string_list_init_nodup(&data->updates);
 
 	transaction->backend_data = data;
 
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index b7052f72e2..49d732f6db 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -491,7 +491,7 @@ 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)
 {
-	return peel_object(ref_iterator->oid, peeled);
+	return peel_object(ref_iterator->oid, peeled) ? -1 : 0;
 }
 
 static int cache_ref_iterator_abort(struct ref_iterator *ref_iterator)
@@ -530,7 +530,7 @@ struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
 	if (prime_dir)
 		prime_ref_dir(dir, prefix);
 
-	iter = xcalloc(1, sizeof(*iter));
+	CALLOC_ARRAY(iter, 1);
 	ref_iterator = &iter->base;
 	base_ref_iterator_init(ref_iterator, &cache_ref_iterator_vtable, 1);
 	ALLOC_GROW(iter->levels, 10, iter->levels_alloc);
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index f2d8c0123a..3155708345 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -32,6 +32,13 @@ struct ref_transaction;
 #define REF_HAVE_OLD (1 << 3)
 
 /*
+ * Used as a flag in ref_update::flags when we want to log a ref
+ * update but not actually perform it.  This is used when a symbolic
+ * ref update is split up.
+ */
+#define REF_LOG_ONLY (1 << 7)
+
+/*
  * Return the length of time to retry acquiring a loose reference lock
  * before giving up, in milliseconds:
  */
@@ -96,12 +103,6 @@ enum peel_status {
  */
 enum peel_status peel_object(const struct object_id *name, struct object_id *oid);
 
-/*
- * Copy the reflog message msg to sb while cleaning up the whitespaces.
- * Especially, convert LF to space, because reflog file is one line per entry.
- */
-void copy_reflog_msg(struct strbuf *sb, const char *msg);
-
 /**
  * Information needed for a single ref update. Set new_oid to the new
  * value or to null_oid to delete the ref. To check the old value
@@ -262,7 +263,7 @@ int refs_rename_ref_available(struct ref_store *refs,
  * after calling ref_iterator_advance() again or calling
  * ref_iterator_abort(), you must make a copy. When the iteration has
  * been exhausted, ref_iterator_advance() releases any resources
- * assocated with the iteration, frees the ref_iterator object, and
+ * associated with the iteration, frees the ref_iterator object, and
  * returns ITER_DONE. If you want to abort the iteration early, call
  * ref_iterator_abort(), which also frees the ref_iterator object and
  * any associated resources. If there was an internal error advancing
@@ -347,9 +348,13 @@ 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. flags
- * can be DO_FOR_EACH_INCLUDE_BROKEN to include broken references in
- * the iteration. The output is ordered by refname.
+ * 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.
  */
 struct ref_iterator *refs_ref_iterator_begin(
 		struct ref_store *refs,
@@ -438,8 +443,19 @@ void base_ref_iterator_free(struct ref_iterator *iter);
 
 /* Virtual function declarations for ref_iterators: */
 
+/*
+ * 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.
+ */
 typedef int ref_iterator_advance_fn(struct ref_iterator *ref_iterator);
 
+/*
+ * Peels the current ref, returning 0 for success or -1 for failure.
+ */
 typedef int ref_iterator_peel_fn(struct ref_iterator *ref_iterator,
 				 struct object_id *peeled);
 
@@ -661,18 +677,32 @@ extern struct ref_storage_be refs_be_packed;
 /*
  * A representation of the reference store for the main repository or
  * a submodule. The ref_store instances for submodules are kept in a
- * linked list.
+ * hash map; see get_submodule_ref_store() for more info.
  */
 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: */
+	char *gitdir;
 };
 
 /*
+ * Parse contents of a loose ref file.
+ */
+int parse_loose_ref_contents(const char *buf, struct object_id *oid,
+			     struct strbuf *referent, unsigned int *type);
+
+/*
  * 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);
 
+/*
+ * Support GIT_TRACE_REFS by optionally wrapping the given ref_store instance.
+ */
+struct ref_store *maybe_debug_wrap_ref_store(const char *gitdir, struct ref_store *store);
+
 #endif /* REFS_REFS_INTERNAL_H */
diff --git a/refspec.c b/refspec.c
index 9a9bf21934..e3d852c0bf 100644
--- a/refspec.c
+++ b/refspec.c
@@ -1,5 +1,5 @@
 #include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "refs.h"
 #include "refspec.h"
 
@@ -8,6 +8,7 @@ static struct refspec_item s_tag_refspec = {
 	1,
 	0,
 	0,
+	0,
 	"refs/tags/*",
 	"refs/tags/*"
 };
@@ -32,10 +33,17 @@ static int parse_refspec(struct refspec_item *item, const char *refspec, int fet
 	if (*lhs == '+') {
 		item->force = 1;
 		lhs++;
+	} else if (*lhs == '^') {
+		item->negative = 1;
+		lhs++;
 	}
 
 	rhs = strrchr(lhs, ':');
 
+	/* negative refspecs only have one side */
+	if (item->negative && rhs)
+		return 0;
+
 	/*
 	 * Before going on, special case ":" (or "+:") as a refspec
 	 * for pushing matching refs.
@@ -55,7 +63,7 @@ static int parse_refspec(struct refspec_item *item, const char *refspec, int fet
 
 	llen = (rhs ? (rhs - lhs - 1) : strlen(lhs));
 	if (1 <= llen && memchr(lhs, '*', llen)) {
-		if ((rhs && !is_glob) || (!rhs && fetch))
+		if ((rhs && !is_glob) || (!rhs && !item->negative && fetch))
 			return 0;
 		is_glob = 1;
 	} else if (rhs && is_glob) {
@@ -63,9 +71,34 @@ static int parse_refspec(struct refspec_item *item, const char *refspec, int fet
 	}
 
 	item->pattern = is_glob;
-	item->src = xstrndup(lhs, llen);
+	if (llen == 1 && *lhs == '@')
+		item->src = xstrdup("HEAD");
+	else
+		item->src = xstrndup(lhs, llen);
 	flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0);
 
+	if (item->negative) {
+		struct object_id unused;
+
+		/*
+		 * Negative refspecs only have a LHS, which indicates a ref
+		 * (or pattern of refs) to exclude from other matches. This
+		 * can either be a simple ref, or a glob pattern. Exact sha1
+		 * match is not currently supported.
+		 */
+		if (!*item->src)
+			return 0; /* negative refspecs must not be empty */
+		else if (llen == the_hash_algo->hexsz && !get_oid_hex(item->src, &unused))
+			return 0; /* negative refpsecs cannot be exact sha1 */
+		else if (!check_refname_format(item->src, flags))
+			; /* valid looking ref is ok */
+		else
+			return 0;
+
+		/* the other rules below do not apply to negative refspecs */
+		return 1;
+	}
+
 	if (fetch) {
 		struct object_id unused;
 
@@ -153,7 +186,7 @@ void refspec_init(struct refspec *rs, int fetch)
 	rs->fetch = fetch;
 }
 
-void refspec_append(struct refspec *rs, const char *refspec)
+static void refspec_append_nodup(struct refspec *rs, char *refspec)
 {
 	struct refspec_item item;
 
@@ -163,7 +196,21 @@ void refspec_append(struct refspec *rs, const char *refspec)
 	rs->items[rs->nr++] = item;
 
 	ALLOC_GROW(rs->raw, rs->raw_nr + 1, rs->raw_alloc);
-	rs->raw[rs->raw_nr++] = xstrdup(refspec);
+	rs->raw[rs->raw_nr++] = refspec;
+}
+
+void refspec_append(struct refspec *rs, const char *refspec)
+{
+	refspec_append_nodup(rs, xstrdup(refspec));
+}
+
+void refspec_appendf(struct refspec *rs, const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	refspec_append_nodup(rs, xstrvfmt(fmt, ap));
+	va_end(ap);
 }
 
 void refspec_appendn(struct refspec *rs, const char **refspecs, int nr)
@@ -201,15 +248,25 @@ int valid_fetch_refspec(const char *fetch_refspec_str)
 	return ret;
 }
 
+int valid_remote_name(const char *name)
+{
+	int result;
+	struct strbuf refspec = STRBUF_INIT;
+	strbuf_addf(&refspec, "refs/heads/test:refs/remotes/%s/test", name);
+	result = valid_fetch_refspec(refspec.buf);
+	strbuf_release(&refspec);
+	return result;
+}
+
 void refspec_ref_prefixes(const struct refspec *rs,
-			  struct argv_array *ref_prefixes)
+			  struct strvec *ref_prefixes)
 {
 	int i;
 	for (i = 0; i < rs->nr; i++) {
 		const struct refspec_item *item = &rs->items[i];
 		const char *prefix = NULL;
 
-		if (item->exact_sha1)
+		if (item->exact_sha1 || item->negative)
 			continue;
 		if (rs->fetch == REFSPEC_FETCH)
 			prefix = item->src;
@@ -218,15 +275,16 @@ void refspec_ref_prefixes(const struct refspec *rs,
 		else if (item->src && !item->exact_sha1)
 			prefix = item->src;
 
-		if (prefix) {
-			if (item->pattern) {
-				const char *glob = strchr(prefix, '*');
-				argv_array_pushf(ref_prefixes, "%.*s",
-						 (int)(glob - prefix),
-						 prefix);
-			} else {
-				expand_ref_prefix(ref_prefixes, prefix);
-			}
+		if (!prefix)
+			continue;
+
+		if (item->pattern) {
+			const char *glob = strchr(prefix, '*');
+			strvec_pushf(ref_prefixes, "%.*s",
+				     (int)(glob - prefix),
+				     prefix);
+		} else {
+			expand_ref_prefix(ref_prefixes, prefix);
 		}
 	}
 }
diff --git a/refspec.h b/refspec.h
index 9b6e64a824..8b79891d32 100644
--- a/refspec.h
+++ b/refspec.h
@@ -4,11 +4,26 @@
 #define TAG_REFSPEC "refs/tags/*:refs/tags/*"
 extern const struct refspec_item *tag_refspec;
 
+/**
+ * A struct refspec_item holds the parsed interpretation of a refspec.  If it
+ * will force updates (starts with a '+'), force is true.  If it is a pattern
+ * (sides end with '*') pattern is true.  If it is a negative refspec, (starts
+ * with '^'), negative is true.  src and dest are the two sides (including '*'
+ * characters if present); if there is only one side, it is src, and dst is
+ * NULL; if sides exist but are empty (i.e., the refspec either starts or ends
+ * with ':'), the corresponding side is "".
+ *
+ * remote_find_tracking(), given a remote and a struct refspec_item with either src
+ * or dst filled out, will fill out the other such that the result is in the
+ * "fetch" specification for the remote (note that this evaluates patterns and
+ * returns a single result).
+ */
 struct refspec_item {
 	unsigned force : 1;
 	unsigned pattern : 1;
 	unsigned matching : 1;
 	unsigned exact_sha1 : 1;
+	unsigned negative : 1;
 
 	char *src;
 	char *dst;
@@ -20,6 +35,10 @@ struct refspec_item {
 #define REFSPEC_INIT_FETCH { .fetch = REFSPEC_FETCH }
 #define REFSPEC_INIT_PUSH { .fetch = REFSPEC_PUSH }
 
+/**
+ * An array of strings can be parsed into a struct refspec using
+ * parse_fetch_refspec() or parse_push_refspec().
+ */
 struct refspec {
 	struct refspec_item *items;
 	int alloc;
@@ -39,17 +58,20 @@ void refspec_item_init_or_die(struct refspec_item *item, const char *refspec,
 void refspec_item_clear(struct refspec_item *item);
 void refspec_init(struct refspec *rs, int fetch);
 void refspec_append(struct refspec *rs, const char *refspec);
+__attribute__((format (printf,2,3)))
+void refspec_appendf(struct refspec *rs, const char *fmt, ...);
 void refspec_appendn(struct refspec *rs, const char **refspecs, int nr);
 void refspec_clear(struct refspec *rs);
 
 int valid_fetch_refspec(const char *refspec);
+int valid_remote_name(const char *name);
 
-struct argv_array;
+struct strvec;
 /*
  * Determine what <prefix> values to pass to the peer in ref-prefix lines
  * (see Documentation/technical/protocol-v2.txt).
  */
 void refspec_ref_prefixes(const struct refspec *rs,
-			  struct argv_array *ref_prefixes);
+			  struct strvec *ref_prefixes);
 
 #endif /* REFSPEC_H */
diff --git a/remote-curl.c b/remote-curl.c
index 350d92a074..598cff7cde 100644
--- a/remote-curl.c
+++ b/remote-curl.c
@@ -10,9 +10,9 @@
 #include "pkt-line.h"
 #include "string-list.h"
 #include "sideband.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "credential.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "send-pack.h"
 #include "protocol.h"
 #include "quote.h"
@@ -39,9 +39,14 @@ struct options {
 		/* One of the SEND_PACK_PUSH_CERT_* constants. */
 		push_cert : 2,
 		deepen_relative : 1,
+
+		/* see documentation of corresponding flag in fetch-pack.h */
 		from_promisor : 1,
-		no_dependents : 1,
-		atomic : 1;
+
+		atomic : 1,
+		object_format : 1,
+		force_if_includes : 1;
+	const struct git_hash_algo *hash_algo;
 };
 static struct options options;
 static struct string_list cas_options = STRING_LIST_INIT_DUP;
@@ -119,10 +124,22 @@ static int set_option(const char *name, const char *value)
 	}
 	else if (!strcmp(name, "cas")) {
 		struct strbuf val = STRBUF_INIT;
-		strbuf_addf(&val, "--" CAS_OPT_NAME "=%s", value);
+		strbuf_addstr(&val, "--force-with-lease=");
+		if (*value != '"')
+			strbuf_addstr(&val, value);
+		else if (unquote_c_style(&val, value, NULL))
+			return -1;
 		string_list_append(&cas_options, val.buf);
 		strbuf_release(&val);
 		return 0;
+	} else if (!strcmp(name, TRANS_OPT_FORCE_IF_INCLUDES)) {
+		if (!strcmp(value, "true"))
+			options.force_if_includes = 1;
+		else if (!strcmp(value, "false"))
+			options.force_if_includes = 0;
+		else
+			return -1;
+		return 0;
 	} else if (!strcmp(name, "cloning")) {
 		if (!strcmp(value, "true"))
 			options.cloning = 1;
@@ -168,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;
@@ -180,16 +195,22 @@ 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;
-	} else if (!strcmp(name, "no-dependents")) {
-		options.no_dependents = 1;
-		return 0;
 	} else if (!strcmp(name, "filter")) {
 		options.filter = xstrdup(value);
 		return 0;
+	} else if (!strcmp(name, "object-format")) {
+		int algo;
+		options.object_format = 1;
+		if (strcmp(value, "true")) {
+			algo = hash_algo_by_name(value);
+			if (algo == GIT_HASH_UNKNOWN)
+				die("unknown object format '%s'", value);
+			options.hash_algo = &hash_algos[algo];
+		}
+		return 0;
 	} else {
 		return 1 /* unsupported */;
 	}
@@ -231,6 +252,7 @@ static struct ref *parse_git_refs(struct discovery *heads, int for_push)
 	case protocol_v0:
 		get_remote_heads(&reader, &list, for_push ? REF_NORMAL : 0,
 				 NULL, &heads->shallow);
+		options.hash_algo = reader.hash_algo;
 		break;
 	case protocol_unknown_version:
 		BUG("unknown protocol version");
@@ -239,6 +261,19 @@ static struct ref *parse_git_refs(struct discovery *heads, int for_push)
 	return list;
 }
 
+static const struct git_hash_algo *detect_hash_algo(struct discovery *heads)
+{
+	const char *p = memchr(heads->buf, '\t', heads->len);
+	int algo;
+	if (!p)
+		return the_hash_algo;
+
+	algo = hash_algo_by_length((p - heads->buf) / 2);
+	if (algo == GIT_HASH_UNKNOWN)
+		return NULL;
+	return &hash_algos[algo];
+}
+
 static struct ref *parse_info_refs(struct discovery *heads)
 {
 	char *data, *start, *mid;
@@ -249,6 +284,12 @@ static struct ref *parse_info_refs(struct discovery *heads)
 	struct ref *ref = NULL;
 	struct ref *last_ref = NULL;
 
+	options.hash_algo = detect_hash_algo(heads);
+	if (!options.hash_algo)
+		die("%sinfo/refs not valid: could not determine hash algorithm; "
+		    "is this a git repository?",
+		    transport_anonymize_url(url.buf));
+
 	data = heads->buf;
 	start = NULL;
 	mid = data;
@@ -259,13 +300,13 @@ static struct ref *parse_info_refs(struct discovery *heads)
 		if (data[i] == '\t')
 			mid = &data[i];
 		if (data[i] == '\n') {
-			if (mid - start != the_hash_algo->hexsz)
+			if (mid - start != options.hash_algo->hexsz)
 				die(_("%sinfo/refs not valid: is this a git repository?"),
 				    transport_anonymize_url(url.buf));
 			data[i] = 0;
 			ref_name = mid + 1;
 			ref = alloc_ref(ref_name);
-			get_oid_hex(start, &ref->old_oid);
+			get_oid_hex_algop(start, &ref->old_oid, options.hash_algo);
 			if (!refs)
 				refs = ref;
 			if (last_ref)
@@ -509,11 +550,18 @@ static struct ref *get_refs(int for_push)
 static void output_refs(struct ref *refs)
 {
 	struct ref *posn;
+	if (options.object_format && options.hash_algo) {
+		printf(":object-format %s\n", options.hash_algo->name);
+		repo_set_hash_algo(the_repository,
+				hash_algo_by_ptr(options.hash_algo));
+	}
 	for (posn = refs; posn; posn = posn->next) {
 		if (posn->symref)
 			printf("@%s %s\n", posn->symref, posn->name);
 		else
-			printf("%s %s\n", oid_to_hex(&posn->old_oid), posn->name);
+			printf("%s %s\n", hash_to_hex_algop(posn->old_oid.hash,
+							    options.hash_algo),
+					  posn->name);
 	}
 	printf("\n");
 	fflush(stdout);
@@ -601,6 +649,8 @@ static int rpc_read_from_out(struct rpc_state *rpc, int options,
 		case PACKET_READ_FLUSH:
 			memcpy(buf - 4, "0000", 4);
 			break;
+		case PACKET_READ_RESPONSE_END:
+			die(_("remote server sent unexpected response end packet"));
 		}
 	}
 
@@ -643,7 +693,7 @@ static size_t rpc_out(void *ptr, size_t eltsize,
 			return 0;
 		}
 		/*
-		 * If avail is non-zerp, the line length for the flush still
+		 * If avail is non-zero, the line length for the flush still
 		 * hasn't been fully sent. Proceed with sending the line
 		 * length.
 		 */
@@ -656,7 +706,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;
@@ -677,11 +726,56 @@ static curlioerr rpc_ioctl(CURL *handle, int cmd, void *clientp)
 		return CURLIOE_UNKNOWNCMD;
 	}
 }
-#endif
+
+struct check_pktline_state {
+	char len_buf[4];
+	int len_filled;
+	int remaining;
+};
+
+static void check_pktline(struct check_pktline_state *state, const char *ptr, size_t size)
+{
+	while (size) {
+		if (!state->remaining) {
+			int digits_remaining = 4 - state->len_filled;
+			if (digits_remaining > size)
+				digits_remaining = size;
+			memcpy(&state->len_buf[state->len_filled], ptr, digits_remaining);
+			state->len_filled += digits_remaining;
+			ptr += digits_remaining;
+			size -= digits_remaining;
+
+			if (state->len_filled == 4) {
+				state->remaining = packet_length(state->len_buf);
+				if (state->remaining < 0) {
+					die(_("remote-curl: bad line length character: %.4s"), state->len_buf);
+				} else if (state->remaining == 2) {
+					die(_("remote-curl: unexpected response end packet"));
+				} else if (state->remaining < 4) {
+					state->remaining = 0;
+				} else {
+					state->remaining -= 4;
+				}
+				state->len_filled = 0;
+			}
+		}
+
+		if (state->remaining) {
+			int remaining = state->remaining;
+			if (remaining > size)
+				remaining = size;
+			ptr += remaining;
+			size -= remaining;
+			state->remaining -= remaining;
+		}
+	}
+}
 
 struct rpc_in_data {
 	struct rpc_state *rpc;
 	struct active_request_slot *slot;
+	int check_pktline;
+	struct check_pktline_state pktline_state;
 };
 
 /*
@@ -702,6 +796,8 @@ static size_t rpc_in(char *ptr, size_t eltsize,
 		return size;
 	if (size)
 		data->rpc->any_written = 1;
+	if (data->check_pktline)
+		check_pktline(&data->pktline_state, ptr, size);
 	write_or_die(data->rpc->in, ptr, size);
 	return size;
 }
@@ -757,7 +853,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);
 
@@ -778,7 +874,7 @@ static curl_off_t xcurl_off_t(size_t len)
  * If flush_received is true, do not attempt to read any more; just use what's
  * in rpc->buf.
  */
-static int post_rpc(struct rpc_state *rpc, int flush_received)
+static int post_rpc(struct rpc_state *rpc, int stateless_connect, int flush_received)
 {
 	struct active_request_slot *slot;
 	struct curl_slist *headers = http_copy_default_headers();
@@ -848,10 +944,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);
@@ -920,7 +1014,9 @@ retry:
 	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, rpc_in);
 	rpc_in_data.rpc = rpc;
 	rpc_in_data.slot = slot;
-	curl_easy_setopt(slot->curl, CURLOPT_FILE, &rpc_in_data);
+	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_WRITEDATA, &rpc_in_data);
 	curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 0);
 
 
@@ -936,6 +1032,14 @@ retry:
 	if (!rpc->any_written)
 		err = -1;
 
+	if (rpc_in_data.pktline_state.len_filled)
+		err = error(_("%d bytes of length header were received"), rpc_in_data.pktline_state.len_filled);
+	if (rpc_in_data.pktline_state.remaining)
+		err = error(_("%d bytes of body are still expected"), rpc_in_data.pktline_state.remaining);
+
+	if (stateless_connect)
+		packet_response_end(rpc->in);
+
 	curl_slist_free_all(headers);
 	free(gzip_body);
 	return err;
@@ -985,7 +1089,7 @@ static int rpc_service(struct rpc_state *rpc, struct discovery *heads,
 			break;
 		rpc->pos = 0;
 		rpc->len = n;
-		err |= post_rpc(rpc, 0);
+		err |= post_rpc(rpc, 0, 0);
 	}
 
 	close(client.in);
@@ -1026,6 +1130,7 @@ static int fetch_dumb(int nr_heads, struct ref **to_fetch)
 
 	walker = get_http_walker(url.buf);
 	walker->get_verbosely = options.verbosity >= 3;
+	walker->get_progress = options.progress;
 	walker->get_recover = 0;
 	ret = walker_fetch(walker, nr_heads, targets, NULL, NULL);
 	walker_free(walker);
@@ -1043,41 +1148,39 @@ static int fetch_git(struct discovery *heads,
 	struct rpc_state rpc;
 	struct strbuf preamble = STRBUF_INIT;
 	int i, err;
-	struct argv_array args = ARGV_ARRAY_INIT;
+	struct strvec args = STRVEC_INIT;
 	struct strbuf rpc_result = STRBUF_INIT;
 
-	argv_array_pushl(&args, "fetch-pack", "--stateless-rpc",
-			 "--stdin", "--lock-pack", NULL);
+	strvec_pushl(&args, "fetch-pack", "--stateless-rpc",
+		     "--stdin", "--lock-pack", NULL);
 	if (options.followtags)
-		argv_array_push(&args, "--include-tag");
+		strvec_push(&args, "--include-tag");
 	if (options.thin)
-		argv_array_push(&args, "--thin");
+		strvec_push(&args, "--thin");
 	if (options.verbosity >= 3)
-		argv_array_pushl(&args, "-v", "-v", NULL);
+		strvec_pushl(&args, "-v", "-v", NULL);
 	if (options.check_self_contained_and_connected)
-		argv_array_push(&args, "--check-self-contained-and-connected");
+		strvec_push(&args, "--check-self-contained-and-connected");
 	if (options.cloning)
-		argv_array_push(&args, "--cloning");
+		strvec_push(&args, "--cloning");
 	if (options.update_shallow)
-		argv_array_push(&args, "--update-shallow");
+		strvec_push(&args, "--update-shallow");
 	if (!options.progress)
-		argv_array_push(&args, "--no-progress");
+		strvec_push(&args, "--no-progress");
 	if (options.depth)
-		argv_array_pushf(&args, "--depth=%lu", options.depth);
+		strvec_pushf(&args, "--depth=%lu", options.depth);
 	if (options.deepen_since)
-		argv_array_pushf(&args, "--shallow-since=%s", options.deepen_since);
+		strvec_pushf(&args, "--shallow-since=%s", options.deepen_since);
 	for (i = 0; i < options.deepen_not.nr; i++)
-		argv_array_pushf(&args, "--shallow-exclude=%s",
-				 options.deepen_not.items[i].string);
+		strvec_pushf(&args, "--shallow-exclude=%s",
+			     options.deepen_not.items[i].string);
 	if (options.deepen_relative && options.depth)
-		argv_array_push(&args, "--deepen-relative");
+		strvec_push(&args, "--deepen-relative");
 	if (options.from_promisor)
-		argv_array_push(&args, "--from-promisor");
-	if (options.no_dependents)
-		argv_array_push(&args, "--no-dependents");
+		strvec_push(&args, "--from-promisor");
 	if (options.filter)
-		argv_array_pushf(&args, "--filter=%s", options.filter);
-	argv_array_push(&args, url.buf);
+		strvec_pushf(&args, "--filter=%s", options.filter);
+	strvec_push(&args, url.buf);
 
 	for (i = 0; i < nr_heads; i++) {
 		struct ref *ref = to_fetch[i];
@@ -1092,12 +1195,12 @@ static int fetch_git(struct discovery *heads,
 	rpc.service_name = "git-upload-pack",
 	rpc.gzip_request = 1;
 
-	err = rpc_service(&rpc, heads, args.argv, &preamble, &rpc_result);
+	err = rpc_service(&rpc, heads, args.v, &preamble, &rpc_result);
 	if (rpc_result.len)
 		write_or_die(1, rpc_result.buf, rpc_result.len);
 	strbuf_release(&rpc_result);
 	strbuf_release(&preamble);
-	argv_array_clear(&args);
+	strvec_clear(&args);
 	return err;
 }
 
@@ -1169,15 +1272,15 @@ static int push_dav(int nr_spec, const char **specs)
 	size_t i;
 
 	child.git_cmd = 1;
-	argv_array_push(&child.args, "http-push");
-	argv_array_push(&child.args, "--helper-status");
+	strvec_push(&child.args, "http-push");
+	strvec_push(&child.args, "--helper-status");
 	if (options.dry_run)
-		argv_array_push(&child.args, "--dry-run");
+		strvec_push(&child.args, "--dry-run");
 	if (options.verbosity > 1)
-		argv_array_push(&child.args, "--verbose");
-	argv_array_push(&child.args, url.buf);
+		strvec_push(&child.args, "--verbose");
+	strvec_push(&child.args, url.buf);
 	for (i = 0; i < nr_spec; i++)
-		argv_array_push(&child.args, specs[i]);
+		strvec_push(&child.args, specs[i]);
 
 	if (run_command(&child))
 		die(_("git-http-push failed"));
@@ -1188,38 +1291,41 @@ static int push_git(struct discovery *heads, int nr_spec, const char **specs)
 {
 	struct rpc_state rpc;
 	int i, err;
-	struct argv_array args;
+	struct strvec args;
 	struct string_list_item *cas_option;
 	struct strbuf preamble = STRBUF_INIT;
 	struct strbuf rpc_result = STRBUF_INIT;
 
-	argv_array_init(&args);
-	argv_array_pushl(&args, "send-pack", "--stateless-rpc", "--helper-status",
-			 NULL);
+	strvec_init(&args);
+	strvec_pushl(&args, "send-pack", "--stateless-rpc", "--helper-status",
+		     NULL);
 
 	if (options.thin)
-		argv_array_push(&args, "--thin");
+		strvec_push(&args, "--thin");
 	if (options.dry_run)
-		argv_array_push(&args, "--dry-run");
+		strvec_push(&args, "--dry-run");
 	if (options.push_cert == SEND_PACK_PUSH_CERT_ALWAYS)
-		argv_array_push(&args, "--signed=yes");
+		strvec_push(&args, "--signed=yes");
 	else if (options.push_cert == SEND_PACK_PUSH_CERT_IF_ASKED)
-		argv_array_push(&args, "--signed=if-asked");
+		strvec_push(&args, "--signed=if-asked");
 	if (options.atomic)
-		argv_array_push(&args, "--atomic");
+		strvec_push(&args, "--atomic");
 	if (options.verbosity == 0)
-		argv_array_push(&args, "--quiet");
+		strvec_push(&args, "--quiet");
 	else if (options.verbosity > 1)
-		argv_array_push(&args, "--verbose");
+		strvec_push(&args, "--verbose");
 	for (i = 0; i < options.push_options.nr; i++)
-		argv_array_pushf(&args, "--push-option=%s",
-				 options.push_options.items[i].string);
-	argv_array_push(&args, options.progress ? "--progress" : "--no-progress");
+		strvec_pushf(&args, "--push-option=%s",
+			     options.push_options.items[i].string);
+	strvec_push(&args, options.progress ? "--progress" : "--no-progress");
 	for_each_string_list_item(cas_option, &cas_options)
-		argv_array_push(&args, cas_option->string);
-	argv_array_push(&args, url.buf);
+		strvec_push(&args, cas_option->string);
+	strvec_push(&args, url.buf);
 
-	argv_array_push(&args, "--stdin");
+	if (options.force_if_includes)
+		strvec_push(&args, "--force-if-includes");
+
+	strvec_push(&args, "--stdin");
 	for (i = 0; i < nr_spec; i++)
 		packet_buf_write(&preamble, "%s\n", specs[i]);
 	packet_buf_flush(&preamble);
@@ -1227,12 +1333,12 @@ static int push_git(struct discovery *heads, int nr_spec, const char **specs)
 	memset(&rpc, 0, sizeof(rpc));
 	rpc.service_name = "git-receive-pack",
 
-	err = rpc_service(&rpc, heads, args.argv, &preamble, &rpc_result);
+	err = rpc_service(&rpc, heads, args.v, &preamble, &rpc_result);
 	if (rpc_result.len)
 		write_or_die(1, rpc_result.buf, rpc_result.len);
 	strbuf_release(&rpc_result);
 	strbuf_release(&preamble);
-	argv_array_clear(&args);
+	strvec_clear(&args);
 	return err;
 }
 
@@ -1251,12 +1357,13 @@ static int push(int nr_spec, const char **specs)
 
 static void parse_push(struct strbuf *buf)
 {
-	struct argv_array specs = ARGV_ARRAY_INIT;
+	struct strvec specs = STRVEC_INIT;
 	int ret;
 
 	do {
-		if (starts_with(buf->buf, "push "))
-			argv_array_push(&specs, buf->buf + 5);
+		const char *arg;
+		if (skip_prefix(buf->buf, "push ", &arg))
+			strvec_push(&specs, arg);
 		else
 			die(_("http transport does not support %s"), buf->buf);
 
@@ -1267,15 +1374,15 @@ static void parse_push(struct strbuf *buf)
 			break;
 	} while (1);
 
-	ret = push(specs.argc, specs.argv);
+	ret = push(specs.nr, specs.v);
 	printf("\n");
 	fflush(stdout);
 
 	if (ret)
 		exit(128); /* error already reported */
 
- free_specs:
-	argv_array_clear(&specs);
+free_specs:
+	strvec_clear(&specs);
 }
 
 static int stateless_connect(const char *service_name)
@@ -1340,7 +1447,7 @@ static int stateless_connect(const char *service_name)
 			BUG("The entire rpc->buf should be larger than LARGE_PACKET_MAX");
 		if (status == PACKET_READ_EOF)
 			break;
-		if (post_rpc(&rpc, status == PACKET_READ_FLUSH))
+		if (post_rpc(&rpc, 1, status == PACKET_READ_FLUSH))
 			/* We would have an err here */
 			break;
 		/* Reset the buffer for next request */
@@ -1437,6 +1544,7 @@ int cmd_main(int argc, const char **argv)
 			printf("option\n");
 			printf("push\n");
 			printf("check-connectivity\n");
+			printf("object-format\n");
 			printf("\n");
 			fflush(stdout);
 		} else if (skip_prefix(buf.buf, "stateless-connect ", &arg)) {
diff --git a/remote-testsvn.c b/remote-testsvn.c
deleted file mode 100644
index 3af708c5b6..0000000000
--- a/remote-testsvn.c
+++ /dev/null
@@ -1,337 +0,0 @@
-#include "cache.h"
-#include "refs.h"
-#include "remote.h"
-#include "object-store.h"
-#include "strbuf.h"
-#include "url.h"
-#include "exec-cmd.h"
-#include "run-command.h"
-#include "vcs-svn/svndump.h"
-#include "notes.h"
-#include "argv-array.h"
-
-static const char *url;
-static int dump_from_file;
-static const char *private_ref;
-static const char *remote_ref = "refs/heads/master";
-static const char *marksfilename, *notes_ref;
-struct rev_note { unsigned int rev_nr; };
-
-static int cmd_capabilities(const char *line);
-static int cmd_import(const char *line);
-static int cmd_list(const char *line);
-
-typedef int (*input_command_handler)(const char *);
-struct input_command_entry {
-	const char *name;
-	input_command_handler fn;
-	unsigned char batchable;	/* whether the command starts or is part of a batch */
-};
-
-static const struct input_command_entry input_command_list[] = {
-	{ "capabilities", cmd_capabilities, 0 },
-	{ "import", cmd_import, 1 },
-	{ "list", cmd_list, 0 },
-	{ NULL, NULL }
-};
-
-static int cmd_capabilities(const char *line)
-{
-	printf("import\n");
-	printf("bidi-import\n");
-	printf("refspec %s:%s\n\n", remote_ref, private_ref);
-	fflush(stdout);
-	return 0;
-}
-
-static void terminate_batch(void)
-{
-	/* terminate a current batch's fast-import stream */
-	printf("done\n");
-	fflush(stdout);
-}
-
-/* NOTE: 'ref' refers to a git reference, while 'rev' refers to a svn revision. */
-static char *read_ref_note(const struct object_id *oid)
-{
-	const struct object_id *note_oid;
-	char *msg = NULL;
-	unsigned long msglen;
-	enum object_type type;
-
-	init_notes(NULL, notes_ref, NULL, 0);
-	if (!(note_oid = get_note(NULL, oid)))
-		return NULL;	/* note tree not found */
-	if (!(msg = read_object_file(note_oid, &type, &msglen)))
-		error("Empty notes tree. %s", notes_ref);
-	else if (!msglen || type != OBJ_BLOB) {
-		error("Note contains unusable content. "
-			"Is something else using this notes tree? %s", notes_ref);
-		FREE_AND_NULL(msg);
-	}
-	free_notes(NULL);
-	return msg;
-}
-
-static int parse_rev_note(const char *msg, struct rev_note *res)
-{
-	const char *key, *value, *end;
-	size_t len;
-
-	while (*msg) {
-		end = strchrnul(msg, '\n');
-		len = end - msg;
-
-		key = "Revision-number: ";
-		if (starts_with(msg, key)) {
-			long i;
-			char *end;
-			value = msg + strlen(key);
-			i = strtol(value, &end, 0);
-			if (end == value || i < 0 || i > UINT32_MAX)
-				return -1;
-			res->rev_nr = i;
-			return 0;
-		}
-		msg += len + 1;
-	}
-	/* didn't find it */
-	return -1;
-}
-
-static int note2mark_cb(const struct object_id *object_oid,
-		const struct object_id *note_oid, char *note_path,
-		void *cb_data)
-{
-	FILE *file = (FILE *)cb_data;
-	char *msg;
-	unsigned long msglen;
-	enum object_type type;
-	struct rev_note note;
-
-	if (!(msg = read_object_file(note_oid, &type, &msglen)) ||
-			!msglen || type != OBJ_BLOB) {
-		free(msg);
-		return 1;
-	}
-	if (parse_rev_note(msg, &note))
-		return 2;
-	if (fprintf(file, ":%d %s\n", note.rev_nr, oid_to_hex(object_oid)) < 1)
-		return 3;
-	return 0;
-}
-
-static void regenerate_marks(void)
-{
-	int ret;
-	FILE *marksfile = xfopen(marksfilename, "w+");
-
-	ret = for_each_note(NULL, 0, note2mark_cb, marksfile);
-	if (ret)
-		die("Regeneration of marks failed, returned %d.", ret);
-	fclose(marksfile);
-}
-
-static void check_or_regenerate_marks(int latestrev)
-{
-	FILE *marksfile;
-	struct strbuf sb = STRBUF_INIT;
-	struct strbuf line = STRBUF_INIT;
-	int found = 0;
-
-	if (latestrev < 1)
-		return;
-
-	init_notes(NULL, notes_ref, NULL, 0);
-	marksfile = fopen(marksfilename, "r");
-	if (!marksfile) {
-		regenerate_marks();
-		marksfile = xfopen(marksfilename, "r");
-		fclose(marksfile);
-	} else {
-		strbuf_addf(&sb, ":%d ", latestrev);
-		while (strbuf_getline_lf(&line, marksfile) != EOF) {
-			if (starts_with(line.buf, sb.buf)) {
-				found++;
-				break;
-			}
-		}
-		fclose(marksfile);
-		if (!found)
-			regenerate_marks();
-	}
-	free_notes(NULL);
-	strbuf_release(&sb);
-	strbuf_release(&line);
-}
-
-static int cmd_import(const char *line)
-{
-	int code;
-	int dumpin_fd;
-	char *note_msg;
-	struct object_id head_oid;
-	unsigned int startrev;
-	struct child_process svndump_proc = CHILD_PROCESS_INIT;
-	const char *command = "svnrdump";
-
-	if (read_ref(private_ref, &head_oid))
-		startrev = 0;
-	else {
-		note_msg = read_ref_note(&head_oid);
-		if(note_msg == NULL) {
-			warning("No note found for %s.", private_ref);
-			startrev = 0;
-		} else {
-			struct rev_note note = { 0 };
-			if (parse_rev_note(note_msg, &note))
-				die("Revision number couldn't be parsed from note.");
-			startrev = note.rev_nr + 1;
-			free(note_msg);
-		}
-	}
-	check_or_regenerate_marks(startrev - 1);
-
-	if (dump_from_file) {
-		dumpin_fd = open(url, O_RDONLY);
-		if(dumpin_fd < 0)
-			die_errno("Couldn't open svn dump file %s.", url);
-	} else {
-		svndump_proc.out = -1;
-		argv_array_push(&svndump_proc.args, command);
-		argv_array_push(&svndump_proc.args, "dump");
-		argv_array_push(&svndump_proc.args, url);
-		argv_array_pushf(&svndump_proc.args, "-r%u:HEAD", startrev);
-
-		code = start_command(&svndump_proc);
-		if (code)
-			die("Unable to start %s, code %d", command, code);
-		dumpin_fd = svndump_proc.out;
-	}
-	/* setup marks file import/export */
-	printf("feature import-marks-if-exists=%s\n"
-			"feature export-marks=%s\n", marksfilename, marksfilename);
-
-	svndump_init_fd(dumpin_fd, STDIN_FILENO);
-	svndump_read(url, private_ref, notes_ref);
-	svndump_deinit();
-	svndump_reset();
-
-	close(dumpin_fd);
-	if (!dump_from_file) {
-		code = finish_command(&svndump_proc);
-		if (code)
-			warning("%s, returned %d", command, code);
-	}
-
-	return 0;
-}
-
-static int cmd_list(const char *line)
-{
-	printf("? %s\n\n", remote_ref);
-	fflush(stdout);
-	return 0;
-}
-
-static int do_command(struct strbuf *line)
-{
-	const struct input_command_entry *p = input_command_list;
-	static struct string_list batchlines = STRING_LIST_INIT_DUP;
-	static const struct input_command_entry *batch_cmd;
-	/*
-	 * commands can be grouped together in a batch.
-	 * Batches are ended by \n. If no batch is active the program ends.
-	 * During a batch all lines are buffered and passed to the handler function
-	 * when the batch is terminated.
-	 */
-	if (line->len == 0) {
-		if (batch_cmd) {
-			struct string_list_item *item;
-			for_each_string_list_item(item, &batchlines)
-				batch_cmd->fn(item->string);
-			terminate_batch();
-			batch_cmd = NULL;
-			string_list_clear(&batchlines, 0);
-			return 0;	/* end of the batch, continue reading other commands. */
-		}
-		return 1;	/* end of command stream, quit */
-	}
-	if (batch_cmd) {
-		if (!starts_with(batch_cmd->name, line->buf))
-			die("Active %s batch interrupted by %s", batch_cmd->name, line->buf);
-		/* buffer batch lines */
-		string_list_append(&batchlines, line->buf);
-		return 0;
-	}
-
-	for (p = input_command_list; p->name; p++) {
-		if (starts_with(line->buf, p->name) && (strlen(p->name) == line->len ||
-				line->buf[strlen(p->name)] == ' ')) {
-			if (p->batchable) {
-				batch_cmd = p;
-				string_list_append(&batchlines, line->buf);
-				return 0;
-			}
-			return p->fn(line->buf);
-		}
-	}
-	die("Unknown command '%s'\n", line->buf);
-	return 0;
-}
-
-int cmd_main(int argc, const char **argv)
-{
-	struct strbuf buf = STRBUF_INIT, url_sb = STRBUF_INIT,
-			private_ref_sb = STRBUF_INIT, marksfilename_sb = STRBUF_INIT,
-			notes_ref_sb = STRBUF_INIT;
-	static struct remote *remote;
-	const char *url_in;
-
-	setup_git_directory();
-	if (argc < 2 || argc > 3) {
-		usage("git-remote-svn <remote-name> [<url>]");
-		return 1;
-	}
-
-	remote = remote_get(argv[1]);
-	url_in = (argc == 3) ? argv[2] : remote->url[0];
-
-	if (starts_with(url_in, "file://")) {
-		dump_from_file = 1;
-		url = url_decode(url_in + sizeof("file://")-1);
-	} else {
-		dump_from_file = 0;
-		end_url_with_slash(&url_sb, url_in);
-		url = url_sb.buf;
-	}
-
-	strbuf_addf(&private_ref_sb, "refs/svn/%s/master", remote->name);
-	private_ref = private_ref_sb.buf;
-
-	strbuf_addf(&notes_ref_sb, "refs/notes/%s/revs", remote->name);
-	notes_ref = notes_ref_sb.buf;
-
-	strbuf_addf(&marksfilename_sb, "%s/info/fast-import/remote-svn/%s.marks",
-		get_git_dir(), remote->name);
-	marksfilename = marksfilename_sb.buf;
-
-	while (1) {
-		if (strbuf_getline_lf(&buf, stdin) == EOF) {
-			if (ferror(stdin))
-				die("Error reading command stream");
-			else
-				die("Unexpected end of command stream");
-		}
-		if (do_command(&buf))
-			break;
-		strbuf_reset(&buf);
-	}
-
-	strbuf_release(&buf);
-	strbuf_release(&url_sb);
-	strbuf_release(&private_ref_sb);
-	strbuf_release(&notes_ref_sb);
-	strbuf_release(&marksfilename_sb);
-	return 0;
-}
diff --git a/remote.c b/remote.c
index 5c4666b53a..dfb863d808 100644
--- a/remote.c
+++ b/remote.c
@@ -11,7 +11,7 @@
 #include "tag.h"
 #include "string-list.h"
 #include "mergesort.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "commit-reach.h"
 #include "advice.h"
 
@@ -151,7 +151,7 @@ static struct remote *make_remote(const char *name, int len)
 	if (e)
 		return container_of(e, struct remote, ent);
 
-	ret = xcalloc(1, sizeof(struct remote));
+	CALLOC_ARRAY(ret, 1);
 	ret->prune = -1;  /* unspecified */
 	ret->prune_tags = -1;  /* unspecified */
 	ret->name = xstrndup(name, len);
@@ -174,54 +174,43 @@ 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, int len)
+static struct branch *make_branch(const char *name, size_t len)
 {
 	struct branch *ret;
 	int i;
 
 	for (i = 0; i < branches_nr; i++) {
-		if (len ? (!strncmp(name, branches[i]->name, len) &&
-			   !branches[i]->name[len]) :
-		    !strcmp(name, branches[i]->name))
+		if (!strncmp(name, branches[i]->name, len) &&
+		    !branches[i]->name[len])
 			return branches[i];
 	}
 
 	ALLOC_GROW(branches, branches_nr + 1, branches_alloc);
-	ret = xcalloc(1, sizeof(struct branch));
+	CALLOC_ARRAY(ret, 1);
 	branches[branches_nr++] = ret;
-	if (len)
-		ret->name = xstrndup(name, len);
-	else
-		ret->name = xstrdup(name);
+	ret->name = xstrndup(name, len);
 	ret->refname = xstrfmt("refs/heads/%s", ret->name);
 
 	return ret;
 }
 
-static struct rewrite *make_rewrite(struct rewrites *r, const char *base, int len)
+static struct rewrite *make_rewrite(struct rewrites *r,
+				    const char *base, size_t len)
 {
 	struct rewrite *ret;
 	int i;
 
 	for (i = 0; i < r->rewrite_nr; i++) {
-		if (len
-		    ? (len == r->rewrite[i]->baselen &&
-		       !strncmp(base, r->rewrite[i]->base, len))
-		    : !strcmp(base, r->rewrite[i]->base))
+		if (len == r->rewrite[i]->baselen &&
+		    !strncmp(base, r->rewrite[i]->base, len))
 			return r->rewrite[i];
 	}
 
 	ALLOC_GROW(r->rewrite, r->rewrite_nr + 1, r->rewrite_alloc);
-	ret = xcalloc(1, sizeof(struct rewrite));
+	CALLOC_ARRAY(ret, 1);
 	r->rewrite[r->rewrite_nr++] = ret;
-	if (len) {
-		ret->base = xstrndup(base, len);
-		ret->baselen = len;
-	}
-	else {
-		ret->base = xstrdup(base);
-		ret->baselen = strlen(base);
-	}
+	ret->base = xstrndup(base, len);
+	ret->baselen = len;
 	return ret;
 }
 
@@ -287,7 +276,7 @@ static void read_branches_file(struct remote *remote)
 
 	/*
 	 * The branches file would have URL and optionally
-	 * #branch specified.  The "master" (or specified) branch is
+	 * #branch specified.  The default (or specified) branch is
 	 * fetched and stored in the local branch matching the
 	 * remote name.
 	 */
@@ -295,28 +284,24 @@ static void read_branches_file(struct remote *remote)
 	if (frag)
 		*(frag++) = '\0';
 	else
-		frag = "master";
+		frag = (char *)git_default_branch_name(0);
 
 	add_url_alias(remote, strbuf_detach(&buf, NULL));
-	strbuf_addf(&buf, "refs/heads/%s:refs/heads/%s",
-		    frag, remote->name);
-	refspec_append(&remote->fetch, buf.buf);
+	refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s",
+			frag, remote->name);
 
 	/*
 	 * Cogito compatible push: push current HEAD to remote #branch
 	 * (master if missing)
 	 */
-	strbuf_reset(&buf);
-	strbuf_addf(&buf, "HEAD:refs/heads/%s", frag);
-	refspec_append(&remote->push, buf.buf);
+	refspec_appendf(&remote->push, "HEAD:refs/heads/%s", frag);
 	remote->fetch_tags = 1; /* always auto-follow */
-	strbuf_release(&buf);
 }
 
 static int handle_config(const char *key, const char *value, void *cb)
 {
 	const char *name;
-	int namelen;
+	size_t namelen;
 	const char *subkey;
 	struct remote *remote;
 	struct branch *branch;
@@ -369,7 +354,8 @@ static int handle_config(const char *key, const char *value, void *cb)
 	}
 	remote = make_remote(name, namelen);
 	remote->origin = REMOTE_CONFIG;
-	if (current_config_scope() == CONFIG_SCOPE_REPO)
+	if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
+	    current_config_scope() == CONFIG_SCOPE_WORKTREE)
 		remote->configured_in_repo = 1;
 	if (!strcmp(subkey, "mirror"))
 		remote->mirror = git_config_bool(key, value);
@@ -469,7 +455,7 @@ static void read_config(void)
 		const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
 		if (head_ref && (flag & REF_ISSYMREF) &&
 		    skip_prefix(head_ref, "refs/heads/", &head_ref)) {
-			current_branch = make_branch(head_ref, 0);
+			current_branch = make_branch(head_ref, strlen(head_ref));
 		}
 	}
 	git_config(handle_config, NULL);
@@ -515,14 +501,11 @@ const char *pushremote_for_branch(struct branch *branch, int *explicit)
 	return remote_for_branch(branch, explicit);
 }
 
-const char *remote_ref_for_branch(struct branch *branch, int for_push,
-				  int *explicit)
+const char *remote_ref_for_branch(struct branch *branch, int for_push)
 {
 	if (branch) {
 		if (!for_push) {
 			if (branch->merge_nr) {
-				if (explicit)
-					*explicit = 1;
 				return branch->merge_name[0];
 			}
 		} else {
@@ -533,15 +516,11 @@ const char *remote_ref_for_branch(struct branch *branch, int for_push,
 			if (remote && remote->push.nr &&
 			    (dst = apply_refspecs(&remote->push,
 						  branch->refname))) {
-				if (explicit)
-					*explicit = 1;
 				return dst;
 			}
 		}
 	}
-	if (explicit)
-		*explicit = 0;
-	return "";
+	return NULL;
 }
 
 static struct remote *remote_get_1(const char *name,
@@ -703,6 +682,101 @@ static int match_name_with_pattern(const char *key, const char *name,
 	return ret;
 }
 
+static int refspec_match(const struct refspec_item *refspec,
+			 const char *name)
+{
+	if (refspec->pattern)
+		return match_name_with_pattern(refspec->src, name, NULL, NULL);
+
+	return !strcmp(refspec->src, name);
+}
+
+static int omit_name_by_refspec(const char *name, struct refspec *rs)
+{
+	int i;
+
+	for (i = 0; i < rs->nr; i++) {
+		if (rs->items[i].negative && refspec_match(&rs->items[i], name))
+			return 1;
+	}
+	return 0;
+}
+
+struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs)
+{
+	struct ref **tail;
+
+	for (tail = &ref_map; *tail; ) {
+		struct ref *ref = *tail;
+
+		if (omit_name_by_refspec(ref->name, rs)) {
+			*tail = ref->next;
+			free(ref->peer_ref);
+			free(ref);
+		} else
+			tail = &ref->next;
+	}
+
+	return ref_map;
+}
+
+static int query_matches_negative_refspec(struct refspec *rs, struct refspec_item *query)
+{
+	int i, matched_negative = 0;
+	int find_src = !query->src;
+	struct string_list reversed = STRING_LIST_INIT_NODUP;
+	const char *needle = find_src ? query->dst : query->src;
+
+	/*
+	 * Check whether the queried ref matches any negative refpsec. If so,
+	 * then we should ultimately treat this as not matching the query at
+	 * all.
+	 *
+	 * Note that negative refspecs always match the source, but the query
+	 * item uses the destination. To handle this, we apply pattern
+	 * refspecs in reverse to figure out if the query source matches any
+	 * of the negative refspecs.
+	 *
+	 * The first loop finds and expands all positive refspecs
+	 * matched by the queried ref.
+	 *
+	 * The second loop checks if any of the results of the first loop
+	 * match any negative refspec.
+	 */
+	for (i = 0; i < rs->nr; i++) {
+		struct refspec_item *refspec = &rs->items[i];
+		char *expn_name;
+
+		if (refspec->negative)
+			continue;
+
+		/* Note the reversal of src and dst */
+		if (refspec->pattern) {
+			const char *key = refspec->dst ? refspec->dst : refspec->src;
+			const char *value = refspec->src;
+
+			if (match_name_with_pattern(key, needle, value, &expn_name))
+				string_list_append_nodup(&reversed, expn_name);
+		} else if (refspec->matching) {
+			/* For the special matching refspec, any query should match */
+			string_list_append(&reversed, needle);
+		} else if (!refspec->src) {
+			BUG("refspec->src should not be null here");
+		} else if (!strcmp(needle, refspec->src)) {
+			string_list_append(&reversed, refspec->src);
+		}
+	}
+
+	for (i = 0; !matched_negative && i < reversed.nr; i++) {
+		if (omit_name_by_refspec(reversed.items[i].string, rs))
+			matched_negative = 1;
+	}
+
+	string_list_clear(&reversed, 0);
+
+	return matched_negative;
+}
+
 static void query_refspecs_multiple(struct refspec *rs,
 				    struct refspec_item *query,
 				    struct string_list *results)
@@ -713,6 +787,9 @@ static void query_refspecs_multiple(struct refspec *rs,
 	if (find_src && !query->dst)
 		BUG("query_refspecs_multiple: need either src or dst");
 
+	if (query_matches_negative_refspec(rs, query))
+		return;
+
 	for (i = 0; i < rs->nr; i++) {
 		struct refspec_item *refspec = &rs->items[i];
 		const char *key = find_src ? refspec->dst : refspec->src;
@@ -720,7 +797,7 @@ static void query_refspecs_multiple(struct refspec *rs,
 		const char *needle = find_src ? query->dst : query->src;
 		char **result = find_src ? &query->src : &query->dst;
 
-		if (!refspec->dst)
+		if (!refspec->dst || refspec->negative)
 			continue;
 		if (refspec->pattern) {
 			if (match_name_with_pattern(key, needle, value, result))
@@ -741,12 +818,15 @@ int query_refspecs(struct refspec *rs, struct refspec_item *query)
 	if (find_src && !query->dst)
 		BUG("query_refspecs: need either src or dst");
 
+	if (query_matches_negative_refspec(rs, query))
+		return -1;
+
 	for (i = 0; i < rs->nr; i++) {
 		struct refspec_item *refspec = &rs->items[i];
 		const char *key = find_src ? refspec->dst : refspec->src;
 		const char *value = find_src ? refspec->src : refspec->dst;
 
-		if (!refspec->dst)
+		if (!refspec->dst || refspec->negative)
 			continue;
 		if (refspec->pattern) {
 			if (match_name_with_pattern(key, needle, value, result)) {
@@ -1075,7 +1155,7 @@ static int match_explicit(struct ref *src, struct ref *dst,
 	const char *dst_value = rs->dst;
 	char *dst_guess;
 
-	if (rs->pattern || rs->matching)
+	if (rs->pattern || rs->matching || rs->negative)
 		return 0;
 
 	matched_src = matched_dst = NULL;
@@ -1151,6 +1231,10 @@ static char *get_ref_match(const struct refspec *rs, const struct ref *ref,
 	int matching_refs = -1;
 	for (i = 0; i < rs->nr; i++) {
 		const struct refspec_item *item = &rs->items[i];
+
+		if (item->negative)
+			continue;
+
 		if (item->matching &&
 		    (matching_refs == -1 || item->force)) {
 			matching_refs = i;
@@ -1356,7 +1440,7 @@ int check_push_refs(struct ref *src, struct refspec *rs)
 	for (i = 0; i < rs->nr; i++) {
 		struct refspec_item *item = &rs->items[i];
 
-		if (item->pattern || item->matching)
+		if (item->pattern || item->matching || item->negative)
 			continue;
 
 		ret |= match_explicit_lhs(src, item, NULL, NULL);
@@ -1458,6 +1542,8 @@ int match_push_refs(struct ref *src, struct ref **dst,
 		string_list_clear(&src_ref_index, 0);
 	}
 
+	*dst = apply_negative_refspecs(*dst, rs);
+
 	if (errs)
 		return -1;
 	return 0;
@@ -1492,12 +1578,23 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
 		 * with the remote-tracking branch to find the value
 		 * to expect, but we did not have such a tracking
 		 * branch.
+		 *
+		 * If the tip of the remote-tracking ref is unreachable
+		 * from any reflog entry of its local ref indicating a
+		 * possible update since checkout; reject the push.
 		 */
 		if (ref->expect_old_sha1) {
 			if (!oideq(&ref->old_oid, &ref->old_oid_expect))
 				reject_reason = REF_STATUS_REJECT_STALE;
+			else if (ref->check_reachable && ref->unreachable)
+				reject_reason =
+					REF_STATUS_REJECT_REMOTE_UPDATED;
 			else
-				/* If the ref isn't stale then force the update. */
+				/*
+				 * If the ref isn't stale, and is reachable
+				 * from one of the reflog entries of
+				 * the local branch, force the update.
+				 */
 				force_ref_update = 1;
 		}
 
@@ -1567,7 +1664,7 @@ static void set_merge(struct branch *ret)
 
 	remote = remote_get(ret->remote_name);
 
-	ret->merge = xcalloc(ret->merge_nr, sizeof(*ret->merge));
+	CALLOC_ARRAY(ret->merge, ret->merge_nr);
 	for (i = 0; i < ret->merge_nr; i++) {
 		ret->merge[i] = xcalloc(1, sizeof(**ret->merge));
 		ret->merge[i]->src = xstrdup(ret->merge_name[i]);
@@ -1575,7 +1672,7 @@ static void set_merge(struct branch *ret)
 		    strcmp(ret->remote_name, "."))
 			continue;
 		if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
-			     &oid, &ref) == 1)
+			     &oid, &ref, 0) == 1)
 			ret->merge[i]->dst = ref;
 		else
 			ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
@@ -1590,7 +1687,7 @@ struct branch *branch_get(const char *name)
 	if (!name || !*name || !strcmp(name, "HEAD"))
 		ret = current_branch;
 	else
-		ret = make_branch(name, 0);
+		ret = make_branch(name, strlen(name));
 	set_merge(ret);
 	return ret;
 }
@@ -1827,6 +1924,9 @@ int get_fetch_map(const struct ref *remote_refs,
 {
 	struct ref *ref_map, **rmp;
 
+	if (refspec->negative)
+		return 0;
+
 	if (refspec->pattern) {
 		ref_map = get_expanded_map(remote_refs, refspec);
 	} else {
@@ -1902,7 +2002,7 @@ static int stat_branch_pair(const char *branch_name, const char *base,
 	struct object_id oid;
 	struct commit *ours, *theirs;
 	struct rev_info revs;
-	struct argv_array argv = ARGV_ARRAY_INIT;
+	struct strvec argv = STRVEC_INIT;
 
 	/* Cannot stat if what we used to build on no longer exists */
 	if (read_ref(base, &oid))
@@ -1928,15 +2028,15 @@ static int stat_branch_pair(const char *branch_name, const char *base,
 		BUG("stat_branch_pair: invalid abf '%d'", abf);
 
 	/* Run "rev-list --left-right ours...theirs" internally... */
-	argv_array_push(&argv, ""); /* ignored */
-	argv_array_push(&argv, "--left-right");
-	argv_array_pushf(&argv, "%s...%s",
-			 oid_to_hex(&ours->object.oid),
-			 oid_to_hex(&theirs->object.oid));
-	argv_array_push(&argv, "--");
+	strvec_push(&argv, ""); /* ignored */
+	strvec_push(&argv, "--left-right");
+	strvec_pushf(&argv, "%s...%s",
+		     oid_to_hex(&ours->object.oid),
+		     oid_to_hex(&theirs->object.oid));
+	strvec_push(&argv, "--");
 
 	repo_init_revisions(the_repository, &revs, NULL);
-	setup_revisions(argv.argc, argv.argv, &revs, NULL);
+	setup_revisions(argv.nr, argv.v, &revs, NULL);
 	if (prepare_revision_walk(&revs))
 		die(_("revision walk setup failed"));
 
@@ -1955,7 +2055,7 @@ static int stat_branch_pair(const char *branch_name, const char *base,
 	clear_commit_marks(ours, ALL_REV_FLAGS);
 	clear_commit_marks(theirs, ALL_REV_FLAGS);
 
-	argv_array_clear(&argv);
+	strvec_clear(&argv);
 	return 1;
 }
 
@@ -2114,8 +2214,17 @@ struct ref *guess_remote_head(const struct ref *head,
 	if (head->symref)
 		return copy_ref(find_ref_by_name(refs, head->symref));
 
-	/* If refs/heads/master could be right, it is. */
+	/* If a remote branch exists with the default branch name, let's use it. */
 	if (!all) {
+		char *ref = xstrfmt("refs/heads/%s",
+				    git_default_branch_name(0));
+
+		r = find_ref_by_name(refs, ref);
+		free(ref);
+		if (r && oideq(&r->old_oid, &head->old_oid))
+			return copy_ref(r);
+
+		/* Fall back to the hard-coded historical default */
 		r = find_ref_by_name(refs, "refs/heads/master");
 		if (r && oideq(&r->old_oid, &head->old_oid))
 			return copy_ref(r);
@@ -2264,12 +2373,13 @@ int is_empty_cas(const struct push_cas_option *cas)
 
 /*
  * Look at remote.fetch refspec and see if we have a remote
- * tracking branch for the refname there.  Fill its current
- * value in sha1[].
+ * tracking branch for the refname there. Fill the name of
+ * the remote-tracking branch in *dst_refname, and the name
+ * of the commit object at its tip in oid[].
  * If we cannot do so, return negative to signal an error.
  */
 static int remote_tracking(struct remote *remote, const char *refname,
-			   struct object_id *oid)
+			   struct object_id *oid, char **dst_refname)
 {
 	char *dst;
 
@@ -2278,9 +2388,150 @@ static int remote_tracking(struct remote *remote, const char *refname,
 		return -1; /* no tracking ref for refname at remote */
 	if (read_ref(dst, oid))
 		return -1; /* we know what the tracking ref is but we cannot read it */
+
+	*dst_refname = dst;
+	return 0;
+}
+
+/*
+ * The struct "reflog_commit_array" and related helper functions
+ * are used for collecting commits into an array during reflog
+ * traversals in "check_and_collect_until()".
+ */
+struct reflog_commit_array {
+	struct commit **item;
+	size_t nr, alloc;
+};
+
+#define REFLOG_COMMIT_ARRAY_INIT { NULL, 0, 0 }
+
+/* Append a commit to the array. */
+static void append_commit(struct reflog_commit_array *arr,
+			  struct commit *commit)
+{
+	ALLOC_GROW(arr->item, arr->nr + 1, arr->alloc);
+	arr->item[arr->nr++] = commit;
+}
+
+/* Free and reset the array. */
+static void free_commit_array(struct reflog_commit_array *arr)
+{
+	FREE_AND_NULL(arr->item);
+	arr->nr = arr->alloc = 0;
+}
+
+struct check_and_collect_until_cb_data {
+	struct commit *remote_commit;
+	struct reflog_commit_array *local_commits;
+	timestamp_t remote_reflog_timestamp;
+};
+
+/* Get the timestamp of the latest entry. */
+static int peek_reflog(struct object_id *o_oid, struct object_id *n_oid,
+		       const char *ident, timestamp_t timestamp,
+		       int tz, const char *message, void *cb_data)
+{
+	timestamp_t *ts = cb_data;
+	*ts = timestamp;
+	return 1;
+}
+
+static int check_and_collect_until(struct object_id *o_oid,
+				   struct object_id *n_oid,
+				   const char *ident, timestamp_t timestamp,
+				   int tz, const char *message, void *cb_data)
+{
+	struct commit *commit;
+	struct check_and_collect_until_cb_data *cb = cb_data;
+
+	/* An entry was found. */
+	if (oideq(n_oid, &cb->remote_commit->object.oid))
+		return 1;
+
+	if ((commit = lookup_commit_reference(the_repository, n_oid)))
+		append_commit(cb->local_commits, commit);
+
+	/*
+	 * If the reflog entry timestamp is older than the remote ref's
+	 * latest reflog entry, there is no need to check or collect
+	 * entries older than this one.
+	 */
+	if (timestamp < cb->remote_reflog_timestamp)
+		return -1;
+
 	return 0;
 }
 
+#define MERGE_BASES_BATCH_SIZE 8
+
+/*
+ * Iterate through the reflog of the local ref to check if there is an entry
+ * for the given remote-tracking ref; runs until the timestamp of an entry is
+ * older than latest timestamp of remote-tracking ref's reflog. Any commits
+ * are that seen along the way are collected into an array to check if the
+ * remote-tracking ref is reachable from any of them.
+ */
+static int is_reachable_in_reflog(const char *local, const struct ref *remote)
+{
+	timestamp_t date;
+	struct commit *commit;
+	struct commit **chunk;
+	struct check_and_collect_until_cb_data cb;
+	struct reflog_commit_array arr = REFLOG_COMMIT_ARRAY_INIT;
+	size_t size = 0;
+	int ret = 0;
+
+	commit = lookup_commit_reference(the_repository, &remote->old_oid);
+	if (!commit)
+		goto cleanup_return;
+
+	/*
+	 * Get the timestamp from the latest entry
+	 * of the remote-tracking ref's reflog.
+	 */
+	for_each_reflog_ent_reverse(remote->tracking_ref, peek_reflog, &date);
+
+	cb.remote_commit = commit;
+	cb.local_commits = &arr;
+	cb.remote_reflog_timestamp = date;
+	ret = for_each_reflog_ent_reverse(local, check_and_collect_until, &cb);
+
+	/* We found an entry in the reflog. */
+	if (ret > 0)
+		goto cleanup_return;
+
+	/*
+	 * Check if the remote commit is reachable from any
+	 * of the commits in the collected array, in batches.
+	 */
+	for (chunk = arr.item; chunk < arr.item + arr.nr; chunk += size) {
+		size = arr.item + arr.nr - chunk;
+		if (MERGE_BASES_BATCH_SIZE < size)
+			size = MERGE_BASES_BATCH_SIZE;
+
+		if ((ret = in_merge_bases_many(commit, size, chunk)))
+			break;
+	}
+
+cleanup_return:
+	free_commit_array(&arr);
+	return ret;
+}
+
+/*
+ * Check for reachability of a remote-tracking
+ * ref in the reflog entries of its local ref.
+ */
+static void check_if_includes_upstream(struct ref *remote)
+{
+	struct ref *local = get_local_ref(remote->name);
+	if (!local)
+		return;
+
+	if (is_reachable_in_reflog(local->name, remote) <= 0)
+		remote->unreachable = 1;
+}
+
 static void apply_cas(struct push_cas_option *cas,
 		      struct remote *remote,
 		      struct ref *ref)
@@ -2295,8 +2546,12 @@ static void apply_cas(struct push_cas_option *cas,
 		ref->expect_old_sha1 = 1;
 		if (!entry->use_tracking)
 			oidcpy(&ref->old_oid_expect, &entry->expect);
-		else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
+		else if (remote_tracking(remote, ref->name,
+					 &ref->old_oid_expect,
+					 &ref->tracking_ref))
 			oidclr(&ref->old_oid_expect);
+		else
+			ref->check_reachable = cas->use_force_if_includes;
 		return;
 	}
 
@@ -2305,8 +2560,12 @@ static void apply_cas(struct push_cas_option *cas,
 		return;
 
 	ref->expect_old_sha1 = 1;
-	if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
+	if (remote_tracking(remote, ref->name,
+			    &ref->old_oid_expect,
+			    &ref->tracking_ref))
 		oidclr(&ref->old_oid_expect);
+	else
+		ref->check_reachable = cas->use_force_if_includes;
 }
 
 void apply_push_cas(struct push_cas_option *cas,
@@ -2314,6 +2573,15 @@ void apply_push_cas(struct push_cas_option *cas,
 		    struct ref *remote_refs)
 {
 	struct ref *ref;
-	for (ref = remote_refs; ref; ref = ref->next)
+	for (ref = remote_refs; ref; ref = ref->next) {
 		apply_cas(cas, remote, ref);
+
+		/*
+		 * If "compare-and-swap" is in "use_tracking[_for_rest]"
+		 * mode, and if "--force-if-includes" was specified, run
+		 * the check.
+		 */
+		if (ref->check_reachable)
+			check_if_includes_upstream(ref);
+	}
 }
diff --git a/remote.h b/remote.h
index 0e1d2b245b..5a59198252 100644
--- a/remote.h
+++ b/remote.h
@@ -6,6 +6,16 @@
 #include "hashmap.h"
 #include "refspec.h"
 
+struct transport_ls_refs_options;
+
+/**
+ * The API gives access to the configuration related to remotes. It handles
+ * all three configuration mechanisms historically and currently used by Git,
+ * and presents the information in a uniform fashion. Note that the code also
+ * handles plain URLs without any configuration, giving them just the default
+ * information.
+ */
+
 enum {
 	REMOTE_UNCONFIGURED = 0,
 	REMOTE_CONFIG,
@@ -16,16 +26,22 @@ enum {
 struct remote {
 	struct hashmap_entry ent;
 
+	/* The user's nickname for the remote */
 	const char *name;
+
 	int origin, configured_in_repo;
 
 	const char *foreign_vcs;
 
+	/* An array of all of the url_nr URLs configured for the remote */
 	const char **url;
+
 	int url_nr;
 	int url_alloc;
 
+	/* An array of all of the pushurl_nr push URLs configured for the remote */
 	const char **pushurl;
+
 	int pushurl_nr;
 	int pushurl_alloc;
 
@@ -34,48 +50,79 @@ struct remote {
 	struct refspec fetch;
 
 	/*
+	 * The setting for whether to fetch tags (as a separate rule from the
+	 * configured refspecs);
 	 * -1 to never fetch tags
 	 * 0 to auto-follow tags on heuristic (default)
 	 * 1 to always auto-follow tags
 	 * 2 to always fetch tags
 	 */
 	int fetch_tags;
+
 	int skip_default_update;
 	int mirror;
 	int prune;
 	int prune_tags;
 
+	/**
+	 * The configured helper programs to run on the remote side, for
+	 * Git-native protocols.
+	 */
 	const char *receivepack;
 	const char *uploadpack;
 
-	/*
-	 * for curl remotes only
-	 */
+	/* The proxy to use for curl (http, https, ftp, etc.) URLs. */
 	char *http_proxy;
+
+	/* The method used for authenticating against `http_proxy`. */
 	char *http_proxy_authmethod;
 };
 
+/**
+ * struct remotes can be found by name with remote_get().
+ * remote_get(NULL) will return the default remote, given the current branch
+ * and configuration.
+ */
 struct remote *remote_get(const char *name);
+
 struct remote *pushremote_get(const char *name);
 int remote_is_configured(struct remote *remote, int in_repo);
 
 typedef int each_remote_fn(struct remote *remote, void *priv);
+
+/* iterate through struct remotes */
 int for_each_remote(each_remote_fn fn, void *priv);
 
 int remote_has_url(struct remote *remote, const char *url);
 
+struct ref_push_report {
+	const char *ref_name;
+	struct object_id *old_oid;
+	struct object_id *new_oid;
+	unsigned int forced_update:1;
+	struct ref_push_report *next;
+};
+
 struct ref {
 	struct ref *next;
 	struct object_id old_oid;
 	struct object_id new_oid;
 	struct object_id old_oid_expect; /* used by expect-old */
 	char *symref;
+	char *tracking_ref;
 	unsigned int
 		force:1,
 		forced_update:1,
 		expect_old_sha1:1,
 		exact_oid:1,
-		deletion:1;
+		deletion:1,
+		/* Need to check if local reflog reaches the remote tip. */
+		check_reachable:1,
+		/*
+		 * Store the result of the check enabled by "check_reachable";
+		 * implies the local reflog does not reach the remote tip.
+		 */
+		unreachable:1;
 
 	enum {
 		REF_NOT_MATCHED = 0, /* initial value */
@@ -89,7 +136,7 @@ struct ref {
 	 * should be 0, so that xcalloc'd structures get it
 	 * by default.
 	 */
-	enum {
+	enum fetch_head_status {
 		FETCH_HEAD_MERGE = -1,
 		FETCH_HEAD_NOT_FOR_MERGE = 0,
 		FETCH_HEAD_IGNORE = 1
@@ -105,12 +152,14 @@ struct ref {
 		REF_STATUS_REJECT_NEEDS_FORCE,
 		REF_STATUS_REJECT_STALE,
 		REF_STATUS_REJECT_SHALLOW,
+		REF_STATUS_REJECT_REMOTE_UPDATED,
 		REF_STATUS_UPTODATE,
 		REF_STATUS_REMOTE_REJECT,
 		REF_STATUS_EXPECTING_REPORT,
 		REF_STATUS_ATOMIC_PUSH_FAILED
 	} status;
 	char *remote_status;
+	struct ref_push_report *report;
 	struct ref *peer_ref; /* when renaming */
 	char name[FLEX_ARRAY]; /* more */
 };
@@ -139,7 +188,7 @@ void free_refs(struct ref *ref);
 
 struct oid_array;
 struct packet_reader;
-struct argv_array;
+struct strvec;
 struct string_list;
 struct ref **get_remote_heads(struct packet_reader *reader,
 			      struct ref **list, unsigned int flags,
@@ -149,8 +198,9 @@ struct ref **get_remote_heads(struct packet_reader *reader,
 /* Used for protocol v2 in order to retrieve refs from a remote */
 struct ref **get_remote_refs(int fd_out, struct packet_reader *reader,
 			     struct ref **list, int for_push,
-			     const struct argv_array *ref_prefixes,
-			     const struct string_list *server_options);
+			     struct transport_ls_refs_options *transport_options,
+			     const struct string_list *server_options,
+			     int stateless_rpc);
 
 int resolve_remote_symref(struct ref *ref, struct ref *list);
 
@@ -163,6 +213,12 @@ int resolve_remote_symref(struct ref *ref, struct ref *list);
  */
 struct ref *ref_remove_duplicates(struct ref *ref_map);
 
+/*
+ * Remove all entries in the input list which match any negative refspec in
+ * the refspec list.
+ */
+struct ref *apply_negative_refspecs(struct ref *ref_map, struct refspec *rs);
+
 int query_refspecs(struct refspec *rs, struct refspec_item *query);
 char *apply_refspecs(struct refspec *rs, const char *name);
 
@@ -175,7 +231,8 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror,
 /*
  * Given a list of the remote refs and the specification of things to
  * fetch, makes a (separate) list of the refs to fetch and the local
- * refs to store into.
+ * refs to store into. Note that negative refspecs are ignored here, and
+ * should be handled separately.
  *
  * *tail is the pointer to the tail pointer of the list of results
  * beforehand, and will be set to the tail pointer of the list of
@@ -194,16 +251,36 @@ struct ref *get_remote_ref(const struct ref *remote_refs, const char *name);
  */
 int remote_find_tracking(struct remote *remote, struct refspec_item *refspec);
 
+/**
+ * struct branch holds the configuration for a branch. It can be looked up with
+ * branch_get(name) for "refs/heads/{name}", or with branch_get(NULL) for HEAD.
+ */
 struct branch {
+
+	/* The short name of the branch. */
 	const char *name;
+
+	/* The full path for the branch ref. */
 	const char *refname;
 
+	/* The name of the remote listed in the configuration. */
 	const char *remote_name;
+
 	const char *pushremote_name;
 
+	/* An array of the "merge" lines in the configuration. */
 	const char **merge_name;
+
+	/**
+	 * An array of the struct refspecs used for the merge lines. That is,
+	 * merge[i]->dst is a local tracking ref which should be merged into this
+	 * branch by default.
+	 */
 	struct refspec_item **merge;
+
+	/* The number of merge configurations */
 	int merge_nr;
+
 	int merge_alloc;
 
 	const char *push_tracking_ref;
@@ -212,10 +289,11 @@ struct branch {
 struct branch *branch_get(const char *name);
 const char *remote_for_branch(struct branch *branch, int *explicit);
 const char *pushremote_for_branch(struct branch *branch, int *explicit);
-const char *remote_ref_for_branch(struct branch *branch, int for_push,
-				  int *explicit);
+const char *remote_ref_for_branch(struct branch *branch, int for_push);
 
+/* returns true if the given branch has merge configuration given. */
 int branch_has_merge_config(struct branch *branch);
+
 int branch_merge_matches(struct branch *, int n, const char *);
 
 /**
@@ -281,6 +359,7 @@ struct ref *get_stale_heads(struct refspec *rs, struct ref *fetch_map);
 
 struct push_cas_option {
 	unsigned use_tracking_for_rest:1;
+	unsigned use_force_if_includes:1;
 	struct push_cas {
 		struct object_id expect;
 		unsigned use_tracking:1;
diff --git a/replace-object.c b/replace-object.c
index e295e87943..7bd9aba6ee 100644
--- a/replace-object.c
+++ b/replace-object.c
@@ -34,14 +34,23 @@ static int register_replace_ref(struct repository *r,
 
 void prepare_replace_object(struct repository *r)
 {
-	if (r->objects->replace_map)
+	if (r->objects->replace_map_initialized)
 		return;
 
+	pthread_mutex_lock(&r->objects->replace_mutex);
+	if (r->objects->replace_map_initialized) {
+		pthread_mutex_unlock(&r->objects->replace_mutex);
+		return;
+	}
+
 	r->objects->replace_map =
 		xmalloc(sizeof(*r->objects->replace_map));
 	oidmap_init(r->objects->replace_map, 0);
 
 	for_each_replace_ref(r, register_replace_ref, NULL);
+	r->objects->replace_map_initialized = 1;
+
+	pthread_mutex_unlock(&r->objects->replace_mutex);
 }
 
 /* We allow "recursive" replacement. Only within reason, though */
diff --git a/replace-object.h b/replace-object.h
index 04ed7a85a2..3fbc32eb7b 100644
--- a/replace-object.h
+++ b/replace-object.h
@@ -24,12 +24,17 @@ const struct object_id *do_lookup_replace_object(struct repository *r,
  * name (replaced recursively, if necessary).  The return value is
  * either sha1 or a pointer to a permanently-allocated value.  When
  * object replacement is suppressed, always return sha1.
+ *
+ * Note: some thread debuggers might point a data race on the
+ * replace_map_initialized reading in this function. However, we know there's no
+ * problem in the value being updated by one thread right after another one read
+ * it here (and it should be written to only once, anyway).
  */
 static inline const struct object_id *lookup_replace_object(struct repository *r,
 							    const struct object_id *oid)
 {
 	if (!read_replace_refs ||
-	    (r->objects->replace_map &&
+	    (r->objects->replace_map_initialized &&
 	     r->objects->replace_map->map.tablesize == 0))
 		return oid;
 	return do_lookup_replace_object(r, oid);
diff --git a/repo-settings.c b/repo-settings.c
index a703e407a3..0cfe8b787d 100644
--- a/repo-settings.c
+++ b/repo-settings.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 #include "config.h"
 #include "repository.h"
+#include "midx.h"
 
 #define UPDATE_DEFAULT_BOOL(s,v) do { if (s == -1) { s = v; } } while(0)
 
@@ -17,9 +18,12 @@ void prepare_repo_settings(struct repository *r)
 
 	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);
 
 	if (!repo_config_get_int(r, "index.version", &value))
@@ -39,25 +43,33 @@ void prepare_repo_settings(struct repository *r)
 	if (!repo_config_get_string(r, "fetch.negotiationalgorithm", &strval)) {
 		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
 			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);
 	}
+
 	if (!repo_config_get_bool(r, "fetch.writecommitgraph", &value))
 		r->settings.fetch_write_commit_graph = value;
-	if (!repo_config_get_bool(r, "feature.experimental", &value) && value) {
-		UPDATE_DEFAULT_BOOL(r->settings.pack_use_sparse, 1);
-		UPDATE_DEFAULT_BOOL(r->settings.fetch_negotiation_algorithm, FETCH_NEGOTIATION_SKIPPING);
-		UPDATE_DEFAULT_BOOL(r->settings.fetch_write_commit_graph, 1);
-	}
 	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;
@@ -65,4 +77,19 @@ void prepare_repo_settings(struct repository *r)
 		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
+	 * codebase around uses of the index, this setting will be
+	 * 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 682c239fe3..b2bf44c6fa 100644
--- a/repository.c
+++ b/repository.c
@@ -10,6 +10,8 @@
 #include "object.h"
 #include "lockfile.h"
 #include "submodule-config.h"
+#include "sparse-index.h"
+#include "promisor-remote.h"
 
 /* The main repository */
 static struct repository the_repo;
@@ -72,7 +74,7 @@ void repo_set_gitdir(struct repository *repo,
 	repo_set_commondir(repo, o->commondir);
 
 	if (!repo->objects->odb) {
-		repo->objects->odb = xcalloc(1, sizeof(*repo->objects->odb));
+		CALLOC_ARRAY(repo->objects->odb, 1);
 		repo->objects->odb_tail = &repo->objects->odb->next;
 	}
 	expand_base_dir(&repo->objects->odb->path, o->object_dir,
@@ -171,6 +173,10 @@ int repo_init(struct repository *repo,
 
 	repo_set_hash_algo(repo, format.hash_algo);
 
+	/* take ownership of format.partial_clone */
+	repo->repository_format_partial_clone = format.partial_clone;
+	format.partial_clone = NULL;
+
 	if (worktree)
 		repo_set_worktree(repo, worktree);
 
@@ -200,9 +206,9 @@ int repo_submodule_init(struct repository *subrepo,
 
 	if (repo_init(subrepo, gitdir.buf, worktree.buf)) {
 		/*
-		 * If initilization fails then it may be due to the submodule
+		 * If initialization fails then it may be due to the submodule
 		 * not being populated in the superproject's worktree.  Instead
-		 * we can try to initilize the submodule by finding it's gitdir
+		 * we can try to initialize the submodule by finding it's gitdir
 		 * in the superproject's 'modules' directory.  In this case the
 		 * submodule would not have a worktree.
 		 */
@@ -257,14 +263,33 @@ void repo_clear(struct repository *repo)
 		if (repo->index != &the_index)
 			FREE_AND_NULL(repo->index);
 	}
+
+	if (repo->promisor_remote_config) {
+		promisor_remote_clear(repo->promisor_remote_config);
+		FREE_AND_NULL(repo->promisor_remote_config);
+	}
 }
 
 int repo_read_index(struct repository *repo)
 {
+	int res;
+
 	if (!repo->index)
-		repo->index = xcalloc(1, sizeof(*repo->index));
+		CALLOC_ARRAY(repo->index, 1);
+
+	/* Complete the double-reference */
+	if (!repo->index->repo)
+		repo->index->repo = repo;
+	else if (repo->index->repo != repo)
+		BUG("repo's index should point back at itself");
+
+	res = read_index_from(repo->index, repo->index_file, repo->gitdir);
+
+	prepare_repo_settings(repo);
+	if (repo->settings.command_requires_full_index)
+		ensure_full_index(repo->index);
 
-	return read_index_from(repo->index, repo->index_file, repo->gitdir);
+	return res;
 }
 
 int repo_hold_locked_index(struct repository *repo,
diff --git a/repository.h b/repository.h
index fe42197813..3740c93bc0 100644
--- a/repository.h
+++ b/repository.h
@@ -10,6 +10,7 @@ struct lock_file;
 struct pathspec;
 struct raw_object_store;
 struct submodule_cache;
+struct promisor_remote_config;
 
 enum untracked_cache_setting {
 	UNTRACKED_CACHE_UNSET = -1,
@@ -23,12 +24,14 @@ enum fetch_negotiation_setting {
 	FETCH_NEGOTIATION_NONE = 0,
 	FETCH_NEGOTIATION_DEFAULT = 1,
 	FETCH_NEGOTIATION_SKIPPING = 2,
+	FETCH_NEGOTIATION_NOOP = 3,
 };
 
 struct repo_settings {
 	int initialized;
 
 	int core_commit_graph;
+	int commit_graph_read_changed_paths;
 	int gc_write_commit_graph;
 	int fetch_write_commit_graph;
 
@@ -37,6 +40,11 @@ struct repo_settings {
 
 	int pack_use_sparse;
 	enum fetch_negotiation_setting fetch_negotiation_algorithm;
+
+	int core_multi_pack_index;
+
+	unsigned command_requires_full_index:1,
+		 sparse_index:1;
 };
 
 struct repository {
@@ -67,8 +75,12 @@ struct repository {
 	 */
 	struct parsed_object_pool *parsed_objects;
 
-	/* The store in which the refs are held. */
-	struct ref_store *refs;
+	/*
+	 * The store in which the refs are held. This should generally only be
+	 * accessed via get_main_ref_store(), as that will lazily initialize
+	 * the ref object.
+	 */
+	struct ref_store *refs_private;
 
 	/*
 	 * Contains path to often used file names.
@@ -128,6 +140,10 @@ struct repository {
 	/* True if commit-graph has been disabled within this process. */
 	int commit_graph_disabled;
 
+	/* Configurations related to promisor remotes. */
+	char *repository_format_partial_clone;
+	struct promisor_remote_config *promisor_remote_config;
+
 	/* Configurations */
 
 	/* Indicate if a repository has a different 'commondir' from 'gitdir' */
@@ -172,7 +188,7 @@ void repo_clear(struct repository *repo);
  * be allocated if needed.
  *
  * Return the number of index entries in the populated index or a value less
- * than zero if an error occured.  If the repository's index has already been
+ * than zero if an error occurred.  If the repository's index has already been
  * populated then the number of entries will simply be returned.
  */
 int repo_read_index(struct repository *repo);
@@ -192,4 +208,10 @@ void repo_update_index_if_able(struct repository *, struct lock_file *);
 
 void prepare_repo_settings(struct repository *r);
 
+/*
+ * Return 1 if upgrade repository format to target_version succeeded,
+ * 0 if no upgrade is necessary, and -1 when upgrade is not possible.
+ */
+int upgrade_repository_format(int target_version);
+
 #endif /* REPOSITORY_H */
diff --git a/rerere.c b/rerere.c
index 3e51fdfe58..d83d58df4f 100644
--- a/rerere.c
+++ b/rerere.c
@@ -10,7 +10,8 @@
 #include "attr.h"
 #include "pathspec.h"
 #include "object-store.h"
-#include "sha1-lookup.h"
+#include "hash-lookup.h"
+#include "strmap.h"
 
 #define RESOLVED 0
 #define PUNTED 1
@@ -23,26 +24,27 @@ static int rerere_enabled = -1;
 /* automatically update cleanly resolved paths to the index */
 static int rerere_autoupdate;
 
-static int rerere_dir_nr;
-static int rerere_dir_alloc;
-
 #define RR_HAS_POSTIMAGE 1
 #define RR_HAS_PREIMAGE 2
-static struct rerere_dir {
-	unsigned char hash[GIT_MAX_HEXSZ];
+struct rerere_dir {
 	int status_alloc, status_nr;
 	unsigned char *status;
-} **rerere_dir;
+	char name[FLEX_ARRAY];
+};
+
+static struct strmap rerere_dirs = STRMAP_INIT;
 
 static void free_rerere_dirs(void)
 {
-	int i;
-	for (i = 0; i < rerere_dir_nr; i++) {
-		free(rerere_dir[i]->status);
-		free(rerere_dir[i]);
+	struct hashmap_iter iter;
+	struct strmap_entry *ent;
+
+	strmap_for_each_entry(&rerere_dirs, &iter, ent) {
+		struct rerere_dir *rr_dir = ent->value;
+		free(rr_dir->status);
+		free(rr_dir);
 	}
-	FREE_AND_NULL(rerere_dir);
-	rerere_dir_nr = rerere_dir_alloc = 0;
+	strmap_clear(&rerere_dirs, 0);
 }
 
 static void free_rerere_id(struct string_list_item *item)
@@ -52,7 +54,7 @@ static void free_rerere_id(struct string_list_item *item)
 
 static const char *rerere_id_hex(const struct rerere_id *id)
 {
-	return hash_to_hex(id->collection->hash);
+	return id->collection->name;
 }
 
 static void fit_variant(struct rerere_dir *rr_dir, int variant)
@@ -115,7 +117,7 @@ static int is_rr_file(const char *name, const char *filename, int *variant)
 static void scan_rerere_dir(struct rerere_dir *rr_dir)
 {
 	struct dirent *de;
-	DIR *dir = opendir(git_path("rr-cache/%s", hash_to_hex(rr_dir->hash)));
+	DIR *dir = opendir(git_path("rr-cache/%s", rr_dir->name));
 
 	if (!dir)
 		return;
@@ -133,39 +135,21 @@ static void scan_rerere_dir(struct rerere_dir *rr_dir)
 	closedir(dir);
 }
 
-static const unsigned char *rerere_dir_hash(size_t i, void *table)
-{
-	struct rerere_dir **rr_dir = table;
-	return rr_dir[i]->hash;
-}
-
 static struct rerere_dir *find_rerere_dir(const char *hex)
 {
-	unsigned char hash[GIT_MAX_RAWSZ];
 	struct rerere_dir *rr_dir;
-	int pos;
-
-	if (get_sha1_hex(hex, hash))
-		return NULL; /* BUG */
-	pos = sha1_pos(hash, rerere_dir, rerere_dir_nr, rerere_dir_hash);
-	if (pos < 0) {
-		rr_dir = xmalloc(sizeof(*rr_dir));
-		hashcpy(rr_dir->hash, hash);
+
+	rr_dir = strmap_get(&rerere_dirs, hex);
+	if (!rr_dir) {
+		FLEX_ALLOC_STR(rr_dir, name, hex);
 		rr_dir->status = NULL;
 		rr_dir->status_nr = 0;
 		rr_dir->status_alloc = 0;
-		pos = -1 - pos;
-
-		/* Make sure the array is big enough ... */
-		ALLOC_GROW(rerere_dir, rerere_dir_nr + 1, rerere_dir_alloc);
-		/* ... and add it in. */
-		rerere_dir_nr++;
-		MOVE_ARRAY(rerere_dir + pos + 1, rerere_dir + pos,
-			   rerere_dir_nr - pos - 1);
-		rerere_dir[pos] = rr_dir;
+		strmap_put(&rerere_dirs, hex, rr_dir);
+
 		scan_rerere_dir(rr_dir);
 	}
-	return rerere_dir[pos];
+	return rr_dir;
 }
 
 static int has_rerere_resolution(const struct rerere_id *id)
@@ -431,7 +415,7 @@ static int handle_conflict(struct strbuf *out, struct rerere_io *io,
  * and NUL concatenated together.
  *
  * Return 1 if conflict hunks are found, 0 if there are no conflict
- * hunks and -1 if an error occured.
+ * hunks and -1 if an error occurred.
  */
 static int handle_path(unsigned char *hash, struct rerere_io *io, int marker_size)
 {
@@ -1178,6 +1162,14 @@ static void prune_one(struct rerere_id *id,
 		unlink_rr_item(id);
 }
 
+/* Does the basename in "path" look plausibly like an rr-cache entry? */
+static int is_rr_cache_dirname(const char *path)
+{
+	struct object_id oid;
+	const char *end;
+	return !parse_oid_hex(path, &oid, &end) && !*end;
+}
+
 void rerere_gc(struct repository *r, struct string_list *rr)
 {
 	struct string_list to_remove = STRING_LIST_INIT_DUP;
@@ -1198,17 +1190,16 @@ void rerere_gc(struct repository *r, struct string_list *rr)
 	if (!dir)
 		die_errno(_("unable to open rr-cache directory"));
 	/* Collect stale conflict IDs ... */
-	while ((e = readdir(dir))) {
+	while ((e = readdir_skip_dot_and_dotdot(dir))) {
 		struct rerere_dir *rr_dir;
 		struct rerere_id id;
 		int now_empty;
 
-		if (is_dot_or_dotdot(e->d_name))
-			continue;
-		rr_dir = find_rerere_dir(e->d_name);
-		if (!rr_dir)
+		if (!is_rr_cache_dirname(e->d_name))
 			continue; /* or should we remove e->d_name? */
 
+		rr_dir = find_rerere_dir(e->d_name);
+
 		now_empty = 1;
 		for (id.variant = 0, id.collection = rr_dir;
 		     id.variant < id.collection->status_nr;
diff --git a/reset.c b/reset.c
new file mode 100644
index 0000000000..79310ae071
--- /dev/null
+++ b/reset.c
@@ -0,0 +1,141 @@
+#include "git-compat-util.h"
+#include "cache-tree.h"
+#include "lockfile.h"
+#include "refs.h"
+#include "reset.h"
+#include "run-command.h"
+#include "tree-walk.h"
+#include "tree.h"
+#include "unpack-trees.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)
+{
+	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;
+	struct tree_desc desc[2] = { { NULL }, { NULL } };
+	struct lock_file lock = LOCK_INIT;
+	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;
+	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 (!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)) {
+		ret = error(_("could not determine HEAD revision"));
+		goto leave_reset_head;
+	}
+
+	if (!oid)
+		oid = &head_oid;
+
+	if (refs_only)
+		goto reset_head_refs;
+
+	setup_unpack_trees_porcelain(&unpack_tree_opts, action);
+	unpack_tree_opts.head_idx = 1;
+	unpack_tree_opts.src_index = r->index;
+	unpack_tree_opts.dst_index = r->index;
+	unpack_tree_opts.fn = reset_hard ? oneway_merge : twoway_merge;
+	unpack_tree_opts.update = 1;
+	unpack_tree_opts.merge = 1;
+	init_checkout_metadata(&unpack_tree_opts.meta, switch_to_branch, oid, NULL);
+	if (!detach_head)
+		unpack_tree_opts.reset = 1;
+
+	if (repo_read_index_unmerged(r) < 0) {
+		ret = error(_("could not read index"));
+		goto leave_reset_head;
+	}
+
+	if (!reset_hard && !fill_tree_descriptor(r, &desc[nr++], &head_oid)) {
+		ret = error(_("failed to find tree of %s"),
+			    oid_to_hex(&head_oid));
+		goto leave_reset_head;
+	}
+
+	if (!fill_tree_descriptor(r, &desc[nr++], oid)) {
+		ret = error(_("failed to find tree of %s"), oid_to_hex(oid));
+		goto leave_reset_head;
+	}
+
+	if (unpack_trees(nr, desc, &unpack_tree_opts)) {
+		ret = -1;
+		goto leave_reset_head;
+	}
+
+	tree = parse_tree_indirect(oid);
+	prime_cache_tree(r, r->index, tree);
+
+	if (write_locked_index(r->index, &lock, COMMIT_LOCK) < 0) {
+		ret = error(_("could not write index"));
+		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);
+
+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
new file mode 100644
index 0000000000..12f83c78e2
--- /dev/null
+++ b/reset.h
@@ -0,0 +1,20 @@
+#ifndef RESET_H
+#define RESET_H
+
+#include "hash.h"
+#include "repository.h"
+
+#define GIT_REFLOG_ACTION_ENVIRONMENT "GIT_REFLOG_ACTION"
+
+#define RESET_HEAD_DETACH (1<<0)
+#define RESET_HEAD_HARD (1<<1)
+#define RESET_HEAD_RUN_POST_CHECKOUT_HOOK (1<<2)
+#define RESET_HEAD_REFS_ONLY (1<<3)
+#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);
+
+#endif
diff --git a/resolve-undo.c b/resolve-undo.c
index 236320f179..e81096e2d4 100644
--- a/resolve-undo.c
+++ b/resolve-undo.c
@@ -15,7 +15,7 @@ void record_resolve_undo(struct index_state *istate, struct cache_entry *ce)
 		return;
 
 	if (!istate->resolve_undo) {
-		resolve_undo = xcalloc(1, sizeof(*resolve_undo));
+		CALLOC_ARRAY(resolve_undo, 1);
 		resolve_undo->strdup_strings = 1;
 		istate->resolve_undo = resolve_undo;
 	}
@@ -57,7 +57,7 @@ struct string_list *resolve_undo_read(const char *data, unsigned long size)
 	int i;
 	const unsigned rawsz = the_hash_algo->rawsz;
 
-	resolve_undo = xcalloc(1, sizeof(*resolve_undo));
+	CALLOC_ARRAY(resolve_undo, 1);
 	resolve_undo->strdup_strings = 1;
 
 	while (size) {
@@ -172,6 +172,8 @@ void unmerge_marked_index(struct index_state *istate)
 	if (!istate->resolve_undo)
 		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 (ce->ce_flags & CE_MATCHED)
@@ -186,6 +188,8 @@ void unmerge_index(struct index_state *istate, const struct pathspec *pathspec)
 	if (!istate->resolve_undo)
 		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 (!ce_path_match(istate, ce, pathspec, NULL))
diff --git a/revision.c b/revision.c
index 0e39b2b8a5..0dabb5a0bc 100644
--- a/revision.c
+++ b/revision.c
@@ -5,6 +5,7 @@
 #include "tree.h"
 #include "commit.h"
 #include "diff.h"
+#include "diff-merges.h"
 #include "refs.h"
 #include "revision.h"
 #include "repository.h"
@@ -23,12 +24,14 @@
 #include "bisect.h"
 #include "packfile.h"
 #include "worktree.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "commit-reach.h"
 #include "commit-graph.h"
 #include "prio-queue.h"
 #include "hashmap.h"
 #include "utf8.h"
+#include "bloom.h"
+#include "json-writer.h"
 
 volatile show_early_output_fn_t show_early_output;
 
@@ -37,6 +40,8 @@ static const char *term_good;
 
 implement_shared_commit_slab(revision_sources, char *);
 
+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;
@@ -120,11 +125,6 @@ static int path_and_oids_cmp(const void *hashmap_cmp_fn_data,
 	return strcmp(e1->path, e2->path);
 }
 
-static void paths_and_oids_init(struct hashmap *map)
-{
-	hashmap_init(map, path_and_oids_cmp, NULL, 0);
-}
-
 static void paths_and_oids_clear(struct hashmap *map)
 {
 	struct hashmap_iter iter;
@@ -135,7 +135,7 @@ static void paths_and_oids_clear(struct hashmap *map)
 		free(entry->path);
 	}
 
-	hashmap_free_entries(map, struct path_and_oids_entry, ent);
+	hashmap_clear_and_free(map, struct path_and_oids_entry, ent);
 }
 
 static void paths_and_oids_insert(struct hashmap *map,
@@ -154,7 +154,7 @@ static void paths_and_oids_insert(struct hashmap *map,
 
 	entry = hashmap_get_entry(map, &key, ent, NULL);
 	if (!entry) {
-		entry = xcalloc(1, sizeof(struct path_and_oids_entry));
+		CALLOC_ARRAY(entry, 1);
 		hashmap_entry_init(&entry->ent, hash);
 		entry->path = xstrdup(key.path);
 		oidset_init(&entry->trees, 16);
@@ -209,7 +209,7 @@ void mark_trees_uninteresting_sparse(struct repository *r,
 				     struct oidset *trees)
 {
 	unsigned has_interesting = 0, has_uninteresting = 0;
-	struct hashmap map;
+	struct hashmap map = HASHMAP_INIT(path_and_oids_cmp, NULL);
 	struct hashmap_iter map_iter;
 	struct path_and_oids_entry *entry;
 	struct object_id *oid;
@@ -233,8 +233,6 @@ void mark_trees_uninteresting_sparse(struct repository *r,
 	if (!has_uninteresting || !has_interesting)
 		return;
 
-	paths_and_oids_init(&map);
-
 	oidset_iter_init(trees, &iter);
 	while ((oid = oidset_iter_next(&iter))) {
 		struct tree *tree = lookup_tree(r, oid);
@@ -311,15 +309,17 @@ static void add_pending_object_with_path(struct rev_info *revs,
 					 const char *name, unsigned mode,
 					 const char *path)
 {
+	struct interpret_branch_name_options options = { 0 };
 	if (!obj)
 		return;
 	if (revs->no_walk && (obj->flags & UNINTERESTING))
 		revs->no_walk = 0;
 	if (revs->reflog_info && obj->type == OBJ_COMMIT) {
 		struct strbuf buf = STRBUF_INIT;
-		int len = interpret_branch_name(name, 0, &buf, 0);
+		size_t namelen = strlen(name);
+		int len = interpret_branch_name(name, namelen, &buf, &options);
 
-		if (0 < len && name[len] && buf.len)
+		if (0 < len && len < namelen && buf.len)
 			strbuf_addstr(&buf, name + len);
 		add_reflog_for_walk(revs->reflog_info,
 				    (struct commit *)obj,
@@ -360,20 +360,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)
@@ -435,7 +433,7 @@ static struct commit *handle_commit(struct rev_info *revs,
 	if (object->type == OBJ_COMMIT) {
 		struct commit *commit = (struct commit *)object;
 
-		if (parse_commit(commit) < 0)
+		if (repo_parse_commit(revs->repo, commit) < 0)
 			die("unable to parse commit %s", name);
 		if (flags & UNINTERESTING) {
 			mark_parents_uninteresting(commit);
@@ -624,11 +622,156 @@ static void file_change(struct diff_options *options,
 	options->flags.has_changes = 1;
 }
 
+static int bloom_filter_atexit_registered;
+static unsigned int count_bloom_filter_maybe;
+static unsigned int count_bloom_filter_definitely_not;
+static unsigned int count_bloom_filter_false_positive;
+static unsigned int count_bloom_filter_not_present;
+
+static void trace2_bloom_filter_statistics_atexit(void)
+{
+	struct json_writer jw = JSON_WRITER_INIT;
+
+	jw_object_begin(&jw, 0);
+	jw_object_intmax(&jw, "filter_not_present", count_bloom_filter_not_present);
+	jw_object_intmax(&jw, "maybe", count_bloom_filter_maybe);
+	jw_object_intmax(&jw, "definitely_not", count_bloom_filter_definitely_not);
+	jw_object_intmax(&jw, "false_positive", count_bloom_filter_false_positive);
+	jw_end(&jw);
+
+	trace2_data_json("bloom", the_repository, "statistics", &jw);
+
+	jw_release(&jw);
+}
+
+static int forbid_bloom_filters(struct pathspec *spec)
+{
+	if (spec->has_wildcard)
+		return 1;
+	if (spec->nr > 1)
+		return 1;
+	if (spec->magic & ~PATHSPEC_LITERAL)
+		return 1;
+	if (spec->nr && (spec->items[0].magic & ~PATHSPEC_LITERAL))
+		return 1;
+
+	return 0;
+}
+
+static void prepare_to_use_bloom_filter(struct rev_info *revs)
+{
+	struct pathspec_item *pi;
+	char *path_alloc = NULL;
+	const char *path, *p;
+	size_t len;
+	int path_component_nr = 1;
+
+	if (!revs->commits)
+		return;
+
+	if (forbid_bloom_filters(&revs->prune_data))
+		return;
+
+	repo_parse_commit(revs->repo, revs->commits->item);
+
+	revs->bloom_filter_settings = get_bloom_filter_settings(revs->repo);
+	if (!revs->bloom_filter_settings)
+		return;
+
+	if (!revs->pruning.pathspec.nr)
+		return;
+
+	pi = &revs->pruning.pathspec.items[0];
+
+	/* remove single trailing slash from path, if needed */
+	if (pi->len > 0 && pi->match[pi->len - 1] == '/') {
+		path_alloc = xmemdupz(pi->match, pi->len - 1);
+		path = path_alloc;
+	} else
+		path = pi->match;
+
+	len = strlen(path);
+	if (!len) {
+		revs->bloom_filter_settings = NULL;
+		free(path_alloc);
+		return;
+	}
+
+	p = path;
+	while (*p) {
+		/*
+		 * At this point, the path is normalized to use Unix-style
+		 * path separators. This is required due to how the
+		 * changed-path Bloom filters store the paths.
+		 */
+		if (*p == '/')
+			path_component_nr++;
+		p++;
+	}
+
+	revs->bloom_keys_nr = path_component_nr;
+	ALLOC_ARRAY(revs->bloom_keys, revs->bloom_keys_nr);
+
+	fill_bloom_key(path, len, &revs->bloom_keys[0],
+		       revs->bloom_filter_settings);
+	path_component_nr = 1;
+
+	p = path + len - 1;
+	while (p > path) {
+		if (*p == '/')
+			fill_bloom_key(path, p - path,
+				       &revs->bloom_keys[path_component_nr++],
+				       revs->bloom_filter_settings);
+		p--;
+	}
+
+	if (trace2_is_enabled() && !bloom_filter_atexit_registered) {
+		atexit(trace2_bloom_filter_statistics_atexit);
+		bloom_filter_atexit_registered = 1;
+	}
+
+	free(path_alloc);
+}
+
+static int check_maybe_different_in_bloom_filter(struct rev_info *revs,
+						 struct commit *commit)
+{
+	struct bloom_filter *filter;
+	int result = 1, j;
+
+	if (!revs->repo->objects->commit_graph)
+		return -1;
+
+	if (commit_graph_generation(commit) == GENERATION_NUMBER_INFINITY)
+		return -1;
+
+	filter = get_bloom_filter(revs->repo, commit);
+
+	if (!filter) {
+		count_bloom_filter_not_present++;
+		return -1;
+	}
+
+	for (j = 0; result && j < revs->bloom_keys_nr; j++) {
+		result = bloom_filter_contains(filter,
+					       &revs->bloom_keys[j],
+					       revs->bloom_filter_settings);
+	}
+
+	if (result)
+		count_bloom_filter_maybe++;
+	else
+		count_bloom_filter_definitely_not++;
+
+	return result;
+}
+
 static int rev_compare_tree(struct rev_info *revs,
-			    struct commit *parent, struct commit *commit)
+			    struct commit *parent, struct commit *commit, int nth_parent)
 {
 	struct tree *t1 = get_commit_tree(parent);
 	struct tree *t2 = get_commit_tree(commit);
+	int bloom_ret = 1;
 
 	if (!t1)
 		return REV_TREE_NEW;
@@ -653,17 +796,26 @@ static int rev_compare_tree(struct rev_info *revs,
 			return REV_TREE_SAME;
 	}
 
+	if (revs->bloom_keys_nr && !nth_parent) {
+		bloom_ret = check_maybe_different_in_bloom_filter(revs, commit);
+
+		if (bloom_ret == 0)
+			return REV_TREE_SAME;
+	}
+
 	tree_difference = REV_TREE_SAME;
 	revs->pruning.flags.has_changes = 0;
-	if (diff_tree_oid(&t1->object.oid, &t2->object.oid, "",
-			   &revs->pruning) < 0)
-		return REV_TREE_DIFFERENT;
+	diff_tree_oid(&t1->object.oid, &t2->object.oid, "", &revs->pruning);
+
+	if (!nth_parent)
+		if (bloom_ret == 1 && tree_difference == REV_TREE_SAME)
+			count_bloom_filter_false_positive++;
+
 	return tree_difference;
 }
 
 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
 {
-	int retval;
 	struct tree *t1 = get_commit_tree(commit);
 
 	if (!t1)
@@ -671,9 +823,9 @@ static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
 
 	tree_difference = REV_TREE_SAME;
 	revs->pruning.flags.has_changes = 0;
-	retval = diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
+	diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
 
-	return retval >= 0 && (tree_difference == REV_TREE_SAME);
+	return tree_difference == REV_TREE_SAME;
 }
 
 struct treesame_state {
@@ -851,11 +1003,11 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 					ts->treesame[0] = 1;
 			}
 		}
-		if (parse_commit(p) < 0)
+		if (repo_parse_commit(revs->repo, p) < 0)
 			die("cannot simplify commit %s (because of %s)",
 			    oid_to_hex(&commit->object.oid),
 			    oid_to_hex(&p->object.oid));
-		switch (rev_compare_tree(revs, p, commit)) {
+		switch (rev_compare_tree(revs, p, commit, nth_parent)) {
 		case REV_TREE_SAME:
 			if (!revs->simplify_history || !relevant_commit(p)) {
 				/* Even if a merge with an uninteresting
@@ -870,7 +1022,19 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 			}
 			parent->next = NULL;
 			commit->parents = parent;
-			commit->object.flags |= TREESAME;
+
+			/*
+			 * A merge commit is a "diversion" if it is not
+			 * TREESAME to its first parent but is TREESAME
+			 * to a later parent. In the simplified history,
+			 * we "divert" the history walk to the later
+			 * parent. These commits are shown when "show_pulls"
+			 * is enabled, so do not mark the object as
+			 * TREESAME here.
+			 */
+			if (!revs->show_pulls || !nth_parent)
+				commit->object.flags |= TREESAME;
+
 			return;
 
 		case REV_TREE_NEW:
@@ -884,7 +1048,7 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 				 * IOW, we pretend this parent is a
 				 * "root" commit.
 				 */
-				if (parse_commit(p) < 0)
+				if (repo_parse_commit(revs->repo, p) < 0)
 					die("cannot simplify commit %s (invalid %s)",
 					    oid_to_hex(&commit->object.oid),
 					    oid_to_hex(&p->object.oid));
@@ -897,6 +1061,10 @@ static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 				relevant_change = 1;
 			else
 				irrelevant_change = 1;
+
+			if (!nth_parent)
+				commit->object.flags |= PULL_MERGE;
+
 			continue;
 		}
 		die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
@@ -948,13 +1116,13 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
 			parent = parent->next;
 			if (p)
 				p->object.flags |= UNINTERESTING;
-			if (parse_commit_gently(p, 1) < 0)
+			if (repo_parse_commit_gently(revs->repo, p, 1) < 0)
 				continue;
 			if (p->parents)
 				mark_parents_uninteresting(p);
 			if (p->object.flags & SEEN)
 				continue;
-			p->object.flags |= SEEN;
+			p->object.flags |= (SEEN | NOT_USER_GIVEN);
 			if (list)
 				commit_list_insert_by_date(p, list);
 			if (queue)
@@ -979,7 +1147,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
 		struct commit *p = parent->item;
 		int gently = revs->ignore_missing_links ||
 			     revs->exclude_promisor_objects;
-		if (parse_commit_gently(p, gently) < 0) {
+		if (repo_parse_commit_gently(revs->repo, p, gently) < 0) {
 			if (revs->exclude_promisor_objects &&
 			    is_promisor_object(&p->object.oid)) {
 				if (revs->first_parent_only)
@@ -996,7 +1164,7 @@ static int process_parents(struct rev_info *revs, struct commit *commit,
 		}
 		p->object.flags |= left_flag;
 		if (!(p->object.flags & SEEN)) {
-			p->object.flags |= SEEN;
+			p->object.flags |= (SEEN | NOT_USER_GIVEN);
 			if (list)
 				commit_list_insert_by_date(p, list);
 			if (queue)
@@ -1073,12 +1241,14 @@ static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
 		/*
 		 * Have we seen the same patch id?
 		 */
-		id = has_commit_patch_id(commit, &ids);
+		id = patch_id_iter_first(commit, &ids);
 		if (!id)
 			continue;
 
 		commit->object.flags |= cherry_flag;
-		id->commit->object.flags |= cherry_flag;
+		do {
+			id->commit->object.flags |= cherry_flag;
+		} while ((id = patch_id_iter_next(id, &ids)));
 	}
 
 	free_patch_ids(&ids);
@@ -1222,20 +1392,20 @@ static int limit_list(struct rev_info *revs)
 {
 	int slop = SLOP;
 	timestamp_t date = TIME_MAX;
-	struct commit_list *list = revs->commits;
+	struct commit_list *original_list = revs->commits;
 	struct commit_list *newlist = NULL;
 	struct commit_list **p = &newlist;
 	struct commit_list *bottom = NULL;
 	struct commit *interesting_cache = NULL;
 
 	if (revs->ancestry_path) {
-		bottom = collect_bottom_commits(list);
+		bottom = collect_bottom_commits(original_list);
 		if (!bottom)
 			die("--ancestry-path given but there are no bottom commits");
 	}
 
-	while (list) {
-		struct commit *commit = pop_commit(&list);
+	while (original_list) {
+		struct commit *commit = pop_commit(&original_list);
 		struct object *obj = &commit->object;
 		show_early_output_fn_t show;
 
@@ -1244,16 +1414,17 @@ static int limit_list(struct rev_info *revs)
 
 		if (revs->max_age != -1 && (commit->date < revs->max_age))
 			obj->flags |= UNINTERESTING;
-		if (process_parents(revs, commit, &list, NULL) < 0)
+		if (process_parents(revs, commit, &original_list, NULL) < 0)
 			return -1;
 		if (obj->flags & UNINTERESTING) {
 			mark_parents_uninteresting(commit);
-			slop = still_interesting(list, date, slop, &interesting_cache);
+			slop = still_interesting(original_list, date, slop, &interesting_cache);
 			if (slop)
 				continue;
 			break;
 		}
-		if (revs->min_age != -1 && (commit->date > revs->min_age))
+		if (revs->min_age != -1 && (commit->date > revs->min_age) &&
+		    !revs->line_level_traverse)
 			continue;
 		date = commit->date;
 		p = &commit_list_insert(commit, p)->next;
@@ -1280,14 +1451,17 @@ static int limit_list(struct rev_info *revs)
 	 * Check if any commits have become TREESAME by some of their parents
 	 * becoming UNINTERESTING.
 	 */
-	if (limiting_can_increase_treesame(revs))
+	if (limiting_can_increase_treesame(revs)) {
+		struct commit_list *list = NULL;
 		for (list = newlist; list; list = list->next) {
 			struct commit *c = list->item;
 			if (c->object.flags & (UNINTERESTING | TREESAME))
 				continue;
 			update_treesame(revs, c);
 		}
+	}
 
+	free_commit_list(original_list);
 	revs->commits = newlist;
 	return 0;
 }
@@ -1358,7 +1532,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;
 }
 
@@ -1383,7 +1557,7 @@ void clear_ref_exclusion(struct string_list **ref_excludes_p)
 void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
 {
 	if (!*ref_excludes_p) {
-		*ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
+		CALLOC_ARRAY(*ref_excludes_p, 1);
 		(*ref_excludes_p)->strdup_strings = 1;
 	}
 	string_list_append(*ref_excludes_p, exclude);
@@ -1452,7 +1626,7 @@ static void add_other_reflogs_to_pending(struct all_refs_cb *cb)
 {
 	struct worktree **worktrees, **p;
 
-	worktrees = get_worktrees(0);
+	worktrees = get_worktrees();
 	for (p = worktrees; *p; p++) {
 		struct worktree *wt = *p;
 
@@ -1508,6 +1682,8 @@ static void do_add_index_objects_to_pending(struct rev_info *revs,
 {
 	int i;
 
+	/* TODO: audit for interaction with sparse-index. */
+	ensure_full_index(istate);
 	for (i = 0; i < istate->cache_nr; i++) {
 		struct cache_entry *ce = istate->cache[i];
 		struct blob *blob;
@@ -1540,7 +1716,7 @@ void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
 	if (revs->single_worktree)
 		return;
 
-	worktrees = get_worktrees(0);
+	worktrees = get_worktrees();
 	for (p = worktrees; *p; p++) {
 		struct worktree *wt = *p;
 		struct index_state istate = { NULL };
@@ -1637,7 +1813,6 @@ void repo_init_revisions(struct repository *r,
 
 	revs->repo = r;
 	revs->abbrev = DEFAULT_ABBREV;
-	revs->ignore_merges = 1;
 	revs->simplify_history = 1;
 	revs->pruning.repo = r;
 	revs->pruning.flags.recursive = 1;
@@ -1658,7 +1833,6 @@ void repo_init_revisions(struct repository *r,
 	revs->commit_format = CMIT_FMT_DEFAULT;
 	revs->expand_tabs_in_log_default = 8;
 
-	init_grep_defaults(revs->repo);
 	grep_init(&revs->grep_filter, revs->repo, prefix);
 	revs->grep_filter.status_only = 1;
 
@@ -1668,7 +1842,7 @@ void repo_init_revisions(struct repository *r,
 		revs->diffopt.prefix_length = strlen(prefix);
 	}
 
-	revs->notes_opt.use_default_notes = -1;
+	init_display_notes(&revs->notes_opt);
 }
 
 static void add_pending_commit_list(struct rev_info *revs,
@@ -1839,7 +2013,7 @@ static int handle_dotdot(const char *arg,
 	return ret;
 }
 
-int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
+static int handle_revision_arg_1(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
 {
 	struct object_context oc;
 	char *mark;
@@ -1914,15 +2088,23 @@ int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsi
 	return 0;
 }
 
+int handle_revision_arg(const char *arg, struct rev_info *revs, int flags, unsigned revarg_opt)
+{
+	int ret = handle_revision_arg_1(arg, revs, flags, revarg_opt);
+	if (!ret)
+		revs->rev_input_given = 1;
+	return ret;
+}
+
 static void read_pathspec_from_stdin(struct strbuf *sb,
-				     struct argv_array *prune)
+				     struct strvec *prune)
 {
 	while (strbuf_getline(sb, stdin) != EOF)
-		argv_array_push(prune, sb->buf);
+		strvec_push(prune, sb->buf);
 }
 
 static void read_revisions_from_stdin(struct rev_info *revs,
-				      struct argv_array *prune)
+				      struct strvec *prune)
 {
 	struct strbuf sb;
 	int seen_dashdash = 0;
@@ -2072,6 +2254,10 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 	} else if (!strcmp(arg, "--author-date-order")) {
 		revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
 		revs->topo_order = 1;
+	} else if (!strcmp(arg, "--unsorted-input")) {
+		if (revs->no_walk)
+			die(_("--unsorted-input is incompatible with --no-walk"));
+		revs->unsorted_input = 1;
 	} else if (!strcmp(arg, "--early-output")) {
 		revs->early_output = 100;
 		revs->topo_order = 1;
@@ -2157,7 +2343,17 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 	} else if (!strcmp(arg, "--unpacked")) {
 		revs->unpacked = 1;
 	} else if (starts_with(arg, "--unpacked=")) {
-		die("--unpacked=<packfile> no longer supported.");
+		die(_("--unpacked=<packfile> no longer supported"));
+	} else if (!strcmp(arg, "--no-kept-objects")) {
+		revs->no_kept_objects = 1;
+		revs->keep_pack_cache_flags |= IN_CORE_KEEP_PACKS;
+		revs->keep_pack_cache_flags |= ON_DISK_KEEP_PACKS;
+	} else if (skip_prefix(arg, "--no-kept-objects=", &optarg)) {
+		revs->no_kept_objects = 1;
+		if (!strcmp(optarg, "in-core"))
+			revs->keep_pack_cache_flags |= IN_CORE_KEEP_PACKS;
+		if (!strcmp(optarg, "on-disk"))
+			revs->keep_pack_cache_flags |= ON_DISK_KEEP_PACKS;
 	} else if (!strcmp(arg, "-r")) {
 		revs->diff = 1;
 		revs->diffopt.flags.recursive = 1;
@@ -2165,19 +2361,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->diff = 1;
 		revs->diffopt.flags.recursive = 1;
 		revs->diffopt.flags.tree_in_recursive = 1;
-	} else if (!strcmp(arg, "-m")) {
-		revs->ignore_merges = 0;
-	} else if (!strcmp(arg, "-c")) {
-		revs->diff = 1;
-		revs->dense_combined_merges = 0;
-		revs->combine_merges = 1;
-	} else if (!strcmp(arg, "--combined-all-paths")) {
-		revs->diff = 1;
-		revs->combined_all_paths = 1;
-	} else if (!strcmp(arg, "--cc")) {
-		revs->diff = 1;
-		revs->dense_combined_merges = 1;
-		revs->combine_merges = 1;
+	} else if ((argcount = diff_merges_parse_opts(revs, argv))) {
+		return argcount;
 	} else if (!strcmp(arg, "-v")) {
 		revs->verbose_header = 1;
 	} else if (!strcmp(arg, "--pretty")) {
@@ -2203,9 +2388,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 			die("'%s': not a non-negative integer", arg);
 		revs->expand_tabs_in_log = val;
 	} else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
-		revs->show_notes = 1;
+		enable_default_display_notes(&revs->notes_opt, &revs->show_notes);
 		revs->show_notes_given = 1;
-		revs->notes_opt.use_default_notes = 1;
 	} else if (!strcmp(arg, "--show-signature")) {
 		revs->show_signature = 1;
 	} else if (!strcmp(arg, "--no-show-signature")) {
@@ -2220,25 +2404,14 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->track_first_time = 1;
 	} else if (skip_prefix(arg, "--show-notes=", &optarg) ||
 		   skip_prefix(arg, "--notes=", &optarg)) {
-		struct strbuf buf = STRBUF_INIT;
-		revs->show_notes = 1;
-		revs->show_notes_given = 1;
 		if (starts_with(arg, "--show-notes=") &&
 		    revs->notes_opt.use_default_notes < 0)
 			revs->notes_opt.use_default_notes = 1;
-		strbuf_addstr(&buf, optarg);
-		expand_notes_ref(&buf);
-		string_list_append(&revs->notes_opt.extra_notes_refs,
-				   strbuf_detach(&buf, NULL));
+		enable_ref_display_notes(&revs->notes_opt, &revs->show_notes, optarg);
+		revs->show_notes_given = 1;
 	} else if (!strcmp(arg, "--no-notes")) {
-		revs->show_notes = 0;
+		disable_display_notes(&revs->notes_opt, &revs->show_notes);
 		revs->show_notes_given = 1;
-		revs->notes_opt.use_default_notes = -1;
-		/* we have been strdup'ing ourselves, so trick
-		 * string_list into free()ing strings */
-		revs->notes_opt.extra_notes_refs.strdup_strings = 1;
-		string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
-		revs->notes_opt.extra_notes_refs.strdup_strings = 0;
 	} else if (!strcmp(arg, "--standard-notes")) {
 		revs->show_notes_given = 1;
 		revs->notes_opt.use_default_notes = 1;
@@ -2253,6 +2426,10 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 		revs->topo_order = 1;
 		revs->rewrite_parents = 1;
 		revs->graph = graph_init(revs);
+	} else if (!strcmp(arg, "--encode-email-headers")) {
+		revs->encode_email_headers = 1;
+	} else if (!strcmp(arg, "--no-encode-email-headers")) {
+		revs->encode_email_headers = 0;
 	} else if (!strcmp(arg, "--root")) {
 		revs->show_root_diff = 1;
 	} else if (!strcmp(arg, "--no-commit-id")) {
@@ -2277,6 +2454,8 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 	} else if (!strcmp(arg, "--full-diff")) {
 		revs->diff = 1;
 		revs->full_diff = 1;
+	} else if (!strcmp(arg, "--show-pulls")) {
+		revs->show_pulls = 1;
 	} else if (!strcmp(arg, "--full-history")) {
 		revs->simplify_history = 0;
 	} else if (!strcmp(arg, "--relative-date")) {
@@ -2304,8 +2483,6 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
 	} else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
 		add_message_grep(revs, optarg);
 		return argcount;
-	} else if (!strcmp(arg, "--grep-debug")) {
-		revs->grep_filter.debug = 1;
 	} else if (!strcmp(arg, "--basic-regexp")) {
 		revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
 	} else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
@@ -2387,8 +2564,8 @@ static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void
 }
 
 static int handle_revision_pseudo_opt(const char *submodule,
-				struct rev_info *revs,
-				int argc, const char **argv, int *flags)
+				      struct rev_info *revs,
+				      const char **argv, int *flags)
 {
 	const char *arg = argv[0];
 	const char *optarg;
@@ -2476,16 +2653,22 @@ 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;
+		if (!revs->no_walk && revs->unsorted_input)
+			die(_("--no-walk is incompatible with --unsorted-input"));
+		revs->no_walk = 1;
 	} else if (skip_prefix(arg, "--no-walk=", &optarg)) {
+		if (!revs->no_walk && revs->unsorted_input)
+			die(_("--no-walk is incompatible with --unsorted-input"));
+
 		/*
 		 * 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")) {
@@ -2522,8 +2705,8 @@ static void NORETURN diagnose_missing_default(const char *def)
  */
 int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
 {
-	int i, flags, left, seen_dashdash, got_rev_arg = 0, revarg_opt;
-	struct argv_array prune_data = ARGV_ARRAY_INIT;
+	int i, flags, left, seen_dashdash, revarg_opt;
+	struct strvec prune_data = STRVEC_INIT;
 	const char *submodule = NULL;
 	int seen_end_of_options = 0;
 
@@ -2542,7 +2725,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 			argv[i] = NULL;
 			argc = i;
 			if (argv[i + 1])
-				argv_array_pushv(&prune_data, argv + i + 1);
+				strvec_pushv(&prune_data, argv + i + 1);
 			seen_dashdash = 1;
 			break;
 		}
@@ -2559,7 +2742,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 			int opts;
 
 			opts = handle_revision_pseudo_opt(submodule,
-						revs, argc - i, argv + i,
+						revs, argv + i,
 						&flags);
 			if (opts > 0) {
 				i += opts - 1;
@@ -2608,14 +2791,12 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 			for (j = i; j < argc; j++)
 				verify_filename(revs->prefix, argv[j], j == i);
 
-			argv_array_pushv(&prune_data, argv + i);
+			strvec_pushv(&prune_data, argv + i);
 			break;
 		}
-		else
-			got_rev_arg = 1;
 	}
 
-	if (prune_data.argc) {
+	if (prune_data.nr) {
 		/*
 		 * If we need to introduce the magic "a lone ':' means no
 		 * pathspec whatsoever", here is the place to do so.
@@ -2631,9 +2812,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 		 * }
 		 */
 		parse_pathspec(&revs->prune_data, 0, 0,
-			       revs->prefix, prune_data.argv);
+			       revs->prefix, prune_data.v);
 	}
-	argv_array_clear(&prune_data);
+	strvec_clear(&prune_data);
 
 	if (revs->def == NULL)
 		revs->def = opt ? opt->def : NULL;
@@ -2641,7 +2822,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 		opt->tweak(revs, opt);
 	if (revs->show_merge)
 		prepare_show_merge(revs);
-	if (revs->def && !revs->pending.nr && !revs->rev_input_given && !got_rev_arg) {
+	if (revs->def && !revs->pending.nr && !revs->rev_input_given) {
 		struct object_id oid;
 		struct object *object;
 		struct object_context oc;
@@ -2664,6 +2845,12 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 	if (revs->diffopt.objfind)
 		revs->simplify_history = 0;
 
+	if (revs->line_level_traverse) {
+		if (want_ancestry(revs))
+			revs->limited = 1;
+		revs->topo_order = 1;
+	}
+
 	if (revs->topo_order && !generation_numbers_enabled(the_repository))
 		revs->limited = 1;
 
@@ -2676,17 +2863,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 			copy_pathspec(&revs->diffopt.pathspec,
 				      &revs->prune_data);
 	}
-	if (revs->combine_merges)
-		revs->ignore_merges = 0;
-	if (revs->combined_all_paths && !revs->combine_merges)
-		die("--combined-all-paths makes no sense without -c or --cc");
 
-	revs->diffopt.abbrev = revs->abbrev;
+	diff_merges_setup_revs(revs);
 
-	if (revs->line_level_traverse) {
-		revs->limited = 1;
-		revs->topo_order = 1;
-	}
+	revs->diffopt.abbrev = revs->abbrev;
 
 	diff_setup_done(&revs->diffopt);
 
@@ -2716,9 +2896,6 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 	if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
 		die("cannot use --grep-reflog without --walk-reflogs");
 
-	if (revs->first_parent_only && revs->bisect)
-		die(_("--first-parent is incompatible with --bisect"));
-
 	if (revs->line_level_traverse &&
 	    (revs->diffopt.output_format & ~(DIFF_FORMAT_PATCH | DIFF_FORMAT_NO_OUTPUT)))
 		die(_("-L does not yet support diff formats besides -p and -s"));
@@ -2776,7 +2953,7 @@ static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs,
 
 	st = lookup_decoration(&revs->merge_simplification, &commit->object);
 	if (!st) {
-		st = xcalloc(1, sizeof(*st));
+		CALLOC_ARRAY(st, 1);
 		add_decoration(&revs->merge_simplification, &commit->object, st);
 	}
 	return st;
@@ -3031,7 +3208,8 @@ static struct commit_list **simplify_one(struct rev_info *revs, struct commit *c
 	if (!cnt ||
 	    (commit->object.flags & UNINTERESTING) ||
 	    !(commit->object.flags & TREESAME) ||
-	    (parent = one_relevant_parent(revs, commit->parents)) == NULL)
+	    (parent = one_relevant_parent(revs, commit->parents)) == NULL ||
+	    (revs->show_pulls && (commit->object.flags & PULL_MERGE)))
 		st->simplified = commit;
 	else {
 		pst = locate_simplify_state(revs, parent);
@@ -3098,7 +3276,7 @@ static void set_children(struct rev_info *revs)
 
 void reset_revision_walk(void)
 {
-	clear_object_flags(SEEN | ADDED | SHOWN);
+	clear_object_flags(SEEN | ADDED | SHOWN | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE);
 }
 
 static int mark_uninteresting(const struct object_id *oid,
@@ -3107,7 +3285,7 @@ static int mark_uninteresting(const struct object_id *oid,
 			      void *cb)
 {
 	struct rev_info *revs = cb;
-	struct object *o = parse_object(revs->repo, oid);
+	struct object *o = lookup_unknown_object(revs->repo, oid);
 	o->flags |= UNINTERESTING | SEEN;
 	return 0;
 }
@@ -3116,7 +3294,7 @@ define_commit_slab(indegree_slab, int);
 define_commit_slab(author_date_slab, timestamp_t);
 
 struct topo_walk_info {
-	uint32_t min_generation;
+	timestamp_t min_generation;
 	struct prio_queue explore_queue;
 	struct prio_queue indegree_queue;
 	struct prio_queue topo_queue;
@@ -3124,6 +3302,26 @@ struct topo_walk_info {
 	struct author_date_slab author_date;
 };
 
+static int topo_walk_atexit_registered;
+static unsigned int count_explore_walked;
+static unsigned int count_indegree_walked;
+static unsigned int count_topo_walked;
+
+static void trace2_topo_walk_statistics_atexit(void)
+{
+	struct json_writer jw = JSON_WRITER_INIT;
+
+	jw_object_begin(&jw, 0);
+	jw_object_intmax(&jw, "count_explore_walked", count_explore_walked);
+	jw_object_intmax(&jw, "count_indegree_walked", count_indegree_walked);
+	jw_object_intmax(&jw, "count_topo_walked", count_topo_walked);
+	jw_end(&jw);
+
+	trace2_data_json("topo_walk", the_repository, "statistics", &jw);
+
+	jw_release(&jw);
+}
+
 static inline void test_flag_and_insert(struct prio_queue *q, struct commit *c, int flag)
 {
 	if (c->object.flags & flag)
@@ -3142,9 +3340,11 @@ static void explore_walk_step(struct rev_info *revs)
 	if (!c)
 		return;
 
-	if (parse_commit_gently(c, 1) < 0)
+	if (repo_parse_commit_gently(revs->repo, c, 1) < 0)
 		return;
 
+	count_explore_walked++;
+
 	if (revs->sort_order == REV_SORT_BY_AUTHOR_DATE)
 		record_author_date(&info->author_date, c);
 
@@ -3162,12 +3362,12 @@ static void explore_walk_step(struct rev_info *revs)
 }
 
 static void explore_to_depth(struct rev_info *revs,
-			     uint32_t gen_cutoff)
+			     timestamp_t gen_cutoff)
 {
 	struct topo_walk_info *info = revs->topo_walk_info;
 	struct commit *c;
 	while ((c = prio_queue_peek(&info->explore_queue)) &&
-	       c->generation >= gen_cutoff)
+	       commit_graph_generation(c) >= gen_cutoff)
 		explore_walk_step(revs);
 }
 
@@ -3180,15 +3380,20 @@ static void indegree_walk_step(struct rev_info *revs)
 	if (!c)
 		return;
 
-	if (parse_commit_gently(c, 1) < 0)
+	if (repo_parse_commit_gently(revs->repo, c, 1) < 0)
 		return;
 
-	explore_to_depth(revs, c->generation);
+	count_indegree_walked++;
+
+	explore_to_depth(revs, commit_graph_generation(c));
 
 	for (p = c->parents; p; p = p->next) {
 		struct commit *parent = p->item;
 		int *pi = indegree_slab_at(&info->indegree, parent);
 
+		if (repo_parse_commit_gently(revs->repo, parent, 1) < 0)
+			return;
+
 		if (*pi)
 			(*pi)++;
 		else
@@ -3202,19 +3407,35 @@ static void indegree_walk_step(struct rev_info *revs)
 }
 
 static void compute_indegrees_to_depth(struct rev_info *revs,
-				       uint32_t gen_cutoff)
+				       timestamp_t gen_cutoff)
 {
 	struct topo_walk_info *info = revs->topo_walk_info;
 	struct commit *c;
 	while ((c = prio_queue_peek(&info->indegree_queue)) &&
-	       c->generation >= gen_cutoff)
+	       commit_graph_generation(c) >= gen_cutoff)
 		indegree_walk_step(revs);
 }
 
+static void reset_topo_walk(struct rev_info *revs)
+{
+	struct topo_walk_info *info = revs->topo_walk_info;
+
+	clear_prio_queue(&info->explore_queue);
+	clear_prio_queue(&info->indegree_queue);
+	clear_prio_queue(&info->topo_queue);
+	clear_indegree_slab(&info->indegree);
+	clear_author_date_slab(&info->author_date);
+
+	FREE_AND_NULL(revs->topo_walk_info);
+}
+
 static void init_topo_walk(struct rev_info *revs)
 {
 	struct topo_walk_info *info;
 	struct commit_list *list;
+	if (revs->topo_walk_info)
+		reset_topo_walk(revs);
+
 	revs->topo_walk_info = xmalloc(sizeof(struct topo_walk_info));
 	info = revs->topo_walk_info;
 	memset(info, 0, sizeof(struct topo_walk_info));
@@ -3244,15 +3465,17 @@ static void init_topo_walk(struct rev_info *revs)
 	info->min_generation = GENERATION_NUMBER_INFINITY;
 	for (list = revs->commits; list; list = list->next) {
 		struct commit *c = list->item;
+		timestamp_t generation;
 
-		if (parse_commit_gently(c, 1))
+		if (repo_parse_commit_gently(revs->repo, c, 1))
 			continue;
 
 		test_flag_and_insert(&info->explore_queue, c, TOPO_WALK_EXPLORED);
 		test_flag_and_insert(&info->indegree_queue, c, TOPO_WALK_INDEGREE);
 
-		if (c->generation < info->min_generation)
-			info->min_generation = c->generation;
+		generation = commit_graph_generation(c);
+		if (generation < info->min_generation)
+			info->min_generation = generation;
 
 		*(indegree_slab_at(&info->indegree, c)) = 1;
 
@@ -3274,6 +3497,11 @@ static void init_topo_walk(struct rev_info *revs)
 	 */
 	if (revs->sort_order == REV_SORT_IN_GRAPH_ORDER)
 		prio_queue_reverse(&info->topo_queue);
+
+	if (trace2_is_enabled() && !topo_walk_atexit_registered) {
+		atexit(trace2_topo_walk_statistics_atexit);
+		topo_walk_atexit_registered = 1;
+	}
 }
 
 static struct commit *next_topo_commit(struct rev_info *revs)
@@ -3300,18 +3528,22 @@ static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
 			    oid_to_hex(&commit->object.oid));
 	}
 
+	count_topo_walked++;
+
 	for (p = commit->parents; p; p = p->next) {
 		struct commit *parent = p->item;
 		int *pi;
+		timestamp_t generation;
 
 		if (parent->object.flags & UNINTERESTING)
 			continue;
 
-		if (parse_commit_gently(parent, 1) < 0)
+		if (repo_parse_commit_gently(revs->repo, parent, 1) < 0)
 			continue;
 
-		if (parent->generation < info->min_generation) {
-			info->min_generation = parent->generation;
+		generation = commit_graph_generation(parent);
+		if (generation < info->min_generation) {
+			info->min_generation = generation;
 			compute_indegrees_to_depth(revs, info->min_generation);
 		}
 
@@ -3358,7 +3590,9 @@ int prepare_revision_walk(struct rev_info *revs)
 				       FOR_EACH_OBJECT_PROMISOR_ONLY);
 	}
 
-	if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
+	if (!revs->reflog_info)
+		prepare_to_use_bloom_filter(revs);
+	if (!revs->unsorted_input)
 		commit_list_sort_by_date(&revs->commits);
 	if (revs->no_walk)
 		return 0;
@@ -3369,12 +3603,20 @@ int prepare_revision_walk(struct rev_info *revs)
 			sort_in_topological_order(&revs->commits, revs->sort_order);
 	} else if (revs->topo_order)
 		init_topo_walk(revs);
-	if (revs->line_level_traverse)
+	if (revs->line_level_traverse && want_ancestry(revs))
+		/*
+		 * At the moment we can only do line-level log with parent
+		 * rewriting by performing this expensive pre-filtering step.
+		 * If parent rewriting is not requested, then we rather
+		 * perform the line-level log filtering during the regular
+		 * history traversal.
+		 */
 		line_log_filter(revs);
 	if (revs->simplify_merges)
 		simplify_merges(revs);
 	if (revs->children.name)
 		set_children(revs);
+
 	return 0;
 }
 
@@ -3577,8 +3819,29 @@ enum commit_action get_commit_action(struct rev_info *revs, struct commit *commi
 		return commit_ignore;
 	if (revs->unpacked && has_object_pack(&commit->object.oid))
 		return commit_ignore;
+	if (revs->no_kept_objects) {
+		if (has_object_kept_pack(&commit->object.oid,
+					 revs->keep_pack_cache_flags))
+			return commit_ignore;
+	}
 	if (commit->object.flags & UNINTERESTING)
 		return commit_ignore;
+	if (revs->line_level_traverse && !want_ancestry(revs)) {
+		/*
+		 * In case of line-level log with parent rewriting
+		 * prepare_revision_walk() already took care of all line-level
+		 * log filtering, and there is nothing left to do here.
+		 *
+		 * If parent rewriting was not requested, then this is the
+		 * place to perform the line-level log filtering.  Notably,
+		 * this check, though expensive, must come before the other,
+		 * cheaper filtering conditions, because the tracked line
+		 * ranges must be adjusted even when the commit will end up
+		 * being ignored based on other conditions.
+		 */
+		if (!line_log_process_ranges_arbitrary_commit(revs, commit))
+			return commit_ignore;
+	}
 	if (revs->min_age != -1 &&
 	    comparison_date(revs, commit) > revs->min_age)
 			return commit_ignore;
@@ -3598,6 +3861,10 @@ enum commit_action get_commit_action(struct rev_info *revs, struct commit *commi
 			/* drop merges unless we want parenthood */
 			if (!want_ancestry(revs))
 				return commit_ignore;
+
+			if (revs->show_pulls && (commit->object.flags & PULL_MERGE))
+				return commit_show;
+
 			/*
 			 * If we want ancestry, then need to keep any merges
 			 * between relevant commits to tie together topology.
@@ -3944,7 +4211,7 @@ struct commit *get_revision(struct rev_info *revs)
 	return c;
 }
 
-char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
+const char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
 {
 	if (commit->object.flags & BOUNDARY)
 		return "-";
@@ -3966,7 +4233,7 @@ char *get_revision_mark(const struct rev_info *revs, const struct commit *commit
 
 void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
 {
-	char *mark = get_revision_mark(revs, commit);
+	const char *mark = get_revision_mark(revs, commit);
 	if (!strlen(mark))
 		return;
 	fputs(mark, stdout);
diff --git a/revision.h b/revision.h
index 4134dc6029..0c65a760ee 100644
--- a/revision.h
+++ b/revision.h
@@ -9,6 +9,19 @@
 #include "diff.h"
 #include "commit-slab-decl.h"
 
+/**
+ * The revision walking API offers functions to build a list of revisions
+ * and then iterate over that list.
+ *
+ * Calling sequence
+ * ----------------
+ *
+ * The walking API has a given calling sequence: first you need to initialize
+ * a rev_info structure, then add revisions to control what kind of revision
+ * list do you want to get, finally you can iterate over the revision list.
+ *
+ */
+
 /* Remember to update object flag allocation in object.h */
 #define SEEN		(1u<<0)
 #define UNINTERESTING   (1u<<1)
@@ -21,19 +34,20 @@
 #define SYMMETRIC_LEFT	(1u<<8)
 #define PATCHSAME	(1u<<9)
 #define BOTTOM		(1u<<10)
+
+/* WARNING: This is also used as REACHABLE in commit-graph.c. */
+#define PULL_MERGE	(1u<<15)
+
+#define TOPO_WALK_EXPLORED	(1u<<23)
+#define TOPO_WALK_INDEGREE	(1u<<24)
+
 /*
  * Indicates object was reached by traversal. i.e. not given by user on
  * command-line or stdin.
- * NEEDSWORK: NOT_USER_GIVEN doesn't apply to commits because we only support
- * filtering trees and blobs, but it may be useful to support filtering commits
- * in the future.
  */
 #define NOT_USER_GIVEN	(1u<<25)
 #define TRACK_LINEAR	(1u<<26)
-#define ALL_REV_FLAGS	(((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR)
-
-#define TOPO_WALK_EXPLORED	(1u<<27)
-#define TOPO_WALK_INDEGREE	(1u<<28)
+#define ALL_REV_FLAGS	(((1u<<11)-1) | NOT_USER_GIVEN | TRACK_LINEAR | PULL_MERGE)
 
 #define DECORATE_SHORT_REFS	1
 #define DECORATE_FULL_REFS	2
@@ -43,6 +57,8 @@ struct repository;
 struct rev_info;
 struct string_list;
 struct saved_parents;
+struct bloom_key;
+struct bloom_filter_settings;
 define_shared_commit_slab(revision_sources, char *);
 
 struct rev_cmdline_info {
@@ -63,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;
 
@@ -113,9 +125,11 @@ 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,
 			topo_order:1,
 			simplify_merges:1,
 			simplify_by_decoration:1,
@@ -128,6 +142,7 @@ struct rev_info {
 			edge_hint_aggressive:1,
 			limited:1,
 			unpacked:1,
+			no_kept_objects:1,
 			boundary:2,
 			count:1,
 			left_right:1,
@@ -168,19 +183,25 @@ struct rev_info {
 	unsigned int	diff:1,
 			full_diff:1,
 			show_root_diff:1,
+			match_missing:1,
 			no_commit_id:1,
 			verbose_header:1,
-			ignore_merges:1,
+			always_show_header:1,
+			/* Diff-merge flags */
+			explicit_diff_merges: 1,
+			merges_need_diff: 1,
+			merges_imply_patch:1,
+			separate_merges: 1,
 			combine_merges:1,
 			combined_all_paths:1,
 			dense_combined_merges:1,
-			always_show_header:1;
+			first_parent_merges:1;
 
 	/* Format info */
+	int		show_notes;
 	unsigned int	shown_one:1,
 			shown_dashes:1,
 			show_merge:1,
-			show_notes:1,
 			show_notes_given:1,
 			show_signature:1,
 			pretty_given:1,
@@ -190,7 +211,9 @@ struct rev_info {
 			use_terminator:1,
 			missing_newline:1,
 			date_mode_explicit:1,
-			preserve_subject:1;
+			preserve_subject:1,
+			encode_email_headers:1,
+			include_header:1;
 	unsigned int	disable_stdin:1;
 	/* --show-linear-break */
 	unsigned int	track_linear:1,
@@ -208,7 +231,7 @@ struct rev_info {
 	const char	*mime_boundary;
 	const char	*patch_suffix;
 	int		numbered_files;
-	int		reroll_count;
+	const char	*reroll_count;
 	char		*message_id;
 	struct ident_split from_ident;
 	struct string_list *ref_message_ids;
@@ -216,6 +239,7 @@ struct rev_info {
 	const char	*extra_headers;
 	const char	*log_reencode;
 	const char	*subject_prefix;
+	int		patch_name_max;
 	int		no_inline;
 	int		show_log_size;
 	struct string_list *mailmap;
@@ -236,6 +260,7 @@ struct rev_info {
 	int min_parents;
 	int max_parents;
 	int (*include_check)(struct commit *, void *);
+	int (*include_check_obj)(struct object *obj, void *);
 	void *include_check_data;
 
 	/* diff info for patches and for paths limiting */
@@ -278,6 +303,20 @@ struct rev_info {
 	struct revision_sources *sources;
 
 	struct topo_walk_info *topo_walk_info;
+
+	/* Commit graph bloom filter fields */
+	/* The bloom filter key(s) for the pathspec */
+	struct bloom_key *bloom_keys;
+	int bloom_keys_nr;
+
+	/*
+	 * The bloom filter settings used to generate the key.
+	 * This is loaded from the commit-graph being used.
+	 */
+	struct bloom_filter_settings *bloom_filter_settings;
+
+	/* misc. flags related to '--no-kept-objects' */
+	unsigned keep_pack_cache_flags;
 };
 
 int ref_excluded(struct string_list *, const char *path);
@@ -306,11 +345,29 @@ struct setup_revision_opt {
 #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
 #define init_revisions(revs, prefix) repo_init_revisions(the_repository, revs, prefix)
 #endif
+
+/**
+ * Initialize a rev_info structure with default values. The third parameter may
+ * be NULL or can be prefix path, and then the `.prefix` variable will be set
+ * to it. This is typically the first function you want to call when you want
+ * to deal with a revision list. After calling this function, you are free to
+ * customize options, like set `.ignore_merges` to 0 if you don't want to
+ * ignore merges, and so on.
+ */
 void repo_init_revisions(struct repository *r,
 			 struct rev_info *revs,
 			 const char *prefix);
+
+/**
+ * Parse revision information, filling in the `rev_info` structure, and
+ * removing the used arguments from the argument list. Returns the number
+ * of arguments left that weren't recognized, which are also moved to the
+ * head of the argument list. The last parameter is used in case no
+ * parameter given by the first two arguments.
+ */
 int setup_revisions(int argc, const char **argv, struct rev_info *revs,
 		    struct setup_revision_opt *);
+
 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 			const struct option *options,
 			const char * const usagestr[]);
@@ -319,11 +376,28 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 int handle_revision_arg(const char *arg, struct rev_info *revs,
 			int flags, unsigned revarg_opt);
 
+/**
+ * Reset the flags used by the revision walking api. You can use this to do
+ * multiple sequential revision walks.
+ */
 void reset_revision_walk(void);
+
+/**
+ * Prepares the rev_info structure for a walk. You should check if it returns
+ * any error (non-zero return code) and if it does not, you can start using
+ * get_revision() to do the iteration.
+ */
 int prepare_revision_walk(struct rev_info *revs);
+
+/**
+ * Takes a pointer to a `rev_info` structure and iterates over it, returning a
+ * `struct commit *` each time you call it. The end of the revision list is
+ * indicated by returning a NULL pointer.
+ */
 struct commit *get_revision(struct rev_info *revs);
-char *get_revision_mark(const struct rev_info *revs,
-			const struct commit *commit);
+
+const char *get_revision_mark(const struct rev_info *revs,
+			      const struct commit *commit);
 void put_revision_mark(const struct rev_info *revs,
 		       const struct commit *commit);
 
@@ -333,8 +407,19 @@ void mark_trees_uninteresting_sparse(struct repository *r, struct oidset *trees)
 
 void show_object_with_name(FILE *, struct object *, const char *);
 
+/**
+ * This function can be used if you want to add commit objects as revision
+ * information. You can use the `UNINTERESTING` object flag to indicate if
+ * you want to include or exclude the given commit (and commits reachable
+ * from the given commit) from the revision list.
+ *
+ * NOTE: If you have the commits as a string list then you probably want to
+ * use setup_revisions(), instead of parsing each string and using this
+ * function.
+ */
 void add_pending_object(struct rev_info *revs,
 			struct object *obj, const char *name);
+
 void add_pending_oid(struct rev_info *revs,
 		     const char *name, const struct object_id *oid,
 		     unsigned int flags);
diff --git a/run-command.c b/run-command.c
index 3449db319b..2961f7e55e 100644
--- a/run-command.c
+++ b/run-command.c
@@ -2,23 +2,23 @@
 #include "run-command.h"
 #include "exec-cmd.h"
 #include "sigchain.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "thread-utils.h"
 #include "strbuf.h"
 #include "string-list.h"
 #include "quote.h"
+#include "config.h"
 
 void child_process_init(struct child_process *child)
 {
-	memset(child, 0, sizeof(*child));
-	argv_array_init(&child->args);
-	argv_array_init(&child->env_array);
+	struct child_process blank = CHILD_PROCESS_INIT;
+	memcpy(child, &blank, sizeof(*child));
 }
 
 void child_process_clear(struct child_process *child)
 {
-	argv_array_clear(&child->args);
-	argv_array_clear(&child->env_array);
+	strvec_clear(&child->args);
+	strvec_clear(&child->env_array);
 }
 
 struct child_to_clean {
@@ -213,8 +213,9 @@ static char *locate_in_PATH(const char *file)
 static int exists_in_PATH(const char *file)
 {
 	char *r = locate_in_PATH(file);
+	int found = r != NULL;
 	free(r);
-	return r != NULL;
+	return found;
 }
 
 int sane_execvp(const char *file, char * const argv[])
@@ -262,31 +263,31 @@ int sane_execvp(const char *file, char * const argv[])
 	return -1;
 }
 
-static const char **prepare_shell_cmd(struct argv_array *out, const char **argv)
+static const char **prepare_shell_cmd(struct strvec *out, const char **argv)
 {
 	if (!argv[0])
 		BUG("shell command is empty");
 
 	if (strcspn(argv[0], "|&;<>()$`\\\"' \t\n*?[#~=%") != strlen(argv[0])) {
 #ifndef GIT_WINDOWS_NATIVE
-		argv_array_push(out, SHELL_PATH);
+		strvec_push(out, SHELL_PATH);
 #else
-		argv_array_push(out, "sh");
+		strvec_push(out, "sh");
 #endif
-		argv_array_push(out, "-c");
+		strvec_push(out, "-c");
 
 		/*
 		 * If we have no extra arguments, we do not even need to
 		 * bother with the "$@" magic.
 		 */
 		if (!argv[1])
-			argv_array_push(out, argv[0]);
+			strvec_push(out, argv[0]);
 		else
-			argv_array_pushf(out, "%s \"$@\"", argv[0]);
+			strvec_pushf(out, "%s \"$@\"", argv[0]);
 	}
 
-	argv_array_pushv(out, argv);
-	return out->argv;
+	strvec_pushv(out, argv);
+	return out->v;
 }
 
 #ifndef GIT_WINDOWS_NATIVE
@@ -400,7 +401,7 @@ static void child_err_spew(struct child_process *cmd, struct child_err *cerr)
 	set_error_routine(old_errfn);
 }
 
-static int prepare_cmd(struct argv_array *out, const struct child_process *cmd)
+static int prepare_cmd(struct strvec *out, const struct child_process *cmd)
 {
 	if (!cmd->argv[0])
 		BUG("command is empty");
@@ -409,30 +410,29 @@ static int prepare_cmd(struct argv_array *out, const struct child_process *cmd)
 	 * Add SHELL_PATH so in the event exec fails with ENOEXEC we can
 	 * attempt to interpret the command with 'sh'.
 	 */
-	argv_array_push(out, SHELL_PATH);
+	strvec_push(out, SHELL_PATH);
 
 	if (cmd->git_cmd) {
-		argv_array_push(out, "git");
-		argv_array_pushv(out, cmd->argv);
+		prepare_git_cmd(out, cmd->argv);
 	} else if (cmd->use_shell) {
 		prepare_shell_cmd(out, cmd->argv);
 	} else {
-		argv_array_pushv(out, cmd->argv);
+		strvec_pushv(out, cmd->argv);
 	}
 
 	/*
-	 * If there are no '/' characters in the command then perform a path
-	 * lookup and use the resolved path as the command to exec.  If there
-	 * are '/' characters, we have exec attempt to invoke the command
-	 * directly.
+	 * If there are no dir separator characters in the command then perform
+	 * a path lookup and use the resolved path as the command to exec. If
+	 * there are dir separator characters, we have exec attempt to invoke
+	 * the command directly.
 	 */
-	if (!strchr(out->argv[1], '/')) {
-		char *program = locate_in_PATH(out->argv[1]);
+	if (!has_dir_sep(out->v[1])) {
+		char *program = locate_in_PATH(out->v[1]);
 		if (program) {
-			free((char *)out->argv[1]);
-			out->argv[1] = program;
+			free((char *)out->v[1]);
+			out->v[1] = program;
 		} else {
-			argv_array_clear(out);
+			strvec_clear(out);
 			errno = ENOENT;
 			return -1;
 		}
@@ -550,8 +550,11 @@ 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)
-		return 0;
+	if (in_signal) {
+		if (WIFEXITED(status))
+			code = WEXITSTATUS(status);
+		return code;
+	}
 
 	if (waiting < 0) {
 		failed_errno = errno;
@@ -672,9 +675,9 @@ int start_command(struct child_process *cmd)
 	char *str;
 
 	if (!cmd->argv)
-		cmd->argv = cmd->args.argv;
+		cmd->argv = cmd->args.v;
 	if (!cmd->env)
-		cmd->env = cmd->env_array.argv;
+		cmd->env = cmd->env_array.v;
 
 	/*
 	 * In case of errors we must keep the promise to close FDs
@@ -742,7 +745,7 @@ fail_pipe:
 	int notify_pipe[2];
 	int null_fd = -1;
 	char **childenv;
-	struct argv_array argv = ARGV_ARRAY_INIT;
+	struct strvec argv = STRVEC_INIT;
 	struct child_err cerr;
 	struct atfork_state as;
 
@@ -758,9 +761,7 @@ 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);
 	}
 
@@ -846,10 +847,10 @@ fail_pipe:
 		 * be used in the event exec failed with ENOEXEC at which point
 		 * we will try to interpret the command using 'sh'.
 		 */
-		execve(argv.argv[1], (char *const *) argv.argv + 1,
+		execve(argv.v[1], (char *const *) argv.v + 1,
 		       (char *const *) childenv);
 		if (errno == ENOEXEC)
-			execve(argv.argv[0], (char *const *) argv.argv,
+			execve(argv.v[0], (char *const *) argv.v,
 			       (char *const *) childenv);
 
 		if (errno == ENOENT) {
@@ -888,7 +889,7 @@ fail_pipe:
 
 	if (null_fd >= 0)
 		close(null_fd);
-	argv_array_clear(&argv);
+	strvec_clear(&argv);
 	free(childenv);
 }
 end_of_spawn:
@@ -897,7 +898,7 @@ end_of_spawn:
 {
 	int fhin = 0, fhout = 1, fherr = 2;
 	const char **sargv = cmd->argv;
-	struct argv_array nargv = ARGV_ARRAY_INIT;
+	struct strvec nargv = STRVEC_INIT;
 
 	if (cmd->no_stdin)
 		fhin = open("/dev/null", O_RDWR);
@@ -935,7 +936,7 @@ end_of_spawn:
 	if (cmd->clean_on_exit && cmd->pid >= 0)
 		mark_child_for_cleanup(cmd->pid, cmd);
 
-	argv_array_clear(&nargv);
+	strvec_clear(&nargv);
 	cmd->argv = sargv;
 	if (fhin != 0)
 		close(fhin);
@@ -989,6 +990,7 @@ int finish_command(struct child_process *cmd)
 	int ret = wait_or_whine(cmd->pid, cmd->argv[0], 0);
 	trace2_child_exit(cmd, ret);
 	child_process_clear(cmd);
+	invalidate_lstat_cache();
 	return ret;
 }
 
@@ -1039,6 +1041,7 @@ int run_command_v_opt_cd_env_tr2(const char **argv, int opt, const char *dir,
 	cmd.silent_exec_failure = opt & RUN_SILENT_EXEC_FAILURE ? 1 : 0;
 	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.dir = dir;
 	cmd.env = env;
 	cmd.trace2_child_class = tr2_class;
@@ -1289,13 +1292,19 @@ error:
 int finish_async(struct async *async)
 {
 #ifdef NO_PTHREADS
-	return wait_or_whine(async->pid, "child process", 0);
+	int ret = wait_or_whine(async->pid, "child process", 0);
+
+	invalidate_lstat_cache();
+
+	return ret;
 #else
 	void *ret = (void *)(intptr_t)(-1);
 
 	if (pthread_join(async->tid, &ret))
 		error("pthread_join failed");
+	invalidate_lstat_cache();
 	return (int)(intptr_t)ret;
+
 #endif
 }
 
@@ -1351,9 +1360,9 @@ int run_hook_ve(const char *const *env, const char *name, va_list args)
 	if (!p)
 		return 0;
 
-	argv_array_push(&hook.args, p);
+	strvec_push(&hook.args, p);
 	while ((p = va_arg(args, const char *)))
-		argv_array_push(&hook.args, p);
+		strvec_push(&hook.args, p);
 	hook.env = env;
 	hook.no_stdin = 1;
 	hook.stdout_to_stderr = 1;
@@ -1626,8 +1635,8 @@ static void pp_init(struct parallel_processes *pp,
 	pp->nr_processes = 0;
 	pp->output_owner = 0;
 	pp->shutdown = 0;
-	pp->children = xcalloc(n, sizeof(*pp->children));
-	pp->pfd = xcalloc(n, sizeof(*pp->pfd));
+	CALLOC_ARRAY(pp->children, n);
+	CALLOC_ARRAY(pp->pfd, n);
 	strbuf_init(&pp->buffered_output, 0);
 
 	for (i = 0; i < n; i++) {
@@ -1864,3 +1873,31 @@ int run_processes_parallel_tr2(int n, get_next_task_fn get_next_task,
 
 	return result;
 }
+
+int run_auto_maintenance(int quiet)
+{
+	int enabled;
+	struct child_process maint = CHILD_PROCESS_INIT;
+
+	if (!git_config_get_bool("maintenance.auto", &enabled) &&
+	    !enabled)
+		return 0;
+
+	maint.git_cmd = 1;
+	strvec_pushl(&maint.args, "maintenance", "run", "--auto", NULL);
+	strvec_push(&maint.args, quiet ? "--quiet" : "--no-quiet");
+
+	return run_command(&maint);
+}
+
+void prepare_other_repo_env(struct strvec *env_array, const char *new_git_dir)
+{
+	const char * const *var;
+
+	for (var = local_repo_env; *var; var++) {
+		if (strcmp(*var, CONFIG_DATA_ENVIRONMENT) &&
+		    strcmp(*var, CONFIG_COUNT_ENVIRONMENT))
+			strvec_push(env_array, *var);
+	}
+	strvec_pushf(env_array, "%s=%s", GIT_DIR_ENVIRONMENT, new_git_dir);
+}
diff --git a/run-command.h b/run-command.h
index f769e03f01..af1296769f 100644
--- a/run-command.h
+++ b/run-command.h
@@ -3,12 +3,64 @@
 
 #include "thread-utils.h"
 
-#include "argv-array.h"
+#include "strvec.h"
 
+/**
+ * The run-command API offers a versatile tool to run sub-processes with
+ * redirected input and output as well as with a modified environment
+ * and an alternate current directory.
+ *
+ * A similar API offers the capability to run a function asynchronously,
+ * which is primarily used to capture the output that the function
+ * produces in the caller in order to process it.
+ */
+
+
+/**
+ * This describes the arguments, redirections, and environment of a
+ * command to run in a sub-process.
+ *
+ * The caller:
+ *
+ * 1. allocates and clears (using child_process_init() or
+ *    CHILD_PROCESS_INIT) a struct child_process variable;
+ * 2. initializes the members;
+ * 3. calls start_command();
+ * 4. processes the data;
+ * 5. closes file descriptors (if necessary; see below);
+ * 6. calls finish_command().
+ *
+ * Special forms of redirection are available by setting these members
+ * to 1:
+ *
+ *  .no_stdin, .no_stdout, .no_stderr: The respective channel is
+ *		redirected to /dev/null.
+ *
+ *	.stdout_to_stderr: stdout of the child is redirected to its
+ *		stderr. This happens after stderr is itself redirected.
+ *		So stdout will follow stderr to wherever it is
+ *		redirected.
+ */
 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.
+	 *
+	 * 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).
+	 *
+	 */
 	const char **argv;
-	struct argv_array args;
-	struct argv_array env_array;
+
+	struct strvec args;
+	struct strvec env_array;
 	pid_t pid;
 
 	int trace2_child_id;
@@ -18,8 +70,8 @@ struct child_process {
 
 	/*
 	 * Using .in, .out, .err:
-	 * - Specify 0 for no redirections (child inherits stdin, stdout,
-	 *   stderr from parent).
+	 * - Specify 0 for no redirections. No new file descriptor is allocated.
+	 * (child inherits stdin, stdout, stderr from parent).
 	 * - Specify -1 to have a pipe allocated as follows:
 	 *     .in: returns the writable pipe end; parent writes to it,
 	 *          the readable pipe end becomes child's stdin
@@ -37,29 +89,119 @@ struct child_process {
 	int in;
 	int out;
 	int err;
+
+	/**
+	 * To specify a new initial working directory for the sub-process,
+	 * specify it in the .dir member.
+	 */
 	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;
 	unsigned git_cmd:1; /* if this is to be git sub-command */
+
+	/**
+	 * If the program cannot be found, the functions return -1 and set
+	 * errno to ENOENT. Normally, an error message is printed, but if
+	 * .silent_exec_failure is set to 1, no message is printed for this
+	 * special error condition.
+	 */
 	unsigned silent_exec_failure:1;
-	unsigned stdout_to_stderr:1;
+
+	/**
+	 * Run the command from argv[0] using a shell (but note that we may
+	 * still optimize out the shell call if the command contains no
+	 * metacharacters). Note that further arguments to the command in
+	 * argv[1], etc, do not need to be shell-quoted.
+	 */
 	unsigned use_shell:1;
+
+	unsigned stdout_to_stderr:1;
 	unsigned clean_on_exit:1;
 	unsigned wait_after_clean:1;
 	void (*clean_on_exit_handler)(struct child_process *process);
 	void *clean_on_exit_handler_cbdata;
 };
 
-#define CHILD_PROCESS_INIT { NULL, ARGV_ARRAY_INIT, ARGV_ARRAY_INIT }
+#define CHILD_PROCESS_INIT { \
+	.args = STRVEC_INIT, \
+	.env_array = STRVEC_INIT, \
+}
+
+/**
+ * The functions: child_process_init, start_command, finish_command,
+ * run_command, run_command_v_opt, run_command_v_opt_cd_env, child_process_clear
+ * do the following:
+ *
+ * - If a system call failed, errno is set and -1 is returned. A diagnostic
+ *   is printed.
+ *
+ * - If the program was not found, then -1 is returned and errno is set to
+ *   ENOENT; a diagnostic is printed only if .silent_exec_failure is 0.
+ *
+ * - Otherwise, the program is run. If it terminates regularly, its exit
+ *   code is returned. No diagnostic is printed, even if the exit code is
+ *   non-zero.
+ *
+ * - If the program terminated due to a signal, then the return value is the
+ *   signal number + 128, ie. the same value that a POSIX shell's $? would
+ *   report.  A diagnostic is printed.
+ *
+ */
+
+/**
+ * Initialize a struct child_process variable.
+ */
 void child_process_init(struct child_process *);
+
+/**
+ * Release the memory associated with the struct child_process.
+ * Most users of the run-command API don't need to call this
+ * function explicitly because `start_command` invokes it on
+ * failure and `finish_command` calls it automatically already.
+ */
 void child_process_clear(struct child_process *);
+
 int is_executable(const char *name);
 
+/**
+ * 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.
+ */
 int start_command(struct child_process *);
+
+/**
+ * Wait for the completion of a sub-process that was started with
+ * start_command().
+ */
 int finish_command(struct child_process *);
+
 int finish_command_in_signal(struct child_process *);
+
+/**
+ * A convenience function that encapsulates a sequence of
+ * start_command() followed by finish_command(). Takes a pointer
+ * to a `struct child_process` that specifies the details.
+ */
 int run_command(struct child_process *);
 
 /*
@@ -68,16 +210,48 @@ int run_command(struct child_process *);
  * 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
+
+/**
+ * Convenience functions that encapsulate a sequence of
+ * start_command() followed by finish_command(). The argument argv
+ * specifies the program and its arguments. The argument opt is zero
+ * or more of the flags `RUN_COMMAND_NO_STDIN`, `RUN_GIT_CMD`,
+ * `RUN_COMMAND_STDOUT_TO_STDERR`, or `RUN_SILENT_EXEC_FAILURE`
+ * that correspond to the members .no_stdin, .git_cmd,
+ * .stdout_to_stderr, .silent_exec_failure of `struct child_process`.
+ * The argument dir corresponds the member .dir. The argument env
+ * corresponds to the member .env.
+ */
 int run_command_v_opt(const char **argv, int opt);
 int run_command_v_opt_tr2(const char **argv, int opt, const char *tr2_class);
 /*
@@ -125,15 +299,84 @@ static inline int capture_command(struct child_process *cmd,
  * It is expected that no synchronization and mutual exclusion between
  * the caller and the feed function is necessary so that the function
  * can run in a thread without interfering with the caller.
+ *
+ * The caller:
+ *
+ * 1. allocates and clears (memset(&asy, 0, sizeof(asy));) a
+ *    struct async variable;
+ * 2. initializes .proc and .data;
+ * 3. calls start_async();
+ * 4. processes communicates with proc through .in and .out;
+ * 5. closes .in and .out;
+ * 6. calls finish_async().
+ *
+ * There are serious restrictions on what the asynchronous function can do
+ * because this facility is implemented by a thread in the same address
+ * space on most platforms (when pthreads is available), but by a pipe to
+ * a forked process otherwise:
+ *
+ * - It cannot change the program's state (global variables, environment,
+ *   etc.) in a way that the caller notices; in other words, .in and .out
+ *   are the only communication channels to the caller.
+ *
+ * - It must not change the program's state that the caller of the
+ *   facility also uses.
+ *
  */
 struct async {
-	/*
-	 * proc reads from in; closes it before return
-	 * proc writes to out; closes it before return
-	 * returns 0 on success, non-zero on failure
+
+	/**
+	 * The function pointer in .proc has the following signature:
+	 *
+	 *	int proc(int in, int out, void *data);
+	 *
+	 * - in, out specifies a set of file descriptors to which the function
+	 *  must read/write the data that it needs/produces.  The function
+	 *  *must* close these descriptors before it returns.  A descriptor
+	 *  may be -1 if the caller did not configure a descriptor for that
+	 *  direction.
+	 *
+	 * - data is the value that the caller has specified in the .data member
+	 *  of struct async.
+	 *
+	 * - The return value of the function is 0 on success and non-zero
+	 *  on failure. If the function indicates failure, finish_async() will
+	 *  report failure as well.
+	 *
 	 */
 	int (*proc)(int in, int out, void *data);
+
 	void *data;
+
+	/**
+	 * The members .in, .out are used to provide a set of fd's for
+	 * communication between the caller and the callee as follows:
+	 *
+	 * - Specify 0 to have no file descriptor passed.  The callee will
+	 *   receive -1 in the corresponding argument.
+	 *
+	 * - Specify < 0 to have a pipe allocated; start_async() replaces
+	 *   with the pipe FD in the following way:
+	 *
+	 * 	.in: Returns the writable pipe end into which the caller
+	 * 	writes; the readable end of the pipe becomes the function's
+	 * 	in argument.
+	 *
+	 * 	.out: Returns the readable pipe end from which the caller
+	 * 	reads; the writable end of the pipe becomes the function's
+	 * 	out argument.
+	 *
+	 *   The caller of start_async() must close the returned FDs after it
+	 *   has completed reading from/writing from them.
+	 *
+	 * - Specify a file descriptor > 0 to be used by the function:
+	 *
+	 * 	.in: The FD must be readable; it becomes the function's in.
+	 * 	.out: The FD must be writable; it becomes the function's out.
+	 *
+	 *   The specified FD is closed by start_async(), even if it fails to
+	 *   run the function.
+	 */
 	int in;		/* caller writes here and closes it */
 	int out;	/* caller reads from here and closes it */
 #ifdef NO_PTHREADS
@@ -146,8 +389,19 @@ struct async {
 	int isolate_sigpipe;
 };
 
+/**
+ * Run a function asynchronously. Takes a pointer to a `struct
+ * async` that specifies the details and returns a set of pipe FDs
+ * for communication with the function. See below for details.
+ */
 int start_async(struct async *async);
+
+/**
+ * Wait for the completion of an asynchronous function that was
+ * started with start_async().
+ */
 int finish_async(struct async *async);
+
 int in_async(void);
 int async_with_fork(void);
 void check_pipe(int err);
@@ -232,4 +486,14 @@ int run_processes_parallel_tr2(int n, get_next_task_fn, start_failure_fn,
 			       task_finished_fn, void *pp_cb,
 			       const char *tr2_category, const char *tr2_label);
 
+/**
+ * Convenience function which prepares env_array for a command to be run in a
+ * new repo. This adds all GIT_* environment variables to env_array with the
+ * exception of GIT_CONFIG_PARAMETERS and GIT_CONFIG_COUNT (which cause the
+ * corresponding environment variables to be unset in the subprocess) and adds
+ * an environment variable pointing to new_git_dir. See local_repo_env in
+ * cache.h for more information.
+ */
+void prepare_other_repo_env(struct strvec *env_array, const char *new_git_dir);
+
 #endif
diff --git a/send-pack.c b/send-pack.c
index 34c77cbb1a..b3a495b7b1 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -12,9 +12,10 @@
 #include "quote.h"
 #include "transport.h"
 #include "version.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "gpg-interface.h"
 #include "cache.h"
+#include "shallow.h"
 
 int option_parse_push_signed(const struct option *opt,
 			     const char *arg, int unset)
@@ -41,7 +42,9 @@ int option_parse_push_signed(const struct option *opt,
 static void feed_object(const struct object_id *oid, FILE *fh, int negative)
 {
 	if (negative &&
-	    !has_object_file_with_flags(oid, OBJECT_INFO_SKIP_FETCH_OBJECT))
+	    !has_object_file_with_flags(oid,
+					OBJECT_INFO_SKIP_FETCH_OBJECT |
+					OBJECT_INFO_QUICK))
 		return;
 
 	if (negative)
@@ -53,7 +56,9 @@ static void feed_object(const struct object_id *oid, FILE *fh, int negative)
 /*
  * Make a pack stream and spit it out into file descriptor fd
  */
-static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struct send_pack_args *args)
+static int pack_objects(int fd, struct ref *refs, struct oid_array *advertised,
+			struct oid_array *negotiated,
+			struct send_pack_args *args)
 {
 	/*
 	 * The child becomes pack-objects --revs; we feed
@@ -65,23 +70,24 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc
 	int i;
 	int rc;
 
-	argv_array_push(&po.args, "pack-objects");
-	argv_array_push(&po.args, "--all-progress-implied");
-	argv_array_push(&po.args, "--revs");
-	argv_array_push(&po.args, "--stdout");
+	strvec_push(&po.args, "pack-objects");
+	strvec_push(&po.args, "--all-progress-implied");
+	strvec_push(&po.args, "--revs");
+	strvec_push(&po.args, "--stdout");
 	if (args->use_thin_pack)
-		argv_array_push(&po.args, "--thin");
+		strvec_push(&po.args, "--thin");
 	if (args->use_ofs_delta)
-		argv_array_push(&po.args, "--delta-base-offset");
+		strvec_push(&po.args, "--delta-base-offset");
 	if (args->quiet || !args->progress)
-		argv_array_push(&po.args, "-q");
+		strvec_push(&po.args, "-q");
 	if (args->progress)
-		argv_array_push(&po.args, "--progress");
+		strvec_push(&po.args, "--progress");
 	if (is_repository_shallow(the_repository))
-		argv_array_push(&po.args, "--shallow");
+		strvec_push(&po.args, "--shallow");
 	po.in = -1;
 	po.out = args->stateless_rpc ? -1 : fd;
 	po.git_cmd = 1;
+	po.clean_on_exit = 1;
 	if (start_command(&po))
 		die_errno("git pack-objects failed");
 
@@ -90,8 +96,10 @@ static int pack_objects(int fd, struct ref *refs, struct oid_array *extra, struc
 	 * parameters by writing to the pipe.
 	 */
 	po_in = xfdopen(po.in, "w");
-	for (i = 0; i < extra->nr; i++)
-		feed_object(&extra->oid[i], po_in, 1);
+	for (i = 0; i < advertised->nr; i++)
+		feed_object(&advertised->oid[i], po_in, 1);
+	for (i = 0; i < negotiated->nr; i++)
+		feed_object(&negotiated->oid[i], po_in, 1);
 
 	while (refs) {
 		if (!is_null_oid(&refs->old_oid))
@@ -151,25 +159,79 @@ static int receive_status(struct packet_reader *reader, struct ref *refs)
 {
 	struct ref *hint;
 	int ret;
+	struct ref_push_report *report = NULL;
+	int new_report = 0;
+	int once = 0;
 
 	hint = NULL;
 	ret = receive_unpack_status(reader);
 	while (1) {
+		struct object_id old_oid, new_oid;
+		const char *head;
 		const char *refname;
-		char *msg;
+		char *p;
 		if (packet_reader_read(reader) != PACKET_READ_NORMAL)
 			break;
-		if (!starts_with(reader->line, "ok ") && !starts_with(reader->line, "ng ")) {
-			error("invalid ref status from remote: %s", reader->line);
+		head = reader->line;
+		p = strchr(head, ' ');
+		if (!p) {
+			error("invalid status line from remote: %s", reader->line);
 			ret = -1;
 			break;
 		}
+		*p++ = '\0';
 
-		refname = reader->line + 3;
-		msg = strchr(refname, ' ');
-		if (msg)
-			*msg++ = '\0';
+		if (!strcmp(head, "option")) {
+			const char *key, *val;
 
+			if (!hint || !(report || new_report)) {
+				if (!once++)
+					error("'option' without a matching 'ok/ng' directive");
+				ret = -1;
+				continue;
+			}
+			if (new_report) {
+				if (!hint->report) {
+					CALLOC_ARRAY(hint->report, 1);
+					report = hint->report;
+				} else {
+					report = hint->report;
+					while (report->next)
+						report = report->next;
+					CALLOC_ARRAY(report->next, 1);
+					report = report->next;
+				}
+				new_report = 0;
+			}
+			key = p;
+			p = strchr(key, ' ');
+			if (p)
+				*p++ = '\0';
+			val = p;
+			if (!strcmp(key, "refname"))
+				report->ref_name = xstrdup_or_null(val);
+			else if (!strcmp(key, "old-oid") && val &&
+				 !parse_oid_hex(val, &old_oid, &val))
+				report->old_oid = oiddup(&old_oid);
+			else if (!strcmp(key, "new-oid") && val &&
+				 !parse_oid_hex(val, &new_oid, &val))
+				report->new_oid = oiddup(&new_oid);
+			else if (!strcmp(key, "forced-update"))
+				report->forced_update = 1;
+			continue;
+		}
+
+		report = NULL;
+		new_report = 0;
+		if (strcmp(head, "ok") && strcmp(head, "ng")) {
+			error("invalid ref status from remote: %s", head);
+			ret = -1;
+			break;
+		}
+		refname = p;
+		p = strchr(refname, ' ');
+		if (p)
+			*p++ = '\0';
 		/* first try searching at our hint, falling back to all refs */
 		if (hint)
 			hint = find_ref_by_name(hint, refname);
@@ -177,24 +239,27 @@ static int receive_status(struct packet_reader *reader, struct ref *refs)
 			hint = find_ref_by_name(refs, refname);
 		if (!hint) {
 			warning("remote reported status on unknown ref: %s",
-					refname);
+				refname);
 			continue;
 		}
-		if (hint->status != REF_STATUS_EXPECTING_REPORT) {
+		if (hint->status != REF_STATUS_EXPECTING_REPORT &&
+		    hint->status != REF_STATUS_OK &&
+		    hint->status != REF_STATUS_REMOTE_REJECT) {
 			warning("remote reported status on unexpected ref: %s",
-					refname);
+				refname);
 			continue;
 		}
-
-		if (reader->line[0] == 'o' && reader->line[1] == 'k')
-			hint->status = REF_STATUS_OK;
-		else {
+		if (!strcmp(head, "ng")) {
 			hint->status = REF_STATUS_REMOTE_REJECT;
-			ret = -1;
+			if (p)
+				hint->remote_status = xstrdup(p);
+			else
+				hint->remote_status = "failed";
+		} else {
+			hint->status = REF_STATUS_OK;
+			hint->remote_status = xstrdup_or_null(p);
+			new_report = 1;
 		}
-		hint->remote_status = xstrdup_or_null(msg);
-		/* start our next search from the next ref */
-		hint = hint->next;
 	}
 	return ret;
 }
@@ -239,11 +304,17 @@ static int check_to_send_update(const struct ref *ref, const struct send_pack_ar
 	case REF_STATUS_REJECT_FETCH_FIRST:
 	case REF_STATUS_REJECT_NEEDS_FORCE:
 	case REF_STATUS_REJECT_STALE:
+	case REF_STATUS_REJECT_REMOTE_UPDATED:
 	case REF_STATUS_REJECT_NODELETE:
 		return CHECK_REF_STATUS_REJECTED;
 	case REF_STATUS_UPTODATE:
 		return CHECK_REF_UPTODATE;
+
 	default:
+	case REF_STATUS_EXPECTING_REPORT:
+		/* already passed checks on the local side */
+	case REF_STATUS_OK:
+		/* of course this is OK */
 		return 0;
 	}
 }
@@ -320,29 +391,6 @@ free_return:
 	return update_seen;
 }
 
-
-static int atomic_push_failure(struct send_pack_args *args,
-			       struct ref *remote_refs,
-			       struct ref *failing_ref)
-{
-	struct ref *ref;
-	/* Mark other refs as failed */
-	for (ref = remote_refs; ref; ref = ref->next) {
-		if (!ref->peer_ref && !args->send_mirror)
-			continue;
-
-		switch (ref->status) {
-		case REF_STATUS_EXPECTING_REPORT:
-			ref->status = REF_STATUS_ATOMIC_PUSH_FAILED;
-			continue;
-		default:
-			break; /* do nothing */
-		}
-	}
-	return error("atomic push failed for ref %s. status: %d\n",
-		     failing_ref->name, failing_ref->status);
-}
-
 #define NONCE_LEN_LIMIT 256
 
 static void reject_invalid_nonce(const char *nonce, int len)
@@ -365,11 +413,57 @@ static void reject_invalid_nonce(const char *nonce, int len)
 	}
 }
 
+static void get_commons_through_negotiation(const char *url,
+					    const struct ref *remote_refs,
+					    struct oid_array *commons)
+{
+	struct child_process child = CHILD_PROCESS_INIT;
+	const struct ref *ref;
+	int len = the_hash_algo->hexsz + 1; /* hash + NL */
+
+	child.git_cmd = 1;
+	child.no_stdin = 1;
+	child.out = -1;
+	strvec_pushl(&child.args, "fetch", "--negotiate-only", NULL);
+	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))
+		die(_("send-pack: unable to fork off fetch subprocess"));
+
+	do {
+		char hex_hash[GIT_MAX_HEXSZ + 1];
+		int read_len = read_in_full(child.out, hex_hash, len);
+		struct object_id oid;
+		const char *end;
+
+		if (!read_len)
+			break;
+		if (read_len != len)
+			die("invalid length read %d", read_len);
+		if (parse_oid_hex(hex_hash, &oid, &end) || *end != '\n')
+			die("invalid hash");
+		oid_array_append(commons, &oid);
+	} while (1);
+
+	if (finish_command(&child)) {
+		/*
+		 * The information that push negotiation provides is useful but
+		 * not mandatory.
+		 */
+		warning(_("push negotiation failed; proceeding anyway with push"));
+	}
+}
+
 int send_pack(struct send_pack_args *args,
 	      int fd[], struct child_process *conn,
 	      struct ref *remote_refs,
 	      struct oid_array *extra_have)
 {
+	struct oid_array commons = OID_ARRAY_INIT;
 	int in = fd[0];
 	int out = fd[1];
 	struct strbuf req_buf = STRBUF_INIT;
@@ -381,18 +475,35 @@ int send_pack(struct send_pack_args *args,
 	int use_sideband = 0;
 	int quiet_supported = 0;
 	int agent_supported = 0;
+	int advertise_sid = 0;
+	int push_negotiate = 0;
 	int use_atomic = 0;
 	int atomic_supported = 0;
 	int use_push_options = 0;
 	int push_options_supported = 0;
+	int object_format_supported = 0;
 	unsigned cmds_sent = 0;
 	int ret;
 	struct async demux;
 	const char *push_cert_nonce = NULL;
 	struct packet_reader reader;
 
+	if (!remote_refs) {
+		fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
+			"Perhaps you should specify a branch.\n");
+		return 0;
+	}
+
+	git_config_get_bool("push.negotiate", &push_negotiate);
+	if (push_negotiate)
+		get_commons_through_negotiation(args->url, remote_refs, &commons);
+
+	git_config_get_bool("transfer.advertisesid", &advertise_sid);
+
 	/* Does the other end support the reporting? */
-	if (server_supports("report-status"))
+	if (server_supports("report-status-v2"))
+		status_report = 2;
+	else if (server_supports("report-status"))
 		status_report = 1;
 	if (server_supports("delete-refs"))
 		allow_deleting_refs = 1;
@@ -404,6 +515,8 @@ int send_pack(struct send_pack_args *args,
 		quiet_supported = 1;
 	if (server_supports("agent"))
 		agent_supported = 1;
+	if (!server_supports("session-id"))
+		advertise_sid = 0;
 	if (server_supports("no-thin"))
 		args->use_thin_pack = 0;
 	if (server_supports("atomic"))
@@ -411,6 +524,9 @@ int send_pack(struct send_pack_args *args,
 	if (server_supports("push-options"))
 		push_options_supported = 1;
 
+	if (!server_supports_hash(the_hash_algo->name, &object_format_supported))
+		die(_("the receiving end does not support this repository's hash algorithm"));
+
 	if (args->push_cert != SEND_PACK_PUSH_CERT_NEVER) {
 		int len;
 		push_cert_nonce = server_feature_value("push-cert", &len);
@@ -426,11 +542,6 @@ int send_pack(struct send_pack_args *args,
 		}
 	}
 
-	if (!remote_refs) {
-		fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
-			"Perhaps you should specify a branch such as 'master'.\n");
-		return 0;
-	}
 	if (args->atomic && !atomic_supported)
 		die(_("the receiving end does not support --atomic push"));
 
@@ -441,8 +552,10 @@ int send_pack(struct send_pack_args *args,
 
 	use_push_options = push_options_supported && args->push_options;
 
-	if (status_report)
+	if (status_report == 1)
 		strbuf_addstr(&cap_buf, " report-status");
+	else if (status_report == 2)
+		strbuf_addstr(&cap_buf, " report-status-v2");
 	if (use_sideband)
 		strbuf_addstr(&cap_buf, " side-band-64k");
 	if (quiet_supported && (args->quiet || !args->progress))
@@ -451,8 +564,12 @@ int send_pack(struct send_pack_args *args,
 		strbuf_addstr(&cap_buf, " atomic");
 	if (use_push_options)
 		strbuf_addstr(&cap_buf, " push-options");
+	if (object_format_supported)
+		strbuf_addf(&cap_buf, " object-format=%s", the_hash_algo->name);
 	if (agent_supported)
 		strbuf_addf(&cap_buf, " agent=%s", git_user_agent_sanitized());
+	if (advertise_sid)
+		strbuf_addf(&cap_buf, " session-id=%s", trace2_session_id());
 
 	/*
 	 * NEEDSWORK: why does delete-refs have to be so specific to
@@ -463,13 +580,6 @@ int send_pack(struct send_pack_args *args,
 		if (ref->deletion && !allow_deleting_refs)
 			ref->status = REF_STATUS_REJECT_NODELETE;
 
-	if (!args->dry_run)
-		advertise_shallow_grafts_buf(&req_buf);
-
-	if (!args->dry_run && push_cert_nonce)
-		cmds_sent = generate_push_cert(&req_buf, remote_refs, args,
-					       cap_buf.buf, push_cert_nonce);
-
 	/*
 	 * Clear the status for each ref and see if we need to send
 	 * the pack data.
@@ -487,7 +597,10 @@ int send_pack(struct send_pack_args *args,
 			if (use_atomic) {
 				strbuf_release(&req_buf);
 				strbuf_release(&cap_buf);
-				return atomic_push_failure(args, remote_refs, ref);
+				reject_atomic_push(remote_refs, args->send_mirror);
+				error("atomic push failed for ref %s. status: %d\n",
+				      ref->name, ref->status);
+				return args->porcelain ? 0 : -1;
 			}
 			/* else fallthrough */
 		default:
@@ -502,31 +615,35 @@ int send_pack(struct send_pack_args *args,
 			ref->status = REF_STATUS_EXPECTING_REPORT;
 	}
 
+	if (!args->dry_run)
+		advertise_shallow_grafts_buf(&req_buf);
+
 	/*
 	 * Finally, tell the other end!
 	 */
-	for (ref = remote_refs; ref; ref = ref->next) {
-		char *old_hex, *new_hex;
-
-		if (args->dry_run || push_cert_nonce)
-			continue;
-
-		if (check_to_send_update(ref, args) < 0)
-			continue;
-
-		old_hex = oid_to_hex(&ref->old_oid);
-		new_hex = oid_to_hex(&ref->new_oid);
-		if (!cmds_sent) {
-			packet_buf_write(&req_buf,
-					 "%s %s %s%c%s",
-					 old_hex, new_hex, ref->name, 0,
-					 cap_buf.buf);
-			cmds_sent = 1;
-		} else {
-			packet_buf_write(&req_buf, "%s %s %s",
-					 old_hex, new_hex, ref->name);
+	if (!args->dry_run && push_cert_nonce)
+		cmds_sent = generate_push_cert(&req_buf, remote_refs, args,
+					       cap_buf.buf, push_cert_nonce);
+	else if (!args->dry_run)
+		for (ref = remote_refs; ref; ref = ref->next) {
+			char *old_hex, *new_hex;
+
+			if (check_to_send_update(ref, args) < 0)
+				continue;
+
+			old_hex = oid_to_hex(&ref->old_oid);
+			new_hex = oid_to_hex(&ref->new_oid);
+			if (!cmds_sent) {
+				packet_buf_write(&req_buf,
+						 "%s %s %s%c%s",
+						 old_hex, new_hex, ref->name, 0,
+						 cap_buf.buf);
+				cmds_sent = 1;
+			} else {
+				packet_buf_write(&req_buf, "%s %s %s",
+						 old_hex, new_hex, ref->name);
+			}
 		}
-	}
 
 	if (use_push_options) {
 		struct string_list_item *item;
@@ -564,9 +681,7 @@ int send_pack(struct send_pack_args *args,
 			   PACKET_READ_DIE_ON_ERR_PACKET);
 
 	if (need_pack_data && cmds_sent) {
-		if (pack_objects(out, remote_refs, extra_have, args) < 0) {
-			for (ref = remote_refs; ref; ref = ref->next)
-				ref->status = REF_STATUS_NONE;
+		if (pack_objects(out, remote_refs, extra_have, &commons, args) < 0) {
 			if (args->stateless_rpc)
 				close(out);
 			if (git_connection_is_socket(conn))
@@ -574,10 +689,12 @@ int send_pack(struct send_pack_args *args,
 
 			/*
 			 * Do not even bother with the return value; we know we
-			 * are failing, and just want the error() side effects.
+			 * are failing, and just want the error() side effects,
+			 * as well as marking refs with their remote status (if
+			 * we get one).
 			 */
 			if (status_report)
-				receive_unpack_status(&reader);
+				receive_status(&reader, remote_refs);
 
 			if (use_sideband) {
 				close(demux.out);
diff --git a/sequencer.c b/sequencer.c
index 9d5964fd81..8a7c1abe1a 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -14,9 +14,10 @@
 #include "diff.h"
 #include "revision.h"
 #include "rerere.h"
-#include "merge-recursive.h"
+#include "merge-ort.h"
+#include "merge-ort-wrappers.h"
 #include "refs.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "quote.h"
 #include "trailer.h"
 #include "log-tree.h"
@@ -32,6 +33,7 @@
 #include "alias.h"
 #include "commit-reach.h"
 #include "rebase-interactive.h"
+#include "reset.h"
 
 #define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
 
@@ -40,7 +42,7 @@ static const char cherry_picked_prefix[] = "(cherry picked from commit ";
 
 GIT_PATH_FUNC(git_path_commit_editmsg, "COMMIT_EDITMSG")
 
-GIT_PATH_FUNC(git_path_seq_dir, "sequencer")
+static GIT_PATH_FUNC(git_path_seq_dir, "sequencer")
 
 static GIT_PATH_FUNC(git_path_todo_file, "sequencer/todo")
 static GIT_PATH_FUNC(git_path_opts_file, "sequencer/opts")
@@ -57,6 +59,8 @@ static GIT_PATH_FUNC(rebase_path, "rebase-merge")
 GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo")
 GIT_PATH_FUNC(rebase_path_todo_backup, "rebase-merge/git-rebase-todo.backup")
 
+GIT_PATH_FUNC(rebase_path_dropped, "rebase-merge/dropped")
+
 /*
  * The rebase command lines that have already been processed. A line
  * is moved here when it is first handled, before any associated user
@@ -117,7 +121,7 @@ static GIT_PATH_FUNC(rebase_path_author_script, "rebase-merge/author-script")
 static GIT_PATH_FUNC(rebase_path_amend, "rebase-merge/amend")
 /*
  * When we stop at a given patch via the "edit" command, this file contains
- * the abbreviated commit name of the corresponding patch.
+ * the commit object name of the corresponding patch.
  */
 static GIT_PATH_FUNC(rebase_path_stopped_sha, "rebase-merge/stopped-sha")
 /*
@@ -131,7 +135,7 @@ static GIT_PATH_FUNC(rebase_path_rewritten_pending,
 	"rebase-merge/rewritten-pending")
 
 /*
- * The path of the file containig the OID of the "squash onto" commit, i.e.
+ * The path of the file containing the OID of the "squash onto" commit, i.e.
  * the dummy commit used for `reset [new root]`.
  */
 static GIT_PATH_FUNC(rebase_path_squash_onto, "rebase-merge/squash-onto")
@@ -147,6 +151,8 @@ static GIT_PATH_FUNC(rebase_path_refs_to_delete, "rebase-merge/refs-to-delete")
  * command-line.
  */
 static GIT_PATH_FUNC(rebase_path_gpg_sign_opt, "rebase-merge/gpg_sign_opt")
+static GIT_PATH_FUNC(rebase_path_cdate_is_adate, "rebase-merge/cdate_is_adate")
+static GIT_PATH_FUNC(rebase_path_ignore_date, "rebase-merge/ignore_date")
 static GIT_PATH_FUNC(rebase_path_orig_head, "rebase-merge/orig-head")
 static GIT_PATH_FUNC(rebase_path_verbose, "rebase-merge/verbose")
 static GIT_PATH_FUNC(rebase_path_quiet, "rebase-merge/quiet")
@@ -158,6 +164,9 @@ static GIT_PATH_FUNC(rebase_path_strategy, "rebase-merge/strategy")
 static GIT_PATH_FUNC(rebase_path_strategy_opts, "rebase-merge/strategy_opts")
 static GIT_PATH_FUNC(rebase_path_allow_rerere_autoupdate, "rebase-merge/allow_rerere_autoupdate")
 static GIT_PATH_FUNC(rebase_path_reschedule_failed_exec, "rebase-merge/reschedule-failed-exec")
+static GIT_PATH_FUNC(rebase_path_no_reschedule_failed_exec, "rebase-merge/no-reschedule-failed-exec")
+static GIT_PATH_FUNC(rebase_path_drop_redundant_commits, "rebase-merge/drop_redundant_commits")
+static GIT_PATH_FUNC(rebase_path_keep_redundant_commits, "rebase-merge/keep_redundant_commits")
 
 static int git_sequencer_config(const char *k, const char *v, void *cb)
 {
@@ -197,6 +206,20 @@ static int git_sequencer_config(const char *k, const char *v, void *cb)
 		return 0;
 	}
 
+	if (!opts->default_strategy && !strcmp(k, "pull.twohead")) {
+		int ret = git_config_string((const char**)&opts->default_strategy, k, v);
+		if (ret == 0) {
+			/*
+			 * pull.twohead is allowed to be multi-valued; we only
+			 * care about the first value.
+			 */
+			char *tmp = strchr(opts->default_strategy, ' ');
+			if (tmp)
+				*tmp = '\0';
+		}
+		return ret;
+	}
+
 	status = git_gpg_config(k, v, NULL);
 	if (status)
 		return status;
@@ -242,11 +265,20 @@ static int has_conforming_footer(struct strbuf *sb, struct strbuf *sob,
 	struct trailer_info info;
 	size_t i;
 	int found_sob = 0, found_sob_last = 0;
+	char saved_char;
 
 	opts.no_divider = 1;
 
+	if (ignore_footer) {
+		saved_char = sb->buf[sb->len - ignore_footer];
+		sb->buf[sb->len - ignore_footer] = '\0';
+	}
+
 	trailer_info_get(&info, sb->buf, &opts);
 
+	if (ignore_footer)
+		sb->buf[sb->len - ignore_footer] = saved_char;
+
 	if (info.trailer_start == info.trailer_end)
 		return 0;
 
@@ -288,7 +320,7 @@ int sequencer_remove_state(struct replay_opts *opts)
 			char *eol = strchr(p, '\n');
 			if (eol)
 				*eol = '\0';
-			if (delete_ref("(rebase -i) cleanup", p, NULL, 0) < 0) {
+			if (delete_ref("(rebase) cleanup", p, NULL, 0) < 0) {
 				warning(_("could not delete '%s'"), p);
 				ret = -1;
 			}
@@ -299,6 +331,7 @@ int sequencer_remove_state(struct replay_opts *opts)
 	}
 
 	free(opts->gpg_sign);
+	free(opts->default_strategy);
 	free(opts->strategy);
 	for (i = 0; i < opts->xopts_nr; i++)
 		free(opts->xopts[i]);
@@ -322,7 +355,7 @@ static const char *action_name(const struct replay_opts *opts)
 	case REPLAY_PICK:
 		return N_("cherry-pick");
 	case REPLAY_INTERACTIVE_REBASE:
-		return N_("rebase -i");
+		return N_("rebase");
 	}
 	die(_("unknown action: %d"), opts->action);
 }
@@ -350,7 +383,7 @@ static int get_message(struct commit *commit, struct commit_message *out)
 	subject_len = find_commit_subject(out->message, &subject);
 
 	out->subject = xmemdupz(subject, subject_len);
-	out->label = xstrfmt("%s... %s", abbrev, out->subject);
+	out->label = xstrfmt("%s (%s)", abbrev, out->subject);
 	out->parent_label = xstrfmt("parent of %s", out->label);
 
 	return 0;
@@ -370,13 +403,14 @@ 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
 		 * of the commit itself so remove CHERRY_PICK_HEAD
 		 */
-		unlink(git_path_cherry_pick_head(r));
+		refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD",
+				NULL, 0);
 		return;
 	}
 
@@ -384,10 +418,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()");
 	}
 }
 
@@ -415,25 +461,15 @@ static int write_message(const void *buf, size_t len, const char *filename,
 	return 0;
 }
 
-/*
- * Reads a file that was presumably written by a shell script, i.e. with an
- * end-of-line marker that needs to be stripped.
- *
- * Note that only the last end-of-line marker is stripped, consistent with the
- * behavior of "$(cat path)" in a shell script.
- *
- * Returns 1 if the file was read, 0 if it could not be read or does not exist.
- */
-static int read_oneliner(struct strbuf *buf,
-	const char *path, int skip_if_empty)
+int read_oneliner(struct strbuf *buf,
+	const char *path, unsigned flags)
 {
 	int orig_len = buf->len;
 
-	if (!file_exists(path))
-		return 0;
-
 	if (strbuf_read_file(buf, path, 0) < 0) {
-		warning_errno(_("could not read '%s'"), path);
+		if ((flags & READ_ONELINER_WARN_MISSING) ||
+		    (errno != ENOENT && errno != ENOTDIR))
+			warning_errno(_("could not read '%s'"), path);
 		return 0;
 	}
 
@@ -443,7 +479,7 @@ static int read_oneliner(struct strbuf *buf,
 		buf->buf[buf->len] = '\0';
 	}
 
-	if (skip_if_empty && buf->len == orig_len)
+	if ((flags & READ_ONELINER_SKIP_IF_EMPTY) && buf->len == orig_len)
 		return 0;
 
 	return 1;
@@ -501,7 +537,7 @@ static int fast_forward_to(struct repository *r,
 	if (!transaction ||
 	    ref_transaction_update(transaction, "HEAD",
 				   to, unborn && !is_rebase_i(opts) ?
-				   &null_oid : from,
+				   null_oid() : from,
 				   0, sb.buf, &err) ||
 	    ref_transaction_commit(transaction, &err)) {
 		ref_transaction_free(transaction);
@@ -586,9 +622,10 @@ static int do_recursive_merge(struct repository *r,
 			      struct replay_opts *opts)
 {
 	struct merge_options o;
+	struct merge_result result;
 	struct tree *next_tree, *base_tree, *head_tree;
-	int clean;
-	char **xopt;
+	int clean, show_output;
+	int i;
 	struct lock_file index_lock = LOCK_INIT;
 
 	if (repo_hold_locked_index(r, &index_lock, LOCK_REPORT_ON_ERROR) < 0)
@@ -608,15 +645,30 @@ static int do_recursive_merge(struct repository *r,
 	next_tree = next ? get_commit_tree(next) : empty_tree(r);
 	base_tree = base ? get_commit_tree(base) : empty_tree(r);
 
-	for (xopt = opts->xopts; xopt != opts->xopts + opts->xopts_nr; xopt++)
-		parse_merge_opt(&o, *xopt);
+	for (i = 0; i < opts->xopts_nr; i++)
+		parse_merge_opt(&o, opts->xopts[i]);
 
-	clean = merge_trees(&o,
-			    head_tree,
-			    next_tree, base_tree);
-	if (is_rebase_i(opts) && clean <= 0)
-		fputs(o.obuf.buf, stdout);
-	strbuf_release(&o.obuf);
+	if (!opts->strategy || !strcmp(opts->strategy, "ort")) {
+		memset(&result, 0, sizeof(result));
+		merge_incore_nonrecursive(&o, base_tree, head_tree, next_tree,
+					    &result);
+		show_output = !is_rebase_i(opts) || !result.clean;
+		/*
+		 * TODO: merge_switch_to_result will update index/working tree;
+		 * we only really want to do that if !result.clean || this is
+		 * the final patch to be picked.  But determining this is the
+		 * final patch would take some work, and "head_tree" would need
+		 * to be replace with the tree the index matched before we
+		 * started doing any picks.
+		 */
+		merge_switch_to_result(&o, head_tree, &result, 1, show_output);
+		clean = result.clean;
+	} else {
+		clean = merge_trees(&o, head_tree, next_tree, base_tree);
+		if (is_rebase_i(opts) && clean <= 0)
+			fputs(o.obuf.buf, stdout);
+		strbuf_release(&o.obuf);
+	}
 	if (clean < 0) {
 		rollback_lock_file(&index_lock);
 		return clean;
@@ -626,7 +678,7 @@ static int do_recursive_merge(struct repository *r,
 			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
 		/*
 		 * TRANSLATORS: %s will be "revert", "cherry-pick" or
-		 * "rebase -i".
+		 * "rebase".
 		 */
 		return error(_("%s: Unable to write new index file"),
 			_(action_name(opts)));
@@ -640,9 +692,6 @@ static int do_recursive_merge(struct repository *r,
 
 static struct object_id *get_cache_tree_oid(struct index_state *istate)
 {
-	if (!istate->cache_tree)
-		istate->cache_tree = cache_tree();
-
 	if (!cache_tree_fully_valid(istate->cache_tree))
 		if (cache_tree_update(istate, 0)) {
 			error(_("unable to update cache tree"));
@@ -835,10 +884,10 @@ finish:
 
 /*
  * Read a GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL AND GIT_AUTHOR_DATE from a
- * file with shell quoting into struct argv_array. Returns -1 on
+ * file with shell quoting into struct strvec. Returns -1 on
  * error, 0 otherwise.
  */
-static int read_env_script(struct argv_array *env)
+static int read_env_script(struct strvec *env)
 {
 	char *name, *email, *date;
 
@@ -846,9 +895,9 @@ static int read_env_script(struct argv_array *env)
 			       &name, &email, &date, 0))
 		return -1;
 
-	argv_array_pushf(env, "GIT_AUTHOR_NAME=%s", name);
-	argv_array_pushf(env, "GIT_AUTHOR_EMAIL=%s", email);
-	argv_array_pushf(env, "GIT_AUTHOR_DATE=%s", date);
+	strvec_pushf(env, "GIT_AUTHOR_NAME=%s", name);
+	strvec_pushf(env, "GIT_AUTHOR_EMAIL=%s", email);
+	strvec_pushf(env, "GIT_AUTHOR_DATE=%s", date);
 	free(name);
 	free(email);
 	free(date);
@@ -868,6 +917,22 @@ static char *get_author(const char *message)
 	return NULL;
 }
 
+static const char *author_date_from_env_array(const struct strvec *env)
+{
+	int i;
+	const char *date;
+
+	for (i = 0; i < env->nr; i++)
+		if (skip_prefix(env->v[i],
+				"GIT_AUTHOR_DATE=", &date))
+			return date;
+	/*
+	 * If GIT_AUTHOR_DATE is missing we should have already errored out when
+	 * reading the script
+	 */
+	BUG("GIT_AUTHOR_DATE missing from author script");
+}
+
 static const char staged_changes_advice[] =
 N_("you have staged changes in your working tree\n"
 "If these changes are meant to be squashed into the previous commit, run:\n"
@@ -888,6 +953,7 @@ N_("you have staged changes in your working tree\n"
 #define CLEANUP_MSG (1<<3)
 #define VERIFY_MSG  (1<<4)
 #define CREATE_ROOT_COMMIT (1<<5)
+#define VERBATIM_MSG (1<<6)
 
 static int run_command_silent_on_success(struct child_process *cmd)
 {
@@ -918,48 +984,63 @@ static int run_command_silent_on_success(struct child_process *cmd)
  * interactive rebase: in that case, we will want to retain the
  * author metadata.
  */
-static int run_git_commit(struct repository *r,
-			  const char *defmsg,
+static int run_git_commit(const char *defmsg,
 			  struct replay_opts *opts,
 			  unsigned int flags)
 {
 	struct child_process cmd = CHILD_PROCESS_INIT;
 
+	if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG))
+		BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive");
+
 	cmd.git_cmd = 1;
 
-	if (is_rebase_i(opts) && read_env_script(&cmd.env_array)) {
+	if (is_rebase_i(opts) && !(!defmsg && (flags & AMEND_MSG)) &&
+	    read_env_script(&cmd.env_array)) {
 		const char *gpg_opt = gpg_sign_opt_quoted(opts);
 
 		return error(_(staged_changes_advice),
 			     gpg_opt, gpg_opt);
 	}
 
-	argv_array_push(&cmd.args, "commit");
+	if (opts->committer_date_is_author_date)
+		strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s",
+			     opts->ignore_date ?
+			     "" :
+			     author_date_from_env_array(&cmd.env_array));
+	if (opts->ignore_date)
+		strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE=");
+
+	strvec_push(&cmd.args, "commit");
 
 	if (!(flags & VERIFY_MSG))
-		argv_array_push(&cmd.args, "-n");
+		strvec_push(&cmd.args, "-n");
 	if ((flags & AMEND_MSG))
-		argv_array_push(&cmd.args, "--amend");
+		strvec_push(&cmd.args, "--amend");
 	if (opts->gpg_sign)
-		argv_array_pushf(&cmd.args, "-S%s", opts->gpg_sign);
+		strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign);
+	else
+		strvec_push(&cmd.args, "--no-gpg-sign");
 	if (defmsg)
-		argv_array_pushl(&cmd.args, "-F", defmsg, NULL);
+		strvec_pushl(&cmd.args, "-F", defmsg, NULL);
 	else if (!(flags & EDIT_MSG))
-		argv_array_pushl(&cmd.args, "-C", "HEAD", NULL);
+		strvec_pushl(&cmd.args, "-C", "HEAD", NULL);
 	if ((flags & CLEANUP_MSG))
-		argv_array_push(&cmd.args, "--cleanup=strip");
+		strvec_push(&cmd.args, "--cleanup=strip");
+	if ((flags & VERBATIM_MSG))
+		strvec_push(&cmd.args, "--cleanup=verbatim");
 	if ((flags & EDIT_MSG))
-		argv_array_push(&cmd.args, "-e");
+		strvec_push(&cmd.args, "-e");
 	else if (!(flags & CLEANUP_MSG) &&
 		 !opts->signoff && !opts->record_origin &&
 		 !opts->explicit_cleanup)
-		argv_array_push(&cmd.args, "--cleanup=verbatim");
+		strvec_push(&cmd.args, "--cleanup=verbatim");
 
 	if ((flags & ALLOW_EMPTY))
-		argv_array_push(&cmd.args, "--allow-empty");
+		strvec_push(&cmd.args, "--allow-empty");
 
 	if (!(flags & EDIT_MSG))
-		argv_array_push(&cmd.args, "--allow-empty-message");
+		strvec_push(&cmd.args, "--allow-empty-message");
 
 	if (is_rebase_i(opts) && !(flags & EDIT_MSG))
 		return run_command_silent_on_success(&cmd);
@@ -1064,7 +1145,7 @@ int update_head_with_reflog(const struct commit *old_head,
 	transaction = ref_transaction_begin(err);
 	if (!transaction ||
 	    ref_transaction_update(transaction, "HEAD", new_head,
-				   old_head ? &old_head->object.oid : &null_oid,
+				   old_head ? &old_head->object.oid : null_oid(),
 				   0, sb.buf, err) ||
 	    ref_transaction_commit(transaction, err)) {
 		ret = -1;
@@ -1126,25 +1207,22 @@ static int run_prepare_commit_msg_hook(struct repository *r,
 				       struct strbuf *msg,
 				       const char *commit)
 {
-	struct argv_array hook_env = ARGV_ARRAY_INIT;
-	int ret;
-	const char *name;
+	int ret = 0;
+	const char *name, *arg1 = NULL, *arg2 = NULL;
 
 	name = git_path_commit_editmsg();
 	if (write_message(msg->buf, msg->len, name, 0))
 		return -1;
 
-	argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", r->index_file);
-	argv_array_push(&hook_env, "GIT_EDITOR=:");
-	if (commit)
-		ret = run_hook_le(hook_env.argv, "prepare-commit-msg", name,
-				  "commit", commit, NULL);
-	else
-		ret = run_hook_le(hook_env.argv, "prepare-commit-msg", name,
-				  "message", NULL);
-	if (ret)
+	if (commit) {
+		arg1 = "commit";
+		arg2 = commit;
+	} else {
+		arg1 = "message";
+	}
+	if (run_commit_hook(0, r->index_file, "prepare-commit-msg", name,
+			    arg1, arg2, NULL))
 		ret = error(_("'prepare-commit-msg' hook failed"));
-	argv_array_clear(&hook_env);
 
 	return ret;
 }
@@ -1176,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);
 
@@ -1314,15 +1392,19 @@ static int try_to_commit(struct repository *r,
 	struct strbuf err = STRBUF_INIT;
 	struct strbuf commit_msg = STRBUF_INIT;
 	char *amend_author = NULL;
+	const char *committer = NULL;
 	const char *hook_commit = NULL;
 	enum commit_msg_cleanup_mode cleanup;
 	int res = 0;
 
+	if ((flags & CLEANUP_MSG) && (flags & VERBATIM_MSG))
+		BUG("CLEANUP_MSG and VERBATIM_MSG are mutually exclusive");
+
 	if (parse_head(r, &current_head))
 		return -1;
 
 	if (flags & AMEND_MSG) {
-		const char *exclude_gpgsig[] = { "gpgsig", NULL };
+		const char *exclude_gpgsig[] = { "gpgsig", "gpgsig-sha256", NULL };
 		const char *out_enc = get_commit_output_encoding();
 		const char *message = logmsg_reencode(current_head, NULL,
 						      out_enc);
@@ -1353,11 +1435,27 @@ static int try_to_commit(struct repository *r,
 		goto out;
 	}
 
-	if (!(flags & ALLOW_EMPTY) && oideq(current_head ?
-					    get_commit_tree_oid(current_head) :
-					    the_hash_algo->empty_tree, &tree)) {
-		res = 1; /* run 'git commit' to display error message */
-		goto out;
+	if (!(flags & ALLOW_EMPTY)) {
+		struct commit *first_parent = current_head;
+
+		if (flags & AMEND_MSG) {
+			if (current_head->parents) {
+				first_parent = current_head->parents->item;
+				if (repo_parse_commit(r, first_parent)) {
+					res = error(_("could not parse HEAD commit"));
+					goto out;
+				}
+			} else {
+				first_parent = NULL;
+			}
+		}
+		if (oideq(first_parent
+			  ? get_commit_tree_oid(first_parent)
+			  : the_hash_algo->empty_tree,
+			  &tree)) {
+			res = 1; /* run 'git commit' to display error message */
+			goto out;
+		}
 	}
 
 	if (find_hook("prepare-commit-msg")) {
@@ -1376,6 +1474,8 @@ static int try_to_commit(struct repository *r,
 
 	if (flags & CLEANUP_MSG)
 		cleanup = COMMIT_MSG_CLEANUP_ALL;
+	else if (flags & VERBATIM_MSG)
+		cleanup = COMMIT_MSG_CLEANUP_NONE;
 	else if ((opts->signoff || opts->record_origin) &&
 		 !opts->explicit_cleanup)
 		cleanup = COMMIT_MSG_CLEANUP_SPACE;
@@ -1389,10 +1489,57 @@ static int try_to_commit(struct repository *r,
 		goto out;
 	}
 
-	reset_ident_date();
+	if (opts->committer_date_is_author_date) {
+		struct ident_split id;
+		struct strbuf date = STRBUF_INIT;
 
-	if (commit_tree_extended(msg->buf, msg->len, &tree, parents,
-				 oid, author, opts->gpg_sign, extra)) {
+		if (!opts->ignore_date) {
+			if (split_ident_line(&id, author, (int)strlen(author)) < 0) {
+				res = error(_("invalid author identity '%s'"),
+					    author);
+				goto out;
+			}
+			if (!id.date_begin) {
+				res = error(_(
+					"corrupt author: missing date information"));
+				goto out;
+			}
+			strbuf_addf(&date, "@%.*s %.*s",
+				    (int)(id.date_end - id.date_begin),
+				    id.date_begin,
+				    (int)(id.tz_end - id.tz_begin),
+				    id.tz_begin);
+		} else {
+			reset_ident_date();
+		}
+		committer = fmt_ident(getenv("GIT_COMMITTER_NAME"),
+				      getenv("GIT_COMMITTER_EMAIL"),
+				      WANT_COMMITTER_IDENT,
+				      opts->ignore_date ? NULL : date.buf,
+				      IDENT_STRICT);
+		strbuf_release(&date);
+	} else {
+		reset_ident_date();
+	}
+
+	if (opts->ignore_date) {
+		struct ident_split id;
+		char *name, *email;
+
+		if (split_ident_line(&id, author, strlen(author)) < 0) {
+			error(_("invalid author identity '%s'"), author);
+			goto out;
+		}
+		name = xmemdupz(id.name_begin, id.name_end - id.name_begin);
+		email = xmemdupz(id.mail_begin, id.mail_end - id.mail_begin);
+		author = fmt_ident(name, email, WANT_AUTHOR_IDENT, NULL,
+				   IDENT_STRICT);
+		free(name);
+		free(email);
+	}
+
+	if (commit_tree_extended(msg->buf, msg->len, &tree, parents, oid,
+				 author, committer, opts->gpg_sign, extra)) {
 		res = error(_("failed to write commit object"));
 		goto out;
 	}
@@ -1403,6 +1550,7 @@ static int try_to_commit(struct repository *r,
 		goto out;
 	}
 
+	run_commit_hook(0, r->index_file, "post-commit", NULL);
 	if (flags & AMEND_MSG)
 		commit_post_rewrite(r, current_head, oid);
 
@@ -1415,9 +1563,19 @@ out:
 	return res;
 }
 
+static int write_rebase_head(struct object_id *oid)
+{
+	if (update_ref("rebase", "REBASE_HEAD", oid,
+		       NULL, REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR))
+		return error(_("could not update %s"), "REBASE_HEAD");
+
+	return 0;
+}
+
 static int do_commit(struct repository *r,
 		     const char *msg_file, const char *author,
-		     struct replay_opts *opts, unsigned int flags)
+		     struct replay_opts *opts, unsigned int flags,
+		     struct object_id *oid)
 {
 	int res = 1;
 
@@ -1434,7 +1592,8 @@ static int do_commit(struct repository *r,
 				    author, opts, flags, &oid);
 		strbuf_release(&sb);
 		if (!res) {
-			unlink(git_path_cherry_pick_head(r));
+			refs_delete_ref(get_main_ref_store(r), "",
+					"CHERRY_PICK_HEAD", NULL, 0);
 			unlink(git_path_merge_msg(r));
 			if (!is_rebase_i(opts))
 				print_commit_summary(r, NULL, &oid,
@@ -1442,8 +1601,12 @@ static int do_commit(struct repository *r,
 			return res;
 		}
 	}
-	if (res == 1)
-		return run_git_commit(r, msg_file, opts, flags);
+	if (res == 1) {
+		if (is_rebase_i(opts) && oid)
+			if (write_rebase_head(oid))
+			    return -1;
+		return run_git_commit(msg_file, opts, flags);
+	}
 
 	return res;
 }
@@ -1469,23 +1632,30 @@ static int is_original_commit_empty(struct commit *commit)
 }
 
 /*
- * Do we run "git commit" with "--allow-empty"?
+ * Should empty commits be allowed?  Return status:
+ *    <0: Error in is_index_unchanged(r) or is_original_commit_empty(commit)
+ *     0: Halt on empty commit
+ *     1: Allow empty commit
+ *     2: Drop empty commit
  */
 static int allow_empty(struct repository *r,
 		       struct replay_opts *opts,
 		       struct commit *commit)
 {
-	int index_unchanged, empty_commit;
+	int index_unchanged, originally_empty;
 
 	/*
-	 * Three cases:
+	 * Four cases:
 	 *
 	 * (1) we do not allow empty at all and error out.
 	 *
-	 * (2) we allow ones that were initially empty, but
-	 * forbid the ones that become empty;
+	 * (2) we allow ones that were initially empty, and
+	 *     just drop the ones that become empty
+	 *
+	 * (3) we allow ones that were initially empty, but
+	 *     halt for the ones that become empty;
 	 *
-	 * (3) we allow both.
+	 * (4) we allow both.
 	 */
 	if (!opts->allow_empty)
 		return 0; /* let "git commit" barf as necessary */
@@ -1499,13 +1669,15 @@ static int allow_empty(struct repository *r,
 	if (opts->keep_redundant_commits)
 		return 1;
 
-	empty_commit = is_original_commit_empty(commit);
-	if (empty_commit < 0)
-		return empty_commit;
-	if (!empty_commit)
-		return 0;
-	else
+	originally_empty = is_original_commit_empty(commit);
+	if (originally_empty < 0)
+		return originally_empty;
+	if (originally_empty)
 		return 1;
+	else if (opts->drop_redundant_commits)
+		return 2;
+	else
+		return 0;
 }
 
 static struct {
@@ -1537,7 +1709,7 @@ static const char *command_to_string(const enum todo_command command)
 
 static char command_to_char(const enum todo_command command)
 {
-	if (command < TODO_COMMENT && todo_command_info[command].c)
+	if (command < TODO_COMMENT)
 		return todo_command_info[command].c;
 	return comment_line_char;
 }
@@ -1568,14 +1740,185 @@ static int is_pick_or_similar(enum todo_command command)
 	}
 }
 
+enum todo_item_flags {
+	TODO_EDIT_MERGE_MSG    = (1 << 0),
+	TODO_REPLACE_FIXUP_MSG = (1 << 1),
+	TODO_EDIT_FIXUP_MSG    = (1 << 2),
+};
+
+static const char first_commit_msg_str[] = N_("This is the 1st commit message:");
+static const char nth_commit_msg_fmt[] = N_("This is the commit message #%d:");
+static const char skip_first_commit_msg_str[] = N_("The 1st commit message will be skipped:");
+static const char skip_nth_commit_msg_fmt[] = N_("The commit message #%d will be skipped:");
+static const char combined_commit_msg_fmt[] = N_("This is a combination of %d commits.");
+
+static int is_fixup_flag(enum todo_command command, unsigned flag)
+{
+	return command == TODO_FIXUP && ((flag & TODO_REPLACE_FIXUP_MSG) ||
+					 (flag & TODO_EDIT_FIXUP_MSG));
+}
+
+/*
+ * Wrapper around strbuf_add_commented_lines() which avoids double
+ * commenting commit subjects.
+ */
+static void add_commented_lines(struct strbuf *buf, const void *str, size_t len)
+{
+	const char *s = str;
+	while (len > 0 && s[0] == comment_line_char) {
+		size_t count;
+		const char *n = memchr(s, '\n', len);
+		if (!n)
+			count = len;
+		else
+			count = n - s + 1;
+		strbuf_add(buf, s, count);
+		s += count;
+		len -= count;
+	}
+	strbuf_add_commented_lines(buf, s, len);
+}
+
+/* Does the current fixup chain contain a squash command? */
+static int seen_squash(struct replay_opts *opts)
+{
+	return starts_with(opts->current_fixups.buf, "squash") ||
+		strstr(opts->current_fixups.buf, "\nsquash");
+}
+
+static void update_comment_bufs(struct strbuf *buf1, struct strbuf *buf2, int n)
+{
+	strbuf_setlen(buf1, 2);
+	strbuf_addf(buf1, _(nth_commit_msg_fmt), n);
+	strbuf_addch(buf1, '\n');
+	strbuf_setlen(buf2, 2);
+	strbuf_addf(buf2, _(skip_nth_commit_msg_fmt), n);
+	strbuf_addch(buf2, '\n');
+}
+
+/*
+ * Comment out any un-commented commit messages, updating the message comments
+ * to say they will be skipped but do not comment out the empty lines that
+ * surround commit messages and their comments.
+ */
+static void update_squash_message_for_fixup(struct strbuf *msg)
+{
+	void (*copy_lines)(struct strbuf *, const void *, size_t) = strbuf_add;
+	struct strbuf buf1 = STRBUF_INIT, buf2 = STRBUF_INIT;
+	const char *s, *start;
+	char *orig_msg;
+	size_t orig_msg_len;
+	int i = 1;
+
+	strbuf_addf(&buf1, "# %s\n", _(first_commit_msg_str));
+	strbuf_addf(&buf2, "# %s\n", _(skip_first_commit_msg_str));
+	s = start = orig_msg = strbuf_detach(msg, &orig_msg_len);
+	while (s) {
+		const char *next;
+		size_t off;
+		if (skip_prefix(s, buf1.buf, &next)) {
+			/*
+			 * Copy the last message, preserving the blank line
+			 * preceding the current line
+			 */
+			off = (s > start + 1 && s[-2] == '\n') ? 1 : 0;
+			copy_lines(msg, start, s - start - off);
+			if (off)
+				strbuf_addch(msg, '\n');
+			/*
+			 * The next message needs to be commented out but the
+			 * message header is already commented out so just copy
+			 * it and the blank line that follows it.
+			 */
+			strbuf_addbuf(msg, &buf2);
+			if (*next == '\n')
+				strbuf_addch(msg, *next++);
+			start = s = next;
+			copy_lines = add_commented_lines;
+			update_comment_bufs(&buf1, &buf2, ++i);
+		} else if (skip_prefix(s, buf2.buf, &next)) {
+			off = (s > start + 1 && s[-2] == '\n') ? 1 : 0;
+			copy_lines(msg, start, s - start - off);
+			start = s - off;
+			s = next;
+			copy_lines = strbuf_add;
+			update_comment_bufs(&buf1, &buf2, ++i);
+		} else {
+			s = strchr(s, '\n');
+			if (s)
+				s++;
+		}
+	}
+	copy_lines(msg, start, orig_msg_len - (start - orig_msg));
+	free(orig_msg);
+	strbuf_release(&buf1);
+	strbuf_release(&buf2);
+}
+
+static int append_squash_message(struct strbuf *buf, const char *body,
+			 enum todo_command command, struct replay_opts *opts,
+			 unsigned flag)
+{
+	const char *fixup_msg;
+	size_t commented_len = 0, fixup_off;
+	/*
+	 * amend is non-interactive and not normally used with fixup!
+	 * or squash! commits, so only comment out those subjects when
+	 * squashing commit messages.
+	 */
+	if (starts_with(body, "amend!") ||
+	    ((command == TODO_SQUASH || seen_squash(opts)) &&
+	     (starts_with(body, "squash!") || starts_with(body, "fixup!"))))
+		commented_len = commit_subject_length(body);
+
+	strbuf_addf(buf, "\n%c ", comment_line_char);
+	strbuf_addf(buf, _(nth_commit_msg_fmt),
+		    ++opts->current_fixup_count + 1);
+	strbuf_addstr(buf, "\n\n");
+	strbuf_add_commented_lines(buf, body, commented_len);
+	/* buf->buf may be reallocated so store an offset into the buffer */
+	fixup_off = buf->len;
+	strbuf_addstr(buf, body + commented_len);
+
+	/* fixup -C after squash behaves like squash */
+	if (is_fixup_flag(command, flag) && !seen_squash(opts)) {
+		/*
+		 * We're replacing the commit message so we need to
+		 * append the Signed-off-by: trailer if the user
+		 * requested '--signoff'.
+		 */
+		if (opts->signoff)
+			append_signoff(buf, 0, 0);
+
+		if ((command == TODO_FIXUP) &&
+		    (flag & TODO_REPLACE_FIXUP_MSG) &&
+		    (file_exists(rebase_path_fixup_msg()) ||
+		     !file_exists(rebase_path_squash_msg()))) {
+			fixup_msg = skip_blank_lines(buf->buf + fixup_off);
+			if (write_message(fixup_msg, strlen(fixup_msg),
+					rebase_path_fixup_msg(), 0) < 0)
+				return error(_("cannot write '%s'"),
+					rebase_path_fixup_msg());
+		} else {
+			unlink(rebase_path_fixup_msg());
+		}
+	} else  {
+		unlink(rebase_path_fixup_msg());
+	}
+
+	return 0;
+}
+
 static int update_squash_messages(struct repository *r,
 				  enum todo_command command,
 				  struct commit *commit,
-				  struct replay_opts *opts)
+				  struct replay_opts *opts,
+				  unsigned flag)
 {
 	struct strbuf buf = STRBUF_INIT;
-	int res;
+	int res = 0;
 	const char *message, *body;
+	const char *encoding = get_commit_output_encoding();
 
 	if (opts->current_fixup_count > 0) {
 		struct strbuf header = STRBUF_INIT;
@@ -1589,10 +1932,12 @@ static int update_squash_messages(struct repository *r,
 			buf.buf : strchrnul(buf.buf, '\n');
 
 		strbuf_addf(&header, "%c ", comment_line_char);
-		strbuf_addf(&header, _("This is a combination of %d commits."),
+		strbuf_addf(&header, _(combined_commit_msg_fmt),
 			    opts->current_fixup_count + 2);
 		strbuf_splice(&buf, 0, eol - buf.buf, header.buf, header.len);
 		strbuf_release(&header);
+		if (is_fixup_flag(command, flag) && !seen_squash(opts))
+			update_squash_message_for_fixup(&buf);
 	} else {
 		struct object_id head;
 		struct commit *head_commit;
@@ -1602,42 +1947,40 @@ static int update_squash_messages(struct repository *r,
 			return error(_("need a HEAD to fixup"));
 		if (!(head_commit = lookup_commit_reference(r, &head)))
 			return error(_("could not read HEAD"));
-		if (!(head_message = get_commit_buffer(head_commit, NULL)))
+		if (!(head_message = logmsg_reencode(head_commit, NULL, encoding)))
 			return error(_("could not read HEAD's commit message"));
 
 		find_commit_subject(head_message, &body);
-		if (write_message(body, strlen(body),
-				  rebase_path_fixup_msg(), 0)) {
+		if (command == TODO_FIXUP && !flag && write_message(body, strlen(body),
+							rebase_path_fixup_msg(), 0) < 0) {
 			unuse_commit_buffer(head_commit, head_message);
-			return error(_("cannot write '%s'"),
-				     rebase_path_fixup_msg());
+			return error(_("cannot write '%s'"), rebase_path_fixup_msg());
 		}
-
 		strbuf_addf(&buf, "%c ", comment_line_char);
-		strbuf_addf(&buf, _("This is a combination of %d commits."), 2);
+		strbuf_addf(&buf, _(combined_commit_msg_fmt), 2);
 		strbuf_addf(&buf, "\n%c ", comment_line_char);
-		strbuf_addstr(&buf, _("This is the 1st commit message:"));
+		strbuf_addstr(&buf, is_fixup_flag(command, flag) ?
+			      _(skip_first_commit_msg_str) :
+			      _(first_commit_msg_str));
 		strbuf_addstr(&buf, "\n\n");
-		strbuf_addstr(&buf, body);
+		if (is_fixup_flag(command, flag))
+			strbuf_add_commented_lines(&buf, body, strlen(body));
+		else
+			strbuf_addstr(&buf, body);
 
 		unuse_commit_buffer(head_commit, head_message);
 	}
 
-	if (!(message = get_commit_buffer(commit, NULL)))
+	if (!(message = logmsg_reencode(commit, NULL, encoding)))
 		return error(_("could not read commit message of %s"),
 			     oid_to_hex(&commit->object.oid));
 	find_commit_subject(message, &body);
 
-	if (command == TODO_SQUASH) {
-		unlink(rebase_path_fixup_msg());
-		strbuf_addf(&buf, "\n%c ", comment_line_char);
-		strbuf_addf(&buf, _("This is the commit message #%d:"),
-			    ++opts->current_fixup_count + 1);
-		strbuf_addstr(&buf, "\n\n");
-		strbuf_addstr(&buf, body);
+	if (command == TODO_SQUASH || is_fixup_flag(command, flag)) {
+		res = append_squash_message(&buf, body, command, opts, flag);
 	} else if (command == TODO_FIXUP) {
 		strbuf_addf(&buf, "\n%c ", comment_line_char);
-		strbuf_addf(&buf, _("The commit message #%d will be skipped:"),
+		strbuf_addf(&buf, _(skip_nth_commit_msg_fmt),
 			    ++opts->current_fixup_count + 1);
 		strbuf_addstr(&buf, "\n\n");
 		strbuf_add_commented_lines(&buf, body, strlen(body));
@@ -1645,7 +1988,9 @@ static int update_squash_messages(struct repository *r,
 		return error(_("unknown command: %d"), command);
 	unuse_commit_buffer(commit, message);
 
-	res = write_message(buf.buf, buf.len, rebase_path_squash_msg(), 0);
+	if (!res)
+		res = write_message(buf.buf, buf.len, rebase_path_squash_msg(),
+				    0);
 	strbuf_release(&buf);
 
 	if (!res) {
@@ -1701,27 +2046,39 @@ static void record_in_rewritten(struct object_id *oid,
 		flush_rewritten_pending();
 }
 
+static int should_edit(struct replay_opts *opts) {
+	if (opts->edit < 0)
+		/*
+		 * Note that we only handle the case of non-conflicted
+		 * commits; continue_single_pick() handles the conflicted
+		 * commits itself instead of calling this function.
+		 */
+		return (opts->action == REPLAY_REVERT && isatty(0)) ? 1 : 0;
+	return opts->edit;
+}
+
 static int do_pick_commit(struct repository *r,
-			  enum todo_command command,
-			  struct commit *commit,
+			  struct todo_item *item,
 			  struct replay_opts *opts,
 			  int final_fixup, int *check_todo)
 {
-	unsigned int flags = opts->edit ? EDIT_MSG : 0;
-	const char *msg_file = opts->edit ? NULL : git_path_merge_msg(r);
+	unsigned int flags = should_edit(opts) ? EDIT_MSG : 0;
+	const char *msg_file = should_edit(opts) ? NULL : git_path_merge_msg(r);
 	struct object_id head;
 	struct commit *base, *next, *parent;
 	const char *base_label, *next_label;
 	char *author = NULL;
 	struct commit_message msg = { NULL, NULL, NULL, NULL };
 	struct strbuf msgbuf = STRBUF_INIT;
-	int res, unborn = 0, reword = 0, allow;
+	int res, unborn = 0, reword = 0, allow, drop_commit;
+	enum todo_command command = item->command;
+	struct commit *commit = item->commit;
 
 	if (opts->no_commit) {
 		/*
 		 * 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))
@@ -1845,13 +2202,14 @@ static int do_pick_commit(struct repository *r,
 	if (command == TODO_REWORD)
 		reword = 1;
 	else if (is_fixup(command)) {
-		if (update_squash_messages(r, command, commit, opts))
+		if (update_squash_messages(r, command, commit,
+					   opts, item->flags))
 			return -1;
 		flags |= AMEND_MSG;
 		if (!final_fixup)
 			msg_file = rebase_path_squash_msg();
 		else if (file_exists(rebase_path_fixup_msg())) {
-			flags |= CLEANUP_MSG;
+			flags |= VERBATIM_MSG;
 			msg_file = rebase_path_fixup_msg();
 		} else {
 			const char *dest = git_path_squash_msg(r);
@@ -1870,7 +2228,10 @@ static int do_pick_commit(struct repository *r,
 
 	if (is_rebase_i(opts) && write_author_script(msg.message) < 0)
 		res = -1;
-	else if (!opts->strategy || !strcmp(opts->strategy, "recursive") || command == TODO_REVERT) {
+	else if (!opts->strategy ||
+		 !strcmp(opts->strategy, "recursive") ||
+		 !strcmp(opts->strategy, "ort") ||
+		 command == TODO_REVERT) {
 		res = do_recursive_merge(r, base, next, base_label, next_label,
 					 &head, &msgbuf, opts);
 		if (res < 0)
@@ -1901,7 +2262,9 @@ static int do_pick_commit(struct repository *r,
 	 * However, if the merge did not even start, then we don't want to
 	 * write it at all.
 	 */
-	if (command == TODO_PICK && !opts->no_commit && (res == 0 || res == 1) &&
+	if ((command == TODO_PICK || command == TODO_REWORD ||
+	     command == TODO_EDIT) && !opts->no_commit &&
+	    (res == 0 || res == 1) &&
 	    update_ref(NULL, "CHERRY_PICK_HEAD", &commit->object.oid, NULL,
 		       REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR))
 		res = -1;
@@ -1920,21 +2283,33 @@ static int do_pick_commit(struct repository *r,
 		goto leave;
 	}
 
+	drop_commit = 0;
 	allow = allow_empty(r, opts, commit);
 	if (allow < 0) {
 		res = allow;
 		goto leave;
-	} else if (allow)
+	} else if (allow == 1) {
 		flags |= ALLOW_EMPTY;
-	if (!opts->no_commit) {
+	} else if (allow == 2) {
+		drop_commit = 1;
+		refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD",
+				NULL, 0);
+		unlink(git_path_merge_msg(r));
+		unlink(git_path_auto_merge(r));
+		fprintf(stderr,
+			_("dropping %s %s -- patch contents already upstream\n"),
+			oid_to_hex(&commit->object.oid), msg.subject);
+	} /* else allow == 0 and there's nothing special to do */
+	if (!opts->no_commit && !drop_commit) {
 		if (author || command == TODO_REVERT || (flags & AMEND_MSG))
-			res = do_commit(r, msg_file, author, opts, flags);
+			res = do_commit(r, msg_file, author, opts, flags,
+					commit? &commit->object.oid : NULL);
 		else
 			res = error(_("unable to parse commit author"));
 		*check_todo = !!(flags & EDIT_MSG);
 		if (!res && reword) {
 fast_forward_edit:
-			res = run_git_commit(r, NULL, opts, EDIT_MSG |
+			res = run_git_commit(NULL, opts, EDIT_MSG |
 					     VERIFY_MSG | AMEND_MSG |
 					     (flags & ALLOW_EMPTY));
 			*check_todo = 1;
@@ -1994,10 +2369,6 @@ static int read_and_refresh_cache(struct repository *r,
 	return 0;
 }
 
-enum todo_item_flags {
-	TODO_EDIT_MERGE_MSG = 1
-};
-
 void todo_list_release(struct todo_list *todo_list)
 {
 	strbuf_release(&todo_list->buf);
@@ -2008,6 +2379,7 @@ void todo_list_release(struct todo_list *todo_list)
 static struct todo_item *append_new_todo(struct todo_list *todo_list)
 {
 	ALLOC_GROW(todo_list->items, todo_list->nr + 1, todo_list->alloc);
+	todo_list->total_nr++;
 	return todo_list->items + todo_list->nr++;
 }
 
@@ -2083,6 +2455,18 @@ static int parse_insn_line(struct repository *r, struct todo_item *item,
 		return 0;
 	}
 
+	if (item->command == TODO_FIXUP) {
+		if (skip_prefix(bol, "-C", &bol) &&
+		   (*bol == ' ' || *bol == '\t')) {
+			bol += strspn(bol, " \t");
+			item->flags |= TODO_REPLACE_FIXUP_MSG;
+		} else if (skip_prefix(bol, "-c", &bol) &&
+				  (*bol == ' ' || *bol == '\t')) {
+			bol += strspn(bol, " \t");
+			item->flags |= TODO_EDIT_FIXUP_MSG;
+		}
+	}
+
 	if (item->command == TODO_MERGE) {
 		if (skip_prefix(bol, "-C", &bol))
 			bol += strspn(bol, " \t");
@@ -2102,6 +2486,8 @@ static int parse_insn_line(struct repository *r, struct todo_item *item,
 	saved = *end_of_object_name;
 	*end_of_object_name = '\0';
 	status = get_oid(bol, &commit_oid);
+	if (status < 0)
+		error(_("could not parse '%s'"), bol); /* return later */
 	*end_of_object_name = saved;
 
 	bol = end_of_object_name + strspn(end_of_object_name, " \t");
@@ -2109,11 +2495,10 @@ static int parse_insn_line(struct repository *r, struct todo_item *item,
 	item->arg_len = (int)(eol - bol);
 
 	if (status < 0)
-		return error(_("could not parse '%.*s'"),
-			     (int)(end_of_object_name - bol), bol);
+		return status;
 
 	item->commit = lookup_commit_reference(r, &commit_oid);
-	return !item->commit;
+	return item->commit ? 0 : -1;
 }
 
 int sequencer_get_last_command(struct repository *r, enum replay_action *action)
@@ -2256,20 +2641,26 @@ void sequencer_post_commit_cleanup(struct repository *r, int verbose)
 	struct replay_opts opts = REPLAY_OPTS_INIT;
 	int need_cleanup = 0;
 
-	if (file_exists(git_path_cherry_pick_head(r))) {
-		if (!unlink(git_path_cherry_pick_head(r)) && verbose)
+	if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD")) {
+		if (!refs_delete_ref(get_main_ref_store(r), "",
+				     "CHERRY_PICK_HEAD", NULL, 0) &&
+		    verbose)
 			warning(_("cancelling a cherry picking in progress"));
 		opts.action = REPLAY_PICK;
 		need_cleanup = 1;
 	}
 
-	if (file_exists(git_path_revert_head(r))) {
-		if (!unlink(git_path_revert_head(r)) && verbose)
+	if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) {
+		if (!refs_delete_ref(get_main_ref_store(r), "", "REVERT_HEAD",
+				     NULL, 0) &&
+		    verbose)
 			warning(_("cancelling a revert in progress"));
 		opts.action = REPLAY_REVERT;
 		need_cleanup = 1;
 	}
 
+	unlink(git_path_auto_merge(r));
+
 	if (!need_cleanup)
 		return;
 
@@ -2279,6 +2670,16 @@ void sequencer_post_commit_cleanup(struct repository *r, int verbose)
 	sequencer_remove_state(&opts);
 }
 
+static void todo_list_write_total_nr(struct todo_list *todo_list)
+{
+	FILE *f = fopen_or_warn(rebase_path_msgtotal(), "w");
+
+	if (f) {
+		fprintf(f, "%d\n", todo_list->total_nr);
+		fclose(f);
+	}
+}
+
 static int read_populate_todo(struct repository *r,
 			      struct todo_list *todo_list,
 			      struct replay_opts *opts)
@@ -2324,7 +2725,6 @@ static int read_populate_todo(struct repository *r,
 
 	if (is_rebase_i(opts)) {
 		struct todo_list done = TODO_LIST_INIT;
-		FILE *f = fopen_or_warn(rebase_path_msgtotal(), "w");
 
 		if (strbuf_read_file(&done.buf, rebase_path_done(), 0) > 0 &&
 		    !todo_list_parse_insn_buffer(r, done.buf.buf, &done))
@@ -2336,10 +2736,7 @@ static int read_populate_todo(struct repository *r,
 			+ count_commands(todo_list);
 		todo_list_release(&done);
 
-		if (f) {
-			fprintf(f, "%d\n", todo_list->total_nr);
-			fclose(f);
-		}
+		todo_list_write_total_nr(todo_list);
 	}
 
 	return 0;
@@ -2440,8 +2837,10 @@ static int read_populate_opts(struct replay_opts *opts)
 {
 	if (is_rebase_i(opts)) {
 		struct strbuf buf = STRBUF_INIT;
+		int ret = 0;
 
-		if (read_oneliner(&buf, rebase_path_gpg_sign_opt(), 1)) {
+		if (read_oneliner(&buf, rebase_path_gpg_sign_opt(),
+				  READ_ONELINER_SKIP_IF_EMPTY)) {
 			if (!starts_with(buf.buf, "-S"))
 				strbuf_reset(&buf);
 			else {
@@ -2451,7 +2850,8 @@ static int read_populate_opts(struct replay_opts *opts)
 			strbuf_reset(&buf);
 		}
 
-		if (read_oneliner(&buf, rebase_path_allow_rerere_autoupdate(), 1)) {
+		if (read_oneliner(&buf, rebase_path_allow_rerere_autoupdate(),
+				  READ_ONELINER_SKIP_IF_EMPTY)) {
 			if (!strcmp(buf.buf, "--rerere-autoupdate"))
 				opts->allow_rerere_auto = RERERE_AUTOUPDATE;
 			else if (!strcmp(buf.buf, "--no-rerere-autoupdate"))
@@ -2470,14 +2870,33 @@ static int read_populate_opts(struct replay_opts *opts)
 			opts->signoff = 1;
 		}
 
+		if (file_exists(rebase_path_cdate_is_adate())) {
+			opts->allow_ff = 0;
+			opts->committer_date_is_author_date = 1;
+		}
+
+		if (file_exists(rebase_path_ignore_date())) {
+			opts->allow_ff = 0;
+			opts->ignore_date = 1;
+		}
+
 		if (file_exists(rebase_path_reschedule_failed_exec()))
 			opts->reschedule_failed_exec = 1;
+		else if (file_exists(rebase_path_no_reschedule_failed_exec()))
+			opts->reschedule_failed_exec = 0;
+
+		if (file_exists(rebase_path_drop_redundant_commits()))
+			opts->drop_redundant_commits = 1;
+
+		if (file_exists(rebase_path_keep_redundant_commits()))
+			opts->keep_redundant_commits = 1;
 
 		read_strategy_opts(opts, &buf);
-		strbuf_release(&buf);
+		strbuf_reset(&buf);
 
 		if (read_oneliner(&opts->current_fixups,
-				  rebase_path_current_fixups(), 1)) {
+				  rebase_path_current_fixups(),
+				  READ_ONELINER_SKIP_IF_EMPTY)) {
 			const char *p = opts->current_fixups.buf;
 			opts->current_fixup_count = 1;
 			while ((p = strchr(p, '\n'))) {
@@ -2487,12 +2906,16 @@ static int read_populate_opts(struct replay_opts *opts)
 		}
 
 		if (read_oneliner(&buf, rebase_path_squash_onto(), 0)) {
-			if (get_oid_hex(buf.buf, &opts->squash_onto) < 0)
-				return error(_("unusable squash-onto"));
+			if (get_oid_committish(buf.buf, &opts->squash_onto) < 0) {
+				ret = error(_("unusable squash-onto"));
+				goto done_rebase_i;
+			}
 			opts->have_squash_onto = 1;
 		}
 
-		return 0;
+done_rebase_i:
+		strbuf_release(&buf);
+		return ret;
 	}
 
 	if (!file_exists(git_path_opts_file()))
@@ -2522,20 +2945,19 @@ static void write_strategy_opts(struct replay_opts *opts)
 }
 
 int write_basic_state(struct replay_opts *opts, const char *head_name,
-		      struct commit *onto, const char *orig_head)
+		      struct commit *onto, const struct object_id *orig_head)
 {
-	const char *quiet = getenv("GIT_QUIET");
-
 	if (head_name)
 		write_file(rebase_path_head_name(), "%s\n", head_name);
 	if (onto)
 		write_file(rebase_path_onto(), "%s\n",
 			   oid_to_hex(&onto->object.oid));
 	if (orig_head)
-		write_file(rebase_path_orig_head(), "%s\n", orig_head);
+		write_file(rebase_path_orig_head(), "%s\n",
+			   oid_to_hex(orig_head));
 
-	if (quiet)
-		write_file(rebase_path_quiet(), "%s\n", quiet);
+	if (opts->quiet)
+		write_file(rebase_path_quiet(), "%s", "");
 	if (opts->verbose)
 		write_file(rebase_path_verbose(), "%s", "");
 	if (opts->strategy)
@@ -2552,8 +2974,18 @@ int write_basic_state(struct replay_opts *opts, const char *head_name,
 		write_file(rebase_path_gpg_sign_opt(), "-S%s\n", opts->gpg_sign);
 	if (opts->signoff)
 		write_file(rebase_path_signoff(), "--signoff\n");
+	if (opts->drop_redundant_commits)
+		write_file(rebase_path_drop_redundant_commits(), "%s", "");
+	if (opts->keep_redundant_commits)
+		write_file(rebase_path_keep_redundant_commits(), "%s", "");
+	if (opts->committer_date_is_author_date)
+		write_file(rebase_path_cdate_is_adate(), "%s", "");
+	if (opts->ignore_date)
+		write_file(rebase_path_ignore_date(), "%s", "");
 	if (opts->reschedule_failed_exec)
 		write_file(rebase_path_reschedule_failed_exec(), "%s", "");
+	else
+		write_file(rebase_path_no_reschedule_failed_exec(), "%s", "");
 
 	return 0;
 }
@@ -2564,14 +2996,17 @@ static int walk_revs_populate_todo(struct todo_list *todo_list,
 	enum todo_command command = opts->action == REPLAY_PICK ?
 		TODO_PICK : TODO_REVERT;
 	const char *command_string = todo_command_info[command].str;
+	const char *encoding;
 	struct commit *commit;
 
 	if (prepare_revs(opts))
 		return -1;
 
+	encoding = get_log_output_encoding();
+
 	while ((commit = get_revision(opts->revs))) {
 		struct todo_item *item = append_new_todo(todo_list);
-		const char *commit_buffer = get_commit_buffer(commit, NULL);
+		const char *commit_buffer = logmsg_reencode(commit, NULL, encoding);
 		const char *subject;
 		int subject_len;
 
@@ -2597,8 +3032,9 @@ static int create_seq_dir(struct repository *r)
 	enum replay_action action;
 	const char *in_progress_error = NULL;
 	const char *in_progress_advice = NULL;
-	unsigned int advise_skip = file_exists(git_path_revert_head(r)) ||
-				file_exists(git_path_cherry_pick_head(r));
+	unsigned int advise_skip =
+		refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") ||
+		refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD");
 
 	if (!sequencer_get_last_command(r, &action)) {
 		switch (action) {
@@ -2680,15 +3116,15 @@ static int rollback_is_safe(void)
 static int reset_merge(const struct object_id *oid)
 {
 	int ret;
-	struct argv_array argv = ARGV_ARRAY_INIT;
+	struct strvec argv = STRVEC_INIT;
 
-	argv_array_pushl(&argv, "reset", "--merge", NULL);
+	strvec_pushl(&argv, "reset", "--merge", NULL);
 
 	if (!is_null_oid(oid))
-		argv_array_push(&argv, oid_to_hex(oid));
+		strvec_push(&argv, oid_to_hex(oid));
 
-	ret = run_command_v_opt(argv.argv, RUN_GIT_CMD);
-	argv_array_clear(&argv);
+	ret = run_command_v_opt(argv.v, RUN_GIT_CMD);
+	strvec_clear(&argv);
 
 	return ret;
 }
@@ -2697,8 +3133,8 @@ static int rollback_single_pick(struct repository *r)
 {
 	struct object_id head_oid;
 
-	if (!file_exists(git_path_cherry_pick_head(r)) &&
-	    !file_exists(git_path_revert_head(r)))
+	if (!refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") &&
+	    !refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD"))
 		return error(_("no cherry-pick or revert in progress"));
 	if (read_ref_full("HEAD", 0, &head_oid, NULL))
 		return error(_("cannot resolve HEAD"));
@@ -2792,7 +3228,7 @@ int sequencer_skip(struct repository *r, struct replay_opts *opts)
 	 */
 	switch (opts->action) {
 	case REPLAY_REVERT:
-		if (!file_exists(git_path_revert_head(r))) {
+		if (!refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) {
 			if (action != REPLAY_REVERT)
 				return error(_("no revert in progress"));
 			if (!rollback_is_safe())
@@ -2800,7 +3236,8 @@ int sequencer_skip(struct repository *r, struct replay_opts *opts)
 		}
 		break;
 	case REPLAY_PICK:
-		if (!file_exists(git_path_cherry_pick_head(r))) {
+		if (!refs_ref_exists(get_main_ref_store(r),
+				     "CHERRY_PICK_HEAD")) {
 			if (action != REPLAY_PICK)
 				return error(_("no cherry-pick in progress"));
 			if (!rollback_is_safe())
@@ -2878,9 +3315,9 @@ static int save_opts(struct replay_opts *opts)
 	if (opts->no_commit)
 		res |= git_config_set_in_file_gently(opts_file,
 					"options.no-commit", "true");
-	if (opts->edit)
-		res |= git_config_set_in_file_gently(opts_file,
-					"options.edit", "true");
+	if (opts->edit >= 0)
+		res |= git_config_set_in_file_gently(opts_file, "options.edit",
+						     opts->edit ? "true" : "false");
 	if (opts->allow_empty)
 		res |= git_config_set_in_file_gently(opts_file,
 					"options.allow-empty", "true");
@@ -2938,15 +3375,14 @@ static int make_patch(struct repository *r,
 {
 	struct strbuf buf = STRBUF_INIT;
 	struct rev_info log_tree_opt;
-	const char *subject, *p;
+	const char *subject;
+	char hex[GIT_MAX_HEXSZ + 1];
 	int res = 0;
 
-	p = short_commit_name(commit);
-	if (write_message(p, strlen(p), rebase_path_stopped_sha(), 1) < 0)
+	oid_to_hex_r(hex, &commit->object.oid);
+	if (write_message(hex, strlen(hex), rebase_path_stopped_sha(), 1) < 0)
 		return -1;
-	if (update_ref("rebase", "REBASE_HEAD", &commit->object.oid,
-		       NULL, REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR))
-		res |= error(_("could not update %s"), "REBASE_HEAD");
+	res |= write_rebase_head(&commit->object.oid);
 
 	strbuf_addf(&buf, "%s/patch", get_dir(opts));
 	memset(&log_tree_opt, 0, sizeof(log_tree_opt));
@@ -2968,7 +3404,8 @@ static int make_patch(struct repository *r,
 
 	strbuf_addf(&buf, "%s/message", get_dir(opts));
 	if (!file_exists(buf.buf)) {
-		const char *commit_buffer = get_commit_buffer(commit, NULL);
+		const char *encoding = get_commit_output_encoding();
+		const char *commit_buffer = logmsg_reencode(commit, NULL, encoding);
 		find_commit_subject(commit_buffer, &subject);
 		res |= write_message(subject, strlen(subject), buf.buf, 1);
 		unuse_commit_buffer(commit, commit_buffer);
@@ -3052,17 +3489,17 @@ static int error_failed_squash(struct repository *r,
 
 static int do_exec(struct repository *r, const char *command_line)
 {
-	struct argv_array child_env = ARGV_ARRAY_INIT;
+	struct strvec child_env = STRVEC_INIT;
 	const char *child_argv[] = { NULL, NULL };
 	int dirty, status;
 
-	fprintf(stderr, "Executing: %s\n", command_line);
+	fprintf(stderr, _("Executing: %s\n"), command_line);
 	child_argv[0] = command_line;
-	argv_array_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir()));
-	argv_array_pushf(&child_env, "GIT_WORK_TREE=%s",
-			 absolute_path(get_git_work_tree()));
+	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.argv);
+					  child_env.v);
 
 	/* force re-reading of the cache */
 	if (discard_index(r->index) < 0 || repo_read_index(r) < 0)
@@ -3092,11 +3529,12 @@ static int do_exec(struct repository *r, const char *command_line)
 		status = 1;
 	}
 
-	argv_array_clear(&child_env);
+	strvec_clear(&child_env);
 
 	return status;
 }
 
+__attribute__((format (printf, 2, 3)))
 static int safe_append(const char *filename, const char *fmt, ...)
 {
 	va_list ap;
@@ -3147,7 +3585,7 @@ static int do_label(struct repository *r, const char *name, int len)
 		return error(_("illegal label name: '%.*s'"), len, name);
 
 	strbuf_addf(&ref_name, "refs/rewritten/%.*s", len, name);
-	strbuf_addf(&msg, "rebase -i (label) '%.*s'", len, name);
+	strbuf_addf(&msg, "rebase (label) '%.*s'", len, name);
 
 	transaction = ref_store_transaction_begin(refs, &err);
 	if (!transaction) {
@@ -3174,8 +3612,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,
@@ -3233,6 +3690,7 @@ static int do_reset(struct repository *r,
 	unpack_tree_opts.fn = oneway_merge;
 	unpack_tree_opts.merge = 1;
 	unpack_tree_opts.update = 1;
+	init_checkout_metadata(&unpack_tree_opts.meta, name, &oid, NULL);
 
 	if (repo_read_index_unmerged(r)) {
 		rollback_lock_file(&lock);
@@ -3294,16 +3752,17 @@ 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;
 	struct commit_list *to_merge = NULL, **tail = &to_merge;
 	const char *strategy = !opts->xopts_nr &&
-		(!opts->strategy || !strcmp(opts->strategy, "recursive")) ?
+		(!opts->strategy ||
+		 !strcmp(opts->strategy, "recursive") ||
+		 !strcmp(opts->strategy, "ort")) ?
 		NULL : opts->strategy;
 	struct merge_options o;
 	int merge_arg_len, oneline_offset, can_fast_forward, ret, k;
@@ -3369,8 +3828,48 @@ 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 *message = get_commit_buffer(commit, NULL);
+		const char *encoding = get_commit_output_encoding();
+		const char *message = logmsg_reencode(commit, NULL, encoding);
 		const char *body;
 		int len;
 
@@ -3417,46 +3916,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;
@@ -3468,36 +3927,49 @@ static int do_merge(struct repository *r,
 			goto leave_merge;
 		}
 
+		if (opts->committer_date_is_author_date)
+			strvec_pushf(&cmd.env_array, "GIT_COMMITTER_DATE=%s",
+				     opts->ignore_date ?
+				     "" :
+				     author_date_from_env_array(&cmd.env_array));
+		if (opts->ignore_date)
+			strvec_push(&cmd.env_array, "GIT_AUTHOR_DATE=");
+
 		cmd.git_cmd = 1;
-		argv_array_push(&cmd.args, "merge");
-		argv_array_push(&cmd.args, "-s");
+		strvec_push(&cmd.args, "merge");
+		strvec_push(&cmd.args, "-s");
 		if (!strategy)
-			argv_array_push(&cmd.args, "octopus");
+			strvec_push(&cmd.args, "octopus");
 		else {
-			argv_array_push(&cmd.args, strategy);
+			strvec_push(&cmd.args, strategy);
 			for (k = 0; k < opts->xopts_nr; k++)
-				argv_array_pushf(&cmd.args,
-						 "-X%s", opts->xopts[k]);
+				strvec_pushf(&cmd.args,
+					     "-X%s", opts->xopts[k]);
 		}
-		argv_array_push(&cmd.args, "--no-edit");
-		argv_array_push(&cmd.args, "--no-ff");
-		argv_array_push(&cmd.args, "--no-log");
-		argv_array_push(&cmd.args, "--no-stat");
-		argv_array_push(&cmd.args, "-F");
-		argv_array_push(&cmd.args, git_path_merge_msg(r));
+		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");
+		strvec_push(&cmd.args, "-F");
+		strvec_push(&cmd.args, git_path_merge_msg(r));
 		if (opts->gpg_sign)
-			argv_array_push(&cmd.args, opts->gpg_sign);
+			strvec_pushf(&cmd.args, "-S%s", opts->gpg_sign);
+		else
+			strvec_push(&cmd.args, "--no-gpg-sign");
 
 		/* Add the tips to be merged */
 		for (j = to_merge; j; j = j->next)
-			argv_array_push(&cmd.args,
-					oid_to_hex(&j->item->object.oid));
+			strvec_push(&cmd.args,
+				    oid_to_hex(&j->item->object.oid));
 
 		strbuf_release(&ref_name);
-		unlink(git_path_cherry_pick_head(r));
+		refs_delete_ref(get_main_ref_store(r), "", "CHERRY_PICK_HEAD",
+				NULL, 0);
 		rollback_lock_file(&lock);
 
-		rollback_lock_file(&lock);
 		ret = run_command(&cmd);
 
 		/* force re-reading of the cache */
@@ -3530,7 +4002,20 @@ static int do_merge(struct repository *r,
 	o.branch2 = ref_name.buf;
 	o.buffer_output = 2;
 
-	ret = merge_recursive(&o, head_commit, merge_commit, reversed, &i);
+	if (!opts->strategy || !strcmp(opts->strategy, "ort")) {
+		/*
+		 * TODO: Should use merge_incore_recursive() and
+		 * merge_switch_to_result(), skipping the call to
+		 * merge_switch_to_result() when we don't actually need to
+		 * update the index and working copy immediately.
+		 */
+		ret = merge_ort_recursive(&o,
+					  head_commit, merge_commit, reversed,
+					  &i);
+	} else {
+		ret = merge_recursive(&o, head_commit, merge_commit, reversed,
+				      &i);
+	}
 	if (ret <= 0)
 		fputs(o.obuf.buf, stdout);
 	strbuf_release(&o.obuf);
@@ -3564,10 +4049,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(r, git_path_merge_msg(r), opts,
+		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);
@@ -3601,68 +4093,130 @@ static enum todo_command peek_command(struct todo_list *todo_list, int offset)
 	return -1;
 }
 
-static int apply_autostash(struct replay_opts *opts)
+void create_autostash(struct repository *r, const char *path,
+		      const char *default_reflog_action)
+{
+	struct strbuf buf = STRBUF_INIT;
+	struct lock_file lock_file = LOCK_INIT;
+	int fd;
+
+	fd = repo_hold_locked_index(r, &lock_file, 0);
+	refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
+	if (0 <= fd)
+		repo_update_index_if_able(r, &lock_file);
+	rollback_lock_file(&lock_file);
+
+	if (has_unstaged_changes(r, 1) ||
+	    has_uncommitted_changes(r, 1)) {
+		struct child_process stash = CHILD_PROCESS_INIT;
+		struct object_id oid;
+
+		strvec_pushl(&stash.args,
+			     "stash", "create", "autostash", NULL);
+		stash.git_cmd = 1;
+		stash.no_stdin = 1;
+		strbuf_reset(&buf);
+		if (capture_command(&stash, &buf, GIT_MAX_HEXSZ))
+			die(_("Cannot autostash"));
+		strbuf_trim_trailing_newline(&buf);
+		if (get_oid(buf.buf, &oid))
+			die(_("Unexpected stash response: '%s'"),
+			    buf.buf);
+		strbuf_reset(&buf);
+		strbuf_add_unique_abbrev(&buf, &oid, DEFAULT_ABBREV);
+
+		if (safe_create_leading_directories_const(path))
+			die(_("Could not create directory for '%s'"),
+			    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)
+			die(_("could not reset --hard"));
+
+		if (discard_index(r->index) < 0 ||
+			repo_read_index(r) < 0)
+			die(_("could not read index"));
+	}
+	strbuf_release(&buf);
+}
+
+static int apply_save_autostash_oid(const char *stash_oid, int attempt_apply)
 {
-	struct strbuf stash_sha1 = STRBUF_INIT;
 	struct child_process child = CHILD_PROCESS_INIT;
 	int ret = 0;
 
-	if (!read_oneliner(&stash_sha1, rebase_path_autostash(), 1)) {
-		strbuf_release(&stash_sha1);
-		return 0;
+	if (attempt_apply) {
+		child.git_cmd = 1;
+		child.no_stdout = 1;
+		child.no_stderr = 1;
+		strvec_push(&child.args, "stash");
+		strvec_push(&child.args, "apply");
+		strvec_push(&child.args, stash_oid);
+		ret = run_command(&child);
 	}
-	strbuf_trim(&stash_sha1);
 
-	child.git_cmd = 1;
-	child.no_stdout = 1;
-	child.no_stderr = 1;
-	argv_array_push(&child.args, "stash");
-	argv_array_push(&child.args, "apply");
-	argv_array_push(&child.args, stash_sha1.buf);
-	if (!run_command(&child))
+	if (attempt_apply && !ret)
 		fprintf(stderr, _("Applied autostash.\n"));
 	else {
 		struct child_process store = CHILD_PROCESS_INIT;
 
 		store.git_cmd = 1;
-		argv_array_push(&store.args, "stash");
-		argv_array_push(&store.args, "store");
-		argv_array_push(&store.args, "-m");
-		argv_array_push(&store.args, "autostash");
-		argv_array_push(&store.args, "-q");
-		argv_array_push(&store.args, stash_sha1.buf);
+		strvec_push(&store.args, "stash");
+		strvec_push(&store.args, "store");
+		strvec_push(&store.args, "-m");
+		strvec_push(&store.args, "autostash");
+		strvec_push(&store.args, "-q");
+		strvec_push(&store.args, stash_oid);
 		if (run_command(&store))
-			ret = error(_("cannot store %s"), stash_sha1.buf);
+			ret = error(_("cannot store %s"), stash_oid);
 		else
 			fprintf(stderr,
-				_("Applying autostash resulted in conflicts.\n"
+				_("%s\n"
 				  "Your changes are safe in the stash.\n"
 				  "You can run \"git stash pop\" or"
-				  " \"git stash drop\" at any time.\n"));
+				  " \"git stash drop\" at any time.\n"),
+				attempt_apply ?
+				_("Applying autostash resulted in conflicts.") :
+				_("Autostash exists; creating a new stash entry."));
 	}
 
-	strbuf_release(&stash_sha1);
 	return ret;
 }
 
-static const char *reflog_message(struct replay_opts *opts,
-	const char *sub_action, const char *fmt, ...)
+static int apply_save_autostash(const char *path, int attempt_apply)
 {
-	va_list ap;
-	static struct strbuf buf = STRBUF_INIT;
+	struct strbuf stash_oid = STRBUF_INIT;
+	int ret = 0;
 
-	va_start(ap, fmt);
-	strbuf_reset(&buf);
-	strbuf_addstr(&buf, action_name(opts));
-	if (sub_action)
-		strbuf_addf(&buf, " (%s)", sub_action);
-	if (fmt) {
-		strbuf_addstr(&buf, ": ");
-		strbuf_vaddf(&buf, fmt, ap);
+	if (!read_oneliner(&stash_oid, path,
+			   READ_ONELINER_SKIP_IF_EMPTY)) {
+		strbuf_release(&stash_oid);
+		return 0;
 	}
-	va_end(ap);
+	strbuf_trim(&stash_oid);
 
-	return buf.buf;
+	ret = apply_save_autostash_oid(stash_oid.buf, attempt_apply);
+
+	unlink(path);
+	strbuf_release(&stash_oid);
+	return ret;
+}
+
+int save_autostash(const char *path)
+{
+	return apply_save_autostash(path, 0);
+}
+
+int apply_autostash(const char *path)
+{
+	return apply_save_autostash(path, 1);
+}
+
+int apply_autostash_oid(const char *stash_oid)
+{
+	return apply_save_autostash_oid(stash_oid, 1);
 }
 
 static int run_git_checkout(struct repository *r, struct replay_opts *opts,
@@ -3673,9 +4227,9 @@ static int run_git_checkout(struct repository *r, struct replay_opts *opts,
 
 	cmd.git_cmd = 1;
 
-	argv_array_push(&cmd.args, "checkout");
-	argv_array_push(&cmd.args, commit);
-	argv_array_pushf(&cmd.env_array, GIT_REFLOG_ACTION "=%s", action);
+	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);
@@ -3688,37 +4242,19 @@ static int run_git_checkout(struct repository *r, struct replay_opts *opts,
 	return ret;
 }
 
-int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts,
-				 const char *commit)
-{
-	const char *action;
-
-	if (commit && *commit) {
-		action = reflog_message(opts, "start", "checkout %s", commit);
-		if (run_git_checkout(r, opts, commit, action))
-			return error(_("could not checkout %s"), commit);
-	}
-
-	return 0;
-}
-
 static int checkout_onto(struct repository *r, struct replay_opts *opts,
 			 const char *onto_name, const struct object_id *onto,
-			 const char *orig_head)
+			 const struct object_id *orig_head)
 {
-	struct object_id oid;
 	const char *action = reflog_message(opts, "start", "checkout %s", onto_name);
 
-	if (get_oid(orig_head, &oid))
-		return error(_("%s: not a valid OID"), orig_head);
-
 	if (run_git_checkout(r, opts, oid_to_hex(onto), action)) {
-		apply_autostash(opts);
+		apply_autostash(rebase_path_autostash());
 		sequencer_remove_state(opts);
 		return error(_("could not detach HEAD"));
 	}
 
-	return update_ref(NULL, "ORIG_HEAD", &oid, NULL, 0, UPDATE_REFS_MSG_ON_ERR);
+	return update_ref(NULL, "ORIG_HEAD", orig_head, NULL, 0, UPDATE_REFS_MSG_ON_ERR);
 }
 
 static int stopped_at_head(struct repository *r)
@@ -3755,11 +4291,16 @@ static int pick_commits(struct repository *r,
 			struct replay_opts *opts)
 {
 	int res = 0, reschedule = 0;
+	char *prev_reflog_action;
 
+	/* Note that 0 for 3rd parameter of setenv means set only if not set */
 	setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
+	prev_reflog_action = xstrdup(getenv(GIT_REFLOG_ACTION));
 	if (opts->allow_ff)
 		assert(!(opts->signoff || opts->no_commit ||
-				opts->record_origin || opts->edit));
+			 opts->record_origin || should_edit(opts) ||
+			 opts->committer_date_is_author_date ||
+			 opts->ignore_date));
 	if (read_and_refresh_cache(r, opts))
 		return -1;
 
@@ -3781,7 +4322,7 @@ static int pick_commits(struct repository *r,
 					fclose(f);
 				}
 				if (!opts->quiet)
-					fprintf(stderr, "Rebasing (%d/%d)%s",
+					fprintf(stderr, _("Rebasing (%d/%d)%s"),
 						todo_list->done_nr,
 						todo_list->total_nr,
 						opts->verbose ? "\n" : "\r");
@@ -3791,6 +4332,7 @@ static int pick_commits(struct repository *r,
 			unlink(rebase_path_stopped_sha());
 			unlink(rebase_path_amend());
 			unlink(git_path_merge_head(r));
+			unlink(git_path_auto_merge(r));
 			delete_ref(NULL, "REBASE_HEAD", NULL, REF_NO_DEREF);
 
 			if (item->command == TODO_BREAK) {
@@ -3801,12 +4343,14 @@ static int pick_commits(struct repository *r,
 		}
 		if (item->command <= TODO_SQUASH) {
 			if (is_rebase_i(opts))
-				setenv("GIT_REFLOG_ACTION", reflog_message(opts,
+				setenv(GIT_REFLOG_ACTION, reflog_message(opts,
 					command_to_string(item->command), NULL),
 					1);
-			res = do_pick_commit(r, item->command, item->commit,
-					     opts, is_final_fixup(todo_list),
+			res = do_pick_commit(r, item, opts,
+					     is_final_fixup(todo_list),
 					     &check_todo);
+			if (is_rebase_i(opts))
+				setenv(GIT_REFLOG_ACTION, prev_reflog_action, 1);
 			if (is_rebase_i(opts) && res < 0) {
 				/* Reschedule */
 				advise(_(rescheduled_advice),
@@ -3882,9 +4426,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,
@@ -3910,7 +4453,7 @@ static int pick_commits(struct repository *r,
 							item->commit,
 							arg, item->arg_len,
 							opts, res, 0);
-		} else if (check_todo && !res) {
+		} else if (is_rebase_i(opts) && check_todo && !res) {
 			struct stat st;
 
 			if (stat(get_todo_path(opts), &st)) {
@@ -4008,9 +4551,9 @@ cleanup_head_ref:
 
 			child.in = open(rebase_path_rewritten_list(), O_RDONLY);
 			child.git_cmd = 1;
-			argv_array_push(&child.args, "notes");
-			argv_array_push(&child.args, "copy");
-			argv_array_push(&child.args, "--for-rewrite=rebase");
+			strvec_push(&child.args, "notes");
+			strvec_push(&child.args, "copy");
+			strvec_push(&child.args, "--for-rewrite=rebase");
 			/* we don't care if this copying failed */
 			run_command(&child);
 
@@ -4021,19 +4564,19 @@ cleanup_head_ref:
 					O_RDONLY);
 				hook.stdout_to_stderr = 1;
 				hook.trace2_hook_name = "post-rewrite";
-				argv_array_push(&hook.args, post_rewrite_hook);
-				argv_array_push(&hook.args, "rebase");
+				strvec_push(&hook.args, post_rewrite_hook);
+				strvec_push(&hook.args, "rebase");
 				/* we don't care if this hook failed */
 				run_command(&hook);
 			}
 		}
-		apply_autostash(opts);
+		apply_autostash(rebase_path_autostash());
 
 		if (!opts->quiet) {
 			if (!opts->verbose)
 				term_clear_line();
 			fprintf(stderr,
-				"Successfully rebased and updated %s.\n",
+				_("Successfully rebased and updated %s.\n"),
 				head_ref.buf);
 		}
 
@@ -4048,14 +4591,33 @@ cleanup_head_ref:
 	return sequencer_remove_state(opts);
 }
 
-static int continue_single_pick(struct repository *r)
+static int continue_single_pick(struct repository *r, struct replay_opts *opts)
 {
-	const char *argv[] = { "commit", NULL };
+	struct strvec argv = STRVEC_INIT;
+	int ret;
 
-	if (!file_exists(git_path_cherry_pick_head(r)) &&
-	    !file_exists(git_path_revert_head(r)))
+	if (!refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") &&
+	    !refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD"))
 		return error(_("no cherry-pick or revert in progress"));
-	return run_command_v_opt(argv, RUN_GIT_CMD);
+
+	strvec_push(&argv, "commit");
+
+	/*
+	 * continue_single_pick() handles the case of recovering from a
+	 * conflict.  should_edit() doesn't handle that case; for a conflict,
+	 * we want to edit if the user asked for it, or if they didn't specify
+	 * and stdin is a tty.
+	 */
+	if (!opts->edit || (opts->edit < 0 && !isatty(0)))
+		/*
+		 * Include --cleanup=strip as well because we don't want the
+		 * "# Conflicts:" messages.
+		 */
+		strvec_pushl(&argv, "--no-edit", "--cleanup=strip", NULL);
+
+	ret = run_command_v_opt(argv.v, RUN_GIT_CMD);
+	strvec_clear(&argv);
+	return ret;
 }
 
 static int commit_staged_changes(struct repository *r,
@@ -4151,9 +4713,10 @@ static int commit_staged_changes(struct repository *r,
 				 */
 				struct commit *commit;
 				const char *path = rebase_path_squash_msg();
+				const char *encoding = get_commit_output_encoding();
 
 				if (parse_head(r, &commit) ||
-				    !(p = get_commit_buffer(commit, NULL)) ||
+				    !(p = logmsg_reencode(commit, NULL, encoding)) ||
 				    write_message(p, strlen(p), path, 0)) {
 					unuse_commit_buffer(commit, p);
 					return error(_("could not write file: "
@@ -4168,19 +4731,24 @@ static int commit_staged_changes(struct repository *r,
 	}
 
 	if (is_clean) {
-		const char *cherry_pick_head = git_path_cherry_pick_head(r);
-
-		if (file_exists(cherry_pick_head) && unlink(cherry_pick_head))
+		if (refs_ref_exists(get_main_ref_store(r),
+				    "CHERRY_PICK_HEAD") &&
+		    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;
 	}
 
-	if (run_git_commit(r, final_fixup ? NULL : rebase_path_message(),
+	if (run_git_commit(final_fixup ? NULL : rebase_path_message(),
 			   opts, flags))
 		return error(_("could not commit staged changes."));
 	unlink(rebase_path_amend());
 	unlink(git_path_merge_head(r));
+	unlink(git_path_auto_merge(r));
 	if (final_fixup) {
 		unlink(rebase_path_fixup_msg());
 		unlink(rebase_path_squash_msg());
@@ -4210,18 +4778,29 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
 	if (is_rebase_i(opts)) {
 		if ((res = read_populate_todo(r, &todo_list, opts)))
 			goto release_todo_list;
-		if (commit_staged_changes(r, opts, &todo_list))
-			return -1;
+
+		if (file_exists(rebase_path_dropped())) {
+			if ((res = todo_list_check_against_backup(r, &todo_list)))
+				goto release_todo_list;
+
+			unlink(rebase_path_dropped());
+		}
+
+		if (commit_staged_changes(r, opts, &todo_list)) {
+			res = -1;
+			goto release_todo_list;
+		}
 	} else if (!file_exists(get_todo_path(opts)))
-		return continue_single_pick(r);
+		return continue_single_pick(r, opts);
 	else if ((res = read_populate_todo(r, &todo_list, opts)))
 		goto release_todo_list;
 
 	if (!is_rebase_i(opts)) {
 		/* Verify that the conflict has been resolved */
-		if (file_exists(git_path_cherry_pick_head(r)) ||
-		    file_exists(git_path_revert_head(r))) {
-			res = continue_single_pick(r);
+		if (refs_ref_exists(get_main_ref_store(r),
+				    "CHERRY_PICK_HEAD") ||
+		    refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD")) {
+			res = continue_single_pick(r, opts);
 			if (res)
 				goto release_todo_list;
 		}
@@ -4234,8 +4813,9 @@ int sequencer_continue(struct repository *r, struct replay_opts *opts)
 		struct strbuf buf = STRBUF_INIT;
 		struct object_id oid;
 
-		if (read_oneliner(&buf, rebase_path_stopped_sha(), 1) &&
-		    !get_oid_committish(buf.buf, &oid))
+		if (read_oneliner(&buf, rebase_path_stopped_sha(),
+				  READ_ONELINER_SKIP_IF_EMPTY) &&
+		    !get_oid_hex(buf.buf, &oid))
 			record_in_rewritten(&oid, peek_command(&todo_list, 0));
 		strbuf_release(&buf);
 	}
@@ -4251,11 +4831,14 @@ static int single_pick(struct repository *r,
 		       struct replay_opts *opts)
 {
 	int check_todo;
+	struct todo_item item;
+
+	item.command = opts->action == REPLAY_PICK ?
+			TODO_PICK : TODO_REVERT;
+	item.commit = cmit;
 
 	setenv(GIT_REFLOG_ACTION, action_name(opts), 0);
-	return do_pick_commit(r, opts->action == REPLAY_PICK ?
-			      TODO_PICK : TODO_REVERT, cmit, opts, 0,
-			      &check_todo);
+	return do_pick_commit(r, &item, opts, 0, &check_todo);
 }
 
 int sequencer_pick_revisions(struct repository *r,
@@ -4425,7 +5008,6 @@ static const char *label_oid(struct object_id *oid, const char *label,
 	struct labels_entry *labels_entry;
 	struct string_entry *string_entry;
 	struct object_id dummy;
-	size_t len;
 	int i;
 
 	string_entry = oidmap_get(&state->commit2label, oid);
@@ -4445,10 +5027,10 @@ static const char *label_oid(struct object_id *oid, const char *label,
 	 * abbreviation for any uninteresting commit's names that does not
 	 * clash with any other label.
 	 */
+	strbuf_reset(&state->buf);
 	if (!label) {
 		char *p;
 
-		strbuf_reset(&state->buf);
 		strbuf_grow(&state->buf, GIT_MAX_HEXSZ);
 		label = p = state->buf.buf;
 
@@ -4471,32 +5053,55 @@ static const char *label_oid(struct object_id *oid, const char *label,
 				p[i] = save;
 			}
 		}
-	} else if (((len = strlen(label)) == the_hash_algo->hexsz &&
-		    !get_oid_hex(label, &dummy)) ||
-		   (len == 1 && *label == '#') ||
-		   hashmap_get_from_hash(&state->labels,
-					 strihash(label), label)) {
+	} else {
+		struct strbuf *buf = &state->buf;
+
 		/*
-		 * If the label already exists, or if the label is a valid full
-		 * OID, or the label is a '#' (which we use as a separator
-		 * between merge heads and oneline), we append a dash and a
-		 * number to make it unique.
+		 * Sanitize labels by replacing non-alpha-numeric characters
+		 * (including white-space ones) by dashes, as they might be
+		 * illegal in file names (and hence in ref names).
+		 *
+		 * Note that we retain non-ASCII UTF-8 characters (identified
+		 * via the most significant bit). They should be all acceptable
+		 * in file names. We do not validate the UTF-8 here, that's not
+		 * the job of this function.
 		 */
-		struct strbuf *buf = &state->buf;
+		for (; *label; label++)
+			if ((*label & 0x80) || isalnum(*label))
+				strbuf_addch(buf, *label);
+			/* avoid leading dash and double-dashes */
+			else if (buf->len && buf->buf[buf->len - 1] != '-')
+				strbuf_addch(buf, '-');
+		if (!buf->len) {
+			strbuf_addstr(buf, "rev-");
+			strbuf_add_unique_abbrev(buf, oid, default_abbrev);
+		}
+		label = buf->buf;
 
-		strbuf_reset(buf);
-		strbuf_add(buf, label, len);
+		if ((buf->len == the_hash_algo->hexsz &&
+		     !get_oid_hex(label, &dummy)) ||
+		    (buf->len == 1 && *label == '#') ||
+		    hashmap_get_from_hash(&state->labels,
+					  strihash(label), label)) {
+			/*
+			 * If the label already exists, or if the label is a
+			 * valid full OID, or the label is a '#' (which we use
+			 * as a separator between merge heads and oneline), we
+			 * append a dash and a number to make it unique.
+			 */
+			size_t len = buf->len;
 
-		for (i = 2; ; i++) {
-			strbuf_setlen(buf, len);
-			strbuf_addf(buf, "-%d", i);
-			if (!hashmap_get_from_hash(&state->labels,
-						   strihash(buf->buf),
-						   buf->buf))
-				break;
-		}
+			for (i = 2; ; i++) {
+				strbuf_setlen(buf, len);
+				strbuf_addf(buf, "-%d", i);
+				if (!hashmap_get_from_hash(&state->labels,
+							   strihash(buf->buf),
+							   buf->buf))
+					break;
+			}
 
-		label = buf->buf;
+			label = buf->buf;
+		}
 	}
 
 	FLEX_ALLOC_STR(labels_entry, label, label);
@@ -4517,6 +5122,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;
@@ -4540,10 +5146,15 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 	strbuf_init(&state.buf, 32);
 
 	if (revs->cmdline.nr && (revs->cmdline.rev[0].flags & BOTTOM)) {
+		struct labels_entry *onto_label_entry;
 		struct object_id *oid = &revs->cmdline.rev[0].item->oid;
 		FLEX_ALLOC_STR(entry, string, "onto");
 		oidcpy(&entry->entry.oid, oid);
 		oidmap_put(&state.commit2label, entry);
+
+		FLEX_ALLOC_STR(onto_label_entry, label, "onto");
+		hashmap_entry_init(&onto_label_entry->entry, strihash("onto"));
+		hashmap_add(&state.labels, &onto_label_entry->entry);
 	}
 
 	/*
@@ -4562,7 +5173,14 @@ 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;
 
 		strbuf_reset(&oneline);
@@ -4572,11 +5190,12 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 		if (!to_merge) {
 			/* non-merge commit: easy case */
 			strbuf_reset(&buf);
-			if (!keep_empty && is_empty)
-				strbuf_addf(&buf, "%c ", comment_line_char);
 			strbuf_addf(&buf, "%s %s %s", cmd_pick,
 				    oid_to_hex(&commit->object.oid),
 				    oneline.buf);
+			if (is_empty)
+				strbuf_addf(&buf, " %c empty",
+					    comment_line_char);
 
 			FLEX_ALLOC_STR(entry, string, buf.buf);
 			oidcpy(&entry->entry.oid, &commit->object.oid);
@@ -4598,10 +5217,6 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 		else
 			strbuf_addbuf(&label, &oneline);
 
-		for (p1 = label.buf; *p1; p1++)
-			if (isspace(*p1))
-				*(char *)p1 = '-';
-
 		strbuf_reset(&buf);
 		strbuf_addf(&buf, "%s -C %s",
 			    cmd_merge, oid_to_hex(&commit->object.oid));
@@ -4628,6 +5243,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:
@@ -4644,7 +5262,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 				label_oid(oid, "branch-point", &state);
 		}
 
-		/* Add HEAD as implict "tip of branch" */
+		/* Add HEAD as implicit "tip of branch" */
 		if (!iter->next)
 			tips_tail = &commit_list_insert(iter->item,
 							tips_tail)->next;
@@ -4731,7 +5349,7 @@ static int make_script_with_merges(struct pretty_print_context *pp,
 
 	oidmap_free(&commit2todo, 1);
 	oidmap_free(&state.commit2label, 1);
-	hashmap_free_entries(&state.labels, struct labels_entry, entry);
+	hashmap_clear_and_free(&state.labels, struct labels_entry, entry);
 	strbuf_release(&state.buf);
 
 	return 0;
@@ -4747,12 +5365,14 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 	int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
 	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;
 	if (!rebase_merges)
 		revs.max_parents = 1;
-	revs.cherry_mark = 1;
+	revs.cherry_mark = !reapply_cherry_picks;
 	revs.limited = 1;
 	revs.reverse = 1;
 	revs.right_only = 1;
@@ -4780,17 +5400,27 @@ int sequencer_make_script(struct repository *r, struct strbuf *out, int argc,
 		return make_script_with_merges(&pp, &revs, out, flags);
 
 	while ((commit = get_revision(&revs))) {
-		int is_empty  = is_original_commit_empty(commit);
+		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;
-		if (!keep_empty && is_empty)
-			strbuf_addf(out, "%c ", comment_line_char);
 		strbuf_addf(out, "%s %s ", insn,
 			    oid_to_hex(&commit->object.oid));
 		pretty_print_commit(&pp, commit, out);
+		if (is_empty)
+			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;
 }
 
@@ -4806,7 +5436,7 @@ void todo_list_add_exec_commands(struct todo_list *todo_list,
 	int i, insert, nr = 0, alloc = 0;
 	struct todo_item *items = NULL, *base_items = NULL;
 
-	base_items = xcalloc(commands->nr, sizeof(struct todo_item));
+	CALLOC_ARRAY(base_items, commands->nr);
 	for (i = 0; i < commands->nr; i++) {
 		size_t command_len = strlen(commands->items[i].string);
 
@@ -4826,7 +5456,7 @@ void todo_list_add_exec_commands(struct todo_list *todo_list,
 	 * are considered part of the pick, so we insert the commands *after*
 	 * those chains if there are any.
 	 *
-	 * As we insert the exec commands immediatly after rearranging
+	 * As we insert the exec commands immediately after rearranging
 	 * any fixups and before the user edits the list, a fixup chain
 	 * can never contain comments (any comments are empty picks that
 	 * have been commented out because the user did not specify
@@ -4875,6 +5505,8 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis
 		max = num;
 
 	for (item = todo_list->items, i = 0; i < max; i++, item++) {
+		char cmd;
+
 		/* if the item is not a command write it and continue */
 		if (item->command >= TODO_COMMENT) {
 			strbuf_addf(buf, "%.*s\n", item->arg_len,
@@ -4883,8 +5515,9 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis
 		}
 
 		/* add command to the buffer */
-		if (flags & TODO_LIST_ABBREVIATE_CMDS)
-			strbuf_addch(buf, command_to_char(item->command));
+		cmd = command_to_char(item->command);
+		if ((flags & TODO_LIST_ABBREVIATE_CMDS) && cmd)
+			strbuf_addch(buf, cmd);
 		else
 			strbuf_addstr(buf, command_to_string(item->command));
 
@@ -4894,6 +5527,14 @@ static void todo_list_to_strbuf(struct repository *r, struct todo_list *todo_lis
 					  short_commit_name(item->commit) :
 					  oid_to_hex(&item->commit->object.oid);
 
+			if (item->command == TODO_FIXUP) {
+				if (item->flags & TODO_EDIT_FIXUP_MSG)
+					strbuf_addstr(buf, " -c");
+				else if (item->flags & TODO_REPLACE_FIXUP_MSG) {
+					strbuf_addstr(buf, " -C");
+				}
+			}
+
 			if (item->command == TODO_MERGE) {
 				if (item->flags & TODO_EDIT_MERGE_MSG)
 					strbuf_addstr(buf, " -c");
@@ -4922,7 +5563,7 @@ int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
 
 	todo_list_to_strbuf(r, todo_list, &buf, num, flags);
 	if (flags & TODO_LIST_APPEND_TODO_HELP)
-		append_todo_help(flags & TODO_LIST_KEEP_EMPTY, count_commands(todo_list),
+		append_todo_help(count_commands(todo_list),
 				 shortrevisions, shortonto, &buf);
 
 	res = write_message(buf.buf, buf.len, file, 0);
@@ -4931,41 +5572,6 @@ int todo_list_write_to_file(struct repository *r, struct todo_list *todo_list,
 	return res;
 }
 
-static const char edit_todo_list_advice[] =
-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");
-
-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_or_whine(&new_todo.buf, rebase_path_todo()) < 0) {
-		res = -1;
-		goto out;
-	}
-
-	if (strbuf_read_file_or_whine(&old_todo.buf, rebase_path_todo_backup()) < 0) {
-		res = -1;
-		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)
-		res = todo_list_check(&old_todo, &new_todo);
-	if (res)
-		fprintf(stderr, _(edit_todo_list_advice));
-out:
-	todo_list_release(&old_todo);
-	todo_list_release(&new_todo);
-
-	return res;
-}
-
 /* skip picking commits whose parents are unchanged */
 static int skip_unnecessary_picks(struct repository *r,
 				  struct todo_list *todo_list,
@@ -5005,6 +5611,7 @@ static int skip_unnecessary_picks(struct repository *r,
 		MOVE_ARRAY(todo_list->items, todo_list->items + i, todo_list->nr - i);
 		todo_list->nr -= i;
 		todo_list->current = 0;
+		todo_list->done_nr += i;
 
 		if (is_fixup(peek_command(todo_list, 0)))
 			record_in_rewritten(base_oid, peek_command(todo_list, 0));
@@ -5015,17 +5622,18 @@ static int skip_unnecessary_picks(struct repository *r,
 
 int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
 		    const char *shortrevisions, const char *onto_name,
-		    struct commit *onto, const char *orig_head,
+		    struct commit *onto, const struct object_id *orig_head,
 		    struct string_list *commands, unsigned autosquash,
 		    struct todo_list *todo_list)
 {
-	const char *shortonto, *todo_file = rebase_path_todo();
+	char shortonto[GIT_MAX_HEXSZ + 1];
+	const char *todo_file = rebase_path_todo();
 	struct todo_list new_todo = TODO_LIST_INIT;
-	struct strbuf *buf = &todo_list->buf;
+	struct strbuf *buf = &todo_list->buf, buf2 = STRBUF_INIT;
 	struct object_id oid = onto->object.oid;
 	int res;
 
-	shortonto = find_unique_abbrev(&oid, DEFAULT_ABBREV);
+	find_unique_abbrev_r(shortonto, &oid, DEFAULT_ABBREV);
 
 	if (buf->len == 0) {
 		struct todo_item *item = append_new_todo(todo_list);
@@ -5041,7 +5649,7 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
 		todo_list_add_exec_commands(todo_list, commands);
 
 	if (count_commands(todo_list) == 0) {
-		apply_autostash(opts);
+		apply_autostash(rebase_path_autostash());
 		sequencer_remove_state(opts);
 
 		return error(_("nothing to do"));
@@ -5052,27 +5660,32 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
 	if (res == -1)
 		return -1;
 	else if (res == -2) {
-		apply_autostash(opts);
+		apply_autostash(rebase_path_autostash());
 		sequencer_remove_state(opts);
 
 		return -1;
 	} else if (res == -3) {
-		apply_autostash(opts);
+		apply_autostash(rebase_path_autostash());
 		sequencer_remove_state(opts);
 		todo_list_release(&new_todo);
 
 		return error(_("nothing to do"));
-	}
-
-	if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) ||
-	    todo_list_check(todo_list, &new_todo)) {
-		fprintf(stderr, _(edit_todo_list_advice));
+	} else if (res == -4) {
 		checkout_onto(r, opts, onto_name, &onto->object.oid, orig_head);
 		todo_list_release(&new_todo);
 
 		return -1;
 	}
 
+	/* Expand the commit IDs */
+	todo_list_to_strbuf(r, &new_todo, &buf2, -1, 0);
+	strbuf_swap(&new_todo.buf, &buf2);
+	strbuf_release(&buf2);
+	new_todo.total_nr -= new_todo.nr;
+	if (todo_list_parse_insn_buffer(r, new_todo.buf.buf, &new_todo) < 0)
+		BUG("invalid todo list after expanding IDs:\n%s",
+		    new_todo.buf.buf);
+
 	if (opts->allow_ff && skip_unnecessary_picks(r, &new_todo, &oid)) {
 		todo_list_release(&new_todo);
 		return error(_("could not skip unnecessary pick commands"));
@@ -5084,15 +5697,21 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
 		return error_errno(_("could not write '%s'"), todo_file);
 	}
 
-	todo_list_release(&new_todo);
+	res = -1;
 
 	if (checkout_onto(r, opts, onto_name, &oid, orig_head))
-		return -1;
+		goto cleanup;
 
 	if (require_clean_work_tree(r, "rebase", "", 1, 1))
-		return -1;
+		goto cleanup;
 
-	return sequencer_continue(r, opts);
+	todo_list_write_total_nr(&new_todo);
+	res = pick_commits(r, &new_todo, opts);
+
+cleanup:
+	todo_list_release(&new_todo);
+
+	return res;
 }
 
 struct subject2item_entry {
@@ -5116,6 +5735,12 @@ static int subject2item_cmp(const void *fndata,
 
 define_commit_slab(commit_todo_item, struct todo_item *);
 
+static int skip_fixupish(const char *subject, const char **p) {
+	return skip_prefix(subject, "fixup! ", p) ||
+	       skip_prefix(subject, "amend! ", p) ||
+	       skip_prefix(subject, "squash! ", p);
+}
+
 /*
  * Rearrange the todo list that has both "pick commit-id msg" and "pick
  * commit-id fixup!/squash! msg" in it so that the latter is put immediately
@@ -5169,20 +5794,18 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
 		*commit_todo_item_at(&commit_todo, item->commit) = item;
 
 		parse_commit(item->commit);
-		commit_buffer = get_commit_buffer(item->commit, NULL);
+		commit_buffer = logmsg_reencode(item->commit, NULL, "UTF-8");
 		find_commit_subject(commit_buffer, &subject);
 		format_subject(&buf, subject, " ");
 		subject = subjects[i] = strbuf_detach(&buf, &subject_len);
 		unuse_commit_buffer(item->commit, commit_buffer);
-		if ((skip_prefix(subject, "fixup! ", &p) ||
-		     skip_prefix(subject, "squash! ", &p))) {
+		if (skip_fixupish(subject, &p)) {
 			struct commit *commit2;
 
 			for (;;) {
 				while (isspace(*p))
 					p++;
-				if (!skip_prefix(p, "fixup! ", &p) &&
-				    !skip_prefix(p, "squash! ", &p))
+				if (!skip_fixupish(p, &p))
 					break;
 			}
 
@@ -5212,13 +5835,21 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
 		}
 		if (i2 >= 0) {
 			rearranged = 1;
-			todo_list->items[i].command =
-				starts_with(subject, "fixup!") ?
-				TODO_FIXUP : TODO_SQUASH;
-			if (next[i2] < 0)
+			if (starts_with(subject, "fixup!")) {
+				todo_list->items[i].command = TODO_FIXUP;
+			} else if (starts_with(subject, "amend!")) {
+				todo_list->items[i].command = TODO_FIXUP;
+				todo_list->items[i].flags = TODO_REPLACE_FIXUP_MSG;
+			} else {
+				todo_list->items[i].command = TODO_SQUASH;
+			}
+			if (tail[i2] < 0) {
+				next[i] = next[i2];
 				next[i2] = i;
-			else
+			} else {
+				next[i] = next[tail[i2]];
 				next[tail[i2]] = i;
+			}
 			tail[i2] = i;
 		} else if (!hashmap_get_from_hash(&subject2item,
 						strhash(subject), subject)) {
@@ -5260,9 +5891,30 @@ int todo_list_rearrange_squash(struct todo_list *todo_list)
 	for (i = 0; i < todo_list->nr; i++)
 		free(subjects[i]);
 	free(subjects);
-	hashmap_free_entries(&subject2item, struct subject2item_entry, entry);
+	hashmap_clear_and_free(&subject2item, struct subject2item_entry, entry);
 
 	clear_commit_todo_item(&commit_todo);
 
 	return 0;
 }
+
+int sequencer_determine_whence(struct repository *r, enum commit_whence *whence)
+{
+	if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD")) {
+		struct object_id cherry_pick_head, rebase_head;
+
+		if (file_exists(git_path_seq_dir()))
+			*whence = FROM_CHERRY_PICK_MULTI;
+		if (file_exists(rebase_path()) &&
+		    !get_oid("REBASE_HEAD", &rebase_head) &&
+		    !get_oid("CHERRY_PICK_HEAD", &cherry_pick_head) &&
+		    oideq(&rebase_head, &cherry_pick_head))
+			*whence = FROM_REBASE_PICK;
+		else
+			*whence = FROM_CHERRY_PICK_SINGLE;
+
+		return 1;
+	}
+
+	return 0;
+}
diff --git a/sequencer.h b/sequencer.h
index 574260f621..2088344cb3 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -3,14 +3,15 @@
 
 #include "cache.h"
 #include "strbuf.h"
+#include "wt-status.h"
 
 struct commit;
 struct repository;
 
 const char *git_path_commit_editmsg(void);
-const char *git_path_seq_dir(void);
 const char *rebase_path_todo(void);
 const char *rebase_path_todo_backup(void);
+const char *rebase_path_dropped(void);
 
 #define APPEND_SIGNOFF_DEDUP (1u << 0)
 
@@ -30,8 +31,10 @@ enum commit_msg_cleanup_mode {
 struct replay_opts {
 	enum replay_action action;
 
-	/* Boolean options */
+	/* Tri-state options: unspecified, false, or true */
 	int edit;
+
+	/* Boolean options */
 	int record_origin;
 	int no_commit;
 	int signoff;
@@ -39,10 +42,13 @@ struct replay_opts {
 	int allow_rerere_auto;
 	int allow_empty;
 	int allow_empty_message;
+	int drop_redundant_commits;
 	int keep_redundant_commits;
 	int verbose;
 	int quiet;
 	int reschedule_failed_exec;
+	int committer_date_is_author_date;
+	int ignore_date;
 
 	int mainline;
 
@@ -51,6 +57,7 @@ struct replay_opts {
 	int explicit_cleanup;
 
 	/* Merge strategy */
+	char *default_strategy;  /* from config options */
 	char *strategy;
 	char **xopts;
 	size_t xopts_nr, xopts_alloc;
@@ -66,7 +73,7 @@ struct replay_opts {
 	/* Only used by REPLAY_NONE */
 	struct rev_info *revs;
 };
-#define REPLAY_OPTS_INIT { .action = -1, .current_fixups = STRBUF_INIT }
+#define REPLAY_OPTS_INIT { .edit = -1, .action = -1, .current_fixups = STRBUF_INIT }
 
 /*
  * Note that ordering matters in this enum. Not only must it match the mapping
@@ -148,18 +155,19 @@ int sequencer_remove_state(struct replay_opts *opts);
  * `--onto`, we do not want to re-generate the root commits.
  */
 #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 check_todo_list_from_file(struct repository *r);
 int complete_action(struct repository *r, struct replay_opts *opts, unsigned flags,
 		    const char *shortrevisions, const char *onto_name,
-		    struct commit *onto, const char *orig_head, struct string_list *commands,
-		    unsigned autosquash, struct todo_list *todo_list);
+		    struct commit *onto, const struct object_id *orig_head,
+		    struct string_list *commands, unsigned autosquash,
+		    struct todo_list *todo_list);
 int todo_list_rearrange_squash(struct todo_list *todo_list);
 
 /*
@@ -190,8 +198,11 @@ void commit_post_rewrite(struct repository *r,
 			 const struct commit *current_head,
 			 const struct object_id *new_head);
 
-int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts,
-				 const char *commit);
+void create_autostash(struct repository *r, const char *path,
+		      const char *default_reflog_action);
+int save_autostash(const char *path);
+int apply_autostash(const char *path);
+int apply_autostash_oid(const char *stash_oid);
 
 #define SUMMARY_INITIAL_COMMIT   (1 << 0)
 #define SUMMARY_SHOW_AUTHOR_DATE (1 << 1)
@@ -200,13 +211,27 @@ void print_commit_summary(struct repository *repo,
 			  const struct object_id *oid,
 			  unsigned int flags);
 
+#define READ_ONELINER_SKIP_IF_EMPTY (1 << 0)
+#define READ_ONELINER_WARN_MISSING (1 << 1)
+
+/*
+ * Reads a file that was presumably written by a shell script, i.e. with an
+ * end-of-line marker that needs to be stripped.
+ *
+ * Note that only the last end-of-line marker is stripped, consistent with the
+ * behavior of "$(cat path)" in a shell script.
+ *
+ * Returns 1 if the file was read, 0 if it could not be read or does not exist.
+ */
+int read_oneliner(struct strbuf *buf,
+	const char *path, unsigned flags);
 int read_author_script(const char *path, char **name, char **email, char **date,
 		       int allow_missing);
-#endif
-
 void parse_strategy_opts(struct replay_opts *opts, char *raw_opts);
 int write_basic_state(struct replay_opts *opts, const char *head_name,
-		      struct commit *onto, const char *orig_head);
+		      struct commit *onto, const struct object_id *orig_head);
 void sequencer_post_commit_cleanup(struct repository *r, int verbose);
 int sequencer_get_last_command(struct repository* r,
 			       enum replay_action *action);
+int sequencer_determine_whence(struct repository *r, enum commit_whence *whence);
+#endif /* SEQUENCER_H */
diff --git a/serve.c b/serve.c
index 317256c1a4..f11c0e07c4 100644
--- a/serve.c
+++ b/serve.c
@@ -3,11 +3,14 @@
 #include "config.h"
 #include "pkt-line.h"
 #include "version.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "ls-refs.h"
+#include "protocol-caps.h"
 #include "serve.h"
 #include "upload-pack.h"
 
+static int advertise_sid;
+
 static int always_advertise(struct repository *r,
 			    struct strbuf *value)
 {
@@ -22,6 +25,23 @@ static int agent_advertise(struct repository *r,
 	return 1;
 }
 
+static int object_format_advertise(struct repository *r,
+				   struct strbuf *value)
+{
+	if (value)
+		strbuf_addstr(value, r->hash_algo->name);
+	return 1;
+}
+
+static int session_id_advertise(struct repository *r, struct strbuf *value)
+{
+	if (!advertise_sid)
+		return 0;
+	if (value)
+		strbuf_addstr(value, trace2_session_id());
+	return 1;
+}
+
 struct protocol_capability {
 	/*
 	 * The name of the capability.  The server uses this name when
@@ -48,15 +68,18 @@ struct protocol_capability {
 	 * This field should be NULL for capabilities which are not commands.
 	 */
 	int (*command)(struct repository *r,
-		       struct argv_array *keys,
+		       struct strvec *keys,
 		       struct packet_reader *request);
 };
 
 static struct protocol_capability capabilities[] = {
 	{ "agent", agent_advertise, NULL },
-	{ "ls-refs", always_advertise, ls_refs },
+	{ "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 },
 };
 
 static void advertise_capabilities(void)
@@ -133,13 +156,13 @@ static int is_command(const char *key, struct protocol_capability **command)
 	return 0;
 }
 
-int has_capability(const struct argv_array *keys, const char *capability,
+int has_capability(const struct strvec *keys, const char *capability,
 		   const char **value)
 {
 	int i;
-	for (i = 0; i < keys->argc; i++) {
+	for (i = 0; i < keys->nr; i++) {
 		const char *out;
-		if (skip_prefix(keys->argv[i], capability, &out) &&
+		if (skip_prefix(keys->v[i], capability, &out) &&
 		    (!*out || *out == '=')) {
 			if (value) {
 				if (*out == '=')
@@ -153,6 +176,22 @@ int has_capability(const struct argv_array *keys, const char *capability,
 	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,
@@ -162,8 +201,9 @@ static int process_request(void)
 {
 	enum request_state state = PROCESS_REQUEST_KEYS;
 	struct packet_reader reader;
-	struct argv_array keys = ARGV_ARRAY_INIT;
+	struct strvec keys = STRVEC_INIT;
 	struct protocol_capability *command = NULL;
+	const char *client_sid;
 
 	packet_reader_init(&reader, 0, NULL, 0,
 			   PACKET_READ_CHOMP_NEWLINE |
@@ -186,7 +226,7 @@ static int process_request(void)
 			/* collect request; a sequence of keys and values */
 			if (is_command(reader.line, &command) ||
 			    is_valid_capability(reader.line))
-				argv_array_push(&keys, reader.line);
+				strvec_push(&keys, reader.line);
 			else
 				die("unknown capability '%s'", reader.line);
 
@@ -198,7 +238,7 @@ static int process_request(void)
 			 * If no command and no keys were given then the client
 			 * wanted to terminate the connection.
 			 */
-			if (!keys.argc)
+			if (!keys.nr)
 				return 1;
 
 			/*
@@ -217,21 +257,30 @@ static int process_request(void)
 
 			state = PROCESS_REQUEST_DONE;
 			break;
+		case PACKET_READ_RESPONSE_END:
+			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);
+
 	command->command(the_repository, &keys, &reader);
 
-	argv_array_clear(&keys);
+	strvec_clear(&keys);
 	return 0;
 }
 
 /* Main serve loop for protocol version 2 */
 void serve(struct serve_options *options)
 {
+	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");
diff --git a/serve.h b/serve.h
index 42ddca7f8b..fc2683e24d 100644
--- a/serve.h
+++ b/serve.h
@@ -1,8 +1,8 @@
 #ifndef SERVE_H
 #define SERVE_H
 
-struct argv_array;
-int has_capability(const struct argv_array *keys, const char *capability,
+struct strvec;
+int has_capability(const struct strvec *keys, const char *capability,
 		   const char **value);
 
 struct serve_options {
diff --git a/server-info.c b/server-info.c
index 4d8199b1d9..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;
@@ -93,7 +94,7 @@ static int update_info_file(char *path,
 		uic.old_fp = fopen_or_warn(path, "r");
 
 	/*
-	 * uic_printf will compare incremental comparison aginst old_fp
+	 * uic_printf will compare incremental comparison against old_fp
 	 * and mark uic as stale if needed
 	 */
 	ret = generate(&uic);
@@ -296,7 +297,7 @@ static void init_pack_info(const char *infofile, int force)
 
 		i = num_pack++;
 		ALLOC_GROW(info, num_pack, alloc);
-		info[i] = xcalloc(1, sizeof(struct pack_info));
+		CALLOC_ARRAY(info[i], 1);
 		info[i]->p = p;
 		info[i]->old_num = -1;
 	}
diff --git a/setup.c b/setup.c
index e2a479a64f..eb9367ca5c 100644
--- a/setup.c
+++ b/setup.c
@@ -32,6 +32,7 @@ static int abspath_part_inside_repo(char *path)
 	char *path0;
 	int off;
 	const char *work_tree = get_git_work_tree();
+	struct strbuf realpath = STRBUF_INIT;
 
 	if (!work_tree)
 		return -1;
@@ -60,8 +61,10 @@ static int abspath_part_inside_repo(char *path)
 		path++;
 		if (*path == '/') {
 			*path = '\0';
-			if (fspathcmp(real_path(path0), work_tree) == 0) {
+			strbuf_realpath(&realpath, path0, 1);
+			if (fspathcmp(realpath.buf, work_tree) == 0) {
 				memmove(path0, path + 1, len - (path - path0));
+				strbuf_release(&realpath);
 				return 0;
 			}
 			*path = '/';
@@ -69,11 +72,14 @@ static int abspath_part_inside_repo(char *path)
 	}
 
 	/* check whole path */
-	if (fspathcmp(real_path(path0), work_tree) == 0) {
+	strbuf_realpath(&realpath, path0, 1);
+	if (fspathcmp(realpath.buf, work_tree) == 0) {
 		*path0 = '\0';
+		strbuf_release(&realpath);
 		return 0;
 	}
 
+	strbuf_release(&realpath);
 	return -1;
 }
 
@@ -120,8 +126,13 @@ char *prefix_path_gently(const char *prefix, int len,
 char *prefix_path(const char *prefix, int len, const char *path)
 {
 	char *r = prefix_path_gently(prefix, len, NULL, path);
-	if (!r)
-		die(_("'%s' is outside repository"), path);
+	if (!r) {
+		const char *hint_path = get_git_work_tree();
+		if (!hint_path)
+			hint_path = get_git_dir();
+		die(_("'%s' is outside repository at '%s'"), path,
+		    absolute_path(hint_path));
+	}
 	return r;
 }
 
@@ -197,9 +208,26 @@ static void NORETURN die_verify_filename(struct repository *r,
  */
 static int looks_like_pathspec(const char *arg)
 {
-	/* anything with a wildcard character */
-	if (!no_wildcard(arg))
-		return 1;
+	const char *p;
+	int escaped = 0;
+
+	/*
+	 * Wildcard characters imply the user is looking to match pathspecs
+	 * that aren't in the filesystem. Note that this doesn't include
+	 * backslash even though it's a glob special; by itself it doesn't
+	 * cause any increase in the match. Likewise ignore backslash-escaped
+	 * wildcard characters.
+	 */
+	for (p = arg; *p; p++) {
+		if (escaped) {
+			escaped = 0;
+		} else if (is_glob_special(*p)) {
+			if (*p == '\\')
+				escaped = 1;
+			else
+				return 1;
+		}
+	}
 
 	/* long-form pathspec magic */
 	if (starts_with(arg, ":("))
@@ -419,6 +447,61 @@ static int read_worktree_config(const char *var, const char *value, void *vdata)
 	return 0;
 }
 
+enum extension_result {
+	EXTENSION_ERROR = -1, /* compatible with error(), etc */
+	EXTENSION_UNKNOWN = 0,
+	EXTENSION_OK = 1
+};
+
+/*
+ * Do not add new extensions to this function. It handles extensions which are
+ * respected even in v0-format repositories for historical compatibility.
+ */
+static enum extension_result handle_extension_v0(const char *var,
+						 const char *value,
+						 const char *ext,
+						 struct repository_format *data)
+{
+		if (!strcmp(ext, "noop")) {
+			return EXTENSION_OK;
+		} else if (!strcmp(ext, "preciousobjects")) {
+			data->precious_objects = git_config_bool(var, value);
+			return EXTENSION_OK;
+		} else if (!strcmp(ext, "partialclone")) {
+			data->partial_clone = xstrdup(value);
+			return EXTENSION_OK;
+		} else if (!strcmp(ext, "worktreeconfig")) {
+			data->worktree_config = git_config_bool(var, value);
+			return EXTENSION_OK;
+		}
+
+		return EXTENSION_UNKNOWN;
+}
+
+/*
+ * Record any new extensions in this function.
+ */
+static enum extension_result handle_extension(const char *var,
+					      const char *value,
+					      const char *ext,
+					      struct repository_format *data)
+{
+	if (!strcmp(ext, "noop-v1")) {
+		return EXTENSION_OK;
+	} else if (!strcmp(ext, "objectformat")) {
+		int format;
+
+		if (!value)
+			return config_error_nonbool(var);
+		format = hash_algo_by_name(value);
+		if (format == GIT_HASH_UNKNOWN)
+			return error("invalid value for 'extensions.objectformat'");
+		data->hash_algo = format;
+		return EXTENSION_OK;
+	}
+	return EXTENSION_UNKNOWN;
+}
+
 static int check_repo_format(const char *var, const char *value, void *vdata)
 {
 	struct repository_format *data = vdata;
@@ -427,23 +510,25 @@ static int check_repo_format(const char *var, const char *value, void *vdata)
 	if (strcmp(var, "core.repositoryformatversion") == 0)
 		data->version = git_config_int(var, value);
 	else if (skip_prefix(var, "extensions.", &ext)) {
-		/*
-		 * record any known extensions here; otherwise,
-		 * we fall through to recording it as unknown, and
-		 * check_repository_format will complain
-		 */
-		if (!strcmp(ext, "noop"))
-			;
-		else if (!strcmp(ext, "preciousobjects"))
-			data->precious_objects = git_config_bool(var, value);
-		else if (!strcmp(ext, "partialclone")) {
-			if (!value)
-				return config_error_nonbool(var);
-			data->partial_clone = xstrdup(value);
-		} else if (!strcmp(ext, "worktreeconfig"))
-			data->worktree_config = git_config_bool(var, value);
-		else
+		switch (handle_extension_v0(var, value, ext, data)) {
+		case EXTENSION_ERROR:
+			return -1;
+		case EXTENSION_OK:
+			return 0;
+		case EXTENSION_UNKNOWN:
+			break;
+		}
+
+		switch (handle_extension(var, value, ext, data)) {
+		case EXTENSION_ERROR:
+			return -1;
+		case EXTENSION_OK:
+			string_list_append(&data->v1_only_extensions, ext);
+			return 0;
+		case EXTENSION_UNKNOWN:
 			string_list_append(&data->unknown_extensions, ext);
+			return 0;
+		}
 	}
 
 	return read_worktree_config(var, value, vdata);
@@ -479,9 +564,9 @@ static int check_repository_format_gently(const char *gitdir, struct repository_
 	}
 
 	repository_format_precious_objects = candidate->precious_objects;
-	set_repository_format_partial_clone(candidate->partial_clone);
 	repository_format_worktree_config = candidate->worktree_config;
 	string_list_clear(&candidate->unknown_extensions, 0);
+	string_list_clear(&candidate->v1_only_extensions, 0);
 
 	if (repository_format_worktree_config) {
 		/*
@@ -510,6 +595,37 @@ static int check_repository_format_gently(const char *gitdir, struct repository_
 	return 0;
 }
 
+int upgrade_repository_format(int target_version)
+{
+	struct strbuf sb = STRBUF_INIT;
+	struct strbuf err = STRBUF_INIT;
+	struct strbuf repo_version = STRBUF_INIT;
+	struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
+
+	strbuf_git_common_path(&sb, the_repository, "config");
+	read_repository_format(&repo_fmt, sb.buf);
+	strbuf_release(&sb);
+
+	if (repo_fmt.version >= target_version)
+		return 0;
+
+	if (verify_repository_format(&repo_fmt, &err) < 0) {
+		error("cannot upgrade repository format from %d to %d: %s",
+		      repo_fmt.version, target_version, err.buf);
+		strbuf_release(&err);
+		return -1;
+	}
+	if (!repo_fmt.version && repo_fmt.unknown_extensions.nr)
+		return error("cannot upgrade repository format: "
+			     "unknown extension %s",
+			     repo_fmt.unknown_extensions.items[0].string);
+
+	strbuf_addf(&repo_version, "%d", target_version);
+	git_config_set("core.repositoryformatversion", repo_version.buf);
+	strbuf_release(&repo_version);
+	return 1;
+}
+
 static void init_repository_format(struct repository_format *format)
 {
 	const struct repository_format fresh = REPOSITORY_FORMAT_INIT;
@@ -529,6 +645,7 @@ int read_repository_format(struct repository_format *format, const char *path)
 void clear_repository_format(struct repository_format *format)
 {
 	string_list_clear(&format->unknown_extensions, 0);
+	string_list_clear(&format->v1_only_extensions, 0);
 	free(format->work_tree);
 	free(format->partial_clone);
 	init_repository_format(format);
@@ -546,7 +663,9 @@ int verify_repository_format(const struct repository_format *format,
 	if (format->version >= 1 && format->unknown_extensions.nr) {
 		int i;
 
-		strbuf_addstr(err, _("unknown repository extensions found:"));
+		strbuf_addstr(err, Q_("unknown repository extension found:",
+				      "unknown repository extensions found:",
+				      format->unknown_extensions.nr));
 
 		for (i = 0; i < format->unknown_extensions.nr; i++)
 			strbuf_addf(err, "\n\t%s",
@@ -554,6 +673,20 @@ int verify_repository_format(const struct repository_format *format,
 		return -1;
 	}
 
+	if (format->version == 0 && format->v1_only_extensions.nr) {
+		int i;
+
+		strbuf_addstr(err,
+			      Q_("repo version is 0, but v1-only extension found:",
+				 "repo version is 0, but v1-only extensions found:",
+				 format->v1_only_extensions.nr));
+
+		for (i = 0; i < format->v1_only_extensions.nr; i++)
+			strbuf_addf(err, "\n\t%s",
+				    format->v1_only_extensions.items[i].string);
+		return -1;
+	}
+
 	return 0;
 }
 
@@ -601,6 +734,7 @@ const char *read_gitfile_gently(const char *path, int *return_error_code)
 	struct stat st;
 	int fd;
 	ssize_t len;
+	static struct strbuf realpath = STRBUF_INIT;
 
 	if (stat(path, &st)) {
 		/* NEEDSWORK: discern between ENOENT vs other errors */
@@ -651,7 +785,9 @@ const char *read_gitfile_gently(const char *path, int *return_error_code)
 		error_code = READ_GITFILE_ERR_NOT_A_REPO;
 		goto cleanup_return;
 	}
-	path = real_path(dir);
+
+	strbuf_realpath(&realpath, dir, 1);
+	path = realpath.buf;
 
 cleanup_return:
 	if (return_error_code)
@@ -707,7 +843,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
 		}
 
 		/* #18, #26 */
-		set_git_dir(gitdirenv);
+		set_git_dir(gitdirenv, 0);
 		free(gitfile);
 		return NULL;
 	}
@@ -729,7 +865,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
 	}
 	else if (!git_env_bool(GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, 1)) {
 		/* #16d */
-		set_git_dir(gitdirenv);
+		set_git_dir(gitdirenv, 0);
 		free(gitfile);
 		return NULL;
 	}
@@ -741,14 +877,14 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
 
 	/* both get_git_work_tree() and cwd are already normalized */
 	if (!strcmp(cwd->buf, worktree)) { /* cwd == worktree */
-		set_git_dir(gitdirenv);
+		set_git_dir(gitdirenv, 0);
 		free(gitfile);
 		return NULL;
 	}
 
 	offset = dir_inside_of(cwd->buf, worktree);
 	if (offset >= 0) {	/* cwd inside worktree? */
-		set_git_dir(real_path(gitdirenv));
+		set_git_dir(gitdirenv, 1);
 		if (chdir(worktree))
 			die_errno(_("cannot chdir to '%s'"), worktree);
 		strbuf_addch(cwd, '/');
@@ -757,7 +893,7 @@ static const char *setup_explicit_git_dir(const char *gitdirenv,
 	}
 
 	/* cwd outside worktree */
-	set_git_dir(gitdirenv);
+	set_git_dir(gitdirenv, 0);
 	free(gitfile);
 	return NULL;
 }
@@ -786,7 +922,7 @@ static const char *setup_discovered_git_dir(const char *gitdir,
 
 	/* #16.2, #17.2, #20.2, #21.2, #24, #25, #28, #29 (see t1510) */
 	if (is_bare_repository_cfg > 0) {
-		set_git_dir(offset == cwd->len ? gitdir : real_path(gitdir));
+		set_git_dir(gitdir, (offset != cwd->len));
 		if (chdir(cwd->buf))
 			die_errno(_("cannot come back to cwd"));
 		return NULL;
@@ -795,7 +931,7 @@ static const char *setup_discovered_git_dir(const char *gitdir,
 	/* #0, #1, #5, #8, #9, #12, #13 */
 	set_git_work_tree(".");
 	if (strcmp(gitdir, DEFAULT_GIT_DIR_ENVIRONMENT))
-		set_git_dir(gitdir);
+		set_git_dir(gitdir, 0);
 	inside_git_dir = 0;
 	inside_work_tree = 1;
 	if (offset >= cwd->len)
@@ -838,10 +974,10 @@ static const char *setup_bare_git_dir(struct strbuf *cwd, int offset,
 			die_errno(_("cannot come back to cwd"));
 		root_len = offset_1st_component(cwd->buf);
 		strbuf_setlen(cwd, offset > root_len ? offset : root_len);
-		set_git_dir(cwd->buf);
+		set_git_dir(cwd->buf, 0);
 	}
 	else
-		set_git_dir(".");
+		set_git_dir(".", 0);
 	return NULL;
 }
 
@@ -859,7 +995,7 @@ static dev_t get_device_or_die(const char *path, const char *prefix, int prefix_
 
 /*
  * A "string_list_each_func_t" function that canonicalizes an entry
- * from GIT_CEILING_DIRECTORIES using real_path_if_valid(), or
+ * from GIT_CEILING_DIRECTORIES using real_pathdup(), or
  * discards it if unusable.  The presence of an empty entry in
  * GIT_CEILING_DIRECTORIES turns off canonicalization for all
  * subsequent entries.
@@ -1058,6 +1194,11 @@ int discover_git_directory(struct strbuf *commondir,
 		return -1;
 	}
 
+	/* take ownership of candidate.partial_clone */
+	the_repository->repository_format_partial_clone =
+		candidate.partial_clone;
+	candidate.partial_clone = NULL;
+
 	clear_repository_format(&candidate);
 	return 0;
 }
@@ -1139,18 +1280,10 @@ const char *setup_git_directory_gently(int *nongit_ok)
 	 * the GIT_PREFIX environment variable must always match. For details
 	 * see Documentation/config/alias.txt.
 	 */
-	if (nongit_ok && *nongit_ok) {
+	if (nongit_ok && *nongit_ok)
 		startup_info->have_repository = 0;
-		startup_info->prefix = NULL;
-		setenv(GIT_PREFIX_ENVIRONMENT, "", 1);
-	} else {
+	else
 		startup_info->have_repository = 1;
-		startup_info->prefix = prefix;
-		if (prefix)
-			setenv(GIT_PREFIX_ENVIRONMENT, prefix, 1);
-		else
-			setenv(GIT_PREFIX_ENVIRONMENT, "", 1);
-	}
 
 	/*
 	 * Not all paths through the setup code will call 'set_git_dir()' (which
@@ -1173,10 +1306,31 @@ const char *setup_git_directory_gently(int *nongit_ok)
 				gitdir = DEFAULT_GIT_DIR_ENVIRONMENT;
 			setup_git_env(gitdir);
 		}
-		if (startup_info->have_repository)
+		if (startup_info->have_repository) {
 			repo_set_hash_algo(the_repository, repo_fmt.hash_algo);
+			/* take ownership of repo_fmt.partial_clone */
+			the_repository->repository_format_partial_clone =
+				repo_fmt.partial_clone;
+			repo_fmt.partial_clone = NULL;
+		}
+	}
+	/*
+	 * Since precompose_string_if_needed() needs to look at
+	 * the core.precomposeunicode configuration, this
+	 * has to happen after the above block that finds
+	 * out where the repository is, i.e. a preparation
+	 * for calling git_config_get_bool().
+	 */
+	if (prefix) {
+		prefix = precompose_string_if_needed(prefix);
+		startup_info->prefix = prefix;
+		setenv(GIT_PREFIX_ENVIRONMENT, prefix, 1);
+	} else {
+		startup_info->prefix = NULL;
+		setenv(GIT_PREFIX_ENVIRONMENT, "", 1);
 	}
 
+
 	strbuf_release(&dir);
 	strbuf_release(&gitdir);
 	clear_repository_format(&repo_fmt);
@@ -1235,11 +1389,16 @@ int git_config_perm(const char *var, const char *value)
 	return -(i & 0666);
 }
 
-void check_repository_format(void)
+void check_repository_format(struct repository_format *fmt)
 {
 	struct repository_format repo_fmt = REPOSITORY_FORMAT_INIT;
-	check_repository_format_gently(get_git_dir(), &repo_fmt, NULL);
+	if (!fmt)
+		fmt = &repo_fmt;
+	check_repository_format_gently(get_git_dir(), fmt, NULL);
 	startup_info->have_repository = 1;
+	repo_set_hash_algo(the_repository, fmt->hash_algo);
+	the_repository->repository_format_partial_clone =
+		xstrdup_or_null(fmt->partial_clone);
 	clear_repository_format(&repo_fmt);
 }
 
diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
index e7430b9aa8..6cd307ac2c 100644
--- a/sh-i18n--envsubst.c
+++ b/sh-i18n--envsubst.c
@@ -104,12 +104,12 @@ cmd_main (int argc, const char *argv[])
   if (ferror (stderr) || fflush (stderr))
     {
       fclose (stderr);
-      exit (EXIT_FAILURE);
+      return (EXIT_FAILURE);
     }
   if (fclose (stderr) && errno != EBADF)
-    exit (EXIT_FAILURE);
+    return (EXIT_FAILURE);
 
-  exit (EXIT_SUCCESS);
+  return (EXIT_SUCCESS);
 }
 
 /* Parse the string and invoke the callback each time a $VARIABLE or
diff --git a/sha1-array.h b/sha1-array.h
deleted file mode 100644
index 55d016c4bf..0000000000
--- a/sha1-array.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef SHA1_ARRAY_H
-#define SHA1_ARRAY_H
-
-struct oid_array {
-	struct object_id *oid;
-	int nr;
-	int alloc;
-	int sorted;
-};
-
-#define OID_ARRAY_INIT { NULL, 0, 0, 0 }
-
-void oid_array_append(struct oid_array *array, const struct object_id *oid);
-int oid_array_lookup(struct oid_array *array, const struct object_id *oid);
-void oid_array_clear(struct oid_array *array);
-
-typedef int (*for_each_oid_fn)(const struct object_id *oid,
-			       void *data);
-int oid_array_for_each(struct oid_array *array,
-		       for_each_oid_fn fn,
-		       void *data);
-int oid_array_for_each_unique(struct oid_array *array,
-			      for_each_oid_fn fn,
-			      void *data);
-void oid_array_filter(struct oid_array *array,
-		      for_each_oid_fn want,
-		      void *cbdata);
-
-#endif /* SHA1_ARRAY_H */
diff --git a/sha1dc/sha1.c b/sha1dc/sha1.c
index 9d3cf81d4d..dede2cbddf 100644
--- a/sha1dc/sha1.c
+++ b/sha1dc/sha1.c
@@ -72,7 +72,7 @@
 /* Not under GCC-alike or glibc */
 #elif defined(_BYTE_ORDER) && defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN)
 /*
- * *BSD and newlib (embeded linux, cygwin, etc).
+ * *BSD and newlib (embedded linux, cygwin, etc).
  * the defined(_BIG_ENDIAN) && defined(_LITTLE_ENDIAN) part prevents
  * this condition from matching with Solaris/sparc.
  * (Solaris defines only one endian macro)
@@ -98,7 +98,7 @@
 /*
  * Defines Big Endian on a whitelist of OSs that are known to be Big
  * Endian-only. See
- * https://public-inbox.org/git/93056823-2740-d072-1ebd-46b440b33d7e@felt.demon.nl/
+ * https://lore.kernel.org/git/93056823-2740-d072-1ebd-46b440b33d7e@felt.demon.nl/
  */
 #define SHA1DC_BIGENDIAN
 
diff --git a/sha1dc_git.c b/sha1dc_git.c
index e0cc9d988c..5c300e812e 100644
--- a/sha1dc_git.c
+++ b/sha1dc_git.c
@@ -19,7 +19,7 @@ void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx)
 	if (!SHA1DCFinal(hash, ctx))
 		return;
 	die("SHA-1 appears to be part of a collision attack: %s",
-	    sha1_to_hex(hash));
+	    hash_to_hex_algop(hash, &hash_algos[GIT_HASH_SHA1]));
 }
 
 /*
diff --git a/sha256/gcrypt.h b/sha256/gcrypt.h
index 09bd8bb200..501da5ed91 100644
--- a/sha256/gcrypt.h
+++ b/sha256/gcrypt.h
@@ -22,8 +22,14 @@ inline void gcrypt_SHA256_Final(unsigned char *digest, gcrypt_SHA256_CTX *ctx)
 	memcpy(digest, gcry_md_read(*ctx, GCRY_MD_SHA256), SHA256_DIGEST_SIZE);
 }
 
+inline void gcrypt_SHA256_Clone(gcrypt_SHA256_CTX *dst, const gcrypt_SHA256_CTX *src)
+{
+	gcry_md_copy(dst, *src);
+}
+
 #define platform_SHA256_CTX gcrypt_SHA256_CTX
 #define platform_SHA256_Init gcrypt_SHA256_Init
+#define platform_SHA256_Clone gcrypt_SHA256_Clone
 #define platform_SHA256_Update gcrypt_SHA256_Update
 #define platform_SHA256_Final gcrypt_SHA256_Final
 
diff --git a/shallow.c b/shallow.c
index 7fd04afed1..9ed18eb884 100644
--- a/shallow.c
+++ b/shallow.c
@@ -8,12 +8,13 @@
 #include "pkt-line.h"
 #include "remote.h"
 #include "refs.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "diff.h"
 #include "revision.h"
 #include "commit-slab.h"
 #include "list-objects.h"
 #include "commit-reach.h"
+#include "shallow.h"
 
 void set_alternate_shallow_file(struct repository *r, const char *path, int override)
 {
@@ -38,15 +39,21 @@ int register_shallow(struct repository *r, const struct object_id *oid)
 	return register_commit_graft(r, graft, 0);
 }
 
-int is_repository_shallow(struct repository *r)
+int unregister_shallow(const struct object_id *oid)
 {
-	/*
-	 * NEEDSWORK: This function updates
-	 * r->parsed_objects->{is_shallow,shallow_stat} as a side effect but
-	 * there is no corresponding function to clear them when the shallow
-	 * file is updated.
-	 */
+	int pos = commit_graft_pos(the_repository, oid);
+	if (pos < 0)
+		return -1;
+	if (pos + 1 < the_repository->parsed_objects->grafts_nr)
+		MOVE_ARRAY(the_repository->parsed_objects->grafts + pos,
+			   the_repository->parsed_objects->grafts + pos + 1,
+			   the_repository->parsed_objects->grafts_nr - pos - 1);
+	the_repository->parsed_objects->grafts_nr--;
+	return 0;
+}
 
+int is_repository_shallow(struct repository *r)
+{
 	FILE *fp;
 	char buf[1024];
 	const char *path = r->parsed_objects->alternate_shallow_file;
@@ -79,11 +86,34 @@ int is_repository_shallow(struct repository *r)
 	return r->parsed_objects->is_shallow;
 }
 
+static void reset_repository_shallow(struct repository *r)
+{
+	r->parsed_objects->is_shallow = -1;
+	stat_validity_clear(r->parsed_objects->shallow_stat);
+}
+
+int commit_shallow_file(struct repository *r, struct shallow_lock *lk)
+{
+	int res = commit_lock_file(&lk->lock);
+	reset_repository_shallow(r);
+	return res;
+}
+
+void rollback_shallow_file(struct repository *r, struct shallow_lock *lk)
+{
+	rollback_lock_file(&lk->lock);
+	reset_repository_shallow(r);
+}
+
 /*
  * TODO: use "int" elemtype instead of "int *" when/if commit-slab
  * supports a "valid" flag.
  */
 define_commit_slab(commit_depth, int *);
+static void free_depth_in_slab(int **ptr)
+{
+	FREE_AND_NULL(*ptr);
+}
 struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
 		int shallow_flag, int not_shallow_flag)
 {
@@ -150,15 +180,7 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
 			}
 		}
 	}
-	for (i = 0; i < depths.slab_count; i++) {
-		int j;
-
-		if (!depths.slab[i])
-			continue;
-		for (j = 0; j < depths.slab_size; j++)
-			free(depths.slab[i][j]);
-	}
-	clear_commit_depth(&depths);
+	deep_clear_commit_depth(&depths, free_depth_in_slab);
 
 	return result;
 }
@@ -340,22 +362,22 @@ const char *setup_temporary_shallow(const struct oid_array *extra)
 	return "";
 }
 
-void setup_alternate_shallow(struct lock_file *shallow_lock,
+void setup_alternate_shallow(struct shallow_lock *shallow_lock,
 			     const char **alternate_shallow_file,
 			     const struct oid_array *extra)
 {
 	struct strbuf sb = STRBUF_INIT;
 	int fd;
 
-	fd = hold_lock_file_for_update(shallow_lock,
+	fd = hold_lock_file_for_update(&shallow_lock->lock,
 				       git_path_shallow(the_repository),
 				       LOCK_DIE_ON_ERROR);
 	check_shallow_file_for_update(the_repository);
 	if (write_shallow_commits(&sb, 0, extra)) {
 		if (write_in_full(fd, sb.buf, sb.len) < 0)
 			die_errno("failed to write to %s",
-				  get_lock_file_path(shallow_lock));
-		*alternate_shallow_file = get_lock_file_path(shallow_lock);
+				  get_lock_file_path(&shallow_lock->lock));
+		*alternate_shallow_file = get_lock_file_path(&shallow_lock->lock);
 	} else
 		/*
 		 * is_repository_shallow() sees empty string as "no
@@ -388,7 +410,7 @@ void advertise_shallow_grafts(int fd)
  */
 void prune_shallow(unsigned options)
 {
-	struct lock_file shallow_lock = LOCK_INIT;
+	struct shallow_lock shallow_lock = SHALLOW_LOCK_INIT;
 	struct strbuf sb = STRBUF_INIT;
 	unsigned flags = SEEN_ONLY;
 	int fd;
@@ -402,18 +424,18 @@ void prune_shallow(unsigned options)
 		strbuf_release(&sb);
 		return;
 	}
-	fd = hold_lock_file_for_update(&shallow_lock,
+	fd = hold_lock_file_for_update(&shallow_lock.lock,
 				       git_path_shallow(the_repository),
 				       LOCK_DIE_ON_ERROR);
 	check_shallow_file_for_update(the_repository);
 	if (write_shallow_commits_1(&sb, 0, NULL, flags)) {
 		if (write_in_full(fd, sb.buf, sb.len) < 0)
 			die_errno("failed to write to %s",
-				  get_lock_file_path(&shallow_lock));
-		commit_lock_file(&shallow_lock);
+				  get_lock_file_path(&shallow_lock.lock));
+		commit_shallow_file(the_repository, &shallow_lock);
 	} else {
 		unlink(git_path_shallow(the_repository));
-		rollback_lock_file(&shallow_lock);
+		rollback_shallow_file(the_repository, &shallow_lock);
 	}
 	strbuf_release(&sb);
 }
diff --git a/shallow.h b/shallow.h
new file mode 100644
index 0000000000..5b4a96dcd6
--- /dev/null
+++ b/shallow.h
@@ -0,0 +1,81 @@
+#ifndef SHALLOW_H
+#define SHALLOW_H
+
+#include "lockfile.h"
+#include "object.h"
+#include "repository.h"
+#include "strbuf.h"
+
+void set_alternate_shallow_file(struct repository *r, const char *path, int override);
+int register_shallow(struct repository *r, const struct object_id *oid);
+int unregister_shallow(const struct object_id *oid);
+int is_repository_shallow(struct repository *r);
+
+/*
+ * Lock for updating the $GIT_DIR/shallow file.
+ *
+ * Use `commit_shallow_file()` to commit an update, or
+ * `rollback_shallow_file()` to roll it back. In either case, any
+ * in-memory cached information about which commits are shallow will be
+ * appropriately invalidated so that future operations reflect the new
+ * state.
+ */
+struct shallow_lock {
+	struct lock_file lock;
+};
+#define SHALLOW_LOCK_INIT { LOCK_INIT }
+
+/* commit $GIT_DIR/shallow and reset stat-validity checks */
+int commit_shallow_file(struct repository *r, struct shallow_lock *lk);
+/* rollback $GIT_DIR/shallow and reset stat-validity checks */
+void rollback_shallow_file(struct repository *r, struct shallow_lock *lk);
+
+struct commit_list *get_shallow_commits(struct object_array *heads,
+					int depth, int shallow_flag, int not_shallow_flag);
+struct commit_list *get_shallow_commits_by_rev_list(
+		int ac, const char **av, int shallow_flag, int not_shallow_flag);
+int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
+			  const struct oid_array *extra);
+
+void setup_alternate_shallow(struct shallow_lock *shallow_lock,
+			     const char **alternate_shallow_file,
+			     const struct oid_array *extra);
+
+const char *setup_temporary_shallow(const struct oid_array *extra);
+
+void advertise_shallow_grafts(int);
+
+#define PRUNE_SHOW_ONLY 1
+#define PRUNE_QUICK 2
+void prune_shallow(unsigned options);
+
+/*
+ * Initialize with prepare_shallow_info() or zero-initialize (equivalent to
+ * prepare_shallow_info with a NULL oid_array).
+ */
+struct shallow_info {
+	struct oid_array *shallow;
+	int *ours, nr_ours;
+	int *theirs, nr_theirs;
+	struct oid_array *ref;
+
+	/* for receive-pack */
+	uint32_t **used_shallow;
+	int *need_reachability_test;
+	int *reachable;
+	int *shallow_ref;
+	struct commit **commits;
+	int nr_commits;
+};
+
+void prepare_shallow_info(struct shallow_info *, struct oid_array *);
+void clear_shallow_info(struct shallow_info *);
+void remove_nonexistent_theirs_shallow(struct shallow_info *);
+void assign_shallow_commits_to_refs(struct shallow_info *info,
+				    uint32_t **used,
+				    int *ref_status);
+int delayed_reachability_test(struct shallow_info *si, int c);
+
+extern struct trace_key trace_shallow;
+
+#endif /* SHALLOW_H */
diff --git a/shell.c b/shell.c
index 40084a3013..811e13b9c9 100644
--- a/shell.c
+++ b/shell.c
@@ -4,6 +4,7 @@
 #include "strbuf.h"
 #include "run-command.h"
 #include "alias.h"
+#include "prompt.h"
 
 #define COMMAND_DIR "git-shell-commands"
 #define HELP_COMMAND COMMAND_DIR "/help"
@@ -16,10 +17,10 @@ static int do_generic_cmd(const char *me, char *arg)
 	setup_path();
 	if (!arg || !(arg = sq_dequote(arg)) || *arg == '-')
 		die("bad argument");
-	if (!starts_with(me, "git-"))
+	if (!skip_prefix(me, "git-", &me))
 		die("bad command");
 
-	my_argv[0] = me + 4;
+	my_argv[0] = me;
 	my_argv[1] = arg;
 	my_argv[2] = NULL;
 
@@ -76,12 +77,11 @@ static void run_shell(void)
 		int count;
 
 		fprintf(stderr, "git> ");
-		if (strbuf_getline_lf(&line, stdin) == EOF) {
+		if (git_read_line_interactively(&line) == EOF) {
 			fprintf(stderr, "\n");
 			strbuf_release(&line);
 			break;
 		}
-		strbuf_trim(&line);
 		rawargs = strbuf_detach(&line, NULL);
 		split_args = xstrdup(rawargs);
 		count = split_cmdline(split_args, &argv);
@@ -177,7 +177,7 @@ int cmd_main(int argc, const char **argv)
 		default:
 			continue;
 		}
-		exit(cmd->exec(cmd->name, arg));
+		return cmd->exec(cmd->name, arg);
 	}
 
 	cd_to_homedir();
diff --git a/shortlog.h b/shortlog.h
index 2fa61c4294..3f7e9aabca 100644
--- a/shortlog.h
+++ b/shortlog.h
@@ -15,9 +15,14 @@ struct shortlog {
 	int in2;
 	int user_format;
 	int abbrev;
-	int committer;
 
-	char *common_repo_prefix;
+	enum {
+		SHORTLOG_GROUP_AUTHOR = (1 << 0),
+		SHORTLOG_GROUP_COMMITTER = (1 << 1),
+		SHORTLOG_GROUP_TRAILER = (1 << 2),
+	} groups;
+	struct string_list trailers;
+
 	int email;
 	struct string_list mailmap;
 	FILE *file;
diff --git a/sideband.c b/sideband.c
index ef851113c4..85bddfdcd4 100644
--- a/sideband.c
+++ b/sideband.c
@@ -3,6 +3,7 @@
 #include "config.h"
 #include "sideband.h"
 #include "help.h"
+#include "pkt-line.h"
 
 struct keyword_entry {
 	/*
@@ -114,7 +115,8 @@ static void maybe_colorize_sideband(struct strbuf *dest, const char *src, int n)
 #define ANSI_SUFFIX "\033[K"
 #define DUMB_SUFFIX "        "
 
-int demultiplex_sideband(const char *me, char *buf, int len,
+int demultiplex_sideband(const char *me, int status,
+			 char *buf, int len,
 			 int die_on_error,
 			 struct strbuf *scratch,
 			 enum sideband_type *sideband_type)
@@ -130,24 +132,37 @@ int demultiplex_sideband(const char *me, char *buf, int len,
 			suffix = DUMB_SUFFIX;
 	}
 
-	if (len == 0) {
-		*sideband_type = SIDEBAND_FLUSH;
-		goto cleanup;
-	}
-	if (len < 1) {
+	if (status == PACKET_READ_EOF) {
 		strbuf_addf(scratch,
-			    "%s%s: protocol error: no band designator",
+			    "%s%s: unexpected disconnect while reading sideband packet",
 			    scratch->len ? "\n" : "", me);
 		*sideband_type = SIDEBAND_PROTOCOL_ERROR;
 		goto cleanup;
 	}
+
+	if (len < 0)
+		BUG("negative length on non-eof packet read");
+
+	if (len == 0) {
+		if (status == PACKET_READ_NORMAL) {
+			strbuf_addf(scratch,
+				    "%s%s: protocol error: missing sideband designator",
+				    scratch->len ? "\n" : "", me);
+			*sideband_type = SIDEBAND_PROTOCOL_ERROR;
+		} else {
+			/* covers flush, delim, etc */
+			*sideband_type = SIDEBAND_FLUSH;
+		}
+		goto cleanup;
+	}
+
 	band = buf[0] & 0xff;
 	buf[len] = '\0';
 	len--;
 	switch (band) {
 	case 3:
 		if (die_on_error)
-			die("remote error: %s", buf + 1);
+			die(_("remote error: %s"), buf + 1);
 		strbuf_addf(scratch, "%s%s", scratch->len ? "\n" : "",
 			    DISPLAY_PREFIX);
 		maybe_colorize_sideband(scratch, buf + 1, len);
@@ -168,8 +183,31 @@ int demultiplex_sideband(const char *me, char *buf, int len,
 		while ((brk = strpbrk(b, "\n\r"))) {
 			int linelen = brk - b;
 
+			/*
+			 * For message accross packet boundary, there would have
+			 * a nonempty "scratch" buffer from last call of this
+			 * function, and there may have a leading CR/LF in "buf".
+			 * For this case we should add a clear-to-eol suffix to
+			 * clean leftover letters we previously have written on
+			 * the same line.
+			 */
+			if (scratch->len && !linelen)
+				strbuf_addstr(scratch, suffix);
+
 			if (!scratch->len)
 				strbuf_addstr(scratch, DISPLAY_PREFIX);
+
+			/*
+			 * A use case that we should not add clear-to-eol suffix
+			 * to empty lines:
+			 *
+			 * For progress reporting we may receive a bunch of
+			 * percentage updates followed by '\r' to remain on the
+			 * same line, and at the end receive a single '\n' to
+			 * move to the next line. We should preserve the final
+			 * status report line by not appending clear-to-eol
+			 * suffix to this single line break.
+			 */
 			if (linelen > 0) {
 				maybe_colorize_sideband(scratch, b, linelen);
 				strbuf_addstr(scratch, suffix);
@@ -190,7 +228,7 @@ int demultiplex_sideband(const char *me, char *buf, int len,
 		return 0;
 	case 1:
 		*sideband_type = SIDEBAND_PRIMARY;
-		break;
+		return 1;
 	default:
 		strbuf_addf(scratch, "%s%s: protocol error: bad band #%d",
 			    scratch->len ? "\n" : "", me, band);
diff --git a/sideband.h b/sideband.h
index 227740a58e..5a25331be5 100644
--- a/sideband.h
+++ b/sideband.h
@@ -18,8 +18,12 @@ enum sideband_type {
  *
  * scratch must be a struct strbuf allocated by the caller. It is used to store
  * progress messages split across multiple packets.
+ *
+ * The "status" parameter is a pkt-line response as returned by
+ * packet_read_with_status() (e.g., PACKET_READ_NORMAL).
  */
-int demultiplex_sideband(const char *me, char *buf, int len,
+int demultiplex_sideband(const char *me, int status,
+			 char *buf, int len,
 			 int die_on_error,
 			 struct strbuf *scratch,
 			 enum sideband_type *sideband_type);
diff --git a/sigchain.h b/sigchain.h
index 138b20f54b..8e6bada892 100644
--- a/sigchain.h
+++ b/sigchain.h
@@ -1,12 +1,57 @@
 #ifndef SIGCHAIN_H
 #define SIGCHAIN_H
 
+/**
+ * Code often wants to set a signal handler to clean up temporary files or
+ * other work-in-progress when we die unexpectedly. For multiple pieces of
+ * code to do this without conflicting, each piece of code must remember
+ * the old value of the handler and restore it either when:
+ *
+ *   1. The work-in-progress is finished, and the handler is no longer
+ *      necessary. The handler should revert to the original behavior
+ *      (either another handler, SIG_DFL, or SIG_IGN).
+ *
+ *   2. The signal is received. We should then do our cleanup, then chain
+ *      to the next handler (or die if it is SIG_DFL).
+ *
+ * Sigchain is a tiny library for keeping a stack of handlers. Your handler
+ * and installation code should look something like:
+ *
+ * ------------------------------------------
+ *   void clean_foo_on_signal(int sig)
+ *   {
+ * 	  clean_foo();
+ * 	  sigchain_pop(sig);
+ * 	  raise(sig);
+ *   }
+ *
+ *   void other_func()
+ *   {
+ * 	  sigchain_push_common(clean_foo_on_signal);
+ * 	  mess_up_foo();
+ * 	  clean_foo();
+ *   }
+ * ------------------------------------------
+ *
+ */
+
+/**
+ * Handlers are given the typedef of sigchain_fun. This is the same type
+ * that is given to signal() or sigaction(). It is perfectly reasonable to
+ * push SIG_DFL or SIG_IGN onto the stack.
+ */
 typedef void (*sigchain_fun)(int);
 
+/* You can sigchain_push and sigchain_pop individual signals. */
 int sigchain_push(int sig, sigchain_fun f);
 int sigchain_pop(int sig);
 
+/**
+ * push the handler onto the stack for the common signals:
+ * SIGINT, SIGHUP, SIGTERM, SIGQUIT and SIGPIPE.
+ */
 void sigchain_push_common(sigchain_fun f);
+
 void sigchain_pop_common(void);
 
 #endif /* SIGCHAIN_H */
diff --git a/simple-ipc.h b/simple-ipc.h
new file mode 100644
index 0000000000..2c48a5ee00
--- /dev/null
+++ b/simple-ipc.h
@@ -0,0 +1,235 @@
+#ifndef GIT_SIMPLE_IPC_H
+#define GIT_SIMPLE_IPC_H
+
+/*
+ * 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.
+	 */
+	IPC_STATE__LISTENING = 0,
+
+	/*
+	 * The pipe/socket exists, but the daemon is not listening.
+	 * Perhaps it is very busy.
+	 * Perhaps the daemon died without deleting the path.
+	 * Perhaps it is shutting down and draining existing clients.
+	 * Perhaps it is dead, but other clients are lingering and
+	 * still holding a reference to the pathname.
+	 */
+	IPC_STATE__NOT_LISTENING,
+
+	/*
+	 * The requested pathname is bogus and no amount of retries
+	 * will fix that.
+	 */
+	IPC_STATE__INVALID_PATH,
+
+	/*
+	 * The requested pathname is not found.  This usually means
+	 * that there is no daemon present.
+	 */
+	IPC_STATE__PATH_NOT_FOUND,
+
+	IPC_STATE__OTHER_ERROR,
+};
+
+struct ipc_client_connect_options {
+	/*
+	 * Spin under timeout if the server is running but can't
+	 * accept our connection yet.  This should always be set
+	 * unless you just want to poke the server and see if it
+	 * is alive.
+	 */
+	unsigned int wait_if_busy:1;
+
+	/*
+	 * Spin under timeout if the pipe/socket is not yet present
+	 * on the file system.  This is useful if we just started
+	 * the service and need to wait for it to become ready.
+	 */
+	unsigned int wait_if_not_found:1;
+
+	/*
+	 * Disallow chdir() when creating a Unix domain socket.
+	 */
+	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, \
+}
+
+/*
+ * Determine if a server is listening on this named pipe or socket using
+ * platform-specific logic.  This might just probe the filesystem or it
+ * might make a trivial connection to the server using this pathname.
+ */
+enum ipc_active_state ipc_get_active_state(const char *path);
+
+struct ipc_client_connection {
+	int fd;
+};
+
+/*
+ * Try to connect to the daemon on the named pipe or socket.
+ *
+ * Returns IPC_STATE__LISTENING and a connection handle.
+ *
+ * Otherwise, returns info to help decide whether to retry or to
+ * spawn/respawn the server.
+ */
+enum ipc_active_state ipc_client_try_connect(
+	const char *path,
+	const struct ipc_client_connect_options *options,
+	struct ipc_client_connection **p_connection);
+
+void ipc_client_close_connection(struct ipc_client_connection *connection);
+
+/*
+ * Used by the client to synchronously send and receive a message with
+ * the server on the provided client connection.
+ *
+ * Returns 0 when successful.
+ *
+ * Calls error() and returns non-zero otherwise.
+ */
+int ipc_client_send_command_to_connection(
+	struct ipc_client_connection *connection,
+	const char *message, struct strbuf *answer);
+
+/*
+ * Used by the client to synchronously connect and send and receive a
+ * message to the server listening at the given path.
+ *
+ * Returns 0 when successful.
+ *
+ * Calls error() and returns non-zero otherwise.
+ */
+int ipc_client_send_command(const char *path,
+			    const struct ipc_client_connect_options *options,
+			    const char *message, struct strbuf *answer);
+
+/*
+ * Simple IPC Server Side API.
+ */
+
+struct ipc_server_reply_data;
+
+typedef int (ipc_server_reply_cb)(struct ipc_server_reply_data *,
+				  const char *response,
+				  size_t response_len);
+
+/*
+ * Prototype for an application-supplied callback to process incoming
+ * client IPC messages and compose a reply.  The `application_cb` should
+ * use the provided `reply_cb` and `reply_data` to send an IPC response
+ * back to the client.  The `reply_cb` callback can be called multiple
+ * times for chunking purposes.  A reply message is optional and may be
+ * omitted if not necessary for the application.
+ *
+ * The return value from the application callback is ignored.
+ * The value `SIMPLE_IPC_QUIT` can be used to shutdown the server.
+ */
+typedef int (ipc_server_application_cb)(void *application_data,
+					const char *request,
+					ipc_server_reply_cb *reply_cb,
+					struct ipc_server_reply_data *reply_data);
+
+#define SIMPLE_IPC_QUIT -2
+
+/*
+ * Opaque instance data to represent an IPC server instance.
+ */
+struct ipc_server_data;
+
+/*
+ * Control parameters for the IPC server instance.
+ * Use this to hide platform-specific settings.
+ */
+struct ipc_server_opts
+{
+	int nr_threads;
+
+	/*
+	 * Disallow chdir() when creating a Unix domain socket.
+	 */
+	unsigned int uds_disallow_chdir:1;
+};
+
+/*
+ * Start an IPC server instance in one or more background threads
+ * and return a handle to the pool.
+ *
+ * Returns 0 if the asynchronous server pool was started successfully.
+ * Returns -1 if not.
+ * Returns -2 if we could not startup because another server is using
+ * the socket or named pipe.
+ *
+ * When a client IPC message is received, the `application_cb` will be
+ * called (possibly on a random thread) to handle the message and
+ * optionally compose a reply message.
+ */
+int ipc_server_run_async(struct ipc_server_data **returned_server_data,
+			 const char *path, const struct ipc_server_opts *opts,
+			 ipc_server_application_cb *application_cb,
+			 void *application_data);
+
+/*
+ * Gently signal the IPC server pool to shutdown.  No new client
+ * connections will be accepted, but existing connections will be
+ * allowed to complete.
+ */
+int ipc_server_stop_async(struct ipc_server_data *server_data);
+
+/*
+ * Block the calling thread until all threads in the IPC server pool
+ * have completed and been joined.
+ */
+int ipc_server_await(struct ipc_server_data *server_data);
+
+/*
+ * Close and free all resource handles associated with the IPC server
+ * pool.
+ */
+void ipc_server_free(struct ipc_server_data *server_data);
+
+/*
+ * Run an IPC server instance and block the calling thread of the
+ * current process.  It does not return until the IPC server has
+ * either shutdown or had an unrecoverable error.
+ *
+ * The IPC server handles incoming IPC messages from client processes
+ * and may use one or more background threads as necessary.
+ *
+ * Returns 0 after the server has completed successfully.
+ * Returns -1 if the server cannot be started.
+ * Returns -2 if we could not startup because another server is using
+ * the socket or named pipe.
+ *
+ * When a client IPC message is received, the `application_cb` will be
+ * called (possibly on a random thread) to handle the message and
+ * optionally compose a reply message.
+ *
+ * Note that `ipc_server_run()` is a synchronous wrapper around the
+ * above asynchronous routines.  It effectively hides all of the
+ * server state and thread details from the caller and presents a
+ * simple synchronous interface.
+ */
+int ipc_server_run(const char *path, const struct ipc_server_opts *opts,
+		   ipc_server_application_cb *application_cb,
+		   void *application_data);
+
+#endif /* SUPPORTS_SIMPLE_IPC */
+#endif /* GIT_SIMPLE_IPC_H */
diff --git a/sparse-index.c b/sparse-index.c
new file mode 100644
index 0000000000..c6b4feec41
--- /dev/null
+++ b/sparse-index.c
@@ -0,0 +1,376 @@
+#include "cache.h"
+#include "repository.h"
+#include "sparse-index.h"
+#include "tree.h"
+#include "pathspec.h"
+#include "trace2.h"
+#include "cache-tree.h"
+#include "config.h"
+#include "dir.h"
+#include "fsmonitor.h"
+
+static struct cache_entry *construct_sparse_dir_entry(
+				struct index_state *istate,
+				const char *sparse_dir,
+				struct cache_tree *tree)
+{
+	struct cache_entry *de;
+
+	de = make_cache_entry(istate, S_IFDIR, &tree->oid, sparse_dir, 0, 0);
+
+	de->ce_flags |= CE_SKIP_WORKTREE;
+	return de;
+}
+
+/*
+ * Returns the number of entries "inserted" into the index.
+ */
+static int convert_to_sparse_rec(struct index_state *istate,
+				 int num_converted,
+				 int start, int end,
+				 const char *ct_path, size_t ct_pathlen,
+				 struct cache_tree *ct)
+{
+	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)
+		can_convert = 0;
+
+	for (i = start; can_convert && i < end; i++) {
+		struct cache_entry *ce = istate->cache[i];
+
+		if (ce_stage(ce) ||
+		    S_ISGITLINK(ce->ce_mode) ||
+		    !(ce->ce_flags & CE_SKIP_WORKTREE))
+			can_convert = 0;
+	}
+
+	if (can_convert) {
+		struct cache_entry *se;
+		se = construct_sparse_dir_entry(istate, ct_path, ct);
+
+		istate->cache[num_converted++] = se;
+		return 1;
+	}
+
+	for (i = start; i < end; ) {
+		int count, span, pos = -1;
+		const char *base, *slash;
+		struct cache_entry *ce = istate->cache[i];
+
+		/*
+		 * Detect if this is a normal entry outside of any subtree
+		 * entry.
+		 */
+		base = ce->name + ct_pathlen;
+		slash = strchr(base, '/');
+
+		if (slash)
+			pos = cache_tree_subtree_pos(ct, base, slash - base);
+
+		if (pos < 0) {
+			istate->cache[num_converted++] = ce;
+			i++;
+			continue;
+		}
+
+		strbuf_setlen(&child_path, 0);
+		strbuf_add(&child_path, ce->name, slash - ce->name + 1);
+
+		span = ct->down[pos]->cache_tree->entry_count;
+		count = convert_to_sparse_rec(istate,
+					      num_converted, i, i + span,
+					      child_path.buf, child_path.len,
+					      ct->down[pos]->cache_tree);
+		num_converted += count;
+		i += span;
+	}
+
+	strbuf_release(&child_path);
+	return num_converted - start_converted;
+}
+
+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);
+
+	prepare_repo_settings(repo);
+	repo->settings.sparse_index = enable;
+	return res;
+}
+
+static int index_has_unmerged_entries(struct index_state *istate)
+{
+	int i;
+	for (i = 0; i < istate->cache_nr; i++) {
+		if (ce_stage(istate->cache[i]))
+			return 1;
+	}
+
+	return 0;
+}
+
+int convert_to_sparse(struct index_state *istate)
+{
+	int test_env;
+	if (istate->split_index || istate->sparse_index ||
+	    !core_apply_sparse_checkout || !core_sparse_checkout_cone)
+		return 0;
+
+	if (!istate->repo)
+		istate->repo = the_repository;
+
+	/*
+	 * 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 (!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;
+	}
+
+	if (!istate->sparse_checkout_patterns->use_cone_patterns) {
+		warning(_("attempting to use sparse-index without cone mode"));
+		return -1;
+	}
+
+	/*
+	 * 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;
+
+	/* 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;
+	}
+
+	remove_fsmonitor(istate);
+
+	trace2_region_enter("index", "convert_to_sparse", istate->repo);
+	istate->cache_nr = convert_to_sparse_rec(istate,
+						 0, 0, istate->cache_nr,
+						 "", 0, istate->cache_tree);
+
+	/* Clear and recompute the cache-tree */
+	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;
+}
+
+static void set_index_entry(struct index_state *istate, int nr, struct cache_entry *ce)
+{
+	ALLOC_GROW(istate->cache, nr + 1, istate->cache_alloc);
+
+	istate->cache[nr] = ce;
+	add_name_hash(istate, ce);
+}
+
+static int add_path_to_index(const struct object_id *oid,
+			     struct strbuf *base, const char *path,
+			     unsigned int mode, void *context)
+{
+	struct index_state *istate = (struct index_state *)context;
+	struct cache_entry *ce;
+	size_t len = base->len;
+
+	if (S_ISDIR(mode))
+		return READ_TREE_RECURSIVE;
+
+	strbuf_addstr(base, path);
+
+	ce = make_cache_entry(istate, mode, oid, base->buf, 0, 0);
+	ce->ce_flags |= CE_SKIP_WORKTREE | CE_EXTENDED;
+	set_index_entry(istate, istate->cache_nr++, ce);
+
+	strbuf_setlen(base, len);
+	return 0;
+}
+
+void ensure_full_index(struct index_state *istate)
+{
+	int i;
+	struct index_state *full;
+	struct strbuf base = STRBUF_INIT;
+
+	if (!istate || !istate->sparse_index)
+		return;
+
+	if (!istate->repo)
+		istate->repo = the_repository;
+
+	trace2_region_enter("index", "ensure_full_index", istate->repo);
+
+	/* initialize basics of new index */
+	full = xcalloc(1, sizeof(struct index_state));
+	memcpy(full, istate, sizeof(struct index_state));
+
+	/* then change the necessary things */
+	full->sparse_index = 0;
+	full->cache_alloc = (3 * istate->cache_alloc) / 2;
+	full->cache_nr = 0;
+	ALLOC_ARRAY(full->cache, full->cache_alloc);
+
+	for (i = 0; i < istate->cache_nr; i++) {
+		struct cache_entry *ce = istate->cache[i];
+		struct tree *tree;
+		struct pathspec ps;
+
+		if (!S_ISSPARSEDIR(ce->ce_mode)) {
+			set_index_entry(full, full->cache_nr++, ce);
+			continue;
+		}
+		if (!(ce->ce_flags & CE_SKIP_WORKTREE))
+			warning(_("index entry is a directory, but not sparse (%08x)"),
+				ce->ce_flags);
+
+		/* recursively walk into cd->name */
+		tree = lookup_tree(istate->repo, &ce->oid);
+
+		memset(&ps, 0, sizeof(ps));
+		ps.recursive = 1;
+		ps.has_wildcard = 1;
+		ps.max_depth = -1;
+
+		strbuf_setlen(&base, 0);
+		strbuf_add(&base, ce->name, strlen(ce->name));
+
+		read_tree_at(istate->repo, tree, &base, &ps,
+			     add_path_to_index, full);
+
+		/* free directory entries. full entries are re-used */
+		discard_cache_entry(ce);
+	}
+
+	/* Copy back into original index. */
+	memcpy(&istate->name_hash, &full->name_hash, sizeof(full->name_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);
+
+	/* Clear and recompute the cache-tree */
+	cache_tree_free(&istate->cache_tree);
+	cache_tree_update(istate, 0);
+
+	trace2_region_leave("index", "ensure_full_index", istate->repo);
+}
+
+/*
+ * This static global helps avoid infinite recursion between
+ * expand_to_path() and index_file_exists().
+ */
+static int in_expand_to_path = 0;
+
+void expand_to_path(struct index_state *istate,
+		    const char *path, size_t pathlen, int icase)
+{
+	struct strbuf path_mutable = STRBUF_INIT;
+	size_t substr_len;
+
+	/* prevent extra recursion */
+	if (in_expand_to_path)
+		return;
+
+	if (!istate || !istate->sparse_index)
+		return;
+
+	if (!istate->repo)
+		istate->repo = the_repository;
+
+	in_expand_to_path = 1;
+
+	/*
+	 * We only need to actually expand a region if the
+	 * following are both true:
+	 *
+	 * 1. 'path' is not already in the index.
+	 * 2. Some parent directory of 'path' is a sparse directory.
+	 */
+
+	if (index_file_exists(istate, path, pathlen, icase))
+		goto cleanup;
+
+	strbuf_add(&path_mutable, path, pathlen);
+	strbuf_addch(&path_mutable, '/');
+
+	/* Check the name hash for all parent directories */
+	substr_len = 0;
+	while (substr_len < pathlen) {
+		char temp;
+		char *replace = strchr(path_mutable.buf + substr_len, '/');
+
+		if (!replace)
+			break;
+
+		/* replace the character _after_ the slash */
+		replace++;
+		temp = *replace;
+		*replace = '\0';
+		if (index_file_exists(istate, path_mutable.buf,
+				      path_mutable.len, icase)) {
+			/*
+			 * We found a parent directory in the name-hash
+			 * hashtable, because only sparse directory entries
+			 * have a trailing '/' character.  Since "path" wasn't
+			 * in the index, perhaps it exists within this
+			 * sparse-directory.  Expand accordingly.
+			 */
+			ensure_full_index(istate);
+			break;
+		}
+
+		*replace = temp;
+		substr_len = replace - path_mutable.buf;
+	}
+
+cleanup:
+	strbuf_release(&path_mutable);
+	in_expand_to_path = 0;
+}
diff --git a/sparse-index.h b/sparse-index.h
new file mode 100644
index 0000000000..1115a0d7dd
--- /dev/null
+++ b/sparse-index.h
@@ -0,0 +1,23 @@
+#ifndef SPARSE_INDEX_H__
+#define SPARSE_INDEX_H__
+
+struct index_state;
+int convert_to_sparse(struct index_state *istate);
+
+/*
+ * Some places in the codebase expect to search for a specific path.
+ * This path might be outside of the sparse-checkout definition, in
+ * which case a sparse-index may not contain a path for that index.
+ *
+ * Given an index and a path, check to see if a leading directory for
+ * 'path' exists in the index as a sparse directory. In that case,
+ * expand that sparse directory to a full range of cache entries and
+ * populate the index accordingly.
+ */
+void expand_to_path(struct index_state *istate,
+		    const char *path, size_t pathlen, int icase);
+
+struct repository;
+int set_sparse_index_config(struct repository *repo, int enable);
+
+#endif
diff --git a/split-index.c b/split-index.c
index e6154e4ea9..8e52e891c3 100644
--- a/split-index.c
+++ b/split-index.c
@@ -5,7 +5,7 @@
 struct split_index *init_split_index(struct index_state *istate)
 {
 	if (!istate->split_index) {
-		istate->split_index = xcalloc(1, sizeof(*istate->split_index));
+		CALLOC_ARRAY(istate->split_index, 1);
 		istate->split_index->refcount = 1;
 	}
 	return istate->split_index;
@@ -21,7 +21,7 @@ int read_link_extension(struct index_state *istate,
 	if (sz < the_hash_algo->rawsz)
 		return error("corrupt link extension (too short)");
 	si = init_split_index(istate);
-	hashcpy(si->base_oid.hash, data);
+	oidread(&si->base_oid, data);
 	data += the_hash_algo->rawsz;
 	sz -= the_hash_algo->rawsz;
 	if (!sz)
@@ -79,13 +79,15 @@ void move_cache_to_base_index(struct index_state *istate)
 	if (si->base &&
 		si->base->ce_mem_pool) {
 
-		if (!istate->ce_mem_pool)
-			mem_pool_init(&istate->ce_mem_pool, 0);
+		if (!istate->ce_mem_pool) {
+			istate->ce_mem_pool = xmalloc(sizeof(struct mem_pool));
+			mem_pool_init(istate->ce_mem_pool, 0);
+		}
 
 		mem_pool_combine(istate->ce_mem_pool, istate->split_index->base->ce_mem_pool);
 	}
 
-	si->base = xcalloc(1, sizeof(*si->base));
+	CALLOC_ARRAY(si->base, 1);
 	si->base->version = istate->version;
 	/* zero timestamp disables racy test in ce_write_index() */
 	si->base->timestamp = istate->timestamp;
@@ -205,7 +207,8 @@ static int compare_ce_content(struct cache_entry *a, struct cache_entry *b)
 	b->ce_flags &= ondisk_flags;
 	ret = memcmp(&a->ce_stat_data, &b->ce_stat_data,
 		     offsetof(struct cache_entry, name) -
-		     offsetof(struct cache_entry, ce_stat_data));
+		     offsetof(struct cache_entry, oid)) ||
+		!oideq(&a->oid, &b->oid);
 	a->ce_flags = ce_flags;
 	b->ce_flags = base_flags;
 
diff --git a/strbuf.c b/strbuf.c
index aa48d179a9..c8a5789694 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -52,8 +52,8 @@ char strbuf_slopbuf[1];
 
 void strbuf_init(struct strbuf *sb, size_t hint)
 {
-	sb->alloc = sb->len = 0;
-	sb->buf = strbuf_slopbuf;
+	struct strbuf blank = STRBUF_INIT;
+	memcpy(sb, &blank, sizeof(*sb));
 	if (hint)
 		strbuf_grow(sb, hint);
 }
@@ -209,6 +209,8 @@ void strbuf_list_free(struct strbuf **sbs)
 {
 	struct strbuf **s = sbs;
 
+	if (!s)
+		return;
 	while (*s) {
 		strbuf_release(*s);
 		free(*s++);
@@ -479,6 +481,23 @@ void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src)
 	}
 }
 
+#define URL_UNSAFE_CHARS " <>\"%{}|\\^`:?#[]@!$&'()*+,;="
+
+void strbuf_add_percentencode(struct strbuf *dst, const char *src, int flags)
+{
+	size_t i, len = strlen(src);
+
+	for (i = 0; i < len; i++) {
+		unsigned char ch = src[i];
+		if (ch <= 0x1F || ch >= 0x7F ||
+		    (ch == '/' && (flags & STRBUF_ENCODE_SLASH)) ||
+		    strchr(URL_UNSAFE_CHARS, ch))
+			strbuf_addf(dst, "%%%02X", (unsigned char)ch);
+		else
+			strbuf_addch(dst, ch);
+	}
+}
+
 size_t strbuf_fread(struct strbuf *sb, size_t size, FILE *f)
 {
 	size_t res;
@@ -539,7 +558,6 @@ ssize_t strbuf_write(struct strbuf *sb, FILE *f)
 	return sb->len ? fwrite(sb->buf, 1, sb->len, f) : 0;
 }
 
-
 #define STRBUF_MAXLINK (2*PATH_MAX)
 
 int strbuf_readlink(struct strbuf *sb, const char *path, size_t hint)
@@ -675,6 +693,16 @@ int strbuf_getwholeline(struct strbuf *sb, FILE *fp, int term)
 }
 #endif
 
+int strbuf_appendwholeline(struct strbuf *sb, FILE *fp, int term)
+{
+	struct strbuf line = STRBUF_INIT;
+	if (strbuf_getwholeline(&line, fp, term))
+		return EOF;
+	strbuf_addbuf(sb, &line);
+	strbuf_release(&line);
+	return 0;
+}
+
 static int strbuf_getdelim(struct strbuf *sb, FILE *fp, int term)
 {
 	if (strbuf_getwholeline(sb, fp, term))
@@ -1125,3 +1153,31 @@ int strbuf_normalize_path(struct strbuf *src)
 	strbuf_release(&dst);
 	return 0;
 }
+
+int strbuf_edit_interactively(struct strbuf *buffer, const char *path,
+			      const char *const *env)
+{
+	char *path2 = NULL;
+	int fd, res = 0;
+
+	if (!is_absolute_path(path))
+		path = path2 = xstrdup(git_path("%s", path));
+
+	fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
+	if (fd < 0)
+		res = error_errno(_("could not open '%s' for writing"), path);
+	else if (write_in_full(fd, buffer->buf, buffer->len) < 0) {
+		res = error_errno(_("could not write to '%s'"), path);
+		close(fd);
+	} else if (close(fd) < 0)
+		res = error_errno(_("could not close '%s'"), path);
+	else {
+		strbuf_reset(buffer);
+		if (launch_editor(path, buffer, env) < 0)
+			res = error_errno(_("could not edit '%s'"), path);
+		unlink(path);
+	}
+
+	free(path2);
+	return res;
+}
diff --git a/strbuf.h b/strbuf.h
index 84cf969721..5b1113abf8 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -245,12 +245,25 @@ void strbuf_addchars(struct strbuf *sb, int c, size_t n);
 void strbuf_insert(struct strbuf *sb, size_t pos, const void *, size_t);
 
 /**
+ * Insert a NUL-terminated string to the given position of the buffer.
+ * The remaining contents will be shifted, not overwritten.  It's an
+ * inline function to allow the compiler to resolve strlen() calls on
+ * constants at compile time.
+ */
+static inline void strbuf_insertstr(struct strbuf *sb, size_t pos,
+				    const char *s)
+{
+	strbuf_insert(sb, pos, s, strlen(s));
+}
+
+/**
  * Insert data to the given position of the buffer giving a printf format
  * string. The contents will be shifted, not overwritten.
  */
 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, ...);
 
 /**
@@ -325,8 +338,8 @@ const char *strbuf_join_argv(struct strbuf *buf, int argc,
  * placeholder is unknown, then the percent sign is copied, too.
  *
  * In order to facilitate caching and to make it possible to give
- * parameters to the callback, `strbuf_expand()` passes a context pointer,
- * which can be used by the programmer of the callback as she sees fit.
+ * parameters to the callback, `strbuf_expand()` passes a context
+ * pointer with any kind of data.
  */
 typedef size_t (*expand_fn_t) (struct strbuf *sb,
 			       const char *placeholder,
@@ -366,6 +379,17 @@ size_t strbuf_expand_dict_cb(struct strbuf *sb,
  */
 void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf *src);
 
+#define STRBUF_ENCODE_SLASH 1
+
+/**
+ * Append the contents of a string to a strbuf, percent-encoding any characters
+ * that are needed to be encoded for a URL.
+ *
+ * If STRBUF_ENCODE_SLASH is set in flags, percent-encode slashes.  Otherwise,
+ * slashes are not percent-encoded.
+ */
+void strbuf_add_percentencode(struct strbuf *dst, const char *src, int flags);
+
 /**
  * Append the given byte size as a human-readable string (i.e. 12.23 KiB,
  * 3.50 MiB).
@@ -485,6 +509,12 @@ int strbuf_getline(struct strbuf *sb, FILE *file);
 int strbuf_getwholeline(struct strbuf *sb, FILE *file, int term);
 
 /**
+ * Like `strbuf_getwholeline`, but appends the line instead of
+ * resetting the buffer first.
+ */
+int strbuf_appendwholeline(struct strbuf *sb, FILE *file, int term);
+
+/**
  * Like `strbuf_getwholeline`, but operates on a file descriptor.
  * It reads one character at a time, so it is very slow.  Do not
  * use it unless you need the correct position in the file
@@ -621,6 +651,17 @@ int launch_editor(const char *path, struct strbuf *buffer,
 int launch_sequence_editor(const char *path, struct strbuf *buffer,
 			   const char *const *env);
 
+/*
+ * In contrast to `launch_editor()`, this function writes out the contents
+ * of the specified file first, then clears the `buffer`, then launches
+ * the editor and reads back in the file contents into the `buffer`.
+ * Finally, it deletes the temporary file.
+ *
+ * If `path` is relative, it refers to a file in the `.git` directory.
+ */
+int strbuf_edit_interactively(struct strbuf *buffer, const char *path,
+			      const char *const *env);
+
 void strbuf_add_lines(struct strbuf *sb,
 		      const char *prefix,
 		      const char *buf,
diff --git a/streaming.c b/streaming.c
index fcd6303219..5f480ad50c 100644
--- a/streaming.c
+++ b/streaming.c
@@ -8,53 +8,13 @@
 #include "replace-object.h"
 #include "packfile.h"
 
-enum input_source {
-	stream_error = -1,
-	incore = 0,
-	loose = 1,
-	pack_non_delta = 2
-};
-
 typedef int (*open_istream_fn)(struct git_istream *,
-			       struct object_info *,
+			       struct repository *,
 			       const struct object_id *,
 			       enum object_type *);
 typedef int (*close_istream_fn)(struct git_istream *);
 typedef ssize_t (*read_istream_fn)(struct git_istream *, char *, size_t);
 
-struct stream_vtbl {
-	close_istream_fn close;
-	read_istream_fn read;
-};
-
-#define open_method_decl(name) \
-	int open_istream_ ##name \
-	(struct git_istream *st, struct object_info *oi, \
-	 const struct object_id *oid, \
-	 enum object_type *type)
-
-#define close_method_decl(name) \
-	int close_istream_ ##name \
-	(struct git_istream *st)
-
-#define read_method_decl(name) \
-	ssize_t read_istream_ ##name \
-	(struct git_istream *st, char *buf, size_t sz)
-
-/* forward declaration */
-static open_method_decl(incore);
-static open_method_decl(loose);
-static open_method_decl(pack_non_delta);
-static struct git_istream *attach_stream_filter(struct git_istream *st,
-						struct stream_filter *filter);
-
-
-static open_istream_fn open_istream_tbl[] = {
-	open_istream_incore,
-	open_istream_loose,
-	open_istream_pack_non_delta,
-};
-
 #define FILTER_BUFFER (1024*16)
 
 struct filtered_istream {
@@ -68,7 +28,10 @@ struct filtered_istream {
 };
 
 struct git_istream {
-	const struct stream_vtbl *vtbl;
+	open_istream_fn open;
+	close_istream_fn close;
+	read_istream_fn read;
+
 	unsigned long size; /* inflated size of full object */
 	git_zstream z;
 	enum { z_unused, z_used, z_done, z_error } z_state;
@@ -96,78 +59,6 @@ struct git_istream {
 	} u;
 };
 
-int close_istream(struct git_istream *st)
-{
-	int r = st->vtbl->close(st);
-	free(st);
-	return r;
-}
-
-ssize_t read_istream(struct git_istream *st, void *buf, size_t sz)
-{
-	return st->vtbl->read(st, buf, sz);
-}
-
-static enum input_source istream_source(const struct object_id *oid,
-					enum object_type *type,
-					struct object_info *oi)
-{
-	unsigned long size;
-	int status;
-
-	oi->typep = type;
-	oi->sizep = &size;
-	status = oid_object_info_extended(the_repository, oid, oi, 0);
-	if (status < 0)
-		return stream_error;
-
-	switch (oi->whence) {
-	case OI_LOOSE:
-		return loose;
-	case OI_PACKED:
-		if (!oi->u.packed.is_delta && big_file_threshold < size)
-			return pack_non_delta;
-		/* fallthru */
-	default:
-		return incore;
-	}
-}
-
-struct git_istream *open_istream(const struct object_id *oid,
-				 enum object_type *type,
-				 unsigned long *size,
-				 struct stream_filter *filter)
-{
-	struct git_istream *st;
-	struct object_info oi = OBJECT_INFO_INIT;
-	const struct object_id *real = lookup_replace_object(the_repository, oid);
-	enum input_source src = istream_source(real, type, &oi);
-
-	if (src < 0)
-		return NULL;
-
-	st = xmalloc(sizeof(*st));
-	if (open_istream_tbl[src](st, &oi, real, type)) {
-		if (open_istream_incore(st, &oi, real, type)) {
-			free(st);
-			return NULL;
-		}
-	}
-	if (filter) {
-		/* Add "&& !is_null_stream_filter(filter)" for performance */
-		struct git_istream *nst = attach_stream_filter(st, filter);
-		if (!nst) {
-			close_istream(st);
-			return NULL;
-		}
-		st = nst;
-	}
-
-	*size = st->size;
-	return st;
-}
-
-
 /*****************************************************************
  *
  * Common helpers
@@ -187,13 +78,14 @@ static void close_deflated_stream(struct git_istream *st)
  *
  *****************************************************************/
 
-static close_method_decl(filtered)
+static int close_istream_filtered(struct git_istream *st)
 {
 	free_stream_filter(st->u.filtered.filter);
 	return close_istream(st->u.filtered.upstream);
 }
 
-static read_method_decl(filtered)
+static ssize_t read_istream_filtered(struct git_istream *st, char *buf,
+				     size_t sz)
 {
 	struct filtered_istream *fs = &(st->u.filtered);
 	size_t filled = 0;
@@ -252,18 +144,14 @@ static read_method_decl(filtered)
 	return filled;
 }
 
-static struct stream_vtbl filtered_vtbl = {
-	close_istream_filtered,
-	read_istream_filtered,
-};
-
 static struct git_istream *attach_stream_filter(struct git_istream *st,
 						struct stream_filter *filter)
 {
 	struct git_istream *ifs = xmalloc(sizeof(*ifs));
 	struct filtered_istream *fs = &(ifs->u.filtered);
 
-	ifs->vtbl = &filtered_vtbl;
+	ifs->close = close_istream_filtered;
+	ifs->read = read_istream_filtered;
 	fs->upstream = st;
 	fs->filter = filter;
 	fs->i_end = fs->i_ptr = 0;
@@ -279,7 +167,7 @@ static struct git_istream *attach_stream_filter(struct git_istream *st,
  *
  *****************************************************************/
 
-static read_method_decl(loose)
+static ssize_t read_istream_loose(struct git_istream *st, char *buf, size_t sz)
 {
 	size_t total_read = 0;
 
@@ -324,22 +212,18 @@ static read_method_decl(loose)
 	return total_read;
 }
 
-static close_method_decl(loose)
+static int close_istream_loose(struct git_istream *st)
 {
 	close_deflated_stream(st);
 	munmap(st->u.loose.mapped, st->u.loose.mapsize);
 	return 0;
 }
 
-static struct stream_vtbl loose_vtbl = {
-	close_istream_loose,
-	read_istream_loose,
-};
-
-static open_method_decl(loose)
+static int open_istream_loose(struct git_istream *st, struct repository *r,
+			      const struct object_id *oid,
+			      enum object_type *type)
 {
-	st->u.loose.mapped = map_loose_object(the_repository,
-					      oid, &st->u.loose.mapsize);
+	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,
@@ -356,8 +240,9 @@ static open_method_decl(loose)
 	st->u.loose.hdr_used = strlen(st->u.loose.hdr) + 1;
 	st->u.loose.hdr_avail = st->z.total_out;
 	st->z_state = z_used;
+	st->close = close_istream_loose;
+	st->read = read_istream_loose;
 
-	st->vtbl = &loose_vtbl;
 	return 0;
 }
 
@@ -368,7 +253,8 @@ static open_method_decl(loose)
  *
  *****************************************************************/
 
-static read_method_decl(pack_non_delta)
+static ssize_t read_istream_pack_non_delta(struct git_istream *st, char *buf,
+					   size_t sz)
 {
 	size_t total_read = 0;
 
@@ -426,24 +312,20 @@ static read_method_decl(pack_non_delta)
 	return total_read;
 }
 
-static close_method_decl(pack_non_delta)
+static int close_istream_pack_non_delta(struct git_istream *st)
 {
 	close_deflated_stream(st);
 	return 0;
 }
 
-static struct stream_vtbl pack_non_delta_vtbl = {
-	close_istream_pack_non_delta,
-	read_istream_pack_non_delta,
-};
-
-static open_method_decl(pack_non_delta)
+static int open_istream_pack_non_delta(struct git_istream *st,
+				       struct repository *r,
+				       const struct object_id *oid,
+				       enum object_type *type)
 {
 	struct pack_window *window;
 	enum object_type in_pack_type;
 
-	st->u.in_pack.pack = oi->u.packed.pack;
-	st->u.in_pack.pos = oi->u.packed.offset;
 	window = NULL;
 
 	in_pack_type = unpack_object_header(st->u.in_pack.pack,
@@ -461,7 +343,9 @@ static open_method_decl(pack_non_delta)
 		break;
 	}
 	st->z_state = z_unused;
-	st->vtbl = &pack_non_delta_vtbl;
+	st->close = close_istream_pack_non_delta;
+	st->read = read_istream_pack_non_delta;
+
 	return 0;
 }
 
@@ -472,13 +356,13 @@ static open_method_decl(pack_non_delta)
  *
  *****************************************************************/
 
-static close_method_decl(incore)
+static int close_istream_incore(struct git_istream *st)
 {
 	free(st->u.incore.buf);
 	return 0;
 }
 
-static read_method_decl(incore)
+static ssize_t read_istream_incore(struct git_istream *st, char *buf, size_t sz)
 {
 	size_t read_size = sz;
 	size_t remainder = st->size - st->u.incore.read_ptr;
@@ -492,25 +376,105 @@ static read_method_decl(incore)
 	return read_size;
 }
 
-static struct stream_vtbl incore_vtbl = {
-	close_istream_incore,
-	read_istream_incore,
-};
-
-static open_method_decl(incore)
+static int open_istream_incore(struct git_istream *st, struct repository *r,
+			       const struct object_id *oid, enum object_type *type)
 {
-	st->u.incore.buf = read_object_file_extended(the_repository, oid, type, &st->size, 0);
+	st->u.incore.buf = read_object_file_extended(r, oid, type, &st->size, 0);
 	st->u.incore.read_ptr = 0;
-	st->vtbl = &incore_vtbl;
+	st->close = close_istream_incore;
+	st->read = read_istream_incore;
 
 	return st->u.incore.buf ? 0 : -1;
 }
 
+/*****************************************************************************
+ * static helpers variables and functions for users of streaming interface
+ *****************************************************************************/
+
+static int istream_source(struct git_istream *st,
+			  struct repository *r,
+			  const struct object_id *oid,
+			  enum object_type *type)
+{
+	unsigned long size;
+	int status;
+	struct object_info oi = OBJECT_INFO_INIT;
+
+	oi.typep = type;
+	oi.sizep = &size;
+	status = oid_object_info_extended(r, oid, &oi, 0);
+	if (status < 0)
+		return status;
+
+	switch (oi.whence) {
+	case OI_LOOSE:
+		st->open = open_istream_loose;
+		return 0;
+	case OI_PACKED:
+		if (!oi.u.packed.is_delta && big_file_threshold < size) {
+			st->u.in_pack.pack = oi.u.packed.pack;
+			st->u.in_pack.pos = oi.u.packed.offset;
+			st->open = open_istream_pack_non_delta;
+			return 0;
+		}
+		/* fallthru */
+	default:
+		st->open = open_istream_incore;
+		return 0;
+	}
+}
 
 /****************************************************************
  * Users of streaming interface
  ****************************************************************/
 
+int close_istream(struct git_istream *st)
+{
+	int r = st->close(st);
+	free(st);
+	return r;
+}
+
+ssize_t read_istream(struct git_istream *st, void *buf, size_t sz)
+{
+	return st->read(st, buf, sz);
+}
+
+struct git_istream *open_istream(struct repository *r,
+				 const struct object_id *oid,
+				 enum object_type *type,
+				 unsigned long *size,
+				 struct stream_filter *filter)
+{
+	struct git_istream *st = xmalloc(sizeof(*st));
+	const struct object_id *real = lookup_replace_object(r, oid);
+	int ret = istream_source(st, r, real, type);
+
+	if (ret) {
+		free(st);
+		return NULL;
+	}
+
+	if (st->open(st, r, real, type)) {
+		if (open_istream_incore(st, r, real, type)) {
+			free(st);
+			return NULL;
+		}
+	}
+	if (filter) {
+		/* Add "&& !is_null_stream_filter(filter)" for performance */
+		struct git_istream *nst = attach_stream_filter(st, filter);
+		if (!nst) {
+			close_istream(st);
+			return NULL;
+		}
+		st = nst;
+	}
+
+	*size = st->size;
+	return st;
+}
+
 int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter *filter,
 		      int can_seek)
 {
@@ -520,7 +484,7 @@ int stream_blob_to_fd(int fd, const struct object_id *oid, struct stream_filter
 	ssize_t kept = 0;
 	int result = -1;
 
-	st = open_istream(oid, &type, &sz, filter);
+	st = open_istream(the_repository, oid, &type, &sz, filter);
 	if (!st) {
 		if (filter)
 			free_stream_filter(filter);
diff --git a/streaming.h b/streaming.h
index f465a3cd31..5e4e6acfd0 100644
--- a/streaming.h
+++ b/streaming.h
@@ -8,7 +8,9 @@
 /* opaque */
 struct git_istream;
 
-struct git_istream *open_istream(const struct object_id *, enum object_type *, unsigned long *, struct stream_filter *);
+struct git_istream *open_istream(struct repository *, const struct object_id *,
+				 enum object_type *, unsigned long *,
+				 struct stream_filter *);
 int close_istream(struct git_istream *);
 ssize_t read_istream(struct git_istream *, void *, size_t);
 
diff --git a/string-list.c b/string-list.c
index a917955fbd..43576ad126 100644
--- a/string-list.c
+++ b/string-list.c
@@ -1,10 +1,24 @@
 #include "cache.h"
 #include "string-list.h"
 
+void string_list_init_nodup(struct string_list *list)
+{
+	struct string_list blank = STRING_LIST_INIT_NODUP;
+	memcpy(list, &blank, sizeof(*list));
+}
+
+void string_list_init_dup(struct string_list *list)
+{
+	struct string_list blank = STRING_LIST_INIT_DUP;
+	memcpy(list, &blank, sizeof(*list));
+}
+
 void string_list_init(struct string_list *list, int strdup_strings)
 {
-	memset(list, 0, sizeof(*list));
-	list->strdup_strings = 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
diff --git a/string-list.h b/string-list.h
index f964399949..0d6b469239 100644
--- a/string-list.h
+++ b/string-list.h
@@ -4,7 +4,8 @@
 /**
  * The string_list API offers a data structure and functions to handle
  * sorted and unsorted arrays of strings.  A "sorted" list is one whose
- * entries are sorted by string value in `strcmp()` order.
+ * entries are sorted by string value in the order specified by the `cmp`
+ * member (`strcmp()` by default).
  *
  * The caller:
  *
@@ -90,14 +91,21 @@ struct string_list {
 	compare_strings_fn cmp; /* NULL uses strcmp() */
 };
 
-#define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0, NULL }
-#define STRING_LIST_INIT_DUP   { NULL, 0, 0, 1, NULL }
+#define STRING_LIST_INIT_NODUP { 0 }
+#define STRING_LIST_INIT_DUP   { .strdup_strings = 1 }
 
 /* General functions which work with both sorted and unsorted lists. */
 
 /**
- * Initialize the members of the string_list, set `strdup_strings`
- * member according to the value of the second parameter.
+ * Initialize the members of a string_list pointer in the same way as
+ * the corresponding `STRING_LIST_INIT_NODUP` and
+ * `STRING_LIST_INIT_DUP` macros.
+ */
+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);
 
@@ -179,7 +187,7 @@ void string_list_remove(struct string_list *list, const char *string,
 
 /**
  * Check if the given string is part of a sorted list. If it is part of the list,
- * return the coresponding string_list_item, NULL otherwise.
+ * return the corresponding string_list_item, NULL otherwise.
  */
 struct string_list_item *string_list_lookup(struct string_list *list, const char *string);
 
@@ -209,7 +217,8 @@ struct string_list_item *string_list_append(struct string_list *list, const char
 struct string_list_item *string_list_append_nodup(struct string_list *list, char *string);
 
 /**
- * Sort the list's entries by string value in `strcmp()` order.
+ * Sort the list's entries by string value in order specified by list->cmp
+ * (strcmp() if list->cmp is NULL).
  */
 void string_list_sort(struct string_list *list);
 
diff --git a/strmap.c b/strmap.c
new file mode 100644
index 0000000000..ee48635708
--- /dev/null
+++ b/strmap.c
@@ -0,0 +1,179 @@
+#include "git-compat-util.h"
+#include "strmap.h"
+#include "mem-pool.h"
+
+int cmp_strmap_entry(const void *hashmap_cmp_fn_data,
+		     const struct hashmap_entry *entry1,
+		     const struct hashmap_entry *entry2,
+		     const void *keydata)
+{
+	const struct strmap_entry *e1, *e2;
+
+	e1 = container_of(entry1, const struct strmap_entry, ent);
+	e2 = container_of(entry2, const struct strmap_entry, ent);
+	return strcmp(e1->key, e2->key);
+}
+
+static struct strmap_entry *find_strmap_entry(struct strmap *map,
+					      const char *str)
+{
+	struct strmap_entry entry;
+	hashmap_entry_init(&entry.ent, strhash(str));
+	entry.key = str;
+	return hashmap_get_entry(&map->map, &entry, ent, NULL);
+}
+
+void strmap_init(struct strmap *map)
+{
+	struct strmap blank = STRMAP_INIT;
+	memcpy(map, &blank, sizeof(*map));
+}
+
+void strmap_init_with_options(struct strmap *map,
+			      struct mem_pool *pool,
+			      int strdup_strings)
+{
+	hashmap_init(&map->map, cmp_strmap_entry, NULL, 0);
+	map->pool = pool;
+	map->strdup_strings = strdup_strings;
+}
+
+static void strmap_free_entries_(struct strmap *map, int free_values)
+{
+	struct hashmap_iter iter;
+	struct strmap_entry *e;
+
+	if (!map)
+		return;
+
+	if (!free_values && map->pool)
+		/* Memory other than util is owned by and freed with the pool */
+		return;
+
+	/*
+	 * We need to iterate over the hashmap entries and free
+	 * e->key and e->value ourselves; hashmap has no API to
+	 * take care of that for us.  Since we're already iterating over
+	 * the hashmap, though, might as well free e too and avoid the need
+	 * to make some call into the hashmap API to do that.
+	 */
+	hashmap_for_each_entry(&map->map, &iter, e, ent) {
+		if (free_values)
+			free(e->value);
+		if (!map->pool)
+			free(e);
+	}
+}
+
+void strmap_clear(struct strmap *map, int free_values)
+{
+	strmap_free_entries_(map, free_values);
+	hashmap_clear(&map->map);
+}
+
+void strmap_partial_clear(struct strmap *map, int free_values)
+{
+	strmap_free_entries_(map, free_values);
+	hashmap_partial_clear(&map->map);
+}
+
+static struct strmap_entry *create_entry(struct strmap *map,
+					 const char *str,
+					 void *data)
+{
+	struct strmap_entry *entry;
+
+	if (map->strdup_strings) {
+		if (!map->pool) {
+			FLEXPTR_ALLOC_STR(entry, key, str);
+		} else {
+			size_t len = st_add(strlen(str), 1); /* include NUL */
+			entry = mem_pool_alloc(map->pool,
+					       st_add(sizeof(*entry), len));
+			memcpy(entry + 1, str, len);
+			entry->key = (void *)(entry + 1);
+		}
+	} else if (!map->pool) {
+		entry = xmalloc(sizeof(*entry));
+	} else {
+		entry = mem_pool_alloc(map->pool, sizeof(*entry));
+	}
+	hashmap_entry_init(&entry->ent, strhash(str));
+	if (!map->strdup_strings)
+		entry->key = str;
+	entry->value = data;
+	return entry;
+}
+
+void *strmap_put(struct strmap *map, const char *str, void *data)
+{
+	struct strmap_entry *entry = find_strmap_entry(map, str);
+
+	if (entry) {
+		void *old = entry->value;
+		entry->value = data;
+		return old;
+	}
+
+	entry = create_entry(map, str, data);
+	hashmap_add(&map->map, &entry->ent);
+	return NULL;
+}
+
+struct strmap_entry *strmap_get_entry(struct strmap *map, const char *str)
+{
+	return find_strmap_entry(map, str);
+}
+
+void *strmap_get(struct strmap *map, const char *str)
+{
+	struct strmap_entry *entry = find_strmap_entry(map, str);
+	return entry ? entry->value : NULL;
+}
+
+int strmap_contains(struct strmap *map, const char *str)
+{
+	return find_strmap_entry(map, str) != NULL;
+}
+
+void strmap_remove(struct strmap *map, const char *str, int free_value)
+{
+	struct strmap_entry entry, *ret;
+	hashmap_entry_init(&entry.ent, strhash(str));
+	entry.key = str;
+	ret = hashmap_remove_entry(&map->map, &entry, ent, NULL);
+	if (!ret)
+		return;
+	if (free_value)
+		free(ret->value);
+	if (!map->pool)
+		free(ret);
+}
+
+void strintmap_incr(struct strintmap *map, const char *str, intptr_t amt)
+{
+	struct strmap_entry *entry = find_strmap_entry(&map->map, str);
+	if (entry) {
+		intptr_t *whence = (intptr_t*)&entry->value;
+		*whence += amt;
+	}
+	else
+		strintmap_set(map, str, map->default_value + amt);
+}
+
+int strset_add(struct strset *set, const char *str)
+{
+	/*
+	 * Cannot use strmap_put() because it'll return NULL in both cases:
+	 *   - cannot find str: NULL means "not found"
+	 *   - does find str: NULL is the value associated with str
+	 */
+	struct strmap_entry *entry = find_strmap_entry(&set->map, str);
+
+	if (entry)
+		return 0;
+
+	entry = create_entry(&set->map, str, NULL);
+	hashmap_add(&set->map.map, &entry->ent);
+	return 1;
+}
diff --git a/strmap.h b/strmap.h
new file mode 100644
index 0000000000..1e152d832d
--- /dev/null
+++ b/strmap.h
@@ -0,0 +1,268 @@
+#ifndef STRMAP_H
+#define STRMAP_H
+
+#include "hashmap.h"
+
+struct mem_pool;
+struct strmap {
+	struct hashmap map;
+	struct mem_pool *pool;
+	unsigned int strdup_strings:1;
+};
+
+struct strmap_entry {
+	struct hashmap_entry ent;
+	const char *key;
+	void *value;
+	/* strmap_entry may be allocated extra space to store the key at end */
+};
+
+int cmp_strmap_entry(const void *hashmap_cmp_fn_data,
+		     const struct hashmap_entry *entry1,
+		     const struct hashmap_entry *entry2,
+		     const void *keydata);
+
+#define STRMAP_INIT { \
+			.map = HASHMAP_INIT(cmp_strmap_entry, NULL),  \
+			.strdup_strings = 1,                          \
+		    }
+#define STRINTMAP_INIT { \
+			.map = STRMAP_INIT,   \
+			.default_value = 0,   \
+		       }
+#define STRSET_INIT { .map = STRMAP_INIT }
+
+/*
+ * Initialize the members of the strmap.  Any keys added to the strmap will
+ * be strdup'ed with their memory managed by the strmap.
+ */
+void strmap_init(struct strmap *map);
+
+/*
+ * Same as strmap_init, but for those who want to control the memory management
+ * carefully instead of using the default of strdup_strings=1 and pool=NULL.
+ */
+void strmap_init_with_options(struct strmap *map,
+			      struct mem_pool *pool,
+			      int strdup_strings);
+
+/*
+ * Remove all entries from the map, releasing any allocated resources.
+ */
+void strmap_clear(struct strmap *map, int free_values);
+
+/*
+ * Similar to strmap_clear() but leaves map->map->table allocated and
+ * pre-sized so that subsequent uses won't need as many rehashings.
+ */
+void strmap_partial_clear(struct strmap *map, int free_values);
+
+/*
+ * Insert "str" into the map, pointing to "data".
+ *
+ * If an entry for "str" already exists, its data pointer is overwritten, and
+ * the original data pointer returned. Otherwise, returns NULL.
+ */
+void *strmap_put(struct strmap *map, const char *str, void *data);
+
+/*
+ * Return the strmap_entry mapped by "str", or NULL if there is not such
+ * an item in map.
+ */
+struct strmap_entry *strmap_get_entry(struct strmap *map, const char *str);
+
+/*
+ * Return the data pointer mapped by "str", or NULL if the entry does not
+ * exist.
+ */
+void *strmap_get(struct strmap *map, const char *str);
+
+/*
+ * Return non-zero iff "str" is present in the map. This differs from
+ * strmap_get() in that it can distinguish entries with a NULL data pointer.
+ */
+int strmap_contains(struct strmap *map, const char *str);
+
+/*
+ * Remove the given entry from the strmap.  If the string isn't in the
+ * strmap, the map is not altered.
+ */
+void strmap_remove(struct strmap *map, const char *str, int free_value);
+
+/*
+ * Return how many entries the strmap has.
+ */
+static inline unsigned int strmap_get_size(struct strmap *map)
+{
+	return hashmap_get_size(&map->map);
+}
+
+/*
+ * Return whether the strmap is empty.
+ */
+static inline int strmap_empty(struct strmap *map)
+{
+	return strmap_get_size(map) == 0;
+}
+
+/*
+ * iterate through @map using @iter, @var is a pointer to a type strmap_entry
+ */
+#define strmap_for_each_entry(mystrmap, iter, var)	\
+	hashmap_for_each_entry(&(mystrmap)->map, iter, var, ent)
+
+
+/*
+ * strintmap:
+ *    A map of string -> int, typecasting the void* of strmap to an int.
+ *
+ * Primary differences:
+ *    1) Since the void* value is just an int in disguise, there is no value
+ *       to free.  (Thus one fewer argument to strintmap_clear)
+ *    2) strintmap_get() returns an int, or returns the default_value if the
+ *       key is not found in the strintmap.
+ *    3) No strmap_put() equivalent; strintmap_set() and strintmap_incr()
+ *       instead.
+ */
+
+struct strintmap {
+	struct strmap map;
+	int default_value;
+};
+
+#define strintmap_for_each_entry(mystrmap, iter, var)	\
+	strmap_for_each_entry(&(mystrmap)->map, iter, var)
+
+static inline void strintmap_init(struct strintmap *map, int default_value)
+{
+	strmap_init(&map->map);
+	map->default_value = default_value;
+}
+
+static inline void strintmap_init_with_options(struct strintmap *map,
+					       int default_value,
+					       struct mem_pool *pool,
+					       int strdup_strings)
+{
+	strmap_init_with_options(&map->map, pool, strdup_strings);
+	map->default_value = default_value;
+}
+
+static inline void strintmap_clear(struct strintmap *map)
+{
+	strmap_clear(&map->map, 0);
+}
+
+static inline void strintmap_partial_clear(struct strintmap *map)
+{
+	strmap_partial_clear(&map->map, 0);
+}
+
+static inline int strintmap_contains(struct strintmap *map, const char *str)
+{
+	return strmap_contains(&map->map, str);
+}
+
+static inline void strintmap_remove(struct strintmap *map, const char *str)
+{
+	strmap_remove(&map->map, str, 0);
+}
+
+static inline int strintmap_empty(struct strintmap *map)
+{
+	return strmap_empty(&map->map);
+}
+
+static inline unsigned int strintmap_get_size(struct strintmap *map)
+{
+	return strmap_get_size(&map->map);
+}
+
+/*
+ * Returns the value for str in the map.  If str isn't found in the map,
+ * the map's default_value is returned.
+ */
+static inline int strintmap_get(struct strintmap *map, const char *str)
+{
+	struct strmap_entry *result = strmap_get_entry(&map->map, str);
+	if (!result)
+		return map->default_value;
+	return (intptr_t)result->value;
+}
+
+static inline void strintmap_set(struct strintmap *map, const char *str,
+				 intptr_t v)
+{
+	strmap_put(&map->map, str, (void *)v);
+}
+
+/*
+ * Increment the value for str by amt.  If str isn't in the map, add it and
+ * set its value to default_value + amt.
+ */
+void strintmap_incr(struct strintmap *map, const char *str, intptr_t amt);
+
+/*
+ * strset:
+ *    A set of strings.
+ *
+ * Primary differences with strmap:
+ *    1) The value is always NULL, and ignored.  As there is no value to free,
+ *       there is one fewer argument to strset_clear
+ *    2) No strset_get() because there is no value.
+ *    3) No strset_put(); use strset_add() instead.
+ */
+
+struct strset {
+	struct strmap map;
+};
+
+#define strset_for_each_entry(mystrset, iter, var)	\
+	strmap_for_each_entry(&(mystrset)->map, iter, var)
+
+static inline void strset_init(struct strset *set)
+{
+	strmap_init(&set->map);
+}
+
+static inline void strset_init_with_options(struct strset *set,
+					    struct mem_pool *pool,
+					    int strdup_strings)
+{
+	strmap_init_with_options(&set->map, pool, strdup_strings);
+}
+
+static inline void strset_clear(struct strset *set)
+{
+	strmap_clear(&set->map, 0);
+}
+
+static inline void strset_partial_clear(struct strset *set)
+{
+	strmap_partial_clear(&set->map, 0);
+}
+
+static inline int strset_contains(struct strset *set, const char *str)
+{
+	return strmap_contains(&set->map, str);
+}
+
+static inline void strset_remove(struct strset *set, const char *str)
+{
+	strmap_remove(&set->map, str, 0);
+}
+
+static inline int strset_empty(struct strset *set)
+{
+	return strmap_empty(&set->map);
+}
+
+static inline unsigned int strset_get_size(struct strset *set)
+{
+	return strmap_get_size(&set->map);
+}
+
+/* Returns 1 if str is added to the set; returns 0 if str was already in set */
+int strset_add(struct strset *set, const char *str);
+
+#endif /* STRMAP_H */
diff --git a/strvec.c b/strvec.c
new file mode 100644
index 0000000000..61a76ce6cb
--- /dev/null
+++ b/strvec.c
@@ -0,0 +1,108 @@
+#include "cache.h"
+#include "strvec.h"
+#include "strbuf.h"
+
+const char *empty_strvec[] = { NULL };
+
+void strvec_init(struct strvec *array)
+{
+	struct strvec blank = STRVEC_INIT;
+	memcpy(array, &blank, sizeof(*array));
+}
+
+static void strvec_push_nodup(struct strvec *array, const char *value)
+{
+	if (array->v == empty_strvec)
+		array->v = NULL;
+
+	ALLOC_GROW(array->v, array->nr + 2, array->alloc);
+	array->v[array->nr++] = value;
+	array->v[array->nr] = NULL;
+}
+
+const char *strvec_push(struct strvec *array, const char *value)
+{
+	strvec_push_nodup(array, xstrdup(value));
+	return array->v[array->nr - 1];
+}
+
+const char *strvec_pushf(struct strvec *array, const char *fmt, ...)
+{
+	va_list ap;
+	struct strbuf v = STRBUF_INIT;
+
+	va_start(ap, fmt);
+	strbuf_vaddf(&v, fmt, ap);
+	va_end(ap);
+
+	strvec_push_nodup(array, strbuf_detach(&v, NULL));
+	return array->v[array->nr - 1];
+}
+
+void strvec_pushl(struct strvec *array, ...)
+{
+	va_list ap;
+	const char *arg;
+
+	va_start(ap, array);
+	while ((arg = va_arg(ap, const char *)))
+		strvec_push(array, arg);
+	va_end(ap);
+}
+
+void strvec_pushv(struct strvec *array, const char **items)
+{
+	for (; *items; items++)
+		strvec_push(array, *items);
+}
+
+void strvec_pop(struct strvec *array)
+{
+	if (!array->nr)
+		return;
+	free((char *)array->v[array->nr - 1]);
+	array->v[array->nr - 1] = NULL;
+	array->nr--;
+}
+
+void strvec_split(struct strvec *array, const char *to_split)
+{
+	while (isspace(*to_split))
+		to_split++;
+	for (;;) {
+		const char *p = to_split;
+
+		if (!*p)
+			break;
+
+		while (*p && !isspace(*p))
+			p++;
+		strvec_push_nodup(array, xstrndup(to_split, p - to_split));
+
+		while (isspace(*p))
+			p++;
+		to_split = p;
+	}
+}
+
+void strvec_clear(struct strvec *array)
+{
+	if (array->v != empty_strvec) {
+		int i;
+		for (i = 0; i < array->nr; i++)
+			free((char *)array->v[i]);
+		free(array->v);
+	}
+	strvec_init(array);
+}
+
+const char **strvec_detach(struct strvec *array)
+{
+	if (array->v == empty_strvec)
+		return xcalloc(1, sizeof(const char *));
+	else {
+		const char **ret = array->v;
+		strvec_init(array);
+		return ret;
+	}
+}
diff --git a/strvec.h b/strvec.h
new file mode 100644
index 0000000000..fdcad75b45
--- /dev/null
+++ b/strvec.h
@@ -0,0 +1,89 @@
+#ifndef STRVEC_H
+#define STRVEC_H
+
+/**
+ * The strvec API allows one to dynamically build and store
+ * NULL-terminated arrays of strings. A strvec maintains the invariant that the
+ * `items` member always points to a non-NULL array, and that the array is
+ * always NULL-terminated at the element pointed to by `items[nr]`. This
+ * makes the result suitable for passing to functions expecting to receive
+ * argv from main().
+ *
+ * The string-list API (documented in string-list.h) is similar, but cannot be
+ * used for these purposes; instead of storing a straight string pointer,
+ * it contains an item structure with a `util` field that is not compatible
+ * with the traditional argv interface.
+ *
+ * Each `strvec` manages its own memory. Any strings pushed into the
+ * array are duplicated, and all memory is freed by strvec_clear().
+ */
+
+extern const char *empty_strvec[];
+
+/**
+ * A single array. This should be initialized by assignment from
+ * `STRVEC_INIT`, or by calling `strvec_init`. The `items`
+ * member contains the actual array; the `nr` member contains the
+ * number of elements in the array, not including the terminating
+ * NULL.
+ */
+struct strvec {
+	const char **v;
+	int nr;
+	int alloc;
+};
+
+#define STRVEC_INIT { empty_strvec, 0, 0 }
+
+/**
+ * Initialize an array. This is no different than assigning from
+ * `STRVEC_INIT`.
+ */
+void strvec_init(struct strvec *);
+
+/* Push a copy of a string onto the end of the array. */
+const char *strvec_push(struct strvec *, const char *);
+
+/**
+ * Format a string and push it onto the end of the array. This is a
+ * convenience wrapper combining `strbuf_addf` and `strvec_push`.
+ */
+__attribute__((format (printf,2,3)))
+const char *strvec_pushf(struct strvec *, const char *fmt, ...);
+
+/**
+ * Push a list of strings onto the end of the array. The arguments
+ * should be a list of `const char *` strings, terminated by a NULL
+ * argument.
+ */
+LAST_ARG_MUST_BE_NULL
+void strvec_pushl(struct strvec *, ...);
+
+/* Push a null-terminated array of strings onto the end of the array. */
+void strvec_pushv(struct strvec *, const char **);
+
+/**
+ * Remove the final element from the array. If there are no
+ * elements in the array, do nothing.
+ */
+void strvec_pop(struct strvec *);
+
+/* Splits by whitespace; does not handle quoted arguments! */
+void strvec_split(struct strvec *, const char *);
+
+/**
+ * Free all memory associated with the array and return it to the
+ * initial, empty state.
+ */
+void strvec_clear(struct strvec *);
+
+/**
+ * Disconnect the `items` member from the `strvec` struct and
+ * return it. The caller is responsible for freeing the memory used
+ * by the array, and by the strings it references. After detaching,
+ * the `strvec` is in a reinitialized state and can be pushed
+ * into again.
+ */
+const char **strvec_detach(struct strvec *);
+
+#endif /* STRVEC_H */
diff --git a/sub-process.c b/sub-process.c
index 1b1af9dcbd..dfa790d3ff 100644
--- a/sub-process.c
+++ b/sub-process.c
@@ -84,7 +84,7 @@ int subprocess_start(struct hashmap *hashmap, struct subprocess_entry *entry, co
 	process = &entry->process;
 
 	child_process_init(process);
-	argv_array_push(&process->args, cmd);
+	strvec_push(&process->args, cmd);
 	process->use_shell = 1;
 	process->in = -1;
 	process->out = -1;
diff --git a/submodule-config.c b/submodule-config.c
index 401a9b2382..2026120fb3 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -103,8 +103,8 @@ static void submodule_cache_clear(struct submodule_cache *cache)
 				ent /* member name */)
 		free_one_config(entry);
 
-	hashmap_free_entries(&cache->for_path, struct submodule_entry, ent);
-	hashmap_free_entries(&cache->for_name, struct submodule_entry, ent);
+	hashmap_clear_and_free(&cache->for_path, struct submodule_entry, ent);
+	hashmap_clear_and_free(&cache->for_name, struct submodule_entry, ent);
 	cache->initialized = 0;
 	cache->gitmodules_read = 0;
 }
@@ -225,7 +225,8 @@ static int name_and_item_from_var(const char *var, struct strbuf *name,
 				  struct strbuf *item)
 {
 	const char *subsection, *key;
-	int subsection_len, parse;
+	size_t subsection_len;
+	int parse;
 	parse = parse_config_key(var, "submodule", &subsection,
 			&subsection_len, &key);
 	if (parse < 0 || !subsection)
@@ -409,6 +410,13 @@ struct parse_config_parameter {
 	int overwrite;
 };
 
+/*
+ * Parse a config item from .gitmodules.
+ *
+ * This does not handle submodule-related configuration from the main
+ * config store (.git/config, etc).  Callers are responsible for
+ * checking for overrides in the main config store when appropriate.
+ */
 static int parse_config(const char *var, const char *value, void *data)
 {
 	struct parse_config_parameter *me = data;
@@ -486,8 +494,9 @@ static int parse_config(const char *var, const char *value, void *data)
 			warn_multiple_config(me->treeish_name, submodule->name,
 					     "update");
 		else if (parse_submodule_update_strategy(value,
-			 &submodule->update_strategy) < 0)
-				die(_("invalid value for %s"), var);
+			 &submodule->update_strategy) < 0 ||
+			 submodule->update_strategy.type == SM_UPDATE_COMMAND)
+			die(_("invalid value for %s"), var);
 	} else if (!strcmp(item.buf, "shallow")) {
 		if (!me->overwrite && submodule->recommend_shallow != -1)
 			warn_multiple_config(me->treeish_name, submodule->name,
@@ -618,7 +627,7 @@ static void submodule_cache_check_init(struct repository *repo)
 
 /*
  * Note: This function is private for a reason, the '.gitmodules' file should
- * not be used as as a mechanism to retrieve arbitrary configuration stored in
+ * not be used as a mechanism to retrieve arbitrary configuration stored in
  * the repository.
  *
  * Runs the provided config function on the '.gitmodules' file found in the
@@ -627,7 +636,9 @@ static void submodule_cache_check_init(struct repository *repo)
 static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void *data)
 {
 	if (repo->worktree) {
-		struct git_config_source config_source = { 0 };
+		struct git_config_source config_source = {
+			0, .scope = CONFIG_SCOPE_SUBMODULE
+		};
 		const struct config_options opts = { 0 };
 		struct object_id oid;
 		char *file;
@@ -660,16 +671,19 @@ static int gitmodules_cb(const char *var, const char *value, void *data)
 
 	parameter.cache = repo->submodule_cache;
 	parameter.treeish_name = NULL;
-	parameter.gitmodules_oid = &null_oid;
+	parameter.gitmodules_oid = null_oid();
 	parameter.overwrite = 1;
 
 	return parse_config(var, value, &parameter);
 }
 
-void repo_read_gitmodules(struct repository *repo)
+void repo_read_gitmodules(struct repository *repo, int skip_if_read)
 {
 	submodule_cache_check_init(repo);
 
+	if (repo->submodule_cache->gitmodules_read && skip_if_read)
+		return;
+
 	if (repo_read_index(repo) < 0)
 		return;
 
@@ -695,20 +709,11 @@ void gitmodules_config_oid(const struct object_id *commit_oid)
 	the_repository->submodule_cache->gitmodules_read = 1;
 }
 
-static void gitmodules_read_check(struct repository *repo)
-{
-	submodule_cache_check_init(repo);
-
-	/* read the repo's .gitmodules file if it hasn't been already */
-	if (!repo->submodule_cache->gitmodules_read)
-		repo_read_gitmodules(repo);
-}
-
 const struct submodule *submodule_from_name(struct repository *r,
 					    const struct object_id *treeish_name,
 		const char *name)
 {
-	gitmodules_read_check(r);
+	repo_read_gitmodules(r, 1);
 	return config_from(r->submodule_cache, treeish_name, name, lookup_name);
 }
 
@@ -716,7 +721,7 @@ const struct submodule *submodule_from_path(struct repository *r,
 					    const struct object_id *treeish_name,
 		const char *path)
 {
-	gitmodules_read_check(r);
+	repo_read_gitmodules(r, 1);
 	return config_from(r->submodule_cache, treeish_name, path, lookup_path);
 }
 
@@ -772,10 +777,14 @@ static int gitmodules_fetch_config(const char *var, const char *value, void *cb)
 {
 	struct fetch_config *config = cb;
 	if (!strcmp(var, "submodule.fetchjobs")) {
-		*(config->max_children) = parse_submodule_fetchjobs(var, value);
+		if (config->max_children)
+			*(config->max_children) =
+				parse_submodule_fetchjobs(var, value);
 		return 0;
 	} else if (!strcmp(var, "fetch.recursesubmodules")) {
-		*(config->recurse_submodules) = parse_fetch_recurse_submodules_arg(var, value);
+		if (config->recurse_submodules)
+			*(config->recurse_submodules) =
+				parse_fetch_recurse_submodules_arg(var, value);
 		return 0;
 	}
 
diff --git a/submodule-config.h b/submodule-config.h
index 1b4e2da658..c11e22cf50 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -7,9 +7,31 @@
 #include "submodule.h"
 #include "strbuf.h"
 
+/**
+ * The submodule config cache API allows to read submodule
+ * configurations/information from specified revisions. Internally
+ * information is lazily read into a cache that is used to avoid
+ * unnecessary parsing of the same .gitmodules files. Lookups can be done by
+ * submodule path or name.
+ *
+ * Usage
+ * -----
+ *
+ * The caller can look up information about submodules by using the
+ * `submodule_from_path()` or `submodule_from_name()` functions. They return
+ * a `struct submodule` which contains the values. The API automatically
+ * initializes and allocates the needed infrastructure on-demand. If the
+ * caller does only want to lookup values from revisions the initialization
+ * can be skipped.
+ *
+ * If the internal cache might grow too big or when the caller is done with
+ * the API, all internally cached values can be freed with submodule_free().
+ *
+ */
+
 /*
  * Submodule entry containing the information about a certain submodule
- * in a certain revision.
+ * in a certain revision. It is returned by the lookup functions.
  */
 struct submodule {
 	const char *path;
@@ -39,15 +61,29 @@ int option_fetch_parse_recurse_submodules(const struct option *opt,
 					  const char *arg, int unset);
 int parse_update_recurse_submodules_arg(const char *opt, const char *arg);
 int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
-void repo_read_gitmodules(struct repository *repo);
+void repo_read_gitmodules(struct repository *repo, int skip_if_read);
 void gitmodules_config_oid(const struct object_id *commit_oid);
+
+/**
+ * Same as submodule_from_path but lookup by name.
+ */
 const struct submodule *submodule_from_name(struct repository *r,
 					    const struct object_id *commit_or_tree,
 					    const char *name);
+
+/**
+ * Given a tree-ish in the superproject and a path, return the submodule that
+ * is bound at the path in the named tree.
+ */
 const struct submodule *submodule_from_path(struct repository *r,
 					    const struct object_id *commit_or_tree,
 					    const char *path);
+
+/**
+ * Use these to free the internally cached values.
+ */
 void submodule_free(struct repository *r);
+
 int print_config_from_gitmodules(struct repository *repo, const char *key);
 int config_set_in_gitmodules_file_gently(const char *key, const char *value);
 
diff --git a/submodule.c b/submodule.c
index 0f199c5137..8e611fe1db 100644
--- a/submodule.c
+++ b/submodule.c
@@ -12,8 +12,8 @@
 #include "diffcore.h"
 #include "refs.h"
 #include "string-list.h"
-#include "sha1-array.h"
-#include "argv-array.h"
+#include "oid-array.h"
+#include "strvec.h"
 #include "blob.h"
 #include "thread-utils.h"
 #include "quote.h"
@@ -33,7 +33,7 @@ static struct oid_array ref_tips_after_fetch;
  * will be disabled because we can't guess what might be configured in
  * .gitmodules unless the user resolves the conflict.
  */
-int is_gitmodules_unmerged(const struct index_state *istate)
+int is_gitmodules_unmerged(struct index_state *istate)
 {
 	int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
 	if (pos < 0) { /* .gitmodules not found or isn't merged */
@@ -82,7 +82,7 @@ int is_staging_gitmodules_ok(struct index_state *istate)
 	if ((pos >= 0) && (pos < istate->cache_nr)) {
 		struct stat st;
 		if (lstat(GITMODULES_FILE, &st) == 0 &&
-		    ie_match_stat(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
+		    ie_modified(istate, istate->cache[pos], &st, 0) & DATA_CHANGED)
 			return 0;
 	}
 
@@ -113,7 +113,7 @@ int update_path_in_gitmodules(const char *oldpath, const char *newpath)
 	if (is_gitmodules_unmerged(the_repository->index))
 		die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
 
-	submodule = submodule_from_path(the_repository, &null_oid, oldpath);
+	submodule = submodule_from_path(the_repository, null_oid(), oldpath);
 	if (!submodule || !submodule->name) {
 		warning(_("Could not find section in .gitmodules where path=%s"), oldpath);
 		return -1;
@@ -142,7 +142,7 @@ int remove_path_from_gitmodules(const char *path)
 	if (is_gitmodules_unmerged(the_repository->index))
 		die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
 
-	submodule = submodule_from_path(the_repository, &null_oid, path);
+	submodule = submodule_from_path(the_repository, null_oid(), path);
 	if (!submodule || !submodule->name) {
 		warning(_("Could not find section in .gitmodules where path=%s"), path);
 		return -1;
@@ -188,13 +188,14 @@ void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
 					     const char *path)
 {
 	const struct submodule *submodule = submodule_from_path(the_repository,
-								&null_oid, path);
+								null_oid(),
+								path);
 	if (submodule) {
 		const char *ignore;
 		char *key;
 
 		key = xstrfmt("submodule.%s.ignore", submodule->name);
-		if (repo_config_get_string_const(the_repository, key, &ignore))
+		if (repo_config_get_string_tmp(the_repository, key, &ignore))
 			ignore = submodule->ignore;
 		free(key);
 
@@ -244,7 +245,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, null_oid(), path);
 
 	/* early return if there isn't a path->module mapping */
 	if (!module)
@@ -262,17 +263,17 @@ int is_submodule_active(struct repository *repo, const char *path)
 	sl = repo_config_get_value_multi(repo, "submodule.active");
 	if (sl) {
 		struct pathspec ps;
-		struct argv_array args = ARGV_ARRAY_INIT;
+		struct strvec args = STRVEC_INIT;
 		const struct string_list_item *item;
 
 		for_each_string_list_item(item, sl) {
-			argv_array_push(&args, item->string);
+			strvec_push(&args, item->string);
 		}
 
-		parse_pathspec(&ps, 0, 0, NULL, args.argv);
+		parse_pathspec(&ps, 0, 0, NULL, args.v);
 		ret = match_pathspec(repo->index, &ps, path, strlen(path), 0, NULL, 1);
 
-		argv_array_clear(&args);
+		strvec_clear(&args);
 		clear_pathspec(&ps);
 		return ret;
 	}
@@ -301,7 +302,7 @@ int is_submodule_populated_gently(const char *path, int *return_error_code)
 /*
  * Dies if the provided 'prefix' corresponds to an unpopulated submodule
  */
-void die_in_unpopulated_submodule(const struct index_state *istate,
+void die_in_unpopulated_submodule(struct index_state *istate,
 				  const char *prefix)
 {
 	int i, prefixlen;
@@ -331,7 +332,7 @@ void die_in_unpopulated_submodule(const struct index_state *istate,
 /*
  * Dies if any paths in the provided pathspec descends into a submodule
  */
-void die_path_inside_submodule(const struct index_state *istate,
+void die_path_inside_submodule(struct index_state *istate,
 			       const struct pathspec *ps)
 {
 	int i, j;
@@ -420,6 +421,7 @@ const char *submodule_strategy_to_string(const struct submodule_update_strategy
 void handle_ignore_submodules_arg(struct diff_options *diffopt,
 				  const char *arg)
 {
+	diffopt->flags.ignore_submodule_set = 1;
 	diffopt->flags.ignore_submodules = 0;
 	diffopt->flags.ignore_untracked_in_submodules = 0;
 	diffopt->flags.ignore_dirty_submodules = 0;
@@ -431,20 +433,21 @@ void handle_ignore_submodules_arg(struct diff_options *diffopt,
 	else if (!strcmp(arg, "dirty"))
 		diffopt->flags.ignore_dirty_submodules = 1;
 	else if (strcmp(arg, "none"))
-		die("bad --ignore-submodules argument: %s", arg);
+		die(_("bad --ignore-submodules argument: %s"), arg);
 	/*
 	 * Please update _git_status() in git-completion.bash when you
 	 * add new options
 	 */
 }
 
-static int prepare_submodule_summary(struct rev_info *rev, const char *path,
-		struct commit *left, struct commit *right,
-		struct commit_list *merge_bases)
+static int prepare_submodule_diff_summary(struct repository *r, struct rev_info *rev,
+					  const char *path,
+					  struct commit *left, struct commit *right,
+					  struct commit_list *merge_bases)
 {
 	struct commit_list *list;
 
-	repo_init_revisions(the_repository, rev, NULL);
+	repo_init_revisions(r, rev, NULL);
 	setup_revisions(0, NULL, rev, NULL);
 	rev->left_right = 1;
 	rev->first_parent_only = 1;
@@ -459,7 +462,7 @@ static int prepare_submodule_summary(struct rev_info *rev, const char *path,
 	return prepare_revision_walk(rev);
 }
 
-static void print_submodule_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
+static void print_submodule_diff_summary(struct repository *r, struct rev_info *rev, struct diff_options *o)
 {
 	static const char format[] = "  %m %s";
 	struct strbuf sb = STRBUF_INIT;
@@ -481,27 +484,14 @@ static void print_submodule_summary(struct repository *r, struct rev_info *rev,
 	strbuf_release(&sb);
 }
 
-static void prepare_submodule_repo_env_no_git_dir(struct argv_array *out)
+void prepare_submodule_repo_env(struct strvec *out)
 {
-	const char * const *var;
-
-	for (var = local_repo_env; *var; var++) {
-		if (strcmp(*var, CONFIG_DATA_ENVIRONMENT))
-			argv_array_push(out, *var);
-	}
-}
-
-void prepare_submodule_repo_env(struct argv_array *out)
-{
-	prepare_submodule_repo_env_no_git_dir(out);
-	argv_array_pushf(out, "%s=%s", GIT_DIR_ENVIRONMENT,
-			 DEFAULT_GIT_DIR_ENVIRONMENT);
+	prepare_other_repo_env(out, DEFAULT_GIT_DIR_ENVIRONMENT);
 }
 
-static void prepare_submodule_repo_env_in_gitdir(struct argv_array *out)
+static void prepare_submodule_repo_env_in_gitdir(struct strvec *out)
 {
-	prepare_submodule_repo_env_no_git_dir(out);
-	argv_array_pushf(out, "%s=.", GIT_DIR_ENVIRONMENT);
+	prepare_other_repo_env(out, ".");
 }
 
 /*
@@ -610,7 +600,7 @@ output_header:
 	strbuf_release(&sb);
 }
 
-void show_submodule_summary(struct diff_options *o, const char *path,
+void show_submodule_diff_summary(struct diff_options *o, const char *path,
 		struct object_id *one, struct object_id *two,
 		unsigned dirty_submodule)
 {
@@ -632,12 +622,12 @@ void show_submodule_summary(struct diff_options *o, const char *path,
 		goto out;
 
 	/* Treat revision walker failure the same as missing commits */
-	if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) {
+	if (prepare_submodule_diff_summary(sub, &rev, path, left, right, merge_bases)) {
 		diff_emit_submodule_error(o, "(revision walker failed)\n");
 		goto out;
 	}
 
-	print_submodule_summary(sub, &rev, o);
+	print_submodule_diff_summary(sub, &rev, o);
 
 out:
 	if (merge_bases)
@@ -681,22 +671,22 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
 	cp.no_stdin = 1;
 
 	/* TODO: other options may need to be passed here. */
-	argv_array_pushl(&cp.args, "diff", "--submodule=diff", NULL);
-	argv_array_pushf(&cp.args, "--color=%s", want_color(o->use_color) ?
+	strvec_pushl(&cp.args, "diff", "--submodule=diff", NULL);
+	strvec_pushf(&cp.args, "--color=%s", want_color(o->use_color) ?
 			 "always" : "never");
 
 	if (o->flags.reverse_diff) {
-		argv_array_pushf(&cp.args, "--src-prefix=%s%s/",
-				 o->b_prefix, path);
-		argv_array_pushf(&cp.args, "--dst-prefix=%s%s/",
-				 o->a_prefix, path);
+		strvec_pushf(&cp.args, "--src-prefix=%s%s/",
+			     o->b_prefix, path);
+		strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
+			     o->a_prefix, path);
 	} else {
-		argv_array_pushf(&cp.args, "--src-prefix=%s%s/",
-				 o->a_prefix, path);
-		argv_array_pushf(&cp.args, "--dst-prefix=%s%s/",
-				 o->b_prefix, path);
+		strvec_pushf(&cp.args, "--src-prefix=%s%s/",
+			     o->a_prefix, path);
+		strvec_pushf(&cp.args, "--dst-prefix=%s%s/",
+			     o->b_prefix, path);
 	}
-	argv_array_push(&cp.args, oid_to_hex(old_oid));
+	strvec_push(&cp.args, oid_to_hex(old_oid));
 	/*
 	 * If the submodule has modified content, we will diff against the
 	 * work tree, under the assumption that the user has asked for the
@@ -704,7 +694,7 @@ void show_submodule_inline_diff(struct diff_options *o, const char *path,
 	 * haven't yet been committed to the submodule yet.
 	 */
 	if (!(dirty_submodule & DIRTY_SUBMODULE_MODIFIED))
-		argv_array_push(&cp.args, oid_to_hex(new_oid));
+		strvec_push(&cp.args, oid_to_hex(new_oid));
 
 	prepare_submodule_repo_env(&cp.env_array);
 	if (start_command(&cp))
@@ -743,7 +733,7 @@ const struct submodule *submodule_from_ce(const struct cache_entry *ce)
 	if (!should_update_submodules())
 		return NULL;
 
-	return submodule_from_path(the_repository, &null_oid, ce->name);
+	return submodule_from_path(the_repository, null_oid(), ce->name);
 }
 
 static struct oid_array *submodule_commits(struct string_list *submodules,
@@ -812,9 +802,9 @@ static void collect_changed_submodules_cb(struct diff_queue_struct *q,
 				submodule = submodule_from_name(me->repo,
 								commit_oid, name);
 			if (submodule) {
-				warning("Submodule in commit %s at path: "
+				warning(_("Submodule in commit %s at path: "
 					"'%s' collides with a submodule named "
-					"the same. Skipping it.",
+					"the same. Skipping it."),
 					oid_to_hex(commit_oid), p->two->path);
 				name = NULL;
 			}
@@ -836,15 +826,22 @@ static void collect_changed_submodules_cb(struct diff_queue_struct *q,
  */
 static void collect_changed_submodules(struct repository *r,
 				       struct string_list *changed,
-				       struct argv_array *argv)
+				       struct strvec *argv)
 {
 	struct rev_info rev;
 	const struct commit *commit;
+	int save_warning;
+	struct setup_revision_opt s_r_opt = {
+		.assume_dashdash = 1,
+	};
 
+	save_warning = warn_on_object_refname_ambiguity;
+	warn_on_object_refname_ambiguity = 0;
 	repo_init_revisions(r, &rev, NULL);
-	setup_revisions(argv->argc, argv->argv, &rev, NULL);
+	setup_revisions(argv->nr, argv->v, &rev, &s_r_opt);
+	warn_on_object_refname_ambiguity = save_warning;
 	if (prepare_revision_walk(&rev))
-		die("revision walk setup failed");
+		die(_("revision walk setup failed"));
 
 	while ((commit = get_revision(&rev))) {
 		struct rev_info diff_rev;
@@ -857,7 +854,8 @@ static void collect_changed_submodules(struct repository *r,
 		diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
 		diff_rev.diffopt.format_callback = collect_changed_submodules_cb;
 		diff_rev.diffopt.format_callback_data = &data;
-		diff_tree_combined_merge(commit, 1, &diff_rev);
+		diff_rev.dense_combined_merges = 1;
+		diff_tree_combined_merge(commit, &diff_rev);
 	}
 
 	reset_revision_walk();
@@ -879,8 +877,8 @@ static int has_remote(const char *refname, const struct object_id *oid,
 
 static int append_oid_to_argv(const struct object_id *oid, void *data)
 {
-	struct argv_array *argv = data;
-	argv_array_push(argv, oid_to_hex(oid));
+	struct strvec *argv = data;
+	strvec_push(argv, oid_to_hex(oid));
 	return 0;
 }
 
@@ -941,9 +939,9 @@ static int submodule_has_commits(struct repository *r,
 		struct child_process cp = CHILD_PROCESS_INIT;
 		struct strbuf out = STRBUF_INIT;
 
-		argv_array_pushl(&cp.args, "rev-list", "-n", "1", NULL);
+		strvec_pushl(&cp.args, "rev-list", "-n", "1", NULL);
 		oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
-		argv_array_pushl(&cp.args, "--not", "--all", NULL);
+		strvec_pushl(&cp.args, "--not", "--all", NULL);
 
 		prepare_submodule_repo_env(&cp.env_array);
 		cp.git_cmd = 1;
@@ -982,9 +980,9 @@ static int submodule_needs_pushing(struct repository *r,
 		struct strbuf buf = STRBUF_INIT;
 		int needs_pushing = 0;
 
-		argv_array_push(&cp.args, "rev-list");
+		strvec_push(&cp.args, "rev-list");
 		oid_array_for_each_unique(commits, append_oid_to_argv, &cp.args);
-		argv_array_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
+		strvec_pushl(&cp.args, "--not", "--remotes", "-n", "1" , NULL);
 
 		prepare_submodule_repo_env(&cp.env_array);
 		cp.git_cmd = 1;
@@ -992,7 +990,7 @@ static int submodule_needs_pushing(struct repository *r,
 		cp.out = -1;
 		cp.dir = path;
 		if (start_command(&cp))
-			die("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s",
+			die(_("Could not run 'git rev-list <commits> --not --remotes -n 1' command in submodule %s"),
 					path);
 		if (strbuf_read(&buf, cp.out, the_hash_algo->hexsz + 1))
 			needs_pushing = 1;
@@ -1012,13 +1010,13 @@ int find_unpushed_submodules(struct repository *r,
 {
 	struct string_list submodules = STRING_LIST_INIT_DUP;
 	struct string_list_item *name;
-	struct argv_array argv = ARGV_ARRAY_INIT;
+	struct strvec argv = STRVEC_INIT;
 
-	/* argv.argv[0] will be ignored by setup_revisions */
-	argv_array_push(&argv, "find_unpushed_submodules");
+	/* argv.v[0] will be ignored by setup_revisions */
+	strvec_push(&argv, "find_unpushed_submodules");
 	oid_array_for_each_unique(commits, append_oid_to_argv, &argv);
-	argv_array_push(&argv, "--not");
-	argv_array_pushf(&argv, "--remotes=%s", remotes_name);
+	strvec_push(&argv, "--not");
+	strvec_pushf(&argv, "--remotes=%s", remotes_name);
 
 	collect_changed_submodules(r, &submodules, &argv);
 
@@ -1027,7 +1025,7 @@ int find_unpushed_submodules(struct repository *r,
 		const struct submodule *submodule;
 		const char *path = NULL;
 
-		submodule = submodule_from_name(r, &null_oid, name->string);
+		submodule = submodule_from_name(r, null_oid(), name->string);
 		if (submodule)
 			path = submodule->path;
 		else
@@ -1041,7 +1039,7 @@ int find_unpushed_submodules(struct repository *r,
 	}
 
 	free_submodules_oids(&submodules);
-	argv_array_clear(&argv);
+	strvec_clear(&argv);
 
 	return needs_pushing->nr;
 }
@@ -1054,22 +1052,22 @@ static int push_submodule(const char *path,
 {
 	if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
 		struct child_process cp = CHILD_PROCESS_INIT;
-		argv_array_push(&cp.args, "push");
+		strvec_push(&cp.args, "push");
 		if (dry_run)
-			argv_array_push(&cp.args, "--dry-run");
+			strvec_push(&cp.args, "--dry-run");
 
 		if (push_options && push_options->nr) {
 			const struct string_list_item *item;
 			for_each_string_list_item(item, push_options)
-				argv_array_pushf(&cp.args, "--push-option=%s",
-						 item->string);
+				strvec_pushf(&cp.args, "--push-option=%s",
+					     item->string);
 		}
 
 		if (remote->origin != REMOTE_UNCONFIGURED) {
 			int i;
-			argv_array_push(&cp.args, remote->name);
+			strvec_push(&cp.args, remote->name);
 			for (i = 0; i < rs->raw_nr; i++)
-				argv_array_push(&cp.args, rs->raw[i]);
+				strvec_push(&cp.args, rs->raw[i]);
 		}
 
 		prepare_submodule_repo_env(&cp.env_array);
@@ -1095,13 +1093,13 @@ static void submodule_push_check(const char *path, const char *head,
 	struct child_process cp = CHILD_PROCESS_INIT;
 	int i;
 
-	argv_array_push(&cp.args, "submodule--helper");
-	argv_array_push(&cp.args, "push-check");
-	argv_array_push(&cp.args, head);
-	argv_array_push(&cp.args, remote->name);
+	strvec_push(&cp.args, "submodule--helper");
+	strvec_push(&cp.args, "push-check");
+	strvec_push(&cp.args, head);
+	strvec_push(&cp.args, remote->name);
 
 	for (i = 0; i < rs->raw_nr; i++)
-		argv_array_push(&cp.args, rs->raw[i]);
+		strvec_push(&cp.args, rs->raw[i]);
 
 	prepare_submodule_repo_env(&cp.env_array);
 	cp.git_cmd = 1;
@@ -1115,7 +1113,7 @@ static void submodule_push_check(const char *path, const char *head,
 	 * child process.
 	 */
 	if (run_command(&cp))
-		die("process for submodule '%s' failed", path);
+		die(_("process for submodule '%s' failed"), path);
 }
 
 int push_unpushed_submodules(struct repository *r,
@@ -1155,10 +1153,10 @@ int push_unpushed_submodules(struct repository *r,
 	/* Actually push the submodules */
 	for (i = 0; i < needs_pushing.nr; i++) {
 		const char *path = needs_pushing.items[i].string;
-		fprintf(stderr, "Pushing submodule '%s'\n", path);
+		fprintf(stderr, _("Pushing submodule '%s'\n"), path);
 		if (!push_submodule(path, remote, rs,
 				    push_options, dry_run)) {
-			fprintf(stderr, "Unable to push submodule '%s'\n", path);
+			fprintf(stderr, _("Unable to push submodule '%s'\n"), path);
 			ret = 0;
 		}
 	}
@@ -1189,17 +1187,17 @@ void check_for_new_submodule_commits(struct object_id *oid)
 static void calculate_changed_submodule_paths(struct repository *r,
 		struct string_list *changed_submodule_names)
 {
-	struct argv_array argv = ARGV_ARRAY_INIT;
+	struct strvec argv = STRVEC_INIT;
 	struct string_list_item *name;
 
 	/* No need to check if there are no submodules configured */
 	if (!submodule_from_path(r, NULL, NULL))
 		return;
 
-	argv_array_push(&argv, "--"); /* argv[0] program name */
+	strvec_push(&argv, "--"); /* argv[0] program name */
 	oid_array_for_each_unique(&ref_tips_after_fetch,
 				   append_oid_to_argv, &argv);
-	argv_array_push(&argv, "--not");
+	strvec_push(&argv, "--not");
 	oid_array_for_each_unique(&ref_tips_before_fetch,
 				   append_oid_to_argv, &argv);
 
@@ -1214,7 +1212,7 @@ static void calculate_changed_submodule_paths(struct repository *r,
 		const struct submodule *submodule;
 		const char *path = NULL;
 
-		submodule = submodule_from_name(r, &null_oid, name->string);
+		submodule = submodule_from_name(r, null_oid(), name->string);
 		if (submodule)
 			path = submodule->path;
 		else
@@ -1231,7 +1229,7 @@ static void calculate_changed_submodule_paths(struct repository *r,
 
 	string_list_remove_empty_items(changed_submodule_names, 1);
 
-	argv_array_clear(&argv);
+	strvec_clear(&argv);
 	oid_array_clear(&ref_tips_before_fetch);
 	oid_array_clear(&ref_tips_after_fetch);
 	initialized_fetch_ref_tips = 0;
@@ -1242,24 +1240,24 @@ int submodule_touches_in_range(struct repository *r,
 			       struct object_id *incl_oid)
 {
 	struct string_list subs = STRING_LIST_INIT_DUP;
-	struct argv_array args = ARGV_ARRAY_INIT;
+	struct strvec args = STRVEC_INIT;
 	int ret;
 
 	/* No need to check if there are no submodules configured */
 	if (!submodule_from_path(r, NULL, NULL))
 		return 0;
 
-	argv_array_push(&args, "--"); /* args[0] program name */
-	argv_array_push(&args, oid_to_hex(incl_oid));
+	strvec_push(&args, "--"); /* args[0] program name */
+	strvec_push(&args, oid_to_hex(incl_oid));
 	if (!is_null_oid(excl_oid)) {
-		argv_array_push(&args, "--not");
-		argv_array_push(&args, oid_to_hex(excl_oid));
+		strvec_push(&args, "--not");
+		strvec_push(&args, oid_to_hex(excl_oid));
 	}
 
 	collect_changed_submodules(r, &subs, &args);
 	ret = subs.nr;
 
-	argv_array_clear(&args);
+	strvec_clear(&args);
 
 	free_submodules_oids(&subs);
 	return ret;
@@ -1267,7 +1265,7 @@ int submodule_touches_in_range(struct repository *r,
 
 struct submodule_parallel_fetch {
 	int count;
-	struct argv_array args;
+	struct strvec args;
 	struct repository *r;
 	const char *prefix;
 	int command_line_option;
@@ -1280,10 +1278,12 @@ struct submodule_parallel_fetch {
 	/* Pending fetches by OIDs */
 	struct fetch_task **oid_fetch_tasks;
 	int oid_fetch_tasks_nr, oid_fetch_tasks_alloc;
+
+	struct strbuf submodules_with_errors;
 };
-#define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0, \
+#define SPF_INIT {0, STRVEC_INIT, NULL, NULL, 0, 0, 0, 0, \
 		  STRING_LIST_INIT_DUP, \
-		  NULL, 0, 0}
+		  NULL, 0, 0, STRBUF_INIT}
 
 static int get_fetch_recurse_config(const struct submodule *submodule,
 				    struct submodule_parallel_fetch *spf)
@@ -1297,7 +1297,7 @@ static int get_fetch_recurse_config(const struct submodule *submodule,
 
 		int fetch_recurse = submodule->fetch_recurse;
 		key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
-		if (!repo_config_get_string_const(spf->r, key, &value)) {
+		if (!repo_config_get_string_tmp(spf->r, key, &value)) {
 			fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
 		}
 		free(key);
@@ -1349,7 +1349,7 @@ static struct fetch_task *fetch_task_create(struct repository *r,
 	struct fetch_task *task = xmalloc(sizeof(*task));
 	memset(task, 0, sizeof(*task));
 
-	task->sub = submodule_from_path(r, &null_oid, path);
+	task->sub = submodule_from_path(r, null_oid(), path);
 	if (!task->sub) {
 		/*
 		 * No entry in .gitmodules? Technically not a submodule,
@@ -1448,17 +1448,17 @@ static int get_next_submodule(struct child_process *cp,
 			prepare_submodule_repo_env_in_gitdir(&cp->env_array);
 			cp->git_cmd = 1;
 			if (!spf->quiet)
-				strbuf_addf(err, "Fetching submodule %s%s\n",
+				strbuf_addf(err, _("Fetching submodule %s%s\n"),
 					    spf->prefix, ce->name);
-			argv_array_init(&cp->args);
-			argv_array_pushv(&cp->args, spf->args.argv);
-			argv_array_push(&cp->args, default_argv);
-			argv_array_push(&cp->args, "--submodule-prefix");
+			strvec_init(&cp->args);
+			strvec_pushv(&cp->args, spf->args.v);
+			strvec_push(&cp->args, default_argv);
+			strvec_push(&cp->args, "--submodule-prefix");
 
 			strbuf_addf(&submodule_prefix, "%s%s/",
 						       spf->prefix,
 						       task->sub->path);
-			argv_array_push(&cp->args, submodule_prefix.buf);
+			strvec_push(&cp->args, submodule_prefix.buf);
 
 			spf->count++;
 			*task_cb = task;
@@ -1466,6 +1466,7 @@ static int get_next_submodule(struct child_process *cp,
 			strbuf_release(&submodule_prefix);
 			return 1;
 		} else {
+			struct strbuf empty_submodule_path = STRBUF_INIT;
 
 			fetch_task_release(task);
 			free(task);
@@ -1474,13 +1475,17 @@ static int get_next_submodule(struct child_process *cp,
 			 * An empty directory is normal,
 			 * the submodule is not initialized
 			 */
+			strbuf_addf(&empty_submodule_path, "%s/%s/",
+							spf->r->worktree,
+							ce->name);
 			if (S_ISGITLINK(ce->ce_mode) &&
-			    !is_empty_dir(ce->name)) {
+			    !is_empty_dir(empty_submodule_path.buf)) {
 				spf->result = 1;
 				strbuf_addf(err,
-					    _("Could not access submodule '%s'"),
+					    _("Could not access submodule '%s'\n"),
 					    ce->name);
 			}
+			strbuf_release(&empty_submodule_path);
 		}
 	}
 
@@ -1498,14 +1503,14 @@ static int get_next_submodule(struct child_process *cp,
 		cp->git_cmd = 1;
 		cp->dir = task->repo->gitdir;
 
-		argv_array_init(&cp->args);
-		argv_array_pushv(&cp->args, spf->args.argv);
-		argv_array_push(&cp->args, "on-demand");
-		argv_array_push(&cp->args, "--submodule-prefix");
-		argv_array_push(&cp->args, submodule_prefix.buf);
+		strvec_init(&cp->args);
+		strvec_pushv(&cp->args, spf->args.v);
+		strvec_push(&cp->args, "on-demand");
+		strvec_push(&cp->args, "--submodule-prefix");
+		strvec_push(&cp->args, submodule_prefix.buf);
 
 		/* NEEDSWORK: have get_default_remote from submodule--helper */
-		argv_array_push(&cp->args, "origin");
+		strvec_push(&cp->args, "origin");
 		oid_array_for_each_unique(task->commits,
 					  append_oid_to_argv, &cp->args);
 
@@ -1547,7 +1552,10 @@ static int fetch_finish(int retvalue, struct strbuf *err,
 	struct string_list_item *it;
 	struct oid_array *commits;
 
-	if (retvalue)
+	if (!task || !task->sub)
+		BUG("callback cookie bogus");
+
+	if (retvalue) {
 		/*
 		 * NEEDSWORK: This indicates that the overall fetch
 		 * failed, even though there may be a subsequent fetch
@@ -1557,8 +1565,9 @@ static int fetch_finish(int retvalue, struct strbuf *err,
 		 */
 		spf->result = 1;
 
-	if (!task || !task->sub)
-		BUG("callback cookie bogus");
+		strbuf_addf(&spf->submodules_with_errors, "\t%s\n",
+			    task->sub->name);
+	}
 
 	/* Is this the second time we process this submodule? */
 	if (task->commits)
@@ -1592,7 +1601,7 @@ out:
 }
 
 int fetch_populated_submodules(struct repository *r,
-			       const struct argv_array *options,
+			       const struct strvec *options,
 			       const char *prefix, int command_line_option,
 			       int default_option,
 			       int quiet, int max_parallel_jobs)
@@ -1610,12 +1619,12 @@ int fetch_populated_submodules(struct repository *r,
 		goto out;
 
 	if (repo_read_index(r) < 0)
-		die("index file corrupt");
+		die(_("index file corrupt"));
 
-	argv_array_push(&spf.args, "fetch");
-	for (i = 0; i < options->argc; i++)
-		argv_array_push(&spf.args, options->argv[i]);
-	argv_array_push(&spf.args, "--recurse-submodules-default");
+	strvec_push(&spf.args, "fetch");
+	for (i = 0; i < options->nr; i++)
+		strvec_push(&spf.args, options->v[i]);
+	strvec_push(&spf.args, "--recurse-submodules-default");
 	/* default value, "--submodule-prefix" and its value are added later */
 
 	calculate_changed_submodule_paths(r, &spf.changed_submodule_names);
@@ -1627,7 +1636,12 @@ int fetch_populated_submodules(struct repository *r,
 				   &spf,
 				   "submodule", "parallel/fetch");
 
-	argv_array_clear(&spf.args);
+	if (spf.submodules_with_errors.len > 0)
+		fprintf(stderr, _("Errors during submodule fetch:\n%s"),
+			spf.submodules_with_errors.buf);
+
+
+	strvec_clear(&spf.args);
 out:
 	free_submodules_oids(&spf.changed_submodule_names);
 	return spf.result;
@@ -1655,9 +1669,9 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 	}
 	strbuf_reset(&buf);
 
-	argv_array_pushl(&cp.args, "status", "--porcelain=2", NULL);
+	strvec_pushl(&cp.args, "status", "--porcelain=2", NULL);
 	if (ignore_untracked)
-		argv_array_push(&cp.args, "-uno");
+		strvec_push(&cp.args, "-uno");
 
 	prepare_submodule_repo_env(&cp.env_array);
 	cp.git_cmd = 1;
@@ -1665,7 +1679,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 	cp.out = -1;
 	cp.dir = path;
 	if (start_command(&cp))
-		die("Could not run 'git status --porcelain=2' in submodule %s", path);
+		die(_("Could not run 'git status --porcelain=2' in submodule %s"), path);
 
 	fp = xfdopen(cp.out, "r");
 	while (strbuf_getwholeline(&buf, fp, '\n') != EOF) {
@@ -1706,7 +1720,7 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 	fclose(fp);
 
 	if (finish_command(&cp) && !ignore_cp_exit_code)
-		die("'git status --porcelain=2' failed in submodule %s", path);
+		die(_("'git status --porcelain=2' failed in submodule %s"), path);
 
 	strbuf_release(&buf);
 	return dirty_submodule;
@@ -1715,14 +1729,6 @@ unsigned is_submodule_modified(const char *path, int ignore_untracked)
 int submodule_uses_gitfile(const char *path)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
-	const char *argv[] = {
-		"submodule",
-		"foreach",
-		"--quiet",
-		"--recursive",
-		"test -f .git",
-		NULL,
-	};
 	struct strbuf buf = STRBUF_INIT;
 	const char *git_dir;
 
@@ -1735,7 +1741,10 @@ int submodule_uses_gitfile(const char *path)
 	strbuf_release(&buf);
 
 	/* Now test that all nested submodules use a gitfile too */
-	cp.argv = argv;
+	strvec_pushl(&cp.args,
+		     "submodule", "foreach", "--quiet",	"--recursive",
+		     "test -f .git", NULL);
+
 	prepare_submodule_repo_env(&cp.env_array);
 	cp.git_cmd = 1;
 	cp.no_stdin = 1;
@@ -1768,16 +1777,16 @@ int bad_to_remove_submodule(const char *path, unsigned flags)
 	if (!submodule_uses_gitfile(path))
 		return 1;
 
-	argv_array_pushl(&cp.args, "status", "--porcelain",
-				   "--ignore-submodules=none", NULL);
+	strvec_pushl(&cp.args, "status", "--porcelain",
+		     "--ignore-submodules=none", NULL);
 
 	if (flags & SUBMODULE_REMOVAL_IGNORE_UNTRACKED)
-		argv_array_push(&cp.args, "-uno");
+		strvec_push(&cp.args, "-uno");
 	else
-		argv_array_push(&cp.args, "-uall");
+		strvec_push(&cp.args, "-uall");
 
 	if (!(flags & SUBMODULE_REMOVAL_IGNORE_IGNORED_UNTRACKED))
-		argv_array_push(&cp.args, "--ignored");
+		strvec_push(&cp.args, "--ignored");
 
 	prepare_submodule_repo_env(&cp.env_array);
 	cp.git_cmd = 1;
@@ -1811,7 +1820,7 @@ out:
 void submodule_unset_core_worktree(const struct submodule *sub)
 {
 	char *config_path = xstrfmt("%s/modules/%s/config",
-				    get_git_common_dir(), sub->name);
+				    get_git_dir(), sub->name);
 
 	if (git_config_set_in_file_gently(config_path, "core.worktree", NULL))
 		warning(_("Could not unset core.worktree setting in submodule '%s'"),
@@ -1835,13 +1844,13 @@ static int submodule_has_dirty_index(const struct submodule *sub)
 	prepare_submodule_repo_env(&cp.env_array);
 
 	cp.git_cmd = 1;
-	argv_array_pushl(&cp.args, "diff-index", "--quiet",
-				   "--cached", "HEAD", NULL);
+	strvec_pushl(&cp.args, "diff-index", "--quiet",
+		     "--cached", "HEAD", NULL);
 	cp.no_stdin = 1;
 	cp.no_stdout = 1;
 	cp.dir = sub->path;
 	if (start_command(&cp))
-		die("could not recurse into submodule '%s'", sub->path);
+		die(_("could not recurse into submodule '%s'"), sub->path);
 
 	return finish_command(&cp);
 }
@@ -1855,14 +1864,14 @@ static void submodule_reset_index(const char *path)
 	cp.no_stdin = 1;
 	cp.dir = path;
 
-	argv_array_pushf(&cp.args, "--super-prefix=%s%s/",
-				   get_super_prefix_or_empty(), path);
-	argv_array_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
+	strvec_pushf(&cp.args, "--super-prefix=%s%s/",
+		     get_super_prefix_or_empty(), path);
+	strvec_pushl(&cp.args, "read-tree", "-u", "--reset", NULL);
 
-	argv_array_push(&cp.args, empty_tree_oid_hex());
+	strvec_push(&cp.args, empty_tree_oid_hex());
 
 	if (run_command(&cp))
-		die("could not reset submodule index");
+		die(_("could not reset submodule index"));
 }
 
 /**
@@ -1896,7 +1905,7 @@ int submodule_move_head(const char *path,
 	if (old_head && !is_submodule_populated_gently(path, error_code_ptr))
 		return 0;
 
-	sub = submodule_from_path(the_repository, &null_oid, path);
+	sub = submodule_from_path(the_repository, null_oid(), path);
 
 	if (!sub)
 		BUG("could not get submodule information for '%s'", path);
@@ -1914,7 +1923,7 @@ int submodule_move_head(const char *path,
 					ABSORB_GITDIR_RECURSE_SUBMODULES);
 		} else {
 			char *gitdir = xstrfmt("%s/modules/%s",
-				    get_git_common_dir(), sub->name);
+				    get_git_dir(), sub->name);
 			connect_work_tree_and_git_dir(path, gitdir, 0);
 			free(gitdir);
 
@@ -1924,7 +1933,7 @@ int submodule_move_head(const char *path,
 
 		if (old_head && (flags & SUBMODULE_MOVE_HEAD_FORCE)) {
 			char *gitdir = xstrfmt("%s/modules/%s",
-				    get_git_common_dir(), sub->name);
+				    get_git_dir(), sub->name);
 			connect_work_tree_and_git_dir(path, gitdir, 1);
 			free(gitdir);
 		}
@@ -1936,24 +1945,24 @@ int submodule_move_head(const char *path,
 	cp.no_stdin = 1;
 	cp.dir = path;
 
-	argv_array_pushf(&cp.args, "--super-prefix=%s%s/",
-			get_super_prefix_or_empty(), path);
-	argv_array_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL);
+	strvec_pushf(&cp.args, "--super-prefix=%s%s/",
+		     get_super_prefix_or_empty(), path);
+	strvec_pushl(&cp.args, "read-tree", "--recurse-submodules", NULL);
 
 	if (flags & SUBMODULE_MOVE_HEAD_DRY_RUN)
-		argv_array_push(&cp.args, "-n");
+		strvec_push(&cp.args, "-n");
 	else
-		argv_array_push(&cp.args, "-u");
+		strvec_push(&cp.args, "-u");
 
 	if (flags & SUBMODULE_MOVE_HEAD_FORCE)
-		argv_array_push(&cp.args, "--reset");
+		strvec_push(&cp.args, "--reset");
 	else
-		argv_array_push(&cp.args, "-m");
+		strvec_push(&cp.args, "-m");
 
 	if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
-		argv_array_push(&cp.args, old_head ? old_head : empty_tree_oid_hex());
+		strvec_push(&cp.args, old_head ? old_head : empty_tree_oid_hex());
 
-	argv_array_push(&cp.args, new_head ? new_head : empty_tree_oid_hex());
+	strvec_push(&cp.args, new_head ? new_head : empty_tree_oid_hex());
 
 	if (run_command(&cp)) {
 		ret = error(_("Submodule '%s' could not be updated."), path);
@@ -1969,8 +1978,8 @@ int submodule_move_head(const char *path,
 			cp.dir = path;
 
 			prepare_submodule_repo_env(&cp.env_array);
-			argv_array_pushl(&cp.args, "update-ref", "HEAD",
-					 "--no-deref", new_head, NULL);
+			strvec_pushl(&cp.args, "update-ref", "HEAD",
+				     "--no-deref", new_head, NULL);
 
 			if (run_command(&cp)) {
 				ret = -1;
@@ -1993,6 +2002,47 @@ out:
 	return ret;
 }
 
+int validate_submodule_git_dir(char *git_dir, const char *submodule_name)
+{
+	size_t len = strlen(git_dir), suffix_len = strlen(submodule_name);
+	char *p;
+	int ret = 0;
+
+	if (len <= suffix_len || (p = git_dir + len - suffix_len)[-1] != '/' ||
+	    strcmp(p, submodule_name))
+		BUG("submodule name '%s' not a suffix of git dir '%s'",
+		    submodule_name, git_dir);
+
+	/*
+	 * We prevent the contents of sibling submodules' git directories to
+	 * clash.
+	 *
+	 * Example: having a submodule named `hippo` and another one named
+	 * `hippo/hooks` would result in the git directories
+	 * `.git/modules/hippo/` and `.git/modules/hippo/hooks/`, respectively,
+	 * but the latter directory is already designated to contain the hooks
+	 * of the former.
+	 */
+	for (; *p; p++) {
+		if (is_dir_sep(*p)) {
+			char c = *p;
+
+			*p = '\0';
+			if (is_git_directory(git_dir))
+				ret = -1;
+			*p = c;
+
+			if (ret < 0)
+				return error(_("submodule git dir '%s' is "
+					       "inside git dir '%.*s'"),
+					     git_dir,
+					     (int)(p - git_dir), git_dir);
+		}
+	}
+
+	return 0;
+}
+
 /*
  * Embeds a single submodules git directory into the superprojects git dir,
  * non recursively.
@@ -2000,7 +2050,7 @@ out:
 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;
-	const char *new_git_dir;
+	char *new_git_dir;
 	const struct submodule *sub;
 
 	if (submodule_uses_worktrees(path))
@@ -2014,14 +2064,18 @@ static void relocate_single_git_dir_into_superproject(const char *path)
 
 	real_old_git_dir = real_pathdup(old_git_dir, 1);
 
-	sub = submodule_from_path(the_repository, &null_oid, path);
+	sub = submodule_from_path(the_repository, null_oid(), path);
 	if (!sub)
 		die(_("could not lookup name for submodule '%s'"), path);
 
-	new_git_dir = git_path("modules/%s", sub->name);
+	new_git_dir = git_pathdup("modules/%s", sub->name);
+	if (validate_submodule_git_dir(new_git_dir, 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);
 
 	fprintf(stderr, _("Migrating git directory of '%s%s' from\n'%s' to\n'%s'\n"),
 		get_super_prefix_or_empty(), path,
@@ -2069,7 +2123,7 @@ void absorb_git_dir_into_superproject(const char *path,
 		* superproject did not rewrite the git file links yet,
 		* fix it now.
 		*/
-		sub = submodule_from_path(the_repository, &null_oid, 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,
@@ -2101,9 +2155,9 @@ void absorb_git_dir_into_superproject(const char *path,
 		cp.dir = path;
 		cp.git_cmd = 1;
 		cp.no_stdin = 1;
-		argv_array_pushl(&cp.args, "--super-prefix", sb.buf,
-					   "submodule--helper",
-					   "absorb-git-dirs", NULL);
+		strvec_pushl(&cp.args, "--super-prefix", sb.buf,
+			     "submodule--helper",
+			     "absorb-git-dirs", NULL);
 		prepare_submodule_repo_env(&cp.env_array);
 		if (run_command(&cp))
 			die(_("could not recurse into submodule '%s'"), path);
@@ -2112,13 +2166,13 @@ void absorb_git_dir_into_superproject(const char *path,
 	}
 }
 
-const char *get_superproject_working_tree(void)
+int get_superproject_working_tree(struct strbuf *buf)
 {
 	struct child_process cp = CHILD_PROCESS_INIT;
 	struct strbuf sb = STRBUF_INIT;
-	const char *one_up = real_path_if_valid("../");
+	struct strbuf one_up = STRBUF_INIT;
 	const char *cwd = xgetcwd();
-	const char *ret = NULL;
+	int ret = 0;
 	const char *subpath;
 	int code;
 	ssize_t len;
@@ -2129,19 +2183,20 @@ const char *get_superproject_working_tree(void)
 		 * We might have a superproject, but it is harder
 		 * to determine.
 		 */
-		return NULL;
+		return 0;
 
-	if (!one_up)
-		return NULL;
+	if (!strbuf_realpath(&one_up, "../", 0))
+		return 0;
 
-	subpath = relative_path(cwd, one_up, &sb);
+	subpath = relative_path(cwd, one_up.buf, &sb);
+	strbuf_release(&one_up);
 
 	prepare_submodule_repo_env(&cp.env_array);
-	argv_array_pop(&cp.env_array);
+	strvec_pop(&cp.env_array);
 
-	argv_array_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
-			"ls-files", "-z", "--stage", "--full-name", "--",
-			subpath, NULL);
+	strvec_pushl(&cp.args, "--literal-pathspecs", "-C", "..",
+		     "ls-files", "-z", "--stage", "--full-name", "--",
+		     subpath, NULL);
 	strbuf_reset(&sb);
 
 	cp.no_stdin = 1;
@@ -2175,7 +2230,8 @@ const char *get_superproject_working_tree(void)
 		super_wt = xstrdup(cwd);
 		super_wt[cwd_len - super_sub_len] = '\0';
 
-		ret = real_path(super_wt);
+		strbuf_realpath(buf, super_wt, 1);
+		ret = 1;
 		free(super_wt);
 	}
 	strbuf_release(&sb);
@@ -2184,10 +2240,10 @@ const char *get_superproject_working_tree(void)
 
 	if (code == 128)
 		/* '../' is not a git repository */
-		return NULL;
+		return 0;
 	if (code == 0 && len == 0)
 		/* There is an unrelated git repository at '../' */
-		return NULL;
+		return 0;
 	if (code)
 		die(_("ls-tree returned unexpected return code %d"), code);
 
@@ -2215,7 +2271,8 @@ int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
 		strbuf_addstr(buf, git_dir);
 	}
 	if (!is_git_directory(buf->buf)) {
-		sub = submodule_from_path(the_repository, &null_oid, submodule);
+		sub = submodule_from_path(the_repository, null_oid(),
+					  submodule);
 		if (!sub) {
 			ret = -1;
 			goto cleanup;
diff --git a/submodule.h b/submodule.h
index 8072e6d6dd..84640c49c1 100644
--- a/submodule.h
+++ b/submodule.h
@@ -1,7 +1,7 @@
 #ifndef SUBMODULE_H
 #define SUBMODULE_H
 
-struct argv_array;
+struct strvec;
 struct cache_entry;
 struct diff_options;
 struct index_state;
@@ -39,7 +39,7 @@ struct submodule_update_strategy {
 };
 #define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
 
-int is_gitmodules_unmerged(const struct index_state *istate);
+int is_gitmodules_unmerged(struct index_state *istate);
 int is_writing_gitmodules_ok(void);
 int is_staging_gitmodules_ok(struct index_state *istate);
 int update_path_in_gitmodules(const char *oldpath, const char *newpath);
@@ -60,16 +60,16 @@ int is_submodule_active(struct repository *repo, const char *path);
  * Otherwise the return error code is the same as of resolve_gitdir_gently.
  */
 int is_submodule_populated_gently(const char *path, int *return_error_code);
-void die_in_unpopulated_submodule(const struct index_state *istate,
+void die_in_unpopulated_submodule(struct index_state *istate,
 				  const char *prefix);
-void die_path_inside_submodule(const struct index_state *istate,
+void die_path_inside_submodule(struct index_state *istate,
 			       const struct pathspec *ps);
 enum submodule_update_type parse_submodule_update_type(const char *value);
 int parse_submodule_update_strategy(const char *value,
 				    struct submodule_update_strategy *dst);
 const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
 void handle_ignore_submodules_arg(struct diff_options *, const char *);
-void show_submodule_summary(struct diff_options *o, const char *path,
+void show_submodule_diff_summary(struct diff_options *o, const char *path,
 			    struct object_id *one, struct object_id *two,
 			    unsigned dirty_submodule);
 void show_submodule_inline_diff(struct diff_options *o, const char *path,
@@ -84,7 +84,7 @@ int should_update_submodules(void);
 const struct submodule *submodule_from_ce(const struct cache_entry *ce);
 void check_for_new_submodule_commits(struct object_id *oid);
 int fetch_populated_submodules(struct repository *r,
-			       const struct argv_array *options,
+			       const struct strvec *options,
 			       const char *prefix,
 			       int command_line_option,
 			       int default_option,
@@ -124,6 +124,11 @@ int push_unpushed_submodules(struct repository *r,
  */
 int submodule_to_gitdir(struct strbuf *buf, const char *submodule);
 
+/*
+ * 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);
+
 #define SUBMODULE_MOVE_HEAD_DRY_RUN (1<<0)
 #define SUBMODULE_MOVE_HEAD_FORCE   (1<<1)
 int submodule_move_head(const char *path,
@@ -138,7 +143,7 @@ void submodule_unset_core_worktree(const struct submodule *sub);
  * a submodule by clearing any repo-specific environment variables, but
  * retaining any config in the environment.
  */
-void prepare_submodule_repo_env(struct argv_array *out);
+void prepare_submodule_repo_env(struct strvec *out);
 
 #define ABSORB_GITDIR_RECURSE_SUBMODULES (1<<0)
 void absorb_git_dir_into_superproject(const char *path,
@@ -147,8 +152,8 @@ void absorb_git_dir_into_superproject(const char *path,
 /*
  * Return the absolute path of the working tree of the superproject, which this
  * project is a submodule of. If this repository is not a submodule of
- * another repository, return NULL.
+ * another repository, return 0.
  */
-const char *get_superproject_working_tree(void);
+int get_superproject_working_tree(struct strbuf *buf);
 
 #endif
diff --git a/symlinks.c b/symlinks.c
index 69d458a24d..5232d02020 100644
--- a/symlinks.c
+++ b/symlinks.c
@@ -1,6 +1,7 @@
 #include "cache.h"
 
-static int threaded_check_leading_path(struct cache_def *cache, const char *name, int len);
+static int threaded_check_leading_path(struct cache_def *cache, const char *name,
+				       int len, int warn_on_lstat_err);
 static int threaded_has_dirs_only_path(struct cache_def *cache, const char *name, int len, int prefix_len);
 
 /*
@@ -72,7 +73,7 @@ static int lstat_cache_matchlen(struct cache_def *cache,
 				int prefix_len_stat_func)
 {
 	int match_len, last_slash, last_slash_dir, previous_slash;
-	int save_flags, ret;
+	int save_flags, ret, saved_errno = 0;
 	struct stat st;
 
 	if (cache->track_flags != track_flags ||
@@ -139,6 +140,7 @@ static int lstat_cache_matchlen(struct cache_def *cache,
 
 		if (ret) {
 			*ret_flags = FL_LSTATERR;
+			saved_errno = errno;
 			if (errno == ENOENT)
 				*ret_flags |= FL_NOENT;
 		} else if (S_ISDIR(st.st_mode)) {
@@ -180,6 +182,8 @@ static int lstat_cache_matchlen(struct cache_def *cache,
 	} else {
 		reset_lstat_cache(cache);
 	}
+	if (saved_errno)
+		errno = saved_errno;
 	return match_len;
 }
 
@@ -202,57 +206,47 @@ int threaded_has_symlink_leading_path(struct cache_def *cache, const char *name,
 	return lstat_cache(cache, name, len, FL_SYMLINK|FL_DIR, USE_ONLY_LSTAT) & FL_SYMLINK;
 }
 
-/*
- * Return non-zero if path 'name' has a leading symlink component
- */
 int has_symlink_leading_path(const char *name, int len)
 {
 	return threaded_has_symlink_leading_path(&default_cache, name, len);
 }
 
-/*
- * Return zero if path 'name' has a leading symlink component or
- * if some leading path component does not exists.
- *
- * Return -1 if leading path exists and is a directory.
- *
- * Return path length if leading path exists and is neither a
- * directory nor a symlink.
- */
-int check_leading_path(const char *name, int len)
+int check_leading_path(const char *name, int len, int warn_on_lstat_err)
 {
-	return threaded_check_leading_path(&default_cache, name, len);
+	return threaded_check_leading_path(&default_cache, name, len,
+					   warn_on_lstat_err);
 }
 
 /*
- * Return zero if path 'name' has a leading symlink component or
- * if some leading path component does not exists.
+ * Return zero if some leading path component of 'name' does not exist.
  *
  * Return -1 if leading path exists and is a directory.
  *
- * Return path length if leading path exists and is neither a
- * directory nor a symlink.
+ * Return the length of a leading component if it either exists but it's not a
+ * directory, or if we were unable to lstat() it. If warn_on_lstat_err is true,
+ * also emit a warning for this error.
  */
-static int threaded_check_leading_path(struct cache_def *cache, const char *name, int len)
+static int threaded_check_leading_path(struct cache_def *cache, const char *name,
+				       int len, int warn_on_lstat_err)
 {
 	int flags;
 	int match_len = lstat_cache_matchlen(cache, name, len, &flags,
 			   FL_SYMLINK|FL_NOENT|FL_DIR, USE_ONLY_LSTAT);
+	int saved_errno = errno;
+
 	if (flags & FL_NOENT)
 		return 0;
 	else if (flags & FL_DIR)
 		return -1;
-	else
-		return match_len;
+	if (warn_on_lstat_err && (flags & FL_LSTATERR)) {
+		char *path = xmemdupz(name, match_len);
+		errno = saved_errno;
+		warning_errno(_("failed to lstat '%s'"), path);
+		free(path);
+	}
+	return match_len;
 }
 
-/*
- * Return non-zero if all path components of 'name' exists as a
- * directory.  If prefix_len > 0, we will test with the stat()
- * function instead of the lstat() function for a prefix length of
- * 'prefix_len', thus we then allow for symlinks in the prefix part as
- * long as those points to real existing directories.
- */
 int has_dirs_only_path(const char *name, int len, int prefix_len)
 {
 	return threaded_has_dirs_only_path(&default_cache, name, len, prefix_len);
@@ -267,6 +261,13 @@ int has_dirs_only_path(const char *name, int len, int prefix_len)
  */
 static int threaded_has_dirs_only_path(struct cache_def *cache, const char *name, int len, int prefix_len)
 {
+	/*
+	 * Note: this function is used by the checkout machinery, which also
+	 * takes care to properly reset the cache when it performs an operation
+	 * that would leave the cache outdated. If this function starts caching
+	 * anything else besides FL_DIR, remember to also invalidate the cache
+	 * when creating or deleting paths that might be in the cache.
+	 */
 	return lstat_cache(cache, name, len,
 			   FL_DIR|FL_FULLPATH, prefix_len) &
 		FL_DIR;
@@ -321,3 +322,20 @@ void remove_scheduled_dirs(void)
 {
 	do_remove_scheduled_dirs(0);
 }
+
+void invalidate_lstat_cache(void)
+{
+	reset_lstat_cache(&default_cache);
+}
+
+#undef rmdir
+int lstat_cache_aware_rmdir(const char *path)
+{
+	/* Any change in this function must be made also in `mingw_rmdir()` */
+	int ret = rmdir(path);
+
+	if (!ret)
+		invalidate_lstat_cache();
+
+	return ret;
+}
diff --git a/t/.gitattributes b/t/.gitattributes
index df05434d32..dafa17c3e6 100644
--- a/t/.gitattributes
+++ b/t/.gitattributes
@@ -1,13 +1,13 @@
 t[0-9][0-9][0-9][0-9]/* -whitespace
 /chainlint/*.expect eol=lf
-/diff-lib/* eol=lf
+/lib-diff/* eol=lf
 /t0110/url-* binary
 /t3206/* eol=lf
 /t3900/*.txt eol=lf
 /t3901/*.txt eol=lf
-/t4034/*/* eol=lf
 /t4013/* eol=lf
 /t4018/* eol=lf
+/t4034/*/* eol=lf
 /t4051/* eol=lf
 /t4100/* eol=lf
 /t4101/* eol=lf
diff --git a/t/Makefile b/t/Makefile
index c83fd18861..882d26eee3 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -34,6 +34,7 @@ CHAINLINTTMP_SQ = $(subst ','\'',$(CHAINLINTTMP))
 T = $(sort $(wildcard t[0-9][0-9][0-9][0-9]-*.sh))
 TGITWEB = $(sort $(wildcard t95[0-9][0-9]-*.sh))
 THELPERS = $(sort $(filter-out $(T),$(wildcard *.sh)))
+TPERF = $(sort $(wildcard perf/p[0-9][0-9][0-9][0-9]-*.sh))
 CHAINLINTTESTS = $(sort $(patsubst chainlint/%.test,%,$(wildcard chainlint/*.test)))
 CHAINLINT = sed -f chainlint.sed
 
@@ -81,17 +82,17 @@ test-lint: test-lint-duplicates test-lint-executable test-lint-shell-syntax \
 	test-lint-filenames
 
 test-lint-duplicates:
-	@dups=`echo $(T) | tr ' ' '\n' | sed 's/-.*//' | sort | uniq -d` && \
+	@dups=`echo $(T) $(TPERF) | 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` && \
+	@bad=`for i in $(T) $(TPERF); 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)' check-non-portable-shell.pl $(T) $(THELPERS)
+	@'$(PERL_PATH_SQ)' check-non-portable-shell.pl $(T) $(THELPERS) $(TPERF)
 
 test-lint-filenames:
 	@# We do *not* pass a glob to ls-files but use grep instead, to catch
diff --git a/t/README b/t/README
index 60d5b77bcc..9e70122302 100644
--- a/t/README
+++ b/t/README
@@ -1,7 +1,7 @@
-Core GIT Tests
+Core Git Tests
 ==============
 
-This directory holds many test scripts for core GIT tools.  The
+This directory holds many test scripts for core Git tools.  The
 first part of this short document describes how to run the tests
 and read their output.
 
@@ -69,7 +69,8 @@ You can also run each test individually from command line, like this:
 
 You can pass --verbose (or -v), --debug (or -d), and --immediate
 (or -i) command line argument to the test, or by setting GIT_TEST_OPTS
-appropriately before running "make".
+appropriately before running "make". Short options can be bundled, i.e.
+'-d -v' is the same as '-dv'.
 
 -v::
 --verbose::
@@ -195,6 +196,11 @@ appropriately before running "make".
 	this feature by setting the GIT_TEST_CHAIN_LINT environment
 	variable to "1" or "0", respectively.
 
+	A few test scripts disable some of the more advanced
+	chain-linting detection in the name of efficiency. You can
+	override this by setting the GIT_TEST_CHAIN_LINT_HARDER
+	environment variable to "1".
+
 --stress::
 	Run the test script repeatedly in multiple parallel jobs until
 	one of them fails.  Useful for reproducing rare failures in
@@ -257,16 +263,21 @@ For an individual test suite --run could be used to specify that
 only some tests should be run or that some tests should be
 excluded from a run.
 
-The argument for --run is a list of individual test numbers or
-ranges with an optional negation prefix that define what tests in
-a test suite to include in the run.  A range is two numbers
-separated with a dash and matches a range of tests with both ends
-been included.  You may omit the first or the second number to
-mean "from the first test" or "up to the very last test"
-respectively.
-
-Optional prefix of '!' means that the test or a range of tests
-should be excluded from the run.
+The argument for --run, <test-selector>, is a list of description
+substrings or globs or individual test numbers or ranges with an
+optional negation prefix (of '!') that define what tests in a test
+suite to include (or exclude, if negated) in the run.  A range is two
+numbers separated with a dash and matches a range of tests with both
+ends been included.  You may omit the first or the second number to
+mean "from the first test" or "up to the very last test" respectively.
+
+The argument to --run is split on commas into separate strings,
+numbers, and ranges, and picks all tests that match any of the
+individual selection criteria.  If the substring of the description
+text that you want to match includes a comma, use the glob character
+'?' instead.  For example --run='rebase,merge?cherry-pick' would match
+on all tests that match either the glob *rebase* or the glob
+*merge?cherry-pick*.
 
 If --run starts with an unprefixed number or range the initial
 set of tests to run is empty. If the first item starts with '!'
@@ -274,9 +285,6 @@ all the tests are added to the initial set.  After initial set is
 determined every test number or range is added or excluded from
 the set one by one, from left to right.
 
-Individual numbers or ranges could be separated either by a space
-or a comma.
-
 For example, to run only tests up to a specific test (21), one
 could do this:
 
@@ -289,7 +297,7 @@ or this:
 Common case is to run several setup tests (1, 2, 3) and then a
 specific test (21) that relies on that setup:
 
-    $ sh ./t9200-git-cvsexport-commit.sh --run='1 2 3 21'
+    $ sh ./t9200-git-cvsexport-commit.sh --run='1,2,3,21'
 
 or:
 
@@ -297,17 +305,17 @@ or:
 
 or:
 
-    $ sh ./t9200-git-cvsexport-commit.sh --run='-3 21'
+    $ sh ./t9200-git-cvsexport-commit.sh --run='-3,21'
 
 As noted above, the test set is built by going through the items
 from left to right, so this:
 
-    $ sh ./t9200-git-cvsexport-commit.sh --run='1-4 !3'
+    $ sh ./t9200-git-cvsexport-commit.sh --run='1-4,!3'
 
 will run tests 1, 2, and 4.  Items that come later have higher
 precedence.  It means that this:
 
-    $ sh ./t9200-git-cvsexport-commit.sh --run='!3 1-4'
+    $ sh ./t9200-git-cvsexport-commit.sh --run='!3,1-4'
 
 would just run tests from 1 to 4, including 3.
 
@@ -316,6 +324,18 @@ test in the test suite except from 7 up to 11:
 
     $ sh ./t9200-git-cvsexport-commit.sh --run='!7-11'
 
+Sometimes there may be multiple tests with e.g. "setup" in their name
+that are needed and rather than figuring out the number for all of them
+we can just use "setup" as a substring/glob to match against the test
+description:
+
+    $ sh ./t0050-filesystem.sh --run=setup,9-11
+
+or one could select both the setup tests and the rename ones (assuming all
+relevant tests had those words in their descriptions):
+
+    $ sh ./t0050-filesystem.sh --run=setup,rename
+
 Some tests in a test suite rely on the previous tests performing
 certain actions, specifically some tests are designated as
 "setup" test, so you cannot _arbitrarily_ disable one test and
@@ -343,17 +363,11 @@ whether this mode is active, and e.g. skip some tests that are hard to
 refactor to deal with it. The "SYMLINKS" prerequisite is currently
 excluded as so much relies on it, but this might change in the future.
 
-GIT_TEST_GETTEXT_POISON=<boolean> turns all strings marked for
-translation into gibberish if true. Used for spotting those tests that
-need to be marked with a C_LOCALE_OUTPUT prerequisite when adding more
-strings for translation. See "Testing marked strings" in po/README for
-details.
-
 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_PROTOCOL_VERSION=<n>, when set, overrides the
-'protocol.version' setting to n if it is less than n.
+GIT_TEST_PROTOCOL_VERSION=<n>, when set, makes 'protocol.version'
+default to n.
 
 GIT_TEST_FULL_IN_PACK_ARRAY=<boolean> exercises the uncommon
 pack-objects code path where there are more than 1024 packs even if
@@ -378,6 +392,11 @@ GIT_TEST_COMMIT_GRAPH=<boolean>, when true, forces the commit-graph to
 be written after every 'git commit' command, and overrides the
 'core.commitGraph' setting to true.
 
+GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=<boolean>, when true, forces
+commit-graph write to compute and write changed path Bloom filters for
+every 'git commit-graph write', as if the `--changed-paths` option was
+passed in.
+
 GIT_TEST_FSMONITOR=$PWD/t7519/fsmonitor-all exercises the fsmonitor
 code path for utilizing a file system monitor to speed up detecting
 new or changed files.
@@ -386,15 +405,15 @@ GIT_TEST_INDEX_VERSION=<n> exercises the index read/write code path
 for the index version specified.  Can be set to any valid version
 (currently 2, 3, or 4).
 
-GIT_TEST_PACK_SPARSE=<boolean> if enabled will default the pack-objects
-builtin to use the sparse object walk. This can still be overridden by
-the --no-sparse command-line argument.
+GIT_TEST_PACK_SPARSE=<boolean> if disabled will default the pack-objects
+builtin to use the non-sparse object walk. This can still be overridden by
+the --sparse command-line argument.
 
 GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
 by overriding the minimum number of cache entries required per thread.
 
-GIT_TEST_STASH_USE_BUILTIN=<boolean>, when false, disables the
-built-in version of git-stash. See 'stash.useBuiltin' in
+GIT_TEST_ADD_I_USE_BUILTIN=<boolean>, when true, enables the
+built-in version of git add -i. See 'add.interactive.useBuiltin' in
 git-config(1).
 
 GIT_TEST_INDEX_THREADS=<n> enables exercising the multi-threaded loading
@@ -415,6 +434,20 @@ GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS=<boolean>, when true (which is
 the default when running tests), errors out when an abbreviated option
 is used.
 
+GIT_TEST_DEFAULT_HASH=<hash-algo> specifies which hash algorithm to
+use in the test scripts. Recognized values for <hash-algo> are "sha1"
+and "sha256".
+
+GIT_TEST_WRITE_REV_INDEX=<boolean>, when true enables the
+'pack.writeReverseIndex' setting.
+
+GIT_TEST_SPARSE_INDEX=<boolean>, when true enables index writes to use the
+sparse-index format by default.
+
+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.
+
 Naming Tests
 ------------
 
@@ -546,6 +579,41 @@ Here are the "do's:"
    reports "ok" or "not ok" to the end user running the tests. Under
    --verbose, they are shown to help debug the tests.
 
+ - Be careful when you loop
+
+   You may need to verify multiple things in a loop, but the
+   following does not work correctly:
+
+	test_expect_success 'test three things' '
+	    for i in one two three
+	    do
+		test_something "$i"
+	    done &&
+	    test_something_else
+	'
+
+   Because the status of the loop itself is the exit status of the
+   test_something in the last round, the loop does not fail when
+   "test_something" for "one" or "two" fails.  This is not what you
+   want.
+
+   Instead, you can break out of the loop immediately when you see a
+   failure.  Because all test_expect_* snippets are executed inside
+   a function, "return 1" can be used to fail the test immediately
+   upon a failure:
+
+	test_expect_success 'test three things' '
+	    for i in one two three
+	    do
+		test_something "$i" || return 1
+	    done &&
+	    test_something_else
+	'
+
+   Note that we still &&-chain the loop to propagate failures from
+   earlier commands.
+
+
 And here are the "don'ts:"
 
  - Don't exit() within a <script> part.
@@ -858,13 +926,13 @@ library for your script to use.
 
    Check whether a file has the length it is expected to.
 
- - test_path_is_file <path> [<diagnosis>]
-   test_path_is_dir <path> [<diagnosis>]
-   test_path_is_missing <path> [<diagnosis>]
+ - test_path_is_file <path>
+   test_path_is_dir <path>
+   test_path_is_missing <path>
 
    Check if the named path is a file, if the named path is a
    directory, or if the named path does not exist, respectively,
-   and fail otherwise, showing the <diagnosis> text.
+   and fail otherwise.
 
  - test_when_finished <script>
 
@@ -978,6 +1046,15 @@ library for your script to use.
    output to the downstream---unlike the real version, it generates
    only up to 99 lines.
 
+ - test_bool_env <env-variable-name> <default-value>
+
+   Given the name of an environment variable with a bool value,
+   normalize its value to a 0 (true) or 1 (false or empty string)
+   return code.  Return with code corresponding to the given default
+   value if the variable is unset.
+   Abort the test script if either the value of the variable or the
+   default are not valid bool values.
+
 
 Prerequisites
 -------------
@@ -1036,18 +1113,6 @@ use these, and "test_set_prereq" for how to define your own.
    Git was compiled with support for PCRE. Wrap any tests
    that use git-grep --perl-regexp or git-grep -P in these.
 
- - LIBPCRE1
-
-   Git was compiled with PCRE v1 support via
-   USE_LIBPCRE1=YesPlease. Wrap any PCRE using tests that for some
-   reason need v1 of the PCRE library instead of v2 in these.
-
- - LIBPCRE2
-
-   Git was compiled with PCRE v2 support via
-   USE_LIBPCRE2=YesPlease. Wrap any PCRE using tests that for some
-   reason need v2 of the PCRE library instead of v1 in these.
-
  - CASE_INSENSITIVE_FS
 
    Test is run on a case insensitive file system.
@@ -1061,27 +1126,33 @@ use these, and "test_set_prereq" for how to define your own.
 
    Git wasn't compiled with NO_PTHREADS=YesPlease.
 
+ - REFFILES
+
+   Test is specific to packed/loose ref storage, and should be
+   disabled for other ref storage backends
+
+
 Tips for Writing Tests
 ----------------------
 
 As with any programming projects, existing programs are the best
 source of the information.  However, do _not_ emulate
 t0000-basic.sh when writing your tests.  The test is special in
-that it tries to validate the very core of GIT.  For example, it
+that it tries to validate the very core of Git.  For example, it
 knows that there will be 256 subdirectories under .git/objects/,
 and it knows that the object ID of an empty tree is a certain
 40-byte string.  This is deliberately done so in t0000-basic.sh
 because the things the very basic core test tries to achieve is
-to serve as a basis for people who are changing the GIT internal
+to serve as a basis for people who are changing the Git internals
 drastically.  For these people, after making certain changes,
 not seeing failures from the basic test _is_ a failure.  And
-such drastic changes to the core GIT that even changes these
+such drastic changes to the core Git that even changes these
 otherwise supposedly stable object IDs should be accompanied by
 an update to t0000-basic.sh.
 
 However, other tests that simply rely on basic parts of the core
-GIT working properly should not have that level of intimate
-knowledge of the core GIT internals.  If all the test scripts
+Git working properly should not have that level of intimate
+knowledge of the core Git internals.  If all the test scripts
 hardcoded the object IDs like t0000-basic.sh does, that defeats
 the purpose of t0000-basic.sh, which is to isolate that level of
 validation in one place.  Your test also ends up needing
diff --git a/t/annotate-tests.sh b/t/annotate-tests.sh
index d933af5714..d3b299e75c 100644
--- a/t/annotate-tests.sh
+++ b/t/annotate-tests.sh
@@ -95,7 +95,7 @@ test_expect_success 'blame 2 authors' '
 '
 
 test_expect_success 'setup B1 lines (branch1)' '
-	git checkout -b branch1 master &&
+	git checkout -b branch1 main &&
 	echo "3A slow green fox jumps into the" >>file &&
 	echo "well." >>file &&
 	GIT_AUTHOR_NAME="B1" GIT_AUTHOR_EMAIL="B1@test.git" \
@@ -107,7 +107,7 @@ test_expect_success 'blame 2 authors + 1 branch1 author' '
 '
 
 test_expect_success 'setup B2 lines (branch2)' '
-	git checkout -b branch2 master &&
+	git checkout -b branch2 main &&
 	sed -e "s/2A quick brown/4A quick brown lazy dog/" <file >file.new &&
 	mv file.new file &&
 	GIT_AUTHOR_NAME="B2" GIT_AUTHOR_EMAIL="B2@test.git" \
@@ -131,11 +131,11 @@ test_expect_success 'blame --first-parent blames merge for branch1' '
 '
 
 test_expect_success 'blame ancestor' '
-	check_count -h master A 2 B 2
+	check_count -h main A 2 B 2
 '
 
 test_expect_success 'blame great-ancestor' '
-	check_count -h master^ A 2
+	check_count -h main^ A 2
 '
 
 test_expect_success 'setup evil merge' '
@@ -479,6 +479,28 @@ test_expect_success 'blame -L ^:RE (absolute: end-of-file)' '
 	check_count -f hello.c -L$n -L^:ma.. F 4 G 1 H 1
 '
 
+test_expect_success 'blame -L :funcname with userdiff driver' '
+	cat >file.template <<-\EOF &&
+	DO NOT MATCH THIS LINE
+	function RIGHT(a, b) result(c)
+	AS THE DEFAULT DRIVER WOULD
+
+	integer, intent(in) :: ChangeMe
+	EOF
+
+	fortran_file=file.f03 &&
+	test_when_finished "rm .gitattributes" &&
+	echo "$fortran_file diff=fortran" >.gitattributes &&
+
+	test_commit --author "A <A@test.git>" \
+		"add" "$fortran_file" \
+		"$(cat file.template)" &&
+	test_commit --author "B <B@test.git>" \
+		"change" "$fortran_file" \
+		"$(cat file.template | sed -e s/ChangeMe/IWasChanged/)" &&
+	check_count -f "$fortran_file" -L:RIGHT A 3 B 1
+'
+
 test_expect_success 'setup incremental' '
 	(
 	GIT_AUTHOR_NAME=I &&
diff --git a/t/chainlint.sed b/t/chainlint.sed
index 70df40e34b..8a25c5b855 100644
--- a/t/chainlint.sed
+++ b/t/chainlint.sed
@@ -117,7 +117,7 @@
 /^[ 	]*!*[ 	]*(..*)[ 	]*[0-9]*[<>|&]/boneline
 
 # multi-line "(...\n...)"
-/^[ 	]*(/bsubshell
+/^[ 	]*(/bsubsh
 
 # innocuous line -- print it and advance to next line
 b
@@ -130,11 +130,11 @@ b
 }
 b
 
-:subshell
+:subsh
 # bare "(" line? -- stash for later printing
 /^[ 	]*([	]*$/ {
 	h
-	bnextline
+	bnextln
 }
 # "(..." line -- split off and stash "(", then process "..." as its own line
 x
@@ -143,7 +143,7 @@ x
 s/(//
 bslurp
 
-:nextline
+:nextln
 N
 s/.*\n//
 
@@ -151,10 +151,10 @@ s/.*\n//
 # incomplete line "...\"
 /\\$/bicmplte
 # multi-line quoted string "...\n..."?
-/"/bdqstring
+/"/bdqstr
 # multi-line quoted string '...\n...'? (but not contraction in string "it's")
 /'/{
-	/"[^'"]*'[^'"]*"/!bsqstring
+	/"[^'"]*'[^'"]*"/!bsqstr
 }
 :folded
 # here-doc -- swallow it
@@ -163,8 +163,8 @@ s/.*\n//
 # before closing ")", "done", "elsif", "else", or "fi" will need to be
 # re-visited to drop "suspect" marking since final line of those constructs
 # legitimately lacks "&&", so "suspect" mark must be removed
-/^[ 	]*#/bnextline
-/^[ 	]*$/bnextline
+/^[ 	]*#/bnextln
+/^[ 	]*$/bnextln
 # in-line comment -- strip it (but not "#" in a string, Bash ${#...} array
 # length, or Perforce "//depot/path#42" revision in filespec)
 /[ 	]#/{
@@ -175,22 +175,22 @@ s/.*\n//
 # multi-line "case ... esac"
 /^[ 	]*case[ 	]..*[ 	]in/bcase
 # multi-line "for ... done" or "while ... done"
-/^[ 	]*for[ 	]..*[ 	]in/bcontinue
-/^[ 	]*while[ 	]/bcontinue
-/^[ 	]*do[ 	]/bcontinue
-/^[ 	]*do[ 	]*$/bcontinue
-/;[ 	]*do/bcontinue
+/^[ 	]*for[ 	]..*[ 	]in/bcont
+/^[ 	]*while[ 	]/bcont
+/^[ 	]*do[ 	]/bcont
+/^[ 	]*do[ 	]*$/bcont
+/;[ 	]*do/bcont
 /^[ 	]*done[ 	]*&&[ 	]*$/bdone
 /^[ 	]*done[ 	]*$/bdone
 /^[ 	]*done[ 	]*[<>|]/bdone
 /^[ 	]*done[ 	]*)/bdone
-/||[ 	]*exit[ 	]/bcontinue
-/||[ 	]*exit[ 	]*$/bcontinue
+/||[ 	]*exit[ 	]/bcont
+/||[ 	]*exit[ 	]*$/bcont
 # multi-line "if...elsif...else...fi"
-/^[ 	]*if[ 	]/bcontinue
-/^[ 	]*then[ 	]/bcontinue
-/^[ 	]*then[ 	]*$/bcontinue
-/;[ 	]*then/bcontinue
+/^[ 	]*if[ 	]/bcont
+/^[ 	]*then[ 	]/bcont
+/^[ 	]*then[ 	]*$/bcont
+/;[ 	]*then/bcont
 /^[ 	]*elif[ 	]/belse
 /^[ 	]*elif[ 	]*$/belse
 /^[ 	]*else[ 	]/belse
@@ -234,10 +234,10 @@ s/.*\n//
 	}
 }
 # line ends with pipe "...|" -- valid; not missing "&&"
-/|[ 	]*$/bcontinue
+/|[ 	]*$/bcont
 # missing end-of-line "&&" -- mark suspect
 /&&[ 	]*$/!s/^/?!AMP?!/
-:continue
+:cont
 # retrieve and print previous line
 x
 n
@@ -250,7 +250,7 @@ s/\\\n//
 bslurp
 
 # check for multi-line double-quoted string "...\n..." -- fold to one line
-:dqstring
+:dqstr
 # remove all quote pairs
 s/"\([^"]*\)"/@!\1@!/g
 # done if no dangling quote
@@ -258,13 +258,13 @@ s/"\([^"]*\)"/@!\1@!/g
 # otherwise, slurp next line and try again
 N
 s/\n//
-bdqstring
+bdqstr
 :dqdone
 s/@!/"/g
 bfolded
 
 # check for multi-line single-quoted string '...\n...' -- fold to one line
-:sqstring
+:sqstr
 # remove all quote pairs
 s/'\([^']*\)'/@!\1@!/g
 # done if no dangling quote
@@ -272,7 +272,7 @@ s/'\([^']*\)'/@!\1@!/g
 # otherwise, slurp next line and try again
 N
 s/\n//
-bsqstring
+bsqstr
 :sqdone
 s/@!/'/g
 bfolded
@@ -282,11 +282,11 @@ bfolded
 :heredoc
 s/^\(.*\)<<[ 	]*[-\\'"]*\([A-Za-z0-9_][A-Za-z0-9_]*\)['"]*/<\2>\1<</
 s/[ 	]*<<//
-:heredsub
+:hdocsub
 N
 /^<\([^>]*\)>.*\n[ 	]*\1[ 	]*$/!{
 	s/\n.*$//
-	bheredsub
+	bhdocsub
 }
 s/^<[^>]*>//
 s/\n.*$//
@@ -305,7 +305,7 @@ bcase
 x
 s/?!AMP?!//
 x
-bcontinue
+bcont
 
 # found "done" closing for-loop or while-loop, or "fi" closing if-then -- drop
 # "suspect" from final contained line since that line legitimately lacks "&&"
@@ -321,10 +321,10 @@ bchkchn
 # found nested multi-line "(...\n...)" -- pass through untouched
 :nest
 x
-:nstslurp
+:nstslrp
 n
 # closing ")" on own line -- stop nested slurp
-/^[ 	]*)/bnstclose
+/^[ 	]*)/bnstcl
 # comment -- not closing ")" if in comment
 /^[ 	]*#/bnstcnt
 # "$((...))" -- arithmetic expansion; not closing ")"
@@ -332,11 +332,11 @@ n
 # "$(...)" -- command substitution; not closing ")"
 /\$([^)][^)]*)[^)]*$/bnstcnt
 # closing "...)" -- stop nested slurp
-/)/bnstclose
+/)/bnstcl
 :nstcnt
 x
-bnstslurp
-:nstclose
+bnstslrp
+:nstcl
 s/^/>>/
 # is it "))" which closes nested and parent subshells?
 /)[ 	]*)/bslurp
diff --git a/t/check-non-portable-shell.pl b/t/check-non-portable-shell.pl
index 38bfeebd88..fd3303552b 100755
--- a/t/check-non-portable-shell.pl
+++ b/t/check-non-portable-shell.pl
@@ -46,7 +46,7 @@ while (<>) {
 	/(?:\$\(seq|^\s*seq\b)/ and err 'seq is not portable (use test_seq)';
 	/\bgrep\b.*--file\b/ and err 'grep --file FILE is not portable (use grep -f FILE)';
 	/\bexport\s+[A-Za-z0-9_]*=/ and err '"export FOO=bar" is not portable (use FOO=bar && export FOO)';
-	/^\s*([A-Z0-9_]+=(\w+|(["']).*?\3)\s+)+(\w+)/ and exists($func{$4}) and
+	/^\s*([A-Z0-9_]+=(\w*|(["']).*?\3)\s+)+(\w+)/ and exists($func{$4}) and
 		err '"FOO=bar shell_func" assignment extends beyond "shell_func"';
 	$line = '';
 	# this resets our $. for each file
diff --git a/t/helper/.gitignore b/t/helper/.gitignore
index 48c7bb0bbb..8c2ddcce95 100644
--- a/t/helper/.gitignore
+++ b/t/helper/.gitignore
@@ -1,4 +1,2 @@
 /test-tool
 /test-fake-ssh
-/test-line-buffer
-/test-svn-fe
diff --git a/t/helper/test-advise.c b/t/helper/test-advise.c
new file mode 100644
index 0000000000..cb881139f7
--- /dev/null
+++ b/t/helper/test-advise.c
@@ -0,0 +1,22 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "advice.h"
+#include "config.h"
+
+int cmd__advise_if_enabled(int argc, const char **argv)
+{
+	if (argc != 2)
+		die("usage: %s <advice>", argv[0]);
+
+	setup_git_directory();
+	git_config(git_default_config, NULL);
+
+	/*
+	 * Any advice type can be used for testing, but NESTED_TAG was
+	 * selected here and in t0018 where this command is being
+	 * executed.
+	 */
+	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
new file mode 100644
index 0000000000..134a1e9d76
--- /dev/null
+++ b/t/helper/test-bitmap.c
@@ -0,0 +1,24 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "pack-bitmap.h"
+
+static int bitmap_list_commits(void)
+{
+	return test_bitmap_commits(the_repository);
+}
+
+int cmd__bitmap(int argc, const char **argv)
+{
+	setup_git_directory();
+
+	if (argc != 2)
+		goto usage;
+
+	if (!strcmp(argv[1], "list-commits"))
+		return bitmap_list_commits();
+
+usage:
+	usage("\ttest-tool bitmap list-commits");
+
+	return -1;
+}
diff --git a/t/helper/test-bloom.c b/t/helper/test-bloom.c
new file mode 100644
index 0000000000..ad3ef1cd77
--- /dev/null
+++ b/t/helper/test-bloom.c
@@ -0,0 +1,97 @@
+#include "git-compat-util.h"
+#include "bloom.h"
+#include "test-tool.h"
+#include "commit.h"
+
+static struct bloom_filter_settings settings = DEFAULT_BLOOM_FILTER_SETTINGS;
+
+static void add_string_to_filter(const char *data, struct bloom_filter *filter) {
+		struct bloom_key key;
+		int i;
+
+		fill_bloom_key(data, strlen(data), &key, &settings);
+		printf("Hashes:");
+		for (i = 0; i < settings.num_hashes; i++){
+			printf("0x%08x|", key.hashes[i]);
+		}
+		printf("\n");
+		add_key_to_filter(&key, filter, &settings);
+}
+
+static void print_bloom_filter(struct bloom_filter *filter) {
+	int i;
+
+	if (!filter) {
+		printf("No filter.\n");
+		return;
+	}
+	printf("Filter_Length:%d\n", (int)filter->len);
+	printf("Filter_Data:");
+	for (i = 0; i < filter->len; i++) {
+		printf("%02x|", filter->data[i]);
+	}
+	printf("\n");
+}
+
+static void get_bloom_filter_for_commit(const struct object_id *commit_oid)
+{
+	struct commit *c;
+	struct bloom_filter *filter;
+	setup_git_directory();
+	c = lookup_commit(the_repository, commit_oid);
+	filter = get_or_compute_bloom_filter(the_repository, c, 1,
+					     &settings,
+					     NULL);
+	print_bloom_filter(filter);
+}
+
+static const char *bloom_usage = "\n"
+"  test-tool bloom get_murmur3 <string>\n"
+"  test-tool bloom generate_filter <string> [<string>...]\n"
+"  test-tool bloom get_filter_for_commit <commit-hex>\n";
+
+int cmd__bloom(int argc, const char **argv)
+{
+	setup_git_directory();
+
+	if (argc < 2)
+		usage(bloom_usage);
+
+	if (!strcmp(argv[1], "get_murmur3")) {
+		uint32_t hashed;
+		if (argc < 3)
+			usage(bloom_usage);
+		hashed = murmur3_seeded(0, argv[2], strlen(argv[2]));
+		printf("Murmur3 Hash with seed=0:0x%08x\n", hashed);
+	}
+
+	if (!strcmp(argv[1], "generate_filter")) {
+		struct bloom_filter filter;
+		int i = 2;
+		filter.len =  (settings.bits_per_entry + BITS_PER_WORD - 1) / BITS_PER_WORD;
+		CALLOC_ARRAY(filter.data, filter.len);
+
+		if (argc - 1 < i)
+			usage(bloom_usage);
+
+		while (argv[i]) {
+			add_string_to_filter(argv[i], &filter);
+			i++;
+		}
+
+		print_bloom_filter(&filter);
+	}
+
+	if (!strcmp(argv[1], "get_filter_for_commit")) {
+		struct object_id oid;
+		const char *end;
+		if (argc < 3)
+			usage(bloom_usage);
+		if (parse_oid_hex(argv[2], &oid, &end))
+			die("cannot parse oid '%s'", argv[2]);
+		init_bloom_filters();
+		get_bloom_filter_for_commit(&oid);
+	}
+
+	return 0;
+}
diff --git a/t/helper/test-chmtime.c b/t/helper/test-chmtime.c
index aa22af48c2..524b55ca49 100644
--- a/t/helper/test-chmtime.c
+++ b/t/helper/test-chmtime.c
@@ -109,9 +109,9 @@ int cmd__chmtime(int argc, const char **argv)
 		uintmax_t mtime;
 
 		if (stat(argv[i], &sb) < 0) {
-			fprintf(stderr, "Failed to stat %s: %s\n",
+			fprintf(stderr, "Failed to stat %s: %s. Skipping\n",
 			        argv[i], strerror(errno));
-			return 1;
+			continue;
 		}
 
 #ifdef GIT_WINDOWS_NATIVE
diff --git a/t/helper/test-config.c b/t/helper/test-config.c
index 214003d5b2..a6e936721f 100644
--- a/t/helper/test-config.c
+++ b/t/helper/test-config.c
@@ -37,21 +37,6 @@
  *
  */
 
-static const char *scope_name(enum config_scope scope)
-{
-	switch (scope) {
-	case CONFIG_SCOPE_SYSTEM:
-		return "system";
-	case CONFIG_SCOPE_GLOBAL:
-		return "global";
-	case CONFIG_SCOPE_REPO:
-		return "repo";
-	case CONFIG_SCOPE_CMDLINE:
-		return "cmdline";
-	default:
-		return "unknown";
-	}
-}
 static int iterate_cb(const char *var, const char *value, void *data)
 {
 	static int nr;
@@ -63,7 +48,8 @@ static int iterate_cb(const char *var, const char *value, void *data)
 	printf("value=%s\n", value ? value : "(null)");
 	printf("origin=%s\n", current_config_origin_type());
 	printf("name=%s\n", current_config_name());
-	printf("scope=%s\n", scope_name(current_config_scope()));
+	printf("lno=%d\n", current_config_line());
+	printf("scope=%s\n", config_scope_name(current_config_scope()));
 
 	return 0;
 }
@@ -140,7 +126,7 @@ int cmd__config(int argc, const char **argv)
 			goto exit1;
 		}
 	} else if (argc == 3 && !strcmp(argv[1], "get_string")) {
-		if (!git_config_get_string_const(argv[2], &v)) {
+		if (!git_config_get_string_tmp(argv[2], &v)) {
 			printf("%s\n", v);
 			goto exit0;
 		} else {
diff --git a/t/helper/test-crontab.c b/t/helper/test-crontab.c
new file mode 100644
index 0000000000..e7c0137a47
--- /dev/null
+++ b/t/helper/test-crontab.c
@@ -0,0 +1,35 @@
+#include "test-tool.h"
+#include "cache.h"
+
+/*
+ * Usage: test-tool cron <file> [-l]
+ *
+ * If -l is specified, then write the contents of <file> to stdout.
+ * Otherwise, write from stdin into <file>.
+ */
+int cmd__crontab(int argc, const char **argv)
+{
+	int a;
+	FILE *from, *to;
+
+	if (argc == 3 && !strcmp(argv[2], "-l")) {
+		from = fopen(argv[1], "r");
+		if (!from)
+			return 0;
+		to = stdout;
+	} else if (argc == 2) {
+		from = stdin;
+		to = fopen(argv[1], "w");
+	} else
+		return error("unknown arguments");
+
+	while ((a = fgetc(from)) != EOF)
+		fputc(a, to);
+
+	if (argc == 3)
+		fclose(from);
+	else
+		fclose(to);
+
+	return 0;
+}
diff --git a/t/helper/test-drop-caches.c b/t/helper/test-drop-caches.c
index f65e301f9d..7b4278462b 100644
--- a/t/helper/test-drop-caches.c
+++ b/t/helper/test-drop-caches.c
@@ -8,18 +8,21 @@ static int cmd_sync(void)
 {
 	char Buffer[MAX_PATH];
 	DWORD dwRet;
-	char szVolumeAccessPath[] = "\\\\.\\X:";
+	char szVolumeAccessPath[] = "\\\\.\\XXXX:";
 	HANDLE hVolWrite;
-	int success = 0;
+	int success = 0, dos_drive_prefix;
 
 	dwRet = GetCurrentDirectory(MAX_PATH, Buffer);
 	if ((0 == dwRet) || (dwRet > MAX_PATH))
 		return error("Error getting current directory");
 
-	if (!has_dos_drive_prefix(Buffer))
+	dos_drive_prefix = has_dos_drive_prefix(Buffer);
+	if (!dos_drive_prefix)
 		return error("'%s': invalid drive letter", Buffer);
 
-	szVolumeAccessPath[4] = Buffer[0];
+	memcpy(szVolumeAccessPath, Buffer, dos_drive_prefix);
+	szVolumeAccessPath[dos_drive_prefix] = '\0';
+
 	hVolWrite = CreateFile(szVolumeAccessPath, GENERIC_READ | GENERIC_WRITE,
 		FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
 	if (INVALID_HANDLE_VALUE == hVolWrite)
diff --git a/t/helper/test-dump-fsmonitor.c b/t/helper/test-dump-fsmonitor.c
index 2786f47088..975f0ac890 100644
--- a/t/helper/test-dump-fsmonitor.c
+++ b/t/helper/test-dump-fsmonitor.c
@@ -13,7 +13,7 @@ int cmd__dump_fsmonitor(int ac, const char **av)
 		printf("no fsmonitor\n");
 		return 0;
 	}
-	printf("fsmonitor last update %"PRIuMAX"\n", (uintmax_t)istate->fsmonitor_last_update);
+	printf("fsmonitor last update %s\n", istate->fsmonitor_last_update);
 
 	for (i = 0; i < istate->cache_nr; i++)
 		printf((istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) ? "+" : "-");
diff --git a/t/helper/test-dump-split-index.c b/t/helper/test-dump-split-index.c
index 63c689d6ee..a209880eb3 100644
--- a/t/helper/test-dump-split-index.c
+++ b/t/helper/test-dump-split-index.c
@@ -13,6 +13,8 @@ int cmd__dump_split_index(int ac, const char **av)
 	struct split_index *si;
 	int i;
 
+	setup_git_directory();
+
 	do_read_index(&the_index, av[1], 1);
 	printf("own %s\n", oid_to_hex(&the_index.oid));
 	si = the_index.split_index;
diff --git a/t/helper/test-example-decorate.c b/t/helper/test-example-decorate.c
index c8a1cde7d2..b9d1200eb9 100644
--- a/t/helper/test-example-decorate.c
+++ b/t/helper/test-example-decorate.c
@@ -26,8 +26,8 @@ int cmd__example_decorate(int argc, const char **argv)
 	 * Add 2 objects, one with a non-NULL decoration and one with a NULL
 	 * decoration.
 	 */
-	one = lookup_unknown_object(&one_oid);
-	two = lookup_unknown_object(&two_oid);
+	one = lookup_unknown_object(the_repository, &one_oid);
+	two = lookup_unknown_object(the_repository, &two_oid);
 	ret = add_decoration(&n, one, &decoration_a);
 	if (ret)
 		BUG("when adding a brand-new object, NULL should be returned");
@@ -56,7 +56,7 @@ int cmd__example_decorate(int argc, const char **argv)
 	ret = lookup_decoration(&n, two);
 	if (ret != &decoration_b)
 		BUG("lookup should return added declaration");
-	three = lookup_unknown_object(&three_oid);
+	three = lookup_unknown_object(the_repository, &three_oid);
 	ret = lookup_decoration(&n, three);
 	if (ret)
 		BUG("lookup for unknown object should return NULL");
diff --git a/t/helper/test-fast-rebase.c b/t/helper/test-fast-rebase.c
new file mode 100644
index 0000000000..fc2d460904
--- /dev/null
+++ b/t/helper/test-fast-rebase.c
@@ -0,0 +1,225 @@
+/*
+ * "git fast-rebase" builtin command
+ *
+ * FAST: Forking Any Subprocesses (is) Taboo
+ *
+ * This is meant SOLELY as a demo of what is possible.  sequencer.c and
+ * rebase.c should be refactored to use the ideas here, rather than attempting
+ * to extend this file to replace those (unless Phillip or Dscho say that
+ * refactoring is too hard and we need a clean slate, but I'm guessing that
+ * refactoring is the better route).
+ */
+
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
+#include "test-tool.h"
+
+#include "cache-tree.h"
+#include "commit.h"
+#include "lockfile.h"
+#include "merge-ort.h"
+#include "refs.h"
+#include "revision.h"
+#include "sequencer.h"
+#include "strvec.h"
+#include "tree.h"
+
+static const char *short_commit_name(struct commit *commit)
+{
+	return find_unique_abbrev(&commit->object.oid, DEFAULT_ABBREV);
+}
+
+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 char *get_author(const char *message)
+{
+	size_t len;
+	const char *a;
+
+	a = find_commit_header(message, "author", &len);
+	if (a)
+		return xmemdupz(a, len);
+
+	return NULL;
+}
+
+static struct commit *create_commit(struct tree *tree,
+				    struct commit *based_on,
+				    struct commit *parent)
+{
+	struct object_id ret;
+	struct object *obj;
+	struct commit_list *parents = NULL;
+	char *author;
+	char *sign_commit = NULL;
+	struct commit_extra_header *extra;
+	struct strbuf msg = STRBUF_INIT;
+	const char *out_enc = get_commit_output_encoding();
+	const char *message = logmsg_reencode(based_on, NULL, out_enc);
+	const char *orig_message = NULL;
+	const char *exclude_gpgsig[] = { "gpgsig", NULL };
+
+	commit_list_insert(parent, &parents);
+	extra = read_commit_extra_headers(based_on, exclude_gpgsig);
+	find_commit_subject(message, &orig_message);
+	strbuf_addstr(&msg, orig_message);
+	author = get_author(message);
+	reset_ident_date();
+	if (commit_tree_extended(msg.buf, msg.len, &tree->object.oid, parents,
+				 &ret, author, NULL, sign_commit, extra)) {
+		error(_("failed to write commit object"));
+		return NULL;
+	}
+	free(author);
+	strbuf_release(&msg);
+
+	obj = parse_object(the_repository, &ret);
+	return (struct commit *)obj;
+}
+
+int cmd__fast_rebase(int argc, const char **argv)
+{
+	struct commit *onto;
+	struct commit *last_commit = NULL, *last_picked_commit = NULL;
+	struct object_id head;
+	struct lock_file lock = LOCK_INIT;
+	struct strvec rev_walk_args = STRVEC_INIT;
+	struct rev_info revs;
+	struct commit *commit;
+	struct merge_options merge_opt;
+	struct tree *next_tree, *base_tree, *head_tree;
+	struct merge_result result;
+	struct strbuf reflog_msg = STRBUF_INIT;
+	struct strbuf branch_name = STRBUF_INIT;
+
+	/*
+	 * test-tool stuff doesn't set up the git directory by default; need to
+	 * do that manually.
+	 */
+	setup_git_directory();
+
+	if (argc == 2 && !strcmp(argv[1], "-h")) {
+		printf("Sorry, I am not a psychiatrist; I can not give you the help you need.  Oh, you meant usage...\n");
+		exit(129);
+	}
+
+	if (argc != 5 || strcmp(argv[1], "--onto"))
+		die("usage: read the code, figure out how to use it, then do so");
+
+	onto = peel_committish(argv[2]);
+	strbuf_addf(&branch_name, "refs/heads/%s", argv[4]);
+
+	/* Sanity check */
+	if (get_oid("HEAD", &head))
+		die(_("Cannot read HEAD"));
+	assert(oideq(&onto->object.oid, &head));
+
+	hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
+	if (repo_read_index(the_repository) < 0)
+		BUG("Could not read index");
+
+	repo_init_revisions(the_repository, &revs, NULL);
+	revs.verbose_header = 1;
+	revs.max_parents = 1;
+	revs.cherry_mark = 1;
+	revs.limited = 1;
+	revs.reverse = 1;
+	revs.right_only = 1;
+	revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
+	revs.topo_order = 1;
+	strvec_pushl(&rev_walk_args, "", argv[4], "--not", argv[3], NULL);
+
+	if (setup_revisions(rev_walk_args.nr, rev_walk_args.v, &revs, NULL) > 1)
+		return error(_("unhandled options"));
+
+	strvec_clear(&rev_walk_args);
+
+	if (prepare_revision_walk(&revs) < 0)
+		return error(_("error preparing revisions"));
+
+	init_merge_options(&merge_opt, the_repository);
+	memset(&result, 0, sizeof(result));
+	merge_opt.show_rename_progress = 1;
+	merge_opt.branch1 = "HEAD";
+	head_tree = get_commit_tree(onto);
+	result.tree = head_tree;
+	last_commit = onto;
+	while ((commit = get_revision(&revs))) {
+		struct commit *base;
+
+		fprintf(stderr, "Rebasing %s...\r",
+			oid_to_hex(&commit->object.oid));
+		assert(commit->parents && !commit->parents->next);
+		base = commit->parents->item;
+
+		next_tree = get_commit_tree(commit);
+		base_tree = get_commit_tree(base);
+
+		merge_opt.branch2 = short_commit_name(commit);
+		merge_opt.ancestor = xstrfmt("parent of %s", merge_opt.branch2);
+
+		merge_incore_nonrecursive(&merge_opt,
+					  base_tree,
+					  result.tree,
+					  next_tree,
+					  &result);
+
+		free((char*)merge_opt.ancestor);
+		merge_opt.ancestor = NULL;
+		if (!result.clean)
+			break;
+		last_picked_commit = commit;
+		last_commit = create_commit(result.tree, commit, last_commit);
+	}
+	/* TODO: There should be some kind of rev_info_free(&revs) call... */
+	memset(&revs, 0, sizeof(revs));
+
+	merge_switch_to_result(&merge_opt, head_tree, &result, 1, !result.clean);
+
+	if (result.clean < 0)
+		exit(128);
+
+	if (result.clean) {
+		fprintf(stderr, "\nDone.\n");
+		strbuf_addf(&reflog_msg, "finish rebase %s onto %s",
+			    oid_to_hex(&last_picked_commit->object.oid),
+			    oid_to_hex(&last_commit->object.oid));
+		if (update_ref(reflog_msg.buf, branch_name.buf,
+			       &last_commit->object.oid,
+			       &last_picked_commit->object.oid,
+			       REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) {
+			error(_("could not update %s"), argv[4]);
+			die("Failed to update %s", argv[4]);
+		}
+		if (create_symref("HEAD", branch_name.buf, reflog_msg.buf) < 0)
+			die(_("unable to update HEAD"));
+		strbuf_release(&reflog_msg);
+		strbuf_release(&branch_name);
+
+		prime_cache_tree(the_repository, the_repository->index,
+				 result.tree);
+	} else {
+		fprintf(stderr, "\nAborting: Hit a conflict.\n");
+		strbuf_addf(&reflog_msg, "rebase progress up to %s",
+			    oid_to_hex(&last_picked_commit->object.oid));
+		if (update_ref(reflog_msg.buf, "HEAD",
+			       &last_commit->object.oid,
+			       &head,
+			       REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) {
+			error(_("could not update %s"), argv[4]);
+			die("Failed to update %s", argv[4]);
+		}
+	}
+	if (write_locked_index(&the_index, &lock,
+			       COMMIT_LOCK | SKIP_IF_UNCHANGED))
+		die(_("unable to write %s"), get_index_file());
+	return (result.clean == 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-hash-speed.c b/t/helper/test-hash-speed.c
index 432233c7f0..f40d9ad0c2 100644
--- a/t/helper/test-hash-speed.c
+++ b/t/helper/test-hash-speed.c
@@ -57,5 +57,5 @@ int cmd__hash_speed(int ac, const char **av)
 		free(p);
 	}
 
-	exit(0);
+	return 0;
 }
diff --git a/t/helper/test-hash.c b/t/helper/test-hash.c
index 0a31de66f3..261c545b9d 100644
--- a/t/helper/test-hash.c
+++ b/t/helper/test-hash.c
@@ -54,5 +54,5 @@ int cmd_hash_impl(int ac, const char **av, int algo)
 		fwrite(hash, 1, algop->rawsz, stdout);
 	else
 		puts(hash_to_hex_algop(hash, algop));
-	exit(0);
+	return 0;
 }
diff --git a/t/helper/test-hashmap.c b/t/helper/test-hashmap.c
index f38706216f..36ff07bd4b 100644
--- a/t/helper/test-hashmap.c
+++ b/t/helper/test-hashmap.c
@@ -110,7 +110,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
 				hashmap_add(&map, &entries[i]->ent);
 			}
 
-			hashmap_free(&map);
+			hashmap_clear(&map);
 		}
 	} else {
 		/* test map lookups */
@@ -130,7 +130,7 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
 			}
 		}
 
-		hashmap_free(&map);
+		hashmap_clear(&map);
 	}
 }
 
@@ -151,12 +151,11 @@ static void perf_hashmap(unsigned int method, unsigned int rounds)
 int cmd__hashmap(int argc, const char **argv)
 {
 	struct strbuf line = STRBUF_INIT;
-	struct hashmap map;
 	int icase;
+	struct hashmap map = HASHMAP_INIT(test_entry_cmp, &icase);
 
 	/* init hash map */
 	icase = argc > 1 && !strcmp("ignorecase", argv[1]);
-	hashmap_init(&map, test_entry_cmp, &icase, 0);
 
 	/* process commands from stdin */
 	while (strbuf_getline(&line, stdin) != EOF) {
@@ -262,6 +261,6 @@ int cmd__hashmap(int argc, const char **argv)
 	}
 
 	strbuf_release(&line);
-	hashmap_free_entries(&map, struct test_entry, ent);
+	hashmap_clear_and_free(&map, struct test_entry, ent);
 	return 0;
 }
diff --git a/t/helper/test-line-buffer.c b/t/helper/test-line-buffer.c
deleted file mode 100644
index 078dd7e29d..0000000000
--- a/t/helper/test-line-buffer.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * test-line-buffer.c: code to exercise the svn importer's input helper
- */
-
-#include "git-compat-util.h"
-#include "strbuf.h"
-#include "vcs-svn/line_buffer.h"
-
-static uint32_t strtouint32(const char *s)
-{
-	char *end;
-	uintmax_t n = strtoumax(s, &end, 10);
-	if (*s == '\0' || *end != '\0')
-		die("invalid count: %s", s);
-	return (uint32_t) n;
-}
-
-static void handle_command(const char *command, const char *arg, struct line_buffer *buf)
-{
-	if (starts_with(command, "binary ")) {
-		struct strbuf sb = STRBUF_INIT;
-		strbuf_addch(&sb, '>');
-		buffer_read_binary(buf, &sb, strtouint32(arg));
-		fwrite(sb.buf, 1, sb.len, stdout);
-		strbuf_release(&sb);
-	} else if (starts_with(command, "copy ")) {
-		buffer_copy_bytes(buf, strtouint32(arg));
-	} else if (starts_with(command, "skip ")) {
-		buffer_skip_bytes(buf, strtouint32(arg));
-	} else {
-		die("unrecognized command: %s", command);
-	}
-}
-
-static void handle_line(const char *line, struct line_buffer *stdin_buf)
-{
-	const char *arg = strchr(line, ' ');
-	if (!arg)
-		die("no argument in line: %s", line);
-	handle_command(line, arg + 1, stdin_buf);
-}
-
-int cmd_main(int argc, const char **argv)
-{
-	struct line_buffer stdin_buf = LINE_BUFFER_INIT;
-	struct line_buffer file_buf = LINE_BUFFER_INIT;
-	struct line_buffer *input = &stdin_buf;
-	const char *filename;
-	char *s;
-
-	if (argc == 1)
-		filename = NULL;
-	else if (argc == 2)
-		filename = argv[1];
-	else
-		usage("test-line-buffer [file | &fd] < script");
-
-	if (buffer_init(&stdin_buf, NULL))
-		die_errno("open error");
-	if (filename) {
-		if (*filename == '&') {
-			if (buffer_fdinit(&file_buf, strtouint32(filename + 1)))
-				die_errno("error opening fd %s", filename + 1);
-		} else {
-			if (buffer_init(&file_buf, filename))
-				die_errno("error opening %s", filename);
-		}
-		input = &file_buf;
-	}
-
-	while ((s = buffer_read_line(&stdin_buf)))
-		handle_line(s, input);
-
-	if (filename && buffer_deinit(&file_buf))
-		die("error reading from %s", filename);
-	if (buffer_deinit(&stdin_buf))
-		die("input error");
-	if (ferror(stdout))
-		die("output error");
-	return 0;
-}
diff --git a/t/helper/test-match-trees.c b/t/helper/test-match-trees.c
index b9fd427571..4079fdee06 100644
--- a/t/helper/test-match-trees.c
+++ b/t/helper/test-match-trees.c
@@ -23,5 +23,5 @@ int cmd__match_trees(int ac, const char **av)
 	shift_tree(the_repository, &one->object.oid, &two->object.oid, &shifted, -1);
 	printf("shifted: %s\n", oid_to_hex(&shifted));
 
-	exit(0);
+	return 0;
 }
diff --git a/t/helper/test-sha1-array.c b/t/helper/test-oid-array.c
index ad5e69f9d3..b16cd0b11b 100644
--- a/t/helper/test-sha1-array.c
+++ b/t/helper/test-oid-array.c
@@ -1,6 +1,6 @@
 #include "test-tool.h"
 #include "cache.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 
 static int print_oid(const struct object_id *oid, void *data)
 {
@@ -8,10 +8,13 @@ static int print_oid(const struct object_id *oid, void *data)
 	return 0;
 }
 
-int cmd__sha1_array(int argc, const char **argv)
+int cmd__oid_array(int argc, const char **argv)
 {
 	struct oid_array array = OID_ARRAY_INIT;
 	struct strbuf line = STRBUF_INIT;
+	int nongit_ok;
+
+	setup_git_directory_gently(&nongit_ok);
 
 	while (strbuf_getline(&line, stdin) != EOF) {
 		const char *arg;
@@ -19,11 +22,11 @@ int cmd__sha1_array(int argc, const char **argv)
 
 		if (skip_prefix(line.buf, "append ", &arg)) {
 			if (get_oid_hex(arg, &oid))
-				die("not a hexadecimal SHA1: %s", arg);
+				die("not a hexadecimal oid: %s", arg);
 			oid_array_append(&array, &oid);
 		} else if (skip_prefix(line.buf, "lookup ", &arg)) {
 			if (get_oid_hex(arg, &oid))
-				die("not a hexadecimal SHA1: %s", arg);
+				die("not a hexadecimal oid: %s", arg);
 			printf("%d\n", oid_array_lookup(&array, &oid));
 		} else if (!strcmp(line.buf, "clear"))
 			oid_array_clear(&array);
diff --git a/t/helper/test-oidtree.c b/t/helper/test-oidtree.c
new file mode 100644
index 0000000000..180ee28dd9
--- /dev/null
+++ b/t/helper/test-oidtree.c
@@ -0,0 +1,49 @@
+#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);
+		}
+	}
+	return 0;
+}
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index af82db06ac..2051ce57db 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -121,6 +121,8 @@ int cmd__parse_options(int argc, const char **argv)
 		OPT_INTEGER('j', NULL, &integer, "get a integer, too"),
 		OPT_MAGNITUDE('m', "magnitude", &magnitude, "get a magnitude"),
 		OPT_SET_INT(0, "set23", &integer, "set integer to 23", 23),
+		OPT_CMDMODE(0, "mode1", &integer, "set integer to 1 (cmdmode option)", 1),
+		OPT_CMDMODE(0, "mode2", &integer, "set integer to 2 (cmdmode option)", 2),
 		OPT_CALLBACK('L', "length", &integer, "str",
 			"get length of <str>", length_callback),
 		OPT_FILENAME('F', "file", &file, "set file to <file>"),
diff --git a/t/helper/test-parse-pathspec-file.c b/t/helper/test-parse-pathspec-file.c
new file mode 100644
index 0000000000..b3e08cef4b
--- /dev/null
+++ b/t/helper/test-parse-pathspec-file.c
@@ -0,0 +1,33 @@
+#include "test-tool.h"
+#include "parse-options.h"
+#include "pathspec.h"
+#include "gettext.h"
+
+int cmd__parse_pathspec_file(int argc, const char **argv)
+{
+	struct pathspec pathspec;
+	const char *pathspec_from_file = NULL;
+	int pathspec_file_nul = 0, i;
+
+	static const char *const usage[] = {
+		"test-tool parse-pathspec-file --pathspec-from-file [--pathspec-file-nul]",
+		NULL
+	};
+
+	struct option options[] = {
+		OPT_PATHSPEC_FROM_FILE(&pathspec_from_file),
+		OPT_PATHSPEC_FILE_NUL(&pathspec_file_nul),
+		OPT_END()
+	};
+
+	parse_options(argc, argv, NULL, options, usage, 0);
+
+	parse_pathspec_file(&pathspec, 0, 0, NULL, pathspec_from_file,
+			    pathspec_file_nul);
+
+	for (i = 0; i < pathspec.nr; i++)
+		printf("%s\n", pathspec.items[i].original);
+
+	clear_pathspec(&pathspec);
+	return 0;
+}
diff --git a/t/helper/test-partial-clone.c b/t/helper/test-partial-clone.c
new file mode 100644
index 0000000000..3f102cfddd
--- /dev/null
+++ b/t/helper/test-partial-clone.c
@@ -0,0 +1,43 @@
+#include "cache.h"
+#include "test-tool.h"
+#include "repository.h"
+#include "object-store.h"
+
+/*
+ * Prints the size of the object corresponding to the given hash in a specific
+ * gitdir. This is similar to "git -C gitdir cat-file -s", except that this
+ * exercises the code that accesses the object of an arbitrary repository that
+ * is not the_repository. ("git -C gitdir" makes it so that the_repository is
+ * the one in gitdir.)
+ */
+static void object_info(const char *gitdir, const char *oid_hex)
+{
+	struct repository r;
+	struct object_id oid;
+	unsigned long size;
+	struct object_info oi = {.sizep = &size};
+	const char *p;
+
+	if (repo_init(&r, gitdir, NULL))
+		die("could not init repo");
+	if (parse_oid_hex(oid_hex, &oid, &p))
+		die("could not parse oid");
+	if (oid_object_info_extended(&r, &oid, &oi, 0))
+		die("could not obtain object info");
+	printf("%d\n", (int) size);
+}
+
+int cmd__partial_clone(int argc, const char **argv)
+{
+	setup_git_directory();
+
+	if (argc < 4)
+		die("too few arguments");
+
+	if (!strcmp(argv[1], "object-info"))
+		object_info(argv[2], argv[3]);
+	else
+		die("invalid argument '%s'", argv[1]);
+
+	return 0;
+}
diff --git a/t/helper/test-path-utils.c b/t/helper/test-path-utils.c
index 5d543ad21f..229ed416b0 100644
--- a/t/helper/test-path-utils.c
+++ b/t/helper/test-path-utils.c
@@ -172,9 +172,22 @@ static struct test_data dirname_data[] = {
 	{ NULL,              NULL     }
 };
 
-static int is_dotgitmodules(const char *path)
+static int check_dotfile(const char *x, const char **argv,
+			 int (*is_hfs)(const char *),
+			 int (*is_ntfs)(const char *))
 {
-	return is_hfs_dotgitmodules(path) || is_ntfs_dotgitmodules(path);
+	int res = 0, expect = 1;
+	for (; *argv; argv++) {
+		if (!strcmp("--not", *argv))
+			expect = !expect;
+		else if (expect != (is_hfs(*argv) || is_ntfs(*argv)))
+			res = error("'%s' is %s.git%s", *argv,
+				    expect ? "not " : "", x);
+		else
+			fprintf(stderr, "ok: '%s' is %s.git%s\n",
+				*argv, expect ? "" : "not ", x);
+	}
+	return !!res;
 }
 
 static int cmp_by_st_size(const void *a, const void *b)
@@ -185,6 +198,99 @@ static int cmp_by_st_size(const void *a, const void *b)
 	return x > y ? -1 : (x < y ? +1 : 0);
 }
 
+/*
+ * A very simple, reproducible pseudo-random generator. Copied from
+ * `test-genrandom.c`.
+ */
+static uint64_t my_random_value = 1234;
+
+static uint64_t my_random(void)
+{
+	my_random_value = my_random_value * 1103515245 + 12345;
+	return my_random_value;
+}
+
+/*
+ * A fast approximation of the square root, without requiring math.h.
+ *
+ * It uses Newton's method to approximate the solution of 0 = x^2 - value.
+ */
+static double my_sqrt(double value)
+{
+	const double epsilon = 1e-6;
+	double x = value;
+
+	if (value == 0)
+		return 0;
+
+	for (;;) {
+		double delta = (value / x - x) / 2;
+		if (delta < epsilon && delta > -epsilon)
+			return x + delta;
+		x += delta;
+	}
+}
+
+static int protect_ntfs_hfs_benchmark(int argc, const char **argv)
+{
+	size_t i, j, nr, min_len = 3, max_len = 20;
+	char **names;
+	int repetitions = 15, file_mode = 0100644;
+	uint64_t begin, end;
+	double m[3][2], v[3][2];
+	uint64_t cumul;
+	double cumul2;
+
+	if (argc > 1 && !strcmp(argv[1], "--with-symlink-mode")) {
+		file_mode = 0120000;
+		argc--;
+		argv++;
+	}
+
+	nr = argc > 1 ? strtoul(argv[1], NULL, 0) : 1000000;
+	ALLOC_ARRAY(names, nr);
+
+	if (argc > 2) {
+		min_len = strtoul(argv[2], NULL, 0);
+		if (argc > 3)
+			max_len = strtoul(argv[3], NULL, 0);
+		if (min_len > max_len)
+			die("min_len > max_len");
+	}
+
+	for (i = 0; i < nr; i++) {
+		size_t len = min_len + (my_random() % (max_len + 1 - min_len));
+
+		names[i] = xmallocz(len);
+		while (len > 0)
+			names[i][--len] = (char)(' ' + (my_random() % ('\x7f' - ' ')));
+	}
+
+	for (protect_ntfs = 0; protect_ntfs < 2; protect_ntfs++)
+		for (protect_hfs = 0; protect_hfs < 2; protect_hfs++) {
+			cumul = 0;
+			cumul2 = 0;
+			for (i = 0; i < repetitions; i++) {
+				begin = getnanotime();
+				for (j = 0; j < nr; j++)
+					verify_path(names[j], file_mode);
+				end = getnanotime();
+				printf("protect_ntfs = %d, protect_hfs = %d: %lfms\n", protect_ntfs, protect_hfs, (end-begin) / (double)1e6);
+				cumul += end - begin;
+				cumul2 += (end - begin) * (end - begin);
+			}
+			m[protect_ntfs][protect_hfs] = cumul / (double)repetitions;
+			v[protect_ntfs][protect_hfs] = my_sqrt(cumul2 / (double)repetitions - m[protect_ntfs][protect_hfs] * m[protect_ntfs][protect_hfs]);
+			printf("mean: %lfms, stddev: %lfms\n", m[protect_ntfs][protect_hfs] / (double)1e6, v[protect_ntfs][protect_hfs] / (double)1e6);
+		}
+
+	for (protect_ntfs = 0; protect_ntfs < 2; protect_ntfs++)
+		for (protect_hfs = 0; protect_hfs < 2; protect_hfs++)
+			printf("ntfs=%d/hfs=%d: %lf%% slower\n", protect_ntfs, protect_hfs, (m[protect_ntfs][protect_hfs] - m[0][0]) * 100 / m[0][0]);
+
+	return 0;
+}
+
 int cmd__path_utils(int argc, const char **argv)
 {
 	if (argc == 3 && !strcmp(argv[1], "normalize_path_copy")) {
@@ -197,11 +303,14 @@ int cmd__path_utils(int argc, const char **argv)
 	}
 
 	if (argc >= 2 && !strcmp(argv[1], "real_path")) {
+		struct strbuf realpath = STRBUF_INIT;
 		while (argc > 2) {
-			puts(real_path(argv[2]));
+			strbuf_realpath(&realpath, argv[2], 1);
+			puts(realpath.buf);
 			argc--;
 			argv++;
 		}
+		strbuf_release(&realpath);
 		return 0;
 	}
 
@@ -286,17 +395,24 @@ int cmd__path_utils(int argc, const char **argv)
 		return test_function(dirname_data, posix_dirname, argv[1]);
 
 	if (argc > 2 && !strcmp(argv[1], "is_dotgitmodules")) {
-		int res = 0, expect = 1, i;
-		for (i = 2; i < argc; i++)
-			if (!strcmp("--not", argv[i]))
-				expect = !expect;
-			else if (expect != is_dotgitmodules(argv[i]))
-				res = error("'%s' is %s.gitmodules", argv[i],
-					    expect ? "not " : "");
-			else
-				fprintf(stderr, "ok: '%s' is %s.gitmodules\n",
-					argv[i], expect ? "" : "not ");
-		return !!res;
+		return check_dotfile("modules", argv + 2,
+				     is_hfs_dotgitmodules,
+				     is_ntfs_dotgitmodules);
+	}
+	if (argc > 2 && !strcmp(argv[1], "is_dotgitignore")) {
+		return check_dotfile("ignore", argv + 2,
+				     is_hfs_dotgitignore,
+				     is_ntfs_dotgitignore);
+	}
+	if (argc > 2 && !strcmp(argv[1], "is_dotgitattributes")) {
+		return check_dotfile("attributes", argv + 2,
+				     is_hfs_dotgitattributes,
+				     is_ntfs_dotgitattributes);
+	}
+	if (argc > 2 && !strcmp(argv[1], "is_dotmailmap")) {
+		return check_dotfile("mailmap", argv + 2,
+				     is_hfs_dotmailmap,
+				     is_ntfs_dotmailmap);
 	}
 
 	if (argc > 2 && !strcmp(argv[1], "file-size")) {
@@ -355,6 +471,26 @@ int cmd__path_utils(int argc, const char **argv)
 		return !!res;
 	}
 
+	if (argc > 1 && !strcmp(argv[1], "protect_ntfs_hfs"))
+		return !!protect_ntfs_hfs_benchmark(argc - 1, argv + 1);
+
+	if (argc > 1 && !strcmp(argv[1], "is_valid_path")) {
+		int res = 0, expect = 1, i;
+
+		for (i = 2; i < argc; i++)
+			if (!strcmp("--not", argv[i]))
+				expect = 0;
+			else if (expect != is_valid_path(argv[i]))
+				res = error("'%s' is%s a valid path",
+					    argv[i], expect ? " not" : "");
+			else
+				fprintf(stderr,
+					"'%s' is%s a valid path\n",
+					argv[i], expect ? "" : " not");
+
+		return !!res;
+	}
+
 	fprintf(stderr, "%s: unknown function name: %s\n", argv[0],
 		argv[1] ? argv[1] : "(there was none)");
 	return 1;
diff --git a/t/helper/test-pcre2-config.c b/t/helper/test-pcre2-config.c
new file mode 100644
index 0000000000..5258fdddba
--- /dev/null
+++ b/t/helper/test-pcre2-config.c
@@ -0,0 +1,12 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "grep.h"
+
+int cmd__pcre2_config(int argc, const char **argv)
+{
+	if (argc == 2 && !strcmp(argv[1], "has-PCRE2_MATCH_INVALID_UTF")) {
+		int value = PCRE2_MATCH_INVALID_UTF;
+		return !value;
+	}
+	return 1;
+}
diff --git a/t/helper/test-pkt-line.c b/t/helper/test-pkt-line.c
index 282d536384..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;
@@ -46,6 +56,9 @@ static void unpack(void)
 		case PACKET_READ_DELIM:
 			printf("0001\n");
 			break;
+		case PACKET_READ_RESPONSE_END:
+			printf("0002\n");
+			break;
 		}
 	}
 }
@@ -67,7 +80,7 @@ static void unpack_sideband(void)
 		case PACKET_READ_NORMAL:
 			band = reader.line[0] & 0xff;
 			if (band < 1 || band > 2)
-				die("unexpected side band %d", band);
+				continue; /* skip non-sideband packets */
 			fd = band;
 
 			write_or_die(fd, reader.line + 1, reader.pktlen - 1);
@@ -75,11 +88,31 @@ static void unpack_sideband(void)
 		case PACKET_READ_FLUSH:
 			return;
 		case PACKET_READ_DELIM:
+		case PACKET_READ_RESPONSE_END:
 			break;
 		}
 	}
 }
 
+static int send_split_sideband(void)
+{
+	const char *part1 = "Hello,";
+	const char *primary = "\001primary: regular output\n";
+	const char *part2 = " world!\n";
+
+	send_sideband(1, 2, part1, strlen(part1), LARGE_PACKET_MAX);
+	packet_write(1, primary, strlen(primary));
+	send_sideband(1, 2, part2, strlen(part2), LARGE_PACKET_MAX);
+	packet_response_end(1);
+
+	return 0;
+}
+
+static int receive_sideband(void)
+{
+	return recv_sideband("sideband", 0, 1);
+}
+
 int cmd__pkt_line(int argc, const char **argv)
 {
 	if (argc < 2)
@@ -87,10 +120,16 @@ 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"))
 		unpack_sideband();
+	else if (!strcmp(argv[1], "send-split-sideband"))
+		send_split_sideband();
+	else if (!strcmp(argv[1], "receive-sideband"))
+		receive_sideband();
 	else
 		die("invalid argument '%s'", argv[1]);
 
diff --git a/t/helper/test-proc-receive.c b/t/helper/test-proc-receive.c
new file mode 100644
index 0000000000..cc08506cf0
--- /dev/null
+++ b/t/helper/test-proc-receive.c
@@ -0,0 +1,202 @@
+#include "cache.h"
+#include "connect.h"
+#include "parse-options.h"
+#include "pkt-line.h"
+#include "sigchain.h"
+#include "test-tool.h"
+
+static const char *proc_receive_usage[] = {
+	"test-tool proc-receive [<options>...]",
+	NULL
+};
+
+static int die_read_version;
+static int die_write_version;
+static int die_read_commands;
+static int die_read_push_options;
+static int die_write_report;
+static int no_push_options;
+static int use_atomic;
+static int use_push_options;
+static int verbose;
+static int version = 1;
+static struct string_list returns = STRING_LIST_INIT_NODUP;
+
+struct command {
+	struct command *next;
+	const char *error_string;
+	unsigned int skip_update:1,
+		     did_not_exist:1;
+	int index;
+	struct object_id old_oid;
+	struct object_id new_oid;
+	char ref_name[FLEX_ARRAY]; /* more */
+};
+
+static void proc_receive_verison(struct packet_reader *reader) {
+	int server_version = 0;
+
+	if (die_read_version)
+		die("die with the --die-read-version option");
+
+	for (;;) {
+		int linelen;
+
+		if (packet_reader_read(reader) != PACKET_READ_NORMAL)
+			break;
+
+		/* Ignore version negotiation for version 0 */
+		if (version == 0)
+			continue;
+
+		if (reader->pktlen > 8 && starts_with(reader->line, "version=")) {
+			server_version = atoi(reader->line+8);
+			if (server_version != 1)
+				die("bad protocol version: %d", server_version);
+			linelen = strlen(reader->line);
+			if (linelen < reader->pktlen) {
+				const char *feature_list = reader->line + linelen + 1;
+				if (parse_feature_request(feature_list, "atomic"))
+					use_atomic= 1;
+				if (parse_feature_request(feature_list, "push-options"))
+					use_push_options = 1;
+			}
+		}
+	}
+
+	if (die_write_version)
+		die("die with the --die-write-version option");
+
+	if (version != 0)
+		packet_write_fmt(1, "version=%d%c%s\n",
+				 version, '\0',
+				 use_push_options && !no_push_options ? "push-options": "");
+	packet_flush(1);
+}
+
+static void proc_receive_read_commands(struct packet_reader *reader,
+				       struct command **commands)
+{
+	struct command **tail = commands;
+
+	for (;;) {
+		struct object_id old_oid, new_oid;
+		struct command *cmd;
+		const char *refname;
+		const char *p;
+
+		if (packet_reader_read(reader) != PACKET_READ_NORMAL)
+			break;
+
+		if (die_read_commands)
+			die("die with the --die-read-commands option");
+
+		if (parse_oid_hex(reader->line, &old_oid, &p) ||
+		    *p++ != ' ' ||
+		    parse_oid_hex(p, &new_oid, &p) ||
+		    *p++ != ' ')
+			die("protocol error: expected 'old new ref', got '%s'",
+			    reader->line);
+		refname = p;
+		FLEX_ALLOC_STR(cmd, ref_name, refname);
+		oidcpy(&cmd->old_oid, &old_oid);
+		oidcpy(&cmd->new_oid, &new_oid);
+
+		*tail = cmd;
+		tail = &cmd->next;
+	}
+}
+
+static void proc_receive_read_push_options(struct packet_reader *reader,
+					   struct string_list *options)
+{
+
+	if (no_push_options || !use_push_options)
+	       return;
+
+	if (die_read_push_options)
+		die("die with the --die-read-push-options option");
+
+	while (1) {
+		if (packet_reader_read(reader) != PACKET_READ_NORMAL)
+			break;
+
+		string_list_append(options, reader->line);
+	}
+}
+
+int cmd__proc_receive(int argc, const char **argv)
+{
+	int nongit_ok = 0;
+	struct packet_reader reader;
+	struct command *commands = NULL;
+	struct string_list push_options = STRING_LIST_INIT_DUP;
+	struct string_list_item *item;
+	struct option options[] = {
+		OPT_BOOL(0, "no-push-options", &no_push_options,
+			 "disable push options"),
+		OPT_BOOL(0, "die-read-version", &die_read_version,
+			 "die when reading version"),
+		OPT_BOOL(0, "die-write-version", &die_write_version,
+			 "die when writing version"),
+		OPT_BOOL(0, "die-read-commands", &die_read_commands,
+			 "die when reading commands"),
+		OPT_BOOL(0, "die-read-push-options", &die_read_push_options,
+			 "die when reading push-options"),
+		OPT_BOOL(0, "die-write-report", &die_write_report,
+			 "die when writing report"),
+		OPT_STRING_LIST('r', "return", &returns, "old/new/ref/status/msg",
+				"return of results"),
+		OPT__VERBOSE(&verbose, "be verbose"),
+		OPT_INTEGER('V', "version", &version,
+			    "use this protocol version number"),
+		OPT_END()
+	};
+
+	setup_git_directory_gently(&nongit_ok);
+
+	argc = parse_options(argc, argv, "test-tools", options, proc_receive_usage, 0);
+	if (argc > 0)
+		usage_msg_opt("Too many arguments.", proc_receive_usage, options);
+	packet_reader_init(&reader, 0, NULL, 0,
+			   PACKET_READ_CHOMP_NEWLINE |
+			   PACKET_READ_GENTLE_ON_EOF);
+
+	sigchain_push(SIGPIPE, SIG_IGN);
+	proc_receive_verison(&reader);
+	proc_receive_read_commands(&reader, &commands);
+	proc_receive_read_push_options(&reader, &push_options);
+
+	if (verbose) {
+		struct command *cmd;
+
+		if (use_push_options || use_atomic)
+			fprintf(stderr, "proc-receive:%s%s\n",
+				use_atomic? " atomic": "",
+				use_push_options ? " push_options": "");
+
+		for (cmd = commands; cmd; cmd = cmd->next)
+			fprintf(stderr, "proc-receive< %s %s %s\n",
+				oid_to_hex(&cmd->old_oid),
+				oid_to_hex(&cmd->new_oid),
+				cmd->ref_name);
+
+		if (push_options.nr > 0)
+			for_each_string_list_item(item, &push_options)
+				fprintf(stderr, "proc-receive< %s\n", item->string);
+
+		if (returns.nr)
+			for_each_string_list_item(item, &returns)
+				fprintf(stderr, "proc-receive> %s\n", item->string);
+	}
+
+	if (die_write_report)
+		die("die with the --die-write-report option");
+	if (returns.nr)
+		for_each_string_list_item(item, &returns)
+			packet_write_fmt(1, "%s\n", item->string);
+	packet_flush(1);
+	sigchain_pop(SIGPIPE);
+
+	return 0;
+}
diff --git a/t/helper/test-progress.c b/t/helper/test-progress.c
index 42b96cb103..5d05cbe789 100644
--- a/t/helper/test-progress.c
+++ b/t/helper/test-progress.c
@@ -13,20 +13,13 @@
  *
  * See 't0500-progress-display.sh' for examples.
  */
+#define GIT_TEST_PROGRESS_ONLY
 #include "test-tool.h"
 #include "gettext.h"
 #include "parse-options.h"
 #include "progress.h"
 #include "strbuf.h"
 
-/*
- * These are defined in 'progress.c', but are not exposed in 'progress.h',
- * because they are exclusively for testing.
- */
-extern int progress_testing;
-extern uint64_t progress_test_ns;
-void progress_test_force_update(void);
-
 int cmd__progress(int argc, const char **argv)
 {
 	int total = 0;
diff --git a/t/helper/test-reach.c b/t/helper/test-reach.c
index a0272178b7..2f65c7f6a5 100644
--- a/t/helper/test-reach.c
+++ b/t/helper/test-reach.c
@@ -67,7 +67,7 @@ int cmd__reach(int ac, const char **av)
 			die("failed to load commit for input %s resulting in oid %s\n",
 			    buf.buf, oid_to_hex(&oid));
 
-		c = object_as_type(r, peeled, OBJ_COMMIT, 0);
+		c = object_as_type(peeled, OBJ_COMMIT, 0);
 
 		if (!c)
 			die("failed to load commit for input %s resulting in oid %s\n",
@@ -107,8 +107,10 @@ int cmd__reach(int ac, const char **av)
 		printf("%s(A,B):%d\n", av[1], ref_newer(&oid_A, &oid_B));
 	else if (!strcmp(av[1], "in_merge_bases"))
 		printf("%s(A,B):%d\n", av[1], in_merge_bases(A, B));
+	else if (!strcmp(av[1], "in_merge_bases_many"))
+		printf("%s(A,X):%d\n", av[1], in_merge_bases_many(A, X_nr, X_array));
 	else if (!strcmp(av[1], "is_descendant_of"))
-		printf("%s(A,X):%d\n", av[1], is_descendant_of(A, X));
+		printf("%s(A,X):%d\n", av[1], repo_is_descendant_of(r, A, X));
 	else if (!strcmp(av[1], "get_merge_bases_many")) {
 		struct commit_list *list = get_merge_bases_many(A, X_nr, X_array);
 		printf("%s(A,X):\n", av[1]);
@@ -164,5 +166,5 @@ int cmd__reach(int ac, const char **av)
 		print_sorted_commit_ids(list);
 	}
 
-	exit(0);
+	return 0;
 }
diff --git a/t/helper/test-read-cache.c b/t/helper/test-read-cache.c
index 244977a29b..b52c174acc 100644
--- a/t/helper/test-read-cache.c
+++ b/t/helper/test-read-cache.c
@@ -1,36 +1,82 @@
 #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;
 
-	if (argc > 1 && skip_prefix(argv[1], "--print-and-refresh=", &name)) {
-		argc--;
-		argv++;
+	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 == 2)
-		cnt = strtol(argv[1], NULL, 0);
+	if (argc == 1)
+		cnt = strtol(argv[0], NULL, 0);
 	setup_git_directory();
 	git_config(git_default_config, NULL);
+
 	for (i = 0; i < cnt; i++) {
-		read_cache();
+		repo_read_index(r);
+
+		if (expand)
+			ensure_full_index(r->index);
+
 		if (name) {
 			int pos;
 
-			refresh_index(&the_index, REFRESH_QUIET,
+			refresh_index(r->index, REFRESH_QUIET,
 				      NULL, NULL, NULL);
-			pos = index_name_pos(&the_index, name, strlen(name));
+			pos = index_name_pos(r->index, name, strlen(name));
 			if (pos < 0)
 				die("%s not in index", name);
 			printf("%s is%s up to date\n", name,
-			       ce_uptodate(the_index.cache[pos]) ? "" : " not");
+			       ce_uptodate(r->index->cache[pos]) ? "" : " not");
 			write_file(name, "%d\n", i);
 		}
-		discard_cache();
+		if (table)
+			print_cache(r->index);
+		discard_index(r->index);
 	}
 	return 0;
 }
diff --git a/t/helper/test-read-graph.c b/t/helper/test-read-graph.c
new file mode 100644
index 0000000000..75927b2c81
--- /dev/null
+++ b/t/helper/test-read-graph.c
@@ -0,0 +1,51 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "commit-graph.h"
+#include "repository.h"
+#include "object-store.h"
+
+int cmd__read_graph(int argc, const char **argv)
+{
+	struct commit_graph *graph = NULL;
+	struct object_directory *odb;
+
+	setup_git_directory();
+	odb = the_repository->objects->odb;
+
+	prepare_repo_settings(the_repository);
+
+	graph = read_commit_graph_one(the_repository, odb);
+	if (!graph)
+		return 1;
+
+	printf("header: %08x %d %d %d %d\n",
+		ntohl(*(uint32_t*)graph->data),
+		*(unsigned char*)(graph->data + 4),
+		*(unsigned char*)(graph->data + 5),
+		*(unsigned char*)(graph->data + 6),
+		*(unsigned char*)(graph->data + 7));
+	printf("num_commits: %u\n", graph->num_commits);
+	printf("chunks:");
+
+	if (graph->chunk_oid_fanout)
+		printf(" oid_fanout");
+	if (graph->chunk_oid_lookup)
+		printf(" oid_lookup");
+	if (graph->chunk_commit_data)
+		printf(" commit_metadata");
+	if (graph->chunk_generation_data)
+		printf(" generation_data");
+	if (graph->chunk_generation_data_overflow)
+		printf(" generation_data_overflow");
+	if (graph->chunk_extra_edges)
+		printf(" extra_edges");
+	if (graph->chunk_bloom_indexes)
+		printf(" bloom_indexes");
+	if (graph->chunk_bloom_data)
+		printf(" bloom_data");
+	printf("\n");
+
+	UNLEAK(graph);
+
+	return 0;
+}
diff --git a/t/helper/test-read-midx.c b/t/helper/test-read-midx.c
index 831b586d02..7c2eb11a8e 100644
--- a/t/helper/test-read-midx.c
+++ b/t/helper/test-read-midx.c
@@ -4,17 +4,21 @@
 #include "repository.h"
 #include "object-store.h"
 
-static int read_midx_file(const char *object_dir)
+static int read_midx_file(const char *object_dir, int show_objects)
 {
 	uint32_t i;
-	struct multi_pack_index *m = load_multi_pack_index(object_dir, 1);
+	struct multi_pack_index *m;
+
+	setup_git_directory();
+	m = load_multi_pack_index(object_dir, 1);
 
 	if (!m)
 		return 1;
 
-	printf("header: %08x %d %d %d\n",
+	printf("header: %08x %d %d %d %d\n",
 	       m->signature,
 	       m->version,
+	       m->hash_len,
 	       m->num_chunks,
 	       m->num_packs);
 
@@ -39,13 +43,29 @@ static int read_midx_file(const char *object_dir)
 
 	printf("object-dir: %s\n", m->object_dir);
 
+	if (show_objects) {
+		struct object_id oid;
+		struct pack_entry e;
+
+		for (i = 0; i < m->num_objects; i++) {
+			nth_midxed_object_oid(&oid, m, i);
+			fill_midx_entry(the_repository, &oid, &e, m);
+
+			printf("%s %"PRIu64"\t%s\n",
+			       oid_to_hex(&oid), e.offset, e.p->pack_name);
+		}
+		return 0;
+	}
+
 	return 0;
 }
 
 int cmd__read_midx(int argc, const char **argv)
 {
-	if (argc != 2)
-		usage("read-midx <object-dir>");
+	if (!(argc == 2 || argc == 3))
+		usage("read-midx [--show-objects] <object-dir>");
 
-	return read_midx_file(argv[1]);
+	if (!strcmp(argv[1], "--show-objects"))
+		return read_midx_file(argv[2], 1);
+	return read_midx_file(argv[1], 0);
 }
diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
index 799fc00aa1..b314b81a45 100644
--- a/t/helper/test-ref-store.c
+++ b/t/helper/test-ref-store.c
@@ -37,7 +37,7 @@ static const char **get_store(const char **argv, struct ref_store **refs)
 
 		*refs = get_submodule_ref_store(gitdir);
 	} else if (skip_prefix(argv[0], "worktree:", &gitdir)) {
-		struct worktree **p, **worktrees = get_worktrees(0);
+		struct worktree **p, **worktrees = get_worktrees();
 
 		for (p = worktrees; *p; p++) {
 			struct worktree *wt = *p;
@@ -72,18 +72,6 @@ static int cmd_pack_refs(struct ref_store *refs, const char **argv)
 	return refs_pack_refs(refs, flags);
 }
 
-static int cmd_peel_ref(struct ref_store *refs, const char **argv)
-{
-	const char *refname = notnull(*argv++, "refname");
-	struct object_id oid;
-	int ret;
-
-	ret = refs_peel_ref(refs, refname, &oid);
-	if (!ret)
-		puts(oid_to_hex(&oid));
-	return ret;
-}
-
 static int cmd_create_symref(struct ref_store *refs, const char **argv)
 {
 	const char *refname = notnull(*argv++, "refname");
@@ -130,7 +118,7 @@ static int cmd_for_each_ref(struct ref_store *refs, const char **argv)
 
 static int cmd_resolve_ref(struct ref_store *refs, const char **argv)
 {
-	struct object_id oid;
+	struct object_id oid = *null_oid();
 	const char *refname = notnull(*argv++, "refname");
 	int resolve_flags = arg_flags(*argv++, "resolve-flags");
 	int flags;
@@ -255,7 +243,6 @@ struct command {
 
 static struct command commands[] = {
 	{ "pack-refs", cmd_pack_refs },
-	{ "peel-ref", cmd_peel_ref },
 	{ "create-symref", cmd_create_symref },
 	{ "delete-refs", cmd_delete_refs },
 	{ "rename-ref", cmd_rename_ref },
diff --git a/t/helper/test-regex.c b/t/helper/test-regex.c
index 10284cc56f..d6f28ca8d1 100644
--- a/t/helper/test-regex.c
+++ b/t/helper/test-regex.c
@@ -1,5 +1,4 @@
 #include "test-tool.h"
-#include "git-compat-util.h"
 #include "gettext.h"
 
 struct reg_flag {
@@ -8,12 +7,13 @@ struct reg_flag {
 };
 
 static struct reg_flag reg_flags[] = {
-	{ "EXTENDED",	 REG_EXTENDED	},
-	{ "NEWLINE",	 REG_NEWLINE	},
-	{ "ICASE",	 REG_ICASE	},
-	{ "NOTBOL",	 REG_NOTBOL	},
+	{ "EXTENDED",	REG_EXTENDED	},
+	{ "NEWLINE",	REG_NEWLINE	},
+	{ "ICASE",	REG_ICASE	},
+	{ "NOTBOL",	REG_NOTBOL	},
+	{ "NOTEOL",	REG_NOTEOL	},
 #ifdef REG_STARTEND
-	{ "STARTEND",	 REG_STARTEND	},
+	{ "STARTEND",	REG_STARTEND	},
 #endif
 	{ NULL, 0 }
 };
@@ -41,36 +41,74 @@ int cmd__regex(int argc, const char **argv)
 {
 	const char *pat;
 	const char *str;
-	int flags = 0;
+	int ret, silent = 0, flags = 0;
 	regex_t r;
 	regmatch_t m[1];
-
-	if (argc == 2 && !strcmp(argv[1], "--bug"))
-		return test_regex_bug();
-	else if (argc < 3)
-		usage("test-tool regex --bug\n"
-		      "test-tool regex <pattern> <string> [<options>]");
+	char errbuf[64];
 
 	argv++;
-	pat = *argv++;
-	str = *argv++;
-	while (*argv) {
-		struct reg_flag *rf;
-		for (rf = reg_flags; rf->name; rf++)
-			if (!strcmp(*argv, rf->name)) {
-				flags |= rf->flag;
-				break;
-			}
-		if (!rf->name)
-			die("do not recognize %s", *argv);
+	argc--;
+
+	if (!argc)
+		goto usage;
+
+	if (!strcmp(*argv, "--bug")) {
+		if (argc == 1)
+			return test_regex_bug();
+		else
+			goto usage;
+	}
+	if (!strcmp(*argv, "--silent")) {
+		silent = 1;
 		argv++;
+		argc--;
+	}
+	if (!argc)
+		goto usage;
+
+	pat = *argv++;
+	if (argc == 1)
+		str = NULL;
+	else {
+		str = *argv++;
+		while (*argv) {
+			struct reg_flag *rf;
+			for (rf = reg_flags; rf->name; rf++)
+				if (!strcmp(*argv, rf->name)) {
+					flags |= rf->flag;
+					break;
+				}
+			if (!rf->name)
+				die("do not recognize flag %s", *argv);
+			argv++;
+		}
 	}
 	git_setup_gettext();
 
-	if (regcomp(&r, pat, flags))
-		die("failed regcomp() for pattern '%s'", pat);
-	if (regexec(&r, str, 1, m, 0))
-		return 1;
+	ret = regcomp(&r, pat, flags);
+	if (ret) {
+		if (silent)
+			return ret;
+
+		regerror(ret, &r, errbuf, sizeof(errbuf));
+		die("failed regcomp() for pattern '%s' (%s)", pat, errbuf);
+	}
+	if (!str)
+		return 0;
+
+	ret = regexec(&r, str, 1, m, 0);
+	if (ret) {
+		if (silent || ret == REG_NOMATCH)
+			return ret;
+
+		regerror(ret, &r, errbuf, sizeof(errbuf));
+		die("failed regexec() for subject '%s' (%s)", str, errbuf);
+	}
 
 	return 0;
+usage:
+	usage("\ttest-tool regex --bug\n"
+	      "\ttest-tool regex [--silent] <pattern>\n"
+	      "\ttest-tool regex [--silent] <pattern> <string> [<options>]");
+	return -1;
 }
diff --git a/t/helper/test-repository.c b/t/helper/test-repository.c
index f7f8618445..56f0e3c1be 100644
--- a/t/helper/test-repository.c
+++ b/t/helper/test-repository.c
@@ -19,12 +19,11 @@ static void test_parse_commit_in_graph(const char *gitdir, const char *worktree,
 
 	memset(the_repository, 0, sizeof(*the_repository));
 
-	/* TODO: Needed for temporary hack in hashcmp, see 183a638b7da. */
-	repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
-
 	if (repo_init(&r, gitdir, worktree))
 		die("Couldn't init repo");
 
+	repo_set_hash_algo(the_repository, hash_algo_by_ptr(r.hash_algo));
+
 	c = lookup_commit(&r, commit_oid);
 
 	if (!parse_commit_in_graph(&r, c))
@@ -50,12 +49,11 @@ static void test_get_commit_tree_in_graph(const char *gitdir,
 
 	memset(the_repository, 0, sizeof(*the_repository));
 
-	/* TODO: Needed for temporary hack in hashcmp, see 183a638b7da. */
-	repo_set_hash_algo(the_repository, GIT_HASH_SHA1);
-
 	if (repo_init(&r, gitdir, worktree))
 		die("Couldn't init repo");
 
+	repo_set_hash_algo(the_repository, hash_algo_by_ptr(r.hash_algo));
+
 	c = lookup_commit(&r, commit_oid);
 
 	/*
@@ -75,6 +73,10 @@ static void test_get_commit_tree_in_graph(const char *gitdir,
 
 int cmd__repository(int argc, const char **argv)
 {
+	int nongit_ok = 0;
+
+	setup_git_directory_gently(&nongit_ok);
+
 	if (argc < 2)
 		die("must have at least 2 arguments");
 	if (!strcmp(argv[1], "parse_commit_in_graph")) {
diff --git a/t/helper/test-run-command.c b/t/helper/test-run-command.c
index ead6dc611a..7ae03dc712 100644
--- a/t/helper/test-run-command.c
+++ b/t/helper/test-run-command.c
@@ -12,14 +12,14 @@
 #include "git-compat-util.h"
 #include "cache.h"
 #include "run-command.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "strbuf.h"
 #include "parse-options.h"
 #include "string-list.h"
 #include "thread-utils.h"
 #include "wildmatch.h"
-#include <string.h>
-#include <errno.h>
+#include "gettext.h"
+#include "parse-options.h"
 
 static int number_callbacks;
 static int parallel_next(struct child_process *cp,
@@ -31,7 +31,7 @@ static int parallel_next(struct child_process *cp,
 	if (number_callbacks >= 4)
 		return 0;
 
-	argv_array_pushv(&cp->args, d->argv);
+	strvec_pushv(&cp->args, d->argv);
 	strbuf_addstr(err, "preloaded output of a child\n");
 	number_callbacks++;
 	return 1;
@@ -72,19 +72,19 @@ static int next_test(struct child_process *cp, struct strbuf *err, void *cb,
 		return 0;
 
 	test = suite->tests.items[suite->next++].string;
-	argv_array_pushl(&cp->args, "sh", test, NULL);
+	strvec_pushl(&cp->args, "sh", test, NULL);
 	if (suite->quiet)
-		argv_array_push(&cp->args, "--quiet");
+		strvec_push(&cp->args, "--quiet");
 	if (suite->immediate)
-		argv_array_push(&cp->args, "-i");
+		strvec_push(&cp->args, "-i");
 	if (suite->verbose)
-		argv_array_push(&cp->args, "-v");
+		strvec_push(&cp->args, "-v");
 	if (suite->verbose_log)
-		argv_array_push(&cp->args, "-V");
+		strvec_push(&cp->args, "-V");
 	if (suite->trace)
-		argv_array_push(&cp->args, "-x");
+		strvec_push(&cp->args, "-x");
 	if (suite->write_junit_xml)
-		argv_array_push(&cp->args, "--write-junit-xml");
+		strvec_push(&cp->args, "--write-junit-xml");
 
 	strbuf_addf(err, "Output of '%s':\n", test);
 	*task_cb = (void *)test;
@@ -200,6 +200,174 @@ static int testsuite(int argc, const char **argv)
 	return !!ret;
 }
 
+static uint64_t my_random_next = 1234;
+
+static uint64_t my_random(void)
+{
+	uint64_t res = my_random_next;
+	my_random_next = my_random_next * 1103515245 + 12345;
+	return res;
+}
+
+static int quote_stress_test(int argc, const char **argv)
+{
+	/*
+	 * We are running a quote-stress test.
+	 * spawn a subprocess that runs quote-stress with a
+	 * special option that echoes back the arguments that
+	 * were passed in.
+	 */
+	char special[] = ".?*\\^_\"'`{}()[]<>@~&+:;$%"; // \t\r\n\a";
+	int i, j, k, trials = 100, skip = 0, msys2 = 0;
+	struct strbuf out = STRBUF_INIT;
+	struct strvec args = STRVEC_INIT;
+	struct option options[] = {
+		OPT_INTEGER('n', "trials", &trials, "Number of trials"),
+		OPT_INTEGER('s', "skip", &skip, "Skip <n> trials"),
+		OPT_BOOL('m', "msys2", &msys2, "Test quoting for MSYS2's sh"),
+		OPT_END()
+	};
+	const char * const usage[] = {
+		"test-tool run-command quote-stress-test <options>",
+		NULL
+	};
+
+	argc = parse_options(argc, argv, NULL, options, usage, 0);
+
+	setenv("MSYS_NO_PATHCONV", "1", 0);
+
+	for (i = 0; i < trials; i++) {
+		struct child_process cp = CHILD_PROCESS_INIT;
+		size_t arg_count, arg_offset;
+		int ret = 0;
+
+		strvec_clear(&args);
+		if (msys2)
+			strvec_pushl(&args, "sh", "-c",
+				     "printf %s\\\\0 \"$@\"", "skip", NULL);
+		else
+			strvec_pushl(&args, "test-tool", "run-command",
+				     "quote-echo", NULL);
+		arg_offset = args.nr;
+
+		if (argc > 0) {
+			trials = 1;
+			arg_count = argc;
+			for (j = 0; j < arg_count; j++)
+				strvec_push(&args, argv[j]);
+		} else {
+			arg_count = 1 + (my_random() % 5);
+			for (j = 0; j < arg_count; j++) {
+				char buf[20];
+				size_t min_len = 1;
+				size_t arg_len = min_len +
+					(my_random() % (ARRAY_SIZE(buf) - min_len));
+
+				for (k = 0; k < arg_len; k++)
+					buf[k] = special[my_random() %
+						ARRAY_SIZE(special)];
+				buf[arg_len] = '\0';
+
+				strvec_push(&args, buf);
+			}
+		}
+
+		if (i < skip)
+			continue;
+
+		cp.argv = args.v;
+		strbuf_reset(&out);
+		if (pipe_command(&cp, NULL, 0, &out, 0, NULL, 0) < 0)
+			return error("Failed to spawn child process");
+
+		for (j = 0, k = 0; j < arg_count; j++) {
+			const char *arg = args.v[j + arg_offset];
+
+			if (strcmp(arg, out.buf + k))
+				ret = error("incorrectly quoted arg: '%s', "
+					    "echoed back as '%s'",
+					     arg, out.buf + k);
+			k += strlen(out.buf + k) + 1;
+		}
+
+		if (k != out.len)
+			ret = error("got %d bytes, but consumed only %d",
+				     (int)out.len, (int)k);
+
+		if (ret) {
+			fprintf(stderr, "Trial #%d failed. Arguments:\n", i);
+			for (j = 0; j < arg_count; j++)
+				fprintf(stderr, "arg #%d: '%s'\n",
+					(int)j, args.v[j + arg_offset]);
+
+			strbuf_release(&out);
+			strvec_clear(&args);
+
+			return ret;
+		}
+
+		if (i && (i % 100) == 0)
+			fprintf(stderr, "Trials completed: %d\n", (int)i);
+	}
+
+	strbuf_release(&out);
+	strvec_clear(&args);
+
+	return 0;
+}
+
+static int quote_echo(int argc, const char **argv)
+{
+	while (argc > 1) {
+		fwrite(argv[1], strlen(argv[1]), 1, stdout);
+		fputc('\0', stdout);
+		argv++;
+		argc--;
+	}
+
+	return 0;
+}
+
+static int inherit_handle(const char *argv0)
+{
+	struct child_process cp = CHILD_PROCESS_INIT;
+	char path[PATH_MAX];
+	int tmp;
+
+	/* First, open an inheritable handle */
+	xsnprintf(path, sizeof(path), "out-XXXXXX");
+	tmp = xmkstemp(path);
+
+	strvec_pushl(&cp.args,
+		     "test-tool", argv0, "inherited-handle-child", NULL);
+	cp.in = -1;
+	cp.no_stdout = cp.no_stderr = 1;
+	if (start_command(&cp) < 0)
+		die("Could not start child process");
+
+	/* Then close it, and try to delete it. */
+	close(tmp);
+	if (unlink(path))
+		die("Could not delete '%s'", path);
+
+	if (close(cp.in) < 0 || finish_command(&cp) < 0)
+		die("Child did not finish");
+
+	return 0;
+}
+
+static int inherit_handle_child(void)
+{
+	struct strbuf buf = STRBUF_INIT;
+
+	if (strbuf_read(&buf, 0, 0) < 0)
+		die("Could not read stdin");
+	printf("Received %s\n", buf.buf);
+	strbuf_release(&buf);
+
+	return 0;
+}
+
 int cmd__run_command(int argc, const char **argv)
 {
 	struct child_process proc = CHILD_PROCESS_INIT;
@@ -207,13 +375,23 @@ int cmd__run_command(int argc, const char **argv)
 
 	if (argc > 1 && !strcmp(argv[1], "testsuite"))
 		exit(testsuite(argc - 1, argv + 1));
+	if (!strcmp(argv[1], "inherited-handle"))
+		exit(inherit_handle(argv[0]));
+	if (!strcmp(argv[1], "inherited-handle-child"))
+		exit(inherit_handle_child());
+
+	if (argc >= 2 && !strcmp(argv[1], "quote-stress-test"))
+		return !!quote_stress_test(argc - 1, argv + 1);
+
+	if (argc >= 2 && !strcmp(argv[1], "quote-echo"))
+		return !!quote_echo(argc - 1, argv + 1);
 
 	if (argc < 3)
 		return 1;
 	while (!strcmp(argv[1], "env")) {
 		if (!argv[2])
 			die("env specifier without a value");
-		argv_array_push(&proc.env_array, argv[2]);
+		strvec_push(&proc.env_array, argv[2]);
 		argv += 2;
 		argc -= 2;
 	}
diff --git a/t/helper/test-simple-ipc.c b/t/helper/test-simple-ipc.c
new file mode 100644
index 0000000000..42040ef81b
--- /dev/null
+++ b/t/helper/test-simple-ipc.c
@@ -0,0 +1,787 @@
+/*
+ * test-simple-ipc.c: verify that the Inter-Process Communication works.
+ */
+
+#include "test-tool.h"
+#include "cache.h"
+#include "strbuf.h"
+#include "simple-ipc.h"
+#include "parse-options.h"
+#include "thread-utils.h"
+#include "strvec.h"
+
+#ifndef SUPPORTS_SIMPLE_IPC
+int cmd__simple_ipc(int argc, const char **argv)
+{
+	die("simple IPC not available on this platform");
+}
+#else
+
+/*
+ * The test daemon defines an "application callback" that supports a
+ * series of commands (see `test_app_cb()`).
+ *
+ * Unknown commands are caught here and we send an error message back
+ * to the client process.
+ */
+static int app__unhandled_command(const char *command,
+				  ipc_server_reply_cb *reply_cb,
+				  struct ipc_server_reply_data *reply_data)
+{
+	struct strbuf buf = STRBUF_INIT;
+	int ret;
+
+	strbuf_addf(&buf, "unhandled command: %s", command);
+	ret = reply_cb(reply_data, buf.buf, buf.len);
+	strbuf_release(&buf);
+
+	return ret;
+}
+
+/*
+ * Reply with a single very large buffer.  This is to ensure that
+ * long response are properly handled -- whether the chunking occurs
+ * in the kernel or in the (probably pkt-line) layer.
+ */
+#define BIG_ROWS (10000)
+static int app__big_command(ipc_server_reply_cb *reply_cb,
+			    struct ipc_server_reply_data *reply_data)
+{
+	struct strbuf buf = STRBUF_INIT;
+	int row;
+	int ret;
+
+	for (row = 0; row < BIG_ROWS; row++)
+		strbuf_addf(&buf, "big: %.75d\n", row);
+
+	ret = reply_cb(reply_data, buf.buf, buf.len);
+	strbuf_release(&buf);
+
+	return ret;
+}
+
+/*
+ * Reply with a series of lines.  This is to ensure that we can incrementally
+ * compute the response and chunk it to the client.
+ */
+#define CHUNK_ROWS (10000)
+static int app__chunk_command(ipc_server_reply_cb *reply_cb,
+			      struct ipc_server_reply_data *reply_data)
+{
+	struct strbuf buf = STRBUF_INIT;
+	int row;
+	int ret;
+
+	for (row = 0; row < CHUNK_ROWS; row++) {
+		strbuf_setlen(&buf, 0);
+		strbuf_addf(&buf, "big: %.75d\n", row);
+		ret = reply_cb(reply_data, buf.buf, buf.len);
+	}
+
+	strbuf_release(&buf);
+
+	return ret;
+}
+
+/*
+ * Slowly reply with a series of lines.  This is to model an expensive to
+ * compute chunked response (which might happen if this callback is running
+ * in a thread and is fighting for a lock with other threads).
+ */
+#define SLOW_ROWS     (1000)
+#define SLOW_DELAY_MS (10)
+static int app__slow_command(ipc_server_reply_cb *reply_cb,
+			     struct ipc_server_reply_data *reply_data)
+{
+	struct strbuf buf = STRBUF_INIT;
+	int row;
+	int ret;
+
+	for (row = 0; row < SLOW_ROWS; row++) {
+		strbuf_setlen(&buf, 0);
+		strbuf_addf(&buf, "big: %.75d\n", row);
+		ret = reply_cb(reply_data, buf.buf, buf.len);
+		sleep_millisec(SLOW_DELAY_MS);
+	}
+
+	strbuf_release(&buf);
+
+	return ret;
+}
+
+/*
+ * The client sent a command followed by a (possibly very) large buffer.
+ */
+static int app__sendbytes_command(const char *received,
+				  ipc_server_reply_cb *reply_cb,
+				  struct ipc_server_reply_data *reply_data)
+{
+	struct strbuf buf_resp = STRBUF_INIT;
+	const char *p = "?";
+	int len_ballast = 0;
+	int k;
+	int errs = 0;
+	int ret;
+
+	if (skip_prefix(received, "sendbytes ", &p))
+		len_ballast = strlen(p);
+
+	/*
+	 * Verify that the ballast is n copies of a single letter.
+	 * And that the multi-threaded IO layer didn't cross the streams.
+	 */
+	for (k = 1; k < len_ballast; k++)
+		if (p[k] != p[0])
+			errs++;
+
+	if (errs)
+		strbuf_addf(&buf_resp, "errs:%d\n", errs);
+	else
+		strbuf_addf(&buf_resp, "rcvd:%c%08d\n", p[0], len_ballast);
+
+	ret = reply_cb(reply_data, buf_resp.buf, buf_resp.len);
+
+	strbuf_release(&buf_resp);
+
+	return ret;
+}
+
+/*
+ * An arbitrary fixed address to verify that the application instance
+ * data is handled properly.
+ */
+static int my_app_data = 42;
+
+static ipc_server_application_cb test_app_cb;
+
+/*
+ * This is the "application callback" that sits on top of the
+ * "ipc-server".  It completely defines the set of commands supported
+ * by this application.
+ */
+static int test_app_cb(void *application_data,
+		       const char *command,
+		       ipc_server_reply_cb *reply_cb,
+		       struct ipc_server_reply_data *reply_data)
+{
+	/*
+	 * Verify that we received the application-data that we passed
+	 * when we started the ipc-server.  (We have several layers of
+	 * callbacks calling callbacks and it's easy to get things mixed
+	 * up (especially when some are "void*").)
+	 */
+	if (application_data != (void*)&my_app_data)
+		BUG("application_cb: application_data pointer wrong");
+
+	if (!strcmp(command, "quit")) {
+		/*
+		 * The client sent a "quit" command.  This is an async
+		 * request for the server to shutdown.
+		 *
+		 * We DO NOT send the client a response message
+		 * (because we have nothing to say and the other
+		 * server threads have not yet stopped).
+		 *
+		 * Tell the ipc-server layer to start shutting down.
+		 * This includes: stop listening for new connections
+		 * on the socket/pipe and telling all worker threads
+		 * to finish/drain their outgoing responses to other
+		 * clients.
+		 *
+		 * This DOES NOT force an immediate sync shutdown.
+		 */
+		return SIMPLE_IPC_QUIT;
+	}
+
+	if (!strcmp(command, "ping")) {
+		const char *answer = "pong";
+		return reply_cb(reply_data, answer, strlen(answer));
+	}
+
+	if (!strcmp(command, "big"))
+		return app__big_command(reply_cb, reply_data);
+
+	if (!strcmp(command, "chunk"))
+		return app__chunk_command(reply_cb, reply_data);
+
+	if (!strcmp(command, "slow"))
+		return app__slow_command(reply_cb, reply_data);
+
+	if (starts_with(command, "sendbytes "))
+		return app__sendbytes_command(command, reply_cb, reply_data);
+
+	return app__unhandled_command(command, reply_cb, reply_data);
+}
+
+struct cl_args
+{
+	const char *subcommand;
+	const char *path;
+	const char *token;
+
+	int nr_threads;
+	int max_wait_sec;
+	int bytecount;
+	int batchsize;
+
+	char bytevalue;
+};
+
+static struct cl_args cl_args = {
+	.subcommand = NULL,
+	.path = "ipc-test",
+	.token = NULL,
+
+	.nr_threads = 5,
+	.max_wait_sec = 60,
+	.bytecount = 1024,
+	.batchsize = 10,
+
+	.bytevalue = 'x',
+};
+
+/*
+ * This process will run as a simple-ipc server and listen for IPC commands
+ * from client processes.
+ */
+static int daemon__run_server(void)
+{
+	int ret;
+
+	struct ipc_server_opts opts = {
+		.nr_threads = cl_args.nr_threads,
+	};
+
+	/*
+	 * Synchronously run the ipc-server.  We don't need any application
+	 * instance data, so pass an arbitrary pointer (that we'll later
+	 * verify made the round trip).
+	 */
+	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);
+	else if (ret == -1)
+		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();
+
+	switch (*pid) {
+	case 0:
+		if (setsid() == -1)
+			error_errno(_("setsid failed"));
+		close(0);
+		close(1);
+		close(2);
+		sanitize_stdfds();
+
+		return ipc_server_run(cl_args.path, &opts, test_app_cb,
+				      (void*)&my_app_data);
+
+	case -1:
+		return error_errno(_("could not spawn daemon in the background"));
+
+	default:
+		return 0;
+	}
+}
+#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)
+{
+	int status;
+	pid_t pid_seen;
+	enum ipc_active_state s;
+	time_t time_limit, now;
+
+	time(&time_limit);
+	time_limit += cl_args.max_wait_sec;
+
+	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;
+
+			time(&now);
+			if (now > time_limit)
+				return error(_("daemon not online yet"));
+
+			continue;
+		}
+
+		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;
+
+			/*
+			 * 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"));
+		}
+
+		else
+			return error(_("waitpid is confused"));
+	}
+}
+
+/*
+ * 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.
+ *
+ * Returns 0 if the server is alive.
+ */
+static int client__probe_server(void)
+{
+	enum ipc_active_state s;
+
+	s = ipc_get_active_state(cl_args.path);
+	switch (s) {
+	case IPC_STATE__LISTENING:
+		return 0;
+
+	case IPC_STATE__NOT_LISTENING:
+		return error("no server listening at '%s'", cl_args.path);
+
+	case IPC_STATE__PATH_NOT_FOUND:
+		return error("path not found '%s'", cl_args.path);
+
+	case IPC_STATE__INVALID_PATH:
+		return error("invalid pipe/socket name '%s'", cl_args.path);
+
+	case IPC_STATE__OTHER_ERROR:
+	default:
+		return error("other error for '%s'", cl_args.path);
+	}
+}
+
+/*
+ * Send an IPC command token to an already-running server daemon and
+ * print the response.
+ *
+ * This is a simple 1 word command/token that `test_app_cb()` (in the
+ * daemon process) will understand.
+ */
+static int client__send_ipc(void)
+{
+	const char *command = "(no-command)";
+	struct strbuf buf = STRBUF_INIT;
+	struct ipc_client_connect_options options
+		= IPC_CLIENT_CONNECT_OPTIONS_INIT;
+
+	if (cl_args.token && *cl_args.token)
+		command = cl_args.token;
+
+	options.wait_if_busy = 1;
+	options.wait_if_not_found = 0;
+
+	if (!ipc_client_send_command(cl_args.path, &options, command, &buf)) {
+		if (buf.len) {
+			printf("%s\n", buf.buf);
+			fflush(stdout);
+		}
+		strbuf_release(&buf);
+
+		return 0;
+	}
+
+	return error("failed to send '%s' to '%s'", command, cl_args.path);
+}
+
+/*
+ * Send an IPC command to an already-running server and ask it to
+ * shutdown.  "send quit" is an async request and queues a shutdown
+ * event in the server, so we spin and wait here for it to actually
+ * shutdown to make the unit tests a little easier to write.
+ */
+static int client__stop_server(void)
+{
+	int ret;
+	time_t time_limit, now;
+	enum ipc_active_state s;
+
+	time(&time_limit);
+	time_limit += cl_args.max_wait_sec;
+
+	cl_args.token = "quit";
+
+	ret = client__send_ipc();
+	if (ret)
+		return ret;
+
+	for (;;) {
+		sleep_millisec(100);
+
+		s = ipc_get_active_state(cl_args.path);
+
+		if (s != IPC_STATE__LISTENING) {
+			/*
+			 * The socket/pipe is gone and/or has stopped
+			 * responding.  Lets assume that the daemon
+			 * process has exited too.
+			 */
+			return 0;
+		}
+
+		time(&now);
+		if (now > time_limit)
+			return error(_("daemon has not shutdown yet"));
+	}
+}
+
+/*
+ * Send an IPC command followed by ballast to confirm that a large
+ * message can be sent and that the kernel or pkt-line layers will
+ * properly chunk it and that the daemon receives the entire message.
+ */
+static int do_sendbytes(int bytecount, char byte, const char *path,
+			const struct ipc_client_connect_options *options)
+{
+	struct strbuf buf_send = STRBUF_INIT;
+	struct strbuf buf_resp = STRBUF_INIT;
+
+	strbuf_addstr(&buf_send, "sendbytes ");
+	strbuf_addchars(&buf_send, byte, bytecount);
+
+	if (!ipc_client_send_command(path, options, buf_send.buf, &buf_resp)) {
+		strbuf_rtrim(&buf_resp);
+		printf("sent:%c%08d %s\n", byte, bytecount, buf_resp.buf);
+		fflush(stdout);
+		strbuf_release(&buf_send);
+		strbuf_release(&buf_resp);
+
+		return 0;
+	}
+
+	return error("client failed to sendbytes(%d, '%c') to '%s'",
+		     bytecount, byte, path);
+}
+
+/*
+ * Send an IPC command with ballast to an already-running server daemon.
+ */
+static int client__sendbytes(void)
+{
+	struct ipc_client_connect_options options
+		= IPC_CLIENT_CONNECT_OPTIONS_INIT;
+
+	options.wait_if_busy = 1;
+	options.wait_if_not_found = 0;
+	options.uds_disallow_chdir = 0;
+
+	return do_sendbytes(cl_args.bytecount, cl_args.bytevalue, cl_args.path,
+			    &options);
+}
+
+struct multiple_thread_data {
+	pthread_t pthread_id;
+	struct multiple_thread_data *next;
+	const char *path;
+	int bytecount;
+	int batchsize;
+	int sum_errors;
+	int sum_good;
+	char letter;
+};
+
+static void *multiple_thread_proc(void *_multiple_thread_data)
+{
+	struct multiple_thread_data *d = _multiple_thread_data;
+	int k;
+	struct ipc_client_connect_options options
+		= IPC_CLIENT_CONNECT_OPTIONS_INIT;
+
+	options.wait_if_busy = 1;
+	options.wait_if_not_found = 0;
+	/*
+	 * A multi-threaded client should not be randomly calling chdir().
+	 * The test will pass without this restriction because the test is
+	 * not otherwise accessing the filesystem, but it makes us honest.
+	 */
+	options.uds_disallow_chdir = 1;
+
+	trace2_thread_start("multiple");
+
+	for (k = 0; k < d->batchsize; k++) {
+		if (do_sendbytes(d->bytecount + k, d->letter, d->path, &options))
+			d->sum_errors++;
+		else
+			d->sum_good++;
+	}
+
+	trace2_thread_exit();
+	return NULL;
+}
+
+/*
+ * Start a client-side thread pool.  Each thread sends a series of
+ * IPC requests.  Each request is on a new connection to the server.
+ */
+static int client__multiple(void)
+{
+	struct multiple_thread_data *list = NULL;
+	int k;
+	int sum_join_errors = 0;
+	int sum_thread_errors = 0;
+	int sum_good = 0;
+
+	for (k = 0; k < cl_args.nr_threads; k++) {
+		struct multiple_thread_data *d = xcalloc(1, sizeof(*d));
+		d->next = list;
+		d->path = cl_args.path;
+		d->bytecount = cl_args.bytecount + cl_args.batchsize*(k/26);
+		d->batchsize = cl_args.batchsize;
+		d->sum_errors = 0;
+		d->sum_good = 0;
+		d->letter = 'A' + (k % 26);
+
+		if (pthread_create(&d->pthread_id, NULL, multiple_thread_proc, d)) {
+			warning("failed to create thread[%d] skipping remainder", k);
+			free(d);
+			break;
+		}
+
+		list = d;
+	}
+
+	while (list) {
+		struct multiple_thread_data *d = list;
+
+		if (pthread_join(d->pthread_id, NULL))
+			sum_join_errors++;
+
+		sum_thread_errors += d->sum_errors;
+		sum_good += d->sum_good;
+
+		list = d->next;
+		free(d);
+	}
+
+	printf("client (good %d) (join %d), (errors %d)\n",
+	       sum_good, sum_join_errors, sum_thread_errors);
+
+	return (sum_join_errors + sum_thread_errors) ? 1 : 0;
+}
+
+int cmd__simple_ipc(int argc, const char **argv)
+{
+	const char * const simple_ipc_usage[] = {
+		N_("test-helper simple-ipc is-active    [<name>] [<options>]"),
+		N_("test-helper simple-ipc run-daemon   [<name>] [<threads>]"),
+		N_("test-helper simple-ipc start-daemon [<name>] [<threads>] [<max-wait>]"),
+		N_("test-helper simple-ipc stop-daemon  [<name>] [<max-wait>]"),
+		N_("test-helper simple-ipc send         [<name>] [<token>]"),
+		N_("test-helper simple-ipc sendbytes    [<name>] [<bytecount>] [<byte>]"),
+		N_("test-helper simple-ipc multiple     [<name>] [<threads>] [<bytecount>] [<batchsize>]"),
+		NULL
+	};
+
+	const char *bytevalue = NULL;
+
+	struct option options[] = {
+#ifndef GIT_WINDOWS_NATIVE
+		OPT_STRING(0, "name", &cl_args.path, N_("name"), N_("name or pathname of unix domain socket")),
+#else
+		OPT_STRING(0, "name", &cl_args.path, N_("name"), N_("named-pipe name")),
+#endif
+		OPT_INTEGER(0, "threads", &cl_args.nr_threads, N_("number of threads in server thread pool")),
+		OPT_INTEGER(0, "max-wait", &cl_args.max_wait_sec, N_("seconds to wait for daemon to start or stop")),
+
+		OPT_INTEGER(0, "bytecount", &cl_args.bytecount, N_("number of bytes")),
+		OPT_INTEGER(0, "batchsize", &cl_args.batchsize, N_("number of requests per thread")),
+
+		OPT_STRING(0, "byte", &bytevalue, N_("byte"), N_("ballast character")),
+		OPT_STRING(0, "token", &cl_args.token, N_("token"), N_("command token to send to the server")),
+
+		OPT_END()
+	};
+
+	if (argc < 2)
+		usage_with_options(simple_ipc_usage, options);
+
+	if (argc == 2 && !strcmp(argv[1], "-h"))
+		usage_with_options(simple_ipc_usage, options);
+
+	if (argc == 2 && !strcmp(argv[1], "SUPPORTS_SIMPLE_IPC"))
+		return 0;
+
+	cl_args.subcommand = argv[1];
+
+	argc--;
+	argv++;
+
+	argc = parse_options(argc, argv, NULL, options, simple_ipc_usage, 0);
+
+	if (cl_args.nr_threads < 1)
+		cl_args.nr_threads = 1;
+	if (cl_args.max_wait_sec < 0)
+		cl_args.max_wait_sec = 0;
+	if (cl_args.bytecount < 1)
+		cl_args.bytecount = 1;
+	if (cl_args.batchsize < 1)
+		cl_args.batchsize = 1;
+
+	if (bytevalue && *bytevalue)
+		cl_args.bytevalue = bytevalue[0];
+
+	/*
+	 * Use '!!' on all dispatch functions to map from `error()` style
+	 * (returns -1) style to `test_must_fail` style (expects 1).  This
+	 * makes shell error messages less confusing.
+	 */
+
+	if (!strcmp(cl_args.subcommand, "is-active"))
+		return !!client__probe_server();
+
+	if (!strcmp(cl_args.subcommand, "run-daemon"))
+		return !!daemon__run_server();
+
+	if (!strcmp(cl_args.subcommand, "start-daemon"))
+		return !!daemon__start_server();
+
+	/*
+	 * Client commands follow.  Ensure a server is running before
+	 * sending any data.  This might be overkill, but then again
+	 * this is a test harness.
+	 */
+
+	if (!strcmp(cl_args.subcommand, "stop-daemon")) {
+		if (client__probe_server())
+			return 1;
+		return !!client__stop_server();
+	}
+
+	if (!strcmp(cl_args.subcommand, "send")) {
+		if (client__probe_server())
+			return 1;
+		return !!client__send_ipc();
+	}
+
+	if (!strcmp(cl_args.subcommand, "sendbytes")) {
+		if (client__probe_server())
+			return 1;
+		return !!client__sendbytes();
+	}
+
+	if (!strcmp(cl_args.subcommand, "multiple")) {
+		if (client__probe_server())
+			return 1;
+		return !!client__multiple();
+	}
+
+	die("Unhandled subcommand: '%s'", cl_args.subcommand);
+}
+#endif
diff --git a/t/helper/test-submodule-nested-repo-config.c b/t/helper/test-submodule-nested-repo-config.c
index bc97929bbc..e3f11ff5a7 100644
--- a/t/helper/test-submodule-nested-repo-config.c
+++ b/t/helper/test-submodule-nested-repo-config.c
@@ -1,7 +1,7 @@
 #include "test-tool.h"
 #include "submodule-config.h"
 
-static void die_usage(int argc, const char **argv, const char *msg)
+static void die_usage(const char **argv, const char *msg)
 {
 	fprintf(stderr, "%s\n", msg);
 	fprintf(stderr, "Usage: %s <submodulepath> <config name>\n", argv[0]);
@@ -14,13 +14,13 @@ int cmd__submodule_nested_repo_config(int argc, const char **argv)
 	const struct submodule *sub;
 
 	if (argc < 3)
-		die_usage(argc, argv, "Wrong number of arguments.");
+		die_usage(argv, "Wrong number of arguments.");
 
 	setup_git_directory();
 
-	sub = submodule_from_path(the_repository, &null_oid, argv[1]);
+	sub = submodule_from_path(the_repository, null_oid(), argv[1]);
 	if (repo_submodule_init(&subrepo, the_repository, sub)) {
-		die_usage(argc, argv, "Submodule not found.");
+		die_usage(argv, "Submodule not found.");
 	}
 
 	/* Read the config of _child_ submodules. */
diff --git a/t/helper/test-svn-fe.c b/t/helper/test-svn-fe.c
deleted file mode 100644
index 7667c0803f..0000000000
--- a/t/helper/test-svn-fe.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * test-svn-fe: Code to exercise the svn import lib
- */
-
-#include "git-compat-util.h"
-#include "vcs-svn/svndump.h"
-#include "vcs-svn/svndiff.h"
-#include "vcs-svn/sliding_window.h"
-#include "vcs-svn/line_buffer.h"
-
-static const char test_svnfe_usage[] =
-	"test-svn-fe (<dumpfile> | [-d] <preimage> <delta> <len>)";
-
-static int apply_delta(int argc, const char **argv)
-{
-	struct line_buffer preimage = LINE_BUFFER_INIT;
-	struct line_buffer delta = LINE_BUFFER_INIT;
-	struct sliding_view preimage_view = SLIDING_VIEW_INIT(&preimage, -1);
-
-	if (argc != 5)
-		usage(test_svnfe_usage);
-
-	if (buffer_init(&preimage, argv[2]))
-		die_errno("cannot open preimage");
-	if (buffer_init(&delta, argv[3]))
-		die_errno("cannot open delta");
-	if (svndiff0_apply(&delta, (off_t) strtoumax(argv[4], NULL, 0),
-					&preimage_view, stdout))
-		return 1;
-	if (buffer_deinit(&preimage))
-		die_errno("cannot close preimage");
-	if (buffer_deinit(&delta))
-		die_errno("cannot close delta");
-	strbuf_release(&preimage_view.buf);
-	return 0;
-}
-
-int cmd_main(int argc, const char **argv)
-{
-	if (argc == 2) {
-		if (svndump_init(argv[1]))
-			return 1;
-		svndump_read(NULL, "refs/heads/master", "refs/notes/svn/revs");
-		svndump_deinit();
-		svndump_reset();
-		return 0;
-	}
-
-	if (argc >= 2 && !strcmp(argv[1], "-d"))
-		return apply_delta(argc, argv);
-	usage(test_svnfe_usage);
-}
diff --git a/t/helper/test-tool.c b/t/helper/test-tool.c
index 19ee26d931..3ce5585e53 100644
--- a/t/helper/test-tool.c
+++ b/t/helper/test-tool.c
@@ -14,8 +14,12 @@ struct test_cmd {
 };
 
 static struct test_cmd cmds[] = {
+	{ "advise", cmd__advise_if_enabled },
+	{ "bitmap", cmd__bitmap },
+	{ "bloom", cmd__bloom },
 	{ "chmtime", cmd__chmtime },
 	{ "config", cmd__config },
+	{ "crontab", cmd__crontab },
 	{ "ctype", cmd__ctype },
 	{ "date", cmd__date },
 	{ "delta", cmd__delta },
@@ -26,8 +30,10 @@ static struct test_cmd cmds[] = {
 	{ "dump-split-index", cmd__dump_split_index },
 	{ "dump-untracked-cache", cmd__dump_untracked_cache },
 	{ "example-decorate", cmd__example_decorate },
+	{ "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 },
@@ -36,15 +42,22 @@ static struct test_cmd cmds[] = {
 	{ "match-trees", cmd__match_trees },
 	{ "mergesort", cmd__mergesort },
 	{ "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 },
+	{ "partial-clone", cmd__partial_clone },
 	{ "path-utils", cmd__path_utils },
+	{ "pcre2-config", cmd__pcre2_config },
 	{ "pkt-line", cmd__pkt_line },
 	{ "prio-queue", cmd__prio_queue },
+	{ "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 },
 	{ "regex", cmd__regex },
@@ -54,15 +67,16 @@ static struct test_cmd cmds[] = {
 	{ "scrap-cache-tree", cmd__scrap_cache_tree },
 	{ "serve-v2", cmd__serve_v2 },
 	{ "sha1", cmd__sha1 },
-	{ "sha1-array", cmd__sha1_array },
 	{ "sha256", cmd__sha256 },
 	{ "sigchain", cmd__sigchain },
+	{ "simple-ipc", cmd__simple_ipc },
 	{ "strcmp-offset", cmd__strcmp_offset },
 	{ "string-list", cmd__string_list },
 	{ "submodule-config", cmd__submodule_config },
 	{ "submodule-nested-repo-config", cmd__submodule_nested_repo_config },
 	{ "subprocess", cmd__subprocess },
 	{ "trace2", cmd__trace2 },
+	{ "userdiff", cmd__userdiff },
 	{ "urlmatch-normalization", cmd__urlmatch_normalization },
 	{ "xml-encode", cmd__xml_encode },
 	{ "wildmatch", cmd__wildmatch },
@@ -109,6 +123,7 @@ int cmd_main(int argc, const char **argv)
 			argc--;
 			trace2_cmd_name(cmds[i].name);
 			trace2_cmd_list_config();
+			trace2_cmd_list_env_vars();
 			return cmds[i].fn(argc, argv);
 		}
 	}
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index c2aa56ef50..9f0f522850 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -4,8 +4,12 @@
 #define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "git-compat-util.h"
 
+int cmd__advise_if_enabled(int argc, const char **argv);
+int cmd__bitmap(int argc, const char **argv);
+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__ctype(int argc, const char **argv);
 int cmd__date(int argc, const char **argv);
 int cmd__delta(int argc, const char **argv);
@@ -16,8 +20,10 @@ 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__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);
@@ -27,14 +33,20 @@ 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);
+int cmd__partial_clone(int argc, const char **argv);
 int cmd__path_utils(int argc, const char **argv);
+int cmd__pcre2_config(int argc, const char **argv);
 int cmd__pkt_line(int argc, const char **argv);
 int cmd__prio_queue(int argc, const char **argv);
+int cmd__proc_receive(int argc, const char **argv);
 int cmd__progress(int argc, const char **argv);
 int cmd__reach(int argc, const char **argv);
 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__regex(int argc, const char **argv);
@@ -44,15 +56,17 @@ int cmd__run_command(int argc, const char **argv);
 int cmd__scrap_cache_tree(int argc, const char **argv);
 int cmd__serve_v2(int argc, const char **argv);
 int cmd__sha1(int argc, const char **argv);
-int cmd__sha1_array(int argc, const char **argv);
+int cmd__oid_array(int argc, const char **argv);
 int cmd__sha256(int argc, const char **argv);
 int cmd__sigchain(int argc, const char **argv);
+int cmd__simple_ipc(int argc, const char **argv);
 int cmd__strcmp_offset(int argc, const char **argv);
 int cmd__string_list(int argc, const char **argv);
 int cmd__submodule_config(int argc, const char **argv);
 int cmd__submodule_nested_repo_config(int argc, const char **argv);
 int cmd__subprocess(int argc, const char **argv);
 int cmd__trace2(int argc, const char **argv);
+int cmd__userdiff(int argc, const char **argv);
 int cmd__urlmatch_normalization(int argc, const char **argv);
 int cmd__xml_encode(int argc, const char **argv);
 int cmd__wildmatch(int argc, const char **argv);
diff --git a/t/helper/test-trace2.c b/t/helper/test-trace2.c
index 197819c872..f93633f895 100644
--- a/t/helper/test-trace2.c
+++ b/t/helper/test-trace2.c
@@ -1,6 +1,6 @@
 #include "test-tool.h"
 #include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "run-command.h"
 #include "exec-cmd.h"
 #include "config.h"
@@ -198,6 +198,14 @@ static int ut_006data(int argc, const char **argv)
 	return 0;
 }
 
+static int ut_007bug(int argc, const char **argv)
+{
+	/*
+	 * Exercise BUG() to ensure that the message is printed to trace2.
+	 */
+	BUG("the bug message");
+}
+
 /*
  * Usage:
  *     test-tool trace2 <ut_name_1> <ut_usage_1>
@@ -214,6 +222,7 @@ static struct unit_test ut_table[] = {
 	{ ut_004child,    "004child",  "[<child_command_line>]" },
 	{ ut_005exec,     "005exec",   "<git_command_args>" },
 	{ ut_006data,     "006data",   "[<category> <key> <value>]+" },
+	{ ut_007bug,      "007bug",    "" },
 };
 /* clang-format on */
 
diff --git a/t/helper/test-userdiff.c b/t/helper/test-userdiff.c
new file mode 100644
index 0000000000..f013f8a31e
--- /dev/null
+++ b/t/helper/test-userdiff.c
@@ -0,0 +1,46 @@
+#include "test-tool.h"
+#include "cache.h"
+#include "userdiff.h"
+#include "config.h"
+
+static int driver_cb(struct userdiff_driver *driver,
+		     enum userdiff_driver_type type, void *priv)
+{
+	enum userdiff_driver_type *want_type = priv;
+	if (type & *want_type && driver->funcname.pattern)
+		puts(driver->name);
+	return 0;
+}
+
+static int cmd__userdiff_config(const char *var, const char *value, void *cb)
+{
+	if (userdiff_config(var, value) < 0)
+		return -1;
+	return 0;
+}
+
+int cmd__userdiff(int argc, const char **argv)
+{
+	enum userdiff_driver_type want = 0;
+	if (argc != 2)
+		return 1;
+
+	if (!strcmp(argv[1], "list-drivers"))
+		want = (USERDIFF_DRIVER_TYPE_BUILTIN |
+			USERDIFF_DRIVER_TYPE_CUSTOM);
+	else if (!strcmp(argv[1], "list-builtin-drivers"))
+		want = USERDIFF_DRIVER_TYPE_BUILTIN;
+	else if (!strcmp(argv[1], "list-custom-drivers"))
+		want = USERDIFF_DRIVER_TYPE_CUSTOM;
+	else
+		return error("unknown argument %s", argv[1]);
+
+	if (want & USERDIFF_DRIVER_TYPE_CUSTOM) {
+		setup_git_directory();
+		git_config(cmd__userdiff_config, NULL);
+	}
+
+	for_each_userdiff_driver(driver_cb, &want);
+
+	return 0;
+}
diff --git a/t/helper/test-windows-named-pipe.c b/t/helper/test-windows-named-pipe.c
index b4b752b01a..ae52183e63 100644
--- a/t/helper/test-windows-named-pipe.c
+++ b/t/helper/test-windows-named-pipe.c
@@ -19,7 +19,7 @@ int cmd__windows_named_pipe(int argc, const char **argv)
 	if (argc < 2)
 		goto print_usage;
 	filename = argv[1];
-	if (strchr(filename, '/') || strchr(filename, '\\'))
+	if (strpbrk(filename, "/\\"))
 		goto print_usage;
 	strbuf_addf(&pathname, "//./pipe/%s", filename);
 
diff --git a/t/lib-bash.sh b/t/lib-bash.sh
index 2be955fafb..b0b6060929 100644
--- a/t/lib-bash.sh
+++ b/t/lib-bash.sh
@@ -2,10 +2,12 @@
 # to run under Bash; primarily intended for tests of the completion
 # script.
 
-if test -n "$BASH" && test -z "$POSIXLY_CORRECT"; then
+if test -n "$BASH" && test -z "$POSIXLY_CORRECT"
+then
 	# we are in full-on bash mode
 	true
-elif type bash >/dev/null 2>&1; then
+elif type bash >/dev/null 2>&1
+then
 	# execute in full-on bash mode
 	unset POSIXLY_CORRECT
 	exec bash "$0" "$@"
diff --git a/t/lib-bitmap.sh b/t/lib-bitmap.sh
new file mode 100644
index 0000000000..fe3f98be24
--- /dev/null
+++ b/t/lib-bitmap.sh
@@ -0,0 +1,26 @@
+# 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:
+#
+#   - regular output is in traversal order, whereas bitmap is split by type,
+#     with non-packed objects at the end
+#
+#   - regular output has a space and the pathname appended to non-commit
+#     objects; bitmap output omits this
+#
+# This function normalizes and compares the two. The second file should
+# always be the bitmap output.
+test_bitmap_traversal () {
+	if test "$1" = "--no-confirm-bitmaps"
+	then
+		shift
+	elif cmp "$1" "$2"
+	then
+		echo >&2 "identical raw outputs; are you sure bitmaps were used?"
+		return 1
+	fi &&
+	cut -d' ' -f1 "$1" | sort >"$1.normalized" &&
+	sort "$2" >"$2.normalized" &&
+	test_cmp "$1.normalized" "$2.normalized" &&
+	rm -f "$1.normalized" "$2.normalized"
+}
diff --git a/t/lib-bundle.sh b/t/lib-bundle.sh
new file mode 100644
index 0000000000..cf7ed818b2
--- /dev/null
+++ b/t/lib-bundle.sh
@@ -0,0 +1,42 @@
+# Library of git-bundle related functions.
+
+# Display the pack data contained in the bundle file, bypassing the
+# header that contains the signature, prerequisites and references.
+convert_bundle_to_pack () {
+	while read x && test -n "$x"
+	do
+		:;
+	done
+	cat
+}
+
+# Check count of objects in a bundle file.
+# We can use "--thin" opiton to check thin pack, which must be fixed by
+# command `git-index-pack --fix-thin --stdin`.
+test_bundle_object_count () {
+	thin=
+	if test "$1" = "--thin"
+	then
+		thin=t
+		shift
+	fi
+	if test $# -ne 2
+	then
+		echo >&2 "args should be: <bundle> <count>"
+		return 1
+	fi
+	bundle=$1
+	pack=$bundle.pack
+	convert_bundle_to_pack <"$bundle" >"$pack" &&
+	if test -n "$thin"
+	then
+		mv "$pack" "$bundle.thin.pack" &&
+		git index-pack --stdin --fix-thin "$pack" <"$bundle.thin.pack"
+	else
+		git index-pack "$pack"
+	fi || return 1
+	count=$(git show-index <"${pack%pack}idx" | wc -l) &&
+	test $2 = $count && return 0
+	echo >&2 "error: object count for $bundle is $count, not $2"
+	return 1
+}
diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index 937b831ea6..5ea8bc9f1d 100755..100644
--- a/t/lib-credential.sh
+++ b/t/lib-credential.sh
@@ -1,4 +1,5 @@
-#!/bin/sh
+# Shell library for testing credential handling including helpers. See t0302
+# for an example of testing a specific helper.
 
 # Try a set of credential helpers; the expected stdin,
 # stdout and stderr should be provided on stdin,
diff --git a/t/lib-cvs.sh b/t/lib-cvs.sh
index 9b2bcfb1b0..32b3473379 100644
--- a/t/lib-cvs.sh
+++ b/t/lib-cvs.sh
@@ -36,7 +36,7 @@ setup_cvs_test_repository () {
 test_cvs_co () {
 	# Usage: test_cvs_co BRANCH_NAME
 	rm -rf module-cvs-"$1"
-	if [ "$1" = "master" ]
+	if [ "$1" = "main" ]
 	then
 		$CVS co -P -d module-cvs-"$1" -A module
 	else
diff --git a/t/diff-lib.sh b/t/lib-diff.sh
index 2de880f7a5..2de880f7a5 100644
--- a/t/diff-lib.sh
+++ b/t/lib-diff.sh
diff --git a/t/diff-lib/COPYING b/t/lib-diff/COPYING
index 6ff87c4664..6ff87c4664 100644
--- a/t/diff-lib/COPYING
+++ b/t/lib-diff/COPYING
diff --git a/t/diff-lib/README b/t/lib-diff/README
index 548142c327..548142c327 100644
--- a/t/diff-lib/README
+++ b/t/lib-diff/README
diff --git a/t/lib-encoding.sh b/t/lib-encoding.sh
new file mode 100644
index 0000000000..2dabc8c73e
--- /dev/null
+++ b/t/lib-encoding.sh
@@ -0,0 +1,25 @@
+# Encoding helpers
+
+test_lazy_prereq NO_UTF16_BOM '
+	test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
+'
+
+test_lazy_prereq NO_UTF32_BOM '
+	test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12
+'
+
+write_utf16 () {
+	if test_have_prereq NO_UTF16_BOM
+	then
+		printf '\376\377'
+	fi &&
+	iconv -f UTF-8 -t UTF-16
+}
+
+write_utf32 () {
+	if test_have_prereq NO_UTF32_BOM
+	then
+		printf '\0\0\376\377'
+	fi &&
+	iconv -f UTF-8 -t UTF-32
+}
diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh
index 2139b427ca..cc6bb2cdea 100644
--- a/t/lib-gettext.sh
+++ b/t/lib-gettext.sh
@@ -17,7 +17,7 @@ else
 	. "$GIT_BUILD_DIR"/git-sh-i18n
 fi
 
-if test_have_prereq GETTEXT && test_have_prereq C_LOCALE_OUTPUT
+if test_have_prereq GETTEXT
 then
 	# is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian
 	is_IS_locale=$(locale -a 2>/dev/null |
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
index fb8f887080..e62569222b 100644
--- a/t/lib-git-daemon.sh
+++ b/t/lib-git-daemon.sh
@@ -15,7 +15,7 @@
 #
 #	test_done
 
-if ! git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON
+if ! test_bool_env GIT_TEST_GIT_DAEMON true
 then
 	skip_all="git-daemon testing disabled (unset GIT_TEST_GIT_DAEMON to enable)"
 	test_done
diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index 547b9f88e1..5aff2abe8b 100644
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -175,7 +175,7 @@ stop_and_cleanup_p4d () {
 
 cleanup_git () {
 	retry_until_success rm -r "$git"
-	test_must_fail test -d "$git" &&
+	test_path_is_missing "$git" &&
 	retry_until_success mkdir "$git"
 }
 
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index bc0b9c71f8..2fde2353fd 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -69,7 +69,7 @@ svn_cmd () {
 maybe_start_httpd () {
 	loc=${1-svn}
 
-	if git env--helper --type=bool --default=false --exit-code GIT_TEST_SVN_HTTPD
+	if test_bool_env GIT_TEST_SVN_HTTPD false
 	then
 		. "$TEST_DIRECTORY"/lib-httpd.sh
 		LIB_HTTPD_SVN="$loc"
@@ -78,21 +78,24 @@ maybe_start_httpd () {
 }
 
 convert_to_rev_db () {
-	perl -w -- - "$@" <<\EOF
+	perl -w -- - "$(test_oid rawsz)" "$@" <<\EOF
 use strict;
+my $oidlen = shift;
 @ARGV == 2 or die "usage: convert_to_rev_db <input> <output>";
+my $record_size = $oidlen + 4;
+my $hexlen = $oidlen * 2;
 open my $wr, '+>', $ARGV[1] or die "$!: couldn't open: $ARGV[1]";
 open my $rd, '<', $ARGV[0] or die "$!: couldn't open: $ARGV[0]";
 my $size = (stat($rd))[7];
-($size % 24) == 0 or die "Inconsistent size: $size";
-while (sysread($rd, my $buf, 24) == 24) {
-	my ($r, $c) = unpack('NH40', $buf);
-	my $offset = $r * 41;
+($size % $record_size) == 0 or die "Inconsistent size: $size";
+while (sysread($rd, my $buf, $record_size) == $record_size) {
+	my ($r, $c) = unpack("NH$hexlen", $buf);
+	my $offset = $r * ($hexlen + 1);
 	seek $wr, 0, 2 or die $!;
 	my $pos = tell $wr;
 	if ($pos < $offset) {
-		for (1 .. (($offset - $pos) / 41)) {
-			print $wr (('0' x 40),"\n") or die $!;
+		for (1 .. (($offset - $pos) / ($hexlen + 1))) {
+			print $wr (('0' x $hexlen),"\n") or die $!;
 		}
 	}
 	seek $wr, $offset, 0 or die $!;
@@ -104,7 +107,7 @@ EOF
 }
 
 require_svnserve () {
-	if ! git env--helper --type=bool --default=false --exit-code GIT_TEST_SVNSERVE
+	if ! test_bool_env GIT_TEST_SVNSERVE false
 	then
 		skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)'
 		test_done
@@ -118,12 +121,22 @@ start_svnserve () {
 		 --listen-host 127.0.0.1 &
 }
 
-prepare_a_utf8_locale () {
-	a_utf8_locale=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{
-	p
-	q
-}')
-	if test -n "$a_utf8_locale"
+prepare_utf8_locale () {
+	if test -z "$GIT_TEST_UTF8_LOCALE"
+	then
+		case "${LC_ALL:-$LANG}" in
+		*.[Uu][Tt][Ff]8 | *.[Uu][Tt][Ff]-8)
+			GIT_TEST_UTF8_LOCALE="${LC_ALL:-$LANG}"
+			;;
+		*)
+			GIT_TEST_UTF8_LOCALE=$(locale -a | sed -n '/\.[uU][tT][fF]-*8$/{
+				p
+				q
+			}')
+			;;
+		esac
+	fi
+	if test -n "$GIT_TEST_UTF8_LOCALE"
 	then
 		test_set_prereq UTF8
 	else
diff --git a/t/gitweb-lib.sh b/t/lib-gitweb.sh
index 006d2a8152..1f32ca66ea 100644
--- a/t/gitweb-lib.sh
+++ b/t/lib-gitweb.sh
@@ -58,10 +58,11 @@ gitweb_run () {
 	GATEWAY_INTERFACE='CGI/1.1'
 	HTTP_ACCEPT='*/*'
 	REQUEST_METHOD='GET'
-	QUERY_STRING=""$1""
-	PATH_INFO=""$2""
+	QUERY_STRING=$1
+	PATH_INFO=$2
+	REQUEST_URI=/gitweb.cgi$PATH_INFO
 	export GATEWAY_INTERFACE HTTP_ACCEPT REQUEST_METHOD \
-		QUERY_STRING PATH_INFO
+		QUERY_STRING PATH_INFO REQUEST_URI
 
 	GITWEB_CONFIG=$(pwd)/gitweb_config.perl
 	export GITWEB_CONFIG
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 8d28652b72..9fc5241228 100755..100644
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -1,14 +1,25 @@
-#!/bin/sh
+# We always set GNUPGHOME, even if no usable GPG was found, as
+#
+# - It does not hurt, and
+#
+# - we cannot set global environment variables in lazy prereqs because they are
+#   executed in an eval'ed subshell that changes the working directory to a
+#   temporary one.
+
+GNUPGHOME="$PWD/gpghome"
+export GNUPGHOME
+
+test_lazy_prereq GPG '
+	gpg_version=$(gpg --version 2>&1)
+	test $? != 127 || exit 1
 
-gpg_version=$(gpg --version 2>&1)
-if test $? != 127
-then
 	# As said here: http://www.gnupg.org/documentation/faqs.html#q6.19
-	# the gpg version 1.0.6 didn't parse trust packets correctly, so for
+	# the gpg version 1.0.6 did not parse trust packets correctly, so for
 	# that version, creation of signed tags using the generated key fails.
 	case "$gpg_version" in
-	'gpg (GnuPG) 1.0.6'*)
+	"gpg (GnuPG) 1.0.6"*)
 		say "Your version of gpg (1.0.6) is too buggy for testing"
+		exit 1
 		;;
 	*)
 		# Available key info:
@@ -27,55 +38,54 @@ then
 		# To export ownertrust:
 		#	gpg --homedir /tmp/gpghome --export-ownertrust \
 		#		> lib-gpg/ownertrust
-		mkdir ./gpghome &&
-		chmod 0700 ./gpghome &&
-		GNUPGHOME="$(pwd)/gpghome" &&
-		export GNUPGHOME &&
-		(gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
-		gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \
+		mkdir "$GNUPGHOME" &&
+		chmod 0700 "$GNUPGHOME" &&
+		(gpgconf --kill gpg-agent || : ) &&
+		gpg --homedir "${GNUPGHOME}" --import \
 			"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
-		gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \
+		gpg --homedir "${GNUPGHOME}" --import-ownertrust \
 			"$TEST_DIRECTORY"/lib-gpg/ownertrust &&
-		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null 2>&1 \
-			--sign -u committer@example.com &&
-		test_set_prereq GPG &&
-		# Available key info:
-		# * see t/lib-gpg/gpgsm-gen-key.in
-		# To generate new certificate:
-		#  * no passphrase
-		#	gpgsm --homedir /tmp/gpghome/ \
-		#		-o /tmp/gpgsm.crt.user \
-		#		--generate-key \
-		#		--batch t/lib-gpg/gpgsm-gen-key.in
-		# To import certificate:
-		#	gpgsm --homedir /tmp/gpghome/ \
-		#		--import /tmp/gpgsm.crt.user
-		# To export into a .p12 we can later import:
-		#	gpgsm --homedir /tmp/gpghome/ \
-		#		-o t/lib-gpg/gpgsm_cert.p12 \
-		#		--export-secret-key-p12 "committer@example.com"
-		echo | gpgsm --homedir "${GNUPGHOME}" 2>/dev/null \
-			--passphrase-fd 0 --pinentry-mode loopback \
-			--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
-
-		gpgsm --homedir "${GNUPGHOME}" 2>/dev/null -K |
-		grep fingerprint: |
-		cut -d" " -f4 |
-		tr -d '\n' >"${GNUPGHOME}/trustlist.txt" &&
-
-		echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
-		echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
-			-u committer@example.com -o /dev/null --sign - 2>&1 &&
-		test_set_prereq GPGSM
+		gpg --homedir "${GNUPGHOME}" </dev/null >/dev/null \
+			--sign -u committer@example.com
 		;;
 	esac
-fi
+'
+
+test_lazy_prereq GPGSM '
+	test_have_prereq GPG &&
+	# Available key info:
+	# * see t/lib-gpg/gpgsm-gen-key.in
+	# To generate new certificate:
+	#  * no passphrase
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		-o /tmp/gpgsm.crt.user \
+	#		--generate-key \
+	#		--batch t/lib-gpg/gpgsm-gen-key.in
+	# To import certificate:
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		--import /tmp/gpgsm.crt.user
+	# To export into a .p12 we can later import:
+	#	gpgsm --homedir /tmp/gpghome/ \
+	#		-o t/lib-gpg/gpgsm_cert.p12 \
+	#		--export-secret-key-p12 "committer@example.com"
+	echo | gpgsm --homedir "${GNUPGHOME}" \
+		--passphrase-fd 0 --pinentry-mode loopback \
+		--import "$TEST_DIRECTORY"/lib-gpg/gpgsm_cert.p12 &&
+
+	gpgsm --homedir "${GNUPGHOME}" -K |
+	grep fingerprint: |
+	cut -d" " -f4 |
+	tr -d "\\n" >"${GNUPGHOME}/trustlist.txt" &&
+
+	echo " S relax" >>"${GNUPGHOME}/trustlist.txt" &&
+	echo hello | gpgsm --homedir "${GNUPGHOME}" >/dev/null \
+	       -u committer@example.com -o /dev/null --sign -
+'
 
-if test_have_prereq GPG &&
-    echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>&1
-then
-	test_set_prereq RFC1991
-fi
+test_lazy_prereq RFC1991 '
+	test_have_prereq GPG &&
+	echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null
+'
 
 sanitize_pgp() {
 	perl -ne '
diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
index 0d985758c6..d2edfa4c50 100644
--- a/t/lib-httpd.sh
+++ b/t/lib-httpd.sh
@@ -41,7 +41,7 @@ then
 	test_done
 fi
 
-if ! git env--helper --type=bool --default=true --exit-code GIT_TEST_HTTPD
+if ! test_bool_env GIT_TEST_HTTPD true
 then
 	skip_all="Network testing disabled (unset GIT_TEST_HTTPD to enable)"
 	test_done
@@ -129,10 +129,12 @@ install_script () {
 prepare_httpd() {
 	mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH"
 	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 broken-smart-http.sh
 	install_script error-smart-http.sh
 	install_script error.sh
-	install_script apply-one-time-sed.sh
+	install_script apply-one-time-perl.sh
 
 	ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules"
 
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 5c1c86c193..afa91e38b0 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -113,19 +113,27 @@ Alias /auth/dumb/ www/auth/dumb/
 	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
 	SetEnv GIT_HTTP_EXPORT_ALL
 </LocationMatch>
-<LocationMatch /one_time_sed/>
+<LocationMatch /one_time_perl/>
 	SetEnv GIT_EXEC_PATH ${GIT_EXEC_PATH}
 	SetEnv GIT_HTTP_EXPORT_ALL
 </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/
 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/
 ScriptAlias /error_smart/ error-smart-http.sh/
 ScriptAlias /error/ error.sh/
-ScriptAliasMatch /one_time_sed/(.*) apply-one-time-sed.sh/$1
+ScriptAliasMatch /one_time_perl/(.*) apply-one-time-perl.sh/$1
 <Directory ${GIT_EXEC_PATH}>
 	Options FollowSymlinks
 </Directory>
+<Files incomplete-length-upload-pack-v2-http.sh>
+	Options ExecCGI
+</Files>
+<Files incomplete-body-upload-pack-v2-http.sh>
+	Options ExecCGI
+</Files>
 <Files broken-smart-http.sh>
 	Options ExecCGI
 </Files>
@@ -135,7 +143,7 @@ ScriptAliasMatch /one_time_sed/(.*) apply-one-time-sed.sh/$1
 <Files error.sh>
   Options ExecCGI
 </Files>
-<Files apply-one-time-sed.sh>
+<Files apply-one-time-perl.sh>
 	Options ExecCGI
 </Files>
 <Files ${GIT_EXEC_PATH}/git-http-backend>
diff --git a/t/lib-httpd/apply-one-time-perl.sh b/t/lib-httpd/apply-one-time-perl.sh
new file mode 100644
index 0000000000..09a0abdff7
--- /dev/null
+++ b/t/lib-httpd/apply-one-time-perl.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+# If "one-time-perl" exists in $HTTPD_ROOT_PATH, run perl on the HTTP response,
+# using the contents of "one-time-perl" as the perl command to be run. If the
+# response was modified as a result, delete "one-time-perl" so that subsequent
+# HTTP responses are no longer modified.
+#
+# This can be used to simulate the effects of the repository changing in
+# between HTTP request-response pairs.
+if test -f one-time-perl
+then
+	LC_ALL=C
+	export LC_ALL
+
+	"$GIT_EXEC_PATH/git-http-backend" >out
+	perl -pe "$(cat one-time-perl)" out >out_modified
+
+	if cmp -s out out_modified
+	then
+		cat out
+	else
+		cat out_modified
+		rm one-time-perl
+	fi
+else
+	"$GIT_EXEC_PATH/git-http-backend"
+fi
diff --git a/t/lib-httpd/apply-one-time-sed.sh b/t/lib-httpd/apply-one-time-sed.sh
deleted file mode 100644
index fcef728925..0000000000
--- a/t/lib-httpd/apply-one-time-sed.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# If "one-time-sed" exists in $HTTPD_ROOT_PATH, run sed on the HTTP response,
-# using the contents of "one-time-sed" as the sed command to be run. If the
-# response was modified as a result, delete "one-time-sed" so that subsequent
-# HTTP responses are no longer modified.
-#
-# This can be used to simulate the effects of the repository changing in
-# between HTTP request-response pairs.
-if [ -e one-time-sed ]; then
-	"$GIT_EXEC_PATH/git-http-backend" >out
-	sed "$(cat one-time-sed)" <out >out_modified
-
-	if diff out out_modified >/dev/null; then
-		cat out
-	else
-		cat out_modified
-		rm one-time-sed
-	fi
-else
-	"$GIT_EXEC_PATH/git-http-backend"
-fi
diff --git a/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh b/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh
new file mode 100644
index 0000000000..90e73ef8d5
--- /dev/null
+++ b/t/lib-httpd/incomplete-body-upload-pack-v2-http.sh
@@ -0,0 +1,3 @@
+printf "Content-Type: text/%s\n" "application/x-git-upload-pack-result"
+echo
+printf "%s%s" "0079" "45"
diff --git a/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh b/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh
new file mode 100644
index 0000000000..dce552e348
--- /dev/null
+++ b/t/lib-httpd/incomplete-length-upload-pack-v2-http.sh
@@ -0,0 +1,3 @@
+printf "Content-Type: text/%s\n" "application/x-git-upload-pack-result"
+echo
+printf "%s" "00"
diff --git a/t/lib-log-graph.sh b/t/lib-log-graph.sh
new file mode 100644
index 0000000000..bf952ef920
--- /dev/null
+++ b/t/lib-log-graph.sh
@@ -0,0 +1,28 @@
+# Helps shared by the test scripts for comparing log graphs.
+
+sanitize_log_output () {
+	sed -e 's/ *$//' \
+	    -e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \
+	    -e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \
+	    -e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \
+	    -e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \
+	    -e 's/index [0-9a-f]*\.\.[0-9a-f]*/index BEFORE..AFTER/'
+}
+
+lib_test_cmp_graph () {
+	git log --graph "$@" >output &&
+	sed 's/ *$//' >output.sanitized <output &&
+	test_cmp expect output.sanitized
+}
+
+lib_test_cmp_short_graph () {
+	git log --graph --pretty=short "$@" >output &&
+	sanitize_log_output >output.sanitized <output &&
+	test_cmp expect output.sanitized
+}
+
+lib_test_cmp_colored_graph () {
+	git log --graph --color=always "$@" >output.colors.raw &&
+	test_decode_color <output.colors.raw | sed "s/ *\$//" >output.colors &&
+	test_cmp expect.colors output.colors
+}
diff --git a/t/lib-merge.sh b/t/lib-merge.sh
new file mode 100644
index 0000000000..8734ebfc17
--- /dev/null
+++ b/t/lib-merge.sh
@@ -0,0 +1,13 @@
+# Helper functions used by merge tests.
+
+test_expect_merge_algorithm () {
+	status_for_recursive=$1 status_for_ort=$2
+	shift 2
+
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_expect_${status_for_ort} "$@"
+	else
+		test_expect_${status_for_recursive} "$@"
+	fi
+}
diff --git a/t/lib-pack.sh b/t/lib-pack.sh
index c4d907a450..bb8938ccbe 100644
--- a/t/lib-pack.sh
+++ b/t/lib-pack.sh
@@ -37,7 +37,7 @@ pack_header () {
 pack_obj () {
 	case "$1" in
 	# empty blob
-	e69de29bb2d1d6434b8b29ae775ad8c2e48c5391)
+	$EMPTY_BLOB)
 		case "$2" in
 		'')
 			printf '\060\170\234\003\0\0\0\0\1'
@@ -47,7 +47,7 @@ pack_obj () {
 		;;
 
 	# blob containing "\7\76"
-	e68fe8129b546b101aee9510c5328e7f21ca1d18)
+	$(test_oid packlib_7_76))
 		case "$2" in
 		'')
 			printf '\062\170\234\143\267\3\0\0\116\0\106'
@@ -59,11 +59,18 @@ pack_obj () {
 			printf '\234\143\142\142\142\267\003\0\0\151\0\114'
 			return
 			;;
+		37c8e2c15bb22b912e59b43fd51a4f7e9465ed0b5084c5a1411d991cbe630683)
+			printf '\165\67\310\342\301\133\262\53\221\56\131' &&
+			printf '\264\77\325\32\117\176\224\145\355\13\120' &&
+			printf '\204\305\241\101\35\231\34\276\143\6\203\170' &&
+			printf '\234\143\142\142\142\267\003\0\0\151\0\114'
+			return
+			;;
 		esac
 		;;
 
 	# blob containing "\7\0"
-	01d7713666f4de822776c7622c10f1b07de280dc)
+	$(test_oid packlib_7_0))
 		case "$2" in
 		'')
 			printf '\062\170\234\143\147\0\0\0\20\0\10'
@@ -75,8 +82,23 @@ pack_obj () {
 			printf '\143\142\142\142\147\0\0\0\53\0\16'
 			return
 			;;
+		5d8e6fc40f2dab00e6983a48523fe57e621f46434cb58dbd4422fba03380d886)
+			printf '\165\135\216\157\304\17\55\253\0\346\230\72' &&
+			printf '\110\122\77\345\176\142\37\106\103\114\265' &&
+			printf '\215\275\104\42\373\240\63\200\330\206\170\234' &&
+			printf '\143\142\142\142\147\0\0\0\53\0\16'
+			return
+			;;
 		esac
 		;;
+	# blob containing "\3\326"
+	471819e8c52bf11513f100b2810a8aa0622d5cd3d1c913758a071dd4b3bad8fe)
+		case "$2" in
+		'')
+			printf '\062\170\234\143\276\006\000\000\336\000\332'
+			return
+			;;
+		esac
 	esac
 
 	# If it's not a delta, we can convince pack-objects to generate a pack
@@ -86,7 +108,7 @@ pack_obj () {
 	then
 		echo "$1" | git pack-objects --stdout >pack_obj.tmp &&
 		size=$(wc -c <pack_obj.tmp) &&
-		dd if=pack_obj.tmp bs=1 count=$((size - 20 - 12)) skip=12 &&
+		dd if=pack_obj.tmp bs=1 count=$((size - $(test_oid rawsz) - 12)) skip=12 &&
 		rm -f pack_obj.tmp
 		return
 	fi
@@ -97,7 +119,7 @@ pack_obj () {
 
 # Compute and append pack trailer to "$1"
 pack_trailer () {
-	test-tool sha1 -b <"$1" >trailer.tmp &&
+	test-tool $(test_oid algo) -b <"$1" >trailer.tmp &&
 	cat trailer.tmp >>"$1" &&
 	rm -f trailer.tmp
 }
@@ -108,3 +130,11 @@ pack_trailer () {
 clear_packs () {
 	rm -f .git/objects/pack/*
 }
+
+test_oid_cache <<-EOF
+packlib_7_0 sha1:01d7713666f4de822776c7622c10f1b07de280dc
+packlib_7_0 sha256:37c8e2c15bb22b912e59b43fd51a4f7e9465ed0b5084c5a1411d991cbe630683
+
+packlib_7_76 sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18
+packlib_7_76 sha256:5d8e6fc40f2dab00e6983a48523fe57e621f46434cb58dbd4422fba03380d886
+EOF
diff --git a/t/lib-parallel-checkout.sh b/t/lib-parallel-checkout.sh
new file mode 100644
index 0000000000..83b279a846
--- /dev/null
+++ b/t/lib-parallel-checkout.sh
@@ -0,0 +1,45 @@
+# Helpers for tests invoking parallel-checkout
+
+# Parallel checkout tests need full control of the number of workers
+unset GIT_TEST_CHECKOUT_WORKERS
+
+set_checkout_config () {
+	if test $# -ne 2
+	then
+		BUG "usage: set_checkout_config <workers> <threshold>"
+	fi &&
+
+	test_config_global checkout.workers $1 &&
+	test_config_global checkout.thresholdForParallelism $2
+}
+
+# Run "${@:2}" and check that $1 checkout workers were used
+test_checkout_workers () {
+	if test $# -lt 2
+	then
+		BUG "too few arguments to test_checkout_workers"
+	fi &&
+
+	local expected_workers=$1 &&
+	shift &&
+
+	local trace_file=trace-test-checkout-workers &&
+	rm -f "$trace_file" &&
+	GIT_TRACE2="$(pwd)/$trace_file" "$@" 2>&8 &&
+
+	local workers="$(grep "child_start\[..*\] git checkout--worker" "$trace_file" | wc -l)" &&
+	test $workers -eq $expected_workers &&
+	rm "$trace_file"
+} 8>&2 2>&4
+
+# Verify that both the working tree and the index were created correctly
+verify_checkout () {
+	if test $# -ne 1
+	then
+		BUG "usage: verify_checkout <repository path>"
+	fi &&
+
+	git -C "$1" diff-index --ignore-submodules=none --exit-code HEAD -- &&
+	git -C "$1" status --porcelain >"$1".status &&
+	test_must_be_empty "$1".status
+}
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 6d87961e41..ec6b9b107d 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -4,6 +4,7 @@
 #
 # - override the commit message with $FAKE_COMMIT_MESSAGE
 # - amend the commit message with $FAKE_COMMIT_AMEND
+# - copy the original commit message to a file with $FAKE_MESSAGE_COPY
 # - check that non-commit messages have a certain line count with $EXPECT_COUNT
 # - check the commit count in the commit message header with $EXPECT_HEADER_COUNT
 # - rewrite a rebase -i script as directed by $FAKE_LINES.
@@ -14,10 +15,11 @@
 #       specified line.
 #
 #   "<cmd> <lineno>" -- add a line with the specified command
-#       ("pick", "squash", "fixup", "edit", "reword" or "drop") and the
-#       SHA1 taken from the specified line.
+#       ("pick", "squash", "fixup"|"fixup_-C"|"fixup_-c", "edit", "reword" or "drop")
+#       and the SHA1 taken from the specified line.
 #
-#   "exec_cmd_with_args" -- add an "exec cmd with args" line.
+#   "_" -- add a space, like "fixup_-C" implies "fixup -C" and
+#       "exec_cmd_with_args" add an "exec cmd with args" line.
 #
 #   "#" -- Add a comment line.
 #
@@ -29,10 +31,10 @@ set_fake_editor () {
 	*/COMMIT_EDITMSG)
 		test -z "$EXPECT_HEADER_COUNT" ||
 			test "$EXPECT_HEADER_COUNT" = "$(sed -n '1s/^# This is a combination of \(.*\) commits\./\1/p' < "$1")" ||
-			test "# # GETTEXT POISON #" = "$(sed -n '1p' < "$1")" ||
 			exit
 		test -z "$FAKE_COMMIT_MESSAGE" || echo "$FAKE_COMMIT_MESSAGE" > "$1"
 		test -z "$FAKE_COMMIT_AMEND" || echo "$FAKE_COMMIT_AMEND" >> "$1"
+		test -z "$FAKE_MESSAGE_COPY" || cat "$1" >"$FAKE_MESSAGE_COPY"
 		exit
 		;;
 	esac
@@ -51,6 +53,8 @@ set_fake_editor () {
 			action="$line";;
 		exec_*|x_*|break|b)
 			echo "$line" | sed 's/_/ /g' >> "$1";;
+		merge_*|fixup_*)
+			action=$(echo "$line" | sed 's/_/ /g');;
 		"#")
 			echo '# comment' >> "$1";;
 		">")
@@ -119,3 +123,87 @@ make_empty () {
 	git commit --allow-empty -m "$1" &&
 	git tag "$1"
 }
+
+# Call this (inside test_expect_success) at the end of a test file to
+# check that no tests have changed editor related environment
+# variables or config settings
+test_editor_unchanged () {
+	# We're only interested in exported variables hence 'sh -c'
+	sh -c 'cat >actual <<-EOF
+	EDITOR=$EDITOR
+	FAKE_COMMIT_AMEND=$FAKE_COMMIT_AMEND
+	FAKE_COMMIT_MESSAGE=$FAKE_COMMIT_MESSAGE
+	FAKE_LINES=$FAKE_LINES
+	GIT_EDITOR=$GIT_EDITOR
+	GIT_SEQUENCE_EDITOR=$GIT_SEQUENCE_EDITOR
+	core.editor=$(git config core.editor)
+	sequence.editor=$(git config sequence.editor)
+	EOF'
+	cat >expect <<-\EOF
+	EDITOR=:
+	FAKE_COMMIT_AMEND=
+	FAKE_COMMIT_MESSAGE=
+	FAKE_LINES=
+	GIT_EDITOR=
+	GIT_SEQUENCE_EDITOR=
+	core.editor=
+	sequence.editor=
+	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-submodule-update.sh b/t/lib-submodule-update.sh
index 1dd17fc03e..f7c7df0ca4 100755..100644
--- a/t/lib-submodule-update.sh
+++ b/t/lib-submodule-update.sh
@@ -63,6 +63,7 @@ create_lib_submodule_repo () {
 	git init submodule_update_repo &&
 	(
 		cd submodule_update_repo &&
+		branch=$(git symbolic-ref --short HEAD) &&
 		echo "expect" >>.gitignore &&
 		echo "actual" >>.gitignore &&
 		echo "x" >file1 &&
@@ -144,7 +145,7 @@ create_lib_submodule_repo () {
 		git checkout -b valid_sub1 &&
 		git revert HEAD &&
 
-		git checkout master
+		git checkout "$branch"
 	)
 }
 
@@ -183,7 +184,7 @@ test_git_directory_is_unchanged () {
 	)
 }
 
-test_git_directory_exists() {
+test_git_directory_exists () {
 	test -e ".git/modules/$1" &&
 	if test -f sub1/.git
 	then
@@ -196,7 +197,6 @@ test_git_directory_exists() {
 # the submodule repo if it doesn't exist and configures the most problematic
 # settings for diff.ignoreSubmodules.
 prolog () {
-	test_oid_init &&
 	(test -d submodule_update_repo || create_lib_submodule_repo) &&
 	test_config_global diff.ignoreSubmodules all &&
 	test_config diff.ignoreSubmodules all
@@ -297,30 +297,27 @@ test_submodule_content () {
 # - Directory containing tracked files replaced by submodule
 # - Submodule replaced by tracked files in directory
 # - Submodule replaced by tracked file with the same name
-# - tracked file replaced by submodule
+# - Tracked file replaced by submodule
 #
 # The default is that submodule contents aren't changed until "git submodule
 # update" is run. And even then that command doesn't delete the work tree of
 # a removed submodule.
 #
+# The first argument of the callback function will be the name of the submodule.
+#
 # Removing a submodule containing a .git directory must fail even when forced
-# to protect the history!
+# to protect the history! If we are testing this case, the second argument of
+# the callback function will be 'test_must_fail', else it will be the empty
+# string.
 #
 
-# Internal function; use test_submodule_switch() or
-# test_submodule_forced_switch() instead.
-test_submodule_switch_common() {
+# Internal function; use test_submodule_switch_func(), test_submodule_switch(),
+# or test_submodule_forced_switch() instead.
+test_submodule_switch_common () {
 	command="$1"
 	######################### Appearing submodule #########################
 	# Switching to a commit letting a submodule appear creates empty dir ...
-	if test "$KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES" = 1
-	then
-		# Restoring stash fails to restore submodule index entry
-		RESULT="failure"
-	else
-		RESULT="success"
-	fi
-	test_expect_$RESULT "$command: added submodule creates empty directory" '
+	test_expect_success "$command: added submodule creates empty directory" '
 		prolog &&
 		reset_work_tree_to no_submodule &&
 		(
@@ -334,6 +331,13 @@ test_submodule_switch_common() {
 		)
 	'
 	# ... and doesn't care if it already exists.
+	if test "$KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES" = 1
+	then
+		# Restoring stash fails to restore submodule index entry
+		RESULT="failure"
+	else
+		RESULT="success"
+	fi
 	test_expect_$RESULT "$command: added submodule leaves existing empty directory alone" '
 		prolog &&
 		reset_work_tree_to no_submodule &&
@@ -443,7 +447,7 @@ test_submodule_switch_common() {
 		(
 			cd submodule_update &&
 			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
-			test_must_fail $command replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
 			test_superproject_content origin/add_sub1 &&
 			test_submodule_content sub1 origin/add_sub1
 		)
@@ -456,7 +460,7 @@ test_submodule_switch_common() {
 			cd submodule_update &&
 			git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
 			replace_gitfile_with_git_dir sub1 &&
-			test_must_fail $command replace_sub1_with_directory &&
+			$command replace_sub1_with_directory test_must_fail &&
 			test_superproject_content origin/add_sub1 &&
 			test_git_directory_is_unchanged sub1 &&
 			test_submodule_content sub1 origin/add_sub1
@@ -470,7 +474,7 @@ test_submodule_switch_common() {
 		(
 			cd submodule_update &&
 			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
-			test_must_fail $command replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
 			test_superproject_content origin/add_sub1 &&
 			test_submodule_content sub1 origin/add_sub1
 		)
@@ -484,7 +488,7 @@ test_submodule_switch_common() {
 			cd submodule_update &&
 			git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
 			replace_gitfile_with_git_dir sub1 &&
-			test_must_fail $command replace_sub1_with_file &&
+			$command replace_sub1_with_file test_must_fail &&
 			test_superproject_content origin/add_sub1 &&
 			test_git_directory_is_unchanged sub1 &&
 			test_submodule_content sub1 origin/add_sub1
@@ -559,15 +563,28 @@ test_submodule_switch_common() {
 # conditions, set the appropriate KNOWN_FAILURE_* variable used in the tests
 # below to 1.
 #
-# Use as follows:
+# The first argument of the callback function will be the name of the submodule.
+#
+# Removing a submodule containing a .git directory must fail even when forced
+# to protect the history! If we are testing this case, the second argument of
+# the callback function will be 'test_must_fail', else it will be the empty
+# string.
+#
+# The following example uses `git some-command` as an example command to be
+# tested. It updates the worktree and index to match a target, but not any
+# submodule directories.
 #
 # my_func () {
-#   target=$1
-#   # Do something here that updates the worktree and index to match target,
-#   # but not any submodule directories.
+#   ...prepare for `git some-command` to be run...
+#   $2 git some-command "$1" &&
+#   if test -n "$2"
+#   then
+#     return
+#   fi &&
+#   ...check the state after git some-command is run...
 # }
-# test_submodule_switch "my_func"
-test_submodule_switch () {
+# test_submodule_switch_func "my_func"
+test_submodule_switch_func () {
 	command="$1"
 	test_submodule_switch_common "$command"
 
@@ -580,17 +597,33 @@ test_submodule_switch () {
 			cd submodule_update &&
 			git branch -t add_sub1 origin/add_sub1 &&
 			>sub1 &&
-			test_must_fail $command add_sub1 &&
+			$command add_sub1 test_must_fail &&
 			test_superproject_content origin/no_submodule &&
 			test_must_be_empty sub1
 		)
 	'
 }
 
+# Ensures that the that the arg either contains "test_must_fail" or is empty.
+may_only_be_test_must_fail () {
+	test -z "$1" || test "$1" = test_must_fail || die
+}
+
+git_test_func () {
+	may_only_be_test_must_fail "$2" &&
+	$2 git $gitcmd "$1"
+}
+
+test_submodule_switch () {
+	gitcmd="$1"
+	test_submodule_switch_func "git_test_func"
+}
+
 # Same as test_submodule_switch(), except that throwing away local changes in
 # the superproject is allowed.
 test_submodule_forced_switch () {
-	command="$1"
+	gitcmd="$1"
+	command="git_test_func"
 	KNOWN_FAILURE_FORCED_SWITCH_TESTS=1
 	test_submodule_switch_common "$command"
 
@@ -621,16 +654,18 @@ test_submodule_forced_switch () {
 # - Directory containing tracked files replaced by submodule
 # - Submodule replaced by tracked files in directory
 # - Submodule replaced by tracked file with the same name
-# - tracked file replaced by submodule
+# - Tracked file replaced by submodule
 #
 # New test cases
 # - Removing a submodule with a git directory absorbs the submodules
 #   git directory first into the superproject.
+# - Switching from no submodule to nested submodules
+# - Switching from nested submodules to no submodule
 
 # Internal function; use test_submodule_switch_recursing_with_args() or
 # test_submodule_forced_switch_recursing_with_args() instead.
-test_submodule_recursing_with_args_common() {
-	command="$1"
+test_submodule_recursing_with_args_common () {
+	command="$1 --recurse-submodules"
 
 	######################### Appearing submodule #########################
 	# Switching to a commit letting a submodule appear checks it out ...
@@ -658,22 +693,6 @@ test_submodule_recursing_with_args_common() {
 			test_submodule_content sub1 origin/add_sub1
 		)
 	'
-	test_expect_success "$command: submodule branch is not changed, detach HEAD instead" '
-		prolog &&
-		reset_work_tree_to_interested add_sub1 &&
-		(
-			cd submodule_update &&
-			git -C sub1 checkout -b keep_branch &&
-			git -C sub1 rev-parse HEAD >expect &&
-			git branch -t modify_sub1 origin/modify_sub1 &&
-			$command modify_sub1 &&
-			test_superproject_content origin/modify_sub1 &&
-			test_submodule_content sub1 origin/modify_sub1 &&
-			git -C sub1 rev-parse keep_branch >actual &&
-			test_cmp expect actual &&
-			test_must_fail git -C sub1 symbolic-ref HEAD
-		)
-	'
 
 	# Replacing a tracked file with a submodule produces a checked out submodule
 	test_expect_success "$command: replace tracked file with submodule checks out submodule" '
@@ -699,6 +718,19 @@ test_submodule_recursing_with_args_common() {
 			test_submodule_content sub1 origin/replace_directory_with_sub1
 		)
 	'
+	# Switching to a commit with nested submodules recursively checks them out
+	test_expect_success "$command: nested submodules are checked out" '
+		prolog &&
+		reset_work_tree_to_interested no_submodule &&
+		(
+			cd submodule_update &&
+			git branch -t modify_sub1_recursively origin/modify_sub1_recursively &&
+			$command modify_sub1_recursively &&
+			test_superproject_content origin/modify_sub1_recursively &&
+			test_submodule_content sub1 origin/modify_sub1_recursively &&
+			test_submodule_content -C sub1 sub2 origin/modify_sub1_recursively
+		)
+	'
 
 	######################## Disappearing submodule #######################
 	# Removing a submodule removes its work tree ...
@@ -762,6 +794,21 @@ test_submodule_recursing_with_args_common() {
 		)
 	'
 
+	# Switching to a commit without nested submodules removes their worktrees
+	test_expect_success "$command: worktrees of nested submodules are removed" '
+		prolog &&
+		reset_work_tree_to_interested add_nested_sub &&
+		(
+			cd submodule_update &&
+			git branch -t no_submodule origin/no_submodule &&
+			$command no_submodule &&
+			test_superproject_content origin/no_submodule &&
+			! test_path_is_dir sub1 &&
+			test_must_fail git config -f .git/modules/sub1/config core.worktree &&
+			test_must_fail git config -f .git/modules/sub1/modules/sub2/config core.worktree
+		)
+	'
+
 	########################## Modified submodule #########################
 	# Updating a submodule sha1 updates the submodule's work tree
 	test_expect_success "$command: modified submodule updates submodule work tree" '
@@ -789,6 +836,23 @@ test_submodule_recursing_with_args_common() {
 			test_submodule_content sub1 origin/add_sub1
 		)
 	'
+	# Updating a submodule does not touch the currently checked out branch in the submodule
+	test_expect_success "$command: submodule branch is not changed, detach HEAD instead" '
+		prolog &&
+		reset_work_tree_to_interested add_sub1 &&
+		(
+			cd submodule_update &&
+			git -C sub1 checkout -b keep_branch &&
+			git -C sub1 rev-parse HEAD >expect &&
+			git branch -t modify_sub1 origin/modify_sub1 &&
+			$command modify_sub1 &&
+			test_superproject_content origin/modify_sub1 &&
+			test_submodule_content sub1 origin/modify_sub1 &&
+			git -C sub1 rev-parse keep_branch >actual &&
+			test_cmp expect actual &&
+			test_must_fail git -C sub1 symbolic-ref HEAD
+		)
+	'
 }
 
 # Declares and invokes several tests that, in various situations, checks that
@@ -809,7 +873,7 @@ test_submodule_recursing_with_args_common() {
 # test_submodule_switch_recursing_with_args "$GIT_COMMAND"
 test_submodule_switch_recursing_with_args () {
 	cmd_args="$1"
-	command="git $cmd_args --recurse-submodules"
+	command="git $cmd_args"
 	test_submodule_recursing_with_args_common "$command"
 
 	RESULTDS=success
@@ -908,7 +972,6 @@ test_submodule_switch_recursing_with_args () {
 		)
 	'
 
-	# recursing deeper than one level doesn't work yet.
 	test_expect_success "$command: modified submodule updates submodule recursively" '
 		prolog &&
 		reset_work_tree_to_interested add_nested_sub &&
@@ -927,7 +990,7 @@ test_submodule_switch_recursing_with_args () {
 # away local changes in the superproject is allowed.
 test_submodule_forced_switch_recursing_with_args () {
 	cmd_args="$1"
-	command="git $cmd_args --recurse-submodules"
+	command="git $cmd_args"
 	test_submodule_recursing_with_args_common "$command"
 
 	RESULT=success
diff --git a/t/lib-t6000.sh b/t/lib-t6000.sh
index b0ed4767e3..fba6778ca3 100644
--- a/t/lib-t6000.sh
+++ b/t/lib-t6000.sh
@@ -1,7 +1,5 @@
 : included from 6002 and others
 
-mkdir -p .git/refs/tags
-
 >sed.script
 
 # Answer the sha1 has associated with the tag. The tag must exist under refs/tags
@@ -26,7 +24,8 @@ save_tag () {
 	_tag=$1
 	test -n "$_tag" || error "usage: save_tag tag commit-args ..."
 	shift 1
-	"$@" >".git/refs/tags/$_tag"
+
+	git update-ref "refs/tags/$_tag" $("$@")
 
 	echo "s/$(tag $_tag)/$_tag/g" >sed.script.tmp
 	cat sed.script >>sed.script.tmp
diff --git a/t/oid-info/README b/t/oid-info/README
index 27f843fc00..ca56a74b1e 100644
--- a/t/oid-info/README
+++ b/t/oid-info/README
@@ -5,7 +5,7 @@ starting with `#` are ignored.  The key and value are separated by whitespace
 (specifically, those whitespace in the default `$IFS`).  The key consists only
 of shell identifier characters, and the value consists of a hash algorithm,
 colon, and value.  The hash algorithm also consists only of shell identifier
-characters; it should match the value in sha1-file.c.
+characters; it should match the value in object-file.c.
 
 For example, the following lines map the key "rawsz" to "20" if SHA-1 is in use
 and to "32" if SHA-256 is in use:
diff --git a/t/oid-info/hash-info b/t/oid-info/hash-info
index ccdbfdf974..d0736dd1a0 100644
--- a/t/oid-info/hash-info
+++ b/t/oid-info/hash-info
@@ -6,3 +6,12 @@ hexsz sha256:64
 
 zero sha1:0000000000000000000000000000000000000000
 zero sha256:0000000000000000000000000000000000000000000000000000000000000000
+
+algo sha1:sha1
+algo sha256:sha256
+
+empty_blob sha1:e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+empty_blob sha256:473a0f4c3be8a93681a267e3b1e9a7dcda1185436fe141f7749120a303721813
+
+empty_tree sha1:4b825dc642cb6eb9a060e54bf8d69288fbee4904
+empty_tree sha256:6ef19b41225c5369f1c104d45d8d85efa9b057b53b14b4b9b939dd74decc5321
diff --git a/t/perf/.gitignore b/t/perf/.gitignore
index 982eb8e3a9..72f5d0d314 100644
--- a/t/perf/.gitignore
+++ b/t/perf/.gitignore
@@ -1,3 +1,4 @@
 /build/
 /test-results/
+/test-trace/
 /trash directory*/
diff --git a/t/perf/Makefile b/t/perf/Makefile
index 8c47155a7c..2465770a78 100644
--- a/t/perf/Makefile
+++ b/t/perf/Makefile
@@ -1,15 +1,18 @@
 -include ../../config.mak
 export GIT_TEST_OPTIONS
 
-all: perf
+all: test-lint perf
 
 perf: pre-clean
 	./run
 
 pre-clean:
-	rm -rf test-results
+	rm -rf test-results test-trace
 
 clean:
-	rm -rf build "trash directory".* test-results
+	rm -rf build "trash directory".* test-results test-trace
+
+test-lint:
+	$(MAKE) -C .. test-lint
 
 .PHONY: all perf pre-clean clean
diff --git a/t/perf/README b/t/perf/README
index c7b70e2d28..fb9127a66f 100644
--- a/t/perf/README
+++ b/t/perf/README
@@ -28,6 +28,8 @@ the tests on the current git repository.
     7810.3: grep --cached, cheap regex       3.07(3.02+0.25)
     7810.4: grep --cached, expensive regex   9.39(30.57+0.24)
 
+Output format is in seconds "Elapsed(User + System)"
+
 You can compare multiple repositories and even git revisions with the
 'run' script:
 
@@ -84,6 +86,15 @@ You can set the following variables (also in your config.mak):
 	probably be about linux.git size for optimal results.
 	Both default to the git.git you are running from.
 
+    GIT_PERF_EXTRA
+	Boolean to enable additional tests. Most test scripts are
+	written to detect regressions between two versions of Git, and
+	the output will compare timings for individual tests between
+	those versions. Some scripts have additional tests which are not
+	run by default, that show patterns within a single version of
+	Git (e.g., performance of index-pack as the number of threads
+	changes). These can be enabled with GIT_PERF_EXTRA.
+
 You can also pass the options taken by ordinary git tests; the most
 useful one is:
 
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl
index 66554d2161..82c0df4553 100755
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@ -4,7 +4,6 @@ use lib '../../perl/build/lib';
 use strict;
 use warnings;
 use Getopt::Long;
-use Git;
 use Cwd qw(realpath);
 
 sub get_times {
@@ -59,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
 
@@ -85,13 +85,20 @@ sub format_size {
 	return $out;
 }
 
+sub sane_backticks {
+	open(my $fh, '-|', @_);
+	return <$fh>;
+}
+
 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;
@@ -102,7 +109,8 @@ while (scalar @ARGV) {
 	my $prefix = '';
 	last if -f $arg or $arg eq "--";
 	if (! -d $arg) {
-		my $rev = Git::command_oneline(qw(rev-parse --verify), $arg);
+		my $rev = sane_backticks(qw(git rev-parse --verify), $arg);
+		chomp $rev;
 		$dir = "build/".$rev;
 	} elsif ($arg eq '.') {
 		$dir = '.';
@@ -132,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 "") {
@@ -219,13 +225,7 @@ sub print_default_results {
 		for my $i (0..$#dirs) {
 			my $d = $dirs[$i];
 			my $base = "$resultsdir/$prefixes{$d}$t";
-			$times{$prefixes{$d}.$t} = [];
-			foreach my $type (qw(times size)) {
-				if (-e "$base.$type") {
-					$times{$prefixes{$d}.$t} = [get_times("$base.$type")];
-					last;
-				}
-			}
+			$times{$prefixes{$d}.$t} = [get_times("$base.result")];
 			my ($r,$u,$s) = @{$times{$prefixes{$d}.$t}};
 			my $w = length format_times($r,$u,$s,$firstr);
 			$colwidth[$i] = $w if $w > $colwidth[$i];
@@ -267,7 +267,7 @@ sub print_sorted_results {
 		my ($prevr, $prevu, $prevs, $prevrev);
 		for my $i (0..$#dirs) {
 			my $d = $dirs[$i];
-			my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times");
+			my ($r, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result");
 			if ($i > 0 and defined $r and defined $prevr and $prevr > 0) {
 				my $percent = 100.0 * ($r - $prevr) / $prevr;
 				push @evolutions, { "percent"  => $percent,
@@ -327,7 +327,7 @@ sub print_codespeed_results {
 			my $commitid = $prefixes{$d};
 			$commitid =~ s/^build_//;
 			$commitid =~ s/\.$//;
-			my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.times");
+			my ($result_value, $u, $s) = get_times("$resultsdir/$prefixes{$d}$t.result");
 
 			my %vals = (
 				"commitid" => $commitid,
diff --git a/t/perf/bisect_regression b/t/perf/bisect_regression
index a94d9955d0..ce47e1662a 100755
--- a/t/perf/bisect_regression
+++ b/t/perf/bisect_regression
@@ -51,7 +51,7 @@ oldtime=$(echo "$oldtime" | sed -e 's/^\([0-9]\+\.[0-9]\+\).*$/\1/')
 newtime=$(echo "$newtime" | sed -e 's/^\([0-9]\+\.[0-9]\+\).*$/\1/')
 
 test $(echo "$newtime" "$oldtime" | awk '{ print ($1 > $2) }') = 1 ||
-	die "New time '$newtime' shoud be greater than old time '$oldtime'"
+	die "New time '$newtime' should be greater than old time '$oldtime'"
 
 tmpdir=$(mktemp -d -t bisect_regression_XXXXXX) || die "Failed to create temp directory"
 echo "$oldtime" >"$tmpdir/oldtime" || die "Failed to write to '$tmpdir/oldtime'"
diff --git a/t/perf/p1400-update-ref.sh b/t/perf/p1400-update-ref.sh
new file mode 100755
index 0000000000..dda8a74866
--- /dev/null
+++ b/t/perf/p1400-update-ref.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+test_description="Tests performance of update-ref"
+
+. ./perf-lib.sh
+
+test_perf_fresh_repo
+
+test_expect_success "setup" '
+	test_commit PRE &&
+	test_commit POST &&
+	for i in $(test_seq 5000)
+	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
+	done >instructions
+'
+
+test_perf "update-ref" '
+	for i in $(test_seq 1000)
+	do
+		git update-ref refs/heads/branch PRE &&
+		git update-ref refs/heads/branch POST PRE &&
+		git update-ref -d refs/heads/branch
+	done
+'
+
+test_perf "update-ref --stdin" '
+	git update-ref --stdin <instructions >/dev/null
+'
+
+test_done
diff --git a/t/perf/p2000-sparse-operations.sh b/t/perf/p2000-sparse-operations.sh
new file mode 100755
index 0000000000..597626276f
--- /dev/null
+++ b/t/perf/p2000-sparse-operations.sh
@@ -0,0 +1,114 @@
+#!/bin/sh
+
+test_description="test performance of Git operations using the index"
+
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+SPARSE_CONE=f2/f4
+
+test_expect_success 'setup repo and indexes' '
+	git reset --hard HEAD &&
+
+	# Remove submodules from the example repo, because our
+	# duplication of the entire repo creates an unlikely data shape.
+	if git config --file .gitmodules --get-regexp "submodule.*.path" >modules
+	then
+		git rm $(awk "{print \$2}" modules) &&
+		git commit -m "remove submodules" || return 1
+	fi &&
+
+	echo bogus >a &&
+	cp a b &&
+	git add a b &&
+	git commit -m "level 0" &&
+	BLOB=$(git rev-parse HEAD:a) &&
+	OLD_COMMIT=$(git rev-parse HEAD) &&
+	OLD_TREE=$(git rev-parse HEAD^{tree}) &&
+
+	for i in $(test_seq 1 3)
+	do
+		cat >in <<-EOF &&
+			100755 blob $BLOB	a
+			040000 tree $OLD_TREE	f1
+			040000 tree $OLD_TREE	f2
+			040000 tree $OLD_TREE	f3
+			040000 tree $OLD_TREE	f4
+		EOF
+		NEW_TREE=$(git mktree <in) &&
+		NEW_COMMIT=$(git commit-tree $NEW_TREE -p $OLD_COMMIT -m "level $i") &&
+		OLD_TREE=$NEW_TREE &&
+		OLD_COMMIT=$NEW_COMMIT || return 1
+	done &&
+
+	git sparse-checkout init --cone &&
+	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-v3 &&
+		git sparse-checkout init --cone &&
+		git sparse-checkout set $SPARSE_CONE &&
+		git config index.version 3 &&
+		git update-index --index-version=3 &&
+		git checkout HEAD~4
+	) &&
+	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . full-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 checkout HEAD~4
+	) &&
+	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . sparse-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 checkout HEAD~4
+	) &&
+	git -c core.sparseCheckoutCone=true clone --branch=wide --sparse . sparse-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 checkout HEAD~4
+	)
+'
+
+test_perf_on_all () {
+	command="$@"
+	for repo in full-v3 full-v4 \
+		    sparse-v3 sparse-v4
+	do
+		test_perf "$command ($repo)" "
+			(
+				cd $repo &&
+				echo >>$SPARSE_CONE/a &&
+				$command
+			)
+		"
+	done
+}
+
+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_done
diff --git a/t/perf/p3400-rebase.sh b/t/perf/p3400-rebase.sh
index d202aaed06..7a0bb29448 100755
--- a/t/perf/p3400-rebase.sh
+++ b/t/perf/p3400-rebase.sh
@@ -9,16 +9,16 @@ test_expect_success 'setup rebasing on top of a lot of changes' '
 	git checkout -f -B base &&
 	git checkout -B to-rebase &&
 	git checkout -B upstream &&
-	for i in $(seq 100)
+	for i in $(test_seq 100)
 	do
 		# simulate huge diffs
 		echo change$i >unrelated-file$i &&
-		seq 1000 >>unrelated-file$i &&
+		test_seq 1000 >>unrelated-file$i &&
 		git add unrelated-file$i &&
 		test_tick &&
 		git commit -m commit$i unrelated-file$i &&
 		echo change$i >unrelated-file$i &&
-		seq 1000 | tac >>unrelated-file$i &&
+		test_seq 1000 | tac >>unrelated-file$i &&
 		git add unrelated-file$i &&
 		test_tick &&
 		git commit -m commit$i-reverse unrelated-file$i ||
diff --git a/t/perf/p4205-log-pretty-formats.sh b/t/perf/p4205-log-pretty-formats.sh
index 7c26f4f337..609fecd65d 100755
--- a/t/perf/p4205-log-pretty-formats.sh
+++ b/t/perf/p4205-log-pretty-formats.sh
@@ -6,7 +6,7 @@ test_description='Tests the performance of various pretty format placeholders'
 
 test_perf_default_repo
 
-for format in %H %h %T %t %P %p %h-%h-%h
+for format in %H %h %T %t %P %p %h-%h-%h %an-%ae-%s
 do
 	test_perf "log with $format" "
 		git log --format=\"$format\" >/dev/null
diff --git a/t/perf/p4209-pickaxe.sh b/t/perf/p4209-pickaxe.sh
new file mode 100755
index 0000000000..f585a4465a
--- /dev/null
+++ b/t/perf/p4209-pickaxe.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+test_description="Test pickaxe performance"
+
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+# Not --max-count, as that's the number of matching commit, so it's
+# unbounded. We want to limit our revision walk here.
+from_rev_desc=
+from_rev=
+max_count=1000
+if test_have_prereq EXPENSIVE
+then
+	max_count=10000
+fi
+from_rev=" $(git rev-list HEAD | head -n $max_count | tail -n 1).."
+from_rev_desc=" <limit-rev>.."
+
+for icase in \
+	'' \
+	'-i '
+do
+	# -S (no regex)
+	for pattern in \
+		'int main' \
+		'æ'
+	do
+		for opts in \
+			'-S'
+		do
+			test_perf "git log $icase$opts'$pattern'$from_rev_desc" "
+				git log --pretty=format:%H $icase$opts'$pattern'$from_rev
+			"
+		done
+	done
+
+	# -S (regex)
+	for pattern in  \
+		'(int|void|null)' \
+		'if *\([^ ]+ & ' \
+		'[àáâãäåæñøùúûüýþ]'
+	do
+		for opts in \
+			'--pickaxe-regex -S'
+		do
+			test_perf "git log $icase$opts'$pattern'$from_rev_desc" "
+				git log --pretty=format:%H $icase$opts'$pattern'$from_rev
+			"
+		done
+	done
+
+	# -G
+	for pattern in  \
+		'(int|void|null)' \
+		'if *\([^ ]+ & ' \
+		'[àáâãäåæñøùúûüýþ]'
+	do
+		for opts in \
+			'-G'
+		do
+			test_perf "git log $icase$opts'$pattern'$from_rev_desc" "
+				git log --pretty=format:%H $icase$opts'$pattern'$from_rev
+			"
+		done
+	done
+done
+
+test_done
diff --git a/t/perf/p5302-pack-index.sh b/t/perf/p5302-pack-index.sh
index a9b3e112d9..228593d9ad 100755
--- a/t/perf/p5302-pack-index.sh
+++ b/t/perf/p5302-pack-index.sh
@@ -13,35 +13,36 @@ test_expect_success 'repack' '
 	export PACK
 '
 
-test_perf 'index-pack 0 threads' '
-	rm -rf repo.git &&
-	git init --bare repo.git &&
-	GIT_DIR=repo.git git index-pack --threads=1 --stdin < $PACK
-'
-
-test_perf 'index-pack 1 thread ' '
-	rm -rf repo.git &&
-	git init --bare repo.git &&
-	GIT_DIR=repo.git GIT_FORCE_THREADS=1 git index-pack --threads=1 --stdin < $PACK
+# Rather than counting up and doubling each time, count down from the endpoint,
+# halving each time. That ensures that our final test uses as many threads as
+# CPUs, even if it isn't a power of 2.
+test_expect_success 'set up thread-counting tests' '
+	t=$(test-tool online-cpus) &&
+	threads= &&
+	while test $t -gt 0
+	do
+		threads="$t $threads"
+		t=$((t / 2))
+	done
 '
 
-test_perf 'index-pack 2 threads' '
+test_perf PERF_EXTRA 'index-pack 0 threads' '
 	rm -rf repo.git &&
 	git init --bare repo.git &&
-	GIT_DIR=repo.git git index-pack --threads=2 --stdin < $PACK
-'
-
-test_perf 'index-pack 4 threads' '
-	rm -rf repo.git &&
-	git init --bare repo.git &&
-	GIT_DIR=repo.git git index-pack --threads=4 --stdin < $PACK
+	GIT_DIR=repo.git git index-pack --threads=1 --stdin < $PACK
 '
 
-test_perf 'index-pack 8 threads' '
-	rm -rf repo.git &&
-	git init --bare repo.git &&
-	GIT_DIR=repo.git git index-pack --threads=8 --stdin < $PACK
-'
+for t in $threads
+do
+	THREADS=$t
+	export THREADS
+	test_perf PERF_EXTRA "index-pack $t threads" '
+		rm -rf repo.git &&
+		git init --bare repo.git &&
+		GIT_DIR=repo.git GIT_FORCE_THREADS=1 \
+		git index-pack --threads=$THREADS --stdin <$PACK
+	'
+done
 
 test_perf 'index-pack default number of threads' '
 	rm -rf repo.git &&
diff --git a/t/perf/p5303-many-packs.sh b/t/perf/p5303-many-packs.sh
index 3779851941..35c0cbdf49 100755
--- a/t/perf/p5303-many-packs.sh
+++ b/t/perf/p5303-many-packs.sh
@@ -21,14 +21,25 @@ repack_into_n () {
 	mkdir staging &&
 
 	git rev-list --first-parent HEAD |
-	sed -n '1~5p' |
-	head -n "$1" |
-	perl -e 'print reverse <>' \
-	>pushes
+	perl -e '
+		my $n = shift;
+		while (<>) {
+			last unless @commits < $n;
+			push @commits, $_ if $. % 5 == 1;
+		}
+		print reverse @commits;
+	' "$1" >pushes &&
 
 	# create base packfile
-	head -n 1 pushes |
-	git pack-objects --delta-base-offset --revs staging/pack
+	base_pack=$(
+		head -n 1 pushes |
+		git pack-objects --delta-base-offset --revs staging/pack
+	) &&
+	test_export base_pack &&
+
+	# create an empty packfile
+	empty_pack=$(git pack-objects staging/pack </dev/null) &&
+	test_export empty_pack &&
 
 	# and then incrementals between each pair of commits
 	last= &&
@@ -45,6 +56,12 @@ repack_into_n () {
 		last=$rev
 	done <pushes &&
 
+	(
+		find staging -type f -name 'pack-*.pack' |
+			xargs -n 1 basename | grep -v "$base_pack" &&
+		printf "^pack-%s.pack\n" $base_pack
+	) >stdin.packs
+
 	# and install the whole thing
 	rm -f .git/objects/pack/* &&
 	mv staging/* .git/objects/pack/
@@ -73,15 +90,55 @@ do
 		git rev-list --objects --all >/dev/null
 	'
 
+	test_perf "abbrev-commit ($nr_packs)" '
+		git rev-list --abbrev-commit HEAD >/dev/null
+	'
+
 	# This simulates the interesting part of the repack, which is the
 	# actual pack generation, without smudging the on-disk setup
 	# between trials.
 	test_perf "repack ($nr_packs)" '
+		GIT_TEST_FULL_IN_PACK_ARRAY=1 \
+		git pack-objects --keep-true-parents \
+		  --honor-pack-keep --non-empty --all \
+		  --reflog --indexed-objects --delta-base-offset \
+		  --stdout </dev/null >/dev/null
+	'
+
+	test_perf "repack with kept ($nr_packs)" '
 		git pack-objects --keep-true-parents \
+		  --keep-pack=pack-$empty_pack.pack \
 		  --honor-pack-keep --non-empty --all \
 		  --reflog --indexed-objects --delta-base-offset \
 		  --stdout </dev/null >/dev/null
 	'
+
+	test_perf "repack with --stdin-packs ($nr_packs)" '
+		git pack-objects \
+		  --keep-true-parents \
+		  --stdin-packs \
+		  --non-empty \
+		  --delta-base-offset \
+		  --stdout <stdin.packs >/dev/null
+	'
 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"
+	done |
+	git -c fastimport.unpackLimit=0 fast-import
+'
+
+# The purpose of this test is to evaluate load time for a large number
+# of packs while doing as little other work as possible.
+test_perf "load 10,000 packs" '
+	git rev-parse --verify "HEAD^{commit}"
+'
+
 test_done
diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh
index 6a3a42531b..452be01056 100755
--- a/t/perf/p5310-pack-bitmaps.sh
+++ b/t/perf/p5310-pack-bitmaps.sh
@@ -15,6 +15,12 @@ test_expect_success 'setup bitmap config' '
 	git config pack.writebitmaps true
 '
 
+# 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_perf 'repack to disk' '
 	git repack -ad
 '
@@ -31,14 +37,45 @@ test_perf 'simulated fetch' '
 	} | git pack-objects --revs --stdout >/dev/null
 '
 
-test_perf 'pack to file' '
-	git pack-objects --all pack1 </dev/null >/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_expect_success 'create partial bitmap state' '
 	# pick a commit to represent the repo tip in the past
 	cutoff=$(git rev-list HEAD~100 -1) &&
@@ -68,4 +105,9 @@ 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_done
diff --git a/t/perf/p5600-partial-clone.sh b/t/perf/p5600-partial-clone.sh
index 3e04bd2ae1..a965f2c4d6 100755
--- a/t/perf/p5600-partial-clone.sh
+++ b/t/perf/p5600-partial-clone.sh
@@ -23,4 +23,20 @@ test_perf 'checkout of result' '
 	git -C worktree checkout -f
 '
 
+test_perf 'fsck' '
+	git -C bare.git fsck
+'
+
+test_perf 'count commits' '
+	git -C bare.git rev-list --all --count
+'
+
+test_perf 'count non-promisor commits' '
+	git -C bare.git rev-list --all --count --exclude-promisor-objects
+'
+
+test_perf 'gc' '
+	git -C bare.git gc
+'
+
 test_done
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh
index def7ecdbc7..5eb5044a10 100755
--- a/t/perf/p7519-fsmonitor.sh
+++ b/t/perf/p7519-fsmonitor.sh
@@ -22,7 +22,9 @@ test_description="Test core.fsmonitor"
 #
 # GIT_PERF_7519_UNTRACKED_CACHE: used to configure core.untrackedCache
 # GIT_PERF_7519_SPLIT_INDEX: used to configure core.splitIndex
-# GIT_PERF_7519_FSMONITOR: used to configure core.fsMonitor
+# GIT_PERF_7519_FSMONITOR: used to configure core.fsMonitor. May be an
+#   absolute path to an integration. May be a space delimited list of
+#   absolute paths to integrations.
 #
 # The big win for using fsmonitor is the elimination of the need to scan the
 # working directory looking for changed and untracked files. If the file
@@ -30,6 +32,8 @@ test_description="Test core.fsmonitor"
 #
 # GIT_PERF_7519_DROP_CACHE: if set, the OS caches are dropped between tests
 #
+# GIT_PERF_7519_TRACE: if set, enable trace logging during the test.
+#   Trace logs will be grouped by fsmonitor provider.
 
 test_perf_large_repo
 test_checkout_worktree
@@ -68,7 +72,33 @@ then
 	fi
 fi
 
-test_expect_success "setup for fsmonitor" '
+trace_start() {
+	if test -n "$GIT_PERF_7519_TRACE"
+	then
+		name="$1"
+		TEST_TRACE_DIR="$TEST_OUTPUT_DIRECTORY/test-trace/p7519/"
+		echo "Writing trace logging to $TEST_TRACE_DIR"
+
+		mkdir -p "$TEST_TRACE_DIR"
+
+		# Start Trace2 logging and any other GIT_TRACE_* logs that you
+		# want for this named test case.
+
+		GIT_TRACE2_PERF="$TEST_TRACE_DIR/$name.trace2perf"
+		export GIT_TRACE2_PERF
+
+		>"$GIT_TRACE2_PERF"
+	fi
+}
+
+trace_stop() {
+	if test -n "$GIT_PERF_7519_TRACE"
+	then
+		unset GIT_TRACE2_PERF
+	fi
+}
+
+test_expect_success "one time repo setup" '
 	# set untrackedCache depending on the environment
 	if test -n "$GIT_PERF_7519_UNTRACKED_CACHE"
 	then
@@ -88,24 +118,36 @@ test_expect_success "setup for fsmonitor" '
 		git config core.splitIndex "$GIT_PERF_7519_SPLIT_INDEX"
 	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 &&
+	git add 1_file 10_files 100_files 1000_files 10000_files &&
+	git commit -qm "Add files" &&
+
+	# If Watchman exists, watch the work tree and attempt a query.
+	if test_have_prereq WATCHMAN; then
+		watchman watch "$GIT_WORK_TREE" &&
+		watchman watch-list | grep -q -F "p7519-fsmonitor"
+	fi
+'
+
+setup_for_fsmonitor() {
 	# set INTEGRATION_SCRIPT depending on the environment
-	if test -n "$GIT_PERF_7519_FSMONITOR"
+	if test -n "$INTEGRATION_PATH"
 	then
-		INTEGRATION_SCRIPT="$GIT_PERF_7519_FSMONITOR"
+		INTEGRATION_SCRIPT="$INTEGRATION_PATH"
 	else
 		#
 		# Choose integration script based on existence of Watchman.
-		# If Watchman exists, watch the work tree and attempt a query.
-		# If everything succeeds, use Watchman integration script,
-		# else fall back to an empty integration script.
+		# Fall back to an empty integration script.
 		#
 		mkdir .git/hooks &&
 		if test_have_prereq WATCHMAN
 		then
 			INTEGRATION_SCRIPT=".git/hooks/fsmonitor-watchman" &&
-			cp "$TEST_DIRECTORY/../templates/hooks--fsmonitor-watchman.sample" "$INTEGRATION_SCRIPT" &&
-			watchman watch "$GIT_WORK_TREE" &&
-			watchman watch-list | grep -q -F "$GIT_WORK_TREE"
+			cp "$TEST_DIRECTORY/../templates/hooks--fsmonitor-watchman.sample" "$INTEGRATION_SCRIPT"
 		else
 			INTEGRATION_SCRIPT=".git/hooks/fsmonitor-empty" &&
 			write_script "$INTEGRATION_SCRIPT"<<-\EOF
@@ -114,62 +156,110 @@ test_expect_success "setup for fsmonitor" '
 	fi &&
 
 	git config core.fsmonitor "$INTEGRATION_SCRIPT" &&
-	git update-index --fsmonitor
-'
+	git update-index --fsmonitor 2>error &&
+	if test_have_prereq WATCHMAN
+	then
+		test_must_be_empty error  # ensure no silent error
+	else
+		grep "Empty last update token" error
+	fi
+}
 
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
-	test-tool drop-caches
-fi
+test_perf_w_drop_caches () {
+	if test -n "$GIT_PERF_7519_DROP_CACHE"; then
+		test-tool drop-caches
+	fi
 
-test_perf "status (fsmonitor=$INTEGRATION_SCRIPT)" '
-	git status
-'
+	test_perf "$@"
+}
 
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
-	test-tool drop-caches
-fi
+test_fsmonitor_suite() {
+	if test -n "$INTEGRATION_SCRIPT"; then
+		DESC="fsmonitor=$(basename $INTEGRATION_SCRIPT)"
+	else
+		DESC="fsmonitor=disabled"
+	fi
 
-test_perf "status -uno (fsmonitor=$INTEGRATION_SCRIPT)" '
-	git status -uno
-'
+	test_expect_success "test_initialization" '
+		git reset --hard &&
+		git status  # Warm caches
+	'
 
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
-	test-tool drop-caches
-fi
+	test_perf_w_drop_caches "status ($DESC)" '
+		git status
+	'
 
-test_perf "status -uall (fsmonitor=$INTEGRATION_SCRIPT)" '
-	git status -uall
-'
+	test_perf_w_drop_caches "status -uno ($DESC)" '
+		git status -uno
+	'
 
-test_expect_success "setup without fsmonitor" '
-	unset INTEGRATION_SCRIPT &&
-	git config --unset core.fsmonitor &&
-	git update-index --no-fsmonitor
-'
+	test_perf_w_drop_caches "status -uall ($DESC)" '
+		git status -uall
+	'
 
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
-	test-tool drop-caches
-fi
+	# Update the mtimes on upto 100k files to make status think
+	# that they are dirty.  For simplicity, omit any files with
+	# LFs (i.e. anything that ls-files thinks it needs to dquote).
+	# Then fully backslash-quote the paths to capture any
+	# whitespace so that they pass thru xargs properly.
+	#
+	test_perf_w_drop_caches "status (dirty) ($DESC)" '
+		git ls-files | \
+			head -100000 | \
+			grep -v \" | \
+			sed '\''s/\(.\)/\\\1/g'\'' | \
+			xargs test-tool chmtime -300 &&
+		git status
+	'
 
-test_perf "status (fsmonitor=$INTEGRATION_SCRIPT)" '
-	git status
-'
+	test_perf_w_drop_caches "diff ($DESC)" '
+		git diff
+	'
 
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
-	test-tool drop-caches
-fi
+	test_perf_w_drop_caches "diff HEAD ($DESC)" '
+		git diff HEAD
+	'
 
-test_perf "status -uno (fsmonitor=$INTEGRATION_SCRIPT)" '
-	git status -uno
-'
+	test_perf_w_drop_caches "diff -- 0_files ($DESC)" '
+		git diff -- 1_file
+	'
 
-if test -n "$GIT_PERF_7519_DROP_CACHE"; then
-	test-tool drop-caches
-fi
+	test_perf_w_drop_caches "diff -- 10_files ($DESC)" '
+		git diff -- 10_files
+	'
 
-test_perf "status -uall (fsmonitor=$INTEGRATION_SCRIPT)" '
-	git status -uall
-'
+	test_perf_w_drop_caches "diff -- 100_files ($DESC)" '
+		git diff -- 100_files
+	'
+
+	test_perf_w_drop_caches "diff -- 1000_files ($DESC)" '
+		git diff -- 1000_files
+	'
+
+	test_perf_w_drop_caches "diff -- 10000_files ($DESC)" '
+		git diff -- 10000_files
+	'
+
+	test_perf_w_drop_caches "add ($DESC)" '
+		git add  --all
+	'
+}
+
+#
+# Run a full set of perf tests using each Hook-based fsmonitor provider,
+# such as Watchman.
+#
+
+trace_start fsmonitor-watchman
+if test -n "$GIT_PERF_7519_FSMONITOR"; then
+	for INTEGRATION_PATH in $GIT_PERF_7519_FSMONITOR; do
+		test_expect_success "setup for fsmonitor $INTEGRATION_PATH" 'setup_for_fsmonitor'
+		test_fsmonitor_suite
+	done
+else
+	test_expect_success "setup for fsmonitor" 'setup_for_fsmonitor'
+	test_fsmonitor_suite
+fi
 
 if test_have_prereq WATCHMAN
 then
@@ -179,5 +269,20 @@ then
 	# preventing the removal of the trash directory
 	watchman shutdown-server >/dev/null 2>&1
 fi
+trace_stop
+
+#
+# Run a full set of perf tests with the fsmonitor feature disabled.
+#
+
+trace_start fsmonitor-disabled
+test_expect_success "setup without fsmonitor" '
+	unset INTEGRATION_SCRIPT &&
+	git config --unset core.fsmonitor &&
+	git update-index --no-fsmonitor
+'
+
+test_fsmonitor_suite
+trace_stop
 
 test_done
diff --git a/t/perf/p9300-fast-import-export.sh b/t/perf/p9300-fast-import-export.sh
new file mode 100755
index 0000000000..586161e9ad
--- /dev/null
+++ b/t/perf/p9300-fast-import-export.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+test_description='test fast-import and fast-export performance'
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+# Use --no-data here to produce a vastly smaller export file.
+# This is much cheaper to work with but should still exercise
+# fast-import pretty well (we'll still process all commits and
+# trees, which account for 60% or more of objects in most repos).
+#
+# Use --reencode to avoid the default of aborting on non-utf8 commits,
+# which lets this test run against a wider variety of sample repos.
+test_perf 'export (no-blobs)' '
+	git fast-export --reencode=yes --no-data HEAD >export
+'
+
+test_perf 'import (no-blobs)' '
+	git fast-import --force <export
+'
+
+test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index b58a43ea43..f5ed092ee5 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -45,7 +45,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
@@ -70,6 +70,19 @@ test_perf_do_repo_symlink_config_ () {
 	test_have_prereq SYMLINKS || git config core.symlinks false
 }
 
+test_perf_copy_repo_contents () {
+	for stuff in "$1"/*
+	do
+		case "$stuff" in
+		*/objects|*/hooks|*/config|*/commondir|*/gitdir|*/worktrees)
+			;;
+		*)
+			cp -R "$stuff" "$repo/.git/" || exit 1
+			;;
+		esac
+	done
+}
+
 test_perf_create_repo_from () {
 	test "$#" = 2 ||
 	BUG "not 2 parameters to test-create-repo"
@@ -77,20 +90,20 @@ test_perf_create_repo_from () {
 	source="$2"
 	source_git="$("$MODERN_GIT" -C "$source" rev-parse --git-dir)"
 	objects_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-path objects)"
+	common_dir="$("$MODERN_GIT" -C "$source" rev-parse --git-common-dir)"
 	mkdir -p "$repo/.git"
 	(
 		cd "$source" &&
 		{ cp -Rl "$objects_dir" "$repo/.git/" 2>/dev/null ||
 			cp -R "$objects_dir" "$repo/.git/"; } &&
-		for stuff in "$source_git"/*; do
-			case "$stuff" in
-				*/objects|*/hooks|*/config|*/commondir)
-					;;
-				*)
-					cp -R "$stuff" "$repo/.git/" || exit 1
-					;;
-			esac
-		done
+
+		# common_dir must come first here, since we want source_git to
+		# take precedence and overwrite any overlapping files
+		test_perf_copy_repo_contents "$common_dir"
+		if test "$source_git" != "$common_dir"
+		then
+			test_perf_copy_repo_contents "$source_git"
+		fi
 	) &&
 	(
 		cd "$repo" &&
@@ -147,14 +160,16 @@ test_run_perf_ () {
 	"$GTIME" -f "%E %U %S" -o test_time.$i "$SHELL" -c '
 . '"$TEST_DIRECTORY"/test-lib-functions.sh'
 test_export () {
-	[ $# != 0 ] || return 0
-	test_export_="$test_export_\\|$1"
-	shift
-	test_export "$@"
+	test_export_="$test_export_ $*"
 }
 '"$1"'
 ret=$?
-set | sed -n "s'"/'/'\\\\''/g"';s/^\\($test_export_\\)/export '"'&'"'/p" >test_vars
+needles=
+for v in $test_export_
+do
+	needles="$needles;s/^$v=/export $v=/p"
+done
+set | sed -n "s'"/'/'\\\\''/g"'$needles" >test_vars
 exit $ret' >&3 2>&4
 	eval_ret=$?
 
@@ -214,7 +229,7 @@ test_perf_ () {
 	else
 		test_ok_ "$1"
 	fi
-	"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".times
+	"$TEST_DIRECTORY"/perf/min_time.perl test_time.* >"$base".result
 }
 
 test_perf () {
@@ -223,7 +238,7 @@ test_perf () {
 
 test_size_ () {
 	say >&3 "running: $2"
-	if test_eval_ "$2" 3>"$base".size; then
+	if test_eval_ "$2" 3>"$base".result; then
 		test_ok_ "$1"
 	else
 		test_failure_ "$@"
@@ -238,10 +253,15 @@ 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
 }
 
 test_export () {
 	export "$@"
 }
+
+test_lazy_prereq PERF_EXTRA 'test_bool_env GIT_PERF_EXTRA false'
diff --git a/t/perf/run b/t/perf/run
index c7b86104e1..d19dec258a 100755
--- a/t/perf/run
+++ b/t/perf/run
@@ -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 4d3f7ba295..cb87768513 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -20,9 +20,9 @@ modification *should* take notice and update the test vectors here.
 
 . ./test-lib.sh
 
-try_local_x () {
-	local x="local" &&
-	echo "$x"
+try_local_xy () {
+	local x="local" y="alsolocal" &&
+	echo "$x $y"
 }
 
 # Check whether the shell supports the "local" keyword. "local" is not
@@ -35,11 +35,12 @@ try_local_x () {
 # relying on "local".
 test_expect_success 'verify that the running shell supports "local"' '
 	x="notlocal" &&
-	echo "local" >expected1 &&
-	try_local_x >actual1 &&
+	y="alsonotlocal" &&
+	echo "local alsolocal" >expected1 &&
+	try_local_xy >actual1 &&
 	test_cmp expected1 actual1 &&
-	echo "notlocal" >expected2 &&
-	echo "$x" >actual2 &&
+	echo "notlocal alsonotlocal" >expected2 &&
+	echo "$x $y" >actual2 &&
 	test_cmp expected2 actual2
 '
 
@@ -68,6 +69,23 @@ 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
+
+	# 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
+
 	mkdir "$name" &&
 	(
 		# Pretend we're not running under a test harness, whether we
@@ -76,32 +94,31 @@ _run_sub_test_lib_test_common () {
 		# the sub-test.
 		sane_unset HARNESS_ACTIVE &&
 		cd "$name" &&
-		cat >"$name.sh" <<-EOF &&
-		#!$SHELL_PATH
-
+		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
 		'
 
-		# Tell the framework that we are self-testing to make sure
-		# it yields a stable result.
-		GIT_TEST_FRAMEWORK_SELFTEST=t &&
-
 		# Point to the t/test-lib.sh, which isn't in ../ as usual
 		. "\$TEST_DIRECTORY"/test-lib.sh
 		EOF
 		cat >>"$name.sh" &&
-		chmod +x "$name.sh" &&
 		export TEST_DIRECTORY &&
-		TEST_OUTPUT_DIRECTORY=$(pwd) &&
-		export TEST_OUTPUT_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 &&
 		if test -z "$neg"
 		then
 			./"$name.sh" "$@" >out 2>err
 		else
-			!  ./"$name.sh" "$@" >out 2>err
+			! ./"$name.sh" "$@" >out 2>err
 		fi
 	)
 }
@@ -126,7 +143,7 @@ check_sub_test_lib_test () {
 
 check_sub_test_lib_test_err () {
 	name="$1" # stdin is the expected output from the test
-	# expected error output is in descriptior 3
+	# expected error output is in descriptor 3
 	(
 		cd "$name" &&
 		sed -e 's/^> //' -e 's/Z$//' >expect.out &&
@@ -136,32 +153,32 @@ check_sub_test_lib_test_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 'pretend we have a fully passing test suite' '
+	run_sub_test_lib_test full-pass "3 passing tests" <<-\EOF &&
 	for i in 1 2 3
 	do
-		test_expect_success \"passing test #\$i\" 'true'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test full-pass <<-\\EOF
+	check_sub_test_lib_test full-pass <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 - passing test #3
 	> # passed all 3 test(s)
 	> 1..3
 	EOF
-"
+'
 
-test_expect_success 'pretend we have a partially passing test suite' "
-	test_must_fail run_sub_test_lib_test \
-		partial-pass '2/3 tests passing' <<-\\EOF &&
-	test_expect_success 'passing test #1' 'true'
-	test_expect_success 'failing test #2' 'false'
-	test_expect_success 'passing test #3' 'true'
+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 "passing test #1" "true"
+	test_expect_success "failing test #2" "false"
+	test_expect_success "passing test #3" "true"
 	test_done
 	EOF
-	check_sub_test_lib_test partial-pass <<-\\EOF
+	check_sub_test_lib_test partial-pass <<-\EOF
 	> ok 1 - passing test #1
 	> not ok 2 - failing test #2
 	#	false
@@ -169,44 +186,44 @@ test_expect_success 'pretend we have a partially passing test suite' "
 	> # failed 1 among 3 test(s)
 	> 1..3
 	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 'passing test' 'true'
-	test_expect_failure 'pretend we have a known breakage' 'false'
+test_expect_success 'pretend we have a known breakage' '
+	run_sub_test_lib_test failing-todo "A failing TODO test" <<-\EOF &&
+	test_expect_success "passing test" "true"
+	test_expect_failure "pretend we have a known breakage" "false"
 	test_done
 	EOF
-	check_sub_test_lib_test failing-todo <<-\\EOF
+	check_sub_test_lib_test failing-todo <<-\EOF
 	> ok 1 - passing test
 	> not ok 2 - pretend we have a known breakage # TODO known breakage
 	> # still have 1 known breakage(s)
 	> # passed all remaining 1 test(s)
 	> 1..2
 	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_failure 'pretend we have fixed a known breakage' 'true'
+test_expect_success 'pretend we have fixed a known breakage' '
+	run_sub_test_lib_test passing-todo "A passing TODO test" <<-\EOF &&
+	test_expect_failure "pretend we have fixed a known breakage" "true"
 	test_done
 	EOF
-	check_sub_test_lib_test passing-todo <<-\\EOF
+	check_sub_test_lib_test passing-todo <<-\EOF
 	> ok 1 - pretend we have fixed a known breakage # TODO known breakage vanished
 	> # 1 known breakage(s) vanished; please update test(s)
 	> 1..1
 	EOF
-"
+'
 
-test_expect_success 'pretend we have fixed one of two known breakages (run in sub test-lib)' "
+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_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'
+		"2 TODO tests, one passing" <<-\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"
 	test_done
 	EOF
-	check_sub_test_lib_test partially-passing-todos <<-\\EOF
+	check_sub_test_lib_test partially-passing-todos <<-\EOF
 	> not ok 1 - pretend we have a known breakage # TODO known breakage
 	> ok 2 - pretend we have a passing test
 	> ok 3 - pretend we have fixed another known breakage # TODO known breakage vanished
@@ -215,17 +232,17 @@ test_expect_success 'pretend we have fixed one of two known breakages (run in su
 	> # passed all remaining 1 test(s)
 	> 1..3
 	EOF
-"
+'
 
-test_expect_success 'pretend we have a pass, fail, and known breakage' "
-	test_must_fail run_sub_test_lib_test \
-		mixed-results1 'mixed results #1' <<-\\EOF &&
-	test_expect_success 'passing test' 'true'
-	test_expect_success 'failing test' 'false'
-	test_expect_failure 'pretend we have a known breakage' 'false'
+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 "passing test" "true"
+	test_expect_success "failing test" "false"
+	test_expect_failure "pretend we have a known breakage" "false"
 	test_done
 	EOF
-	check_sub_test_lib_test mixed-results1 <<-\\EOF
+	check_sub_test_lib_test mixed-results1 <<-\EOF
 	> ok 1 - passing test
 	> not ok 2 - failing test
 	> #	false
@@ -234,24 +251,24 @@ test_expect_success 'pretend we have a pass, fail, and known breakage' "
 	> # failed 1 among remaining 2 test(s)
 	> 1..3
 	EOF
-"
-
-test_expect_success 'pretend we have a mix of all possible results' "
-	test_must_fail run_sub_test_lib_test \
-		mixed-results2 'mixed results #2' <<-\\EOF &&
-	test_expect_success 'passing test' 'true'
-	test_expect_success 'passing test' 'true'
-	test_expect_success 'passing test' 'true'
-	test_expect_success 'passing test' 'true'
-	test_expect_success 'failing test' 'false'
-	test_expect_success 'failing test' 'false'
-	test_expect_success 'failing test' 'false'
-	test_expect_failure 'pretend we have a known breakage' 'false'
-	test_expect_failure 'pretend we have a known breakage' 'false'
-	test_expect_failure 'pretend we have fixed a known breakage' 'true'
+'
+
+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 "passing test" "true"
+	test_expect_success "passing test" "true"
+	test_expect_success "passing test" "true"
+	test_expect_success "passing test" "true"
+	test_expect_success "failing test" "false"
+	test_expect_success "failing test" "false"
+	test_expect_success "failing test" "false"
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_expect_failure "pretend we have a known breakage" "false"
+	test_expect_failure "pretend we have fixed a known breakage" "true"
 	test_done
 	EOF
-	check_sub_test_lib_test mixed-results2 <<-\\EOF
+	check_sub_test_lib_test mixed-results2 <<-\EOF
 	> ok 1 - passing test
 	> ok 2 - passing test
 	> ok 3 - passing test
@@ -270,10 +287,10 @@ test_expect_success 'pretend we have a mix of all possible results' "
 	> # failed 3 among remaining 7 test(s)
 	> 1..10
 	EOF
-"
+'
 
-test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
-	test_must_fail run_sub_test_lib_test \
+test_expect_success 'test --verbose' '
+	run_sub_test_lib_test_err \
 		t1234-verbose "test verbose" --verbose <<-\EOF &&
 	test_expect_success "passing test" true
 	test_expect_success "test with output" "echo foo"
@@ -300,7 +317,7 @@ test_expect_success C_LOCALE_OUTPUT 'test --verbose' '
 '
 
 test_expect_success 'test --verbose-only' '
-	test_must_fail run_sub_test_lib_test \
+	run_sub_test_lib_test_err \
 		t2345-verbose-only-2 "test verbose-only=2" \
 		--verbose-only=2 <<-\EOF &&
 	test_expect_success "passing test" true
@@ -322,18 +339,18 @@ test_expect_success 'test --verbose-only' '
 	EOF
 '
 
-test_expect_success 'GIT_SKIP_TESTS' "
+test_expect_success '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 &&
+			"GIT_SKIP_TESTS" \
+			--skip="git.2" <<-\EOF &&
 		for i in 1 2 3
 		do
-			test_expect_success \"passing test #\$i\" 'true'
+			test_expect_success "passing test #$i" "true"
 		done
 		test_done
 		EOF
-		check_sub_test_lib_test git-skip-tests-basic <<-\\EOF
+		check_sub_test_lib_test git-skip-tests-basic <<-\EOF
 		> ok 1 - passing test #1
 		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
 		> ok 3 - passing test #3
@@ -341,20 +358,20 @@ test_expect_success 'GIT_SKIP_TESTS' "
 		> 1..3
 		EOF
 	)
-"
+'
 
-test_expect_success 'GIT_SKIP_TESTS several tests' "
+test_expect_success 'GIT_SKIP_TESTS several 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 &&
+			"GIT_SKIP_TESTS several tests" \
+			--skip="git.2 git.5" <<-\EOF &&
 		for i in 1 2 3 4 5 6
 		do
-			test_expect_success \"passing test #\$i\" 'true'
+			test_expect_success "passing test #$i" "true"
 		done
 		test_done
 		EOF
-		check_sub_test_lib_test git-skip-tests-several <<-\\EOF
+		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 - passing test #3
@@ -365,20 +382,20 @@ test_expect_success 'GIT_SKIP_TESTS several tests' "
 		> 1..6
 		EOF
 	)
-"
+'
 
-test_expect_success 'GIT_SKIP_TESTS sh pattern' "
+test_expect_success 'GIT_SKIP_TESTS sh pattern' '
 	(
-		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 &&
+			"GIT_SKIP_TESTS sh pattern" \
+			--skip="git.[2-5]" <<-\EOF &&
 		for i in 1 2 3 4 5 6
 		do
-			test_expect_success \"passing test #\$i\" 'true'
+			test_expect_success "passing test #$i" "true"
 		done
 		test_done
 		EOF
-		check_sub_test_lib_test git-skip-tests-sh-pattern <<-\\EOF
+		check_sub_test_lib_test git-skip-tests-sh-pattern <<-\EOF
 		> ok 1 - passing test #1
 		> ok 2 # skip passing test #2 (GIT_SKIP_TESTS)
 		> ok 3 # skip passing test #3 (GIT_SKIP_TESTS)
@@ -389,37 +406,37 @@ test_expect_success 'GIT_SKIP_TESTS sh pattern' "
 		> 1..6
 		EOF
 	)
-"
+'
 
-test_expect_success 'GIT_SKIP_TESTS entire suite' "
+test_expect_success 'GIT_SKIP_TESTS entire suite' '
 	(
-		GIT_SKIP_TESTS='git' && export GIT_SKIP_TESTS &&
 		run_sub_test_lib_test git-skip-tests-entire-suite \
-			'GIT_SKIP_TESTS entire suite' <<-\\EOF &&
+			"GIT_SKIP_TESTS entire suite" \
+			--skip="git" <<-\EOF &&
 		for i in 1 2 3
 		do
-			test_expect_success \"passing test #\$i\" 'true'
+			test_expect_success "passing test #$i" "true"
 		done
 		test_done
 		EOF
-		check_sub_test_lib_test git-skip-tests-entire-suite <<-\\EOF
+		check_sub_test_lib_test git-skip-tests-entire-suite <<-\EOF
 		> 1..0 # SKIP skip all tests in git
 		EOF
 	)
-"
+'
 
-test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' "
+test_expect_success '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 &&
+			"GIT_SKIP_TESTS does not skip unmatched suite" \
+			--skip="notgit" <<-\EOF &&
 		for i in 1 2 3
 		do
-			test_expect_success \"passing test #\$i\" 'true'
+			test_expect_success "passing test #$i" "true"
 		done
 		test_done
 		EOF
-		check_sub_test_lib_test git-skip-tests-unmatched-suite <<-\\EOF
+		check_sub_test_lib_test git-skip-tests-unmatched-suite <<-\EOF
 		> ok 1 - passing test #1
 		> ok 2 - passing test #2
 		> ok 3 - passing test #3
@@ -427,18 +444,18 @@ test_expect_success 'GIT_SKIP_TESTS does not skip unmatched suite' "
 		> 1..3
 		EOF
 	)
-"
+'
 
-test_expect_success '--run basic' "
+test_expect_success '--run basic' '
 	run_sub_test_lib_test run-basic \
-		'--run basic' --run='1 3 5' <<-\\EOF &&
+		"--run basic" --run="1,3,5" <<-\EOF &&
 	for i in 1 2 3 4 5 6
 	do
-		test_expect_success \"passing test #\$i\" 'true'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-basic <<-\\EOF
+	check_sub_test_lib_test run-basic <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 # skip passing test #2 (--run)
 	> ok 3 - passing test #3
@@ -448,18 +465,18 @@ test_expect_success '--run basic' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run with a range' "
+test_expect_success '--run with a range' '
 	run_sub_test_lib_test run-range \
-		'--run with a range' --run='1-3' <<-\\EOF &&
+		"--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'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-range <<-\\EOF
+	check_sub_test_lib_test run-range <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 - passing test #3
@@ -469,18 +486,18 @@ test_expect_success '--run with a range' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run with two ranges' "
+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 &&
+		"--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'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-two-ranges <<-\\EOF
+	check_sub_test_lib_test run-two-ranges <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -490,18 +507,18 @@ test_expect_success '--run with two ranges' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run with a left open range' "
+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 &&
+		"--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'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-left-open-range <<-\\EOF
+	check_sub_test_lib_test run-left-open-range <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 - passing test #3
@@ -511,18 +528,18 @@ test_expect_success '--run with a left open range' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run with a right open range' "
+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 &&
+		"--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'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-right-open-range <<-\\EOF
+	check_sub_test_lib_test run-right-open-range <<-\EOF
 	> ok 1 # skip passing test #1 (--run)
 	> ok 2 # skip passing test #2 (--run)
 	> ok 3 # skip passing test #3 (--run)
@@ -532,18 +549,18 @@ test_expect_success '--run with a right open range' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run with basic negation' "
+test_expect_success '--run with basic negation' '
 	run_sub_test_lib_test run-basic-neg \
-		'--run with basic negation' --run='"'!3'"' <<-\\EOF &&
+		"--run with basic negation" --run="!3" <<-\EOF &&
 	for i in 1 2 3 4 5 6
 	do
-		test_expect_success \"passing test #\$i\" 'true'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-basic-neg <<-\\EOF
+	check_sub_test_lib_test run-basic-neg <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -553,18 +570,18 @@ test_expect_success '--run with basic negation' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run with two negations' "
+test_expect_success '--run with two negations' '
 	run_sub_test_lib_test run-two-neg \
-		'--run with two negations' --run='"'!3 !6'"' <<-\\EOF &&
+		"--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'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-two-neg <<-\\EOF
+	check_sub_test_lib_test run-two-neg <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -574,18 +591,18 @@ test_expect_success '--run with two negations' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run a range and negation' "
+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 &&
+		"--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'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-range-and-neg <<-\\EOF
+	check_sub_test_lib_test run-range-and-neg <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 # skip passing test #2 (--run)
 	> ok 3 - passing test #3
@@ -595,18 +612,18 @@ test_expect_success '--run a range and negation' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run range negation' "
+test_expect_success '--run range negation' '
 	run_sub_test_lib_test run-range-neg \
-		'--run range negation' --run='"'!1-3'"' <<-\\EOF &&
+		"--run range negation" --run="!1-3" <<-\EOF &&
 	for i in 1 2 3 4 5 6
 	do
-		test_expect_success \"passing test #\$i\" 'true'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-range-neg <<-\\EOF
+	check_sub_test_lib_test run-range-neg <<-\EOF
 	> ok 1 # skip passing test #1 (--run)
 	> ok 2 # skip passing test #2 (--run)
 	> ok 3 # skip passing test #3 (--run)
@@ -616,19 +633,19 @@ test_expect_success '--run range negation' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run include, exclude and include' "
+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 &&
+		"--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'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-inc-neg-inc <<-\\EOF
+	check_sub_test_lib_test run-inc-neg-inc <<-\EOF
 	> ok 1 # skip passing test #1 (--run)
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -638,19 +655,19 @@ test_expect_success '--run include, exclude and include' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run include, exclude and include, comma separated' "
+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 &&
+		"--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'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-inc-neg-inc-comma <<-\\EOF
+	check_sub_test_lib_test run-inc-neg-inc-comma <<-\EOF
 	> ok 1 # skip passing test #1 (--run)
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -660,19 +677,19 @@ test_expect_success '--run include, exclude and include, comma separated' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run exclude and include' "
+test_expect_success '--run exclude and include' '
 	run_sub_test_lib_test run-neg-inc \
-		'--run exclude and include' \
-		--run='"'!3- 5'"' <<-\\EOF &&
+		"--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'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-neg-inc <<-\\EOF
+	check_sub_test_lib_test run-neg-inc <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 - passing test #2
 	> ok 3 # skip passing test #3 (--run)
@@ -682,19 +699,19 @@ test_expect_success '--run exclude and include' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run empty selectors' "
+test_expect_success '--run empty selectors' '
 	run_sub_test_lib_test run-empty-sel \
-		'--run empty selectors' \
-		--run='1,,3,,,5' <<-\\EOF &&
+		"--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'
+		test_expect_success "passing test #$i" "true"
 	done
 	test_done
 	EOF
-	check_sub_test_lib_test run-empty-sel <<-\\EOF
+	check_sub_test_lib_test run-empty-sel <<-\EOF
 	> ok 1 - passing test #1
 	> ok 2 # skip passing test #2 (--run)
 	> ok 3 - passing test #3
@@ -704,148 +721,189 @@ test_expect_success '--run empty selectors' "
 	> # passed all 6 test(s)
 	> 1..6
 	EOF
-"
+'
 
-test_expect_success '--run invalid range start' "
+test_expect_success '--run substring selector' '
+	run_sub_test_lib_test run-substring-selector \
+		"--run empty selectors" \
+		--run="relevant" <<-\EOF &&
+	test_expect_success "relevant test" "true"
+	for i in 1 2 3 4 5 6
+	do
+		test_expect_success "other test #$i" "true"
+	done
+	test_done
+	EOF
+	check_sub_test_lib_test run-substring-selector <<-\EOF
+	> ok 1 - relevant test
+	> ok 2 # skip other test #1 (--run)
+	> ok 3 # skip other test #2 (--run)
+	> ok 4 # skip other test #3 (--run)
+	> ok 5 # skip other test #4 (--run)
+	> ok 6 # skip other test #5 (--run)
+	> ok 7 # skip other test #6 (--run)
+	> # passed all 7 test(s)
+	> 1..7
+	EOF
+'
+
+test_expect_success '--run keyword selection' '
 	run_sub_test_lib_test_err run-inv-range-start \
-		'--run invalid range start' \
-		--run='a-5' <<-\\EOF &&
-	test_expect_success \"passing test #1\" 'true'
+		"--run invalid range start" \
+		--run="a-5" <<-\EOF &&
+	test_expect_success "passing test #1" "true"
 	test_done
 	EOF
 	check_sub_test_lib_test_err run-inv-range-start \
-		<<-\\EOF_OUT 3<<-\\EOF_ERR
+		<<-\EOF_OUT 3<<-EOF_ERR
 	> FATAL: Unexpected exit with code 1
 	EOF_OUT
-	> error: --run: invalid non-numeric in range start: 'a-5'
+	> error: --run: invalid non-numeric in range start: ${SQ}a-5${SQ}
 	EOF_ERR
-"
+'
 
-test_expect_success '--run invalid range end' "
+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'
+		"--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 \
-		<<-\\EOF_OUT 3<<-\\EOF_ERR
+		<<-\EOF_OUT 3<<-EOF_ERR
 	> FATAL: Unexpected exit with code 1
 	EOF_OUT
-	> error: --run: invalid non-numeric in range end: '1-z'
+	> error: --run: invalid non-numeric in range end: ${SQ}1-z${SQ}
 	EOF_ERR
-"
+'
+
+test_expect_success 'tests respect prerequisites' '
+	run_sub_test_lib_test prereqs "tests respect prereqs" <<-\EOF &&
+
+	test_set_prereq HAVEIT
+	test_expect_success HAVEIT "prereq is satisfied" "true"
+	test_expect_success "have_prereq works" "
+		test_have_prereq HAVEIT
+	"
+	test_expect_success DONTHAVEIT "prereq not satisfied" "false"
+
+	test_set_prereq HAVETHIS
+	test_expect_success HAVETHIS,HAVEIT "multiple prereqs" "true"
+	test_expect_success HAVEIT,DONTHAVEIT "mixed prereqs (yes,no)" "false"
+	test_expect_success DONTHAVEIT,HAVEIT "mixed prereqs (no,yes)" "false"
 
-test_expect_success '--run invalid selector' "
-	run_sub_test_lib_test_err run-inv-selector \
-		'--run invalid selector' \
-		--run='1?' <<-\\EOF &&
-	test_expect_success \"passing test #1\" 'true'
 	test_done
 	EOF
-	check_sub_test_lib_test_err run-inv-selector \
-		<<-\\EOF_OUT 3<<-\\EOF_ERR
-	> FATAL: Unexpected exit with code 1
-	EOF_OUT
-	> error: --run: invalid non-numeric in test selector: '1?'
-	EOF_ERR
-"
-
-
-test_set_prereq HAVEIT
-haveit=no
-test_expect_success HAVEIT 'test runs if prerequisite is satisfied' '
-	test_have_prereq HAVEIT &&
-	haveit=yes
-'
-donthaveit=yes
-test_expect_success DONTHAVEIT 'unmet prerequisite causes test to be skipped' '
-	donthaveit=no
-'
-if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit != yesyes
-then
-	say "bug in test framework: prerequisite tags do not work reliably"
-	exit 1
-fi
-
-test_set_prereq HAVETHIS
-haveit=no
-test_expect_success HAVETHIS,HAVEIT 'test runs if prerequisites are satisfied' '
-	test_have_prereq HAVEIT &&
-	test_have_prereq HAVETHIS &&
-	haveit=yes
-'
-donthaveit=yes
-test_expect_success HAVEIT,DONTHAVEIT 'unmet prerequisites causes test to be skipped' '
-	donthaveit=no
-'
-donthaveiteither=yes
-test_expect_success DONTHAVEIT,HAVEIT 'unmet prerequisites causes test to be skipped' '
-	donthaveiteither=no
-'
-if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $haveit$donthaveit$donthaveiteither != yesyesyes
-then
-	say "bug in test framework: multiple prerequisite tags do not work reliably"
-	exit 1
-fi
-
-test_lazy_prereq LAZY_TRUE true
-havetrue=no
-test_expect_success LAZY_TRUE 'test runs if lazy prereq is satisfied' '
-	havetrue=yes
-'
-donthavetrue=yes
-test_expect_success !LAZY_TRUE 'missing lazy prereqs skip tests' '
-	donthavetrue=no
-'
-
-if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a "$havetrue$donthavetrue" != yesyes
-then
-	say 'bug in test framework: lazy prerequisites do not work'
-	exit 1
-fi
-
-test_lazy_prereq LAZY_FALSE false
-nothavefalse=no
-test_expect_success !LAZY_FALSE 'negative lazy prereqs checked' '
-	nothavefalse=yes
-'
-havefalse=yes
-test_expect_success LAZY_FALSE 'missing negative lazy prereqs will skip' '
-	havefalse=no
-'
-
-if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a "$nothavefalse$havefalse" != yesyes
-then
-	say 'bug in test framework: negative lazy prerequisites do not work'
-	exit 1
-fi
-
-clean=no
-test_expect_success 'tests clean up after themselves' '
-	test_when_finished clean=yes
+
+	check_sub_test_lib_test prereqs <<-\EOF
+	ok 1 - prereq is satisfied
+	ok 2 - have_prereq works
+	ok 3 # skip prereq not satisfied (missing DONTHAVEIT)
+	ok 4 - multiple prereqs
+	ok 5 # skip mixed prereqs (yes,no) (missing DONTHAVEIT of HAVEIT,DONTHAVEIT)
+	ok 6 # skip mixed prereqs (no,yes) (missing DONTHAVEIT of DONTHAVEIT,HAVEIT)
+	# passed all 6 test(s)
+	1..6
+	EOF
 '
 
-if test -z "$GIT_TEST_FAIL_PREREQS_INTERNAL" -a $clean != yes
-then
-	say "bug in test framework: basic cleanup command does not work reliably"
-	exit 1
-fi
+test_expect_success 'tests respect lazy prerequisites' '
+	run_sub_test_lib_test lazy-prereqs "respect lazy prereqs" <<-\EOF &&
+
+	test_lazy_prereq LAZY_TRUE true
+	test_expect_success LAZY_TRUE "lazy prereq is satisifed" "true"
+	test_expect_success !LAZY_TRUE "negative lazy prereq" "false"
+
+	test_lazy_prereq LAZY_FALSE false
+	test_expect_success LAZY_FALSE "lazy prereq not satisfied" "false"
+	test_expect_success !LAZY_FALSE "negative false prereq" "true"
+
+	test_done
+	EOF
+
+	check_sub_test_lib_test lazy-prereqs <<-\EOF
+	ok 1 - lazy prereq is satisifed
+	ok 2 # skip negative lazy prereq (missing !LAZY_TRUE)
+	ok 3 # skip lazy prereq not satisfied (missing LAZY_FALSE)
+	ok 4 - negative false prereq
+	# passed all 4 test(s)
+	1..4
+	EOF
+'
+
+test_expect_success 'nested lazy prerequisites' '
+	run_sub_test_lib_test nested-lazy "nested lazy prereqs" <<-\EOF &&
+
+	test_lazy_prereq NESTED_INNER "
+		>inner &&
+		rm -f outer
+	"
+	test_lazy_prereq NESTED_PREREQ "
+		>outer &&
+		test_have_prereq NESTED_INNER &&
+		echo can create new file in cwd >file &&
+		test_path_is_file outer &&
+		test_path_is_missing inner
+	"
+	test_expect_success NESTED_PREREQ "evaluate nested prereq" "true"
+
+	test_done
+	EOF
 
-test_expect_success 'tests clean up even on failures' "
-	test_must_fail run_sub_test_lib_test \
-		failing-cleanup 'Failing tests with cleanup commands' <<-\\EOF &&
-	test_expect_success 'tests clean up even after a failure' '
+	check_sub_test_lib_test nested-lazy <<-\EOF
+	ok 1 - evaluate nested prereq
+	# passed all 1 test(s)
+	1..1
+	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_lazy_prereq LAZY true
+
+	test_expect_success lazy "test_have_prereq LAZY && echo trace"
+
+	test_done
+	EOF
+
+	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 &&
+	clean=no
+	test_expect_success "do cleanup" "
+		test_when_finished clean=yes
+	"
+	test_expect_success "cleanup happened" "
+		test $clean = yes
+	"
+	test_done
+	EOF
+
+	check_sub_test_lib_test cleanup <<-\EOF
+	ok 1 - do cleanup
+	ok 2 - cleanup happened
+	# passed all 2 test(s)
+	1..2
+	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 "tests clean up even after a failure" "
 		touch clean-after-failure &&
 		test_when_finished rm clean-after-failure &&
 		(exit 1)
-	'
-	test_expect_success 'failure to clean up causes the test to fail' '
+	"
+	test_expect_success "failure to clean up causes the test to fail" "
 		test_when_finished \"(exit 2)\"
-	'
+	"
 	test_done
 	EOF
-	check_sub_test_lib_test failing-cleanup <<-\\EOF
+	check_sub_test_lib_test failing-cleanup <<-\EOF
 	> not ok 1 - tests clean up even after a failure
 	> #	Z
 	> #	touch clean-after-failure &&
@@ -854,33 +912,29 @@ test_expect_success 'tests clean up even on failures' "
 	> #	Z
 	> not ok 2 - failure to clean up causes the test to fail
 	> #	Z
-	> #	test_when_finished \"(exit 2)\"
+	> #	test_when_finished "(exit 2)"
 	> #	Z
 	> # failed 2 among 2 test(s)
 	> 1..2
 	EOF
-"
+'
 
-test_expect_success 'test_atexit is run' "
-	test_must_fail run_sub_test_lib_test \
-		atexit-cleanup 'Run atexit commands' -i <<-\\EOF &&
-	test_expect_success 'tests clean up even after a failure' '
+test_expect_success 'test_atexit is run' '
+	run_sub_test_lib_test_err \
+		atexit-cleanup "Run atexit commands" -i <<-\EOF &&
+	test_expect_success "tests clean up even after a failure" "
 		> ../../clean-atexit &&
 		test_atexit rm ../../clean-atexit &&
 		> ../../also-clean-atexit &&
 		test_atexit rm ../../also-clean-atexit &&
 		> ../../dont-clean-atexit &&
 		(exit 1)
-	'
+	"
 	test_done
 	EOF
 	test_path_is_file dont-clean-atexit &&
 	test_path_is_missing clean-atexit &&
 	test_path_is_missing also-clean-atexit
-"
-
-test_expect_success 'test_oid setup' '
-	test_oid_init
 '
 
 test_expect_success 'test_oid provides sane info by default' '
@@ -916,6 +970,51 @@ test_expect_success 'test_oid can look up data for SHA-256' '
 	test "$hexsz" -eq 64
 '
 
+test_expect_success 'test_oid can look up data for a specified algorithm' '
+	rawsz="$(test_oid --hash=sha1 rawsz)" &&
+	hexsz="$(test_oid --hash=sha1 hexsz)" &&
+	test "$rawsz" -eq 20 &&
+	test "$hexsz" -eq 40 &&
+	rawsz="$(test_oid --hash=sha256 rawsz)" &&
+	hexsz="$(test_oid --hash=sha256 hexsz)" &&
+	test "$rawsz" -eq 32 &&
+	test "$hexsz" -eq 64
+'
+
+test_expect_success 'test_bool_env' '
+	(
+		sane_unset envvar &&
+
+		test_bool_env envvar true &&
+		! test_bool_env envvar false &&
+
+		envvar= &&
+		export envvar &&
+		! test_bool_env envvar true &&
+		! test_bool_env envvar false &&
+
+		envvar=true &&
+		test_bool_env envvar true &&
+		test_bool_env envvar false &&
+
+		envvar=false &&
+		! test_bool_env envvar true &&
+		! test_bool_env envvar false &&
+
+		envvar=invalid &&
+		# When encountering an invalid bool value, test_bool_env
+		# prints its error message to the original stderr of the
+		# test script, hence the redirection of fd 7, and aborts
+		# with "exit 1", hence the subshell.
+		! ( test_bool_env envvar true ) 7>err &&
+		grep "error: test_bool_env requires bool values" err &&
+
+		envvar=true &&
+		! ( test_bool_env envvar invalid ) 7>err &&
+		grep "error: test_bool_env requires bool values" err
+	)
+'
+
 ################################################################
 # Basics of the basics
 
@@ -1138,7 +1237,7 @@ test_expect_success 'writing this tree with --missing-ok' '
 test_expect_success 'git read-tree followed by write-tree should be idempotent' '
 	rm -f .git/index &&
 	git read-tree $tree &&
-	test -f .git/index &&
+	test_path_is_file .git/index &&
 	newtree=$(git write-tree) &&
 	test "$newtree" = "$tree"
 '
@@ -1225,4 +1324,22 @@ test_expect_success 'very long name in the index handled sanely' '
 	test $len = 4098
 '
 
+test_expect_success 'test_must_fail on a failing git command' '
+	test_must_fail git notacommand
+'
+
+test_expect_success 'test_must_fail on a failing git command with env' '
+	test_must_fail env var1=a var2=b git notacommand
+'
+
+test_expect_success 'test_must_fail rejects a non-git command' '
+	! test_must_fail grep ^$ notafile 2>err &&
+	grep -F "test_must_fail: only '"'"'git'"'"' is allowed" err
+'
+
+test_expect_success 'test_must_fail rejects a non-git command with env' '
+	! test_must_fail env var1=a var2=b grep ^$ notafile 2>err &&
+	grep -F "test_must_fail: only '"'"'git'"'"' is allowed" err
+'
+
 test_done
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 26f8206326..df544bb321 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -163,7 +163,7 @@ test_expect_success 'reinit' '
 	(
 		mkdir again &&
 		cd again &&
-		git init >out1 2>err1 &&
+		git -c init.defaultBranch=initial init >out1 2>err1 &&
 		git init >out2 2>err2
 	) &&
 	test_i18ngrep "Initialized empty" again/out1 &&
@@ -186,21 +186,33 @@ test_expect_success 'init with --template (blank)' '
 	test_path_is_missing template-blank/.git/info/exclude
 '
 
-test_expect_success 'init with init.templatedir set' '
-	mkdir templatedir-source &&
-	echo Content >templatedir-source/file &&
-	test_config_global init.templatedir "${HOME}/templatedir-source" &&
+init_no_templatedir_env () {
 	(
-		mkdir templatedir-set &&
-		cd templatedir-set &&
 		sane_unset GIT_TEMPLATE_DIR &&
 		NO_SET_GIT_TEMPLATE_DIR=t &&
 		export NO_SET_GIT_TEMPLATE_DIR &&
-		git init
-	) &&
+		git init "$1"
+	)
+}
+
+test_expect_success 'init with init.templatedir set' '
+	mkdir templatedir-source &&
+	echo Content >templatedir-source/file &&
+	test_config_global init.templatedir "${HOME}/templatedir-source" &&
+
+	init_no_templatedir_env templatedir-set &&
 	test_cmp templatedir-source/file templatedir-set/.git/file
 '
 
+test_expect_success 'init with init.templatedir using ~ expansion' '
+	mkdir -p templatedir-source &&
+	echo Content >templatedir-source/file &&
+	test_config_global init.templatedir "~/templatedir-source" &&
+
+	init_no_templatedir_env templatedir-expansion &&
+	test_cmp templatedir-source/file templatedir-expansion/.git/file
+'
+
 test_expect_success 'init --bare/--shared overrides system/global config' '
 	test_config_global core.bare false &&
 	test_config_global core.sharedRepository 0640 &&
@@ -316,13 +328,38 @@ test_expect_success 'init with separate gitdir' '
 	test_path_is_dir realgitdir/refs
 '
 
+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_expect_success 'implicit bare & --separate-git-dir incompatible' '
+	test_when_finished "rm -rf bare.git" &&
+	mkdir -p bare.git &&
+	test_must_fail env GIT_DIR=. \
+		git -C bare.git init --separate-git-dir goop.git 2>err &&
+	test_i18ngrep "incompatible" err
+'
+
+test_expect_success 'bare & --separate-git-dir incompatible within worktree' '
+	test_when_finished "rm -rf bare.git linkwt seprepo" &&
+	test_commit gumby &&
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add --detach ../linkwt &&
+	test_must_fail git -C linkwt init --separate-git-dir seprepo 2>err &&
+	test_i18ngrep "incompatible" err
+'
+
 test_lazy_prereq GETCWD_IGNORES_PERMS '
 	base=GETCWD_TEST_BASE_DIR &&
 	mkdir -p $base/dir &&
 	chmod 100 $base ||
 	BUG "cannot prepare $base"
 
-	(cd $base/dir && /bin/pwd -P)
+	(
+		cd $base/dir &&
+		test-tool getcwd
+	)
 	status=$?
 
 	chmod 700 $base &&
@@ -392,13 +429,25 @@ test_expect_success SYMLINKS 're-init to move gitdir symlink' '
 	test_path_is_dir realgitdir/refs
 '
 
-# Tests for the hidden file attribute on windows
-is_hidden () {
-	# Use the output of `attrib`, ignore the absolute path
-	case "$(attrib "$1")" in *H*?:*) return 0;; esac
-	return 1
+sep_git_dir_worktree ()  {
+	test_when_finished "rm -rf mainwt linkwt seprepo" &&
+	git init mainwt &&
+	test_commit -C mainwt gumby &&
+	git -C mainwt worktree add --detach ../linkwt &&
+	git -C "$1" init --separate-git-dir ../seprepo &&
+	git -C mainwt rev-parse --git-common-dir >expect &&
+	git -C linkwt rev-parse --git-common-dir >actual &&
+	test_cmp expect actual
 }
 
+test_expect_success 're-init to move gitdir with linked worktrees' '
+	sep_git_dir_worktree mainwt
+'
+
+test_expect_success 're-init to move gitdir within linked worktree' '
+	sep_git_dir_worktree linkwt
+'
+
 test_expect_success MINGW '.git hidden' '
 	rm -rf newdir &&
 	(
@@ -406,7 +455,7 @@ test_expect_success MINGW '.git hidden' '
 		mkdir newdir &&
 		cd newdir &&
 		git init &&
-		is_hidden .git
+		test_path_is_hidden .git
 	) &&
 	check_config newdir/.git false unset
 '
@@ -448,6 +497,39 @@ test_expect_success 're-init from a linked worktree' '
 	)
 '
 
+test_expect_success 'init honors GIT_DEFAULT_HASH' '
+	GIT_DEFAULT_HASH=sha1 git init sha1 &&
+	git -C sha1 rev-parse --show-object-format >actual &&
+	echo sha1 >expected &&
+	test_cmp expected actual &&
+	GIT_DEFAULT_HASH=sha256 git init sha256 &&
+	git -C sha256 rev-parse --show-object-format >actual &&
+	echo sha256 >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'init honors --object-format' '
+	git init --object-format=sha1 explicit-sha1 &&
+	git -C explicit-sha1 rev-parse --show-object-format >actual &&
+	echo sha1 >expected &&
+	test_cmp expected actual &&
+	git init --object-format=sha256 explicit-sha256 &&
+	git -C explicit-sha256 rev-parse --show-object-format >actual &&
+	echo sha256 >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'extensions.objectFormat is not allowed with repo version 0' '
+	git init --object-format=sha256 explicit-v0 &&
+	git -C explicit-v0 config core.repositoryformatversion 0 &&
+	test_must_fail git -C explicit-v0 rev-parse --show-object-format
+'
+
+test_expect_success 'init rejects attempts to initialize with different hash' '
+	test_must_fail git -C sha1 init --object-format=sha256 &&
+	test_must_fail git -C sha256 init --object-format=sha1
+'
+
 test_expect_success MINGW 'core.hidedotfiles = false' '
 	git config --global core.hidedotfiles false &&
 	rm -rf newdir &&
@@ -471,4 +553,52 @@ test_expect_success MINGW 'redirect std handles' '
 	grep "Needed a single revision" output.txt
 '
 
+test_expect_success '--initial-branch' '
+	git init --initial-branch=hello initial-branch-option &&
+	git -C initial-branch-option symbolic-ref HEAD >actual &&
+	echo refs/heads/hello >expect &&
+	test_cmp expect actual &&
+
+	: re-initializing should not change the branch name &&
+	git init --initial-branch=ignore initial-branch-option 2>err &&
+	test_i18ngrep "ignored --initial-branch" err &&
+	git -C initial-branch-option symbolic-ref HEAD >actual &&
+	grep hello actual
+'
+
+test_expect_success 'overridden default initial branch name (config)' '
+	test_config_global init.defaultBranch nmb &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git init initial-branch-config &&
+	git -C initial-branch-config symbolic-ref HEAD >actual &&
+	grep nmb actual
+'
+
+test_expect_success 'advice on unconfigured init.defaultBranch' '
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= git -c color.advice=always \
+		init unconfigured-default-branch-name 2>err &&
+	test_decode_color <err >decoded &&
+	test_i18ngrep "<YELLOW>hint: " decoded
+'
+
+test_expect_success 'overridden default main branch name (env)' '
+	test_config_global init.defaultBranch nmb &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=env git init main-branch-env &&
+	git -C main-branch-env symbolic-ref HEAD >actual &&
+	grep env actual
+'
+
+test_expect_success 'invalid default branch name' '
+	test_must_fail env GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME="with space" \
+		git init initial-branch-invalid 2>err &&
+	test_i18ngrep "invalid branch name" err
+'
+
+test_expect_success 'branch -m with the initial branch' '
+	git init rename-initial &&
+	git -C rename-initial branch -m renamed &&
+	test renamed = $(git -C rename-initial symbolic-ref --short HEAD) &&
+	git -C rename-initial branch -m renamed again &&
+	test again = $(git -C rename-initial symbolic-ref --short HEAD)
+'
+
 test_done
diff --git a/t/t0002-gitfile.sh b/t/t0002-gitfile.sh
index 0aa9908ea1..8440e6add1 100755
--- a/t/t0002-gitfile.sh
+++ b/t/t0002-gitfile.sh
@@ -4,6 +4,9 @@ test_description='.git file
 
 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-lib.sh
 
 objpath() {
@@ -62,7 +65,7 @@ test_expect_success 'check commit-tree' '
 '
 
 test_expect_success 'check rev-list' '
-	echo $SHA >"$REAL/HEAD" &&
+	git update-ref "HEAD" "$SHA" &&
 	test "$SHA" = "$(git rev-list HEAD)"
 '
 
@@ -96,7 +99,7 @@ test_expect_success 'enter_repo non-strict mode' '
 	git ls-remote enter_repo >actual &&
 	cat >expected <<-EOF &&
 	$head	HEAD
-	$head	refs/heads/master
+	$head	refs/heads/main
 	$head	refs/tags/foo
 	EOF
 	test_cmp expected actual
@@ -111,7 +114,7 @@ test_expect_success 'enter_repo linked checkout' '
 	git ls-remote foo >actual &&
 	cat >expected <<-EOF &&
 	$head	HEAD
-	$head	refs/heads/master
+	$head	refs/heads/main
 	$head	refs/tags/foo
 	EOF
 	test_cmp expected actual
@@ -122,7 +125,7 @@ test_expect_success 'enter_repo strict mode' '
 	git ls-remote --upload-pack="git upload-pack --strict" foo/.git >actual &&
 	cat >expected <<-EOF &&
 	$head	HEAD
-	$head	refs/heads/master
+	$head	refs/heads/main
 	$head	refs/tags/foo
 	EOF
 	test_cmp expected actual
diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index 71e63d8b50..1e4c672b84 100755
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -4,20 +4,21 @@ test_description=gitattributes
 
 . ./test-lib.sh
 
-attr_check () {
-	path="$1" expect="$2"
+attr_check_basic () {
+	path="$1" expect="$2" git_opts="$3" &&
 
-	git $3 check-attr test -- "$path" >actual 2>err &&
-	echo "$path: test: $2" >expect &&
-	test_cmp expect actual &&
-	test_line_count = 0 err
+	git $git_opts check-attr test -- "$path" >actual 2>err &&
+	echo "$path: test: $expect" >expect &&
+	test_cmp expect actual
 }
 
-attr_check_quote () {
+attr_check () {
+	attr_check_basic "$@" &&
+	test_must_be_empty err
+}
 
-	path="$1"
-	quoted_path="$2"
-	expect="$3"
+attr_check_quote () {
+	path="$1" quoted_path="$2" expect="$3" &&
 
 	git check-attr test -- "$path" >actual &&
 	echo "\"$quoted_path\": test: $expect" >expect &&
@@ -27,7 +28,7 @@ attr_check_quote () {
 
 test_expect_success 'open-quoted pathname' '
 	echo "\"a test=a" >.gitattributes &&
-	test_must_fail attr_check a a
+	attr_check a unspecified
 '
 
 
@@ -112,20 +113,20 @@ test_expect_success 'attribute test' '
 
 test_expect_success 'attribute matching is case sensitive when core.ignorecase=0' '
 
-	test_must_fail attr_check F f "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/F f "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/c/F f "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/G a/g "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/B/g a/b/g "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/b/G a/b/g "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/b/H a/b/h "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/b/D/g "a/b/d/*" "-c core.ignorecase=0" &&
-	test_must_fail attr_check oNoFf unset "-c core.ignorecase=0" &&
-	test_must_fail attr_check oFfOn set "-c core.ignorecase=0" &&
+	attr_check F unspecified "-c core.ignorecase=0" &&
+	attr_check a/F unspecified "-c core.ignorecase=0" &&
+	attr_check a/c/F unspecified "-c core.ignorecase=0" &&
+	attr_check a/G unspecified "-c core.ignorecase=0" &&
+	attr_check a/B/g a/g "-c core.ignorecase=0" &&
+	attr_check a/b/G unspecified "-c core.ignorecase=0" &&
+	attr_check a/b/H unspecified "-c core.ignorecase=0" &&
+	attr_check a/b/D/g a/g "-c core.ignorecase=0" &&
+	attr_check oNoFf unspecified "-c core.ignorecase=0" &&
+	attr_check oFfOn unspecified "-c core.ignorecase=0" &&
 	attr_check NO unspecified "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/b/D/NO "a/b/d/*" "-c core.ignorecase=0" &&
+	attr_check a/b/D/NO unspecified "-c core.ignorecase=0" &&
 	attr_check a/b/d/YES a/b/d/* "-c core.ignorecase=0" &&
-	test_must_fail attr_check a/E/f "A/e/F" "-c core.ignorecase=0"
+	attr_check a/E/f f "-c core.ignorecase=0"
 
 '
 
@@ -149,8 +150,8 @@ test_expect_success 'attribute matching is case insensitive when core.ignorecase
 '
 
 test_expect_success CASE_INSENSITIVE_FS 'additional case insensitivity tests' '
-	test_must_fail attr_check a/B/D/g "a/b/d/*" "-c core.ignorecase=0" &&
-	test_must_fail attr_check A/B/D/NO "a/b/d/*" "-c core.ignorecase=0" &&
+	attr_check a/B/D/g a/g "-c core.ignorecase=0" &&
+	attr_check A/B/D/NO unspecified "-c core.ignorecase=0" &&
 	attr_check A/b/h a/b/h "-c core.ignorecase=1" &&
 	attr_check a/B/D/g "a/b/d/*" "-c core.ignorecase=1" &&
 	attr_check A/B/D/NO "a/b/d/*" "-c core.ignorecase=1"
@@ -244,7 +245,7 @@ EOF
 	git check-attr foo -- "a/b/f" >>actual 2>>err &&
 	git check-attr foo -- "a/b/c/f" >>actual 2>>err &&
 	test_cmp expect actual &&
-	test_line_count = 0 err
+	test_must_be_empty err
 '
 
 test_expect_success '"**" with no slashes test' '
@@ -265,7 +266,7 @@ EOF
 	git check-attr foo -- "a/b/f" >>actual 2>>err &&
 	git check-attr foo -- "a/b/c/f" >>actual 2>>err &&
 	test_cmp expect actual &&
-	test_line_count = 0 err
+	test_must_be_empty err
 '
 
 test_expect_success 'using --git-dir and --work-tree' '
@@ -334,7 +335,6 @@ test_expect_success 'binary macro expanded by -a' '
 	test_cmp expect actual
 '
 
-
 test_expect_success 'query binary macro directly' '
 	echo "file binary" >.gitattributes &&
 	echo file: binary: set >expect &&
@@ -342,4 +342,31 @@ test_expect_success 'query binary macro directly' '
 	test_cmp expect actual
 '
 
+test_expect_success SYMLINKS 'set up symlink tests' '
+	echo "* test" >attr &&
+	rm -f .gitattributes
+'
+
+test_expect_success SYMLINKS 'symlinks respected in core.attributesFile' '
+	test_when_finished "rm symlink" &&
+	ln -s attr symlink &&
+	test_config core.attributesFile "$(pwd)/symlink" &&
+	attr_check file set
+'
+
+test_expect_success SYMLINKS 'symlinks respected in info/attributes' '
+	test_when_finished "rm .git/info/attributes" &&
+	ln -s ../../attr .git/info/attributes &&
+	attr_check file set
+'
+
+test_expect_success SYMLINKS 'symlinks not respected in-tree' '
+	test_when_finished "rm -rf .gitattributes subdir" &&
+	ln -s attr .gitattributes &&
+	mkdir subdir &&
+	ln -s ../attr subdir/.gitattributes &&
+	attr_check_basic subdir/file unspecified &&
+	test_i18ngrep "unable to access.*gitattributes" err
+'
+
 test_done
diff --git a/t/t0006-date.sh b/t/t0006-date.sh
index d9fcc829a9..6b757d7169 100755
--- a/t/t0006-date.sh
+++ b/t/t0006-date.sh
@@ -11,7 +11,7 @@ check_relative() {
 	echo "$t -> $2" >expect
 	test_expect_${3:-success} "relative date ($2)" "
 	test-tool date relative $t >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 	"
 }
 
@@ -81,6 +81,11 @@ check_parse 2008-02 bad
 check_parse 2008-02-14 bad
 check_parse '2008-02-14 20:30:45' '2008-02-14 20:30:45 +0000'
 check_parse '2008-02-14 20:30:45 -0500' '2008-02-14 20:30:45 -0500'
+check_parse '2008.02.14 20:30:45 -0500' '2008-02-14 20:30:45 -0500'
+check_parse '20080214T203045-04:00' '2008-02-14 20:30:45 -0400'
+check_parse '20080214T203045 -04:00' '2008-02-14 20:30:45 -0400'
+check_parse '20080214T203045.019-04:00' '2008-02-14 20:30:45 -0400'
+check_parse '2008-02-14 20:30:45.019-04:00' '2008-02-14 20:30:45 -0400'
 check_parse '2008-02-14 20:30:45 -0015' '2008-02-14 20:30:45 -0015'
 check_parse '2008-02-14 20:30:45 -5' '2008-02-14 20:30:45 +0000'
 check_parse '2008-02-14 20:30:45 -5:' '2008-02-14 20:30:45 +0000'
@@ -103,6 +108,7 @@ check_approxidate 5.seconds.ago '2009-08-30 19:19:55'
 check_approxidate 10.minutes.ago '2009-08-30 19:10:00'
 check_approxidate yesterday '2009-08-29 19:20:00'
 check_approxidate 3.days.ago '2009-08-27 19:20:00'
+check_approxidate '12:34:56.3.days.ago' '2009-08-27 12:34:56'
 check_approxidate 3.weeks.ago '2009-08-09 19:20:00'
 check_approxidate 3.months.ago '2009-05-30 19:20:00'
 check_approxidate 2.years.3.months.ago '2007-05-30 19:20:00'
@@ -133,7 +139,7 @@ check_date_format_human() {
 	echo "$t -> $2" >expect
 	test_expect_success "human date $t" '
 		test-tool date human $t >actual &&
-		test_i18ncmp expect actual
+		test_cmp expect actual
 '
 }
 
diff --git a/t/t0007-git-var.sh b/t/t0007-git-var.sh
index 1f600e2cae..88b9ae8158 100755
--- a/t/t0007-git-var.sh
+++ b/t/t0007-git-var.sh
@@ -17,7 +17,7 @@ test_expect_success 'get GIT_COMMITTER_IDENT' '
 	test_cmp expect actual
 '
 
-test_expect_success !FAIL_PREREQS,!AUTOIDENT 'requested identites are strict' '
+test_expect_success !FAIL_PREREQS,!AUTOIDENT 'requested identities are strict' '
 	(
 		sane_unset GIT_COMMITTER_NAME &&
 		sane_unset GIT_COMMITTER_EMAIL &&
diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh
index 1744cee5e9..a594b4aa7d 100755
--- a/t/t0008-ignores.sh
+++ b/t/t0008-ignores.sh
@@ -34,7 +34,7 @@ expect_from_stdin () {
 test_stderr () {
 	expected="$1"
 	expect_in stderr "$1" &&
-	test_i18ncmp "$HOME/expected-stderr" "$HOME/stderr"
+	test_cmp "$HOME/expected-stderr" "$HOME/stderr"
 }
 
 broken_c_unquote () {
@@ -424,9 +424,24 @@ test_expect_success 'local ignore inside a sub-directory with --verbose' '
 	)
 '
 
-test_expect_success_multi 'nested include' \
-	'a/b/.gitignore:8:!on*	a/b/one' '
-	test_check_ignore "a/b/one"
+test_expect_success 'nested include of negated pattern' '
+	expect "" &&
+	test_check_ignore "a/b/one" 1
+'
+
+test_expect_success 'nested include of negated pattern with -q' '
+	expect "" &&
+	test_check_ignore "-q a/b/one" 1
+'
+
+test_expect_success 'nested include of negated pattern with -v' '
+	expect "a/b/.gitignore:8:!on*	a/b/one" &&
+	test_check_ignore "-v a/b/one" 0
+'
+
+test_expect_success 'nested include of negated pattern with -v -n' '
+	expect "a/b/.gitignore:8:!on*	a/b/one" &&
+	test_check_ignore "-v -n a/b/one" 0
 '
 
 ############################################################################
@@ -460,7 +475,6 @@ test_expect_success 'cd to ignored sub-directory' '
 	expect_from_stdin <<-\EOF &&
 		foo
 		twoooo
-		../one
 		seven
 		../../one
 	EOF
@@ -543,7 +557,6 @@ test_expect_success 'global ignore' '
 		globalthree
 		a/globalthree
 		a/per-repo
-		globaltwo
 	EOF
 	test_check_ignore "globalone per-repo globalthree a/globalthree a/per-repo not-ignored globaltwo"
 '
@@ -586,17 +599,7 @@ EOF
 cat <<-\EOF >expected-default
 	one
 	a/one
-	a/b/on
-	a/b/one
-	a/b/one one
-	a/b/one two
-	"a/b/one\"three"
-	a/b/two
 	a/b/twooo
-	globaltwo
-	a/globaltwo
-	a/b/globaltwo
-	b/globaltwo
 EOF
 cat <<-EOF >expected-verbose
 	.gitignore:1:one	one
@@ -696,8 +699,12 @@ cat <<-EOF >expected-all
 	$global_excludes:2:!globaltwo	../b/globaltwo
 	::	c/not-ignored
 EOF
+cat <<-EOF >expected-default
+../one
+one
+b/twooo
+EOF
 grep -v '^::	' expected-all >expected-verbose
-sed -e 's/.*	//' expected-verbose >expected-default
 
 broken_c_unquote stdin >stdin0
 
@@ -858,4 +865,38 @@ test_expect_success 'info/exclude trumps core.excludesfile' '
 	test_cmp expect actual
 '
 
+test_expect_success SYMLINKS 'set up ignore file for symlink tests' '
+	echo "*" >ignore &&
+	rm -f .gitignore .git/info/exclude
+'
+
+test_expect_success SYMLINKS 'symlinks respected in core.excludesFile' '
+	test_when_finished "rm symlink" &&
+	ln -s ignore symlink &&
+	test_config core.excludesFile "$(pwd)/symlink" &&
+	echo file >expect &&
+	git check-ignore file >actual 2>err &&
+	test_cmp expect actual &&
+	test_must_be_empty err
+'
+
+test_expect_success SYMLINKS 'symlinks respected in info/exclude' '
+	test_when_finished "rm .git/info/exclude" &&
+	ln -s ../../ignore .git/info/exclude &&
+	echo file >expect &&
+	git check-ignore file >actual 2>err &&
+	test_cmp expect actual &&
+	test_must_be_empty err
+'
+
+test_expect_success SYMLINKS 'symlinks not respected in-tree' '
+	test_when_finished "rm .gitignore" &&
+	ln -s ignore .gitignore &&
+	mkdir subdir &&
+	ln -s ignore subdir/.gitignore &&
+	test_must_fail git check-ignore subdir/file >actual 2>err &&
+	test_must_be_empty actual &&
+	test_i18ngrep "unable to access.*gitignore" err
+'
+
 test_done
diff --git a/t/t0012-help.sh b/t/t0012-help.sh
index e8ef7300ec..5679e29c62 100755
--- a/t/t0012-help.sh
+++ b/t/t0012-help.sh
@@ -55,7 +55,7 @@ test_expect_success "--help does not work for guides" "
 		git: 'revisions' is not a git command. See 'git --help'.
 	EOF
 	test_must_fail git revisions --help 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 "
 
 test_expect_success 'git help' '
diff --git a/t/t0014-alias.sh b/t/t0014-alias.sh
index 2694c81afd..8d3d9144c0 100755
--- a/t/t0014-alias.sh
+++ b/t/t0014-alias.sh
@@ -38,8 +38,8 @@ test_expect_success 'looping aliases - internal execution' '
 #'
 
 test_expect_success 'run-command formats empty args properly' '
-    GIT_TRACE=1 git frotz a "" b " " c 2>&1 |
-    sed -ne "/run_command:/s/.*trace: run_command: //p" >actual &&
+    test_must_fail env GIT_TRACE=1 git frotz a "" b " " c 2>actual.raw &&
+    sed -ne "/run_command:/s/.*trace: run_command: //p" actual.raw >actual &&
     echo "git-frotz a '\'''\'' b '\'' '\'' c" >expect &&
     test_cmp expect actual
 '
diff --git a/t/t0017-env-helper.sh b/t/t0017-env-helper.sh
index c1ecf6aeac..4a159f99e4 100755
--- a/t/t0017-env-helper.sh
+++ b/t/t0017-env-helper.sh
@@ -86,14 +86,14 @@ test_expect_success 'env--helper reads config thanks to trace2' '
 	git config -f home/cycle include.path .gitconfig &&
 
 	test_must_fail \
-		env HOME="$(pwd)/home" GIT_TEST_GETTEXT_POISON=false \
+		env HOME="$(pwd)/home" \
 		git config -l 2>err &&
 	grep "exceeded maximum include depth" err &&
 
 	test_must_fail \
-		env HOME="$(pwd)/home" GIT_TEST_GETTEXT_POISON=true \
-		git -C cycle env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON 2>err &&
-	grep "# GETTEXT POISON #" err
+		env HOME="$(pwd)/home" GIT_TEST_ENV_HELPER=true \
+		git -C cycle env--helper --type=bool --default=0 --exit-code GIT_TEST_ENV_HELPER 2>err &&
+	grep "exceeded maximum include depth" err
 '
 
 test_done
diff --git a/t/t0018-advice.sh b/t/t0018-advice.sh
new file mode 100755
index 0000000000..39e5e4b34f
--- /dev/null
+++ b/t/t0018-advice.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+test_description='Test advise_if_enabled functionality'
+
+. ./test-lib.sh
+
+test_expect_success 'advice should be printed when config variable is unset' '
+	cat >expect <<-\EOF &&
+	hint: This is a piece of advice
+	hint: Disable this message with "git config advice.nestedTag false"
+	EOF
+	test-tool advise "This is a piece of advice" 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'advice should be printed when config variable is set to true' '
+	cat >expect <<-\EOF &&
+	hint: This is a piece of advice
+	hint: Disable this message with "git config advice.nestedTag false"
+	EOF
+	test_config advice.nestedTag true &&
+	test-tool advise "This is a piece of advice" 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'advice should not be printed when config variable is set to false' '
+	test_config advice.nestedTag false &&
+	test-tool advise "This is a piece of advice" 2>actual &&
+	test_must_be_empty actual
+'
+
+test_done
diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 854da0ae16..f25ae8b5e1 100755
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -2,6 +2,9 @@
 
 test_description='CRLF conversion'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 has_cr() {
@@ -84,10 +87,8 @@ test_expect_success 'safecrlf: print warning only once' '
 	git commit -m "nowarn" &&
 	for w in Oh here is CRLFQ in text; do echo $w; done | q_to_cr >doublewarn &&
 	git add doublewarn 2>err &&
-	if test_have_prereq C_LOCALE_OUTPUT
-	then
-		test $(grep "CRLF will be replaced by LF" err | wc -l) = 1
-	fi
+	grep "CRLF will be replaced by LF" err >err.warnings &&
+	test_line_count = 1 err.warnings
 '
 
 
@@ -159,8 +160,8 @@ test_expect_success 'checkout with autocrlf=input' '
 	rm -f tmp one dir/two three &&
 	git config core.autocrlf input &&
 	git read-tree --reset -u HEAD &&
-	test_must_fail has_cr one &&
-	test_must_fail has_cr dir/two &&
+	! has_cr one &&
+	! has_cr dir/two &&
 	git update-index -- one dir/two &&
 	test "$one" = $(git hash-object --stdin <one) &&
 	test "$two" = $(git hash-object --stdin <dir/two) &&
@@ -237,9 +238,9 @@ test_expect_success '.gitattributes says two is binary' '
 	git config core.autocrlf true &&
 	git read-tree --reset -u HEAD &&
 
-	test_must_fail has_cr dir/two &&
+	! has_cr dir/two &&
 	verbose has_cr one &&
-	test_must_fail has_cr three
+	! has_cr three
 '
 
 test_expect_success '.gitattributes says two is input' '
@@ -248,7 +249,7 @@ test_expect_success '.gitattributes says two is input' '
 	echo "two crlf=input" >.gitattributes &&
 	git read-tree --reset -u HEAD &&
 
-	test_must_fail has_cr dir/two
+	! has_cr dir/two
 '
 
 test_expect_success '.gitattributes says two and three are text' '
@@ -270,7 +271,7 @@ test_expect_success 'in-tree .gitattributes (1)' '
 	rm -rf tmp one dir .gitattributes patch.file three &&
 	git read-tree --reset -u HEAD &&
 
-	test_must_fail has_cr one &&
+	! has_cr one &&
 	verbose has_cr three
 '
 
@@ -280,7 +281,7 @@ test_expect_success 'in-tree .gitattributes (2)' '
 	git read-tree --reset HEAD &&
 	git checkout-index -f -q -u -a &&
 
-	test_must_fail has_cr one &&
+	! has_cr one &&
 	verbose has_cr three
 '
 
@@ -291,7 +292,7 @@ test_expect_success 'in-tree .gitattributes (3)' '
 	git checkout-index -u .gitattributes &&
 	git checkout-index -u one dir/two three &&
 
-	test_must_fail has_cr one &&
+	! has_cr one &&
 	verbose has_cr three
 '
 
@@ -302,7 +303,7 @@ test_expect_success 'in-tree .gitattributes (4)' '
 	git checkout-index -u one dir/two three &&
 	git checkout-index -u .gitattributes &&
 
-	test_must_fail has_cr one &&
+	! has_cr one &&
 	verbose has_cr three
 '
 
@@ -318,8 +319,8 @@ test_expect_success 'checkout with existing .gitattributes' '
 	git add .gitattributes .file &&
 	git commit -m second &&
 
-	git checkout master~1 &&
-	git checkout master &&
+	git checkout main~1 &&
+	git checkout main &&
 	test "$(git diff-files --raw)" = ""
 
 '
@@ -331,8 +332,8 @@ test_expect_success 'checkout when deleting .gitattributes' '
 	git add .file2 &&
 	git commit -m third &&
 
-	git checkout master~1 &&
-	git checkout master &&
+	git checkout main~1 &&
+	git checkout main &&
 	has_cr .file2
 
 '
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh
index c954c709ad..33dfc9cd56 100755
--- a/t/t0021-conversion.sh
+++ b/t/t0021-conversion.sh
@@ -2,7 +2,11 @@
 
 test_description='blob conversion via gitattributes'
 
+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
@@ -23,10 +27,6 @@ generate_random_characters () {
 		perl -pe "s/./chr((ord($&) % 26) + ord('a'))/sge" >"$TEST_ROOT/$NAME"
 }
 
-file_size () {
-	test-tool path-utils file-size "$1"
-}
-
 filter_git () {
 	rm -f *.log &&
 	git "$@"
@@ -35,7 +35,7 @@ filter_git () {
 # Compare two files and ensure that `clean` and `smudge` respectively are
 # called at least once if specified in the `expect` file. The actual
 # invocation count is not relevant because their number can vary.
-# c.f. http://public-inbox.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
+# c.f. https://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
 test_cmp_count () {
 	expect=$1
 	actual=$2
@@ -50,7 +50,7 @@ test_cmp_count () {
 
 # Compare two files but exclude all `clean` invocations because Git can
 # call `clean` zero or more times.
-# c.f. http://public-inbox.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
+# c.f. https://lore.kernel.org/git/xmqqshv18i8i.fsf@gitster.mtv.corp.google.com/
 test_cmp_exclude_clean () {
 	expect=$1
 	actual=$2
@@ -258,6 +258,30 @@ test_expect_success 'required filter clean failure' '
 	test_must_fail git add test.fc
 '
 
+test_expect_success 'required filter with absent clean field' '
+	test_config filter.absentclean.smudge cat &&
+	test_config filter.absentclean.required true &&
+
+	echo "*.ac filter=absentclean" >.gitattributes &&
+
+	echo test >test.ac &&
+	test_must_fail git add test.ac 2>stderr &&
+	test_i18ngrep "fatal: test.ac: clean filter .absentclean. failed" stderr
+'
+
+test_expect_success 'required filter with absent smudge field' '
+	test_config filter.absentsmudge.clean cat &&
+	test_config filter.absentsmudge.required true &&
+
+	echo "*.as filter=absentsmudge" >.gitattributes &&
+
+	echo test >test.as &&
+	git add test.as &&
+	rm -f test.as &&
+	test_must_fail git checkout -- test.as 2>stderr &&
+	test_i18ngrep "fatal: test.as: smudge filter absentsmudge failed" stderr
+'
+
 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 &&
@@ -361,9 +385,13 @@ test_expect_success PERL 'required process filter should filter data' '
 		cp "$TEST_ROOT/test3 '\''sq'\'',\$x=.o" "testsubdir/test3 '\''sq'\'',\$x=.r" &&
 		>test4-empty.r &&
 
-		S=$(file_size test.r) &&
-		S2=$(file_size test2.r) &&
-		S3=$(file_size "testsubdir/test3 '\''sq'\'',\$x=.r") &&
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		S3=$(test_file_size "testsubdir/test3 '\''sq'\'',\$x=.r") &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		M3=$(git hash-object "testsubdir/test3 '\''sq'\'',\$x=.r") &&
+		EMPTY=$(git hash-object /dev/null) &&
 
 		filter_git add . &&
 		cat >expected.log <<-EOF &&
@@ -378,14 +406,16 @@ test_expect_success PERL 'required process filter should filter data' '
 		test_cmp_count expected.log debug.log &&
 
 		git commit -m "test commit 2" &&
+		MAIN=$(git rev-parse --verify main) &&
+		META="ref=refs/heads/main treeish=$MAIN" &&
 		rm -f test2.r "testsubdir/test3 '\''sq'\'',\$x=.r" &&
 
 		filter_git checkout --quiet --no-progress . &&
 		cat >expected.log <<-EOF &&
 			START
 			init handshake complete
-			IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $S3 [OK] -- OUT: $S3 . [OK]
+			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
 			STOP
 		EOF
 		test_cmp_exclude_clean expected.log debug.log &&
@@ -402,14 +432,14 @@ test_expect_success PERL 'required process filter should filter data' '
 		EOF
 		test_cmp_exclude_clean expected.log debug.log &&
 
-		filter_git checkout --quiet --no-progress master &&
+		filter_git checkout --quiet --no-progress main &&
 		cat >expected.log <<-EOF &&
 			START
 			init handshake complete
-			IN: smudge test.r $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK]
-			IN: smudge test4-empty.r 0 [OK] -- OUT: 0  [OK]
-			IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $S3 [OK] -- OUT: $S3 . [OK]
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
 			STOP
 		EOF
 		test_cmp_exclude_clean expected.log debug.log &&
@@ -420,6 +450,117 @@ test_expect_success PERL 'required process filter should filter data' '
 	)
 '
 
+test_expect_success PERL 'required process filter should filter data for various subcommands' '
+	test_config_global filter.protocol.process "rot13-filter.pl debug.log clean smudge" &&
+	test_config_global filter.protocol.required true &&
+	(
+		cd repo &&
+
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		S3=$(test_file_size "testsubdir/test3 '\''sq'\'',\$x=.r") &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		M3=$(git hash-object "testsubdir/test3 '\''sq'\'',\$x=.r") &&
+		EMPTY=$(git hash-object /dev/null) &&
+
+		MAIN=$(git rev-parse --verify main) &&
+
+		cp "$TEST_ROOT/test.o" test5.r &&
+		git add test5.r &&
+		git commit -m "test commit 3" &&
+		git checkout empty-branch &&
+		filter_git rebase --onto empty-branch main^^ main &&
+		MAIN2=$(git rev-parse --verify main) &&
+		META="ref=refs/heads/main treeish=$MAIN2" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		git reset --hard empty-branch &&
+		filter_git reset --hard $MAIN &&
+		META="treeish=$MAIN" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		git branch old-main $MAIN &&
+		git reset --hard empty-branch &&
+		filter_git reset --hard old-main &&
+		META="ref=refs/heads/old-main treeish=$MAIN" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		git checkout -b merge empty-branch &&
+		git branch -f main $MAIN2 &&
+		filter_git merge main &&
+		META="treeish=$MAIN2" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		filter_git archive main >/dev/null &&
+		META="ref=refs/heads/main treeish=$MAIN2" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log &&
+
+		TREE="$(git rev-parse $MAIN2^{tree})" &&
+		filter_git archive $TREE >/dev/null &&
+		META="treeish=$TREE" &&
+		cat >expected.log <<-EOF &&
+			START
+			init handshake complete
+			IN: smudge test.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r $META blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test4-empty.r $META blob=$EMPTY 0 [OK] -- OUT: 0  [OK]
+			IN: smudge test5.r $META blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge testsubdir/test3 '\''sq'\'',\$x=.r $META blob=$M3 $S3 [OK] -- OUT: $S3 . [OK]
+			STOP
+		EOF
+		test_cmp_exclude_clean expected.log debug.log
+	)
+'
+
 test_expect_success PERL 'required process filter takes precedence' '
 	test_config_global filter.protocol.clean false &&
 	test_config_global filter.protocol.process "rot13-filter.pl debug.log clean" &&
@@ -432,7 +573,7 @@ test_expect_success PERL 'required process filter takes precedence' '
 
 		echo "*.r filter=protocol" >.gitattributes &&
 		cp "$TEST_ROOT/test.o" test.r &&
-		S=$(file_size test.r) &&
+		S=$(test_file_size test.r) &&
 
 		# Check that the process filter is invoked here
 		filter_git add . &&
@@ -456,7 +597,7 @@ test_expect_success PERL 'required process filter should be used only for "clean
 
 		echo "*.r filter=protocol" >.gitattributes &&
 		cp "$TEST_ROOT/test.o" test.r &&
-		S=$(file_size test.r) &&
+		S=$(test_file_size test.r) &&
 
 		filter_git add . &&
 		cat >expected.log <<-EOF &&
@@ -519,17 +660,22 @@ test_expect_success PERL 'required process filter should process multiple packet
 		EOF
 		test_cmp_count expected.log debug.log &&
 
-		rm -f *.file &&
+		M1="blob=$(git hash-object 1pkt_1__.file)" &&
+		M2="blob=$(git hash-object 2pkt_1+1.file)" &&
+		M3="blob=$(git hash-object 2pkt_2-1.file)" &&
+		M4="blob=$(git hash-object 2pkt_2__.file)" &&
+		M5="blob=$(git hash-object 3pkt_2+1.file)" &&
+		rm -f *.file debug.log &&
 
 		filter_git checkout --quiet --no-progress -- *.file &&
 		cat >expected.log <<-EOF &&
 			START
 			init handshake complete
-			IN: smudge 1pkt_1__.file $(($S    )) [OK] -- OUT: $(($S    )) . [OK]
-			IN: smudge 2pkt_1+1.file $(($S  +1)) [OK] -- OUT: $(($S  +1)) .. [OK]
-			IN: smudge 2pkt_2-1.file $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK]
-			IN: smudge 2pkt_2__.file $(($S*2  )) [OK] -- OUT: $(($S*2  )) .. [OK]
-			IN: smudge 3pkt_2+1.file $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK]
+			IN: smudge 1pkt_1__.file $M1 $(($S    )) [OK] -- OUT: $(($S    )) . [OK]
+			IN: smudge 2pkt_1+1.file $M2 $(($S  +1)) [OK] -- OUT: $(($S  +1)) .. [OK]
+			IN: smudge 2pkt_2-1.file $M3 $(($S*2-1)) [OK] -- OUT: $(($S*2-1)) .. [OK]
+			IN: smudge 2pkt_2__.file $M4 $(($S*2  )) [OK] -- OUT: $(($S*2  )) .. [OK]
+			IN: smudge 3pkt_2+1.file $M5 $(($S*2+1)) [OK] -- OUT: $(($S*2+1)) ... [OK]
 			STOP
 		EOF
 		test_cmp_exclude_clean expected.log debug.log &&
@@ -575,9 +721,13 @@ test_expect_success PERL 'process filter should restart after unexpected write f
 		echo "this is going to fail" >smudge-write-fail.o &&
 		cp smudge-write-fail.o smudge-write-fail.r &&
 
-		S=$(file_size test.r) &&
-		S2=$(file_size test2.r) &&
-		SF=$(file_size smudge-write-fail.r) &&
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		SF=$(test_file_size smudge-write-fail.r) &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		MF=$(git hash-object smudge-write-fail.r) &&
+		rm -f debug.log &&
 
 		git add . &&
 		rm -f *.r &&
@@ -591,11 +741,11 @@ test_expect_success PERL 'process filter should restart after unexpected write f
 		cat >expected.log <<-EOF &&
 			START
 			init handshake complete
-			IN: smudge smudge-write-fail.r $SF [OK] -- [WRITE FAIL]
+			IN: smudge smudge-write-fail.r blob=$MF $SF [OK] -- [WRITE FAIL]
 			START
 			init handshake complete
-			IN: smudge test.r $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
 			STOP
 		EOF
 		test_cmp_exclude_clean expected.log debug.log &&
@@ -626,9 +776,13 @@ test_expect_success PERL 'process filter should not be restarted if it signals a
 		echo "this will cause an error" >error.o &&
 		cp error.o error.r &&
 
-		S=$(file_size test.r) &&
-		S2=$(file_size test2.r) &&
-		SE=$(file_size error.r) &&
+		S=$(test_file_size test.r) &&
+		S2=$(test_file_size test2.r) &&
+		SE=$(test_file_size error.r) &&
+		M=$(git hash-object test.r) &&
+		M2=$(git hash-object test2.r) &&
+		ME=$(git hash-object error.r) &&
+		rm -f debug.log &&
 
 		git add . &&
 		rm -f *.r &&
@@ -637,9 +791,9 @@ test_expect_success PERL 'process filter should not be restarted if it signals a
 		cat >expected.log <<-EOF &&
 			START
 			init handshake complete
-			IN: smudge error.r $SE [OK] -- [ERROR]
-			IN: smudge test.r $S [OK] -- OUT: $S . [OK]
-			IN: smudge test2.r $S2 [OK] -- OUT: $S2 . [OK]
+			IN: smudge error.r blob=$ME $SE [OK] -- [ERROR]
+			IN: smudge test.r blob=$M $S [OK] -- OUT: $S . [OK]
+			IN: smudge test2.r blob=$M2 $S2 [OK] -- OUT: $S2 . [OK]
 			STOP
 		EOF
 		test_cmp_exclude_clean expected.log debug.log &&
@@ -665,18 +819,21 @@ test_expect_success PERL 'process filter abort stops processing of all further f
 		echo "error this blob and all future blobs" >abort.o &&
 		cp abort.o abort.r &&
 
-		SA=$(file_size abort.r) &&
+		M="blob=$(git hash-object abort.r)" &&
+		rm -f debug.log &&
+		SA=$(test_file_size abort.r) &&
 
 		git add . &&
 		rm -f *.r &&
 
+
 		# Note: This test assumes that Git filters files in alphabetical
 		# order ("abort.r" before "test.r").
 		filter_git checkout --quiet --no-progress . &&
 		cat >expected.log <<-EOF &&
 			START
 			init handshake complete
-			IN: smudge abort.r $SA [OK] -- [ABORT]
+			IN: smudge abort.r $M $SA [OK] -- [ABORT]
 			STOP
 		EOF
 		test_cmp_exclude_clean expected.log debug.log &&
@@ -726,28 +883,30 @@ test_expect_success PERL 'delayed checkout in process filter' '
 		git commit -m "test commit"
 	) &&
 
-	S=$(file_size "$TEST_ROOT/test.o") &&
+	S=$(test_file_size "$TEST_ROOT/test.o") &&
+	PM="ref=refs/heads/main treeish=$(git -C repo rev-parse --verify main) " &&
+	M="${PM}blob=$(git -C repo rev-parse --verify main:test.a)" &&
 	cat >a.exp <<-EOF &&
 		START
 		init handshake complete
-		IN: smudge test.a $S [OK] -- OUT: $S . [OK]
-		IN: smudge test-delay10.a $S [OK] -- [DELAYED]
-		IN: smudge test-delay11.a $S [OK] -- [DELAYED]
-		IN: smudge test-delay20.a $S [OK] -- [DELAYED]
+		IN: smudge test.a $M $S [OK] -- OUT: $S . [OK]
+		IN: smudge test-delay10.a $M $S [OK] -- [DELAYED]
+		IN: smudge test-delay11.a $M $S [OK] -- [DELAYED]
+		IN: smudge test-delay20.a $M $S [OK] -- [DELAYED]
 		IN: list_available_blobs test-delay10.a test-delay11.a [OK]
-		IN: smudge test-delay10.a 0 [OK] -- OUT: $S . [OK]
-		IN: smudge test-delay11.a 0 [OK] -- OUT: $S . [OK]
+		IN: smudge test-delay10.a $M 0 [OK] -- OUT: $S . [OK]
+		IN: smudge test-delay11.a $M 0 [OK] -- OUT: $S . [OK]
 		IN: list_available_blobs test-delay20.a [OK]
-		IN: smudge test-delay20.a 0 [OK] -- OUT: $S . [OK]
+		IN: smudge test-delay20.a $M 0 [OK] -- OUT: $S . [OK]
 		IN: list_available_blobs [OK]
 		STOP
 	EOF
 	cat >b.exp <<-EOF &&
 		START
 		init handshake complete
-		IN: smudge test-delay10.b $S [OK] -- [DELAYED]
+		IN: smudge test-delay10.b $M $S [OK] -- [DELAYED]
 		IN: list_available_blobs test-delay10.b [OK]
-		IN: smudge test-delay10.b 0 [OK] -- OUT: $S . [OK]
+		IN: smudge test-delay10.b $M 0 [OK] -- OUT: $S . [OK]
 		IN: list_available_blobs [OK]
 		STOP
 	EOF
@@ -767,8 +926,11 @@ test_expect_success PERL 'delayed checkout in process filter' '
 
 		rm *.a *.b &&
 		filter_git checkout . &&
-		test_cmp_count ../a.exp a.log &&
-		test_cmp_count ../b.exp b.log &&
+		# We are not checking out a ref here, so filter out ref metadata.
+		sed -e "s!$PM!!" ../a.exp >a.exp.filtered &&
+		sed -e "s!$PM!!" ../b.exp >b.exp.filtered &&
+		test_cmp_count a.exp.filtered a.log &&
+		test_cmp_count b.exp.filtered b.log &&
 
 		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test.a &&
 		test_cmp_committed_rot13 "$TEST_ROOT/test.o" test-delay10.a &&
@@ -795,7 +957,6 @@ test_expect_success PERL 'missing file in delayed checkout' '
 
 	rm -rf repo-cloned &&
 	test_must_fail git clone repo repo-cloned 2>git-stderr.log &&
-	cat git-stderr.log &&
 	grep "error: .missing-delay\.a. was not filtered properly" git-stderr.log
 '
 
@@ -820,4 +981,155 @@ test_expect_success PERL 'invalid file in delayed checkout' '
 	grep "error: external filter .* signaled that .unfiltered. is now available although it has not been delayed earlier" git-stderr.log
 '
 
+for mode in 'case' 'utf-8'
+do
+	case "$mode" in
+	case)	dir='A' symlink='a' mode_prereq='CASE_INSENSITIVE_FS' ;;
+	utf-8)
+		dir=$(printf "\141\314\210") symlink=$(printf "\303\244")
+		mode_prereq='UTF8_NFD_TO_NFC' ;;
+	esac
+
+	test_expect_success PERL,SYMLINKS,$mode_prereq \
+	"delayed checkout with $mode-collision don't write to the wrong place" '
+		test_config_global filter.delay.process \
+			"\"$TEST_ROOT/rot13-filter.pl\" --always-delay delayed.log clean smudge delay" &&
+		test_config_global filter.delay.required true &&
+
+		git init $mode-collision &&
+		(
+			cd $mode-collision &&
+			mkdir target-dir &&
+
+			empty_oid=$(printf "" | git hash-object -w --stdin) &&
+			symlink_oid=$(printf "%s" "$PWD/target-dir" | git hash-object -w --stdin) &&
+			attr_oid=$(echo "$dir/z filter=delay" | git hash-object -w --stdin) &&
+
+			cat >objs <<-EOF &&
+			100644 blob $empty_oid	$dir/x
+			100644 blob $empty_oid	$dir/y
+			100644 blob $empty_oid	$dir/z
+			120000 blob $symlink_oid	$symlink
+			100644 blob $attr_oid	.gitattributes
+			EOF
+
+			git update-index --index-info <objs &&
+			git commit -m "test commit"
+		) &&
+
+		git clone $mode-collision $mode-collision-cloned &&
+		# Make sure z was really delayed
+		grep "IN: smudge $dir/z .* \\[DELAYED\\]" $mode-collision-cloned/delayed.log &&
+
+		# Should not create $dir/z at $symlink/z
+		test_path_is_missing $mode-collision/target-dir/z
+	'
+done
+
+test_expect_success PERL,SYMLINKS,CASE_INSENSITIVE_FS \
+"delayed checkout with submodule collision don't write to the wrong place" '
+	git init collision-with-submodule &&
+	(
+		cd collision-with-submodule &&
+		git config filter.delay.process "\"$TEST_ROOT/rot13-filter.pl\" --always-delay delayed.log clean smudge delay" &&
+		git config filter.delay.required true &&
+
+		# We need Git to treat the submodule "a" and the
+		# leading dir "A" as different paths in the index.
+		git config --local core.ignoreCase false &&
+
+		empty_oid=$(printf "" | git hash-object -w --stdin) &&
+		attr_oid=$(echo "A/B/y filter=delay" | git hash-object -w --stdin) &&
+		cat >objs <<-EOF &&
+		100644 blob $empty_oid	A/B/x
+		100644 blob $empty_oid	A/B/y
+		100644 blob $attr_oid	.gitattributes
+		EOF
+		git update-index --index-info <objs &&
+
+		git init a &&
+		mkdir target-dir &&
+		symlink_oid=$(printf "%s" "$PWD/target-dir" | git -C a hash-object -w --stdin) &&
+		echo "120000 blob $symlink_oid	b" >objs &&
+		git -C a update-index --index-info <objs &&
+		git -C a commit -m sub &&
+		git submodule add ./a &&
+		git commit -m super &&
+
+		git checkout --recurse-submodules . &&
+		grep "IN: smudge A/B/y .* \\[DELAYED\\]" delayed.log &&
+		test_path_is_missing target-dir/y
+	)
+'
+
+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/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
index 470107248e..7bb93768f3 100644
--- a/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl
@@ -2,9 +2,15 @@
 # Example implementation for the Git filter protocol version 2
 # See Documentation/gitattributes.txt, section "Filter Protocol"
 #
-# The first argument defines a debug log file that the script write to.
-# All remaining arguments define a list of supported protocol
-# capabilities ("clean", "smudge", etc).
+# Usage: rot13-filter.pl [--always-delay] <log path> <capabilities>
+#
+# Log path defines a debug log file that the script writes to. The
+# subsequent arguments define a list of supported protocol capabilities
+# ("clean", "smudge", etc).
+#
+# When --always-delay is given all pathnames with the "can-delay" flag
+# that don't appear on the list bellow are delayed with a count of 1
+# (see more below).
 #
 # This implementation supports special test cases:
 # (1) If data with the pathname "clean-write-fail.r" is processed with
@@ -53,6 +59,13 @@ use IO::File;
 use Git::Packet;
 
 my $MAX_PACKET_CONTENT_SIZE = 65516;
+
+my $always_delay = 0;
+if ( $ARGV[0] eq '--always-delay' ) {
+	$always_delay = 1;
+	shift @ARGV;
+}
+
 my $log_file                = shift @ARGV;
 my @capabilities            = @ARGV;
 
@@ -134,8 +147,16 @@ while (1) {
 			if ( $buffer eq "can-delay=1" ) {
 				if ( exists $DELAY{$pathname} and $DELAY{$pathname}{"requested"} == 0 ) {
 					$DELAY{$pathname}{"requested"} = 1;
+				} elsif ( !exists $DELAY{$pathname} and $always_delay ) {
+					$DELAY{$pathname} = { "requested" => 1, "count" => 1 };
 				}
+			} elsif ($buffer =~ /^(ref|treeish|blob)=/) {
+				print $debug " $buffer";
 			} else {
+				# In general, filters need to be graceful about
+				# new metadata, since it's documented that we
+				# can pass any key-value pairs, but for tests,
+				# let's be a little stricter.
 				die "Unknown message '$buffer'";
 			}
 
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index 959b6da449..4a5c5c602c 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -83,7 +83,7 @@ check_warning () {
 	*) echo >&2 "Illegal 1": "$1" ; return false ;;
 	esac
 	grep "will be replaced by" "$2" | sed -e "s/\(.*\) in [^ ]*$/\1/" | uniq  >"$2".actual
-	test_i18ncmp "$2".expect "$2".actual
+	test_cmp "$2".expect "$2".actual
 }
 
 commit_check_warn () {
@@ -215,7 +215,7 @@ stats_ascii () {
 }
 
 
-# contruct the attr/ returned by git ls-files --eol
+# construct the attr/ returned by git ls-files --eol
 # Take none (=empty), one or two args
 # convert.c: eol=XX overrides text=auto
 attr_ascii () {
@@ -368,9 +368,9 @@ test_expect_success 'ls-files --eol -o Text/Binary' '
 	test_cmp expect actual
 '
 
-test_expect_success 'setup master' '
+test_expect_success 'setup main' '
 	echo >.gitattributes &&
-	git checkout -b master &&
+	git checkout -b main &&
 	git add .gitattributes &&
 	git commit -m "add .gitattributes" . &&
 	printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\nLINETWO\nLINETHREE"     >LF &&
@@ -386,7 +386,9 @@ test_expect_success 'setup master' '
 	test_tick
 '
 
-
+# Disable extra chain-linting for the next set of tests. There are many
+# auto-generated ones that are not worth checking over and over.
+GIT_TEST_CHAIN_LINT_HARDER_DEFAULT=0
 
 warn_LF_CRLF="LF will be replaced by CRLF"
 warn_CRLF_LF="CRLF will be replaced by LF"
@@ -597,6 +599,9 @@ do
 	checkout_files     auto  "$id" ""     false   native   $NL   CRLF  CRLF_mix_LF  LF_mix_CR    LF_nul
 done
 
+# The rest of the tests are unique; do the usual linting.
+unset GIT_TEST_CHAIN_LINT_HARDER_DEFAULT
+
 # Should be the last test case: remove some files from the worktree
 test_expect_success 'ls-files --eol -d -z' '
 	rm crlf_false_attr__CRLF.txt crlf_false_attr__CRLF_mix_LF.txt crlf_false_attr__LF.txt .gitattributes &&
diff --git a/t/t0028-working-tree-encoding.sh b/t/t0028-working-tree-encoding.sh
index 7aa0945d8d..82905a2156 100755
--- a/t/t0028-working-tree-encoding.sh
+++ b/t/t0028-working-tree-encoding.sh
@@ -2,34 +2,14 @@
 
 test_description='working-tree-encoding conversion via gitattributes'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
+. "$TEST_DIRECTORY/lib-encoding.sh"
 
 GIT_TRACE_WORKING_TREE_ENCODING=1 && export GIT_TRACE_WORKING_TREE_ENCODING
 
-test_lazy_prereq NO_UTF16_BOM '
-	test $(printf abc | iconv -f UTF-8 -t UTF-16 | wc -c) = 6
-'
-
-test_lazy_prereq NO_UTF32_BOM '
-	test $(printf abc | iconv -f UTF-8 -t UTF-32 | wc -c) = 12
-'
-
-write_utf16 () {
-	if test_have_prereq NO_UTF16_BOM
-	then
-		printf '\xfe\xff'
-	fi &&
-	iconv -f UTF-8 -t UTF-16
-}
-
-write_utf32 () {
-	if test_have_prereq NO_UTF32_BOM
-	then
-		printf '\x00\x00\xfe\xff'
-	fi &&
-	iconv -f UTF-8 -t UTF-32
-}
-
 test_expect_success 'setup test files' '
 	git config core.eol lf &&
 
@@ -215,7 +195,7 @@ test_expect_success 'error if encoding round trip is not the same during refresh
 	TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16le) &&
 	git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16le &&
 	COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) &&
-	git update-ref refs/heads/master $COMMIT &&
+	git update-ref refs/heads/main $COMMIT &&
 
 	test_must_fail git checkout HEAD^ 2>err.out &&
 	test_i18ngrep "error: .* overwritten by checkout:" err.out
@@ -231,7 +211,7 @@ test_expect_success 'error if encoding garbage is already in Git' '
 	TEST_HASH=$(git hash-object --no-filters -w nonsense.utf16) &&
 	git update-index --add --cacheinfo 100644 $TEST_HASH nonsense.utf16 &&
 	COMMIT=$(git commit-tree -p $(git rev-parse HEAD) -m "plain commit" $(git write-tree)) &&
-	git update-ref refs/heads/master $COMMIT &&
+	git update-ref refs/heads/main $COMMIT &&
 
 	git diff 2>err.out &&
 	test_i18ngrep "error: BOM is required" err.out
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 705a136ed9..ad4746d899 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -23,6 +23,8 @@ usage: test-tool parse-options <options>
     -j <n>                get a integer, too
     -m, --magnitude <n>   get a magnitude
     --set23               set integer to 23
+    --mode1               set integer to 1 (cmdmode option)
+    --mode2               set integer to 2 (cmdmode option)
     -L, --length <str>    get length of <str>
     -F, --file <file>     set file to <file>
 
@@ -42,7 +44,7 @@ Magic arguments
     --no-ambiguous        negative ambiguity
 
 Standard options
-    --abbrev[=<n>]        use <n> digits to display SHA-1s
+    --abbrev[=<n>]        use <n> digits to display object names
     -v, --verbose         be verbose
     -n, --dry-run         dry run
     -q, --quiet           be quiet
@@ -52,14 +54,14 @@ Alias
     -A, --alias-source <string>
                           get a string
     -Z, --alias-target <string>
-                          get a string
+                          alias of --alias-source
 
 EOF
 
 test_expect_success 'test help' '
 	test_must_fail test-tool parse-options -h >output 2>output.err &&
 	test_must_be_empty output.err &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 mv expect expect.err
@@ -82,7 +84,7 @@ check_unknown_i18n() {
 	cat expect.err >>expect &&
 	test_must_fail test-tool parse-options $* >output 2>output.err &&
 	test_must_be_empty output &&
-	test_i18ncmp expect output.err
+	test_cmp expect output.err
 }
 
 test_expect_success 'OPT_BOOL() #1' 'check boolean: 1 --yes'
@@ -242,23 +244,23 @@ test_expect_success 'Alias options do not contribute to abbreviation' '
 '
 
 cat >typo.err <<\EOF
-error: did you mean `--boolean` (with two dashes ?)
+error: did you mean `--boolean` (with two dashes)?
 EOF
 
 test_expect_success 'detect possible typos' '
 	test_must_fail test-tool parse-options -boolean >output 2>output.err &&
 	test_must_be_empty output &&
-	test_i18ncmp typo.err output.err
+	test_cmp typo.err output.err
 '
 
 cat >typo.err <<\EOF
-error: did you mean `--ambiguous` (with two dashes ?)
+error: did you mean `--ambiguous` (with two dashes)?
 EOF
 
 test_expect_success 'detect possible typos' '
 	test_must_fail test-tool parse-options -ambiguous >output 2>output.err &&
 	test_must_be_empty output &&
-	test_i18ncmp typo.err output.err
+	test_cmp typo.err output.err
 '
 
 test_expect_success 'keep some options as arguments' '
@@ -324,6 +326,22 @@ test_expect_success 'OPT_NEGBIT() works' '
 	test-tool parse-options --expect="boolean: 6" -bb --no-neg-or4
 '
 
+test_expect_success 'OPT_CMDMODE() works' '
+	test-tool parse-options --expect="integer: 1" --mode1
+'
+
+test_expect_success 'OPT_CMDMODE() detects incompatibility' '
+	test_must_fail test-tool parse-options --mode1 --mode2 >output 2>output.err &&
+	test_must_be_empty output &&
+	test_i18ngrep "incompatible with --mode" output.err
+'
+
+test_expect_success 'OPT_CMDMODE() detects incompatibility with something else' '
+	test_must_fail test-tool parse-options --set23 --mode2 >output 2>output.err &&
+	test_must_be_empty output &&
+	test_i18ngrep "incompatible with something else" output.err
+'
+
 test_expect_success 'OPT_COUNTUP() with PARSE_OPT_NODASH works' '
 	test-tool parse-options --expect="boolean: 6" + + + + + +
 '
diff --git a/t/t0041-usage.sh b/t/t0041-usage.sh
index 5b927b76fe..c4fc34eb18 100755
--- a/t/t0041-usage.sh
+++ b/t/t0041-usage.sh
@@ -2,6 +2,9 @@
 
 test_description='Test commands behavior when given invalid argument value'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup ' '
@@ -41,8 +44,8 @@ test_expect_success 'tag usage error' '
 '
 
 test_expect_success 'branch --contains <existent_commit>' '
-	git branch --contains "master" >actual 2>actual.err &&
-	test_i18ngrep "master" actual &&
+	git branch --contains "main" >actual 2>actual.err &&
+	test_i18ngrep "main" actual &&
 	test_line_count = 0 actual.err
 '
 
@@ -54,7 +57,7 @@ test_expect_success 'branch --contains <inexistent_commit>' '
 '
 
 test_expect_success 'branch --no-contains <existent_commit>' '
-	git branch --no-contains "master" >actual 2>actual.err &&
+	git branch --no-contains "main" >actual 2>actual.err &&
 	test_line_count = 0 actual &&
 	test_line_count = 0 actual.err
 '
@@ -73,7 +76,7 @@ test_expect_success 'branch usage error' '
 '
 
 test_expect_success 'for-each-ref --contains <existent_object>' '
-	git for-each-ref --contains "master" >actual 2>actual.err &&
+	git for-each-ref --contains "main" >actual 2>actual.err &&
 	test_line_count = 2 actual &&
 	test_line_count = 0 actual.err
 '
@@ -86,7 +89,7 @@ test_expect_success 'for-each-ref --contains <inexistent_object>' '
 '
 
 test_expect_success 'for-each-ref --no-contains <existent_object>' '
-	git for-each-ref --no-contains "master" >actual 2>actual.err &&
+	git for-each-ref --no-contains "main" >actual 2>actual.err &&
 	test_line_count = 0 actual &&
 	test_line_count = 0 actual.err
 '
diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh
index 608673fb77..afc343cf9b 100755
--- a/t/t0050-filesystem.sh
+++ b/t/t0050-filesystem.sh
@@ -2,6 +2,9 @@
 
 test_description='Various filesystem issues'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 auml=$(printf '\303\244')
@@ -65,7 +68,7 @@ test_expect_success "setup case tests" '
 	git mv camelcase tmp &&
 	git mv tmp CamelCase &&
 	git commit -m "rename" &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'rename (case change)' '
@@ -118,7 +121,7 @@ test_expect_success "setup unicode normalization tests" '
 	git mv $aumlcdiar tmp &&
 	git mv tmp "$auml" &&
 	git commit -m rename &&
-	git checkout -f master
+	git checkout -f main
 '
 
 $test_unicode 'rename (silent unicode normalization)' '
@@ -147,7 +150,7 @@ test_expect_success CASE_INSENSITIVE_FS 'checkout with no pathspec and a case in
 		git add gitweb &&
 		git commit -m "add gitweb/subdir/file" &&
 
-		git checkout master
+		git checkout main
 	)
 '
 
diff --git a/t/t0052-simple-ipc.sh b/t/t0052-simple-ipc.sh
new file mode 100755
index 0000000000..ff98be31a5
--- /dev/null
+++ b/t/t0052-simple-ipc.sh
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+test_description='simple command server'
+
+. ./test-lib.sh
+
+test-tool simple-ipc SUPPORTS_SIMPLE_IPC || {
+	skip_all='simple IPC not supported on this platform'
+	test_done
+}
+
+stop_simple_IPC_server () {
+	test-tool simple-ipc stop-daemon
+}
+
+test_expect_success 'start simple command server' '
+	test_atexit stop_simple_IPC_server &&
+	test-tool simple-ipc start-daemon --threads=8 &&
+	test-tool simple-ipc is-active
+'
+
+test_expect_success 'simple command server' '
+	test-tool simple-ipc send --token=ping >actual &&
+	echo pong >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'servers cannot share the same path' '
+	test_must_fail test-tool simple-ipc run-daemon &&
+	test-tool simple-ipc is-active
+'
+
+test_expect_success 'big response' '
+	test-tool simple-ipc send --token=big >actual &&
+	test_line_count -ge 10000 actual &&
+	grep -q "big: [0]*9999\$" actual
+'
+
+test_expect_success 'chunk response' '
+	test-tool simple-ipc send --token=chunk >actual &&
+	test_line_count -ge 10000 actual &&
+	grep -q "big: [0]*9999\$" actual
+'
+
+test_expect_success 'slow response' '
+	test-tool simple-ipc send --token=slow >actual &&
+	test_line_count -ge 100 actual &&
+	grep -q "big: [0]*99\$" actual
+'
+
+# Send an IPC with n=100,000 bytes of ballast.  This should be large enough
+# to force both the kernel and the pkt-line layer to chunk the message to the
+# daemon and for the daemon to receive it in chunks.
+#
+test_expect_success 'sendbytes' '
+	test-tool simple-ipc sendbytes --bytecount=100000 --byte=A >actual &&
+	grep "sent:A00100000 rcvd:A00100000" actual
+'
+
+# Start a series of <threads> client threads that each make <batchsize>
+# IPC requests to the server.  Each (<threads> * <batchsize>) request
+# will open a new connection to the server and randomly bind to a server
+# thread.  Each client thread exits after completing its batch.  So the
+# total number of live client threads will be smaller than the total.
+# Each request will send a message containing at least <bytecount> bytes
+# of ballast.  (Responses are small.)
+#
+# The purpose here is to test threading in the server and responding to
+# many concurrent client requests (regardless of whether they come from
+# 1 client process or many).  And to test that the server side of the
+# named pipe/socket is stable.  (On Windows this means that the server
+# pipe is properly recycled.)
+#
+# On Windows it also lets us adjust the connection timeout in the
+# `ipc_client_send_command()`.
+#
+# Note it is easy to drive the system into failure by requesting an
+# insane number of threads on client or server and/or increasing the
+# per-thread batchsize or the per-request bytecount (ballast).
+# On Windows these failures look like "pipe is busy" errors.
+# So I've chosen fairly conservative values for now.
+#
+# We expect output of the form "sent:<letter><length> ..."
+# With terms (7, 19, 13) we expect:
+#   <letter> in [A-G]
+#   <length> in [19+0 .. 19+(13-1)]
+# and (7 * 13) successful responses.
+#
+test_expect_success 'stress test threads' '
+	test-tool simple-ipc multiple \
+		--threads=7 \
+		--bytecount=19 \
+		--batchsize=13 \
+		>actual &&
+	test_line_count = 92 actual &&
+	grep "good 91" actual &&
+	grep "sent:A" <actual >actual_a &&
+	cat >expect_a <<-EOF &&
+		sent:A00000019 rcvd:A00000019
+		sent:A00000020 rcvd:A00000020
+		sent:A00000021 rcvd:A00000021
+		sent:A00000022 rcvd:A00000022
+		sent:A00000023 rcvd:A00000023
+		sent:A00000024 rcvd:A00000024
+		sent:A00000025 rcvd:A00000025
+		sent:A00000026 rcvd:A00000026
+		sent:A00000027 rcvd:A00000027
+		sent:A00000028 rcvd:A00000028
+		sent:A00000029 rcvd:A00000029
+		sent:A00000030 rcvd:A00000030
+		sent:A00000031 rcvd:A00000031
+	EOF
+	test_cmp expect_a actual_a
+'
+
+test_expect_success 'stop-daemon works' '
+	test-tool simple-ipc stop-daemon &&
+	test_must_fail test-tool simple-ipc is-active &&
+	test_must_fail test-tool simple-ipc send --token=ping
+'
+
+test_done
diff --git a/t/t0060-path-utils.sh b/t/t0060-path-utils.sh
index c7b53e494b..34d1061f32 100755
--- a/t/t0060-path-utils.sh
+++ b/t/t0060-path-utils.sh
@@ -165,6 +165,15 @@ test_expect_success 'absolute path rejects the empty string' '
 	test_must_fail test-tool path-utils absolute_path ""
 '
 
+test_expect_success MINGW '<drive-letter>:\\abc is an absolute path' '
+	for letter in : \" C Z 1 ä
+	do
+		path=$letter:\\abc &&
+		absolute="$(test-tool path-utils absolute_path "$path")" &&
+		test "$path" = "$absolute" || return 1
+	done
+'
+
 test_expect_success 'real path rejects the empty string' '
 	test_must_fail test-tool path-utils real_path ""
 '
@@ -285,9 +294,13 @@ test_git_path GIT_OBJECT_DIRECTORY=foo objects/foo foo/foo
 test_git_path GIT_OBJECT_DIRECTORY=foo objects2 .git/objects2
 test_expect_success 'setup common repository' 'git --git-dir=bar init'
 test_git_path GIT_COMMON_DIR=bar index                    .git/index
+test_git_path GIT_COMMON_DIR=bar index.lock               .git/index.lock
 test_git_path GIT_COMMON_DIR=bar HEAD                     .git/HEAD
 test_git_path GIT_COMMON_DIR=bar logs/HEAD                .git/logs/HEAD
+test_git_path GIT_COMMON_DIR=bar logs/HEAD.lock           .git/logs/HEAD.lock
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisect/foo     .git/logs/refs/bisect/foo
+test_git_path GIT_COMMON_DIR=bar logs/refs                bar/logs/refs
+test_git_path GIT_COMMON_DIR=bar logs/refs/               bar/logs/refs/
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisec/foo      bar/logs/refs/bisec/foo
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisec          bar/logs/refs/bisec
 test_git_path GIT_COMMON_DIR=bar logs/refs/bisectfoo      bar/logs/refs/bisectfoo
@@ -299,8 +312,8 @@ test_git_path GIT_COMMON_DIR=bar info/sparse-checkout     .git/info/sparse-check
 test_git_path GIT_COMMON_DIR=bar info//sparse-checkout    .git/info//sparse-checkout
 test_git_path GIT_COMMON_DIR=bar remotes/bar              bar/remotes/bar
 test_git_path GIT_COMMON_DIR=bar branches/bar             bar/branches/bar
-test_git_path GIT_COMMON_DIR=bar logs/refs/heads/master   bar/logs/refs/heads/master
-test_git_path GIT_COMMON_DIR=bar refs/heads/master        bar/refs/heads/master
+test_git_path GIT_COMMON_DIR=bar logs/refs/heads/main     bar/logs/refs/heads/main
+test_git_path GIT_COMMON_DIR=bar refs/heads/main          bar/refs/heads/main
 test_git_path GIT_COMMON_DIR=bar refs/bisect/foo          .git/refs/bisect/foo
 test_git_path GIT_COMMON_DIR=bar hooks/me                 bar/hooks/me
 test_git_path GIT_COMMON_DIR=bar config                   bar/config
@@ -423,6 +436,9 @@ test_expect_success 'match .gitmodules' '
 		~1000000 \
 		~9999999 \
 		\
+		.gitmodules:\$DATA \
+		"gitmod~4 . :\$DATA" \
+		\
 		--not \
 		".gitmodules x"  \
 		".gitmodules .x" \
@@ -447,7 +463,92 @@ test_expect_success 'match .gitmodules' '
 		\
 		GI7EB~1 \
 		GI7EB~01 \
-		GI7EB~1X
+		GI7EB~1X \
+		\
+		.gitmodules,:\$DATA
+'
+
+test_expect_success 'match .gitattributes' '
+	test-tool path-utils is_dotgitattributes \
+		.gitattributes \
+		.git${u200c}attributes \
+		.Gitattributes \
+		.gitattributeS \
+		GITATT~1 \
+		GI7D29~1
+'
+
+test_expect_success 'match .gitignore' '
+	test-tool path-utils is_dotgitignore \
+		.gitignore \
+		.git${u200c}ignore \
+		.Gitignore \
+		.gitignorE \
+		GITIGN~1 \
+		GI250A~1
+'
+
+test_expect_success 'match .mailmap' '
+	test-tool path-utils is_dotmailmap \
+		.mailmap \
+		.mail${u200c}map \
+		.Mailmap \
+		.mailmaP \
+		MAILMA~1 \
+		MABA30~1
+'
+
+test_expect_success MINGW 'is_valid_path() on Windows' '
+	test-tool path-utils is_valid_path \
+		win32 \
+		"win32 x" \
+		../hello.txt \
+		C:\\git \
+		comm \
+		conout.c \
+		com0.c \
+		lptN \
+		\
+		--not \
+		"win32 "  \
+		"win32 /x "  \
+		"win32."  \
+		"win32 . ." \
+		.../hello.txt \
+		colon:test \
+		"AUX.c" \
+		"abc/conOut\$  .xyz/test" \
+		lpt8 \
+		com9.c \
+		"lpt*" \
+		Nul \
+		"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 17c9c0f3bb..7d599675e3 100755
--- a/t/t0061-run-command.sh
+++ b/t/t0061-run-command.sh
@@ -12,6 +12,10 @@ cat >hello-script <<-EOF
 	cat hello-script
 EOF
 
+test_expect_success MINGW 'subprocess inherits only std handles' '
+	test-tool run-command inherited-handle
+'
+
 test_expect_success 'start_command reports ENOENT (slash)' '
 	test-tool run-command start-command-ENOENT ./does-not-exist 2>err &&
 	test_i18ngrep "\./does-not-exist" err
diff --git a/t/t0064-sha1-array.sh b/t/t0064-oid-array.sh
index 5dda570b9a..2e5438ccda 100755
--- a/t/t0064-sha1-array.sh
+++ b/t/t0064-oid-array.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='basic tests for the SHA1 array implementation'
+test_description='basic tests for the oid array implementation'
 . ./test-lib.sh
 
 echoid () {
@@ -18,7 +18,7 @@ test_expect_success 'ordered enumeration' '
 	{
 		echoid append 88 44 aa 55 &&
 		echo for_each_unique
-	} | test-tool sha1-array >actual &&
+	} | test-tool oid-array >actual &&
 	test_cmp expect actual
 '
 
@@ -27,8 +27,9 @@ test_expect_success 'ordered enumeration with duplicate suppression' '
 	{
 		echoid append 88 44 aa 55 &&
 		echoid append 88 44 aa 55 &&
+		echoid append 88 44 aa 55 &&
 		echo for_each_unique
-	} | test-tool sha1-array >actual &&
+	} | test-tool oid-array >actual &&
 	test_cmp expect actual
 '
 
@@ -36,7 +37,7 @@ test_expect_success 'lookup' '
 	{
 		echoid append 88 44 aa 55 &&
 		echoid lookup 55
-	} | test-tool sha1-array >actual &&
+	} | test-tool oid-array >actual &&
 	n=$(cat actual) &&
 	test "$n" -eq 1
 '
@@ -45,7 +46,7 @@ test_expect_success 'lookup non-existing entry' '
 	{
 		echoid append 88 44 aa 55 &&
 		echoid lookup 33
-	} | test-tool sha1-array >actual &&
+	} | test-tool oid-array >actual &&
 	n=$(cat actual) &&
 	test "$n" -lt 0
 '
@@ -54,19 +55,21 @@ test_expect_success 'lookup with duplicates' '
 	{
 		echoid append 88 44 aa 55 &&
 		echoid append 88 44 aa 55 &&
+		echoid append 88 44 aa 55 &&
 		echoid lookup 55
-	} | test-tool sha1-array >actual &&
+	} | test-tool oid-array >actual &&
 	n=$(cat actual) &&
-	test "$n" -ge 2 &&
-	test "$n" -le 3
+	test "$n" -ge 3 &&
+	test "$n" -le 5
 '
 
 test_expect_success 'lookup non-existing entry with duplicates' '
 	{
 		echoid append 88 44 aa 55 &&
 		echoid append 88 44 aa 55 &&
+		echoid append 88 44 aa 55 &&
 		echoid lookup 66
-	} | test-tool sha1-array >actual &&
+	} | test-tool oid-array >actual &&
 	n=$(cat actual) &&
 	test "$n" -lt 0
 '
@@ -81,7 +84,7 @@ test_expect_success 'lookup with almost duplicate values' '
 		echo "append $id1" &&
 		echo "append $id2" &&
 		echoid lookup 55
-	} | test-tool sha1-array >actual &&
+	} | test-tool oid-array >actual &&
 	n=$(cat actual) &&
 	test "$n" -eq 0
 '
@@ -90,7 +93,7 @@ test_expect_success 'lookup with single duplicate value' '
 	{
 		echoid append 55 55 &&
 		echoid lookup 55
-	} | test-tool sha1-array >actual &&
+	} | test-tool oid-array >actual &&
 	n=$(cat actual) &&
 	test "$n" -ge 0 &&
 	test "$n" -le 1
diff --git a/t/t0067-parse_pathspec_file.sh b/t/t0067-parse_pathspec_file.sh
new file mode 100755
index 0000000000..7bab49f361
--- /dev/null
+++ b/t/t0067-parse_pathspec_file.sh
@@ -0,0 +1,108 @@
+#!/bin/sh
+
+test_description='Test parse_pathspec_file()'
+
+. ./test-lib.sh
+
+test_expect_success 'one item from stdin' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	echo fileA.t |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'one item from file' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	echo fileA.t >list &&
+	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'NUL delimiters' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\0fileB.t\0" |
+	test-tool parse-pathspec-file --pathspec-from-file=- --pathspec-file-nul >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'LF delimiters' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\nfileB.t\n" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'no trailing delimiter' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\nfileB.t" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'CRLF delimiters' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	fileB.t
+	EOF
+
+	printf "fileA.t\r\nfileB.t\r\n" |
+	test-tool parse-pathspec-file --pathspec-from-file=- >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success 'quotes' '
+	cat >expect <<-\EOF &&
+	fileA.t
+	EOF
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test-tool parse-pathspec-file --pathspec-from-file=list >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success '--pathspec-file-nul takes quotes literally' '
+	# Note: there is an extra newline because --pathspec-file-nul takes
+	# input \n literally, too
+	cat >expect <<-\EOF &&
+	"file\101.t"
+
+	EOF
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test-tool parse-pathspec-file --pathspec-from-file=list --pathspec-file-nul >actual &&
+
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t0068-for-each-repo.sh b/t/t0068-for-each-repo.sh
new file mode 100755
index 0000000000..4675e85251
--- /dev/null
+++ b/t/t0068-for-each-repo.sh
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+test_description='git for-each-repo builtin'
+
+. ./test-lib.sh
+
+test_expect_success 'run based on configured value' '
+	git init one &&
+	git init two &&
+	git init three &&
+	git -C two commit --allow-empty -m "DID NOT RUN" &&
+	git config run.key "$TRASH_DIRECTORY/one" &&
+	git config --add run.key "$TRASH_DIRECTORY/three" &&
+	git for-each-repo --config=run.key commit --allow-empty -m "ran" &&
+	git -C one log -1 --pretty=format:%s >message &&
+	grep ran message &&
+	git -C two log -1 --pretty=format:%s >message &&
+	! grep ran message &&
+	git -C three log -1 --pretty=format:%s >message &&
+	grep ran message &&
+	git for-each-repo --config=run.key -- commit --allow-empty -m "ran again" &&
+	git -C one log -1 --pretty=format:%s >message &&
+	grep again message &&
+	git -C two log -1 --pretty=format:%s >message &&
+	! grep again message &&
+	git -C three log -1 --pretty=format:%s >message &&
+	grep again message
+'
+
+test_expect_success 'do nothing on empty config' '
+	# the whole thing would fail if for-each-ref iterated even
+	# once, because "git help --no-such-option" would fail
+	git for-each-repo --config=bogus.config -- help --no-such-option
+'
+
+test_done
diff --git a/t/t0069-oidtree.sh b/t/t0069-oidtree.sh
new file mode 100755
index 0000000000..bfb1397d7b
--- /dev/null
+++ b/t/t0069-oidtree.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+test_description='basic tests for the oidtree implementation'
+. ./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/t0070-fundamental.sh b/t/t0070-fundamental.sh
index 7b111a56fd..8d59905ef0 100755
--- a/t/t0070-fundamental.sh
+++ b/t/t0070-fundamental.sh
@@ -34,4 +34,22 @@ test_expect_success 'check for a bug in the regex routines' '
 	test-tool regex --bug
 '
 
+test_expect_success 'incomplete sideband messages are reassembled' '
+	test-tool pkt-line send-split-sideband >split-sideband &&
+	test-tool pkt-line receive-sideband <split-sideband 2>err &&
+	grep "Hello, world" err
+'
+
+test_expect_success 'eof on sideband message is reported' '
+	printf 1234 >input &&
+	test-tool pkt-line receive-sideband <input 2>err &&
+	test_i18ngrep "unexpected disconnect" err
+'
+
+test_expect_success 'missing sideband designator is reported' '
+	printf 0004 >input &&
+	test-tool pkt-line receive-sideband <input 2>err &&
+	test_i18ngrep "missing sideband" err
+'
+
 test_done
diff --git a/t/t0081-line-buffer.sh b/t/t0081-line-buffer.sh
deleted file mode 100755
index ce92e6acad..0000000000
--- a/t/t0081-line-buffer.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/sh
-
-test_description="Test the svn importer's input handling routines.
-
-These tests provide some simple checks that the line_buffer API
-behaves as advertised.
-
-While at it, check that input of newlines and null bytes are handled
-correctly.
-"
-. ./test-lib.sh
-
-test_expect_success 'hello world' '
-	echo ">HELLO" >expect &&
-	test-line-buffer <<-\EOF >actual &&
-	binary 6
-	HELLO
-	EOF
-	test_cmp expect actual
-'
-
-test_expect_success '0-length read, send along greeting' '
-	echo ">HELLO" >expect &&
-	test-line-buffer <<-\EOF >actual &&
-	binary 0
-	copy 6
-	HELLO
-	EOF
-	test_cmp expect actual
-'
-
-test_expect_success !MINGW 'read from file descriptor' '
-	rm -f input &&
-	echo hello >expect &&
-	echo hello >input &&
-	echo copy 6 |
-	test-line-buffer "&4" 4<input >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'skip, copy null byte' '
-	echo Q | q_to_nul >expect &&
-	q_to_nul <<-\EOF | test-line-buffer >actual &&
-	skip 2
-	Q
-	copy 2
-	Q
-	EOF
-	test_cmp expect actual
-'
-
-test_expect_success 'read null byte' '
-	echo ">QhelloQ" | q_to_nul >expect &&
-	q_to_nul <<-\EOF | test-line-buffer >actual &&
-	binary 8
-	QhelloQ
-	EOF
-	test_cmp expect actual
-'
-
-test_expect_success 'long reads are truncated' '
-	echo ">foo" >expect &&
-	test-line-buffer <<-\EOF >actual &&
-	binary 5
-	foo
-	EOF
-	test_cmp expect actual
-'
-
-test_expect_success 'long copies are truncated' '
-	printf "%s\n" ">" foo >expect &&
-	test-line-buffer <<-\EOF >actual &&
-	binary 1
-
-	copy 5
-	foo
-	EOF
-	test_cmp expect actual
-'
-
-test_expect_success 'long binary reads are truncated' '
-	echo ">foo" >expect &&
-	test-line-buffer <<-\EOF >actual &&
-	binary 5
-	foo
-	EOF
-	test_cmp expect actual
-'
-
-test_done
diff --git a/t/t0090-cache-tree.sh b/t/t0090-cache-tree.sh
index ce9a4a5f32..9bf66c9e68 100755
--- a/t/t0090-cache-tree.sh
+++ b/t/t0090-cache-tree.sh
@@ -10,39 +10,36 @@ cache-tree extension.
 cmp_cache_tree () {
 	test-tool dump-cache-tree | sed -e '/#(ref)/d' >actual &&
 	sed "s/$OID_REGEX/SHA/" <actual >filtered &&
-	test_cmp "$1" filtered
+	test_cmp "$1" filtered &&
+	rm filtered
 }
 
 # We don't bother with actually checking the SHA1:
 # test-tool dump-cache-tree already verifies that all existing data is
 # correct.
-generate_expected_cache_tree_rec () {
-	dir="$1${1:+/}" &&
-	parent="$2" &&
-	# ls-files might have foo/bar, foo/bar/baz, and foo/bar/quux
-	# We want to count only foo because it's the only direct child
-	subtrees=$(git ls-files|grep /|cut -d / -f 1|uniq) &&
-	subtree_count=$(echo "$subtrees"|awk -v c=0 '$1 != "" {++c} END {print c}') &&
-	entries=$(git ls-files|wc -l) &&
-	printf "SHA $dir (%d entries, %d subtrees)\n" "$entries" "$subtree_count" &&
-	for subtree in $subtrees
-	do
-		cd "$subtree"
-		generate_expected_cache_tree_rec "$dir$subtree" "$dir" || return 1
-		cd ..
-	done &&
-	dir=$parent
-}
-
 generate_expected_cache_tree () {
-	(
-		generate_expected_cache_tree_rec
-	)
+	pathspec="$1" &&
+	dir="$2${2:+/}" &&
+	git ls-tree --name-only HEAD -- "$pathspec" >files &&
+	git ls-tree --name-only -d HEAD -- "$pathspec" >subtrees &&
+	printf "SHA %s (%d entries, %d subtrees)\n" "$dir" $(wc -l <files) $(wc -l <subtrees) &&
+	while read subtree
+	do
+		generate_expected_cache_tree "$pathspec/$subtree/" "$subtree" || return 1
+	done <subtrees
 }
 
 test_cache_tree () {
-	generate_expected_cache_tree >expect &&
-	cmp_cache_tree expect
+	generate_expected_cache_tree "." >expect &&
+	cmp_cache_tree expect &&
+	rm expect actual files subtrees &&
+	git status --porcelain -- ':!status' ':!expected.status' >status &&
+	if test -n "$1"
+	then
+		test_cmp "$1" status
+	else
+		test_must_be_empty status
+	fi
 }
 
 test_invalid_cache_tree () {
@@ -53,7 +50,7 @@ test_invalid_cache_tree () {
 }
 
 test_no_cache_tree () {
-	: >expect &&
+	>expect &&
 	cmp_cache_tree expect
 }
 
@@ -82,18 +79,6 @@ test_expect_success 'git-add in subdir invalidates cache-tree' '
 	test_invalid_cache_tree
 '
 
-cat >before <<\EOF
-SHA  (3 entries, 2 subtrees)
-SHA dir1/ (1 entries, 0 subtrees)
-SHA dir2/ (1 entries, 0 subtrees)
-EOF
-
-cat >expect <<\EOF
-invalid                                   (2 subtrees)
-invalid                                  dir1/ (0 subtrees)
-SHA dir2/ (1 entries, 0 subtrees)
-EOF
-
 test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
 	git tag no-children &&
 	test_when_finished "git reset --hard no-children; git read-tree HEAD" &&
@@ -101,9 +86,20 @@ test_expect_success 'git-add in subdir does not invalidate sibling cache-tree' '
 	test_commit dir1/a &&
 	test_commit dir2/b &&
 	echo "I changed this file" >dir1/a &&
+	test_when_finished "rm before" &&
+	cat >before <<-\EOF &&
+	SHA  (3 entries, 2 subtrees)
+	SHA dir1/ (1 entries, 0 subtrees)
+	SHA dir2/ (1 entries, 0 subtrees)
+	EOF
 	cmp_cache_tree before &&
 	echo "I changed this file" >dir1/a &&
 	git add dir1/a &&
+	cat >expect <<-\EOF &&
+	invalid                                   (2 subtrees)
+	invalid                                  dir1/ (0 subtrees)
+	SHA dir2/ (1 entries, 0 subtrees)
+	EOF
 	cmp_cache_tree expect
 '
 
@@ -132,6 +128,7 @@ test_expect_success 'second commit has cache-tree' '
 '
 
 test_expect_success PERL 'commit --interactive gives cache-tree on partial commit' '
+	test_when_finished "git reset --hard" &&
 	cat <<-\EOT >foo.c &&
 	int foo()
 	{
@@ -158,7 +155,10 @@ test_expect_success PERL 'commit --interactive gives cache-tree on partial commi
 	EOT
 	test_write_lines p 1 "" s n y q |
 	git commit --interactive -m foo &&
-	test_cache_tree
+	cat <<-\EOF >expected.status &&
+	 M foo.c
+	EOF
+	test_cache_tree expected.status
 '
 
 test_expect_success PERL 'commit -p with shrinking cache-tree' '
@@ -249,7 +249,10 @@ test_expect_success 'partial commit gives cache-tree' '
 	git add one.t &&
 	echo "some other change" >two.t &&
 	git commit two.t -m partial &&
-	test_cache_tree
+	cat <<-\EOF >expected.status &&
+	M  one.t
+	EOF
+	test_cache_tree expected.status
 '
 
 test_expect_success 'no phantom error when switching trees' '
diff --git a/t/t0091-bugreport.sh b/t/t0091-bugreport.sh
new file mode 100755
index 0000000000..526304ff95
--- /dev/null
+++ b/t/t0091-bugreport.sh
@@ -0,0 +1,76 @@
+#!/bin/sh
+
+test_description='git bugreport'
+
+. ./test-lib.sh
+
+# Headers "[System Info]" will be followed by a non-empty line if we put some
+# information there; we can make sure all our headers were followed by some
+# information to check if the command was successful.
+HEADER_PATTERN="^\[.*\]$"
+
+check_all_headers_populated () {
+	while read -r line
+	do
+		if test "$(grep "$HEADER_PATTERN" "$line")"
+		then
+			echo "$line"
+			read -r nextline
+			if test -z "$nextline"; then
+				return 1;
+			fi
+		fi
+	done
+}
+
+test_expect_success 'creates a report with content in the right places' '
+	test_when_finished rm git-bugreport-check-headers.txt &&
+	git bugreport -s check-headers &&
+	check_all_headers_populated <git-bugreport-check-headers.txt
+'
+
+test_expect_success 'dies if file with same name as report already exists' '
+	test_when_finished rm git-bugreport-duplicate.txt &&
+	>>git-bugreport-duplicate.txt &&
+	test_must_fail git bugreport --suffix duplicate
+'
+
+test_expect_success '--output-directory puts the report in the provided dir' '
+	test_when_finished rm -fr foo/ &&
+	git bugreport -o foo/ &&
+	test_path_is_file foo/git-bugreport-*
+'
+
+test_expect_success 'incorrect arguments abort with usage' '
+	test_must_fail git bugreport --false 2>output &&
+	test_i18ngrep usage output &&
+	test_path_is_missing git-bugreport-*
+'
+
+test_expect_success 'runs outside of a git dir' '
+	test_when_finished rm non-repo/git-bugreport-* &&
+	nongit git bugreport
+'
+
+test_expect_success 'can create leading directories outside of a git dir' '
+	test_when_finished rm -fr foo/bar/baz &&
+	nongit git bugreport -o foo/bar/baz
+'
+
+test_expect_success 'indicates populated hooks' '
+	test_when_finished rm git-bugreport-hooks.txt &&
+	test_when_finished rm -fr .git/hooks &&
+	rm -fr .git/hooks &&
+	mkdir .git/hooks &&
+	for hook in applypatch-msg prepare-commit-msg.sample
+	do
+		write_script ".git/hooks/$hook" <<-EOF || return 1
+		echo "hook $hook exists"
+		EOF
+	done &&
+	git bugreport -s hooks &&
+	grep applypatch-msg git-bugreport-hooks.txt &&
+	! grep prepare-commit-msg git-bugreport-hooks.txt
+'
+
+test_done
diff --git a/t/t0095-bloom.sh b/t/t0095-bloom.sh
new file mode 100755
index 0000000000..7e4ab1795f
--- /dev/null
+++ b/t/t0095-bloom.sh
@@ -0,0 +1,117 @@
+#!/bin/sh
+
+test_description='Testing the various Bloom filter computations in bloom.c'
+. ./test-lib.sh
+
+test_expect_success 'compute unseeded murmur3 hash for empty string' '
+	cat >expect <<-\EOF &&
+	Murmur3 Hash with seed=0:0x00000000
+	EOF
+	test-tool bloom get_murmur3 "" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'compute unseeded murmur3 hash for test string 1' '
+	cat >expect <<-\EOF &&
+	Murmur3 Hash with seed=0:0x627b0c2c
+	EOF
+	test-tool bloom get_murmur3 "Hello world!" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'compute unseeded murmur3 hash for test string 2' '
+	cat >expect <<-\EOF &&
+	Murmur3 Hash with seed=0:0x2e4ff723
+	EOF
+	test-tool bloom get_murmur3 "The quick brown fox jumps over the lazy dog" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'compute bloom key for empty string' '
+	cat >expect <<-\EOF &&
+	Hashes:0x5615800c|0x5b966560|0x61174ab4|0x66983008|0x6c19155c|0x7199fab0|0x771ae004|
+	Filter_Length:2
+	Filter_Data:11|11|
+	EOF
+	test-tool bloom generate_filter "" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'compute bloom key for whitespace' '
+	cat >expect <<-\EOF &&
+	Hashes:0xf178874c|0x5f3d6eb6|0xcd025620|0x3ac73d8a|0xa88c24f4|0x16510c5e|0x8415f3c8|
+	Filter_Length:2
+	Filter_Data:51|55|
+	EOF
+	test-tool bloom generate_filter " " >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'compute bloom key for test string 1' '
+	cat >expect <<-\EOF &&
+	Hashes:0xb270de9b|0x1bb6f26e|0x84fd0641|0xee431a14|0x57892de7|0xc0cf41ba|0x2a15558d|
+	Filter_Length:2
+	Filter_Data:92|6c|
+	EOF
+	test-tool bloom generate_filter "Hello world!" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'compute bloom key for test string 2' '
+	cat >expect <<-\EOF &&
+	Hashes:0x20ab385b|0xf5237fe2|0xc99bc769|0x9e140ef0|0x728c5677|0x47049dfe|0x1b7ce585|
+	Filter_Length:2
+	Filter_Data:a5|4a|
+	EOF
+	test-tool bloom generate_filter "file.txt" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'get bloom filters for commit with no changes' '
+	git init &&
+	git commit --allow-empty -m "c0" &&
+	cat >expect <<-\EOF &&
+	Filter_Length:1
+	Filter_Data:00|
+	EOF
+	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'get bloom filter for commit with 10 changes' '
+	rm actual &&
+	rm expect &&
+	mkdir smallDir &&
+	for i in $(test_seq 0 9)
+	do
+		echo $i >smallDir/$i
+	done &&
+	git add smallDir &&
+	git commit -m "commit with 10 changes" &&
+	cat >expect <<-\EOF &&
+	Filter_Length:14
+	Filter_Data:02|b3|c4|a0|34|e7|fe|eb|cb|47|fe|a0|e8|72|
+	EOF
+	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success EXPENSIVE 'get bloom filter for commit with 513 changes' '
+	rm actual &&
+	rm expect &&
+	mkdir bigDir &&
+	for i in $(test_seq 0 511)
+	do
+		echo $i >bigDir/$i
+	done &&
+	git add bigDir &&
+	git commit -m "commit with 513 changes" &&
+	cat >expect <<-\EOF &&
+	Filter_Length:1
+	Filter_Data:ff|
+	EOF
+	test-tool bloom get_filter_for_commit "$(git rev-parse HEAD)" >actual &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t0100-previous.sh b/t/t0100-previous.sh
index 58c0b7e9b6..69beb59f62 100755
--- a/t/t0100-previous.sh
+++ b/t/t0100-previous.sh
@@ -2,13 +2,16 @@
 
 test_description='previous branch syntax @{-n}'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'branch -d @{-1}' '
 	test_commit A &&
 	git checkout -b junk &&
 	git checkout - &&
-	test "$(git symbolic-ref HEAD)" = refs/heads/master &&
+	test "$(git symbolic-ref HEAD)" = refs/heads/main &&
 	git branch -d @{-1} &&
 	test_must_fail git rev-parse --verify refs/heads/junk
 '
@@ -17,9 +20,9 @@ test_expect_success 'branch -d @{-12} when there is not enough switches yet' '
 	git reflog expire --expire=now &&
 	git checkout -b junk2 &&
 	git checkout - &&
-	test "$(git symbolic-ref HEAD)" = refs/heads/master &&
+	test "$(git symbolic-ref HEAD)" = refs/heads/main &&
 	test_must_fail git branch -d @{-12} &&
-	git rev-parse --verify refs/heads/master
+	git rev-parse --verify refs/heads/main
 '
 
 test_expect_success 'merge @{-1}' '
@@ -28,19 +31,19 @@ test_expect_success 'merge @{-1}' '
 	git checkout A &&
 	test_commit C &&
 	test_commit D &&
-	git branch -f master B &&
+	git branch -f main B &&
 	git branch -f other &&
 	git checkout other &&
-	git checkout master &&
+	git checkout main &&
 	git merge @{-1} &&
 	git cat-file commit HEAD | grep "Merge branch '\''other'\''"
 '
 
 test_expect_success 'merge @{-1}~1' '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard B &&
 	git checkout other &&
-	git checkout master &&
+	git checkout main &&
 	git merge @{-1}~1 &&
 	git cat-file commit HEAD >actual &&
 	grep "Merge branch '\''other'\''" actual
@@ -48,11 +51,11 @@ test_expect_success 'merge @{-1}~1' '
 
 test_expect_success 'merge @{-100} before checking out that many branches yet' '
 	git reflog expire --expire=now &&
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard B &&
 	git branch -f other C &&
 	git checkout other &&
-	git checkout master &&
+	git checkout main &&
 	test_must_fail git merge @{-100}
 '
 
diff --git a/t/t0201-gettext-fallbacks.sh b/t/t0201-gettext-fallbacks.sh
index 90da1c7ddc..6c74df0dc6 100755
--- a/t/t0201-gettext-fallbacks.sh
+++ b/t/t0201-gettext-fallbacks.sh
@@ -18,7 +18,7 @@ test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_TEST_FALLBACKS is set' '
     test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
 '
 
-test_expect_success C_LOCALE_OUTPUT 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '
+test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is fallthrough' '
     echo fallthrough >expect &&
     echo $GIT_INTERNAL_GETTEXT_SH_SCHEME >actual &&
     test_cmp expect actual
@@ -27,25 +27,25 @@ test_expect_success C_LOCALE_OUTPUT 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is
 test_expect_success 'gettext: our gettext() fallback has pass-through semantics' '
     printf "test" >expect &&
     gettext "test" >actual &&
-    test_i18ncmp expect actual &&
+    test_cmp expect actual &&
     printf "test more words" >expect &&
     gettext "test more words" >actual &&
-    test_i18ncmp expect actual
+    test_cmp expect actual
 '
 
 test_expect_success 'eval_gettext: our eval_gettext() fallback has pass-through semantics' '
     printf "test" >expect &&
     eval_gettext "test" >actual &&
-    test_i18ncmp expect actual &&
+    test_cmp expect actual &&
     printf "test more words" >expect &&
     eval_gettext "test more words" >actual &&
-    test_i18ncmp expect actual
+    test_cmp expect actual
 '
 
 test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables' '
     printf "test YesPlease" >expect &&
     GIT_INTERNAL_GETTEXT_TEST_FALLBACKS=YesPlease eval_gettext "test \$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS" >actual &&
-    test_i18ncmp expect actual
+    test_cmp expect actual
 '
 
 test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces' '
@@ -53,7 +53,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
     export cmdline &&
     printf "When you have resolved this problem, run git am --resolved." >expect &&
     eval_gettext "When you have resolved this problem, run \$cmdline --resolved." >actual &&
-    test_i18ncmp expect actual
+    test_cmp expect actual
 '
 
 test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate variables with spaces and quotes' '
@@ -61,7 +61,7 @@ test_expect_success 'eval_gettext: our eval_gettext() fallback can interpolate v
     export cmdline &&
     printf "When you have resolved this problem, run \"git am --resolved\"." >expect &&
     eval_gettext "When you have resolved this problem, run \"\$cmdline --resolved\"." >actual &&
-    test_i18ncmp expect actual
+    test_cmp expect actual
 '
 
 test_done
diff --git a/t/t0205-gettext-poison.sh b/t/t0205-gettext-poison.sh
deleted file mode 100755
index f9fa16ad83..0000000000
--- a/t/t0205-gettext-poison.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2010 Ævar Arnfjörð Bjarmason
-#
-
-test_description='Gettext Shell poison'
-
-GIT_TEST_GETTEXT_POISON=true
-export GIT_TEST_GETTEXT_POISON
-. ./lib-gettext.sh
-
-test_expect_success 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison' '
-    test "$GIT_INTERNAL_GETTEXT_SH_SCHEME" = "poison"
-'
-
-test_expect_success 'gettext: our gettext() fallback has poison semantics' '
-    printf "# GETTEXT POISON #" >expect &&
-    gettext "test" >actual &&
-    test_cmp expect actual &&
-    printf "# GETTEXT POISON #" >expect &&
-    gettext "test more words" >actual &&
-    test_cmp expect actual
-'
-
-test_expect_success 'eval_gettext: our eval_gettext() fallback has poison semantics' '
-    printf "# GETTEXT POISON #" >expect &&
-    eval_gettext "test" >actual &&
-    test_cmp expect actual &&
-    printf "# GETTEXT POISON #" >expect &&
-    eval_gettext "test more words" >actual &&
-    test_cmp expect actual
-'
-
-test_expect_success "gettext: invalid GIT_TEST_GETTEXT_POISON value doesn't infinitely loop" "
-	test_must_fail env GIT_TEST_GETTEXT_POISON=xyz git version 2>error &&
-	grep \"fatal: bad numeric config value 'xyz' for 'GIT_TEST_GETTEXT_POISON': invalid unit\" error
-"
-
-test_done
diff --git a/t/t0210-trace2-normal.sh b/t/t0210-trace2-normal.sh
index ce7574edb1..0cf3a63b75 100755
--- a/t/t0210-trace2-normal.sh
+++ b/t/t0210-trace2-normal.sh
@@ -147,6 +147,25 @@ test_expect_success 'normal stream, error event' '
 	test_cmp expect actual
 '
 
+# Verb 007bug
+#
+# Check that BUG writes to trace2
+
+test_expect_success 'BUG messages are written to trace2' '
+	test_when_finished "rm trace.normal actual expect" &&
+	test_must_fail env GIT_TRACE2="$(pwd)/trace.normal" test-tool trace2 007bug &&
+	perl "$TEST_DIRECTORY/t0210/scrub_normal.perl" <trace.normal >actual &&
+	cat >expect <<-EOF &&
+		version $V
+		start _EXE_ trace2 007bug
+		cmd_name trace2 (trace2)
+		error the bug message
+		exit elapsed:_TIME_ code:99
+		atexit elapsed:_TIME_ code:99
+	EOF
+	test_cmp expect actual
+'
+
 sane_unset GIT_TRACE2_BRIEF
 
 # Now test without environment variables and get all Trace2 settings
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/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 7065a1b937..1529155cf0 100755
--- a/t/t0212-trace2-event.sh
+++ b/t/t0212-trace2-event.sh
@@ -199,6 +199,43 @@ test_expect_success JSON_PP 'event stream, list config' '
 	test_cmp expect actual
 '
 
+# Test listing of all "interesting" environment variables.
+
+test_expect_success JSON_PP 'event stream, list env vars' '
+	test_when_finished "rm trace.event actual expect" &&
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+		GIT_TRACE2_ENV_VARS="A_VAR,OTHER_VAR,MISSING" \
+		A_VAR=1 OTHER_VAR="hello world" test-tool trace2 001return 0 &&
+	perl "$TEST_DIRECTORY/t0212/parse_events.perl" <trace.event >actual &&
+	sed -e "s/^|//" >expect <<-EOF &&
+	|VAR1 = {
+	|  "_SID0_":{
+	|    "argv":[
+	|      "_EXE_",
+	|      "trace2",
+	|      "001return",
+	|      "0"
+	|    ],
+	|    "exit_code":0,
+	|    "hierarchy":"trace2",
+	|    "name":"trace2",
+	|    "params":[
+	|      {
+	|        "param":"A_VAR",
+	|        "value":"1"
+	|      },
+	|      {
+	|        "param":"OTHER_VAR",
+	|        "value":"hello world"
+	|      }
+	|    ],
+	|    "version":"$V"
+	|  }
+	|};
+	EOF
+	test_cmp expect actual
+'
+
 test_expect_success JSON_PP 'basic trace2_data' '
 	test_when_finished "rm trace.event actual expect" &&
 	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool trace2 006data test_category k1 v1 test_category k2 v2 &&
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/t0300-credentials.sh b/t/t0300-credentials.sh
index 82eaaea0f4..3485c0534e 100755
--- a/t/t0300-credentials.sh
+++ b/t/t0300-credentials.sh
@@ -22,6 +22,11 @@ test_expect_success 'setup helper scripts' '
 	exit 0
 	EOF
 
+	write_script git-credential-quit <<-\EOF &&
+	. ./dump
+	echo quit=1
+	EOF
+
 	write_script git-credential-verbatim <<-\EOF &&
 	user=$1; shift
 	pass=$1; shift
@@ -35,43 +40,71 @@ test_expect_success 'setup helper scripts' '
 
 test_expect_success 'credential_fill invokes helper' '
 	check fill "verbatim foo bar" <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=foo
 	password=bar
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	EOF
 '
 
 test_expect_success 'credential_fill invokes multiple helpers' '
 	check fill useless "verbatim foo bar" <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=foo
 	password=bar
 	--
 	useless: get
+	useless: protocol=http
+	useless: host=example.com
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	EOF
 '
 
 test_expect_success 'credential_fill stops when we get a full response' '
 	check fill "verbatim one two" "verbatim three four" <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=one
 	password=two
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	EOF
 '
 
 test_expect_success 'credential_fill continues through partial response' '
 	check fill "verbatim one \"\"" "verbatim two three" <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=two
 	password=three
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: username=one
 	EOF
 '
@@ -97,14 +130,20 @@ test_expect_success 'credential_fill passes along metadata' '
 
 test_expect_success 'credential_approve calls all helpers' '
 	check approve useless "verbatim one two" <<-\EOF
+	protocol=http
+	host=example.com
 	username=foo
 	password=bar
 	--
 	--
 	useless: store
+	useless: protocol=http
+	useless: host=example.com
 	useless: username=foo
 	useless: password=bar
 	verbatim: store
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: username=foo
 	verbatim: password=bar
 	EOF
@@ -112,6 +151,8 @@ test_expect_success 'credential_approve calls all helpers' '
 
 test_expect_success 'do not bother storing password-less credential' '
 	check approve useless <<-\EOF
+	protocol=http
+	host=example.com
 	username=foo
 	--
 	--
@@ -121,14 +162,20 @@ test_expect_success 'do not bother storing password-less credential' '
 
 test_expect_success 'credential_reject calls all helpers' '
 	check reject useless "verbatim one two" <<-\EOF
+	protocol=http
+	host=example.com
 	username=foo
 	password=bar
 	--
 	--
 	useless: erase
+	useless: protocol=http
+	useless: host=example.com
 	useless: username=foo
 	useless: password=bar
 	verbatim: erase
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: username=foo
 	verbatim: password=bar
 	EOF
@@ -136,33 +183,49 @@ test_expect_success 'credential_reject calls all helpers' '
 
 test_expect_success 'usernames can be preserved' '
 	check fill "verbatim \"\" three" <<-\EOF
+	protocol=http
+	host=example.com
 	username=one
 	--
+	protocol=http
+	host=example.com
 	username=one
 	password=three
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: username=one
 	EOF
 '
 
 test_expect_success 'usernames can be overridden' '
 	check fill "verbatim two three" <<-\EOF
+	protocol=http
+	host=example.com
 	username=one
 	--
+	protocol=http
+	host=example.com
 	username=two
 	password=three
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
 	verbatim: username=one
 	EOF
 '
 
 test_expect_success 'do not bother completing already-full credential' '
 	check fill "verbatim three four" <<-\EOF
+	protocol=http
+	host=example.com
 	username=one
 	password=two
 	--
+	protocol=http
+	host=example.com
 	username=one
 	password=two
 	--
@@ -174,24 +237,58 @@ test_expect_success 'do not bother completing already-full credential' '
 # askpass helper is run, we know the internal getpass is working.
 test_expect_success 'empty helper list falls back to internal getpass' '
 	check fill <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=askpass-username
 	password=askpass-password
 	--
-	askpass: Username:
-	askpass: Password:
+	askpass: Username for '\''http://example.com'\'':
+	askpass: Password for '\''http://askpass-username@example.com'\'':
 	EOF
 '
 
 test_expect_success 'internal getpass does not ask for known username' '
 	check fill <<-\EOF
+	protocol=http
+	host=example.com
 	username=foo
 	--
+	protocol=http
+	host=example.com
 	username=foo
 	password=askpass-password
 	--
-	askpass: Password:
+	askpass: Password for '\''http://foo@example.com'\'':
+	EOF
+'
+
+test_expect_success 'git-credential respects core.askPass' '
+	write_script alternate-askpass <<-\EOF &&
+	echo >&2 "alternate askpass invoked"
+	echo alternate-value
 	EOF
+	test_config core.askpass "$PWD/alternate-askpass" &&
+	(
+		# unset GIT_ASKPASS set by lib-credential.sh which would
+		# override our config, but do so in a subshell so that we do
+		# not interfere with other tests
+		sane_unset GIT_ASKPASS &&
+		check fill <<-\EOF
+		protocol=http
+		host=example.com
+		--
+		protocol=http
+		host=example.com
+		username=alternate-value
+		password=alternate-value
+		--
+		alternate askpass invoked
+		alternate askpass invoked
+		EOF
+	)
 '
 
 HELPER="!f() {
@@ -202,7 +299,11 @@ HELPER="!f() {
 test_expect_success 'respect configured credentials' '
 	test_config credential.helper "$HELPER" &&
 	check fill <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=foo
 	password=bar
 	--
@@ -240,6 +341,102 @@ test_expect_success 'do not match configured credential' '
 	EOF
 '
 
+test_expect_success 'match multiple configured helpers' '
+	test_config credential.helper "verbatim \"\" \"\"" &&
+	test_config credential.https://example.com.helper "$HELPER" &&
+	check fill <<-\EOF
+	protocol=https
+	host=example.com
+	path=repo.git
+	--
+	protocol=https
+	host=example.com
+	username=foo
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	EOF
+'
+
+test_expect_success 'match multiple configured helpers with URLs' '
+	test_config credential.https://example.com/repo.git.helper "verbatim \"\" \"\"" &&
+	test_config credential.https://example.com.helper "$HELPER" &&
+	check fill <<-\EOF
+	protocol=https
+	host=example.com
+	path=repo.git
+	--
+	protocol=https
+	host=example.com
+	username=foo
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	EOF
+'
+
+test_expect_success 'match percent-encoded values' '
+	test_config credential.https://example.com/%2566.git.helper "$HELPER" &&
+	check fill <<-\EOF
+	url=https://example.com/%2566.git
+	--
+	protocol=https
+	host=example.com
+	username=foo
+	password=bar
+	--
+	EOF
+'
+
+test_expect_success 'match percent-encoded UTF-8 values in path' '
+	test_config credential.https://example.com.useHttpPath true &&
+	test_config credential.https://example.com/perú.git.helper "$HELPER" &&
+	check fill <<-\EOF
+	url=https://example.com/per%C3%BA.git
+	--
+	protocol=https
+	host=example.com
+	path=perú.git
+	username=foo
+	password=bar
+	--
+	EOF
+'
+
+test_expect_success 'match percent-encoded values in username' '
+	test_config credential.https://user%2fname@example.com/foo/bar.git.helper "$HELPER" &&
+	check fill <<-\EOF
+	url=https://user%2fname@example.com/foo/bar.git
+	--
+	protocol=https
+	host=example.com
+	username=foo
+	password=bar
+	--
+	EOF
+'
+
+test_expect_success 'fetch with multiple path components' '
+	test_unconfig credential.helper &&
+	test_config credential.https://example.com/foo/repo.git.helper "verbatim foo bar" &&
+	check fill <<-\EOF
+	url=https://example.com/foo/repo.git
+	--
+	protocol=https
+	host=example.com
+	username=foo
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	EOF
+'
+
 test_expect_success 'pull username from config' '
 	test_config credential.https://example.com.username foo &&
 	check fill <<-\EOF
@@ -255,6 +452,63 @@ test_expect_success 'pull username from config' '
 	EOF
 '
 
+test_expect_success 'honors username from URL over helper (URL)' '
+	test_config credential.https://example.com.username bob &&
+	test_config credential.https://example.com.helper "verbatim \"\" bar" &&
+	check fill <<-\EOF
+	url=https://alice@example.com
+	--
+	protocol=https
+	host=example.com
+	username=alice
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	verbatim: username=alice
+	EOF
+'
+
+test_expect_success 'honors username from URL over helper (components)' '
+	test_config credential.https://example.com.username bob &&
+	test_config credential.https://example.com.helper "verbatim \"\" bar" &&
+	check fill <<-\EOF
+	protocol=https
+	host=example.com
+	username=alice
+	--
+	protocol=https
+	host=example.com
+	username=alice
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	verbatim: username=alice
+	EOF
+'
+
+test_expect_success 'last matching username wins' '
+	test_config credential.https://example.com/path.git.username bob &&
+	test_config credential.https://example.com.username alice &&
+	test_config credential.https://example.com.helper "verbatim \"\" bar" &&
+	check fill <<-\EOF
+	url=https://example.com/path.git
+	--
+	protocol=https
+	host=example.com
+	username=alice
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.com
+	verbatim: username=alice
+	EOF
+'
+
 test_expect_success 'http paths can be part of context' '
 	check fill "verbatim foo bar" <<-\EOF &&
 	protocol=https
@@ -289,23 +543,179 @@ test_expect_success 'http paths can be part of context' '
 	EOF
 '
 
+test_expect_success 'context uses urlmatch' '
+	test_config "credential.https://*.org.useHttpPath" true &&
+	check fill "verbatim foo bar" <<-\EOF
+	protocol=https
+	host=example.org
+	path=foo.git
+	--
+	protocol=https
+	host=example.org
+	path=foo.git
+	username=foo
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=example.org
+	verbatim: path=foo.git
+	EOF
+'
+
 test_expect_success 'helpers can abort the process' '
 	test_must_fail git \
-		-c credential.helper="!f() { echo quit=1; }; f" \
+		-c credential.helper=quit \
 		-c credential.helper="verbatim foo bar" \
-		credential fill >stdout &&
-	test_must_be_empty stdout
+		credential fill >stdout 2>stderr <<-\EOF &&
+	protocol=http
+	host=example.com
+	EOF
+	test_must_be_empty stdout &&
+	cat >expect <<-\EOF &&
+	quit: get
+	quit: protocol=http
+	quit: host=example.com
+	fatal: credential helper '\''quit'\'' told us to quit
+	EOF
+	test_cmp expect stderr
 '
 
 test_expect_success 'empty helper spec resets helper list' '
 	test_config credential.helper "verbatim file file" &&
 	check fill "" "verbatim cmdline cmdline" <<-\EOF
+	protocol=http
+	host=example.com
 	--
+	protocol=http
+	host=example.com
 	username=cmdline
 	password=cmdline
 	--
 	verbatim: get
+	verbatim: protocol=http
+	verbatim: host=example.com
+	EOF
+'
+
+test_expect_success 'url parser rejects embedded newlines' '
+	test_must_fail git credential fill 2>stderr <<-\EOF &&
+	url=https://one.example.com?%0ahost=two.example.com/
+	EOF
+	cat >expect <<-\EOF &&
+	warning: url contains a newline in its path component: https://one.example.com?%0ahost=two.example.com/
+	fatal: credential url cannot be parsed: https://one.example.com?%0ahost=two.example.com/
+	EOF
+	test_cmp expect stderr
+'
+
+test_expect_success 'host-less URLs are parsed as empty host' '
+	check fill "verbatim foo bar" <<-\EOF
+	url=cert:///path/to/cert.pem
+	--
+	protocol=cert
+	host=
+	path=path/to/cert.pem
+	username=foo
+	password=bar
+	--
+	verbatim: get
+	verbatim: protocol=cert
+	verbatim: host=
+	verbatim: path=path/to/cert.pem
 	EOF
 '
 
+test_expect_success 'credential system refuses to work with missing host' '
+	test_must_fail git credential fill 2>stderr <<-\EOF &&
+	protocol=http
+	EOF
+	cat >expect <<-\EOF &&
+	fatal: refusing to work with credential missing host field
+	EOF
+	test_cmp expect stderr
+'
+
+test_expect_success 'credential system refuses to work with missing protocol' '
+	test_must_fail git credential fill 2>stderr <<-\EOF &&
+	host=example.com
+	EOF
+	cat >expect <<-\EOF &&
+	fatal: refusing to work with credential missing protocol field
+	EOF
+	test_cmp expect stderr
+'
+
+# usage: check_host_and_path <url> <expected-host> <expected-path>
+check_host_and_path () {
+	# we always parse the path component, but we need this to make sure it
+	# is passed to the helper
+	test_config credential.useHTTPPath true &&
+	check fill "verbatim user pass" <<-EOF
+	url=$1
+	--
+	protocol=https
+	host=$2
+	path=$3
+	username=user
+	password=pass
+	--
+	verbatim: get
+	verbatim: protocol=https
+	verbatim: host=$2
+	verbatim: path=$3
+	EOF
+}
+
+test_expect_success 'url parser handles bare query marker' '
+	check_host_and_path https://example.com?foo.git example.com ?foo.git
+'
+
+test_expect_success 'url parser handles bare fragment marker' '
+	check_host_and_path https://example.com#foo.git example.com "#foo.git"
+'
+
+test_expect_success 'url parser not confused by encoded markers' '
+	check_host_and_path https://example.com%23%3f%2f/foo.git \
+		"example.com#?/" foo.git
+'
+
+test_expect_success 'credential config with partial URLs' '
+	echo "echo password=yep" | write_script git-credential-yep &&
+	test_write_lines url=https://user@example.com/repo.git >stdin &&
+	for partial in \
+		example.com \
+		user@example.com \
+		https:// \
+		https://example.com \
+		https://example.com/ \
+		https://user@example.com \
+		https://user@example.com/ \
+		https://example.com/repo.git \
+		https://user@example.com/repo.git \
+		/repo.git
+	do
+		git -c credential.$partial.helper=yep \
+			credential fill <stdin >stdout &&
+		grep yep stdout ||
+		return 1
+	done &&
+
+	for partial in \
+		dont.use.this \
+		http:// \
+		/repo
+	do
+		git -c credential.$partial.helper=yep \
+			credential fill <stdin >stdout &&
+		! grep yep stdout ||
+		return 1
+	done &&
+
+	git -c credential.$partial.helper=yep \
+		-c credential.with%0anewline.username=uh-oh \
+		credential fill <stdin >stdout 2>stderr &&
+	test_i18ngrep "skipping credential lookup for key" stderr
+'
+
 test_done
diff --git a/t/t0302-credential-store.sh b/t/t0302-credential-store.sh
index d6b54e8c65..716bf1af9f 100755
--- a/t/t0302-credential-store.sh
+++ b/t/t0302-credential-store.sh
@@ -107,7 +107,6 @@ test_expect_success 'store: if both xdg and home files exist, only store in home
 	test_must_be_empty "$HOME/.config/git/credentials"
 '
 
-
 test_expect_success 'erase: erase matching credentials from both xdg and home files' '
 	echo "https://home-user:home-pass@example.com" >"$HOME/.git-credentials" &&
 	mkdir -p "$HOME/.config/git" &&
@@ -120,4 +119,94 @@ test_expect_success 'erase: erase matching credentials from both xdg and home fi
 	test_must_be_empty "$HOME/.config/git/credentials"
 '
 
+invalid_credential_test() {
+	test_expect_success "get: ignore credentials without $1 as invalid" '
+		echo "$2" >"$HOME/.git-credentials" &&
+		check fill store <<-\EOF
+		protocol=https
+		host=example.com
+		--
+		protocol=https
+		host=example.com
+		username=askpass-username
+		password=askpass-password
+		--
+		askpass: Username for '\''https://example.com'\'':
+		askpass: Password for '\''https://askpass-username@example.com'\'':
+		--
+		EOF
+	'
+}
+
+invalid_credential_test "scheme" ://user:pass@example.com
+invalid_credential_test "valid host/path" https://user:pass@
+invalid_credential_test "username/password" https://pass@example.com
+
+test_expect_success 'get: credentials with DOS line endings are invalid' '
+	printf "https://user:pass@example.com\r\n" >"$HOME/.git-credentials" &&
+	check fill store <<-\EOF
+	protocol=https
+	host=example.com
+	--
+	protocol=https
+	host=example.com
+	username=askpass-username
+	password=askpass-password
+	--
+	askpass: Username for '\''https://example.com'\'':
+	askpass: Password for '\''https://askpass-username@example.com'\'':
+	--
+	EOF
+'
+
+test_expect_success 'get: credentials with path and DOS line endings are valid' '
+	printf "https://user:pass@example.com/repo.git\r\n" >"$HOME/.git-credentials" &&
+	check fill store <<-\EOF
+	url=https://example.com/repo.git
+	--
+	protocol=https
+	host=example.com
+	username=user
+	password=pass
+	--
+	EOF
+'
+
+test_expect_success 'get: credentials with DOS line endings are invalid if path is relevant' '
+	printf "https://user:pass@example.com/repo.git\r\n" >"$HOME/.git-credentials" &&
+	test_config credential.useHttpPath true &&
+	check fill store <<-\EOF
+	url=https://example.com/repo.git
+	--
+	protocol=https
+	host=example.com
+	path=repo.git
+	username=askpass-username
+	password=askpass-password
+	--
+	askpass: Username for '\''https://example.com/repo.git'\'':
+	askpass: Password for '\''https://askpass-username@example.com/repo.git'\'':
+	--
+	EOF
+'
+
+test_expect_success 'get: store file can contain empty/bogus lines' '
+	echo "" >"$HOME/.git-credentials" &&
+	q_to_tab <<-\CREDENTIAL >>"$HOME/.git-credentials" &&
+	#comment
+	Q
+	https://user:pass@example.com
+	CREDENTIAL
+	check fill store <<-\EOF
+	protocol=https
+	host=example.com
+	--
+	protocol=https
+	host=example.com
+	username=user
+	password=pass
+	--
+	EOF
+'
+
 test_done
diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh
index a3988bd4b8..a211a66c67 100755
--- a/t/t0410-partial-clone.sh
+++ b/t/t0410-partial-clone.sh
@@ -30,6 +30,40 @@ test_expect_success 'extensions.partialclone without filter' '
 	git -C client fetch origin
 '
 
+test_expect_success 'convert shallow clone to partial clone' '
+	rm -fr server client &&
+	test_create_repo server &&
+	test_commit -C server my_commit 1 &&
+	test_commit -C server my_commit2 1 &&
+	git clone --depth=1 "file://$(pwd)/server" client &&
+	git -C client fetch --unshallow --filter="blob:none" &&
+	test_cmp_config -C client true remote.origin.promisor &&
+	test_cmp_config -C client blob:none remote.origin.partialclonefilter &&
+	test_cmp_config -C client 1 core.repositoryformatversion
+'
+
+test_expect_success SHA1 'convert to partial clone with noop extension' '
+	rm -fr server client &&
+	test_create_repo server &&
+	test_commit -C server my_commit 1 &&
+	test_commit -C server my_commit2 1 &&
+	git clone --depth=1 "file://$(pwd)/server" client &&
+	test_cmp_config -C client 0 core.repositoryformatversion &&
+	git -C client config extensions.noop true &&
+	git -C client fetch --unshallow --filter="blob:none"
+'
+
+test_expect_success SHA1 'converting to partial clone fails with unrecognized extension' '
+	rm -fr server client &&
+	test_create_repo server &&
+	test_commit -C server my_commit 1 &&
+	test_commit -C server my_commit2 1 &&
+	git clone --depth=1 "file://$(pwd)/server" client &&
+	test_cmp_config -C client 0 core.repositoryformatversion &&
+	git -C client config extensions.nonsense true &&
+	test_must_fail git -C client fetch --unshallow --filter="blob:none"
+'
+
 test_expect_success 'missing reflog object, but promised by a commit, passes fsck' '
 	rm -rf repo &&
 	test_create_repo repo &&
@@ -149,7 +183,7 @@ test_expect_success 'missing CLI object, but promised, passes fsck' '
 '
 
 test_expect_success 'fetching of missing objects' '
-	rm -rf repo &&
+	rm -rf repo err &&
 	test_create_repo server &&
 	test_commit -C server foo &&
 	git -C server repack -a -d --write-bitmap-index &&
@@ -160,7 +194,10 @@ test_expect_success 'fetching of missing objects' '
 
 	git -C repo config core.repositoryformatversion 1 &&
 	git -C repo config extensions.partialclone "origin" &&
-	git -C repo cat-file -p "$HASH" &&
+	git -C repo cat-file -p "$HASH" 2>err &&
+
+	# Ensure that no spurious FETCH_HEAD messages are written
+	! grep FETCH_HEAD err &&
 
 	# Ensure that the .promisor file is written, and check that its
 	# associated packfile contains the object
@@ -180,7 +217,7 @@ test_expect_success 'fetching of missing objects works with ref-in-want enabled'
 	rm -rf repo/.git/objects/* &&
 	rm -f trace &&
 	GIT_TRACE_PACKET="$(pwd)/trace" git -C repo cat-file -p "$HASH" &&
-	grep "git< fetch=.*ref-in-want" trace
+	grep "fetch< fetch=.*ref-in-want" trace
 '
 
 test_expect_success 'fetching of missing objects from another promisor remote' '
@@ -567,6 +604,29 @@ test_expect_success 'do not fetch when checking existence of tree we construct o
 	git -C repo cherry-pick side1
 '
 
+test_expect_success 'lazy-fetch when accessing object not in the_repository' '
+	rm -rf full partial.git &&
+	test_create_repo full &&
+	test_commit -C full create-a-file file.txt &&
+
+	test_config -C full uploadpack.allowfilter 1 &&
+	test_config -C full uploadpack.allowanysha1inwant 1 &&
+	git clone --filter=blob:none --bare "file://$(pwd)/full" partial.git &&
+	FILE_HASH=$(git -C full rev-parse HEAD:file.txt) &&
+
+	# Sanity check that the file is missing
+	git -C partial.git rev-list --objects --missing=print HEAD >out &&
+	grep "[?]$FILE_HASH" out &&
+
+	git -C full cat-file -s "$FILE_HASH" >expect &&
+	test-tool partial-clone object-info partial.git "$FILE_HASH" >actual &&
+	test_cmp expect actual &&
+
+	# Sanity check that the file is now present
+	git -C partial.git rev-list --objects --missing=print HEAD >out &&
+	! grep "[?]$FILE_HASH" out
+'
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
diff --git a/t/t0500-progress-display.sh b/t/t0500-progress-display.sh
index 24ccbd8d3b..22058b503a 100755
--- a/t/t0500-progress-display.sh
+++ b/t/t0500-progress-display.sh
@@ -29,7 +29,7 @@ test_expect_success 'simple progress display' '
 	test-tool progress "Working hard" <in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 test_expect_success 'progress display with total' '
@@ -48,7 +48,7 @@ test_expect_success 'progress display with total' '
 	test-tool progress --total=3 "Working hard" <in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 test_expect_success 'progress display breaks long lines #1' '
@@ -72,11 +72,11 @@ EOF
 		<in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 test_expect_success 'progress display breaks long lines #2' '
-	# Note: we dont need that many spaces after the title to cover up
+	# Note: we do not need that many spaces after the title to cover up
 	# the last line before breaking the progress line.
 	sed -e "s/Z$//" >expect <<\EOF &&
 Working hard.......2.........3.........4.........5.........6:   0% (1/100000)<CR>
@@ -100,11 +100,11 @@ EOF
 		<in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 test_expect_success 'progress display breaks long lines #3 - even the first is too long' '
-	# Note: we dont actually need any spaces at the end of the title
+	# Note: we do not actually need any spaces at the end of the title
 	# line, because there is no previous progress line to cover up.
 	sed -e "s/Z$//" >expect <<\EOF &&
 Working hard.......2.........3.........4.........5.........6:                   Z
@@ -126,7 +126,7 @@ EOF
 		<in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 test_expect_success 'progress display breaks long lines #4 - title line matches terminal width' '
@@ -150,7 +150,7 @@ EOF
 		<in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 # Progress counter goes backwards, this should not happen in practice.
@@ -172,7 +172,7 @@ test_expect_success 'progress shortens - crazy caller' '
 	test-tool progress --total=1000 "Working hard" <in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 test_expect_success 'progress display with throughput' '
@@ -201,7 +201,7 @@ test_expect_success 'progress display with throughput' '
 	test-tool progress "Working hard" <in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 test_expect_success 'progress display with throughput and total' '
@@ -226,7 +226,7 @@ test_expect_success 'progress display with throughput and total' '
 	test-tool progress --total=40 "Working hard" <in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 test_expect_success 'cover up after throughput shortens' '
@@ -255,7 +255,7 @@ test_expect_success 'cover up after throughput shortens' '
 	test-tool progress "Working hard" <in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 test_expect_success 'cover up after throughput shortens a lot' '
@@ -280,7 +280,32 @@ test_expect_success 'cover up after throughput shortens a lot' '
 	test-tool progress "Working hard" <in 2>stderr &&
 
 	show_cr <stderr >out &&
-	test_i18ncmp expect out
+	test_cmp expect out
+'
+
+test_expect_success 'progress generates traces' '
+	cat >in <<-\EOF &&
+	throughput 102400 1000
+	update
+	progress 10
+	throughput 204800 2000
+	update
+	progress 20
+	throughput 307200 3000
+	update
+	progress 30
+	throughput 409600 4000
+	update
+	progress 40
+	EOF
+
+	GIT_TRACE2_EVENT="$(pwd)/trace.event" test-tool progress --total=40 \
+		"Working hard" <in 2>stderr &&
+
+	# t0212/parse_events.perl intentionally omits regions and data.
+	test_region progress "Working hard" trace.event &&
+	grep "\"key\":\"total_objects\",\"value\":\"40\"" trace.event &&
+	grep "\"key\":\"total_bytes\",\"value\":\"409600\"" trace.event
 '
 
 test_done
diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh
index c13578a635..11bf10424f 100755
--- a/t/t1004-read-tree-m-u-wf.sh
+++ b/t/t1004-read-tree-m-u-wf.sh
@@ -2,6 +2,9 @@
 
 test_description='read-tree -m -u checks working tree files'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
@@ -20,17 +23,17 @@ test_expect_success 'two-way setup' '
 	git branch side &&
 	git tag -f branch-point &&
 
-	echo file2 is not tracked on the master anymore &&
+	echo file2 is not tracked on the main branch anymore &&
 	rm -f file2 subdir/file2 &&
 	git update-index --remove file2 subdir/file2 &&
-	git commit -a -m "master removes file2 and subdir/file2"
+	git commit -a -m "main removes file2 and subdir/file2"
 '
 
 test_expect_success 'two-way not clobbering' '
 
-	echo >file2 master creates untracked file2 &&
-	echo >subdir/file2 master creates untracked subdir/file2 &&
-	if err=$(read_tree_u_must_succeed -m -u master side 2>&1)
+	echo >file2 main creates untracked file2 &&
+	echo >subdir/file2 main creates untracked subdir/file2 &&
+	if err=$(read_tree_u_must_succeed -m -u main side 2>&1)
 	then
 		echo should have complained
 		false
@@ -43,7 +46,7 @@ echo file2 >.gitignore
 
 test_expect_success 'two-way with incorrect --exclude-per-directory (1)' '
 
-	if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore master side 2>&1)
+	if err=$(read_tree_u_must_succeed -m --exclude-per-directory=.gitignore main side 2>&1)
 	then
 		echo should have complained
 		false
@@ -54,7 +57,7 @@ test_expect_success 'two-way with incorrect --exclude-per-directory (1)' '
 
 test_expect_success 'two-way with incorrect --exclude-per-directory (2)' '
 
-	if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore master side 2>&1)
+	if err=$(read_tree_u_must_succeed -m -u --exclude-per-directory=foo --exclude-per-directory=.gitignore main side 2>&1)
 	then
 		echo should have complained
 		false
@@ -65,7 +68,7 @@ test_expect_success 'two-way with incorrect --exclude-per-directory (2)' '
 
 test_expect_success 'two-way clobbering a ignored file' '
 
-	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore master side
+	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore main side
 '
 
 rm -f .gitignore
@@ -81,21 +84,21 @@ test_expect_success 'three-way not complaining on an untracked path in both' '
 	git update-index --add file3 subdir/file3 &&
 	git commit -a -m "side adds file3 and removes file2" &&
 
-	git checkout master &&
-	echo >file2 file two is untracked on the master side &&
-	echo >subdir/file2 file two is untracked on the master side &&
+	git checkout main &&
+	echo >file2 file two is untracked on the main side &&
+	echo >subdir/file2 file two is untracked on the main side &&
 
-	read_tree_u_must_succeed -m -u branch-point master side
+	read_tree_u_must_succeed -m -u branch-point main side
 '
 
 test_expect_success 'three-way not clobbering a working tree file' '
 
 	git reset --hard &&
 	rm -f file2 subdir/file2 file3 subdir/file3 &&
-	git checkout master &&
-	echo >file3 file three created in master, untracked &&
-	echo >subdir/file3 file three created in master, untracked &&
-	if err=$(read_tree_u_must_succeed -m -u branch-point master side 2>&1)
+	git checkout main &&
+	echo >file3 file three created in main, untracked &&
+	echo >subdir/file3 file three created in main, untracked &&
+	if err=$(read_tree_u_must_succeed -m -u branch-point main side 2>&1)
 	then
 		echo should have complained
 		false
@@ -110,11 +113,11 @@ test_expect_success 'three-way not complaining on an untracked file' '
 
 	git reset --hard &&
 	rm -f file2 subdir/file2 file3 subdir/file3 &&
-	git checkout master &&
-	echo >file3 file three created in master, untracked &&
-	echo >subdir/file3 file three created in master, untracked &&
+	git checkout main &&
+	echo >file3 file three created in main, untracked &&
+	echo >subdir/file3 file three created in main, untracked &&
 
-	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore branch-point master side
+	read_tree_u_must_succeed -m -u --exclude-per-directory=.gitignore branch-point main side
 '
 
 test_expect_success '3-way not overwriting local changes (setup)' '
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index 43c4be1e5e..18b3779ccb 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -140,8 +140,6 @@ test_expect_success '--batch-check without %(rest) considers whole line' '
 	test_cmp expect actual
 '
 
-test_oid_init
-
 tree_sha1=$(git write-tree)
 tree_size=$(($(test_oid rawsz) + 13))
 tree_pretty_content="100644 blob $hello_sha1	hello"
@@ -168,7 +166,7 @@ tag_content="$tag_header_without_timestamp 0000000000 +0000
 
 $tag_description"
 
-tag_sha1=$(echo_without_newline "$tag_content" | git mktag)
+tag_sha1=$(echo_without_newline "$tag_content" | git hash-object -t tag --stdin -w)
 tag_size=$(strlen "$tag_content")
 
 run_tests 'tag' $tag_sha1 $tag_size "$tag_content" "$tag_content" 1
@@ -588,4 +586,26 @@ test_expect_success 'cat-file --unordered works' '
 	test_cmp expect actual
 '
 
+test_expect_success 'set up object list for --batch-all-objects tests' '
+	git -C all-two cat-file --batch-all-objects --batch-check="%(objectname)" >objects
+'
+
+test_expect_success 'cat-file --batch="%(objectname)" with --batch-all-objects will work' '
+	git -C all-two cat-file --batch="%(objectname)" <objects >expect &&
+	git -C all-two cat-file --batch-all-objects --batch="%(objectname)" >actual &&
+	cmp expect actual
+'
+
+test_expect_success 'cat-file --batch="%(rest)" with --batch-all-objects will work' '
+	git -C all-two cat-file --batch="%(rest)" <objects >expect &&
+	git -C all-two cat-file --batch-all-objects --batch="%(rest)" >actual &&
+	cmp expect actual
+'
+
+test_expect_success 'cat-file --batch="batman" with --batch-all-objects will work' '
+	git -C all-two cat-file --batch="batman" <objects >expect &&
+	git -C all-two cat-file --batch-all-objects --batch="batman" >actual &&
+	cmp expect actual
+'
+
 test_done
diff --git a/t/t1008-read-tree-overlay.sh b/t/t1008-read-tree-overlay.sh
index cf96016844..4512fb0b6e 100755
--- a/t/t1008-read-tree-overlay.sh
+++ b/t/t1008-read-tree-overlay.sh
@@ -2,6 +2,9 @@
 
 test_description='test multi-tree read-tree without merging'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-read-tree.sh
 
@@ -22,7 +25,7 @@ test_expect_success setup '
 '
 
 test_expect_success 'multi-read' '
-	read_tree_must_succeed initial master side &&
+	read_tree_must_succeed initial main side &&
 	test_write_lines a b/c >expect &&
 	git ls-files >actual &&
 	test_cmp expect actual
diff --git a/t/t1009-read-tree-new-index.sh b/t/t1009-read-tree-new-index.sh
index 59b3aa4bc4..2935f68f8d 100755
--- a/t/t1009-read-tree-new-index.sh
+++ b/t/t1009-read-tree-new-index.sh
@@ -2,6 +2,9 @@
 
 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-lib.sh
 
 test_expect_success setup '
@@ -12,13 +15,13 @@ test_expect_success setup '
 
 test_expect_success 'non-existent index file' '
 	rm -f new-index &&
-	GIT_INDEX_FILE=new-index git read-tree master
+	GIT_INDEX_FILE=new-index git read-tree main
 '
 
 test_expect_success 'empty index file' '
 	rm -f new-index &&
 	> new-index &&
-	GIT_INDEX_FILE=new-index git read-tree master
+	GIT_INDEX_FILE=new-index git read-tree main
 '
 
 test_done
diff --git a/t/t1011-read-tree-sparse-checkout.sh b/t/t1011-read-tree-sparse-checkout.sh
index ba71b159ba..24092c09a9 100755
--- a/t/t1011-read-tree-sparse-checkout.sh
+++ b/t/t1011-read-tree-sparse-checkout.sh
@@ -2,7 +2,7 @@
 
 test_description='sparse checkout tests
 
-* (tag: removed, master) removed
+* (tag: removed, main) removed
 | D	sub/added
 * (HEAD, tag: top) modified and added
 | M	init.t
@@ -74,13 +74,19 @@ test_expect_success 'read-tree --no-sparse-checkout with empty .git/info/sparse-
 test_expect_success 'read-tree with empty .git/info/sparse-checkout' '
 	git config core.sparsecheckout true &&
 	echo >.git/info/sparse-checkout &&
-	read_tree_u_must_fail -m -u HEAD &&
+	read_tree_u_must_succeed -m -u HEAD &&
 	git ls-files --stage >result &&
 	test_cmp expected result &&
 	git ls-files -t >result &&
+	cat >expected.swt <<-\EOF &&
+	S init.t
+	S sub/added
+	S sub/addedtoo
+	S subsub/added
+	EOF
 	test_cmp expected.swt result &&
-	test -f init.t &&
-	test -f sub/added
+	! test -f init.t &&
+	! test -f sub/added
 '
 
 test_expect_success 'match directories with trailing slash' '
@@ -215,7 +221,6 @@ test_expect_success 'read-tree adds to worktree, dirty case' '
 '
 
 test_expect_success 'index removal and worktree narrowing at the same time' '
-	>empty &&
 	echo init.t >.git/info/sparse-checkout &&
 	echo sub/added >>.git/info/sparse-checkout &&
 	git checkout -f top &&
@@ -223,7 +228,7 @@ test_expect_success 'index removal and worktree narrowing at the same time' '
 	git checkout removed &&
 	git ls-files sub/added >result &&
 	test ! -f sub/added &&
-	test_cmp empty result
+	test_must_be_empty result
 '
 
 test_expect_success 'read-tree --reset removes outside worktree' '
@@ -234,20 +239,21 @@ test_expect_success 'read-tree --reset removes outside worktree' '
 	test_must_be_empty result
 '
 
-test_expect_success 'print errors when failed to update worktree' '
+test_expect_success 'print warnings when some worktree updates disabled' '
 	echo sub >.git/info/sparse-checkout &&
 	git checkout -f init &&
 	mkdir sub &&
 	touch sub/added sub/addedtoo &&
-	test_must_fail git checkout top 2>actual &&
+	# Use -q to suppress "Previous HEAD position" and "Head is now at" msgs
+	git checkout -q top 2>actual &&
 	cat >expected <<\EOF &&
-error: The following untracked working tree files would be overwritten by checkout:
+warning: The following paths were already present and thus not updated despite sparse patterns:
 	sub/added
 	sub/addedtoo
-Please move or remove them before you switch branches.
-Aborting
+
+After fixing the above paths, you may want to run `git sparse-checkout reapply`.
 EOF
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'checkout without --ignore-skip-worktree-bits' '
diff --git a/t/t1013-read-tree-submodule.sh b/t/t1013-read-tree-submodule.sh
index 91a6fafcb4..b6df7444c0 100755
--- a/t/t1013-read-tree-submodule.sh
+++ b/t/t1013-read-tree-submodule.sh
@@ -12,8 +12,8 @@ test_submodule_switch_recursing_with_args "read-tree -u -m"
 
 test_submodule_forced_switch_recursing_with_args "read-tree -u --reset"
 
-test_submodule_switch "git read-tree -u -m"
+test_submodule_switch "read-tree -u -m"
 
-test_submodule_forced_switch "git read-tree -u --reset"
+test_submodule_forced_switch "read-tree -u --reset"
 
 test_done
diff --git a/t/t1014-read-tree-confusing.sh b/t/t1014-read-tree-confusing.sh
index 2f5a25d503..da3376b3bb 100755
--- a/t/t1014-read-tree-confusing.sh
+++ b/t/t1014-read-tree-confusing.sh
@@ -49,6 +49,7 @@ git~1
 .git.SPACE .git.{space}
 .\\\\.GIT\\\\foobar backslashes
 .git\\\\foobar backslashes2
+.git...:alternate-stream
 EOF
 
 test_expect_success 'utf-8 paths allowed with core.protectHFS off' '
diff --git a/t/t1021-rerere-in-workdir.sh b/t/t1021-rerere-in-workdir.sh
index 301e071ff7..0b892894eb 100755
--- a/t/t1021-rerere-in-workdir.sh
+++ b/t/t1021-rerere-in-workdir.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='rerere run in a workdir'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success SYMLINKS setup '
@@ -19,7 +22,7 @@ test_expect_success SYMLINKS setup '
 	test_tick &&
 	git commit -a -m goodbye &&
 
-	git checkout master
+	git checkout main
 '
 
 test_expect_success SYMLINKS 'rerere in workdir' '
diff --git a/t/t1022-read-tree-partial-clone.sh b/t/t1022-read-tree-partial-clone.sh
new file mode 100755
index 0000000000..a763e27c7d
--- /dev/null
+++ b/t/t1022-read-tree-partial-clone.sh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+test_description='git read-tree in partial clones'
+
+TEST_NO_CREATE_REPO=1
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success 'read-tree in partial clone prefetches in one batch' '
+	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 dcb4dbba67..4bab6a513c 100755
--- a/t/t1050-large.sh
+++ b/t/t1050-large.sh
@@ -5,12 +5,6 @@ test_description='adding and checking out large blobs'
 
 . ./test-lib.sh
 
-# This should be moved to test-lib.sh together with the
-# copy in t0021 after both topics have graduated to 'master'.
-file_size () {
-	test-tool path-utils file-size "$1"
-}
-
 test_expect_success setup '
 	# clone does not allow us to pass core.bigfilethreshold to
 	# new repos, so set core.bigfilethreshold globally
@@ -29,7 +23,7 @@ do
 	test_expect_success "add with $config" '
 		test_when_finished "rm -f .git/objects/pack/pack-*.* .git/index" &&
 		git $config add large1 &&
-		sz=$(file_size .git/objects/pack/pack-*.pack) &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
 		case "$expect" in
 		small) test "$sz" -le 100000 ;;
 		large) test "$sz" -ge 100000 ;;
@@ -53,7 +47,8 @@ test_expect_success 'add a large file or two' '
 	for p in .git/objects/pack/pack-*.pack
 	do
 		count=$(( $count + 1 ))
-		if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx"
+		if test_path_is_file "$p" &&
+		   idx=${p%.pack}.idx && test_path_is_file "$idx"
 		then
 			continue
 		fi
@@ -63,9 +58,9 @@ test_expect_success 'add a large file or two' '
 	test $count = 1 &&
 	cnt=$(git show-index <"$idx" | wc -l) &&
 	test $cnt = 2 &&
-	for l in .git/objects/??/??????????????????????????????????????
+	for l in .git/objects/$OIDPATH_REGEX
 	do
-		test -f "$l" || continue
+		test_path_is_file "$l" || continue
 		bad=t
 	done &&
 	test -z "$bad" &&
@@ -76,7 +71,8 @@ test_expect_success 'add a large file or two' '
 	for p in .git/objects/pack/pack-*.pack
 	do
 		count=$(( $count + 1 ))
-		if test -f "$p" && idx=${p%.pack}.idx && test -f "$idx"
+		if test_path_is_file "$p" &&
+		   idx=${p%.pack}.idx && test_path_is_file "$idx"
 		then
 			continue
 		fi
@@ -111,7 +107,7 @@ test_expect_success 'packsize limit' '
 		count=0 &&
 		for pi in .git/objects/pack/pack-*.idx
 		do
-			test -f "$pi" && count=$(( $count + 1 ))
+			test_path_is_file "$pi" && count=$(( $count + 1 ))
 		done &&
 		test $count = 2 &&
 
@@ -175,7 +171,8 @@ test_expect_success 'git-show a large file' '
 
 test_expect_success 'index-pack' '
 	git clone file://"$(pwd)"/.git foo &&
-	GIT_DIR=non-existent git index-pack --strict --verify foo/.git/objects/pack/*.pack
+	GIT_DIR=non-existent git index-pack --object-format=$(test_oid algo) \
+		--strict --verify foo/.git/objects/pack/*.pack
 '
 
 test_expect_success 'repack' '
@@ -194,15 +191,15 @@ test_expect_success 'pack-objects with large loose object' '
 	test_cmp huge actual
 '
 
-test_expect_success 'tar achiving' '
+test_expect_success 'tar archiving' '
 	git archive --format=tar HEAD >/dev/null
 '
 
-test_expect_success 'zip achiving, store only' '
+test_expect_success 'zip archiving, store only' '
 	git archive --format=zip -0 HEAD >/dev/null
 '
 
-test_expect_success 'zip achiving, deflate' '
+test_expect_success 'zip archiving, deflate' '
 	git archive --format=zip HEAD >/dev/null
 '
 
diff --git a/t/t1090-sparse-checkout-scope.sh b/t/t1090-sparse-checkout-scope.sh
index 40cc004326..3deb490187 100755
--- a/t/t1090-sparse-checkout-scope.sh
+++ b/t/t1090-sparse-checkout-scope.sh
@@ -2,6 +2,9 @@
 
 test_description='sparse checkout scope tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -20,18 +23,18 @@ test_expect_success 'create feature branch' '
 	git commit -m "modification"
 '
 
-test_expect_success 'perform sparse checkout of master' '
+test_expect_success 'perform sparse checkout of main' '
 	git config --local --bool core.sparsecheckout true &&
 	echo "!/*" >.git/info/sparse-checkout &&
 	echo "/a" >>.git/info/sparse-checkout &&
 	echo "/c" >>.git/info/sparse-checkout &&
-	git checkout master &&
+	git checkout main &&
 	test_path_is_file a &&
 	test_path_is_missing b &&
 	test_path_is_file c
 '
 
-test_expect_success 'merge feature branch into sparse checkout of master' '
+test_expect_success 'merge feature branch into sparse checkout of main' '
 	git merge feature &&
 	test_path_is_file a &&
 	test_path_is_missing b &&
@@ -39,10 +42,10 @@ test_expect_success 'merge feature branch into sparse checkout of master' '
 	test "$(cat c)" = "modified"
 '
 
-test_expect_success 'return to full checkout of master' '
+test_expect_success 'return to full checkout of main' '
 	git checkout feature &&
 	echo "/*" >.git/info/sparse-checkout &&
-	git checkout master &&
+	git checkout main &&
 	test_path_is_file a &&
 	test_path_is_file b &&
 	test_path_is_file c &&
@@ -63,7 +66,6 @@ test_expect_success 'in partial clone, sparse checkout only fetches needed blobs
 	git -C server commit -m message &&
 
 	test_config -C client core.sparsecheckout 1 &&
-	test_config -C client extensions.partialclone origin &&
 	echo "!/*" >client/.git/info/sparse-checkout &&
 	echo "/a" >>client/.git/info/sparse-checkout &&
 	git -C client fetch --filter=blob:none origin &&
diff --git a/t/t1091-sparse-checkout-builtin.sh b/t/t1091-sparse-checkout-builtin.sh
new file mode 100755
index 0000000000..38fc8340f5
--- /dev/null
+++ b/t/t1091-sparse-checkout-builtin.sh
@@ -0,0 +1,645 @@
+#!/bin/sh
+
+test_description='sparse checkout builtin tests'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+list_files() {
+	# Do not replace this with 'ls "$1"', as "ls" with BSD-lineage
+	# enables "-A" by default for root and ends up including ".git" and
+	# such in its output. (Note, though, that running the test suite as
+	# root is generally not recommended.)
+	(cd "$1" && printf '%s\n' *)
+}
+
+check_files() {
+	list_files "$1" >actual &&
+	shift &&
+	printf "%s\n" $@ >expect &&
+	test_cmp expect actual
+}
+
+test_expect_success 'setup' '
+	git init repo &&
+	(
+		cd repo &&
+		echo "initial" >a &&
+		mkdir folder1 folder2 deep &&
+		mkdir deep/deeper1 deep/deeper2 &&
+		mkdir deep/deeper1/deepest &&
+		cp a folder1 &&
+		cp a folder2 &&
+		cp a deep &&
+		cp a deep/deeper1 &&
+		cp a deep/deeper2 &&
+		cp a deep/deeper1/deepest &&
+		git add . &&
+		git commit -m "initial commit"
+	)
+'
+
+test_expect_success 'git sparse-checkout list (empty)' '
+	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
+'
+
+test_expect_success 'git sparse-checkout list (populated)' '
+	test_when_finished rm -f repo/.git/info/sparse-checkout &&
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/folder1/*
+	/deep/
+	**/a
+	!*bin*
+	EOF
+	cp repo/.git/info/sparse-checkout expect &&
+	git -C repo sparse-checkout list >list &&
+	test_cmp expect list
+'
+
+test_expect_success 'git sparse-checkout init' '
+	git -C repo sparse-checkout init &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	test_cmp_config -C repo true core.sparsecheckout &&
+	check_files repo a
+'
+
+test_expect_success 'git sparse-checkout list after init' '
+	git -C repo sparse-checkout list >actual &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'init with existing sparse-checkout' '
+	echo "*folder*" >> repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout init &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	*folder*
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1 folder2
+'
+
+test_expect_success 'clone --sparse' '
+	git clone --sparse "file://$(pwd)/repo" clone &&
+	git -C clone sparse-checkout list >actual &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	EOF
+	test_cmp expect actual &&
+	check_files clone a
+'
+
+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 &&
+	git -C clone_no_checkout sparse-checkout set folder1 &&
+
+	git -C clone_no_checkout sparse-checkout list >actual &&
+	cat >expect <<-\EOF &&
+	folder1
+	EOF
+	test_cmp expect actual &&
+
+	# nothing checked out, expect "No such file or directory"
+	! ls clone_no_checkout/* >actual &&
+	test_must_be_empty actual &&
+	test_path_is_missing clone_no_checkout/.git/index &&
+
+	# No branch is checked out until we manually switch to one
+	git -C clone_no_checkout switch main &&
+	test_path_is_file clone_no_checkout/.git/index &&
+	check_files clone_no_checkout a folder1
+'
+
+test_expect_success 'set enables config' '
+	git init empty-config &&
+	(
+		cd empty-config &&
+		test_commit test file &&
+		test_path_is_missing .git/config.worktree &&
+		git sparse-checkout set nothing &&
+		test_path_is_file .git/config.worktree &&
+		test_cmp_config true core.sparseCheckout
+	)
+'
+
+test_expect_success 'set sparse-checkout using builtin' '
+	git -C repo sparse-checkout set "/*" "!/*/" "*folder*" &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	*folder*
+	EOF
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1 folder2
+'
+
+test_expect_success 'set sparse-checkout using --stdin' '
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/folder1/
+	/folder2/
+	EOF
+	git -C repo sparse-checkout set --stdin <expect &&
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo "a folder1 folder2"
+'
+
+test_expect_success 'add to sparse-checkout' '
+	cat repo/.git/info/sparse-checkout >expect &&
+	cat >add <<-\EOF &&
+	pattern1
+	/folder1/
+	pattern2
+	EOF
+	cat add >>expect &&
+	git -C repo sparse-checkout add --stdin <add &&
+	git -C repo sparse-checkout list >actual &&
+	test_cmp expect actual &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo "a folder1 folder2"
+'
+
+test_expect_success 'cone mode: match patterns' '
+	git -C repo config --worktree core.sparseCheckoutCone true &&
+	rm -rf repo/a repo/folder1 repo/folder2 &&
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_i18ngrep ! "disabling cone patterns" err &&
+	git -C repo reset --hard &&
+	check_files repo a folder1 folder2
+'
+
+test_expect_success 'cone mode: warn on bad pattern' '
+	test_when_finished mv sparse-checkout repo/.git/info/ &&
+	cp repo/.git/info/sparse-checkout . &&
+	echo "!/deep/deeper/*" >>repo/.git/info/sparse-checkout &&
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_i18ngrep "unrecognized negative pattern" err
+'
+
+test_expect_success 'sparse-checkout disable' '
+	test_when_finished rm -rf repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout disable &&
+	test_path_is_file repo/.git/info/sparse-checkout &&
+	git -C repo config --list >config &&
+	test_must_fail git config core.sparseCheckout &&
+	check_files repo a deep folder1 folder2
+'
+
+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 sparse-checkout disable &&
+	test-tool -C repo read-cache --table >cache &&
+	! grep " tree " cache &&
+	git -C repo config --list >config &&
+	! grep index.sparse config
+'
+
+test_expect_success 'cone mode: init and set' '
+	git -C repo sparse-checkout init --cone &&
+	git -C repo config --list >config &&
+	test_i18ngrep "core.sparsecheckoutcone=true" config &&
+	list_files repo >dir  &&
+	echo a >expect &&
+	test_cmp expect dir &&
+	git -C repo sparse-checkout set deep/deeper1/deepest/ 2>err &&
+	test_must_be_empty err &&
+	check_files repo a deep &&
+	check_files repo/deep a deeper1 &&
+	check_files repo/deep/deeper1 a deepest &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	!/deep/deeper1/*/
+	/deep/deeper1/deepest/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout set --stdin 2>err <<-\EOF &&
+	folder1
+	folder2
+	EOF
+	test_must_be_empty err &&
+	check_files repo a folder1 folder2
+'
+
+test_expect_success 'cone mode: list' '
+	cat >expect <<-\EOF &&
+	folder1
+	folder2
+	EOF
+	git -C repo sparse-checkout set --stdin <expect &&
+	git -C repo sparse-checkout list >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp expect actual
+'
+
+test_expect_success 'cone mode: set with nested folders' '
+	git -C repo sparse-checkout set deep deep/deeper1/deepest 2>err &&
+	test_line_count = 0 err &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	EOF
+	test_cmp repo/.git/info/sparse-checkout expect
+'
+
+test_expect_success 'cone mode: add independent path' '
+	git -C repo sparse-checkout set deep/deeper1 &&
+	git -C repo sparse-checkout add folder1 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	/folder1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep folder1
+'
+
+test_expect_success 'cone mode: add sibling path' '
+	git -C repo sparse-checkout set deep/deeper1 &&
+	git -C repo sparse-checkout add deep/deeper2 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	/deep/deeper2/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep
+'
+
+test_expect_success 'cone mode: add parent path' '
+	git -C repo sparse-checkout set deep/deeper1 folder1 &&
+	git -C repo sparse-checkout add deep &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	/folder1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep folder1
+'
+
+test_expect_success 'not-up-to-date does not block rest of sparsification' '
+	test_when_finished git -C repo sparse-checkout disable &&
+	test_when_finished git -C repo reset --hard &&
+	git -C repo sparse-checkout set deep &&
+
+	echo update >repo/deep/deeper2/a &&
+	cp repo/.git/info/sparse-checkout expect &&
+	test_write_lines "!/deep/*/" "/deep/deeper1/" >>expect &&
+
+	git -C repo sparse-checkout set deep/deeper1 2>err &&
+
+	test_i18ngrep "The following paths are not up to date" err &&
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo/deep a deeper1 deeper2 &&
+	check_files repo/deep/deeper1 a deepest &&
+	check_files repo/deep/deeper1/deepest a &&
+	check_files repo/deep/deeper2 a
+'
+
+test_expect_success 'revert to old sparse-checkout on empty update' '
+	git init empty-test &&
+	(
+		echo >file &&
+		git add file &&
+		git commit -m "test" &&
+		git sparse-checkout set nothing 2>err &&
+		test_i18ngrep ! "Sparse checkout leaves no entry on working directory" err &&
+		test_i18ngrep ! ".git/index.lock" err &&
+		git sparse-checkout set file
+	)
+'
+
+test_expect_success 'fail when lock is taken' '
+	test_when_finished rm -rf repo/.git/info/sparse-checkout.lock &&
+	touch repo/.git/info/sparse-checkout.lock &&
+	test_must_fail git -C repo sparse-checkout set deep 2>err &&
+	test_i18ngrep "Unable to create .*\.lock" err
+'
+
+test_expect_success '.gitignore should not warn about cone mode' '
+	git -C repo config --worktree core.sparseCheckoutCone true &&
+	echo "**/bin/*" >repo/.gitignore &&
+	git -C repo reset --hard 2>err &&
+	test_i18ngrep ! "disabling cone patterns" err
+'
+
+test_expect_success 'sparse-checkout (init|set|disable) warns with dirty status' '
+	git clone repo dirty &&
+	echo dirty >dirty/folder1/a &&
+
+	git -C dirty sparse-checkout init 2>err &&
+	test_i18ngrep "warning.*The following paths are not up to date" err &&
+
+	git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
+	test_i18ngrep "warning.*The following paths are not up to date" err &&
+	test_path_is_file dirty/folder1/a &&
+
+	git -C dirty sparse-checkout disable 2>err &&
+	test_must_be_empty err &&
+
+	git -C dirty reset --hard &&
+	git -C dirty sparse-checkout init &&
+	git -C dirty sparse-checkout set /folder2/* /deep/deeper1/* &&
+	test_path_is_missing dirty/folder1/a &&
+	git -C dirty sparse-checkout disable &&
+	test_path_is_file dirty/folder1/a
+'
+
+test_expect_success 'sparse-checkout (init|set|disable) warns with unmerged status' '
+	git clone repo unmerged &&
+
+	cat >input <<-EOF &&
+	0 $ZERO_OID	folder1/a
+	100644 $(git -C unmerged rev-parse HEAD:folder1/a) 1	folder1/a
+	EOF
+	git -C unmerged update-index --index-info <input &&
+
+	git -C unmerged sparse-checkout init 2>err &&
+	test_i18ngrep "warning.*The following paths are unmerged" err &&
+
+	git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* 2>err &&
+	test_i18ngrep "warning.*The following paths are unmerged" err &&
+	test_path_is_file dirty/folder1/a &&
+
+	git -C unmerged sparse-checkout disable 2>err &&
+	test_i18ngrep "warning.*The following paths are unmerged" err &&
+
+	git -C unmerged reset --hard &&
+	git -C unmerged sparse-checkout init &&
+	git -C unmerged sparse-checkout set /folder2/* /deep/deeper1/* &&
+	git -C unmerged sparse-checkout disable
+'
+
+test_expect_success 'sparse-checkout reapply' '
+	git clone repo tweak &&
+
+	echo dirty >tweak/deep/deeper2/a &&
+
+	cat >input <<-EOF &&
+	0 $ZERO_OID	folder1/a
+	100644 $(git -C tweak rev-parse HEAD:folder1/a) 1	folder1/a
+	EOF
+	git -C tweak update-index --index-info <input &&
+
+	git -C tweak sparse-checkout init --cone 2>err &&
+	test_i18ngrep "warning.*The following paths are not up to date" err &&
+	test_i18ngrep "warning.*The following paths are unmerged" err &&
+
+	git -C tweak sparse-checkout set folder2 deep/deeper1 2>err &&
+	test_i18ngrep "warning.*The following paths are not up to date" err &&
+	test_i18ngrep "warning.*The following paths are unmerged" err &&
+
+	git -C tweak sparse-checkout reapply 2>err &&
+	test_i18ngrep "warning.*The following paths are not up to date" err &&
+	test_path_is_file tweak/deep/deeper2/a &&
+	test_i18ngrep "warning.*The following paths are unmerged" err &&
+	test_path_is_file tweak/folder1/a &&
+
+	git -C tweak checkout HEAD deep/deeper2/a &&
+	git -C tweak sparse-checkout reapply 2>err &&
+	test_i18ngrep ! "warning.*The following paths are not up to date" err &&
+	test_path_is_missing tweak/deep/deeper2/a &&
+	test_i18ngrep "warning.*The following paths are unmerged" err &&
+	test_path_is_file tweak/folder1/a &&
+
+	git -C tweak add folder1/a &&
+	git -C tweak sparse-checkout reapply 2>err &&
+	test_must_be_empty err &&
+	test_path_is_missing tweak/deep/deeper2/a &&
+	test_path_is_missing tweak/folder1/a &&
+
+	git -C tweak sparse-checkout disable
+'
+
+test_expect_success 'cone mode: set with core.ignoreCase=true' '
+	rm repo/.git/info/sparse-checkout &&
+	git -C repo sparse-checkout init --cone &&
+	git -C repo -c core.ignoreCase=true sparse-checkout set folder1 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/folder1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a folder1
+'
+
+test_expect_success 'interaction with submodules' '
+	git clone repo super &&
+	(
+		cd super &&
+		mkdir modules &&
+		git submodule add ../repo modules/child &&
+		git add . &&
+		git commit -m "add submodule" &&
+		git sparse-checkout init --cone &&
+		git sparse-checkout set folder1
+	) &&
+	check_files super a folder1 modules &&
+	check_files super/modules/child a deep folder1 folder2
+'
+
+test_expect_success 'different sparse-checkouts with worktrees' '
+	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
+'
+
+test_expect_success 'set using filename keeps file on-disk' '
+	git -C repo sparse-checkout set a deep &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/a/
+	/deep/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep
+'
+
+check_read_tree_errors () {
+	REPO=$1
+	FILES=$2
+	ERRORS=$3
+	git -C $REPO -c core.sparseCheckoutCone=false read-tree -mu HEAD 2>err &&
+	test_must_be_empty err &&
+	check_files $REPO "$FILES" &&
+	git -C $REPO read-tree -mu HEAD 2>err &&
+	if test -z "$ERRORS"
+	then
+		test_must_be_empty err
+	else
+		test_i18ngrep "$ERRORS" err
+	fi &&
+	check_files $REPO $FILES
+}
+
+test_expect_success 'pattern-checks: /A/**' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/folder1/**
+	EOF
+	check_read_tree_errors repo "a folder1" "disabling cone pattern matching"
+'
+
+test_expect_success 'pattern-checks: /A/**/B/' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/deep/**/deepest
+	EOF
+	check_read_tree_errors repo "a deep" "disabling cone pattern matching" &&
+	check_files repo/deep "deeper1" &&
+	check_files repo/deep/deeper1 "deepest"
+'
+
+test_expect_success 'pattern-checks: too short' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/
+	EOF
+	check_read_tree_errors repo "a" "disabling cone pattern matching"
+'
+test_expect_success 'pattern-checks: not too short' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/b/
+	EOF
+	git -C repo read-tree -mu HEAD 2>err &&
+	test_must_be_empty err &&
+	check_files repo a
+'
+
+test_expect_success 'pattern-checks: trailing "*"' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	/a*
+	EOF
+	check_read_tree_errors repo "a" "disabling cone pattern matching"
+'
+
+test_expect_success 'pattern-checks: starting "*"' '
+	cat >repo/.git/info/sparse-checkout <<-\EOF &&
+	/*
+	!/*/
+	*eep/
+	EOF
+	check_read_tree_errors repo "a deep" "disabling cone pattern matching"
+'
+
+test_expect_success 'pattern-checks: contained glob characters' '
+	for c in "[a]" "\\" "?" "*"
+	do
+		cat >repo/.git/info/sparse-checkout <<-EOF &&
+		/*
+		!/*/
+		something$c-else/
+		EOF
+		check_read_tree_errors repo "a" "disabling cone pattern matching"
+	done
+'
+
+test_expect_success BSLASHPSPEC 'pattern-checks: escaped characters' '
+	git clone repo escaped &&
+	TREEOID=$(git -C escaped rev-parse HEAD:folder1) &&
+	NEWTREE=$(git -C escaped mktree <<-EOF
+	$(git -C escaped ls-tree HEAD)
+	040000 tree $TREEOID	zbad\\dir
+	040000 tree $TREEOID	zdoes*exist
+	040000 tree $TREEOID	zglob[!a]?
+	EOF
+	) &&
+	COMMIT=$(git -C escaped commit-tree $NEWTREE -p HEAD) &&
+	git -C escaped reset --hard $COMMIT &&
+	check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? &&
+	git -C escaped sparse-checkout init --cone &&
+	git -C escaped sparse-checkout set zbad\\dir/bogus "zdoes*not*exist" "zdoes*exist" "zglob[!a]?" &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/zbad\\dir/
+	!/zbad\\dir/*/
+	/zbad\\dir/bogus/
+	/zdoes\*exist/
+	/zdoes\*not\*exist/
+	/zglob\[!a]\?/
+	EOF
+	test_cmp expect escaped/.git/info/sparse-checkout &&
+	check_read_tree_errors escaped "a zbad\\dir zdoes*exist zglob[!a]?" &&
+	git -C escaped ls-tree -d --name-only HEAD >list-expect &&
+	git -C escaped sparse-checkout set --stdin <list-expect &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	/folder1/
+	/folder2/
+	/zbad\\dir/
+	/zdoes\*exist/
+	/zglob\[!a]\?/
+	EOF
+	test_cmp expect escaped/.git/info/sparse-checkout &&
+	check_files escaped "a deep folder1 folder2 zbad\\dir zdoes*exist" zglob[!a]? &&
+	git -C escaped sparse-checkout list >list-actual &&
+	test_cmp list-expect list-actual
+'
+
+test_expect_success MINGW 'cone mode replaces backslashes with slashes' '
+	git -C repo sparse-checkout set deep\\deeper1 &&
+	cat >expect <<-\EOF &&
+	/*
+	!/*/
+	/deep/
+	!/deep/*/
+	/deep/deeper1/
+	EOF
+	test_cmp expect repo/.git/info/sparse-checkout &&
+	check_files repo a deep &&
+	check_files repo/deep a deeper1
+'
+
+test_done
diff --git a/t/t1092-sparse-checkout-compatibility.sh b/t/t1092-sparse-checkout-compatibility.sh
new file mode 100755
index 0000000000..ddc86bb415
--- /dev/null
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@ -0,0 +1,796 @@
+#!/bin/sh
+
+test_description='compare full workdir to sparse workdir'
+
+GIT_TEST_SPLIT_INDEX=0
+GIT_TEST_SPARSE_INDEX=
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	git init initial-repo &&
+	(
+		GIT_TEST_SPARSE_INDEX=0 &&
+		cd initial-repo &&
+		echo a >a &&
+		echo "after deep" >e &&
+		echo "after folder1" >g &&
+		echo "after x" >z &&
+		mkdir folder1 folder2 deep x &&
+		mkdir deep/deeper1 deep/deeper2 deep/before deep/later &&
+		mkdir deep/deeper1/deepest &&
+		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 &&
+		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 &&
+			echo "updated $dir" >$dir/a &&
+			git commit -a -m "update $dir" || return 1
+		done &&
+
+		git checkout -b rename-base base &&
+		cat >folder1/larger-content <<-\EOF &&
+		matching
+		lines
+		help
+		inexact
+		renames
+		EOF
+		cp folder1/larger-content folder2/ &&
+		cp folder1/larger-content deep/deeper1/ &&
+		git add . &&
+		git commit -m "add interesting rename content" &&
+
+		git checkout -b rename-out-to-out rename-base &&
+		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 . &&
+		git commit -m "rename folder1/... to deep/deeper1/..." &&
+
+		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 &&
+		git commit -a -m "update deepest" &&
+
+		git checkout -f base &&
+		git reset --hard
+	)
+'
+
+init_repos () {
+	rm -rf full-checkout sparse-checkout sparse-index &&
+
+	# create repos in initial state
+	cp -r initial-repo full-checkout &&
+	git -C full-checkout reset --hard &&
+
+	cp -r initial-repo sparse-checkout &&
+	git -C sparse-checkout reset --hard &&
+
+	cp -r initial-repo sparse-index &&
+	git -C sparse-index reset --hard &&
+
+	# initialize sparse-checkout definitions
+	git -C sparse-checkout sparse-checkout init --cone &&
+	git -C sparse-checkout sparse-checkout set deep &&
+	git -C sparse-index sparse-checkout init --cone --sparse-index &&
+	test_cmp_config -C sparse-index true index.sparse &&
+	git -C sparse-index sparse-checkout set deep
+}
+
+run_on_sparse () {
+	(
+		cd sparse-checkout &&
+		GIT_PROGRESS_DELAY=100000 "$@" >../sparse-checkout-out 2>../sparse-checkout-err
+	) &&
+	(
+		cd sparse-index &&
+		GIT_PROGRESS_DELAY=100000 "$@" >../sparse-index-out 2>../sparse-index-err
+	)
+}
+
+run_on_all () {
+	(
+		cd full-checkout &&
+		GIT_PROGRESS_DELAY=100000 "$@" >../full-checkout-out 2>../full-checkout-err
+	) &&
+	run_on_sparse "$@"
+}
+
+test_all_match () {
+	run_on_all "$@" &&
+	test_cmp full-checkout-out sparse-checkout-out &&
+	test_cmp full-checkout-out sparse-index-out &&
+	test_cmp full-checkout-err sparse-checkout-err &&
+	test_cmp full-checkout-err sparse-index-err
+}
+
+test_sparse_match () {
+	run_on_sparse "$@" &&
+	test_cmp sparse-checkout-out sparse-index-out &&
+	test_cmp sparse-checkout-err sparse-index-err
+}
+
+test_expect_success 'sparse-index contents' '
+	init_repos &&
+
+	test-tool -C sparse-index read-cache --table >cache &&
+	for dir in folder1 folder2 x
+	do
+		TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
+		grep "040000 tree $TREE	$dir/" cache \
+			|| return 1
+	done &&
+
+	git -C sparse-index sparse-checkout set folder1 &&
+
+	test-tool -C sparse-index read-cache --table >cache &&
+	for dir in deep folder2 x
+	do
+		TREE=$(git -C sparse-index rev-parse HEAD:$dir) &&
+		grep "040000 tree $TREE	$dir/" cache \
+			|| return 1
+	done &&
+
+	git -C sparse-index sparse-checkout set deep/deeper1 &&
+
+	test-tool -C sparse-index read-cache --table >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 \
+			|| return 1
+	done &&
+
+	# Disabling the sparse-index removes 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_expect_success 'expanded in-memory index matches full index' '
+	init_repos &&
+	test_sparse_match test-tool read-cache --expand --table
+'
+
+test_expect_success 'status with options' '
+	init_repos &&
+	test_sparse_match ls &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git status --porcelain=v2 -z -u &&
+	test_all_match git status --porcelain=v2 -uno &&
+	run_on_all touch README.md &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git status --porcelain=v2 -z -u &&
+	test_all_match git status --porcelain=v2 -uno &&
+	test_all_match git add README.md &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git status --porcelain=v2 -z -u &&
+	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 &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>$1
+	EOF
+	run_on_all ../edit-contents README.md &&
+
+	test_all_match git add README.md &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "Add README.md" &&
+
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
+
+	run_on_all ../edit-contents README.md &&
+
+	test_all_match git add -A &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "Extend README.md" &&
+
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout - &&
+
+	run_on_all ../edit-contents deep/newfile &&
+
+	test_all_match git status --porcelain=v2 -uno &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git add . &&
+	test_all_match git status --porcelain=v2 &&
+	test_all_match git commit -m "add deep/newfile" &&
+
+	test_all_match git checkout HEAD~1 &&
+	test_all_match git checkout -
+'
+
+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 &&
+	test_sparse_match test_must_fail git add --refresh folder1/a &&
+
+	# NEEDSWORK: Adding a newly-tracked file outside the cone succeeds
+	test_sparse_match git add folder1/new &&
+
+	test_all_match git add . &&
+	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 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 &&
+
+	test_all_match git checkout update-folder1 &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git checkout update-deep &&
+	test_all_match git status --porcelain=v2 &&
+
+	test_all_match git checkout -b reset-test &&
+	test_all_match git reset --hard deepest &&
+	test_all_match git reset --hard update-folder1 &&
+	test_all_match git reset --hard update-folder2
+'
+
+test_expect_success 'diff --staged' '
+	init_repos &&
+
+	write_script edit-contents <<-\EOF &&
+	echo text >>README.md
+	EOF
+	run_on_all ../edit-contents &&
+
+	test_all_match git diff &&
+	test_all_match git diff --staged &&
+	test_all_match git add README.md &&
+	test_all_match git diff &&
+	test_all_match git diff --staged
+'
+
+# 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 \
+		      df-conflict-1 \
+		      fd-conflict
+	do
+		test_all_match git checkout rename-base &&
+		test_all_match git checkout $branch -- . &&
+		test_all_match git status --porcelain=v2 &&
+		test_all_match git diff --staged --no-renames &&
+		test_all_match git diff --staged --find-renames || return 1
+	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 --staged --no-renames &&
+		test_all_match git diff --staged --find-renames || return 1
+	done
+'
+
+test_expect_success 'log with pathspec outside sparse definition' '
+	init_repos &&
+
+	test_all_match git log -- a &&
+	test_all_match git log -- folder1/a &&
+	test_all_match git log -- folder2/a &&
+	test_all_match git log -- deep/a &&
+	test_all_match git log -- deep/deeper1/a &&
+	test_all_match git log -- deep/deeper1/deepest/a &&
+
+	test_all_match git checkout update-folder1 &&
+	test_all_match git log -- folder1/a
+'
+
+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
+'
+
+# 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' '
+	init_repos &&
+
+	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
+'
+
+# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
+# in this scenario, but it shouldn't.
+test_expect_failure '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
+'
+
+# NEEDSWORK: a sparse-checkout behaves differently from a full checkout
+# in this scenario, but it shouldn't.
+test_expect_success 'checkout and reset (mixed) [sparse]' '
+	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
+'
+
+test_expect_success 'merge' '
+	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 &&
+	test_all_match git rev-parse HEAD^{tree}
+'
+
+# NEEDSWORK: This test is documenting current behavior, but that
+# behavior can be confusing to users so there is desire to change it.
+# Right now, users might be using this flow to work through conflicts,
+# so any solution should present advice to users who try this sequence
+# of commands to follow whatever new method we create.
+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_all_match git add 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_all_match git add 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 'merge with outside renames' '
+	init_repos &&
+
+	for type in out-to-out out-to-in in-to-out
+	do
+		test_all_match git reset --hard &&
+		test_all_match git checkout -f -b merge-$type update-deep &&
+		test_all_match git merge -m "$type" rename-$type &&
+		test_all_match git rev-parse HEAD^{tree} || return 1
+	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 'clean' '
+	init_repos &&
+
+	echo bogus >>.gitignore &&
+	run_on_all cp ../.gitignore . &&
+	test_all_match git add .gitignore &&
+	test_all_match git commit -m "ignore bogus files" &&
+
+	run_on_sparse mkdir folder1 &&
+	run_on_all touch folder1/bogus &&
+
+	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 &&
+
+	test_all_match git clean -xf &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+
+	test_all_match git clean -xdf &&
+	test_all_match git status --porcelain=v2 &&
+	test_sparse_match ls &&
+	test_sparse_match ls folder1 &&
+
+	test_sparse_match test_path_is_dir folder1
+'
+
+test_expect_success 'submodule handling' '
+	init_repos &&
+
+	test_all_match mkdir modules &&
+	test_all_match touch modules/a &&
+	test_all_match git add modules &&
+	test_all_match git commit -m "add modules directory" &&
+
+	run_on_all git submodule add "$(pwd)/initial-repo" modules/sub &&
+	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_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 &&
+	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 &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git -C sparse-index "$@" &&
+	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 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 - &&
+	git -C sparse-index reset --hard &&
+	ensure_not_expanded checkout rename-out-to-out -- deep/deeper1 &&
+	git -C sparse-index 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 .
+'
+
+# 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 test-tool read-cache --table --expand &&
+	test_sparse_match git status --porcelain=v2 &&
+
+	# At this point, sparse-checkouts behave differently
+	# from the full-checkout.
+	test_sparse_match git checkout --orphan new-branch &&
+	test_sparse_match test-tool read-cache --table --expand &&
+	test_sparse_match git 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/t1300-config.sh b/t/t1300-config.sh
index 983a0a1583..9ff46f3b04 100755
--- a/t/t1300-config.sh
+++ b/t/t1300-config.sh
@@ -5,6 +5,9 @@
 
 test_description='Test git config in different settings'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'clear default config' '
@@ -12,75 +15,75 @@ test_expect_success 'clear default config' '
 '
 
 cat > expect << EOF
-[core]
+[section]
 	penguin = little blue
 EOF
 test_expect_success 'initial' '
-	git config core.penguin "little blue" &&
+	git config section.penguin "little blue" &&
 	test_cmp expect .git/config
 '
 
 cat > expect << EOF
-[core]
+[section]
 	penguin = little blue
 	Movie = BadPhysics
 EOF
 test_expect_success 'mixed case' '
-	git config Core.Movie BadPhysics &&
+	git config Section.Movie BadPhysics &&
 	test_cmp expect .git/config
 '
 
 cat > expect << EOF
-[core]
+[section]
 	penguin = little blue
 	Movie = BadPhysics
-[Cores]
+[Sections]
 	WhatEver = Second
 EOF
 test_expect_success 'similar section' '
-	git config Cores.WhatEver Second &&
+	git config Sections.WhatEver Second &&
 	test_cmp expect .git/config
 '
 
 cat > expect << EOF
-[core]
+[section]
 	penguin = little blue
 	Movie = BadPhysics
 	UPPERCASE = true
-[Cores]
+[Sections]
 	WhatEver = Second
 EOF
 test_expect_success 'uppercase section' '
-	git config CORE.UPPERCASE true &&
+	git config SECTION.UPPERCASE true &&
 	test_cmp expect .git/config
 '
 
 test_expect_success 'replace with non-match' '
-	git config core.penguin kingpin !blue
+	git config section.penguin kingpin !blue
 '
 
 test_expect_success 'replace with non-match (actually matching)' '
-	git config core.penguin "very blue" !kingpin
+	git config section.penguin "very blue" !kingpin
 '
 
 cat > expect << EOF
-[core]
+[section]
 	penguin = very blue
 	Movie = BadPhysics
 	UPPERCASE = true
 	penguin = kingpin
-[Cores]
+[Sections]
 	WhatEver = Second
 EOF
 
 test_expect_success 'non-match result' 'test_cmp expect .git/config'
 
 test_expect_success 'find mixed-case key by canonical name' '
-	test_cmp_config Second cores.whatever
+	test_cmp_config Second sections.whatever
 '
 
 test_expect_success 'find mixed-case key by non-canonical name' '
-	test_cmp_config Second CoReS.WhAtEvEr
+	test_cmp_config Second SeCtIoNs.WhAtEvEr
 '
 
 test_expect_success 'subsections are not canonicalized by git-config' '
@@ -469,7 +472,8 @@ test_expect_success 'new variable inserts into proper section' '
 '
 
 test_expect_success 'alternative --file (non-existing file should fail)' '
-	test_must_fail git config --file non-existing-config -l
+	test_must_fail git config --file non-existing-config -l &&
+	test_must_fail git config --file non-existing-config test.xyzzy
 '
 
 cat > other-config << EOF
@@ -506,10 +510,6 @@ test_expect_success 'editing stdin is an error' '
 
 test_expect_success 'refer config from subdirectory' '
 	mkdir x &&
-	test_cmp_config -C x strasse --get --file ../other-config ein.bahn
-'
-
-test_expect_success 'refer config from subdirectory via --file' '
 	test_cmp_config -C x strasse --file=../other-config --get ein.bahn
 '
 
@@ -675,6 +675,13 @@ test_expect_success 'invalid unit' '
 	test_i18ngrep "bad numeric config value .1auto. for .aninvalid.unit. in file .git/config: invalid unit" actual
 '
 
+test_expect_success 'invalid unit boolean' '
+	git config commit.gpgsign "1true" &&
+	test_cmp_config 1true commit.gpgsign &&
+	test_must_fail git config --bool --get commit.gpgsign 2>actual &&
+	test_i18ngrep "bad boolean config value .1true. for .commit.gpgsign." actual
+'
+
 test_expect_success 'line number is reported correctly' '
 	printf "[bool]\n\tvar\n" >invalid &&
 	test_must_fail git config -f invalid --path bool.var 2>actual &&
@@ -1036,11 +1043,6 @@ test_expect_success SYMLINKS 'symlinked configuration' '
 	test_cmp expect actual
 '
 
-test_expect_success 'nonexistent configuration' '
-	test_must_fail git config --file=doesnotexist --list &&
-	test_must_fail git config --file=doesnotexist test.xyzzy
-'
-
 test_expect_success SYMLINKS 'symlink to nonexistent configuration' '
 	ln -s doesnotexist linktonada &&
 	ln -s linktonada linktolinktonada &&
@@ -1054,8 +1056,8 @@ test_expect_success 'check split_cmdline return' "
 	echo foo > foo &&
 	git add foo &&
 	git commit -m 'initial commit' &&
-	git config branch.master.mergeoptions 'echo \"' &&
-	test_must_fail git merge master
+	git config branch.main.mergeoptions 'echo \"' &&
+	test_must_fail git merge main
 "
 
 test_expect_success 'git -c "key=value" support' '
@@ -1065,12 +1067,12 @@ test_expect_success 'git -c "key=value" support' '
 	true
 	EOF
 	{
-		git -c core.name=value config core.name &&
+		git -c section.name=value config section.name &&
 		git -c foo.CamelCase=value config foo.camelcase &&
 		git -c foo.flag config --bool foo.flag
 	} >actual &&
 	test_cmp expect actual &&
-	test_must_fail git -c name=value config core.name
+	test_must_fail git -c name=value config section.name
 '
 
 # We just need a type-specifier here that cares about the
@@ -1115,7 +1117,7 @@ test_expect_success 'aliases can be CamelCased' '
 
 test_expect_success 'git -c does not split values on equals' '
 	echo "value with = in it" >expect &&
-	git -c core.foo="value with = in it" config core.foo >actual &&
+	git -c section.foo="value with = in it" config section.foo >actual &&
 	test_cmp expect actual
 '
 
@@ -1191,47 +1193,47 @@ test_expect_success 'old-fashioned settings are case insensitive' '
 	test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" &&
 
 	cat >testConfig_actual <<-EOF &&
-		[V.A]
-		r = value1
+	[V.A]
+	r = value1
 	EOF
 	q_to_tab >testConfig_expect <<-EOF &&
-		[V.A]
-		Qr = value2
+	[V.A]
+	Qr = value2
 	EOF
 	git config -f testConfig_actual "v.a.r" value2 &&
 	test_cmp testConfig_expect testConfig_actual &&
 
 	cat >testConfig_actual <<-EOF &&
-		[V.A]
-		r = value1
+	[V.A]
+	r = value1
 	EOF
 	q_to_tab >testConfig_expect <<-EOF &&
-		[V.A]
-		QR = value2
+	[V.A]
+	QR = value2
 	EOF
 	git config -f testConfig_actual "V.a.R" value2 &&
 	test_cmp testConfig_expect testConfig_actual &&
 
 	cat >testConfig_actual <<-EOF &&
-		[V.A]
-		r = value1
+	[V.A]
+	r = value1
 	EOF
 	q_to_tab >testConfig_expect <<-EOF &&
-		[V.A]
-		r = value1
-		Qr = value2
+	[V.A]
+	r = value1
+	Qr = value2
 	EOF
 	git config -f testConfig_actual "V.A.r" value2 &&
 	test_cmp testConfig_expect testConfig_actual &&
 
 	cat >testConfig_actual <<-EOF &&
-		[V.A]
-		r = value1
+	[V.A]
+	r = value1
 	EOF
 	q_to_tab >testConfig_expect <<-EOF &&
-		[V.A]
-		r = value1
-		Qr = value2
+	[V.A]
+	r = value1
+	Qr = value2
 	EOF
 	git config -f testConfig_actual "v.A.r" value2 &&
 	test_cmp testConfig_expect testConfig_actual
@@ -1241,26 +1243,26 @@ test_expect_success 'setting different case sensitive subsections ' '
 	test_when_finished "rm -f testConfig testConfig_expect testConfig_actual" &&
 
 	cat >testConfig_actual <<-EOF &&
-		[V "A"]
-		R = v1
-		[K "E"]
-		Y = v1
-		[a "b"]
-		c = v1
-		[d "e"]
-		f = v1
+	[V "A"]
+	R = v1
+	[K "E"]
+	Y = v1
+	[a "b"]
+	c = v1
+	[d "e"]
+	f = v1
 	EOF
 	q_to_tab >testConfig_expect <<-EOF &&
-		[V "A"]
-		Qr = v2
-		[K "E"]
-		Qy = v2
-		[a "b"]
-		Qc = v2
-		[d "e"]
-		f = v1
-		[d "E"]
-		Qf = v2
+	[V "A"]
+	Qr = v2
+	[K "E"]
+	Qy = v2
+	[a "b"]
+	Qc = v2
+	[d "e"]
+	f = v1
+	[d "E"]
+	Qf = v2
 	EOF
 	# exact match
 	git config -f testConfig_actual a.b.c v2 &&
@@ -1294,6 +1296,58 @@ test_expect_success 'git -c is not confused by empty environment' '
 	GIT_CONFIG_PARAMETERS="" git -c x.one=1 config --list
 '
 
+test_expect_success 'GIT_CONFIG_PARAMETERS handles old-style entries' '
+	v="${SQ}key.one=foo${SQ}" &&
+	v="$v  ${SQ}key.two=bar${SQ}" &&
+	v="$v ${SQ}key.ambiguous=section.whatever=value${SQ}" &&
+	GIT_CONFIG_PARAMETERS=$v git config --get-regexp "key.*" >actual &&
+	cat >expect <<-EOF &&
+	key.one foo
+	key.two bar
+	key.ambiguous section.whatever=value
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'GIT_CONFIG_PARAMETERS handles new-style entries' '
+	v="${SQ}key.one${SQ}=${SQ}foo${SQ}" &&
+	v="$v  ${SQ}key.two${SQ}=${SQ}bar${SQ}" &&
+	v="$v ${SQ}key.ambiguous=section.whatever${SQ}=${SQ}value${SQ}" &&
+	GIT_CONFIG_PARAMETERS=$v git config --get-regexp "key.*" >actual &&
+	cat >expect <<-EOF &&
+	key.one foo
+	key.two bar
+	key.ambiguous=section.whatever value
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'old and new-style entries can mix' '
+	v="${SQ}key.oldone=oldfoo${SQ}" &&
+	v="$v ${SQ}key.newone${SQ}=${SQ}newfoo${SQ}" &&
+	v="$v ${SQ}key.oldtwo=oldbar${SQ}" &&
+	v="$v ${SQ}key.newtwo${SQ}=${SQ}newbar${SQ}" &&
+	GIT_CONFIG_PARAMETERS=$v git config --get-regexp "key.*" >actual &&
+	cat >expect <<-EOF &&
+	key.oldone oldfoo
+	key.newone newfoo
+	key.oldtwo oldbar
+	key.newtwo newbar
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'old and new bools with ambiguous subsection' '
+	v="${SQ}key.with=equals.oldbool${SQ}" &&
+	v="$v ${SQ}key.with=equals.newbool${SQ}=" &&
+	GIT_CONFIG_PARAMETERS=$v git config --get-regexp "key.*" >actual &&
+	cat >expect <<-EOF &&
+	key.with equals.oldbool
+	key.with=equals.newbool
+	EOF
+	test_cmp expect actual
+'
+
 test_expect_success 'detect bogus GIT_CONFIG_PARAMETERS' '
 	cat >expect <<-\EOF &&
 	env.one one
@@ -1316,6 +1370,186 @@ test_expect_success 'detect bogus GIT_CONFIG_PARAMETERS' '
 		git config --get-regexp "env.*"
 '
 
+test_expect_success 'git --config-env=key=envvar support' '
+	cat >expect <<-\EOF &&
+	value
+	value
+	value
+	value
+	false
+	false
+	EOF
+	{
+		ENVVAR=value git --config-env=core.name=ENVVAR config core.name &&
+		ENVVAR=value git --config-env core.name=ENVVAR config core.name &&
+		ENVVAR=value git --config-env=foo.CamelCase=ENVVAR config foo.camelcase &&
+		ENVVAR=value git --config-env foo.CamelCase=ENVVAR config foo.camelcase &&
+		ENVVAR= git --config-env=foo.flag=ENVVAR config --bool foo.flag &&
+		ENVVAR= git --config-env foo.flag=ENVVAR config --bool foo.flag
+	} >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git --config-env with missing value' '
+	test_must_fail env ENVVAR=value git --config-env 2>error &&
+	grep "no config key given for --config-env" error &&
+	test_must_fail env ENVVAR=value git --config-env config core.name 2>error &&
+	grep "invalid config format: config" error
+'
+
+test_expect_success 'git --config-env fails with invalid parameters' '
+	test_must_fail git --config-env=foo.flag config --bool foo.flag 2>error &&
+	test_i18ngrep "invalid config format: foo.flag" error &&
+	test_must_fail git --config-env=foo.flag= config --bool foo.flag 2>error &&
+	test_i18ngrep "missing environment variable name for configuration ${SQ}foo.flag${SQ}" error &&
+	sane_unset NONEXISTENT &&
+	test_must_fail git --config-env=foo.flag=NONEXISTENT config --bool foo.flag 2>error &&
+	test_i18ngrep "missing environment variable ${SQ}NONEXISTENT${SQ} for configuration ${SQ}foo.flag${SQ}" error
+'
+
+test_expect_success 'git -c and --config-env work together' '
+	cat >expect <<-\EOF &&
+	bar.cmd cmd-value
+	bar.env env-value
+	EOF
+	ENVVAR=env-value git \
+		-c bar.cmd=cmd-value \
+		--config-env=bar.env=ENVVAR \
+		config --get-regexp "^bar.*" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git -c and --config-env override each other' '
+	cat >expect <<-\EOF &&
+	env
+	cmd
+	EOF
+	{
+		ENVVAR=env git -c bar.bar=cmd --config-env=bar.bar=ENVVAR config bar.bar &&
+		ENVVAR=env git --config-env=bar.bar=ENVVAR -c bar.bar=cmd config bar.bar
+	} >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--config-env handles keys with equals' '
+	echo value=with=equals >expect &&
+	ENVVAR=value=with=equals git \
+		--config-env=section.subsection=with=equals.key=ENVVAR \
+		config section.subsection=with=equals.key >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git config handles environment config pairs' '
+	GIT_CONFIG_COUNT=2 \
+		GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="foo" \
+		GIT_CONFIG_KEY_1="pair.two" GIT_CONFIG_VALUE_1="bar" \
+		git config --get-regexp "pair.*" >actual &&
+	cat >expect <<-EOF &&
+	pair.one foo
+	pair.two bar
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'git config ignores pairs without count' '
+	test_must_fail env GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \
+		git config pair.one 2>error &&
+	test_must_be_empty error
+'
+
+test_expect_success 'git config ignores pairs with zero count' '
+	test_must_fail env \
+		GIT_CONFIG_COUNT=0 \
+		GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \
+		git config pair.one
+'
+
+test_expect_success 'git config ignores pairs exceeding count' '
+	GIT_CONFIG_COUNT=1 \
+		GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \
+		GIT_CONFIG_KEY_1="pair.two" GIT_CONFIG_VALUE_1="value" \
+		git config --get-regexp "pair.*" >actual &&
+	cat >expect <<-EOF &&
+	pair.one value
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'git config ignores pairs with zero count' '
+	test_must_fail env \
+		GIT_CONFIG_COUNT=0 GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \
+		git config pair.one >error &&
+	test_must_be_empty error
+'
+
+test_expect_success 'git config ignores pairs with empty count' '
+	test_must_fail env \
+		GIT_CONFIG_COUNT= GIT_CONFIG_KEY_0="pair.one" GIT_CONFIG_VALUE_0="value" \
+		git config pair.one >error &&
+	test_must_be_empty error
+'
+
+test_expect_success 'git config fails with invalid count' '
+	test_must_fail env GIT_CONFIG_COUNT=10a git config --list 2>error &&
+	test_i18ngrep "bogus count" error &&
+	test_must_fail env GIT_CONFIG_COUNT=9999999999999999 git config --list 2>error &&
+	test_i18ngrep "too many entries" error
+'
+
+test_expect_success 'git config fails with missing config key' '
+	test_must_fail env GIT_CONFIG_COUNT=1 GIT_CONFIG_VALUE_0="value" \
+		git config --list 2>error &&
+	test_i18ngrep "missing config key" error
+'
+
+test_expect_success 'git config fails with missing config value' '
+	test_must_fail env GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0="pair.one" \
+		git config --list 2>error &&
+	test_i18ngrep "missing config value" error
+'
+
+test_expect_success 'git config fails with invalid config pair key' '
+	test_must_fail env GIT_CONFIG_COUNT=1 \
+		GIT_CONFIG_KEY_0= GIT_CONFIG_VALUE_0=value \
+		git config --list &&
+	test_must_fail env GIT_CONFIG_COUNT=1 \
+		GIT_CONFIG_KEY_0=missing-section GIT_CONFIG_VALUE_0=value \
+		git config --list
+'
+
+test_expect_success 'environment overrides config file' '
+	test_when_finished "rm -f .git/config" &&
+	cat >.git/config <<-EOF &&
+	[pair]
+	one = value
+	EOF
+	GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=pair.one GIT_CONFIG_VALUE_0=override \
+		git config pair.one >actual &&
+	cat >expect <<-EOF &&
+	override
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'GIT_CONFIG_PARAMETERS overrides environment config' '
+	GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=pair.one GIT_CONFIG_VALUE_0=value \
+		GIT_CONFIG_PARAMETERS="${SQ}pair.one=override${SQ}" \
+		git config pair.one >actual &&
+	cat >expect <<-EOF &&
+	override
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'command line overrides environment config' '
+	GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=pair.one GIT_CONFIG_VALUE_0=value \
+		git -c pair.one=override config pair.one >actual &&
+	cat >expect <<-EOF &&
+	override
+	EOF
+	test_cmp expect actual
+'
+
 test_expect_success 'git config --edit works' '
 	git config -f tmp test.value no &&
 	echo test.value=yes >expect &&
@@ -1408,6 +1642,8 @@ test_expect_success 'urlmatch favors more specific URLs' '
 		cookieFile = /tmp/wildcard.txt
 	[http "https://*.example.com/wildcardwithsubdomain"]
 		cookieFile = /tmp/wildcardwithsubdomain.txt
+	[http "https://*.example.*"]
+		cookieFile = /tmp/multiwildcard.txt
 	[http "https://trailing.example.com"]
 		cookieFile = /tmp/trailing.txt
 	[http "https://user@*.example.com/"]
@@ -1454,6 +1690,10 @@ test_expect_success 'urlmatch favors more specific URLs' '
 
 	echo http.cookiefile /tmp/sub.txt >expect &&
 	git config --get-urlmatch HTTP https://user@sub.example.com >actual &&
+	test_cmp expect actual &&
+
+	echo http.cookiefile /tmp/multiwildcard.txt >expect &&
+	git config --get-urlmatch HTTP https://wildcard.example.org >actual &&
 	test_cmp expect actual
 '
 
@@ -1622,57 +1862,59 @@ test_expect_success 'set up --show-origin tests' '
 	INCLUDE_DIR="$HOME/include" &&
 	mkdir -p "$INCLUDE_DIR" &&
 	cat >"$INCLUDE_DIR"/absolute.include <<-\EOF &&
-		[user]
-			absolute = include
+	[user]
+		absolute = include
 	EOF
 	cat >"$INCLUDE_DIR"/relative.include <<-\EOF &&
-		[user]
-			relative = include
+	[user]
+		relative = include
 	EOF
 	cat >"$HOME"/.gitconfig <<-EOF &&
-		[user]
-			global = true
-			override = global
-		[include]
-			path = "$INCLUDE_DIR/absolute.include"
+	[user]
+		global = true
+		override = global
+	[include]
+		path = "$INCLUDE_DIR/absolute.include"
 	EOF
 	cat >.git/config <<-\EOF
-		[user]
-			local = true
-			override = local
-		[include]
-			path = ../include/relative.include
+	[user]
+		local = true
+		override = local
+	[include]
+		path = ../include/relative.include
 	EOF
 '
 
 test_expect_success '--show-origin with --list' '
 	cat >expect <<-EOF &&
-		file:$HOME/.gitconfig	user.global=true
-		file:$HOME/.gitconfig	user.override=global
-		file:$HOME/.gitconfig	include.path=$INCLUDE_DIR/absolute.include
-		file:$INCLUDE_DIR/absolute.include	user.absolute=include
-		file:.git/config	user.local=true
-		file:.git/config	user.override=local
-		file:.git/config	include.path=../include/relative.include
-		file:.git/../include/relative.include	user.relative=include
-		command line:	user.cmdline=true
-	EOF
-	git -c user.cmdline=true config --list --show-origin >output &&
+	file:$HOME/.gitconfig	user.global=true
+	file:$HOME/.gitconfig	user.override=global
+	file:$HOME/.gitconfig	include.path=$INCLUDE_DIR/absolute.include
+	file:$INCLUDE_DIR/absolute.include	user.absolute=include
+	file:.git/config	user.local=true
+	file:.git/config	user.override=local
+	file:.git/config	include.path=../include/relative.include
+	file:.git/../include/relative.include	user.relative=include
+	command line:	user.environ=true
+	command line:	user.cmdline=true
+	EOF
+	GIT_CONFIG_COUNT=1 GIT_CONFIG_KEY_0=user.environ GIT_CONFIG_VALUE_0=true\
+		git -c user.cmdline=true config --list --show-origin >output &&
 	test_cmp expect output
 '
 
 test_expect_success '--show-origin with --list --null' '
 	cat >expect <<-EOF &&
-		file:$HOME/.gitconfigQuser.global
-		trueQfile:$HOME/.gitconfigQuser.override
-		globalQfile:$HOME/.gitconfigQinclude.path
-		$INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute
-		includeQfile:.git/configQuser.local
-		trueQfile:.git/configQuser.override
-		localQfile:.git/configQinclude.path
-		../include/relative.includeQfile:.git/../include/relative.includeQuser.relative
-		includeQcommand line:Quser.cmdline
-		trueQ
+	file:$HOME/.gitconfigQuser.global
+	trueQfile:$HOME/.gitconfigQuser.override
+	globalQfile:$HOME/.gitconfigQinclude.path
+	$INCLUDE_DIR/absolute.includeQfile:$INCLUDE_DIR/absolute.includeQuser.absolute
+	includeQfile:.git/configQuser.local
+	trueQfile:.git/configQuser.override
+	localQfile:.git/configQinclude.path
+	../include/relative.includeQfile:.git/../include/relative.includeQuser.relative
+	includeQcommand line:Quser.cmdline
+	trueQ
 	EOF
 	git -c user.cmdline=true config --null --list --show-origin >output.raw &&
 	nul_to_q <output.raw >output &&
@@ -1684,9 +1926,9 @@ test_expect_success '--show-origin with --list --null' '
 
 test_expect_success '--show-origin with single file' '
 	cat >expect <<-\EOF &&
-		file:.git/config	user.local=true
-		file:.git/config	user.override=local
-		file:.git/config	include.path=../include/relative.include
+	file:.git/config	user.local=true
+	file:.git/config	user.override=local
+	file:.git/config	include.path=../include/relative.include
 	EOF
 	git config --local --list --show-origin >output &&
 	test_cmp expect output
@@ -1694,8 +1936,8 @@ test_expect_success '--show-origin with single file' '
 
 test_expect_success '--show-origin with --get-regexp' '
 	cat >expect <<-EOF &&
-		file:$HOME/.gitconfig	user.global true
-		file:.git/config	user.local true
+	file:$HOME/.gitconfig	user.global true
+	file:.git/config	user.local true
 	EOF
 	git config --show-origin --get-regexp "user\.[g|l].*" >output &&
 	test_cmp expect output
@@ -1703,31 +1945,36 @@ test_expect_success '--show-origin with --get-regexp' '
 
 test_expect_success '--show-origin getting a single key' '
 	cat >expect <<-\EOF &&
-		file:.git/config	local
+	file:.git/config	local
 	EOF
 	git config --show-origin user.override >output &&
 	test_cmp expect output
 '
 
 test_expect_success 'set up custom config file' '
-	CUSTOM_CONFIG_FILE="file\" (dq) and spaces.conf" &&
+	CUSTOM_CONFIG_FILE="custom.conf" &&
 	cat >"$CUSTOM_CONFIG_FILE" <<-\EOF
-		[user]
-			custom = true
+	[user]
+		custom = true
 	EOF
 '
 
+test_expect_success !MINGW 'set up custom config file with special name characters' '
+	WEIRDLY_NAMED_FILE="file\" (dq) and spaces.conf" &&
+	cp "$CUSTOM_CONFIG_FILE" "$WEIRDLY_NAMED_FILE"
+'
+
 test_expect_success !MINGW '--show-origin escape special file name characters' '
 	cat >expect <<-\EOF &&
-		file:"file\" (dq) and spaces.conf"	user.custom=true
+	file:"file\" (dq) and spaces.conf"	user.custom=true
 	EOF
-	git config --file "$CUSTOM_CONFIG_FILE" --show-origin --list >output &&
+	git config --file "$WEIRDLY_NAMED_FILE" --show-origin --list >output &&
 	test_cmp expect output
 '
 
 test_expect_success '--show-origin stdin' '
 	cat >expect <<-\EOF &&
-		standard input:	user.custom=true
+	standard input:	user.custom=true
 	EOF
 	git config --file - --show-origin --list <"$CUSTOM_CONFIG_FILE" >output &&
 	test_cmp expect output
@@ -1735,11 +1982,11 @@ test_expect_success '--show-origin stdin' '
 
 test_expect_success '--show-origin stdin with file include' '
 	cat >"$INCLUDE_DIR"/stdin.include <<-EOF &&
-		[user]
-			stdin = include
+	[user]
+		stdin = include
 	EOF
 	cat >expect <<-EOF &&
-		file:$INCLUDE_DIR/stdin.include	include
+	file:$INCLUDE_DIR/stdin.include	include
 	EOF
 	echo "[include]path=\"$INCLUDE_DIR\"/stdin.include" |
 	git config --show-origin --includes --file - user.stdin >output &&
@@ -1747,79 +1994,226 @@ test_expect_success '--show-origin stdin with file include' '
 	test_cmp expect output
 '
 
-test_expect_success !MINGW '--show-origin blob' '
+test_expect_success '--show-origin blob' '
 	blob=$(git hash-object -w "$CUSTOM_CONFIG_FILE") &&
 	cat >expect <<-EOF &&
-		blob:$blob	user.custom=true
+	blob:$blob	user.custom=true
 	EOF
 	git config --blob=$blob --show-origin --list >output &&
 	test_cmp expect output
 '
 
-test_expect_success !MINGW '--show-origin blob ref' '
+test_expect_success '--show-origin blob ref' '
 	cat >expect <<-\EOF &&
-		blob:"master:file\" (dq) and spaces.conf"	user.custom=true
+	blob:main:custom.conf	user.custom=true
 	EOF
 	git add "$CUSTOM_CONFIG_FILE" &&
 	git commit -m "new config file" &&
-	git config --blob=master:"$CUSTOM_CONFIG_FILE" --show-origin --list >output &&
+	git config --blob=main:"$CUSTOM_CONFIG_FILE" --show-origin --list >output &&
+	test_cmp expect output
+'
+
+test_expect_success '--show-scope with --list' '
+	cat >expect <<-EOF &&
+	global	user.global=true
+	global	user.override=global
+	global	include.path=$INCLUDE_DIR/absolute.include
+	global	user.absolute=include
+	local	user.local=true
+	local	user.override=local
+	local	include.path=../include/relative.include
+	local	user.relative=include
+	command	user.cmdline=true
+	EOF
+	git -c user.cmdline=true config --list --show-scope >output &&
+	test_cmp expect output
+'
+
+test_expect_success !MINGW '--show-scope with --blob' '
+	blob=$(git hash-object -w "$CUSTOM_CONFIG_FILE") &&
+	cat >expect <<-EOF &&
+	command	user.custom=true
+	EOF
+	git config --blob=$blob --show-scope --list >output &&
+	test_cmp expect output
+'
+
+test_expect_success '--show-scope with --local' '
+	cat >expect <<-\EOF &&
+	local	user.local=true
+	local	user.override=local
+	local	include.path=../include/relative.include
+	EOF
+	git config --local --list --show-scope >output &&
 	test_cmp expect output
 '
 
-test_expect_success '--local requires a repo' '
-	# we expect 128 to ensure that we do not simply
-	# fail to find anything and return code "1"
-	test_expect_code 128 nongit git config --local foo.bar
+test_expect_success '--show-scope getting a single value' '
+	cat >expect <<-\EOF &&
+	local	true
+	EOF
+	git config --show-scope --get user.local >output &&
+	test_cmp expect output
 '
 
+test_expect_success '--show-scope with --show-origin' '
+	cat >expect <<-EOF &&
+	global	file:$HOME/.gitconfig	user.global=true
+	global	file:$HOME/.gitconfig	user.override=global
+	global	file:$HOME/.gitconfig	include.path=$INCLUDE_DIR/absolute.include
+	global	file:$INCLUDE_DIR/absolute.include	user.absolute=include
+	local	file:.git/config	user.local=true
+	local	file:.git/config	user.override=local
+	local	file:.git/config	include.path=../include/relative.include
+	local	file:.git/../include/relative.include	user.relative=include
+	command	command line:	user.cmdline=true
+	EOF
+	git -c user.cmdline=true config --list --show-origin --show-scope >output &&
+	test_cmp expect output
+'
+
+test_expect_success 'override global and system config' '
+	test_when_finished rm -f "$HOME"/.config/git &&
+
+	cat >"$HOME"/.gitconfig <<-EOF &&
+	[home]
+		config = true
+	EOF
+	mkdir -p "$HOME"/.config/git &&
+	cat >"$HOME"/.config/git/config <<-EOF &&
+	[xdg]
+		config = true
+	EOF
+	cat >.git/config <<-EOF &&
+	[local]
+		config = true
+	EOF
+	cat >custom-global-config <<-EOF &&
+	[global]
+		config = true
+	EOF
+	cat >custom-system-config <<-EOF &&
+	[system]
+		config = true
+	EOF
+
+	cat >expect <<-EOF &&
+	global	xdg.config=true
+	global	home.config=true
+	local	local.config=true
+	EOF
+	git config --show-scope --list >output &&
+	test_cmp expect output &&
+
+	cat >expect <<-EOF &&
+	system	system.config=true
+	global	global.config=true
+	local	local.config=true
+	EOF
+	GIT_CONFIG_NOSYSTEM=false GIT_CONFIG_SYSTEM=custom-system-config GIT_CONFIG_GLOBAL=custom-global-config \
+		git config --show-scope --list >output &&
+	test_cmp expect output &&
+
+	cat >expect <<-EOF &&
+	local	local.config=true
+	EOF
+	GIT_CONFIG_NOSYSTEM=false GIT_CONFIG_SYSTEM=/dev/null GIT_CONFIG_GLOBAL=/dev/null \
+		git config --show-scope --list >output &&
+	test_cmp expect output
+'
+
+test_expect_success 'override global and system config with missing file' '
+	test_must_fail env GIT_CONFIG_GLOBAL=does-not-exist GIT_CONFIG_SYSTEM=/dev/null git config --global --list &&
+	test_must_fail env GIT_CONFIG_GLOBAL=/dev/null GIT_CONFIG_SYSTEM=does-not-exist git config --system --list &&
+	GIT_CONFIG_GLOBAL=does-not-exist GIT_CONFIG_SYSTEM=does-not-exist git version
+'
+
+test_expect_success 'system override has no effect with GIT_CONFIG_NOSYSTEM' '
+	# `git config --system` has different semantics compared to other
+	# commands as it ignores GIT_CONFIG_NOSYSTEM. We thus test whether the
+	# variable has an effect via a different proxy.
+	cat >alias-config <<-EOF &&
+	[alias]
+		hello-world = !echo "hello world"
+	EOF
+	test_must_fail env GIT_CONFIG_NOSYSTEM=true GIT_CONFIG_SYSTEM=alias-config \
+		git hello-world &&
+	GIT_CONFIG_NOSYSTEM=false GIT_CONFIG_SYSTEM=alias-config \
+		git hello-world >actual &&
+	echo "hello world" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'write to overridden global and system config' '
+	cat >expect <<EOF &&
+[config]
+	key = value
+EOF
+
+	GIT_CONFIG_GLOBAL=write-to-global git config --global config.key value &&
+	test_cmp expect write-to-global &&
+
+	GIT_CONFIG_SYSTEM=write-to-system git config --system config.key value &&
+	test_cmp expect write-to-system
+'
+
+for opt in --local --worktree
+do
+	test_expect_success "$opt requires a repo" '
+		# we expect 128 to ensure that we do not simply
+		# fail to find anything and return code "1"
+		test_expect_code 128 nongit git config $opt foo.bar
+	'
+done
+
 cat >.git/config <<-\EOF &&
-[core]
+[section]
 foo = true
 number = 10
 big = 1M
 EOF
 
 test_expect_success 'identical modern --type specifiers are allowed' '
-	test_cmp_config 1048576 --type=int --type=int core.big
+	test_cmp_config 1048576 --type=int --type=int section.big
 '
 
 test_expect_success 'identical legacy --type specifiers are allowed' '
-	test_cmp_config 1048576 --int --int core.big
+	test_cmp_config 1048576 --int --int section.big
 '
 
 test_expect_success 'identical mixed --type specifiers are allowed' '
-	test_cmp_config 1048576 --int --type=int core.big
+	test_cmp_config 1048576 --int --type=int section.big
 '
 
 test_expect_success 'non-identical modern --type specifiers are not allowed' '
-	test_must_fail git config --type=int --type=bool core.big 2>error &&
+	test_must_fail git config --type=int --type=bool section.big 2>error &&
 	test_i18ngrep "only one type at a time" error
 '
 
 test_expect_success 'non-identical legacy --type specifiers are not allowed' '
-	test_must_fail git config --int --bool core.big 2>error &&
+	test_must_fail git config --int --bool section.big 2>error &&
 	test_i18ngrep "only one type at a time" error
 '
 
 test_expect_success 'non-identical mixed --type specifiers are not allowed' '
-	test_must_fail git config --type=int --bool core.big 2>error &&
+	test_must_fail git config --type=int --bool section.big 2>error &&
 	test_i18ngrep "only one type at a time" error
 '
 
 test_expect_success '--type allows valid type specifiers' '
-	test_cmp_config true  --type=bool core.foo
+	test_cmp_config true  --type=bool section.foo
 '
 
 test_expect_success '--no-type unsets type specifiers' '
-	test_cmp_config 10 --type=bool --no-type core.number
+	test_cmp_config 10 --type=bool --no-type section.number
 '
 
 test_expect_success 'unset type specifiers may be reset to conflicting ones' '
-	test_cmp_config 1048576 --type=bool --no-type --type=int core.big
+	test_cmp_config 1048576 --type=bool --no-type --type=int section.big
 '
 
 test_expect_success '--type rejects unknown specifiers' '
-	test_must_fail git config --type=nonsense core.foo 2>error &&
+	test_must_fail git config --type=nonsense section.foo 2>error &&
 	test_i18ngrep "unrecognized --type argument" error
 '
 
@@ -1844,4 +2238,153 @@ test_expect_success '--replace-all does not invent newlines' '
 	test_cmp expect .git/config
 '
 
+test_expect_success 'set all config with value-pattern' '
+	test_when_finished rm -f config initial &&
+	git config --file=initial abc.key one &&
+
+	# no match => add new entry
+	cp initial config &&
+	git config --file=config abc.key two a+ &&
+	git config --file=config --list >actual &&
+	cat >expect <<-\EOF &&
+	abc.key=one
+	abc.key=two
+	EOF
+	test_cmp expect actual &&
+
+	# multiple matches => failure
+	test_must_fail git config --file=config abc.key three o+ 2>err &&
+	test_i18ngrep "has multiple values" err &&
+
+	# multiple values, no match => add
+	git config --file=config abc.key three a+ &&
+	git config --file=config --list >actual &&
+	cat >expect <<-\EOF &&
+	abc.key=one
+	abc.key=two
+	abc.key=three
+	EOF
+	test_cmp expect actual &&
+
+	# single match => replace
+	git config --file=config abc.key four h+ &&
+	git config --file=config --list >actual &&
+	cat >expect <<-\EOF &&
+	abc.key=one
+	abc.key=two
+	abc.key=four
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success '--replace-all and value-pattern' '
+	test_when_finished rm -f config &&
+	git config --file=config --add abc.key one &&
+	git config --file=config --add abc.key two &&
+	git config --file=config --add abc.key three &&
+	git config --file=config --replace-all abc.key four "o+" &&
+	git config --file=config --list >actual &&
+	cat >expect <<-\EOF &&
+	abc.key=four
+	abc.key=three
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'refuse --fixed-value for incompatible actions' '
+	test_when_finished rm -f config &&
+	git config --file=config dev.null bogus &&
+
+	# These modes do not allow --fixed-value at all
+	test_must_fail git config --file=config --fixed-value --add dev.null bogus &&
+	test_must_fail git config --file=config --fixed-value --get-urlmatch dev.null bogus &&
+	test_must_fail git config --file=config --fixed-value --get-urlmatch dev.null bogus &&
+	test_must_fail git config --file=config --fixed-value --rename-section dev null &&
+	test_must_fail git config --file=config --fixed-value --remove-section dev &&
+	test_must_fail git config --file=config --fixed-value --list &&
+	test_must_fail git config --file=config --fixed-value --get-color dev.null &&
+	test_must_fail git config --file=config --fixed-value --get-colorbool dev.null &&
+
+	# These modes complain when --fixed-value has no value-pattern
+	test_must_fail git config --file=config --fixed-value dev.null bogus &&
+	test_must_fail git config --file=config --fixed-value --replace-all dev.null bogus &&
+	test_must_fail git config --file=config --fixed-value --get dev.null &&
+	test_must_fail git config --file=config --fixed-value --get-all dev.null &&
+	test_must_fail git config --file=config --fixed-value --get-regexp "dev.*" &&
+	test_must_fail git config --file=config --fixed-value --unset dev.null &&
+	test_must_fail git config --file=config --fixed-value --unset-all dev.null
+'
+
+test_expect_success '--fixed-value uses exact string matching' '
+	test_when_finished rm -f config initial &&
+	META="a+b*c?d[e]f.g" &&
+	git config --file=initial fixed.test "$META" &&
+
+	cp initial config &&
+	git config --file=config fixed.test bogus "$META" &&
+	git config --file=config --list >actual &&
+	cat >expect <<-EOF &&
+	fixed.test=$META
+	fixed.test=bogus
+	EOF
+	test_cmp expect actual &&
+
+	cp initial config &&
+	git config --file=config --fixed-value fixed.test bogus "$META" &&
+	git config --file=config --list >actual &&
+	cat >expect <<-\EOF &&
+	fixed.test=bogus
+	EOF
+	test_cmp expect actual &&
+
+	cp initial config &&
+	test_must_fail git config --file=config --unset fixed.test "$META" &&
+	git config --file=config --fixed-value --unset fixed.test "$META" &&
+	test_must_fail git config --file=config fixed.test &&
+
+	cp initial config &&
+	test_must_fail git config --file=config --unset-all fixed.test "$META" &&
+	git config --file=config --fixed-value --unset-all fixed.test "$META" &&
+	test_must_fail git config --file=config fixed.test &&
+
+	cp initial config &&
+	git config --file=config --replace-all fixed.test bogus "$META" &&
+	git config --file=config --list >actual &&
+	cat >expect <<-EOF &&
+	fixed.test=$META
+	fixed.test=bogus
+	EOF
+	test_cmp expect actual &&
+
+	git config --file=config --fixed-value --replace-all fixed.test bogus "$META" &&
+	git config --file=config --list >actual &&
+	cat >expect <<-EOF &&
+	fixed.test=bogus
+	fixed.test=bogus
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success '--get and --get-all with --fixed-value' '
+	test_when_finished rm -f config &&
+	META="a+b*c?d[e]f.g" &&
+	git config --file=config fixed.test bogus &&
+	git config --file=config --add fixed.test "$META" &&
+
+	git config --file=config --get fixed.test bogus &&
+	test_must_fail git config --file=config --get fixed.test "$META" &&
+	git config --file=config --get --fixed-value fixed.test "$META" &&
+	test_must_fail git config --file=config --get --fixed-value fixed.test non-existent &&
+
+	git config --file=config --get-all fixed.test bogus &&
+	test_must_fail git config --file=config --get-all fixed.test "$META" &&
+	git config --file=config --get-all --fixed-value fixed.test "$META" &&
+	test_must_fail git config --file=config --get-all --fixed-value fixed.test non-existent &&
+
+	git config --file=config --get-regexp fixed+ bogus &&
+	test_must_fail git config --file=config --get-regexp fixed+ "$META" &&
+	git config --file=config --get-regexp --fixed-value fixed+ "$META" &&
+	test_must_fail git config --file=config --get-regexp --fixed-value fixed+ non-existent
+'
+
 test_done
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh
index 2dc853d1be..84bf1970d8 100755
--- a/t/t1301-shared-repo.sh
+++ b/t/t1301-shared-repo.sh
@@ -5,6 +5,9 @@
 
 test_description='Test shared repository initialization'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Remove a default ACL from the test dir if possible.
@@ -115,13 +118,13 @@ test_expect_success POSIXPERM 'git reflog expire honors core.sharedRepository' '
 	umask 077 &&
 	git config core.sharedRepository group &&
 	git reflog expire --all &&
-	actual="$(ls -l .git/logs/refs/heads/master)" &&
+	actual="$(ls -l .git/logs/refs/heads/main)" &&
 	case "$actual" in
 	-rw-rw-*)
 		: happy
 		;;
 	*)
-		echo Ooops, .git/logs/refs/heads/master is not 0662 [$actual]
+		echo Ooops, .git/logs/refs/heads/main is not 066x [$actual]
 		false
 		;;
 	esac
diff --git a/t/t1302-repo-version.sh b/t/t1302-repo-version.sh
index ce4cff13bb..0acabb6d11 100755
--- a/t/t1302-repo-version.sh
+++ b/t/t1302-repo-version.sh
@@ -8,6 +8,10 @@ test_description='Test repository version check'
 . ./test-lib.sh
 
 test_expect_success 'setup' '
+	test_oid_cache <<-\EOF &&
+	version sha1:0
+	version sha256:1
+	EOF
 	cat >test.patch <<-\EOF &&
 	diff --git a/test.txt b/test.txt
 	new file mode 100644
@@ -23,7 +27,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'gitdir selection on normal repos' '
-	echo 0 >expect &&
+	echo $(test_oid version) >expect &&
 	git config core.repositoryformatversion >actual &&
 	git -C test config core.repositoryformatversion >actual2 &&
 	test_cmp expect actual &&
@@ -83,6 +87,9 @@ allow 1
 allow 1 noop
 abort 1 no-such-extension
 allow 0 no-such-extension
+allow 0 noop
+abort 0 noop-v1
+allow 1 noop-v1
 EOF
 
 test_expect_success 'precious-objects allowed' '
diff --git a/t/t1305-config-include.sh b/t/t1305-config-include.sh
index d20b4d150d..ccbb116c01 100755
--- a/t/t1305-config-include.sh
+++ b/t/t1305-config-include.sh
@@ -63,7 +63,7 @@ test_expect_success 'listing includes option and expansion' '
 	test.one=1
 	EOF
 	git config --list >actual.full &&
-	grep -v ^core actual.full >actual &&
+	grep -v -e ^core -e ^extensions actual.full >actual &&
 	test_cmp expect actual
 '
 
@@ -312,7 +312,7 @@ test_expect_success SYMLINKS 'conditional include, gitdir matching symlink, icas
 test_expect_success 'conditional include, onbranch' '
 	echo "[includeIf \"onbranch:foo-branch\"]path=bar9" >>.git/config &&
 	echo "[test]nine=9" >.git/bar9 &&
-	git checkout -b master &&
+	git checkout -b main &&
 	test_must_fail git config test.nine &&
 	git checkout -b foo-branch &&
 	echo 9 >expect &&
@@ -352,9 +352,7 @@ test_expect_success 'include cycles are detected' '
 	git init --bare cycle &&
 	git -C cycle config include.path cycle &&
 	git config -f cycle/cycle include.path config &&
-	test_must_fail \
-		env GIT_TEST_GETTEXT_POISON=false \
-		git -C cycle config --get-all test.value 2>stderr &&
+	test_must_fail git -C cycle config --get-all test.value 2>stderr &&
 	grep "exceeded maximum include depth" stderr
 '
 
diff --git a/t/t1306-xdg-files.sh b/t/t1306-xdg-files.sh
index 21e139a313..40d3c42618 100755
--- a/t/t1306-xdg-files.sh
+++ b/t/t1306-xdg-files.sh
@@ -116,7 +116,7 @@ test_expect_success 'Exclusion in a non-XDG global ignore file' '
 test_expect_success 'Checking XDG ignore file when HOME is unset' '
 	(sane_unset HOME &&
 	 git config --unset core.excludesfile &&
-	 git ls-files --exclude-standard --ignored >actual) &&
+	 git ls-files --exclude-standard --ignored --others >actual) &&
 	test_must_be_empty actual
 '
 
@@ -153,7 +153,7 @@ test_expect_success 'Checking attributes in both XDG and local attributes files'
 
 
 test_expect_success 'Checking attributes in a non-XDG global attributes file' '
-	test_might_fail rm .gitattributes &&
+	rm -f .gitattributes &&
 	echo "f attr_f=test" >"$HOME"/my_gitattributes &&
 	git config core.attributesfile "$HOME"/my_gitattributes &&
 	echo "f: attr_f: test" >expected &&
@@ -165,7 +165,7 @@ test_expect_success 'Checking attributes in a non-XDG global attributes file' '
 test_expect_success 'write: xdg file exists and ~/.gitconfig doesn'\''t' '
 	mkdir -p "$HOME"/.config/git &&
 	>"$HOME"/.config/git/config &&
-	test_might_fail rm "$HOME"/.gitconfig &&
+	rm -f "$HOME"/.gitconfig &&
 	git config --global user.name "write_config" &&
 	echo "[user]" >expected &&
 	echo "	name = write_config" >>expected &&
@@ -183,8 +183,8 @@ test_expect_success 'write: xdg file exists and ~/.gitconfig exists' '
 
 
 test_expect_success 'write: ~/.config/git/ exists and config file doesn'\''t' '
-	test_might_fail rm "$HOME"/.gitconfig &&
-	test_might_fail rm "$HOME"/.config/git/config &&
+	rm -f "$HOME"/.gitconfig &&
+	rm -f "$HOME"/.config/git/config &&
 	git config --global user.name "write_gitconfig" &&
 	echo "[user]" >expected &&
 	echo "	name = write_gitconfig" >>expected &&
diff --git a/t/t1307-config-blob.sh b/t/t1307-config-blob.sh
index 37dc689d8c..930dce06f0 100755
--- a/t/t1307-config-blob.sh
+++ b/t/t1307-config-blob.sh
@@ -65,16 +65,14 @@ test_expect_success 'parse errors in blobs are properly attributed' '
 '
 
 test_expect_success 'can parse blob ending with CR' '
-	printf "[some]key = value\\r" >config &&
-	git add config &&
-	git commit -m CR &&
+	test_commit --printf CR config "[some]key = value\\r" &&
 	echo value >expect &&
 	git config --blob=HEAD:config some.key >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'config --blob outside of a repository is an error' '
-	test_must_fail nongit git config --blob=foo --list
+	nongit test_must_fail git config --blob=foo --list
 '
 
 test_done
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 7b4e1a63eb..88b119a0a3 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -208,14 +208,14 @@ test_expect_success 'proper error on error in default config files' '
 	echo "[" >>.git/config &&
 	echo "fatal: bad config line 34 in file .git/config" >expect &&
 	test_expect_code 128 test-tool config get_value foo.bar 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'proper error on error in custom config files' '
 	echo "[" >>syntax-error &&
 	echo "fatal: bad config line 1 in file syntax-error" >expect &&
 	test_expect_code 128 test-tool config configset_get_value foo.bar syntax-error 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'check line errors for malformed values' '
@@ -238,8 +238,8 @@ test_expect_success 'error on modifying repo config without repo' '
 
 cmdline_config="'foo.bar=from-cmdline'"
 test_expect_success 'iteration shows correct origins' '
-	echo "[foo]bar = from-repo" >.git/config &&
-	echo "[foo]bar = from-home" >.gitconfig &&
+	printf "[ignore]\n\tthis = please\n[foo]bar = from-repo\n" >.git/config &&
+	printf "[foo]\n\tbar = from-home\n" >.gitconfig &&
 	if test_have_prereq MINGW
 	then
 		# Use Windows path (i.e. *not* $HOME)
@@ -253,19 +253,29 @@ test_expect_success 'iteration shows correct origins' '
 	value=from-home
 	origin=file
 	name=$HOME_GITCONFIG
+	lno=2
 	scope=global
 
+	key=ignore.this
+	value=please
+	origin=file
+	name=.git/config
+	lno=2
+	scope=local
+
 	key=foo.bar
 	value=from-repo
 	origin=file
 	name=.git/config
-	scope=repo
+	lno=3
+	scope=local
 
 	key=foo.bar
 	value=from-cmdline
 	origin=command line
 	name=
-	scope=cmdline
+	lno=-1
+	scope=command
 	EOF
 	GIT_CONFIG_PARAMETERS=$cmdline_config test-tool config iterate >actual &&
 	test_cmp expect actual
diff --git a/t/t1309-early-config.sh b/t/t1309-early-config.sh
index 3a0de0ddaa..b4a9158307 100755
--- a/t/t1309-early-config.sh
+++ b/t/t1309-early-config.sh
@@ -29,7 +29,7 @@ test_expect_success 'ceiling' '
 		cd sub &&
 		test-tool config read_early_config early.config
 	) >output &&
-	test -z "$(cat output)"
+	test_must_be_empty output
 '
 
 test_expect_success 'ceiling #2' '
@@ -91,11 +91,11 @@ test_expect_failure 'ignore .git/ with invalid config' '
 
 test_expect_success 'early config and onbranch' '
 	echo "[broken" >broken &&
-	test_with_config "[includeif \"onbranch:master\"]path=../broken"
+	test_with_config "[includeif \"onbranch:topic\"]path=../broken"
 '
 
 test_expect_success 'onbranch config outside of git repo' '
-	test_config_global includeIf.onbranch:master.path non-existent &&
+	test_config_global includeIf.onbranch:topic.path non-existent &&
 	nongit git help
 '
 
diff --git a/t/t1350-config-hooks-path.sh b/t/t1350-config-hooks-path.sh
index f1f9aee9f5..fa9647a7c0 100755
--- a/t/t1350-config-hooks-path.sh
+++ b/t/t1350-config-hooks-path.sh
@@ -5,6 +5,7 @@ test_description='Test the core.hooksPath configuration variable'
 . ./test-lib.sh
 
 test_expect_success 'set up a pre-commit hook in core.hooksPath' '
+	>actual &&
 	mkdir -p .git/custom-hooks .git/hooks &&
 	write_script .git/custom-hooks/pre-commit <<-\EOF &&
 	echo CUSTOM >>actual
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index 1fbd940408..4506cd435b 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -4,11 +4,14 @@
 #
 
 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
 
-m=refs/heads/master
+m=refs/heads/main
 n_dir=refs/heads/gu
 n=$n_dir/fixes
 outside=refs/foo
@@ -27,38 +30,39 @@ create_test_commits ()
 }
 
 test_expect_success setup '
+	git checkout --orphan main &&
 	create_test_commits "" &&
 	mkdir $bare &&
 	cd $bare &&
-	git init --bare &&
+	git init --bare -b main &&
 	create_test_commits "bare" &&
 	cd -
 '
 
 test_expect_success "create $m" '
 	git update-ref $m $A &&
-	test $A = $(cat .git/$m)
+	test $A = $(git show-ref -s --verify $m)
 '
 test_expect_success "create $m with oldvalue verification" '
 	git update-ref $m $B $A &&
-	test $B = $(cat .git/$m)
+	test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "fail to delete $m with stale ref" '
 	test_must_fail git update-ref -d $m $A &&
-	test $B = "$(cat .git/$m)"
+	test $B = "$(git show-ref -s --verify $m)"
 '
 test_expect_success "delete $m" '
-	test_when_finished "rm -f .git/$m" &&
+	test_when_finished "git update-ref -d $m" &&
 	git update-ref -d $m $B &&
-	test_path_is_missing .git/$m
+	test_must_fail git show-ref --verify -q $m
 '
 
 test_expect_success "delete $m without oldvalue verification" '
-	test_when_finished "rm -f .git/$m" &&
+	test_when_finished "git update-ref -d $m" &&
 	git update-ref $m $A &&
-	test $A = $(cat .git/$m) &&
+	test $A = $(git show-ref -s --verify $m) &&
 	git update-ref -d $m &&
-	test_path_is_missing .git/$m
+	test_must_fail git show-ref --verify -q $m
 '
 
 test_expect_success "fail to create $n" '
@@ -69,37 +73,37 @@ test_expect_success "fail to create $n" '
 
 test_expect_success "create $m (by HEAD)" '
 	git update-ref HEAD $A &&
-	test $A = $(cat .git/$m)
+	test $A = $(git show-ref -s --verify $m)
 '
 test_expect_success "create $m (by HEAD) with oldvalue verification" '
 	git update-ref HEAD $B $A &&
-	test $B = $(cat .git/$m)
+	test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "fail to delete $m (by HEAD) with stale ref" '
 	test_must_fail git update-ref -d HEAD $A &&
-	test $B = $(cat .git/$m)
+	test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "delete $m (by HEAD)" '
-	test_when_finished "rm -f .git/$m" &&
+	test_when_finished "git update-ref -d $m" &&
 	git update-ref -d HEAD $B &&
-	test_path_is_missing .git/$m
+	test_must_fail git show-ref --verify -q $m
 '
 
 test_expect_success "deleting current branch adds message to HEAD's log" '
-	test_when_finished "rm -f .git/$m" &&
+	test_when_finished "git update-ref -d $m" &&
 	git update-ref $m $A &&
 	git symbolic-ref HEAD $m &&
 	git update-ref -m delete-$m -d $m &&
-	test_path_is_missing .git/$m &&
+	test_must_fail git show-ref --verify -q $m &&
 	grep "delete-$m$" .git/logs/HEAD
 '
 
 test_expect_success "deleting by HEAD adds message to HEAD's log" '
-	test_when_finished "rm -f .git/$m" &&
+	test_when_finished "git update-ref -d $m" &&
 	git update-ref $m $A &&
 	git symbolic-ref HEAD $m &&
 	git update-ref -m delete-by-head -d HEAD &&
-	test_path_is_missing .git/$m &&
+	test_must_fail git show-ref --verify -q $m &&
 	grep "delete-by-head$" .git/logs/HEAD
 '
 
@@ -160,10 +164,10 @@ test_expect_success 'core.logAllRefUpdates=always creates reflog by default' '
 	git reflog exists $outside
 '
 
-test_expect_success 'core.logAllRefUpdates=always creates no reflog for ORIG_HEAD' '
+test_expect_success 'core.logAllRefUpdates=always creates reflog for ORIG_HEAD' '
 	test_config core.logAllRefUpdates always &&
 	git update-ref ORIG_HEAD $A &&
-	test_must_fail git reflog exists ORIG_HEAD
+	git reflog exists ORIG_HEAD
 '
 
 test_expect_success '--no-create-reflog overrides core.logAllRefUpdates=always' '
@@ -178,41 +182,47 @@ test_expect_success '--no-create-reflog overrides core.logAllRefUpdates=always'
 
 test_expect_success "create $m (by HEAD)" '
 	git update-ref HEAD $A &&
-	test $A = $(cat .git/$m)
+	test $A = $(git show-ref -s --verify $m)
 '
 test_expect_success 'pack refs' '
 	git pack-refs --all
 '
 test_expect_success "move $m (by HEAD)" '
 	git update-ref HEAD $B $A &&
-	test $B = $(cat .git/$m)
+	test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "delete $m (by HEAD) should remove both packed and loose $m" '
-	test_when_finished "rm -f .git/$m" &&
+	test_when_finished "git update-ref -d $m" &&
 	git update-ref -d HEAD $B &&
 	! grep "$m" .git/packed-refs &&
-	test_path_is_missing .git/$m
+	test_must_fail git show-ref --verify -q $m
 '
 
-cp -f .git/HEAD .git/HEAD.orig
 test_expect_success 'delete symref without dereference' '
-	test_when_finished "cp -f .git/HEAD.orig .git/HEAD" &&
-	git update-ref --no-deref -d HEAD &&
-	test_path_is_missing .git/HEAD
+	test_when_finished "git update-ref -d $m" &&
+	echo foo >foo.c &&
+	git add foo.c &&
+	git commit -m foo &&
+	git symbolic-ref SYMREF $m &&
+	git update-ref --no-deref -d SYMREF &&
+	git show-ref --verify -q $m &&
+	test_must_fail git show-ref --verify -q SYMREF &&
+	test_must_fail git symbolic-ref SYMREF
 '
 
 test_expect_success 'delete symref without dereference when the referred ref is packed' '
-	test_when_finished "cp -f .git/HEAD.orig .git/HEAD" &&
+	test_when_finished "git update-ref -d $m" &&
 	echo foo >foo.c &&
 	git add foo.c &&
 	git commit -m foo &&
+	git symbolic-ref SYMREF $m &&
 	git pack-refs --all &&
-	git update-ref --no-deref -d HEAD &&
-	test_path_is_missing .git/HEAD
+	git update-ref --no-deref -d SYMREF &&
+	git show-ref --verify -q $m &&
+	test_must_fail git show-ref --verify -q SYMREF &&
+	test_must_fail git symbolic-ref SYMREF
 '
 
-git update-ref -d $m
-
 test_expect_success 'update-ref -d is not confused by self-reference' '
 	git symbolic-ref refs/heads/self refs/heads/self &&
 	test_when_finished "rm -f .git/refs/heads/self" &&
@@ -226,25 +236,25 @@ test_expect_success 'update-ref --no-deref -d can delete self-reference' '
 	test_when_finished "rm -f .git/refs/heads/self" &&
 	test_path_is_file .git/refs/heads/self &&
 	git update-ref --no-deref -d refs/heads/self &&
-	test_path_is_missing .git/refs/heads/self
+	test_must_fail git show-ref --verify -q refs/heads/self
 '
 
 test_expect_success 'update-ref --no-deref -d can delete reference to bad ref' '
 	>.git/refs/heads/bad &&
 	test_when_finished "rm -f .git/refs/heads/bad" &&
 	git symbolic-ref refs/heads/ref-to-bad refs/heads/bad &&
-	test_when_finished "rm -f .git/refs/heads/ref-to-bad" &&
+	test_when_finished "git update-ref -d refs/heads/ref-to-bad" &&
 	test_path_is_file .git/refs/heads/ref-to-bad &&
 	git update-ref --no-deref -d refs/heads/ref-to-bad &&
-	test_path_is_missing .git/refs/heads/ref-to-bad
+	test_must_fail git show-ref --verify -q refs/heads/ref-to-bad
 '
 
 test_expect_success '(not) create HEAD with old sha1' '
 	test_must_fail git update-ref HEAD $A $B
 '
 test_expect_success "(not) prior created .git/$m" '
-	test_when_finished "rm -f .git/$m" &&
-	test_path_is_missing .git/$m
+	test_when_finished "git update-ref -d $m" &&
+	test_must_fail git show-ref --verify -q $m
 '
 
 test_expect_success 'create HEAD' '
@@ -254,28 +264,28 @@ test_expect_success '(not) change HEAD with wrong SHA1' '
 	test_must_fail git update-ref HEAD $B $Z
 '
 test_expect_success "(not) changed .git/$m" '
-	test_when_finished "rm -f .git/$m" &&
-	! test $B = $(cat .git/$m)
+	test_when_finished "git update-ref -d $m" &&
+	! test $B = $(git show-ref -s --verify $m)
 '
 
-rm -f .git/logs/refs/heads/master
+rm -f .git/logs/refs/heads/main
 test_expect_success "create $m (logged by touch)" '
 	test_config core.logAllRefUpdates false &&
 	GIT_COMMITTER_DATE="2005-05-26 23:30" \
 	git update-ref --create-reflog HEAD $A -m "Initial Creation" &&
-	test $A = $(cat .git/$m)
+	test $A = $(git show-ref -s --verify $m)
 '
 test_expect_success "update $m (logged by touch)" '
 	test_config core.logAllRefUpdates false &&
 	GIT_COMMITTER_DATE="2005-05-26 23:31" \
 	git update-ref HEAD $B $A -m "Switch" &&
-	test $B = $(cat .git/$m)
+	test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "set $m (logged by touch)" '
 	test_config core.logAllRefUpdates false &&
 	GIT_COMMITTER_DATE="2005-05-26 23:41" \
 	git update-ref HEAD $A &&
-	test $A = $(cat .git/$m)
+	test $A = $(git show-ref -s --verify $m)
 '
 
 test_expect_success 'empty directory removal' '
@@ -284,8 +294,8 @@ test_expect_success 'empty directory removal' '
 	test_path_is_file .git/refs/heads/d1/d2/r1 &&
 	test_path_is_file .git/logs/refs/heads/d1/d2/r1 &&
 	git branch -d d1/d2/r1 &&
-	test_path_is_missing .git/refs/heads/d1/d2 &&
-	test_path_is_missing .git/logs/refs/heads/d1/d2 &&
+	test_must_fail git show-ref --verify -q refs/heads/d1/d2 &&
+	test_must_fail git show-ref --verify -q logs/refs/heads/d1/d2 &&
 	test_path_is_file .git/refs/heads/d1/r2 &&
 	test_path_is_file .git/logs/refs/heads/d1/r2
 '
@@ -294,12 +304,12 @@ test_expect_success 'symref empty directory removal' '
 	git branch e1/e2/r1 HEAD &&
 	git branch e1/r2 HEAD &&
 	git checkout e1/e2/r1 &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	test_path_is_file .git/refs/heads/e1/e2/r1 &&
 	test_path_is_file .git/logs/refs/heads/e1/e2/r1 &&
 	git update-ref -d HEAD &&
-	test_path_is_missing .git/refs/heads/e1/e2 &&
-	test_path_is_missing .git/logs/refs/heads/e1/e2 &&
+	test_must_fail git show-ref --verify -q refs/heads/e1/e2 &&
+	test_must_fail git show-ref --verify -q logs/refs/heads/e1/e2 &&
 	test_path_is_file .git/refs/heads/e1/r2 &&
 	test_path_is_file .git/logs/refs/heads/e1/r2 &&
 	test_path_is_file .git/logs/HEAD
@@ -319,19 +329,19 @@ test_expect_success "create $m (logged by config)" '
 	test_config core.logAllRefUpdates true &&
 	GIT_COMMITTER_DATE="2005-05-26 23:32" \
 	git update-ref HEAD $A -m "Initial Creation" &&
-	test $A = $(cat .git/$m)
+	test $A = $(git show-ref -s --verify $m)
 '
 test_expect_success "update $m (logged by config)" '
 	test_config core.logAllRefUpdates true &&
 	GIT_COMMITTER_DATE="2005-05-26 23:33" \
-	git update-ref HEAD'" $B $A "'-m "Switch" &&
-	test $B = $(cat .git/$m)
+	git update-ref HEAD $B $A -m "Switch" &&
+	test $B = $(git show-ref -s --verify $m)
 '
 test_expect_success "set $m (logged by config)" '
 	test_config core.logAllRefUpdates true &&
 	GIT_COMMITTER_DATE="2005-05-26 23:43" \
 	git update-ref HEAD $A &&
-	test $A = $(cat .git/$m)
+	test $A = $(git show-ref -s --verify $m)
 '
 
 cat >expect <<EOF
@@ -344,70 +354,84 @@ test_expect_success "verifying $m's log (logged by config)" '
 	test_cmp expect .git/logs/$m
 '
 
-git update-ref $m $D
-cat >.git/logs/$m <<EOF
-$Z $C $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 -0500
-$C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150350 -0500
-$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500
-$F $Z $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150680 -0500
-$Z $E $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 -0500
-EOF
+test_expect_success 'set up for querying the reflog' '
+	git update-ref $m $D &&
+	cat >.git/logs/$m <<-EOF
+	$Z $C $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150320 -0500
+	$C $A $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150350 -0500
+	$A $B $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150380 -0500
+	$F $Z $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150680 -0500
+	$Z $E $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150980 -0500
+	EOF
+'
 
 ed="Thu, 26 May 2005 18:32:00 -0500"
 gd="Thu, 26 May 2005 18:33:00 -0500"
 ld="Thu, 26 May 2005 18:43:00 -0500"
-test_expect_success 'Query "master@{May 25 2005}" (before history)' '
+test_expect_success 'Query "main@{May 25 2005}" (before history)' '
 	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "master@{May 25 2005}" >o 2>e &&
-	test $C = $(cat o) &&
-	test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"
+	git rev-parse --verify "main@{May 25 2005}" >o 2>e &&
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
+	test_cmp expect e
 '
-test_expect_success 'Query master@{2005-05-25} (before history)' '
+test_expect_success 'Query main@{2005-05-25} (before history)' '
 	test_when_finished "rm -f o e" &&
-	git rev-parse --verify master@{2005-05-25} >o 2>e &&
-	test $C = $(cat o) &&
-	test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"
+	git rev-parse --verify main@{2005-05-25} >o 2>e &&
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
+	test_cmp expect e
 '
-test_expect_success 'Query "master@{May 26 2005 23:31:59}" (1 second before history)' '
+test_expect_success 'Query "main@{May 26 2005 23:31:59}" (1 second before history)' '
 	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "master@{May 26 2005 23:31:59}" >o 2>e &&
-	test $C = $(cat o) &&
-	test "warning: Log for '\''master'\'' only goes back to $ed." = "$(cat e)"
+	git rev-parse --verify "main@{May 26 2005 23:31:59}" >o 2>e &&
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	echo "warning: log for '\''main'\'' only goes back to $ed" >expect &&
+	test_cmp expect e
 '
-test_expect_success 'Query "master@{May 26 2005 23:32:00}" (exactly history start)' '
+test_expect_success 'Query "main@{May 26 2005 23:32:00}" (exactly history start)' '
 	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "master@{May 26 2005 23:32:00}" >o 2>e &&
-	test $C = $(cat o) &&
-	test "" = "$(cat e)"
+	git rev-parse --verify "main@{May 26 2005 23:32:00}" >o 2>e &&
+	echo "$C" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 '
-test_expect_success 'Query "master@{May 26 2005 23:32:30}" (first non-creation change)' '
+test_expect_success 'Query "main@{May 26 2005 23:32:30}" (first non-creation change)' '
 	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "master@{May 26 2005 23:32:30}" >o 2>e &&
-	test $A = $(cat o) &&
-	test "" = "$(cat e)"
+	git rev-parse --verify "main@{May 26 2005 23:32:30}" >o 2>e &&
+	echo "$A" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 '
-test_expect_success 'Query "master@{2005-05-26 23:33:01}" (middle of history with gap)' '
+test_expect_success 'Query "main@{2005-05-26 23:33:01}" (middle of history with gap)' '
 	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "master@{2005-05-26 23:33:01}" >o 2>e &&
-	test $B = $(cat o) &&
+	git rev-parse --verify "main@{2005-05-26 23:33:01}" >o 2>e &&
+	echo "$B" >expect &&
+	test_cmp expect o &&
 	test_i18ngrep -F "warning: log for ref $m has gap after $gd" e
 '
-test_expect_success 'Query "master@{2005-05-26 23:38:00}" (middle of history)' '
+test_expect_success 'Query "main@{2005-05-26 23:38:00}" (middle of history)' '
 	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "master@{2005-05-26 23:38:00}" >o 2>e &&
-	test $Z = $(cat o) &&
-	test "" = "$(cat e)"
+	git rev-parse --verify "main@{2005-05-26 23:38:00}" >o 2>e &&
+	echo "$Z" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 '
-test_expect_success 'Query "master@{2005-05-26 23:43:00}" (exact end of history)' '
+test_expect_success 'Query "main@{2005-05-26 23:43:00}" (exact end of history)' '
 	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "master@{2005-05-26 23:43:00}" >o 2>e &&
-	test $E = $(cat o) &&
-	test "" = "$(cat e)"
+	git rev-parse --verify "main@{2005-05-26 23:43:00}" >o 2>e &&
+	echo "$E" >expect &&
+	test_cmp expect o &&
+	test_must_be_empty e
 '
-test_expect_success 'Query "master@{2005-05-28}" (past end of history)' '
+test_expect_success 'Query "main@{2005-05-28}" (past end of history)' '
 	test_when_finished "rm -f o e" &&
-	git rev-parse --verify "master@{2005-05-28}" >o 2>e &&
-	test $D = $(cat o) &&
+	git rev-parse --verify "main@{2005-05-28}" >o 2>e &&
+	echo "$D" >expect &&
+	test_cmp expect o &&
 	test_i18ngrep -F "warning: log for ref $m unexpectedly ended on $ld" e
 '
 
@@ -447,71 +471,71 @@ test_expect_success 'git commit logged updates' '
 '
 unset h_TEST h_OTHER h_FIXED h_MERGED
 
-test_expect_success 'git cat-file blob master:F (expect OTHER)' '
-	test OTHER = $(git cat-file blob master:F)
+test_expect_success 'git cat-file blob main:F (expect OTHER)' '
+	test OTHER = $(git cat-file blob main:F)
 '
-test_expect_success 'git cat-file blob master@{2005-05-26 23:30}:F (expect TEST)' '
-	test TEST = $(git cat-file blob "master@{2005-05-26 23:30}:F")
+test_expect_success 'git cat-file blob main@{2005-05-26 23:30}:F (expect TEST)' '
+	test TEST = $(git cat-file blob "main@{2005-05-26 23:30}:F")
 '
-test_expect_success 'git cat-file blob master@{2005-05-26 23:42}:F (expect OTHER)' '
-	test OTHER = $(git cat-file blob "master@{2005-05-26 23:42}:F")
+test_expect_success 'git cat-file blob main@{2005-05-26 23:42}:F (expect OTHER)' '
+	test OTHER = $(git cat-file blob "main@{2005-05-26 23:42}:F")
 '
 
 # Test adding and deleting pseudorefs
 
 test_expect_success 'given old value for missing pseudoref, do not create' '
 	test_must_fail git update-ref PSEUDOREF $A $B 2>err &&
-	test_path_is_missing .git/PSEUDOREF &&
-	test_i18ngrep "could not read ref" err
+	test_must_fail git rev-parse PSEUDOREF &&
+	test_i18ngrep "unable to resolve reference" err
 '
 
 test_expect_success 'create pseudoref' '
 	git update-ref PSEUDOREF $A &&
-	test $A = $(cat .git/PSEUDOREF)
+	test $A = $(git rev-parse PSEUDOREF)
 '
 
 test_expect_success 'overwrite pseudoref with no old value given' '
 	git update-ref PSEUDOREF $B &&
-	test $B = $(cat .git/PSEUDOREF)
+	test $B = $(git rev-parse PSEUDOREF)
 '
 
 test_expect_success 'overwrite pseudoref with correct old value' '
 	git update-ref PSEUDOREF $C $B &&
-	test $C = $(cat .git/PSEUDOREF)
+	test $C = $(git rev-parse PSEUDOREF)
 '
 
 test_expect_success 'do not overwrite pseudoref with wrong old value' '
 	test_must_fail git update-ref PSEUDOREF $D $E 2>err &&
-	test $C = $(cat .git/PSEUDOREF) &&
-	test_i18ngrep "unexpected object ID" err
+	test $C = $(git rev-parse PSEUDOREF) &&
+	test_i18ngrep "cannot lock ref.*expected" err
 '
 
 test_expect_success 'delete pseudoref' '
 	git update-ref -d PSEUDOREF &&
-	test_path_is_missing .git/PSEUDOREF
+	test_must_fail git rev-parse PSEUDOREF
 '
 
 test_expect_success 'do not delete pseudoref with wrong old value' '
 	git update-ref PSEUDOREF $A &&
 	test_must_fail git update-ref -d PSEUDOREF $B 2>err &&
-	test $A = $(cat .git/PSEUDOREF) &&
-	test_i18ngrep "unexpected object ID" err
+	test $A = $(git rev-parse PSEUDOREF) &&
+	test_i18ngrep "cannot lock ref.*expected" err
 '
 
 test_expect_success 'delete pseudoref with correct old value' '
 	git update-ref -d PSEUDOREF $A &&
-	test_path_is_missing .git/PSEUDOREF
+	test_must_fail git rev-parse PSEUDOREF
 '
 
 test_expect_success 'create pseudoref with old OID zero' '
 	git update-ref PSEUDOREF $A $Z &&
-	test $A = $(cat .git/PSEUDOREF)
+	test $A = $(git rev-parse PSEUDOREF)
 '
 
 test_expect_success 'do not overwrite pseudoref with old OID zero' '
 	test_when_finished git update-ref -d PSEUDOREF &&
 	test_must_fail git update-ref PSEUDOREF $B $Z 2>err &&
-	test $A = $(cat .git/PSEUDOREF) &&
+	test $A = $(git rev-parse PSEUDOREF) &&
 	test_i18ngrep "already exists" err
 '
 
@@ -566,21 +590,21 @@ test_expect_success 'stdin fails on unknown command' '
 '
 
 test_expect_success 'stdin fails on unbalanced quotes' '
-	echo "create $a \"master" >stdin &&
+	echo "create $a \"main" >stdin &&
 	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: badly quoted argument: \\\"master" err
+	grep "fatal: badly quoted argument: \\\"main" err
 '
 
 test_expect_success 'stdin fails on invalid escape' '
-	echo "create $a \"ma\zter\"" >stdin &&
+	echo "create $a \"ma\zn\"" >stdin &&
 	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: badly quoted argument: \\\"ma\\\\zter\\\"" err
+	grep "fatal: badly quoted argument: \\\"ma\\\\zn\\\"" err
 '
 
 test_expect_success 'stdin fails on junk after quoted argument' '
-	echo "create \"$a\"master" >stdin &&
+	echo "create \"$a\"main" >stdin &&
 	test_must_fail git update-ref --stdin <stdin 2>err &&
-	grep "fatal: unexpected character after quoted argument: \\\"$a\\\"master" err
+	grep "fatal: unexpected character after quoted argument: \\\"$a\\\"main" err
 '
 
 test_expect_success 'stdin fails create with no ref' '
@@ -692,7 +716,7 @@ test_expect_success 'stdin succeeds with quoted argument' '
 
 test_expect_success 'stdin succeeds with escaped character' '
 	git update-ref -d $a &&
-	echo "create $a \"ma\\163ter\"" >stdin &&
+	echo "create $a \"ma\\151n\"" >stdin &&
 	git update-ref --stdin <stdin &&
 	git rev-parse $m >expect &&
 	git rev-parse $a >actual &&
@@ -1340,15 +1364,6 @@ test_expect_success 'fails with duplicate ref update via symref' '
 	test_cmp expect actual
 '
 
-run_with_limited_open_files () {
-	(ulimit -n 32 && "$@")
-}
-
-test_lazy_prereq ULIMIT_FILE_DESCRIPTORS '
-	test_have_prereq !MINGW,!CYGWIN &&
-	run_with_limited_open_files true
-'
-
 test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches does not burst open file limit' '
 (
 	for i in $(test_seq 33)
@@ -1383,11 +1398,213 @@ test_expect_success 'handle per-worktree refs in refs/bisect' '
 		git rev-parse refs/bisect/something >../worktree-head &&
 		git for-each-ref | grep refs/bisect/something
 	) &&
-	test_path_is_missing .git/refs/bisect &&
+	git show-ref >actual &&
+	! grep 'refs/bisect' actual &&
 	test_must_fail git rev-parse refs/bisect/something &&
 	git update-ref refs/bisect/something HEAD &&
 	git rev-parse refs/bisect/something >main-head &&
 	! test_cmp main-head worktree-head
 '
 
+test_expect_success 'transaction handles empty commit' '
+	cat >stdin <<-EOF &&
+	start
+	prepare
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start prepare commit >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'transaction handles empty commit with missing prepare' '
+	cat >stdin <<-EOF &&
+	start
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start commit >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'transaction handles sole commit' '
+	cat >stdin <<-EOF &&
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" commit >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'transaction handles empty abort' '
+	cat >stdin <<-EOF &&
+	start
+	prepare
+	abort
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start prepare abort >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'transaction exits on multiple aborts' '
+	cat >stdin <<-EOF &&
+	abort
+	abort
+	EOF
+	test_must_fail git update-ref --stdin <stdin >actual 2>err &&
+	printf "%s: ok\n" abort >expect &&
+	test_cmp expect actual &&
+	grep "fatal: transaction is closed" err
+'
+
+test_expect_success 'transaction exits on start after prepare' '
+	cat >stdin <<-EOF &&
+	prepare
+	start
+	EOF
+	test_must_fail git update-ref --stdin <stdin 2>err >actual &&
+	printf "%s: ok\n" prepare >expect &&
+	test_cmp expect actual &&
+	grep "fatal: prepared transactions can only be closed" err
+'
+
+test_expect_success 'transaction handles empty abort with missing prepare' '
+	cat >stdin <<-EOF &&
+	start
+	abort
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start abort >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'transaction handles sole abort' '
+	cat >stdin <<-EOF &&
+	abort
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" abort >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'transaction can handle commit' '
+	cat >stdin <<-EOF &&
+	start
+	create $a HEAD
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start commit >expect &&
+	test_cmp expect actual &&
+	git rev-parse HEAD >expect &&
+	git rev-parse $a >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'transaction can handle abort' '
+	cat >stdin <<-EOF &&
+	start
+	create $b HEAD
+	abort
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start abort >expect &&
+	test_cmp expect actual &&
+	test_must_fail git show-ref --verify -q $b
+'
+
+test_expect_success 'transaction aborts by default' '
+	cat >stdin <<-EOF &&
+	start
+	create $b HEAD
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start >expect &&
+	test_cmp expect actual &&
+	test_must_fail git show-ref --verify -q $b
+'
+
+test_expect_success 'transaction with prepare aborts by default' '
+	cat >stdin <<-EOF &&
+	start
+	create $b HEAD
+	prepare
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start prepare >expect &&
+	test_cmp expect actual &&
+	test_must_fail git show-ref --verify -q $b
+'
+
+test_expect_success 'transaction can commit multiple times' '
+	cat >stdin <<-EOF &&
+	start
+	create refs/heads/branch-1 $A
+	commit
+	start
+	create refs/heads/branch-2 $B
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start commit start commit >expect &&
+	test_cmp expect actual &&
+	echo "$A" >expect &&
+	git rev-parse refs/heads/branch-1 >actual &&
+	test_cmp expect actual &&
+	echo "$B" >expect &&
+	git rev-parse refs/heads/branch-2 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'transaction can create and delete' '
+	cat >stdin <<-EOF &&
+	start
+	create refs/heads/create-and-delete $A
+	commit
+	start
+	delete refs/heads/create-and-delete $A
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start commit start commit >expect &&
+	test_must_fail git show-ref --verify refs/heads/create-and-delete
+'
+
+test_expect_success 'transaction can commit after abort' '
+	cat >stdin <<-EOF &&
+	start
+	create refs/heads/abort $A
+	abort
+	start
+	create refs/heads/abort $A
+	commit
+	EOF
+	git update-ref --stdin <stdin >actual &&
+	printf "%s: ok\n" start abort start commit >expect &&
+	echo "$A" >expect &&
+	git rev-parse refs/heads/abort >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'transaction cannot restart ongoing transaction' '
+	cat >stdin <<-EOF &&
+	start
+	create refs/heads/restart $A
+	start
+	commit
+	EOF
+	test_must_fail git update-ref --stdin <stdin >actual &&
+	test_must_fail git show-ref --verify refs/heads/restart
+'
+
+test_expect_success 'directory not created deleting packed ref' '
+	git branch d1/d2/r1 HEAD &&
+	git pack-refs --all &&
+	test_path_is_missing .git/refs/heads/d1/d2 &&
+	git update-ref -d refs/heads/d1/d2/r1 &&
+	test_path_is_missing .git/refs/heads/d1/d2 &&
+	test_path_is_missing .git/refs/heads/d1
+'
+
 test_done
diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh
index a4ebb0b65f..132a1b885a 100755
--- a/t/t1401-symbolic-ref.sh
+++ b/t/t1401-symbolic-ref.sh
@@ -7,17 +7,19 @@ test_description='basic symbolic-ref tests'
 # the git repo, meaning that further tests will operate on
 # the surrounding git repo instead of the trash directory.
 reset_to_sane() {
-	echo ref: refs/heads/foo >.git/HEAD
+	rm -rf .git &&
+	"$TAR" xf .git.tar
 }
 
-test_expect_success 'symbolic-ref writes HEAD' '
+test_expect_success 'setup' '
 	git symbolic-ref HEAD refs/heads/foo &&
-	echo ref: refs/heads/foo >expect &&
-	test_cmp expect .git/HEAD
+	test_commit file &&
+	"$TAR" cf .git.tar .git/
 '
 
-test_expect_success 'symbolic-ref reads HEAD' '
-	echo refs/heads/foo >expect &&
+test_expect_success 'symbolic-ref read/write roundtrip' '
+	git symbolic-ref HEAD refs/heads/read-write-roundtrip &&
+	echo refs/heads/read-write-roundtrip >expect &&
 	git symbolic-ref HEAD >actual &&
 	test_cmp expect actual
 '
@@ -25,12 +27,13 @@ test_expect_success 'symbolic-ref reads HEAD' '
 test_expect_success 'symbolic-ref refuses non-ref for HEAD' '
 	test_must_fail git symbolic-ref HEAD foo
 '
+
 reset_to_sane
 
 test_expect_success 'symbolic-ref refuses bare sha1' '
-	echo content >file && git add file && git commit -m one &&
 	test_must_fail git symbolic-ref HEAD $(git rev-parse HEAD)
 '
+
 reset_to_sane
 
 test_expect_success 'HEAD cannot be removed' '
@@ -42,16 +45,16 @@ reset_to_sane
 test_expect_success 'symbolic-ref can be deleted' '
 	git symbolic-ref NOTHEAD refs/heads/foo &&
 	git symbolic-ref -d NOTHEAD &&
-	test_path_is_file .git/refs/heads/foo &&
-	test_path_is_missing .git/NOTHEAD
+	git rev-parse refs/heads/foo &&
+	test_must_fail git symbolic-ref NOTHEAD
 '
 reset_to_sane
 
 test_expect_success 'symbolic-ref can delete dangling symref' '
 	git symbolic-ref NOTHEAD refs/heads/missing &&
 	git symbolic-ref -d NOTHEAD &&
-	test_path_is_missing .git/refs/heads/missing &&
-	test_path_is_missing .git/NOTHEAD
+	test_must_fail git rev-parse refs/heads/missing &&
+	test_must_fail git symbolic-ref NOTHEAD
 '
 reset_to_sane
 
diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
index 98e4a8613b..cabc516ae9 100755
--- a/t/t1402-check-ref-format.sh
+++ b/t/t1402-check-ref-format.sh
@@ -134,18 +134,18 @@ valid_ref !MINGW "$ref" '--refspec-pattern --allow-onelevel --normalize'
 test_expect_success "check-ref-format --branch @{-1}" '
 	T=$(git write-tree) &&
 	sha1=$(echo A | git commit-tree $T) &&
-	git update-ref refs/heads/master $sha1 &&
-	git update-ref refs/remotes/origin/master $sha1 &&
-	git checkout master &&
-	git checkout origin/master &&
-	git checkout master &&
+	git update-ref refs/heads/main $sha1 &&
+	git update-ref refs/remotes/origin/main $sha1 &&
+	git checkout main &&
+	git checkout origin/main &&
+	git checkout main &&
 	refname=$(git check-ref-format --branch @{-1}) &&
 	test "$refname" = "$sha1" &&
 	refname2=$(git check-ref-format --branch @{-2}) &&
-	test "$refname2" = master'
+	test "$refname2" = main'
 
-test_expect_success 'check-ref-format --branch -naster' '
-	test_must_fail git check-ref-format --branch -naster >actual &&
+test_expect_success 'check-ref-format --branch -nain' '
+	test_must_fail git check-ref-format --branch -nain >actual &&
 	test_must_be_empty actual
 '
 
@@ -154,11 +154,11 @@ test_expect_success 'check-ref-format --branch from subdir' '
 
 	T=$(git write-tree) &&
 	sha1=$(echo A | git commit-tree $T) &&
-	git update-ref refs/heads/master $sha1 &&
-	git update-ref refs/remotes/origin/master $sha1 &&
-	git checkout master &&
-	git checkout origin/master &&
-	git checkout master &&
+	git update-ref refs/heads/main $sha1 &&
+	git update-ref refs/remotes/origin/main $sha1 &&
+	git checkout main &&
+	git checkout origin/main &&
+	git checkout main &&
 	refname=$(
 		cd subdir &&
 		git check-ref-format --branch @{-1}
@@ -171,9 +171,9 @@ test_expect_success 'check-ref-format --branch @{-1} from non-repo' '
 	test_must_be_empty actual
 '
 
-test_expect_success 'check-ref-format --branch master from non-repo' '
-	echo master >expect &&
-	nongit git check-ref-format --branch master >actual &&
+test_expect_success 'check-ref-format --branch main from non-repo' '
+	echo main >expect &&
+	nongit git check-ref-format --branch main >actual &&
 	test_cmp expect actual
 '
 
diff --git a/t/t1403-show-ref.sh b/t/t1403-show-ref.sh
index 5d955c3bff..17d3cc1405 100755
--- a/t/t1403-show-ref.sh
+++ b/t/t1403-show-ref.sh
@@ -1,15 +1,16 @@
 #!/bin/sh
 
 test_description='show-ref'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
-	test_commit A &&
-	git tag -f -a -m "annotated A" A &&
+	test_commit --annotate A &&
 	git checkout -b side &&
-	test_commit B &&
-	git tag -f -a -m "annotated B" B &&
-	git checkout master &&
+	test_commit --annotate B &&
+	git checkout main &&
 	test_commit C &&
 	git branch B A^0
 '
@@ -92,23 +93,23 @@ test_expect_success 'show-ref -d' '
 	git show-ref --verify -d refs/tags/A refs/tags/C >actual &&
 	test_cmp expect actual &&
 
-	echo $(git rev-parse refs/heads/master) refs/heads/master >expect &&
-	git show-ref -d master >actual &&
+	echo $(git rev-parse refs/heads/main) refs/heads/main >expect &&
+	git show-ref -d main >actual &&
 	test_cmp expect actual &&
 
-	git show-ref -d heads/master >actual &&
+	git show-ref -d heads/main >actual &&
 	test_cmp expect actual &&
 
-	git show-ref -d refs/heads/master >actual &&
+	git show-ref -d refs/heads/main >actual &&
 	test_cmp expect actual &&
 
-	git show-ref -d --verify refs/heads/master >actual &&
+	git show-ref -d --verify refs/heads/main >actual &&
 	test_cmp expect actual &&
 
-	test_must_fail git show-ref -d --verify master >actual &&
+	test_must_fail git show-ref -d --verify main >actual &&
 	test_must_be_empty actual &&
 
-	test_must_fail git show-ref -d --verify heads/master >actual &&
+	test_must_fail git show-ref -d --verify heads/main >actual &&
 	test_must_be_empty actual &&
 
 	test_must_fail git show-ref --verify -d A C >actual &&
@@ -120,7 +121,7 @@ test_expect_success 'show-ref -d' '
 '
 
 test_expect_success 'show-ref --heads, --tags, --head, pattern' '
-	for branch in B master side
+	for branch in B main side
 	do
 		echo $(git rev-parse refs/heads/$branch) refs/heads/$branch
 	done >expect.heads &&
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
index 2d142e5535..b729c1f480 100755
--- a/t/t1404-update-ref-errors.sh
+++ b/t/t1404-update-ref-errors.sh
@@ -101,7 +101,7 @@ df_test() {
 		printf "%s\n" "delete $delname" "create $addname $D"
 	fi >commands &&
 	test_must_fail git update-ref --stdin <commands 2>output.err &&
-	test_i18ncmp expected-err output.err &&
+	test_cmp expected-err output.err &&
 	printf "%s\n" "$C $delref" >expected-refs &&
 	git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs &&
 	test_cmp expected-refs actual-refs
@@ -189,7 +189,7 @@ test_expect_success 'one new ref is a simple prefix of another' '
 
 '
 
-test_expect_success 'empty directory should not fool rev-parse' '
+test_expect_success REFFILES 'empty directory should not fool rev-parse' '
 	prefix=refs/e-rev-parse &&
 	git update-ref $prefix/foo $C &&
 	git pack-refs --all &&
@@ -199,7 +199,7 @@ test_expect_success 'empty directory should not fool rev-parse' '
 	test_cmp expected actual
 '
 
-test_expect_success 'empty directory should not fool for-each-ref' '
+test_expect_success REFFILES 'empty directory should not fool for-each-ref' '
 	prefix=refs/e-for-each-ref &&
 	git update-ref $prefix/foo $C &&
 	git for-each-ref $prefix >expected &&
@@ -209,14 +209,14 @@ test_expect_success 'empty directory should not fool for-each-ref' '
 	test_cmp expected actual
 '
 
-test_expect_success 'empty directory should not fool create' '
+test_expect_success REFFILES 'empty directory should not fool create' '
 	prefix=refs/e-create &&
 	mkdir -p .git/$prefix/foo/bar/baz &&
 	printf "create %s $C\n" $prefix/foo |
 	git update-ref --stdin
 '
 
-test_expect_success 'empty directory should not fool verify' '
+test_expect_success REFFILES 'empty directory should not fool verify' '
 	prefix=refs/e-verify &&
 	git update-ref $prefix/foo $C &&
 	git pack-refs --all &&
@@ -225,7 +225,7 @@ test_expect_success 'empty directory should not fool verify' '
 	git update-ref --stdin
 '
 
-test_expect_success 'empty directory should not fool 1-arg update' '
+test_expect_success REFFILES 'empty directory should not fool 1-arg update' '
 	prefix=refs/e-update-1 &&
 	git update-ref $prefix/foo $C &&
 	git pack-refs --all &&
@@ -234,7 +234,7 @@ test_expect_success 'empty directory should not fool 1-arg update' '
 	git update-ref --stdin
 '
 
-test_expect_success 'empty directory should not fool 2-arg update' '
+test_expect_success REFFILES 'empty directory should not fool 2-arg update' '
 	prefix=refs/e-update-2 &&
 	git update-ref $prefix/foo $C &&
 	git pack-refs --all &&
@@ -243,7 +243,7 @@ test_expect_success 'empty directory should not fool 2-arg update' '
 	git update-ref --stdin
 '
 
-test_expect_success 'empty directory should not fool 0-arg delete' '
+test_expect_success REFFILES 'empty directory should not fool 0-arg delete' '
 	prefix=refs/e-delete-0 &&
 	git update-ref $prefix/foo $C &&
 	git pack-refs --all &&
@@ -252,7 +252,7 @@ test_expect_success 'empty directory should not fool 0-arg delete' '
 	git update-ref --stdin
 '
 
-test_expect_success 'empty directory should not fool 1-arg delete' '
+test_expect_success REFFILES 'empty directory should not fool 1-arg delete' '
 	prefix=refs/e-delete-1 &&
 	git update-ref $prefix/foo $C &&
 	git pack-refs --all &&
@@ -466,7 +466,7 @@ test_expect_success 'incorrect old value blocks indirect no-deref delete' '
 	test_cmp expected output.err
 '
 
-test_expect_success 'non-empty directory blocks create' '
+test_expect_success REFFILES 'non-empty directory blocks create' '
 	prefix=refs/ne-create &&
 	mkdir -p .git/$prefix/foo/bar &&
 	: >.git/$prefix/foo/bar/baz.lock &&
@@ -485,7 +485,7 @@ test_expect_success 'non-empty directory blocks create' '
 	test_cmp expected output.err
 '
 
-test_expect_success 'broken reference blocks create' '
+test_expect_success REFFILES 'broken reference blocks create' '
 	prefix=refs/broken-create &&
 	mkdir -p .git/$prefix &&
 	echo "gobbledigook" >.git/$prefix/foo &&
@@ -504,7 +504,7 @@ test_expect_success 'broken reference blocks create' '
 	test_cmp expected output.err
 '
 
-test_expect_success 'non-empty directory blocks indirect create' '
+test_expect_success REFFILES 'non-empty directory blocks indirect create' '
 	prefix=refs/ne-indirect-create &&
 	git symbolic-ref $prefix/symref $prefix/foo &&
 	mkdir -p .git/$prefix/foo/bar &&
@@ -524,7 +524,7 @@ test_expect_success 'non-empty directory blocks indirect create' '
 	test_cmp expected output.err
 '
 
-test_expect_success 'broken reference blocks indirect create' '
+test_expect_success REFFILES 'broken reference blocks indirect create' '
 	prefix=refs/broken-indirect-create &&
 	git symbolic-ref $prefix/symref $prefix/foo &&
 	echo "gobbledigook" >.git/$prefix/foo &&
@@ -543,7 +543,7 @@ test_expect_success 'broken reference blocks indirect create' '
 	test_cmp expected output.err
 '
 
-test_expect_success 'no bogus intermediate values during delete' '
+test_expect_success REFFILES 'no bogus intermediate values during delete' '
 	prefix=refs/slow-transaction &&
 	# Set up a reference with differing loose and packed versions:
 	git update-ref $prefix/foo $C &&
@@ -600,7 +600,7 @@ test_expect_success 'no bogus intermediate values during delete' '
 	test_must_fail git rev-parse --verify --quiet $prefix/foo
 '
 
-test_expect_success 'delete fails cleanly if packed-refs file is locked' '
+test_expect_success REFFILES 'delete fails cleanly if packed-refs file is locked' '
 	prefix=refs/locked-packed-refs &&
 	# Set up a reference with differing loose and packed versions:
 	git update-ref $prefix/foo $C &&
@@ -616,7 +616,7 @@ test_expect_success 'delete fails cleanly if packed-refs file is locked' '
 	test_cmp unchanged actual
 '
 
-test_expect_success 'delete fails cleanly if packed-refs.new write fails' '
+test_expect_success REFFILES 'delete fails cleanly if packed-refs.new write fails' '
 	# Setup and expectations are similar to the test above.
 	prefix=refs/failed-packed-refs &&
 	git update-ref $prefix/foo $C &&
diff --git a/t/t1405-main-ref-store.sh b/t/t1405-main-ref-store.sh
index 331899ddc4..49718b7ea7 100755
--- a/t/t1405-main-ref-store.sh
+++ b/t/t1405-main-ref-store.sh
@@ -2,53 +2,59 @@
 
 test_description='test main ref store api'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 RUN="test-tool ref-store main"
 
-test_expect_success 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
-	test_commit one &&
-	N=`find .git/refs -type f | wc -l` &&
-	test "$N" != 0 &&
-	$RUN pack-refs 3 &&
-	N=`find .git/refs -type f | wc -l`
+
+test_expect_success 'setup' '
+	test_commit one
 '
 
-test_expect_success 'peel_ref(new-tag)' '
-	git rev-parse HEAD >expected &&
-	git tag -a -m new-tag new-tag HEAD &&
-	$RUN peel-ref refs/tags/new-tag >actual &&
-	test_cmp expected actual
+test_expect_success REFFILES 'pack_refs(PACK_REFS_ALL | PACK_REFS_PRUNE)' '
+	N=`find .git/refs -type f | wc -l` &&
+	test "$N" != 0 &&
+	ALL_OR_PRUNE_FLAG=3 &&
+	$RUN pack-refs ${ALL_OR_PRUNE_FLAG} &&
+	N=`find .git/refs -type f` &&
+	test -z "$N"
 '
 
-test_expect_success 'create_symref(FOO, refs/heads/master)' '
-	$RUN create-symref FOO refs/heads/master nothing &&
-	echo refs/heads/master >expected &&
+test_expect_success 'create_symref(FOO, refs/heads/main)' '
+	$RUN create-symref FOO refs/heads/main nothing &&
+	echo refs/heads/main >expected &&
 	git symbolic-ref FOO >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'delete_refs(FOO, refs/tags/new-tag)' '
+	git tag -a -m new-tag new-tag HEAD &&
 	git rev-parse FOO -- &&
 	git rev-parse refs/tags/new-tag -- &&
-	$RUN delete-refs 0 nothing FOO 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 &&
+	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 --
 '
 
-test_expect_success 'rename_refs(master, new-master)' '
-	git rev-parse master >expected &&
-	$RUN rename-ref refs/heads/master refs/heads/new-master &&
-	git rev-parse new-master >actual &&
+test_expect_success 'rename_refs(main, new-main)' '
+	git rev-parse main >expected &&
+	$RUN rename-ref refs/heads/main refs/heads/new-main &&
+	git rev-parse new-main >actual &&
 	test_cmp expected actual &&
-	test_commit recreate-master
+	test_commit recreate-main
 '
 
 test_expect_success 'for_each_ref(refs/heads/)' '
 	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
 	cat >expected <<-\EOF &&
-	master 0x0
-	new-master 0x0
+	main 0x0
+	new-main 0x0
 	EOF
 	test_cmp expected actual
 '
@@ -59,23 +65,23 @@ test_expect_success 'for_each_ref() is sorted' '
 	test_cmp expected actual
 '
 
-test_expect_success 'resolve_ref(new-master)' '
-	SHA1=`git rev-parse new-master` &&
-	echo "$SHA1 refs/heads/new-master 0x0" >expected &&
-	$RUN resolve-ref refs/heads/new-master 0 >actual &&
+test_expect_success 'resolve_ref(new-main)' '
+	SHA1=`git rev-parse new-main` &&
+	echo "$SHA1 refs/heads/new-main 0x0" >expected &&
+	$RUN resolve-ref refs/heads/new-main 0 >actual &&
 	test_cmp expected actual
 '
 
-test_expect_success 'verify_ref(new-master)' '
-	$RUN verify-ref refs/heads/new-master
+test_expect_success 'verify_ref(new-main)' '
+	$RUN verify-ref refs/heads/new-main
 '
 
 test_expect_success 'for_each_reflog()' '
 	$RUN for-each-reflog | sort -k2 | cut -d" " -f 2- >actual &&
 	cat >expected <<-\EOF &&
 	HEAD 0x1
-	refs/heads/master 0x0
-	refs/heads/new-master 0x0
+	refs/heads/main 0x0
+	refs/heads/new-main 0x0
 	EOF
 	test_cmp expected actual
 '
@@ -83,12 +89,12 @@ 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-master
+	tail -n2 actual | head -n1 | grep recreate-main
 '
 
 test_expect_success 'for_each_reflog_ent_reverse()' '
 	$RUN for-each-reflog-ent-reverse HEAD >actual &&
-	head -n1 actual | grep recreate-master &&
+	head -n1 actual | grep recreate-main &&
 	tail -n2 actual | head -n1 | grep one
 '
 
@@ -98,12 +104,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
+	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 d199d872fb..0a87058971 100755
--- a/t/t1406-submodule-ref-store.sh
+++ b/t/t1406-submodule-ref-store.sh
@@ -2,6 +2,9 @@
 
 test_description='test submodule ref store api'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 RUN="test-tool ref-store submodule:sub"
@@ -11,7 +14,8 @@ test_expect_success 'setup' '
 	(
 		cd sub &&
 		test_commit first &&
-		git checkout -b new-master
+		git checkout -b new-main &&
+		git tag -a -m new-tag new-tag HEAD
 	)
 '
 
@@ -19,15 +23,8 @@ test_expect_success 'pack_refs() not allowed' '
 	test_must_fail $RUN pack-refs 3
 '
 
-test_expect_success 'peel_ref(new-tag)' '
-	git -C sub rev-parse HEAD >expected &&
-	git -C sub tag -a -m new-tag new-tag HEAD &&
-	$RUN peel-ref refs/tags/new-tag >actual &&
-	test_cmp expected actual
-'
-
 test_expect_success 'create_symref() not allowed' '
-	test_must_fail $RUN create-symref FOO refs/heads/master nothing
+	test_must_fail $RUN create-symref FOO refs/heads/main nothing
 '
 
 test_expect_success 'delete_refs() not allowed' '
@@ -35,14 +32,14 @@ test_expect_success 'delete_refs() not allowed' '
 '
 
 test_expect_success 'rename_refs() not allowed' '
-	test_must_fail $RUN rename-ref refs/heads/master refs/heads/new-master
+	test_must_fail $RUN rename-ref refs/heads/main refs/heads/new-main
 '
 
 test_expect_success 'for_each_ref(refs/heads/)' '
 	$RUN for-each-ref refs/heads/ | cut -d" " -f 2- >actual &&
 	cat >expected <<-\EOF &&
-	master 0x0
-	new-master 0x0
+	main 0x0
+	new-main 0x0
 	EOF
 	test_cmp expected actual
 '
@@ -53,36 +50,36 @@ test_expect_success 'for_each_ref() is sorted' '
 	test_cmp expected actual
 '
 
-test_expect_success 'resolve_ref(master)' '
-	SHA1=`git -C sub rev-parse master` &&
-	echo "$SHA1 refs/heads/master 0x0" >expected &&
-	$RUN resolve-ref refs/heads/master 0 >actual &&
+test_expect_success 'resolve_ref(main)' '
+	SHA1=`git -C sub rev-parse main` &&
+	echo "$SHA1 refs/heads/main 0x0" >expected &&
+	$RUN resolve-ref refs/heads/main 0 >actual &&
 	test_cmp expected actual
 '
 
-test_expect_success 'verify_ref(new-master)' '
-	$RUN verify-ref refs/heads/new-master
+test_expect_success 'verify_ref(new-main)' '
+	$RUN verify-ref refs/heads/new-main
 '
 
 test_expect_success 'for_each_reflog()' '
 	$RUN for-each-reflog | sort | cut -d" " -f 2- >actual &&
 	cat >expected <<-\EOF &&
 	HEAD 0x1
-	refs/heads/master 0x0
-	refs/heads/new-master 0x0
+	refs/heads/main 0x0
+	refs/heads/new-main 0x0
 	EOF
 	test_cmp expected actual
 '
 
 test_expect_success 'for_each_reflog_ent()' '
-	$RUN for-each-reflog-ent HEAD >actual && cat actual &&
+	$RUN for-each-reflog-ent HEAD >actual &&
 	head -n1 actual | grep first &&
-	tail -n2 actual | head -n1 | grep master.to.new
+	tail -n2 actual | head -n1 | grep main.to.new
 '
 
 test_expect_success 'for_each_reflog_ent_reverse()' '
 	$RUN for-each-reflog-ent-reverse HEAD >actual &&
-	head -n1 actual | grep master.to.new &&
+	head -n1 actual | grep main.to.new &&
 	tail -n2 actual | head -n1 | grep first
 '
 
diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-ref-store.sh
index 9a84858118..ad8006c813 100755
--- a/t/t1407-worktree-ref-store.sh
+++ b/t/t1407-worktree-ref-store.sh
@@ -2,6 +2,9 @@
 
 test_description='test worktree ref store api'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 RWT="test-tool ref-store worktree:wt"
@@ -9,7 +12,7 @@ RMAIN="test-tool ref-store worktree:main"
 
 test_expect_success 'setup' '
 	test_commit first &&
-	git worktree add -b wt-master wt &&
+	git worktree add -b wt-main wt &&
 	(
 		cd wt &&
 		test_commit second
@@ -17,39 +20,46 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'resolve_ref(<shared-ref>)' '
-	SHA1=`git rev-parse master` &&
-	echo "$SHA1 refs/heads/master 0x0" >expected &&
-	$RWT resolve-ref refs/heads/master 0 >actual &&
+	SHA1=`git rev-parse main` &&
+	echo "$SHA1 refs/heads/main 0x0" >expected &&
+	$RWT resolve-ref refs/heads/main 0 >actual &&
 	test_cmp expected actual &&
-	$RMAIN resolve-ref refs/heads/master 0 >actual &&
+	$RMAIN resolve-ref refs/heads/main 0 >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'resolve_ref(<per-worktree-ref>)' '
 	SHA1=`git -C wt rev-parse HEAD` &&
-	echo "$SHA1 refs/heads/wt-master 0x1" >expected &&
+	echo "$SHA1 refs/heads/wt-main 0x1" >expected &&
 	$RWT resolve-ref HEAD 0 >actual &&
 	test_cmp expected actual &&
 
 	SHA1=`git rev-parse HEAD` &&
-	echo "$SHA1 refs/heads/master 0x1" >expected &&
+	echo "$SHA1 refs/heads/main 0x1" >expected &&
 	$RMAIN resolve-ref HEAD 0 >actual &&
 	test_cmp expected actual
 '
 
-test_expect_success 'create_symref(FOO, refs/heads/master)' '
-	$RWT create-symref FOO refs/heads/master nothing &&
-	echo refs/heads/master >expected &&
+test_expect_success 'create_symref(FOO, refs/heads/main)' '
+	$RWT create-symref FOO refs/heads/main nothing &&
+	echo refs/heads/main >expected &&
 	git -C wt symbolic-ref FOO >actual &&
 	test_cmp expected actual &&
 
-	$RMAIN create-symref FOO refs/heads/wt-master nothing &&
-	echo refs/heads/wt-master >expected &&
+	$RMAIN create-symref FOO refs/heads/wt-main nothing &&
+	echo refs/heads/wt-main >expected &&
 	git symbolic-ref FOO >actual &&
 	test_cmp expected actual
 '
 
-test_expect_success 'for_each_reflog()' '
+# Some refs (refs/bisect/*, pseudorefs) are kept per worktree, so they should
+# only appear in the for-each-reflog output if it is called from the correct
+# worktree, which is exercised in this test. This test is poorly written (and
+# therefore marked REFFILES) for mulitple reasons: 1) it creates invalidly
+# formatted log entres. 2) it uses direct FS access for creating the reflogs. 3)
+# PSEUDO-WT and refs/bisect/random do not create reflogs by default, so it is
+# not testing a realistic scenario.
+test_expect_success REFFILES 'for_each_reflog()' '
 	echo $ZERO_OID > .git/logs/PSEUDO-MAIN &&
 	mkdir -p     .git/logs/refs/bisect &&
 	echo $ZERO_OID > .git/logs/refs/bisect/random &&
@@ -63,8 +73,8 @@ test_expect_success 'for_each_reflog()' '
 	HEAD 0x1
 	PSEUDO-WT 0x0
 	refs/bisect/wt-random 0x0
-	refs/heads/master 0x0
-	refs/heads/wt-master 0x0
+	refs/heads/main 0x0
+	refs/heads/wt-main 0x0
 	EOF
 	test_cmp expected actual &&
 
@@ -73,8 +83,8 @@ test_expect_success 'for_each_reflog()' '
 	HEAD 0x1
 	PSEUDO-MAIN 0x0
 	refs/bisect/random 0x0
-	refs/heads/master 0x0
-	refs/heads/wt-master 0x0
+	refs/heads/main 0x0
+	refs/heads/wt-main 0x0
 	EOF
 	test_cmp expected actual
 '
diff --git a/t/t1408-packed-refs.sh b/t/t1408-packed-refs.sh
index 1e44a17eea..41ba1f1d7f 100755
--- a/t/t1408-packed-refs.sh
+++ b/t/t1408-packed-refs.sh
@@ -2,6 +2,9 @@
 
 test_description='packed-refs entries are covered by loose refs'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -9,32 +12,32 @@ test_expect_success setup '
 	git commit --allow-empty -m one &&
 	one=$(git rev-parse HEAD) &&
 	git for-each-ref >actual &&
-	echo "$one commit	refs/heads/master" >expect &&
+	echo "$one commit	refs/heads/main" >expect &&
 	test_cmp expect actual &&
 
 	git pack-refs --all &&
 	git for-each-ref >actual &&
-	echo "$one commit	refs/heads/master" >expect &&
+	echo "$one commit	refs/heads/main" >expect &&
 	test_cmp expect actual &&
 
 	git checkout --orphan another &&
 	test_tick &&
 	git commit --allow-empty -m two &&
 	two=$(git rev-parse HEAD) &&
-	git checkout -B master &&
+	git checkout -B main &&
 	git branch -D another &&
 
 	git for-each-ref >actual &&
-	echo "$two commit	refs/heads/master" >expect &&
+	echo "$two commit	refs/heads/main" >expect &&
 	test_cmp expect actual &&
 
 	git reflog expire --expire=now --all &&
 	git prune &&
-	git tag -m v1.0 v1.0 master
+	git tag -m v1.0 v1.0 main
 '
 
 test_expect_success 'no error from stale entry in packed-refs' '
-	git describe master >actual 2>&1 &&
+	git describe main >actual 2>&1 &&
 	echo "v1.0" >expect &&
 	test_cmp expect actual
 '
diff --git a/t/t1409-avoid-packing-refs.sh b/t/t1409-avoid-packing-refs.sh
index e5cb8a252d..be12fb6350 100755
--- a/t/t1409-avoid-packing-refs.sh
+++ b/t/t1409-avoid-packing-refs.sh
@@ -8,7 +8,7 @@ test_description='avoid rewriting packed-refs unnecessarily'
 # shouldn't upset readers, and it should be omitted if the file is
 # ever rewritten.
 mark_packed_refs () {
-	sed -e "s/^\(#.*\)/\1 t1409 /" <.git/packed-refs >.git/packed-refs.new &&
+	sed -e "s/^\(#.*\)/\1 t1409 /" .git/packed-refs >.git/packed-refs.new &&
 	mv .git/packed-refs.new .git/packed-refs
 }
 
@@ -27,15 +27,15 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'do not create packed-refs file gratuitously' '
-	test_must_fail test -f .git/packed-refs &&
+	test_path_is_missing .git/packed-refs &&
 	git update-ref refs/heads/foo $A &&
-	test_must_fail test -f .git/packed-refs &&
+	test_path_is_missing .git/packed-refs &&
 	git update-ref refs/heads/foo $B &&
-	test_must_fail test -f .git/packed-refs &&
+	test_path_is_missing .git/packed-refs &&
 	git update-ref refs/heads/foo $C $B &&
-	test_must_fail test -f .git/packed-refs &&
+	test_path_is_missing .git/packed-refs &&
 	git update-ref -d refs/heads/foo &&
-	test_must_fail test -f .git/packed-refs
+	test_path_is_missing .git/packed-refs
 '
 
 test_expect_success 'check that marking the packed-refs file works' '
@@ -46,7 +46,7 @@ test_expect_success 'check that marking the packed-refs file works' '
 	git for-each-ref >actual &&
 	test_cmp expected actual &&
 	git pack-refs --all &&
-	test_must_fail check_packed_refs_marked &&
+	! check_packed_refs_marked &&
 	git for-each-ref >actual2 &&
 	test_cmp expected actual2
 '
@@ -80,7 +80,7 @@ test_expect_success 'touch packed-refs on delete of packed' '
 	git pack-refs --all &&
 	mark_packed_refs &&
 	git update-ref -d refs/heads/packed-delete &&
-	test_must_fail check_packed_refs_marked
+	! check_packed_refs_marked
 '
 
 test_expect_success 'leave packed-refs untouched on update of loose' '
diff --git a/t/t1410-reflog.sh b/t/t1410-reflog.sh
index 82950c0282..d42f067ff8 100755
--- a/t/t1410-reflog.sh
+++ b/t/t1410-reflog.sh
@@ -4,6 +4,9 @@
 #
 
 test_description='Test prune and reflog expiration'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_have () {
@@ -54,7 +57,6 @@ check_dont_have () {
 }
 
 test_expect_success setup '
-	test_oid_init &&
 	mkdir -p A/B &&
 	echo rat >C &&
 	echo ox >A/D &&
@@ -100,7 +102,7 @@ test_expect_success setup '
 
 	check_fsck &&
 
-	git reflog refs/heads/master >output &&
+	git reflog refs/heads/main >output &&
 	test_line_count = 4 output
 '
 
@@ -117,7 +119,7 @@ test_expect_success rewind '
 
 	check_have A B C D E F G H I J K L &&
 
-	git reflog refs/heads/master >output &&
+	git reflog refs/heads/main >output &&
 	test_line_count = 5 output
 '
 
@@ -136,7 +138,7 @@ test_expect_success 'reflog expire --dry-run should not touch reflog' '
 		--stale-fix \
 		--all &&
 
-	git reflog refs/heads/master >output &&
+	git reflog refs/heads/main >output &&
 	test_line_count = 5 output &&
 
 	check_fsck "missing blob $F"
@@ -150,12 +152,38 @@ test_expect_success 'reflog expire' '
 		--stale-fix \
 		--all &&
 
-	git reflog refs/heads/master >output &&
+	git reflog refs/heads/main >output &&
 	test_line_count = 2 output &&
 
 	check_fsck "dangling commit $K"
 '
 
+test_expect_success '--stale-fix handles missing objects generously' '
+	git -c core.logAllRefUpdates=false fast-import --date-format=now <<-EOS &&
+	commit refs/heads/stale-fix
+	mark :1
+	committer Author <a@uth.or> now
+	data <<EOF
+	start stale fix
+	EOF
+	M 100644 inline file
+	data <<EOF
+	contents
+	EOF
+	commit refs/heads/stale-fix
+	committer Author <a@uth.or> now
+	data <<EOF
+	stale fix branch tip
+	EOF
+	from :1
+	EOS
+
+	parent_oid=$(git rev-parse stale-fix^) &&
+	test_when_finished "recover $parent_oid" &&
+	corrupt $parent_oid &&
+	git reflog expire --stale-fix
+'
+
 test_expect_success 'prune and fsck' '
 
 	git prune &&
@@ -187,29 +215,29 @@ test_expect_success 'delete' '
 	git commit -m tiger C &&
 
 	HEAD_entry_count=$(git reflog | wc -l) &&
-	master_entry_count=$(git reflog show master | wc -l) &&
+	main_entry_count=$(git reflog show main | wc -l) &&
 
 	test $HEAD_entry_count = 5 &&
-	test $master_entry_count = 5 &&
+	test $main_entry_count = 5 &&
 
 
-	git reflog delete master@{1} &&
-	git reflog show master > output &&
-	test $(($master_entry_count - 1)) = $(wc -l < output) &&
+	git reflog delete main@{1} &&
+	git reflog show main > output &&
+	test_line_count = $(($main_entry_count - 1)) output &&
 	test $HEAD_entry_count = $(git reflog | wc -l) &&
 	! grep ox < output &&
 
-	master_entry_count=$(wc -l < output) &&
+	main_entry_count=$(wc -l < output) &&
 
 	git reflog delete HEAD@{1} &&
 	test $(($HEAD_entry_count -1)) = $(git reflog | wc -l) &&
-	test $master_entry_count = $(git reflog show master | wc -l) &&
+	test $main_entry_count = $(git reflog show main | wc -l) &&
 
 	HEAD_entry_count=$(git reflog | wc -l) &&
 
-	git reflog delete master@{07.04.2005.15:15:00.-0700} &&
-	git reflog show master > output &&
-	test $(($master_entry_count - 1)) = $(wc -l < output) &&
+	git reflog delete main@{07.04.2005.15:15:00.-0700} &&
+	git reflog show main > output &&
+	test_line_count = $(($main_entry_count - 1)) output &&
 	! grep dragon < output
 
 '
@@ -217,7 +245,7 @@ test_expect_success 'delete' '
 test_expect_success 'rewind2' '
 
 	test_tick && git reset --hard HEAD~2 &&
-	git reflog refs/heads/master >output &&
+	git reflog refs/heads/main >output &&
 	test_line_count = 4 output
 '
 
@@ -227,7 +255,7 @@ test_expect_success '--expire=never' '
 		--expire=never \
 		--expire-unreachable=never \
 		--all &&
-	git reflog refs/heads/master >output &&
+	git reflog refs/heads/main >output &&
 	test_line_count = 4 output
 '
 
@@ -238,7 +266,7 @@ test_expect_success 'gc.reflogexpire=never' '
 	git reflog expire --verbose --all >output &&
 	test_line_count = 9 output &&
 
-	git reflog refs/heads/master >output &&
+	git reflog refs/heads/main >output &&
 	test_line_count = 4 output
 '
 
@@ -247,7 +275,7 @@ test_expect_success 'gc.reflogexpire=false' '
 	test_config gc.reflogexpireunreachable false &&
 
 	git reflog expire --verbose --all &&
-	git reflog refs/heads/master >output &&
+	git reflog refs/heads/main >output &&
 	test_line_count = 4 output
 
 '
@@ -256,33 +284,33 @@ test_expect_success 'git reflog expire unknown reference' '
 	test_config gc.reflogexpire never &&
 	test_config gc.reflogexpireunreachable never &&
 
-	test_must_fail git reflog expire master@{123} 2>stderr &&
+	test_must_fail git reflog expire main@{123} 2>stderr &&
 	test_i18ngrep "points nowhere" stderr &&
 	test_must_fail git reflog expire does-not-exist 2>stderr &&
 	test_i18ngrep "points nowhere" stderr
 '
 
 test_expect_success 'checkout should not delete log for packed ref' '
-	test $(git reflog master | wc -l) = 4 &&
+	test $(git reflog main | wc -l) = 4 &&
 	git branch foo &&
 	git pack-refs --all &&
 	git checkout foo &&
-	test $(git reflog master | wc -l) = 4
+	test $(git reflog main | wc -l) = 4
 '
 
 test_expect_success 'stale dirs do not cause d/f conflicts (reflogs on)' '
 	test_when_finished "git branch -d one || git branch -d one/two" &&
 
-	git branch one/two master &&
-	echo "one/two@{0} branch: Created from master" >expect &&
+	git branch one/two main &&
+	echo "one/two@{0} branch: Created from main" >expect &&
 	git log -g --format="%gd %gs" one/two >actual &&
 	test_cmp expect actual &&
 	git branch -d one/two &&
 
 	# now logs/refs/heads/one is a stale directory, but
 	# we should move it out of the way to create "one" reflog
-	git branch one master &&
-	echo "one@{0} branch: Created from master" >expect &&
+	git branch one main &&
+	echo "one@{0} branch: Created from main" >expect &&
 	git log -g --format="%gd %gs" one >actual &&
 	test_cmp expect actual
 '
@@ -290,15 +318,15 @@ test_expect_success 'stale dirs do not cause d/f conflicts (reflogs on)' '
 test_expect_success 'stale dirs do not cause d/f conflicts (reflogs off)' '
 	test_when_finished "git branch -d one || git branch -d one/two" &&
 
-	git branch one/two master &&
-	echo "one/two@{0} branch: Created from master" >expect &&
+	git branch one/two main &&
+	echo "one/two@{0} branch: Created from main" >expect &&
 	git log -g --format="%gd %gs" one/two >actual &&
 	test_cmp expect actual &&
 	git branch -d one/two &&
 
 	# same as before, but we only create a reflog for "one" if
 	# it already exists, which it does not
-	git -c core.logallrefupdates=false branch one master &&
+	git -c core.logallrefupdates=false branch one main &&
 	git log -g --format="%gd %gs" one >actual &&
 	test_must_be_empty actual
 '
@@ -346,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 &&
diff --git a/t/t1411-reflog-show.sh b/t/t1411-reflog-show.sh
index 985daf1def..0bb319b944 100755
--- a/t/t1411-reflog-show.sh
+++ b/t/t1411-reflog-show.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Test reflog display routines'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -167,7 +170,7 @@ test_expect_success 'git log -g -p shows diffs vs. parents' '
 '
 
 test_expect_success 'reflog exists works' '
-	git reflog exists refs/heads/master &&
+	git reflog exists refs/heads/main &&
 	! git reflog exists refs/heads/nonexistent
 '
 
diff --git a/t/t1412-reflog-loop.sh b/t/t1412-reflog-loop.sh
index 3acd895afb..977603f7f1 100755
--- a/t/t1412-reflog-loop.sh
+++ b/t/t1412-reflog-loop.sh
@@ -4,11 +4,8 @@ test_description='reflog walk shows repeated commits again'
 . ./test-lib.sh
 
 test_expect_success 'setup commits' '
-	test_tick &&
-	echo content >file && git add file && git commit -m one &&
-	git tag one &&
-	echo content >>file && git add file && git commit -m two &&
-	git tag two
+	test_commit one file content &&
+	test_commit --append two file content
 '
 
 test_expect_success 'setup reflog with alternating commits' '
diff --git a/t/t1413-reflog-detach.sh b/t/t1413-reflog-detach.sh
index c730600d8a..934688a1ee 100755
--- a/t/t1413-reflog-detach.sh
+++ b/t/t1413-reflog-detach.sh
@@ -1,11 +1,13 @@
 #!/bin/sh
 
 test_description='Test reflog interaction with detached HEAD'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 reset_state () {
-	git checkout master &&
-	cp saved_reflog .git/logs/HEAD
+	rm -rf .git && "$TAR" xf .git-saved.tar
 }
 
 test_expect_success setup '
@@ -14,19 +16,19 @@ test_expect_success setup '
 	git branch side &&
 	test_tick &&
 	git commit --allow-empty -m second &&
-	cat .git/logs/HEAD >saved_reflog
+	"$TAR" cf .git-saved.tar .git
 '
 
 test_expect_success baseline '
 	reset_state &&
-	git rev-parse master master^ >expect &&
+	git rev-parse main main^ >expect &&
 	git log -g --format=%H >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'switch to branch' '
 	reset_state &&
-	git rev-parse side master master^ >expect &&
+	git rev-parse side main main^ >expect &&
 	git checkout side &&
 	git log -g --format=%H >actual &&
 	test_cmp expect actual
@@ -34,34 +36,34 @@ test_expect_success 'switch to branch' '
 
 test_expect_success 'detach to other' '
 	reset_state &&
-	git rev-parse master side master master^ >expect &&
+	git rev-parse main side main main^ >expect &&
 	git checkout side &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	git log -g --format=%H >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'detach to self' '
 	reset_state &&
-	git rev-parse master master master^ >expect &&
-	git checkout master^0 &&
+	git rev-parse main main main^ >expect &&
+	git checkout main^0 &&
 	git log -g --format=%H >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'attach to self' '
 	reset_state &&
-	git rev-parse master master master master^ >expect &&
-	git checkout master^0 &&
-	git checkout master &&
+	git rev-parse main main main main^ >expect &&
+	git checkout main^0 &&
+	git checkout main &&
 	git log -g --format=%H >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'attach to other' '
 	reset_state &&
-	git rev-parse side master master master^ >expect &&
-	git checkout master^0 &&
+	git rev-parse side main main main^ >expect &&
+	git checkout main^0 &&
 	git checkout side &&
 	git log -g --format=%H >actual &&
 	test_cmp expect actual
diff --git a/t/t1414-reflog-walk.sh b/t/t1414-reflog-walk.sh
index 1181a9fb28..ea64cecf47 100755
--- a/t/t1414-reflog-walk.sh
+++ b/t/t1414-reflog-walk.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='various tests of reflog walk (log -g) behavior'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'set up some reflog entries' '
@@ -8,7 +11,7 @@ test_expect_success 'set up some reflog entries' '
 	test_commit two &&
 	git checkout -b side HEAD^ &&
 	test_commit three &&
-	git merge --no-commit master &&
+	git merge --no-commit main &&
 	echo evil-merge-content >>one.t &&
 	test_tick &&
 	git commit --no-edit -a
@@ -20,9 +23,9 @@ do_walk () {
 
 test_expect_success 'set up expected reflog' '
 	cat >expect.all <<-EOF
-	HEAD@{0} commit (merge): Merge branch ${SQ}master${SQ} into side
+	HEAD@{0} commit (merge): Merge branch ${SQ}main${SQ} into side
 	HEAD@{1} commit: three
-	HEAD@{2} checkout: moving from master to side
+	HEAD@{2} checkout: moving from main to side
 	HEAD@{3} commit: two
 	HEAD@{4} commit (initial): one
 	EOF
@@ -73,15 +76,15 @@ test_expect_success 'walking multiple reflogs shows all' '
 	#      sort ignores the bits after the timestamp.
 	#
 	#   2. POSIX leaves undefined whether this is a stable sort or not. So
-	#      we use "-k 1" to ensure that we see HEAD before master before
+	#      we use "-k 1" to ensure that we see HEAD before main before
 	#      side when breaking ties.
 	{
 		do_walk --date=unix HEAD &&
 		do_walk --date=unix side &&
-		do_walk --date=unix master
+		do_walk --date=unix main
 	} >expect.raw &&
 	sort -t "{" -k 2nr -k 1 <expect.raw >expect &&
-	do_walk --date=unix HEAD master side >actual &&
+	do_walk --date=unix HEAD main side >actual &&
 	test_cmp expect actual
 '
 
@@ -116,7 +119,9 @@ test_expect_success 'min/max age uses entry date to limit' '
 	test_cmp expect actual
 '
 
-test_expect_success 'walk prefers reflog to ref tip' '
+# Create a situation where the reflog and ref database disagree about the latest
+# state of HEAD.
+test_expect_success REFFILES 'walk prefers reflog to ref tip' '
 	head=$(git rev-parse HEAD) &&
 	one=$(git rev-parse one) &&
 	ident="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
diff --git a/t/t1415-worktree-refs.sh b/t/t1415-worktree-refs.sh
index bb2c7572a3..a3e6ea0808 100755
--- a/t/t1415-worktree-refs.sh
+++ b/t/t1415-worktree-refs.sh
@@ -16,7 +16,10 @@ test_expect_success 'setup' '
 	git -C wt2 update-ref refs/worktree/foo HEAD
 '
 
-test_expect_success 'refs/worktree must not be packed' '
+# The 'packed-refs' file is stored directly in .git/. This means it is global
+# to the repository, and can only contain refs that are shared across all
+# worktrees.
+test_expect_success REFFILES 'refs/worktree must not be packed' '
 	git pack-refs --all &&
 	test_path_is_missing .git/refs/tags/wt1 &&
 	test_path_is_file .git/refs/worktree/foo &&
@@ -37,9 +40,8 @@ test_expect_success 'resolve main-worktree/HEAD' '
 '
 
 test_expect_success 'ambiguous main-worktree/HEAD' '
-	mkdir -p .git/refs/heads/main-worktree &&
-	test_when_finished rm -f .git/refs/heads/main-worktree/HEAD &&
-	cp .git/HEAD .git/refs/heads/main-worktree/HEAD &&
+	test_when_finished git update-ref -d refs/heads/main-worktree/HEAD &&
+	git update-ref refs/heads/main-worktree/HEAD $(git rev-parse HEAD) &&
 	git rev-parse main-worktree/HEAD 2>warn &&
 	grep "main-worktree/HEAD.*ambiguous" warn
 '
@@ -51,9 +53,8 @@ test_expect_success 'resolve worktrees/xx/HEAD' '
 '
 
 test_expect_success 'ambiguous worktrees/xx/HEAD' '
-	mkdir -p .git/refs/heads/worktrees/wt1 &&
-	test_when_finished rm -f .git/refs/heads/worktrees/wt1/HEAD &&
-	cp .git/HEAD .git/refs/heads/worktrees/wt1/HEAD &&
+	git update-ref refs/heads/worktrees/wt1/HEAD $(git rev-parse HEAD) &&
+	test_when_finished git update-ref -d refs/heads/worktrees/wt1/HEAD &&
 	git rev-parse worktrees/wt1/HEAD 2>warn &&
 	grep "worktrees/wt1/HEAD.*ambiguous" warn
 '
@@ -76,24 +77,24 @@ test_expect_success 'reflog of worktrees/xx/HEAD' '
 	test_cmp expected actual.wt2
 '
 
-test_expect_success 'for-each-ref from main repo' '
+test_expect_success 'for-each-ref from main worktree' '
 	mkdir fer1 &&
 	git -C fer1 init repo &&
 	test_commit -C fer1/repo initial &&
 	git -C fer1/repo worktree add ../second &&
-	git -C fer1/repo update-ref refs/bisect/main HEAD &&
-	git -C fer1/repo update-ref refs/rewritten/main HEAD &&
-	git -C fer1/repo update-ref refs/worktree/main HEAD &&
-	git -C fer1/repo for-each-ref --format="%(refname)" | grep main >actual &&
+	git -C fer1/repo update-ref refs/bisect/first HEAD &&
+	git -C fer1/repo update-ref refs/rewritten/first HEAD &&
+	git -C fer1/repo update-ref refs/worktree/first HEAD &&
+	git -C fer1/repo for-each-ref --format="%(refname)" | grep first >actual &&
 	cat >expected <<-\EOF &&
-	refs/bisect/main
-	refs/rewritten/main
-	refs/worktree/main
+	refs/bisect/first
+	refs/rewritten/first
+	refs/worktree/first
 	EOF
 	test_cmp expected actual
 '
 
-test_expect_success 'for-each-ref from linked repo' '
+test_expect_success 'for-each-ref from linked worktree' '
 	mkdir fer2 &&
 	git -C fer2 init repo &&
 	test_commit -C fer2/repo initial &&
diff --git a/t/t1416-ref-transaction-hooks.sh b/t/t1416-ref-transaction-hooks.sh
new file mode 100755
index 0000000000..6c941027a8
--- /dev/null
+++ b/t/t1416-ref-transaction-hooks.sh
@@ -0,0 +1,139 @@
+#!/bin/sh
+
+test_description='reference transaction hooks'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success setup '
+	mkdir -p .git/hooks &&
+	test_commit PRE &&
+	PRE_OID=$(git rev-parse PRE) &&
+	test_commit POST &&
+	POST_OID=$(git rev-parse POST)
+'
+
+test_expect_success 'hook allows updating ref if successful' '
+	test_when_finished "rm .git/hooks/reference-transaction" &&
+	git reset --hard PRE &&
+	write_script .git/hooks/reference-transaction <<-\EOF &&
+		echo "$*" >>actual
+	EOF
+	cat >expect <<-EOF &&
+		prepared
+		committed
+	EOF
+	git update-ref HEAD POST &&
+	test_cmp expect actual
+'
+
+test_expect_success 'hook aborts updating ref in prepared state' '
+	test_when_finished "rm .git/hooks/reference-transaction" &&
+	git reset --hard PRE &&
+	write_script .git/hooks/reference-transaction <<-\EOF &&
+		if test "$1" = prepared
+		then
+			exit 1
+		fi
+	EOF
+	test_must_fail git update-ref HEAD POST 2>err &&
+	test_i18ngrep "ref updates aborted by hook" err
+'
+
+test_expect_success 'hook gets all queued updates in prepared state' '
+	test_when_finished "rm .git/hooks/reference-transaction actual" &&
+	git reset --hard PRE &&
+	write_script .git/hooks/reference-transaction <<-\EOF &&
+		if test "$1" = prepared
+		then
+			while read -r line
+			do
+				printf "%s\n" "$line"
+			done >actual
+		fi
+	EOF
+	cat >expect <<-EOF &&
+		$ZERO_OID $POST_OID HEAD
+		$ZERO_OID $POST_OID refs/heads/main
+	EOF
+	git update-ref HEAD POST <<-EOF &&
+		update HEAD $ZERO_OID $POST_OID
+		update refs/heads/main $ZERO_OID $POST_OID
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'hook gets all queued updates in committed state' '
+	test_when_finished "rm .git/hooks/reference-transaction actual" &&
+	git reset --hard PRE &&
+	write_script .git/hooks/reference-transaction <<-\EOF &&
+		if test "$1" = committed
+		then
+			while read -r line
+			do
+				printf "%s\n" "$line"
+			done >actual
+		fi
+	EOF
+	cat >expect <<-EOF &&
+		$ZERO_OID $POST_OID HEAD
+		$ZERO_OID $POST_OID refs/heads/main
+	EOF
+	git update-ref HEAD POST &&
+	test_cmp expect actual
+'
+
+test_expect_success 'hook gets all queued updates in aborted state' '
+	test_when_finished "rm .git/hooks/reference-transaction actual" &&
+	git reset --hard PRE &&
+	write_script .git/hooks/reference-transaction <<-\EOF &&
+		if test "$1" = aborted
+		then
+			while read -r line
+			do
+				printf "%s\n" "$line"
+			done >actual
+		fi
+	EOF
+	cat >expect <<-EOF &&
+		$ZERO_OID $POST_OID HEAD
+		$ZERO_OID $POST_OID refs/heads/main
+	EOF
+	git update-ref --stdin <<-EOF &&
+		start
+		update HEAD POST $ZERO_OID
+		update refs/heads/main POST $ZERO_OID
+		abort
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'interleaving hook calls succeed' '
+	test_when_finished "rm -r target-repo.git" &&
+
+	git init --bare target-repo.git &&
+
+	write_script target-repo.git/hooks/reference-transaction <<-\EOF &&
+		echo $0 "$@" >>actual
+	EOF
+
+	write_script target-repo.git/hooks/update <<-\EOF &&
+		echo $0 "$@" >>actual
+	EOF
+
+	cat >expect <<-EOF &&
+		hooks/update refs/tags/PRE $ZERO_OID $PRE_OID
+		hooks/reference-transaction prepared
+		hooks/reference-transaction committed
+		hooks/update refs/tags/POST $ZERO_OID $POST_OID
+		hooks/reference-transaction prepared
+		hooks/reference-transaction committed
+	EOF
+
+	git push ./target-repo.git PRE POST &&
+	test_cmp expect target-repo.git/actual
+'
+
+test_done
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index c7878a60ed..b1839e0877 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 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-lib.sh
 
 test_expect_success setup '
@@ -17,7 +20,7 @@ test_expect_success 'fast-import: fail on invalid branch name ".badbranchname"'
 		corrupt
 		COMMIT
 
-		from refs/heads/master
+		from refs/heads/main
 
 	INPUT_END
 	test_must_fail git fast-import <input
@@ -32,14 +35,14 @@ test_expect_success 'fast-import: fail on invalid branch name "bad[branch]name"'
 		corrupt
 		COMMIT
 
-		from refs/heads/master
+		from refs/heads/main
 
 	INPUT_END
 	test_must_fail git fast-import <input
 '
 
 test_expect_success 'git branch shows badly named ref as warning' '
-	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
 	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
 	git branch >output 2>error &&
 	test_i18ngrep -e "ignoring ref with broken name refs/heads/broken\.\.\.ref" error &&
@@ -47,7 +50,7 @@ test_expect_success 'git branch shows badly named ref as warning' '
 '
 
 test_expect_success 'branch -d can delete badly named ref' '
-	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
 	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
 	git branch -d broken...ref &&
 	git branch >output 2>error &&
@@ -56,7 +59,7 @@ test_expect_success 'branch -d can delete badly named ref' '
 '
 
 test_expect_success 'branch -D can delete badly named ref' '
-	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
 	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
 	git branch -D broken...ref &&
 	git branch >output 2>error &&
@@ -98,17 +101,17 @@ test_expect_success 'branch -m cannot rename to a bad ref name' '
 	test_might_fail git branch -D goodref &&
 	git branch goodref &&
 	test_must_fail git branch -m goodref broken...ref &&
-	test_cmp_rev master goodref &&
+	test_cmp_rev main goodref &&
 	git branch >output 2>error &&
 	! grep -e "broken\.\.\.ref" error &&
 	! grep -e "broken\.\.\.ref" output
 '
 
 test_expect_failure 'branch -m can rename from a bad ref name' '
-	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
 	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
 	git branch -m broken...ref renamed &&
-	test_cmp_rev master renamed &&
+	test_cmp_rev main renamed &&
 	git branch >output 2>error &&
 	! grep -e "broken\.\.\.ref" error &&
 	! grep -e "broken\.\.\.ref" output
@@ -122,7 +125,7 @@ test_expect_success 'push cannot create a badly named ref' '
 	! grep -e "broken\.\.\.ref" output
 '
 
-test_expect_failure C_LOCALE_OUTPUT 'push --mirror can delete badly named ref' '
+test_expect_failure 'push --mirror can delete badly named ref' '
 	top=$(pwd) &&
 	git init src &&
 	git init dest &&
@@ -135,7 +138,7 @@ test_expect_failure C_LOCALE_OUTPUT 'push --mirror can delete badly named ref' '
 		cd dest &&
 		test_commit two &&
 		git checkout --detach &&
-		cp .git/refs/heads/master .git/refs/heads/broken...ref
+		cp .git/refs/heads/main .git/refs/heads/broken...ref
 	) &&
 	git -C src push --mirror "file://$top/dest" &&
 	git -C dest branch >output 2>error &&
@@ -146,7 +149,7 @@ test_expect_failure C_LOCALE_OUTPUT '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" &&
 	git branch shadow one &&
-	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	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" &&
 	git rev-parse --verify one >expect &&
@@ -156,11 +159,11 @@ 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/master .git/refs/heads/broken...ref &&
+	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" &&
-	printf "ref: refs/heads/master\n" >.git/refs/heads/broken...symref &&
+	printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
 	test_when_finished "rm -f .git/refs/heads/broken...symref" &&
 	git for-each-ref >output 2>error &&
 	! grep -e "broken\.\.\.ref" output &&
@@ -172,7 +175,7 @@ test_expect_success 'for-each-ref emits warnings for broken names' '
 '
 
 test_expect_success 'update-ref -d can delete broken name' '
-	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
 	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
 	git update-ref -d refs/heads/broken...ref >output 2>error &&
 	test_must_be_empty output &&
@@ -183,7 +186,7 @@ test_expect_success 'update-ref -d can delete broken name' '
 '
 
 test_expect_success 'branch -d can delete broken name' '
-	cp .git/refs/heads/master .git/refs/heads/broken...ref &&
+	cp .git/refs/heads/main .git/refs/heads/broken...ref &&
 	test_when_finished "rm -f .git/refs/heads/broken...ref" &&
 	git branch -d broken...ref >output 2>error &&
 	test_i18ngrep "Deleted branch broken...ref (was broken)" output &&
@@ -194,7 +197,7 @@ 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/master .git/refs/heads/broken...ref &&
+	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" &&
@@ -205,7 +208,7 @@ 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/master .git/refs/heads/broken...ref &&
+	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" &&
@@ -234,7 +237,7 @@ 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/master .git/refs/heads/broken...ref &&
+	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" &&
@@ -245,7 +248,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/master\n" >.git/refs/heads/broken...symref &&
+	printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
 	test_when_finished "rm -f .git/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 &&
@@ -254,11 +257,11 @@ 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/master\n" >.git/refs/heads/broken...symref &&
+	printf "ref: refs/heads/main\n" >.git/refs/heads/broken...symref &&
 	test_when_finished "rm -f .git/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/master)" output &&
+	test_i18ngrep "Deleted branch broken...symref (was refs/heads/main)" output &&
 	test_must_be_empty error
 '
 
@@ -296,37 +299,37 @@ test_expect_success 'update-ref -d cannot delete absolute path' '
 '
 
 test_expect_success 'update-ref --stdin fails create with bad ref name' '
-	echo "create ~a refs/heads/master" >stdin &&
+	echo "create ~a refs/heads/main" >stdin &&
 	test_must_fail git update-ref --stdin <stdin 2>err &&
 	grep "fatal: invalid ref format: ~a" err
 '
 
 test_expect_success 'update-ref --stdin fails update with bad ref name' '
-	echo "update ~a refs/heads/master" >stdin &&
+	echo "update ~a refs/heads/main" >stdin &&
 	test_must_fail git update-ref --stdin <stdin 2>err &&
 	grep "fatal: invalid ref format: ~a" err
 '
 
 test_expect_success 'update-ref --stdin fails delete with bad ref name' '
-	echo "delete ~a refs/heads/master" >stdin &&
+	echo "delete ~a refs/heads/main" >stdin &&
 	test_must_fail git update-ref --stdin <stdin 2>err &&
 	grep "fatal: invalid ref format: ~a" err
 '
 
 test_expect_success 'update-ref --stdin -z fails create with bad ref name' '
-	printf "%s\0" "create ~a " refs/heads/master >stdin &&
+	printf "%s\0" "create ~a " refs/heads/main >stdin &&
 	test_must_fail git update-ref -z --stdin <stdin 2>err &&
 	grep "fatal: invalid ref format: ~a " err
 '
 
 test_expect_success 'update-ref --stdin -z fails update with bad ref name' '
-	printf "%s\0" "update ~a" refs/heads/master "" >stdin &&
+	printf "%s\0" "update ~a" refs/heads/main "" >stdin &&
 	test_must_fail git update-ref -z --stdin <stdin 2>err &&
 	grep "fatal: invalid ref format: ~a" err
 '
 
 test_expect_success 'update-ref --stdin -z fails delete with bad ref name' '
-	printf "%s\0" "delete ~a" refs/heads/master >stdin &&
+	printf "%s\0" "delete ~a" refs/heads/main >stdin &&
 	test_must_fail git update-ref -z --stdin <stdin 2>err &&
 	grep "fatal: invalid ref format: ~a" err
 '
diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh
index 50d28e6fdb..5071ac63a5 100755
--- a/t/t1450-fsck.sh
+++ b/t/t1450-fsck.sh
@@ -3,13 +3,12 @@
 test_description='git fsck random collection of tests
 
 * (HEAD) B
-* (master) A
+* (main) A
 '
 
 . ./test-lib.sh
 
 test_expect_success setup '
-	test_oid_init &&
 	git config gc.auto 0 &&
 	git config i18n.commitencoding ISO-8859-1 &&
 	test_commit A fileA one &&
@@ -41,17 +40,13 @@ test_expect_success 'HEAD is part of refs, valid objects appear valid' '
 # specific corruption you test afterwards, lest a later test trip over
 # it.
 
-test_expect_success 'setup: helpers for corruption tests' '
-	sha1_file() {
-		remainder=${1#??} &&
-		firsttwo=${1%$remainder} &&
-		echo ".git/objects/$firsttwo/$remainder"
-	} &&
+sha1_file () {
+	git rev-parse --git-path objects/$(test_oid_to_path "$1")
+}
 
-	remove_object() {
-		rm "$(sha1_file "$1")"
-	}
-'
+remove_object () {
+	rm "$(sha1_file "$1")"
+}
 
 test_expect_success 'object with bad sha1' '
 	sha=$(echo blob | git hash-object -w --stdin) &&
@@ -133,6 +128,30 @@ test_expect_success 'other worktree HEAD link pointing at a funny place' '
 	test_i18ngrep "worktrees/other/HEAD points to something strange" out
 '
 
+test_expect_success 'commit with multiple signatures is okay' '
+	git cat-file commit HEAD >basis &&
+	cat >sigs <<-EOF &&
+	gpgsig -----BEGIN PGP SIGNATURE-----
+	  VGhpcyBpcyBub3QgcmVhbGx5IGEgc2lnbmF0dXJlLg==
+	  -----END PGP SIGNATURE-----
+	gpgsig-sha256 -----BEGIN PGP SIGNATURE-----
+	  VGhpcyBpcyBub3QgcmVhbGx5IGEgc2lnbmF0dXJlLg==
+	  -----END PGP SIGNATURE-----
+	EOF
+	sed -e "/^committer/q" basis >okay &&
+	cat sigs >>okay &&
+	echo >>okay &&
+	sed -e "1,/^$/d" basis >>okay &&
+	cat okay &&
+	new=$(git hash-object -t commit -w --stdin <okay) &&
+	test_when_finished "remove_object $new" &&
+	git update-ref refs/heads/bogus "$new" &&
+	test_when_finished "git update-ref -d refs/heads/bogus" &&
+	git fsck 2>out &&
+	cat out &&
+	! grep "commit $new" out
+'
+
 test_expect_success 'email without @ is okay' '
 	git cat-file commit HEAD >basis &&
 	sed "s/@/AT/" basis >okay &&
@@ -141,7 +160,6 @@ test_expect_success 'email without @ is okay' '
 	git update-ref refs/heads/bogus "$new" &&
 	test_when_finished "git update-ref -d refs/heads/bogus" &&
 	git fsck 2>out &&
-	cat out &&
 	! grep "commit $new" out
 '
 
@@ -234,6 +252,35 @@ test_expect_success 'tree object with duplicate entries' '
 	test_i18ngrep "error in tree .*contains duplicate file entries" out
 '
 
+check_duplicate_names () {
+	expect=$1 &&
+	shift &&
+	names=$@ &&
+	test_expect_$expect "tree object with duplicate names: $names" '
+		test_when_finished "remove_object \$blob" &&
+		test_when_finished "remove_object \$tree" &&
+		test_when_finished "remove_object \$badtree" &&
+		blob=$(echo blob | git hash-object -w --stdin) &&
+		printf "100644 blob %s\t%s\n" $blob x.2 >tree &&
+		tree=$(git mktree <tree) &&
+		for name in $names
+		do
+			case "$name" in
+			*/) printf "040000 tree %s\t%s\n" $tree "${name%/}" ;;
+			*)  printf "100644 blob %s\t%s\n" $blob "$name" ;;
+			esac
+		done >badtree &&
+		badtree=$(git mktree <badtree) &&
+		test_must_fail git fsck 2>out &&
+		test_i18ngrep "$badtree" out &&
+		test_i18ngrep "error in tree .*contains duplicate file entries" out
+	'
+}
+
+check_duplicate_names success x x.1 x/
+check_duplicate_names success x x.1.2 x.1/ x/
+check_duplicate_names success x x.1 x.1.2 x/
+
 test_expect_success 'unparseable tree object' '
 	test_oid_cache <<-\EOF &&
 	junk sha1:twenty-bytes-of-junk
@@ -329,7 +376,7 @@ test_expect_success 'tag with incorrect tag name & missing tagger' '
 	warning in tag $tag: badTagName: invalid '\''tag'\'' name: wrong name format
 	warning in tag $tag: missingTaggerEntry: invalid format - expected '\''tagger'\'' line
 	EOF
-	test_i18ncmp expect out
+	test_cmp expect out
 '
 
 test_expect_success 'tag with bad tagger' '
@@ -441,6 +488,7 @@ while read name path pretty; do
 		(
 			git init $name-$type &&
 			cd $name-$type &&
+			git config core.protectNTFS false &&
 			echo content >file &&
 			git add file &&
 			git commit -m base &&
@@ -610,13 +658,15 @@ test_expect_success 'fsck --name-objects' '
 	git init name-objects &&
 	(
 		cd name-objects &&
+		git config core.logAllRefUpdates false &&
 		test_commit julius caesar.t &&
-		test_commit augustus &&
-		test_commit caesar &&
+		test_commit augustus44 &&
+		test_commit caesar  &&
 		remove_object $(git rev-parse julius:caesar.t) &&
-		test_must_fail git fsck --name-objects >out &&
 		tree=$(git rev-parse --verify julius:) &&
-		test_i18ngrep -E "$tree \((refs/heads/master|HEAD)@\{[0-9]*\}:" out
+		git tag -d julius &&
+		test_must_fail git fsck --name-objects >out &&
+		test_i18ngrep "$tree (refs/tags/augustus44\\^:" out
 	)
 '
 
@@ -661,7 +711,7 @@ test_expect_success 'fsck fails on corrupt packfile' '
 	# at least one of which is not zero, so setting the first byte to 0 is
 	# sufficient.)
 	chmod a+w .git/objects/pack/pack-$pack.pack &&
-	printf '\0' | dd of=.git/objects/pack/pack-$pack.pack bs=1 conv=notrunc seek=12 &&
+	printf "\0" | dd of=.git/objects/pack/pack-$pack.pack bs=1 conv=notrunc seek=12 &&
 
 	test_when_finished "rm -f .git/objects/pack/pack-$pack.*" &&
 	remove_object $hsh &&
@@ -754,7 +804,7 @@ test_expect_success 'fsck notices dangling objects' '
 		git fsck >actual &&
 		# the output order is non-deterministic, as it comes from a hash
 		sort <actual >actual.sorted &&
-		test_i18ncmp expect actual.sorted
+		test_cmp expect actual.sorted
 	)
 '
 
@@ -764,7 +814,7 @@ test_expect_success 'fsck --connectivity-only notices dangling objects' '
 		git fsck --connectivity-only >actual &&
 		# the output order is non-deterministic, as it comes from a hash
 		sort <actual >actual.sorted &&
-		test_i18ncmp expect actual.sorted
+		test_cmp expect actual.sorted
 	)
 '
 
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
index 01abee533d..1c2df08333 100755
--- a/t/t1500-rev-parse.sh
+++ b/t/t1500-rev-parse.sh
@@ -1,8 +1,21 @@
 #!/bin/sh
 
 test_description='test git rev-parse'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
+test_one () {
+	dir="$1" &&
+	expect="$2" &&
+	shift &&
+	shift &&
+	echo "$expect" >expect &&
+	git -C "$dir" rev-parse "$@" >actual &&
+	test_cmp expect actual
+}
+
 # usage: [options] label is-bare is-inside-git is-inside-work prefix git-dir absolute-git-dir
 test_rev_parse () {
 	d=
@@ -60,7 +73,13 @@ ROOT=$(pwd)
 
 test_expect_success 'setup' '
 	mkdir -p sub/dir work &&
-	cp -R .git repo.git
+	cp -R .git repo.git &&
+	git checkout -B main &&
+	test_commit abc &&
+	git checkout -b side &&
+	test_commit def &&
+	git checkout main &&
+	git worktree add worktree side
 '
 
 test_rev_parse toplevel false false true '' .git "$ROOT/.git"
@@ -88,6 +107,49 @@ test_rev_parse -C work -g ../repo.git -b t 'GIT_DIR=../repo.git, core.bare = tru
 
 test_rev_parse -C work -g ../repo.git -b u 'GIT_DIR=../repo.git, core.bare undefined' false false true ''
 
+test_expect_success 'rev-parse --path-format=absolute' '
+	test_one "." "$ROOT/.git" --path-format=absolute --git-dir &&
+	test_one "." "$ROOT/.git" --path-format=absolute --git-common-dir &&
+	test_one "sub/dir" "$ROOT/.git" --path-format=absolute --git-dir &&
+	test_one "sub/dir" "$ROOT/.git" --path-format=absolute --git-common-dir &&
+	test_one "worktree" "$ROOT/.git/worktrees/worktree" --path-format=absolute --git-dir &&
+	test_one "worktree" "$ROOT/.git" --path-format=absolute --git-common-dir &&
+	test_one "." "$ROOT" --path-format=absolute --show-toplevel &&
+	test_one "." "$ROOT/.git/objects" --path-format=absolute --git-path objects &&
+	test_one "." "$ROOT/.git/objects/foo/bar/baz" --path-format=absolute --git-path objects/foo/bar/baz
+'
+
+test_expect_success 'rev-parse --path-format=relative' '
+	test_one "." ".git" --path-format=relative --git-dir &&
+	test_one "." ".git" --path-format=relative --git-common-dir &&
+	test_one "sub/dir" "../../.git" --path-format=relative --git-dir &&
+	test_one "sub/dir" "../../.git" --path-format=relative --git-common-dir &&
+	test_one "worktree" "../.git/worktrees/worktree" --path-format=relative --git-dir &&
+	test_one "worktree" "../.git" --path-format=relative --git-common-dir &&
+	test_one "." "./" --path-format=relative --show-toplevel &&
+	test_one "." ".git/objects" --path-format=relative --git-path objects &&
+	test_one "." ".git/objects/foo/bar/baz" --path-format=relative --git-path objects/foo/bar/baz
+'
+
+test_expect_success '--path-format=relative does not affect --absolute-git-dir' '
+	git rev-parse --path-format=relative --absolute-git-dir >actual &&
+	echo "$ROOT/.git" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '--path-format can change in the middle of the command line' '
+	git rev-parse --path-format=absolute --git-dir --path-format=relative --git-path objects/foo/bar >actual &&
+	cat >expect <<-EOF &&
+	$ROOT/.git
+	.git/objects/foo/bar
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success '--path-format does not segfault without an argument' '
+	test_must_fail git rev-parse --path-format
+'
+
 test_expect_success 'git-common-dir from worktree root' '
 	echo .git >expect &&
 	git rev-parse --git-common-dir >actual &&
@@ -131,6 +193,30 @@ test_expect_success 'rev-parse --is-shallow-repository in non-shallow repo' '
 	test_cmp expect actual
 '
 
+test_expect_success 'rev-parse --show-object-format in repo' '
+	echo "$(test_oid algo)" >expect &&
+	git rev-parse --show-object-format >actual &&
+	test_cmp expect actual &&
+	git rev-parse --show-object-format=storage >actual &&
+	test_cmp expect actual &&
+	git rev-parse --show-object-format=input >actual &&
+	test_cmp expect actual &&
+	git rev-parse --show-object-format=output >actual &&
+	test_cmp expect actual &&
+	test_must_fail git rev-parse --show-object-format=squeamish-ossifrage 2>err &&
+	grep "unknown mode for --show-object-format: squeamish-ossifrage" err
+'
+
+test_expect_success '--show-toplevel from subdir of working tree' '
+	pwd >expect &&
+	git -C sub/dir rev-parse --show-toplevel >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--show-toplevel from inside .git' '
+	test_must_fail git -C .git rev-parse --show-toplevel
+'
+
 test_expect_success 'showing the superproject correctly' '
 	git rev-parse --show-superproject-working-tree >out &&
 	test_must_be_empty out &&
@@ -150,8 +236,8 @@ test_expect_success 'showing the superproject correctly' '
 	test_commit -C super/dir/sub branch1_commit &&
 	git -C super add dir/sub &&
 	test_commit -C super branch1_commit &&
-	git -C super checkout -b branch2 master &&
-	git -C super/dir/sub checkout -b branch2 master &&
+	git -C super checkout -b branch2 main &&
+	git -C super/dir/sub checkout -b branch2 main &&
 	test_commit -C super/dir/sub branch2_commit &&
 	git -C super add dir/sub &&
 	test_commit -C super branch2_commit &&
@@ -161,4 +247,19 @@ test_expect_success 'showing the superproject correctly' '
 	test_cmp expect out
 '
 
+# at least one external project depends on this behavior:
+test_expect_success 'rev-parse --since= unsqueezed ordering' '
+	x1=--since=1970-01-01T00:00:01Z &&
+	x2=--since=1970-01-01T00:00:02Z &&
+	x3=--since=1970-01-01T00:00:03Z &&
+	git rev-parse $x1 $x1 $x3 $x2 >actual &&
+	cat >expect <<-EOF &&
+	--max-age=1
+	--max-age=1
+	--max-age=3
+	--max-age=2
+	EOF
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t1501-work-tree.sh b/t/t1501-work-tree.sh
index 3498d3d55e..b75558040f 100755
--- a/t/t1501-work-tree.sh
+++ b/t/t1501-work-tree.sh
@@ -350,7 +350,7 @@ test_expect_success 'Multi-worktree setup' '
 	mkdir work &&
 	mkdir -p repo.git/repos/foo &&
 	cp repo.git/HEAD repo.git/index repo.git/repos/foo &&
-	test_might_fail cp repo.git/sharedindex.* repo.git/repos/foo &&
+	{ cp repo.git/sharedindex.* repo.git/repos/foo || :; } &&
 	sane_unset GIT_DIR GIT_CONFIG GIT_WORK_TREE
 '
 
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index a859abedf5..b29563fc99 100755
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -95,7 +95,7 @@ test_expect_success 'test --parseopt help output' '
 |EOF
 END_EXPECT
 	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'test --parseopt help output no switches' '
@@ -108,7 +108,7 @@ test_expect_success 'test --parseopt help output no switches' '
 |EOF
 END_EXPECT
 	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_no_switches &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'test --parseopt help output hidden switches' '
@@ -121,7 +121,7 @@ test_expect_success 'test --parseopt help output hidden switches' '
 |EOF
 END_EXPECT
 	test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_only_hidden_switches &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'test --parseopt help-all output hidden switches' '
@@ -136,7 +136,7 @@ test_expect_success 'test --parseopt help-all output hidden switches' '
 |EOF
 END_EXPECT
 	test_expect_code 129 git rev-parse --parseopt -- --help-all > output < optionspec_only_hidden_switches &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'test --parseopt invalid switch help output' '
@@ -176,7 +176,7 @@ test_expect_success 'test --parseopt invalid switch help output' '
 |
 END_EXPECT
 	test_expect_code 129 git rev-parse --parseopt -- --does-not-exist 1>/dev/null 2>output < optionspec &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'setup expect.1' "
diff --git a/t/t1503-rev-parse-verify.sh b/t/t1503-rev-parse-verify.sh
index 492edffa9c..40958615eb 100755
--- a/t/t1503-rev-parse-verify.sh
+++ b/t/t1503-rev-parse-verify.sh
@@ -6,6 +6,9 @@ test_description='test git rev-parse --verify'
 
 exec </dev/null
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 add_line_into_file()
@@ -51,8 +54,8 @@ test_expect_success 'works with one good rev' '
 	test "$rev_hash3" = "$HASH3" &&
 	rev_hash4=$(git rev-parse --verify $HASH4) &&
 	test "$rev_hash4" = "$HASH4" &&
-	rev_master=$(git rev-parse --verify master) &&
-	test "$rev_master" = "$HASH4" &&
+	rev_main=$(git rev-parse --verify main) &&
+	test "$rev_main" = "$HASH4" &&
 	rev_head=$(git rev-parse --verify HEAD) &&
 	test "$rev_head" = "$HASH4"
 '
@@ -86,8 +89,8 @@ test_expect_success 'fails silently when using -q' '
 test_expect_success 'fails silently when using -q with deleted reflogs' '
 	ref=$(git rev-parse HEAD) &&
 	git update-ref --create-reflog -m "message for refs/test" refs/test "$ref" &&
-	git reflog delete --updateref --rewrite refs/test@{0} &&
-	test_must_fail git rev-parse -q --verify refs/test@{0} >error 2>&1 &&
+	git reflog delete --updateref --rewrite refs/test@{1} &&
+	test_must_fail git rev-parse -q --verify refs/test@{1} >error 2>&1 &&
 	test_must_be_empty error
 '
 
@@ -116,32 +119,45 @@ test_expect_success 'no stdout output on error' '
 '
 
 test_expect_success 'use --default' '
-	git rev-parse --verify --default master &&
-	git rev-parse --verify --default master HEAD &&
-	git rev-parse --default master --verify &&
-	git rev-parse --default master --verify HEAD &&
-	git rev-parse --verify HEAD --default master &&
-	test_must_fail git rev-parse --verify foo --default master &&
+	git rev-parse --verify --default main &&
+	git rev-parse --verify --default main HEAD &&
+	git rev-parse --default main --verify &&
+	git rev-parse --default main --verify HEAD &&
+	git rev-parse --verify HEAD --default main &&
+	test_must_fail git rev-parse --verify foo --default main &&
 	test_must_fail git rev-parse --default HEAD --verify bar &&
 	test_must_fail git rev-parse --verify --default HEAD baz &&
 	test_must_fail git rev-parse --default foo --verify &&
 	test_must_fail git rev-parse --verify --default bar
 '
 
-test_expect_success 'master@{n} for various n' '
+test_expect_success 'main@{n} for various n' '
 	N=$(git reflog | wc -l) &&
 	Nm1=$(($N-1)) &&
 	Np1=$(($N+1)) &&
-	git rev-parse --verify master@{0} &&
-	git rev-parse --verify master@{1} &&
-	git rev-parse --verify master@{$Nm1} &&
-	test_must_fail git rev-parse --verify master@{$N} &&
-	test_must_fail git rev-parse --verify master@{$Np1}
+	git rev-parse --verify main@{0} &&
+	git rev-parse --verify main@{1} &&
+	git rev-parse --verify main@{$Nm1} &&
+	test_must_fail git rev-parse --verify main@{$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
 '
 
+test_expect_success 'options can appear after --verify' '
+	git rev-parse --verify HEAD >expect &&
+	git rev-parse --verify -q HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'verify respects --end-of-options' '
+	git update-ref refs/heads/-tricky HEAD &&
+	git rev-parse --verify HEAD >expect &&
+	git rev-parse --verify --end-of-options -tricky >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t1505-rev-parse-last.sh b/t/t1505-rev-parse-last.sh
index 4969edb314..2803ca9489 100755
--- a/t/t1505-rev-parse-last.sh
+++ b/t/t1505-rev-parse-last.sh
@@ -2,6 +2,9 @@
 
 test_description='test @{-N} syntax'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
@@ -20,12 +23,12 @@ test_expect_success 'setup' '
 	make_commit 3 &&
 	git checkout side &&
 	make_commit 4 &&
-	git merge master &&
-	git checkout master
+	git merge main &&
+	git checkout main
 
 '
 
-# 1 -- 2 -- 3 master
+# 1 -- 2 -- 3 main
 #  \         \
 #   \         \
 #    --- 4 --- 5 side
@@ -49,7 +52,7 @@ test_expect_success '@{-1}@{1} works' '
 '
 
 test_expect_success '@{-2} works' '
-	test_cmp_rev master @{-2}
+	test_cmp_rev main @{-2}
 '
 
 test_expect_success '@{-3} fails' '
diff --git a/t/t1506-rev-parse-diagnosis.sh b/t/t1506-rev-parse-diagnosis.sh
index 624d0a588f..65a154a8a2 100755
--- a/t/t1506-rev-parse-diagnosis.sh
+++ b/t/t1506-rev-parse-diagnosis.sh
@@ -4,13 +4,16 @@ test_description='test git rev-parse diagnosis for invalid argument'
 
 exec </dev/null
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_did_you_mean ()
 {
 	cat >expected <<-EOF &&
-	fatal: Path '$2$3' $4, but not ${5:-$SQ$3$SQ}.
-	Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}?
+	fatal: path '$2$3' $4, but not ${5:-$SQ$3$SQ}
+	hint: Did you mean '$1:$2$3'${2:+ aka $SQ$1:./$3$SQ}?
 	EOF
 	test_cmp expected error
 }
@@ -103,66 +106,66 @@ test_expect_success 'correct relative file objects (6)' '
 
 test_expect_success 'incorrect revision id' '
 	test_must_fail git rev-parse foobar:file.txt 2>error &&
-	grep "Invalid object name '"'"'foobar'"'"'." error &&
-	test_must_fail git rev-parse foobar 2> error &&
+	test_i18ngrep "invalid object name .foobar." error &&
+	test_must_fail git rev-parse foobar 2>error &&
 	test_i18ngrep "unknown revision or path not in the working tree." error
 '
 
 test_expect_success 'incorrect file in sha1:path' '
-	test_must_fail git rev-parse HEAD:nothing.txt 2> error &&
-	grep "fatal: Path '"'"'nothing.txt'"'"' does not exist in '"'"'HEAD'"'"'" error &&
-	test_must_fail git rev-parse HEAD:index-only.txt 2> error &&
-	grep "fatal: Path '"'"'index-only.txt'"'"' exists on disk, but not in '"'"'HEAD'"'"'." error &&
+	test_must_fail git rev-parse HEAD:nothing.txt 2>error &&
+	test_i18ngrep "path .nothing.txt. does not exist in .HEAD." error &&
+	test_must_fail git rev-parse HEAD:index-only.txt 2>error &&
+	test_i18ngrep "path .index-only.txt. exists on disk, but not in .HEAD." error &&
 	(cd subdir &&
-	 test_must_fail git rev-parse HEAD:file2.txt 2> error &&
+	 test_must_fail git rev-parse HEAD:file2.txt 2>error &&
 	 test_did_you_mean HEAD subdir/ file2.txt exists )
 '
 
 test_expect_success 'incorrect file in :path and :N:path' '
-	test_must_fail git rev-parse :nothing.txt 2> error &&
-	grep "fatal: Path '"'"'nothing.txt'"'"' does not exist (neither on disk nor in the index)." error &&
-	test_must_fail git rev-parse :1:nothing.txt 2> error &&
-	grep "Path '"'"'nothing.txt'"'"' does not exist (neither on disk nor in the index)." error &&
-	test_must_fail git rev-parse :1:file.txt 2> error &&
+	test_must_fail git rev-parse :nothing.txt 2>error &&
+	test_i18ngrep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
+	test_must_fail git rev-parse :1:nothing.txt 2>error &&
+	test_i18ngrep "path .nothing.txt. does not exist (neither on disk nor in the index)" error &&
+	test_must_fail git rev-parse :1:file.txt 2>error &&
 	test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
 	(cd subdir &&
-	 test_must_fail git rev-parse :1:file.txt 2> error &&
+	 test_must_fail git rev-parse :1:file.txt 2>error &&
 	 test_did_you_mean ":0" "" file.txt "is in the index" "at stage 1" &&
-	 test_must_fail git rev-parse :file2.txt 2> error &&
+	 test_must_fail git rev-parse :file2.txt 2>error &&
 	 test_did_you_mean ":0" subdir/ file2.txt "is in the index" &&
-	 test_must_fail git rev-parse :2:file2.txt 2> error &&
+	 test_must_fail git rev-parse :2:file2.txt 2>error &&
 	 test_did_you_mean :0 subdir/ file2.txt "is in the index") &&
-	test_must_fail git rev-parse :disk-only.txt 2> error &&
-	grep "fatal: Path '"'"'disk-only.txt'"'"' exists on disk, but not in the index." error
+	test_must_fail git rev-parse :disk-only.txt 2>error &&
+	test_i18ngrep "path .disk-only.txt. exists on disk, but not in the index" error
 '
 
 test_expect_success 'invalid @{n} reference' '
-	test_must_fail git rev-parse master@{99999} >output 2>error &&
-	test -z "$(cat output)" &&
-	grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error  &&
-	test_must_fail git rev-parse --verify master@{99999} >output 2>error &&
-	test -z "$(cat output)" &&
-	grep "fatal: Log for [^ ]* only has [0-9][0-9]* entries." error
+	test_must_fail git rev-parse main@{99999} >output 2>error &&
+	test_must_be_empty output &&
+	test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error  &&
+	test_must_fail git rev-parse --verify main@{99999} >output 2>error &&
+	test_must_be_empty output &&
+	test_i18ngrep "log for [^ ]* only has [0-9][0-9]* entries" error
 '
 
 test_expect_success 'relative path not found' '
 	(
 		cd subdir &&
 		test_must_fail git rev-parse HEAD:./nonexistent.txt 2>error &&
-		grep subdir/nonexistent.txt error
+		test_i18ngrep subdir/nonexistent.txt error
 	)
 '
 
 test_expect_success 'relative path outside worktree' '
 	test_must_fail git rev-parse HEAD:../file.txt >output 2>error &&
-	test -z "$(cat output)" &&
+	test_must_be_empty output &&
 	test_i18ngrep "outside repository" error
 '
 
 test_expect_success 'relative path when cwd is outside worktree' '
 	test_must_fail git --git-dir=.git --work-tree=subdir rev-parse HEAD:./file.txt >output 2>error &&
-	test -z "$(cat output)" &&
-	grep "relative path syntax can.t be used outside working tree." error
+	test_must_be_empty output &&
+	test_i18ngrep "relative path syntax can.t be used outside working tree" error
 '
 
 test_expect_success '<commit>:file correctly diagnosed after a pathname' '
@@ -190,6 +193,24 @@ test_expect_success 'dotdot is not an empty set' '
 	test_cmp expect actual
 '
 
+test_expect_success 'dotdot does not peel endpoints' '
+	git tag -a -m "annote" annotated HEAD &&
+	A=$(git rev-parse annotated) &&
+	H=$(git rev-parse annotated^0) &&
+	{
+		echo $A && echo ^$A
+	} >expect-with-two-dots &&
+	{
+		echo $A && echo $A && echo ^$H
+	} >expect-with-merge-base &&
+
+	git rev-parse annotated..annotated >actual-with-two-dots &&
+	test_cmp expect-with-two-dots actual-with-two-dots &&
+
+	git rev-parse annotated...annotated >actual-with-merge-base &&
+	test_cmp expect-with-merge-base actual-with-merge-base
+'
+
 test_expect_success 'arg before dashdash must be a revision (missing)' '
 	test_must_fail git rev-parse foobar -- 2>stderr &&
 	test_i18ngrep "bad revision" stderr
@@ -207,7 +228,7 @@ test_expect_success 'arg before dashdash must be a revision (ambiguous)' '
 	{
 		# we do not want to use rev-parse here, because
 		# we are testing it
-		cat .git/refs/heads/foobar &&
+		git show-ref -s refs/heads/foobar &&
 		printf "%s\n" --
 	} >expect &&
 	git rev-parse foobar -- >actual &&
@@ -222,4 +243,43 @@ test_expect_success 'reject Nth ancestor if N is too high' '
 	test_must_fail git rev-parse HEAD~100000000000000000000000000000000
 '
 
+test_expect_success 'pathspecs with wildcards are not ambiguous' '
+	echo "*.c" >expect &&
+	git rev-parse "*.c" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'backslash does not trigger wildcard rule' '
+	test_must_fail git rev-parse "foo\\bar"
+'
+
+test_expect_success 'escaped char does not trigger wildcard rule' '
+	test_must_fail git rev-parse "foo\\*bar"
+'
+
+test_expect_success 'arg after dashdash not interpreted as option' '
+	cat >expect <<-\EOF &&
+	--
+	--local-env-vars
+	EOF
+	git rev-parse -- --local-env-vars >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'arg after end-of-options not interpreted as option' '
+	test_must_fail git rev-parse --end-of-options --not-real -- 2>err &&
+	test_i18ngrep bad.revision.*--not-real err
+'
+
+test_expect_success 'end-of-options still allows --' '
+	cat >expect <<-EOF &&
+	--end-of-options
+	$(git rev-parse --verify HEAD)
+	--
+	path
+	EOF
+	git rev-parse --end-of-options HEAD -- path >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh
index 8b4cf8a6e3..c34714ffe3 100755
--- a/t/t1507-rev-parse-upstream.sh
+++ b/t/t1507-rev-parse-upstream.sh
@@ -2,6 +2,9 @@
 
 test_description='test <branch>@{upstream} syntax'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
@@ -10,32 +13,27 @@ test_expect_success 'setup' '
 	test_commit 1 &&
 	git checkout -b side &&
 	test_commit 2 &&
-	git checkout master &&
+	git checkout main &&
 	git clone . clone &&
 	test_commit 3 &&
 	(cd clone &&
 	 test_commit 4 &&
 	 git branch --track my-side origin/side &&
-	 git branch --track local-master master &&
+	 git branch --track local-main main &&
 	 git branch --track fun@ny origin/side &&
 	 git branch --track @funny origin/side &&
 	 git branch --track funny@ origin/side &&
-	 git remote add -t master master-only .. &&
-	 git fetch master-only &&
+	 git remote add -t main main-only .. &&
+	 git fetch main-only &&
 	 git branch bad-upstream &&
-	 git config branch.bad-upstream.remote master-only &&
+	 git config branch.bad-upstream.remote main-only &&
 	 git config branch.bad-upstream.merge refs/heads/side
 	)
 '
 
-full_name () {
-	(cd clone &&
-	 git rev-parse --symbolic-full-name "$@")
-}
-
 commit_subject () {
 	(cd clone &&
-	 git show -s --pretty=format:%s "$@")
+	 git show -s --pretty=tformat:%s "$@")
 }
 
 error_message () {
@@ -44,63 +42,78 @@ error_message () {
 }
 
 test_expect_success '@{upstream} resolves to correct full name' '
-	test refs/remotes/origin/master = "$(full_name @{upstream})" &&
-	test refs/remotes/origin/master = "$(full_name @{UPSTREAM})" &&
-	test refs/remotes/origin/master = "$(full_name @{UpSTReam})"
+	echo refs/remotes/origin/main >expect &&
+	git -C clone rev-parse --symbolic-full-name @{upstream} >actual &&
+	test_cmp expect actual &&
+	git -C clone rev-parse --symbolic-full-name @{UPSTREAM} >actual &&
+	test_cmp expect actual &&
+	git -C clone rev-parse --symbolic-full-name @{UpSTReam} >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success '@{u} resolves to correct full name' '
-	test refs/remotes/origin/master = "$(full_name @{u})" &&
-	test refs/remotes/origin/master = "$(full_name @{U})"
+	echo refs/remotes/origin/main >expect &&
+	git -C clone rev-parse --symbolic-full-name @{u} >actual &&
+	test_cmp expect actual &&
+	git -C clone rev-parse --symbolic-full-name @{U} >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'my-side@{upstream} resolves to correct full name' '
-	test refs/remotes/origin/side = "$(full_name my-side@{u})"
+	echo refs/remotes/origin/side >expect &&
+	git -C clone rev-parse --symbolic-full-name my-side@{u} >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'upstream of branch with @ in middle' '
-	full_name fun@ny@{u} >actual &&
+	git -C clone rev-parse --symbolic-full-name fun@ny@{u} >actual &&
 	echo refs/remotes/origin/side >expect &&
 	test_cmp expect actual &&
-	full_name fun@ny@{U} >actual &&
+	git -C clone rev-parse --symbolic-full-name fun@ny@{U} >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'upstream of branch with @ at start' '
-	full_name @funny@{u} >actual &&
+	git -C clone rev-parse --symbolic-full-name @funny@{u} >actual &&
 	echo refs/remotes/origin/side >expect &&
 	test_cmp expect actual
 '
 
 test_expect_success 'upstream of branch with @ at end' '
-	full_name funny@@{u} >actual &&
+	git -C clone rev-parse --symbolic-full-name funny@@{u} >actual &&
 	echo refs/remotes/origin/side >expect &&
 	test_cmp expect actual
 '
 
 test_expect_success 'refs/heads/my-side@{upstream} does not resolve to my-side{upstream}' '
-	test_must_fail full_name refs/heads/my-side@{upstream}
+	test_must_fail git -C clone rev-parse --symbolic-full-name refs/heads/my-side@{upstream}
 '
 
 test_expect_success 'my-side@{u} resolves to correct commit' '
 	git checkout side &&
 	test_commit 5 &&
 	(cd clone && git fetch) &&
-	test 2 = "$(commit_subject my-side)" &&
-	test 5 = "$(commit_subject my-side@{u})"
+	echo 2 >expect &&
+	commit_subject my-side >actual &&
+	test_cmp expect actual &&
+	echo 5 >expect &&
+	commit_subject my-side@{u} >actual
 '
 
 test_expect_success 'not-tracking@{u} fails' '
-	test_must_fail full_name non-tracking@{u} &&
+	test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u} &&
 	(cd clone && git checkout --no-track -b non-tracking) &&
-	test_must_fail full_name non-tracking@{u}
+	test_must_fail git -C clone rev-parse --symbolic-full-name non-tracking@{u}
 '
 
 test_expect_success '<branch>@{u}@{1} resolves correctly' '
 	test_commit 6 &&
 	(cd clone && git fetch) &&
-	test 5 = $(commit_subject my-side@{u}@{1}) &&
-	test 5 = $(commit_subject my-side@{U}@{1})
+	echo 5 >expect &&
+	commit_subject my-side@{u}@{1} >actual &&
+	test_cmp expect actual &&
+	commit_subject my-side@{U}@{1} >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success '@{u} without specifying branch fails on a detached HEAD' '
@@ -122,7 +135,7 @@ test_expect_success 'checkout -b new my-side@{u} forks from the same' '
 test_expect_success 'merge my-side@{u} records the correct name' '
 (
 	cd clone &&
-	git checkout master &&
+	git checkout main &&
 	test_might_fail git branch -D new &&
 	git branch -t new my-side@{u} &&
 	git merge -s ours new@{u} &&
@@ -133,23 +146,25 @@ test_expect_success 'merge my-side@{u} records the correct name' '
 '
 
 test_expect_success 'branch -d other@{u}' '
-	git checkout -t -b other master &&
+	git checkout -t -b other main &&
 	git branch -d @{u} &&
-	git for-each-ref refs/heads/master >actual &&
+	git for-each-ref refs/heads/main >actual &&
 	test_must_be_empty actual
 '
 
 test_expect_success 'checkout other@{u}' '
-	git branch -f master HEAD &&
-	git checkout -t -b another master &&
+	git branch -f main HEAD &&
+	git checkout -t -b another main &&
 	git checkout @{u} &&
 	git symbolic-ref HEAD >actual &&
-	echo refs/heads/master >expect &&
+	echo refs/heads/main >expect &&
 	test_cmp expect actual
 '
 
 test_expect_success 'branch@{u} works when tracking a local branch' '
-	test refs/heads/master = "$(full_name local-master@{u})"
+	echo refs/heads/main >expect &&
+	git -C clone rev-parse --symbolic-full-name local-main@{u} >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'branch@{u} error message when no upstream' '
@@ -157,15 +172,15 @@ test_expect_success 'branch@{u} error message when no upstream' '
 	fatal: no upstream configured for branch ${SQ}non-tracking${SQ}
 	EOF
 	error_message non-tracking@{u} &&
-	test_i18ncmp expect error
+	test_cmp expect error
 '
 
 test_expect_success '@{u} error message when no upstream' '
 	cat >expect <<-EOF &&
-	fatal: no upstream configured for branch ${SQ}master${SQ}
+	fatal: no upstream configured for branch ${SQ}main${SQ}
 	EOF
 	test_must_fail git rev-parse --verify @{u} 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'branch@{u} error message with misspelt branch' '
@@ -173,7 +188,7 @@ test_expect_success 'branch@{u} error message with misspelt branch' '
 	fatal: no such branch: ${SQ}no-such-branch${SQ}
 	EOF
 	error_message no-such-branch@{u} &&
-	test_i18ncmp expect error
+	test_cmp expect error
 '
 
 test_expect_success '@{u} error message when not on a branch' '
@@ -182,7 +197,7 @@ test_expect_success '@{u} error message when not on a branch' '
 	EOF
 	git checkout HEAD^0 &&
 	test_must_fail git rev-parse --verify @{u} 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'branch@{u} error message if upstream branch not fetched' '
@@ -190,48 +205,50 @@ test_expect_success 'branch@{u} error message if upstream branch not fetched' '
 	fatal: upstream branch ${SQ}refs/heads/side${SQ} not stored as a remote-tracking branch
 	EOF
 	error_message bad-upstream@{u} &&
-	test_i18ncmp expect error
+	test_cmp expect error
 '
 
 test_expect_success 'pull works when tracking a local branch' '
 (
 	cd clone &&
-	git checkout local-master &&
+	git checkout local-main &&
 	git pull
 )
 '
 
 # makes sense if the previous one succeeded
 test_expect_success '@{u} works when tracking a local branch' '
-	test refs/heads/master = "$(full_name @{u})"
+	echo refs/heads/main >expect &&
+	git -C clone rev-parse --symbolic-full-name @{u} >actual &&
+	test_cmp expect actual
 '
 
-commit=$(git rev-parse HEAD)
-cat >expect <<EOF
-commit $commit
-Reflog: master@{0} (C O Mitter <committer@example.com>)
-Reflog message: branch: Created from HEAD
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    3
-EOF
 test_expect_success 'log -g other@{u}' '
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	commit $commit
+	Reflog: main@{0} (C O Mitter <committer@example.com>)
+	Reflog message: branch: Created from HEAD
+	Author: A U Thor <author@example.com>
+	Date:   Thu Apr 7 15:15:13 2005 -0700
+
+	    3
+	EOF
 	git log -1 -g other@{u} >actual &&
 	test_cmp expect actual
 '
 
-cat >expect <<EOF
-commit $commit
-Reflog: master@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
-Reflog message: branch: Created from HEAD
-Author: A U Thor <author@example.com>
-Date:   Thu Apr 7 15:15:13 2005 -0700
-
-    3
-EOF
-
 test_expect_success 'log -g other@{u}@{now}' '
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	commit $commit
+	Reflog: main@{Thu Apr 7 15:17:13 2005 -0700} (C O Mitter <committer@example.com>)
+	Reflog message: branch: Created from HEAD
+	Author: A U Thor <author@example.com>
+	Date:   Thu Apr 7 15:15:13 2005 -0700
+
+	    3
+	EOF
 	git log -1 -g other@{u}@{now} >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t1508-at-combinations.sh b/t/t1508-at-combinations.sh
index 4a9964e9dc..87a4286414 100755
--- a/t/t1508-at-combinations.sh
+++ b/t/t1508-at-combinations.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test various @{X} syntax combinations together'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check() {
@@ -30,8 +33,8 @@ fail() {
 }
 
 test_expect_success 'setup' '
-	test_commit master-one &&
-	test_commit master-two &&
+	test_commit main-one &&
+	test_commit main-two &&
 	git checkout -b upstream-branch &&
 	test_commit upstream-one &&
 	test_commit upstream-two &&
@@ -47,7 +50,7 @@ test_expect_success 'setup' '
 	git checkout -b new-branch &&
 	test_commit new-one &&
 	test_commit new-two &&
-	git branch -u master old-branch &&
+	git branch -u main old-branch &&
 	git branch -u upstream-branch new-branch
 '
 
@@ -62,8 +65,8 @@ check "@{-1}@{1}" commit old-one
 check "@{u}" ref refs/heads/upstream-branch
 check "HEAD@{u}" ref refs/heads/upstream-branch
 check "@{u}@{1}" commit upstream-one
-check "@{-1}@{u}" ref refs/heads/master
-check "@{-1}@{u}@{1}" commit master-one
+check "@{-1}@{u}" ref refs/heads/main
+check "@{-1}@{u}@{1}" commit main-one
 check "@" commit new-two
 check "@@{u}" ref refs/heads/upstream-branch
 check "@@/at-test" ref refs/heads/@@/at-test
@@ -99,4 +102,17 @@ test_expect_success 'create path with @' '
 check "@:normal" blob content
 check "@:fun@ny" blob content
 
+test_expect_success '@{1} works with only one reflog entry' '
+	git checkout -B newbranch main &&
+	git reflog expire --expire=now refs/heads/newbranch &&
+	git commit --allow-empty -m "first after expiration" &&
+	test_cmp_rev newbranch~ newbranch@{1}
+'
+
+test_expect_success '@{0} works with empty reflog' '
+	git checkout -B newbranch main &&
+	git reflog expire --expire=now refs/heads/newbranch &&
+	test_cmp_rev newbranch newbranch@{0}
+'
+
 test_done
diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh
index 9974457f56..bbfe05b8e4 100755
--- a/t/t1510-repo-setup.sh
+++ b/t/t1510-repo-setup.sh
@@ -79,7 +79,7 @@ setup_repo () {
 	name=$1 worktreecfg=$2 gitfile=$3 barecfg=$4 &&
 	sane_unset GIT_DIR GIT_WORK_TREE &&
 
-	git init "$name" &&
+	git -c init.defaultBranch=initial init "$name" &&
 	maybe_config "$name/.git/config" core.worktree "$worktreecfg" &&
 	maybe_config "$name/.git/config" core.bare "$barecfg" &&
 	mkdir -p "$name/sub/sub" &&
diff --git a/t/t1511-rev-parse-caret.sh b/t/t1511-rev-parse-caret.sh
index e0a49a651f..6ecfed86bc 100755
--- a/t/t1511-rev-parse-caret.sh
+++ b/t/t1511-rev-parse-caret.sh
@@ -2,6 +2,9 @@
 
 test_description='tests for ref^{stuff}'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -15,7 +18,7 @@ test_expect_success 'setup' '
 	git commit -m Initial &&
 	git tag -a -m commit commit-tag &&
 	git branch ref &&
-	git checkout master &&
+	git checkout main &&
 	echo modified >>a-blob &&
 	git add -u &&
 	git commit -m Modified &&
@@ -73,52 +76,52 @@ test_expect_success 'ref^{tag}' '
 '
 
 test_expect_success 'ref^{/.}' '
-	git rev-parse master >expected &&
-	git rev-parse master^{/.} >actual &&
+	git rev-parse main >expected &&
+	git rev-parse main^{/.} >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'ref^{/non-existent}' '
-	test_must_fail git rev-parse master^{/non-existent}
+	test_must_fail git rev-parse main^{/non-existent}
 '
 
 test_expect_success 'ref^{/Initial}' '
 	git rev-parse ref >expected &&
-	git rev-parse master^{/Initial} >actual &&
+	git rev-parse main^{/Initial} >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'ref^{/!Exp}' '
-	test_must_fail git rev-parse master^{/!Exp}
+	test_must_fail git rev-parse main^{/!Exp}
 '
 
 test_expect_success 'ref^{/!}' '
-	test_must_fail git rev-parse master^{/!}
+	test_must_fail git rev-parse main^{/!}
 '
 
 test_expect_success 'ref^{/!!Exp}' '
 	git rev-parse expref >expected &&
-	git rev-parse master^{/!!Exp} >actual &&
+	git rev-parse main^{/!!Exp} >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'ref^{/!-}' '
-	test_must_fail git rev-parse master^{/!-}
+	test_must_fail git rev-parse main^{/!-}
 '
 
 test_expect_success 'ref^{/!-.}' '
-	test_must_fail git rev-parse master^{/!-.}
+	test_must_fail git rev-parse main^{/!-.}
 '
 
 test_expect_success 'ref^{/!-non-existent}' '
-	git rev-parse master >expected &&
-	git rev-parse master^{/!-non-existent} >actual &&
+	git rev-parse main >expected &&
+	git rev-parse main^{/!-non-existent} >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'ref^{/!-Changed}' '
 	git rev-parse expref >expected &&
-	git rev-parse master^{/!-Changed} >actual &&
+	git rev-parse main^{/!-Changed} >actual &&
 	test_cmp expected actual
 '
 
diff --git a/t/t1512-rev-parse-disambiguation.sh b/t/t1512-rev-parse-disambiguation.sh
index c19fb500cb..7891a6becf 100755
--- a/t/t1512-rev-parse-disambiguation.sh
+++ b/t/t1512-rev-parse-disambiguation.sh
@@ -20,6 +20,9 @@ one tagged as v1.0.0.  They all have one regular file each.
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq SHA1
@@ -48,7 +51,7 @@ test_expect_success 'blob and tree' '
 
 test_expect_success 'warn ambiguity when no candidate matches type hint' '
 	test_must_fail git rev-parse --verify 000000000^{commit} 2>actual &&
-	test_i18ngrep "short SHA1 000000000 is ambiguous" actual
+	test_i18ngrep "short object ID 000000000 is ambiguous" actual
 '
 
 test_expect_success 'disambiguate tree-ish' '
@@ -212,7 +215,7 @@ test_expect_success 'more history' '
 	side=$(git rev-parse HEAD) &&
 
 	# commit 000000000066
-	git checkout master &&
+	git checkout main &&
 
 	# If you use recursive, merge will fail and you will need to
 	# clean up a0blgqsjc as well.  If you use resolve, merge will
@@ -282,7 +285,7 @@ test_expect_success 'rev-parse --disambiguate' '
 	# commits created by commit-tree in earlier tests share a
 	# different prefix.
 	git rev-parse --disambiguate=000000000 >actual &&
-	test $(wc -l <actual) = 16 &&
+	test_line_count = 16 actual &&
 	test "$(sed -e "s/^\(.........\).*/\1/" actual | sort -u)" = 000000000
 '
 
@@ -311,39 +314,39 @@ test_expect_success 'ambiguous short sha1 ref' '
 	grep "refname.*${REF}.*ambiguous" err
 '
 
-test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (raw)' '
+test_expect_success 'ambiguity errors are not repeated (raw)' '
 	test_must_fail git rev-parse 00000 2>stderr &&
 	grep "is ambiguous" stderr >errors &&
 	test_line_count = 1 errors
 '
 
-test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (treeish)' '
+test_expect_success 'ambiguity errors are not repeated (treeish)' '
 	test_must_fail git rev-parse 00000:foo 2>stderr &&
 	grep "is ambiguous" stderr >errors &&
 	test_line_count = 1 errors
 '
 
-test_expect_success C_LOCALE_OUTPUT 'ambiguity errors are not repeated (peel)' '
+test_expect_success 'ambiguity errors are not repeated (peel)' '
 	test_must_fail git rev-parse 00000^{commit} 2>stderr &&
 	grep "is ambiguous" stderr >errors &&
 	test_line_count = 1 errors
 '
 
-test_expect_success C_LOCALE_OUTPUT 'ambiguity hints' '
+test_expect_success 'ambiguity hints' '
 	test_must_fail git rev-parse 000000000 2>stderr &&
 	grep ^hint: stderr >hints &&
 	# 16 candidates, plus one intro line
 	test_line_count = 17 hints
 '
 
-test_expect_success C_LOCALE_OUTPUT 'ambiguity hints respect type' '
+test_expect_success 'ambiguity hints respect type' '
 	test_must_fail git rev-parse 000000000^{commit} 2>stderr &&
 	grep ^hint: stderr >hints &&
-	# 5 commits, 1 tag (which is a commitish), plus intro line
+	# 5 commits, 1 tag (which is a committish), plus intro line
 	test_line_count = 7 hints
 '
 
-test_expect_success C_LOCALE_OUTPUT 'failed type-selector still shows hint' '
+test_expect_success 'failed type-selector still shows hint' '
 	# these two blobs share the same prefix "ee3d", but neither
 	# will pass for a commit
 	echo 851 | git hash-object --stdin -w &&
@@ -367,7 +370,7 @@ test_expect_success 'core.disambiguate does not override context' '
 		git -c core.disambiguate=committish rev-parse $sha1^{tree}
 '
 
-test_expect_success C_LOCALE_OUTPUT 'ambiguous commits are printed by type first, then hash order' '
+test_expect_success 'ambiguous commits are printed by type first, then hash order' '
 	test_must_fail git rev-parse 0000 2>stderr &&
 	grep ^hint: stderr >hints &&
 	grep 0000 hints >objects &&
diff --git a/t/t1513-rev-parse-prefix.sh b/t/t1513-rev-parse-prefix.sh
index 87ec3ae714..5f437be8c9 100755
--- a/t/t1513-rev-parse-prefix.sh
+++ b/t/t1513-rev-parse-prefix.sh
@@ -2,6 +2,9 @@
 
 test_description='Tests for rev-parse --prefix'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -76,9 +79,9 @@ test_expect_success 'disambiguate path with valid prefix' '
 '
 
 test_expect_success 'file and refs with prefix' '
-	git rev-parse --prefix sub1/ master file1 >actual &&
+	git rev-parse --prefix sub1/ main file1 >actual &&
 	cat <<-EOF >expected &&
-	$(git rev-parse master)
+	$(git rev-parse main)
 	sub1/file1
 	EOF
 	test_cmp expected actual
diff --git a/t/t1514-rev-parse-push.sh b/t/t1514-rev-parse-push.sh
index 788cc91e45..d868a08110 100755
--- a/t/t1514-rev-parse-push.sh
+++ b/t/t1514-rev-parse-push.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test <branch>@{push} syntax'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 resolve () {
@@ -16,24 +19,24 @@ test_expect_success 'setup' '
 	git remote add other other.git &&
 	test_commit base &&
 	git push origin HEAD &&
-	git branch --set-upstream-to=origin/master master &&
-	git branch --track topic origin/master &&
+	git branch --set-upstream-to=origin/main main &&
+	git branch --track topic origin/main &&
 	git push origin topic &&
 	git push other topic
 '
 
 test_expect_success '@{push} with default=nothing' '
 	test_config push.default nothing &&
-	test_must_fail git rev-parse master@{push} &&
-	test_must_fail git rev-parse master@{PUSH} &&
-	test_must_fail git rev-parse master@{PuSH}
+	test_must_fail git rev-parse main@{push} &&
+	test_must_fail git rev-parse main@{PUSH} &&
+	test_must_fail git rev-parse main@{PuSH}
 '
 
 test_expect_success '@{push} with default=simple' '
 	test_config push.default simple &&
-	resolve master@{push} refs/remotes/origin/master &&
-	resolve master@{PUSH} refs/remotes/origin/master &&
-	resolve master@{pUSh} refs/remotes/origin/master
+	resolve main@{push} refs/remotes/origin/main &&
+	resolve main@{PUSH} refs/remotes/origin/main &&
+	resolve main@{pUSh} refs/remotes/origin/main
 '
 
 test_expect_success 'triangular @{push} fails with default=simple' '
diff --git a/t/t1600-index.sh b/t/t1600-index.sh
index b7c31aa86a..c9b9e718b8 100755
--- a/t/t1600-index.sh
+++ b/t/t1600-index.sh
@@ -18,7 +18,7 @@ test_expect_success 'bogus GIT_INDEX_VERSION issues warning' '
 			warning: GIT_INDEX_VERSION set, but the value is invalid.
 			Using version Z
 		EOF
-		test_i18ncmp expect.err actual.err
+		test_cmp expect.err actual.err
 	)
 '
 
@@ -32,7 +32,7 @@ test_expect_success 'out of bounds GIT_INDEX_VERSION issues warning' '
 			warning: GIT_INDEX_VERSION set, but the value is invalid.
 			Using version Z
 		EOF
-		test_i18ncmp expect.err actual.err
+		test_cmp expect.err actual.err
 	)
 '
 
@@ -55,7 +55,7 @@ test_expect_success 'out of bounds index.version issues warning' '
 			warning: index.version set, but the value is invalid.
 			Using version Z
 		EOF
-		test_i18ncmp expect.err actual.err
+		test_cmp expect.err actual.err
 	)
 '
 
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 12a5568844..986baa612e 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -2,6 +2,9 @@
 
 test_description='split index mode tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # We need total control of index splitting here
@@ -496,7 +499,7 @@ test_expect_success 'do not refresh null base index' '
 		test_commit initial &&
 		git checkout -b side-branch &&
 		test_commit extra &&
-		git checkout master &&
+		git checkout main &&
 		git update-index --split-index &&
 		test_commit more &&
 		# must not write a new shareindex, or we wont catch the problem
diff --git a/t/t2004-checkout-cache-temp.sh b/t/t2004-checkout-cache-temp.sh
index a12afe93f3..a9352b08a8 100755
--- a/t/t2004-checkout-cache-temp.sh
+++ b/t/t2004-checkout-cache-temp.sh
@@ -88,9 +88,17 @@ test_expect_success 'checkout all stage 2 to temporary files' '
 	done
 '
 
+test_expect_success 'checkout all stages of unknown path' '
+	rm -f path* .merge_* actual &&
+	test_must_fail git checkout-index --stage=all --temp \
+		-- does-not-exist 2>stderr &&
+	test_i18ngrep not.in.the.cache stderr
+'
+
 test_expect_success 'checkout all stages/one file to nothing' '
 	rm -f path* .merge_* actual &&
-	git checkout-index --stage=all --temp -- path0 >actual &&
+	git checkout-index --stage=all --temp -- path0 >actual 2>stderr &&
+	test_must_be_empty stderr &&
 	test_line_count = 0 actual
 '
 
diff --git a/t/t2006-checkout-index-basic.sh b/t/t2006-checkout-index-basic.sh
index 57cbdfe9bc..7705e3a317 100755
--- a/t/t2006-checkout-index-basic.sh
+++ b/t/t2006-checkout-index-basic.sh
@@ -21,4 +21,83 @@ test_expect_success 'checkout-index -h in broken repository' '
 	test_i18ngrep "[Uu]sage" broken/usage
 '
 
+test_expect_success 'checkout-index reports errors (cmdline)' '
+	test_must_fail git checkout-index -- does-not-exist 2>stderr &&
+	test_i18ngrep not.in.the.cache stderr
+'
+
+test_expect_success 'checkout-index reports errors (stdin)' '
+	echo does-not-exist |
+	test_must_fail git checkout-index --stdin 2>stderr &&
+	test_i18ngrep not.in.the.cache stderr
+'
+for mode in 'case' 'utf-8'
+do
+	case "$mode" in
+	case)	dir='A' symlink='a' mode_prereq='CASE_INSENSITIVE_FS' ;;
+	utf-8)
+		dir=$(printf "\141\314\210") symlink=$(printf "\303\244")
+		mode_prereq='UTF8_NFD_TO_NFC' ;;
+	esac
+
+	test_expect_success SYMLINKS,$mode_prereq \
+	"checkout-index with $mode-collision don't write to the wrong place" '
+		git init $mode-collision &&
+		(
+			cd $mode-collision &&
+			mkdir target-dir &&
+
+			empty_obj_hex=$(git hash-object -w --stdin </dev/null) &&
+			symlink_hex=$(printf "%s" "$PWD/target-dir" | git hash-object -w --stdin) &&
+
+			cat >objs <<-EOF &&
+			100644 blob ${empty_obj_hex}	${dir}/x
+			100644 blob ${empty_obj_hex}	${dir}/y
+			100644 blob ${empty_obj_hex}	${dir}/z
+			120000 blob ${symlink_hex}	${symlink}
+			EOF
+
+			git update-index --index-info <objs &&
+
+			# Note: the order is important here to exercise the
+			# case where the file at ${dir} has its type changed by
+			# the time Git tries to check out ${dir}/z.
+			#
+			# Also, we use core.precomposeUnicode=false because we
+			# want Git to treat the UTF-8 paths transparently on
+			# Mac OS, matching what is in the index.
+			#
+			git -c core.precomposeUnicode=false checkout-index -f \
+				${dir}/x ${dir}/y ${symlink} ${dir}/z &&
+
+			# Should not create ${dir}/z at ${symlink}/z
+			test_path_is_missing target-dir/z
+
+		)
+	'
+done
+
+test_expect_success 'checkout-index --temp correctly reports error on missing blobs' '
+	test_when_finished git reset --hard &&
+	missing_blob=$(echo "no such blob here" | git hash-object --stdin) &&
+	cat >objs <<-EOF &&
+	100644 $missing_blob	file
+	120000 $missing_blob	symlink
+	EOF
+	git update-index --index-info <objs &&
+
+	test_must_fail git checkout-index --temp symlink file 2>stderr &&
+	test_i18ngrep "unable to read sha1 file of file ($missing_blob)" stderr &&
+	test_i18ngrep "unable to read sha1 file of symlink ($missing_blob)" stderr
+'
+
+test_expect_success 'checkout-index --temp correctly reports error for submodules' '
+	git init sub &&
+	test_commit -C sub file &&
+	git submodule add ./sub &&
+	git commit -m sub &&
+	test_must_fail git checkout-index --temp sub 2>stderr &&
+	test_i18ngrep "cannot create temporary submodule sub" stderr
+'
+
 test_done
diff --git a/t/t2007-checkout-symlink.sh b/t/t2007-checkout-symlink.sh
index fc9aad530e..6f0b90ce12 100755
--- a/t/t2007-checkout-symlink.sh
+++ b/t/t2007-checkout-symlink.sh
@@ -4,6 +4,9 @@
 
 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-lib.sh
 
 test_expect_success setup '
@@ -12,14 +15,14 @@ test_expect_success setup '
 	echo hello >frotz/filfre &&
 	git add frotz/filfre &&
 	test_tick &&
-	git commit -m "master has file frotz/filfre" &&
+	git commit -m "main has file frotz/filfre" &&
 
 	git branch side &&
 
 	echo goodbye >nitfol &&
 	git add nitfol &&
 	test_tick &&
-	git commit -m "master adds file nitfol" &&
+	git commit -m "main adds file nitfol" &&
 
 	git checkout side &&
 
@@ -34,13 +37,13 @@ test_expect_success setup '
 
 test_expect_success 'switch from symlink to dir' '
 
-	git checkout master
+	git checkout main
 
 '
 
-test_expect_success 'Remove temporary directories & switch to master' '
+test_expect_success 'Remove temporary directories & switch to main' '
 	rm -fr frotz xyzzy nitfol &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'switch from dir to symlink' '
diff --git a/t/t2009-checkout-statinfo.sh b/t/t2009-checkout-statinfo.sh
index f3c2152087..b0540636ae 100755
--- a/t/t2009-checkout-statinfo.sh
+++ b/t/t2009-checkout-statinfo.sh
@@ -2,6 +2,9 @@
 
 test_description='checkout should leave clean stat info'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -21,13 +24,13 @@ test_expect_success 'branch switching' '
 	git reset --hard &&
 	test "$(git diff-files --raw)" = "" &&
 
-	git checkout master &&
+	git checkout main &&
 	test "$(git diff-files --raw)" = "" &&
 
 	git checkout side &&
 	test "$(git diff-files --raw)" = "" &&
 
-	git checkout master &&
+	git checkout main &&
 	test "$(git diff-files --raw)" = ""
 
 '
@@ -37,13 +40,13 @@ test_expect_success 'path checkout' '
 	git reset --hard &&
 	test "$(git diff-files --raw)" = "" &&
 
-	git checkout master world &&
+	git checkout main world &&
 	test "$(git diff-files --raw)" = "" &&
 
 	git checkout side world &&
 	test "$(git diff-files --raw)" = "" &&
 
-	git checkout master world &&
+	git checkout main world &&
 	test "$(git diff-files --raw)" = ""
 
 '
diff --git a/t/t2010-checkout-ambiguous.sh b/t/t2010-checkout-ambiguous.sh
index 2e47fe01cf..6e8757387d 100755
--- a/t/t2010-checkout-ambiguous.sh
+++ b/t/t2010-checkout-ambiguous.sh
@@ -2,6 +2,9 @@
 
 test_description='checkout and pathspecs/refspecs ambiguities'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -17,7 +20,7 @@ test_expect_success 'reference must be a tree' '
 '
 
 test_expect_success 'branch switching' '
-	test "refs/heads/master" = "$(git symbolic-ref HEAD)" &&
+	test "refs/heads/main" = "$(git symbolic-ref HEAD)" &&
 	git checkout world -- &&
 	test "refs/heads/world" = "$(git symbolic-ref HEAD)"
 '
@@ -57,7 +60,7 @@ test_expect_success 'disambiguate checking out from a tree-ish' '
 '
 
 test_expect_success 'accurate error message with more than one ref' '
-	test_must_fail git checkout HEAD master -- 2>actual &&
+	test_must_fail git checkout HEAD main -- 2>actual &&
 	test_i18ngrep 2 actual &&
 	test_i18ngrep "one reference expected, 2 given" actual
 '
diff --git a/t/t2011-checkout-invalid-head.sh b/t/t2011-checkout-invalid-head.sh
index 0e8d56aa76..e52022e152 100755
--- a/t/t2011-checkout-invalid-head.sh
+++ b/t/t2011-checkout-invalid-head.sh
@@ -2,6 +2,9 @@
 
 test_description='checkout switching away from an invalid branch'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -11,12 +14,12 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'checkout should not start branch from a tree' '
-	test_must_fail git checkout -b newbranch master^{tree}
+	test_must_fail git checkout -b newbranch main^{tree}
 '
 
-test_expect_success 'checkout master from invalid HEAD' '
+test_expect_success 'checkout main from invalid HEAD' '
 	echo $ZERO_OID >.git/HEAD &&
-	git checkout master --
+	git checkout main --
 '
 
 test_expect_success 'checkout notices failure to lock HEAD' '
@@ -26,7 +29,7 @@ test_expect_success 'checkout notices failure to lock HEAD' '
 '
 
 test_expect_success 'create ref directory/file conflict scenario' '
-	git update-ref refs/heads/outer/inner master &&
+	git update-ref refs/heads/outer/inner main &&
 
 	# do not rely on symbolic-ref to get a known state,
 	# as it may use the same code we are testing
@@ -37,12 +40,12 @@ test_expect_success 'create ref directory/file conflict scenario' '
 
 test_expect_success 'checkout away from d/f HEAD (unpacked, to branch)' '
 	reset_to_df &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'checkout away from d/f HEAD (unpacked, to detached)' '
 	reset_to_df &&
-	git checkout --detach master
+	git checkout --detach main
 '
 
 test_expect_success 'pack refs' '
@@ -51,11 +54,11 @@ test_expect_success 'pack refs' '
 
 test_expect_success 'checkout away from d/f HEAD (packed, to branch)' '
 	reset_to_df &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'checkout away from d/f HEAD (packed, to detached)' '
 	reset_to_df &&
-	git checkout --detach master
+	git checkout --detach main
 '
 test_done
diff --git a/t/t2012-checkout-last.sh b/t/t2012-checkout-last.sh
index e7ba8c505f..0e7d47ab31 100755
--- a/t/t2012-checkout-last.sh
+++ b/t/t2012-checkout-last.sh
@@ -2,16 +2,15 @@
 
 test_description='checkout can switch to last branch and merge base'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
-	echo hello >world &&
-	git add world &&
-	git commit -m initial &&
+	test_commit initial world hello &&
 	git branch other &&
-	echo "hello again" >>world &&
-	git add world &&
-	git commit -m second
+	test_commit --append second world "hello again"
 '
 
 test_expect_success '"checkout -" does not work initially' '
@@ -24,7 +23,7 @@ test_expect_success 'first branch switch' '
 
 test_expect_success '"checkout -" switches back' '
 	git checkout - &&
-	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
 '
 
 test_expect_success '"checkout -" switches forth' '
@@ -93,61 +92,59 @@ test_expect_success 'switch to twelfth from the last' '
 
 test_expect_success 'merge base test setup' '
 	git checkout -b another other &&
-	echo "hello again" >>world &&
-	git add world &&
-	git commit -m third
+	test_commit --append third world "hello again"
 '
 
-test_expect_success 'another...master' '
+test_expect_success 'another...main' '
 	git checkout another &&
-	git checkout another...master &&
-	test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
+	git checkout another...main &&
+	test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify main^)"
 '
 
-test_expect_success '...master' '
+test_expect_success '...main' '
 	git checkout another &&
-	git checkout ...master &&
-	test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
+	git checkout ...main &&
+	test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify main^)"
 '
 
-test_expect_success 'master...' '
+test_expect_success 'main...' '
 	git checkout another &&
-	git checkout master... &&
-	test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify master^)"
+	git checkout main... &&
+	test "z$(git rev-parse --verify HEAD)" = "z$(git rev-parse --verify main^)"
 '
 
 test_expect_success '"checkout -" works after a rebase A' '
-	git checkout master &&
+	git checkout main &&
 	git checkout other &&
-	git rebase master &&
+	git rebase main &&
 	git checkout - &&
-	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
 '
 
 test_expect_success '"checkout -" works after a rebase A B' '
-	git branch moodle master~1 &&
-	git checkout master &&
+	git branch moodle main~1 &&
+	git checkout main &&
 	git checkout other &&
-	git rebase master moodle &&
+	git rebase main moodle &&
 	git checkout - &&
-	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
 '
 
 test_expect_success '"checkout -" works after a rebase -i A' '
-	git checkout master &&
+	git checkout main &&
 	git checkout other &&
-	git rebase -i master &&
+	git rebase -i main &&
 	git checkout - &&
-	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
 '
 
 test_expect_success '"checkout -" works after a rebase -i A B' '
-	git branch foodle master~1 &&
-	git checkout master &&
+	git branch foodle main~1 &&
+	git checkout main &&
 	git checkout other &&
-	git rebase master foodle &&
+	git rebase main foodle &&
 	git checkout - &&
-	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/master"
+	test "z$(git symbolic-ref HEAD)" = "zrefs/heads/main"
 '
 
 test_done
diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh
index 8f86b5f4b2..b2bdd1fcb4 100755
--- a/t/t2013-checkout-submodule.sh
+++ b/t/t2013-checkout-submodule.sh
@@ -68,8 +68,8 @@ test_submodule_switch_recursing_with_args "checkout"
 
 test_submodule_forced_switch_recursing_with_args "checkout -f"
 
-test_submodule_switch "git checkout"
+test_submodule_switch "checkout"
 
-test_submodule_forced_switch "git checkout -f"
+test_submodule_forced_switch "checkout -f"
 
 test_done
diff --git a/t/t2015-checkout-unborn.sh b/t/t2015-checkout-unborn.sh
index 37bdcedcc9..a9721215fa 100755
--- a/t/t2015-checkout-unborn.sh
+++ b/t/t2015-checkout-unborn.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='checkout from unborn branch'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -11,7 +14,7 @@ test_expect_success 'setup' '
 	 git add file &&
 	 git commit -m base
 	) &&
-	git fetch parent master:origin
+	git fetch parent main:origin
 '
 
 test_expect_success 'checkout from unborn preserves untracked files' '
diff --git a/t/t2016-checkout-patch.sh b/t/t2016-checkout-patch.sh
index 47aeb0b167..abfd586c32 100755
--- a/t/t2016-checkout-patch.sh
+++ b/t/t2016-checkout-patch.sh
@@ -18,6 +18,10 @@ test_expect_success PERL 'setup' '
 
 # note: bar sorts before dir/foo, so the first 'n' is always to skip 'bar'
 
+# NEEDSWORK: Since the builtin add-p is used when $GIT_TEST_ADD_I_USE_BUILTIN
+# is given, we should replace the PERL prerequisite with an ADD_I prerequisite
+# which first checks if $GIT_TEST_ADD_I_USE_BUILTIN is defined before checking
+# PERL.
 test_expect_success PERL 'saying "n" does nothing' '
 	set_and_save_state dir/foo work head &&
 	test_write_lines n n | git checkout -p &&
@@ -59,6 +63,13 @@ test_expect_success PERL 'git checkout -p HEAD with change already staged' '
 	verify_state dir/foo head head
 '
 
+test_expect_success PERL 'git checkout -p HEAD^...' '
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git checkout -p HEAD^... &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent parent
+'
+
 test_expect_success PERL 'git checkout -p HEAD^' '
 	# the third n is to get out in case it mistakenly does not apply
 	test_write_lines n y n | git checkout -p HEAD^ &&
@@ -112,4 +123,9 @@ test_expect_success PERL 'none of this moved HEAD' '
 	verify_saved_head
 '
 
+test_expect_success PERL 'empty tree can be handled' '
+	test_when_finished "git reset --hard" &&
+	git checkout -p $(test_oid empty_tree) --
+'
+
 test_done
diff --git a/t/t2017-checkout-orphan.sh b/t/t2017-checkout-orphan.sh
index 655f278c5f..88d6992a5e 100755
--- a/t/t2017-checkout-orphan.sh
+++ b/t/t2017-checkout-orphan.sh
@@ -7,6 +7,9 @@ test_description='git checkout --orphan
 
 Main Tests for --orphan functionality.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 TEST_FILE=foo
@@ -29,34 +32,34 @@ test_expect_success '--orphan creates a new orphan branch from HEAD' '
 	test_tick &&
 	git commit -m "Third Commit" &&
 	test_must_fail git rev-parse --verify HEAD^ &&
-	git diff-tree --quiet master alpha
+	git diff-tree --quiet main alpha
 '
 
 test_expect_success '--orphan creates a new orphan branch from <start_point>' '
-	git checkout master &&
-	git checkout --orphan beta master^ &&
+	git checkout main &&
+	git checkout --orphan beta main^ &&
 	test_must_fail git rev-parse --verify HEAD &&
 	test "refs/heads/beta" = "$(git symbolic-ref HEAD)" &&
 	test_tick &&
 	git commit -m "Fourth Commit" &&
 	test_must_fail git rev-parse --verify HEAD^ &&
-	git diff-tree --quiet master^ beta
+	git diff-tree --quiet main^ beta
 '
 
 test_expect_success '--orphan must be rejected with -b' '
-	git checkout master &&
+	git checkout main &&
 	test_must_fail git checkout --orphan new -b newer &&
-	test refs/heads/master = "$(git symbolic-ref HEAD)"
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
 '
 
 test_expect_success '--orphan must be rejected with -t' '
-	git checkout master &&
-	test_must_fail git checkout --orphan new -t master &&
-	test refs/heads/master = "$(git symbolic-ref HEAD)"
+	git checkout main &&
+	test_must_fail git checkout --orphan new -t main &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
 '
 
 test_expect_success '--orphan ignores branch.autosetupmerge' '
-	git checkout master &&
+	git checkout main &&
 	git config branch.autosetupmerge always &&
 	git checkout --orphan gamma &&
 	test -z "$(git config branch.gamma.merge)" &&
@@ -65,7 +68,7 @@ test_expect_success '--orphan ignores branch.autosetupmerge' '
 '
 
 test_expect_success '--orphan makes reflog by default' '
-	git checkout master &&
+	git checkout main &&
 	git config --unset core.logAllRefUpdates &&
 	git checkout --orphan delta &&
 	test_must_fail git rev-parse --verify delta@{0} &&
@@ -73,8 +76,8 @@ test_expect_success '--orphan makes reflog by default' '
 	git rev-parse --verify delta@{0}
 '
 
-test_expect_success '--orphan does not make reflog when core.logAllRefUpdates = false' '
-	git checkout master &&
+test_expect_success REFFILES '--orphan does not make reflog when core.logAllRefUpdates = false' '
+	git checkout main &&
 	git config core.logAllRefUpdates false &&
 	git checkout --orphan epsilon &&
 	test_must_fail git rev-parse --verify epsilon@{0} &&
@@ -83,7 +86,7 @@ test_expect_success '--orphan does not make reflog when core.logAllRefUpdates =
 '
 
 test_expect_success '--orphan with -l makes reflog when core.logAllRefUpdates = false' '
-	git checkout master &&
+	git checkout main &&
 	git checkout -l --orphan zeta &&
 	test_must_fail git rev-parse --verify zeta@{0} &&
 	git commit -m Zeta &&
@@ -91,33 +94,33 @@ test_expect_success '--orphan with -l makes reflog when core.logAllRefUpdates =
 '
 
 test_expect_success 'giving up --orphan not committed when -l and core.logAllRefUpdates = false deletes reflog' '
-	git checkout master &&
+	git checkout main &&
 	git checkout -l --orphan eta &&
 	test_must_fail git rev-parse --verify eta@{0} &&
-	git checkout master &&
+	git checkout main &&
 	test_must_fail git rev-parse --verify eta@{0}
 '
 
 test_expect_success '--orphan is rejected with an existing name' '
-	git checkout master &&
-	test_must_fail git checkout --orphan master &&
-	test refs/heads/master = "$(git symbolic-ref HEAD)"
+	git checkout main &&
+	test_must_fail git checkout --orphan main &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
 '
 
 test_expect_success '--orphan refuses to switch if a merge is needed' '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard &&
 	echo local >>"$TEST_FILE" &&
 	cat "$TEST_FILE" >"$TEST_FILE.saved" &&
-	test_must_fail git checkout --orphan new master^ &&
-	test refs/heads/master = "$(git symbolic-ref HEAD)" &&
+	test_must_fail git checkout --orphan new main^ &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)" &&
 	test_cmp "$TEST_FILE" "$TEST_FILE.saved" &&
 	git diff-index --quiet --cached HEAD &&
 	git reset --hard
 '
 
 test_expect_success 'cannot --detach on an unborn branch' '
-	git checkout master &&
+	git checkout main &&
 	git checkout --orphan new &&
 	test_must_fail git checkout --detach
 '
diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh
index 822381dd9d..93be1c0eae 100755
--- a/t/t2018-checkout-branch.sh
+++ b/t/t2018-checkout-branch.sh
@@ -1,50 +1,76 @@
 #!/bin/sh
 
-test_description='checkout '
+test_description='checkout'
 
 . ./test-lib.sh
 
-# Arguments: <branch> <sha> [<checkout options>]
+# Arguments: [!] <branch> <oid> [<checkout options>]
 #
 # Runs "git checkout" to switch to <branch>, testing that
 #
 #   1) we are on the specified branch, <branch>;
-#   2) HEAD is <sha>; if <sha> is not specified, the old HEAD is used.
+#   2) HEAD is <oid>; if <oid> is not specified, the old HEAD is used.
 #
 # If <checkout options> is not specified, "git checkout" is run with -b.
-do_checkout() {
+#
+# If the first argument is `!`, "git checkout" is expected to fail when
+# it is run.
+do_checkout () {
+	should_fail= &&
+	if test "x$1" = "x!"
+	then
+		should_fail=yes &&
+		shift
+	fi &&
 	exp_branch=$1 &&
 	exp_ref="refs/heads/$exp_branch" &&
 
-	# if <sha> is not specified, use HEAD.
-	exp_sha=${2:-$(git rev-parse --verify HEAD)} &&
+	# if <oid> is not specified, use HEAD.
+	exp_oid=${2:-$(git rev-parse --verify HEAD)} &&
 
 	# default options for git checkout: -b
-	if [ -z "$3" ]; then
+	if test -z "$3"
+	then
 		opts="-b"
 	else
 		opts="$3"
 	fi
 
-	git checkout $opts $exp_branch $exp_sha &&
+	if test -n "$should_fail"
+	then
+		test_must_fail git checkout $opts $exp_branch $exp_oid
+	else
+		git checkout $opts $exp_branch $exp_oid &&
+		echo "$exp_ref" >ref.expect &&
+		git rev-parse --symbolic-full-name HEAD >ref.actual &&
+		test_cmp ref.expect ref.actual &&
+		echo "$exp_oid" >oid.expect &&
+		git rev-parse --verify HEAD >oid.actual &&
+		test_cmp oid.expect oid.actual
+	fi
+}
 
-	test $exp_ref = $(git rev-parse --symbolic-full-name HEAD) &&
-	test $exp_sha = $(git rev-parse --verify HEAD)
+test_dirty_unmergeable () {
+	test_expect_code 1 git diff --exit-code
 }
 
-test_dirty_unmergeable() {
-	! git diff --exit-code >/dev/null
+test_dirty_unmergeable_discards_changes () {
+	git diff --exit-code
 }
 
-setup_dirty_unmergeable() {
+setup_dirty_unmergeable () {
 	echo >>file1 change2
 }
 
-test_dirty_mergeable() {
-	! git diff --cached --exit-code >/dev/null
+test_dirty_mergeable () {
+	test_expect_code 1 git diff --cached --exit-code
+}
+
+test_dirty_mergeable_discards_changes () {
+	git diff --cached --exit-code
 }
 
-setup_dirty_mergeable() {
+setup_dirty_mergeable () {
 	echo >file2 file2 &&
 	git add file2
 }
@@ -82,7 +108,7 @@ test_expect_success 'checkout -b to a new branch, set to an explicit ref' '
 
 test_expect_success 'checkout -b to a new branch with unmergeable changes fails' '
 	setup_dirty_unmergeable &&
-	test_must_fail do_checkout branch2 $HEAD1 &&
+	do_checkout ! branch2 $HEAD1 &&
 	test_dirty_unmergeable
 '
 
@@ -93,7 +119,7 @@ test_expect_success 'checkout -f -b to a new branch with unmergeable changes dis
 
 	# still dirty and on branch1
 	do_checkout branch2 $HEAD1 "-f -b" &&
-	test_must_fail test_dirty_unmergeable
+	test_dirty_unmergeable_discards_changes
 '
 
 test_expect_success 'checkout -b to a new branch preserves mergeable changes' '
@@ -111,12 +137,12 @@ test_expect_success 'checkout -f -b to a new branch with mergeable changes disca
 	test_when_finished git reset --hard HEAD &&
 	setup_dirty_mergeable &&
 	do_checkout branch2 $HEAD1 "-f -b" &&
-	test_must_fail test_dirty_mergeable
+	test_dirty_mergeable_discards_changes
 '
 
 test_expect_success 'checkout -b to an existing branch fails' '
 	test_when_finished git reset --hard HEAD &&
-	test_must_fail do_checkout branch2 $HEAD2
+	do_checkout ! branch2 $HEAD2
 '
 
 test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
@@ -124,7 +150,7 @@ test_expect_success 'checkout -b to @{-1} fails with the right branch name' '
 	git checkout branch2 &&
 	echo  >expect "fatal: A branch named '\''branch1'\'' already exists." &&
 	test_must_fail git checkout -b @{-1} 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'checkout -B to an existing branch resets branch to HEAD' '
@@ -140,7 +166,8 @@ test_expect_success 'checkout -B to a merge base' '
 '
 
 test_expect_success 'checkout -B to an existing branch from detached HEAD resets branch to HEAD' '
-	git checkout $(git rev-parse --verify HEAD) &&
+	head=$(git rev-parse --verify HEAD) &&
+	git checkout "$head" &&
 
 	do_checkout branch2 "" -B
 '
@@ -155,14 +182,14 @@ test_expect_success 'checkout -B to an existing branch with unmergeable changes
 	git checkout branch1 &&
 
 	setup_dirty_unmergeable &&
-	test_must_fail do_checkout branch2 $HEAD1 -B &&
+	do_checkout ! branch2 $HEAD1 -B &&
 	test_dirty_unmergeable
 '
 
 test_expect_success 'checkout -f -B to an existing branch with unmergeable changes discards changes' '
 	# still dirty and on branch1
 	do_checkout branch2 $HEAD1 "-f -B" &&
-	test_must_fail test_dirty_unmergeable
+	test_dirty_unmergeable_discards_changes
 '
 
 test_expect_success 'checkout -B to an existing branch preserves mergeable changes' '
@@ -179,7 +206,7 @@ test_expect_success 'checkout -f -B to an existing branch with mergeable changes
 
 	setup_dirty_mergeable &&
 	do_checkout branch2 $HEAD1 "-f -B" &&
-	test_must_fail test_dirty_mergeable
+	test_dirty_mergeable_discards_changes
 '
 
 test_expect_success 'checkout -b <describe>' '
@@ -211,4 +238,36 @@ test_expect_success 'checkout -b after clone --no-checkout does a checkout of HE
 	test_path_is_file dest/a.t
 '
 
+test_expect_success 'checkout -b to a new branch preserves mergeable changes despite sparse-checkout' '
+	test_when_finished "
+		git reset --hard &&
+		git checkout branch1-scratch &&
+		test_might_fail git branch -D branch3 &&
+		git config core.sparseCheckout false &&
+		rm .git/info/sparse-checkout" &&
+
+	test_commit file2 &&
+
+	echo stuff >>file1 &&
+	echo file2 >.git/info/sparse-checkout &&
+	git config core.sparseCheckout true &&
+
+	CURHEAD=$(git rev-parse HEAD) &&
+	do_checkout branch3 $CURHEAD &&
+
+	echo file1 >expect &&
+	git diff --name-only >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'checkout -b rejects an invalid start point' '
+	test_must_fail git checkout -b branch4 file1 2>err &&
+	test_i18ngrep "is not a commit" err
+'
+
+test_expect_success 'checkout -b rejects an extra path argument' '
+	test_must_fail git checkout -b branch5 branch1 file1 2>err &&
+	test_i18ngrep "Cannot update paths and switch to branch" err
+'
+
 test_done
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index b748db9946..bc46713a43 100755
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='checkout into detached HEAD state'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_detached () {
@@ -22,7 +25,7 @@ check_no_orphan_warning() {
 }
 
 reset () {
-	git checkout master &&
+	git checkout main &&
 	check_not_detached
 }
 
@@ -85,7 +88,7 @@ test_expect_success 'checkout --detach errors out for non-commit' '
 
 test_expect_success 'checkout --detach errors out for extra argument' '
 	reset &&
-	git checkout master &&
+	git checkout main &&
 	test_must_fail git checkout --detach tag one.t &&
 	check_not_detached
 '
@@ -113,7 +116,7 @@ test_expect_success 'checkout warns on orphan commits' '
 	echo new content >orphan &&
 	git commit -a -m orphan2 &&
 	orphan2=$(git rev-parse HEAD) &&
-	git checkout master 2>stderr
+	git checkout main 2>stderr
 '
 
 test_expect_success 'checkout warns on orphan commits: output' '
@@ -132,7 +135,7 @@ test_expect_success 'checkout warns orphaning 1 of 2 commits: output' '
 test_expect_success 'checkout does not warn leaving ref tip' '
 	reset &&
 	git checkout --detach two &&
-	git checkout master 2>stderr
+	git checkout main 2>stderr
 '
 
 test_expect_success 'checkout does not warn leaving ref tip' '
@@ -142,7 +145,7 @@ test_expect_success 'checkout does not warn leaving ref tip' '
 test_expect_success 'checkout does not warn leaving reachable commit' '
 	reset &&
 	git checkout --detach HEAD^ &&
-	git checkout master 2>stderr
+	git checkout main 2>stderr
 '
 
 test_expect_success 'checkout does not warn leaving reachable commit' '
@@ -150,17 +153,17 @@ test_expect_success 'checkout does not warn leaving reachable commit' '
 '
 
 cat >expect <<'EOF'
-Your branch is behind 'master' by 1 commit, and can be fast-forwarded.
+Your branch is behind 'main' by 1 commit, and can be fast-forwarded.
   (use "git pull" to update your local branch)
 EOF
 test_expect_success 'tracking count is accurate after orphan check' '
 	reset &&
-	git branch child master^ &&
+	git branch child main^ &&
 	git config branch.child.remote . &&
-	git config branch.child.merge refs/heads/master &&
+	git config branch.child.merge refs/heads/main &&
 	git checkout child^ &&
 	git checkout child >stdout &&
-	test_i18ncmp expect stdout
+	test_cmp expect stdout
 '
 
 test_expect_success 'no advice given for explicit detached head state' '
@@ -189,9 +192,9 @@ test_expect_success 'no advice given for explicit detached head state' '
 # Detached HEAD tests for GIT_PRINT_SHA1_ELLIPSIS (new format)
 test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not asked to' "
 
-	commit=$(git rev-parse --short=12 master^) &&
-	commit2=$(git rev-parse --short=12 master~2) &&
-	commit3=$(git rev-parse --short=12 master~3) &&
+	commit=$(git rev-parse --short=12 main^) &&
+	commit2=$(git rev-parse --short=12 main~2) &&
+	commit3=$(git rev-parse --short=12 main~3) &&
 
 	# The first detach operation is more chatty than the following ones.
 	cat >1st_detach <<-EOF &&
@@ -234,15 +237,15 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
 	sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
 	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
 	check_detached &&
-	test_i18ncmp 1st_detach actual &&
+	test_cmp 1st_detach actual &&
 
 	GIT_PRINT_SHA1_ELLIPSIS="no" git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
 	check_detached &&
-	test_i18ncmp 2nd_detach actual &&
+	test_cmp 2nd_detach actual &&
 
 	GIT_PRINT_SHA1_ELLIPSIS= git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
 	check_detached &&
-	test_i18ncmp 3rd_detach actual &&
+	test_cmp 3rd_detach actual &&
 
 	sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
 
@@ -253,17 +256,17 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
 	# Make no mention of the env var at all
 	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
 	check_detached &&
-	test_i18ncmp 1st_detach actual &&
+	test_cmp 1st_detach actual &&
 
 	GIT_PRINT_SHA1_ELLIPSIS='nope' &&
 	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
 	check_detached &&
-	test_i18ncmp 2nd_detach actual &&
+	test_cmp 2nd_detach actual &&
 
 	GIT_PRINT_SHA1_ELLIPSIS=nein &&
 	git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
 	check_detached &&
-	test_i18ncmp 3rd_detach actual &&
+	test_cmp 3rd_detach actual &&
 
 	true
 "
@@ -271,9 +274,9 @@ test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not as
 # Detached HEAD tests for GIT_PRINT_SHA1_ELLIPSIS (old format)
 test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked to' "
 
-	commit=$(git rev-parse --short=12 master^) &&
-	commit2=$(git rev-parse --short=12 master~2) &&
-	commit3=$(git rev-parse --short=12 master~3) &&
+	commit=$(git rev-parse --short=12 main^) &&
+	commit2=$(git rev-parse --short=12 main~2) &&
+	commit3=$(git rev-parse --short=12 main~3) &&
 
 	# The first detach operation is more chatty than the following ones.
 	cat >1st_detach <<-EOF &&
@@ -316,15 +319,15 @@ test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked
 
 	GIT_PRINT_SHA1_ELLIPSIS=yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
 	check_detached &&
-	test_i18ncmp 1st_detach actual &&
+	test_cmp 1st_detach actual &&
 
 	GIT_PRINT_SHA1_ELLIPSIS=Yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
 	check_detached &&
-	test_i18ncmp 2nd_detach actual &&
+	test_cmp 2nd_detach actual &&
 
 	GIT_PRINT_SHA1_ELLIPSIS=YES git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
 	check_detached &&
-	test_i18ncmp 3rd_detach actual &&
+	test_cmp 3rd_detach actual &&
 
 	true
 "
diff --git a/t/t2021-checkout-overwrite.sh b/t/t2021-checkout-overwrite.sh
index c2ada7de37..70d69263e6 100755
--- a/t/t2021-checkout-overwrite.sh
+++ b/t/t2021-checkout-overwrite.sh
@@ -51,4 +51,16 @@ test_expect_success SYMLINKS 'the symlink remained' '
 	test -h a/b
 '
 
+test_expect_success SYMLINKS 'checkout -f must not follow symlinks when removing entries' '
+	git checkout -f start &&
+	mkdir dir &&
+	>dir/f &&
+	git add dir/f &&
+	git commit -m "add dir/f" &&
+	mv dir untracked &&
+	ln -s untracked dir &&
+	git checkout -f HEAD~ &&
+	test_path_is_file untracked/f
+'
+
 test_done
diff --git a/t/t2022-checkout-paths.sh b/t/t2022-checkout-paths.sh
index 6844afafc0..c49ba7f9bd 100755
--- a/t/t2022-checkout-paths.sh
+++ b/t/t2022-checkout-paths.sh
@@ -1,19 +1,22 @@
 #!/bin/sh
 
 test_description='checkout $tree -- $paths'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
 	mkdir dir &&
-	>dir/master &&
+	>dir/main &&
 	echo common >dir/common &&
-	git add dir/master dir/common &&
-	test_tick && git commit -m "master has dir/master" &&
+	git add dir/main dir/common &&
+	test_tick && git commit -m "main has dir/main" &&
 	git checkout -b next &&
-	git mv dir/master dir/next0 &&
+	git mv dir/main dir/next0 &&
 	echo next >dir/next1 &&
 	git add dir &&
-	test_tick && git commit -m "next has dir/next but not dir/master"
+	test_tick && git commit -m "next has dir/next but not dir/main"
 '
 
 test_expect_success 'checking out paths out of a tree does not clobber unrelated paths' '
@@ -26,11 +29,11 @@ test_expect_success 'checking out paths out of a tree does not clobber unrelated
 	echo untracked >expect.next2 &&
 	cat expect.next2 >dir/next2 &&
 
-	git checkout master dir &&
+	git checkout main dir &&
 
 	test_cmp expect.common dir/common &&
-	test_path_is_file dir/master &&
-	git diff --exit-code master dir/master &&
+	test_path_is_file dir/main &&
+	git diff --exit-code main dir/main &&
 
 	test_path_is_missing dir/next0 &&
 	test_cmp expect.next1 dir/next1 &&
@@ -52,11 +55,11 @@ test_expect_success 'do not touch unmerged entries matching $path but not in $tr
 	EOF
 	git update-index --index-info <expect.next0 &&
 
-	git checkout master dir &&
+	git checkout main dir &&
 
 	test_cmp expect.common dir/common &&
-	test_path_is_file dir/master &&
-	git diff --exit-code master dir/master &&
+	test_path_is_file dir/main &&
+	git diff --exit-code main dir/main &&
 	git ls-files -s dir/next0 >actual.next0 &&
 	test_cmp expect.next0 actual.next0
 '
diff --git a/t/t2023-checkout-m.sh b/t/t2023-checkout-m.sh
index fca3f85824..7b327b7544 100755
--- a/t/t2023-checkout-m.sh
+++ b/t/t2023-checkout-m.sh
@@ -4,21 +4,24 @@ test_description='checkout -m -- <conflicted path>
 
 Ensures that checkout -m on a resolved file restores the conflicted file'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
 	test_tick &&
 	test_commit both.txt both.txt initial &&
 	git branch topic &&
-	test_commit modified_in_master both.txt in_master &&
-	test_commit added_in_master each.txt in_master &&
+	test_commit modified_in_main both.txt in_main &&
+	test_commit added_in_main each.txt in_main &&
 	git checkout topic &&
 	test_commit modified_in_topic both.txt in_topic &&
 	test_commit added_in_topic each.txt in_topic
 '
 
-test_expect_success 'git merge master' '
-    test_must_fail git merge master
+test_expect_success 'git merge main' '
+    test_must_fail git merge main
 '
 
 clean_branchnames () {
@@ -61,7 +64,7 @@ test_expect_success 'force checkout a conflict file creates stage zero entry' '
 		git checkout topic &&
 		echo c >a &&
 		C_OBJ=$(git hash-object a) &&
-		git checkout -m master &&
+		git checkout -m main &&
 		test_cmp_rev :1:a $A_OBJ &&
 		test_cmp_rev :2:a $B_OBJ &&
 		test_cmp_rev :3:a $C_OBJ &&
diff --git a/t/t2024-checkout-dwim.sh b/t/t2024-checkout-dwim.sh
index fa0718c730..4a1c901456 100755
--- a/t/t2024-checkout-dwim.sh
+++ b/t/t2024-checkout-dwim.sh
@@ -29,24 +29,28 @@ status_uno_is_clean () {
 }
 
 test_expect_success 'setup' '
-	test_commit my_master &&
+	test_commit my_main &&
 	git init repo_a &&
 	(
 		cd repo_a &&
-		test_commit a_master &&
+		test_commit a_main &&
 		git checkout -b foo &&
 		test_commit a_foo &&
 		git checkout -b bar &&
-		test_commit a_bar
+		test_commit a_bar &&
+		git checkout -b ambiguous_branch_and_file &&
+		test_commit a_ambiguous_branch_and_file
 	) &&
 	git init repo_b &&
 	(
 		cd repo_b &&
-		test_commit b_master &&
+		test_commit b_main &&
 		git checkout -b foo &&
 		test_commit b_foo &&
 		git checkout -b baz &&
-		test_commit b_baz
+		test_commit b_baz &&
+		git checkout -b ambiguous_branch_and_file &&
+		test_commit b_ambiguous_branch_and_file
 	) &&
 	git remote add repo_a repo_a &&
 	git remote add repo_b repo_b &&
@@ -56,41 +60,61 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'checkout of non-existing branch fails' '
-	git checkout -B master &&
+	git checkout -B main &&
 	test_might_fail git branch -D xyzzy &&
 
 	test_must_fail git checkout xyzzy &&
 	status_uno_is_clean &&
 	test_must_fail git rev-parse --verify refs/heads/xyzzy &&
-	test_branch master
+	test_branch main
 '
 
 test_expect_success 'checkout of branch from multiple remotes fails #1' '
-	git checkout -B master &&
+	git checkout -B main &&
 	test_might_fail git branch -D foo &&
 
 	test_must_fail git checkout foo &&
 	status_uno_is_clean &&
 	test_must_fail git rev-parse --verify refs/heads/foo &&
-	test_branch master
+	test_branch main
+'
+
+test_expect_success 'when arg matches multiple remotes, do not fallback to interpreting as pathspec' '
+	# create a file with name matching remote branch name
+	git checkout -b t_ambiguous_branch_and_file &&
+	>ambiguous_branch_and_file &&
+	git add ambiguous_branch_and_file &&
+	git commit -m "ambiguous_branch_and_file" &&
+
+	# modify file to verify that it will not be touched by checkout
+	test_when_finished "git checkout -- ambiguous_branch_and_file" &&
+	echo "file contents" >ambiguous_branch_and_file &&
+	cp ambiguous_branch_and_file expect &&
+
+	test_must_fail git checkout ambiguous_branch_and_file 2>err &&
+
+	test_i18ngrep "matched multiple (2) remote tracking branches" err &&
+
+	# file must not be altered
+	test_cmp expect ambiguous_branch_and_file
 '
 
 test_expect_success 'checkout of branch from multiple remotes fails with advice' '
-	git checkout -B master &&
+	git checkout -B main &&
 	test_might_fail git branch -D foo &&
 	test_must_fail git checkout foo 2>stderr &&
-	test_branch master &&
+	test_branch main &&
 	status_uno_is_clean &&
 	test_i18ngrep "^hint: " stderr &&
 	test_must_fail git -c advice.checkoutAmbiguousRemoteBranchName=false \
 		checkout foo 2>stderr &&
-	test_branch master &&
+	test_branch main &&
 	status_uno_is_clean &&
 	test_i18ngrep ! "^hint: " stderr
 '
 
 test_expect_success PERL 'checkout -p with multiple remotes does not print advice' '
-	git checkout -B master &&
+	git checkout -B main &&
 	test_might_fail git branch -D foo &&
 
 	git checkout -p foo 2>stderr &&
@@ -99,7 +123,7 @@ test_expect_success PERL 'checkout -p with multiple remotes does not print advic
 '
 
 test_expect_success 'checkout of branch from multiple remotes succeeds with checkout.defaultRemote #1' '
-	git checkout -B master &&
+	git checkout -B main &&
 	status_uno_is_clean &&
 	test_might_fail git branch -D foo &&
 
@@ -111,7 +135,7 @@ test_expect_success 'checkout of branch from multiple remotes succeeds with chec
 '
 
 test_expect_success 'checkout of branch from a single remote succeeds #1' '
-	git checkout -B master &&
+	git checkout -B main &&
 	test_might_fail git branch -D bar &&
 
 	git checkout bar &&
@@ -122,7 +146,7 @@ test_expect_success 'checkout of branch from a single remote succeeds #1' '
 '
 
 test_expect_success 'checkout of branch from a single remote succeeds #2' '
-	git checkout -B master &&
+	git checkout -B main &&
 	test_might_fail git branch -D baz &&
 
 	git checkout baz &&
@@ -133,22 +157,33 @@ test_expect_success 'checkout of branch from a single remote succeeds #2' '
 '
 
 test_expect_success '--no-guess suppresses branch auto-vivification' '
-	git checkout -B master &&
+	git checkout -B main &&
 	status_uno_is_clean &&
 	test_might_fail git branch -D bar &&
 
 	test_must_fail git checkout --no-guess bar &&
 	test_must_fail git rev-parse --verify refs/heads/bar &&
-	test_branch master
+	test_branch main
+'
+
+test_expect_success 'checkout.guess = false suppresses branch auto-vivification' '
+	git checkout -B main &&
+	status_uno_is_clean &&
+	test_might_fail git branch -D bar &&
+
+	test_config checkout.guess false &&
+	test_must_fail git checkout bar &&
+	test_must_fail git rev-parse --verify refs/heads/bar &&
+	test_branch main
 '
 
 test_expect_success 'setup more remotes with unconventional refspecs' '
-	git checkout -B master &&
+	git checkout -B main &&
 	status_uno_is_clean &&
 	git init repo_c &&
 	(
 		cd repo_c &&
-		test_commit c_master &&
+		test_commit c_main &&
 		git checkout -b bar &&
 		test_commit c_bar &&
 		git checkout -b spam &&
@@ -157,7 +192,7 @@ test_expect_success 'setup more remotes with unconventional refspecs' '
 	git init repo_d &&
 	(
 		cd repo_d &&
-		test_commit d_master &&
+		test_commit d_main &&
 		git checkout -b baz &&
 		test_commit d_baz &&
 		git checkout -b eggs &&
@@ -173,29 +208,29 @@ test_expect_success 'setup more remotes with unconventional refspecs' '
 '
 
 test_expect_success 'checkout of branch from multiple remotes fails #2' '
-	git checkout -B master &&
+	git checkout -B main &&
 	status_uno_is_clean &&
 	test_might_fail git branch -D bar &&
 
 	test_must_fail git checkout bar &&
 	status_uno_is_clean &&
 	test_must_fail git rev-parse --verify refs/heads/bar &&
-	test_branch master
+	test_branch main
 '
 
 test_expect_success 'checkout of branch from multiple remotes fails #3' '
-	git checkout -B master &&
+	git checkout -B main &&
 	status_uno_is_clean &&
 	test_might_fail git branch -D baz &&
 
 	test_must_fail git checkout baz &&
 	status_uno_is_clean &&
 	test_must_fail git rev-parse --verify refs/heads/baz &&
-	test_branch master
+	test_branch main
 '
 
 test_expect_success 'checkout of branch from a single remote succeeds #3' '
-	git checkout -B master &&
+	git checkout -B main &&
 	status_uno_is_clean &&
 	test_might_fail git branch -D spam &&
 
@@ -207,7 +242,7 @@ test_expect_success 'checkout of branch from a single remote succeeds #3' '
 '
 
 test_expect_success 'checkout of branch from a single remote succeeds #4' '
-	git checkout -B master &&
+	git checkout -B main &&
 	status_uno_is_clean &&
 	test_might_fail git branch -D eggs &&
 
@@ -219,7 +254,7 @@ test_expect_success 'checkout of branch from a single remote succeeds #4' '
 '
 
 test_expect_success 'checkout of branch with a file having the same name fails' '
-	git checkout -B master &&
+	git checkout -B main &&
 	status_uno_is_clean &&
 	test_might_fail git branch -D spam &&
 
@@ -227,11 +262,11 @@ test_expect_success 'checkout of branch with a file having the same name fails'
 	test_must_fail git checkout spam &&
 	status_uno_is_clean &&
 	test_must_fail git rev-parse --verify refs/heads/spam &&
-	test_branch master
+	test_branch main
 '
 
 test_expect_success 'checkout of branch with a file in subdir having the same name fails' '
-	git checkout -B master &&
+	git checkout -B main &&
 	status_uno_is_clean &&
 	test_might_fail git branch -D spam &&
 
@@ -241,11 +276,11 @@ test_expect_success 'checkout of branch with a file in subdir having the same na
 	test_must_fail git -C sub checkout spam &&
 	status_uno_is_clean &&
 	test_must_fail git rev-parse --verify refs/heads/spam &&
-	test_branch master
+	test_branch main
 '
 
 test_expect_success 'checkout <branch> -- succeeds, even if a file with the same name exists' '
-	git checkout -B master &&
+	git checkout -B main &&
 	status_uno_is_clean &&
 	test_might_fail git branch -D spam &&
 
@@ -259,7 +294,7 @@ test_expect_success 'checkout <branch> -- succeeds, even if a file with the same
 
 test_expect_success 'loosely defined local base branch is reported correctly' '
 
-	git checkout master &&
+	git checkout main &&
 	status_uno_is_clean &&
 	git branch strict &&
 	git branch loose &&
@@ -267,8 +302,8 @@ test_expect_success 'loosely defined local base branch is reported correctly' '
 
 	test_config branch.strict.remote . &&
 	test_config branch.loose.remote . &&
-	test_config branch.strict.merge refs/heads/master &&
-	test_config branch.loose.merge master &&
+	test_config branch.strict.merge refs/heads/main &&
+	test_config branch.loose.merge main &&
 
 	git checkout strict | sed -e "s/strict/BRANCHNAME/g" >expect &&
 	status_uno_is_clean &&
diff --git a/t/t2025-checkout-no-overlay.sh b/t/t2025-checkout-no-overlay.sh
index 76330cb5ab..fa9e098706 100755
--- a/t/t2025-checkout-no-overlay.sh
+++ b/t/t2025-checkout-no-overlay.sh
@@ -44,4 +44,16 @@ test_expect_success '--no-overlay --theirs with D/F conflict deletes file' '
 	test_path_is_missing file1
 '
 
+test_expect_success 'wildcard pathspec matches file in subdirectory' '
+	git reset --hard &&
+	mkdir subdir &&
+	test_commit file3-1 subdir/file3 &&
+	test_commit file3-2 subdir/file3 &&
+
+	git checkout --no-overlay file3-1 "*file3" &&
+	echo file3-1 >expect &&
+	test_path_is_file subdir/file3 &&
+	test_cmp expect subdir/file3
+'
+
 test_done
diff --git a/t/t2026-checkout-pathspec-file.sh b/t/t2026-checkout-pathspec-file.sh
new file mode 100755
index 0000000000..43d31d7948
--- /dev/null
+++ b/t/t2026-checkout-pathspec-file.sh
@@ -0,0 +1,163 @@
+#!/bin/sh
+
+test_description='checkout --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	test_commit file0 &&
+
+	echo 1 >fileA.t &&
+	echo 1 >fileB.t &&
+	echo 1 >fileC.t &&
+	echo 1 >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 1" &&
+
+	echo 2 >fileA.t &&
+	echo 2 >fileB.t &&
+	echo 2 >fileC.t &&
+	echo 2 >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 2" &&
+
+	git tag checkpoint
+'
+
+restore_checkpoint () {
+	git reset --hard checkpoint
+}
+
+verify_expect () {
+	git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success '--pathspec-from-file from stdin' '
+	restore_checkpoint &&
+
+	echo fileA.t | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success '--pathspec-from-file from file' '
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git checkout --pathspec-from-file=list HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'NUL delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git checkout --pathspec-from-file=- --pathspec-file-nul HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'LF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'no trailing delimiter' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'CRLF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	M  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git checkout --pathspec-from-file=list HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes not compatible with --pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git checkout --pathspec-from-file=list --pathspec-file-nul HEAD^1
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git checkout --pathspec-from-file=- HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	M  fileB.t
+	M  fileC.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	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_must_fail git checkout --pathspec-from-file=list --patch 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --patch" 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_must_fail git checkout --pathspec-file-nul 2>err &&
+	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err
+'
+
+test_done
diff --git a/t/t2027-checkout-track.sh b/t/t2027-checkout-track.sh
new file mode 100755
index 0000000000..4453741b96
--- /dev/null
+++ b/t/t2027-checkout-track.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+test_description='tests for git branch --track'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	test_commit one &&
+	test_commit two
+'
+
+test_expect_success 'checkout --track -b creates a new tracking branch' '
+	git checkout --track -b branch1 main &&
+	test $(git rev-parse --abbrev-ref HEAD) = branch1 &&
+	test $(git config --get branch.branch1.remote) = . &&
+	test $(git config --get branch.branch1.merge) = refs/heads/main
+'
+
+test_expect_success 'checkout --track -b rejects an extra path argument' '
+	test_must_fail git checkout --track -b branch2 main one.t 2>err &&
+	test_i18ngrep "cannot be used with updating paths" err
+'
+
+test_done
diff --git a/t/t2030-unresolve-info.sh b/t/t2030-unresolve-info.sh
index 309199bca2..f691e6d903 100755
--- a/t/t2030-unresolve-info.sh
+++ b/t/t2030-unresolve-info.sh
@@ -2,6 +2,9 @@
 
 test_description='undoing resolution'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_resolve_undo () {
@@ -59,7 +62,7 @@ test_expect_success setup '
 	test_commit fourth fi/le fourth &&
 	git checkout add-add &&
 	test_commit fifth add-differently &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'add records switch clears' '
@@ -176,15 +179,14 @@ test_expect_success 'rerere and rerere forget (subdirectory)' '
 
 test_expect_success 'rerere forget (binary)' '
 	git checkout -f side &&
-	printf "a\0c" >binary &&
-	git commit -a -m binary &&
+	test_commit --printf binary binary "a\0c" &&
 	test_must_fail git merge second &&
 	git rerere forget binary
 '
 
 test_expect_success 'rerere forget (add-add conflict)' '
-	git checkout -f master &&
-	echo master >add-differently &&
+	git checkout -f main &&
+	echo main >add-differently &&
 	git add add-differently &&
 	git commit -m "add differently" &&
 	test_must_fail git merge fifth &&
diff --git a/t/t2060-switch.sh b/t/t2060-switch.sh
index f9efa29dfb..9bc6a3aa5c 100755
--- a/t/t2060-switch.sh
+++ b/t/t2060-switch.sh
@@ -2,6 +2,9 @@
 
 test_description='switch basic functionality'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -23,41 +26,41 @@ test_expect_success 'switch branch' '
 '
 
 test_expect_success 'switch and detach' '
-	test_when_finished git switch master &&
-	test_must_fail git switch master^{commit} &&
-	git switch --detach master^{commit} &&
+	test_when_finished git switch main &&
+	test_must_fail git switch main^{commit} &&
+	git switch --detach main^{commit} &&
 	test_must_fail git symbolic-ref HEAD
 '
 
 test_expect_success 'switch and detach current branch' '
-	test_when_finished git switch master &&
-	git switch master &&
+	test_when_finished git switch main &&
+	git switch main &&
 	git switch --detach &&
 	test_must_fail git symbolic-ref HEAD
 '
 
 test_expect_success 'switch and create branch' '
-	test_when_finished git switch master &&
-	git switch -c temp master^ &&
-	test_cmp_rev master^ refs/heads/temp &&
+	test_when_finished git switch main &&
+	git switch -c temp main^ &&
+	test_cmp_rev main^ refs/heads/temp &&
 	echo refs/heads/temp >expected-branch &&
 	git symbolic-ref HEAD >actual-branch &&
 	test_cmp expected-branch actual-branch
 '
 
 test_expect_success 'force create branch from HEAD' '
-	test_when_finished git switch master &&
-	git switch --detach master &&
+	test_when_finished git switch main &&
+	git switch --detach main &&
 	test_must_fail git switch -c temp &&
 	git switch -C temp &&
-	test_cmp_rev master refs/heads/temp &&
+	test_cmp_rev main refs/heads/temp &&
 	echo refs/heads/temp >expected-branch &&
 	git symbolic-ref HEAD >actual-branch &&
 	test_cmp expected-branch actual-branch
 '
 
 test_expect_success 'new orphan branch from empty' '
-	test_when_finished git switch master &&
+	test_when_finished git switch main &&
 	test_must_fail git switch --orphan new-orphan HEAD &&
 	git switch --orphan new-orphan &&
 	test_commit orphan &&
@@ -68,8 +71,16 @@ test_expect_success 'new orphan branch from empty' '
 	test_cmp expected tracked-files
 '
 
+test_expect_success 'orphan branch works with --discard-changes' '
+	test_when_finished git switch main &&
+	echo foo >foo.txt &&
+	git switch --discard-changes --orphan new-orphan2 &&
+	git ls-files >tracked-files &&
+	test_must_be_empty tracked-files
+'
+
 test_expect_success 'switching ignores file of same branch name' '
-	test_when_finished git switch master &&
+	test_when_finished git switch main &&
 	: >first-branch &&
 	git switch first-branch &&
 	echo refs/heads/first-branch >expected &&
@@ -77,9 +88,12 @@ test_expect_success 'switching ignores file of same branch name' '
 	test_cmp expected actual
 '
 
-test_expect_success 'guess and create branch ' '
-	test_when_finished git switch master &&
+test_expect_success 'guess and create branch' '
+	test_when_finished git switch main &&
 	test_must_fail git switch --no-guess foo &&
+	test_config checkout.guess false &&
+	test_must_fail git switch foo &&
+	test_config checkout.guess true &&
 	git switch foo &&
 	echo refs/heads/foo >expected &&
 	git symbolic-ref HEAD >actual &&
diff --git a/t/t2070-restore.sh b/t/t2070-restore.sh
index 21c3f84459..7c43ddf1d9 100755
--- a/t/t2070-restore.sh
+++ b/t/t2070-restore.sh
@@ -2,6 +2,9 @@
 
 test_description='restore basic functionality'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -15,7 +18,7 @@ test_expect_success 'setup' '
 	echo ignored >ignored &&
 	echo /ignored >.gitignore &&
 	git add one two .gitignore &&
-	git update-ref refs/heads/one master
+	git update-ref refs/heads/one main
 '
 
 test_expect_success 'restore without pathspec is not ok' '
@@ -69,6 +72,17 @@ test_expect_success 'restore --staged uses HEAD as source' '
 	test_cmp expected actual
 '
 
+test_expect_success 'restore --worktree --staged uses HEAD as source' '
+	test_when_finished git reset --hard &&
+	git show HEAD:./first.t >expected &&
+	echo dirty >>first.t &&
+	git add first.t &&
+	git restore --worktree --staged first.t &&
+	git show :./first.t >actual &&
+	test_cmp expected actual &&
+	test_cmp expected first.t
+'
+
 test_expect_success 'restore --ignore-unmerged ignores unmerged entries' '
 	git init unmerged &&
 	(
@@ -80,7 +94,7 @@ test_expect_success 'restore --ignore-unmerged ignores unmerged entries' '
 		git switch -c first &&
 		echo first >unmerged &&
 		git commit -am first &&
-		git switch -c second master &&
+		git switch -c second main &&
 		echo second >unmerged &&
 		git commit -am second &&
 		test_must_fail git merge first &&
@@ -106,4 +120,21 @@ test_expect_success 'restore --staged adds deleted intent-to-add file back to in
 	git diff --cached --exit-code
 '
 
+test_expect_success 'restore --staged invalidates cache tree for deletions' '
+	test_when_finished git reset --hard &&
+	>new1 &&
+	>new2 &&
+	git add new1 new2 &&
+
+	# It is important to commit and then reset here, so that the index
+	# contains a valid cache-tree for the "both" tree.
+	git commit -m both &&
+	git reset --soft HEAD^ &&
+
+	git restore --staged new1 &&
+	git commit -m "just new2" &&
+	git rev-parse HEAD:new2 &&
+	test_must_fail git rev-parse HEAD:new1
+'
+
 test_done
diff --git a/t/t2071-restore-patch.sh b/t/t2071-restore-patch.sh
index 98b2476e7c..b5c5c0ff7e 100755
--- a/t/t2071-restore-patch.sh
+++ b/t/t2071-restore-patch.sh
@@ -60,6 +60,14 @@ test_expect_success PERL 'git restore -p --source=HEAD^' '
 	verify_state dir/foo parent index
 '
 
+test_expect_success PERL 'git restore -p --source=HEAD^...' '
+	set_state dir/foo work index &&
+	# the third n is to get out in case it mistakenly does not apply
+	test_write_lines n y n | git restore -p --source=HEAD^... &&
+	verify_saved_state bar &&
+	verify_state dir/foo parent index
+'
+
 test_expect_success PERL 'git restore -p handles deletion' '
 	set_state dir/foo work index &&
 	rm dir/foo &&
diff --git a/t/t2072-restore-pathspec-file.sh b/t/t2072-restore-pathspec-file.sh
new file mode 100755
index 0000000000..b48345bf95
--- /dev/null
+++ b/t/t2072-restore-pathspec-file.sh
@@ -0,0 +1,177 @@
+#!/bin/sh
+
+test_description='restore --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	test_commit file0 &&
+
+	mkdir dir1 &&
+	echo 1 >dir1/file &&
+	echo 1 >fileA.t &&
+	echo 1 >fileB.t &&
+	echo 1 >fileC.t &&
+	echo 1 >fileD.t &&
+	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 1" &&
+
+	echo 2 >dir1/file &&
+	echo 2 >fileA.t &&
+	echo 2 >fileB.t &&
+	echo 2 >fileC.t &&
+	echo 2 >fileD.t &&
+	git add dir1 fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files 2" &&
+
+	git tag checkpoint
+'
+
+restore_checkpoint () {
+	git reset --hard checkpoint
+}
+
+verify_expect () {
+	git status --porcelain --untracked-files=no -- dir1 fileA.t fileB.t fileC.t fileD.t >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success '--pathspec-from-file from stdin' '
+	restore_checkpoint &&
+
+	echo fileA.t | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success '--pathspec-from-file from file' '
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git restore --pathspec-from-file=list --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'NUL delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git restore --pathspec-from-file=- --pathspec-file-nul --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'LF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'no trailing delimiter' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'CRLF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	 M fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git restore --pathspec-from-file=list --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes not compatible with --pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git restore --pathspec-from-file=list --pathspec-file-nul --source=HEAD^1
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+
+	cat >expect <<-\EOF &&
+	 M fileB.t
+	 M fileC.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>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_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_must_fail git restore --pathspec-file-nul --source=HEAD^1 2>err &&
+	test_i18ngrep -e "--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
+'
+
+test_expect_success 'wildcard pathspec matches file in subdirectory' '
+	restore_checkpoint &&
+
+	echo "*file" | git restore --pathspec-from-file=- --source=HEAD^1 &&
+	cat >expect <<-\EOF &&
+	 M dir1/file
+	EOF
+	verify_expect
+'
+
+test_done
diff --git a/t/t2080-parallel-checkout-basics.sh b/t/t2080-parallel-checkout-basics.sh
new file mode 100755
index 0000000000..3e0f8c675f
--- /dev/null
+++ b/t/t2080-parallel-checkout-basics.sh
@@ -0,0 +1,229 @@
+#!/bin/sh
+
+test_description='parallel-checkout basics
+
+Ensure that parallel-checkout basically works on clone and checkout, spawning
+the required number of workers and correctly populating both the index and the
+working tree.
+'
+
+TEST_NO_CREATE_REPO=1
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-parallel-checkout.sh"
+
+# Test parallel-checkout with a branch switch containing a variety of file
+# creations, deletions, and modifications, involving different entry types.
+# The branches B1 and B2 have the following paths:
+#
+#      B1                 B2
+#  a/a (file)         a   (file)
+#  b   (file)         b/b (file)
+#
+#  c/c (file)         c   (symlink)
+#  d   (symlink)      d/d (file)
+#
+#  e/e (file)         e   (submodule)
+#  f   (submodule)    f/f (file)
+#
+#  g   (submodule)    g   (symlink)
+#  h   (symlink)      h   (submodule)
+#
+# Additionally, the following paths are present on both branches, but with
+# different contents:
+#
+#  i   (file)         i   (file)
+#  j   (symlink)      j   (symlink)
+#  k   (submodule)    k   (submodule)
+#
+# And the following paths are only present in one of the branches:
+#
+#  l/l (file)         -
+#  -                  m/m (file)
+#
+test_expect_success 'setup repo for checkout with various types of changes' '
+	git init sub &&
+	(
+		cd sub &&
+		git checkout -b B2 &&
+		echo B2 >file &&
+		git add file &&
+		git commit -m file &&
+
+		git checkout -b B1 &&
+		echo B1 >file &&
+		git add file &&
+		git commit -m file
+	) &&
+
+	git init various &&
+	(
+		cd various &&
+
+		git checkout -b B1 &&
+		mkdir a c e &&
+		echo a/a >a/a &&
+		echo b >b &&
+		echo c/c >c/c &&
+		test_ln_s_add c d &&
+		echo e/e >e/e &&
+		git submodule add ../sub f &&
+		git submodule add ../sub g &&
+		test_ln_s_add c h &&
+
+		echo "B1 i" >i &&
+		test_ln_s_add c j &&
+		git submodule add -b B1 ../sub k &&
+		mkdir l &&
+		echo l/l >l/l &&
+
+		git add . &&
+		git commit -m B1 &&
+
+		git checkout -b B2 &&
+		git rm -rf :^.gitmodules :^k &&
+		mkdir b d f &&
+		echo a >a &&
+		echo b/b >b/b &&
+		test_ln_s_add b c &&
+		echo d/d >d/d &&
+		git submodule add ../sub e &&
+		echo f/f >f/f &&
+		test_ln_s_add b g &&
+		git submodule add ../sub h &&
+
+		echo "B2 i" >i &&
+		test_ln_s_add b j &&
+		git -C k checkout B2 &&
+		mkdir m &&
+		echo m/m >m/m &&
+
+		git add . &&
+		git commit -m B2 &&
+
+		git checkout --recurse-submodules B1
+	)
+'
+
+for mode in sequential parallel sequential-fallback
+do
+	case $mode in
+	sequential)          workers=1 threshold=0 expected_workers=0 ;;
+	parallel)            workers=2 threshold=0 expected_workers=2 ;;
+	sequential-fallback) workers=2 threshold=100 expected_workers=0 ;;
+	esac
+
+	test_expect_success "$mode checkout" '
+		repo=various_$mode &&
+		cp -R -P various $repo &&
+
+		# The just copied files have more recent timestamps than their
+		# associated index entries. So refresh the cached timestamps
+		# to avoid an "entry not up-to-date" error from `git checkout`.
+		# We only have to do this for the submodules as `git checkout`
+		# will already refresh the superproject index before performing
+		# the up-to-date check.
+		#
+		git -C $repo submodule foreach "git update-index --refresh" &&
+
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git -C $repo checkout --recurse-submodules B2 &&
+		verify_checkout $repo
+	'
+done
+
+for mode in parallel sequential-fallback
+do
+	case $mode in
+	parallel)            workers=2 threshold=0 expected_workers=2 ;;
+	sequential-fallback) workers=2 threshold=100 expected_workers=0 ;;
+	esac
+
+	test_expect_success "$mode checkout on clone" '
+		repo=various_${mode}_clone &&
+		set_checkout_config $workers $threshold &&
+		test_checkout_workers $expected_workers \
+			git clone --recurse-submodules --branch B2 various $repo &&
+		verify_checkout $repo
+	'
+done
+
+# Just to be paranoid, actually compare the working trees' contents directly.
+test_expect_success 'compare the working trees' '
+	rm -rf various_*/.git &&
+	rm -rf various_*/*/.git &&
+
+	# We use `git diff` instead of `diff -r` because the latter would
+	# follow symlinks, and not all `diff` implementations support the
+	# `--no-dereference` option.
+	#
+	git diff --no-index various_sequential various_parallel &&
+	git diff --no-index various_sequential various_parallel_clone &&
+	git diff --no-index various_sequential various_sequential-fallback &&
+	git diff --no-index various_sequential various_sequential-fallback_clone
+'
+
+# Currently, each submodule is checked out in a separated child process, but
+# these subprocesses must also be able to use parallel checkout workers to
+# write the submodules' entries.
+test_expect_success 'submodules can use parallel checkout' '
+	set_checkout_config 2 0 &&
+	git init super &&
+	(
+		cd super &&
+		git init sub &&
+		test_commit -C sub A &&
+		test_commit -C sub B &&
+		git submodule add ./sub &&
+		git commit -m sub &&
+		rm sub/* &&
+		test_checkout_workers 2 git checkout --recurse-submodules .
+	)
+'
+
+test_expect_success 'parallel checkout respects --[no]-force' '
+	set_checkout_config 2 0 &&
+	git init dirty &&
+	(
+		cd dirty &&
+		mkdir D &&
+		test_commit D/F &&
+		test_commit F &&
+
+		rm -rf D &&
+		echo changed >D &&
+		echo changed >F.t &&
+
+		# We expect 0 workers because there is nothing to be done
+		test_checkout_workers 0 git checkout HEAD &&
+		test_path_is_file D &&
+		grep changed D &&
+		grep changed F.t &&
+
+		test_checkout_workers 2 git checkout --force HEAD &&
+		test_path_is_dir D &&
+		grep D/F D/F.t &&
+		grep F F.t
+	)
+'
+
+test_expect_success SYMLINKS 'parallel checkout checks for symlinks in leading dirs' '
+	set_checkout_config 2 0 &&
+	git init symlinks &&
+	(
+		cd symlinks &&
+		mkdir D untracked &&
+		# Commit 2 files to have enough work for 2 parallel workers
+		test_commit D/A &&
+		test_commit D/B &&
+		rm -rf D &&
+		ln -s untracked D &&
+
+		test_checkout_workers 2 git checkout --force HEAD &&
+		! test -h D &&
+		grep D/A D/A.t &&
+		grep D/B D/B.t
+	)
+'
+
+test_done
diff --git a/t/t2081-parallel-checkout-collisions.sh b/t/t2081-parallel-checkout-collisions.sh
new file mode 100755
index 0000000000..f6fcfc0c1e
--- /dev/null
+++ b/t/t2081-parallel-checkout-collisions.sh
@@ -0,0 +1,162 @@
+#!/bin/sh
+
+test_description="path collisions during parallel checkout
+
+Parallel checkout must detect path collisions to:
+
+1) Avoid racily writing to different paths that represent the same file on disk.
+2) Report the colliding entries on clone.
+
+The tests in this file exercise parallel checkout's collision detection code in
+both these mechanics.
+"
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-parallel-checkout.sh"
+
+TEST_ROOT="$PWD"
+
+test_expect_success CASE_INSENSITIVE_FS 'setup' '
+	empty_oid=$(git hash-object -w --stdin </dev/null) &&
+	cat >objs <<-EOF &&
+	100644 $empty_oid	FILE_X
+	100644 $empty_oid	FILE_x
+	100644 $empty_oid	file_X
+	100644 $empty_oid	file_x
+	EOF
+	git update-index --index-info <objs &&
+	git commit -m "colliding files" &&
+	git tag basename_collision &&
+
+	write_script "$TEST_ROOT"/logger_script <<-\EOF
+	echo "$@" >>filter.log
+	EOF
+'
+
+test_workers_in_event_trace ()
+{
+	test $1 -eq $(grep ".event.:.child_start..*checkout--worker" $2 | wc -l)
+}
+
+test_expect_success CASE_INSENSITIVE_FS 'worker detects basename collision' '
+	GIT_TRACE2_EVENT="$(pwd)/trace" git \
+		-c checkout.workers=2 -c checkout.thresholdForParallelism=0 \
+		checkout . &&
+
+	test_workers_in_event_trace 2 trace &&
+	collisions=$(grep -i "category.:.pcheckout.,.key.:.collision/basename.,.value.:.file_x.}" trace | wc -l) &&
+	test $collisions -eq 3
+'
+
+test_expect_success CASE_INSENSITIVE_FS 'worker detects dirname collision' '
+	test_config filter.logger.smudge "\"$TEST_ROOT/logger_script\" %f" &&
+	empty_oid=$(git hash-object -w --stdin </dev/null) &&
+
+	# By setting a filter command to "a", we make it ineligible for parallel
+	# checkout, and thus it is checked out *first*. This way we can ensure
+	# that "A/B" and "A/C" will both collide with the regular file "a".
+	#
+	attr_oid=$(echo "a filter=logger" | git hash-object -w --stdin) &&
+
+	cat >objs <<-EOF &&
+	100644 $empty_oid	A/B
+	100644 $empty_oid	A/C
+	100644 $empty_oid	a
+	100644 $attr_oid	.gitattributes
+	EOF
+	git rm -rf . &&
+	git update-index --index-info <objs &&
+
+	rm -f trace filter.log &&
+	GIT_TRACE2_EVENT="$(pwd)/trace" git \
+		-c checkout.workers=2 -c checkout.thresholdForParallelism=0 \
+		checkout . &&
+
+	# Check that "a" (and only "a") was filtered
+	echo a >expected.log &&
+	test_cmp filter.log expected.log &&
+
+	# Check that it used the right number of workers and detected the collisions
+	test_workers_in_event_trace 2 trace &&
+	grep "category.:.pcheckout.,.key.:.collision/dirname.,.value.:.A/B.}" trace &&
+	grep "category.:.pcheckout.,.key.:.collision/dirname.,.value.:.A/C.}" trace
+'
+
+test_expect_success SYMLINKS,CASE_INSENSITIVE_FS 'do not follow symlinks colliding with leading dir' '
+	empty_oid=$(git hash-object -w --stdin </dev/null) &&
+	symlink_oid=$(echo "./e" | git hash-object -w --stdin) &&
+	mkdir e &&
+
+	cat >objs <<-EOF &&
+	120000 $symlink_oid	D
+	100644 $empty_oid	d/x
+	100644 $empty_oid	e/y
+	EOF
+	git rm -rf . &&
+	git update-index --index-info <objs &&
+
+	set_checkout_config 2 0 &&
+	test_checkout_workers 2 git checkout . &&
+	test_path_is_dir e &&
+	test_path_is_missing e/x
+'
+
+# The two following tests check that parallel checkout correctly reports
+# colliding entries on clone. The sequential code detects a collision by
+# calling lstat() before trying to open(O_CREAT) a file. (Note that this only
+# works for clone.) Then, to find the pair of a colliding item k, it searches
+# cache_entry[0, k-1]. This is not sufficient in parallel checkout because:
+#
+# - A colliding file may be created between the lstat() and open() calls;
+# - A colliding entry might appear in the second half of the cache_entry array.
+#
+test_expect_success CASE_INSENSITIVE_FS 'collision report on clone (w/ racy file creation)' '
+	git reset --hard basename_collision &&
+	set_checkout_config 2 0 &&
+	test_checkout_workers 2 git clone . clone-repo 2>stderr &&
+
+	grep FILE_X stderr &&
+	grep FILE_x stderr &&
+	grep file_X stderr &&
+	grep file_x stderr &&
+	grep "the following paths have collided" stderr
+'
+
+# This test ensures that the collision report code is correctly looking for
+# colliding peers in the second half of the cache_entry array. This is done by
+# defining a smudge command for the *last* array entry, which makes it
+# non-eligible for parallel-checkout. Thus, it is checked out *first*, before
+# spawning the workers.
+#
+# Note: this test doesn't work on Windows because, on this system, the
+# collision report code uses strcmp() to find the colliding pairs when
+# core.ignoreCase is false. And we need this setting for this test so that only
+# 'file_x' matches the pattern of the filter attribute. But the test works on
+# OSX, where the colliding pairs are found using inode.
+#
+test_expect_success CASE_INSENSITIVE_FS,!MINGW,!CYGWIN \
+	'collision report on clone (w/ colliding peer after the detected entry)' '
+
+	test_config_global filter.logger.smudge "\"$TEST_ROOT/logger_script\" %f" &&
+	git reset --hard basename_collision &&
+	echo "file_x filter=logger" >.gitattributes &&
+	git add .gitattributes &&
+	git commit -m "filter for file_x" &&
+
+	rm -rf clone-repo &&
+	set_checkout_config 2 0 &&
+	test_checkout_workers 2 \
+		git -c core.ignoreCase=false clone . clone-repo 2>stderr &&
+
+	grep FILE_X stderr &&
+	grep FILE_x stderr &&
+	grep file_X stderr &&
+	grep file_x stderr &&
+	grep "the following paths have collided" stderr &&
+
+	# Check that only "file_x" was filtered
+	echo file_x >expected.log &&
+	test_cmp clone-repo/filter.log expected.log
+'
+
+test_done
diff --git a/t/t2082-parallel-checkout-attributes.sh b/t/t2082-parallel-checkout-attributes.sh
new file mode 100755
index 0000000000..2525457961
--- /dev/null
+++ b/t/t2082-parallel-checkout-attributes.sh
@@ -0,0 +1,194 @@
+#!/bin/sh
+
+test_description='parallel-checkout: attributes
+
+Verify that parallel-checkout correctly creates files that require
+conversions, as specified in .gitattributes. The main point here is
+to check that the conv_attr data is correctly sent to the workers
+and that it contains sufficient information to smudge files
+properly (without access to the index or attribute stack).
+'
+
+TEST_NO_CREATE_REPO=1
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-parallel-checkout.sh"
+. "$TEST_DIRECTORY/lib-encoding.sh"
+
+test_expect_success 'parallel-checkout with ident' '
+	set_checkout_config 2 0 &&
+	git init ident &&
+	(
+		cd ident &&
+		echo "A ident" >.gitattributes &&
+		echo "\$Id\$" >A &&
+		echo "\$Id\$" >B &&
+		git add -A &&
+		git commit -m id &&
+
+		rm A B &&
+		test_checkout_workers 2 git reset --hard &&
+		hexsz=$(test_oid hexsz) &&
+		grep -E "\\\$Id: [0-9a-f]{$hexsz} \\\$" A &&
+		grep "\\\$Id\\\$" B
+	)
+'
+
+test_expect_success 'parallel-checkout with re-encoding' '
+	set_checkout_config 2 0 &&
+	git init encoding &&
+	(
+		cd encoding &&
+		echo text >utf8-text &&
+		write_utf16 <utf8-text >utf16-text &&
+
+		echo "A working-tree-encoding=UTF-16" >.gitattributes &&
+		cp utf16-text A &&
+		cp utf8-text B &&
+		git add A B .gitattributes &&
+		git commit -m encoding &&
+
+		# Check that A is stored in UTF-8
+		git cat-file -p :A >A.internal &&
+		test_cmp_bin utf8-text A.internal &&
+
+		rm A B &&
+		test_checkout_workers 2 git checkout A B &&
+
+		# Check that A (and only A) is re-encoded during checkout
+		test_cmp_bin utf16-text A &&
+		test_cmp_bin utf8-text B
+	)
+'
+
+test_expect_success 'parallel-checkout with eol conversions' '
+	set_checkout_config 2 0 &&
+	git init eol &&
+	(
+		cd eol &&
+		printf "multi\r\nline\r\ntext" >crlf-text &&
+		printf "multi\nline\ntext" >lf-text &&
+
+		git config core.autocrlf false &&
+		echo "A eol=crlf" >.gitattributes &&
+		cp crlf-text A &&
+		cp lf-text B &&
+		git add A B .gitattributes &&
+		git commit -m eol &&
+
+		# Check that A is stored with LF format
+		git cat-file -p :A >A.internal &&
+		test_cmp_bin lf-text A.internal &&
+
+		rm A B &&
+		test_checkout_workers 2 git checkout A B &&
+
+		# Check that A (and only A) is converted to CRLF during checkout
+		test_cmp_bin crlf-text A &&
+		test_cmp_bin lf-text B
+	)
+'
+
+# Entries that require an external filter are not eligible for parallel
+# checkout. Check that both the parallel-eligible and non-eligible entries are
+# properly writen in a single checkout operation.
+#
+test_expect_success 'parallel-checkout and external filter' '
+	set_checkout_config 2 0 &&
+	git init filter &&
+	(
+		cd filter &&
+		write_script <<-\EOF rot13.sh &&
+		tr \
+		  "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+		  "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM"
+		EOF
+
+		git config filter.rot13.clean "\"$(pwd)/rot13.sh\"" &&
+		git config filter.rot13.smudge "\"$(pwd)/rot13.sh\"" &&
+		git config filter.rot13.required true &&
+
+		echo abcd >original &&
+		echo nopq >rot13 &&
+
+		echo "A filter=rot13" >.gitattributes &&
+		cp original A &&
+		cp original B &&
+		cp original C &&
+		git add A B C .gitattributes &&
+		git commit -m filter &&
+
+		# Check that A (and only A) was cleaned
+		git cat-file -p :A >A.internal &&
+		test_cmp rot13 A.internal &&
+		git cat-file -p :B >B.internal &&
+		test_cmp original B.internal &&
+		git cat-file -p :C >C.internal &&
+		test_cmp original C.internal &&
+
+		rm A B C *.internal &&
+		test_checkout_workers 2 git checkout A B C &&
+
+		# Check that A (and only A) was smudged during checkout
+		test_cmp original A &&
+		test_cmp original B &&
+		test_cmp original C
+	)
+'
+
+# The delayed queue is independent from the parallel queue, and they should be
+# able to work together in the same checkout process.
+#
+test_expect_success PERL 'parallel-checkout and delayed checkout' '
+	write_script rot13-filter.pl "$PERL_PATH" \
+		<"$TEST_DIRECTORY"/t0021/rot13-filter.pl &&
+
+	test_config_global filter.delay.process \
+		"\"$(pwd)/rot13-filter.pl\" --always-delay \"$(pwd)/delayed.log\" clean smudge delay" &&
+	test_config_global filter.delay.required true &&
+
+	echo "abcd" >original &&
+	echo "nopq" >rot13 &&
+
+	git init delayed &&
+	(
+		cd delayed &&
+		echo "*.d filter=delay" >.gitattributes &&
+		cp ../original W.d &&
+		cp ../original X.d &&
+		cp ../original Y &&
+		cp ../original Z &&
+		git add -A &&
+		git commit -m delayed &&
+
+		# Check that *.d files were cleaned
+		git cat-file -p :W.d >W.d.internal &&
+		test_cmp W.d.internal ../rot13 &&
+		git cat-file -p :X.d >X.d.internal &&
+		test_cmp X.d.internal ../rot13 &&
+		git cat-file -p :Y >Y.internal &&
+		test_cmp Y.internal ../original &&
+		git cat-file -p :Z >Z.internal &&
+		test_cmp Z.internal ../original &&
+
+		rm *
+	) &&
+
+	set_checkout_config 2 0 &&
+	test_checkout_workers 2 git -C delayed checkout -f &&
+	verify_checkout delayed &&
+
+	# Check that the *.d files got to the delay queue and were filtered
+	grep "smudge W.d .* \[DELAYED\]" delayed.log &&
+	grep "smudge X.d .* \[DELAYED\]" delayed.log &&
+	test_cmp delayed/W.d original &&
+	test_cmp delayed/X.d original &&
+
+	# Check that the parallel-eligible entries went to the right queue and
+	# were not filtered
+	! grep "smudge Y .* \[DELAYED\]" delayed.log &&
+	! grep "smudge Z .* \[DELAYED\]" delayed.log &&
+	test_cmp delayed/Y original &&
+	test_cmp delayed/Z original
+'
+
+test_done
diff --git a/t/t2104-update-index-skip-worktree.sh b/t/t2104-update-index-skip-worktree.sh
index 7e2e7dd4ae..30666fc70d 100755
--- a/t/t2104-update-index-skip-worktree.sh
+++ b/t/t2104-update-index-skip-worktree.sh
@@ -9,6 +9,11 @@ test_description='skip-worktree bit test'
 
 sane_unset GIT_TEST_SPLIT_INDEX
 
+test_set_index_version () {
+    GIT_INDEX_VERSION="$1"
+    export GIT_INDEX_VERSION
+}
+
 test_set_index_version 3
 
 cat >expect.full <<EOF
diff --git a/t/t2106-update-index-assume-unchanged.sh b/t/t2106-update-index-assume-unchanged.sh
index 99d858c6b7..2d450daf5c 100755
--- a/t/t2106-update-index-assume-unchanged.sh
+++ b/t/t2106-update-index-assume-unchanged.sh
@@ -5,20 +5,23 @@ test_description='git update-index --assume-unchanged test.
 
 . ./test-lib.sh
 
-test_expect_success 'setup' \
-	': >file &&
-	 git add file &&
-	 git commit -m initial &&
-	 git branch other &&
-	 echo upstream >file &&
-	 git add file &&
-	 git commit -m upstream'
+test_expect_success 'setup' '
+	: >file &&
+	git add file &&
+	git commit -m initial &&
+	git branch other &&
+	echo upstream >file &&
+	git add file &&
+	git commit -m upstream
+'
 
-test_expect_success 'do not switch branches with dirty file' \
-	'git reset --hard &&
-	 git checkout other &&
-	 echo dirt >file &&
-	 git update-index --assume-unchanged file &&
-	 test_must_fail git checkout master'
+test_expect_success 'do not switch branches with dirty file' '
+	git reset --hard &&
+	git checkout other &&
+	echo dirt >file &&
+	git update-index --assume-unchanged file &&
+	test_must_fail git checkout - 2>err &&
+	test_i18ngrep overwritten err
+'
 
 test_done
diff --git a/t/t2107-update-index-basic.sh b/t/t2107-update-index-basic.sh
index 2242cd098e..a30b7ca6bc 100755
--- a/t/t2107-update-index-basic.sh
+++ b/t/t2107-update-index-basic.sh
@@ -9,7 +9,6 @@ Tests for command-line parsing and basic operation.
 
 test_expect_success 'update-index --nonsense fails' '
 	test_must_fail git update-index --nonsense 2>msg &&
-	cat msg &&
 	test -s msg
 '
 
diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh
index f764b7e3f5..45ca35d60a 100755
--- a/t/t2200-add-update.sh
+++ b/t/t2200-add-update.sh
@@ -135,7 +135,7 @@ test_expect_success 'add -n -u should not add but just report' '
 	after=$(git ls-files -s check top) &&
 
 	test "$before" = "$after" &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 
 '
 
@@ -179,7 +179,8 @@ test_expect_success 'add -u resolves unmerged paths' '
 
 test_expect_success '"add -u non-existent" should fail' '
 	test_must_fail git add -u non-existent &&
-	! (git ls-files | grep "non-existent")
+	git ls-files >actual &&
+	! grep "non-existent" actual
 '
 
 test_done
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 5bbe8dcce4..cf0175ad6e 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -232,17 +232,53 @@ test_expect_success 'double rename detection in status' '
 	)
 '
 
-test_expect_success 'diff-files/diff-cached shows ita as new/not-new files' '
+test_expect_success 'i-t-a files shown as new for "diff", "diff-files"; not-new for "diff --cached"' '
 	git reset --hard &&
-	echo new >new-ita &&
-	git add -N new-ita &&
+	: >empty &&
+	content="foo" &&
+	echo "$content" >not-empty &&
+
+	hash_e=$(git hash-object empty) &&
+	hash_n=$(git hash-object not-empty) &&
+
+	cat >expect.diff_p <<-EOF &&
+	diff --git a/empty b/empty
+	new file mode 100644
+	index 0000000..$(git rev-parse --short $hash_e)
+	diff --git a/not-empty b/not-empty
+	new file mode 100644
+	index 0000000..$(git rev-parse --short $hash_n)
+	--- /dev/null
+	+++ b/not-empty
+	@@ -0,0 +1 @@
+	+$content
+	EOF
+	cat >expect.diff_s <<-EOF &&
+	 create mode 100644 empty
+	 create mode 100644 not-empty
+	EOF
+	cat >expect.diff_a <<-EOF &&
+	:000000 100644 0000000 0000000 A$(printf "\t")empty
+	:000000 100644 0000000 0000000 A$(printf "\t")not-empty
+	EOF
+
+	git add -N empty not-empty &&
+
+	git diff >actual &&
+	test_cmp expect.diff_p actual &&
+
 	git diff --summary >actual &&
-	echo " create mode 100644 new-ita" >expected &&
-	test_cmp expected actual &&
-	git diff --cached --summary >actual2 &&
-	test_must_be_empty actual2
-'
+	test_cmp expect.diff_s actual &&
+
+	git diff-files -p >actual &&
+	test_cmp expect.diff_p actual &&
 
+	git diff-files --abbrev >actual &&
+	test_cmp expect.diff_a actual &&
+
+	git diff --cached >actual &&
+	test_must_be_empty actual
+'
 
 test_expect_success '"diff HEAD" includes ita as new files' '
 	git reset --hard &&
diff --git a/t/t2400-worktree-add.sh b/t/t2400-worktree-add.sh
index e819ba741e..37ad79470f 100755
--- a/t/t2400-worktree-add.sh
+++ b/t/t2400-worktree-add.sh
@@ -2,6 +2,9 @@
 
 test_description='test git worktree add'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
@@ -12,12 +15,12 @@ test_expect_success 'setup' '
 
 test_expect_success '"add" an existing worktree' '
 	mkdir -p existing/subtree &&
-	test_must_fail git worktree add --detach existing master
+	test_must_fail git worktree add --detach existing main
 '
 
 test_expect_success '"add" an existing empty worktree' '
 	mkdir existing_empty &&
-	git worktree add --detach existing_empty master
+	git worktree add --detach existing_empty main
 '
 
 test_expect_success '"add" using shorthand - fails when no previous branch' '
@@ -29,7 +32,7 @@ test_expect_success '"add" using - shorthand' '
 	echo hello >myworld &&
 	git add myworld &&
 	git commit -m myworld &&
-	git checkout master &&
+	git checkout main &&
 	git worktree add short-hand - &&
 	echo refs/heads/newbranch >expect &&
 	git -C short-hand rev-parse --symbolic-full-name HEAD >actual &&
@@ -37,7 +40,7 @@ test_expect_success '"add" using - shorthand' '
 '
 
 test_expect_success '"add" refuses to checkout locked branch' '
-	test_must_fail git worktree add zere master &&
+	test_must_fail git worktree add zere main &&
 	! test -d zere &&
 	! test -d .git/worktrees/zere
 '
@@ -46,13 +49,13 @@ test_expect_success 'checking out paths not complaining about linked checkouts'
 	(
 	cd existing_empty &&
 	echo dirty >>init.t &&
-	git checkout master -- init.t
+	git checkout main -- init.t
 	)
 '
 
 test_expect_success '"add" worktree' '
 	git rev-parse HEAD >expect &&
-	git worktree add --detach here master &&
+	git worktree add --detach here main &&
 	(
 		cd here &&
 		test_cmp ../init.t init.t &&
@@ -64,16 +67,30 @@ 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 master &&
+	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 &&
 		cd sub &&
-		git worktree add --detach here master &&
+		git worktree add --detach here main &&
 		cd here &&
 		test_cmp ../../init.t init.t
 	)
@@ -82,19 +99,19 @@ test_expect_success '"add" worktree from a subdir' '
 test_expect_success '"add" from a linked checkout' '
 	(
 		cd here &&
-		git worktree add --detach nested-here master &&
+		git worktree add --detach nested-here main &&
 		cd nested-here &&
 		git fsck
 	)
 '
 
 test_expect_success '"add" worktree creating new branch' '
-	git worktree add -b newmaster there master &&
+	git worktree add -b newmain there main &&
 	(
 		cd there &&
 		test_cmp ../init.t init.t &&
 		git symbolic-ref HEAD >actual &&
-		echo refs/heads/newmaster >expect &&
+		echo refs/heads/newmain >expect &&
 		test_cmp expect actual &&
 		git fsck
 	)
@@ -103,7 +120,7 @@ test_expect_success '"add" worktree creating new branch' '
 test_expect_success 'die the same branch is already checked out' '
 	(
 		cd here &&
-		test_must_fail git checkout newmaster
+		test_must_fail git checkout newmain
 	)
 '
 
@@ -112,20 +129,20 @@ test_expect_success SYMLINKS 'die the same branch is already checked out (symlin
 	ref=$(git -C there symbolic-ref HEAD) &&
 	rm "$head" &&
 	ln -s "$ref" "$head" &&
-	test_must_fail git -C here checkout newmaster
+	test_must_fail git -C here checkout newmain
 '
 
 test_expect_success 'not die the same branch is already checked out' '
 	(
 		cd here &&
-		git worktree add --force anothernewmaster newmaster
+		git worktree add --force anothernewmain newmain
 	)
 '
 
 test_expect_success 'not die on re-checking out current branch' '
 	(
 		cd there &&
-		git checkout newmaster
+		git checkout newmain
 	)
 '
 
@@ -133,14 +150,14 @@ test_expect_success '"add" from a bare repo' '
 	(
 		git clone --bare . bare &&
 		cd bare &&
-		git worktree add -b bare-master ../there2 master
+		git worktree add -b bare-main ../there2 main
 	)
 '
 
 test_expect_success 'checkout from a bare repo without "add"' '
 	(
 		cd bare &&
-		test_must_fail git checkout master
+		test_must_fail git checkout main
 	)
 '
 
@@ -148,7 +165,7 @@ test_expect_success '"add" default branch of a bare repo' '
 	(
 		git clone --bare . bare2 &&
 		cd bare2 &&
-		git worktree add ../there3 master
+		git worktree add ../there3 main
 	)
 '
 
@@ -165,7 +182,7 @@ test_expect_success 'checkout with grafts' '
 	EOF
 	git log --format=%s -2 >actual &&
 	test_cmp expected actual &&
-	git worktree add --detach grafted master &&
+	git worktree add --detach grafted main &&
 	git --git-dir=grafted/.git log --format=%s -2 >actual &&
 	test_cmp expected actual
 '
@@ -226,34 +243,34 @@ test_expect_success '"add" no auto-vivify with --detach and <branch> omitted' '
 '
 
 test_expect_success '"add" -b/-B mutually exclusive' '
-	test_must_fail git worktree add -b poodle -B poodle bamboo master
+	test_must_fail git worktree add -b poodle -B poodle bamboo main
 '
 
 test_expect_success '"add" -b/--detach mutually exclusive' '
-	test_must_fail git worktree add -b poodle --detach bamboo master
+	test_must_fail git worktree add -b poodle --detach bamboo main
 '
 
 test_expect_success '"add" -B/--detach mutually exclusive' '
-	test_must_fail git worktree add -B poodle --detach bamboo master
+	test_must_fail git worktree add -B poodle --detach bamboo main
 '
 
 test_expect_success '"add -B" fails if the branch is checked out' '
-	git rev-parse newmaster >before &&
-	test_must_fail git worktree add -B newmaster bamboo master &&
-	git rev-parse newmaster >after &&
+	git rev-parse newmain >before &&
+	test_must_fail git worktree add -B newmain bamboo main &&
+	git rev-parse newmain >after &&
 	test_cmp before after
 '
 
 test_expect_success 'add -B' '
-	git worktree add -B poodle bamboo2 master^ &&
+	git worktree add -B poodle bamboo2 main^ &&
 	git -C bamboo2 symbolic-ref HEAD >actual &&
 	echo refs/heads/poodle >expected &&
 	test_cmp expected actual &&
-	test_cmp_rev master^ poodle
+	test_cmp_rev main^ poodle
 '
 
 test_expect_success 'add --quiet' '
-	git worktree add --quiet another-worktree master 2>actual &&
+	git worktree add --quiet another-worktree main 2>actual &&
 	test_must_be_empty actual
 '
 
@@ -348,24 +365,24 @@ test_branch_upstream () {
 
 test_expect_success '--track sets up tracking' '
 	test_when_finished rm -rf track &&
-	git worktree add --track -b track track master &&
-	test_branch_upstream track . master
+	git worktree add --track -b track track main &&
+	test_branch_upstream track . main
 '
 
 # setup remote repository $1 and repository $2 with $1 set up as
-# remote.  The remote has two branches, master and foo.
+# remote.  The remote has two branches, main and foo.
 setup_remote_repo () {
 	git init $1 &&
 	(
 		cd $1 &&
-		test_commit $1_master &&
+		test_commit $1_main &&
 		git checkout -b foo &&
 		test_commit upstream_foo
 	) &&
 	git init $2 &&
 	(
 		cd $2 &&
-		test_commit $2_master &&
+		test_commit $2_main &&
 		git remote add $1 ../$1 &&
 		git config remote.$1.fetch \
 			"refs/heads/*:refs/remotes/$1/*" &&
@@ -438,7 +455,7 @@ test_expect_success 'git worktree add does not match remote' '
 		cd foo &&
 		test_must_fail git config "branch.foo.remote" &&
 		test_must_fail git config "branch.foo.merge" &&
-		! test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+		test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo
 	)
 '
 
@@ -483,7 +500,7 @@ test_expect_success 'git worktree --no-guess-remote option overrides config' '
 		cd foo &&
 		test_must_fail git config "branch.foo.remote" &&
 		test_must_fail git config "branch.foo.merge" &&
-		! test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+		test_cmp_rev ! refs/remotes/repo_a/foo refs/heads/foo
 	)
 '
 
@@ -570,6 +587,15 @@ test_expect_success '"add" an existing locked but missing worktree' '
 	git worktree add --force --force --detach gnoo
 '
 
+test_expect_success '"add" not tripped up by magic worktree matching"' '
+	# if worktree "sub1/bar" exists, "git worktree add bar" in distinct
+	# directory `sub2` should not mistakenly complain that `bar` is an
+	# already-registered worktree
+	mkdir sub1 sub2 &&
+	git -C sub1 --git-dir=../.git worktree add --detach bozo &&
+	git -C sub2 --git-dir=../.git worktree add --detach bozo
+'
+
 test_expect_success FUNNYNAMES 'sanitize generated worktree name' '
 	git worktree add --detach ".  weird*..?.lock.lock" &&
 	test -d .git/worktrees/---weird-.-
@@ -587,4 +613,28 @@ test_expect_success '"add" should not fail because of another bad worktree' '
 	)
 '
 
+test_expect_success '"add" with uninitialized submodule, with submodule.recurse unset' '
+	test_create_repo submodule &&
+	test_commit -C submodule first &&
+	test_create_repo project &&
+	git -C project submodule add ../submodule &&
+	git -C project add submodule &&
+	test_tick &&
+	git -C project commit -m add_sub &&
+	git clone project project-clone &&
+	git -C project-clone worktree add ../project-2
+'
+test_expect_success '"add" with uninitialized submodule, with submodule.recurse set' '
+	git -C project-clone -c submodule.recurse worktree add ../project-3
+'
+
+test_expect_success '"add" with initialized submodule, with submodule.recurse unset' '
+	git -C project-clone submodule update --init &&
+	git -C project-clone worktree add ../project-4
+'
+
+test_expect_success '"add" with initialized submodule, with submodule.recurse set' '
+	git -C project-clone -c submodule.recurse worktree add ../project-5
+'
+
 test_done
diff --git a/t/t2401-worktree-prune.sh b/t/t2401-worktree-prune.sh
index b7d6d5d45a..a615d3b483 100755
--- a/t/t2401-worktree-prune.sh
+++ b/t/t2401-worktree-prune.sh
@@ -2,6 +2,9 @@
 
 test_description='prune $GIT_DIR/worktrees'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success initialize '
@@ -20,7 +23,7 @@ test_expect_success 'prune files inside $GIT_DIR/worktrees' '
 	cat >expect <<EOF &&
 Removing worktrees/abc: not a valid directory
 EOF
-	test_i18ncmp expect actual &&
+	test_cmp expect actual &&
 	! test -f .git/worktrees/abc &&
 	! test -d .git/worktrees
 '
@@ -32,7 +35,7 @@ test_expect_success 'prune directories without gitdir' '
 Removing worktrees/def: gitdir file does not exist
 EOF
 	git worktree prune --verbose >actual &&
-	test_i18ncmp expect actual &&
+	test_cmp expect actual &&
 	! test -d .git/worktrees/def &&
 	! test -d .git/worktrees
 '
@@ -87,9 +90,33 @@ test_expect_success 'not prune recent checkouts' '
 
 test_expect_success 'not prune proper checkouts' '
 	test_when_finished rm -r .git/worktrees &&
-	git worktree add --detach "$PWD/nop" master &&
+	git worktree add --detach "$PWD/nop" main &&
 	git worktree prune &&
 	test -d .git/worktrees/nop
 '
 
+test_expect_success 'prune duplicate (linked/linked)' '
+	test_when_finished rm -fr .git/worktrees w1 w2 &&
+	git worktree add --detach w1 &&
+	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 &&
+	test_i18ngrep "duplicate entry" actual &&
+	test -d .git/worktrees/w1 &&
+	! test -d .git/worktrees/w2
+'
+
+test_expect_success 'prune duplicate (main/linked)' '
+	test_when_finished rm -fr repo wt &&
+	test_create_repo repo &&
+	test_commit -C repo x &&
+	git -C repo worktree add --detach ../wt &&
+	rm -fr wt &&
+	mv repo wt &&
+	git -C wt worktree prune --verbose >actual &&
+	test_i18ngrep "duplicate entry" actual &&
+	! test -d .git/worktrees/wt
+'
+
 test_done
diff --git a/t/t2402-worktree-list.sh b/t/t2402-worktree-list.sh
index bb6fb9b12c..4012bd67b0 100755
--- a/t/t2402-worktree-list.sh
+++ b/t/t2402-worktree-list.sh
@@ -2,6 +2,9 @@
 
 test_description='test git worktree list'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -21,7 +24,7 @@ test_expect_success 'rev-parse --git-common-dir on main worktree' '
 test_expect_success 'rev-parse --git-path objects linked worktree' '
 	echo "$(git rev-parse --show-toplevel)/.git/objects" >expect &&
 	test_when_finished "rm -rf linked-tree actual expect && git worktree prune" &&
-	git worktree add --detach linked-tree master &&
+	git worktree add --detach linked-tree main &&
 	git -C linked-tree rev-parse --git-path objects >actual &&
 	test_cmp expect actual
 '
@@ -29,7 +32,7 @@ test_expect_success 'rev-parse --git-path objects linked worktree' '
 test_expect_success '"list" all worktrees from main' '
 	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
 	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
-	git worktree add --detach here master &&
+	git worktree add --detach here main &&
 	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
 	git worktree list >out &&
 	sed "s/  */ /g" <out >actual &&
@@ -39,7 +42,7 @@ test_expect_success '"list" all worktrees from main' '
 test_expect_success '"list" all worktrees from linked' '
 	echo "$(git rev-parse --show-toplevel) $(git rev-parse --short HEAD) [$(git symbolic-ref --short HEAD)]" >expect &&
 	test_when_finished "rm -rf here out actual expect && git worktree prune" &&
-	git worktree add --detach here master &&
+	git worktree add --detach here main &&
 	echo "$(git -C here rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >>expect &&
 	git -C here worktree list >out &&
 	sed "s/  */ /g" <out >actual &&
@@ -52,7 +55,7 @@ test_expect_success '"list" all worktrees --porcelain' '
 	echo "branch $(git symbolic-ref HEAD)" >>expect &&
 	echo >>expect &&
 	test_when_finished "rm -rf here actual expect && git worktree prune" &&
-	git worktree add --detach here master &&
+	git worktree add --detach here main &&
 	echo "worktree $(git -C here rev-parse --show-toplevel)" >>expect &&
 	echo "HEAD $(git rev-parse HEAD)" >>expect &&
 	echo "detached" >>expect &&
@@ -61,18 +64,124 @@ test_expect_success '"list" all worktrees --porcelain' '
 	test_cmp expect actual
 '
 
+test_expect_success '"list" all worktrees with locked annotation' '
+	test_when_finished "rm -rf locked unlocked out && git worktree prune" &&
+	git worktree add --detach locked main &&
+	git worktree add --detach unlocked main &&
+	git worktree lock locked &&
+	test_when_finished "git worktree unlock locked" &&
+	git worktree list >out &&
+	grep "/locked  *[0-9a-f].* locked$" out &&
+	! grep "/unlocked  *[0-9a-f].* locked$" out
+'
+
+test_expect_success '"list" all worktrees --porcelain with locked' '
+	test_when_finished "rm -rf locked1 locked2 unlocked out actual expect && git worktree prune" &&
+	echo "locked" >expect &&
+	echo "locked with reason" >>expect &&
+	git worktree add --detach locked1 &&
+	git worktree add --detach locked2 &&
+	# unlocked worktree should not be annotated with "locked"
+	git worktree add --detach unlocked &&
+	git worktree lock locked1 &&
+	test_when_finished "git worktree unlock locked1" &&
+	git worktree lock locked2 --reason "with reason" &&
+	test_when_finished "git worktree unlock locked2" &&
+	git worktree list --porcelain >out &&
+	grep "^locked" out >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '"list" all worktrees --porcelain with locked reason newline escaped' '
+	test_when_finished "rm -rf locked_lf locked_crlf out actual expect && git worktree prune" &&
+	printf "locked \"locked\\\\r\\\\nreason\"\n" >expect &&
+	printf "locked \"locked\\\\nreason\"\n" >>expect &&
+	git worktree add --detach locked_lf &&
+	git worktree add --detach locked_crlf &&
+	git worktree lock locked_lf --reason "$(printf "locked\nreason")" &&
+	test_when_finished "git worktree unlock locked_lf" &&
+	git worktree lock locked_crlf --reason "$(printf "locked\r\nreason")" &&
+	test_when_finished "git worktree unlock locked_crlf" &&
+	git worktree list --porcelain >out &&
+	grep "^locked" out >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '"list" all worktrees with prunable annotation' '
+	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	git worktree add --detach unprunable &&
+	rm -rf prunable &&
+	git worktree list >out &&
+	grep "/prunable  *[0-9a-f].* prunable$" out &&
+	! grep "/unprunable  *[0-9a-f].* prunable$"
+'
+
+test_expect_success '"list" all worktrees --porcelain with prunable' '
+	test_when_finished "rm -rf prunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	rm -rf prunable &&
+	git worktree list --porcelain >out &&
+	sed -n "/^worktree .*\/prunable$/,/^$/p" <out >only_prunable &&
+	test_i18ngrep "^prunable gitdir file points to non-existent location$" only_prunable
+'
+
+test_expect_success '"list" all worktrees with prunable consistent with "prune"' '
+	test_when_finished "rm -rf prunable unprunable out && git worktree prune" &&
+	git worktree add --detach prunable &&
+	git worktree add --detach unprunable &&
+	rm -rf prunable &&
+	git worktree list >out &&
+	grep "/prunable  *[0-9a-f].* prunable$" out &&
+	! grep "/unprunable  *[0-9a-f].* unprunable$" out &&
+	git worktree prune --verbose >out &&
+	test_i18ngrep "^Removing worktrees/prunable" out &&
+	test_i18ngrep ! "^Removing worktrees/unprunable" out
+'
+
+test_expect_success '"list" --verbose and --porcelain mutually exclusive' '
+	test_must_fail git worktree list --verbose --porcelain
+'
+
+test_expect_success '"list" all worktrees --verbose with locked' '
+	test_when_finished "rm -rf locked1 locked2 out actual expect && git worktree prune" &&
+	git worktree add locked1 --detach &&
+	git worktree add locked2 --detach &&
+	git worktree lock locked1 &&
+	test_when_finished "git worktree unlock locked1" &&
+	git worktree lock locked2 --reason "with reason" &&
+	test_when_finished "git worktree unlock locked2" &&
+	echo "$(git -C locked2 rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
+	printf "\tlocked: with reason\n" >>expect &&
+	git worktree list --verbose >out &&
+	grep "/locked1  *[0-9a-f].* locked$" out &&
+	sed -n "s/  */ /g;/\/locked2  *[0-9a-f].*$/,/locked: .*$/p" <out >actual &&
+	test_cmp actual expect
+'
+
+test_expect_success '"list" all worktrees --verbose with prunable' '
+	test_when_finished "rm -rf prunable out actual expect && git worktree prune" &&
+	git worktree add prunable --detach &&
+	echo "$(git -C prunable rev-parse --show-toplevel) $(git rev-parse --short HEAD) (detached HEAD)" >expect &&
+	printf "\tprunable: gitdir file points to non-existent location\n" >>expect &&
+	rm -rf prunable &&
+	git worktree list --verbose >out &&
+	sed -n "s/  */ /g;/\/prunable  *[0-9a-f].*$/,/prunable: .*$/p" <out >actual &&
+	test_cmp actual expect
+'
+
 test_expect_success 'bare repo setup' '
 	git init --bare bare1 &&
 	echo "data" >file1 &&
 	git add file1 &&
 	git commit -m"File1: add data" &&
-	git push bare1 master &&
+	git push bare1 main &&
 	git reset --hard HEAD^
 '
 
 test_expect_success '"list" all worktrees from bare main' '
 	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there master &&
+	git -C bare1 worktree add --detach ../there main &&
 	echo "$(pwd)/bare1 (bare)" >expect &&
 	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
 	git -C bare1 worktree list >out &&
@@ -82,7 +191,7 @@ test_expect_success '"list" all worktrees from bare main' '
 
 test_expect_success '"list" all worktrees --porcelain from bare main' '
 	test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there master &&
+	git -C bare1 worktree add --detach ../there main &&
 	echo "worktree $(pwd)/bare1" >expect &&
 	echo "bare" >>expect &&
 	echo >>expect &&
@@ -96,7 +205,7 @@ test_expect_success '"list" all worktrees --porcelain from bare main' '
 
 test_expect_success '"list" all worktrees from linked with a bare main' '
 	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there master &&
+	git -C bare1 worktree add --detach ../there main &&
 	echo "$(pwd)/bare1 (bare)" >expect &&
 	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
 	git -C there worktree list >out &&
@@ -121,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 &&
@@ -151,4 +260,10 @@ test_expect_success 'linked worktrees are sorted' '
 	test_cmp expected sorted/main/actual
 '
 
+test_expect_success 'worktree path when called in .git directory' '
+	git worktree list >list1 &&
+	git -C .git worktree list >list2 &&
+	test_cmp list1 list2
+'
+
 test_done
diff --git a/t/t2403-worktree-move.sh b/t/t2403-worktree-move.sh
index 939d18d728..a4e1a178e0 100755
--- a/t/t2403-worktree-move.sh
+++ b/t/t2403-worktree-move.sh
@@ -112,6 +112,27 @@ test_expect_success 'move locked worktree (force)' '
 	git worktree move --force --force flump ploof
 '
 
+test_expect_success 'refuse to move worktree atop existing path' '
+	>bobble &&
+	git worktree add --detach beeble &&
+	test_must_fail git worktree move beeble bobble
+'
+
+test_expect_success 'move atop existing but missing worktree' '
+	git worktree add --detach gnoo &&
+	git worktree add --detach pneu &&
+	rm -fr pneu &&
+	test_must_fail git worktree move gnoo pneu &&
+	git worktree move --force gnoo pneu &&
+
+	git worktree add --detach nu &&
+	git worktree lock nu &&
+	rm -fr nu &&
+	test_must_fail git worktree move pneu nu &&
+	test_must_fail git worktree --force move pneu nu &&
+	git worktree move --force --force pneu nu
+'
+
 test_expect_success 'move a repo with uninitialized submodule' '
 	git init withsub &&
 	(
diff --git a/t/t2404-worktree-config.sh b/t/t2404-worktree-config.sh
index 286121d8de..9536d10919 100755
--- a/t/t2404-worktree-config.sh
+++ b/t/t2404-worktree-config.sh
@@ -23,8 +23,10 @@ test_expect_success 'config --worktree without extension' '
 '
 
 test_expect_success 'enable worktreeConfig extension' '
+	git config core.repositoryformatversion 1 &&
 	git config extensions.worktreeConfig true &&
-	test_cmp_config true extensions.worktreeConfig
+	test_cmp_config true extensions.worktreeConfig &&
+	test_cmp_config 1 core.repositoryformatversion
 '
 
 test_expect_success 'config is shared as before' '
diff --git a/t/t2405-worktree-submodule.sh b/t/t2405-worktree-submodule.sh
new file mode 100755
index 0000000000..b172c26ca4
--- /dev/null
+++ b/t/t2405-worktree-submodule.sh
@@ -0,0 +1,93 @@
+#!/bin/sh
+
+test_description='Combination of submodules and multiple worktrees'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+base_path=$(pwd -P)
+
+test_expect_success 'setup: create origin repos'  '
+	git init origin/sub &&
+	test_commit -C origin/sub file1 &&
+	git init origin/main &&
+	test_commit -C origin/main first &&
+	git -C origin/main submodule add ../sub &&
+	git -C origin/main commit -m "add sub" &&
+	test_commit -C origin/sub "file1 updated" file1 file1updated file1updated &&
+	git -C origin/main/sub pull &&
+	git -C origin/main add sub &&
+	git -C origin/main commit -m "sub updated"
+'
+
+test_expect_success 'setup: clone superproject to create main worktree' '
+	git clone --recursive "$base_path/origin/main" main
+'
+
+rev1_hash_main=$(git --git-dir=origin/main/.git show --pretty=format:%h -q "HEAD~1")
+rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1")
+
+test_expect_success 'add superproject worktree' '
+	git -C main worktree add "$base_path/worktree" "$rev1_hash_main"
+'
+
+test_expect_failure 'submodule is checked out just after worktree add' '
+	git -C worktree diff --submodule main"^!" >out &&
+	grep "file1 updated" out
+'
+
+test_expect_success 'add superproject worktree and initialize submodules' '
+	git -C main worktree add "$base_path/worktree-submodule-update" "$rev1_hash_main" &&
+	git -C worktree-submodule-update submodule update
+'
+
+test_expect_success 'submodule is checked out just after submodule update in linked worktree' '
+	git -C worktree-submodule-update diff --submodule main"^!" >out &&
+	grep "file1 updated" out
+'
+
+test_expect_success 'add superproject worktree and manually add submodule worktree' '
+	git -C main worktree add "$base_path/linked_submodule" "$rev1_hash_main" &&
+	git -C main/sub worktree add "$base_path/linked_submodule/sub" "$rev1_hash_sub"
+'
+
+test_expect_success 'submodule is checked out after manually adding submodule worktree' '
+	git -C linked_submodule diff --submodule main"^!" >out &&
+	grep "file1 updated" out
+'
+
+test_expect_success 'checkout --recurse-submodules uses $GIT_DIR for submodules in a linked worktree' '
+	git -C main worktree add "$base_path/checkout-recurse" --detach  &&
+	git -C checkout-recurse submodule update --init &&
+	echo "gitdir: ../../main/.git/worktrees/checkout-recurse/modules/sub" >expect-gitfile &&
+	cat checkout-recurse/sub/.git >actual-gitfile &&
+	test_cmp expect-gitfile actual-gitfile &&
+	git -C main/sub rev-parse HEAD >expect-head-main &&
+	git -C checkout-recurse checkout --recurse-submodules HEAD~1 &&
+	cat checkout-recurse/sub/.git >actual-gitfile &&
+	git -C main/sub rev-parse HEAD >actual-head-main &&
+	test_cmp expect-gitfile actual-gitfile &&
+	test_cmp expect-head-main actual-head-main
+'
+
+test_expect_success 'core.worktree is removed in $GIT_DIR/modules/<name>/config, not in $GIT_COMMON_DIR/modules/<name>/config' '
+	echo "../../../sub" >expect-main &&
+	git -C main/sub config --get core.worktree >actual-main &&
+	test_cmp expect-main actual-main &&
+	echo "../../../../../../checkout-recurse/sub" >expect-linked &&
+	git -C checkout-recurse/sub config --get core.worktree >actual-linked &&
+	test_cmp expect-linked actual-linked &&
+	git -C checkout-recurse checkout --recurse-submodules first &&
+	test_expect_code 1 git -C main/.git/worktrees/checkout-recurse/modules/sub config --get core.worktree >linked-config &&
+	test_must_be_empty linked-config &&
+	git -C main/sub config --get core.worktree >actual-main &&
+	test_cmp expect-main actual-main
+'
+
+test_expect_success 'unsetting core.worktree does not prevent running commands directly against the submodule repository' '
+	git -C main/.git/worktrees/checkout-recurse/modules/sub log
+'
+
+test_done
diff --git a/t/t2406-worktree-repair.sh b/t/t2406-worktree-repair.sh
new file mode 100755
index 0000000000..f73741886b
--- /dev/null
+++ b/t/t2406-worktree-repair.sh
@@ -0,0 +1,205 @@
+#!/bin/sh
+
+test_description='test git worktree repair'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+	test_commit init
+'
+
+test_expect_success 'skip missing worktree' '
+	test_when_finished "git worktree prune" &&
+	git worktree add --detach missing &&
+	rm -rf missing &&
+	git worktree repair >out 2>err &&
+	test_must_be_empty out &&
+	test_must_be_empty err
+'
+
+test_expect_success 'worktree path not directory' '
+	test_when_finished "git worktree prune" &&
+	git worktree add --detach notdir &&
+	rm -rf notdir &&
+	>notdir &&
+	test_must_fail git worktree repair >out 2>err &&
+	test_must_be_empty out &&
+	test_i18ngrep "not a directory" err
+'
+
+test_expect_success "don't clobber .git repo" '
+	test_when_finished "rm -rf repo && git worktree prune" &&
+	git worktree add --detach repo &&
+	rm -rf repo &&
+	test_create_repo repo &&
+	test_must_fail git worktree repair >out 2>err &&
+	test_must_be_empty out &&
+	test_i18ngrep ".git is not a file" err
+'
+
+test_corrupt_gitfile () {
+	butcher=$1 &&
+	problem=$2 &&
+	repairdir=${3:-.} &&
+	test_when_finished 'rm -rf corrupt && git worktree prune' &&
+	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 corrupt rev-parse --absolute-git-dir >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success 'repair missing .git file' '
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken"
+'
+
+test_expect_success 'repair bogus .git file' '
+	test_corrupt_gitfile "echo \"gitdir: /nowhere\" >corrupt/.git" \
+		".git file broken"
+'
+
+test_expect_success 'repair incorrect .git file' '
+	test_when_finished "rm -rf other && git worktree prune" &&
+	test_create_repo other &&
+	other=$(git -C other rev-parse --absolute-git-dir) &&
+	test_corrupt_gitfile "echo \"gitdir: $other\" >corrupt/.git" \
+		".git file incorrect"
+'
+
+test_expect_success 'repair .git file from main/.git' '
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" .git
+'
+
+test_expect_success 'repair .git file from linked worktree' '
+	test_when_finished "rm -rf other && git worktree prune" &&
+	git worktree add --detach other &&
+	test_corrupt_gitfile "rm -f corrupt/.git" ".git file broken" other
+'
+
+test_expect_success 'repair .git file from bare.git' '
+	test_when_finished "rm -rf bare.git corrupt && git worktree prune" &&
+	git clone --bare . bare.git &&
+	git -C bare.git worktree add --detach ../corrupt &&
+	git -C corrupt rev-parse --absolute-git-dir >expect &&
+	rm -f corrupt/.git &&
+	git -C bare.git worktree repair &&
+	git -C corrupt rev-parse --absolute-git-dir >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'invalid worktree path' '
+	test_must_fail git worktree repair /notvalid >out 2>err &&
+	test_must_be_empty out &&
+	test_i18ngrep "not a valid path" err
+'
+
+test_expect_success 'repo not found; .git not file' '
+	test_when_finished "rm -rf not-a-worktree" &&
+	test_create_repo not-a-worktree &&
+	test_must_fail git worktree repair not-a-worktree >out 2>err &&
+	test_must_be_empty out &&
+	test_i18ngrep ".git is not a file" err
+'
+
+test_expect_success 'repo not found; .git not referencing repo' '
+	test_when_finished "rm -rf side not-a-repo && git worktree prune" &&
+	git worktree add --detach side &&
+	sed s,\.git/worktrees/side$,not-a-repo, side/.git >side/.newgit &&
+	mv side/.newgit side/.git &&
+	mkdir not-a-repo &&
+	test_must_fail git worktree repair side 2>err &&
+	test_i18ngrep ".git file does not reference a repository" err
+'
+
+test_expect_success 'repo not found; .git file broken' '
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	echo /invalid >orig/.git &&
+	mv orig moved &&
+	test_must_fail git worktree repair moved >out 2>err &&
+	test_must_be_empty out &&
+	test_i18ngrep ".git file broken" err
+'
+
+test_expect_success 'repair broken gitdir' '
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	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 &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_i18ngrep "gitdir unreadable" out &&
+	test_must_be_empty err
+'
+
+test_expect_success 'repair incorrect gitdir' '
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	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 &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_i18ngrep "gitdir incorrect" out &&
+	test_must_be_empty err
+'
+
+test_expect_success 'repair gitdir (implicit) from linked worktree' '
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	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 &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_i18ngrep "gitdir incorrect" out &&
+	test_must_be_empty err
+'
+
+test_expect_success 'unable to repair gitdir (implicit) from main worktree' '
+	test_when_finished "rm -rf orig moved && git worktree prune" &&
+	git worktree add --detach orig &&
+	cat .git/worktrees/orig/gitdir >expect &&
+	mv orig moved &&
+	git worktree repair >out 2>err &&
+	test_cmp expect .git/worktrees/orig/gitdir &&
+	test_must_be_empty out &&
+	test_must_be_empty err
+'
+
+test_expect_success 'repair multiple gitdir files' '
+	test_when_finished "rm -rf orig1 orig2 moved1 moved2 &&
+		git worktree prune" &&
+	git worktree add --detach orig1 &&
+	git worktree add --detach orig2 &&
+	sed s,orig1/\.git$,moved1/.git, .git/worktrees/orig1/gitdir >expect1 &&
+	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 &&
+	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_expect_success 'repair moved main and linked worktrees' '
+	test_when_finished "rm -rf main side mainmoved sidemoved" &&
+	test_create_repo main &&
+	test_commit -C main init &&
+	git -C main worktree add --detach ../side &&
+	sed "s,side/\.git$,sidemoved/.git," \
+		main/.git/worktrees/side/gitdir >expect-gitdir &&
+	sed "s,main/.git/worktrees/side$,mainmoved/.git/worktrees/side," \
+		side/.git >expect-gitfile &&
+	mv main mainmoved &&
+	mv side sidemoved &&
+	git -C mainmoved worktree repair ../sidemoved &&
+	test_cmp expect-gitdir mainmoved/.git/worktrees/side/gitdir &&
+	test_cmp expect-gitfile sidemoved/.git
+'
+
+test_done
diff --git a/t/t3000-ls-files-others.sh b/t/t3000-ls-files-others.sh
index 0aefadacb0..740ce56eab 100755
--- a/t/t3000-ls-files-others.sh
+++ b/t/t3000-ls-files-others.sh
@@ -91,4 +91,141 @@ test_expect_success SYMLINKS 'ls-files --others with symlinked submodule' '
 	test_cmp expect actual
 '
 
+test_expect_success 'setup nested pathspec search' '
+	test_create_repo nested &&
+	(
+		cd nested &&
+
+		mkdir -p partially_tracked/untracked_dir &&
+		> partially_tracked/content &&
+		> partially_tracked/untracked_dir/file &&
+
+		mkdir -p untracked/deep &&
+		> untracked/deep/path &&
+		> untracked/deep/foo.c &&
+
+		git add partially_tracked/content
+	)
+'
+
+test_expect_success 'ls-files -o --directory with single deep dir pathspec' '
+	(
+		cd nested &&
+
+		git ls-files -o --directory untracked/deep/ >actual &&
+
+		cat <<-EOF >expect &&
+		untracked/deep/
+		EOF
+
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'ls-files -o --directory with multiple dir pathspecs' '
+	(
+		cd nested &&
+
+		git ls-files -o --directory partially_tracked/ untracked/ >actual &&
+
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/
+		EOF
+
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'ls-files -o --directory with mix dir/file pathspecs' '
+	(
+		cd nested &&
+
+		git ls-files -o --directory partially_tracked/ untracked/deep/path >actual &&
+
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/deep/path
+		EOF
+
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'ls-files -o --directory with glob filetype match' '
+	(
+		cd nested &&
+
+		# globs kinda defeat --directory, but only for that pathspec
+		git ls-files --others --directory partially_tracked "untracked/*.c" >actual &&
+
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/deep/foo.c
+		EOF
+
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'ls-files -o --directory with mix of tracked states' '
+	(
+		cd nested &&
+
+		# globs kinda defeat --directory, but only for that pathspec
+		git ls-files --others --directory partially_tracked/ "untracked/?*" >actual &&
+
+		cat <<-EOF >expect &&
+		partially_tracked/untracked_dir/
+		untracked/deep/
+		EOF
+
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'ls-files -o --directory with glob filetype match only' '
+	(
+		cd nested &&
+
+		git ls-files --others --directory "untracked/*.c" >actual &&
+
+		cat <<-EOF >expect &&
+		untracked/deep/foo.c
+		EOF
+
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'ls-files -o --directory to get immediate paths under one dir only' '
+	(
+		cd nested &&
+
+		git ls-files --others --directory "untracked/?*" >actual &&
+
+		cat <<-EOF >expect &&
+		untracked/deep/
+		EOF
+
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'ls-files -o avoids listing untracked non-matching gitdir' '
+	test_when_finished "rm -rf nested/untracked/deep/empty" &&
+	(
+		cd nested &&
+
+		git init untracked/deep/empty &&
+		git ls-files --others "untracked/*.c" >actual &&
+
+		cat <<-EOF >expect &&
+		untracked/deep/foo.c
+		EOF
+
+		test_cmp expect actual
+	)
+'
+
 test_done
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
index 1ec7cb57c7..516c95ea0e 100755
--- a/t/t3001-ls-files-others-exclude.sh
+++ b/t/t3001-ls-files-others-exclude.sh
@@ -292,6 +292,11 @@ EOF
 	test_cmp expect actual
 '
 
+test_expect_success 'ls-files with "**" patterns and --directory' '
+	# Expectation same as previous test
+	git ls-files --directory -o -i --exclude "**/a.1" >actual &&
+	test_cmp expect actual
+'
 
 test_expect_success 'ls-files with "**" patterns and no slashes' '
 	git ls-files -o -i --exclude "one**a.1" >actual &&
diff --git a/t/t3003-ls-files-exclude.sh b/t/t3003-ls-files-exclude.sh
index d5ec333131..c41c4f046a 100755
--- a/t/t3003-ls-files-exclude.sh
+++ b/t/t3003-ls-files-exclude.sh
@@ -29,11 +29,11 @@ test_expect_success 'add file to gitignore' '
 '
 check_all_output
 
-test_expect_success 'ls-files -i lists only tracked-but-ignored files' '
+test_expect_success 'ls-files -i -c lists only tracked-but-ignored files' '
 	echo content >other-file &&
 	git add other-file &&
 	echo file >expect &&
-	git ls-files -i --exclude-standard >output &&
+	git ls-files -i -c --exclude-standard >output &&
 	test_cmp expect output
 '
 
diff --git a/t/t3005-ls-files-relative.sh b/t/t3005-ls-files-relative.sh
index 2ec69a8a26..727e9ae1a4 100755
--- a/t/t3005-ls-files-relative.sh
+++ b/t/t3005-ls-files-relative.sh
@@ -46,7 +46,7 @@ test_expect_success 'ls-files -c' '
 		ls ../x* >expect.out &&
 		test_must_fail git ls-files -c --error-unmatch ../[xy]* >actual.out 2>actual.err &&
 		test_cmp expect.out actual.out &&
-		test_i18ncmp expect.err actual.err
+		test_cmp expect.err actual.err
 	)
 '
 
@@ -61,7 +61,7 @@ test_expect_success 'ls-files -o' '
 		ls ../y* >expect.out &&
 		test_must_fail git ls-files -o --error-unmatch ../[xy]* >actual.out 2>actual.err &&
 		test_cmp expect.out actual.out &&
-		test_i18ncmp expect.err actual.err
+		test_cmp expect.err actual.err
 	)
 '
 
diff --git a/t/t3007-ls-files-recurse-submodules.sh b/t/t3007-ls-files-recurse-submodules.sh
index 318b5bce7e..4a08000713 100755
--- a/t/t3007-ls-files-recurse-submodules.sh
+++ b/t/t3007-ls-files-recurse-submodules.sh
@@ -130,7 +130,6 @@ test_expect_success '--recurse-submodules and pathspecs setup' '
 
 	git ls-files --recurse-submodules >actual &&
 	test_cmp expect actual &&
-	cat actual &&
 	git ls-files --recurse-submodules "*" >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t3008-ls-files-lazy-init-name-hash.sh b/t/t3008-ls-files-lazy-init-name-hash.sh
index 64f047332b..85f3704958 100755
--- a/t/t3008-ls-files-lazy-init-name-hash.sh
+++ b/t/t3008-ls-files-lazy-init-name-hash.sh
@@ -4,7 +4,7 @@ test_description='Test the lazy init name hash with various folder structures'
 
 . ./test-lib.sh
 
-if test 1 -eq $($GIT_BUILD_DIR/t/helper/test-tool online-cpus)
+if test 1 -eq $(test-tool online-cpus)
 then
 	skip_all='skipping lazy-init tests, single cpu'
 	test_done
diff --git a/t/t3011-common-prefixes-and-directory-traversal.sh b/t/t3011-common-prefixes-and-directory-traversal.sh
new file mode 100755
index 0000000000..3da5b2b6e7
--- /dev/null
+++ b/t/t3011-common-prefixes-and-directory-traversal.sh
@@ -0,0 +1,209 @@
+#!/bin/sh
+
+test_description='directory traversal handling, especially with common prefixes'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	test_commit hello &&
+
+	>empty &&
+	mkdir untracked_dir &&
+	>untracked_dir/empty &&
+	git init untracked_repo &&
+	>untracked_repo/empty &&
+
+	cat <<-EOF >.gitignore &&
+	ignored
+	an_ignored_dir/
+	EOF
+	mkdir an_ignored_dir &&
+	mkdir an_untracked_dir &&
+	>an_ignored_dir/ignored &&
+	>an_ignored_dir/untracked &&
+	>an_untracked_dir/ignored &&
+	>an_untracked_dir/untracked
+'
+
+test_expect_success 'git ls-files -o shows the right entries' '
+	cat <<-EOF >expect &&
+	.gitignore
+	actual
+	an_ignored_dir/ignored
+	an_ignored_dir/untracked
+	an_untracked_dir/ignored
+	an_untracked_dir/untracked
+	empty
+	expect
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o --exclude-standard shows the right entries' '
+	cat <<-EOF >expect &&
+	.gitignore
+	actual
+	an_untracked_dir/untracked
+	empty
+	expect
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o --exclude-standard >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_dir recurses' '
+	echo untracked_dir/empty >expect &&
+	git ls-files -o untracked_dir >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_dir/ recurses' '
+	echo untracked_dir/empty >expect &&
+	git ls-files -o untracked_dir/ >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o --directory untracked_dir does not recurse' '
+	echo untracked_dir/ >expect &&
+	git ls-files -o --directory untracked_dir >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o --directory untracked_dir/ does not recurse' '
+	echo untracked_dir/ >expect &&
+	git ls-files -o --directory untracked_dir/ >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_repo does not recurse' '
+	echo untracked_repo/ >expect &&
+	git ls-files -o untracked_repo >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_repo/ does not recurse' '
+	echo untracked_repo/ >expect &&
+	git ls-files -o untracked_repo/ >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_dir untracked_repo recurses into untracked_dir only' '
+	cat <<-EOF >expect &&
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o untracked_dir untracked_repo >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o untracked_dir/ untracked_repo/ recurses into untracked_dir only' '
+	cat <<-EOF >expect &&
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o untracked_dir/ untracked_repo/ >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o --directory untracked_dir untracked_repo does not recurse' '
+	cat <<-EOF >expect &&
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory untracked_dir untracked_repo >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o --directory untracked_dir/ untracked_repo/ does not recurse' '
+	cat <<-EOF >expect &&
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory untracked_dir/ untracked_repo/ >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o .git shows nothing' '
+	git ls-files -o .git >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success 'git ls-files -o .git/ shows nothing' '
+	git ls-files -o .git/ >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success FUNNYNAMES 'git ls-files -o untracked_* recurses appropriately' '
+	mkdir "untracked_*" &&
+	>"untracked_*/empty" &&
+
+	cat <<-EOF >expect &&
+	untracked_*/empty
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o "untracked_*" >actual &&
+	test_cmp expect actual
+'
+
+# It turns out fill_directory returns the right paths, but ls-files' post-call
+# filtering in show_dir_entry() via calling dir_path_match() which ends up
+# in git_fnmatch() has logic for PATHSPEC_ONESTAR that assumes the pathspec
+# must match the full path; it doesn't check it for matching a leading
+# directory.
+test_expect_failure FUNNYNAMES 'git ls-files -o untracked_*/ recurses appropriately' '
+	cat <<-EOF >expect &&
+	untracked_*/empty
+	untracked_dir/empty
+	untracked_repo/
+	EOF
+	git ls-files -o "untracked_*/" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success FUNNYNAMES 'git ls-files -o --directory untracked_* does not recurse' '
+	cat <<-EOF >expect &&
+	untracked_*/
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory "untracked_*" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success FUNNYNAMES 'git ls-files -o --directory untracked_*/ does not recurse' '
+	cat <<-EOF >expect &&
+	untracked_*/
+	untracked_dir/
+	untracked_repo/
+	EOF
+	git ls-files -o --directory "untracked_*/" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git ls-files -o consistent between one or two dirs' '
+	git ls-files -o --exclude-standard an_ignored_dir/ an_untracked_dir/ >tmp &&
+	! grep ^an_ignored_dir/ tmp >expect &&
+	git ls-files -o --exclude-standard an_ignored_dir/ >actual &&
+	test_cmp expect actual
+'
+
+# ls-files doesn't have a way to request showing both untracked and ignored
+# files at the same time, so use `git status --ignored`
+test_expect_success 'git status --ignored shows same files under dir with or without pathspec' '
+	cat <<-EOF >expect &&
+	?? an_untracked_dir/
+	!! an_untracked_dir/ignored
+	EOF
+	git status --porcelain --ignored >output &&
+	grep an_untracked_dir output >expect &&
+	git status --porcelain --ignored an_untracked_dir/ >actual &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t3012-ls-files-dedup.sh b/t/t3012-ls-files-dedup.sh
new file mode 100755
index 0000000000..2682b1f43a
--- /dev/null
+++ b/t/t3012-ls-files-dedup.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+
+test_description='git ls-files --deduplicate test'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	>a.txt &&
+	>b.txt &&
+	>delete.txt &&
+	git add a.txt b.txt delete.txt &&
+	git commit -m base &&
+	echo a >a.txt &&
+	echo b >b.txt &&
+	echo delete >delete.txt &&
+	git add a.txt b.txt delete.txt &&
+	git commit -m tip &&
+	git tag tip &&
+	git reset --hard HEAD^ &&
+	echo change >a.txt &&
+	git commit -a -m side &&
+	git tag side
+'
+
+test_expect_success 'git ls-files --deduplicate to show unique unmerged path' '
+	test_must_fail git merge tip &&
+	git ls-files --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	a.txt
+	b.txt
+	delete.txt
+	EOF
+	test_cmp expect actual &&
+	git merge --abort
+'
+
+test_expect_success 'git ls-files -d -m --deduplicate with different display options' '
+	git reset --hard side &&
+	test_must_fail git merge tip &&
+	rm delete.txt &&
+	git ls-files -d -m --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	a.txt
+	delete.txt
+	EOF
+	test_cmp expect actual &&
+	git ls-files -d -m -t --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	C a.txt
+	C a.txt
+	C a.txt
+	R delete.txt
+	C delete.txt
+	EOF
+	test_cmp expect actual &&
+	git ls-files -d -m -c --deduplicate >actual &&
+	cat >expect <<-\EOF &&
+	a.txt
+	b.txt
+	delete.txt
+	EOF
+	test_cmp expect actual &&
+	git merge --abort
+'
+
+test_done
diff --git a/t/t3040-subprojects-basic.sh b/t/t3040-subprojects-basic.sh
index b81eb5fd6f..6abdcbbc94 100755
--- a/t/t3040-subprojects-basic.sh
+++ b/t/t3040-subprojects-basic.sh
@@ -79,7 +79,4 @@ test_expect_success 'checkout in superproject' '
 	git diff-index --exit-code --raw --cached save -- sub1
 '
 
-# just interesting what happened...
-# git diff --name-status -M save master
-
 test_done
diff --git a/t/t3060-ls-files-with-tree.sh b/t/t3060-ls-files-with-tree.sh
index 44f378ce41..b257c792a4 100755
--- a/t/t3060-ls-files-with-tree.sh
+++ b/t/t3060-ls-files-with-tree.sh
@@ -47,7 +47,13 @@ test_expect_success setup '
 	git add .
 '
 
-test_expect_success 'git -ls-files --with-tree should succeed from subdir' '
+test_expect_success 'usage' '
+	test_expect_code 128 git ls-files --with-tree=HEAD -u &&
+	test_expect_code 128 git ls-files --with-tree=HEAD -s &&
+	test_expect_code 128 git ls-files --recurse-submodules --with-tree=HEAD
+'
+
+test_expect_success 'git ls-files --with-tree should succeed from subdir' '
 	# We have to run from a sub-directory to trigger prune_path
 	# Then we finally get to run our --with-tree test
 	(
@@ -57,7 +63,42 @@ test_expect_success 'git -ls-files --with-tree should succeed from subdir' '
 '
 
 test_expect_success \
-    'git -ls-files --with-tree should add entries from named tree.' \
+    'git ls-files --with-tree should add entries from named tree.' \
     'test_cmp expected output'
 
+test_expect_success 'no duplicates in --with-tree output' '
+	git ls-files --with-tree=HEAD >actual &&
+	sort -u actual >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'setup: output in a conflict' '
+	test_create_repo conflict &&
+	test_commit -C conflict BASE file &&
+	test_commit -C conflict A file foo &&
+	git -C conflict reset --hard BASE &&
+	test_commit -C conflict B file bar
+'
+
+test_expect_success 'output in a conflict' '
+	test_must_fail git -C conflict merge A B &&
+	cat >expected <<-\EOF &&
+	file
+	file
+	file
+	file
+	EOF
+	git -C conflict ls-files --with-tree=HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'output with removed .git/index' '
+	cat >expected <<-\EOF &&
+	file
+	EOF
+	rm conflict/.git/index &&
+	git -C conflict ls-files --with-tree=HEAD >actual &&
+	test_cmp expected actual
+'
+
 test_done
diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh
index 891d4d7cb9..56ea4bda13 100755
--- a/t/t3070-wildmatch.sh
+++ b/t/t3070-wildmatch.sh
@@ -4,6 +4,11 @@ test_description='wildmatch tests'
 
 . ./test-lib.sh
 
+# Disable expensive chain-lint tests; all of the tests in this script
+# are variants of a few trivial test-tool invocations, and there are a lot of
+# them.
+GIT_TEST_CHAIN_LINT_HARDER_DEFAULT=0
+
 should_create_test_file() {
 	file=$1
 
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 411a70b0ce..e575ffb4ff 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -5,6 +5,9 @@
 
 test_description='git branch assorted tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
@@ -12,6 +15,7 @@ test_expect_success 'prepare a trivial repository' '
 	echo Hello >A &&
 	git update-index --add A &&
 	git commit -m "Initial commit." &&
+	git branch -M main &&
 	echo World >>A &&
 	git update-index --add A &&
 	git commit -m "Second commit." &&
@@ -27,8 +31,8 @@ test_expect_success 'branch -h in broken repository' '
 	mkdir broken &&
 	(
 		cd broken &&
-		git init &&
-		>.git/refs/heads/master &&
+		git init -b main &&
+		>.git/refs/heads/main &&
 		test_expect_code 129 git branch -h >usage 2>&1
 	) &&
 	test_i18ngrep "[Uu]sage" broken/usage
@@ -42,8 +46,8 @@ 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
 '
 
-test_expect_success 'git branch mb master... should create a branch' '
-	git branch mb master... && test_path_is_file .git/refs/heads/mb
+test_expect_success 'git branch mb main... should create a branch' '
+	git branch mb main... && test_path_is_file .git/refs/heads/mb
 '
 
 test_expect_success 'git branch HEAD should fail' '
@@ -51,7 +55,7 @@ test_expect_success 'git branch HEAD should fail' '
 '
 
 cat >expect <<EOF
-$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000	branch: Created from master
+$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000	branch: Created from main
 EOF
 test_expect_success 'git branch --create-reflog d/e/f should create a branch and a log' '
 	GIT_COMMITTER_DATE="2005-05-26 23:30" \
@@ -110,7 +114,7 @@ test_expect_success 'git branch -m n/n n should work' '
 
 test_expect_success 'git branch -m bbb should rename checked out branch' '
 	test_when_finished git branch -D bbb &&
-	test_when_finished git checkout master &&
+	test_when_finished git checkout main &&
 	git checkout -b aaa &&
 	git commit --allow-empty -m "a new commit" &&
 	git rev-parse aaa@{0} >expect &&
@@ -124,7 +128,7 @@ test_expect_success 'git branch -m bbb should rename checked out branch' '
 
 test_expect_success 'renaming checked out branch works with d/f conflict' '
 	test_when_finished "git branch -D foo/bar || git branch -D foo" &&
-	test_when_finished git checkout master &&
+	test_when_finished git checkout main &&
 	git checkout -b foo &&
 	git branch -m foo/bar &&
 	git symbolic-ref HEAD >actual &&
@@ -178,14 +182,14 @@ test_expect_success 'git branch -M baz bam should add entries to .git/logs/HEAD'
 '
 
 test_expect_success 'git branch -M should leave orphaned HEAD alone' '
-	git init orphan &&
+	git init -b main orphan &&
 	(
 		cd orphan &&
 		test_commit initial &&
 		git checkout --orphan lonely &&
 		grep lonely .git/HEAD &&
 		test_path_is_missing .git/refs/head/lonely &&
-		git branch -M master mistress &&
+		git branch -M main mistress &&
 		grep lonely .git/HEAD
 	)
 '
@@ -201,7 +205,7 @@ test_expect_success 'resulting reflog can be shown by log -g' '
 '
 
 test_expect_success 'git branch -M baz bam should succeed when baz is checked out as linked working tree' '
-	git checkout master &&
+	git checkout main &&
 	git worktree add -b baz bazdir &&
 	git worktree add -f bazdir2 baz &&
 	git branch -M baz bam &&
@@ -224,20 +228,20 @@ test_expect_success 'git branch -M baz bam should succeed within a worktree in w
 	git worktree prune
 '
 
-test_expect_success 'git branch -M master should work when master is checked out' '
-	git checkout master &&
-	git branch -M master
+test_expect_success 'git branch -M main should work when main is checked out' '
+	git checkout main &&
+	git branch -M main
 '
 
-test_expect_success 'git branch -M master master should work when master is checked out' '
-	git checkout master &&
-	git branch -M master master
+test_expect_success 'git branch -M main main should work when main is checked out' '
+	git checkout main &&
+	git branch -M main main
 '
 
-test_expect_success 'git branch -M master2 master2 should work when master is checked out' '
-	git checkout master &&
-	git branch master2 &&
-	git branch -M master2 master2
+test_expect_success 'git branch -M topic topic should work when main is checked out' '
+	git checkout main &&
+	git branch topic &&
+	git branch -M topic topic
 '
 
 test_expect_success 'git branch -v -d t should work' '
@@ -289,11 +293,11 @@ test_expect_success 'deleting checked-out branch from repo that is a submodule'
 test_expect_success 'bare main worktree has HEAD at branch deleted by secondary worktree' '
 	test_when_finished "rm -rf nonbare base secondary" &&
 
-	git init nonbare &&
+	git init -b main nonbare &&
 	test_commit -C nonbare x &&
 	git clone --bare nonbare bare &&
-	git -C bare worktree add --detach ../secondary master &&
-	git -C secondary branch -D master
+	git -C bare worktree add --detach ../secondary main &&
+	git -C secondary branch -D main
 '
 
 test_expect_success 'git branch --list -v with --abbrev' '
@@ -305,7 +309,9 @@ test_expect_success 'git branch --list -v with --abbrev' '
 
 	git branch -v --list --no-abbrev t >actual.noabbrev &&
 	git branch -v --list --abbrev=0 t >actual.0abbrev &&
+	git -c core.abbrev=no branch -v --list t >actual.noabbrev-conf &&
 	test_cmp actual.noabbrev actual.0abbrev &&
+	test_cmp actual.noabbrev actual.noabbrev-conf &&
 
 	git branch -v --list --abbrev=36 t >actual.36abbrev &&
 	# how many hexdigits are used?
@@ -323,11 +329,11 @@ test_expect_success 'git branch --list -v with --abbrev' '
 
 test_expect_success 'git branch --column' '
 	COLUMNS=81 git branch --column=column >actual &&
-	cat >expected <<\EOF &&
-  a/b/c     bam       foo       l       * master    mb        o/o       q
-  abc       bar       j/k       m/m       master2   n         o/p       r
+	cat >expect <<\EOF &&
+  a/b/c   bam     foo     l     * main    n       o/p     r
+  abc     bar     j/k     m/m     mb      o/o     q       topic
 EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'git branch --column with an extremely long branch name' '
@@ -336,7 +342,7 @@ test_expect_success 'git branch --column with an extremely long branch name' '
 	test_when_finished "git branch -d $long" &&
 	git branch $long &&
 	COLUMNS=80 git branch --column=column >actual &&
-	cat >expected <<EOF &&
+	cat >expect <<EOF &&
   a/b/c
   abc
   bam
@@ -345,17 +351,17 @@ test_expect_success 'git branch --column with an extremely long branch name' '
   j/k
   l
   m/m
-* master
-  master2
+* main
   mb
   n
   o/o
   o/p
   q
   r
+  topic
   $long
 EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'git branch with column.*' '
@@ -364,11 +370,11 @@ test_expect_success 'git branch with column.*' '
 	COLUMNS=80 git branch >actual &&
 	git config --unset column.branch &&
 	git config --unset column.ui &&
-	cat >expected <<\EOF &&
-  a/b/c   bam   foo   l   * master    mb   o/o   q
-  abc     bar   j/k   m/m   master2   n    o/p   r
+	cat >expect <<\EOF &&
+  a/b/c   bam   foo   l   * main   n     o/p   r
+  abc     bar   j/k   m/m   mb     o/o   q     topic
 EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'git branch --column -v should fail' '
@@ -377,9 +383,9 @@ test_expect_success 'git branch --column -v should fail' '
 
 test_expect_success 'git branch -v with column.ui ignored' '
 	git config column.ui column &&
-	COLUMNS=80 git branch -v | cut -c -10 | sed "s/ *$//" >actual &&
+	COLUMNS=80 git branch -v | cut -c -8 | sed "s/ *$//" >actual &&
 	git config --unset column.ui &&
-	cat >expected <<\EOF &&
+	cat >expect <<\EOF &&
   a/b/c
   abc
   bam
@@ -388,21 +394,21 @@ test_expect_success 'git branch -v with column.ui ignored' '
   j/k
   l
   m/m
-* master
-  master2
+* main
   mb
   n
   o/o
   o/p
   q
   r
+  topic
 EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 mv .git/config .git/config-saved
 
-test_expect_success 'git branch -m q q2 without config should succeed' '
+test_expect_success SHA1 'git branch -m q q2 without config should succeed' '
 	git branch -m q q2 &&
 	git branch -m q2 q
 '
@@ -427,8 +433,8 @@ test_expect_success 'config information was renamed, too' '
 '
 
 test_expect_success 'git branch -m correctly renames multiple config sections' '
-	test_when_finished "git checkout master" &&
-	git checkout -b source master &&
+	test_when_finished "git checkout main" &&
+	git checkout -b source main &&
 
 	# Assert that a config file with multiple config sections has
 	# those sections preserved...
@@ -587,20 +593,20 @@ test_expect_success 'git branch -C c1 c2 should never touch HEAD' '
 	! grep "$msg$" .git/logs/HEAD
 '
 
-test_expect_success 'git branch -C master should work when master is checked out' '
-	git checkout master &&
-	git branch -C master
+test_expect_success 'git branch -C main should work when main is checked out' '
+	git checkout main &&
+	git branch -C main
 '
 
-test_expect_success 'git branch -C master master should work when master is checked out' '
-	git checkout master &&
-	git branch -C master master
+test_expect_success 'git branch -C main main should work when main is checked out' '
+	git checkout main &&
+	git branch -C main main
 '
 
-test_expect_success 'git branch -C master5 master5 should work when master is checked out' '
-	git checkout master &&
-	git branch master5 &&
-	git branch -C master5 master5
+test_expect_success 'git branch -C main5 main5 should work when main is checked out' '
+	git checkout main &&
+	git branch main5 &&
+	git branch -C main5 main5
 '
 
 test_expect_success 'git branch -C ab cd should overwrite existing config for cd' '
@@ -620,8 +626,8 @@ test_expect_success 'git branch -C ab cd should overwrite existing config for cd
 test_expect_success 'git branch -c correctly copies multiple config sections' '
 	FOO=1 &&
 	export FOO &&
-	test_when_finished "git checkout master" &&
-	git checkout -b source2 master &&
+	test_when_finished "git checkout main" &&
+	git checkout -b source2 main &&
 
 	# Assert that a config file with multiple config sections has
 	# those sections preserved...
@@ -689,7 +695,7 @@ test_expect_success 'deleting a symref' '
 	git branch -d symref >actual &&
 	test_path_is_file .git/refs/heads/target &&
 	test_path_is_missing .git/refs/heads/symref &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'deleting a dangling symref' '
@@ -698,7 +704,7 @@ test_expect_success 'deleting a dangling symref' '
 	echo "Deleted branch dangling-symref (was nowhere)." >expect &&
 	git branch -d dangling-symref >actual &&
 	test_path_is_missing .git/refs/heads/dangling-symref &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'deleting a self-referential symref' '
@@ -707,15 +713,15 @@ test_expect_success 'deleting a self-referential symref' '
 	echo "Deleted branch self-reference (was refs/heads/self-reference)." >expect &&
 	git branch -d self-reference >actual &&
 	test_path_is_missing .git/refs/heads/self-reference &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'renaming a symref is not allowed' '
-	git symbolic-ref refs/heads/master2 refs/heads/master &&
-	test_must_fail git branch -m master2 master3 &&
-	git symbolic-ref refs/heads/master2 &&
-	test_path_is_file .git/refs/heads/master &&
-	test_path_is_missing .git/refs/heads/master3
+	git symbolic-ref refs/heads/topic refs/heads/main &&
+	test_must_fail git branch -m topic new-topic &&
+	git symbolic-ref refs/heads/topic &&
+	test_path_is_file .git/refs/heads/main &&
+	test_path_is_missing .git/refs/heads/new-topic
 '
 
 test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '
@@ -728,27 +734,27 @@ test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for
 test_expect_success 'test tracking setup via --track' '
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --track my1 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track my1 local/main &&
 	test $(git config branch.my1.remote) = local &&
-	test $(git config branch.my1.merge) = refs/heads/master
+	test $(git config branch.my1.merge) = refs/heads/main
 '
 
 test_expect_success 'test tracking setup (non-wildcard, matching)' '
 	git config remote.local.url . &&
-	git config remote.local.fetch refs/heads/master:refs/remotes/local/master &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --track my4 local/master &&
+	git config remote.local.fetch refs/heads/main:refs/remotes/local/main &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track my4 local/main &&
 	test $(git config branch.my4.remote) = local &&
-	test $(git config branch.my4.merge) = refs/heads/master
+	test $(git config branch.my4.merge) = refs/heads/main
 '
 
 test_expect_success 'tracking setup fails on non-matching refspec' '
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
 	git config remote.local.fetch refs/heads/s:refs/remotes/local/s &&
-	test_must_fail git branch --track my5 local/master &&
+	test_must_fail git branch --track my5 local/main &&
 	test_must_fail git config branch.my5.remote &&
 	test_must_fail git config branch.my5.merge
 '
@@ -757,21 +763,21 @@ test_expect_success 'test tracking setup via config' '
 	git config branch.autosetupmerge true &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch my3 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch my3 local/main &&
 	test $(git config branch.my3.remote) = local &&
-	test $(git config branch.my3.merge) = refs/heads/master
+	test $(git config branch.my3.merge) = refs/heads/main
 '
 
 test_expect_success 'test overriding tracking setup via --no-track' '
 	git config branch.autosetupmerge true &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --no-track my2 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track my2 local/main &&
 	git config branch.autosetupmerge false &&
 	! test "$(git config branch.my2.remote)" = local &&
-	! test "$(git config branch.my2.merge)" = refs/heads/master
+	! test "$(git config branch.my2.merge)" = refs/heads/main
 '
 
 test_expect_success 'no tracking without .fetch entries' '
@@ -802,7 +808,7 @@ test_expect_success 'test deleting branch without config' '
 	sha1=$(git rev-parse my7 | cut -c 1-7) &&
 	echo "Deleted branch my7 (was $sha1)." >expect &&
 	git branch -d my7 >actual 2>&1 &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'deleting currently checked out branch fails' '
@@ -835,134 +841,153 @@ test_expect_success 'branch from tag w/--track causes failure' '
 '
 
 test_expect_success '--set-upstream-to fails on multiple branches' '
-	test_must_fail git branch --set-upstream-to master a b c
+	echo "fatal: too many arguments to set new upstream" >expect &&
+	test_must_fail git branch --set-upstream-to main a b c 2>err &&
+	test_cmp expect err
 '
 
 test_expect_success '--set-upstream-to fails on detached HEAD' '
 	git checkout HEAD^{} &&
-	test_must_fail git branch --set-upstream-to master &&
-	git checkout -
+	test_when_finished git checkout - &&
+	echo "fatal: could not set upstream of HEAD to main when it does not point to any branch." >expect &&
+	test_must_fail git branch --set-upstream-to main 2>err &&
+	test_cmp expect err
 '
 
 test_expect_success '--set-upstream-to fails on a missing dst branch' '
-	test_must_fail git branch --set-upstream-to master does-not-exist
+	echo "fatal: branch '"'"'does-not-exist'"'"' does not exist" >expect &&
+	test_must_fail git branch --set-upstream-to main does-not-exist 2>err &&
+	test_cmp expect err
 '
 
 test_expect_success '--set-upstream-to fails on a missing src branch' '
-	test_must_fail git branch --set-upstream-to does-not-exist master
+	test_must_fail git branch --set-upstream-to does-not-exist main 2>err &&
+	test_i18ngrep "the requested upstream branch '"'"'does-not-exist'"'"' does not exist" err
 '
 
 test_expect_success '--set-upstream-to fails on a non-ref' '
-	test_must_fail git branch --set-upstream-to HEAD^{}
+	echo "fatal: Cannot setup 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
 '
 
 test_expect_success '--set-upstream-to fails on locked config' '
 	test_when_finished "rm -f .git/config.lock" &&
 	>.git/config.lock &&
 	git branch locked &&
-	test_must_fail git branch --set-upstream-to locked
+	test_must_fail git branch --set-upstream-to locked 2>err &&
+	test_i18ngrep "could not lock config file .git/config" err
 '
 
 test_expect_success 'use --set-upstream-to modify HEAD' '
-	test_config branch.master.remote foo &&
-	test_config branch.master.merge foo &&
+	test_config branch.main.remote foo &&
+	test_config branch.main.merge foo &&
 	git branch my12 &&
 	git branch --set-upstream-to my12 &&
-	test "$(git config branch.master.remote)" = "." &&
-	test "$(git config branch.master.merge)" = "refs/heads/my12"
+	test "$(git config branch.main.remote)" = "." &&
+	test "$(git config branch.main.merge)" = "refs/heads/my12"
 '
 
 test_expect_success 'use --set-upstream-to modify a particular branch' '
 	git branch my13 &&
-	git branch --set-upstream-to master my13 &&
+	git branch --set-upstream-to main my13 &&
 	test_when_finished "git branch --unset-upstream my13" &&
 	test "$(git config branch.my13.remote)" = "." &&
-	test "$(git config branch.my13.merge)" = "refs/heads/master"
+	test "$(git config branch.my13.merge)" = "refs/heads/main"
 '
 
 test_expect_success '--unset-upstream should fail if given a non-existent branch' '
-	test_must_fail git branch --unset-upstream i-dont-exist
+	echo "fatal: Branch '"'"'i-dont-exist'"'"' has no upstream information" >expect &&
+	test_must_fail git branch --unset-upstream i-dont-exist 2>err &&
+	test_cmp expect err
 '
 
 test_expect_success '--unset-upstream should fail if config is locked' '
 	test_when_finished "rm -f .git/config.lock" &&
 	git branch --set-upstream-to locked &&
 	>.git/config.lock &&
-	test_must_fail git branch --unset-upstream
+	test_must_fail git branch --unset-upstream 2>err &&
+	test_i18ngrep "could not lock config file .git/config" err
 '
 
 test_expect_success 'test --unset-upstream on HEAD' '
 	git branch my14 &&
-	test_config branch.master.remote foo &&
-	test_config branch.master.merge foo &&
+	test_config branch.main.remote foo &&
+	test_config branch.main.merge foo &&
 	git branch --set-upstream-to my14 &&
 	git branch --unset-upstream &&
-	test_must_fail git config branch.master.remote &&
-	test_must_fail git config branch.master.merge &&
+	test_must_fail git config branch.main.remote &&
+	test_must_fail git config branch.main.merge &&
 	# fail for a branch without upstream set
-	test_must_fail git branch --unset-upstream
+	echo "fatal: Branch '"'"'main'"'"' has no upstream information" >expect &&
+	test_must_fail git branch --unset-upstream 2>err &&
+	test_cmp expect err
 '
 
 test_expect_success '--unset-upstream should fail on multiple branches' '
-	test_must_fail git branch --unset-upstream a b c
+	echo "fatal: too many arguments to unset upstream" >expect &&
+	test_must_fail git branch --unset-upstream a b c 2>err &&
+	test_cmp expect err
 '
 
 test_expect_success '--unset-upstream should fail on detached HEAD' '
 	git checkout HEAD^{} &&
-	test_must_fail git branch --unset-upstream &&
-	git checkout -
+	test_when_finished git checkout - &&
+	echo "fatal: could not unset upstream of HEAD when it does not point to any branch." >expect &&
+	test_must_fail git branch --unset-upstream 2>err &&
+	test_cmp expect err
 '
 
 test_expect_success 'test --unset-upstream on a particular branch' '
 	git branch my15 &&
-	git branch --set-upstream-to master my14 &&
+	git branch --set-upstream-to main my14 &&
 	git branch --unset-upstream my14 &&
 	test_must_fail git config branch.my14.remote &&
 	test_must_fail git config branch.my14.merge
 '
 
 test_expect_success 'disabled option --set-upstream fails' '
-    test_must_fail git branch --set-upstream origin/master
+	test_must_fail git branch --set-upstream origin/main
 '
 
 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 >expected <<-\EOF &&
+	cat >expect <<-\EOF &&
 	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_i18ncmp expected actual
+	test_cmp expect actual
 '
 
 # Keep this test last, as it changes the current branch
 cat >expect <<EOF
-$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000	branch: Created from master
+$ZERO_OID $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000	branch: Created from main
 EOF
 test_expect_success 'git checkout -b g/h/i -l should create a branch and a log' '
 	GIT_COMMITTER_DATE="2005-05-26 23:30" \
-	git checkout -b g/h/i -l master &&
+	git checkout -b g/h/i -l main &&
 	test_path_is_file .git/refs/heads/g/h/i &&
 	test_path_is_file .git/logs/refs/heads/g/h/i &&
 	test_cmp expect .git/logs/refs/heads/g/h/i
 '
 
 test_expect_success 'checkout -b makes reflog by default' '
-	git checkout master &&
+	git checkout main &&
 	git config --unset core.logAllRefUpdates &&
 	git checkout -b alpha &&
 	git rev-parse --verify alpha@{0}
 '
 
 test_expect_success 'checkout -b does not make reflog when core.logAllRefUpdates = false' '
-	git checkout master &&
+	git checkout main &&
 	git config core.logAllRefUpdates false &&
 	git checkout -b beta &&
 	test_must_fail git rev-parse --verify beta@{0}
 '
 
 test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates = false' '
-	git checkout master &&
+	git checkout main &&
 	git checkout -lb gamma &&
 	git config --unset core.logAllRefUpdates &&
 	git rev-parse --verify gamma@{0}
@@ -971,10 +996,10 @@ test_expect_success 'checkout -b with -l makes reflog when core.logAllRefUpdates
 test_expect_success 'avoid ambiguous track' '
 	git config branch.autosetupmerge true &&
 	git config remote.ambi1.url lalala &&
-	git config remote.ambi1.fetch refs/heads/lalala:refs/heads/master &&
+	git config remote.ambi1.fetch refs/heads/lalala:refs/heads/main &&
 	git config remote.ambi2.url lilili &&
-	git config remote.ambi2.fetch refs/heads/lilili:refs/heads/master &&
-	test_must_fail git branch all1 master &&
+	git config remote.ambi2.fetch refs/heads/lilili:refs/heads/main &&
+	test_must_fail git branch all1 main &&
 	test -z "$(git config branch.all1.merge)"
 '
 
@@ -1030,10 +1055,10 @@ test_expect_success 'autosetuprebase local on a tracked remote branch' '
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 	git config branch.autosetuprebase local &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --track myr5 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track myr5 local/main &&
 	test "$(git config branch.myr5.remote)" = local &&
-	test "$(git config branch.myr5.merge)" = refs/heads/master &&
+	test "$(git config branch.myr5.merge)" = refs/heads/main &&
 	! test "$(git config branch.myr5.rebase)" = true
 '
 
@@ -1041,10 +1066,10 @@ test_expect_success 'autosetuprebase never on a tracked remote branch' '
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 	git config branch.autosetuprebase never &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --track myr6 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track myr6 local/main &&
 	test "$(git config branch.myr6.remote)" = local &&
-	test "$(git config branch.myr6.merge)" = refs/heads/master &&
+	test "$(git config branch.myr6.merge)" = refs/heads/main &&
 	! test "$(git config branch.myr6.rebase)" = true
 '
 
@@ -1052,10 +1077,10 @@ test_expect_success 'autosetuprebase remote on a tracked remote branch' '
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 	git config branch.autosetuprebase remote &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --track myr7 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track myr7 local/main &&
 	test "$(git config branch.myr7.remote)" = local &&
-	test "$(git config branch.myr7.merge)" = refs/heads/master &&
+	test "$(git config branch.myr7.merge)" = refs/heads/main &&
 	test "$(git config branch.myr7.rebase)" = true
 '
 
@@ -1063,10 +1088,10 @@ test_expect_success 'autosetuprebase always on a tracked remote branch' '
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
 	git config branch.autosetuprebase remote &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --track myr8 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track myr8 local/main &&
 	test "$(git config branch.myr8.remote)" = local &&
-	test "$(git config branch.myr8.merge)" = refs/heads/master &&
+	test "$(git config branch.myr8.merge)" = refs/heads/main &&
 	test "$(git config branch.myr8.rebase)" = true
 '
 
@@ -1074,10 +1099,10 @@ test_expect_success 'autosetuprebase unconfigured on a tracked remote branch' '
 	git config --unset branch.autosetuprebase &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --track myr9 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --track myr9 local/main &&
 	test "$(git config branch.myr9.remote)" = local &&
-	test "$(git config branch.myr9.merge)" = refs/heads/master &&
+	test "$(git config branch.myr9.merge)" = refs/heads/main &&
 	test "z$(git config branch.myr9.rebase)" = z
 '
 
@@ -1095,7 +1120,7 @@ test_expect_success 'autosetuprebase unconfigured on a tracked local branch' '
 test_expect_success 'autosetuprebase unconfigured on untracked local branch' '
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
 	git branch --no-track myr11 mybase2 &&
 	test "z$(git config branch.myr11.remote)" = z &&
 	test "z$(git config branch.myr11.merge)" = z &&
@@ -1105,8 +1130,8 @@ test_expect_success 'autosetuprebase unconfigured on untracked local branch' '
 test_expect_success 'autosetuprebase unconfigured on untracked remote branch' '
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --no-track myr12 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr12 local/main &&
 	test "z$(git config branch.myr12.remote)" = z &&
 	test "z$(git config branch.myr12.merge)" = z &&
 	test "z$(git config branch.myr12.rebase)" = z
@@ -1116,7 +1141,7 @@ test_expect_success 'autosetuprebase never on an untracked local branch' '
 	git config branch.autosetuprebase never &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
 	git branch --no-track myr13 mybase2 &&
 	test "z$(git config branch.myr13.remote)" = z &&
 	test "z$(git config branch.myr13.merge)" = z &&
@@ -1127,7 +1152,7 @@ test_expect_success 'autosetuprebase local on an untracked local branch' '
 	git config branch.autosetuprebase local &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
 	git branch --no-track myr14 mybase2 &&
 	test "z$(git config branch.myr14.remote)" = z &&
 	test "z$(git config branch.myr14.merge)" = z &&
@@ -1138,7 +1163,7 @@ test_expect_success 'autosetuprebase remote on an untracked local branch' '
 	git config branch.autosetuprebase remote &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
 	git branch --no-track myr15 mybase2 &&
 	test "z$(git config branch.myr15.remote)" = z &&
 	test "z$(git config branch.myr15.merge)" = z &&
@@ -1149,7 +1174,7 @@ test_expect_success 'autosetuprebase always on an untracked local branch' '
 	git config branch.autosetuprebase always &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
 	git branch --no-track myr16 mybase2 &&
 	test "z$(git config branch.myr16.remote)" = z &&
 	test "z$(git config branch.myr16.merge)" = z &&
@@ -1160,8 +1185,8 @@ test_expect_success 'autosetuprebase never on an untracked remote branch' '
 	git config branch.autosetuprebase never &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --no-track myr17 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr17 local/main &&
 	test "z$(git config branch.myr17.remote)" = z &&
 	test "z$(git config branch.myr17.merge)" = z &&
 	test "z$(git config branch.myr17.rebase)" = z
@@ -1171,8 +1196,8 @@ test_expect_success 'autosetuprebase local on an untracked remote branch' '
 	git config branch.autosetuprebase local &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --no-track myr18 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr18 local/main &&
 	test "z$(git config branch.myr18.remote)" = z &&
 	test "z$(git config branch.myr18.merge)" = z &&
 	test "z$(git config branch.myr18.rebase)" = z
@@ -1182,8 +1207,8 @@ test_expect_success 'autosetuprebase remote on an untracked remote branch' '
 	git config branch.autosetuprebase remote &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --no-track myr19 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr19 local/main &&
 	test "z$(git config branch.myr19.remote)" = z &&
 	test "z$(git config branch.myr19.merge)" = z &&
 	test "z$(git config branch.myr19.rebase)" = z
@@ -1193,8 +1218,8 @@ test_expect_success 'autosetuprebase always on an untracked remote branch' '
 	git config branch.autosetuprebase always &&
 	git config remote.local.url . &&
 	git config remote.local.fetch refs/heads/*:refs/remotes/local/* &&
-	(git show-ref -q refs/remotes/local/master || git fetch local) &&
-	git branch --no-track myr20 local/master &&
+	(git show-ref -q refs/remotes/local/main || git fetch local) &&
+	git branch --no-track myr20 local/main &&
 	test "z$(git config branch.myr20.remote)" = z &&
 	test "z$(git config branch.myr20.merge)" = z &&
 	test "z$(git config branch.myr20.rebase)" = z
@@ -1202,7 +1227,7 @@ test_expect_success 'autosetuprebase always on an untracked remote branch' '
 
 test_expect_success 'autosetuprebase always on detached HEAD' '
 	git config branch.autosetupmerge always &&
-	test_when_finished git checkout master &&
+	test_when_finished git checkout main &&
 	git checkout HEAD^0 &&
 	git branch my11 &&
 	test -z "$(git config branch.my11.remote)" &&
@@ -1230,23 +1255,36 @@ test_expect_success 'attempt to delete a branch without base and unmerged to HEA
 test_expect_success 'attempt to delete a branch merged to its base' '
 	# we are on my9 which is the initial commit; traditionally
 	# we would not have allowed deleting my8 that is not merged
-	# to my9, but it is set to track master that already has my8
-	git config branch.my8.merge refs/heads/master &&
+	# to my9, but it is set to track main that already has my8
+	git config branch.my8.merge refs/heads/main &&
 	git branch -d my8
 '
 
 test_expect_success 'attempt to delete a branch merged to its base' '
-	git checkout master &&
+	git checkout main &&
 	echo Third >>A &&
 	git commit -m "Third commit" A &&
 	git branch -t my10 my9 &&
 	git branch -f my10 HEAD^ &&
-	# we are on master which is at the third commit, and my10
+	# we are on main which is at the third commit, and my10
 	# is behind us, so traditionally we would have allowed deleting
 	# it; but my10 is set to track my9 that is further behind.
 	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"
@@ -1268,6 +1306,7 @@ test_expect_success 'detect typo in branch name when using --edit-description' '
 '
 
 test_expect_success 'refuse --edit-description on unborn branch for now' '
+	test_when_finished "git checkout main" &&
 	write_script editor <<-\EOF &&
 		echo "New contents" >"$1"
 	EOF
@@ -1279,24 +1318,20 @@ test_expect_success '--merged catches invalid object names' '
 	test_must_fail git branch --merged 0000000000000000000000000000000000000000
 '
 
-test_expect_success '--merged is incompatible with --no-merged' '
-	test_must_fail git branch --merged HEAD --no-merged HEAD
-'
-
 test_expect_success '--list during rebase' '
 	test_when_finished "reset_rebase" &&
-	git checkout master &&
+	git checkout main &&
 	FAKE_LINES="1 edit 2" &&
 	export FAKE_LINES &&
 	set_fake_editor &&
 	git rebase -i HEAD~2 &&
 	git branch --list >actual &&
-	test_i18ngrep "rebasing master" actual
+	test_i18ngrep "rebasing main" actual
 '
 
 test_expect_success '--list during rebase from detached HEAD' '
-	test_when_finished "reset_rebase && git checkout master" &&
-	git checkout master^0 &&
+	test_when_finished "reset_rebase && git checkout main" &&
+	git checkout main^0 &&
 	oid=$(git rev-parse --short HEAD) &&
 	FAKE_LINES="1 edit 2" &&
 	export FAKE_LINES &&
@@ -1308,17 +1343,17 @@ test_expect_success '--list during rebase from detached HEAD' '
 
 test_expect_success 'tracking with unexpected .fetch refspec' '
 	rm -rf a b c d &&
-	git init a &&
+	git init -b main a &&
 	(
 		cd a &&
 		test_commit a
 	) &&
-	git init b &&
+	git init -b main b &&
 	(
 		cd b &&
 		test_commit b
 	) &&
-	git init c &&
+	git init -b main c &&
 	(
 		cd c &&
 		test_commit c &&
@@ -1326,23 +1361,23 @@ test_expect_success 'tracking with unexpected .fetch refspec' '
 		git remote add b ../b &&
 		git fetch --all
 	) &&
-	git init d &&
+	git init -b main d &&
 	(
 		cd d &&
 		git remote add c ../c &&
 		git config remote.c.fetch "+refs/remotes/*:refs/remotes/*" &&
 		git fetch c &&
-		git branch --track local/a/master remotes/a/master &&
-		test "$(git config branch.local/a/master.remote)" = "c" &&
-		test "$(git config branch.local/a/master.merge)" = "refs/remotes/a/master" &&
+		git branch --track local/a/main remotes/a/main &&
+		test "$(git config branch.local/a/main.remote)" = "c" &&
+		test "$(git config branch.local/a/main.merge)" = "refs/remotes/a/main" &&
 		git rev-parse --verify a >expect &&
-		git rev-parse --verify local/a/master >actual &&
+		git rev-parse --verify local/a/main >actual &&
 		test_cmp expect actual
 	)
 '
 
 test_expect_success 'configured committerdate sort' '
-	git init sort &&
+	git init -b main sort &&
 	(
 		cd sort &&
 		git config branch.sort committerdate &&
@@ -1355,7 +1390,7 @@ test_expect_success 'configured committerdate sort' '
 		test_commit b &&
 		git branch >actual &&
 		cat >expect <<-\EOF &&
-		  master
+		  main
 		  a
 		  c
 		* b
@@ -1373,7 +1408,7 @@ test_expect_success 'option override configured sort' '
 		  a
 		* b
 		  c
-		  master
+		  main
 		EOF
 		test_cmp expect actual
 	)
diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh
index 40251c9f8f..349a810cee 100755
--- a/t/t3201-branch-contains.sh
+++ b/t/t3201-branch-contains.sh
@@ -2,6 +2,9 @@
 
 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 '
@@ -10,51 +13,52 @@ test_expect_success setup '
 	git add file &&
 	test_tick &&
 	git commit -m initial &&
+	git branch -M main &&
 	git branch side &&
 
 	echo 1 >file &&
 	test_tick &&
-	git commit -a -m "second on master" &&
+	git commit -a -m "second on main" &&
 
 	git checkout side &&
 	echo 1 >file &&
 	test_tick &&
 	git commit -a -m "second on side" &&
 
-	git merge master
+	git merge main
 
 '
 
-test_expect_success 'branch --contains=master' '
+test_expect_success 'branch --contains=main' '
 
-	git branch --contains=master >actual &&
+	git branch --contains=main >actual &&
 	{
-		echo "  master" && echo "* side"
+		echo "  main" && echo "* side"
 	} >expect &&
 	test_cmp expect actual
 
 '
 
-test_expect_success 'branch --contains master' '
+test_expect_success 'branch --contains main' '
 
-	git branch --contains master >actual &&
+	git branch --contains main >actual &&
 	{
-		echo "  master" && echo "* side"
+		echo "  main" && echo "* side"
 	} >expect &&
 	test_cmp expect actual
 
 '
 
-test_expect_success 'branch --no-contains=master' '
+test_expect_success 'branch --no-contains=main' '
 
-	git branch --no-contains=master >actual &&
+	git branch --no-contains=main >actual &&
 	test_must_be_empty actual
 
 '
 
-test_expect_success 'branch --no-contains master' '
+test_expect_success 'branch --no-contains main' '
 
-	git branch --no-contains master >actual &&
+	git branch --no-contains main >actual &&
 	test_must_be_empty actual
 
 '
@@ -73,7 +77,7 @@ test_expect_success 'branch --no-contains=side' '
 
 	git branch --no-contains=side >actual &&
 	{
-		echo "  master"
+		echo "  main"
 	} >expect &&
 	test_cmp expect actual
 
@@ -81,9 +85,9 @@ test_expect_success 'branch --no-contains=side' '
 
 test_expect_success 'branch --contains with pattern implies --list' '
 
-	git branch --contains=master master >actual &&
+	git branch --contains=main main >actual &&
 	{
-		echo "  master"
+		echo "  main"
 	} >expect &&
 	test_cmp expect actual
 
@@ -91,7 +95,7 @@ test_expect_success 'branch --contains with pattern implies --list' '
 
 test_expect_success 'branch --no-contains with pattern implies --list' '
 
-	git branch --no-contains=master master >actual &&
+	git branch --no-contains=main main >actual &&
 	test_must_be_empty actual
 
 '
@@ -100,7 +104,7 @@ test_expect_success 'side: branch --merged' '
 
 	git branch --merged >actual &&
 	{
-		echo "  master" &&
+		echo "  main" &&
 		echo "* side"
 	} >expect &&
 	test_cmp expect actual
@@ -109,9 +113,9 @@ test_expect_success 'side: branch --merged' '
 
 test_expect_success 'branch --merged with pattern implies --list' '
 
-	git branch --merged=side master >actual &&
+	git branch --merged=side main >actual &&
 	{
-		echo "  master"
+		echo "  main"
 	} >expect &&
 	test_cmp expect actual
 
@@ -124,18 +128,18 @@ test_expect_success 'side: branch --no-merged' '
 
 '
 
-test_expect_success 'master: branch --merged' '
+test_expect_success 'main: branch --merged' '
 
-	git checkout master &&
+	git checkout main &&
 	git branch --merged >actual &&
 	{
-		echo "* master"
+		echo "* main"
 	} >expect &&
 	test_cmp expect actual
 
 '
 
-test_expect_success 'master: branch --no-merged' '
+test_expect_success 'main: branch --no-merged' '
 
 	git branch --no-merged >actual &&
 	{
@@ -147,22 +151,22 @@ test_expect_success 'master: branch --no-merged' '
 
 test_expect_success 'branch --no-merged with pattern implies --list' '
 
-	git branch --no-merged=master master >actual &&
+	git branch --no-merged=main main >actual &&
 	test_must_be_empty actual
 
 '
 
 test_expect_success 'implicit --list conflicts with modification options' '
 
-	test_must_fail git branch --contains=master -d &&
-	test_must_fail git branch --contains=master -m foo &&
-	test_must_fail git branch --no-contains=master -d &&
-	test_must_fail git branch --no-contains=master -m foo
+	test_must_fail git branch --contains=main -d &&
+	test_must_fail git branch --contains=main -m foo &&
+	test_must_fail git branch --no-contains=main -d &&
+	test_must_fail git branch --no-contains=main -m foo
 
 '
 
 test_expect_success 'Assert that --contains only works on commits, not trees & blobs' '
-	test_must_fail git branch --contains master^{tree} &&
+	test_must_fail git branch --contains main^{tree} &&
 	blob=$(git hash-object -w --stdin <<-\EOF
 	Some blob
 	EOF
@@ -171,44 +175,96 @@ test_expect_success 'Assert that --contains only works on commits, not trees & b
 	test_must_fail git branch --no-contains $blob
 '
 
+test_expect_success 'multiple branch --contains' '
+	git checkout -b side2 main &&
+	>feature &&
+	git add feature &&
+	git commit -m "add feature" &&
+	git checkout -b next main &&
+	git merge side &&
+	git branch --contains side --contains side2 >actual &&
+	cat >expect <<-\EOF &&
+	* next
+	  side
+	  side2
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'multiple branch --merged' '
+	git branch --merged next --merged main >actual &&
+	cat >expect <<-\EOF &&
+	  main
+	* next
+	  side
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'multiple branch --no-contains' '
+	git branch --no-contains side --no-contains side2 >actual &&
+	cat >expect <<-\EOF &&
+	  main
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'multiple branch --no-merged' '
+	git branch --no-merged next --no-merged main >actual &&
+	cat >expect <<-\EOF &&
+	  side2
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'branch --contains combined with --no-contains' '
+	git checkout -b seen main &&
+	git merge side &&
+	git merge side2 &&
+	git branch --contains side --no-contains side2 >actual &&
+	cat >expect <<-\EOF &&
+	  next
+	  side
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'branch --merged combined with --no-merged' '
+	git branch --merged seen --no-merged next >actual &&
+	cat >expect <<-\EOF &&
+	* seen
+	  side2
+	EOF
+	test_cmp expect actual
+'
+
 # We want to set up a case where the walk for the tracking info
 # of one branch crosses the tip of another branch (and make sure
 # that the latter walk does not mess up our flag to see if it was
 # merged).
 #
-# Here "topic" tracks "master" with one extra commit, and "zzz" points to the
-# same tip as master The name "zzz" must come alphabetically after "topic"
+# Here "topic" tracks "main" with one extra commit, and "zzz" points to the
+# same tip as main The name "zzz" must come alphabetically after "topic"
 # as we process them in that order.
 test_expect_success 'branch --merged with --verbose' '
-	git branch --track topic master &&
+	git branch --track topic main &&
 	git branch zzz topic &&
 	git checkout topic &&
 	test_commit foo &&
 	git branch --merged topic >actual &&
 	cat >expect <<-\EOF &&
-	  master
+	  main
 	* topic
 	  zzz
 	EOF
 	test_cmp expect actual &&
 	git branch --verbose --merged topic >actual &&
 	cat >expect <<-EOF &&
-	  master $(git rev-parse --short master) second on master
-	* topic  $(git rev-parse --short topic ) [ahead 1] foo
-	  zzz    $(git rev-parse --short zzz   ) second on master
-	EOF
-	test_i18ncmp expect actual
-'
-
-test_expect_success 'branch --contains combined with --no-contains' '
-	git branch --contains zzz --no-contains topic >actual &&
-	cat >expect <<-\EOF &&
-	  master
-	  side
-	  zzz
+	  main  $(git rev-parse --short main) second on main
+	* topic $(git rev-parse --short topic ) [ahead 1] foo
+	  zzz   $(git rev-parse --short zzz   ) second on main
 	EOF
 	test_cmp expect actual
-
 '
 
 test_done
diff --git a/t/t3202-show-branch-octopus.sh b/t/t3202-show-branch-octopus.sh
deleted file mode 100755
index 6adf47869c..0000000000
--- a/t/t3202-show-branch-octopus.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-test_description='test show-branch with more than 8 heads'
-
-. ./test-lib.sh
-
-numbers="1 2 3 4 5 6 7 8 9 10"
-
-test_expect_success 'setup' '
-
-	> file &&
-	git add file &&
-	test_tick &&
-	git commit -m initial &&
-
-	for i in $numbers
-	do
-		git checkout -b branch$i master &&
-		> file$i &&
-		git add file$i &&
-		test_tick &&
-		git commit -m branch$i || return 1
-	done
-
-'
-
-cat > expect << EOF
-! [branch1] branch1
- ! [branch2] branch2
-  ! [branch3] branch3
-   ! [branch4] branch4
-    ! [branch5] branch5
-     ! [branch6] branch6
-      ! [branch7] branch7
-       ! [branch8] branch8
-        ! [branch9] branch9
-         * [branch10] branch10
-----------
-         * [branch10] branch10
-        +  [branch9] branch9
-       +   [branch8] branch8
-      +    [branch7] branch7
-     +     [branch6] branch6
-    +      [branch5] branch5
-   +       [branch4] branch4
-  +        [branch3] branch3
- +         [branch2] branch2
-+          [branch1] branch1
-+++++++++* [branch10^] initial
-EOF
-
-test_expect_success 'show-branch with more than 8 branches' '
-
-	git show-branch $(for i in $numbers; do echo branch$i; done) > out &&
-	test_cmp expect out
-
-'
-
-test_expect_success 'show-branch with showbranch.default' '
-	for i in $numbers; do
-		git config --add showbranch.default branch$i
-	done &&
-	git show-branch >out &&
-	test_cmp expect out
-'
-
-test_done
diff --git a/t/t3202-show-branch.sh b/t/t3202-show-branch.sh
new file mode 100755
index 0000000000..ad9902a06b
--- /dev/null
+++ b/t/t3202-show-branch.sh
@@ -0,0 +1,149 @@
+#!/bin/sh
+
+test_description='test show-branch'
+
+. ./test-lib.sh
+
+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
+	done &&
+	git for-each-ref \
+		--sort=version:refname \
+		--format="%(refname:strip=2)" \
+		"refs/heads/branch*" >branches.sorted &&
+	sed "s/^> //" >expect <<-\EOF
+	> ! [branch1] branch1
+	>  ! [branch2] branch2
+	>   ! [branch3] branch3
+	>    ! [branch4] branch4
+	>     ! [branch5] branch5
+	>      ! [branch6] branch6
+	>       ! [branch7] branch7
+	>        ! [branch8] branch8
+	>         ! [branch9] branch9
+	>          * [branch10] branch10
+	> ----------
+	>          * [branch10] branch10
+	>         +  [branch9] branch9
+	>        +   [branch8] branch8
+	>       +    [branch7] branch7
+	>      +     [branch6] branch6
+	>     +      [branch5] branch5
+	>    +       [branch4] branch4
+	>   +        [branch3] branch3
+	>  +         [branch2] branch2
+	> +          [branch1] branch1
+	> +++++++++* [branch10^] initial
+	EOF
+'
+
+test_expect_success 'show-branch with more than 8 branches' '
+	git show-branch $(cat branches.sorted) >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'show-branch with showbranch.default' '
+	for branch in $(cat branches.sorted)
+	do
+		test_config showbranch.default $branch --add
+	done &&
+	git show-branch >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'show-branch --color output' '
+	sed "s/^> //" >expect <<-\EOF &&
+	> <RED>!<RESET> [branch1] branch1
+	>  <GREEN>!<RESET> [branch2] branch2
+	>   <YELLOW>!<RESET> [branch3] branch3
+	>    <BLUE>!<RESET> [branch4] branch4
+	>     <MAGENTA>!<RESET> [branch5] branch5
+	>      <CYAN>!<RESET> [branch6] branch6
+	>       <BOLD;RED>!<RESET> [branch7] branch7
+	>        <BOLD;GREEN>!<RESET> [branch8] branch8
+	>         <BOLD;YELLOW>!<RESET> [branch9] branch9
+	>          <BOLD;BLUE>*<RESET> [branch10] branch10
+	> ----------
+	>          <BOLD;BLUE>*<RESET> [branch10] branch10
+	>         <BOLD;YELLOW>+<RESET>  [branch9] branch9
+	>        <BOLD;GREEN>+<RESET>   [branch8] branch8
+	>       <BOLD;RED>+<RESET>    [branch7] branch7
+	>      <CYAN>+<RESET>     [branch6] branch6
+	>     <MAGENTA>+<RESET>      [branch5] branch5
+	>    <BLUE>+<RESET>       [branch4] branch4
+	>   <YELLOW>+<RESET>        [branch3] branch3
+	>  <GREEN>+<RESET>         [branch2] branch2
+	> <RED>+<RESET>          [branch1] branch1
+	> <RED>+<RESET><GREEN>+<RESET><YELLOW>+<RESET><BLUE>+<RESET><MAGENTA>+<RESET><CYAN>+<RESET><BOLD;RED>+<RESET><BOLD;GREEN>+<RESET><BOLD;YELLOW>+<RESET><BOLD;BLUE>*<RESET> [branch10^] initial
+	EOF
+	git show-branch --color=always $(cat branches.sorted) >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'show branch --remotes' '
+	cat >expect.err <<-\EOF &&
+	No revs to be shown.
+	EOF
+	git show-branch -r 2>actual.err >actual.out &&
+	test_cmp expect.err actual.err &&
+	test_must_be_empty actual.out
+'
+
+test_expect_success 'setup show branch --list' '
+	sed "s/^> //" >expect <<-\EOF
+	>   [branch1] branch1
+	>   [branch2] branch2
+	>   [branch3] branch3
+	>   [branch4] branch4
+	>   [branch5] branch5
+	>   [branch6] branch6
+	>   [branch7] branch7
+	>   [branch8] branch8
+	>   [branch9] branch9
+	> * [branch10] branch10
+	EOF
+'
+
+test_expect_success 'show branch --list' '
+	git show-branch --list $(cat branches.sorted) >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'show branch --list has no --color output' '
+	git show-branch --color=always --list $(cat branches.sorted) >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'show branch --merge-base with one argument' '
+	for branch in $(cat branches.sorted)
+	do
+		git rev-parse $branch >expect &&
+		git show-branch --merge-base $branch >actual &&
+		test_cmp expect actual
+	done
+'
+
+test_expect_success 'show branch --merge-base with two arguments' '
+	for branch in $(cat branches.sorted)
+	do
+		git rev-parse initial >expect &&
+		git show-branch --merge-base initial $branch >actual &&
+		test_cmp expect actual
+	done
+'
+
+test_expect_success 'show branch --merge-base with N arguments' '
+	git rev-parse initial >expect &&
+	git show-branch --merge-base $(cat branches.sorted) >actual &&
+	test_cmp expect actual &&
+
+	git merge-base $(cat branches.sorted) >actual &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t3203-branch-output.sh b/t/t3203-branch-output.sh
index 71818b90f0..6e94c6db7b 100755
--- a/t/t3203-branch-output.sh
+++ b/t/t3203-branch-output.sh
@@ -1,6 +1,9 @@
 #!/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
 
@@ -8,6 +11,7 @@ test_expect_success 'make commits' '
 	echo content >file &&
 	git add file &&
 	git commit -m one &&
+	git branch -M main &&
 	echo content >>file &&
 	git commit -a -m two
 '
@@ -26,7 +30,7 @@ test_expect_success 'make remote branches' '
 cat >expect <<'EOF'
   branch-one
   branch-two
-* master
+* main
 EOF
 test_expect_success 'git branch shows local branches' '
 	git branch >actual &&
@@ -60,7 +64,7 @@ test_expect_success 'git branch -r shows remote branches' '
 cat >expect <<'EOF'
   branch-one
   branch-two
-* master
+* main
   remotes/origin/HEAD -> origin/branch-one
   remotes/origin/branch-one
   remotes/origin/branch-two
@@ -152,24 +156,24 @@ test_expect_success 'git branch shows detached HEAD properly' '
 * (HEAD detached at $(git rev-parse --short HEAD^0))
   branch-one
   branch-two
-  master
+  main
 EOF
 	git checkout HEAD^0 &&
 	git branch >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'git branch shows detached HEAD properly after checkout --detach' '
-	git checkout master &&
+	git checkout main &&
 	cat >expect <<EOF &&
 * (HEAD detached at $(git rev-parse --short HEAD^0))
   branch-one
   branch-two
-  master
+  main
 EOF
 	git checkout --detach &&
 	git branch >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'git branch shows detached HEAD properly after moving' '
@@ -177,11 +181,11 @@ test_expect_success 'git branch shows detached HEAD properly after moving' '
 * (HEAD detached from $(git rev-parse --short HEAD))
   branch-one
   branch-two
-  master
+  main
 EOF
 	git reset --hard HEAD^1 &&
 	git branch >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'git branch shows detached HEAD properly from tag' '
@@ -189,12 +193,12 @@ test_expect_success 'git branch shows detached HEAD properly from tag' '
 * (HEAD detached at fromtag)
   branch-one
   branch-two
-  master
+  main
 EOF
-	git tag fromtag master &&
+	git tag fromtag main &&
 	git checkout fromtag &&
 	git branch >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'git branch shows detached HEAD properly after moving from tag' '
@@ -202,28 +206,77 @@ test_expect_success 'git branch shows detached HEAD properly after moving from t
 * (HEAD detached from fromtag)
   branch-one
   branch-two
-  master
+  main
 EOF
 	git reset --hard HEAD^1 &&
 	git branch >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
-test_expect_success 'git branch `--sort` option' '
+test_expect_success 'git branch `--sort=[-]objectsize` option' '
 	cat >expect <<-\EOF &&
 	* (HEAD detached from fromtag)
 	  branch-two
 	  branch-one
-	  master
+	  main
 	EOF
 	git branch --sort=objectsize >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  branch-one
+	  main
+	  branch-two
+	EOF
+	git branch --sort=-objectsize >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git branch `--sort=[-]type` option' '
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  branch-one
+	  branch-two
+	  main
+	EOF
+	git branch --sort=type >actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  branch-one
+	  branch-two
+	  main
+	EOF
+	git branch --sort=-type >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'git branch `--sort=[-]version:refname` option' '
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  branch-one
+	  branch-two
+	  main
+	EOF
+	git branch --sort=version:refname >actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-\EOF &&
+	* (HEAD detached from fromtag)
+	  main
+	  branch-two
+	  branch-one
+	EOF
+	git branch --sort=-version:refname >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git branch --points-at option' '
 	cat >expect <<-\EOF &&
 	  branch-one
-	  master
+	  main
 	EOF
 	git branch --points-at=branch-one >actual &&
 	test_cmp expect actual
@@ -251,7 +304,7 @@ test_expect_success 'local-branch symrefs shortened properly' '
 
 test_expect_success 'sort branches, ignore case' '
 	(
-		git init sort-icase &&
+		git init -b main sort-icase &&
 		cd sort-icase &&
 		test_commit initial &&
 		git branch branch-one &&
@@ -260,14 +313,14 @@ test_expect_success 'sort branches, ignore case' '
 		cat >expected <<-\EOF &&
 		BRANCH-two
 		branch-one
-		master
+		main
 		EOF
 		test_cmp expected actual &&
 		git branch --list -i | awk "{print \$NF}" >actual &&
 		cat >expected <<-\EOF &&
 		branch-one
 		BRANCH-two
-		master
+		main
 		EOF
 		test_cmp expected actual
 	)
@@ -279,12 +332,16 @@ test_expect_success 'git branch --format option' '
 	Refname is refs/heads/ambiguous
 	Refname is refs/heads/branch-one
 	Refname is refs/heads/branch-two
-	Refname is refs/heads/master
+	Refname is refs/heads/main
 	Refname is refs/heads/ref-to-branch
 	Refname is refs/heads/ref-to-remote
 	EOF
 	git branch --format="Refname is %(refname)" >actual &&
-	test_i18ncmp expect actual
+	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' '
@@ -293,7 +350,7 @@ test_expect_success 'worktree colors correct' '
 	  ambiguous<RESET>
 	  branch-one<RESET>
 	+ <CYAN>branch-two<RESET>
-	  master<RESET>
+	  main<RESET>
 	  ref-to-branch<RESET> -> branch-one
 	  ref-to-remote<RESET> -> origin/branch-one
 	EOF
@@ -302,13 +359,13 @@ test_expect_success 'worktree colors correct' '
 	rm -r worktree_dir &&
 	git worktree prune &&
 	test_decode_color <actual.raw >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success "set up color tests" '
-	echo "<RED>master<RESET>" >expect.color &&
-	echo "master" >expect.bare &&
-	color_args="--format=%(color:red)%(refname:short) --list master"
+	echo "<RED>main<RESET>" >expect.color &&
+	echo "main" >expect.bare &&
+	color_args="--format=%(color:red)%(refname:short) --list main"
 '
 
 test_expect_success '%(color) omitted without tty' '
@@ -331,13 +388,13 @@ test_expect_success '--color overrides auto-color' '
 
 test_expect_success 'verbose output lists worktree path' '
 	one=$(git rev-parse --short HEAD) &&
-	two=$(git rev-parse --short master) &&
+	two=$(git rev-parse --short main) &&
 	cat >expect <<-EOF &&
 	* (HEAD detached from fromtag) $one one
 	  ambiguous                    $one one
 	  branch-one                   $two two
 	+ branch-two                   $one ($(pwd)/worktree_dir) one
-	  master                       $two two
+	  main                         $two two
 	  ref-to-branch                $two two
 	  ref-to-remote                $two two
 	EOF
@@ -345,7 +402,7 @@ test_expect_success 'verbose output lists worktree path' '
 	git branch -vv >actual &&
 	rm -r worktree_dir &&
 	git worktree prune &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_done
diff --git a/t/t3204-branch-name-interpretation.sh b/t/t3204-branch-name-interpretation.sh
index 698d9cc4f3..993a6b5eff 100755
--- a/t/t3204-branch-name-interpretation.sh
+++ b/t/t3204-branch-name-interpretation.sh
@@ -6,6 +6,9 @@ Branch name arguments are usually names which are taken to be inside of
 refs/heads/, but we interpret some magic syntax like @{-1}, @{upstream}, etc.
 This script aims to check the behavior of those corner cases.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 expect_branch() {
@@ -28,7 +31,7 @@ test_expect_success 'update branch via @{-1}' '
 	git branch previous one &&
 
 	git checkout previous &&
-	git checkout master &&
+	git checkout main &&
 
 	git branch -f @{-1} two &&
 	expect_branch previous two
@@ -58,7 +61,7 @@ test_expect_success 'delete branch via @{-1}' '
 	git branch previous-del &&
 
 	git checkout previous-del &&
-	git checkout master &&
+	git checkout main &&
 
 	git branch -D @{-1} &&
 	expect_deleted previous-del
@@ -98,7 +101,7 @@ test_expect_success 'disallow deleting remote branch via @{-1}' '
 	git update-ref refs/remotes/origin/previous one &&
 
 	git checkout -b origin/previous two &&
-	git checkout master &&
+	git checkout main &&
 
 	test_must_fail git branch -r -D @{-1} &&
 	expect_branch refs/remotes/origin/previous one &&
diff --git a/t/t3205-branch-color.sh b/t/t3205-branch-color.sh
index 4f1e16bb44..08bd906173 100755
--- a/t/t3205-branch-color.sh
+++ b/t/t3205-branch-color.sh
@@ -1,11 +1,15 @@
 #!/bin/sh
 
 test_description='basic branch output coloring'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'set up some sample branches' '
 	test_commit foo &&
-	git update-ref refs/remotes/origin/master HEAD &&
+	git branch -M main &&
+	git update-ref refs/remotes/origin/main HEAD &&
 	git update-ref refs/heads/other HEAD
 '
 
@@ -19,9 +23,9 @@ test_expect_success 'set up some color config' '
 
 test_expect_success 'regular output shows colors' '
 	cat >expect <<-\EOF &&
-	* <CYAN>master<RESET>
+	* <CYAN>main<RESET>
 	  <BLUE>other<RESET>
-	  <YELLOW>remotes/origin/master<RESET>
+	  <YELLOW>remotes/origin/main<RESET>
 	EOF
 	git branch --color -a >actual.raw &&
 	test_decode_color <actual.raw >actual &&
@@ -31,9 +35,9 @@ test_expect_success 'regular output shows colors' '
 test_expect_success 'verbose output shows colors' '
 	oid=$(git rev-parse --short HEAD) &&
 	cat >expect <<-EOF &&
-	* <CYAN>master               <RESET> $oid foo
-	  <BLUE>other                <RESET> $oid foo
-	  <YELLOW>remotes/origin/master<RESET> $oid foo
+	* <CYAN>main               <RESET> $oid foo
+	  <BLUE>other              <RESET> $oid foo
+	  <YELLOW>remotes/origin/main<RESET> $oid foo
 	EOF
 	git branch --color -v -a >actual.raw &&
 	test_decode_color <actual.raw >actual &&
diff --git a/t/t3206-range-diff.sh b/t/t3206-range-diff.sh
index 0579cd9969..e30bc48a29 100755
--- a/t/t3206-range-diff.sh
+++ b/t/t3206-range-diff.sh
@@ -2,14 +2,17 @@
 
 test_description='range-diff tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Note that because of the range-diff's heuristics, test_commit does more
 # harm than good.  We need some real history.
 
 test_expect_success 'setup' '
-	git fast-import < "$TEST_DIRECTORY"/t3206/history.export &&
-	test_oid_cache <<-EOF
+	git fast-import <"$TEST_DIRECTORY"/t3206/history.export &&
+	test_oid_cache <<-\EOF
 	# topic
 	t1 sha1:4de457d
 	t2 sha1:fccce22
@@ -102,6 +105,14 @@ test_expect_success 'setup' '
 	n3 sha256:3b0a644
 	n4 sha256:e461653
 
+	# mode change
+	o1 sha1:4d39cb3
+	o2 sha1:26c107f
+	o3 sha1:4c1e0f5
+	o1 sha256:d0dd598
+	o2 sha256:c4a279e
+	o3 sha256:78459d7
+
 	# added and removed
 	s1 sha1:096b1ba
 	s2 sha1:d92e698
@@ -119,90 +130,103 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'simple A..B A..C (unmodified)' '
-	git range-diff --no-color master..topic master..unmodified \
+	git range-diff --no-color main..topic main..unmodified \
 		>actual &&
-	cat >expected <<-EOF &&
+	cat >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
 	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
 	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
 	4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'simple B...C (unmodified)' '
 	git range-diff --no-color topic...unmodified >actual &&
-	# same "expected" as above
-	test_cmp expected actual
+	# same "expect" as above
+	test_cmp expect actual
 '
 
 test_expect_success 'simple A B C (unmodified)' '
-	git range-diff --no-color master topic unmodified >actual &&
-	# same "expected" as above
-	test_cmp expected actual
+	git range-diff --no-color main topic unmodified >actual &&
+	# same "expect" as above
+	test_cmp expect actual
+'
+
+test_expect_success 'A^! and A^-<n> (unmodified)' '
+	git range-diff --no-color topic^! unmodified^-1 >actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t4) = 1:  $(test_oid u4) s/12/B/
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'A^{/..} is not mistaken for a range' '
+	test_must_fail git range-diff topic^.. topic^{/..} 2>error &&
+	test_i18ngrep "not a commit range" error
 '
 
 test_expect_success 'trivial reordering' '
-	git range-diff --no-color master topic reordered >actual &&
-	cat >expected <<-EOF &&
+	git range-diff --no-color main topic reordered >actual &&
+	cat >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid r1) s/5/A/
 	3:  $(test_oid t3) = 2:  $(test_oid r2) s/11/B/
 	4:  $(test_oid t4) = 3:  $(test_oid r3) s/12/B/
 	2:  $(test_oid t2) = 4:  $(test_oid r4) s/4/A/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'removed a commit' '
-	git range-diff --no-color master topic removed >actual &&
-	cat >expected <<-EOF &&
+	git range-diff --no-color main topic removed >actual &&
+	cat >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid d1) s/5/A/
 	2:  $(test_oid t2) < -:  $(test_oid __) s/4/A/
 	3:  $(test_oid t3) = 2:  $(test_oid d2) s/11/B/
 	4:  $(test_oid t4) = 3:  $(test_oid d3) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'added a commit' '
-	git range-diff --no-color master topic added >actual &&
-	cat >expected <<-EOF &&
+	git range-diff --no-color main topic added >actual &&
+	cat >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid a1) s/5/A/
 	2:  $(test_oid t2) = 2:  $(test_oid a2) s/4/A/
 	-:  $(test_oid __) > 3:  $(test_oid a3) s/6/A/
 	3:  $(test_oid t3) = 4:  $(test_oid a4) s/11/B/
 	4:  $(test_oid t4) = 5:  $(test_oid a5) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'new base, A B C' '
-	git range-diff --no-color master topic rebased >actual &&
-	cat >expected <<-EOF &&
+	git range-diff --no-color main topic rebased >actual &&
+	cat >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid b1) s/5/A/
 	2:  $(test_oid t2) = 2:  $(test_oid b2) s/4/A/
 	3:  $(test_oid t3) = 3:  $(test_oid b3) s/11/B/
 	4:  $(test_oid t4) = 4:  $(test_oid b4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'new base, B...C' '
-	# this syntax includes the commits from master!
+	# this syntax includes the commits from main!
 	git range-diff --no-color topic...rebased >actual &&
-	cat >expected <<-EOF &&
+	cat >expect <<-EOF &&
 	-:  $(test_oid __) > 1:  $(test_oid b5) unrelated
 	1:  $(test_oid t1) = 2:  $(test_oid b1) s/5/A/
 	2:  $(test_oid t2) = 3:  $(test_oid b2) s/4/A/
 	3:  $(test_oid t3) = 4:  $(test_oid b3) s/11/B/
 	4:  $(test_oid t4) = 5:  $(test_oid b4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'changed commit' '
 	git range-diff --no-color topic...changed >actual &&
-	cat >expected <<-EOF &&
+	cat >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
 	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
 	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
@@ -226,42 +250,38 @@ test_expect_success 'changed commit' '
 	     +B
 	      13
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'changed commit with --no-patch diff option' '
 	git range-diff --no-color --no-patch topic...changed >actual &&
-	cat >expected <<-EOF &&
+	cat >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
 	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
 	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
 	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'changed commit with --stat diff option' '
 	git range-diff --no-color --stat topic...changed >actual &&
-	cat >expected <<-EOF &&
+	cat >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
-	     a => b | 0
-	     1 file changed, 0 insertions(+), 0 deletions(-)
 	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
-	     a => b | 0
-	     1 file changed, 0 insertions(+), 0 deletions(-)
 	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
-	     a => b | 0
-	     1 file changed, 0 insertions(+), 0 deletions(-)
+	     a => b | 2 +-
+	     1 file changed, 1 insertion(+), 1 deletion(-)
 	4:  $(test_oid t4) ! 4:  $(test_oid c4) s/12/B/
-	     a => b | 0
-	     1 file changed, 0 insertions(+), 0 deletions(-)
+	     a => b | 2 +-
+	     1 file changed, 1 insertion(+), 1 deletion(-)
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'changed commit with sm config' '
 	git range-diff --no-color --submodule=log topic...changed >actual &&
-	cat >expected <<-EOF &&
+	cat >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid c1) s/5/A/
 	2:  $(test_oid t2) = 2:  $(test_oid c2) s/4/A/
 	3:  $(test_oid t3) ! 3:  $(test_oid c3) s/11/B/
@@ -285,12 +305,12 @@ test_expect_success 'changed commit with sm config' '
 	     +B
 	      13
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'renamed file' '
 	git range-diff --no-color --submodule=log topic...renamed-file >actual &&
-	sed s/Z/\ /g >expected <<-EOF &&
+	sed s/Z/\ /g >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid n1) s/5/A/
 	2:  $(test_oid t2) ! 2:  $(test_oid n2) s/4/A/
 	    @@ Metadata
@@ -330,13 +350,13 @@ test_expect_success 'renamed file' '
 	    Z 10
 	    Z B
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'file with mode only change' '
 	git range-diff --no-color --submodule=log topic...mode-only-change >actual &&
-	sed s/Z/\ /g >expected <<-EOF &&
-	1:  fccce22 ! 1:  4d39cb3 s/4/A/
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t2) ! 1:  $(test_oid o1) s/4/A/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -352,7 +372,7 @@ test_expect_success 'file with mode only change' '
 	    Z 7
 	    +
 	    + ## other-file (new) ##
-	2:  147e64e ! 2:  26c107f s/11/B/
+	2:  $(test_oid t3) ! 2:  $(test_oid o2) s/11/B/
 	    @@ Metadata
 	    ZAuthor: Thomas Rast <trast@inf.ethz.ch>
 	    Z
@@ -368,14 +388,14 @@ test_expect_success 'file with mode only change' '
 	    Z 14
 	    +
 	    + ## other-file (mode change 100644 => 100755) ##
-	3:  a63e992 = 3:  4c1e0f5 s/12/B/
+	3:  $(test_oid t4) = 3:  $(test_oid o3) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'file added and later removed' '
 	git range-diff --no-color --submodule=log topic...added-removed >actual &&
-	sed s/Z/\ /g >expected <<-EOF &&
+	sed s/Z/\ /g >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid s1) s/5/A/
 	2:  $(test_oid t2) ! 2:  $(test_oid s2) s/4/A/
 	    @@ Metadata
@@ -411,17 +431,17 @@ test_expect_success 'file added and later removed' '
 	    + ## new-file (deleted) ##
 	4:  $(test_oid t4) = 4:  $(test_oid s4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'no commits on one side' '
 	git commit --amend -m "new message" &&
-	git range-diff master HEAD@{1} HEAD
+	git range-diff main HEAD@{1} HEAD
 '
 
 test_expect_success 'changed message' '
 	git range-diff --no-color topic...changed-message >actual &&
-	sed s/Z/\ /g >expected <<-EOF &&
+	sed s/Z/\ /g >expect <<-EOF &&
 	1:  $(test_oid t1) = 1:  $(test_oid m1) s/5/A/
 	2:  $(test_oid t2) ! 2:  $(test_oid m2) s/4/A/
 	    @@ Metadata
@@ -436,7 +456,7 @@ test_expect_success 'changed message' '
 	3:  $(test_oid t3) = 3:  $(test_oid m3) s/11/B/
 	4:  $(test_oid t4) = 4:  $(test_oid m4) s/12/B/
 	EOF
-	test_cmp expected actual
+	test_cmp expect actual
 '
 
 test_expect_success 'dual-coloring' '
@@ -478,11 +498,11 @@ test_expect_success 'dual-coloring' '
 	test_cmp expect actual
 '
 
-for prev in topic master..topic
+for prev in topic main..topic
 do
 	test_expect_success "format-patch --range-diff=$prev" '
 		git format-patch --cover-letter --range-diff=$prev \
-			master..unmodified >actual &&
+			main..unmodified >actual &&
 		test_when_finished "rm 000?-*" &&
 		test_line_count = 5 actual &&
 		test_i18ngrep "^Range-diff:$" 0000-* &&
@@ -501,8 +521,255 @@ test_expect_success 'format-patch --range-diff as commentary' '
 	grep "> 1: .* new message" 0001-*
 '
 
+test_expect_success 'format-patch --range-diff reroll-count with a non-integer' '
+	git format-patch --range-diff=HEAD~1 -v2.9 HEAD~1 >actual &&
+	test_when_finished "rm v2.9-0001-*" &&
+	test_line_count = 1 actual &&
+	test_i18ngrep "^Range-diff:$" v2.9-0001-* &&
+	grep "> 1: .* new message" v2.9-0001-*
+'
+
+test_expect_success 'format-patch --range-diff reroll-count with a integer' '
+	git format-patch --range-diff=HEAD~1 -v2 HEAD~1 >actual &&
+	test_when_finished "rm v2-0001-*" &&
+	test_line_count = 1 actual &&
+	test_i18ngrep "^Range-diff ..* v1:$" v2-0001-* &&
+	grep "> 1: .* new message" v2-0001-*
+'
+
+test_expect_success 'format-patch --range-diff with v0' '
+	git format-patch --range-diff=HEAD~1 -v0 HEAD~1 >actual &&
+	test_when_finished "rm v0-0001-*" &&
+	test_line_count = 1 actual &&
+	test_i18ngrep "^Range-diff:$" v0-0001-* &&
+	grep "> 1: .* new message" v0-0001-*
+'
+
 test_expect_success 'range-diff overrides diff.noprefix internally' '
 	git -c diff.noprefix=true range-diff HEAD^...
 '
 
+test_expect_success 'basic with modified format.pretty with suffix' '
+	git -c format.pretty="format:commit %H%d%n" range-diff \
+		main..topic main..unmodified
+'
+
+test_expect_success 'basic with modified format.pretty without "commit "' '
+	git -c format.pretty="format:%H%n" range-diff \
+		main..topic main..unmodified
+'
+
+test_expect_success 'range-diff compares notes by default' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	git range-diff --no-color main..topic main..unmodified \
+		>actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes ##
+	    -    topic note
+	    +    unmodified note
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'range-diff with --no-notes' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	git range-diff --no-color --no-notes main..topic main..unmodified \
+		>actual &&
+	cat >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) = 4:  $(test_oid u4) s/12/B/
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'range-diff with multiple --notes' '
+	git notes --ref=note1 add -m "topic note1" topic &&
+	git notes --ref=note1 add -m "unmodified note1" unmodified &&
+	test_when_finished git notes --ref=note1 remove topic unmodified &&
+	git notes --ref=note2 add -m "topic note2" topic &&
+	git notes --ref=note2 add -m "unmodified note2" unmodified &&
+	test_when_finished git notes --ref=note2 remove topic unmodified &&
+	git range-diff --no-color --notes=note1 --notes=note2 main..topic main..unmodified \
+		>actual &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	1:  $(test_oid t1) = 1:  $(test_oid u1) s/5/A/
+	2:  $(test_oid t2) = 2:  $(test_oid u2) s/4/A/
+	3:  $(test_oid t3) = 3:  $(test_oid u3) s/11/B/
+	4:  $(test_oid t4) ! 4:  $(test_oid u4) s/12/B/
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes (note1) ##
+	    -    topic note1
+	    +    unmodified note1
+	    Z
+	    Z
+	    Z ## Notes (note2) ##
+	    -    topic note2
+	    +    unmodified note2
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'format-patch --range-diff does not compare notes by default' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	git format-patch --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	test_when_finished "rm 000?-*" &&
+	test_line_count = 5 actual &&
+	test_i18ngrep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "= 4: .* s/12/B" 0000-* &&
+	! grep "Notes" 0000-* &&
+	! grep "note" 0000-*
+'
+
+test_expect_success 'format-patch --range-diff with --no-notes' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	git format-patch --no-notes --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	test_when_finished "rm 000?-*" &&
+	test_line_count = 5 actual &&
+	test_i18ngrep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "= 4: .* s/12/B" 0000-* &&
+	! grep "Notes" 0000-* &&
+	! grep "note" 0000-*
+'
+
+test_expect_success 'format-patch --range-diff with --notes' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	git format-patch --notes --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	test_when_finished "rm 000?-*" &&
+	test_line_count = 5 actual &&
+	test_i18ngrep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "! 4: .* s/12/B" 0000-* &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes ##
+	    -    topic note
+	    +    unmodified note
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'format-patch --range-diff with format.notes config' '
+	git notes add -m "topic note" topic &&
+	git notes add -m "unmodified note" unmodified &&
+	test_when_finished git notes remove topic unmodified &&
+	test_config format.notes true &&
+	git format-patch --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	test_when_finished "rm 000?-*" &&
+	test_line_count = 5 actual &&
+	test_i18ngrep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "! 4: .* s/12/B" 0000-* &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes ##
+	    -    topic note
+	    +    unmodified note
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'format-patch --range-diff with multiple notes' '
+	git notes --ref=note1 add -m "topic note1" topic &&
+	git notes --ref=note1 add -m "unmodified note1" unmodified &&
+	test_when_finished git notes --ref=note1 remove topic unmodified &&
+	git notes --ref=note2 add -m "topic note2" topic &&
+	git notes --ref=note2 add -m "unmodified note2" unmodified &&
+	test_when_finished git notes --ref=note2 remove topic unmodified &&
+	git format-patch --notes=note1 --notes=note2 --cover-letter --range-diff=$prev \
+		main..unmodified >actual &&
+	test_when_finished "rm 000?-*" &&
+	test_line_count = 5 actual &&
+	test_i18ngrep "^Range-diff:$" 0000-* &&
+	grep "= 1: .* s/5/A" 0000-* &&
+	grep "= 2: .* s/4/A" 0000-* &&
+	grep "= 3: .* s/11/B" 0000-* &&
+	grep "! 4: .* s/12/B" 0000-* &&
+	sed s/Z/\ /g >expect <<-EOF &&
+	    @@ Commit message
+	    Z
+	    Z
+	    Z ## Notes (note1) ##
+	    -    topic note1
+	    +    unmodified note1
+	    Z
+	    Z
+	    Z ## Notes (note2) ##
+	    -    topic note2
+	    +    unmodified note2
+	    Z
+	    Z ## file ##
+	    Z@@ file: A
+	EOF
+	sed "/@@ Commit message/,/@@ file: A/!d" 0000-* >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--left-only/--right-only' '
+	git switch --orphan left-right &&
+	test_commit first &&
+	test_commit unmatched &&
+	test_commit common &&
+	git switch -C left-right first &&
+	git cherry-pick common &&
+
+	git range-diff -s --left-only ...common >actual &&
+	head_oid=$(git rev-parse --short HEAD) &&
+	common_oid=$(git rev-parse --short common) &&
+	echo "1:  $head_oid = 2:  $common_oid common" >expect &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t3206/history.export b/t/t3206/history.export
index 4c808e5b3b..4485adc37b 100644
--- a/t/t3206/history.export
+++ b/t/t3206/history.export
@@ -168,7 +168,7 @@ mark :11
 data 10
 unrelated
 
-commit refs/heads/master
+commit refs/heads/main
 mark :12
 author Thomas Rast <trast@inf.ethz.ch> 1374485127 +0200
 committer Thomas Rast <trast@inf.ethz.ch> 1374485127 +0200
diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index 9ea5fa4fd2..577f32dc71 100755
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -9,6 +9,9 @@ test_description='git pack-refs should not change the branch semantic
 This test runs git pack-refs and git show-ref and checks that the branch
 semantic is still the same.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'enable reflogs' '
@@ -135,7 +138,7 @@ test_expect_success 'delete ref with dangling packed version' '
 	git commit --allow-empty -m "future garbage" &&
 	git pack-refs --all &&
 	git reset --hard HEAD^ &&
-	git checkout master &&
+	git checkout main &&
 	git reflog expire --expire=all --all &&
 	git prune --expire=all &&
 	git branch -d lamb 2>result &&
@@ -240,7 +243,7 @@ test_expect_success 'retry acquiring packed-refs.lock' '
 
 test_expect_success SYMLINKS 'pack symlinked packed-refs' '
 	# First make sure that symlinking works when reading:
-	git update-ref refs/heads/loosy refs/heads/master &&
+	git update-ref refs/heads/lossy refs/heads/main &&
 	git for-each-ref >all-refs-before &&
 	mv .git/packed-refs .git/my-deviant-packed-refs &&
 	ln -s my-deviant-packed-refs .git/packed-refs &&
@@ -250,7 +253,7 @@ test_expect_success SYMLINKS 'pack symlinked packed-refs' '
 	git for-each-ref >all-refs-packed &&
 	test_cmp all-refs-before all-refs-packed &&
 	test -h .git/packed-refs &&
-	test "$(readlink .git/packed-refs)" = "my-deviant-packed-refs"
+	test "$(test_readlink .git/packed-refs)" = "my-deviant-packed-refs"
 '
 
 test_done
diff --git a/t/t3211-peel-ref.sh b/t/t3211-peel-ref.sh
index 3b7caca421..37b9d26f4b 100755
--- a/t/t3211-peel-ref.sh
+++ b/t/t3211-peel-ref.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 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-lib.sh
 
 test_expect_success 'create annotated tag in refs/tags' '
@@ -19,7 +22,7 @@ print_ref() {
 
 test_expect_success 'set up expected show-ref output' '
 	{
-		print_ref "refs/heads/master" &&
+		print_ref "refs/heads/main" &&
 		print_ref "refs/outside/foo" &&
 		print_ref "refs/outside/foo^{}" &&
 		print_ref "refs/tags/base" &&
@@ -47,7 +50,7 @@ test_expect_success 'create old-style pack-refs without fully-peeled' '
 	# know we are emulating exactly what an older git would have written.
 	{
 		echo "# pack-refs with: peeled " &&
-		print_ref "refs/heads/master" &&
+		print_ref "refs/heads/main" &&
 		print_ref "refs/outside/foo" &&
 		print_ref "refs/tags/base" &&
 		print_ref "refs/tags/foo" &&
diff --git a/t/t3300-funny-names.sh b/t/t3300-funny-names.sh
index 04de03cad0..f5bf16abcd 100755
--- a/t/t3300-funny-names.sh
+++ b/t/t3300-funny-names.sh
@@ -181,7 +181,7 @@ test_expect_success 'diffstat for rename quotes funny filename' '
 	git diff-index -M -p $t0 >diff &&
 	git apply --stat <diff >diffstat &&
 	sed -e "s/|.*//" -e "s/ *\$//" <diffstat >current &&
-	test_i18ncmp expected current
+	test_cmp expected current
 '
 
 test_expect_success 'numstat for rename quotes funny filename' '
diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
index d3fa298c6a..d742be8840 100755
--- a/t/t3301-notes.sh
+++ b/t/t3301-notes.sh
@@ -54,7 +54,9 @@ test_expect_success 'create notes' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b4" = "$(git notes show)" &&
+	echo b4 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
@@ -79,14 +81,21 @@ test_expect_success 'edit existing notes' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b3" = "$(git notes show)" &&
+	echo b3 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
 
 test_expect_success 'show notes from treeish' '
-	test "b3" = "$(git notes --ref commits^{tree} show)" &&
-	test "b4" = "$(git notes --ref commits@{1} show)"
+	echo b3 >expect &&
+	git notes --ref commits^{tree} show >actual &&
+	test_cmp expect actual &&
+
+	echo b4 >expect &&
+	git notes --ref commits@{1} show >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'cannot edit notes from non-ref' '
@@ -99,7 +108,9 @@ test_expect_success 'cannot "git notes add -m" where notes already exists' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b3" = "$(git notes show)" &&
+	echo b3 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
@@ -109,7 +120,9 @@ test_expect_success 'can overwrite existing note with "git notes add -f -m"' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b1" = "$(git notes show)" &&
+	echo b1 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
@@ -119,7 +132,9 @@ test_expect_success 'add w/no options on existing note morphs into edit' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b2" = "$(git notes show)" &&
+	echo b2 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
@@ -129,7 +144,9 @@ test_expect_success 'can overwrite existing note with "git notes add -f"' '
 	test_path_is_missing .git/NOTES_EDITMSG &&
 	git ls-tree -r refs/notes/commits >actual &&
 	test_line_count = 1 actual &&
-	test "b1" = "$(git notes show)" &&
+	echo b1 >expect &&
+	git notes show >actual &&
+	test_cmp expect actual &&
 	git show HEAD^ &&
 	test_must_fail git notes show HEAD^
 '
@@ -146,7 +163,8 @@ test_expect_success 'show notes' '
 		Notes:
 		${indent}b1
 	EOF
-	! (git cat-file commit HEAD | grep b1) &&
+	git cat-file commit HEAD >commits &&
+	! grep b1 commits &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -472,9 +490,11 @@ test_expect_success 'removing with --stdin --ignore-missing' '
 test_expect_success 'list notes with "git notes list"' '
 	commit_2=$(git rev-parse 2nd) &&
 	commit_3=$(git rev-parse 3rd) &&
+	note_2=$(git rev-parse refs/notes/commits:$commit_2) &&
+	note_3=$(git rev-parse refs/notes/commits:$commit_3) &&
 	sort -t" " -k2 >expect <<-EOF &&
-		$(git rev-parse refs/notes/commits:$commit_2) $commit_2
-		$(git rev-parse refs/notes/commits:$commit_3) $commit_3
+		$note_2 $commit_2
+		$note_3 $commit_3
 	EOF
 	git notes list >actual &&
 	test_cmp expect actual
@@ -486,9 +506,7 @@ test_expect_success 'list notes with "git notes"' '
 '
 
 test_expect_success 'list specific note with "git notes list <object>"' '
-	cat >expect <<-EOF &&
-		$(git rev-parse refs/notes/commits:$commit_3)
-	EOF
+	git rev-parse refs/notes/commits:$commit_3 >expect &&
 	git notes list HEAD^^ >actual &&
 	test_cmp expect actual
 '
@@ -512,10 +530,11 @@ test_expect_success 'append to existing note with "git notes append"' '
 
 test_expect_success '"git notes list" does not expand to "git notes list HEAD"' '
 	commit_5=$(git rev-parse 5th) &&
+	note_5=$(git rev-parse refs/notes/commits:$commit_5) &&
 	sort -t" " -k2 >expect_list <<-EOF &&
-		$(git rev-parse refs/notes/commits:$commit_2) $commit_2
-		$(git rev-parse refs/notes/commits:$commit_3) $commit_3
-		$(git rev-parse refs/notes/commits:$commit_5) $commit_5
+		$note_2 $commit_2
+		$note_3 $commit_3
+		$note_5 $commit_5
 	EOF
 	git notes list >actual &&
 	test_cmp expect_list actual
@@ -653,6 +672,11 @@ test_expect_success 'notes.displayRef respects order' '
 	test_cmp expect-both-reversed actual
 '
 
+test_expect_success 'notes.displayRef with no value handled gracefully' '
+	test_must_fail git -c notes.displayRef log -0 --notes &&
+	test_must_fail git -c notes.displayRef diff-tree --notes HEAD
+'
+
 test_expect_success 'GIT_NOTES_DISPLAY_REF works' '
 	GIT_NOTES_DISPLAY_REF=refs/notes/commits:refs/notes/other \
 		git log -2 >actual &&
@@ -721,7 +745,8 @@ test_expect_success 'Allow notes on non-commits (trees, blobs, tags)' '
 	git notes show HEAD: >actual &&
 	test_cmp expect actual &&
 	echo "Note on a blob" >expect &&
-	filename=$(git ls-tree --name-only HEAD | head -n1) &&
+	git ls-tree --name-only HEAD >files &&
+	filename=$(head -n1 files) &&
 	git notes add -m "Note on a blob" HEAD:$filename &&
 	git notes show HEAD:$filename >actual &&
 	test_cmp expect actual &&
@@ -745,10 +770,13 @@ test_expect_success 'create note from other note with "git notes add -C"' '
 		Notes:
 		${indent}order test
 	EOF
-	git notes add -C $(git notes list HEAD^) &&
+	note=$(git notes list HEAD^) &&
+	git notes add -C $note &&
 	git log -1 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'create note from non-existing note with "git notes add -C" fails' '
@@ -777,11 +805,12 @@ test_expect_success 'create note from blob with "git notes add -C" reuses blob i
 		Notes:
 		${indent}This is a blob object
 	EOF
-	blob=$(echo "This is a blob object" | git hash-object -w --stdin) &&
-	git notes add -C $blob &&
+	echo "This is a blob object" | git hash-object -w --stdin >blob &&
+	git notes add -C $(cat blob) &&
 	git log -1 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$blob"
+	git notes list HEAD >actual &&
+	test_cmp blob actual
 '
 
 test_expect_success 'create note from other note with "git notes add -c"' '
@@ -797,7 +826,8 @@ test_expect_success 'create note from other note with "git notes add -c"' '
 		Notes:
 		${indent}yet another note
 	EOF
-	MSG="yet another note" git notes add -c $(git notes list HEAD^^) &&
+	note=$(git notes list HEAD^^) &&
+	MSG="yet another note" git notes add -c $note &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -822,7 +852,8 @@ test_expect_success 'append to note from other note with "git notes append -C"'
 		${indent}
 		${indent}yet another note
 	EOF
-	git notes append -C $(git notes list HEAD^) HEAD^ &&
+	note=$(git notes list HEAD^) &&
+	git notes append -C $note HEAD^ &&
 	git log -1 HEAD^ >actual &&
 	test_cmp expect actual
 '
@@ -839,7 +870,8 @@ test_expect_success 'create note from other note with "git notes append -c"' '
 		Notes:
 		${indent}other note
 	EOF
-	MSG="other note" git notes append -c $(git notes list HEAD^) &&
+	note=$(git notes list HEAD^) &&
+	MSG="other note" git notes append -c $note &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -858,12 +890,33 @@ test_expect_success 'append to note from other note with "git notes append -c"'
 		${indent}
 		${indent}yet another note
 	EOF
-	MSG="yet another note" git notes append -c $(git notes list HEAD) &&
+	note=$(git notes list HEAD) &&
+	MSG="yet another note" git notes append -c $note &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'copy note with "git notes copy"' '
+	commit=$(git rev-parse 4th) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:16:13 2005 -0700
+
+		${indent}4th
+
+		Notes:
+		${indent}This is a blob object
+	EOF
+	git notes copy 8th 4th &&
+	git log 3rd..4th >actual &&
+	test_cmp expect actual &&
+	git notes list 4th >expect &&
+	git notes list 8th >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'copy note with "git notes copy" with default' '
 	test_commit 11th &&
 	commit=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
@@ -878,17 +931,33 @@ test_expect_success 'copy note with "git notes copy"' '
 		${indent}
 		${indent}yet another note
 	EOF
-	git notes copy HEAD^ HEAD &&
+	git notes copy HEAD^ &&
 	git log -1 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'prevent overwrite with "git notes copy"' '
 	test_must_fail git notes copy HEAD~2 HEAD &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
+
+		${indent}11th
+
+		Notes:
+		${indent}other note
+		${indent}
+		${indent}yet another note
+	EOF
 	git log -1 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$(git notes list HEAD^)"
+	git notes list HEAD^ >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'allow overwrite with "git notes copy -f"' '
@@ -901,14 +970,36 @@ test_expect_success 'allow overwrite with "git notes copy -f"' '
 		${indent}11th
 
 		Notes:
+		${indent}This is a blob object
+	EOF
+	git notes copy -f HEAD~3 HEAD &&
+	git log -1 >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~3 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'allow overwrite with "git notes copy -f" with default' '
+	commit=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+		commit $commit
+		Author: A U Thor <author@example.com>
+		Date:   Thu Apr 7 15:23:13 2005 -0700
+
+		${indent}11th
+
+		Notes:
 		${indent}yet another note
 		${indent}
 		${indent}yet another note
 	EOF
-	git notes copy -f HEAD~2 HEAD &&
+	git notes copy -f HEAD~2 &&
 	git log -1 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$(git notes list HEAD~2)"
+	git notes list HEAD~2 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'cannot copy note from object without notes' '
@@ -943,13 +1034,21 @@ test_expect_success 'git notes copy --stdin' '
 		${indent}
 		${indent}yet another note
 	EOF
-	(echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
-	echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
-	git notes copy --stdin &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --stdin <copy &&
 	git log -2 >actual &&
 	test_cmp expect actual &&
-	test "$(git notes list HEAD)" = "$(git notes list HEAD~2)" &&
-	test "$(git notes list HEAD^)" = "$(git notes list HEAD~3)"
+	git notes list HEAD~2 >expect &&
+	git notes list HEAD >actual &&
+	test_cmp expect actual &&
+	git notes list HEAD~3 >expect &&
+	git notes list HEAD^ >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git notes copy --for-rewrite (unconfigured)' '
@@ -970,9 +1069,13 @@ test_expect_success 'git notes copy --for-rewrite (unconfigured)' '
 
 		${indent}14th
 	EOF
-	(echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
-	echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -2 >actual &&
 	test_cmp expect actual
 '
@@ -1005,17 +1108,23 @@ test_expect_success 'git notes copy --for-rewrite (enabled)' '
 	EOF
 	test_config notes.rewriteMode overwrite &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	(echo $(git rev-parse HEAD~3) $(git rev-parse HEAD^) &&
-	echo $(git rev-parse HEAD~2) $(git rev-parse HEAD)) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD^) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD~2) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -2 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git notes copy --for-rewrite (disabled)' '
 	test_config notes.rewrite.bar false &&
-	echo $(git rev-parse HEAD~3) $(git rev-parse HEAD) |
-	git notes copy --for-rewrite=bar &&
+	from=$(git rev-parse HEAD~3) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=bar <copy &&
 	git log -2 >actual &&
 	test_cmp expect actual
 '
@@ -1035,8 +1144,10 @@ test_expect_success 'git notes copy --for-rewrite (overwrite)' '
 	git notes add -f -m"a fresh note" HEAD^ &&
 	test_config notes.rewriteMode overwrite &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -1044,8 +1155,10 @@ test_expect_success 'git notes copy --for-rewrite (overwrite)' '
 test_expect_success 'git notes copy --for-rewrite (ignore)' '
 	test_config notes.rewriteMode ignore &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -1067,8 +1180,10 @@ test_expect_success 'git notes copy --for-rewrite (append)' '
 	git notes add -f -m"another fresh note" HEAD^ &&
 	test_config notes.rewriteMode concatenate &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -1095,9 +1210,13 @@ test_expect_success 'git notes copy --for-rewrite (append two to one)' '
 	git notes add -f -m"append 2" HEAD^^ &&
 	test_config notes.rewriteMode concatenate &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	(echo $(git rev-parse HEAD^) $(git rev-parse HEAD) &&
-	echo $(git rev-parse HEAD^^) $(git rev-parse HEAD)) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	from=$(git rev-parse HEAD^^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >>copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -1106,8 +1225,10 @@ test_expect_success 'git notes copy --for-rewrite (append empty)' '
 	git notes remove HEAD^ &&
 	test_config notes.rewriteMode concatenate &&
 	test_config notes.rewriteRef "refs/notes/*" &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-	git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -1127,8 +1248,10 @@ test_expect_success 'GIT_NOTES_REWRITE_MODE works' '
 	test_config notes.rewriteMode concatenate &&
 	test_config notes.rewriteRef "refs/notes/*" &&
 	git notes add -f -m"replacement note 1" HEAD^ &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
-	GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo &&
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
+	GIT_NOTES_REWRITE_MODE=overwrite git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -1148,9 +1271,11 @@ test_expect_success 'GIT_NOTES_REWRITE_REF works' '
 	git notes add -f -m"replacement note 2" HEAD^ &&
 	test_config notes.rewriteMode overwrite &&
 	test_unconfig notes.rewriteRef &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
 	GIT_NOTES_REWRITE_REF=refs/notes/commits:refs/notes/other \
-		git notes copy --for-rewrite=foo &&
+		git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	test_cmp expect actual
 '
@@ -1159,41 +1284,55 @@ test_expect_success 'GIT_NOTES_REWRITE_REF overrides config' '
 	git notes add -f -m"replacement note 3" HEAD^ &&
 	test_config notes.rewriteMode overwrite &&
 	test_config notes.rewriteRef refs/notes/other &&
-	echo $(git rev-parse HEAD^) $(git rev-parse HEAD) |
+	from=$(git rev-parse HEAD^) &&
+	to=$(git rev-parse HEAD) &&
+	echo "$from" "$to" >copy &&
 	GIT_NOTES_REWRITE_REF=refs/notes/commits \
-		git notes copy --for-rewrite=foo &&
+		git notes copy --for-rewrite=foo <copy &&
 	git log -1 >actual &&
 	grep "replacement note 3" actual
 '
 
-test_expect_success 'git notes copy diagnoses too many or too few parameters' '
-	test_must_fail git notes copy &&
-	test_must_fail git notes copy one two three
+test_expect_success 'git notes copy diagnoses too many or too few arguments' '
+	test_must_fail git notes copy 2>error &&
+	test_i18ngrep "too few arguments" error &&
+	test_must_fail git notes copy one two three 2>error &&
+	test_i18ngrep "too many arguments" error
 '
 
-test_expect_success 'git notes get-ref expands refs/heads/master to refs/notes/refs/heads/master' '
+test_expect_success 'git notes get-ref expands refs/heads/main to refs/notes/refs/heads/main' '
 	test_unconfig core.notesRef &&
 	sane_unset GIT_NOTES_REF &&
-	test "$(git notes --ref=refs/heads/master get-ref)" = "refs/notes/refs/heads/master"
+	echo refs/notes/refs/heads/main >expect &&
+	git notes --ref=refs/heads/main get-ref >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (no overrides)' '
 	test_unconfig core.notesRef &&
 	sane_unset GIT_NOTES_REF &&
-	test "$(git notes get-ref)" = "refs/notes/commits"
+	echo refs/notes/commits >expect &&
+	git notes get-ref >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (core.notesRef)' '
 	test_config core.notesRef refs/notes/foo &&
-	test "$(git notes get-ref)" = "refs/notes/foo"
+	echo refs/notes/foo >expect &&
+	git notes get-ref >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (GIT_NOTES_REF)' '
-	test "$(GIT_NOTES_REF=refs/notes/bar git notes get-ref)" = "refs/notes/bar"
+	echo refs/notes/bar >expect &&
+	GIT_NOTES_REF=refs/notes/bar git notes get-ref >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'git notes get-ref (--ref)' '
-	test "$(GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref)" = "refs/notes/baz"
+	echo refs/notes/baz >expect &&
+	GIT_NOTES_REF=refs/notes/bar git notes --ref=baz get-ref >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'setup testing of empty notes' '
diff --git a/t/t3302-notes-index-expensive.sh b/t/t3302-notes-index-expensive.sh
index 7217c5e222..ef8b63952e 100755
--- a/t/t3302-notes-index-expensive.sh
+++ b/t/t3302-notes-index-expensive.sh
@@ -5,6 +5,9 @@
 
 test_description='Test commit notes index (expensive!)'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 create_repo () {
@@ -20,7 +23,7 @@ create_repo () {
 			notemark=$(($mark+1))
 			test_tick &&
 			cat <<-INPUT_END &&
-			commit refs/heads/master
+			commit refs/heads/main
 			mark :$mark
 			committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 			data <<COMMIT
diff --git a/t/t3303-notes-subtrees.sh b/t/t3303-notes-subtrees.sh
index 704aee81ef..d47ce00f69 100755
--- a/t/t3303-notes-subtrees.sh
+++ b/t/t3303-notes-subtrees.sh
@@ -2,6 +2,9 @@
 
 test_description='Test commit notes organized in subtrees'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 number_of_commits=100
@@ -40,7 +43,7 @@ test_expect_success "setup: create $number_of_commits commits" '
 			nr=$(($nr+1)) &&
 			test_tick &&
 			cat <<INPUT_END
-commit refs/heads/master
+commit refs/heads/main
 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 data <<COMMIT
 commit #$nr
@@ -75,7 +78,7 @@ test_sha1_based () {
 	(
 		start_note_commit &&
 		nr=$number_of_commits &&
-		git rev-list refs/heads/master |
+		git rev-list refs/heads/main |
 		while read sha1; do
 			note_path=$(echo "$sha1" | sed "$1")
 			cat <<INPUT_END &&
@@ -105,7 +108,7 @@ test_same_notes () {
 	(
 		start_note_commit &&
 		nr=$number_of_commits &&
-		git rev-list refs/heads/master |
+		git rev-list refs/heads/main |
 		while read sha1; do
 			first_note_path=$(echo "$sha1" | sed "$1")
 			second_note_path=$(echo "$sha1" | sed "$2")
@@ -144,7 +147,7 @@ test_concatenated_notes () {
 	(
 		start_note_commit &&
 		nr=$number_of_commits &&
-		git rev-list refs/heads/master |
+		git rev-list refs/heads/main |
 		while read sha1; do
 			first_note_path=$(echo "$sha1" | sed "$1")
 			second_note_path=$(echo "$sha1" | sed "$2")
diff --git a/t/t3304-notes-mixed.sh b/t/t3304-notes-mixed.sh
index 1709e8c00b..03dfcd3954 100755
--- a/t/t3304-notes-mixed.sh
+++ b/t/t3304-notes-mixed.sh
@@ -2,6 +2,9 @@
 
 test_description='Test notes trees that also contain non-notes'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 number_of_commits=100
@@ -36,7 +39,7 @@ test_expect_success "setup: create a couple of commits" '
 
 	test_tick &&
 	cat <<INPUT_END >input &&
-commit refs/heads/master
+commit refs/heads/main
 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 data <<COMMIT
 commit #1
@@ -51,7 +54,7 @@ INPUT_END
 
 	test_tick &&
 	cat <<INPUT_END >>input &&
-commit refs/heads/master
+commit refs/heads/main
 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 data <<COMMIT
 commit #2
@@ -68,8 +71,8 @@ INPUT_END
 
 test_expect_success "create a notes tree with both notes and non-notes" '
 
-	commit1=$(git rev-parse refs/heads/master^) &&
-	commit2=$(git rev-parse refs/heads/master) &&
+	commit1=$(git rev-parse refs/heads/main^) &&
+	commit2=$(git rev-parse refs/heads/main) &&
 	test_tick &&
 	cat <<INPUT_END >input &&
 commit refs/notes/commits
diff --git a/t/t3305-notes-fanout.sh b/t/t3305-notes-fanout.sh
index 831f83d211..94c1b02251 100755
--- a/t/t3305-notes-fanout.sh
+++ b/t/t3305-notes-fanout.sh
@@ -4,6 +4,38 @@ test_description='Test that adding/removing many notes triggers automatic fanout
 
 . ./test-lib.sh
 
+path_has_fanout() {
+	path=$1 &&
+	fanout=$2 &&
+	after_last_slash=$(($(test_oid hexsz) - $fanout * 2)) &&
+	echo $path | grep -q "^\([0-9a-f]\{2\}/\)\{$fanout\}[0-9a-f]\{$after_last_slash\}$"
+}
+
+touched_one_note_with_fanout() {
+	notes_commit=$1 &&
+	modification=$2 &&  # 'A' for addition, 'D' for deletion
+	fanout=$3 &&
+	diff=$(git diff-tree --no-commit-id --name-status --root -r $notes_commit) &&
+	path=$(echo $diff | sed -e "s/^$modification[\t ]//") &&
+	path_has_fanout "$path" $fanout;
+}
+
+all_notes_have_fanout() {
+	notes_commit=$1 &&
+	fanout=$2 &&
+	git ls-tree -r --name-only $notes_commit 2>/dev/null |
+	while read path
+	do
+		path_has_fanout $path $fanout || return 1
+	done
+}
+
+test_expect_success 'tweak test environment' '
+	git checkout -b nondeterminism &&
+	test_commit A &&
+	git checkout --orphan with_notes;
+'
+
 test_expect_success 'creating many notes with git-notes' '
 	num_notes=300 &&
 	i=0 &&
@@ -20,7 +52,7 @@ test_expect_success 'creating many notes with git-notes' '
 
 test_expect_success 'many notes created correctly with git-notes' '
 	git log | grep "^    " > output &&
-	i=300 &&
+	i=$num_notes &&
 	while test $i -gt 0
 	do
 		echo "    commit #$i" &&
@@ -30,34 +62,46 @@ test_expect_success 'many notes created correctly with git-notes' '
 	test_cmp expect output
 '
 
-test_expect_success 'many notes created with git-notes triggers fanout' '
-	# Expect entire notes tree to have a fanout == 1
-	git ls-tree -r --name-only refs/notes/commits |
-	while read path
+test_expect_success 'stable fanout 0 is followed by stable fanout 1' '
+	i=$num_notes &&
+	fanout=0 &&
+	while test $i -gt 0
 	do
-		echo $path | grep "^../[0-9a-f]*$" || {
-			echo "Invalid path \"$path\"" &&
-			return 1;
-		}
-	done
+		i=$(($i - 1)) &&
+		if touched_one_note_with_fanout refs/notes/commits~$i A $fanout
+		then
+			continue
+		elif test $fanout -eq 0
+		then
+			fanout=1 &&
+			if all_notes_have_fanout refs/notes/commits~$i $fanout
+			then
+				echo "Fanout 0 -> 1 at refs/notes/commits~$i" &&
+				continue
+			fi
+		fi &&
+		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
+		git ls-tree -r --name-only refs/notes/commits~$i &&
+		return 1
+	done &&
+	all_notes_have_fanout refs/notes/commits 1
 '
 
 test_expect_success 'deleting most notes with git-notes' '
-	num_notes=250 &&
+	remove_notes=285 &&
 	i=0 &&
 	git rev-list HEAD |
-	while test $i -lt $num_notes && read sha1
+	while test $i -lt $remove_notes && read sha1
 	do
 		i=$(($i + 1)) &&
 		test_tick &&
-		git notes remove "$sha1" ||
-		exit 1
+		git notes remove "$sha1" 2>/dev/null || return 1
 	done
 '
 
 test_expect_success 'most notes deleted correctly with git-notes' '
-	git log HEAD~250 | grep "^    " > output &&
-	i=50 &&
+	git log HEAD~$remove_notes | grep "^    " > output &&
+	i=$(($num_notes - $remove_notes)) &&
 	while test $i -gt 0
 	do
 		echo "    commit #$i" &&
@@ -67,16 +111,29 @@ test_expect_success 'most notes deleted correctly with git-notes' '
 	test_cmp expect output
 '
 
-test_expect_success 'deleting most notes triggers fanout consolidation' '
-	# Expect entire notes tree to have a fanout == 0
-	git ls-tree -r --name-only refs/notes/commits |
-	while read path
+test_expect_success 'stable fanout 1 is followed by stable fanout 0' '
+	i=$remove_notes &&
+	fanout=1 &&
+	while test $i -gt 0
 	do
-		echo $path | grep -v "^../.*" || {
-			echo "Invalid path \"$path\"" &&
-			return 1;
-		}
-	done
+		i=$(($i - 1)) &&
+		if touched_one_note_with_fanout refs/notes/commits~$i D $fanout
+		then
+			continue
+		elif test $fanout -eq 1
+		then
+			fanout=0 &&
+			if all_notes_have_fanout refs/notes/commits~$i $fanout
+			then
+				echo "Fanout 1 -> 0 at refs/notes/commits~$i" &&
+				continue
+			fi
+		fi &&
+		echo "Failed fanout=$fanout check at refs/notes/commits~$i" &&
+		git ls-tree -r --name-only refs/notes/commits~$i &&
+		return 1
+	done &&
+	all_notes_have_fanout refs/notes/commits 0
 '
 
 test_done
diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh
index d60588ec8f..202702be1a 100755
--- a/t/t3308-notes-merge.sh
+++ b/t/t3308-notes-merge.sh
@@ -20,7 +20,33 @@ test_expect_success setup '
 	git notes add -m "Notes on 3rd commit" 3rd &&
 	git notes add -m "Notes on 4th commit" 4th &&
 	# Copy notes to remote-notes
-	git fetch . refs/notes/*:refs/remote-notes/origin/*
+	git fetch . refs/notes/*:refs/remote-notes/origin/* &&
+
+	test_oid_cache <<-EOF
+	hash4a sha1:5e93d24084d32e1cb61f7070505b9d2530cca987
+	hash3a sha1:8366731eeee53787d2bdf8fc1eff7d94757e8da0
+	hash2a sha1:eede89064cd42441590d6afec6c37b321ada3389
+	hash1a sha1:daa55ffad6cb99bf64226532147ffcaf5ce8bdd1
+	hash5b sha1:0f2efbd00262f2fd41dfae33df8765618eeacd99
+	hash4b sha1:dec2502dac3ea161543f71930044deff93fa945c
+	hash3b sha1:4069cdb399fd45463ec6eef8e051a16a03592d91
+	hash2c sha1:d000d30e6ddcfce3a8122c403226a2ce2fd04d9d
+	hash1c sha1:43add6bd0c8c0bc871ac7991e0f5573cfba27804
+	hash4d sha1:1f257a3a90328557c452f0817d6cc50c89d315d4
+	hash3d sha1:05a4927951bcef347f51486575b878b2b60137f2
+
+	hash4a sha256:eef876be1d32ac2e2e42240e0429325cec116e55e88cb2969899fac695aa762f
+	hash3a sha256:cf7cd1bc091d7ba4166a86df864110e42087cd893a5ae96bc50d637e0290939d
+	hash2a sha256:21ddde7ebce2c285213898cb04deca0fd3209610cf7aaf8222e4e2f45262fae2
+	hash1a sha256:f9fe0eda16c6027732ed9d4295689a03abd16f893be69b3dcbf4037ddb191921
+	hash5b sha256:20046f2244577797a9e3d3f790ea9eca4d8a6bafb2a5570bcb0e03aa02ce100b
+	hash4b sha256:f90563d134c61a95bb88afbd45d48ccc9e919c62aa6fbfcd483302b3e4d8dbcb
+	hash3b sha256:988f2aca9f2d87e93e6a73197c2bb99560cc44a2f92d18653968f956f01221e0
+	hash2c sha256:84153b777b4d42827a756c6578dcdb59d8ae5d1360b874fb37c430150c825c26
+	hash1c sha256:9beb2bc4eef72e4c4087be168a20573e34d993d9ab1883055f23e322afa06567
+	hash4d sha256:32de39dc06e679a7abb2d4a55ede7709b3124340a4a90aa305971b1c72ac319d
+	hash3d sha256:fa73b20e41cbb7541c4c81d1535016131dbfbeb05bf6a71f6115e9cad31c7af5
+	EOF
 '
 
 commit_sha1=$(git rev-parse 1st^{commit})
@@ -40,10 +66,10 @@ verify_notes () {
 }
 
 cat <<EOF | sort >expect_notes_x
-5e93d24084d32e1cb61f7070505b9d2530cca987 $commit_sha4
-8366731eeee53787d2bdf8fc1eff7d94757e8da0 $commit_sha3
-eede89064cd42441590d6afec6c37b321ada3389 $commit_sha2
-daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1
+$(test_oid hash4a) $commit_sha4
+$(test_oid hash3a) $commit_sha3
+$(test_oid hash2a) $commit_sha2
+$(test_oid hash1a) $commit_sha1
 EOF
 
 cat >expect_log_x <<EOF
@@ -82,7 +108,7 @@ test_expect_success 'fail to merge into various non-notes refs' '
 	git update-ref refs/notes/dir/foo HEAD &&
 	test_must_fail git -c "core.notesRef=refs/notes/dir" notes merge x &&
 	test_must_fail git -c "core.notesRef=refs/notes/dir/" notes merge x &&
-	test_must_fail git -c "core.notesRef=refs/heads/master" notes merge x &&
+	test_must_fail git -c "core.notesRef=refs/heads/main" notes merge x &&
 	test_must_fail git -c "core.notesRef=refs/notes/y:" notes merge x &&
 	test_must_fail git -c "core.notesRef=refs/notes/y:foo" notes merge x &&
 	test_must_fail git -c "core.notesRef=refs/notes/foo^{bar" notes merge x
@@ -126,10 +152,10 @@ test_expect_success 'merge previous notes commit (y^ => y) => No-op' '
 '
 
 cat <<EOF | sort >expect_notes_y
-0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
-dec2502dac3ea161543f71930044deff93fa945c $commit_sha4
-4069cdb399fd45463ec6eef8e051a16a03592d91 $commit_sha3
-daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1
+$(test_oid hash5b) $commit_sha5
+$(test_oid hash4b) $commit_sha4
+$(test_oid hash3b) $commit_sha3
+$(test_oid hash1a) $commit_sha1
 EOF
 
 cat >expect_log_y <<EOF
@@ -193,11 +219,11 @@ test_expect_success 'merge empty notes ref (z => y)' '
 '
 
 cat <<EOF | sort >expect_notes_y
-0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
-dec2502dac3ea161543f71930044deff93fa945c $commit_sha4
-4069cdb399fd45463ec6eef8e051a16a03592d91 $commit_sha3
-d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2
-43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1
+$(test_oid hash5b) $commit_sha5
+$(test_oid hash4b) $commit_sha4
+$(test_oid hash3b) $commit_sha3
+$(test_oid hash2c) $commit_sha2
+$(test_oid hash1c) $commit_sha1
 EOF
 
 cat >expect_log_y <<EOF
@@ -231,9 +257,9 @@ test_expect_success 'change notes on other notes ref (y)' '
 '
 
 cat <<EOF | sort >expect_notes_x
-0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
-1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4
-daa55ffad6cb99bf64226532147ffcaf5ce8bdd1 $commit_sha1
+$(test_oid hash5b) $commit_sha5
+$(test_oid hash4d) $commit_sha4
+$(test_oid hash1a) $commit_sha1
 EOF
 
 cat >expect_log_x <<EOF
@@ -262,10 +288,10 @@ test_expect_success 'change notes on notes ref (x)' '
 '
 
 cat <<EOF | sort >expect_notes_x
-0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
-1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4
-d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2
-43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1
+$(test_oid hash5b) $commit_sha5
+$(test_oid hash4d) $commit_sha4
+$(test_oid hash2c) $commit_sha2
+$(test_oid hash1c) $commit_sha1
 EOF
 
 cat >expect_log_x <<EOF
@@ -296,8 +322,8 @@ test_expect_success 'merge y into x => Non-conflicting 3-way merge' '
 '
 
 cat <<EOF | sort >expect_notes_w
-05a4927951bcef347f51486575b878b2b60137f2 $commit_sha3
-d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2
+$(test_oid hash3d) $commit_sha3
+$(test_oid hash2c) $commit_sha2
 EOF
 
 cat >expect_log_w <<EOF
@@ -326,11 +352,11 @@ test_expect_success 'create notes on new, separate notes ref (w)' '
 '
 
 cat <<EOF | sort >expect_notes_x
-0f2efbd00262f2fd41dfae33df8765618eeacd99 $commit_sha5
-1f257a3a90328557c452f0817d6cc50c89d315d4 $commit_sha4
-05a4927951bcef347f51486575b878b2b60137f2 $commit_sha3
-d000d30e6ddcfce3a8122c403226a2ce2fd04d9d $commit_sha2
-43add6bd0c8c0bc871ac7991e0f5573cfba27804 $commit_sha1
+$(test_oid hash5b) $commit_sha5
+$(test_oid hash4d) $commit_sha4
+$(test_oid hash3d) $commit_sha3
+$(test_oid hash2c) $commit_sha2
+$(test_oid hash1c) $commit_sha1
 EOF
 
 cat >expect_log_x <<EOF
diff --git a/t/t3309-notes-merge-auto-resolve.sh b/t/t3309-notes-merge-auto-resolve.sh
index 14c2adf970..141d3e4ca4 100755
--- a/t/t3309-notes-merge-auto-resolve.sh
+++ b/t/t3309-notes-merge-auto-resolve.sh
@@ -23,7 +23,67 @@ test_expect_success 'setup commits' '
 	test_commit 12th &&
 	test_commit 13th &&
 	test_commit 14th &&
-	test_commit 15th
+	test_commit 15th &&
+
+	test_oid_cache <<-EOF
+	hash15a sha1:457a85d6c814ea208550f15fcc48f804ac8dc023
+	hash14a sha1:b0c95b954301d69da2bc3723f4cb1680d355937c
+	hash13a sha1:5d30216a129eeffa97d9694ffe8c74317a560315
+	hash12a sha1:dd161bc149470fd890dd4ab52a4cbd79bbd18c36
+	hash11a sha1:7abbc45126d680336fb24294f013a7cdfa3ed545
+	hash10a sha1:b8d03e173f67f6505a76f6e00cf93440200dd9be
+	hash09a sha1:20c613c835011c48a5abe29170a2402ca6354910
+	hash08a sha1:a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6
+	hash07a sha1:897003322b53bc6ca098e9324ee508362347e734
+	hash06a sha1:11d97fdebfa5ceee540a3da07bce6fa0222bc082
+	hash15b sha1:68b8630d25516028bed862719855b3d6768d7833
+	hash14b sha1:5de7ea7ad4f47e7ff91989fb82234634730f75df
+	hash13b sha1:3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc
+	hash12b sha1:a66055fa82f7a03fe0c02a6aba3287a85abf7c62
+	hash05b sha1:154508c7a0bcad82b6fe4b472bc4c26b3bf0825b
+	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
+	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
+	hash15c sha1:9b4b2c61f0615412da3c10f98ff85b57c04ec765
+	hash11c sha1:7e3c53503a3db8dd996cb62e37c66e070b44b54d
+	hash08c sha1:851e1638784a884c7dd26c5d41f3340f6387413a
+	hash05c sha1:99fc34adfc400b95c67b013115e37e31aa9a6d23
+	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
+	hash15d sha1:7c4e546efd0fe939f876beb262ece02797880b54
+	hash05d sha1:6c841cc36ea496027290967ca96bd2bef54dbb47
+	hash15e sha1:d682107b8bf7a7aea1e537a8d5cb6a12b60135f1
+	hash05e sha1:357b6ca14c7afd59b7f8b8aaaa6b8b723771135b
+	hash15f sha1:6be90240b5f54594203e25d9f2f64b7567175aee
+	hash05f sha1:660311d7f78dc53db12ac373a43fca7465381a7e
+
+	hash15a sha256:45b1558e5c1b75f570010fa48aaa67bb2289fcd431b34ad81cb4c8b95f4f872a
+	hash14a sha256:6e7af179ea4dd28afdc83ae6912ba0098cdeff764b26a8b750b157dd81749092
+	hash13a sha256:7353089961baf555388e1bac68c67c8ea94b08ccbd97532201cf7f6790703052
+	hash12a sha256:5863e4521689ee1879ceab3b38d39e93ab5b51ec70aaf6a96ad388fbdedfa25e
+	hash11a sha256:82a0ec0338b4ecf8b44304badf4ad38d7469dc41827f38d7ba6c42e3bae3ee98
+	hash10a sha256:e84f2564e92de9792c93b8d197262c735d7ccb1de6025cef8759af8f6c3308eb
+	hash09a sha256:4dd07764bcec696f195c0ea71ae89e174876403af1637e4642b8f4453fd23028
+	hash08a sha256:02132c4546cd88a1d0aa5854dd55da120927f7904ba16afe36fe03e91a622067
+	hash07a sha256:369baf7d00c6720efdc10273493555f943051f84a4706fb24caeb353fa4789db
+	hash06a sha256:52d32c10353583b2d96a5849b1f1f43c8018e76f3e8ef1b0d46eb5cff7cdefaf
+	hash15b sha256:345e6660b345fa174738a31a7a59423c394bdf414804e200bc510c65d971ae96
+	hash14b sha256:7653a6596021c52e405cba979eea15a729993e7102b9a61ba4667e34f0ead4a1
+	hash13b sha256:0f202a0b6b9690de2349c173dfd766a37e82744f61c14f1c389306f1d69f470b
+	hash12b sha256:eb00f219c026136ea6535b16ff8ec3efa510e6bf50098ca041e1a2a1d4b79840
+	hash05b sha256:993b2290cd0c24c27c849d99f1904f3b590f77af0f539932734ad05679ac5a2f
+	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
+	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
+	hash15c sha256:62316660a22bf97857dc4a16709ec4d93a224e8c9f37d661ef91751e1f4c4166
+	hash11c sha256:51c3763de9b08309370adc5036d58debb331980e73097902957c444602551daa
+	hash08c sha256:22cf1fa29599898a7218c51135d66ed85d22aad584f77db3305dedce4c3d4798
+	hash05c sha256:2508fd86db980f0508893a1c1571bdf3b2ee113dc25ddb1a3a2fb94bd6cd0d58
+	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
+	hash15d sha256:667acb4e2d5f8df15e5aea4506dfd16d25bc7feca70fdb0d965a7222f983bb88
+	hash05d sha256:09e6b5a6fe666c4a027674b6611a254b7d2528cd211c6b5288d1b4db6c741dfa
+	hash15e sha256:e8cbf52f6fcadc6de3c7761e64a89e9fe38d19a03d3e28ef6ca8596d93fc4f3a
+	hash05e sha256:cdb1e19f7ba1539f95af51a57edeb88a7ecc97d3c2f52da8c4c86af308595607
+	hash15f sha256:29c14cb92da448a923963b8a43994268b19c2e57913de73f3667421fd2c0eeec
+	hash05f sha256:14a6e641b2c0a9f398ebac6b4d34afa5efea4c52d2631382f45f8f662266903b
+	EOF
 '
 
 commit_sha1=$(git rev-parse 1st^{commit})
@@ -68,16 +128,16 @@ test_expect_success 'setup merge base (x)' '
 '
 
 cat <<EOF | sort >expect_notes_x
-457a85d6c814ea208550f15fcc48f804ac8dc023 $commit_sha15
-b0c95b954301d69da2bc3723f4cb1680d355937c $commit_sha14
-5d30216a129eeffa97d9694ffe8c74317a560315 $commit_sha13
-dd161bc149470fd890dd4ab52a4cbd79bbd18c36 $commit_sha12
-7abbc45126d680336fb24294f013a7cdfa3ed545 $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-20c613c835011c48a5abe29170a2402ca6354910 $commit_sha9
-a3daf8a1e4e5dc3409a303ad8481d57bfea7f5d6 $commit_sha8
-897003322b53bc6ca098e9324ee508362347e734 $commit_sha7
-11d97fdebfa5ceee540a3da07bce6fa0222bc082 $commit_sha6
+$(test_oid hash15a) $commit_sha15
+$(test_oid hash14a) $commit_sha14
+$(test_oid hash13a) $commit_sha13
+$(test_oid hash12a) $commit_sha12
+$(test_oid hash11a) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash09a) $commit_sha9
+$(test_oid hash08a) $commit_sha8
+$(test_oid hash07a) $commit_sha7
+$(test_oid hash06a) $commit_sha6
 EOF
 
 cat >expect_log_x <<EOF
@@ -141,16 +201,16 @@ test_expect_success 'setup local branch (y)' '
 '
 
 cat <<EOF | sort >expect_notes_y
-68b8630d25516028bed862719855b3d6768d7833 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12
-7abbc45126d680336fb24294f013a7cdfa3ed545 $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-20c613c835011c48a5abe29170a2402ca6354910 $commit_sha9
-154508c7a0bcad82b6fe4b472bc4c26b3bf0825b $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
+$(test_oid hash15b) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash12b) $commit_sha12
+$(test_oid hash11a) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash09a) $commit_sha9
+$(test_oid hash05b) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
 EOF
 
 cat >expect_log_y <<EOF
@@ -214,16 +274,16 @@ test_expect_success 'setup remote branch (z)' '
 '
 
 cat <<EOF | sort >expect_notes_z
-9b4b2c61f0615412da3c10f98ff85b57c04ec765 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-5d30216a129eeffa97d9694ffe8c74317a560315 $commit_sha13
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8
-897003322b53bc6ca098e9324ee508362347e734 $commit_sha7
-99fc34adfc400b95c67b013115e37e31aa9a6d23 $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15c) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13a) $commit_sha13
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash08c) $commit_sha8
+$(test_oid hash07a) $commit_sha7
+$(test_oid hash05c) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_z <<EOF
@@ -306,16 +366,16 @@ test_expect_success 'merge z into y with invalid configuration option => Fail/No
 '
 
 cat <<EOF | sort >expect_notes_ours
-68b8630d25516028bed862719855b3d6768d7833 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-154508c7a0bcad82b6fe4b472bc4c26b3bf0825b $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15b) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash12b) $commit_sha12
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash05b) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_ours <<EOF
@@ -395,16 +455,16 @@ test_expect_success 'reset to pre-merge state (y)' '
 '
 
 cat <<EOF | sort >expect_notes_theirs
-9b4b2c61f0615412da3c10f98ff85b57c04ec765 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8
-99fc34adfc400b95c67b013115e37e31aa9a6d23 $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15c) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash08c) $commit_sha8
+$(test_oid hash05c) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_theirs <<EOF
@@ -473,17 +533,17 @@ test_expect_success 'reset to pre-merge state (y)' '
 '
 
 cat <<EOF | sort >expect_notes_union
-7c4e546efd0fe939f876beb262ece02797880b54 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8
-6c841cc36ea496027290967ca96bd2bef54dbb47 $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15d) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash12b) $commit_sha12
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash08c) $commit_sha8
+$(test_oid hash05d) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_union <<EOF
@@ -574,17 +634,17 @@ test_expect_success 'merge z into y with "manual" per-ref only checks specific r
 '
 
 cat <<EOF | sort >expect_notes_union2
-d682107b8bf7a7aea1e537a8d5cb6a12b60135f1 $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8
-357b6ca14c7afd59b7f8b8aaaa6b8b723771135b $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15e) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash12b) $commit_sha12
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash08c) $commit_sha8
+$(test_oid hash05e) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_union2 <<EOF
@@ -648,17 +708,17 @@ test_expect_success 'reset to pre-merge state (z)' '
 '
 
 cat <<EOF | sort >expect_notes_cat_sort_uniq
-6be90240b5f54594203e25d9f2f64b7567175aee $commit_sha15
-5de7ea7ad4f47e7ff91989fb82234634730f75df $commit_sha14
-3a631fdb6f41b05b55d8f4baf20728ba8f6fccbc $commit_sha13
-a66055fa82f7a03fe0c02a6aba3287a85abf7c62 $commit_sha12
-7e3c53503a3db8dd996cb62e37c66e070b44b54d $commit_sha11
-b8d03e173f67f6505a76f6e00cf93440200dd9be $commit_sha10
-851e1638784a884c7dd26c5d41f3340f6387413a $commit_sha8
-660311d7f78dc53db12ac373a43fca7465381a7e $commit_sha5
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
+$(test_oid hash15f) $commit_sha15
+$(test_oid hash14b) $commit_sha14
+$(test_oid hash13b) $commit_sha13
+$(test_oid hash12b) $commit_sha12
+$(test_oid hash11c) $commit_sha11
+$(test_oid hash10a) $commit_sha10
+$(test_oid hash08c) $commit_sha8
+$(test_oid hash05f) $commit_sha5
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
 EOF
 
 cat >expect_log_cat_sort_uniq <<EOF
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh
index 2dea846e25..d3d72e25fe 100755
--- a/t/t3310-notes-merge-manual-resolve.sh
+++ b/t/t3310-notes-merge-manual-resolve.sh
@@ -13,7 +13,39 @@ test_expect_success 'setup commits' '
 	test_commit 2nd &&
 	test_commit 3rd &&
 	test_commit 4th &&
-	test_commit 5th
+	test_commit 5th &&
+
+	test_oid_cache <<-EOF
+	hash04a sha1:6e8e3febca3c2bb896704335cc4d0c34cb2f8715
+	hash03a sha1:e5388c10860456ee60673025345fe2e153eb8cf8
+	hash02a sha1:ceefa674873670e7ecd131814d909723cce2b669
+	hash04b sha1:e2bfd06a37dd2031684a59a6e2b033e212239c78
+	hash03b sha1:5772f42408c0dd6f097a7ca2d24de0e78d1c46b1
+	hash01b sha1:b0a6021ec006d07e80e9b20ec9b444cbd9d560d3
+	hash04c sha1:cff59c793c20bb49a4e01bc06fb06bad642e0d54
+	hash02c sha1:283b48219aee9a4105f6cab337e789065c82c2b9
+	hash01c sha1:0a81da8956346e19bcb27a906f04af327e03e31b
+	hash04d sha1:00494adecf2d9635a02fa431308d67993f853968
+	hash01e sha1:f75d1df88cbfe4258d49852f26cfc83f2ad4494b
+	hash04f sha1:021faa20e931fb48986ffc6282b4bb05553ac946
+	hash01f sha1:0a59e787e6d688aa6309e56e8c1b89431a0fc1c1
+	hash05g sha1:304dfb4325cf243025b9957486eb605a9b51c199
+
+	hash04a	sha256:f18a935e65866345098b3b754071dbf9f3aa3520eb27a7b036b278c5e2f1ed7e
+	hash03a	sha256:713035dc94067a64e5fa6e4e1821b7c3bde49a77c7cb3f80eaadefa1ca41b3d2
+	hash02a	sha256:f160a67e048b6fa75bec3952184154045076692cf5dccd3da21e3fd34b7a3f0f
+	hash04b sha256:c7fba0d6104917fbf35258f40b9fa4fc697cfa992deecd1570a3b08d0a5587a9
+	hash03b sha256:7287a2d78a3766c181b08df38951d784b08b72a44f571ed6d855bd0be22c70f6
+	hash01b sha256:da96cf778c15d0a2bb76f98b2a62f6c9c01730fa7030e8f08ef0191048e7d620
+	hash04c sha256:cb615d2def4b834d5f55b2351df97dc92bee4f5009d285201427f349081c8aca
+	hash02c sha256:63bb527e0b4e1c8e1dd0d54dd778ca7c3718689fd6e37c473044cfbcf1cacfdb
+	hash01c sha256:5b87237ac1fbae0246256fed9f9a1f077c4140fb7e6444925f8dbfa5ae406cd8
+	hash04d sha256:eeddc9f9f6cb3d6b39b861659853f10891dc373e0b6eecb09e03e39b6ce64714
+	hash01e sha256:108f521b1a74c2e6d0b52a4eda87e09162bf847f7d190cfce496ee1af0b29a5a
+	hash04f sha256:901acda0454502b3bbd281f130c419e6c8de78afcf72a8def8d45ad31462bce4
+	hash01f sha256:a2d99d1b8bf23c8af7d9d91368454adc110dfd5cc068a4cebb486ee8f5a1e16c
+	hash05g sha256:4fef015b01da8efe929a68e3bb9b8fbad81f53995f097befe8ebc93f12ab98ec
+	EOF
 '
 
 commit_sha1=$(git rev-parse 1st^{commit})
@@ -32,10 +64,16 @@ verify_notes () {
 	test_cmp "expect_log_$notes_ref" "output_log_$notes_ref"
 }
 
+notes_merge_files_gone () {
+	# No .git/NOTES_MERGE_* files left
+	{ ls .git/NOTES_MERGE_* >output || :; } &&
+	test_must_be_empty output
+}
+
 cat <<EOF | sort >expect_notes_x
-6e8e3febca3c2bb896704335cc4d0c34cb2f8715 $commit_sha4
-e5388c10860456ee60673025345fe2e153eb8cf8 $commit_sha3
-ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2
+$(test_oid hash04a) $commit_sha4
+$(test_oid hash03a) $commit_sha3
+$(test_oid hash02a) $commit_sha2
 EOF
 
 cat >expect_log_x <<EOF
@@ -63,9 +101,9 @@ test_expect_success 'setup merge base (x)' '
 '
 
 cat <<EOF | sort >expect_notes_y
-e2bfd06a37dd2031684a59a6e2b033e212239c78 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-b0a6021ec006d07e80e9b20ec9b444cbd9d560d3 $commit_sha1
+$(test_oid hash04b) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash01b) $commit_sha1
 EOF
 
 cat >expect_log_y <<EOF
@@ -95,9 +133,9 @@ test_expect_success 'setup local branch (y)' '
 '
 
 cat <<EOF | sort >expect_notes_z
-cff59c793c20bb49a4e01bc06fb06bad642e0d54 $commit_sha4
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
-0a81da8956346e19bcb27a906f04af327e03e31b $commit_sha1
+$(test_oid hash04c) $commit_sha4
+$(test_oid hash02c) $commit_sha2
+$(test_oid hash01c) $commit_sha1
 EOF
 
 cat >expect_log_z <<EOF
@@ -193,9 +231,9 @@ test_expect_success 'merge z into m (== y) with default ("manual") resolver => C
 '
 
 cat <<EOF | sort >expect_notes_z
-00494adecf2d9635a02fa431308d67993f853968 $commit_sha4
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
-0a81da8956346e19bcb27a906f04af327e03e31b $commit_sha1
+$(test_oid hash04d) $commit_sha4
+$(test_oid hash02c) $commit_sha2
+$(test_oid hash01c) $commit_sha1
 EOF
 
 cat >expect_log_z <<EOF
@@ -231,8 +269,8 @@ test_expect_success 'cannot do merge w/conflicts when previous merge is unfinish
 # Setup non-conflicting merge between x and new notes ref w
 
 cat <<EOF | sort >expect_notes_w
-ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2
-f75d1df88cbfe4258d49852f26cfc83f2ad4494b $commit_sha1
+$(test_oid hash02a) $commit_sha2
+$(test_oid hash01e) $commit_sha1
 EOF
 
 cat >expect_log_w <<EOF
@@ -258,10 +296,10 @@ test_expect_success 'setup unrelated notes ref (w)' '
 '
 
 cat <<EOF | sort >expect_notes_w
-6e8e3febca3c2bb896704335cc4d0c34cb2f8715 $commit_sha4
-e5388c10860456ee60673025345fe2e153eb8cf8 $commit_sha3
-ceefa674873670e7ecd131814d909723cce2b669 $commit_sha2
-f75d1df88cbfe4258d49852f26cfc83f2ad4494b $commit_sha1
+$(test_oid hash04a) $commit_sha4
+$(test_oid hash03a) $commit_sha3
+$(test_oid hash02a) $commit_sha2
+$(test_oid hash01e) $commit_sha1
 EOF
 
 cat >expect_log_w <<EOF
@@ -291,10 +329,10 @@ test_expect_success 'can do merge without conflicts even if previous merge is un
 '
 
 cat <<EOF | sort >expect_notes_m
-021faa20e931fb48986ffc6282b4bb05553ac946 $commit_sha4
-5772f42408c0dd6f097a7ca2d24de0e78d1c46b1 $commit_sha3
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
-0a59e787e6d688aa6309e56e8c1b89431a0fc1c1 $commit_sha1
+$(test_oid hash04f) $commit_sha4
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02c) $commit_sha2
+$(test_oid hash01f) $commit_sha1
 EOF
 
 cat >expect_log_m <<EOF
@@ -335,9 +373,7 @@ EOF
 y and z notes on 4th commit
 EOF
 	git notes merge --commit &&
-	# No .git/NOTES_MERGE_* files left
-	test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
-	test_must_be_empty output &&
+	notes_merge_files_gone &&
 	# Merge commit has pre-merge y and pre-merge z as parents
 	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
 	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
@@ -397,9 +433,7 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol
 
 test_expect_success 'abort notes merge' '
 	git notes merge --abort &&
-	# No .git/NOTES_MERGE_* files left
-	test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
-	test_must_be_empty output &&
+	notes_merge_files_gone &&
 	# m has not moved (still == y)
 	test "$(git rev-parse refs/notes/m)" = "$(cat pre_merge_y)" &&
 	# Verify that other notes refs has not changed (w, x, y and z)
@@ -430,9 +464,9 @@ test_expect_success 'redo merge of z into m (== y) with default ("manual") resol
 '
 
 cat <<EOF | sort >expect_notes_m
-304dfb4325cf243025b9957486eb605a9b51c199 $commit_sha5
-283b48219aee9a4105f6cab337e789065c82c2b9 $commit_sha2
-0a59e787e6d688aa6309e56e8c1b89431a0fc1c1 $commit_sha1
+$(test_oid hash05g) $commit_sha5
+$(test_oid hash02c) $commit_sha2
+$(test_oid hash01f) $commit_sha1
 EOF
 
 cat >expect_log_m <<EOF
@@ -464,9 +498,7 @@ EOF
 	echo "new note on 5th commit" > .git/NOTES_MERGE_WORKTREE/$commit_sha5 &&
 	# Finalize merge
 	git notes merge --commit &&
-	# No .git/NOTES_MERGE_* files left
-	test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
-	test_must_be_empty output &&
+	notes_merge_files_gone &&
 	# Merge commit has pre-merge y and pre-merge z as parents
 	test "$(git rev-parse refs/notes/m^1)" = "$(cat pre_merge_y)" &&
 	test "$(git rev-parse refs/notes/m^2)" = "$(cat pre_merge_z)" &&
@@ -553,9 +585,7 @@ EOF
 
 test_expect_success 'resolve situation by aborting the notes merge' '
 	git notes merge --abort &&
-	# No .git/NOTES_MERGE_* files left
-	test_might_fail ls .git/NOTES_MERGE_* >output 2>/dev/null &&
-	test_must_be_empty output &&
+	notes_merge_files_gone &&
 	# m has not moved (still == w)
 	test "$(git rev-parse refs/notes/m)" = "$(git rev-parse refs/notes/w)" &&
 	# Verify that other notes refs has not changed (w, x, y and z)
diff --git a/t/t3311-notes-merge-fanout.sh b/t/t3311-notes-merge-fanout.sh
index 37151a3adc..5b675417e9 100755
--- a/t/t3311-notes-merge-fanout.sh
+++ b/t/t3311-notes-merge-fanout.sh
@@ -29,15 +29,10 @@ verify_fanout () {
 	git ls-tree -r --name-only "refs/notes/$notes_ref" |
 	while read path
 	do
-		case "$path" in
-		??/??????????????????????????????????????)
-			: true
-			;;
-		*)
+		echo "$path" | grep "^../[0-9a-f]*$" || {
 			echo "Invalid path \"$path\"" &&
-			return 1
-			;;
-		esac
+			return 1;
+		}
 	done
 }
 
@@ -48,15 +43,10 @@ verify_no_fanout () {
 	git ls-tree -r --name-only "refs/notes/$notes_ref" |
 	while read path
 	do
-		case "$path" in
-		????????????????????????????????????????)
-			: true
-			;;
-		*)
+		echo "$path" | grep -v "^../.*" || {
 			echo "Invalid path \"$path\"" &&
-			return 1
-			;;
-		esac
+			return 1;
+		}
 	done
 }
 
@@ -67,7 +57,27 @@ test_expect_success 'setup a few initial commits with notes (notes ref: x)' '
 	do
 		test_commit "commit$i" >/dev/null &&
 		git notes add -m "notes for commit$i" || return 1
-	done
+	done &&
+
+	git log --format=oneline &&
+
+	test_oid_cache <<-EOF
+	hash05a sha1:aed91155c7a72c2188e781fdf40e0f3761b299db
+	hash04a sha1:99fab268f9d7ee7b011e091a436c78def8eeee69
+	hash03a sha1:953c20ae26c7aa0b428c20693fe38bc687f9d1a9
+	hash02a sha1:6358796131b8916eaa2dde6902642942a1cb37e1
+	hash01a sha1:b02d459c32f0e68f2fe0981033bb34f38776ba47
+	hash03b sha1:9f506ee70e20379d7f78204c77b334f43d77410d
+	hash02b sha1:23a47d6ea7d589895faf800752054818e1e7627b
+
+	hash05a sha256:3aae5d26619d96dba93795f66325716e4cbc486884f95a6adee8fb0615a76d12
+	hash04a sha256:07e43dd3d89fe634d3252e253b426aacc7285a995dcdbcf94ac284060a1122cf
+	hash03a sha256:26fb52eaa7f4866bf735254587be7b31209ec10e525912ffd8e8ba549ba892ff
+	hash02a sha256:b57ebdf23634e750dcbc4b9a37991d70f90830d568a0e4529ce9de0a3f8d605c
+	hash01a sha256:377903b1572bd5117087a5518fcb1011b5053cccbc59e3c7c823a8615204173b
+	hash03b sha256:04e7b392fda7c185bfa17c9179b56db732edc2dc2b3bf887308dcaabb717270d
+	hash02b sha256:66099aaaec49a485ed990acadd9a9b81232ea592079964113d8f581ff69ef50b
+	EOF
 '
 
 commit_sha1=$(git rev-parse commit1^{commit})
@@ -77,11 +87,11 @@ commit_sha4=$(git rev-parse commit4^{commit})
 commit_sha5=$(git rev-parse commit5^{commit})
 
 cat <<EOF | sort >expect_notes_x
-aed91155c7a72c2188e781fdf40e0f3761b299db $commit_sha5
-99fab268f9d7ee7b011e091a436c78def8eeee69 $commit_sha4
-953c20ae26c7aa0b428c20693fe38bc687f9d1a9 $commit_sha3
-6358796131b8916eaa2dde6902642942a1cb37e1 $commit_sha2
-b02d459c32f0e68f2fe0981033bb34f38776ba47 $commit_sha1
+$(test_oid hash05a) $commit_sha5
+$(test_oid hash04a) $commit_sha4
+$(test_oid hash03a) $commit_sha3
+$(test_oid hash02a) $commit_sha2
+$(test_oid hash01a) $commit_sha1
 EOF
 
 cat >expect_log_x <<EOF
@@ -145,9 +155,9 @@ test_expect_success 'Fast-forward merge (y => x)' '
 '
 
 cat <<EOF | sort >expect_notes_z
-9f506ee70e20379d7f78204c77b334f43d77410d $commit_sha3
-23a47d6ea7d589895faf800752054818e1e7627b $commit_sha2
-b02d459c32f0e68f2fe0981033bb34f38776ba47 $commit_sha1
+$(test_oid hash03b) $commit_sha3
+$(test_oid hash02b) $commit_sha2
+$(test_oid hash01a) $commit_sha1
 EOF
 
 cat >expect_log_z <<EOF
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index 823fdbda1f..6b2d507f3e 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -5,6 +5,9 @@
 
 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-lib.sh
 
 test_expect_success 'setup commit' '
@@ -36,15 +39,16 @@ test_expect_success 'modify notes ref ourselves (x)' '
 '
 
 test_expect_success 'create some new worktrees' '
-	git worktree add -b newbranch worktree master &&
-	git worktree add -b newbranch2 worktree2 master
+	git worktree add -b newbranch worktree main &&
+	git worktree add -b newbranch2 worktree2 main
 '
 
 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' '
@@ -54,7 +58,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' '
@@ -65,8 +69,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 ab18ac5f28..23dbd3c82e 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -8,6 +8,9 @@ test_description='git rebase assorted tests
 This test runs git rebase and checks that the author information is not lost
 among other things.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 GIT_AUTHOR_NAME=author@name
@@ -24,15 +27,15 @@ test_expect_success 'prepare repository with topic branches' '
 	git update-index --add Y &&
 	git commit -m "Add Y." &&
 	git checkout -b filemove &&
-	git reset --soft master &&
+	git reset --soft main &&
 	mkdir D &&
 	git mv A D/A &&
 	git commit -m "Move A." &&
-	git checkout -b my-topic-branch master &&
+	git checkout -b my-topic-branch main &&
 	echo Second >B &&
 	git update-index --add B &&
 	git commit -m "Add B." &&
-	git checkout -f master &&
+	git checkout -f main &&
 	echo Third >>A &&
 	git update-index A &&
 	git commit -m "Modify A." &&
@@ -46,25 +49,25 @@ test_expect_success 'prepare repository with topic branches' '
 
 test_expect_success 'rebase on dirty worktree' '
 	echo dirty >>A &&
-	test_must_fail git rebase master
+	test_must_fail git rebase main
 '
 
 test_expect_success 'rebase on dirty cache' '
 	git add A &&
-	test_must_fail git rebase master
+	test_must_fail git rebase main
 '
 
-test_expect_success 'rebase against master' '
+test_expect_success 'rebase against main' '
 	git reset --hard HEAD &&
-	git rebase master
+	git rebase main
 '
 
 test_expect_success 'rebase sets ORIG_HEAD to pre-rebase state' '
 	git checkout -b orig-head topic &&
 	pre="$(git rev-parse --verify HEAD)" &&
-	git rebase master &&
+	git rebase main &&
 	test_cmp_rev "$pre" ORIG_HEAD &&
-	! test_cmp_rev "$pre" HEAD
+	test_cmp_rev ! "$pre" HEAD
 '
 
 test_expect_success 'rebase, with <onto> and <upstream> specified as :/quuxery' '
@@ -93,28 +96,28 @@ test_expect_success 'HEAD was detached during rebase' '
 
 test_expect_success 'rebase from ambiguous branch name' '
 	git checkout -b topic side &&
-	git rebase master
+	git rebase main
 '
 
 test_expect_success 'rebase off of the previous branch using "-"' '
-	git checkout master &&
+	git checkout main &&
 	git checkout HEAD^ &&
 	git rebase @{-1} >expect.messages &&
-	git merge-base master HEAD >expect.forkpoint &&
+	git merge-base main HEAD >expect.forkpoint &&
 
-	git checkout master &&
+	git checkout main &&
 	git checkout HEAD^ &&
 	git rebase - >actual.messages &&
-	git merge-base master HEAD >actual.forkpoint &&
+	git merge-base main HEAD >actual.forkpoint &&
 
 	test_cmp expect.forkpoint actual.forkpoint &&
 	# the next one is dubious---we may want to say "-",
 	# instead of @{-1}, in the message
-	test_i18ncmp expect.messages actual.messages
+	test_cmp expect.messages actual.messages
 '
 
 test_expect_success 'rebase a single mode change' '
-	git checkout master &&
+	git checkout main &&
 	git branch -D topic &&
 	echo 1 >X &&
 	git add X &&
@@ -126,7 +129,7 @@ test_expect_success 'rebase a single mode change' '
 	test_chmod +x A &&
 	test_tick &&
 	git commit -m modechange &&
-	GIT_TRACE=1 git rebase master
+	GIT_TRACE=1 git rebase main
 '
 
 test_expect_success 'rebase is not broken by diff.renames' '
@@ -143,11 +146,11 @@ test_expect_success 'setup: recover' '
 
 test_expect_success 'Show verbose error when HEAD could not be detached' '
 	>B &&
+	test_when_finished "rm -f B" &&
 	test_must_fail git rebase topic 2>output.err >output.out &&
 	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" output.err &&
 	test_i18ngrep B output.err
 '
-rm -f B
 
 test_expect_success 'fail when upstream arg is missing and not on branch' '
 	git checkout topic &&
@@ -159,19 +162,43 @@ test_expect_success 'fail when upstream arg is missing and not configured' '
 	test_must_fail git rebase
 '
 
-test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg' '
-	git checkout -b default-base master &&
+test_expect_success 'rebase works with format.useAutoBase' '
+	test_config format.useAutoBase true &&
+	git checkout topic &&
+	git rebase main
+'
+
+test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--merge)' '
+	git checkout -b default-base main &&
 	git checkout -b default topic &&
 	git config branch.default.remote . &&
 	git config branch.default.merge refs/heads/default-base &&
-	git rebase &&
+	git rebase --merge &&
 	git rev-parse --verify default-base >expect &&
 	git rev-parse default~1 >actual &&
 	test_cmp expect actual &&
 	git checkout default-base &&
 	git reset --hard HEAD^ &&
 	git checkout default &&
-	git rebase &&
+	git rebase --merge &&
+	git rev-parse --verify default-base >expect &&
+	git rev-parse default~1 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'default to common base in @{upstream}s reflog if no upstream arg (--apply)' '
+	git checkout -B default-base main &&
+	git checkout -B default topic &&
+	git config branch.default.remote . &&
+	git config branch.default.merge refs/heads/default-base &&
+	git rebase --apply &&
+	git rev-parse --verify default-base >expect &&
+	git rev-parse default~1 >actual &&
+	test_cmp expect actual &&
+	git checkout default-base &&
+	git reset --hard HEAD^ &&
+	git checkout default &&
+	git rebase --apply &&
 	git rev-parse --verify default-base >expect &&
 	git rev-parse default~1 >actual &&
 	test_cmp expect actual
@@ -200,9 +227,15 @@ test_expect_success 'cherry-picked commits and fork-point work together' '
 	test_cmp expect D
 '
 
-test_expect_success 'rebase -q is quiet' '
+test_expect_success 'rebase --apply -q is quiet' '
 	git checkout -b quiet topic &&
-	git rebase -q master >output.out 2>&1 &&
+	git rebase --apply -q main >output.out 2>&1 &&
+	test_must_be_empty output.out
+'
+
+test_expect_success 'rebase --merge -q is quiet' '
+	git checkout -B quiet topic &&
+	git rebase --merge -q main >output.out 2>&1 &&
 	test_must_be_empty output.out
 '
 
@@ -264,7 +297,7 @@ test_expect_success 'rebase commit with an ancient timestamp' '
 '
 
 test_expect_success 'rebase with "From " line in commit message' '
-	git checkout -b preserve-from master~1 &&
+	git checkout -b preserve-from main~1 &&
 	cat >From_.msg <<EOF &&
 Somebody embedded an mbox in a commit message
 
@@ -280,12 +313,12 @@ EOF
 	>From_ &&
 	git add From_ &&
 	git commit -F From_.msg &&
-	git rebase master &&
+	git rebase main &&
 	git log -1 --pretty=format:%B >out &&
 	test_cmp From_.msg out
 '
 
-test_expect_success 'rebase --am and --show-current-patch' '
+test_expect_success 'rebase --apply and --show-current-patch' '
 	test_create_repo conflict-apply &&
 	(
 		cd conflict-apply &&
@@ -295,13 +328,13 @@ test_expect_success 'rebase --am and --show-current-patch' '
 		echo two >>init.t &&
 		git commit -a -m two &&
 		git tag two &&
-		test_must_fail git rebase -f --onto init HEAD^ &&
+		test_must_fail git rebase --apply -f --onto init HEAD^ &&
 		GIT_TRACE=1 git rebase --show-current-patch >/dev/null 2>stderr &&
 		grep "show.*$(git rev-parse two)" stderr
 	)
 '
 
-test_expect_success 'rebase --am and .gitattributes' '
+test_expect_success 'rebase --apply and .gitattributes' '
 	test_create_repo attributes &&
 	(
 		cd attributes &&
@@ -327,12 +360,12 @@ test_expect_success 'rebase --am and .gitattributes' '
 		git cherry-pick test &&
 
 		git checkout test &&
-		git rebase master &&
+		git rebase main &&
 		grep "smudged" a.txt &&
 
 		git checkout removal &&
 		git reset --hard &&
-		git rebase master &&
+		git rebase main &&
 		grep "clean" a.txt
 	)
 '
@@ -355,20 +388,32 @@ test_expect_success 'rebase--merge.sh and --show-current-patch' '
 	)
 '
 
-test_expect_success 'rebase -c rebase.useBuiltin=false warning' '
-	expected="rebase.useBuiltin support has been removed" &&
+test_expect_success 'switch to branch checked out here' '
+	git checkout main &&
+	git rebase main main
+'
+
+test_expect_success 'switch to branch not checked out' '
+	git checkout main &&
+	git branch other &&
+	git rebase main other
+'
 
-	# Only warn when the legacy rebase is requested...
-	test_must_fail git -c rebase.useBuiltin=false rebase 2>err &&
-	test_i18ngrep "$expected" err &&
-	test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=false git rebase 2>err &&
-	test_i18ngrep "$expected" err &&
+test_expect_success 'refuse to switch to branch checked out elsewhere' '
+	git checkout main &&
+	git worktree add wt &&
+	test_must_fail git -C wt rebase main main 2>err &&
+	test_i18ngrep "already checked out" err
+'
 
-	# ...not when we would have used the built-in anyway
-	test_must_fail git -c rebase.useBuiltin=true rebase 2>err &&
-	test_must_be_empty err &&
-	test_must_fail env GIT_TEST_REBASE_USE_BUILTIN=true git rebase 2>err &&
-	test_must_be_empty 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_done
diff --git a/t/t3401-rebase-and-am-rename.sh b/t/t3401-rebase-and-am-rename.sh
index a0b9438b22..f18bae9450 100755
--- a/t/t3401-rebase-and-am-rename.sh
+++ b/t/t3401-rebase-and-am-rename.sh
@@ -52,13 +52,13 @@ test_expect_success 'rebase --interactive: directory rename detected' '
 	)
 '
 
-test_expect_failure 'rebase (am): directory rename detected' '
+test_expect_failure 'rebase --apply: directory rename detected' '
 	(
 		cd dir-rename &&
 
 		git checkout B^0 &&
 
-		git -c merge.directoryRenames=true rebase A &&
+		git -c merge.directoryRenames=true rebase --apply A &&
 
 		git ls-files -s >out &&
 		test_line_count = 5 out &&
diff --git a/t/t3402-rebase-merge.sh b/t/t3402-rebase-merge.sh
index a1ec501a87..cfde68f193 100755
--- a/t/t3402-rebase-merge.sh
+++ b/t/t3402-rebase-merge.sh
@@ -5,6 +5,9 @@
 
 test_description='git rebase --merge test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 T="A quick brown fox
@@ -19,10 +22,10 @@ test_expect_success setup '
 	git commit -m"initial" &&
 	git branch side &&
 	echo "11 $T" >>original &&
-	git commit -a -m"master updates a bit." &&
+	git commit -a -m"main updates a bit." &&
 
 	echo "12 $T" >>original &&
-	git commit -a -m"master updates a bit more." &&
+	git commit -a -m"main updates a bit more." &&
 
 	git checkout side &&
 	(echo "0 $T" && cat original) >renamed &&
@@ -47,13 +50,13 @@ test_expect_success setup '
 '
 
 test_expect_success 'reference merge' '
-	git merge -s recursive -m "reference merge" master
+	git merge -s recursive -m "reference merge" main
 '
 
 PRE_REBASE=$(git rev-parse test-rebase)
 test_expect_success rebase '
 	git checkout test-rebase &&
-	GIT_TRACE=1 git rebase --merge master
+	GIT_TRACE=1 git rebase --merge main
 '
 
 test_expect_success 'test-rebase@{1} is pre rebase' '
@@ -72,24 +75,24 @@ test_expect_success 'merge and rebase should match' '
 '
 
 test_expect_success 'rebase the other way' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git rebase --merge side
 '
 
 test_expect_success 'rebase -Xtheirs' '
-	git checkout -b conflicting master~2 &&
+	git checkout -b conflicting main~2 &&
 	echo "AB $T" >> original &&
 	git commit -mconflicting original &&
-	git rebase -Xtheirs master &&
+	git rebase -Xtheirs main &&
 	grep AB original &&
 	! grep 11 original
 '
 
 test_expect_success 'rebase -Xtheirs from orphan' '
-	git checkout --orphan orphan-conflicting master~2 &&
+	git checkout --orphan orphan-conflicting main~2 &&
 	echo "AB $T" >> original &&
 	git commit -morphan-conflicting original &&
-	git rebase -Xtheirs master &&
+	git rebase -Xtheirs main &&
 	grep AB original &&
 	! grep 11 original
 '
@@ -107,9 +110,9 @@ test_expect_success 'merge and rebase should match' '
 
 test_expect_success 'picking rebase' '
 	git reset --hard side &&
-	git rebase --merge --onto master side^^ &&
-	mb=$(git merge-base master HEAD) &&
-	if test "$mb" = "$(git rev-parse master)"
+	git rebase --merge --onto main side^^ &&
+	mb=$(git merge-base main HEAD) &&
+	if test "$mb" = "$(git rev-parse main)"
 	then
 		echo happy
 	else
@@ -140,11 +143,11 @@ test_expect_success 'rebase -s funny -Xopt' '
 	EOF
 	chmod +x test-bin/git-merge-funny &&
 	git reset --hard &&
-	git checkout -b test-funny master^ &&
+	git checkout -b test-funny main^ &&
 	test_commit funny &&
 	(
 		PATH=./test-bin:$PATH &&
-		git rebase -s funny -Xopt master
+		git rebase -s funny -Xopt main
 	) &&
 	test -f funny.was.run
 '
@@ -162,4 +165,81 @@ test_expect_success 'rebase --skip works with two conflicts in a row' '
 	git rebase --skip
 '
 
+test_expect_success '--reapply-cherry-picks' '
+	git init repo &&
+
+	# O(1-10) -- O(1-11) -- O(0-10) main
+	#        \
+	#         -- O(1-11) -- O(1-12) otherbranch
+
+	printf "Line %d\n" $(test_seq 1 10) >repo/file.txt &&
+	git -C repo add file.txt &&
+	git -C repo commit -m "base commit" &&
+
+	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
+	git -C repo commit -a -m "add 11" &&
+
+	printf "Line %d\n" $(test_seq 0 10) >repo/file.txt &&
+	git -C repo commit -a -m "add 0 delete 11" &&
+
+	git -C repo checkout -b otherbranch HEAD^^ &&
+	printf "Line %d\n" $(test_seq 1 11) >repo/file.txt &&
+	git -C repo commit -a -m "add 11 in another branch" &&
+
+	printf "Line %d\n" $(test_seq 1 12) >repo/file.txt &&
+	git -C repo commit -a -m "add 12 in another branch" &&
+
+	# Regular rebase fails, because the 1-11 commit is deduplicated
+	test_must_fail git -C repo rebase --merge main 2> err &&
+	test_i18ngrep "error: could not apply.*add 12 in another branch" err &&
+	git -C repo rebase --abort &&
+
+	# With --reapply-cherry-picks, it works
+	git -C repo rebase --merge --reapply-cherry-picks main
+'
+
+test_expect_success '--reapply-cherry-picks refrains from reading unneeded blobs' '
+	git init server &&
+
+	# O(1-10) -- O(1-11) -- O(1-12) main
+	#        \
+	#         -- O(0-10) otherbranch
+
+	printf "Line %d\n" $(test_seq 1 10) >server/file.txt &&
+	git -C server add file.txt &&
+	git -C server commit -m "merge base" &&
+
+	printf "Line %d\n" $(test_seq 1 11) >server/file.txt &&
+	git -C server commit -a -m "add 11" &&
+
+	printf "Line %d\n" $(test_seq 1 12) >server/file.txt &&
+	git -C server commit -a -m "add 12" &&
+
+	git -C server checkout -b otherbranch HEAD^^ &&
+	printf "Line %d\n" $(test_seq 0 10) >server/file.txt &&
+	git -C server commit -a -m "add 0" &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	git -C client checkout origin/main &&
+	git -C client checkout origin/otherbranch &&
+
+	# Sanity check to ensure that the blobs from the merge base and "add
+	# 11" are missing
+	git -C client rev-list --objects --all --missing=print >missing_list &&
+	MERGE_BASE_BLOB=$(git -C server rev-parse main^^:file.txt) &&
+	ADD_11_BLOB=$(git -C server rev-parse main^:file.txt) &&
+	grep "[?]$MERGE_BASE_BLOB" missing_list &&
+	grep "[?]$ADD_11_BLOB" missing_list &&
+
+	git -C client rebase --merge --reapply-cherry-picks origin/main &&
+
+	# The blob from the merge base had to be fetched, but not "add 11"
+	git -C client rev-list --objects --all --missing=print >missing_list &&
+	! grep "[?]$MERGE_BASE_BLOB" missing_list &&
+	grep "[?]$ADD_11_BLOB" missing_list
+'
+
 test_done
diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index 1f5122b632..f6e4864497 100755
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -5,8 +5,13 @@
 
 test_description='git rebase --merge --skip tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
 # we assume the default git am -3 --skip strategy is tested independently
 # and always works :)
 
@@ -15,11 +20,27 @@ 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" &&
 	echo goodbye >> hello &&
 	git commit -a -m "goodbye" &&
+	git tag goodbye &&
+
+	git checkout --detach &&
+	git checkout HEAD^ . &&
+	test_tick &&
+	git commit -m reverted-goodbye &&
+	git tag reverted-goodbye &&
+	git checkout goodbye &&
+	test_tick &&
+	GIT_AUTHOR_NAME="Another Author" \
+		GIT_AUTHOR_EMAIL="another.author@example.com" \
+		git commit --amend --no-edit -m amended-goodbye \
+			--reset-author &&
+	test_tick &&
+	git tag amended-goodbye &&
 
 	git checkout -f skip-reference &&
 	echo moo > hello &&
@@ -32,7 +53,7 @@ test_expect_success setup '
 	'
 
 test_expect_success 'rebase with git am -3 (default)' '
-	test_must_fail git rebase master
+	test_must_fail git rebase --apply main
 '
 
 test_expect_success 'rebase --skip can not be used with other options' '
@@ -48,7 +69,7 @@ test_expect_success 'rebase moves back to skip-reference' '
 	test refs/heads/skip-reference = $(git symbolic-ref HEAD) &&
 	git branch post-rebase &&
 	git reset --hard pre-rebase &&
-	test_must_fail git rebase master &&
+	test_must_fail git rebase main &&
 	echo "hello" > hello &&
 	git add hello &&
 	git rebase --continue &&
@@ -59,7 +80,7 @@ test_expect_success 'rebase moves back to skip-reference' '
 test_expect_success 'checkout skip-merge' 'git checkout -f skip-merge'
 
 test_expect_success 'rebase with --merge' '
-	test_must_fail git rebase --merge master
+	test_must_fail git rebase --merge main
 '
 
 test_expect_success 'rebase --skip with --merge' '
@@ -76,4 +97,106 @@ 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 \
+		amended-goodbye^ amended-goodbye 2>err &&
+	test_i18ngrep "previous cherry-pick is now empty" err &&
+	test_i18ngrep "git rebase --skip" err &&
+	test_must_fail git commit &&
+	test_i18ngrep "git rebase --skip" err
+'
+
+test_expect_success 'correct authorship when committing empty pick' '
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -i --onto goodbye \
+		amended-goodbye^ amended-goodbye &&
+	git commit --allow-empty &&
+	git log --pretty=format:"%an <%ae>%n%ad%B" -1 amended-goodbye >expect &&
+	git log --pretty=format:"%an <%ae>%n%ad%B" -1 HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'correct advice upon rewording empty commit' '
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="reword 1" git rebase -i \
+			--onto goodbye amended-goodbye^ amended-goodbye 2>err
+	) &&
+	test_i18ngrep "previous cherry-pick is now empty" err &&
+	test_i18ngrep "git rebase --skip" err &&
+	test_must_fail git commit &&
+	test_i18ngrep "git rebase --skip" err
+'
+
+test_expect_success 'correct advice upon editing empty commit' '
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="edit 1" git rebase -i \
+			--onto goodbye amended-goodbye^ amended-goodbye 2>err
+	) &&
+	test_i18ngrep "previous cherry-pick is now empty" err &&
+	test_i18ngrep "git rebase --skip" err &&
+	test_must_fail git commit &&
+	test_i18ngrep "git rebase --skip" err
+'
+
+test_expect_success 'correct advice upon cherry-picking an empty commit during a rebase' '
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_amended-goodbye" \
+			git rebase -i goodbye^ goodbye 2>err
+	) &&
+	test_i18ngrep "previous cherry-pick is now empty" err &&
+	test_i18ngrep "git cherry-pick --skip" err &&
+	test_must_fail git commit 2>err &&
+	test_i18ngrep "git cherry-pick --skip" err
+'
+
+test_expect_success 'correct advice upon multi cherry-pick picking an empty commit during a rebase' '
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 exec_git_cherry-pick_goodbye_amended-goodbye" \
+			git rebase -i goodbye^^ goodbye 2>err
+	) &&
+	test_i18ngrep "previous cherry-pick is now empty" err &&
+	test_i18ngrep "git cherry-pick --skip" err &&
+	test_must_fail git commit 2>err &&
+	test_i18ngrep "git cherry-pick --skip" err
+'
+
+test_expect_success 'fixup that empties commit fails' '
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 2" git rebase -i \
+			goodbye^ reverted-goodbye
+	)
+'
+
+test_expect_success 'squash that empties commit fails' '
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 squash 2" git rebase -i \
+			goodbye^ reverted-goodbye
+	)
+'
+
+# Must be the last test in this file
+test_expect_success '$EDITOR and friends are unchanged' '
+	test_editor_unchanged
+'
+
 test_done
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index d2dfbe46b9..d877872e8f 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -12,7 +12,7 @@ Initial setup:
 
      one - two - three - four (conflict-branch)
    /
- A - B - C - D - E            (master)
+ A - B - C - D - E            (primary)
  | \
  |   F - G - H                (branch1)
  |     \
@@ -25,11 +25,15 @@ 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
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
 test_expect_success 'setup' '
+	git switch -C primary &&
 	test_commit A file1 &&
 	test_commit B file1 &&
 	test_commit C file2 &&
@@ -65,24 +69,28 @@ SHELL=
 export SHELL
 
 test_expect_success 'rebase --keep-empty' '
-	git checkout -b emptybranch master &&
+	git checkout -b emptybranch primary &&
 	git commit --allow-empty -m "empty" &&
 	git rebase --keep-empty -i HEAD~2 &&
 	git log --oneline >actual &&
 	test_line_count = 6 actual
 '
 
-test_expect_success 'rebase -i with empty HEAD' '
+test_expect_success 'rebase -i with empty todo list' '
 	cat >expect <<-\EOF &&
 	error: nothing to do
 	EOF
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 exec_true" git rebase -i HEAD^ >actual 2>&1 &&
-	test_i18ncmp expect actual
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="#" \
+			git rebase -i HEAD^ >output 2>&1
+	) &&
+	tail -n 1 output >actual &&  # Ignore output about changing todo list
+	test_cmp expect actual
 '
 
 test_expect_success 'rebase -i with the exec command' '
-	git checkout master &&
+	git checkout primary &&
 	(
 	set_fake_editor &&
 	FAKE_LINES="1 exec_>touch-one
@@ -93,18 +101,19 @@ test_expect_success 'rebase -i with the exec command' '
 	) &&
 	test_path_is_file touch-one &&
 	test_path_is_file touch-two &&
-	test_path_is_missing touch-three " (should have stopped before)" &&
+	# Missing because we should have stopped by now.
+	test_path_is_missing touch-three &&
 	test_cmp_rev C HEAD &&
 	git rebase --continue &&
 	test_path_is_file touch-three &&
 	test_path_is_file "touch-file  name with spaces" &&
 	test_path_is_file touch-after-semicolon &&
-	test_cmp_rev master HEAD &&
+	test_cmp_rev primary HEAD &&
 	rm -f touch-*
 '
 
 test_expect_success 'rebase -i with the exec command runs from tree root' '
-	git checkout master &&
+	git checkout primary &&
 	mkdir subdir && (cd subdir &&
 	set_fake_editor &&
 	FAKE_LINES="1 exec_>touch-subdir" \
@@ -117,7 +126,7 @@ test_expect_success 'rebase -i with the exec command runs from tree root' '
 test_expect_success 'rebase -i with exec allows git commands in subdirs' '
 	test_when_finished "rm -rf subdir" &&
 	test_when_finished "git rebase --abort ||:" &&
-	git checkout master &&
+	git checkout primary &&
 	mkdir subdir && (cd subdir &&
 	set_fake_editor &&
 	FAKE_LINES="1 x_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
@@ -135,10 +144,13 @@ test_expect_success 'rebase -i sets work tree properly' '
 '
 
 test_expect_success 'rebase -i with the exec command checks tree cleanness' '
-	git checkout master &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" git rebase -i HEAD^ &&
-	test_cmp_rev master^ HEAD &&
+	git checkout primary &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" \
+			git rebase -i HEAD^
+	) &&
+	test_cmp_rev primary^ HEAD &&
 	git reset --hard &&
 	git rebase --continue
 '
@@ -147,9 +159,9 @@ test_expect_success 'rebase -x with empty command fails' '
 	test_when_finished "git rebase --abort ||:" &&
 	test_must_fail env git rebase -x "" @ 2>actual &&
 	test_write_lines "error: empty exec command" >expected &&
-	test_i18ncmp expected actual &&
+	test_cmp expected actual &&
 	test_must_fail env git rebase -x " " @ 2>actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'rebase -x with newline in command fails' '
@@ -157,15 +169,17 @@ test_expect_success 'rebase -x with newline in command fails' '
 	test_must_fail env git rebase -x "a${LF}b" @ 2>actual &&
 	test_write_lines "error: exec commands cannot contain newlines" \
 			 >expected &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'rebase -i with exec of inexistent command' '
-	git checkout master &&
+	git checkout primary &&
 	test_when_finished "git rebase --abort" &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
-	git rebase -i HEAD^ >actual 2>&1 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
+			git rebase -i HEAD^ >actual 2>&1
+	) &&
 	! grep "Maybe git-rebase is broken" actual
 '
 
@@ -176,57 +190,55 @@ test_expect_success 'implicit interactive rebase does not invoke sequence editor
 
 test_expect_success 'no changes are a nop' '
 	git checkout branch2 &&
-	set_fake_editor &&
 	git rebase -i F &&
 	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
-	test $(git rev-parse I) = $(git rev-parse HEAD)
+	test_cmp_rev I HEAD
 '
 
 test_expect_success 'test the [branch] option' '
 	git checkout -b dead-end &&
 	git rm file6 &&
 	git commit -m "stop here" &&
-	set_fake_editor &&
 	git rebase -i F branch2 &&
 	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch2" &&
-	test $(git rev-parse I) = $(git rev-parse branch2) &&
-	test $(git rev-parse I) = $(git rev-parse HEAD)
+	test_cmp_rev I branch2 &&
+	test_cmp_rev I HEAD
 '
 
 test_expect_success 'test --onto <branch>' '
 	git checkout -b test-onto branch2 &&
-	set_fake_editor &&
 	git rebase -i --onto branch1 F &&
 	test "$(git symbolic-ref -q HEAD)" = "refs/heads/test-onto" &&
-	test $(git rev-parse HEAD^) = $(git rev-parse branch1) &&
-	test $(git rev-parse I) = $(git rev-parse branch2)
+	test_cmp_rev HEAD^ branch1 &&
+	test_cmp_rev I branch2
 '
 
 test_expect_success 'rebase on top of a non-conflicting commit' '
 	git checkout branch1 &&
 	git tag original-branch1 &&
-	set_fake_editor &&
 	git rebase -i branch2 &&
 	test file6 = $(git diff --name-only original-branch1) &&
 	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
-	test $(git rev-parse I) = $(git rev-parse branch2) &&
-	test $(git rev-parse I) = $(git rev-parse HEAD~2)
+	test_cmp_rev I branch2 &&
+	test_cmp_rev I HEAD~2
 '
 
 test_expect_success 'reflog for the branch shows state before rebase' '
-	test $(git rev-parse branch1@{1}) = $(git rev-parse original-branch1)
+	test_cmp_rev branch1@{1} original-branch1
 '
 
 test_expect_success 'reflog for the branch shows correct finish message' '
-	printf "rebase -i (finish): refs/heads/branch1 onto %s\n" \
+	printf "rebase (finish): refs/heads/branch1 onto %s\n" \
 		"$(git rev-parse branch2)" >expected &&
 	git log -g --pretty=%gs -1 refs/heads/branch1 >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'exchange two commits' '
-	set_fake_editor &&
-	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2
+	) &&
 	test H = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 	test G = $(git cat-file commit HEAD | sed -ne \$p) &&
 	blob1=$(git rev-parse --short HEAD^:file1) &&
@@ -249,12 +261,11 @@ test_expect_success 'stop on conflicting pick' '
 	D
 	=======
 	G
-	>>>>>>> $commit... G
+	>>>>>>> $commit (G)
 	EOF
 	git tag new-branch1 &&
-	set_fake_editor &&
-	test_must_fail git rebase -i master &&
-	test "$(git rev-parse HEAD~3)" = "$(git rev-parse master)" &&
+	test_must_fail git rebase -i primary &&
+	test "$(git rev-parse HEAD~3)" = "$(git rev-parse primary)" &&
 	test_cmp expect .git/rebase-merge/patch &&
 	test_cmp expect2 file1 &&
 	test "$(git diff --name-status |
@@ -273,7 +284,7 @@ test_expect_success 'show conflicted patch' '
 
 test_expect_success 'abort' '
 	git rebase --abort &&
-	test $(git rev-parse new-branch1) = $(git rev-parse HEAD) &&
+	test_cmp_rev new-branch1 HEAD &&
 	test "$(git symbolic-ref -q HEAD)" = "refs/heads/branch1" &&
 	test_path_is_missing .git/rebase-merge
 '
@@ -281,8 +292,7 @@ test_expect_success 'abort' '
 test_expect_success 'abort with error when new base cannot be checked out' '
 	git rm --cached file1 &&
 	git commit -m "remove file in base" &&
-	set_fake_editor &&
-	test_must_fail git rebase -i master > output 2>&1 &&
+	test_must_fail git rebase -i primary > output 2>&1 &&
 	test_i18ngrep "The following untracked working tree files would be overwritten by checkout:" \
 		output &&
 	test_i18ngrep "file1" output &&
@@ -296,8 +306,7 @@ test_expect_success 'retain authorship' '
 	test_tick &&
 	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
 	git tag twerp &&
-	set_fake_editor &&
-	git rebase -i --onto master HEAD^ &&
+	git rebase -i --onto primary HEAD^ &&
 	git show HEAD | grep "^Author: Twerp Snog"
 '
 
@@ -314,12 +323,11 @@ test_expect_success 'retain authorship w/ conflicts' '
 	test_commit b conflict b conflict-b &&
 	GIT_AUTHOR_NAME=$oGIT_AUTHOR_NAME &&
 
-	set_fake_editor &&
 	test_must_fail git rebase -i conflict-a &&
 	echo resolved >conflict &&
 	git add conflict &&
 	git rebase --continue &&
-	test $(git rev-parse conflict-a^0) = $(git rev-parse HEAD^) &&
+	test_cmp_rev conflict-a^0 HEAD^ &&
 	git show >out &&
 	grep AttributeMe out
 '
@@ -330,11 +338,13 @@ test_expect_success 'squash' '
 	test_tick &&
 	GIT_AUTHOR_NAME="Nitfol" git commit -m "nitfol" file7 &&
 	echo "******************************" &&
-	set_fake_editor &&
-	FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
-		git rebase -i --onto master HEAD~2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2" EXPECT_HEADER_COUNT=2 \
+			git rebase -i --onto primary HEAD~2
+	) &&
 	test B = $(cat file7) &&
-	test $(git rev-parse HEAD^) = $(git rev-parse master)
+	test_cmp_rev HEAD^ primary
 '
 
 test_expect_success 'retain authorship when squashing' '
@@ -343,7 +353,6 @@ test_expect_success 'retain authorship when squashing' '
 
 test_expect_success REBASE_P '-p handles "no changes" gracefully' '
 	HEAD=$(git rev-parse HEAD) &&
-	set_fake_editor &&
 	git rebase -i -p HEAD^ &&
 	git update-index --refresh &&
 	git diff-files --quiet &&
@@ -353,19 +362,21 @@ test_expect_success REBASE_P '-p handles "no changes" gracefully' '
 
 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 &&
+	(
+		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 master^ &&
+	git checkout -b to-be-preserved primary^ &&
 	: > unrelated-file &&
 	git add unrelated-file &&
 	test_tick &&
 	git commit -m "unrelated" &&
-	git checkout -b another-branch master &&
+	git checkout -b another-branch primary &&
 	echo B > file1 &&
 	test_tick &&
 	git commit -m J file1 &&
@@ -388,14 +399,13 @@ test_expect_success REBASE_P 'preserve merges with -p' '
 	git commit -m M file1 &&
 	git checkout -b to-be-rebased &&
 	test_tick &&
-	set_fake_editor &&
-	git rebase -i -p --onto branch1 master &&
+	git rebase -i -p --onto branch1 primary &&
 	git update-index --refresh &&
 	git diff-files --quiet &&
 	git diff-index --quiet --cached HEAD -- &&
-	test $(git rev-parse HEAD~6) = $(git rev-parse branch1) &&
-	test $(git rev-parse HEAD~4^2) = $(git rev-parse to-be-preserved) &&
-	test $(git rev-parse HEAD^^2^) = $(git rev-parse 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 &&
@@ -403,8 +413,10 @@ test_expect_success REBASE_P 'preserve merges with -p' '
 '
 
 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 &&
+	(
+		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 &&
@@ -418,19 +430,20 @@ test_expect_success REBASE_P 'edit ancestor with -p' '
 test_expect_success '--continue tries to commit' '
 	git reset --hard D &&
 	test_tick &&
-	set_fake_editor &&
-	test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
-	echo resolved > file1 &&
-	git add file1 &&
-	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
-	test $(git rev-parse HEAD^) = $(git rev-parse new-branch1) &&
+	(
+		set_fake_editor &&
+		test_must_fail git rebase -i --onto new-branch1 HEAD^ &&
+		echo resolved > file1 &&
+		git add file1 &&
+		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
+	) &&
+	test_cmp_rev HEAD^ new-branch1 &&
 	git show HEAD | grep chouette
 '
 
 test_expect_success 'verbose flag is heeded, even after --continue' '
-	git reset --hard master@{1} &&
+	git reset --hard primary@{1} &&
 	test_tick &&
-	set_fake_editor &&
 	test_must_fail git rebase -v -i --onto new-branch1 HEAD^ &&
 	echo resolved > file1 &&
 	git add file1 &&
@@ -438,22 +451,28 @@ test_expect_success 'verbose flag is heeded, even after --continue' '
 	grep "^ file1 | 2 +-$" output
 '
 
-test_expect_success C_LOCALE_OUTPUT 'multi-squash only fires up editor once' '
+test_expect_success 'multi-squash only fires up editor once' '
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 squash 2 squash 3 squash 4" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="1 squash 2 squash 3 squash 4" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 1 = $(git show | grep ONCE | wc -l)
 '
 
-test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' '
+test_expect_success 'multi-fixup does not fire up editor' '
 	git checkout -b multi-fixup E &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="NEVER" FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
-		git rebase -i $base &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="NEVER" \
+			FAKE_LINES="1 fixup 2 fixup 3 fixup 4" \
+			git rebase -i $base
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 0 = $(git show | grep NEVER | wc -l) &&
 	git checkout @{-1} &&
@@ -463,12 +482,15 @@ test_expect_success C_LOCALE_OUTPUT 'multi-fixup does not fire up editor' '
 test_expect_success 'commit message used after conflict' '
 	git checkout -b conflict-fixup conflict-branch &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" git rebase -i $base &&
-	echo three > conflict &&
-	git add conflict &&
-	FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
-		git rebase --continue &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" \
+			git rebase -i $base &&
+		echo three > conflict &&
+		git add conflict &&
+		FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
+			git rebase --continue
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 1 = $(git show | grep ONCE | wc -l) &&
 	git checkout @{-1} &&
@@ -478,19 +500,22 @@ test_expect_success 'commit message used after conflict' '
 test_expect_success 'commit message retained after conflict' '
 	git checkout -b conflict-squash conflict-branch &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 fixup 3 squash 4" git rebase -i $base &&
-	echo three > conflict &&
-	git add conflict &&
-	FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
-		git rebase --continue &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 fixup 3 squash 4" \
+			git rebase -i $base &&
+		echo three > conflict &&
+		git add conflict &&
+		FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
+			git rebase --continue
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 2 = $(git show | grep TWICE | wc -l) &&
 	git checkout @{-1} &&
 	git branch -D conflict-squash
 '
 
-test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messages' '
+test_expect_success 'squash and fixup generate correct log messages' '
 	cat >expect-squash-fixup <<-\EOF &&
 	B
 
@@ -500,10 +525,13 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa
 	EOF
 	git checkout -b squash-fixup E &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="1 fixup 2 squash 3 fixup 4" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
 	git cat-file commit HEAD | sed -e 1,/^\$/d > actual-squash-fixup &&
 	test_cmp expect-squash-fixup actual-squash-fixup &&
 	git cat-file commit HEAD@{2} |
@@ -514,26 +542,32 @@ test_expect_success C_LOCALE_OUTPUT 'squash and fixup generate correct log messa
 	git branch -D squash-fixup
 '
 
-test_expect_success C_LOCALE_OUTPUT 'squash ignores comments' '
+test_expect_success 'squash ignores comments' '
 	git checkout -b skip-comments E &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="# 1 # squash 2 # squash 3 # squash 4 #" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 1 = $(git show | grep ONCE | wc -l) &&
 	git checkout @{-1} &&
 	git branch -D skip-comments
 '
 
-test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' '
+test_expect_success 'squash ignores blank lines' '
 	git checkout -b skip-blank-lines E &&
 	base=$(git rev-parse HEAD~4) &&
-	set_fake_editor &&
-	FAKE_COMMIT_AMEND="ONCE" FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
-		EXPECT_HEADER_COUNT=4 \
-		git rebase -i $base &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="ONCE" \
+			FAKE_LINES="> 1 > squash 2 > squash 3 > squash 4 >" \
+			EXPECT_HEADER_COUNT=4 \
+			git rebase -i $base
+	) &&
 	test $base = $(git rev-parse HEAD^) &&
 	test 1 = $(git show | grep ONCE | wc -l) &&
 	git checkout @{-1} &&
@@ -543,17 +577,21 @@ test_expect_success C_LOCALE_OUTPUT 'squash ignores blank lines' '
 test_expect_success 'squash works as expected' '
 	git checkout -b squash-works no-conflict-branch &&
 	one=$(git rev-parse HEAD~3) &&
-	set_fake_editor &&
-	FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 \
-		git rebase -i HEAD~3 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 s 3 2" EXPECT_HEADER_COUNT=2 git rebase -i HEAD~3
+	) &&
 	test $one = $(git rev-parse HEAD~2)
 '
 
 test_expect_success 'interrupted squash works as expected' '
 	git checkout -b interrupted-squash conflict-branch &&
 	one=$(git rev-parse HEAD~3) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 squash 3 2" \
+			git rebase -i HEAD~3
+	) &&
 	test_write_lines one two four > conflict &&
 	git add conflict &&
 	test_must_fail git rebase --continue &&
@@ -566,8 +604,11 @@ test_expect_success 'interrupted squash works as expected' '
 test_expect_success 'interrupted squash works as expected (case 2)' '
 	git checkout -b interrupted-squash2 conflict-branch &&
 	one=$(git rev-parse HEAD~3) &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="3 squash 1 2" \
+			git rebase -i HEAD~3
+	) &&
 	test_write_lines one four > conflict &&
 	git add conflict &&
 	test_must_fail git rebase --continue &&
@@ -587,11 +628,13 @@ test_expect_success '--continue tries to commit, even for "edit"' '
 	git commit -m "unrelated change" &&
 	parent=$(git rev-parse HEAD^) &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	echo edited > file7 &&
-	git add file7 &&
-	FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo edited > file7 &&
+		git add file7 &&
+		FAKE_COMMIT_MESSAGE="chouette!" git rebase --continue
+	) &&
 	test edited = $(git show HEAD:file7) &&
 	git show HEAD | grep chouette &&
 	test $parent = $(git rev-parse HEAD^)
@@ -600,34 +643,41 @@ test_expect_success '--continue tries to commit, even for "edit"' '
 test_expect_success 'aborted --continue does not squash commits after "edit"' '
 	old=$(git rev-parse HEAD) &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	echo "edited again" > file7 &&
-	git add file7 &&
-	test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo "edited again" > file7 &&
+		git add file7 &&
+		test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue
+	) &&
 	test $old = $(git rev-parse HEAD) &&
 	git rebase --abort
 '
 
 test_expect_success 'auto-amend only edited commits after "edit"' '
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
-	echo "edited again" > file7 &&
-	git add file7 &&
-	FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
-	echo "and again" > file7 &&
-	git add file7 &&
-	test_tick &&
-	test_must_fail env FAKE_COMMIT_MESSAGE="and again" git rebase --continue &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i HEAD^ &&
+		echo "edited again" > file7 &&
+		git add file7 &&
+		FAKE_COMMIT_MESSAGE="edited file7 again" git commit &&
+		echo "and again" > file7 &&
+		git add file7 &&
+		test_tick &&
+		test_must_fail env FAKE_COMMIT_MESSAGE="and again" \
+			git rebase --continue
+	) &&
 	git rebase --abort
 '
 
 test_expect_success 'clean error after failed "exec"' '
 	test_tick &&
 	test_when_finished "git rebase --abort || :" &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^
+	) &&
 	echo "edited again" > file7 &&
 	git add file7 &&
 	test_must_fail git rebase --continue 2>error &&
@@ -638,8 +688,10 @@ test_expect_success 'rebase a detached HEAD' '
 	grandparent=$(git rev-parse HEAD~2) &&
 	git checkout $(git rev-parse HEAD) &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="2 1" git rebase -i HEAD~2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2
+	) &&
 	test $grandparent = $(git rev-parse HEAD~2)
 '
 
@@ -654,9 +706,10 @@ test_expect_success 'rebase a commit violating pre-commit' '
 	test_must_fail git commit -m doesnt-verify file1 &&
 	git commit -m doesnt-verify --no-verify file1 &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES=2 git rebase -i HEAD~2
-
+	(
+		set_fake_editor &&
+		FAKE_LINES=2 git rebase -i HEAD~2
+	)
 '
 
 test_expect_success 'rebase with a file named HEAD in worktree' '
@@ -676,8 +729,10 @@ test_expect_success 'rebase with a file named HEAD in worktree' '
 		git commit -m "Add body"
 	) &&
 
-	set_fake_editor &&
-	FAKE_LINES="1 squash 2" git rebase -i @{-1} &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2" git rebase -i @{-1}
+	) &&
 	test "$(git show -s --pretty=format:%an)" = "Squashed Away"
 
 '
@@ -688,9 +743,8 @@ test_expect_success 'do "noop" when there is nothing to cherry-pick' '
 	GIT_EDITOR=: git commit --amend \
 		--author="Somebody else <somebody@else.com>" &&
 	test $(git rev-parse branch3) != $(git rev-parse branch4) &&
-	set_fake_editor &&
 	git rebase -i branch3 &&
-	test $(git rev-parse branch3) = $(git rev-parse branch4)
+	test_cmp_rev branch3 branch4
 
 '
 
@@ -713,13 +767,14 @@ test_expect_success 'submodule rebase setup' '
 		git commit -a -m "submodule second"
 	) &&
 	test_tick &&
-	set_fake_editor &&
 	git commit -a -m "Three changes submodule"
 '
 
 test_expect_success 'submodule rebase -i' '
-	set_fake_editor &&
-	FAKE_LINES="1 squash 2 3" git rebase -i A
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 squash 2 3" git rebase -i A
+	)
 '
 
 test_expect_success 'submodule conflict setup' '
@@ -736,7 +791,6 @@ test_expect_success 'submodule conflict setup' '
 '
 
 test_expect_success 'rebase -i continue with only submodule staged' '
-	set_fake_editor &&
 	test_must_fail git rebase -i submodule-base &&
 	git add sub &&
 	git rebase --continue &&
@@ -746,20 +800,18 @@ test_expect_success 'rebase -i continue with only submodule staged' '
 test_expect_success 'rebase -i continue with unstaged submodule' '
 	git checkout submodule-topic &&
 	git reset --hard &&
-	set_fake_editor &&
 	test_must_fail git rebase -i submodule-base &&
 	git reset &&
 	git rebase --continue &&
-	test $(git rev-parse submodule-base) = $(git rev-parse HEAD)
+	test_cmp_rev submodule-base HEAD
 '
 
 test_expect_success 'avoid unnecessary reset' '
-	git checkout master &&
+	git checkout primary &&
 	git reset --hard &&
 	test-tool chmtime =123456789 file3 &&
 	git update-index --refresh &&
 	HEAD=$(git rev-parse HEAD) &&
-	set_fake_editor &&
 	git rebase -i HEAD~4 &&
 	test $HEAD = $(git rev-parse HEAD) &&
 	MTIME=$(test-tool chmtime --get file3) &&
@@ -767,20 +819,39 @@ test_expect_success 'avoid unnecessary reset' '
 '
 
 test_expect_success 'reword' '
-	git checkout -b reword-branch master &&
-	set_fake_editor &&
-	FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" git rebase -i A &&
-	git show HEAD | grep "E changed" &&
-	test $(git rev-parse master) != $(git rev-parse HEAD) &&
-	test $(git rev-parse master^) = $(git rev-parse HEAD^) &&
-	FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" git rebase -i A &&
-	git show HEAD^ | grep "D changed" &&
-	FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" git rebase -i A &&
-	git show HEAD~3 | grep "B changed" &&
-	FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" git rebase -i A &&
+	git checkout -b reword-branch primary &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 reword 4" FAKE_COMMIT_MESSAGE="E changed" \
+			git rebase -i A &&
+		git show HEAD | grep "E changed" &&
+		test $(git rev-parse primary) != $(git rev-parse HEAD) &&
+		test_cmp_rev primary^ HEAD^ &&
+		FAKE_LINES="1 2 reword 3 4" FAKE_COMMIT_MESSAGE="D changed" \
+			git rebase -i A &&
+		git show HEAD^ | grep "D changed" &&
+		FAKE_LINES="reword 1 2 3 4" FAKE_COMMIT_MESSAGE="B changed" \
+			git rebase -i A &&
+		git show HEAD~3 | grep "B changed" &&
+		FAKE_LINES="1 r 2 pick 3 p 4" FAKE_COMMIT_MESSAGE="C changed" \
+			git rebase -i A
+	) &&
 	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/*" &&
@@ -788,7 +859,6 @@ test_expect_success 'rebase -i can copy notes' '
 	test_commit n2 &&
 	test_commit n3 &&
 	git notes add -m"a note" n3 &&
-	set_fake_editor &&
 	git rebase -i --onto n1 n2 &&
 	test "a note" = "$(git notes show HEAD)"
 '
@@ -801,8 +871,11 @@ test_expect_success 'rebase -i can copy notes over a fixup' '
 	EOF
 	git reset --hard n3 &&
 	git notes add -m"an earlier note" n2 &&
-	set_fake_editor &&
-	GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" git rebase -i n1 &&
+	(
+		set_fake_editor &&
+		GIT_NOTES_REWRITE_MODE=concatenate FAKE_LINES="1 f 2" \
+			git rebase -i n1
+	) &&
 	git notes show > output &&
 	test_cmp expect output
 '
@@ -811,8 +884,10 @@ test_expect_success 'rebase while detaching HEAD' '
 	git symbolic-ref HEAD &&
 	grandparent=$(git rev-parse HEAD~2) &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1" git rebase -i HEAD~2 HEAD^0
+	) &&
 	test $grandparent = $(git rev-parse HEAD~2) &&
 	test_must_fail git symbolic-ref HEAD
 '
@@ -821,7 +896,6 @@ test_tick # Ensure that the rebased commits get a different timestamp.
 test_expect_success 'always cherry-pick with --no-ff' '
 	git checkout no-ff-branch &&
 	git tag original-no-ff-branch &&
-	set_fake_editor &&
 	git rebase -i --no-ff A &&
 	for p in 0 1 2
 	do
@@ -829,7 +903,7 @@ test_expect_success 'always cherry-pick with --no-ff' '
 		git diff HEAD~$p original-no-ff-branch~$p > out &&
 		test_must_be_empty out
 	done &&
-	test $(git rev-parse HEAD~3) = $(git rev-parse original-no-ff-branch~3) &&
+	test_cmp_rev HEAD~3 original-no-ff-branch~3 &&
 	git diff HEAD~3 original-no-ff-branch~3 > out &&
 	test_must_be_empty out
 '
@@ -853,14 +927,16 @@ test_expect_success 'set up commits with funny messages' '
 test_expect_success 'rebase-i history with funny messages' '
 	git rev-list A..funny >expect &&
 	test_tick &&
-	set_fake_editor &&
-	FAKE_LINES="1 2 3 4" git rebase -i A &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i A
+	) &&
 	git rev-list A.. >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'prepare for rebase -i --exec' '
-	git checkout master &&
+	git checkout primary &&
 	git checkout -b execute &&
 	test_commit one_exec main.txt one_exec &&
 	test_commit two_exec main.txt two_exec &&
@@ -868,9 +944,9 @@ test_expect_success 'prepare for rebase -i --exec' '
 '
 
 test_expect_success 'running "git rebase -i --exec git show HEAD"' '
-	set_fake_editor &&
-	git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
 	(
+		set_fake_editor &&
+		git rebase -i --exec "git show HEAD" HEAD~2 >actual &&
 		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 		export FAKE_LINES &&
 		git rebase -i HEAD~2 >expect
@@ -881,9 +957,9 @@ test_expect_success 'running "git rebase -i --exec git show HEAD"' '
 
 test_expect_success 'running "git rebase --exec git show HEAD -i"' '
 	git reset --hard execute &&
-	set_fake_editor &&
-	git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
 	(
+		set_fake_editor &&
+		git rebase --exec "git show HEAD" -i HEAD~2 >actual &&
 		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 		export FAKE_LINES &&
 		git rebase -i HEAD~2 >expect
@@ -894,9 +970,9 @@ test_expect_success 'running "git rebase --exec git show HEAD -i"' '
 
 test_expect_success 'running "git rebase -ix git show HEAD"' '
 	git reset --hard execute &&
-	set_fake_editor &&
-	git rebase -ix "git show HEAD" HEAD~2 >actual &&
 	(
+		set_fake_editor &&
+		git rebase -ix "git show HEAD" HEAD~2 >actual &&
 		FAKE_LINES="1 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 		export FAKE_LINES &&
 		git rebase -i HEAD~2 >expect
@@ -908,9 +984,9 @@ test_expect_success 'running "git rebase -ix git show HEAD"' '
 
 test_expect_success 'rebase -ix with several <CMD>' '
 	git reset --hard execute &&
-	set_fake_editor &&
-	git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
 	(
+		set_fake_editor &&
+		git rebase -ix "git show HEAD; pwd" HEAD~2 >actual &&
 		FAKE_LINES="1 exec_git_show_HEAD;_pwd 2 exec_git_show_HEAD;_pwd" &&
 		export FAKE_LINES &&
 		git rebase -i HEAD~2 >expect
@@ -921,9 +997,9 @@ test_expect_success 'rebase -ix with several <CMD>' '
 
 test_expect_success 'rebase -ix with several instances of --exec' '
 	git reset --hard execute &&
-	set_fake_editor &&
-	git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
 	(
+		set_fake_editor &&
+		git rebase -i --exec "git show HEAD" --exec "pwd" HEAD~2 >actual &&
 		FAKE_LINES="1 exec_git_show_HEAD exec_pwd 2
 				exec_git_show_HEAD exec_pwd" &&
 		export FAKE_LINES &&
@@ -933,7 +1009,7 @@ test_expect_success 'rebase -ix with several instances of --exec' '
 	test_cmp expected actual
 '
 
-test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' '
+test_expect_success 'rebase -ix with --autosquash' '
 	git reset --hard execute &&
 	git checkout -b autosquash &&
 	echo second >second.txt &&
@@ -942,13 +1018,11 @@ test_expect_success C_LOCALE_OUTPUT 'rebase -ix with --autosquash' '
 	echo bis >bis.txt &&
 	git add bis.txt &&
 	git commit -m "fixup! two_exec" &&
-	set_fake_editor &&
-	(
-		git checkout -b autosquash_actual &&
-		git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual
-	) &&
+	git checkout -b autosquash_actual &&
+	git rebase -i --exec "git show HEAD" --autosquash HEAD~4 >actual &&
 	git checkout autosquash &&
 	(
+		set_fake_editor &&
 		git checkout -b autosquash_expected &&
 		FAKE_LINES="1 fixup 3 fixup 4 exec_git_show_HEAD 2 exec_git_show_HEAD" &&
 		export FAKE_LINES &&
@@ -969,16 +1043,17 @@ test_expect_success 'rebase --exec works without -i ' '
 
 test_expect_success 'rebase -i --exec without <CMD>' '
 	git reset --hard execute &&
-	set_fake_editor &&
 	test_must_fail git rebase -i --exec 2>actual &&
 	test_i18ngrep "requires a value" actual &&
-	git checkout master
+	git checkout primary
 '
 
 test_expect_success 'rebase -i --root re-order and drop commits' '
 	git checkout E &&
-	set_fake_editor &&
-	FAKE_LINES="3 1 2 5" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="3 1 2 5" git rebase -i --root
+	) &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test B = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 	test A = $(git cat-file commit HEAD^^ | sed -ne \$p) &&
@@ -991,24 +1066,30 @@ test_expect_success 'rebase -i --root retain root commit author and message' '
 	echo B >file7 &&
 	git add file7 &&
 	GIT_AUTHOR_NAME="Twerp Snog" git commit -m "different author" &&
-	set_fake_editor &&
-	FAKE_LINES="2" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2" git rebase -i --root
+	) &&
 	git cat-file commit HEAD | grep -q "^author Twerp Snog" &&
 	git cat-file commit HEAD | grep -q "^different author$"
 '
 
 test_expect_success 'rebase -i --root temporary sentinel commit' '
 	git checkout B &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="2" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="2" git rebase -i --root
+	) &&
 	git cat-file commit HEAD | grep "^tree $EMPTY_TREE" &&
 	git rebase --abort
 '
 
 test_expect_success 'rebase -i --root fixup root commit' '
 	git checkout B &&
-	set_fake_editor &&
-	FAKE_LINES="1 fixup 2" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 fixup 2" git rebase -i --root
+	) &&
 	test A = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test B = $(git show HEAD:file1) &&
 	test 0 = $(git cat-file commit HEAD | grep -c ^parent\ )
@@ -1016,20 +1097,24 @@ test_expect_success 'rebase -i --root fixup root commit' '
 
 test_expect_success 'rebase -i --root reword original root commit' '
 	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b reword-original-root-branch master &&
-	set_fake_editor &&
-	FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
-	git rebase -i --root &&
+	git checkout -b reword-original-root-branch primary &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="reword 1 2" FAKE_COMMIT_MESSAGE="A changed" \
+			git rebase -i --root
+	) &&
 	git show HEAD^ | grep "A changed" &&
 	test -z "$(git show -s --format=%p HEAD^)"
 '
 
 test_expect_success 'rebase -i --root reword new root commit' '
 	test_when_finished "test_might_fail git rebase --abort" &&
-	git checkout -b reword-now-root-branch master &&
-	set_fake_editor &&
-	FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \
-	git rebase -i --root &&
+	git checkout -b reword-now-root-branch primary &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="reword 3 1" FAKE_COMMIT_MESSAGE="C changed" \
+		git rebase -i --root
+	) &&
 	git show HEAD^ | grep "C changed" &&
 	test -z "$(git show -s --format=%p HEAD^)"
 '
@@ -1041,8 +1126,10 @@ test_expect_success 'rebase -i --root when root has untracked file conflict' '
 	git rm file1 &&
 	git commit -m "remove file 1 add file 2" &&
 	echo z >file1 &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 2" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2" git rebase -i --root
+	) &&
 	rm file1 &&
 	git rebase --continue &&
 	test "$(git log -1 --format=%B)" = "remove file 1 add file 2" &&
@@ -1052,32 +1139,38 @@ test_expect_success 'rebase -i --root when root has untracked file conflict' '
 test_expect_success 'rebase -i --root reword root when root has untracked file conflict' '
 	test_when_finished "reset_rebase" &&
 	echo z>file1 &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="reword 1 2" \
-		FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root &&
-	rm file1 &&
-	FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="reword 1 2" \
+			FAKE_COMMIT_MESSAGE="Modified A" git rebase -i --root &&
+		rm file1 &&
+		FAKE_COMMIT_MESSAGE="Reworded A" git rebase --continue
+	) &&
 	test "$(git log -1 --format=%B HEAD^)" = "Reworded A" &&
 	test "$(git rev-list --count HEAD)" = 2
 '
 
-test_expect_success C_LOCALE_OUTPUT 'rebase --edit-todo does not work on non-interactive rebase' '
+test_expect_success 'rebase --edit-todo does not work on non-interactive rebase' '
 	git checkout reword-original-root-branch &&
 	git reset --hard &&
 	git checkout conflict-branch &&
-	set_fake_editor &&
-	test_must_fail git rebase -f --onto HEAD~2 HEAD~ &&
-	test_must_fail git rebase --edit-todo &&
+	(
+		set_fake_editor &&
+		test_must_fail git rebase -f --apply --onto HEAD~2 HEAD~ &&
+		test_must_fail git rebase --edit-todo
+	) &&
 	git rebase --abort
 '
 
 test_expect_success 'rebase --edit-todo can be used to modify todo' '
 	git reset --hard &&
 	git checkout no-conflict-branch^0 &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
-	FAKE_LINES="2 1" git rebase --edit-todo &&
-	git rebase --continue &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2 3" git rebase -i HEAD~3 &&
+		FAKE_LINES="2 1" git rebase --edit-todo &&
+		git rebase --continue
+	) &&
 	test M = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 	test L = $(git cat-file commit HEAD | sed -ne \$p)
 '
@@ -1085,13 +1178,12 @@ test_expect_success 'rebase --edit-todo can be used to modify todo' '
 test_expect_success 'rebase -i produces readable reflog' '
 	git reset --hard &&
 	git branch -f branch-reflog-test H &&
-	set_fake_editor &&
 	git rebase -i --onto I F branch-reflog-test &&
 	cat >expect <<-\EOF &&
-	rebase -i (finish): returning to refs/heads/branch-reflog-test
-	rebase -i (pick): H
-	rebase -i (pick): G
-	rebase -i (start): checkout I
+	rebase (finish): returning to refs/heads/branch-reflog-test
+	rebase (pick): H
+	rebase (pick): G
+	rebase (start): checkout I
 	EOF
 	git reflog -n4 HEAD |
 	sed "s/[^:]*: //" >actual &&
@@ -1106,8 +1198,10 @@ test_expect_success 'rebase -i respects core.commentchar' '
 	sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" &&
 	mv "$1.tmp" "$1"
 	EOF
-	test_set_editor "$(pwd)/remove-all-but-first.sh" &&
-	git rebase -i B &&
+	(
+		test_set_editor "$(pwd)/remove-all-but-first.sh" &&
+		git rebase -i B
+	) &&
 	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 '
 
@@ -1116,9 +1210,11 @@ test_expect_success 'rebase -i respects core.commentchar=auto' '
 	write_script copy-edit-script.sh <<-\EOF &&
 	cp "$1" edit-script
 	EOF
-	test_set_editor "$(pwd)/copy-edit-script.sh" &&
 	test_when_finished "git rebase --abort || :" &&
-	git rebase -i HEAD^ &&
+	(
+		test_set_editor "$(pwd)/copy-edit-script.sh" &&
+		git rebase -i HEAD^
+	) &&
 	test -z "$(grep -ve "^#" -e "^\$" -e "^pick" edit-script)"
 '
 
@@ -1153,8 +1249,11 @@ test_expect_success 'interrupted rebase -i with --strategy and -X' '
 	echo five >conflict &&
 	echo Z >file1 &&
 	git commit -a -m "one file conflict" &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive -Xours conflict-branch &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2" git rebase -i --strategy=recursive \
+			-Xours conflict-branch
+	) &&
 	git rebase --continue &&
 	test $(git show conflict-branch:conflict) = $(cat conflict) &&
 	test $(cat file1) = Z
@@ -1169,8 +1268,8 @@ test_expect_success 'rebase -i error on commits with \ in message' '
 	test_expect_code 1 grep  "	emp" error
 '
 
-test_expect_success SHA1 'short SHA-1 setup' '
-	test_when_finished "git checkout master" &&
+test_expect_success 'short commit ID setup' '
+	test_when_finished "git checkout primary" &&
 	git checkout --orphan collide &&
 	git rm -rf . &&
 	(
@@ -1181,22 +1280,68 @@ test_expect_success SHA1 'short SHA-1 setup' '
 	)
 '
 
-test_expect_success SHA1 'short SHA-1 collide' '
-	test_when_finished "reset_rebase && git checkout master" &&
+if test -n "$GIT_TEST_FIND_COLLIDER"
+then
+	author="$(unset test_tick; test_tick; git var GIT_AUTHOR_IDENT)"
+	committer="$(unset test_tick; test_tick; git var GIT_COMMITTER_IDENT)"
+	blob="$(git rev-parse collide2:collide)"
+	from="$(git rev-parse collide1^0)"
+	repl="commit refs/heads/collider-&\\n"
+	repl="${repl}author $author\\ncommitter $committer\\n"
+	repl="${repl}data <<EOF\\ncollide2 &\\nEOF\\n"
+	repl="${repl}from $from\\nM 100644 $blob collide\\n"
+	test_seq 1 32768 | sed "s|.*|$repl|" >script &&
+	git fast-import <script &&
+	git pack-refs &&
+	git for-each-ref >refs &&
+	grep "^$(test_oid t3404_collision)" <refs >matches &&
+	cat matches &&
+	test_line_count -gt 2 matches || {
+		echo "Could not find a collider" >&2
+		exit 1
+	}
+fi
+
+test_expect_success 'short commit ID collide' '
+	test_oid_cache <<-EOF &&
+	# collision-related constants
+	t3404_collision	sha1:6bcd
+	t3404_collision	sha256:0161
+	t3404_collider	sha1:ac4f2ee
+	t3404_collider	sha256:16697
+	EOF
+	test_when_finished "reset_rebase && git checkout primary" &&
 	git checkout collide &&
+	colliding_id=$(test_oid t3404_collision) &&
+	hexsz=$(test_oid hexsz) &&
+	test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" &&
+	test_config core.abbrev 4 &&
 	(
-	unset test_tick &&
-	test_tick &&
-	set_fake_editor &&
-	FAKE_COMMIT_MESSAGE="collide2 ac4f2ee" \
-	FAKE_LINES="reword 1 2" git rebase -i HEAD~2
-	)
+		unset test_tick &&
+		test_tick &&
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE="collide2 $(test_oid t3404_collider)" \
+		FAKE_LINES="reword 1 break 2" git rebase -i HEAD~2 &&
+		test $colliding_id = "$(git rev-parse HEAD | cut -c 1-4)" &&
+		grep "^pick $colliding_id " \
+			.git/rebase-merge/git-rebase-todo.tmp &&
+		grep "^pick [0-9a-f]\{$hexsz\}" \
+			.git/rebase-merge/git-rebase-todo &&
+		grep "^pick [0-9a-f]\{$hexsz\}" \
+			.git/rebase-merge/git-rebase-todo.backup &&
+		git rebase --continue
+	) &&
+	collide2="$(git rev-parse HEAD~1 | cut -c 1-4)" &&
+	collide3="$(git rev-parse collide3 | cut -c 1-4)" &&
+	test "$collide2" = "$collide3"
 '
 
 test_expect_success 'respect core.abbrev' '
 	git config core.abbrev 12 &&
-	set_cat_todo_editor &&
-	test_must_fail git rebase -i HEAD~4 >todo-list &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i HEAD~4 >todo-list
+	) &&
 	test 4 = $(grep -c "pick [0-9a-f]\{12,\}" todo-list)
 '
 
@@ -1204,16 +1349,20 @@ test_expect_success 'todo count' '
 	write_script dump-raw.sh <<-\EOF &&
 		cat "$1"
 	EOF
-	test_set_editor "$(pwd)/dump-raw.sh" &&
-	git rebase -i HEAD~4 >actual &&
+	(
+		test_set_editor "$(pwd)/dump-raw.sh" &&
+		git rebase -i HEAD~4 >actual
+	) &&
 	test_i18ngrep "^# Rebase ..* onto ..* ([0-9]" actual
 '
 
 test_expect_success 'rebase -i commits that overwrite untracked files (pick)' '
 	git checkout --force branch2 &&
 	git clean -f &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1 2" git rebase -i A &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2" git rebase -i A
+	) &&
 	test_cmp_rev HEAD F &&
 	test_path_is_missing file6 &&
 	>file6 &&
@@ -1228,8 +1377,10 @@ test_expect_success 'rebase -i commits that overwrite untracked files (squash)'
 	git checkout --force branch2 &&
 	git clean -f &&
 	git tag original-branch2 &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1 squash 2" git rebase -i A &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 squash 2" git rebase -i A
+	) &&
 	test_cmp_rev HEAD F &&
 	test_path_is_missing file6 &&
 	>file6 &&
@@ -1244,8 +1395,10 @@ test_expect_success 'rebase -i commits that overwrite untracked files (squash)'
 test_expect_success 'rebase -i commits that overwrite untracked files (no ff)' '
 	git checkout --force branch2 &&
 	git clean -f &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1 2" git rebase -i --no-ff A &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1 2" git rebase -i --no-ff A
+	) &&
 	test $(git cat-file commit HEAD | sed -ne \$p) = F &&
 	test_path_is_missing file6 &&
 	>file6 &&
@@ -1268,8 +1421,10 @@ test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' '
 	git tag seq-onto &&
 	git reset --hard HEAD~2 &&
 	git cherry-pick seq-onto &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES= git rebase -i seq-onto &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES= git rebase -i seq-onto
+	) &&
 	test -d .git/rebase-merge &&
 	git rebase --continue &&
 	git diff --exit-code seq-onto &&
@@ -1279,17 +1434,19 @@ test_expect_success 'rebase --continue removes CHERRY_PICK_HEAD' '
 
 rebase_setup_and_clean () {
 	test_when_finished "
-		git checkout master &&
+		git checkout primary &&
 		test_might_fail git branch -D $1 &&
 		test_might_fail git rebase --abort
 	" &&
-	git checkout -b $1 ${2:-master}
+	git checkout -b $1 ${2:-primary}
 }
 
 test_expect_success 'drop' '
 	rebase_setup_and_clean drop-test &&
-	set_fake_editor &&
-	FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 drop 2 3 d 4 5" git rebase -i --root
+	) &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test C = $(git cat-file commit HEAD^ | sed -ne \$p) &&
 	test A = $(git cat-file commit HEAD^^ | sed -ne \$p)
@@ -1298,9 +1455,10 @@ test_expect_success 'drop' '
 test_expect_success 'rebase -i respects rebase.missingCommitsCheck = ignore' '
 	test_config rebase.missingCommitsCheck ignore &&
 	rebase_setup_and_clean missing-commit &&
-	set_fake_editor &&
-	FAKE_LINES="1 2 3 4" \
-		git rebase -i --root 2>actual &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual
+	) &&
 	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test_i18ngrep \
 		"Successfully rebased and updated refs/heads/missing-commit" \
@@ -1311,16 +1469,17 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = warn' '
 	cat >expect <<-EOF &&
 	Warning: some commits may have been dropped accidentally.
 	Dropped commits (newer to older):
-	 - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
 	To avoid this message, use "drop" to explicitly remove a commit.
 	EOF
 	test_config rebase.missingCommitsCheck warn &&
 	rebase_setup_and_clean missing-commit &&
-	set_fake_editor &&
-	FAKE_LINES="1 2 3 4" \
-		git rebase -i --root 2>actual.2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 2 3 4" git rebase -i --root 2>actual.2
+	) &&
 	head -n4 actual.2 >actual &&
-	test_i18ncmp expect actual &&
+	test_cmp expect actual &&
 	test D = $(git cat-file commit HEAD | sed -ne \$p)
 '
 
@@ -1328,8 +1487,8 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
 	cat >expect <<-EOF &&
 	Warning: some commits may have been dropped accidentally.
 	Dropped commits (newer to older):
-	 - $(git rev-list --pretty=oneline --abbrev-commit -1 master)
-	 - $(git rev-list --pretty=oneline --abbrev-commit -1 master~2)
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~2)
 	To avoid this message, use "drop" to explicitly remove a commit.
 
 	Use '\''git config rebase.missingCommitsCheck'\'' to change the level of warnings.
@@ -1340,19 +1499,141 @@ test_expect_success 'rebase -i respects rebase.missingCommitsCheck = error' '
 	EOF
 	test_config rebase.missingCommitsCheck error &&
 	rebase_setup_and_clean missing-commit &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 2 4" \
-		git rebase -i --root 2>actual &&
-	test_i18ncmp expect actual &&
-	cp .git/rebase-merge/git-rebase-todo.backup \
-		.git/rebase-merge/git-rebase-todo &&
-	FAKE_LINES="1 2 drop 3 4 drop 5" \
-		git rebase --edit-todo &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 4" \
+			git rebase -i --root 2>actual &&
+		test_cmp expect actual &&
+		cp .git/rebase-merge/git-rebase-todo.backup \
+			.git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 drop 3 4 drop 5" git rebase --edit-todo
+	) &&
 	git rebase --continue &&
 	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test B = $(git cat-file commit HEAD^ | sed -ne \$p)
 '
 
+test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = ignore' '
+	test_config rebase.missingCommitsCheck ignore &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="break 1 2 3 4 5" git rebase -i --root &&
+		FAKE_LINES="1 2 3 4" git rebase --edit-todo &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_i18ngrep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
+'
+
+test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = warn' '
+	cat >expect <<-EOF &&
+	error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
+	To avoid this message, use "drop" to explicitly remove a commit.
+	EOF
+	head -n4 expect >expect.2 &&
+	tail -n1 expect >>expect.2 &&
+	tail -n4 expect.2 >expect.3 &&
+	test_config rebase.missingCommitsCheck warn &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
+			git rebase -i --root &&
+		cp .git/rebase-merge/git-rebase-todo.backup orig &&
+		FAKE_LINES="2 3 4" git rebase --edit-todo 2>actual.2 &&
+		head -n6 actual.2 >actual &&
+		test_cmp expect actual &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 3 4" git rebase --edit-todo 2>actual.2 &&
+		head -n4 actual.2 >actual &&
+		test_cmp expect.3 actual &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_i18ngrep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
+'
+
+test_expect_success 'rebase --edit-todo respects rebase.missingCommitsCheck = error' '
+	cat >expect <<-EOF &&
+	error: invalid line 1: badcmd $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
+	Warning: some commits may have been dropped accidentally.
+	Dropped commits (newer to older):
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary)
+	 - $(git rev-list --pretty=oneline --abbrev-commit -1 primary~4)
+	To avoid this message, use "drop" to explicitly remove a commit.
+
+	Use '\''git config rebase.missingCommitsCheck'\'' to change the level of warnings.
+	The possible behaviours are: ignore, warn, error.
+
+	You can fix this with '\''git rebase --edit-todo'\'' and then run '\''git rebase --continue'\''.
+	Or you can abort the rebase with '\''git rebase --abort'\''.
+	EOF
+	tail -n11 expect >expect.2 &&
+	head -n3 expect.2 >expect.3 &&
+	tail -n7 expect.2 >>expect.3 &&
+	test_config rebase.missingCommitsCheck error &&
+	rebase_setup_and_clean missing-commit &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="bad 1 2 3 4 5" \
+			git rebase -i --root &&
+		cp .git/rebase-merge/git-rebase-todo.backup orig &&
+		test_must_fail env FAKE_LINES="2 3 4" \
+			git rebase --edit-todo 2>actual &&
+		test_cmp expect actual &&
+		test_must_fail git rebase --continue 2>actual &&
+		test_cmp expect.2 actual &&
+		test_must_fail git rebase --edit-todo &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		test_must_fail env FAKE_LINES="1 2 3 4" \
+			git rebase --edit-todo 2>actual &&
+		test_cmp expect.3 actual &&
+		test_must_fail git rebase --continue 2>actual &&
+		test_cmp expect.3 actual &&
+		cp orig .git/rebase-merge/git-rebase-todo &&
+		FAKE_LINES="1 2 3 4 drop 5" git rebase --edit-todo &&
+		git rebase --continue 2>actual
+	) &&
+	test D = $(git cat-file commit HEAD | sed -ne \$p) &&
+	test_i18ngrep \
+		"Successfully rebased and updated refs/heads/missing-commit" \
+		actual
+'
+
+test_expect_success 'rebase.missingCommitsCheck = error after resolving conflicts' '
+	test_config rebase.missingCommitsCheck error &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="drop 1 break 2 3 4" git rebase -i A E
+	) &&
+	git rebase --edit-todo &&
+	test_must_fail git rebase --continue &&
+	echo x >file1 &&
+	git add file1 &&
+	git rebase --continue
+'
+
+test_expect_success 'rebase.missingCommitsCheck = error when editing for a second time' '
+	test_config rebase.missingCommitsCheck error &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 break 2 3" git rebase -i A D &&
+		cp .git/rebase-merge/git-rebase-todo todo &&
+		test_must_fail env FAKE_LINES=2 git rebase --edit-todo &&
+		GIT_SEQUENCE_EDITOR="cp todo" git rebase --edit-todo &&
+		git rebase --continue
+	)
+'
+
 test_expect_success 'respects rebase.abbreviateCommands with fixup, squash and exec' '
 	rebase_setup_and_clean abbrevcmd &&
 	test_commit "first" file1.txt "first line" first &&
@@ -1368,21 +1649,27 @@ test_expect_success 'respects rebase.abbreviateCommands with fixup, squash and e
 	x git show HEAD
 	EOF
 	git checkout abbrevcmd &&
-	set_cat_todo_editor &&
 	test_config rebase.abbreviateCommands true &&
-	test_must_fail git rebase -i --exec "git show HEAD" \
-		--autosquash master >actual &&
+	(
+		set_cat_todo_editor &&
+		test_must_fail git rebase -i --exec "git show HEAD" \
+			--autosquash primary >actual
+	) &&
 	test_cmp expected actual
 '
 
 test_expect_success 'static check of bad command' '
 	rebase_setup_and_clean bad-cmd &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
 		git rebase -i --root 2>actual &&
-	test_i18ngrep "badcmd $(git rev-list --oneline -1 master~1)" actual &&
-	test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual &&
-	FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo &&
+		test_i18ngrep "badcmd $(git rev-list --oneline -1 primary~1)" \
+				actual &&
+		test_i18ngrep "You can fix this with .git rebase --edit-todo.." \
+				actual &&
+		FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo
+	) &&
 	git rebase --continue &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p) &&
 	test C = $(git cat-file commit HEAD^ | sed -ne \$p)
@@ -1398,19 +1685,24 @@ test_expect_success 'tabs and spaces are accepted in the todolist' '
 	) >"$1.new"
 	mv "$1.new" "$1"
 	EOF
-	test_set_editor "$(pwd)/add-indent.sh" &&
-	git rebase -i HEAD^^^ &&
+	(
+		test_set_editor "$(pwd)/add-indent.sh" &&
+		git rebase -i HEAD^^^
+	) &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p)
 '
 
 test_expect_success 'static check of bad SHA-1' '
 	rebase_setup_and_clean bad-sha &&
-	set_fake_editor &&
-	test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
-		git rebase -i --root 2>actual &&
-	test_i18ngrep "edit XXXXXXX False commit" actual &&
-	test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual &&
-	FAKE_LINES="1 2 4 5 6" git rebase --edit-todo &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
+			git rebase -i --root 2>actual &&
+			test_i18ngrep "edit XXXXXXX False commit" actual &&
+			test_i18ngrep "You can fix this with .git rebase --edit-todo.." \
+					actual &&
+		FAKE_LINES="1 2 4 5 6" git rebase --edit-todo
+	) &&
 	git rebase --continue &&
 	test E = $(git cat-file commit HEAD | sed -ne \$p)
 '
@@ -1429,39 +1721,114 @@ test_expect_success 'editor saves as CR/LF' '
 
 test_expect_success 'rebase -i --gpg-sign=<key-id>' '
 	test_when_finished "test_might_fail git rebase --abort" &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
-		>out 2>err &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
+			HEAD^ >out 2>err
+	) &&
 	test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
 '
 
 test_expect_success 'rebase -i --gpg-sign=<key-id> overrides commit.gpgSign' '
 	test_when_finished "test_might_fail git rebase --abort" &&
 	test_config commit.gpgsign true &&
-	set_fake_editor &&
-	FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" HEAD^ \
-		>out 2>err &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 1" git rebase -i --gpg-sign="\"S I Gner\"" \
+			HEAD^ >out 2>err
+	) &&
 	test_i18ngrep "$SQ-S\"S I Gner\"$SQ" err
 '
 
 test_expect_success 'valid author header after --root swap' '
 	rebase_setup_and_clean author-header no-conflict-branch &&
-	set_fake_editor &&
 	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
 	git cat-file commit HEAD | grep ^author >expected &&
-	FAKE_LINES="5 1" git rebase -i --root &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="5 1" git rebase -i --root
+	) &&
 	git cat-file commit HEAD^ | grep ^author >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'valid author header when author contains single quote' '
 	rebase_setup_and_clean author-header no-conflict-branch &&
-	set_fake_editor &&
 	git commit --amend --author="Au ${SQ}thor <author@example.com>" --no-edit &&
 	git cat-file commit HEAD | grep ^author >expected &&
-	FAKE_LINES="2" git rebase -i HEAD~2 &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2" git rebase -i HEAD~2
+	) &&
 	git cat-file commit HEAD | grep ^author >actual &&
 	test_cmp expected actual
 '
 
+test_expect_success 'post-commit hook is called' '
+	test_when_finished "rm -f .git/hooks/post-commit" &&
+	>actual &&
+	mkdir -p .git/hooks &&
+	write_script .git/hooks/post-commit <<-\EOS &&
+	git rev-parse HEAD >>actual
+	EOS
+	(
+		set_fake_editor &&
+		FAKE_LINES="edit 4 1 reword 2 fixup 3" git rebase -i A E &&
+		echo x>file3 &&
+		git add file3 &&
+		FAKE_COMMIT_MESSAGE=edited git rebase --continue
+	) &&
+	git rev-parse HEAD@{5} HEAD@{4} HEAD@{3} HEAD@{2} HEAD@{1} HEAD \
+		>expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'correct error message for partial commit after empty pick' '
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="2 1 1" &&
+		export FAKE_LINES &&
+		test_must_fail git rebase -i A D
+	) &&
+	echo x >file1 &&
+	test_must_fail git commit file1 2>err &&
+	test_i18ngrep "cannot do a partial commit during a rebase." err
+'
+
+test_expect_success 'correct error message for commit --amend after empty pick' '
+	test_when_finished "git rebase --abort" &&
+	(
+		set_fake_editor &&
+		FAKE_LINES="1 1" &&
+		export FAKE_LINES &&
+		test_must_fail git rebase -i A D
+	) &&
+	echo x>file1 &&
+	test_must_fail git commit -a --amend 2>err &&
+	test_i18ngrep "middle of a rebase -- cannot amend." err
+'
+
+test_expect_success 'todo has correct onto hash' '
+	GIT_SEQUENCE_EDITOR=cat git rebase -i no-conflict-branch~4 no-conflict-branch >actual &&
+	onto=$(git rev-parse --short HEAD~4) &&
+	test_i18ngrep "^# Rebase ..* onto $onto" actual
+'
+
+test_expect_success 'ORIG_HEAD is updated correctly' '
+	test_when_finished "git checkout primary && git branch -D test-orig-head" &&
+	git checkout -b test-orig-head A &&
+	git commit --allow-empty -m A1 &&
+	git commit --allow-empty -m A2 &&
+	git commit --allow-empty -m A3 &&
+	git commit --allow-empty -m A4 &&
+	git rebase primary &&
+	test_cmp_rev ORIG_HEAD test-orig-head@{1}
+'
+
+# This must be the last test in this file
+test_expect_success '$EDITOR and friends are unchanged' '
+	test_editor_unchanged
+'
+
 test_done
diff --git a/t/t3405-rebase-malformed.sh b/t/t3405-rebase-malformed.sh
index 860e63e444..2524331861 100755
--- a/t/t3405-rebase-malformed.sh
+++ b/t/t3405-rebase-malformed.sh
@@ -2,6 +2,9 @@
 
 test_description='rebase should handle arbitrary git message'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
@@ -52,7 +55,7 @@ test_expect_success setup '
 	git add file3 &&
 	git commit --allow-empty-message -m "" &&
 
-	git checkout master &&
+	git checkout main &&
 
 	echo One >file1 &&
 	test_tick &&
@@ -62,7 +65,7 @@ test_expect_success setup '
 
 test_expect_success 'rebase commit with multi-line subject' '
 
-	git rebase master multi-line-subject &&
+	git rebase main multi-line-subject &&
 	git cat-file commit HEAD | sed -e "1,/^\$/d" >F1 &&
 
 	test_cmp F0 F1 &&
@@ -70,14 +73,14 @@ test_expect_success 'rebase commit with multi-line subject' '
 '
 
 test_expect_success 'rebase commit with diff in message' '
-	git rebase master diff-in-message &&
+	git rebase main diff-in-message &&
 	git cat-file commit HEAD | sed -e "1,/^$/d" >G1 &&
 	test_cmp G0 G1 &&
 	test_cmp G G0
 '
 
 test_expect_success 'rebase -m commit with empty message' '
-	git rebase -m master empty-message-merge
+	git rebase -m main empty-message-merge
 '
 
 test_expect_success 'rebase -i commit with empty message' '
diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh
index b393e1e9fe..77a313f62e 100755
--- a/t/t3406-rebase-message.sh
+++ b/t/t3406-rebase-message.sh
@@ -2,6 +2,9 @@
 
 test_description='messages from rebase operation'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -18,62 +21,52 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'rebase -m' '
-	git rebase -m master >report &&
-	>expect &&
-	sed -n -e "/^Already applied: /p" \
-		-e "/^Committed: /p" report >actual &&
-	test_cmp expect actual
+	git rebase -m main >actual &&
+	test_must_be_empty actual
 '
 
-test_expect_success 'rebase against master twice' '
-	git rebase master >out &&
+test_expect_success 'rebase against main twice' '
+	git rebase --apply main >out &&
 	test_i18ngrep "Current branch topic is up to date" out
 '
 
-test_expect_success 'rebase against master twice with --force' '
-	git rebase --force-rebase master >out &&
+test_expect_success 'rebase against main twice with --force' '
+	git rebase --force-rebase --apply main >out &&
 	test_i18ngrep "Current branch topic is up to date, rebase forced" out
 '
 
-test_expect_success 'rebase against master twice from another branch' '
+test_expect_success 'rebase against main twice from another branch' '
 	git checkout topic^ &&
-	git rebase master topic >out &&
+	git rebase --apply main topic >out &&
 	test_i18ngrep "Current branch topic is up to date" out
 '
 
-test_expect_success 'rebase fast-forward to master' '
+test_expect_success 'rebase fast-forward to main' '
 	git checkout topic^ &&
-	git rebase topic >out &&
+	git rebase --apply topic >out &&
 	test_i18ngrep "Fast-forwarded HEAD to topic" out
 '
 
 test_expect_success 'rebase --stat' '
 	git reset --hard start &&
-        git rebase --stat master >diffstat.txt &&
-        grep "^ fileX |  *1 +$" diffstat.txt
+	git rebase --stat main >diffstat.txt &&
+	grep "^ fileX |  *1 +$" diffstat.txt
 '
 
 test_expect_success 'rebase w/config rebase.stat' '
 	git reset --hard start &&
-        git config rebase.stat true &&
-        git rebase master >diffstat.txt &&
-        grep "^ fileX |  *1 +$" diffstat.txt
+	git config rebase.stat true &&
+	git rebase main >diffstat.txt &&
+	grep "^ fileX |  *1 +$" diffstat.txt
 '
 
 test_expect_success 'rebase -n overrides config rebase.stat config' '
 	git reset --hard start &&
-        git config rebase.stat true &&
-        git rebase -n master >diffstat.txt &&
-        ! grep "^ fileX |  *1 +$" diffstat.txt
+	git config rebase.stat true &&
+	git rebase -n main >diffstat.txt &&
+	! grep "^ fileX |  *1 +$" diffstat.txt
 '
 
-# Output to stderr:
-#
-#     "Does not point to a valid commit: invalid-ref"
-#
-# NEEDSWORK: This "grep" is fine in real non-C locales, but
-# GIT_TEST_GETTEXT_POISON poisons the refname along with the enclosing
-# error message.
 test_expect_success 'rebase --onto outputs the invalid ref' '
 	test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err &&
 	test_i18ngrep "invalid-ref" err
@@ -95,9 +88,9 @@ test_expect_success 'GIT_REFLOG_ACTION' '
 	git rebase reflog-onto &&
 	git log -g --format=%gs -3 >actual &&
 	cat >expect <<-\EOF &&
-	rebase finished: returning to refs/heads/reflog-topic
-	rebase: reflog-to-rebase
-	rebase: checkout reflog-onto
+	rebase (finish): returning to refs/heads/reflog-topic
+	rebase (pick): reflog-to-rebase
+	rebase (start): checkout reflog-onto
 	EOF
 	test_cmp expect actual &&
 
@@ -105,9 +98,9 @@ test_expect_success 'GIT_REFLOG_ACTION' '
 	GIT_REFLOG_ACTION=change-the-reflog git rebase reflog-onto &&
 	git log -g --format=%gs -3 >actual &&
 	cat >expect <<-\EOF &&
-	rebase finished: returning to refs/heads/reflog-prefix
-	change-the-reflog: reflog-to-rebase
-	change-the-reflog: checkout reflog-onto
+	change-the-reflog (finish): returning to refs/heads/reflog-prefix
+	change-the-reflog (pick): reflog-to-rebase
+	change-the-reflog (start): checkout reflog-onto
 	EOF
 	test_cmp expect actual
 '
@@ -116,7 +109,7 @@ test_expect_success 'rebase -i onto unrelated history' '
 	git init unrelated &&
 	test_commit -C unrelated 1 &&
 	git -C unrelated remote add -f origin "$PWD" &&
-	git -C unrelated branch --set-upstream-to=origin/master &&
+	git -C unrelated branch --set-upstream-to=origin/main &&
 	git -C unrelated -c core.editor=true rebase -i -v --stat >actual &&
 	test_i18ngrep "Changes to " actual &&
 	test_i18ngrep "5 files changed" actual
diff --git a/t/t3407-rebase-abort.sh b/t/t3407-rebase-abort.sh
index 910f218284..7c381fbc89 100755
--- a/t/t3407-rebase-abort.sh
+++ b/t/t3407-rebase-abort.sh
@@ -2,6 +2,9 @@
 
 test_description='git rebase --abort tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 ### Test that we handle space characters properly
@@ -37,7 +40,7 @@ testrebase() {
 		cd "$work_dir" &&
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
+		test_must_fail git rebase$type main &&
 		test_path_is_dir "$dotest" &&
 		git rebase --abort &&
 		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
@@ -48,10 +51,10 @@ testrebase() {
 		cd "$work_dir" &&
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
+		test_must_fail git rebase$type main &&
 		test_path_is_dir "$dotest" &&
 		test_must_fail git rebase --skip &&
-		test $(git rev-parse HEAD) = $(git rev-parse master) &&
+		test $(git rev-parse HEAD) = $(git rev-parse main) &&
 		git rebase --abort &&
 		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
 		test ! -d "$dotest"
@@ -61,13 +64,13 @@ testrebase() {
 		cd "$work_dir" &&
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
+		test_must_fail git rebase$type main &&
 		test_path_is_dir "$dotest" &&
 		echo c > a &&
 		echo d >> a &&
 		git add a &&
 		test_must_fail git rebase --continue &&
-		test $(git rev-parse HEAD) != $(git rev-parse master) &&
+		test $(git rev-parse HEAD) != $(git rev-parse main) &&
 		git rebase --abort &&
 		test $(git rev-parse to-rebase) = $(git rev-parse pre-rebase) &&
 		test ! -d "$dotest"
@@ -78,7 +81,7 @@ testrebase() {
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
 		git reflog show to-rebase > reflog_before &&
-		test_must_fail git rebase$type master &&
+		test_must_fail git rebase$type main &&
 		git rebase --abort &&
 		git reflog show to-rebase > reflog_after &&
 		test_cmp reflog_before reflog_after &&
@@ -89,21 +92,21 @@ testrebase() {
 		cd "$work_dir" &&
 		# Clean up the state from the previous one
 		git reset --hard pre-rebase &&
-		test_must_fail git rebase$type master &&
+		test_must_fail git rebase$type main &&
 		test_must_fail git rebase -v --abort &&
 		test_must_fail git rebase --abort -v &&
 		git rebase --abort
 	'
 }
 
-testrebase "" .git/rebase-apply
+testrebase " --apply" .git/rebase-apply
 testrebase " --merge" .git/rebase-merge
 
-test_expect_success 'rebase --quit' '
+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 master &&
+	test_must_fail git rebase --apply main &&
 	test_path_is_dir .git/rebase-apply &&
 	head_before=$(git rev-parse HEAD) &&
 	git rebase --quit &&
@@ -115,7 +118,7 @@ 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 master &&
+	test_must_fail git rebase --merge main &&
 	test_path_is_dir .git/rebase-merge &&
 	head_before=$(git rev-parse HEAD) &&
 	git rebase --quit &&
diff --git a/t/t3408-rebase-multi-line.sh b/t/t3408-rebase-multi-line.sh
index d2bd7c17b0..ab0960e6d9 100755
--- a/t/t3408-rebase-multi-line.sh
+++ b/t/t3408-rebase-multi-line.sh
@@ -2,6 +2,9 @@
 
 test_description='rebasing a commit with multi-line first paragraph.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -46,7 +49,7 @@ But otherwise with a sane description." side2 &&
 test_expect_success rebase '
 
 	git checkout side &&
-	git rebase master &&
+	git rebase main &&
 	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
 	git cat-file commit side@{1} | sed -e "1,/^\$/d" >expect &&
 	test_cmp expect actual
diff --git a/t/t3409-rebase-preserve-merges.sh b/t/t3409-rebase-preserve-merges.sh
index 3b340f1ece..ec8062a66a 100755
--- a/t/t3409-rebase-preserve-merges.sh
+++ b/t/t3409-rebase-preserve-merges.sh
@@ -6,6 +6,9 @@ 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
@@ -18,7 +21,7 @@ export GIT_AUTHOR_EMAIL
 
 # Clone 2 (conflicting merge):
 #
-# A1--A2--B3   <-- origin/master
+# A1--A2--B3   <-- origin/main
 #  \       \
 #   B1------M  <-- topic
 #    \
@@ -26,7 +29,7 @@ export GIT_AUTHOR_EMAIL
 #
 # Clone 3 (no-ff merge):
 #
-# A1--A2--B3   <-- origin/master
+# A1--A2--B3   <-- origin/main
 #  \
 #   B1------M  <-- topic
 #    \     /
@@ -44,7 +47,7 @@ test_expect_success 'setup for merge-preserving rebase' \
 	echo Second > B &&
 	git add B &&
 	git commit -m "Add B1" &&
-	git checkout -f master &&
+	git checkout -f main &&
 	echo Third >> A &&
 	git commit -a -m "Modify A2" &&
 	echo Fifth > B &&
@@ -55,10 +58,10 @@ test_expect_success 'setup for merge-preserving rebase' \
 	(
 		cd clone2 &&
 		git checkout -b topic origin/topic &&
-		test_must_fail git merge origin/master &&
+		test_must_fail git merge origin/main &&
 		echo Resolved >B &&
 		git add B &&
-		git commit -m "Merge origin/master into topic"
+		git commit -m "Merge origin/main into topic"
 	) &&
 
 	git clone ./. clone3 &&
diff --git a/t/t3412-rebase-root.sh b/t/t3412-rebase-root.sh
index 21632a984e..fda62c65bd 100755
--- a/t/t3412-rebase-root.sh
+++ b/t/t3412-rebase-root.sh
@@ -4,6 +4,9 @@ test_description='git rebase --root
 
 Tests if git rebase --root --onto <newparent> can rebase the root commit.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 log_with_names () {
@@ -24,7 +27,7 @@ test_expect_success 'prepare repository' '
 
 test_expect_success 'rebase --root fails with too many args' '
 	git checkout -B fail other &&
-	test_must_fail git rebase --onto master --root fail fail
+	test_must_fail git rebase --onto main --root fail fail
 '
 
 test_expect_success 'setup pre-rebase hook' '
@@ -44,7 +47,7 @@ EOF
 
 test_expect_success 'rebase --root --onto <newbase>' '
 	git checkout -b work other &&
-	git rebase --root --onto master &&
+	git rebase --root --onto main &&
 	git log --pretty=tformat:"%s" > rebased &&
 	test_cmp expect rebased
 '
@@ -55,7 +58,7 @@ test_expect_success 'pre-rebase got correct input (1)' '
 
 test_expect_success 'rebase --root --onto <newbase> <branch>' '
 	git branch work2 other &&
-	git rebase --root --onto master work2 &&
+	git rebase --root --onto main work2 &&
 	git log --pretty=tformat:"%s" > rebased2 &&
 	test_cmp expect rebased2
 '
@@ -66,7 +69,7 @@ test_expect_success 'pre-rebase got correct input (2)' '
 
 test_expect_success 'rebase -i --root --onto <newbase>' '
 	git checkout -b work3 other &&
-	git rebase -i --root --onto master &&
+	git rebase -i --root --onto main &&
 	git log --pretty=tformat:"%s" > rebased3 &&
 	test_cmp expect rebased3
 '
@@ -77,7 +80,7 @@ test_expect_success 'pre-rebase got correct input (3)' '
 
 test_expect_success 'rebase -i --root --onto <newbase> <branch>' '
 	git branch work4 other &&
-	git rebase -i --root --onto master work4 &&
+	git rebase -i --root --onto main work4 &&
 	git log --pretty=tformat:"%s" > rebased4 &&
 	test_cmp expect rebased4
 '
@@ -88,7 +91,7 @@ test_expect_success 'pre-rebase got correct input (4)' '
 
 test_expect_success REBASE_P 'rebase -i -p with linear history' '
 	git checkout -b work5 other &&
-	git rebase -i -p --root --onto master &&
+	git rebase -i -p --root --onto main &&
 	git log --pretty=tformat:"%s" > rebased5 &&
 	test_cmp expect rebased5
 '
@@ -122,7 +125,7 @@ EOF
 
 test_expect_success REBASE_P 'rebase -i -p with merge' '
 	git checkout -b work6 other &&
-	git rebase -i -p --root --onto master &&
+	git rebase -i -p --root --onto main &&
 	log_with_names work6 > rebased6 &&
 	test_cmp expect-side rebased6
 '
@@ -157,7 +160,7 @@ EOF
 
 test_expect_success REBASE_P 'rebase -i -p with two roots' '
 	git checkout -b work7 other &&
-	git rebase -i -p --root --onto master &&
+	git rebase -i -p --root --onto main &&
 	log_with_names work7 > rebased7 &&
 	test_cmp expect-third rebased7
 '
@@ -173,14 +176,14 @@ EOF
 
 test_expect_success 'pre-rebase hook stops rebase' '
 	git checkout -b stops1 other &&
-	test_must_fail git rebase --root --onto master &&
+	test_must_fail git rebase --root --onto main &&
 	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops1 &&
 	test 0 = $(git rev-list other...stops1 | wc -l)
 '
 
 test_expect_success 'pre-rebase hook stops rebase -i' '
 	git checkout -b stops2 other &&
-	test_must_fail git rebase --root --onto master &&
+	test_must_fail git rebase --root --onto main &&
 	test "z$(git symbolic-ref HEAD)" = zrefs/heads/stops2 &&
 	test 0 = $(git rev-list other...stops2 | wc -l)
 '
@@ -190,7 +193,7 @@ test_expect_success 'remove pre-rebase hook' '
 '
 
 test_expect_success 'set up a conflict' '
-	git checkout master &&
+	git checkout main &&
 	echo conflict > B &&
 	git add B &&
 	git commit -m conflict
@@ -198,7 +201,7 @@ test_expect_success 'set up a conflict' '
 
 test_expect_success 'rebase --root with conflict (first part)' '
 	git checkout -b conflict1 other &&
-	test_must_fail git rebase --root --onto master &&
+	test_must_fail git rebase --root --onto main &&
 	git ls-files -u | grep "B$"
 '
 
@@ -225,7 +228,7 @@ test_expect_success 'rebase --root with conflict (second part)' '
 
 test_expect_success 'rebase -i --root with conflict (first part)' '
 	git checkout -b conflict2 other &&
-	test_must_fail git rebase -i --root --onto master &&
+	test_must_fail git rebase -i --root --onto main &&
 	git ls-files -u | grep "B$"
 '
 
@@ -263,7 +266,7 @@ 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 master &&
+	test_must_fail git rebase -i -p --root --onto main &&
 	git ls-files -u | grep "B$"
 '
 
diff --git a/t/t3413-rebase-hook.sh b/t/t3413-rebase-hook.sh
index b6833e9a5f..b4acb3be5c 100755
--- a/t/t3413-rebase-hook.sh
+++ b/t/t3413-rebase-hook.sh
@@ -2,6 +2,9 @@
 
 test_description='git rebase with its hook(s)'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -18,7 +21,7 @@ test_expect_success setup '
 	git add git &&
 	test_tick &&
 	git commit -m side &&
-	git checkout master &&
+	git checkout main &&
 	git log --pretty=oneline --abbrev-commit --graph --all &&
 	git branch test side
 '
@@ -26,14 +29,14 @@ test_expect_success setup '
 test_expect_success 'rebase' '
 	git checkout test &&
 	git reset --hard side &&
-	git rebase master &&
+	git rebase main &&
 	test "z$(cat git)" = zworld
 '
 
 test_expect_success 'rebase -i' '
 	git checkout test &&
 	git reset --hard side &&
-	EDITOR=true git rebase -i master &&
+	EDITOR=true git rebase -i main &&
 	test "z$(cat git)" = zworld
 '
 
@@ -49,53 +52,53 @@ EOF
 test_expect_success 'pre-rebase hook gets correct input (1)' '
 	git checkout test &&
 	git reset --hard side &&
-	git rebase master &&
+	git rebase main &&
 	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
 
 '
 
 test_expect_success 'pre-rebase hook gets correct input (2)' '
 	git checkout test &&
 	git reset --hard side &&
-	git rebase master test &&
+	git rebase main test &&
 	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
 '
 
 test_expect_success 'pre-rebase hook gets correct input (3)' '
 	git checkout test &&
 	git reset --hard side &&
-	git checkout master &&
-	git rebase master test &&
+	git checkout main &&
+	git rebase main test &&
 	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
 '
 
 test_expect_success 'pre-rebase hook gets correct input (4)' '
 	git checkout test &&
 	git reset --hard side &&
-	EDITOR=true git rebase -i master &&
+	EDITOR=true git rebase -i main &&
 	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,
 
 '
 
 test_expect_success 'pre-rebase hook gets correct input (5)' '
 	git checkout test &&
 	git reset --hard side &&
-	EDITOR=true git rebase -i master test &&
+	EDITOR=true git rebase -i main test &&
 	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
 '
 
 test_expect_success 'pre-rebase hook gets correct input (6)' '
 	git checkout test &&
 	git reset --hard side &&
-	git checkout master &&
-	EDITOR=true git rebase -i master test &&
+	git checkout main &&
+	EDITOR=true git rebase -i main test &&
 	test "z$(cat git)" = zworld &&
-	test "z$(cat .git/PRE-REBASE-INPUT)" = zmaster,test
+	test "z$(cat .git/PRE-REBASE-INPUT)" = zmain,test
 '
 
 test_expect_success 'setup pre-rebase hook that fails' '
@@ -110,7 +113,7 @@ EOF
 test_expect_success 'pre-rebase hook stops rebase (1)' '
 	git checkout test &&
 	git reset --hard side &&
-	test_must_fail git rebase master &&
+	test_must_fail git rebase main &&
 	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
 	test 0 = $(git rev-list HEAD...side | wc -l)
 '
@@ -118,7 +121,7 @@ test_expect_success 'pre-rebase hook stops rebase (1)' '
 test_expect_success 'pre-rebase hook stops rebase (2)' '
 	git checkout test &&
 	git reset --hard side &&
-	test_must_fail env EDITOR=: git rebase -i master &&
+	test_must_fail env EDITOR=: git rebase -i main &&
 	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
 	test 0 = $(git rev-list HEAD...side | wc -l)
 '
@@ -126,7 +129,7 @@ test_expect_success 'pre-rebase hook stops rebase (2)' '
 test_expect_success 'rebase --no-verify overrides pre-rebase (1)' '
 	git checkout test &&
 	git reset --hard side &&
-	git rebase --no-verify master &&
+	git rebase --no-verify main &&
 	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
 	test "z$(cat git)" = zworld
 '
@@ -134,7 +137,7 @@ test_expect_success 'rebase --no-verify overrides pre-rebase (1)' '
 test_expect_success 'rebase --no-verify overrides pre-rebase (2)' '
 	git checkout test &&
 	git reset --hard side &&
-	EDITOR=true git rebase --no-verify -i master &&
+	EDITOR=true git rebase --no-verify -i main &&
 	test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
 	test "z$(cat git)" = zworld
 '
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 22d218698e..78c27496d6 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -2,6 +2,9 @@
 
 test_description='auto squash'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
@@ -25,6 +28,13 @@ test_expect_success setup '
 '
 
 test_auto_fixup () {
+	no_squash= &&
+	if test "x$1" = 'x!'
+	then
+		no_squash=true
+		shift
+	fi &&
+
 	git reset --hard base &&
 	echo 1 >file1 &&
 	git add -u &&
@@ -35,10 +45,19 @@ test_auto_fixup () {
 	test_tick &&
 	git rebase $2 -i HEAD^^^ &&
 	git log --oneline >actual &&
-	test_line_count = 3 actual &&
-	git diff --exit-code $1 &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD^ | grep first | wc -l)
+	if test -n "$no_squash"
+	then
+		test_line_count = 4 actual
+	else
+		test_line_count = 3 actual &&
+		git diff --exit-code $1 &&
+		echo 1 >expect &&
+		git cat-file blob HEAD^:file1 >actual &&
+		test_cmp expect actual &&
+		git cat-file commit HEAD^ >commit &&
+		grep first commit >actual &&
+		test_line_count = 1 actual
+	fi
 }
 
 test_expect_success 'auto fixup (option)' '
@@ -48,26 +67,41 @@ test_expect_success 'auto fixup (option)' '
 test_expect_success 'auto fixup (config)' '
 	git config rebase.autosquash true &&
 	test_auto_fixup final-fixup-config-true &&
-	test_must_fail test_auto_fixup fixup-config-true-no --no-autosquash &&
+	test_auto_fixup ! fixup-config-true-no --no-autosquash &&
 	git config rebase.autosquash false &&
-	test_must_fail test_auto_fixup final-fixup-config-false
+	test_auto_fixup ! final-fixup-config-false
 '
 
 test_auto_squash () {
+	no_squash= &&
+	if test "x$1" = 'x!'
+	then
+		no_squash=true
+		shift
+	fi &&
+
 	git reset --hard base &&
 	echo 1 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "squash! first" &&
-
+	git commit -m "squash! first" -m "extra para for first" &&
 	git tag $1 &&
 	test_tick &&
 	git rebase $2 -i HEAD^^^ &&
 	git log --oneline >actual &&
-	test_line_count = 3 actual &&
-	git diff --exit-code $1 &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 2 = $(git cat-file commit HEAD^ | grep first | wc -l)
+	if test -n "$no_squash"
+	then
+		test_line_count = 4 actual
+	else
+		test_line_count = 3 actual &&
+		git diff --exit-code $1 &&
+		echo 1 >expect &&
+		git cat-file blob HEAD^:file1 >actual &&
+		test_cmp expect actual &&
+		git cat-file commit HEAD^ >commit &&
+		grep first commit >actual &&
+		test_line_count = 2 actual
+	fi
 }
 
 test_expect_success 'auto squash (option)' '
@@ -77,9 +111,9 @@ test_expect_success 'auto squash (option)' '
 test_expect_success 'auto squash (config)' '
 	git config rebase.autosquash true &&
 	test_auto_squash final-squash-config-true &&
-	test_must_fail test_auto_squash squash-config-true-no --no-autosquash &&
+	test_auto_squash ! squash-config-true-no --no-autosquash &&
 	git config rebase.autosquash false &&
-	test_must_fail test_auto_squash final-squash-config-false
+	test_auto_squash ! final-squash-config-false
 '
 
 test_expect_success 'misspelled auto squash' '
@@ -94,7 +128,8 @@ test_expect_success 'misspelled auto squash' '
 	git log --oneline >actual &&
 	test_line_count = 4 actual &&
 	git diff --exit-code final-missquash &&
-	test 0 = $(git rev-list final-missquash...HEAD | wc -l)
+	git rev-list final-missquash...HEAD >list &&
+	test_must_be_empty list
 '
 
 test_expect_success 'auto squash that matches 2 commits' '
@@ -106,16 +141,22 @@ test_expect_success 'auto squash that matches 2 commits' '
 	echo 1 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "squash! first" &&
+	git commit -m "squash! first" -m "extra para for first" &&
 	git tag final-multisquash &&
 	test_tick &&
 	git rebase --autosquash -i HEAD~4 &&
 	git log --oneline >actual &&
 	test_line_count = 4 actual &&
 	git diff --exit-code final-multisquash &&
-	test 1 = "$(git cat-file blob HEAD^^:file1)" &&
-	test 2 = $(git cat-file commit HEAD^^ | grep first | wc -l) &&
-	test 1 = $(git cat-file commit HEAD | grep first | wc -l)
+	echo 1 >expect &&
+	git cat-file blob HEAD^^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^^ >commit &&
+	grep first commit >actual &&
+	test_line_count = 2 actual &&
+	git cat-file commit HEAD >commit &&
+	grep first commit >actual &&
+	test_line_count = 1 actual
 '
 
 test_expect_success 'auto squash that matches a commit after the squash' '
@@ -134,25 +175,39 @@ test_expect_success 'auto squash that matches a commit after the squash' '
 	git log --oneline >actual &&
 	test_line_count = 5 actual &&
 	git diff --exit-code final-presquash &&
-	test 0 = "$(git cat-file blob HEAD^^:file1)" &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD | grep third | wc -l) &&
-	test 1 = $(git cat-file commit HEAD^ | grep third | wc -l)
+	echo 0 >expect &&
+	git cat-file blob HEAD^^:file1 >actual &&
+	test_cmp expect actual &&
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD >commit &&
+	grep third commit >actual &&
+	test_line_count = 1 actual &&
+	git cat-file commit HEAD^ >commit &&
+	grep third commit >actual &&
+	test_line_count = 1 actual
 '
 test_expect_success 'auto squash that matches a sha1' '
 	git reset --hard base &&
 	echo 1 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "squash! $(git rev-parse --short HEAD^)" &&
+	oid=$(git rev-parse --short HEAD^) &&
+	git commit -m "squash! $oid" -m "extra para" &&
 	git tag final-shasquash &&
 	test_tick &&
 	git rebase --autosquash -i HEAD^^^ &&
 	git log --oneline >actual &&
 	test_line_count = 3 actual &&
 	git diff --exit-code final-shasquash &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l)
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	! grep "squash" commit &&
+	grep "^extra para" commit >actual &&
+	test_line_count = 1 actual
 '
 
 test_expect_success 'auto squash that matches longer sha1' '
@@ -160,15 +215,21 @@ test_expect_success 'auto squash that matches longer sha1' '
 	echo 1 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "squash! $(git rev-parse --short=11 HEAD^)" &&
+	oid=$(git rev-parse --short=11 HEAD^) &&
+	git commit -m "squash! $oid" -m "extra para" &&
 	git tag final-longshasquash &&
 	test_tick &&
 	git rebase --autosquash -i HEAD^^^ &&
 	git log --oneline >actual &&
 	test_line_count = 3 actual &&
 	git diff --exit-code final-longshasquash &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 1 = $(git cat-file commit HEAD^ | grep squash | wc -l)
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	! grep "squash" commit &&
+	grep "^extra para" commit >actual &&
+	test_line_count = 1 actual
 '
 
 test_auto_commit_flags () {
@@ -176,15 +237,19 @@ test_auto_commit_flags () {
 	echo 1 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit --$1 first-commit &&
+	git commit --$1 first-commit -m "extra para for first" &&
 	git tag final-commit-$1 &&
 	test_tick &&
 	git rebase --autosquash -i HEAD^^^ &&
 	git log --oneline >actual &&
 	test_line_count = 3 actual &&
 	git diff --exit-code final-commit-$1 &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test $2 = $(git cat-file commit HEAD^ | grep first | wc -l)
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	grep first commit >actual &&
+	test_line_count = $2 actual
 }
 
 test_expect_success 'use commit --fixup' '
@@ -200,21 +265,25 @@ test_auto_fixup_fixup () {
 	echo 1 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "$1! first" &&
+	git commit -m "$1! first" -m "extra para for first" &&
 	echo 2 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "$1! $2! first" &&
+	git commit -m "$1! $2! first" -m "second extra para for first" &&
 	git tag "final-$1-$2" &&
 	test_tick &&
 	(
 		set_cat_todo_editor &&
 		test_must_fail git rebase --autosquash -i HEAD^^^^ >actual &&
+		head=$(git rev-parse --short HEAD) &&
+		parent1=$(git rev-parse --short HEAD^) &&
+		parent2=$(git rev-parse --short HEAD^^) &&
+		parent3=$(git rev-parse --short HEAD^^^) &&
 		cat >expected <<-EOF &&
-		pick $(git rev-parse --short HEAD^^^) first commit
-		$1 $(git rev-parse --short HEAD^) $1! first
-		$1 $(git rev-parse --short HEAD) $1! $2! first
-		pick $(git rev-parse --short HEAD^^) second commit
+		pick $parent3 first commit
+		$1 $parent1 $1! first
+		$1 $head $1! $2! first
+		pick $parent2 second commit
 		EOF
 		test_cmp expected actual
 	) &&
@@ -222,53 +291,64 @@ test_auto_fixup_fixup () {
 	git log --oneline >actual &&
 	test_line_count = 3 actual
 	git diff --exit-code "final-$1-$2" &&
-	test 2 = "$(git cat-file blob HEAD^:file1)" &&
+	echo 2 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	grep first commit >actual &&
 	if test "$1" = "fixup"
 	then
-		test 1 = $(git cat-file commit HEAD^ | grep first | wc -l)
+		test_line_count = 1 actual
 	elif test "$1" = "squash"
 	then
-		test 3 = $(git cat-file commit HEAD^ | grep first | wc -l)
+		test_line_count = 3 actual
 	else
 		false
 	fi
 }
 
-test_expect_success C_LOCALE_OUTPUT 'fixup! fixup!' '
+test_expect_success 'fixup! fixup!' '
 	test_auto_fixup_fixup fixup fixup
 '
 
-test_expect_success C_LOCALE_OUTPUT 'fixup! squash!' '
+test_expect_success 'fixup! squash!' '
 	test_auto_fixup_fixup fixup squash
 '
 
-test_expect_success C_LOCALE_OUTPUT 'squash! squash!' '
+test_expect_success 'squash! squash!' '
 	test_auto_fixup_fixup squash squash
 '
 
-test_expect_success C_LOCALE_OUTPUT 'squash! fixup!' '
+test_expect_success 'squash! fixup!' '
 	test_auto_fixup_fixup squash fixup
 '
 
-test_expect_success C_LOCALE_OUTPUT 'autosquash with custom inst format' '
+test_expect_success 'autosquash with custom inst format' '
 	git reset --hard base &&
 	git config --add rebase.instructionFormat "[%an @ %ar] %s"  &&
 	echo 2 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "squash! $(git rev-parse --short HEAD^)" &&
+	oid=$(git rev-parse --short HEAD^) &&
+	git commit -m "squash! $oid" -m "extra para for first" &&
 	echo 1 >file1 &&
 	git add -u &&
 	test_tick &&
-	git commit -m "squash! $(git log -n 1 --format=%s HEAD~2)" &&
+	subject=$(git log -n 1 --format=%s HEAD~2) &&
+	git commit -m "squash! $subject" -m "second extra para for first" &&
 	git tag final-squash-instFmt &&
 	test_tick &&
 	git rebase --autosquash -i HEAD~4 &&
 	git log --oneline >actual &&
 	test_line_count = 3 actual &&
 	git diff --exit-code final-squash-instFmt &&
-	test 1 = "$(git cat-file blob HEAD^:file1)" &&
-	test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l)
+	echo 1 >expect &&
+	git cat-file blob HEAD^:file1 >actual &&
+	test_cmp expect actual &&
+	git cat-file commit HEAD^ >commit &&
+	! grep "squash" commit &&
+	grep first commit >actual &&
+	test_line_count = 3 actual
 '
 
 test_expect_success 'autosquash with empty custom instructionFormat' '
@@ -332,7 +412,7 @@ test_expect_success 'wrapped original subject' '
 
 test_expect_success 'abort last squash' '
 	test_when_finished "test_might_fail git rebase --abort" &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 
 	git checkout -b some-squashes &&
 	git commit --allow-empty -m first &&
@@ -349,4 +429,28 @@ test_expect_success 'abort last squash' '
 	! grep first actual
 '
 
+test_expect_success 'fixup a fixup' '
+	echo 0to-fixup >file0 &&
+	test_tick &&
+	git commit -m "to-fixup" file0 &&
+	test_tick &&
+	git commit --squash HEAD -m X --allow-empty &&
+	test_tick &&
+	git commit --squash HEAD^ -m Y --allow-empty &&
+	test_tick &&
+	git commit -m "squash! $(git rev-parse HEAD^)" -m Z --allow-empty &&
+	test_tick &&
+	git commit -m "squash! $(git rev-parse HEAD^^)" -m W --allow-empty &&
+	git rebase -ki --autosquash HEAD~5 &&
+	test XZWY = $(git show | tr -cd W-Z)
+'
+
+test_expect_success 'fixup does not clean up commit message' '
+	oneline="#818" &&
+	git commit --allow-empty -m "$oneline" &&
+	git commit --fixup HEAD --allow-empty &&
+	git -c commit.cleanup=strip rebase -ki --autosquash HEAD~2 &&
+	test "$oneline" = "$(git show -s --format=%s)"
+'
+
 test_done
diff --git a/t/t3416-rebase-onto-threedots.sh b/t/t3416-rebase-onto-threedots.sh
index 9c2548423b..3716a42e81 100755
--- a/t/t3416-rebase-onto-threedots.sh
+++ b/t/t3416-rebase-onto-threedots.sh
@@ -2,17 +2,20 @@
 
 test_description='git rebase --onto A...B'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-rebase.sh"
 
-# Rebase only the tip commit of "topic" on merge base between "master"
-# and "topic".  Cannot do this for "side" with "master" because there
+# Rebase only the tip commit of "topic" on merge base between "main"
+# and "topic".  Cannot do this for "side" with "main" because there
 # is no single merge base.
 #
 #
 #	    F---G topic                             G'
 #	   /                                       /
-# A---B---C---D---E master      -->       A---B---C---D---E
+# A---B---C---D---E main        -->       A---B---C---D---E
 #      \   \ /
 #	\   x
 #	 \ / \
@@ -26,7 +29,7 @@ test_expect_success setup '
 	git branch topic &&
 	git checkout side &&
 	test_commit H &&
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git merge H &&
 	git tag D &&
@@ -42,83 +45,83 @@ test_expect_success setup '
 	test_commit K
 '
 
-test_expect_success 'rebase --onto master...topic' '
+test_expect_success 'rebase --onto main...topic' '
 	git reset --hard &&
 	git checkout topic &&
 	git reset --hard G &&
 
-	git rebase --onto master...topic F &&
+	git rebase --onto main...topic F &&
 	git rev-parse HEAD^1 >actual &&
 	git rev-parse C^0 >expect &&
 	test_cmp expect actual
 '
 
-test_expect_success 'rebase --onto master...' '
+test_expect_success 'rebase --onto main...' '
 	git reset --hard &&
 	git checkout topic &&
 	git reset --hard G &&
 
-	git rebase --onto master... F &&
+	git rebase --onto main... F &&
 	git rev-parse HEAD^1 >actual &&
 	git rev-parse C^0 >expect &&
 	test_cmp expect actual
 '
 
-test_expect_success 'rebase --onto master...side' '
+test_expect_success 'rebase --onto main...side' '
 	git reset --hard &&
 	git checkout side &&
 	git reset --hard K &&
 
-	test_must_fail git rebase --onto master...side J
+	test_must_fail git rebase --onto main...side J
 '
 
-test_expect_success 'rebase -i --onto master...topic' '
+test_expect_success 'rebase -i --onto main...topic' '
 	git reset --hard &&
 	git checkout topic &&
 	git reset --hard G &&
 	set_fake_editor &&
-	EXPECT_COUNT=1 git rebase -i --onto master...topic F &&
+	EXPECT_COUNT=1 git rebase -i --onto main...topic F &&
 	git rev-parse HEAD^1 >actual &&
 	git rev-parse C^0 >expect &&
 	test_cmp expect actual
 '
 
-test_expect_success 'rebase -i --onto master...' '
+test_expect_success 'rebase -i --onto main...' '
 	git reset --hard &&
 	git checkout topic &&
 	git reset --hard G &&
 	set_fake_editor &&
-	EXPECT_COUNT=1 git rebase -i --onto master... F &&
+	EXPECT_COUNT=1 git rebase -i --onto main... F &&
 	git rev-parse HEAD^1 >actual &&
 	git rev-parse C^0 >expect &&
 	test_cmp expect actual
 '
 
-test_expect_success 'rebase -i --onto master...side' '
+test_expect_success 'rebase -i --onto main...side' '
 	git reset --hard &&
 	git checkout side &&
 	git reset --hard K &&
 
 	set_fake_editor &&
-	test_must_fail git rebase -i --onto master...side J
+	test_must_fail git rebase -i --onto main...side J
 '
 
 test_expect_success 'rebase --keep-base --onto incompatible' '
-	test_must_fail git rebase --keep-base --onto master...
+	test_must_fail git rebase --keep-base --onto main...
 '
 
 test_expect_success 'rebase --keep-base --root incompatible' '
 	test_must_fail git rebase --keep-base --root
 '
 
-test_expect_success 'rebase --keep-base master from topic' '
+test_expect_success 'rebase --keep-base main from topic' '
 	git reset --hard &&
 	git checkout topic &&
 	git reset --hard G &&
 
-	git rebase --keep-base master &&
+	git rebase --keep-base main &&
 	git rev-parse C >base.expect &&
-	git merge-base master HEAD >base.actual &&
+	git merge-base main HEAD >base.actual &&
 	test_cmp base.expect base.actual &&
 
 	git rev-parse HEAD~2 >actual &&
@@ -126,23 +129,23 @@ test_expect_success 'rebase --keep-base master from topic' '
 	test_cmp expect actual
 '
 
-test_expect_success 'rebase --keep-base master from side' '
+test_expect_success 'rebase --keep-base main from side' '
 	git reset --hard &&
 	git checkout side &&
 	git reset --hard K &&
 
-	test_must_fail git rebase --keep-base master
+	test_must_fail git rebase --keep-base main
 '
 
-test_expect_success 'rebase -i --keep-base master from topic' '
+test_expect_success 'rebase -i --keep-base main from topic' '
 	git reset --hard &&
 	git checkout topic &&
 	git reset --hard G &&
 
 	set_fake_editor &&
-	EXPECT_COUNT=2 git rebase -i --keep-base master &&
+	EXPECT_COUNT=2 git rebase -i --keep-base main &&
 	git rev-parse C >base.expect &&
-	git merge-base master HEAD >base.actual &&
+	git merge-base main HEAD >base.actual &&
 	test_cmp base.expect base.actual &&
 
 	git rev-parse HEAD~2 >actual &&
@@ -150,13 +153,13 @@ test_expect_success 'rebase -i --keep-base master from topic' '
 	test_cmp expect actual
 '
 
-test_expect_success 'rebase -i --keep-base master from side' '
+test_expect_success 'rebase -i --keep-base main from side' '
 	git reset --hard &&
 	git checkout side &&
 	git reset --hard K &&
 
 	set_fake_editor &&
-	test_must_fail git rebase -i --keep-base master
+	test_must_fail git rebase -i --keep-base main
 '
 
 test_done
diff --git a/t/t3417-rebase-whitespace-fix.sh b/t/t3417-rebase-whitespace-fix.sh
index e85cdc7037..946e92f8da 100755
--- a/t/t3417-rebase-whitespace-fix.sh
+++ b/t/t3417-rebase-whitespace-fix.sh
@@ -52,7 +52,7 @@ test_expect_success 'blank line at end of file; extend at end of file' '
 	git commit --allow-empty -m "Initial empty commit" &&
 	git add file && git commit -m first &&
 	mv second file &&
-	git add file &&	git commit -m second &&
+	git add file && git commit -m second &&
 	git rebase --whitespace=fix HEAD^^ &&
 	git diff --exit-code HEAD^:file expect-first &&
 	test_cmp expect-second file
@@ -118,7 +118,7 @@ test_expect_success 'at beginning of file' '
 	for i in 1 2 3 4 5; do
 		echo $i
 	done >> file &&
-	git commit -m more 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 7a2da972fd..738fbae9b2 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -2,6 +2,9 @@
 
 test_description='git rebase --continue tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
@@ -15,25 +18,35 @@ test_expect_success 'setup' '
 	git checkout -b topic HEAD^ &&
 	test_commit "commit-new-file-F2-on-topic-branch" F2 22 &&
 
-	git checkout master
+	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 master &&
+	git checkout main &&
 
 	FAKE_LINES="edit 1" git rebase -i HEAD^ &&
 	test-tool chmtime =-60 F1 &&
 	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 master &&
+	git checkout main &&
 
-	test_must_fail git rebase --onto master master topic &&
+	test_must_fail git rebase --apply --onto main main topic &&
 	echo "Resolved" >F2 &&
 	git add F2 &&
 	test-tool chmtime =-60 F1 &&
@@ -61,7 +74,7 @@ test_expect_success 'rebase --continue remembers merge strategy and options' '
 	chmod +x test-bin/git-merge-funny &&
 	(
 		PATH=./test-bin:$PATH &&
-		test_must_fail git rebase -s funny -Xopt master topic
+		test_must_fail git rebase -s funny -Xopt main topic
 	) &&
 	test -f funny.was.run &&
 	rm funny.was.run &&
@@ -93,7 +106,7 @@ test_expect_success 'rebase -i --continue handles merge strategy and options' '
 	chmod +x test-bin/git-merge-funny &&
 	(
 		PATH=./test-bin:$PATH &&
-		test_must_fail git rebase -i -s funny -Xopt -Xfoo master topic
+		test_must_fail git rebase -i -s funny -Xopt -Xfoo main topic
 	) &&
 	test -f funny.was.run &&
 	rm funny.was.run &&
@@ -188,11 +201,11 @@ test_expect_success '--skip after failed fixup cleans commit message' '
 test_expect_success 'setup rerere database' '
 	rm -fr .git/rebase-* &&
 	git reset --hard commit-new-file-F3-on-topic-branch &&
-	git checkout master &&
+	git checkout main &&
 	test_commit "commit-new-file-F3" F3 3 &&
 	test_config rerere.enabled true &&
 	git update-ref refs/heads/topic commit-new-file-F3-on-topic-branch &&
-	test_must_fail git rebase -m master topic &&
+	test_must_fail git rebase -m main topic &&
 	echo "Resolved" >F2 &&
 	cp F2 expected-F2 &&
 	git add F2 &&
@@ -207,7 +220,7 @@ test_expect_success 'setup rerere database' '
 prepare () {
 	rm -fr .git/rebase-* &&
 	git reset --hard commit-new-file-F3-on-topic-branch &&
-	git checkout master &&
+	git checkout main &&
 	test_config rerere.enabled true
 }
 
@@ -215,7 +228,7 @@ test_rerere_autoupdate () {
 	action=$1 &&
 	test_expect_success "rebase $action --continue remembers --rerere-autoupdate" '
 		prepare &&
-		test_must_fail git rebase $action --rerere-autoupdate master topic &&
+		test_must_fail git rebase $action --rerere-autoupdate main topic &&
 		test_cmp expected-F2 F2 &&
 		git diff-files --quiet &&
 		test_must_fail git rebase --continue &&
@@ -227,7 +240,7 @@ test_rerere_autoupdate () {
 	test_expect_success "rebase $action --continue honors rerere.autoUpdate" '
 		prepare &&
 		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action master topic &&
+		test_must_fail git rebase $action main topic &&
 		test_cmp expected-F2 F2 &&
 		git diff-files --quiet &&
 		test_must_fail git rebase --continue &&
@@ -239,7 +252,7 @@ test_rerere_autoupdate () {
 	test_expect_success "rebase $action --continue remembers --no-rerere-autoupdate" '
 		prepare &&
 		test_config rerere.autoupdate true &&
-		test_must_fail git rebase $action --no-rerere-autoupdate master topic &&
+		test_must_fail git rebase $action --no-rerere-autoupdate main topic &&
 		test_cmp expected-F2 F2 &&
 		test_must_fail git diff-files --quiet &&
 		git add F2 &&
@@ -251,7 +264,7 @@ 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
@@ -279,12 +292,35 @@ test_expect_success '--reschedule-failed-exec' '
 	test_i18ngrep "has been rescheduled" err
 '
 
-test_expect_success 'rebase.reschedulefailedexec only affects `rebase -i`' '
-	test_config rebase.reschedulefailedexec true &&
+test_expect_success 'rebase.rescheduleFailedExec only affects `rebase -i`' '
+	test_config rebase.rescheduleFailedExec true &&
 	test_must_fail git rebase -x false HEAD^ &&
 	grep "^exec false" .git/rebase-merge/git-rebase-todo &&
 	git rebase --abort &&
 	git rebase HEAD^
 '
 
+test_expect_success 'rebase.rescheduleFailedExec=true & --no-reschedule-failed-exec' '
+	test_when_finished "git rebase --abort" &&
+	test_config rebase.rescheduleFailedExec true &&
+	test_must_fail git rebase -x false --no-reschedule-failed-exec HEAD~2 &&
+	test_must_fail git rebase --continue 2>err &&
+	! grep "has been rescheduled" err
+'
+
+test_expect_success 'new rebase.rescheduleFailedExec=true setting in an ongoing rebase is ignored' '
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -x false HEAD~2 &&
+	test_config rebase.rescheduleFailedExec true &&
+	test_must_fail git rebase --continue 2>err &&
+	! grep "has been rescheduled" err
+'
+
+test_expect_success 'there is no --no-reschedule-failed-exec in an ongoing rebase' '
+	test_when_finished "git rebase --abort" &&
+	test_must_fail git rebase -x false HEAD~2 &&
+	test_expect_code 129 git rebase --continue --no-reschedule-failed-exec &&
+	test_expect_code 129 git rebase --edit-todo --no-reschedule-failed-exec
+'
+
 test_done
diff --git a/t/t3419-rebase-patch-id.sh b/t/t3419-rebase-patch-id.sh
index 49f548cdb9..295040f2fe 100755
--- a/t/t3419-rebase-patch-id.sh
+++ b/t/t3419-rebase-patch-id.sh
@@ -2,16 +2,10 @@
 
 test_description='git rebase - test patch id computation'
 
-. ./test-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
-count () {
-	i=0
-	while test $i -lt $1
-	do
-		echo "$i"
-		i=$(($i+1))
-	done
-}
+. ./test-lib.sh
 
 scramble () {
 	i=0
@@ -26,75 +20,55 @@ scramble () {
 	mv -f "$1.new" "$1"
 }
 
-run () {
-	echo \$ "$@"
-	/usr/bin/time "$@" >/dev/null
-}
-
 test_expect_success 'setup' '
 	git commit --allow-empty -m initial &&
 	git tag root
 '
 
-do_tests () {
-	nlines=$1 pr=${2-}
-
-	test_expect_success $pr "setup: $nlines lines" "
-		rm -f .gitattributes &&
-		git checkout -q -f master &&
-		git reset --hard root &&
-		count $nlines >file &&
-		git add file &&
-		git commit -q -m initial &&
-		git branch -f other &&
-
-		scramble file &&
-		git add file &&
-		git commit -q -m 'change big file' &&
-
-		git checkout -q other &&
-		: >newfile &&
-		git add newfile &&
-		git commit -q -m 'add small file' &&
-
-		git cherry-pick master >/dev/null 2>&1
-	"
-
-	test_debug "
-		run git diff master^\!
-	"
-
-	test_expect_success $pr 'setup attributes' "
-		echo 'file binary' >.gitattributes
-	"
-
-	test_debug "
-		run git format-patch --stdout master &&
-		run git format-patch --stdout --ignore-if-in-upstream master
-	"
+test_expect_success 'setup: 500 lines' '
+	rm -f .gitattributes &&
+	git checkout -q -f main &&
+	git reset --hard root &&
+	test_seq 500 >file &&
+	git add file &&
+	git commit -q -m initial &&
+	git branch -f other &&
+
+	scramble file &&
+	git add file &&
+	git commit -q -m "change big file" &&
+
+	git checkout -q other &&
+	: >newfile &&
+	git add newfile &&
+	git commit -q -m "add small file" &&
+
+	git cherry-pick main >/dev/null 2>&1
+'
 
-	test_expect_success $pr 'detect upstream patch' '
-		git checkout -q master &&
-		scramble file &&
-		git add file &&
-		git commit -q -m "change big file again" &&
-		git checkout -q other^{} &&
-		git rebase master &&
-		test_must_fail test -n "$(git rev-list master...HEAD~)"
-	'
+test_expect_success 'setup attributes' '
+	echo "file binary" >.gitattributes
+'
 
-	test_expect_success $pr 'do not drop patch' '
-		git branch -f squashed master &&
-		git checkout -q -f squashed &&
-		git reset -q --soft HEAD~2 &&
-		git commit -q -m squashed &&
-		git checkout -q other^{} &&
-		test_must_fail git rebase squashed &&
-		rm -rf .git/rebase-apply
-	'
-}
+test_expect_success 'detect upstream patch' '
+	git checkout -q main &&
+	scramble file &&
+	git add file &&
+	git commit -q -m "change big file again" &&
+	git checkout -q other^{} &&
+	git rebase main &&
+	git rev-list main...HEAD~ >revs &&
+	test_must_be_empty revs
+'
 
-do_tests 500
-do_tests 50000 EXPENSIVE
+test_expect_success 'do not drop patch' '
+	git branch -f squashed main &&
+	git checkout -q -f squashed &&
+	git reset -q --soft HEAD~2 &&
+	git commit -q -m squashed &&
+	git checkout -q other^{} &&
+	test_must_fail git rebase squashed &&
+	git rebase --quit
+'
 
 test_done
diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh
index 5f7e73cf83..43fcb68f27 100755
--- a/t/t3420-rebase-autostash.sh
+++ b/t/t3420-rebase-autostash.sh
@@ -4,6 +4,9 @@
 #
 
 test_description='git rebase --autostash tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -21,12 +24,12 @@ test_expect_success setup '
 	git add . &&
 	test_tick &&
 	git commit -m "third commit" &&
-	git checkout -b unrelated-onto-branch master &&
+	git checkout -b unrelated-onto-branch main &&
 	echo unrelated >file4 &&
 	git add . &&
 	test_tick &&
 	git commit -m "unrelated commit" &&
-	git checkout -b related-onto-branch master &&
+	git checkout -b related-onto-branch main &&
 	echo conflicting-change >file2 &&
 	git add . &&
 	test_tick &&
@@ -34,7 +37,7 @@ test_expect_success setup '
 	remove_progress_re="$(printf "s/.*\\r//")"
 '
 
-create_expected_success_am () {
+create_expected_success_apply () {
 	cat >expected <<-EOF
 	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
 	First, rewinding head to replay your work on top of it...
@@ -44,7 +47,7 @@ create_expected_success_am () {
 	EOF
 }
 
-create_expected_success_interactive () {
+create_expected_success_merge () {
 	q_to_cr >expected <<-EOF
 	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
 	Applied autostash.
@@ -52,7 +55,7 @@ create_expected_success_interactive () {
 	EOF
 }
 
-create_expected_failure_am () {
+create_expected_failure_apply () {
 	cat >expected <<-EOF
 	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
 	First, rewinding head to replay your work on top of it...
@@ -64,7 +67,7 @@ create_expected_failure_am () {
 	EOF
 }
 
-create_expected_failure_interactive () {
+create_expected_failure_merge () {
 	cat >expected <<-EOF
 	$(grep "^Created autostash: [0-9a-f][0-9a-f]*\$" actual)
 	Applying autostash resulted in conflicts.
@@ -101,13 +104,13 @@ testrebase () {
 
 	test_expect_success "rebase$type --autostash: check output" '
 		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-am} &&
-		if test ${suffix} = "merge"; then
-			suffix=interactive
+		suffix=${type#\ --} && suffix=${suffix:-apply} &&
+		if test ${suffix} = "interactive"; then
+			suffix=merge
 		fi &&
 		create_expected_success_$suffix &&
 		sed "$remove_progress_re" <actual >actual2 &&
-		test_i18ncmp expected actual2
+		test_cmp expected actual2
 	'
 
 	test_expect_success "rebase$type: dirty index, non-conflicting rebase" '
@@ -184,6 +187,26 @@ testrebase () {
 		git checkout feature-branch
 	'
 
+	test_expect_success "rebase$type: --quit" '
+		test_config rebase.autostash true &&
+		git reset --hard &&
+		git checkout -b rebased-feature-branch feature-branch &&
+		test_when_finished git branch -D rebased-feature-branch &&
+		echo dirty >>file3 &&
+		git diff >expect &&
+		test_must_fail git rebase$type related-onto-branch &&
+		test_path_is_file $dotest/autostash &&
+		test_path_is_missing file3 &&
+		git rebase --quit &&
+		test_when_finished git stash drop &&
+		test_path_is_missing $dotest/autostash &&
+		! grep dirty file3 &&
+		git stash show -p >actual &&
+		test_cmp expect actual &&
+		git reset --hard &&
+		git checkout feature-branch
+	'
+
 	test_expect_success "rebase$type: non-conflicting rebase, conflicting stash" '
 		test_config rebase.autostash true &&
 		git reset --hard &&
@@ -202,13 +225,13 @@ testrebase () {
 
 	test_expect_success "rebase$type: check output with conflicting stash" '
 		test_when_finished git branch -D rebased-feature-branch &&
-		suffix=${type#\ --} && suffix=${suffix:-am} &&
-		if test ${suffix} = "merge"; then
-			suffix=interactive
+		suffix=${type#\ --} && suffix=${suffix:-apply} &&
+		if test ${suffix} = "interactive"; then
+			suffix=merge
 		fi &&
 		create_expected_failure_$suffix &&
 		sed "$remove_progress_re" <actual >actual2 &&
-		test_i18ncmp expected actual2
+		test_cmp expected actual2
 	'
 }
 
@@ -234,7 +257,7 @@ test_expect_success "rebase: noop rebase" '
 	git checkout feature-branch
 '
 
-testrebase "" .git/rebase-apply
+testrebase " --apply" .git/rebase-apply
 testrebase " --merge" .git/rebase-merge
 testrebase " --interactive" .git/rebase-merge
 
@@ -285,7 +308,7 @@ test_expect_success 'autostash is saved on editor failure with conflict' '
 '
 
 test_expect_success 'autostash with dirty submodules' '
-	test_when_finished "git reset --hard && git checkout master" &&
+	test_when_finished "git reset --hard && git checkout main" &&
 	git checkout -b with-submodule &&
 	git submodule add ./ sub &&
 	test_tick &&
@@ -304,7 +327,7 @@ test_expect_success 'branch is left alone when possible' '
 
 test_expect_success 'never change active branch' '
 	git checkout -b not-the-feature-branch unrelated-onto-branch &&
-	test_when_finished "git reset --hard && git checkout master" &&
+	test_when_finished "git reset --hard && git checkout main" &&
 	echo changed >file0 &&
 	git rebase --autostash not-the-feature-branch feature-branch &&
 	test_cmp_rev not-the-feature-branch unrelated-onto-branch
diff --git a/t/t3421-rebase-topology-linear.sh b/t/t3421-rebase-topology-linear.sh
index b847064f91..4a9204b4b6 100755
--- a/t/t3421-rebase-topology-linear.sh
+++ b/t/t3421-rebase-topology-linear.sh
@@ -26,7 +26,7 @@ test_run_rebase () {
 		test_linear_range 'd e' c..
 	"
 }
-test_run_rebase success ''
+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
@@ -50,7 +50,7 @@ test_run_rebase () {
 		test_cmp_rev e HEAD
 	"
 }
-test_run_rebase success ''
+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
@@ -61,12 +61,12 @@ test_run_rebase () {
 	test_expect_$result "rebase $* -f rewrites even if upstream is an ancestor" "
 		reset_rebase &&
 		git rebase $* -f b e &&
-		! test_cmp_rev e HEAD &&
+		test_cmp_rev ! e HEAD &&
 		test_cmp_rev b HEAD~2 &&
 		test_linear_range 'd e' b..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success --fork-point
 test_run_rebase success -m
 test_run_rebase success -i
@@ -78,12 +78,12 @@ test_run_rebase () {
 	test_expect_$result "rebase $* -f rewrites even if remote upstream is an ancestor" "
 		reset_rebase &&
 		git rebase $* -f branch-b branch-e &&
-		! test_cmp_rev branch-e origin/branch-e &&
+		test_cmp_rev ! branch-e origin/branch-e &&
 		test_cmp_rev branch-b HEAD~2 &&
 		test_linear_range 'd e' branch-b..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success --fork-point
 test_run_rebase success -m
 test_run_rebase success -i
@@ -98,7 +98,7 @@ test_run_rebase () {
 		test_cmp_rev e HEAD
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success --fork-point
 test_run_rebase success -m
 test_run_rebase success -i
@@ -139,7 +139,7 @@ test_run_rebase () {
 		test_linear_range 'd i' h..
 	"
 }
-test_run_rebase success ''
+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
@@ -154,7 +154,7 @@ test_run_rebase () {
 		test_linear_range 'd' h..
 	"
 }
-test_run_rebase success ''
+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
@@ -169,7 +169,7 @@ test_run_rebase () {
 		test_linear_range 'd i' f..
 	"
 }
-test_run_rebase success ''
+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
@@ -184,7 +184,7 @@ test_run_rebase () {
 		test_linear_range 'd gp i' h..
 	"
 }
-test_run_rebase success ''
+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
@@ -205,32 +205,31 @@ test_expect_success 'setup of linear history for empty commit tests' '
 test_run_rebase () {
 	result=$1
 	shift
-	test_expect_$result "rebase $* drops empty commit" "
+	test_expect_$result "rebase $* keeps begin-empty commits" "
 		reset_rebase &&
-		git rebase $* c l &&
-		test_cmp_rev c HEAD~2 &&
-		test_linear_range 'd l' c..
+		git rebase $* j l &&
+		test_cmp_rev c HEAD~4 &&
+		test_linear_range 'j d k l' c..
 	"
 }
-test_run_rebase success ''
+test_run_rebase failure --apply
 test_run_rebase success -m
 test_run_rebase success -i
-test_have_prereq !REBASE_P || test_run_rebase success -p
+test_have_prereq !REBASE_P || test_run_rebase failure -p
 
 test_run_rebase () {
 	result=$1
 	shift
-	test_expect_$result "rebase $* --keep-empty" "
+	test_expect_$result "rebase $* --no-keep-empty drops begin-empty commits" "
 		reset_rebase &&
-		git rebase $* --keep-empty c l &&
-		test_cmp_rev c HEAD~3 &&
-		test_linear_range 'd k l' c..
+		git rebase $* --no-keep-empty c l &&
+		test_cmp_rev c HEAD~2 &&
+		test_linear_range 'd l' c..
 	"
 }
-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_have_prereq !REBASE_P || test_run_rebase success -p
 
 test_run_rebase () {
 	result=$1
@@ -242,10 +241,9 @@ test_run_rebase () {
 		test_linear_range 'd k l' j..
 	"
 }
-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_have_prereq !REBASE_P || test_run_rebase success -p
 test_run_rebase success --rebase-merges
 
 #       m
@@ -282,7 +280,7 @@ test_run_rebase () {
 		test_linear_range 'x y' c..
 	"
 }
-test_run_rebase success ''
+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
@@ -297,7 +295,7 @@ test_run_rebase () {
 		test_linear_range 'x y' c..
 	"
 }
-test_run_rebase success ''
+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
@@ -312,7 +310,7 @@ test_run_rebase () {
 		test_linear_range 'x y' m..
 	"
 }
-test_run_rebase success ''
+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
@@ -328,7 +326,7 @@ test_run_rebase () {
 	"
 }
 
-test_run_rebase success ''
+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
@@ -343,7 +341,7 @@ test_run_rebase () {
 		test_linear_range 'x y' m..
 	"
 }
-test_run_rebase success ''
+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
@@ -368,7 +366,7 @@ test_run_rebase () {
 	test_expect_$result "rebase $* -f --root on linear history causes re-write" "
 		reset_rebase &&
 		git rebase $* -f --root c &&
-		! test_cmp_rev a HEAD~2 &&
+		test_cmp_rev ! a HEAD~2 &&
 		test_linear_range 'a b c' HEAD
 	"
 }
diff --git a/t/t3422-rebase-incompatible-options.sh b/t/t3422-rebase-incompatible-options.sh
index 50e7960702..c8234062c6 100755
--- a/t/t3422-rebase-incompatible-options.sh
+++ b/t/t3422-rebase-incompatible-options.sh
@@ -61,8 +61,6 @@ test_rebase_am_only () {
 }
 
 test_rebase_am_only --whitespace=fix
-test_rebase_am_only --ignore-whitespace
-test_rebase_am_only --committer-date-is-author-date
 test_rebase_am_only -C4
 
 test_expect_success REBASE_P '--preserve-merges incompatible with --signoff' '
diff --git a/t/t3423-rebase-reword.sh b/t/t3423-rebase-reword.sh
index 6963750794..4859bb8f72 100755
--- a/t/t3423-rebase-reword.sh
+++ b/t/t3423-rebase-reword.sh
@@ -7,7 +7,7 @@ test_description='git rebase interactive with rewording'
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
 test_expect_success 'setup' '
-	test_commit master file-1 test &&
+	test_commit main file-1 test &&
 
 	git checkout -b stuff &&
 
@@ -22,7 +22,7 @@ test_expect_success 'reword without issues functions as intended' '
 
 	set_fake_editor &&
 	FAKE_LINES="pick 1 reword 2" FAKE_COMMIT_MESSAGE="feature_b_reworded" \
-		git rebase -i -v master &&
+		git rebase -i -v main &&
 
 	test "$(git log -1 --format=%B)" = "feature_b_reworded" &&
 	test $(git rev-list --count HEAD) = 3
@@ -35,7 +35,7 @@ test_expect_success 'reword after a conflict preserves commit' '
 
 	set_fake_editor &&
 	test_must_fail env FAKE_LINES="reword 2" \
-		git rebase -i -v master &&
+		git rebase -i -v main &&
 
 	git checkout --theirs file-2 &&
 	git add file-2 &&
diff --git a/t/t3424-rebase-empty.sh b/t/t3424-rebase-empty.sh
new file mode 100755
index 0000000000..5e1045a0af
--- /dev/null
+++ b/t/t3424-rebase-empty.sh
@@ -0,0 +1,170 @@
+#!/bin/sh
+
+test_description='git rebase of commits that start or become empty'
+
+. ./test-lib.sh
+
+test_expect_success 'setup test repository' '
+	test_write_lines 1 2 3 4 5 6 7 8 9 10 >numbers &&
+	test_write_lines A B C D E F G H I J >letters &&
+	git add numbers letters &&
+	git commit -m A &&
+
+	git branch upstream &&
+	git branch localmods &&
+
+	git checkout upstream &&
+	test_write_lines A B C D E >letters &&
+	git add letters &&
+	git commit -m B &&
+
+	test_write_lines 1 2 3 4 five 6 7 8 9 ten >numbers &&
+	git add numbers &&
+	git commit -m C &&
+
+	git checkout localmods &&
+	test_write_lines 1 2 3 4 five 6 7 8 9 10 >numbers &&
+	git add numbers &&
+	git commit -m C2 &&
+
+	git commit --allow-empty -m D &&
+
+	test_write_lines A B C D E >letters &&
+	git add letters &&
+	git commit -m "Five letters ought to be enough for anybody"
+'
+
+test_expect_failure 'rebase (apply-backend)' '
+	test_when_finished "git rebase --abort" &&
+	git checkout -B testing localmods &&
+	# rebase (--apply) should not drop commits that start empty
+	git rebase --apply upstream &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge --empty=drop' '
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=drop upstream &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge uses default of --empty=drop' '
+	git checkout -B testing localmods &&
+	git rebase --merge upstream &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge --empty=keep' '
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=keep upstream &&
+
+	test_write_lines D C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge --empty=ask' '
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --merge --empty=ask upstream &&
+
+	git rebase --skip &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --interactive --empty=drop' '
+	git checkout -B testing localmods &&
+	git rebase --interactive --empty=drop upstream &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --interactive --empty=keep' '
+	git checkout -B testing localmods &&
+	git rebase --interactive --empty=keep upstream &&
+
+	test_write_lines D C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --interactive --empty=ask' '
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --interactive --empty=ask upstream &&
+
+	git rebase --skip &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --interactive uses default of --empty=ask' '
+	git checkout -B testing localmods &&
+	test_must_fail git rebase --interactive upstream &&
+
+	git rebase --skip &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge --empty=drop --keep-empty' '
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=drop --keep-empty upstream &&
+
+	test_write_lines D C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge --empty=drop --no-keep-empty' '
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=drop --no-keep-empty upstream &&
+
+	test_write_lines C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge --empty=keep --keep-empty' '
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=keep --keep-empty upstream &&
+
+	test_write_lines D C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge --empty=keep --no-keep-empty' '
+	git checkout -B testing localmods &&
+	git rebase --merge --empty=keep --no-keep-empty upstream &&
+
+	test_write_lines C2 C B A >expect &&
+	git log --format=%s >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'rebase --merge does not leave state laying around' '
+	git checkout -B testing localmods~2 &&
+	git rebase --merge upstream &&
+
+	test_path_is_missing .git/CHERRY_PICK_HEAD &&
+	test_path_is_missing .git/MERGE_MSG
+'
+
+test_done
diff --git a/t/t3425-rebase-topology-merges.sh b/t/t3425-rebase-topology-merges.sh
index fd8efe84fe..e42faa44e7 100755
--- a/t/t3425-rebase-topology-merges.sh
+++ b/t/t3425-rebase-topology-merges.sh
@@ -54,7 +54,7 @@ test_run_rebase () {
 		test_linear_range 'n o' e..
 	"
 }
-test_run_rebase success ''
+test_run_rebase success --apply
 test_run_rebase success -m
 test_run_rebase success -i
 
@@ -70,7 +70,7 @@ test_run_rebase () {
 		test_linear_range "\'"$expected"\'" d..
 	"
 }
-test_run_rebase success 'n o e' ''
+test_run_rebase success 'n o e' --apply
 test_run_rebase success 'n o e' -m
 test_run_rebase success 'n o e' -i
 
@@ -86,7 +86,7 @@ test_run_rebase () {
 		test_linear_range "\'"$expected"\'" c..
 	"
 }
-test_run_rebase success 'd n o e' ''
+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
 
@@ -102,7 +102,7 @@ test_run_rebase () {
 		test_linear_range "\'"$expected"\'" c..
 	"
 }
-test_run_rebase success 'd n o e' ''
+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
 
diff --git a/t/t3426-rebase-submodule.sh b/t/t3426-rebase-submodule.sh
index a2bba04ba9..0ad3a07bf4 100755
--- a/t/t3426-rebase-submodule.sh
+++ b/t/t3426-rebase-submodule.sh
@@ -17,10 +17,11 @@ git_rebase () {
 	git status -su >actual &&
 	ls -1pR * >>actual &&
 	test_cmp expect actual &&
-	git rebase "$1"
+	may_only_be_test_must_fail "$2" &&
+	$2 git rebase "$1"
 }
 
-test_submodule_switch "git_rebase"
+test_submodule_switch_func "git_rebase"
 
 git_rebase_interactive () {
 	git status -su >expect &&
@@ -35,10 +36,11 @@ git_rebase_interactive () {
 	test_cmp expect actual &&
 	set_fake_editor &&
 	echo "fake-editor.sh" >.git/info/exclude &&
-	git rebase -i "$1"
+	may_only_be_test_must_fail "$2" &&
+	$2 git rebase -i "$1"
 }
 
-test_submodule_switch "git_rebase_interactive"
+test_submodule_switch_func "git_rebase_interactive"
 
 test_expect_success 'rebase interactive ignores modified submodules' '
 	test_when_finished "rm -rf super sub" &&
diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
index bec48e6a1f..e78c7e3796 100755
--- a/t/t3427-rebase-subtree.sh
+++ b/t/t3427-rebase-subtree.sh
@@ -4,6 +4,9 @@ test_description='git rebase tests for -Xsubtree
 
 This test runs git rebase and tests the subtree strategy.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
 
@@ -15,12 +18,12 @@ commit_message() {
 # this test script tries to document them.  First, the following commit history
 # is generated (the onelines are shown, time flows from left to right):
 #
-# master1 - master2 - master3
+# topic_1 - topic_2 - topic_3
 #                             \
-# README ---------------------- Add subproject master - master4 - files_subtree/master5
+# README ---------------------- Add subproject main - topic_4 - files_subtree/topic_5
 #
-# Where the merge moves the files master[123].t into the subdirectory
-# files_subtree/ and master4 as well as files_subtree/master5 add files to that
+# Where the merge moves the files topic_[123].t into the subdirectory
+# files_subtree/ and topic_4 as well as files_subtree/topic_5 add files to that
 # directory directly.
 #
 # Then, in subsequent test cases, `git filter-branch` is used to distill just
@@ -28,11 +31,11 @@ commit_message() {
 # an empty commit is added on top. The pre-rebase commit history looks like
 # this:
 #
-# Add subproject master - master4 - files_subtree/master5 - Empty commit
+# Add subproject main - topic_4 - files_subtree/topic_5 - Empty commit
 #
-# where the root commit adds three files: master1.t, master2.t and master3.t.
+# where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.
 #
-# This commit history is then rebased onto `master3` with the
+# This commit history is then rebased onto `topic_3` with the
 # `-Xsubtree=files_subtree` option in three different ways:
 #
 # 1. using `--preserve-merges`
@@ -43,20 +46,20 @@ test_expect_success 'setup' '
 	test_commit README &&
 
 	git init files &&
-	test_commit -C files master1 &&
-	test_commit -C files master2 &&
-	test_commit -C files master3 &&
+	test_commit -C files topic_1 &&
+	test_commit -C files topic_2 &&
+	test_commit -C files topic_3 &&
 
 	: perform subtree merge into files_subtree/ &&
-	git fetch files refs/heads/master:refs/heads/files-master &&
+	git fetch files refs/heads/main:refs/heads/files-main &&
 	git merge -s ours --no-commit --allow-unrelated-histories \
-		files-master &&
-	git read-tree --prefix=files_subtree -u files-master &&
-	git commit -m "Add subproject master" &&
+		files-main &&
+	git read-tree --prefix=files_subtree -u files-main &&
+	git commit -m "Add subproject main" &&
 
 	: add two extra commits to rebase &&
-	test_commit -C files_subtree master4 &&
-	test_commit files_subtree/master5 &&
+	test_commit -C files_subtree topic_4 &&
+	test_commit files_subtree/topic_5 &&
 
 	git checkout -b to-rebase &&
 	git fast-export --no-data HEAD -- files_subtree/ |
@@ -66,44 +69,44 @@ test_expect_success 'setup' '
 	git commit -m "Empty commit" --allow-empty
 '
 
-# FAILURE: Does not preserve master4.
+# 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-master master &&
-	verbose test "$(commit_message HEAD~)" = "master4" &&
-	verbose test "$(commit_message HEAD)" = "files_subtree/master5"
+	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 master4.
+# 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-master master &&
-	verbose test "$(commit_message HEAD~2)" = "master4" &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
+	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 --keep-empty --onto commit' '
+test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
 	reset_rebase &&
 	git checkout -b rebase-onto to-rebase &&
-	test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --onto files-master master &&
+	test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-main main &&
 	: first pick results in no changes &&
-	git rebase --continue &&
-	verbose test "$(commit_message HEAD~2)" = "master4" &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
+	git rebase --skip &&
+	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 --keep-empty --rebase-merges --onto commit' '
+test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit' '
 	reset_rebase &&
 	git checkout -b rebase-merges-onto to-rebase &&
-	test_must_fail git rebase -Xsubtree=files_subtree --keep-empty --rebase-merges --onto files-master --root &&
+	test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-main --root &&
 	: first pick results in no changes &&
-	git rebase --continue &&
-	verbose test "$(commit_message HEAD~2)" = "master4" &&
-	verbose test "$(commit_message HEAD~)" = "files_subtree/master5" &&
+	git rebase --skip &&
+	verbose test "$(commit_message HEAD~2)" = "topic_4" &&
+	verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
 	verbose test "$(commit_message HEAD)" = "Empty commit"
 '
 
diff --git a/t/t3429-rebase-edit-todo.sh b/t/t3429-rebase-edit-todo.sh
index 8739cb60a7..7024d49ae7 100755
--- a/t/t3429-rebase-edit-todo.sh
+++ b/t/t3429-rebase-edit-todo.sh
@@ -17,7 +17,7 @@ test_expect_success 'rebase exec modifies rebase-todo' '
 	test -e F
 '
 
-test_expect_success SHA1 'loose object cache vs re-reading todo list' '
+test_expect_success 'loose object cache vs re-reading todo list' '
 	GIT_REBASE_TODO=.git/rebase-merge/git-rebase-todo &&
 	export GIT_REBASE_TODO &&
 	write_script append-todo.sh <<-\EOS &&
@@ -52,4 +52,34 @@ test_expect_success 'todo is re-read after reword and squash' '
 	test_cmp expected actual
 '
 
+test_expect_success 're-reading todo doesnt interfere with revert --edit' '
+	git reset --hard third &&
+
+	git revert --edit third second &&
+
+	cat >expect <<-\EOF &&
+	Revert "second"
+	Revert "third"
+	third
+	second
+	first
+	EOF
+	git log --format="%s" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 're-reading todo doesnt interfere with cherry-pick --edit' '
+	git reset --hard first &&
+
+	git cherry-pick --edit second third &&
+
+	cat >expect <<-\EOF &&
+	third
+	second
+	first
+	EOF
+	git log --format="%s" >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t3430-rebase-merges.sh b/t/t3430-rebase-merges.sh
index 9efcf4808a..43c82d9a33 100755
--- a/t/t3430-rebase-merges.sh
+++ b/t/t3430-rebase-merges.sh
@@ -12,20 +12,22 @@ Initial setup:
 
     -- B --                   (first)
    /       \
- A - C - D - E - H            (master)
+ A - C - D - E - H            (main)
    \    \       /
     \    F - G                (second)
      \
       Conflicting-G
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-rebase.sh
+. "$TEST_DIRECTORY"/lib-log-graph.sh
 
 test_cmp_graph () {
 	cat >expect &&
-	git log --graph --boundary --format=%s "$@" >output &&
-	sed "s/ *$//" <output >output.trimmed &&
-	test_cmp expect output.trimmed
+	lib_test_cmp_graph --boundary --format=%s "$@"
 }
 
 test_expect_success 'setup' '
@@ -38,7 +40,7 @@ test_expect_success 'setup' '
 	git checkout -b first &&
 	test_commit B &&
 	b=$(git rev-parse --short HEAD) &&
-	git checkout master &&
+	git checkout main &&
 	test_commit C &&
 	c=$(git rev-parse --short HEAD) &&
 	test_commit D &&
@@ -53,7 +55,7 @@ test_expect_success 'setup' '
 	f=$(git rev-parse --short HEAD) &&
 	test_commit G &&
 	g=$(git rev-parse --short HEAD) &&
-	git checkout master &&
+	git checkout main &&
 	git merge --no-commit G &&
 	test_tick &&
 	git commit -m H &&
@@ -83,7 +85,7 @@ test_expect_success 'create completely different structure' '
 	EOF
 	test_config sequence.editor \""$PWD"/replace-editor.sh\" &&
 	test_tick &&
-	git rebase -i -r A master &&
+	git rebase -i -r A main &&
 	test_cmp_graph <<-\EOF
 	*   Merge the topic branch '\''onebranch'\''
 	|\
@@ -170,21 +172,41 @@ 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 master &&
+	git checkout -b already-upstream main &&
 	base="$(git rev-parse --verify HEAD)" &&
 
 	test_commit A1 &&
@@ -212,7 +234,7 @@ test_expect_success 'with a branch tip that was cherry-picked already' '
 '
 
 test_expect_success 'do not rebase cousins unless asked for' '
-	git checkout -b cousins master &&
+	git checkout -b cousins main &&
 	before="$(git rev-parse --verify HEAD)" &&
 	test_tick &&
 	git rebase -r HEAD^ &&
@@ -341,12 +363,12 @@ test_expect_success 'a "merge" into a root commit is a fast-forward' '
 test_expect_success 'A root commit can be a cousin, treat it that way' '
 	git checkout --orphan khnum &&
 	test_commit yama &&
-	git checkout -b asherah master &&
+	git checkout -b asherah main &&
 	test_commit shamkat &&
 	git merge --allow-unrelated-histories khnum &&
 	test_tick &&
 	git rebase -f -r HEAD^ &&
-	! test_cmp_rev HEAD^2 khnum &&
+	test_cmp_rev ! HEAD^2 khnum &&
 	test_cmp_graph HEAD^.. <<-\EOF &&
 	*   Merge branch '\''khnum'\'' into asherah
 	|\
@@ -368,7 +390,7 @@ test_expect_success 'labels that are object IDs are rewritten' '
 	git checkout -b third B &&
 	test_commit I &&
 	third=$(git rev-parse HEAD) &&
-	git checkout -b labels master &&
+	git checkout -b labels main &&
 	git merge --no-commit third &&
 	test_tick &&
 	git commit -m "Merge commit '\''$third'\'' into labels" &&
@@ -408,7 +430,7 @@ test_expect_success 'octopus merges' '
 	| | * three
 	| * | two
 	| |/
-	* | one
+	* / one
 	|/
 	o before-octopus
 	EOF
@@ -421,7 +443,7 @@ test_expect_success 'with --autosquash and --exec' '
 	git commit --fixup B B.t &&
 	write_script show.sh <<-\EOF &&
 	subject="$(git show -s --format=%s HEAD)"
-	content="$(git diff HEAD^! | tail -n 1)"
+	content="$(git diff HEAD^ HEAD | tail -n 1)"
 	echo "$subject: $content"
 	EOF
 	test_tick &&
@@ -468,4 +490,31 @@ test_expect_success '--rebase-merges with strategies' '
 	test_cmp expect G.t
 '
 
+test_expect_success '--rebase-merges with commit that can generate bad characters for filename' '
+	git checkout -b colon-in-label E &&
+	git merge -m "colon: this should work" G &&
+	git rebase --rebase-merges --force-rebase E
+'
+
+test_expect_success '--rebase-merges with message matched with onto label' '
+	git checkout -b onto-label E &&
+	git merge -m onto G &&
+	git rebase --rebase-merges --force-rebase E &&
+	test_cmp_graph <<-\EOF
+	*   onto
+	|\
+	| * G
+	| * F
+	* |   E
+	|\ \
+	| * | B
+	* | | D
+	| |/
+	|/|
+	* | C
+	|/
+	* A
+	EOF
+'
+
 test_done
diff --git a/t/t3431-rebase-fork-point.sh b/t/t3431-rebase-fork-point.sh
index 78851b9a2a..4c98d99e7e 100755
--- a/t/t3431-rebase-fork-point.sh
+++ b/t/t3431-rebase-fork-point.sh
@@ -5,13 +5,16 @@
 
 test_description='git rebase --fork-point test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
-# A---B---D---E    (master)
+# A---B---D---E    (main)
 #      \
 #       C*---F---G (side)
 #
-# C was formerly part of master but master was rewound to remove C
+# C was formerly part of main but main was rewound to remove C
 #
 test_expect_success setup '
 	test_commit A &&
@@ -26,19 +29,23 @@ test_expect_success setup '
 	test_commit G
 '
 
+do_test_rebase () {
+	expected="$1" &&
+	shift &&
+	git checkout main &&
+	git reset --hard E &&
+	git checkout side &&
+	git reset --hard G &&
+	git rebase $* &&
+	test_write_lines $expected >expect &&
+	git log --pretty=%s >actual &&
+	test_cmp expect actual
+}
+
 test_rebase () {
 	expected="$1" &&
 	shift &&
-	test_expect_success "git rebase $*" "
-		git checkout master &&
-		git reset --hard E &&
-		git checkout side &&
-		git reset --hard G &&
-		git rebase $* &&
-		test_write_lines $expected >expect &&
-		git log --pretty=%s >actual &&
-		test_cmp expect actual
-	"
+	test_expect_success "git rebase $*" "do_test_rebase '$expected' $*"
 }
 
 test_rebase 'G F E D B A'
@@ -47,11 +54,62 @@ test_rebase 'G F B A' --keep-base
 test_rebase 'G F C E D B A' --no-fork-point
 test_rebase 'G F C D B A' --no-fork-point --onto D
 test_rebase 'G F C B A' --no-fork-point --keep-base
-test_rebase 'G F E D B A' --fork-point refs/heads/master
-test_rebase 'G F D B A' --fork-point --onto D refs/heads/master
-test_rebase 'G F B A' --fork-point --keep-base refs/heads/master
-test_rebase 'G F C E D B A' refs/heads/master
-test_rebase 'G F C D B A' --onto D refs/heads/master
-test_rebase 'G F C B A' --keep-base refs/heads/master
+
+test_rebase 'G F E D B A' --fork-point refs/heads/main
+test_rebase 'G F E D B A' --fork-point main
+
+test_rebase 'G F D B A' --fork-point --onto D refs/heads/main
+test_rebase 'G F D B A' --fork-point --onto D main
+
+test_rebase 'G F B A' --fork-point --keep-base refs/heads/main
+test_rebase 'G F B A' --fork-point --keep-base main
+
+test_rebase 'G F C E D B A' refs/heads/main
+test_rebase 'G F C E D B A' main
+
+test_rebase 'G F C D B A' --onto D refs/heads/main
+test_rebase 'G F C D B A' --onto D main
+
+test_rebase 'G F C B A' --keep-base refs/heads/main
+test_rebase 'G F C B A' --keep-base main
+
+test_expect_success 'git rebase --fork-point with ambigous refname' '
+	git checkout main &&
+	git checkout -b one &&
+	git checkout side &&
+	git tag one &&
+	test_must_fail git rebase --fork-point --onto D one
+'
+
+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_expect_success 'rebase.forkPoint set to false' '
+	test_config rebase.forkPoint false &&
+	do_test_rebase "G F C E D B A"
+'
+
+test_expect_success 'rebase.forkPoint set to false and then to true' '
+	test_config_global rebase.forkPoint false &&
+	test_config rebase.forkPoint true &&
+	do_test_rebase "G F E D B A"
+'
+
+test_expect_success 'rebase.forkPoint set to false and command line says --fork-point' '
+	test_config rebase.forkPoint false &&
+	do_test_rebase "G F E D B A" --fork-point
+'
+
+test_expect_success 'rebase.forkPoint set to true and command line says --no-fork-point' '
+	test_config rebase.forkPoint true &&
+	do_test_rebase "G F C E D B A" --no-fork-point
+'
+
+test_expect_success 'rebase.forkPoint set to true and --root given' '
+	test_config rebase.forkPoint true &&
+	git rebase --root
+'
 
 test_done
diff --git a/t/t3432-rebase-fast-forward.sh b/t/t3432-rebase-fast-forward.sh
index 034ffc7e76..5086e14c02 100755
--- a/t/t3432-rebase-fast-forward.sh
+++ b/t/t3432-rebase-fast-forward.sh
@@ -5,6 +5,9 @@
 
 test_description='ensure rebase fast-forwards commits when possible'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -28,8 +31,12 @@ test_rebase_same_head () {
 	shift &&
 	cmp_f="$1" &&
 	shift &&
-	test_rebase_same_head_ $status_n $what_n $cmp_n "" "$*" &&
-	test_rebase_same_head_ $status_f $what_f $cmp_f " --no-ff" "$*"
+	test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --apply" "$*" &&
+	test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --apply --no-ff" "$*"
+	test_rebase_same_head_ $status_n $what_n $cmp_n 0 " --merge" "$*" &&
+	test_rebase_same_head_ $status_f $what_f $cmp_f 0 " --merge --no-ff" "$*"
+	test_rebase_same_head_ $status_n $what_n $cmp_n 1 " --merge" "$*" &&
+	test_rebase_same_head_ $status_f $what_f $cmp_f 1 " --merge --no-ff" "$*"
 }
 
 test_rebase_same_head_ () {
@@ -39,24 +46,33 @@ test_rebase_same_head_ () {
 	shift &&
 	cmp="$1" &&
 	shift &&
+	abbreviate="$1" &&
+	shift &&
 	flag="$1"
 	shift &&
-	test_expect_$status "git rebase$flag $* with $changes is $what with $cmp HEAD" "
+	if test $abbreviate -eq 1
+	then
+		msg="git rebase$flag $* (rebase.abbreviateCommands = true) with $changes is $what with $cmp HEAD"
+	else
+		msg="git rebase$flag $* with $changes is $what with $cmp HEAD"
+	fi &&
+	test_expect_$status "$msg" "
+		if test $abbreviate -eq 1
+		then
+			test_config rebase.abbreviateCommands true
+		fi &&
 		oldhead=\$(git rev-parse HEAD) &&
 		test_when_finished 'git reset --hard \$oldhead' &&
+		git reflog HEAD >expect &&
 		git rebase$flag $* >stdout &&
+		git reflog HEAD >actual &&
 		if test $what = work
 		then
-			# Must check this case first, for 'is up to
-			# date, rebase forced[...]rewinding head' cases
-			test_i18ngrep 'rewinding head' stdout
+			old=\$(wc -l <expect) &&
+			test_line_count '-gt' \$old actual
 		elif test $what = noop
 		then
-			test_i18ngrep 'is up to date' stdout &&
-			test_i18ngrep ! 'rebase forced' stdout
-		elif test $what = noop-force
-		then
-			test_i18ngrep 'is up to date, rebase forced' stdout
+			test_cmp expect actual
 		fi &&
 		newhead=\$(git rev-parse HEAD) &&
 		if test $cmp = same
@@ -64,26 +80,26 @@ test_rebase_same_head_ () {
 			test_cmp_rev \$oldhead \$newhead
 		elif test $cmp = diff
 		then
-			! test_cmp_rev \$oldhead \$newhead
+			test_cmp_rev ! \$oldhead \$newhead
 		fi
 	"
 }
 
 changes='no changes'
 test_rebase_same_head success noop same success work same
-test_rebase_same_head success noop same success noop-force same master
-test_rebase_same_head success noop same success noop-force diff --onto B B
-test_rebase_same_head success noop same success noop-force diff --onto B... B
-test_rebase_same_head success noop same success noop-force same --onto master... master
-test_rebase_same_head success noop same success noop-force same --keep-base master
-test_rebase_same_head success noop same success noop-force same --keep-base
-test_rebase_same_head success noop same success noop-force same --no-fork-point
-test_rebase_same_head success noop same success noop-force same --keep-base --no-fork-point
-test_rebase_same_head success noop same success work same --fork-point master
+test_rebase_same_head success noop same success work same main
+test_rebase_same_head success noop same success work diff --onto B B
+test_rebase_same_head success noop same success work diff --onto B... B
+test_rebase_same_head success noop same success work same --onto main... main
+test_rebase_same_head success noop same success work same --keep-base main
+test_rebase_same_head success noop same success work same --keep-base
+test_rebase_same_head success noop same success work same --no-fork-point
+test_rebase_same_head success noop same success work same --keep-base --no-fork-point
+test_rebase_same_head success noop same success work same --fork-point main
 test_rebase_same_head success noop same success work diff --fork-point --onto B B
 test_rebase_same_head success noop same success work diff --fork-point --onto B... B
-test_rebase_same_head success noop same success work same --fork-point --onto master... master
-test_rebase_same_head success noop same success work same --keep-base --keep-base master
+test_rebase_same_head success noop same success work same --fork-point --onto main... main
+test_rebase_same_head success noop same success work same --keep-base --keep-base main
 
 test_expect_success 'add work same to side' '
 	test_commit E
@@ -91,35 +107,35 @@ test_expect_success 'add work same to side' '
 
 changes='our changes'
 test_rebase_same_head success noop same success work same
-test_rebase_same_head success noop same success noop-force same master
-test_rebase_same_head success noop same success noop-force diff --onto B B
-test_rebase_same_head success noop same success noop-force diff --onto B... B
-test_rebase_same_head success noop same success noop-force same --onto master... master
-test_rebase_same_head success noop same success noop-force same --keep-base master
-test_rebase_same_head success noop same success noop-force same --keep-base
-test_rebase_same_head success noop same success noop-force same --no-fork-point
-test_rebase_same_head success noop same success noop-force same --keep-base --no-fork-point
-test_rebase_same_head success noop same success work same --fork-point master
+test_rebase_same_head success noop same success work same main
+test_rebase_same_head success noop same success work diff --onto B B
+test_rebase_same_head success noop same success work diff --onto B... B
+test_rebase_same_head success noop same success work same --onto main... main
+test_rebase_same_head success noop same success work same --keep-base main
+test_rebase_same_head success noop same success work same --keep-base
+test_rebase_same_head success noop same success work same --no-fork-point
+test_rebase_same_head success noop same success work same --keep-base --no-fork-point
+test_rebase_same_head success noop same success work same --fork-point main
 test_rebase_same_head success noop same success work diff --fork-point --onto B B
 test_rebase_same_head success noop same success work diff --fork-point --onto B... B
-test_rebase_same_head success noop same success work same --fork-point --onto master... master
-test_rebase_same_head success noop same success work same --fork-point --keep-base master
+test_rebase_same_head success noop same success work same --fork-point --onto main... main
+test_rebase_same_head success noop same success work same --fork-point --keep-base main
 
 test_expect_success 'add work same to upstream' '
-	git checkout master &&
+	git checkout main &&
 	test_commit F &&
 	git checkout side
 '
 
 changes='our and their changes'
-test_rebase_same_head success noop same success noop-force diff --onto B B
-test_rebase_same_head success noop same success noop-force diff --onto B... B
-test_rebase_same_head success noop same success work diff --onto master... master
-test_rebase_same_head success noop same success work diff --keep-base master
+test_rebase_same_head success noop same success work diff --onto B B
+test_rebase_same_head success noop same success work diff --onto B... B
+test_rebase_same_head success noop same success work diff --onto main... main
+test_rebase_same_head success noop same success work diff --keep-base main
 test_rebase_same_head success noop same success work diff --keep-base
 test_rebase_same_head failure work same success work diff --fork-point --onto B B
 test_rebase_same_head failure work same success work diff --fork-point --onto B... B
-test_rebase_same_head success noop same success work diff --fork-point --onto master... master
-test_rebase_same_head success noop same success work diff --fork-point --keep-base master
+test_rebase_same_head success noop same success work diff --fork-point --onto main... main
+test_rebase_same_head success noop same success work diff --fork-point --keep-base main
 
 test_done
diff --git a/t/t3433-rebase-across-mode-change.sh b/t/t3433-rebase-across-mode-change.sh
new file mode 100755
index 0000000000..05df964670
--- /dev/null
+++ b/t/t3433-rebase-across-mode-change.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+test_description='git rebase across mode change'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	mkdir DS &&
+	>DS/whatever &&
+	git add DS &&
+	git commit -m base &&
+
+	git branch side1 &&
+	git branch side2 &&
+
+	git checkout side1 &&
+	git rm -rf DS &&
+	test_ln_s_add unrelated DS &&
+	git commit -m side1 &&
+
+	git checkout side2 &&
+	>unrelated &&
+	git add unrelated &&
+	git commit -m commit1 &&
+
+	echo >>unrelated &&
+	git commit -am commit2
+'
+
+test_expect_success 'rebase changes with the apply backend' '
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b apply-backend side2 &&
+	git rebase side1
+'
+
+test_expect_success 'rebase changes with the merge backend' '
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b merge-backend side2 &&
+	git rebase -m side1
+'
+
+test_expect_success 'rebase changes with the merge backend with a delay' '
+	test_when_finished "git rebase --abort || true" &&
+	git checkout -b merge-delay-backend side2 &&
+	git rebase -m --exec "sleep 1" side1
+'
+
+test_done
diff --git a/t/t3434-rebase-i18n.sh b/t/t3434-rebase-i18n.sh
new file mode 100755
index 0000000000..e6fef696bb
--- /dev/null
+++ b/t/t3434-rebase-i18n.sh
@@ -0,0 +1,87 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Doan Tran Cong Danh
+#
+
+test_description='rebase with changing encoding
+
+Initial setup:
+
+1 - 2              main
+ \
+  3 - 4            first
+   \
+    5 - 6          second
+'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+compare_msg () {
+	iconv -f "$2" -t "$3" "$TEST_DIRECTORY/t3434/$1" >expect &&
+	git cat-file commit HEAD >raw &&
+	sed "1,/^$/d" raw >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success setup '
+	test_commit one &&
+	git branch first &&
+	test_commit two &&
+	git switch first &&
+	test_commit three &&
+	git branch second &&
+	test_commit four &&
+	git switch second &&
+	test_commit five &&
+	test_commit six
+'
+
+test_expect_success 'rebase --rebase-merges update encoding eucJP to UTF-8' '
+	git switch -c merge-eucJP-UTF-8 first &&
+	git config i18n.commitencoding eucJP &&
+	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
+	git config i18n.commitencoding UTF-8 &&
+	git rebase --rebase-merges main &&
+	compare_msg eucJP.txt eucJP UTF-8
+'
+
+test_expect_success 'rebase --rebase-merges update encoding eucJP to ISO-2022-JP' '
+	git switch -c merge-eucJP-ISO-2022-JP first &&
+	git config i18n.commitencoding eucJP &&
+	git merge -F "$TEST_DIRECTORY/t3434/eucJP.txt" second &&
+	git config i18n.commitencoding ISO-2022-JP &&
+	git rebase --rebase-merges main &&
+	compare_msg eucJP.txt eucJP ISO-2022-JP
+'
+
+test_rebase_continue_update_encode () {
+	old=$1
+	new=$2
+	msgfile=$3
+	test_expect_success "rebase --continue update from $old to $new" '
+		(git rebase --abort || : abort current git-rebase failure) &&
+		git switch -c conflict-$old-$new one &&
+		echo for-conflict >two.t &&
+		git add two.t &&
+		git config i18n.commitencoding $old &&
+		git commit -F "$TEST_DIRECTORY/t3434/$msgfile" &&
+		git config i18n.commitencoding $new &&
+		test_must_fail git rebase -m main &&
+		test -f .git/rebase-merge/message &&
+		git stripspace <.git/rebase-merge/message >two.t &&
+		git add two.t &&
+		git rebase --continue &&
+		compare_msg $msgfile $old $new &&
+		: git-commit assume invalid utf-8 is latin1 &&
+		test_cmp expect two.t
+	'
+}
+
+test_rebase_continue_update_encode ISO-8859-1 UTF-8 ISO8859-1.txt
+test_rebase_continue_update_encode eucJP UTF-8 eucJP.txt
+test_rebase_continue_update_encode eucJP ISO-2022-JP eucJP.txt
+
+test_done
diff --git a/t/t3434/ISO8859-1.txt b/t/t3434/ISO8859-1.txt
new file mode 100644
index 0000000000..7cbef0ee6f
--- /dev/null
+++ b/t/t3434/ISO8859-1.txt
@@ -0,0 +1,3 @@
+ÄËÑÏÖ
+
+Ábçdèfg
diff --git a/t/t3434/eucJP.txt b/t/t3434/eucJP.txt
new file mode 100644
index 0000000000..546f2aac01
--- /dev/null
+++ b/t/t3434/eucJP.txt
@@ -0,0 +1,4 @@
+¤Ï¤ì¤Ò¤Û¤Õ
+
+¤·¤Æ¤¤¤ë¤Î¤¬¡¢¤¤¤ë¤Î¤Ç¡£
+ßÀÉͤۤì¤×¤ê¤Ý¤ì¤Þ¤Ó¤°¤ê¤í¤Ø¡£
diff --git a/t/t3435-rebase-gpg-sign.sh b/t/t3435-rebase-gpg-sign.sh
new file mode 100755
index 0000000000..ec10766858
--- /dev/null
+++ b/t/t3435-rebase-gpg-sign.sh
@@ -0,0 +1,130 @@
+#!/bin/sh
+#
+# Copyright (c) 2020 Doan Tran Cong Danh
+#
+
+test_description='test rebase --[no-]gpg-sign'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-rebase.sh"
+. "$TEST_DIRECTORY/lib-gpg.sh"
+
+if ! test_have_prereq GPG
+then
+	skip_all='skip all test rebase --[no-]gpg-sign, gpg not available'
+	test_done
+fi
+
+test_rebase_gpg_sign () {
+	local must_fail= will=will fake_editor=
+	if test "x$1" = "x!"
+	then
+		must_fail=test_must_fail
+		will="won't"
+		shift
+	fi
+	conf=$1
+	shift
+	test_expect_success "rebase $* with commit.gpgsign=$conf $will sign commit" "
+		git reset two &&
+		git config commit.gpgsign $conf &&
+		set_fake_editor &&
+		FAKE_LINES='r 1 p 2' git rebase --force-rebase --root $* &&
+		$must_fail git verify-commit HEAD^ &&
+		$must_fail git verify-commit HEAD
+	"
+}
+
+test_expect_success 'setup' '
+	test_commit one &&
+	test_commit two &&
+	test_must_fail git verify-commit HEAD &&
+	test_must_fail git verify-commit HEAD^
+'
+
+test_expect_success 'setup: merge commit' '
+	test_commit fork-point &&
+	git switch -c side &&
+	test_commit three &&
+	git switch main &&
+	git merge --no-ff side &&
+	git tag merged
+'
+
+test_rebase_gpg_sign ! false
+test_rebase_gpg_sign   true
+test_rebase_gpg_sign ! true  --no-gpg-sign
+test_rebase_gpg_sign ! true  --gpg-sign --no-gpg-sign
+test_rebase_gpg_sign   false --no-gpg-sign --gpg-sign
+test_rebase_gpg_sign   true  -i
+test_rebase_gpg_sign ! true  -i --no-gpg-sign
+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' '
+	git reset --hard merged &&
+	git config commit.gpgsign true &&
+	git rebase -p --no-gpg-sign --onto=one fork-point main &&
+	test_must_fail git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r, merge strategy, --gpg-sign will sign commit' '
+	git reset --hard merged &&
+	test_unconfig commit.gpgsign &&
+	git rebase -fr --gpg-sign -s resolve --root &&
+	git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r, merge strategy, commit.gpgsign=true will sign commit' '
+	git reset --hard merged &&
+	git config commit.gpgsign true &&
+	git rebase -fr -s resolve --root &&
+	git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r, merge strategy, commit.gpgsign=false --gpg-sign will sign commit' '
+	git reset --hard merged &&
+	git config commit.gpgsign false &&
+	git rebase -fr --gpg-sign -s resolve --root &&
+	git verify-commit HEAD
+'
+
+test_expect_success "rebase -r, merge strategy, commit.gpgsign=true --no-gpg-sign won't sign commit" '
+	git reset --hard merged &&
+	git config commit.gpgsign true &&
+	git rebase -fr --no-gpg-sign -s resolve --root &&
+	test_must_fail git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r --gpg-sign will sign commit' '
+	git reset --hard merged &&
+	test_unconfig commit.gpgsign &&
+	git rebase -fr --gpg-sign --root &&
+	git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r with commit.gpgsign=true will sign commit' '
+	git reset --hard merged &&
+	git config commit.gpgsign true &&
+	git rebase -fr --root &&
+	git verify-commit HEAD
+'
+
+test_expect_success 'rebase -r --gpg-sign with commit.gpgsign=false will sign commit' '
+	git reset --hard merged &&
+	git config commit.gpgsign false &&
+	git rebase -fr --gpg-sign --root &&
+	git verify-commit HEAD
+'
+
+test_expect_success "rebase -r --no-gpg-sign with commit.gpgsign=true won't sign commit" '
+	git reset --hard merged &&
+	git config commit.gpgsign true &&
+	git rebase -fr --no-gpg-sign --root &&
+	test_must_fail git verify-commit HEAD
+'
+
+test_done
diff --git a/t/t3436-rebase-more-options.sh b/t/t3436-rebase-more-options.sh
new file mode 100755
index 0000000000..4d106642ba
--- /dev/null
+++ b/t/t3436-rebase-more-options.sh
@@ -0,0 +1,180 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Rohit Ashiwal
+#
+
+test_description='tests to ensure compatibility between am and interactive backends'
+
+. ./test-lib.sh
+
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
+GIT_AUTHOR_DATE="1999-04-02T08:03:20+05:30"
+export GIT_AUTHOR_DATE
+
+# This is a special case in which both am and interactive backends
+# provide the same output. It was done intentionally because
+# both the backends fall short of optimal behaviour.
+test_expect_success 'setup' '
+	git checkout -b topic &&
+	test_write_lines "line 1" "	line 2" "line 3" >file &&
+	git add file &&
+	git commit -m "add file" &&
+
+	test_write_lines "line 1" "new line 2" "line 3" >file &&
+	git commit -am "update file" &&
+	git tag side &&
+	test_commit commit1 foo foo1 &&
+	test_commit commit2 foo foo2 &&
+	test_commit commit3 foo foo3 &&
+
+	git checkout --orphan main &&
+	rm foo &&
+	test_write_lines "line 1" "        line 2" "line 3" >file &&
+	git commit -am "add file" &&
+	git tag main &&
+
+	mkdir test-bin &&
+	write_script test-bin/git-merge-test <<-\EOF
+	exec git merge-recursive "$@"
+	EOF
+'
+
+test_expect_success '--ignore-whitespace works with apply backend' '
+	test_must_fail git rebase --apply main side &&
+	git rebase --abort &&
+	git rebase --apply --ignore-whitespace main side &&
+	git diff --exit-code side
+'
+
+test_expect_success '--ignore-whitespace works with merge backend' '
+	test_must_fail git rebase --merge main side &&
+	git rebase --abort &&
+	git rebase --merge --ignore-whitespace main side &&
+	git diff --exit-code side
+'
+
+test_expect_success '--ignore-whitespace is remembered when continuing' '
+	(
+		set_fake_editor &&
+		FAKE_LINES="break 1" git rebase -i --ignore-whitespace \
+			main side &&
+		git rebase --continue
+	) &&
+	git diff --exit-code side
+'
+
+test_ctime_is_atime () {
+	git log $1 --format="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> %ai" >authortime &&
+	git log $1 --format="%cn <%ce> %ci" >committertime &&
+	test_cmp authortime committertime
+}
+
+test_expect_success '--committer-date-is-author-date works with apply backend' '
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	git rebase --apply --committer-date-is-author-date HEAD^ &&
+	test_ctime_is_atime -1
+'
+
+test_expect_success '--committer-date-is-author-date works with merge backend' '
+	GIT_AUTHOR_DATE="@1234 +0300" git commit --amend --reset-author &&
+	git rebase -m --committer-date-is-author-date HEAD^ &&
+	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 &&
+	git rebase -r --root --committer-date-is-author-date &&
+	test_ctime_is_atime
+'
+
+test_expect_success '--committer-date-is-author-date works when forking merge' '
+	git checkout side &&
+	GIT_AUTHOR_DATE="@1234 +0300" git merge --no-ff commit3 &&
+	PATH="./test-bin:$PATH" git rebase -r --root --strategy=test \
+					--committer-date-is-author-date &&
+	test_ctime_is_atime
+'
+
+test_expect_success '--committer-date-is-author-date works when committing conflict resolution' '
+	git checkout commit2 &&
+	GIT_AUTHOR_DATE="@1980 +0000" git commit --amend --only --reset-author &&
+	test_must_fail git rebase -m --committer-date-is-author-date \
+		--onto HEAD^^ HEAD^ &&
+	echo resolved > foo &&
+	git add foo &&
+	git rebase --continue &&
+	test_ctime_is_atime -1
+'
+
+# Checking for +0000 in the author date is sufficient since the
+# default timezone is UTC but the timezone used while committing is
+# +0530. The inverted logic in the grep is necessary to check all the
+# author dates in the file.
+test_atime_is_ignored () {
+	git log $1 --format=%ai >authortime &&
+	! grep -v +0000 authortime
+}
+
+test_expect_success '--reset-author-date works with apply backend' '
+	git commit --amend --date="$GIT_AUTHOR_DATE" &&
+	git rebase --apply --reset-author-date HEAD^ &&
+	test_atime_is_ignored -1
+'
+
+test_expect_success '--reset-author-date works with merge backend' '
+	git commit --amend --date="$GIT_AUTHOR_DATE" &&
+	git rebase --reset-author-date -m HEAD^ &&
+	test_atime_is_ignored -1
+'
+
+test_expect_success '--reset-author-date works after conflict resolution' '
+	test_must_fail git rebase --reset-author-date -m \
+		--onto commit2^^ commit2^ commit2 &&
+	echo resolved >foo &&
+	git add foo &&
+	git rebase --continue &&
+	test_atime_is_ignored -1
+'
+
+test_expect_success '--reset-author-date works with rebase -r' '
+	git checkout side &&
+	git merge --no-ff commit3 &&
+	git rebase -r --root --reset-author-date &&
+	test_atime_is_ignored
+'
+
+test_expect_success '--reset-author-date with --committer-date-is-author-date works' '
+	test_must_fail git rebase -m --committer-date-is-author-date \
+		--reset-author-date --onto commit2^^ commit2^ commit3 &&
+	git checkout --theirs foo &&
+	git add foo &&
+	git rebase --continue &&
+	test_ctime_is_atime -2 &&
+	test_atime_is_ignored -2
+'
+
+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 \
+				--reset-author-date \
+				--committer-date-is-author-date side side &&
+	test_ctime_is_atime -1 &&
+	test_atime_is_ignored -1
+ '
+
+test_expect_success '--ignore-date is an alias for --reset-author-date' '
+	git commit --amend --date="$GIT_AUTHOR_DATE" &&
+	git rebase --apply --ignore-date HEAD^ &&
+	git commit --allow-empty -m empty --date="$GIT_AUTHOR_DATE" &&
+	git rebase -m --ignore-date HEAD^ &&
+	test_atime_is_ignored -2
+'
+
+# This must be the last test in this file
+test_expect_success '$EDITOR and friends are unchanged' '
+	test_editor_unchanged
+'
+
+test_done
diff --git a/t/t3437-rebase-fixup-options.sh b/t/t3437-rebase-fixup-options.sh
new file mode 100755
index 0000000000..c023fefd68
--- /dev/null
+++ b/t/t3437-rebase-fixup-options.sh
@@ -0,0 +1,211 @@
+#!/bin/sh
+#
+# Copyright (c) 2018 Phillip Wood
+#
+
+test_description='git rebase interactive fixup options
+
+This test checks the "fixup [-C|-c]" command of rebase interactive.
+In addition to amending the contents of the commit, "fixup -C"
+replaces the original commit message with the message of the fixup
+commit. "fixup -c" also replaces the original message, but opens the
+editor to allow the user to edit the message before committing. Similar
+to the "fixup" command that works with "fixup!", "fixup -C" works with
+"amend!" upon --autosquash.
+'
+
+. ./test-lib.sh
+
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
+EMPTY=""
+
+# test_commit_message <rev> -m <msg>
+# test_commit_message <rev> <path>
+# Verify that the commit message of <rev> matches
+# <msg> or the content of <path>.
+test_commit_message () {
+	git show --no-patch --pretty=format:%B "$1" >actual &&
+	case "$2" in
+	-m)
+		echo "$3" >expect &&
+		test_cmp expect actual ;;
+	*)
+		test_cmp "$2" actual ;;
+	esac
+}
+
+get_author () {
+	rev="$1" &&
+	git log -1 --pretty=format:"%an %ae %at" "$rev"
+}
+
+test_expect_success 'setup' '
+	cat >message <<-EOF &&
+	amend! B
+	$EMPTY
+	new subject
+	$EMPTY
+	new
+	body
+	EOF
+
+	test_commit A A &&
+	test_commit B B &&
+	get_author HEAD >expected-author &&
+	ORIG_AUTHOR_NAME="$GIT_AUTHOR_NAME" &&
+	ORIG_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL" &&
+	GIT_AUTHOR_NAME="Amend Author" &&
+	GIT_AUTHOR_EMAIL="amend@example.com" &&
+	test_commit "$(cat message)" A A1 A1 &&
+	test_commit A2 A &&
+	test_commit A3 A &&
+	GIT_AUTHOR_NAME="$ORIG_AUTHOR_NAME" &&
+	GIT_AUTHOR_EMAIL="$ORIG_AUTHOR_EMAIL" &&
+	git checkout -b conflicts-branch A &&
+	test_commit conflicts A &&
+
+	set_fake_editor &&
+	git checkout -b branch B &&
+	echo B1 >B &&
+	test_tick &&
+	git commit --fixup=HEAD -a &&
+	git tag B1 &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited 1" git commit --fixup=reword:B &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited 2" git commit --fixup=reword:HEAD &&
+	echo B2 >B &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited squash" git commit --squash=HEAD -a &&
+	git tag B2 &&
+	echo B3 >B &&
+	test_tick &&
+	FAKE_COMMIT_AMEND="edited 3" git commit -a --fixup=amend:HEAD^ &&
+	git tag B3 &&
+
+	GIT_AUTHOR_NAME="Rebase Author" &&
+	GIT_AUTHOR_EMAIL="rebase.author@example.com" &&
+	GIT_COMMITTER_NAME="Rebase Committer" &&
+	GIT_COMMITTER_EMAIL="rebase.committer@example.com"
+'
+
+test_expect_success 'simple fixup -C works' '
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A2 &&
+	FAKE_LINES="1 fixup_-C 2" git rebase -i B &&
+	test_cmp_rev HEAD^ B &&
+	test_cmp_rev HEAD^{tree} A2^{tree} &&
+	test_commit_message HEAD -m "A2"
+'
+
+test_expect_success 'simple fixup -c works' '
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A2 &&
+	git log -1 --pretty=format:%B >expected-fixup-message &&
+	test_write_lines "" "Modified A2" >>expected-fixup-message &&
+	FAKE_LINES="1 fixup_-c 2" \
+		FAKE_COMMIT_AMEND="Modified A2" \
+		git rebase -i B &&
+	test_cmp_rev HEAD^ B &&
+	test_cmp_rev HEAD^{tree} A2^{tree} &&
+	test_commit_message HEAD expected-fixup-message
+'
+
+test_expect_success 'fixup -C removes amend! from message' '
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A1 &&
+	git log -1 --pretty=format:%b >expected-message &&
+	FAKE_LINES="1 fixup_-C 2" git rebase -i A &&
+	test_cmp_rev HEAD^ A &&
+	test_cmp_rev HEAD^{tree} A1^{tree} &&
+	test_commit_message HEAD expected-message &&
+	get_author HEAD >actual-author &&
+	test_cmp expected-author actual-author
+'
+
+test_expect_success 'fixup -C with conflicts gives correct message' '
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A1 &&
+	git log -1 --pretty=format:%b >expected-message &&
+	test_write_lines "" "edited" >>expected-message &&
+	test_must_fail env FAKE_LINES="1 fixup_-C 2" git rebase -i conflicts &&
+	git checkout --theirs -- A &&
+	git add A &&
+	FAKE_COMMIT_AMEND=edited git rebase --continue &&
+	test_cmp_rev HEAD^ conflicts &&
+	test_cmp_rev HEAD^{tree} A1^{tree} &&
+	test_commit_message HEAD expected-message &&
+	get_author HEAD >actual-author &&
+	test_cmp expected-author actual-author
+'
+
+test_expect_success 'skipping fixup -C after fixup gives correct message' '
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A3 &&
+	test_must_fail env FAKE_LINES="1 fixup 2 fixup_-C 4" git rebase -i A &&
+	git reset --hard &&
+	FAKE_COMMIT_AMEND=edited git rebase --continue &&
+	test_commit_message HEAD -m "B"
+'
+
+test_expect_success 'sequence of fixup, fixup -C & squash --signoff works' '
+	git checkout --detach B3 &&
+	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4 squash 5 fixup_-C 6" \
+		FAKE_COMMIT_AMEND=squashed \
+		FAKE_MESSAGE_COPY=actual-squash-message \
+		git -c commit.status=false rebase -ik --signoff A &&
+	git diff-tree --exit-code --patch HEAD B3 -- &&
+	test_cmp_rev HEAD^ A &&
+	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
+		actual-squash-message
+'
+
+test_expect_success 'first fixup -C commented out in sequence fixup fixup -C fixup -C' '
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach B2~ &&
+	git log -1 --pretty=format:%b >expected-message &&
+	FAKE_LINES="1 fixup 2 fixup_-C 3 fixup_-C 4" git rebase -i A &&
+	test_cmp_rev HEAD^ A &&
+	test_commit_message HEAD expected-message
+'
+
+test_expect_success 'multiple fixup -c opens editor once' '
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A3 &&
+	git log -1 --pretty=format:%B >expected-message &&
+	test_write_lines "" "Modified-A3" >>expected-message &&
+	FAKE_COMMIT_AMEND="Modified-A3" \
+		FAKE_LINES="1 fixup_-C 2 fixup_-c 3 fixup_-c 4" \
+		EXPECT_HEADER_COUNT=4 \
+		git rebase -i A &&
+	test_cmp_rev HEAD^ A &&
+	get_author HEAD >actual-author &&
+	test_cmp expected-author actual-author &&
+	test_commit_message HEAD expected-message
+'
+
+test_expect_success 'sequence squash, fixup & fixup -c gives combined message' '
+	test_when_finished "test_might_fail git rebase --abort" &&
+	git checkout --detach A3 &&
+	FAKE_LINES="1 squash 2 fixup 3 fixup_-c 4" \
+		FAKE_MESSAGE_COPY=actual-combined-message \
+		git -c commit.status=false rebase -i A &&
+	test_cmp "$TEST_DIRECTORY/t3437/expected-combined-message" \
+		actual-combined-message &&
+	test_cmp_rev HEAD^ A
+'
+
+test_expect_success 'fixup -C works upon --autosquash with amend!' '
+	git checkout --detach B3 &&
+	FAKE_COMMIT_AMEND=squashed \
+		FAKE_MESSAGE_COPY=actual-squash-message \
+		git -c commit.status=false rebase -ik --autosquash \
+						--signoff A &&
+	git diff-tree --exit-code --patch HEAD B3 -- &&
+	test_cmp_rev HEAD^ A &&
+	test_cmp "$TEST_DIRECTORY/t3437/expected-squash-message" \
+		actual-squash-message
+'
+
+test_done
diff --git a/t/t3437/expected-combined-message b/t/t3437/expected-combined-message
new file mode 100644
index 0000000000..a26cfb2fa9
--- /dev/null
+++ b/t/t3437/expected-combined-message
@@ -0,0 +1,21 @@
+# This is a combination of 4 commits.
+# This is the 1st commit message:
+
+B
+
+# This is the commit message #2:
+
+# amend! B
+
+new subject
+
+new
+body
+
+# The commit message #3 will be skipped:
+
+# A2
+
+# This is the commit message #4:
+
+A3
diff --git a/t/t3437/expected-squash-message b/t/t3437/expected-squash-message
new file mode 100644
index 0000000000..ab2434f90e
--- /dev/null
+++ b/t/t3437/expected-squash-message
@@ -0,0 +1,51 @@
+# This is a combination of 6 commits.
+# The 1st commit message will be skipped:
+
+# B
+#
+# Signed-off-by: Rebase Committer <rebase.committer@example.com>
+
+# The commit message #2 will be skipped:
+
+# fixup! B
+
+# The commit message #3 will be skipped:
+
+# amend! B
+#
+# B
+#
+# edited 1
+#
+# Signed-off-by: Rebase Committer <rebase.committer@example.com>
+
+# This is the commit message #4:
+
+# amend! amend! B
+
+B
+
+edited 1
+
+edited 2
+
+Signed-off-by: Rebase Committer <rebase.committer@example.com>
+
+# This is the commit message #5:
+
+# squash! amend! amend! B
+
+edited squash
+
+# This is the commit message #6:
+
+# amend! amend! amend! B
+
+B
+
+edited 1
+
+edited 2
+
+edited 3
+squashed
diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh
index f038f34b7c..0458a58b4b 100755
--- a/t/t3500-cherry.sh
+++ b/t/t3500-cherry.sh
@@ -5,9 +5,12 @@
 
 test_description='git cherry should detect patches integrated upstream
 
-This test cherry-picks one local change of two into master branch, and
+This test cherry-picks one local change of two into main branch, and
 checks that git cherry only returns the second patch in the local branch
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 GIT_AUTHOR_EMAIL=bogus_email_address
@@ -32,7 +35,7 @@ test_expect_success \
      test_tick &&
      git commit -m "Add C." &&
 
-     git checkout -f master &&
+     git checkout -f main &&
      rm -f B C &&
 
      echo Third >> A &&
@@ -40,19 +43,42 @@ test_expect_success \
      test_tick &&
      git commit -m "Modify A." &&
 
-     expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*"
+     expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* + .*"
 '
 
 test_expect_success \
     'check that cherry with limit returns only the top patch'\
-    'expr "$(echo $(git cherry master my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
+    'expr "$(echo $(git cherry main my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
 '
 
 test_expect_success \
     'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' \
     'git cherry-pick my-topic-branch^0 &&
-     echo $(git cherry master my-topic-branch) &&
-     expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* - .*"
+     echo $(git cherry main my-topic-branch) &&
+     expr "$(echo $(git cherry main my-topic-branch) )" : "+ [^ ]* - .*"
+'
+
+test_expect_success 'cherry ignores whitespace' '
+	git switch --orphan=upstream-with-space &&
+	test_commit initial file &&
+	>expect &&
+	git switch --create=feature-without-space &&
+
+	# A spaceless file on the feature branch.  Expect a match upstream.
+	printf space >file &&
+	git add file &&
+	git commit -m"file without space" &&
+	git log --format="- %H" -1 >>expect &&
+
+	# A further change.  Should not match upstream.
+	test_commit change file &&
+	git log --format="+ %H" -1 >>expect &&
+
+	git switch upstream-with-space &&
+	# Same as the spaceless file, just with spaces and on upstream.
+	test_commit "file with space" file "s p a c e" file-with-space &&
+	git cherry upstream-with-space feature-without-space >actual &&
+	test_cmp expect actual
 '
 
 test_done
diff --git a/t/t3501-revert-cherry-pick.sh b/t/t3501-revert-cherry-pick.sh
index d1c68af8c5..4b5b607673 100755
--- a/t/t3501-revert-cherry-pick.sh
+++ b/t/t3501-revert-cherry-pick.sh
@@ -10,6 +10,9 @@ test_description='test cherry-pick and revert with renames
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -47,7 +50,7 @@ test_expect_success 'cherry-pick --nonsense' '
 	git diff --exit-code HEAD &&
 	test_must_fail git cherry-pick --nonsense 2>msg &&
 	git diff --exit-code HEAD "$pos" &&
-	test_i18ngrep '[Uu]sage:' msg
+	test_i18ngrep "[Uu]sage:" msg
 '
 
 test_expect_success 'revert --nonsense' '
@@ -56,7 +59,7 @@ test_expect_success 'revert --nonsense' '
 	git diff --exit-code HEAD &&
 	test_must_fail git revert --nonsense 2>msg &&
 	git diff --exit-code HEAD "$pos" &&
-	test_i18ngrep '[Uu]sage:' msg
+	test_i18ngrep "[Uu]sage:" msg
 '
 
 test_expect_success 'cherry-pick after renaming branch' '
@@ -106,13 +109,13 @@ test_expect_success 'cherry-pick on unborn branch' '
 	rm -rf * &&
 	git cherry-pick initial &&
 	git diff --quiet initial &&
-	! test_cmp_rev initial HEAD
+	test_cmp_rev ! initial HEAD
 '
 
 test_expect_success 'cherry-pick "-" to pick from previous branch' '
 	git checkout unborn &&
 	test_commit to-pick actual content &&
-	git checkout master &&
+	git checkout main &&
 	git cherry-pick - &&
 	echo content >expect &&
 	test_cmp expect actual
@@ -132,7 +135,7 @@ test_expect_success 'cherry-pick "-" is meaningless without checkout' '
 test_expect_success 'cherry-pick "-" works with arguments' '
 	git checkout -b side-branch &&
 	test_commit change actual change &&
-	git checkout master &&
+	git checkout main &&
 	git cherry-pick -s - &&
 	echo "Signed-off-by: C O Mitter <committer@example.com>" >expect &&
 	git cat-file commit HEAD | grep ^Signed-off-by: >signoff &&
@@ -150,9 +153,25 @@ test_expect_success 'cherry-pick works with dirty renamed file' '
 	test_tick &&
 	git commit -m renamed &&
 	echo modified >renamed &&
-	git cherry-pick refs/heads/unrelated >out &&
+	git cherry-pick refs/heads/unrelated &&
 	test $(git rev-parse :0:renamed) = $(git rev-parse HEAD~2:to-rename.t) &&
 	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/t3502-cherry-pick-merge.sh b/t/t3502-cherry-pick-merge.sh
index 8b635a196d..5495eacfec 100755
--- a/t/t3502-cherry-pick-merge.sh
+++ b/t/t3502-cherry-pick-merge.sh
@@ -8,6 +8,9 @@ test_description='cherry picking and reverting a merge
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -25,7 +28,7 @@ test_expect_success setup '
 	echo new line >B &&
 	git commit -m "add line to B" B &&
 	git tag b &&
-	git checkout master &&
+	git checkout main &&
 	git merge side &&
 	git tag c
 
diff --git a/t/t3503-cherry-pick-root.sh b/t/t3503-cherry-pick-root.sh
index e27f39d1e5..95fe4feaee 100755
--- a/t/t3503-cherry-pick-root.sh
+++ b/t/t3503-cherry-pick-root.sh
@@ -2,6 +2,9 @@
 
 test_description='test cherry-picking (and reverting) a root commit'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -30,7 +33,7 @@ test_expect_success setup '
 test_expect_success 'cherry-pick a root commit' '
 
 	git checkout second^0 &&
-	git cherry-pick master &&
+	git cherry-pick main &&
 	echo first >expect &&
 	test_cmp expect file1
 
@@ -38,14 +41,14 @@ test_expect_success 'cherry-pick a root commit' '
 
 test_expect_success 'revert a root commit' '
 
-	git revert master &&
+	git revert main &&
 	test_path_is_missing file1
 
 '
 
 test_expect_success 'cherry-pick a root commit with an external strategy' '
 
-	git cherry-pick --strategy=resolve master &&
+	git cherry-pick --strategy=resolve main &&
 	echo first >expect &&
 	test_cmp expect file1
 
@@ -53,7 +56,7 @@ test_expect_success 'cherry-pick a root commit with an external strategy' '
 
 test_expect_success 'revert a root commit with an external strategy' '
 
-	git revert --strategy=resolve master &&
+	git revert --strategy=resolve main &&
 	test_path_is_missing file1
 
 '
@@ -65,7 +68,7 @@ test_expect_success 'cherry-pick two root commits' '
 	echo third >expect.file3 &&
 
 	git checkout second^0 &&
-	git cherry-pick master third &&
+	git cherry-pick main third &&
 
 	test_cmp expect.file1 file1 &&
 	test_cmp expect.file2 file2 &&
diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh
index a267b2d144..4581ae98b8 100755
--- a/t/t3504-cherry-pick-rerere.sh
+++ b/t/t3504-cherry-pick-rerere.sh
@@ -2,12 +2,15 @@
 
 test_description='cherry-pick should rerere for conflicts'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
 	test_commit foo &&
-	test_commit foo-master foo &&
-	test_commit bar-master bar &&
+	test_commit foo-main foo &&
+	test_commit bar-main bar &&
 
 	git checkout -b dev foo &&
 	test_commit foo-dev foo &&
@@ -16,7 +19,7 @@ test_expect_success setup '
 '
 
 test_expect_success 'conflicting merge' '
-	test_must_fail git merge master
+	test_must_fail git merge main
 '
 
 test_expect_success 'fixup' '
@@ -29,7 +32,7 @@ test_expect_success 'fixup' '
 '
 
 test_expect_success 'cherry-pick conflict with --rerere-autoupdate' '
-	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master &&
+	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
 	test_cmp foo-expect foo &&
 	git diff-files --quiet &&
 	test_must_fail git cherry-pick --continue &&
@@ -41,7 +44,7 @@ test_expect_success 'cherry-pick conflict with --rerere-autoupdate' '
 
 test_expect_success 'cherry-pick conflict repsects rerere.autoUpdate' '
 	test_config rerere.autoUpdate true &&
-	test_must_fail git cherry-pick foo..bar-master &&
+	test_must_fail git cherry-pick foo..bar-main &&
 	test_cmp foo-expect foo &&
 	git diff-files --quiet &&
 	test_must_fail git cherry-pick --continue &&
@@ -53,7 +56,7 @@ test_expect_success 'cherry-pick conflict repsects rerere.autoUpdate' '
 
 test_expect_success 'cherry-pick conflict with --no-rerere-autoupdate' '
 	test_config rerere.autoUpdate true &&
-	test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-master &&
+	test_must_fail git cherry-pick --no-rerere-autoupdate foo..bar-main &&
 	test_cmp foo-expect foo &&
 	test_must_fail git diff-files --quiet &&
 	git add foo &&
@@ -66,36 +69,38 @@ test_expect_success 'cherry-pick conflict with --no-rerere-autoupdate' '
 '
 
 test_expect_success 'cherry-pick --continue rejects --rerere-autoupdate' '
-	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-master &&
+	test_must_fail git cherry-pick --rerere-autoupdate foo..bar-main &&
 	test_cmp foo-expect foo &&
 	git diff-files --quiet &&
 	test_must_fail git cherry-pick --continue --rerere-autoupdate >actual 2>&1 &&
 	echo "fatal: cherry-pick: --rerere-autoupdate cannot be used with --continue" >expect &&
-	test_i18ncmp expect actual &&
+	test_cmp expect actual &&
 	test_must_fail git cherry-pick --continue --no-rerere-autoupdate >actual 2>&1 &&
 	echo "fatal: cherry-pick: --no-rerere-autoupdate cannot be used with --continue" >expect &&
-	test_i18ncmp expect actual &&
+	test_cmp expect actual &&
 	git cherry-pick --abort
 '
 
 test_expect_success 'cherry-pick --rerere-autoupdate more than once' '
-	test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-master &&
+	test_must_fail git cherry-pick --rerere-autoupdate --rerere-autoupdate foo..bar-main &&
 	test_cmp foo-expect foo &&
 	git diff-files --quiet &&
 	git cherry-pick --abort &&
-	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-master &&
+	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate --rerere-autoupdate foo..bar-main &&
 	test_cmp foo-expect foo &&
 	git diff-files --quiet &&
 	git cherry-pick --abort &&
-	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-master &&
+	test_must_fail git cherry-pick --rerere-autoupdate --no-rerere-autoupdate foo..bar-main &&
 	test_must_fail git diff-files --quiet &&
 	git cherry-pick --abort
 '
 
 test_expect_success 'cherry-pick conflict without rerere' '
 	test_config rerere.enabled false &&
-	test_must_fail git cherry-pick master &&
-	test_must_fail test_cmp expect foo
+	test_must_fail git cherry-pick foo-main &&
+	grep ===== foo &&
+	grep foo-dev foo &&
+	grep foo-main foo
 '
 
 test_done
diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh
index 5f911bb529..eba3c38d5a 100755
--- a/t/t3505-cherry-pick-empty.sh
+++ b/t/t3505-cherry-pick-empty.sh
@@ -2,6 +2,9 @@
 
 test_description='test cherry-picking an empty commit'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -17,7 +20,7 @@ test_expect_success setup '
 	test_tick &&
 	git commit --allow-empty-message -m "" &&
 
-	git checkout master &&
+	git checkout main &&
 	git checkout -b empty-change-branch &&
 	test_tick &&
 	git commit --allow-empty -m "empty"
@@ -25,7 +28,7 @@ test_expect_success setup '
 '
 
 test_expect_success 'cherry-pick an empty commit' '
-	git checkout master &&
+	git checkout main &&
 	test_expect_code 1 git cherry-pick empty-change-branch
 '
 
@@ -35,7 +38,7 @@ test_expect_success 'index lockfile was removed' '
 
 test_expect_success 'cherry-pick a commit with an empty message' '
 	test_when_finished "git reset --hard empty-message-branch~1" &&
-	git checkout master &&
+	git checkout main &&
 	git cherry-pick empty-message-branch
 '
 
@@ -44,12 +47,12 @@ test_expect_success 'index lockfile was removed' '
 '
 
 test_expect_success 'cherry-pick a commit with an empty message with --allow-empty-message' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git cherry-pick --allow-empty-message empty-message-branch
 '
 
 test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' '
-	git checkout master &&
+	git checkout main &&
 	echo fourth >>file2 &&
 	git add file2 &&
 	git commit -m "fourth" &&
@@ -57,22 +60,22 @@ test_expect_success 'cherry pick an empty non-ff commit without --allow-empty' '
 '
 
 test_expect_success 'cherry pick an empty non-ff commit with --allow-empty' '
-	git checkout master &&
+	git checkout main &&
 	git cherry-pick --allow-empty empty-change-branch
 '
 
 test_expect_success 'cherry pick with --keep-redundant-commits' '
-	git checkout master &&
+	git checkout main &&
 	git cherry-pick --keep-redundant-commits HEAD^
 '
 
 test_expect_success 'cherry-pick a commit that becomes no-op (prep)' '
-	git checkout master &&
+	git checkout main &&
 	git branch fork &&
 	echo foo >file2 &&
 	git add file2 &&
 	test_tick &&
-	git commit -m "add file2 on master" &&
+	git commit -m "add file2 on main" &&
 
 	git checkout fork &&
 	echo foo >file2 &&
@@ -84,15 +87,15 @@ test_expect_success 'cherry-pick a commit that becomes no-op (prep)' '
 test_expect_success 'cherry-pick a no-op without --keep-redundant' '
 	git reset --hard &&
 	git checkout fork^0 &&
-	test_must_fail git cherry-pick master
+	test_must_fail git cherry-pick main
 '
 
 test_expect_success 'cherry-pick a no-op with --keep-redundant' '
 	git reset --hard &&
 	git checkout fork^0 &&
-	git cherry-pick --keep-redundant-commits master &&
+	git cherry-pick --keep-redundant-commits main &&
 	git show -s --format=%s >actual &&
-	echo "add file2 on master" >expect &&
+	echo "add file2 on main" >expect &&
 	test_cmp expect actual
 '
 
diff --git a/t/t3506-cherry-pick-ff.sh b/t/t3506-cherry-pick-ff.sh
index 9d5adbc130..7e11bd4a4c 100755
--- a/t/t3506-cherry-pick-ff.sh
+++ b/t/t3506-cherry-pick-ff.sh
@@ -2,6 +2,9 @@
 
 test_description='test cherry-picking with --ff option'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -24,7 +27,7 @@ test_expect_success setup '
 '
 
 test_expect_success 'cherry-pick using --ff fast forwards' '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard first &&
 	test_tick &&
 	git cherry-pick --ff second &&
@@ -32,7 +35,7 @@ test_expect_success 'cherry-pick using --ff fast forwards' '
 '
 
 test_expect_success 'cherry-pick not using --ff does not fast forwards' '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard first &&
 	test_tick &&
 	git cherry-pick second &&
@@ -49,7 +52,7 @@ test_expect_success 'cherry-pick not using --ff does not fast forwards' '
 # (This has been taken from t3502-cherry-pick-merge.sh)
 #
 test_expect_success 'merge setup' '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard first &&
 	echo new line >A &&
 	git add A &&
@@ -62,7 +65,7 @@ test_expect_success 'merge setup' '
 	test_tick &&
 	git commit -m "add line to B" B &&
 	git tag B &&
-	git checkout master &&
+	git checkout main &&
 	git merge side &&
 	git tag C &&
 	git checkout -b new A
diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 9b9b4ca8d4..979e843c65 100755
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -9,6 +9,9 @@ test_description='test cherry-pick and revert with conflicts
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 pristine_detach () {
@@ -29,7 +32,7 @@ test_expect_success setup '
 	test_commit redundant-pick foo c redundant &&
 	git commit --allow-empty --allow-empty-message &&
 	git tag empty &&
-	git checkout master &&
+	git checkout main &&
 	git config advice.detachedhead false
 
 '
@@ -44,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_i18ncmp expected actual
-"
+	test_cmp expected actual
+'
 
 test_expect_success 'advice from failed cherry-pick --no-commit' "
 	pristine_detach initial &&
@@ -70,7 +76,7 @@ test_expect_success 'advice from failed cherry-pick --no-commit' "
 	EOF
 	test_must_fail git cherry-pick --no-commit picked 2>actual &&
 
-	test_i18ncmp expected actual
+	test_cmp expected actual
 "
 
 test_expect_success 'failed cherry-pick sets CHERRY_PICK_HEAD' '
@@ -161,6 +167,29 @@ test_expect_success 'successful commit clears CHERRY_PICK_HEAD' '
 
 	test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 '
+
+test_expect_success 'partial commit of cherry-pick fails' '
+	pristine_detach initial &&
+
+	test_must_fail git cherry-pick picked &&
+	echo resolved >foo &&
+	git add foo &&
+	test_must_fail git commit foo 2>err &&
+
+	test_i18ngrep "cannot do a partial commit during a cherry-pick." err
+'
+
+test_expect_success 'commit --amend of cherry-pick fails' '
+	pristine_detach initial &&
+
+	test_must_fail git cherry-pick picked &&
+	echo resolved >foo &&
+	git add foo &&
+	test_must_fail git commit --amend 2>err &&
+
+	test_i18ngrep "in the middle of a cherry-pick -- cannot amend." err
+'
+
 test_expect_success 'successful final commit clears cherry-pick state' '
 	pristine_detach initial &&
 
@@ -168,7 +197,7 @@ test_expect_success 'successful final commit clears cherry-pick state' '
 	echo resolved >foo &&
 	test_path_is_file .git/sequencer/todo &&
 	git commit -a &&
-	test_must_fail test_path_exists .git/sequencer
+	test_path_is_missing .git/sequencer
 '
 
 test_expect_success 'reset after final pick clears cherry-pick state' '
@@ -178,7 +207,7 @@ test_expect_success 'reset after final pick clears cherry-pick state' '
 	echo resolved >foo &&
 	test_path_is_file .git/sequencer/todo &&
 	git reset &&
-	test_must_fail test_path_exists .git/sequencer
+	test_path_is_missing .git/sequencer
 '
 
 test_expect_success 'failed cherry-pick produces dirty index' '
@@ -230,7 +259,7 @@ test_expect_success \
 
 	test_must_fail git cherry-pick picked &&
 
-	test_i18ncmp expected .git/MERGE_MSG
+	test_cmp expected .git/MERGE_MSG
 '
 
 test_expect_success \
@@ -250,7 +279,7 @@ test_expect_success \
 
 	test_must_fail git cherry-pick --cleanup=scissors picked &&
 
-	test_i18ncmp expected .git/MERGE_MSG
+	test_cmp expected .git/MERGE_MSG
 '
 
 test_expect_success 'failed cherry-pick describes conflict in work tree' '
@@ -260,12 +289,12 @@ test_expect_success 'failed cherry-pick describes conflict in work tree' '
 	a
 	=======
 	c
-	>>>>>>> objid picked
+	>>>>>>> objid (picked)
 	EOF
 
 	test_must_fail git cherry-pick picked &&
 
-	sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
 	test_cmp expected actual
 '
 
@@ -275,16 +304,16 @@ test_expect_success 'diff3 -m style' '
 	cat <<-EOF >expected &&
 	<<<<<<< HEAD
 	a
-	||||||| parent of objid picked
+	||||||| parent of objid (picked)
 	b
 	=======
 	c
-	>>>>>>> objid picked
+	>>>>>>> objid (picked)
 	EOF
 
 	test_must_fail git cherry-pick picked &&
 
-	sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
 	test_cmp expected actual
 '
 
@@ -296,7 +325,7 @@ test_expect_success 'revert also handles conflicts sanely' '
 	a
 	=======
 	b
-	>>>>>>> parent of objid picked
+	>>>>>>> parent of objid (picked)
 	EOF
 	{
 		git checkout picked -- foo &&
@@ -322,7 +351,7 @@ test_expect_success 'revert also handles conflicts sanely' '
 	test_must_fail git update-index --refresh -q &&
 	test_must_fail git diff-index --exit-code HEAD &&
 	test_cmp expected-stages actual-stages &&
-	sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
 	test_cmp expected actual
 '
 
@@ -381,23 +410,23 @@ test_expect_success 'failed commit does not clear REVERT_HEAD' '
 '
 
 test_expect_success 'successful final commit clears revert state' '
-       pristine_detach picked-signed &&
+	pristine_detach picked-signed &&
 
-       test_must_fail git revert picked-signed base &&
-       echo resolved >foo &&
-       test_path_is_file .git/sequencer/todo &&
-       git commit -a &&
-       test_must_fail test_path_exists .git/sequencer
+	test_must_fail git revert picked-signed base &&
+	echo resolved >foo &&
+	test_path_is_file .git/sequencer/todo &&
+	git commit -a &&
+	test_path_is_missing .git/sequencer
 '
 
 test_expect_success 'reset after final pick clears revert state' '
-       pristine_detach picked-signed &&
+	pristine_detach picked-signed &&
 
-       test_must_fail git revert picked-signed base &&
-       echo resolved >foo &&
-       test_path_is_file .git/sequencer/todo &&
-       git reset &&
-       test_must_fail test_path_exists .git/sequencer
+	test_must_fail git revert picked-signed base &&
+	echo resolved >foo &&
+	test_path_is_file .git/sequencer/todo &&
+	git reset &&
+	test_path_is_missing .git/sequencer
 '
 
 test_expect_success 'revert conflict, diff3 -m style' '
@@ -406,16 +435,16 @@ test_expect_success 'revert conflict, diff3 -m style' '
 	cat <<-EOF >expected &&
 	<<<<<<< HEAD
 	a
-	||||||| objid picked
+	||||||| objid (picked)
 	c
 	=======
 	b
-	>>>>>>> parent of objid picked
+	>>>>>>> parent of objid (picked)
 	EOF
 
 	test_must_fail git revert picked &&
 
-	sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&
+	sed "s/[a-f0-9]* (/objid (/" foo >actual &&
 	test_cmp expected actual
 '
 
@@ -439,7 +468,7 @@ test_expect_success \
 	test_must_fail git revert picked &&
 
 	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success \
@@ -462,7 +491,7 @@ test_expect_success \
 	test_must_fail git revert --cleanup=scissors picked &&
 
 	sed "s/$OID_REGEX/OBJID/" .git/MERGE_MSG >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'failed cherry-pick does not forget -s' '
@@ -489,7 +518,7 @@ test_expect_success 'commit after failed cherry-pick adds -s at the right place'
 	Signed-off-by: C O Mitter <committer@example.com>
 	# Conflicts:
 	EOF
-	grep -e "^# Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual &&
+	grep -e "^# Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual &&
 	test_cmp expect actual &&
 
 	cat <<-\EOF >expected &&
@@ -518,7 +547,7 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' '
 	Signed-off-by: C O Mitter <committer@example.com>
 	Conflicts:
 	EOF
-	grep -e "^Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual &&
+	grep -e "^Conflicts:" -e "^Signed-off-by" .git/COMMIT_EDITMSG >actual &&
 	test_cmp expect actual
 '
 
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh
index b457333e18..e8375d1c97 100755
--- a/t/t3508-cherry-pick-many-commits.sh
+++ b/t/t3508-cherry-pick-many-commits.sh
@@ -2,10 +2,13 @@
 
 test_description='test cherry-picking many commits'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_head_differs_from() {
-	! test_cmp_rev HEAD "$1"
+	test_cmp_rev ! HEAD "$1"
 }
 
 check_head_equals() {
@@ -31,7 +34,7 @@ test_expect_success setup '
 '
 
 test_expect_success 'cherry-pick first..fourth works' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard first &&
 	test_tick &&
 	git cherry-pick first..fourth &&
@@ -45,7 +48,7 @@ test_expect_success 'cherry-pick three one two works' '
 	test_commit one &&
 	test_commit two &&
 	test_commit three &&
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard first &&
 	git cherry-pick three one two &&
 	git diff --quiet three &&
@@ -56,38 +59,38 @@ two"
 '
 
 test_expect_success 'cherry-pick three one two: fails' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard first &&
 	test_must_fail git cherry-pick three one two:
 '
 
 test_expect_success 'output to keep user entertained during multi-pick' '
 	cat <<-\EOF >expected &&
-	[master OBJID] second
+	[main OBJID] second
 	 Author: A U Thor <author@example.com>
 	 Date: Thu Apr 7 15:14:13 2005 -0700
 	 1 file changed, 1 insertion(+)
-	[master OBJID] third
+	[main OBJID] third
 	 Author: A U Thor <author@example.com>
 	 Date: Thu Apr 7 15:15:13 2005 -0700
 	 1 file changed, 1 insertion(+)
-	[master OBJID] fourth
+	[main OBJID] fourth
 	 Author: A U Thor <author@example.com>
 	 Date: Thu Apr 7 15:16:13 2005 -0700
 	 1 file changed, 1 insertion(+)
 	EOF
 
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard first &&
 	test_tick &&
 	git cherry-pick first..fourth >actual &&
 	sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
 	test_line_count -ge 3 actual.fuzzy &&
-	test_i18ncmp expected actual.fuzzy
+	test_cmp expected actual.fuzzy
 '
 
 test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard first &&
 	test_tick &&
 	git cherry-pick --strategy resolve first..fourth &&
@@ -99,32 +102,32 @@ test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
 test_expect_success 'output during multi-pick indicates merge strategy' '
 	cat <<-\EOF >expected &&
 	Trying simple merge.
-	[master OBJID] second
+	[main OBJID] second
 	 Author: A U Thor <author@example.com>
 	 Date: Thu Apr 7 15:14:13 2005 -0700
 	 1 file changed, 1 insertion(+)
 	Trying simple merge.
-	[master OBJID] third
+	[main OBJID] third
 	 Author: A U Thor <author@example.com>
 	 Date: Thu Apr 7 15:15:13 2005 -0700
 	 1 file changed, 1 insertion(+)
 	Trying simple merge.
-	[master OBJID] fourth
+	[main OBJID] fourth
 	 Author: A U Thor <author@example.com>
 	 Date: Thu Apr 7 15:16:13 2005 -0700
 	 1 file changed, 1 insertion(+)
 	EOF
 
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard first &&
 	test_tick &&
 	git cherry-pick --strategy resolve first..fourth >actual &&
 	sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
-	test_i18ncmp expected actual.fuzzy
+	test_cmp expected actual.fuzzy
 '
 
 test_expect_success 'cherry-pick --ff first..fourth works' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard first &&
 	test_tick &&
 	git cherry-pick --ff first..fourth &&
@@ -134,7 +137,7 @@ test_expect_success 'cherry-pick --ff first..fourth works' '
 '
 
 test_expect_success 'cherry-pick -n first..fourth works' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard first &&
 	test_tick &&
 	git cherry-pick -n first..fourth &&
@@ -144,7 +147,7 @@ test_expect_success 'cherry-pick -n first..fourth works' '
 '
 
 test_expect_success 'revert first..fourth works' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard fourth &&
 	test_tick &&
 	git revert first..fourth &&
@@ -154,7 +157,7 @@ test_expect_success 'revert first..fourth works' '
 '
 
 test_expect_success 'revert ^first fourth works' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard fourth &&
 	test_tick &&
 	git revert ^first fourth &&
@@ -164,7 +167,7 @@ test_expect_success 'revert ^first fourth works' '
 '
 
 test_expect_success 'revert fourth fourth~1 fourth~2 works' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard fourth &&
 	test_tick &&
 	git revert fourth fourth~1 fourth~2 &&
@@ -174,7 +177,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' '
 '
 
 test_expect_success 'cherry-pick -3 fourth works' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard first &&
 	test_tick &&
 	git cherry-pick -3 fourth &&
@@ -184,7 +187,7 @@ test_expect_success 'cherry-pick -3 fourth works' '
 '
 
 test_expect_success 'cherry-pick --stdin works' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard first &&
 	test_tick &&
 	git rev-list --reverse first..fourth | git cherry-pick --stdin &&
diff --git a/t/t3509-cherry-pick-merge-df.sh b/t/t3509-cherry-pick-merge-df.sh
index 1e5b3948df..f4159246e1 100755
--- a/t/t3509-cherry-pick-merge-df.sh
+++ b/t/t3509-cherry-pick-merge-df.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Test cherry-pick with directory/file conflicts'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'Initialize repository' '
@@ -28,7 +31,7 @@ test_expect_success 'Setup rename across paths each below D/F conflicts' '
 
 test_expect_success 'Cherry-pick succeeds with rename across D/F conflicts' '
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	git cherry-pick branch
 '
 
diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh
index 793bcc7fe3..49010aa946 100755
--- a/t/t3510-cherry-pick-sequence.sh
+++ b/t/t3510-cherry-pick-sequence.sh
@@ -65,7 +65,7 @@ test_expect_success 'cherry-pick persists opts correctly' '
 	# gets interrupted, use a high-enough number that is larger
 	# than the number of parents of any commit we have created
 	mainline=4 &&
-	test_expect_code 128 git cherry-pick -s -m $mainline --strategy=recursive -X patience -X ours initial..anotherpick &&
+	test_expect_code 128 git cherry-pick -s -m $mainline --strategy=recursive -X patience -X ours --edit initial..anotherpick &&
 	test_path_is_dir .git/sequencer &&
 	test_path_is_file .git/sequencer/head &&
 	test_path_is_file .git/sequencer/todo &&
@@ -84,6 +84,36 @@ test_expect_success 'cherry-pick persists opts correctly' '
 	ours
 	EOF
 	git config --file=.git/sequencer/opts --get-all options.strategy-option >actual &&
+	test_cmp expect actual &&
+	echo "true" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.edit >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'revert persists opts correctly' '
+	pristine_detach initial &&
+	# to make sure that the session to revert a sequence
+	# gets interrupted, revert commits that are not in the history
+	# of HEAD.
+	test_expect_code 1 git revert -s --strategy=recursive -X patience -X ours --no-edit picked yetanotherpick &&
+	test_path_is_dir .git/sequencer &&
+	test_path_is_file .git/sequencer/head &&
+	test_path_is_file .git/sequencer/todo &&
+	test_path_is_file .git/sequencer/opts &&
+	echo "true" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.signoff >actual &&
+	test_cmp expect actual &&
+	echo "recursive" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.strategy >actual &&
+	test_cmp expect actual &&
+	cat >expect <<-\EOF &&
+	patience
+	ours
+	EOF
+	git config --file=.git/sequencer/opts --get-all options.strategy-option >actual &&
+	test_cmp expect actual &&
+	echo "false" >expect &&
+	git config --file=.git/sequencer/opts --get-all options.edit >actual &&
 	test_cmp expect actual
 '
 
@@ -123,7 +153,8 @@ test_expect_success 'revert --skip to skip commit' '
 test_expect_success 'skip "empty" commit' '
 	pristine_detach picked &&
 	test_commit dummy foo d &&
-	test_must_fail git cherry-pick anotherpick &&
+	test_must_fail git cherry-pick anotherpick 2>err &&
+	test_i18ngrep "git cherry-pick --skip" err &&
 	git cherry-pick --skip &&
 	test_cmp_rev dummy HEAD
 '
@@ -169,7 +200,7 @@ test_expect_success 'check advice when we move HEAD by committing' '
 	git commit -a &&
 	test_path_is_missing .git/CHERRY_PICK_HEAD &&
 	test_must_fail git cherry-pick --skip 2>advice &&
-	test_i18ncmp expect advice
+	test_cmp expect advice
 '
 
 test_expect_success 'selectively advise --skip while launching another sequence' '
@@ -181,7 +212,7 @@ test_expect_success 'selectively advise --skip while launching another sequence'
 	EOF
 	test_must_fail git cherry-pick picked..yetanotherpick &&
 	test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
-	test_i18ncmp expect advice &&
+	test_cmp expect advice &&
 	cat >expect <<-EOF &&
 	error: cherry-pick is already in progress
 	hint: try "git cherry-pick (--continue | --abort | --quit)"
@@ -189,7 +220,7 @@ test_expect_success 'selectively advise --skip while launching another sequence'
 	EOF
 	git reset --merge &&
 	test_must_fail git cherry-pick picked..yetanotherpick 2>advice &&
-	test_i18ncmp expect advice
+	test_cmp expect advice
 '
 
 test_expect_success 'allow skipping commit but not abort for a new history' '
@@ -203,7 +234,7 @@ test_expect_success 'allow skipping commit but not abort for a new history' '
 	test_must_fail git cherry-pick anotherpick &&
 	test_must_fail git cherry-pick --abort 2>advice &&
 	git cherry-pick --skip &&
-	test_i18ncmp expect advice
+	test_cmp expect advice
 '
 
 test_expect_success 'allow skipping stopped cherry-pick because of untracked file modifications' '
diff --git a/t/t3512-cherry-pick-submodule.sh b/t/t3512-cherry-pick-submodule.sh
index bd78287841..c657840db3 100755
--- a/t/t3512-cherry-pick-submodule.sh
+++ b/t/t3512-cherry-pick-submodule.sh
@@ -2,12 +2,18 @@
 
 test_description='cherry-pick can handle submodules'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
 
-KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
-KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
-test_submodule_switch "git cherry-pick"
+if test "$GIT_TEST_MERGE_ALGORITHM" != ort
+then
+	KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
+	KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
+fi
+test_submodule_switch "cherry-pick"
 
 test_expect_success 'unrelated submodule/file conflict is ignored' '
 	test_create_repo sub &&
@@ -35,7 +41,7 @@ test_expect_success 'unrelated submodule/file conflict is ignored' '
 		git add a_file &&
 		git commit -m "modify a file" &&
 
-		git checkout master &&
+		git checkout main &&
 
 		git submodule add ../sub sub &&
 		git submodule update sub &&
diff --git a/t/t3513-revert-submodule.sh b/t/t3513-revert-submodule.sh
index 5e39fcdb66..8bfe3ed246 100755
--- a/t/t3513-revert-submodule.sh
+++ b/t/t3513-revert-submodule.sh
@@ -14,18 +14,26 @@ test_description='revert can handle submodules'
 git_revert () {
 	git status -su >expect &&
 	ls -1pR * >>expect &&
-	tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
-	git checkout "$1" &&
+	"$TAR" cf "$TRASH_DIRECTORY/tmp.tar" * &&
+	may_only_be_test_must_fail "$2" &&
+	$2 git checkout "$1" &&
+	if test -n "$2"
+	then
+		return
+	fi &&
 	git revert HEAD &&
 	rm -rf * &&
-	tar xf "$TRASH_DIRECTORY/tmp.tar" &&
+	"$TAR" xf "$TRASH_DIRECTORY/tmp.tar" &&
 	git status -su >actual &&
 	ls -1pR * >>actual &&
 	test_cmp expect actual &&
 	git revert HEAD
 }
 
-KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
-test_submodule_switch "git_revert"
+if test "$GIT_TEST_MERGE_ALGORITHM" != ort
+then
+	KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
+fi
+test_submodule_switch_func "git_revert"
 
 test_done
diff --git a/t/t3514-cherry-pick-revert-gpg.sh b/t/t3514-cherry-pick-revert-gpg.sh
new file mode 100755
index 0000000000..5b2e250eaa
--- /dev/null
+++ b/t/t3514-cherry-pick-revert-gpg.sh
@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# Copyright (c) 2020 Doan Tran Cong Danh
+#
+
+test_description='test {cherry-pick,revert} --[no-]gpg-sign'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-gpg.sh"
+
+if ! test_have_prereq GPG
+then
+	skip_all='skip all test {cherry-pick,revert} --[no-]gpg-sign, gpg not available'
+	test_done
+fi
+
+test_gpg_sign () {
+	local must_fail= will=will fake_editor=
+	if test "x$1" = "x!"
+	then
+		must_fail=test_must_fail
+		will="won't"
+		shift
+	fi
+	conf=$1
+	cmd=$2
+	cmit=$3
+	shift 3
+	test_expect_success "$cmd $* $cmit with commit.gpgsign=$conf $will sign commit" "
+		git reset --hard tip &&
+		git config commit.gpgsign $conf &&
+		git $cmd $* $cmit &&
+		git rev-list tip.. >rev-list &&
+		$must_fail git verify-commit \$(cat rev-list)
+	"
+}
+
+test_expect_success 'setup' '
+	test_commit one &&
+	git switch -c side &&
+	test_commit side1 &&
+	test_commit side2 &&
+	git switch - &&
+	test_commit two &&
+	test_commit three &&
+	test_commit tip
+'
+
+test_gpg_sign ! false cherry-pick   side
+test_gpg_sign ! false cherry-pick ..side
+test_gpg_sign   true  cherry-pick   side
+test_gpg_sign   true  cherry-pick ..side
+test_gpg_sign ! true  cherry-pick   side --no-gpg-sign
+test_gpg_sign ! true  cherry-pick ..side --no-gpg-sign
+test_gpg_sign ! true  cherry-pick   side --gpg-sign --no-gpg-sign
+test_gpg_sign ! true  cherry-pick ..side --gpg-sign --no-gpg-sign
+test_gpg_sign   false cherry-pick   side --no-gpg-sign --gpg-sign
+test_gpg_sign   false cherry-pick ..side --no-gpg-sign --gpg-sign
+test_gpg_sign   true  cherry-pick   side --edit
+test_gpg_sign   true  cherry-pick ..side --edit
+test_gpg_sign ! true  cherry-pick   side --edit --no-gpg-sign
+test_gpg_sign ! true  cherry-pick ..side --edit --no-gpg-sign
+test_gpg_sign ! true  cherry-pick   side --edit --gpg-sign --no-gpg-sign
+test_gpg_sign ! true  cherry-pick ..side --edit --gpg-sign --no-gpg-sign
+test_gpg_sign   false cherry-pick   side --edit --no-gpg-sign --gpg-sign
+test_gpg_sign   false cherry-pick ..side --edit --no-gpg-sign --gpg-sign
+
+test_gpg_sign ! false revert HEAD  --edit
+test_gpg_sign ! false revert two.. --edit
+test_gpg_sign   true  revert HEAD  --edit
+test_gpg_sign   true  revert two.. --edit
+test_gpg_sign ! true  revert HEAD  --edit --no-gpg-sign
+test_gpg_sign ! true  revert two.. --edit --no-gpg-sign
+test_gpg_sign ! true  revert HEAD  --edit --gpg-sign --no-gpg-sign
+test_gpg_sign ! true  revert two.. --edit --gpg-sign --no-gpg-sign
+test_gpg_sign   false revert HEAD  --edit --no-gpg-sign --gpg-sign
+test_gpg_sign   false revert two.. --edit --no-gpg-sign --gpg-sign
+test_gpg_sign   true  revert HEAD  --no-edit
+test_gpg_sign   true  revert two.. --no-edit
+test_gpg_sign ! true  revert HEAD  --no-edit --no-gpg-sign
+test_gpg_sign ! true  revert two.. --no-edit --no-gpg-sign
+test_gpg_sign ! true  revert HEAD  --no-edit --gpg-sign --no-gpg-sign
+test_gpg_sign ! true  revert two.. --no-edit --gpg-sign --no-gpg-sign
+test_gpg_sign   false revert HEAD  --no-edit --no-gpg-sign --gpg-sign
+
+test_done
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 8c8cca5bfb..bb9ef35dac 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -5,6 +5,9 @@
 
 test_description='Test of the various options to git rm.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Setup some files to be removed, some with funny characters
@@ -113,9 +116,10 @@ test_expect_success '"rm" command printed' '
 	echo frotz >test-file &&
 	git add test-file &&
 	git commit -m "add file for rm test" &&
-	git rm test-file >rm-output &&
-	test $(grep "^rm " rm-output | wc -l) = 1 &&
-	rm -f test-file rm-output &&
+	git rm test-file >rm-output.raw &&
+	grep "^rm " rm-output.raw >rm-output &&
+	test_line_count = 1 rm-output &&
+	rm -f test-file rm-output.raw rm-output &&
 	git commit -m "remove file from rm test"
 '
 
@@ -239,8 +243,7 @@ test_expect_success 'refresh index before checking if it is up-to-date' '
 	test_path_is_missing frotz/nitfol
 '
 
-test_expect_success 'choking "git rm" should not let it die with cruft' '
-	test_oid_init &&
+choke_git_rm_setup() {
 	git reset -q --hard &&
 	test_when_finished "rm -f .git/index.lock && git reset -q --hard" &&
 	i=0 &&
@@ -249,11 +252,24 @@ test_expect_success 'choking "git rm" should not let it die with cruft' '
 	do
 		echo "100644 $hash 0	some-file-$i"
 		i=$(( $i + 1 ))
-	done | git update-index --index-info &&
+	done | git update-index --index-info
+}
+
+test_expect_success 'choking "git rm" should not let it die with cruft (induce SIGPIPE)' '
+	choke_git_rm_setup &&
+	# git command is intentionally placed upstream of pipe to induce SIGPIPE
 	git rm -n "some-file-*" | : &&
 	test_path_is_missing .git/index.lock
 '
 
+
+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 ) &&
+	test_match_signal 13 "$OUT" &&
+	test_path_is_missing .git/index.lock
+'
+
 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" &&
@@ -303,7 +319,8 @@ EOF
 
 test_expect_success 'rm removes empty submodules from work tree' '
 	mkdir submod &&
-	git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) submod &&
+	hash=$(git rev-parse HEAD) &&
+	git update-index --add --cacheinfo 160000 "$hash" submod &&
 	git config -f .gitmodules submodule.sub.url ./. &&
 	git config -f .gitmodules submodule.sub.path submod &&
 	git submodule init &&
@@ -422,6 +439,13 @@ test_expect_success 'rm will error out on a modified .gitmodules file unless sta
 	git status -s -uno >actual &&
 	test_cmp expect actual
 '
+test_expect_success 'rm will not error out on .gitmodules file with zero stat data' '
+	git reset --hard &&
+	git submodule update &&
+	git read-tree HEAD &&
+	git rm submod &&
+	test_path_is_missing submod
+'
 
 test_expect_success 'rm issues a warning when section is not found in .gitmodules' '
 	git reset --hard &&
@@ -430,7 +454,7 @@ test_expect_success 'rm issues a warning when section is not found in .gitmodule
 	git add .gitmodules &&
 	echo "warning: Could not find section in .gitmodules where path=submod" >expect.err &&
 	git rm submod >actual 2>actual.err &&
-	test_i18ncmp expect.err actual.err &&
+	test_cmp expect.err actual.err &&
 	test_path_is_missing submod &&
 	test_path_is_missing submod/.git &&
 	git status -s -uno >actual &&
@@ -474,16 +498,16 @@ test_expect_success 'setup submodule conflict' '
 	echo 1 >nitfol &&
 	git add nitfol &&
 	git commit -m "added nitfol 1" &&
-	git checkout -b branch2 master &&
+	git checkout -b branch2 main &&
 	echo 2 >nitfol &&
 	git add nitfol &&
 	git commit -m "added nitfol 2" &&
-	git checkout -b conflict1 master &&
+	git checkout -b conflict1 main &&
 	git -C submod fetch &&
 	git -C submod checkout branch1 &&
 	git add submod &&
 	git commit -m "submod 1" &&
-	git checkout -b conflict2 master &&
+	git checkout -b conflict2 main &&
 	git -C submod checkout branch2 &&
 	git add submod &&
 	git commit -m "submod 2"
@@ -595,7 +619,7 @@ test_expect_success 'rm of a conflicted unpopulated submodule succeeds' '
 '
 
 test_expect_success 'rm of a populated submodule with a .git directory migrates git dir' '
-	git checkout -f master &&
+	git checkout -f main &&
 	git reset --hard &&
 	git submodule update &&
 	(
@@ -622,7 +646,8 @@ test_expect_success 'setup subsubmodule' '
 	git submodule update &&
 	(
 		cd submod &&
-		git update-index --add --cacheinfo 160000 $(git rev-parse HEAD) subsubmod &&
+		hash=$(git rev-parse HEAD) &&
+		git update-index --add --cacheinfo 160000 "$hash" subsubmod &&
 		git config -f .gitmodules submodule.sub.url ../. &&
 		git config -f .gitmodules submodule.sub.path subsubmod &&
 		git submodule init &&
@@ -707,7 +732,7 @@ test_expect_success 'checking out a commit after submodule removal needs manual
 	git checkout HEAD^ &&
 	git submodule update &&
 	git checkout -q HEAD^ &&
-	git checkout -q master 2>actual &&
+	git checkout -q main 2>actual &&
 	test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual &&
 	git status -s submod >actual &&
 	echo "?? submod/" >expected &&
@@ -799,7 +824,7 @@ test_expect_success 'rm files with different staged content' '
 	echo content1 >foo.txt &&
 	echo content1 >bar.txt &&
 	test_must_fail git rm foo.txt bar.txt 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'rm files with different staged content without hints' '
@@ -812,7 +837,7 @@ test_expect_success 'rm files with different staged content without hints' '
 	echo content2 >foo.txt &&
 	echo content2 >bar.txt &&
 	test_must_fail git -c advice.rmhints=false rm foo.txt bar.txt 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'rm file with local modification' '
@@ -824,7 +849,7 @@ test_expect_success 'rm file with local modification' '
 	git commit -m "testing rm 3" &&
 	echo content3 >foo.txt &&
 	test_must_fail git rm foo.txt 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'rm file with local modification without hints' '
@@ -834,7 +859,7 @@ test_expect_success 'rm file with local modification without hints' '
 	EOF
 	echo content4 >bar.txt &&
 	test_must_fail git -c advice.rmhints=false rm bar.txt 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'rm file with changes in the index' '
@@ -847,7 +872,7 @@ test_expect_success 'rm file with changes in the index' '
 	echo content5 >foo.txt &&
 	git add foo.txt &&
 	test_must_fail git rm foo.txt 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'rm file with changes in the index without hints' '
@@ -856,7 +881,7 @@ test_expect_success 'rm file with changes in the index without hints' '
 	    foo.txt
 	EOF
 	test_must_fail git -c advice.rmhints=false rm foo.txt 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'rm files with two different errors' '
@@ -875,7 +900,7 @@ test_expect_success 'rm files with two different errors' '
 	echo content6 >bar1.txt &&
 	git add bar1.txt &&
 	test_must_fail git rm bar1.txt foo1.txt 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'rm empty string should fail' '
diff --git a/t/t3601-rm-pathspec-file.sh b/t/t3601-rm-pathspec-file.sh
new file mode 100755
index 0000000000..7de21f8bcf
--- /dev/null
+++ b/t/t3601-rm-pathspec-file.sh
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+test_description='rm --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "files" &&
+
+	git tag checkpoint
+'
+
+restore_checkpoint () {
+	git reset --hard checkpoint
+}
+
+verify_expect () {
+	git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success 'simplest' '
+	restore_checkpoint &&
+
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	EOF
+
+	echo fileA.t | git rm --pathspec-from-file=- &&
+	verify_expect
+'
+
+test_expect_success '--pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	D  fileB.t
+	EOF
+
+	printf "fileA.t\0fileB.t\0" | git rm --pathspec-from-file=- --pathspec-file-nul &&
+	verify_expect
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	cat >expect <<-\EOF &&
+	D  fileB.t
+	D  fileC.t
+	EOF
+
+	printf "fileB.t\nfileC.t\n" | git rm --pathspec-from-file=- &&
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	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_must_fail git rm --pathspec-file-nul 2>err &&
+	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err &&
+
+	>empty_list &&
+	test_must_fail git rm --pathspec-from-file=empty_list 2>err &&
+	test_i18ngrep -e "No pathspec was given. Which files should I remove?" err
+'
+
+test_done
diff --git a/t/t3602-rm-sparse-checkout.sh b/t/t3602-rm-sparse-checkout.sh
new file mode 100755
index 0000000000..e9e9a15c74
--- /dev/null
+++ b/t/t3602-rm-sparse-checkout.sh
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+test_description='git rm in sparse checked out working trees'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' "
+	mkdir -p sub/dir &&
+	touch a b c sub/d sub/dir/e &&
+	git add -A &&
+	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:
+	EOF
+
+	cat >sparse_hint <<-EOF &&
+	hint: Disable or modify the sparsity rules if you intend to update such entries.
+	hint: Disable this message with \"git config advice.updateSparsePath false\"
+	EOF
+
+	echo b | cat sparse_error_header - >sparse_entry_b_error &&
+	cat sparse_entry_b_error sparse_hint >b_error_and_hint
+"
+
+for opt in "" -f --dry-run
+do
+	test_expect_success "rm${opt:+ $opt} does not remove sparse entries" '
+		git sparse-checkout set a &&
+		test_must_fail git rm $opt b 2>stderr &&
+		test_cmp b_error_and_hint stderr &&
+		git ls-files --error-unmatch b
+	'
+done
+
+test_expect_success 'recursive rm does not remove sparse entries' '
+	git reset --hard &&
+	git sparse-checkout set sub/dir &&
+	git rm -r sub &&
+	git status --porcelain -uno >actual &&
+	echo "D  sub/dir/e" >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'rm obeys advice.updateSparsePath' '
+	git reset --hard &&
+	git sparse-checkout set a &&
+	test_must_fail git -c advice.updateSparsePath=false rm b 2>stderr &&
+	test_cmp sparse_entry_b_error stderr
+'
+
+test_expect_success 'do not advice about sparse entries when they do not match the pathspec' '
+	git reset --hard &&
+	git sparse-checkout set a &&
+	test_must_fail git rm nonexistent 2>stderr &&
+	grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
+	! grep -F -f sparse_error_header stderr
+'
+
+test_expect_success 'do not warn about sparse entries when pathspec matches dense entries' '
+	git reset --hard &&
+	git sparse-checkout set a &&
+	git rm "[ba]" 2>stderr &&
+	test_must_be_empty stderr &&
+	git ls-files --error-unmatch b &&
+	test_must_fail git ls-files --error-unmatch a
+'
+
+test_expect_success 'do not warn about sparse entries with --ignore-unmatch' '
+	git reset --hard &&
+	git sparse-checkout set a &&
+	git rm --ignore-unmatch b 2>stderr &&
+	test_must_be_empty stderr &&
+	git ls-files --error-unmatch b
+'
+
+test_done
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index c325167b90..4086e1ebbc 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -192,10 +192,16 @@ test_expect_success 'git add --refresh with pathspec' '
 	test_must_be_empty actual &&
 
 	git diff-files --name-only >actual &&
-	! grep bar actual&&
+	! grep bar actual &&
 	grep baz actual
 '
 
+test_expect_success 'git add --refresh correctly reports no match error' "
+	echo \"fatal: pathspec ':(icase)nonexistent' did not match any files\" >expect &&
+	test_must_fail git add --refresh ':(icase)nonexistent' 2>actual &&
+	test_cmp expect actual
+"
+
 test_expect_success POSIXPERM,SANITY 'git add should fail atomically upon an unreadable file' '
 	git reset --hard &&
 	date >foo1 &&
@@ -304,7 +310,7 @@ test_expect_success 'error on a repository with no commits' '
 	error: '"'empty/'"' does not have a commit checked out
 	fatal: adding files failed
 	EOF
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'git add --dry-run of existing changed file' "
@@ -320,13 +326,15 @@ test_expect_success 'git add --dry-run of non-existing file' "
 
 test_expect_success 'git add --dry-run of an existing file output' "
 	echo \"fatal: pathspec 'ignored-file' did not match any files\" >expect &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 "
 
 cat >expect.err <<\EOF
 The following paths are ignored by one of your .gitignore files:
 ignored-file
-Use -f if you really want to add them.
+hint: Use -f if you really want to add them.
+hint: Turn this message off by running
+hint: "git config advice.addIgnoredFile false"
 EOF
 cat >expect.out <<\EOF
 add 'track-this'
@@ -337,8 +345,12 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file' '
 '
 
 test_expect_success 'git add --dry-run --ignore-missing of non-existing file output' '
-	test_i18ncmp expect.out actual.out &&
-	test_i18ncmp expect.err actual.err
+	test_cmp expect.out actual.out &&
+	test_cmp expect.err actual.err
+'
+
+test_expect_success 'git add --dry-run --interactive should fail' '
+	test_must_fail git add --dry-run --interactive
 '
 
 test_expect_success 'git add empty string should fail' '
@@ -384,6 +396,36 @@ test_expect_success POSIXPERM 'git add --chmod=[+-]x does not change the working
 	! test -x foo4
 '
 
+test_expect_success 'git add --chmod fails with non regular files (but updates the other paths)' '
+	git reset --hard &&
+	test_ln_s_add foo foo3 &&
+	touch foo4 &&
+	test_must_fail git add --chmod=+x foo3 foo4 2>stderr &&
+	test_i18ngrep "cannot chmod +x .foo3." stderr &&
+	test_mode_in_index 120000 foo3 &&
+	test_mode_in_index 100755 foo4
+'
+
+test_expect_success 'git add --chmod honors --dry-run' '
+	git reset --hard &&
+	echo foo >foo4 &&
+	git add foo4 &&
+	git add --chmod=+x --dry-run foo4 &&
+	test_mode_in_index 100644 foo4
+'
+
+test_expect_success 'git add --chmod --dry-run reports error for non regular files' '
+	git reset --hard &&
+	test_ln_s_add foo foo4 &&
+	test_must_fail git add --chmod=+x --dry-run foo4 2>stderr &&
+	test_i18ngrep "cannot chmod +x .foo4." stderr
+'
+
+test_expect_success 'git add --chmod --dry-run reports error for unmatched pathspec' '
+	test_must_fail git add --chmod=+x --dry-run nonexistent 2>stderr &&
+	test_i18ngrep "pathspec .nonexistent. did not match any files" stderr
+'
+
 test_expect_success 'no file status change if no pathspec is given' '
 	>foo5 &&
 	>foo6 &&
@@ -407,11 +449,17 @@ test_expect_success 'no file status change if no pathspec is given in subdir' '
 '
 
 test_expect_success 'all statuses changed in folder if . is given' '
-	rm -fr empty &&
-	git add --chmod=+x . &&
-	test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
-	git add --chmod=-x . &&
-	test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
+	git init repo &&
+	(
+		cd repo &&
+		mkdir -p sub/dir &&
+		touch x y z sub/a sub/dir/b &&
+		git add -A &&
+		git add --chmod=+x . &&
+		test $(git ls-files --stage | grep ^100644 | wc -l) -eq 0 &&
+		git add --chmod=-x . &&
+		test $(git ls-files --stage | grep ^100755 | wc -l) -eq 0
+	)
 '
 
 test_expect_success CASE_INSENSITIVE_FS 'path is case-insensitive' '
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index d50e165ca8..207714655f 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='add -i basic tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
@@ -23,6 +26,26 @@ diff_cmp () {
 	test_cmp "$1.filtered" "$2.filtered"
 }
 
+# This function uses a trick to manipulate the interactive add to use color:
+# the `want_color()` function special-cases the situation where a pager was
+# spawned and Git now wants to output colored text: to detect that situation,
+# the environment variable `GIT_PAGER_IN_USE` is set. However, color is
+# suppressed despite that environment variable if the `TERM` variable
+# indicates a dumb terminal, so we set that variable, too.
+
+force_color () {
+	# The first element of $@ may be a shell function, as a result POSIX
+	# does not guarantee that "one-shot assignment" will not persist after
+	# the function call. Thus, we prevent these variables from escaping
+	# this function's context with this subshell.
+	(
+		GIT_PAGER_IN_USE=true &&
+		TERM=vt100 &&
+		export GIT_PAGER_IN_USE TERM &&
+		"$@"
+	)
+}
+
 test_expect_success 'setup (initial)' '
 	echo content >file &&
 	git add file &&
@@ -57,6 +80,15 @@ test_expect_success 'revert works (initial)' '
 	! grep . output
 '
 
+test_expect_success 'add untracked (multiple)' '
+	test_when_finished "git reset && rm [1-9]" &&
+	touch $(test_seq 9) &&
+	test_write_lines a "2-5 8-" | git add -i -- [1-9] &&
+	test_write_lines 2 3 4 5 8 9 >expected &&
+	git ls-files [1-9] >output &&
+	test_cmp expected output
+'
+
 test_expect_success 'setup (commit)' '
 	echo baseline >file &&
 	git add file &&
@@ -94,7 +126,6 @@ test_expect_success 'revert works (commit)' '
 	grep "unchanged *+3/-0 file" output
 '
 
-
 test_expect_success 'setup expected' '
 	cat >expected <<-\EOF
 	EOF
@@ -263,6 +294,35 @@ test_expect_success FILEMODE 'stage mode and hunk' '
 
 # end of tests disabled when filemode is not usable
 
+test_expect_success 'different prompts for mode change/deleted' '
+	git reset --hard &&
+	>file &&
+	>deleted &&
+	git add --chmod=+x file deleted &&
+	echo changed >file &&
+	rm deleted &&
+	test_write_lines n n n |
+	git -c core.filemode=true add -p >actual &&
+	sed -n "s/^\(([0-9/]*) Stage .*?\).*/\1/p" actual >actual.filtered &&
+	cat >expect <<-\EOF &&
+	(1/1) Stage deletion [y,n,q,a,d,?]?
+	(1/2) Stage mode change [y,n,q,a,d,j,J,g,/,?]?
+	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]?
+	EOF
+	test_cmp expect actual.filtered
+'
+
+test_expect_success 'correct message when there is nothing to do' '
+	git reset --hard &&
+	git add -p 2>err &&
+	test_i18ngrep "No changes" err &&
+	printf "\\0123" >binary &&
+	git add binary &&
+	printf "\\0abc" >binary &&
+	git add -p 2>err &&
+	test_i18ngrep "Only binary files changed" err
+'
+
 test_expect_success 'setup again' '
 	git reset --hard &&
 	test_chmod +x file &&
@@ -310,7 +370,7 @@ test_expect_success 'setup expected' '
 '
 
 # Test splitting the first patch, then adding both
-test_expect_success C_LOCALE_OUTPUT 'add first line works' '
+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 |
@@ -364,6 +424,25 @@ test_expect_success 'deleting an empty file' '
 	diff_cmp expected diff
 '
 
+test_expect_success 'adding an empty file' '
+	git init added &&
+	(
+		cd added &&
+		test_commit initial &&
+		>empty &&
+		git add empty &&
+		test_tick &&
+		git commit -m empty &&
+		git tag added-file &&
+		git reset --hard HEAD^ &&
+		test_path_is_missing empty &&
+
+		echo y | git checkout -p added-file -- >actual &&
+		test_path_is_file empty &&
+		test_i18ngrep "Apply addition to index and worktree" actual
+	)
+'
+
 test_expect_success 'split hunk setup' '
 	git reset --hard &&
 	test_write_lines 10 20 30 40 50 60 >test &&
@@ -374,6 +453,36 @@ test_expect_success 'split hunk setup' '
 	test_write_lines 10 15 20 21 22 23 24 30 40 50 60 >test
 '
 
+test_expect_success 'goto hunk' '
+	test_when_finished "git reset" &&
+	tr _ " " >expect <<-EOF &&
+	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? + 1:  -1,2 +1,3          +15
+	_ 2:  -2,4 +3,8          +21
+	go to which hunk? @@ -1,2 +1,3 @@
+	_10
+	+15
+	_20
+	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?_
+	EOF
+	test_write_lines s y g 1 | git add -p >actual &&
+	tail -n 7 <actual >actual.trimmed &&
+	test_cmp expect actual.trimmed
+'
+
+test_expect_success 'navigate to hunk via regex' '
+	test_when_finished "git reset" &&
+	tr _ " " >expect <<-EOF &&
+	(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? @@ -1,2 +1,3 @@
+	_10
+	+15
+	_20
+	(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]?_
+	EOF
+	test_write_lines s y /1,2 | git add -p >actual &&
+	tail -n 5 <actual >actual.trimmed &&
+	test_cmp expect actual.trimmed
+'
+
 test_expect_success 'split hunk "add -p (edit)"' '
 	# Split, say Edit and do nothing.  Then:
 	#
@@ -403,14 +512,48 @@ test_expect_failure 'split hunk "add -p (no, yes, edit)"' '
 	! grep "^+31" actual
 '
 
+test_expect_success 'split hunk with incomplete line at end' '
+	git reset --hard &&
+	printf "missing LF" >>test &&
+	git add test &&
+	test_write_lines before 10 20 30 40 50 60 70 >test &&
+	git grep --cached missing &&
+	test_write_lines s n y q | git add -p &&
+	test_must_fail git grep --cached missing &&
+	git grep before &&
+	test_must_fail git grep --cached before
+'
+
+test_expect_failure 'edit, adding lines to the first hunk' '
+	test_write_lines 10 11 20 30 40 50 51 60 >test &&
+	git reset &&
+	tr _ " " >patch <<-EOF &&
+	@@ -1,5 +1,6 @@
+	_10
+	+11
+	+12
+	_20
+	+21
+	+22
+	_30
+	EOF
+	# test sequence is s(plit), e(dit), n(o)
+	# q n q q is there to make sure we exit at the end.
+	printf "%s\n" s e n   q n q q |
+	EDITOR=./fake_editor.sh git add -p 2>error &&
+	test_must_be_empty error &&
+	git diff --cached >actual &&
+	grep "^+22" actual
+'
+
 test_expect_success 'patch mode ignores unmerged entries' '
 	git reset --hard &&
 	test_commit conflict &&
 	test_commit non-conflict &&
 	git checkout -b side &&
 	test_commit side conflict.t &&
-	git checkout master &&
-	test_commit master conflict.t &&
+	git checkout main &&
+	test_commit main conflict.t &&
 	test_must_fail git merge side &&
 	echo changed >non-conflict.t &&
 	echo y | git add -p >output &&
@@ -429,35 +572,153 @@ test_expect_success 'patch mode ignores unmerged entries' '
 	diff_cmp expected diff
 '
 
-test_expect_success TTY 'diffs can be colorized' '
+test_expect_success 'index is refreshed after applying patch' '
+	git reset --hard &&
+	echo content >test &&
+	printf y | git add -p &&
+	git diff-files --exit-code
+'
+
+test_expect_success 'diffs can be colorized' '
 	git reset --hard &&
 
 	echo content >test &&
-	printf y | test_terminal git add -p >output 2>&1 &&
+	printf y >y &&
+	force_color git add -p >output 2>&1 <y &&
+	git diff-files --exit-code &&
 
 	# We do not want to depend on the exact coloring scheme
 	# git uses for diffs, so just check that we saw some kind of color.
 	grep "$(printf "\\033")" output
 '
 
-test_expect_success TTY 'diffFilter filters diff' '
+test_expect_success 'colors can be overridden' '
+	git reset --hard &&
+	test_when_finished "git rm -f color-test" &&
+	test_write_lines context old more-context >color-test &&
+	git add color-test &&
+	test_write_lines context new more-context another-one >color-test &&
+
+	echo trigger an error message >input &&
+	force_color git \
+		-c color.interactive.error=blue \
+		add -i 2>err.raw <input &&
+	test_decode_color <err.raw >err &&
+	grep "<BLUE>Huh (trigger)?<RESET>" err &&
+
+	test_write_lines help quit >input &&
+	force_color git \
+		-c color.interactive.header=red \
+		-c color.interactive.help=green \
+		-c color.interactive.prompt=yellow \
+		add -i >actual.raw <input &&
+	test_decode_color <actual.raw >actual &&
+	cat >expect <<-\EOF &&
+	<RED>           staged     unstaged path<RESET>
+	  1:        +3/-0        +2/-1 color-test
+
+	<RED>*** Commands ***<RESET>
+	  1: <YELLOW>s<RESET>tatus	  2: <YELLOW>u<RESET>pdate	  3: <YELLOW>r<RESET>evert	  4: <YELLOW>a<RESET>dd untracked
+	  5: <YELLOW>p<RESET>atch	  6: <YELLOW>d<RESET>iff	  7: <YELLOW>q<RESET>uit	  8: <YELLOW>h<RESET>elp
+	<YELLOW>What now<RESET>> <GREEN>status        - show paths with changes<RESET>
+	<GREEN>update        - add working tree state to the staged set of changes<RESET>
+	<GREEN>revert        - revert staged set of changes back to the HEAD version<RESET>
+	<GREEN>patch         - pick hunks and update selectively<RESET>
+	<GREEN>diff          - view diff between HEAD and index<RESET>
+	<GREEN>add untracked - add contents of untracked files to the staged set of changes<RESET>
+	<RED>*** Commands ***<RESET>
+	  1: <YELLOW>s<RESET>tatus	  2: <YELLOW>u<RESET>pdate	  3: <YELLOW>r<RESET>evert	  4: <YELLOW>a<RESET>dd untracked
+	  5: <YELLOW>p<RESET>atch	  6: <YELLOW>d<RESET>iff	  7: <YELLOW>q<RESET>uit	  8: <YELLOW>h<RESET>elp
+	<YELLOW>What now<RESET>> Bye.
+	EOF
+	test_cmp expect actual &&
+
+	: exercise recolor_hunk by editing and then look at the hunk again &&
+	test_write_lines s e K q >input &&
+	force_color git \
+		-c color.interactive.prompt=yellow \
+		-c color.diff.meta=italic \
+		-c color.diff.frag=magenta \
+		-c color.diff.context=cyan \
+		-c color.diff.old=bold \
+		-c color.diff.new=blue \
+		-c core.editor=touch \
+		add -p >actual.raw <input &&
+	test_decode_color <actual.raw >actual.decoded &&
+	sed "s/index [0-9a-f]*\\.\\.[0-9a-f]* 100644/<INDEX-LINE>/" <actual.decoded >actual &&
+	cat >expect <<-\EOF &&
+	<ITALIC>diff --git a/color-test b/color-test<RESET>
+	<ITALIC><INDEX-LINE><RESET>
+	<ITALIC>--- a/color-test<RESET>
+	<ITALIC>+++ b/color-test<RESET>
+	<MAGENTA>@@ -1,3 +1,4 @@<RESET>
+	<CYAN> context<RESET>
+	<BOLD>-old<RESET>
+	<BLUE>+<RESET><BLUE>new<RESET>
+	<CYAN> more-context<RESET>
+	<BLUE>+<RESET><BLUE>another-one<RESET>
+	<YELLOW>(1/1) Stage this hunk [y,n,q,a,d,s,e,?]? <RESET><BOLD>Split into 2 hunks.<RESET>
+	<MAGENTA>@@ -1,3 +1,3 @@<RESET>
+	<CYAN> context<RESET>
+	<BOLD>-old<RESET>
+	<BLUE>+<RESET><BLUE>new<RESET>
+	<CYAN> more-context<RESET>
+	<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? <RESET><MAGENTA>@@ -3 +3,2 @@<RESET>
+	<CYAN> more-context<RESET>
+	<BLUE>+<RESET><BLUE>another-one<RESET>
+	<YELLOW>(2/2) Stage this hunk [y,n,q,a,d,K,g,/,e,?]? <RESET><MAGENTA>@@ -1,3 +1,3 @@<RESET>
+	<CYAN> context<RESET>
+	<BOLD>-old<RESET>
+	<BLUE>+new<RESET>
+	<CYAN> more-context<RESET>
+	<YELLOW>(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? <RESET>
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'colorized diffs respect diff.wsErrorHighlight' '
+	git reset --hard &&
+
+	echo "old " >test &&
+	git add test &&
+	echo "new " >test &&
+
+	printf y >y &&
+	force_color git -c diff.wsErrorHighlight=all add -p >output.raw 2>&1 <y &&
+	test_decode_color <output.raw >output &&
+	grep "old<" output
+'
+
+test_expect_success 'diffFilter filters diff' '
 	git reset --hard &&
 
 	echo content >test &&
 	test_config interactive.diffFilter "sed s/^/foo:/" &&
-	printf y | test_terminal git add -p >output 2>&1 &&
+	printf y >y &&
+	force_color git add -p >output 2>&1 <y &&
 
 	# avoid depending on the exact coloring or content of the prompts,
 	# and just make sure we saw our diff prefixed
 	grep foo:.*content output
 '
 
-test_expect_success TTY 'detect bogus diffFilter output' '
+test_expect_success 'detect bogus diffFilter output' '
 	git reset --hard &&
 
 	echo content >test &&
-	test_config interactive.diffFilter "echo too-short" &&
-	printf y | test_must_fail test_terminal git add -p
+	test_config interactive.diffFilter "sed 1d" &&
+	printf y >y &&
+	force_color test_must_fail git add -p <y
+'
+
+test_expect_success 'diff.algorithm is passed to `git diff-files`' '
+	git reset --hard &&
+
+	>file &&
+	git add file &&
+	echo changed >file &&
+	test_must_fail git -c diff.algorithm=bogus add -p 2>err &&
+	test_i18ngrep "error: option diff-algorithm accepts " err
 '
 
 test_expect_success 'patch-mode via -i prompts for files' '
@@ -591,6 +852,12 @@ test_expect_success 'setup different kinds of dirty submodules' '
 	cat >expected <<-\EOF &&
 	dirty-both-ways
 	dirty-head
+	EOF
+	test_cmp expected actual &&
+	git -C for-submodules diff-files --name-only --ignore-submodules=none >actual &&
+	cat >expected <<-\EOF &&
+	dirty-both-ways
+	dirty-head
 	dirty-otherwise
 	EOF
 	test_cmp expected actual &&
@@ -642,9 +909,72 @@ test_expect_success 'add -p patch editing works with pathological context lines'
 test_expect_success 'checkout -p works with pathological context lines' '
 	test_write_lines a a a a a a >a &&
 	git add a &&
-	test_write_lines a b a b a b a b a b a > a&&
+	test_write_lines a b a b a b a b a b a >a &&
 	test_write_lines s n n y q | git checkout -p &&
 	test_write_lines a b a b a a b a b a >expect &&
 	test_cmp expect a
 '
+
+# This should be called from a subshell as it sets a temporary editor
+setup_new_file() {
+	write_script new-file-editor.sh <<-\EOF &&
+	sed /^#/d "$1" >patch &&
+	sed /^+c/d patch >"$1"
+	EOF
+	test_set_editor "$(pwd)/new-file-editor.sh" &&
+	test_write_lines a b c d e f >new-file &&
+	test_write_lines a b d e f >new-file-expect &&
+	test_write_lines "@@ -0,0 +1,6 @@" +a +b +c +d +e +f >patch-expect
+}
+
+test_expect_success 'add -N followed by add -p patch editing' '
+	git reset --hard &&
+	(
+		setup_new_file &&
+		git add -N new-file &&
+		test_write_lines e n q | git add -p &&
+		git cat-file blob :new-file >actual &&
+		test_cmp new-file-expect actual &&
+		test_cmp patch-expect patch
+	)
+'
+
+test_expect_success 'checkout -p patch editing of added file' '
+	git reset --hard &&
+	(
+		setup_new_file &&
+		git add new-file &&
+		git commit -m "add new file" &&
+		git rm new-file &&
+		git commit -m "remove new file" &&
+		test_write_lines e n q | git checkout -p HEAD^ &&
+		test_cmp new-file-expect new-file &&
+		test_cmp patch-expect patch
+	)
+'
+
+test_expect_success 'show help from add--helper' '
+	git reset --hard &&
+	cat >expect <<-EOF &&
+
+	<BOLD>*** Commands ***<RESET>
+	  1: <BOLD;BLUE>s<RESET>tatus	  2: <BOLD;BLUE>u<RESET>pdate	  3: <BOLD;BLUE>r<RESET>evert	  4: <BOLD;BLUE>a<RESET>dd untracked
+	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>q<RESET>uit	  8: <BOLD;BLUE>h<RESET>elp
+	<BOLD;BLUE>What now<RESET>> <BOLD;RED>status        - show paths with changes<RESET>
+	<BOLD;RED>update        - add working tree state to the staged set of changes<RESET>
+	<BOLD;RED>revert        - revert staged set of changes back to the HEAD version<RESET>
+	<BOLD;RED>patch         - pick hunks and update selectively<RESET>
+	<BOLD;RED>diff          - view diff between HEAD and index<RESET>
+	<BOLD;RED>add untracked - add contents of untracked files to the staged set of changes<RESET>
+	<BOLD>*** Commands ***<RESET>
+	  1: <BOLD;BLUE>s<RESET>tatus	  2: <BOLD;BLUE>u<RESET>pdate	  3: <BOLD;BLUE>r<RESET>evert	  4: <BOLD;BLUE>a<RESET>dd untracked
+	  5: <BOLD;BLUE>p<RESET>atch	  6: <BOLD;BLUE>d<RESET>iff	  7: <BOLD;BLUE>q<RESET>uit	  8: <BOLD;BLUE>h<RESET>elp
+	<BOLD;BLUE>What now<RESET>>$SP
+	Bye.
+	EOF
+	test_write_lines h | force_color git add -i >actual.colored &&
+	test_decode_color <actual.colored >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t3704-add-pathspec-file.sh b/t/t3704-add-pathspec-file.sh
new file mode 100755
index 0000000000..9e35c1fbca
--- /dev/null
+++ b/t/t3704-add-pathspec-file.sh
@@ -0,0 +1,159 @@
+#!/bin/sh
+
+test_description='add --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	test_commit file0 &&
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t
+'
+
+restore_checkpoint () {
+	git reset
+}
+
+verify_expect () {
+	git status --porcelain --untracked-files=no -- fileA.t fileB.t fileC.t fileD.t >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success '--pathspec-from-file from stdin' '
+	restore_checkpoint &&
+
+	echo fileA.t | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success '--pathspec-from-file from file' '
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git add --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'NUL delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git add --pathspec-from-file=- --pathspec-file-nul &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'LF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'no trailing delimiter' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'CRLF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	A  fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git add --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	A  fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes not compatible with --pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git add --pathspec-from-file=list --pathspec-file-nul
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git add --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	A  fileB.t
+	A  fileC.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>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_must_fail git add --pathspec-from-file=list --patch 2>err &&
+	test_i18ngrep -e "--pathspec-from-file is incompatible with --interactive/--patch" 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_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_must_fail git add --pathspec-file-nul 2>err &&
+	test_i18ngrep -e "--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 &&
+	test_i18ngrep -e "Nothing specified, nothing added." err
+'
+
+test_done
diff --git a/t/t3705-add-sparse-checkout.sh b/t/t3705-add-sparse-checkout.sh
new file mode 100755
index 0000000000..2b1fd0d0ee
--- /dev/null
+++ b/t/t3705-add-sparse-checkout.sh
@@ -0,0 +1,155 @@
+#!/bin/sh
+
+test_description='git add in sparse checked out working trees'
+
+. ./test-lib.sh
+
+SPARSE_ENTRY_BLOB=""
+
+# Optionally take a printf format string to write to the sparse_entry file
+setup_sparse_entry () {
+	# 'sparse_entry' might already be in the index with the skip-worktree
+	# bit set. Remove it so that the subsequent git add can update it.
+	git update-index --force-remove sparse_entry &&
+	if test $# -eq 1
+	then
+		printf "$1" >sparse_entry
+	else
+		>sparse_entry
+	fi &&
+	git add sparse_entry &&
+	git update-index --skip-worktree sparse_entry &&
+	SPARSE_ENTRY_BLOB=$(git rev-parse :sparse_entry)
+}
+
+test_sparse_entry_unchanged () {
+	echo "100644 $SPARSE_ENTRY_BLOB 0	sparse_entry" >expected &&
+	git ls-files --stage sparse_entry >actual &&
+	test_cmp expected actual
+}
+
+setup_gitignore () {
+	test_when_finished rm -f .gitignore &&
+	cat >.gitignore <<-EOF
+	*
+	!/sparse_entry
+	EOF
+}
+
+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:
+	EOF
+
+	cat >sparse_hint <<-EOF &&
+	hint: Disable or modify the sparsity rules if you intend to update such entries.
+	hint: Disable this message with \"git config advice.updateSparsePath false\"
+	EOF
+
+	echo sparse_entry | cat sparse_error_header - >sparse_entry_error &&
+	cat sparse_entry_error sparse_hint >error_and_hint
+"
+
+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_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged
+'
+
+test_expect_success 'git add -A does not remove sparse entries' '
+	setup_sparse_entry &&
+	rm sparse_entry &&
+	setup_gitignore &&
+	git add -A 2>stderr &&
+	test_must_be_empty stderr &&
+	test_sparse_entry_unchanged
+'
+
+test_expect_success 'git add . does not remove sparse entries' '
+	setup_sparse_entry &&
+	rm sparse_entry &&
+	setup_gitignore &&
+	test_must_fail git add . 2>stderr &&
+
+	cat sparse_error_header >expect &&
+	echo . >>expect &&
+	cat sparse_hint >>expect &&
+
+	test_cmp expect stderr &&
+	test_sparse_entry_unchanged
+'
+
+for opt in "" -f -u --ignore-removal --dry-run
+do
+	test_expect_success "git add${opt:+ $opt} does not update sparse entries" '
+		setup_sparse_entry &&
+		echo modified >sparse_entry &&
+		test_must_fail git add $opt sparse_entry 2>stderr &&
+		test_cmp error_and_hint stderr &&
+		test_sparse_entry_unchanged
+	'
+done
+
+test_expect_success 'git add --refresh does not update sparse entries' '
+	setup_sparse_entry &&
+	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_cmp error_and_hint stderr &&
+	git ls-files --debug sparse_entry | grep mtime >after &&
+	test_cmp before after
+'
+
+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_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged &&
+	! test -x sparse_entry
+'
+
+test_expect_success 'git add --renormalize does not update sparse entries' '
+	test_config core.autocrlf false &&
+	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_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged
+'
+
+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_cmp error_and_hint stderr &&
+	test_sparse_entry_unchanged
+'
+
+test_expect_success 'do not advice about sparse entries when they do not match the pathspec' '
+	setup_sparse_entry &&
+	test_must_fail git add nonexistent 2>stderr &&
+	grep "fatal: pathspec .nonexistent. did not match any files" stderr &&
+	! grep -F -f sparse_error_header stderr
+'
+
+test_expect_success 'do not warn when pathspec matches dense entries' '
+	setup_sparse_entry &&
+	echo modified >sparse_entry &&
+	>dense_entry &&
+	git add "*_entry" 2>stderr &&
+	test_must_be_empty stderr &&
+	test_sparse_entry_unchanged &&
+	git ls-files --error-unmatch dense_entry
+'
+
+test_expect_success 'add obeys advice.updateSparsePath' '
+	setup_sparse_entry &&
+	test_must_fail git -c advice.updateSparsePath=false add sparse_entry 2>stderr &&
+	test_cmp sparse_entry_error stderr
+
+'
+
+test_done
diff --git a/t/t3800-mktag.sh b/t/t3800-mktag.sh
index 64dcc5ec28..0544d58a6e 100755
--- a/t/t3800-mktag.sh
+++ b/t/t3800-mktag.sh
@@ -12,10 +12,105 @@ test_description='git mktag: tag object verify test'
 # given in the expect.pat file.
 
 check_verify_failure () {
-	expect="$2"
+	subject=$1 &&
+	message=$2 &&
+	shift 2 &&
+
+	no_strict= &&
+	fsck_obj_ok= &&
+	no_strict= &&
+	while test $# != 0
+	do
+		case "$1" in
+		--no-strict)
+			no_strict=yes
+			;;
+		--fsck-obj-ok)
+			fsck_obj_ok=yes
+			;;
+		esac &&
+		shift
+	done &&
+
+	test_expect_success "fail with [--[no-]strict]: $subject" '
+		test_must_fail git mktag <tag.sig 2>err &&
+		if test -z "$no_strict"
+		then
+			test_must_fail git mktag <tag.sig 2>err2 &&
+			test_cmp err err2
+		else
+			git mktag --no-strict <tag.sig
+		fi
+	'
+
+	test_expect_success "setup: $subject" '
+		tag_ref=refs/tags/bad_tag &&
+
+		# Reset any leftover state from the last $subject
+		rm -rf bad-tag &&
+
+		git init --bare bad-tag &&
+		bad_tag=$(git -C bad-tag hash-object -t tag -w --stdin --literally <tag.sig)
+	'
+
+	test_expect_success "hash-object & fsck unreachable: $subject" '
+		if test -n "$fsck_obj_ok"
+		then
+			git -C bad-tag fsck
+		else
+			test_must_fail git -C bad-tag fsck
+		fi
+	'
+
+	test_expect_success "update-ref & fsck reachable: $subject" '
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
+
+		# The update-ref of the bad content will fail, do it
+		# anyway to see if it segfaults
+		test_might_fail git -C bad-tag update-ref "$tag_ref" "$bad_tag" &&
+
+		# Manually create the broken, we cannot do it with
+		# update-ref
+		echo "$bad_tag" >"bad-tag/$tag_ref" &&
+
+		# Unlike fsck-ing unreachable content above, this
+		# will always fail.
+		test_must_fail git -C bad-tag fsck
+	'
+
+	test_expect_success "for-each-ref: $subject" '
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
+
+		echo "$bad_tag" >"bad-tag/$tag_ref" &&
+
+		printf "%s tag\t%s\n" "$bad_tag" "$tag_ref" >expected &&
+		git -C bad-tag for-each-ref "$tag_ref" >actual &&
+		test_cmp expected actual &&
+
+		test_must_fail git -C bad-tag for-each-ref --format="%(*objectname)"
+	'
+
+	test_expect_success "fast-export & fast-import: $subject" '
+		# Make sure the earlier test created it for us
+		git rev-parse "$bad_tag" &&
+
+		test_must_fail git -C bad-tag fast-export --all &&
+		test_must_fail git -C bad-tag fast-export "$bad_tag"
+	'
+}
+
+test_expect_mktag_success() {
 	test_expect_success "$1" '
-		( test_must_fail git mktag <tag.sig 2>message ) &&
-		grep "$expect" message
+		git hash-object -t tag -w --stdin <tag.sig >expected &&
+		git fsck --strict &&
+
+		git mktag <tag.sig >hash &&
+		test_cmp expected hash &&
+		test_when_finished "git update-ref -d refs/tags/mytag $(cat hash)" &&
+		git update-ref refs/tags/mytag $(cat hash) $(test_oid zero) &&
+		git fsck --strict
 	'
 }
 
@@ -23,11 +118,24 @@ check_verify_failure () {
 # first create a commit, so we have a valid object/type
 # for the tag.
 test_expect_success 'setup' '
-	test_oid_init &&
-	echo Hello >A &&
-	git update-index --add A &&
-	git commit -m "Initial commit" &&
-	head=$(git rev-parse --verify HEAD)
+	test_commit A &&
+	test_commit B &&
+	head=$(git rev-parse --verify HEAD) &&
+	head_parent=$(git rev-parse --verify HEAD~) &&
+	tree=$(git rev-parse HEAD^{tree}) &&
+	blob=$(git rev-parse --verify HEAD:B.t)
+'
+
+test_expect_success 'basic usage' '
+	cat >tag.sig <<-EOF &&
+	object $head
+	type commit
+	tag mytag
+	tagger T A Gger <tagger@example.com> 1206478233 -0500
+	EOF
+	git mktag <tag.sig &&
+	git mktag --end-of-options <tag.sig &&
+	test_expect_code 129 git mktag --unknown-option
 '
 
 ############################################################
@@ -38,33 +146,33 @@ too short for a tag
 EOF
 
 check_verify_failure 'Tag object length check' \
-	'^error: .*size wrong.*$'
+	'^error:.* missingObject:' 'strict'
 
 ############################################################
 #  2. object line label check
 
 cat >tag.sig <<EOF
-xxxxxx 139e9b33986b1c2670fff52c5067603117b3e895
+xxxxxx $head
 type tag
 tag mytag
 tagger . <> 0 +0000
 
 EOF
 
-check_verify_failure '"object" line label check' '^error: char0: .*"object "$'
+check_verify_failure '"object" line label check' '^error:.* missingObject:'
 
 ############################################################
-#  3. object line SHA1 check
+#  3. object line hash check
 
 cat >tag.sig <<EOF
-object zz9e9b33986b1c2670fff52c5067603117b3e895
+object $(echo $head | tr 0-9a-f z)
 type tag
 tag mytag
 tagger . <> 0 +0000
 
 EOF
 
-check_verify_failure '"object" line SHA1 check' '^error: char7: .*SHA1 hash$'
+check_verify_failure '"object" line check' '^error:.* badObjectSha1:'
 
 ############################################################
 #  4. type line label check
@@ -77,7 +185,7 @@ tagger . <> 0 +0000
 
 EOF
 
-check_verify_failure '"type" line label check' '^error: char.*: .*"\\ntype "$'
+check_verify_failure '"type" line label check' '^error:.* missingTypeEntry:'
 
 ############################################################
 #  5. type line eol check
@@ -85,7 +193,7 @@ check_verify_failure '"type" line label check' '^error: char.*: .*"\\ntype "$'
 echo "object $head" >tag.sig
 printf "type tagsssssssssssssssssssssssssssssss" >>tag.sig
 
-check_verify_failure '"type" line eol check' '^error: char.*: .*"\\n"$'
+check_verify_failure '"type" line eol check' '^error:.* unterminatedHeader:'
 
 ############################################################
 #  6. tag line label check #1
@@ -99,7 +207,7 @@ tagger . <> 0 +0000
 EOF
 
 check_verify_failure '"tag" line label check #1' \
-	'^error: char.*: no "tag " found$'
+	'^error:.* missingTagEntry:'
 
 ############################################################
 #  7. tag line label check #2
@@ -111,7 +219,7 @@ tag
 EOF
 
 check_verify_failure '"tag" line label check #2' \
-	'^error: char.*: no "tag " found$'
+	'^error:.* badType:'
 
 ############################################################
 #  8. type line type-name length check
@@ -123,21 +231,86 @@ tag mytag
 EOF
 
 check_verify_failure '"type" line type-name length check' \
-	'^error: char.*: type too long$'
+	'^error:.* badType:'
 
 ############################################################
-#  9. verify object (SHA1/type) check
+#  9. verify object (hash/type) check
 
 cat >tag.sig <<EOF
 object $(test_oid deadbeef)
+type tag
+tag mytag
+tagger . <> 0 +0000
+
+EOF
+
+check_verify_failure 'verify object (hash/type) check -- correct type, nonexisting object' \
+	'^fatal: could not read tagged object' \
+	--fsck-obj-ok
+
+cat >tag.sig <<EOF
+object $head
 type tagggg
 tag mytag
 tagger . <> 0 +0000
 
 EOF
 
-check_verify_failure 'verify object (SHA1/type) check' \
-	'^error: char7: could not verify object.*$'
+check_verify_failure 'verify object (hash/type) check -- made-up type, valid object' \
+	'^error:.* badType:'
+
+cat >tag.sig <<EOF
+object $(test_oid deadbeef)
+type tagggg
+tag mytag
+tagger . <> 0 +0000
+
+EOF
+
+check_verify_failure 'verify object (hash/type) check -- made-up type, nonexisting object' \
+	'^error:.* badType:'
+
+cat >tag.sig <<EOF
+object $head
+type tree
+tag mytag
+tagger . <> 0 +0000
+
+EOF
+
+check_verify_failure 'verify object (hash/type) check -- mismatched type, valid object' \
+	'^fatal: object.*tagged as.*tree.*but is.*commit' \
+	--fsck-obj-ok
+
+############################################################
+#  9.5. verify object (hash/type) check -- replacement
+
+test_expect_success 'setup replacement of commit -> commit and tree -> blob' '
+	git replace $head_parent $head &&
+	git replace -f $tree $blob
+'
+
+cat >tag.sig <<EOF
+object $head_parent
+type commit
+tag mytag
+tagger . <> 0 +0000
+
+EOF
+
+test_expect_mktag_success 'tag to a commit replaced by another commit'
+
+cat >tag.sig <<EOF
+object $tree
+type tree
+tag mytag
+tagger . <> 0 +0000
+
+EOF
+
+check_verify_failure 'verify object (hash/type) check -- mismatched type, valid object' \
+	'^fatal: object.*tagged as.*tree.*but is.*blob' \
+	--fsck-obj-ok
 
 ############################################################
 # 10. verify tag-name check
@@ -151,7 +324,9 @@ tagger . <> 0 +0000
 EOF
 
 check_verify_failure 'verify tag-name check' \
-	'^error: char.*: could not verify tag name$'
+	'^error:.* badTagName:' \
+	--no-strict \
+	--fsck-obj-ok
 
 ############################################################
 # 11. tagger line label check #1
@@ -165,7 +340,9 @@ This is filler
 EOF
 
 check_verify_failure '"tagger" line label check #1' \
-	'^error: char.*: could not find "tagger "$'
+	'^error:.* missingTaggerEntry:' \
+	--no-strict \
+	--fsck-obj-ok
 
 ############################################################
 # 12. tagger line label check #2
@@ -180,10 +357,12 @@ This is filler
 EOF
 
 check_verify_failure '"tagger" line label check #2' \
-	'^error: char.*: could not find "tagger "$'
+	'^error:.* missingTaggerEntry:' \
+	--no-strict \
+	--fsck-obj-ok
 
 ############################################################
-# 13. disallow missing tag author name
+# 13. allow missing tag author name like fsck
 
 cat >tag.sig <<EOF
 object $head
@@ -194,8 +373,7 @@ tagger  <> 0 +0000
 This is filler
 EOF
 
-check_verify_failure 'disallow missing tag author name' \
-	'^error: char.*: missing tagger name$'
+test_expect_mktag_success 'allow missing tag author name'
 
 ############################################################
 # 14. disallow missing tag author name
@@ -210,7 +388,9 @@ tagger T A Gger <
 EOF
 
 check_verify_failure 'disallow malformed tagger' \
-	'^error: char.*: malformed tagger field$'
+	'^error:.* badEmail:' \
+	--no-strict \
+	--fsck-obj-ok
 
 ############################################################
 # 15. allow empty tag email
@@ -223,12 +403,10 @@ tagger T A Gger <> 0 +0000
 
 EOF
 
-test_expect_success \
-    'allow empty tag email' \
-    'git mktag <tag.sig >.git/refs/tags/mytag 2>message'
+test_expect_mktag_success 'allow empty tag email'
 
 ############################################################
-# 16. disallow spaces in tag email
+# 16. allow spaces in tag email like fsck
 
 cat >tag.sig <<EOF
 object $head
@@ -238,8 +416,7 @@ tagger T A Gger <tag ger@example.com> 0 +0000
 
 EOF
 
-check_verify_failure 'disallow spaces in tag email' \
-	'^error: char.*: malformed tagger field$'
+test_expect_mktag_success 'allow spaces in tag email like fsck'
 
 ############################################################
 # 17. disallow missing tag timestamp
@@ -253,7 +430,7 @@ tagger T A Gger <tagger@example.com>__
 EOF
 
 check_verify_failure 'disallow missing tag timestamp' \
-	'^error: char.*: missing tag timestamp$'
+	'^error:.* badDate:'
 
 ############################################################
 # 18. detect invalid tag timestamp1
@@ -267,7 +444,7 @@ tagger T A Gger <tagger@example.com> Tue Mar 25 15:47:44 2008
 EOF
 
 check_verify_failure 'detect invalid tag timestamp1' \
-	'^error: char.*: missing tag timestamp$'
+	'^error:.* badDate:'
 
 ############################################################
 # 19. detect invalid tag timestamp2
@@ -281,7 +458,7 @@ tagger T A Gger <tagger@example.com> 2008-03-31T12:20:15-0500
 EOF
 
 check_verify_failure 'detect invalid tag timestamp2' \
-	'^error: char.*: malformed tag timestamp$'
+	'^error:.* badDate:'
 
 ############################################################
 # 20. detect invalid tag timezone1
@@ -295,7 +472,7 @@ tagger T A Gger <tagger@example.com> 1206478233 GMT
 EOF
 
 check_verify_failure 'detect invalid tag timezone1' \
-	'^error: char.*: malformed tag timezone$'
+	'^error:.* badTimezone:'
 
 ############################################################
 # 21. detect invalid tag timezone2
@@ -309,10 +486,10 @@ tagger T A Gger <tagger@example.com> 1206478233 +  30
 EOF
 
 check_verify_failure 'detect invalid tag timezone2' \
-	'^error: char.*: malformed tag timezone$'
+	'^error:.* badTimezone:'
 
 ############################################################
-# 22. detect invalid tag timezone3
+# 22. allow invalid tag timezone3 (the maximum is -1200/+1400)
 
 cat >tag.sig <<EOF
 object $head
@@ -322,8 +499,7 @@ tagger T A Gger <tagger@example.com> 1206478233 -1430
 
 EOF
 
-check_verify_failure 'detect invalid tag timezone3' \
-	'^error: char.*: malformed tag timezone$'
+test_expect_mktag_success 'allow invalid tag timezone'
 
 ############################################################
 # 23. detect invalid header entry
@@ -338,10 +514,29 @@ this line should not be here
 EOF
 
 check_verify_failure 'detect invalid header entry' \
-	'^error: char.*: trailing garbage in tag header$'
+	'^error:.* extraHeaderEntry:' \
+	--no-strict \
+	--fsck-obj-ok
 
-############################################################
-# 24. create valid tag
+test_expect_success 'invalid header entry config & fsck' '
+	test_must_fail git mktag <tag.sig &&
+	git mktag --no-strict <tag.sig &&
+
+	test_must_fail git -c fsck.extraHeaderEntry=error mktag <tag.sig &&
+	test_must_fail git -c fsck.extraHeaderEntry=error mktag --no-strict <tag.sig &&
+
+	test_must_fail git -c fsck.extraHeaderEntry=warn mktag <tag.sig &&
+	git -c fsck.extraHeaderEntry=warn mktag --no-strict <tag.sig &&
+
+	git -c fsck.extraHeaderEntry=ignore mktag <tag.sig &&
+	git -c fsck.extraHeaderEntry=ignore mktag --no-strict <tag.sig &&
+
+	git fsck &&
+	git -c fsck.extraHeaderEntry=warn fsck 2>err &&
+	grep "warning .*extraHeaderEntry:" err &&
+	test_must_fail git -c fsck.extraHeaderEntry=error 2>err fsck &&
+	grep "error .* extraHeaderEntry:" err
+'
 
 cat >tag.sig <<EOF
 object $head
@@ -349,18 +544,41 @@ type commit
 tag mytag
 tagger T A Gger <tagger@example.com> 1206478233 -0500
 
+
+this line comes after an extra newline
 EOF
 
-test_expect_success \
-    'create valid tag' \
-    'git mktag <tag.sig >.git/refs/tags/mytag 2>message'
+test_expect_mktag_success 'allow extra newlines at start of body'
+
+cat >tag.sig <<EOF
+object $head
+type commit
+tag mytag
+tagger T A Gger <tagger@example.com> 1206478233 -0500
+
+EOF
+
+test_expect_mktag_success 'allow a blank line before an empty body (1)'
+
+cat >tag.sig <<EOF
+object $head
+type commit
+tag mytag
+tagger T A Gger <tagger@example.com> 1206478233 -0500
+EOF
+
+test_expect_mktag_success 'allow no blank line before an empty body (2)'
 
 ############################################################
-# 25. check mytag
+# 24. create valid tag
 
-test_expect_success \
-    'check mytag' \
-    'git tag -l | grep mytag'
+cat >tag.sig <<EOF
+object $head
+type commit
+tag mytag
+tagger T A Gger <tagger@example.com> 1206478233 -0500
+EOF
 
+test_expect_mktag_success 'create valid tag object'
 
 test_done
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index b92ff95977..bfab245eb3 100755
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -204,4 +204,37 @@ test_commit_autosquash_flags eucJP fixup
 
 test_commit_autosquash_flags ISO-2022-JP squash
 
+test_commit_autosquash_multi_encoding () {
+	flag=$1
+	old=$2
+	new=$3
+	msg=$4
+	test_expect_success "commit --$flag into $old from $new" '
+		git checkout -b $flag-$old-$new C0 &&
+		git config i18n.commitencoding $old &&
+		echo $old >>F &&
+		git commit -a -F "$TEST_DIRECTORY"/t3900/$msg &&
+		test_tick &&
+		echo intermediate stuff >>G &&
+		git add G &&
+		git commit -a -m "intermediate commit" &&
+		test_tick &&
+		git config i18n.commitencoding $new &&
+		echo $new-$flag >>F &&
+		git commit -a --$flag HEAD^ &&
+		git rebase --autosquash -i HEAD^^^ &&
+		git rev-list HEAD >actual &&
+		test_line_count = 3 actual &&
+		iconv -f $old -t UTF-8 "$TEST_DIRECTORY"/t3900/$msg >expect &&
+		git cat-file commit HEAD^ >raw &&
+		(sed "1,/^$/d" raw | iconv -f $new -t utf-8) >actual &&
+		test_cmp expect actual
+	'
+}
+
+test_commit_autosquash_multi_encoding fixup UTF-8 ISO-8859-1 1-UTF-8.txt
+test_commit_autosquash_multi_encoding squash ISO-8859-1 UTF-8 ISO8859-1.txt
+test_commit_autosquash_multi_encoding squash eucJP ISO-2022-JP eucJP.txt
+test_commit_autosquash_multi_encoding fixup ISO-2022-JP UTF-8 ISO-2022-JP.txt
+
 test_done
diff --git a/t/t3901-i18n-patch.sh b/t/t3901-i18n-patch.sh
index 923eb01f0e..4f16a735d9 100755
--- a/t/t3901-i18n-patch.sh
+++ b/t/t3901-i18n-patch.sh
@@ -5,6 +5,9 @@
 
 test_description='i18n settings and format-patch | am pipe'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_encoding () {
@@ -45,7 +48,7 @@ test_expect_success setup '
 
 	# the first commit on the side branch is UTF-8
 	test_tick &&
-	git checkout -b side master^ &&
+	git checkout -b side main^ &&
 	echo Another file >yours &&
 	git add yours &&
 	git commit -s -m "Second on side" &&
@@ -69,7 +72,7 @@ test_expect_success setup '
 test_expect_success 'format-patch output (ISO-8859-1)' '
 	git config i18n.logoutputencoding ISO8859-1 &&
 
-	git format-patch --stdout master..HEAD^ >out-l1 &&
+	git format-patch --stdout main..HEAD^ >out-l1 &&
 	git format-patch --stdout HEAD^ >out-l2 &&
 	grep "^Content-Type: text/plain; charset=ISO8859-1" out-l1 &&
 	grep "^From: =?ISO8859-1?q?=C1=E9=ED=20=F3=FA?=" out-l1 &&
@@ -80,7 +83,7 @@ test_expect_success 'format-patch output (ISO-8859-1)' '
 test_expect_success 'format-patch output (UTF-8)' '
 	git config i18n.logoutputencoding UTF-8 &&
 
-	git format-patch --stdout master..HEAD^ >out-u1 &&
+	git format-patch --stdout main..HEAD^ >out-u1 &&
 	git format-patch --stdout HEAD^ >out-u2 &&
 	grep "^Content-Type: text/plain; charset=UTF-8" out-u1 &&
 	grep "^From: =?UTF-8?q?=C3=81=C3=A9=C3=AD=20=C3=B3=C3=BA?=" out-u1 &&
@@ -102,7 +105,7 @@ test_expect_success 'rebase (U/U)' '
 	# we want UTF-8 encoded name.
 	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 	git checkout -b test &&
-	git rebase master &&
+	git rebase main &&
 
 	check_encoding 2
 '
@@ -113,7 +116,7 @@ test_expect_success 'rebase (U/L)' '
 	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
 	git reset --hard side &&
-	git rebase master &&
+	git rebase main &&
 
 	check_encoding 2
 '
@@ -125,7 +128,7 @@ test_expect_success !MINGW 'rebase (L/L)' '
 	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
 	git reset --hard side &&
-	git rebase master &&
+	git rebase main &&
 
 	check_encoding 2 8859
 '
@@ -138,7 +141,7 @@ test_expect_success !MINGW 'rebase (L/U)' '
 	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
 	git reset --hard side &&
-	git rebase master &&
+	git rebase main &&
 
 	check_encoding 2 8859
 '
@@ -150,7 +153,7 @@ test_expect_success 'cherry-pick(U/U)' '
 	git config i18n.logoutputencoding UTF-8 &&
 	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	git cherry-pick side^ &&
 	git cherry-pick side &&
 	git revert HEAD &&
@@ -165,7 +168,7 @@ test_expect_success !MINGW 'cherry-pick(L/L)' '
 	git config i18n.logoutputencoding ISO8859-1 &&
 	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	git cherry-pick side^ &&
 	git cherry-pick side &&
 	git revert HEAD &&
@@ -180,7 +183,7 @@ test_expect_success 'cherry-pick(U/L)' '
 	git config i18n.logoutputencoding ISO8859-1 &&
 	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	git cherry-pick side^ &&
 	git cherry-pick side &&
 	git revert HEAD &&
@@ -196,7 +199,7 @@ test_expect_success !MINGW 'cherry-pick(L/U)' '
 	git config i18n.logoutputencoding UTF-8 &&
 	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	git cherry-pick side^ &&
 	git cherry-pick side &&
 	git revert HEAD &&
@@ -210,7 +213,7 @@ test_expect_success 'rebase --merge (U/U)' '
 	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
 	git reset --hard side &&
-	git rebase --merge master &&
+	git rebase --merge main &&
 
 	check_encoding 2
 '
@@ -221,7 +224,7 @@ test_expect_success 'rebase --merge (U/L)' '
 	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
 	git reset --hard side &&
-	git rebase --merge master &&
+	git rebase --merge main &&
 
 	check_encoding 2
 '
@@ -233,7 +236,7 @@ test_expect_success 'rebase --merge (L/L)' '
 	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
 	git reset --hard side &&
-	git rebase --merge master &&
+	git rebase --merge main &&
 
 	check_encoding 2 8859
 '
@@ -246,7 +249,7 @@ test_expect_success 'rebase --merge (L/U)' '
 	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
 	git reset --hard side &&
-	git rebase --merge master &&
+	git rebase --merge main &&
 
 	check_encoding 2 8859
 '
@@ -256,7 +259,7 @@ test_expect_success 'am (U/U)' '
 	git config i18n.commitencoding UTF-8 &&
 	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	git am out-u1 out-u2 &&
 
 	check_encoding 2
@@ -267,7 +270,7 @@ test_expect_success !MINGW 'am (L/L)' '
 	git config i18n.commitencoding ISO8859-1 &&
 	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	git am out-l1 out-l2 &&
 
 	check_encoding 2 8859
@@ -277,7 +280,7 @@ test_expect_success 'am (U/L)' '
 	# Apply ISO-8859-1 patches with UTF-8 commitencoding
 	git config i18n.commitencoding UTF-8 &&
 	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
-	git reset --hard master &&
+	git reset --hard main &&
 
 	# am specifies --utf8 by default.
 	git am out-l1 out-l2 &&
@@ -290,7 +293,7 @@ test_expect_success 'am --no-utf8 (U/L)' '
 	git config i18n.commitencoding UTF-8 &&
 	. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	git am --no-utf8 out-l1 out-l2 2>err &&
 
 	# commit-tree will warn that the commit message does not contain valid UTF-8
@@ -305,7 +308,7 @@ test_expect_success !MINGW 'am (L/U)' '
 	git config i18n.commitencoding ISO8859-1 &&
 	. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	# mailinfo will re-code the commit message to the charset specified by
 	# i18n.commitencoding
 	git am out-u1 out-u2 &&
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 580bfbdc23..873aa56e35 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -5,6 +5,9 @@
 
 test_description='Test git stash'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 diff_cmp () {
@@ -220,14 +223,14 @@ test_expect_success 'stash branch' '
 	git commit file -m second &&
 	git stash branch stashbranch &&
 	test refs/heads/stashbranch = $(git symbolic-ref HEAD) &&
-	test $(git rev-parse HEAD) = $(git rev-parse master^) &&
+	test $(git rev-parse HEAD) = $(git rev-parse main^) &&
 	git diff --cached >output &&
 	diff_cmp expect output &&
 	git diff >output &&
 	diff_cmp expect1 output &&
 	git add file &&
 	git commit -m alternate\ second &&
-	git diff master..stashbranch >output &&
+	git diff main..stashbranch >output &&
 	diff_cmp output expect2 &&
 	test 0 = $(git stash list | wc -l)
 '
@@ -244,8 +247,11 @@ test_expect_success 'save -q is quiet' '
 	test_must_be_empty output.out
 '
 
-test_expect_success 'pop -q is quiet' '
+test_expect_success 'pop -q works and is quiet' '
 	git stash pop -q >output.out 2>&1 &&
+	echo bar >expect &&
+	git show :file >actual &&
+	test_cmp expect actual &&
 	test_must_be_empty output.out
 '
 
@@ -254,6 +260,8 @@ test_expect_success 'pop -q --index works and is quiet' '
 	git add file &&
 	git stash save --quiet &&
 	git stash pop -q --index >output.out 2>&1 &&
+	git diff-files file2 >file2.diff &&
+	test_must_be_empty file2.diff &&
 	test foo = "$(git show :file)" &&
 	test_must_be_empty output.out
 '
@@ -280,6 +288,11 @@ test_expect_success 'stash --no-keep-index' '
 	test bar,bar2 = $(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
+'
+
 test_expect_success 'stash --invalid-option' '
 	echo bar5 >file &&
 	echo bar6 >file2 &&
@@ -510,7 +523,7 @@ test_expect_success 'stash branch - no stashes on stack, stash-like argument' '
 	STASH_ID=$(git stash create) &&
 	git reset --hard &&
 	git stash branch stash-branch ${STASH_ID} &&
-	test_when_finished "git reset --hard HEAD && git checkout master &&
+	test_when_finished "git reset --hard HEAD && git checkout main &&
 	git branch -D stash-branch" &&
 	test $(git ls-files --modified | wc -l) -eq 1
 '
@@ -526,7 +539,7 @@ test_expect_success 'stash branch - stashes on stack, stash-like argument' '
 	STASH_ID=$(git stash create) &&
 	git reset --hard &&
 	git stash branch stash-branch ${STASH_ID} &&
-	test_when_finished "git reset --hard HEAD && git checkout master &&
+	test_when_finished "git reset --hard HEAD && git checkout main &&
 	git branch -D stash-branch" &&
 	test $(git ls-files --modified | wc -l) -eq 1
 '
@@ -551,7 +564,7 @@ test_expect_success 'stash show format defaults to --stat' '
 	 1 file changed, 1 insertion(+)
 	EOF
 	git stash show ${STASH_ID} >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'stash show - stashes on stack, stash-like argument' '
@@ -728,7 +741,7 @@ test_expect_success 'valid ref of the form "n", n < N' '
 	git stash &&
 	git stash show 0 &&
 	git stash branch tmp 0 &&
-	git checkout master &&
+	git checkout main &&
 	git stash &&
 	git stash apply 0 &&
 	git reset --hard &&
@@ -745,7 +758,7 @@ test_expect_success 'branch: do not drop the stash if the branch exists' '
 	git commit -m initial &&
 	echo bar >file &&
 	git stash &&
-	test_must_fail git stash branch master stash@{0} &&
+	test_must_fail git stash branch main stash@{0} &&
 	git rev-parse stash@{0} --
 '
 
@@ -758,7 +771,7 @@ test_expect_success 'branch: should not drop the stash if the apply fails' '
 	echo bar >file &&
 	git stash &&
 	echo baz >file &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	test_must_fail git stash branch new_branch stash@{0} &&
 	git rev-parse stash@{0} --
 '
@@ -779,7 +792,7 @@ test_expect_success 'apply: show same status as git status (relative to ./)' '
 		git stash apply
 	) |
 	sed -e 1d >actual && # drop "Saved..."
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat >expect <<EOF
@@ -846,7 +859,7 @@ test_expect_success 'setup stash with index and worktree changes' '
 	git stash
 '
 
-test_expect_success 'stash list implies --first-parent -m' '
+test_expect_success 'stash list -p shows simple diff' '
 	cat >expect <<-EOF &&
 	stash@{0}
 
@@ -892,7 +905,7 @@ test_expect_success 'push -m shows right message' '
 	>foo &&
 	git add foo &&
 	git stash push -m "test message" &&
-	echo "stash@{0}: On master: test message" >expect &&
+	echo "stash@{0}: On main: test message" >expect &&
 	git stash list -1 >actual &&
 	test_cmp expect actual
 '
@@ -901,7 +914,7 @@ test_expect_success 'push -m also works without space' '
 	>foo &&
 	git add foo &&
 	git stash push -m"unspaced test message" &&
-	echo "stash@{0}: On master: unspaced test message" >expect &&
+	echo "stash@{0}: On main: unspaced test message" >expect &&
 	git stash list -1 >actual &&
 	test_cmp expect actual
 '
@@ -958,7 +971,7 @@ test_expect_success 'push -mfoo uses right message' '
 	>foo &&
 	git add foo &&
 	git stash push -m"test mfoo" &&
-	echo "stash@{0}: On master: test mfoo" >expect &&
+	echo "stash@{0}: On main: test mfoo" >expect &&
 	git stash list -1 >actual &&
 	test_cmp expect actual
 '
@@ -967,7 +980,7 @@ test_expect_success 'push --message foo is synonym for -mfoo' '
 	>foo &&
 	git add foo &&
 	git stash push --message "test message foo" &&
-	echo "stash@{0}: On master: test message foo" >expect &&
+	echo "stash@{0}: On main: test message foo" >expect &&
 	git stash list -1 >actual &&
 	test_cmp expect actual
 '
@@ -976,7 +989,7 @@ test_expect_success 'push --message=foo is synonym for -mfoo' '
 	>foo &&
 	git add foo &&
 	git stash push --message="test message=foo" &&
-	echo "stash@{0}: On master: test message=foo" >expect &&
+	echo "stash@{0}: On main: test message=foo" >expect &&
 	git stash list -1 >actual &&
 	test_cmp expect actual
 '
@@ -985,7 +998,7 @@ test_expect_success 'push -m shows right message' '
 	>foo &&
 	git add foo &&
 	git stash push -m "test m foo" &&
-	echo "stash@{0}: On master: test m foo" >expect &&
+	echo "stash@{0}: On main: test m foo" >expect &&
 	git stash list -1 >actual &&
 	test_cmp expect actual
 '
@@ -994,7 +1007,7 @@ test_expect_success 'create stores correct message' '
 	>foo &&
 	git add foo &&
 	STASH_ID=$(git stash create "create test message") &&
-	echo "On master: create test message" >expect &&
+	echo "On main: create test message" >expect &&
 	git show --pretty=%s -s ${STASH_ID} >actual &&
 	test_cmp expect actual
 '
@@ -1003,13 +1016,13 @@ test_expect_success 'create with multiple arguments for the message' '
 	>foo &&
 	git add foo &&
 	STASH_ID=$(git stash create test untracked) &&
-	echo "On master: test untracked" >expect &&
+	echo "On main: test untracked" >expect &&
 	git show --pretty=%s -s ${STASH_ID} >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'create in a detached state' '
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	git checkout HEAD~1 &&
 	>foo &&
 	git add foo &&
@@ -1101,7 +1114,7 @@ test_expect_success 'stash push -p with pathspec shows no changes only once' '
 	git stash push -p foo >actual &&
 	echo "No local changes to save" >expect &&
 	git reset --hard HEAD~ &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'push <pathspec>: show no changes when there are none' '
@@ -1111,7 +1124,7 @@ test_expect_success 'push <pathspec>: show no changes when there are none' '
 	git stash push foo >actual &&
 	echo "No local changes to save" >expect &&
 	git reset --hard HEAD~ &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'push: <pathspec> not in the repository errors out' '
@@ -1269,4 +1282,29 @@ test_expect_success 'stash apply should succeed with unmodified file' '
 	git stash apply
 '
 
+test_expect_success 'stash handles skip-worktree entries nicely' '
+	test_commit A &&
+	echo changed >A.t &&
+	git add A.t &&
+	git update-index --skip-worktree A.t &&
+	rm A.t &&
+	git stash &&
+
+	git rev-parse --verify refs/stash:A.t
+'
+
+test_expect_success 'stash -c stash.useBuiltin=false warning ' '
+	expected="stash.useBuiltin support has been removed" &&
+
+	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 &&
+
+	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
+'
+
 test_done
diff --git a/t/t3904-stash-patch.sh b/t/t3904-stash-patch.sh
index 9546b6f8a4..accfe3845c 100755
--- a/t/t3904-stash-patch.sh
+++ b/t/t3904-stash-patch.sh
@@ -89,7 +89,7 @@ test_expect_success 'none of this moved HEAD' '
 	verify_saved_head
 '
 
-test_expect_failure 'stash -p with split hunk' '
+test_expect_success 'stash -p with split hunk' '
 	git reset --hard &&
 	cat >test <<-\EOF &&
 	aaa
@@ -106,8 +106,8 @@ test_expect_failure 'stash -p with split hunk' '
 	ccc
 	EOF
 	printf "%s\n" s n y q |
-	test_might_fail git stash -p 2>error &&
-	! test_must_be_empty error &&
+	git stash -p 2>error &&
+	test_must_be_empty error &&
 	grep "added line 1" test &&
 	! grep "added line 2" test
 '
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index 29ca76f2fb..dd2cdcc114 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -8,16 +8,16 @@ test_description='Test git stash --include-untracked'
 . ./test-lib.sh
 
 test_expect_success 'stash save --include-untracked some dirty working directory' '
-	echo 1 > file &&
+	echo 1 >file &&
 	git add file &&
 	test_tick &&
 	git commit -m initial &&
-	echo 2 > file &&
+	echo 2 >file &&
 	git add file &&
-	echo 3 > file &&
+	echo 3 >file &&
 	test_tick &&
-	echo 1 > file2 &&
-	echo 1 > HEAD &&
+	echo 1 >file2 &&
+	echo 1 >HEAD &&
 	mkdir untracked &&
 	echo untracked >untracked/untracked &&
 	git stash --include-untracked &&
@@ -25,48 +25,50 @@ test_expect_success 'stash save --include-untracked some dirty working directory
 	git diff-index --cached --quiet HEAD
 '
 
-cat > expect <<EOF
-?? actual
-?? expect
-EOF
-
 test_expect_success 'stash save --include-untracked cleaned the untracked files' '
+	cat >expect <<-EOF &&
+	?? actual
+	?? expect
+	EOF
+
 	git status --porcelain >actual &&
 	test_cmp expect actual
 '
 
-tracked=$(git rev-parse --short $(echo 1 | git hash-object --stdin))
-untracked=$(git rev-parse --short $(echo untracked | git hash-object --stdin))
-cat > expect.diff <<EOF
-diff --git a/HEAD b/HEAD
-new file mode 100644
-index 0000000..$tracked
---- /dev/null
-+++ b/HEAD
-@@ -0,0 +1 @@
-+1
-diff --git a/file2 b/file2
-new file mode 100644
-index 0000000..$tracked
---- /dev/null
-+++ b/file2
-@@ -0,0 +1 @@
-+1
-diff --git a/untracked/untracked b/untracked/untracked
-new file mode 100644
-index 0000000..$untracked
---- /dev/null
-+++ b/untracked/untracked
-@@ -0,0 +1 @@
-+untracked
-EOF
-cat > expect.lstree <<EOF
-HEAD
-file2
-untracked
-EOF
-
 test_expect_success 'stash save --include-untracked stashed the untracked files' '
+	one_blob=$(echo 1 | git hash-object --stdin) &&
+	tracked=$(git rev-parse --short "$one_blob") &&
+	untracked_blob=$(echo untracked | git hash-object --stdin) &&
+	untracked=$(git rev-parse --short "$untracked_blob") &&
+	cat >expect.diff <<-EOF &&
+	diff --git a/HEAD b/HEAD
+	new file mode 100644
+	index 0000000..$tracked
+	--- /dev/null
+	+++ b/HEAD
+	@@ -0,0 +1 @@
+	+1
+	diff --git a/file2 b/file2
+	new file mode 100644
+	index 0000000..$tracked
+	--- /dev/null
+	+++ b/file2
+	@@ -0,0 +1 @@
+	+1
+	diff --git a/untracked/untracked b/untracked/untracked
+	new file mode 100644
+	index 0000000..$untracked
+	--- /dev/null
+	+++ b/untracked/untracked
+	@@ -0,0 +1 @@
+	+untracked
+	EOF
+	cat >expect.lstree <<-EOF &&
+	HEAD
+	file2
+	untracked
+	EOF
+
 	test_path_is_missing file2 &&
 	test_path_is_missing untracked &&
 	test_path_is_missing HEAD &&
@@ -83,57 +85,64 @@ test_expect_success 'stash save --patch --all fails' '
 	test_must_fail git stash --patch --all
 '
 
-git clean --force --quiet
+test_expect_success 'clean up untracked/untracked file to prepare for next tests' '
+	git clean --force --quiet
 
-cat > expect <<EOF
- M file
-?? HEAD
-?? actual
-?? expect
-?? file2
-?? untracked/
-EOF
+'
 
 test_expect_success 'stash pop after save --include-untracked leaves files untracked again' '
+	cat >expect <<-EOF &&
+	 M file
+	?? HEAD
+	?? actual
+	?? expect
+	?? file2
+	?? untracked/
+	EOF
+
 	git stash pop &&
 	git status --porcelain >actual &&
 	test_cmp expect actual &&
-	test "1" = "$(cat file2)" &&
-	test untracked = "$(cat untracked/untracked)"
+	echo 1 >expect_file2 &&
+	test_cmp expect_file2 file2 &&
+	echo untracked >untracked_expect &&
+	test_cmp untracked_expect untracked/untracked
 '
 
-git clean --force --quiet -d
+test_expect_success 'clean up untracked/ directory to prepare for next tests' '
+	git clean --force --quiet -d
+'
 
 test_expect_success 'stash save -u dirty index' '
-	echo 4 > file3 &&
+	echo 4 >file3 &&
 	git add file3 &&
 	test_tick &&
 	git stash -u
 '
 
-blob=$(git rev-parse --short $(echo 4 | git hash-object --stdin))
-cat > expect <<EOF
-diff --git a/file3 b/file3
-new file mode 100644
-index 0000000..$blob
---- /dev/null
-+++ b/file3
-@@ -0,0 +1 @@
-+4
-EOF
-
 test_expect_success 'stash save --include-untracked dirty index got stashed' '
+	four_blob=$(echo 4 | git hash-object --stdin) &&
+	blob=$(git rev-parse --short "$four_blob") &&
+	cat >expect <<-EOF &&
+	diff --git a/file3 b/file3
+	new file mode 100644
+	index 0000000..$blob
+	--- /dev/null
+	+++ b/file3
+	@@ -0,0 +1 @@
+	+4
+	EOF
+
 	git stash pop --index &&
+	test_when_finished "git reset" &&
 	git diff --cached >actual &&
 	test_cmp expect actual
 '
 
-git reset > /dev/null
-
 # Must direct output somewhere where it won't be considered an untracked file
 test_expect_success 'stash save --include-untracked -q is quiet' '
-	echo 1 > file5 &&
-	git stash save --include-untracked --quiet > .git/stash-output.out 2>&1 &&
+	echo 1 >file5 &&
+	git stash save --include-untracked --quiet >.git/stash-output.out 2>&1 &&
 	test_line_count = 0 .git/stash-output.out &&
 	rm -f .git/stash-output.out
 '
@@ -141,35 +150,34 @@ test_expect_success 'stash save --include-untracked -q is quiet' '
 test_expect_success 'stash save --include-untracked removed files' '
 	rm -f file &&
 	git stash save --include-untracked &&
-	echo 1 > expect &&
+	echo 1 >expect &&
+	test_when_finished "rm -f expect" &&
 	test_cmp expect file
 '
 
-rm -f expect
-
 test_expect_success 'stash save --include-untracked removed files got stashed' '
 	git stash pop &&
 	test_path_is_missing file
 '
 
-cat > .gitignore <<EOF
-.gitignore
-ignored
-ignored.d/
-EOF
-
 test_expect_success 'stash save --include-untracked respects .gitignore' '
-	echo ignored > ignored &&
+	cat >.gitignore <<-EOF &&
+	.gitignore
+	ignored
+	ignored.d/
+	EOF
+
+	echo ignored >ignored &&
 	mkdir ignored.d &&
 	echo ignored >ignored.d/untracked &&
 	git stash -u &&
-	test -s ignored &&
-	test -s ignored.d/untracked &&
-	test -s .gitignore
+	test_file_not_empty ignored &&
+	test_file_not_empty ignored.d/untracked &&
+	test_file_not_empty .gitignore
 '
 
 test_expect_success 'stash save -u can stash with only untracked files different' '
-	echo 4 > file4 &&
+	echo 4 >file4 &&
 	git stash -u &&
 	test_path_is_missing file4
 '
@@ -183,9 +191,9 @@ test_expect_success 'stash save --all does not respect .gitignore' '
 
 test_expect_success 'stash save --all is stash poppable' '
 	git stash pop &&
-	test -s ignored &&
-	test -s ignored.d/untracked &&
-	test -s .gitignore
+	test_file_not_empty ignored &&
+	test_file_not_empty ignored.d/untracked &&
+	test_file_not_empty .gitignore
 '
 
 test_expect_success 'stash push --include-untracked with pathspec' '
@@ -214,17 +222,17 @@ test_expect_success 'stash push with $IFS character' '
 	test_path_is_file bar
 '
 
-cat > .gitignore <<EOF
-ignored
-ignored.d/*
-EOF
-
 test_expect_success 'stash previously ignored file' '
+	cat >.gitignore <<-EOF &&
+	ignored
+	ignored.d/*
+	EOF
+
 	git reset HEAD &&
 	git add .gitignore &&
 	git commit -m "Add .gitignore" &&
 	>ignored.d/foo &&
-	echo "!ignored.d/foo" >> .gitignore &&
+	echo "!ignored.d/foo" >>.gitignore &&
 	git stash save --include-untracked &&
 	test_path_is_missing ignored.d/foo &&
 	git stash pop &&
@@ -277,10 +285,10 @@ test_expect_success 'stash -u -- <ignored> leaves ignored file alone' '
 	test_path_is_file ignored.d/bar
 '
 
-test_expect_success 'stash -u -- <non-existant> shows no changes when there are none' '
-	git stash push -u -- non-existant >actual &&
+test_expect_success 'stash -u -- <non-existent> shows no changes when there are none' '
+	git stash push -u -- non-existent >actual &&
 	echo "No local changes to save" >expect &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'stash -u with globs' '
@@ -289,4 +297,129 @@ test_expect_success 'stash -u with globs' '
 	test_path_is_missing untracked.txt
 '
 
+test_expect_success 'stash show --include-untracked shows untracked files' '
+	git reset --hard &&
+	git clean -xf &&
+	>untracked &&
+	>tracked &&
+	git add tracked &&
+	empty_blob_oid=$(git rev-parse --short :tracked) &&
+	git stash -u &&
+
+	cat >expect <<-EOF &&
+	 tracked   | 0
+	 untracked | 0
+	 2 files changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git stash show --include-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show -u >actual &&
+	test_cmp expect actual &&
+	git stash show --no-include-untracked --include-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --only-untracked --include-untracked >actual &&
+	test_cmp expect actual &&
+	git -c stash.showIncludeUntracked=true stash show >actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-EOF &&
+	diff --git a/tracked b/tracked
+	new file mode 100644
+	index 0000000..$empty_blob_oid
+	diff --git a/untracked b/untracked
+	new file mode 100644
+	index 0000000..$empty_blob_oid
+	EOF
+	git stash show -p --include-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --include-untracked -p >actual &&
+	test_cmp expect actual &&
+	git -c stash.showIncludeUntracked=true stash show -p >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'stash show --only-untracked only shows untracked files' '
+	git reset --hard &&
+	git clean -xf &&
+	>untracked &&
+	>tracked &&
+	git add tracked &&
+	empty_blob_oid=$(git rev-parse --short :tracked) &&
+	git stash -u &&
+
+	cat >expect <<-EOF &&
+	 untracked | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git stash show --only-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --no-include-untracked --only-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --include-untracked --only-untracked >actual &&
+	test_cmp expect actual &&
+
+	cat >expect <<-EOF &&
+	diff --git a/untracked b/untracked
+	new file mode 100644
+	index 0000000..$empty_blob_oid
+	EOF
+	git stash show -p --only-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --only-untracked -p >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'stash show --no-include-untracked cancels --{include,only}-untracked' '
+	git reset --hard &&
+	git clean -xf &&
+	>untracked &&
+	>tracked &&
+	git add tracked &&
+	git stash -u &&
+
+	cat >expect <<-EOF &&
+	 tracked | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	git stash show --only-untracked --no-include-untracked >actual &&
+	test_cmp expect actual &&
+	git stash show --include-untracked --no-include-untracked >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'stash show --include-untracked errors on duplicate files' '
+	git reset --hard &&
+	git clean -xf &&
+	>tracked &&
+	git add tracked &&
+	tree=$(git write-tree) &&
+	i_commit=$(git commit-tree -p HEAD -m "index on any-branch" "$tree") &&
+	test_when_finished "rm -f untracked_index" &&
+	u_commit=$(
+		GIT_INDEX_FILE="untracked_index" &&
+		export GIT_INDEX_FILE &&
+		git update-index --add tracked &&
+		u_tree=$(git write-tree) &&
+		git commit-tree -m "untracked files on any-branch" "$u_tree"
+	) &&
+	w_commit=$(git commit-tree -p HEAD -p "$i_commit" -p "$u_commit" -m "WIP on any-branch" "$tree") &&
+	test_must_fail git stash show --include-untracked "$w_commit" 2>err &&
+	test_i18ngrep "worktree and untracked commit have duplicate entries: tracked" err
+'
+
+test_expect_success 'stash show --{include,only}-untracked on stashes without untracked entries' '
+	git reset --hard &&
+	git clean -xf &&
+	>tracked &&
+	git add tracked &&
+	git stash &&
+
+	git stash show >expect &&
+	git stash show --include-untracked >actual &&
+	test_cmp expect actual &&
+
+	git stash show --only-untracked >actual &&
+	test_must_be_empty actual
+'
+
 test_done
diff --git a/t/t3906-stash-submodule.sh b/t/t3906-stash-submodule.sh
index b93d1d74da..a52e53dd2d 100755
--- a/t/t3906-stash-submodule.sh
+++ b/t/t3906-stash-submodule.sh
@@ -8,7 +8,12 @@ test_description='stash can handle submodules'
 git_stash () {
 	git status -su >expect &&
 	ls -1pR * >>expect &&
-	git read-tree -u -m "$1" &&
+	may_only_be_test_must_fail "$2" &&
+	$2 git read-tree -u -m "$1" &&
+	if test -n "$2"
+	then
+		return
+	fi &&
 	git stash &&
 	git status -su >actual &&
 	ls -1pR * >>actual &&
@@ -19,7 +24,7 @@ git_stash () {
 KNOWN_FAILURE_STASH_DOES_IGNORE_SUBMODULE_CHANGES=1
 KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1
 KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
-test_submodule_switch "git_stash"
+test_submodule_switch_func "git_stash"
 
 setup_basic () {
 	test_when_finished "rm -rf main sub" &&
diff --git a/t/t3909-stash-pathspec-file.sh b/t/t3909-stash-pathspec-file.sh
new file mode 100755
index 0000000000..55e050cfd4
--- /dev/null
+++ b/t/t3909-stash-pathspec-file.sh
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+test_description='stash --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	>fileA.t &&
+	>fileB.t &&
+	>fileC.t &&
+	>fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t &&
+	git commit -m "Files" &&
+
+	git tag checkpoint
+'
+
+restore_checkpoint () {
+	git reset --hard checkpoint
+}
+
+verify_expect () {
+	git stash show --name-status >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success 'simplest' '
+	restore_checkpoint &&
+
+	# More files are written to make sure that git didnt ignore
+	# --pathspec-from-file, stashing everything
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+
+	cat >expect <<-\EOF &&
+	M	fileA.t
+	EOF
+
+	echo fileA.t | git stash push --pathspec-from-file=- &&
+	verify_expect
+'
+
+test_expect_success '--pathspec-file-nul' '
+	restore_checkpoint &&
+
+	# More files are written to make sure that git didnt ignore
+	# --pathspec-from-file, stashing everything
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+
+	cat >expect <<-\EOF &&
+	M	fileA.t
+	M	fileB.t
+	EOF
+
+	printf "fileA.t\0fileB.t\0" | git stash push --pathspec-from-file=- --pathspec-file-nul &&
+	verify_expect
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	# More files are written to make sure that git didnt ignore
+	# --pathspec-from-file, stashing everything
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+
+	cat >expect <<-\EOF &&
+	M	fileB.t
+	M	fileC.t
+	EOF
+
+	printf "fileB.t\nfileC.t\n" | git stash push --pathspec-from-file=- &&
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo A >fileA.t &&
+	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_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_must_fail git stash push --pathspec-file-nul 2>err &&
+	test_i18ngrep -e "--pathspec-file-nul requires --pathspec-from-file" err
+'
+
+test_done
diff --git a/t/t3910-mac-os-precompose.sh b/t/t3910-mac-os-precompose.sh
index 54ce19e353..898267a6bd 100755
--- a/t/t3910-mac-os-precompose.sh
+++ b/t/t3910-mac-os-precompose.sh
@@ -5,6 +5,9 @@
 
 test_description='utf-8 decomposed (nfd) converted to precomposed (nfc)'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq UTF8_NFD_TO_NFC
@@ -151,7 +154,7 @@ test_expect_success "git checkout link nfd" '
 	git checkout l.$Odiarnfd
 '
 test_expect_success "setup case mac2" '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard &&
 	git checkout -b mac_os_2
 '
@@ -163,7 +166,7 @@ test_expect_success "commit file d2.Adiarnfd/f.Adiarnfd" '
 	git commit -m "add d2.$Adiarnfd/f.$Adiarnfd" -- d2.$Adiarnfd/f.$Adiarnfd
 '
 test_expect_success "setup for long decomposed filename" '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard &&
 	git checkout -b mac_os_long_nfd_fn
 '
@@ -173,7 +176,7 @@ test_expect_success "Add long decomposed filename" '
 	git commit -m "Long filename"
 '
 test_expect_success "setup for long precomposed filename" '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard &&
 	git checkout -b mac_os_long_nfc_fn
 '
@@ -191,6 +194,22 @@ test_expect_failure 'handle existing decomposed filenames' '
 	test_must_be_empty untracked
 '
 
+test_expect_success "unicode decomposed: git restore -p . " '
+	DIRNAMEPWD=dir.Odiarnfc &&
+	DIRNAMEINREPO=dir.$Adiarnfc &&
+	export DIRNAMEPWD DIRNAMEINREPO &&
+	git init "$DIRNAMEPWD" &&
+	(
+		cd "$DIRNAMEPWD" &&
+		mkdir "$DIRNAMEINREPO" &&
+		cd "$DIRNAMEINREPO" &&
+		echo "Initial" >file &&
+		git add file &&
+		echo "More stuff" >>file &&
+		echo y | git restore -p .
+	)
+'
+
 # Test if the global core.precomposeunicode stops autosensing
 # Must be the last test case
 test_expect_success "respect git config --global core.precomposeunicode" '
diff --git a/t/t3920-crlf-messages.sh b/t/t3920-crlf-messages.sh
new file mode 100755
index 0000000000..a8ad5462d9
--- /dev/null
+++ b/t/t3920-crlf-messages.sh
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+test_description='Test ref-filter and pretty APIs for commit and tag messages using CRLF'
+. ./test-lib.sh
+
+LIB_CRLF_BRANCHES=""
+
+create_crlf_ref () {
+	branch="$1" &&
+	cat >.crlf-orig-$branch.txt &&
+	cat .crlf-orig-$branch.txt | append_cr >.crlf-message-$branch.txt &&
+	grep 'Subject' .crlf-orig-$branch.txt | tr '\n' ' ' | sed 's/[ ]*$//' | tr -d '\n' >.crlf-subject-$branch.txt &&
+	grep 'Body' .crlf-message-$branch.txt >.crlf-body-$branch.txt || true &&
+	LIB_CRLF_BRANCHES="${LIB_CRLF_BRANCHES} ${branch}" &&
+	test_tick &&
+	hash=$(git commit-tree HEAD^{tree} -p HEAD -F .crlf-message-${branch}.txt) &&
+	git branch ${branch} ${hash} &&
+	git tag tag-${branch} ${branch} -F .crlf-message-${branch}.txt --cleanup=verbatim
+}
+
+create_crlf_refs () {
+	create_crlf_ref crlf <<-\EOF &&
+	Subject first line
+
+	Body first line
+	Body second line
+	EOF
+	create_crlf_ref crlf-empty-lines-after-subject <<-\EOF &&
+	Subject first line
+
+
+	Body first line
+	Body second line
+	EOF
+	create_crlf_ref crlf-two-line-subject <<-\EOF &&
+	Subject first line
+	Subject second line
+
+	Body first line
+	Body second line
+	EOF
+	create_crlf_ref crlf-two-line-subject-no-body <<-\EOF &&
+	Subject first line
+	Subject second line
+	EOF
+	create_crlf_ref crlf-two-line-subject-no-body-trailing-newline <<-\EOF
+	Subject first line
+	Subject second line
+
+	EOF
+}
+
+test_crlf_subject_body_and_contents() {
+	command_and_args="$@" &&
+	command=$1 &&
+	if test ${command} = "branch" || test ${command} = "for-each-ref" || test ${command} = "tag"
+	then
+		atoms="(contents:subject) (contents:body) (contents)"
+	elif test ${command} = "log" || test ${command} = "show"
+	then
+		atoms="s b B"
+	fi &&
+	files="subject body message" &&
+	while test -n "${atoms}"
+	do
+		set ${atoms} && atom=$1 && shift && atoms="$*" &&
+		set ${files} && file=$1 && shift && files="$*" &&
+		test_expect_success "${command}: --format='%${atom}' works with messages using CRLF" "
+			rm -f expect &&
+			for ref in ${LIB_CRLF_BRANCHES}
+			do
+				cat .crlf-${file}-\"\${ref}\".txt >>expect &&
+				printf \"\n\" >>expect
+			done &&
+			git $command_and_args --format=\"%${atom}\" >actual &&
+			test_cmp expect actual
+		"
+	done
+}
+
+
+test_expect_success 'Setup refs with commit and tag messages using CRLF' '
+	test_commit inital &&
+	create_crlf_refs
+'
+
+test_expect_success 'branch: --verbose works with messages using CRLF' '
+	rm -f expect &&
+	for branch in $LIB_CRLF_BRANCHES
+	do
+		printf "  " >>expect &&
+		cat .crlf-subject-${branch}.txt >>expect &&
+		printf "\n" >>expect
+	done &&
+	git branch -v >tmp &&
+	# Remove first two columns, and the line for the currently checked out branch
+	current=$(git branch --show-current) &&
+	grep -v $current <tmp | awk "{\$1=\$2=\"\"}1"  >actual &&
+	test_cmp expect actual
+'
+
+test_crlf_subject_body_and_contents branch --list crlf*
+
+test_crlf_subject_body_and_contents tag --list tag-crlf*
+
+test_crlf_subject_body_and_contents for-each-ref refs/heads/crlf*
+
+test_expect_success 'log: --oneline works with messages using CRLF' '
+	for branch in $LIB_CRLF_BRANCHES
+	do
+		cat .crlf-subject-${branch}.txt >expect &&
+		printf "\n" >>expect &&
+		git log --oneline -1 ${branch} >tmp-branch &&
+		git log --oneline -1 tag-${branch} >tmp-tag &&
+		cut -d" " -f2- <tmp-branch >actual-branch &&
+		cut -d" " -f2- <tmp-tag >actual-tag &&
+		test_cmp expect actual-branch &&
+		test_cmp expect actual-tag || return 1
+	done
+'
+
+test_crlf_subject_body_and_contents log --all --reverse --grep Subject
+
+test_crlf_subject_body_and_contents show $LIB_CRLF_BRANCHES
+
+test_done
diff --git a/t/t4000-diff-format.sh b/t/t4000-diff-format.sh
index e5116a76a1..cce334981e 100755
--- a/t/t4000-diff-format.sh
+++ b/t/t4000-diff-format.sh
@@ -7,7 +7,7 @@ test_description='Test built-in diff output engine.
 
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 echo >path0 'Line 1
 Line 2
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index c16486a9d4..68f2ebca58 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -7,7 +7,7 @@ test_description='Test rename detection in diff engine.
 
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 test_expect_success 'setup' '
 	cat >path0 <<-\EOF &&
@@ -262,4 +262,28 @@ test_expect_success 'diff-tree -l0 defaults to a big rename limit, not zero' '
 	grep "myotherfile.*myfile" actual
 '
 
+test_expect_success 'basename similarity vs best similarity' '
+	mkdir subdir &&
+	test_write_lines line1 line2 line3 line4 line5 \
+			 line6 line7 line8 line9 line10 >subdir/file.txt &&
+	git add subdir/file.txt &&
+	git commit -m "base txt" &&
+
+	git rm subdir/file.txt &&
+	test_write_lines line1 line2 line3 line4 line5 \
+			  line6 line7 line8 >file.txt &&
+	test_write_lines line1 line2 line3 line4 line5 \
+			  line6 line7 line8 line9 >file.md &&
+	git add file.txt file.md &&
+	git commit -a -m "rename" &&
+	git diff-tree -r -M --name-status HEAD^ HEAD >actual &&
+	# subdir/file.txt is 88% similar to file.md, 78% similar to file.txt,
+	# but since same basenames are checked first...
+	cat >expected <<-\EOF &&
+	A	file.md
+	R078	subdir/file.txt	file.txt
+	EOF
+	test_cmp expected actual
+'
+
 test_done
diff --git a/t/t4002-diff-basic.sh b/t/t4002-diff-basic.sh
index cbcdd10464..6a9f010197 100755
--- a/t/t4002-diff-basic.sh
+++ b/t/t4002-diff-basic.sh
@@ -10,8 +10,6 @@ test_description='Test diff raw-output.
 
 . "$TEST_DIRECTORY"/lib-read-tree-m-3way.sh
 
-test_oid_init
-
 test_oid_cache <<\EOF
 aa_1 sha1:ccba72ad3888a3520b39efcf780b9ee64167535d
 aa_1 sha256:9febfbf18197819b2735c45291f138525d2476d59470f98239647544586ba403
diff --git a/t/t4003-diff-rename-1.sh b/t/t4003-diff-rename-1.sh
index df2accb655..db07ff3eb1 100755
--- a/t/t4003-diff-rename-1.sh
+++ b/t/t4003-diff-rename-1.sh
@@ -7,11 +7,11 @@ test_description='More rename detection
 
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
 test_expect_success \
     'prepare reference tree' \
-    'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+    'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
      echo frotz >rezrov &&
     git update-index --add COPYING rezrov &&
     tree=$(git write-tree) &&
@@ -99,7 +99,7 @@ test_expect_success \
 
 test_expect_success \
     'prepare work tree once again' \
-    'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+    'cat "$TEST_DIRECTORY"/lib-diff/COPYING >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 6e562c80d1..3d495e37bb 100755
--- a/t/t4004-diff-rename-symlink.sh
+++ b/t/t4004-diff-rename-symlink.sh
@@ -10,7 +10,7 @@ copy of symbolic links, but should not produce rename/copy followed
 by an edit for them.
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 test_expect_success SYMLINKS \
     'prepare reference tree' \
diff --git a/t/t4005-diff-rename-2.sh b/t/t4005-diff-rename-2.sh
index f542d2929d..8647906132 100755
--- a/t/t4005-diff-rename-2.sh
+++ b/t/t4005-diff-rename-2.sh
@@ -6,16 +6,16 @@
 test_description='Same rename detection as t4003 but testing diff-raw.'
 
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
 test_expect_success 'setup reference tree' '
-	cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+	cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
 	echo frotz >rezrov &&
 	git update-index --add COPYING rezrov &&
 	tree=$(git write-tree) &&
 	echo $tree &&
-	sed -e 's/HOWEVER/However/' <COPYING >COPYING.1 &&
-	sed -e 's/GPL/G.P.L/g' <COPYING >COPYING.2 &&
+	sed -e "s/HOWEVER/However/" <COPYING >COPYING.1 &&
+	sed -e "s/GPL/G.P.L/g" <COPYING >COPYING.2 &&
 	origoid=$(git hash-object COPYING) &&
 	oid1=$(git hash-object COPYING.1) &&
 	oid2=$(git hash-object COPYING.2)
@@ -64,7 +64,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"/diff-lib/COPYING >COPYING &&
+	cat "$TEST_DIRECTORY"/lib-diff/COPYING >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 03489aff14..6cdee2a216 100755
--- a/t/t4006-diff-mode.sh
+++ b/t/t4006-diff-mode.sh
@@ -26,10 +26,8 @@ test_expect_success 'chmod' '
 '
 
 test_expect_success 'prepare binary file' '
-	git commit -m rezrov &&
-	printf "\00\01\02\03\04\05\06" >binbin &&
-	git add binbin &&
-	git commit -m binbin
+	git commit -m one &&
+	test_commit --printf two binbin "\00\01\02\03\04\05\06"
 '
 
 test_expect_success '--stat output after text chmod' '
@@ -39,13 +37,13 @@ test_expect_success '--stat output after text chmod' '
 	 1 file changed, 0 insertions(+), 0 deletions(-)
 	EOF
 	git diff HEAD --stat >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success '--shortstat output after text chmod' '
 	tail -n 1 <expect >expect.short &&
 	git diff HEAD --shortstat >actual &&
-	test_i18ncmp expect.short actual
+	test_cmp expect.short actual
 '
 
 test_expect_success '--stat output after binary chmod' '
@@ -56,13 +54,13 @@ test_expect_success '--stat output after binary chmod' '
 	 2 files changed, 0 insertions(+), 0 deletions(-)
 	EOF
 	git diff HEAD --stat >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success '--shortstat output after binary chmod' '
 	tail -n 1 <expect >expect.short &&
 	git diff HEAD --shortstat >actual &&
-	test_i18ncmp expect.short actual
+	test_cmp expect.short actual
 '
 
 test_done
diff --git a/t/t4007-rename-3.sh b/t/t4007-rename-3.sh
index b187b7f6c6..cbb9c62f53 100755
--- a/t/t4007-rename-3.sh
+++ b/t/t4007-rename-3.sh
@@ -7,17 +7,17 @@ test_description='Rename interaction with pathspec.
 
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
 test_expect_success 'prepare reference tree' '
 	mkdir path0 path1 &&
-	cp "$TEST_DIRECTORY"/diff-lib/COPYING path0/COPYING &&
+	cp "$TEST_DIRECTORY"/lib-diff/COPYING path0/COPYING &&
 	git update-index --add path0/COPYING &&
 	tree=$(git write-tree) &&
 	echo $tree
 '
 
-blob=$(git hash-object "$TEST_DIRECTORY/diff-lib/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 b1ccd4102e..2299f27511 100755
--- a/t/t4008-diff-break-rewrite.sh
+++ b/t/t4008-diff-break-rewrite.sh
@@ -22,11 +22,11 @@ With -B, this should be detected as two complete rewrites.
 Further, with -B and -M together, these should turn into two renames.
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
 test_expect_success setup '
-	cat "$TEST_DIRECTORY"/diff-lib/README >file0 &&
-	cat "$TEST_DIRECTORY"/diff-lib/COPYING >file1 &&
+	cat "$TEST_DIRECTORY"/lib-diff/README >file0 &&
+	cat "$TEST_DIRECTORY"/lib-diff/COPYING >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 b63bdf031f..b1da807f16 100755
--- a/t/t4009-diff-rename-4.sh
+++ b/t/t4009-diff-rename-4.sh
@@ -7,11 +7,11 @@ test_description='Same rename detection as t4003 but testing diff-raw -z.
 
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
 test_expect_success \
     'prepare reference tree' \
-    'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+    'cat "$TEST_DIRECTORY"/lib-diff/COPYING >COPYING &&
      echo frotz >rezrov &&
     git update-index --add COPYING rezrov &&
     orig=$(git hash-object COPYING) &&
@@ -81,7 +81,7 @@ test_expect_success \
 
 test_expect_success \
     'prepare work tree once again' \
-    'cat "$TEST_DIRECTORY"/diff-lib/COPYING >COPYING &&
+    'cat "$TEST_DIRECTORY"/lib-diff/COPYING >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 281f8fad0c..1bbced79ec 100755
--- a/t/t4010-diff-pathspec.sh
+++ b/t/t4010-diff-pathspec.sh
@@ -10,18 +10,22 @@ Prepare:
         path1/file1
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
 test_expect_success \
     setup \
     'echo frotz >file0 &&
      mkdir path1 &&
      echo rezrov >path1/file1 &&
+     before0=$(git hash-object file0) &&
+     before1=$(git hash-object path1/file1) &&
      git update-index --add file0 path1/file1 &&
      tree=$(git write-tree) &&
      echo "$tree" &&
      echo nitfol >file0 &&
      echo yomin >path1/file1 &&
+     after0=$(git hash-object file0) &&
+     after1=$(git hash-object path1/file1) &&
      git update-index file0 path1/file1'
 
 cat >expected <<\EOF
@@ -31,32 +35,32 @@ test_expect_success \
     'git diff-index --cached $tree -- path >current &&
      compare_diff_raw current expected'
 
-cat >expected <<\EOF
-:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M	path1/file1
+cat >expected <<EOF
+:100644 100644 $before1 $after1 M	path1/file1
 EOF
 test_expect_success \
     'limit to path1 should show path1/file1' \
     'git diff-index --cached $tree -- path1 >current &&
      compare_diff_raw current expected'
 
-cat >expected <<\EOF
-:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M	path1/file1
+cat >expected <<EOF
+:100644 100644 $before1 $after1 M	path1/file1
 EOF
 test_expect_success \
     'limit to path1/ should show path1/file1' \
     'git diff-index --cached $tree -- path1/ >current &&
      compare_diff_raw current expected'
 
-cat >expected <<\EOF
-:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M	path1/file1
+cat >expected <<EOF
+:100644 100644 $before1 $after1 M	path1/file1
 EOF
 test_expect_success \
     '"*file1" should show path1/file1' \
     'git diff-index --cached $tree -- "*file1" >current &&
      compare_diff_raw current expected'
 
-cat >expected <<\EOF
-:100644 100644 8e4020bb5a8d8c873b25de15933e75cc0fc275df dca6b92303befc93086aa025d90a5facd7eb2812 M	file0
+cat >expected <<EOF
+:100644 100644 $before0 $after0 M	file0
 EOF
 test_expect_success \
     'limit to file0 should show file0' \
@@ -121,7 +125,9 @@ test_expect_success 'setup submodules' '
 test_expect_success 'diff-tree ignores trailing slash on submodule path' '
 	git diff --name-only HEAD^ HEAD submod >expect &&
 	git diff --name-only HEAD^ HEAD submod/ >actual &&
-	test_cmp expect actual
+	test_cmp expect actual &&
+	git diff --name-only HEAD^ HEAD -- submod/whatever >actual &&
+	test_must_be_empty actual
 '
 
 test_expect_success 'diff multiple wildcard pathspecs' '
diff --git a/t/t4011-diff-symlink.sh b/t/t4011-diff-symlink.sh
index 5ae19b987d..5a25c259fe 100755
--- a/t/t4011-diff-symlink.sh
+++ b/t/t4011-diff-symlink.sh
@@ -7,13 +7,26 @@ test_description='Test diff of symlinks.
 
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
+
+# Print the short OID of a symlink with the given name.
+symlink_oid () {
+	local oid=$(printf "%s" "$1" | git hash-object --stdin) &&
+	git rev-parse --short "$oid"
+}
+
+# Print the short OID of the given file.
+short_oid () {
+	local oid=$(git hash-object "$1") &&
+	git rev-parse --short "$oid"
+}
 
 test_expect_success 'diff new symlink and file' '
-	cat >expected <<-\EOF &&
+	symlink=$(symlink_oid xyzzy) &&
+	cat >expected <<-EOF &&
 	diff --git a/frotz b/frotz
 	new file mode 120000
-	index 0000000..7c465af
+	index 0000000..$symlink
 	--- /dev/null
 	+++ b/frotz
 	@@ -0,0 +1 @@
@@ -21,7 +34,7 @@ test_expect_success 'diff new symlink and file' '
 	\ No newline at end of file
 	diff --git a/nitfol b/nitfol
 	new file mode 100644
-	index 0000000..7c465af
+	index 0000000..$symlink
 	--- /dev/null
 	+++ b/nitfol
 	@@ -0,0 +1 @@
@@ -46,10 +59,10 @@ test_expect_success 'diff unchanged symlink and file'  '
 '
 
 test_expect_success 'diff removed symlink and file' '
-	cat >expected <<-\EOF &&
+	cat >expected <<-EOF &&
 	diff --git a/frotz b/frotz
 	deleted file mode 120000
-	index 7c465af..0000000
+	index $symlink..0000000
 	--- a/frotz
 	+++ /dev/null
 	@@ -1 +0,0 @@
@@ -57,7 +70,7 @@ test_expect_success 'diff removed symlink and file' '
 	\ No newline at end of file
 	diff --git a/nitfol b/nitfol
 	deleted file mode 100644
-	index 7c465af..0000000
+	index $symlink..0000000
 	--- a/nitfol
 	+++ /dev/null
 	@@ -1 +0,0 @@
@@ -90,9 +103,10 @@ test_expect_success 'diff identical, but newly created symlink and file' '
 '
 
 test_expect_success 'diff different symlink and file' '
-	cat >expected <<-\EOF &&
+	new=$(symlink_oid yxyyz) &&
+	cat >expected <<-EOF &&
 	diff --git a/frotz b/frotz
-	index 7c465af..df1db54 120000
+	index $symlink..$new 120000
 	--- a/frotz
 	+++ b/frotz
 	@@ -1 +1 @@
@@ -101,7 +115,7 @@ test_expect_success 'diff different symlink and file' '
 	+yxyyz
 	\ No newline at end of file
 	diff --git a/nitfol b/nitfol
-	index 7c465af..df1db54 100644
+	index $symlink..$new 100644
 	--- a/nitfol
 	+++ b/nitfol
 	@@ -1 +1 @@
@@ -137,14 +151,16 @@ test_expect_success SYMLINKS 'setup symlinks with attributes' '
 '
 
 test_expect_success SYMLINKS 'symlinks do not respect userdiff config by path' '
-	cat >expect <<-\EOF &&
+	file=$(short_oid file.bin) &&
+	link=$(symlink_oid file.bin) &&
+	cat >expect <<-EOF &&
 	diff --git a/file.bin b/file.bin
 	new file mode 100644
-	index 0000000..d95f3ad
+	index 0000000..$file
 	Binary files /dev/null and b/file.bin differ
 	diff --git a/link.bin b/link.bin
 	new file mode 120000
-	index 0000000..dce41ec
+	index 0000000..$link
 	--- /dev/null
 	+++ b/link.bin
 	@@ -0,0 +1 @@
diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh
index 6579c81216..33ff588ebc 100755
--- a/t/t4012-diff-binary.sh
+++ b/t/t4012-diff-binary.sh
@@ -34,19 +34,19 @@ EOF
 test_expect_success 'apply --stat output for binary file change' '
 	git diff >diff &&
 	git apply --stat --summary <diff >current &&
-	test_i18ncmp expected current
+	test_cmp expected current
 '
 
 test_expect_success 'diff --shortstat output for binary file change' '
 	tail -n 1 expected >expect &&
 	git diff --shortstat >current &&
-	test_i18ncmp expect current
+	test_cmp expect current
 '
 
 test_expect_success 'diff --shortstat output for binary file change only' '
 	echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected &&
 	git diff --shortstat -- b >current &&
-	test_i18ncmp expected current
+	test_cmp expected current
 '
 
 test_expect_success 'apply --numstat notices binary file change' '
@@ -63,7 +63,7 @@ test_expect_success 'apply --numstat understands diff --binary format' '
 
 # apply needs to be able to skip the binary material correctly
 # in order to report the line number of a corrupt patch.
-test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
+test_expect_success 'apply detecting corrupt patch correctly' '
 	git diff >output &&
 	sed -e "s/-CIT/xCIT/" <output >broken &&
 	test_must_fail git apply --stat --summary broken 2>detected &&
@@ -73,7 +73,7 @@ test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
 	test "$detected" = xCIT
 '
 
-test_expect_success C_LOCALE_OUTPUT 'apply detecting corrupt patch correctly' '
+test_expect_success 'apply detecting corrupt patch correctly' '
 	git diff --binary | sed -e "s/-CIT/xCIT/" >broken &&
 	test_must_fail git apply --stat --summary broken 2>detected &&
 	detected=$(cat detected) &&
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index 5ac94b390d..28683d059d 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -5,7 +5,11 @@
 
 test_description='Various diff formatting options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 test_expect_success setup '
 
@@ -61,7 +65,7 @@ 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" &&
@@ -95,6 +99,15 @@ test_expect_success setup '
 	git commit -m "update mode" &&
 	git checkout -f master &&
 
+	GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
+	GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
+	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+	git checkout -b note initial &&
+	git update-index --chmod=+x file2 &&
+	git commit -m "update mode (file2)" &&
+	git notes add -m "note" &&
+	git checkout -f master &&
+
 	# Same merge as master, but with parents reversed. Hide it in a
 	# pseudo-ref to avoid impacting tests with --all.
 	commit=$(echo reverse |
@@ -120,9 +133,52 @@ test_expect_success setup '
 +*++ [initial] Initial
 EOF
 
+process_diffs () {
+	perl -e '
+		my $oid_length = length($ARGV[0]);
+		my $x40 = "[0-9a-f]{40}";
+		my $xab = "[0-9a-f]{4,16}";
+		my $orx = "[0-9a-f]" x $oid_length;
+
+		sub munge_oid {
+			my ($oid) = @_;
+			my $x;
+
+			return "" unless length $oid;
+
+			if ($oid =~ /^(100644|100755|120000)$/) {
+				return $oid;
+			}
+
+			if ($oid =~ /^0*$/) {
+				$x = "0";
+			} else {
+				$x = "f";
+			}
+
+			if (length($oid) == 40) {
+				return $x x $oid_length;
+			} else {
+				return $x x length($oid);
+			}
+		}
+
+		while (<STDIN>) {
+			s/($orx)/munge_oid($1)/ge;
+			s/From ($x40)( |\))/"From " . munge_oid($1) . $2/ge;
+			s/commit ($x40)($| \(from )($x40?)/"commit " .  munge_oid($1) . $2 . munge_oid($3)/ge;
+			s/\b($x40)( |\.\.|$)/munge_oid($1) . $2/ge;
+			s/^($x40)($| )/munge_oid($1) . $2/e;
+			s/($xab)(\.\.|,| |\.\.\.|$)/munge_oid($1) . $2/ge;
+			print;
+		}
+	' "$ZERO_OID" <"$1"
+}
+
 V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
 while read magic cmd
 do
+	status=success
 	case "$magic" in
 	'' | '#'*)
 		continue ;;
@@ -131,6 +187,10 @@ do
 		label="$magic-$cmd"
 		case "$magic" in
 		noellipses) ;;
+		failure)
+			status=failure
+			magic=
+			label="$cmd" ;;
 		*)
 			BUG "unknown magic $magic" ;;
 		esac ;;
@@ -143,7 +203,7 @@ do
 	expect="$TEST_DIRECTORY/t4013/diff.$test"
 	actual="$pfx-diff.$test"
 
-	test_expect_success "git $cmd # magic is ${magic:-(not used)}" '
+	test_expect_$status "git $cmd # magic is ${magic:-(not used)}" '
 		{
 			echo "$ git $cmd"
 			case "$magic" in
@@ -158,13 +218,15 @@ do
 		} >"$actual" &&
 		if test -f "$expect"
 		then
+			process_diffs "$actual" >actual &&
+			process_diffs "$expect" >expect &&
 			case $cmd in
 			*format-patch* | *-stat*)
-				test_i18ncmp "$expect" "$actual";;
+				test_cmp expect actual;;
 			*)
-				test_cmp "$expect" "$actual";;
+				test_cmp expect actual;;
 			esac &&
-			rm -f "$actual"
+			rm -f "$actual" actual expect
 		else
 			# this is to help developing new tests.
 			cp "$actual" "$expect"
@@ -186,6 +248,9 @@ diff-tree --root -r --abbrev=4 initial
 :noellipses diff-tree --root -r --abbrev=4 initial
 diff-tree -p initial
 diff-tree --root -p initial
+diff-tree --root -p --abbrev=10 initial
+diff-tree --root -p --full-index initial
+diff-tree --root -p --full-index --abbrev=10 initial
 diff-tree --patch-with-stat initial
 diff-tree --root --patch-with-stat initial
 diff-tree --patch-with-raw initial
@@ -228,6 +293,7 @@ diff-tree --stat initial mode
 diff-tree --summary initial mode
 
 diff-tree master
+diff-tree -m master
 diff-tree -p master
 diff-tree -p -m master
 diff-tree -c master
@@ -262,9 +328,18 @@ log --root --patch-with-stat --summary master
 log --root -c --patch-with-stat --summary master
 # improved by Timo's patch
 log --root --cc --patch-with-stat --summary master
+log --no-diff-merges -p --first-parent master
+log --diff-merges=off -p --first-parent master
+log --first-parent --diff-merges=off -p master
 log -p --first-parent master
+log -p --diff-merges=first-parent master
+log --diff-merges=first-parent master
 log -m -p --first-parent master
 log -m -p master
+log --cc -m -p master
+log -c -m -p master
+log -m --raw master
+log -m --stat master
 log -SF master
 log -S F master
 log -SF -p master
@@ -274,6 +349,7 @@ log -SF master --max-count=2
 log -GF master
 log -GF -p master
 log -GF -p --pickaxe-all master
+log -IA -IB -I1 -I2 -p master
 log --decorate --all
 log --decorate=full --all
 
@@ -372,10 +448,65 @@ diff --no-index --raw --no-abbrev dir2 dir
 
 diff-tree --pretty --root --stat --compact-summary initial
 diff-tree --pretty -R --root --stat --compact-summary initial
+diff-tree --pretty note
+diff-tree --pretty --notes note
+diff-tree --format=%N note
 diff-tree --stat --compact-summary initial mode
 diff-tree -R --stat --compact-summary initial mode
 EOF
 
+test_expect_success 'log -m matches pure log' '
+	git log master >result &&
+	process_diffs result >expected &&
+	git log -m >result &&
+	process_diffs result >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'log --diff-merges=on matches --diff-merges=separate' '
+	git log -p --diff-merges=separate master >result &&
+	process_diffs result >expected &&
+	git log -p --diff-merges=on master >result &&
+	process_diffs result >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'deny wrong log.diffMerges config' '
+	test_config log.diffMerges wrong-value &&
+	test_expect_code 128 git log
+'
+
+test_expect_success 'git config log.diffMerges first-parent' '
+	git log -p --diff-merges=first-parent master >result &&
+	process_diffs result >expected &&
+	test_config log.diffMerges first-parent &&
+	git log -p --diff-merges=on master >result &&
+	process_diffs result >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'git config log.diffMerges first-parent vs -m' '
+	git log -p --diff-merges=first-parent master >result &&
+	process_diffs result >expected &&
+	test_config log.diffMerges first-parent &&
+	git log -p -m master >result &&
+	process_diffs result >actual &&
+	test_cmp expected actual
+'
+
+# -m in "git diff-index" means "match missing", that differs
+# from its meaning in "git diff". Let's check it in diff-index.
+# The line in the output for removed file should disappear when
+# we provide -m in diff-index.
+test_expect_success 'git diff-index -m' '
+	rm -f file1 &&
+	git diff-index HEAD >without-m &&
+	lines_count=$(wc -l <without-m) &&
+	git diff-index -m HEAD >with-m &&
+	git restore file1 &&
+	test_line_count = $((lines_count - 1)) with-m
+'
+
 test_expect_success 'log -S requires an argument' '
 	test_must_fail git log -S
 '
@@ -383,16 +514,22 @@ test_expect_success 'log -S requires an argument' '
 test_expect_success 'diff --cached on unborn branch' '
 	echo ref: refs/heads/unborn >.git/HEAD &&
 	git diff --cached >result &&
-	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached" result
+	process_diffs result >actual &&
+	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached" >expected &&
+	test_cmp expected actual
 '
 
 test_expect_success 'diff --cached -- file on unborn branch' '
 	git diff --cached -- file0 >result &&
-	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" result
+	process_diffs result >actual &&
+	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--cached_--_file0" >expected &&
+	test_cmp expected actual
 '
 test_expect_success 'diff --line-prefix with spaces' '
 	git diff --line-prefix="| | | " --cached -- file0 >result &&
-	test_cmp "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" result
+	process_diffs result >actual &&
+	process_diffs "$TEST_DIRECTORY/t4013/diff.diff_--line-prefix_--cached_--_file0" >expected &&
+	test_cmp expected actual
 '
 
 test_expect_success 'diff-tree --stdin with log formatting' '
@@ -405,4 +542,43 @@ test_expect_success 'diff-tree --stdin with log formatting' '
 	test_cmp expect actual
 '
 
+test_expect_success 'diff -I<regex>: setup' '
+	git checkout master &&
+	test_seq 50 >file0 &&
+	git commit -m "Set up -I<regex> test file" file0 &&
+	test_seq 50 | sed -e "s/13/ten and three/" -e "/7\$/d" >file0 &&
+	echo >>file0
+'
+test_expect_success 'diff -I<regex>' '
+	git diff --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
+	cat >expect <<-\EOF &&
+	diff --git a/file0 b/file0
+	--- a/file0
+	+++ b/file0
+	@@ -34,7 +31,6 @@
+	 34
+	 35
+	 36
+	-37
+	 38
+	 39
+	 40
+	EOF
+	compare_diff_patch expect actual
+'
+
+test_expect_success 'diff -I<regex> --stat' '
+	git diff --stat --ignore-blank-lines -I"ten.*e" -I"^[124-9]" >actual &&
+	cat >expect <<-\EOF &&
+	 file0 | 1 -
+	 1 file changed, 1 deletion(-)
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'diff -I<regex>: detect malformed regex' '
+	test_expect_code 129 git diff --ignore-matching-lines="^[124-9" 2>error &&
+	test_i18ngrep "invalid regex given to -I: " error
+'
+
 test_done
diff --git a/t/t4013/diff.diff-tree_--format=%N_note b/t/t4013/diff.diff-tree_--format=%N_note
new file mode 100644
index 0000000000..93042ed539
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--format=%N_note
@@ -0,0 +1,6 @@
+$ git diff-tree --format=%N note
+note
+
+
+:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M	file2
+$
diff --git a/t/t4013/diff.diff-tree_--pretty_--notes_note b/t/t4013/diff.diff-tree_--pretty_--notes_note
new file mode 100644
index 0000000000..4d0bde601c
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--pretty_--notes_note
@@ -0,0 +1,12 @@
+$ git diff-tree --pretty --notes note
+commit a6f364368ca320bc5a92e18912e16fa6b3dff598
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:06:00 2006 +0000
+
+    update mode (file2)
+
+Notes:
+    note
+
+:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M	file2
+$
diff --git a/t/t4013/diff.diff-tree_--pretty_note b/t/t4013/diff.diff-tree_--pretty_note
new file mode 100644
index 0000000000..1fa5967083
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--pretty_note
@@ -0,0 +1,9 @@
+$ git diff-tree --pretty note
+commit a6f364368ca320bc5a92e18912e16fa6b3dff598
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:06:00 2006 +0000
+
+    update mode (file2)
+
+:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M	file2
+$
diff --git a/t/t4013/diff.diff-tree_--root_-p_--abbrev=10_initial b/t/t4013/diff.diff-tree_--root_-p_--abbrev=10_initial
new file mode 100644
index 0000000000..7518a9044e
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--root_-p_--abbrev=10_initial
@@ -0,0 +1,29 @@
+$ git diff-tree --root -p --abbrev=10 initial
+444ac553ac7612cc88969031b02b3767fb8a353a
+diff --git a/dir/sub b/dir/sub
+new file mode 100644
+index 0000000000..35d242ba79
+--- /dev/null
++++ b/dir/sub
+@@ -0,0 +1,2 @@
++A
++B
+diff --git a/file0 b/file0
+new file mode 100644
+index 0000000000..01e79c32a8
+--- /dev/null
++++ b/file0
+@@ -0,0 +1,3 @@
++1
++2
++3
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000000..01e79c32a8
+--- /dev/null
++++ b/file2
+@@ -0,0 +1,3 @@
++1
++2
++3
+$
diff --git a/t/t4013/diff.diff-tree_--root_-p_--full-index_--abbrev=10_initial b/t/t4013/diff.diff-tree_--root_-p_--full-index_--abbrev=10_initial
new file mode 100644
index 0000000000..69f913fbe5
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--root_-p_--full-index_--abbrev=10_initial
@@ -0,0 +1,29 @@
+$ git diff-tree --root -p --full-index --abbrev=10 initial
+444ac553ac7612cc88969031b02b3767fb8a353a
+diff --git a/dir/sub b/dir/sub
+new file mode 100644
+index 0000000000000000000000000000000000000000..35d242ba79ae89ac695e26b3d4c27a8e6f028f9e
+--- /dev/null
++++ b/dir/sub
+@@ -0,0 +1,2 @@
++A
++B
+diff --git a/file0 b/file0
+new file mode 100644
+index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d
+--- /dev/null
++++ b/file0
+@@ -0,0 +1,3 @@
++1
++2
++3
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d
+--- /dev/null
++++ b/file2
+@@ -0,0 +1,3 @@
++1
++2
++3
+$
diff --git a/t/t4013/diff.diff-tree_--root_-p_--full-index_initial b/t/t4013/diff.diff-tree_--root_-p_--full-index_initial
new file mode 100644
index 0000000000..1b0b6717fa
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--root_-p_--full-index_initial
@@ -0,0 +1,29 @@
+$ git diff-tree --root -p --full-index initial
+444ac553ac7612cc88969031b02b3767fb8a353a
+diff --git a/dir/sub b/dir/sub
+new file mode 100644
+index 0000000000000000000000000000000000000000..35d242ba79ae89ac695e26b3d4c27a8e6f028f9e
+--- /dev/null
++++ b/dir/sub
+@@ -0,0 +1,2 @@
++A
++B
+diff --git a/file0 b/file0
+new file mode 100644
+index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d
+--- /dev/null
++++ b/file0
+@@ -0,0 +1,3 @@
++1
++2
++3
+diff --git a/file2 b/file2
+new file mode 100644
+index 0000000000000000000000000000000000000000..01e79c32a8c99c557f0757da7cb6d65b3414466d
+--- /dev/null
++++ b/file2
+@@ -0,0 +1,3 @@
++1
++2
++3
+$
diff --git a/t/t4013/diff.diff-tree_-m_master b/t/t4013/diff.diff-tree_-m_master
new file mode 100644
index 0000000000..6d0a2207fb
--- /dev/null
+++ b/t/t4013/diff.diff-tree_-m_master
@@ -0,0 +1,11 @@
+$ git diff-tree -m master
+59d314ad6f356dd08601a4cd5e530381da3e3c64
+:040000 040000 65f5c9dd60ce3b2b3324b618ac7accf8d912c113 0564e026437809817a64fff393079714b6dd4628 M	dir
+:100644 100644 b414108e81e5091fe0974a1858b4d0d22b107f70 10a8a9f3657f91a156b9f0184ed79a20adef9f7f M	file0
+59d314ad6f356dd08601a4cd5e530381da3e3c64
+:040000 040000 f977ed46ae6873c1c30ab878e15a4accedc3618b 0564e026437809817a64fff393079714b6dd4628 M	dir
+:100644 100644 f4615da674c09df322d6ba8d6b21ecfb1b1ba510 10a8a9f3657f91a156b9f0184ed79a20adef9f7f M	file0
+:000000 100644 0000000000000000000000000000000000000000 b1e67221afe8461efd244b487afca22d46b95eb8 A	file1
+:100644 000000 01e79c32a8c99c557f0757da7cb6d65b3414466d 0000000000000000000000000000000000000000 D	file2
+:100644 000000 7289e35bff32727c08dda207511bec138fdb9ea5 0000000000000000000000000000000000000000 D	file3
+$
diff --git a/t/t4013/diff.log_--cc_-m_-p_master b/t/t4013/diff.log_--cc_-m_-p_master
new file mode 100644
index 0000000000..7c217cf348
--- /dev/null
+++ b/t/t4013/diff.log_--cc_-m_-p_master
@@ -0,0 +1,200 @@
+$ git log --cc -m -p master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+diff --git a/dir/sub b/dir/sub
+index cead32e..992913c 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -4,3 +4,5 @@ C
+ D
+ E
+ F
++1
++2
+diff --git a/file0 b/file0
+index b414108..10a8a9f 100644
+--- a/file0
++++ b/file0
+@@ -4,3 +4,6 @@
+ 4
+ 5
+ 6
++A
++B
++C
+
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+diff --git a/dir/sub b/dir/sub
+index 7289e35..992913c 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,4 +1,8 @@
+ A
+ B
++C
++D
++E
++F
+ 1
+ 2
+diff --git a/file0 b/file0
+index f4615da..10a8a9f 100644
+--- a/file0
++++ b/file0
+@@ -1,6 +1,9 @@
+ 1
+ 2
+ 3
++4
++5
++6
+ A
+ B
+ C
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+diff --git a/file3 b/file3
+deleted file mode 100644
+index 7289e35..0000000
+--- a/file3
++++ /dev/null
+@@ -1,4 +0,0 @@
+-A
+-B
+-1
+-2
+
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:03:00 2006 +0000
+
+    Side
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+
+diff --git a/dir/sub b/dir/sub
+index 8422d40..cead32e 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -2,3 +2,5 @@ A
+ B
+ C
+ D
++E
++F
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:01:00 2006 +0000
+
+    Second
+    
+    This is the second commit.
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..8422d40 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++C
++D
+diff --git a/file0 b/file0
+index 01e79c3..b414108 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++4
++5
++6
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+$
diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
index 2afe91f116..3f9b872ece 100644
--- a/t/t4013/diff.log_--decorate=full_--all
+++ b/t/t4013/diff.log_--decorate=full_--all
@@ -5,12 +5,27 @@ Date:   Mon Jun 26 00:06:00 2006 +0000
 
     update mode
 
+commit a6f364368ca320bc5a92e18912e16fa6b3dff598 (refs/heads/note)
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:06:00 2006 +0000
+
+    update mode (file2)
+
+Notes:
+    note
+
 commit cd4e72fd96faed3f0ba949dc42967430374e2290 (refs/heads/rearrange)
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:06:00 2006 +0000
 
     Rearranged lines in dir/sub
 
+commit cbacedd14cb8b89255a2c02b59e77a2e9a8021a0 (refs/notes/commits)
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:06:00 2006 +0000
+
+    Notes added by 'git notes add'
+
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> refs/heads/master)
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
index d0f308ab2b..f5e20e1e14 100644
--- a/t/t4013/diff.log_--decorate_--all
+++ b/t/t4013/diff.log_--decorate_--all
@@ -5,12 +5,27 @@ Date:   Mon Jun 26 00:06:00 2006 +0000
 
     update mode
 
+commit a6f364368ca320bc5a92e18912e16fa6b3dff598 (note)
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:06:00 2006 +0000
+
+    update mode (file2)
+
+Notes:
+    note
+
 commit cd4e72fd96faed3f0ba949dc42967430374e2290 (rearrange)
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:06:00 2006 +0000
 
     Rearranged lines in dir/sub
 
+commit cbacedd14cb8b89255a2c02b59e77a2e9a8021a0 (refs/notes/commits)
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:06:00 2006 +0000
+
+    Notes added by 'git notes add'
+
 commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (HEAD -> master)
 Merge: 9a6d494 c7a2ab9
 Author: A U Thor <author@example.com>
diff --git a/t/t4013/diff.log_--diff-merges=first-parent_master b/t/t4013/diff.log_--diff-merges=first-parent_master
new file mode 100644
index 0000000000..fa63a557dd
--- /dev/null
+++ b/t/t4013/diff.log_--diff-merges=first-parent_master
@@ -0,0 +1,56 @@
+$ git log --diff-merges=first-parent master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+diff --git a/dir/sub b/dir/sub
+index cead32e..992913c 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -4,3 +4,5 @@ C
+ D
+ E
+ F
++1
++2
+diff --git a/file0 b/file0
+index b414108..10a8a9f 100644
+--- a/file0
++++ b/file0
+@@ -4,3 +4,6 @@
+ 4
+ 5
+ 6
++A
++B
++C
+
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:03:00 2006 +0000
+
+    Side
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:01:00 2006 +0000
+
+    Second
+    
+    This is the second commit.
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+$
diff --git a/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
new file mode 100644
index 0000000000..194e893c94
--- /dev/null
+++ b/t/t4013/diff.log_--diff-merges=off_-p_--first-parent_master
@@ -0,0 +1,78 @@
+$ git log --diff-merges=off -p --first-parent master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+
+diff --git a/dir/sub b/dir/sub
+index 8422d40..cead32e 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -2,3 +2,5 @@ A
+ B
+ C
+ D
++E
++F
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:01:00 2006 +0000
+
+    Second
+    
+    This is the second commit.
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..8422d40 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++C
++D
+diff --git a/file0 b/file0
+index 01e79c3..b414108 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++4
++5
++6
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+$
diff --git a/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
new file mode 100644
index 0000000000..5d7461a167
--- /dev/null
+++ b/t/t4013/diff.log_--first-parent_--diff-merges=off_-p_master
@@ -0,0 +1,78 @@
+$ git log --first-parent --diff-merges=off -p master
+commit 80e25ffa65bcdbe82ef654b4d06dbbde7945c37f
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+
+diff --git a/dir/sub b/dir/sub
+index 8422d40..cead32e 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -2,3 +2,5 @@ A
+ B
+ C
+ D
++E
++F
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:01:00 2006 +0000
+
+    Second
+    
+    This is the second commit.
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..8422d40 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++C
++D
+diff --git a/file0 b/file0
+index 01e79c3..b414108 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++4
++5
++6
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+$
diff --git a/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master b/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
new file mode 100644
index 0000000000..597002232e
--- /dev/null
+++ b/t/t4013/diff.log_--no-diff-merges_-p_--first-parent_master
@@ -0,0 +1,78 @@
+$ git log --no-diff-merges -p --first-parent master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+
+diff --git a/dir/sub b/dir/sub
+index 8422d40..cead32e 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -2,3 +2,5 @@ A
+ B
+ C
+ D
++E
++F
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:01:00 2006 +0000
+
+    Second
+    
+    This is the second commit.
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..8422d40 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++C
++D
+diff --git a/file0 b/file0
+index 01e79c3..b414108 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++4
++5
++6
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+$
diff --git a/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master b/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
new file mode 100644
index 0000000000..929f35a05b
--- /dev/null
+++ b/t/t4013/diff.log_-IA_-IB_-I1_-I2_-p_master
@@ -0,0 +1,99 @@
+$ git log -IA -IB -I1 -I2 -p master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:03:00 2006 +0000
+
+    Side
+
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+
+diff --git a/dir/sub b/dir/sub
+index 8422d40..cead32e 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -2,3 +2,5 @@ A
+ B
+ C
+ D
++E
++F
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:01:00 2006 +0000
+
+    Second
+    
+    This is the second commit.
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..8422d40 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++C
++D
+diff --git a/file0 b/file0
+index 01e79c3..b414108 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++4
++5
++6
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+$
diff --git a/t/t4013/diff.log_-c_-m_-p_master b/t/t4013/diff.log_-c_-m_-p_master
new file mode 100644
index 0000000000..b660f3d5f2
--- /dev/null
+++ b/t/t4013/diff.log_-c_-m_-p_master
@@ -0,0 +1,200 @@
+$ git log -c -m -p master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+diff --git a/dir/sub b/dir/sub
+index cead32e..992913c 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -4,3 +4,5 @@ C
+ D
+ E
+ F
++1
++2
+diff --git a/file0 b/file0
+index b414108..10a8a9f 100644
+--- a/file0
++++ b/file0
+@@ -4,3 +4,6 @@
+ 4
+ 5
+ 6
++A
++B
++C
+
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+diff --git a/dir/sub b/dir/sub
+index 7289e35..992913c 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,4 +1,8 @@
+ A
+ B
++C
++D
++E
++F
+ 1
+ 2
+diff --git a/file0 b/file0
+index f4615da..10a8a9f 100644
+--- a/file0
++++ b/file0
+@@ -1,6 +1,9 @@
+ 1
+ 2
+ 3
++4
++5
++6
+ A
+ B
+ C
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+diff --git a/file3 b/file3
+deleted file mode 100644
+index 7289e35..0000000
+--- a/file3
++++ /dev/null
+@@ -1,4 +0,0 @@
+-A
+-B
+-1
+-2
+
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:03:00 2006 +0000
+
+    Side
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+
+diff --git a/dir/sub b/dir/sub
+index 8422d40..cead32e 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -2,3 +2,5 @@ A
+ B
+ C
+ D
++E
++F
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:01:00 2006 +0000
+
+    Second
+    
+    This is the second commit.
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..8422d40 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++C
++D
+diff --git a/file0 b/file0
+index 01e79c3..b414108 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++4
++5
++6
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+$
diff --git a/t/t4013/diff.log_-m_--raw_master b/t/t4013/diff.log_-m_--raw_master
new file mode 100644
index 0000000000..cd2ecc4628
--- /dev/null
+++ b/t/t4013/diff.log_-m_--raw_master
@@ -0,0 +1,61 @@
+$ git log -m --raw master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+:100644 100644 cead32e... 992913c... M	dir/sub
+:100644 100644 b414108... 10a8a9f... M	file0
+
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+:100644 100644 7289e35... 992913c... M	dir/sub
+:100644 100644 f4615da... 10a8a9f... M	file0
+:000000 100644 0000000... b1e6722... A	file1
+:100644 000000 01e79c3... 0000000... D	file2
+:100644 000000 7289e35... 0000000... D	file3
+
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:03:00 2006 +0000
+
+    Side
+
+:100644 100644 35d242b... 7289e35... M	dir/sub
+:100644 100644 01e79c3... f4615da... M	file0
+:000000 100644 0000000... 7289e35... A	file3
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+
+:100644 100644 8422d40... cead32e... M	dir/sub
+:000000 100644 0000000... b1e6722... A	file1
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:01:00 2006 +0000
+
+    Second
+    
+    This is the second commit.
+
+:100644 100644 35d242b... 8422d40... M	dir/sub
+:100644 100644 01e79c3... b414108... M	file0
+:100644 000000 01e79c3... 0000000... D	file2
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+$
diff --git a/t/t4013/diff.log_-m_--stat_master b/t/t4013/diff.log_-m_--stat_master
new file mode 100644
index 0000000000..c7db084fd9
--- /dev/null
+++ b/t/t4013/diff.log_-m_--stat_master
@@ -0,0 +1,66 @@
+$ git log -m --stat master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+ dir/sub | 2 ++
+ file0   | 3 +++
+ 2 files changed, 5 insertions(+)
+
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a)
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+ dir/sub | 4 ++++
+ file0   | 3 +++
+ file1   | 3 +++
+ file2   | 3 ---
+ file3   | 4 ----
+ 5 files changed, 10 insertions(+), 7 deletions(-)
+
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:03:00 2006 +0000
+
+    Side
+
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file3   | 4 ++++
+ 3 files changed, 9 insertions(+)
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+
+ dir/sub | 2 ++
+ file1   | 3 +++
+ 2 files changed, 5 insertions(+)
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:01:00 2006 +0000
+
+    Second
+    
+    This is the second commit.
+
+ dir/sub | 2 ++
+ file0   | 3 +++
+ file2   | 3 ---
+ 3 files changed, 5 insertions(+), 3 deletions(-)
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+$
diff --git a/t/t4013/diff.log_-p_--diff-merges=first-parent_master b/t/t4013/diff.log_-p_--diff-merges=first-parent_master
new file mode 100644
index 0000000000..9538a27511
--- /dev/null
+++ b/t/t4013/diff.log_-p_--diff-merges=first-parent_master
@@ -0,0 +1,137 @@
+$ git log -p --diff-merges=first-parent master
+commit 59d314ad6f356dd08601a4cd5e530381da3e3c64
+Merge: 9a6d494 c7a2ab9
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:04:00 2006 +0000
+
+    Merge branch 'side'
+
+diff --git a/dir/sub b/dir/sub
+index cead32e..992913c 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -4,3 +4,5 @@ C
+ D
+ E
+ F
++1
++2
+diff --git a/file0 b/file0
+index b414108..10a8a9f 100644
+--- a/file0
++++ b/file0
+@@ -4,3 +4,6 @@
+ 4
+ 5
+ 6
++A
++B
++C
+
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:03:00 2006 +0000
+
+    Side
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:02:00 2006 +0000
+
+    Third
+
+diff --git a/dir/sub b/dir/sub
+index 8422d40..cead32e 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -2,3 +2,5 @@ A
+ B
+ C
+ D
++E
++F
+diff --git a/file1 b/file1
+new file mode 100644
+index 0000000..b1e6722
+--- /dev/null
++++ b/file1
+@@ -0,0 +1,3 @@
++A
++B
++C
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:01:00 2006 +0000
+
+    Second
+    
+    This is the second commit.
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..8422d40 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++C
++D
+diff --git a/file0 b/file0
+index 01e79c3..b414108 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++4
++5
++6
+diff --git a/file2 b/file2
+deleted file mode 100644
+index 01e79c3..0000000
+--- a/file2
++++ /dev/null
+@@ -1,3 +0,0 @@
+-1
+-2
+-3
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date:   Mon Jun 26 00:00:00 2006 +0000
+
+    Initial
+$
diff --git a/t/t4013/diff.log_-p_--first-parent_master b/t/t4013/diff.log_-p_--first-parent_master
index 3fc896d424..28840ebea1 100644
--- a/t/t4013/diff.log_-p_--first-parent_master
+++ b/t/t4013/diff.log_-p_--first-parent_master
@@ -6,6 +6,28 @@ Date:   Mon Jun 26 00:04:00 2006 +0000
 
     Merge branch 'side'
 
+diff --git a/dir/sub b/dir/sub
+index cead32e..992913c 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -4,3 +4,5 @@ C
+ D
+ E
+ F
++1
++2
+diff --git a/file0 b/file0
+index b414108..10a8a9f 100644
+--- a/file0
++++ b/file0
+@@ -4,3 +4,6 @@
+ 4
+ 5
+ 6
++A
++B
++C
+
 commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index b8969998b5..712d4b5ddf 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -5,6 +5,9 @@
 
 test_description='various format-patch tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
@@ -32,11 +35,11 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m "Side changes #3 with \\n backslash-n in it." &&
 
-	git checkout master &&
+	git checkout main &&
 	git diff-tree -p C2 >patch &&
 	git apply --index <patch &&
 	test_tick &&
-	git commit -m "Master accepts moral equivalent of #2" &&
+	git commit -m "Main accepts moral equivalent of #2" &&
 
 	git checkout side &&
 	git checkout -b patchid &&
@@ -56,57 +59,57 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m "patchid 3" &&
 
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'format-patch --ignore-if-in-upstream' '
-	git format-patch --stdout master..side >patch0 &&
+	git format-patch --stdout main..side >patch0 &&
 	grep "^From " patch0 >from0 &&
 	test_line_count = 3 from0
 '
 
 test_expect_success 'format-patch --ignore-if-in-upstream' '
 	git format-patch --stdout \
-		--ignore-if-in-upstream master..side >patch1 &&
+		--ignore-if-in-upstream main..side >patch1 &&
 	grep "^From " patch1 >from1 &&
 	test_line_count = 2 from1
 '
 
 test_expect_success 'format-patch --ignore-if-in-upstream handles tags' '
 	git tag -a v1 -m tag side &&
-	git tag -a v2 -m tag master &&
+	git tag -a v2 -m tag main &&
 	git format-patch --stdout --ignore-if-in-upstream v2..v1 >patch1 &&
 	grep "^From " patch1 >from1 &&
 	test_line_count = 2 from1
 '
 
 test_expect_success "format-patch doesn't consider merge commits" '
-	git checkout -b slave master &&
+	git checkout -b feature main &&
 	echo "Another line" >>file &&
 	test_tick &&
-	git commit -am "Slave change #1" &&
+	git commit -am "Feature branch change #1" &&
 	echo "Yet another line" >>file &&
 	test_tick &&
-	git commit -am "Slave change #2" &&
-	git checkout -b merger master &&
+	git commit -am "Feature branch change #2" &&
+	git checkout -b merger main &&
 	test_tick &&
-	git merge --no-ff slave &&
+	git merge --no-ff feature &&
 	git format-patch -3 --stdout >patch &&
 	grep "^From " patch >from &&
 	test_line_count = 3 from
 '
 
 test_expect_success 'format-patch result applies' '
-	git checkout -b rebuild-0 master &&
+	git checkout -b rebuild-0 main &&
 	git am -3 patch0 &&
-	git rev-list master.. >list &&
+	git rev-list main.. >list &&
 	test_line_count = 2 list
 '
 
 test_expect_success 'format-patch --ignore-if-in-upstream result applies' '
-	git checkout -b rebuild-1 master &&
+	git checkout -b rebuild-1 main &&
 	git am -3 patch1 &&
-	git rev-list master.. >list &&
+	git rev-list main.. >list &&
 	test_line_count = 2 list
 '
 
@@ -130,7 +133,7 @@ test_expect_success 'extra headers' '
 " &&
 	git config --add format.headers "Cc: S E Cipient <scipient@example.com>
 " &&
-	git format-patch --stdout master..side >patch2 &&
+	git format-patch --stdout main..side >patch2 &&
 	sed -e "/^\$/q" patch2 >hdrs2 &&
 	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs2 &&
 	grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs2
@@ -139,7 +142,7 @@ test_expect_success 'extra headers' '
 test_expect_success 'extra headers without newlines' '
 	git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
 	git config --add format.headers "Cc: S E Cipient <scipient@example.com>" &&
-	git format-patch --stdout master..side >patch3 &&
+	git format-patch --stdout main..side >patch3 &&
 	sed -e "/^\$/q" patch3 >hdrs3 &&
 	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs3 &&
 	grep "^Cc: S E Cipient <scipient@example.com>\$" hdrs3
@@ -148,7 +151,7 @@ test_expect_success 'extra headers without newlines' '
 test_expect_success 'extra headers with multiple To:s' '
 	git config --replace-all format.headers "To: R E Cipient <rcipient@example.com>" &&
 	git config --add format.headers "To: S E Cipient <scipient@example.com>" &&
-	git format-patch --stdout master..side >patch4 &&
+	git format-patch --stdout main..side >patch4 &&
 	sed -e "/^\$/q" patch4 >hdrs4 &&
 	grep "^To: R E Cipient <rcipient@example.com>,\$" hdrs4 &&
 	grep "^ *S E Cipient <scipient@example.com>\$" hdrs4
@@ -156,7 +159,7 @@ test_expect_success 'extra headers with multiple To:s' '
 
 test_expect_success 'additional command line cc (ascii)' '
 	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
-	git format-patch --cc="S E Cipient <scipient@example.com>" --stdout master..side >patch5 &&
+	git format-patch --cc="S E Cipient <scipient@example.com>" --stdout main..side >patch5 &&
 	sed -e "/^\$/q" patch5 >hdrs5 &&
 	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
 	grep "^ *S E Cipient <scipient@example.com>\$" hdrs5
@@ -164,7 +167,7 @@ test_expect_success 'additional command line cc (ascii)' '
 
 test_expect_failure 'additional command line cc (rfc822)' '
 	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
-	git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout master..side >patch5 &&
+	git format-patch --cc="S. E. Cipient <scipient@example.com>" --stdout main..side >patch5 &&
 	sed -e "/^\$/q" patch5 >hdrs5 &&
 	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs5 &&
 	grep "^ *\"S. E. Cipient\" <scipient@example.com>\$" hdrs5
@@ -172,14 +175,14 @@ test_expect_failure 'additional command line cc (rfc822)' '
 
 test_expect_success 'command line headers' '
 	git config --unset-all format.headers &&
-	git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout master..side >patch6 &&
+	git format-patch --add-header="Cc: R E Cipient <rcipient@example.com>" --stdout main..side >patch6 &&
 	sed -e "/^\$/q" patch6 >hdrs6 &&
 	grep "^Cc: R E Cipient <rcipient@example.com>\$" hdrs6
 '
 
 test_expect_success 'configuration headers and command line headers' '
 	git config --replace-all format.headers "Cc: R E Cipient <rcipient@example.com>" &&
-	git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout master..side >patch7 &&
+	git format-patch --add-header="Cc: S E Cipient <scipient@example.com>" --stdout main..side >patch7 &&
 	sed -e "/^\$/q" patch7 >hdrs7 &&
 	grep "^Cc: R E Cipient <rcipient@example.com>,\$" hdrs7 &&
 	grep "^ *S E Cipient <scipient@example.com>\$" hdrs7
@@ -187,40 +190,40 @@ test_expect_success 'configuration headers and command line headers' '
 
 test_expect_success 'command line To: header (ascii)' '
 	git config --unset-all format.headers &&
-	git format-patch --to="R E Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+	git format-patch --to="R E Cipient <rcipient@example.com>" --stdout main..side >patch8 &&
 	sed -e "/^\$/q" patch8 >hdrs8 &&
 	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs8
 '
 
 test_expect_failure 'command line To: header (rfc822)' '
-	git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+	git format-patch --to="R. E. Cipient <rcipient@example.com>" --stdout main..side >patch8 &&
 	sed -e "/^\$/q" patch8 >hdrs8 &&
 	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs8
 '
 
 test_expect_failure 'command line To: header (rfc2047)' '
-	git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout master..side >patch8 &&
+	git format-patch --to="R Ä Cipient <rcipient@example.com>" --stdout main..side >patch8 &&
 	sed -e "/^\$/q" patch8 >hdrs8 &&
 	grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs8
 '
 
 test_expect_success 'configuration To: header (ascii)' '
 	git config format.to "R E Cipient <rcipient@example.com>" &&
-	git format-patch --stdout master..side >patch9 &&
+	git format-patch --stdout main..side >patch9 &&
 	sed -e "/^\$/q" patch9 >hdrs9 &&
 	grep "^To: R E Cipient <rcipient@example.com>\$" hdrs9
 '
 
 test_expect_failure 'configuration To: header (rfc822)' '
 	git config format.to "R. E. Cipient <rcipient@example.com>" &&
-	git format-patch --stdout master..side >patch9 &&
+	git format-patch --stdout main..side >patch9 &&
 	sed -e "/^\$/q" patch9 >hdrs9 &&
 	grep "^To: \"R. E. Cipient\" <rcipient@example.com>\$" hdrs9
 '
 
 test_expect_failure 'configuration To: header (rfc2047)' '
 	git config format.to "R Ä Cipient <rcipient@example.com>" &&
-	git format-patch --stdout master..side >patch9 &&
+	git format-patch --stdout main..side >patch9 &&
 	sed -e "/^\$/q" patch9 >hdrs9 &&
 	grep "^To: =?UTF-8?q?R=20=C3=84=20Cipient?= <rcipient@example.com>\$" hdrs9
 '
@@ -234,35 +237,35 @@ check_patch () {
 }
 
 test_expect_success 'format.from=false' '
-	git -c format.from=false format-patch --stdout master..side >patch &&
+	git -c format.from=false format-patch --stdout main..side >patch &&
 	sed -e "/^\$/q" patch >hdrs &&
 	check_patch patch &&
 	! grep "^From: C O Mitter <committer@example.com>\$" hdrs
 '
 
 test_expect_success 'format.from=true' '
-	git -c format.from=true format-patch --stdout master..side >patch &&
+	git -c format.from=true format-patch --stdout main..side >patch &&
 	sed -e "/^\$/q" patch >hdrs &&
 	check_patch hdrs &&
 	grep "^From: C O Mitter <committer@example.com>\$" hdrs
 '
 
 test_expect_success 'format.from with address' '
-	git -c format.from="F R Om <from@example.com>" format-patch --stdout master..side >patch &&
+	git -c format.from="F R Om <from@example.com>" format-patch --stdout main..side >patch &&
 	sed -e "/^\$/q" patch >hdrs &&
 	check_patch hdrs &&
 	grep "^From: F R Om <from@example.com>\$" hdrs
 '
 
 test_expect_success '--no-from overrides format.from' '
-	git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout master..side >patch &&
+	git -c format.from="F R Om <from@example.com>" format-patch --no-from --stdout main..side >patch &&
 	sed -e "/^\$/q" patch >hdrs &&
 	check_patch hdrs &&
 	! grep "^From: F R Om <from@example.com>\$" hdrs
 '
 
 test_expect_success '--from overrides format.from' '
-	git -c format.from="F R Om <from@example.com>" format-patch --from --stdout master..side >patch &&
+	git -c format.from="F R Om <from@example.com>" format-patch --from --stdout main..side >patch &&
 	sed -e "/^\$/q" patch >hdrs &&
 	check_patch hdrs &&
 	! grep "^From: F R Om <from@example.com>\$" hdrs
@@ -271,7 +274,7 @@ test_expect_success '--from overrides format.from' '
 test_expect_success '--no-to overrides config.to' '
 	git config --replace-all format.to \
 		"R E Cipient <rcipient@example.com>" &&
-	git format-patch --no-to --stdout master..side >patch10 &&
+	git format-patch --no-to --stdout main..side >patch10 &&
 	sed -e "/^\$/q" patch10 >hdrs10 &&
 	check_patch hdrs10 &&
 	! grep "^To: R E Cipient <rcipient@example.com>\$" hdrs10
@@ -281,7 +284,7 @@ test_expect_success '--no-to and --to replaces config.to' '
 	git config --replace-all format.to \
 		"Someone <someone@out.there>" &&
 	git format-patch --no-to --to="Someone Else <else@out.there>" \
-		--stdout master..side >patch11 &&
+		--stdout main..side >patch11 &&
 	sed -e "/^\$/q" patch11 >hdrs11 &&
 	check_patch hdrs11 &&
 	! grep "^To: Someone <someone@out.there>\$" hdrs11 &&
@@ -291,7 +294,7 @@ test_expect_success '--no-to and --to replaces config.to' '
 test_expect_success '--no-cc overrides config.cc' '
 	git config --replace-all format.cc \
 		"C E Cipient <rcipient@example.com>" &&
-	git format-patch --no-cc --stdout master..side >patch12 &&
+	git format-patch --no-cc --stdout main..side >patch12 &&
 	sed -e "/^\$/q" patch12 >hdrs12 &&
 	check_patch hdrs12 &&
 	! grep "^Cc: C E Cipient <rcipient@example.com>\$" hdrs12
@@ -300,7 +303,7 @@ test_expect_success '--no-cc overrides config.cc' '
 test_expect_success '--no-add-header overrides config.headers' '
 	git config --replace-all format.headers \
 		"Header1: B E Cipient <rcipient@example.com>" &&
-	git format-patch --no-add-header --stdout master..side >patch13 &&
+	git format-patch --no-add-header --stdout main..side >patch13 &&
 	sed -e "/^\$/q" patch13 >hdrs13 &&
 	check_patch hdrs13 &&
 	! grep "^Header1: B E Cipient <rcipient@example.com>\$" hdrs13
@@ -309,13 +312,67 @@ test_expect_success '--no-add-header overrides config.headers' '
 test_expect_success 'multiple files' '
 	rm -rf patches/ &&
 	git checkout side &&
-	git format-patch -o patches/ master &&
+	git format-patch -o patches/ main &&
 	ls patches/0001-Side-changes-1.patch patches/0002-Side-changes-2.patch patches/0003-Side-changes-3-with-n-backslash-n-in-it.patch
 '
 
+test_expect_success 'filename length limit' '
+	test_when_finished "rm -f 000*" &&
+	rm -rf 000[1-9]-*.patch &&
+	for len in 15 25 35
+	do
+		git format-patch --filename-max-length=$len -3 side &&
+		max=$(
+			for patch in 000[1-9]-*.patch
+			do
+				echo "$patch" | wc -c
+			done |
+			sort -nr |
+			head -n 1
+		) &&
+		test $max -le $len || return 1
+	done
+'
+
+test_expect_success 'filename length limit from config' '
+	test_when_finished "rm -f 000*" &&
+	rm -rf 000[1-9]-*.patch &&
+	for len in 15 25 35
+	do
+		git -c format.filenameMaxLength=$len format-patch -3 side &&
+		max=$(
+			for patch in 000[1-9]-*.patch
+			do
+				echo "$patch" | wc -c
+			done |
+			sort -nr |
+			head -n 1
+		) &&
+		test $max -le $len || return 1
+	done
+'
+
+test_expect_success 'filename limit applies only to basename' '
+	test_when_finished "rm -rf patches/" &&
+	rm -rf patches/ &&
+	for len in 15 25 35
+	do
+		git format-patch -o patches --filename-max-length=$len -3 side &&
+		max=$(
+			for patch in patches/000[1-9]-*.patch
+			do
+				echo "${patch#patches/}" | wc -c
+			done |
+			sort -nr |
+			head -n 1
+		) &&
+		test $max -le $len || return 1
+	done
+'
+
 test_expect_success 'reroll count' '
 	rm -fr patches &&
-	git format-patch -o patches --cover-letter --reroll-count 4 master..side >list &&
+	git format-patch -o patches --cover-letter --reroll-count 4 main..side >list &&
 	! grep -v "^patches/v4-000[0-3]-" list &&
 	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
 	! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects
@@ -323,12 +380,36 @@ test_expect_success 'reroll count' '
 
 test_expect_success 'reroll count (-v)' '
 	rm -fr patches &&
-	git format-patch -o patches --cover-letter -v4 master..side >list &&
+	git format-patch -o patches --cover-letter -v4 main..side >list &&
 	! grep -v "^patches/v4-000[0-3]-" list &&
 	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
 	! grep -v "^Subject: \[PATCH v4 [0-3]/3\] " subjects
 '
 
+test_expect_success 'reroll count (-v) with a fractional number' '
+	rm -fr patches &&
+	git format-patch -o patches --cover-letter -v4.4 main..side >list &&
+	! grep -v "^patches/v4.4-000[0-3]-" list &&
+	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
+	! grep -v "^Subject: \[PATCH v4.4 [0-3]/3\] " subjects
+'
+
+test_expect_success 'reroll (-v) count with a non number' '
+	rm -fr patches &&
+	git format-patch -o patches --cover-letter -v4rev2 main..side >list &&
+	! grep -v "^patches/v4rev2-000[0-3]-" list &&
+	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
+	! grep -v "^Subject: \[PATCH v4rev2 [0-3]/3\] " subjects
+'
+
+test_expect_success 'reroll (-v) count with a non-pathname character' '
+	rm -fr patches &&
+	git format-patch -o patches --cover-letter -v4---..././../--1/.2//  main..side >list &&
+	! grep -v "patches/v4-\.-\.-\.-1-\.2-000[0-3]-" list &&
+	sed -n -e "/^Subject: /p" $(cat list) >subjects &&
+	! grep -v "^Subject: \[PATCH v4---\.\.\./\./\.\./--1/\.2// [0-3]/3\] " subjects
+'
+
 check_threading () {
 	expect="$1" &&
 	shift &&
@@ -359,7 +440,7 @@ EOF
 
 test_expect_success 'no threading' '
 	git checkout side &&
-	check_threading expect.no-threading master
+	check_threading expect.no-threading main
 '
 
 cat >expect.thread <<EOF
@@ -376,7 +457,7 @@ References: <0>
 EOF
 
 test_expect_success 'thread' '
-	check_threading expect.thread --thread master
+	check_threading expect.thread --thread main
 '
 
 cat >expect.in-reply-to <<EOF
@@ -396,7 +477,7 @@ EOF
 
 test_expect_success 'thread in-reply-to' '
 	check_threading expect.in-reply-to --in-reply-to="<test.message>" \
-		--thread master
+		--thread main
 '
 
 cat >expect.cover-letter <<EOF
@@ -417,7 +498,7 @@ References: <0>
 EOF
 
 test_expect_success 'thread cover-letter' '
-	check_threading expect.cover-letter --cover-letter --thread master
+	check_threading expect.cover-letter --cover-letter --thread main
 '
 
 cat >expect.cl-irt <<EOF
@@ -444,12 +525,12 @@ EOF
 
 test_expect_success 'thread cover-letter in-reply-to' '
 	check_threading expect.cl-irt --cover-letter \
-		--in-reply-to="<test.message>" --thread master
+		--in-reply-to="<test.message>" --thread main
 '
 
 test_expect_success 'thread explicit shallow' '
 	check_threading expect.cl-irt --cover-letter \
-		--in-reply-to="<test.message>" --thread=shallow master
+		--in-reply-to="<test.message>" --thread=shallow main
 '
 
 cat >expect.deep <<EOF
@@ -467,7 +548,7 @@ References: <0>
 EOF
 
 test_expect_success 'thread deep' '
-	check_threading expect.deep --thread=deep master
+	check_threading expect.deep --thread=deep main
 '
 
 cat >expect.deep-irt <<EOF
@@ -490,7 +571,7 @@ EOF
 
 test_expect_success 'thread deep in-reply-to' '
 	check_threading expect.deep-irt  --thread=deep \
-		--in-reply-to="<test.message>" master
+		--in-reply-to="<test.message>" main
 '
 
 cat >expect.deep-cl <<EOF
@@ -514,7 +595,7 @@ References: <0>
 EOF
 
 test_expect_success 'thread deep cover-letter' '
-	check_threading expect.deep-cl --cover-letter --thread=deep master
+	check_threading expect.deep-cl --cover-letter --thread=deep main
 '
 
 cat >expect.deep-cl-irt <<EOF
@@ -544,27 +625,27 @@ EOF
 
 test_expect_success 'thread deep cover-letter in-reply-to' '
 	check_threading expect.deep-cl-irt --cover-letter \
-		--in-reply-to="<test.message>" --thread=deep master
+		--in-reply-to="<test.message>" --thread=deep main
 '
 
 test_expect_success 'thread via config' '
 	test_config format.thread true &&
-	check_threading expect.thread master
+	check_threading expect.thread main
 '
 
 test_expect_success 'thread deep via config' '
 	test_config format.thread deep &&
-	check_threading expect.deep master
+	check_threading expect.deep main
 '
 
 test_expect_success 'thread config + override' '
 	test_config format.thread deep &&
-	check_threading expect.thread --thread master
+	check_threading expect.thread --thread main
 '
 
 test_expect_success 'thread config + --no-thread' '
 	test_config format.thread deep &&
-	check_threading expect.no-threading --no-thread master
+	check_threading expect.no-threading --no-thread main
 '
 
 test_expect_success 'excessive subject' '
@@ -577,7 +658,7 @@ test_expect_success 'excessive subject' '
 	after=$(git rev-parse --short $after) &&
 	git update-index file &&
 	git commit -m "This is an excessively long subject line for a message due to the habit some projects have of not having a short, one-line subject at the start of the commit message, but rather sticking a whole paragraph right at the start as the only thing in the commit message. It had better not become the filename for the patch." &&
-	git format-patch -o patches/ master..side &&
+	git format-patch -o patches/ main..side &&
 	ls patches/0004-This-is-an-excessively-long-subject-line-for-a-messa.patch
 '
 
@@ -793,27 +874,59 @@ test_expect_success 'format-patch with multiple notes refs' '
 	! grep "this is note 2" out
 '
 
+test_expect_success 'format-patch with multiple notes refs in config' '
+	test_when_finished "test_unconfig format.notes" &&
+
+	git notes --ref note1 add -m "this is note 1" HEAD &&
+	test_when_finished git notes --ref note1 remove HEAD &&
+	git notes --ref note2 add -m "this is note 2" HEAD &&
+	test_when_finished git notes --ref note2 remove HEAD &&
+
+	git config format.notes note1 &&
+	git format-patch -1 --stdout >out &&
+	grep "this is note 1" out &&
+	! grep "this is note 2" out &&
+	git config format.notes note2 &&
+	git format-patch -1 --stdout >out &&
+	! grep "this is note 1" out &&
+	grep "this is note 2" out &&
+	git config --add format.notes note1 &&
+	git format-patch -1 --stdout >out &&
+	grep "this is note 1" out &&
+	grep "this is note 2" out &&
+
+	git config --replace-all format.notes note1 &&
+	git config --add format.notes false &&
+	git format-patch -1 --stdout >out &&
+	! grep "this is note 1" out &&
+	! grep "this is note 2" out &&
+	git config --add format.notes note2 &&
+	git format-patch -1 --stdout >out &&
+	! grep "this is note 1" out &&
+	grep "this is note 2" out
+'
+
 echo "fatal: --name-only does not make sense" >expect.name-only
 echo "fatal: --name-status does not make sense" >expect.name-status
 echo "fatal: --check does not make sense" >expect.check
 
 test_expect_success 'options no longer allowed for format-patch' '
 	test_must_fail git format-patch --name-only 2>output &&
-	test_i18ncmp expect.name-only output &&
+	test_cmp expect.name-only output &&
 	test_must_fail git format-patch --name-status 2>output &&
-	test_i18ncmp expect.name-status output &&
+	test_cmp expect.name-status output &&
 	test_must_fail git format-patch --check 2>output &&
-	test_i18ncmp expect.check output
+	test_cmp expect.check output
 '
 
 test_expect_success 'format-patch --numstat should produce a patch' '
-	git format-patch --numstat --stdout master..side >output &&
+	git format-patch --numstat --stdout main..side >output &&
 	grep "^diff --git a/" output >diff &&
 	test_line_count = 5 diff
 '
 
 test_expect_success 'format-patch -- <path>' '
-	git format-patch master..side -- file 2>error &&
+	git format-patch main..side -- file 2>error &&
 	! grep "Use .--" error
 '
 
@@ -1129,6 +1242,59 @@ test_expect_success 'format-patch wraps extremely long from-header (rfc2047)' '
 '
 
 cat >expect <<'EOF'
+From: Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar
+ Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo
+ Bar Foo Bar Foo Bar Foo Bar <author@example.com>
+EOF
+test_expect_success 'format-patch wraps extremely long from-header (non-ASCII without Q-encoding)' '
+	echo content >>file &&
+	git add file &&
+	GIT_AUTHOR_NAME="Foö Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar Foo Bar" \
+	git commit -m author-check &&
+	git format-patch --no-encode-email-headers --stdout -1 >patch &&
+	sed -n "/^From: /p; /^ /p; /^$/q" patch >actual &&
+	test_cmp expect actual
+'
+
+cat >expect <<'EOF'
+Subject: [PATCH] Foö
+EOF
+test_expect_success 'subject lines are unencoded with --no-encode-email-headers' '
+	echo content >>file &&
+	git add file &&
+	git commit -m "Foö" &&
+	git format-patch --no-encode-email-headers -1 --stdout >patch &&
+	grep ^Subject: patch >actual &&
+	test_cmp expect actual
+'
+
+cat >expect <<'EOF'
+Subject: [PATCH] Foö
+EOF
+test_expect_success 'subject lines are unencoded with format.encodeEmailHeaders=false' '
+	echo content >>file &&
+	git add file &&
+	git commit -m "Foö" &&
+	git config format.encodeEmailHeaders false &&
+	git format-patch -1 --stdout >patch &&
+	grep ^Subject: patch >actual &&
+	test_cmp expect actual
+'
+
+cat >expect <<'EOF'
+Subject: [PATCH] =?UTF-8?q?Fo=C3=B6?=
+EOF
+test_expect_success '--encode-email-headers overrides format.encodeEmailHeaders' '
+	echo content >>file &&
+	git add file &&
+	git commit -m "Foö" &&
+	git config format.encodeEmailHeaders false &&
+	git format-patch --encode-email-headers -1 --stdout >patch &&
+	grep ^Subject: patch >actual &&
+	test_cmp expect actual
+'
+
+cat >expect <<'EOF'
 Subject: header with . in it
 EOF
 test_expect_success 'subject lines do not have 822 atom-quoting' '
@@ -1517,10 +1683,195 @@ test_expect_success 'format patch ignores color.ui' '
 	test_cmp expect actual
 '
 
+test_expect_success 'format patch respects diff.relative' '
+	rm -rf subdir &&
+	mkdir subdir &&
+	echo other content >subdir/file2 &&
+	git add subdir/file2 &&
+	git commit -F msg &&
+	test_unconfig diff.relative &&
+	git format-patch --relative=subdir --stdout -1 >expect &&
+	test_config diff.relative true &&
+	git -C subdir format-patch --stdout -1 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'cover letter with invalid --cover-from-description and config' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_must_fail git format-patch --cover-letter --cover-from-description garbage main &&
+	test_config format.coverFromDescription garbage &&
+	test_must_fail git format-patch --cover-letter main
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = default' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription default &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description default' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description default main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = none' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription none &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	! grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description none' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description none main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	! grep "^body$" actual
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = message' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription message &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description message' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description message main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = subject' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription subject &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description subject' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description subject main >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = auto (short subject line)' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription auto &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description auto (short subject line)' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description auto main >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with format.coverFromDescription = auto (long subject line)' '
+	test_config branch.rebuild-1.description "this is a really long first line and it is over 100 characters long which is the threshold for long subjects
+
+body" &&
+	test_config format.coverFromDescription auto &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^this is a really long first line and it is over 100 characters long which is the threshold for long subjects$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with --cover-from-description auto (long subject line)' '
+	test_config branch.rebuild-1.description "this is a really long first line and it is over 100 characters long which is the threshold for long subjects
+
+body" &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description auto main >actual &&
+	grep "^Subject: \[PATCH 0/2\] \*\*\* SUBJECT HERE \*\*\*$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	grep "^this is a really long first line and it is over 100 characters long which is the threshold for long subjects$" actual &&
+	grep "^body$" actual
+'
+
+test_expect_success 'cover letter with command-line --cover-from-description overrides config' '
+	test_config branch.rebuild-1.description "config subject
+
+body" &&
+	test_config format.coverFromDescription none &&
+	git checkout rebuild-1 &&
+	git format-patch --stdout --cover-letter --cover-from-description subject main >actual &&
+	grep "^Subject: \[PATCH 0/2\] config subject$" actual &&
+	! grep "^\*\*\* BLURB HERE \*\*\*$" actual &&
+	! grep "^config subject$" actual &&
+	grep "^body$" actual
+'
+
 test_expect_success 'cover letter using branch description (1)' '
 	git checkout rebuild-1 &&
 	test_config branch.rebuild-1.description hello &&
-	git format-patch --stdout --cover-letter master >actual &&
+	git format-patch --stdout --cover-letter main >actual &&
 	grep hello actual
 '
 
@@ -1534,14 +1885,14 @@ test_expect_success 'cover letter using branch description (2)' '
 test_expect_success 'cover letter using branch description (3)' '
 	git checkout rebuild-1 &&
 	test_config branch.rebuild-1.description hello &&
-	git format-patch --stdout --cover-letter ^master rebuild-1 >actual &&
+	git format-patch --stdout --cover-letter ^main rebuild-1 >actual &&
 	grep hello actual
 '
 
 test_expect_success 'cover letter using branch description (4)' '
 	git checkout rebuild-1 &&
 	test_config branch.rebuild-1.description hello &&
-	git format-patch --stdout --cover-letter master.. >actual &&
+	git format-patch --stdout --cover-letter main.. >actual &&
 	grep hello actual
 '
 
@@ -1608,8 +1959,8 @@ test_expect_success 'From line has expected format' '
 
 test_expect_success 'format-patch -o with no leading directories' '
 	rm -fr patches &&
-	git format-patch -o patches master..side &&
-	count=$(git rev-list --count master..side) &&
+	git format-patch -o patches main..side &&
+	count=$(git rev-list --count main..side) &&
 	ls patches >list &&
 	test_line_count = $count list
 '
@@ -1617,16 +1968,16 @@ test_expect_success 'format-patch -o with no leading directories' '
 test_expect_success 'format-patch -o with leading existing directories' '
 	rm -rf existing-dir &&
 	mkdir existing-dir &&
-	git format-patch -o existing-dir/patches master..side &&
-	count=$(git rev-list --count master..side) &&
+	git format-patch -o existing-dir/patches main..side &&
+	count=$(git rev-list --count main..side) &&
 	ls existing-dir/patches >list &&
 	test_line_count = $count list
 '
 
 test_expect_success 'format-patch -o with leading non-existing directories' '
 	rm -rf non-existing-dir &&
-	git format-patch -o non-existing-dir/patches master..side &&
-	count=$(git rev-list --count master..side) &&
+	git format-patch -o non-existing-dir/patches main..side &&
+	count=$(git rev-list --count main..side) &&
 	test_path_is_dir non-existing-dir &&
 	ls non-existing-dir/patches >list &&
 	test_line_count = $count list
@@ -1635,8 +1986,8 @@ test_expect_success 'format-patch -o with leading non-existing directories' '
 test_expect_success 'format-patch format.outputDirectory option' '
 	test_config format.outputDirectory patches &&
 	rm -fr patches &&
-	git format-patch master..side &&
-	count=$(git rev-list --count master..side) &&
+	git format-patch main..side &&
+	count=$(git rev-list --count main..side) &&
 	ls patches >list &&
 	test_line_count = $count list
 '
@@ -1644,11 +1995,44 @@ test_expect_success 'format-patch format.outputDirectory option' '
 test_expect_success 'format-patch -o overrides format.outputDirectory' '
 	test_config format.outputDirectory patches &&
 	rm -fr patches patchset &&
-	git format-patch master..side -o patchset &&
+	git format-patch main..side -o patchset &&
 	test_path_is_missing patches &&
 	test_path_is_dir patchset
 '
 
+test_expect_success 'format-patch forbids multiple outputs' '
+	rm -fr outfile outdir &&
+	test_must_fail \
+		git format-patch --stdout --output-directory=outdir &&
+	test_must_fail \
+		git format-patch --stdout --output=outfile &&
+	test_must_fail \
+		git format-patch --output=outfile --output-directory=outdir
+'
+
+test_expect_success 'configured outdir does not conflict with output options' '
+	rm -fr outfile outdir &&
+	test_config format.outputDirectory outdir &&
+	git format-patch --stdout &&
+	test_path_is_missing outdir &&
+	git format-patch --output=outfile &&
+	test_path_is_missing outdir
+'
+
+test_expect_success 'format-patch --output' '
+	rm -fr outfile &&
+	git format-patch -3 --stdout HEAD >expect &&
+	git format-patch -3 --output=outfile HEAD &&
+	test_cmp expect outfile
+'
+
+test_expect_success 'format-patch --cover-letter --output' '
+	rm -fr outfile &&
+	git format-patch --cover-letter -3 --stdout HEAD >expect &&
+	git format-patch --cover-letter -3 --output=outfile HEAD &&
+	test_cmp expect outfile
+'
+
 test_expect_success 'format-patch --base' '
 	git checkout patchid &&
 
@@ -1708,14 +2092,14 @@ test_expect_success 'format-patch --base errors out when base commit is not ance
 	#	  ------------W
 	#
 	# If "format-patch Z..X" is given, P and Z can not be specified as the base commit
-	git checkout -b topic1 master &&
+	git checkout -b topic1 main &&
 	git rev-parse HEAD >commit-id-base &&
 	test_commit P &&
 	git rev-parse HEAD >commit-id-P &&
 	test_commit Z &&
 	git rev-parse HEAD >commit-id-Z &&
 	test_commit Y &&
-	git checkout -b topic2 master &&
+	git checkout -b topic2 main &&
 	test_commit W &&
 	git merge topic1 &&
 	test_commit X &&
@@ -1728,7 +2112,7 @@ test_expect_success 'format-patch --base errors out when base commit is not ance
 '
 
 test_expect_success 'format-patch --base=auto' '
-	git checkout -b upstream master &&
+	git checkout -b upstream main &&
 	git checkout -b local upstream &&
 	git branch --set-upstream-to=upstream &&
 	test_commit N1 &&
@@ -1749,11 +2133,11 @@ test_expect_success 'format-patch errors out when history involves criss-cross'
 	#  \ / \
 	#   C---M2---E
 	#
-	git checkout master &&
+	git checkout main &&
 	test_commit A &&
-	git checkout -b xb master &&
+	git checkout -b xb main &&
 	test_commit B &&
-	git checkout -b xc master &&
+	git checkout -b xc main &&
 	test_commit C &&
 	git checkout -b xbc xb -- &&
 	git merge xc &&
@@ -1767,10 +2151,25 @@ test_expect_success 'format-patch errors out when history involves criss-cross'
 	test_must_fail 	git format-patch --base=auto -1
 '
 
-test_expect_success 'format-patch format.useAutoBaseoption' '
-	test_when_finished "git config --unset format.useAutoBase" &&
+test_expect_success 'format-patch format.useAutoBase whenAble history involves criss-cross' '
+	test_config format.useAutoBase whenAble &&
+	git format-patch -1 >patch &&
+	! grep "^base-commit:" patch
+'
+
+test_expect_success 'format-patch format.useAutoBase option' '
+	git checkout local &&
+	test_config format.useAutoBase true &&
+	git format-patch --stdout -1 >patch &&
+	grep "^base-commit:" patch >actual &&
+	git rev-parse upstream >commit-id-base &&
+	echo "base-commit: $(cat commit-id-base)" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'format-patch format.useAutoBase option with whenAble' '
 	git checkout local &&
-	git config format.useAutoBase true &&
+	test_config format.useAutoBase whenAble &&
 	git format-patch --stdout -1 >patch &&
 	grep "^base-commit:" patch >actual &&
 	git rev-parse upstream >commit-id-base &&
@@ -1779,8 +2178,7 @@ test_expect_success 'format-patch format.useAutoBaseoption' '
 '
 
 test_expect_success 'format-patch --base overrides format.useAutoBase' '
-	test_when_finished "git config --unset format.useAutoBase" &&
-	git config format.useAutoBase true &&
+	test_config format.useAutoBase true &&
 	git format-patch --stdout --base=HEAD~1 -1 >patch &&
 	grep "^base-commit:" patch >actual &&
 	git rev-parse HEAD~1 >commit-id-base &&
@@ -1788,6 +2186,18 @@ test_expect_success 'format-patch --base overrides format.useAutoBase' '
 	test_cmp expect actual
 '
 
+test_expect_success 'format-patch --no-base overrides format.useAutoBase' '
+	test_config format.useAutoBase true &&
+	git format-patch --stdout --no-base -1 >patch &&
+	! grep "^base-commit:" patch
+'
+
+test_expect_success 'format-patch --no-base overrides format.useAutoBase whenAble' '
+	test_config format.useAutoBase whenAble &&
+	git format-patch --stdout --no-base -1 >patch &&
+	! grep "^base-commit:" patch
+'
+
 test_expect_success 'format-patch --base with --attach' '
 	git format-patch --attach=mimemime --stdout --base=HEAD~ -1 >patch &&
 	sed -n -e "/^base-commit:/s/.*/1/p" -e "/^---*mimemime--$/s/.*/2/p" \
@@ -1847,7 +2257,7 @@ test_expect_success 'format-patch --pretty=mboxrd' '
 '
 
 test_expect_success 'interdiff: setup' '
-	git checkout -b boop master &&
+	git checkout -b boop main &&
 	test_commit fnorp blorp &&
 	test_commit fleep blorp
 '
@@ -1869,6 +2279,16 @@ test_expect_success 'interdiff: reroll-count' '
 	test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
 '
 
+test_expect_success 'interdiff: reroll-count with a non-integer' '
+	git format-patch --cover-letter --interdiff=boop~2 -v2.2 -1 boop &&
+	test_i18ngrep "^Interdiff:$" v2.2-0000-cover-letter.patch
+'
+
+test_expect_success 'interdiff: reroll-count with a integer' '
+	git format-patch --cover-letter --interdiff=boop~2 -v2 -1 boop &&
+	test_i18ngrep "^Interdiff ..* v1:$" v2-0000-cover-letter.patch
+'
+
 test_expect_success 'interdiff: solo-patch' '
 	cat >expect <<-\EOF &&
 	  +fleep
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 6b087df3dc..2c13b62d3c 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -7,7 +7,7 @@ test_description='Test special whitespace in diff engine.
 
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 test_expect_success "Ray Lehtiniemi's example" '
 	cat <<-\EOF >x &&
@@ -16,6 +16,8 @@ test_expect_success "Ray Lehtiniemi's example" '
 	} while (0);
 	EOF
 	git update-index --add x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 
 	cat <<-\EOF >x &&
 	do
@@ -24,10 +26,12 @@ test_expect_success "Ray Lehtiniemi's example" '
 	}
 	while (0);
 	EOF
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
 
-	cat <<-\EOF >expect &&
+	cat <<-EOF >expect &&
 	diff --git a/x b/x
-	index adf3937..6edc172 100644
+	index $before..$after 100644
 	--- a/x
 	+++ b/x
 	@@ -1,3 +1,5 @@
@@ -61,6 +65,8 @@ test_expect_success 'another test, without options' '
 	EOF
 
 	git update-index x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 
 	tr "_" " " <<-\EOF >x &&
 	_	whitespace at beginning
@@ -70,10 +76,12 @@ test_expect_success 'another test, without options' '
 	unchanged line
 	CR at end
 	EOF
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
 
-	tr "Q_" "\015 " <<-\EOF >expect &&
+	tr "Q_" "\015 " <<-EOF >expect &&
 	diff --git a/x b/x
-	index d99af23..22d9f73 100644
+	index $before..$after 100644
 	--- a/x
 	+++ b/x
 	@@ -1,6 +1,6 @@
@@ -108,9 +116,9 @@ test_expect_success 'another test, without options' '
 	git diff -w --ignore-cr-at-eol >out &&
 	test_must_be_empty out &&
 
-	tr "Q_" "\015 " <<-\EOF >expect &&
+	tr "Q_" "\015 " <<-EOF >expect &&
 	diff --git a/x b/x
-	index d99af23..22d9f73 100644
+	index $before..$after 100644
 	--- a/x
 	+++ b/x
 	@@ -1,6 +1,6 @@
@@ -132,9 +140,9 @@ test_expect_success 'another test, without options' '
 	git diff -b --ignore-cr-at-eol >out &&
 	test_cmp expect out &&
 
-	tr "Q_" "\015 " <<-\EOF >expect &&
+	tr "Q_" "\015 " <<-EOF >expect &&
 	diff --git a/x b/x
-	index d99af23..22d9f73 100644
+	index $before..$after 100644
 	--- a/x
 	+++ b/x
 	@@ -1,6 +1,6 @@
@@ -154,9 +162,9 @@ test_expect_success 'another test, without options' '
 	git diff --ignore-space-at-eol --ignore-cr-at-eol >out &&
 	test_cmp expect out &&
 
-	tr "Q_" "\015 " <<-\EOF >expect &&
+	tr "Q_" "\015 " <<-EOF >expect &&
 	diff --git a/x b/x
-	index_d99af23..22d9f73 100644
+	index_$before..$after 100644
 	--- a/x
 	+++ b/x
 	@@ -1,6 +1,6 @@
@@ -522,13 +530,15 @@ test_expect_success 'ignore-blank-lines: mix changes and blank lines' '
 test_expect_success 'check mixed spaces and tabs in indent' '
 	# This is indented with SP HT SP.
 	echo " 	 foo();" >x &&
-	git diff --check | grep "space before tab in indent"
+	test_must_fail git diff --check >check &&
+	grep "space before tab in indent" check
 '
 
 test_expect_success 'check mixed tabs and spaces in indent' '
 	# This is indented with HT SP HT.
 	echo "	 	foo();" >x &&
-	git diff --check | grep "space before tab in indent"
+	test_must_fail git diff --check >check &&
+	grep "space before tab in indent" check
 '
 
 test_expect_success 'check with no whitespace errors' '
@@ -557,6 +567,30 @@ test_expect_success '--check and --quiet are not exclusive' '
 	git diff --check --quiet
 '
 
+test_expect_success '-w and --exit-code interact sensibly' '
+	test_when_finished "git checkout x" &&
+	{
+		test_seq 15 &&
+		echo " 16"
+	} >x &&
+	test_must_fail git diff --exit-code &&
+	git diff -w >actual &&
+	test_must_be_empty actual &&
+	git diff -w --exit-code
+'
+
+test_expect_success '-I and --exit-code interact sensibly' '
+	test_when_finished "git checkout x" &&
+	{
+		test_seq 15 &&
+		echo " 16"
+	} >x &&
+	test_must_fail git diff --exit-code &&
+	git diff -I. >actual &&
+	test_must_be_empty actual &&
+	git diff -I. --exit-code
+'
+
 test_expect_success 'check staged with no whitespace errors' '
 	echo "foo();" >x &&
 	git add x &&
@@ -749,20 +783,23 @@ test_expect_success 'check tab-in-indent excluded from wildcard whitespace attri
 test_expect_success 'line numbers in --check output are correct' '
 	echo "" >x &&
 	echo "foo(); " >>x &&
-	git diff --check | grep "x:2:"
+	test_must_fail git diff --check >check &&
+	grep "x:2:" check
 '
 
 test_expect_success 'checkdiff detects new trailing blank lines (1)' '
 	echo "foo();" >x &&
 	echo "" >>x &&
-	git diff --check | grep "new blank line"
+	test_must_fail git diff --check >check &&
+	grep "new blank line" check
 '
 
 test_expect_success 'checkdiff detects new trailing blank lines (2)' '
-	{ echo a; echo b; echo; echo; } >x &&
+	test_write_lines a b "" "" >x &&
 	git add x &&
-	{ echo a; echo; echo; echo; echo; } >x &&
-	git diff --check | grep "new blank line"
+	test_write_lines a "" "" "" "" >x &&
+	test_must_fail git diff --check >check &&
+	grep "new blank line" check
 '
 
 test_expect_success 'checkdiff allows new blank lines' '
@@ -776,7 +813,7 @@ test_expect_success 'checkdiff allows new blank lines' '
 	git diff --check
 '
 
-test_expect_success 'whitespace-only changes not reported' '
+test_expect_success 'whitespace-only changes not reported (diff)' '
 	git reset --hard &&
 	echo >x "hello world" &&
 	git add x &&
@@ -786,23 +823,61 @@ test_expect_success 'whitespace-only changes not reported' '
 	test_must_be_empty actual
 '
 
-cat <<EOF >expect
-diff --git a/x b/z
-similarity index NUM%
-rename from x
-rename to z
-index 380c32a..a97b785 100644
-EOF
-test_expect_success 'whitespace-only changes reported across renames' '
+test_expect_success 'whitespace-only changes not reported (diffstat)' '
+	# reuse state from previous test
+	git diff --stat -b >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success 'whitespace changes with modification reported (diffstat)' '
 	git reset --hard &&
+	echo >x "hello  world" &&
+	git update-index --chmod=+x x &&
+	git diff --stat --cached -b >actual &&
+	cat <<-EOF >expect &&
+	 x | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	test_cmp expect actual
+'
+
+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 &&
+	git add x &&
+	git commit -m "base" &&
+	sed -e "5s/^/ /" x >z &&
+	git rm x &&
+	git add z &&
+	git diff -w -M --cached --stat >actual &&
+	cat <<-EOF >expect &&
+	 x => z | 0
+	 1 file changed, 0 insertions(+), 0 deletions(-)
+	EOF
+	test_cmp expect actual
+'
+
+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 &&
 	git add x &&
+	hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$hash_x") &&
 	git commit -m "base" &&
 	sed -e "5s/^/ /" x >z &&
 	git rm x &&
 	git add z &&
-	git diff -w -M --cached |
-	sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" >actual &&
+	hash_z=$(git hash-object z) &&
+	after=$(git rev-parse --short "$hash_z") &&
+	git diff -w -M --cached >actual.raw &&
+	sed -e "/^similarity index /s/[0-9][0-9]*/NUM/" actual.raw >actual &&
+	cat <<-EOF >expect &&
+	diff --git a/x b/z
+	similarity index NUM%
+	rename from x
+	rename to z
+	index $before..$after 100644
+	EOF
 	test_cmp expect actual
 '
 
@@ -826,15 +901,16 @@ test_expect_success 'rename empty' '
 test_expect_success 'combined diff with autocrlf conversion' '
 
 	git reset --hard &&
-	echo >x hello &&
-	git commit -m "one side" x &&
+	test_commit "one side" x hello one-side &&
 	git checkout HEAD^ &&
 	echo >x goodbye &&
 	git commit -m "the other side" x &&
 	git config core.autocrlf true &&
-	test_must_fail git merge master &&
+	test_must_fail git merge one-side >actual &&
+	test_i18ngrep "Automatic merge failed" actual &&
 
-	git diff | sed -e "1,/^@@@/d" >actual &&
+	git diff >actual.raw &&
+	sed -e "1,/^@@@/d" actual.raw >actual &&
 	! grep "^-" actual
 
 '
@@ -858,13 +934,18 @@ test_expect_success 'diff that introduces a line with only tabs' '
 	git config core.whitespace blank-at-eol &&
 	git reset --hard &&
 	echo "test" >x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 	git commit -m "initial" x &&
 	echo "{NTN}" | tr "NT" "\n\t" >>x &&
-	git diff --color | test_decode_color >current &&
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
+	git diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
 
-	cat >expected <<-\EOF &&
+	cat >expected <<-EOF &&
 	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index 9daeafb..2874b91 100644<RESET>
+	<BOLD>index $before..$after 100644<RESET>
 	<BOLD>--- a/x<RESET>
 	<BOLD>+++ b/x<RESET>
 	<CYAN>@@ -1 +1,4 @@<RESET>
@@ -883,19 +964,23 @@ test_expect_success 'diff that introduces and removes ws breakages' '
 		echo "0. blank-at-eol " &&
 		echo "1. blank-at-eol "
 	} >x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 	git commit -a --allow-empty -m preimage &&
 	{
 		echo "0. blank-at-eol " &&
 		echo "1. still-blank-at-eol " &&
 		echo "2. and a new line "
 	} >x &&
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
 
-	git diff --color |
-	test_decode_color >current &&
+	git diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
 
-	cat >expected <<-\EOF &&
+	cat >expected <<-EOF &&
 	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index d0233a2..700886e 100644<RESET>
+	<BOLD>index $before..$after 100644<RESET>
 	<BOLD>--- a/x<RESET>
 	<BOLD>+++ b/x<RESET>
 	<CYAN>@@ -1,2 +1,3 @@<RESET>
@@ -915,16 +1000,20 @@ test_expect_success 'ws-error-highlight test setup' '
 		echo "0. blank-at-eol " &&
 		echo "1. blank-at-eol "
 	} >x &&
+	old_hash_x=$(git hash-object x) &&
+	before=$(git rev-parse --short "$old_hash_x") &&
 	git commit -a --allow-empty -m preimage &&
 	{
 		echo "0. blank-at-eol " &&
 		echo "1. still-blank-at-eol " &&
 		echo "2. and a new line "
 	} >x &&
+	new_hash_x=$(git hash-object x) &&
+	after=$(git rev-parse --short "$new_hash_x") &&
 
-	cat >expect.default-old <<-\EOF &&
+	cat >expect.default-old <<-EOF &&
 	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index d0233a2..700886e 100644<RESET>
+	<BOLD>index $before..$after 100644<RESET>
 	<BOLD>--- a/x<RESET>
 	<BOLD>+++ b/x<RESET>
 	<CYAN>@@ -1,2 +1,3 @@<RESET>
@@ -934,9 +1023,9 @@ test_expect_success 'ws-error-highlight test setup' '
 	<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
 	EOF
 
-	cat >expect.all <<-\EOF &&
+	cat >expect.all <<-EOF &&
 	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index d0233a2..700886e 100644<RESET>
+	<BOLD>index $before..$after 100644<RESET>
 	<BOLD>--- a/x<RESET>
 	<BOLD>+++ b/x<RESET>
 	<CYAN>@@ -1,2 +1,3 @@<RESET>
@@ -946,9 +1035,9 @@ test_expect_success 'ws-error-highlight test setup' '
 	<GREEN>+<RESET><GREEN>2. and a new line<RESET><BLUE> <RESET>
 	EOF
 
-	cat >expect.none <<-\EOF
+	cat >expect.none <<-EOF
 	<BOLD>diff --git a/x b/x<RESET>
-	<BOLD>index d0233a2..700886e 100644<RESET>
+	<BOLD>index $before..$after 100644<RESET>
 	<BOLD>--- a/x<RESET>
 	<BOLD>+++ b/x<RESET>
 	<CYAN>@@ -1,2 +1,3 @@<RESET>
@@ -962,32 +1051,32 @@ test_expect_success 'ws-error-highlight test setup' '
 
 test_expect_success 'test --ws-error-highlight option' '
 
-	git diff --color --ws-error-highlight=default,old |
-	test_decode_color >current &&
+	git diff --color --ws-error-highlight=default,old >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.default-old current &&
 
-	git diff --color --ws-error-highlight=all |
-	test_decode_color >current &&
+	git diff --color --ws-error-highlight=all >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.all current &&
 
-	git diff --color --ws-error-highlight=none |
-	test_decode_color >current &&
+	git diff --color --ws-error-highlight=none >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.none current
 
 '
 
 test_expect_success 'test diff.wsErrorHighlight config' '
 
-	git -c diff.wsErrorHighlight=default,old diff --color |
-	test_decode_color >current &&
+	git -c diff.wsErrorHighlight=default,old diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.default-old current &&
 
-	git -c diff.wsErrorHighlight=all diff --color |
-	test_decode_color >current &&
+	git -c diff.wsErrorHighlight=all diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.all current &&
 
-	git -c diff.wsErrorHighlight=none diff --color |
-	test_decode_color >current &&
+	git -c diff.wsErrorHighlight=none diff --color >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.none current
 
 '
@@ -995,18 +1084,18 @@ test_expect_success 'test diff.wsErrorHighlight config' '
 test_expect_success 'option overrides diff.wsErrorHighlight' '
 
 	git -c diff.wsErrorHighlight=none \
-		diff --color --ws-error-highlight=default,old |
-	test_decode_color >current &&
+		diff --color --ws-error-highlight=default,old >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.default-old current &&
 
 	git -c diff.wsErrorHighlight=default \
-		diff --color --ws-error-highlight=all |
-	test_decode_color >current &&
+		diff --color --ws-error-highlight=all >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.all current &&
 
 	git -c diff.wsErrorHighlight=all \
-		diff --color --ws-error-highlight=none |
-	test_decode_color >current &&
+		diff --color --ws-error-highlight=none >current.raw &&
+	test_decode_color <current.raw >current &&
 	test_cmp expect.none current
 
 '
@@ -1022,14 +1111,16 @@ test_expect_success 'detect moved code, complete file' '
 	EOF
 	git add test.c &&
 	git commit -m "add main function" &&
+	file=$(git rev-parse --short HEAD:test.c) &&
 	git mv test.c main.c &&
 	test_config color.diff.oldMoved "normal red" &&
 	test_config color.diff.newMoved "normal green" &&
-	git diff HEAD --color-moved=zebra --color --no-renames | test_decode_color >actual &&
-	cat >expected <<-\EOF &&
+	git diff HEAD --color-moved=zebra --color --no-renames >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat >expected <<-EOF &&
 	<BOLD>diff --git a/main.c b/main.c<RESET>
 	<BOLD>new file mode 100644<RESET>
-	<BOLD>index 0000000..a986c57<RESET>
+	<BOLD>index 0000000..$file<RESET>
 	<BOLD>--- /dev/null<RESET>
 	<BOLD>+++ b/main.c<RESET>
 	<CYAN>@@ -0,0 +1,5 @@<RESET>
@@ -1040,7 +1131,7 @@ test_expect_success 'detect moved code, complete file' '
 	<BGREEN>+<RESET><BGREEN>}<RESET>
 	<BOLD>diff --git a/test.c b/test.c<RESET>
 	<BOLD>deleted file mode 100644<RESET>
-	<BOLD>index a986c57..0000000<RESET>
+	<BOLD>index $file..0000000<RESET>
 	<BOLD>--- a/test.c<RESET>
 	<BOLD>+++ /dev/null<RESET>
 	<CYAN>@@ -1,5 +0,0 @@<RESET>
@@ -1094,6 +1185,8 @@ test_expect_success 'detect malicious moved code, inside file' '
 	EOF
 	git add main.c test.c &&
 	git commit -m "add main and test file" &&
+	before_main=$(git rev-parse --short HEAD:main.c) &&
+	before_test=$(git rev-parse --short HEAD:test.c) &&
 	cat <<-\EOF >main.c &&
 		#include<stdio.h>
 		int stuff()
@@ -1126,10 +1219,15 @@ test_expect_success 'detect malicious moved code, inside file' '
 			bar();
 		}
 	EOF
-	git diff HEAD --no-renames --color-moved=zebra --color | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
+	hash_main=$(git hash-object main.c) &&
+	after_main=$(git rev-parse --short "$hash_main") &&
+	hash_test=$(git hash-object test.c) &&
+	after_test=$(git rev-parse --short "$hash_test") &&
+	git diff HEAD --no-renames --color-moved=zebra --color >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat <<-EOF >expected &&
 	<BOLD>diff --git a/main.c b/main.c<RESET>
-	<BOLD>index 27a619c..7cf9336 100644<RESET>
+	<BOLD>index $before_main..$after_main 100644<RESET>
 	<BOLD>--- a/main.c<RESET>
 	<BOLD>+++ b/main.c<RESET>
 	<CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
@@ -1147,7 +1245,7 @@ test_expect_success 'detect malicious moved code, inside file' '
 	 {<RESET>
 	 foo();<RESET>
 	<BOLD>diff --git a/test.c b/test.c<RESET>
-	<BOLD>index 1dc1d85..2bedec9 100644<RESET>
+	<BOLD>index $before_test..$after_test 100644<RESET>
 	<BOLD>--- a/test.c<RESET>
 	<BOLD>+++ b/test.c<RESET>
 	<CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
@@ -1175,10 +1273,11 @@ test_expect_success 'plain moved code, inside file' '
 	test_config color.diff.oldMovedAlternative "blue" &&
 	test_config color.diff.newMovedAlternative "yellow" &&
 	# needs previous test as setup
-	git diff HEAD --no-renames --color-moved=plain --color | test_decode_color >actual &&
-	cat <<-\EOF >expected &&
+	git diff HEAD --no-renames --color-moved=plain --color >actual.raw &&
+	test_decode_color <actual.raw >actual &&
+	cat <<-EOF >expected &&
 	<BOLD>diff --git a/main.c b/main.c<RESET>
-	<BOLD>index 27a619c..7cf9336 100644<RESET>
+	<BOLD>index $before_main..$after_main 100644<RESET>
 	<BOLD>--- a/main.c<RESET>
 	<BOLD>+++ b/main.c<RESET>
 	<CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
@@ -1196,7 +1295,7 @@ test_expect_success 'plain moved code, inside file' '
 	 {<RESET>
 	 foo();<RESET>
 	<BOLD>diff --git a/test.c b/test.c<RESET>
-	<BOLD>index 1dc1d85..2bedec9 100644<RESET>
+	<BOLD>index $before_test..$after_test 100644<RESET>
 	<BOLD>--- a/test.c<RESET>
 	<BOLD>+++ b/test.c<RESET>
 	<CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
@@ -1754,7 +1853,8 @@ test_expect_success 'move detection with submodules' '
 	! grep BRED decoded_actual &&
 
 	# nor did we mess with it another way
-	git diff --submodule=diff --color | test_decode_color >expect &&
+	git diff --submodule=diff --color >expect.raw &&
+	test_decode_color <expect.raw >expect &&
 	test_cmp expect decoded_actual &&
 	rm -rf bananas &&
 	git submodule deinit bananas
@@ -2008,11 +2108,6 @@ test_expect_success 'compare mixed whitespace delta across moved blocks' '
 	test_cmp expected actual
 '
 
-# Note that the "6" in the expected hunk header below is funny, since we only
-# show 5 lines (the missing one was blank and thus ignored). This is how
-# --ignore-blank-lines behaves even without --function-context, and this test
-# is just checking the interaction of the two features. Don't take it as an
-# endorsement of that output.
 test_expect_success 'combine --ignore-blank-lines with --function-context' '
 	test_write_lines 1 "" 2 3 4 5 >a &&
 	test_write_lines 1    2 3 4   >b &&
@@ -2022,6 +2117,7 @@ test_expect_success 'combine --ignore-blank-lines with --function-context' '
 	cat <<-\EOF >expect &&
 	@@ -1,6 +1,4 @@
 	 1
+	-
 	 2
 	 3
 	 4
@@ -2030,4 +2126,27 @@ test_expect_success 'combine --ignore-blank-lines with --function-context' '
 	test_cmp expect actual
 '
 
+test_expect_success 'combine --ignore-blank-lines with --function-context 2' '
+	test_write_lines    a b c "" function 1 2 3 4 5 "" 6 7 8 9 >a &&
+	test_write_lines "" a b c "" function 1 2 3 4 5    6 7 8   >b &&
+	test_must_fail git diff --no-index \
+		--ignore-blank-lines --function-context a b >actual.raw &&
+	sed -n "/@@/,\$p" <actual.raw >actual &&
+	cat <<-\EOF >expect &&
+	@@ -5,11 +6,9 @@ c
+	 function
+	 1
+	 2
+	 3
+	 4
+	 5
+	-
+	 6
+	 7
+	 8
+	-9
+	EOF
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t4016-diff-quote.sh b/t/t4016-diff-quote.sh
index 9c48e5c2c9..876271d682 100755
--- a/t/t4016-diff-quote.sh
+++ b/t/t4016-diff-quote.sh
@@ -82,7 +82,7 @@ test_expect_success 'git diff --stat -M HEAD' '
 	 7 files changed, 0 insertions(+), 0 deletions(-)
 	EOF
 	git diff --stat -M HEAD >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_done
diff --git a/t/t4017-diff-retval.sh b/t/t4017-diff-retval.sh
index 95a7ca7070..ed461f481e 100755
--- a/t/t4017-diff-retval.sh
+++ b/t/t4017-diff-retval.sh
@@ -2,6 +2,9 @@
 
 test_description='Return value of diffs'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -111,7 +114,7 @@ test_expect_success 'check detects leftover conflict markers' '
 	git checkout HEAD^ &&
 	echo binary >>b &&
 	git commit -m "side" b &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	git add b &&
 	test_expect_code 2 git --no-pager diff --cached --check >test.out &&
 	test 3 = $(grep "conflict marker" test.out | wc -l) &&
diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index 6f5ef0035e..740696c8f7 100755
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -25,30 +25,26 @@ test_expect_success 'setup' '
 	echo B >B.java
 '
 
+test_expect_success 'setup: test-tool userdiff' '
+	# Make sure additions to builtin_drivers are sorted
+	test_when_finished "rm builtin-drivers.sorted" &&
+	test-tool userdiff list-builtin-drivers >builtin-drivers &&
+	test_file_not_empty builtin-drivers &&
+	sort <builtin-drivers >builtin-drivers.sorted &&
+	test_cmp builtin-drivers.sorted builtin-drivers &&
+
+	# Ditto, but "custom" requires the .git directory and config
+	# to be setup and read.
+	test_when_finished "rm custom-drivers.sorted" &&
+	test-tool userdiff list-custom-drivers >custom-drivers &&
+	test_file_not_empty custom-drivers &&
+	sort <custom-drivers >custom-drivers.sorted &&
+	test_cmp custom-drivers.sorted custom-drivers
+'
+
 diffpatterns="
-	ada
-	bibtex
-	cpp
-	csharp
-	css
-	dts
-	fortran
-	fountain
-	golang
-	html
-	java
-	matlab
-	objc
-	pascal
-	perl
-	php
-	python
-	ruby
-	rust
-	tex
-	custom1
-	custom2
-	custom3
+	$(cat builtin-drivers)
+	$(cat custom-drivers)
 "
 
 for p in $diffpatterns
@@ -98,14 +94,7 @@ test_expect_success 'setup hunk header tests' '
 # check each individual file
 for i in $(git ls-files)
 do
-	if grep broken "$i" >/dev/null 2>&1
-	then
-		result=failure
-	else
-		result=success
-	fi
-	test_expect_$result "hunk header: $i" "
-		test_when_finished 'cat actual' &&	# for debugging only
+	test_expect_success "hunk header: $i" "
 		git diff -U1 $i >actual &&
 		grep '@@ .* @@.*RIGHT' actual
 	"
diff --git a/t/t4018/README b/t/t4018/README
index 283e01cca1..2d25b2b4fc 100644
--- a/t/t4018/README
+++ b/t/t4018/README
@@ -7,9 +7,6 @@ at least two lines from the line that must appear in the hunk header.
 The text that must appear in the hunk header must contain the word
 "right", but in all upper-case, like in the title above.
 
-To mark a test case that highlights a malfunction, insert the word
-BROKEN in all lower-case somewhere in the file.
-
 This text is a bit twisted and out of order, but it is itself a
 test case for the default hunk header pattern. Know what you are doing
 if you change it.
diff --git a/t/t4018/bash-arithmetic-function b/t/t4018/bash-arithmetic-function
new file mode 100644
index 0000000000..c0b276cb50
--- /dev/null
+++ b/t/t4018/bash-arithmetic-function
@@ -0,0 +1,4 @@
+RIGHT() ((
+
+    ChangeMe = "$x" + "$y"
+))
diff --git a/t/t4018/bash-bashism-style-compact b/t/t4018/bash-bashism-style-compact
new file mode 100644
index 0000000000..1ca3126f61
--- /dev/null
+++ b/t/t4018/bash-bashism-style-compact
@@ -0,0 +1,6 @@
+function RIGHT {
+    function InvalidSyntax{
+        :
+        echo 'ChangeMe'
+    }
+}
diff --git a/t/t4018/bash-bashism-style-function b/t/t4018/bash-bashism-style-function
new file mode 100644
index 0000000000..f1de4fa831
--- /dev/null
+++ b/t/t4018/bash-bashism-style-function
@@ -0,0 +1,4 @@
+function RIGHT {
+    :
+    echo 'ChangeMe'
+}
diff --git a/t/t4018/bash-bashism-style-whitespace b/t/t4018/bash-bashism-style-whitespace
new file mode 100644
index 0000000000..ade85dd3a5
--- /dev/null
+++ b/t/t4018/bash-bashism-style-whitespace
@@ -0,0 +1,4 @@
+	 function 	RIGHT 	( 	) 	{
+
+	    ChangeMe
+	 }
diff --git a/t/t4018/bash-conditional-function b/t/t4018/bash-conditional-function
new file mode 100644
index 0000000000..c5949e829b
--- /dev/null
+++ b/t/t4018/bash-conditional-function
@@ -0,0 +1,4 @@
+RIGHT() [[ \
+
+    "$a" > "$ChangeMe"
+]]
diff --git a/t/t4018/bash-missing-parentheses b/t/t4018/bash-missing-parentheses
new file mode 100644
index 0000000000..8c8a05dd7a
--- /dev/null
+++ b/t/t4018/bash-missing-parentheses
@@ -0,0 +1,6 @@
+function RIGHT {
+    functionInvalidSyntax {
+        :
+        echo 'ChangeMe'
+    }
+}
diff --git a/t/t4018/bash-mixed-style-compact b/t/t4018/bash-mixed-style-compact
new file mode 100644
index 0000000000..d9364cba67
--- /dev/null
+++ b/t/t4018/bash-mixed-style-compact
@@ -0,0 +1,4 @@
+function RIGHT(){
+    :
+    echo 'ChangeMe'
+}
diff --git a/t/t4018/bash-mixed-style-function b/t/t4018/bash-mixed-style-function
new file mode 100644
index 0000000000..555f9b2466
--- /dev/null
+++ b/t/t4018/bash-mixed-style-function
@@ -0,0 +1,4 @@
+function RIGHT() {
+
+    ChangeMe
+}
diff --git a/t/t4018/bash-nested-functions b/t/t4018/bash-nested-functions
new file mode 100644
index 0000000000..2c9237ead4
--- /dev/null
+++ b/t/t4018/bash-nested-functions
@@ -0,0 +1,6 @@
+outer() {
+    RIGHT() {
+        :
+        echo 'ChangeMe'
+    }
+}
diff --git a/t/t4018/bash-other-characters b/t/t4018/bash-other-characters
new file mode 100644
index 0000000000..a3f390d525
--- /dev/null
+++ b/t/t4018/bash-other-characters
@@ -0,0 +1,4 @@
+_RIGHT_0n() {
+
+    ChangeMe
+}
diff --git a/t/t4018/bash-posix-style-compact b/t/t4018/bash-posix-style-compact
new file mode 100644
index 0000000000..045bd2029b
--- /dev/null
+++ b/t/t4018/bash-posix-style-compact
@@ -0,0 +1,4 @@
+RIGHT(){
+
+    ChangeMe
+}
diff --git a/t/t4018/bash-posix-style-function b/t/t4018/bash-posix-style-function
new file mode 100644
index 0000000000..a4d144856e
--- /dev/null
+++ b/t/t4018/bash-posix-style-function
@@ -0,0 +1,4 @@
+RIGHT() {
+
+    ChangeMe
+}
diff --git a/t/t4018/bash-posix-style-whitespace b/t/t4018/bash-posix-style-whitespace
new file mode 100644
index 0000000000..4d984f0aa4
--- /dev/null
+++ b/t/t4018/bash-posix-style-whitespace
@@ -0,0 +1,4 @@
+	 RIGHT 	( 	) 	{
+
+	    ChangeMe
+	 }
diff --git a/t/t4018/bash-subshell-function b/t/t4018/bash-subshell-function
new file mode 100644
index 0000000000..80baa09484
--- /dev/null
+++ b/t/t4018/bash-subshell-function
@@ -0,0 +1,4 @@
+RIGHT() (
+
+    ChangeMe=2
+)
diff --git a/t/t4018/bash-trailing-comment b/t/t4018/bash-trailing-comment
new file mode 100644
index 0000000000..f1edbeda31
--- /dev/null
+++ b/t/t4018/bash-trailing-comment
@@ -0,0 +1,4 @@
+RIGHT() { # Comment
+
+    ChangeMe
+}
diff --git a/t/t4018/css-attribute-value-selector b/t/t4018/css-attribute-value-selector
new file mode 100644
index 0000000000..918256b20c
--- /dev/null
+++ b/t/t4018/css-attribute-value-selector
@@ -0,0 +1,4 @@
+[class*="RIGHT"] {
+    background : #000;
+    border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-block-level-@-statements b/t/t4018/css-block-level-@-statements
new file mode 100644
index 0000000000..d6755f2f3d
--- /dev/null
+++ b/t/t4018/css-block-level-@-statements
@@ -0,0 +1,10 @@
+@keyframes RIGHT {
+    from {
+        background : #000;
+        border : 10px ChangeMe #C6C6C6;
+    }
+    to {
+        background : #fff;
+        border : 10px solid #C6C6C6;
+    }
+}
diff --git a/t/t4018/css-class-selector b/t/t4018/css-class-selector
new file mode 100644
index 0000000000..f790a0062f
--- /dev/null
+++ b/t/t4018/css-class-selector
@@ -0,0 +1,4 @@
+.RIGHT {
+    background : #000;
+    border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-id-selector b/t/t4018/css-id-selector
new file mode 100644
index 0000000000..17c5111052
--- /dev/null
+++ b/t/t4018/css-id-selector
@@ -0,0 +1,4 @@
+#RIGHT {
+    background : #000;
+    border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/css-root-selector b/t/t4018/css-root-selector
new file mode 100644
index 0000000000..22b958e369
--- /dev/null
+++ b/t/t4018/css-root-selector
@@ -0,0 +1,4 @@
+:RIGHT {
+    background : #000;
+    border : 10px ChangeMe #C6C6C6;
+}
diff --git a/t/t4018/elixir-do-not-pick-end b/t/t4018/elixir-do-not-pick-end
new file mode 100644
index 0000000000..fae08ba7e8
--- /dev/null
+++ b/t/t4018/elixir-do-not-pick-end
@@ -0,0 +1,5 @@
+defmodule RIGHT do
+end
+#
+#
+# ChangeMe; do not pick up 'end' line
diff --git a/t/t4018/elixir-ex-unit-test b/t/t4018/elixir-ex-unit-test
new file mode 100644
index 0000000000..0560a2b697
--- /dev/null
+++ b/t/t4018/elixir-ex-unit-test
@@ -0,0 +1,6 @@
+defmodule Test do
+  test "RIGHT" do
+    assert true == true
+    assert ChangeMe
+  end
+end
diff --git a/t/t4018/elixir-function b/t/t4018/elixir-function
new file mode 100644
index 0000000000..d452f495a7
--- /dev/null
+++ b/t/t4018/elixir-function
@@ -0,0 +1,5 @@
+def function(RIGHT, arg) do
+  # comment
+  # comment
+  ChangeMe
+end
diff --git a/t/t4018/elixir-macro b/t/t4018/elixir-macro
new file mode 100644
index 0000000000..4f925e9ad4
--- /dev/null
+++ b/t/t4018/elixir-macro
@@ -0,0 +1,5 @@
+defmacro foo(RIGHT) do
+  # Code
+  # Code
+  ChangeMe
+end
diff --git a/t/t4018/elixir-module b/t/t4018/elixir-module
new file mode 100644
index 0000000000..91a4e7aa20
--- /dev/null
+++ b/t/t4018/elixir-module
@@ -0,0 +1,9 @@
+defmodule RIGHT do
+  @moduledoc """
+  Foo bar
+  """
+
+  def ChangeMe(a) where is_map(a) do
+    a
+  end
+end
diff --git a/t/t4018/elixir-module-func b/t/t4018/elixir-module-func
new file mode 100644
index 0000000000..c9910d0675
--- /dev/null
+++ b/t/t4018/elixir-module-func
@@ -0,0 +1,8 @@
+defmodule Foo do
+  def fun(RIGHT) do
+     # Code
+     # Code
+     # Code
+     ChangeMe
+  end
+end
diff --git a/t/t4018/elixir-nested-module b/t/t4018/elixir-nested-module
new file mode 100644
index 0000000000..771ebc5c42
--- /dev/null
+++ b/t/t4018/elixir-nested-module
@@ -0,0 +1,9 @@
+defmodule MyApp.RIGHT do
+  @moduledoc """
+  Foo bar
+  """
+
+  def ChangeMe(a) where is_map(a) do
+    a
+  end
+end
diff --git a/t/t4018/elixir-private-function b/t/t4018/elixir-private-function
new file mode 100644
index 0000000000..1aabe33b7a
--- /dev/null
+++ b/t/t4018/elixir-private-function
@@ -0,0 +1,5 @@
+defp function(RIGHT, arg) do
+  # comment
+  # comment
+  ChangeMe
+end
diff --git a/t/t4018/elixir-protocol b/t/t4018/elixir-protocol
new file mode 100644
index 0000000000..7d9173691e
--- /dev/null
+++ b/t/t4018/elixir-protocol
@@ -0,0 +1,6 @@
+defprotocol RIGHT do
+  @doc """
+  Calculates the size (and not the length!) of a data structure
+  """
+  def size(data, ChangeMe)
+end
diff --git a/t/t4018/elixir-protocol-implementation b/t/t4018/elixir-protocol-implementation
new file mode 100644
index 0000000000..f9234bbfc4
--- /dev/null
+++ b/t/t4018/elixir-protocol-implementation
@@ -0,0 +1,5 @@
+defimpl RIGHT do
+  # Docs
+  # Docs
+  def foo(ChangeMe), do: :ok
+end
diff --git a/t/t4018/fortran-block-data b/t/t4018/fortran-block-data
new file mode 100644
index 0000000000..63d4e21d0a
--- /dev/null
+++ b/t/t4018/fortran-block-data
@@ -0,0 +1,5 @@
+       BLOCK DATA RIGHT
+       
+       COMMON /B/ C, ChangeMe
+       DATA C, ChangeMe  / 2.0, 6.0 / 
+       END 
diff --git a/t/t4018/fortran-comment b/t/t4018/fortran-comment
new file mode 100644
index 0000000000..7b10d17658
--- /dev/null
+++ b/t/t4018/fortran-comment
@@ -0,0 +1,13 @@
+      module a
+
+      contains
+
+      ! subroutine wrong
+      subroutine RIGHT
+      ! subroutine wrong
+
+      real ChangeMe
+
+      end subroutine RIGHT
+
+      end module a
diff --git a/t/t4018/fortran-comment-keyword b/t/t4018/fortran-comment-keyword
new file mode 100644
index 0000000000..e9206a5379
--- /dev/null
+++ b/t/t4018/fortran-comment-keyword
@@ -0,0 +1,14 @@
+      module a
+
+      contains
+
+      subroutine RIGHT (funcA, funcB)
+
+      real funcA  ! grid function a
+      real funcB  ! grid function b
+
+      real ChangeMe
+
+      end subroutine RIGHT
+
+      end module a
diff --git a/t/t4018/fortran-comment-legacy b/t/t4018/fortran-comment-legacy
new file mode 100644
index 0000000000..53cd062c1e
--- /dev/null
+++ b/t/t4018/fortran-comment-legacy
@@ -0,0 +1,13 @@
+      module a
+
+      contains
+
+C subroutine wrong
+      subroutine RIGHT
+C subroutine wrong
+
+      real ChangeMe
+
+      end subroutine RIGHT
+
+      end module a
diff --git a/t/t4018/fortran-comment-legacy-star b/t/t4018/fortran-comment-legacy-star
new file mode 100644
index 0000000000..2cbcdc3d8a
--- /dev/null
+++ b/t/t4018/fortran-comment-legacy-star
@@ -0,0 +1,13 @@
+      module a
+
+      contains
+
+* subroutine wrong
+      subroutine RIGHT
+* subroutine wrong
+
+      real ChangeMe
+
+      end subroutine RIGHT
+
+      end module a
diff --git a/t/t4018/fortran-external-function b/t/t4018/fortran-external-function
new file mode 100644
index 0000000000..5a2d85d3aa
--- /dev/null
+++ b/t/t4018/fortran-external-function
@@ -0,0 +1,9 @@
+function RIGHT(a, b) result(c)
+
+integer, intent(in) :: ChangeMe
+integer, intent(in) :: b
+integer, intent(out) :: c
+
+c = a+b
+
+end function RIGHT
diff --git a/t/t4018/fortran-external-subroutine b/t/t4018/fortran-external-subroutine
new file mode 100644
index 0000000000..4ce85fea13
--- /dev/null
+++ b/t/t4018/fortran-external-subroutine
@@ -0,0 +1,5 @@
+subroutine RIGHT
+
+real ChangeMe
+
+end subroutine RIGHT
diff --git a/t/t4018/fortran-module b/t/t4018/fortran-module
new file mode 100644
index 0000000000..c4b737dac3
--- /dev/null
+++ b/t/t4018/fortran-module
@@ -0,0 +1,5 @@
+module RIGHT
+
+use ChangeMe
+
+end module RIGHT
diff --git a/t/t4018/fortran-module-procedure b/t/t4018/fortran-module-procedure
new file mode 100644
index 0000000000..1ce6d854c2
--- /dev/null
+++ b/t/t4018/fortran-module-procedure
@@ -0,0 +1,13 @@
+ module RIGHT
+
+   implicit none
+   private
+
+   interface letters  ! generic interface
+      module procedure aaaa, &
+                       bbbb, &
+                       ChangeMe, &
+                       dddd
+   end interface
+   
+end module RIGHT
diff --git a/t/t4018/fortran-program b/t/t4018/fortran-program
new file mode 100644
index 0000000000..4616895e4b
--- /dev/null
+++ b/t/t4018/fortran-program
@@ -0,0 +1,5 @@
+program RIGHT
+
+call ChangeMe
+
+end program RIGHT
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/markdown-heading-indented b/t/t4018/markdown-heading-indented
new file mode 100644
index 0000000000..1991c2bd45
--- /dev/null
+++ b/t/t4018/markdown-heading-indented
@@ -0,0 +1,6 @@
+Indented headings are allowed, as long as the indent is no more than 3 spaces.
+
+   ### RIGHT
+
+- something
+- ChangeMe
diff --git a/t/t4018/markdown-heading-non-headings b/t/t4018/markdown-heading-non-headings
new file mode 100644
index 0000000000..c479c1a3f1
--- /dev/null
+++ b/t/t4018/markdown-heading-non-headings
@@ -0,0 +1,17 @@
+Headings can be right next to other lines of the file:
+# RIGHT
+Indents of four or more spaces make a code block:
+
+    # code comment, not heading
+
+If there's no space after the final hash, it's not a heading:
+
+#hashtag
+
+Sequences of more than 6 hashes don't make a heading:
+
+####### over-enthusiastic heading
+
+So the detected heading should be right up at the start of this file.
+
+ChangeMe
diff --git a/t/t4018/php-abstract-method b/t/t4018/php-abstract-method
new file mode 100644
index 0000000000..ce215df75a
--- /dev/null
+++ b/t/t4018/php-abstract-method
@@ -0,0 +1,7 @@
+abstract class Klass
+{
+    abstract public function RIGHT(): ?string
+    {
+        return 'ChangeMe';
+    }
+}
diff --git a/t/t4018/php-final-method b/t/t4018/php-final-method
new file mode 100644
index 0000000000..537fb8ad9a
--- /dev/null
+++ b/t/t4018/php-final-method
@@ -0,0 +1,7 @@
+class Klass
+{
+    final public function RIGHT(): string
+    {
+        return 'ChangeMe';
+    }
+}
diff --git a/t/t4018/python-async-def b/t/t4018/python-async-def
new file mode 100644
index 0000000000..87640e03d2
--- /dev/null
+++ b/t/t4018/python-async-def
@@ -0,0 +1,4 @@
+async def RIGHT(pi: int = 3.14):
+    while True:
+        break
+    return ChangeMe()
diff --git a/t/t4018/python-class b/t/t4018/python-class
new file mode 100644
index 0000000000..ba9e741430
--- /dev/null
+++ b/t/t4018/python-class
@@ -0,0 +1,4 @@
+class RIGHT(int, str):
+    # comment
+    # another comment
+    # ChangeMe
diff --git a/t/t4018/python-def b/t/t4018/python-def
new file mode 100644
index 0000000000..e50b31b0ad
--- /dev/null
+++ b/t/t4018/python-def
@@ -0,0 +1,4 @@
+def RIGHT(pi: int = 3.14):
+    while True:
+        break
+    return ChangeMe()
diff --git a/t/t4018/python-indented-async-def b/t/t4018/python-indented-async-def
new file mode 100644
index 0000000000..f5d03258af
--- /dev/null
+++ b/t/t4018/python-indented-async-def
@@ -0,0 +1,7 @@
+class Foo:
+    async def RIGHT(self, x: int):
+        return [
+            1,
+            2,
+            ChangeMe,
+        ]
diff --git a/t/t4018/python-indented-class b/t/t4018/python-indented-class
new file mode 100644
index 0000000000..19b4f35c4c
--- /dev/null
+++ b/t/t4018/python-indented-class
@@ -0,0 +1,5 @@
+if TYPE_CHECKING:
+    class RIGHT:
+        # comment
+        # another comment
+        # ChangeMe
diff --git a/t/t4018/python-indented-def b/t/t4018/python-indented-def
new file mode 100644
index 0000000000..208fbadd2b
--- /dev/null
+++ b/t/t4018/python-indented-def
@@ -0,0 +1,7 @@
+class Foo:
+    def RIGHT(self, x: int):
+        return [
+            1,
+            2,
+            ChangeMe,
+        ]
diff --git a/t/t4018/rust-macro-rules b/t/t4018/rust-macro-rules
new file mode 100644
index 0000000000..ec610c5b62
--- /dev/null
+++ b/t/t4018/rust-macro-rules
@@ -0,0 +1,6 @@
+macro_rules! RIGHT {
+    () => {
+        // a comment
+        let x = ChangeMe;
+    };
+}
diff --git a/t/t4018/scheme-class b/t/t4018/scheme-class
new file mode 100644
index 0000000000..e5e07b43fb
--- /dev/null
+++ b/t/t4018/scheme-class
@@ -0,0 +1,7 @@
+(define book-class%
+  (class* () object% RIGHT
+    (field (pages 5))
+    (field (ChangeMe 5))
+    (define/public (letters)
+      (* pages 500))
+    (super-new)))
diff --git a/t/t4018/scheme-def b/t/t4018/scheme-def
new file mode 100644
index 0000000000..1e2673da96
--- /dev/null
+++ b/t/t4018/scheme-def
@@ -0,0 +1,4 @@
+(def (some-func x y z) RIGHT
+  (let ((a x)
+        (b y))
+        (ChangeMe a b)))
diff --git a/t/t4018/scheme-def-variant b/t/t4018/scheme-def-variant
new file mode 100644
index 0000000000..d857a61d64
--- /dev/null
+++ b/t/t4018/scheme-def-variant
@@ -0,0 +1,4 @@
+(defmethod {print point} RIGHT
+  (lambda (self)
+    (with ((point x y) self)
+      (printf "{ChangeMe x:~a y:~a}~n" x y))))
diff --git a/t/t4018/scheme-define-slash-public b/t/t4018/scheme-define-slash-public
new file mode 100644
index 0000000000..39a93a1600
--- /dev/null
+++ b/t/t4018/scheme-define-slash-public
@@ -0,0 +1,7 @@
+(define bar-class%
+  (class object%
+    (field (info 5))
+    (define/public (foo) RIGHT
+      (+ info 42)
+      (* info ChangeMe))
+    (super-new)))
diff --git a/t/t4018/scheme-define-syntax b/t/t4018/scheme-define-syntax
new file mode 100644
index 0000000000..7d5e99e0fc
--- /dev/null
+++ b/t/t4018/scheme-define-syntax
@@ -0,0 +1,8 @@
+(define-syntax define-test-suite RIGHT
+  (syntax-rules ()
+    ((_ suite-name (name test) ChangeMe ...)
+     (define suite-name
+       (let ((tests
+              `((name . ,test) ...)))
+         (lambda ()
+           (run-suite 'suite-name tests)))))))
diff --git a/t/t4018/scheme-define-variant b/t/t4018/scheme-define-variant
new file mode 100644
index 0000000000..911708854d
--- /dev/null
+++ b/t/t4018/scheme-define-variant
@@ -0,0 +1,4 @@
+(define* (some-func x y z) RIGHT
+  (let ((a x)
+        (b y))
+        (ChangeMe a b)))
diff --git a/t/t4018/scheme-library b/t/t4018/scheme-library
new file mode 100644
index 0000000000..82ea3df510
--- /dev/null
+++ b/t/t4018/scheme-library
@@ -0,0 +1,11 @@
+(library (my-helpers id-stuff) RIGHT
+  (export find-dup)
+  (import (ChangeMe))
+  (define (find-dup l)
+    (and (pair? l)
+         (let loop ((rest (cdr l)))
+           (cond
+            [(null? rest) (find-dup (cdr l))]
+            [(bound-identifier=? (car l) (car rest))
+             (car rest)]
+            [else (loop (cdr rest))])))))
diff --git a/t/t4018/scheme-local-define b/t/t4018/scheme-local-define
new file mode 100644
index 0000000000..bc6d8aebbe
--- /dev/null
+++ b/t/t4018/scheme-local-define
@@ -0,0 +1,4 @@
+(define (higher-order)
+  (define local-function RIGHT
+    (lambda (x)
+     (car "this is" "ChangeMe"))))
diff --git a/t/t4018/scheme-module b/t/t4018/scheme-module
new file mode 100644
index 0000000000..edfae0ebf7
--- /dev/null
+++ b/t/t4018/scheme-module
@@ -0,0 +1,6 @@
+(module A RIGHT
+  (export with-display-exception)
+  (extern (display-exception display-exception ChangeMe))
+  (def (with-display-exception thunk)
+    (with-catch (lambda (e) (display-exception e (current-error-port)) e)
+      thunk)))
diff --git a/t/t4018/scheme-top-level-define b/t/t4018/scheme-top-level-define
new file mode 100644
index 0000000000..624743c22b
--- /dev/null
+++ b/t/t4018/scheme-top-level-define
@@ -0,0 +1,4 @@
+(define (some-func x y z) RIGHT
+  (let ((a x)
+        (b y))
+        (ChangeMe a b)))
diff --git a/t/t4018/scheme-user-defined-define b/t/t4018/scheme-user-defined-define
new file mode 100644
index 0000000000..35fe7cc9bf
--- /dev/null
+++ b/t/t4018/scheme-user-defined-define
@@ -0,0 +1,6 @@
+(define-test-suite record\ case-tests RIGHT
+  (record-case-1 (lambda (fail)
+                   (let ((a (make-foo 1 2)))
+                     (record-case a
+                       ((bar x) (ChangeMe))
+                       ((foo a b) (+ a b)))))))
diff --git a/t/t4026-color.sh b/t/t4026-color.sh
index 671e951ee5..c0b642c1ab 100755
--- a/t/t4026-color.sh
+++ b/t/t4026-color.sh
@@ -30,6 +30,14 @@ test_expect_success 'attribute before color name' '
 	color "bold red" "[1;31m"
 '
 
+test_expect_success 'aixterm bright fg color' '
+	color "brightred" "[91m"
+'
+
+test_expect_success 'aixterm bright bg color' '
+	color "green brightblue" "[32;104m"
+'
+
 test_expect_success 'color name before attribute' '
 	color "red bold" "[1;31m"
 '
@@ -74,6 +82,10 @@ test_expect_success '0-7 are aliases for basic ANSI color names' '
 	color "0 7" "[30;47m"
 '
 
+test_expect_success '8-15 are aliases for aixterm color names' '
+	color "12 13" "[94;105m"
+'
+
 test_expect_success '256 colors' '
 	color "254 bold 255" "[1;38;5;254;48;5;255m"
 '
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 9aa8e2b39b..94ef77e1df 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -3,7 +3,7 @@
 test_description='difference in submodules'
 
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 test_expect_success setup '
 	test_tick &&
@@ -36,7 +36,8 @@ test_expect_success setup '
 '
 
 test_expect_success 'git diff --raw HEAD' '
-	git diff --raw --abbrev=40 HEAD >actual &&
+	hexsz=$(test_oid hexsz) &&
+	git diff --raw --abbrev=$hexsz HEAD >actual &&
 	test_cmp expect actual
 '
 
@@ -92,6 +93,14 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked)' '
 	) &&
 	git diff HEAD >actual &&
 	sed -e "1,/^@@/d" actual >actual.body &&
+	expect_from_to >expect.body $subtip $subprev &&
+	test_cmp expect.body actual.body
+'
+
+test_expect_success 'git diff HEAD with dirty submodule (untracked) (none ignored)' '
+	test_config diff.ignoreSubmodules none &&
+	git diff HEAD >actual &&
+	sed -e "1,/^@@/d" actual >actual.body &&
 	expect_from_to >expect.body $subtip $subprev-dirty &&
 	test_cmp expect.body actual.body
 '
@@ -167,13 +176,13 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)'
 		git clean -qfdx &&
 		>cruft
 	) &&
-	git diff HEAD >actual &&
+	git diff --ignore-submodules=none HEAD >actual &&
 	sed -e "1,/^@@/d" actual >actual.body &&
 	expect_from_to >expect.body $subprev $subprev-dirty &&
 	test_cmp expect.body actual.body &&
 	git diff --ignore-submodules=all HEAD >actual2 &&
 	test_must_be_empty actual2 &&
-	git diff --ignore-submodules=untracked HEAD >actual3 &&
+	git diff HEAD >actual3 &&
 	test_must_be_empty actual3 &&
 	git diff --ignore-submodules=dirty HEAD >actual4 &&
 	test_must_be_empty actual4
@@ -245,23 +254,21 @@ test_expect_success 'git diff (empty submodule dir)' '
 '
 
 test_expect_success 'conflicted submodule setup' '
-
-	# 39 efs
-	c=fffffffffffffffffffffffffffffffffffffff &&
+	c=$(test_oid ff_1) &&
 	(
 		echo "000000 $ZERO_OID 0	sub" &&
 		echo "160000 1$c 1	sub" &&
 		echo "160000 2$c 2	sub" &&
 		echo "160000 3$c 3	sub"
 	) | git update-index --index-info &&
-	echo >expect.nosub '\''diff --cc sub
+	echo >expect.nosub "diff --cc sub
 index 2ffffff,3ffffff..0000000
 --- a/sub
 +++ b/sub
 @@@ -1,1 -1,1 +1,1 @@@
-- Subproject commit 2fffffffffffffffffffffffffffffffffffffff
- -Subproject commit 3fffffffffffffffffffffffffffffffffffffff
-++Subproject commit 0000000000000000000000000000000000000000'\'' &&
+- Subproject commit 2$c
+ -Subproject commit 3$c
+++Subproject commit $ZERO_OID" &&
 
 	hh=$(git rev-parse HEAD) &&
 	sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
diff --git a/t/t4030-diff-textconv.sh b/t/t4030-diff-textconv.sh
index 4cb9f0e523..a39a626664 100755
--- a/t/t4030-diff-textconv.sh
+++ b/t/t4030-diff-textconv.sh
@@ -26,12 +26,8 @@ EOF
 chmod +x hexdump
 
 test_expect_success 'setup binary file with history' '
-	printf "\\0\\n" >file &&
-	git add file &&
-	git commit -m one &&
-	printf "\\01\\n" >>file &&
-	git add file &&
-	git commit -m two
+	test_commit --printf one file "\\0\\n" &&
+	test_commit --printf --append two file "\\01\\n"
 '
 
 test_expect_success 'file is considered binary by porcelain' '
@@ -139,7 +135,7 @@ EOF
 test_expect_success 'diffstat does not run textconv' '
 	echo file diff=fail >.gitattributes &&
 	git diff --stat HEAD^ HEAD >actual &&
-	test_i18ncmp expect.stat actual &&
+	test_cmp expect.stat actual &&
 
 	head -n1 <expect.stat >expect.line1 &&
 	head -n1 <actual >actual.line1 &&
diff --git a/t/t4034-diff-words.sh b/t/t4034-diff-words.sh
index 9a93c2a3e0..561c582d16 100755
--- a/t/t4034-diff-words.sh
+++ b/t/t4034-diff-words.sh
@@ -3,7 +3,7 @@
 test_description='word diff colors'
 
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 cat >pre.simple <<-\EOF
 	h(4)
@@ -19,9 +19,11 @@ cat >post.simple <<-\EOF
 
 	aeff = aeff * ( aaa )
 EOF
-cat >expect.letter-runs-are-words <<-\EOF
+pre=$(git rev-parse --short $(git hash-object pre.simple))
+post=$(git rev-parse --short $(git hash-object post.simple))
+cat >expect.letter-runs-are-words <<-EOF
 	<BOLD>diff --git a/pre b/post<RESET>
-	<BOLD>index 330b04f..5ed8eff 100644<RESET>
+	<BOLD>index $pre..$post 100644<RESET>
 	<BOLD>--- a/pre<RESET>
 	<BOLD>+++ b/post<RESET>
 	<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -33,9 +35,9 @@ cat >expect.letter-runs-are-words <<-\EOF
 
 	<GREEN>aeff = aeff * ( aaa<RESET> )
 EOF
-cat >expect.non-whitespace-is-word <<-\EOF
+cat >expect.non-whitespace-is-word <<-EOF
 	<BOLD>diff --git a/pre b/post<RESET>
-	<BOLD>index 330b04f..5ed8eff 100644<RESET>
+	<BOLD>index $pre..$post 100644<RESET>
 	<BOLD>--- a/pre<RESET>
 	<BOLD>+++ b/post<RESET>
 	<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -49,9 +51,12 @@ cat >expect.non-whitespace-is-word <<-\EOF
 EOF
 
 word_diff () {
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
 	test_must_fail git diff --no-index "$@" pre post >output &&
 	test_decode_color <output >output.decrypted &&
-	test_cmp expect output.decrypted
+	sed -e "2s/index [^ ]*/index $pre..$post/" expect >expected
+	test_cmp expected output.decrypted
 }
 
 test_language_driver () {
@@ -77,9 +82,9 @@ test_expect_success 'set up pre and post with runs of whitespace' '
 '
 
 test_expect_success 'word diff with runs of whitespace' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 330b04f..5ed8eff 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -97,9 +102,9 @@ test_expect_success 'word diff with runs of whitespace' '
 '
 
 test_expect_success '--word-diff=porcelain' '
-	sed 's/#.*$//' >expect <<-\EOF &&
+	sed "s/#.*$//" >expect <<-EOF &&
 		diff --git a/pre b/post
-		index 330b04f..5ed8eff 100644
+		index $pre..$post 100644
 		--- a/pre
 		+++ b/post
 		@@ -1,3 +1,7 @@
@@ -121,9 +126,9 @@ test_expect_success '--word-diff=porcelain' '
 '
 
 test_expect_success '--word-diff=plain' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		diff --git a/pre b/post
-		index 330b04f..5ed8eff 100644
+		index $pre..$post 100644
 		--- a/pre
 		+++ b/post
 		@@ -1,3 +1,7 @@
@@ -140,9 +145,9 @@ test_expect_success '--word-diff=plain' '
 '
 
 test_expect_success '--word-diff=plain --color' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 330b04f..5ed8eff 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -158,9 +163,9 @@ test_expect_success '--word-diff=plain --color' '
 '
 
 test_expect_success 'word diff without context' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 330b04f..5ed8eff 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1 +1 @@<RESET>
@@ -179,6 +184,11 @@ test_expect_success 'word diff with a regular expression' '
 	word_diff --color-words="[a-z]+"
 '
 
+test_expect_success 'word diff with zero length matches' '
+	cp expect.letter-runs-are-words expect &&
+	word_diff --color-words="[a-z${LF}]*"
+'
+
 test_expect_success 'set up a diff driver' '
 	git config diff.testdriver.wordRegex "[^[:space:]]" &&
 	cat <<-\EOF >.gitattributes
@@ -207,9 +217,9 @@ test_expect_success 'command-line overrides config' '
 '
 
 test_expect_success 'command-line overrides config: --word-diff-regex' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 330b04f..5ed8eff 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -234,9 +244,9 @@ test_expect_success 'setup: remove diff driver regex' '
 '
 
 test_expect_success 'use configured regex' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 330b04f..5ed8eff 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1,3 +1,7 @@<RESET>
@@ -254,9 +264,11 @@ test_expect_success 'use configured regex' '
 test_expect_success 'test parsing words for newline' '
 	echo "aaa (aaa)" >pre &&
 	echo "aaa (aaa) aaa" >post &&
-	cat >expect <<-\EOF &&
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index c29453b..be22f37 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1 +1 @@<RESET>
@@ -268,9 +280,11 @@ test_expect_success 'test parsing words for newline' '
 test_expect_success 'test when words are only removed at the end' '
 	echo "(:" >pre &&
 	echo "(" >post &&
-	cat >expect <<-\EOF &&
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
 		<BOLD>diff --git a/pre b/post<RESET>
-		<BOLD>index 289cb9d..2d06f37 100644<RESET>
+		<BOLD>index $pre..$post 100644<RESET>
 		<BOLD>--- a/pre<RESET>
 		<BOLD>+++ b/post<RESET>
 		<CYAN>@@ -1 +1 @@<RESET>
@@ -282,9 +296,11 @@ test_expect_success 'test when words are only removed at the end' '
 test_expect_success '--word-diff=none' '
 	echo "(:" >pre &&
 	echo "(" >post &&
-	cat >expect <<-\EOF &&
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
 		diff --git a/pre b/post
-		index 289cb9d..2d06f37 100644
+		index $pre..$post 100644
 		--- a/pre
 		+++ b/post
 		@@ -1 +1 @@
@@ -314,19 +330,10 @@ test_language_driver perl
 test_language_driver php
 test_language_driver python
 test_language_driver ruby
+test_language_driver scheme
 test_language_driver tex
 
 test_expect_success 'word-diff with diff.sbe' '
-	cat >expect <<-\EOF &&
-	diff --git a/pre b/post
-	index a1a53b5..bc8fe6d 100644
-	--- a/pre
-	+++ b/post
-	@@ -1,3 +1,3 @@
-	a
-
-	[-b-]{+c+}
-	EOF
 	cat >pre <<-\EOF &&
 	a
 
@@ -337,21 +344,35 @@ test_expect_success 'word-diff with diff.sbe' '
 
 	c
 	EOF
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
+	diff --git a/pre b/post
+	index $pre..$post 100644
+	--- a/pre
+	+++ b/post
+	@@ -1,3 +1,3 @@
+	a
+
+	[-b-]{+c+}
+	EOF
 	test_config diff.suppress-blank-empty true &&
 	word_diff --word-diff=plain
 '
 
 test_expect_success 'word-diff with no newline at EOF' '
-	cat >expect <<-\EOF &&
+	printf "%s" "a a a a a" >pre &&
+	printf "%s" "a a ab a a" >post &&
+	pre=$(git rev-parse --short $(git hash-object pre)) &&
+	post=$(git rev-parse --short $(git hash-object post)) &&
+	cat >expect <<-EOF &&
 	diff --git a/pre b/post
-	index 7bf316e..3dd0303 100644
+	index $pre..$post 100644
 	--- a/pre
 	+++ b/post
 	@@ -1 +1 @@
 	a a [-a-]{+ab+} a a
 	EOF
-	printf "%s" "a a a a a" >pre &&
-	printf "%s" "a a ab a a" >post &&
 	word_diff --word-diff=plain
 '
 
diff --git a/t/t4034/scheme/expect b/t/t4034/scheme/expect
new file mode 100644
index 0000000000..496cd5de8c
--- /dev/null
+++ b/t/t4034/scheme/expect
@@ -0,0 +1,11 @@
+<BOLD>diff --git a/pre b/post<RESET>
+<BOLD>index 74b6605..63b6ac4 100644<RESET>
+<BOLD>--- a/pre<RESET>
+<BOLD>+++ b/post<RESET>
+<CYAN>@@ -1,6 +1,6 @@<RESET>
+(define (<RED>myfunc a b<RESET><GREEN>my-func first second<RESET>)
+  ; This is a <RED>really<RESET><GREEN>(moderately)<RESET> cool function.
+  (<RED>this\place<RESET><GREEN>that\place<RESET> (+ 3 4))
+  (define <RED>some-text<RESET><GREEN>|a greeting|<RESET> "hello")
+  (let ((c (<RED>+ a b<RESET><GREEN>add1 first<RESET>)))
+    (format "one more than the total is %d" (<RED>add1<RESET><GREEN>+<RESET> c <GREEN>second<RESET>))))
diff --git a/t/t4034/scheme/post b/t/t4034/scheme/post
new file mode 100644
index 0000000000..63b6ac4f87
--- /dev/null
+++ b/t/t4034/scheme/post
@@ -0,0 +1,6 @@
+(define (my-func first second)
+  ; This is a (moderately) cool function.
+  (that\place (+ 3 4))
+  (define |a greeting| "hello")
+  (let ((c (add1 first)))
+    (format "one more than the total is %d" (+ c second))))
diff --git a/t/t4034/scheme/pre b/t/t4034/scheme/pre
new file mode 100644
index 0000000000..74b6605357
--- /dev/null
+++ b/t/t4034/scheme/pre
@@ -0,0 +1,6 @@
+(define (myfunc a b)
+  ; This is a really cool function.
+  (this\place (+ 3 4))
+  (define some-text "hello")
+  (let ((c (+ a b)))
+    (format "one more than the total is %d" (add1 c))))
diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh
index b9d876efa2..aeac203c42 100755
--- a/t/t4038-diff-combined.sh
+++ b/t/t4038-diff-combined.sh
@@ -2,8 +2,11 @@
 
 test_description='combined diff'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 setup_helper () {
 	one=$1 branch=$2 side=$3 &&
@@ -115,7 +118,7 @@ test_expect_success 'check --cc --raw with forty trees' '
 '
 
 test_expect_success 'setup combined ignore spaces' '
-	git checkout master &&
+	git checkout main &&
 	>test &&
 	git add test &&
 	git commit -m initial &&
@@ -143,7 +146,7 @@ test_expect_success 'setup combined ignore spaces' '
 	EOF
 	git commit -m "test other space changes" -a &&
 
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	tr -d Q <<-\EOF >test &&
 	eol spaces Q
 	space  change
@@ -354,7 +357,7 @@ test_expect_failure 'combine diff coalesce three parents' '
 '
 
 # Test for a bug reported at
-# https://public-inbox.org/git/20130515143508.GO25742@login.drsnuggles.stderr.nl/
+# https://lore.kernel.org/git/20130515143508.GO25742@login.drsnuggles.stderr.nl/
 # where a delete lines were missing from combined diff output when they
 # occurred exactly before the context lines of a later change.
 test_expect_success 'combine diff missing delete bug' '
@@ -404,7 +407,7 @@ test_expect_success 'combine diff missing delete bug' '
 test_expect_success 'combine diff gets tree sorting right' '
 	# create a directory and a file that sort differently in trees
 	# versus byte-wise (implied "/" sorts after ".")
-	git checkout -f master &&
+	git checkout -f main &&
 	mkdir foo &&
 	echo base >foo/one &&
 	echo base >foo/two &&
@@ -414,9 +417,9 @@ test_expect_success 'combine diff gets tree sorting right' '
 
 	# one side modifies a file in the directory, along with the root
 	# file...
-	echo master >foo/one &&
-	echo master >foo.ext &&
-	git commit -a -m master &&
+	echo main >foo/one &&
+	echo main >foo.ext &&
+	git commit -a -m main &&
 
 	# the other side modifies the other file in the directory
 	git checkout -b other HEAD^ &&
@@ -426,7 +429,7 @@ test_expect_success 'combine diff gets tree sorting right' '
 	# And now we merge. The files in the subdirectory will resolve cleanly,
 	# meaning that a combined diff will not find them interesting. But it
 	# will find the tree itself interesting, because it had to be merged.
-	git checkout master &&
+	git checkout main &&
 	git merge other &&
 
 	printf "MM\tfoo\n" >expect &&
@@ -440,11 +443,13 @@ test_expect_success 'setup for --combined-all-paths' '
 	git branch side2c &&
 	git checkout side1c &&
 	test_seq 1 10 >filename-side1c &&
+	side1cf=$(git hash-object filename-side1c) &&
 	git add filename-side1c &&
 	git commit -m with &&
 	git checkout side2c &&
 	test_seq 1 9 >filename-side2c &&
 	echo ten >>filename-side2c &&
+	side2cf=$(git hash-object filename-side2c) &&
 	git add filename-side2c &&
 	git commit -m iam &&
 	git checkout -b mergery side1c &&
@@ -452,13 +457,14 @@ test_expect_success 'setup for --combined-all-paths' '
 	git rm filename-side1c &&
 	echo eleven >>filename-side2c &&
 	git mv filename-side2c filename-merged &&
+	mergedf=$(git hash-object filename-merged) &&
 	git add filename-merged &&
 	git commit
 '
 
 test_expect_success '--combined-all-paths and --raw' '
-	cat <<-\EOF >expect &&
-	::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR	filename-side1c	filename-side2c	filename-merged
+	cat <<-EOF >expect &&
+	::100644 100644 100644 $side1cf $side2cf $mergedf RR	filename-side1c	filename-side2c	filename-merged
 	EOF
 	git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp &&
 	sed 1d <actual.tmp >actual &&
@@ -482,11 +488,13 @@ test_expect_success FUNNYNAMES 'setup for --combined-all-paths with funny names'
 	git checkout side1d &&
 	test_seq 1 10 >"$(printf "file\twith\ttabs")" &&
 	git add file* &&
+	side1df=$(git hash-object *tabs) &&
 	git commit -m with &&
 	git checkout side2d &&
 	test_seq 1 9 >"$(printf "i\tam\ttabbed")" &&
 	echo ten >>"$(printf "i\tam\ttabbed")" &&
 	git add *tabbed &&
+	side2df=$(git hash-object *tabbed) &&
 	git commit -m iam &&
 	git checkout -b funny-names-mergery side1d &&
 	git merge --no-commit side2d &&
@@ -494,12 +502,14 @@ test_expect_success FUNNYNAMES 'setup for --combined-all-paths with funny names'
 	echo eleven >>"$(printf "i\tam\ttabbed")" &&
 	git mv "$(printf "i\tam\ttabbed")" "$(printf "fickle\tnaming")" &&
 	git add fickle* &&
-	git commit
+	headf=$(git hash-object fickle*) &&
+	git commit &&
+	head=$(git rev-parse HEAD)
 '
 
 test_expect_success FUNNYNAMES '--combined-all-paths and --raw and funny names' '
-	cat <<-\EOF >expect &&
-	::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR	"file\twith\ttabs"	"i\tam\ttabbed"	"fickle\tnaming"
+	cat <<-EOF >expect &&
+	::100644 100644 100644 $side1df $side2df $headf RR	"file\twith\ttabs"	"i\tam\ttabbed"	"fickle\tnaming"
 	EOF
 	git diff-tree -c -M --raw --combined-all-paths HEAD >actual.tmp &&
 	sed 1d <actual.tmp >actual &&
@@ -507,7 +517,7 @@ test_expect_success FUNNYNAMES '--combined-all-paths and --raw and funny names'
 '
 
 test_expect_success FUNNYNAMES '--combined-all-paths and --raw -and -z and funny names' '
-	printf "aaf8087c3cbd4db8e185a2d074cf27c53cfb75d7\0::100644 100644 100644 f00c965d8307308469e537302baa73048488f162 088bd5d92c2a8e0203ca8e7e4c2a5c692f6ae3f7 333b9c62519f285e1854830ade0fe1ef1d40ee1b RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect &&
+	printf "$head\0::100644 100644 100644 $side1df $side2df $headf RR\0file\twith\ttabs\0i\tam\ttabbed\0fickle\tnaming\0" >expect &&
 	git diff-tree -c -M --raw --combined-all-paths -z HEAD >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t4039-diff-assume-unchanged.sh b/t/t4039-diff-assume-unchanged.sh
index 53ac44b0f0..0eb0314a8b 100755
--- a/t/t4039-diff-assume-unchanged.sh
+++ b/t/t4039-diff-assume-unchanged.sh
@@ -12,6 +12,7 @@ test_expect_success 'setup' '
 	git commit -m zero &&
 	echo one > one &&
 	echo two > two &&
+	blob=$(git hash-object one) &&
 	git add one two &&
 	git commit -m onetwo &&
 	git update-index --assume-unchanged one &&
@@ -20,7 +21,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'diff-index does not examine assume-unchanged entries' '
-	git diff-index HEAD^ -- one | grep -q 5626abf0f72e58d7a153368ba57db4c673c0e171
+	git diff-index HEAD^ -- one | grep -q $blob
 '
 
 test_expect_success 'diff-files does not examine assume-unchanged entries' '
diff --git a/t/t4041-diff-submodule-option.sh b/t/t4041-diff-submodule-option.sh
index 619bf97098..0c1502d4b0 100755
--- a/t/t4041-diff-submodule-option.sh
+++ b/t/t4041-diff-submodule-option.sh
@@ -9,6 +9,9 @@ test_description='Support for verbose submodule differences in git diff
 This test tries to verify the sanity of the --submodule option of git diff.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Tested non-UTF-8 encoding
@@ -262,7 +265,7 @@ test_expect_success 'submodule is up to date' '
 
 test_expect_success 'submodule contains untracked content' '
 	echo new > sm1/new-file &&
-	git diff-index -p --submodule=log HEAD >actual &&
+	git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
 	EOF
@@ -270,7 +273,7 @@ test_expect_success 'submodule contains untracked content' '
 '
 
 test_expect_success 'submodule contains untracked content (untracked ignored)' '
-	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
+	git diff-index -p --submodule=log HEAD >actual &&
 	test_must_be_empty actual
 '
 
@@ -284,9 +287,9 @@ test_expect_success 'submodule contains untracked content (all ignored)' '
 	test_must_be_empty actual
 '
 
-test_expect_success 'submodule contains untracked and modifed content' '
+test_expect_success 'submodule contains untracked and modified content' '
 	echo new > sm1/foo6 &&
-	git diff-index -p --submodule=log HEAD >actual &&
+	git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
 	Submodule sm1 contains modified content
@@ -294,28 +297,28 @@ test_expect_success 'submodule contains untracked and modifed content' '
 	test_cmp expected actual
 '
 
-test_expect_success 'submodule contains untracked and modifed content (untracked ignored)' '
+test_expect_success 'submodule contains untracked and modified content (untracked ignored)' '
 	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
+	git diff-index -p --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains modified content
 	EOF
 	test_cmp expected actual
 '
 
-test_expect_success 'submodule contains untracked and modifed content (dirty ignored)' '
+test_expect_success 'submodule contains untracked and modified content (dirty ignored)' '
 	echo new > sm1/foo6 &&
 	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
 	test_must_be_empty actual
 '
 
-test_expect_success 'submodule contains untracked and modifed content (all ignored)' '
+test_expect_success 'submodule contains untracked and modified content (all ignored)' '
 	echo new > sm1/foo6 &&
 	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
 	test_must_be_empty actual
 '
 
-test_expect_success 'submodule contains modifed content' '
+test_expect_success 'submodule contains modified content' '
 	rm -f sm1/new-file &&
 	git diff-index -p --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
@@ -337,7 +340,7 @@ test_expect_success 'submodule is modified' '
 
 test_expect_success 'modified submodule contains untracked content' '
 	echo new > sm1/new-file &&
-	git diff-index -p --submodule=log HEAD >actual &&
+	git diff-index -p  --ignore-submodules=none --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
 	Submodule sm1 $head6..$head8:
@@ -347,7 +350,7 @@ test_expect_success 'modified submodule contains untracked content' '
 '
 
 test_expect_success 'modified submodule contains untracked content (untracked ignored)' '
-	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
+	git diff-index -p --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 $head6..$head8:
 	  > change
@@ -369,9 +372,9 @@ test_expect_success 'modified submodule contains untracked content (all ignored)
 	test_must_be_empty actual
 '
 
-test_expect_success 'modified submodule contains untracked and modifed content' '
+test_expect_success 'modified submodule contains untracked and modified content' '
 	echo modification >> sm1/foo6 &&
-	git diff-index -p --submodule=log HEAD >actual &&
+	git diff-index -p --ignore-submodules=none --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
 	Submodule sm1 contains modified content
@@ -381,9 +384,9 @@ test_expect_success 'modified submodule contains untracked and modifed content'
 	test_cmp expected actual
 '
 
-test_expect_success 'modified submodule contains untracked and modifed content (untracked ignored)' '
+test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' '
 	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules=untracked --submodule=log HEAD >actual &&
+	git diff-index -p --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains modified content
 	Submodule sm1 $head6..$head8:
@@ -392,7 +395,7 @@ test_expect_success 'modified submodule contains untracked and modifed content (
 	test_cmp expected actual
 '
 
-test_expect_success 'modified submodule contains untracked and modifed content (dirty ignored)' '
+test_expect_success 'modified submodule contains untracked and modified content (dirty ignored)' '
 	echo modification >> sm1/foo6 &&
 	git diff-index -p --ignore-submodules=dirty --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
@@ -402,13 +405,13 @@ test_expect_success 'modified submodule contains untracked and modifed content (
 	test_cmp expected actual
 '
 
-test_expect_success 'modified submodule contains untracked and modifed content (all ignored)' '
+test_expect_success 'modified submodule contains untracked and modified content (all ignored)' '
 	echo modification >> sm1/foo6 &&
 	git diff-index -p --ignore-submodules --submodule=log HEAD >actual &&
 	test_must_be_empty actual
 '
 
-test_expect_success 'modified submodule contains modifed content' '
+test_expect_success 'modified submodule contains modified content' '
 	rm -f sm1/new-file &&
 	git diff-index -p --submodule=log HEAD >actual &&
 	cat >expected <<-EOF &&
@@ -538,7 +541,7 @@ test_expect_success 'diff --submodule with objects referenced by alternates' '
 	(cd super &&
 		(cd sub &&
 			git fetch &&
-			git checkout origin/master
+			git checkout origin/main
 		) &&
 		git diff --submodule > ../actual
 	) &&
diff --git a/t/t4044-diff-index-unique-abbrev.sh b/t/t4044-diff-index-unique-abbrev.sh
index 647905e01f..4701796d10 100755
--- a/t/t4044-diff-index-unique-abbrev.sh
+++ b/t/t4044-diff-index-unique-abbrev.sh
@@ -3,34 +3,48 @@
 test_description='test unique sha1 abbreviation on "index from..to" line'
 . ./test-lib.sh
 
-if ! test_have_prereq SHA1
-then
-       skip_all='not using SHA-1 for objects'
-       test_done
-fi
-
-cat >expect_initial <<EOF
-100644 blob 51d2738463ea4ca66f8691c91e33ce64b7d41bb1	foo
-EOF
+test_expect_success 'setup' '
+	test_oid_cache <<-EOF &&
+	val1 sha1:4827
+	val1 sha256:5664
 
-cat >expect_update <<EOF
-100644 blob 51d2738efb4ad8a1e40bed839ab8e116f0a15e47	foo
-EOF
+	val2 sha1:11742
+	val2 sha256:10625
 
-test_expect_success 'setup' '
-	echo 4827 > foo &&
+	hash1 sha1:51d2738463ea4ca66f8691c91e33ce64b7d41bb1
+	hash1 sha256:ae31dfff0af93b2c62b0098a039b38569c43b0a7e97b873000ca42d128f27350
+
+	hasht1 sha1:51d27384
+	hasht1 sha256:ae31dfff
+
+	hash2 sha1:51d2738efb4ad8a1e40bed839ab8e116f0a15e47
+	hash2 sha256:ae31dffada88a46fd5f53c7ed5aa25a7a8951f1d5e88456c317c8d5484d263e5
+
+	hasht2 sha1:51d2738e
+	hasht2 sha256:ae31dffa
+	EOF
+
+	cat >expect_initial <<-EOF &&
+	100644 blob $(test_oid hash1)	foo
+	EOF
+
+	cat >expect_update <<-EOF &&
+	100644 blob $(test_oid hash2)	foo
+	EOF
+
+	echo "$(test_oid val1)" > foo &&
 	git add foo &&
 	git commit -m "initial" &&
 	git cat-file -p HEAD: > actual &&
 	test_cmp expect_initial actual &&
-	echo 11742 > foo &&
+	echo "$(test_oid val2)" > foo &&
 	git commit -a -m "update" &&
 	git cat-file -p HEAD: > actual &&
 	test_cmp expect_update actual
 '
 
 cat >expect <<EOF
-index 51d27384..51d2738e 100644
+index $(test_oid hasht1)..$(test_oid hasht2) 100644
 EOF
 
 test_expect_success 'diff does not produce ambiguous index line' '
diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh
index 36f8ed8a81..fab351b48a 100755
--- a/t/t4045-diff-relative.sh
+++ b/t/t4045-diff-relative.sh
@@ -8,7 +8,8 @@ test_expect_success 'setup' '
 	echo content >file1 &&
 	mkdir subdir &&
 	echo other content >subdir/file2 &&
-	blob=$(git hash-object subdir/file2) &&
+	blob_file1=$(git hash-object file1) &&
+	blob_file2=$(git hash-object subdir/file2) &&
 	git add . &&
 	git commit -m one
 '
@@ -18,7 +19,7 @@ check_diff () {
 	shift
 	expect=$1
 	shift
-	short_blob=$(git rev-parse --short $blob)
+	short_blob=$(git rev-parse --short $blob_file2)
 	cat >expected <<-EOF
 	diff --git a/$expect b/$expect
 	new file mode 100644
@@ -60,7 +61,7 @@ check_stat () {
 	EOF
 	test_expect_success "--stat $*" "
 		git -C '$dir' diff --stat $* HEAD^ >actual &&
-		test_i18ncmp expected actual
+		test_cmp expected actual
 	"
 }
 
@@ -70,7 +71,7 @@ check_raw () {
 	expect=$1
 	shift
 	cat >expected <<-EOF
-	:000000 100644 0000000000000000000000000000000000000000 $blob A	$expect
+	:000000 100644 $ZERO_OID $blob_file2 A	$expect
 	EOF
 	test_expect_success "--raw $*" "
 		git -C '$dir' diff --no-abbrev --raw $* HEAD^ >actual &&
@@ -86,4 +87,132 @@ do
 	check_$type . dir/file2 --relative=sub
 done
 
+check_diff_relative_option () {
+	dir=$1
+	shift
+	expect=$1
+	shift
+	relative_opt=$1
+	shift
+	test_expect_success "config diff.relative $relative_opt -p $*" "
+		short_blob=\$(git rev-parse --short $blob_file2) &&
+		cat >expected <<-EOF &&
+		diff --git a/$expect b/$expect
+		new file mode 100644
+		index 0000000..\$short_blob
+		--- /dev/null
+		+++ b/$expect
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C $dir diff.relative $relative_opt &&
+		git -C '$dir' diff -p $* HEAD^ >actual &&
+		test_cmp expected actual
+	"
+}
+
+check_diff_no_relative_option () {
+	dir=$1
+	shift
+	expect=$1
+	shift
+	relative_opt=$1
+	shift
+	test_expect_success "config diff.relative $relative_opt -p $*" "
+		short_blob_file1=\$(git rev-parse --short $blob_file1) &&
+		short_blob_file2=\$(git rev-parse --short $blob_file2) &&
+		cat >expected <<-EOF &&
+		diff --git a/file1 b/file1
+		new file mode 100644
+		index 0000000..\$short_blob_file1
+		--- /dev/null
+		+++ b/file1
+		@@ -0,0 +1 @@
+		+content
+		diff --git a/$expect b/$expect
+		new file mode 100644
+		index 0000000..\$short_blob_file2
+		--- /dev/null
+		+++ b/$expect
+		@@ -0,0 +1 @@
+		+other content
+		EOF
+		test_config -C $dir diff.relative $relative_opt &&
+		git -C '$dir' diff -p $* HEAD^ >actual &&
+		test_cmp expected actual
+	"
+}
+
+check_diff_no_relative_option . subdir/file2 false
+check_diff_no_relative_option . subdir/file2 true --no-relative
+check_diff_no_relative_option . subdir/file2 false --no-relative
+check_diff_no_relative_option subdir subdir/file2 false
+check_diff_no_relative_option subdir subdir/file2 true --no-relative
+check_diff_no_relative_option subdir subdir/file2 false --no-relative
+
+check_diff_relative_option . file2 false --relative=subdir/
+check_diff_relative_option . file2 false --relative=subdir
+check_diff_relative_option . file2 true --relative=subdir/
+check_diff_relative_option . file2 true --relative=subdir
+check_diff_relative_option subdir file2 false --relative
+check_diff_relative_option subdir file2 true --relative
+check_diff_relative_option subdir file2 true
+check_diff_relative_option subdir file2 false --no-relative --relative
+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/t4048-diff-combined-binary.sh b/t/t4048-diff-combined-binary.sh
index 87a8949500..0260cf64f5 100755
--- a/t/t4048-diff-combined-binary.sh
+++ b/t/t4048-diff-combined-binary.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='combined and merge diff handle binary files and textconv'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup binary merge conflict' '
@@ -9,24 +12,27 @@ test_expect_success 'setup binary merge conflict' '
 	git commit -m one &&
 	echo twoQ2 | q_to_nul >binary &&
 	git commit -a -m two &&
+	two=$(git rev-parse --short HEAD:binary) &&
 	git checkout -b branch-binary HEAD^ &&
 	echo threeQ3 | q_to_nul >binary &&
 	git commit -a -m three &&
-	test_must_fail git merge master &&
+	three=$(git rev-parse --short HEAD:binary) &&
+	test_must_fail git merge main &&
 	echo resolvedQhooray | q_to_nul >binary &&
-	git commit -a -m resolved
+	git commit -a -m resolved &&
+	res=$(git rev-parse --short HEAD:binary)
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --git a/binary b/binary
-index 7ea6ded..9563691 100644
+index $three..$res 100644
 Binary files a/binary and b/binary differ
 resolved
 
 diff --git a/binary b/binary
-index 6197570..9563691 100644
+index $two..$res 100644
 Binary files a/binary and b/binary differ
 EOF
 test_expect_success 'diff -m indicates binary-ness' '
@@ -34,11 +40,11 @@ test_expect_success 'diff -m indicates binary-ness' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --combined binary
-index 7ea6ded,6197570..9563691
+index $three,$two..$res
 Binary files differ
 EOF
 test_expect_success 'diff -c indicates binary-ness' '
@@ -46,11 +52,11 @@ test_expect_success 'diff -c indicates binary-ness' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --cc binary
-index 7ea6ded,6197570..9563691
+index $three,$two..$res
 Binary files differ
 EOF
 test_expect_success 'diff --cc indicates binary-ness' '
@@ -59,26 +65,29 @@ test_expect_success 'diff --cc indicates binary-ness' '
 '
 
 test_expect_success 'setup non-binary with binary attribute' '
-	git checkout master &&
+	git checkout main &&
 	test_commit one text &&
 	test_commit two text &&
+	two=$(git rev-parse --short HEAD:text) &&
 	git checkout -b branch-text HEAD^ &&
 	test_commit three text &&
-	test_must_fail git merge master &&
+	three=$(git rev-parse --short HEAD:text) &&
+	test_must_fail git merge main &&
 	test_commit resolved text &&
+	res=$(git rev-parse --short HEAD:text) &&
 	echo text -diff >.gitattributes
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --git a/text b/text
-index 2bdf67a..2ab19ae 100644
+index $three..$res 100644
 Binary files a/text and b/text differ
 resolved
 
 diff --git a/text b/text
-index f719efd..2ab19ae 100644
+index $two..$res 100644
 Binary files a/text and b/text differ
 EOF
 test_expect_success 'diff -m respects binary attribute' '
@@ -86,11 +95,11 @@ test_expect_success 'diff -m respects binary attribute' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --combined text
-index 2bdf67a,f719efd..2ab19ae
+index $three,$two..$res
 Binary files differ
 EOF
 test_expect_success 'diff -c respects binary attribute' '
@@ -98,11 +107,11 @@ test_expect_success 'diff -c respects binary attribute' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --cc text
-index 2bdf67a,f719efd..2ab19ae
+index $three,$two..$res
 Binary files differ
 EOF
 test_expect_success 'diff --cc respects binary attribute' '
@@ -115,11 +124,11 @@ test_expect_success 'setup textconv attribute' '
 	git config diff.upcase.textconv "tr a-z A-Z <"
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --git a/text b/text
-index 2bdf67a..2ab19ae 100644
+index $three..$res 100644
 --- a/text
 +++ b/text
 @@ -1 +1 @@
@@ -128,7 +137,7 @@ index 2bdf67a..2ab19ae 100644
 resolved
 
 diff --git a/text b/text
-index f719efd..2ab19ae 100644
+index $two..$res 100644
 --- a/text
 +++ b/text
 @@ -1 +1 @@
@@ -140,11 +149,11 @@ test_expect_success 'diff -m respects textconv attribute' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --combined text
-index 2bdf67a,f719efd..2ab19ae
+index $three,$two..$res
 --- a/text
 +++ b/text
 @@@ -1,1 -1,1 +1,1 @@@
@@ -157,11 +166,11 @@ test_expect_success 'diff -c respects textconv attribute' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 resolved
 
 diff --cc text
-index 2bdf67a,f719efd..2ab19ae
+index $three,$two..$res
 --- a/text
 +++ b/text
 @@@ -1,1 -1,1 +1,1 @@@
@@ -174,9 +183,9 @@ test_expect_success 'diff --cc respects textconv attribute' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 diff --combined text
-index 2bdf67a,f719efd..2ab19ae
+index $three,$two..$res
 --- a/text
 +++ b/text
 @@@ -1,1 -1,1 +1,1 @@@
@@ -190,9 +199,9 @@ test_expect_success 'diff-tree plumbing does not respect textconv' '
 	test_cmp expect actual
 '
 
-cat >expect <<'EOF'
+cat >expect <<EOF
 diff --cc text
-index 2bdf67a,f719efd..0000000
+index $three,$two..0000000
 --- a/text
 +++ b/text
 @@@ -1,1 -1,1 +1,5 @@@
@@ -200,11 +209,11 @@ index 2bdf67a,f719efd..0000000
  +THREE
 ++=======
 + TWO
-++>>>>>>> MASTER
+++>>>>>>> MAIN
 EOF
 test_expect_success 'diff --cc respects textconv on worktree file' '
 	git reset --hard HEAD^ &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	git diff >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t4049-diff-stat-count.sh b/t/t4049-diff-stat-count.sh
index a34121740a..53061b104e 100755
--- a/t/t4049-diff-stat-count.sh
+++ b/t/t4049-diff-stat-count.sh
@@ -25,7 +25,7 @@ test_expect_success 'mode-only change show as a 0-line change' '
 	 4 files changed, 2 insertions(+)
 	EOF
 	git diff --stat --stat-count=2 HEAD >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'binary changes do not count in lines' '
@@ -40,7 +40,7 @@ test_expect_success 'binary changes do not count in lines' '
 	 3 files changed, 2 insertions(+)
 	EOF
 	git diff --stat --stat-count=2 >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'exclude unmerged entries from total file count' '
@@ -62,7 +62,7 @@ test_expect_success 'exclude unmerged entries from total file count' '
 	 3 files changed, 3 insertions(+)
 	EOF
 	git diff --stat --stat-count=2 >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_done
diff --git a/t/t4052-stat-output.sh b/t/t4052-stat-output.sh
index 28c053849a..9eba436211 100755
--- a/t/t4052-stat-output.sh
+++ b/t/t4052-stat-output.sh
@@ -5,6 +5,9 @@
 
 test_description='test --stat output of various commands'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
@@ -353,7 +356,7 @@ cat >expect <<'EOF'
 EOF
 test_expect_success 'merge --stat respects COLUMNS (big change)' '
 	git checkout -b branch HEAD^^ &&
-	COLUMNS=100 git merge --stat --no-ff master^ >output &&
+	COLUMNS=100 git merge --stat --no-ff main^ >output &&
 	grep " | " output >actual &&
 	test_cmp expect actual
 '
@@ -362,7 +365,7 @@ cat >expect <<'EOF'
  aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa | 1000 +++++++++++++++++++++++++++++++++++++++
 EOF
 test_expect_success 'merge --stat respects COLUMNS (long filename)' '
-	COLUMNS=100 git merge --stat --no-ff master >output &&
+	COLUMNS=100 git merge --stat --no-ff main >output &&
 	grep " | " output >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
index 0168946b63..3feadf0e35 100755
--- a/t/t4053-diff-no-index.sh
+++ b/t/t4053-diff-no-index.sh
@@ -16,6 +16,11 @@ test_expect_success 'setup' '
 	echo 1 >non/git/b
 '
 
+test_expect_success 'git diff --no-index --exit-code' '
+	git diff --no-index --exit-code a/1 non/git/a &&
+	test_expect_code 1 git diff --no-index --exit-code a/1 a/2
+'
+
 test_expect_success 'git diff --no-index directories' '
 	test_expect_code 1 git diff --no-index a b >cnt &&
 	test_line_count = 14 cnt
@@ -144,4 +149,59 @@ test_expect_success 'diff --no-index allows external diff' '
 	test_cmp expect actual
 '
 
+test_expect_success 'diff --no-index normalizes mode: no changes' '
+	echo foo >x &&
+	cp x y &&
+	git diff --no-index x y >out &&
+	test_must_be_empty out
+'
+
+test_expect_success POSIXPERM 'diff --no-index normalizes mode: chmod +x' '
+	chmod +x y &&
+	cat >expected <<-\EOF &&
+	diff --git a/x b/y
+	old mode 100644
+	new mode 100755
+	EOF
+	test_expect_code 1 git diff --no-index x y >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success POSIXPERM 'diff --no-index normalizes: mode not like git mode' '
+	chmod 666 x &&
+	chmod 777 y &&
+	cat >expected <<-\EOF &&
+	diff --git a/x b/y
+	old mode 100644
+	new mode 100755
+	EOF
+	test_expect_code 1 git diff --no-index x y >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success POSIXPERM,SYMLINKS 'diff --no-index normalizes: mode not like git mode (symlink)' '
+	ln -s y z &&
+	X_OID=$(git hash-object --stdin <x) &&
+	Z_OID=$(printf y | git hash-object --stdin) &&
+	cat >expected <<-EOF &&
+	diff --git a/x b/x
+	deleted file mode 100644
+	index $X_OID..$ZERO_OID
+	--- a/x
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-foo
+	diff --git a/z b/z
+	new file mode 120000
+	index $ZERO_OID..$Z_OID
+	--- /dev/null
+	+++ b/z
+	@@ -0,0 +1 @@
+	+y
+	\ No newline at end of file
+	EOF
+	test_expect_code 1 git -c core.abbrev=no diff --no-index x z >actual &&
+	test_cmp expected actual
+'
+
 test_done
diff --git a/t/t4054-diff-bogus-tree.sh b/t/t4054-diff-bogus-tree.sh
index fcae82fffa..8c95f152b2 100755
--- a/t/t4054-diff-bogus-tree.sh
+++ b/t/t4054-diff-bogus-tree.sh
@@ -4,8 +4,9 @@ test_description='test diff with a bogus tree containing the null sha1'
 . ./test-lib.sh
 
 test_expect_success 'create bogus tree' '
+	name=$(echo $ZERO_OID | sed -e "s/00/Q/g") &&
 	bogus_tree=$(
-		printf "100644 fooQQQQQQQQQQQQQQQQQQQQQ" |
+		printf "100644 fooQ$name" |
 		q_to_nul |
 		git hash-object -w --stdin -t tree
 	)
diff --git a/t/t4056-diff-order.sh b/t/t4056-diff-order.sh
index 43dd474a12..aec1d9d1b4 100755
--- a/t/t4056-diff-order.sh
+++ b/t/t4056-diff-order.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-test_description='diff order'
+test_description='diff order & rotate'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
@@ -106,7 +109,7 @@ done
 test_expect_success 'setup for testing combine-diff order' '
 	git checkout -b tmp HEAD~ &&
 	create_files 3 &&
-	git checkout master &&
+	git checkout main &&
 	git merge --no-commit -s ours tmp &&
 	create_files 5
 '
@@ -124,4 +127,74 @@ do
 	'
 done
 
+### rotate and skip
+
+test_expect_success 'rotate and skip setup' '
+	>sample1.t &&
+	>sample2.t &&
+	>sample3.t &&
+	>sample4.t &&
+	git add sample[1234].t &&
+	git commit -m "added" sample[1234].t &&
+	echo modified >>sample1.t &&
+	echo modified >>sample2.t &&
+	echo modified >>sample4.t &&
+	git commit -m "updated" sample[1234].t
+'
+
+test_expect_success 'diff --rotate-to' '
+	git diff --rotate-to=sample2.t --name-only HEAD^ >actual &&
+	test_write_lines sample2.t sample4.t sample1.t >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'diff --skip-to' '
+	git diff --skip-to=sample2.t --name-only HEAD^ >actual &&
+	test_write_lines sample2.t sample4.t >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'diff --rotate/skip-to error condition' '
+	test_must_fail git diff --rotate-to=sample3.t HEAD^ &&
+	test_must_fail git diff --skip-to=sample3.t HEAD^
+'
+
+test_expect_success 'log --rotate-to' '
+	git log --rotate-to=sample3.t --raw HEAD~2.. >raw &&
+	# just distill the commit header and paths
+	sed -n -e "s/^commit.*/commit/p" \
+	       -e "/^:/s/^.*	//p" raw >actual &&
+
+	cat >expect <<-\EOF &&
+	commit
+	sample4.t
+	sample1.t
+	sample2.t
+	commit
+	sample3.t
+	sample4.t
+	sample1.t
+	sample2.t
+	EOF
+
+	test_cmp expect actual
+'
+
+test_expect_success 'log --skip-to' '
+	git log --skip-to=sample3.t --raw HEAD~2.. >raw &&
+	# just distill the commit header and paths
+	sed -n -e "s/^commit.*/commit/p" \
+	       -e "/^:/s/^.*	//p" raw >actual &&
+
+	cat >expect <<-\EOF &&
+	commit
+	sample4.t
+	commit
+	sample3.t
+	sample4.t
+	EOF
+
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t4057-diff-combined-paths.sh b/t/t4057-diff-combined-paths.sh
index dff36b77ec..7e5b74f72e 100755
--- a/t/t4057-diff-combined-paths.sh
+++ b/t/t4057-diff-combined-paths.sh
@@ -2,6 +2,9 @@
 
 test_description='combined diff show only paths that are different to all parents'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # verify that diffc.expect matches output of
@@ -14,7 +17,7 @@ diffc_verify () {
 test_expect_success 'trivial merge - combine-diff empty' '
 	for i in $(test_seq 1 9)
 	do
-		echo $i >$i.txt	&&
+		echo $i >$i.txt &&
 		git add $i.txt
 	done &&
 	git commit -m "init" &&
@@ -24,16 +27,16 @@ test_expect_success 'trivial merge - combine-diff empty' '
 		echo $i/2 >>$i.txt
 	done &&
 	git commit -a -m "side 2-9" &&
-	git checkout master &&
+	git checkout main &&
 	echo 1/2 >1.txt &&
-	git commit -a -m "master 1" &&
+	git commit -a -m "main 1" &&
 	git merge side &&
 	>diffc.expect &&
 	diffc_verify
 '
 
 
-test_expect_success 'only one trully conflicting path' '
+test_expect_success 'only one truly conflicting path' '
 	git checkout side &&
 	for i in $(test_seq 2 9)
 	do
@@ -41,19 +44,19 @@ test_expect_success 'only one trully conflicting path' '
 	done &&
 	echo "4side" >>4.txt &&
 	git commit -a -m "side 2-9 +4" &&
-	git checkout master &&
+	git checkout main &&
 	for i in $(test_seq 1 9)
 	do
 		echo $i/3 >>$i.txt
 	done &&
-	echo "4master" >>4.txt &&
-	git commit -a -m "master 1-9 +4" &&
+	echo "4main" >>4.txt &&
+	git commit -a -m "main 1-9 +4" &&
 	test_must_fail git merge side &&
 	cat <<-\EOF >4.txt &&
 	4
 	4/2
 	4/3
-	4master
+	4main
 	4side
 	EOF
 	git add 4.txt &&
@@ -69,12 +72,12 @@ test_expect_success 'merge introduces new file' '
 		echo $i/4 >>$i.txt
 	done &&
 	git commit -a -m "side 5-9" &&
-	git checkout master &&
+	git checkout main &&
 	for i in $(test_seq 1 3)
 	do
 		echo $i/4 >>$i.txt
 	done &&
-	git commit -a -m "master 1-3 +4hello" &&
+	git commit -a -m "main 1-3 +4hello" &&
 	git merge side &&
 	echo "Hello World" >4hello.txt &&
 	git add 4hello.txt &&
@@ -90,12 +93,12 @@ test_expect_success 'merge removed a file' '
 		echo $i/5 >>$i.txt
 	done &&
 	git commit -a -m "side 5-9" &&
-	git checkout master &&
+	git checkout main &&
 	for i in $(test_seq 1 3)
 	do
 		echo $i/4 >>$i.txt
 	done &&
-	git commit -a -m "master 1-3" &&
+	git commit -a -m "main 1-3" &&
 	git merge side &&
 	git rm 4.txt &&
 	git commit --amend &&
diff --git a/t/t4058-diff-duplicates.sh b/t/t4058-diff-duplicates.sh
index c24ee175ef..54614b814d 100755
--- a/t/t4058-diff-duplicates.sh
+++ b/t/t4058-diff-duplicates.sh
@@ -1,5 +1,14 @@
 #!/bin/sh
 
+# NOTICE:
+#   This testsuite does a number of diffs and checks that the output match.
+#   However, it is a "garbage in, garbage out" situation; the trees have
+#   duplicate entries for individual paths, and it results in diffs that do
+#   not make much sense.  As such, it is not clear that the diffs are
+#   "correct".  The primary purpose of these tests was to verify that
+#   diff-tree does not segfault, but there is perhaps some value in ensuring
+#   that the diff output isn't wildly unreasonable.
+
 test_description='test tree diff when trees have duplicate entries'
 . ./test-lib.sh
 
@@ -57,7 +66,16 @@ test_expect_success 'create trees with duplicate entries' '
 	git tag two $outer_two
 '
 
-test_expect_success 'diff-tree between trees' '
+test_expect_success 'create tree without duplicate entries' '
+	blob_one=$(echo one | git hash-object -w --stdin) &&
+	outer_three=$(make_tree \
+		100644 renamed $blob_one
+	) &&
+	git tag three $outer_three
+'
+
+test_expect_success 'diff-tree between duplicate trees' '
+	# See NOTICE at top of file
 	{
 		printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
 		printf ":000000 100644 $ZERO_OID $blob_two A\touter/inner\n" &&
@@ -71,9 +89,101 @@ test_expect_success 'diff-tree between trees' '
 '
 
 test_expect_success 'diff-tree with renames' '
-	# same expectation as above, since we disable rename detection
+	# See NOTICE at top of file.
 	git diff-tree -M -r --no-abbrev one two >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success 'diff-tree FROM duplicate tree' '
+	# See NOTICE at top of file.
+	{
+		printf ":100644 000000 $blob_one $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":000000 100644 $ZERO_OID $blob_one A\trenamed\n"
+	} >expect &&
+	git diff-tree -r --no-abbrev one three >actual &&
 	test_cmp expect actual
 '
 
+test_expect_success 'diff-tree FROM duplicate tree, with renames' '
+	# See NOTICE at top of file.
+	{
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 000000 $blob_two $ZERO_OID D\touter/inner\n" &&
+		printf ":100644 100644 $blob_one $blob_one R100\touter/inner\trenamed\n"
+	} >expect &&
+	git diff-tree -M -r --no-abbrev one three >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'create a few commits' '
+	git commit-tree -m "Duplicate Entries" two^{tree} >commit_id &&
+	git branch base $(cat commit_id) &&
+
+	git commit-tree -p $(cat commit_id) -m "Just one" three^{tree} >up &&
+	git branch update $(cat up) &&
+
+	git commit-tree -p $(cat up) -m "Back to weird" two^{tree} >final &&
+	git branch final $(cat final) &&
+
+	rm commit_id up final
+'
+
+test_expect_failure 'git read-tree does not segfault' '
+	test_when_finished rm .git/index.lock &&
+	test_might_fail git read-tree --reset base
+'
+
+test_expect_failure 'reset --hard does not segfault' '
+	test_when_finished rm .git/index.lock &&
+	git checkout base &&
+	test_might_fail git reset --hard
+'
+
+test_expect_failure 'git diff HEAD does not segfault' '
+	git checkout base &&
+	GIT_TEST_CHECK_CACHE_TREE=false &&
+	git reset --hard &&
+	test_might_fail git diff HEAD
+'
+
+test_expect_failure 'can switch to another branch when status is empty' '
+	git clean -ffdqx &&
+	git status --porcelain -uno >actual &&
+	test_must_be_empty actual &&
+	git checkout update
+'
+
+test_expect_success 'forcibly switch to another branch, verify status empty' '
+	git checkout -f update &&
+	git status --porcelain -uno >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success 'fast-forward from non-duplicate entries to duplicate' '
+	git merge final
+'
+
+test_expect_failure 'clean status, switch branches, status still clean' '
+	git status --porcelain -uno >actual &&
+	test_must_be_empty actual &&
+	git checkout base &&
+	git status --porcelain -uno >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success 'switch to base branch and force status to be clean' '
+	git checkout base &&
+	GIT_TEST_CHECK_CACHE_TREE=false git reset --hard &&
+	git status --porcelain -uno >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_failure 'fast-forward from duplicate entries to non-duplicate' '
+	git merge update
+'
+
 test_done
diff --git a/t/t4060-diff-submodule-option-diff-format.sh b/t/t4060-diff-submodule-option-diff-format.sh
index 9dcb69df5c..dc7b242697 100755
--- a/t/t4060-diff-submodule-option-diff-format.sh
+++ b/t/t4060-diff-submodule-option-diff-format.sh
@@ -42,6 +42,17 @@ commit_file () {
 	git commit "$@" -m "Commit $*" >/dev/null
 }
 
+diff_cmp () {
+       for i in "$1" "$2"
+       do
+		sed -e 's/^index 0000000\.\.[0-9a-f]*/index 0000000..1234567/' \
+		-e 's/^index [0-9a-f]*\.\.[0-9a-f]*/index 1234567..89abcde/' \
+		"$i" >"$i.compare" || return 1
+       done &&
+       test_cmp "$1.compare" "$2.compare" &&
+       rm -f "$1.compare" "$2.compare"
+}
+
 test_expect_success 'setup repository' '
 	test_create_repo sm1 &&
 	add_file . foo &&
@@ -69,7 +80,7 @@ test_expect_success 'added submodule' '
 	@@ -0,0 +1 @@
 	+foo2
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'added submodule, set diff.submodule' '
@@ -93,7 +104,7 @@ test_expect_success 'added submodule, set diff.submodule' '
 	@@ -0,0 +1 @@
 	+foo2
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success '--submodule=short overrides diff.submodule' '
@@ -109,7 +120,7 @@ test_expect_success '--submodule=short overrides diff.submodule' '
 	@@ -0,0 +1 @@
 	+Subproject commit $fullhead1
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'diff.submodule does not affect plumbing' '
@@ -124,7 +135,7 @@ test_expect_success 'diff.submodule does not affect plumbing' '
 	@@ -0,0 +1 @@
 	+Subproject commit $fullhead1
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file sm1 &&
@@ -142,7 +153,7 @@ test_expect_success 'modified submodule(forward)' '
 	@@ -0,0 +1 @@
 	+foo3
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule(forward)' '
@@ -157,7 +168,7 @@ test_expect_success 'modified submodule(forward)' '
 	@@ -0,0 +1 @@
 	+foo3
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule(forward) --submodule' '
@@ -166,7 +177,7 @@ test_expect_success 'modified submodule(forward) --submodule' '
 	Submodule sm1 $head1..$head2:
 	  > Add foo3 ($added foo3)
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 fullhead2=$(cd sm1; git rev-parse --verify HEAD)
@@ -181,7 +192,7 @@ test_expect_success 'modified submodule(forward) --submodule=short' '
 	-Subproject commit $fullhead1
 	+Subproject commit $fullhead2
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file sm1 &&
@@ -210,7 +221,7 @@ test_expect_success 'modified submodule(backward)' '
 	@@ -1 +0,0 @@
 	-foo3
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 head4=$(add_file sm1 foo4 foo5)
@@ -247,7 +258,7 @@ test_expect_success 'modified submodule(backward and forward)' '
 	@@ -0,0 +1 @@
 	+foo5
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file sm1 &&
@@ -291,7 +302,7 @@ test_expect_success 'typechanged submodule(submodule->blob), --cached' '
 	@@ -0,0 +1 @@
 	+sm1
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'typechanged submodule(submodule->blob)' '
@@ -327,7 +338,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' '
 	@@ -0,0 +1 @@
 	+foo5
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 rm -rf sm1 &&
@@ -344,7 +355,7 @@ test_expect_success 'typechanged submodule(submodule->blob)' '
 	@@ -0,0 +1 @@
 	+sm1
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 rm -f sm1 &&
@@ -356,7 +367,7 @@ test_expect_success 'nonexistent commit' '
 	cat >expected <<-EOF &&
 	Submodule sm1 $head4...$head6 (commits not present)
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file
@@ -386,26 +397,27 @@ test_expect_success 'typechanged submodule(blob->submodule)' '
 	@@ -0,0 +1 @@
 	+foo7
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file sm1 &&
 test_expect_success 'submodule is up to date' '
+	head7=$(git -C sm1 rev-parse --short --verify HEAD) &&
 	git diff-index -p --submodule=diff HEAD >actual &&
 	test_must_be_empty actual
 '
 
 test_expect_success 'submodule contains untracked content' '
 	echo new > sm1/new-file &&
-	git diff-index -p --submodule=diff HEAD >actual &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'submodule contains untracked content (untracked ignored)' '
-	git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
+	git diff-index -p --submodule=diff HEAD >actual &&
 	test_must_be_empty actual
 '
 
@@ -421,7 +433,7 @@ test_expect_success 'submodule contains untracked content (all ignored)' '
 
 test_expect_success 'submodule contains untracked and modified content' '
 	echo new > sm1/foo6 &&
-	git diff-index -p --submodule=diff HEAD >actual &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
 	Submodule sm1 contains modified content
@@ -433,13 +445,13 @@ test_expect_success 'submodule contains untracked and modified content' '
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 # NOT OK
 test_expect_success 'submodule contains untracked and modified content (untracked ignored)' '
 	echo new > sm1/foo6 &&
-	git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
+	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains modified content
 	diff --git a/sm1/foo6 b/sm1/foo6
@@ -450,7 +462,7 @@ test_expect_success 'submodule contains untracked and modified content (untracke
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'submodule contains untracked and modified content (dirty ignored)' '
@@ -478,7 +490,7 @@ test_expect_success 'submodule contains modified content' '
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 (cd sm1; git commit -mchange foo6 >/dev/null) &&
@@ -486,7 +498,7 @@ head8=$(cd sm1; git rev-parse --short --verify HEAD) &&
 test_expect_success 'submodule is modified' '
 	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9..$head8:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..3e75765 100644
 	--- a/sm1/foo6
@@ -495,15 +507,15 @@ test_expect_success 'submodule is modified' '
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked content' '
 	echo new > sm1/new-file &&
-	git diff-index -p --submodule=diff HEAD >actual &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
-	Submodule sm1 17243c9..$head8:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..3e75765 100644
 	--- a/sm1/foo6
@@ -512,13 +524,13 @@ test_expect_success 'modified submodule contains untracked content' '
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked content (untracked ignored)' '
-	git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
+	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9..$head8:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..3e75765 100644
 	--- a/sm1/foo6
@@ -527,13 +539,13 @@ test_expect_success 'modified submodule contains untracked content (untracked ig
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked content (dirty ignored)' '
 	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9..cfce562:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..3e75765 100644
 	--- a/sm1/foo6
@@ -542,7 +554,7 @@ test_expect_success 'modified submodule contains untracked content (dirty ignore
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked content (all ignored)' '
@@ -552,11 +564,11 @@ test_expect_success 'modified submodule contains untracked content (all ignored)
 
 test_expect_success 'modified submodule contains untracked and modified content' '
 	echo modification >> sm1/foo6 &&
-	git diff-index -p --submodule=diff HEAD >actual &&
+	git diff-index -p --ignore-submodules=none --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains untracked content
 	Submodule sm1 contains modified content
-	Submodule sm1 17243c9..cfce562:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..dfda541 100644
 	--- a/sm1/foo6
@@ -566,15 +578,15 @@ test_expect_success 'modified submodule contains untracked and modified content'
 	+new
 	+modification
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked and modified content (untracked ignored)' '
 	echo modification >> sm1/foo6 &&
-	git diff-index -p --ignore-submodules=untracked --submodule=diff HEAD >actual &&
+	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains modified content
-	Submodule sm1 17243c9..cfce562:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..e20e2d9 100644
 	--- a/sm1/foo6
@@ -585,14 +597,14 @@ test_expect_success 'modified submodule contains untracked and modified content
 	+modification
 	+modification
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked and modified content (dirty ignored)' '
 	echo modification >> sm1/foo6 &&
 	git diff-index -p --ignore-submodules=dirty --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9..cfce562:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..3e75765 100644
 	--- a/sm1/foo6
@@ -601,7 +613,7 @@ test_expect_success 'modified submodule contains untracked and modified content
 	-foo6
 	+new
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'modified submodule contains untracked and modified content (all ignored)' '
@@ -616,7 +628,7 @@ test_expect_success 'modified submodule contains modified content' '
 	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
 	Submodule sm1 contains modified content
-	Submodule sm1 17243c9..cfce562:
+	Submodule sm1 $head7..$head8:
 	diff --git a/sm1/foo6 b/sm1/foo6
 	index 462398b..ac466ca 100644
 	--- a/sm1/foo6
@@ -629,29 +641,29 @@ test_expect_success 'modified submodule contains modified content' '
 	+modification
 	+modification
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 rm -rf sm1
 test_expect_success 'deleted submodule' '
 	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9...0000000 (submodule deleted)
+	Submodule sm1 $head7...0000000 (submodule deleted)
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'create second submodule' '
 	test_create_repo sm2 &&
-	head7=$(add_file sm2 foo8 foo9) &&
+	head9=$(add_file sm2 foo8 foo9) &&
 	git add sm2
 '
 
 test_expect_success 'multiple submodules' '
 	git diff-index -p --submodule=diff HEAD >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9...0000000 (submodule deleted)
-	Submodule sm2 0000000...a5a65c9 (new submodule)
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
 	diff --git a/sm2/foo8 b/sm2/foo8
 	new file mode 100644
 	index 0000000..db9916b
@@ -667,13 +679,13 @@ test_expect_success 'multiple submodules' '
 	@@ -0,0 +1 @@
 	+foo9
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'path filter' '
 	git diff-index -p --submodule=diff HEAD sm2 >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm2 0000000...a5a65c9 (new submodule)
+	Submodule sm2 0000000...$head9 (new submodule)
 	diff --git a/sm2/foo8 b/sm2/foo8
 	new file mode 100644
 	index 0000000..db9916b
@@ -689,15 +701,15 @@ test_expect_success 'path filter' '
 	@@ -0,0 +1 @@
 	+foo9
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 commit_file sm2
 test_expect_success 'given commit' '
 	git diff-index -p --submodule=diff HEAD^ >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9...0000000 (submodule deleted)
-	Submodule sm2 0000000...a5a65c9 (new submodule)
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
 	diff --git a/sm2/foo8 b/sm2/foo8
 	new file mode 100644
 	index 0000000..db9916b
@@ -713,7 +725,7 @@ test_expect_success 'given commit' '
 	@@ -0,0 +1 @@
 	+foo9
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'setup .git file for sm2' '
@@ -726,8 +738,8 @@ test_expect_success 'setup .git file for sm2' '
 test_expect_success 'diff --submodule=diff with .git file' '
 	git diff --submodule=diff HEAD^ >actual &&
 	cat >expected <<-EOF &&
-	Submodule sm1 17243c9...0000000 (submodule deleted)
-	Submodule sm2 0000000...a5a65c9 (new submodule)
+	Submodule sm1 $head7...0000000 (submodule deleted)
+	Submodule sm2 0000000...$head9 (new submodule)
 	diff --git a/sm2/foo8 b/sm2/foo8
 	new file mode 100644
 	index 0000000..db9916b
@@ -743,25 +755,27 @@ test_expect_success 'diff --submodule=diff with .git file' '
 	@@ -0,0 +1 @@
 	+foo9
 	EOF
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 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"
+	git -C sm2 commit -a -m "nested sub" &&
+	head10=$(git -C sm2 rev-parse --short --verify HEAD)
 '
 
 test_expect_success 'move nested submodule HEAD' '
 	echo "nested content" >sm2/nested/file &&
 	git -C sm2/nested add file &&
-	git -C sm2/nested commit --allow-empty -m "new HEAD"
+	git -C sm2/nested commit --allow-empty -m "new HEAD" &&
+	head11=$(git -C sm2/nested rev-parse --short --verify HEAD)
 '
 
 test_expect_success 'diff --submodule=diff with moved nested submodule HEAD' '
 	cat >expected <<-EOF &&
-	Submodule nested a5a65c9..b55928c:
+	Submodule nested $head9..$head11:
 	diff --git a/nested/file b/nested/file
 	new file mode 100644
 	index 0000000..ca281f5
@@ -772,13 +786,13 @@ test_expect_success 'diff --submodule=diff with moved nested submodule HEAD' '
 	EOF
 	git -C sm2 diff --submodule=diff >actual 2>err &&
 	test_must_be_empty err &&
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_expect_success 'diff --submodule=diff recurses into nested submodules' '
 	cat >expected <<-EOF &&
 	Submodule sm2 contains modified content
-	Submodule sm2 a5a65c9..280969a:
+	Submodule sm2 $head9..$head10:
 	diff --git a/sm2/.gitmodules b/sm2/.gitmodules
 	new file mode 100644
 	index 0000000..3a816b8
@@ -788,7 +802,7 @@ test_expect_success 'diff --submodule=diff recurses into nested submodules' '
 	+[submodule "nested"]
 	+	path = nested
 	+	url = ../sm2
-	Submodule nested 0000000...b55928c (new submodule)
+	Submodule nested 0000000...$head11 (new submodule)
 	diff --git a/sm2/nested/file b/sm2/nested/file
 	new file mode 100644
 	index 0000000..ca281f5
@@ -813,7 +827,7 @@ test_expect_success 'diff --submodule=diff recurses into nested submodules' '
 	EOF
 	git diff --submodule=diff >actual 2>err &&
 	test_must_be_empty err &&
-	test_cmp expected actual
+	diff_cmp expected actual
 '
 
 test_done
diff --git a/t/t4061-diff-indent.sh b/t/t4061-diff-indent.sh
index 2affd7a100..7750b87ca1 100755
--- a/t/t4061-diff-indent.sh
+++ b/t/t4061-diff-indent.sh
@@ -3,8 +3,11 @@
 test_description='Test diff indent heuristic.
 
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 # Compare two diff outputs. Ignore "index" lines, because we don't
 # care about SHA-1s or file modes.
@@ -17,7 +20,7 @@ compare_diff () {
 # Compare blame output using the expectation for a diff as reference.
 # Only look for the lines coming from non-boundary commits.
 compare_blame () {
-	sed -n -e "1,4d" -e "s/^\+//p" <"$1" >.tmp-1
+	sed -n -e "1,4d" -e "s/^+//p" <"$1" >.tmp-1
 	sed -ne "s/^[^^][^)]*) *//p" <"$2" >.tmp-2
 	test_cmp .tmp-1 .tmp-2 && rm -f .tmp-1 .tmp-2
 }
@@ -266,7 +269,7 @@ test_expect_success 'diff-index: nice spaces with --indent-heuristic' '
 	git reset --soft HEAD~ &&
 	git diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted &&
 	compare_diff spaces-compacted-expect out-diff-index-compacted &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'diff-index: nice spaces with diff.indentHeuristic=true' '
@@ -274,7 +277,7 @@ test_expect_success 'diff-index: nice spaces with diff.indentHeuristic=true' '
 	git reset --soft HEAD~ &&
 	git -c diff.indentHeuristic=true diff-index -p old -- spaces.txt >out-diff-index-compacted2 &&
 	compare_diff spaces-compacted-expect out-diff-index-compacted2 &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'diff-index: ugly spaces with --no-indent-heuristic' '
@@ -282,7 +285,7 @@ test_expect_success 'diff-index: ugly spaces with --no-indent-heuristic' '
 	git reset --soft HEAD~ &&
 	git diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index &&
 	compare_diff spaces-expect out-diff-index &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'diff-index: ugly spaces with diff.indentHeuristic=false' '
@@ -290,7 +293,7 @@ test_expect_success 'diff-index: ugly spaces with diff.indentHeuristic=false' '
 	git reset --soft HEAD~ &&
 	git -c diff.indentHeuristic=false diff-index -p old -- spaces.txt >out-diff-index2 &&
 	compare_diff spaces-expect out-diff-index2 &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'diff-index: --indent-heuristic overrides config' '
@@ -298,7 +301,7 @@ test_expect_success 'diff-index: --indent-heuristic overrides config' '
 	git reset --soft HEAD~ &&
 	git -c diff.indentHeuristic=false diff-index --indent-heuristic -p old -- spaces.txt >out-diff-index-compacted3 &&
 	compare_diff spaces-compacted-expect out-diff-index-compacted3 &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'diff-index: --no-indent-heuristic overrides config' '
@@ -306,7 +309,7 @@ test_expect_success 'diff-index: --no-indent-heuristic overrides config' '
 	git reset --soft HEAD~ &&
 	git -c diff.indentHeuristic=true diff-index --no-indent-heuristic -p old -- spaces.txt >out-diff-index3 &&
 	compare_diff spaces-expect out-diff-index3 &&
-	git checkout -f master
+	git checkout -f main
 '
 
 # --- diff-files tests ----------------------------------------------------
@@ -317,7 +320,7 @@ test_expect_success 'diff-files: nice spaces with --indent-heuristic' '
 	git diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw &&
 	grep -v index out-diff-files-raw >out-diff-files-compacted &&
 	compare_diff spaces-compacted-expect out-diff-files-compacted &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'diff-files: nice spaces with diff.indentHeuristic=true' '
@@ -326,7 +329,7 @@ test_expect_success 'diff-files: nice spaces with diff.indentHeuristic=true' '
 	git -c diff.indentHeuristic=true diff-files -p spaces.txt >out-diff-files-raw2 &&
 	grep -v index out-diff-files-raw2 >out-diff-files-compacted2 &&
 	compare_diff spaces-compacted-expect out-diff-files-compacted2 &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'diff-files: ugly spaces with --no-indent-heuristic' '
@@ -335,7 +338,7 @@ test_expect_success 'diff-files: ugly spaces with --no-indent-heuristic' '
 	git diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw &&
 	grep -v index out-diff-files-raw >out-diff-files &&
 	compare_diff spaces-expect out-diff-files &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'diff-files: ugly spaces with diff.indentHeuristic=false' '
@@ -344,7 +347,7 @@ test_expect_success 'diff-files: ugly spaces with diff.indentHeuristic=false' '
 	git -c diff.indentHeuristic=false diff-files -p spaces.txt >out-diff-files-raw2 &&
 	grep -v index out-diff-files-raw2 >out-diff-files &&
 	compare_diff spaces-expect out-diff-files &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'diff-files: --indent-heuristic overrides config' '
@@ -353,7 +356,7 @@ test_expect_success 'diff-files: --indent-heuristic overrides config' '
 	git -c diff.indentHeuristic=false diff-files --indent-heuristic -p spaces.txt >out-diff-files-raw3 &&
 	grep -v index out-diff-files-raw3 >out-diff-files-compacted &&
 	compare_diff spaces-compacted-expect out-diff-files-compacted &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_expect_success 'diff-files: --no-indent-heuristic overrides config' '
@@ -362,7 +365,7 @@ test_expect_success 'diff-files: --no-indent-heuristic overrides config' '
 	git -c diff.indentHeuristic=true diff-files --no-indent-heuristic -p spaces.txt >out-diff-files-raw4 &&
 	grep -v index out-diff-files-raw4 >out-diff-files &&
 	compare_diff spaces-expect out-diff-files &&
-	git checkout -f master
+	git checkout -f main
 '
 
 test_done
diff --git a/t/t4064-diff-oidfind.sh b/t/t4064-diff-oidfind.sh
index 3bdf317af8..6d8c8986fc 100755
--- a/t/t4064-diff-oidfind.sh
+++ b/t/t4064-diff-oidfind.sh
@@ -65,4 +65,59 @@ test_expect_success 'find a submodule' '
 	test_cmp expect actual
 '
 
+test_expect_success 'set up merge tests' '
+	test_commit base &&
+
+	git checkout -b boring base^ &&
+	echo boring >file &&
+	git add file &&
+	git commit -m boring &&
+
+	git checkout -b interesting base^ &&
+	echo interesting >file &&
+	git add file &&
+	git commit -m interesting &&
+
+	blob=$(git rev-parse interesting:file)
+'
+
+test_expect_success 'detect merge which introduces blob' '
+	git checkout -B merge base &&
+	git merge --no-commit boring &&
+	echo interesting >file &&
+	git commit -am "introduce blob" &&
+	git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual &&
+	cat >expect <<-\EOF &&
+	introduce blob
+
+	AM	file
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'detect merge which removes blob' '
+	git checkout -B merge interesting &&
+	git merge --no-commit base &&
+	echo boring >file &&
+	git commit -am "remove blob" &&
+	git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual &&
+	cat >expect <<-\EOF &&
+	remove blob
+
+	MA	file
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'do not detect merge that does not touch blob' '
+	git checkout -B merge interesting &&
+	git merge -m "untouched blob" base &&
+	git diff-tree --format=%s --find-object=$blob -c --name-status HEAD >actual &&
+	cat >expect <<-\EOF &&
+	untouched blob
+
+	EOF
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t4066-diff-emit-delay.sh b/t/t4066-diff-emit-delay.sh
index 5df6b5e64e..a1de63b77f 100755
--- a/t/t4066-diff-emit-delay.sh
+++ b/t/t4066-diff-emit-delay.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test combined/stat/moved interaction'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # This test covers a weird 3-way interaction between "--cc -p", which will run
@@ -13,12 +16,12 @@ test_expect_success 'set up history with a merge' '
 	test_commit B &&
 	git checkout -b side HEAD^ &&
 	test_commit C &&
-	git merge -m M master &&
+	git merge -m M main &&
 	test_commit D
 '
 
 test_expect_success 'log --cc -p --stat --color-moved' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	commit D
 	---
 	 D.t | 1 +
@@ -26,7 +29,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
 
 	diff --git a/D.t b/D.t
 	new file mode 100644
-	index 0000000..1784810
+	index 0000000..$(git rev-parse --short D:D.t)
 	--- /dev/null
 	+++ b/D.t
 	@@ -0,0 +1 @@
@@ -42,7 +45,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
 
 	diff --git a/C.t b/C.t
 	new file mode 100644
-	index 0000000..3cc58df
+	index 0000000..$(git rev-parse --short C:C.t)
 	--- /dev/null
 	+++ b/C.t
 	@@ -0,0 +1 @@
@@ -54,7 +57,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
 
 	diff --git a/B.t b/B.t
 	new file mode 100644
-	index 0000000..223b783
+	index 0000000..$(git rev-parse --short B:B.t)
 	--- /dev/null
 	+++ b/B.t
 	@@ -0,0 +1 @@
@@ -66,7 +69,7 @@ test_expect_success 'log --cc -p --stat --color-moved' '
 
 	diff --git a/A.t b/A.t
 	new file mode 100644
-	index 0000000..f70f10e
+	index 0000000..$(git rev-parse --short A:A.t)
 	--- /dev/null
 	+++ b/A.t
 	@@ -0,0 +1 @@
diff --git a/t/t4067-diff-partial-clone.sh b/t/t4067-diff-partial-clone.sh
index 4831ad35e6..804f2a82e8 100755
--- a/t/t4067-diff-partial-clone.sh
+++ b/t/t4067-diff-partial-clone.sh
@@ -20,7 +20,7 @@ test_expect_success 'git show batches blobs' '
 	# Ensure that there is exactly 1 negotiation by checking that there is
 	# only 1 "done" line sent. ("done" marks the end of negotiation.)
 	GIT_TRACE_PACKET="$(pwd)/trace" git -C client show HEAD &&
-	grep "git> done" trace >done_lines &&
+	grep "fetch> done" trace >done_lines &&
 	test_line_count = 1 done_lines
 '
 
@@ -44,7 +44,7 @@ test_expect_success 'diff batches blobs' '
 	# Ensure that there is exactly 1 negotiation by checking that there is
 	# only 1 "done" line sent. ("done" marks the end of negotiation.)
 	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff HEAD^ HEAD &&
-	grep "git> done" trace >done_lines &&
+	grep "fetch> done" trace >done_lines &&
 	test_line_count = 1 done_lines
 '
 
@@ -125,9 +125,57 @@ test_expect_success 'diff with rename detection batches blobs' '
 
 	# Ensure that there is exactly 1 negotiation by checking that there is
 	# only 1 "done" line sent. ("done" marks the end of negotiation.)
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff -M HEAD^ HEAD >out &&
-	grep "similarity index" out &&
-	grep "git> done" trace >done_lines &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD >out &&
+	grep ":100644 100644.*R[0-9][0-9][0-9].*b.*c" out &&
+	grep "fetch> done" trace >done_lines &&
+	test_line_count = 1 done_lines
+'
+
+test_expect_success 'diff does not fetch anything if inexact rename detection is not needed' '
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	printf "b\nb\nb\nb\nb\n" >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	mv server/b server/c &&
+	git -C server add c &&
+	git -C server commit -a -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure no fetches.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
+	! test_path_exists trace
+'
+
+test_expect_success 'diff --break-rewrites fetches only if necessary, and batches blobs if it does' '
+	test_when_finished "rm -rf server client trace" &&
+
+	test_create_repo server &&
+	echo a >server/a &&
+	printf "b\nb\nb\nb\nb\n" >server/b &&
+	git -C server add a b &&
+	git -C server commit -m x &&
+	printf "c\nc\nc\nc\nc\n" >server/b &&
+	git -C server commit -a -m x &&
+
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --bare --filter=blob:limit=0 "file://$(pwd)/server" client &&
+
+	# Ensure no fetches.
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --raw -M HEAD^ HEAD &&
+	! test_path_exists trace &&
+
+	# But with --break-rewrites, ensure that there is exactly 1 negotiation
+	# by checking that there is only 1 "done" line sent. ("done" marks the
+	# end of negotiation.)
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client diff --break-rewrites --raw -M HEAD^ HEAD &&
+	grep "fetch> done" trace >done_lines &&
 	test_line_count = 1 done_lines
 '
 
diff --git a/t/t4068-diff-symmetric-merge-base.sh b/t/t4068-diff-symmetric-merge-base.sh
new file mode 100755
index 0000000000..2d650d8f10
--- /dev/null
+++ b/t/t4068-diff-symmetric-merge-base.sh
@@ -0,0 +1,196 @@
+#!/bin/sh
+
+test_description='behavior of diff with symmetric-diff setups and --merge-base'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+# build these situations:
+#  - normal merge with one merge base (br1...b2r);
+#  - criss-cross merge ie 2 merge bases (br1...main);
+#  - disjoint subgraph (orphan branch, br3...main).
+#
+#     B---E   <-- main
+#    / \ /
+#   A   X
+#    \ / \
+#     C---D--G   <-- br1
+#      \    /
+#       ---F   <-- br2
+#
+#  H  <-- br3
+#
+# We put files into a few commits so that we can verify the
+# output as well.
+
+test_expect_success setup '
+	git commit --allow-empty -m A &&
+	echo b >b &&
+	git add b &&
+	git commit -m B &&
+	git checkout -b br1 HEAD^ &&
+	echo c >c &&
+	git add c &&
+	git commit -m C &&
+	git tag commit-C &&
+	git merge -m D main &&
+	git tag commit-D &&
+	git checkout main &&
+	git merge -m E commit-C &&
+	git checkout -b br2 commit-C &&
+	echo f >f &&
+	git add f &&
+	git commit -m F &&
+	git checkout br1 &&
+	git merge -m G br2 &&
+	git checkout --orphan br3 &&
+	git commit -m H
+'
+
+test_expect_success 'diff with one merge base' '
+	git diff commit-D...br1 >tmp &&
+	tail -n 1 tmp >actual &&
+	echo +f >expect &&
+	test_cmp expect actual
+'
+
+# The output (in tmp) can have +b or +c depending
+# on which merge base (commit B or C) is picked.
+# It should have one of those two, which comes out
+# to seven lines.
+test_expect_success 'diff with two merge bases' '
+	git diff br1...main >tmp 2>err &&
+	test_line_count = 7 tmp &&
+	test_line_count = 1 err
+'
+
+test_expect_success 'diff with no merge bases' '
+	test_must_fail git diff br2...br3 2>err &&
+	test_i18ngrep "fatal: br2...br3: no merge base" err
+'
+
+test_expect_success 'diff with too many symmetric differences' '
+	test_must_fail git diff br1...main br2...br3 2>err &&
+	test_i18ngrep "usage" err
+'
+
+test_expect_success 'diff with symmetric difference and extraneous arg' '
+	test_must_fail git diff main br1...main 2>err &&
+	test_i18ngrep "usage" err
+'
+
+test_expect_success 'diff with two ranges' '
+	test_must_fail git diff main br1..main br2..br3 2>err &&
+	test_i18ngrep "usage" err
+'
+
+test_expect_success 'diff with ranges and extra arg' '
+	test_must_fail git diff main br1..main commit-D 2>err &&
+	test_i18ngrep "usage" err
+'
+
+test_expect_success 'diff --merge-base with no commits' '
+	test_must_fail git diff --merge-base
+'
+
+test_expect_success 'diff --merge-base with three commits' '
+	test_must_fail git diff --merge-base br1 br2 main 2>err &&
+	test_i18ngrep "usage" err
+'
+
+for cmd in diff-index diff
+do
+	test_expect_success "$cmd --merge-base with one commit" '
+		git checkout main &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base br2 >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "$cmd --merge-base with one commit and unstaged changes" '
+		git checkout main &&
+		test_when_finished git reset --hard &&
+		echo unstaged >>c &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base br2 >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "$cmd --merge-base with one commit and staged and unstaged changes" '
+		git checkout main &&
+		test_when_finished git reset --hard &&
+		echo staged >>c &&
+		git add c &&
+		echo unstaged >>c &&
+		git $cmd commit-C >expect &&
+		git $cmd --merge-base br2 >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "$cmd --merge-base --cached with one commit and staged and unstaged changes" '
+		git checkout main &&
+		test_when_finished git reset --hard &&
+		echo staged >>c &&
+		git add c &&
+		echo unstaged >>c &&
+		git $cmd --cached commit-C >expect &&
+		git $cmd --cached --merge-base br2 >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "$cmd --merge-base with non-commit" '
+		git checkout main &&
+		test_must_fail git $cmd --merge-base main^{tree} 2>err &&
+		test_i18ngrep "fatal: --merge-base only works with commits" err
+	'
+
+	test_expect_success "$cmd --merge-base with no merge bases and one commit" '
+		git checkout main &&
+		test_must_fail git $cmd --merge-base br3 2>err &&
+		test_i18ngrep "fatal: no merge base found" err
+	'
+
+	test_expect_success "$cmd --merge-base with multiple merge bases and one commit" '
+		git checkout main &&
+		test_must_fail git $cmd --merge-base br1 2>err &&
+		test_i18ngrep "fatal: multiple merge bases found" err
+	'
+done
+
+for cmd in diff-tree diff
+do
+	test_expect_success "$cmd --merge-base with two commits" '
+		git $cmd commit-C main >expect &&
+		git $cmd --merge-base br2 main >actual &&
+		test_cmp expect actual
+	'
+
+	test_expect_success "$cmd --merge-base commit and non-commit" '
+		test_must_fail git $cmd --merge-base br2 main^{tree} 2>err &&
+		test_i18ngrep "fatal: --merge-base only works with commits" err
+	'
+
+	test_expect_success "$cmd --merge-base with no merge bases and two commits" '
+		test_must_fail git $cmd --merge-base br2 br3 2>err &&
+		test_i18ngrep "fatal: no merge base found" err
+	'
+
+	test_expect_success "$cmd --merge-base with multiple merge bases and two commits" '
+		test_must_fail git $cmd --merge-base main br1 2>err &&
+		test_i18ngrep "fatal: multiple merge bases found" err
+	'
+done
+
+test_expect_success 'diff-tree --merge-base with one commit' '
+	test_must_fail git diff-tree --merge-base main 2>err &&
+	test_i18ngrep "fatal: --merge-base only works with two commits" err
+'
+
+test_expect_success 'diff --merge-base with range' '
+	test_must_fail git diff --merge-base br2..br3 2>err &&
+	test_i18ngrep "fatal: --merge-base does not work with ranges" err
+'
+
+test_done
diff --git a/t/t4100-apply-stat.sh b/t/t4100-apply-stat.sh
index 744b8e51be..9b433de836 100755
--- a/t/t4100-apply-stat.sh
+++ b/t/t4100-apply-stat.sh
@@ -17,13 +17,13 @@ do
 	test_expect_success "$title" '
 		git apply --stat --summary \
 			<"$TEST_DIRECTORY/t4100/t-apply-$num.patch" >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
 	'
 
 	test_expect_success "$title with recount" '
 		sed -e "$UNC" <"$TEST_DIRECTORY/t4100/t-apply-$num.patch" |
 		git apply --recount --stat --summary >current &&
-		test_i18ncmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
+		test_cmp "$TEST_DIRECTORY"/t4100/t-apply-$num.expect current
 	'
 done <<\EOF
 rename
diff --git a/t/t4100/t-apply-1.patch b/t/t4100/t-apply-1.patch
index 90ab54f0f5..43394f8285 100644
--- a/t/t4100/t-apply-1.patch
+++ b/t/t4100/t-apply-1.patch
@@ -75,8 +75,8 @@ diff --git a/Documentation/git.txt b/Documentation/git.txt
 +link:git-ssh-pull.html[git-ssh-pull]::
  	Pulls from a remote repository over ssh connection
  
- Interogators:
-@@ -156,8 +156,8 @@ Interogators:
+ Interrogators:
+@@ -156,8 +156,8 @@ Interrogators:
  link:git-diff-helper.html[git-diff-helper]::
  	Generates patch format output for git-diff-*
  
diff --git a/t/t4100/t-apply-3.patch b/t/t4100/t-apply-3.patch
index 90cdbaa5bb..cac172e779 100644
--- a/t/t4100/t-apply-3.patch
+++ b/t/t4100/t-apply-3.patch
@@ -211,7 +211,7 @@ dissimilarity index 82%
 -
 -		/* If this is an exact directory match, we may have
 -		 * directory files following this path. Match on them.
--		 * Otherwise, we're at a pach subcomponent, and we need
+-		 * Otherwise, we're at a patch subcomponent, and we need
 -		 * to try to match again.
 -		 */
 -		if (mtype == 0)
diff --git a/t/t4100/t-apply-5.patch b/t/t4100/t-apply-5.patch
index 5f6ddc1059..57ec79d887 100644
--- a/t/t4100/t-apply-5.patch
+++ b/t/t4100/t-apply-5.patch
@@ -185,8 +185,8 @@ diff a/Documentation/git.txt b/Documentation/git.txt
 +link:git-ssh-pull.html[git-ssh-pull]::
  	Pulls from a remote repository over ssh connection
  
- Interogators:
-@@ -156,8 +156,8 @@ Interogators:
+ Interrogators:
+@@ -156,8 +156,8 @@ Interrogators:
  link:git-diff-helper.html[git-diff-helper]::
  	Generates patch format output for git-diff-*
  
diff --git a/t/t4100/t-apply-7.patch b/t/t4100/t-apply-7.patch
index 07c6589e74..fa24305108 100644
--- a/t/t4100/t-apply-7.patch
+++ b/t/t4100/t-apply-7.patch
@@ -335,7 +335,7 @@ diff a/ls-tree.c b/ls-tree.c
  
 -		/* If this is an exact directory match, we may have
 -		 * directory files following this path. Match on them.
--		 * Otherwise, we're at a pach subcomponent, and we need
+-		 * Otherwise, we're at a patch subcomponent, and we need
 -		 * to try to match again.
 +	if (e->directory) {
 +		/* If this is a directory, we have the following cases:
diff --git a/t/t4103-apply-binary.sh b/t/t4103-apply-binary.sh
index 1b420e3b5f..d370ecfe0d 100755
--- a/t/t4103-apply-binary.sh
+++ b/t/t4103-apply-binary.sh
@@ -6,6 +6,9 @@
 test_description='git apply handling binary patches
 
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -31,64 +34,64 @@ test_expect_success 'setup' '
 	git update-index --add --remove file1 file2 file3 file4 &&
 	git commit -m "Second Version" &&
 
-	git diff-tree -p master binary >B.diff &&
-	git diff-tree -p -C master binary >C.diff &&
+	git diff-tree -p main binary >B.diff &&
+	git diff-tree -p -C main binary >C.diff &&
 
-	git diff-tree -p --binary master binary >BF.diff &&
-	git diff-tree -p --binary -C master binary >CF.diff &&
+	git diff-tree -p --binary main binary >BF.diff &&
+	git diff-tree -p --binary -C main binary >CF.diff &&
 
-	git diff-tree -p --full-index master binary >B-index.diff &&
-	git diff-tree -p -C --full-index master binary >C-index.diff &&
+	git diff-tree -p --full-index main binary >B-index.diff &&
+	git diff-tree -p -C --full-index main binary >C-index.diff &&
 
-	git diff-tree -p --binary --no-prefix master binary -- file3 >B0.diff &&
+	git diff-tree -p --binary --no-prefix main binary -- file3 >B0.diff &&
 
 	git init other-repo &&
 	(
 		cd other-repo &&
-		git fetch .. master &&
+		git fetch .. main &&
 		git reset --hard FETCH_HEAD
 	)
 '
 
 test_expect_success 'stat binary diff -- should not fail.' \
-	'git checkout master &&
+	'git checkout main &&
 	 git apply --stat --summary B.diff'
 
 test_expect_success 'stat binary -p0 diff -- should not fail.' '
-	 git checkout master &&
+	 git checkout main &&
 	 git apply --stat -p0 B0.diff
 '
 
 test_expect_success 'stat binary diff (copy) -- should not fail.' \
-	'git checkout master &&
+	'git checkout main &&
 	 git apply --stat --summary C.diff'
 
 test_expect_success 'check binary diff -- should fail.' \
-	'git checkout master &&
+	'git checkout main &&
 	 test_must_fail git apply --check B.diff'
 
 test_expect_success 'check binary diff (copy) -- should fail.' \
-	'git checkout master &&
+	'git checkout main &&
 	 test_must_fail git apply --check C.diff'
 
 test_expect_success \
 	'check incomplete binary diff with replacement -- should fail.' '
-	git checkout master &&
+	git checkout main &&
 	test_must_fail git apply --check --allow-binary-replacement B.diff
 '
 
 test_expect_success \
     'check incomplete binary diff with replacement (copy) -- should fail.' '
-	 git checkout master &&
+	 git checkout main &&
 	 test_must_fail git apply --check --allow-binary-replacement C.diff
 '
 
 test_expect_success 'check binary diff with replacement.' \
-	'git checkout master &&
+	'git checkout main &&
 	 git apply --check --allow-binary-replacement BF.diff'
 
 test_expect_success 'check binary diff with replacement (copy).' \
-	'git checkout master &&
+	'git checkout main &&
 	 git apply --check --allow-binary-replacement CF.diff'
 
 # Now we start applying them.
@@ -96,7 +99,7 @@ test_expect_success 'check binary diff with replacement (copy).' \
 do_reset () {
 	rm -f file? &&
 	git reset --hard &&
-	git checkout -f master
+	git checkout -f main
 }
 
 test_expect_success 'apply binary diff -- should fail.' \
@@ -155,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/t4104-apply-boundary.sh b/t/t4104-apply-boundary.sh
index 32e3b0ee0b..71ef4132d1 100755
--- a/t/t4104-apply-boundary.sh
+++ b/t/t4104-apply-boundary.sh
@@ -3,80 +3,55 @@
 # Copyright (c) 2005 Junio C Hamano
 #
 
-test_description='git apply boundary tests
+test_description='git apply boundary tests'
 
-'
 . ./test-lib.sh
 
 L="c d e f g h i j k l m n o p q r s t u v w x"
 
 test_expect_success setup '
-	for i in b '"$L"' y
-	do
-		echo $i
-	done >victim &&
+	test_write_lines b $L y >victim &&
 	cat victim >original &&
 	git update-index --add victim &&
 
 	# add to the head
-	for i in a b '"$L"' y
-	do
-		echo $i
-	done >victim &&
+	test_write_lines a b $L y >victim &&
 	cat victim >add-a-expect &&
 	git diff victim >add-a-patch.with &&
 	git diff --unified=0 >add-a-patch.without &&
 
 	# insert at line two
-	for i in b a '"$L"' y
-	do
-		echo $i
-	done >victim &&
+	test_write_lines b a $L y >victim &&
 	cat victim >insert-a-expect &&
 	git diff victim >insert-a-patch.with &&
 	git diff --unified=0 >insert-a-patch.without &&
 
 	# modify at the head
-	for i in a '"$L"' y
-	do
-		echo $i
-	done >victim &&
+	test_write_lines a $L y >victim &&
 	cat victim >mod-a-expect &&
 	git diff victim >mod-a-patch.with &&
 	git diff --unified=0 >mod-a-patch.without &&
 
 	# remove from the head
-	for i in '"$L"' y
-	do
-		echo $i
-	done >victim &&
+	test_write_lines $L y >victim &&
 	cat victim >del-a-expect &&
 	git diff victim >del-a-patch.with &&
 	git diff --unified=0 >del-a-patch.without &&
 
 	# add to the tail
-	for i in b '"$L"' y z
-	do
-		echo $i
-	done >victim &&
+	test_write_lines b $L y z >victim &&
 	cat victim >add-z-expect &&
 	git diff victim >add-z-patch.with &&
 	git diff --unified=0 >add-z-patch.without &&
 
 	# modify at the tail
-	for i in b '"$L"' z
-	do
-		echo $i
-	done >victim &&
+	test_write_lines b $L z >victim &&
 	cat victim >mod-z-expect &&
 	git diff victim >mod-z-patch.with &&
 	git diff --unified=0 >mod-z-patch.without &&
 
 	# remove from the tail
-	for i in b '"$L"'
-	do
-		echo $i
-	done >victim &&
+	test_write_lines b $L >victim &&
 	cat victim >del-z-expect &&
 	git diff victim >del-z-patch.with &&
 	git diff --unified=0 >del-z-patch.without
@@ -88,15 +63,15 @@ for with in with without
 do
 	case "$with" in
 	with) u= ;;
-	without) u='--unidiff-zero ' ;;
+	without) u=--unidiff-zero ;;
 	esac
 	for kind in add-a add-z insert-a mod-a mod-z del-a del-z
 	do
 		test_expect_success "apply $kind-patch $with context" '
 			cat original >victim &&
 			git update-index victim &&
-			git apply --index '"$u$kind-patch.$with"' &&
-			test_cmp '"$kind"'-expect victim
+			git apply --index $u "$kind-patch.$with" &&
+			test_cmp "$kind-expect" victim
 		'
 	done
 done
@@ -110,13 +85,12 @@ do
 	test_expect_success "apply non-git $kind-patch without context" '
 		cat original >victim &&
 		git update-index victim &&
-		git apply --unidiff-zero --index '"$kind-ng.without"' &&
-		test_cmp '"$kind"'-expect victim
+		git apply --unidiff-zero --index "$kind-ng.without" &&
+		test_cmp "$kind-expect" victim
 	'
 done
 
 test_expect_success 'two lines' '
-
 	>file &&
 	git add file &&
 	echo aaa >file &&
@@ -125,11 +99,10 @@ test_expect_success 'two lines' '
 	echo bbb >file &&
 	git add file &&
 	test_must_fail git apply --check patch
-
 '
 
 test_expect_success 'apply patch with 3 context lines matching at end' '
-	{ echo a; echo b; echo c; echo d; } >file &&
+	test_write_lines a b c d >file &&
 	git add file &&
 	echo e >>file &&
 	git diff >patch &&
diff --git a/t/t4108-apply-threeway.sh b/t/t4108-apply-threeway.sh
index fa5d4efb89..65147efdea 100755
--- a/t/t4108-apply-threeway.sh
+++ b/t/t4108-apply-threeway.sh
@@ -2,25 +2,22 @@
 
 test_description='git apply --3way'
 
-. ./test-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
-create_file () {
-	for i
-	do
-		echo "$i"
-	done
-}
+. ./test-lib.sh
 
-sanitize_conflicted_diff () {
+print_sanitized_conflicted_diff () {
+	git diff HEAD >diff.raw &&
 	sed -e '
 		/^index /d
-		s/^\(+[<>][<>][<>][<>]*\) .*/\1/
-	'
+		s/^\(+[<>|][<>|][<>|][<>|]*\) .*/\1/
+	' diff.raw
 }
 
 test_expect_success setup '
 	test_tick &&
-	create_file >one 1 2 3 4 5 6 7 &&
+	test_write_lines 1 2 3 4 5 6 7 >one &&
 	cat one >two &&
 	git add one two &&
 	git commit -m initial &&
@@ -28,16 +25,16 @@ test_expect_success setup '
 	git branch side &&
 
 	test_tick &&
-	create_file >one 1 two 3 4 5 six 7 &&
-	create_file >two 1 two 3 4 5 6 7 &&
-	git commit -a -m master &&
+	test_write_lines 1 two 3 4 5 six 7 >one &&
+	test_write_lines 1 two 3 4 5 6 7 >two &&
+	git commit -a -m main &&
 
 	git checkout side &&
-	create_file >one 1 2 3 4 five 6 7 &&
-	create_file >two 1 2 3 4 five 6 7 &&
+	test_write_lines 1 2 3 4 five 6 7 >one &&
+	test_write_lines 1 2 3 4 five 6 7 >two &&
 	git commit -a -m side &&
 
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'apply without --3way' '
@@ -45,55 +42,64 @@ test_expect_success 'apply without --3way' '
 
 	# should fail to apply
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	test_must_fail git apply --index P.diff &&
 	# should leave things intact
 	git diff-files --exit-code &&
 	git diff-index --exit-code --cached HEAD
 '
 
-test_expect_success 'apply with --3way' '
+test_apply_with_3way () {
 	# Merging side should be similar to applying this patch
 	git diff ...side >P.diff &&
 
 	# The corresponding conflicted merge
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	test_must_fail git merge --no-commit side &&
 	git ls-files -s >expect.ls &&
-	git diff HEAD | sanitize_conflicted_diff >expect.diff &&
+	print_sanitized_conflicted_diff >expect.diff &&
 
 	# should fail to apply
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	test_must_fail git apply --index --3way P.diff &&
 	git ls-files -s >actual.ls &&
-	git diff HEAD | sanitize_conflicted_diff >actual.diff &&
+	print_sanitized_conflicted_diff >actual.diff &&
 
 	# The result should resemble the corresponding merge
 	test_cmp expect.ls actual.ls &&
 	test_cmp expect.diff actual.diff
+}
+
+test_expect_success 'apply with --3way' '
+	test_apply_with_3way
+'
+
+test_expect_success 'apply with --3way with merge.conflictStyle = diff3' '
+	test_config merge.conflictStyle diff3 &&
+	test_apply_with_3way
 '
 
 test_expect_success 'apply with --3way with rerere enabled' '
-	git config rerere.enabled true &&
+	test_config rerere.enabled true &&
 
 	# Merging side should be similar to applying this patch
 	git diff ...side >P.diff &&
 
 	# The corresponding conflicted merge
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	test_must_fail git merge --no-commit side &&
 
 	# Manually resolve and record the resolution
-	create_file 1 two 3 4 five six 7 >one &&
+	test_write_lines 1 two 3 4 five six 7 >one &&
 	git rerere &&
 	cat one >expect &&
 
 	# should fail to apply
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	test_must_fail git apply --index --3way P.diff &&
 
 	# but rerere should have replayed the recorded resolution
@@ -104,14 +110,14 @@ test_expect_success 'apply -3 with add/add conflict setup' '
 	git reset --hard &&
 
 	git checkout -b adder &&
-	create_file 1 2 3 4 5 6 7 >three &&
-	create_file 1 2 3 4 5 6 7 >four &&
+	test_write_lines 1 2 3 4 5 6 7 >three &&
+	test_write_lines 1 2 3 4 5 6 7 >four &&
 	git add three four &&
 	git commit -m "add three and four" &&
 
 	git checkout -b another adder^ &&
-	create_file 1 2 3 4 5 6 7 >three &&
-	create_file 1 2 3 four 5 6 7 >four &&
+	test_write_lines 1 2 3 4 5 6 7 >three &&
+	test_write_lines 1 2 3 four 5 6 7 >four &&
 	git add three four &&
 	git commit -m "add three and four" &&
 
@@ -121,7 +127,7 @@ test_expect_success 'apply -3 with add/add conflict setup' '
 	git checkout adder^0 &&
 	test_must_fail git merge --no-commit another &&
 	git ls-files -s >expect.ls &&
-	git diff HEAD | sanitize_conflicted_diff >expect.diff
+	print_sanitized_conflicted_diff >expect.diff
 '
 
 test_expect_success 'apply -3 with add/add conflict' '
@@ -131,7 +137,7 @@ test_expect_success 'apply -3 with add/add conflict' '
 	test_must_fail git apply --index --3way P.diff &&
 	# ... and leave conflicts in the index and in the working tree
 	git ls-files -s >actual.ls &&
-	git diff HEAD | sanitize_conflicted_diff >actual.diff &&
+	print_sanitized_conflicted_diff >actual.diff &&
 
 	# The result should resemble the corresponding merge
 	test_cmp expect.ls actual.ls &&
@@ -154,4 +160,74 @@ test_expect_success 'apply -3 with add/add conflict (dirty working tree)' '
 	test_cmp three.save three
 '
 
+test_expect_success 'apply -3 with ambiguous repeating file' '
+	git reset --hard &&
+	test_write_lines 1 2 1 2 1 2 1 2 1 2 1 >one_two_repeat &&
+	git add one_two_repeat &&
+	git commit -m "init one" &&
+	test_write_lines 1 2 1 2 1 2 1 2 one 2 1 >one_two_repeat &&
+	git commit -a -m "change one" &&
+
+	git diff HEAD~ >Repeat.diff &&
+	git reset --hard HEAD~ &&
+
+	test_write_lines 1 2 1 2 1 2 one 2 1 2 one >one_two_repeat &&
+	git commit -a -m "change surrounding one" &&
+
+	git apply --index --3way Repeat.diff &&
+	test_write_lines 1 2 1 2 1 2 one 2 one 2 one >expect &&
+
+	test_cmp expect one_two_repeat
+'
+
+test_expect_success 'apply with --3way --cached clean apply' '
+	# Merging side should be similar to applying this patch
+	git diff ...side >P.diff &&
+
+	# The corresponding cleanly applied merge
+	git reset --hard &&
+	git checkout main~ &&
+	git merge --no-commit side &&
+	git ls-files -s >expect.ls &&
+
+	# should succeed
+	git reset --hard &&
+	git checkout main~ &&
+	git apply --cached --3way P.diff &&
+	git ls-files -s >actual.ls &&
+	print_sanitized_conflicted_diff >actual.diff &&
+
+	# The cache should resemble the corresponding merge
+	# (both files at stage #0)
+	test_cmp expect.ls actual.ls &&
+	# However the working directory should not change
+	>expect.diff &&
+	test_cmp expect.diff actual.diff
+'
+
+test_expect_success 'apply with --3way --cached and conflicts' '
+	# Merging side should be similar to applying this patch
+	git diff ...side >P.diff &&
+
+	# The corresponding conflicted merge
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git merge --no-commit side &&
+	git ls-files -s >expect.ls &&
+
+	# should fail to apply
+	git reset --hard &&
+	git checkout main^0 &&
+	test_must_fail git apply --cached --3way P.diff &&
+	git ls-files -s >actual.ls &&
+	print_sanitized_conflicted_diff >actual.diff &&
+
+	# The cache should resemble the corresponding merge
+	# (one file at stage #0, one file at stages #1 #2 #3)
+	test_cmp expect.ls actual.ls &&
+	# However the working directory should not change
+	>expect.diff &&
+	test_cmp expect.diff actual.diff
+'
+
 test_done
diff --git a/t/t4114-apply-typechange.sh b/t/t4114-apply-typechange.sh
index ebadbc347f..da3e64f811 100755
--- a/t/t4114-apply-typechange.sh
+++ b/t/t4114-apply-typechange.sh
@@ -88,6 +88,13 @@ test_expect_success 'symlink becomes file' '
 	'
 test_debug 'cat patch'
 
+test_expect_success 'symlink becomes file, in reverse' '
+	git checkout -f foo-symlinked-to-bar &&
+	git diff-tree -p HEAD foo-back-to-file > patch &&
+	git checkout foo-back-to-file &&
+	git apply -R --index < patch
+	'
+
 test_expect_success 'binary file becomes symlink' '
 	git checkout -f foo-becomes-binary &&
 	git diff-tree -p --binary HEAD foo-symlinked-to-bar > patch &&
diff --git a/t/t4117-apply-reject.sh b/t/t4117-apply-reject.sh
index f7de6f077a..0ee93fe845 100755
--- a/t/t4117-apply-reject.sh
+++ b/t/t4117-apply-reject.sh
@@ -74,7 +74,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
 	test_must_fail git apply --reject patch.1 &&
 	test_cmp expected file1 &&
 
-	cat file1.rej &&
+	test_path_is_file file1.rej &&
 	test_path_is_missing file2.rej
 '
 
@@ -87,7 +87,7 @@ test_expect_success 'apply with --reject should fail but update the file' '
 	test_path_is_missing file1 &&
 	test_cmp expected file2 &&
 
-	cat file2.rej &&
+	test_path_is_file file2.rej &&
 	test_path_is_missing file1.rej
 
 '
@@ -101,7 +101,7 @@ test_expect_success 'the same test with --verbose' '
 	test_path_is_missing file1 &&
 	test_cmp expected file2 &&
 
-	cat file2.rej &&
+	test_path_is_file file2.rej &&
 	test_path_is_missing file1.rej
 
 '
diff --git a/t/t4121-apply-diffs.sh b/t/t4121-apply-diffs.sh
index 66368effd5..b45454aaf4 100755
--- a/t/t4121-apply-diffs.sh
+++ b/t/t4121-apply-diffs.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git apply for contextually independent diffs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 echo '1
@@ -23,7 +26,7 @@ test_expect_success 'setup' \
 	git commit -a -q -m 2 &&
 	echo 9 >>file &&
 	git commit -a -q -m 3 &&
-	git checkout master'
+	git checkout main'
 
 test_expect_success \
 	'check if contextually independent diffs for the same file apply' \
diff --git a/t/t4122-apply-symlink-inside.sh b/t/t4122-apply-symlink-inside.sh
index 4acb3f336e..aa52de401b 100755
--- a/t/t4122-apply-symlink-inside.sh
+++ b/t/t4122-apply-symlink-inside.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='apply to deeper directory without getting fooled with symlink'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -35,11 +38,11 @@ test_expect_success apply '
 
 test_expect_success 'check result' '
 
-	git diff --exit-code master &&
-	git diff --exit-code --cached master &&
+	git diff --exit-code main &&
+	git diff --exit-code --cached main &&
 	test_tick &&
 	git commit -m replay &&
-	T1=$(git rev-parse "master^{tree}") &&
+	T1=$(git rev-parse "main^{tree}") &&
 	T2=$(git rev-parse "HEAD^{tree}") &&
 	test "z$T1" = "z$T2"
 
diff --git a/t/t4124-apply-ws-rule.sh b/t/t4124-apply-ws-rule.sh
index ff51e9e789..0ca29821ec 100755
--- a/t/t4124-apply-ws-rule.sh
+++ b/t/t4124-apply-ws-rule.sh
@@ -35,9 +35,15 @@ prepare_test_file () {
 }
 
 apply_patch () {
+	cmd_prefix= &&
+	if test "x$1" = 'x!'
+	then
+		cmd_prefix=test_must_fail &&
+		shift
+	fi &&
 	>target &&
 	sed -e "s|\([ab]\)/file|\1/target|" <patch |
-	git apply "$@"
+	$cmd_prefix git apply "$@"
 }
 
 test_fix () {
@@ -46,6 +52,13 @@ test_fix () {
 
 	# find touched lines
 	$DIFF file target | sed -n -e "s/^> //p" >fixed
+	# busybox's diff(1) doesn't output normal format
+	if ! test -s fixed
+	then
+		$DIFF -u file target |
+		grep -v '^+++ target' |
+		sed -ne "/^+/s/+//p" >fixed
+	fi
 
 	# the changed lines are all expected to change
 	fixed_cnt=$(wc -l <fixed)
@@ -99,7 +112,7 @@ test_expect_success 'whitespace=warn, default rule' '
 
 test_expect_success 'whitespace=error-all, default rule' '
 
-	test_must_fail apply_patch --whitespace=error-all &&
+	apply_patch ! --whitespace=error-all &&
 	test_must_be_empty target
 
 '
diff --git a/t/t4127-apply-same-fn.sh b/t/t4127-apply-same-fn.sh
index 972946c174..305b7e649e 100755
--- a/t/t4127-apply-same-fn.sh
+++ b/t/t4127-apply-same-fn.sh
@@ -32,6 +32,10 @@ test_expect_success 'apply same filename with independent changes' '
 
 test_expect_success 'apply same filename with overlapping changes' '
 	git reset --hard &&
+
+	# Store same_fn so that we can check apply -R in next test
+	cp same_fn same_fn1 &&
+
 	modify "s/^d/z/" same_fn &&
 	git diff > patch0 &&
 	git add same_fn &&
@@ -43,6 +47,11 @@ test_expect_success 'apply same filename with overlapping changes' '
 	test_cmp same_fn same_fn2
 '
 
+test_expect_success 'apply same filename with overlapping changes, in reverse' '
+	git apply -R patch0 &&
+	test_cmp same_fn same_fn1
+'
+
 test_expect_success 'apply same new filename after rename' '
 	git reset --hard &&
 	git mv same_fn new_fn &&
diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
index 5cdd76dfa7..576632f868 100755
--- a/t/t4129-apply-samemode.sh
+++ b/t/t4129-apply-samemode.sh
@@ -73,4 +73,30 @@ test_expect_success FILEMODE 'bogus mode is rejected' '
 	test_i18ngrep "invalid mode" err
 '
 
+test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree files' '
+	git reset --hard &&
+	test_config core.sharedRepository 0666 &&
+	(
+		# Remove a default ACL if possible.
+		(setfacl -k . 2>/dev/null || true) &&
+		umask 0077 &&
+
+		# Test both files (f1) and leading dirs (d)
+		mkdir d &&
+		touch f1 d/f2 &&
+		git add f1 d/f2 &&
+		git diff --staged >patch-f1-and-f2.txt &&
+
+		rm -rf d f1 &&
+		git apply patch-f1-and-f2.txt &&
+
+		echo "-rw-------" >f1_mode.expected &&
+		echo "drwx------" >d_mode.expected &&
+		test_modebits f1 >f1_mode.actual &&
+		test_modebits d >d_mode.actual &&
+		test_cmp f1_mode.expected f1_mode.actual &&
+		test_cmp d_mode.expected d_mode.actual
+	)
+'
+
 test_done
diff --git a/t/t4134-apply-submodule.sh b/t/t4134-apply-submodule.sh
index 0043930ca6..d1c16ba33c 100755
--- a/t/t4134-apply-submodule.sh
+++ b/t/t4134-apply-submodule.sh
@@ -15,7 +15,7 @@ index 0000000..0123456
 --- /dev/null
 +++ b/dir/sm
 @@ -0,0 +1 @@
-+Subproject commit 0123456789abcdef0123456789abcdef01234567
++Subproject commit $(test_oid numeric)
 EOF
 	cat > remove-sm.patch <<EOF
 diff --git a/dir/sm b/dir/sm
@@ -24,7 +24,7 @@ index 0123456..0000000
 --- a/dir/sm
 +++ /dev/null
 @@ -1 +0,0 @@
--Subproject commit 0123456789abcdef0123456789abcdef01234567
+-Subproject commit $(test_oid numeric)
 EOF
 '
 
diff --git a/t/t4137-apply-submodule.sh b/t/t4137-apply-submodule.sh
index a9bd40a6d0..07d5262537 100755
--- a/t/t4137-apply-submodule.sh
+++ b/t/t4137-apply-submodule.sh
@@ -6,15 +6,19 @@ test_description='git apply handling submodules'
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
 
 apply_index () {
-	git diff --ignore-submodules=dirty "..$1" | git apply --index -
+	git diff --ignore-submodules=dirty "..$1" >diff &&
+	may_only_be_test_must_fail "$2" &&
+	$2 git apply --index diff
 }
 
-test_submodule_switch "apply_index"
+test_submodule_switch_func "apply_index"
 
 apply_3way () {
-	git diff --ignore-submodules=dirty "..$1" | git apply --3way -
+	git diff --ignore-submodules=dirty "..$1" >diff &&
+	may_only_be_test_must_fail "$2" &&
+	$2 git apply --3way diff
 }
 
-test_submodule_switch "apply_3way"
+test_submodule_switch_func "apply_3way"
 
 test_done
diff --git a/t/t4138-apply-ws-expansion.sh b/t/t4138-apply-ws-expansion.sh
index 3b636a63a3..b19faeb67a 100755
--- a/t/t4138-apply-ws-expansion.sh
+++ b/t/t4138-apply-ws-expansion.sh
@@ -17,8 +17,8 @@ test_expect_success setup '
 	printf "\t%s\n" 1 2 3 >after &&
 	printf "%64s\n" a b c >>after &&
 	printf "\t%s\n" 4 5 6 >>after &&
-	git diff --no-index before after |
-		sed -e "s/before/test-1/" -e "s/after/test-1/" >patch1.patch &&
+	test_expect_code 1 git diff --no-index before after >patch1.patch.raw &&
+	sed -e "s/before/test-1/" -e "s/after/test-1/" patch1.patch.raw >patch1.patch &&
 	printf "%64s\n" 1 2 3 4 5 6 >test-1 &&
 	printf "%64s\n" 1 2 3 a b c 4 5 6 >expect-1 &&
 
@@ -33,8 +33,8 @@ test_expect_success setup '
 		x=$(( $x + 1 ))
 	done &&
 	printf "\t%s\n" d e f >>after &&
-	git diff --no-index before after |
-		sed -e "s/before/test-2/" -e "s/after/test-2/" >patch2.patch &&
+	test_expect_code 1 git diff --no-index before after >patch2.patch.raw &&
+	sed -e "s/before/test-2/" -e "s/after/test-2/" patch2.patch.raw >patch2.patch &&
 	printf "%64s\n" a b c d e f >test-2 &&
 	printf "%64s\n" a b c >expect-2 &&
 	x=1 &&
@@ -56,8 +56,8 @@ test_expect_success setup '
 		x=$(( $x + 1 ))
 	done &&
 	printf "\t%s\n" d e f >>after &&
-	git diff --no-index before after |
-	sed -e "s/before/test-3/" -e "s/after/test-3/" >patch3.patch &&
+	test_expect_code 1 git diff --no-index before after >patch3.patch.raw &&
+	sed -e "s/before/test-3/" -e "s/after/test-3/" patch3.patch.raw >patch3.patch &&
 	printf "%64s\n" a b c d e f >test-3 &&
 	printf "%64s\n" a b c >expect-3 &&
 	x=0 &&
@@ -84,8 +84,8 @@ test_expect_success setup '
 		printf "\t%02d\n" $x >>after
 		x=$(( $x + 1 ))
 	done &&
-	git diff --no-index before after |
-	sed -e "s/before/test-4/" -e "s/after/test-4/" >patch4.patch &&
+	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 &&
 	>test-4 &&
 	x=0 &&
 	while test $x -lt 50
diff --git a/t/t4140-apply-ita.sh b/t/t4140-apply-ita.sh
new file mode 100755
index 0000000000..c614eaf04c
--- /dev/null
+++ b/t/t4140-apply-ita.sh
@@ -0,0 +1,56 @@
+#!/bin/sh
+
+test_description='git apply of i-t-a file'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+	test_write_lines 1 2 3 4 5 >blueprint &&
+
+	cat blueprint >test-file &&
+	git add -N test-file &&
+	git diff >creation-patch &&
+	grep "new file mode 100644" creation-patch &&
+
+	rm -f test-file &&
+	git diff >deletion-patch &&
+	grep "deleted file mode 100644" deletion-patch
+'
+
+test_expect_success 'apply creation patch to ita path (--cached)' '
+	git rm -f test-file &&
+	cat blueprint >test-file &&
+	git add -N test-file &&
+
+	git apply --cached creation-patch &&
+	git cat-file blob :test-file >actual &&
+	test_cmp blueprint actual
+'
+
+test_expect_success 'apply creation patch to ita path (--index)' '
+	git rm -f test-file &&
+	cat blueprint >test-file &&
+	git add -N test-file &&
+	rm -f test-file &&
+
+	test_must_fail git apply --index creation-patch
+'
+
+test_expect_success 'apply deletion patch to ita path (--cached)' '
+	git rm -f test-file &&
+	cat blueprint >test-file &&
+	git add -N test-file &&
+
+	git apply --cached deletion-patch &&
+	test_must_fail git ls-files --stage --error-unmatch test-file
+'
+
+test_expect_success 'apply deletion patch to ita path (--index)' '
+	cat blueprint >test-file &&
+	git add -N test-file &&
+
+	test_must_fail git apply --index deletion-patch &&
+	git ls-files --stage --error-unmatch test-file
+'
+
+test_done
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 4f1e24ecbe..2aaaa0d7de 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -2,6 +2,9 @@
 
 test_description='git am running'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup: messages' '
@@ -166,7 +169,7 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m third &&
 
-	git format-patch --stdout first >patch2	&&
+	git format-patch --stdout first >patch2 &&
 
 	git checkout -b lorem &&
 	sed -n -e "11,\$p" msg >file &&
@@ -179,8 +182,8 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m "added another file" &&
 
-	git format-patch --stdout master >lorem-move.patch &&
-	git format-patch --no-prefix --stdout master >lorem-zero.patch &&
+	git format-patch --stdout main >lorem-move.patch &&
+	git format-patch --no-prefix --stdout main >lorem-zero.patch &&
 
 	git checkout -b rename &&
 	git mv file renamed &&
@@ -453,11 +456,11 @@ test_expect_success 'am changes committer and keeps author' '
 	git checkout first &&
 	git am patch2 &&
 	test_path_is_missing .git/rebase-apply &&
-	test "$(git rev-parse master^^)" = "$(git rev-parse HEAD^^)" &&
-	git diff --exit-code master..HEAD &&
-	git diff --exit-code master^..HEAD^ &&
-	compare author master HEAD &&
-	compare author master^ HEAD^ &&
+	test "$(git rev-parse main^^)" = "$(git rev-parse HEAD^^)" &&
+	git diff --exit-code main..HEAD &&
+	git diff --exit-code main^..HEAD^ &&
+	compare author main HEAD &&
+	compare author main^ HEAD^ &&
 	test "$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" = \
 	     "$(git log -1 --pretty=format:"%cn <%ce>" HEAD)"
 '
@@ -465,7 +468,7 @@ test_expect_success 'am changes committer and keeps author' '
 test_expect_success 'am --signoff adds Signed-off-by: line' '
 	rm -fr .git/rebase-apply &&
 	git reset --hard &&
-	git checkout -b master2 first &&
+	git checkout -b topic_2 first &&
 	git am --signoff <patch2 &&
 	{
 		printf "third\n\nSigned-off-by: %s <%s>\n\n" \
@@ -479,7 +482,7 @@ test_expect_success 'am --signoff adds Signed-off-by: line' '
 '
 
 test_expect_success 'am stays in branch' '
-	echo refs/heads/master2 >expected &&
+	echo refs/heads/topic_2 >expected &&
 	git symbolic-ref HEAD >actual &&
 	test_cmp expected actual
 '
@@ -540,7 +543,7 @@ test_expect_success 'am without --keep removes Re: and [PATCH] stuff' '
 	git reset --hard HEAD^ &&
 	git am <patch4 &&
 	git rev-parse HEAD >expected &&
-	git rev-parse master2 >actual &&
+	git rev-parse topic_2 >actual &&
 	test_cmp expected actual
 '
 
@@ -567,7 +570,7 @@ test_expect_success 'am --keep-non-patch really keeps the non-patch part' '
 test_expect_success 'setup am -3' '
 	rm -fr .git/rebase-apply &&
 	git reset --hard &&
-	git checkout -b base3way master2 &&
+	git checkout -b base3way topic_2 &&
 	sed -n -e "3,\$p" msg >file &&
 	head -n 9 msg >>file &&
 	git add file &&
@@ -666,6 +669,26 @@ test_expect_success 'am --show-current-patch' '
 	test_cmp .git/rebase-apply/0001 actual.patch
 '
 
+test_expect_success 'am --show-current-patch=raw' '
+	git am --show-current-patch=raw >actual.patch &&
+	test_cmp .git/rebase-apply/0001 actual.patch
+'
+
+test_expect_success 'am --show-current-patch=diff' '
+	git am --show-current-patch=diff >actual.patch &&
+	test_cmp .git/rebase-apply/patch actual.patch
+'
+
+test_expect_success 'am accepts repeated --show-current-patch' '
+	git am --show-current-patch --show-current-patch=raw >actual.patch &&
+	test_cmp .git/rebase-apply/0001 actual.patch
+'
+
+test_expect_success 'am detects incompatible --show-current-patch' '
+	test_must_fail git am --show-current-patch=raw --show-current-patch=diff &&
+	test_must_fail git am --show-current-patch --show-current-patch=diff
+'
+
 test_expect_success 'am --skip works' '
 	echo goodbye >expected &&
 	git am --skip &&
@@ -739,7 +762,7 @@ test_expect_success 'am takes patches from a Pine mailbox' '
 	git checkout first &&
 	cat pine patch1 | git am &&
 	test_path_is_missing .git/rebase-apply &&
-	git diff --exit-code master^..HEAD
+	git diff --exit-code main^..HEAD
 '
 
 test_expect_success 'am fails on mail without patch' '
@@ -883,7 +906,7 @@ test_expect_success 'am empty-file does not infloop' '
 	test_tick &&
 	test_must_fail git am empty-file 2>actual &&
 	echo Patch format detection failed. >expected &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'am --message-id really adds the message id' '
@@ -969,7 +992,7 @@ test_expect_success 'am -s unexpected trailer block' '
 	Signed-off-by: J C H <j@c.h>
 	EOF
 	git commit -F msg &&
-	git cat-file commit HEAD | sed -e '1,/^$/d' >original &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >original &&
 	git format-patch --stdout -1 >patch &&
 
 	git reset --hard HEAD^ &&
@@ -978,7 +1001,7 @@ test_expect_success 'am -s unexpected trailer block' '
 		cat original &&
 		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
 	) >expect &&
-	git cat-file commit HEAD | sed -e '1,/^$/d' >actual &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
 	test_cmp expect actual &&
 
 	cat >msg <<-\EOF &&
@@ -989,7 +1012,7 @@ test_expect_success 'am -s unexpected trailer block' '
 	EOF
 	git reset HEAD^ &&
 	git commit -F msg file &&
-	git cat-file commit HEAD | sed -e '1,/^$/d' >original &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >original &&
 	git format-patch --stdout -1 >patch &&
 
 	git reset --hard HEAD^ &&
@@ -1000,7 +1023,7 @@ test_expect_success 'am -s unexpected trailer block' '
 		echo &&
 		echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>"
 	) >expect &&
-	git cat-file commit HEAD | sed -e '1,/^$/d' >actual &&
+	git cat-file commit HEAD | sed -e "1,/^$/d" >actual &&
 	test_cmp expect actual
 '
 
@@ -1092,25 +1115,41 @@ test_expect_success 'am and .gitattibutes' '
 		test_commit sixth &&
 
 		git checkout test &&
-		git format-patch --stdout master..HEAD >patches &&
-		git reset --hard master &&
+		git format-patch --stdout main..HEAD >patches &&
+		git reset --hard main &&
 		git am patches &&
 		grep "smudged" a.txt &&
 
 		git checkout removal &&
 		git reset --hard &&
-		git format-patch --stdout master..HEAD >patches &&
-		git reset --hard master &&
+		git format-patch --stdout main..HEAD >patches &&
+		git reset --hard main &&
 		git am patches &&
 		grep "clean" a.txt &&
 
 		git checkout conflict &&
 		git reset --hard &&
-		git format-patch --stdout master..HEAD >patches &&
+		git format-patch --stdout main..HEAD >patches &&
 		git reset --hard fourth &&
 		test_must_fail git am -3 patches &&
 		grep "<<<<<<<<<<" a.txt
 	)
 '
 
+test_expect_success 'apply binary blob in partial clone' '
+	printf "\\000" >binary &&
+	git add binary &&
+	git commit -m "binary blob" &&
+	git format-patch --stdout -m HEAD^ >patch &&
+
+	test_create_repo server &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	test_when_finished "rm -rf client" &&
+
+	# Exercise to make sure that it works
+	git -C client am ../patch
+'
+
 test_done
diff --git a/t/t4153-am-resume-override-opts.sh b/t/t4153-am-resume-override-opts.sh
index 8ea22d1bcb..b7c3861407 100755
--- a/t/t4153-am-resume-override-opts.sh
+++ b/t/t4153-am-resume-override-opts.sh
@@ -61,7 +61,7 @@ test_expect_success '--no-quiet overrides --quiet' '
 	# Applying side2 will be quiet.
 	git am --no-quiet --continue >out &&
 	echo "Applying: side1" >expected &&
-	test_i18ncmp expected out
+	test_cmp expected out
 '
 
 test_expect_success '--signoff overrides --no-signoff' '
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 55b7750ade..9f8c76dffb 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -8,7 +8,7 @@ test_description='git rerere
 ! [fifth] version1
  ! [first] first
   ! [fourth] version1
-   ! [master] initial
+   ! [main] initial
     ! [second] prefer first over second
      ! [third] version2
 ------
@@ -19,9 +19,12 @@ test_description='git rerere
     -  [second] prefer first over second
  +  +  [first] first
     +  [second^] second
-++++++ [master] initial
+++++++ [main] initial
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -57,7 +60,7 @@ test_expect_success 'setup' '
 	test_tick &&
 	git commit -q -a -m first &&
 
-	git checkout -b second master &&
+	git checkout -b second main &&
 	git show first:a1 |
 	sed -e "s/To die, t/To die! T/" -e "s/Some title/Some Title/" >a1 &&
 	echo "* END *" >>a1 &&
@@ -168,7 +171,7 @@ test_expect_success 'first postimage wins' '
 
 	oldmtimepost=$(test-tool chmtime --get -60 $rr/postimage) &&
 
-	git checkout -b third master &&
+	git checkout -b third main &&
 	git show second^:a1 | sed "s/To die: t/To die! T/" >a1 &&
 	git commit -q -a -m third &&
 
@@ -210,7 +213,7 @@ test_expect_success 'set up for garbage collection tests' '
 	echo Hello >$rr/preimage &&
 	echo World >$rr/postimage &&
 
-	sha2=4000000000000000000000000000000000000000 &&
+	sha2=$(test_oid deadbeef) &&
 	rr2=.git/rr-cache/$sha2 &&
 	mkdir $rr2 &&
 	echo Hello >$rr2/preimage &&
@@ -363,7 +366,7 @@ test_expect_success 'set up an unresolved merge' '
 	git reset --hard &&
 	git checkout version2 &&
 	fifth=$(git rev-parse fifth) &&
-	echo "$fifth		branch 'fifth' of ." |
+	echo "$fifth		branch fifth of ." |
 	git fmt-merge-msg >msg &&
 	ancestor=$(git merge-base version2 fifth) &&
 	test_must_fail git merge-recursive "$ancestor" -- HEAD fifth &&
@@ -580,13 +583,13 @@ test_expect_success 'multiple identical conflicts' '
 test_expect_success 'rerere with unexpected conflict markers does not crash' '
 	git reset --hard &&
 
-	git checkout -b branch-1 master &&
+	git checkout -b branch-1 main &&
 	echo "bar" >test &&
 	git add test &&
 	git commit -q -m two &&
 
 	git reset --hard &&
-	git checkout -b branch-2 master &&
+	git checkout -b branch-2 main &&
 	echo "foo" >test &&
 	git add test &&
 	git commit -q -a -m one &&
@@ -601,7 +604,7 @@ test_expect_success 'rerere with unexpected conflict markers does not crash' '
 test_expect_success 'rerere with inner conflict markers' '
 	git reset --hard &&
 
-	git checkout -b A master &&
+	git checkout -b A main &&
 	echo "bar" >test &&
 	git add test &&
 	git commit -q -m two &&
@@ -610,7 +613,7 @@ test_expect_success 'rerere with inner conflict markers' '
 	git commit -q -m three &&
 
 	git reset --hard &&
-	git checkout -b B master &&
+	git checkout -b B main &&
 	echo "foo" >test &&
 	git add test &&
 	git commit -q -a -m one &&
@@ -651,11 +654,11 @@ test_expect_success 'setup simple stage 1 handling' '
 		git add original &&
 		git commit -m original &&
 
-		git checkout -b A master &&
+		git checkout -b A main &&
 		git mv original A &&
 		git commit -m "rename to A" &&
 
-		git checkout -b B master &&
+		git checkout -b B main &&
 		git mv original B &&
 		git commit -m "rename to B"
 	)
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index d3a7ce6bbb..3095b1b2ff 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -6,6 +6,9 @@
 test_description='git shortlog
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -191,7 +194,7 @@ test_expect_success 'shortlog with revision pseudo options' '
 '
 
 test_expect_success 'shortlog with --output=<file>' '
-	git shortlog --output=shortlog -1 master >output &&
+	git shortlog --output=shortlog -1 main >output &&
 	test_must_be_empty output &&
 	test_line_count = 3 shortlog
 '
@@ -215,4 +218,145 @@ test_expect_success 'shortlog --committer (external)' '
 	test_cmp expect actual
 '
 
+test_expect_success '--group=committer is the same as --committer' '
+	git shortlog -ns --group=committer HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'shortlog --group=trailer:signed-off-by' '
+	git commit --allow-empty -m foo -s &&
+	GIT_COMMITTER_NAME="SOB One" \
+	GIT_COMMITTER_EMAIL=sob@example.com \
+		git commit --allow-empty -m foo -s &&
+	git commit --allow-empty --amend --no-edit -s &&
+	cat >expect <<-\EOF &&
+	     2	C O Mitter <committer@example.com>
+	     1	SOB One <sob@example.com>
+	EOF
+	git shortlog -nse --group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'trailer idents are split' '
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	SOB One
+	EOF
+	git shortlog -ns --group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'trailer idents are mailmapped' '
+	cat >expect <<-\EOF &&
+	     2	C O Mitter
+	     1	Another Name
+	EOF
+	echo "Another Name <sob@example.com>" >mail.map &&
+	git -c mailmap.file=mail.map shortlog -ns \
+		--group=trailer:signed-off-by HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'shortlog de-duplicates trailers in a single commit' '
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
+
+	this message has two distinct values, plus a repeat
+
+	Repeated-trailer: Foo
+	Repeated-trailer: Bar
+	Repeated-trailer: Foo
+	EOF
+
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
+
+	similar to the previous, but without the second distinct value
+
+	Repeated-trailer: Foo
+	Repeated-trailer: Foo
+	EOF
+
+	cat >expect <<-\EOF &&
+	     2	Foo
+	     1	Bar
+	EOF
+	git shortlog -ns --group=trailer:repeated-trailer -2 HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'shortlog can match multiple groups' '
+	git commit --allow-empty -F - <<-\EOF &&
+	subject one
+
+	this has two trailers that are distinct from the author; it will count
+	3 times in the output
+
+	Some-trailer: User A <a@example.com>
+	Another-trailer: User B <b@example.com>
+	EOF
+
+	git commit --allow-empty -F - <<-\EOF &&
+	subject two
+
+	this one has two trailers, one of which is a duplicate with the author;
+	it will only be counted once for them
+
+	Another-trailer: A U Thor <author@example.com>
+	Some-trailer: User B <b@example.com>
+	EOF
+
+	cat >expect <<-\EOF &&
+	     2	A U Thor
+	     2	User B
+	     1	User A
+	EOF
+	git shortlog -ns \
+		--group=author \
+		--group=trailer:some-trailer \
+		--group=trailer:another-trailer \
+		-2 HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'set up option selection tests' '
+	git commit --allow-empty -F - <<-\EOF
+	subject
+
+	body
+
+	Trailer-one: value-one
+	Trailer-two: value-two
+	EOF
+'
+
+test_expect_success '--no-group resets group list to author' '
+	cat >expect <<-\EOF &&
+	     1	A U Thor
+	EOF
+	git shortlog -ns \
+		--group=committer \
+		--group=trailer:trailer-one \
+		--no-group \
+		-1 HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--no-group resets trailer list' '
+	cat >expect <<-\EOF &&
+	     1	value-two
+	EOF
+	git shortlog -ns \
+		--group=trailer:trailer-one \
+		--no-group \
+		--group=trailer:trailer-two \
+		-1 HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'stdin with multiple groups reports error' '
+	git log >log &&
+	test_must_fail git shortlog --group=author --group=committer <log
+'
+
 test_done
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index e803ba402e..9dfead936b 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -2,9 +2,17 @@
 
 test_description='git log'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 . "$TEST_DIRECTORY/lib-terminal.sh"
+. "$TEST_DIRECTORY/lib-log-graph.sh"
+
+test_cmp_graph () {
+	lib_test_cmp_graph --format=%s "$@"
+}
 
 test_expect_success setup '
 
@@ -87,12 +95,12 @@ test_expect_success 'format %w(,1,2)' '
 '
 
 cat > expect << EOF
-804a787 sixth
-394ef78 fifth
-5d31159 fourth
-2fbe8c0 third
-f7dab8e second
-3a2fdcb initial
+$(git rev-parse --short :/sixth  ) sixth
+$(git rev-parse --short :/fifth  ) fifth
+$(git rev-parse --short :/fourth ) fourth
+$(git rev-parse --short :/third  ) third
+$(git rev-parse --short :/second ) second
+$(git rev-parse --short :/initial) initial
 EOF
 test_expect_success 'oneline' '
 
@@ -173,43 +181,45 @@ test_expect_success 'git config log.follow is overridden by --no-follow' '
 	verbose test "$actual" = "$expect"
 '
 
+# Note that these commits are intentionally listed out of order.
+last_three="$(git rev-parse :/fourth :/sixth :/fifth)"
 cat > expect << EOF
-804a787 sixth
-394ef78 fifth
-5d31159 fourth
+$(git rev-parse --short :/sixth ) sixth
+$(git rev-parse --short :/fifth ) fifth
+$(git rev-parse --short :/fourth) fourth
 EOF
 test_expect_success 'git log --no-walk <commits> sorts by commit time' '
-	git log --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
+	git log --no-walk --oneline $last_three > actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git log --no-walk=sorted <commits> sorts by commit time' '
-	git log --no-walk=sorted --oneline 5d31159 804a787 394ef78 > actual &&
+	git log --no-walk=sorted --oneline $last_three > actual &&
 	test_cmp expect actual
 '
 
 cat > expect << EOF
-=== 804a787 sixth
-=== 394ef78 fifth
-=== 5d31159 fourth
+=== $(git rev-parse --short :/sixth ) sixth
+=== $(git rev-parse --short :/fifth ) fifth
+=== $(git rev-parse --short :/fourth) fourth
 EOF
 test_expect_success 'git log --line-prefix="=== " --no-walk <commits> sorts by commit time' '
-	git log --line-prefix="=== " --no-walk --oneline 5d31159 804a787 394ef78 > actual &&
+	git log --line-prefix="=== " --no-walk --oneline $last_three > actual &&
 	test_cmp expect actual
 '
 
 cat > expect << EOF
-5d31159 fourth
-804a787 sixth
-394ef78 fifth
+$(git rev-parse --short :/fourth) fourth
+$(git rev-parse --short :/sixth ) sixth
+$(git rev-parse --short :/fifth ) fifth
 EOF
 test_expect_success 'git log --no-walk=unsorted <commits> leaves list of commits as given' '
-	git log --no-walk=unsorted --oneline 5d31159 804a787 394ef78 > actual &&
+	git log --no-walk=unsorted --oneline $last_three > actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'git show <commits> leaves list of commits as given' '
-	git show --oneline -s 5d31159 804a787 394ef78 > actual &&
+	git show --oneline -s $last_three > actual &&
 	test_cmp expect actual
 '
 
@@ -450,8 +460,7 @@ cat > expect <<EOF
 EOF
 
 test_expect_success 'simple log --graph' '
-	git log --graph --pretty=tformat:%s >actual &&
-	test_cmp expect actual
+	test_cmp_graph
 '
 
 cat > expect <<EOF
@@ -465,15 +474,14 @@ cat > expect <<EOF
 EOF
 
 test_expect_success 'simple log --graph --line-prefix="123 "' '
-	git log --graph --line-prefix="123 " --pretty=tformat:%s >actual &&
-	test_cmp expect actual
+	test_cmp_graph --line-prefix="123 "
 '
 
 test_expect_success 'set up merge history' '
 	git checkout -b side HEAD~4 &&
 	test_commit side-1 1 1 &&
 	test_commit side-2 2 2 &&
-	git checkout master &&
+	git checkout main &&
 	git merge side
 '
 
@@ -493,9 +501,7 @@ cat > expect <<\EOF
 EOF
 
 test_expect_success 'log --graph with merge' '
-	git log --graph --date-order --pretty=tformat:%s |
-		sed "s/ *\$//" >actual &&
-	test_cmp expect actual
+	test_cmp_graph --date-order
 '
 
 cat > expect <<\EOF
@@ -514,9 +520,7 @@ cat > expect <<\EOF
 EOF
 
 test_expect_success 'log --graph --line-prefix="| | | " with merge' '
-	git log --line-prefix="| | | " --graph --date-order --pretty=tformat:%s |
-		sed "s/ *\$//" >actual &&
-	test_cmp expect actual
+	test_cmp_graph --line-prefix="| | | " --date-order
 '
 
 cat > expect.colors <<\EOF
@@ -536,23 +540,21 @@ EOF
 
 test_expect_success 'log --graph with merge with log.graphColors' '
 	test_config log.graphColors " blue,invalid-color, cyan, red  , " &&
-	git log --color=always --graph --date-order --pretty=tformat:%s |
-		test_decode_color | sed "s/ *\$//" >actual &&
-	test_cmp expect.colors actual
+	lib_test_cmp_colored_graph --date-order --format=%s
 '
 
 test_expect_success 'log --raw --graph -m with merge' '
-	git log --raw --graph --oneline -m master | head -n 500 >actual &&
+	git log --raw --graph --oneline -m main | head -n 500 >actual &&
 	grep "initial" actual
 '
 
 test_expect_success 'diff-tree --graph' '
-	git diff-tree --graph master^ | head -n 500 >actual &&
+	git diff-tree --graph main^ | head -n 500 >actual &&
 	grep "one" actual
 '
 
 cat > expect <<\EOF
-*   commit master
+*   commit main
 |\  Merge: A B
 | | Author: A U Thor <author@example.com>
 | |
@@ -568,22 +570,22 @@ cat > expect <<\EOF
 | |
 | |     side-1
 | |
-* | commit master~1
+* | commit main~1
 | | Author: A U Thor <author@example.com>
 | |
 | |     Second
 | |
-* | commit master~2
+* | commit main~2
 | | Author: A U Thor <author@example.com>
 | |
 | |     sixth
 | |
-* | commit master~3
+* | commit main~3
 | | Author: A U Thor <author@example.com>
 | |
 | |     fifth
 | |
-* | commit master~4
+* | commit main~4
 |/  Author: A U Thor <author@example.com>
 |
 |       fourth
@@ -614,19 +616,19 @@ test_expect_success 'log --graph with full output' '
 test_expect_success 'set up more tangled history' '
 	git checkout -b tangle HEAD~6 &&
 	test_commit tangle-a tangle-a a &&
-	git merge master~3 &&
+	git merge main~3 &&
 	git merge side~1 &&
-	git checkout master &&
+	git checkout main &&
 	git merge tangle &&
 	git checkout -b reach &&
 	test_commit reach &&
-	git checkout master &&
+	git checkout main &&
 	git checkout -b octopus-a &&
 	test_commit octopus-a &&
-	git checkout master &&
+	git checkout main &&
 	git checkout -b octopus-b &&
 	test_commit octopus-b &&
-	git checkout master &&
+	git checkout main &&
 	test_commit seventh &&
 	git merge octopus-a octopus-b &&
 	git merge reach
@@ -651,7 +653,7 @@ cat > expect <<\EOF
 |\
 | *   Merge branch 'side' (early part) into tangle
 | |\
-| * \   Merge branch 'master' (early part) into tangle
+| * \   Merge branch 'main' (early part) into tangle
 | |\ \
 | * | | tangle-a
 * | | |   Merge branch 'side'
@@ -667,16 +669,14 @@ cat > expect <<\EOF
 * | | fifth
 * | | fourth
 |/ /
-* | third
+* / third
 |/
 * second
 * initial
 EOF
 
 test_expect_success 'log --graph with merge' '
-	git log --graph --date-order --pretty=tformat:%s |
-		sed "s/ *\$//" >actual &&
-	test_cmp expect actual
+	test_cmp_graph --date-order
 '
 
 test_expect_success 'log.decorate configuration' '
@@ -745,8 +745,24 @@ test_expect_success 'decorate-refs with glob' '
 	octopus-a (octopus-a)
 	reach
 	EOF
+	cat >expect.no-decorate <<-\EOF &&
+	Merge-tag-reach
+	Merge-tags-octopus-a-and-octopus-b
+	seventh
+	octopus-b
+	octopus-a
+	reach
+	EOF
 	git log -n6 --decorate=short --pretty="tformat:%f%d" \
 		--decorate-refs="heads/octopus*" >actual &&
+	test_cmp expect.decorate actual &&
+	git log -n6 --decorate=short --pretty="tformat:%f%d" \
+		--decorate-refs-exclude="heads/octopus*" \
+		--decorate-refs="heads/octopus*" >actual &&
+	test_cmp expect.no-decorate actual &&
+	git -c log.excludeDecoration="heads/octopus*" log \
+		-n6 --decorate=short --pretty="tformat:%f%d" \
+		--decorate-refs="heads/octopus*" >actual &&
 	test_cmp expect.decorate actual
 '
 
@@ -781,7 +797,7 @@ test_expect_success 'multiple decorate-refs' '
 
 test_expect_success 'decorate-refs-exclude with glob' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach (HEAD -> master)
+	Merge-tag-reach (HEAD -> main)
 	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b)
@@ -790,12 +806,15 @@ test_expect_success 'decorate-refs-exclude with glob' '
 	EOF
 	git log -n6 --decorate=short --pretty="tformat:%f%d" \
 		--decorate-refs-exclude="heads/octopus*" >actual &&
+	test_cmp expect.decorate actual &&
+	git -c log.excludeDecoration="heads/octopus*" log \
+		-n6 --decorate=short --pretty="tformat:%f%d" >actual &&
 	test_cmp expect.decorate actual
 '
 
 test_expect_success 'decorate-refs-exclude without globs' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach (HEAD -> master)
+	Merge-tag-reach (HEAD -> main)
 	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b, octopus-b)
@@ -804,12 +823,15 @@ test_expect_success 'decorate-refs-exclude without globs' '
 	EOF
 	git log -n6 --decorate=short --pretty="tformat:%f%d" \
 		--decorate-refs-exclude="tags/reach" >actual &&
+	test_cmp expect.decorate actual &&
+	git -c log.excludeDecoration="tags/reach" log \
+		-n6 --decorate=short --pretty="tformat:%f%d" >actual &&
 	test_cmp expect.decorate actual
 '
 
 test_expect_success 'multiple decorate-refs-exclude' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach (HEAD -> master)
+	Merge-tag-reach (HEAD -> main)
 	Merge-tags-octopus-a-and-octopus-b
 	seventh (tag: seventh)
 	octopus-b (tag: octopus-b)
@@ -819,12 +841,20 @@ test_expect_success 'multiple decorate-refs-exclude' '
 	git log -n6 --decorate=short --pretty="tformat:%f%d" \
 		--decorate-refs-exclude="heads/octopus*" \
 		--decorate-refs-exclude="tags/reach" >actual &&
+	test_cmp expect.decorate actual &&
+	git -c log.excludeDecoration="heads/octopus*" \
+		-c log.excludeDecoration="tags/reach" log \
+		-n6 --decorate=short --pretty="tformat:%f%d" >actual &&
+	test_cmp expect.decorate actual &&
+	git -c log.excludeDecoration="heads/octopus*" log \
+		--decorate-refs-exclude="tags/reach" \
+		-n6 --decorate=short --pretty="tformat:%f%d" >actual &&
 	test_cmp expect.decorate actual
 '
 
 test_expect_success 'decorate-refs and decorate-refs-exclude' '
-	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach (master)
+	cat >expect.no-decorate <<-\EOF &&
+	Merge-tag-reach (main)
 	Merge-tags-octopus-a-and-octopus-b
 	seventh
 	octopus-b
@@ -834,12 +864,27 @@ test_expect_success 'decorate-refs and decorate-refs-exclude' '
 	git log -n6 --decorate=short --pretty="tformat:%f%d" \
 		--decorate-refs="heads/*" \
 		--decorate-refs-exclude="heads/oc*" >actual &&
+	test_cmp expect.no-decorate actual
+'
+
+test_expect_success 'deocrate-refs and log.excludeDecoration' '
+	cat >expect.decorate <<-\EOF &&
+	Merge-tag-reach (main)
+	Merge-tags-octopus-a-and-octopus-b
+	seventh
+	octopus-b (octopus-b)
+	octopus-a (octopus-a)
+	reach (reach)
+	EOF
+	git -c log.excludeDecoration="heads/oc*" log \
+		--decorate-refs="heads/*" \
+		-n6 --decorate=short --pretty="tformat:%f%d" >actual &&
 	test_cmp expect.decorate actual
 '
 
 test_expect_success 'decorate-refs-exclude and simplify-by-decoration' '
 	cat >expect.decorate <<-\EOF &&
-	Merge-tag-reach (HEAD -> master)
+	Merge-tag-reach (HEAD -> main)
 	reach (tag: reach, reach)
 	seventh (tag: seventh)
 	Merge-branch-tangle
@@ -849,6 +894,10 @@ test_expect_success 'decorate-refs-exclude and simplify-by-decoration' '
 	git log -n6 --decorate=short --pretty="tformat:%f%d" \
 		--decorate-refs-exclude="*octopus*" \
 		--simplify-by-decoration >actual &&
+	test_cmp expect.decorate actual &&
+	git -c log.excludeDecoration="*octopus*" log \
+		-n6 --decorate=short --pretty="tformat:%f%d" \
+		--simplify-by-decoration >actual &&
 	test_cmp expect.decorate actual
 '
 
@@ -957,7 +1006,7 @@ cat >expect <<\EOF
 | |
 | | diff --git a/reach.t b/reach.t
 | | new file mode 100644
-| | index 0000000..10c9591
+| | index BEFORE..AFTER
 | | --- /dev/null
 | | +++ b/reach.t
 | | @@ -0,0 +1 @@
@@ -980,7 +1029,7 @@ cat >expect <<\EOF
 | | |
 | | |   diff --git a/octopus-b.t b/octopus-b.t
 | | |   new file mode 100644
-| | |   index 0000000..d5fcad0
+| | |   index BEFORE..AFTER
 | | |   --- /dev/null
 | | |   +++ b/octopus-b.t
 | | |   @@ -0,0 +1 @@
@@ -996,7 +1045,7 @@ cat >expect <<\EOF
 | |
 | |   diff --git a/octopus-a.t b/octopus-a.t
 | |   new file mode 100644
-| |   index 0000000..11ee015
+| |   index BEFORE..AFTER
 | |   --- /dev/null
 | |   +++ b/octopus-a.t
 | |   @@ -0,0 +1 @@
@@ -1012,7 +1061,7 @@ cat >expect <<\EOF
 |
 |   diff --git a/seventh.t b/seventh.t
 |   new file mode 100644
-|   index 0000000..9744ffc
+|   index BEFORE..AFTER
 |   --- /dev/null
 |   +++ b/seventh.t
 |   @@ -0,0 +1 @@
@@ -1034,7 +1083,7 @@ cat >expect <<\EOF
 | |\ \  Merge: MERGE_PARENTS
 | | | | Author: A U Thor <author@example.com>
 | | | |
-| | | |     Merge branch 'master' (early part) into tangle
+| | | |     Merge branch 'main' (early part) into tangle
 | | | |
 | * | | commit COMMIT_OBJECT_NAME
 | | | | Author: A U Thor <author@example.com>
@@ -1046,7 +1095,7 @@ cat >expect <<\EOF
 | | | |
 | | | | diff --git a/tangle-a b/tangle-a
 | | | | new file mode 100644
-| | | | index 0000000..7898192
+| | | | index BEFORE..AFTER
 | | | | --- /dev/null
 | | | | +++ b/tangle-a
 | | | | @@ -0,0 +1 @@
@@ -1068,7 +1117,7 @@ cat >expect <<\EOF
 | | | |
 | | | |   diff --git a/2 b/2
 | | | |   new file mode 100644
-| | | |   index 0000000..0cfbf08
+| | | |   index BEFORE..AFTER
 | | | |   --- /dev/null
 | | | |   +++ b/2
 | | | |   @@ -0,0 +1 @@
@@ -1084,7 +1133,7 @@ cat >expect <<\EOF
 | | | |
 | | | | diff --git a/1 b/1
 | | | | new file mode 100644
-| | | | index 0000000..d00491f
+| | | | index BEFORE..AFTER
 | | | | --- /dev/null
 | | | | +++ b/1
 | | | | @@ -0,0 +1 @@
@@ -1100,7 +1149,7 @@ cat >expect <<\EOF
 | | | |
 | | | | diff --git a/one b/one
 | | | | new file mode 100644
-| | | | index 0000000..9a33383
+| | | | index BEFORE..AFTER
 | | | | --- /dev/null
 | | | | +++ b/one
 | | | | @@ -0,0 +1 @@
@@ -1116,7 +1165,7 @@ cat >expect <<\EOF
 | | |
 | | |   diff --git a/a/two b/a/two
 | | |   deleted file mode 100644
-| | |   index 9245af5..0000000
+| | |   index BEFORE..AFTER
 | | |   --- a/a/two
 | | |   +++ /dev/null
 | | |   @@ -1 +0,0 @@
@@ -1132,7 +1181,7 @@ cat >expect <<\EOF
 | | |
 | | | diff --git a/a/two b/a/two
 | | | new file mode 100644
-| | | index 0000000..9245af5
+| | | index BEFORE..AFTER
 | | | --- /dev/null
 | | | +++ b/a/two
 | | | @@ -0,0 +1 @@
@@ -1148,7 +1197,7 @@ cat >expect <<\EOF
 | |
 | |   diff --git a/ein b/ein
 | |   new file mode 100644
-| |   index 0000000..9d7e69f
+| |   index BEFORE..AFTER
 | |   --- /dev/null
 | |   +++ b/ein
 | |   @@ -0,0 +1 @@
@@ -1165,14 +1214,14 @@ cat >expect <<\EOF
 |
 |   diff --git a/ichi b/ichi
 |   new file mode 100644
-|   index 0000000..9d7e69f
+|   index BEFORE..AFTER
 |   --- /dev/null
 |   +++ b/ichi
 |   @@ -0,0 +1 @@
 |   +ichi
 |   diff --git a/one b/one
 |   deleted file mode 100644
-|   index 9d7e69f..0000000
+|   index BEFORE..AFTER
 |   --- a/one
 |   +++ /dev/null
 |   @@ -1 +0,0 @@
@@ -1187,7 +1236,7 @@ cat >expect <<\EOF
 |  1 file changed, 1 insertion(+), 1 deletion(-)
 |
 | diff --git a/one b/one
-| index 5626abf..9d7e69f 100644
+| index BEFORE..AFTER 100644
 | --- a/one
 | +++ b/one
 | @@ -1 +1 @@
@@ -1204,30 +1253,15 @@ cat >expect <<\EOF
 
   diff --git a/one b/one
   new file mode 100644
-  index 0000000..5626abf
+  index BEFORE..AFTER
   --- /dev/null
   +++ b/one
   @@ -0,0 +1 @@
   +one
 EOF
 
-sanitize_output () {
-	sed -e 's/ *$//' \
-	    -e 's/commit [0-9a-f]*$/commit COMMIT_OBJECT_NAME/' \
-	    -e 's/Merge: [ 0-9a-f]*$/Merge: MERGE_PARENTS/' \
-	    -e 's/Merge tag.*/Merge HEADS DESCRIPTION/' \
-	    -e 's/Merge commit.*/Merge HEADS DESCRIPTION/' \
-	    -e 's/, 0 deletions(-)//' \
-	    -e 's/, 0 insertions(+)//' \
-	    -e 's/ 1 files changed, / 1 file changed, /' \
-	    -e 's/, 1 deletions(-)/, 1 deletion(-)/' \
-	    -e 's/, 1 insertions(+)/, 1 insertion(+)/'
-}
-
 test_expect_success 'log --graph with diff and stats' '
-	git log --no-renames --graph --pretty=short --stat -p >actual &&
-	sanitize_output >actual.sanitized <actual &&
-	test_i18ncmp expect actual.sanitized
+	lib_test_cmp_short_graph --no-renames --stat -p
 '
 
 cat >expect <<\EOF
@@ -1247,7 +1281,7 @@ cat >expect <<\EOF
 *** | |
 *** | | diff --git a/reach.t b/reach.t
 *** | | new file mode 100644
-*** | | index 0000000..10c9591
+*** | | index BEFORE..AFTER
 *** | | --- /dev/null
 *** | | +++ b/reach.t
 *** | | @@ -0,0 +1 @@
@@ -1270,7 +1304,7 @@ cat >expect <<\EOF
 *** | | |
 *** | | |   diff --git a/octopus-b.t b/octopus-b.t
 *** | | |   new file mode 100644
-*** | | |   index 0000000..d5fcad0
+*** | | |   index BEFORE..AFTER
 *** | | |   --- /dev/null
 *** | | |   +++ b/octopus-b.t
 *** | | |   @@ -0,0 +1 @@
@@ -1286,7 +1320,7 @@ cat >expect <<\EOF
 *** | |
 *** | |   diff --git a/octopus-a.t b/octopus-a.t
 *** | |   new file mode 100644
-*** | |   index 0000000..11ee015
+*** | |   index BEFORE..AFTER
 *** | |   --- /dev/null
 *** | |   +++ b/octopus-a.t
 *** | |   @@ -0,0 +1 @@
@@ -1302,7 +1336,7 @@ cat >expect <<\EOF
 *** |
 *** |   diff --git a/seventh.t b/seventh.t
 *** |   new file mode 100644
-*** |   index 0000000..9744ffc
+*** |   index BEFORE..AFTER
 *** |   --- /dev/null
 *** |   +++ b/seventh.t
 *** |   @@ -0,0 +1 @@
@@ -1324,7 +1358,7 @@ cat >expect <<\EOF
 *** | |\ \  Merge: MERGE_PARENTS
 *** | | | | Author: A U Thor <author@example.com>
 *** | | | |
-*** | | | |     Merge branch 'master' (early part) into tangle
+*** | | | |     Merge branch 'main' (early part) into tangle
 *** | | | |
 *** | * | | commit COMMIT_OBJECT_NAME
 *** | | | | Author: A U Thor <author@example.com>
@@ -1336,7 +1370,7 @@ cat >expect <<\EOF
 *** | | | |
 *** | | | | diff --git a/tangle-a b/tangle-a
 *** | | | | new file mode 100644
-*** | | | | index 0000000..7898192
+*** | | | | index BEFORE..AFTER
 *** | | | | --- /dev/null
 *** | | | | +++ b/tangle-a
 *** | | | | @@ -0,0 +1 @@
@@ -1358,7 +1392,7 @@ cat >expect <<\EOF
 *** | | | |
 *** | | | |   diff --git a/2 b/2
 *** | | | |   new file mode 100644
-*** | | | |   index 0000000..0cfbf08
+*** | | | |   index BEFORE..AFTER
 *** | | | |   --- /dev/null
 *** | | | |   +++ b/2
 *** | | | |   @@ -0,0 +1 @@
@@ -1374,7 +1408,7 @@ cat >expect <<\EOF
 *** | | | |
 *** | | | | diff --git a/1 b/1
 *** | | | | new file mode 100644
-*** | | | | index 0000000..d00491f
+*** | | | | index BEFORE..AFTER
 *** | | | | --- /dev/null
 *** | | | | +++ b/1
 *** | | | | @@ -0,0 +1 @@
@@ -1390,7 +1424,7 @@ cat >expect <<\EOF
 *** | | | |
 *** | | | | diff --git a/one b/one
 *** | | | | new file mode 100644
-*** | | | | index 0000000..9a33383
+*** | | | | index BEFORE..AFTER
 *** | | | | --- /dev/null
 *** | | | | +++ b/one
 *** | | | | @@ -0,0 +1 @@
@@ -1406,7 +1440,7 @@ cat >expect <<\EOF
 *** | | |
 *** | | |   diff --git a/a/two b/a/two
 *** | | |   deleted file mode 100644
-*** | | |   index 9245af5..0000000
+*** | | |   index BEFORE..AFTER
 *** | | |   --- a/a/two
 *** | | |   +++ /dev/null
 *** | | |   @@ -1 +0,0 @@
@@ -1422,7 +1456,7 @@ cat >expect <<\EOF
 *** | | |
 *** | | | diff --git a/a/two b/a/two
 *** | | | new file mode 100644
-*** | | | index 0000000..9245af5
+*** | | | index BEFORE..AFTER
 *** | | | --- /dev/null
 *** | | | +++ b/a/two
 *** | | | @@ -0,0 +1 @@
@@ -1438,7 +1472,7 @@ cat >expect <<\EOF
 *** | |
 *** | |   diff --git a/ein b/ein
 *** | |   new file mode 100644
-*** | |   index 0000000..9d7e69f
+*** | |   index BEFORE..AFTER
 *** | |   --- /dev/null
 *** | |   +++ b/ein
 *** | |   @@ -0,0 +1 @@
@@ -1455,14 +1489,14 @@ cat >expect <<\EOF
 *** |
 *** |   diff --git a/ichi b/ichi
 *** |   new file mode 100644
-*** |   index 0000000..9d7e69f
+*** |   index BEFORE..AFTER
 *** |   --- /dev/null
 *** |   +++ b/ichi
 *** |   @@ -0,0 +1 @@
 *** |   +ichi
 *** |   diff --git a/one b/one
 *** |   deleted file mode 100644
-*** |   index 9d7e69f..0000000
+*** |   index BEFORE..AFTER
 *** |   --- a/one
 *** |   +++ /dev/null
 *** |   @@ -1 +0,0 @@
@@ -1477,7 +1511,7 @@ cat >expect <<\EOF
 *** |  1 file changed, 1 insertion(+), 1 deletion(-)
 *** |
 *** | diff --git a/one b/one
-*** | index 5626abf..9d7e69f 100644
+*** | index BEFORE..AFTER 100644
 *** | --- a/one
 *** | +++ b/one
 *** | @@ -1 +1 @@
@@ -1494,7 +1528,7 @@ cat >expect <<\EOF
 ***
 ***   diff --git a/one b/one
 ***   new file mode 100644
-***   index 0000000..5626abf
+***   index BEFORE..AFTER
 ***   --- /dev/null
 ***   +++ b/one
 ***   @@ -0,0 +1 @@
@@ -1502,9 +1536,7 @@ cat >expect <<\EOF
 EOF
 
 test_expect_success 'log --line-prefix="*** " --graph with diff and stats' '
-	git log --line-prefix="*** " --no-renames --graph --pretty=short --stat -p >actual &&
-	sanitize_output >actual.sanitized <actual &&
-	test_i18ncmp expect actual.sanitized
+	lib_test_cmp_short_graph --line-prefix="*** " --no-renames --stat -p
 '
 
 cat >expect <<-\EOF
@@ -1526,9 +1558,7 @@ cat >expect <<-\EOF
 EOF
 
 test_expect_success 'log --graph with --name-status' '
-	git log --graph --format=%s --name-status tangle..reach >actual &&
-	sanitize_output <actual >actual.sanitized &&
-	test_cmp expect actual.sanitized
+	test_cmp_graph --name-status tangle..reach
 '
 
 cat >expect <<-\EOF
@@ -1550,9 +1580,7 @@ cat >expect <<-\EOF
 EOF
 
 test_expect_success 'log --graph with --name-only' '
-	git log --graph --format=%s --name-only tangle..reach >actual &&
-	sanitize_output <actual >actual.sanitized &&
-	test_cmp expect actual.sanitized
+	test_cmp_graph --name-only tangle..reach
 '
 
 test_expect_success 'dotdot is a parent directory' '
@@ -1563,16 +1591,24 @@ test_expect_success 'dotdot is a parent directory' '
 '
 
 test_expect_success GPG 'setup signed branch' '
-	test_when_finished "git reset --hard && git checkout master" &&
-	git checkout -b signed master &&
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b signed main &&
 	echo foo >foo &&
 	git add foo &&
 	git commit -S -m signed_commit
 '
 
+test_expect_success GPG 'setup signed branch with subkey' '
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b signed-subkey main &&
+	echo foo >foo &&
+	git add foo &&
+	git commit -SB7227189 -m signed_commit
+'
+
 test_expect_success GPGSM 'setup signed branch x509' '
-	test_when_finished "git reset --hard && git checkout master" &&
-	git checkout -b signed-x509 master &&
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b signed-x509 main &&
 	echo foo >foo &&
 	git add foo &&
 	test_config gpg.format x509 &&
@@ -1580,6 +1616,18 @@ test_expect_success GPGSM 'setup signed branch x509' '
 	git commit -S -m signed_commit
 '
 
+test_expect_success GPGSM 'log x509 fingerprint' '
+	echo "F8BF62E0693D0694816377099909C779FA23FD65 | " >expect &&
+	git log -n1 --format="%GF | %GP" signed-x509 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success GPGSM 'log OpenPGP fingerprint' '
+	echo "D4BE22311AD3131E5EDA29A461092E85B7227189" > expect &&
+	git log -n1 --format="%GP" signed-subkey >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 &&
@@ -1593,12 +1641,12 @@ test_expect_success GPGSM 'log --graph --show-signature x509' '
 '
 
 test_expect_success GPG 'log --graph --show-signature for merged tag' '
-	test_when_finished "git reset --hard && git checkout master" &&
-	git checkout -b plain master &&
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b plain main &&
 	echo aaa >bar &&
 	git add bar &&
 	git commit -m bar_commit &&
-	git checkout -b tagged master &&
+	git checkout -b tagged main &&
 	echo bbb >baz &&
 	git add baz &&
 	git commit -m baz_commit &&
@@ -1611,15 +1659,95 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
 	grep "^| | gpg: Good signature" actual
 '
 
+test_expect_success GPG 'log --graph --show-signature for merged tag in shallow clone' '
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b plain-shallow main &&
+	echo aaa >bar &&
+	git add bar &&
+	git commit -m bar_commit &&
+	git checkout --detach main &&
+	echo bbb >baz &&
+	git add baz &&
+	git commit -m baz_commit &&
+	git tag -s -m signed_tag_msg signed_tag_shallow &&
+	hash=$(git rev-parse HEAD) &&
+	git checkout plain-shallow &&
+	git merge --no-ff -m msg signed_tag_shallow &&
+	git clone --depth 1 --no-local . shallow &&
+	test_when_finished "rm -rf shallow" &&
+	git -C shallow log --graph --show-signature -n1 plain-shallow >actual &&
+	grep "tag signed_tag_shallow names a non-parent $hash" actual
+'
+
+test_expect_success GPG 'log --graph --show-signature for merged tag with missing key' '
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b plain-nokey main &&
+	echo aaa >bar &&
+	git add bar &&
+	git commit -m bar_commit &&
+	git checkout -b tagged-nokey main &&
+	echo bbb >baz &&
+	git add baz &&
+	git commit -m baz_commit &&
+	git tag -s -m signed_tag_msg signed_tag_nokey &&
+	git checkout plain-nokey &&
+	git merge --no-ff -m msg signed_tag_nokey &&
+	GNUPGHOME=. git log --graph --show-signature -n1 plain-nokey >actual &&
+	grep "^|\\\  merged tag" actual &&
+	grep "^| | gpg: Signature made" actual &&
+	grep -E "^| | gpg: Can'"'"'t check signature: (public key not found|No public key)" actual
+'
+
+test_expect_success GPG 'log --graph --show-signature for merged tag with bad signature' '
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b plain-bad main &&
+	echo aaa >bar &&
+	git add bar &&
+	git commit -m bar_commit &&
+	git checkout -b tagged-bad main &&
+	echo bbb >baz &&
+	git add baz &&
+	git commit -m baz_commit &&
+	git tag -s -m signed_tag_msg signed_tag_bad &&
+	git cat-file tag signed_tag_bad >raw &&
+	sed -e "s/signed_tag_msg/forged/" raw >forged &&
+	git hash-object -w -t tag forged >forged.tag &&
+	git checkout plain-bad &&
+	git merge --no-ff -m msg "$(cat forged.tag)" &&
+	git log --graph --show-signature -n1 plain-bad >actual &&
+	grep "^|\\\  merged tag" actual &&
+	grep "^| | gpg: Signature made" actual &&
+	grep "^| | gpg: BAD signature from" actual
+'
+
+test_expect_success GPG 'log --show-signature for merged tag with GPG failure' '
+	test_when_finished "git reset --hard && git checkout main" &&
+	git checkout -b plain-fail main &&
+	echo aaa >bar &&
+	git add bar &&
+	git commit -m bar_commit &&
+	git checkout -b tagged-fail main &&
+	echo bbb >baz &&
+	git add baz &&
+	git commit -m baz_commit &&
+	git tag -s -m signed_tag_msg signed_tag_fail &&
+	git checkout plain-fail &&
+	git merge --no-ff -m msg signed_tag_fail &&
+	TMPDIR="$(pwd)/bogus" git log --show-signature -n1 plain-fail >actual &&
+	grep "^merged tag" actual &&
+	grep "^No signature" actual &&
+	! grep "^gpg: Signature made" actual
+'
+
 test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
-	test_when_finished "git reset --hard && git checkout master" &&
+	test_when_finished "git reset --hard && git checkout main" &&
 	test_config gpg.format x509 &&
 	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
-	git checkout -b plain-x509 master &&
+	git checkout -b plain-x509 main &&
 	echo aaa >bar &&
 	git add bar &&
 	git commit -m bar_commit &&
-	git checkout -b tagged-x509 master &&
+	git checkout -b tagged-x509 main &&
 	echo bbb >baz &&
 	git add baz &&
 	git commit -m baz_commit &&
@@ -1632,6 +1760,51 @@ test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
 	grep "^| | gpgsm: Good signature" actual
 '
 
+test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 missing key' '
+	test_when_finished "git reset --hard && git checkout main" &&
+	test_config gpg.format x509 &&
+	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+	git checkout -b plain-x509-nokey main &&
+	echo aaa >bar &&
+	git add bar &&
+	git commit -m bar_commit &&
+	git checkout -b tagged-x509-nokey main &&
+	echo bbb >baz &&
+	git add baz &&
+	git commit -m baz_commit &&
+	git tag -s -m signed_tag_msg signed_tag_x509_nokey &&
+	git checkout plain-x509-nokey &&
+	git merge --no-ff -m msg signed_tag_x509_nokey &&
+	GNUPGHOME=. git log --graph --show-signature -n1 plain-x509-nokey >actual &&
+	grep "^|\\\  merged tag" actual &&
+	grep "^| | gpgsm: certificate not found" actual
+'
+
+test_expect_success GPGSM 'log --graph --show-signature for merged tag x509 bad signature' '
+	test_when_finished "git reset --hard && git checkout main" &&
+	test_config gpg.format x509 &&
+	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
+	git checkout -b plain-x509-bad main &&
+	echo aaa >bar &&
+	git add bar &&
+	git commit -m bar_commit &&
+	git checkout -b tagged-x509-bad main &&
+	echo bbb >baz &&
+	git add baz &&
+	git commit -m baz_commit &&
+	git tag -s -m signed_tag_msg signed_tag_x509_bad &&
+	git cat-file tag signed_tag_x509_bad >raw &&
+	sed -e "s/signed_tag_msg/forged/" raw >forged &&
+	git hash-object -w -t tag forged >forged.tag &&
+	git checkout plain-x509-bad &&
+	git merge --no-ff -m msg "$(cat forged.tag)" &&
+	git log --graph --show-signature -n1 plain-x509-bad >actual &&
+	grep "^|\\\  merged tag" actual &&
+	grep "^| | gpgsm: Signature made" actual &&
+	grep "^| | gpgsm: invalid signature" actual
+'
+
+
 test_expect_success GPG '--no-show-signature overrides --show-signature' '
 	git log -1 --show-signature --no-show-signature signed >actual &&
 	! grep "^gpg:" actual
@@ -1661,14 +1834,24 @@ test_expect_success 'log --graph --no-walk is forbidden' '
 	test_must_fail git log --graph --no-walk
 '
 
-test_expect_success 'log diagnoses bogus HEAD' '
+test_expect_success 'log on empty repo fails' '
 	git init empty &&
+	test_when_finished "rm -rf empty" &&
 	test_must_fail git -C empty log 2>stderr &&
-	test_i18ngrep does.not.have.any.commits stderr &&
-	echo 1234abcd >empty/.git/refs/heads/master &&
+	test_i18ngrep does.not.have.any.commits stderr
+'
+
+test_expect_success REFFILES 'log diagnoses bogus HEAD hash' '
+	git init empty &&
+	test_when_finished "rm -rf empty" &&
+	echo 1234abcd >empty/.git/refs/heads/main &&
 	test_must_fail git -C empty log 2>stderr &&
-	test_i18ngrep broken stderr &&
-	echo "ref: refs/heads/invalid.lock" >empty/.git/HEAD &&
+	test_i18ngrep broken stderr
+'
+
+test_expect_success 'log diagnoses bogus HEAD symref' '
+	git init empty &&
+	git --git-dir empty/.git symbolic-ref HEAD refs/heads/invalid.lock &&
 	test_must_fail git -C empty log 2>stderr &&
 	test_i18ngrep broken stderr &&
 	test_must_fail git -C empty log --default totally-bogus 2>stderr &&
@@ -1680,6 +1863,16 @@ test_expect_success 'log does not default to HEAD when rev input is given' '
 	test_must_be_empty actual
 '
 
+test_expect_success 'do not default to HEAD with ignored object on cmdline' '
+	git log --ignore-missing $ZERO_OID >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success 'do not default to HEAD with ignored object on stdin' '
+	echo $ZERO_OID | git log --ignore-missing --stdin >actual &&
+	test_must_be_empty actual
+'
+
 test_expect_success 'set up --source tests' '
 	git checkout --orphan source-a &&
 	test_commit one &&
@@ -1689,10 +1882,10 @@ test_expect_success 'set up --source tests' '
 '
 
 test_expect_success 'log --source paints branch names' '
-	cat >expect <<-\EOF &&
-	09e12a9	source-b three
-	8e393e1	source-a two
-	1ac6c77	source-b one
+	cat >expect <<-EOF &&
+	$(git rev-parse --short :/three)	source-b three
+	$(git rev-parse --short :/two  )	source-a two
+	$(git rev-parse --short :/one  )	source-b one
 	EOF
 	git log --oneline --source source-a source-b >actual &&
 	test_cmp expect actual
@@ -1700,19 +1893,19 @@ test_expect_success 'log --source paints branch names' '
 
 test_expect_success 'log --source paints tag names' '
 	git tag -m tagged source-tag &&
-	cat >expect <<-\EOF &&
-	09e12a9	source-tag three
-	8e393e1	source-a two
-	1ac6c77	source-tag one
+	cat >expect <<-EOF &&
+	$(git rev-parse --short :/three)	source-tag three
+	$(git rev-parse --short :/two  )	source-a two
+	$(git rev-parse --short :/one  )	source-tag one
 	EOF
 	git log --oneline --source source-tag source-a >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'log --source paints symmetric ranges' '
-	cat >expect <<-\EOF &&
-	09e12a9	source-b three
-	8e393e1	source-a two
+	cat >expect <<-EOF &&
+	$(git rev-parse --short :/three)	source-b three
+	$(git rev-parse --short :/two  )	source-a two
 	EOF
 	git log --oneline --source source-a...source-b >actual &&
 	test_cmp expect actual
@@ -1722,6 +1915,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 &&
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 918ada69eb..0b2d21ec55 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -2,30 +2,14 @@
 
 test_description='.mailmap configurations'
 
-. ./test-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
-fuzz_blame () {
-	sed "
-		s/$_x05[0-9a-f][0-9a-f][0-9a-f]/OBJID/g
-		s/$_x05[0-9a-f][0-9a-f]/OBJI/g
-		s/[-0-9]\{10\} [:0-9]\{8\} [-+][0-9]\{4\}/DATE/g
-	" "$@"
-}
-
-test_expect_success setup '
-	cat >contacts <<-\EOF &&
-	A U Thor <author@example.com>
-	nick1 <bugs@company.xx>
-	EOF
+. ./test-lib.sh
 
-	echo one >one &&
-	git add one &&
-	test_tick &&
-	git commit -m initial &&
-	echo two >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "nick1 <bugs@company.xx>" -m second
+test_expect_success 'setup commits and contacts file' '
+	test_commit initial one one &&
+	test_commit --author "nick1 <bugs@company.xx>" --append second one two
 '
 
 test_expect_success 'check-mailmap no arguments' '
@@ -33,183 +17,267 @@ test_expect_success 'check-mailmap no arguments' '
 '
 
 test_expect_success 'check-mailmap arguments' '
-	cat >expect <<-\EOF &&
-	A U Thor <author@example.com>
+	cat >expect <<-EOF &&
+	$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 	nick1 <bugs@company.xx>
 	EOF
 	git check-mailmap \
-		"A U Thor <author@example.com>" \
+		"$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" \
 		"nick1 <bugs@company.xx>" >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'check-mailmap --stdin' '
-	cat >expect <<-\EOF &&
-	A U Thor <author@example.com>
+	cat >expect <<-EOF &&
+	$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 	nick1 <bugs@company.xx>
 	EOF
-	git check-mailmap --stdin <contacts >actual &&
+	git check-mailmap --stdin <expect >actual &&
 	test_cmp expect actual
 '
 
-test_expect_success 'check-mailmap --stdin arguments' '
+test_expect_success 'check-mailmap --stdin arguments: no mapping' '
+	test_when_finished "rm contacts" &&
+	cat >contacts <<-EOF &&
+	$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+	nick1 <bugs@company.xx>
+	EOF
 	cat >expect <<-\EOF &&
 	Internal Guy <bugs@company.xy>
 	EOF
-	cat <contacts >>expect &&
+	cat contacts >>expect &&
+
 	git check-mailmap --stdin "Internal Guy <bugs@company.xy>" \
 		<contacts >actual &&
 	test_cmp expect actual
 '
 
+test_expect_success 'check-mailmap --stdin arguments: mapping' '
+	test_when_finished "rm .mailmap" &&
+	cat >.mailmap <<-EOF &&
+	New Name <$GIT_AUTHOR_EMAIL>
+	EOF
+	cat >stdin <<-EOF &&
+	Old Name <$GIT_AUTHOR_EMAIL>
+	EOF
+
+	cp .mailmap expect &&
+	git check-mailmap --stdin <stdin >actual &&
+	test_cmp expect actual &&
+
+	cat .mailmap >>expect &&
+	git check-mailmap --stdin "Another Old Name <$GIT_AUTHOR_EMAIL>" \
+		<stdin >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'check-mailmap bogus contact' '
 	test_must_fail git check-mailmap bogus
 '
 
-cat >expect <<\EOF
-A U Thor (1):
-      initial
+test_expect_success 'check-mailmap bogus contact --stdin' '
+	test_must_fail git check-mailmap --stdin bogus </dev/null
+'
 
-nick1 (1):
-      second
+test_expect_success 'No mailmap' '
+	cat >expect <<-EOF &&
+	$GIT_AUTHOR_NAME (1):
+	      initial
 
-EOF
+	nick1 (1):
+	      second
 
-test_expect_success 'No mailmap' '
+	EOF
 	git shortlog HEAD >actual &&
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
-Repo Guy (1):
-      initial
+test_expect_success 'setup default .mailmap' '
+	cat >default.map <<-EOF
+	Repo Guy <$GIT_AUTHOR_EMAIL>
+	EOF
+'
+
+test_expect_success 'test default .mailmap' '
+	test_when_finished "rm .mailmap" &&
+	cp default.map .mailmap &&
 
-nick1 (1):
-      second
+	cat >expect <<-\EOF &&
+	Repo Guy (1):
+	      initial
 
-EOF
+	nick1 (1):
+	      second
 
-test_expect_success 'default .mailmap' '
-	echo "Repo Guy <author@example.com>" > .mailmap &&
+	EOF
 	git shortlog HEAD >actual &&
 	test_cmp expect actual
 '
 
-# Using a mailmap file in a subdirectory of the repo here, but
-# could just as well have been a file outside of the repository
-cat >expect <<\EOF
-Internal Guy (1):
-      second
+test_expect_success 'mailmap.file set' '
+	test_when_finished "rm .mailmap" &&
+	cp default.map .mailmap &&
+
+	test_config mailmap.file internal.map &&
+	cat >internal.map <<-\EOF &&
+	Internal Guy <bugs@company.xx>
+	EOF
 
-Repo Guy (1):
-      initial
+	cat >expect <<-\EOF &&
+	Internal Guy (1):
+	      second
 
-EOF
-test_expect_success 'mailmap.file set' '
-	mkdir -p internal_mailmap &&
-	echo "Internal Guy <bugs@company.xx>" > internal_mailmap/.mailmap &&
-	git config mailmap.file internal_mailmap/.mailmap &&
+	Repo Guy (1):
+	      initial
+
+	EOF
 	git shortlog HEAD >actual &&
-	test_cmp expect actual
+	test_cmp expect actual &&
+
+	# The internal_mailmap/.mailmap file is an a subdirectory, but
+	# as shown here it can also be outside the repository
+	test_when_finished "rm -rf sub-repo" &&
+	git clone . sub-repo &&
+	(
+		cd sub-repo &&
+		cp ../.mailmap . &&
+		git config mailmap.file ../internal.map &&
+		git shortlog HEAD >actual &&
+		test_cmp ../expect actual
+	)
 '
 
-cat >expect <<\EOF
-External Guy (1):
-      initial
+test_expect_success 'mailmap.file override' '
+	test_config mailmap.file internal.map &&
+	cat >internal.map <<-EOF &&
+	Internal Guy <bugs@company.xx>
+	External Guy <$GIT_AUTHOR_EMAIL>
+	EOF
+
+	cat >expect <<-\EOF &&
+	External Guy (1):
+	      initial
 
-Internal Guy (1):
-      second
+	Internal Guy (1):
+	      second
 
-EOF
-test_expect_success 'mailmap.file override' '
-	echo "External Guy <author@example.com>" >> internal_mailmap/.mailmap &&
-	git config mailmap.file internal_mailmap/.mailmap &&
+	EOF
 	git shortlog HEAD >actual &&
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
-Repo Guy (1):
-      initial
+test_expect_success 'mailmap.file non-existent' '
+	test_when_finished "rm .mailmap" &&
+	cp default.map .mailmap &&
 
-nick1 (1):
-      second
+	cat >expect <<-\EOF &&
+	Repo Guy (1):
+	      initial
 
-EOF
+	nick1 (1):
+	      second
 
-test_expect_success 'mailmap.file non-existent' '
-	rm internal_mailmap/.mailmap &&
-	rmdir internal_mailmap &&
+	EOF
 	git shortlog HEAD >actual &&
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
-Internal Guy (1):
-      second
+test_expect_success 'name entry after email entry' '
+	test_when_finished "rm .mailmap" &&
+	cp default.map .mailmap &&
+
+	test_config mailmap.file internal.map &&
+	cat >internal.map <<-\EOF &&
+	<bugs@company.xy> <bugs@company.xx>
+	Internal Guy <bugs@company.xx>
+	EOF
+
+	cat >expect <<-\EOF &&
+	Internal Guy (1):
+	      second
 
-Repo Guy (1):
-      initial
+	Repo Guy (1):
+	      initial
 
-EOF
+	EOF
 
-test_expect_success 'name entry after email entry' '
-	mkdir -p internal_mailmap &&
-	echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
-	echo "Internal Guy <bugs@company.xx>" >>internal_mailmap/.mailmap &&
 	git shortlog HEAD >actual &&
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
-Internal Guy (1):
-      second
+test_expect_success 'name entry after email entry, case-insensitive' '
+	test_when_finished "rm .mailmap" &&
+	cp default.map .mailmap &&
+
+	test_config mailmap.file internal.map &&
+	cat >internal.map <<-\EOF &&
+	<bugs@company.xy> <bugs@company.xx>
+	Internal Guy <BUGS@Company.xx>
+	EOF
 
-Repo Guy (1):
-      initial
+	cat >expect <<-\EOF &&
+	Internal Guy (1):
+	      second
 
-EOF
+	Repo Guy (1):
+	      initial
 
-test_expect_success 'name entry after email entry, case-insensitive' '
-	mkdir -p internal_mailmap &&
-	echo "<bugs@company.xy> <bugs@company.xx>" >internal_mailmap/.mailmap &&
-	echo "Internal Guy <BUGS@Company.xx>" >>internal_mailmap/.mailmap &&
+	EOF
+	git shortlog HEAD >actual &&
+	test_cmp expect actual &&
+
+	cat >internal.map <<-\EOF &&
+	NiCk <BuGs@CoMpAnY.Xy> NICK1 <BUGS@COMPANY.XX>
+	EOF
+
+	cat >expect <<-\EOF &&
+	NiCk (1):
+	      second
+
+	Repo Guy (1):
+	      initial
+
+	EOF
 	git shortlog HEAD >actual &&
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
-A U Thor (1):
-      initial
+test_expect_success 'No mailmap files, but configured' '
+	cat >expect <<-EOF &&
+	$GIT_AUTHOR_NAME (1):
+	      initial
 
-nick1 (1):
-      second
+	nick1 (1):
+	      second
 
-EOF
-test_expect_success 'No mailmap files, but configured' '
-	rm -f .mailmap internal_mailmap/.mailmap &&
+	EOF
 	git shortlog HEAD >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'setup mailmap blob tests' '
 	git checkout -b map &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	cat >just-bugs <<-\EOF &&
 	Blob Guy <bugs@company.xx>
 	EOF
-	cat >both <<-\EOF &&
-	Blob Guy <author@example.com>
+	cat >both <<-EOF &&
+	Blob Guy <$GIT_AUTHOR_EMAIL>
 	Blob Guy <bugs@company.xx>
 	EOF
-	printf "Tricky Guy <author@example.com>" >no-newline &&
+	printf "Tricky Guy <$GIT_AUTHOR_EMAIL>" >no-newline &&
 	git add just-bugs both no-newline &&
 	git commit -m "my mailmaps" &&
-	echo "Repo Guy <author@example.com>" >.mailmap &&
-	echo "Internal Guy <author@example.com>" >internal.map
+
+	cat >internal.map <<-EOF
+	Internal Guy <$GIT_AUTHOR_EMAIL>
+	EOF
 '
 
 test_expect_success 'mailmap.blob set' '
+	test_when_finished "rm .mailmap" &&
+	cp default.map .mailmap &&
+
 	cat >expect <<-\EOF &&
 	Blob Guy (1):
 	      second
@@ -223,6 +291,9 @@ test_expect_success 'mailmap.blob set' '
 '
 
 test_expect_success 'mailmap.blob overrides .mailmap' '
+	test_when_finished "rm .mailmap" &&
+	cp default.map .mailmap &&
+
 	cat >expect <<-\EOF &&
 	Blob Guy (2):
 	      initial
@@ -249,7 +320,28 @@ test_expect_success 'mailmap.file overrides mailmap.blob' '
 	test_cmp expect actual
 '
 
+test_expect_success 'mailmap.file can be missing' '
+	test_when_finished "rm .mailmap" &&
+	cp default.map .mailmap &&
+
+	test_config mailmap.file nonexistent &&
+	cat >expect <<-\EOF &&
+	Repo Guy (1):
+	      initial
+
+	nick1 (1):
+	      second
+
+	EOF
+	git shortlog HEAD >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp expect actual
+'
+
 test_expect_success 'mailmap.blob can be missing' '
+	test_when_finished "rm .mailmap" &&
+	cp default.map .mailmap &&
+
 	cat >expect <<-\EOF &&
 	Repo Guy (1):
 	      initial
@@ -258,7 +350,17 @@ test_expect_success 'mailmap.blob can be missing' '
 	      second
 
 	EOF
-	git -c mailmap.blob=map:nonexistent shortlog HEAD >actual &&
+	git -c mailmap.blob=map:nonexistent shortlog HEAD >actual 2>err &&
+	test_must_be_empty err &&
+	test_cmp expect actual
+'
+
+test_expect_success 'mailmap.blob might be the wrong type' '
+	test_when_finished "rm .mailmap" &&
+	cp default.map .mailmap &&
+
+	git -c mailmap.blob=HEAD: shortlog HEAD >actual 2>err &&
+	test_i18ngrep "mailmap is not a blob" err &&
 	test_cmp expect actual
 '
 
@@ -266,12 +368,16 @@ test_expect_success 'mailmap.blob defaults to off in non-bare repo' '
 	git init non-bare &&
 	(
 		cd non-bare &&
-		test_commit one .mailmap "Fake Name <author@example.com>" &&
-		echo "     1	Fake Name" >expect &&
+		test_commit one .mailmap "Fake Name <$GIT_AUTHOR_EMAIL>" &&
+		cat >expect <<-\EOF &&
+		     1	Fake Name
+		EOF
 		git shortlog -ns HEAD >actual &&
 		test_cmp expect actual &&
 		rm .mailmap &&
-		echo "     1	A U Thor" >expect &&
+		cat >expect <<-EOF &&
+		     1	$GIT_AUTHOR_NAME
+		EOF
 		git shortlog -ns HEAD >actual &&
 		test_cmp expect actual
 	)
@@ -281,7 +387,9 @@ test_expect_success 'mailmap.blob defaults to HEAD:.mailmap in bare repo' '
 	git clone --bare non-bare bare &&
 	(
 		cd bare &&
-		echo "     1	Fake Name" >expect &&
+		cat >expect <<-\EOF &&
+		     1	Fake Name
+		EOF
 		git shortlog -ns HEAD >actual &&
 		test_cmp expect actual
 	)
@@ -300,230 +408,559 @@ test_expect_success 'mailmap.blob can handle blobs without trailing newline' '
 	test_cmp expect actual
 '
 
-test_expect_success 'cleanup after mailmap.blob tests' '
-	rm -f .mailmap
-'
-
 test_expect_success 'single-character name' '
-	echo "     1	A <author@example.com>" >expect &&
-	echo "     1	nick1 <bugs@company.xx>" >>expect &&
-	echo "A <author@example.com>" >.mailmap &&
 	test_when_finished "rm .mailmap" &&
+	cat >.mailmap <<-EOF &&
+	A <$GIT_AUTHOR_EMAIL>
+	EOF
+
+	cat >expect <<-EOF &&
+	     1	A <$GIT_AUTHOR_EMAIL>
+	     1	nick1 <bugs@company.xx>
+	EOF
 	git shortlog -es HEAD >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'preserve canonical email case' '
-	echo "     1	A U Thor <AUTHOR@example.com>" >expect &&
-	echo "     1	nick1 <bugs@company.xx>" >>expect &&
-	echo "<AUTHOR@example.com> <author@example.com>" >.mailmap &&
 	test_when_finished "rm .mailmap" &&
+	cat >.mailmap <<-EOF &&
+	<AUTHOR@example.com> <$GIT_AUTHOR_EMAIL>
+	EOF
+
+	cat >expect <<-EOF &&
+	     1	$GIT_AUTHOR_NAME <AUTHOR@example.com>
+	     1	nick1 <bugs@company.xx>
+	EOF
 	git shortlog -es HEAD >actual &&
 	test_cmp expect actual
 '
 
-# Extended mailmap configurations should give us the following output for shortlog
-cat >expect <<\EOF
-A U Thor <author@example.com> (1):
-      initial
+test_expect_success 'gitmailmap(5) example output: setup' '
+	test_create_repo doc &&
+	test_commit -C doc --author "Joe Developer <joe@example.com>" A &&
+	test_commit -C doc --author "Joe R. Developer <joe@example.com>" B &&
+	test_commit -C doc --author "Jane Doe <jane@example.com>" C &&
+	test_commit -C doc --author "Jane Doe <jane@laptop.(none)>" D &&
+	test_commit -C doc --author "Jane D. <jane@desktop.(none)>" E
+'
 
-CTO <cto@company.xx> (1):
-      seventh
+test_expect_success 'gitmailmap(5) example output: example #1' '
+	test_config -C doc mailmap.file ../doc.map &&
+	cat >doc.map <<-\EOF &&
+	Joe R. Developer <joe@example.com>
+	Jane Doe <jane@example.com>
+	Jane Doe <jane@desktop.(none)>
+	EOF
+
+	cat >expect <<-\EOF &&
+	Author Joe Developer <joe@example.com> maps to Joe R. Developer <joe@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author Joe R. Developer <joe@example.com> maps to Joe R. Developer <joe@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author Jane Doe <jane@example.com> maps to Jane Doe <jane@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author Jane Doe <jane@laptop.(none)> maps to Jane Doe <jane@laptop.(none)>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author Jane D <jane@desktop.(none)> maps to Jane Doe <jane@desktop.(none)>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+	EOF
+	git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'gitmailmap(5) example output: example #2' '
+	test_config -C doc mailmap.file ../doc.map &&
+	cat >doc.map <<-\EOF &&
+	Joe R. Developer <joe@example.com>
+	Jane Doe <jane@example.com> <jane@laptop.(none)>
+	Jane Doe <jane@example.com> <jane@desktop.(none)>
+	EOF
+
+	cat >expect <<-\EOF &&
+	Author Joe Developer <joe@example.com> maps to Joe R. Developer <joe@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author Joe R. Developer <joe@example.com> maps to Joe R. Developer <joe@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author Jane Doe <jane@example.com> maps to Jane Doe <jane@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author Jane Doe <jane@laptop.(none)> maps to Jane Doe <jane@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author Jane D <jane@desktop.(none)> maps to Jane Doe <jane@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+	EOF
+	git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'gitmailmap(5) example output: example #3' '
+	test_config -C doc mailmap.file ../doc.map &&
+	cat >>doc.map <<-\EOF &&
+	Joe R. Developer <joe@example.com> Joe <bugs@example.com>
+	Jane Doe <jane@example.com> Jane <bugs@example.com>
+	EOF
 
-Other Author <other@author.xx> (2):
-      third
-      fourth
+	test_commit -C doc --author "Joe <bugs@example.com>" F &&
+	test_commit -C doc --author "Jane <bugs@example.com>" G &&
 
-Santa Claus <santa.claus@northpole.xx> (2):
-      fifth
-      sixth
+	cat >>expect <<-\EOF &&
 
-Some Dude <some@dude.xx> (1):
-      second
+	Author Joe <bugs@example.com> maps to Joe R. Developer <joe@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author Jane <bugs@example.com> maps to Jane Doe <jane@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+	EOF
+	git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+	test_cmp expect actual
+'
 
-EOF
 
 test_expect_success 'Shortlog output (complex mapping)' '
-	echo three >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "nick2 <bugs@company.xx>" -m third &&
-
-	echo four >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "nick2 <nick2@company.xx>" -m fourth &&
-
-	echo five >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "santa <me@company.xx>" -m fifth &&
-
-	echo six >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "claus <me@company.xx>" -m sixth &&
-
-	echo seven >>one &&
-	git add one &&
-	test_tick &&
-	git commit --author "CTO <cto@coompany.xx>" -m seventh &&
-
-	mkdir -p internal_mailmap &&
-	echo "Committed <committer@example.com>" > internal_mailmap/.mailmap &&
-	echo "<cto@company.xx>                       <cto@coompany.xx>" >> internal_mailmap/.mailmap &&
-	echo "Some Dude <some@dude.xx>         nick1 <bugs@company.xx>" >> internal_mailmap/.mailmap &&
-	echo "Other Author <other@author.xx>   nick2 <bugs@company.xx>" >> internal_mailmap/.mailmap &&
-	echo "Other Author <other@author.xx>         <nick2@company.xx>" >> internal_mailmap/.mailmap &&
-	echo "Santa Claus <santa.claus@northpole.xx> <me@company.xx>" >> internal_mailmap/.mailmap &&
-	echo "Santa Claus <santa.claus@northpole.xx> <me@company.xx>" >> internal_mailmap/.mailmap &&
+	test_config mailmap.file complex.map &&
+	cat >complex.map <<-EOF &&
+	Committed <$GIT_COMMITTER_EMAIL>
+	<cto@company.xx> <cto@coompany.xx>
+	Some Dude <some@dude.xx>         nick1 <bugs@company.xx>
+	Other Author <other@author.xx>   nick2 <bugs@company.xx>
+	Other Author <other@author.xx>         <nick2@company.xx>
+	Santa Claus <santa.claus@northpole.xx> <me@company.xx>
+	EOF
+
+	test_commit --author "nick2 <bugs@company.xx>" --append third one three &&
+	test_commit --author "nick2 <nick2@company.xx>" --append fourth one four &&
+	test_commit --author "santa <me@company.xx>" --append fifth one five &&
+	test_commit --author "claus <me@company.xx>" --append sixth one six &&
+	test_commit --author "CTO <cto@coompany.xx>" --append seventh one seven &&
+
+	cat >expect <<-EOF &&
+	$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> (1):
+	      initial
+
+	CTO <cto@company.xx> (1):
+	      seventh
+
+	Other Author <other@author.xx> (2):
+	      third
+	      fourth
+
+	Santa Claus <santa.claus@northpole.xx> (2):
+	      fifth
+	      sixth
+
+	Some Dude <some@dude.xx> (1):
+	      second
+
+	EOF
 
 	git shortlog -e HEAD >actual &&
 	test_cmp expect actual
 
 '
 
-# git log with --pretty format which uses the name and email mailmap placemarkers
-cat >expect <<\EOF
-Author CTO <cto@coompany.xx> maps to CTO <cto@company.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+test_expect_success 'Log output (complex mapping)' '
+	test_config mailmap.file complex.map &&
 
-Author claus <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+	cat >expect <<-EOF &&
+	Author CTO <cto@coompany.xx> maps to CTO <cto@company.xx>
+	Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
-Author santa <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+	Author claus <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
+	Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
-Author nick2 <nick2@company.xx> maps to Other Author <other@author.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+	Author santa <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
+	Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
-Author nick2 <bugs@company.xx> maps to Other Author <other@author.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+	Author nick2 <nick2@company.xx> maps to Other Author <other@author.xx>
+	Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
-Author nick1 <bugs@company.xx> maps to Some Dude <some@dude.xx>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
+	Author nick2 <bugs@company.xx> maps to Other Author <other@author.xx>
+	Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
 
-Author A U Thor <author@example.com> maps to A U Thor <author@example.com>
-Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
-EOF
+	Author nick1 <bugs@company.xx> maps to Some Dude <some@dude.xx>
+	Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
+
+	Author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> maps to $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+	Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL>
+	EOF
 
-test_expect_success 'Log output (complex mapping)' '
 	git log --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
-Author: CTO <cto@company.xx>
-Author: Santa Claus <santa.claus@northpole.xx>
-Author: Santa Claus <santa.claus@northpole.xx>
-Author: Other Author <other@author.xx>
-Author: Other Author <other@author.xx>
-Author: Some Dude <some@dude.xx>
-Author: A U Thor <author@example.com>
-EOF
+test_expect_success 'Log output (local-part email address)' '
+	cat >expect <<-EOF &&
+	Author email cto@coompany.xx has local-part cto
+	Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
 
-test_expect_success 'Log output with --use-mailmap' '
-	git log --use-mailmap | grep Author >actual &&
+	Author email me@company.xx has local-part me
+	Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+	Author email me@company.xx has local-part me
+	Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+	Author email nick2@company.xx has local-part nick2
+	Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+	Author email bugs@company.xx has local-part bugs
+	Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+	Author email bugs@company.xx has local-part bugs
+	Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+
+	Author email author@example.com has local-part author
+	Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME
+	EOF
+
+	git log --pretty=format:"Author email %ae has local-part %al%nCommitter email %ce has local-part %cl%n" >actual &&
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
-Author: CTO <cto@company.xx>
-Author: Santa Claus <santa.claus@northpole.xx>
-Author: Santa Claus <santa.claus@northpole.xx>
-Author: Other Author <other@author.xx>
-Author: Other Author <other@author.xx>
-Author: Some Dude <some@dude.xx>
-Author: A U Thor <author@example.com>
-EOF
+test_expect_success 'Log output with --use-mailmap' '
+	test_config mailmap.file complex.map &&
+
+	cat >expect <<-EOF &&
+	Author: CTO <cto@company.xx>
+	Author: Santa Claus <santa.claus@northpole.xx>
+	Author: Santa Claus <santa.claus@northpole.xx>
+	Author: Other Author <other@author.xx>
+	Author: Other Author <other@author.xx>
+	Author: Some Dude <some@dude.xx>
+	Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+	EOF
+
+	git log --use-mailmap >log &&
+	grep Author log >actual &&
+	test_cmp expect actual
+'
 
 test_expect_success 'Log output with log.mailmap' '
-	git -c log.mailmap=True log | grep Author >actual &&
+	test_config mailmap.file complex.map &&
+
+	cat >expect <<-EOF &&
+	Author: CTO <cto@company.xx>
+	Author: Santa Claus <santa.claus@northpole.xx>
+	Author: Santa Claus <santa.claus@northpole.xx>
+	Author: Other Author <other@author.xx>
+	Author: Other Author <other@author.xx>
+	Author: Some Dude <some@dude.xx>
+	Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+	EOF
+
+	git -c log.mailmap=True log >log &&
+	grep Author log >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'log.mailmap=false disables mailmap' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	Author: CTO <cto@coompany.xx>
 	Author: claus <me@company.xx>
 	Author: santa <me@company.xx>
 	Author: nick2 <nick2@company.xx>
 	Author: nick2 <bugs@company.xx>
 	Author: nick1 <bugs@company.xx>
-	Author: A U Thor <author@example.com>
+	Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 	EOF
-	git -c log.mailmap=False log | grep Author > actual &&
+	git -c log.mailmap=false log >log &&
+	grep Author log >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success '--no-use-mailmap disables mailmap' '
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	Author: CTO <cto@coompany.xx>
 	Author: claus <me@company.xx>
 	Author: santa <me@company.xx>
 	Author: nick2 <nick2@company.xx>
 	Author: nick2 <bugs@company.xx>
 	Author: nick1 <bugs@company.xx>
-	Author: A U Thor <author@example.com>
+	Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
 	EOF
-	git log --no-use-mailmap | grep Author > actual &&
+	git log --no-use-mailmap >log &&
+	grep Author log >actual &&
 	test_cmp expect actual
 '
 
-cat >expect <<\EOF
-Author: Santa Claus <santa.claus@northpole.xx>
-Author: Santa Claus <santa.claus@northpole.xx>
-EOF
-
 test_expect_success 'Grep author with --use-mailmap' '
-	git log --use-mailmap --author Santa | grep Author >actual &&
+	test_config mailmap.file complex.map &&
+
+	cat >expect <<-\EOF &&
+	Author: Santa Claus <santa.claus@northpole.xx>
+	Author: Santa Claus <santa.claus@northpole.xx>
+	EOF
+	git log --use-mailmap --author Santa >log &&
+	grep Author log >actual &&
 	test_cmp expect actual
 '
-cat >expect <<\EOF
-Author: Santa Claus <santa.claus@northpole.xx>
-Author: Santa Claus <santa.claus@northpole.xx>
-EOF
 
 test_expect_success 'Grep author with log.mailmap' '
-	git -c log.mailmap=True log --author Santa | grep Author >actual &&
+	test_config mailmap.file complex.map &&
+
+	cat >expect <<-\EOF &&
+	Author: Santa Claus <santa.claus@northpole.xx>
+	Author: Santa Claus <santa.claus@northpole.xx>
+	EOF
+
+	git -c log.mailmap=True log --author Santa >log &&
+	grep Author log >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'log.mailmap is true by default these days' '
-	git log --author Santa | grep Author >actual &&
+	test_config mailmap.file complex.map &&
+	git log --author Santa >log &&
+	grep Author log >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'Only grep replaced author with --use-mailmap' '
+	test_config mailmap.file complex.map &&
 	git log --use-mailmap --author "<cto@coompany.xx>" >actual &&
 	test_must_be_empty actual
 '
 
-# git blame
-cat >expect <<\EOF
-^OBJI (A U Thor     DATE 1) one
-OBJID (Some Dude    DATE 2) two
-OBJID (Other Author DATE 3) three
-OBJID (Other Author DATE 4) four
-OBJID (Santa Claus  DATE 5) five
-OBJID (Santa Claus  DATE 6) six
-OBJID (CTO          DATE 7) seven
-EOF
-test_expect_success 'Blame output (complex mapping)' '
-	git blame one >actual &&
-	fuzz_blame actual >actual.fuzz &&
+test_expect_success 'Blame --porcelain output (complex mapping)' '
+	test_config mailmap.file complex.map &&
+
+	cat >expect <<-EOF &&
+	1 1 1
+	A U Thor
+	2 2 1
+	Some Dude
+	3 3 1
+	Other Author
+	4 4 1
+	Other Author
+	5 5 1
+	Santa Claus
+	6 6 1
+	Santa Claus
+	7 7 1
+	CTO
+	EOF
+
+	git blame --porcelain one >actual.blame &&
+
+	NUM="[0-9][0-9]*" &&
+	sed -n <actual.blame >actual.fuzz \
+		-e "s/^author //p" \
+		-e "s/^$OID_REGEX \\($NUM $NUM $NUM\\)$/\\1/p"  &&
 	test_cmp expect actual.fuzz
 '
 
-cat >expect <<\EOF
-Some Dude <some@dude.xx>
-EOF
+test_expect_success 'Blame output (complex mapping)' '
+	git -c mailmap.file=complex.map blame one >a &&
+	git blame one >b &&
+	test_file_not_empty a &&
+	! cmp a b
+'
 
 test_expect_success 'commit --author honors mailmap' '
+	test_config mailmap.file complex.map &&
+
+	cat >expect <<-\EOF &&
+	Some Dude <some@dude.xx>
+	EOF
+
 	test_must_fail git commit --author "nick" --allow-empty -meight &&
 	git commit --author "Some Dude" --allow-empty -meight &&
 	git show --pretty=format:"%an <%ae>%n" >actual &&
 	test_cmp expect actual
 '
 
+test_expect_success 'comment syntax: setup' '
+	test_create_repo comm &&
+	test_commit -C comm --author "A <a@example.com>" A &&
+	test_commit -C comm --author "B <b@example.com>" B &&
+	test_commit -C comm --author "C <#@example.com>" C &&
+	test_commit -C comm --author "D <d@e#ample.com>" D &&
+
+	test_config -C comm mailmap.file ../doc.map &&
+	cat >>doc.map <<-\EOF &&
+	# Ah <a@example.com>
+
+	; Bee <b@example.com>
+	Cee <cee@example.com> <#@example.com>
+	Dee <dee@example.com> <d@e#ample.com>
+	EOF
+
+	cat >expect <<-\EOF &&
+	Author A <a@example.com> maps to A <a@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author B <b@example.com> maps to ; Bee <b@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author C <#@example.com> maps to Cee <cee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author D <d@e#ample.com> maps to Dee <dee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+	EOF
+	git -C comm log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'whitespace syntax: setup' '
+	test_create_repo space &&
+	test_commit -C space --author "A <a@example.com>" A &&
+	test_commit -C space --author "B <b@example.com>" B &&
+	test_commit -C space --author " C <c@example.com>" C &&
+	test_commit -C space --author " D  <d@example.com>" D &&
+	test_commit -C space --author "E E <e@example.com>" E &&
+	test_commit -C space --author "F  F <f@example.com>" F &&
+	test_commit -C space --author "G   G <g@example.com>" G &&
+	test_commit -C space --author "H   H <h@example.com>" H &&
+
+	test_config -C space mailmap.file ../space.map &&
+	cat >>space.map <<-\EOF &&
+	Ah <ah@example.com> < a@example.com >
+	Bee <bee@example.com  > <  b@example.com  >
+	Cee <cee@example.com> C <c@example.com>
+	dee <dee@example.com>  D  <d@example.com>
+	eee <eee@example.com> E E <e@example.com>
+	eff <eff@example.com> F  F <f@example.com>
+	gee <gee@example.com> G   G <g@example.com>
+	aitch <aitch@example.com> H  H <h@example.com>
+	EOF
+
+	cat >expect <<-\EOF &&
+	Author A <a@example.com> maps to A <a@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author B <b@example.com> maps to B <b@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author C <c@example.com> maps to Cee <cee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author D <d@example.com> maps to dee <dee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author E E <e@example.com> maps to eee <eee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author F  F <f@example.com> maps to eff <eff@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author G   G <g@example.com> maps to gee <gee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author H   H <h@example.com> maps to H   H <h@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+	EOF
+	git -C space log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'empty syntax: setup' '
+	test_create_repo empty &&
+	test_commit -C empty --author "A <>" A &&
+	test_commit -C empty --author "B <b@example.com>" B &&
+	test_commit -C empty --author "C <c@example.com>" C &&
+
+	test_config -C empty mailmap.file ../empty.map &&
+	cat >>empty.map <<-\EOF &&
+	Ah <ah@example.com> <>
+	Bee <bee@example.com> <>
+	Cee <> <c@example.com>
+	EOF
+
+	cat >expect <<-\EOF &&
+	Author A <> maps to Bee <bee@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author B <b@example.com> maps to B <b@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+
+	Author C <c@example.com> maps to C <c@example.com>
+	Committer C O Mitter <committer@example.com> maps to C O Mitter <committer@example.com>
+	EOF
+	git -C empty log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'set up mailmap location tests' '
+	git init --bare loc-bare &&
+	git --git-dir=loc-bare --work-tree=. commit \
+		--allow-empty -m foo --author="Orig <orig@example.com>" &&
+	echo "New <new@example.com> <orig@example.com>" >loc-bare/.mailmap
+'
+
+test_expect_success 'bare repo with --work-tree finds mailmap at top-level' '
+	git -C loc-bare --work-tree=. log -1 --format=%aE >actual &&
+	echo new@example.com >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'bare repo does not look in current directory' '
+	git -C loc-bare log -1 --format=%aE >actual &&
+	echo orig@example.com >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'non-git shortlog respects mailmap in current dir' '
+	git --git-dir=loc-bare log -1 >input &&
+	nongit cp "$TRASH_DIRECTORY/loc-bare/.mailmap" . &&
+	nongit git shortlog -s <input >actual &&
+	echo "     1	New" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'shortlog on stdin respects mailmap from repo' '
+	cp loc-bare/.mailmap . &&
+	git shortlog -s <input >actual &&
+	echo "     1	New" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'find top-level mailmap from subdir' '
+	git clone loc-bare loc-wt &&
+	cp loc-bare/.mailmap loc-wt &&
+	mkdir loc-wt/subdir &&
+	git -C loc-wt/subdir log -1 --format=%aE >actual &&
+	echo new@example.com >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success SYMLINKS 'set up symlink tests' '
+	git commit --allow-empty -m foo --author="Orig <orig@example.com>" &&
+	echo "New <new@example.com> <orig@example.com>" >map &&
+	rm -f .mailmap
+'
+
+test_expect_success SYMLINKS 'symlinks respected in mailmap.file' '
+	test_when_finished "rm symlink" &&
+	ln -s map symlink &&
+	git -c mailmap.file="$(pwd)/symlink" log -1 --format=%aE >actual &&
+	echo "new@example.com" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success SYMLINKS 'symlinks respected in non-repo shortlog' '
+	git log -1 >input &&
+	test_when_finished "nongit rm .mailmap" &&
+	nongit ln -sf "$TRASH_DIRECTORY/map" .mailmap &&
+	nongit git shortlog -s <input >actual &&
+	echo "     1	New" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success SYMLINKS 'symlinks not respected in-tree' '
+	test_when_finished "rm .mailmap" &&
+	ln -s map .mailmap &&
+	git log -1 --format=%aE >actual &&
+	echo "orig@example.com" >expect &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t4204-patch-id.sh b/t/t4204-patch-id.sh
index 0288c17ec6..f120857c20 100755
--- a/t/t4204-patch-id.sh
+++ b/t/t4204-patch-id.sh
@@ -2,6 +2,9 @@
 
 test_description='git patch-id'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -13,9 +16,9 @@ test_expect_success 'setup' '
 	test_write_lines $as b >foo &&
 	test_write_lines $as b >bar &&
 	git commit -a -m first &&
-	git checkout -b same master &&
+	git checkout -b same main &&
 	git commit --amend -m same-msg &&
-	git checkout -b notsame master &&
+	git checkout -b notsame main &&
 	echo c >foo &&
 	echo c >bar &&
 	git commit --amend -a -m notsame-msg &&
@@ -25,7 +28,7 @@ test_expect_success 'setup' '
 
 test_expect_success 'patch-id output is well-formed' '
 	git log -p -1 | git patch-id >output &&
-	grep "^[a-f0-9]\{40\} $(git rev-parse HEAD)$" output
+	grep "^$OID_REGEX $(git rev-parse HEAD)$" output
 '
 
 #calculate patch id. Make sure output is not empty.
@@ -46,31 +49,31 @@ get_patch_id () {
 }
 
 test_expect_success 'patch-id detects equality' '
-	get_patch_id master &&
+	get_patch_id main &&
 	get_patch_id same &&
-	test_cmp patch-id_master patch-id_same
+	test_cmp patch-id_main patch-id_same
 '
 
 test_expect_success 'patch-id detects inequality' '
-	get_patch_id master &&
+	get_patch_id main &&
 	get_patch_id notsame &&
-	! test_cmp patch-id_master patch-id_notsame
+	! test_cmp patch-id_main patch-id_notsame
 '
 
 test_expect_success 'patch-id supports git-format-patch output' '
-	get_patch_id master &&
+	get_patch_id main &&
 	git checkout same &&
 	git format-patch -1 --stdout | calc_patch_id same &&
-	test_cmp patch-id_master patch-id_same &&
+	test_cmp patch-id_main patch-id_same &&
 	set $(git format-patch -1 --stdout | git patch-id) &&
 	test "$2" = $(git rev-parse HEAD)
 '
 
 test_expect_success 'whitespace is irrelevant in footer' '
-	get_patch_id master &&
+	get_patch_id main &&
 	git checkout same &&
 	git format-patch -1 --stdout | sed "s/ \$//" | calc_patch_id same &&
-	test_cmp patch-id_master patch-id_same
+	test_cmp patch-id_main patch-id_same
 '
 
 cmp_patch_id () {
@@ -88,7 +91,7 @@ test_patch_id_file_order () {
 	shift
 	name="order-${1}-$relevant"
 	shift
-	get_top_diff "master" | calc_patch_id "$name" "$@" &&
+	get_top_diff "main" | calc_patch_id "$name" "$@" &&
 	git checkout same &&
 	git format-patch -1 --stdout -O foo-then-bar |
 		calc_patch_id "ordered-$name" "$@" &&
@@ -137,10 +140,10 @@ test_expect_success '--stable overrides patchid.stable = false' '
 '
 
 test_expect_success 'patch-id supports git-format-patch MIME output' '
-	get_patch_id master &&
+	get_patch_id main &&
 	git checkout same &&
 	git format-patch -1 --attach --stdout | calc_patch_id same &&
-	test_cmp patch-id_master patch-id_same
+	test_cmp patch-id_main patch-id_same
 '
 
 test_expect_success 'patch-id respects config from subdir' '
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index f42a69faa2..5865daa8f8 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -123,10 +123,10 @@ test_expect_success 'NUL separation with --stat' '
 	stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
 	printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n" >expected &&
 	git log -z --stat --pretty="format:%s" >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
-test_expect_failure C_LOCALE_OUTPUT 'NUL termination with --stat' '
+test_expect_failure 'NUL termination with --stat' '
 	stat0_part=$(git diff --stat HEAD^ HEAD) &&
 	stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
 	printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n0" >expected &&
@@ -134,6 +134,36 @@ test_expect_failure C_LOCALE_OUTPUT 'NUL termination with --stat' '
 	test_cmp expected actual
 '
 
+for p in short medium full fuller email raw
+do
+	test_expect_success "NUL termination with --reflog --pretty=$p" '
+		revs="$(git rev-list --reflog)" &&
+		for r in $revs
+		do
+			git show -s "$r" --pretty="$p" &&
+			printf "\0" || return 1
+		done >expect &&
+		{
+			git log -z --reflog --pretty="$p" &&
+			printf "\0"
+		} >actual &&
+		test_cmp expect actual
+	'
+done
+
+test_expect_success 'NUL termination with --reflog --pretty=oneline' '
+	revs="$(git rev-list --reflog)" &&
+	for r in $revs
+	do
+		git show -s --pretty=oneline "$r" >raw &&
+		cat raw | lf_to_nul || exit 1
+	done >expect &&
+	# the trailing NUL is already produced so we do not need to
+	# output another one
+	git log -z --pretty=oneline --reflog >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'setup more commits' '
 	test_commit "message one" one one message-one &&
 	test_commit "message two" two two message-two &&
@@ -495,14 +525,25 @@ test_expect_success 'strbuf_utf8_replace() not producing NUL' '
 	! grep Q actual
 '
 
-# ISO strict date format
-test_expect_success 'ISO and ISO-strict date formats display the same values' '
-	git log --format=%ai%n%ci |
-	sed -e "s/ /T/; s/ //; s/..\$/:&/" >expected &&
+# --date=[XXX] and corresponding %a[X] %c[X] format equivalency
+test_expect_success '--date=iso-strict %ad%cd is the same as %aI%cI' '
+	git log --format=%ad%n%cd --date=iso-strict >expected &&
 	git log --format=%aI%n%cI >actual &&
 	test_cmp expected actual
 '
 
+test_expect_success '--date=short %ad%cd is the same as %as%cs' '
+	git log --format=%ad%n%cd --date=short >expected &&
+	git log --format=%as%n%cs >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success '--date=human %ad%cd is the same as %ah%ch' '
+	git log --format=%ad%n%cd --date=human >expected &&
+	git log --format=%ah%n%ch >actual &&
+	test_cmp expected actual
+'
+
 # get new digests (with no abbreviations)
 test_expect_success 'set up log decoration tests' '
 	head1=$(git rev-parse --verify HEAD~0) &&
@@ -569,6 +610,12 @@ test_expect_success 'pretty format %(trailers) shows trailers' '
 	test_cmp expect actual
 '
 
+test_expect_success 'pretty format %(trailers:) enables no options' '
+	git log --no-walk --pretty="%(trailers:)" >actual &&
+	# "expect" the same as the test above
+	test_cmp expect actual
+'
+
 test_expect_success '%(trailers:only) shows only "key: value" trailers' '
 	git log --no-walk --pretty="%(trailers:only)" >actual &&
 	{
@@ -640,7 +687,7 @@ test_expect_success 'pretty format %(trailers:key=foo) multiple keys' '
 	test_cmp expect actual
 '
 
-test_expect_success '%(trailers:key=nonexistant) becomes empty' '
+test_expect_success '%(trailers:key=nonexistent) becomes empty' '
 	git log --no-walk --pretty="x%(trailers:key=Nacked-by)x" >actual &&
 	echo "xx" >expect &&
 	test_cmp expect actual
@@ -673,19 +720,101 @@ test_expect_success '%(trailers:key) without value is error' '
 	test_cmp expect actual
 '
 
+test_expect_success '%(trailers:keyonly) shows only keys' '
+	git log --no-walk --pretty="format:%(trailers:keyonly)" >actual &&
+	test_write_lines \
+		"Signed-off-by" \
+		"Acked-by" \
+		"[ v2 updated patch description ]" \
+		"Signed-off-by" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(trailers:key=foo,keyonly) shows only key' '
+	git log --no-walk --pretty="format:%(trailers:key=Acked-by,keyonly)" >actual &&
+	echo "Acked-by" >expect &&
+	test_cmp expect actual
+'
+
 test_expect_success '%(trailers:key=foo,valueonly) shows only value' '
 	git log --no-walk --pretty="format:%(trailers:key=Acked-by,valueonly)" >actual &&
 	echo "A U Thor <author@example.com>" >expect &&
 	test_cmp expect actual
 '
 
+test_expect_success '%(trailers:valueonly) shows only values' '
+	git log --no-walk --pretty="format:%(trailers:valueonly)" >actual &&
+	test_write_lines \
+		"A U Thor <author@example.com>" \
+		"A U Thor <author@example.com>" \
+		"[ v2 updated patch description ]" \
+		"A U Thor" \
+		"  <author@example.com>" >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(trailers:key=foo,keyonly,valueonly) shows nothing' '
+	git log --no-walk --pretty="format:%(trailers:key=Acked-by,keyonly,valueonly)" >actual &&
+	echo >expect &&
+	test_cmp expect actual
+'
+
 test_expect_success 'pretty format %(trailers:separator) changes separator' '
+	git log --no-walk --pretty=format:"X%(trailers:separator=%x00)X" >actual &&
+	(
+		printf "XSigned-off-by: A U Thor <author@example.com>\0" &&
+		printf "Acked-by: A U Thor <author@example.com>\0" &&
+		printf "[ v2 updated patch description ]\0" &&
+		printf "Signed-off-by: A U Thor\n  <author@example.com>X"
+	) >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:separator=X,unfold) changes separator' '
 	git log --no-walk --pretty=format:"X%(trailers:separator=%x00,unfold)X" >actual &&
-	printf "XSigned-off-by: A U Thor <author@example.com>\0Acked-by: A U Thor <author@example.com>\0[ v2 updated patch description ]\0Signed-off-by: A U Thor <author@example.com>X" >expect &&
+	(
+		printf "XSigned-off-by: A U Thor <author@example.com>\0" &&
+		printf "Acked-by: A U Thor <author@example.com>\0" &&
+		printf "[ v2 updated patch description ]\0" &&
+		printf "Signed-off-by: A U Thor <author@example.com>X"
+	) >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:key_value_separator) changes key-value separator' '
+	git log --no-walk --pretty=format:"X%(trailers:key_value_separator=%x00)X" >actual &&
+	(
+		printf "XSigned-off-by\0A U Thor <author@example.com>\n" &&
+		printf "Acked-by\0A U Thor <author@example.com>\n" &&
+		printf "[ v2 updated patch description ]\n" &&
+		printf "Signed-off-by\0A U Thor\n  <author@example.com>\nX"
+	) >expect &&
 	test_cmp expect actual
 '
 
-test_expect_success 'pretty format %(trailers) combining separator/key/valueonly' '
+test_expect_success 'pretty format %(trailers:key_value_separator,unfold) changes key-value separator' '
+	git log --no-walk --pretty=format:"X%(trailers:key_value_separator=%x00,unfold)X" >actual &&
+	(
+		printf "XSigned-off-by\0A U Thor <author@example.com>\n" &&
+		printf "Acked-by\0A U Thor <author@example.com>\n" &&
+		printf "[ v2 updated patch description ]\n" &&
+		printf "Signed-off-by\0A U Thor <author@example.com>\nX"
+	) >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers:separator,key_value_separator) changes both separators' '
+	git log --no-walk --pretty=format:"%(trailers:separator=%x00,key_value_separator=%x00%x00,unfold)" >actual &&
+	(
+		printf "Signed-off-by\0\0A U Thor <author@example.com>\0" &&
+		printf "Acked-by\0\0A U Thor <author@example.com>\0" &&
+		printf "[ v2 updated patch description ]\0" &&
+		printf "Signed-off-by\0\0A U Thor <author@example.com>"
+	) >expect &&
+	test_cmp expect actual
+'
+
+test_expect_success 'pretty format %(trailers) combining separator/key/keyonly/valueonly' '
 	git commit --allow-empty -F - <<-\EOF &&
 	Important fix
 
@@ -712,6 +841,13 @@ test_expect_success 'pretty format %(trailers) combining separator/key/valueonly
 		"Does not close any tickets" \
 		"Another fix #567, #890" \
 		"Important fix #1234" >expect &&
+	test_cmp expect actual &&
+
+	git log --pretty="%s% (trailers:separator=%x2c%x20,key=Closes,keyonly)" HEAD~3.. >actual &&
+	test_write_lines \
+		"Does not close any tickets" \
+		"Another fix Closes, Closes" \
+		"Important fix Closes" >expect &&
 	test_cmp expect actual
 '
 
@@ -788,4 +924,82 @@ test_expect_success '%S in git log --format works with other placeholders (part
 	test_cmp expect actual
 '
 
+test_expect_success 'log --pretty=reference' '
+	git log --pretty="tformat:%h (%s, %as)" >expect &&
+	git log --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference with log.date is overridden by short date' '
+	git log --pretty="tformat:%h (%s, %as)" >expect &&
+	test_config log.date rfc &&
+	git log --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference with explicit date overrides short date' '
+	git log --date=rfc --pretty="tformat:%h (%s, %ad)" >expect &&
+	git log --date=rfc --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference is never unabbreviated' '
+	git log --pretty="tformat:%h (%s, %as)" >expect &&
+	git log --no-abbrev-commit --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference is never decorated' '
+	git log --pretty="tformat:%h (%s, %as)" >expect &&
+	git log --decorate=short --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference does not output reflog info' '
+	git log --walk-reflogs --pretty="tformat:%h (%s, %as)" >expect &&
+	git log --walk-reflogs --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'log --pretty=reference is colored appropriately' '
+	git log --color=always --pretty="tformat:%C(auto)%h (%s, %as)" >expect &&
+	git log --color=always --pretty=reference >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(describe) vs git describe' '
+	git log --format="%H" | while read hash
+	do
+		if desc=$(git describe $hash)
+		then
+			: >expect-contains-good
+		else
+			: >expect-contains-bad
+		fi &&
+		echo "$hash $desc"
+	done >expect &&
+	test_path_exists expect-contains-good &&
+	test_path_exists expect-contains-bad &&
+
+	git log --format="%H %(describe)" >actual 2>err &&
+	test_cmp expect actual &&
+	test_must_be_empty err
+'
+
+test_expect_success '%(describe:match=...) vs git describe --match ...' '
+	test_when_finished "git tag -d tag-match" &&
+	git tag -a -m tagged tag-match &&
+	git describe --match "*-match" >expect &&
+	git log -1 --format="%(describe:match=*-match)" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '%(describe:exclude=...) vs git describe --exclude ...' '
+	test_when_finished "git tag -d tag-exclude" &&
+	git tag -a -m tagged tag-exclude &&
+	git describe --exclude "*-exclude" >expect &&
+	git log -1 --format="%(describe:exclude=*-exclude)" >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t4206-log-follow-harder-copies.sh b/t/t4206-log-follow-harder-copies.sh
index ad29e65fcb..4871a5dc92 100755
--- a/t/t4206-log-follow-harder-copies.sh
+++ b/t/t4206-log-follow-harder-copies.sh
@@ -7,7 +7,7 @@ test_description='Test --follow should always find copies hard in git log.
 
 '
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh
+. "$TEST_DIRECTORY"/lib-diff.sh
 
 echo >path0 'Line 1
 Line 2
diff --git a/t/t4207-log-decoration-colors.sh b/t/t4207-log-decoration-colors.sh
index 60f040cab8..b870942498 100755
--- a/t/t4207-log-decoration-colors.sh
+++ b/t/t4207-log-decoration-colors.sh
@@ -5,6 +5,9 @@
 
 test_description='Test for "git log --decorate" colors'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -40,13 +43,13 @@ test_expect_success setup '
 
 cat >expected <<EOF
 ${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_HEAD}HEAD ->\
- ${c_reset}${c_branch}master${c_reset}${c_commit},\
+ ${c_reset}${c_branch}main${c_reset}${c_commit},\
  ${c_reset}${c_tag}tag: v1.0${c_reset}${c_commit},\
  ${c_reset}${c_tag}tag: B${c_reset}${c_commit})${c_reset} B
 ${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_tag}tag: A1${c_reset}${c_commit},\
- ${c_reset}${c_remoteBranch}other/master${c_reset}${c_commit})${c_reset} A1
+ ${c_reset}${c_remoteBranch}other/main${c_reset}${c_commit})${c_reset} A1
 ${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_stash}refs/stash${c_reset}${c_commit})${c_reset}\
- On master: Changes to A.t
+ On main: Changes to A.t
 ${c_commit}COMMIT_ID${c_reset}${c_commit} (${c_reset}${c_tag}tag: A${c_reset}${c_commit})${c_reset} A
 EOF
 
diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index 4c8f3b8e1b..7f0c1dcc0f 100755
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -2,6 +2,9 @@
 
 test_description='magic pathspec tests using git-log'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -26,15 +29,10 @@ test_expect_success '"git log :/a -- " should not be ambiguous' '
 '
 
 test_expect_success '"git log :/detached -- " should find a commit only in HEAD' '
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	git checkout --detach &&
-	# Must manually call `test_tick` instead of using `test_commit`,
-	# because the latter additionally creates a tag, which would make
-	# the commit reachable not only via HEAD.
-	test_tick &&
-	git commit --allow-empty -m detached &&
-	test_tick &&
-	git commit --allow-empty -m something-else &&
+	test_commit --no-tag detached &&
+	test_commit --no-tag something-else &&
 	git log :/detached --
 '
 
@@ -55,6 +53,10 @@ test_expect_success '"git log -- :/a" should not be ambiguous' '
 	git log -- :/a
 '
 
+test_expect_success '"git log :/any/path/" should not segfault' '
+	test_must_fail git log :/any/path/
+'
+
 # This differs from the ":/a" check above in that :/in looks like a pathspec,
 # but doesn't match an actual file.
 test_expect_success '"git log :/in" should not be ambiguous' '
@@ -115,7 +117,7 @@ test_expect_success 'command line pathspec parsing for "git log"' '
 	git checkout HEAD^ &&
 	echo 2 >a &&
 	git commit -a -m "update a to 2" &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	git add a &&
 	git log --merge -- a
 '
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 5d06f5f45e..75795d0b49 100755
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -55,6 +55,43 @@ test_expect_success setup '
 	git rev-parse --verify HEAD >expect_second
 '
 
+test_expect_success 'usage' '
+	test_expect_code 129 git log -S 2>err &&
+	test_i18ngrep "switch.*requires a value" err &&
+
+	test_expect_code 129 git log -G 2>err &&
+	test_i18ngrep "switch.*requires a value" err &&
+
+	test_expect_code 128 git log -Gregex -Sstring 2>err &&
+	grep "mutually exclusive" err &&
+
+	test_expect_code 128 git log -Gregex --find-object=HEAD 2>err &&
+	grep "mutually exclusive" err &&
+
+	test_expect_code 128 git log -Sstring --find-object=HEAD 2>err &&
+	grep "mutually exclusive" err &&
+
+	test_expect_code 128 git log --pickaxe-all --find-object=HEAD 2>err &&
+	grep "mutually exclusive" err
+'
+
+test_expect_success 'usage: --pickaxe-regex' '
+	test_expect_code 128 git log -Gregex --pickaxe-regex 2>err &&
+	grep "mutually exclusive" err
+'
+
+test_expect_success 'usage: --no-pickaxe-regex' '
+	cat >expect <<-\EOF &&
+	fatal: unrecognized argument: --no-pickaxe-regex
+	EOF
+
+	test_expect_code 128 git log -Sstring --no-pickaxe-regex 2>actual &&
+	test_cmp expect actual &&
+
+	test_expect_code 128 git log -Gstring --no-pickaxe-regex 2>err &&
+	test_cmp expect actual
+'
+
 test_log	expect_initial	--grep initial
 test_log	expect_nomatch	--grep InItial
 test_log_icase	expect_initial	--grep InItial
@@ -106,38 +143,83 @@ test_expect_success 'log -S --no-textconv (missing textconv tool)' '
 	rm .gitattributes
 '
 
+test_expect_success 'setup log -[GS] plain & regex' '
+	test_create_repo GS-plain &&
+	test_commit -C GS-plain --append A data.txt "a" &&
+	test_commit -C GS-plain --append B data.txt "a a" &&
+	test_commit -C GS-plain --append C data.txt "b" &&
+	test_commit -C GS-plain --append D data.txt "[b]" &&
+	test_commit -C GS-plain E data.txt "" &&
+
+	# We also include E, the deletion commit
+	git -C GS-plain log --grep="[ABE]" >A-to-B-then-E-log &&
+	git -C GS-plain log --grep="[CDE]" >C-to-D-then-E-log &&
+	git -C GS-plain log --grep="[DE]" >D-then-E-log &&
+	git -C GS-plain log >full-log
+'
+
+test_expect_success 'log -G trims diff new/old [-+]' '
+	git -C GS-plain log -G"[+-]a" >log &&
+	test_must_be_empty log &&
+	git -C GS-plain log -G"^a" >log &&
+	test_cmp log A-to-B-then-E-log
+'
+
+test_expect_success 'log -S<pat> is not a regex, but -S<pat> --pickaxe-regex is' '
+	git -C GS-plain log -S"a" >log &&
+	test_cmp log A-to-B-then-E-log &&
+
+	git -C GS-plain log -S"[a]" >log &&
+	test_must_be_empty log &&
+
+	git -C GS-plain log -S"[a]" --pickaxe-regex >log &&
+	test_cmp log A-to-B-then-E-log &&
+
+	git -C GS-plain log -S"[b]" >log &&
+	test_cmp log D-then-E-log &&
+
+	git -C GS-plain log -S"[b]" --pickaxe-regex >log &&
+	test_cmp log C-to-D-then-E-log
+'
+
 test_expect_success 'setup log -[GS] binary & --text' '
-	git checkout --orphan GS-binary-and-text &&
-	git read-tree --empty &&
-	printf "a\na\0a\n" >data.bin &&
-	git add data.bin &&
-	git commit -m "create binary file" data.bin &&
-	printf "a\na\0a\n" >>data.bin &&
-	git commit -m "modify binary file" data.bin &&
-	git rm data.bin &&
-	git commit -m "delete binary file" data.bin &&
-	git log >full-log
+	test_create_repo GS-bin-txt &&
+	test_commit -C GS-bin-txt --printf A data.bin "a\na\0a\n" &&
+	test_commit -C GS-bin-txt --append --printf B data.bin "a\na\0a\n" &&
+	test_commit -C GS-bin-txt C data.bin "" &&
+	git -C GS-bin-txt log >full-log
 '
 
 test_expect_success 'log -G ignores binary files' '
-	git log -Ga >log &&
+	git -C GS-bin-txt log -Ga >log &&
 	test_must_be_empty log
 '
 
 test_expect_success 'log -G looks into binary files with -a' '
-	git log -a -Ga >log &&
+	git -C GS-bin-txt log -a -Ga >log &&
 	test_cmp log full-log
 '
 
 test_expect_success 'log -G looks into binary files with textconv filter' '
-	test_when_finished "rm .gitattributes" &&
-	echo "* diff=bin" >.gitattributes &&
-	git -c diff.bin.textconv=cat log -Ga >log &&
+	test_when_finished "rm GS-bin-txt/.gitattributes" &&
+	(
+		cd GS-bin-txt &&
+		echo "* diff=bin" >.gitattributes &&
+		git -c diff.bin.textconv=cat log -Ga >../log
+	) &&
 	test_cmp log full-log
 '
 
 test_expect_success 'log -S looks into binary files' '
-	git log -Sa >log &&
+	git -C GS-bin-txt log -Sa >log &&
+	test_cmp log full-log
+'
+
+test_expect_success 'log -S --pickaxe-regex looks into binary files' '
+	git -C GS-bin-txt log --pickaxe-regex -Sa >log &&
+	test_cmp log full-log &&
+
+	git -C GS-bin-txt log --pickaxe-regex -S"[a]" >log &&
 	test_cmp log full-log
 '
 
diff --git a/t/t4210-log-i18n.sh b/t/t4210-log-i18n.sh
index 6e61f57f09..d2dfcf164e 100755
--- a/t/t4210-log-i18n.sh
+++ b/t/t4210-log-i18n.sh
@@ -10,6 +10,13 @@ latin1_e=$(printf '\351')
 # invalid UTF-8
 invalid_e=$(printf '\303\50)') # ")" at end to close opening "("
 
+have_reg_illseq=
+if test_have_prereq GETTEXT_LOCALE &&
+	! LC_ALL=$is_IS_locale test-tool regex --silent $latin1_e
+then
+	have_reg_illseq=1
+fi
+
 test_expect_success 'create commits in different encodings' '
 	test_tick &&
 	cat >msg <<-EOF &&
@@ -51,43 +58,77 @@ test_expect_success !MINGW 'log --grep does not find non-reencoded values (utf8)
 	test_must_be_empty actual
 '
 
-test_expect_success !MINGW 'log --grep does not find non-reencoded values (latin1)' '
+test_expect_success 'log --grep does not find non-reencoded values (latin1)' '
 	git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual &&
 	test_must_be_empty actual
 '
 
+triggers_undefined_behaviour () {
+	local engine=$1
+
+	case $engine in
+	fixed)
+		if test -n "$have_reg_illseq" &&
+			! test_have_prereq LIBPCRE2
+		then
+			return 0
+		fi
+		;;
+	basic|extended)
+		if test -n "$have_reg_illseq"
+		then
+			return 0
+		fi
+		;;
+	esac
+	return 1
+}
+
+mismatched_git_log () {
+	local pattern=$1
+
+	LC_ALL=$is_IS_locale git log --encoding=ISO-8859-1 --format=%s \
+		--grep=$pattern
+}
+
 for engine in fixed basic extended perl
 do
 	prereq=
 	if test $engine = "perl"
 	then
-		prereq="PCRE"
-	else
-		prereq=""
+		prereq=PCRE
 	fi
 	force_regex=
 	if test $engine != "fixed"
 	then
-	    force_regex=.*
+		force_regex='.*'
 	fi
-	test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" "
-		cat >expect <<-\EOF &&
-		latin1
-		utf8
-		EOF
-		LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$latin1_e\" >actual &&
-		test_cmp expect actual
-	"
 
-	test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not find non-reencoded values (latin1 + locale)" "
-		LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$utf8_e\" >actual &&
-		test_must_be_empty actual
+	test_expect_success $prereq "config grep.patternType=$engine" "
+		git config grep.patternType $engine
 	"
 
-	test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "-c grep.patternType=$engine log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)" "
-		LC_ALL=\"$is_IS_locale\" git -c grep.patternType=$engine log --encoding=ISO-8859-1 --format=%s --grep=\"$force_regex$invalid_e\" >actual &&
+	test_expect_success GETTEXT_LOCALE,$prereq "log --grep does not find non-reencoded values (latin1 + locale)" "
+		mismatched_git_log '$force_regex$utf8_e' >actual &&
 		test_must_be_empty actual
 	"
+
+	if ! triggers_undefined_behaviour $engine
+	then
+		test_expect_success !MINGW,GETTEXT_LOCALE,$prereq "log --grep searches in log output encoding (latin1 + locale)" "
+			cat >expect <<-\EOF &&
+			latin1
+			utf8
+			EOF
+			mismatched_git_log '$force_regex$latin1_e' >actual &&
+			test_cmp expect actual
+		"
+
+		test_expect_success GETTEXT_LOCALE,$prereq "log --grep does not die on invalid UTF-8 value (latin1 + locale + invalid needle)" "
+			mismatched_git_log '$force_regex$invalid_e' >actual &&
+			test_must_be_empty actual
+		"
+	fi
 done
 
 test_done
diff --git a/t/t4211-line-log.sh b/t/t4211-line-log.sh
index 8319163744..560127cc07 100755
--- a/t/t4211-line-log.sh
+++ b/t/t4211-line-log.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test log -L'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup (import history)' '
@@ -8,10 +11,32 @@ test_expect_success 'setup (import history)' '
 	git reset --hard
 '
 
+test_expect_success 'basic command line parsing' '
+	# This may fail due to "no such path a.c in commit", or
+	# "-L is incompatible with pathspec", depending on the
+	# order the error is checked.  Either is acceptable.
+	test_must_fail git log -L1,1:a.c -- a.c &&
+
+	# -L requires there is no pathspec
+	test_must_fail git log -L1,1:b.c -- b.c 2>error &&
+	test_i18ngrep "cannot be used with pathspec" error &&
+
+	# This would fail because --follow wants a single path, but
+	# we may fail due to incompatibility between -L/--follow in
+	# the future.  Either is acceptable.
+	test_must_fail git log -L1,1:b.c --follow &&
+	test_must_fail git log --follow -L1,1:b.c &&
+
+	# This would fail because -L wants no pathspec, but
+	# we may fail due to incompatibility between -L/--follow in
+	# the future.  Either is acceptable.
+	test_must_fail git log --follow -L1,1:b.c -- b.c
+'
+
 canned_test_1 () {
 	test_expect_$1 "$2" "
 		git log $2 >actual &&
-		test_cmp \"\$TEST_DIRECTORY\"/t4211/expect.$3 actual
+		test_cmp \"\$TEST_DIRECTORY\"/t4211/$(test_oid algo)/expect.$3 actual
 	"
 }
 
@@ -214,4 +239,80 @@ test_expect_success 'fancy rename following #2' '
 	test_cmp expect actual
 '
 
+# Create the following linear history, where each commit does what its
+# subject line promises:
+#
+#   * 66c6410 Modify func2() in file.c
+#   * 50834e5 Modify other-file
+#   * fe5851c Modify func1() in file.c
+#   * 8c7c7dd Add other-file
+#   * d5f4417 Add func1() and func2() in file.c
+test_expect_success 'setup for checking line-log and parent oids' '
+	git checkout --orphan parent-oids &&
+	git reset --hard &&
+
+	cat >file.c <<-\EOF &&
+	int func1()
+	{
+	    return F1;
+	}
+
+	int func2()
+	{
+	    return F2;
+	}
+	EOF
+	git add file.c &&
+	test_tick &&
+	first_tick=$test_tick &&
+	git commit -m "Add func1() and func2() in file.c" &&
+
+	echo 1 >other-file &&
+	git add other-file &&
+	test_tick &&
+	git commit -m "Add other-file" &&
+
+	sed -e "s/F1/F1 + 1/" file.c >tmp &&
+	mv tmp file.c &&
+	git commit -a -m "Modify func1() in file.c" &&
+
+	echo 2 >other-file &&
+	git commit -a -m "Modify other-file" &&
+
+	sed -e "s/F2/F2 + 2/" file.c >tmp &&
+	mv tmp file.c &&
+	git commit -a -m "Modify func2() in file.c" &&
+
+	head_oid=$(git rev-parse --short HEAD) &&
+	prev_oid=$(git rev-parse --short HEAD^) &&
+	root_oid=$(git rev-parse --short HEAD~4)
+'
+
+# Parent oid should be from immediate parent.
+test_expect_success 'parent oids without parent rewriting' '
+	cat >expect <<-EOF &&
+	$head_oid $prev_oid Modify func2() in file.c
+	$root_oid  Add func1() and func2() in file.c
+	EOF
+	git log --format="%h %p %s" --no-patch -L:func2:file.c >actual &&
+	test_cmp expect actual
+'
+
+# Parent oid should be from the most recent ancestor touching func2(),
+# i.e. in this case from the root commit.
+test_expect_success 'parent oids with parent rewriting' '
+	cat >expect <<-EOF &&
+	$head_oid $root_oid Modify func2() in file.c
+	$root_oid  Add func1() and func2() in file.c
+	EOF
+	git log --format="%h %p %s" --no-patch -L:func2:file.c --parents >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'line-log with --before' '
+	echo $root_oid >expect &&
+	git log --format=%h --no-patch -L:func2:file.c --before=$first_tick >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t4211/history.export b/t/t4211/history.export
index f9f41e211e..006972a1f2 100644
--- a/t/t4211/history.export
+++ b/t/t4211/history.export
@@ -316,7 +316,7 @@ long f(long x)
 	return s;
 }
 
-commit refs/heads/master
+commit refs/heads/main
 mark :19
 author Thomas Rast <trast@student.ethz.ch> 1362045024 +0100
 committer Thomas Rast <trast@student.ethz.ch> 1362045024 +0100
diff --git a/t/t4211/expect.beginning-of-file b/t/t4211/sha1/expect.beginning-of-file
index 91b4054898..91b4054898 100644
--- a/t/t4211/expect.beginning-of-file
+++ b/t/t4211/sha1/expect.beginning-of-file
diff --git a/t/t4211/expect.end-of-file b/t/t4211/sha1/expect.end-of-file
index bd25bb2f59..bd25bb2f59 100644
--- a/t/t4211/expect.end-of-file
+++ b/t/t4211/sha1/expect.end-of-file
diff --git a/t/t4211/expect.move-support-f b/t/t4211/sha1/expect.move-support-f
index c905e01bc2..c905e01bc2 100644
--- a/t/t4211/expect.move-support-f
+++ b/t/t4211/sha1/expect.move-support-f
diff --git a/t/t4211/expect.multiple b/t/t4211/sha1/expect.multiple
index 76ad5b598c..76ad5b598c 100644
--- a/t/t4211/expect.multiple
+++ b/t/t4211/sha1/expect.multiple
diff --git a/t/t4211/expect.multiple-overlapping b/t/t4211/sha1/expect.multiple-overlapping
index d930b6eec4..d930b6eec4 100644
--- a/t/t4211/expect.multiple-overlapping
+++ b/t/t4211/sha1/expect.multiple-overlapping
diff --git a/t/t4211/expect.multiple-superset b/t/t4211/sha1/expect.multiple-superset
index d930b6eec4..d930b6eec4 100644
--- a/t/t4211/expect.multiple-superset
+++ b/t/t4211/sha1/expect.multiple-superset
diff --git a/t/t4211/expect.parallel-change-f-to-main b/t/t4211/sha1/expect.parallel-change-f-to-main
index 052def8074..052def8074 100644
--- a/t/t4211/expect.parallel-change-f-to-main
+++ b/t/t4211/sha1/expect.parallel-change-f-to-main
diff --git a/t/t4211/expect.simple-f b/t/t4211/sha1/expect.simple-f
index a1f5bc49c8..a1f5bc49c8 100644
--- a/t/t4211/expect.simple-f
+++ b/t/t4211/sha1/expect.simple-f
diff --git a/t/t4211/expect.simple-f-to-main b/t/t4211/sha1/expect.simple-f-to-main
index a475768710..a475768710 100644
--- a/t/t4211/expect.simple-f-to-main
+++ b/t/t4211/sha1/expect.simple-f-to-main
diff --git a/t/t4211/expect.simple-main b/t/t4211/sha1/expect.simple-main
index 39ce39bebe..39ce39bebe 100644
--- a/t/t4211/expect.simple-main
+++ b/t/t4211/sha1/expect.simple-main
diff --git a/t/t4211/expect.simple-main-to-end b/t/t4211/sha1/expect.simple-main-to-end
index 8480bd9cc4..8480bd9cc4 100644
--- a/t/t4211/expect.simple-main-to-end
+++ b/t/t4211/sha1/expect.simple-main-to-end
diff --git a/t/t4211/expect.two-ranges b/t/t4211/sha1/expect.two-ranges
index 6109aa0dce..6109aa0dce 100644
--- a/t/t4211/expect.two-ranges
+++ b/t/t4211/sha1/expect.two-ranges
diff --git a/t/t4211/expect.vanishes-early b/t/t4211/sha1/expect.vanishes-early
index 1f7cd06941..1f7cd06941 100644
--- a/t/t4211/expect.vanishes-early
+++ b/t/t4211/sha1/expect.vanishes-early
diff --git a/t/t4211/sha256/expect.beginning-of-file b/t/t4211/sha256/expect.beginning-of-file
new file mode 100644
index 0000000000..5adfdfc1a1
--- /dev/null
+++ b/t/t4211/sha256/expect.beginning-of-file
@@ -0,0 +1,43 @@
+commit 62a40b38fa4f00800004aee81ef287b7201317594ebcb990f38cbe493b01d200
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:47:40 2013 +0100
+
+    change at very beginning
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,3 +1,4 @@
++#include <unistd.h>
+ #include <stdio.h>
+ 
+ long f(long x)
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -1,3 +1,3 @@
+ #include <stdio.h>
+ 
+-int f(int x)
++long f(long x)
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +1,3 @@
++#include <stdio.h>
++
++int f(int x)
diff --git a/t/t4211/sha256/expect.end-of-file b/t/t4211/sha256/expect.end-of-file
new file mode 100644
index 0000000000..03ab5c1784
--- /dev/null
+++ b/t/t4211/sha256/expect.end-of-file
@@ -0,0 +1,62 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -20,3 +20,5 @@
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -20,3 +20,3 @@
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -19,3 +19,3 @@
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +18,3 @@
++	printf("%d\n", f(15));
++	return 0;
++}
diff --git a/t/t4211/sha256/expect.move-support-f b/t/t4211/sha256/expect.move-support-f
new file mode 100644
index 0000000000..223b4ed2a0
--- /dev/null
+++ b/t/t4211/sha256/expect.move-support-f
@@ -0,0 +1,80 @@
+commit 4f7a58195a92c400e28a2354328587f1ff14fb77f5cf894536f17ccbc72931b9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:49:50 2013 +0100
+
+    another simple change
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -4,9 +4,9 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+-		x >>= 1;
++		x /= 2;
+ 		s++;
+ 	}
+ 	return s;
+ }
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,9 +3,9 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,8 +3,9 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,8 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
diff --git a/t/t4211/sha256/expect.multiple b/t/t4211/sha256/expect.multiple
new file mode 100644
index 0000000000..ca00409b9a
--- /dev/null
+++ b/t/t4211/sha256/expect.multiple
@@ -0,0 +1,104 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,7 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,9 +3,9 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+@@ -17,5 +17,5 @@
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,8 +3,9 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,8 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
diff --git a/t/t4211/sha256/expect.multiple-overlapping b/t/t4211/sha256/expect.multiple-overlapping
new file mode 100644
index 0000000000..9015a45a25
--- /dev/null
+++ b/t/t4211/sha256/expect.multiple-overlapping
@@ -0,0 +1,187 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -4,19 +4,21 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -4,19 +4,19 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,19 +3,19 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,19 +3,19 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,18 +3,19 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+ 	printf("%d\n", f(15));
+ 	return 0;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,18 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
diff --git a/t/t4211/sha256/expect.multiple-superset b/t/t4211/sha256/expect.multiple-superset
new file mode 100644
index 0000000000..9015a45a25
--- /dev/null
+++ b/t/t4211/sha256/expect.multiple-superset
@@ -0,0 +1,187 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -4,19 +4,21 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -4,19 +4,19 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,19 +3,19 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,19 +3,19 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,18 +3,19 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+ int main ()
+ {
+ 	printf("%d\n", f(15));
+ 	return 0;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,18 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
diff --git a/t/t4211/sha256/expect.parallel-change-f-to-main b/t/t4211/sha256/expect.parallel-change-f-to-main
new file mode 100644
index 0000000000..e68f8928ea
--- /dev/null
+++ b/t/t4211/sha256/expect.parallel-change-f-to-main
@@ -0,0 +1,160 @@
+commit 98117c2059b76c36995748fb97b02542aef477fe26379e94c18fd70f7790bc67
+Merge: b511694 4f7a581
+Author: Thomas Rast <trast@inf.ethz.ch>
+Date:   Fri Apr 12 16:16:24 2013 +0200
+
+    Merge across the rename
+
+
+commit 4f7a58195a92c400e28a2354328587f1ff14fb77f5cf894536f17ccbc72931b9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:49:50 2013 +0100
+
+    another simple change
+
+diff --git a/b.c b/b.c
+--- a/b.c
++++ b/b.c
+@@ -4,14 +4,14 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+-		x >>= 1;
++		x /= 2;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * This is only an example!
+  */
+ 
+
+commit b511694f5337663fbd697622993a5f8e1099eca84be4df313f2b3ee94a098b42
+Author: Thomas Rast <trast@inf.ethz.ch>
+Date:   Fri Apr 12 16:15:57 2013 +0200
+
+    change on another line of history while rename happens
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -4,14 +4,14 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * This is only an example!
++ * This is only a short example!
+  */
+ 
+
+commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,14 +3,14 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,14 +3,14 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,13 +3,14 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,13 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
diff --git a/t/t4211/sha256/expect.simple-f b/t/t4211/sha256/expect.simple-f
new file mode 100644
index 0000000000..65508d7c0b
--- /dev/null
+++ b/t/t4211/sha256/expect.simple-f
@@ -0,0 +1,59 @@
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,9 +3,9 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,8 +3,9 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,8 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
diff --git a/t/t4211/sha256/expect.simple-f-to-main b/t/t4211/sha256/expect.simple-f-to-main
new file mode 100644
index 0000000000..77b721c196
--- /dev/null
+++ b/t/t4211/sha256/expect.simple-f-to-main
@@ -0,0 +1,100 @@
+commit 5a1b3989063d55e71e7685efa3392f133385b4034bddde530dcb5090d8b8b8ca
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:41 2013 +0100
+
+    touch comment
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,14 +3,14 @@
+ long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+- * A comment.
++ * This is only an example!
+  */
+ 
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,14 +3,14 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,13 +3,14 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+ 
+ /*
+  * A comment.
+  */
+ 
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,13 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
++
++/*
++ * A comment.
++ */
++
diff --git a/t/t4211/sha256/expect.simple-main b/t/t4211/sha256/expect.simple-main
new file mode 100644
index 0000000000..d20708c9f9
--- /dev/null
+++ b/t/t4211/sha256/expect.simple-main
@@ -0,0 +1,68 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -17,5 +17,5 @@
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +16,5 @@
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
diff --git a/t/t4211/sha256/expect.simple-main-to-end b/t/t4211/sha256/expect.simple-main-to-end
new file mode 100644
index 0000000000..617cdf3481
--- /dev/null
+++ b/t/t4211/sha256/expect.simple-main-to-end
@@ -0,0 +1,70 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,7 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
++
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -17,5 +17,5 @@
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +16,5 @@
++int main ()
++{
++	printf("%d\n", f(15));
++	return 0;
++}
diff --git a/t/t4211/sha256/expect.two-ranges b/t/t4211/sha256/expect.two-ranges
new file mode 100644
index 0000000000..af57c8b997
--- /dev/null
+++ b/t/t4211/sha256/expect.two-ranges
@@ -0,0 +1,102 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
+\ No newline at end of file
++}
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -18,5 +18,5 @@
+ int main ()
+ {
+ 	printf("%ld\n", f(15));
+ 	return 0;
+-}
++}
+\ No newline at end of file
+
+commit ccf97b9878189c40a981da50b15713bb80a35755326320ec80900caf22ced46f
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:45:16 2013 +0100
+
+    touch both functions
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,9 +3,9 @@
+-int f(int x)
++long f(long x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
+ 	return s;
+ }
+@@ -17,5 +17,5 @@
+ int main ()
+ {
+-	printf("%d\n", f(15));
++	printf("%ld\n", f(15));
+ 	return 0;
+ }
+
+commit f6434acd34260a6c9f61e96d96bf9a323d330561df5b1ca2631104f82026dfed
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:55 2013 +0100
+
+    change f()
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -3,8 +3,9 @@
+ int f(int x)
+ {
+ 	int s = 0;
+ 	while (x) {
+ 		x >>= 1;
+ 		s++;
+ 	}
++	return s;
+ }
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +3,8 @@
++int f(int x)
++{
++	int s = 0;
++	while (x) {
++		x >>= 1;
++		s++;
++	}
++}
diff --git a/t/t4211/sha256/expect.vanishes-early b/t/t4211/sha256/expect.vanishes-early
new file mode 100644
index 0000000000..11ec9bdecf
--- /dev/null
+++ b/t/t4211/sha256/expect.vanishes-early
@@ -0,0 +1,39 @@
+commit 5526ed05c2476b56af8b7be499e8f78bd50f490740733a9ca7e1f55878fa90a9
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:43 2013 +0100
+
+    change back to complete line
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -22,1 +24,1 @@
+-}
+\ No newline at end of file
++/* incomplete lines are bad! */
+
+commit 29f32ac3141c48b22803e5c4127b719917b67d0f8ca8c5248bebfa2a19f7da10
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:48:10 2013 +0100
+
+    change to an incomplete line at end
+
+diff --git a/a.c b/a.c
+--- a/a.c
++++ b/a.c
+@@ -22,1 +22,1 @@
+-}
++}
+\ No newline at end of file
+
+commit 1dd7e9b2b1699324b53b341e728653b913bc192a14dfea168c5b51f2b3d03592
+Author: Thomas Rast <trast@student.ethz.ch>
+Date:   Thu Feb 28 10:44:48 2013 +0100
+
+    initial
+
+diff --git a/a.c b/a.c
+--- /dev/null
++++ b/a.c
+@@ -0,0 +20,1 @@
++}
diff --git a/t/t4213-log-tabexpand.sh b/t/t4213-log-tabexpand.sh
index 7f90f58c03..53a4af3244 100755
--- a/t/t4213-log-tabexpand.sh
+++ b/t/t4213-log-tabexpand.sh
@@ -36,7 +36,7 @@ count_expand ()
 	esac
 
 	# Prefix the output with the command line arguments, and
-	# replace SP with a dot both in the expecte and actual output
+	# replace SP with a dot both in the expected and actual output
 	# so that test_cmp would show the difference together with the
 	# breakage in a way easier to consume by the debugging user.
 	{
diff --git a/t/t4214-log-graph-octopus.sh b/t/t4214-log-graph-octopus.sh
index 3ae8e51e50..f70c46bbbf 100755
--- a/t/t4214-log-graph-octopus.sh
+++ b/t/t4214-log-graph-octopus.sh
@@ -2,12 +2,25 @@
 
 test_description='git log --graph of skewed left octopus merge.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-log-graph.sh
+
+test_cmp_graph () {
+	cat >expect &&
+	lib_test_cmp_graph --color=never --date-order --format=%s "$@"
+}
+
+test_cmp_colored_graph () {
+	lib_test_cmp_colored_graph --date-order --format=%s "$@"
+}
 
 test_expect_success 'set up merge history' '
 	test_commit initial &&
 	for i in 1 2 3 4 ; do
-		git checkout master -b $i || return $?
+		git checkout main -b $i || return $?
 		# Make tag name different from branch name, to avoid
 		# ambiguity error when calling checkout.
 		test_commit $i $i $i tag$i || return $?
@@ -24,65 +37,55 @@ test_expect_success 'set up merge history' '
 '
 
 test_expect_success 'log --graph with tricky octopus merge, no color' '
-	cat >expect.uncolored <<-\EOF &&
+	test_cmp_graph left octopus-merge <<-\EOF
 	* left
-	| *---.   octopus-merge
-	| |\ \ \
-	|/ / / /
+	| *-.   octopus-merge
+	|/|\ \
 	| | | * 4
 	| | * | 3
 	| | |/
-	| * | 2
+	| * / 2
 	| |/
-	* | 1
+	* / 1
 	|/
 	* initial
 	EOF
-	git log --color=never --graph --date-order --pretty=tformat:%s left octopus-merge >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
 '
 
 test_expect_success 'log --graph with tricky octopus merge with colors' '
 	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
 	cat >expect.colors <<-\EOF &&
 	* left
-	<RED>|<RESET> *<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
-	<RED>|<RESET> <RED>|<RESET><YELLOW>\<RESET> <BLUE>\<RESET> <MAGENTA>\<RESET>
-	<RED>|<RESET><RED>/<RESET> <YELLOW>/<RESET> <BLUE>/<RESET> <MAGENTA>/<RESET>
+	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
+	<RED>|<RESET><RED>/<RESET><YELLOW>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET>
 	<RED>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
 	<RED>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
 	<RED>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	<RED>|<RESET> * <MAGENTA>|<RESET> 2
+	<RED>|<RESET> * <MAGENTA>/<RESET> 2
 	<RED>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* <MAGENTA>|<RESET> 1
+	* <MAGENTA>/<RESET> 1
 	<MAGENTA>|<RESET><MAGENTA>/<RESET>
 	* initial
 	EOF
-	git log --color=always --graph --date-order --pretty=tformat:%s left octopus-merge >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	test_cmp_colored_graph left octopus-merge
 '
 
 # Repeat the previous two tests with "normal" octopus merge (i.e.,
 # without the first parent skewing to the "left" branch column).
 
 test_expect_success 'log --graph with normal octopus merge, no color' '
-	cat >expect.uncolored <<-\EOF &&
+	test_cmp_graph octopus-merge <<-\EOF
 	*---.   octopus-merge
 	|\ \ \
 	| | | * 4
 	| | * | 3
 	| | |/
-	| * | 2
+	| * / 2
 	| |/
-	* | 1
+	* / 1
 	|/
 	* initial
 	EOF
-	git log --color=never --graph --date-order --pretty=tformat:%s octopus-merge >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
 '
 
 test_expect_success 'log --graph with normal octopus merge with colors' '
@@ -92,38 +95,33 @@ test_expect_success 'log --graph with normal octopus merge with colors' '
 	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 4
 	<RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 3
 	<RED>|<RESET> <GREEN>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-	<RED>|<RESET> * <BLUE>|<RESET> 2
+	<RED>|<RESET> * <BLUE>/<RESET> 2
 	<RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET>
-	* <BLUE>|<RESET> 1
+	* <BLUE>/<RESET> 1
 	<BLUE>|<RESET><BLUE>/<RESET>
 	* initial
 	EOF
 	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	git log --color=always --graph --date-order --pretty=tformat:%s octopus-merge >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	test_cmp_colored_graph octopus-merge
 '
 
 test_expect_success 'log --graph with normal octopus merge and child, no color' '
-	cat >expect.uncolored <<-\EOF &&
+	test_cmp_graph after-merge <<-\EOF
 	* after-merge
 	*---.   octopus-merge
 	|\ \ \
 	| | | * 4
 	| | * | 3
 	| | |/
-	| * | 2
+	| * / 2
 	| |/
-	* | 1
+	* / 1
 	|/
 	* initial
 	EOF
-	git log --color=never --graph --date-order --pretty=tformat:%s after-merge >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
 '
 
-test_expect_failure 'log --graph with normal octopus and child merge with colors' '
+test_expect_success 'log --graph with normal octopus and child merge with colors' '
 	cat >expect.colors <<-\EOF &&
 	* after-merge
 	*<BLUE>-<RESET><BLUE>-<RESET><MAGENTA>-<RESET><MAGENTA>.<RESET>   octopus-merge
@@ -131,63 +129,54 @@ test_expect_failure 'log --graph with normal octopus and child merge with colors
 	<GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 4
 	<GREEN>|<RESET> <YELLOW>|<RESET> * <MAGENTA>|<RESET> 3
 	<GREEN>|<RESET> <YELLOW>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	<GREEN>|<RESET> * <MAGENTA>|<RESET> 2
+	<GREEN>|<RESET> * <MAGENTA>/<RESET> 2
 	<GREEN>|<RESET> <MAGENTA>|<RESET><MAGENTA>/<RESET>
-	* <MAGENTA>|<RESET> 1
+	* <MAGENTA>/<RESET> 1
 	<MAGENTA>|<RESET><MAGENTA>/<RESET>
 	* initial
 	EOF
 	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
-	git log --color=always --graph --date-order --pretty=tformat:%s after-merge >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	test_cmp_colored_graph after-merge
 '
 
 test_expect_success 'log --graph with tricky octopus merge and its child, no color' '
-	cat >expect.uncolored <<-\EOF &&
+	test_cmp_graph left after-merge <<-\EOF
 	* left
 	| * after-merge
-	| *---.   octopus-merge
-	| |\ \ \
-	|/ / / /
+	| *-.   octopus-merge
+	|/|\ \
 	| | | * 4
 	| | * | 3
 	| | |/
-	| * | 2
+	| * / 2
 	| |/
-	* | 1
+	* / 1
 	|/
 	* initial
 	EOF
-	git log --color=never --graph --date-order --pretty=tformat:%s left after-merge >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
 '
 
-test_expect_failure 'log --graph with tricky octopus merge and its child with colors' '
+test_expect_success 'log --graph with tricky octopus merge and its child with colors' '
 	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
 	cat >expect.colors <<-\EOF &&
 	* left
 	<RED>|<RESET> * after-merge
-	<RED>|<RESET> *<MAGENTA>-<RESET><MAGENTA>-<RESET><CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
-	<RED>|<RESET> <RED>|<RESET><BLUE>\<RESET> <MAGENTA>\<RESET> <CYAN>\<RESET>
-	<RED>|<RESET><RED>/<RESET> <BLUE>/<RESET> <MAGENTA>/<RESET> <CYAN>/<RESET>
+	<RED>|<RESET> *<CYAN>-<RESET><CYAN>.<RESET>   octopus-merge
+	<RED>|<RESET><RED>/<RESET><BLUE>|<RESET><MAGENTA>\<RESET> <CYAN>\<RESET>
 	<RED>|<RESET> <BLUE>|<RESET> <MAGENTA>|<RESET> * 4
 	<RED>|<RESET> <BLUE>|<RESET> * <CYAN>|<RESET> 3
 	<RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
-	<RED>|<RESET> * <CYAN>|<RESET> 2
+	<RED>|<RESET> * <CYAN>/<RESET> 2
 	<RED>|<RESET> <CYAN>|<RESET><CYAN>/<RESET>
-	* <CYAN>|<RESET> 1
+	* <CYAN>/<RESET> 1
 	<CYAN>|<RESET><CYAN>/<RESET>
 	* initial
 	EOF
-	git log --color=always --graph --date-order --pretty=tformat:%s left after-merge >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	test_cmp_colored_graph left after-merge
 '
 
 test_expect_success 'log --graph with crossover in octopus merge, no color' '
-	cat >expect.uncolored <<-\EOF &&
+	test_cmp_graph after-4 octopus-merge <<-\EOF
 	* after-4
 	| *---.   octopus-merge
 	| |\ \ \
@@ -204,12 +193,9 @@ test_expect_success 'log --graph with crossover in octopus merge, no color' '
 	|/
 	* initial
 	EOF
-	git log --color=never --graph --date-order --pretty=tformat:%s after-4 octopus-merge >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
 '
 
-test_expect_failure 'log --graph with crossover in octopus merge with colors' '
+test_expect_success 'log --graph with crossover in octopus merge with colors' '
 	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
 	cat >expect.colors <<-\EOF &&
 	* after-4
@@ -228,13 +214,11 @@ test_expect_failure 'log --graph with crossover in octopus merge with colors' '
 	<MAGENTA>|<RESET><MAGENTA>/<RESET>
 	* initial
 	EOF
-	git log --color=always --graph --date-order --pretty=tformat:%s after-4 octopus-merge >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	test_cmp_colored_graph after-4 octopus-merge
 '
 
 test_expect_success 'log --graph with crossover in octopus merge and its child, no color' '
-	cat >expect.uncolored <<-\EOF &&
+	test_cmp_graph after-4 after-merge <<-\EOF
 	* after-4
 	| * after-merge
 	| *---.   octopus-merge
@@ -252,12 +236,9 @@ test_expect_success 'log --graph with crossover in octopus merge and its child,
 	|/
 	* initial
 	EOF
-	git log --color=never --graph --date-order --pretty=tformat:%s after-4 after-merge >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
 '
 
-test_expect_failure 'log --graph with crossover in octopus merge and its child with colors' '
+test_expect_success 'log --graph with crossover in octopus merge and its child with colors' '
 	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
 	cat >expect.colors <<-\EOF &&
 	* after-4
@@ -277,13 +258,11 @@ test_expect_failure 'log --graph with crossover in octopus merge and its child w
 	<CYAN>|<RESET><CYAN>/<RESET>
 	* initial
 	EOF
-	git log --color=always --graph --date-order --pretty=tformat:%s after-4 after-merge >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	test_cmp_colored_graph after-4 after-merge
 '
 
 test_expect_success 'log --graph with unrelated commit and octopus tip, no color' '
-	cat >expect.uncolored <<-\EOF &&
+	test_cmp_graph after-initial octopus-merge <<-\EOF
 	* after-initial
 	| *---.   octopus-merge
 	| |\ \ \
@@ -300,9 +279,6 @@ test_expect_success 'log --graph with unrelated commit and octopus tip, no color
 	|/
 	* initial
 	EOF
-	git log --color=never --graph --date-order --pretty=tformat:%s after-initial octopus-merge >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
 '
 
 test_expect_success 'log --graph with unrelated commit and octopus tip with colors' '
@@ -324,13 +300,11 @@ test_expect_success 'log --graph with unrelated commit and octopus tip with colo
 	<RED>|<RESET><RED>/<RESET>
 	* initial
 	EOF
-	git log --color=always --graph --date-order --pretty=tformat:%s after-initial octopus-merge >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	test_cmp_colored_graph after-initial octopus-merge
 '
 
 test_expect_success 'log --graph with unrelated commit and octopus child, no color' '
-	cat >expect.uncolored <<-\EOF &&
+	test_cmp_graph after-initial after-merge <<-\EOF
 	* after-initial
 	| * after-merge
 	| *---.   octopus-merge
@@ -348,12 +322,9 @@ test_expect_success 'log --graph with unrelated commit and octopus child, no col
 	|/
 	* initial
 	EOF
-	git log --color=never --graph --date-order --pretty=tformat:%s after-initial after-merge >actual.raw &&
-	sed "s/ *\$//" actual.raw >actual &&
-	test_cmp expect.uncolored actual
 '
 
-test_expect_failure 'log --graph with unrelated commit and octopus child with colors' '
+test_expect_success 'log --graph with unrelated commit and octopus child with colors' '
 	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
 	cat >expect.colors <<-\EOF &&
 	* after-initial
@@ -373,9 +344,7 @@ test_expect_failure 'log --graph with unrelated commit and octopus child with co
 	<RED>|<RESET><RED>/<RESET>
 	* initial
 	EOF
-	git log --color=always --graph --date-order --pretty=tformat:%s after-initial after-merge >actual.colors.raw &&
-	test_decode_color <actual.colors.raw | sed "s/ *\$//" >actual.colors &&
-	test_cmp expect.colors actual.colors
+	test_cmp_colored_graph after-initial after-merge
 '
 
 test_done
diff --git a/t/t4215-log-skewed-merges.sh b/t/t4215-log-skewed-merges.sh
new file mode 100755
index 0000000000..28d0779a8c
--- /dev/null
+++ b/t/t4215-log-skewed-merges.sh
@@ -0,0 +1,373 @@
+#!/bin/sh
+
+test_description='git log --graph of skewed merges'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-log-graph.sh
+
+check_graph () {
+	cat >expect &&
+	lib_test_cmp_graph --format=%s "$@"
+}
+
+test_expect_success 'log --graph with merge fusing with its left and right neighbors' '
+	git checkout --orphan _p &&
+	test_commit A &&
+	test_commit B &&
+	git checkout -b _q @^ && test_commit C &&
+	git checkout -b _r @^ && test_commit D &&
+	git checkout _p && git merge --no-ff _q _r -m E &&
+	git checkout _r && test_commit F &&
+	git checkout _p && git merge --no-ff _r -m G &&
+	git checkout @^^ && git merge --no-ff _p -m H &&
+
+	check_graph <<-\EOF
+	*   H
+	|\
+	| *   G
+	| |\
+	| | * F
+	| * | E
+	|/|\|
+	| | * D
+	| * | C
+	| |/
+	* / B
+	|/
+	* A
+	EOF
+'
+
+test_expect_success 'log --graph with left-skewed merge' '
+	git checkout --orphan 0_p && test_commit 0_A &&
+	git checkout -b 0_q 0_p && test_commit 0_B &&
+	git checkout -b 0_r 0_p &&
+	test_commit 0_C &&
+	test_commit 0_D &&
+	git checkout -b 0_s 0_p && test_commit 0_E &&
+	git checkout -b 0_t 0_p && git merge --no-ff 0_r^ 0_s -m 0_F &&
+	git checkout 0_p && git merge --no-ff 0_s -m 0_G &&
+	git checkout @^ && git merge --no-ff 0_q 0_r 0_t 0_p -m 0_H &&
+
+	check_graph <<-\EOF
+	*-----.   0_H
+	|\ \ \ \
+	| | | | * 0_G
+	| |_|_|/|
+	|/| | | |
+	| | | * | 0_F
+	| |_|/|\|
+	|/| | | |
+	| | | | * 0_E
+	| |_|_|/
+	|/| | |
+	| | * | 0_D
+	| | |/
+	| | * 0_C
+	| |/
+	|/|
+	| * 0_B
+	|/
+	* 0_A
+	EOF
+'
+
+test_expect_success 'log --graph with nested left-skewed merge' '
+	git checkout --orphan 1_p &&
+	test_commit 1_A &&
+	test_commit 1_B &&
+	test_commit 1_C &&
+	git checkout -b 1_q @^ && test_commit 1_D &&
+	git checkout 1_p && git merge --no-ff 1_q -m 1_E &&
+	git checkout -b 1_r @~3 && test_commit 1_F &&
+	git checkout 1_p && git merge --no-ff 1_r -m 1_G &&
+	git checkout @^^ && git merge --no-ff 1_p -m 1_H &&
+
+	check_graph <<-\EOF
+	*   1_H
+	|\
+	| *   1_G
+	| |\
+	| | * 1_F
+	| * | 1_E
+	|/| |
+	| * | 1_D
+	* | | 1_C
+	|/ /
+	* / 1_B
+	|/
+	* 1_A
+	EOF
+'
+
+test_expect_success 'log --graph with nested left-skewed merge following normal merge' '
+	git checkout --orphan 2_p &&
+	test_commit 2_A &&
+	test_commit 2_B &&
+	test_commit 2_C &&
+	git checkout -b 2_q @^^ &&
+	test_commit 2_D &&
+	test_commit 2_E &&
+	git checkout -b 2_r @^ && test_commit 2_F &&
+	git checkout 2_q &&
+	git merge --no-ff 2_r -m 2_G &&
+	git merge --no-ff 2_p^ -m 2_H &&
+	git checkout -b 2_s @^^ && git merge --no-ff 2_q -m 2_J &&
+	git checkout 2_p && git merge --no-ff 2_s -m 2_K &&
+
+	check_graph <<-\EOF
+	*   2_K
+	|\
+	| *   2_J
+	| |\
+	| | *   2_H
+	| | |\
+	| | * | 2_G
+	| |/| |
+	| | * | 2_F
+	| * | | 2_E
+	| |/ /
+	| * | 2_D
+	* | | 2_C
+	| |/
+	|/|
+	* | 2_B
+	|/
+	* 2_A
+	EOF
+'
+
+test_expect_success 'log --graph with nested right-skewed merge following left-skewed merge' '
+	git checkout --orphan 3_p &&
+	test_commit 3_A &&
+	git checkout -b 3_q &&
+	test_commit 3_B &&
+	test_commit 3_C &&
+	git checkout -b 3_r @^ &&
+	test_commit 3_D &&
+	git checkout 3_q && git merge --no-ff 3_r -m 3_E &&
+	git checkout 3_p && git merge --no-ff 3_q -m 3_F &&
+	git checkout 3_r && test_commit 3_G &&
+	git checkout 3_p && git merge --no-ff 3_r -m 3_H &&
+	git checkout @^^ && git merge --no-ff 3_p -m 3_J &&
+
+	check_graph <<-\EOF
+	*   3_J
+	|\
+	| *   3_H
+	| |\
+	| | * 3_G
+	| * | 3_F
+	|/| |
+	| * | 3_E
+	| |\|
+	| | * 3_D
+	| * | 3_C
+	| |/
+	| * 3_B
+	|/
+	* 3_A
+	EOF
+'
+
+test_expect_success 'log --graph with right-skewed merge following a left-skewed one' '
+	git checkout --orphan 4_p &&
+	test_commit 4_A &&
+	test_commit 4_B &&
+	test_commit 4_C &&
+	git checkout -b 4_q @^^ && test_commit 4_D &&
+	git checkout -b 4_r 4_p^ && git merge --no-ff 4_q -m 4_E &&
+	git checkout -b 4_s 4_p^^ &&
+	git merge --no-ff 4_r -m 4_F &&
+	git merge --no-ff 4_p -m 4_G &&
+	git checkout @^^ && git merge --no-ff 4_s -m 4_H &&
+
+	check_graph --date-order <<-\EOF
+	*   4_H
+	|\
+	| *   4_G
+	| |\
+	| * | 4_F
+	|/| |
+	| * |   4_E
+	| |\ \
+	| | * | 4_D
+	| |/ /
+	|/| |
+	| | * 4_C
+	| |/
+	| * 4_B
+	|/
+	* 4_A
+	EOF
+'
+
+test_expect_success 'log --graph with octopus merge with column joining its penultimate parent' '
+	git checkout --orphan 5_p &&
+	test_commit 5_A &&
+	git branch 5_q &&
+	git branch 5_r &&
+	test_commit 5_B &&
+	git checkout 5_q && test_commit 5_C &&
+	git checkout 5_r && test_commit 5_D &&
+	git checkout 5_p &&
+	git merge --no-ff 5_q 5_r -m 5_E &&
+	git checkout 5_q && test_commit 5_F &&
+	git checkout -b 5_s 5_p^ &&
+	git merge --no-ff 5_p 5_q -m 5_G &&
+	git checkout 5_r &&
+	git merge --no-ff 5_s -m 5_H &&
+
+	check_graph <<-\EOF
+	*   5_H
+	|\
+	| *-.   5_G
+	| |\ \
+	| | | * 5_F
+	| | * |   5_E
+	| |/|\ \
+	| |_|/ /
+	|/| | /
+	| | |/
+	* | | 5_D
+	| | * 5_C
+	| |/
+	|/|
+	| * 5_B
+	|/
+	* 5_A
+	EOF
+'
+
+test_expect_success 'log --graph with multiple tips' '
+	git checkout --orphan 6_1 &&
+	test_commit 6_A &&
+	git branch 6_2 &&
+	git branch 6_4 &&
+	test_commit 6_B &&
+	git branch 6_3 &&
+	test_commit 6_C &&
+	git checkout 6_2 && test_commit 6_D &&
+	git checkout 6_3 && test_commit 6_E &&
+	git checkout -b 6_5 6_1 &&
+	git merge --no-ff 6_2 -m 6_F &&
+	git checkout 6_4 && test_commit 6_G &&
+	git checkout 6_3 &&
+	git merge --no-ff 6_4 -m 6_H &&
+	git checkout 6_1 &&
+	git merge --no-ff 6_2 -m 6_I &&
+
+	check_graph 6_1 6_3 6_5 <<-\EOF
+	*   6_I
+	|\
+	| | *   6_H
+	| | |\
+	| | | * 6_G
+	| | * | 6_E
+	| | | | * 6_F
+	| |_|_|/|
+	|/| | |/
+	| | |/|
+	| |/| |
+	| * | | 6_D
+	| | |/
+	| |/|
+	* | | 6_C
+	| |/
+	|/|
+	* | 6_B
+	|/
+	* 6_A
+	EOF
+'
+
+test_expect_success 'log --graph with multiple tips and colors' '
+	test_config log.graphColors red,green,yellow,blue,magenta,cyan &&
+	cat >expect.colors <<-\EOF &&
+	*   6_I
+	<RED>|<RESET><GREEN>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> *   6_H
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET><BLUE>\<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> * 6_G
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET> * 6_F
+	<RED>|<RESET> <GREEN>|<RESET><RED>_<RESET><YELLOW>|<RESET><RED>_<RESET><BLUE>|<RESET><RED>/<RESET><GREEN>|<RESET>
+	<RED>|<RESET><RED>/<RESET><GREEN>|<RESET> <YELLOW>|<RESET> <BLUE>|<RESET><GREEN>/<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> <YELLOW>|<RESET><GREEN>/<RESET><BLUE>|<RESET>
+	<RED>|<RESET> <GREEN>|<RESET><GREEN>/<RESET><YELLOW>|<RESET> <BLUE>|<RESET>
+	<RED>|<RESET> <GREEN>|<RESET> * <BLUE>|<RESET> 6_E
+	<RED>|<RESET> * <CYAN>|<RESET> <BLUE>|<RESET> 6_D
+	<RED>|<RESET> <BLUE>|<RESET> <CYAN>|<RESET><BLUE>/<RESET>
+	<RED>|<RESET> <BLUE>|<RESET><BLUE>/<RESET><CYAN>|<RESET>
+	* <BLUE>|<RESET> <CYAN>|<RESET> 6_C
+	<CYAN>|<RESET> <BLUE>|<RESET><CYAN>/<RESET>
+	<CYAN>|<RESET><CYAN>/<RESET><BLUE>|<RESET>
+	* <BLUE>|<RESET> 6_B
+	<BLUE>|<RESET><BLUE>/<RESET>
+	* 6_A
+	EOF
+	lib_test_cmp_colored_graph --date-order --pretty=tformat:%s 6_1 6_3 6_5
+'
+
+test_expect_success 'log --graph with multiple tips' '
+	git checkout --orphan 7_1 &&
+	test_commit 7_A &&
+	test_commit 7_B &&
+	test_commit 7_C &&
+	git checkout -b 7_2 7_1~2 &&
+	test_commit 7_D &&
+	test_commit 7_E &&
+	git checkout -b 7_3 7_1~1 &&
+	test_commit 7_F &&
+	test_commit 7_G &&
+	git checkout -b 7_4 7_2~1 &&
+	test_commit 7_H &&
+	git checkout -b 7_5 7_1~2 &&
+	test_commit 7_I &&
+	git checkout -b 7_6 7_3~1 &&
+	test_commit 7_J &&
+	git checkout -b M_1 7_1 &&
+	git merge --no-ff 7_2 -m 7_M1 &&
+	git checkout -b M_3 7_3 &&
+	git merge --no-ff 7_4 -m 7_M2 &&
+	git checkout -b M_5 7_5 &&
+	git merge --no-ff 7_6 -m 7_M3 &&
+	git checkout -b M_7 7_1 &&
+	git merge --no-ff 7_2 7_3 -m 7_M4 &&
+
+	check_graph M_1 M_3 M_5 M_7 <<-\EOF
+	*   7_M1
+	|\
+	| | *   7_M2
+	| | |\
+	| | | * 7_H
+	| | | | *   7_M3
+	| | | | |\
+	| | | | | * 7_J
+	| | | | * | 7_I
+	| | | | | | *   7_M4
+	| |_|_|_|_|/|\
+	|/| | | | |/ /
+	| | |_|_|/| /
+	| |/| | | |/
+	| | | |_|/|
+	| | |/| | |
+	| | * | | | 7_G
+	| | | |_|/
+	| | |/| |
+	| | * | | 7_F
+	| * | | | 7_E
+	| | |/ /
+	| |/| |
+	| * | | 7_D
+	| | |/
+	| |/|
+	* | | 7_C
+	| |/
+	|/|
+	* | 7_B
+	|/
+	* 7_A
+	EOF
+'
+
+test_done
diff --git a/t/t4216-log-bloom.sh b/t/t4216-log-bloom.sh
new file mode 100755
index 0000000000..50f206db55
--- /dev/null
+++ b/t/t4216-log-bloom.sh
@@ -0,0 +1,408 @@
+#!/bin/sh
+
+test_description='git log for a path with Bloom filters'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+GIT_TEST_COMMIT_GRAPH=0
+GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
+
+test_expect_success 'setup test - repo, commits, commit graph, log outputs' '
+	git init &&
+	mkdir A A/B A/B/C &&
+	test_commit c1 A/file1 &&
+	test_commit c2 A/B/file2 &&
+	test_commit c3 A/B/C/file3 &&
+	test_commit c4 A/file1 &&
+	test_commit c5 A/B/file2 &&
+	test_commit c6 A/B/C/file3 &&
+	test_commit c7 A/file1 &&
+	test_commit c8 A/B/file2 &&
+	test_commit c9 A/B/C/file3 &&
+	test_commit c10 file_to_be_deleted &&
+	git checkout -b side HEAD~4 &&
+	test_commit side-1 file4 &&
+	git checkout main &&
+	git merge side &&
+	test_commit c11 file5 &&
+	mv file5 file5_renamed &&
+	git add file5_renamed &&
+	git commit -m "rename" &&
+	rm file_to_be_deleted &&
+	git add . &&
+	git commit -m "file removed" &&
+	git commit --allow-empty -m "empty" &&
+	git commit-graph write --reachable --changed-paths &&
+
+	test_oid_cache <<-EOF
+	oid_version sha1:1
+	oid_version sha256:2
+	EOF
+'
+
+graph_read_expect () {
+	NUM_CHUNKS=6
+	cat >expect <<- EOF
+	header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
+	num_commits: $1
+	chunks: oid_fanout oid_lookup commit_metadata generation_data bloom_indexes bloom_data
+	EOF
+	test-tool read-graph >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success 'commit-graph write wrote out the bloom chunks' '
+	graph_read_expect 16
+'
+
+# Turn off any inherited trace2 settings for this test.
+sane_unset GIT_TRACE2 GIT_TRACE2_PERF GIT_TRACE2_EVENT
+sane_unset GIT_TRACE2_PERF_BRIEF
+sane_unset GIT_TRACE2_CONFIG_PARAMS
+
+setup () {
+	rm -f "$TRASH_DIRECTORY/trace.perf" &&
+	git -c core.commitGraph=false log --pretty="format:%s" $1 >log_wo_bloom &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.perf" git -c core.commitGraph=true log --pretty="format:%s" $1 >log_w_bloom
+}
+
+test_bloom_filters_used () {
+	log_args=$1
+	bloom_trace_prefix="statistics:{\"filter_not_present\":${2:-0},\"maybe\""
+	setup "$log_args" &&
+	grep -q "$bloom_trace_prefix" "$TRASH_DIRECTORY/trace.perf" &&
+	test_cmp log_wo_bloom log_w_bloom &&
+    test_path_is_file "$TRASH_DIRECTORY/trace.perf"
+}
+
+test_bloom_filters_not_used () {
+	log_args=$1
+	setup "$log_args" &&
+	! grep -q "statistics:{\"filter_not_present\":" "$TRASH_DIRECTORY/trace.perf" &&
+	test_cmp log_wo_bloom log_w_bloom
+}
+
+for path in A A/B A/B/C A/file1 A/B/file2 A/B/C/file3 file4 file5 file5_renamed file_to_be_deleted
+do
+	for option in "" \
+	      "--all" \
+		      "--full-history" \
+		      "--full-history --simplify-merges" \
+		      "--simplify-merges" \
+		      "--simplify-by-decoration" \
+		      "--follow" \
+		      "--first-parent" \
+		      "--topo-order" \
+		      "--date-order" \
+		      "--author-date-order" \
+		      "--ancestry-path side..main"
+	do
+		test_expect_success "git log option: $option for path: $path" '
+			test_bloom_filters_used "$option -- $path" &&
+			test_config commitgraph.readChangedPaths false &&
+			test_bloom_filters_not_used "$option -- $path"
+		'
+	done
+done
+
+test_expect_success 'git log -- folder works with and without the trailing slash' '
+	test_bloom_filters_used "-- A" &&
+	test_bloom_filters_used "-- A/"
+'
+
+test_expect_success 'git log for path that does not exist. ' '
+	test_bloom_filters_used "-- path_does_not_exist"
+'
+
+test_expect_success 'git log with --walk-reflogs does not use Bloom filters' '
+	test_bloom_filters_not_used "--walk-reflogs -- A"
+'
+
+test_expect_success 'git log -- multiple path specs does not use Bloom filters' '
+	test_bloom_filters_not_used "-- file4 A/file1"
+'
+
+test_expect_success 'git log -- "." pathspec at root does not use Bloom filters' '
+	test_bloom_filters_not_used "-- ."
+'
+
+test_expect_success 'git log with wildcard that resolves to a single path uses Bloom filters' '
+	test_bloom_filters_used "-- *4" &&
+	test_bloom_filters_used "-- *renamed"
+'
+
+test_expect_success 'git log with wildcard that resolves to a multiple paths does not uses Bloom filters' '
+	test_bloom_filters_not_used "-- *" &&
+	test_bloom_filters_not_used "-- file*"
+'
+
+test_expect_success 'setup - add commit-graph to the chain without Bloom filters' '
+	test_commit c14 A/anotherFile2 &&
+	test_commit c15 A/B/anotherFile2 &&
+	test_commit c16 A/B/C/anotherFile2 &&
+	git commit-graph write --reachable --split --no-changed-paths &&
+	test_line_count = 2 .git/objects/info/commit-graphs/commit-graph-chain
+'
+
+test_expect_success 'use Bloom filters even if the latest graph does not have Bloom filters' '
+	# Ensure that the number of empty filters is equal to the number of
+	# filters in the latest graph layer to prove that they are loaded (and
+	# ignored).
+	test_bloom_filters_used "-- A/B" 3
+'
+
+test_expect_success 'setup - add commit-graph to the chain with Bloom filters' '
+	test_commit c17 A/anotherFile3 &&
+	git commit-graph write --reachable --changed-paths --split &&
+	test_line_count = 3 .git/objects/info/commit-graphs/commit-graph-chain
+'
+
+test_bloom_filters_used_when_some_filters_are_missing () {
+	log_args=$1
+	bloom_trace_prefix="statistics:{\"filter_not_present\":3,\"maybe\":6,\"definitely_not\":9"
+	setup "$log_args" &&
+	grep -q "$bloom_trace_prefix" "$TRASH_DIRECTORY/trace.perf" &&
+	test_cmp log_wo_bloom log_w_bloom
+}
+
+test_expect_success 'Use Bloom filters if they exist in the latest but not all commit graphs in the chain.' '
+	test_bloom_filters_used_when_some_filters_are_missing "-- A/B"
+'
+
+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
+'
+
+test_max_changed_paths () {
+	grep "\"max_changed_paths\":$1" $2
+}
+
+test_filter_not_computed () {
+	grep "\"key\":\"filter-not-computed\",\"value\":\"$1\"" $2
+}
+
+test_filter_computed () {
+	grep "\"key\":\"filter-computed\",\"value\":\"$1\"" $2
+}
+
+test_filter_trunc_empty () {
+	grep "\"key\":\"filter-trunc-empty\",\"value\":\"$1\"" $2
+}
+
+test_filter_trunc_large () {
+	grep "\"key\":\"filter-trunc-large\",\"value\":\"$1\"" $2
+}
+
+test_expect_success 'correctly report changes over limit' '
+	git init limits &&
+	(
+		cd limits &&
+		mkdir d &&
+		mkdir d/e &&
+
+		for i in $(test_seq 1 2)
+		do
+			printf $i >d/file$i.txt &&
+			printf $i >d/e/file$i.txt || return 1
+		done &&
+
+		mkdir mode &&
+		printf bash >mode/script.sh &&
+
+		mkdir foo &&
+		touch foo/bar &&
+		touch foo.txt &&
+
+		git add d foo foo.txt mode &&
+		git commit -m "files" &&
+
+		# Commit has 7 file and 4 directory adds
+		GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=10 \
+			GIT_TRACE2_EVENT="$(pwd)/trace" \
+			git commit-graph write --reachable --changed-paths &&
+		test_max_changed_paths 10 trace &&
+		test_filter_computed 1 trace &&
+		test_filter_trunc_large 1 trace &&
+
+		for path in $(git ls-tree -r --name-only HEAD)
+		do
+			git -c commitGraph.readChangedPaths=false log \
+				-- $path >expect &&
+			git log -- $path >actual &&
+			test_cmp expect actual || return 1
+		done &&
+
+		# Make a variety of path changes
+		printf new1 >d/e/file1.txt &&
+		printf new2 >d/file2.txt &&
+		rm d/e/file2.txt &&
+		rm -r foo &&
+		printf text >foo &&
+		mkdir f &&
+		printf new1 >f/file1.txt &&
+
+		# including a mode-only change (counts as modified)
+		git update-index --chmod=+x mode/script.sh &&
+
+		git add foo d f &&
+		git commit -m "complicated" &&
+
+		# start from scratch and rebuild
+		rm -f .git/objects/info/commit-graph &&
+		GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=10 \
+			GIT_TRACE2_EVENT="$(pwd)/trace-edit" \
+			git commit-graph write --reachable --changed-paths &&
+		test_max_changed_paths 10 trace-edit &&
+		test_filter_computed 2 trace-edit &&
+		test_filter_trunc_large 2 trace-edit &&
+
+		for path in $(git ls-tree -r --name-only HEAD)
+		do
+			git -c commitGraph.readChangedPaths=false log \
+				-- $path >expect &&
+			git log -- $path >actual &&
+			test_cmp expect actual || return 1
+		done &&
+
+		# start from scratch and rebuild
+		rm -f .git/objects/info/commit-graph &&
+		GIT_TEST_BLOOM_SETTINGS_MAX_CHANGED_PATHS=11 \
+			GIT_TRACE2_EVENT="$(pwd)/trace-update" \
+			git commit-graph write --reachable --changed-paths &&
+		test_max_changed_paths 11 trace-update &&
+		test_filter_computed 2 trace-update &&
+		test_filter_trunc_large 0 trace-update &&
+
+		for path in $(git ls-tree -r --name-only HEAD)
+		do
+			git -c commitGraph.readChangedPaths=false log \
+				-- $path >expect &&
+			git log -- $path >actual &&
+			test_cmp expect actual || return 1
+		done
+	)
+'
+
+test_expect_success 'correctly report commits with no changed paths' '
+	git init empty &&
+	test_when_finished "rm -fr empty" &&
+	(
+		cd empty &&
+
+		git commit --allow-empty -m "initial commit" &&
+
+		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+			git commit-graph write --reachable --changed-paths &&
+		test_filter_computed 1 trace.event &&
+		test_filter_not_computed 0 trace.event &&
+		test_filter_trunc_empty 1 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
+'
+
+test_expect_success 'Bloom generation is limited by --max-new-filters' '
+	(
+		cd limits &&
+		test_commit c2 filter &&
+		test_commit c3 filter &&
+		test_commit c4 no-filter &&
+
+		rm -f trace.event &&
+		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+			git commit-graph write --reachable --split=replace \
+				--changed-paths --max-new-filters=2 &&
+
+		test_filter_computed 2 trace.event &&
+		test_filter_not_computed 3 trace.event &&
+		test_filter_trunc_empty 0 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
+'
+
+test_expect_success 'Bloom generation backfills previously-skipped filters' '
+	# Check specifying commitGraph.maxNewFilters over "git config" works.
+	test_config -C limits commitGraph.maxNewFilters 1 &&
+	(
+		cd limits &&
+
+		rm -f trace.event &&
+		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+			git commit-graph write --reachable --changed-paths \
+				--split=replace &&
+		test_filter_computed 1 trace.event &&
+		test_filter_not_computed 4 trace.event &&
+		test_filter_trunc_empty 0 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
+'
+
+test_expect_success '--max-new-filters overrides configuration' '
+	git init override &&
+	test_when_finished "rm -fr override" &&
+	test_config -C override commitGraph.maxNewFilters 2 &&
+	(
+		cd override &&
+		test_commit one &&
+		test_commit two &&
+
+		rm -f trace.event &&
+		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+			git commit-graph write --reachable --changed-paths \
+				--max-new-filters=1 &&
+		test_filter_computed 1 trace.event &&
+		test_filter_not_computed 1 trace.event &&
+		test_filter_trunc_empty 0 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
+'
+
+test_expect_success 'Bloom generation backfills empty commits' '
+	git init empty &&
+	test_when_finished "rm -fr empty" &&
+	(
+		cd empty &&
+		for i in $(test_seq 1 6)
+		do
+			git commit --allow-empty -m "$i"
+		done &&
+
+		# Generate Bloom filters for empty commits 1-6, two at a time.
+		for i in $(test_seq 1 3)
+		do
+			rm -f trace.event &&
+			GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+				git commit-graph write --reachable \
+					--changed-paths --max-new-filters=2 &&
+			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
+		done &&
+
+		# Finally, make sure that once all commits have filters, that
+		# none are subsequently recomputed.
+		rm -f trace.event &&
+		GIT_TRACE2_EVENT="$(pwd)/trace.event" \
+			git commit-graph write --reachable \
+				--changed-paths --max-new-filters=2 &&
+		test_filter_computed 0 trace.event &&
+		test_filter_not_computed 6 trace.event &&
+		test_filter_trunc_empty 0 trace.event &&
+		test_filter_trunc_large 0 trace.event
+	)
+'
+
+test_done
diff --git a/t/t4253-am-keep-cr-dos.sh b/t/t4253-am-keep-cr-dos.sh
index 6e1b73ec3a..0ee69d2a0c 100755
--- a/t/t4253-am-keep-cr-dos.sh
+++ b/t/t4253-am-keep-cr-dos.sh
@@ -6,6 +6,9 @@
 test_description='git-am mbox with dos line ending.
 
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Three patches which will be added as files with dos line ending.
@@ -43,7 +46,7 @@ test_expect_success 'setup repository with dos files' '
 
 test_expect_success 'am with dos files without --keep-cr' '
 	git checkout -b dosfiles initial &&
-	git format-patch -k initial..master &&
+	git format-patch -k initial..main &&
 	test_must_fail git am -k -3 000*.patch &&
 	git am --abort &&
 	rm -rf .git/rebase-apply 000*.patch
@@ -51,23 +54,23 @@ test_expect_success 'am with dos files without --keep-cr' '
 
 test_expect_success 'am with dos files with --keep-cr' '
 	git checkout -b dosfiles-keep-cr initial &&
-	git format-patch -k --stdout initial..master >output &&
+	git format-patch -k --stdout initial..main >output &&
 	git am --keep-cr -k -3 output &&
-	git diff --exit-code master
+	git diff --exit-code main
 '
 
 test_expect_success 'am with dos files config am.keepcr' '
 	git config am.keepcr 1 &&
 	git checkout -b dosfiles-conf-keepcr initial &&
-	git format-patch -k --stdout initial..master >output &&
+	git format-patch -k --stdout initial..main >output &&
 	git am -k -3 output &&
-	git diff --exit-code master
+	git diff --exit-code main
 '
 
 test_expect_success 'am with dos files config am.keepcr overridden by --no-keep-cr' '
 	git config am.keepcr 1 &&
 	git checkout -b dosfiles-conf-keepcr-override initial &&
-	git format-patch -k initial..master &&
+	git format-patch -k initial..main &&
 	test_must_fail git am -k -3 --no-keep-cr 000*.patch &&
 	git am --abort &&
 	rm -rf .git/rebase-apply 000*.patch
@@ -75,14 +78,14 @@ test_expect_success 'am with dos files config am.keepcr overridden by --no-keep-
 
 test_expect_success 'am with dos files with --keep-cr continue' '
 	git checkout -b dosfiles-keep-cr-continue initial &&
-	git format-patch -k initial..master &&
+	git format-patch -k initial..main &&
 	append_cr <file1a >file &&
 	git commit -m "different patch" file &&
 	test_must_fail git am --keep-cr -k -3 000*.patch &&
 	append_cr <file2 >file &&
 	git add file &&
 	git am -3 --resolved &&
-	git diff --exit-code master
+	git diff --exit-code main
 '
 
 test_expect_success 'am with unix files config am.keepcr overridden by --no-keep-cr' '
@@ -90,9 +93,9 @@ test_expect_success 'am with unix files config am.keepcr overridden by --no-keep
 	git checkout -b unixfiles-conf-keepcr-override initial &&
 	cp -f file1 file &&
 	git commit -m "line ending to unix" file &&
-	git format-patch -k initial..master &&
+	git format-patch -k initial..main &&
 	git am -k -3 --no-keep-cr 000*.patch &&
-	git diff --exit-code -w master
+	git diff --exit-code -w main
 '
 
 test_done
diff --git a/t/t4254-am-corrupt.sh b/t/t4254-am-corrupt.sh
index fd3bdbfe2c..54be7da161 100755
--- a/t/t4254-am-corrupt.sh
+++ b/t/t4254-am-corrupt.sh
@@ -3,6 +3,37 @@
 test_description='git am with corrupt input'
 . ./test-lib.sh
 
+make_mbox_with_nul () {
+	space=' '
+	q_nul_in_subject=
+	q_nul_in_body=
+	while test $# -ne 0
+	do
+		case "$1" in
+		subject) q_nul_in_subject='=00' ;;
+		body)    q_nul_in_body='=00' ;;
+		esac &&
+		shift
+	done &&
+	cat <<-EOF
+	From ec7364544f690c560304f5a5de9428ea3b978b26 Mon Sep 17 00:00:00 2001
+	From: A U Thor <author@example.com>
+	Date: Sun, 19 Apr 2020 13:42:07 +0700
+	Subject: [PATCH] =?ISO-8859-1?q?=C4=CB${q_nul_in_subject}=D1=CF=D6?=
+	MIME-Version: 1.0
+	Content-Type: text/plain; charset=ISO-8859-1
+	Content-Transfer-Encoding: quoted-printable
+
+	abc${q_nul_in_body}def
+	---
+	diff --git a/afile b/afile
+	new file mode 100644
+	index 0000000000..e69de29bb2
+	--$space
+	2.26.1
+	EOF
+}
+
 test_expect_success setup '
 	# Note the missing "+++" line:
 	cat >bad-patch.diff <<-\EOF &&
@@ -25,13 +56,27 @@ test_expect_success setup '
 #   fatal: unable to write file '(null)' mode 100644: Bad address
 # Also, it had the unwanted side-effect of deleting f.
 test_expect_success 'try to apply corrupted patch' '
-	test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual
-'
-
-test_expect_success 'compare diagnostic; ensure file is still here' '
+	test_when_finished "git am --abort" &&
+	test_must_fail git -c advice.amWorkDir=false am bad-patch.diff 2>actual &&
 	echo "error: git diff header lacks filename information (line 4)" >expected &&
 	test_path_is_file f &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
+'
+
+test_expect_success "NUL in commit message's body" '
+	test_when_finished "git am --abort" &&
+	make_mbox_with_nul body >body.patch &&
+	test_must_fail git am body.patch 2>err &&
+	grep "a NUL byte in commit log message not allowed" err
 '
 
+test_expect_success "NUL in commit message's header" "
+	test_when_finished 'git am --abort' &&
+	make_mbox_with_nul subject >subject.patch &&
+	test_must_fail git mailinfo msg patch <subject.patch 2>err &&
+	grep \"a NUL byte in 'Subject' is not allowed\" err &&
+	test_must_fail git am subject.patch 2>err &&
+	grep \"a NUL byte in 'Subject' is not allowed\" err
+"
+
 test_done
diff --git a/t/t4255-am-submodule.sh b/t/t4255-am-submodule.sh
index 0ba8194403..a7ba08f728 100755
--- a/t/t4255-am-submodule.sh
+++ b/t/t4255-am-submodule.sh
@@ -6,17 +6,21 @@ test_description='git am handling submodules'
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
 
 am () {
-	git format-patch --stdout --ignore-submodules=dirty "..$1" | git am -
+	git format-patch --stdout --ignore-submodules=dirty "..$1" >patch &&
+	may_only_be_test_must_fail "$2" &&
+	$2 git am patch
 }
 
-test_submodule_switch "am"
+test_submodule_switch_func "am"
 
 am_3way () {
-	git format-patch --stdout --ignore-submodules=dirty "..$1" | git am --3way -
+	git format-patch --stdout --ignore-submodules=dirty "..$1" >patch &&
+	may_only_be_test_must_fail "$2" &&
+	$2 git am --3way patch
 }
 
 KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
-test_submodule_switch "am_3way"
+test_submodule_switch_func "am_3way"
 
 test_expect_success 'setup diff.submodule' '
 	test_commit one &&
diff --git a/t/t4256-am-format-flowed.sh b/t/t4256-am-format-flowed.sh
index 6340310e9a..2369c4e17a 100755
--- a/t/t4256-am-format-flowed.sh
+++ b/t/t4256-am-format-flowed.sh
@@ -11,7 +11,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'am with format=flowed' '
-	git am <"$TEST_DIRECTORY/t4256/1/patch" >stdout 2>stderr &&
+	git am <"$TEST_DIRECTORY/t4256/1/patch" 2>stderr &&
 	test_i18ngrep "warning: Patch sent with format=flowed" stderr &&
 	test_cmp "$TEST_DIRECTORY/t4256/1/mailinfo.c" mailinfo.c
 '
diff --git a/t/t4257-am-interactive.sh b/t/t4257-am-interactive.sh
index 5344bd248a..aed8f4de3d 100755
--- a/t/t4257-am-interactive.sh
+++ b/t/t4257-am-interactive.sh
@@ -10,7 +10,7 @@ test_expect_success 'set up patches to apply' '
 	git format-patch --stdout -2 >mbox &&
 
 	git reset --hard unrelated &&
-	test_commit conflict-master file master base
+	test_commit conflict-main file main base
 '
 
 # Sanity check our setup.
diff --git a/t/t4258-am-quoted-cr.sh b/t/t4258-am-quoted-cr.sh
new file mode 100755
index 0000000000..201915b45a
--- /dev/null
+++ b/t/t4258-am-quoted-cr.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+test_description='test am --quoted-cr=<action>'
+
+. ./test-lib.sh
+
+DATA="$TEST_DIRECTORY/t4258"
+
+test_expect_success 'setup' '
+	test_write_lines one two three >text &&
+	test_commit one text &&
+	test_write_lines one owt three >text &&
+	test_commit two text
+'
+
+test_expect_success 'am warn if quoted-cr is found' '
+	git reset --hard one &&
+	test_must_fail git am "$DATA/mbox" 2>err &&
+	grep "quoted CRLF detected" err
+'
+
+test_expect_success 'am --quoted-cr=strip' '
+	test_might_fail git am --abort &&
+	git reset --hard one &&
+	git am --quoted-cr=strip "$DATA/mbox" &&
+	git diff --exit-code HEAD two
+'
+
+test_expect_success 'am with config mailinfo.quotedCr=strip' '
+	test_might_fail git am --abort &&
+	git reset --hard one &&
+	test_config mailinfo.quotedCr strip &&
+	git am "$DATA/mbox" &&
+	git diff --exit-code HEAD two
+'
+
+test_done
diff --git a/t/t4258/mbox b/t/t4258/mbox
new file mode 100644
index 0000000000..c62819f3d2
--- /dev/null
+++ b/t/t4258/mbox
@@ -0,0 +1,12 @@
+From: A U Thor <mail@example.com>
+To: list@example.org
+Subject: [PATCH v2] sample
+Date: Mon,  3 Aug 2020 22:40:55 +0700
+Message-Id: <msg-id@example.com>
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: base64
+
+VGhpcyBpcyBjb21taXQgbWVzc2FnZS4NCi0tLQ0KIHRleHQgfCAyICstDQogMSBmaWxlIGNoYW5n
+ZWQsIDEgaW5zZXJ0aW9uKCspLCAxIGRlbGV0aW9uKC0pDQoNCmRpZmYgLS1naXQgYS90ZXh0IGIv
+dGV4dA0KaW5kZXggNTYyNmFiZi4uZjcxOWVmZCAxMDA2NDQNCi0tLSBhL3RleHQNCisrKyBiL3Rl
+eHQNCkBAIC0xICsxIEBADQotb25lDQordHdvDQotLSANCjIuMzEuMQoK
diff --git a/t/t4300-merge-tree.sh b/t/t4300-merge-tree.sh
index d87cc7d9ef..e59601e5fe 100755
--- a/t/t4300-merge-tree.sh
+++ b/t/t4300-merge-tree.sh
@@ -11,16 +11,16 @@ test_expect_success setup '
 '
 
 test_expect_success 'file add A, !B' '
-	cat >expected <<\EXPECTED &&
+	git reset --hard initial &&
+	test_commit "add-a-not-b" "ONE" "AAA" &&
+	git merge-tree initial initial add-a-not-b >actual &&
+	cat >expected <<EXPECTED &&
 added in remote
-  their  100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
+  their  100644 $(git rev-parse HEAD:ONE) ONE
 @@ -0,0 +1 @@
 +AAA
 EXPECTED
 
-	git reset --hard initial &&
-	test_commit "add-a-not-b" "ONE" "AAA" &&
-	git merge-tree initial initial add-a-not-b >actual &&
 	test_cmp expected actual
 '
 
@@ -41,10 +41,15 @@ test_expect_success 'file add A, B (same)' '
 '
 
 test_expect_success 'file add A, B (different)' '
-	cat >expected <<\EXPECTED &&
+	git reset --hard initial &&
+	test_commit "add-a-b-diff-A" "ONE" "AAA" &&
+	git reset --hard initial &&
+	test_commit "add-a-b-diff-B" "ONE" "BBB" &&
+	git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual &&
+	cat >expected <<EXPECTED &&
 added in both
-  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
+  our    100644 $(git rev-parse add-a-b-diff-A:ONE) ONE
+  their  100644 $(git rev-parse add-a-b-diff-B:ONE) ONE
 @@ -1 +1,5 @@
 +<<<<<<< .our
  AAA
@@ -53,11 +58,6 @@ added in both
 +>>>>>>> .their
 EXPECTED
 
-	git reset --hard initial &&
-	test_commit "add-a-b-diff-A" "ONE" "AAA" &&
-	git reset --hard initial &&
-	test_commit "add-a-b-diff-B" "ONE" "BBB" &&
-	git merge-tree initial add-a-b-diff-A add-a-b-diff-B >actual &&
 	test_cmp expected actual
 '
 
@@ -69,18 +69,18 @@ test_expect_success 'file change A, !B' '
 '
 
 test_expect_success 'file change !A, B' '
-	cat >expected <<\EXPECTED &&
+	git reset --hard initial &&
+	test_commit "change-not-a-b" "initial-file" "BBB" &&
+	git merge-tree initial initial change-not-a-b >actual &&
+	cat >expected <<EXPECTED &&
 merged
-  result 100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file
-  our    100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
+  result 100644 $(git rev-parse change-a-not-b:initial-file) initial-file
+  our    100644 $(git rev-parse initial:initial-file       ) initial-file
 @@ -1 +1 @@
 -initial
 +BBB
 EXPECTED
 
-	git reset --hard initial &&
-	test_commit "change-not-a-b" "initial-file" "BBB" &&
-	git merge-tree initial initial change-not-a-b >actual &&
 	test_cmp expected actual
 '
 
@@ -94,11 +94,16 @@ test_expect_success 'file change A, B (same)' '
 '
 
 test_expect_success 'file change A, B (different)' '
-	cat >expected <<\EXPECTED &&
+	git reset --hard initial &&
+	test_commit "change-a-b-diff-A" "initial-file" "AAA" &&
+	git reset --hard initial &&
+	test_commit "change-a-b-diff-B" "initial-file" "BBB" &&
+	git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual &&
+	cat >expected <<EXPECTED &&
 changed in both
-  base   100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
-  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d initial-file
-  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 initial-file
+  base   100644 $(git rev-parse initial:initial-file          ) initial-file
+  our    100644 $(git rev-parse change-a-b-diff-A:initial-file) initial-file
+  their  100644 $(git rev-parse change-a-b-diff-B:initial-file) initial-file
 @@ -1 +1,5 @@
 +<<<<<<< .our
  AAA
@@ -107,34 +112,10 @@ changed in both
 +>>>>>>> .their
 EXPECTED
 
-	git reset --hard initial &&
-	test_commit "change-a-b-diff-A" "initial-file" "AAA" &&
-	git reset --hard initial &&
-	test_commit "change-a-b-diff-B" "initial-file" "BBB" &&
-	git merge-tree initial change-a-b-diff-A change-a-b-diff-B >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'file change A, B (mixed)' '
-	cat >expected <<\EXPECTED &&
-changed in both
-  base   100644 f4f1f998c7776568c4ff38f516d77fef9399b5a7 ONE
-  our    100644 af14c2c3475337c73759d561ef70b59e5c731176 ONE
-  their  100644 372d761493f524d44d59bd24700c3bdf914c973c ONE
-@@ -7,7 +7,11 @@
- AAA
- AAA
- AAA
-+<<<<<<< .our
- BBB
-+=======
-+CCC
-+>>>>>>> .their
- AAA
- AAA
- AAA
-EXPECTED
-
 	git reset --hard initial &&
 	test_commit "change-a-b-mix-base" "ONE" "
 AAA
@@ -159,6 +140,26 @@ AAA" &&
 		"$(sed -e "1{s/AAA/BBB/;}" -e "10{s/AAA/CCC/;}" <ONE)" &&
 	git merge-tree change-a-b-mix-base change-a-b-mix-A change-a-b-mix-B \
 		>actual &&
+
+	cat >expected <<EXPECTED &&
+changed in both
+  base   100644 $(git rev-parse change-a-b-mix-base:ONE) ONE
+  our    100644 $(git rev-parse change-a-b-mix-A:ONE   ) ONE
+  their  100644 $(git rev-parse change-a-b-mix-B:ONE   ) ONE
+@@ -7,7 +7,11 @@
+ AAA
+ AAA
+ AAA
++<<<<<<< .our
+ BBB
++=======
++CCC
++>>>>>>> .their
+ AAA
+ AAA
+ AAA
+EXPECTED
+
 	test_cmp expected actual
 '
 
@@ -173,20 +174,20 @@ test_expect_success 'file remove A, !B' '
 '
 
 test_expect_success 'file remove !A, B' '
-	cat >expected <<\EXPECTED &&
-removed in remote
-  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-@@ -1 +0,0 @@
--AAA
-EXPECTED
-
 	git reset --hard initial &&
 	test_commit "rm-not-a-b-base" "ONE" "AAA" &&
 	git rm ONE &&
 	git commit -m "rm-not-a-b" &&
 	git tag "rm-not-a-b" &&
 	git merge-tree rm-a-not-b-base rm-a-not-b-base rm-a-not-b >actual &&
+	cat >expected <<EXPECTED &&
+removed in remote
+  base   100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
+  our    100644 $(git rev-parse rm-a-not-b-base:ONE) ONE
+@@ -1 +0,0 @@
+-AAA
+EXPECTED
+
 	test_cmp expected actual
 '
 
@@ -201,14 +202,6 @@ test_expect_success 'file remove A, B (same)' '
 '
 
 test_expect_success 'file change A, remove B' '
-	cat >expected <<\EXPECTED &&
-removed in remote
-  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  our    100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
-@@ -1 +0,0 @@
--BBB
-EXPECTED
-
 	git reset --hard initial &&
 	test_commit "change-a-rm-b-base" "ONE" "AAA" &&
 	test_commit "change-a-rm-b-A" "ONE" "BBB" &&
@@ -218,16 +211,18 @@ EXPECTED
 	git tag "change-a-rm-b-B" &&
 	git merge-tree change-a-rm-b-base change-a-rm-b-A change-a-rm-b-B \
 		>actual &&
+	cat >expected <<EXPECTED &&
+removed in remote
+  base   100644 $(git rev-parse change-a-rm-b-base:ONE) ONE
+  our    100644 $(git rev-parse change-a-rm-b-A:ONE   ) ONE
+@@ -1 +0,0 @@
+-BBB
+EXPECTED
+
 	test_cmp expected actual
 '
 
 test_expect_success 'file remove A, change B' '
-	cat >expected <<\EXPECTED &&
-removed in local
-  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d ONE
-  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 ONE
-EXPECTED
-
 	git reset --hard initial &&
 	test_commit "rm-a-change-b-base" "ONE" "AAA" &&
 
@@ -238,6 +233,11 @@ EXPECTED
 	test_commit "rm-a-change-b-B" "ONE" "BBB" &&
 	git merge-tree rm-a-change-b-base rm-a-change-b-A rm-a-change-b-B \
 		>actual &&
+	cat >expected <<EXPECTED &&
+removed in local
+  base   100644 $(git rev-parse rm-a-change-b-base:ONE) ONE
+  their  100644 $(git rev-parse rm-a-change-b-B:ONE   ) ONE
+EXPECTED
 	test_cmp expected actual
 '
 
@@ -250,10 +250,17 @@ test_expect_success 'tree add A, B (same)' '
 '
 
 test_expect_success 'tree add A, B (different)' '
-	cat >expect <<-\EOF &&
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "AAA" add-tree-a-b-A &&
+	git reset --hard initial &&
+	mkdir sub &&
+	test_commit "add sub/file" "sub/file" "BBB" add-tree-a-b-B &&
+	git merge-tree initial add-tree-a-b-A add-tree-a-b-B >actual &&
+	cat >expect <<-EOF &&
 	added in both
-	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
-	  their  100644 ba629238ca89489f2b350e196ca445e09d8bb834 sub/file
+	  our    100644 $(git rev-parse add-tree-a-b-A:sub/file) sub/file
+	  their  100644 $(git rev-parse add-tree-a-b-B:sub/file) sub/file
 	@@ -1 +1,5 @@
 	+<<<<<<< .our
 	 AAA
@@ -261,24 +268,10 @@ test_expect_success 'tree add A, B (different)' '
 	+BBB
 	+>>>>>>> .their
 	EOF
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "AAA" add-tree-a-b-A &&
-	git reset --hard initial &&
-	mkdir sub &&
-	test_commit "add sub/file" "sub/file" "BBB" add-tree-a-b-B &&
-	git merge-tree initial add-tree-a-b-A add-tree-a-b-B >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'tree unchanged A, removed B' '
-	cat >expect <<-\EOF &&
-	removed in remote
-	  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
-	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d sub/file
-	@@ -1 +0,0 @@
-	-AAA
-	EOF
 	git reset --hard initial &&
 	mkdir sub &&
 	test_commit "add sub/file" "sub/file" "AAA" tree-remove-b-initial &&
@@ -287,6 +280,13 @@ test_expect_success 'tree unchanged A, removed B' '
 	git commit -m "remove sub/file" &&
 	git tag tree-remove-b-B &&
 	git merge-tree tree-remove-b-initial tree-remove-b-initial tree-remove-b-B >actual &&
+	cat >expect <<-EOF &&
+	removed in remote
+	  base   100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
+	  our    100644 $(git rev-parse tree-remove-b-initial:sub/file) sub/file
+	@@ -1 +0,0 @@
+	-AAA
+	EOF
 	test_cmp expect actual
 '
 
@@ -296,14 +296,14 @@ test_expect_success 'turn file to tree' '
 	mkdir initial-file &&
 	test_commit "turn-file-to-tree" "initial-file/ONE" "CCC" &&
 	git merge-tree initial initial turn-file-to-tree >actual &&
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	added in remote
-	  their  100644 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 initial-file/ONE
+	  their  100644 $(git rev-parse turn-file-to-tree:initial-file/ONE) initial-file/ONE
 	@@ -0,0 +1 @@
 	+CCC
 	removed in remote
-	  base   100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
-	  our    100644 e79c5e8f964493290a409888d5413a737e8e5dd5 initial-file
+	  base   100644 $(git rev-parse initial:initial-file) initial-file
+	  our    100644 $(git rev-parse initial:initial-file) initial-file
 	@@ -1 +0,0 @@
 	-initial
 	EOF
@@ -318,14 +318,14 @@ test_expect_success 'turn tree to file' '
 	rm -fr dir &&
 	test_commit "make-file" "dir" "CCC" &&
 	git merge-tree add-tree add-another-tree make-file >actual &&
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	removed in remote
-	  base   100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path
-	  our    100644 43d5a8ed6ef6c00ff775008633f95787d088285d dir/path
+	  base   100644 $(git rev-parse add-tree:dir/path) dir/path
+	  our    100644 $(git rev-parse add-tree:dir/path) dir/path
 	@@ -1 +0,0 @@
 	-AAA
 	added in remote
-	  their  100644 43aa4fdec31eb92e1fdc2f0ce6ea9ddb7c32bcf7 dir
+	  their  100644 $(git rev-parse make-file:dir) dir
 	@@ -0,0 +1 @@
 	+CCC
 	EOF
diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh
index 37655a237c..2c88d1c159 100755
--- a/t/t5000-tar-tree.sh
+++ b/t/t5000-tar-tree.sh
@@ -94,6 +94,16 @@ check_tar() {
 	'
 }
 
+check_added() {
+	dir=$1
+	path_in_fs=$2
+	path_in_archive=$3
+
+	test_expect_success " validate extra file $path_in_archive" '
+		diff -r $path_in_fs $dir/$path_in_archive
+	'
+}
+
 test_expect_success 'setup' '
 	test_oid_cache <<-EOF
 	obj sha1:19f9c8273ec45a8938e6999cb59b3ff66739902a
@@ -101,25 +111,34 @@ test_expect_success 'setup' '
 	EOF
 '
 
-test_expect_success \
-    'populate workdir' \
-    'mkdir a &&
-     echo simple textfile >a/a &&
-     ten=0123456789 && hundred=$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten &&
-     echo long filename >a/four$hundred &&
-     mkdir a/bin &&
-     test-tool genrandom "frotz" 500000 >a/bin/sh &&
-     printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
-     printf "A not substituted O" >a/substfile2 &&
-     if test_have_prereq SYMLINKS; then
-	ln -s a a/l1
-     else
-	printf %s a > a/l1
-     fi &&
-     (p=long_path_to_a_file && cd a &&
-      for depth in 1 2 3 4 5; do mkdir $p && cd $p; done &&
-      echo text >file_with_long_path) &&
-     (cd a && find .) | sort >a.lst'
+test_expect_success 'populate workdir' '
+	mkdir a &&
+	echo simple textfile >a/a &&
+	ten=0123456789 &&
+	hundred="$ten$ten$ten$ten$ten$ten$ten$ten$ten$ten" &&
+	echo long filename >"a/four$hundred" &&
+	mkdir a/bin &&
+	test-tool genrandom "frotz" 500000 >a/bin/sh &&
+	printf "A\$Format:%s\$O" "$SUBSTFORMAT" >a/substfile1 &&
+	printf "A not substituted O" >a/substfile2 &&
+	if test_have_prereq SYMLINKS
+	then
+		ln -s a a/l1
+	else
+		printf %s a >a/l1
+	fi &&
+	(
+		p=long_path_to_a_file &&
+		cd a &&
+		for depth in 1 2 3 4 5
+		do
+			mkdir $p &&
+			cd $p
+		done &&
+		echo text >file_with_long_path
+	) &&
+	(cd a && find .) | sort >a.lst
+'
 
 test_expect_success \
     'add ignored file' \
@@ -137,18 +156,18 @@ test_expect_success 'setup export-subst' '
 		>a/substfile1
 '
 
-test_expect_success \
-    'create bare clone' \
-    'git clone --bare . bare.git &&
-     cp .git/info/attributes bare.git/info/attributes'
+test_expect_success 'create bare clone' '
+	git clone --bare . bare.git &&
+	cp .git/info/attributes bare.git/info/attributes
+'
 
-test_expect_success \
-    'remove ignored file' \
-    'rm a/ignored'
+test_expect_success 'remove ignored file' '
+	rm a/ignored
+'
 
-test_expect_success \
-    'git archive' \
-    'git archive HEAD >b.tar'
+test_expect_success 'git archive' '
+	git archive HEAD >b.tar
+'
 
 check_tar b
 
@@ -164,27 +183,48 @@ test_expect_success 'git-archive --prefix=olde-' '
 
 check_tar with_olde-prefix olde-
 
+test_expect_success 'git archive --add-file' '
+	echo untracked >untracked &&
+	git archive --add-file=untracked HEAD >with_untracked.tar
+'
+
+check_tar with_untracked
+check_added with_untracked untracked untracked
+
+test_expect_success 'git archive --add-file twice' '
+	echo untracked >untracked &&
+	git archive --prefix=one/ --add-file=untracked \
+		--prefix=two/ --add-file=untracked \
+		--prefix= HEAD >with_untracked2.tar
+'
+
+check_tar with_untracked2
+check_added with_untracked2 untracked one/untracked
+check_added with_untracked2 untracked two/untracked
+
 test_expect_success 'git archive on large files' '
-    test_config core.bigfilethreshold 1 &&
-    git archive HEAD >b3.tar &&
-    test_cmp_bin b.tar b3.tar
+	test_config core.bigfilethreshold 1 &&
+	git archive HEAD >b3.tar &&
+	test_cmp_bin b.tar b3.tar
 '
 
-test_expect_success \
-    'git archive in a bare repo' \
-    '(cd bare.git && git archive HEAD) >b3.tar'
+test_expect_success 'git archive in a bare repo' '
+	git --git-dir bare.git archive HEAD >b3.tar
+'
 
-test_expect_success \
-    'git archive vs. the same in a bare repo' \
-    'test_cmp_bin b.tar b3.tar'
+test_expect_success 'git archive vs. the same in a bare repo' '
+	test_cmp_bin b.tar b3.tar
+'
 
-test_expect_success 'git archive with --output' \
-    'git archive --output=b4.tar HEAD &&
-    test_cmp_bin b.tar b4.tar'
+test_expect_success 'git archive with --output' '
+	git archive --output=b4.tar HEAD &&
+	test_cmp_bin b.tar b4.tar
+'
 
-test_expect_success 'git archive --remote' \
-    'git archive --remote=. HEAD >b5.tar &&
-    test_cmp_bin b.tar b5.tar'
+test_expect_success 'git archive --remote' '
+	git archive --remote=. HEAD >b5.tar &&
+	test_cmp_bin b.tar b5.tar
+'
 
 test_expect_success 'git archive --remote with configured remote' '
 	git config remote.foo.url . &&
@@ -195,18 +235,19 @@ test_expect_success 'git archive --remote with configured remote' '
 	test_cmp_bin b.tar b5-nick.tar
 '
 
-test_expect_success \
-    'validate file modification time' \
-    'mkdir extract &&
-     "$TAR" xf b.tar -C extract a/a &&
-     test-tool chmtime --get extract/a/a >b.mtime &&
-     echo "1117231200" >expected.mtime &&
-     test_cmp expected.mtime b.mtime'
+test_expect_success 'validate file modification time' '
+	mkdir extract &&
+	"$TAR" xf b.tar -C extract a/a &&
+	test-tool chmtime --get extract/a/a >b.mtime &&
+	echo "1117231200" >expected.mtime &&
+	test_cmp expected.mtime b.mtime
+'
 
-test_expect_success \
-    'git get-tar-commit-id' \
-    'git get-tar-commit-id <b.tar >b.commitid &&
-     test_cmp .git/$(git symbolic-ref HEAD) b.commitid'
+test_expect_success 'git get-tar-commit-id' '
+	git get-tar-commit-id <b.tar >actual &&
+	git rev-parse HEAD >expect &&
+	test_cmp expect actual
+'
 
 test_expect_success 'git archive with --output, override inferred format' '
 	git archive --format=tar --output=d4.zip HEAD &&
@@ -402,15 +443,33 @@ test_expect_success TAR_HUGE,LONG_IS_64BIT 'system tar can read our huge size' '
 	test_cmp expect actual
 '
 
-test_expect_success TIME_IS_64BIT 'set up repository with far-future commit' '
+test_expect_success TIME_IS_64BIT 'set up repository with far-future (2^34 - 1) commit' '
+	rm -f .git/index &&
+	echo foo >file &&
+	git add file &&
+	GIT_COMMITTER_DATE="@17179869183 +0000" \
+		git commit -m "tempori parendum"
+'
+
+test_expect_success TIME_IS_64BIT 'generate tar with far-future mtime' '
+	git archive HEAD >future.tar
+'
+
+test_expect_success TAR_HUGE,TIME_IS_64BIT,TIME_T_IS_64BIT 'system tar can read our future mtime' '
+	echo 2514 >expect &&
+	tar_info future.tar | cut -d" " -f2 >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success TIME_IS_64BIT 'set up repository with far-far-future (2^36 + 1) commit' '
 	rm -f .git/index &&
 	echo content >file &&
 	git add file &&
-	GIT_COMMITTER_DATE="@68719476737 +0000" \
+	GIT_TEST_COMMIT_GRAPH=0 GIT_COMMITTER_DATE="@68719476737 +0000" \
 		git commit -m "tempori parendum"
 '
 
-test_expect_success TIME_IS_64BIT 'generate tar with future mtime' '
+test_expect_success TIME_IS_64BIT 'generate tar with far-far-future mtime' '
 	git archive HEAD >future.tar
 '
 
diff --git a/t/t5001-archive-attr.sh b/t/t5001-archive-attr.sh
index e9aa97117a..712ae52299 100755
--- a/t/t5001-archive-attr.sh
+++ b/t/t5001-archive-attr.sh
@@ -128,4 +128,18 @@ test_expect_success 'export-subst' '
 	test_cmp substfile2 archive/substfile2
 '
 
+test_expect_success 'export-subst expands %(describe) once' '
+	echo "\$Format:%(describe)\$" >substfile3 &&
+	echo "\$Format:%(describe)\$" >>substfile3 &&
+	echo "\$Format:%(describe)${LF}%(describe)\$" >substfile4 &&
+	git add substfile[34] &&
+	git commit -m export-subst-describe &&
+	git tag -m export-subst-describe export-subst-describe &&
+	git archive HEAD >archive-describe.tar &&
+	extract_tar_to_dir archive-describe &&
+	desc=$(git describe) &&
+	grep -F "$desc" archive-describe/substfile[34] >substituted &&
+	test_line_count = 1 substituted
+'
+
 test_done
diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh
index 106eddbd85..1e6d18b140 100755
--- a/t/t5003-archive-zip.sh
+++ b/t/t5003-archive-zip.sh
@@ -7,12 +7,12 @@ test_description='git archive --format=zip test'
 SUBSTFORMAT=%H%n
 
 test_lazy_prereq UNZIP_SYMLINKS '
-	(
-		mkdir unzip-symlinks &&
-		cd unzip-symlinks &&
-		"$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
-		test -h symlink
-	)
+	"$GIT_UNZIP" "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip &&
+	test -h symlink
+'
+
+test_lazy_prereq UNZIP_CONVERT '
+	"$GIT_UNZIP" -a "$TEST_DIRECTORY"/t5003/infozip-symlinks.zip
 '
 
 check_zip() {
@@ -39,39 +39,49 @@ check_zip() {
 	extracted=${dir_with_prefix}a
 	original=a
 
-	test_expect_success UNZIP " extract ZIP archive with EOL conversion" '
+	test_expect_success UNZIP_CONVERT " extract ZIP archive with EOL conversion" '
 		(mkdir $dir && cd $dir && "$GIT_UNZIP" -a ../$zipfile)
 	'
 
-	test_expect_success UNZIP " validate that text files are converted" "
+	test_expect_success UNZIP_CONVERT " validate that text files are converted" "
 		test_cmp_bin $extracted/text.cr $extracted/text.crlf &&
 		test_cmp_bin $extracted/text.cr $extracted/text.lf
 	"
 
-	test_expect_success UNZIP " validate that binary files are unchanged" "
+	test_expect_success UNZIP_CONVERT " validate that binary files are unchanged" "
 		test_cmp_bin $original/binary.cr   $extracted/binary.cr &&
 		test_cmp_bin $original/binary.crlf $extracted/binary.crlf &&
 		test_cmp_bin $original/binary.lf   $extracted/binary.lf
 	"
 
-	test_expect_success UNZIP " validate that diff files are converted" "
+	test_expect_success UNZIP_CONVERT " validate that diff files are converted" "
 		test_cmp_bin $extracted/diff.cr $extracted/diff.crlf &&
 		test_cmp_bin $extracted/diff.cr $extracted/diff.lf
 	"
 
-	test_expect_success UNZIP " validate that -diff files are unchanged" "
+	test_expect_success UNZIP_CONVERT " validate that -diff files are unchanged" "
 		test_cmp_bin $original/nodiff.cr   $extracted/nodiff.cr &&
 		test_cmp_bin $original/nodiff.crlf $extracted/nodiff.crlf &&
 		test_cmp_bin $original/nodiff.lf   $extracted/nodiff.lf
 	"
 
-	test_expect_success UNZIP " validate that custom diff is unchanged " "
+	test_expect_success UNZIP_CONVERT " validate that custom diff is unchanged " "
 		test_cmp_bin $original/custom.cr   $extracted/custom.cr &&
 		test_cmp_bin $original/custom.crlf $extracted/custom.crlf &&
 		test_cmp_bin $original/custom.lf   $extracted/custom.lf
 	"
 }
 
+check_added() {
+	dir=$1
+	path_in_fs=$2
+	path_in_archive=$3
+
+	test_expect_success UNZIP " validate extra file $path_in_archive" '
+		diff -r $path_in_fs $dir/$path_in_archive
+	'
+}
+
 test_expect_success \
     'populate workdir' \
     'mkdir a &&
@@ -188,4 +198,22 @@ test_expect_success 'git archive --format=zip on large files' '
 
 check_zip large-compressed
 
+test_expect_success 'git archive --format=zip --add-file' '
+	echo untracked >untracked &&
+	git archive --format=zip --add-file=untracked HEAD >with_untracked.zip
+'
+
+check_zip with_untracked
+check_added with_untracked untracked untracked
+
+test_expect_success 'git archive --format=zip --add-file twice' '
+	echo untracked >untracked &&
+	git archive --format=zip --prefix=one/ --add-file=untracked \
+		--prefix=two/ --add-file=untracked \
+		--prefix= HEAD >with_untracked2.zip
+'
+check_zip with_untracked2
+check_added with_untracked2 untracked one/untracked
+check_added with_untracked2 untracked two/untracked
+
 test_done
diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh
index 3e7b23cb32..2d32d0ed12 100755
--- a/t/t5004-archive-corner-cases.sh
+++ b/t/t5004-archive-corner-cases.sh
@@ -153,7 +153,8 @@ test_expect_success ZIPINFO 'zip archive with many entries' '
 
 	# check the number of entries in the ZIP file directory
 	expr 65536 + 256 >expect &&
-	"$ZIPINFO" many.zip | head -2 | sed -n "2s/.* //p" >actual &&
+	"$ZIPINFO" -h many.zip >zipinfo &&
+	sed -n "2s/.* //p" <zipinfo >actual &&
 	test_cmp expect actual
 '
 
diff --git a/t/t5100-mailinfo.sh b/t/t5100-mailinfo.sh
index 9690dcad4f..141b29f031 100755
--- a/t/t5100-mailinfo.sh
+++ b/t/t5100-mailinfo.sh
@@ -213,4 +213,59 @@ test_expect_failure 'mailinfo -b separated double [PATCH]' '
 	test z"$subj" = z"Subject: [other] message"
 '
 
+test_expect_success 'mailinfo handles unusual header whitespace' '
+	git mailinfo /dev/null /dev/null >actual <<-\EOF &&
+	From:Real Name <user@example.com>
+	Subject:    extra spaces
+	EOF
+
+	cat >expect <<-\EOF &&
+	Author: Real Name
+	Email: user@example.com
+	Subject: extra spaces
+
+	EOF
+	test_cmp expect actual
+'
+
+check_quoted_cr_mail () {
+	mail="$1" && shift &&
+	git mailinfo -u "$@" "$mail.msg" "$mail.patch" \
+		<"$mail" >"$mail.info" 2>"$mail.err" &&
+	test_cmp "$mail-expected.msg" "$mail.msg" &&
+	test_cmp "$mail-expected.patch" "$mail.patch" &&
+	test_cmp "$DATA/quoted-cr-info" "$mail.info"
+}
+
+test_expect_success 'split base64 email with quoted-cr' '
+	mkdir quoted-cr &&
+	git mailsplit -oquoted-cr "$DATA/quoted-cr.mbox" >quoted-cr/last &&
+	test $(cat quoted-cr/last) = 2
+'
+
+test_expect_success 'mailinfo warn CR in base64 encoded email' '
+	sed -e "s/%%$//" -e "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-msg" \
+		>quoted-cr/0001-expected.msg &&
+	sed "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-msg" \
+		>quoted-cr/0002-expected.msg &&
+	sed -e "s/%%$//" -e "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-patch" \
+		>quoted-cr/0001-expected.patch &&
+	sed "s/%%/$(printf \\015)/g" "$DATA/quoted-cr-patch" \
+		>quoted-cr/0002-expected.patch &&
+	check_quoted_cr_mail quoted-cr/0001 &&
+	test_must_be_empty quoted-cr/0001.err &&
+	check_quoted_cr_mail quoted-cr/0002 &&
+	grep "quoted CRLF detected" quoted-cr/0002.err &&
+	check_quoted_cr_mail quoted-cr/0001 --quoted-cr=nowarn &&
+	test_must_be_empty quoted-cr/0001.err &&
+	check_quoted_cr_mail quoted-cr/0002 --quoted-cr=nowarn &&
+	test_must_be_empty quoted-cr/0002.err &&
+	cp quoted-cr/0001-expected.msg quoted-cr/0002-expected.msg &&
+	cp quoted-cr/0001-expected.patch quoted-cr/0002-expected.patch &&
+	check_quoted_cr_mail quoted-cr/0001 --quoted-cr=strip &&
+	test_must_be_empty quoted-cr/0001.err &&
+	check_quoted_cr_mail quoted-cr/0002 --quoted-cr=strip &&
+	test_must_be_empty quoted-cr/0002.err
+'
+
 test_done
diff --git a/t/t5100/quoted-cr-info b/t/t5100/quoted-cr-info
new file mode 100644
index 0000000000..dab2228b70
--- /dev/null
+++ b/t/t5100/quoted-cr-info
@@ -0,0 +1,5 @@
+Author: A U Thor
+Email: mail@example.com
+Subject: sample
+Date: Mon, 3 Aug 2020 22:40:55 +0700
+
diff --git a/t/t5100/quoted-cr-msg b/t/t5100/quoted-cr-msg
new file mode 100644
index 0000000000..89b05a0784
--- /dev/null
+++ b/t/t5100/quoted-cr-msg
@@ -0,0 +1,2 @@
+On different distro, %%pytest is suffixed with different patterns.%%
+%%
diff --git a/t/t5100/quoted-cr-patch b/t/t5100/quoted-cr-patch
new file mode 100644
index 0000000000..65b13eeef7
--- /dev/null
+++ b/t/t5100/quoted-cr-patch
@@ -0,0 +1,22 @@
+---%%
+ configure | 2 +-%%
+ 1 file changed, 1 insertion(+), 1 deletion(-)%%
+%%
+diff --git a/configure b/configure%%
+index db3538b3..f7c1c095 100755%%
+--- a/configure%%
++++ b/configure%%
+@@ -814,7 +814,7 @@ if [ $have_python3 -eq 1 ]; then%%
+     printf "%%Checking for python3 pytest (>= 3.0)... "%%
+     conf=$(mktemp)%%
+     printf "[pytest]\nminversion=3.0\n" > $conf%%
+-    if pytest-3 -c $conf --version >/dev/null 2>&1; then%%
++    if "$python" -m pytest -c $conf --version >/dev/null 2>&1; then%%
+         printf "Yes.\n"%%
+         have_python3_pytest=1%%
+     else%%
+-- %%
+2.28.0%%
+_______________________________________________
+example mailing list -- list@example.org
+To unsubscribe send an email to list-leave@example.org
diff --git a/t/t5100/quoted-cr.mbox b/t/t5100/quoted-cr.mbox
new file mode 100644
index 0000000000..909021bb7a
--- /dev/null
+++ b/t/t5100/quoted-cr.mbox
@@ -0,0 +1,47 @@
+From nobody Mon Sep 17 00:00:00 2001
+From: A U Thor <mail@example.com>
+To: list@example.org
+Subject: [PATCH v2] sample
+Date: Mon,  3 Aug 2020 22:40:55 +0700
+Message-Id: <msg-id@example.com>
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: base64
+
+T24gZGlmZmVyZW50IGRpc3RybywgDXB5dGVzdCBpcyBzdWZmaXhlZCB3aXRoIGRpZmZlcmVudCBw
+YXR0ZXJucy4KCi0tLQogY29uZmlndXJlIHwgMiArLQogMSBmaWxlIGNoYW5nZWQsIDEgaW5zZXJ0
+aW9uKCspLCAxIGRlbGV0aW9uKC0pCgpkaWZmIC0tZ2l0IGEvY29uZmlndXJlIGIvY29uZmlndXJl
+CmluZGV4IGRiMzUzOGIzLi5mN2MxYzA5NSAxMDA3NTUKLS0tIGEvY29uZmlndXJlCisrKyBiL2Nv
+bmZpZ3VyZQpAQCAtODE0LDcgKzgxNCw3IEBAIGlmIFsgJGhhdmVfcHl0aG9uMyAtZXEgMSBdOyB0
+aGVuCiAgICAgcHJpbnRmICINQ2hlY2tpbmcgZm9yIHB5dGhvbjMgcHl0ZXN0ICg+PSAzLjApLi4u
+ICIKICAgICBjb25mPSQobWt0ZW1wKQogICAgIHByaW50ZiAiW3B5dGVzdF1cbm1pbnZlcnNpb249
+My4wXG4iID4gJGNvbmYKLSAgICBpZiBweXRlc3QtMyAtYyAkY29uZiAtLXZlcnNpb24gPi9kZXYv
+bnVsbCAyPiYxOyB0aGVuCisgICAgaWYgIiRweXRob24iIC1tIHB5dGVzdCAtYyAkY29uZiAtLXZl
+cnNpb24gPi9kZXYvbnVsbCAyPiYxOyB0aGVuCiAgICAgICAgIHByaW50ZiAiWWVzLlxuIgogICAg
+ICAgICBoYXZlX3B5dGhvbjNfcHl0ZXN0PTEKICAgICBlbHNlCi0tIAoyLjI4LjAKX19fX19fX19f
+X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KZXhhbXBsZSBtYWlsaW5nIGxp
+c3QgLS0gbGlzdEBleGFtcGxlLm9yZwpUbyB1bnN1YnNjcmliZSBzZW5kIGFuIGVtYWlsIHRvIGxp
+c3QtbGVhdmVAZXhhbXBsZS5vcmcK
+
+From nobody Mon Sep 17 00:00:00 2001
+From: A U Thor <mail@example.com>
+To: list@example.org
+Subject: [PATCH v2] sample
+Date: Mon,  3 Aug 2020 22:40:55 +0700
+Message-Id: <msg-id2@example.com>
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: base64
+
+T24gZGlmZmVyZW50IGRpc3RybywgDXB5dGVzdCBpcyBzdWZmaXhlZCB3aXRoIGRpZmZlcmVudCBw
+YXR0ZXJucy4NCg0KLS0tDQogY29uZmlndXJlIHwgMiArLQ0KIDEgZmlsZSBjaGFuZ2VkLCAxIGlu
+c2VydGlvbigrKSwgMSBkZWxldGlvbigtKQ0KDQpkaWZmIC0tZ2l0IGEvY29uZmlndXJlIGIvY29u
+ZmlndXJlDQppbmRleCBkYjM1MzhiMy4uZjdjMWMwOTUgMTAwNzU1DQotLS0gYS9jb25maWd1cmUN
+CisrKyBiL2NvbmZpZ3VyZQ0KQEAgLTgxNCw3ICs4MTQsNyBAQCBpZiBbICRoYXZlX3B5dGhvbjMg
+LWVxIDEgXTsgdGhlbg0KICAgICBwcmludGYgIg1DaGVja2luZyBmb3IgcHl0aG9uMyBweXRlc3Qg
+KD49IDMuMCkuLi4gIg0KICAgICBjb25mPSQobWt0ZW1wKQ0KICAgICBwcmludGYgIltweXRlc3Rd
+XG5taW52ZXJzaW9uPTMuMFxuIiA+ICRjb25mDQotICAgIGlmIHB5dGVzdC0zIC1jICRjb25mIC0t
+dmVyc2lvbiA+L2Rldi9udWxsIDI+JjE7IHRoZW4NCisgICAgaWYgIiRweXRob24iIC1tIHB5dGVz
+dCAtYyAkY29uZiAtLXZlcnNpb24gPi9kZXYvbnVsbCAyPiYxOyB0aGVuDQogICAgICAgICBwcmlu
+dGYgIlllcy5cbiINCiAgICAgICAgIGhhdmVfcHl0aG9uM19weXRlc3Q9MQ0KICAgICBlbHNlDQot
+LSANCjIuMjguMA0KX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f
+X18KZXhhbXBsZSBtYWlsaW5nIGxpc3QgLS0gbGlzdEBleGFtcGxlLm9yZwpUbyB1bnN1YnNjcmli
+ZSBzZW5kIGFuIGVtYWlsIHRvIGxpc3QtbGVhdmVAZXhhbXBsZS5vcmcK
diff --git a/t/t5150-request-pull.sh b/t/t5150-request-pull.sh
index 852dcd913f..cb67bac1c4 100755
--- a/t/t5150-request-pull.sh
+++ b/t/t5150-request-pull.sh
@@ -2,8 +2,17 @@
 
 test_description='Test workflows involving pull request.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
+if ! test_have_prereq PERL
+then
+	skip_all='skipping request-pull tests, perl not available'
+	test_done
+fi
+
 test_expect_success 'setup' '
 
 	git init --bare upstream.git &&
@@ -25,13 +34,13 @@ test_expect_success 'setup' '
 		test_tick &&
 		git commit -m "\"Thirty days\", a reminder of month lengths" &&
 		git tag -m "version 1" -a initial &&
-		git push --tags origin master
+		git push --tags origin main
 	) &&
 	(
 		cd local &&
 		git remote add upstream "$trash_url/upstream.git" &&
 		git fetch upstream &&
-		git pull upstream master &&
+		git pull upstream main &&
 		cat <<-\EOT >>mnemonic.txt &&
 		Of twyecescore-eightt is but eine,
 		And all the remnante be thrycescore-eine.
@@ -53,7 +62,7 @@ test_expect_success 'setup' '
 		git commit -a -m "Adapt to use modern, simpler English
 
 But keep the old version, too, in case some people prefer it." &&
-		git checkout master
+		git checkout main
 	)
 
 '
@@ -123,7 +132,7 @@ test_expect_success 'pull request when forgot to push' '
 	(
 		cd local &&
 		git checkout initial &&
-		git merge --ff-only master &&
+		git merge --ff-only main &&
 		test_must_fail git request-pull initial "$downstream_url" \
 			2>../err
 	) &&
@@ -139,12 +148,11 @@ test_expect_success 'pull request after push' '
 	(
 		cd local &&
 		git checkout initial &&
-		git merge --ff-only master &&
-		git push origin master:for-upstream &&
-		git request-pull initial origin master:for-upstream >../request
+		git merge --ff-only main &&
+		git push origin main:for-upstream &&
+		git request-pull initial origin main:for-upstream >../request
 	) &&
 	sed -nf read-request.sed <request >digest &&
-	cat digest &&
 	{
 		read task &&
 		read repository &&
@@ -167,13 +175,12 @@ test_expect_success 'request asks HEAD to be pulled' '
 	(
 		cd local &&
 		git checkout initial &&
-		git merge --ff-only master &&
-		git push --tags origin master simplify &&
-		git push origin master:for-upstream &&
+		git merge --ff-only main &&
+		git push --tags origin main simplify &&
+		git push origin main:for-upstream &&
 		git request-pull initial "$downstream_url" >../request
 	) &&
 	sed -nf read-request.sed <request >digest &&
-	cat digest &&
 	{
 		read task &&
 		read repository &&
@@ -211,19 +218,19 @@ test_expect_success 'pull request format' '
 	(
 		cd local &&
 		git checkout initial &&
-		git merge --ff-only master &&
+		git merge --ff-only main &&
 		git push origin tags/full &&
 		git request-pull initial "$downstream_url" tags/full >../request
 	) &&
 	<request sed -nf fuzz.sed >request.fuzzy &&
-	test_i18ncmp expect request.fuzzy &&
+	test_cmp expect request.fuzzy &&
 
 	(
 		cd local &&
 		git request-pull initial "$downstream_url" tags/full:refs/tags/full
 	) >request &&
 	sed -nf fuzz.sed <request >request.fuzzy &&
-	test_i18ncmp expect request.fuzzy &&
+	test_cmp expect request.fuzzy &&
 
 	(
 		cd local &&
@@ -239,9 +246,9 @@ test_expect_success 'request-pull ignores OPTIONS_KEEPDASHDASH poison' '
 		OPTIONS_KEEPDASHDASH=Yes &&
 		export OPTIONS_KEEPDASHDASH &&
 		git checkout initial &&
-		git merge --ff-only master &&
-		git push origin master:for-upstream &&
-		git request-pull -- initial "$downstream_url" master:for-upstream >../request
+		git merge --ff-only main &&
+		git push origin main:for-upstream &&
+		git request-pull -- initial "$downstream_url" main:for-upstream >../request
 	)
 
 '
@@ -253,7 +260,7 @@ test_expect_success 'request-pull quotes regex metacharacters properly' '
 	(
 		cd local &&
 		git checkout initial &&
-		git merge --ff-only master &&
+		git merge --ff-only main &&
 		git tag -mrelease v2.0 &&
 		git push origin refs/tags/v2.0:refs/tags/v2-0 &&
 		test_must_fail git request-pull initial "$downstream_url" tags/v2.0 \
@@ -271,7 +278,7 @@ test_expect_success 'pull request with mismatched object' '
 	(
 		cd local &&
 		git checkout initial &&
-		git merge --ff-only master &&
+		git merge --ff-only main &&
 		git push origin HEAD:refs/tags/full &&
 		test_must_fail git request-pull initial "$downstream_url" tags/full \
 			2>../err
@@ -288,7 +295,7 @@ test_expect_success 'pull request with stale object' '
 	(
 		cd local &&
 		git checkout initial &&
-		git merge --ff-only master &&
+		git merge --ff-only main &&
 		git push origin refs/tags/full &&
 		git tag -f -m"Thirty-one days" full &&
 		test_must_fail git request-pull initial "$downstream_url" tags/full \
diff --git a/t/t5300-pack-object.sh b/t/t5300-pack-object.sh
index 410a09b0dd..e13a884207 100755
--- a/t/t5300-pack-object.sh
+++ b/t/t5300-pack-object.sh
@@ -8,125 +8,195 @@ test_description='git pack-object
 '
 . ./test-lib.sh
 
-TRASH=$(pwd)
+test_expect_success 'setup' '
+	rm -f .git/index* &&
+	perl -e "print \"a\" x 4096;" >a &&
+	perl -e "print \"b\" x 4096;" >b &&
+	perl -e "print \"c\" x 4096;" >c &&
+	test-tool genrandom "seed a" 2097152 >a_big &&
+	test-tool genrandom "seed b" 2097152 >b_big &&
+	git update-index --add a a_big b b_big c &&
+	cat c >d && echo foo >>d && git update-index --add d &&
+	tree=$(git write-tree) &&
+	commit=$(git commit-tree $tree </dev/null) &&
+	{
+		echo $tree &&
+		echo $commit &&
+		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
+	} >obj-list &&
+	{
+		git diff-tree --root -p $commit &&
+		while read object
+		do
+			t=$(git cat-file -t $object) &&
+			git cat-file $t $object || return 1
+		done <obj-list
+	} >expect
+'
 
-test_expect_success \
-    'setup' \
-    'rm -f .git/index* &&
-     perl -e "print \"a\" x 4096;" > a &&
-     perl -e "print \"b\" x 4096;" > b &&
-     perl -e "print \"c\" x 4096;" > c &&
-     test-tool genrandom "seed a" 2097152 > a_big &&
-     test-tool genrandom "seed b" 2097152 > b_big &&
-     git update-index --add a a_big b b_big c &&
-     cat c >d && echo foo >>d && git update-index --add d &&
-     tree=$(git write-tree) &&
-     commit=$(git commit-tree $tree </dev/null) && {
-	 echo $tree &&
-	 echo $commit &&
-	 git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
-     } >obj-list && {
-	 git diff-tree --root -p $commit &&
-	 while read object
-	 do
-	    t=$(git cat-file -t $object) &&
-	    git cat-file $t $object || return 1
-	 done <obj-list
-     } >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 without delta' \
-    'packname_1=$(git pack-objects --window=0 test-1 <obj-list)'
+'
 
-test_expect_success \
-    'pack-objects with bogus arguments' \
-    'test_must_fail git pack-objects --window=0 test-1 blah blah <obj-list'
+test_expect_success 'pack-object <stdin parsing: basic [|--revs]' '
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
+	EOF
 
-rm -fr .git2
-mkdir .git2
+	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 &&
 
-test_expect_success \
-    'unpack without delta' \
-    "GIT_OBJECT_DIRECTORY=.git2/objects &&
-     export GIT_OBJECT_DIRECTORY &&
-     git init &&
-     git unpack-objects -n <test-1-${packname_1}.pack &&
-     git unpack-objects <test-1-${packname_1}.pack"
+	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
+'
 
-unset GIT_OBJECT_DIRECTORY
-cd "$TRASH/.git2"
+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 \
-    'check unpack without delta' \
-    '(cd ../.git && find objects -type f -print) |
-     while read path
-     do
-         cmp $path ../.git/$path || {
-	     echo $path differs.
-	     return 1
-	 }
-     done'
-cd "$TRASH"
+test_expect_success 'pack-object <stdin parsing: [|--revs] empty line' '
+	cat >in <<-EOF &&
+	$(git -C pack-object-stdin rev-parse one)
 
-test_expect_success \
-    'pack with REF_DELTA' \
-    'pwd &&
-     packname_2=$(git pack-objects test-2 <obj-list)'
+	$(git -C pack-object-stdin rev-parse two)
+	EOF
 
-rm -fr .git2
-mkdir .git2
+	sed -e "s/^> //g" -e "s/Z$//g" >err.expect <<-EOF &&
+	fatal: expected object ID, got garbage:
+	>  Z
 
-test_expect_success \
-    'unpack with REF_DELTA' \
-    'GIT_OBJECT_DIRECTORY=.git2/objects &&
-     export GIT_OBJECT_DIRECTORY &&
-     git init &&
-     git unpack-objects -n <test-2-${packname_2}.pack &&
-     git unpack-objects <test-2-${packname_2}.pack'
-
-unset GIT_OBJECT_DIRECTORY
-cd "$TRASH/.git2"
-test_expect_success \
-    'check unpack with REF_DELTA' \
-    '(cd ../.git && find objects -type f -print) |
-     while read path
-     do
-         cmp $path ../.git/$path || {
-	     echo $path differs.
-	     return 1
-	 }
-     done'
-cd "$TRASH"
+	EOF
+	test_must_fail git -C pack-object-stdin pack-objects empty-line-stdin <in 2>err.actual &&
+	test_cmp err.expect err.actual &&
 
-test_expect_success \
-    'pack with OFS_DELTA' \
-    'pwd &&
-     packname_3=$(git pack-objects --delta-base-offset test-3 <obj-list)'
+	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
+'
 
-rm -fr .git2
-mkdir .git2
+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
+'
 
-test_expect_success \
-    'unpack with OFS_DELTA' \
-    'GIT_OBJECT_DIRECTORY=.git2/objects &&
-     export GIT_OBJECT_DIRECTORY &&
-     git init &&
-     git unpack-objects -n <test-3-${packname_3}.pack &&
-     git unpack-objects <test-3-${packname_3}.pack'
-
-unset GIT_OBJECT_DIRECTORY
-cd "$TRASH/.git2"
-test_expect_success \
-    'check unpack with OFS_DELTA' \
-    '(cd ../.git && find objects -type f -print) |
-     while read path
-     do
-         cmp $path ../.git/$path || {
-	     echo $path differs.
-	     return 1
-	 }
-     done'
-cd "$TRASH"
+# usage: check_deltas <stderr_from_pack_objects> <cmp_op> <nr_deltas>
+# e.g.: check_deltas stderr -gt 0
+check_deltas() {
+	deltas=$(perl -lne '/delta (\d+)/ and print $1' "$1") &&
+	shift &&
+	if ! test "$deltas" "$@"
+	then
+		echo >&2 "unexpected number of deltas (compared $delta $*)"
+		return 1
+	fi
+}
+
+test_expect_success 'pack without delta' '
+	packname_1=$(git pack-objects --progress --window=0 test-1 \
+			<obj-list 2>stderr) &&
+	check_deltas stderr = 0
+'
+
+test_expect_success 'pack-objects with bogus arguments' '
+	test_must_fail git pack-objects --window=0 test-1 blah blah <obj-list
+'
+
+check_unpack () {
+	test_when_finished "rm -rf git2" &&
+	git init --bare git2 &&
+	git -C git2 unpack-objects -n <"$1".pack &&
+	git -C git2 unpack-objects <"$1".pack &&
+	(cd .git && find objects -type f -print) |
+	while read path
+	do
+		cmp git2/$path .git/$path || {
+			echo $path differs.
+			return 1
+		}
+	done
+}
+
+test_expect_success 'unpack without delta' '
+	check_unpack test-1-${packname_1}
+'
+
+test_expect_success 'pack with REF_DELTA' '
+	packname_2=$(git pack-objects --progress test-2 <obj-list 2>stderr) &&
+	check_deltas stderr -gt 0
+'
+
+test_expect_success 'unpack with REF_DELTA' '
+	check_unpack test-2-${packname_2}
+'
+
+test_expect_success 'pack with OFS_DELTA' '
+	packname_3=$(git pack-objects --progress --delta-base-offset test-3 \
+			<obj-list 2>stderr) &&
+	check_deltas stderr -gt 0
+'
+
+test_expect_success 'unpack with OFS_DELTA' '
+	check_unpack test-3-${packname_3}
+'
 
 test_expect_success 'compare delta flavors' '
 	perl -e '\''
@@ -135,55 +205,33 @@ test_expect_success 'compare delta flavors' '
 	'\'' test-2-$packname_2.pack test-3-$packname_3.pack
 '
 
-rm -fr .git2
-mkdir .git2
+check_use_objects () {
+	test_when_finished "rm -rf git2" &&
+	git init --bare git2 &&
+	cp "$1".pack "$1".idx git2/objects/pack &&
+	(
+		cd git2 &&
+		git diff-tree --root -p $commit &&
+		while read object
+		do
+			t=$(git cat-file -t $object) &&
+			git cat-file $t $object || exit 1
+		done
+	) <obj-list >current &&
+	cmp expect current
+}
 
-test_expect_success \
-    'use packed objects' \
-    'GIT_OBJECT_DIRECTORY=.git2/objects &&
-     export GIT_OBJECT_DIRECTORY &&
-     git init &&
-     cp test-1-${packname_1}.pack test-1-${packname_1}.idx .git2/objects/pack && {
-	 git diff-tree --root -p $commit &&
-	 while read object
-	 do
-	    t=$(git cat-file -t $object) &&
-	    git cat-file $t $object || return 1
-	 done <obj-list
-    } >current &&
-    cmp expect current'
+test_expect_success 'use packed objects' '
+	check_use_objects test-1-${packname_1}
+'
 
-test_expect_success \
-    'use packed deltified (REF_DELTA) objects' \
-    'GIT_OBJECT_DIRECTORY=.git2/objects &&
-     export GIT_OBJECT_DIRECTORY &&
-     rm -f .git2/objects/pack/test-* &&
-     cp test-2-${packname_2}.pack test-2-${packname_2}.idx .git2/objects/pack && {
-	 git diff-tree --root -p $commit &&
-	 while read object
-	 do
-	    t=$(git cat-file -t $object) &&
-	    git cat-file $t $object || return 1
-	 done <obj-list
-    } >current &&
-    cmp expect current'
+test_expect_success 'use packed deltified (REF_DELTA) objects' '
+	check_use_objects test-2-${packname_2}
+'
 
-test_expect_success \
-    'use packed deltified (OFS_DELTA) objects' \
-    'GIT_OBJECT_DIRECTORY=.git2/objects &&
-     export GIT_OBJECT_DIRECTORY &&
-     rm -f .git2/objects/pack/test-* &&
-     cp test-3-${packname_3}.pack test-3-${packname_3}.idx .git2/objects/pack && {
-	 git diff-tree --root -p $commit &&
-	 while read object
-	 do
-	    t=$(git cat-file -t $object) &&
-	    git cat-file $t $object || return 1
-	 done <obj-list
-    } >current &&
-    cmp expect current'
-
-unset GIT_OBJECT_DIRECTORY
+test_expect_success 'use packed deltified (OFS_DELTA) objects' '
+	check_use_objects test-3-${packname_3}
+'
 
 test_expect_success 'survive missing objects/pack directory' '
 	(
@@ -412,22 +460,23 @@ test_expect_success 'set up pack for non-repo tests' '
 '
 
 test_expect_success 'index-pack --stdin complains of non-repo' '
-	nongit test_must_fail git index-pack --stdin <foo.pack &&
+	nongit test_must_fail git index-pack --object-format=$(test_oid algo) --stdin <foo.pack &&
 	test_path_is_missing non-repo/.git
 '
 
 test_expect_success 'index-pack <pack> works in non-repo' '
-	nongit git index-pack ../foo.pack &&
+	nongit git index-pack --object-format=$(test_oid algo) ../foo.pack &&
 	test_path_is_file foo.idx
 '
 
 test_expect_success 'index-pack --strict <pack> works in non-repo' '
 	rm -f foo.idx &&
-	nongit git index-pack --strict ../foo.pack &&
+	nongit git index-pack --strict --object-format=$(test_oid algo) ../foo.pack &&
 	test_path_is_file foo.idx
 '
 
-test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'index-pack --threads=N or pack.threads=N warns when no pthreads' '
+test_expect_success !PTHREADS,!FAIL_PREREQS \
+	'index-pack --threads=N or pack.threads=N warns when no pthreads' '
 	test_must_fail git index-pack --threads=2 2>err &&
 	grep ^warning: err >warnings &&
 	test_line_count = 1 warnings &&
@@ -445,7 +494,8 @@ test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'index-pack --threads=N or pack.th
 	grep -F "no threads support, ignoring pack.threads" err
 '
 
-test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'pack-objects --threads=N or pack.threads=N warns when no pthreads' '
+test_expect_success !PTHREADS,!FAIL_PREREQS \
+	'pack-objects --threads=N or pack.threads=N warns when no pthreads' '
 	git pack-objects --threads=2 --stdout --all </dev/null >/dev/null 2>err &&
 	grep ^warning: err >warnings &&
 	test_line_count = 1 warnings &&
@@ -496,4 +546,180 @@ test_expect_success 'make sure index-pack detects the SHA1 collision (large blob
 	)
 '
 
+test_expect_success 'prefetch objects' '
+	rm -rf server client &&
+
+	git init server &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server protocol.version 2 &&
+
+	echo one >server/one &&
+	git -C server add one &&
+	git -C server commit -m one &&
+	git -C server branch one_branch &&
+
+	echo two_a >server/two_a &&
+	echo two_b >server/two_b &&
+	git -C server add two_a two_b &&
+	git -C server commit -m two &&
+
+	echo three >server/three &&
+	git -C server add three &&
+	git -C server commit -m three &&
+	git -C server branch three_branch &&
+
+	# Clone, fetch "two" with blobs excluded, and re-push it. This requires
+	# the client to have the blobs of "two" - verify that these are
+	# prefetched in one batch.
+	git clone --filter=blob:none --single-branch -b one_branch \
+		"file://$(pwd)/server" client &&
+	test_config -C client protocol.version 2 &&
+	TWO=$(git -C server rev-parse three_branch^) &&
+	git -C client fetch --filter=blob:none origin "$TWO" &&
+	GIT_TRACE_PACKET=$(pwd)/trace git -C client push origin "$TWO":refs/heads/two_branch &&
+	grep "fetch> done" trace >donelines &&
+	test_line_count = 1 donelines
+'
+
+test_expect_success 'setup for --stdin-packs tests' '
+	git init stdin-packs &&
+	(
+		cd stdin-packs &&
+
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
+
+		for id in A B C
+		do
+			git pack-objects .git/objects/pack/pack-$id \
+				--incremental --revs <<-EOF
+			refs/tags/$id
+			EOF
+		done &&
+
+		ls -la .git/objects/pack
+	)
+'
+
+test_expect_success '--stdin-packs with excluded packs' '
+	(
+		cd stdin-packs &&
+
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+
+		git pack-objects test --stdin-packs <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		EOF
+
+		(
+			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-C-*.idx)
+		) >expect.raw &&
+		git show-index <$(ls test-*.idx) >actual.raw &&
+
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success '--stdin-packs is incompatible with --filter' '
+	(
+		cd stdin-packs &&
+		test_must_fail git pack-objects --stdin-packs --stdout \
+			--filter=blob:none </dev/null 2>err &&
+		test_i18ngrep "cannot use --filter with --stdin-packs" err
+	)
+'
+
+test_expect_success '--stdin-packs is incompatible with --revs' '
+	(
+		cd stdin-packs &&
+		test_must_fail git pack-objects --stdin-packs --revs out \
+			</dev/null 2>err &&
+		test_i18ngrep "cannot use internal rev list with --stdin-packs" err
+	)
+'
+
+test_expect_success '--stdin-packs with loose objects' '
+	(
+		cd stdin-packs &&
+
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+
+		test_commit D && # loose
+
+		git pack-objects test2 --stdin-packs --unpacked <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		EOF
+
+		(
+			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
+			git rev-list --objects --no-object-names \
+				refs/tags/C..refs/tags/D
+
+		) >expect.raw &&
+		ls -la . &&
+		git show-index <$(ls test2-*.idx) >actual.raw &&
+
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success '--stdin-packs with broken links' '
+	(
+		cd stdin-packs &&
+
+		# make an unreachable object with a bogus parent
+		git cat-file -p HEAD >commit &&
+		sed "s/$(git rev-parse HEAD^)/$(test_oid zero)/" <commit |
+		git hash-object -w -t commit --stdin >in &&
+
+		git pack-objects .git/objects/pack/pack-D <in &&
+
+		PACK_A="$(basename .git/objects/pack/pack-A-*.pack)" &&
+		PACK_B="$(basename .git/objects/pack/pack-B-*.pack)" &&
+		PACK_C="$(basename .git/objects/pack/pack-C-*.pack)" &&
+		PACK_D="$(basename .git/objects/pack/pack-D-*.pack)" &&
+
+		git pack-objects test3 --stdin-packs --unpacked <<-EOF &&
+		$PACK_A
+		^$PACK_B
+		$PACK_C
+		$PACK_D
+		EOF
+
+		(
+			git show-index <$(ls .git/objects/pack/pack-A-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-C-*.idx) &&
+			git show-index <$(ls .git/objects/pack/pack-D-*.idx) &&
+			git rev-list --objects --no-object-names \
+				refs/tags/C..refs/tags/D
+		) >expect.raw &&
+		git show-index <$(ls test3-*.idx) >actual.raw &&
+
+		cut -d" " -f2 <expect.raw | sort >expect &&
+		cut -d" " -f2 <actual.raw | sort >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success 'negative window clamps to 0' '
+	git pack-objects --progress --window=-1 neg-window <obj-list 2>stderr &&
+	check_deltas stderr = 0
+'
+
 test_done
diff --git a/t/t5302-pack-index.sh b/t/t5302-pack-index.sh
index 91d51b35f9..7c9d687367 100755
--- a/t/t5302-pack-index.sh
+++ b/t/t5302-pack-index.sh
@@ -6,64 +6,65 @@
 test_description='pack index with 64-bit offsets and object CRC'
 . ./test-lib.sh
 
-test_expect_success \
-    'setup' \
-    'rm -rf .git &&
-     git init &&
-     git config pack.threads 1 &&
-     i=1 &&
-     while test $i -le 100
-     do
-         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 &&
-	 test-tool genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii &&
-	 test-tool genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii &&
-         echo $iii >file_$iii &&
-	 test-tool genrandom "$iii" 8192 >>file_$iii &&
-         git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
-         i=$(expr $i + 1) || return 1
-     done &&
-     { echo 101 && test-tool genrandom 100 8192; } >file_101 &&
-     git update-index --add file_101 &&
-     tree=$(git write-tree) &&
-     commit=$(git commit-tree $tree </dev/null) && {
-	 echo $tree &&
-	 git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
-     } >obj-list &&
-     git update-ref HEAD $commit'
+test_expect_success 'setup' '
+	rawsz=$(test_oid rawsz) &&
+	rm -rf .git &&
+	git init &&
+	git config pack.threads 1 &&
+	i=1 &&
+	while test $i -le 100
+	do
+		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 &&
+		test-tool genrandom "foo"$(expr $i + 1) 100 >> deep_delta_$iii &&
+		test-tool genrandom "foo"$(expr $i + 2) 100 >> deep_delta_$iii &&
+		echo $iii >file_$iii &&
+		test-tool genrandom "$iii" 8192 >>file_$iii &&
+		git update-index --add file_$iii deep_delta_$iii wide_delta_$iii &&
+		i=$(expr $i + 1) || return 1
+	done &&
+	{ echo 101 && test-tool genrandom 100 8192; } >file_101 &&
+	git update-index --add file_101 &&
+	tree=$(git write-tree) &&
+	commit=$(git commit-tree $tree </dev/null) && {
+		echo $tree &&
+		git ls-tree $tree | sed -e "s/.* \\([0-9a-f]*\\)	.*/\\1/"
+	} >obj-list &&
+	git update-ref HEAD $commit
+'
 
-test_expect_success \
-    'pack-objects with index version 1' \
-    'pack1=$(git pack-objects --index-version=1 test-1 <obj-list) &&
-     git verify-pack -v "test-1-${pack1}.pack"'
+test_expect_success 'pack-objects with index version 1' '
+	pack1=$(git pack-objects --index-version=1 test-1 <obj-list) &&
+	git verify-pack -v "test-1-${pack1}.pack"
+'
 
-test_expect_success \
-    'pack-objects with index version 2' \
-    'pack2=$(git pack-objects --index-version=2 test-2 <obj-list) &&
-     git verify-pack -v "test-2-${pack2}.pack"'
+test_expect_success 'pack-objects with index version 2' '
+	pack2=$(git pack-objects --index-version=2 test-2 <obj-list) &&
+	git verify-pack -v "test-2-${pack2}.pack"
+'
 
-test_expect_success \
-    'both packs should be identical' \
-    'cmp "test-1-${pack1}.pack" "test-2-${pack2}.pack"'
+test_expect_success 'both packs should be identical' '
+	cmp "test-1-${pack1}.pack" "test-2-${pack2}.pack"
+'
 
-test_expect_success \
-    'index v1 and index v2 should be different' \
-    '! cmp "test-1-${pack1}.idx" "test-2-${pack2}.idx"'
+test_expect_success 'index v1 and index v2 should be different' '
+	! cmp "test-1-${pack1}.idx" "test-2-${pack2}.idx"
+'
 
-test_expect_success \
-    'index-pack with index version 1' \
-    'git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"'
+test_expect_success 'index-pack with index version 1' '
+	git index-pack --index-version=1 -o 1.idx "test-1-${pack1}.pack"
+'
 
-test_expect_success \
-    'index-pack with index version 2' \
-    'git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"'
+test_expect_success 'index-pack with index version 2' '
+	git index-pack --index-version=2 -o 2.idx "test-1-${pack1}.pack"
+'
 
-test_expect_success \
-    'index-pack results should match pack-objects ones' \
-    'cmp "test-1-${pack1}.idx" "1.idx" &&
-     cmp "test-2-${pack2}.idx" "2.idx"'
+test_expect_success 'index-pack results should match pack-objects ones' '
+	cmp "test-1-${pack1}.idx" "1.idx" &&
+	cmp "test-2-${pack2}.idx" "2.idx"
+'
 
 test_expect_success 'index-pack --verify on index version 1' '
 	git index-pack --verify "test-1-${pack1}.pack"
@@ -73,13 +74,13 @@ test_expect_success 'index-pack --verify on index version 2' '
 	git index-pack --verify "test-2-${pack2}.pack"
 '
 
-test_expect_success \
-    'pack-objects --index-version=2, is not accepted' \
-    'test_must_fail git pack-objects --index-version=2, test-3 <obj-list'
+test_expect_success 'pack-objects --index-version=2, is not accepted' '
+	test_must_fail git pack-objects --index-version=2, test-3 <obj-list
+'
 
-test_expect_success \
-    'index v2: force some 64-bit offsets with pack-objects' \
-    'pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list)'
+test_expect_success 'index v2: force some 64-bit offsets with pack-objects' '
+	pack3=$(git pack-objects --index-version=2,0x40000 test-3 <obj-list)
+'
 
 if msg=$(git verify-pack -v "test-3-${pack3}.pack" 2>&1) ||
 	! (echo "$msg" | grep "pack too large .* off_t")
@@ -89,21 +90,21 @@ else
 	say "# skipping tests concerning 64-bit offsets"
 fi
 
-test_expect_success OFF64_T \
-    'index v2: verify a pack with some 64-bit offsets' \
-    'git verify-pack -v "test-3-${pack3}.pack"'
+test_expect_success OFF64_T 'index v2: verify a pack with some 64-bit offsets' '
+	git verify-pack -v "test-3-${pack3}.pack"
+'
 
-test_expect_success OFF64_T \
-    '64-bit offsets: should be different from previous index v2 results' \
-    '! cmp "test-2-${pack2}.idx" "test-3-${pack3}.idx"'
+test_expect_success OFF64_T '64-bit offsets: should be different from previous index v2 results' '
+	! cmp "test-2-${pack2}.idx" "test-3-${pack3}.idx"
+'
 
-test_expect_success OFF64_T \
-    'index v2: force some 64-bit offsets with index-pack' \
-    'git index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack"'
+test_expect_success OFF64_T 'index v2: force some 64-bit offsets with index-pack' '
+	git index-pack --index-version=2,0x40000 -o 3.idx "test-1-${pack1}.pack"
+'
 
-test_expect_success OFF64_T \
-    '64-bit offsets: index-pack result should match pack-objects one' \
-    'cmp "test-3-${pack3}.idx" "3.idx"'
+test_expect_success OFF64_T '64-bit offsets: index-pack result should match pack-objects one' '
+	cmp "test-3-${pack3}.idx" "3.idx"
+'
 
 test_expect_success OFF64_T 'index-pack --verify on 64-bit offset v2 (cheat)' '
 	# This cheats by knowing which lower offset should still be encoded
@@ -118,134 +119,143 @@ test_expect_success OFF64_T 'index-pack --verify on 64-bit offset v2' '
 # returns the object number for given object in given pack index
 index_obj_nr()
 {
-    idx_file=$1
-    object_sha1=$2
-    nr=0
-    git show-index < $idx_file |
-    while read offs sha1 extra
-    do
-      nr=$(($nr + 1))
-      test "$sha1" = "$object_sha1" || continue
-      echo "$(($nr - 1))"
-      break
-    done
+	idx_file=$1
+	object_sha1=$2
+	nr=0
+	git show-index < $idx_file |
+	while read offs sha1 extra
+	do
+	  nr=$(($nr + 1))
+	  test "$sha1" = "$object_sha1" || continue
+	  echo "$(($nr - 1))"
+	  break
+	done
 }
 
 # returns the pack offset for given object as found in given pack index
 index_obj_offset()
 {
-    idx_file=$1
-    object_sha1=$2
-    git show-index < $idx_file | grep $object_sha1 |
-    ( read offs extra && echo "$offs" )
+	idx_file=$1
+	object_sha1=$2
+	git show-index < $idx_file | grep $object_sha1 |
+	( read offs extra && echo "$offs" )
 }
 
-test_expect_success \
-    '[index v1] 1) stream pack to repository' \
-    'git index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" &&
-     git prune-packed &&
-     git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
-     cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
-     cmp "test-1-${pack1}.idx"  ".git/objects/pack/pack-${pack1}.idx"'
+test_expect_success '[index v1] 1) stream pack to repository' '
+	git index-pack --index-version=1 --stdin < "test-1-${pack1}.pack" &&
+	git prune-packed &&
+	git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
+	cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
+	cmp "test-1-${pack1}.idx"	".git/objects/pack/pack-${pack1}.idx"
+'
 
 test_expect_success \
-    '[index v1] 2) create a stealth corruption in a delta base reference' \
-    '# This test assumes file_101 is a delta smaller than 16 bytes.
-     # It should be against file_100 but we substitute its base for file_099
-     sha1_101=$(git hash-object file_101) &&
-     sha1_099=$(git hash-object file_099) &&
-     offs_101=$(index_obj_offset 1.idx $sha1_101) &&
-     nr_099=$(index_obj_nr 1.idx $sha1_099) &&
-     chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
-     dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
-        if=".git/objects/pack/pack-${pack1}.idx" \
-        skip=$((4 + 256 * 4 + $nr_099 * 24)) \
-        bs=1 count=20 conv=notrunc &&
-     git cat-file blob $sha1_101 > file_101_foo1'
+	'[index v1] 2) create a stealth corruption in a delta base reference' '
+	# This test assumes file_101 is a delta smaller than 16 bytes.
+	# It should be against file_100 but we substitute its base for file_099
+	sha1_101=$(git hash-object file_101) &&
+	sha1_099=$(git hash-object file_099) &&
+	offs_101=$(index_obj_offset 1.idx $sha1_101) &&
+	nr_099=$(index_obj_nr 1.idx $sha1_099) &&
+	chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
+	recordsz=$((rawsz + 4)) &&
+	dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
+	       if=".git/objects/pack/pack-${pack1}.idx" \
+	       skip=$((4 + 256 * 4 + $nr_099 * recordsz)) \
+	       bs=1 count=$rawsz conv=notrunc &&
+	git cat-file blob $sha1_101 > file_101_foo1
+'
 
 test_expect_success \
-    '[index v1] 3) corrupted delta happily returned wrong data' \
-    'test -f file_101_foo1 && ! cmp file_101 file_101_foo1'
+	'[index v1] 3) corrupted delta happily returned wrong data' '
+	test -f file_101_foo1 && ! cmp file_101 file_101_foo1
+'
 
 test_expect_success \
-    '[index v1] 4) confirm that the pack is actually corrupted' \
-    'test_must_fail git fsck --full $commit'
+	'[index v1] 4) confirm that the pack is actually corrupted' '
+	test_must_fail git fsck --full $commit
+'
 
 test_expect_success \
-    '[index v1] 5) pack-objects happily reuses corrupted data' \
-    'pack4=$(git pack-objects test-4 <obj-list) &&
-     test -f "test-4-${pack4}.pack"'
+	'[index v1] 5) pack-objects happily reuses corrupted data' '
+	pack4=$(git pack-objects test-4 <obj-list) &&
+	test -f "test-4-${pack4}.pack"
+'
 
-test_expect_success \
-    '[index v1] 6) newly created pack is BAD !' \
-    'test_must_fail git verify-pack -v "test-4-${pack4}.pack"'
+test_expect_success '[index v1] 6) newly created pack is BAD !' '
+	test_must_fail git verify-pack -v "test-4-${pack4}.pack"
+'
 
-test_expect_success \
-    '[index v2] 1) stream pack to repository' \
-    'rm -f .git/objects/pack/* &&
-     git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
-     git prune-packed &&
-     git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
-     cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
-     cmp "test-2-${pack1}.idx"  ".git/objects/pack/pack-${pack1}.idx"'
+test_expect_success '[index v2] 1) stream pack to repository' '
+	rm -f .git/objects/pack/* &&
+	git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
+	git prune-packed &&
+	git count-objects | ( read nr rest && test "$nr" -eq 1 ) &&
+	cmp "test-1-${pack1}.pack" ".git/objects/pack/pack-${pack1}.pack" &&
+	cmp "test-2-${pack1}.idx"	".git/objects/pack/pack-${pack1}.idx"
+'
 
 test_expect_success \
-    '[index v2] 2) create a stealth corruption in a delta base reference' \
-    '# This test assumes file_101 is a delta smaller than 16 bytes.
-     # It should be against file_100 but we substitute its base for file_099
-     sha1_101=$(git hash-object file_101) &&
-     sha1_099=$(git hash-object file_099) &&
-     offs_101=$(index_obj_offset 1.idx $sha1_101) &&
-     nr_099=$(index_obj_nr 1.idx $sha1_099) &&
-     chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
-     dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
-        if=".git/objects/pack/pack-${pack1}.idx" \
-        skip=$((8 + 256 * 4 + $nr_099 * 20)) \
-        bs=1 count=20 conv=notrunc &&
-     git cat-file blob $sha1_101 > file_101_foo2'
+	'[index v2] 2) create a stealth corruption in a delta base reference' '
+	# This test assumes file_101 is a delta smaller than 16 bytes.
+	# It should be against file_100 but we substitute its base for file_099
+	sha1_101=$(git hash-object file_101) &&
+	sha1_099=$(git hash-object file_099) &&
+	offs_101=$(index_obj_offset 1.idx $sha1_101) &&
+	nr_099=$(index_obj_nr 1.idx $sha1_099) &&
+	chmod +w ".git/objects/pack/pack-${pack1}.pack" &&
+	dd of=".git/objects/pack/pack-${pack1}.pack" seek=$(($offs_101 + 1)) \
+		if=".git/objects/pack/pack-${pack1}.idx" \
+		skip=$((8 + 256 * 4 + $nr_099 * rawsz)) \
+		bs=1 count=$rawsz conv=notrunc &&
+	git cat-file blob $sha1_101 > file_101_foo2
+'
 
 test_expect_success \
-    '[index v2] 3) corrupted delta happily returned wrong data' \
-    'test -f file_101_foo2 && ! cmp file_101 file_101_foo2'
+	'[index v2] 3) corrupted delta happily returned wrong data' '
+	test -f file_101_foo2 && ! cmp file_101 file_101_foo2
+'
 
 test_expect_success \
-    '[index v2] 4) confirm that the pack is actually corrupted' \
-    'test_must_fail git fsck --full $commit'
+	'[index v2] 4) confirm that the pack is actually corrupted' '
+	test_must_fail git fsck --full $commit
+'
 
 test_expect_success \
-    '[index v2] 5) pack-objects refuses to reuse corrupted data' \
-    'test_must_fail git pack-objects test-5 <obj-list &&
-     test_must_fail git pack-objects --no-reuse-object test-6 <obj-list'
+	'[index v2] 5) pack-objects refuses to reuse corrupted data' '
+	test_must_fail git pack-objects test-5 <obj-list &&
+	test_must_fail git pack-objects --no-reuse-object test-6 <obj-list
+'
 
 test_expect_success \
-    '[index v2] 6) verify-pack detects CRC mismatch' \
-    'rm -f .git/objects/pack/* &&
-     git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
-     git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
-     obj=$(git hash-object file_001) &&
-     nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
-     chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
-     printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
-        bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * 20 + $nr * 4)) &&
-     ( while read obj
-       do git cat-file -p $obj >/dev/null || exit 1
-       done <obj-list ) &&
-     test_must_fail git verify-pack ".git/objects/pack/pack-${pack1}.pack"
+	'[index v2] 6) verify-pack detects CRC mismatch' '
+	rm -f .git/objects/pack/* &&
+	git index-pack --index-version=2 --stdin < "test-1-${pack1}.pack" &&
+	git verify-pack ".git/objects/pack/pack-${pack1}.pack" &&
+	obj=$(git hash-object file_001) &&
+	nr=$(index_obj_nr ".git/objects/pack/pack-${pack1}.idx" $obj) &&
+	chmod +w ".git/objects/pack/pack-${pack1}.idx" &&
+	printf xxxx | dd of=".git/objects/pack/pack-${pack1}.idx" conv=notrunc \
+		bs=1 count=4 seek=$((8 + 256 * 4 + $(wc -l <obj-list) * rawsz + $nr * 4)) &&
+	 ( while read obj
+	   do git cat-file -p $obj >/dev/null || exit 1
+	   done <obj-list ) &&
+	test_must_fail git verify-pack ".git/objects/pack/pack-${pack1}.pack"
 '
 
 test_expect_success 'running index-pack in the object store' '
-    rm -f .git/objects/pack/* &&
-    cp test-1-${pack1}.pack .git/objects/pack/pack-${pack1}.pack &&
-    (
-	cd .git/objects/pack &&
-	git index-pack pack-${pack1}.pack
-    ) &&
-    test -f .git/objects/pack/pack-${pack1}.idx
+	rm -f .git/objects/pack/* &&
+	cp test-1-${pack1}.pack .git/objects/pack/pack-${pack1}.pack &&
+	(
+		cd .git/objects/pack &&
+		git index-pack pack-${pack1}.pack
+	) &&
+	test -f .git/objects/pack/pack-${pack1}.idx
 '
 
 test_expect_success 'index-pack --strict warns upon missing tagger in tag' '
-    sha=$(git rev-parse HEAD) &&
-    cat >wrong-tag <<EOF &&
+	sha=$(git rev-parse HEAD) &&
+	cat >wrong-tag <<EOF &&
 object $sha
 type commit
 tag guten tag
@@ -253,18 +263,25 @@ tag guten tag
 This is an invalid tag.
 EOF
 
-    tag=$(git hash-object -t tag -w --stdin <wrong-tag) &&
-    pack1=$(echo $tag $sha | git pack-objects tag-test) &&
-    echo remove tag object &&
-    thirtyeight=${tag#??} &&
-    rm -f .git/objects/${tag%$thirtyeight}/$thirtyeight &&
-    git index-pack --strict tag-test-${pack1}.pack 2>err &&
-    grep "^warning:.* expected .tagger. line" err
+	tag=$(git hash-object -t tag -w --stdin <wrong-tag) &&
+	pack1=$(echo $tag $sha | git pack-objects tag-test) &&
+	echo remove tag object &&
+	thirtyeight=${tag#??} &&
+	rm -f .git/objects/${tag%$thirtyeight}/$thirtyeight &&
+	git index-pack --strict tag-test-${pack1}.pack 2>err &&
+	grep "^warning:.* expected .tagger. line" err
 '
 
 test_expect_success 'index-pack --fsck-objects also warns upon missing tagger in tag' '
-    git index-pack --fsck-objects tag-test-${pack1}.pack 2>err &&
-    grep "^warning:.* expected .tagger. line" err
+	git index-pack --fsck-objects tag-test-${pack1}.pack 2>err &&
+	grep "^warning:.* expected .tagger. line" err
+'
+
+test_expect_success 'index-pack -v --stdin produces progress for both phases' '
+	pack=$(git pack-objects --all pack </dev/null) &&
+	GIT_PROGRESS_DELAY=0 git index-pack -v --stdin <pack-$pack.pack 2>err &&
+	test_i18ngrep "Receiving objects" err &&
+	test_i18ngrep "Resolving deltas" err
 '
 
 test_done
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index df60f18fb8..7cabb85ca6 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -4,6 +4,9 @@
 #
 
 test_description='prune'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 day=$((60*60*24))
@@ -19,30 +22,25 @@ add_blob() {
 }
 
 test_expect_success setup '
-
-	: > file &&
+	>file &&
 	git add file &&
 	test_tick &&
 	git commit -m initial &&
 	git gc
-
 '
 
 test_expect_success 'prune stale packs' '
-
 	orig_pack=$(echo .git/objects/pack/*.pack) &&
-	: > .git/objects/tmp_1.pack &&
-	: > .git/objects/tmp_2.pack &&
+	>.git/objects/tmp_1.pack &&
+	>.git/objects/tmp_2.pack &&
 	test-tool chmtime =-86501 .git/objects/tmp_1.pack &&
 	git prune --expire 1.day &&
 	test_path_is_file $orig_pack &&
 	test_path_is_file .git/objects/tmp_2.pack &&
 	test_path_is_missing .git/objects/tmp_1.pack
-
 '
 
 test_expect_success 'prune --expire' '
-
 	add_blob &&
 	git prune --expire=1.hour.ago &&
 	verbose test $((1 + $before)) = $(git count-objects | sed "s/ .*//") &&
@@ -51,11 +49,9 @@ test_expect_success 'prune --expire' '
 	git prune --expire 1.day &&
 	verbose test $before = $(git count-objects | sed "s/ .*//") &&
 	test_path_is_missing $BLOB_FILE
-
 '
 
 test_expect_success 'gc: implicit prune --expire' '
-
 	add_blob &&
 	test-tool chmtime =-$((2*$week-30)) $BLOB_FILE &&
 	git gc &&
@@ -65,123 +61,98 @@ test_expect_success 'gc: implicit prune --expire' '
 	git gc &&
 	verbose test $before = $(git count-objects | sed "s/ .*//") &&
 	test_path_is_missing $BLOB_FILE
-
 '
 
 test_expect_success 'gc: refuse to start with invalid gc.pruneExpire' '
-
 	git config gc.pruneExpire invalid &&
 	test_must_fail git gc
-
 '
 
 test_expect_success 'gc: start with ok gc.pruneExpire' '
-
 	git config gc.pruneExpire 2.days.ago &&
 	git gc
-
 '
 
 test_expect_success 'prune: prune nonsense parameters' '
-
 	test_must_fail git prune garbage &&
 	test_must_fail git prune --- &&
 	test_must_fail git prune --no-such-option
-
 '
 
 test_expect_success 'prune: prune unreachable heads' '
-
 	git config core.logAllRefUpdates false &&
-	mv .git/logs .git/logs.old &&
-	: > file2 &&
+	>file2 &&
 	git add file2 &&
 	git commit -m temporary &&
 	tmp_head=$(git rev-list -1 HEAD) &&
 	git reset HEAD^ &&
+	git reflog expire --all &&
 	git prune &&
 	test_must_fail git reset $tmp_head --
-
 '
 
 test_expect_success 'prune: do not prune detached HEAD with no reflog' '
-
 	git checkout --detach --quiet &&
 	git commit --allow-empty -m "detached commit" &&
-	# verify that there is no reflogs
-	# (should be removed and disabled by previous test)
-	test_path_is_missing .git/logs &&
+	git reflog expire --all &&
 	git prune -n >prune_actual &&
 	test_must_be_empty prune_actual
-
 '
 
 test_expect_success 'prune: prune former HEAD after checking out branch' '
-
 	head_oid=$(git rev-parse HEAD) &&
-	git checkout --quiet master &&
+	git checkout --quiet main &&
+	git reflog expire --all &&
 	git prune -v >prune_actual &&
 	grep "$head_oid" prune_actual
-
 '
 
 test_expect_success 'prune: do not prune heads listed as an argument' '
-
-	: > file2 &&
+	>file2 &&
 	git add file2 &&
 	git commit -m temporary &&
 	tmp_head=$(git rev-list -1 HEAD) &&
 	git reset HEAD^ &&
 	git prune -- $tmp_head &&
 	git reset $tmp_head --
-
 '
 
 test_expect_success 'gc --no-prune' '
-
 	add_blob &&
 	test-tool chmtime =-$((5001*$day)) $BLOB_FILE &&
 	git config gc.pruneExpire 2.days.ago &&
 	git gc --no-prune &&
 	verbose test 1 = $(git count-objects | sed "s/ .*//") &&
 	test_path_is_file $BLOB_FILE
-
 '
 
 test_expect_success 'gc respects gc.pruneExpire' '
-
 	git config gc.pruneExpire 5002.days.ago &&
 	git gc &&
 	test_path_is_file $BLOB_FILE &&
 	git config gc.pruneExpire 5000.days.ago &&
 	git gc &&
 	test_path_is_missing $BLOB_FILE
-
 '
 
 test_expect_success 'gc --prune=<date>' '
-
 	add_blob &&
 	test-tool chmtime =-$((5001*$day)) $BLOB_FILE &&
 	git gc --prune=5002.days.ago &&
 	test_path_is_file $BLOB_FILE &&
 	git gc --prune=5000.days.ago &&
 	test_path_is_missing $BLOB_FILE
-
 '
 
 test_expect_success 'gc --prune=never' '
-
 	add_blob &&
 	git gc --prune=never &&
 	test_path_is_file $BLOB_FILE &&
 	git gc --prune=now &&
 	test_path_is_missing $BLOB_FILE
-
 '
 
 test_expect_success 'gc respects gc.pruneExpire=never' '
-
 	git config gc.pruneExpire never &&
 	add_blob &&
 	git gc &&
@@ -189,17 +160,14 @@ test_expect_success 'gc respects gc.pruneExpire=never' '
 	git config gc.pruneExpire now &&
 	git gc &&
 	test_path_is_missing $BLOB_FILE
-
 '
 
 test_expect_success 'prune --expire=never' '
-
 	add_blob &&
 	git prune --expire=never &&
 	test_path_is_file $BLOB_FILE &&
 	git prune &&
 	test_path_is_missing $BLOB_FILE
-
 '
 
 test_expect_success 'gc: prune old objects after local clone' '
@@ -219,16 +187,16 @@ test_expect_success 'gc: prune old objects after local clone' '
 test_expect_success 'garbage report in count-objects -v' '
 	test_when_finished "rm -f .git/objects/pack/fake*" &&
 	test_when_finished "rm -f .git/objects/pack/foo*" &&
-	: >.git/objects/pack/foo &&
-	: >.git/objects/pack/foo.bar &&
-	: >.git/objects/pack/foo.keep &&
-	: >.git/objects/pack/foo.pack &&
-	: >.git/objects/pack/fake.bar &&
-	: >.git/objects/pack/fake.keep &&
-	: >.git/objects/pack/fake.pack &&
-	: >.git/objects/pack/fake.idx &&
-	: >.git/objects/pack/fake2.keep &&
-	: >.git/objects/pack/fake3.idx &&
+	>.git/objects/pack/foo &&
+	>.git/objects/pack/foo.bar &&
+	>.git/objects/pack/foo.keep &&
+	>.git/objects/pack/foo.pack &&
+	>.git/objects/pack/fake.bar &&
+	>.git/objects/pack/fake.keep &&
+	>.git/objects/pack/fake.pack &&
+	>.git/objects/pack/fake.idx &&
+	>.git/objects/pack/fake2.keep &&
+	>.git/objects/pack/fake3.idx &&
 	git count-objects -v 2>stderr &&
 	grep "index file .git/objects/pack/fake.idx is too small" stderr &&
 	grep "^warning:" stderr | sort >actual &&
@@ -247,12 +215,12 @@ EOF
 test_expect_success 'clean pack garbage with gc' '
 	test_when_finished "rm -f .git/objects/pack/fake*" &&
 	test_when_finished "rm -f .git/objects/pack/foo*" &&
-	: >.git/objects/pack/foo.keep &&
-	: >.git/objects/pack/foo.pack &&
-	: >.git/objects/pack/fake.idx &&
-	: >.git/objects/pack/fake2.keep &&
-	: >.git/objects/pack/fake2.idx &&
-	: >.git/objects/pack/fake3.keep &&
+	>.git/objects/pack/foo.keep &&
+	>.git/objects/pack/foo.pack &&
+	>.git/objects/pack/fake.idx &&
+	>.git/objects/pack/fake2.keep &&
+	>.git/objects/pack/fake2.idx &&
+	>.git/objects/pack/fake3.keep &&
 	git gc &&
 	git count-objects -v 2>stderr &&
 	grep "^warning:" stderr | sort >actual &&
@@ -349,4 +317,20 @@ test_expect_success 'trivial prune with bitmaps enabled' '
 	test_must_fail git cat-file -e $blob
 '
 
+test_expect_success 'old reachable-from-recent retained with bitmaps' '
+	git repack -adb &&
+	to_drop=$(echo bitmap-from-recent-1 | git hash-object -w --stdin) &&
+	test-tool chmtime -86400 .git/objects/$(test_oid_to_path $to_drop) &&
+	to_save=$(echo bitmap-from-recent-2 | git hash-object -w --stdin) &&
+	test-tool chmtime -86400 .git/objects/$(test_oid_to_path $to_save) &&
+	tree=$(printf "100644 blob $to_save\tfile\n" | git mktree) &&
+	test-tool chmtime -86400 .git/objects/$(test_oid_to_path $tree) &&
+	commit=$(echo foo | git commit-tree $tree) &&
+	git prune --expire=12.hours.ago &&
+	git cat-file -e $commit &&
+	git cat-file -e $tree &&
+	git cat-file -e $to_save &&
+	test_must_fail git cat-file -e $to_drop
+'
+
 test_done
diff --git a/t/t5305-include-tag.sh b/t/t5305-include-tag.sh
index a5eca210b8..44bd9ef45f 100755
--- a/t/t5305-include-tag.sh
+++ b/t/t5305-include-tag.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git pack-object --include-tag'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 TRASH=$(pwd)
@@ -111,7 +114,7 @@ test_expect_success 'check unpacked result (have all objects)' '
 
 test_expect_success 'single-branch clone can transfer tag' '
 	rm -rf clone.git &&
-	git clone --no-local --single-branch -b master . clone.git &&
+	git clone --no-local --single-branch -b main . clone.git &&
 	git -C clone.git fsck
 '
 
diff --git a/t/t5308-pack-detect-duplicates.sh b/t/t5308-pack-detect-duplicates.sh
index 6845c1f3c3..693b2411c8 100755
--- a/t/t5308-pack-detect-duplicates.sh
+++ b/t/t5308-pack-detect-duplicates.sh
@@ -4,23 +4,27 @@ test_description='handling of duplicate objects in incoming packfiles'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-pack.sh
 
-if ! test_have_prereq SHA1
-then
-       skip_all='not using SHA-1 for objects'
-       test_done
-fi
+test_expect_success 'setup' '
+	test_oid_cache <<-EOF
+	lo_oid sha1:e68fe8129b546b101aee9510c5328e7f21ca1d18
+	lo_oid sha256:471819e8c52bf11513f100b2810a8aa0622d5cd3d1c913758a071dd4b3bad8fe
+
+	missing_oid sha1:e69d000000000000000000000000000000000000
+	missing_oid sha256:4720000000000000000000000000000000000000000000000000000000000000
+	EOF
+'
 
 # The sha1s we have in our pack. It's important that these have the same
 # starting byte, so that they end up in the same fanout section of the index.
 # That lets us make sure we are exercising the binary search with both sets.
-LO_SHA1=e68fe8129b546b101aee9510c5328e7f21ca1d18
-HI_SHA1=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+LO_SHA1=$(test_oid lo_oid)
+HI_SHA1=$EMPTY_BLOB
 
 # And here's a "missing sha1" which will produce failed lookups. It must also
 # be in the same fanout section, and should be between the two (so that during
 # our binary search, we are sure to end up looking at one or the other of the
 # duplicate runs).
-MISSING_SHA1='e69d000000000000000000000000000000000000'
+MISSING_SHA1=$(test_oid missing_oid)
 
 # git will never intentionally create packfiles with
 # duplicate objects, so we have to construct them by hand.
diff --git a/t/t5309-pack-delta-cycles.sh b/t/t5309-pack-delta-cycles.sh
index 491556dad9..55b787630f 100755
--- a/t/t5309-pack-delta-cycles.sh
+++ b/t/t5309-pack-delta-cycles.sh
@@ -4,15 +4,9 @@ test_description='test index-pack handling of delta cycles in packfiles'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-pack.sh
 
-if ! test_have_prereq SHA1
-then
-       skip_all='not using SHA-1 for objects'
-       test_done
-fi
-
 # Two similar-ish objects that we have computed deltas between.
-A=01d7713666f4de822776c7622c10f1b07de280dc
-B=e68fe8129b546b101aee9510c5328e7f21ca1d18
+A=$(test_oid packlib_7_0)
+B=$(test_oid packlib_7_76)
 
 # double-check our hand-constucted packs
 test_expect_success 'index-pack works with a single delta (A->B)' '
@@ -62,13 +56,13 @@ test_expect_success 'index-pack detects REF_DELTA cycles' '
 	test_must_fail git index-pack --fix-thin --stdin <cycle.pack
 '
 
-test_expect_failure 'failover to an object in another pack' '
+test_expect_success 'failover to an object in another pack' '
 	clear_packs &&
 	git index-pack --stdin <ab.pack &&
-	git index-pack --stdin --fix-thin <cycle.pack
+	test_must_fail git index-pack --stdin --fix-thin <cycle.pack
 '
 
-test_expect_failure 'failover to a duplicate object in the same pack' '
+test_expect_success 'failover to a duplicate object in the same pack' '
 	clear_packs &&
 	{
 		pack_header 3 &&
@@ -77,7 +71,7 @@ test_expect_failure 'failover to a duplicate object in the same pack' '
 		pack_obj $A
 	} >recoverable.pack &&
 	pack_trailer recoverable.pack &&
-	git index-pack --fix-thin --stdin <recoverable.pack
+	test_must_fail git index-pack --fix-thin --stdin <recoverable.pack
 '
 
 test_done
diff --git a/t/t5310-pack-bitmaps.sh b/t/t5310-pack-bitmaps.sh
index 6640329ebf..b02838750e 100755
--- a/t/t5310-pack-bitmaps.sh
+++ b/t/t5310-pack-bitmaps.sh
@@ -1,7 +1,12 @@
 #!/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
 
 objpath () {
 	echo ".git/objects/$(echo "$1" | sed -e 's|\(..\)|\1/|')"
@@ -20,76 +25,172 @@ 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 100 &&
+	test_commit_bulk --id=file 10 &&
+	git branch -M second &&
 	git checkout -b other HEAD~5 &&
 	test_commit_bulk --id=side 10 &&
-	git checkout master &&
-	bitmaptip=$(git rev-parse master) &&
+
+	# 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
 '
 
 test_expect_success 'full repack creates bitmaps' '
-	git repack -ad &&
+	GIT_TRACE2_EVENT_NESTING=4 GIT_TRACE2_EVENT="$(pwd)/trace" \
+		git repack -ad &&
 	ls .git/objects/pack/ | grep bitmap >output &&
-	test_line_count = 1 output
+	test_line_count = 1 output &&
+	grep "\"key\":\"num_selected_commits\",\"value\":\"106\"" trace &&
+	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() {
-	state=$1
-
-	test_expect_success "counting commits via bitmap ($state)" '
-		git rev-list --count HEAD >expect &&
-		git rev-list --use-bitmap-index --count HEAD >actual &&
+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)" '
-		git rev-list --count HEAD~5..HEAD >expect &&
-		git rev-list --use-bitmap-index --count HEAD~5..HEAD >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)" '
-		git rev-list --count -n 1 HEAD >expect &&
-		git rev-list --use-bitmap-index --count -n 1 HEAD >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)" '
-		git rev-list --count other...master >expect &&
-		git rev-list --use-bitmap-index --count other...master >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)" '
-		git rev-list --count HEAD -- 1.t >expect &&
-		git rev-list --use-bitmap-index --count HEAD -- 1.t >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 "enumerate --objects ($state)" '
-		git rev-list --objects --use-bitmap-index HEAD >tmp &&
-		cut -d" " -f1 <tmp >tmp2 &&
-		sort <tmp2 >actual &&
-		git rev-list --objects HEAD >tmp &&
-		cut -d" " -f1 <tmp >tmp2 &&
-		sort <tmp2 >expect &&
+	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 "bitmap --objects handles non-commit objects ($state)" '
-		git rev-list --objects --use-bitmap-index HEAD tagged-blob >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' '
@@ -99,6 +200,20 @@ test_expect_success 'clone from bitmapped repository' '
 	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
 '
@@ -106,7 +221,7 @@ test_expect_success 'setup further non-bitmapped commits' '
 rev_list_tests 'partial bitmap'
 
 test_expect_success 'fetch (partial bitmap)' '
-	git --git-dir=clone.git fetch origin master:master &&
+	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
@@ -208,7 +323,7 @@ test_expect_success 'full repack, reusing previous bitmaps' '
 '
 
 test_expect_success 'fetch (full bitmap)' '
-	git --git-dir=clone.git fetch origin master:master &&
+	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
@@ -255,7 +370,7 @@ test_expect_success 'pack with missing parent' '
 	git pack-objects --stdout --revs <revs >/dev/null
 '
 
-test_expect_success JGIT 'we can read jgit bitmaps' '
+test_expect_success JGIT,SHA1 'we can read jgit bitmaps' '
 	git clone --bare . compat-jgit.git &&
 	(
 		cd compat-jgit.git &&
@@ -265,7 +380,7 @@ test_expect_success JGIT 'we can read jgit bitmaps' '
 	)
 '
 
-test_expect_success JGIT 'jgit can read our bitmaps' '
+test_expect_success JGIT,SHA1 'jgit can read our bitmaps' '
 	git clone --bare . compat-us.git &&
 	(
 		cd compat-us.git &&
@@ -321,7 +436,20 @@ test_expect_success 'pack reuse respects --incremental' '
 	test_must_be_empty actual
 '
 
-test_expect_success 'truncated bitmap fails gracefully' '
+test_expect_success 'truncated bitmap fails gracefully (ewah)' '
+	test_config pack.writebitmaphashcache false &&
+	git repack -ad &&
+	git rev-list --use-bitmap-index --count --all >expect &&
+	bitmap=$(ls .git/objects/pack/*.bitmap) &&
+	test_when_finished "rm -f $bitmap" &&
+	test_copy_bytes 256 <$bitmap >$bitmap.tmp &&
+	mv -f $bitmap.tmp $bitmap &&
+	git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
+	test_cmp expect actual &&
+	test_i18ngrep corrupt.ewah.bitmap stderr
+'
+
+test_expect_success 'truncated bitmap fails gracefully (cache)' '
 	git repack -ad &&
 	git rev-list --use-bitmap-index --count --all >expect &&
 	bitmap=$(ls .git/objects/pack/*.bitmap) &&
@@ -330,7 +458,30 @@ test_expect_success 'truncated bitmap fails gracefully' '
 	mv -f $bitmap.tmp $bitmap &&
 	git rev-list --use-bitmap-index --count --all >actual 2>stderr &&
 	test_cmp expect actual &&
-	test_i18ngrep corrupt stderr
+	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>
@@ -426,4 +577,42 @@ test_expect_success 'fetch with bitmaps can reuse old base' '
 	)
 '
 
+test_expect_success 'pack.preferBitmapTips' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		# create enough commits that not all are receive bitmap
+		# coverage even if they are all at the tip of some reference.
+		test_commit_bulk --message="%s" 103 &&
+
+		git rev-list HEAD >commits.raw &&
+		sort <commits.raw >commits &&
+
+		git log --format="create refs/tags/%s %H" HEAD >refs &&
+		git update-ref --stdin <refs &&
+
+		git repack -adb &&
+		test-tool bitmap list-commits | sort >bitmaps &&
+
+		# remember which commits did not receive bitmaps
+		comm -13 bitmaps commits >before &&
+		test_file_not_empty before &&
+
+		# mark the commits which did not receive bitmaps as preferred,
+		# and generate the bitmap again
+		perl -pe "s{^}{create refs/tags/include/$. }" <before |
+			git update-ref --stdin &&
+		git -c pack.preferBitmapTips=refs/tags/include repack -adb &&
+
+		# finally, check that the commit(s) without bitmap coverage
+		# are not the same ones as before
+		test-tool bitmap list-commits | sort >bitmaps &&
+		comm -13 bitmaps commits >after &&
+
+		! test_cmp before after
+	)
+'
+
 test_done
diff --git a/t/t5312-prune-corruption.sh b/t/t5312-prune-corruption.sh
index da9d59940d..11423b3cb2 100755
--- a/t/t5312-prune-corruption.sh
+++ b/t/t5312-prune-corruption.sh
@@ -8,6 +8,9 @@ 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.
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'disable reflogs' '
@@ -16,7 +19,7 @@ test_expect_success 'disable reflogs' '
 '
 
 test_expect_success 'create history reachable only from a bogus-named ref' '
-	test_tick && git commit --allow-empty -m master &&
+	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) &&
@@ -51,7 +54,7 @@ test_expect_success 'clean up bogus ref' '
 '
 
 # We create two new objects here, "one" and "two". Our
-# master branch points to "two", which is deleted,
+# main branch points to "two", which is deleted,
 # corrupting the repository. But we'd like to make sure
 # that the otherwise unreachable "one" is not pruned
 # (since it is the user's best bet for recovering
@@ -81,7 +84,7 @@ test_expect_success 'pruning with a corrupted tip does not drop history' '
 test_expect_success 'pack-refs does not silently delete broken loose ref' '
 	git pack-refs --all --prune &&
 	echo $missing >expect &&
-	git rev-parse refs/heads/master >actual &&
+	git rev-parse refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
@@ -89,25 +92,25 @@ test_expect_success 'pack-refs does not silently delete broken loose ref' '
 # actually pack it, as it is perfectly reasonable to
 # skip processing a broken ref
 test_expect_success 'create packed-refs file with broken ref' '
-	rm -f .git/refs/heads/master &&
+	rm -f .git/refs/heads/main &&
 	cat >.git/packed-refs <<-EOF &&
-	$missing refs/heads/master
+	$missing refs/heads/main
 	$recoverable refs/heads/other
 	EOF
 	echo $missing >expect &&
-	git rev-parse refs/heads/master >actual &&
+	git rev-parse refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'pack-refs does not silently delete broken packed ref' '
 	git pack-refs --all --prune &&
-	git rev-parse refs/heads/master >actual &&
+	git rev-parse refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'pack-refs does not drop broken refs during deletion' '
 	git update-ref -d refs/heads/other &&
-	git rev-parse refs/heads/master >actual &&
+	git rev-parse refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
diff --git a/t/t5313-pack-bounds-checks.sh b/t/t5313-pack-bounds-checks.sh
index f1708d415e..535313e4dc 100755
--- a/t/t5313-pack-bounds-checks.sh
+++ b/t/t5313-pack-bounds-checks.sh
@@ -38,16 +38,26 @@ munge () {
 # for the initial, and another ofs(4*nr) past that for the extended.
 #
 ofs_table () {
-	echo $((4 + 4 + 4*256 + 20*$1 + 4*$1))
+	echo $((4 + 4 + 4*256 + $(test_oid rawsz)*$1 + 4*$1))
 }
 extended_table () {
 	echo $(($(ofs_table "$1") + 4*$1))
 }
 
+test_expect_success 'setup' '
+	test_oid_cache <<-EOF
+	oid000 sha1:1485
+	oid000 sha256:4222
+
+	oidfff sha1:74
+	oidfff sha256:1350
+	EOF
+'
+
 test_expect_success 'set up base packfile and variables' '
 	# the hash of this content starts with ff, which
 	# makes some later computations much simpler
-	echo 74 >file &&
+	echo $(test_oid oidfff) >file &&
 	git add file &&
 	git commit -m base &&
 	git repack -ad &&
@@ -140,10 +150,10 @@ test_expect_success 'bogus offset inside v2 extended table' '
 	# an extended table (if the first object were larger than 2^31).
 	#
 	# Note that the value is important here. We want $object as
-	# the second entry in sorted-sha1 order. The sha1 of 1485 starts
+	# the second entry in sorted-hash order. The hash of this object starts
 	# with "000", which sorts before that of $object (which starts
 	# with "fff").
-	second=$(echo 1485 | git hash-object -w --stdin) &&
+	second=$(test_oid oid000 | git hash-object -w --stdin) &&
 	do_pack "$object $second" --index-version=2 &&
 
 	# We have to make extra room for the table, so we cannot
diff --git a/t/t5314-pack-cycle-detection.sh b/t/t5314-pack-cycle-detection.sh
index e525466de0..0aec8619e2 100755
--- a/t/t5314-pack-cycle-detection.sh
+++ b/t/t5314-pack-cycle-detection.sh
@@ -53,7 +53,7 @@ immediately after the lookup for "dummy".
 
 
 
-# Create a pack containing the the tree $1 and blob $1:file, with
+# Create a pack containing the tree $1 and blob $1:file, with
 # the latter stored as a delta against $2:file.
 #
 # We convince pack-objects to make the delta in the direction of our choosing
diff --git a/t/t5315-pack-objects-compression.sh b/t/t5315-pack-objects-compression.sh
index df970d7584..8bacd96275 100755
--- a/t/t5315-pack-objects-compression.sh
+++ b/t/t5315-pack-objects-compression.sh
@@ -4,12 +4,6 @@ test_description='pack-object compression configuration'
 
 . ./test-lib.sh
 
-# This should be moved to test-lib.sh together with the
-# copy in t0021 after both topics have graduated to 'master'.
-file_size () {
-	test-tool path-utils file-size "$1"
-}
-
 test_expect_success setup '
 	printf "%2000000s" X |
 	git hash-object -w --stdin >object-name &&
@@ -24,7 +18,7 @@ do
 	test_expect_success "pack-objects with $config" '
 		test_when_finished "rm -f pack-*.*" &&
 		git $config pack-objects pack <object-name &&
-		sz=$(file_size pack-*.pack) &&
+		sz=$(test_file_size pack-*.pack) &&
 		case "$expect" in
 		small) test "$sz" -le 100000 ;;
 		large) test "$sz" -ge 100000 ;;
diff --git a/t/t5316-pack-delta-depth.sh b/t/t5316-pack-delta-depth.sh
index 0f06c40eb1..759169d074 100755
--- a/t/t5316-pack-delta-depth.sh
+++ b/t/t5316-pack-delta-depth.sh
@@ -69,6 +69,7 @@ test_expect_success 'create series of packs' '
 max_chain() {
 	git index-pack --verify-stat-only "$1" >output &&
 	perl -lne '
+	  BEGIN { $len = 0 }
 	  /chain length = (\d+)/ and $len = $1;
 	  END { print $len }
 	' output
@@ -84,14 +85,28 @@ test_expect_success 'packing produces a long delta' '
 	pack=$(git pack-objects --all --window=0 </dev/null pack) &&
 	echo 9 >expect &&
 	max_chain pack-$pack.pack >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success '--depth limits depth' '
 	pack=$(git pack-objects --all --depth=5 </dev/null pack) &&
 	echo 5 >expect &&
 	max_chain pack-$pack.pack >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
+'
+
+test_expect_success '--depth=0 disables deltas' '
+	pack=$(git pack-objects --all --depth=0 </dev/null pack) &&
+	echo 0 >expect &&
+	max_chain pack-$pack.pack >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'negative depth disables deltas' '
+	pack=$(git pack-objects --all --depth=-1 </dev/null pack) &&
+	echo 0 >expect &&
+	max_chain pack-$pack.pack >actual &&
+	test_cmp expect actual
 '
 
 test_done
diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
index 2d2f5d0229..13ed3eb136 100755
--- a/t/t5317-pack-objects-filter-objects.sh
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -2,6 +2,9 @@
 
 test_description='git pack-objects using object filtering'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Test blob:none filter.
@@ -45,12 +48,7 @@ test_expect_success 'verify blob:none packfile has no blobs' '
 	git -C r1 index-pack ../filter.pack &&
 
 	git -C r1 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	awk -f print_1.awk |
-	sort >observed &&
-
-	nr=$(wc -l <observed) &&
-	test 0 -eq $nr
+	! grep blob verify_result
 '
 
 test_expect_success 'verify normal and blob:none packfiles have same commits/trees' '
@@ -72,7 +70,8 @@ test_expect_success 'get an error for missing tree object' '
 	echo foo >r5/foo &&
 	git -C r5 add foo &&
 	git -C r5 commit -m "foo" &&
-	del=$(git -C r5 rev-parse HEAD^{tree} | sed "s|..|&/|") &&
+	git -C r5 rev-parse HEAD^{tree} >tree &&
+	del=$(sed "s|..|&/|" tree) &&
 	rm r5/.git/objects/$del &&
 	test_must_fail git -C r5 pack-objects --revs --stdout 2>bad_tree <<-EOF &&
 	HEAD
@@ -148,12 +147,7 @@ test_expect_success 'verify blob:limit=500 omits all blobs' '
 	git -C r2 index-pack ../filter.pack &&
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	awk -f print_1.awk |
-	sort >observed &&
-
-	nr=$(wc -l <observed) &&
-	test 0 -eq $nr
+	! grep blob verify_result
 '
 
 test_expect_success 'verify blob:limit=1000' '
@@ -163,12 +157,7 @@ test_expect_success 'verify blob:limit=1000' '
 	git -C r2 index-pack ../filter.pack &&
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
-	grep blob verify_result |
-	awk -f print_1.awk |
-	sort >observed &&
-
-	nr=$(wc -l <observed) &&
-	test 0 -eq $nr
+	! grep blob verify_result
 '
 
 test_expect_success 'verify blob:limit=1001' '
@@ -230,10 +219,9 @@ test_expect_success 'verify explicitly specifying oversized blob in input' '
 	awk -f print_2.awk ls_files_result |
 	sort >expected &&
 
-	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
-	HEAD
-	$(git -C r2 rev-parse HEAD:large.10000)
-	EOF
+	echo HEAD >objects &&
+	git -C r2 rev-parse HEAD:large.10000 >>objects &&
+	git -C r2 pack-objects --revs --stdout --filter=blob:limit=1k <objects >filter.pack &&
 	git -C r2 index-pack ../filter.pack &&
 
 	git -C r2 verify-pack -v ../filter.pack >verify_result &&
@@ -377,7 +365,8 @@ test_expect_success 'verify sparse:oid=OID' '
 	awk -f print_2.awk ls_files_result |
 	sort >expected &&
 
-	oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
+	git -C r4 ls-files -s pattern >staged &&
+	oid=$(awk -f print_2.awk staged) &&
 	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
 	HEAD
 	EOF
@@ -396,7 +385,7 @@ test_expect_success 'verify sparse:oid=oid-ish' '
 	awk -f print_2.awk ls_files_result |
 	sort >expected &&
 
-	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
+	git -C r4 pack-objects --revs --stdout --filter=sparse:oid=main:pattern >filter.pack <<-EOF &&
 	HEAD
 	EOF
 	git -C r4 index-pack ../filter.pack &&
diff --git a/t/t5318-commit-graph.sh b/t/t5318-commit-graph.sh
index d42b3efe39..af88f805aa 100755
--- a/t/t5318-commit-graph.sh
+++ b/t/t5318-commit-graph.sh
@@ -3,13 +3,23 @@
 test_description='commit graph'
 . ./test-lib.sh
 
+GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
+
 test_expect_success 'setup full repo' '
 	mkdir full &&
 	cd "$TRASH_DIRECTORY/full" &&
 	git init &&
 	git config core.commitGraph true &&
 	objdir=".git/objects" &&
-	test_oid_init
+
+	test_oid_cache <<-EOF
+	oid_version sha1:1
+	oid_version sha256:2
+	EOF
+'
+
+test_expect_success POSIXPERM 'tweak umask for modebit tests' '
+	umask 022
 '
 
 test_expect_success 'verify graph with no graph file' '
@@ -19,8 +29,8 @@ test_expect_success 'verify graph with no graph file' '
 
 test_expect_success 'write graph with no packs' '
 	cd "$TRASH_DIRECTORY/full" &&
-	git commit-graph write --object-dir . &&
-	test_path_is_missing info/commit-graph
+	git commit-graph write --object-dir $objdir &&
+	test_path_is_missing $objdir/info/commit-graph
 '
 
 test_expect_success 'exit with correct error on bad input to --stdin-packs' '
@@ -40,15 +50,6 @@ test_expect_success 'create commits and repack' '
 	git repack
 '
 
-test_expect_success 'exit with correct error on bad input to --stdin-commits' '
-	cd "$TRASH_DIRECTORY/full" &&
-	echo HEAD | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
-	test_i18ngrep "invalid commit object id" stderr &&
-	# valid tree OID, but not a commit OID
-	git rev-parse HEAD^{tree} | test_expect_code 1 git commit-graph write --stdin-commits 2>stderr &&
-	test_i18ngrep "invalid commit object id" stderr
-'
-
 graph_git_two_modes() {
 	git -c core.commitGraph=true $1 >output
 	git -c core.commitGraph=false $1 >expect
@@ -75,25 +76,48 @@ graph_git_behavior 'no graph' full commits/3 commits/1
 graph_read_expect() {
 	OPTIONAL=""
 	NUM_CHUNKS=3
-	if test ! -z $2
+	if test ! -z "$2"
 	then
 		OPTIONAL=" $2"
 		NUM_CHUNKS=$((3 + $(echo "$2" | wc -w)))
 	fi
 	cat >expect <<- EOF
-	header: 43475048 1 1 $NUM_CHUNKS 0
+	header: 43475048 1 $(test_oid oid_version) $NUM_CHUNKS 0
 	num_commits: $1
 	chunks: oid_fanout oid_lookup commit_metadata$OPTIONAL
 	EOF
-	git commit-graph read >output &&
+	test-tool read-graph >output &&
 	test_cmp expect output
 }
 
+test_expect_success 'exit with correct error on bad input to --stdin-commits' '
+	cd "$TRASH_DIRECTORY/full" &&
+	# invalid, non-hex OID
+	echo HEAD >in &&
+	test_expect_code 1 git commit-graph write --stdin-commits <in 2>stderr &&
+	test_i18ngrep "unexpected non-hex object ID: HEAD" stderr &&
+	# non-existent OID
+	echo $ZERO_OID >in &&
+	test_expect_code 1 git commit-graph write --stdin-commits <in 2>stderr &&
+	test_i18ngrep "invalid object" stderr &&
+	# valid commit and tree OID
+	git rev-parse HEAD HEAD^{tree} >in &&
+	git commit-graph write --stdin-commits <in &&
+	graph_read_expect 3 generation_data
+'
+
 test_expect_success 'write graph' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git commit-graph write &&
 	test_path_is_file $objdir/info/commit-graph &&
-	graph_read_expect "3"
+	graph_read_expect "3" generation_data
+'
+
+test_expect_success POSIXPERM 'write graph has correct permissions' '
+	test_path_is_file $objdir/info/commit-graph &&
+	echo "-r--r--r--" >expect &&
+	test_modebits $objdir/info/commit-graph >actual &&
+	test_cmp expect actual
 '
 
 graph_git_behavior 'graph exists' full commits/3 commits/1
@@ -127,37 +151,58 @@ test_expect_success 'Add more commits' '
 test_expect_success 'commit-graph write progress off for redirected stderr' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git commit-graph write 2>err &&
-	test_line_count = 0 err
+	test_must_be_empty err
 '
 
 test_expect_success 'commit-graph write force progress on for stderr' '
 	cd "$TRASH_DIRECTORY/full" &&
-	git commit-graph write --progress 2>err &&
+	GIT_PROGRESS_DELAY=0 git commit-graph write --progress 2>err &&
 	test_file_not_empty err
 '
 
 test_expect_success 'commit-graph write with the --no-progress option' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git commit-graph write --no-progress 2>err &&
-	test_line_count = 0 err
+	test_must_be_empty err
+'
+
+test_expect_success 'commit-graph write --stdin-commits progress off for redirected stderr' '
+	cd "$TRASH_DIRECTORY/full" &&
+	git rev-parse commits/5 >in &&
+	git commit-graph write --stdin-commits <in 2>err &&
+	test_must_be_empty err
+'
+
+test_expect_success 'commit-graph write --stdin-commits force progress on for stderr' '
+	cd "$TRASH_DIRECTORY/full" &&
+	git rev-parse commits/5 >in &&
+	GIT_PROGRESS_DELAY=0 git commit-graph write --stdin-commits --progress <in 2>err &&
+	test_i18ngrep "Collecting commits from input" err
+'
+
+test_expect_success 'commit-graph write --stdin-commits with the --no-progress option' '
+	cd "$TRASH_DIRECTORY/full" &&
+	git rev-parse commits/5 >in &&
+	git commit-graph write --stdin-commits --no-progress <in 2>err &&
+	test_must_be_empty err
 '
 
 test_expect_success 'commit-graph verify progress off for redirected stderr' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git commit-graph verify 2>err &&
-	test_line_count = 0 err
+	test_must_be_empty err
 '
 
 test_expect_success 'commit-graph verify force progress on for stderr' '
 	cd "$TRASH_DIRECTORY/full" &&
-	git commit-graph verify --progress 2>err &&
+	GIT_PROGRESS_DELAY=0 git commit-graph verify --progress 2>err &&
 	test_file_not_empty err
 '
 
 test_expect_success 'commit-graph verify with the --no-progress option' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git commit-graph verify --no-progress 2>err &&
-	test_line_count = 0 err
+	test_must_be_empty err
 '
 
 # Current graph structure:
@@ -174,7 +219,7 @@ test_expect_success 'write graph with merges' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git commit-graph write &&
 	test_path_is_file $objdir/info/commit-graph &&
-	graph_read_expect "10" "extra_edges"
+	graph_read_expect "10" "generation_data extra_edges"
 '
 
 graph_git_behavior 'merge 1 vs 2' full merge/1 merge/2
@@ -209,7 +254,7 @@ test_expect_success 'write graph with new commit' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git commit-graph write &&
 	test_path_is_file $objdir/info/commit-graph &&
-	graph_read_expect "11" "extra_edges"
+	graph_read_expect "11" "generation_data extra_edges"
 '
 
 graph_git_behavior 'full graph, commit 8 vs merge 1' full commits/8 merge/1
@@ -219,7 +264,7 @@ test_expect_success 'write graph with nothing new' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git commit-graph write &&
 	test_path_is_file $objdir/info/commit-graph &&
-	graph_read_expect "11" "extra_edges"
+	graph_read_expect "11" "generation_data extra_edges"
 '
 
 graph_git_behavior 'cleared graph, commit 8 vs merge 1' full commits/8 merge/1
@@ -229,7 +274,7 @@ test_expect_success 'build graph from latest pack with closure' '
 	cd "$TRASH_DIRECTORY/full" &&
 	cat new-idx | git commit-graph write --stdin-packs &&
 	test_path_is_file $objdir/info/commit-graph &&
-	graph_read_expect "9" "extra_edges"
+	graph_read_expect "9" "generation_data extra_edges"
 '
 
 graph_git_behavior 'graph from pack, commit 8 vs merge 1' full commits/8 merge/1
@@ -242,7 +287,7 @@ test_expect_success 'build graph from commits with closure' '
 	git rev-parse merge/1 >>commits-in &&
 	cat commits-in | git commit-graph write --stdin-commits &&
 	test_path_is_file $objdir/info/commit-graph &&
-	graph_read_expect "6"
+	graph_read_expect "6" "generation_data"
 '
 
 graph_git_behavior 'graph from commits, commit 8 vs merge 1' full commits/8 merge/1
@@ -252,7 +297,7 @@ test_expect_success 'build graph from commits with append' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git rev-parse merge/3 | git commit-graph write --stdin-commits --append &&
 	test_path_is_file $objdir/info/commit-graph &&
-	graph_read_expect "10" "extra_edges"
+	graph_read_expect "10" "generation_data extra_edges"
 '
 
 graph_git_behavior 'append graph, commit 8 vs merge 1' full commits/8 merge/1
@@ -262,7 +307,7 @@ test_expect_success 'build graph using --reachable' '
 	cd "$TRASH_DIRECTORY/full" &&
 	git commit-graph write --reachable &&
 	test_path_is_file $objdir/info/commit-graph &&
-	graph_read_expect "11" "extra_edges"
+	graph_read_expect "11" "generation_data extra_edges"
 '
 
 graph_git_behavior 'append graph, commit 8 vs merge 1' full commits/8 merge/1
@@ -283,7 +328,7 @@ test_expect_success 'write graph in bare repo' '
 	cd "$TRASH_DIRECTORY/bare" &&
 	git commit-graph write &&
 	test_path_is_file $baredir/info/commit-graph &&
-	graph_read_expect "11" "extra_edges"
+	graph_read_expect "11" "generation_data extra_edges"
 '
 
 graph_git_behavior 'bare repo with graph, commit 8 vs merge 1' bare commits/8 merge/1
@@ -372,6 +417,56 @@ test_expect_success 'replace-objects invalidates commit-graph' '
 	)
 '
 
+test_expect_success 'warn on improper hash version' '
+	git init --object-format=sha1 sha1 &&
+	(
+		cd sha1 &&
+		test_commit 1 &&
+		git commit-graph write --reachable &&
+		mv .git/objects/info/commit-graph ../cg-sha1
+	) &&
+	git init --object-format=sha256 sha256 &&
+	(
+		cd sha256 &&
+		test_commit 1 &&
+		git commit-graph write --reachable &&
+		mv .git/objects/info/commit-graph ../cg-sha256
+	) &&
+	(
+		cd sha1 &&
+		mv ../cg-sha256 .git/objects/info/commit-graph &&
+		git log -1 2>err &&
+		test_i18ngrep "commit-graph hash version 2 does not match version 1" err
+	) &&
+	(
+		cd sha256 &&
+		mv ../cg-sha1 .git/objects/info/commit-graph &&
+		git log -1 2>err &&
+		test_i18ngrep "commit-graph hash version 1 does not match version 2" err
+	)
+'
+
+test_expect_success 'lower layers have overflow chunk' '
+	cd "$TRASH_DIRECTORY/full" &&
+	UNIX_EPOCH_ZERO="@0 +0000" &&
+	FUTURE_DATE="@2147483646 +0000" &&
+	rm -f .git/objects/info/commit-graph &&
+	test_commit --date "$FUTURE_DATE" future-1 &&
+	test_commit --date "$UNIX_EPOCH_ZERO" old-1 &&
+	git commit-graph write --reachable &&
+	test_commit --date "$FUTURE_DATE" future-2 &&
+	test_commit --date "$UNIX_EPOCH_ZERO" old-2 &&
+	git commit-graph write --reachable --split=no-merge &&
+	test_commit extra &&
+	git commit-graph write --reachable --split=no-merge &&
+	git commit-graph write --reachable &&
+	graph_read_expect 16 "generation_data generation_data_overflow extra_edges" &&
+	mv .git/objects/info/commit-graph commit-graph-upgraded &&
+	git commit-graph write --reachable &&
+	graph_read_expect 16 "generation_data generation_data_overflow extra_edges" &&
+	test_cmp .git/objects/info/commit-graph commit-graph-upgraded
+'
+
 # the verify tests below expect the commit-graph to contain
 # exactly the commits reachable from the commits/8 branch.
 # If the file changes the set of commits in the list, then the
@@ -380,8 +475,9 @@ test_expect_success 'replace-objects invalidates commit-graph' '
 
 test_expect_success 'git commit-graph verify' '
 	cd "$TRASH_DIRECTORY/full" &&
-	git rev-parse commits/8 | git commit-graph write --stdin-commits &&
-	git commit-graph verify >output
+	git rev-parse commits/8 | git -c commitGraph.generationVersion=1 commit-graph write --stdin-commits &&
+	git commit-graph verify >output &&
+	graph_read_expect 9 extra_edges
 '
 
 NUM_COMMITS=9
@@ -421,7 +517,8 @@ GRAPH_BYTE_FOOTER=$(($GRAPH_OCTOPUS_DATA_OFFSET + 4 * $NUM_OCTOPUS_EDGES))
 corrupt_graph_setup() {
 	cd "$TRASH_DIRECTORY/full" &&
 	test_when_finished mv commit-graph-backup $objdir/info/commit-graph &&
-	cp $objdir/info/commit-graph commit-graph-backup
+	cp $objdir/info/commit-graph commit-graph-backup &&
+	chmod u+w $objdir/info/commit-graph
 }
 
 corrupt_graph_verify() {
@@ -434,7 +531,8 @@ corrupt_graph_verify() {
 		cp $objdir/info/commit-graph commit-graph-pre-write-test
 	fi &&
 	git status --short &&
-	GIT_TEST_COMMIT_GRAPH_DIE_ON_LOAD=true git commit-graph write &&
+	GIT_TEST_COMMIT_GRAPH_DIE_ON_PARSE=true git commit-graph write &&
+	chmod u+w $objdir/info/commit-graph &&
 	git commit-graph verify
 }
 
@@ -453,7 +551,7 @@ corrupt_graph_and_verify() {
 	zero_pos=${4:-${orig_size}} &&
 	printf "$data" | dd of="$objdir/info/commit-graph" bs=1 seek="$pos" conv=notrunc &&
 	dd of="$objdir/info/commit-graph" bs=1 seek="$zero_pos" if=/dev/null &&
-	generate_zero_bytes $(($orig_size - $zero_pos)) >>"$objdir/info/commit-graph" &&
+	test-tool genzeros $(($orig_size - $zero_pos)) >>"$objdir/info/commit-graph" &&
 	corrupt_graph_verify "$grepstr"
 
 }
@@ -481,13 +579,13 @@ test_expect_success 'detect bad version' '
 '
 
 test_expect_success 'detect bad hash version' '
-	corrupt_graph_and_verify $GRAPH_BYTE_HASH "\02" \
+	corrupt_graph_and_verify $GRAPH_BYTE_HASH "\03" \
 		"hash version"
 '
 
 test_expect_success 'detect low chunk count' '
-	corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\02" \
-		"missing the .* chunk"
+	corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\01" \
+		"final chunk has non-zero id"
 '
 
 test_expect_success 'detect missing OID fanout chunk' '
@@ -572,7 +670,8 @@ test_expect_success 'detect invalid checksum hash' '
 
 test_expect_success 'detect incorrect chunk count' '
 	corrupt_graph_and_verify $GRAPH_BYTE_CHUNK_COUNT "\377" \
-		"chunk lookup table entry missing" $GRAPH_CHUNK_LOOKUP_OFFSET
+		"commit-graph file is too small to hold [0-9]* chunks" \
+		$GRAPH_CHUNK_LOOKUP_OFFSET
 '
 
 test_expect_success 'git fsck (checks commit-graph)' '
@@ -629,7 +728,7 @@ test_expect_success 'corrupt commit-graph write (broken parent)' '
 		empty="$(git mktree </dev/null)" &&
 		cat >broken <<-EOF &&
 		tree $empty
-		parent 0000000000000000000000000000000000000000
+		parent $ZERO_OID
 		author whatever <whatever@example.com> 1234 -0000
 		committer whatever <whatever@example.com> 1234 -0000
 
@@ -650,7 +749,7 @@ test_expect_success 'corrupt commit-graph write (missing tree)' '
 		cd repo &&
 		tree="$(git mktree </dev/null)" &&
 		cat >broken <<-EOF &&
-		parent 0000000000000000000000000000000000000000
+		parent $ZERO_OID
 		author whatever <whatever@example.com> 1234 -0000
 		committer whatever <whatever@example.com> 1234 -0000
 
@@ -660,8 +759,60 @@ test_expect_success 'corrupt commit-graph write (missing tree)' '
 		git commit-tree -p "$broken" -m "good" "$tree" >good &&
 		test_must_fail git commit-graph write --stdin-commits \
 			<good 2>test_err &&
-		test_i18ngrep "unable to get tree for" test_err
+		test_i18ngrep "unable to parse commit" test_err
 	)
 '
 
+# We test the overflow-related code with the following repo history:
+#
+#               4:F - 5:N - 6:U
+#              /                \
+# 1:U - 2:N - 3:U                M:N
+#              \                /
+#               7:N - 8:F - 9:N
+#
+# Here the commits denoted by U have committer date of zero seconds
+# since Unix epoch, the commits denoted by N have committer date
+# starting from 1112354055 seconds since Unix epoch (default committer
+# date for the test suite), and the commits denoted by F have committer
+# date of (2 ^ 31 - 2) seconds since Unix epoch.
+#
+# The largest offset observed is 2 ^ 31, just large enough to overflow.
+#
+
+test_expect_success 'set up and verify repo with generation data overflow chunk' '
+	objdir=".git/objects" &&
+	UNIX_EPOCH_ZERO="@0 +0000" &&
+	FUTURE_DATE="@2147483646 +0000" &&
+	test_oid_cache <<-EOF &&
+	oid_version sha1:1
+	oid_version sha256:2
+	EOF
+	cd "$TRASH_DIRECTORY" &&
+	mkdir repo &&
+	cd repo &&
+	git init &&
+	test_commit --date "$UNIX_EPOCH_ZERO" 1 &&
+	test_commit 2 &&
+	test_commit --date "$UNIX_EPOCH_ZERO" 3 &&
+	git commit-graph write --reachable &&
+	graph_read_expect 3 generation_data &&
+	test_commit --date "$FUTURE_DATE" 4 &&
+	test_commit 5 &&
+	test_commit --date "$UNIX_EPOCH_ZERO" 6 &&
+	git branch left &&
+	git reset --hard 3 &&
+	test_commit 7 &&
+	test_commit --date "$FUTURE_DATE" 8 &&
+	test_commit 9 &&
+	git branch right &&
+	git reset --hard 3 &&
+	test_merge M left right &&
+	git commit-graph write --reachable &&
+	graph_read_expect 10 "generation_data generation_data_overflow" &&
+	git commit-graph verify
+'
+
+graph_git_behavior 'generation data overflow chunk repo' repo left right
+
 test_done
diff --git a/t/t5319-multi-pack-index.sh b/t/t5319-multi-pack-index.sh
index c72ca04399..3d4d9f10c3 100755
--- a/t/t5319-multi-pack-index.sh
+++ b/t/t5319-multi-pack-index.sh
@@ -3,8 +3,11 @@
 test_description='multi-pack-indexes'
 . ./test-lib.sh
 
+GIT_TEST_MULTI_PACK_INDEX=0
 objdir=.git/objects
 
+HASH_LEN=$(test_oid rawsz)
+
 midx_read_expect () {
 	NUM_PACKS=$1
 	NUM_OBJECTS=$2
@@ -13,7 +16,7 @@ midx_read_expect () {
 	EXTRA_CHUNKS="$5"
 	{
 		cat <<-EOF &&
-		header: 4d494458 1 $NUM_CHUNKS $NUM_PACKS
+		header: 4d494458 1 $HASH_LEN $NUM_CHUNKS $NUM_PACKS
 		chunks: pack-names oid-fanout oid-lookup object-offsets$EXTRA_CHUNKS
 		num_objects: $NUM_OBJECTS
 		packs:
@@ -28,10 +31,28 @@ midx_read_expect () {
 	test_cmp expect actual
 }
 
-test_expect_success 'write midx with no packs' '
-	test_when_finished rm -f pack/multi-pack-index &&
-	git multi-pack-index --object-dir=. write &&
-	midx_read_expect 0 0 4 .
+test_expect_success 'setup' '
+	test_oid_cache <<-EOF
+	idxoff sha1:2999
+	idxoff sha256:3739
+
+	packnameoff sha1:652
+	packnameoff sha256:940
+
+	fanoutoff sha1:1
+	fanoutoff sha256:3
+	EOF
+'
+
+test_expect_success "don't write midx with no packs" '
+	test_must_fail git multi-pack-index --object-dir=. write &&
+	test_path_is_missing pack/multi-pack-index
+'
+
+test_expect_success SHA1 'warn if a midx contains no oid' '
+	cp "$TEST_DIRECTORY"/t5319/no-objects.midx $objdir/pack/multi-pack-index &&
+	test_must_fail git multi-pack-index verify &&
+	rm $objdir/pack/multi-pack-index
 '
 
 generate_objects () {
@@ -117,7 +138,7 @@ test_expect_success 'write midx with one v2 pack' '
 
 compare_results_with_midx "one v2 pack"
 
-test_expect_success 'corrupt idx not opened' '
+test_expect_success 'corrupt idx reports errors' '
 	idx=$(test-tool read-midx $objdir | grep "\.idx\$") &&
 	mv $objdir/pack/$idx backup-$idx &&
 	test_when_finished "mv backup-\$idx \$objdir/pack/\$idx" &&
@@ -128,7 +149,7 @@ test_expect_success 'corrupt idx not opened' '
 	test_copy_bytes 1064 <backup-$idx >$objdir/pack/$idx &&
 
 	git -c core.multiPackIndex=true rev-list --objects --all 2>err &&
-	test_must_be_empty err
+	grep "index unavailable" err
 '
 
 test_expect_success 'add more objects' '
@@ -147,6 +168,21 @@ test_expect_success 'write midx with two packs' '
 
 compare_results_with_midx "two packs"
 
+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 &&
+	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 &&
+	test_line_count = 0 err
+'
+
 test_expect_success 'add more packs' '
 	for j in $(test_seq 11 20)
 	do
@@ -165,10 +201,101 @@ test_expect_success 'write midx with twelve packs' '
 
 compare_results_with_midx "twelve packs"
 
+test_expect_success 'warn on improper hash version' '
+	git init --object-format=sha1 sha1 &&
+	(
+		cd sha1 &&
+		git config core.multiPackIndex true &&
+		test_commit 1 &&
+		git repack -a &&
+		git multi-pack-index write &&
+		mv .git/objects/pack/multi-pack-index ../mpi-sha1
+	) &&
+	git init --object-format=sha256 sha256 &&
+	(
+		cd sha256 &&
+		git config core.multiPackIndex true &&
+		test_commit 1 &&
+		git repack -a &&
+		git multi-pack-index write &&
+		mv .git/objects/pack/multi-pack-index ../mpi-sha256
+	) &&
+	(
+		cd sha1 &&
+		mv ../mpi-sha256 .git/objects/pack/multi-pack-index &&
+		git log -1 2>err &&
+		test_i18ngrep "multi-pack-index hash version 2 does not match version 1" err
+	) &&
+	(
+		cd sha256 &&
+		mv ../mpi-sha1 .git/objects/pack/multi-pack-index &&
+		git log -1 2>err &&
+		test_i18ngrep "multi-pack-index hash version 1 does not match version 2" err
+	)
+'
+
+test_expect_success 'midx picks objects from preferred pack' '
+	test_when_finished rm -rf preferred.git &&
+	git init --bare preferred.git &&
+	(
+		cd preferred.git &&
+
+		a=$(echo "a" | git hash-object -w --stdin) &&
+		b=$(echo "b" | git hash-object -w --stdin) &&
+		c=$(echo "c" | git hash-object -w --stdin) &&
+
+		# Set up two packs, duplicating the object "B" at different
+		# offsets.
+		#
+		# Note that the "BC" pack (the one we choose as preferred) sorts
+		# lexically after the "AB" pack, meaning that omitting the
+		# --preferred-pack argument would cause this test to fail (since
+		# the MIDX code would select the copy of "b" in the "AB" pack).
+		git pack-objects objects/pack/test-AB <<-EOF &&
+		$a
+		$b
+		EOF
+		bc=$(git pack-objects objects/pack/test-BC <<-EOF
+		$b
+		$c
+		EOF
+		) &&
+
+		git multi-pack-index --object-dir=objects \
+			write --preferred-pack=test-BC-$bc.idx 2>err &&
+		test_must_be_empty err &&
+
+		test-tool read-midx --show-objects objects >out &&
+
+		ofs=$(git show-index <objects/pack/test-BC-$bc.idx | grep $b |
+			cut -d" " -f1) &&
+		printf "%s %s\tobjects/pack/test-BC-%s.pack\n" \
+			"$b" "$ofs" "$bc" >expect &&
+		grep ^$b out >actual &&
+
+		test_cmp expect actual
+	)
+'
+
 test_expect_success 'verify multi-pack-index success' '
 	git multi-pack-index verify --object-dir=$objdir
 '
 
+test_expect_success 'verify progress off for redirected stderr' '
+	git multi-pack-index verify --object-dir=$objdir 2>err &&
+	test_line_count = 0 err
+'
+
+test_expect_success 'verify force progress on for stderr' '
+	git multi-pack-index verify --object-dir=$objdir --progress 2>err &&
+	test_file_not_empty err
+'
+
+test_expect_success 'verify with the --no-progress option' '
+	git multi-pack-index verify --object-dir=$objdir --no-progress 2>err &&
+	test_line_count = 0 err
+'
+
 # usage: corrupt_midx_and_verify <pos> <data> <objdir> <string>
 corrupt_midx_and_verify() {
 	POS=$1 &&
@@ -195,7 +322,6 @@ test_expect_success 'verify bad signature' '
 		"multi-pack-index signature"
 '
 
-HASH_LEN=20
 NUM_OBJECTS=74
 MIDX_BYTE_VERSION=4
 MIDX_BYTE_OID_VERSION=5
@@ -208,9 +334,9 @@ MIDX_CHUNK_LOOKUP_WIDTH=12
 MIDX_OFFSET_PACKNAMES=$(($MIDX_HEADER_SIZE + \
 			 $MIDX_NUM_CHUNKS * $MIDX_CHUNK_LOOKUP_WIDTH))
 MIDX_BYTE_PACKNAME_ORDER=$(($MIDX_OFFSET_PACKNAMES + 2))
-MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + 652))
+MIDX_OFFSET_OID_FANOUT=$(($MIDX_OFFSET_PACKNAMES + $(test_oid packnameoff)))
 MIDX_OID_FANOUT_WIDTH=4
-MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + 1))
+MIDX_BYTE_OID_FANOUT_ORDER=$((MIDX_OFFSET_OID_FANOUT + 250 * $MIDX_OID_FANOUT_WIDTH + $(test_oid fanoutoff)))
 MIDX_OFFSET_OID_LOOKUP=$(($MIDX_OFFSET_OID_FANOUT + 256 * $MIDX_OID_FANOUT_WIDTH))
 MIDX_BYTE_OID_LOOKUP=$(($MIDX_OFFSET_OID_LOOKUP + 16 * $HASH_LEN))
 MIDX_OFFSET_OBJECT_OFFSETS=$(($MIDX_OFFSET_OID_LOOKUP + $NUM_OBJECTS * $HASH_LEN))
@@ -224,18 +350,18 @@ test_expect_success 'verify bad version' '
 '
 
 test_expect_success 'verify bad OID version' '
-	corrupt_midx_and_verify $MIDX_BYTE_OID_VERSION "\02" $objdir \
+	corrupt_midx_and_verify $MIDX_BYTE_OID_VERSION "\03" $objdir \
 		"hash version"
 '
 
 test_expect_success 'verify truncated chunk count' '
 	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_COUNT "\01" $objdir \
-		"missing required"
+		"final chunk has non-zero id"
 '
 
 test_expect_success 'verify extended chunk count' '
 	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_COUNT "\07" $objdir \
-		"terminating multi-pack-index chunk id appears earlier than expected"
+		"terminating chunk id appears earlier than expected"
 '
 
 test_expect_success 'verify missing required chunk' '
@@ -245,7 +371,7 @@ test_expect_success 'verify missing required chunk' '
 
 test_expect_success 'verify invalid chunk offset' '
 	corrupt_midx_and_verify $MIDX_BYTE_CHUNK_OFFSET "\01" $objdir \
-		"invalid chunk offset (too large)"
+		"improper chunk offset(s)"
 '
 
 test_expect_success 'verify packnames out of order' '
@@ -274,22 +400,90 @@ test_expect_success 'verify incorrect pack-int-id' '
 '
 
 test_expect_success 'verify incorrect offset' '
-	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \
+	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \
 		"incorrect object offset"
 '
 
 test_expect_success 'git-fsck incorrect offset' '
-	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\07" $objdir \
+	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \
 		"incorrect object offset" \
 		"git -c core.multipackindex=true fsck"
 '
 
-test_expect_success 'repack removes multi-pack-index' '
+test_expect_success 'corrupt MIDX is not reused' '
+	corrupt_midx_and_verify $MIDX_BYTE_OFFSET "\377" $objdir \
+		"incorrect object offset" &&
+	git multi-pack-index write 2>err &&
+	test_i18ngrep checksum.mismatch err &&
+	git multi-pack-index verify
+'
+
+test_expect_success 'verify incorrect checksum' '
+	pos=$(($(wc -c <$objdir/pack/multi-pack-index) - 1)) &&
+	corrupt_midx_and_verify $pos "\377" $objdir "incorrect checksum"
+'
+
+test_expect_success 'repack progress off for redirected stderr' '
+	GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir repack 2>err &&
+	test_line_count = 0 err
+'
+
+test_expect_success 'repack force progress on for stderr' '
+	GIT_PROGRESS_DELAY=0 git multi-pack-index --object-dir=$objdir --progress repack 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 &&
+	test_line_count = 0 err
+'
+
+test_expect_success 'repack removes multi-pack-index when deleting packs' '
 	test_path_is_file $objdir/pack/multi-pack-index &&
-	GIT_TEST_MULTI_PACK_INDEX=0 git repack -adf &&
+	# Set GIT_TEST_MULTI_PACK_INDEX to 0 to avoid writing a new
+	# multi-pack-index after repacking, but set "core.multiPackIndex" to
+	# true so that "git repack" can read the existing MIDX.
+	GIT_TEST_MULTI_PACK_INDEX=0 git -c core.multiPackIndex repack -adf &&
 	test_path_is_missing $objdir/pack/multi-pack-index
 '
 
+test_expect_success 'repack preserves multi-pack-index when creating packs' '
+	git init preserve &&
+	test_when_finished "rm -fr preserve" &&
+	(
+		cd preserve &&
+		packdir=.git/objects/pack &&
+		midx=$packdir/multi-pack-index &&
+
+		test_commit 1 &&
+		pack1=$(git pack-objects --all $packdir/pack) &&
+		touch $packdir/pack-$pack1.keep &&
+		test_commit 2 &&
+		pack2=$(git pack-objects --revs $packdir/pack) &&
+		touch $packdir/pack-$pack2.keep &&
+
+		git multi-pack-index write &&
+		cp $midx $midx.bak &&
+
+		cat >pack-input <<-EOF &&
+		HEAD
+		^HEAD~1
+		EOF
+		test_commit 3 &&
+		pack3=$(git pack-objects --revs $packdir/pack <pack-input) &&
+		test_commit 4 &&
+		pack4=$(git pack-objects --revs $packdir/pack <pack-input) &&
+
+		GIT_TEST_MULTI_PACK_INDEX=0 git -c core.multiPackIndex repack -ad &&
+		ls -la $packdir &&
+		test_path_is_file $packdir/pack-$pack1.pack &&
+		test_path_is_file $packdir/pack-$pack2.pack &&
+		test_path_is_missing $packdir/pack-$pack3.pack &&
+		test_path_is_missing $packdir/pack-$pack4.pack &&
+		test_cmp_bin $midx.bak $midx
+	)
+'
+
 compare_results_with_midx "after repack"
 
 test_expect_success 'multi-pack-index and pack-bitmap' '
@@ -342,7 +536,7 @@ test_expect_success 'force some 64-bit offsets with pack-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 2999 "\02" &&
+	corrupt_data $idx64 $(test_oid idxoff) "\02" &&
 	midx64=$(git multi-pack-index --object-dir=objects64 write) &&
 	midx_read_expect 1 63 5 objects64 " large-offsets"
 '
@@ -413,6 +607,30 @@ test_expect_success 'expire does not remove any packs' '
 	)
 '
 
+test_expect_success 'expire progress off for redirected stderr' '
+	(
+		cd dup &&
+		git multi-pack-index expire 2>err &&
+		test_line_count = 0 err
+	)
+'
+
+test_expect_success 'expire force progress on for stderr' '
+	(
+		cd dup &&
+		GIT_PROGRESS_DELAY=0 git multi-pack-index --progress expire 2>err &&
+		test_file_not_empty err
+	)
+'
+
+test_expect_success 'expire with the --no-progress option' '
+	(
+		cd dup &&
+		GIT_PROGRESS_DELAY=0 git multi-pack-index --no-progress expire 2>err &&
+		test_line_count = 0 err
+	)
+'
+
 test_expect_success 'expire removes unreferenced packs' '
 	(
 		cd dup &&
@@ -438,10 +656,10 @@ test_expect_success 'repack with minimum size does not alter existing packs' '
 		cd dup &&
 		rm -rf .git/objects/pack &&
 		mv .git/objects/pack-backup .git/objects/pack &&
-		touch -m -t 201901010000 .git/objects/pack/pack-D* &&
-		touch -m -t 201901010001 .git/objects/pack/pack-C* &&
-		touch -m -t 201901010002 .git/objects/pack/pack-B* &&
-		touch -m -t 201901010003 .git/objects/pack/pack-A* &&
+		test-tool chmtime =-5 .git/objects/pack/pack-D* &&
+		test-tool chmtime =-4 .git/objects/pack/pack-C* &&
+		test-tool chmtime =-3 .git/objects/pack/pack-B* &&
+		test-tool chmtime =-2 .git/objects/pack/pack-A* &&
 		ls .git/objects/pack >expect &&
 		MINSIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | head -n 1) &&
 		git multi-pack-index repack --batch-size=$MINSIZE &&
@@ -450,6 +668,33 @@ test_expect_success 'repack with minimum size does not alter existing packs' '
 	)
 '
 
+test_expect_success 'repack respects repack.packKeptObjects=false' '
+	test_when_finished rm -f dup/.git/objects/pack/*keep &&
+	(
+		cd dup &&
+		ls .git/objects/pack/*idx >idx-list &&
+		test_line_count = 5 idx-list &&
+		ls .git/objects/pack/*.pack | sed "s/\.pack/.keep/" >keep-list &&
+		test_line_count = 5 keep-list &&
+		for keep in $(cat keep-list)
+		do
+			touch $keep || return 1
+		done &&
+		git multi-pack-index repack --batch-size=0 &&
+		ls .git/objects/pack/*idx >idx-list &&
+		test_line_count = 5 idx-list &&
+		test-tool read-midx .git/objects | grep idx >midx-list &&
+		test_line_count = 5 midx-list &&
+		THIRD_SMALLEST_SIZE=$(test-tool path-utils file-size .git/objects/pack/*pack | sort -n | sed -n 3p) &&
+		BATCH_SIZE=$((THIRD_SMALLEST_SIZE + 1)) &&
+		git multi-pack-index repack --batch-size=$BATCH_SIZE &&
+		ls .git/objects/pack/*idx >idx-list &&
+		test_line_count = 5 idx-list &&
+		test-tool read-midx .git/objects | grep idx >midx-list &&
+		test_line_count = 5 midx-list
+	)
+'
+
 test_expect_success 'repack creates a new pack' '
 	(
 		cd dup &&
@@ -520,14 +765,16 @@ test_expect_success 'expire respects .keep files' '
 		PACKA=$(ls .git/objects/pack/a-pack*\.pack | sed s/\.pack\$//) &&
 		touch $PACKA.keep &&
 		git multi-pack-index expire &&
-		ls -S .git/objects/pack/a-pack* | grep $PACKA >a-pack-files &&
-		test_line_count = 3 a-pack-files &&
+		test_path_is_file $PACKA.idx &&
+		test_path_is_file $PACKA.keep &&
+		test_path_is_file $PACKA.pack &&
 		test-tool read-midx .git/objects | grep idx >midx-list &&
 		test_line_count = 2 midx-list
 	)
 '
 
 test_expect_success 'repack --batch-size=0 repacks everything' '
+	cp -r dup dup2 &&
 	(
 		cd dup &&
 		rm .git/objects/pack/*.keep &&
@@ -547,4 +794,52 @@ test_expect_success 'repack --batch-size=0 repacks everything' '
 	)
 '
 
+test_expect_success 'repack --batch-size=<large> repacks everything' '
+	(
+		cd dup2 &&
+		rm .git/objects/pack/*.keep &&
+		ls .git/objects/pack/*idx >idx-list &&
+		test_line_count = 2 idx-list &&
+		git multi-pack-index repack --batch-size=2000000 &&
+		ls .git/objects/pack/*idx >idx-list &&
+		test_line_count = 3 idx-list &&
+		test-tool read-midx .git/objects | grep idx >midx-list &&
+		test_line_count = 3 midx-list &&
+		git multi-pack-index expire &&
+		ls -al .git/objects/pack/*idx >idx-list &&
+		test_line_count = 1 idx-list
+	)
+'
+
+test_expect_success 'load reverse index when missing .idx, .pack' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		git config core.multiPackIndex true &&
+
+		test_commit base &&
+		git repack -ad &&
+		git multi-pack-index write &&
+
+		git rev-parse HEAD >tip &&
+		pack=$(ls .git/objects/pack/pack-*.pack) &&
+		idx=$(ls .git/objects/pack/pack-*.idx) &&
+
+		mv $idx $idx.bak &&
+		git cat-file --batch-check="%(objectsize:disk)" <tip &&
+
+		mv $idx.bak $idx &&
+
+		mv $pack $pack.bak &&
+		git cat-file --batch-check="%(objectsize:disk)" <tip
+	)
+'
+
+test_expect_success 'usage shown without sub-command' '
+	test_expect_code 129 git multi-pack-index 2>err &&
+	! test_i18ngrep "unrecognized subcommand" err
+'
+
 test_done
diff --git a/t/t5319/no-objects.midx b/t/t5319/no-objects.midx
new file mode 100644
index 0000000000..e466b8e086
--- /dev/null
+++ b/t/t5319/no-objects.midx
diff --git a/t/t5321-pack-large-objects.sh b/t/t5321-pack-large-objects.sh
index a75eab87d3..8a56d98a0e 100755
--- a/t/t5321-pack-large-objects.sh
+++ b/t/t5321-pack-large-objects.sh
@@ -10,8 +10,8 @@ test_description='git pack-object with "large" deltas
 . "$TEST_DIRECTORY"/lib-pack.sh
 
 # Two similar-ish objects that we have computed deltas between.
-A=01d7713666f4de822776c7622c10f1b07de280dc
-B=e68fe8129b546b101aee9510c5328e7f21ca1d18
+A=$(test_oid packlib_7_0)
+B=$(test_oid packlib_7_76)
 
 test_expect_success 'setup' '
 	clear_packs &&
diff --git a/t/t5322-pack-objects-sparse.sh b/t/t5322-pack-objects-sparse.sh
index 7124b5581a..61cb907a90 100755
--- a/t/t5322-pack-objects-sparse.sh
+++ b/t/t5322-pack-objects-sparse.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='pack-objects object selection using sparse algorithm'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup repo' '
@@ -18,7 +21,7 @@ test_expect_success 'setup repo' '
 	git commit -m "Initialized trees" &&
 	for i in $(test_seq 1 3)
 	do
-		git checkout -b topic$i master &&
+		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"
 	done &&
@@ -105,14 +108,16 @@ test_expect_success 'non-sparse pack-objects' '
 	test_cmp required_objects.txt nonsparse_required_objects.txt
 '
 
+# --sparse is enabled by default by pack.useSparse
 test_expect_success 'sparse pack-objects' '
+	GIT_TEST_PACK_SPARSE=-1 &&
 	git rev-parse			\
 		topic1			\
 		topic1^{tree}		\
 		topic1:f3		\
 		topic1:f3/f4		\
 		topic1:f3/f4/data.txt | sort >expect_sparse_objects.txt &&
-	git pack-objects --stdout --revs --sparse <packinput.txt >sparse.pack &&
+	git pack-objects --stdout --revs <packinput.txt >sparse.pack &&
 	git index-pack -o sparse.idx sparse.pack &&
 	git show-index <sparse.idx | awk "{print \$2}" >sparse_objects.txt &&
 	test_cmp expect_sparse_objects.txt sparse_objects.txt
diff --git a/t/t5323-pack-redundant.sh b/t/t5323-pack-redundant.sh
index 6b4d1ca353..8dbbcc5e51 100755
--- a/t/t5323-pack-redundant.sh
+++ b/t/t5323-pack-redundant.sh
@@ -6,7 +6,7 @@
 test_description='Test git pack-redundant
 
 In order to test git-pack-redundant, we will create a number of objects and
-packs in the repository `master.git`. The relationship between packs (P1-P8)
+packs in the repository `main.git`. The relationship between packs (P1-P8)
 and objects (T, A-R) is showed in the following chart. Objects of a pack will
 be marked with letter x, while objects of redundant packs will be marked with
 exclamation point, and redundant pack itself will be marked with asterisk.
@@ -25,7 +25,7 @@ exclamation point, and redundant pack itself will be marked with asterisk.
     ALL | x x x x x x x x x x x x x x x x x x x
 
 Another repository `shared.git` has unique objects (X-Z), while other objects
-(marked with letter s) are shared through alt-odb (of `master.git`). The
+(marked with letter s) are shared through alt-odb (of `main.git`). The
 relationship between packs and objects is as follows:
 
 	| T A B C D E F G H I J K L M N O P Q R   X Y Z
@@ -36,9 +36,11 @@ relationship between packs and objects is as follows:
 
 . ./test-lib.sh
 
-master_repo=master.git
+main_repo=main.git
 shared_repo=shared.git
 
+git_pack_redundant='git pack-redundant --i-still-use-this'
+
 # Create commits in <repo> and assign each commit's oid to shell variables
 # given in the arguments (A, B, and C). E.g.:
 #
@@ -69,7 +71,7 @@ create_commits_in () {
 		shift ||
 		return 1
 	done &&
-	git -C "$repo" update-ref refs/heads/master $oid
+	git -C "$repo" update-ref refs/heads/main $oid
 }
 
 # Create pack in <repo> and assign pack id to variable given in the 2nd argument
@@ -107,9 +109,20 @@ format_packfiles () {
 	sort
 }
 
-test_expect_success 'setup master repo' '
-	git init --bare "$master_repo" &&
-	create_commits_in "$master_repo" A B C D E F G H I J K L M N O P Q R
+test_expect_success 'setup main repo' '
+	git init --bare "$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 'main: pack-redundant works with no packfile' '
+	(
+		cd "$main_repo" &&
+		cat >expect <<-EOF &&
+			fatal: Zero packs found!
+			EOF
+		test_must_fail $git_pack_redundant --all >actual 2>&1 &&
+		test_cmp expect actual
+	)
 '
 
 #############################################################################
@@ -118,14 +131,12 @@ test_expect_success 'setup master repo' '
 #         | T A B C D E F G H I J K L M N O P Q R
 #     ----+--------------------------------------
 #     P1  | x x x x x x x                       x
-#     P2  |     x x x x   x x x
-#     P3  |             x     x x x x x
 #     ----+--------------------------------------
-#     ALL | x x x x x x x x x x x x x x         x
+#     ALL | x x x x x x x                       x
 #
 #############################################################################
-test_expect_success 'master: no redundant for pack 1, 2, 3' '
-	create_pack_in "$master_repo" P1 <<-EOF &&
+test_expect_success 'main: pack-redundant works with one packfile' '
+	create_pack_in "$main_repo" P1 <<-EOF &&
 		$T
 		$A
 		$B
@@ -135,7 +146,27 @@ test_expect_success 'master: no redundant for pack 1, 2, 3' '
 		$F
 		$R
 		EOF
-	create_pack_in "$master_repo" P2 <<-EOF &&
+	(
+		cd "$main_repo" &&
+		$git_pack_redundant --all >out &&
+		test_must_be_empty out
+	)
+'
+
+#############################################################################
+# Chart of packs and objects for this test case
+#
+#         | T A B C D E F G H I J K L M N O P Q R
+#     ----+--------------------------------------
+#     P1  | x x x x x x x                       x
+#     P2  |     x x x x   x x x
+#     P3  |             x     x x x x x
+#     ----+--------------------------------------
+#     ALL | x x x x x x x x x x x x x x         x
+#
+#############################################################################
+test_expect_success 'main: no redundant for pack 1, 2, 3' '
+	create_pack_in "$main_repo" P2 <<-EOF &&
 		$B
 		$C
 		$D
@@ -144,7 +175,7 @@ test_expect_success 'master: no redundant for pack 1, 2, 3' '
 		$H
 		$I
 		EOF
-	create_pack_in "$master_repo" P3 <<-EOF &&
+	create_pack_in "$main_repo" P3 <<-EOF &&
 		$F
 		$I
 		$J
@@ -153,8 +184,8 @@ test_expect_success 'master: no redundant for pack 1, 2, 3' '
 		$M
 		EOF
 	(
-		cd "$master_repo" &&
-		git pack-redundant --all >out &&
+		cd "$main_repo" &&
+		$git_pack_redundant --all >out &&
 		test_must_be_empty out
 	)
 '
@@ -173,26 +204,26 @@ test_expect_success 'master: no redundant for pack 1, 2, 3' '
 #     ALL | x x x x x x x x x x x x x x x x x   x
 #
 #############################################################################
-test_expect_success 'master: one of pack-2/pack-3 is redundant' '
-	create_pack_in "$master_repo" P4 <<-EOF &&
+test_expect_success 'main: one of pack-2/pack-3 is redundant' '
+	create_pack_in "$main_repo" P4 <<-EOF &&
 		$J
 		$K
 		$L
 		$M
 		$P
 		EOF
-	create_pack_in "$master_repo" P5 <<-EOF &&
+	create_pack_in "$main_repo" P5 <<-EOF &&
 		$G
 		$H
 		$N
 		$O
 		EOF
 	(
-		cd "$master_repo" &&
+		cd "$main_repo" &&
 		cat >expect <<-EOF &&
 			P3:$P3
 			EOF
-		git pack-redundant --all >out &&
+		$git_pack_redundant --all >out &&
 		format_packfiles <out >actual &&
 		test_cmp expect actual
 	)
@@ -214,24 +245,24 @@ test_expect_success 'master: one of pack-2/pack-3 is redundant' '
 #     ALL | x x x x x x x x x x x x x x x x x x x
 #
 #############################################################################
-test_expect_success 'master: pack 2, 4, and 6 are redundant' '
-	create_pack_in "$master_repo" P6 <<-EOF &&
+test_expect_success 'main: pack 2, 4, and 6 are redundant' '
+	create_pack_in "$main_repo" P6 <<-EOF &&
 		$N
 		$O
 		$Q
 		EOF
-	create_pack_in "$master_repo" P7 <<-EOF &&
+	create_pack_in "$main_repo" P7 <<-EOF &&
 		$P
 		$Q
 		EOF
 	(
-		cd "$master_repo" &&
+		cd "$main_repo" &&
 		cat >expect <<-EOF &&
 			P2:$P2
 			P4:$P4
 			P6:$P6
 			EOF
-		git pack-redundant --all >out &&
+		$git_pack_redundant --all >out &&
 		format_packfiles <out >actual &&
 		test_cmp expect actual
 	)
@@ -254,57 +285,57 @@ test_expect_success 'master: pack 2, 4, and 6 are redundant' '
 #     ALL | x x x x x x x x x x x x x x x x x x x
 #
 #############################################################################
-test_expect_success 'master: pack-8 (subset of pack-1) is also redundant' '
-	create_pack_in "$master_repo" P8 <<-EOF &&
+test_expect_success 'main: pack-8 (subset of pack-1) is also redundant' '
+	create_pack_in "$main_repo" P8 <<-EOF &&
 		$A
 		EOF
 	(
-		cd "$master_repo" &&
+		cd "$main_repo" &&
 		cat >expect <<-EOF &&
 			P2:$P2
 			P4:$P4
 			P6:$P6
 			P8:$P8
 			EOF
-		git pack-redundant --all >out &&
+		$git_pack_redundant --all >out &&
 		format_packfiles <out >actual &&
 		test_cmp expect actual
 	)
 '
 
-test_expect_success 'master: clean loose objects' '
+test_expect_success 'main: clean loose objects' '
 	(
-		cd "$master_repo" &&
+		cd "$main_repo" &&
 		git prune-packed &&
 		find objects -type f | sed -e "/objects\/pack\//d" >out &&
 		test_must_be_empty out
 	)
 '
 
-test_expect_success 'master: remove redundant packs and pass fsck' '
+test_expect_success 'main: remove redundant packs and pass fsck' '
 	(
-		cd "$master_repo" &&
-		git pack-redundant --all | xargs rm &&
+		cd "$main_repo" &&
+		$git_pack_redundant --all | xargs rm &&
 		git fsck &&
-		git pack-redundant --all >out &&
+		$git_pack_redundant --all >out &&
 		test_must_be_empty out
 	)
 '
 
 # The following test cases will execute inside `shared.git`, instead of
-# inside `master.git`.
+# inside `main.git`.
 test_expect_success 'setup shared.git' '
-	git clone --mirror "$master_repo" "$shared_repo" &&
+	git clone --mirror "$main_repo" "$shared_repo" &&
 	(
 		cd "$shared_repo" &&
-		printf "../../$master_repo/objects\n" >objects/info/alternates
+		printf "../../$main_repo/objects\n" >objects/info/alternates
 	)
 '
 
 test_expect_success 'shared: all packs are redundant, but no output without --alt-odb' '
 	(
 		cd "$shared_repo" &&
-		git pack-redundant --all >out &&
+		$git_pack_redundant --all >out &&
 		test_must_be_empty out
 	)
 '
@@ -312,7 +343,7 @@ test_expect_success 'shared: all packs are redundant, but no output without --al
 #############################################################################
 # Chart of packs and objects for this test case
 #
-#     ================ master.git ===============
+#     ================= main.git ================
 #         | T A B C D E F G H I J K L M N O P Q R  <----------+
 #     ----+--------------------------------------             |
 #     P1  | x x x x x x x                       x             |
@@ -343,7 +374,7 @@ test_expect_success 'shared: show redundant packs in stderr for verbose mode' '
 			P5:$P5
 			P7:$P7
 			EOF
-		git pack-redundant --all --verbose >out 2>out.err &&
+		$git_pack_redundant --all --verbose >out 2>out.err &&
 		test_must_be_empty out &&
 		grep "pack$" out.err | format_packfiles >actual &&
 		test_cmp expect actual
@@ -356,9 +387,9 @@ test_expect_success 'shared: remove redundant packs, no packs left' '
 		cat >expect <<-EOF &&
 			fatal: Zero packs found!
 			EOF
-		git pack-redundant --all --alt-odb | xargs rm &&
+		$git_pack_redundant --all --alt-odb | xargs rm &&
 		git fsck &&
-		test_must_fail git pack-redundant --all --alt-odb >actual 2>&1 &&
+		test_must_fail $git_pack_redundant --all --alt-odb >actual 2>&1 &&
 		test_cmp expect actual
 	)
 '
@@ -386,7 +417,7 @@ test_expect_success 'shared: create new objects and packs' '
 test_expect_success 'shared: no redundant without --alt-odb' '
 	(
 		cd "$shared_repo" &&
-		git pack-redundant --all >out &&
+		$git_pack_redundant --all >out &&
 		test_must_be_empty out
 	)
 '
@@ -394,7 +425,7 @@ test_expect_success 'shared: no redundant without --alt-odb' '
 #############################################################################
 # Chart of packs and objects for this test case
 #
-#     ================ master.git ===============
+#     ================= main.git ================
 #         | T A B C D E F G H I J K L M N O P Q R  <----------------+
 #     ----+--------------------------------------                   |
 #     P1  | x x x x x x x                       x                   |
@@ -417,7 +448,7 @@ test_expect_success 'shared: no redundant without --alt-odb' '
 test_expect_success 'shared: one pack is redundant with --alt-odb' '
 	(
 		cd "$shared_repo" &&
-		git pack-redundant --all --alt-odb >out &&
+		$git_pack_redundant --all --alt-odb >out &&
 		format_packfiles <out >actual &&
 		test_line_count = 1 actual
 	)
@@ -426,7 +457,7 @@ test_expect_success 'shared: one pack is redundant with --alt-odb' '
 #############################################################################
 # Chart of packs and objects for this test case
 #
-#     ================ master.git ===============
+#     ================= main.git ================
 #         | T A B C D E F G H I J K L M N O P Q R  <----------------+
 #     ----+--------------------------------------                   |
 #     P1  | x x x x x x x                       x                   |
@@ -454,7 +485,7 @@ test_expect_success 'shared: ignore unique objects and all two packs are redunda
 			Px1:$Px1
 			Px2:$Px2
 			EOF
-		git pack-redundant --all --alt-odb >out <<-EOF &&
+		$git_pack_redundant --all --alt-odb >out <<-EOF &&
 			$X
 			$Y
 			$Z
diff --git a/t/t5324-split-commit-graph.sh b/t/t5324-split-commit-graph.sh
index 115aabd141..587226ed10 100755
--- a/t/t5324-split-commit-graph.sh
+++ b/t/t5324-split-commit-graph.sh
@@ -4,6 +4,7 @@ test_description='split commit graph'
 . ./test-lib.sh
 
 GIT_TEST_COMMIT_GRAPH=0
+GIT_TEST_COMMIT_GRAPH_CHANGED_PATHS=0
 
 test_expect_success 'setup repo' '
 	git init &&
@@ -11,7 +12,16 @@ test_expect_success 'setup repo' '
 	git config gc.writeCommitGraph false &&
 	infodir=".git/objects/info" &&
 	graphdir="$infodir/commit-graphs" &&
-	test_oid_init
+	test_oid_cache <<-EOM
+	shallow sha1:2132
+	shallow sha256:2436
+
+	base sha1:1408
+	base sha256:1528
+
+	oid_version sha1:1
+	oid_version sha256:2
+	EOM
 '
 
 graph_read_expect() {
@@ -21,14 +31,18 @@ graph_read_expect() {
 		NUM_BASE=$2
 	fi
 	cat >expect <<- EOF
-	header: 43475048 1 1 3 $NUM_BASE
+	header: 43475048 1 $(test_oid oid_version) 4 $NUM_BASE
 	num_commits: $1
-	chunks: oid_fanout oid_lookup commit_metadata
+	chunks: oid_fanout oid_lookup commit_metadata generation_data
 	EOF
-	git commit-graph read >output &&
+	test-tool read-graph >output &&
 	test_cmp expect output
 }
 
+test_expect_success POSIXPERM 'tweak umask for modebit tests' '
+	umask 022
+'
+
 test_expect_success 'create commits and write commit-graph' '
 	for i in $(test_seq 3)
 	do
@@ -203,8 +217,14 @@ test_expect_success 'test merge stragety constants' '
 		git config core.commitGraph true &&
 		test_line_count = 2 $graphdir/commit-graph-chain &&
 		test_commit 15 &&
-		git commit-graph write --reachable --split --size-multiple=10 --expire-time=1980-01-01 &&
+		touch $graphdir/to-delete.graph $graphdir/to-keep.graph &&
+		test-tool chmtime =1546362000 $graphdir/to-delete.graph &&
+		test-tool chmtime =1546362001 $graphdir/to-keep.graph &&
+		git commit-graph write --reachable --split --size-multiple=10 \
+			--expire-time="2019-01-01 12:00 -05:00" &&
 		test_line_count = 1 $graphdir/commit-graph-chain &&
+		test_path_is_missing $graphdir/to-delete.graph &&
+		test_path_is_file $graphdir/to-keep.graph &&
 		ls $graphdir/graph-*.graph >graph-files &&
 		test_line_count = 3 graph-files
 	) &&
@@ -248,7 +268,7 @@ test_expect_success 'verify hashes along chain, even in shallow' '
 		cd verify &&
 		git commit-graph verify &&
 		base_file=$graphdir/graph-$(head -n 1 $graphdir/commit-graph-chain).graph &&
-		corrupt_file "$base_file" 1760 "\01" &&
+		corrupt_file "$base_file" $(test_oid shallow) "\01" &&
 		test_must_fail git commit-graph verify --shallow 2>test_err &&
 		grep -v "^+" test_err >err &&
 		test_i18ngrep "incorrect checksum" err
@@ -275,7 +295,7 @@ test_expect_success 'warn on base graph chunk incorrect' '
 		cd base-chunk &&
 		git commit-graph verify &&
 		base_file=$graphdir/graph-$(tail -n 1 $graphdir/commit-graph-chain).graph &&
-		corrupt_file "$base_file" 1376 "\01" &&
+		corrupt_file "$base_file" $(test_oid base) "\01" &&
 		git commit-graph verify --shallow 2>test_err &&
 		grep -v "^+" test_err >err &&
 		test_i18ngrep "commit-graph chain does not match" err
@@ -344,4 +364,274 @@ test_expect_success 'split across alternate where alternate is not split' '
 	test_cmp commit-graph .git/objects/info/commit-graph
 '
 
+test_expect_success '--split=no-merge always writes an incremental' '
+	test_when_finished rm -rf a b &&
+	rm -rf $graphdir $infodir/commit-graph &&
+	git reset --hard commits/2 &&
+	git rev-list HEAD~1 >a &&
+	git rev-list HEAD >b &&
+	git commit-graph write --split --stdin-commits <a &&
+	git commit-graph write --split=no-merge --stdin-commits <b &&
+	test_line_count = 2 $graphdir/commit-graph-chain
+'
+
+test_expect_success '--split=replace replaces the chain' '
+	rm -rf $graphdir $infodir/commit-graph &&
+	git reset --hard commits/3 &&
+	git rev-list -1 HEAD~2 >a &&
+	git rev-list -1 HEAD~1 >b &&
+	git rev-list -1 HEAD >c &&
+	git commit-graph write --split=no-merge --stdin-commits <a &&
+	git commit-graph write --split=no-merge --stdin-commits <b &&
+	git commit-graph write --split=no-merge --stdin-commits <c &&
+	test_line_count = 3 $graphdir/commit-graph-chain &&
+	git commit-graph write --stdin-commits --split=replace <b &&
+	test_path_is_missing $infodir/commit-graph &&
+	test_path_is_file $graphdir/commit-graph-chain &&
+	ls $graphdir/graph-*.graph >graph-files &&
+	test_line_count = 1 graph-files &&
+	verify_chain_files_exist $graphdir &&
+	graph_read_expect 2
+'
+
+test_expect_success ULIMIT_FILE_DESCRIPTORS 'handles file descriptor exhaustion' '
+	git init ulimit &&
+	(
+		cd ulimit &&
+		for i in $(test_seq 64)
+		do
+			test_commit $i &&
+			run_with_limited_open_files test_might_fail git commit-graph write \
+				--split=no-merge --reachable || return 1
+		done
+	)
+'
+
+while read mode modebits
+do
+	test_expect_success POSIXPERM "split commit-graph respects core.sharedrepository $mode" '
+		rm -rf $graphdir $infodir/commit-graph &&
+		git reset --hard commits/1 &&
+		test_config core.sharedrepository "$mode" &&
+		git commit-graph write --split --reachable &&
+		ls $graphdir/graph-*.graph >graph-files &&
+		test_line_count = 1 graph-files &&
+		echo "$modebits" >expect &&
+		test_modebits $graphdir/graph-*.graph >actual &&
+		test_cmp expect actual &&
+		test_modebits $graphdir/commit-graph-chain >actual &&
+		test_cmp expect actual
+	'
+done <<\EOF
+0666 -r--r--r--
+0600 -r--------
+EOF
+
+test_expect_success '--split=replace with partial Bloom data' '
+	rm -rf $graphdir $infodir/commit-graph &&
+	git reset --hard commits/3 &&
+	git rev-list -1 HEAD~2 >a &&
+	git rev-list -1 HEAD~1 >b &&
+	git commit-graph write --split=no-merge --stdin-commits --changed-paths <a &&
+	git commit-graph write --split=no-merge --stdin-commits <b &&
+	git commit-graph write --split=replace --stdin-commits --changed-paths <c &&
+	ls $graphdir/graph-*.graph >graph-files &&
+	test_line_count = 1 graph-files &&
+	verify_chain_files_exist $graphdir
+'
+
+test_expect_success 'prevent regression for duplicate commits across layers' '
+	git init dup &&
+	git -C dup commit --allow-empty -m one &&
+	git -C dup -c core.commitGraph=false commit-graph write --split=no-merge --reachable 2>err &&
+	test_i18ngrep "attempting to write a commit-graph" err &&
+	git -C dup commit-graph write --split=no-merge --reachable &&
+	git -C dup commit --allow-empty -m two &&
+	git -C dup commit-graph write --split=no-merge --reachable &&
+	git -C dup commit --allow-empty -m three &&
+	git -C dup commit-graph write --split --reachable &&
+	git -C dup commit-graph verify
+'
+
+NUM_FIRST_LAYER_COMMITS=64
+NUM_SECOND_LAYER_COMMITS=16
+NUM_THIRD_LAYER_COMMITS=7
+NUM_FOURTH_LAYER_COMMITS=8
+NUM_FIFTH_LAYER_COMMITS=16
+SECOND_LAYER_SEQUENCE_START=$(($NUM_FIRST_LAYER_COMMITS + 1))
+SECOND_LAYER_SEQUENCE_END=$(($SECOND_LAYER_SEQUENCE_START + $NUM_SECOND_LAYER_COMMITS - 1))
+THIRD_LAYER_SEQUENCE_START=$(($SECOND_LAYER_SEQUENCE_END + 1))
+THIRD_LAYER_SEQUENCE_END=$(($THIRD_LAYER_SEQUENCE_START + $NUM_THIRD_LAYER_COMMITS - 1))
+FOURTH_LAYER_SEQUENCE_START=$(($THIRD_LAYER_SEQUENCE_END + 1))
+FOURTH_LAYER_SEQUENCE_END=$(($FOURTH_LAYER_SEQUENCE_START + $NUM_FOURTH_LAYER_COMMITS - 1))
+FIFTH_LAYER_SEQUENCE_START=$(($FOURTH_LAYER_SEQUENCE_END + 1))
+FIFTH_LAYER_SEQUENCE_END=$(($FIFTH_LAYER_SEQUENCE_START + $NUM_FIFTH_LAYER_COMMITS - 1))
+
+# Current split graph chain:
+#
+#     16 commits (No GDAT)
+# ------------------------
+#     64 commits (GDAT)
+#
+test_expect_success 'setup repo for mixed generation commit-graph-chain' '
+	graphdir=".git/objects/info/commit-graphs" &&
+	test_oid_cache <<-EOF &&
+	oid_version sha1:1
+	oid_version sha256:2
+	EOF
+	git init mixed &&
+	(
+		cd mixed &&
+		git config core.commitGraph true &&
+		git config gc.writeCommitGraph false &&
+		for i in $(test_seq $NUM_FIRST_LAYER_COMMITS)
+		do
+			test_commit $i &&
+			git branch commits/$i || return 1
+		done &&
+		git -c commitGraph.generationVersion=2 commit-graph write --reachable --split &&
+		graph_read_expect $NUM_FIRST_LAYER_COMMITS &&
+		test_line_count = 1 $graphdir/commit-graph-chain &&
+		for i in $(test_seq $SECOND_LAYER_SEQUENCE_START $SECOND_LAYER_SEQUENCE_END)
+		do
+			test_commit $i &&
+			git branch commits/$i || return 1
+		done &&
+		git -c commitGraph.generationVersion=1 commit-graph write --reachable --split=no-merge &&
+		test_line_count = 2 $graphdir/commit-graph-chain &&
+		test-tool read-graph >output &&
+		cat >expect <<-EOF &&
+		header: 43475048 1 $(test_oid oid_version) 4 1
+		num_commits: $NUM_SECOND_LAYER_COMMITS
+		chunks: oid_fanout oid_lookup commit_metadata
+		EOF
+		test_cmp expect output &&
+		git commit-graph verify &&
+		cat $graphdir/commit-graph-chain
+	)
+'
+
+# The new layer will be added without generation data chunk as it was not
+# present on the layer underneath it.
+#
+#      7 commits (No GDAT)
+# ------------------------
+#     16 commits (No GDAT)
+# ------------------------
+#     64 commits (GDAT)
+#
+test_expect_success 'do not write generation data chunk if not present on existing tip' '
+	git clone mixed mixed-no-gdat &&
+	(
+		cd mixed-no-gdat &&
+		for i in $(test_seq $THIRD_LAYER_SEQUENCE_START $THIRD_LAYER_SEQUENCE_END)
+		do
+			test_commit $i &&
+			git branch commits/$i || return 1
+		done &&
+		git commit-graph write --reachable --split=no-merge &&
+		test_line_count = 3 $graphdir/commit-graph-chain &&
+		test-tool read-graph >output &&
+		cat >expect <<-EOF &&
+		header: 43475048 1 $(test_oid oid_version) 4 2
+		num_commits: $NUM_THIRD_LAYER_COMMITS
+		chunks: oid_fanout oid_lookup commit_metadata
+		EOF
+		test_cmp expect output &&
+		git commit-graph verify
+	)
+'
+
+# Number of commits in each layer of the split-commit graph before merge:
+#
+#      8 commits (No GDAT)
+# ------------------------
+#      7 commits (No GDAT)
+# ------------------------
+#     16 commits (No GDAT)
+# ------------------------
+#     64 commits (GDAT)
+#
+# The top two layers are merged and do not have generation data chunk as layer below them does
+# not have generation data chunk.
+#
+#     15 commits (No GDAT)
+# ------------------------
+#     16 commits (No GDAT)
+# ------------------------
+#     64 commits (GDAT)
+#
+test_expect_success 'do not write generation data chunk if the topmost remaining layer does not have generation data chunk' '
+	git clone mixed-no-gdat mixed-merge-no-gdat &&
+	(
+		cd mixed-merge-no-gdat &&
+		for i in $(test_seq $FOURTH_LAYER_SEQUENCE_START $FOURTH_LAYER_SEQUENCE_END)
+		do
+			test_commit $i &&
+			git branch commits/$i || return 1
+		done &&
+		git commit-graph write --reachable --split --size-multiple 1 &&
+		test_line_count = 3 $graphdir/commit-graph-chain &&
+		test-tool read-graph >output &&
+		cat >expect <<-EOF &&
+		header: 43475048 1 $(test_oid oid_version) 4 2
+		num_commits: $(($NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS))
+		chunks: oid_fanout oid_lookup commit_metadata
+		EOF
+		test_cmp expect output &&
+		git commit-graph verify
+	)
+'
+
+# Number of commits in each layer of the split-commit graph before merge:
+#
+#     16 commits (No GDAT)
+# ------------------------
+#     15 commits (No GDAT)
+# ------------------------
+#     16 commits (No GDAT)
+# ------------------------
+#     64 commits (GDAT)
+#
+# The top three layers are merged and has generation data chunk as the topmost remaining layer
+# has generation data chunk.
+#
+#     47 commits (GDAT)
+# ------------------------
+#     64 commits (GDAT)
+#
+test_expect_success 'write generation data chunk if topmost remaining layer has generation data chunk' '
+	git clone mixed-merge-no-gdat mixed-merge-gdat &&
+	(
+		cd mixed-merge-gdat &&
+		for i in $(test_seq $FIFTH_LAYER_SEQUENCE_START $FIFTH_LAYER_SEQUENCE_END)
+		do
+			test_commit $i &&
+			git branch commits/$i || return 1
+		done &&
+		git commit-graph write --reachable --split --size-multiple 1 &&
+		test_line_count = 2 $graphdir/commit-graph-chain &&
+		test-tool read-graph >output &&
+		cat >expect <<-EOF &&
+		header: 43475048 1 $(test_oid oid_version) 5 1
+		num_commits: $(($NUM_SECOND_LAYER_COMMITS + $NUM_THIRD_LAYER_COMMITS + $NUM_FOURTH_LAYER_COMMITS + $NUM_FIFTH_LAYER_COMMITS))
+		chunks: oid_fanout oid_lookup commit_metadata generation_data
+		EOF
+		test_cmp expect output
+	)
+'
+
+test_expect_success 'write generation data chunk when commit-graph chain is replaced' '
+	git clone mixed mixed-replace &&
+	(
+		cd mixed-replace &&
+		git commit-graph write --reachable --split=replace &&
+		test_path_is_file $graphdir/commit-graph-chain &&
+		test_line_count = 1 $graphdir/commit-graph-chain &&
+		verify_chain_files_exist $graphdir &&
+		graph_read_expect $(($NUM_FIRST_LAYER_COMMITS + $NUM_SECOND_LAYER_COMMITS)) &&
+		git commit-graph verify
+	)
+'
+
 test_done
diff --git a/t/t5325-reverse-index.sh b/t/t5325-reverse-index.sh
new file mode 100755
index 0000000000..da453f68d6
--- /dev/null
+++ b/t/t5325-reverse-index.sh
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+test_description='on-disk reverse index'
+. ./test-lib.sh
+
+# The below tests want control over the 'pack.writeReverseIndex' setting
+# themselves to assert various combinations of it with other options.
+sane_unset GIT_TEST_WRITE_REV_INDEX
+
+packdir=.git/objects/pack
+
+test_expect_success 'setup' '
+	test_commit base &&
+
+	pack=$(git pack-objects --all $packdir/pack) &&
+	rev=$packdir/pack-$pack.rev &&
+
+	test_path_is_missing $rev
+'
+
+test_index_pack () {
+	rm -f $rev &&
+	conf=$1 &&
+	shift &&
+	# remove the index since Windows won't overwrite an existing file
+	rm $packdir/pack-$pack.idx &&
+	git -c pack.writeReverseIndex=$conf index-pack "$@" \
+		$packdir/pack-$pack.pack
+}
+
+test_expect_success 'index-pack with pack.writeReverseIndex' '
+	test_index_pack "" &&
+	test_path_is_missing $rev &&
+
+	test_index_pack false &&
+	test_path_is_missing $rev &&
+
+	test_index_pack true &&
+	test_path_is_file $rev
+'
+
+test_expect_success 'index-pack with --[no-]rev-index' '
+	for conf in "" true false
+	do
+		test_index_pack "$conf" --rev-index &&
+		test_path_exists $rev &&
+
+		test_index_pack "$conf" --no-rev-index &&
+		test_path_is_missing $rev
+	done
+'
+
+test_expect_success 'index-pack can verify reverse indexes' '
+	test_when_finished "rm -f $rev" &&
+	test_index_pack true &&
+
+	test_path_is_file $rev &&
+	git index-pack --rev-index --verify $packdir/pack-$pack.pack &&
+
+	# Intentionally corrupt the reverse index.
+	chmod u+w $rev &&
+	printf "xxxx" | dd of=$rev bs=1 count=4 conv=notrunc &&
+
+	test_must_fail git index-pack --rev-index --verify \
+		$packdir/pack-$pack.pack 2>err &&
+	grep "validation error" err
+'
+
+test_expect_success 'index-pack infers reverse index name with -o' '
+	git index-pack --rev-index -o other.idx $packdir/pack-$pack.pack &&
+	test_path_is_file other.idx &&
+	test_path_is_file other.rev
+'
+
+test_expect_success 'pack-objects respects pack.writeReverseIndex' '
+	test_when_finished "rm -fr pack-1-*" &&
+
+	git -c pack.writeReverseIndex= pack-objects --all pack-1 &&
+	test_path_is_missing pack-1-*.rev &&
+
+	git -c pack.writeReverseIndex=false pack-objects --all pack-1 &&
+	test_path_is_missing pack-1-*.rev &&
+
+	git -c pack.writeReverseIndex=true pack-objects --all pack-1 &&
+	test_path_is_file pack-1-*.rev
+'
+
+test_expect_success 'reverse index is not generated when available on disk' '
+	test_index_pack true &&
+	test_path_is_file $rev &&
+
+	git rev-parse HEAD >tip &&
+	GIT_TEST_REV_INDEX_DIE_IN_MEMORY=1 git cat-file \
+		--batch-check="%(objectsize:disk)" <tip
+'
+
+test_expect_success 'revindex in-memory vs on-disk' '
+	git init repo &&
+	test_when_finished "rm -fr repo" &&
+	(
+		cd repo &&
+
+		test_commit commit &&
+
+		git rev-list --objects --no-object-names --all >objects &&
+
+		git -c pack.writeReverseIndex=false repack -ad &&
+		test_path_is_missing $packdir/pack-*.rev &&
+		git cat-file --batch-check="%(objectsize:disk) %(objectname)" \
+			<objects >in-core &&
+
+		git -c pack.writeReverseIndex=true repack -ad &&
+		test_path_is_file $packdir/pack-*.rev &&
+		git cat-file --batch-check="%(objectsize:disk) %(objectname)" \
+			<objects >on-disk &&
+
+		test_cmp on-disk in-core
+	)
+'
+test_done
diff --git a/t/t5400-send-pack.sh b/t/t5400-send-pack.sh
index 571d620aed..3f81f16e13 100755
--- a/t/t5400-send-pack.sh
+++ b/t/t5400-send-pack.sh
@@ -6,6 +6,9 @@
 test_description='See why rewinding head breaks send-pack
 
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 cnt=64
@@ -21,14 +24,15 @@ test_expect_success setup '
 	i=0 &&
 	while test $i -le $cnt
 	do
-	    i=$(($i+1)) &&
-	    test_tick &&
-	    echo "Commit #$i" >mozart/is/pink &&
-	    git update-index --add mozart/is/pink &&
-	    tree=$(git write-tree) &&
-	    commit=$(echo "Commit #$i" | git commit-tree $tree -p $parent) &&
-	    git update-ref refs/tags/commit$i $commit &&
-	    parent=$commit || return 1
+		i=$(($i+1)) &&
+		test_tick &&
+		echo "Commit #$i" >mozart/is/pink &&
+		git update-index --add mozart/is/pink &&
+		tree=$(git write-tree) &&
+		commit=$(echo "Commit #$i" |
+			 git commit-tree $tree -p $parent) &&
+		git update-ref refs/tags/commit$i $commit &&
+		parent=$commit || return 1
 	done &&
 	git update-ref HEAD "$commit" &&
 	git clone ./. victim &&
@@ -38,14 +42,14 @@ test_expect_success setup '
 	i=0 &&
 	while test $i -le $cnt
 	do
-	    i=$(($i+1)) &&
-	    test_tick &&
-	    echo "Rebase #$i" >mozart/is/pink &&
-	    git update-index --add mozart/is/pink &&
-	    tree=$(git write-tree) &&
-	    commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) &&
-	    git update-ref refs/tags/rebase$i $commit &&
-	    parent=$commit || return 1
+		i=$(($i+1)) &&
+		test_tick &&
+		echo "Rebase #$i" >mozart/is/pink &&
+		git update-index --add mozart/is/pink &&
+		tree=$(git write-tree) &&
+		commit=$(echo "Rebase #$i" | git commit-tree $tree -p $parent) &&
+		git update-ref refs/tags/rebase$i $commit &&
+		parent=$commit || return 1
 	done &&
 	git update-ref HEAD "$commit" &&
 	echo Rebase &&
@@ -57,40 +61,40 @@ test_expect_success 'pack the source repository' '
 '
 
 test_expect_success 'pack the destination repository' '
-    (
-	cd victim &&
-	git repack -a -d &&
-	git prune
-    )
+	(
+		cd victim &&
+		git repack -a -d &&
+		git prune
+	)
 '
 
 test_expect_success 'refuse pushing rewound head without --force' '
-	pushed_head=$(git rev-parse --verify master) &&
-	victim_orig=$(cd victim && git rev-parse --verify master) &&
-	test_must_fail git send-pack ./victim master &&
-	victim_head=$(cd victim && git rev-parse --verify master) &&
+	pushed_head=$(git rev-parse --verify main) &&
+	victim_orig=$(cd victim && git rev-parse --verify main) &&
+	test_must_fail git send-pack ./victim main &&
+	victim_head=$(cd victim && git rev-parse --verify main) &&
 	test "$victim_head" = "$victim_orig" &&
 	# this should update
-	git send-pack --force ./victim master &&
-	victim_head=$(cd victim && git rev-parse --verify master) &&
+	git send-pack --force ./victim main &&
+	victim_head=$(cd victim && git rev-parse --verify main) &&
 	test "$victim_head" = "$pushed_head"
 '
 
 test_expect_success 'push can be used to delete a ref' '
-	( cd victim && git branch extra master ) &&
-	git send-pack ./victim :extra master &&
+	( cd victim && git branch extra main ) &&
+	git send-pack ./victim :extra main &&
 	( cd victim &&
 	  test_must_fail git rev-parse --verify extra )
 '
 
 test_expect_success 'refuse deleting push with denyDeletes' '
 	(
-	    cd victim &&
-	    test_might_fail git branch -D extra &&
-	    git config receive.denyDeletes true &&
-	    git branch extra master
+		cd victim &&
+		test_might_fail git branch -D extra &&
+		git config receive.denyDeletes true &&
+		git branch extra main
 	) &&
-	test_must_fail git send-pack ./victim :extra master
+	test_must_fail git send-pack ./victim :extra main
 '
 
 test_expect_success 'cannot override denyDeletes with git -c send-pack' '
@@ -98,10 +102,10 @@ test_expect_success 'cannot override denyDeletes with git -c send-pack' '
 		cd victim &&
 		test_might_fail git branch -D extra &&
 		git config receive.denyDeletes true &&
-		git branch extra master
+		git branch extra main
 	) &&
 	test_must_fail git -c receive.denyDeletes=false \
-					send-pack ./victim :extra master
+					send-pack ./victim :extra main
 '
 
 test_expect_success 'override denyDeletes with git -c receive-pack' '
@@ -109,22 +113,22 @@ test_expect_success 'override denyDeletes with git -c receive-pack' '
 		cd victim &&
 		test_might_fail git branch -D extra &&
 		git config receive.denyDeletes true &&
-		git branch extra master
+		git branch extra main
 	) &&
 	git send-pack \
 		--receive-pack="git -c receive.denyDeletes=false receive-pack" \
-		./victim :extra master
+		./victim :extra main
 '
 
 test_expect_success 'denyNonFastforwards trumps --force' '
 	(
-	    cd victim &&
-	    test_might_fail git branch -D extra &&
-	    git config receive.denyNonFastforwards true
+		cd victim &&
+		test_might_fail git branch -D extra &&
+		git config receive.denyNonFastforwards true
 	) &&
-	victim_orig=$(cd victim && git rev-parse --verify master) &&
-	test_must_fail git send-pack --force ./victim master^:master &&
-	victim_head=$(cd victim && git rev-parse --verify master) &&
+	victim_orig=$(cd victim && git rev-parse --verify main) &&
+	test_must_fail git send-pack --force ./victim main^:main &&
+	victim_head=$(cd victim && git rev-parse --verify main) &&
 	test "$victim_orig" = "$victim_head"
 '
 
@@ -143,16 +147,16 @@ test_expect_success 'send-pack --all sends all branches' '
 test_expect_success 'push --all excludes remote-tracking hierarchy' '
 	mkdir parent &&
 	(
-	    cd parent &&
-	    git init && : >file && git add file && git commit -m add
+		cd parent &&
+		git init && : >file && git add file && git commit -m add
 	) &&
 	git clone parent child &&
 	(
-	    cd child && git push --all
+		cd child && git push --all
 	) &&
 	(
-	    cd parent &&
-	    test -z "$(git for-each-ref refs/remotes/origin)"
+		cd parent &&
+		test -z "$(git for-each-ref refs/remotes/origin)"
 	)
 '
 
@@ -160,33 +164,33 @@ test_expect_success 'receive-pack runs auto-gc in remote repo' '
 	rm -rf parent child &&
 	git init parent &&
 	(
-	    # Setup a repo with 2 packs
-	    cd parent &&
-	    echo "Some text" >file.txt &&
-	    git add . &&
-	    git commit -m "Initial commit" &&
-	    git repack -adl &&
-	    echo "Some more text" >>file.txt &&
-	    git commit -a -m "Second commit" &&
-	    git repack
+		# Setup a repo with 2 packs
+		cd parent &&
+		echo "Some text" >file.txt &&
+		git add . &&
+		git commit -m "Initial commit" &&
+		git repack -adl &&
+		echo "Some more text" >>file.txt &&
+		git commit -a -m "Second commit" &&
+		git repack
 	) &&
 	cp -R parent child &&
 	(
-	    # Set the child to auto-pack if more than one pack exists
-	    cd child &&
-	    git config gc.autopacklimit 1 &&
-	    git config gc.autodetach false &&
-	    git branch test_auto_gc &&
-	    # And create a file that follows the temporary object naming
-	    # convention for the auto-gc to remove
-	    : >.git/objects/tmp_test_object &&
-	    test-tool chmtime =-1209601 .git/objects/tmp_test_object
+		# Set the child to auto-pack if more than one pack exists
+		cd child &&
+		git config gc.autopacklimit 1 &&
+		git config gc.autodetach false &&
+		git branch test_auto_gc &&
+		# And create a file that follows the temporary object naming
+		# convention for the auto-gc to remove
+		: >.git/objects/tmp_test_object &&
+		test-tool chmtime =-1209601 .git/objects/tmp_test_object
 	) &&
 	(
-	    cd parent &&
-	    echo "Even more text" >>file.txt &&
-	    git commit -a -m "Third commit" &&
-	    git send-pack ../child HEAD:refs/heads/test_auto_gc
+		cd parent &&
+		echo "Even more text" >>file.txt &&
+		git commit -a -m "Third commit" &&
+		git send-pack ../child HEAD:refs/heads/test_auto_gc
 	) &&
 	test ! -e child/.git/objects/tmp_test_object
 '
@@ -195,63 +199,63 @@ rewound_push_setup() {
 	rm -rf parent child &&
 	mkdir parent &&
 	(
-	    cd parent &&
-	    git init &&
-	    echo one >file && git add file && git commit -m one &&
-	    git config receive.denyCurrentBranch warn &&
-	    echo two >file && git commit -a -m two
+		cd parent &&
+		git init &&
+		echo one >file && git add file && git commit -m one &&
+		git config receive.denyCurrentBranch warn &&
+		echo two >file && git commit -a -m two
 	) &&
 	git clone parent child &&
 	(
-	    cd child && git reset --hard HEAD^
+		cd child && git reset --hard HEAD^
 	)
 }
 
 test_expect_success 'pushing explicit refspecs respects forcing' '
 	rewound_push_setup &&
-	parent_orig=$(cd parent && git rev-parse --verify master) &&
+	parent_orig=$(cd parent && git rev-parse --verify main) &&
 	(
-	    cd child &&
-	    test_must_fail git send-pack ../parent \
-		refs/heads/master:refs/heads/master
+		cd child &&
+		test_must_fail git send-pack ../parent \
+			refs/heads/main:refs/heads/main
 	) &&
-	parent_head=$(cd parent && git rev-parse --verify master) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
 	test "$parent_orig" = "$parent_head" &&
 	(
-	    cd child &&
-	    git send-pack ../parent \
-	        +refs/heads/master:refs/heads/master
+		cd child &&
+		git send-pack ../parent \
+			+refs/heads/main:refs/heads/main
 	) &&
-	parent_head=$(cd parent && git rev-parse --verify master) &&
-	child_head=$(cd child && git rev-parse --verify master) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
+	child_head=$(cd child && git rev-parse --verify main) &&
 	test "$parent_head" = "$child_head"
 '
 
 test_expect_success 'pushing wildcard refspecs respects forcing' '
 	rewound_push_setup &&
-	parent_orig=$(cd parent && git rev-parse --verify master) &&
+	parent_orig=$(cd parent && git rev-parse --verify main) &&
 	(
-	    cd child &&
-	    test_must_fail git send-pack ../parent \
-	        "refs/heads/*:refs/heads/*"
+		cd child &&
+		test_must_fail git send-pack ../parent \
+			"refs/heads/*:refs/heads/*"
 	) &&
-	parent_head=$(cd parent && git rev-parse --verify master) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
 	test "$parent_orig" = "$parent_head" &&
 	(
-	    cd child &&
-	    git send-pack ../parent \
-	        "+refs/heads/*:refs/heads/*"
+		cd child &&
+		git send-pack ../parent \
+			"+refs/heads/*:refs/heads/*"
 	) &&
-	parent_head=$(cd parent && git rev-parse --verify master) &&
-	child_head=$(cd child && git rev-parse --verify master) &&
+	parent_head=$(cd parent && git rev-parse --verify main) &&
+	child_head=$(cd child && git rev-parse --verify main) &&
 	test "$parent_head" = "$child_head"
 '
 
 test_expect_success 'deny pushing to delete current branch' '
 	rewound_push_setup &&
 	(
-	    cd child &&
-	    test_must_fail git send-pack ../parent :refs/heads/master 2>errs
+		cd child &&
+		test_must_fail git send-pack ../parent :refs/heads/main 2>errs
 	)
 '
 
@@ -282,14 +286,14 @@ test_expect_success 'receive-pack de-dupes .have lines' '
 	local=$(git -C fork rev-parse HEAD) &&
 	shared=$(git -C shared rev-parse only-shared) &&
 	cat >expect <<-EOF &&
-	$local refs/heads/master
+	$local refs/heads/main
 	$local refs/remotes/origin/HEAD
-	$local refs/remotes/origin/master
+	$local refs/remotes/origin/main
 	$shared .have
 	EOF
 
-	GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION= \
-	    git push \
+	GIT_TRACE_PACKET=$(pwd)/trace GIT_TEST_PROTOCOL_VERSION=0 \
+	git push \
 		--receive-pack="unset GIT_TRACE_PACKET; git-receive-pack" \
 		fork HEAD:foo &&
 	extract_ref_advertisement <trace >refs &&
diff --git a/t/t5401-update-hooks.sh b/t/t5401-update-hooks.sh
index 956d69f5b1..6012cc8172 100755
--- a/t/t5401-update-hooks.sh
+++ b/t/t5401-update-hooks.sh
@@ -15,11 +15,11 @@ test_expect_success setup '
 	git update-index a &&
 	tree1=$(git write-tree) &&
 	commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
-	git update-ref refs/heads/master $commit0 &&
+	git update-ref refs/heads/main $commit0 &&
 	git update-ref refs/heads/tofail $commit1 &&
 	git clone --bare ./. victim.git &&
 	GIT_DIR=victim.git git update-ref refs/heads/tofail $commit1 &&
-	git update-ref refs/heads/master $commit1 &&
+	git update-ref refs/heads/main $commit1 &&
 	git update-ref refs/heads/tofail $commit0
 '
 
@@ -38,7 +38,7 @@ echo "$@" >>$GIT_DIR/update.args
 read x; printf %s "$x" >$GIT_DIR/update.stdin
 echo STDOUT update $1
 echo STDERR update $1 >&2
-test "$1" = refs/heads/master || exit
+test "$1" = refs/heads/main || exit
 EOF
 chmod u+x victim.git/hooks/update
 
@@ -62,11 +62,11 @@ chmod u+x victim.git/hooks/post-update
 
 test_expect_success push '
 	test_must_fail git send-pack --force ./victim.git \
-		master tofail >send.out 2>send.err
+		main tofail >send.out 2>send.err
 '
 
 test_expect_success 'updated as expected' '
-	test $(GIT_DIR=victim.git git rev-parse master) = $commit1 &&
+	test $(GIT_DIR=victim.git git rev-parse main) = $commit1 &&
 	test $(GIT_DIR=victim.git git rev-parse tofail) = $commit1
 '
 
@@ -82,24 +82,24 @@ test_expect_success 'hooks ran' '
 '
 
 test_expect_success 'pre-receive hook input' '
-	(echo $commit0 $commit1 refs/heads/master &&
+	(echo $commit0 $commit1 refs/heads/main &&
 	 echo $commit1 $commit0 refs/heads/tofail
 	) | test_cmp - victim.git/pre-receive.stdin
 '
 
 test_expect_success 'update hook arguments' '
-	(echo refs/heads/master $commit0 $commit1 &&
+	(echo refs/heads/main $commit0 $commit1 &&
 	 echo refs/heads/tofail $commit1 $commit0
 	) | test_cmp - victim.git/update.args
 '
 
 test_expect_success 'post-receive hook input' '
-	echo $commit0 $commit1 refs/heads/master |
+	echo $commit0 $commit1 refs/heads/main |
 	test_cmp - victim.git/post-receive.stdin
 '
 
 test_expect_success 'post-update hook arguments' '
-	echo refs/heads/master |
+	echo refs/heads/main |
 	test_cmp - victim.git/post-update.args
 '
 
@@ -120,8 +120,8 @@ test_expect_success 'send-pack produced no output' '
 cat <<EOF >expect
 remote: STDOUT pre-receive
 remote: STDERR pre-receive
-remote: STDOUT update refs/heads/master
-remote: STDERR update refs/heads/master
+remote: STDOUT update refs/heads/main
+remote: STDERR update refs/heads/main
 remote: STDOUT update refs/heads/tofail
 remote: STDERR update refs/heads/tofail
 remote: error: hook declined to update refs/heads/tofail
@@ -143,7 +143,7 @@ test_expect_success 'pre-receive hook that forgets to read its input' '
 
 	for v in $(test_seq 100 999)
 	do
-		git branch branch_$v master || return
+		git branch branch_$v main || return
 	done &&
 	git push ./victim.git "+refs/heads/*:refs/heads/*"
 '
diff --git a/t/t5402-post-merge-hook.sh b/t/t5402-post-merge-hook.sh
index 6eb2ffd6ec..3e5e19c719 100755
--- a/t/t5402-post-merge-hook.sh
+++ b/t/t5402-post-merge-hook.sh
@@ -4,6 +4,9 @@
 #
 
 test_description='Test the post-merge hook.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -15,7 +18,7 @@ test_expect_success setup '
 	git update-index a &&
 	tree1=$(git write-tree) &&
 	commit1=$(echo modify | git commit-tree $tree1 -p $commit0) &&
-        git update-ref refs/heads/master $commit0 &&
+	git update-ref refs/heads/main $commit0 &&
 	git clone ./. clone1 &&
 	GIT_DIR=clone1/.git git update-index --add a &&
 	git clone ./. clone2 &&
@@ -23,34 +26,34 @@ test_expect_success setup '
 '
 
 for clone in 1 2; do
-    cat >clone${clone}/.git/hooks/post-merge <<'EOF'
+	cat >clone${clone}/.git/hooks/post-merge <<'EOF'
 #!/bin/sh
 echo $@ >> $GIT_DIR/post-merge.args
 EOF
-    chmod u+x clone${clone}/.git/hooks/post-merge
+	chmod u+x clone${clone}/.git/hooks/post-merge
 done
 
 test_expect_success 'post-merge does not run for up-to-date ' '
-        GIT_DIR=clone1/.git git merge $commit0 &&
+	GIT_DIR=clone1/.git git merge $commit0 &&
 	! test -f clone1/.git/post-merge.args
 '
 
 test_expect_success 'post-merge runs as expected ' '
-        GIT_DIR=clone1/.git git merge $commit1 &&
+	GIT_DIR=clone1/.git git merge $commit1 &&
 	test -e clone1/.git/post-merge.args
 '
 
 test_expect_success 'post-merge from normal merge receives the right argument ' '
-        grep 0 clone1/.git/post-merge.args
+	grep 0 clone1/.git/post-merge.args
 '
 
 test_expect_success 'post-merge from squash merge runs as expected ' '
-        GIT_DIR=clone2/.git git merge --squash $commit1 &&
+	GIT_DIR=clone2/.git git merge --squash $commit1 &&
 	test -e clone2/.git/post-merge.args
 '
 
 test_expect_success 'post-merge from squash merge receives the right argument ' '
-        grep 1 clone2/.git/post-merge.args
+	grep 1 clone2/.git/post-merge.args
 '
 
 test_done
diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index a39b3b5c78..1ec9e23be7 100755
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -4,6 +4,9 @@
 #
 
 test_description='Test the post-checkout hook.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -20,7 +23,7 @@ test_expect_success setup '
 
 test_expect_success 'post-checkout receives the right arguments with HEAD unchanged ' '
 	test_when_finished "rm -f .git/post-checkout.args" &&
-	git checkout master &&
+	git checkout main &&
 	read old new flag <.git/post-checkout.args &&
 	test $old = $new && test $flag = 1
 '
@@ -41,14 +44,14 @@ test_expect_success 'post-checkout receives the right args with HEAD changed ' '
 
 test_expect_success 'post-checkout receives the right args when not switching branches ' '
 	test_when_finished "rm -f .git/post-checkout.args" &&
-	git checkout master -- three.t &&
+	git checkout main -- three.t &&
 	read old new flag <.git/post-checkout.args &&
 	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 master &&
+	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 &&
diff --git a/t/t5404-tracking-branches.sh b/t/t5404-tracking-branches.sh
index 2762f420bc..cc07889667 100755
--- a/t/t5404-tracking-branches.sh
+++ b/t/t5404-tracking-branches.sh
@@ -2,6 +2,9 @@
 
 test_description='tracking branch update checks for git push'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -30,9 +33,9 @@ test_expect_success 'prepare pushable branches' '
 	git checkout -b b2 origin/b2 &&
 	echo aa-b2 >>file &&
 	git commit -a -m aa-b2 &&
-	git checkout master &&
-	echo aa-master >>file &&
-	git commit -a -m aa-master
+	git checkout main &&
+	echo aa-main >>file &&
+	git commit -a -m aa-main
 '
 
 test_expect_success 'mixed-success push returns error' '
@@ -40,7 +43,7 @@ test_expect_success 'mixed-success push returns error' '
 '
 
 test_expect_success 'check tracking branches updated correctly after push' '
-	test "$(git rev-parse origin/master)" = "$(git rev-parse master)"
+	test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
 '
 
 test_expect_success 'check tracking branches not updated for failed refs' '
diff --git a/t/t5405-send-pack-rewind.sh b/t/t5405-send-pack-rewind.sh
index 235fb7686a..11f03239a0 100755
--- a/t/t5405-send-pack-rewind.sh
+++ b/t/t5405-send-pack-rewind.sh
@@ -2,6 +2,9 @@
 
 test_description='forced push to replace commit we do not have'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -13,7 +16,7 @@ test_expect_success setup '
 	mkdir another && (
 		cd another &&
 		git init &&
-		git fetch --update-head-ok .. master:master
+		git fetch --update-head-ok .. main:main
 	) &&
 
 	>file2 && git add file2 && test_tick &&
@@ -25,7 +28,7 @@ test_expect_success 'non forced push should die not segfault' '
 
 	(
 		cd another &&
-		test_must_fail git push .. master:master
+		test_must_fail git push .. main:main
 	)
 
 '
@@ -34,7 +37,7 @@ test_expect_success 'forced push should succeed' '
 
 	(
 		cd another &&
-		git push .. +master:master
+		git push .. +main:main
 	)
 
 '
diff --git a/t/t5406-remote-rejects.sh b/t/t5406-remote-rejects.sh
index ff06f99649..5c509db6fc 100755
--- a/t/t5406-remote-rejects.sh
+++ b/t/t5406-remote-rejects.sh
@@ -5,7 +5,6 @@ test_description='remote push rejects are reported by client'
 . ./test-lib.sh
 
 test_expect_success 'setup' '
-	mkdir .git/hooks &&
 	write_script .git/hooks/update <<-\EOF &&
 	exit 1
 	EOF
diff --git a/t/t5407-post-rewrite-hook.sh b/t/t5407-post-rewrite-hook.sh
index 7344253bfb..6da8d760e2 100755
--- a/t/t5407-post-rewrite-hook.sh
+++ b/t/t5407-post-rewrite-hook.sh
@@ -4,6 +4,9 @@
 #
 
 test_description='Test the post-rewrite hook.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -14,11 +17,9 @@ test_expect_success 'setup' '
 	git checkout A^0 &&
 	test_commit E bar E &&
 	test_commit F foo F &&
-	git checkout master
+	git checkout main
 '
 
-mkdir .git/hooks
-
 cat >.git/hooks/post-rewrite <<EOF
 #!/bin/sh
 echo \$@ > "$TRASH_DIRECTORY"/post-rewrite.args
@@ -53,10 +54,10 @@ test_expect_success 'git commit --amend --no-post-rewrite' '
 	test ! -f post-rewrite.data
 '
 
-test_expect_success 'git rebase' '
+test_expect_success 'git rebase --apply' '
 	git reset --hard D &&
 	clear_hook_input &&
-	test_must_fail git rebase --onto A B &&
+	test_must_fail git rebase --apply --onto A B &&
 	echo C > foo &&
 	git add foo &&
 	git rebase --continue &&
@@ -68,10 +69,10 @@ test_expect_success 'git rebase' '
 	verify_hook_input
 '
 
-test_expect_success 'git rebase --skip' '
+test_expect_success 'git rebase --apply --skip' '
 	git reset --hard D &&
 	clear_hook_input &&
-	test_must_fail git rebase --onto A B &&
+	test_must_fail git rebase --apply --onto A B &&
 	test_must_fail git rebase --skip &&
 	echo D > foo &&
 	git add foo &&
@@ -84,10 +85,10 @@ test_expect_success 'git rebase --skip' '
 	verify_hook_input
 '
 
-test_expect_success 'git rebase --skip the last one' '
+test_expect_success 'git rebase --apply --skip the last one' '
 	git reset --hard F &&
 	clear_hook_input &&
-	test_must_fail git rebase --onto D A &&
+	test_must_fail git rebase --apply --onto D A &&
 	git rebase --skip &&
 	echo rebase >expected.args &&
 	cat >expected.data <<-EOF &&
@@ -128,7 +129,7 @@ test_expect_success 'git rebase -m --skip' '
 	verify_hook_input
 '
 
-test_expect_success 'git rebase with implicit use of interactive backend' '
+test_expect_success 'git rebase with implicit use of merge backend' '
 	git reset --hard D &&
 	clear_hook_input &&
 	test_must_fail git rebase --keep-empty --onto A B &&
@@ -143,7 +144,7 @@ test_expect_success 'git rebase with implicit use of interactive backend' '
 	verify_hook_input
 '
 
-test_expect_success 'git rebase --skip with implicit use of interactive backend' '
+test_expect_success 'git rebase --skip with implicit use of merge backend' '
 	git reset --hard D &&
 	clear_hook_input &&
 	test_must_fail git rebase --keep-empty --onto A B &&
diff --git a/t/t5409-colorize-remote-messages.sh b/t/t5409-colorize-remote-messages.sh
index 2a8c449661..9f1a483f42 100755
--- a/t/t5409-colorize-remote-messages.sh
+++ b/t/t5409-colorize-remote-messages.sh
@@ -5,7 +5,6 @@ test_description='remote messages are colorized on the client'
 . ./test-lib.sh
 
 test_expect_success 'setup' '
-	mkdir .git/hooks &&
 	write_script .git/hooks/update <<-\EOF &&
 	echo error: error
 	echo ERROR: also highlighted
@@ -56,14 +55,13 @@ test_expect_success 'short line' '
 
 test_expect_success 'case-insensitive' '
 	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/case-insensitive 2>output &&
-	cat output &&
 	test_decode_color <output >decoded &&
 	grep "<BOLD;RED>error<RESET>: error" decoded &&
 	grep "<BOLD;RED>ERROR<RESET>: also highlighted" decoded
 '
 
 test_expect_success 'leading space' '
-	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&        cat output &&
+	git --git-dir child/.git -c color.remote=always push -f origin HEAD:refs/heads/leading-space 2>output &&
 	test_decode_color <output >decoded &&
 	grep "  <BOLD;RED>error<RESET>: leading space" decoded
 '
diff --git a/t/t5410-receive-pack-alternates.sh b/t/t5410-receive-pack-alternates.sh
index f00d0da860..0b28e4e452 100755
--- a/t/t5410-receive-pack-alternates.sh
+++ b/t/t5410-receive-pack-alternates.sh
@@ -2,14 +2,17 @@
 
 test_description='git receive-pack with alternate ref filtering'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
 	test_commit base &&
 	git clone -s --bare . fork &&
-	git checkout -b public/branch master &&
+	git checkout -b public/branch main &&
 	test_commit public &&
-	git checkout -b private/branch master &&
+	git checkout -b private/branch main &&
 	test_commit private
 '
 
diff --git a/t/t5411-proc-receive-hook.sh b/t/t5411-proc-receive-hook.sh
new file mode 100755
index 0000000000..98b0e81208
--- /dev/null
+++ b/t/t5411-proc-receive-hook.sh
@@ -0,0 +1,120 @@
+#!/bin/sh
+#
+# Copyright (c) 2020 Jiang Xin
+#
+
+test_description='Test proc-receive hook'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+. "$TEST_DIRECTORY"/t5411/common-functions.sh
+
+setup_upstream_and_workbench () {
+	# Refs of upstream : main(A)
+	# Refs of workbench: main(A)  tags/v123
+	test_expect_success "setup upstream and workbench" '
+		rm -rf upstream.git &&
+		rm -rf workbench &&
+		git init --bare upstream.git &&
+		git init workbench &&
+		create_commits_in workbench A B &&
+		(
+			cd workbench &&
+			# Try to make a stable fixed width for abbreviated commit ID,
+			# this fixed-width oid will be replaced with "<OID>".
+			git config core.abbrev 7 &&
+			git tag -m "v123" v123 $A &&
+			git remote add origin ../upstream.git &&
+			git push origin main &&
+			git update-ref refs/heads/main $A $B &&
+			git -C ../upstream.git update-ref \
+				refs/heads/main $A $B
+		) &&
+		TAG=$(git -C workbench rev-parse v123) &&
+
+		# setup pre-receive hook
+		write_script upstream.git/hooks/pre-receive <<-\EOF &&
+		exec >&2
+		echo "# pre-receive hook"
+		while read old new ref
+		do
+			echo "pre-receive< $old $new $ref"
+		done
+		EOF
+
+		# setup post-receive hook
+		write_script upstream.git/hooks/post-receive <<-\EOF &&
+		exec >&2
+		echo "# post-receive hook"
+		while read old new ref
+		do
+			echo "post-receive< $old $new $ref"
+		done
+		EOF
+
+		upstream=upstream.git
+	'
+}
+
+run_proc_receive_hook_test() {
+	case $1 in
+	http)
+		PROTOCOL="HTTP protocol"
+		URL_PREFIX="http://.*"
+		;;
+	local)
+		PROTOCOL="builtin protocol"
+		URL_PREFIX="\.\."
+		;;
+	esac
+
+	# Include test cases for both file and HTTP protocol
+	for t in  "$TEST_DIRECTORY"/t5411/test-*.sh
+	do
+		. "$t"
+	done
+}
+
+# Initialize the upstream repository and local workbench.
+setup_upstream_and_workbench
+
+# Load test cases that only need to be executed once.
+for t in  "$TEST_DIRECTORY"/t5411/once-*.sh
+do
+	. "$t"
+done
+
+# Initialize the upstream repository and local workbench.
+setup_upstream_and_workbench
+
+# Run test cases for 'proc-receive' hook on local file protocol.
+run_proc_receive_hook_test local
+
+ROOT_PATH="$PWD"
+. "$TEST_DIRECTORY"/lib-gpg.sh
+. "$TEST_DIRECTORY"/lib-httpd.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
+start_httpd
+
+# Re-initialize the upstream repository and local workbench.
+setup_upstream_and_workbench
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "setup for HTTP protocol" '
+	git -C upstream.git config http.receivepack true &&
+	upstream="$HTTPD_DOCUMENT_ROOT_PATH/upstream.git" &&
+	mv upstream.git "$upstream" &&
+	git -C workbench remote set-url origin "$HTTPD_URL/auth-push/smart/upstream.git" &&
+	set_askpass user@host pass@host
+'
+
+setup_askpass_helper
+
+# Run test cases for 'proc-receive' hook on HTTP protocol.
+run_proc_receive_hook_test http
+
+test_done
diff --git a/t/t5411/common-functions.sh b/t/t5411/common-functions.sh
new file mode 100644
index 0000000000..3c747782c1
--- /dev/null
+++ b/t/t5411/common-functions.sh
@@ -0,0 +1,73 @@
+# Create commits in <repo> and assign each commit's oid to shell variables
+# given in the arguments (A, B, and C). E.g.:
+#
+#     create_commits_in <repo> A B C
+#
+# NOTE: Never calling this function from a subshell since variable
+# assignments will disappear when subshell exits.
+create_commits_in () {
+	repo="$1" && test -d "$repo" ||
+	error "Repository $repo does not exist."
+	shift &&
+	while test $# -gt 0
+	do
+		name=$1 &&
+		shift &&
+		test_commit -C "$repo" --no-tag "$name" &&
+		eval $name=$(git -C "$repo" rev-parse HEAD)
+	done
+}
+
+get_abbrev_oid () {
+	oid=$1 &&
+	suffix=${oid#???????} &&
+	oid=${oid%$suffix} &&
+	if test -n "$oid"
+	then
+		echo "$oid"
+	else
+		echo "undefined-oid"
+	fi
+}
+
+# Format the output of git-push, git-show-ref and other commands to make a
+# user-friendly and stable text.  We can easily prepare the expect text
+# without having to worry about changes of the commit ID (full or abbrev.)
+# of the output.  Single quotes are replaced with double quotes, because
+# it is boring to prepare unquoted single quotes in expect text.  We also
+# remove some locale error messages. The emitted human-readable errors are
+# redundant to the more machine-readable output the tests already assert.
+make_user_friendly_and_stable_output () {
+	sed \
+		-e "s/'/\"/g" \
+		-e "s/$(get_abbrev_oid $A)[0-9a-f]*/<COMMIT-A>/g" \
+		-e "s/$(get_abbrev_oid $B)[0-9a-f]*/<COMMIT-B>/g" \
+		-e "s/$(get_abbrev_oid $TAG)[0-9a-f]*/<TAG-v123>/g" \
+		-e "s/$ZERO_OID/<ZERO-OID>/g" \
+		-e "s#To $URL_PREFIX/upstream.git#To <URL/of/upstream.git>#" \
+		-e "/^error: / d"
+}
+
+filter_out_user_friendly_and_stable_output () {
+	make_user_friendly_and_stable_output |
+		sed -n ${1+"$@"}
+}
+
+format_and_save_expect () {
+	sed -e 's/^> //' -e 's/Z$//' >expect
+}
+
+test_cmp_refs () {
+	indir=
+	if test "$1" = "-C"
+	then
+		shift
+		indir="$1"
+		shift
+	fi
+	indir=${indir:+"$indir"/}
+	cat >show-ref.expect &&
+	git ${indir:+ -C "$indir"} show-ref >show-ref.pristine &&
+	make_user_friendly_and_stable_output <show-ref.pristine >show-ref.filtered &&
+	test_cmp show-ref.expect show-ref.filtered
+}
diff --git a/t/t5411/once-0010-report-status-v1.sh b/t/t5411/once-0010-report-status-v1.sh
new file mode 100644
index 0000000000..297b10925d
--- /dev/null
+++ b/t/t5411/once-0010-report-status-v1.sh
@@ -0,0 +1,91 @@
+test_expect_success "setup receive.procReceiveRefs" '
+	git -C "$upstream" config --add receive.procReceiveRefs refs/for
+'
+
+test_expect_success "setup proc-receive hook" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic1" \
+		-r "option fall-through" \
+		-r "ok refs/for/main/topic2" \
+		-r "option refname refs/for/changes/23/123/1" \
+		-r "option new-oid $A" \
+		-r "ok refs/for/main/topic2" \
+		-r "option refname refs/for/changes/24/124/2" \
+		-r "option old-oid $B" \
+		-r "option new-oid $A" \
+		-r "option forced-update" \
+		-r "ng refs/for/next/topic target branch not exist"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         : (B)                   refs/for/main/topic1(A)  foo(A)  refs/for/next/topic(A)  refs/for/main/topic2(A)
+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_raw
+		else
+			printf "%s %s refs/heads/main\0report-status object-format=$GIT_DEFAULT_HASH\n" \
+				$A $B | packetize_raw
+		fi &&
+		printf "%s %s refs/for/main/topic1\n" \
+			$ZERO_OID $A | packetize &&
+		printf "%s %s refs/heads/foo\n" \
+			$ZERO_OID $A | packetize &&
+		printf "%s %s refs/for/next/topic\n" \
+			$ZERO_OID $A | packetize &&
+		printf "%s %s refs/for/main/topic2\n" \
+			$ZERO_OID $A | packetize &&
+		printf 0000 &&
+		printf "" | git -C "$upstream" pack-objects --stdout
+	} | git receive-pack "$upstream" --stateless-rpc \
+	>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	cat >expect <<-EOF &&
+	# pre-receive hook
+	pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+	pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
+	pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
+	pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
+	pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
+	# proc-receive hook
+	proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
+	proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic
+	proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic2
+	proc-receive> ok refs/for/main/topic1
+	proc-receive> option fall-through
+	proc-receive> ok refs/for/main/topic2
+	proc-receive> option refname refs/for/changes/23/123/1
+	proc-receive> option new-oid <COMMIT-A>
+	proc-receive> ok refs/for/main/topic2
+	proc-receive> option refname refs/for/changes/24/124/2
+	proc-receive> option old-oid <COMMIT-B>
+	proc-receive> option new-oid <COMMIT-A>
+	proc-receive> option forced-update
+	proc-receive> ng refs/for/next/topic target branch not exist
+	000eunpack ok
+	0017ok refs/heads/main
+	001cok refs/for/main/topic1
+	0016ok refs/heads/foo
+	0033ng refs/for/next/topic target branch not exist
+	001cok refs/for/main/topic2
+	0000# post-receive hook
+	post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main
+	post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic1
+	post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo
+	post-receive< <ZERO-OID> <COMMIT-A> refs/for/changes/23/123/1
+	post-receive< <COMMIT-B> <COMMIT-A> refs/for/changes/24/124/2
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/for/main/topic1
+	<COMMIT-A> refs/heads/foo
+	<COMMIT-B> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0000-standard-git-push.sh b/t/t5411/test-0000-standard-git-push.sh
new file mode 100644
index 0000000000..ce64bb660b
--- /dev/null
+++ b/t/t5411/test-0000-standard-git-push.sh
@@ -0,0 +1,134 @@
+# Refs of upstream : main(A)  
+# Refs of workbench: main(A)  tags/v123
+# git-push         : main(B)             next(A)
+test_expect_success "git-push ($PROTOCOL)" '
+	git -C workbench push origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/next \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> main
+	>  * [new branch]      HEAD -> next
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(B)  next(A)
+# Refs of workbench: main(A)           tags/v123
+# git-push --atomic: main(A)  next(B)
+test_expect_success "git-push --atomic ($PROTOCOL)" '
+	test_must_fail git -C workbench push --atomic origin \
+		main \
+		$B:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> To <URL/of/upstream.git>
+	>  ! [rejected]        main -> main (non-fast-forward)
+	>  ! [rejected]        <COMMIT-B> -> next (atomic push failed)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(B)  next(A)
+# Refs of workbench: main(A)           tags/v123
+# git-push         : main(A)  next(B)
+test_expect_success "non-fast-forward git-push ($PROTOCOL)" '
+	test_must_fail git \
+		-C workbench \
+		-c advice.pushUpdateRejected=false \
+		push origin \
+		main \
+		$B:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> next
+	>  ! [rejected]        main -> main (non-fast-forward)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-B> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(B)  next(B)
+# Refs of workbench: main(A)           tags/v123
+# git-push -f      : main(A)  NULL     tags/v123  refs/review/main/topic(A)  a/b/c(A)
+test_expect_success "git-push -f ($PROTOCOL)" '
+	git -C workbench push -f origin \
+		refs/tags/v123 \
+		:refs/heads/next \
+		main \
+		main:refs/review/main/topic \
+		HEAD:refs/heads/a/b/c \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
+	> To <URL/of/upstream.git>
+	>  + <COMMIT-B>...<COMMIT-A> main -> main (forced update)
+	>  - [deleted]         next
+	>  * [new tag]         v123 -> v123
+	>  * [new reference]   main -> refs/review/main/topic
+	>  * [new branch]      HEAD -> a/b/c
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/a/b/c
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/review/main/topic
+	<TAG-v123> refs/tags/v123
+	EOF
+'
+
+# Refs of upstream : main(A)  tags/v123  refs/review/main/topic(A)  a/b/c(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+	(
+		cd "$upstream" &&
+		git update-ref -d refs/review/main/topic &&
+		git update-ref -d refs/tags/v123 &&
+		git update-ref -d refs/heads/a/b/c
+	)
+'
diff --git a/t/t5411/test-0001-standard-git-push--porcelain.sh b/t/t5411/test-0001-standard-git-push--porcelain.sh
new file mode 100644
index 0000000000..373ec3d865
--- /dev/null
+++ b/t/t5411/test-0001-standard-git-push--porcelain.sh
@@ -0,0 +1,138 @@
+# Refs of upstream : main(A)  
+# Refs of workbench: main(A)  tags/v123
+# git-push         : main(B)             next(A)
+test_expect_success "git-push ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/next \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>  	<COMMIT-B>:refs/heads/main	<COMMIT-A>..<COMMIT-B>
+	> *	HEAD:refs/heads/next	[new branch]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(B)  next(A)
+# Refs of workbench: main(A)           tags/v123
+# git-push --atomic: main(A)  next(B)
+test_expect_success "git-push --atomic ($PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --atomic --porcelain origin \
+		main \
+		$B:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "s/^# GETTEXT POISON #//" \
+		-e "/^To / { p; }" \
+		-e "/^!/ { p; }" \
+		<out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> To <URL/of/upstream.git>
+	> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
+	> !	<COMMIT-B>:refs/heads/next	[rejected] (atomic push failed)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(B)  next(A)
+# Refs of workbench: main(A)           tags/v123
+# git-push         : main(A)  next(B)
+test_expect_success "non-fast-forward git-push ($PROTOCOL/porcelain)" '
+	test_must_fail git \
+		-C workbench \
+		-c advice.pushUpdateRejected=false \
+		push --porcelain origin \
+		main \
+		$B:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>  	<COMMIT-B>:refs/heads/next	<COMMIT-A>..<COMMIT-B>
+	> !	refs/heads/main:refs/heads/main	[rejected] (non-fast-forward)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	<COMMIT-B> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(B)  next(B)
+# Refs of workbench: main(A)           tags/v123
+# git-push -f      : main(A)  NULL     tags/v123  refs/review/main/topic(A)  a/b/c(A)
+test_expect_success "git-push -f ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain -f origin \
+		refs/tags/v123 \
+		:refs/heads/next \
+		main \
+		main:refs/review/main/topic \
+		HEAD:refs/heads/a/b/c \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: pre-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: post-receive< <COMMIT-B> <ZERO-OID> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/review/main/topic        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/a/b/c        Z
+	> To <URL/of/upstream.git>
+	> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
+	> -	:refs/heads/next	[deleted]
+	> *	refs/tags/v123:refs/tags/v123	[new tag]
+	> *	refs/heads/main:refs/review/main/topic	[new reference]
+	> *	HEAD:refs/heads/a/b/c	[new branch]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/a/b/c
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/review/main/topic
+	<TAG-v123> refs/tags/v123
+	EOF
+'
+
+# Refs of upstream : main(A)  tags/v123  refs/review/main/topic(A)  a/b/c(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+	(
+		cd "$upstream" &&
+		git update-ref -d refs/review/main/topic &&
+		git update-ref -d refs/tags/v123 &&
+		git update-ref -d refs/heads/a/b/c
+	)
+'
diff --git a/t/t5411/test-0002-pre-receive-declined.sh b/t/t5411/test-0002-pre-receive-declined.sh
new file mode 100644
index 0000000000..0c3490c9b1
--- /dev/null
+++ b/t/t5411/test-0002-pre-receive-declined.sh
@@ -0,0 +1,31 @@
+test_expect_success "setup pre-receive hook ($PROTOCOL)" '
+	mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
+	write_script "$upstream/hooks/pre-receive" <<-EOF
+	exit 1
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git-push         : main(B)             next(A)
+test_expect_success "git-push is declined ($PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] <COMMIT-B> -> main (pre-receive hook declined)
+	 ! [remote rejected] HEAD -> next (pre-receive hook declined)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "cleanup ($PROTOCOL)" '
+	mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive"
+'
diff --git a/t/t5411/test-0003-pre-receive-declined--porcelain.sh b/t/t5411/test-0003-pre-receive-declined--porcelain.sh
new file mode 100644
index 0000000000..2393b04ad9
--- /dev/null
+++ b/t/t5411/test-0003-pre-receive-declined--porcelain.sh
@@ -0,0 +1,32 @@
+test_expect_success "setup pre-receive hook ($PROTOCOL/porcelain)" '
+	mv "$upstream/hooks/pre-receive" "$upstream/hooks/pre-receive.ok" &&
+	write_script "$upstream/hooks/pre-receive" <<-EOF
+	exit 1
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git-push         : main(B)             next(A)
+test_expect_success "git-push is declined ($PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/next \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> To <URL/of/upstream.git>
+	> !	<COMMIT-B>:refs/heads/main	[remote rejected] (pre-receive hook declined)
+	> !	HEAD:refs/heads/next	[remote rejected] (pre-receive hook declined)
+	Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+	mv "$upstream/hooks/pre-receive.ok" "$upstream/hooks/pre-receive"
+'
diff --git a/t/t5411/test-0010-proc-receive-settings.sh b/t/t5411/test-0010-proc-receive-settings.sh
new file mode 100644
index 0000000000..a36809927b
--- /dev/null
+++ b/t/t5411/test-0010-proc-receive-settings.sh
@@ -0,0 +1,7 @@
+test_expect_success "add two receive.procReceiveRefs settings" '
+	(
+		cd "$upstream" &&
+		git config --add receive.procReceiveRefs refs/for &&
+		git config --add receive.procReceiveRefs refs/review/
+	)
+'
diff --git a/t/t5411/test-0011-no-hook-error.sh b/t/t5411/test-0011-no-hook-error.sh
new file mode 100644
index 0000000000..d35002b1f0
--- /dev/null
+++ b/t/t5411/test-0011-no-hook-error.sh
@@ -0,0 +1,60 @@
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       next(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:next \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: error: cannot find hook "proc-receive"        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>  * [new branch]      HEAD -> next
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(A)             next(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+	git -C "$upstream" update-ref -d refs/heads/next
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push --atomic: (B)                   next(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL)" '
+	test_must_fail git -C workbench push --atomic origin \
+		$B:main \
+		HEAD:next \
+		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: error: cannot find hook "proc-receive"        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] <COMMIT-B> -> main (fail to run proc-receive hook)
+	>  ! [remote rejected] HEAD -> next (fail to run proc-receive hook)
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0012-no-hook-error--porcelain.sh b/t/t5411/test-0012-no-hook-error--porcelain.sh
new file mode 100644
index 0000000000..04468b5018
--- /dev/null
+++ b/t/t5411/test-0012-no-hook-error--porcelain.sh
@@ -0,0 +1,62 @@
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       next(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: no hook, fail to push special ref ($PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:next \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: error: cannot find hook "proc-receive"        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/heads/next	[new branch]
+	> !	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(A)             next(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+	git -C "$upstream" update-ref -d refs/heads/next
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push --atomic: (B)                   next(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: no hook, all failed for atomic push ($PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain --atomic origin \
+		$B:main \
+		HEAD:next \
+		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: error: cannot find hook "proc-receive"        Z
+	> To <URL/of/upstream.git>
+	> !	<COMMIT-B>:refs/heads/main	[remote rejected] (fail to run proc-receive hook)
+	> !	HEAD:refs/heads/next	[remote rejected] (fail to run proc-receive hook)
+	> !	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0013-bad-protocol.sh b/t/t5411/test-0013-bad-protocol.sh
new file mode 100644
index 0000000000..c08a00ded2
--- /dev/null
+++ b/t/t5411/test-0013-bad-protocol.sh
@@ -0,0 +1,302 @@
+test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --version 2
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+
+	# Check status report for git-push
+	sed -n \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<actual >actual-report &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual-report &&
+
+	# Check error message from "receive-pack", but ignore unstable fatal error
+	# message ("remote: fatal: the remote end hung up unexpectedly") which
+	# is different from the remote HTTP server with different locale settings.
+	grep "^remote: error:" <actual >actual-error &&
+	format_and_save_expect <<-EOF &&
+	> remote: error: proc-receive version "2" is not supported        Z
+	EOF
+	test_cmp expect actual-error &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-version
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
+	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-write-version
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-write-version option" out-$test_count &&
+	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-commands
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-commands option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-push-options
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $PROTOCOL)" '
+	git -C "$upstream" config receive.advertisePushOptions true &&
+	test_must_fail git -C workbench push origin \
+		-o reviewers=user1,user2 \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-push-options option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-write-report
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; }" \
+		-e "/^ ! / { p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	 ! [remote rejected] HEAD -> refs/for/main/topic (fail to run proc-receive hook)
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-write-report option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (no report, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       next(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	>  * [new branch]      HEAD -> next
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(A)             next(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+	git -C "$upstream" update-ref -d refs/heads/next
+
+'
+
+test_expect_success "setup proc-receive hook (no ref, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic
+test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic\
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok        Z
+	> remote: error: proc-receive reported incomplete status line: "ok"        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "xx refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic
+test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+			HEAD:refs/for/main/topic \
+			>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> xx refs/for/main/topic        Z
+	> remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic"        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0014-bad-protocol--porcelain.sh b/t/t5411/test-0014-bad-protocol--porcelain.sh
new file mode 100644
index 0000000000..3eaa597e0f
--- /dev/null
+++ b/t/t5411/test-0014-bad-protocol--porcelain.sh
@@ -0,0 +1,304 @@
+test_expect_success "setup proc-receive hook (unknown version, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --version 2
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (unknown version, $PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+
+	# Check status report for git-push
+	sed -n \
+		-e "/^To / { p; n; p; n; p; }" \
+		<actual >actual-report &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual-report &&
+
+	# Check error message from "receive-pack", but ignore unstable fatal error
+	# message ("remote: fatal: the remote end hung up unexpectedly") which
+	# is different from the remote HTTP server with different locale settings.
+	grep "^remote: error:" <actual >actual-error &&
+	format_and_save_expect <<-EOF &&
+	> remote: error: proc-receive version "2" is not supported        Z
+	EOF
+	test_cmp expect actual-error &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-version, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-version
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-version, $PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; n; p; n; p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-version option" out-$test_count &&
+	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-write-version, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-write-version
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-write-version, $PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; n; p; n; p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-write-version option" out-$test_count &&
+	grep "remote: error: fail to negotiate version with proc-receive hook" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-commands, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-commands
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-commands, $PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; n; p; n; p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-commands option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-read-push-options, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-read-push-options
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-read-push-options, $PROTOCOL/porcelain)" '
+	git -C "$upstream" config receive.advertisePushOptions true &&
+	test_must_fail git -C workbench push --porcelain origin \
+		-o reviewers=user1,user2 \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; n; p; n; p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-read-push-options option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (hook --die-write-report, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v --die-write-report
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (hook --die-write-report, $PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	filter_out_user_friendly_and_stable_output \
+		-e "/^To / { p; n; p; n; p; }" \
+		<out-$test_count >actual &&
+	cat >expect <<-EOF &&
+	To <URL/of/upstream.git>
+	!	HEAD:refs/for/main/topic	[remote rejected] (fail to run proc-receive hook)
+	Done
+	EOF
+	test_cmp expect actual &&
+	grep "remote: fatal: die with the --die-write-report option" out-$test_count &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (no report, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       next(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: bad protocol (no report, $PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic >out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/heads/next	[new branch]
+	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(A)             next(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+	git -C "$upstream" update-ref -d refs/heads/next
+'
+
+test_expect_success "setup proc-receive hook (no ref, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic
+test_expect_success "proc-receive: bad protocol (no ref, $PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic\
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok        Z
+	> remote: error: proc-receive reported incomplete status line: "ok"        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (unknown status, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "xx refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic
+test_expect_success "proc-receive: bad protocol (unknown status, $PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+			HEAD:refs/for/main/topic \
+			>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> xx refs/for/main/topic        Z
+	> remote: error: proc-receive reported bad status "xx" on ref "refs/for/main/topic"        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0020-report-ng.sh b/t/t5411/test-0020-report-ng.sh
new file mode 100644
index 0000000000..e915dbc28d
--- /dev/null
+++ b/t/t5411/test-0020-report-ng.sh
@@ -0,0 +1,63 @@
+test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ng refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic
+test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ng refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (failed)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (ng message, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ng refs/for/main/topic error msg"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic
+test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ng refs/for/main/topic error msg        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (error msg)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0021-report-ng--porcelain.sh b/t/t5411/test-0021-report-ng--porcelain.sh
new file mode 100644
index 0000000000..2a392e099b
--- /dev/null
+++ b/t/t5411/test-0021-report-ng--porcelain.sh
@@ -0,0 +1,65 @@
+test_expect_success "setup proc-receive hook (ng, no message, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ng refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic
+test_expect_success "proc-receive: fail to update (ng, no message, $PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ng refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (failed)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (ng message, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ng refs/for/main/topic error msg"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic
+test_expect_success "proc-receive: fail to update (ng, with message, $PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ng refs/for/main/topic error msg        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (error msg)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0022-report-unexpect-ref.sh b/t/t5411/test-0022-report-unexpect-ref.sh
new file mode 100644
index 0000000000..f7a494bdb9
--- /dev/null
+++ b/t/t5411/test-0022-report-unexpect-ref.sh
@@ -0,0 +1,43 @@
+test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         : (B)                   refs/for/main/topic
+test_expect_success "proc-receive: report unexpected ref ($PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		$B:refs/heads/main \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: error: proc-receive reported status on unexpected ref: refs/heads/main        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> main
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	EOF
+'
+
+# Refs of upstream : main(B)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+	git -C "$upstream" update-ref refs/heads/main $A
+'
diff --git a/t/t5411/test-0023-report-unexpect-ref--porcelain.sh b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
new file mode 100644
index 0000000000..63c479e975
--- /dev/null
+++ b/t/t5411/test-0023-report-unexpect-ref--porcelain.sh
@@ -0,0 +1,44 @@
+test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         : (B)                   refs/for/main/topic
+test_expect_success "proc-receive: report unexpected ref ($PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		$B:refs/heads/main \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: error: proc-receive reported status on unexpected ref: refs/heads/main        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> To <URL/of/upstream.git>
+	>  	<COMMIT-B>:refs/heads/main	<COMMIT-A>..<COMMIT-B>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/main
+	EOF
+'
+
+# Refs of upstream : main(B)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+	git -C "$upstream" update-ref refs/heads/main $A
+'
diff --git a/t/t5411/test-0024-report-unknown-ref.sh b/t/t5411/test-0024-report-unknown-ref.sh
new file mode 100644
index 0000000000..af055aa086
--- /dev/null
+++ b/t/t5411/test-0024-report-unknown-ref.sh
@@ -0,0 +1,32 @@
+test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/a/b/c/my/topic
+test_expect_success "proc-receive: report unknown reference ($PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/a/b/c/my/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: error: proc-receive reported status on unknown ref: refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/a/b/c/my/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0025-report-unknown-ref--porcelain.sh b/t/t5411/test-0025-report-unknown-ref--porcelain.sh
new file mode 100644
index 0000000000..99601ca321
--- /dev/null
+++ b/t/t5411/test-0025-report-unknown-ref--porcelain.sh
@@ -0,0 +1,33 @@
+test_expect_success "setup proc-receive hook (unexpected ref, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/a/b/c/my/topic
+test_expect_success "proc-receive: report unknown reference ($PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/a/b/c/my/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/my/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: error: proc-receive reported status on unknown ref: refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/a/b/c/my/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0026-push-options.sh b/t/t5411/test-0026-push-options.sh
new file mode 100644
index 0000000000..fec5f95793
--- /dev/null
+++ b/t/t5411/test-0026-push-options.sh
@@ -0,0 +1,133 @@
+test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL)" '
+	git -C "$upstream" config receive.advertisePushOptions false &&
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push -o ...  :                       refs/for/main/topic
+test_expect_success "proc-receive: not support push options ($PROTOCOL)" '
+	test_must_fail git -C workbench push \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	test_i18ngrep "fatal: the receiving end does not support push options" \
+		actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "enable push options ($PROTOCOL)" '
+	git -C "$upstream" config receive.advertisePushOptions true
+'
+
+test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		--version 0 \
+		-r "ok refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push -o ...  :                       next(A)  refs/for/main/topic
+test_expect_success "proc-receive: ignore push-options for version 0 ($PROTOCOL)" '
+	git -C workbench push \
+		--atomic \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  * [new branch]      HEAD -> next
+	>  * [new reference]   HEAD -> refs/for/main/topic
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+test_expect_success "restore proc-receive hook ($PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)             next(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+	git -C "$upstream" update-ref -d refs/heads/next
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push -o ...  :                       next(A)  refs/for/main/topic
+test_expect_success "proc-receive: push with options ($PROTOCOL)" '
+	git -C workbench push \
+		--atomic \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive: atomic push_options        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< issue=123        Z
+	> remote: proc-receive< reviewer=user1        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  * [new branch]      HEAD -> next
+	>  * [new reference]   HEAD -> refs/for/main/topic
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(A)             next(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+	git -C "$upstream" update-ref -d refs/heads/next
+'
diff --git a/t/t5411/test-0027-push-options--porcelain.sh b/t/t5411/test-0027-push-options--porcelain.sh
new file mode 100644
index 0000000000..8fb75a8789
--- /dev/null
+++ b/t/t5411/test-0027-push-options--porcelain.sh
@@ -0,0 +1,138 @@
+test_expect_success "setup proc-receive hook and disable push-options ($PROTOCOL/porcelain)" '
+	git -C "$upstream" config receive.advertisePushOptions false &&
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push -o ...  :                       refs/for/main/topic
+test_expect_success "proc-receive: not support push options ($PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push \
+		--porcelain \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	test_i18ngrep "fatal: the receiving end does not support push options" \
+		actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "enable push options ($PROTOCOL/porcelain)" '
+	git -C "$upstream" config receive.advertisePushOptions true
+'
+
+test_expect_success "setup version=0 for proc-receive hook ($PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		--version 0 \
+		-r "ok refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push -o ...  :                       next(A)  refs/for/main/topic
+test_expect_success "proc-receive: ignore push-options for version 0 ($PROTOCOL/porcelain)" '
+	git -C workbench push \
+		--porcelain \
+		--atomic \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/heads/next	[new branch]
+	> *	HEAD:refs/for/main/topic	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+test_expect_success "restore proc-receive hook ($PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)             next(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+	git -C "$upstream" update-ref -d refs/heads/next
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push -o ...  :                       next(A)  refs/for/main/topic
+test_expect_success "proc-receive: push with options ($PROTOCOL/porcelain)" '
+	git -C workbench push \
+		--porcelain \
+		--atomic \
+		-o issue=123 \
+		-o reviewer=user1 \
+		origin \
+		HEAD:refs/heads/next \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive: atomic push_options        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< issue=123        Z
+	> remote: proc-receive< reviewer=user1        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/heads/next	[new branch]
+	> *	HEAD:refs/for/main/topic	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/next
+	EOF
+'
+
+# Refs of upstream : main(A)             next(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+	git -C "$upstream" update-ref -d refs/heads/next
+'
diff --git a/t/t5411/test-0030-report-ok.sh b/t/t5411/test-0030-report-ok.sh
new file mode 100644
index 0000000000..a3a6278213
--- /dev/null
+++ b/t/t5411/test-0030-report-ok.sh
@@ -0,0 +1,33 @@
+test_expect_success "setup proc-receive hook (ok, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic
+test_expect_success "proc-receive: ok ($PROTOCOL)" '
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/for/main/topic
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0031-report-ok--porcelain.sh b/t/t5411/test-0031-report-ok--porcelain.sh
new file mode 100644
index 0000000000..0e175388b6
--- /dev/null
+++ b/t/t5411/test-0031-report-ok--porcelain.sh
@@ -0,0 +1,34 @@
+test_expect_success "setup proc-receive hook (ok, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic
+test_expect_success "proc-receive: ok ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/for/main/topic	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0032-report-with-options.sh b/t/t5411/test-0032-report-with-options.sh
new file mode 100644
index 0000000000..988a4302a6
--- /dev/null
+++ b/t/t5411/test-0032-report-with-options.sh
@@ -0,0 +1,253 @@
+test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option without matching ok ($PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: error: proc-receive reported "option" without a matching "ok/ng" directive        Z
+	> To <URL/of/upstream.git>
+	>  ! [remote rejected] HEAD -> refs/for/main/topic (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (option refname, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname ($PROTOCOL)" '
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/pull/123/head
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option forced-update"
+	EOF
+'
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL)" '
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/pull/123/head
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL)" '
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-B>..<COMMIT-A>  HEAD -> refs/pull/123/head
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option old-oid ($PROTOCOL)" '
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-B>..<COMMIT-A>  HEAD -> refs/for/main/topic
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL)" '
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/a/b/c/topic" \
+		-r "ok refs/for/next/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/124/head" \
+		-r "option old-oid $B" \
+		-r "option forced-update" \
+		-r "option new-oid $A"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL)" '
+	git -C workbench push origin \
+		HEAD:refs/for/next/topic \
+		HEAD:refs/for/a/b/c/topic \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/a/b/c/topic        Z
+	> remote: proc-receive> ok refs/for/next/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/pull/123/head
+	>  * [new reference]   HEAD -> refs/for/a/b/c/topic
+	>  + <COMMIT-B>...<COMMIT-A> HEAD -> refs/pull/124/head (forced update)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0033-report-with-options--porcelain.sh b/t/t5411/test-0033-report-with-options--porcelain.sh
new file mode 100644
index 0000000000..daacb3d69d
--- /dev/null
+++ b/t/t5411/test-0033-report-with-options--porcelain.sh
@@ -0,0 +1,262 @@
+test_expect_success "setup proc-receive hook (option without matching ok, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option without matching ok ($PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: error: proc-receive reported "option" without a matching "ok/ng" directive        Z
+	> To <URL/of/upstream.git>
+	> !	HEAD:refs/for/main/topic	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (option refname, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/pull/123/head	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (option refname and forced-update, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option forced-update"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname and forced-update ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/pull/123/head	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (option refname and old-oid, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option refname and old-oid ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/123/head        Z
+	> To <URL/of/upstream.git>
+	>  	HEAD:refs/pull/123/head	<COMMIT-B>..<COMMIT-A>
+	> Done
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (option old-oid, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option old-oid ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  	HEAD:refs/for/main/topic	<COMMIT-B>..<COMMIT-A>
+	> Done
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (option old-oid and new-oid, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report option old-oid and new-oid ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
+	> Done
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success "setup proc-receive hook (report with multiple rewrites, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/a/b/c/topic" \
+		-r "ok refs/for/next/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/124/head" \
+		-r "option old-oid $B" \
+		-r "option forced-update" \
+		-r "option new-oid $A"
+
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/next/topic(A)  refs/for/a/b/c/topic(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report with multiple rewrites ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/next/topic \
+		HEAD:refs/for/a/b/c/topic \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/a/b/c/topic        Z
+	> remote: proc-receive> ok refs/for/next/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/123/head        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/a/b/c/topic        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/pull/123/head	[new reference]
+	> *	HEAD:refs/for/a/b/c/topic	[new reference]
+	> +	HEAD:refs/pull/124/head	<COMMIT-B>...<COMMIT-A> (forced update)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0034-report-ft.sh b/t/t5411/test-0034-report-ft.sh
new file mode 100644
index 0000000000..73a47d1ffd
--- /dev/null
+++ b/t/t5411/test-0034-report-ft.sh
@@ -0,0 +1,42 @@
+test_expect_success "setup proc-receive hook (ft, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option fall-through"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(B)
+test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL)" '
+	git -C workbench push origin \
+		$B:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   <COMMIT-B> -> refs/for/main/topic
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/for/main/topic
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+# Refs of upstream : main(A)             refs/for/main/topic(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+	git -C "$upstream" update-ref -d refs/for/main/topic
+'
diff --git a/t/t5411/test-0035-report-ft--porcelain.sh b/t/t5411/test-0035-report-ft--porcelain.sh
new file mode 100644
index 0000000000..c350201107
--- /dev/null
+++ b/t/t5411/test-0035-report-ft--porcelain.sh
@@ -0,0 +1,43 @@
+test_expect_success "setup proc-receive hook (fall-through, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option fall-through"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(B)
+test_expect_success "proc-receive: fall throught, let receive-pack to execute ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		$B:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	> *	<COMMIT-B>:refs/for/main/topic	[new reference]
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/for/main/topic
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+# Refs of upstream : main(A)             refs/for/main/topic(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+	git -C "$upstream" update-ref -d refs/for/main/topic
+'
diff --git a/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
new file mode 100644
index 0000000000..8c8a6c16e1
--- /dev/null
+++ b/t/t5411/test-0036-report-multi-rewrite-for-one-ref.sh
@@ -0,0 +1,221 @@
+test_expect_success "setup git config for remote-tracking of special refs" '
+	(
+		cd workbench &&
+		if ! git config --get-all remote.origin.fetch | grep refs/for/
+		then
+			git config --add remote.origin.fetch \
+				"+refs/for/*:refs/t/for/*" &&
+			git config --add remote.origin.fetch \
+				"+refs/pull/*:refs/t/pull/*" &&
+			git config --add remote.origin.fetch \
+				"+refs/changes/*:refs/t/changes/*"
+		fi
+	)
+'
+
+test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/1" \
+		-r "option old-oid $ZERO_OID" \
+		-r "option new-oid $A" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/25/125/1" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite ($PROTOCOL)" '
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/1        Z
+	> remote: proc-receive> option old-oid <ZERO-OID>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/25/125/1        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
+	>  * [new reference]   HEAD -> refs/changes/24/124/1
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/changes/25/125/1
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "proc-receive: check remote-tracking #1 ($PROTOCOL)" '
+	git -C workbench show-ref |
+		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
+	make_user_friendly_and_stable_output <out >actual &&
+	cat >expect <<-EOF &&
+	<COMMIT-A> refs/t/changes/24/124/1
+	<COMMIT-B> refs/t/changes/25/125/1
+	<COMMIT-B> refs/t/for/main/topic
+	EOF
+	test_cmp expect actual &&
+	git -C workbench update-ref -d refs/t/for/main/topic &&
+	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
+	git -C workbench update-ref -d refs/t/changes/25/125/1
+'
+
+test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/1" \
+		-r "option old-oid $ZERO_OID" \
+		-r "option new-oid $A" \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/25/125/1" \
+		-r "option old-oid $B" \
+		-r "option new-oid $A" \
+		-r "option forced-update"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite ($PROTOCOL)" '
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/1        Z
+	> remote: proc-receive> option old-oid <ZERO-OID>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/25/125/1        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/changes/24/124/1
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
+	>  + <COMMIT-B>...<COMMIT-A> HEAD -> refs/changes/25/125/1 (forced update)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "proc-receive: check remote-tracking #2 ($PROTOCOL)" '
+	git -C workbench show-ref |
+		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
+	make_user_friendly_and_stable_output <out >actual &&
+	cat >expect <<-EOF &&
+	<COMMIT-A> refs/t/changes/24/124/1
+	<COMMIT-A> refs/t/changes/25/125/1
+	<COMMIT-B> refs/t/for/main/topic
+	EOF
+	test_cmp expect actual &&
+	git -C workbench update-ref -d refs/t/for/main/topic &&
+	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
+	git -C workbench update-ref -d refs/t/changes/25/125/1
+'
+
+test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/23/123/1" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/2" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL)" '
+	git -C workbench push origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/23/123/1        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/2        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2        Z
+	> To <URL/of/upstream.git>
+	>  * [new reference]   HEAD -> refs/changes/23/123/1
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/changes/24/124/2
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "proc-receive: check remote-tracking #3 ($PROTOCOL)" '
+	git -C workbench show-ref |
+		grep -v -e refs/remotes -e refs/heads -e refs/tags >out &&
+	make_user_friendly_and_stable_output <out >actual &&
+	cat >expect <<-EOF &&
+	<COMMIT-A> refs/t/changes/23/123/1
+	<COMMIT-B> refs/t/changes/24/124/2
+	EOF
+	test_cmp expect actual &&
+	git -C workbench update-ref -d refs/t/changes/24/124/1 &&
+	git -C workbench update-ref -d refs/t/changes/25/125/2
+'
diff --git a/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
new file mode 100644
index 0000000000..bc44810f33
--- /dev/null
+++ b/t/t5411/test-0037-report-multi-rewrite-for-one-ref--porcelain.sh
@@ -0,0 +1,166 @@
+test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 1st rewrite, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/1" \
+		-r "option old-oid $ZERO_OID" \
+		-r "option new-oid $A" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/25/125/1" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: multiple rewrite for one ref, no refname for the 1st rewrite ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/1        Z
+	> remote: proc-receive> option old-oid <ZERO-OID>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/25/125/1        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/25/125/1        Z
+	> To <URL/of/upstream.git>
+	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
+	> *	HEAD:refs/changes/24/124/1	[new reference]
+	>  	HEAD:refs/changes/25/125/1	<COMMIT-A>..<COMMIT-B>
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (multiple rewrites for one ref, no refname for the 2nd rewrite, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/1" \
+		-r "option old-oid $ZERO_OID" \
+		-r "option new-oid $A" \
+		-r "ok refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/25/125/1" \
+		-r "option old-oid $B" \
+		-r "option new-oid $A" \
+		-r "option forced-update"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: multiple rewrites for one ref, no refname for the 2nd rewrite ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/1        Z
+	> remote: proc-receive> option old-oid <ZERO-OID>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/25/125/1        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/24/124/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/changes/25/125/1        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/changes/24/124/1	[new reference]
+	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
+	> +	HEAD:refs/changes/25/125/1	<COMMIT-B>...<COMMIT-A> (forced update)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+test_expect_success "setup proc-receive hook (multiple rewrites for one ref, $PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/23/123/1" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/changes/24/124/2" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         :                       refs/for/main/topic(A)
+test_expect_success "proc-receive: multiple rewrites for one ref ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain origin \
+		HEAD:refs/for/main/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/23/123/1        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/changes/24/124/2        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/changes/23/123/1        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/changes/24/124/2        Z
+	> To <URL/of/upstream.git>
+	> *	HEAD:refs/changes/23/123/1	[new reference]
+	>  	HEAD:refs/changes/24/124/2	<COMMIT-A>..<COMMIT-B>
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
diff --git a/t/t5411/test-0038-report-mixed-refs.sh b/t/t5411/test-0038-report-mixed-refs.sh
new file mode 100644
index 0000000000..e63fe7ba11
--- /dev/null
+++ b/t/t5411/test-0038-report-mixed-refs.sh
@@ -0,0 +1,87 @@
+test_expect_success "setup proc-receive hook ($PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/next/topic2" \
+		-r "ng refs/for/next/topic1 fail to call Web API" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         : (B)                   bar(A)  baz(A)  refs/for/next/topic(A)  foo(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL)" '
+	test_must_fail git -C workbench push origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/bar \
+		HEAD:refs/heads/baz \
+		HEAD:refs/for/next/topic2 \
+		HEAD:refs/for/next/topic1 \
+		HEAD:refs/heads/foo \
+		HEAD:refs/for/main/topic \
+		HEAD:refs/for/next/topic3 \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
+	> remote: proc-receive> ok refs/for/next/topic2        Z
+	> remote: proc-receive> ng refs/for/next/topic1 fail to call Web API        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> main
+	>  * [new branch]      HEAD -> bar
+	>  * [new branch]      HEAD -> baz
+	>  * [new reference]   HEAD -> refs/for/next/topic2
+	>  * [new branch]      HEAD -> foo
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/for/main/topic
+	>  ! [remote rejected] HEAD -> refs/for/next/topic1 (fail to call Web API)
+	>  ! [remote rejected] HEAD -> refs/for/next/topic3 (proc-receive failed to report status)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/bar
+	<COMMIT-A> refs/heads/baz
+	<COMMIT-A> refs/heads/foo
+	<COMMIT-B> refs/heads/main
+	EOF
+'
+
+# Refs of upstream : main(B)             foo(A)  bar(A))  baz(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+	(
+		cd "$upstream" &&
+		git update-ref refs/heads/main $A &&
+		git update-ref -d refs/heads/foo &&
+		git update-ref -d refs/heads/bar &&
+		git update-ref -d refs/heads/baz
+	)
+'
diff --git a/t/t5411/test-0039-report-mixed-refs--porcelain.sh b/t/t5411/test-0039-report-mixed-refs--porcelain.sh
new file mode 100644
index 0000000000..99d17b73af
--- /dev/null
+++ b/t/t5411/test-0039-report-mixed-refs--porcelain.sh
@@ -0,0 +1,89 @@
+test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/for/next/topic2" \
+		-r "ng refs/for/next/topic1 fail to call Web API" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/for/main/topic" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         : (B)                   bar(A)  baz(A)  refs/for/next/topic(A)  foo(A)  refs/for/main/topic(A)
+test_expect_success "proc-receive: report update of mixed refs ($PROTOCOL/porcelain)" '
+	test_must_fail git -C workbench push --porcelain origin \
+		$B:refs/heads/main \
+		HEAD:refs/heads/bar \
+		HEAD:refs/heads/baz \
+		HEAD:refs/for/next/topic2 \
+		HEAD:refs/for/next/topic1 \
+		HEAD:refs/heads/foo \
+		HEAD:refs/for/main/topic \
+		HEAD:refs/for/next/topic3 \
+		>out-$test_count 2>&1 &&
+	make_user_friendly_and_stable_output <out-$test_count >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic1        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic3        Z
+	> remote: proc-receive> ok refs/for/next/topic2        Z
+	> remote: proc-receive> ng refs/for/next/topic1 fail to call Web API        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/for/main/topic        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/bar        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/baz        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic2        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/heads/foo        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/for/main/topic        Z
+	> To <URL/of/upstream.git>
+	>  	<COMMIT-B>:refs/heads/main	<COMMIT-A>..<COMMIT-B>
+	> *	HEAD:refs/heads/bar	[new branch]
+	> *	HEAD:refs/heads/baz	[new branch]
+	> *	HEAD:refs/for/next/topic2	[new reference]
+	> *	HEAD:refs/heads/foo	[new branch]
+	>  	HEAD:refs/for/main/topic	<COMMIT-A>..<COMMIT-B>
+	> !	HEAD:refs/for/next/topic1	[remote rejected] (fail to call Web API)
+	> !	HEAD:refs/for/next/topic3	[remote rejected] (proc-receive failed to report status)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/bar
+	<COMMIT-A> refs/heads/baz
+	<COMMIT-A> refs/heads/foo
+	<COMMIT-B> refs/heads/main
+	EOF
+'
+
+# Refs of upstream : main(B)             foo(A)  bar(A))  baz(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+	(
+		cd "$upstream" &&
+		git update-ref refs/heads/main $A &&
+		git update-ref -d refs/heads/foo &&
+		git update-ref -d refs/heads/bar &&
+		git update-ref -d refs/heads/baz
+	)
+
+'
diff --git a/t/t5411/test-0040-process-all-refs.sh b/t/t5411/test-0040-process-all-refs.sh
new file mode 100644
index 0000000000..2f405adefa
--- /dev/null
+++ b/t/t5411/test-0040-process-all-refs.sh
@@ -0,0 +1,111 @@
+test_expect_success "config receive.procReceiveRefs = refs ($PROTOCOL)" '
+	git -C "$upstream" config --unset-all receive.procReceiveRefs &&
+	git -C "$upstream" config --add receive.procReceiveRefs refs
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "setup upstream branches ($PROTOCOL)" '
+	(
+		cd "$upstream" &&
+		git update-ref refs/heads/main $B &&
+		git update-ref refs/heads/foo $A &&
+		git update-ref refs/heads/bar $A &&
+		git update-ref refs/heads/baz $A
+	)
+
+'
+
+test_expect_success "setup proc-receive hook ($PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main" \
+		-r "option fall-through" \
+		-r "ok refs/heads/foo" \
+		-r "option fall-through" \
+		-r "ok refs/heads/bar" \
+		-r "option fall-through" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/next/topic" \
+		-r "option refname refs/pull/124/head" \
+		-r "option old-oid $B" \
+		-r "option new-oid $A" \
+		-r "option forced-update"
+	EOF
+'
+
+# Refs of upstream : main(B)             foo(A)  bar(A))  baz(A)
+# Refs of workbench: main(A)  tags/v123
+# git push -f      : main(A)             (NULL)  (B)              refs/for/main/topic(A)  refs/for/next/topic(A)
+test_expect_success "proc-receive: process all refs ($PROTOCOL)" '
+	git -C workbench push -f origin \
+		HEAD:refs/heads/main \
+		:refs/heads/foo \
+		$B:refs/heads/bar \
+		HEAD:refs/for/main/topic \
+		HEAD:refs/for/next/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: proc-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/heads/foo        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/heads/bar        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/next/topic        Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: post-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> bar
+	>  - [deleted]         foo
+	>  + <COMMIT-B>...<COMMIT-A> HEAD -> main (forced update)
+	>    <COMMIT-A>..<COMMIT-B>  HEAD -> refs/pull/123/head
+	>  + <COMMIT-B>...<COMMIT-A> HEAD -> refs/pull/124/head (forced update)
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/bar
+	<COMMIT-A> refs/heads/baz
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+# Refs of upstream : main(A)             bar(A)  baz(B)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL)" '
+	(
+		cd "$upstream" &&
+		git update-ref -d refs/heads/bar &&
+		git update-ref -d refs/heads/baz
+	)
+'
diff --git a/t/t5411/test-0041-process-all-refs--porcelain.sh b/t/t5411/test-0041-process-all-refs--porcelain.sh
new file mode 100644
index 0000000000..c88405792e
--- /dev/null
+++ b/t/t5411/test-0041-process-all-refs--porcelain.sh
@@ -0,0 +1,112 @@
+test_expect_success "config receive.procReceiveRefs = refs ($PROTOCOL/porcelain)" '
+	git -C "$upstream" config --unset-all receive.procReceiveRefs &&
+	git -C "$upstream" config --add receive.procReceiveRefs refs
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "setup upstream branches ($PROTOCOL/porcelain)" '
+	(
+		cd "$upstream" &&
+		git update-ref refs/heads/main $B &&
+		git update-ref refs/heads/foo $A &&
+		git update-ref refs/heads/bar $A &&
+		git update-ref refs/heads/baz $A
+	)
+
+'
+
+test_expect_success "setup proc-receive hook ($PROTOCOL/porcelain)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main" \
+		-r "option fall-through" \
+		-r "ok refs/heads/foo" \
+		-r "option fall-through" \
+		-r "ok refs/heads/bar" \
+		-r "option fall-through" \
+		-r "ok refs/for/main/topic" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/for/next/topic" \
+		-r "option refname refs/pull/124/head" \
+		-r "option old-oid $B" \
+		-r "option new-oid $A" \
+		-r "option forced-update"
+	EOF
+'
+
+# Refs of upstream : main(B)             foo(A)  bar(A))  baz(A)
+# Refs of workbench: main(A)  tags/v123
+# git push -f      : main(A)             (NULL)  (B)              refs/for/main/topic(A)  refs/for/next/topic(A)
+test_expect_success "proc-receive: process all refs ($PROTOCOL/porcelain)" '
+	git -C workbench push --porcelain -f origin \
+		HEAD:refs/heads/main \
+		:refs/heads/foo \
+		$B:refs/heads/bar \
+		HEAD:refs/for/main/topic \
+		HEAD:refs/for/next/topic \
+		>out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: pre-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: proc-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/main/topic        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/for/next/topic        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/heads/foo        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/heads/bar        Z
+	> remote: proc-receive> option fall-through        Z
+	> remote: proc-receive> ok refs/for/main/topic        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/for/next/topic        Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-B>        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: proc-receive> option forced-update        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/bar        Z
+	> remote: post-receive< <COMMIT-A> <ZERO-OID> refs/heads/foo        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/heads/main        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head        Z
+	> remote: post-receive< <COMMIT-B> <COMMIT-A> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
+	> -	:refs/heads/foo	[deleted]
+	> +	HEAD:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
+	>  	HEAD:refs/pull/123/head	<COMMIT-A>..<COMMIT-B>
+	> +	HEAD:refs/pull/124/head	<COMMIT-B>...<COMMIT-A> (forced update)
+	> Done
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-B> refs/heads/bar
+	<COMMIT-A> refs/heads/baz
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+# Refs of upstream : main(A)             bar(A)  baz(B)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "cleanup ($PROTOCOL/porcelain)" '
+	(
+		cd "$upstream" &&
+		git update-ref -d refs/heads/bar &&
+		git update-ref -d refs/heads/baz
+	)
+'
diff --git a/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
new file mode 100644
index 0000000000..31989f0185
--- /dev/null
+++ b/t/t5411/test-0050-proc-receive-refs-with-modifiers.sh
@@ -0,0 +1,129 @@
+test_expect_success "config receive.procReceiveRefs with modifiers ($PROTOCOL)" '
+	(
+		cd "$upstream" &&
+		git config --unset-all receive.procReceiveRefs &&
+		git config --add receive.procReceiveRefs m:refs/heads/main &&
+		git config --add receive.procReceiveRefs ad:refs/heads &&
+		git config --add receive.procReceiveRefs "a!:refs/heads"
+	)
+'
+
+test_expect_success "setup proc-receive hook ($PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $A" \
+		-r "option new-oid $B" \
+		-r "ok refs/tags/v123 " \
+		-r "option refname refs/pull/124/head"
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+# git push         : main(B)  tags/v123
+test_expect_success "proc-receive: update branch and new tag ($PROTOCOL)" '
+	git -C workbench push origin \
+		$B:refs/heads/main \
+		v123 >out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: pre-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <COMMIT-A> <COMMIT-B> refs/heads/main        Z
+	> remote: proc-receive< <ZERO-OID> <TAG-v123> refs/tags/v123        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <COMMIT-B>        Z
+	> remote: proc-receive> ok refs/tags/v123         Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/pull/123/head        Z
+	> remote: post-receive< <ZERO-OID> <TAG-v123> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> refs/pull/123/head
+	>  * [new reference]   v123 -> refs/pull/124/head
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	EOF
+'
+
+# Refs of upstream : main(A)
+# Refs of workbench: main(A)  tags/v123
+test_expect_success "setup upstream: create tags/v123 ($PROTOCOL)" '
+	git -C "$upstream" update-ref refs/heads/topic $A &&
+	git -C "$upstream" update-ref refs/tags/v123 $TAG &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-A> refs/heads/topic
+	<TAG-v123> refs/tags/v123
+	EOF
+'
+
+test_expect_success "setup proc-receive hook ($PROTOCOL)" '
+	write_script "$upstream/hooks/proc-receive" <<-EOF
+	printf >&2 "# proc-receive hook\n"
+	test-tool proc-receive -v \
+		-r "ok refs/heads/main" \
+		-r "option refname refs/pull/123/head" \
+		-r "option old-oid $A" \
+		-r "option new-oid $ZERO_OID" \
+		-r "ok refs/heads/next" \
+		-r "option refname refs/pull/124/head" \
+		-r "option new-oid $A"
+	EOF
+'
+
+# Refs of upstream : main(A)  topic(A)  tags/v123
+# Refs of workbench: main(A)            tags/v123
+# git push         : NULL       topic(B)  NULL       next(A)
+test_expect_success "proc-receive: create/delete branch, and delete tag ($PROTOCOL)" '
+	git -C workbench push origin \
+		:refs/heads/main \
+		$B:refs/heads/topic \
+		$A:refs/heads/next \
+		:refs/tags/v123 >out 2>&1 &&
+	make_user_friendly_and_stable_output <out >actual &&
+	format_and_save_expect <<-EOF &&
+	> remote: # pre-receive hook        Z
+	> remote: pre-receive< <COMMIT-A> <ZERO-OID> refs/heads/main        Z
+	> remote: pre-receive< <COMMIT-A> <COMMIT-B> refs/heads/topic        Z
+	> remote: pre-receive< <TAG-v123> <ZERO-OID> refs/tags/v123        Z
+	> remote: pre-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: # proc-receive hook        Z
+	> remote: proc-receive< <COMMIT-A> <ZERO-OID> refs/heads/main        Z
+	> remote: proc-receive< <ZERO-OID> <COMMIT-A> refs/heads/next        Z
+	> remote: proc-receive> ok refs/heads/main        Z
+	> remote: proc-receive> option refname refs/pull/123/head        Z
+	> remote: proc-receive> option old-oid <COMMIT-A>        Z
+	> remote: proc-receive> option new-oid <ZERO-OID>        Z
+	> remote: proc-receive> ok refs/heads/next        Z
+	> remote: proc-receive> option refname refs/pull/124/head        Z
+	> remote: proc-receive> option new-oid <COMMIT-A>        Z
+	> remote: # post-receive hook        Z
+	> remote: post-receive< <COMMIT-A> <ZERO-OID> refs/pull/123/head        Z
+	> remote: post-receive< <COMMIT-A> <COMMIT-B> refs/heads/topic        Z
+	> remote: post-receive< <TAG-v123> <ZERO-OID> refs/tags/v123        Z
+	> remote: post-receive< <ZERO-OID> <COMMIT-A> refs/pull/124/head        Z
+	> To <URL/of/upstream.git>
+	>  - [deleted]         refs/pull/123/head
+	>    <COMMIT-A>..<COMMIT-B>  <COMMIT-B> -> topic
+	>  - [deleted]         v123
+	>  * [new reference]   <COMMIT-A> -> refs/pull/124/head
+	EOF
+	test_cmp expect actual &&
+
+	test_cmp_refs -C "$upstream" <<-EOF
+	<COMMIT-A> refs/heads/main
+	<COMMIT-B> refs/heads/topic
+	EOF
+'
diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh
index 6b97923964..8a5d3492c7 100755
--- a/t/t5500-fetch-pack.sh
+++ b/t/t5500-fetch-pack.sh
@@ -5,6 +5,9 @@
 
 test_description='Testing multi_ack pack fetching'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Test fetch-pack/upload-pack pair.
@@ -385,6 +388,54 @@ test_expect_success 'clone shallow with packed refs' '
 	test_cmp count8.expected count8.actual
 '
 
+test_expect_success 'in_vain not triggered before first ACK' '
+	rm -rf myserver myclient &&
+	git init myserver &&
+	test_commit -C myserver foo &&
+	git clone "file://$(pwd)/myserver" myclient &&
+
+	# MAX_IN_VAIN is 256. Because of batching, the client will send 496
+	# (16+32+64+128+256) commits, not 256, before giving up. So create 496
+	# irrelevant commits.
+	test_commit_bulk -C myclient 496 &&
+
+	# The new commit that the client wants to fetch.
+	test_commit -C myserver bar &&
+
+	git -C myclient fetch --progress origin 2>log &&
+	test_i18ngrep "remote: Total 3 " log
+'
+
+test_expect_success 'in_vain resetted upon ACK' '
+	rm -rf myserver myclient &&
+	git init myserver &&
+
+	# Linked list of commits on main. The first is common; the rest are
+	# not.
+	test_commit -C myserver first_main_commit &&
+	git clone "file://$(pwd)/myserver" myclient &&
+	test_commit_bulk -C myclient 255 &&
+
+	# Another linked list of commits on anotherbranch with no connection to
+	# main. The first is common; the rest are not.
+	git -C myserver checkout --orphan anotherbranch &&
+	test_commit -C myserver first_anotherbranch_commit &&
+	git -C myclient fetch origin anotherbranch:refs/heads/anotherbranch &&
+	git -C myclient checkout anotherbranch &&
+	test_commit_bulk -C myclient 255 &&
+
+	# The new commit that the client wants to fetch.
+	git -C myserver checkout main &&
+	test_commit -C myserver to_fetch &&
+
+	# The client will send (as "have"s) all 256 commits in anotherbranch
+	# first. The 256th commit is common between the client and the server,
+	# and should reset in_vain. This allows negotiation to continue until
+	# the client reports that first_anotherbranch_commit is common.
+	git -C myclient fetch --progress origin main 2>log &&
+	test_i18ngrep "Total 3 " log
+'
+
 test_expect_success 'fetch in shallow repo unreachable shallow objects' '
 	(
 		git clone --bare --branch B --single-branch "file://$(pwd)/." no-reflog &&
@@ -440,11 +491,12 @@ test_expect_success 'setup tests for the --stdin parameter' '
 '
 
 test_expect_success 'setup fetch refs from cmdline v[12]' '
+	cp -r client client0 &&
 	cp -r client client1 &&
 	cp -r client client2
 '
 
-for version in '' 1 2
+for version in '' 0 1 2
 do
 	test_expect_success "protocol.version=$version fetch refs from cmdline" "
 		(
@@ -495,7 +547,7 @@ test_expect_success 'test lonely missing ref' '
 		cd client &&
 		test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy 2>../error-m
 	) &&
-	test_i18ncmp expect-error error-m
+	test_cmp expect-error error-m
 '
 
 test_expect_success 'test missing ref after existing' '
@@ -503,7 +555,7 @@ test_expect_success 'test missing ref after existing' '
 		cd client &&
 		test_must_fail git fetch-pack --no-progress .. refs/heads/A refs/heads/xyzzy 2>../error-em
 	) &&
-	test_i18ncmp expect-error error-em
+	test_cmp expect-error error-em
 '
 
 test_expect_success 'test missing ref before existing' '
@@ -511,7 +563,7 @@ test_expect_success 'test missing ref before existing' '
 		cd client &&
 		test_must_fail git fetch-pack --no-progress .. refs/heads/xyzzy refs/heads/A 2>../error-me
 	) &&
-	test_i18ncmp expect-error error-me
+	test_cmp expect-error error-me
 '
 
 test_expect_success 'test --all, --depth, and explicit head' '
@@ -588,7 +640,7 @@ test_expect_success 'shallow fetch with tags does not break the repository' '
 		mkdir repo2 &&
 		cd repo2 &&
 		git init &&
-		git fetch --depth=2 ../.git master:branch &&
+		git fetch --depth=2 ../.git main:branch &&
 		git fsck
 	)
 '
@@ -613,7 +665,7 @@ test_expect_success 'fetch-pack can fetch a raw sha1 that is advertised as a ref
 
 	git init client &&
 	git -C client fetch-pack ../server \
-		$(git -C server rev-parse refs/heads/master)
+		$(git -C server rev-parse refs/heads/main)
 '
 
 test_expect_success 'fetch-pack can fetch a raw sha1 overlapping a named ref' '
@@ -638,8 +690,8 @@ test_expect_success 'fetch-pack cannot fetch a raw sha1 that is not advertised a
 	git init client &&
 	# Some protocol versions (e.g. 2) support fetching
 	# unadvertised objects, so restrict this test to v0.
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION= git -C client fetch-pack ../server \
-		$(git -C server rev-parse refs/heads/master^) 2>err &&
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C client fetch-pack ../server \
+		$(git -C server rev-parse refs/heads/main^) 2>err &&
 	test_i18ngrep "Server does not allow request for unadvertised object" err
 '
 
@@ -773,7 +825,7 @@ test_expect_success 'clone shallow since ...' '
 
 test_expect_success 'fetch shallow since ...' '
 	git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
-	git -C shallow11 log --pretty=tformat:%s origin/master >actual &&
+	git -C shallow11 log --pretty=tformat:%s origin/main >actual &&
 	cat >expected <<-\EOF &&
 	three
 	two
@@ -814,7 +866,7 @@ test_expect_success 'shallow since with commit graph and already-seen commit' '
 	(
 	cd shallow-since-graph &&
 	test_commit base &&
-	test_commit master &&
+	test_commit main &&
 	git checkout -b other HEAD^ &&
 	test_commit other &&
 	git commit-graph write --reachable &&
@@ -822,9 +874,10 @@ test_expect_success 'shallow since with commit graph and already-seen commit' '
 
 	GIT_PROTOCOL=version=2 git upload-pack . <<-EOF >/dev/null
 	0012command=fetch
+	$(echo "object-format=$(test_oid algo)" | packetize)
 	00010013deepen-since 1
-	0032want $(git rev-parse other)
-	0032have $(git rev-parse master)
+	$(echo "want $(git rev-parse other)" | packetize)
+	$(echo "have $(git rev-parse main)" | packetize)
 	0000
 	EOF
 	)
@@ -846,7 +899,7 @@ test_expect_success 'shallow clone exclude tag two' '
 
 test_expect_success 'fetch exclude tag one' '
 	git -C shallow12 fetch --shallow-exclude one origin &&
-	git -C shallow12 log --pretty=tformat:%s origin/master >actual &&
+	git -C shallow12 log --pretty=tformat:%s origin/main >actual &&
 	test_write_lines three two >expected &&
 	test_cmp expected actual
 '
@@ -860,11 +913,11 @@ test_expect_success 'fetching deepen' '
 	test_commit three &&
 	git clone --depth 1 "file://$(pwd)/." deepen &&
 	test_commit four &&
-	git -C deepen log --pretty=tformat:%s master >actual &&
+	git -C deepen log --pretty=tformat:%s main >actual &&
 	echo three >expected &&
 	test_cmp expected actual &&
 	git -C deepen fetch --deepen=1 &&
-	git -C deepen log --pretty=tformat:%s origin/master >actual &&
+	git -C deepen log --pretty=tformat:%s origin/main >actual &&
 	cat >expected <<-\EOF &&
 	four
 	three
@@ -917,7 +970,10 @@ test_expect_success 'filtering by size' '
 	git -C client fetch-pack --filter=blob:limit=0 ../server HEAD &&
 
 	# Ensure that object is not inadvertently fetched
-	test_must_fail git -C client cat-file -e $(git hash-object server/one.t)
+	commit=$(git -C server rev-parse HEAD) &&
+	blob=$(git hash-object server/one.t) &&
+	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
+	! grep "$blob" oids
 '
 
 test_expect_success 'filtering by size has no effect if support for it is not advertised' '
@@ -929,7 +985,10 @@ test_expect_success 'filtering by size has no effect if support for it is not ad
 	git -C client fetch-pack --filter=blob:limit=0 ../server HEAD 2> err &&
 
 	# Ensure that object is fetched
-	git -C client cat-file -e $(git hash-object server/one.t) &&
+	commit=$(git -C server rev-parse HEAD) &&
+	blob=$(git hash-object server/one.t) &&
+	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
+	grep "$blob" oids &&
 
 	test_i18ngrep "filtering not recognized by server" err
 '
@@ -944,16 +1003,17 @@ fetch_filter_blob_limit_zero () {
 	test_config -C "$SERVER" uploadpack.allowfilter 1 &&
 
 	git clone "$URL" client &&
-	test_config -C client extensions.partialclone origin &&
 
 	test_commit -C "$SERVER" two &&
 
 	git -C client fetch --filter=blob:limit=0 origin HEAD:somewhere &&
 
 	# Ensure that commit is fetched, but blob is not
-	test_config -C client extensions.partialclone "arbitrary string" &&
-	git -C client cat-file -e $(git -C "$SERVER" rev-parse two) &&
-	test_must_fail git -C client cat-file -e $(git hash-object "$SERVER/two.t")
+	commit=$(git -C "$SERVER" rev-parse two) &&
+	blob=$(git hash-object server/two.t) &&
+	git -C client rev-list --objects --missing=allow-any "$commit" >oids &&
+	grep "$commit" oids &&
+	! grep "$blob" oids
 }
 
 test_expect_success 'fetch with --filter=blob:limit=0' '
diff --git a/t/t5501-fetch-push-alternates.sh b/t/t5501-fetch-push-alternates.sh
index 1bc57ac03f..66f19a4ef2 100755
--- a/t/t5501-fetch-push-alternates.sh
+++ b/t/t5501-fetch-push-alternates.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='fetch/push involving alternates'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 count_objects () {
@@ -45,7 +48,7 @@ test_expect_success setup '
 test_expect_success 'pushing into a repository with the same alternate' '
 	(
 		cd one &&
-		git push ../receiver master:refs/heads/it
+		git push ../receiver main:refs/heads/it
 	) &&
 	(
 		cd receiver &&
@@ -57,7 +60,7 @@ test_expect_success 'pushing into a repository with the same alternate' '
 test_expect_success 'fetching from a repository with the same alternate' '
 	(
 		cd fetcher &&
-		git fetch ../one master:refs/heads/it &&
+		git fetch ../one main:refs/heads/it &&
 		count_objects >../fetcher.count
 	) &&
 	test_cmp one.count fetcher.count
diff --git a/t/t5502-quickfetch.sh b/t/t5502-quickfetch.sh
index 7a46cbdbe6..8c05c7715b 100755
--- a/t/t5502-quickfetch.sh
+++ b/t/t5502-quickfetch.sh
@@ -2,6 +2,9 @@
 
 test_description='test quickfetch from local'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -108,14 +111,14 @@ test_expect_success 'quickfetch should not copy from alternate' '
 				q
 			}"
 	) ) &&
-	origin_master=$( (
+	origin_main=$( (
 		cd quickclone &&
-		git rev-parse origin/master
+		git rev-parse origin/main
 	) ) &&
 	echo "loose objects: $obj_cnt, packfiles: $pck_cnt" &&
 	test $obj_cnt -eq 0 &&
 	test $pck_cnt -eq 0 &&
-	test z$origin_master = z$(git rev-parse master)
+	test z$origin_main = z$(git rev-parse main)
 
 '
 
diff --git a/t/t5503-tagfollow.sh b/t/t5503-tagfollow.sh
index 6041a4dd32..195fc64dd4 100755
--- a/t/t5503-tagfollow.sh
+++ b/t/t5503-tagfollow.sh
@@ -2,6 +2,9 @@
 
 test_description='test automatic tag following'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # End state of the repository:
@@ -11,7 +14,7 @@ test_description='test automatic tag following'
 #   L - A ------ O ------ B
 #    \   \                 \
 #     \   C - origin/cat    \
-#      origin/master         master
+#      origin/main           main
 
 test_expect_success setup '
 	test_tick &&
@@ -57,7 +60,7 @@ test_expect_success 'fetch A (new commit : 1 connection)' '
 	(
 		cd cloned &&
 		GIT_TRACE_PACKET=$UPATH git fetch &&
-		test $A = $(git rev-parse --verify origin/master)
+		test $A = $(git rev-parse --verify origin/main)
 	) &&
 	get_needs $U >actual &&
 	test_cmp expect actual
@@ -72,7 +75,7 @@ test_expect_success "create tag T on A, create C on branch cat" '
 	git add file &&
 	git commit -m C &&
 	C=$(git rev-parse --verify HEAD) &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'setup expect' '
@@ -123,7 +126,7 @@ test_expect_success 'fetch B, S (commit and tag : 1 connection)' '
 	(
 		cd cloned &&
 		GIT_TRACE_PACKET=$UPATH git fetch &&
-		test $B = $(git rev-parse --verify origin/master) &&
+		test $B = $(git rev-parse --verify origin/main) &&
 		test $B = $(git rev-parse --verify tag2^0) &&
 		test $S = $(git rev-parse --verify tag2)
 	) &&
@@ -138,7 +141,7 @@ want $S
 EOF
 '
 
-test_expect_success 'new clone fetch master and tags' '
+test_expect_success 'new clone fetch main and tags' '
 	test_might_fail git branch -D cat &&
 	rm -f $U &&
 	(
@@ -147,7 +150,7 @@ test_expect_success 'new clone fetch master and tags' '
 		git init &&
 		git remote add origin .. &&
 		GIT_TRACE_PACKET=$UPATH git fetch &&
-		test $B = $(git rev-parse --verify origin/master) &&
+		test $B = $(git rev-parse --verify origin/main) &&
 		test $S = $(git rev-parse --verify tag2) &&
 		test $B = $(git rev-parse --verify tag2^0) &&
 		test $T = $(git rev-parse --verify tag1) &&
diff --git a/t/t5504-fetch-receive-strict.sh b/t/t5504-fetch-receive-strict.sh
index fdfe179b11..6e5a9c20e7 100755
--- a/t/t5504-fetch-receive-strict.sh
+++ b/t/t5504-fetch-receive-strict.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='fetch/receive strict mode'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup and inject "corrupt or missing" object' '
@@ -25,7 +28,7 @@ test_expect_success 'fetch without strict' '
 		cd dst &&
 		git config fetch.fsckobjects false &&
 		git config transfer.fsckobjects false &&
-		test_must_fail git fetch ../.git master
+		test_must_fail git fetch ../.git main
 	)
 '
 
@@ -36,7 +39,7 @@ test_expect_success 'fetch with !fetch.fsckobjects' '
 		cd dst &&
 		git config fetch.fsckobjects false &&
 		git config transfer.fsckobjects true &&
-		test_must_fail git fetch ../.git master
+		test_must_fail git fetch ../.git main
 	)
 '
 
@@ -47,7 +50,7 @@ test_expect_success 'fetch with fetch.fsckobjects' '
 		cd dst &&
 		git config fetch.fsckobjects true &&
 		git config transfer.fsckobjects false &&
-		test_must_fail git fetch ../.git master
+		test_must_fail git fetch ../.git main
 	)
 '
 
@@ -57,13 +60,14 @@ test_expect_success 'fetch with transfer.fsckobjects' '
 	(
 		cd dst &&
 		git config transfer.fsckobjects true &&
-		test_must_fail git fetch ../.git master
+		test_must_fail git fetch ../.git main
 	)
 '
 
 cat >exp <<EOF
 To dst
-!	refs/heads/master:refs/heads/test	[remote rejected] (missing necessary objects)
+!	refs/heads/main:refs/heads/test	[remote rejected] (missing necessary objects)
+Done
 EOF
 
 test_expect_success 'push without strict' '
@@ -74,7 +78,7 @@ test_expect_success 'push without strict' '
 		git config fetch.fsckobjects false &&
 		git config transfer.fsckobjects false
 	) &&
-	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
 	test_cmp exp act
 '
 
@@ -86,13 +90,13 @@ test_expect_success 'push with !receive.fsckobjects' '
 		git config receive.fsckobjects false &&
 		git config transfer.fsckobjects true
 	) &&
-	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
 	test_cmp exp act
 '
 
 cat >exp <<EOF
 To dst
-!	refs/heads/master:refs/heads/test	[remote rejected] (unpacker error)
+!	refs/heads/main:refs/heads/test	[remote rejected] (unpacker error)
 EOF
 
 test_expect_success 'push with receive.fsckobjects' '
@@ -103,7 +107,7 @@ test_expect_success 'push with receive.fsckobjects' '
 		git config receive.fsckobjects true &&
 		git config transfer.fsckobjects false
 	) &&
-	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
 	test_cmp exp act
 '
 
@@ -114,7 +118,7 @@ test_expect_success 'push with transfer.fsckobjects' '
 		cd dst &&
 		git config transfer.fsckobjects true
 	) &&
-	test_must_fail git push --porcelain dst master:refs/heads/test >act &&
+	test_must_fail git push --porcelain dst main:refs/heads/test >act &&
 	test_cmp exp act
 '
 
@@ -144,11 +148,11 @@ test_expect_success 'fsck with no skipList input' '
 
 test_expect_success 'setup sorted and unsorted skipLists' '
 	cat >SKIP.unsorted <<-EOF &&
-	0000000000000000000000000000000000000004
-	0000000000000000000000000000000000000002
+	$(test_oid 004)
+	$(test_oid 002)
 	$commit
-	0000000000000000000000000000000000000001
-	0000000000000000000000000000000000000003
+	$(test_oid 001)
+	$(test_oid 003)
 	EOF
 	sort SKIP.unsorted >SKIP.sorted
 '
@@ -172,14 +176,14 @@ test_expect_success 'fsck with invalid or bogus skipList input' '
 test_expect_success 'fsck with other accepted skipList input (comments & empty lines)' '
 	cat >SKIP.with-comment <<-EOF &&
 	# Some bad commit
-	0000000000000000000000000000000000000001
+	$(test_oid 001)
 	EOF
 	test_must_fail git -c fsck.skipList=SKIP.with-comment fsck 2>err-with-comment &&
 	test_i18ngrep "missingEmail" err-with-comment &&
 	cat >SKIP.with-empty-line <<-EOF &&
-	0000000000000000000000000000000000000001
+	$(test_oid 001)
 
-	0000000000000000000000000000000000000002
+	$(test_oid 002)
 	EOF
 	test_must_fail git -c fsck.skipList=SKIP.with-empty-line fsck 2>err-with-empty-line &&
 	test_i18ngrep "missingEmail" err-with-empty-line
@@ -204,7 +208,7 @@ test_expect_success 'fsck with exhaustive accepted skipList input (various types
 	echo " # Comment after whitespace" >>SKIP.exhaustive &&
 	echo "$commit # Our bad commit (with leading whitespace and trailing comment)" >>SKIP.exhaustive &&
 	echo "# Some bad commit (leading whitespace)" >>SKIP.exhaustive &&
-	echo "  0000000000000000000000000000000000000001" >>SKIP.exhaustive &&
+	echo "  $(test_oid 001)" >>SKIP.exhaustive &&
 	git -c fsck.skipList=SKIP.exhaustive fsck 2>err &&
 	test_must_be_empty err
 '
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index 883b32efa0..e6e3c8f552 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -2,12 +2,15 @@
 
 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 () {
 	mkdir "$1" && (
 	cd "$1" &&
-	git init &&
+	git init -b main &&
 	>file &&
 	git add file &&
 	test_tick &&
@@ -17,7 +20,7 @@ setup_repository () {
 	git add elif &&
 	test_tick &&
 	git commit -m "Second" &&
-	git checkout master
+	git checkout main
 	)
 }
 
@@ -56,12 +59,12 @@ test_expect_success 'add remote whose URL agrees with url.<...>.insteadOf' '
 	git remote add myremote git@host.com:team/repo.git
 '
 
-test_expect_success C_LOCALE_OUTPUT 'remote information for the origin' '
+test_expect_success 'remote information for the origin' '
 	(
 		cd test &&
 		tokens_match origin "$(git remote)" &&
-		check_remote_track origin master side &&
-		check_tracking_branch origin HEAD master side
+		check_remote_track origin main side &&
+		check_tracking_branch origin HEAD main side
 	)
 '
 
@@ -70,7 +73,7 @@ test_expect_success 'add another remote' '
 		cd test &&
 		git remote add -f second ../two &&
 		tokens_match "origin second" "$(git remote)" &&
-		check_tracking_branch second master side another &&
+		check_tracking_branch second main side another &&
 		git for-each-ref "--format=%(refname)" refs/remotes |
 		sed -e "/^refs\/remotes\/origin\//d" \
 		    -e "/^refs\/remotes\/second\//d" >actual &&
@@ -78,11 +81,11 @@ test_expect_success 'add another remote' '
 	)
 '
 
-test_expect_success C_LOCALE_OUTPUT 'check remote-tracking' '
+test_expect_success 'check remote-tracking' '
 	(
 		cd test &&
-		check_remote_track origin master side &&
-		check_remote_track second master side another
+		check_remote_track origin main side &&
+		check_remote_track second main side another
 	)
 '
 
@@ -99,16 +102,16 @@ test_expect_success 'remote forces tracking branches' '
 test_expect_success 'remove remote' '
 	(
 		cd test &&
-		git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/master &&
+		git symbolic-ref refs/remotes/second/HEAD refs/remotes/second/main &&
 		git remote rm second
 	)
 '
 
-test_expect_success C_LOCALE_OUTPUT 'remove remote' '
+test_expect_success 'remove remote' '
 	(
 		cd test &&
 		tokens_match origin "$(git remote)" &&
-		check_remote_track origin master side &&
+		check_remote_track origin main side &&
 		git for-each-ref "--format=%(refname)" refs/remotes |
 		sed -e "/^refs\/remotes\/origin\//d" >actual &&
 		test_must_be_empty actual
@@ -121,13 +124,13 @@ test_expect_success 'remove remote protects local branches' '
 		cat >expect1 <<-\EOF &&
 		Note: A branch outside the refs/remotes/ hierarchy was not removed;
 		to delete it, use:
-		  git branch -d master
+		  git branch -d main
 		EOF
 		cat >expect2 <<-\EOF &&
 		Note: Some branches outside the refs/remotes/ hierarchy were not removed;
 		to delete them, use:
 		  git branch -d foobranch
-		  git branch -d master
+		  git branch -d main
 		EOF
 		git tag footag &&
 		git config --add remote.oops.fetch "+refs/*:refs/*" &&
@@ -137,23 +140,23 @@ test_expect_success 'remove remote protects local branches' '
 		git remote rm oops 2>actual2 &&
 		git branch -d foobranch &&
 		git tag -d footag &&
-		test_i18ncmp expect1 actual1 &&
-		test_i18ncmp expect2 actual2
+		test_cmp expect1 actual1 &&
+		test_cmp expect2 actual2
 	)
 '
 
 test_expect_success 'remove errors out early when deleting non-existent branch' '
 	(
 		cd test &&
-		echo "fatal: No such remote: '\''foo'\''" >expect &&
-		test_must_fail git remote rm foo 2>actual &&
-		test_i18ncmp expect actual
+		echo "error: No such remote: '\''foo'\''" >expect &&
+		test_expect_code 2 git remote rm foo 2>actual &&
+		test_cmp expect actual
 	)
 '
 
 test_expect_success 'remove remote with a branch without configured merge' '
 	test_when_finished "(
-		git -C test checkout master;
+		git -C test checkout main;
 		git -C test branch -D two;
 		git -C test config --remove-section remote.two;
 		git -C test config --remove-section branch.second;
@@ -163,9 +166,9 @@ test_expect_success 'remove remote with a branch without configured merge' '
 		cd test &&
 		git remote add two ../two &&
 		git fetch two &&
-		git checkout -b second two/master^0 &&
+		git checkout -b second two/main^0 &&
 		git config branch.second.remote two &&
-		git checkout master &&
+		git checkout main &&
 		git remote rm two
 	)
 '
@@ -173,67 +176,80 @@ test_expect_success 'remove remote with a branch without configured merge' '
 test_expect_success 'rename errors out early when deleting non-existent branch' '
 	(
 		cd test &&
-		echo "fatal: No such remote: '\''foo'\''" >expect &&
-		test_must_fail git remote rename foo bar 2>actual &&
-		test_i18ncmp expect actual
+		echo "error: No such remote: '\''foo'\''" >expect &&
+		test_expect_code 2 git remote rename foo bar 2>actual &&
+		test_cmp expect actual
 	)
 '
 
+test_expect_success 'rename errors out early when new name is invalid' '
+	test_config remote.foo.vcs bar &&
+	echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
+	test_must_fail git remote rename foo invalid...name 2>actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'add existing foreign_vcs remote' '
 	test_config remote.foo.vcs bar &&
-	echo "fatal: remote foo already exists." >expect &&
-	test_must_fail git remote add foo bar 2>actual &&
-	test_i18ncmp expect actual
+	echo "error: remote foo already exists." >expect &&
+	test_expect_code 3 git remote add foo bar 2>actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'add existing foreign_vcs remote' '
 	test_config remote.foo.vcs bar &&
 	test_config remote.bar.vcs bar &&
-	echo "fatal: remote bar already exists." >expect &&
-	test_must_fail git remote rename foo bar 2>actual &&
-	test_i18ncmp expect actual
+	echo "error: remote bar already exists." >expect &&
+	test_expect_code 3 git remote rename foo bar 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'add invalid foreign_vcs remote' '
+	echo "fatal: '\''invalid...name'\'' is not a valid remote name" >expect &&
+	test_must_fail git remote add invalid...name bar 2>actual &&
+	test_cmp expect actual
 '
 
 cat >test/expect <<EOF
 * remote origin
   Fetch URL: $(pwd)/one
   Push  URL: $(pwd)/one
-  HEAD branch: master
+  HEAD branch: main
   Remote branches:
-    master new (next fetch will store in remotes/origin)
-    side   tracked
+    main new (next fetch will store in remotes/origin)
+    side tracked
   Local branches configured for 'git pull':
-    ahead    merges with remote master
-    master   merges with remote master
+    ahead    merges with remote main
+    main     merges with remote main
     octopus  merges with remote topic-a
                 and with remote topic-b
                 and with remote topic-c
-    rebase  rebases onto remote master
+    rebase  rebases onto remote main
   Local refs configured for 'git push':
-    master pushes to master   (local out of date)
-    master pushes to upstream (create)
+    main pushes to main     (local out of date)
+    main pushes to upstream (create)
 * remote two
   Fetch URL: ../two
   Push  URL: ../three
-  HEAD branch: master
+  HEAD branch: main
   Local refs configured for 'git push':
-    ahead  forces to master  (fast-forwardable)
-    master pushes to another (up to date)
+    ahead forces to main    (fast-forwardable)
+    main  pushes to another (up to date)
 EOF
 
 test_expect_success 'show' '
 	(
 		cd test &&
-		git config --add remote.origin.fetch refs/heads/master:refs/heads/upstream &&
+		git config --add remote.origin.fetch refs/heads/main:refs/heads/upstream &&
 		git fetch &&
-		git checkout -b ahead origin/master &&
+		git checkout -b ahead origin/main &&
 		echo 1 >>file &&
 		test_tick &&
 		git commit -m update file &&
-		git checkout master &&
-		git branch --track octopus origin/master &&
-		git branch --track rebase origin/master &&
-		git branch -d -r origin/master &&
+		git checkout main &&
+		git branch --track octopus origin/main &&
+		git branch --track rebase origin/main &&
+		git branch -d -r origin/main &&
 		git config --add remote.two.url ../two &&
 		git config --add remote.two.pushurl ../three &&
 		git config branch.rebase.rebase true &&
@@ -245,13 +261,13 @@ test_expect_success 'show' '
 			git commit -m update file
 		) &&
 		git config --add remote.origin.push : &&
-		git config --add remote.origin.push refs/heads/master:refs/heads/upstream &&
+		git config --add remote.origin.push refs/heads/main:refs/heads/upstream &&
 		git config --add remote.origin.push +refs/tags/lastbackup &&
-		git config --add remote.two.push +refs/heads/ahead:refs/heads/master &&
-		git config --add remote.two.push refs/heads/master:refs/heads/another &&
+		git config --add remote.two.push +refs/heads/ahead:refs/heads/main &&
+		git config --add remote.two.push refs/heads/main:refs/heads/another &&
 		git remote show origin two >output &&
 		git branch -d rebase octopus &&
-		test_i18ncmp expect output
+		test_cmp expect output
 	)
 '
 
@@ -261,14 +277,14 @@ cat >test/expect <<EOF
   Push  URL: $(pwd)/one
   HEAD branch: (not queried)
   Remote branches: (status not queried)
-    master
+    main
     side
   Local branches configured for 'git pull':
-    ahead  merges with remote master
-    master merges with remote master
+    ahead merges with remote main
+    main  merges with remote main
   Local refs configured for 'git push' (status not queried):
     (matching)           pushes to (matching)
-    refs/heads/master    pushes to refs/heads/upstream
+    refs/heads/main      pushes to refs/heads/upstream
     refs/tags/lastbackup forces to refs/tags/lastbackup
 EOF
 
@@ -278,7 +294,7 @@ test_expect_success 'show -n' '
 		cd test &&
 		git remote show -n origin >output &&
 		mv ../one.unreachable ../one &&
-		test_i18ncmp expect output
+		test_cmp expect output
 	)
 '
 
@@ -309,7 +325,7 @@ test_expect_success 'set-head --auto' '
 	(
 		cd test &&
 		git remote set-head --auto origin &&
-		echo refs/remotes/origin/master >expect &&
+		echo refs/remotes/origin/main >expect &&
 		git symbolic-ref refs/remotes/origin/HEAD >output &&
 		test_cmp expect output
 	)
@@ -320,8 +336,8 @@ test_expect_success 'set-head --auto has no problem w/multiple HEADs' '
 		cd test &&
 		git fetch two "refs/heads/*:refs/remotes/two/*" &&
 		git remote set-head --auto two >output 2>&1 &&
-		echo "two/HEAD set to master" >expect &&
-		test_i18ncmp expect output
+		echo "two/HEAD set to main" >expect &&
+		test_cmp expect output
 	)
 '
 
@@ -334,7 +350,7 @@ test_expect_success 'set-head explicit' '
 		cd test &&
 		git remote set-head origin side2 &&
 		git symbolic-ref refs/remotes/origin/HEAD >output &&
-		git remote set-head origin master &&
+		git remote set-head origin main &&
 		test_cmp expect output
 	)
 '
@@ -353,7 +369,7 @@ test_expect_success 'prune --dry-run' '
 		git remote prune --dry-run origin >output &&
 		git rev-parse refs/remotes/origin/side2 &&
 		test_must_fail git rev-parse refs/remotes/origin/side &&
-		test_i18ncmp expect output
+		test_cmp expect output
 	)
 '
 
@@ -381,7 +397,7 @@ test_expect_success 'add --mirror && prune' '
 
 test_expect_success 'add --mirror=fetch' '
 	mkdir mirror-fetch &&
-	git init mirror-fetch/parent &&
+	git init -b main mirror-fetch/parent &&
 	(
 		cd mirror-fetch/parent &&
 		test_commit one
@@ -397,7 +413,7 @@ test_expect_success 'fetch mirrors act as mirrors during fetch' '
 	(
 		cd mirror-fetch/parent &&
 		git branch new &&
-		git branch -m master renamed
+		git branch -m main renamed
 	) &&
 	(
 		cd mirror-fetch/child &&
@@ -411,7 +427,7 @@ test_expect_success 'fetch mirrors can prune' '
 	(
 		cd mirror-fetch/child &&
 		git remote prune parent &&
-		test_must_fail git rev-parse --verify refs/heads/master
+		test_must_fail git rev-parse --verify refs/heads/main
 	)
 '
 
@@ -452,7 +468,7 @@ test_expect_success 'fetch mirror respects specific branches' '
 test_expect_success 'add --mirror=push' '
 	mkdir mirror-push &&
 	git init --bare mirror-push/public &&
-	git init mirror-push/private &&
+	git init -b main mirror-push/private &&
 	(
 		cd mirror-push/private &&
 		test_commit one &&
@@ -464,14 +480,14 @@ test_expect_success 'push mirrors act as mirrors during push' '
 	(
 		cd mirror-push/private &&
 		git branch new &&
-		git branch -m master renamed &&
+		git branch -m main renamed &&
 		git push public
 	) &&
 	(
 		cd mirror-push/private &&
 		git rev-parse --verify refs/heads/new &&
 		git rev-parse --verify refs/heads/renamed &&
-		test_must_fail git rev-parse --verify refs/heads/master
+		test_must_fail git rev-parse --verify refs/heads/main
 	)
 '
 
@@ -578,6 +594,7 @@ test_expect_success 'add --no-tags' '
 		cd add-no-tags &&
 		git init &&
 		git remote add -f --no-tags origin ../one &&
+		grep tagOpt .git/config &&
 		git tag -l some-tag >../test/output &&
 		git tag -l foobar-tag >../test/output &&
 		git config remote.origin.tagopt >>../test/output
@@ -597,10 +614,10 @@ test_expect_success 'reject --no-no-tags' '
 '
 
 cat >one/expect <<\EOF
-  apis/master
+  apis/main
   apis/side
   drosophila/another
-  drosophila/master
+  drosophila/main
   drosophila/side
 EOF
 
@@ -617,11 +634,11 @@ test_expect_success 'update' '
 
 cat >one/expect <<\EOF
   drosophila/another
-  drosophila/master
+  drosophila/main
   drosophila/side
-  manduca/master
+  manduca/main
   manduca/side
-  megaloprepus/master
+  megaloprepus/main
   megaloprepus/side
 EOF
 
@@ -660,11 +677,11 @@ test_expect_success 'update --prune' '
 '
 
 cat >one/expect <<-\EOF
-  apis/master
+  apis/main
   apis/side
-  manduca/master
+  manduca/main
   manduca/side
-  megaloprepus/master
+  megaloprepus/main
   megaloprepus/side
 EOF
 
@@ -684,7 +701,7 @@ test_expect_success 'update default' '
 
 cat >one/expect <<\EOF
   drosophila/another
-  drosophila/master
+  drosophila/main
   drosophila/side
 EOF
 
@@ -734,15 +751,55 @@ test_expect_success 'reject adding remote with an invalid name' '
 # the last two ones check if the config is updated.
 
 test_expect_success 'rename a remote' '
+	test_config_global remote.pushDefault origin &&
 	git clone one four &&
 	(
 		cd four &&
+		git config branch.main.pushRemote origin &&
 		git remote rename origin upstream &&
+		grep "pushRemote" .git/config &&
 		test -z "$(git for-each-ref refs/remotes/origin)" &&
-		test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/master" &&
-		test "$(git rev-parse upstream/master)" = "$(git rev-parse master)" &&
+		test "$(git symbolic-ref refs/remotes/upstream/HEAD)" = "refs/remotes/upstream/main" &&
+		test "$(git rev-parse upstream/main)" = "$(git rev-parse main)" &&
 		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/remotes/upstream/*" &&
-		test "$(git config branch.master.remote)" = "upstream"
+		test "$(git config branch.main.remote)" = "upstream" &&
+		test "$(git config branch.main.pushRemote)" = "upstream" &&
+		test "$(git config --global remote.pushDefault)" = "origin"
+	)
+'
+
+test_expect_success 'rename a remote renames repo remote.pushDefault' '
+	git clone one four.1 &&
+	(
+		cd four.1 &&
+		git config remote.pushDefault origin &&
+		git remote rename origin upstream &&
+		grep pushDefault .git/config &&
+		test "$(git config --local remote.pushDefault)" = "upstream"
+	)
+'
+
+test_expect_success 'rename a remote renames repo remote.pushDefault but ignores global' '
+	test_config_global remote.pushDefault other &&
+	git clone one four.2 &&
+	(
+		cd four.2 &&
+		git config remote.pushDefault origin &&
+		git remote rename origin upstream &&
+		test "$(git config --global remote.pushDefault)" = "other" &&
+		test "$(git config --local remote.pushDefault)" = "upstream"
+	)
+'
+
+test_expect_success 'rename a remote renames repo remote.pushDefault but keeps global' '
+	test_config_global remote.pushDefault origin &&
+	git clone one four.3 &&
+	(
+		cd four.3 &&
+		git config remote.pushDefault origin &&
+		git remote rename origin upstream &&
+		test "$(git config --global remote.pushDefault)" = "origin" &&
+		test "$(git config --local remote.pushDefault)" = "upstream"
 	)
 '
 
@@ -753,7 +810,7 @@ test_expect_success 'rename does not update a non-default fetch refspec' '
 		git config remote.origin.fetch +refs/heads/*:refs/heads/origin/* &&
 		git remote rename origin upstream &&
 		test "$(git config remote.upstream.fetch)" = "+refs/heads/*:refs/heads/origin/*" &&
-		git rev-parse -q origin/master
+		git rev-parse -q origin/main
 	)
 '
 
@@ -773,7 +830,7 @@ test_expect_success 'rename a remote with name prefix of other remote' '
 		cd four.three &&
 		git remote add o git://example.com/repo.git &&
 		git remote rename o upstream &&
-		test "$(git rev-parse origin/master)" = "$(git rev-parse master)"
+		test "$(git rev-parse origin/main)" = "$(git rev-parse main)"
 	)
 '
 
@@ -784,11 +841,59 @@ test_expect_success 'rename succeeds with existing remote.<target>.prune' '
 	git -C four.four remote rename origin upstream
 '
 
+test_expect_success 'remove a remote' '
+	test_config_global remote.pushDefault origin &&
+	git clone one four.five &&
+	(
+		cd four.five &&
+		git config branch.main.pushRemote origin &&
+		git remote remove origin &&
+		test -z "$(git for-each-ref refs/remotes/origin)" &&
+		test_must_fail git config branch.main.remote &&
+		test_must_fail git config branch.main.pushRemote &&
+		test "$(git config --global remote.pushDefault)" = "origin"
+	)
+'
+
+test_expect_success 'remove a remote removes repo remote.pushDefault' '
+	git clone one four.five.1 &&
+	(
+		cd four.five.1 &&
+		git config remote.pushDefault origin &&
+		git remote remove origin &&
+		test_must_fail git config --local remote.pushDefault
+	)
+'
+
+test_expect_success 'remove a remote removes repo remote.pushDefault but ignores global' '
+	test_config_global remote.pushDefault other &&
+	git clone one four.five.2 &&
+	(
+		cd four.five.2 &&
+		git config remote.pushDefault origin &&
+		git remote remove origin &&
+		test "$(git config --global remote.pushDefault)" = "other" &&
+		test_must_fail git config --local remote.pushDefault
+	)
+'
+
+test_expect_success 'remove a remote removes repo remote.pushDefault but keeps global' '
+	test_config_global remote.pushDefault origin &&
+	git clone one four.five.3 &&
+	(
+		cd four.five.3 &&
+		git config remote.pushDefault origin &&
+		git remote remove origin &&
+		test "$(git config --global remote.pushDefault)" = "origin" &&
+		test_must_fail git config --local remote.pushDefault
+	)
+'
+
 cat >remotes_origin <<EOF
 URL: $(pwd)/one
-Push: refs/heads/master:refs/heads/upstream
+Push: refs/heads/main:refs/heads/upstream
 Push: refs/heads/next:refs/heads/upstream2
-Pull: refs/heads/master:refs/heads/origin
+Pull: refs/heads/main:refs/heads/origin
 Pull: refs/heads/next:refs/heads/origin2
 EOF
 
@@ -804,11 +909,11 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
 		test_path_is_missing .git/remotes/origin &&
 		test "$(git config remote.origin.url)" = "$origin_url" &&
 		cat >push_expected <<-\EOF &&
-		refs/heads/master:refs/heads/upstream
+		refs/heads/main:refs/heads/upstream
 		refs/heads/next:refs/heads/upstream2
 		EOF
 		cat >fetch_expected <<-\EOF &&
-		refs/heads/master:refs/heads/origin
+		refs/heads/main:refs/heads/origin
 		refs/heads/next:refs/heads/origin2
 		EOF
 		git config --get-all remote.origin.push >push_actual &&
@@ -824,12 +929,12 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
 	(
 		cd six &&
 		git remote rm origin &&
-		echo "$origin_url" >.git/branches/origin &&
+		echo "$origin_url#main" >.git/branches/origin &&
 		git remote rename origin origin &&
 		test_path_is_missing .git/branches/origin &&
 		test "$(git config remote.origin.url)" = "$origin_url" &&
-		test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin" &&
-		test "$(git config remote.origin.push)" = "HEAD:refs/heads/master"
+		test "$(git config remote.origin.fetch)" = "refs/heads/main:refs/heads/origin" &&
+		test "$(git config remote.origin.push)" = "HEAD:refs/heads/main"
 	)
 '
 
@@ -852,7 +957,7 @@ test_expect_success 'remote prune to cause a dangling symref' '
 	(
 		cd one &&
 		git checkout side2 &&
-		git branch -D master
+		git branch -D main
 	) &&
 	(
 		cd eight &&
@@ -895,24 +1000,24 @@ test_expect_success 'remote set-branches' '
 	EOF
 	sort <<-\EOF >expect.replace &&
 	+refs/heads/maint:refs/remotes/scratch/maint
-	+refs/heads/master:refs/remotes/scratch/master
+	+refs/heads/main:refs/remotes/scratch/main
 	+refs/heads/next:refs/remotes/scratch/next
 	EOF
 	sort <<-\EOF >expect.add-two &&
 	+refs/heads/maint:refs/remotes/scratch/maint
-	+refs/heads/master:refs/remotes/scratch/master
+	+refs/heads/main:refs/remotes/scratch/main
 	+refs/heads/next:refs/remotes/scratch/next
-	+refs/heads/pu:refs/remotes/scratch/pu
+	+refs/heads/seen:refs/remotes/scratch/seen
 	+refs/heads/t/topic:refs/remotes/scratch/t/topic
 	EOF
 	sort <<-\EOF >expect.setup-ffonly &&
-	refs/heads/master:refs/remotes/scratch/master
+	refs/heads/main:refs/remotes/scratch/main
 	+refs/heads/next:refs/remotes/scratch/next
 	EOF
 	sort <<-\EOF >expect.respect-ffonly &&
-	refs/heads/master:refs/remotes/scratch/master
+	refs/heads/main:refs/remotes/scratch/main
 	+refs/heads/next:refs/remotes/scratch/next
-	+refs/heads/pu:refs/remotes/scratch/pu
+	+refs/heads/seen:refs/remotes/scratch/seen
 	EOF
 
 	git clone .git/ setbranches &&
@@ -926,23 +1031,23 @@ test_expect_success 'remote set-branches' '
 		git config --get-all remote.scratch.fetch >config-result &&
 		sort <config-result >../actual.add &&
 
-		git remote set-branches scratch maint master next &&
+		git remote set-branches scratch maint main next &&
 		git config --get-all remote.scratch.fetch >config-result &&
 		sort <config-result >../actual.replace &&
 
-		git remote set-branches --add scratch pu t/topic &&
+		git remote set-branches --add scratch seen t/topic &&
 		git config --get-all remote.scratch.fetch >config-result &&
 		sort <config-result >../actual.add-two &&
 
 		git config --unset-all remote.scratch.fetch &&
 		git config remote.scratch.fetch \
-			refs/heads/master:refs/remotes/scratch/master &&
+			refs/heads/main:refs/remotes/scratch/main &&
 		git config --add remote.scratch.fetch \
 			+refs/heads/next:refs/remotes/scratch/next &&
 		git config --get-all remote.scratch.fetch >config-result &&
 		sort <config-result >../actual.setup-ffonly &&
 
-		git remote set-branches --add scratch pu &&
+		git remote set-branches --add scratch seen &&
 		git config --get-all remote.scratch.fetch >config-result &&
 		sort <config-result >../actual.respect-ffonly
 	) &&
@@ -956,14 +1061,14 @@ test_expect_success 'remote set-branches' '
 
 test_expect_success 'remote set-branches with --mirror' '
 	echo "+refs/*:refs/*" >expect.initial &&
-	echo "+refs/heads/master:refs/heads/master" >expect.replace &&
+	echo "+refs/heads/main:refs/heads/main" >expect.replace &&
 	git clone --mirror .git/ setbranches-mirror &&
 	(
 		cd setbranches-mirror &&
 		git remote rename origin scratch &&
 		git config --get-all remote.scratch.fetch >../actual.initial &&
 
-		git remote set-branches scratch heads/master &&
+		git remote set-branches scratch heads/main &&
 		git config --get-all remote.scratch.fetch >../actual.replace
 	) &&
 	test_cmp expect.initial actual.initial &&
@@ -1209,7 +1314,7 @@ test_extra_arg () {
 test_extra_arg add nick url
 test_extra_arg rename origin newname
 test_extra_arg remove origin
-test_extra_arg set-head origin master
+test_extra_arg set-head origin main
 # set-branches takes any number of args
 test_extra_arg get-url origin newurl
 test_extra_arg set-url origin newurl oldurl
@@ -1226,7 +1331,7 @@ test_expect_success 'unqualified <dst> refspec DWIM and advice' '
 	test_when_finished "(cd test && git tag -d some-tag)" &&
 	(
 		cd test &&
-		git tag -a -m "Some tag" some-tag master &&
+		git tag -a -m "Some tag" some-tag main &&
 		exit_with=true &&
 		for type in commit tag tree blob
 		do
@@ -1252,7 +1357,7 @@ test_expect_success 'unqualified <dst> refspec DWIM and advice' '
 test_expect_success 'refs/remotes/* <src> refspec and unqualified <dst> DWIM and advice' '
 	(
 		cd two &&
-		git tag -a -m "Some tag" my-tag master &&
+		git tag -a -m "Some tag" my-tag main &&
 		git update-ref refs/trees/my-head-tree HEAD^{tree} &&
 		git update-ref refs/blobs/my-file-blob HEAD:file
 	) &&
diff --git a/t/t5506-remote-groups.sh b/t/t5506-remote-groups.sh
index 83d5558c0e..8f150c0793 100755
--- a/t/t5506-remote-groups.sh
+++ b/t/t5506-remote-groups.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git remote group handling'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 mark() {
@@ -31,8 +34,8 @@ repo_fetched() {
 test_expect_success 'setup' '
 	mkdir one && (cd one && git init) &&
 	mkdir two && (cd two && git init) &&
-	git remote add -m master one one &&
-	git remote add -m master two two
+	git remote add -m main one one &&
+	git remote add -m main two two
 '
 
 test_expect_success 'no group updates all' '
diff --git a/t/t5509-fetch-push-namespaces.sh b/t/t5509-fetch-push-namespaces.sh
index 75cbfcc392..31553b48df 100755
--- a/t/t5509-fetch-push-namespaces.sh
+++ b/t/t5509-fetch-push-namespaces.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='fetch/push involving ref namespaces'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -20,16 +23,16 @@ test_expect_success setup '
 	) &&
 	commit0=$(cd original && git rev-parse HEAD^) &&
 	commit1=$(cd original && git rev-parse HEAD) &&
-	git init pushee &&
+	git init --bare pushee &&
 	git init puller
 '
 
 test_expect_success 'pushing into a repository using a ref namespace' '
 	(
 		cd original &&
-		git push pushee-namespaced master &&
+		git push pushee-namespaced main &&
 		git ls-remote pushee-namespaced >actual &&
-		printf "$commit1\trefs/heads/master\n" >expected &&
+		printf "$commit1\trefs/heads/main\n" >expected &&
 		test_cmp expected actual &&
 		git push pushee-namespaced --tags &&
 		git ls-remote pushee-namespaced >actual &&
@@ -56,7 +59,7 @@ test_expect_success 'pulling from a repository using a ref namespace' '
 		cd puller &&
 		git remote add -f pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
 		git for-each-ref refs/ >actual &&
-		printf "$commit1 commit\trefs/remotes/pushee-namespaced/master\n" >expected &&
+		printf "$commit1 commit\trefs/remotes/pushee-namespaced/main\n" >expected &&
 		printf "$commit0 commit\trefs/tags/0\n" >>expected &&
 		printf "$commit1 commit\trefs/tags/1\n" >>expected &&
 		test_cmp expected actual
@@ -76,7 +79,7 @@ test_expect_success 'mirroring a repository using a ref namespace' '
 	(
 		cd mirror &&
 		git for-each-ref refs/ >actual &&
-		printf "$commit1 commit\trefs/namespaces/namespace/refs/heads/master\n" >expected &&
+		printf "$commit1 commit\trefs/namespaces/namespace/refs/heads/main\n" >expected &&
 		printf "$commit0 commit\trefs/namespaces/namespace/refs/tags/0\n" >>expected &&
 		printf "$commit1 commit\trefs/namespaces/namespace/refs/tags/1\n" >>expected &&
 		test_cmp expected actual
@@ -87,7 +90,7 @@ test_expect_success 'hide namespaced refs with transfer.hideRefs' '
 	GIT_NAMESPACE=namespace \
 		git -C pushee -c transfer.hideRefs=refs/tags \
 		ls-remote "ext::git %s ." >actual &&
-	printf "$commit1\trefs/heads/master\n" >expected &&
+	printf "$commit1\trefs/heads/main\n" >expected &&
 	test_cmp expected actual
 '
 
@@ -95,7 +98,7 @@ test_expect_success 'check that transfer.hideRefs does not match unstripped refs
 	GIT_NAMESPACE=namespace \
 		git -C pushee -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
 		ls-remote "ext::git %s ." >actual &&
-	printf "$commit1\trefs/heads/master\n" >expected &&
+	printf "$commit1\trefs/heads/main\n" >expected &&
 	printf "$commit0\trefs/tags/0\n" >>expected &&
 	printf "$commit1\trefs/tags/1\n" >>expected &&
 	test_cmp expected actual
@@ -105,23 +108,23 @@ test_expect_success 'hide full refs with transfer.hideRefs' '
 	GIT_NAMESPACE=namespace \
 		git -C pushee -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
 		ls-remote "ext::git %s ." >actual &&
-	printf "$commit1\trefs/heads/master\n" >expected &&
+	printf "$commit1\trefs/heads/main\n" >expected &&
 	test_cmp expected actual
 '
 
 test_expect_success 'try to update a hidden ref' '
-	test_config -C pushee transfer.hideRefs refs/heads/master &&
-	test_must_fail git -C original push pushee-namespaced master
+	test_config -C pushee transfer.hideRefs refs/heads/main &&
+	test_must_fail git -C original push pushee-namespaced main
 '
 
 test_expect_success 'try to update a ref that is not hidden' '
-	test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/master &&
-	git -C original push pushee-namespaced master
+	test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/main &&
+	git -C original push pushee-namespaced main
 '
 
 test_expect_success 'try to update a hidden full ref' '
-	test_config -C pushee transfer.hideRefs "^refs/namespaces/namespace/refs/heads/master" &&
-	test_must_fail git -C original push pushee-namespaced master
+	test_config -C pushee transfer.hideRefs "^refs/namespaces/namespace/refs/heads/main" &&
+	test_must_fail git -C original push pushee-namespaced main
 '
 
 test_expect_success 'set up ambiguous HEAD' '
@@ -152,4 +155,15 @@ test_expect_success 'clone chooses correct HEAD (v2)' '
 	test_cmp expect actual
 '
 
+test_expect_success 'denyCurrentBranch and unborn branch with ref namespace' '
+	(
+		cd original &&
+		git init unborn &&
+		git remote add unborn-namespaced "ext::git --namespace=namespace %s unborn" &&
+		test_must_fail git push unborn-namespaced HEAD:main &&
+		git -C unborn config receive.denyCurrentBranch updateInstead &&
+		git push unborn-namespaced HEAD:main
+	)
+'
+
 test_done
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 4b60282689..a0faf0dd94 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -5,27 +5,20 @@ 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
 
 D=$(pwd)
 
-test_bundle_object_count () {
-	git verify-pack -v "$1" >verify.out &&
-	test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l)
-}
-
-convert_bundle_to_pack () {
-	while read x && test -n "$x"
-	do
-		:;
-	done
-	cat
-}
-
 test_expect_success setup '
 	echo >file original &&
 	git add file &&
-	git commit -a -m original'
+	git commit -a -m original &&
+	git branch -M main
+'
 
 test_expect_success "clone and setup child repos" '
 	git clone . one &&
@@ -37,19 +30,19 @@ test_expect_success "clone and setup child repos" '
 	git clone . two &&
 	(
 		cd two &&
-		git config branch.master.remote one &&
+		git config branch.main.remote one &&
 		git config remote.one.url ../one/.git/ &&
-		git config remote.one.fetch refs/heads/master:refs/heads/one
+		git config remote.one.fetch refs/heads/main:refs/heads/one
 	) &&
 	git clone . three &&
 	(
 		cd three &&
-		git config branch.master.remote two &&
-		git config branch.master.merge refs/heads/one &&
+		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/master:refs/heads/two"
+			echo "Pull: refs/heads/main:refs/heads/two"
 			echo "Pull: refs/heads/one:refs/heads/one"
 		} >.git/remotes/two
 	) &&
@@ -65,7 +58,7 @@ test_expect_success "fetch test" '
 	git fetch &&
 	git rev-parse --verify refs/heads/one &&
 	mine=$(git rev-parse refs/heads/one) &&
-	his=$(cd ../one && git rev-parse refs/heads/master) &&
+	his=$(cd ../one && git rev-parse refs/heads/main) &&
 	test "z$mine" = "z$his"
 '
 
@@ -75,11 +68,11 @@ test_expect_success "fetch test for-merge" '
 	git fetch &&
 	git rev-parse --verify refs/heads/two &&
 	git rev-parse --verify refs/heads/one &&
-	master_in_two=$(cd ../two && git rev-parse master) &&
+	main_in_two=$(cd ../two && git rev-parse main) &&
 	one_in_two=$(cd ../two && git rev-parse one) &&
 	{
 		echo "$one_in_two	"
-		echo "$master_in_two	not-for-merge"
+		echo "$main_in_two	not-for-merge"
 	} >expected &&
 	cut -f -2 .git/FETCH_HEAD >actual &&
 	test_cmp expected actual'
@@ -88,7 +81,7 @@ test_expect_success 'fetch --prune on its own works as expected' '
 	cd "$D" &&
 	git clone . prune &&
 	cd prune &&
-	git update-ref refs/remotes/origin/extrabranch master &&
+	git update-ref refs/remotes/origin/extrabranch main &&
 
 	git fetch --prune origin &&
 	test_must_fail git rev-parse origin/extrabranch
@@ -98,9 +91,9 @@ test_expect_success 'fetch --prune with a branch name keeps branches' '
 	cd "$D" &&
 	git clone . prune-branch &&
 	cd prune-branch &&
-	git update-ref refs/remotes/origin/extrabranch master &&
+	git update-ref refs/remotes/origin/extrabranch main &&
 
-	git fetch --prune origin master &&
+	git fetch --prune origin main &&
 	git rev-parse origin/extrabranch
 '
 
@@ -110,18 +103,18 @@ test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
 	cd prune-namespace &&
 
 	git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
-	git rev-parse origin/master
+	git rev-parse origin/main
 '
 
 test_expect_success 'fetch --prune handles overlapping refspecs' '
 	cd "$D" &&
-	git update-ref refs/pull/42/head master &&
+	git update-ref refs/pull/42/head main &&
 	git clone . prune-overlapping &&
 	cd prune-overlapping &&
 	git config --add remote.origin.fetch refs/pull/*/head:refs/remotes/origin/pr/* &&
 
 	git fetch --prune origin &&
-	git rev-parse origin/master &&
+	git rev-parse origin/main &&
 	git rev-parse origin/pr/42 &&
 
 	git config --unset-all remote.origin.fetch &&
@@ -129,7 +122,7 @@ test_expect_success 'fetch --prune handles overlapping refspecs' '
 	git config --add remote.origin.fetch refs/heads/*:refs/remotes/origin/* &&
 
 	git fetch --prune origin &&
-	git rev-parse origin/master &&
+	git rev-parse origin/main &&
 	git rev-parse origin/pr/42
 '
 
@@ -137,13 +130,13 @@ test_expect_success 'fetch --prune --tags prunes branches but not tags' '
 	cd "$D" &&
 	git clone . prune-tags &&
 	cd prune-tags &&
-	git tag sometag master &&
+	git tag sometag main &&
 	# Create what looks like a remote-tracking branch from an earlier
 	# fetch that has since been deleted from the remote:
-	git update-ref refs/remotes/origin/fake-remote master &&
+	git update-ref refs/remotes/origin/fake-remote main &&
 
 	git fetch --prune --tags origin &&
-	git rev-parse origin/master &&
+	git rev-parse origin/main &&
 	test_must_fail git rev-parse origin/fake-remote &&
 	git rev-parse sometag
 '
@@ -152,10 +145,10 @@ test_expect_success 'fetch --prune --tags with branch does not prune other thing
 	cd "$D" &&
 	git clone . prune-tags-branch &&
 	cd prune-tags-branch &&
-	git tag sometag master &&
-	git update-ref refs/remotes/origin/extrabranch master &&
+	git tag sometag main &&
+	git update-ref refs/remotes/origin/extrabranch main &&
 
-	git fetch --prune --tags origin master &&
+	git fetch --prune --tags origin main &&
 	git rev-parse origin/extrabranch &&
 	git rev-parse sometag
 '
@@ -164,9 +157,9 @@ test_expect_success 'fetch --prune --tags with refspec prunes based on refspec'
 	cd "$D" &&
 	git clone . prune-tags-refspec &&
 	cd prune-tags-refspec &&
-	git tag sometag master &&
-	git update-ref refs/remotes/origin/foo/otherbranch master &&
-	git update-ref refs/remotes/origin/extrabranch master &&
+	git tag sometag main &&
+	git update-ref refs/remotes/origin/foo/otherbranch main &&
+	git update-ref refs/remotes/origin/extrabranch main &&
 
 	git fetch --prune --tags origin refs/heads/foo/*:refs/remotes/origin/foo/* &&
 	test_must_fail git rev-parse refs/remotes/origin/foo/otherbranch &&
@@ -174,6 +167,198 @@ test_expect_success 'fetch --prune --tags with refspec prunes based on refspec'
 	git rev-parse sometag
 '
 
+test_expect_success 'fetch --atomic works with a single branch' '
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	git branch atomic-branch &&
+	oid=$(git rev-parse atomic-branch) &&
+	echo "$oid" >expected &&
+
+	git -C atomic fetch --atomic origin &&
+	git -C atomic rev-parse origin/atomic-branch >actual &&
+	test_cmp expected actual &&
+	test $oid = "$(git -C atomic rev-parse --verify FETCH_HEAD)"
+'
+
+test_expect_success 'fetch --atomic works with multiple branches' '
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	git branch atomic-branch-1 &&
+	git branch atomic-branch-2 &&
+	git branch atomic-branch-3 &&
+	git rev-parse refs/heads/atomic-branch-1 refs/heads/atomic-branch-2 refs/heads/atomic-branch-3 >actual &&
+
+	git -C atomic fetch --atomic origin &&
+	git -C atomic rev-parse refs/remotes/origin/atomic-branch-1 refs/remotes/origin/atomic-branch-2 refs/remotes/origin/atomic-branch-3 >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'fetch --atomic works with mixed branches and tags' '
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	git branch atomic-mixed-branch &&
+	git tag atomic-mixed-tag &&
+	git rev-parse refs/heads/atomic-mixed-branch refs/tags/atomic-mixed-tag >actual &&
+
+	git -C atomic fetch --tags --atomic origin &&
+	git -C atomic rev-parse refs/remotes/origin/atomic-mixed-branch refs/tags/atomic-mixed-tag >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'fetch --atomic prunes references' '
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git branch atomic-prune-delete &&
+	git clone . atomic &&
+	git branch --delete atomic-prune-delete &&
+	git branch atomic-prune-create &&
+	git rev-parse refs/heads/atomic-prune-create >actual &&
+
+	git -C atomic fetch --prune --atomic origin &&
+	test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-prune-delete &&
+	git -C atomic rev-parse refs/remotes/origin/atomic-prune-create >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'fetch --atomic aborts with non-fast-forward update' '
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git branch atomic-non-ff &&
+	git clone . atomic &&
+	git rev-parse HEAD >actual &&
+
+	git branch atomic-new-branch &&
+	parent_commit=$(git rev-parse atomic-non-ff~) &&
+	git update-ref refs/heads/atomic-non-ff $parent_commit &&
+
+	test_must_fail git -C atomic fetch --atomic origin refs/heads/*:refs/remotes/origin/* &&
+	test_must_fail git -C atomic rev-parse refs/remotes/origin/atomic-new-branch &&
+	git -C atomic rev-parse refs/remotes/origin/atomic-non-ff >expected &&
+	test_cmp expected actual &&
+	test_must_be_empty atomic/.git/FETCH_HEAD
+'
+
+test_expect_success 'fetch --atomic executes a single reference transaction only' '
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	git branch atomic-hooks-1 &&
+	git branch atomic-hooks-2 &&
+	head_oid=$(git rev-parse HEAD) &&
+
+	cat >expected <<-EOF &&
+		prepared
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
+		committed
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-1
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-2
+	EOF
+
+	rm -f atomic/actual &&
+	write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
+		( echo "$*" && cat ) >>actual
+	EOF
+
+	git -C atomic fetch --atomic origin &&
+	test_cmp expected atomic/actual
+'
+
+test_expect_success 'fetch --atomic aborts all reference updates if hook aborts' '
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	git branch atomic-hooks-abort-1 &&
+	git branch atomic-hooks-abort-2 &&
+	git branch atomic-hooks-abort-3 &&
+	git tag atomic-hooks-abort &&
+	head_oid=$(git rev-parse HEAD) &&
+
+	cat >expected <<-EOF &&
+		prepared
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
+		$ZERO_OID $head_oid refs/tags/atomic-hooks-abort
+		aborted
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-1
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-2
+		$ZERO_OID $head_oid refs/remotes/origin/atomic-hooks-abort-3
+		$ZERO_OID $head_oid refs/tags/atomic-hooks-abort
+	EOF
+
+	rm -f atomic/actual &&
+	write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
+		( echo "$*" && cat ) >>actual
+		exit 1
+	EOF
+
+	git -C atomic for-each-ref >expected-refs &&
+	test_must_fail git -C atomic fetch --tags --atomic origin &&
+	git -C atomic for-each-ref >actual-refs &&
+	test_cmp expected-refs actual-refs &&
+	test_must_be_empty atomic/.git/FETCH_HEAD
+'
+
+test_expect_success 'fetch --atomic --append appends to FETCH_HEAD' '
+	test_when_finished "rm -rf \"$D\"/atomic" &&
+
+	cd "$D" &&
+	git clone . atomic &&
+	oid=$(git rev-parse HEAD) &&
+
+	git branch atomic-fetch-head-1 &&
+	git -C atomic fetch --atomic origin atomic-fetch-head-1 &&
+	test_line_count = 1 atomic/.git/FETCH_HEAD &&
+
+	git branch atomic-fetch-head-2 &&
+	git -C atomic fetch --atomic --append origin atomic-fetch-head-2 &&
+	test_line_count = 2 atomic/.git/FETCH_HEAD &&
+	cp atomic/.git/FETCH_HEAD expected &&
+
+	write_script atomic/.git/hooks/reference-transaction <<-\EOF &&
+		exit 1
+	EOF
+
+	git branch atomic-fetch-head-3 &&
+	test_must_fail git -C atomic fetch --atomic --append origin atomic-fetch-head-3 &&
+	test_cmp expected atomic/.git/FETCH_HEAD
+'
+
+test_expect_success '--refmap="" ignores configured refspec' '
+	cd "$TRASH_DIRECTORY" &&
+	git clone "$D" remote-refs &&
+	git -C remote-refs rev-parse remotes/origin/main >old &&
+	git -C remote-refs update-ref refs/remotes/origin/main main~1 &&
+	git -C remote-refs rev-parse remotes/origin/main >new &&
+	git -C remote-refs fetch --refmap= origin "+refs/heads/*:refs/hidden/origin/*" &&
+	git -C remote-refs rev-parse remotes/origin/main >actual &&
+	test_cmp new actual &&
+	git -C remote-refs fetch origin &&
+	git -C remote-refs rev-parse remotes/origin/main >actual &&
+	test_cmp old actual
+'
+
+test_expect_success '--refmap="" and --prune' '
+	git -C remote-refs update-ref refs/remotes/origin/foo/otherbranch main &&
+	git -C remote-refs update-ref refs/hidden/foo/otherbranch main &&
+	git -C remote-refs fetch --prune --refmap="" origin +refs/heads/*:refs/hidden/* &&
+	git -C remote-refs rev-parse remotes/origin/foo/otherbranch &&
+	test_must_fail git -C remote-refs rev-parse refs/hidden/foo/otherbranch &&
+	git -C remote-refs fetch --prune origin &&
+	test_must_fail git -C remote-refs rev-parse remotes/origin/foo/otherbranch
+'
+
 test_expect_success 'fetch tags when there is no tags' '
 
     cd "$D" &&
@@ -189,7 +374,7 @@ test_expect_success 'fetch tags when there is no tags' '
 test_expect_success 'fetch following tags' '
 
 	cd "$D" &&
-	git tag -a -m 'annotated' anno HEAD &&
+	git tag -a -m "annotated" anno HEAD &&
 	git tag light HEAD &&
 
 	mkdir four &&
@@ -226,7 +411,7 @@ test_expect_success 'fetch uses remote ref names to describe new refs' '
 		test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
 		test_i18ngrep "new ref.* -> crazy$" actual
 	) &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'fetch must not resolve short tag name' '
@@ -257,39 +442,42 @@ test_expect_success 'create bundle 1' '
 	cd "$D" &&
 	echo >file updated again by origin &&
 	git commit -a -m "tip" &&
-	git bundle create bundle1 master^..master
+	git bundle create --version=3 bundle1 main^..main
 '
 
 test_expect_success 'header of bundle looks right' '
-	head -n 1 "$D"/bundle1 | grep "^#" &&
-	head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
-	head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
-	head -n 4 "$D"/bundle1 | grep "^$"
+	cat >expect <<-EOF &&
+	# v3 git bundle
+	@object-format=$(test_oid algo)
+	-OID updated by origin
+	OID refs/heads/main
+
+	EOF
+	sed -e "s/$OID_REGEX/OID/g" -e "5q" "$D"/bundle1 >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'create bundle 2' '
 	cd "$D" &&
-	git bundle create bundle2 master~2..master
+	git bundle create bundle2 main~2..main
 '
 
 test_expect_success 'unbundle 1' '
 	cd "$D/bundle" &&
 	git checkout -b some-branch &&
-	test_must_fail git fetch "$D/bundle1" master:master
+	test_must_fail git fetch "$D/bundle1" main:main
 '
 
 
 test_expect_success 'bundle 1 has only 3 files ' '
 	cd "$D" &&
-	convert_bundle_to_pack <bundle1 >bundle.pack &&
-	git index-pack bundle.pack &&
-	test_bundle_object_count bundle.pack 3
+	test_bundle_object_count bundle1 3
 '
 
 test_expect_success 'unbundle 2' '
 	cd "$D/bundle" &&
-	git fetch ../bundle2 master:master &&
-	test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
+	git fetch ../bundle2 main:main &&
+	test "tip" = "$(git log -1 --pretty=oneline main | cut -d" " -f2)"
 '
 
 test_expect_success 'bundle does not prerequisite objects' '
@@ -298,22 +486,20 @@ test_expect_success 'bundle does not prerequisite objects' '
 	git add file2 &&
 	git commit -m add.file2 file2 &&
 	git bundle create bundle3 -1 HEAD &&
-	convert_bundle_to_pack <bundle3 >bundle.pack &&
-	git index-pack bundle.pack &&
-	test_bundle_object_count bundle.pack 3
+	test_bundle_object_count bundle3 3
 '
 
 test_expect_success 'bundle should be able to create a full history' '
 
 	cd "$D" &&
-	git tag -a -m '1.0' v1.0 master &&
+	git tag -a -m "1.0" v1.0 main &&
 	git bundle create bundle4 v1.0
 
 '
 
 test_expect_success 'fetch with a non-applying branch.<name>.merge' '
-	git config branch.master.remote yeti &&
-	git config branch.master.merge refs/heads/bigfoot &&
+	git config branch.main.remote yeti &&
+	git config branch.main.merge refs/heads/bigfoot &&
 	git config remote.blub.url one &&
 	git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
 	git fetch blub
@@ -333,8 +519,8 @@ test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge
 # the merge spec matches the branch the remote HEAD points to
 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
 	one_ref=$(cd one && git symbolic-ref HEAD) &&
-	git config branch.master.remote blub &&
-	git config branch.master.merge "$one_ref" &&
+	git config branch.main.remote blub &&
+	git config branch.main.merge "$one_ref" &&
 	git update-ref -d FETCH_HEAD &&
 	git fetch one &&
 	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
@@ -344,7 +530,7 @@ test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge
 # URL supplied to fetch matches the url of the configured branch's remote, but
 # the merge spec does not match the branch the remote HEAD points to
 test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
-	git config branch.master.merge "${one_ref}_not" &&
+	git config branch.main.merge "${one_ref}_not" &&
 	git update-ref -d FETCH_HEAD &&
 	git fetch one &&
 	test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
@@ -354,16 +540,15 @@ test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge
 # the strange name is: a\!'b
 test_expect_success 'quoting of a strangely named repo' '
 	test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
-	cat result &&
 	grep "fatal: '\''a\\\\!'\''b'\''" result
 '
 
 test_expect_success 'bundle should record HEAD correctly' '
 
 	cd "$D" &&
-	git bundle create bundle5 HEAD master &&
+	git bundle create bundle5 HEAD main &&
 	git bundle list-heads bundle5 >actual &&
-	for h in HEAD refs/heads/master
+	for h in HEAD refs/heads/main
 	do
 		echo "$(git rev-parse --verify $h) $h"
 	done >expect &&
@@ -371,10 +556,10 @@ test_expect_success 'bundle should record HEAD correctly' '
 
 '
 
-test_expect_success 'mark initial state of origin/master' '
+test_expect_success 'mark initial state of origin/main' '
 	(
 		cd three &&
-		git tag base-origin-master refs/remotes/origin/master
+		git tag base-origin-main refs/remotes/origin/main
 	)
 '
 
@@ -384,10 +569,10 @@ test_expect_success 'explicit fetch should update tracking' '
 	git branch -f side &&
 	(
 		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git fetch origin master &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git fetch origin main &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
 		test "$o" != "$n" &&
 		test_must_fail git rev-parse --verify refs/remotes/origin/side
 	)
@@ -399,10 +584,10 @@ test_expect_success 'explicit pull should update tracking' '
 	git branch -f side &&
 	(
 		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git pull origin master &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git pull origin main &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
 		test "$o" != "$n" &&
 		test_must_fail git rev-parse --verify refs/remotes/origin/side
 	)
@@ -421,13 +606,13 @@ test_expect_success 'explicit --refmap option overrides remote.*.fetch' '
 	git branch -f side &&
 	(
 		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin master &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git fetch --refmap="refs/heads/*:refs/remotes/other/*" origin main &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
 		test "$o" = "$n" &&
 		test_must_fail git rev-parse --verify refs/remotes/origin/side &&
-		git rev-parse --verify refs/remotes/other/master
+		git rev-parse --verify refs/remotes/other/main
 	)
 '
 
@@ -436,10 +621,10 @@ test_expect_success 'explicitly empty --refmap option disables remote.*.fetch' '
 	git branch -f side &&
 	(
 		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git fetch --refmap="" origin master &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git fetch --refmap="" origin main &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
 		test "$o" = "$n" &&
 		test_must_fail git rev-parse --verify refs/remotes/origin/side
 	)
@@ -451,10 +636,10 @@ test_expect_success 'configured fetch updates tracking' '
 	git branch -f side &&
 	(
 		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
 		git fetch origin &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
 		test "$o" != "$n" &&
 		git rev-parse --verify refs/remotes/origin/side
 	)
@@ -465,12 +650,12 @@ test_expect_success 'non-matching refspecs do not confuse tracking update' '
 	git update-ref refs/odd/location HEAD &&
 	(
 		cd three &&
-		git update-ref refs/remotes/origin/master base-origin-master &&
+		git update-ref refs/remotes/origin/main base-origin-main &&
 		git config --add remote.origin.fetch \
 			refs/odd/location:refs/remotes/origin/odd &&
-		o=$(git rev-parse --verify refs/remotes/origin/master) &&
-		git fetch origin master &&
-		n=$(git rev-parse --verify refs/remotes/origin/master) &&
+		o=$(git rev-parse --verify refs/remotes/origin/main) &&
+		git fetch origin main &&
+		n=$(git rev-parse --verify refs/remotes/origin/main) &&
 		test "$o" != "$n" &&
 		test_must_fail git rev-parse --verify refs/remotes/origin/odd
 	)
@@ -496,7 +681,7 @@ test_expect_success 'auto tag following fetches minimum' '
 			git tag -a -m $i excess-$i || exit 1
 		done
 	) &&
-	git checkout master &&
+	git checkout main &&
 	(
 		cd follow &&
 		git fetch
@@ -505,20 +690,33 @@ test_expect_success 'auto tag following fetches minimum' '
 
 test_expect_success 'refuse to fetch into the current branch' '
 
-	test_must_fail git fetch . side:master
+	test_must_fail git fetch . side:main
 
 '
 
 test_expect_success 'fetch into the current branch with --update-head-ok' '
 
-	git fetch --update-head-ok . side:master
+	git fetch --update-head-ok . side:main
+
+'
 
+test_expect_success 'fetch --dry-run does not touch FETCH_HEAD, but still prints what would be written' '
+	rm -f .git/FETCH_HEAD err &&
+	git fetch --dry-run . 2>err &&
+	! test -f .git/FETCH_HEAD &&
+	grep FETCH_HEAD err
 '
 
-test_expect_success 'fetch --dry-run' '
+test_expect_success '--no-write-fetch-head does not touch FETCH_HEAD, and does not print what would be written' '
+	rm -f .git/FETCH_HEAD err &&
+	git fetch --no-write-fetch-head . 2>err &&
+	! test -f .git/FETCH_HEAD &&
+	! grep FETCH_HEAD err
+'
 
+test_expect_success '--write-fetch-head gets defeated by --dry-run' '
 	rm -f .git/FETCH_HEAD &&
-	git fetch --dry-run . &&
+	git fetch --dry-run --write-fetch-head . &&
 	! test -f .git/FETCH_HEAD
 '
 
@@ -527,7 +725,7 @@ test_expect_success "should be able to fetch with duplicate refspecs" '
 	(
 		cd dups &&
 		git init &&
-		git config branch.master.remote three &&
+		git config branch.main.remote three &&
 		git config remote.three.url ../three/.git &&
 		git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
 		git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
@@ -773,7 +971,7 @@ test_configured_prune true  true  unset unset pruned pruned \
 	"--prune origin refs/tags/*:refs/tags/* +refs/heads/*:refs/remotes/origin/*"
 
 # --prune-tags on its own does nothing, needs --prune as well, same
-# for for fetch.pruneTags without fetch.prune
+# for fetch.pruneTags without fetch.prune
 test_configured_prune unset unset unset unset kept kept     "--prune-tags"
 test_configured_prune unset unset true unset  kept kept     ""
 test_configured_prune unset unset unset true  kept kept     ""
@@ -836,14 +1034,12 @@ test_expect_success 'all boundary commits are excluded' '
 	test_commit oneside &&
 	git checkout HEAD^ &&
 	test_commit otherside &&
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git merge otherside &&
 	ad=$(git log --no-walk --format=%ad HEAD) &&
-	git bundle create twoside-boundary.bdl master --since="$ad" &&
-	convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
-	pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
-	test_bundle_object_count .git/objects/pack/pack-${pack##pack	}.pack 3
+	git bundle create twoside-boundary.bdl main --since="$ad" &&
+	test_bundle_object_count --thin twoside-boundary.bdl 3
 '
 
 test_expect_success 'fetch --prune prints the remotes url' '
@@ -855,7 +1051,7 @@ test_expect_success 'fetch --prune prints the remotes url' '
 		git fetch --prune origin 2>&1 | head -n1 >../actual
 	) &&
 	echo "From ${D}/." >expect &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'branchname D/F conflict resolved by --prune' '
@@ -895,13 +1091,13 @@ test_expect_success 'fetching with auto-gc does not lock up' '
 		git config fetch.unpackLimit 1 &&
 		git config gc.autoPackLimit 1 &&
 		git config gc.autoDetach false &&
-		GIT_ASK_YESNO="$D/askyesno" git fetch >fetch.out 2>&1 &&
+		GIT_ASK_YESNO="$D/askyesno" git fetch --verbose >fetch.out 2>&1 &&
 		test_i18ngrep "Auto packing the repository" fetch.out &&
 		! grep "Should I try again" fetch.out
 	)
 '
 
-test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
+test_expect_success 'fetch aligned output' '
 	git clone . full-output &&
 	test_commit looooooooooooong-tag &&
 	(
@@ -910,13 +1106,13 @@ test_expect_success C_LOCALE_OUTPUT 'fetch aligned output' '
 		grep -e "->" actual | cut -c 22- >../actual
 	) &&
 	cat >expect <<-\EOF &&
-	master               -> origin/master
+	main                 -> origin/main
 	looooooooooooong-tag -> looooooooooooong-tag
 	EOF
 	test_cmp expect actual
 '
 
-test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
+test_expect_success 'fetch compact output' '
 	git clone . compact &&
 	test_commit extraaa &&
 	(
@@ -925,7 +1121,7 @@ test_expect_success C_LOCALE_OUTPUT 'fetch compact output' '
 		grep -e "->" actual | cut -c 22- >../actual
 	) &&
 	cat >expect <<-\EOF &&
-	master     -> origin/*
+	main       -> origin/*
 	extraaa    -> *
 	EOF
 	test_cmp expect actual
@@ -960,7 +1156,7 @@ setup_negotiation_tip () {
 	USE_PROTOCOL_V2="$3"
 
 	rm -rf "$SERVER" client trace &&
-	git init "$SERVER" &&
+	git init -b main "$SERVER" &&
 	test_commit -C "$SERVER" alpha_1 &&
 	test_commit -C "$SERVER" alpha_2 &&
 	git -C "$SERVER" checkout --orphan beta &&
@@ -976,7 +1172,7 @@ setup_negotiation_tip () {
 	fi &&
 
 	test_commit -C "$SERVER" beta_s &&
-	git -C "$SERVER" checkout master &&
+	git -C "$SERVER" checkout main &&
 	test_commit -C "$SERVER" alpha_s &&
 	git -C "$SERVER" tag -d alpha_1 alpha_2 beta_1 beta_2
 }
@@ -1018,6 +1214,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 f541f30bc2..be025b90f9 100755
--- a/t/t5511-refspec.sh
+++ b/t/t5511-refspec.sh
@@ -33,7 +33,7 @@ test_refspec fetch '::'						invalid
 test_refspec push 'refs/heads/*:refs/remotes/frotz/*'
 test_refspec push 'refs/heads/*:refs/remotes/frotz'		invalid
 test_refspec push 'refs/heads:refs/remotes/frotz/*'		invalid
-test_refspec push 'refs/heads/master:refs/remotes/frotz/xyzzy'
+test_refspec push 'refs/heads/main:refs/remotes/frotz/xyzzy'
 
 
 # These have invalid LHS, but we do not have a formal "valid sha-1
@@ -41,23 +41,25 @@ test_refspec push 'refs/heads/master:refs/remotes/frotz/xyzzy'
 # code.  They will be caught downstream anyway, but we may want to
 # have tighter check later...
 
-: test_refspec push 'refs/heads/master::refs/remotes/frotz/xyzzy'	invalid
+: test_refspec push 'refs/heads/main::refs/remotes/frotz/xyzzy'	invalid
 : test_refspec push 'refs/heads/maste :refs/remotes/frotz/xyzzy'	invalid
 
 test_refspec fetch 'refs/heads/*:refs/remotes/frotz/*'
 test_refspec fetch 'refs/heads/*:refs/remotes/frotz'		invalid
 test_refspec fetch 'refs/heads:refs/remotes/frotz/*'		invalid
-test_refspec fetch 'refs/heads/master:refs/remotes/frotz/xyzzy'
-test_refspec fetch 'refs/heads/master::refs/remotes/frotz/xyzzy'	invalid
+test_refspec fetch 'refs/heads/main:refs/remotes/frotz/xyzzy'
+test_refspec fetch 'refs/heads/main::refs/remotes/frotz/xyzzy'	invalid
 test_refspec fetch 'refs/heads/maste :refs/remotes/frotz/xyzzy'	invalid
 
-test_refspec push 'master~1:refs/remotes/frotz/backup'
-test_refspec fetch 'master~1:refs/remotes/frotz/backup'		invalid
+test_refspec push 'main~1:refs/remotes/frotz/backup'
+test_refspec fetch 'main~1:refs/remotes/frotz/backup'		invalid
 test_refspec push 'HEAD~4:refs/remotes/frotz/new'
 test_refspec fetch 'HEAD~4:refs/remotes/frotz/new'		invalid
 
 test_refspec push 'HEAD'
 test_refspec fetch 'HEAD'
+test_refspec push '@'
+test_refspec fetch '@'
 test_refspec push 'refs/heads/ nitfol'				invalid
 test_refspec fetch 'refs/heads/ nitfol'				invalid
 
diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh
index 43e1d8d4d2..f53f58895a 100755
--- a/t/t5512-ls-remote.sh
+++ b/t/t5512-ls-remote.sh
@@ -2,8 +2,19 @@
 
 test_description='git ls-remote'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
+generate_references () {
+	for ref
+	do
+		oid=$(git rev-parse "$ref") &&
+		printf '%s\t%s\n' "$oid" "$ref" || return 1
+	done
+}
+
 test_expect_success setup '
 	>file &&
 	git add file &&
@@ -13,11 +24,11 @@ test_expect_success setup '
 	git tag mark1.1 &&
 	git tag mark1.2 &&
 	git tag mark1.10 &&
-	git show-ref --tags -d | sed -e "s/ /	/" >expected.tag &&
-	(
-		echo "$(git rev-parse HEAD)	HEAD" &&
-		git show-ref -d	| sed -e "s/ /	/"
-	) >expected.all &&
+	git show-ref --tags -d >expected.tag.raw &&
+	sed -e "s/ /	/" expected.tag.raw >expected.tag &&
+	generate_references HEAD >expected.all &&
+	git show-ref -d	>refs &&
+	sed -e "s/ /	/" refs >>expected.all &&
 
 	git remote add self "$(pwd)/.git"
 '
@@ -43,34 +54,31 @@ test_expect_success 'ls-remote self' '
 '
 
 test_expect_success 'ls-remote --sort="version:refname" --tags self' '
-	cat >expect <<-EOF &&
-	$(git rev-parse mark)	refs/tags/mark
-	$(git rev-parse mark1.1)	refs/tags/mark1.1
-	$(git rev-parse mark1.2)	refs/tags/mark1.2
-	$(git rev-parse mark1.10)	refs/tags/mark1.10
-	EOF
+	generate_references \
+		refs/tags/mark \
+		refs/tags/mark1.1 \
+		refs/tags/mark1.2 \
+		refs/tags/mark1.10 >expect &&
 	git ls-remote --sort="version:refname" --tags self >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'ls-remote --sort="-version:refname" --tags self' '
-	cat >expect <<-EOF &&
-	$(git rev-parse mark1.10)	refs/tags/mark1.10
-	$(git rev-parse mark1.2)	refs/tags/mark1.2
-	$(git rev-parse mark1.1)	refs/tags/mark1.1
-	$(git rev-parse mark)	refs/tags/mark
-	EOF
+	generate_references \
+		refs/tags/mark1.10 \
+		refs/tags/mark1.2 \
+		refs/tags/mark1.1 \
+		refs/tags/mark >expect &&
 	git ls-remote --sort="-version:refname" --tags self >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'ls-remote --sort="-refname" --tags self' '
-	cat >expect <<-EOF &&
-	$(git rev-parse mark1.2)	refs/tags/mark1.2
-	$(git rev-parse mark1.10)	refs/tags/mark1.10
-	$(git rev-parse mark1.1)	refs/tags/mark1.1
-	$(git rev-parse mark)	refs/tags/mark
-	EOF
+	generate_references \
+		refs/tags/mark1.2 \
+		refs/tags/mark1.10 \
+		refs/tags/mark1.1 \
+		refs/tags/mark >expect &&
 	git ls-remote --sort="-refname" --tags self >actual &&
 	test_cmp expect actual
 '
@@ -92,7 +100,7 @@ test_expect_success 'use "origin" when no remote specified' '
 
 test_expect_success 'suppress "From <url>" with -q' '
 	git ls-remote -q 2>actual_err &&
-	test_must_fail test_cmp exp_err actual_err
+	! test_cmp exp_err actual_err
 '
 
 test_expect_success 'use branch.<name>.remote if possible' '
@@ -113,7 +121,7 @@ test_expect_success 'use branch.<name>.remote if possible' '
 	echo "From $URL" >exp_err &&
 
 	git remote add other $URL &&
-	git config branch.master.remote other &&
+	git config branch.main.remote other &&
 
 	git ls-remote 2>actual_err >actual &&
 	test_cmp exp_err actual_err &&
@@ -124,9 +132,9 @@ test_expect_success 'confuses pattern as remote when no remote specified' '
 	if test_have_prereq MINGW
 	then
 		# Windows does not like asterisks in pathname
-		does_not_exist=master
+		does_not_exist=main
 	else
-		does_not_exist="refs*master"
+		does_not_exist="refs*main"
 	fi &&
 	cat >exp <<-EOF &&
 	fatal: '\''$does_not_exist'\'' does not appear to be a git repository
@@ -139,10 +147,10 @@ test_expect_success 'confuses pattern as remote when no remote specified' '
 	# Do not expect "git ls-remote <pattern>" to work; ls-remote needs
 	# <remote> if you want to feed <pattern>, just like you cannot say
 	# fetch <branch>.
-	# We could just as easily have used "master"; the "*" emphasizes its
+	# We could just as easily have used "main"; the "*" emphasizes its
 	# role as a pattern.
 	test_must_fail git ls-remote "$does_not_exist" >actual 2>&1 &&
-	test_i18ncmp exp actual
+	test_cmp exp actual
 '
 
 test_expect_success 'die with non-2 for wrong repository even with --exit-code' '
@@ -180,8 +188,8 @@ do
 		test_config $configsection.hiderefs refs/tags &&
 		git ls-remote . >actual &&
 		test_unconfig $configsection.hiderefs &&
-		git ls-remote . |
-		sed -e "/	refs\/tags\//d" >expect &&
+		git ls-remote . >expect.raw &&
+		sed -e "/	refs\/tags\//d" expect.raw >expect &&
 		test_cmp expect actual
 	'
 
@@ -212,62 +220,64 @@ test_expect_success 'protocol v2 supports hiderefs' '
 
 test_expect_success 'ls-remote --symref' '
 	git fetch origin &&
-	cat >expect <<-EOF &&
-	ref: refs/heads/master	HEAD
-	$(git rev-parse HEAD)	HEAD
-	$(git rev-parse refs/heads/master)	refs/heads/master
-	$(git rev-parse HEAD)	refs/remotes/origin/HEAD
-	$(git rev-parse refs/remotes/origin/master)	refs/remotes/origin/master
-	$(git rev-parse refs/tags/mark)	refs/tags/mark
-	$(git rev-parse refs/tags/mark1.1)	refs/tags/mark1.1
-	$(git rev-parse refs/tags/mark1.10)	refs/tags/mark1.10
-	$(git rev-parse refs/tags/mark1.2)	refs/tags/mark1.2
-	EOF
+	echo "ref: refs/heads/main	HEAD" >expect &&
+	generate_references \
+		HEAD \
+		refs/heads/main >>expect &&
+	oid=$(git rev-parse HEAD) &&
+	echo "$oid	refs/remotes/origin/HEAD" >>expect &&
+	generate_references \
+		refs/remotes/origin/main \
+		refs/tags/mark \
+		refs/tags/mark1.1 \
+		refs/tags/mark1.10 \
+		refs/tags/mark1.2 >>expect &&
 	# Protocol v2 supports sending symrefs for refs other than HEAD, so use
 	# protocol v0 here.
-	GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref >actual &&
+	GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'ls-remote with filtered symref (refname)' '
-	cat >expect <<-\EOF &&
-	ref: refs/heads/master	HEAD
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	HEAD
+	rev=$(git rev-parse HEAD) &&
+	cat >expect <<-EOF &&
+	ref: refs/heads/main	HEAD
+	$rev	HEAD
 	EOF
 	# Protocol v2 supports sending symrefs for refs other than HEAD, so use
 	# protocol v0 here.
-	GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref . HEAD >actual &&
+	GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref . HEAD >actual &&
 	test_cmp expect actual
 '
 
 test_expect_failure 'ls-remote with filtered symref (--heads)' '
 	git symbolic-ref refs/heads/foo refs/tags/mark &&
-	cat >expect <<-\EOF &&
+	cat >expect <<-EOF &&
 	ref: refs/tags/mark	refs/heads/foo
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/foo
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
+	$rev	refs/heads/foo
+	$rev	refs/heads/main
 	EOF
 	# Protocol v2 supports sending symrefs for refs other than HEAD, so use
 	# protocol v0 here.
-	GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref --heads . >actual &&
+	GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref --heads . >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'ls-remote --symref omits filtered-out matches' '
-	cat >expect <<-\EOF &&
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/foo
-	1bd44cb9d13204b0fe1958db0082f5028a16eb3a	refs/heads/master
+	cat >expect <<-EOF &&
+	$rev	refs/heads/foo
+	$rev	refs/heads/main
 	EOF
 	# Protocol v2 supports sending symrefs for refs other than HEAD, so use
 	# protocol v0 here.
-	GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref --heads . >actual &&
+	GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref --heads . >actual &&
 	test_cmp expect actual &&
-	GIT_TEST_PROTOCOL_VERSION= git ls-remote --symref . "refs/heads/*" >actual &&
+	GIT_TEST_PROTOCOL_VERSION=0 git ls-remote --symref . "refs/heads/*" >actual &&
 	test_cmp expect actual
 '
 
 test_lazy_prereq GIT_DAEMON '
-	git env--helper --type=bool --default=true --exit-code GIT_TEST_GIT_DAEMON
+	test_bool_env GIT_TEST_GIT_DAEMON true
 '
 
 # This test spawns a daemon, so run it only if the user would be OK with
@@ -323,10 +333,10 @@ test_expect_success 'ls-remote --sort fails gracefully outside repository' '
 
 test_expect_success 'ls-remote patterns work with all protocol versions' '
 	git for-each-ref --format="%(objectname)	%(refname)" \
-		refs/heads/master refs/remotes/origin/master >expect &&
-	git -c protocol.version=1 ls-remote . master >actual.v1 &&
+		refs/heads/main refs/remotes/origin/main >expect &&
+	git -c protocol.version=1 ls-remote . main >actual.v1 &&
 	test_cmp expect actual.v1 &&
-	git -c protocol.version=2 ls-remote . master >actual.v2 &&
+	git -c protocol.version=2 ls-remote . main >actual.v2 &&
 	test_cmp expect actual.v2
 '
 
diff --git a/t/t5514-fetch-multiple.sh b/t/t5514-fetch-multiple.sh
index de8e2f1531..511ba3bd45 100755
--- a/t/t5514-fetch-multiple.sh
+++ b/t/t5514-fetch-multiple.sh
@@ -2,6 +2,9 @@
 
 test_description='fetch --all works correctly'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 setup_repository () {
@@ -17,7 +20,7 @@ setup_repository () {
 	git add elif &&
 	test_tick &&
 	git commit -m "Second" &&
-	git checkout master
+	git checkout main
 	)
 }
 
@@ -32,16 +35,16 @@ test_expect_success setup '
 '
 
 cat > test/expect << EOF
-  one/master
+  one/main
   one/side
-  origin/HEAD -> origin/master
-  origin/master
+  origin/HEAD -> origin/main
+  origin/main
   origin/side
   three/another
-  three/master
+  three/main
   three/side
   two/another
-  two/master
+  two/main
   two/side
 EOF
 
@@ -70,15 +73,15 @@ test_expect_success 'git fetch --all should continue if a remote has errors' '
 test_expect_success 'git fetch --all does not allow non-option arguments' '
 	(cd test &&
 	 test_must_fail git fetch --all origin &&
-	 test_must_fail git fetch --all origin master)
+	 test_must_fail git fetch --all origin main)
 '
 
 cat > expect << EOF
-  origin/HEAD -> origin/master
-  origin/master
+  origin/HEAD -> origin/main
+  origin/main
   origin/side
   three/another
-  three/master
+  three/main
   three/side
 EOF
 
@@ -92,10 +95,10 @@ test_expect_success 'git fetch --multiple (but only one remote)' '
 '
 
 cat > expect << EOF
-  one/master
+  one/main
   one/side
   two/another
-  two/master
+  two/main
   two/side
 EOF
 
@@ -108,7 +111,7 @@ test_expect_success 'git fetch --multiple (two remotes)' '
 	 GIT_TRACE=1 git fetch --multiple one two 2>trace &&
 	 git branch -r > output &&
 	 test_cmp ../expect output &&
-	 grep "built-in: git gc" trace >gc &&
+	 grep "built-in: git maintenance" trace >gc &&
 	 test_line_count = 1 gc
 	)
 '
@@ -133,13 +136,13 @@ test_expect_success 'git fetch --all (skipFetchAll)' '
 '
 
 cat > expect << EOF
-  one/master
+  one/main
   one/side
   three/another
-  three/master
+  three/main
   three/side
   two/another
-  two/master
+  two/main
   two/side
 EOF
 
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 961eb35c99..50f14101c5 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -8,15 +8,63 @@ test_description='Merge logic in fetch'
 
 # NEEDSWORK: If the overspecification of the expected result is reduced, we
 # might be able to run this test in all protocol versions.
-GIT_TEST_PROTOCOL_VERSION=
+GIT_TEST_PROTOCOL_VERSION=0
+export GIT_TEST_PROTOCOL_VERSION
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
+build_script () {
+	script="$1" &&
+	for i in one three_file main topic_2 one_tree three two two2 three2
+	do
+		echo "s/$(test_oid --hash=sha1 "$i")/$(test_oid "$i")/g" >>"$script"
+	done
+}
+
+convert_expected () {
+	file="$1" &&
+	script="$2" &&
+	sed -f "$script" "$file" >"$file.tmp" &&
+	mv "$file.tmp" "$file"
+}
+
 test_expect_success setup '
 	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
 	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
 	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
 
+	test_oid_cache <<-EOF &&
+	one sha1:8e32a6d901327a23ef831511badce7bf3bf46689
+	one sha256:8739546433ab1ac72ee93088dce611210effee072b2b586ceac6dde43ebec9ce
+
+	three_file sha1:0e3b14047d3ee365f4f2a1b673db059c3972589c
+	three_file sha256:bc4447d50c07497a8bfe6eef817f2364ecca9d471452e43b52756cc1a908bd32
+
+	main sha1:ecf3b3627b498bdcb735cc4343bf165f76964e9a
+	main sha256:fff666109892bb4b1c80cd1649d2d8762a0663db8b5d46c8be98360b64fbba5f
+
+	one_tree sha1:22feea448b023a2d864ef94b013735af34d238ba
+	one_tree sha256:6e4743f4ef2356b881dda5e91f5c7cdffe870faf350bf7b312f80a20935f5d83
+
+	three sha1:c61a82b60967180544e3c19f819ddbd0c9f89899
+	three sha256:0cc6d1eda617ded715170786e31ba4e2d0185404ec5a3508dd0d73b324860c6a
+
+	two sha1:525b7fb068d59950d185a8779dc957c77eed73ba
+	two sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db
+
+	topic_2 sha1:b4ab76b1a01ea602209932134a44f1e6bd610832
+	topic_2 sha256:380ebae0113f877ce46fcdf39d5bc33e4dc0928db5c5a4d5fdc78381c4d55ae3
+
+	two2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8
+	two2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4
+
+	three2 sha1:0567da4d5edd2ff4bb292a465ba9e64dcad9536b
+	three2 sha256:cceb3e8eca364fa9a0a39a1efbebecacc664af86cbbd8070571f5faeb5f0e8c3
+	EOF
+
 	echo >file original &&
 	git add file &&
 	git commit -a -m One &&
@@ -35,9 +83,9 @@ test_expect_success setup '
 	git tag -a -m "Tag Three file" tag-three-file HEAD^{tree}:file &&
 	git branch three &&
 
-	echo master >> file &&
-	git commit -a -m Master &&
-	git tag -a -m "Tag Master" tag-master &&
+	echo main >> file &&
+	git commit -a -m Main &&
+	git tag -a -m "Tag Main" tag-main &&
 
 	git checkout three &&
 
@@ -46,7 +94,7 @@ test_expect_success setup '
 	git config remote.origin.url ../.git/ &&
 
 	git config remote.config-explicit.url ../.git/ &&
-	git config remote.config-explicit.fetch refs/heads/master:remotes/rem/master &&
+	git config remote.config-explicit.fetch refs/heads/main:remotes/rem/main &&
 	git config --add remote.config-explicit.fetch refs/heads/one:remotes/rem/one &&
 	git config --add remote.config-explicit.fetch two:remotes/rem/two &&
 	git config --add remote.config-explicit.fetch refs/heads/three:remotes/rem/three &&
@@ -59,7 +107,7 @@ test_expect_success setup '
 	mkdir -p .git/remotes &&
 	{
 		echo "URL: ../.git/"
-		echo "Pull: refs/heads/master:remotes/rem/master"
+		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"
@@ -86,7 +134,8 @@ test_expect_success setup '
 		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
-	done
+	done &&
+	build_script sed_script
 '
 
 # Merge logic depends on branch properties and Pull: or .fetch lines
@@ -103,7 +152,7 @@ done > tests
 # but does depend on Pull: or fetch lines.
 # Use two branches completely unrelated from the arguments,
 # the clone default and one without branch properties
-for branch in master br-unconfig ; do
+for branch in main br-unconfig ; do
     echo $branch
     for remote in $remotes ; do
 	echo $branch $remote
@@ -112,7 +161,7 @@ done >> tests
 
 # Merge logic does not depend on branch properties
 # neither in the Pull: or .fetch config
-for branch in master br-unconfig ; do
+for branch in main br-unconfig ; do
     cat <<EOF
 $branch ../.git
 $branch ../.git one
@@ -137,6 +186,10 @@ do
 	actual_r="$pfx-refs.$test"
 
 	test_expect_success "$cmd" '
+		cp "$expect_f" expect_f &&
+		convert_expected expect_f sed_script &&
+		cp "$expect_r" expect_r &&
+		convert_expected expect_r sed_script &&
 		{
 			echo "# $cmd"
 			set x $cmd; shift
@@ -152,18 +205,18 @@ do
 			cat .git/FETCH_HEAD
 		} >"$actual_f" &&
 		git show-ref >"$actual_r" &&
-		if test -f "$expect_f"
+		if test -f "expect_f"
 		then
-			test_cmp "$expect_f" "$actual_f" &&
+			test_cmp "expect_f" "$actual_f" &&
 			rm -f "$actual_f"
 		else
 			# this is to help developing new tests.
 			cp "$actual_f" "$expect_f"
 			false
 		fi &&
-		if test -f "$expect_r"
+		if test -f "expect_r"
 		then
-			test_cmp "$expect_r" "$actual_r" &&
+			test_cmp "expect_r" "$actual_r" &&
 			rm -f "$actual_r"
 		else
 			# this is to help developing new tests.
diff --git a/t/t5515/fetch.br-branches-default b/t/t5515/fetch.br-branches-default
index a1bc3d53a6..0bed09cc12 100644
--- a/t/t5515/fetch.br-branches-default
+++ b/t/t5515/fetch.br-branches-default
@@ -1,6 +1,6 @@
 # br-branches-default
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-default-merge b/t/t5515/fetch.br-branches-default-merge
index 12ab08e8ac..59eef63527 100644
--- a/t/t5515/fetch.br-branches-default-merge
+++ b/t/t5515/fetch.br-branches-default-merge
@@ -1,7 +1,7 @@
 # br-branches-default-merge
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-default-merge_branches-default b/t/t5515/fetch.br-branches-default-merge_branches-default
index 54427522dd..490186c158 100644
--- a/t/t5515/fetch.br-branches-default-merge_branches-default
+++ b/t/t5515/fetch.br-branches-default-merge_branches-default
@@ -1,7 +1,7 @@
 # br-branches-default-merge branches-default
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-default-octopus b/t/t5515/fetch.br-branches-default-octopus
index 498a761aae..d484138c27 100644
--- a/t/t5515/fetch.br-branches-default-octopus
+++ b/t/t5515/fetch.br-branches-default-octopus
@@ -1,8 +1,8 @@
 # br-branches-default-octopus
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-default-octopus_branches-default b/t/t5515/fetch.br-branches-default-octopus_branches-default
index 0857f134e1..b79a5fe2c3 100644
--- a/t/t5515/fetch.br-branches-default-octopus_branches-default
+++ b/t/t5515/fetch.br-branches-default-octopus_branches-default
@@ -1,8 +1,8 @@
 # br-branches-default-octopus branches-default
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-default_branches-default b/t/t5515/fetch.br-branches-default_branches-default
index 8cbd718936..1c866d85e6 100644
--- a/t/t5515/fetch.br-branches-default_branches-default
+++ b/t/t5515/fetch.br-branches-default_branches-default
@@ -1,6 +1,6 @@
 # br-branches-default branches-default
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one b/t/t5515/fetch.br-branches-one
index c98f670526..6925a775b6 100644
--- a/t/t5515/fetch.br-branches-one
+++ b/t/t5515/fetch.br-branches-one
@@ -1,6 +1,6 @@
 # br-branches-one
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one-merge b/t/t5515/fetch.br-branches-one-merge
index 54a77420d5..85257031ce 100644
--- a/t/t5515/fetch.br-branches-one-merge
+++ b/t/t5515/fetch.br-branches-one-merge
@@ -1,7 +1,7 @@
 # br-branches-one-merge
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one-merge_branches-one b/t/t5515/fetch.br-branches-one-merge_branches-one
index b4d1bb0b0b..3a63a7f450 100644
--- a/t/t5515/fetch.br-branches-one-merge_branches-one
+++ b/t/t5515/fetch.br-branches-one-merge_branches-one
@@ -1,7 +1,7 @@
 # br-branches-one-merge branches-one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one-octopus b/t/t5515/fetch.br-branches-one-octopus
index 97c4b544b8..46af763fec 100644
--- a/t/t5515/fetch.br-branches-one-octopus
+++ b/t/t5515/fetch.br-branches-one-octopus
@@ -1,7 +1,7 @@
 # br-branches-one-octopus
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one-octopus_branches-one b/t/t5515/fetch.br-branches-one-octopus_branches-one
index df705f74c7..becfde9ddd 100644
--- a/t/t5515/fetch.br-branches-one-octopus_branches-one
+++ b/t/t5515/fetch.br-branches-one-octopus_branches-one
@@ -1,7 +1,7 @@
 # br-branches-one-octopus branches-one
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-branches-one_branches-one b/t/t5515/fetch.br-branches-one_branches-one
index 96890e5bd9..9ba34c6754 100644
--- a/t/t5515/fetch.br-branches-one_branches-one
+++ b/t/t5515/fetch.br-branches-one_branches-one
@@ -1,6 +1,6 @@
 # br-branches-one branches-one
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit b/t/t5515/fetch.br-config-explicit
index 68fc927263..7466a73214 100644
--- a/t/t5515/fetch.br-config-explicit
+++ b/t/t5515/fetch.br-config-explicit
@@ -1,9 +1,9 @@
 # br-config-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit-merge b/t/t5515/fetch.br-config-explicit-merge
index 5ce764a06e..9375b7d21d 100644
--- a/t/t5515/fetch.br-config-explicit-merge
+++ b/t/t5515/fetch.br-config-explicit-merge
@@ -1,9 +1,9 @@
 # br-config-explicit-merge
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit-merge_config-explicit b/t/t5515/fetch.br-config-explicit-merge_config-explicit
index b1152b76dc..6335e2b113 100644
--- a/t/t5515/fetch.br-config-explicit-merge_config-explicit
+++ b/t/t5515/fetch.br-config-explicit-merge_config-explicit
@@ -1,9 +1,9 @@
 # br-config-explicit-merge config-explicit
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit-octopus b/t/t5515/fetch.br-config-explicit-octopus
index 110577bb67..c379aa9b31 100644
--- a/t/t5515/fetch.br-config-explicit-octopus
+++ b/t/t5515/fetch.br-config-explicit-octopus
@@ -1,9 +1,9 @@
 # br-config-explicit-octopus
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit-octopus_config-explicit b/t/t5515/fetch.br-config-explicit-octopus_config-explicit
index a29dd8baba..7fb3a3eef8 100644
--- a/t/t5515/fetch.br-config-explicit-octopus_config-explicit
+++ b/t/t5515/fetch.br-config-explicit-octopus_config-explicit
@@ -1,9 +1,9 @@
 # br-config-explicit-octopus config-explicit
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-explicit_config-explicit b/t/t5515/fetch.br-config-explicit_config-explicit
index b19b0162e1..86045a79d4 100644
--- a/t/t5515/fetch.br-config-explicit_config-explicit
+++ b/t/t5515/fetch.br-config-explicit_config-explicit
@@ -1,9 +1,9 @@
 # br-config-explicit config-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob b/t/t5515/fetch.br-config-glob
index 946d70ca07..bfeef2b716 100644
--- a/t/t5515/fetch.br-config-glob
+++ b/t/t5515/fetch.br-config-glob
@@ -1,9 +1,9 @@
 # br-config-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob-merge b/t/t5515/fetch.br-config-glob-merge
index 89f2596cb9..5376a4ac1d 100644
--- a/t/t5515/fetch.br-config-glob-merge
+++ b/t/t5515/fetch.br-config-glob-merge
@@ -1,9 +1,9 @@
 # br-config-glob-merge
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob-merge_config-glob b/t/t5515/fetch.br-config-glob-merge_config-glob
index 2ba4832160..7dfc2feb35 100644
--- a/t/t5515/fetch.br-config-glob-merge_config-glob
+++ b/t/t5515/fetch.br-config-glob-merge_config-glob
@@ -1,9 +1,9 @@
 # br-config-glob-merge config-glob
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob-octopus b/t/t5515/fetch.br-config-glob-octopus
index 64994df7e2..10840309ef 100644
--- a/t/t5515/fetch.br-config-glob-octopus
+++ b/t/t5515/fetch.br-config-glob-octopus
@@ -1,9 +1,9 @@
 # br-config-glob-octopus
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob-octopus_config-glob b/t/t5515/fetch.br-config-glob-octopus_config-glob
index 681a725adc..839866daf3 100644
--- a/t/t5515/fetch.br-config-glob-octopus_config-glob
+++ b/t/t5515/fetch.br-config-glob-octopus_config-glob
@@ -1,9 +1,9 @@
 # br-config-glob-octopus config-glob
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-config-glob_config-glob b/t/t5515/fetch.br-config-glob_config-glob
index 19daf0cb77..7b0cb91e51 100644
--- a/t/t5515/fetch.br-config-glob_config-glob
+++ b/t/t5515/fetch.br-config-glob_config-glob
@@ -1,9 +1,9 @@
 # br-config-glob config-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit b/t/t5515/fetch.br-remote-explicit
index ab44bc5519..d6619e7fc0 100644
--- a/t/t5515/fetch.br-remote-explicit
+++ b/t/t5515/fetch.br-remote-explicit
@@ -1,9 +1,9 @@
 # br-remote-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit-merge b/t/t5515/fetch.br-remote-explicit-merge
index d018b3515f..5b49b7c4c5 100644
--- a/t/t5515/fetch.br-remote-explicit-merge
+++ b/t/t5515/fetch.br-remote-explicit-merge
@@ -1,9 +1,9 @@
 # br-remote-explicit-merge
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit-merge_remote-explicit b/t/t5515/fetch.br-remote-explicit-merge_remote-explicit
index 0d3d780dd0..417261d8eb 100644
--- a/t/t5515/fetch.br-remote-explicit-merge_remote-explicit
+++ b/t/t5515/fetch.br-remote-explicit-merge_remote-explicit
@@ -1,9 +1,9 @@
 # br-remote-explicit-merge remote-explicit
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit-octopus b/t/t5515/fetch.br-remote-explicit-octopus
index 6f843044ed..2edef64473 100644
--- a/t/t5515/fetch.br-remote-explicit-octopus
+++ b/t/t5515/fetch.br-remote-explicit-octopus
@@ -1,9 +1,9 @@
 # br-remote-explicit-octopus
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit b/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit
index 3546a83713..ceb8752e1f 100644
--- a/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit
+++ b/t/t5515/fetch.br-remote-explicit-octopus_remote-explicit
@@ -1,9 +1,9 @@
 # br-remote-explicit-octopus remote-explicit
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-explicit_remote-explicit b/t/t5515/fetch.br-remote-explicit_remote-explicit
index 01e014e6a0..b7abbd227c 100644
--- a/t/t5515/fetch.br-remote-explicit_remote-explicit
+++ b/t/t5515/fetch.br-remote-explicit_remote-explicit
@@ -1,9 +1,9 @@
 # br-remote-explicit remote-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob b/t/t5515/fetch.br-remote-glob
index 09bfcee00f..645412c73f 100644
--- a/t/t5515/fetch.br-remote-glob
+++ b/t/t5515/fetch.br-remote-glob
@@ -1,9 +1,9 @@
 # br-remote-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob-merge b/t/t5515/fetch.br-remote-glob-merge
index 7e1a433a64..8512cfd8d3 100644
--- a/t/t5515/fetch.br-remote-glob-merge
+++ b/t/t5515/fetch.br-remote-glob-merge
@@ -1,9 +1,9 @@
 # br-remote-glob-merge
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob-merge_remote-glob b/t/t5515/fetch.br-remote-glob-merge_remote-glob
index 53571bb4ec..7394164d85 100644
--- a/t/t5515/fetch.br-remote-glob-merge_remote-glob
+++ b/t/t5515/fetch.br-remote-glob-merge_remote-glob
@@ -1,9 +1,9 @@
 # br-remote-glob-merge remote-glob
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		branch 'three' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob-octopus b/t/t5515/fetch.br-remote-glob-octopus
index c7c8b6d7f4..0ca4719ef8 100644
--- a/t/t5515/fetch.br-remote-glob-octopus
+++ b/t/t5515/fetch.br-remote-glob-octopus
@@ -1,9 +1,9 @@
 # br-remote-glob-octopus
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob-octopus_remote-glob b/t/t5515/fetch.br-remote-glob-octopus_remote-glob
index 36076fba0c..7e7b0ba5f5 100644
--- a/t/t5515/fetch.br-remote-glob-octopus_remote-glob
+++ b/t/t5515/fetch.br-remote-glob-octopus_remote-glob
@@ -1,9 +1,9 @@
 # br-remote-glob-octopus remote-glob
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-remote-glob_remote-glob b/t/t5515/fetch.br-remote-glob_remote-glob
index 20ba5cb172..7bae5ecfb7 100644
--- a/t/t5515/fetch.br-remote-glob_remote-glob
+++ b/t/t5515/fetch.br-remote-glob_remote-glob
@@ -1,9 +1,9 @@
 # br-remote-glob remote-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig b/t/t5515/fetch.br-unconfig
index 887ccfc41f..ccaa54fed2 100644
--- a/t/t5515/fetch.br-unconfig
+++ b/t/t5515/fetch.br-unconfig
@@ -1,9 +1,9 @@
 # br-unconfig
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_--tags_.._.git b/t/t5515/fetch.br-unconfig_--tags_.._.git
index 0f70f66c70..3afb4f850d 100644
--- a/t/t5515/fetch.br-unconfig_--tags_.._.git
+++ b/t/t5515/fetch.br-unconfig_--tags_.._.git
@@ -1,6 +1,6 @@
 # br-unconfig --tags ../.git
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
index 74115361ba..525713a2ab 100644
--- a/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
+++ b/t/t5515/fetch.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
@@ -2,7 +2,7 @@
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689		tag 'tag-one' of ../
 0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
 525b7fb068d59950d185a8779dc957c77eed73ba	not-for-merge	tag 'tag-two' of ../
diff --git a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
index 7726983818..18c871f512 100644
--- a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
+++ b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
@@ -1,7 +1,7 @@
 # br-unconfig ../.git tag tag-one-tree tag tag-three-file
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
 525b7fb068d59950d185a8779dc957c77eed73ba	not-for-merge	tag 'tag-two' of ../
diff --git a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three
index 7b3750ce5c..7328d30c67 100644
--- a/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three
+++ b/t/t5515/fetch.br-unconfig_.._.git_tag_tag-one_tag_tag-three
@@ -1,7 +1,7 @@
 # br-unconfig ../.git tag tag-one tag tag-three
 8e32a6d901327a23ef831511badce7bf3bf46689		tag 'tag-one' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899		tag 'tag-three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
 525b7fb068d59950d185a8779dc957c77eed73ba	not-for-merge	tag 'tag-two' of ../
diff --git a/t/t5515/fetch.br-unconfig_branches-default b/t/t5515/fetch.br-unconfig_branches-default
index da30e3c62c..3d82f94376 100644
--- a/t/t5515/fetch.br-unconfig_branches-default
+++ b/t/t5515/fetch.br-unconfig_branches-default
@@ -1,6 +1,6 @@
 # br-unconfig branches-default
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_branches-one b/t/t5515/fetch.br-unconfig_branches-one
index e4614314c5..948ed0c3d9 100644
--- a/t/t5515/fetch.br-unconfig_branches-one
+++ b/t/t5515/fetch.br-unconfig_branches-one
@@ -1,6 +1,6 @@
 # br-unconfig branches-one
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_config-explicit b/t/t5515/fetch.br-unconfig_config-explicit
index ed323c9871..65aaec8a7b 100644
--- a/t/t5515/fetch.br-unconfig_config-explicit
+++ b/t/t5515/fetch.br-unconfig_config-explicit
@@ -1,9 +1,9 @@
 # br-unconfig config-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_config-glob b/t/t5515/fetch.br-unconfig_config-glob
index 2372ed03c5..1aa3d4598a 100644
--- a/t/t5515/fetch.br-unconfig_config-glob
+++ b/t/t5515/fetch.br-unconfig_config-glob
@@ -1,9 +1,9 @@
 # br-unconfig config-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_remote-explicit b/t/t5515/fetch.br-unconfig_remote-explicit
index 6318dd11b4..16438d2085 100644
--- a/t/t5515/fetch.br-unconfig_remote-explicit
+++ b/t/t5515/fetch.br-unconfig_remote-explicit
@@ -1,9 +1,9 @@
 # br-unconfig remote-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.br-unconfig_remote-glob b/t/t5515/fetch.br-unconfig_remote-glob
index 1d9afad7d8..7a01d2e0f6 100644
--- a/t/t5515/fetch.br-unconfig_remote-glob
+++ b/t/t5515/fetch.br-unconfig_remote-glob
@@ -1,9 +1,9 @@
 # br-unconfig remote-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master b/t/t5515/fetch.main
index 9b29d67200..819ed33bf5 100644
--- a/t/t5515/fetch.master
+++ b/t/t5515/fetch.main
@@ -1,9 +1,9 @@
-# master
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+# main
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master_--tags_.._.git b/t/t5515/fetch.main_--tags_.._.git
index ab473a6e1f..ddf67a613b 100644
--- a/t/t5515/fetch.master_--tags_.._.git
+++ b/t/t5515/fetch.main_--tags_.._.git
@@ -1,6 +1,6 @@
-# master --tags ../.git
+# main --tags ../.git
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master_.._.git b/t/t5515/fetch.main_.._.git
index 66d1aaddae..285e57eaf5 100644
--- a/t/t5515/fetch.master_.._.git
+++ b/t/t5515/fetch.main_.._.git
@@ -1,2 +1,2 @@
-# master ../.git
+# main ../.git
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b		../
diff --git a/t/t5515/fetch.master_.._.git_one b/t/t5515/fetch.main_.._.git_one
index 35deddbd2c..f9f511efbc 100644
--- a/t/t5515/fetch.master_.._.git_one
+++ b/t/t5515/fetch.main_.._.git_one
@@ -1,2 +1,2 @@
-# master ../.git one
+# main ../.git one
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
diff --git a/t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/fetch.main_.._.git_one_tag_tag-one_tag_tag-three-file
index 0672d1292f..187643e2ce 100644
--- a/t/t5515/fetch.master_.._.git_one_tag_tag-one_tag_tag-three-file
+++ b/t/t5515/fetch.main_.._.git_one_tag_tag-one_tag_tag-three-file
@@ -1,8 +1,8 @@
-# master ../.git one tag tag-one tag tag-three-file
+# main ../.git one tag tag-one tag tag-three-file
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689		tag 'tag-one' of ../
 0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
 525b7fb068d59950d185a8779dc957c77eed73ba	not-for-merge	tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_.._.git_one_two b/t/t5515/fetch.main_.._.git_one_two
index 35ec5782c8..048ad97a15 100644
--- a/t/t5515/fetch.master_.._.git_one_two
+++ b/t/t5515/fetch.main_.._.git_one_two
@@ -1,3 +1,3 @@
-# master ../.git one two
+# main ../.git one two
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8		branch 'two' of ../
diff --git a/t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/fetch.main_.._.git_tag_tag-one-tree_tag_tag-three-file
index 0fd737cf81..df5f2a7d5f 100644
--- a/t/t5515/fetch.master_.._.git_tag_tag-one-tree_tag_tag-three-file
+++ b/t/t5515/fetch.main_.._.git_tag_tag-one-tree_tag_tag-three-file
@@ -1,7 +1,7 @@
-# master ../.git tag tag-one-tree tag tag-three-file
+# main ../.git tag tag-one-tree tag tag-three-file
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
 525b7fb068d59950d185a8779dc957c77eed73ba	not-for-merge	tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three b/t/t5515/fetch.main_.._.git_tag_tag-one_tag_tag-three
index e488986653..a40b72817b 100644
--- a/t/t5515/fetch.master_.._.git_tag_tag-one_tag_tag-three
+++ b/t/t5515/fetch.main_.._.git_tag_tag-one_tag_tag-three
@@ -1,7 +1,7 @@
-# master ../.git tag tag-one tag tag-three
+# main ../.git tag tag-one tag tag-three
 8e32a6d901327a23ef831511badce7bf3bf46689		tag 'tag-one' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899		tag 'tag-three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
 525b7fb068d59950d185a8779dc957c77eed73ba	not-for-merge	tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_branches-default b/t/t5515/fetch.main_branches-default
index 2eedd3bfa4..e3466e8329 100644
--- a/t/t5515/fetch.master_branches-default
+++ b/t/t5515/fetch.main_branches-default
@@ -1,6 +1,6 @@
-# master branches-default
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+# main branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master_branches-one b/t/t5515/fetch.main_branches-one
index 901ce21d33..a94f11af4c 100644
--- a/t/t5515/fetch.master_branches-one
+++ b/t/t5515/fetch.main_branches-one
@@ -1,6 +1,6 @@
-# master branches-one
+# main branches-one
 8e32a6d901327a23ef831511badce7bf3bf46689		branch 'one' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master_config-explicit b/t/t5515/fetch.main_config-explicit
index 251c826aa9..16d04c14d2 100644
--- a/t/t5515/fetch.master_config-explicit
+++ b/t/t5515/fetch.main_config-explicit
@@ -1,9 +1,9 @@
-# master config-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+# main config-explicit
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master_config-glob b/t/t5515/fetch.main_config-glob
index 27c158e332..f6a6f56991 100644
--- a/t/t5515/fetch.master_config-glob
+++ b/t/t5515/fetch.main_config-glob
@@ -1,9 +1,9 @@
-# master config-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
+# main config-glob
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.master_remote-explicit b/t/t5515/fetch.main_remote-explicit
index b3cfe6b98b..bf4fd65e00 100644
--- a/t/t5515/fetch.master_remote-explicit
+++ b/t/t5515/fetch.main_remote-explicit
@@ -1,9 +1,9 @@
-# master remote-explicit
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f		branch 'master' of ../
+# main remote-explicit
+b4ab76b1a01ea602209932134a44f1e6bd610832		branch 'main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
 8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
 22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
 c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
diff --git a/t/t5515/fetch.main_remote-glob b/t/t5515/fetch.main_remote-glob
new file mode 100644
index 0000000000..91dc2e26ef
--- /dev/null
+++ b/t/t5515/fetch.main_remote-glob
@@ -0,0 +1,11 @@
+# main remote-glob
+b4ab76b1a01ea602209932134a44f1e6bd610832	not-for-merge	branch 'main' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
+ecf3b3627b498bdcb735cc4343bf165f76964e9a	not-for-merge	tag 'tag-main' of ../
+8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
+22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
+c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
+0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
+525b7fb068d59950d185a8779dc957c77eed73ba	not-for-merge	tag 'tag-two' of ../
diff --git a/t/t5515/fetch.master_remote-glob b/t/t5515/fetch.master_remote-glob
deleted file mode 100644
index 118befd1e4..0000000000
--- a/t/t5515/fetch.master_remote-glob
+++ /dev/null
@@ -1,11 +0,0 @@
-# master remote-glob
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f	not-for-merge	branch 'master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	branch 'one' of ../
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b	not-for-merge	branch 'three' of ../
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8	not-for-merge	branch 'two' of ../
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5	not-for-merge	tag 'tag-master' of ../
-8e32a6d901327a23ef831511badce7bf3bf46689	not-for-merge	tag 'tag-one' of ../
-22feea448b023a2d864ef94b013735af34d238ba	not-for-merge	tag 'tag-one-tree' of ../
-c61a82b60967180544e3c19f819ddbd0c9f89899	not-for-merge	tag 'tag-three' of ../
-0e3b14047d3ee365f4f2a1b673db059c3972589c	not-for-merge	tag 'tag-three-file' of ../
-525b7fb068d59950d185a8779dc957c77eed73ba	not-for-merge	tag 'tag-two' of ../
diff --git a/t/t5515/refs.br-branches-default b/t/t5515/refs.br-branches-default
index 21917c1e5d..dc4f2b7a4e 100644
--- a/t/t5515/refs.br-branches-default
+++ b/t/t5515/refs.br-branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-default-merge b/t/t5515/refs.br-branches-default-merge
index 21917c1e5d..dc4f2b7a4e 100644
--- a/t/t5515/refs.br-branches-default-merge
+++ b/t/t5515/refs.br-branches-default-merge
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-default-merge_branches-default b/t/t5515/refs.br-branches-default-merge_branches-default
index 21917c1e5d..dc4f2b7a4e 100644
--- a/t/t5515/refs.br-branches-default-merge_branches-default
+++ b/t/t5515/refs.br-branches-default-merge_branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-default-octopus b/t/t5515/refs.br-branches-default-octopus
index 21917c1e5d..dc4f2b7a4e 100644
--- a/t/t5515/refs.br-branches-default-octopus
+++ b/t/t5515/refs.br-branches-default-octopus
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-default-octopus_branches-default b/t/t5515/refs.br-branches-default-octopus_branches-default
index 21917c1e5d..dc4f2b7a4e 100644
--- a/t/t5515/refs.br-branches-default-octopus_branches-default
+++ b/t/t5515/refs.br-branches-default-octopus_branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-default_branches-default b/t/t5515/refs.br-branches-default_branches-default
index 21917c1e5d..dc4f2b7a4e 100644
--- a/t/t5515/refs.br-branches-default_branches-default
+++ b/t/t5515/refs.br-branches-default_branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one b/t/t5515/refs.br-branches-one
index 8a705a5df2..e8f79bf4b1 100644
--- a/t/t5515/refs.br-branches-one
+++ b/t/t5515/refs.br-branches-one
@@ -1,10 +1,10 @@
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one-merge b/t/t5515/refs.br-branches-one-merge
index 8a705a5df2..e8f79bf4b1 100644
--- a/t/t5515/refs.br-branches-one-merge
+++ b/t/t5515/refs.br-branches-one-merge
@@ -1,10 +1,10 @@
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one-merge_branches-one b/t/t5515/refs.br-branches-one-merge_branches-one
index 8a705a5df2..e8f79bf4b1 100644
--- a/t/t5515/refs.br-branches-one-merge_branches-one
+++ b/t/t5515/refs.br-branches-one-merge_branches-one
@@ -1,10 +1,10 @@
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one-octopus b/t/t5515/refs.br-branches-one-octopus
index 8a705a5df2..e8f79bf4b1 100644
--- a/t/t5515/refs.br-branches-one-octopus
+++ b/t/t5515/refs.br-branches-one-octopus
@@ -1,10 +1,10 @@
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one-octopus_branches-one b/t/t5515/refs.br-branches-one-octopus_branches-one
index 8a705a5df2..e8f79bf4b1 100644
--- a/t/t5515/refs.br-branches-one-octopus_branches-one
+++ b/t/t5515/refs.br-branches-one-octopus_branches-one
@@ -1,10 +1,10 @@
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-branches-one_branches-one b/t/t5515/refs.br-branches-one_branches-one
index 8a705a5df2..e8f79bf4b1 100644
--- a/t/t5515/refs.br-branches-one_branches-one
+++ b/t/t5515/refs.br-branches-one_branches-one
@@ -1,10 +1,10 @@
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit b/t/t5515/refs.br-config-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-explicit
+++ b/t/t5515/refs.br-config-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit-merge b/t/t5515/refs.br-config-explicit-merge
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-explicit-merge
+++ b/t/t5515/refs.br-config-explicit-merge
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit-merge_config-explicit b/t/t5515/refs.br-config-explicit-merge_config-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-explicit-merge_config-explicit
+++ b/t/t5515/refs.br-config-explicit-merge_config-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit-octopus b/t/t5515/refs.br-config-explicit-octopus
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-explicit-octopus
+++ b/t/t5515/refs.br-config-explicit-octopus
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit-octopus_config-explicit b/t/t5515/refs.br-config-explicit-octopus_config-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-explicit-octopus_config-explicit
+++ b/t/t5515/refs.br-config-explicit-octopus_config-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-explicit_config-explicit b/t/t5515/refs.br-config-explicit_config-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-explicit_config-explicit
+++ b/t/t5515/refs.br-config-explicit_config-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob b/t/t5515/refs.br-config-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-glob
+++ b/t/t5515/refs.br-config-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob-merge b/t/t5515/refs.br-config-glob-merge
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-glob-merge
+++ b/t/t5515/refs.br-config-glob-merge
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob-merge_config-glob b/t/t5515/refs.br-config-glob-merge_config-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-glob-merge_config-glob
+++ b/t/t5515/refs.br-config-glob-merge_config-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob-octopus b/t/t5515/refs.br-config-glob-octopus
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-glob-octopus
+++ b/t/t5515/refs.br-config-glob-octopus
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob-octopus_config-glob b/t/t5515/refs.br-config-glob-octopus_config-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-glob-octopus_config-glob
+++ b/t/t5515/refs.br-config-glob-octopus_config-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-config-glob_config-glob b/t/t5515/refs.br-config-glob_config-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-config-glob_config-glob
+++ b/t/t5515/refs.br-config-glob_config-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit b/t/t5515/refs.br-remote-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-explicit
+++ b/t/t5515/refs.br-remote-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit-merge b/t/t5515/refs.br-remote-explicit-merge
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-explicit-merge
+++ b/t/t5515/refs.br-remote-explicit-merge
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit-merge_remote-explicit b/t/t5515/refs.br-remote-explicit-merge_remote-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-explicit-merge_remote-explicit
+++ b/t/t5515/refs.br-remote-explicit-merge_remote-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit-octopus b/t/t5515/refs.br-remote-explicit-octopus
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-explicit-octopus
+++ b/t/t5515/refs.br-remote-explicit-octopus
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit-octopus_remote-explicit b/t/t5515/refs.br-remote-explicit-octopus_remote-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-explicit-octopus_remote-explicit
+++ b/t/t5515/refs.br-remote-explicit-octopus_remote-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-explicit_remote-explicit b/t/t5515/refs.br-remote-explicit_remote-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-explicit_remote-explicit
+++ b/t/t5515/refs.br-remote-explicit_remote-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob b/t/t5515/refs.br-remote-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-glob
+++ b/t/t5515/refs.br-remote-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob-merge b/t/t5515/refs.br-remote-glob-merge
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-glob-merge
+++ b/t/t5515/refs.br-remote-glob-merge
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob-merge_remote-glob b/t/t5515/refs.br-remote-glob-merge_remote-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-glob-merge_remote-glob
+++ b/t/t5515/refs.br-remote-glob-merge_remote-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob-octopus b/t/t5515/refs.br-remote-glob-octopus
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-glob-octopus
+++ b/t/t5515/refs.br-remote-glob-octopus
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob-octopus_remote-glob b/t/t5515/refs.br-remote-glob-octopus_remote-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-glob-octopus_remote-glob
+++ b/t/t5515/refs.br-remote-glob-octopus_remote-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-remote-glob_remote-glob b/t/t5515/refs.br-remote-glob_remote-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-remote-glob_remote-glob
+++ b/t/t5515/refs.br-remote-glob_remote-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig b/t/t5515/refs.br-unconfig
index 13e4ad2e46..f2ab01f68b 100644
--- a/t/t5515/refs.br-unconfig
+++ b/t/t5515/refs.br-unconfig
@@ -1,9 +1,9 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_--tags_.._.git b/t/t5515/refs.br-unconfig_--tags_.._.git
index 13e4ad2e46..f2ab01f68b 100644
--- a/t/t5515/refs.br-unconfig_--tags_.._.git
+++ b/t/t5515/refs.br-unconfig_--tags_.._.git
@@ -1,9 +1,9 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_.._.git b/t/t5515/refs.br-unconfig_.._.git
index 70962eaac1..4a74b68029 100644
--- a/t/t5515/refs.br-unconfig_.._.git
+++ b/t/t5515/refs.br-unconfig_.._.git
@@ -1,5 +1,5 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.br-unconfig_.._.git_one b/t/t5515/refs.br-unconfig_.._.git_one
index 70962eaac1..4a74b68029 100644
--- a/t/t5515/refs.br-unconfig_.._.git_one
+++ b/t/t5515/refs.br-unconfig_.._.git_one
@@ -1,5 +1,5 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/refs.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
index 13e4ad2e46..f2ab01f68b 100644
--- a/t/t5515/refs.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
+++ b/t/t5515/refs.br-unconfig_.._.git_one_tag_tag-one_tag_tag-three-file
@@ -1,9 +1,9 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_.._.git_one_two b/t/t5515/refs.br-unconfig_.._.git_one_two
index 70962eaac1..4a74b68029 100644
--- a/t/t5515/refs.br-unconfig_.._.git_one_two
+++ b/t/t5515/refs.br-unconfig_.._.git_one_two
@@ -1,5 +1,5 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/refs.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
index 13e4ad2e46..f2ab01f68b 100644
--- a/t/t5515/refs.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
+++ b/t/t5515/refs.br-unconfig_.._.git_tag_tag-one-tree_tag_tag-three-file
@@ -1,9 +1,9 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_.._.git_tag_tag-one_tag_tag-three b/t/t5515/refs.br-unconfig_.._.git_tag_tag-one_tag_tag-three
index 13e4ad2e46..f2ab01f68b 100644
--- a/t/t5515/refs.br-unconfig_.._.git_tag_tag-one_tag_tag-three
+++ b/t/t5515/refs.br-unconfig_.._.git_tag_tag-one_tag_tag-three
@@ -1,9 +1,9 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_branches-default b/t/t5515/refs.br-unconfig_branches-default
index 21917c1e5d..dc4f2b7a4e 100644
--- a/t/t5515/refs.br-unconfig_branches-default
+++ b/t/t5515/refs.br-unconfig_branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_branches-one b/t/t5515/refs.br-unconfig_branches-one
index 8a705a5df2..e8f79bf4b1 100644
--- a/t/t5515/refs.br-unconfig_branches-one
+++ b/t/t5515/refs.br-unconfig_branches-one
@@ -1,10 +1,10 @@
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_config-explicit b/t/t5515/refs.br-unconfig_config-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-unconfig_config-explicit
+++ b/t/t5515/refs.br-unconfig_config-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_config-glob b/t/t5515/refs.br-unconfig_config-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-unconfig_config-glob
+++ b/t/t5515/refs.br-unconfig_config-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_remote-explicit b/t/t5515/refs.br-unconfig_remote-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-unconfig_remote-explicit
+++ b/t/t5515/refs.br-unconfig_remote-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.br-unconfig_remote-glob b/t/t5515/refs.br-unconfig_remote-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.br-unconfig_remote-glob
+++ b/t/t5515/refs.br-unconfig_remote-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master b/t/t5515/refs.main
index 13e4ad2e46..f2ab01f68b 100644
--- a/t/t5515/refs.master
+++ b/t/t5515/refs.main
@@ -1,9 +1,9 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_--tags_.._.git b/t/t5515/refs.main_--tags_.._.git
index 13e4ad2e46..f2ab01f68b 100644
--- a/t/t5515/refs.master_--tags_.._.git
+++ b/t/t5515/refs.main_--tags_.._.git
@@ -1,9 +1,9 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_.._.git_one b/t/t5515/refs.main_.._.git
index 70962eaac1..4a74b68029 100644
--- a/t/t5515/refs.master_.._.git_one
+++ b/t/t5515/refs.main_.._.git
@@ -1,5 +1,5 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.master_.._.git b/t/t5515/refs.main_.._.git_one
index 70962eaac1..4a74b68029 100644
--- a/t/t5515/refs.master_.._.git
+++ b/t/t5515/refs.main_.._.git_one
@@ -1,5 +1,5 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.master_.._.git_one_tag_tag-one_tag_tag-three-file b/t/t5515/refs.main_.._.git_one_tag_tag-one_tag_tag-three-file
index 13e4ad2e46..f2ab01f68b 100644
--- a/t/t5515/refs.master_.._.git_one_tag_tag-one_tag_tag-three-file
+++ b/t/t5515/refs.main_.._.git_one_tag_tag-one_tag_tag-three-file
@@ -1,9 +1,9 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_.._.git_one_two b/t/t5515/refs.main_.._.git_one_two
index 70962eaac1..4a74b68029 100644
--- a/t/t5515/refs.master_.._.git_one_two
+++ b/t/t5515/refs.main_.._.git_one_two
@@ -1,5 +1,5 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
diff --git a/t/t5515/refs.master_.._.git_tag_tag-one-tree_tag_tag-three-file b/t/t5515/refs.main_.._.git_tag_tag-one-tree_tag_tag-three-file
index 13e4ad2e46..f2ab01f68b 100644
--- a/t/t5515/refs.master_.._.git_tag_tag-one-tree_tag_tag-three-file
+++ b/t/t5515/refs.main_.._.git_tag_tag-one-tree_tag_tag-three-file
@@ -1,9 +1,9 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.main_.._.git_tag_tag-one_tag_tag-three b/t/t5515/refs.main_.._.git_tag_tag-one_tag_tag-three
new file mode 100644
index 0000000000..f2ab01f68b
--- /dev/null
+++ b/t/t5515/refs.main_.._.git_tag_tag-one_tag_tag-three
@@ -0,0 +1,11 @@
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
+8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
+0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
+6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
+8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
+22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
+c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
+0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
+525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two
diff --git a/t/t5515/refs.master_branches-default b/t/t5515/refs.main_branches-default
index 21917c1e5d..dc4f2b7a4e 100644
--- a/t/t5515/refs.master_branches-default
+++ b/t/t5515/refs.main_branches-default
@@ -1,10 +1,10 @@
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/heads/branches-default
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/heads/branches-default
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_branches-one b/t/t5515/refs.main_branches-one
index 8a705a5df2..e8f79bf4b1 100644
--- a/t/t5515/refs.master_branches-one
+++ b/t/t5515/refs.main_branches-one
@@ -1,10 +1,10 @@
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/heads/branches-one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_config-explicit b/t/t5515/refs.main_config-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.master_config-explicit
+++ b/t/t5515/refs.main_config-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_config-glob b/t/t5515/refs.main_config-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.master_config-glob
+++ b/t/t5515/refs.main_config-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_remote-explicit b/t/t5515/refs.main_remote-explicit
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.master_remote-explicit
+++ b/t/t5515/refs.main_remote-explicit
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_remote-glob b/t/t5515/refs.main_remote-glob
index 9bbbfd9fc5..a28fa5f56e 100644
--- a/t/t5515/refs.master_remote-glob
+++ b/t/t5515/refs.main_remote-glob
@@ -1,13 +1,13 @@
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/origin/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/rem/master
+b4ab76b1a01ea602209932134a44f1e6bd610832 refs/remotes/rem/main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/rem/one
 0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/rem/three
 6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/rem/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
+ecf3b3627b498bdcb735cc4343bf165f76964e9a refs/tags/tag-main
 8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
 22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
 c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
diff --git a/t/t5515/refs.master_.._.git_tag_tag-one_tag_tag-three b/t/t5515/refs.master_.._.git_tag_tag-one_tag_tag-three
deleted file mode 100644
index 13e4ad2e46..0000000000
--- a/t/t5515/refs.master_.._.git_tag_tag-one_tag_tag-three
+++ /dev/null
@@ -1,11 +0,0 @@
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/HEAD
-754b754407bf032e9a2f9d5a9ad05ca79a6b228f refs/remotes/origin/master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/remotes/origin/one
-0567da4d5edd2ff4bb292a465ba9e64dcad9536b refs/remotes/origin/three
-6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 refs/remotes/origin/two
-6c9dec2b923228c9ff994c6cfe4ae16c12408dc5 refs/tags/tag-master
-8e32a6d901327a23ef831511badce7bf3bf46689 refs/tags/tag-one
-22feea448b023a2d864ef94b013735af34d238ba refs/tags/tag-one-tree
-c61a82b60967180544e3c19f819ddbd0c9f89899 refs/tags/tag-three
-0e3b14047d3ee365f4f2a1b673db059c3972589c refs/tags/tag-three-file
-525b7fb068d59950d185a8779dc957c77eed73ba refs/tags/tag-two
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index c81ca360ac..4db8edd9c8 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -14,6 +14,9 @@ This test checks the following functionality:
 * reflogs
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 D=$(pwd)
@@ -120,13 +123,13 @@ test_expect_success setup '
 	git add path1 &&
 	test_tick &&
 	git commit -a -m repo &&
-	the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
+	the_first_commit=$(git show-ref -s --verify refs/heads/main) &&
 
 	>path2 &&
 	git add path2 &&
 	test_tick &&
 	git commit -a -m second &&
-	the_commit=$(git show-ref -s --verify refs/heads/master)
+	the_commit=$(git show-ref -s --verify refs/heads/main)
 
 '
 
@@ -134,9 +137,9 @@ test_expect_success 'fetch without wildcard' '
 	mk_empty testrepo &&
 	(
 		cd testrepo &&
-		git fetch .. refs/heads/master:refs/remotes/origin/master &&
+		git fetch .. refs/heads/main:refs/remotes/origin/main &&
 
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
 		git for-each-ref refs/remotes/origin >actual &&
 		test_cmp expect actual
 	)
@@ -150,7 +153,7 @@ test_expect_success 'fetch with wildcard' '
 		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
 		git fetch up &&
 
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
 		git for-each-ref refs/remotes/origin >actual &&
 		test_cmp expect actual
 	)
@@ -166,7 +169,7 @@ test_expect_success 'fetch with insteadOf' '
 		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
 		git fetch up &&
 
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
 		git for-each-ref refs/remotes/origin >actual &&
 		test_cmp expect actual
 	)
@@ -182,19 +185,57 @@ test_expect_success 'fetch with pushInsteadOf (should not rewrite)' '
 		git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
 		git fetch up &&
 
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
 		git for-each-ref refs/remotes/origin >actual &&
 		test_cmp expect actual
 	)
 '
 
+grep_wrote () {
+	object_count=$1
+	file_name=$2
+	grep 'write_pack_file/wrote.*"value":"'$1'"' $2
+}
+
+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 &&
+	grep_wrote 5 event && # 2 commits, 2 trees, 1 blob
+
+	# Same commands, but 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
+'
+
+test_expect_success 'push with negotiation proceeds anyway even if negotiation fails' '
+	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 &&
+	grep_wrote 5 event && # 2 commits, 2 trees, 1 blob
+	test_i18ngrep "push negotiation failed" err
+'
+
 test_expect_success 'push without wildcard' '
 	mk_empty testrepo &&
 
-	git push testrepo refs/heads/master:refs/remotes/origin/master &&
+	git push testrepo refs/heads/main:refs/remotes/origin/main &&
 	(
 		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
 		git for-each-ref refs/remotes/origin >actual &&
 		test_cmp expect actual
 	)
@@ -206,7 +247,7 @@ test_expect_success 'push with wildcard' '
 	git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
 	(
 		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
 		git for-each-ref refs/remotes/origin >actual &&
 		test_cmp expect actual
 	)
@@ -216,10 +257,10 @@ test_expect_success 'push with insteadOf' '
 	mk_empty testrepo &&
 	TRASH="$(pwd)/" &&
 	test_config "url.$TRASH.insteadOf" trash/ &&
-	git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
+	git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
 	(
 		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
 		git for-each-ref refs/remotes/origin >actual &&
 		test_cmp expect actual
 	)
@@ -229,10 +270,10 @@ test_expect_success 'push with pushInsteadOf' '
 	mk_empty testrepo &&
 	TRASH="$(pwd)/" &&
 	test_config "url.$TRASH.pushInsteadOf" trash/ &&
-	git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
+	git push trash/testrepo refs/heads/main:refs/remotes/origin/main &&
 	(
 		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
 		git for-each-ref refs/remotes/origin >actual &&
 		test_cmp expect actual
 	)
@@ -244,10 +285,10 @@ test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf
 	test_config "url.trash3/.pushInsteadOf" trash/wrong &&
 	test_config remote.r.url trash/wrong &&
 	test_config remote.r.pushurl "testrepo/" &&
-	git push r refs/heads/master:refs/remotes/origin/master &&
+	git push r refs/heads/main:refs/remotes/origin/main &&
 	(
 		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
 		git for-each-ref refs/remotes/origin >actual &&
 		test_cmp expect actual
 	)
@@ -255,101 +296,101 @@ test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf
 
 test_expect_success 'push with matching heads' '
 
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	git push testrepo : &&
-	check_push_result testrepo $the_commit heads/master
+	check_push_result testrepo $the_commit heads/main
 
 '
 
 test_expect_success 'push with matching heads on the command line' '
 
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	git push testrepo : &&
-	check_push_result testrepo $the_commit heads/master
+	check_push_result testrepo $the_commit heads/main
 
 '
 
 test_expect_success 'failed (non-fast-forward) push with matching heads' '
 
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	git push testrepo : &&
 	git commit --amend -massaged &&
 	test_must_fail git push testrepo &&
-	check_push_result testrepo $the_commit heads/master &&
+	check_push_result testrepo $the_commit heads/main &&
 	git reset --hard $the_commit
 
 '
 
 test_expect_success 'push --force with matching heads' '
 
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	git push testrepo : &&
 	git commit --amend -massaged &&
 	git push --force testrepo : &&
-	! check_push_result testrepo $the_commit heads/master &&
+	! check_push_result testrepo $the_commit heads/main &&
 	git reset --hard $the_commit
 
 '
 
 test_expect_success 'push with matching heads and forced update' '
 
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	git push testrepo : &&
 	git commit --amend -massaged &&
 	git push testrepo +: &&
-	! check_push_result testrepo $the_commit heads/master &&
+	! check_push_result testrepo $the_commit heads/main &&
 	git reset --hard $the_commit
 
 '
 
 test_expect_success 'push with no ambiguity (1)' '
 
-	mk_test testrepo heads/master &&
-	git push testrepo master:master &&
-	check_push_result testrepo $the_commit heads/master
+	mk_test testrepo heads/main &&
+	git push testrepo main:main &&
+	check_push_result testrepo $the_commit heads/main
 
 '
 
 test_expect_success 'push with no ambiguity (2)' '
 
-	mk_test testrepo remotes/origin/master &&
-	git push testrepo master:origin/master &&
-	check_push_result testrepo $the_commit remotes/origin/master
+	mk_test testrepo remotes/origin/main &&
+	git push testrepo main:origin/main &&
+	check_push_result testrepo $the_commit remotes/origin/main
 
 '
 
 test_expect_success 'push with colon-less refspec, no ambiguity' '
 
-	mk_test testrepo heads/master heads/t/master &&
-	git branch -f t/master master &&
-	git push testrepo master &&
-	check_push_result testrepo $the_commit heads/master &&
-	check_push_result testrepo $the_first_commit heads/t/master
+	mk_test testrepo heads/main heads/t/main &&
+	git branch -f t/main main &&
+	git push testrepo main &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit heads/t/main
 
 '
 
 test_expect_success 'push with weak ambiguity (1)' '
 
-	mk_test testrepo heads/master remotes/origin/master &&
-	git push testrepo master:master &&
-	check_push_result testrepo $the_commit heads/master &&
-	check_push_result testrepo $the_first_commit remotes/origin/master
+	mk_test testrepo heads/main remotes/origin/main &&
+	git push testrepo main:main &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit remotes/origin/main
 
 '
 
 test_expect_success 'push with weak ambiguity (2)' '
 
-	mk_test testrepo heads/master remotes/origin/master remotes/another/master &&
-	git push testrepo master:master &&
-	check_push_result testrepo $the_commit heads/master &&
-	check_push_result testrepo $the_first_commit remotes/origin/master remotes/another/master
+	mk_test testrepo heads/main remotes/origin/main remotes/another/main &&
+	git push testrepo main:main &&
+	check_push_result testrepo $the_commit heads/main &&
+	check_push_result testrepo $the_first_commit remotes/origin/main remotes/another/main
 
 '
 
 test_expect_success 'push with ambiguity' '
 
 	mk_test testrepo heads/frotz tags/frotz &&
-	test_must_fail git push testrepo master:frotz &&
+	test_must_fail git push testrepo main:frotz &&
 	check_push_result testrepo $the_first_commit heads/frotz tags/frotz
 
 '
@@ -357,7 +398,7 @@ test_expect_success 'push with ambiguity' '
 test_expect_success 'push with colon-less refspec (1)' '
 
 	mk_test testrepo heads/frotz tags/frotz &&
-	git branch -f frotz master &&
+	git branch -f frotz main &&
 	git push testrepo frotz &&
 	check_push_result testrepo $the_commit heads/frotz &&
 	check_push_result testrepo $the_first_commit tags/frotz
@@ -385,7 +426,7 @@ test_expect_success 'push with colon-less refspec (3)' '
 	then
 		git tag -d frotz
 	fi &&
-	git branch -f frotz master &&
+	git branch -f frotz main &&
 	git push testrepo frotz &&
 	check_push_result testrepo $the_commit heads/frotz &&
 	test 1 = $( cd testrepo && git show-ref | wc -l )
@@ -408,7 +449,7 @@ test_expect_success 'push with colon-less refspec (4)' '
 test_expect_success 'push head with non-existent, incomplete dest' '
 
 	mk_test testrepo &&
-	git push testrepo master:branch &&
+	git push testrepo main:branch &&
 	check_push_result testrepo $the_commit heads/branch
 
 '
@@ -425,236 +466,235 @@ test_expect_success 'push tag with non-existent, incomplete dest' '
 test_expect_success 'push sha1 with non-existent, incomplete dest' '
 
 	mk_test testrepo &&
-	test_must_fail git push testrepo $(git rev-parse master):foo
+	test_must_fail git push testrepo $(git rev-parse main):foo
 
 '
 
 test_expect_success 'push ref expression with non-existent, incomplete dest' '
 
 	mk_test testrepo &&
-	test_must_fail git push testrepo master^:branch
+	test_must_fail git push testrepo main^:branch
 
 '
 
-test_expect_success 'push with HEAD' '
-
-	mk_test testrepo heads/master &&
-	git checkout master &&
-	git push testrepo HEAD &&
-	check_push_result testrepo $the_commit heads/master
-
-'
-
-test_expect_success 'push with HEAD nonexisting at remote' '
-
-	mk_test testrepo heads/master &&
-	git checkout -b local master &&
-	git push testrepo HEAD &&
-	check_push_result testrepo $the_commit heads/local
-'
-
-test_expect_success 'push with +HEAD' '
-
-	mk_test testrepo heads/master &&
-	git checkout master &&
-	git branch -D local &&
-	git checkout -b local &&
-	git push testrepo master local &&
-	check_push_result testrepo $the_commit heads/master &&
-	check_push_result testrepo $the_commit heads/local &&
-
-	# Without force rewinding should fail
-	git reset --hard HEAD^ &&
-	test_must_fail git push testrepo HEAD &&
-	check_push_result testrepo $the_commit heads/local &&
+for head in HEAD @
+do
 
-	# With force rewinding should succeed
-	git push testrepo +HEAD &&
-	check_push_result testrepo $the_first_commit heads/local
+	test_expect_success "push with $head" '
+		mk_test testrepo heads/main &&
+		git checkout main &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/main
+	'
 
-'
+	test_expect_success "push with $head nonexisting at remote" '
+		mk_test testrepo heads/main &&
+		git checkout -b local main &&
+		test_when_finished "git checkout main; git branch -D local" &&
+		git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local
+	'
 
-test_expect_success 'push HEAD with non-existent, incomplete dest' '
+	test_expect_success "push with +$head" '
+		mk_test testrepo heads/main &&
+		git checkout -b local main &&
+		test_when_finished "git checkout main; git branch -D local" &&
+		git push testrepo main local &&
+		check_push_result testrepo $the_commit heads/main &&
+		check_push_result testrepo $the_commit heads/local &&
+
+		# Without force rewinding should fail
+		git reset --hard $head^ &&
+		test_must_fail git push testrepo $head &&
+		check_push_result testrepo $the_commit heads/local &&
+
+		# With force rewinding should succeed
+		git push testrepo +$head &&
+		check_push_result testrepo $the_first_commit heads/local
+	'
 
-	mk_test testrepo &&
-	git checkout master &&
-	git push testrepo HEAD:branch &&
-	check_push_result testrepo $the_commit heads/branch
+	test_expect_success "push $head with non-existent, incomplete dest" '
+		mk_test testrepo &&
+		git checkout main &&
+		git push testrepo $head:branch &&
+		check_push_result testrepo $the_commit heads/branch
 
-'
+	'
 
-test_expect_success 'push with config remote.*.push = HEAD' '
+	test_expect_success "push with config remote.*.push = $head" '
+		mk_test testrepo heads/local &&
+		git checkout main &&
+		git branch -f local $the_commit &&
+		test_when_finished "git branch -D local" &&
+		(
+			cd testrepo &&
+			git checkout local &&
+			git reset --hard $the_first_commit
+		) &&
+		test_config remote.there.url testrepo &&
+		test_config remote.there.push $head &&
+		test_config branch.main.remote there &&
+		git push &&
+		check_push_result testrepo $the_commit heads/main &&
+		check_push_result testrepo $the_first_commit heads/local
+	'
 
-	mk_test testrepo heads/local &&
-	git checkout master &&
-	git branch -f local $the_commit &&
-	(
-		cd testrepo &&
-		git checkout local &&
-		git reset --hard $the_first_commit
-	) &&
-	test_config remote.there.url testrepo &&
-	test_config remote.there.push HEAD &&
-	test_config branch.master.remote there &&
-	git push &&
-	check_push_result testrepo $the_commit heads/master &&
-	check_push_result testrepo $the_first_commit heads/local
-'
+done
 
 test_expect_success 'push with remote.pushdefault' '
-	mk_test up_repo heads/master &&
-	mk_test down_repo heads/master &&
+	mk_test up_repo heads/main &&
+	mk_test down_repo heads/main &&
 	test_config remote.up.url up_repo &&
 	test_config remote.down.url down_repo &&
-	test_config branch.master.remote up &&
+	test_config branch.main.remote up &&
 	test_config remote.pushdefault down &&
 	test_config push.default matching &&
 	git push &&
-	check_push_result up_repo $the_first_commit heads/master &&
-	check_push_result down_repo $the_commit heads/master
+	check_push_result up_repo $the_first_commit heads/main &&
+	check_push_result down_repo $the_commit heads/main
 '
 
 test_expect_success 'push with config remote.*.pushurl' '
 
-	mk_test testrepo heads/master &&
-	git checkout master &&
+	mk_test testrepo heads/main &&
+	git checkout main &&
 	test_config remote.there.url test2repo &&
 	test_config remote.there.pushurl testrepo &&
 	git push there : &&
-	check_push_result testrepo $the_commit heads/master
+	check_push_result testrepo $the_commit heads/main
 '
 
 test_expect_success 'push with config branch.*.pushremote' '
-	mk_test up_repo heads/master &&
-	mk_test side_repo heads/master &&
-	mk_test down_repo heads/master &&
+	mk_test up_repo heads/main &&
+	mk_test side_repo heads/main &&
+	mk_test down_repo heads/main &&
 	test_config remote.up.url up_repo &&
 	test_config remote.pushdefault side_repo &&
 	test_config remote.down.url down_repo &&
-	test_config branch.master.remote up &&
-	test_config branch.master.pushremote down &&
+	test_config branch.main.remote up &&
+	test_config branch.main.pushremote down &&
 	test_config push.default matching &&
 	git push &&
-	check_push_result up_repo $the_first_commit heads/master &&
-	check_push_result side_repo $the_first_commit heads/master &&
-	check_push_result down_repo $the_commit heads/master
+	check_push_result up_repo $the_first_commit heads/main &&
+	check_push_result side_repo $the_first_commit heads/main &&
+	check_push_result down_repo $the_commit heads/main
 '
 
 test_expect_success 'branch.*.pushremote config order is irrelevant' '
-	mk_test one_repo heads/master &&
-	mk_test two_repo heads/master &&
+	mk_test one_repo heads/main &&
+	mk_test two_repo heads/main &&
 	test_config remote.one.url one_repo &&
 	test_config remote.two.url two_repo &&
-	test_config branch.master.pushremote two_repo &&
+	test_config branch.main.pushremote two_repo &&
 	test_config remote.pushdefault one_repo &&
 	test_config push.default matching &&
 	git push &&
-	check_push_result one_repo $the_first_commit heads/master &&
-	check_push_result two_repo $the_commit heads/master
+	check_push_result one_repo $the_first_commit heads/main &&
+	check_push_result two_repo $the_commit heads/main
 '
 
 test_expect_success 'push with dry-run' '
 
-	mk_test testrepo heads/master &&
-	old_commit=$(git -C testrepo show-ref -s --verify refs/heads/master) &&
+	mk_test testrepo heads/main &&
+	old_commit=$(git -C testrepo show-ref -s --verify refs/heads/main) &&
 	git push --dry-run testrepo : &&
-	check_push_result testrepo $old_commit heads/master
+	check_push_result testrepo $old_commit heads/main
 '
 
 test_expect_success 'push updates local refs' '
 
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	mk_child testrepo child &&
 	(
 		cd child &&
-		git pull .. master &&
+		git pull .. main &&
 		git push &&
-		test $(git rev-parse master) = \
-			$(git rev-parse remotes/origin/master)
+		test $(git rev-parse main) = \
+			$(git rev-parse remotes/origin/main)
 	)
 
 '
 
 test_expect_success 'push updates up-to-date local refs' '
 
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	mk_child testrepo child1 &&
 	mk_child testrepo child2 &&
-	(cd child1 && git pull .. master && git push) &&
+	(cd child1 && git pull .. main && git push) &&
 	(
 		cd child2 &&
-		git pull ../child1 master &&
+		git pull ../child1 main &&
 		git push &&
-		test $(git rev-parse master) = \
-			$(git rev-parse remotes/origin/master)
+		test $(git rev-parse main) = \
+			$(git rev-parse remotes/origin/main)
 	)
 
 '
 
 test_expect_success 'push preserves up-to-date packed refs' '
 
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	mk_child testrepo child &&
 	(
 		cd child &&
 		git push &&
-		! test -f .git/refs/remotes/origin/master
+		! test -f .git/refs/remotes/origin/main
 	)
 
 '
 
 test_expect_success 'push does not update local refs on failure' '
 
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	mk_child testrepo child &&
 	mkdir testrepo/.git/hooks &&
 	echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
 	chmod +x testrepo/.git/hooks/pre-receive &&
 	(
 		cd child &&
-		git pull .. master &&
+		git pull .. main &&
 		test_must_fail git push &&
-		test $(git rev-parse master) != \
-			$(git rev-parse remotes/origin/master)
+		test $(git rev-parse main) != \
+			$(git rev-parse remotes/origin/main)
 	)
 
 '
 
 test_expect_success 'allow deleting an invalid remote ref' '
 
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	rm -f testrepo/.git/objects/??/* &&
-	git push testrepo :refs/heads/master &&
-	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
+	git push testrepo :refs/heads/main &&
+	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/main)
 
 '
 
 test_expect_success 'pushing valid refs triggers post-receive and post-update hooks' '
-	mk_test_with_hooks testrepo heads/master heads/next &&
-	orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
-	newmaster=$(git show-ref -s --verify refs/heads/master) &&
+	mk_test_with_hooks testrepo heads/main heads/next &&
+	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+	newmain=$(git show-ref -s --verify refs/heads/main) &&
 	orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
 	newnext=$ZERO_OID &&
-	git push testrepo refs/heads/master:refs/heads/master :refs/heads/next &&
+	git push testrepo refs/heads/main:refs/heads/main :refs/heads/next &&
 	(
 		cd testrepo/.git &&
 		cat >pre-receive.expect <<-EOF &&
-		$orgmaster $newmaster refs/heads/master
+		$orgmain $newmain refs/heads/main
 		$orgnext $newnext refs/heads/next
 		EOF
 
 		cat >update.expect <<-EOF &&
-		refs/heads/master $orgmaster $newmaster
+		refs/heads/main $orgmain $newmain
 		refs/heads/next $orgnext $newnext
 		EOF
 
 		cat >post-receive.expect <<-EOF &&
-		$orgmaster $newmaster refs/heads/master
+		$orgmain $newmain refs/heads/main
 		$orgnext $newnext refs/heads/next
 		EOF
 
 		cat >post-update.expect <<-EOF &&
-		refs/heads/master
+		refs/heads/main
 		refs/heads/next
 		EOF
 
@@ -666,25 +706,25 @@ 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/master &&
+	mk_test_with_hooks testrepo heads/main &&
 	rm -f testrepo/.git/objects/??/* &&
-	git push testrepo :refs/heads/master &&
+	git push testrepo :refs/heads/main &&
 	(
 		cd testrepo/.git &&
 		cat >pre-receive.expect <<-EOF &&
-		$ZERO_OID $ZERO_OID refs/heads/master
+		$ZERO_OID $ZERO_OID refs/heads/main
 		EOF
 
 		cat >update.expect <<-EOF &&
-		refs/heads/master $ZERO_OID $ZERO_OID
+		refs/heads/main $ZERO_OID $ZERO_OID
 		EOF
 
 		cat >post-receive.expect <<-EOF &&
-		$ZERO_OID $ZERO_OID refs/heads/master
+		$ZERO_OID $ZERO_OID refs/heads/main
 		EOF
 
 		cat >post-update.expect <<-EOF &&
-		refs/heads/master
+		refs/heads/main
 		EOF
 
 		test_cmp pre-receive.expect pre-receive.actual &&
@@ -695,28 +735,28 @@ test_expect_success 'deleting dangling ref triggers hooks with correct args' '
 '
 
 test_expect_success 'deletion of a non-existent ref is not fed to post-receive and post-update hooks' '
-	mk_test_with_hooks testrepo heads/master &&
-	orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
-	newmaster=$(git show-ref -s --verify refs/heads/master) &&
-	git push testrepo master :refs/heads/nonexistent &&
+	mk_test_with_hooks testrepo heads/main &&
+	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+	newmain=$(git show-ref -s --verify refs/heads/main) &&
+	git push testrepo main :refs/heads/nonexistent &&
 	(
 		cd testrepo/.git &&
 		cat >pre-receive.expect <<-EOF &&
-		$orgmaster $newmaster refs/heads/master
+		$orgmain $newmain refs/heads/main
 		$ZERO_OID $ZERO_OID refs/heads/nonexistent
 		EOF
 
 		cat >update.expect <<-EOF &&
-		refs/heads/master $orgmaster $newmaster
+		refs/heads/main $orgmain $newmain
 		refs/heads/nonexistent $ZERO_OID $ZERO_OID
 		EOF
 
 		cat >post-receive.expect <<-EOF &&
-		$orgmaster $newmaster refs/heads/master
+		$orgmain $newmain refs/heads/main
 		EOF
 
 		cat >post-update.expect <<-EOF &&
-		refs/heads/master
+		refs/heads/main
 		EOF
 
 		test_cmp pre-receive.expect pre-receive.actual &&
@@ -727,7 +767,7 @@ test_expect_success 'deletion of a non-existent ref is not fed to post-receive a
 '
 
 test_expect_success 'deletion of a non-existent ref alone does trigger post-receive and post-update hooks' '
-	mk_test_with_hooks testrepo heads/master &&
+	mk_test_with_hooks testrepo heads/main &&
 	git push testrepo :refs/heads/nonexistent &&
 	(
 		cd testrepo/.git &&
@@ -747,42 +787,42 @@ test_expect_success 'deletion of a non-existent ref alone does trigger post-rece
 '
 
 test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input' '
-	mk_test_with_hooks testrepo heads/master heads/next heads/pu &&
-	orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
-	newmaster=$(git show-ref -s --verify refs/heads/master) &&
+	mk_test_with_hooks testrepo heads/main heads/next heads/seen &&
+	orgmain=$(cd testrepo && git show-ref -s --verify refs/heads/main) &&
+	newmain=$(git show-ref -s --verify refs/heads/main) &&
 	orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
 	newnext=$ZERO_OID &&
-	orgpu=$(cd testrepo && git show-ref -s --verify refs/heads/pu) &&
-	newpu=$(git show-ref -s --verify refs/heads/master) &&
-	git push testrepo refs/heads/master:refs/heads/master \
-	    refs/heads/master:refs/heads/pu :refs/heads/next \
+	orgseen=$(cd testrepo && git show-ref -s --verify refs/heads/seen) &&
+	newseen=$(git show-ref -s --verify refs/heads/main) &&
+	git push testrepo refs/heads/main:refs/heads/main \
+	    refs/heads/main:refs/heads/seen :refs/heads/next \
 	    :refs/heads/nonexistent &&
 	(
 		cd testrepo/.git &&
 		cat >pre-receive.expect <<-EOF &&
-		$orgmaster $newmaster refs/heads/master
+		$orgmain $newmain refs/heads/main
 		$orgnext $newnext refs/heads/next
-		$orgpu $newpu refs/heads/pu
+		$orgseen $newseen refs/heads/seen
 		$ZERO_OID $ZERO_OID refs/heads/nonexistent
 		EOF
 
 		cat >update.expect <<-EOF &&
-		refs/heads/master $orgmaster $newmaster
+		refs/heads/main $orgmain $newmain
 		refs/heads/next $orgnext $newnext
-		refs/heads/pu $orgpu $newpu
+		refs/heads/seen $orgseen $newseen
 		refs/heads/nonexistent $ZERO_OID $ZERO_OID
 		EOF
 
 		cat >post-receive.expect <<-EOF &&
-		$orgmaster $newmaster refs/heads/master
+		$orgmain $newmain refs/heads/main
 		$orgnext $newnext refs/heads/next
-		$orgpu $newpu refs/heads/pu
+		$orgseen $newseen refs/heads/seen
 		EOF
 
 		cat >post-update.expect <<-EOF &&
-		refs/heads/master
+		refs/heads/main
 		refs/heads/next
-		refs/heads/pu
+		refs/heads/seen
 		EOF
 
 		test_cmp pre-receive.expect pre-receive.actual &&
@@ -793,15 +833,15 @@ test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks w
 '
 
 test_expect_success 'allow deleting a ref using --delete' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	(cd testrepo && git config receive.denyDeleteCurrent warn) &&
-	git push testrepo --delete master &&
-	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
+	git push testrepo --delete main &&
+	(cd testrepo && test_must_fail git rev-parse --verify refs/heads/main)
 '
 
 test_expect_success 'allow deleting a tag using --delete' '
-	mk_test testrepo heads/master &&
-	git tag -a -m dummy_message deltag heads/master &&
+	mk_test testrepo heads/main &&
+	git tag -a -m dummy_message deltag heads/main &&
 	git push testrepo --tags &&
 	(cd testrepo && git rev-parse --verify -q refs/tags/deltag) &&
 	git push testrepo --delete tag deltag &&
@@ -809,56 +849,61 @@ test_expect_success 'allow deleting a tag using --delete' '
 '
 
 test_expect_success 'push --delete without args aborts' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	test_must_fail git push testrepo --delete
 '
 
 test_expect_success 'push --delete refuses src:dest refspecs' '
+	mk_test testrepo heads/main &&
+	test_must_fail git push testrepo --delete main:foo
+'
+
+test_expect_success 'push --delete refuses empty string' '
 	mk_test testrepo heads/master &&
-	test_must_fail git push testrepo --delete master:foo
+	test_must_fail git push testrepo --delete ""
 '
 
 test_expect_success 'warn on push to HEAD of non-bare repository' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	(
 		cd testrepo &&
-		git checkout master &&
+		git checkout main &&
 		git config receive.denyCurrentBranch warn
 	) &&
-	git push testrepo master 2>stderr &&
+	git push testrepo main 2>stderr &&
 	grep "warning: updating the current branch" stderr
 '
 
 test_expect_success 'deny push to HEAD of non-bare repository' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	(
 		cd testrepo &&
-		git checkout master &&
+		git checkout main &&
 		git config receive.denyCurrentBranch true
 	) &&
-	test_must_fail git push testrepo master
+	test_must_fail git push testrepo main
 '
 
 test_expect_success 'allow push to HEAD of bare repository (bare)' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	(
 		cd testrepo &&
-		git checkout master &&
+		git checkout main &&
 		git config receive.denyCurrentBranch true &&
 		git config core.bare true
 	) &&
-	git push testrepo master 2>stderr &&
+	git push testrepo main 2>stderr &&
 	! grep "warning: updating the current branch" stderr
 '
 
 test_expect_success 'allow push to HEAD of non-bare repository (config)' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	(
 		cd testrepo &&
-		git checkout master &&
+		git checkout main &&
 		git config receive.denyCurrentBranch false
 	) &&
-	git push testrepo master 2>stderr &&
+	git push testrepo main 2>stderr &&
 	! grep "warning: updating the current branch" stderr
 '
 
@@ -874,7 +919,7 @@ test_expect_success 'fetch with branches' '
 		git for-each-ref refs/heads >actual &&
 		test_cmp expect actual
 	) &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'fetch with branches containing #' '
@@ -887,7 +932,7 @@ test_expect_success 'fetch with branches containing #' '
 		git for-each-ref refs/heads >actual &&
 		test_cmp expect actual
 	) &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'push with branches' '
@@ -897,7 +942,7 @@ test_expect_success 'push with branches' '
 	git push branch1 &&
 	(
 		cd testrepo &&
-		echo "$the_first_commit commit	refs/heads/master" >expect &&
+		echo "$the_first_commit commit	refs/heads/main" >expect &&
 		git for-each-ref refs/heads >actual &&
 		test_cmp expect actual
 	)
@@ -913,11 +958,11 @@ test_expect_success 'push with branches containing #' '
 		git for-each-ref refs/heads >actual &&
 		test_cmp expect actual
 	) &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'push into aliased refs (consistent)' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	mk_child testrepo child1 &&
 	mk_child testrepo child2 &&
 	(
@@ -939,7 +984,7 @@ test_expect_success 'push into aliased refs (consistent)' '
 '
 
 test_expect_success 'push into aliased refs (inconsistent)' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	mk_child testrepo child1 &&
 	mk_child testrepo child2 &&
 	(
@@ -970,7 +1015,7 @@ test_force_push_tag () {
 	tag_args=$2
 
 	test_expect_success "force pushing required to update $tag_type_description" "
-		mk_test testrepo heads/master &&
+		mk_test testrepo heads/main &&
 		mk_child testrepo child1 &&
 		mk_child testrepo child2 &&
 		(
@@ -1016,7 +1061,7 @@ test_force_fetch_tag () {
 	tag_args=$2
 
 	test_expect_success "fetch will not clobber an existing $tag_type_description without --force" "
-		mk_test testrepo heads/master &&
+		mk_test testrepo heads/main &&
 		mk_child testrepo child1 &&
 		mk_child testrepo child2 &&
 		(
@@ -1039,12 +1084,12 @@ test_force_fetch_tag "annotated tag" "-f -a -m'tag message'"
 test_expect_success 'push --porcelain' '
 	mk_empty testrepo &&
 	echo >.git/foo  "To testrepo" &&
-	echo >>.git/foo "*	refs/heads/master:refs/remotes/origin/master	[new branch]"  &&
+	echo >>.git/foo "*	refs/heads/main:refs/remotes/origin/main	[new reference]"  &&
 	echo >>.git/foo "Done" &&
-	git push >.git/bar --porcelain  testrepo refs/heads/master:refs/remotes/origin/master &&
+	git push >.git/bar --porcelain  testrepo refs/heads/main:refs/remotes/origin/main &&
 	(
 		cd testrepo &&
-		echo "$the_commit commit	refs/remotes/origin/master" >expect &&
+		echo "$the_commit commit	refs/remotes/origin/main" >expect &&
 		git for-each-ref refs/remotes/origin >actual &&
 		test_cmp expect actual
 	) &&
@@ -1053,51 +1098,52 @@ test_expect_success 'push --porcelain' '
 
 test_expect_success 'push --porcelain bad url' '
 	mk_empty testrepo &&
-	test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/master:refs/remotes/origin/master &&
+	test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/main:refs/remotes/origin/main &&
 	! grep -q Done .git/bar
 '
 
 test_expect_success 'push --porcelain rejected' '
 	mk_empty testrepo &&
-	git push testrepo refs/heads/master:refs/remotes/origin/master &&
+	git push testrepo refs/heads/main:refs/remotes/origin/main &&
 	(cd testrepo &&
-		git reset --hard origin/master^ &&
+		git reset --hard origin/main^ &&
 		git config receive.denyCurrentBranch true) &&
 
 	echo >.git/foo  "To testrepo"  &&
-	echo >>.git/foo "!	refs/heads/master:refs/heads/master	[remote rejected] (branch is currently checked out)" &&
+	echo >>.git/foo "!	refs/heads/main:refs/heads/main	[remote rejected] (branch is currently checked out)" &&
+	echo >>.git/foo "Done" &&
 
-	test_must_fail git push >.git/bar --porcelain  testrepo refs/heads/master:refs/heads/master &&
+	test_must_fail git push >.git/bar --porcelain  testrepo refs/heads/main:refs/heads/main &&
 	test_cmp .git/foo .git/bar
 '
 
 test_expect_success 'push --porcelain --dry-run rejected' '
 	mk_empty testrepo &&
-	git push testrepo refs/heads/master:refs/remotes/origin/master &&
+	git push testrepo refs/heads/main:refs/remotes/origin/main &&
 	(cd testrepo &&
-		git reset --hard origin/master &&
+		git reset --hard origin/main &&
 		git config receive.denyCurrentBranch true) &&
 
 	echo >.git/foo  "To testrepo"  &&
-	echo >>.git/foo "!	refs/heads/master^:refs/heads/master	[rejected] (non-fast-forward)" &&
+	echo >>.git/foo "!	refs/heads/main^:refs/heads/main	[rejected] (non-fast-forward)" &&
 	echo >>.git/foo "Done" &&
 
-	test_must_fail git push >.git/bar --porcelain  --dry-run testrepo refs/heads/master^:refs/heads/master &&
+	test_must_fail git push >.git/bar --porcelain  --dry-run testrepo refs/heads/main^:refs/heads/main &&
 	test_cmp .git/foo .git/bar
 '
 
 test_expect_success 'push --prune' '
-	mk_test testrepo heads/master heads/second heads/foo heads/bar &&
+	mk_test testrepo heads/main heads/second heads/foo heads/bar &&
 	git push --prune testrepo : &&
-	check_push_result testrepo $the_commit heads/master &&
+	check_push_result testrepo $the_commit heads/main &&
 	check_push_result testrepo $the_first_commit heads/second &&
 	! check_push_result testrepo $the_first_commit heads/foo heads/bar
 '
 
 test_expect_success 'push --prune refspec' '
-	mk_test testrepo tmp/master tmp/second tmp/foo tmp/bar &&
+	mk_test testrepo tmp/main tmp/second tmp/foo tmp/bar &&
 	git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
-	check_push_result testrepo $the_commit tmp/master &&
+	check_push_result testrepo $the_commit tmp/main &&
 	check_push_result testrepo $the_first_commit tmp/second &&
 	! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
 '
@@ -1105,18 +1151,18 @@ test_expect_success 'push --prune refspec' '
 for configsection in transfer receive
 do
 	test_expect_success "push to update a ref hidden by $configsection.hiderefs" '
-		mk_test testrepo heads/master hidden/one hidden/two hidden/three &&
+		mk_test testrepo heads/main hidden/one hidden/two hidden/three &&
 		(
 			cd testrepo &&
 			git config $configsection.hiderefs refs/hidden
 		) &&
 
 		# push to unhidden ref succeeds normally
-		git push testrepo master:refs/heads/master &&
-		check_push_result testrepo $the_commit heads/master &&
+		git push testrepo main:refs/heads/main &&
+		check_push_result testrepo $the_commit heads/main &&
 
 		# push to update a hidden ref should fail
-		test_must_fail git push testrepo master:refs/hidden/one &&
+		test_must_fail git push testrepo main:refs/hidden/one &&
 		check_push_result testrepo $the_first_commit hidden/one &&
 
 		# push to delete a hidden ref should fail
@@ -1130,8 +1176,8 @@ do
 done
 
 test_expect_success 'fetch exact SHA1' '
-	mk_test testrepo heads/master hidden/one &&
-	git push testrepo master:refs/hidden/one &&
+	mk_test testrepo heads/main hidden/one &&
+	git push testrepo main:refs/hidden/one &&
 	(
 		cd testrepo &&
 		git config transfer.hiderefs refs/hidden
@@ -1151,7 +1197,7 @@ test_expect_success 'fetch exact SHA1' '
 		# unadvertised objects, so restrict this test to v0.
 
 		# fetching the hidden object should fail by default
-		test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 			git fetch -v ../testrepo $the_commit:refs/heads/copy 2>err &&
 		test_i18ngrep "Server does not allow request for unadvertised object" err &&
 		test_must_fail git rev-parse --verify refs/heads/copy &&
@@ -1162,7 +1208,7 @@ test_expect_success 'fetch exact SHA1' '
 			git config uploadpack.allowtipsha1inwant true
 		) &&
 
-		git fetch -v ../testrepo $the_commit:refs/heads/copy master:refs/heads/extra &&
+		git fetch -v ../testrepo $the_commit:refs/heads/copy main:refs/heads/extra &&
 		cat >expect <<-EOF &&
 		$the_commit
 		$the_first_commit
@@ -1176,8 +1222,8 @@ test_expect_success 'fetch exact SHA1' '
 '
 
 test_expect_success 'fetch exact SHA1 in protocol v2' '
-	mk_test testrepo heads/master hidden/one &&
-	git push testrepo master:refs/hidden/one &&
+	mk_test testrepo heads/main hidden/one &&
+	git push testrepo main:refs/hidden/one &&
 	git -C testrepo config transfer.hiderefs refs/hidden &&
 	check_push_result testrepo $the_commit hidden/one &&
 
@@ -1210,7 +1256,7 @@ do
 			cd shallow &&
 			# Some protocol versions (e.g. 2) support fetching
 			# unadvertised objects, so restrict this test to v0.
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 				git fetch --depth=1 ../testrepo/.git $SHA1 &&
 			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
 			git fetch --depth=1 ../testrepo/.git $SHA1 &&
@@ -1241,9 +1287,9 @@ do
 			cd shallow &&
 			# Some protocol versions (e.g. 2) support fetching
 			# unadvertised objects, so restrict this test to v0.
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 				git fetch ../testrepo/.git $SHA1_3 &&
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 				git fetch ../testrepo/.git $SHA1_1 &&
 			git --git-dir=../testrepo/.git config uploadpack.allowreachablesha1inwant true &&
 			git fetch ../testrepo/.git $SHA1_1 &&
@@ -1251,25 +1297,27 @@ do
 			test_must_fail git cat-file commit $SHA1_2 &&
 			git fetch ../testrepo/.git $SHA1_2 &&
 			git cat-file commit $SHA1_2 &&
-			test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+			test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 				git fetch ../testrepo/.git $SHA1_3 2>err &&
-			test_i18ngrep "remote error:.*not our ref.*$SHA1_3\$" err
+			# ideally we would insist this be on a "remote error:"
+			# line, but it is racy; see the commit message
+			test_i18ngrep "not our ref.*$SHA1_3\$" err
 		)
 	'
 done
 
 test_expect_success 'fetch follows tags by default' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	rm -fr src dst &&
 	git init src &&
 	(
 		cd src &&
-		git pull ../testrepo master &&
+		git pull ../testrepo main &&
 		git tag -m "annotated" tag &&
 		git for-each-ref >tmp1 &&
 		(
 			cat tmp1
-			sed -n "s|refs/heads/master$|refs/remotes/origin/master|p" tmp1
+			sed -n "s|refs/heads/main$|refs/remotes/origin/main|p" tmp1
 		) |
 		sort -k 3 >../expect
 	) &&
@@ -1277,8 +1325,8 @@ test_expect_success 'fetch follows tags by default' '
 	(
 		cd dst &&
 		git remote add origin ../src &&
-		git config branch.master.remote origin &&
-		git config branch.master.merge refs/heads/master &&
+		git config branch.main.remote origin &&
+		git config branch.main.merge refs/heads/main &&
 		git pull &&
 		git for-each-ref >../actual
 	) &&
@@ -1291,80 +1339,80 @@ test_expect_success 'peeled advertisements are not considered ref tips' '
 	git -C testrepo commit --allow-empty -m two &&
 	git -C testrepo tag -m foo mytag HEAD^ &&
 	oid=$(git -C testrepo rev-parse mytag^{commit}) &&
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 		git fetch testrepo $oid 2>err &&
 	test_i18ngrep "Server does not allow request for unadvertised object" err
 '
 
 test_expect_success 'pushing a specific ref applies remote.$name.push as refmap' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	rm -fr src dst &&
 	git init src &&
 	git init --bare dst &&
 	(
 		cd src &&
-		git pull ../testrepo master &&
+		git pull ../testrepo main &&
 		git branch next &&
 		git config remote.dst.url ../dst &&
 		git config remote.dst.push "+refs/heads/*:refs/remotes/src/*" &&
-		git push dst master &&
-		git show-ref refs/heads/master |
+		git push dst main &&
+		git show-ref refs/heads/main |
 		sed -e "s|refs/heads/|refs/remotes/src/|" >../dst/expect
 	) &&
 	(
 		cd dst &&
 		test_must_fail git show-ref refs/heads/next &&
-		test_must_fail git show-ref refs/heads/master &&
-		git show-ref refs/remotes/src/master >actual
+		test_must_fail git show-ref refs/heads/main &&
+		git show-ref refs/remotes/src/main >actual
 	) &&
 	test_cmp dst/expect dst/actual
 '
 
 test_expect_success 'with no remote.$name.push, it is not used as refmap' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	rm -fr src dst &&
 	git init src &&
 	git init --bare dst &&
 	(
 		cd src &&
-		git pull ../testrepo master &&
+		git pull ../testrepo main &&
 		git branch next &&
 		git config remote.dst.url ../dst &&
 		git config push.default matching &&
-		git push dst master &&
-		git show-ref refs/heads/master >../dst/expect
+		git push dst main &&
+		git show-ref refs/heads/main >../dst/expect
 	) &&
 	(
 		cd dst &&
 		test_must_fail git show-ref refs/heads/next &&
-		git show-ref refs/heads/master >actual
+		git show-ref refs/heads/main >actual
 	) &&
 	test_cmp dst/expect dst/actual
 '
 
 test_expect_success 'with no remote.$name.push, upstream mapping is used' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	rm -fr src dst &&
 	git init src &&
 	git init --bare dst &&
 	(
 		cd src &&
-		git pull ../testrepo master &&
+		git pull ../testrepo main &&
 		git branch next &&
 		git config remote.dst.url ../dst &&
 		git config remote.dst.fetch "+refs/heads/*:refs/remotes/dst/*" &&
 		git config push.default upstream &&
 
-		git config branch.master.merge refs/heads/trunk &&
-		git config branch.master.remote dst &&
+		git config branch.main.merge refs/heads/trunk &&
+		git config branch.main.remote dst &&
 
-		git push dst master &&
-		git show-ref refs/heads/master |
-		sed -e "s|refs/heads/master|refs/heads/trunk|" >../dst/expect
+		git push dst main &&
+		git show-ref refs/heads/main |
+		sed -e "s|refs/heads/main|refs/heads/trunk|" >../dst/expect
 	) &&
 	(
 		cd dst &&
-		test_must_fail git show-ref refs/heads/master &&
+		test_must_fail git show-ref refs/heads/main &&
 		test_must_fail git show-ref refs/heads/next &&
 		git show-ref refs/heads/trunk >actual
 	) &&
@@ -1372,20 +1420,20 @@ test_expect_success 'with no remote.$name.push, upstream mapping is used' '
 '
 
 test_expect_success 'push does not follow tags by default' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	rm -fr src dst &&
 	git init src &&
 	git init --bare dst &&
 	(
 		cd src &&
-		git pull ../testrepo master &&
+		git pull ../testrepo main &&
 		git tag -m "annotated" tag &&
 		git checkout -b another &&
 		git commit --allow-empty -m "future commit" &&
 		git tag -m "future" future &&
-		git checkout master &&
-		git for-each-ref refs/heads/master >../expect &&
-		git push ../dst master
+		git checkout main &&
+		git for-each-ref refs/heads/main >../expect &&
+		git push ../dst main
 	) &&
 	(
 		cd dst &&
@@ -1395,20 +1443,20 @@ test_expect_success 'push does not follow tags by default' '
 '
 
 test_expect_success 'push --follow-tags only pushes relevant tags' '
-	mk_test testrepo heads/master &&
+	mk_test testrepo heads/main &&
 	rm -fr src dst &&
 	git init src &&
 	git init --bare dst &&
 	(
 		cd src &&
-		git pull ../testrepo master &&
+		git pull ../testrepo main &&
 		git tag -m "annotated" tag &&
 		git checkout -b another &&
 		git commit --allow-empty -m "future commit" &&
 		git tag -m "future" future &&
-		git checkout master &&
-		git for-each-ref refs/heads/master refs/tags/tag >../expect &&
-		git push --follow-tags ../dst master
+		git checkout main &&
+		git for-each-ref refs/heads/main refs/tags/tag >../expect &&
+		git push --follow-tags ../dst main
 	) &&
 	(
 		cd dst &&
@@ -1426,12 +1474,12 @@ EOF
 	git commit -am initial &&
 	git init no-thin &&
 	git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
-	git push no-thin/.git refs/heads/master:refs/heads/foo &&
+	git push no-thin/.git refs/heads/main:refs/heads/foo &&
 	echo modified >> path1 &&
 	git commit -am modified &&
 	git repack -adf &&
 	rcvpck="git receive-pack --reject-thin-pack-for-testing" &&
-	git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/master:refs/heads/foo
+	git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/main:refs/heads/foo
 '
 
 test_expect_success 'pushing a tag pushes the tagged object' '
@@ -1454,12 +1502,12 @@ test_expect_success 'push into bare respects core.logallrefupdates' '
 
 	# double push to test both with and without
 	# the actual pack transfer
-	git push dst.git master:one &&
+	git push dst.git main:one &&
 	echo "one@{0} push" >expect &&
 	git -C dst.git log -g --format="%gd %gs" one >actual &&
 	test_cmp expect actual &&
 
-	git push dst.git master:two &&
+	git push dst.git main:two &&
 	echo "two@{0} push" >expect &&
 	git -C dst.git log -g --format="%gd %gs" two >actual &&
 	test_cmp expect actual
@@ -1474,20 +1522,20 @@ test_expect_success 'fetch into bare respects core.logallrefupdates' '
 
 		# as above, we double-fetch to test both
 		# with and without pack transfer
-		git fetch .. master:one &&
-		echo "one@{0} fetch .. master:one: storing head" >expect &&
+		git fetch .. main:one &&
+		echo "one@{0} fetch .. main:one: storing head" >expect &&
 		git log -g --format="%gd %gs" one >actual &&
 		test_cmp expect actual &&
 
-		git fetch .. master:two &&
-		echo "two@{0} fetch .. master:two: storing head" >expect &&
+		git fetch .. main:two &&
+		echo "two@{0} fetch .. main:two: storing head" >expect &&
 		git log -g --format="%gd %gs" two >actual &&
 		test_cmp expect actual
 	)
 '
 
 test_expect_success 'receive.denyCurrentBranch = updateInstead' '
-	git push testrepo master &&
+	git push testrepo main &&
 	(
 		cd testrepo &&
 		git reset --hard &&
@@ -1496,7 +1544,7 @@ test_expect_success 'receive.denyCurrentBranch = updateInstead' '
 	test_commit third path2 &&
 
 	# Try pushing into a repository with pristine working tree
-	git push testrepo master &&
+	git push testrepo main &&
 	(
 		cd testrepo &&
 		git update-index -q --refresh &&
@@ -1513,7 +1561,7 @@ test_expect_success 'receive.denyCurrentBranch = updateInstead' '
 		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
 		test-tool chmtime +100 path1
 	) &&
-	git push testrepo master &&
+	git push testrepo main &&
 	(
 		cd testrepo &&
 		git update-index -q --refresh &&
@@ -1533,7 +1581,7 @@ test_expect_success 'receive.denyCurrentBranch = updateInstead' '
 		cd testrepo &&
 		echo changed >path1
 	) &&
-	test_must_fail git push testrepo master &&
+	test_must_fail git push testrepo main &&
 	(
 		cd testrepo &&
 		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
@@ -1547,7 +1595,7 @@ test_expect_success 'receive.denyCurrentBranch = updateInstead' '
 		echo changed >path1 &&
 		git add path1
 	) &&
-	test_must_fail git push testrepo master &&
+	test_must_fail git push testrepo main &&
 	(
 		cd testrepo &&
 		test $(git -C .. rev-parse HEAD^) = $(git rev-parse HEAD) &&
@@ -1564,7 +1612,7 @@ test_expect_success 'receive.denyCurrentBranch = updateInstead' '
 		git reset --hard &&
 		echo changed >path3
 	) &&
-	test_must_fail git push testrepo master &&
+	test_must_fail git push testrepo main &&
 	(
 		cd testrepo &&
 		test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
@@ -1580,7 +1628,7 @@ test_expect_success 'receive.denyCurrentBranch = updateInstead' '
 		echo fifth >path3 &&
 		git add path3
 	) &&
-	test_must_fail git push testrepo master &&
+	test_must_fail git push testrepo main &&
 	(
 		cd testrepo &&
 		test $(git -C .. rev-parse HEAD^^) = $(git rev-parse HEAD) &&
@@ -1595,17 +1643,17 @@ test_expect_success 'receive.denyCurrentBranch = updateInstead' '
 		cd void &&
 		git config receive.denyCurrentBranch updateInstead
 	) &&
-	git push void master &&
+	git push void main &&
 	(
 		cd void &&
-		test $(git -C .. rev-parse master) = $(git rev-parse HEAD) &&
+		test $(git -C .. rev-parse main) = $(git rev-parse HEAD) &&
 		git diff --quiet &&
 		git diff --cached --quiet
 	) &&
 
 	# (6) updateInstead intervened by fast-forward check
-	test_must_fail git push void master^:master &&
-	test $(git -C void rev-parse HEAD) = $(git rev-parse master) &&
+	test_must_fail git push void main^:main &&
+	test $(git -C void rev-parse HEAD) = $(git rev-parse main) &&
 	git -C void diff --quiet &&
 	git -C void diff --cached --quiet
 '
@@ -1615,7 +1663,7 @@ test_expect_success 'updateInstead with push-to-checkout hook' '
 	git init testrepo &&
 	(
 		cd testrepo &&
-		git pull .. master &&
+		git pull .. main &&
 		git reset --hard HEAD^^ &&
 		git tag initial &&
 		git config receive.denyCurrentBranch updateInstead &&
@@ -1633,7 +1681,7 @@ test_expect_success 'updateInstead with push-to-checkout hook' '
 	) &&
 
 	# Try pushing into a pristine
-	git push testrepo master &&
+	git push testrepo main &&
 	(
 		cd testrepo &&
 		git diff --quiet &&
@@ -1647,7 +1695,7 @@ test_expect_success 'updateInstead with push-to-checkout hook' '
 		git reset --hard initial &&
 		echo conflicting >path2
 	) &&
-	test_must_fail git push testrepo master &&
+	test_must_fail git push testrepo main &&
 	(
 		cd testrepo &&
 		test $(git rev-parse initial) = $(git rev-parse HEAD) &&
@@ -1663,7 +1711,7 @@ test_expect_success 'updateInstead with push-to-checkout hook' '
 		echo irrelevant >path5 &&
 		git add path5
 	) &&
-	git push testrepo master &&
+	git push testrepo main &&
 	(
 		cd testrepo &&
 		test "$(cat path1)" = unrelated &&
@@ -1703,7 +1751,7 @@ test_expect_success 'updateInstead with push-to-checkout hook' '
 		EOF
 	) &&
 
-	git push void master &&
+	git push void main &&
 	(
 		cd void &&
 		git diff --quiet &&
@@ -1712,4 +1760,14 @@ test_expect_success 'updateInstead with push-to-checkout hook' '
 	)
 '
 
+test_expect_success 'denyCurrentBranch and worktrees' '
+	git worktree add new-wt &&
+	git clone . cloned &&
+	test_commit -C cloned first &&
+	test_config receive.denyCurrentBranch refuse &&
+	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_must_fail git -C cloned push --delete origin new-wt
+'
 test_done
diff --git a/t/t5517-push-mirror.sh b/t/t5517-push-mirror.sh
index e4edd56404..a448e169bd 100755
--- a/t/t5517-push-mirror.sh
+++ b/t/t5517-push-mirror.sh
@@ -2,6 +2,9 @@
 
 test_description='pushing to a mirror repository'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 D=$(pwd)
@@ -15,16 +18,16 @@ invert () {
 }
 
 mk_repo_pair () {
-	rm -rf master mirror &&
+	rm -rf main mirror &&
 	mkdir mirror &&
 	(
 		cd mirror &&
 		git init &&
 		git config receive.denyCurrentBranch warn
 	) &&
-	mkdir master &&
+	mkdir main &&
 	(
-		cd master &&
+		cd main &&
 		git init &&
 		git remote add $1 up ../mirror
 	)
@@ -36,13 +39,13 @@ test_expect_success 'push mirror creates new branches' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
 		git push --mirror up
 	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
-	test "$master_master" = "$mirror_master"
+	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
+	test "$main_main" = "$mirror_main"
 
 '
 
@@ -50,15 +53,15 @@ test_expect_success 'push mirror updates existing branches' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
 		git push --mirror up &&
 		echo two >foo && git add foo && git commit -m two &&
 		git push --mirror up
 	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
-	test "$master_master" = "$mirror_master"
+	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
+	test "$main_main" = "$mirror_main"
 
 '
 
@@ -66,7 +69,7 @@ test_expect_success 'push mirror force updates existing branches' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
 		git push --mirror up &&
 		echo two >foo && git add foo && git commit -m two &&
@@ -74,9 +77,9 @@ test_expect_success 'push mirror force updates existing branches' '
 		git reset --hard HEAD^ &&
 		git push --mirror up
 	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
-	test "$master_master" = "$mirror_master"
+	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
+	test "$main_main" = "$mirror_main"
 
 '
 
@@ -84,9 +87,9 @@ test_expect_success 'push mirror removes branches' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
-		git branch remove master &&
+		git branch remove main &&
 		git push --mirror up &&
 		git branch -D remove &&
 		git push --mirror up
@@ -102,21 +105,21 @@ test_expect_success 'push mirror adds, updates and removes branches together' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
-		git branch remove master &&
+		git branch remove main &&
 		git push --mirror up &&
 		git branch -D remove &&
-		git branch add master &&
+		git branch add main &&
 		echo two >foo && git add foo && git commit -m two &&
 		git push --mirror up
 	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
-	master_add=$(cd master && git show-ref -s --verify refs/heads/add) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
+	main_main=$(cd main && git show-ref -s --verify refs/heads/main) &&
+	main_add=$(cd main && git show-ref -s --verify refs/heads/add) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/heads/main) &&
 	mirror_add=$(cd mirror && git show-ref -s --verify refs/heads/add) &&
-	test "$master_master" = "$mirror_master" &&
-	test "$master_add" = "$mirror_add" &&
+	test "$main_main" = "$mirror_main" &&
+	test "$main_add" = "$mirror_add" &&
 	(
 		cd mirror &&
 		invert git show-ref -s --verify refs/heads/remove
@@ -130,14 +133,14 @@ test_expect_success 'push mirror creates new tags' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
-		git tag -f tmaster master &&
+		git tag -f tmain main &&
 		git push --mirror up
 	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
-	test "$master_master" = "$mirror_master"
+	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
+	test "$main_main" = "$mirror_main"
 
 '
 
@@ -145,17 +148,17 @@ test_expect_success 'push mirror updates existing tags' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
-		git tag -f tmaster master &&
+		git tag -f tmain main &&
 		git push --mirror up &&
 		echo two >foo && git add foo && git commit -m two &&
-		git tag -f tmaster master &&
+		git tag -f tmain main &&
 		git push --mirror up
 	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
-	test "$master_master" = "$mirror_master"
+	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
+	test "$main_main" = "$mirror_main"
 
 '
 
@@ -163,20 +166,20 @@ test_expect_success 'push mirror force updates existing tags' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
-		git tag -f tmaster master &&
+		git tag -f tmain main &&
 		git push --mirror up &&
 		echo two >foo && git add foo && git commit -m two &&
-		git tag -f tmaster master &&
+		git tag -f tmain main &&
 		git push --mirror up &&
 		git reset --hard HEAD^ &&
-		git tag -f tmaster master &&
+		git tag -f tmain main &&
 		git push --mirror up
 	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
-	test "$master_master" = "$mirror_master"
+	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
+	test "$main_main" = "$mirror_main"
 
 '
 
@@ -184,9 +187,9 @@ test_expect_success 'push mirror removes tags' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
-		git tag -f tremove master &&
+		git tag -f tremove main &&
 		git push --mirror up &&
 		git tag -d tremove &&
 		git push --mirror up
@@ -202,23 +205,23 @@ test_expect_success 'push mirror adds, updates and removes tags together' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
-		git tag -f tmaster master &&
-		git tag -f tremove master &&
+		git tag -f tmain main &&
+		git tag -f tremove main &&
 		git push --mirror up &&
 		git tag -d tremove &&
-		git tag tadd master &&
+		git tag tadd main &&
 		echo two >foo && git add foo && git commit -m two &&
-		git tag -f tmaster master &&
+		git tag -f tmain main &&
 		git push --mirror up
 	) &&
-	master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
-	master_add=$(cd master && git show-ref -s --verify refs/tags/tadd) &&
-	mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
+	main_main=$(cd main && git show-ref -s --verify refs/tags/tmain) &&
+	main_add=$(cd main && git show-ref -s --verify refs/tags/tadd) &&
+	mirror_main=$(cd mirror && git show-ref -s --verify refs/tags/tmain) &&
 	mirror_add=$(cd mirror && git show-ref -s --verify refs/tags/tadd) &&
-	test "$master_master" = "$mirror_master" &&
-	test "$master_add" = "$mirror_add" &&
+	test "$main_main" = "$mirror_main" &&
+	test "$main_add" = "$mirror_add" &&
 	(
 		cd mirror &&
 		invert git show-ref -s --verify refs/tags/tremove
@@ -230,10 +233,10 @@ test_expect_success 'remote.foo.mirror adds and removes branches' '
 
 	mk_repo_pair --mirror &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
-		git branch keep master &&
-		git branch remove master &&
+		git branch keep main &&
+		git branch remove main &&
 		git push up &&
 		git branch -D remove &&
 		git push up
@@ -250,10 +253,10 @@ test_expect_success 'remote.foo.mirror=no has no effect' '
 
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
 		git config --add remote.up.mirror no &&
-		git branch keep master &&
+		git branch keep main &&
 		git push --mirror up &&
 		git branch -D keep &&
 		git push up :
@@ -268,10 +271,10 @@ test_expect_success 'remote.foo.mirror=no has no effect' '
 test_expect_success 'push to mirrored repository with refspec fails' '
 	mk_repo_pair &&
 	(
-		cd master &&
+		cd main &&
 		echo one >foo && git add foo && git commit -m one &&
 		git config --add remote.up.mirror true &&
-		test_must_fail git push up master
+		test_must_fail git push up main
 	)
 '
 
diff --git a/t/t5518-fetch-exit-status.sh b/t/t5518-fetch-exit-status.sh
index c2060bb870..5c4ac2556e 100755
--- a/t/t5518-fetch-exit-status.sh
+++ b/t/t5518-fetch-exit-status.sh
@@ -5,6 +5,9 @@
 
 test_description='fetch exit status test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -17,20 +20,20 @@ test_expect_success setup '
 	echo side >file &&
 	git commit -a -m side &&
 
-	git checkout master &&
+	git checkout main &&
 	echo next >file &&
 	git commit -a -m next
 '
 
 test_expect_success 'non-fast-forward fetch' '
 
-	test_must_fail git fetch . master:side
+	test_must_fail git fetch . main:side
 
 '
 
 test_expect_success 'forced update' '
 
-	git fetch . +master:side
+	git fetch . +main:side
 
 '
 
diff --git a/t/t5519-push-alternates.sh b/t/t5519-push-alternates.sh
index 11fcd37700..20ba604dfd 100755
--- a/t/t5519-push-alternates.sh
+++ b/t/t5519-push-alternates.sh
@@ -2,6 +2,9 @@
 
 test_description='push to a repository that borrows from elsewhere'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -17,7 +20,7 @@ test_expect_success setup '
 		>file &&
 		git add . &&
 		git commit -m initial &&
-		git push ../alice-pub master
+		git push ../alice-pub main
 	) &&
 
 	# Project Bob is a fork of project Alice
@@ -31,7 +34,7 @@ test_expect_success setup '
 	git clone alice-pub bob-work &&
 	(
 		cd bob-work &&
-		git push ../bob-pub master
+		git push ../bob-pub main
 	)
 '
 
@@ -54,7 +57,7 @@ test_expect_success 'bob fetches from alice, works and pushes' '
 		# has at her public repository are available to it
 		# via its alternates.
 		cd bob-work &&
-		git pull ../alice-pub master &&
+		git pull ../alice-pub main &&
 		echo more bob >file &&
 		git commit -a -m third &&
 		git push ../bob-pub :
@@ -93,7 +96,7 @@ test_expect_success 'alice works and pushes again' '
 test_expect_success 'bob works and pushes' '
 	(
 		# This time Bob does not pull from Alice, and
-		# the master branch at her public repository points
+		# the main branch at her public repository points
 		# at a commit Bob does not know about.  This should
 		# not prevent the push by Bob from succeeding.
 		cd bob-work &&
@@ -122,11 +125,11 @@ test_expect_success 'alice works and pushes yet again' '
 test_expect_success 'bob works and pushes again' '
 	(
 		cd alice-pub &&
-		git cat-file commit master >../bob-work/commit
+		git cat-file commit main >../bob-work/commit
 	) &&
 	(
 		# This time Bob does not pull from Alice, and
-		# the master branch at her public repository points
+		# the main branch at her public repository points
 		# at a commit Bob does not fully know about, but
 		# he happens to have the commit object (but not the
 		# necessary tree) in his repository from Alice.
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index cf4cc32fd0..672001a18b 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -2,21 +2,28 @@
 
 test_description='pulling into void'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 modify () {
-	sed -e "$1" <"$2" >"$2.x" &&
+	sed -e "$1" "$2" >"$2.x" &&
 	mv "$2.x" "$2"
 }
 
 test_pull_autostash () {
+	expect_parent_num="$1" &&
+	shift &&
 	git reset --hard before-rebase &&
 	echo dirty >new_file &&
 	git add new_file &&
 	git pull "$@" . copy &&
-	test_cmp_rev HEAD^ copy &&
-	test "$(cat new_file)" = dirty &&
-	test "$(cat file)" = "modified again"
+	test_cmp_rev HEAD^"$expect_parent_num" copy &&
+	echo dirty >expect &&
+	test_cmp expect new_file &&
+	echo "modified again" >expect &&
+	test_cmp expect file
 }
 
 test_pull_autostash_fail () {
@@ -24,7 +31,7 @@ test_pull_autostash_fail () {
 	echo dirty >new_file &&
 	git add new_file &&
 	test_must_fail git pull "$@" . copy 2>err &&
-	test_i18ngrep "uncommitted changes." err
+	test_i18ngrep -E "uncommitted changes.|overwritten by merge:" err
 }
 
 test_expect_success setup '
@@ -39,19 +46,19 @@ test_expect_success 'pulling into void' '
 		cd cloned &&
 		git pull ..
 	) &&
-	test -f file &&
-	test -f cloned/file &&
+	test_path_is_file file &&
+	test_path_is_file cloned/file &&
 	test_cmp file cloned/file
 '
 
-test_expect_success 'pulling into void using master:master' '
+test_expect_success 'pulling into void using main:main' '
 	git init cloned-uho &&
 	(
 		cd cloned-uho &&
-		git pull .. master:master
+		git pull .. main:main
 	) &&
-	test -f file &&
-	test -f cloned-uho/file &&
+	test_path_is_file file &&
+	test_path_is_file cloned-uho/file &&
 	test_cmp file cloned-uho/file
 '
 
@@ -60,7 +67,7 @@ test_expect_success 'pulling into void does not overwrite untracked files' '
 	(
 		cd cloned-untracked &&
 		echo untracked >file &&
-		test_must_fail git pull .. master &&
+		test_must_fail git pull .. main &&
 		echo untracked >expect &&
 		test_cmp expect file
 	)
@@ -72,7 +79,7 @@ test_expect_success 'pulling into void does not overwrite staged files' '
 		cd cloned-staged-colliding &&
 		echo "alternate content" >file &&
 		git add file &&
-		test_must_fail git pull .. master &&
+		test_must_fail git pull .. main &&
 		echo "alternate content" >expect &&
 		test_cmp expect file &&
 		git cat-file blob :file >file.index &&
@@ -86,7 +93,7 @@ test_expect_success 'pulling into void does not remove new staged files' '
 		cd cloned-staged-new &&
 		echo "new tracked file" >newfile &&
 		git add newfile &&
-		git pull .. master &&
+		git pull .. main &&
 		echo "new tracked file" >expect &&
 		test_cmp expect newfile &&
 		git cat-file blob :newfile >newfile.index &&
@@ -98,21 +105,23 @@ test_expect_success 'pulling into void must not create an octopus' '
 	git init cloned-octopus &&
 	(
 		cd cloned-octopus &&
-		test_must_fail git pull .. master master &&
-		! test -f file
+		test_must_fail git pull .. main main &&
+		test_path_is_missing file
 	)
 '
 
 test_expect_success 'test . as a remote' '
-	git branch copy master &&
+	git branch copy main &&
 	git config branch.copy.remote . &&
-	git config branch.copy.merge refs/heads/master &&
+	git config branch.copy.merge refs/heads/main &&
 	echo updated >file &&
 	git commit -a -m updated &&
 	git checkout copy &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	git pull &&
-	test "$(cat file)" = updated &&
+	echo updated >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: Fast-forward" >reflog.expected &&
@@ -120,27 +129,30 @@ test_expect_success 'test . as a remote' '
 '
 
 test_expect_success 'the default remote . should not break explicit pull' '
-	git checkout -b second master^ &&
+	git checkout -b second main^ &&
 	echo modified >file &&
 	git commit -a -m modified &&
 	git checkout copy &&
 	git reset --hard HEAD^ &&
-	test "$(cat file)" = file &&
-	git pull . second &&
-	test "$(cat file)" = modified &&
+	echo file >expect &&
+	test_cmp expect file &&
+	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
 '
 
 test_expect_success 'fail if wildcard spec does not match any refs' '
 	git checkout -b test copy^ &&
 	test_when_finished "git checkout -f copy && git branch -D test" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_must_fail git pull . "refs/nonexisting1/*:refs/nonexisting2/*" 2>err &&
 	test_i18ngrep "no candidates for merging" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'fail if no branches specified with non-default remote' '
@@ -148,11 +160,12 @@ test_expect_success 'fail if no branches specified with non-default remote' '
 	test_when_finished "git remote remove test_remote" &&
 	git checkout -b test copy^ &&
 	test_when_finished "git checkout -f copy && git branch -D test" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_config branch.test.remote origin &&
 	test_must_fail git pull test_remote 2>err &&
 	test_i18ngrep "specify a branch on the command line" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'fail if not on a branch' '
@@ -160,10 +173,11 @@ test_expect_success 'fail if not on a branch' '
 	test_when_finished "git remote remove origin" &&
 	git checkout HEAD^ &&
 	test_when_finished "git checkout -f copy" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_must_fail git pull 2>err &&
 	test_i18ngrep "not currently on a branch" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'fail if no configuration for current branch' '
@@ -172,10 +186,11 @@ test_expect_success 'fail if no configuration for current branch' '
 	git checkout -b test copy^ &&
 	test_when_finished "git checkout -f copy && git branch -D test" &&
 	test_config branch.test.remote test_remote &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_must_fail git pull 2>err &&
 	test_i18ngrep "no tracking information" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'pull --all: fail if no configuration for current branch' '
@@ -184,10 +199,11 @@ test_expect_success 'pull --all: fail if no configuration for current branch' '
 	git checkout -b test copy^ &&
 	test_when_finished "git checkout -f copy && git branch -D test" &&
 	test_config branch.test.remote test_remote &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_must_fail git pull --all 2>err &&
 	test_i18ngrep "There is no tracking information" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'fail if upstream branch does not exist' '
@@ -195,26 +211,31 @@ test_expect_success 'fail if upstream branch does not exist' '
 	test_when_finished "git checkout -f copy && git branch -D test" &&
 	test_config branch.test.remote . &&
 	test_config branch.test.merge refs/heads/nonexisting &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_must_fail git pull 2>err &&
 	test_i18ngrep "no such ref was fetched" err &&
-	test "$(cat file)" = file
+	test_cmp expect file
 '
 
 test_expect_success 'fail if the index has unresolved entries' '
 	git checkout -b third second^ &&
 	test_when_finished "git checkout -f copy && git branch -D third" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	test_commit modified2 file &&
-	test -z "$(git ls-files -u)" &&
-	test_must_fail git pull . second &&
-	test -n "$(git ls-files -u)" &&
+	git ls-files -u >unmerged &&
+	test_must_be_empty unmerged &&
+	test_must_fail git pull --no-rebase . second &&
+	git ls-files -u >unmerged &&
+	test_file_not_empty unmerged &&
 	cp file expected &&
 	test_must_fail git pull . second 2>err &&
 	test_i18ngrep "Pulling is not possible because you have unmerged files." err &&
 	test_cmp expected file &&
 	git add file &&
-	test -z "$(git ls-files -u)" &&
+	git ls-files -u >unmerged &&
+	test_must_be_empty unmerged &&
 	test_must_fail git pull . second 2>err &&
 	test_i18ngrep "You have not concluded your merge" err &&
 	test_cmp expected file
@@ -223,47 +244,66 @@ test_expect_success 'fail if the index has unresolved entries' '
 test_expect_success 'fast-forwards working tree if branch head is updated' '
 	git checkout -b third second^ &&
 	test_when_finished "git checkout -f copy && git branch -D third" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	git pull . second:third 2>err &&
 	test_i18ngrep "fetch updated the current branch head" err &&
-	test "$(cat file)" = modified &&
-	test "$(git rev-parse third)" = "$(git rev-parse second)"
+	echo modified >expect &&
+	test_cmp expect file &&
+	test_cmp_rev third second
 '
 
 test_expect_success 'fast-forward fails with conflicting work tree' '
 	git checkout -b third second^ &&
 	test_when_finished "git checkout -f copy && git branch -D third" &&
-	test "$(cat file)" = file &&
+	echo file >expect &&
+	test_cmp expect file &&
 	echo conflict >file &&
 	test_must_fail git pull . second:third 2>err &&
 	test_i18ngrep "Cannot fast-forward your working tree" err &&
-	test "$(cat file)" = conflict &&
-	test "$(git rev-parse third)" = "$(git rev-parse second)"
+	echo conflict >expect &&
+	test_cmp expect file &&
+	test_cmp_rev third second
 '
 
 test_expect_success '--rebase' '
 	git branch to-rebase &&
-	echo modified again > file &&
+	echo modified again >file &&
 	git commit -m file file &&
 	git checkout to-rebase &&
-	echo new > file2 &&
+	echo new >file2 &&
 	git add file2 &&
 	git commit -m "new file" &&
 	git tag before-rebase &&
 	git pull --rebase . copy &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
+	test_cmp_rev HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual
 '
 
-test_expect_success '--rebase fast forward' '
+test_expect_success '--rebase (merge) fast forward' '
 	git reset --hard before-rebase &&
 	git checkout -b ff &&
 	echo another modification >file &&
 	git commit -m third file &&
 
 	git checkout to-rebase &&
-	git pull --rebase . ff &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse ff)" &&
+	git -c rebase.backend=merge pull --rebase . ff &&
+	test_cmp_rev HEAD ff &&
+
+	# The above only validates the result.  Did we actually bypass rebase?
+	git reflog -1 >reflog.actual &&
+	sed "s/^[0-9a-f][0-9a-f]*/OBJID/" reflog.actual >reflog.fuzzy &&
+	echo "OBJID HEAD@{0}: pull --rebase . ff: Fast-forward" >reflog.expected &&
+	test_cmp reflog.expected reflog.fuzzy
+'
+
+test_expect_success '--rebase (am) fast forward' '
+	git reset --hard before-rebase &&
+
+	git -c rebase.backend=apply pull --rebase . ff &&
+	test_cmp_rev HEAD ff &&
 
 	# The above only validates the result.  Did we actually bypass rebase?
 	git reflog -1 >reflog.actual &&
@@ -287,7 +327,7 @@ test_expect_success '--rebase --autostash fast forward' '
 	git checkout behind &&
 	echo dirty >file &&
 	git pull --rebase --autostash . to-rebase-ff &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse to-rebase-ff)"
+	test_cmp_rev HEAD to-rebase-ff
 '
 
 test_expect_success '--rebase with conflicts shows advice' '
@@ -305,7 +345,7 @@ test_expect_success '--rebase with conflicts shows advice' '
 	test_tick &&
 	git commit -m "Create conflict" seq.txt &&
 	test_must_fail git pull --rebase . seq 2>err >out &&
-	test_i18ngrep "Resolve all conflicts manually" out
+	test_i18ngrep "Resolve all conflicts manually" err
 '
 
 test_expect_success 'failed --rebase shows advice' '
@@ -319,35 +359,37 @@ test_expect_success 'failed --rebase shows advice' '
 	git checkout -f -b fails-to-rebase HEAD^ &&
 	test_commit v2-without-cr file "2" file2-lf &&
 	test_must_fail git pull --rebase . diverging 2>err >out &&
-	test_i18ngrep "Resolve all conflicts manually" out
+	test_i18ngrep "Resolve all conflicts manually" err
 '
 
 test_expect_success '--rebase fails with multiple branches' '
 	git reset --hard before-rebase &&
-	test_must_fail git pull --rebase . copy master 2>err &&
-	test "$(git rev-parse HEAD)" = "$(git rev-parse before-rebase)" &&
+	test_must_fail git pull --rebase . copy main 2>err &&
+	test_cmp_rev HEAD before-rebase &&
 	test_i18ngrep "Cannot rebase onto multiple branches" err &&
-	test modified = "$(git show HEAD:file)"
+	echo modified >expect &&
+	git show HEAD:file >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'pull --rebase succeeds with dirty working directory and rebase.autostash set' '
 	test_config rebase.autostash true &&
-	test_pull_autostash --rebase
+	test_pull_autostash 1 --rebase
 '
 
 test_expect_success 'pull --rebase --autostash & rebase.autostash=true' '
 	test_config rebase.autostash true &&
-	test_pull_autostash --rebase --autostash
+	test_pull_autostash 1 --rebase --autostash
 '
 
 test_expect_success 'pull --rebase --autostash & rebase.autostash=false' '
 	test_config rebase.autostash false &&
-	test_pull_autostash --rebase --autostash
+	test_pull_autostash 1 --rebase --autostash
 '
 
 test_expect_success 'pull --rebase --autostash & rebase.autostash unset' '
 	test_unconfig rebase.autostash &&
-	test_pull_autostash --rebase --autostash
+	test_pull_autostash 1 --rebase --autostash
 '
 
 test_expect_success 'pull --rebase --no-autostash & rebase.autostash=true' '
@@ -365,25 +407,54 @@ test_expect_success 'pull --rebase --no-autostash & rebase.autostash unset' '
 	test_pull_autostash_fail --rebase --no-autostash
 '
 
-for i in --autostash --no-autostash
-do
-	test_expect_success "pull $i (without --rebase) is illegal" '
-		test_must_fail git pull $i . copy 2>err &&
-		test_i18ngrep "only valid with --rebase" err
-	'
-done
+test_expect_success 'pull succeeds with dirty working directory and merge.autostash set' '
+	test_config merge.autostash true &&
+	test_pull_autostash 2 --no-rebase
+'
+
+test_expect_success 'pull --autostash & merge.autostash=true' '
+	test_config merge.autostash true &&
+	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 --no-rebase
+'
+
+test_expect_success 'pull --autostash & merge.autostash unset' '
+	test_unconfig merge.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 --no-rebase
+'
+
+test_expect_success 'pull --no-autostash & merge.autostash=false' '
+	test_config merge.autostash false &&
+	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 --no-rebase
+'
 
 test_expect_success 'pull.rebase' '
 	git reset --hard before-rebase &&
 	test_config pull.rebase true &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
+	test_cmp_rev HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'pull --autostash & pull.rebase=true' '
 	test_config pull.rebase true &&
-	test_pull_autostash --autostash
+	test_pull_autostash 1 --autostash
 '
 
 test_expect_success 'pull --no-autostash & pull.rebase=true' '
@@ -395,8 +466,10 @@ test_expect_success 'branch.to-rebase.rebase' '
 	git reset --hard before-rebase &&
 	test_config branch.to-rebase.rebase true &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
+	test_cmp_rev HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
@@ -404,27 +477,33 @@ test_expect_success 'branch.to-rebase.rebase should override pull.rebase' '
 	test_config pull.rebase true &&
 	test_config branch.to-rebase.rebase false &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^)" != "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)"
+	test_cmp_rev ! HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual
 '
 
-test_expect_success "pull --rebase warns on --verify-signatures" '
+test_expect_success 'pull --rebase warns on --verify-signatures' '
 	git reset --hard before-rebase &&
 	git pull --rebase --verify-signatures . copy 2>err &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)" &&
+	test_cmp_rev HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual &&
 	test_i18ngrep "ignoring --verify-signatures for rebase" err
 '
 
-test_expect_success "pull --rebase does not warn on --no-verify-signatures" '
+test_expect_success 'pull --rebase does not warn on --no-verify-signatures' '
 	git reset --hard before-rebase &&
 	git pull --rebase --no-verify-signatures . copy 2>err &&
-	test "$(git rev-parse HEAD^)" = "$(git rev-parse copy)" &&
-	test new = "$(git show HEAD:file2)" &&
+	test_cmp_rev HEAD^ copy &&
+	echo new >expect &&
+	git show HEAD:file2 >actual &&
+	test_cmp expect actual &&
 	test_i18ngrep ! "verify-signatures" err
 '
 
-# add a feature branch, keep-merge, that is merged into master, so the
+# add a feature branch, keep-merge, that is merged into main, so the
 # test can try preserving the merge commit (or not) with various
 # --rebase flags/pull.rebase settings.
 test_expect_success 'preserve merge setup' '
@@ -440,25 +519,31 @@ test_expect_success 'pull.rebase=false create a new merge commit' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase false &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^1 before-preserve-rebase &&
+	test_cmp_rev HEAD^2 copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'pull.rebase=true flattens keep-merge' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase true &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^^ copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'pull.rebase=1 is treated as true and flattens keep-merge' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase 1 &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^^ copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success REBASE_P \
@@ -466,8 +551,8 @@ test_expect_success REBASE_P \
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase preserve &&
 	git pull . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
+	test_cmp_rev HEAD^^ copy &&
+	test_cmp_rev HEAD^2 keep-merge
 '
 
 test_expect_success 'pull.rebase=interactive' '
@@ -478,7 +563,8 @@ test_expect_success 'pull.rebase=interactive' '
 	test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
 	test_when_finished "test_might_fail git rebase --abort" &&
 	test_must_fail git pull --rebase=interactive . copy &&
-	test "I was here" = "$(cat fake.out)"
+	echo "I was here" >expect &&
+	test_cmp expect fake.out
 '
 
 test_expect_success 'pull --rebase=i' '
@@ -489,30 +575,35 @@ test_expect_success 'pull --rebase=i' '
 	test_set_editor "$TRASH_DIRECTORY/fake-editor" &&
 	test_when_finished "test_might_fail git rebase --abort" &&
 	test_must_fail git pull --rebase=i . copy &&
-	test "I was here, too" = "$(cat fake.out)"
+	echo "I was here, too" >expect &&
+	test_cmp expect fake.out
 '
 
 test_expect_success 'pull.rebase=invalid fails' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase invalid &&
-	! git pull . copy
+	test_must_fail git pull . copy
 '
 
 test_expect_success '--rebase=false create a new merge commit' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase true &&
 	git pull --rebase=false . copy &&
-	test "$(git rev-parse HEAD^1)" = "$(git rev-parse before-preserve-rebase)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^1 before-preserve-rebase &&
+	test_cmp_rev HEAD^2 copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success '--rebase=true rebases and flattens keep-merge' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase preserve &&
 	git pull --rebase=true . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^^ copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success REBASE_P \
@@ -520,58 +611,62 @@ test_expect_success REBASE_P \
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase true &&
 	git pull --rebase=preserve . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test "$(git rev-parse HEAD^2)" = "$(git rev-parse keep-merge)"
+	test_cmp_rev HEAD^^ copy &&
+	test_cmp_rev HEAD^2 keep-merge
 '
 
 test_expect_success '--rebase=invalid fails' '
 	git reset --hard before-preserve-rebase &&
-	! git pull --rebase=invalid . copy
+	test_must_fail git pull --rebase=invalid . copy
 '
 
 test_expect_success '--rebase overrides pull.rebase=preserve and flattens keep-merge' '
 	git reset --hard before-preserve-rebase &&
 	test_config pull.rebase preserve &&
 	git pull --rebase . copy &&
-	test "$(git rev-parse HEAD^^)" = "$(git rev-parse copy)" &&
-	test file3 = "$(git show HEAD:file3.t)"
+	test_cmp_rev HEAD^^ copy &&
+	echo file3 >expect &&
+	git show HEAD:file3.t >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success '--rebase with rebased upstream' '
-
 	git remote add -f me . &&
 	git checkout copy &&
 	git tag copy-orig &&
 	git reset --hard HEAD^ &&
-	echo conflicting modification > file &&
+	echo conflicting modification >file &&
 	git commit -m conflict file &&
 	git checkout to-rebase &&
-	echo file > file2 &&
+	echo file >file2 &&
 	git commit -m to-rebase file2 &&
 	git tag to-rebase-orig &&
 	git pull --rebase me copy &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
-
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
 '
 
 test_expect_success '--rebase -f with rebased upstream' '
 	test_when_finished "test_might_fail git rebase --abort" &&
 	git reset --hard to-rebase-orig &&
 	git pull --rebase -f me copy &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
 '
 
 test_expect_success '--rebase with rebased default upstream' '
-
 	git update-ref refs/remotes/me/copy copy-orig &&
 	git checkout --track -b to-rebase2 me/copy &&
 	git reset --hard to-rebase-orig &&
 	git pull --rebase &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
-
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
 '
 
 test_expect_success 'rebased upstream + fetch + pull --rebase' '
@@ -582,13 +677,14 @@ test_expect_success 'rebased upstream + fetch + pull --rebase' '
 	git reset --hard to-rebase-orig &&
 	git fetch &&
 	git pull --rebase &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
 
 '
 
 test_expect_success 'pull --rebase dies early with dirty working directory' '
-
 	git checkout to-rebase &&
 	git update-ref refs/remotes/me/copy copy^ &&
 	COPY="$(git rev-parse --verify me/copy)" &&
@@ -596,23 +692,23 @@ test_expect_success 'pull --rebase dies early with dirty working directory' '
 	test_config branch.to-rebase.remote me &&
 	test_config branch.to-rebase.merge refs/heads/copy &&
 	test_config branch.to-rebase.rebase true &&
-	echo dirty >> file &&
+	echo dirty >>file &&
 	git add file &&
 	test_must_fail git pull &&
-	test "$COPY" = "$(git rev-parse --verify me/copy)" &&
+	test_cmp_rev "$COPY" me/copy &&
 	git checkout HEAD -- file &&
 	git pull &&
-	test "$COPY" != "$(git rev-parse --verify me/copy)"
-
+	test_cmp_rev ! "$COPY" me/copy
 '
 
 test_expect_success 'pull --rebase works on branch yet to be born' '
-	git rev-parse master >expect &&
+	git rev-parse main >expect &&
 	mkdir empty_repo &&
-	(cd empty_repo &&
-	 git init &&
-	 git pull --rebase .. master &&
-	 git rev-parse HEAD >../actual
+	(
+		cd empty_repo &&
+		git init &&
+		git pull --rebase .. main &&
+		git rev-parse HEAD >../actual
 	) &&
 	test_cmp expect actual
 '
@@ -624,10 +720,14 @@ test_expect_success 'pull --rebase fails on unborn branch with staged changes' '
 		cd empty_repo2 &&
 		echo staged-file >staged-file &&
 		git add staged-file &&
-		test "$(git ls-files)" = staged-file &&
-		test_must_fail git pull --rebase .. master 2>err &&
-		test "$(git ls-files)" = staged-file &&
-		test "$(git show :staged-file)" = staged-file &&
+		echo staged-file >expect &&
+		git ls-files >actual &&
+		test_cmp expect actual &&
+		test_must_fail git pull --rebase .. main 2>err &&
+		git ls-files >actual &&
+		test_cmp expect actual &&
+		git show :staged-file >actual &&
+		test_cmp expect actual &&
 		test_i18ngrep "unborn branch with changes added to the index" err
 	)
 '
@@ -638,74 +738,82 @@ test_expect_success 'pull --rebase fails on corrupt HEAD' '
 	(
 		cd corrupt &&
 		test_commit one &&
-		obj=$(git rev-parse --verify HEAD | sed "s#^..#&/#") &&
+		git rev-parse --verify HEAD >head &&
+		obj=$(sed "s#^..#&/#" head) &&
 		rm -f .git/objects/$obj &&
 		test_must_fail git pull --rebase
 	)
 '
 
 test_expect_success 'setup for detecting upstreamed changes' '
-	mkdir src &&
-	(cd src &&
-	 git init &&
-	 printf "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" > stuff &&
-	 git add stuff &&
-	 git commit -m "Initial revision"
-	) &&
+	test_create_repo src &&
+	test_commit -C src --printf one stuff "1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n" &&
 	git clone src dst &&
-	(cd src &&
-	 modify s/5/43/ stuff &&
-	 git commit -a -m "5->43" &&
-	 modify s/6/42/ stuff &&
-	 git commit -a -m "Make it bigger"
+	(
+		cd src &&
+		modify s/5/43/ stuff &&
+		git commit -a -m "5->43" &&
+		modify s/6/42/ stuff &&
+		git commit -a -m "Make it bigger"
 	) &&
-	(cd dst &&
-	 modify s/5/43/ stuff &&
-	 git commit -a -m "Independent discovery of 5->43"
+	(
+		cd dst &&
+		modify s/5/43/ stuff &&
+		git commit -a -m "Independent discovery of 5->43"
 	)
 '
 
 test_expect_success 'git pull --rebase detects upstreamed changes' '
-	(cd dst &&
-	 git pull --rebase &&
-	 test -z "$(git ls-files -u)"
+	(
+		cd dst &&
+		git pull --rebase &&
+		git ls-files -u >untracked &&
+		test_must_be_empty untracked
 	)
 '
 
 test_expect_success 'setup for avoiding reapplying old patches' '
-	(cd dst &&
-	 test_might_fail git rebase --abort &&
-	 git reset --hard origin/master
+	(
+		cd dst &&
+		test_might_fail git rebase --abort &&
+		git reset --hard origin/main
 	) &&
 	git clone --bare src src-replace.git &&
 	rm -rf src &&
 	mv src-replace.git src &&
-	(cd dst &&
-	 modify s/2/22/ stuff &&
-	 git commit -a -m "Change 2" &&
-	 modify s/3/33/ stuff &&
-	 git commit -a -m "Change 3" &&
-	 modify s/4/44/ stuff &&
-	 git commit -a -m "Change 4" &&
-	 git push &&
-
-	 modify s/44/55/ stuff &&
-	 git commit --amend -a -m "Modified Change 4"
+	(
+		cd dst &&
+		modify s/2/22/ stuff &&
+		git commit -a -m "Change 2" &&
+		modify s/3/33/ stuff &&
+		git commit -a -m "Change 3" &&
+		modify s/4/44/ stuff &&
+		git commit -a -m "Change 4" &&
+		git push &&
+
+		modify s/44/55/ stuff &&
+		git commit --amend -a -m "Modified Change 4"
 	)
 '
 
 test_expect_success 'git pull --rebase does not reapply old patches' '
-	(cd dst &&
-	 test_must_fail git pull --rebase &&
-	 test 1 = $(find .git/rebase-apply -name "000*" | wc -l)
+	(
+		cd dst &&
+		test_must_fail git pull --rebase &&
+		cat .git/rebase-merge/done .git/rebase-merge/git-rebase-todo >work &&
+		grep -v -e \# -e ^$ work >patches &&
+		test_line_count = 1 patches &&
+		rm -f work
 	)
 '
 
 test_expect_success 'git pull --rebase against local branch' '
 	git checkout -b copy2 to-rebase-orig &&
 	git pull --rebase . to-rebase &&
-	test "conflicting modification" = "$(cat file)" &&
-	test file = "$(cat file2)"
+	echo "conflicting modification" >expect &&
+	test_cmp expect file &&
+	echo file >expect &&
+	test_cmp expect file2
 '
 
 test_done
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index ccde8ba491..7601c919fd 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -2,6 +2,9 @@
 
 test_description='pull options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -11,10 +14,10 @@ test_expect_success 'setup' '
 	 git commit -m one)
 '
 
-test_expect_success 'git pull -q' '
+test_expect_success 'git pull -q --no-rebase' '
 	mkdir clonedq &&
 	(cd clonedq && git init &&
-	git pull -q "../parent" >out 2>err &&
+	git pull -q --no-rebase "../parent" >out 2>err &&
 	test_must_be_empty err &&
 	test_must_be_empty out)
 '
@@ -30,10 +33,10 @@ test_expect_success 'git pull -q --rebase' '
 	test_must_be_empty out)
 '
 
-test_expect_success 'git pull' '
+test_expect_success 'git pull --no-rebase' '
 	mkdir cloned &&
 	(cd cloned && git init &&
-	git pull "../parent" >out 2>err &&
+	git pull --no-rebase "../parent" >out 2>err &&
 	test -s err &&
 	test_must_be_empty out)
 '
@@ -46,10 +49,10 @@ test_expect_success 'git pull --rebase' '
 	test_must_be_empty out)
 '
 
-test_expect_success 'git pull -v' '
+test_expect_success 'git pull -v --no-rebase' '
 	mkdir clonedv &&
 	(cd clonedv && git init &&
-	git pull -v "../parent" >out 2>err &&
+	git pull -v --no-rebase "../parent" >out 2>err &&
 	test -s err &&
 	test_must_be_empty out)
 '
@@ -62,29 +65,36 @@ test_expect_success 'git pull -v --rebase' '
 	test_must_be_empty out)
 '
 
-test_expect_success 'git pull -v -q' '
+test_expect_success 'git pull -v -q --no-rebase' '
 	mkdir clonedvq &&
 	(cd clonedvq && git init &&
-	git pull -v -q "../parent" >out 2>err &&
+	git pull -v -q --no-rebase "../parent" >out 2>err &&
 	test_must_be_empty out &&
 	test_must_be_empty err)
 '
 
-test_expect_success 'git pull -q -v' '
+test_expect_success 'git pull -q -v --no-rebase' '
 	mkdir clonedqv &&
 	(cd clonedqv && git init &&
-	git pull -q -v "../parent" >out 2>err &&
+	git pull -q -v --no-rebase "../parent" >out 2>err &&
 	test_must_be_empty out &&
 	test -s err)
 '
 test_expect_success 'git pull --cleanup errors early on invalid argument' '
 	mkdir clonedcleanup &&
 	(cd clonedcleanup && git init &&
-	test_must_fail git pull --cleanup invalid "../parent" >out 2>err &&
+	test_must_fail git pull --no-rebase --cleanup invalid "../parent" >out 2>err &&
 	test_must_be_empty out &&
 	test -s err)
 '
 
+test_expect_success 'git pull --no-write-fetch-head fails' '
+	mkdir clonedwfh &&
+	(cd clonedwfh && git init &&
+	test_expect_code 129 git pull --no-write-fetch-head "../parent" >out 2>err &&
+	test_must_be_empty out &&
+	test_i18ngrep "no-write-fetch-head" err)
+'
 
 test_expect_success 'git pull --force' '
 	mkdir clonedoldstyle &&
@@ -92,18 +102,18 @@ test_expect_success 'git pull --force' '
 	cat >>.git/config <<-\EOF &&
 	[remote "one"]
 		url = ../parent
-		fetch = refs/heads/master:refs/heads/mirror
+		fetch = refs/heads/main:refs/heads/mirror
 	[remote "two"]
 		url = ../parent
-		fetch = refs/heads/master:refs/heads/origin
-	[branch "master"]
+		fetch = refs/heads/main:refs/heads/origin
+	[branch "main"]
 		remote = two
-		merge = refs/heads/master
+		merge = refs/heads/main
 	EOF
 	git pull two &&
 	test_commit A &&
 	git branch -f origin &&
-	git pull --all --force
+	git pull --no-rebase --all --force
 	)
 '
 
@@ -117,9 +127,9 @@ test_expect_success 'git pull --all' '
 	[remote "two"]
 		url = ../parent
 		fetch = refs/heads/*:refs/remotes/two/*
-	[branch "master"]
+	[branch "main"]
 		remote = one
-		merge = refs/heads/master
+		merge = refs/heads/main
 	EOF
 	git pull --all
 	)
@@ -132,7 +142,7 @@ test_expect_success 'git pull --dry-run' '
 		cd clonedry &&
 		git pull --dry-run ../parent &&
 		test_path_is_missing .git/FETCH_HEAD &&
-		test_path_is_missing .git/refs/heads/master &&
+		test_path_is_missing .git/refs/heads/main &&
 		test_path_is_missing .git/index &&
 		test_path_is_missing file
 	)
@@ -146,7 +156,7 @@ test_expect_success 'git pull --all --dry-run' '
 		git remote add origin ../parent &&
 		git pull --all --dry-run &&
 		test_path_is_missing .git/FETCH_HEAD &&
-		test_path_is_missing .git/refs/remotes/origin/master &&
+		test_path_is_missing .git/refs/remotes/origin/main &&
 		test_path_is_missing .git/index &&
 		test_path_is_missing file
 	)
@@ -169,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
 	)
 '
 
diff --git a/t/t5523-push-upstream.sh b/t/t5523-push-upstream.sh
index c0df81a014..fdb4292056 100755
--- a/t/t5523-push-upstream.sh
+++ b/t/t5523-push-upstream.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='push with --set-upstream'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
@@ -26,35 +29,35 @@ check_config() {
 	test_cmp expect.$1 actual.$1
 }
 
-test_expect_success 'push -u master:master' '
-	git push -u upstream master:master &&
-	check_config master upstream refs/heads/master
+test_expect_success 'push -u main:main' '
+	git push -u upstream main:main &&
+	check_config main upstream refs/heads/main
 '
 
-test_expect_success 'push -u master:other' '
-	git push -u upstream master:other &&
-	check_config master upstream refs/heads/other
+test_expect_success 'push -u main:other' '
+	git push -u upstream main:other &&
+	check_config main upstream refs/heads/other
 '
 
-test_expect_success 'push -u --dry-run master:otherX' '
-	git push -u --dry-run upstream master:otherX &&
-	check_config master upstream refs/heads/other
+test_expect_success 'push -u --dry-run main:otherX' '
+	git push -u --dry-run upstream main:otherX &&
+	check_config main upstream refs/heads/other
 '
 
-test_expect_success 'push -u master2:master2' '
-	git branch master2 &&
-	git push -u upstream master2:master2 &&
-	check_config master2 upstream refs/heads/master2
+test_expect_success 'push -u topic_2:topic_2' '
+	git branch topic_2 &&
+	git push -u upstream topic_2:topic_2 &&
+	check_config topic_2 upstream refs/heads/topic_2
 '
 
-test_expect_success 'push -u master2:other2' '
-	git push -u upstream master2:other2 &&
-	check_config master2 upstream refs/heads/other2
+test_expect_success 'push -u topic_2:other2' '
+	git push -u upstream topic_2:other2 &&
+	check_config topic_2 upstream refs/heads/other2
 '
 
-test_expect_success 'push -u :master2' '
-	git push -u upstream :master2 &&
-	check_config master2 upstream refs/heads/other2
+test_expect_success 'push -u :topic_2' '
+	git push -u upstream :topic_2 &&
+	check_config topic_2 upstream refs/heads/other2
 '
 
 test_expect_success 'push -u --all' '
@@ -74,7 +77,7 @@ test_expect_success 'push -u HEAD' '
 test_expect_success TTY 'progress messages go to tty' '
 	ensure_fresh_upstream &&
 
-	test_terminal git push -u upstream master >out 2>err &&
+	test_terminal git push -u upstream main >out 2>err &&
 	test_i18ngrep "Writing objects" err
 '
 
@@ -82,7 +85,7 @@ test_expect_success 'progress messages do not go to non-tty' '
 	ensure_fresh_upstream &&
 
 	# skip progress messages, since stderr is non-tty
-	git push -u upstream master >out 2>err &&
+	git push -u upstream main >out 2>err &&
 	test_i18ngrep ! "Writing objects" err
 '
 
@@ -90,21 +93,21 @@ test_expect_success 'progress messages go to non-tty (forced)' '
 	ensure_fresh_upstream &&
 
 	# force progress messages to stderr, even though it is non-tty
-	git push -u --progress upstream master >out 2>err &&
+	git push -u --progress upstream main >out 2>err &&
 	test_i18ngrep "Writing objects" err
 '
 
 test_expect_success TTY 'push -q suppresses progress' '
 	ensure_fresh_upstream &&
 
-	test_terminal git push -u -q upstream master >out 2>err &&
+	test_terminal git push -u -q upstream main >out 2>err &&
 	test_i18ngrep ! "Writing objects" err
 '
 
 test_expect_success TTY 'push --no-progress suppresses progress' '
 	ensure_fresh_upstream &&
 
-	test_terminal git push -u --no-progress upstream master >out 2>err &&
+	test_terminal git push -u --no-progress upstream main >out 2>err &&
 	test_i18ngrep ! "Unpacking objects" err &&
 	test_i18ngrep ! "Writing objects" err
 '
@@ -112,7 +115,14 @@ test_expect_success TTY 'push --no-progress suppresses progress' '
 test_expect_success TTY 'quiet push' '
 	ensure_fresh_upstream &&
 
-	test_terminal git push --quiet --no-progress upstream master 2>&1 | tee output &&
+	test_terminal git push --quiet --no-progress upstream main 2>&1 | tee output &&
+	test_must_be_empty output
+'
+
+test_expect_success TTY 'quiet push -u' '
+	ensure_fresh_upstream &&
+
+	test_terminal git push --quiet -u --no-progress upstream main 2>&1 | tee output &&
 	test_must_be_empty output
 '
 
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 63205dfdf9..ed11569d8d 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -3,6 +3,9 @@
 
 test_description='Recursive "git fetch" for submodules'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 pwd=$(pwd)
@@ -18,7 +21,7 @@ add_upstream_commit() {
 		head2=$(git rev-parse --short HEAD) &&
 		echo "Fetching submodule submodule" > ../expect.err &&
 		echo "From $pwd/submodule" >> ../expect.err &&
-		echo "   $head1..$head2  master     -> origin/master" >> ../expect.err
+		echo "   $head1..$head2  sub        -> origin/sub" >> ../expect.err
 	) &&
 	(
 		cd deepsubmodule &&
@@ -30,7 +33,7 @@ add_upstream_commit() {
 		head2=$(git rev-parse --short HEAD) &&
 		echo "Fetching submodule submodule/subdir/deepsubmodule" >> ../expect.err
 		echo "From $pwd/deepsubmodule" >> ../expect.err &&
-		echo "   $head1..$head2  master     -> origin/master" >> ../expect.err
+		echo "   $head1..$head2  deep       -> origin/deep" >> ../expect.err
 	)
 }
 
@@ -41,7 +44,8 @@ test_expect_success setup '
 		git init &&
 		echo deepsubcontent > deepsubfile &&
 		git add deepsubfile &&
-		git commit -m new deepsubfile
+		git commit -m new deepsubfile &&
+		git branch -M deep
 	) &&
 	mkdir submodule &&
 	(
@@ -50,10 +54,12 @@ test_expect_success setup '
 		echo subcontent > subfile &&
 		git add subfile &&
 		git submodule add "$pwd/deepsubmodule" subdir/deepsubmodule &&
-		git commit -a -m new
+		git commit -a -m new &&
+		git branch -M sub
 	) &&
 	git submodule add "$pwd/submodule" submodule &&
 	git commit -am initial &&
+	git branch -M super &&
 	git clone . downstream &&
 	(
 		cd downstream &&
@@ -68,7 +74,7 @@ test_expect_success "fetch --recurse-submodules recurses into submodules" '
 		git fetch --recurse-submodules >../actual.out 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err
+	test_cmp expect.err actual.err
 '
 
 test_expect_success "submodule.recurse option triggers recursive fetch" '
@@ -78,7 +84,7 @@ test_expect_success "submodule.recurse option triggers recursive fetch" '
 		git -c submodule.recurse fetch >../actual.out 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err
+	test_cmp expect.err actual.err
 '
 
 test_expect_success "fetch --recurse-submodules -j2 has the same output behaviour" '
@@ -88,7 +94,7 @@ test_expect_success "fetch --recurse-submodules -j2 has the same output behaviou
 		GIT_TRACE="$TRASH_DIRECTORY/trace.out" git fetch --recurse-submodules -j2 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err &&
+	test_cmp expect.err actual.err &&
 	grep "2 tasks" trace.out
 '
 
@@ -118,7 +124,7 @@ test_expect_success "using fetchRecurseSubmodules=true in .gitmodules recurses i
 		git fetch >../actual.out 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err
+	test_cmp expect.err actual.err
 '
 
 test_expect_success "--no-recurse-submodules overrides .gitmodules config" '
@@ -149,7 +155,7 @@ test_expect_success "--recurse-submodules overrides fetchRecurseSubmodules setti
 		git config --unset submodule.submodule.fetchRecurseSubmodules
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err
+	test_cmp expect.err actual.err
 '
 
 test_expect_success "--quiet propagates to submodules" '
@@ -177,7 +183,7 @@ test_expect_success "--dry-run propagates to submodules" '
 		git fetch --recurse-submodules --dry-run >../actual.out 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err
+	test_cmp expect.err actual.err
 '
 
 test_expect_success "Without --dry-run propagates to submodules" '
@@ -186,7 +192,7 @@ test_expect_success "Without --dry-run propagates to submodules" '
 		git fetch --recurse-submodules >../actual.out 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err
+	test_cmp expect.err actual.err
 '
 
 test_expect_success "recurseSubmodules=true propagates into submodules" '
@@ -197,7 +203,7 @@ test_expect_success "recurseSubmodules=true propagates into submodules" '
 		git fetch >../actual.out 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err
+	test_cmp expect.err actual.err
 '
 
 test_expect_success "--recurse-submodules overrides config in submodule" '
@@ -211,7 +217,7 @@ test_expect_success "--recurse-submodules overrides config in submodule" '
 		git fetch --recurse-submodules >../actual.out 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err
+	test_cmp expect.err actual.err
 '
 
 test_expect_success "--no-recurse-submodules overrides config setting" '
@@ -245,13 +251,13 @@ test_expect_success "Recursion stops when no new submodule commits are fetched"
 	git commit -m "new submodule" &&
 	head2=$(git rev-parse --short HEAD) &&
 	echo "From $pwd/." > expect.err.sub &&
-	echo "   $head1..$head2  master     -> origin/master" >>expect.err.sub &&
+	echo "   $head1..$head2  super      -> origin/super" >>expect.err.sub &&
 	head -3 expect.err >> expect.err.sub &&
 	(
 		cd downstream &&
 		git fetch >../actual.out 2>../actual.err
 	) &&
-	test_i18ncmp expect.err.sub actual.err &&
+	test_cmp expect.err.sub actual.err &&
 	test_must_be_empty actual.out
 '
 
@@ -263,13 +269,13 @@ test_expect_success "Recursion doesn't happen when new superproject commits don'
 	git commit -m "new file" &&
 	head2=$(git rev-parse --short HEAD) &&
 	echo "From $pwd/." > expect.err.file &&
-	echo "   $head1..$head2  master     -> origin/master" >> expect.err.file &&
+	echo "   $head1..$head2  super      -> origin/super" >> expect.err.file &&
 	(
 		cd downstream &&
 		git fetch >../actual.out 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err.file actual.err
+	test_cmp expect.err.file actual.err
 '
 
 test_expect_success "Recursion picks up config in submodule" '
@@ -287,7 +293,7 @@ test_expect_success "Recursion picks up config in submodule" '
 	git commit -m "new submodule" &&
 	head2=$(git rev-parse --short HEAD) &&
 	echo "From $pwd/." > expect.err.sub &&
-	echo "   $head1..$head2  master     -> origin/master" >> expect.err.sub &&
+	echo "   $head1..$head2  super      -> origin/super" >> expect.err.sub &&
 	cat expect.err >> expect.err.sub &&
 	(
 		cd downstream &&
@@ -297,7 +303,7 @@ test_expect_success "Recursion picks up config in submodule" '
 			git config --unset fetch.recurseSubmodules
 		)
 	) &&
-	test_i18ncmp expect.err.sub actual.err &&
+	test_cmp expect.err.sub actual.err &&
 	test_must_be_empty actual.out
 '
 
@@ -316,21 +322,21 @@ test_expect_success "Recursion picks up all submodules when necessary" '
 		head2=$(git rev-parse --short HEAD) &&
 		echo "Fetching submodule submodule" > ../expect.err.sub &&
 		echo "From $pwd/submodule" >> ../expect.err.sub &&
-		echo "   $head1..$head2  master     -> origin/master" >> ../expect.err.sub
+		echo "   $head1..$head2  sub        -> origin/sub" >> ../expect.err.sub
 	) &&
 	head1=$(git rev-parse --short HEAD) &&
 	git add submodule &&
 	git commit -m "new submodule" &&
 	head2=$(git rev-parse --short HEAD) &&
 	echo "From $pwd/." > expect.err.2 &&
-	echo "   $head1..$head2  master     -> origin/master" >> expect.err.2 &&
+	echo "   $head1..$head2  super      -> origin/super" >> expect.err.2 &&
 	cat expect.err.sub >> expect.err.2 &&
 	tail -3 expect.err >> expect.err.2 &&
 	(
 		cd downstream &&
 		git fetch >../actual.out 2>../actual.err
 	) &&
-	test_i18ncmp expect.err.2 actual.err &&
+	test_cmp expect.err.2 actual.err &&
 	test_must_be_empty actual.out
 '
 
@@ -349,7 +355,7 @@ test_expect_success "'--recurse-submodules=on-demand' doesn't recurse when no ne
 		head2=$(git rev-parse --short HEAD) &&
 		echo Fetching submodule submodule > ../expect.err.sub &&
 		echo "From $pwd/submodule" >> ../expect.err.sub &&
-		echo "   $head1..$head2  master     -> origin/master" >> ../expect.err.sub
+		echo "   $head1..$head2  sub        -> origin/sub" >> ../expect.err.sub
 	) &&
 	(
 		cd downstream &&
@@ -368,7 +374,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess
 	head2=$(git rev-parse --short HEAD) &&
 	tail -3 expect.err > expect.err.deepsub &&
 	echo "From $pwd/." > expect.err &&
-	echo "   $head1..$head2  master     -> origin/master" >>expect.err &&
+	echo "   $head1..$head2  super      -> origin/super" >>expect.err &&
 	cat expect.err.sub >> expect.err &&
 	cat expect.err.deepsub >> expect.err &&
 	(
@@ -386,7 +392,7 @@ test_expect_success "'--recurse-submodules=on-demand' recurses as deep as necess
 		)
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err
+	test_cmp expect.err actual.err
 '
 
 test_expect_success "'--recurse-submodules=on-demand' stops when no new submodule commits are found in the superproject (and ignores config)" '
@@ -397,13 +403,13 @@ test_expect_success "'--recurse-submodules=on-demand' stops when no new submodul
 	git commit -m "new file" &&
 	head2=$(git rev-parse --short HEAD) &&
 	echo "From $pwd/." > expect.err.file &&
-	echo "   $head1..$head2  master     -> origin/master" >> expect.err.file &&
+	echo "   $head1..$head2  super      -> origin/super" >> expect.err.file &&
 	(
 		cd downstream &&
 		git fetch --recurse-submodules=on-demand >../actual.out 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err.file actual.err
+	test_cmp expect.err.file actual.err
 '
 
 test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config" '
@@ -418,7 +424,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
 	git commit -m "new submodule" &&
 	head2=$(git rev-parse --short HEAD) &&
 	echo "From $pwd/." > expect.err.2 &&
-	echo "   $head1..$head2  master     -> origin/master" >>expect.err.2 &&
+	echo "   $head1..$head2  super      -> origin/super" >>expect.err.2 &&
 	head -3 expect.err >> expect.err.2 &&
 	(
 		cd downstream &&
@@ -431,7 +437,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' overrides global config
 		git config --unset fetch.recurseSubmodules
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err.2 actual.err
+	test_cmp expect.err.2 actual.err
 '
 
 test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' overrides fetch.recurseSubmodules" '
@@ -446,7 +452,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
 	git commit -m "new submodule" &&
 	head2=$(git rev-parse --short HEAD) &&
 	echo "From $pwd/." > expect.err.2 &&
-	echo "   $head1..$head2  master     -> origin/master" >>expect.err.2 &&
+	echo "   $head1..$head2  super      -> origin/super" >>expect.err.2 &&
 	head -3 expect.err >> expect.err.2 &&
 	(
 		cd downstream &&
@@ -459,7 +465,7 @@ test_expect_success "'submodule.<sub>.fetchRecurseSubmodules=on-demand' override
 		git config --unset submodule.submodule.fetchRecurseSubmodules
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err.2 actual.err
+	test_cmp expect.err.2 actual.err
 '
 
 test_expect_success "don't fetch submodule when newly recorded commits are already present" '
@@ -472,16 +478,16 @@ test_expect_success "don't fetch submodule when newly recorded commits are alrea
 	git commit -m "submodule rewound" &&
 	head2=$(git rev-parse --short HEAD) &&
 	echo "From $pwd/." > expect.err &&
-	echo "   $head1..$head2  master     -> origin/master" >> expect.err &&
+	echo "   $head1..$head2  super      -> origin/super" >> expect.err &&
 	(
 		cd downstream &&
 		git fetch >../actual.out 2>../actual.err
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err actual.err &&
+	test_cmp expect.err actual.err &&
 	(
 		cd submodule &&
-		git checkout -q master
+		git checkout -q sub
 	)
 '
 
@@ -497,7 +503,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .git
 	git commit -m "new submodule without .gitmodules" &&
 	head2=$(git rev-parse --short HEAD) &&
 	echo "From $pwd/." >expect.err.2 &&
-	echo "   $head1..$head2  master     -> origin/master" >>expect.err.2 &&
+	echo "   $head1..$head2  super      -> origin/super" >>expect.err.2 &&
 	head -3 expect.err >>expect.err.2 &&
 	(
 		cd downstream &&
@@ -514,7 +520,7 @@ test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .git
 		git reset --hard
 	) &&
 	test_must_be_empty actual.out &&
-	test_i18ncmp expect.err.2 actual.err &&
+	test_cmp expect.err.2 actual.err &&
 	git checkout HEAD^ -- .gitmodules &&
 	git add .gitmodules &&
 	git commit -m "new submodule restored .gitmodules"
@@ -663,9 +669,9 @@ test_expect_success 'fetch new submodule commits on-demand without .gitmodules e
 	git config -f .gitmodules --remove-section submodule.sub1 &&
 	git add .gitmodules &&
 	git commit -m "delete gitmodules file" &&
-	git checkout -B master &&
+	git checkout -B super &&
 	git -C downstream fetch &&
-	git -C downstream checkout origin/master &&
+	git -C downstream checkout origin/super &&
 
 	C=$(git -C submodule commit-tree -m "yet another change outside refs/heads" HEAD^{tree}) &&
 	git -C submodule update-ref refs/changes/7 $C &&
@@ -719,4 +725,121 @@ test_expect_success 'fetch new submodule commit intermittently referenced by sup
 	)
 '
 
+add_commit_push () {
+	dir="$1" &&
+	msg="$2" &&
+	shift 2 &&
+	git -C "$dir" add "$@" &&
+	git -C "$dir" commit -a -m "$msg" &&
+	git -C "$dir" push
+}
+
+compare_refs_in_dir () {
+	fail= &&
+	if test "x$1" = 'x!'
+	then
+		fail='!' &&
+		shift
+	fi &&
+	git -C "$1" rev-parse --verify "$2" >expect &&
+	git -C "$3" rev-parse --verify "$4" >actual &&
+	eval $fail test_cmp expect actual
+}
+
+
+test_expect_success 'setup nested submodule fetch test' '
+	# does not depend on any previous test setups
+
+	for repo in outer middle inner
+	do
+		git init --bare $repo &&
+		git clone $repo ${repo}_content &&
+		echo "$repo" >"${repo}_content/file" &&
+		add_commit_push ${repo}_content "initial" file ||
+		return 1
+	done &&
+
+	git clone outer A &&
+	git -C A submodule add "$pwd/middle" &&
+	git -C A/middle/ submodule add "$pwd/inner" &&
+	add_commit_push A/middle/ "adding inner sub" .gitmodules inner &&
+	add_commit_push A/ "adding middle sub" .gitmodules middle &&
+
+	git clone outer B &&
+	git -C B/ submodule update --init middle &&
+
+	compare_refs_in_dir A HEAD B HEAD &&
+	compare_refs_in_dir A/middle HEAD B/middle HEAD &&
+	test_path_is_file B/file &&
+	test_path_is_file B/middle/file &&
+	test_path_is_missing B/middle/inner/file &&
+
+	echo "change on inner repo of A" >"A/middle/inner/file" &&
+	add_commit_push A/middle/inner "change on inner" file &&
+	add_commit_push A/middle "change on inner" inner &&
+	add_commit_push A "change on inner" middle
+'
+
+test_expect_success 'fetching a superproject containing an uninitialized sub/sub project' '
+	# depends on previous test for setup
+
+	git -C B/ fetch &&
+	compare_refs_in_dir A origin/HEAD B origin/HEAD
+'
+
+fetch_with_recursion_abort () {
+	# In a regression the following git call will run into infinite recursion.
+	# To handle that, we connect the sed command to the git call by a pipe
+	# so that sed can kill the infinite recursion when detected.
+	# The recursion creates git output like:
+	# Fetching submodule sub
+	# Fetching submodule sub/sub              <-- [1]
+	# Fetching submodule sub/sub/sub
+	# ...
+	# [1] sed will stop reading and cause git to eventually stop and die
+
+	git -C "$1" fetch --recurse-submodules 2>&1 |
+		sed "/Fetching submodule $2[^$]/q" >out &&
+	! grep "Fetching submodule $2[^$]" out
+}
+
+test_expect_success 'setup recursive fetch with uninit submodule' '
+	# does not depend on any previous test setups
+
+	test_create_repo super &&
+	test_commit -C super initial &&
+	test_create_repo sub &&
+	test_commit -C sub initial &&
+	git -C sub rev-parse HEAD >expect &&
+
+	git -C super submodule add ../sub &&
+	git -C super commit -m "add sub" &&
+
+	git clone super superclone &&
+	git -C superclone submodule status >out &&
+	sed -e "s/^-//" -e "s/ sub.*$//" out >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'recursive fetch with uninit submodule' '
+	# depends on previous test for setup
+
+	fetch_with_recursion_abort superclone sub &&
+	git -C superclone submodule status >out &&
+	sed -e "s/^-//" -e "s/ sub$//" out >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'recursive fetch after deinit a submodule' '
+	# depends on previous test for setup
+
+	git -C superclone submodule update --init sub &&
+	git -C superclone submodule deinit -f sub &&
+
+	fetch_with_recursion_abort superclone sub &&
+	git -C superclone submodule status >out &&
+	sed -e "s/^-//" -e "s/ sub$//" out >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t5527-fetch-odd-refs.sh b/t/t5527-fetch-odd-refs.sh
index 3b0cb98422..e2770e4541 100755
--- a/t/t5527-fetch-odd-refs.sh
+++ b/t/t5527-fetch-odd-refs.sh
@@ -1,17 +1,20 @@
 #!/bin/sh
 
 test_description='test fetching of oddly-named refs'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # afterwards we will have:
 #  HEAD - two
-#  refs/for/refs/heads/master - one
-#  refs/heads/master - three
+#  refs/for/refs/heads/main - one
+#  refs/heads/main - three
 test_expect_success 'setup repo with odd suffix ref' '
 	echo content >file &&
 	git add . &&
 	git commit -m one &&
-	git update-ref refs/for/refs/heads/master HEAD &&
+	git update-ref refs/for/refs/heads/main HEAD &&
 	echo content >>file &&
 	git commit -a -m two &&
 	echo content >>file &&
@@ -22,7 +25,7 @@ test_expect_success 'setup repo with odd suffix ref' '
 test_expect_success 'suffix ref is ignored during fetch' '
 	git clone --bare file://"$PWD" suffix &&
 	echo three >expect &&
-	git --git-dir=suffix log -1 --format=%s refs/heads/master >actual &&
+	git --git-dir=suffix log -1 --format=%s refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
@@ -33,7 +36,7 @@ test_expect_success 'try to create repo with absurdly long refname' '
 	(
 		cd long &&
 		test_commit long &&
-		test_commit master
+		test_commit main
 	) &&
 	if git -C long update-ref refs/heads/$ref1440 long; then
 		test_set_prereq LONG_REF
@@ -46,7 +49,7 @@ test_expect_success LONG_REF 'fetch handles extremely long refname' '
 	git fetch long refs/heads/*:refs/remotes/long/* &&
 	cat >expect <<-\EOF &&
 	long
-	master
+	main
 	EOF
 	git for-each-ref --format="%(subject)" refs/remotes/long >actual &&
 	test_cmp expect actual
@@ -55,7 +58,7 @@ test_expect_success LONG_REF 'fetch handles extremely long refname' '
 test_expect_success LONG_REF 'push handles extremely long refname' '
 	git push long :refs/heads/$ref1440 &&
 	git -C long for-each-ref --format="%(subject)" refs/heads >actual &&
-	echo master >expect &&
+	echo main >expect &&
 	test_cmp expect actual
 '
 
diff --git a/t/t5528-push-default.sh b/t/t5528-push-default.sh
index 44309566f1..f280e00eb7 100755
--- a/t/t5528-push-default.sh
+++ b/t/t5528-push-default.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='check various push.default settings'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup bare remotes' '
@@ -41,7 +44,7 @@ test_push_failure () {
 
 # $1 = success or failure
 # $2 = push.default value
-# $3 = branch to check for actual output (master or foo)
+# $3 = branch to check for actual output (main or foo)
 # $4 = [optional] switch to triangular workflow
 test_pushdefault_workflow () {
 	workflow=central
@@ -51,8 +54,8 @@ test_pushdefault_workflow () {
 		pushdefault=parent2
 	fi
 	test_expect_success "push.default = $2 $1 in $workflow workflows" "
-		test_config branch.master.remote parent1 &&
-		test_config branch.master.merge refs/heads/foo &&
+		test_config branch.main.remote parent1 &&
+		test_config branch.main.merge refs/heads/foo &&
 		test_config remote.pushdefault $pushdefault &&
 		test_commit commit-for-$2${4+-triangular} &&
 		test_push_$1 $2 $3 ${4+repo2}
@@ -60,32 +63,32 @@ test_pushdefault_workflow () {
 }
 
 test_expect_success '"upstream" pushes to configured upstream' '
-	git checkout master &&
-	test_config branch.master.remote parent1 &&
-	test_config branch.master.merge refs/heads/foo &&
+	git checkout main &&
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/foo &&
 	test_commit two &&
 	test_push_success upstream foo
 '
 
 test_expect_success '"upstream" does not push on unconfigured remote' '
-	git checkout master &&
-	test_unconfig branch.master.remote &&
+	git checkout main &&
+	test_unconfig branch.main.remote &&
 	test_commit three &&
 	test_push_failure upstream
 '
 
 test_expect_success '"upstream" does not push on unconfigured branch' '
-	git checkout master &&
-	test_config branch.master.remote parent1 &&
-	test_unconfig branch.master.merge &&
+	git checkout main &&
+	test_config branch.main.remote parent1 &&
+	test_unconfig branch.main.merge &&
 	test_commit four &&
 	test_push_failure upstream
 '
 
 test_expect_success '"upstream" does not push when remotes do not match' '
-	git checkout master &&
-	test_config branch.master.remote parent1 &&
-	test_config branch.master.merge refs/heads/foo &&
+	git checkout main &&
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/foo &&
 	test_config push.default upstream &&
 	test_commit five &&
 	test_must_fail git push parent2
@@ -98,6 +101,12 @@ test_expect_success 'push from/to new branch with upstream, matching and simple'
 	test_push_failure upstream
 '
 
+test_expect_success '"matching" fails if none match' '
+	git init --bare empty &&
+	test_must_fail git push empty : 2>actual &&
+	test_i18ngrep "Perhaps you should specify a branch" actual
+'
+
 test_expect_success 'push ambiguously named branch with upstream, matching and simple' '
 	git checkout -b ambiguous &&
 	test_config branch.ambiguous.remote parent1 &&
@@ -115,99 +124,99 @@ test_expect_success 'push from/to new branch with current creates remote branch'
 '
 
 test_expect_success 'push to existing branch, with no upstream configured' '
-	test_config branch.master.remote repo1 &&
-	git checkout master &&
+	test_config branch.main.remote repo1 &&
+	git checkout main &&
 	test_push_failure simple &&
 	test_push_failure upstream
 '
 
 test_expect_success 'push to existing branch, upstream configured with same name' '
-	test_config branch.master.remote repo1 &&
-	test_config branch.master.merge refs/heads/master &&
-	git checkout master &&
+	test_config branch.main.remote repo1 &&
+	test_config branch.main.merge refs/heads/main &&
+	git checkout main &&
 	test_commit six &&
-	test_push_success upstream master &&
+	test_push_success upstream main &&
 	test_commit seven &&
-	test_push_success simple master
+	test_push_success simple main
 '
 
 test_expect_success 'push to existing branch, upstream configured with different name' '
-	test_config branch.master.remote repo1 &&
-	test_config branch.master.merge refs/heads/other-name &&
-	git checkout master &&
+	test_config branch.main.remote repo1 &&
+	test_config branch.main.merge refs/heads/other-name &&
+	git checkout main &&
 	test_commit eight &&
 	test_push_success upstream other-name &&
 	test_commit nine &&
 	test_push_failure simple &&
 	git --git-dir=repo1 log -1 --format="%h %s" "other-name" >expect-other-name &&
-	test_push_success current master &&
+	test_push_success current main &&
 	git --git-dir=repo1 log -1 --format="%h %s" "other-name" >actual-other-name &&
 	test_cmp expect-other-name actual-other-name
 '
 
-# We are on 'master', which integrates with 'foo' from parent1
+# We are on 'main', which integrates with 'foo' from parent1
 # remote (set in test_pushdefault_workflow helper).  Push to
 # parent1 in centralized, and push to parent2 in triangular workflow.
-# The parent1 repository has 'master' and 'foo' branches, while
-# the parent2 repository has only 'master' branch.
+# The parent1 repository has 'main' and 'foo' branches, while
+# the parent2 repository has only 'main' branch.
 #
 # test_pushdefault_workflow() arguments:
 # $1 = success or failure
 # $2 = push.default value
-# $3 = branch to check for actual output (master or foo)
+# $3 = branch to check for actual output (main or foo)
 # $4 = [optional] switch to triangular workflow
 
-# update parent1's master (which is not our upstream)
-test_pushdefault_workflow success current master
+# update parent1's main (which is not our upstream)
+test_pushdefault_workflow success current main
 
 # update parent1's foo (which is our upstream)
 test_pushdefault_workflow success upstream foo
 
-# upsream is foo which is not the name of the current branch
-test_pushdefault_workflow failure simple master
+# upstream is foo which is not the name of the current branch
+test_pushdefault_workflow failure simple main
 
-# master and foo are updated
-test_pushdefault_workflow success matching master
+# main and foo are updated
+test_pushdefault_workflow success matching main
 
-# master is updated
-test_pushdefault_workflow success current master triangular
+# main is updated
+test_pushdefault_workflow success current main triangular
 
 # upstream mode cannot be used in triangular
 test_pushdefault_workflow failure upstream foo triangular
 
 # in triangular, 'simple' works as 'current' and update the branch
 # with the same name.
-test_pushdefault_workflow success simple master triangular
+test_pushdefault_workflow success simple main triangular
 
-# master is updated (parent2 does not have foo)
-test_pushdefault_workflow success matching master triangular
+# main is updated (parent2 does not have foo)
+test_pushdefault_workflow success matching main triangular
 
 # default tests, when no push-default is specified. This
 # should behave the same as "simple" in non-triangular
 # settings, and as "current" otherwise.
 
 test_expect_success 'default behavior allows "simple" push' '
-	test_config branch.master.remote parent1 &&
-	test_config branch.master.merge refs/heads/master &&
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/main &&
 	test_config remote.pushdefault parent1 &&
-	test_commit default-master-master &&
-	test_push_success "" master
+	test_commit default-main-main &&
+	test_push_success "" main
 '
 
 test_expect_success 'default behavior rejects non-simple push' '
-	test_config branch.master.remote parent1 &&
-	test_config branch.master.merge refs/heads/foo &&
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/foo &&
 	test_config remote.pushdefault parent1 &&
-	test_commit default-master-foo &&
+	test_commit default-main-foo &&
 	test_push_failure ""
 '
 
 test_expect_success 'default triangular behavior acts like "current"' '
-	test_config branch.master.remote parent1 &&
-	test_config branch.master.merge refs/heads/foo &&
+	test_config branch.main.remote parent1 &&
+	test_config branch.main.merge refs/heads/foo &&
 	test_config remote.pushdefault parent2 &&
 	test_commit default-triangular &&
-	test_push_success "" master repo2
+	test_push_success "" main repo2
 '
 
 test_done
diff --git a/t/t5529-push-errors.sh b/t/t5529-push-errors.sh
index 9871307fd4..ce85fd30ad 100755
--- a/t/t5529-push-errors.sh
+++ b/t/t5529-push-errors.sh
@@ -32,7 +32,7 @@ test_expect_success 'detect missing branches early' '
 test_expect_success 'detect missing sha1 expressions early' '
 	echo no >rp-ran &&
 	echo no >expect &&
-	test_must_fail git push origin master~2:master &&
+	test_must_fail git push origin main~2:main &&
 	test_cmp expect rp-ran
 '
 
diff --git a/t/t5530-upload-pack-error.sh b/t/t5530-upload-pack-error.sh
index a1d3031d40..7c1460eaa9 100755
--- a/t/t5530-upload-pack-error.sh
+++ b/t/t5530-upload-pack-error.sh
@@ -14,7 +14,6 @@ corrupt_repo () {
 }
 
 test_expect_success 'setup and corrupt repository' '
-
 	echo file >file &&
 	git add file &&
 	git rev-parse :file &&
@@ -31,9 +30,10 @@ test_expect_success 'fsck fails' '
 '
 
 test_expect_success 'upload-pack fails due to error in pack-objects packing' '
-
-	printf "0032want %s\n00000009done\n0000" \
-		$(git rev-parse HEAD) >input &&
+	head=$(git rev-parse HEAD) &&
+	hexsz=$(test_oid hexsz) &&
+	printf "%04xwant %s\n00000009done\n0000" \
+		$(($hexsz + 10)) $head >input &&
 	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
 	test_i18ngrep "unable to read" output.err &&
 	test_i18ngrep "pack-objects died" output.err
@@ -51,16 +51,17 @@ test_expect_success 'fsck fails' '
 '
 test_expect_success 'upload-pack fails due to error in rev-list' '
 
-	printf "0032want %s\n0034shallow %s00000009done\n0000" \
-		$(git rev-parse HEAD) $(git rev-parse HEAD^) >input &&
+	printf "%04xwant %s\n%04xshallow %s00000009done\n0000" \
+		$(($hexsz + 10)) $(git rev-parse HEAD) \
+		$(($hexsz + 12)) $(git rev-parse HEAD^) >input &&
 	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
 	grep "bad tree object" output.err
 '
 
 test_expect_success 'upload-pack fails due to bad want (no object)' '
 
-	printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
-		"deadbeefdeadbeefdeadbeefdeadbeefdeadbeef" >input &&
+	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
+		$(($hexsz + 29)) $(test_oid deadbeef) >input &&
 	test_must_fail git upload-pack . <input >output 2>output.err &&
 	grep "not our ref" output.err &&
 	grep "ERR" output &&
@@ -70,8 +71,8 @@ test_expect_success 'upload-pack fails due to bad want (no object)' '
 test_expect_success 'upload-pack fails due to bad want (not tip)' '
 
 	oid=$(echo an object we have | git hash-object -w --stdin) &&
-	printf "0045want %s multi_ack_detailed\n00000009done\n0000" \
-		"$oid" >input &&
+	printf "%04xwant %s multi_ack_detailed\n00000009done\n0000" \
+		$(($hexsz + 29)) "$oid" >input &&
 	test_must_fail git upload-pack . <input >output 2>output.err &&
 	grep "not our ref" output.err &&
 	grep "ERR" output &&
@@ -80,13 +81,30 @@ test_expect_success 'upload-pack fails due to bad want (not tip)' '
 
 test_expect_success 'upload-pack fails due to error in pack-objects enumeration' '
 
-	printf "0032want %s\n00000009done\n0000" \
-		$(git rev-parse HEAD) >input &&
+	printf "%04xwant %s\n00000009done\n0000" \
+		$((hexsz + 10)) $(git rev-parse HEAD) >input &&
 	test_must_fail git upload-pack . <input >/dev/null 2>output.err &&
 	grep "bad tree object" output.err &&
 	grep "pack-objects died" output.err
 '
 
+test_expect_success 'upload-pack tolerates EOF just after stateless client wants' '
+	test_commit initial &&
+	head=$(git rev-parse HEAD) &&
+
+	{
+		packetize "want $head" &&
+		packetize "shallow $head" &&
+		packetize "deepen 1" &&
+		printf "0000"
+	} >request &&
+
+	printf "0000" >expect &&
+
+	git upload-pack --stateless-rpc . <request >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'create empty repository' '
 
 	mkdir foo &&
@@ -97,7 +115,7 @@ test_expect_success 'create empty repository' '
 
 test_expect_success 'fetch fails' '
 
-	test_must_fail git fetch .. master
+	test_must_fail git fetch .. main
 
 '
 
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index 4ad059e6be..d573ca496a 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -2,6 +2,9 @@
 
 test_description='test push with submodules'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -30,7 +33,7 @@ test_expect_success setup '
 test_expect_success 'push works with recorded gitlink' '
 	(
 		cd work &&
-		git push ../pub.git master
+		git push ../pub.git main
 	)
 '
 
@@ -45,7 +48,7 @@ test_expect_success 'push if submodule has no remote' '
 		cd work &&
 		git add gar/bage &&
 		git commit -m "Second commit for gar/bage" &&
-		git push --recurse-submodules=check ../pub.git master
+		git push --recurse-submodules=check ../pub.git main
 	)
 '
 
@@ -66,21 +69,21 @@ test_expect_success 'push fails if submodule commit not on remote' '
 		git commit -m "Third commit for gar/bage" &&
 		# the push should fail with --recurse-submodules=check
 		# on the command line...
-		test_must_fail git push --recurse-submodules=check ../pub.git master &&
+		test_must_fail git push --recurse-submodules=check ../pub.git main &&
 
 		# ...or if specified in the configuration..
-		test_must_fail git -c push.recurseSubmodules=check push ../pub.git master
+		test_must_fail git -c push.recurseSubmodules=check push ../pub.git main
 	)
 '
 
 test_expect_success 'push succeeds after commit was pushed to remote' '
 	(
 		cd work/gar/bage &&
-		git push origin master
+		git push origin main
 	) &&
 	(
 		cd work &&
-		git push --recurse-submodules=check ../pub.git master
+		git push --recurse-submodules=check ../pub.git main
 	)
 '
 
@@ -95,13 +98,13 @@ test_expect_success 'push succeeds if submodule commit not on remote but using o
 		cd work &&
 		git add gar/bage &&
 		git commit -m "Recurse on-demand on command line for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git master &&
+		git push --recurse-submodules=on-demand ../pub.git main &&
 		# Check that the supermodule commit got there
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
+		git diff --quiet FETCH_HEAD main &&
 		# Check that the submodule commit got there too
 		cd gar/bage &&
-		git diff --quiet origin/master master
+		git diff --quiet origin/main main
 	)
 '
 
@@ -116,13 +119,13 @@ test_expect_success 'push succeeds if submodule commit not on remote but using o
 		cd work &&
 		git add gar/bage &&
 		git commit -m "Recurse on-demand from config for gar/bage" &&
-		git -c push.recurseSubmodules=on-demand push ../pub.git master &&
+		git -c push.recurseSubmodules=on-demand push ../pub.git main &&
 		# Check that the supermodule commit got there
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
+		git diff --quiet FETCH_HEAD main &&
 		# Check that the submodule commit got there too
 		cd gar/bage &&
-		git diff --quiet origin/master master
+		git diff --quiet origin/main main
 	)
 '
 
@@ -137,13 +140,13 @@ test_expect_success 'push succeeds if submodule commit not on remote but using a
 		cd work &&
 		git add gar/bage &&
 		git commit -m "Recurse submodule.recurse from config for gar/bage" &&
-		git -c submodule.recurse push ../pub.git master &&
+		git -c submodule.recurse push ../pub.git main &&
 		# Check that the supermodule commit got there
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
+		git diff --quiet FETCH_HEAD main &&
 		# Check that the submodule commit got there too
 		cd gar/bage &&
-		git diff --quiet origin/master master
+		git diff --quiet origin/main main
 	)
 '
 
@@ -161,34 +164,34 @@ test_expect_success 'push recurse-submodules on command line overrides config' '
 
 		# Ensure that we can override on-demand in the config
 		# to just check submodules
-		test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git master &&
+		test_must_fail git -c push.recurseSubmodules=on-demand push --recurse-submodules=check ../pub.git main &&
 		# Check that the supermodule commit did not get there
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master^ &&
+		git diff --quiet FETCH_HEAD main^ &&
 		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/master master^) &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
 
 		# Ensure that we can override check in the config to
 		# disable submodule recursion entirely
-		(cd gar/bage && git diff --quiet origin/master master^) &&
-		git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git master &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
+		git -c push.recurseSubmodules=on-demand push --recurse-submodules=no ../pub.git main &&
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		(cd gar/bage && git diff --quiet origin/master master^) &&
+		git diff --quiet FETCH_HEAD main &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
 
 		# Ensure that we can override check in the config to
 		# disable submodule recursion entirely (alternative form)
-		git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git master &&
+		git -c push.recurseSubmodules=on-demand push --no-recurse-submodules ../pub.git main &&
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		(cd gar/bage && git diff --quiet origin/master master^) &&
+		git diff --quiet FETCH_HEAD main &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
 
 		# Ensure that we can override check in the config to
 		# push the submodule too
-		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master &&
+		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
-		(cd gar/bage && git diff --quiet origin/master master)
+		git diff --quiet FETCH_HEAD main &&
+		(cd gar/bage && git diff --quiet origin/main main)
 	)
 '
 
@@ -205,31 +208,31 @@ test_expect_success 'push recurse-submodules last one wins on command line' '
 		git commit -m "Recurse on command-line overriding earlier command-line for gar/bage" &&
 
 		# should result in "check"
-		test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git master &&
+		test_must_fail git push --recurse-submodules=on-demand --recurse-submodules=check ../pub.git main &&
 		# Check that the supermodule commit did not get there
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master^ &&
+		git diff --quiet FETCH_HEAD main^ &&
 		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/master master^) &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
 
 		# should result in "no"
-		git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git master &&
+		git push --recurse-submodules=on-demand --recurse-submodules=no ../pub.git main &&
 		# Check that the supermodule commit did get there
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
+		git diff --quiet FETCH_HEAD main &&
 		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/master master^) &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
 
 		# should result in "no"
-		git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git master &&
+		git push --recurse-submodules=on-demand --no-recurse-submodules ../pub.git main &&
 		# Check that the submodule commit did not get there
-		(cd gar/bage && git diff --quiet origin/master master^) &&
+		(cd gar/bage && git diff --quiet origin/main main^) &&
 
 		# But the options in the other order should push the submodule
-		git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git master &&
+		git push --recurse-submodules=check --recurse-submodules=on-demand ../pub.git main &&
 		# Check that the submodule commit did get there
 		git fetch ../pub.git &&
-		(cd gar/bage && git diff --quiet origin/master master)
+		(cd gar/bage && git diff --quiet origin/main main)
 	)
 '
 
@@ -244,13 +247,13 @@ test_expect_success 'push succeeds if submodule commit not on remote using on-de
 		cd work &&
 		git add gar/bage &&
 		git commit -m "Recurse on-demand on command-line overriding config for gar/bage" &&
-		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git master &&
+		git -c push.recurseSubmodules=check push --recurse-submodules=on-demand ../pub.git main &&
 		# Check that the supermodule commit got there
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
+		git diff --quiet FETCH_HEAD main &&
 		# Check that the submodule commit got there
 		cd gar/bage &&
-		git diff --quiet origin/master master
+		git diff --quiet origin/main main
 	)
 '
 
@@ -265,14 +268,14 @@ test_expect_success 'push succeeds if submodule commit disabling recursion from
 		cd work &&
 		git add gar/bage &&
 		git commit -m "Recurse disable on command-line overriding config for gar/bage" &&
-		git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git master &&
+		git -c push.recurseSubmodules=check push --recurse-submodules=no ../pub.git main &&
 		# Check that the supermodule commit got there
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
+		git diff --quiet FETCH_HEAD main &&
 		# But that the submodule commit did not
-		( cd gar/bage && git diff --quiet origin/master master^ ) &&
+		( cd gar/bage && git diff --quiet origin/main main^ ) &&
 		# Now push it to avoid confusing future tests
-		git push --recurse-submodules=on-demand ../pub.git master
+		git push --recurse-submodules=on-demand ../pub.git main
 	)
 '
 
@@ -287,14 +290,14 @@ test_expect_success 'push succeeds if submodule commit disabling recursion from
 		cd work &&
 		git add gar/bage &&
 		git commit -m "Recurse disable on command-line alternative overriding config for gar/bage" &&
-		git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git master &&
+		git -c push.recurseSubmodules=check push --no-recurse-submodules ../pub.git main &&
 		# Check that the supermodule commit got there
 		git fetch ../pub.git &&
-		git diff --quiet FETCH_HEAD master &&
+		git diff --quiet FETCH_HEAD main &&
 		# But that the submodule commit did not
-		( cd gar/bage && git diff --quiet origin/master master^ ) &&
+		( cd gar/bage && git diff --quiet origin/main main^ ) &&
 		# Now push it to avoid confusing future tests
-		git push --recurse-submodules=on-demand ../pub.git master
+		git push --recurse-submodules=on-demand ../pub.git main
 	)
 '
 
@@ -304,7 +307,7 @@ test_expect_success 'submodule entry pointing at a tag is error' '
 	git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&
 	git -C work commit -m "bad commit" &&
 	test_when_finished "git -C work reset --hard HEAD^" &&
-	test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git master 2>err &&
+	test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git main 2>err &&
 	test_i18ngrep "is a tag, not a commit" err
 '
 
@@ -319,9 +322,9 @@ test_expect_success 'push fails if recurse submodules option passed as yes' '
 		cd work &&
 		git add gar/bage &&
 		git commit -m "Recurse push fails if recurse submodules option passed as yes for gar/bage" &&
-		test_must_fail git push --recurse-submodules=yes ../pub.git master &&
-		test_must_fail git -c push.recurseSubmodules=yes push ../pub.git master &&
-		git push --recurse-submodules=on-demand ../pub.git master
+		test_must_fail git push --recurse-submodules=yes ../pub.git main &&
+		test_must_fail git -c push.recurseSubmodules=yes push ../pub.git main &&
+		git push --recurse-submodules=on-demand ../pub.git main
 	)
 '
 
@@ -363,7 +366,7 @@ test_expect_success 'push succeeds if submodule has no remote and is on the firs
 		) &&
 		git add b &&
 		git commit -m "added submodule" &&
-		git push --recurse-submodules=check origin master
+		git push --recurse-submodules=check origin main
 	)
 '
 
@@ -372,21 +375,21 @@ test_expect_success 'push unpushed submodules when not needed' '
 		cd work &&
 		(
 			cd gar/bage &&
-			git checkout master &&
+			git checkout main &&
 			>junk5 &&
 			git add junk5 &&
 			git commit -m "Fifth junk" &&
 			git push &&
-			git rev-parse origin/master >../../../expected
+			git rev-parse origin/main >../../../expected
 		) &&
-		git checkout master &&
+		git checkout main &&
 		git add gar/bage &&
 		git commit -m "Fifth commit for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git master
+		git push --recurse-submodules=on-demand ../pub.git main
 	) &&
 	(
 		cd submodule.git &&
-		git rev-parse master >../actual
+		git rev-parse main >../actual
 	) &&
 	test_cmp expected actual
 '
@@ -394,7 +397,7 @@ test_expect_success 'push unpushed submodules when not needed' '
 test_expect_success 'push unpushed submodules when not needed 2' '
 	(
 		cd submodule.git &&
-		git rev-parse master >../expected
+		git rev-parse main >../expected
 	) &&
 	(
 		cd work &&
@@ -407,11 +410,11 @@ test_expect_success 'push unpushed submodules when not needed 2' '
 		>junk2 &&
 		git add junk2 &&
 		git commit -m "Second junk for work" &&
-		git push --recurse-submodules=on-demand ../pub.git master
+		git push --recurse-submodules=on-demand ../pub.git main
 	) &&
 	(
 		cd submodule.git &&
-		git rev-parse master >../actual
+		git rev-parse main >../actual
 	) &&
 	test_cmp expected actual
 '
@@ -421,20 +424,20 @@ test_expect_success 'push unpushed submodules recursively' '
 		cd work &&
 		(
 			cd gar/bage &&
-			git checkout master &&
+			git checkout main &&
 			> junk7 &&
 			git add junk7 &&
 			git commit -m "Seventh junk" &&
-			git rev-parse master >../../../expected
+			git rev-parse main >../../../expected
 		) &&
-		git checkout master &&
+		git checkout main &&
 		git add gar/bage &&
 		git commit -m "Seventh commit for gar/bage" &&
-		git push --recurse-submodules=on-demand ../pub.git master
+		git push --recurse-submodules=on-demand ../pub.git main
 	) &&
 	(
 		cd submodule.git &&
-		git rev-parse master >../actual
+		git rev-parse main >../actual
 	) &&
 	test_cmp expected actual
 '
@@ -444,64 +447,64 @@ test_expect_success 'push unpushable submodule recursively fails' '
 		cd work &&
 		(
 			cd gar/bage &&
-			git rev-parse origin/master >../../../expected &&
-			git checkout master~0 &&
+			git rev-parse origin/main >../../../expected &&
+			git checkout main~0 &&
 			> junk8 &&
 			git add junk8 &&
 			git commit -m "Eighth junk"
 		) &&
 		git add gar/bage &&
 		git commit -m "Eighth commit for gar/bage" &&
-		test_must_fail git push --recurse-submodules=on-demand ../pub.git master
+		test_must_fail git push --recurse-submodules=on-demand ../pub.git main
 	) &&
 	(
 		cd submodule.git &&
-		git rev-parse master >../actual
+		git rev-parse main >../actual
 	) &&
-	test_when_finished git -C work reset --hard master^ &&
+	test_when_finished git -C work reset --hard main^ &&
 	test_cmp expected actual
 '
 
 test_expect_success 'push --dry-run does not recursively update submodules' '
 	(
 		cd work/gar/bage &&
-		git checkout master &&
-		git rev-parse master >../../../expected_submodule &&
+		git checkout main &&
+		git rev-parse main >../../../expected_submodule &&
 		> junk9 &&
 		git add junk9 &&
 		git commit -m "Ninth junk" &&
 
 		# Go up to 'work' directory
 		cd ../.. &&
-		git checkout master &&
-		git rev-parse master >../expected_pub &&
+		git checkout main &&
+		git rev-parse main >../expected_pub &&
 		git add gar/bage &&
 		git commit -m "Ninth commit for gar/bage" &&
-		git push --dry-run --recurse-submodules=on-demand ../pub.git master
+		git push --dry-run --recurse-submodules=on-demand ../pub.git main
 	) &&
-	git -C submodule.git rev-parse master >actual_submodule &&
-	git -C pub.git rev-parse master >actual_pub &&
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
 	test_cmp expected_pub actual_pub &&
 	test_cmp expected_submodule actual_submodule
 '
 
 test_expect_success 'push --dry-run does not recursively update submodules' '
-	git -C work push --dry-run --recurse-submodules=only ../pub.git master &&
+	git -C work push --dry-run --recurse-submodules=only ../pub.git main &&
 
-	git -C submodule.git rev-parse master >actual_submodule &&
-	git -C pub.git rev-parse master >actual_pub &&
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
 	test_cmp expected_pub actual_pub &&
 	test_cmp expected_submodule actual_submodule
 '
 
 test_expect_success 'push only unpushed submodules recursively' '
-	git -C work/gar/bage rev-parse master >expected_submodule &&
-	git -C pub.git rev-parse master >expected_pub &&
+	git -C work/gar/bage rev-parse main >expected_submodule &&
+	git -C pub.git rev-parse main >expected_pub &&
 
-	git -C work push --recurse-submodules=only ../pub.git master &&
+	git -C work push --recurse-submodules=only ../pub.git main &&
 
-	git -C submodule.git rev-parse master >actual_submodule &&
-	git -C pub.git rev-parse master >actual_pub &&
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
 	test_cmp expected_submodule actual_submodule &&
 	test_cmp expected_pub actual_pub
 '
@@ -517,14 +520,14 @@ test_expect_success 'push propagating the remotes name to a submodule' '
 	git -C work commit -m "Tenth junk added to gar/bage" &&
 
 	# Fails when submodule does not have a matching remote
-	test_must_fail git -C work push --recurse-submodules=on-demand pub master &&
+	test_must_fail git -C work push --recurse-submodules=on-demand pub main &&
 	# Succeeds when submodules has matching remote and refspec
-	git -C work push --recurse-submodules=on-demand origin master &&
+	git -C work push --recurse-submodules=on-demand origin main &&
 
-	git -C submodule.git rev-parse master >actual_submodule &&
-	git -C pub.git rev-parse master >actual_pub &&
-	git -C work/gar/bage rev-parse master >expected_submodule &&
-	git -C work rev-parse master >expected_pub &&
+	git -C submodule.git rev-parse main >actual_submodule &&
+	git -C pub.git rev-parse main >actual_pub &&
+	git -C work/gar/bage rev-parse main >expected_submodule &&
+	git -C work rev-parse main >expected_pub &&
 	test_cmp expected_submodule actual_submodule &&
 	test_cmp expected_pub actual_pub
 '
@@ -548,7 +551,7 @@ test_expect_success 'push propagating refspec to a submodule' '
 	test_must_fail git -C work push --recurse-submodules=on-demand origin \
 		HEAD:refs/heads/branch2 &&
 
-	git -C work/gar/bage branch branch2 master &&
+	git -C work/gar/bage branch branch2 main &&
 	git -C work push --recurse-submodules=on-demand origin branch2 &&
 
 	git -C submodule.git rev-parse branch2 >actual_submodule &&
diff --git a/t/t5533-push-cas.sh b/t/t5533-push-cas.sh
index 0b0eb1d025..cba26a872d 100755
--- a/t/t5533-push-cas.sh
+++ b/t/t5533-push-cas.sh
@@ -2,6 +2,9 @@
 
 test_description='compare & swap push force/delete safety'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 setup_srcdst_basic () {
@@ -13,6 +16,46 @@ setup_srcdst_basic () {
 	)
 }
 
+# For tests with "--force-if-includes".
+setup_src_dup_dst () {
+	rm -fr src dup dst &&
+	git init --bare dst &&
+	git clone --no-local dst src &&
+	git clone --no-local dst dup
+	(
+		cd src &&
+		test_commit A &&
+		test_commit B &&
+		test_commit C &&
+		git push origin
+	) &&
+	(
+		cd dup &&
+		git fetch &&
+		git merge origin/main &&
+		git switch -c branch main~2 &&
+		test_commit D &&
+		test_commit E &&
+		git push origin --all
+	) &&
+	(
+		cd src &&
+		git switch main &&
+		git fetch --all &&
+		git branch branch --track origin/branch &&
+		git rebase origin/main
+	) &&
+	(
+		cd dup &&
+		git switch main &&
+		test_commit F &&
+		test_commit G &&
+		git switch branch &&
+		test_commit H &&
+		git push origin --all
+	)
+}
+
 test_expect_success setup '
 	# create template repository
 	test_commit A &&
@@ -25,11 +68,11 @@ test_expect_success 'push to update (protected)' '
 	(
 		cd dst &&
 		test_commit D &&
-		test_must_fail git push --force-with-lease=master:master origin master 2>err &&
+		test_must_fail git push --force-with-lease=main:main origin main 2>err &&
 		grep "stale info" err
 	) &&
-	git ls-remote . refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
+	git ls-remote . refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
@@ -38,11 +81,11 @@ test_expect_success 'push to update (protected, forced)' '
 	(
 		cd dst &&
 		test_commit D &&
-		git push --force --force-with-lease=master:master origin master 2>err &&
+		git push --force --force-with-lease=main:main origin main 2>err &&
 		grep "forced update" err
 	) &&
-	git ls-remote dst refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
@@ -50,20 +93,20 @@ test_expect_success 'push to update (protected, tracking)' '
 	setup_srcdst_basic &&
 	(
 		cd src &&
-		git checkout master &&
+		git checkout main &&
 		test_commit D &&
 		git checkout HEAD^0
 	) &&
-	git ls-remote src refs/heads/master >expect &&
+	git ls-remote src refs/heads/main >expect &&
 	(
 		cd dst &&
 		test_commit E &&
-		git ls-remote . refs/remotes/origin/master >expect &&
-		test_must_fail git push --force-with-lease=master origin master &&
-		git ls-remote . refs/remotes/origin/master >actual &&
+		git ls-remote . refs/remotes/origin/main >expect &&
+		test_must_fail git push --force-with-lease=main origin main &&
+		git ls-remote . refs/remotes/origin/main >actual &&
 		test_cmp expect actual
 	) &&
-	git ls-remote src refs/heads/master >actual &&
+	git ls-remote src refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
@@ -71,18 +114,18 @@ test_expect_success 'push to update (protected, tracking, forced)' '
 	setup_srcdst_basic &&
 	(
 		cd src &&
-		git checkout master &&
+		git checkout main &&
 		test_commit D &&
 		git checkout HEAD^0
 	) &&
 	(
 		cd dst &&
 		test_commit E &&
-		git ls-remote . refs/remotes/origin/master >expect &&
-		git push --force --force-with-lease=master origin master
+		git ls-remote . refs/remotes/origin/main >expect &&
+		git push --force --force-with-lease=main origin main
 	) &&
-	git ls-remote dst refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
@@ -91,10 +134,10 @@ test_expect_success 'push to update (allowed)' '
 	(
 		cd dst &&
 		test_commit D &&
-		git push --force-with-lease=master:master^ origin master
+		git push --force-with-lease=main:main^ origin main
 	) &&
-	git ls-remote dst refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
@@ -103,11 +146,11 @@ test_expect_success 'push to update (allowed, tracking)' '
 	(
 		cd dst &&
 		test_commit D &&
-		git push --force-with-lease=master origin master 2>err &&
+		git push --force-with-lease=main origin main 2>err &&
 		! grep "forced update" err
 	) &&
-	git ls-remote dst refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
@@ -117,22 +160,22 @@ test_expect_success 'push to update (allowed even though no-ff)' '
 		cd dst &&
 		git reset --hard HEAD^ &&
 		test_commit D &&
-		git push --force-with-lease=master origin master 2>err &&
+		git push --force-with-lease=main origin main 2>err &&
 		grep "forced update" err
 	) &&
-	git ls-remote dst refs/heads/master >expect &&
-	git ls-remote src refs/heads/master >actual &&
+	git ls-remote dst refs/heads/main >expect &&
+	git ls-remote src refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'push to delete (protected)' '
 	setup_srcdst_basic &&
-	git ls-remote src refs/heads/master >expect &&
+	git ls-remote src refs/heads/main >expect &&
 	(
 		cd dst &&
-		test_must_fail git push --force-with-lease=master:master^ origin :master
+		test_must_fail git push --force-with-lease=main:main^ origin :main
 	) &&
-	git ls-remote src refs/heads/master >actual &&
+	git ls-remote src refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
@@ -140,9 +183,9 @@ test_expect_success 'push to delete (protected, forced)' '
 	setup_srcdst_basic &&
 	(
 		cd dst &&
-		git push --force --force-with-lease=master:master^ origin :master
+		git push --force --force-with-lease=main:main^ origin :main
 	) &&
-	git ls-remote src refs/heads/master >actual &&
+	git ls-remote src refs/heads/main >actual &&
 	test_must_be_empty actual
 '
 
@@ -150,10 +193,10 @@ test_expect_success 'push to delete (allowed)' '
 	setup_srcdst_basic &&
 	(
 		cd dst &&
-		git push --force-with-lease=master origin :master 2>err &&
+		git push --force-with-lease=main origin :main 2>err &&
 		grep deleted err
 	) &&
-	git ls-remote src refs/heads/master >actual &&
+	git ls-remote src refs/heads/main >actual &&
 	test_must_be_empty actual
 '
 
@@ -161,12 +204,12 @@ test_expect_success 'cover everything with default force-with-lease (protected)'
 	setup_srcdst_basic &&
 	(
 		cd src &&
-		git branch naster master^
+		git branch nain main^
 	) &&
 	git ls-remote src refs/heads/\* >expect &&
 	(
 		cd dst &&
-		test_must_fail git push --force-with-lease origin master master:naster
+		test_must_fail git push --force-with-lease origin main main:nain
 	) &&
 	git ls-remote src refs/heads/\* >actual &&
 	test_cmp expect actual
@@ -176,16 +219,16 @@ test_expect_success 'cover everything with default force-with-lease (allowed)' '
 	setup_srcdst_basic &&
 	(
 		cd src &&
-		git branch naster master^
+		git branch nain main^
 	) &&
 	(
 		cd dst &&
 		git fetch &&
-		git push --force-with-lease origin master master:naster
+		git push --force-with-lease origin main main:nain
 	) &&
-	git ls-remote dst refs/heads/master |
-	sed -e "s/master/naster/" >expect &&
-	git ls-remote src refs/heads/naster >actual &&
+	git ls-remote dst refs/heads/main |
+	sed -e "s/main/nain/" >expect &&
+	git ls-remote src refs/heads/nain >actual &&
 	test_cmp expect actual
 '
 
@@ -193,7 +236,7 @@ test_expect_success 'new branch covered by force-with-lease' '
 	setup_srcdst_basic &&
 	(
 		cd dst &&
-		git branch branch master &&
+		git branch branch main &&
 		git push --force-with-lease=branch origin branch
 	) &&
 	git ls-remote dst refs/heads/branch >expect &&
@@ -205,7 +248,7 @@ test_expect_success 'new branch covered by force-with-lease (explicit)' '
 	setup_srcdst_basic &&
 	(
 		cd dst &&
-		git branch branch master &&
+		git branch branch main &&
 		git push --force-with-lease=branch: origin branch
 	) &&
 	git ls-remote dst refs/heads/branch >expect &&
@@ -217,12 +260,12 @@ test_expect_success 'new branch already exists' '
 	setup_srcdst_basic &&
 	(
 		cd src &&
-		git checkout -b branch master &&
+		git checkout -b branch main &&
 		test_commit F
 	) &&
 	(
 		cd dst &&
-		git branch branch master &&
+		git branch branch main &&
 		test_must_fail git push --force-with-lease=branch: origin branch
 	)
 '
@@ -237,7 +280,7 @@ test_expect_success 'background updates of REMOTE can be mitigated with a non-up
 		cd dst &&
 		test_commit G &&
 		git remote add origin-push ../src.bare &&
-		git push origin-push master:master
+		git push origin-push main:main
 	) &&
 	git clone --no-local src.bare dst2 &&
 	test_when_finished "rm -rf dst2" &&
@@ -256,4 +299,101 @@ test_expect_success 'background updates of REMOTE can be mitigated with a non-up
 	)
 '
 
+test_expect_success 'background updates to remote can be mitigated with "--force-if-includes"' '
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	git ls-remote dst refs/heads/main >expect.main &&
+	git ls-remote dst refs/heads/branch >expect.branch &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git fetch --all &&
+		test_must_fail git push --force-with-lease --force-if-includes --all
+	) &&
+	git ls-remote dst refs/heads/main >actual.main &&
+	git ls-remote dst refs/heads/branch >actual.branch &&
+	test_cmp expect.main actual.main &&
+	test_cmp expect.branch actual.branch
+'
+
+test_expect_success 'background updates to remote can be mitigated with "push.useForceIfIncludes"' '
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	git ls-remote dst refs/heads/main >expect.main &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git fetch --all &&
+		git config --local push.useForceIfIncludes true &&
+		test_must_fail git push --force-with-lease=main origin main
+	) &&
+	git ls-remote dst refs/heads/main >actual.main &&
+	test_cmp expect.main actual.main
+'
+
+test_expect_success '"--force-if-includes" should be disabled for --force-with-lease="<refname>:<expect>"' '
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	git ls-remote dst refs/heads/main >expect.main &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		remote_head="$(git rev-parse refs/remotes/origin/main)" &&
+		git fetch --all &&
+		test_must_fail git push --force-if-includes --force-with-lease="main:$remote_head" 2>err &&
+		grep "stale info" err
+	) &&
+	git ls-remote dst refs/heads/main >actual.main &&
+	test_cmp expect.main actual.main
+'
+
+test_expect_success '"--force-if-includes" should allow forced update after a rebase ("pull --rebase")' '
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git pull --rebase origin main &&
+		git push --force-if-includes --force-with-lease="main"
+	)
+'
+
+test_expect_success '"--force-if-includes" should allow forced update after a rebase ("pull --rebase", local rebase)' '
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	(
+		cd src &&
+		git switch branch &&
+		test_commit I &&
+		git switch main &&
+		test_commit J &&
+		git pull --rebase origin main &&
+		git rebase --onto HEAD~4 HEAD~1 &&
+		git push --force-if-includes --force-with-lease="main"
+	)
+'
+
+test_expect_success '"--force-if-includes" should allow deletes' '
+	setup_src_dup_dst &&
+	test_when_finished "rm -fr dst src dup" &&
+	(
+		cd src &&
+		git switch branch &&
+		git pull --rebase origin branch &&
+		git push --force-if-includes --force-with-lease="branch" origin :branch
+	)
+'
+
 test_done
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 030331f1c5..bba768f5de 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -2,6 +2,9 @@
 
 test_description='signed push'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 
@@ -9,11 +12,11 @@ prepare_dst () {
 	rm -fr dst &&
 	test_create_repo dst &&
 
-	git push dst master:noop master:ff master:noff
+	git push dst main:noop main:ff main:noff
 }
 
 test_expect_success setup '
-	# master, ff and noff branches pointing at the same commit
+	# main, ff and noff branches pointing at the same commit
 	test_tick &&
 	git commit --allow-empty -m initial &&
 
@@ -273,4 +276,26 @@ test_expect_success GPGSM 'fail without key and heed user.signingkey x509' '
 	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 &&
+	write_script gpg <<-EOF &&
+	# should check atomic push locally before running GPG.
+	exit 1
+	EOF
+	test_must_fail env PATH="$TRASH_DIRECTORY:$PATH" git push \
+			--signed --atomic --porcelain \
+			dst noop ff noff >out 2>err &&
+
+	test_i18ngrep ! "gpg failed to sign" err &&
+	cat >expect <<-EOF &&
+	To dst
+	=	refs/heads/noop:refs/heads/noop	[up to date]
+	!	refs/heads/ff:refs/heads/ff	[rejected] (atomic push failed)
+	!	refs/heads/noff:refs/heads/noff	[rejected] (non-fast-forward)
+	Done
+	EOF
+	test_cmp expect out
+'
+
 test_done
diff --git a/t/t5535-fetch-push-symref.sh b/t/t5535-fetch-push-symref.sh
index 8ed58d27f2..e8f6d233ff 100755
--- a/t/t5535-fetch-push-symref.sh
+++ b/t/t5535-fetch-push-symref.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='avoiding conflicting update thru symref aliasing'
+test_description='avoiding conflicting update through symref aliasing'
 
 . ./test-lib.sh
 
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 97a67728ca..11d5ea54a9 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -2,6 +2,9 @@
 
 test_description='fetch/clone from a shallow clone'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 commit() {
@@ -15,16 +18,17 @@ test_expect_success 'setup' '
 	commit 2 &&
 	commit 3 &&
 	commit 4 &&
-	git config --global transfer.fsckObjects true
+	git config --global transfer.fsckObjects true &&
+	test_oid_cache <<-\EOF
+	perl sha1:s/0034shallow %s/0036unshallow %s/
+	perl sha256:s/004cshallow %s/004eunshallow %s/
+	EOF
 '
 
 test_expect_success 'setup shallow clone' '
 	git clone --no-local --depth=2 .git shallow &&
 	git --git-dir=shallow/.git log --format=%s >actual &&
-	cat <<EOF >expect &&
-4
-3
-EOF
+	test_write_lines 4 3 >expect &&
 	test_cmp expect actual
 '
 
@@ -34,10 +38,7 @@ test_expect_success 'clone from shallow clone' '
 	cd shallow2 &&
 	git fsck &&
 	git log --format=%s >actual &&
-	cat <<EOF >expect &&
-4
-3
-EOF
+	test_write_lines 4 3 >expect &&
 	test_cmp expect actual
 	)
 '
@@ -51,12 +52,8 @@ test_expect_success 'fetch from shallow clone' '
 	cd shallow2 &&
 	git fetch &&
 	git fsck &&
-	git log --format=%s origin/master >actual &&
-	cat <<EOF >expect &&
-5
-4
-3
-EOF
+	git log --format=%s origin/main >actual &&
+	test_write_lines 5 4 3 >expect &&
 	test_cmp expect actual
 	)
 '
@@ -70,11 +67,8 @@ test_expect_success 'fetch --depth from shallow clone' '
 	cd shallow2 &&
 	git fetch --depth=2 &&
 	git fsck &&
-	git log --format=%s origin/master >actual &&
-	cat <<EOF >expect &&
-6
-5
-EOF
+	git log --format=%s origin/main >actual &&
+	test_write_lines 6 5 >expect &&
 	test_cmp expect actual
 	)
 '
@@ -84,13 +78,22 @@ test_expect_success 'fetch --unshallow from shallow clone' '
 	cd shallow2 &&
 	git fetch --unshallow &&
 	git fsck &&
-	git log --format=%s origin/master >actual &&
-	cat <<EOF >expect &&
-6
-5
-4
-3
-EOF
+	git log --format=%s origin/main >actual &&
+	test_write_lines 6 5 4 3 >expect &&
+	test_cmp expect actual
+	)
+'
+
+test_expect_success 'fetch --unshallow from a full clone' '
+	git clone --no-local --depth=2 .git shallow3 &&
+	(
+	cd shallow3 &&
+	git log --format=%s >actual &&
+	test_write_lines 4 3 >expect &&
+	test_cmp expect actual &&
+	git -c fetch.writeCommitGraph fetch --unshallow &&
+	git log origin/main --format=%s >actual &&
+	test_write_lines 4 3 2 1 >expect &&
 	test_cmp expect actual
 	)
 '
@@ -104,18 +107,13 @@ test_expect_success 'fetch something upstream has but hidden by clients shallow
 	git commit -m add-1-back &&
 	(
 	cd shallow2 &&
-	git fetch ../.git +refs/heads/master:refs/remotes/top/master &&
+	git fetch ../.git +refs/heads/main:refs/remotes/top/main &&
 	git fsck &&
-	git log --format=%s top/master >actual &&
-	cat <<EOF >expect &&
-add-1-back
-4
-3
-EOF
+	git log --format=%s top/main >actual &&
+	test_write_lines add-1-back 4 3 >expect &&
 	test_cmp expect actual
 	) &&
 	git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) >/dev/null
-
 '
 
 test_expect_success 'fetch that requires changes in .git/shallow is filtered' '
@@ -127,16 +125,12 @@ test_expect_success 'fetch that requires changes in .git/shallow is filtered' '
 	git init notshallow &&
 	(
 	cd notshallow &&
-	git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/*&&
+	git fetch ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
 	git for-each-ref --format="%(refname)" >actual.refs &&
-	cat <<EOF >expect.refs &&
-refs/remotes/shallow/no-shallow
-EOF
+	echo refs/remotes/shallow/no-shallow >expect.refs &&
 	test_cmp expect.refs actual.refs &&
 	git log --format=%s shallow/no-shallow >actual &&
-	cat <<EOF >expect &&
-no-shallow
-EOF
+	echo no-shallow >expect &&
 	test_cmp expect actual
 	)
 '
@@ -144,7 +138,7 @@ EOF
 test_expect_success 'fetch --update-shallow' '
 	(
 	cd shallow &&
-	git checkout master &&
+	git checkout main &&
 	commit 7 &&
 	git tag -m foo heavy-tag HEAD^ &&
 	git tag light-tag HEAD^:tracked
@@ -154,21 +148,44 @@ test_expect_success 'fetch --update-shallow' '
 	git fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
 	git fsck &&
 	git for-each-ref --sort=refname --format="%(refname)" >actual.refs &&
-	cat <<EOF >expect.refs &&
-refs/remotes/shallow/master
-refs/remotes/shallow/no-shallow
-refs/tags/heavy-tag
-refs/tags/light-tag
-EOF
+	cat <<-\EOF >expect.refs &&
+	refs/remotes/shallow/main
+	refs/remotes/shallow/no-shallow
+	refs/tags/heavy-tag
+	refs/tags/light-tag
+	EOF
+	test_cmp expect.refs actual.refs &&
+	git log --format=%s shallow/main >actual &&
+	test_write_lines 7 6 5 4 3 >expect &&
+	test_cmp expect actual
+	)
+'
+
+test_expect_success 'fetch --update-shallow (with fetch.writeCommitGraph)' '
+	(
+	cd shallow &&
+	git checkout main &&
+	commit 8 &&
+	git tag -m foo heavy-tag-for-graph HEAD^ &&
+	git tag light-tag-for-graph HEAD^:tracked
+	) &&
+	test_config -C notshallow fetch.writeCommitGraph true &&
+	(
+	cd notshallow &&
+	git fetch --update-shallow ../shallow/.git refs/heads/*:refs/remotes/shallow/* &&
+	git fsck &&
+	git for-each-ref --sort=refname --format="%(refname)" >actual.refs &&
+	cat <<-EOF >expect.refs &&
+	refs/remotes/shallow/main
+	refs/remotes/shallow/no-shallow
+	refs/tags/heavy-tag
+	refs/tags/heavy-tag-for-graph
+	refs/tags/light-tag
+	refs/tags/light-tag-for-graph
+	EOF
 	test_cmp expect.refs actual.refs &&
-	git log --format=%s shallow/master >actual &&
-	cat <<EOF >expect &&
-7
-6
-5
-4
-3
-EOF
+	git log --format=%s shallow/main >actual &&
+	test_write_lines 8 7 6 5 4 3 >expect &&
 	test_cmp expect actual
 	)
 '
@@ -179,10 +196,7 @@ test_expect_success POSIXPERM,SANITY 'shallow fetch from a read-only repo' '
 	find read-only.git -print | xargs chmod -w &&
 	git clone --no-local --depth=2 read-only.git from-read-only &&
 	git --git-dir=from-read-only/.git log --format=%s >actual &&
-	cat >expect <<EOF &&
-add-1-back
-4
-EOF
+	test_write_lines add-1-back 4 >expect &&
 	test_cmp expect actual
 '
 
@@ -195,7 +209,7 @@ test_expect_success '.git/shallow is edited by repack' '
 	test_commit -C shallow-server E &&
 	test_commit -C shallow-server D &&
 	d="$(git -C shallow-server rev-parse --verify D^0)" &&
-	git -C shallow-server checkout master &&
+	git -C shallow-server checkout main &&
 
 	git clone --depth=1 --no-tags --no-single-branch \
 		"file://$PWD/shallow-server" shallow-client &&
@@ -233,22 +247,22 @@ test_expect_success 'shallow fetches check connectivity before writing shallow f
 	git -C "$REPO" config protocol.version 2 &&
 	git -C client config protocol.version 2 &&
 
-	git -C client fetch --depth=2 "$HTTPD_URL/one_time_sed/repo" master:a_branch &&
+	git -C client fetch --depth=2 "$HTTPD_URL/one_time_perl/repo" main:a_branch &&
 
 	# Craft a situation in which the server sends back an unshallow request
 	# with an empty packfile. This is done by refetching with a shorter
 	# depth (to ensure that the packfile is empty), and overwriting the
 	# shallow line in the response with the unshallow line we want.
-	printf "s/0034shallow %s/0036unshallow %s/" \
+	printf "$(test_oid perl)" \
 	       "$(git -C "$REPO" rev-parse HEAD)" \
 	       "$(git -C "$REPO" rev-parse HEAD^)" \
-	       >"$HTTPD_ROOT_PATH/one-time-sed" &&
+	       >"$HTTPD_ROOT_PATH/one-time-perl" &&
 	test_must_fail env GIT_TEST_SIDEBAND_ALL=0 git -C client \
-		fetch --depth=1 "$HTTPD_URL/one_time_sed/repo" \
-		master:a_branch &&
+		fetch --depth=1 "$HTTPD_URL/one_time_perl/repo" \
+		main:a_branch &&
 
-	# Ensure that the one-time-sed script was used.
-	! test -e "$HTTPD_ROOT_PATH/one-time-sed" &&
+	# Ensure that the one-time-perl script was used.
+	! test -e "$HTTPD_ROOT_PATH/one-time-perl" &&
 
 	# Ensure that the resulting repo is consistent, despite our failure to
 	# fetch.
diff --git a/t/t5538-push-shallow.sh b/t/t5538-push-shallow.sh
index ecbf84d21c..e91fcc173e 100755
--- a/t/t5538-push-shallow.sh
+++ b/t/t5538-push-shallow.sh
@@ -2,6 +2,9 @@
 
 test_description='push from/to a shallow clone'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 commit() {
@@ -44,9 +47,9 @@ test_expect_success 'push from shallow clone' '
 	(
 	cd shallow &&
 	commit 5 &&
-	git push ../.git +master:refs/remotes/shallow/master
+	git push ../.git +main:refs/remotes/shallow/main
 	) &&
-	git log --format=%s shallow/master >actual &&
+	git log --format=%s shallow/main >actual &&
 	git fsck &&
 	cat <<EOF >expect &&
 5
@@ -61,10 +64,10 @@ EOF
 test_expect_success 'push from shallow clone, with grafted roots' '
 	(
 	cd shallow2 &&
-	test_must_fail git push ../.git +master:refs/remotes/shallow2/master 2>err &&
-	grep "shallow2/master.*shallow update not allowed" err
+	test_must_fail git push ../.git +main:refs/remotes/shallow2/main 2>err &&
+	grep "shallow2/main.*shallow update not allowed" err
 	) &&
-	test_must_fail git rev-parse shallow2/master &&
+	test_must_fail git rev-parse shallow2/main &&
 	git fsck
 '
 
@@ -72,9 +75,9 @@ test_expect_success 'add new shallow root with receive.updateshallow on' '
 	test_config receive.shallowupdate true &&
 	(
 	cd shallow2 &&
-	git push ../.git +master:refs/remotes/shallow2/master
+	git push ../.git +main:refs/remotes/shallow2/main
 	) &&
-	git log --format=%s shallow2/master >actual &&
+	git log --format=%s shallow2/main >actual &&
 	git fsck &&
 	cat <<EOF >expect &&
 c
@@ -87,12 +90,12 @@ test_expect_success 'push from shallow to shallow' '
 	(
 	cd shallow &&
 	git --git-dir=../shallow2/.git config receive.shallowupdate true &&
-	git push ../shallow2/.git +master:refs/remotes/shallow/master &&
+	git push ../shallow2/.git +main:refs/remotes/shallow/main &&
 	git --git-dir=../shallow2/.git config receive.shallowupdate false
 	) &&
 	(
 	cd shallow2 &&
-	git log --format=%s shallow/master >actual &&
+	git log --format=%s shallow/main >actual &&
 	git fsck &&
 	cat <<EOF >expect &&
 5
@@ -106,10 +109,10 @@ EOF
 test_expect_success 'push from full to shallow' '
 	! git --git-dir=shallow2/.git cat-file blob $(echo 1|git hash-object --stdin) &&
 	commit 1 &&
-	git push shallow2/.git +master:refs/remotes/top/master &&
+	git push shallow2/.git +main:refs/remotes/top/main &&
 	(
 	cd shallow2 &&
-	git log --format=%s top/master >actual &&
+	git log --format=%s top/main >actual &&
 	git fsck &&
 	cat <<EOF >expect &&
 1
diff --git a/t/t5539-fetch-http-shallow.sh b/t/t5539-fetch-http-shallow.sh
index b4ad81f006..3ea75d34ca 100755
--- a/t/t5539-fetch-http-shallow.sh
+++ b/t/t5539-fetch-http-shallow.sh
@@ -2,6 +2,9 @@
 
 test_description='fetch/clone from a shallow clone over http'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
@@ -9,10 +12,12 @@ start_httpd
 commit() {
 	echo "$1" >tracked &&
 	git add tracked &&
+	test_tick &&
 	git commit -m "$1"
 }
 
 test_expect_success 'setup shallow clone' '
+	test_tick=1500000000 &&
 	commit 1 &&
 	commit 2 &&
 	commit 3 &&
@@ -30,7 +35,7 @@ test_expect_success 'clone http repository' '
 	(
 	cd clone &&
 	git fsck &&
-	git log --format=%s origin/master >actual &&
+	git log --format=%s origin/main >actual &&
 	cat <<EOF >expect &&
 7
 6
@@ -48,7 +53,6 @@ EOF
 test_expect_success 'no shallow lines after receiving ACK ready' '
 	(
 		cd shallow &&
-		test_tick &&
 		for i in $(test_seq 15)
 		do
 			git checkout --orphan unrelated$i &&
@@ -59,17 +63,18 @@ test_expect_success 'no shallow lines after receiving ACK ready' '
 				refs/heads/unrelated$i:refs/heads/unrelated$i ||
 			exit 1
 		done &&
-		git checkout master &&
+		git checkout main &&
 		test_commit new &&
-		git push  "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" master
+		git push  "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" main
 	) &&
 	(
 		cd clone &&
 		git checkout --orphan newnew &&
+		test_tick=1400000000 &&
 		test_commit new-too &&
 		# NEEDSWORK: If the overspecification of the expected result is reduced, we
 		# might be able to run this test in all protocol versions.
-		GIT_TRACE_PACKET="$TRASH_DIRECTORY/trace" GIT_TEST_PROTOCOL_VERSION= \
+		GIT_TRACE_PACKET="$TRASH_DIRECTORY/trace" GIT_TEST_PROTOCOL_VERSION=0 \
 			git fetch --depth=2 &&
 		grep "fetch-pack< ACK .* ready" ../trace &&
 		! grep "fetch-pack> done" ../trace
@@ -93,7 +98,7 @@ test_expect_success 'clone shallow since ...' '
 
 test_expect_success 'fetch shallow since ...' '
 	git -C shallow11 fetch --shallow-since "200000000 +0700" origin &&
-	git -C shallow11 log --pretty=tformat:%s origin/master >actual &&
+	git -C shallow11 log --pretty=tformat:%s origin/main >actual &&
 	cat >expected <<-\EOF &&
 	three
 	two
@@ -118,7 +123,7 @@ test_expect_success 'shallow clone exclude tag two' '
 
 test_expect_success 'fetch exclude tag one' '
 	git -C shallow12 fetch --shallow-exclude one origin &&
-	git -C shallow12 log --pretty=tformat:%s origin/master >actual &&
+	git -C shallow12 log --pretty=tformat:%s origin/main >actual &&
 	test_write_lines three two >expected &&
 	test_cmp expected actual
 '
@@ -134,12 +139,12 @@ test_expect_success 'fetching deepen' '
 	git clone --depth 1 $HTTPD_URL/smart/shallow-deepen.git deepen &&
 	mv "$HTTPD_DOCUMENT_ROOT_PATH/shallow-deepen.git" .git &&
 	test_commit four &&
-	git -C deepen log --pretty=tformat:%s master >actual &&
+	git -C deepen log --pretty=tformat:%s main >actual &&
 	echo three >expected &&
 	test_cmp expected actual &&
 	mv .git "$HTTPD_DOCUMENT_ROOT_PATH/shallow-deepen.git" &&
 	git -C deepen fetch --deepen=1 &&
-	git -C deepen log --pretty=tformat:%s origin/master >actual &&
+	git -C deepen log --pretty=tformat:%s origin/main >actual &&
 	cat >expected <<-\EOF &&
 	four
 	three
diff --git a/t/t5540-http-push-webdav.sh b/t/t5540-http-push-webdav.sh
index a094fd5e71..8b68bb38a4 100755
--- a/t/t5540-http-push-webdav.sh
+++ b/t/t5540-http-push-webdav.sh
@@ -7,6 +7,9 @@ test_description='test WebDAV http-push
 
 This test runs various sanity checks on http-push.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if git http-push > /dev/null 2>&1 || [ $? -eq 128 ]
@@ -71,7 +74,7 @@ test_expect_success 'push already up-to-date' '
 test_expect_success 'push to remote repository with unpacked refs' '
 	(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
 	 rm packed-refs &&
-	 git update-ref refs/heads/master $ORIG_HEAD &&
+	 git update-ref refs/heads/main $ORIG_HEAD &&
 	 git --bare update-server-info) &&
 	git push &&
 	(cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
@@ -91,7 +94,7 @@ test_expect_success 'http-push fetches unpacked objects' '
 	 git remote rm origin &&
 	 git reflog expire --expire=0 --all &&
 	 git prune &&
-	 git push -f -v $HTTPD_URL/dumb/test_repo_unpacked.git master)
+	 git push -f -v $HTTPD_URL/dumb/test_repo_unpacked.git main)
 '
 
 test_expect_success 'http-push fetches packed objects' '
@@ -111,7 +114,7 @@ test_expect_success 'http-push fetches packed objects' '
 	 git remote remove origin &&
 	 git reflog expire --expire=0 --all &&
 	 git prune &&
-	 git push -f -v $HTTPD_URL/dumb/test_repo_packed.git master)
+	 git push -f -v $HTTPD_URL/dumb/test_repo_packed.git main)
 '
 
 test_expect_success 'create and delete remote branch' '
@@ -126,6 +129,22 @@ test_expect_success 'create and delete remote branch' '
 	test_must_fail git show-ref --verify refs/remotes/origin/dev
 '
 
+test_expect_success 'non-force push fails if not up to date' '
+	git init --bare "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_conflict.git &&
+	git -C "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo_conflict.git update-server-info &&
+	git clone $HTTPD_URL/dumb/test_repo_conflict.git "$ROOT_PATH"/c1 &&
+	git clone $HTTPD_URL/dumb/test_repo_conflict.git "$ROOT_PATH"/c2 &&
+	test_commit -C "$ROOT_PATH/c1" path1 &&
+	git -C "$ROOT_PATH/c1" push origin HEAD &&
+	git -C "$ROOT_PATH/c2" pull &&
+	test_commit -C "$ROOT_PATH/c1" path2 &&
+	git -C "$ROOT_PATH/c1" push origin HEAD &&
+	test_commit -C "$ROOT_PATH/c2" path3 &&
+	git -C "$ROOT_PATH/c1" log --graph --all &&
+	git -C "$ROOT_PATH/c2" log --graph --all &&
+	test_must_fail git -C "$ROOT_PATH/c2" push origin HEAD
+'
+
 test_expect_success 'MKCOL sends directory names with trailing slashes' '
 
 	! grep "\"MKCOL.*[^/] HTTP/[^ ]*\"" < "$HTTPD_ROOT_PATH"/access.log
@@ -134,22 +153,20 @@ test_expect_success 'MKCOL sends directory names with trailing slashes' '
 
 x1="[0-9a-f]"
 x2="$x1$x1"
-x5="$x1$x1$x1$x1$x1"
-x38="$x5$x5$x5$x5$x5$x5$x5$x1$x1$x1"
-x40="$x38$x2"
+xtrunc=$(echo $OID_REGEX | sed -e "s/\[0-9a-f\]\[0-9a-f\]//")
 
 test_expect_success 'PUT and MOVE sends object to URLs with SHA-1 hash suffix' '
 	sed \
 		-e "s/PUT /OP /" \
 		-e "s/MOVE /OP /" \
-	    -e "s|/objects/$x2/${x38}_$x40|WANTED_PATH_REQUEST|" \
+	    -e "s|/objects/$x2/${xtrunc}_$OID_REGEX|WANTED_PATH_REQUEST|" \
 		"$HTTPD_ROOT_PATH"/access.log |
 	grep -e "\"OP .*WANTED_PATH_REQUEST HTTP/[.0-9]*\" 20[0-9] "
 
 '
 
 test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
-	"$ROOT_PATH"/test_repo_clone master
+	"$ROOT_PATH"/test_repo_clone main
 
 test_expect_success 'push to password-protected repository (user in URL)' '
 	test_commit pw-user &&
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index 4c970787b0..c024fa2818 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -4,6 +4,9 @@
 #
 
 test_description='test smart pushing over http via http-backend'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 ROOT_PATH="$PWD"
@@ -49,7 +52,7 @@ test_expect_success 'no empty path components' '
 
 	# NEEDSWORK: If the overspecification of the expected result is reduced, we
 	# might be able to run this test in all protocol versions.
-	if test -z "$GIT_TEST_PROTOCOL_VERSION"
+	if test "$GIT_TEST_PROTOCOL_VERSION" = 0
 	then
 		check_access_log exp
 	fi
@@ -115,7 +118,7 @@ test_expect_success 'rejected update prints status' '
 	git commit -m dev2 &&
 	test_must_fail git push origin dev2 2>act &&
 	sed -e "/^remote: /s/ *$//" <act >cmp &&
-	test_i18ncmp exp cmp
+	test_cmp exp cmp
 '
 rm -f "$HTTPD_DOCUMENT_ROOT_PATH/test_repo.git/hooks/update"
 
@@ -135,30 +138,30 @@ EOF
 test_expect_success 'used receive-pack service' '
 	# NEEDSWORK: If the overspecification of the expected result is reduced, we
 	# might be able to run this test in all protocol versions.
-	if test -z "$GIT_TEST_PROTOCOL_VERSION"
+	if test "$GIT_TEST_PROTOCOL_VERSION" = 0
 	then
 		check_access_log exp
 	fi
 '
 
 test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
-	"$ROOT_PATH"/test_repo_clone master 		success
+	"$ROOT_PATH"/test_repo_clone main 		success
 
 test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
 	# create a dissimilarly-named remote ref so that git is unable to match the
 	# two refs (viz. local, remote) unless an explicit refspec is provided.
-	git push origin master:retsam &&
+	git push origin main:niam &&
 
 	echo "change changed" > path2 &&
 	git commit -a -m path2 --amend &&
 
-	# push master too; this ensures there is at least one '"'push'"' command to
+	# push main too; this ensures there is at least one '"'push'"' command to
 	# the remote helper and triggers interaction with the helper.
-	test_must_fail git push -v origin +master master:retsam >output 2>&1'
+	test_must_fail git push -v origin +main main:niam >output 2>&1'
 
 test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: remote output' '
-	grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *master -> master (forced update)$" output &&
-	grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output
+	grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *main -> main (forced update)$" output &&
+	grep "^ ! \[rejected\] *main -> niam (non-fast-forward)$" output
 '
 
 test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper: our output' '
@@ -167,7 +170,7 @@ test_expect_success 'push fails for non-fast-forward refs unmatched by remote he
 '
 
 test_expect_success 'push (chunked)' '
-	git checkout master &&
+	git checkout main &&
 	test_commit commit path3 &&
 	HEAD=$(git rev-parse --verify HEAD) &&
 	test_config http.postbuffer 4 &&
@@ -177,6 +180,9 @@ test_expect_success 'push (chunked)' '
 	 test $HEAD = $(git rev-parse --verify HEAD))
 '
 
+## References of remote: atomic1(1)            main(2) collateral(2) other(2)
+## References of local :            atomic2(2) main(1) collateral(3) other(2) collateral1(3) atomic(1)
+## Atomic push         :                       main(1) collateral(3)                         atomic(1)
 test_expect_success 'push --atomic also prevents branch creation, reports collateral' '
 	# Setup upstream repo - empty for now
 	d=$HTTPD_DOCUMENT_ROOT_PATH/atomic-branches.git &&
@@ -189,14 +195,15 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat
 	test_commit atomic2 &&
 	git branch collateral &&
 	git branch other &&
-	git push "$up" master collateral other &&
+	git push "$up" atomic1 main collateral other &&
+	git tag -d atomic1 &&
 
 	# collateral is a valid push, but should be failed by atomic push
 	git checkout collateral &&
 	test_commit collateral1 &&
 
-	# Make master incompatible with upstream to provoke atomic
-	git checkout master &&
+	# Make main incompatible with upstream to provoke atomic
+	git checkout main &&
 	git reset --hard HEAD^ &&
 
 	# Add a new branch which should be failed by atomic push. This is a
@@ -204,7 +211,7 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat
 	git branch atomic &&
 
 	# --atomic should cause entire push to be rejected
-	test_must_fail git push --atomic "$up" master atomic collateral 2>output &&
+	test_must_fail git push --atomic "$up" main atomic collateral 2>output &&
 
 	# the new branch should not have been created upstream
 	test_must_fail git -C "$d" show-ref --verify refs/heads/atomic &&
@@ -212,19 +219,23 @@ test_expect_success 'push --atomic also prevents branch creation, reports collat
 	# upstream should still reflect atomic2, the last thing we pushed
 	# successfully
 	git rev-parse atomic2 >expected &&
-	# on master...
-	git -C "$d" rev-parse refs/heads/master >actual &&
+	# on main...
+	git -C "$d" rev-parse refs/heads/main >actual &&
 	test_cmp expected actual &&
 	# ...and collateral.
 	git -C "$d" rev-parse refs/heads/collateral >actual &&
 	test_cmp expected actual &&
 
 	# the failed refs should be indicated to the user
-	grep "^ ! .*rejected.* master -> master" output &&
+	grep "^ ! .*rejected.* main -> main" output &&
 
 	# the collateral failure refs should be indicated to the user
 	grep "^ ! .*rejected.* atomic -> atomic .*atomic push failed" output &&
-	grep "^ ! .*rejected.* collateral -> collateral .*atomic push failed" output
+	grep "^ ! .*rejected.* collateral -> collateral .*atomic push failed" output &&
+
+	# never report what we do not push
+	! grep "^ ! .*rejected.* atomic1 " output &&
+	! grep "^ ! .*rejected.* other " output
 '
 
 test_expect_success 'push --atomic fails on server-side errors' '
@@ -456,11 +467,41 @@ test_expect_success 'push status output scrubs password' '
 	grep "^To $HTTPD_URL/smart/test_repo.git" status
 '
 
+test_expect_success 'clone/fetch scrubs password from reflogs' '
+	cd "$ROOT_PATH" &&
+	git clone "$HTTPD_URL_USER_PASS/smart/test_repo.git" \
+		reflog-test &&
+	cd reflog-test &&
+	test_commit prepare-for-force-fetch &&
+	git switch -c away &&
+	git fetch "$HTTPD_URL_USER_PASS/smart/test_repo.git" \
+		+main:main &&
+	# should have been scrubbed down to vanilla URL
+	git log -g main >reflog &&
+	grep "$HTTPD_URL" reflog &&
+	! grep "$HTTPD_URL_USER_PASS" reflog
+'
+
+test_expect_success 'Non-ASCII branch name can be used with --force-with-lease' '
+	cd "$ROOT_PATH" &&
+	git clone "$HTTPD_URL_USER_PASS/smart/test_repo.git" non-ascii &&
+	cd non-ascii &&
+	git checkout -b rama-de-árbol &&
+	test_commit F &&
+	git push --force-with-lease origin rama-de-árbol &&
+	git ls-remote origin refs/heads/rama-de-árbol >actual &&
+	git ls-remote . refs/heads/rama-de-árbol >expect &&
+	test_cmp expect actual &&
+	git push --delete --force-with-lease origin rama-de-árbol &&
+	git ls-remote origin refs/heads/rama-de-árbol >actual &&
+	test_must_be_empty actual
+'
+
 test_expect_success 'colorize errors/hints' '
 	cd "$ROOT_PATH"/test_repo_clone &&
 	test_must_fail git -c color.transport=always -c color.advice=always \
 		-c color.push=always \
-		push origin origin/master^:master 2>act &&
+		push origin origin/main^:main 2>act &&
 	test_decode_color <act >decoded &&
 	test_i18ngrep "<RED>.*rejected.*<RESET>" decoded &&
 	test_i18ngrep "<RED>error: failed to push some refs" decoded &&
diff --git a/t/t5542-push-http-shallow.sh b/t/t5542-push-http-shallow.sh
index ddc1db722d..c2cc83182f 100755
--- a/t/t5542-push-http-shallow.sh
+++ b/t/t5542-push-http-shallow.sh
@@ -2,6 +2,9 @@
 
 test_description='push from/to a shallow clone over http'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
@@ -51,12 +54,12 @@ test_expect_success 'push to shallow repo via http' '
 	(
 	cd full &&
 	commit 9 &&
-	git push $HTTPD_URL/smart/repo.git +master:refs/remotes/top/master
+	git push $HTTPD_URL/smart/repo.git +main:refs/remotes/top/main
 	) &&
 	(
 	cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
 	git fsck &&
-	git log --format=%s top/master >actual &&
+	git log --format=%s top/main >actual &&
 	cat <<EOF >expect &&
 9
 4
@@ -74,11 +77,11 @@ test_expect_success 'push from shallow repo via http' '
 	git config http.receivepack true
 	) &&
 	commit 10 &&
-	git push $HTTPD_URL/smart/repo.git +master:refs/remotes/top/master &&
+	git push $HTTPD_URL/smart/repo.git +main:refs/remotes/top/main &&
 	(
 	cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
 	git fsck &&
-	git log --format=%s top/master >actual &&
+	git log --format=%s top/main >actual &&
 	cat <<EOF >expect &&
 10
 4
diff --git a/t/t5543-atomic-push.sh b/t/t5543-atomic-push.sh
index 7079bcf9a0..bfee461861 100755
--- a/t/t5543-atomic-push.sh
+++ b/t/t5543-atomic-push.sh
@@ -2,6 +2,9 @@
 
 test_description='pushing to a repository using the atomic push option'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 mk_repo_pair () {
@@ -27,6 +30,12 @@ test_refs () {
 	test_cmp expect actual
 }
 
+fmt_status_report () {
+	sed -n \
+		-e "/^To / { s/   */ /g; p; }" \
+		-e "/^ ! / { s/   */ /g; p; }"
+}
+
 test_expect_success 'atomic push works for a single branch' '
 	mk_repo_pair &&
 	(
@@ -34,9 +43,9 @@ test_expect_success 'atomic push works for a single branch' '
 		test_commit one &&
 		git push --mirror up &&
 		test_commit two &&
-		git push --atomic up master
+		git push --atomic up main
 	) &&
-	test_refs master master
+	test_refs main main
 '
 
 test_expect_success 'atomic push works for two branches' '
@@ -49,9 +58,9 @@ test_expect_success 'atomic push works for two branches' '
 		test_commit two &&
 		git checkout second &&
 		test_commit three &&
-		git push --atomic up master second
+		git push --atomic up main second
 	) &&
-	test_refs master master &&
+	test_refs main main &&
 	test_refs second second
 '
 
@@ -64,7 +73,7 @@ test_expect_success 'atomic push works in combination with --mirror' '
 		test_commit two &&
 		git push --atomic --mirror up
 	) &&
-	test_refs master master &&
+	test_refs main main &&
 	test_refs second second
 '
 
@@ -73,7 +82,7 @@ test_expect_success 'atomic push works in combination with --force' '
 	(
 		cd workbench &&
 		test_commit one &&
-		git branch second master &&
+		git branch second main &&
 		test_commit two_a &&
 		git checkout second &&
 		test_commit two_b &&
@@ -81,36 +90,36 @@ test_expect_success 'atomic push works in combination with --force' '
 		test_commit four &&
 		git push --mirror up &&
 		# The actual test is below
-		git checkout master &&
+		git checkout main &&
 		test_commit three_a &&
 		git checkout second &&
 		git reset --hard HEAD^ &&
-		git push --force --atomic up master second
+		git push --force --atomic up main second
 	) &&
-	test_refs master master &&
+	test_refs main main &&
 	test_refs second second
 '
 
-# set up two branches where master can be pushed but second can not
+# set up two branches where main can be pushed but second can not
 # (non-fast-forward). Since second can not be pushed the whole operation
-# will fail and leave master untouched.
+# will fail and leave main untouched.
 test_expect_success 'atomic push fails if one branch fails' '
 	mk_repo_pair &&
 	(
 		cd workbench &&
 		test_commit one &&
-		git checkout -b second master &&
+		git checkout -b second main &&
 		test_commit two &&
 		test_commit three &&
 		test_commit four &&
 		git push --mirror up &&
 		git reset --hard HEAD~2 &&
 		test_commit five &&
-		git checkout master &&
+		git checkout main &&
 		test_commit six &&
 		test_must_fail git push --atomic --all up
 	) &&
-	test_refs master HEAD@{7} &&
+	test_refs main HEAD@{7} &&
 	test_refs second HEAD@{4}
 '
 
@@ -120,7 +129,7 @@ test_expect_success 'atomic push fails if one tag fails remotely' '
 	(
 		cd workbench &&
 		test_commit one &&
-		git checkout -b second master &&
+		git checkout -b second main &&
 		test_commit two &&
 		git push --mirror up
 	) &&
@@ -133,14 +142,14 @@ test_expect_success 'atomic push fails if one tag fails remotely' '
 	# see if we can now push both branches.
 	(
 		cd workbench &&
-		git checkout master &&
+		git checkout main &&
 		test_commit three &&
 		git checkout second &&
 		test_commit four &&
 		git tag test_tag &&
-		test_must_fail git push --tags --atomic up master second
+		test_must_fail git push --tags --atomic up main second
 	) &&
-	test_refs master HEAD@{3} &&
+	test_refs main HEAD@{3} &&
 	test_refs second HEAD@{1}
 '
 
@@ -149,7 +158,7 @@ test_expect_success 'atomic push obeys update hook preventing a branch to be pus
 	(
 		cd workbench &&
 		test_commit one &&
-		git checkout -b second master &&
+		git checkout -b second main &&
 		test_commit two &&
 		git push --mirror up
 	) &&
@@ -159,19 +168,19 @@ test_expect_success 'atomic push obeys update hook preventing a branch to be pus
 		HOOK="$HOOKDIR/update" &&
 		mkdir -p "$HOOKDIR" &&
 		write_script "$HOOK" <<-\EOF
-			# only allow update to master from now on
-			test "$1" = "refs/heads/master"
+			# only allow update to main from now on
+			test "$1" = "refs/heads/main"
 		EOF
 	) &&
 	(
 		cd workbench &&
-		git checkout master &&
+		git checkout main &&
 		test_commit three &&
 		git checkout second &&
 		test_commit four &&
-		test_must_fail git push --atomic up master second
+		test_must_fail git push --atomic up main second
 	) &&
-	test_refs master HEAD@{3} &&
+	test_refs main HEAD@{3} &&
 	test_refs second HEAD@{1}
 '
 
@@ -186,9 +195,92 @@ test_expect_success 'atomic push is not advertised if configured' '
 		test_commit one &&
 		git push --mirror up &&
 		test_commit two &&
-		test_must_fail git push --atomic up master
+		test_must_fail git push --atomic up main
+	) &&
+	test_refs main HEAD@{1}
+'
+
+# References in upstream : main(1) one(1) foo(1)
+# References in workbench: main(2)        foo(1) two(2) bar(2)
+# Atomic push            : main(2)               two(2) bar(2)
+test_expect_success 'atomic push reports (reject by update hook)' '
+	mk_repo_pair &&
+	(
+		cd workbench &&
+		test_commit one &&
+		git branch foo &&
+		git push up main one foo &&
+		git tag -d one
+	) &&
+	(
+		mkdir -p upstream/.git/hooks &&
+		cat >upstream/.git/hooks/update <<-EOF &&
+		#!/bin/sh
+
+		if test "\$1" = "refs/heads/bar"
+		then
+			echo >&2 "Pusing to branch bar is prohibited"
+			exit 1
+		fi
+		EOF
+		chmod a+x upstream/.git/hooks/update
+	) &&
+	(
+		cd workbench &&
+		test_commit two &&
+		git branch bar
+	) &&
+	test_must_fail git -C workbench \
+		push --atomic up main two bar >out 2>&1 &&
+	fmt_status_report <out >actual &&
+	cat >expect <<-EOF &&
+	To ../upstream
+	 ! [remote rejected] main -> main (atomic push failure)
+	 ! [remote rejected] two -> two (atomic push failure)
+	 ! [remote rejected] bar -> bar (hook declined)
+	EOF
+	test_cmp expect actual
+'
+
+# References in upstream : main(1) one(1) foo(1)
+# References in workbench: main(2)        foo(1) two(2) bar(2)
+test_expect_success 'atomic push reports (mirror, but reject by update hook)' '
+	(
+		cd workbench &&
+		git remote remove up &&
+		git remote add up ../upstream
+	) &&
+	test_must_fail git -C workbench \
+		push --atomic --mirror up >out 2>&1 &&
+	fmt_status_report <out >actual &&
+	cat >expect <<-EOF &&
+	To ../upstream
+	 ! [remote rejected] main -> main (atomic push failure)
+	 ! [remote rejected] one (atomic push failure)
+	 ! [remote rejected] bar -> bar (hook declined)
+	 ! [remote rejected] two -> two (atomic push failure)
+	EOF
+	test_cmp expect actual
+'
+
+# References in upstream : main(2) one(1) foo(1)
+# References in workbench: main(1)        foo(1) two(2) bar(2)
+test_expect_success 'atomic push reports (reject by non-ff)' '
+	rm upstream/.git/hooks/update &&
+	(
+		cd workbench &&
+		git push up main &&
+		git reset --hard HEAD^
 	) &&
-	test_refs master HEAD@{1}
+	test_must_fail git -C workbench \
+		push --atomic up main foo bar >out 2>&1 &&
+	fmt_status_report <out >actual &&
+	cat >expect <<-EOF &&
+	To ../upstream
+	 ! [rejected] main -> main (non-fast-forward)
+	 ! [rejected] bar -> bar (atomic push failed)
+	EOF
+	test_cmp expect actual
 '
 
 test_done
diff --git a/t/t5544-pack-objects-hook.sh b/t/t5544-pack-objects-hook.sh
index 4357af1525..dd5f44d986 100755
--- a/t/t5544-pack-objects-hook.sh
+++ b/t/t5544-pack-objects-hook.sh
@@ -59,4 +59,14 @@ test_expect_success 'hook does not run from repo config' '
 	test_path_is_missing .git/hook.stdout
 '
 
+test_expect_success 'hook works with partial clone' '
+	clear_hook_results &&
+	test_config_global uploadpack.packObjectsHook ./hook &&
+	test_config_global uploadpack.allowFilter true &&
+	git clone --bare --no-local --filter=blob:none . dst.git &&
+	git -C dst.git rev-list --objects --missing=allow-any --no-object-names --all >objects &&
+	git -C dst.git cat-file --batch-check="%(objecttype)" <objects >types &&
+	! grep blob types
+'
+
 test_done
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
index 04b34c4de1..58c7add7ee 100755
--- a/t/t5545-push-options.sh
+++ b/t/t5545-push-options.sh
@@ -2,6 +2,9 @@
 
 test_description='pushing to a repository using push options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 mk_repo_pair () {
@@ -63,9 +66,9 @@ test_expect_success 'one push option works for a single branch' '
 		test_commit one &&
 		git push --mirror up &&
 		test_commit two &&
-		git push --push-option=asdf up master
+		git push --push-option=asdf up main
 	) &&
-	test_refs master master &&
+	test_refs main main &&
 	echo "asdf" >expect &&
 	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
 	test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -79,9 +82,9 @@ test_expect_success 'push option denied by remote' '
 		test_commit one &&
 		git push --mirror up &&
 		test_commit two &&
-		test_must_fail git push --push-option=asdf up master
+		test_must_fail git push --push-option=asdf up main
 	) &&
-	test_refs master HEAD@{1}
+	test_refs main HEAD@{1}
 '
 
 test_expect_success 'two push options work' '
@@ -92,9 +95,9 @@ test_expect_success 'two push options work' '
 		test_commit one &&
 		git push --mirror up &&
 		test_commit two &&
-		git push --push-option=asdf --push-option="more structured text" up master
+		git push --push-option=asdf --push-option="more structured text" up main
 	) &&
-	test_refs master master &&
+	test_refs main main &&
 	printf "asdf\nmore structured text\n" >expect &&
 	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
 	test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -115,7 +118,7 @@ test_expect_success 'push options and submodules' '
 
 	git -C parent submodule add ../upstream workbench &&
 	git -C parent/workbench remote add up ../../upstream &&
-	git -C parent commit -m "add submoule" &&
+	git -C parent commit -m "add submodule" &&
 
 	test_commit -C parent/workbench two &&
 	git -C parent add workbench &&
@@ -123,14 +126,14 @@ test_expect_success 'push options and submodules' '
 
 	git -C parent push \
 		--push-option=asdf --push-option="more structured text" \
-		--recurse-submodules=on-demand up master &&
+		--recurse-submodules=on-demand up main &&
 
-	git -C upstream rev-parse --verify master >expect &&
-	git -C parent/workbench rev-parse --verify master >actual &&
+	git -C upstream rev-parse --verify main >expect &&
+	git -C parent/workbench rev-parse --verify main >actual &&
 	test_cmp expect actual &&
 
-	git -C parent_upstream rev-parse --verify master >expect &&
-	git -C parent rev-parse --verify master >actual &&
+	git -C parent_upstream rev-parse --verify main >expect &&
+	git -C parent rev-parse --verify main >actual &&
 	test_cmp expect actual &&
 
 	printf "asdf\nmore structured text\n" >expect &&
@@ -148,9 +151,9 @@ test_expect_success 'default push option' '
 		test_commit one &&
 		git push --mirror up &&
 		test_commit two &&
-		git -c push.pushOption=default push up master
+		git -c push.pushOption=default push up main
 	) &&
-	test_refs master master &&
+	test_refs main main &&
 	echo "default" >expect &&
 	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
 	test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -164,9 +167,9 @@ test_expect_success 'two default push options' '
 		test_commit one &&
 		git push --mirror up &&
 		test_commit two &&
-		git -c push.pushOption=default1 -c push.pushOption=default2 push up master
+		git -c push.pushOption=default1 -c push.pushOption=default2 push up main
 	) &&
-	test_refs master master &&
+	test_refs main main &&
 	printf "default1\ndefault2\n" >expect &&
 	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
 	test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -180,9 +183,9 @@ test_expect_success 'push option from command line overrides from-config push op
 		test_commit one &&
 		git push --mirror up &&
 		test_commit two &&
-		git -c push.pushOption=default push --push-option=manual up master
+		git -c push.pushOption=default push --push-option=manual up main
 	) &&
-	test_refs master master &&
+	test_refs main main &&
 	echo "manual" >expect &&
 	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
 	test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -196,9 +199,9 @@ test_expect_success 'empty value of push.pushOption in config clears the list' '
 		test_commit one &&
 		git push --mirror up &&
 		test_commit two &&
-		git -c push.pushOption=default1 -c push.pushOption= -c push.pushOption=default2 push up master
+		git -c push.pushOption=default1 -c push.pushOption= -c push.pushOption=default2 push up main
 	) &&
-	test_refs master master &&
+	test_refs main main &&
 	echo "default2" >expect &&
 	test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
 	test_cmp expect upstream/.git/hooks/post-receive.push_options
@@ -212,16 +215,16 @@ test_expect_success 'invalid push option in config' '
 		test_commit one &&
 		git push --mirror up &&
 		test_commit two &&
-		test_must_fail git -c push.pushOption push up master
+		test_must_fail git -c push.pushOption push up main
 	) &&
-	test_refs master HEAD@{1}
+	test_refs main HEAD@{1}
 '
 
 test_expect_success 'push options keep quoted characters intact (direct)' '
 	mk_repo_pair &&
 	git -C upstream config receive.advertisePushOptions true &&
 	test_commit -C workbench one &&
-	git -C workbench push --push-option="\"embedded quotes\"" up master &&
+	git -C workbench push --push-option="\"embedded quotes\"" up main &&
 	echo "\"embedded quotes\"" >expect &&
 	test_cmp expect upstream/.git/hooks/pre-receive.push_options
 '
@@ -244,28 +247,28 @@ mk_http_pair () {
 test_expect_success 'push option denied properly by http server' '
 	mk_http_pair false &&
 	test_commit -C test_http_clone one &&
-	test_must_fail git -C test_http_clone push --push-option=asdf origin master 2>actual &&
+	test_must_fail git -C test_http_clone push --push-option=asdf origin main 2>actual &&
 	test_i18ngrep "the receiving end does not support push options" actual &&
-	git -C test_http_clone push origin master
+	git -C test_http_clone push origin main
 '
 
 test_expect_success 'push options work properly across http' '
 	mk_http_pair true &&
 
 	test_commit -C test_http_clone one &&
-	git -C test_http_clone push origin master &&
-	git -C "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git rev-parse --verify master >expect &&
-	git -C test_http_clone rev-parse --verify master >actual &&
+	git -C test_http_clone push origin main &&
+	git -C "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git rev-parse --verify main >expect &&
+	git -C test_http_clone rev-parse --verify main >actual &&
 	test_cmp expect actual &&
 
 	test_commit -C test_http_clone two &&
-	git -C test_http_clone push --push-option=asdf --push-option="more structured text" origin master &&
+	git -C test_http_clone push --push-option=asdf --push-option="more structured text" origin main &&
 	printf "asdf\nmore structured text\n" >expect &&
 	test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options &&
 	test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/post-receive.push_options &&
 
-	git -C "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git rev-parse --verify master >expect &&
-	git -C test_http_clone rev-parse --verify master >actual &&
+	git -C "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git rev-parse --verify main >expect &&
+	git -C test_http_clone rev-parse --verify main >actual &&
 	test_cmp expect actual
 '
 
@@ -273,7 +276,7 @@ test_expect_success 'push options keep quoted characters intact (http)' '
 	mk_http_pair true &&
 
 	test_commit -C test_http_clone one &&
-	git -C test_http_clone push --push-option="\"embedded quotes\"" origin master &&
+	git -C test_http_clone push --push-option="\"embedded quotes\"" origin main &&
 	echo "\"embedded quotes\"" >expect &&
 	test_cmp expect "$HTTPD_DOCUMENT_ROOT_PATH"/upstream.git/hooks/pre-receive.push_options
 '
diff --git a/t/t5548-push-porcelain.sh b/t/t5548-push-porcelain.sh
new file mode 100755
index 0000000000..f11ff57e54
--- /dev/null
+++ b/t/t5548-push-porcelain.sh
@@ -0,0 +1,278 @@
+#!/bin/sh
+#
+# Copyright (c) 2020 Jiang Xin
+#
+test_description='Test git push porcelain output'
+
+. ./test-lib.sh
+
+# Create commits in <repo> and assign each commit's oid to shell variables
+# given in the arguments (A, B, and C). E.g.:
+#
+#     create_commits_in <repo> A B C
+#
+# NOTE: Never calling this function from a subshell since variable
+# assignments will disappear when subshell exits.
+create_commits_in () {
+	repo="$1" && test -d "$repo" ||
+	error "Repository $repo does not exist."
+	shift &&
+	while test $# -gt 0
+	do
+		name=$1 &&
+		shift &&
+		test_commit -C "$repo" --no-tag "$name" &&
+		eval $name=$(git -C "$repo" rev-parse HEAD)
+	done
+}
+
+get_abbrev_oid () {
+	oid=$1 &&
+	suffix=${oid#???????} &&
+	oid=${oid%$suffix} &&
+	if test -n "$oid"
+	then
+		echo "$oid"
+	else
+		echo "undefined-oid"
+	fi
+}
+
+# Format the output of git-push, git-show-ref and other commands to make a
+# user-friendly and stable text.  We can easily prepare the expect text
+# without having to worry about future changes of the commit ID and spaces
+# of the output.
+make_user_friendly_and_stable_output () {
+	sed \
+		-e "s/$(get_abbrev_oid $A)[0-9a-f]*/<COMMIT-A>/g" \
+		-e "s/$(get_abbrev_oid $B)[0-9a-f]*/<COMMIT-B>/g" \
+		-e "s/$ZERO_OID/<ZERO-OID>/g" \
+		-e "s#To $URL_PREFIX/upstream.git#To <URL/of/upstream.git>#"
+}
+
+format_and_save_expect () {
+	sed -e 's/^> //' -e 's/Z$//' >expect
+}
+
+setup_upstream_and_workbench () {
+	# Upstream  after setup : main(B)  foo(A)  bar(A)  baz(A)
+	# Workbench after setup : main(A)
+	test_expect_success "setup upstream repository and workbench" '
+		rm -rf upstream.git workbench &&
+		git init --bare upstream.git &&
+		git init workbench &&
+		create_commits_in workbench A B &&
+		(
+			cd workbench &&
+			# Try to make a stable fixed width for abbreviated commit ID,
+			# this fixed-width oid will be replaced with "<OID>".
+			git config core.abbrev 7 &&
+			git remote add origin ../upstream.git &&
+			git update-ref refs/heads/main $A &&
+			git push origin \
+				$B:refs/heads/main \
+				$A:refs/heads/foo \
+				$A:refs/heads/bar \
+				$A:refs/heads/baz
+		) &&
+		git -C "workbench" config advice.pushUpdateRejected false &&
+		upstream=upstream.git
+	'
+}
+
+run_git_push_porcelain_output_test() {
+	case $1 in
+	http)
+		PROTOCOL="HTTP protocol"
+		URL_PREFIX="http://.*"
+		;;
+	file)
+		PROTOCOL="builtin protocol"
+		URL_PREFIX="\.\."
+		;;
+	esac
+
+	# Refs of upstream : main(B)  foo(A)  bar(A)  baz(A)
+	# Refs of workbench: main(A)                  baz(A)  next(A)
+	# git-push         : main(A)  NULL    (B)     baz(A)  next(A)
+	test_expect_success "porcelain output of successful git-push ($PROTOCOL)" '
+		(
+			cd workbench &&
+			git update-ref refs/heads/main $A &&
+			git update-ref refs/heads/baz $A &&
+			git update-ref refs/heads/next $A &&
+			git push --porcelain --force origin \
+				main \
+				:refs/heads/foo \
+				$B:bar \
+				baz \
+				next
+		) >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		> To <URL/of/upstream.git>
+		> =	refs/heads/baz:refs/heads/baz	[up to date]
+		>  	<COMMIT-B>:refs/heads/bar	<COMMIT-A>..<COMMIT-B>
+		> -	:refs/heads/foo	[deleted]
+		> +	refs/heads/main:refs/heads/main	<COMMIT-B>...<COMMIT-A> (forced update)
+		> *	refs/heads/next:refs/heads/next	[new branch]
+		> Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	'
+
+	# Refs of upstream : main(A)  bar(B)  baz(A)  next(A)
+	# Refs of workbench: main(B)  bar(A)  baz(A)  next(A)
+	# git-push         : main(B)  bar(A)  NULL    next(A)
+	test_expect_success "atomic push failed ($PROTOCOL)" '
+		(
+			cd workbench &&
+			git update-ref refs/heads/main $B &&
+			git update-ref refs/heads/bar $A &&
+			test_must_fail git push --atomic --porcelain origin \
+				main \
+				bar \
+				:baz \
+				next
+		) >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		To <URL/of/upstream.git>
+		> =	refs/heads/next:refs/heads/next	[up to date]
+		> !	refs/heads/bar:refs/heads/bar	[rejected] (non-fast-forward)
+		> !	(delete):refs/heads/baz	[rejected] (atomic push failed)
+		> !	refs/heads/main:refs/heads/main	[rejected] (atomic push failed)
+		Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	'
+
+	test_expect_success "prepare pre-receive hook ($PROTOCOL)" '
+		write_script "$upstream/hooks/pre-receive" <<-EOF
+		exit 1
+		EOF
+	'
+
+	# Refs of upstream : main(A)  bar(B)  baz(A)  next(A)
+	# Refs of workbench: main(B)  bar(A)  baz(A)  next(A)
+	# git-push         : main(B)  bar(A)  NULL    next(A)
+	test_expect_success "pre-receive hook declined ($PROTOCOL)" '
+		(
+			cd workbench &&
+			git update-ref refs/heads/main $B &&
+			git update-ref refs/heads/bar $A &&
+			test_must_fail git push --porcelain --force origin \
+				main \
+				bar \
+				:baz \
+				next
+		) >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		To <URL/of/upstream.git>
+		> =	refs/heads/next:refs/heads/next	[up to date]
+		> !	refs/heads/bar:refs/heads/bar	[remote rejected] (pre-receive hook declined)
+		> !	:refs/heads/baz	[remote rejected] (pre-receive hook declined)
+		> !	refs/heads/main:refs/heads/main	[remote rejected] (pre-receive hook declined)
+		Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-A> refs/heads/baz
+		<COMMIT-A> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	'
+
+	test_expect_success "remove pre-receive hook ($PROTOCOL)" '
+		rm "$upstream/hooks/pre-receive"
+	'
+
+	# Refs of upstream : main(A)  bar(B)  baz(A)  next(A)
+	# Refs of workbench: main(B)  bar(A)  baz(A)  next(A)
+	# git-push         : main(B)  bar(A)  NULL    next(A)
+	test_expect_success "non-fastforward push ($PROTOCOL)" '
+		(
+			cd workbench &&
+			test_must_fail git push --porcelain origin \
+				main \
+				bar \
+				:baz \
+				next
+		) >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		format_and_save_expect <<-EOF &&
+		To <URL/of/upstream.git>
+		> =	refs/heads/next:refs/heads/next	[up to date]
+		> -	:refs/heads/baz	[deleted]
+		>  	refs/heads/main:refs/heads/main	<COMMIT-A>..<COMMIT-B>
+		> !	refs/heads/bar:refs/heads/bar	[rejected] (non-fast-forward)
+		Done
+		EOF
+		test_cmp expect actual &&
+
+		git -C "$upstream" show-ref >out &&
+		make_user_friendly_and_stable_output <out >actual &&
+		cat >expect <<-EOF &&
+		<COMMIT-B> refs/heads/bar
+		<COMMIT-B> refs/heads/main
+		<COMMIT-A> refs/heads/next
+		EOF
+		test_cmp expect actual
+	'
+}
+
+# Initialize the upstream repository and local workbench.
+setup_upstream_and_workbench
+
+# Run git-push porcelain test on builtin protocol
+run_git_push_porcelain_output_test file
+
+ROOT_PATH="$PWD"
+. "$TEST_DIRECTORY"/lib-gpg.sh
+. "$TEST_DIRECTORY"/lib-httpd.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
+start_httpd
+
+# Re-initialize the upstream repository and local workbench.
+setup_upstream_and_workbench
+
+test_expect_success "setup for http" '
+	git -C upstream.git config http.receivepack true &&
+	upstream="$HTTPD_DOCUMENT_ROOT_PATH/upstream.git" &&
+	mv upstream.git "$upstream" &&
+
+	git -C workbench remote set-url origin $HTTPD_URL/smart/upstream.git
+'
+
+setup_askpass_helper
+
+# Run git-push porcelain test on HTTP protocol
+run_git_push_porcelain_output_test http
+
+test_done
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 b811d89cfd..6d9142afc3 100755
--- a/t/t5550-http-fetch-dumb.sh
+++ b/t/t5550-http-fetch-dumb.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test dumb fetching over http via static file'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
@@ -26,7 +29,7 @@ test_expect_success 'create http-accessible bare repository with loose objects'
 	 hooks/post-update
 	) &&
 	git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	git push public master:master
+	git push public main:main
 '
 
 test_expect_success 'clone http repository' '
@@ -37,8 +40,8 @@ test_expect_success 'clone http repository' '
 
 test_expect_success 'list refs from outside any repository' '
 	cat >expect <<-EOF &&
-	$(git rev-parse master)	HEAD
-	$(git rev-parse master)	refs/heads/master
+	$(git rev-parse main)	HEAD
+	$(git rev-parse main)	refs/heads/main
 	EOF
 	nongit git ls-remote "$HTTPD_URL/dumb/repo.git" >actual &&
 	test_cmp expect actual
@@ -50,6 +53,24 @@ test_expect_success 'create password-protected repository' '
 	       "$HTTPD_DOCUMENT_ROOT_PATH/auth/dumb/repo.git"
 '
 
+test_expect_success 'create empty remote repository' '
+	git init --bare "$HTTPD_DOCUMENT_ROOT_PATH/empty.git" &&
+	(cd "$HTTPD_DOCUMENT_ROOT_PATH/empty.git" &&
+	 mkdir -p hooks &&
+	 write_script "hooks/post-update" <<-\EOF &&
+	 exec git update-server-info
+	EOF
+	 hooks/post-update
+	)
+'
+
+test_expect_success 'empty dumb HTTP repository has default hash algorithm' '
+	test_when_finished "rm -fr clone-empty" &&
+	git clone $HTTPD_URL/dumb/empty.git clone-empty &&
+	git -C clone-empty rev-parse --show-object-format >empty-format &&
+	test "$(cat empty-format)" = "$(test_oid algo)"
+'
+
 setup_askpass_helper
 
 test_expect_success 'cloning password-protected repository can fail' '
@@ -163,8 +184,8 @@ test_expect_success 'fetch changes via manual http-fetch' '
 
 	HEAD=$(git rev-parse --verify HEAD) &&
 	(cd clone2 &&
-	 git http-fetch -a -w heads/master-new $HEAD $(git config remote.origin.url) &&
-	 git checkout master-new &&
+	 git http-fetch -a -w heads/main-new $HEAD $(git config remote.origin.url) &&
+	 git checkout main-new &&
 	 test $HEAD = $(git rev-parse --verify HEAD)) &&
 	test_cmp file clone2/file
 '
@@ -174,19 +195,19 @@ test_expect_success 'manual http-fetch without -a works just as well' '
 
 	HEAD=$(git rev-parse --verify HEAD) &&
 	(cd clone3 &&
-	 git http-fetch -w heads/master-new $HEAD $(git config remote.origin.url) &&
-	 git checkout master-new &&
+	 git http-fetch -w heads/main-new $HEAD $(git config remote.origin.url) &&
+	 git checkout main-new &&
 	 test $HEAD = $(git rev-parse --verify HEAD)) &&
 	test_cmp file clone3/file
 '
 
 test_expect_success 'http remote detects correct HEAD' '
-	git push public master:other &&
+	git push public main:other &&
 	(cd clone &&
 	 git remote set-head origin -d &&
 	 git remote set-head origin -a &&
 	 git symbolic-ref refs/remotes/origin/HEAD > output &&
-	 echo refs/remotes/origin/master > expect &&
+	 echo refs/remotes/origin/main > expect &&
 	 test_cmp expect output
 	)
 '
@@ -199,6 +220,31 @@ test_expect_success 'fetch packed objects' '
 	git clone $HTTPD_URL/dumb/repo_pack.git
 '
 
+test_expect_success 'http-fetch --packfile' '
+	# Arbitrary hash. Use rev-parse so that we get one of the correct
+	# length.
+	ARBITRARY=$(git -C "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git rev-parse HEAD) &&
+
+	git init packfileclient &&
+	p=$(cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git && ls objects/pack/pack-*.pack) &&
+	git -C packfileclient http-fetch --packfile=$ARBITRARY \
+		--index-pack-arg=index-pack --index-pack-arg=--stdin \
+		--index-pack-arg=--keep \
+		"$HTTPD_URL"/dumb/repo_pack.git/$p >out &&
+
+	grep "^keep.[0-9a-f]\{16,\}$" out &&
+	cut -c6- out >packhash &&
+
+	# Ensure that the expected files are generated
+	test -e "packfileclient/.git/objects/pack/pack-$(cat packhash).pack" &&
+	test -e "packfileclient/.git/objects/pack/pack-$(cat packhash).idx" &&
+	test -e "packfileclient/.git/objects/pack/pack-$(cat packhash).keep" &&
+
+	# Ensure that it has the HEAD of repo_pack, at least
+	HASH=$(git -C "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git rev-parse HEAD) &&
+	git -C packfileclient cat-file -e "$HASH"
+'
+
 test_expect_success 'fetch notices corrupt pack' '
 	cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
 	(cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad1.git &&
@@ -214,6 +260,14 @@ test_expect_success 'fetch notices corrupt pack' '
 	)
 '
 
+test_expect_success 'http-fetch --packfile with corrupt pack' '
+	rm -rf packfileclient &&
+	git init packfileclient &&
+	p=$(cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad1.git && ls objects/pack/pack-*.pack) &&
+	test_must_fail git -C packfileclient http-fetch --packfile \
+		"$HTTPD_URL"/dumb/repo_bad1.git/$p
+'
+
 test_expect_success 'fetch notices corrupt idx' '
 	cp -R "$HTTPD_DOCUMENT_ROOT_PATH"/repo_pack.git "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
 	(cd "$HTTPD_DOCUMENT_ROOT_PATH"/repo_bad2.git &&
@@ -248,9 +302,7 @@ test_expect_success 'fetch can handle previously-fetched .idx files' '
 '
 
 test_expect_success 'did not use upload-pack service' '
-	test_might_fail grep '/git-upload-pack' <"$HTTPD_ROOT_PATH"/access.log >act &&
-	: >exp &&
-	test_cmp exp act
+	! grep "/git-upload-pack" "$HTTPD_ROOT_PATH/access.log"
 '
 
 test_expect_success 'git client shows text/plain errors' '
@@ -321,11 +373,17 @@ test_expect_success 'git client does not send an empty Accept-Language' '
 '
 
 test_expect_success 'remote-http complains cleanly about malformed urls' '
-	# do not actually issue "list" or other commands, as we do not
-	# want to rely on what curl would actually do with such a broken
-	# URL. This is just about making sure we do not segfault during
-	# initialization.
-	test_must_fail git remote-http http::/example.com/repo.git
+	test_must_fail git remote-http http::/example.com/repo.git 2>stderr &&
+	test_i18ngrep "url has no scheme" stderr
+'
+
+# NEEDSWORK: Writing commands to git-remote-curl can race against the latter
+# erroring out, producing SIGPIPE. Remove "ok=sigpipe" once transport-helper has
+# learned to handle early remote helper failures more cleanly.
+test_expect_success 'remote-http complains cleanly about empty scheme' '
+	test_must_fail ok=sigpipe git ls-remote \
+		http::${HTTPD_URL#http}/dumb/repo.git 2>stderr &&
+	test_i18ngrep "url has no scheme" stderr
 '
 
 test_expect_success 'redirects can be forbidden/allowed' '
@@ -364,7 +422,7 @@ test_expect_success 'set up evil alternates scheme' '
 	evil=$HTTPD_DOCUMENT_ROOT_PATH/evil.git &&
 	git init --bare "$evil" &&
 	# do this by hand to avoid object existence check
-	printf "%s\\t%s\\n" $sha1 refs/heads/master >"$evil/info/refs"
+	printf "%s\\t%s\\n" $sha1 refs/heads/main >"$evil/info/refs"
 '
 
 # Here we'll just redirect via HTTP. In a real-world attack these would be on
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index e38e543867..4f87d90c5b 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test smart fetching over http via http-backend'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
@@ -18,7 +21,7 @@ test_expect_success 'create http-accessible bare repository' '
 	 git --bare init
 	) &&
 	git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	git push public master:master
+	git push public main:main
 '
 
 setup_askpass_helper
@@ -43,7 +46,7 @@ test_expect_success 'clone http repository' '
 	< Cache-Control: no-cache, max-age=0, must-revalidate
 	< Content-Type: application/x-git-upload-pack-result
 	EOF
-	GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION= \
+	GIT_TRACE_CURL=true GIT_TEST_PROTOCOL_VERSION=0 \
 		git clone --quiet $HTTPD_URL/smart/repo.git clone 2>err &&
 	test_cmp file clone/file &&
 	tr '\''\015'\'' Q <err |
@@ -84,7 +87,7 @@ test_expect_success 'clone http repository' '
 
 	# NEEDSWORK: If the overspecification of the expected result is reduced, we
 	# might be able to run this test in all protocol versions.
-	if test -z "$GIT_TEST_PROTOCOL_VERSION"
+	if test "$GIT_TEST_PROTOCOL_VERSION" = 0
 	then
 		sed -e "s/^> Accept-Encoding: .*/> Accept-Encoding: ENCODINGS/" \
 				actual >actual.smudged &&
@@ -113,7 +116,7 @@ test_expect_success 'used upload-pack service' '
 
 	# NEEDSWORK: If the overspecification of the expected result is reduced, we
 	# might be able to run this test in all protocol versions.
-	if test -z "$GIT_TEST_PROTOCOL_VERSION"
+	if test "$GIT_TEST_PROTOCOL_VERSION" = 0
 	then
 		check_access_log exp
 	fi
@@ -185,6 +188,40 @@ test_expect_success 'redirects send auth to new location' '
 	expect_askpass both user@host auth/smart/repo.git
 '
 
+test_expect_success 'GIT_TRACE_CURL redacts auth details' '
+	rm -rf redact-auth trace &&
+	set_askpass user@host pass@host &&
+	GIT_TRACE_CURL="$(pwd)/trace" git clone --bare "$HTTPD_URL/auth/smart/repo.git" redact-auth &&
+	expect_askpass both user@host &&
+
+	# 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
+'
+
+test_expect_success 'GIT_CURL_VERBOSE redacts auth details' '
+	rm -rf redact-auth trace &&
+	set_askpass user@host pass@host &&
+	GIT_CURL_VERBOSE=1 git clone --bare "$HTTPD_URL/auth/smart/repo.git" redact-auth 2>trace &&
+	expect_askpass both user@host &&
+
+	# 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
+'
+
+test_expect_success 'GIT_TRACE_CURL does not redact auth details if GIT_TRACE_REDACT=0' '
+	rm -rf redact-auth trace &&
+	set_askpass user@host pass@host &&
+	GIT_TRACE_REDACT=0 GIT_TRACE_CURL="$(pwd)/trace" \
+		git clone --bare "$HTTPD_URL/auth/smart/repo.git" redact-auth &&
+	expect_askpass both user@host &&
+
+	grep "Authorization: Basic [0-9a-zA-Z+/]" trace
+'
+
 test_expect_success 'disable dumb http on server' '
 	git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \
 		config http.getanyfile false
@@ -204,9 +241,9 @@ test_expect_success 'invalid Content-Type rejected' '
 
 test_expect_success 'create namespaced refs' '
 	test_commit namespaced &&
-	git push public HEAD:refs/namespaces/ns/refs/heads/master &&
+	git push public HEAD:refs/namespaces/ns/refs/heads/main &&
 	git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" \
-		symbolic-ref refs/namespaces/ns/HEAD refs/namespaces/ns/refs/heads/master
+		symbolic-ref refs/namespaces/ns/HEAD refs/namespaces/ns/refs/heads/main
 '
 
 test_expect_success 'smart clone respects namespace' '
@@ -237,11 +274,11 @@ test_expect_success 'cookies stored in http.cookiefile when http.savecookies set
 	EOF
 	git config http.cookiefile cookies.txt &&
 	git config http.savecookies true &&
-	git ls-remote $HTTPD_URL/smart_cookies/repo.git master &&
+	git ls-remote $HTTPD_URL/smart_cookies/repo.git main &&
 
 	# NEEDSWORK: If the overspecification of the expected result is reduced, we
 	# might be able to run this test in all protocol versions.
-	if test -z "$GIT_TEST_PROTOCOL_VERSION"
+	if test "$GIT_TEST_PROTOCOL_VERSION" = 0
 	then
 		tail -3 cookies.txt | sort >cookies_tail.txt &&
 		test_cmp expect_cookies.txt cookies_tail.txt
@@ -310,12 +347,12 @@ test_expect_success 'large fetch-pack requests can be sent using chunked encodin
 test_expect_success 'test allowreachablesha1inwant' '
 	test_when_finished "rm -rf test_reachable.git" &&
 	server="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	master_sha=$(git -C "$server" rev-parse refs/heads/master) &&
+	main_sha=$(git -C "$server" rev-parse refs/heads/main) &&
 	git -C "$server" config uploadpack.allowreachablesha1inwant 1 &&
 
 	git init --bare test_reachable.git &&
 	git -C test_reachable.git remote add origin "$HTTPD_URL/smart/repo.git" &&
-	git -C test_reachable.git fetch origin "$master_sha"
+	git -C test_reachable.git fetch origin "$main_sha"
 '
 
 test_expect_success 'test allowreachablesha1inwant with unreachable' '
@@ -329,14 +366,14 @@ test_expect_success 'test allowreachablesha1inwant with unreachable' '
 	git push public :refs/heads/doomed &&
 
 	server="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	master_sha=$(git -C "$server" rev-parse refs/heads/master) &&
+	main_sha=$(git -C "$server" rev-parse refs/heads/main) &&
 	git -C "$server" config uploadpack.allowreachablesha1inwant 1 &&
 
 	git init --bare test_reachable.git &&
 	git -C test_reachable.git remote add origin "$HTTPD_URL/smart/repo.git" &&
 	# Some protocol versions (e.g. 2) support fetching
 	# unadvertised objects, so restrict this test to v0.
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 		git -C test_reachable.git fetch origin "$(git rev-parse HEAD)"
 '
 
@@ -351,14 +388,14 @@ test_expect_success 'test allowanysha1inwant with unreachable' '
 	git push public :refs/heads/doomed &&
 
 	server="$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	master_sha=$(git -C "$server" rev-parse refs/heads/master) &&
+	main_sha=$(git -C "$server" rev-parse refs/heads/main) &&
 	git -C "$server" config uploadpack.allowreachablesha1inwant 1 &&
 
 	git init --bare test_reachable.git &&
 	git -C test_reachable.git remote add origin "$HTTPD_URL/smart/repo.git" &&
 	# Some protocol versions (e.g. 2) support fetching
 	# unadvertised objects, so restrict this test to v0.
-	test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 		git -C test_reachable.git fetch origin "$(git rev-parse HEAD)" &&
 
 	git -C "$server" config uploadpack.allowanysha1inwant 1 &&
@@ -410,8 +447,8 @@ test_expect_success 'using fetch command in remote-curl updates refs' '
 	test_commit -C "$SERVER" bar &&
 	git -C client -c protocol.version=0 fetch &&
 
-	git -C "$SERVER" rev-parse master >expect &&
-	git -C client rev-parse origin/master >actual &&
+	git -C "$SERVER" rev-parse main >expect &&
+	git -C client rev-parse origin/main >actual &&
 	test_cmp expect actual
 '
 
@@ -430,27 +467,39 @@ test_expect_success 'fetch by SHA-1 without tag following' '
 		--no-tags origin $(cat bar_hash)
 '
 
-test_expect_success 'GIT_REDACT_COOKIES redacts cookies' '
+test_expect_success 'cookies are redacted by default' '
 	rm -rf clone &&
 	echo "Set-Cookie: Foo=1" >cookies &&
 	echo "Set-Cookie: Bar=2" >>cookies &&
-	GIT_TRACE_CURL=true GIT_REDACT_COOKIES=Bar,Baz \
+	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:.*Foo=<redacted>" err &&
 	grep "Cookie:.*Bar=<redacted>" err &&
+	! grep "Cookie:.*Foo=1" err &&
 	! grep "Cookie:.*Bar=2" err
 '
 
-test_expect_success 'GIT_REDACT_COOKIES handles empty values' '
+test_expect_success 'empty values of cookies are also redacted' '
 	rm -rf clone &&
 	echo "Set-Cookie: Foo=" >cookies &&
-	GIT_TRACE_CURL=true GIT_REDACT_COOKIES=Foo \
+	GIT_TRACE_CURL=true \
 		git -c "http.cookieFile=$(pwd)/cookies" clone \
 		$HTTPD_URL/smart/repo.git clone 2>err &&
 	grep "Cookie:.*Foo=<redacted>" err
 '
 
+test_expect_success 'GIT_TRACE_REDACT=0 disables cookie redaction' '
+	rm -rf clone &&
+	echo "Set-Cookie: Foo=1" >cookies &&
+	echo "Set-Cookie: Bar=2" >>cookies &&
+	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
+'
+
 test_expect_success 'GIT_TRACE_CURL_NO_DATA prevents data from being traced' '
 	rm -rf clone &&
 	GIT_TRACE_CURL=true \
@@ -468,4 +517,45 @@ test_expect_success 'server-side error detected' '
 	test_i18ngrep "server-side error" actual
 '
 
+test_expect_success 'http auth remembers successful credentials' '
+	rm -f .git-credentials &&
+	test_config credential.helper store &&
+
+	# the first request prompts the user...
+	set_askpass user@host pass@host &&
+	git ls-remote "$HTTPD_URL/auth/smart/repo.git" >/dev/null &&
+	expect_askpass both user@host &&
+
+	# ...and the second one uses the stored value rather than
+	# prompting the user.
+	set_askpass bogus-user bogus-pass &&
+	git ls-remote "$HTTPD_URL/auth/smart/repo.git" >/dev/null &&
+	expect_askpass none
+'
+
+test_expect_success 'http auth forgets bogus credentials' '
+	# seed credential store with bogus values. In real life,
+	# this would probably come from a password which worked
+	# for a previous request.
+	rm -f .git-credentials &&
+	test_config credential.helper store &&
+	{
+		echo "url=$HTTPD_URL" &&
+		echo "username=bogus" &&
+		echo "password=bogus"
+	} | git credential approve &&
+
+	# we expect this to use the bogus values and fail, never even
+	# prompting the user...
+	set_askpass user@host pass@host &&
+	test_must_fail git ls-remote "$HTTPD_URL/auth/smart/repo.git" >/dev/null &&
+	expect_askpass none &&
+
+	# ...but now we should have forgotten the bad value, causing
+	# us to prompt the user again.
+	set_askpass user@host pass@host &&
+	git ls-remote "$HTTPD_URL/auth/smart/repo.git" >/dev/null &&
+	expect_askpass both user@host
+'
+
 test_done
diff --git a/t/t5552-skipping-fetch-negotiator.sh b/t/t5552-skipping-fetch-negotiator.sh
index f70cbcc9ca..7b9fb4ff02 100755
--- a/t/t5552-skipping-fetch-negotiator.sh
+++ b/t/t5552-skipping-fetch-negotiator.sh
@@ -100,14 +100,18 @@ test_expect_success 'use ref advertisement to filter out commits' '
 	git -C server checkout --orphan anotherbranch &&
 	test_commit -C server to_fetch &&
 
-	# The server advertising "c3" (as "refs/heads/master") means that we do
+	# The server advertising "c3" (as "refs/heads/main") means that we do
 	# not need to send any ancestors of "c3", but we still need to send "c3"
 	# itself.
 	test_config -C client fetch.negotiationalgorithm skipping &&
 
 	# The ref advertisement itself is filtered when protocol v2 is used, so
 	# use v0.
-	GIT_TEST_PROTOCOL_VERSION= trace_fetch client origin to_fetch &&
+	(
+		GIT_TEST_PROTOCOL_VERSION=0 &&
+		export GIT_TEST_PROTOCOL_VERSION &&
+		trace_fetch client origin to_fetch
+	) &&
 	have_sent c5 c4^ c2side &&
 	have_not_sent c4 c4^^ c4^^^
 '
@@ -169,7 +173,17 @@ test_expect_success 'do not send "have" with ancestors of commits that server AC
 	test_commit -C server commit-on-b1 &&
 
 	test_config -C client fetch.negotiationalgorithm skipping &&
-	trace_fetch client "$(pwd)/server" to_fetch &&
+
+	# NEEDSWORK: The number of "have"s sent depends on whether the transport
+	# is stateful. If the overspecification of the result were reduced, this
+	# test could be used for both stateful and stateless transports.
+	(
+		# Force protocol v0, in which local transport is stateful (in
+		# protocol v2 it is stateless).
+		GIT_TEST_PROTOCOL_VERSION=0 &&
+		export GIT_TEST_PROTOCOL_VERSION &&
+		trace_fetch client "$(pwd)/server" to_fetch
+	) &&
 	grep "  fetch" trace &&
 
 	# fetch-pack sends 2 requests each containing 16 "have" lines before
diff --git a/t/t5553-set-upstream.sh b/t/t5553-set-upstream.sh
index 81975ad8f9..9c12c0f8c3 100755
--- a/t/t5553-set-upstream.sh
+++ b/t/t5553-set-upstream.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='"git fetch/pull --set-upstream" basic tests.'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_config () {
@@ -32,9 +35,9 @@ test_expect_success 'setup bare parent fetch' '
 	git remote add upstream parent
 '
 
-test_expect_success 'setup commit on master and other fetch' '
+test_expect_success 'setup commit on main and other fetch' '
 	test_commit one &&
-	git push upstream master &&
+	git push upstream main &&
 	git checkout -b other &&
 	test_commit two &&
 	git push upstream other
@@ -43,47 +46,47 @@ test_expect_success 'setup commit on master and other fetch' '
 # tests for fetch --set-upstream
 
 test_expect_success 'fetch --set-upstream does not set upstream w/o branch' '
-	clear_config master other &&
-	git checkout master &&
+	clear_config main other &&
+	git checkout main &&
 	git fetch --set-upstream upstream &&
-	check_config_missing master &&
+	check_config_missing main &&
 	check_config_missing other
 '
 
-test_expect_success 'fetch --set-upstream upstream master sets branch master but not other' '
-	clear_config master other &&
-	git fetch --set-upstream upstream master &&
-	check_config master upstream refs/heads/master &&
+test_expect_success 'fetch --set-upstream upstream main sets branch main but not other' '
+	clear_config main other &&
+	git fetch --set-upstream upstream main &&
+	check_config main upstream refs/heads/main &&
 	check_config_missing other
 '
 
 test_expect_success 'fetch --set-upstream upstream other sets branch other' '
-	clear_config master other &&
+	clear_config main other &&
 	git fetch --set-upstream upstream other &&
-	check_config master upstream refs/heads/other &&
+	check_config main upstream refs/heads/other &&
 	check_config_missing other
 '
 
-test_expect_success 'fetch --set-upstream master:other does not set the branch other2' '
+test_expect_success 'fetch --set-upstream main:other does not set the branch other2' '
 	clear_config other2 &&
-	git fetch --set-upstream upstream master:other2 &&
+	git fetch --set-upstream upstream main:other2 &&
 	check_config_missing other2
 '
 
 test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com fails with invalid url' '
-	# master explicitly not cleared, we check that it is not touched from previous value
+	# main explicitly not cleared, we check that it is not touched from previous value
 	clear_config other other2 &&
 	test_must_fail git fetch --set-upstream http://nosuchdomain.example.com &&
-	check_config master upstream refs/heads/other &&
+	check_config main upstream refs/heads/other &&
 	check_config_missing other &&
 	check_config_missing other2
 '
 
 test_expect_success 'fetch --set-upstream with valid URL sets upstream to URL' '
 	clear_config other other2 &&
-	url="file://'"$PWD"'" &&
+	url="file://$PWD" &&
 	git fetch --set-upstream "$url" &&
-	check_config master "$url" HEAD &&
+	check_config main "$url" HEAD &&
 	check_config_missing other &&
 	check_config_missing other2
 '
@@ -96,81 +99,81 @@ test_expect_success 'setup bare parent pull' '
 	git remote add upstream parent
 '
 
-test_expect_success 'setup commit on master and other pull' '
+test_expect_success 'setup commit on main and other pull' '
 	test_commit three &&
-	git push --tags upstream master &&
+	git push --tags upstream main &&
 	test_commit four &&
 	git push upstream other
 '
 
-test_expect_success 'pull --set-upstream upstream master sets branch master but not other' '
-	clear_config master other &&
-	git pull --set-upstream upstream master &&
-	check_config master upstream refs/heads/master &&
+test_expect_success 'pull --set-upstream upstream main sets branch main but not other' '
+	clear_config main other &&
+	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 master:other2 does not set the branch other2' '
+test_expect_success 'pull --set-upstream main:other2 does not set the branch other2' '
 	clear_config other2 &&
-	git pull --set-upstream upstream master:other2 &&
+	git pull --no-rebase --set-upstream upstream main:other2 &&
 	check_config_missing other2
 '
 
-test_expect_success 'pull --set-upstream upstream other sets branch master' '
-	clear_config master other &&
-	git pull --set-upstream upstream other &&
-	check_config master upstream refs/heads/other &&
+test_expect_success 'pull --set-upstream upstream other sets branch main' '
+	clear_config main 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
 '
 
 test_expect_success 'pull --set-upstream http://nosuchdomain.example.com fails with invalid url' '
-	# master explicitly not cleared, we check that it is not touched from previous value
+	# main explicitly not cleared, we check that it is not touched from previous value
 	clear_config other other2 three &&
 	test_must_fail git pull --set-upstream http://nosuchdomain.example.com &&
-	check_config master upstream refs/heads/other &&
+	check_config main upstream refs/heads/other &&
 	check_config_missing other &&
 	check_config_missing other2 &&
 	check_config_missing three
 '
 
 test_expect_success 'pull --set-upstream upstream HEAD sets branch HEAD' '
-	clear_config master other &&
-	git pull --set-upstream upstream HEAD &&
-	check_config master upstream HEAD &&
+	clear_config main other &&
+	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 master three &&
-	git pull --set-upstream upstream master three &&
-	check_config_missing master &&
+	clear_config main three &&
+	git pull --no-rebase --set-upstream upstream main three &&
+	check_config_missing main &&
 	check_config_missing three
 '
 
 test_expect_success 'pull --set-upstream with valid URL sets upstream to URL' '
-	clear_config master other other2 &&
-	git checkout master &&
-	url="file://'"$PWD"'" &&
+	clear_config main other other2 &&
+	git checkout main &&
+	url="file://$PWD" &&
 	git pull --set-upstream "$url" &&
-	check_config master "$url" HEAD &&
+	check_config main "$url" HEAD &&
 	check_config_missing other &&
 	check_config_missing other2
 '
 
 test_expect_success 'pull --set-upstream with valid URL and branch sets branch' '
-	clear_config master other other2 &&
-	git checkout master &&
-	url="file://'"$PWD"'" &&
-	git pull --set-upstream "$url" master &&
-	check_config master "$url" refs/heads/master &&
+	clear_config main other other2 &&
+	git checkout main &&
+	url="file://$PWD" &&
+	git pull --set-upstream "$url" main &&
+	check_config main "$url" refs/heads/main &&
 	check_config_missing other &&
 	check_config_missing other2
 '
diff --git a/t/t5554-noop-fetch-negotiator.sh b/t/t5554-noop-fetch-negotiator.sh
new file mode 100755
index 0000000000..2ac7b5859e
--- /dev/null
+++ b/t/t5554-noop-fetch-negotiator.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+test_description='test noop fetch negotiator'
+. ./test-lib.sh
+
+test_expect_success 'noop negotiator does not emit any "have"' '
+	rm -f trace &&
+
+	test_create_repo server &&
+	test_commit -C server to_fetch &&
+
+	test_create_repo client &&
+	test_commit -C client we_have &&
+
+	test_config -C client fetch.negotiationalgorithm noop &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "$(pwd)/server" &&
+
+	! grep "fetch> have" trace &&
+	grep "fetch> done" trace
+'
+
+test_done
diff --git a/t/t5560-http-backend-noserver.sh b/t/t5560-http-backend-noserver.sh
index 9fafcf1945..d30cf4f5b8 100755
--- a/t/t5560-http-backend-noserver.sh
+++ b/t/t5560-http-backend-noserver.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test git-http-backend-noserver'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 HTTPD_DOCUMENT_ROOT_PATH="$TRASH_DIRECTORY"
diff --git a/t/t5561-http-backend.sh b/t/t5561-http-backend.sh
index 6eb0294978..9c57d84315 100755
--- a/t/t5561-http-backend.sh
+++ b/t/t5561-http-backend.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test git-http-backend'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 
@@ -39,9 +42,9 @@ POST() {
 
 grep '^[^#]' >exp <<EOF
 
-###  refs/heads/master
+###  refs/heads/main
 ###
-GET  /smart/repo.git/refs/heads/master HTTP/1.1 404 -
+GET  /smart/repo.git/refs/heads/main HTTP/1.1 404 -
 
 ###  getanyfile default
 ###
diff --git a/t/t5562-http-backend-content-length.sh b/t/t5562-http-backend-content-length.sh
index f0f425b2cf..05a58069b0 100755
--- a/t/t5562-http-backend-content-length.sh
+++ b/t/t5562-http-backend-content-length.sh
@@ -53,15 +53,20 @@ test_expect_success 'setup' '
 	test_commit c1 &&
 	hash_head=$(git rev-parse HEAD) &&
 	hash_prev=$(git rev-parse HEAD~1) &&
-	printf "want %s" "$hash_head" | packetize >fetch_body &&
-	printf 0000 >>fetch_body &&
-	printf "have %s" "$hash_prev" | packetize >>fetch_body &&
-	printf done | packetize >>fetch_body &&
+	{
+		packetize "want $hash_head" &&
+		printf 0000 &&
+		packetize "have $hash_prev" &&
+		packetize "done"
+	} >fetch_body &&
 	test_copy_bytes 10 <fetch_body >fetch_body.trunc &&
 	hash_next=$(git commit-tree -p HEAD -m next HEAD^{tree}) &&
-	printf "%s %s refs/heads/newbranch\\0report-status\\n" "$_z40" "$hash_next" | packetize >push_body &&
-	printf 0000 >>push_body &&
-	echo "$hash_next" | git pack-objects --stdout >>push_body &&
+	{
+		printf "%s %s refs/heads/newbranch\\0report-status object-format=%s\\n" \
+			"$ZERO_OID" "$hash_next" "$(test_oid algo)" | packetize_raw
+		printf 0000 &&
+		echo "$hash_next" | git pack-objects --stdout
+	} >push_body &&
 	test_copy_bytes 10 <push_body >push_body.trunc &&
 	: >empty_body
 '
diff --git a/t/t556x_common b/t/t556x_common
index 359fcfe32b..670fb89477 100755
--- a/t/t556x_common
+++ b/t/t556x_common
@@ -22,7 +22,7 @@ test_expect_success 'setup repository' '
 	 : >objects/info/http-alternates
 	) &&
 	git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	git push public master:master &&
+	git push public main:main &&
 
 	(cd "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
 	 git repack -a -d
@@ -31,7 +31,7 @@ test_expect_success 'setup repository' '
 	echo other >file &&
 	git add file &&
 	git commit -m two &&
-	git push public master:master &&
+	git push public main:main &&
 
 	LOOSE_URL=$(find_file objects/??) &&
 	PACK_URL=$(find_file objects/pack/*.pack) &&
@@ -51,8 +51,8 @@ get_static_files() {
 
 SMART=smart
 GIT_HTTP_EXPORT_ALL=1 && export GIT_HTTP_EXPORT_ALL
-test_expect_success 'direct refs/heads/master not found' '
-	GET refs/heads/master "404 Not Found"
+test_expect_success 'direct refs/heads/main not found' '
+	GET refs/heads/main "404 Not Found"
 '
 test_expect_success 'static file is ok' '
 	get_static_files "200 OK"
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index 34487bbb8c..b87ca06a58 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test fetching over git protocol'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-git-daemon.sh
@@ -26,7 +29,7 @@ test_expect_success 'create git-accessible bare repository' '
 	 : >git-daemon-export-ok
 	) &&
 	git remote add public "$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo.git" &&
-	git push public master:master
+	git push public main:main
 '
 
 test_expect_success 'clone git repository' '
@@ -55,12 +58,12 @@ test_expect_success 'no-op fetch without "-v" is quiet' '
 '
 
 test_expect_success 'remote detects correct HEAD' '
-	git push public master:other &&
+	git push public main:other &&
 	(cd clone &&
 	 git remote set-head -d origin &&
 	 git remote set-head -a origin &&
 	 git symbolic-ref refs/remotes/origin/HEAD > output &&
-	 echo refs/remotes/origin/master > expect &&
+	 echo refs/remotes/origin/main > expect &&
 	 test_cmp expect output
 	)
 '
@@ -103,6 +106,11 @@ test_expect_success 'fetch notices corrupt idx' '
 	)
 '
 
+test_expect_success 'client refuses to ask for repo with newline' '
+	test_must_fail git clone "$GIT_DAEMON_URL/repo$LF.git" dst 2>stderr &&
+	test_i18ngrep newline.is.forbidden stderr
+'
+
 test_remote_error()
 {
 	do_export=YesPlease
@@ -147,18 +155,18 @@ test_remote_error()
 }
 
 msg="access denied or repository not exported"
-test_expect_success 'clone non-existent' "test_remote_error    '$msg' clone nowhere.git    "
-test_expect_success 'push disabled'      "test_remote_error    '$msg' push  repo.git master"
-test_expect_success 'read access denied' "test_remote_error -x '$msg' fetch repo.git       "
-test_expect_success 'not exported'       "test_remote_error -n '$msg' fetch repo.git       "
+test_expect_success 'clone non-existent' "test_remote_error    '$msg' clone nowhere.git"
+test_expect_success 'push disabled'      "test_remote_error    '$msg' push  repo.git main"
+test_expect_success 'read access denied' "test_remote_error -x '$msg' fetch repo.git"
+test_expect_success 'not exported'       "test_remote_error -n '$msg' fetch repo.git"
 
 stop_git_daemon
 start_git_daemon --informative-errors
 
-test_expect_success 'clone non-existent' "test_remote_error    'no such repository'      clone nowhere.git    "
-test_expect_success 'push disabled'      "test_remote_error    'service not enabled'     push  repo.git master"
-test_expect_success 'read access denied' "test_remote_error -x 'no such repository'      fetch repo.git       "
-test_expect_success 'not exported'       "test_remote_error -n 'repository not exported' fetch repo.git       "
+test_expect_success 'clone non-existent' "test_remote_error    'no such repository'      clone nowhere.git"
+test_expect_success 'push disabled'      "test_remote_error    'service not enabled'     push  repo.git main"
+test_expect_success 'read access denied' "test_remote_error -x 'no such repository'      fetch repo.git"
+test_expect_success 'not exported'       "test_remote_error -n 'repository not exported' fetch repo.git"
 
 stop_git_daemon
 start_git_daemon --interpolated-path="$GIT_DAEMON_DOCUMENT_ROOT_PATH/%H%D"
@@ -186,16 +194,16 @@ 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 &&
 	depacketize <output >output.raw &&
 
-	# just pick out the value of master, which avoids any protocol
+	# just pick out the value of main, which avoids any protocol
 	# particulars
-	perl -lne "print \$1 if m{^(\\S+) refs/heads/master}" <output.raw >actual &&
-	git -C "$repo" rev-parse master >expect &&
+	perl -lne "print \$1 if m{^(\\S+) refs/heads/main}" <output.raw >actual &&
+	git -C "$repo" rev-parse main >expect &&
 	test_cmp expect actual
 '
 
diff --git a/t/t5571-pre-push-hook.sh b/t/t5571-pre-push-hook.sh
index ac53d63869..ad8d5804f7 100755
--- a/t/t5571-pre-push-hook.sh
+++ b/t/t5571-pre-push-hook.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='check pre-push hooks'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Setup hook that always succeeds
@@ -48,11 +51,11 @@ EOF
 cat >expected <<EOF
 parent1
 repo1
-refs/heads/master $COMMIT2 refs/heads/foreign $COMMIT1
+refs/heads/main $COMMIT2 refs/heads/foreign $COMMIT1
 EOF
 
 test_expect_success 'push with hook' '
-	git push parent1 master:foreign &&
+	git push parent1 main:foreign &&
 	diff expected actual
 '
 
diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
index f916729a12..4f92a116e1 100755
--- a/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@ -13,34 +13,41 @@ reset_branch_to_HEAD () {
 
 git_pull () {
 	reset_branch_to_HEAD "$1" &&
-	git pull
+	may_only_be_test_must_fail "$2" &&
+	$2 git pull
 }
 
 # pulls without conflicts
-test_submodule_switch "git_pull"
+test_submodule_switch_func "git_pull"
 
 git_pull_ff () {
 	reset_branch_to_HEAD "$1" &&
-	git pull --ff
+	may_only_be_test_must_fail "$2" &&
+	$2 git pull --ff
 }
 
-test_submodule_switch "git_pull_ff"
+test_submodule_switch_func "git_pull_ff"
 
 git_pull_ff_only () {
 	reset_branch_to_HEAD "$1" &&
-	git pull --ff-only
+	may_only_be_test_must_fail "$2" &&
+	$2 git pull --ff-only
 }
 
-test_submodule_switch "git_pull_ff_only"
+test_submodule_switch_func "git_pull_ff_only"
 
 git_pull_noff () {
 	reset_branch_to_HEAD "$1" &&
-	git pull --no-ff
+	may_only_be_test_must_fail "$2" &&
+	$2 git pull --no-ff
 }
 
-KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
-KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
-test_submodule_switch "git_pull_noff"
+if test "$GIT_TEST_MERGE_ALGORITHM" != ort
+then
+	KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
+	KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
+fi
+test_submodule_switch_func "git_pull_noff"
 
 test_expect_success 'pull --recurse-submodule setup' '
 	test_create_repo child &&
@@ -97,7 +104,12 @@ test_expect_success " --[no-]recurse-submodule and submodule.recurse" '
 	test_path_is_file super/sub/merge_strategy_4.t
 '
 
-test_expect_success 'recursive rebasing pull' '
+test_expect_success 'pull --rebase --recurse-submodules (remote superproject submodule changes, local submodule changes)' '
+	# This tests the following scenario :
+	# - local submodule has new commits
+	# - local superproject does not have new commits
+	# - upstream superproject has new commits that change the submodule pointer
+
 	# change upstream
 	test_commit -C child rebase_strategy &&
 	git -C parent submodule update --remote &&
@@ -112,7 +124,10 @@ test_expect_success 'recursive rebasing pull' '
 	test_path_is_file super/sub/local_stuff.t
 '
 
-test_expect_success 'pull rebase recursing fails with conflicts' '
+test_expect_success 'pull --rebase --recurse-submodules fails if both sides record submodule changes' '
+	# This tests the following scenario :
+	# - local superproject has new commits that change the submodule pointer
+	# - upstream superproject has new commits that change the submodule pointer
 
 	# local changes in submodule recorded in superproject:
 	test_commit -C super/sub local_stuff_2 &&
@@ -132,6 +147,50 @@ test_expect_success 'pull rebase recursing fails with conflicts' '
 	test_i18ngrep "locally recorded submodule modifications" err
 '
 
+test_expect_success 'pull --rebase --recurse-submodules (no submodule changes, no fork-point)' '
+	# This tests the following scenario :
+	# - local submodule does not have new commits
+	# - local superproject has new commits that *do not* change the submodule pointer
+	# - upstream superproject has new commits that *do not* change the submodule pointer
+	# - local superproject branch has no fork-point with its remote-tracking counter-part
+
+	# create upstream superproject
+	test_create_repo submodule &&
+	test_commit -C submodule first_in_sub &&
+
+	test_create_repo superprojet &&
+	test_commit -C superprojet first_in_super &&
+	git -C superprojet submodule add ../submodule &&
+	git -C superprojet commit -m "add submodule" &&
+	test_commit -C superprojet third_in_super &&
+
+	# clone superproject
+	git clone --recurse-submodules superprojet superclone &&
+
+	# add commits upstream
+	test_commit -C superprojet fourth_in_super &&
+
+	# create topic branch in clone, not based on any remote-tracking branch
+	git -C superclone checkout -b feat HEAD~1 &&
+	test_commit -C superclone first_on_feat &&
+	git -C superclone pull --rebase --recurse-submodules origin HEAD
+'
+
+# NOTE:
+#
+# This test is particular because there is only a single commit in the upstream superproject
+# 'parent' (which adds the submodule 'a-submodule'). The clone of the superproject
+# ('child') hard-resets its branch to a new root commit with the same tree as the one
+# from the upstream superproject, so that its branch has no merge-base with its
+# remote-tracking counterpart, and then calls 'git pull --recurse-submodules --rebase'.
+# The result is that the local branch is reset to the remote-tracking branch (as it was
+# originally before the hard-reset).
+
+# The only commit in the range generated by 'submodule.c::submodule_touches_in_range' and
+# passed to 'submodule.c::collect_changed_submodules' is the new (regenerated) initial commit,
+# which adds the submodule.
+# However, 'submodule_touches_in_range' does not error (even though this commit adds the submodule)
+# because 'combine-diff.c::diff_tree_combined' returns early, as the initial commit has no parents.
 test_expect_success 'branch has no merge base with remote-tracking counterpart' '
 	rm -rf parent child &&
 
@@ -144,8 +203,8 @@ test_expect_success 'branch has no merge base with remote-tracking counterpart'
 
 	git clone parent child &&
 
-	# Reset master so that it has no merge base with
-	# refs/remotes/origin/master.
+	# Reset the current branch so that it has no merge base with
+	# the remote-tracking branch.
 	OTHER=$(git -C child commit-tree -m bar \
 		$(git -C child rev-parse HEAD^{tree})) &&
 	git -C child reset --hard "$OTHER" &&
diff --git a/t/t5573-pull-verify-signatures.sh b/t/t5573-pull-verify-signatures.sh
index 3e9876e197..a53dd8550d 100755
--- a/t/t5573-pull-verify-signatures.sh
+++ b/t/t5573-pull-verify-signatures.sh
@@ -60,6 +60,27 @@ test_expect_success GPG 'pull commit with untrusted signature with --verify-sign
 	test_i18ngrep "has an untrusted GPG signature" pullerror
 '
 
+test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=ultimate' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config gpg.minTrustLevel ultimate &&
+	test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror &&
+	test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=marginal' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config gpg.minTrustLevel marginal &&
+	test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror &&
+	test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures and minTrustLevel=undefined' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config gpg.minTrustLevel undefined &&
+	git pull --ff-only --verify-signatures untrusted >pulloutput &&
+	test_i18ngrep "has a good GPG signature" pulloutput
+'
+
 test_expect_success GPG 'pull signed commit with --verify-signatures' '
 	test_when_finished "git reset --hard && git checkout initial" &&
 	git pull --verify-signatures signed >pulloutput &&
@@ -79,10 +100,53 @@ test_expect_success GPG 'pull commit with bad signature with --no-verify-signatu
 '
 
 test_expect_success GPG 'pull unsigned commit into unborn branch' '
+	test_when_finished "rm -rf empty-repo" &&
 	git init empty-repo &&
 	test_must_fail \
 		git -C empty-repo pull --verify-signatures ..  2>pullerror &&
 	test_i18ngrep "does not have a GPG signature" pullerror
 '
 
+test_expect_success GPG 'pull commit into unborn branch with bad signature and --verify-signatures' '
+	test_when_finished "rm -rf empty-repo" &&
+	git init empty-repo &&
+	test_must_fail \
+		git -C empty-repo pull --ff-only --verify-signatures ../bad 2>pullerror &&
+	test_i18ngrep "has a bad GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures' '
+	test_when_finished "rm -rf empty-repo" &&
+	git init empty-repo &&
+	test_must_fail \
+		git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror &&
+	test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=ultimate' '
+	test_when_finished "rm -rf empty-repo" &&
+	git init empty-repo &&
+	test_config_global gpg.minTrustLevel ultimate &&
+	test_must_fail \
+		git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror &&
+	test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=marginal' '
+	test_when_finished "rm -rf empty-repo" &&
+	git init empty-repo &&
+	test_config_global gpg.minTrustLevel marginal &&
+	test_must_fail \
+		git -C empty-repo pull --ff-only --verify-signatures ../untrusted 2>pullerror &&
+	test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit into unborn branch with untrusted signature and --verify-signatures and minTrustLevel=undefined' '
+	test_when_finished "rm -rf empty-repo" &&
+	git init empty-repo &&
+	test_config_global gpg.minTrustLevel undefined &&
+	git -C empty-repo pull --ff-only --verify-signatures ../untrusted >pulloutput &&
+	test_i18ngrep "has a good GPG signature" pulloutput
+'
+
 test_done
diff --git a/t/t5580-clone-push-unc.sh b/t/t5580-unc-paths.sh
index b3c8a92450..cd803ae8bf 100755
--- a/t/t5580-clone-push-unc.sh
+++ b/t/t5580-unc-paths.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='various Windows-only path tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if test_have_prereq CYGWIN
@@ -40,11 +43,23 @@ test_expect_success clone '
 	git clone "file://$UNCPATH" clone
 '
 
+test_expect_success 'clone without file://' '
+	git clone "$UNCPATH" clone-without-file
+'
+
 test_expect_success 'clone with backslashed path' '
 	BACKSLASHED="$(echo "$UNCPATH" | tr / \\\\)" &&
 	git clone "$BACKSLASHED" backslashed
 '
 
+test_expect_success fetch '
+	git init to-fetch &&
+	(
+		cd to-fetch &&
+		git fetch "$UNCPATH" main
+	)
+'
+
 test_expect_success push '
 	(
 		cd clone &&
@@ -58,7 +73,7 @@ test_expect_success push '
 
 test_expect_success MINGW 'remote nick cannot contain backslashes' '
 	BACKSLASHED="$(winpwd | tr / \\\\)" &&
-	git ls-remote "$BACKSLASHED" >out 2>err &&
+	git ls-remote "$BACKSLASHED" 2>err &&
 	test_i18ngrep ! "unable to access" err
 '
 
diff --git a/t/t5581-http-curl-verbose.sh b/t/t5581-http-curl-verbose.sh
index 5129b0724f..cded79c16b 100755
--- a/t/t5581-http-curl-verbose.sh
+++ b/t/t5581-http-curl-verbose.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test GIT_CURL_VERBOSE'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
@@ -13,14 +16,14 @@ test_expect_success 'setup repository' '
 	git add file &&
 	git commit -m one &&
 	git remote add public "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
-	git push public master:master
+	git push public main:main
 '
 
 test_expect_success 'failure in git-upload-pack is shown' '
 	test_might_fail env GIT_CURL_VERBOSE=1 \
 		git clone "$HTTPD_URL/error_git_upload_pack/smart/repo.git" \
 		2>curl_log &&
-	grep "< HTTP/1.1 500 Intentional Breakage" curl_log
+	grep "<= Recv header: HTTP/1.1 500 Intentional Breakage" curl_log
 '
 
 test_done
diff --git a/t/t5582-fetch-negative-refspec.sh b/t/t5582-fetch-negative-refspec.sh
new file mode 100755
index 0000000000..7a80e47c2b
--- /dev/null
+++ b/t/t5582-fetch-negative-refspec.sh
@@ -0,0 +1,285 @@
+#!/bin/sh
+# Copyright (c) 2020, Jacob Keller.
+
+test_description='"git fetch" with negative refspecs.
+
+'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success setup '
+	echo >file original &&
+	git add file &&
+	git commit -a -m original
+'
+
+test_expect_success "clone and setup child repos" '
+	git clone . one &&
+	(
+		cd one &&
+		echo >file updated by one &&
+		git commit -a -m "updated by one" &&
+		git switch -c alternate &&
+		echo >file updated again by one &&
+		git commit -a -m "updated by one again" &&
+		git switch main
+	) &&
+	git clone . two &&
+	(
+		cd two &&
+		git config branch.main.remote one &&
+		git config remote.one.url ../one/.git/ &&
+		git config remote.one.fetch +refs/heads/*:refs/remotes/one/* &&
+		git config --add remote.one.fetch ^refs/heads/alternate
+	) &&
+	git clone . three
+'
+
+test_expect_success "fetch one" '
+	echo >file updated by origin &&
+	git commit -a -m "updated by origin" &&
+	(
+		cd two &&
+		test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
+		git fetch one &&
+		test_must_fail git rev-parse --verify refs/remotes/one/alternate &&
+		git rev-parse --verify refs/remotes/one/main &&
+		mine=$(git rev-parse refs/remotes/one/main) &&
+		his=$(cd ../one && git rev-parse refs/heads/main) &&
+		test "z$mine" = "z$his"
+	)
+'
+
+test_expect_success "fetch with negative refspec on commandline" '
+	echo >file updated by origin again &&
+	git commit -a -m "updated by origin again" &&
+	(
+		cd three &&
+		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
+		echo $alternate_in_one >expect &&
+		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/main &&
+		cut -f -1 .git/FETCH_HEAD >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success "fetch with negative sha1 refspec fails" '
+	echo >file updated by origin yet again &&
+	git commit -a -m "updated by origin yet again" &&
+	(
+		cd three &&
+		main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
+		test_must_fail git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^$main_in_one
+	)
+'
+
+test_expect_success "fetch with negative pattern refspec" '
+	echo >file updated by origin once more &&
+	git commit -a -m "updated by origin once more" &&
+	(
+		cd three &&
+		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
+		echo $alternate_in_one >expect &&
+		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^refs/heads/m* &&
+		cut -f -1 .git/FETCH_HEAD >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success "fetch with negative pattern refspec does not expand prefix" '
+	echo >file updated by origin another time &&
+	git commit -a -m "updated by origin another time" &&
+	(
+		cd three &&
+		alternate_in_one=$(cd ../one && git rev-parse refs/heads/alternate) &&
+		main_in_one=$(cd ../one && git rev-parse refs/heads/main) &&
+		echo $alternate_in_one >expect &&
+		echo $main_in_one >>expect &&
+		git fetch ../one/.git refs/heads/*:refs/remotes/one/* ^main &&
+		cut -f -1 .git/FETCH_HEAD >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success "fetch with negative refspec avoids duplicate conflict" '
+	(
+		cd one &&
+		git branch dups/a &&
+		git branch dups/b &&
+		git branch dups/c &&
+		git branch other/a &&
+		git rev-parse --verify refs/heads/other/a >../expect &&
+		git rev-parse --verify refs/heads/dups/b >>../expect &&
+		git rev-parse --verify refs/heads/dups/c >>../expect
+	) &&
+	(
+		cd three &&
+		git fetch ../one/.git ^refs/heads/dups/a refs/heads/dups/*:refs/dups/* refs/heads/other/a:refs/dups/a &&
+		git rev-parse --verify refs/dups/a >../actual &&
+		git rev-parse --verify refs/dups/b >>../actual &&
+		git rev-parse --verify refs/dups/c >>../actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success "push --prune with negative refspec" '
+	(
+		cd two &&
+		git branch prune/a &&
+		git branch prune/b &&
+		git branch prune/c &&
+		git push ../three refs/heads/prune/* &&
+		git branch -d prune/a &&
+		git branch -d prune/b &&
+		git push --prune ../three refs/heads/prune/* ^refs/heads/prune/b
+	) &&
+	(
+		cd three &&
+		test_write_lines b c >expect &&
+		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/prune/ >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success "push --prune with negative refspec apply to the destination" '
+	(
+		cd two &&
+		git branch ours/a &&
+		git branch ours/b &&
+		git branch ours/c &&
+		git push ../three refs/heads/ours/*:refs/heads/theirs/* &&
+		git branch -d ours/a &&
+		git branch -d ours/b &&
+		git push --prune ../three refs/heads/ours/*:refs/heads/theirs/* ^refs/heads/theirs/b
+	) &&
+	(
+		cd three &&
+		test_write_lines b c >expect &&
+		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/theirs/ >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success "fetch --prune with negative refspec" '
+	(
+		cd two &&
+		git branch fetch/a &&
+		git branch fetch/b &&
+		git branch fetch/c
+	) &&
+	(
+		cd three &&
+		git fetch ../two/.git refs/heads/fetch/*:refs/heads/copied/*
+	) &&
+	(
+		cd two &&
+		git branch -d fetch/a &&
+		git branch -d fetch/b
+	) &&
+	(
+		cd three &&
+		test_write_lines b c >expect &&
+		git fetch -v ../two/.git --prune refs/heads/fetch/*:refs/heads/copied/* ^refs/heads/fetch/b &&
+		git for-each-ref --format="%(refname:lstrip=3)" refs/heads/copied/ >actual &&
+		test_cmp expect actual
+	)
+'
+
+test_expect_success "push with matching : and negative refspec" '
+	# Manually handle cleanup, since test_config is not
+	# prepared to take arbitrary options like --add
+	test_when_finished "test_unconfig -C two remote.one.push" &&
+
+	# For convenience, we use "master" to refer to the name of
+	# the branch created by default in the following.
+	#
+	# Repositories two and one have branches other than "master"
+	# but they have no overlap---"master" is the only one that
+	# is shared between them.  And the master branch at two is
+	# behind the master branch at one by one commit.
+	git -C two config --add remote.one.push : &&
+
+	# A matching push tries to update master, fails due to non-ff
+	test_must_fail git -C two push one &&
+
+	# "master" may actually not be "master"---find it out.
+	current=$(git symbolic-ref HEAD) &&
+
+	# If master is in negative refspec, then the command will not attempt
+	# to push and succeed.
+	git -C two config --add remote.one.push "^$current" &&
+
+	# With "master" excluded, this push is a no-op.  Nothing gets
+	# pushed and it succeeds.
+	git -C two push -v one
+'
+
+test_expect_success "push with matching +: and negative refspec" '
+	test_when_finished "test_unconfig -C two remote.one.push" &&
+
+	# The same set-up as above, whose side-effect was a no-op.
+	git -C two config --add remote.one.push +: &&
+
+	# The push refuses to update the "master" branch that is checked
+	# out in the "one" repository, even when it is forced with +:
+	test_must_fail git -C two push one &&
+
+	# "master" may actually not be "master"---find it out.
+	current=$(git symbolic-ref HEAD) &&
+
+	# If master is in negative refspec, then the command will not attempt
+	# to push and succeed
+	git -C two config --add remote.one.push "^$current" &&
+
+	# With "master" excluded, this push is a no-op.  Nothing gets
+	# pushed and it succeeds.
+	git -C two push -v one
+'
+
+test_expect_success '--prefetch correctly modifies refspecs' '
+	git -C one config --unset-all remote.origin.fetch &&
+	git -C one config --add remote.origin.fetch ^refs/heads/bogus/ignore &&
+	git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
+	git -C one config --add remote.origin.fetch "refs/heads/bogus/*:bogus/*" &&
+
+	git tag -a -m never never-fetch-tag HEAD &&
+
+	git branch bogus/fetched HEAD~1 &&
+	git branch bogus/ignore HEAD &&
+
+	git -C one fetch --prefetch --no-tags &&
+	test_must_fail git -C one rev-parse never-fetch-tag &&
+	git -C one rev-parse refs/prefetch/bogus/fetched &&
+	test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore &&
+
+	# correctly handle when refspec set becomes empty
+	# after removing the refs/tags/* refspec.
+	git -C one config --unset-all remote.origin.fetch &&
+	git -C one config --add remote.origin.fetch "refs/tags/*:refs/tags/*" &&
+
+	git -C one fetch --prefetch --no-tags &&
+	test_must_fail git -C one rev-parse never-fetch-tag &&
+
+	# The refspec for refs that are not fully qualified
+	# are filtered multiple times.
+	git -C one rev-parse refs/prefetch/bogus/fetched &&
+	test_must_fail git -C one rev-parse refs/prefetch/bogus/ignore
+'
+
+test_expect_success '--prefetch succeeds when refspec becomes empty' '
+	git checkout bogus/fetched &&
+	test_commit extra &&
+
+	git -C one config --unset-all remote.origin.fetch &&
+	git -C one config --unset branch.main.remote &&
+	git -C one config remote.origin.fetch "+refs/tags/extra" &&
+	git -C one config remote.origin.skipfetchall true &&
+	git -C one config remote.origin.tagopt "--no-tags" &&
+
+	git -C one fetch --prefetch
+'
+
+test_done
diff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh
index 4a1a912e03..5bf10261d3 100755
--- a/t/t5600-clone-fail-cleanup.sh
+++ b/t/t5600-clone-fail-cleanup.sh
@@ -97,4 +97,11 @@ test_expect_success 'failed clone into empty leaves directory (separate, wt)' '
 	test_dir_is_empty empty-wt
 '
 
+test_expect_success 'transport failure cleans up directory' '
+	test_must_fail git clone --no-local \
+		-u "f() { git-upload-pack \"\$@\"; return 1; }; f" \
+		foo broken-clone &&
+	test_path_is_missing broken-clone
+'
+
 test_done
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index ad8c41176e..83c24fc97a 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -2,6 +2,9 @@
 
 test_description=clone
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 X=
@@ -37,7 +40,7 @@ test_expect_success 'clone with excess parameters (2)' '
 
 '
 
-test_expect_success C_LOCALE_OUTPUT 'output from clone' '
+test_expect_success 'output from clone' '
 	rm -fr dst &&
 	git clone -n "file://$(pwd)/src" dst >output 2>&1 &&
 	test $(grep Clon output | wc -l) = 1
@@ -217,7 +220,7 @@ test_expect_success 'clone respects global branch.autosetuprebase' '
 		rm -fr dst &&
 		git clone src dst &&
 		cd dst &&
-		actual="z$(git config branch.master.rebase)" &&
+		actual="z$(git config branch.main.rebase)" &&
 		test ztrue = $actual
 	)
 '
@@ -271,7 +274,9 @@ test_expect_success 'fetch from gitfile parent' '
 
 test_expect_success 'clone separate gitdir where target already exists' '
 	rm -rf dst &&
-	test_must_fail git clone --separate-git-dir realgitdir src dst
+	echo foo=bar >>realgitdir/config &&
+	test_must_fail git clone --separate-git-dir realgitdir src dst &&
+	grep foo=bar realgitdir/config
 '
 
 test_expect_success 'clone --reference from original' '
@@ -300,7 +305,8 @@ test_expect_success 'clone from original with relative alternate' '
 test_expect_success 'clone checking out a tag' '
 	git clone --branch=some-tag src dst.tag &&
 	GIT_DIR=src/.git git rev-parse some-tag >expected &&
-	test_cmp expected dst.tag/.git/HEAD &&
+	GIT_DIR=dst.tag/.git git rev-parse HEAD >actual &&
+	test_cmp expected actual &&
 	GIT_DIR=dst.tag/.git git config remote.origin.fetch >fetch.actual &&
 	echo "+refs/heads/*:refs/remotes/origin/*" >fetch.expected &&
 	test_cmp fetch.expected fetch.actual
@@ -589,7 +595,7 @@ test_expect_success 'clone from a repository with two identical branches' '
 
 	(
 		cd src &&
-		git checkout -b another master
+		git checkout -b another main
 	) &&
 	git clone src target-11 &&
 	test "z$( cd target-11 && git symbolic-ref HEAD )" = zrefs/heads/another
@@ -629,16 +635,30 @@ test_expect_success CASE_INSENSITIVE_FS 'colliding file detection' '
 	test_i18ngrep "the following paths have collided" icasefs/warning
 '
 
+test_expect_success 'clone with GIT_DEFAULT_HASH' '
+	(
+		sane_unset GIT_DEFAULT_HASH &&
+		git init --object-format=sha1 test-sha1 &&
+		git init --object-format=sha256 test-sha256
+	) &&
+	test_commit -C test-sha1 foo &&
+	test_commit -C test-sha256 foo &&
+	GIT_DEFAULT_HASH=sha1 git clone test-sha256 test-clone-sha256 &&
+	GIT_DEFAULT_HASH=sha256 git clone test-sha1 test-clone-sha1 &&
+	git -C test-clone-sha1 status &&
+	git -C test-clone-sha256 status
+'
+
 partial_clone_server () {
 	       SERVER="$1" &&
 
 	rm -rf "$SERVER" client &&
 	test_create_repo "$SERVER" &&
 	test_commit -C "$SERVER" one &&
-	HASH1=$(git hash-object "$SERVER/one.t") &&
+	HASH1=$(git -C "$SERVER" hash-object one.t) &&
 	git -C "$SERVER" revert HEAD &&
 	test_commit -C "$SERVER" two &&
-	HASH2=$(git hash-object "$SERVER/two.t") &&
+	HASH2=$(git -C "$SERVER" hash-object two.t) &&
 	test_config -C "$SERVER" uploadpack.allowfilter 1 &&
 	test_config -C "$SERVER" uploadpack.allowanysha1inwant 1
 }
@@ -667,7 +687,8 @@ test_expect_success 'partial clone' '
 
 test_expect_success 'partial clone with -o' '
 	partial_clone_server server &&
-	git clone -o blah --filter=blob:limit=0 "file://$(pwd)/server" client
+	git clone -o blah --filter=blob:limit=0 "file://$(pwd)/server" client &&
+	test_cmp_config -C client "blob:limit=0" --get-all remote.blah.partialclonefilter
 '
 
 test_expect_success 'partial clone: warn if server does not support object filtering' '
@@ -702,7 +723,7 @@ test_expect_success 'batch missing blob request during checkout' '
 	# Ensure that there is only one negotiation by checking that there is
 	# only "done" line sent. ("done" marks the end of negotiation.)
 	GIT_TRACE_PACKET="$(pwd)/trace" git -C client checkout HEAD^ &&
-	grep "git> done" trace >done_lines &&
+	grep "fetch> done" trace >done_lines &&
 	test_line_count = 1 done_lines
 '
 
@@ -739,6 +760,15 @@ test_expect_success 'partial clone using HTTP' '
 	partial_clone "$HTTPD_DOCUMENT_ROOT_PATH/server" "$HTTPD_URL/smart/server"
 '
 
+test_expect_success 'reject cloning shallow repository using HTTP' '
+	test_when_finished "rm -rf repo" &&
+	git clone --bare --no-local --depth=1 src "$HTTPD_DOCUMENT_ROOT_PATH/repo.git" &&
+	test_must_fail git -c protocol.version=2 clone --reject-shallow $HTTPD_URL/smart/repo.git repo 2>err &&
+	test_i18ngrep -e "source repository is shallow, reject to clone." err &&
+
+	git clone --no-reject-shallow $HTTPD_URL/smart/repo.git repo
+'
+
 # DO NOT add non-httpd-specific tests here, because the last part of this
 # test script is only executed when httpd is available and enabled.
 
diff --git a/t/t5604-clone-reference.sh b/t/t5604-clone-reference.sh
index 4894237ab8..24340e6d56 100755
--- a/t/t5604-clone-reference.sh
+++ b/t/t5604-clone-reference.sh
@@ -4,6 +4,9 @@
 #
 
 test_description='test clone --reference'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 base_dir=$(pwd)
@@ -49,7 +52,7 @@ test_expect_success 'existence of info/alternates' '
 '
 
 test_expect_success 'pulling from reference' '
-	git -C C pull ../B master
+	git -C C pull ../B main
 '
 
 test_expect_success 'that reference gets used' '
@@ -70,7 +73,7 @@ test_expect_success 'existence of info/alternates' '
 '
 
 test_expect_success 'pulling from reference' '
-	git -C D pull ../B master
+	git -C D pull ../B main
 '
 
 test_expect_success 'that reference gets used' '
@@ -84,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
@@ -93,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
@@ -136,11 +139,11 @@ test_expect_success 'prepare branched repository' '
 	git clone A J &&
 	(
 		cd J &&
-		git checkout -b other master^ &&
+		git checkout -b other main^ &&
 		echo other >otherfile &&
 		git add otherfile &&
 		git commit -m other &&
-		git checkout master
+		git checkout main
 	)
 '
 
@@ -152,9 +155,9 @@ test_expect_success 'fetch with incomplete alternates' '
 		git remote add J "file://$base_dir/J" &&
 		GIT_TRACE_PACKET=$U.K git fetch J
 	) &&
-	master_object=$(cd A && git for-each-ref --format="%(objectname)" refs/heads/master) &&
+	main_object=$(cd A && git for-each-ref --format="%(objectname)" refs/heads/main) &&
 	test -s "$U.K" &&
-	! grep " want $master_object" "$U.K" &&
+	! grep " want $main_object" "$U.K" &&
 	tag_object=$(cd A && git for-each-ref --format="%(objectname)" refs/tags/HEAD) &&
 	! grep " want $tag_object" "$U.K"
 '
@@ -175,7 +178,7 @@ test_expect_success 'clone using repo pointed at by gitfile as reference' '
 test_expect_success 'clone and dissociate from reference' '
 	git init P &&
 	(
-		cd P &&	test_commit one
+		cd P && test_commit one
 	) &&
 	git clone P Q &&
 	(
@@ -326,15 +329,16 @@ test_expect_success SYMLINKS 'clone repo with symlinked or unknown files at obje
 	for raw in $(ls T*.raw)
 	do
 		sed -e "s!/../!/Y/!; s![0-9a-f]\{38,\}!Z!" -e "/commit-graph/d" \
-		    -e "/multi-pack-index/d" <$raw >$raw.de-sha || return 1
+		    -e "/multi-pack-index/d" -e "/rev/d" <$raw >$raw.de-sha-1 &&
+		sort $raw.de-sha-1 >$raw.de-sha || return 1
 	done &&
 
 	cat >expected-files <<-EOF &&
 	./Y/Z
 	./Y/Z
+	./Y/Z
 	./a-loose-dir/Z
 	./an-object
-	./Y/Z
 	./info/packs
 	./pack/pack-Z.idx
 	./pack/pack-Z.pack
diff --git a/t/t5605-clone-local.sh b/t/t5605-clone-local.sh
index af23419ebf..7d63365f93 100755
--- a/t/t5605-clone-local.sh
+++ b/t/t5605-clone-local.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test local clone'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 repo_is_hardlinked() {
@@ -15,7 +18,7 @@ test_expect_success 'preparing origin repository' '
 	test "$(cd a.git && git config --bool core.bare)" = true &&
 	test "$(cd x && git config --bool core.bare)" = true &&
 	git bundle create b1.bundle --all &&
-	git bundle create b2.bundle master &&
+	git bundle create b2.bundle main &&
 	mkdir dir &&
 	cp b1.bundle dir/b3 &&
 	cp b1.bundle b4
@@ -84,7 +87,7 @@ test_expect_success 'bundle clone with nonexistent HEAD' '
 	git clone b2.bundle b2 &&
 	(cd b2 &&
 	git fetch &&
-	test_must_fail git rev-parse --verify refs/heads/master)
+	test_must_fail git rev-parse --verify refs/heads/main)
 '
 
 test_expect_success 'clone empty repository' '
@@ -98,9 +101,9 @@ test_expect_success 'clone empty repository' '
 	 echo "content" >> foo &&
 	 git add foo &&
 	 git commit -m "Initial commit" &&
-	 git push origin master &&
-	 expected=$(git rev-parse master) &&
-	 actual=$(git --git-dir=../empty/.git rev-parse master) &&
+	 git push origin main &&
+	 expected=$(git rev-parse main) &&
+	 actual=$(git --git-dir=../empty/.git rev-parse main) &&
 	 test $actual = $expected)
 '
 
diff --git a/t/t5606-clone-options.sh b/t/t5606-clone-options.sh
index 9e24ec88e6..3a595c0f82 100755
--- a/t/t5606-clone-options.sh
+++ b/t/t5606-clone-options.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='basic clone options'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -8,14 +11,105 @@ test_expect_success 'setup' '
 	mkdir parent &&
 	(cd parent && git init &&
 	 echo one >file && git add file &&
-	 git commit -m one)
+	 git commit -m one) &&
+	git clone --depth=1 --no-local parent shallow-repo
 
 '
 
 test_expect_success 'clone -o' '
 
 	git clone -o foo parent clone-o &&
-	(cd clone-o && git rev-parse --verify refs/remotes/foo/master)
+	git -C clone-o rev-parse --verify refs/remotes/foo/main
+
+'
+
+test_expect_success 'rejects invalid -o/--origin' '
+
+	test_must_fail git clone -o "bad...name" parent clone-bad-name 2>err &&
+	test_i18ngrep "'\''bad...name'\'' is not a valid remote name" err
+
+'
+
+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_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_expect_success 'reject cloning shallow repository' '
+	test_when_finished "rm -rf repo" &&
+	test_must_fail git clone --reject-shallow shallow-repo out 2>err &&
+	test_i18ngrep -e "source repository is shallow, reject to clone." err &&
+
+	git clone --no-reject-shallow shallow-repo repo
+'
+
+test_expect_success 'reject cloning non-local shallow repository' '
+	test_when_finished "rm -rf repo" &&
+	test_must_fail git clone --reject-shallow --no-local shallow-repo out 2>err &&
+	test_i18ngrep -e "source repository is shallow, reject to clone." err &&
+
+	git clone --no-reject-shallow --no-local shallow-repo repo
+'
+
+test_expect_success 'succeed cloning normal repository' '
+	test_when_finished "rm -rf chilad1 child2 child3 child4 " &&
+	git clone --reject-shallow parent child1 &&
+	git clone --reject-shallow --no-local parent child2 &&
+	git clone --no-reject-shallow parent child3 &&
+	git clone --no-reject-shallow --no-local parent child4
+'
+
+test_expect_success 'uses "origin" for default remote name' '
+
+	git clone parent clone-default-origin &&
+	git -C clone-default-origin rev-parse --verify refs/remotes/origin/main
+
+'
+
+test_expect_success 'prefers --template config over normal config' '
+
+	template="$TRASH_DIRECTORY/template-with-config" &&
+	mkdir "$template" &&
+	git config --file "$template/config" foo.bar from_template &&
+	test_config_global foo.bar from_global &&
+	git clone "--template=$template" parent clone-template-config &&
+	test "$(git -C clone-template-config config --local foo.bar)" = "from_template"
+
+'
+
+test_expect_success 'prefers -c config over --template config' '
+
+	template="$TRASH_DIRECTORY/template-with-ignored-config" &&
+	mkdir "$template" &&
+	git config --file "$template/config" foo.bar from_template &&
+	git clone "--template=$template" -c foo.bar=inline parent clone-template-inline-config &&
+	test "$(git -C clone-template-inline-config config --local foo.bar)" = "inline"
+
+'
+
+test_expect_success 'prefers config "clone.defaultRemoteName" over default' '
+
+	test_config_global clone.defaultRemoteName from_config &&
+	git clone parent clone-config-origin &&
+	git -C clone-config-origin rev-parse --verify refs/remotes/from_config/main
+
+'
+
+test_expect_success 'prefers --origin over -c config' '
+
+	git clone -c clone.defaultRemoteName=inline --origin from_option parent clone-o-and-inline-config &&
+	git -C clone-o-and-inline-config rev-parse --verify refs/remotes/from_option/main
 
 '
 
@@ -35,4 +129,41 @@ test_expect_success 'redirected clone -v does show progress' '
 
 '
 
+test_expect_success 'clone does not segfault with --bare and core.bare=false' '
+	test_config_global core.bare false &&
+	git clone --bare parent clone-bare &&
+	echo true >expect &&
+	git -C clone-bare rev-parse --is-bare-repository >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'chooses correct default initial branch name' '
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=foo init --bare empty &&
+	test_config -C empty lsrefs.unborn advertise &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=up -c protocol.version=2 clone empty whats-up &&
+	test refs/heads/foo = $(git -C whats-up symbolic-ref HEAD) &&
+	test refs/heads/foo = $(git -C whats-up config branch.foo.merge)
+'
+
+test_expect_success 'guesses initial branch name correctly' '
+	git init --initial-branch=guess initial-branch &&
+	test_commit -C initial-branch no-spoilers &&
+	git -C initial-branch branch abc guess &&
+	git clone initial-branch is-it &&
+	test refs/heads/guess = $(git -C is-it symbolic-ref HEAD) &&
+
+	git -c init.defaultBranch=none init --bare no-head &&
+	git -C initial-branch push ../no-head guess abc &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git clone no-head is-it2 &&
+	test_must_fail git -C is-it2 symbolic-ref refs/remotes/origin/HEAD &&
+	git -C no-head update-ref --no-deref HEAD refs/heads/guess &&
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=guess clone no-head is-it3 &&
+	test refs/remotes/origin/guess = \
+		$(git -C is-it3 symbolic-ref refs/remotes/origin/HEAD)
+'
+
 test_done
diff --git a/t/t5607-clone-bundle.sh b/t/t5607-clone-bundle.sh
index b7a3fdf02d..51705aa86a 100755
--- a/t/t5607-clone-bundle.sh
+++ b/t/t5607-clone-bundle.sh
@@ -1,9 +1,16 @@
 #!/bin/sh
 
 test_description='some bundle related tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
+	test_oid_cache <<-EOF &&
+	version sha1:2
+	version sha256:3
+	EOF
 	test_commit initial &&
 	test_tick &&
 	git tag -m tag tag &&
@@ -15,18 +22,28 @@ test_expect_success 'setup' '
 '
 
 test_expect_success '"verify" needs a worktree' '
-	git bundle create tip.bundle -1 master &&
-	test_must_fail nongit git bundle verify ../tip.bundle 2>err &&
+	git bundle create tip.bundle -1 main &&
+	nongit test_must_fail git bundle verify ../tip.bundle 2>err &&
 	test_i18ngrep "need a repository" err
 '
 
 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' '
@@ -34,41 +51,68 @@ test_expect_success 'die if bundle file cannot be created' '
 	test_must_fail git bundle create adir --all
 '
 
-test_expect_failure 'bundle --stdin' '
-	echo master | git bundle create stdin-bundle.bdl --stdin &&
-	git ls-remote stdin-bundle.bdl >output &&
-	grep master output
+test_expect_success 'bundle --stdin' '
+	echo main | git bundle create stdin-bundle.bdl --stdin &&
+	cat >expect <<-EOF &&
+	$(git rev-parse main)	refs/heads/main
+	EOF
+	git ls-remote stdin-bundle.bdl >actual &&
+	test_cmp expect actual
 '
 
-test_expect_failure 'bundle --stdin <rev-list options>' '
-	echo master | git bundle create hybrid-bundle.bdl --stdin tag &&
-	git ls-remote hybrid-bundle.bdl >output &&
-	grep master output
+test_expect_success 'bundle --stdin <rev-list options>' '
+	echo main | git bundle create hybrid-bundle.bdl --stdin tag &&
+	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 "^-[0-9a-f]\\{40\\} " 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 "" &&
@@ -79,14 +123,14 @@ test_expect_success 'prerequisites with an empty commit message' '
 
 test_expect_success 'failed bundle creation does not leave cruft' '
 	# This fails because the bundle would be empty.
-	test_must_fail git bundle create fail.bundle master..master &&
+	test_must_fail git bundle create fail.bundle main..main &&
 	test_path_is_missing fail.bundle.lock
 '
 
 test_expect_success 'fetch SHA-1 from bundle' '
 	test_create_repo foo &&
 	test_commit -C foo x &&
-	git -C foo bundle create tip.bundle -1 master &&
+	git -C foo bundle create tip.bundle -1 main &&
 	git -C foo rev-parse HEAD >hash &&
 
 	# Exercise to ensure that fetching a SHA-1 from a bundle works with no
@@ -94,4 +138,35 @@ test_expect_success 'fetch SHA-1 from bundle' '
 	git fetch --no-tags foo/tip.bundle "$(cat hash)"
 '
 
+test_expect_success 'git bundle uses expected default format' '
+	git bundle create bundle HEAD^.. &&
+	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' '
+	git branch side HEAD &&
+	git bundle create --version=3 bundle HEAD^..side &&
+	head -n2 bundle >actual &&
+	cat >expect <<-EOF &&
+	# v3 git bundle
+	@object-format=$(test_oid algo)
+	EOF
+	test_cmp expect actual &&
+	git bundle verify bundle
+'
+
+test_expect_success 'git bundle v3 rejects unknown capabilities' '
+	cat >new <<-EOF &&
+	# v3 git bundle
+	@object-format=$(test_oid algo)
+	@unknown=silly
+	EOF
+	test_must_fail git bundle verify new 2>output &&
+	test_i18ngrep "unknown capability .unknown=silly." output
+'
+
 test_done
diff --git a/t/t5608-clone-2gb.sh b/t/t5608-clone-2gb.sh
index 2c6bc07344..87a8cd9f98 100755
--- a/t/t5608-clone-2gb.sh
+++ b/t/t5608-clone-2gb.sh
@@ -3,14 +3,13 @@
 test_description='Test cloning a repository larger than 2 gigabyte'
 . ./test-lib.sh
 
-if test -z "$GIT_TEST_CLONE_2GB"
+if ! test_bool_env GIT_TEST_CLONE_2GB false
 then
-	say 'Skipping expensive 2GB clone test; enable it with GIT_TEST_CLONE_2GB=t'
-else
-	test_set_prereq CLONE_2GB
+	skip_all='expensive 2GB clone test; enable with GIT_TEST_CLONE_2GB=true'
+	test_done
 fi
 
-test_expect_success CLONE_2GB 'setup' '
+test_expect_success 'setup' '
 
 	git config pack.compression 0 &&
 	git config pack.depth 0 &&
@@ -27,7 +26,7 @@ test_expect_success CLONE_2GB 'setup' '
 		i=$(($i+1)) ||
 		echo $? > exit-status
 	 done &&
-	 echo "commit refs/heads/master" &&
+	 echo "commit refs/heads/main" &&
 	 echo "author A U Thor <author@email.com> 123456789 +0000" &&
 	 echo "committer C O Mitter <committer@email.com> 123456789 +0000" &&
 	 echo "data 5" &&
@@ -38,13 +37,13 @@ test_expect_success CLONE_2GB 'setup' '
 
 '
 
-test_expect_success CLONE_2GB 'clone - bare' '
+test_expect_success 'clone - bare' '
 
 	git clone --bare --no-hardlinks . clone-bare
 
 '
 
-test_expect_success CLONE_2GB 'clone - with worktree, file:// protocol' '
+test_expect_success 'clone - with worktree, file:// protocol' '
 
 	git clone "file://$(pwd)" clone-wt
 
diff --git a/t/t5609-clone-branch.sh b/t/t5609-clone-branch.sh
index 6e7a7be052..f86a674a03 100755
--- a/t/t5609-clone-branch.sh
+++ b/t/t5609-clone-branch.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='clone --branch option'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_HEAD() {
@@ -20,7 +23,7 @@ test_expect_success 'setup' '
 	 echo one >file && git add file && git commit -m one &&
 	 git checkout -b two &&
 	 echo two >file && git add file && git commit -m two &&
-	 git checkout master) &&
+	 git checkout main) &&
 	mkdir empty &&
 	(cd empty && git init)
 '
@@ -28,7 +31,7 @@ test_expect_success 'setup' '
 test_expect_success 'vanilla clone chooses HEAD' '
 	git clone parent clone &&
 	(cd clone &&
-	 check_HEAD master &&
+	 check_HEAD main &&
 	 check_file one
 	)
 '
@@ -53,7 +56,7 @@ test_expect_success 'clone -b sets up tracking' '
 
 test_expect_success 'clone -b does not munge remotes/origin/HEAD' '
 	(cd clone-two &&
-	 echo refs/remotes/origin/master >expect &&
+	 echo refs/remotes/origin/main >expect &&
 	 git symbolic-ref refs/remotes/origin/HEAD >actual &&
 	 test_cmp expect actual
 	)
diff --git a/t/t5610-clone-detached.sh b/t/t5610-clone-detached.sh
index 8b0d607df1..a7ec21eda5 100755
--- a/t/t5610-clone-detached.sh
+++ b/t/t5610-clone-detached.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test cloning a repository with detached HEAD'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 head_is_detached() {
@@ -20,7 +23,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'clone repo (detached HEAD points to branch)' '
-	git checkout master^0 &&
+	git checkout main^0 &&
 	git clone "file://$PWD" detached-branch
 '
 test_expect_success 'cloned HEAD matches' '
@@ -59,7 +62,7 @@ test_expect_success 'cloned HEAD is detached' '
 '
 
 test_expect_success 'clone repo (orphan detached HEAD)' '
-	git checkout master^0 &&
+	git checkout main^0 &&
 	echo four >file &&
 	git commit -a -m four &&
 	git clone "file://$PWD" detached-orphan
diff --git a/t/t5611-clone-config.sh b/t/t5611-clone-config.sh
index 60c1ba951b..f8625f9158 100755
--- a/t/t5611-clone-config.sh
+++ b/t/t5611-clone-config.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='tests for git clone -c key=value'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'clone -c sets config in cloned repo' '
@@ -47,16 +50,16 @@ test_expect_success 'clone -c config is available during clone' '
 
 test_expect_success 'clone -c remote.origin.fetch=<refspec> works' '
 	rm -rf child &&
-	git update-ref refs/grab/it refs/heads/master &&
-	git update-ref refs/leave/out refs/heads/master &&
+	git update-ref refs/grab/it refs/heads/main &&
+	git update-ref refs/leave/out refs/heads/main &&
 	git clone -c "remote.origin.fetch=+refs/grab/*:refs/grab/*" . child &&
 	git -C child for-each-ref --format="%(refname)" >actual &&
 
 	cat >expect <<-\EOF &&
 	refs/grab/it
-	refs/heads/master
+	refs/heads/main
 	refs/remotes/origin/HEAD
-	refs/remotes/origin/master
+	refs/remotes/origin/main
 	EOF
 	test_cmp expect actual
 '
@@ -68,9 +71,9 @@ test_expect_success 'git -c remote.origin.fetch=<refspec> clone works' '
 
 	cat >expect <<-\EOF &&
 	refs/grab/it
-	refs/heads/master
+	refs/heads/main
 	refs/remotes/origin/HEAD
-	refs/remotes/origin/master
+	refs/remotes/origin/main
 	EOF
 	test_cmp expect actual
 '
@@ -85,31 +88,49 @@ test_expect_success 'clone -c remote.<remote>.fetch=<refspec> --origin=<name>' '
 
 	cat >expect <<-\EOF &&
 	refs/grab/it
-	refs/heads/master
+	refs/heads/main
 	refs/remotes/upstream/HEAD
-	refs/remotes/upstream/master
+	refs/remotes/upstream/main
 	EOF
 	test_cmp expect actual
 '
 
-# Tests for the hidden file attribute on windows
-is_hidden () {
-	# Use the output of `attrib`, ignore the absolute path
-	case "$(attrib "$1")" in *H*?:*) return 0;; esac
-	return 1
-}
+test_expect_success 'set up shallow repository' '
+	git clone --depth=1 --no-local . shallow-repo
+'
+
+test_expect_success 'clone.rejectshallow=true should reject cloning shallow repo' '
+	test_when_finished "rm -rf out" &&
+	test_must_fail git -c clone.rejectshallow=true clone --no-local shallow-repo out 2>err &&
+	test_i18ngrep -e "source repository is shallow, reject to clone." err &&
+
+	git -c clone.rejectshallow=false clone --no-local shallow-repo out
+'
+
+test_expect_success 'option --[no-]reject-shallow override clone.rejectshallow config' '
+	test_when_finished "rm -rf out" &&
+	test_must_fail git -c clone.rejectshallow=false clone --reject-shallow --no-local shallow-repo out 2>err &&
+	test_i18ngrep -e "source repository is shallow, reject to clone." err &&
+
+	git -c clone.rejectshallow=true clone --no-reject-shallow --no-local shallow-repo out
+'
+
+test_expect_success 'clone.rejectshallow=true should succeed cloning normal repo' '
+	test_when_finished "rm -rf out" &&
+	git -c clone.rejectshallow=true clone --no-local . out
+'
 
 test_expect_success MINGW 'clone -c core.hideDotFiles' '
 	test_commit attributes .gitattributes "" &&
 	rm -rf child &&
 	git clone -c core.hideDotFiles=false . child &&
-	! is_hidden child/.gitattributes &&
+	! test_path_is_hidden child/.gitattributes &&
 	rm -rf child &&
 	git clone -c core.hideDotFiles=dotGitOnly . child &&
-	! is_hidden child/.gitattributes &&
+	! test_path_is_hidden child/.gitattributes &&
 	rm -rf child &&
 	git clone -c core.hideDotFiles=true . child &&
-	is_hidden child/.gitattributes
+	test_path_is_hidden child/.gitattributes
 '
 
 test_done
diff --git a/t/t5612-clone-refspec.sh b/t/t5612-clone-refspec.sh
index e36ac01661..3126cfd7e9 100755
--- a/t/t5612-clone-refspec.sh
+++ b/t/t5612-clone-refspec.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 
 test_description='test refspec written by clone-command'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
-	# Make two branches, "master" and "side"
+	# Make two branches, "main" and "side"
 	echo one >file &&
 	git add file &&
 	git commit -m one &&
@@ -16,7 +19,7 @@ test_expect_success 'setup' '
 	git checkout -b side &&
 	echo four >file &&
 	git commit -a -m four &&
-	git checkout master &&
+	git checkout main &&
 	git tag five &&
 
 	# default clone
@@ -25,18 +28,18 @@ test_expect_success 'setup' '
 	# default clone --no-tags
 	git clone --no-tags . dir_all_no_tags &&
 
-	# default --single that follows HEAD=master
-	git clone --single-branch . dir_master &&
+	# default --single that follows HEAD=main
+	git clone --single-branch . dir_main &&
 
-	# default --single that follows HEAD=master with no tags
-	git clone --single-branch --no-tags . dir_master_no_tags &&
+	# default --single that follows HEAD=main with no tags
+	git clone --single-branch --no-tags . dir_main_no_tags &&
 
 	# default --single that follows HEAD=side
 	git checkout side &&
 	git clone --single-branch . dir_side &&
 
 	# explicit --single that follows side
-	git checkout master &&
+	git checkout main &&
 	git clone --single-branch --branch side . dir_side2 &&
 
 	# default --single with --mirror
@@ -55,11 +58,11 @@ test_expect_success 'setup' '
 	# explicit --single with tag and --no-tags
 	git clone --single-branch --no-tags --branch two . dir_tag_no_tags &&
 
-	# advance both "master" and "side" branches
+	# advance both "main" and "side" branches
 	git checkout side &&
 	echo five >file &&
 	git commit -a -m five &&
-	git checkout master &&
+	git checkout main &&
 	echo six >file &&
 	git commit -a -m six &&
 
@@ -71,11 +74,11 @@ test_expect_success 'by default all branches will be kept updated' '
 	(
 		cd dir_all &&
 		git fetch &&
-		git for-each-ref refs/remotes/origin |
+		git for-each-ref refs/remotes/origin >refs &&
 		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" >../actual
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
 	) &&
-	# follow both master and side
+	# follow both main and side
 	git for-each-ref refs/heads >expect &&
 	test_cmp expect actual
 '
@@ -87,33 +90,34 @@ test_expect_success 'by default no tags will be kept updated' '
 		git for-each-ref refs/tags >../actual
 	) &&
 	git for-each-ref refs/tags >expect &&
-	test_must_fail test_cmp expect actual &&
+	! test_cmp expect actual &&
 	test_line_count = 2 actual
 '
 
 test_expect_success 'clone with --no-tags' '
 	(
 		cd dir_all_no_tags &&
+		grep tagOpt .git/config &&
 		git fetch &&
 		git for-each-ref refs/tags >../actual
 	) &&
 	test_must_be_empty actual
 '
 
-test_expect_success '--single-branch while HEAD pointing at master' '
+test_expect_success '--single-branch while HEAD pointing at main' '
 	(
-		cd dir_master &&
+		cd dir_main &&
 		git fetch --force &&
-		git for-each-ref refs/remotes/origin |
+		git for-each-ref refs/remotes/origin >refs &&
 		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" >../actual
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
 	) &&
-	# only follow master
-	git for-each-ref refs/heads/master >expect &&
+	# only follow main
+	git for-each-ref refs/heads/main >expect &&
 	# get & check latest tags
 	test_cmp expect actual &&
 	(
-		cd dir_master &&
+		cd dir_main &&
 		git fetch --tags --force &&
 		git for-each-ref refs/tags >../actual
 	) &&
@@ -122,20 +126,20 @@ test_expect_success '--single-branch while HEAD pointing at master' '
 	test_line_count = 2 actual
 '
 
-test_expect_success '--single-branch while HEAD pointing at master and --no-tags' '
+test_expect_success '--single-branch while HEAD pointing at main and --no-tags' '
 	(
-		cd dir_master_no_tags &&
+		cd dir_main_no_tags &&
 		git fetch &&
-		git for-each-ref refs/remotes/origin |
+		git for-each-ref refs/remotes/origin >refs &&
 		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" >../actual
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
 	) &&
-	# only follow master
-	git for-each-ref refs/heads/master >expect &&
+	# only follow main
+	git for-each-ref refs/heads/main >expect &&
 	test_cmp expect actual &&
 	# get tags (noop)
 	(
-		cd dir_master_no_tags &&
+		cd dir_main_no_tags &&
 		git fetch &&
 		git for-each-ref refs/tags >../actual
 	) &&
@@ -143,7 +147,7 @@ test_expect_success '--single-branch while HEAD pointing at master and --no-tags
 	test_line_count = 0 actual &&
 	# get tags with --tags overrides tagOpt
 	(
-		cd dir_master_no_tags &&
+		cd dir_main_no_tags &&
 		git fetch --tags &&
 		git for-each-ref refs/tags >../actual
 	) &&
@@ -156,9 +160,9 @@ test_expect_success '--single-branch while HEAD pointing at side' '
 	(
 		cd dir_side &&
 		git fetch &&
-		git for-each-ref refs/remotes/origin |
+		git for-each-ref refs/remotes/origin >refs &&
 		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" >../actual
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
 	) &&
 	# only follow side
 	git for-each-ref refs/heads/side >expect &&
@@ -169,9 +173,9 @@ test_expect_success '--single-branch with explicit --branch side' '
 	(
 		cd dir_side2 &&
 		git fetch &&
-		git for-each-ref refs/remotes/origin |
+		git for-each-ref refs/remotes/origin >refs &&
 		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" >../actual
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
 	) &&
 	# only follow side
 	git for-each-ref refs/heads/side >expect &&
@@ -223,9 +227,9 @@ test_expect_success '--single-branch with detached' '
 	(
 		cd dir_detached &&
 		git fetch &&
-		git for-each-ref refs/remotes/origin |
+		git for-each-ref refs/remotes/origin >refs &&
 		sed -e "/HEAD$/d" \
-		    -e "s|/remotes/origin/|/heads/|" >../actual
+		    -e "s|/remotes/origin/|/heads/|" refs >../actual
 	) &&
 	# nothing
 	test_must_be_empty actual
diff --git a/t/t5614-clone-submodules-shallow.sh b/t/t5614-clone-submodules-shallow.sh
index e4e6ea4d52..5504b519c7 100755
--- a/t/t5614-clone-submodules-shallow.sh
+++ b/t/t5614-clone-submodules-shallow.sh
@@ -7,7 +7,7 @@ test_description='Test shallow cloning of repos with submodules'
 pwd=$(pwd)
 
 test_expect_success 'setup' '
-	git checkout -b master &&
+	git checkout -b main &&
 	test_commit commit1 &&
 	test_commit commit2 &&
 	mkdir sub &&
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index eaa33a852b..cf3e82bdf5 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -2,6 +2,9 @@
 
 test_description='git partial clone'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # create a normal "src" repo where we can later create new commits.
@@ -49,16 +52,16 @@ test_expect_success 'do partial clone 1' '
 test_expect_success 'verify that .promisor file contains refs fetched' '
 	ls pc1/.git/objects/pack/pack-*.promisor >promisorlist &&
 	test_line_count = 1 promisorlist &&
-	git -C srv.bare rev-list HEAD >headhash &&
+	git -C srv.bare rev-parse --verify HEAD >headhash &&
 	grep "$(cat headhash) HEAD" $(cat promisorlist) &&
-	grep "$(cat headhash) refs/heads/master" $(cat promisorlist)
+	grep "$(cat headhash) refs/heads/main" $(cat promisorlist)
 '
 
-# checkout master to force dynamic object fetch of blobs at HEAD.
+# checkout main to force dynamic object fetch of blobs at HEAD.
 test_expect_success 'verify checkout with dynamic object fetch' '
 	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
 	test_line_count = 4 observed &&
-	git -C pc1 checkout master &&
+	git -C pc1 checkout main &&
 	git -C pc1 rev-list --quiet --objects --missing=print HEAD >observed &&
 	test_line_count = 0 observed
 '
@@ -73,8 +76,8 @@ test_expect_success 'push new commits to server' '
 		git -C src add file.1.txt
 		git -C src commit -m "mod $x"
 	done &&
-	git -C src blame master -- file.1.txt >expect.blame &&
-	git -C src push -u srv master
+	git -C src blame main -- file.1.txt >expect.blame &&
+	git -C src push -u srv main
 '
 
 # (partial) fetch in the partial clone repo from the promisor remote.
@@ -83,26 +86,26 @@ test_expect_success 'push new commits to server' '
 test_expect_success 'partial fetch inherits filter settings' '
 	git -C pc1 fetch origin &&
 	git -C pc1 rev-list --quiet --objects --missing=print \
-		master..origin/master >observed &&
+		main..origin/main >observed &&
 	test_line_count = 5 observed
 '
 
 # force dynamic object fetch using diff.
-# we should only get 1 new blob (for the file in origin/master).
+# we should only get 1 new blob (for the file in origin/main).
 test_expect_success 'verify diff causes dynamic object fetch' '
-	git -C pc1 diff master..origin/master -- file.1.txt &&
+	git -C pc1 diff main..origin/main -- file.1.txt &&
 	git -C pc1 rev-list --quiet --objects --missing=print \
-		 master..origin/master >observed &&
+		 main..origin/main >observed &&
 	test_line_count = 4 observed
 '
 
 # force full dynamic object fetch of the file's history using blame.
 # we should get the intermediate blobs for the file.
 test_expect_success 'verify blame causes dynamic object fetch' '
-	git -C pc1 blame origin/master -- file.1.txt >observed.blame &&
+	git -C pc1 blame origin/main -- file.1.txt >observed.blame &&
 	test_cmp expect.blame observed.blame &&
 	git -C pc1 rev-list --quiet --objects --missing=print \
-		master..origin/master >observed &&
+		main..origin/main >observed &&
 	test_line_count = 0 observed
 '
 
@@ -115,7 +118,7 @@ test_expect_success 'push new commits to server for file.2.txt' '
 		git -C src add file.2.txt
 		git -C src commit -m "mod $x"
 	done &&
-	git -C src push -u srv master
+	git -C src push -u srv main
 '
 
 # Do FULL fetch by disabling inherited filter-spec using --no-filter.
@@ -123,7 +126,7 @@ test_expect_success 'push new commits to server for file.2.txt' '
 test_expect_success 'override inherited filter-spec using --no-filter' '
 	git -C pc1 fetch --no-filter origin &&
 	git -C pc1 rev-list --quiet --objects --missing=print \
-		master..origin/master >observed &&
+		main..origin/main >observed &&
 	test_line_count = 0 observed
 '
 
@@ -136,7 +139,7 @@ test_expect_success 'push new commits to server for file.3.txt' '
 		git -C src add file.3.txt
 		git -C src commit -m "mod $x"
 	done &&
-	git -C src push -u srv master
+	git -C src push -u srv main
 '
 
 # Do a partial fetch and then try to manually fetch the missing objects.
@@ -146,7 +149,7 @@ test_expect_success 'manual prefetch of missing objects' '
 	git -C pc1 fetch --filter=blob:none origin &&
 
 	git -C pc1 rev-list --quiet --objects --missing=print \
-		 master..origin/master >revs &&
+		 main..origin/main >revs &&
 	awk -f print_1.awk revs |
 	sed "s/?//" |
 	sort >observed.oids &&
@@ -155,7 +158,7 @@ test_expect_success 'manual prefetch of missing objects' '
 	git -C pc1 fetch-pack --stdin "file://$(pwd)/srv.bare" <observed.oids &&
 
 	git -C pc1 rev-list --quiet --objects --missing=print \
-		master..origin/master >revs &&
+		main..origin/main >revs &&
 	awk -f print_1.awk revs |
 	sed "s/?//" |
 	sort >observed.oids &&
@@ -163,6 +166,22 @@ test_expect_success 'manual prefetch of missing objects' '
 	test_line_count = 0 observed.oids
 '
 
+test_expect_success 'partial clone with transfer.fsckobjects=1 works with submodules' '
+	test_create_repo submodule &&
+	test_commit -C submodule mycommit &&
+
+	test_create_repo src_with_sub &&
+	test_config -C src_with_sub uploadpack.allowfilter 1 &&
+	test_config -C src_with_sub uploadpack.allowanysha1inwant 1 &&
+
+	git -C src_with_sub submodule add "file://$(pwd)/submodule" mysub &&
+	git -C src_with_sub commit -m "commit with submodule" &&
+
+	git -c transfer.fsckobjects=1 \
+		clone --filter="blob:none" "file://$(pwd)/src_with_sub" dst &&
+	test_when_finished rm -rf dst
+'
+
 test_expect_success 'partial clone with transfer.fsckobjects=1 uses index-pack --fsck-objects' '
 	git init src &&
 	test_commit -C src x &&
@@ -180,7 +199,7 @@ test_expect_success 'use fsck before and after manually fetching a missing subtr
 	echo "in dir" >src/dir/file.txt &&
 	git -C src add dir/file.txt &&
 	git -C src commit -m "file in dir" &&
-	git -C src push -u srv master &&
+	git -C src push -u srv main &&
 	SUBTREE=$(git -C src rev-parse HEAD:dir) &&
 
 	rm -rf dst &&
@@ -188,7 +207,7 @@ test_expect_success 'use fsck before and after manually fetching a missing subtr
 	git -C dst fsck &&
 
 	# Make sure we only have commits, and all trees and blobs are missing.
-	git -C dst rev-list --missing=allow-any --objects master \
+	git -C dst rev-list --missing=allow-any --objects main \
 		>fetched_objects &&
 	awk -f print_1.awk fetched_objects |
 	xargs -n1 git -C dst cat-file -t >fetched_types &&
@@ -205,7 +224,7 @@ test_expect_success 'use fsck before and after manually fetching a missing subtr
 	git -C dst fsck &&
 
 	# Auto-fetch all remaining trees and blobs with --missing=error
-	git -C dst rev-list --missing=error --objects master >fetched_objects &&
+	git -C dst rev-list --missing=error --objects main >fetched_objects &&
 	test_line_count = 70 fetched_objects &&
 
 	awk -f print_1.awk fetched_objects |
@@ -235,6 +254,55 @@ test_expect_success 'implicitly construct combine: filter with repeated flags' '
 	test_cmp unique_types.expected unique_types.actual
 '
 
+test_expect_success 'upload-pack complains of bogus filter config' '
+	printf 0000 |
+	test_must_fail git \
+		-c uploadpackfilter.tree.maxdepth \
+		upload-pack . >/dev/null 2>err &&
+	test_i18ngrep "unable to parse.*tree.maxdepth" err
+'
+
+test_expect_success 'upload-pack fails banned object filters' '
+	test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
+		"file://$(pwd)/srv.bare" pc3 2>err &&
+	test_i18ngrep "filter '\''blob:none'\'' not supported" err
+'
+
+test_expect_success 'upload-pack fails banned combine object filters' '
+	test_config -C srv.bare uploadpackfilter.allow false &&
+	test_config -C srv.bare uploadpackfilter.combine.allow true &&
+	test_config -C srv.bare uploadpackfilter.tree.allow true &&
+	test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
+		--filter=blob:none "file://$(pwd)/srv.bare" pc3 2>err &&
+	test_i18ngrep "filter '\''blob:none'\'' not supported" err
+'
+
+test_expect_success 'upload-pack fails banned object filters with fallback' '
+	test_config -C srv.bare uploadpackfilter.allow false &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
+		"file://$(pwd)/srv.bare" pc3 2>err &&
+	test_i18ngrep "filter '\''blob:none'\'' not supported" err
+'
+
+test_expect_success 'upload-pack limits tree depth filters' '
+	test_config -C srv.bare uploadpackfilter.allow false &&
+	test_config -C srv.bare uploadpackfilter.tree.allow true &&
+	test_config -C srv.bare uploadpackfilter.tree.maxDepth 0 &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
+		"file://$(pwd)/srv.bare" pc3 2>err &&
+	test_i18ngrep "tree filter allows max depth 0, but got 1" err &&
+
+	git clone --no-checkout --filter=tree:0 "file://$(pwd)/srv.bare" pc4 &&
+
+	test_config -C srv.bare uploadpackfilter.tree.maxDepth 5 &&
+	git clone --no-checkout --filter=tree:5 "file://$(pwd)/srv.bare" pc5 &&
+	test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:6 \
+		"file://$(pwd)/srv.bare" pc6 2>err &&
+	test_i18ngrep "tree filter allows max depth 5, but got 6" err
+'
+
 test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' '
 	rm -rf src dst &&
 	git init src &&
@@ -282,7 +350,7 @@ test_expect_success 'setup src repo for sparse filter' '
 test_expect_success 'partial clone with sparse filter succeeds' '
 	rm -rf dst.git &&
 	git clone --no-local --bare \
-		  --filter=sparse:oid=master:only-one \
+		  --filter=sparse:oid=main:only-one \
 		  sparse-src dst.git &&
 	(
 		cd dst.git &&
@@ -295,15 +363,199 @@ test_expect_success 'partial clone with sparse filter succeeds' '
 test_expect_success 'partial clone with unresolvable sparse filter fails cleanly' '
 	rm -rf dst.git &&
 	test_must_fail git clone --no-local --bare \
-				 --filter=sparse:oid=master:no-such-name \
+				 --filter=sparse:oid=main:no-such-name \
 				 sparse-src dst.git 2>err &&
-	test_i18ngrep "unable to access sparse blob in .master:no-such-name" err &&
+	test_i18ngrep "unable to access sparse blob in .main:no-such-name" err &&
 	test_must_fail git clone --no-local --bare \
-				 --filter=sparse:oid=master \
+				 --filter=sparse:oid=main \
 				 sparse-src dst.git 2>err &&
 	test_i18ngrep "unable to parse sparse filter data in" err
 '
 
+setup_triangle () {
+	rm -rf big-blob.txt server client promisor-remote &&
+
+	printf "line %d\n" $(test_seq 1 100) >big-blob.txt &&
+
+	# Create a server with 2 commits: a commit with a big tree and a child
+	# commit with an incremental change. Also, create a partial clone
+	# client that only contains the first commit.
+	git init server &&
+	git -C server config --local uploadpack.allowfilter 1 &&
+	for i in $(test_seq 1 100)
+	do
+		echo "make the tree big" >server/file$i &&
+		git -C server add file$i
+	done &&
+	git -C server commit -m "initial" &&
+	git clone --bare --filter=tree:0 "file://$(pwd)/server" client &&
+	echo another line >>server/file1 &&
+	git -C server commit -am "incremental change" &&
+
+	# Create a promisor remote that only contains the tree and blob from
+	# the first commit.
+	git init promisor-remote &&
+	git -C server config --local uploadpack.allowanysha1inwant 1 &&
+	TREE_HASH=$(git -C server rev-parse HEAD~1^{tree}) &&
+	git -C promisor-remote fetch --keep "file://$(pwd)/server" "$TREE_HASH" &&
+	git -C promisor-remote count-objects -v >object-count &&
+	test_i18ngrep "count: 0" object-count &&
+	test_i18ngrep "in-pack: 2" object-count &&
+
+	# Set it as the promisor remote of client. Thus, whenever
+	# the client lazy fetches, the lazy fetch will succeed only if it is
+	# for this tree or blob.
+	test_commit -C promisor-remote one && # so that ref advertisement is not empty
+	git -C promisor-remote config --local uploadpack.allowanysha1inwant 1 &&
+	git -C client remote set-url origin "file://$(pwd)/promisor-remote"
+}
+
+# NEEDSWORK: The tests beginning with "fetch lazy-fetches" below only
+# test that "fetch" avoid fetching trees and blobs, but not commits or
+# tags. Revisit this if Git is ever taught to support partial clones
+# with commits and/or tags filtered out.
+
+test_expect_success 'fetch lazy-fetches only to resolve deltas' '
+	setup_triangle &&
+
+	# Exercise to make sure it works. Git will not fetch anything from the
+	# promisor remote other than for the big tree (because it needs to
+	# resolve the delta).
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
+		fetch "file://$(pwd)/server" main &&
+
+	# Verify the assumption that the client needed to fetch the delta base
+	# to resolve the delta.
+	git -C server rev-parse HEAD~1^{tree} >hash &&
+	grep "want $(cat hash)" trace
+'
+
+test_expect_success 'fetch lazy-fetches only to resolve deltas, protocol v2' '
+	setup_triangle &&
+
+	git -C server config --local protocol.version 2 &&
+	git -C client config --local protocol.version 2 &&
+	git -C promisor-remote config --local protocol.version 2 &&
+
+	# Exercise to make sure it works. Git will not fetch anything from the
+	# promisor remote other than for the big blob (because it needs to
+	# resolve the delta).
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client \
+		fetch "file://$(pwd)/server" main &&
+
+	# Verify that protocol version 2 was used.
+	grep "fetch< version 2" trace &&
+
+	# Verify the assumption that the client needed to fetch the delta base
+	# to resolve the delta.
+	git -C server rev-parse HEAD~1^{tree} >hash &&
+	grep "want $(cat hash)" trace
+'
+
+test_expect_success 'fetch does not lazy-fetch missing targets of its refs' '
+	rm -rf server client trace &&
+
+	test_create_repo server &&
+	test_config -C server uploadpack.allowfilter 1 &&
+	test_config -C server uploadpack.allowanysha1inwant 1 &&
+	test_commit -C server foo &&
+
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	# Make all refs point to nothing by deleting all objects.
+	rm client/.git/objects/pack/* &&
+
+	test_commit -C server bar &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch \
+		--no-tags --recurse-submodules=no \
+		origin refs/tags/bar &&
+	FOO_HASH=$(git -C server rev-parse foo) &&
+	! grep "want $FOO_HASH" trace
+'
+
+# The following two tests must be in this order. It is important that
+# the srv.bare repository did not have tags during clone, but has tags
+# in the fetch.
+
+test_expect_success 'verify fetch succeeds when asking for new tags' '
+	git clone --filter=blob:none "file://$(pwd)/srv.bare" tag-test &&
+	for i in I J K
+	do
+		test_commit -C src $i &&
+		git -C src branch $i || return 1
+	done &&
+	git -C srv.bare fetch --tags origin +refs/heads/*:refs/heads/* &&
+	git -C tag-test -c protocol.version=2 fetch --tags origin
+'
+
+test_expect_success 'verify fetch downloads only one pack when updating refs' '
+	git clone --filter=blob:none "file://$(pwd)/srv.bare" pack-test &&
+	ls pack-test/.git/objects/pack/*pack >pack-list &&
+	test_line_count = 2 pack-list &&
+	for i in A B C
+	do
+		test_commit -C src $i &&
+		git -C src branch $i || return 1
+	done &&
+	git -C srv.bare fetch origin +refs/heads/*:refs/heads/* &&
+	git -C pack-test fetch origin &&
+	ls pack-test/.git/objects/pack/*pack >pack-list &&
+	test_line_count = 3 pack-list
+'
+
+test_expect_success 'single-branch tag following respects partial clone' '
+	git clone --single-branch -b B --filter=blob:none \
+		"file://$(pwd)/srv.bare" single &&
+	git -C single rev-parse --verify refs/tags/B &&
+	git -C single rev-parse --verify refs/tags/A &&
+	test_must_fail git -C single rev-parse --verify refs/tags/C
+'
+
+test_expect_success 'fetch from a partial clone, protocol v0' '
+	rm -rf server client trace &&
+
+	# Pretend that the server is a partial clone
+	git init server &&
+	git -C server remote add a_remote "file://$(pwd)/" &&
+	test_config -C server core.repositoryformatversion 1 &&
+	test_config -C server extensions.partialclone a_remote &&
+	test_config -C server protocol.version 0 &&
+	test_commit -C server foo &&
+
+	# Fetch from the server
+	git init client &&
+	test_config -C client protocol.version 0 &&
+	test_commit -C client bar &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" &&
+	! grep "version 2" trace
+'
+
+test_expect_success 'fetch from a partial clone, protocol v2' '
+	rm -rf server client trace &&
+
+	# Pretend that the server is a partial clone
+	git init server &&
+	git -C server remote add a_remote "file://$(pwd)/" &&
+	test_config -C server core.repositoryformatversion 1 &&
+	test_config -C server extensions.partialclone a_remote &&
+	test_config -C server protocol.version 2 &&
+	test_commit -C server foo &&
+
+	# Fetch from the server
+	git init client &&
+	test_config -C client protocol.version 2 &&
+	test_commit -C client bar &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git -C client fetch "file://$(pwd)/server" &&
+	grep "version 2" trace
+'
+
+test_expect_success 'repack does not loosen promisor objects' '
+	rm -rf client trace &&
+	git clone --bare --filter=blob:none "file://$(pwd)/srv.bare" client &&
+	test_when_finished "rm -rf client trace" &&
+	GIT_TRACE2_PERF="$(pwd)/trace" git -C client repack -A -d &&
+	grep "loosen_unused_packed_objects/loosened:0" trace
+'
+
 . "$TEST_DIRECTORY"/lib-httpd.sh
 start_httpd
 
@@ -318,14 +570,18 @@ intersperse () {
 	sed 's/\(..\)/'$1'\1/g'
 }
 
-# Create a one-time-sed command to replace the existing packfile with $1.
+# Create a one-time-perl command to replace the existing packfile with $1.
 replace_packfile () {
 	# The protocol requires that the packfile be sent in sideband 1, hence
 	# the extra \x01 byte at the beginning.
-	printf "1,/packfile/!c %04x\\\\x01%s0000" \
-		"$(($(wc -c <$1) + 5))" \
-		"$(hex_unpack <$1 | intersperse '\\x')" \
-		>"$HTTPD_ROOT_PATH/one-time-sed"
+	cp $1 "$HTTPD_ROOT_PATH/one-time-pack" &&
+	echo 'if (/packfile/) {
+		print;
+		my $length = -s "one-time-pack";
+		printf "%04x\x01", $length + 5;
+		print `cat one-time-pack` . "0000";
+		last
+	}' >"$HTTPD_ROOT_PATH/one-time-perl"
 }
 
 test_expect_success 'upon cloning, check that all refs point to objects' '
@@ -349,16 +605,16 @@ test_expect_success 'upon cloning, check that all refs point to objects' '
 	# \x01 byte at the beginning.
 	replace_packfile incomplete.pack &&
 
-	# Use protocol v2 because the sed command looks for the "packfile"
+	# Use protocol v2 because the perl command looks for the "packfile"
 	# section header.
 	test_config -C "$SERVER" protocol.version 2 &&
 	test_must_fail git -c protocol.version=2 clone \
-		--filter=blob:none $HTTPD_URL/one_time_sed/server repo 2>err &&
+		--filter=blob:none $HTTPD_URL/one_time_perl/server repo 2>err &&
 
 	test_i18ngrep "did not send all necessary objects" err &&
 
-	# Ensure that the one-time-sed script was used.
-	! test -e "$HTTPD_ROOT_PATH/one-time-sed"
+	# Ensure that the one-time-perl script was used.
+	! test -e "$HTTPD_ROOT_PATH/one-time-perl"
 '
 
 test_expect_success 'when partial cloning, tolerate server not sending target of tag' '
@@ -389,17 +645,17 @@ test_expect_success 'when partial cloning, tolerate server not sending target of
 	# \x01 byte at the beginning.
 	replace_packfile incomplete.pack &&
 
-	# Use protocol v2 because the sed command looks for the "packfile"
+	# Use protocol v2 because the perl command looks for the "packfile"
 	# section header.
 	test_config -C "$SERVER" protocol.version 2 &&
 
 	# Exercise to make sure it works.
 	git -c protocol.version=2 clone \
-		--filter=blob:none $HTTPD_URL/one_time_sed/server repo 2> err &&
+		--filter=blob:none $HTTPD_URL/one_time_perl/server repo 2> err &&
 	! grep "missing object referenced by" err &&
 
-	# Ensure that the one-time-sed script was used.
-	! test -e "$HTTPD_ROOT_PATH/one-time-sed"
+	# Ensure that the one-time-perl script was used.
+	! test -e "$HTTPD_ROOT_PATH/one-time-perl"
 '
 
 test_expect_success 'tolerate server sending REF_DELTA against missing promisor objects' '
@@ -422,7 +678,7 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor
 
 	# Clone. The client has deltabase_have but not deltabase_missing.
 	git -c protocol.version=2 clone --no-checkout \
-		--filter=blob:none $HTTPD_URL/one_time_sed/server repo &&
+		--filter=blob:none $HTTPD_URL/one_time_perl/server repo &&
 	git -C repo hash-object -w -- "$SERVER/have.txt" &&
 
 	# Sanity check to ensure that the client does not have
@@ -463,7 +719,7 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor
 
 	replace_packfile thin.pack &&
 
-	# Use protocol v2 because the sed command looks for the "packfile"
+	# Use protocol v2 because the perl command looks for the "packfile"
 	# section header.
 	test_config -C "$SERVER" protocol.version 2 &&
 
@@ -476,8 +732,8 @@ test_expect_success 'tolerate server sending REF_DELTA against missing promisor
 	grep "want $(cat deltabase_missing)" trace &&
 	! grep "want $(cat deltabase_have)" trace &&
 
-	# Ensure that the one-time-sed script was used.
-	! test -e "$HTTPD_ROOT_PATH/one-time-sed"
+	# Ensure that the one-time-perl script was used.
+	! test -e "$HTTPD_ROOT_PATH/one-time-perl"
 '
 
 # DO NOT add non-httpd-specific tests here, because the last part of this
diff --git a/t/t5617-clone-submodules-remote.sh b/t/t5617-clone-submodules-remote.sh
index 37fcce9c40..e2dbb4eaba 100755
--- a/t/t5617-clone-submodules-remote.sh
+++ b/t/t5617-clone-submodules-remote.sh
@@ -2,19 +2,23 @@
 
 test_description='Test cloning repos with submodules using remote-tracking branches'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 pwd=$(pwd)
 
 test_expect_success 'setup' '
-	git checkout -b master &&
+	git checkout -b main &&
 	test_commit commit1 &&
 	mkdir sub &&
 	(
 		cd sub &&
 		git init &&
 		test_commit subcommit1 &&
-		git tag sub_when_added_to_super
+		git tag sub_when_added_to_super &&
+		git branch other
 	) &&
 	git submodule add "file://$pwd/sub" sub &&
 	git commit -m "add submodule" &&
@@ -38,7 +42,7 @@ test_expect_success 'clone with --remote-submodules' '
 	git clone --recurse-submodules --remote-submodules "file://$pwd/." super_clone &&
 	(
 		cd super_clone/sub &&
-		git diff --exit-code remotes/origin/master
+		git diff --exit-code remotes/origin/main
 	)
 '
 
@@ -51,4 +55,14 @@ test_expect_success 'check the default is --no-remote-submodules' '
 	)
 '
 
+test_expect_success 'clone with --single-branch' '
+	test_when_finished "rm -rf super_clone" &&
+	git clone --recurse-submodules --single-branch "file://$pwd/." super_clone &&
+	(
+		cd super_clone/sub &&
+		git rev-parse --verify origin/main &&
+		test_must_fail git rev-parse --verify origin/other
+	)
+'
+
 test_done
diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh
index 2571eb90b7..468bd3e13e 100755
--- a/t/t5700-protocol-v1.sh
+++ b/t/t5700-protocol-v1.sh
@@ -5,7 +5,11 @@ test_description='test git wire-protocol transition'
 TEST_NO_CREATE_REPO=1
 
 # This is a protocol-specific test.
-GIT_TEST_PROTOCOL_VERSION=
+GIT_TEST_PROTOCOL_VERSION=0
+export GIT_TEST_PROTOCOL_VERSION
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./test-lib.sh
 
@@ -40,7 +44,7 @@ test_expect_success 'fetch with git:// using protocol v1' '
 	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
 		fetch 2>log &&
 
-	git -C daemon_child log -1 --format=%s origin/master >actual &&
+	git -C daemon_child log -1 --format=%s origin/main >actual &&
 	git -C "$daemon_parent" log -1 --format=%s >expect &&
 	test_cmp expect actual &&
 
@@ -68,7 +72,7 @@ test_expect_success 'push with git:// using protocol v1' '
 	test_commit -C daemon_child three &&
 
 	# Push to another branch, as the target repository has the
-	# master branch checked out and we cannot push into it.
+	# main branch checked out and we cannot push into it.
 	GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
 		push origin HEAD:client_branch 2>log &&
 
@@ -109,7 +113,7 @@ test_expect_success 'fetch with file:// using protocol v1' '
 	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
 		fetch 2>log &&
 
-	git -C file_child log -1 --format=%s origin/master >actual &&
+	git -C file_child log -1 --format=%s origin/main >actual &&
 	git -C file_parent log -1 --format=%s >expect &&
 	test_cmp expect actual &&
 
@@ -133,7 +137,7 @@ test_expect_success 'push with file:// using protocol v1' '
 	test_commit -C file_child three &&
 
 	# Push to another branch, as the target repository has the
-	# master branch checked out and we cannot push into it.
+	# main branch checked out and we cannot push into it.
 	GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
 		push origin HEAD:client_branch 2>log &&
 
@@ -187,7 +191,7 @@ test_expect_success 'fetch with ssh:// using protocol v1' '
 		fetch 2>log &&
 	expect_ssh git-upload-pack &&
 
-	git -C ssh_child log -1 --format=%s origin/master >actual &&
+	git -C ssh_child log -1 --format=%s origin/main >actual &&
 	git -C ssh_parent log -1 --format=%s >expect &&
 	test_cmp expect actual &&
 
@@ -212,7 +216,7 @@ test_expect_success 'push with ssh:// using protocol v1' '
 	test_commit -C ssh_child three &&
 
 	# Push to another branch, as the target repository has the
-	# master branch checked out and we cannot push into it.
+	# main branch checked out and we cannot push into it.
 	GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
 		push origin HEAD:client_branch 2>log &&
 	expect_ssh git-receive-pack &&
@@ -256,7 +260,7 @@ test_expect_success 'fetch with http:// using protocol v1' '
 	GIT_TRACE_PACKET=1 git -C http_child -c protocol.version=1 \
 		fetch 2>log &&
 
-	git -C http_child log -1 --format=%s origin/master >actual &&
+	git -C http_child log -1 --format=%s origin/main >actual &&
 	git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
 	test_cmp expect actual &&
 
@@ -280,7 +284,7 @@ test_expect_success 'push with http:// using protocol v1' '
 	test_commit -C http_child three &&
 
 	# Push to another branch, as the target repository has the
-	# master branch checked out and we cannot push into it.
+	# main branch checked out and we cannot push into it.
 	GIT_TRACE_PACKET=1 git -C http_child -c protocol.version=1 \
 		push origin HEAD:client_branch && #2>log &&
 
diff --git a/t/t5701-git-serve.sh b/t/t5701-git-serve.sh
index ffb9613885..930721f053 100755
--- a/t/t5701-git-serve.sh
+++ b/t/t5701-git-serve.sh
@@ -2,15 +2,24 @@
 
 test_description='test protocol v2 server commands'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'test capability advertisement' '
+	test_oid_cache <<-EOF &&
+	wrong_algo sha1:sha256
+	wrong_algo sha256:sha1
+	EOF
 	cat >expect <<-EOF &&
 	version 2
 	agent=git/$(git version | cut -d" " -f3)
-	ls-refs
-	fetch=shallow
+	ls-refs=unborn
+	fetch=shallow wait-for-done
 	server-option
+	object-format=$(test_oid algo)
+	object-info
 	0000
 	EOF
 
@@ -45,6 +54,7 @@ test_expect_success 'request invalid capability' '
 test_expect_success 'request with no command' '
 	test-tool pkt-line pack >in <<-EOF &&
 	agent=git/test
+	object-format=$(test_oid algo)
 	0000
 	EOF
 	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
@@ -54,6 +64,7 @@ test_expect_success 'request with no command' '
 test_expect_success 'request invalid command' '
 	test-tool pkt-line pack >in <<-EOF &&
 	command=foo
+	object-format=$(test_oid algo)
 	agent=git/test
 	0000
 	EOF
@@ -61,26 +72,38 @@ test_expect_success 'request invalid command' '
 	test_i18ngrep "invalid command" err
 '
 
+test_expect_success 'wrong object-format' '
+	test-tool pkt-line pack >in <<-EOF &&
+	command=fetch
+	agent=git/test
+	object-format=$(test_oid wrong_algo)
+	0000
+	EOF
+	test_must_fail test-tool serve-v2 --stateless-rpc 2>err <in &&
+	test_i18ngrep "mismatched object format" err
+'
+
 # Test the basics of ls-refs
 #
 test_expect_success 'setup some refs and tags' '
 	test_commit one &&
-	git branch dev master &&
+	git branch dev main &&
 	test_commit two &&
-	git symbolic-ref refs/heads/release refs/heads/master &&
+	git symbolic-ref refs/heads/release refs/heads/main &&
 	git tag -a -m "annotated tag" annotated-tag
 '
 
 test_expect_success 'basics of ls-refs' '
 	test-tool pkt-line pack >in <<-EOF &&
 	command=ls-refs
+	object-format=$(test_oid algo)
 	0000
 	EOF
 
 	cat >expect <<-EOF &&
 	$(git rev-parse HEAD) HEAD
 	$(git rev-parse refs/heads/dev) refs/heads/dev
-	$(git rev-parse refs/heads/master) refs/heads/master
+	$(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
@@ -96,14 +119,15 @@ test_expect_success 'basics of ls-refs' '
 test_expect_success 'basic ref-prefixes' '
 	test-tool pkt-line pack >in <<-EOF &&
 	command=ls-refs
+	object-format=$(test_oid algo)
 	0001
-	ref-prefix refs/heads/master
+	ref-prefix refs/heads/main
 	ref-prefix refs/tags/one
 	0000
 	EOF
 
 	cat >expect <<-EOF &&
-	$(git rev-parse refs/heads/master) refs/heads/master
+	$(git rev-parse refs/heads/main) refs/heads/main
 	$(git rev-parse refs/tags/one) refs/tags/one
 	0000
 	EOF
@@ -116,6 +140,7 @@ test_expect_success 'basic ref-prefixes' '
 test_expect_success 'refs/heads prefix' '
 	test-tool pkt-line pack >in <<-EOF &&
 	command=ls-refs
+	object-format=$(test_oid algo)
 	0001
 	ref-prefix refs/heads/
 	0000
@@ -123,7 +148,7 @@ test_expect_success 'refs/heads prefix' '
 
 	cat >expect <<-EOF &&
 	$(git rev-parse refs/heads/dev) refs/heads/dev
-	$(git rev-parse refs/heads/master) refs/heads/master
+	$(git rev-parse refs/heads/main) refs/heads/main
 	$(git rev-parse refs/heads/release) refs/heads/release
 	0000
 	EOF
@@ -136,6 +161,7 @@ test_expect_success 'refs/heads prefix' '
 test_expect_success 'peel parameter' '
 	test-tool pkt-line pack >in <<-EOF &&
 	command=ls-refs
+	object-format=$(test_oid algo)
 	0001
 	peel
 	ref-prefix refs/tags/
@@ -157,6 +183,7 @@ test_expect_success 'peel parameter' '
 test_expect_success 'symrefs parameter' '
 	test-tool pkt-line pack >in <<-EOF &&
 	command=ls-refs
+	object-format=$(test_oid algo)
 	0001
 	symrefs
 	ref-prefix refs/heads/
@@ -165,8 +192,8 @@ test_expect_success 'symrefs parameter' '
 
 	cat >expect <<-EOF &&
 	$(git rev-parse refs/heads/dev) refs/heads/dev
-	$(git rev-parse refs/heads/master) refs/heads/master
-	$(git rev-parse refs/heads/release) refs/heads/release symref-target:refs/heads/master
+	$(git rev-parse refs/heads/main) refs/heads/main
+	$(git rev-parse refs/heads/release) refs/heads/release symref-target:refs/heads/main
 	0000
 	EOF
 
@@ -178,6 +205,7 @@ test_expect_success 'symrefs parameter' '
 test_expect_success 'sending server-options' '
 	test-tool pkt-line pack >in <<-EOF &&
 	command=ls-refs
+	object-format=$(test_oid algo)
 	server-option=hello
 	server-option=world
 	0001
@@ -200,6 +228,7 @@ test_expect_success 'unexpected lines are not allowed in fetch request' '
 
 	test-tool pkt-line pack >in <<-EOF &&
 	command=fetch
+	object-format=$(test_oid algo)
 	0001
 	this-is-not-a-command
 	0000
@@ -212,4 +241,29 @@ test_expect_success 'unexpected lines are not allowed in fetch request' '
 	grep "unexpected line: .this-is-not-a-command." err
 '
 
+# Test the basics of object-info
+#
+test_expect_success 'basics of object-info' '
+	test-tool pkt-line pack >in <<-EOF &&
+	command=object-info
+	object-format=$(test_oid algo)
+	0001
+	size
+	oid $(git rev-parse two:two.t)
+	oid $(git rev-parse two:two.t)
+	0000
+	EOF
+
+	cat >expect <<-EOF &&
+	size
+	$(git rev-parse two:two.t) $(wc -c <two.t | xargs)
+	$(git rev-parse two:two.t) $(wc -c <two.t | xargs)
+	0000
+	EOF
+
+	test-tool serve-v2 --stateless-rpc <in >out &&
+	test-tool pkt-line unpack <out >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t5702-protocol-v2.sh b/t/t5702-protocol-v2.sh
index ae9175cedf..d3687b1a2e 100755
--- a/t/t5702-protocol-v2.sh
+++ b/t/t5702-protocol-v2.sh
@@ -4,6 +4,9 @@ test_description='test git wire-protocol version 2'
 
 TEST_NO_CREATE_REPO=1
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Test protocol v2 with 'git://' transport
@@ -24,22 +27,22 @@ 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
 '
 
-test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' '
+test_expect_success 'ref advertisement is filtered with ls-remote using protocol v2' '
 	test_when_finished "rm -f log" &&
 
 	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		ls-remote "$GIT_DAEMON_URL/parent" master >actual &&
+		ls-remote "$GIT_DAEMON_URL/parent" main >actual &&
 
 	cat >expect <<-EOF &&
-	$(git -C "$daemon_parent" rev-parse refs/heads/master)$(printf "\t")refs/heads/master
+	$(git -C "$daemon_parent" rev-parse refs/heads/main)$(printf "\t")refs/heads/main
 	EOF
 
 	test_cmp expect actual
@@ -69,7 +72,7 @@ test_expect_success 'fetch with git:// using protocol v2' '
 	GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
 		fetch &&
 
-	git -C daemon_child log -1 --format=%s origin/master >actual &&
+	git -C daemon_child log -1 --format=%s origin/main >actual &&
 	git -C "$daemon_parent" log -1 --format=%s >expect &&
 	test_cmp expect actual &&
 
@@ -118,7 +121,7 @@ test_expect_success 'push with git:// and a config of v2 does not request v2' '
 	test_commit -C daemon_child three &&
 
 	# Push to another branch, as the target repository has the
-	# master branch checked out and we cannot push into it.
+	# main branch checked out and we cannot push into it.
 	GIT_TRACE_PACKET="$(pwd)/log" git -C daemon_child -c protocol.version=2 \
 		push origin HEAD:client_branch &&
 
@@ -148,20 +151,20 @@ 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
 '
 
-test_expect_success 'ref advertisment is filtered with ls-remote using protocol v2' '
+test_expect_success 'ref advertisement is filtered with ls-remote using protocol v2' '
 	test_when_finished "rm -f log" &&
 
 	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		ls-remote "file://$(pwd)/file_parent" master >actual &&
+		ls-remote "file://$(pwd)/file_parent" main >actual &&
 
 	cat >expect <<-EOF &&
-	$(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master
+	$(git -C file_parent rev-parse refs/heads/main)$(printf "\t")refs/heads/main
 	EOF
 
 	test_cmp expect actual
@@ -171,10 +174,10 @@ test_expect_success 'server-options are sent when using ls-remote' '
 	test_when_finished "rm -f log" &&
 
 	GIT_TRACE_PACKET="$(pwd)/log" git -c protocol.version=2 \
-		ls-remote -o hello -o world "file://$(pwd)/file_parent" master >actual &&
+		ls-remote -o hello -o world "file://$(pwd)/file_parent" main >actual &&
 
 	cat >expect <<-EOF &&
-	$(git -C file_parent rev-parse refs/heads/master)$(printf "\t")refs/heads/master
+	$(git -C file_parent rev-parse refs/heads/main)$(printf "\t")refs/heads/main
 	EOF
 
 	test_cmp expect actual &&
@@ -184,7 +187,7 @@ test_expect_success 'server-options are sent when using ls-remote' '
 
 test_expect_success 'warn if using server-option with ls-remote with legacy protocol' '
 	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -c protocol.version=0 \
-		ls-remote -o hello -o world "file://$(pwd)/file_parent" master 2>err &&
+		ls-remote -o hello -o world "file://$(pwd)/file_parent" main 2>err &&
 
 	test_i18ngrep "see protocol.version in" err &&
 	test_i18ngrep "server options require protocol version 2 or later" err
@@ -209,6 +212,31 @@ test_expect_success 'clone with file:// using protocol v2' '
 	grep "ref-prefix refs/tags/" log
 '
 
+test_expect_success 'clone of empty repo propagates name of default branch' '
+	test_when_finished "rm -rf file_empty_parent file_empty_child" &&
+
+	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 "file://$(pwd)/file_empty_parent" file_empty_child &&
+	grep "refs/heads/mydefaultbranch" file_empty_child/.git/HEAD
+'
+
+test_expect_success '...but not if explicitly forbidden by config' '
+	test_when_finished "rm -rf file_empty_parent file_empty_child" &&
+
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=mydefaultbranch init file_empty_parent &&
+	test_config -C file_empty_parent lsrefs.unborn ignore &&
+
+	GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME= \
+	git -c init.defaultBranch=main -c protocol.version=2 \
+		clone "file://$(pwd)/file_empty_parent" file_empty_child &&
+	! grep "refs/heads/mydefaultbranch" file_empty_child/.git/HEAD
+'
+
 test_expect_success 'fetch with file:// using protocol v2' '
 	test_when_finished "rm -f log" &&
 
@@ -217,7 +245,7 @@ test_expect_success 'fetch with file:// using protocol v2' '
 	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
 		fetch origin &&
 
-	git -C file_child log -1 --format=%s origin/master >actual &&
+	git -C file_child log -1 --format=%s origin/main >actual &&
 	git -C file_parent log -1 --format=%s >expect &&
 	test_cmp expect actual &&
 
@@ -225,20 +253,20 @@ test_expect_success 'fetch with file:// using protocol v2' '
 	grep "fetch< version 2" log
 '
 
-test_expect_success 'ref advertisment is filtered during fetch using protocol v2' '
+test_expect_success 'ref advertisement is filtered during fetch using protocol v2' '
 	test_when_finished "rm -f log" &&
 
 	test_commit -C file_parent three &&
 	git -C file_parent branch unwanted-branch three &&
 
 	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
-		fetch origin master &&
+		fetch origin main &&
 
-	git -C file_child log -1 --format=%s origin/master >actual &&
+	git -C file_child log -1 --format=%s origin/main >actual &&
 	git -C file_parent log -1 --format=%s >expect &&
 	test_cmp expect actual &&
 
-	grep "refs/heads/master" log &&
+	grep "refs/heads/main" log &&
 	! grep "refs/heads/unwanted-branch" log
 '
 
@@ -248,9 +276,9 @@ test_expect_success 'server-options are sent when fetching' '
 	test_commit -C file_parent four &&
 
 	GIT_TRACE_PACKET="$(pwd)/log" git -C file_child -c protocol.version=2 \
-		fetch -o hello -o world origin master &&
+		fetch -o hello -o world origin main &&
 
-	git -C file_child log -1 --format=%s origin/master >actual &&
+	git -C file_child log -1 --format=%s origin/main >actual &&
 	git -C file_parent log -1 --format=%s >expect &&
 	test_cmp expect actual &&
 
@@ -264,7 +292,7 @@ test_expect_success 'warn if using server-option with fetch with legacy protocol
 	git init temp_child &&
 
 	test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 git -C temp_child -c protocol.version=0 \
-		fetch -o hello -o world "file://$(pwd)/file_parent" master 2>err &&
+		fetch -o hello -o world "file://$(pwd)/file_parent" main 2>err &&
 
 	test_i18ngrep "see protocol.version in" err &&
 	test_i18ngrep "server options require protocol version 2 or later" err
@@ -325,7 +353,7 @@ test_expect_success 'partial clone' '
 	grep "version 2" trace &&
 
 	# Ensure that the old version of the file is missing
-	git -C client rev-list --quiet --objects --missing=print master \
+	git -C client rev-list --quiet --objects --missing=print main \
 		>observed.oids &&
 	grep "$(git -C server rev-parse message1:a.txt)" observed.oids &&
 
@@ -348,10 +376,9 @@ test_expect_success 'partial fetch' '
 	rm -rf client "$(pwd)/trace" &&
 	git init client &&
 	SERVER="file://$(pwd)/server" &&
-	test_config -C client extensions.partialClone "$SERVER" &&
 
 	GIT_TRACE_PACKET="$(pwd)/trace" git -C client -c protocol.version=2 \
-		fetch --filter=blob:none "$SERVER" master:refs/heads/other &&
+		fetch --filter=blob:none "$SERVER" main:refs/heads/other &&
 	grep "version 2" trace &&
 
 	# Ensure that the old version of the file is missing
@@ -394,8 +421,9 @@ test_expect_success 'even with handcrafted request, filter does not work if not
 	# Custom request that tries to filter even though it is not advertised.
 	test-tool pkt-line pack >in <<-EOF &&
 	command=fetch
+	object-format=$(test_oid algo)
 	0001
-	want $(git -C server rev-parse master)
+	want $(git -C server rev-parse main)
 	filter blob:none
 	0000
 	EOF
@@ -539,7 +567,7 @@ test_expect_success 'deepen-relative' '
 	test_commit -C server four &&
 
 	# Sanity check that only "three" is downloaded
-	git -C client log --pretty=tformat:%s master >actual &&
+	git -C client log --pretty=tformat:%s main >actual &&
 	echo three >expected &&
 	test_cmp expected actual &&
 
@@ -548,7 +576,7 @@ test_expect_success 'deepen-relative' '
 	# Ensure that protocol v2 is used
 	grep "fetch< version 2" trace &&
 
-	git -C client log --pretty=tformat:%s origin/master >actual &&
+	git -C client log --pretty=tformat:%s origin/main >actual &&
 	cat >expected <<-\EOF &&
 	four
 	three
@@ -557,6 +585,65 @@ test_expect_success 'deepen-relative' '
 	test_cmp expected actual
 '
 
+setup_negotiate_only () {
+	SERVER="$1"
+	URI="$2"
+
+	rm -rf "$SERVER" client
+
+	git init "$SERVER"
+	test_commit -C "$SERVER" one
+	test_commit -C "$SERVER" two
+
+	git clone "$URI" client
+	test_commit -C client three
+}
+
+test_expect_success 'usage: --negotiate-only without --negotiation-tip' '
+	SERVER="server" &&
+	URI="file://$(pwd)/server" &&
+
+	setup_negotiate_only "$SERVER" "$URI" &&
+
+	cat >err.expect <<-\EOF &&
+	fatal: --negotiate-only needs one or more --negotiate-tip=*
+	EOF
+
+	test_must_fail git -c protocol.version=2 -C client fetch \
+		--negotiate-only \
+		origin 2>err.actual &&
+	test_cmp err.expect err.actual
+'
+
+test_expect_success 'file:// --negotiate-only' '
+	SERVER="server" &&
+	URI="file://$(pwd)/server" &&
+
+	setup_negotiate_only "$SERVER" "$URI" &&
+
+	git -c protocol.version=2 -C client fetch \
+		--no-tags \
+		--negotiate-only \
+		--negotiation-tip=$(git -C client rev-parse HEAD) \
+		origin >out &&
+	COMMON=$(git -C "$SERVER" rev-parse two) &&
+	grep "$COMMON" out
+'
+
+test_expect_success 'file:// --negotiate-only with protocol v0' '
+	SERVER="server" &&
+	URI="file://$(pwd)/server" &&
+
+	setup_negotiate_only "$SERVER" "$URI" &&
+
+	test_must_fail git -c protocol.version=0 -C client fetch \
+		--no-tags \
+		--negotiate-only \
+		--negotiation-tip=$(git -C client rev-parse HEAD) \
+		origin 2>err &&
+	test_i18ngrep "negotiate-only requires protocol v2" err
+'
+
 # Test protocol v2 with 'http://' transport
 #
 . "$TEST_DIRECTORY"/lib-httpd.sh
@@ -586,6 +673,53 @@ test_expect_success 'clone with http:// using protocol v2' '
 	! grep "Send header: Transfer-Encoding: chunked" log
 '
 
+test_expect_success 'clone repository with http:// using protocol v2 with incomplete pktline length' '
+	test_when_finished "rm -f log" &&
+
+	git init "$HTTPD_DOCUMENT_ROOT_PATH/incomplete_length" &&
+	test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/incomplete_length" file &&
+
+	test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git -c protocol.version=2 \
+		clone "$HTTPD_URL/smart/incomplete_length" incomplete_length_child 2>err &&
+
+	# Client requested to use protocol v2
+	grep "Git-Protocol: version=2" log &&
+	# Server responded using protocol v2
+	grep "git< version 2" log &&
+	# Client reported appropriate failure
+	test_i18ngrep "bytes of length header were received" err
+'
+
+test_expect_success 'clone repository with http:// using protocol v2 with incomplete pktline body' '
+	test_when_finished "rm -f log" &&
+
+	git init "$HTTPD_DOCUMENT_ROOT_PATH/incomplete_body" &&
+	test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/incomplete_body" file &&
+
+	test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" git -c protocol.version=2 \
+		clone "$HTTPD_URL/smart/incomplete_body" incomplete_body_child 2>err &&
+
+	# Client requested to use protocol v2
+	grep "Git-Protocol: version=2" log &&
+	# Server responded using protocol v2
+	grep "git< version 2" log &&
+	# Client reported appropriate failure
+	test_i18ngrep "bytes of body are still expected" err
+'
+
+test_expect_success 'clone with http:// using protocol v2 and invalid parameters' '
+	test_when_finished "rm -f log" &&
+
+	test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" GIT_TRACE_CURL="$(pwd)/log" \
+		git -c protocol.version=2 \
+		clone --shallow-since=20151012 "$HTTPD_URL/smart/http_parent" http_child_invalid &&
+
+	# Client requested to use protocol v2
+	grep "Git-Protocol: version=2" log &&
+	# Server responded using protocol v2
+	grep "git< version 2" log
+'
+
 test_expect_success 'clone big repository with http:// using protocol v2' '
 	test_when_finished "rm -f log" &&
 
@@ -623,7 +757,7 @@ test_expect_success 'fetch with http:// using protocol v2' '
 	GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
 		fetch &&
 
-	git -C http_child log -1 --format=%s origin/master >actual &&
+	git -C http_child log -1 --format=%s origin/main >actual &&
 	git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
 	test_cmp expect actual &&
 
@@ -651,11 +785,11 @@ test_expect_success 'fetch from namespaced repo respects namespaces' '
 	test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" one &&
 	test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" two &&
 	git -C "$HTTPD_DOCUMENT_ROOT_PATH/nsrepo" \
-		update-ref refs/namespaces/ns/refs/heads/master one &&
+		update-ref refs/namespaces/ns/refs/heads/main one &&
 
 	GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
 		fetch "$HTTPD_URL/smart_namespace/nsrepo" \
-		refs/heads/master:refs/heads/theirs &&
+		refs/heads/main:refs/heads/theirs &&
 
 	# Server responded using protocol v2
 	grep "fetch< version 2" log &&
@@ -665,6 +799,18 @@ test_expect_success 'fetch from namespaced repo respects namespaces' '
 	test_cmp expect actual
 '
 
+test_expect_success 'ls-remote with v2 http sends only one POST' '
+	test_when_finished "rm -f log" &&
+
+	git ls-remote "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" >expect &&
+	GIT_TRACE_CURL="$(pwd)/log" git -c protocol.version=2 \
+		ls-remote "$HTTPD_URL/smart/http_parent" >actual &&
+	test_cmp expect actual &&
+
+	grep "Send header: POST" log >posts &&
+	test_line_count = 1 posts
+'
+
 test_expect_success 'push with http:// and a config of v2 does not request v2' '
 	test_when_finished "rm -f log" &&
 	# Till v2 for push is designed, make sure that if a client has
@@ -674,7 +820,7 @@ test_expect_success 'push with http:// and a config of v2 does not request v2' '
 	test_commit -C http_child three &&
 
 	# Push to another branch, as the target repository has the
-	# master branch checked out and we cannot push into it.
+	# main branch checked out and we cannot push into it.
 	GIT_TRACE_PACKET="$(pwd)/log" git -C http_child -c protocol.version=2 \
 		push origin HEAD:client_branch &&
 
@@ -682,9 +828,9 @@ test_expect_success 'push with http:// and a config of v2 does not request v2' '
 	git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect &&
 	test_cmp expect actual &&
 
-	# Client didnt request to use protocol v2
+	# Client did not request to use protocol v2
 	! grep "Git-Protocol: version=2" log &&
-	# Server didnt respond using protocol v2
+	# Server did not respond using protocol v2
 	! grep "git< version 2" log
 '
 
@@ -700,11 +846,11 @@ test_expect_success 'when server sends "ready", expect DELIM' '
 
 	# After "ready" in the acknowledgments section, pretend that a FLUSH
 	# (0000) was sent instead of a DELIM (0001).
-	printf "/ready/,$ s/0001/0000/" \
-		>"$HTTPD_ROOT_PATH/one-time-sed" &&
+	printf "\$ready = 1 if /ready/; \$ready && s/0001/0000/" \
+		>"$HTTPD_ROOT_PATH/one-time-perl" &&
 
 	test_must_fail git -C http_child -c protocol.version=2 \
-		fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err &&
+		fetch "$HTTPD_URL/one_time_perl/http_parent" 2> err &&
 	test_i18ngrep "expected packfile to be sent after .ready." err
 '
 
@@ -725,17 +871,275 @@ test_expect_success 'when server does not send "ready", expect FLUSH' '
 
 	# After the acknowledgments section, pretend that a DELIM
 	# (0001) was sent instead of a FLUSH (0000).
-	printf "/acknowledgments/,$ s/0000/0001/" \
-		>"$HTTPD_ROOT_PATH/one-time-sed" &&
+	printf "\$ack = 1 if /acknowledgments/; \$ack && s/0000/0001/" \
+		>"$HTTPD_ROOT_PATH/one-time-perl" &&
 
 	test_must_fail env GIT_TRACE_PACKET="$(pwd)/log" git -C http_child \
 		-c protocol.version=2 \
-		fetch "$HTTPD_URL/one_time_sed/http_parent" 2> err &&
+		fetch "$HTTPD_URL/one_time_perl/http_parent" 2> err &&
 	grep "fetch< .*acknowledgments" log &&
 	! grep "fetch< .*ready" log &&
 	test_i18ngrep "expected no other sections to be sent after no .ready." err
 '
 
+configure_exclusion () {
+	git -C "$1" hash-object "$2" >objh &&
+	git -C "$1" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
+	git -C "$1" config --add \
+		"uploadpack.blobpackfileuri" \
+		"$(cat objh) $(cat packh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+	cat objh
+}
+
+test_expect_success 'part of packfile response provided as URI' '
+	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 &&
+	echo other-blob >"$P/other-blob" &&
+	git -C "$P" add other-blob &&
+	git -C "$P" commit -m x &&
+
+	configure_exclusion "$P" my-blob >h &&
+	configure_exclusion "$P" other-blob >h2 &&
+
+	GIT_TRACE=1 GIT_TRACE_PACKET="$(pwd)/log" GIT_TEST_SIDEBAND_ALL=1 \
+	git -c protocol.version=2 \
+		-c fetch.uriprotocols=http,https \
+		clone "$HTTPD_URL/smart/http_parent" http_child &&
+
+	# Ensure that my-blob and other-blob are in separate packfiles.
+	for idx in http_child/.git/objects/pack/*.idx
+	do
+		git verify-pack --object-format=$(test_oid algo) --verbose $idx >out &&
+		{
+			grep "^[0-9a-f]\{16,\} " out || :
+		} >out.objectlist &&
+		if test_line_count = 1 out.objectlist
+		then
+			if grep $(cat h) out
+			then
+				>hfound
+			fi &&
+			if grep $(cat h2) out
+			then
+				>h2found
+			fi
+		fi
+	done &&
+	test -f hfound &&
+	test -f h2found &&
+
+	# Ensure that there are exactly 3 packfiles with associated .idx
+	ls http_child/.git/objects/pack/*.pack \
+	    http_child/.git/objects/pack/*.idx >filelist &&
+	test_line_count = 6 filelist
+'
+
+test_expect_success 'packfile URIs with fetch instead of clone' '
+	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 &&
+
+	configure_exclusion "$P" my-blob >h &&
+
+	git init http_child &&
+
+	GIT_TEST_SIDEBAND_ALL=1 \
+	git -C http_child -c protocol.version=2 \
+		-c fetch.uriprotocols=http,https \
+		fetch "$HTTPD_URL/smart/http_parent"
+'
+
+test_expect_success 'fetching with valid packfile URI but invalid hash fails' '
+	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 &&
+	echo other-blob >"$P/other-blob" &&
+	git -C "$P" add other-blob &&
+	git -C "$P" commit -m x &&
+
+	configure_exclusion "$P" my-blob >h &&
+	# Configure a URL for other-blob. Just reuse the hash of the object as
+	# the hash of the packfile, since the hash does not matter for this
+	# test as long as it is not the hash of the pack, and it is of the
+	# expected length.
+	git -C "$P" hash-object other-blob >objh &&
+	git -C "$P" pack-objects "$HTTPD_DOCUMENT_ROOT_PATH/mypack" <objh >packh &&
+	git -C "$P" config --add \
+		"uploadpack.blobpackfileuri" \
+		"$(cat objh) $(cat objh) $HTTPD_URL/dumb/mypack-$(cat packh).pack" &&
+
+	test_must_fail env GIT_TEST_SIDEBAND_ALL=1 \
+		git -c protocol.version=2 \
+		-c fetch.uriprotocols=http,https \
+		clone "$HTTPD_URL/smart/http_parent" http_child 2>err &&
+	test_i18ngrep "pack downloaded from.*does not match expected hash" err
+'
+
+test_expect_success 'packfile-uri with transfer.fsckobjects' '
+	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 &&
+
+	configure_exclusion "$P" my-blob >h &&
+
+	sane_unset GIT_TEST_SIDEBAND_ALL &&
+	git -c protocol.version=2 -c transfer.fsckobjects=1 \
+		-c fetch.uriprotocols=http,https \
+		clone "$HTTPD_URL/smart/http_parent" http_child &&
+
+	# Ensure that there are exactly 2 packfiles with associated .idx
+	ls http_child/.git/objects/pack/*.pack \
+	    http_child/.git/objects/pack/*.idx >filelist &&
+	test_line_count = 4 filelist
+'
+
+test_expect_success 'packfile-uri with transfer.fsckobjects fails on bad object' '
+	P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+	rm -rf "$P" http_child log &&
+
+	git init "$P" &&
+	git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+	cat >bogus-commit <<-EOF &&
+	tree $EMPTY_TREE
+	author Bugs Bunny 1234567890 +0000
+	committer Bugs Bunny <bugs@bun.ni> 1234567890 +0000
+
+	This commit object intentionally broken
+	EOF
+	BOGUS=$(git -C "$P" hash-object -t commit -w --stdin <bogus-commit) &&
+	git -C "$P" branch bogus-branch "$BOGUS" &&
+
+	echo my-blob >"$P/my-blob" &&
+	git -C "$P" add my-blob &&
+	git -C "$P" commit -m x &&
+
+	configure_exclusion "$P" my-blob >h &&
+
+	sane_unset GIT_TEST_SIDEBAND_ALL &&
+	test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \
+		-c fetch.uriprotocols=http,https \
+		clone "$HTTPD_URL/smart/http_parent" http_child 2>error &&
+	test_i18ngrep "invalid author/committer line - missing email" error
+'
+
+test_expect_success 'packfile-uri with transfer.fsckobjects succeeds when .gitmodules is separate from tree' '
+	P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+	rm -rf "$P" http_child &&
+
+	git init "$P" &&
+	git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+	echo "[submodule libfoo]" >"$P/.gitmodules" &&
+	echo "path = include/foo" >>"$P/.gitmodules" &&
+	echo "url = git://example.com/git/lib.git" >>"$P/.gitmodules" &&
+	git -C "$P" add .gitmodules &&
+	git -C "$P" commit -m x &&
+
+	configure_exclusion "$P" .gitmodules >h &&
+
+	sane_unset GIT_TEST_SIDEBAND_ALL &&
+	git -c protocol.version=2 -c transfer.fsckobjects=1 \
+		-c fetch.uriprotocols=http,https \
+		clone "$HTTPD_URL/smart/http_parent" http_child &&
+
+	# Ensure that there are exactly 2 packfiles with associated .idx
+	ls http_child/.git/objects/pack/*.pack \
+	    http_child/.git/objects/pack/*.idx >filelist &&
+	test_line_count = 4 filelist
+'
+
+test_expect_success 'packfile-uri with transfer.fsckobjects fails when .gitmodules separate from tree is invalid' '
+	P="$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+	rm -rf "$P" http_child err &&
+
+	git init "$P" &&
+	git -C "$P" config "uploadpack.allowsidebandall" "true" &&
+
+	echo "[submodule \"..\"]" >"$P/.gitmodules" &&
+	echo "path = include/foo" >>"$P/.gitmodules" &&
+	echo "url = git://example.com/git/lib.git" >>"$P/.gitmodules" &&
+	git -C "$P" add .gitmodules &&
+	git -C "$P" commit -m x &&
+
+	configure_exclusion "$P" .gitmodules >h &&
+
+	sane_unset GIT_TEST_SIDEBAND_ALL &&
+	test_must_fail git -c protocol.version=2 -c transfer.fsckobjects=1 \
+		-c fetch.uriprotocols=http,https \
+		clone "$HTTPD_URL/smart/http_parent" http_child 2>err &&
+	test_i18ngrep "disallowed submodule name" err
+'
+
+test_expect_success 'http:// --negotiate-only' '
+	SERVER="$HTTPD_DOCUMENT_ROOT_PATH/server" &&
+	URI="$HTTPD_URL/smart/server" &&
+
+	setup_negotiate_only "$SERVER" "$URI" &&
+
+	git -c protocol.version=2 -C client fetch \
+		--no-tags \
+		--negotiate-only \
+		--negotiation-tip=$(git -C client rev-parse HEAD) \
+		origin >out &&
+	COMMON=$(git -C "$SERVER" rev-parse two) &&
+	grep "$COMMON" out
+'
+
+test_expect_success 'http:// --negotiate-only without wait-for-done support' '
+	SERVER="server" &&
+	URI="$HTTPD_URL/one_time_perl/server" &&
+
+	setup_negotiate_only "$SERVER" "$URI" &&
+
+	echo "s/ wait-for-done/ xxxx-xxx-xxxx/" \
+		>"$HTTPD_ROOT_PATH/one-time-perl" &&
+
+	test_must_fail git -c protocol.version=2 -C client fetch \
+		--no-tags \
+		--negotiate-only \
+		--negotiation-tip=$(git -C client rev-parse HEAD) \
+		origin 2>err &&
+	test_i18ngrep "server does not support wait-for-done" err
+'
+
+test_expect_success 'http:// --negotiate-only with protocol v0' '
+	SERVER="$HTTPD_DOCUMENT_ROOT_PATH/server" &&
+	URI="$HTTPD_URL/smart/server" &&
+
+	setup_negotiate_only "$SERVER" "$URI" &&
+
+	test_must_fail git -c protocol.version=0 -C client fetch \
+		--no-tags \
+		--negotiate-only \
+		--negotiation-tip=$(git -C client rev-parse HEAD) \
+		origin 2>err &&
+	test_i18ngrep "negotiate-only requires protocol v2" err
+'
+
 # DO NOT add non-httpd-specific tests here, because the last part of this
 # test script is only executed when httpd is available and enabled.
 
diff --git a/t/t5703-upload-pack-ref-in-want.sh b/t/t5703-upload-pack-ref-in-want.sh
index 3a2c143c6d..220098523a 100755
--- a/t/t5703-upload-pack-ref-in-want.sh
+++ b/t/t5703-upload-pack-ref-in-want.sh
@@ -2,6 +2,9 @@
 
 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 () {
@@ -13,29 +16,63 @@ get_actual_refs () {
 }
 
 get_actual_commits () {
-	sed -n -e '/packfile/,/0000/{
-		/packfile/d
-		p
-		}' <out | test-tool pkt-line unpack-sideband >o.pack &&
+	test-tool pkt-line unpack-sideband <out >o.pack &&
 	git index-pack o.pack &&
-	git verify-pack -v o.idx | grep commit | cut -c-40 | sort >actual_commits
+	git verify-pack -v o.idx >objs &&
+	sed -n -e 's/\([0-9a-f][0-9a-f]*\) commit .*/\1/p' objs >objs.sed &&
+	sort >actual_commits <objs.sed
 }
 
 check_output () {
 	get_actual_refs &&
 	test_cmp expected_refs actual_refs &&
 	get_actual_commits &&
-	test_cmp expected_commits actual_commits
+	sort expected_commits >sorted_commits &&
+	test_cmp sorted_commits actual_commits
+}
+
+write_command () {
+	echo "command=$1"
+
+	if test "$(test_oid algo)" != sha1
+	then
+		echo "object-format=$(test_oid algo)"
+	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(master)
+#         b   e(baz)  f(main)
 #          \__  |  __/
 #             \ | /
 #               a
 test_expect_success 'setup repository' '
 	test_commit a &&
+	git branch -M main &&
 	git checkout -b o/foo &&
 	test_commit b &&
 	test_commit c &&
@@ -43,115 +80,103 @@ test_expect_success 'setup repository' '
 	test_commit d &&
 	git checkout -b baz a &&
 	test_commit e &&
-	git checkout master &&
+	git checkout main &&
 	test_commit f
 '
 
 test_expect_success 'config controls ref-in-want advertisement' '
 	test-tool serve-v2 --advertise-capabilities >out &&
-	! grep -a ref-in-want out &&
+	perl -ne "/ref-in-want/ and print" out >out.filter &&
+	test_must_be_empty out.filter &&
 
 	git config uploadpack.allowRefInWant false &&
 	test-tool serve-v2 --advertise-capabilities >out &&
-	! grep -a ref-in-want out &&
+	perl -ne "/ref-in-want/ and print" out >out.filter &&
+	test_must_be_empty out.filter &&
 
 	git config uploadpack.allowRefInWant true &&
 	test-tool serve-v2 --advertise-capabilities >out &&
-	grep -a ref-in-want out
+	perl -ne "/ref-in-want/ and print" out >out.filter &&
+	test_file_not_empty out.filter
 '
 
 test_expect_success 'invalid want-ref line' '
-	test-tool pkt-line pack >in <<-EOF &&
-	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
 '
 
 test_expect_success 'basic want-ref' '
+	oid=$(git rev-parse f) &&
 	cat >expected_refs <<-EOF &&
-	$(git rev-parse f) refs/heads/master
+	$oid refs/heads/main
 	EOF
-	git rev-parse f | sort >expected_commits &&
+	git rev-parse f >expected_commits &&
 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=fetch
-	0001
-	no-progress
-	want-ref refs/heads/master
+	write_fetch_command >pkt <<-EOF &&
+	want-ref refs/heads/main
 	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
 '
 
 test_expect_success 'multiple want-ref lines' '
+	oid_c=$(git rev-parse c) &&
+	oid_d=$(git rev-parse d) &&
 	cat >expected_refs <<-EOF &&
-	$(git rev-parse c) refs/heads/o/foo
-	$(git rev-parse d) refs/heads/o/bar
+	$oid_c refs/heads/o/foo
+	$oid_d refs/heads/o/bar
 	EOF
-	git rev-parse c d | sort >expected_commits &&
+	git rev-parse c d >expected_commits &&
 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=fetch
-	0001
-	no-progress
+	write_fetch_command >pkt <<-EOF &&
 	want-ref refs/heads/o/foo
 	want-ref refs/heads/o/bar
 	have $(git rev-parse b)
-	done
-	0000
 	EOF
+	test-tool pkt-line pack <pkt >in &&
 
 	test-tool serve-v2 --stateless-rpc >out <in &&
 	check_output
 '
 
 test_expect_success 'mix want and want-ref' '
+	oid=$(git rev-parse f) &&
 	cat >expected_refs <<-EOF &&
-	$(git rev-parse f) refs/heads/master
+	$oid refs/heads/main
 	EOF
-	git rev-parse e f | sort >expected_commits &&
+	git rev-parse e f >expected_commits &&
 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=fetch
-	0001
-	no-progress
-	want-ref refs/heads/master
+	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
 '
 
 test_expect_success 'want-ref with ref we already have commit for' '
+	oid=$(git rev-parse c) &&
 	cat >expected_refs <<-EOF &&
-	$(git rev-parse c) refs/heads/o/foo
+	$oid refs/heads/o/foo
 	EOF
 	>expected_commits &&
 
-	test-tool pkt-line pack >in <<-EOF &&
-	command=fetch
-	0001
-	no-progress
+	write_fetch_command >pkt <<-EOF &&
 	want-ref refs/heads/o/foo
 	have $(git rev-parse c)
-	done
-	0000
 	EOF
+	test-tool pkt-line pack <pkt >in &&
 
 	test-tool serve-v2 --stateless-rpc >out <in &&
 	check_output
@@ -163,7 +188,7 @@ LOCAL_PRISTINE="$(pwd)/local_pristine"
 # $REPO
 # c(o/foo) d(o/bar)
 #        \ /
-#         b   e(baz)  f(master)
+#         b   e(baz)  f(main)
 #          \__  |  __/
 #             \ | /
 #               a
@@ -174,10 +199,10 @@ LOCAL_PRISTINE="$(pwd)/local_pristine"
 #		.
 #		.
 #		|
-#		a(master)
+#		a(main)
 test_expect_success 'setup repos for fetching with ref-in-want tests' '
 	(
-		git init "$REPO" &&
+		git init -b main "$REPO" &&
 		cd "$REPO" &&
 		test_commit a &&
 
@@ -190,7 +215,7 @@ test_expect_success 'setup repos for fetching with ref-in-want tests' '
 		test_commit_bulk --id=s 33 &&
 
 		# Add novel commits to upstream
-		git checkout master &&
+		git checkout main &&
 		cd "$REPO" &&
 		git checkout -b o/foo &&
 		test_commit b &&
@@ -199,7 +224,7 @@ test_expect_success 'setup repos for fetching with ref-in-want tests' '
 		test_commit d &&
 		git checkout -b baz a &&
 		test_commit e &&
-		git checkout master &&
+		git checkout main &&
 		test_commit f
 	) &&
 	git -C "$REPO" config uploadpack.allowRefInWant true &&
@@ -211,13 +236,14 @@ test_expect_success 'fetching with exact OID' '
 
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
+	oid=$(git -C "$REPO" rev-parse d) &&
 	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
-		$(git -C "$REPO" rev-parse d):refs/heads/actual &&
+		"$oid":refs/heads/actual &&
 
 	git -C "$REPO" rev-parse "d" >expected &&
 	git -C local rev-parse refs/heads/actual >actual &&
 	test_cmp expected actual &&
-	grep "want $(git -C "$REPO" rev-parse d)" log
+	grep "want $oid" log
 '
 
 test_expect_success 'fetching multiple refs' '
@@ -225,12 +251,12 @@ test_expect_success 'fetching multiple refs' '
 
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
-	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin master baz &&
+	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin main baz &&
 
-	git -C "$REPO" rev-parse "master" "baz" >expected &&
-	git -C local rev-parse refs/remotes/origin/master refs/remotes/origin/baz >actual &&
+	git -C "$REPO" rev-parse "main" "baz" >expected &&
+	git -C local rev-parse refs/remotes/origin/main refs/remotes/origin/baz >actual &&
 	test_cmp expected actual &&
-	grep "want-ref refs/heads/master" log &&
+	grep "want-ref refs/heads/main" log &&
 	grep "want-ref refs/heads/baz" log
 '
 
@@ -239,14 +265,15 @@ test_expect_success 'fetching ref and exact OID' '
 
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
+	oid=$(git -C "$REPO" rev-parse b) &&
 	GIT_TRACE_PACKET="$(pwd)/log" git -C local fetch origin \
-		master $(git -C "$REPO" rev-parse b):refs/heads/actual &&
+		main "$oid":refs/heads/actual &&
 
-	git -C "$REPO" rev-parse "master" "b" >expected &&
-	git -C local rev-parse refs/remotes/origin/master refs/heads/actual >actual &&
+	git -C "$REPO" rev-parse "main" "b" >expected &&
+	git -C local rev-parse refs/remotes/origin/main refs/heads/actual >actual &&
 	test_cmp expected actual &&
-	grep "want $(git -C "$REPO" rev-parse b)" log &&
-	grep "want-ref refs/heads/master" log
+	grep "want $oid" log &&
+	grep "want-ref refs/heads/main" log
 '
 
 test_expect_success 'fetching with wildcard that does not match any refs' '
@@ -272,6 +299,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
 
@@ -280,7 +442,7 @@ LOCAL_PRISTINE="$(pwd)/local_pristine"
 
 test_expect_success 'setup repos for change-while-negotiating test' '
 	(
-		git init "$REPO" &&
+		git init -b main "$REPO" &&
 		cd "$REPO" &&
 		>.git/git-daemon-export-ok &&
 		test_commit m1 &&
@@ -295,13 +457,13 @@ test_expect_success 'setup repos for change-while-negotiating test' '
 		test_commit_bulk --id=s 33 &&
 
 		# Add novel commits to upstream
-		git checkout master &&
+		git checkout main &&
 		cd "$REPO" &&
 		test_commit m2 &&
 		test_commit m3 &&
 		git tag -d m2 m3
 	) &&
-	git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_sed/repo" &&
+	git -C "$LOCAL_PRISTINE" remote set-url origin "http://127.0.0.1:$LIB_HTTPD_PORT/one_time_perl/repo" &&
 	git -C "$LOCAL_PRISTINE" config protocol.version 2
 '
 
@@ -312,17 +474,16 @@ inconsistency () {
 	# repository appears to change during negotiation, for example, when
 	# different servers in a load-balancing arrangement serve (stateless)
 	# RPCs during a single negotiation.
-	printf "s/%s/%s/" \
-	       $(git -C "$REPO" rev-parse $1 | tr -d "\n") \
-	       $(git -C "$REPO" rev-parse $2 | tr -d "\n") \
-	       >"$HTTPD_ROOT_PATH/one-time-sed"
+	oid1=$(git -C "$REPO" rev-parse $1) &&
+	oid2=$(git -C "$REPO" rev-parse $2) &&
+	echo "s/$oid1/$oid2/" >"$HTTPD_ROOT_PATH/one-time-perl"
 }
 
 test_expect_success 'server is initially ahead - no ref in want' '
 	git -C "$REPO" config uploadpack.allowRefInWant false &&
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
-	inconsistency master 1234567890123456789012345678901234567890 &&
+	inconsistency main $(test_oid numeric) &&
 	test_must_fail git -C local fetch 2>err &&
 	test_i18ngrep "fatal: remote error: upload-pack: not our ref" err
 '
@@ -331,11 +492,11 @@ test_expect_success 'server is initially ahead - ref in want' '
 	git -C "$REPO" config uploadpack.allowRefInWant true &&
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
-	inconsistency master 1234567890123456789012345678901234567890 &&
+	inconsistency main $(test_oid numeric) &&
 	git -C local fetch &&
 
-	git -C "$REPO" rev-parse --verify master >expected &&
-	git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+	git -C "$REPO" rev-parse --verify main >expected &&
+	git -C local rev-parse --verify refs/remotes/origin/main >actual &&
 	test_cmp expected actual
 '
 
@@ -343,11 +504,11 @@ test_expect_success 'server is initially behind - no ref in want' '
 	git -C "$REPO" config uploadpack.allowRefInWant false &&
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
-	inconsistency master "master^" &&
+	inconsistency main "main^" &&
 	git -C local fetch &&
 
-	git -C "$REPO" rev-parse --verify "master^" >expected &&
-	git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+	git -C "$REPO" rev-parse --verify "main^" >expected &&
+	git -C local rev-parse --verify refs/remotes/origin/main >actual &&
 	test_cmp expected actual
 '
 
@@ -355,11 +516,11 @@ test_expect_success 'server is initially behind - ref in want' '
 	git -C "$REPO" config uploadpack.allowRefInWant true &&
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
-	inconsistency master "master^" &&
+	inconsistency main "main^" &&
 	git -C local fetch &&
 
-	git -C "$REPO" rev-parse --verify "master" >expected &&
-	git -C local rev-parse --verify refs/remotes/origin/master >actual &&
+	git -C "$REPO" rev-parse --verify "main" >expected &&
+	git -C local rev-parse --verify refs/remotes/origin/main >actual &&
 	test_cmp expected actual
 '
 
@@ -367,10 +528,10 @@ test_expect_success 'server loses a ref - ref in want' '
 	git -C "$REPO" config uploadpack.allowRefInWant true &&
 	rm -rf local &&
 	cp -r "$LOCAL_PRISTINE" local &&
-	echo "s/master/raster/" >"$HTTPD_ROOT_PATH/one-time-sed" &&
+	echo "s/main/rain/" >"$HTTPD_ROOT_PATH/one-time-perl" &&
 	test_must_fail git -C local fetch 2>err &&
 
-	test_i18ngrep "fatal: remote error: unknown ref refs/heads/raster" err
+	test_i18ngrep "fatal: remote error: unknown ref refs/heads/rain" err
 '
 
 # DO NOT add non-httpd-specific tests here, because the last part of this
diff --git a/t/t5704-protocol-violations.sh b/t/t5704-protocol-violations.sh
new file mode 100755
index 0000000000..5c941949b9
--- /dev/null
+++ b/t/t5704-protocol-violations.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+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-lib.sh
+
+test_expect_success 'extra delim packet in v2 ls-refs args' '
+	{
+		packetize command=ls-refs &&
+		packetize "object-format=$(test_oid algo)" &&
+		printf 0001 &&
+		# protocol expects 0000 flush here
+		printf 0001
+	} >input &&
+	test_must_fail env GIT_PROTOCOL=version=2 \
+		git upload-pack . <input 2>err &&
+	test_i18ngrep "expected flush after ls-refs arguments" err
+'
+
+test_expect_success 'extra delim packet in v2 fetch args' '
+	{
+		packetize command=fetch &&
+		packetize "object-format=$(test_oid algo)" &&
+		printf 0001 &&
+		# protocol expects 0000 flush here
+		printf 0001
+	} >input &&
+	test_must_fail env GIT_PROTOCOL=version=2 \
+		git upload-pack . <input 2>err &&
+	test_i18ngrep "expected flush after fetch arguments" err
+'
+
+test_done
diff --git a/t/t5705-session-id-in-capabilities.sh b/t/t5705-session-id-in-capabilities.sh
new file mode 100755
index 0000000000..eb8c79aafd
--- /dev/null
+++ b/t/t5705-session-id-in-capabilities.sh
@@ -0,0 +1,89 @@
+#!/bin/sh
+
+test_description='session ID in capabilities'
+
+. ./test-lib.sh
+
+REPO="$(pwd)/repo"
+LOCAL_PRISTINE="$(pwd)/local_pristine"
+
+test_expect_success 'setup repos for session ID capability tests' '
+	git init "$REPO" &&
+	test_commit -C "$REPO" a &&
+	git clone "file://$REPO" "$LOCAL_PRISTINE" &&
+	test_commit -C "$REPO" b
+'
+
+for PROTO in 0 1 2
+do
+	test_expect_success "session IDs not advertised by default (fetch 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 &&
+		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
+		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
+	'
+
+	test_expect_success "session IDs not advertised by default (push v${PROTO})" '
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		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" \
+			origin HEAD:new-branch &&
+		test -z "$(grep \"key\":\"server-sid\" tr2-client-events)" &&
+		test -z "$(grep \"key\":\"client-sid\" tr2-server-events)"
+	'
+done
+
+test_expect_success 'enable SID advertisement' '
+	git -C "$REPO" config transfer.advertiseSID true &&
+	git -C "$LOCAL_PRISTINE" config transfer.advertiseSID true
+'
+
+for PROTO in 0 1 2
+do
+	test_expect_success "session IDs advertised (fetch 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\":\"server-sid\" tr2-client-events &&
+		grep \"key\":\"client-sid\" tr2-server-events
+	'
+
+	test_expect_success "session IDs advertised (push v${PROTO})" '
+		test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
+		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" \
+			origin HEAD:new-branch &&
+		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/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh
index 121e5c6edb..d386076dbd 100755
--- a/t/t5801-remote-helpers.sh
+++ b/t/t5801-remote-helpers.sh
@@ -5,15 +5,24 @@
 
 test_description='Test remote-helper import and export commands'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 
 PATH="$TEST_DIRECTORY/t5801:$PATH"
 
 compare_refs() {
+	fail= &&
+	if test "x$1" = 'x!'
+	then
+		fail='!' &&
+		shift
+	fi &&
 	git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
 	git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
-	test_cmp expect actual
+	eval $fail test_cmp expect actual
 }
 
 test_expect_success 'setup repository' '
@@ -65,18 +74,18 @@ test_expect_success 'fetch multiple branches' '
 	(cd local &&
 	 git fetch
 	) &&
-	compare_refs server master local refs/remotes/origin/master &&
+	compare_refs server main local refs/remotes/origin/main &&
 	compare_refs server new local refs/remotes/origin/new
 '
 
 test_expect_success 'push when remote has extra refs' '
 	(cd local &&
-	 git reset --hard origin/master &&
+	 git reset --hard origin/main &&
 	 echo content >>file &&
 	 git commit -a -m six &&
 	 git push
 	) &&
-	compare_refs local master server master
+	compare_refs local main server main
 '
 
 test_expect_success 'push new branch by name' '
@@ -168,7 +177,7 @@ test_expect_failure 'pushing without marks' '
 
 test_expect_success 'push all with existing object' '
 	(cd local &&
-	git branch dup2 master &&
+	git branch dup2 main &&
 	git push origin --all
 	) &&
 	compare_refs local dup2 server dup2
@@ -176,7 +185,7 @@ test_expect_success 'push all with existing object' '
 
 test_expect_success 'push ref with existing object' '
 	(cd local &&
-	git branch dup master &&
+	git branch dup main &&
 	git push origin dup
 	) &&
 	compare_refs local dup server dup
@@ -184,17 +193,17 @@ test_expect_success 'push ref with existing object' '
 
 test_expect_success GPG 'push signed tag' '
 	(cd local &&
-	git checkout master &&
+	git checkout main &&
 	git tag -s -m signed-tag signed-tag &&
 	git push origin signed-tag
 	) &&
 	compare_refs local signed-tag^{} server signed-tag^{} &&
-	test_must_fail compare_refs local signed-tag server signed-tag
+	compare_refs ! local signed-tag server signed-tag
 '
 
 test_expect_success GPG 'push signed tag with signed-tags capability' '
 	(cd local &&
-	git checkout master &&
+	git checkout main &&
 	git tag -s -m signed-tag signed-tag-2 &&
 	GIT_REMOTE_TESTGIT_SIGNED_TAGS=1 git push origin signed-tag-2
 	) &&
@@ -203,7 +212,7 @@ test_expect_success GPG 'push signed tag with signed-tags capability' '
 
 test_expect_success 'push update refs' '
 	(cd local &&
-	git checkout -b update master &&
+	git checkout -b update main &&
 	echo update >>file &&
 	git commit -a -m update &&
 	git push origin update &&
@@ -254,7 +263,7 @@ test_expect_success 'proper failure checks for fetching' '
 test_expect_success 'proper failure checks for pushing' '
 	test_when_finished "rm -rf local/git.marks local/testgit.marks" &&
 	(cd local &&
-	git checkout -b crash master &&
+	git checkout -b crash main &&
 	echo crash >>file &&
 	git commit -a -m crash &&
 	test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all &&
@@ -266,7 +275,7 @@ test_expect_success 'proper failure checks for pushing' '
 
 test_expect_success 'push messages' '
 	(cd local &&
-	git checkout -b new_branch master &&
+	git checkout -b new_branch main &&
 	echo new >>file &&
 	git commit -a -m new &&
 	git push origin new_branch &&
@@ -280,7 +289,7 @@ test_expect_success 'push messages' '
 
 test_expect_success 'fetch HEAD' '
 	(cd server &&
-	git checkout master &&
+	git checkout main &&
 	echo more >>file &&
 	git commit -a -m more
 	) &&
@@ -292,7 +301,7 @@ test_expect_success 'fetch HEAD' '
 
 test_expect_success 'fetch url' '
 	(cd server &&
-	git checkout master &&
+	git checkout main &&
 	echo more >>file &&
 	git commit -a -m more
 	) &&
diff --git a/t/t5801/git-remote-testgit b/t/t5801/git-remote-testgit
index 6b9f0b5dc7..1544d6dc6b 100755
--- a/t/t5801/git-remote-testgit
+++ b/t/t5801/git-remote-testgit
@@ -52,9 +52,11 @@ do
 		test -n "$GIT_REMOTE_TESTGIT_SIGNED_TAGS" && echo "signed-tags"
 		test -n "$GIT_REMOTE_TESTGIT_NO_PRIVATE_UPDATE" && echo "no-private-update"
 		echo 'option'
+		echo 'object-format'
 		echo
 		;;
 	list)
+		echo ":object-format $(git rev-parse --show-object-format=storage)"
 		git for-each-ref --format='? %(refname)' 'refs/heads/' 'refs/tags/'
 		head=$(git symbolic-ref HEAD)
 		echo "@$head HEAD"
@@ -139,6 +141,10 @@ do
 			test $val = "true" && force="true" || force=
 			echo "ok"
 			;;
+		object-format)
+			test $val = "true" && object_format="true" || object_format=
+			echo "ok"
+			;;
 		*)
 			echo "unsupported"
 			;;
diff --git a/t/t6000-rev-list-misc.sh b/t/t6000-rev-list-misc.sh
index b8cf82349b..ef849e5bc8 100755
--- a/t/t6000-rev-list-misc.sh
+++ b/t/t6000-rev-list-misc.sh
@@ -2,12 +2,16 @@
 
 test_description='miscellaneous rev-list tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
 	echo content1 >wanted_file &&
 	echo content2 >unwanted_file &&
 	git add wanted_file unwanted_file &&
+	test_tick &&
 	git commit -m one
 '
 
@@ -21,6 +25,7 @@ test_expect_success 'rev-list --objects with pathspecs and deeper paths' '
 	mkdir foo &&
 	>foo/file &&
 	git add foo/file &&
+	test_tick &&
 	git commit -m two &&
 
 	git rev-list --objects HEAD -- foo >output &&
@@ -69,6 +74,7 @@ test_expect_success '--no-object-names and --object-names are last-one-wins' '
 '
 
 test_expect_success 'rev-list A..B and rev-list ^A B are the same' '
+	test_tick &&
 	git commit --allow-empty -m another &&
 	git tag -a -m "annotated" v1.0 &&
 	git rev-list --objects ^v1.0^ v1.0 >expect &&
@@ -82,12 +88,12 @@ test_expect_success 'propagate uninteresting flag down correctly' '
 '
 
 test_expect_success 'symleft flag bit is propagated down from tag' '
-	git log --format="%m %s" --left-right v1.0...master >actual &&
+	git log --format="%m %s" --left-right v1.0...main >actual &&
 	cat >expect <<-\EOF &&
-	> two
-	> one
 	< another
 	< that
+	> two
+	> one
 	EOF
 	test_cmp expect actual
 '
@@ -104,13 +110,16 @@ test_expect_success 'rev-list can show index objects' '
 	#   - we do not show the root tree; since we updated the index, it
 	#     does not have a valid cache tree
 	#
-	cat >expect <<-\EOF &&
-	8e4020bb5a8d8c873b25de15933e75cc0fc275df one
-	d9d3a7417b9605cfd88ee6306b28dadc29e6ab08 only-in-index
-	9200b628cf9dc883a85a7abc8d6e6730baee589c two
-	EOF
 	echo only-in-index >only-in-index &&
 	test_when_finished "git reset --hard" &&
+	rev1=$(git rev-parse HEAD:one) &&
+	rev2=$(git rev-parse HEAD:two) &&
+	revi=$(git hash-object only-in-index) &&
+	cat >expect <<-EOF &&
+	$rev1 one
+	$revi only-in-index
+	$rev2 two
+	EOF
 	git add only-in-index &&
 	git rev-list --objects --indexed-objects >actual &&
 	test_cmp expect actual
@@ -122,8 +131,8 @@ test_expect_success 'rev-list can negate index objects' '
 	test_cmp expect actual
 '
 
-test_expect_success '--bisect and --first-parent can not be combined' '
-	test_must_fail git rev-list --bisect --first-parent HEAD
+test_expect_success '--bisect and --first-parent can be combined' '
+	git rev-list --bisect --first-parent HEAD
 '
 
 test_expect_success '--header shows a NUL after each commit' '
@@ -148,4 +157,47 @@ test_expect_success 'rev-list --end-of-options' '
 	test_cmp expect actual
 '
 
+test_expect_success 'rev-list --count' '
+	count=$(git rev-list --count HEAD) &&
+	git rev-list HEAD >actual &&
+	test_line_count = $count actual
+'
+
+test_expect_success 'rev-list --count --objects' '
+	count=$(git rev-list --count --objects HEAD) &&
+	git rev-list --objects HEAD >actual &&
+	test_line_count = $count actual
+'
+
+test_expect_success 'rev-list --unsorted-input results in different sorting' '
+	git rev-list --unsorted-input HEAD HEAD~ >first &&
+	git rev-list --unsorted-input HEAD~ HEAD >second &&
+	! test_cmp first second &&
+	sort first >first.sorted &&
+	sort second >second.sorted &&
+	test_cmp first.sorted second.sorted
+'
+
+test_expect_success 'rev-list --unsorted-input incompatible with --no-walk' '
+	cat >expect <<-EOF &&
+		fatal: --no-walk is incompatible with --unsorted-input
+	EOF
+	test_must_fail git rev-list --unsorted-input --no-walk HEAD 2>error &&
+	test_cmp expect error &&
+	test_must_fail git rev-list --unsorted-input --no-walk=sorted HEAD 2>error &&
+	test_cmp expect error &&
+	test_must_fail git rev-list --unsorted-input --no-walk=unsorted HEAD 2>error &&
+	test_cmp expect error &&
+
+	cat >expect <<-EOF &&
+		fatal: --unsorted-input is incompatible with --no-walk
+	EOF
+	test_must_fail git rev-list --no-walk --unsorted-input HEAD 2>error &&
+	test_cmp expect error &&
+	test_must_fail git rev-list --no-walk=sorted --unsorted-input HEAD 2>error &&
+	test_cmp expect error &&
+	test_must_fail git rev-list --no-walk=unsorted --unsorted-input HEAD 2>error &&
+	test_cmp expect error
+'
+
 test_done
diff --git a/t/t6001-rev-list-graft.sh b/t/t6001-rev-list-graft.sh
index 7504ba4751..7294147334 100755
--- a/t/t6001-rev-list-graft.sh
+++ b/t/t6001-rev-list-graft.sh
@@ -2,6 +2,9 @@
 
 test_description='Revision traversal vs grafts and path limiter'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -20,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/master .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/t6002-rev-list-bisect.sh b/t/t6002-rev-list-bisect.sh
index a661408038..b95a0212ad 100755
--- a/t/t6002-rev-list-bisect.sh
+++ b/t/t6002-rev-list-bisect.sh
@@ -263,4 +263,49 @@ test_expect_success 'rev-parse --bisect can default to good/bad refs' '
 	test_cmp expect.sorted actual.sorted
 '
 
+test_output_expect_success '--bisect --first-parent' 'git rev-list --bisect --first-parent E ^F' <<EOF
+e4
+EOF
+
+test_output_expect_success '--first-parent' 'git rev-list --first-parent E ^F' <<EOF
+E
+e1
+e2
+e3
+e4
+e5
+e6
+e7
+e8
+EOF
+
+test_output_expect_success '--bisect-vars --first-parent' 'git rev-list --bisect-vars --first-parent E ^F' <<EOF
+bisect_rev='e5'
+bisect_nr=4
+bisect_good=4
+bisect_bad=3
+bisect_all=9
+bisect_steps=2
+EOF
+
+test_expect_success '--bisect-all --first-parent' '
+	cat >expect.unsorted <<-EOF &&
+	$(git rev-parse E) (tag: E, dist=0)
+	$(git rev-parse e1) (tag: e1, dist=1)
+	$(git rev-parse e2) (tag: e2, dist=2)
+	$(git rev-parse e3) (tag: e3, dist=3)
+	$(git rev-parse e4) (tag: e4, dist=4)
+	$(git rev-parse e5) (tag: e5, dist=4)
+	$(git rev-parse e6) (tag: e6, dist=3)
+	$(git rev-parse e7) (tag: e7, dist=2)
+	$(git rev-parse e8) (tag: e8, dist=1)
+	EOF
+
+	# expect results to be ordered by distance (descending),
+	# commit hash (ascending)
+	sort -k4,4r -k1,1 expect.unsorted >expect &&
+	git rev-list --bisect-all --first-parent E ^F >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t6004-rev-list-path-optim.sh b/t/t6004-rev-list-path-optim.sh
index 3e8c42ee0b..cd4f420e2a 100755
--- a/t/t6004-rev-list-path-optim.sh
+++ b/t/t6004-rev-list-path-optim.sh
@@ -4,7 +4,7 @@ test_description='git rev-list trivial path optimization test
 
    d/z1
    b0                             b1
-   o------------------------*----o master
+   o------------------------*----o main
   /                        /
  o---------o----o----o----o side
  a0        c0   c1   a1   c2
@@ -13,6 +13,9 @@ test_description='git rev-list trivial path optimization test
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -55,18 +58,18 @@ test_expect_success 'further setup' '
 	git add c &&
 	test_tick &&
 	git commit -m "Side makes yet another irrelevant commit" &&
-	git checkout master &&
+	git checkout main &&
 	echo Another >b &&
 	echo Munged >d/z &&
 	git add b d/z &&
 	test_tick &&
-	git commit -m "Master touches b" &&
-	git tag master_b0 &&
+	git commit -m "Main touches b" &&
+	git tag main_b0 &&
 	git merge side &&
 	echo Touched >b &&
 	git add b &&
 	test_tick &&
-	git commit -m "Master touches b again"
+	git commit -m "Main touches b again"
 '
 
 test_expect_success 'path optimization 2' '
@@ -76,13 +79,13 @@ test_expect_success 'path optimization 2' '
 '
 
 test_expect_success 'pathspec with leading path' '
-	git rev-parse master^ master_b0 side_c0 initial >expected &&
+	git rev-parse main^ main_b0 side_c0 initial >expected &&
 	git rev-list HEAD -- d >actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'pathspec with glob (1)' '
-	git rev-parse master^ master_b0 side_c0 initial >expected &&
+	git rev-parse main^ main_b0 side_c0 initial >expected &&
 	git rev-list HEAD -- "d/*" >actual &&
 	test_cmp expected actual
 '
diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index cfb74d0e03..41d0ca00b1 100755
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -5,6 +5,9 @@
 
 test_description='git rev-list --pretty=format test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
@@ -38,22 +41,59 @@ test_expect_success 'setup' '
 	echo "$added_iso88591" | git commit -F - &&
 	head1=$(git rev-parse --verify HEAD) &&
 	head1_short=$(git rev-parse --verify --short $head1) &&
+	head1_short4=$(git rev-parse --verify --short=4 $head1) &&
 	tree1=$(git rev-parse --verify HEAD:) &&
 	tree1_short=$(git rev-parse --verify --short $tree1) &&
 	echo "$changed" > foo &&
 	echo "$changed_iso88591" | git commit -a -F - &&
 	head2=$(git rev-parse --verify HEAD) &&
 	head2_short=$(git rev-parse --verify --short $head2) &&
+	head2_short4=$(git rev-parse --verify --short=4 $head2) &&
 	tree2=$(git rev-parse --verify HEAD:) &&
 	tree2_short=$(git rev-parse --verify --short $tree2) &&
 	git config --unset i18n.commitEncoding
 '
 
-# usage: test_format name format_string [failure] <expected_output
+# usage: test_format [argument...] name format_string [failure] <expected_output
 test_format () {
+	local args=
+	while true
+	do
+		case "$1" in
+		--*)
+			args="$args $1"
+			shift;;
+		*)
+			break;;
+		esac
+	done
 	cat >expect.$1
 	test_expect_${3:-success} "format $1" "
-		git rev-list --pretty=format:'$2' master >output.$1 &&
+		git rev-list $args --pretty=format:'$2' main >output.$1 &&
+		test_cmp expect.$1 output.$1
+	"
+}
+
+# usage: test_pretty [argument...] name format_name [failure] <expected_output
+test_pretty () {
+	local args=
+	while true
+	do
+		case "$1" in
+		--*)
+			args="$args $1"
+			shift;;
+		*)
+			break;;
+		esac
+	done
+	cat >expect.$1
+	test_expect_${3:-success} "pretty $1 (without --no-commit-header)" "
+		git rev-list $args --pretty='$2' main >output.$1 &&
+		test_cmp expect.$1 output.$1
+	"
+	test_expect_${3:-success} "pretty $1 (with --no-commit-header)" "
+		git rev-list $args --no-commit-header --pretty='$2' main >output.$1 &&
 		test_cmp expect.$1 output.$1
 	"
 }
@@ -90,6 +130,20 @@ $head1
 $head1_short
 EOF
 
+test_format --no-commit-header hash-no-header %H%n%h <<EOF
+$head2
+$head2_short
+$head1
+$head1_short
+EOF
+
+test_format --abbrev-commit --abbrev=0 --no-commit-header hash-no-header-abbrev %H%n%h <<EOF
+$head2
+$head2_short4
+$head1
+$head1_short4
+EOF
+
 test_format tree %T%n%t <<EOF
 commit $head2
 $tree2
@@ -109,31 +163,35 @@ commit $head1
 EOF
 
 # we don't test relative here
-test_format author %an%n%ae%n%ad%n%aD%n%at <<EOF
+test_format author %an%n%ae%n%al%n%ad%n%aD%n%at <<EOF
 commit $head2
-A U Thor
-author@example.com
+$GIT_AUTHOR_NAME
+$GIT_AUTHOR_EMAIL
+$TEST_AUTHOR_LOCALNAME
 Thu Apr 7 15:13:13 2005 -0700
 Thu, 7 Apr 2005 15:13:13 -0700
 1112911993
 commit $head1
-A U Thor
-author@example.com
+$GIT_AUTHOR_NAME
+$GIT_AUTHOR_EMAIL
+$TEST_AUTHOR_LOCALNAME
 Thu Apr 7 15:13:13 2005 -0700
 Thu, 7 Apr 2005 15:13:13 -0700
 1112911993
 EOF
 
-test_format committer %cn%n%ce%n%cd%n%cD%n%ct <<EOF
+test_format committer %cn%n%ce%n%cl%n%cd%n%cD%n%ct <<EOF
 commit $head2
-C O Mitter
-committer@example.com
+$GIT_COMMITTER_NAME
+$GIT_COMMITTER_EMAIL
+$TEST_COMMITTER_LOCALNAME
 Thu Apr 7 15:13:13 2005 -0700
 Thu, 7 Apr 2005 15:13:13 -0700
 1112911993
 commit $head1
-C O Mitter
-committer@example.com
+$GIT_COMMITTER_NAME
+$GIT_COMMITTER_EMAIL
+$TEST_COMMITTER_LOCALNAME
 Thu Apr 7 15:13:13 2005 -0700
 Thu, 7 Apr 2005 15:13:13 -0700
 1112911993
@@ -174,19 +232,44 @@ $added
 
 EOF
 
+test_format --no-commit-header raw-body-no-header %B <<EOF
+$changed
+
+$added
+
+EOF
+
+test_pretty oneline oneline <<EOF
+$head2 $changed
+$head1 $added
+EOF
+
+test_pretty short short <<EOF
+commit $head2
+Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+
+    $changed
+
+commit $head1
+Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>
+
+    $added
+
+EOF
+
 test_expect_success 'basic colors' '
 	cat >expect <<-EOF &&
 	commit $head2
 	<RED>foo<GREEN>bar<BLUE>baz<RESET>xyzzy
 	EOF
 	format="%Credfoo%Cgreenbar%Cbluebaz%Cresetxyzzy" &&
-	git rev-list --color --format="$format" -1 master >actual.raw &&
+	git rev-list --color --format="$format" -1 main >actual.raw &&
 	test_decode_color <actual.raw >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success '%S is not a placeholder for rev-list yet' '
-	git rev-list --format="%S" -1 master | grep "%S"
+	git rev-list --format="%S" -1 main | grep "%S"
 '
 
 test_expect_success 'advanced colors' '
@@ -195,7 +278,7 @@ test_expect_success 'advanced colors' '
 	<BOLD;RED;BYELLOW>foo<RESET>
 	EOF
 	format="%C(red yellow bold)foo%C(reset)" &&
-	git rev-list --color --format="$format" -1 master >actual.raw &&
+	git rev-list --color --format="$format" -1 main >actual.raw &&
 	test_decode_color <actual.raw >actual &&
 	test_cmp expect actual
 '
@@ -335,7 +418,7 @@ commit $head1
 .. (hinzugef${added_utf8_part_iso88591}gt) foo
 EOF
 
-test_expect_success 'prepare expected messages (for test %b)' '
+test_expect_success 'setup expected messages (for test %b)' '
 	cat <<-EOF >expected.utf-8 &&
 	commit $head3
 	This commit message is much longer than the others,
@@ -402,7 +485,7 @@ test_expect_success '%x00 shows NUL' '
 
 test_expect_success '%ad respects --date=' '
 	echo 2005-04-07 >expect.ad-short &&
-	git log -1 --date=short --pretty=tformat:%ad >output.ad-short master &&
+	git log -1 --date=short --pretty=tformat:%ad >output.ad-short main &&
 	test_cmp expect.ad-short output.ad-short
 '
 
@@ -410,7 +493,7 @@ test_expect_success 'empty email' '
 	test_tick &&
 	C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
 	A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
-	verbose test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700"
+	verbose test "$A" = "$GIT_AUTHOR_NAME,,Thu Apr 7 15:14:13 2005 -0700"
 '
 
 test_expect_success 'del LF before empty (1)' '
@@ -459,9 +542,10 @@ test_expect_success '--abbrev' '
 '
 
 test_expect_success '%H is not affected by --abbrev-commit' '
+	expected=$(($(test_oid hexsz) + 1)) &&
 	git log -1 --format=%H --abbrev-commit --abbrev=20 HEAD >actual &&
 	len=$(wc -c <actual) &&
-	test $len = 41
+	test $len = $expected
 '
 
 test_expect_success '%h is not affected by --abbrev-commit' '
@@ -489,13 +573,13 @@ test_expect_success '"%h %gD: %gs" is same as git-reflog (with --abbrev)' '
 '
 
 test_expect_success '%gd shortens ref name' '
-	echo "master@{0}" >expect.gd-short &&
-	git log -g -1 --format=%gd refs/heads/master >actual.gd-short &&
+	echo "main@{0}" >expect.gd-short &&
+	git log -g -1 --format=%gd refs/heads/main >actual.gd-short &&
 	test_cmp expect.gd-short actual.gd-short
 '
 
 test_expect_success 'reflog identity' '
-	echo "C O Mitter:committer@example.com" >expect &&
+	echo "$GIT_COMMITTER_NAME:$GIT_COMMITTER_EMAIL" >expect &&
 	git log -g -1 --format="%gn:%ge" >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index f0268372d2..aebe4b69e1 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -2,6 +2,9 @@
 
 test_description='test git rev-list --cherry-pick -- file'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # A---B---D---F
@@ -31,7 +34,7 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m "E" &&
 	git tag E &&
-	git checkout master &&
+	git checkout main &&
 	git checkout branch foo &&
 	test_tick &&
 	git commit -m "B" &&
@@ -233,7 +236,7 @@ test_expect_success '--cherry-pick with independent, but identical branches' '
 	test_tick &&
 	git commit -m "independent, too" foo &&
 	test -z "$(git rev-list --left-right --cherry-pick \
-		HEAD...master -- foo)"
+		HEAD...main -- foo)"
 '
 
 cat >expect <<EOF
@@ -245,6 +248,18 @@ test_expect_success '--count --left-right' '
 	test_cmp expect actual
 '
 
+test_expect_success '--cherry-pick with duplicates on each side' '
+	git checkout -b dup-orig &&
+	test_commit dup-base &&
+	git revert dup-base &&
+	git cherry-pick dup-base &&
+	git checkout -b dup-side HEAD~3 &&
+	test_tick &&
+	git cherry-pick -3 dup-orig &&
+	git rev-list --cherry-pick dup-orig...dup-side >actual &&
+	test_must_be_empty actual
+'
+
 # Corrupt the object store deliberately to make sure
 # the object is not even checked for its existence.
 remove_loose_object () {
diff --git a/t/t6008-rev-list-submodule.sh b/t/t6008-rev-list-submodule.sh
index c4af9ca0a7..3153a0d891 100755
--- a/t/t6008-rev-list-submodule.sh
+++ b/t/t6008-rev-list-submodule.sh
@@ -5,6 +5,9 @@
 
 test_description='git rev-list involving submodules that this repo has'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -36,7 +39,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success "Ilari's test" '
-	git rev-list --objects super master ^super^
+	git rev-list --objects super main ^super^
 '
 
 test_done
diff --git a/t/t6009-rev-list-parent.sh b/t/t6009-rev-list-parent.sh
index 916d9692bc..63fa7c8313 100755
--- a/t/t6009-rev-list-parent.sh
+++ b/t/t6009-rev-list-parent.sh
@@ -2,6 +2,9 @@
 
 test_description='ancestor culling and limiting by parent number'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_revlist () {
@@ -45,7 +48,7 @@ test_expect_success 'setup roots, merges and octopuses' '
 	test_commit seven &&
 	git checkout -b yetanotherbranch four &&
 	test_commit eight &&
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git merge --allow-unrelated-histories -m normalmerge newroot &&
 	git tag normalmerge &&
@@ -56,7 +59,7 @@ test_expect_success 'setup roots, merges and octopuses' '
 	test_tick &&
 	git merge -m tetrapus sidebranch anotherbranch yetanotherbranch &&
 	git tag tetrapus &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'rev-list roots' '
@@ -123,7 +126,7 @@ test_expect_success 'dodecapus' '
 		roots="$roots root$i" ||
 		return
 	done &&
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git merge -m dodecapus $roots &&
 	git tag dodecapus &&
diff --git a/t/t6012-rev-list-simplify.sh b/t/t6012-rev-list-simplify.sh
index a10f0df02b..4f7fa8b6c0 100755
--- a/t/t6012-rev-list-simplify.sh
+++ b/t/t6012-rev-list-simplify.sh
@@ -2,6 +2,9 @@
 
 test_description='merge simplification'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 note () {
@@ -43,7 +46,7 @@ test_expect_success setup '
 	git add side &&
 	test_tick && git commit -m "Side root" &&
 	note J &&
-	git checkout master &&
+	git checkout main &&
 
 	echo "Hello" >file &&
 	echo "second" >lost &&
@@ -65,7 +68,7 @@ test_expect_success setup '
 	note D &&
 
 	test_tick &&
-	test_must_fail git merge -m "merge" master &&
+	test_must_fail git merge -m "merge" main &&
 	>lost && git commit -a -m "merge" &&
 	note E &&
 
@@ -74,7 +77,7 @@ test_expect_success setup '
 	test_tick && git commit -m "Irrelevant change" &&
 	note F &&
 
-	git checkout master &&
+	git checkout main &&
 	echo "Yet another" >elif &&
 	git add elif &&
 	test_tick && git commit -m "Another irrelevant change" &&
@@ -87,7 +90,7 @@ test_expect_success setup '
 	test_tick && git commit -a -m "Final change" &&
 	note I &&
 
-	git checkout master &&
+	git checkout main &&
 	test_tick && git merge --allow-unrelated-histories -m "Coolest" unrelated &&
 	note K &&
 
@@ -154,4 +157,124 @@ test_expect_success '--full-diff is not affected by --parents' '
 	test_cmp expected actual
 '
 
+#
+# Create a new history to demonstrate the value of --show-pulls
+# with respect to the subtleties of simplified history, --full-history,
+# and --simplify-merges.
+#
+#   .-A---M-----C--N---O---P
+#  /     / \  \  \/   /   /
+# I     B   \  R-'`-Z'   /
+#  \   /     \/         /
+#   \ /      /\        /
+#    `---X--'  `---Y--'
+#
+# This example is explained in Documentation/rev-list-options.txt
+
+test_expect_success 'setup rebuild repo' '
+	rm -rf .git * &&
+	git init &&
+	git switch -c topic &&
+
+	echo base >file &&
+	git add file &&
+	test_commit I &&
+
+	echo A >file &&
+	git add file &&
+	test_commit A &&
+
+	git switch -c branchB I &&
+	echo B >file &&
+	git add file &&
+	test_commit B &&
+
+	git switch topic &&
+	test_must_fail git merge -m "M" B &&
+	echo A >file &&
+	echo B >>file &&
+	git add file &&
+	git merge --continue &&
+	note M &&
+
+	echo C >other &&
+	git add other &&
+	test_commit C &&
+
+	git switch -c branchX I &&
+	echo X >file &&
+	git add file &&
+	test_commit X &&
+
+	git switch -c branchR M &&
+	git merge -m R -Xtheirs X &&
+	note R &&
+
+	git switch topic &&
+	git merge -m N R &&
+	note N &&
+
+	git switch -c branchY M &&
+	echo Y >y &&
+	git add y &&
+	test_commit Y &&
+
+	git switch -c branchZ C &&
+	echo Z >z &&
+	git add z &&
+	test_commit Z &&
+
+	git switch topic &&
+	git merge -m O Z &&
+	note O &&
+
+	git merge -m P Y &&
+	note P
+'
+
+check_result 'X I' -- file
+check_result 'N R X I' --show-pulls -- file
+
+check_result 'P O N R X M B A I' --full-history --topo-order -- file
+check_result 'N R X M B A I' --simplify-merges --topo-order --show-pulls -- file
+check_result 'R X M B A I' --simplify-merges --topo-order -- file
+check_result 'N M A I' --first-parent -- file
+check_result 'N M A I' --first-parent --show-pulls -- file
+
+# --ancestry-path implies --full-history
+check_result 'P O N R M' --topo-order \
+	--ancestry-path A..HEAD -- file
+check_result 'P O N R M' --topo-order \
+	--show-pulls \
+	--ancestry-path A..HEAD -- file
+check_result 'P O N R M' --topo-order \
+	--full-history \
+	--ancestry-path A..HEAD -- file
+check_result 'R M' --topo-order \
+	--simplify-merges \
+	--ancestry-path A..HEAD -- file
+check_result 'N R M' --topo-order \
+	--simplify-merges --show-pulls \
+	--ancestry-path A..HEAD -- file
+
+test_expect_success 'log --graph --simplify-merges --show-pulls' '
+	cat >expect <<-\EOF &&
+	* N
+	*   R
+	|\  
+	| * X
+	* |   M
+	|\ \  
+	| * | B
+	| |/  
+	* / A
+	|/  
+	* I
+	EOF
+	git log --graph --pretty="%s" \
+		--simplify-merges --show-pulls \
+		-- file >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t6013-rev-list-reverse-parents.sh b/t/t6013-rev-list-reverse-parents.sh
index 89458d370f..39793cbbd6 100755
--- a/t/t6013-rev-list-reverse-parents.sh
+++ b/t/t6013-rev-list-reverse-parents.sh
@@ -2,6 +2,9 @@
 
 test_description='--reverse combines with --parents'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
@@ -18,24 +21,24 @@ test_expect_success 'set up --reverse example' '
 	commit two &&
 	git checkout -b side HEAD^ &&
 	commit three &&
-	git checkout master &&
+	git checkout main &&
 	git merge -s ours side &&
 	commit five
 	'
 
 test_expect_success '--reverse --parents --full-history combines correctly' '
-	git rev-list --parents --full-history master -- foo |
+	git rev-list --parents --full-history main -- foo |
 		perl -e "print reverse <>" > expected &&
-	git rev-list --reverse --parents --full-history master -- foo \
+	git rev-list --reverse --parents --full-history main -- foo \
 		> actual &&
 	test_cmp expected actual
 	'
 
 test_expect_success '--boundary does too' '
-	git rev-list --boundary --parents --full-history master ^root -- foo |
+	git rev-list --boundary --parents --full-history main ^root -- foo |
 		perl -e "print reverse <>" > expected &&
 	git rev-list --boundary --reverse --parents --full-history \
-		master ^root -- foo > actual &&
+		main ^root -- foo > actual &&
 	test_cmp expected actual
 	'
 
diff --git a/t/t6016-rev-list-graph-simplify-history.sh b/t/t6016-rev-list-graph-simplify-history.sh
index f7181d1d6a..54b0a6f5f8 100755
--- a/t/t6016-rev-list-graph-simplify-history.sh
+++ b/t/t6016-rev-list-graph-simplify-history.sh
@@ -7,14 +7,23 @@
 
 test_description='--graph and simplified history'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-log-graph.sh
+
+check_graph () {
+	cat >expect &&
+	lib_test_cmp_graph --format=%s "$@"
+}
 
 test_expect_success 'set up rev-list --graph test' '
 	# 3 commits on branch A
 	test_commit A1 foo.txt &&
 	test_commit A2 bar.txt &&
 	test_commit A3 bar.txt &&
-	git branch -m master A &&
+	git branch -m main A &&
 
 	# 2 commits on branch B, started from A1
 	git checkout -b B A1 &&
@@ -28,7 +37,7 @@ test_expect_success 'set up rev-list --graph test' '
 
 	# Octopus merge B and C into branch A
 	git checkout A &&
-	git merge B C &&
+	git merge B C -m A4 &&
 	git tag A4 &&
 
 	test_commit A5 bar.txt &&
@@ -38,83 +47,64 @@ test_expect_success 'set up rev-list --graph test' '
 	test_commit C3 foo.txt &&
 	test_commit C4 bar.txt &&
 	git checkout A &&
-	git merge -s ours C &&
+	git merge -s ours C -m A6 &&
 	git tag A6 &&
 
-	test_commit A7 bar.txt &&
-
-	# Store commit names in variables for later use
-	A1=$(git rev-parse --verify A1) &&
-	A2=$(git rev-parse --verify A2) &&
-	A3=$(git rev-parse --verify A3) &&
-	A4=$(git rev-parse --verify A4) &&
-	A5=$(git rev-parse --verify A5) &&
-	A6=$(git rev-parse --verify A6) &&
-	A7=$(git rev-parse --verify A7) &&
-	B1=$(git rev-parse --verify B1) &&
-	B2=$(git rev-parse --verify B2) &&
-	C1=$(git rev-parse --verify C1) &&
-	C2=$(git rev-parse --verify C2) &&
-	C3=$(git rev-parse --verify C3) &&
-	C4=$(git rev-parse --verify C4)
-	'
+	test_commit A7 bar.txt
+'
 
 test_expect_success '--graph --all' '
-	rm -f expected &&
-	echo "* $A7" >> expected &&
-	echo "*   $A6" >> expected &&
-	echo "|\\  " >> expected &&
-	echo "| * $C4" >> expected &&
-	echo "| * $C3" >> expected &&
-	echo "* | $A5" >> expected &&
-	echo "| |     " >> expected &&
-	echo "|  \\    " >> expected &&
-	echo "*-. \\   $A4" >> expected &&
-	echo "|\\ \\ \\  " >> expected &&
-	echo "| | |/  " >> expected &&
-	echo "| | * $C2" >> expected &&
-	echo "| | * $C1" >> expected &&
-	echo "| * | $B2" >> expected &&
-	echo "| * | $B1" >> expected &&
-	echo "* | | $A3" >> expected &&
-	echo "| |/  " >> expected &&
-	echo "|/|   " >> expected &&
-	echo "* | $A2" >> expected &&
-	echo "|/  " >> expected &&
-	echo "* $A1" >> expected &&
-	git rev-list --graph --all > actual &&
-	test_cmp expected actual
-	'
+	check_graph --all <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	| * C3
+	* | A5
+	| |
+	|  \
+	*-. | A4
+	|\ \|
+	| | * C2
+	| | * C1
+	| * | B2
+	| * | B1
+	* | | A3
+	| |/
+	|/|
+	* | A2
+	|/
+	* A1
+	EOF
+'
 
 # Make sure the graph_is_interesting() code still realizes
 # that undecorated merges are interesting, even with --simplify-by-decoration
 test_expect_success '--graph --simplify-by-decoration' '
-	rm -f expected &&
 	git tag -d A4 &&
-	echo "* $A7" >> expected &&
-	echo "*   $A6" >> expected &&
-	echo "|\\  " >> expected &&
-	echo "| * $C4" >> expected &&
-	echo "| * $C3" >> expected &&
-	echo "* | $A5" >> expected &&
-	echo "| |     " >> expected &&
-	echo "|  \\    " >> expected &&
-	echo "*-. \\   $A4" >> expected &&
-	echo "|\\ \\ \\  " >> expected &&
-	echo "| | |/  " >> expected &&
-	echo "| | * $C2" >> expected &&
-	echo "| | * $C1" >> expected &&
-	echo "| * | $B2" >> expected &&
-	echo "| * | $B1" >> expected &&
-	echo "* | | $A3" >> expected &&
-	echo "| |/  " >> expected &&
-	echo "|/|   " >> expected &&
-	echo "* | $A2" >> expected &&
-	echo "|/  " >> expected &&
-	echo "* $A1" >> expected &&
-	git rev-list --graph --all --simplify-by-decoration > actual &&
-	test_cmp expected actual
-	'
+	check_graph --all --simplify-by-decoration <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	| * C3
+	* | A5
+	| |
+	|  \
+	*-. | A4
+	|\ \|
+	| | * C2
+	| | * C1
+	| * | B2
+	| * | B1
+	* | | A3
+	| |/
+	|/|
+	* | A2
+	|/
+	* A1
+	EOF
+'
 
 test_expect_success 'setup: get rid of decorations on B' '
 	git tag -d B2 &&
@@ -124,144 +114,133 @@ test_expect_success 'setup: get rid of decorations on B' '
 
 # Graph with branch B simplified away
 test_expect_success '--graph --simplify-by-decoration prune branch B' '
-	rm -f expected &&
-	echo "* $A7" >> expected &&
-	echo "*   $A6" >> expected &&
-	echo "|\\  " >> expected &&
-	echo "| * $C4" >> expected &&
-	echo "| * $C3" >> expected &&
-	echo "* | $A5" >> expected &&
-	echo "* |   $A4" >> expected &&
-	echo "|\\ \\  " >> expected &&
-	echo "| |/  " >> expected &&
-	echo "| * $C2" >> expected &&
-	echo "| * $C1" >> expected &&
-	echo "* | $A3" >> expected &&
-	echo "|/  " >> expected &&
-	echo "* $A2" >> expected &&
-	echo "* $A1" >> expected &&
-	git rev-list --graph --simplify-by-decoration --all > actual &&
-	test_cmp expected actual
-	'
+	check_graph --simplify-by-decoration --all <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	| * C3
+	* | A5
+	* | A4
+	|\|
+	| * C2
+	| * C1
+	* | A3
+	|/
+	* A2
+	* A1
+	EOF
+'
 
 test_expect_success '--graph --full-history -- bar.txt' '
-	rm -f expected &&
-	echo "* $A7" >> expected &&
-	echo "*   $A6" >> expected &&
-	echo "|\\  " >> expected &&
-	echo "| * $C4" >> expected &&
-	echo "* | $A5" >> expected &&
-	echo "* |   $A4" >> expected &&
-	echo "|\\ \\  " >> expected &&
-	echo "| |/  " >> expected &&
-	echo "* | $A3" >> expected &&
-	echo "|/  " >> expected &&
-	echo "* $A2" >> expected &&
-	git rev-list --graph --full-history --all -- bar.txt > actual &&
-	test_cmp expected actual
-	'
+	check_graph --full-history --all -- bar.txt <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* | A5
+	* | A4
+	|\|
+	* | A3
+	|/
+	* A2
+	EOF
+'
 
 test_expect_success '--graph --full-history --simplify-merges -- bar.txt' '
-	rm -f expected &&
-	echo "* $A7" >> expected &&
-	echo "*   $A6" >> expected &&
-	echo "|\\  " >> expected &&
-	echo "| * $C4" >> expected &&
-	echo "* | $A5" >> expected &&
-	echo "* | $A3" >> expected &&
-	echo "|/  " >> expected &&
-	echo "* $A2" >> expected &&
-	git rev-list --graph --full-history --simplify-merges --all \
-		-- bar.txt > actual &&
-	test_cmp expected actual
-	'
+	check_graph --full-history --simplify-merges --all -- bar.txt <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* | A5
+	* | A3
+	|/
+	* A2
+	EOF
+'
 
 test_expect_success '--graph -- bar.txt' '
-	rm -f expected &&
-	echo "* $A7" >> expected &&
-	echo "* $A5" >> expected &&
-	echo "* $A3" >> expected &&
-	echo "| * $C4" >> expected &&
-	echo "|/  " >> expected &&
-	echo "* $A2" >> expected &&
-	git rev-list --graph --all -- bar.txt > actual &&
-	test_cmp expected actual
-	'
+	check_graph --all -- bar.txt <<-\EOF
+	* A7
+	* A5
+	* A3
+	| * C4
+	|/
+	* A2
+	EOF
+'
 
 test_expect_success '--graph --sparse -- bar.txt' '
-	rm -f expected &&
-	echo "* $A7" >> expected &&
-	echo "* $A6" >> expected &&
-	echo "* $A5" >> expected &&
-	echo "* $A4" >> expected &&
-	echo "* $A3" >> expected &&
-	echo "| * $C4" >> expected &&
-	echo "| * $C3" >> expected &&
-	echo "| * $C2" >> expected &&
-	echo "| * $C1" >> expected &&
-	echo "|/  " >> expected &&
-	echo "* $A2" >> expected &&
-	echo "* $A1" >> expected &&
-	git rev-list --graph --sparse --all -- bar.txt > actual &&
-	test_cmp expected actual
-	'
+	check_graph --sparse --all -- bar.txt <<-\EOF
+	* A7
+	* A6
+	* A5
+	* A4
+	* A3
+	| * C4
+	| * C3
+	| * C2
+	| * C1
+	|/
+	* A2
+	* A1
+	EOF
+'
 
 test_expect_success '--graph ^C4' '
-	rm -f expected &&
-	echo "* $A7" >> expected &&
-	echo "* $A6" >> expected &&
-	echo "* $A5" >> expected &&
-	echo "*   $A4" >> expected &&
-	echo "|\\  " >> expected &&
-	echo "| * $B2" >> expected &&
-	echo "| * $B1" >> expected &&
-	echo "* $A3" >> expected &&
-	git rev-list --graph --all ^C4 > actual &&
-	test_cmp expected actual
-	'
+	check_graph --all ^C4 <<-\EOF
+	* A7
+	* A6
+	* A5
+	*   A4
+	|\
+	| * B2
+	| * B1
+	* A3
+	EOF
+'
 
 test_expect_success '--graph ^C3' '
-	rm -f expected &&
-	echo "* $A7" >> expected &&
-	echo "*   $A6" >> expected &&
-	echo "|\\  " >> expected &&
-	echo "| * $C4" >> expected &&
-	echo "* $A5" >> expected &&
-	echo "*   $A4" >> expected &&
-	echo "|\\  " >> expected &&
-	echo "| * $B2" >> expected &&
-	echo "| * $B1" >> expected &&
-	echo "* $A3" >> expected &&
-	git rev-list --graph --all ^C3 > actual &&
-	test_cmp expected actual
-	'
+	check_graph --all ^C3 <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* A5
+	*   A4
+	|\
+	| * B2
+	| * B1
+	* A3
+	EOF
+'
 
 # I don't think the ordering of the boundary commits is really
 # that important, but this test depends on it.  If the ordering ever changes
 # in the code, we'll need to update this test.
 test_expect_success '--graph --boundary ^C3' '
-	rm -f expected &&
-	echo "* $A7" >> expected &&
-	echo "*   $A6" >> expected &&
-	echo "|\\  " >> expected &&
-	echo "| * $C4" >> expected &&
-	echo "* | $A5" >> expected &&
-	echo "| |     " >> expected &&
-	echo "|  \\    " >> expected &&
-	echo "*-. \\   $A4" >> expected &&
-	echo "|\\ \\ \\  " >> expected &&
-	echo "| * | | $B2" >> expected &&
-	echo "| * | | $B1" >> expected &&
-	echo "* | | | $A3" >> expected &&
-	echo "o | | | $A2" >> expected &&
-	echo "|/ / /  " >> expected &&
-	echo "o | | $A1" >> expected &&
-	echo " / /  " >> expected &&
-	echo "| o $C3" >> expected &&
-	echo "|/  " >> expected &&
-	echo "o $C2" >> expected &&
-	git rev-list --graph --boundary --all ^C3 > actual &&
-	test_cmp expected actual
-	'
+	check_graph --boundary --all ^C3 <<-\EOF
+	* A7
+	*   A6
+	|\
+	| * C4
+	* | A5
+	| |
+	|  \
+	*-. \   A4
+	|\ \ \
+	| * | | B2
+	| * | | B1
+	* | | | A3
+	o | | | A2
+	|/ / /
+	o / / A1
+	 / /
+	| o C3
+	|/
+	o C2
+	EOF
+'
 
 test_done
diff --git a/t/t6017-rev-list-stdin.sh b/t/t6017-rev-list-stdin.sh
index 667b37564e..05162512a0 100755
--- a/t/t6017-rev-list-stdin.sh
+++ b/t/t6017-rev-list-stdin.sh
@@ -5,6 +5,9 @@
 
 test_description='log family learns --stdin'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check () {
@@ -40,7 +43,7 @@ test_expect_success setup '
 		done &&
 		for i in $them
 		do
-			git checkout -b side-$i master~$i &&
+			git checkout -b side-$i main~$i &&
 			echo updated $i >file-$i &&
 			git add file-$i &&
 			test_tick &&
@@ -49,7 +52,7 @@ test_expect_success setup '
 	)
 '
 
-check master
+check main
 check side-1 ^side-4
 check side-1 ^side-7 --
 check side-1 ^side-7 -- file-1
@@ -66,11 +69,11 @@ test_expect_success 'not only --stdin' '
 	file-2
 	EOF
 	cat >input <<-EOF &&
-	^master^
+	^main^
 	--
 	file-2
 	EOF
-	git log --pretty=tformat:%s --name-only --stdin master -- file-1 \
+	git log --pretty=tformat:%s --name-only --stdin main -- file-1 \
 		<input >actual &&
 	test_cmp expect actual
 '
diff --git a/t/t6018-rev-list-glob.sh b/t/t6018-rev-list-glob.sh
index bb5aeac07f..24b34add83 100755
--- a/t/t6018-rev-list-glob.sh
+++ b/t/t6018-rev-list-glob.sh
@@ -2,6 +2,9 @@
 
 test_description='rev-list/rev-parse --glob'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 commit () {
@@ -20,23 +23,23 @@ compare () {
 
 test_expect_success 'setup' '
 
-	commit master &&
-	git checkout -b subspace/one master &&
+	commit main &&
+	git checkout -b subspace/one main &&
 	commit one &&
-	git checkout -b subspace/two master &&
+	git checkout -b subspace/two main &&
 	commit two &&
-	git checkout -b subspace-x master &&
+	git checkout -b subspace-x main &&
 	commit subspace-x &&
-	git checkout -b other/three master &&
+	git checkout -b other/three main &&
 	commit three &&
-	git checkout -b someref master &&
+	git checkout -b someref main &&
 	commit some &&
-	git checkout master &&
-	commit master2 &&
-	git tag foo/bar master &&
-	commit master3 &&
-	git update-ref refs/remotes/foo/baz master &&
-	commit master4 &&
+	git checkout main &&
+	commit topic_2 &&
+	git tag foo/bar main &&
+	commit topic_3 &&
+	git update-ref refs/remotes/foo/baz main &&
+	commit topic_4 &&
 	git update-ref refs/remotes/upstream/one subspace/one &&
 	git update-ref refs/remotes/upstream/two subspace/two &&
 	git update-ref refs/remotes/upstream/x subspace-x &&
@@ -83,7 +86,7 @@ test_expect_failure 'rev-parse accepts --glob as detached option' '
 
 test_expect_failure 'rev-parse is not confused by option-like glob' '
 
-	compare rev-parse "master" "--glob --symbolic master"
+	compare rev-parse "main" "--glob --symbolic main"
 
 '
 
@@ -111,15 +114,15 @@ test_expect_success 'rev-parse --glob=heads/subspace/* --glob=heads/other/*' '
 
 '
 
-test_expect_success 'rev-parse --glob=heads/someref/* master' '
+test_expect_success 'rev-parse --glob=heads/someref/* main' '
 
-	compare rev-parse "master" "--glob=heads/someref/* master"
+	compare rev-parse "main" "--glob=heads/someref/* main"
 
 '
 
 test_expect_success 'rev-parse --glob=heads/*' '
 
-	compare rev-parse "master other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+	compare rev-parse "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
 
 '
 
@@ -136,7 +139,7 @@ test_expect_success 'rev-parse --remotes=foo' '
 '
 
 test_expect_success 'rev-parse --exclude with --branches' '
-	compare rev-parse "--exclude=*/* --branches" "master someref subspace-x"
+	compare rev-parse "--exclude=*/* --branches" "main someref subspace-x"
 '
 
 test_expect_success 'rev-parse --exclude with --all' '
@@ -221,7 +224,7 @@ test_expect_success 'rev-list --glob refs/heads/subspace/*' '
 
 test_expect_success 'rev-list not confused by option-like --glob arg' '
 
-	compare rev-list "master" "--glob -0 master"
+	compare rev-list "main" "--glob -0 main"
 
 '
 
@@ -269,13 +272,13 @@ test_expect_success 'rev-list --branches=subspace' '
 
 test_expect_success 'rev-list --branches' '
 
-	compare rev-list "master subspace-x someref other/three subspace/one subspace/two" "--branches"
+	compare rev-list "main subspace-x someref other/three subspace/one subspace/two" "--branches"
 
 '
 
-test_expect_success 'rev-list --glob=heads/someref/* master' '
+test_expect_success 'rev-list --glob=heads/someref/* main' '
 
-	compare rev-list "master" "--glob=heads/someref/* master"
+	compare rev-list "main" "--glob=heads/someref/* main"
 
 '
 
@@ -287,7 +290,7 @@ test_expect_success 'rev-list --glob=heads/subspace/* --glob=heads/other/*' '
 
 test_expect_success 'rev-list --glob=heads/*' '
 
-	compare rev-list "master other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
+	compare rev-list "main other/three someref subspace-x subspace/one subspace/two" "--glob=heads/*"
 
 '
 
@@ -310,7 +313,7 @@ test_expect_success 'rev-list --remotes=foo' '
 '
 
 test_expect_success 'rev-list --exclude with --branches' '
-	compare rev-list "--exclude=*/* --branches" "master someref subspace-x"
+	compare rev-list "--exclude=*/* --branches" "main someref subspace-x"
 '
 
 test_expect_success 'rev-list --exclude with --all' '
@@ -345,17 +348,22 @@ test_expect_success 'rev-list should succeed with empty output with empty glob'
 	test_must_be_empty actual
 '
 
+test_expect_success 'rev-list should succeed with empty output when ignoring missing' '
+	git rev-list --ignore-missing $ZERO_OID >actual &&
+	test_must_be_empty actual
+'
+
 test_expect_success 'shortlog accepts --glob/--tags/--remotes' '
 
 	compare shortlog "subspace/one subspace/two" --branches=subspace &&
 	compare shortlog \
-	  "master subspace-x someref other/three subspace/one subspace/two" \
+	  "main subspace-x someref other/three subspace/one subspace/two" \
 	  --branches &&
-	compare shortlog master "--glob=heads/someref/* master" &&
+	compare shortlog main "--glob=heads/someref/* main" &&
 	compare shortlog "subspace/one subspace/two other/three" \
 	  "--glob=heads/subspace/* --glob=heads/other/*" &&
 	compare shortlog \
-	  "master other/three someref subspace-x subspace/one subspace/two" \
+	  "main other/three someref subspace-x subspace/one subspace/two" \
 	  "--glob=heads/*" &&
 	compare shortlog foo/bar --tags=foo &&
 	compare shortlog "foo/bar qux/one qux/two qux/x" --tags &&
@@ -366,14 +374,14 @@ test_expect_success 'shortlog accepts --glob/--tags/--remotes' '
 test_expect_failure 'shortlog accepts --glob as detached option' '
 
 	compare shortlog \
-	  "master other/three someref subspace-x subspace/one subspace/two" \
+	  "main other/three someref subspace-x subspace/one subspace/two" \
 	  "--glob heads/*"
 
 '
 
 test_expect_failure 'shortlog --glob is not confused by option-like argument' '
 
-	compare shortlog master "--glob -e master"
+	compare shortlog main "--glob -e main"
 
 '
 
diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh
index beadaf6cca..20adbece65 100755
--- a/t/t6019-rev-list-ancestry-path.sh
+++ b/t/t6019-rev-list-ancestry-path.sh
@@ -21,6 +21,9 @@ test_description='--ancestry-path'
 #  --ancestry-path G..M -- G.t == L
 #  --ancestry-path --simplify-merges G^..M -- G.t == G L
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_merge () {
@@ -128,29 +131,29 @@ test_expect_success 'setup criss-cross' '
 	(cd criss-cross &&
 	 git init &&
 	 test_commit A &&
-	 git checkout -b xb master &&
+	 git checkout -b xb main &&
 	 test_commit B &&
-	 git checkout -b xc master &&
+	 git checkout -b xc main &&
 	 test_commit C &&
 	 git checkout -b xbc xb -- &&
 	 git merge xc &&
 	 git checkout -b xcb xc -- &&
 	 git merge xb &&
-	 git checkout master)
+	 git checkout main)
 '
 
 # no commits in bc descend from cb
 test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' '
 	(cd criss-cross &&
 	 git rev-list --ancestry-path xcb..xbc > actual &&
-	 test -z "$(cat actual)")
+	 test_must_be_empty actual)
 '
 
 # no commits in repository descend from cb
 test_expect_success 'criss-cross: rev-list --ancestry-path --all ^cb' '
 	(cd criss-cross &&
 	 git rev-list --ancestry-path --all ^xcb > actual &&
-	 test -z "$(cat actual)")
+	 test_must_be_empty actual)
 '
 
 test_done
diff --git a/t/t6020-bundle-misc.sh b/t/t6020-bundle-misc.sh
new file mode 100755
index 0000000000..b13e8a52a9
--- /dev/null
+++ b/t/t6020-bundle-misc.sh
@@ -0,0 +1,478 @@
+#!/bin/sh
+#
+# Copyright (c) 2021 Jiang Xin
+#
+
+test_description='Test git-bundle'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-bundle.sh
+
+# Create a commit or tag and set the variable with the object ID.
+test_commit_setvar () {
+	notick=
+	signoff=
+	indir=
+	merge=
+	tag=
+	var=
+
+	while test $# != 0
+	do
+		case "$1" in
+		--merge)
+			merge=t
+			;;
+		--tag)
+			tag=t
+			;;
+		--notick)
+			notick=t
+			;;
+		--signoff)
+			signoff="$1"
+			;;
+		-C)
+			shift
+			indir="$1"
+			;;
+		-*)
+			echo >&2 "error: unknown option $1"
+			return 1
+			;;
+		*)
+			break
+			;;
+		esac
+		shift
+	done
+	if test $# -lt 2
+	then
+		echo >&2 "error: test_commit_setvar must have at least 2 arguments"
+		return 1
+	fi
+	var=$1
+	shift
+	indir=${indir:+"$indir"/}
+	if test -z "$notick"
+	then
+		test_tick
+	fi &&
+	if test -n "$merge"
+	then
+		git ${indir:+ -C "$indir"} merge --no-edit --no-ff \
+			${2:+-m "$2"} "$1" &&
+		oid=$(git ${indir:+ -C "$indir"} rev-parse HEAD)
+	elif test -n "$tag"
+	then
+		git ${indir:+ -C "$indir"} tag -m "$1" "$1" "${2:-HEAD}" &&
+		oid=$(git ${indir:+ -C "$indir"} rev-parse "$1")
+	else
+		file=${2:-"$1.t"} &&
+		echo "${3-$1}" >"$indir$file" &&
+		git ${indir:+ -C "$indir"} add "$file" &&
+		git ${indir:+ -C "$indir"} commit $signoff -m "$1" &&
+		oid=$(git ${indir:+ -C "$indir"} rev-parse HEAD)
+	fi &&
+	eval $var=$oid
+}
+
+get_abbrev_oid () {
+	oid=$1 &&
+	suffix=${oid#???????} &&
+	oid=${oid%$suffix} &&
+	if test -n "$oid"
+	then
+		echo "$oid"
+	else
+		echo "undefined-oid"
+	fi
+}
+
+# Format the output of git commands to make a user-friendly and stable
+# text.  We can easily prepare the expect text without having to worry
+# about future changes of the commit ID.
+make_user_friendly_and_stable_output () {
+	sed \
+		-e "s/$(get_abbrev_oid $A)[0-9a-f]*/<COMMIT-A>/g" \
+		-e "s/$(get_abbrev_oid $B)[0-9a-f]*/<COMMIT-B>/g" \
+		-e "s/$(get_abbrev_oid $C)[0-9a-f]*/<COMMIT-C>/g" \
+		-e "s/$(get_abbrev_oid $D)[0-9a-f]*/<COMMIT-D>/g" \
+		-e "s/$(get_abbrev_oid $E)[0-9a-f]*/<COMMIT-E>/g" \
+		-e "s/$(get_abbrev_oid $F)[0-9a-f]*/<COMMIT-F>/g" \
+		-e "s/$(get_abbrev_oid $G)[0-9a-f]*/<COMMIT-G>/g" \
+		-e "s/$(get_abbrev_oid $H)[0-9a-f]*/<COMMIT-H>/g" \
+		-e "s/$(get_abbrev_oid $I)[0-9a-f]*/<COMMIT-I>/g" \
+		-e "s/$(get_abbrev_oid $J)[0-9a-f]*/<COMMIT-J>/g" \
+		-e "s/$(get_abbrev_oid $K)[0-9a-f]*/<COMMIT-K>/g" \
+		-e "s/$(get_abbrev_oid $L)[0-9a-f]*/<COMMIT-L>/g" \
+		-e "s/$(get_abbrev_oid $M)[0-9a-f]*/<COMMIT-M>/g" \
+		-e "s/$(get_abbrev_oid $N)[0-9a-f]*/<COMMIT-N>/g" \
+		-e "s/$(get_abbrev_oid $O)[0-9a-f]*/<COMMIT-O>/g" \
+		-e "s/$(get_abbrev_oid $P)[0-9a-f]*/<COMMIT-P>/g" \
+		-e "s/$(get_abbrev_oid $TAG1)[0-9a-f]*/<TAG-1>/g" \
+		-e "s/$(get_abbrev_oid $TAG2)[0-9a-f]*/<TAG-2>/g" \
+		-e "s/$(get_abbrev_oid $TAG3)[0-9a-f]*/<TAG-3>/g"
+}
+
+format_and_save_expect () {
+	sed -e 's/Z$//' >expect
+}
+
+#            (C)   (D, pull/1/head, topic/1)
+#             o --- o
+#            /       \                              (L)
+#           /         \        o (H, topic/2)             (M, tag:v2)
+#          /    (F)    \      /                                 (N, tag:v3)
+#         /      o --------- o (G, pull/2/head)      o --- o --- o (release)
+#        /      /        \    \                      /       \
+#  o --- o --- o -------- o -- o ------------------ o ------- o --- o (main)
+# (A)   (B)  (E, tag:v1) (I)  (J)                  (K)       (O)   (P)
+#
+test_expect_success 'setup' '
+	# Try to make a stable fixed width for abbreviated commit ID,
+	# this fixed-width oid will be replaced with "<OID>".
+	git config core.abbrev 7 &&
+
+	# branch main: commit A & B
+	test_commit_setvar A "Commit A" main.txt &&
+	test_commit_setvar B "Commit B" main.txt &&
+
+	# branch topic/1: commit C & D, refs/pull/1/head
+	git checkout -b topic/1 &&
+	test_commit_setvar C "Commit C" topic-1.txt &&
+	test_commit_setvar D "Commit D" topic-1.txt &&
+	git update-ref refs/pull/1/head HEAD &&
+
+	# branch topic/1: commit E, tag v1
+	git checkout main &&
+	test_commit_setvar E "Commit E" main.txt &&
+	test_commit_setvar --tag TAG1 v1 &&
+
+	# branch topic/2: commit F & G, refs/pull/2/head
+	git checkout -b topic/2 &&
+	test_commit_setvar F "Commit F" topic-2.txt &&
+	test_commit_setvar G "Commit G" topic-2.txt &&
+	git update-ref refs/pull/2/head HEAD &&
+	test_commit_setvar H "Commit H" topic-2.txt &&
+
+	# branch main: merge commit I & J
+	git checkout main &&
+	test_commit_setvar --merge I topic/1 "Merge commit I" &&
+	test_commit_setvar --merge J refs/pull/2/head "Merge commit J" &&
+
+	# branch main: commit K
+	git checkout main &&
+	test_commit_setvar K "Commit K" main.txt &&
+
+	# branch release:
+	git checkout -b release &&
+	test_commit_setvar L "Commit L" release.txt &&
+	test_commit_setvar M "Commit M" release.txt &&
+	test_commit_setvar --tag TAG2 v2 &&
+	test_commit_setvar N "Commit N" release.txt &&
+	test_commit_setvar --tag TAG3 v3 &&
+
+	# branch main: merge commit O, commit P
+	git checkout main &&
+	test_commit_setvar --merge O tags/v2 "Merge commit O" &&
+	test_commit_setvar P "Commit P" main.txt
+'
+
+test_expect_success 'create bundle from special rev: main^!' '
+	git bundle create special-rev.bdl "main^!" &&
+
+	git bundle list-heads special-rev.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-P> refs/heads/main
+	EOF
+	test_cmp expect actual &&
+
+	git bundle verify special-rev.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	format_and_save_expect <<-\EOF &&
+	The bundle contains this ref:
+	<COMMIT-P> refs/heads/main
+	The bundle requires this ref:
+	<COMMIT-O> Z
+	EOF
+	test_cmp expect actual &&
+
+	test_bundle_object_count special-rev.bdl 3
+'
+
+test_expect_success 'create bundle with --max-count option' '
+	git bundle create max-count.bdl --max-count 1 \
+		main \
+		"^release" \
+		refs/tags/v1 \
+		refs/pull/1/head \
+		refs/pull/2/head &&
+
+	git bundle verify max-count.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	format_and_save_expect <<-\EOF &&
+	The bundle contains these 2 refs:
+	<COMMIT-P> refs/heads/main
+	<TAG-1> refs/tags/v1
+	The bundle requires this ref:
+	<COMMIT-O> Z
+	EOF
+	test_cmp expect actual &&
+
+	test_bundle_object_count max-count.bdl 4
+'
+
+test_expect_success 'create bundle with --since option' '
+	git log -1 --pretty="%ad" $M >actual &&
+	cat >expect <<-\EOF &&
+	Thu Apr 7 15:26:13 2005 -0700
+	EOF
+	test_cmp expect actual &&
+
+	git bundle create since.bdl \
+		--since "Thu Apr 7 15:27:00 2005 -0700" \
+		--all &&
+
+	git bundle verify since.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	format_and_save_expect <<-\EOF &&
+	The bundle contains these 5 refs:
+	<COMMIT-P> refs/heads/main
+	<COMMIT-N> refs/heads/release
+	<TAG-2> refs/tags/v2
+	<TAG-3> refs/tags/v3
+	<COMMIT-P> HEAD
+	The bundle requires these 2 refs:
+	<COMMIT-M> Z
+	<COMMIT-K> Z
+	EOF
+	test_cmp expect actual &&
+
+	test_bundle_object_count --thin since.bdl 13
+'
+
+test_expect_success 'create bundle 1 - no prerequisites' '
+	# create bundle from args
+	git bundle create 1.bdl topic/1 topic/2 &&
+
+	# create bundle from stdin
+	cat >input <<-\EOF &&
+	topic/1
+	topic/2
+	EOF
+	git bundle create stdin-1.bdl --stdin <input &&
+
+	cat >expect <<-\EOF &&
+	The bundle contains these 2 refs:
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	The bundle records a complete history.
+	EOF
+
+	# verify bundle, which has no prerequisites
+	git bundle verify 1.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	git bundle verify stdin-1.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	test_bundle_object_count       1.bdl 24 &&
+	test_bundle_object_count stdin-1.bdl 24
+'
+
+test_expect_success 'create bundle 2 - has prerequisites' '
+	# create bundle from args
+	git bundle create 2.bdl \
+		--ignore-missing \
+		^topic/deleted \
+		^$D \
+		^topic/2 \
+		release &&
+
+	# create bundle from stdin
+	# input has a non-exist reference: "topic/deleted"
+	cat >input <<-EOF &&
+	^topic/deleted
+	^$D
+	^topic/2
+	EOF
+	git bundle create stdin-2.bdl \
+		--ignore-missing \
+		--stdin \
+		release <input &&
+
+	format_and_save_expect <<-\EOF &&
+	The bundle contains this ref:
+	<COMMIT-N> refs/heads/release
+	The bundle requires these 3 refs:
+	<COMMIT-D> Z
+	<COMMIT-E> Z
+	<COMMIT-G> Z
+	EOF
+
+	git bundle verify 2.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	git bundle verify stdin-2.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	test_bundle_object_count       2.bdl 16 &&
+	test_bundle_object_count stdin-2.bdl 16
+'
+
+test_expect_success 'fail to verify bundle without prerequisites' '
+	git init --bare test1.git &&
+
+	format_and_save_expect <<-\EOF &&
+	error: Repository lacks these prerequisite commits:
+	error: <COMMIT-D> Z
+	error: <COMMIT-E> Z
+	error: <COMMIT-G> Z
+	EOF
+
+	test_must_fail git -C test1.git bundle verify ../2.bdl 2>&1 |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	test_must_fail git -C test1.git bundle verify ../stdin-2.bdl 2>&1 |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'create bundle 3 - two refs, same object' '
+	# create bundle from args
+	git bundle create --version=3 3.bdl \
+		^release \
+		^topic/1 \
+		^topic/2 \
+		main \
+		HEAD &&
+
+	# create bundle from stdin
+	cat >input <<-\EOF &&
+	^release
+	^topic/1
+	^topic/2
+	EOF
+	git bundle create --version=3 stdin-3.bdl \
+		--stdin \
+		main HEAD <input &&
+
+	format_and_save_expect <<-\EOF &&
+	The bundle contains these 2 refs:
+	<COMMIT-P> refs/heads/main
+	<COMMIT-P> HEAD
+	The bundle requires these 2 refs:
+	<COMMIT-M> Z
+	<COMMIT-K> Z
+	EOF
+
+	git bundle verify 3.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	git bundle verify stdin-3.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	test_bundle_object_count       3.bdl 4 &&
+	test_bundle_object_count stdin-3.bdl 4
+'
+
+test_expect_success 'create bundle 4 - with tags' '
+	# create bundle from args
+	git bundle create 4.bdl \
+		^main \
+		^release \
+		^topic/1 \
+		^topic/2 \
+		--all &&
+
+	# create bundle from stdin
+	cat >input <<-\EOF &&
+	^main
+	^release
+	^topic/1
+	^topic/2
+	EOF
+	git bundle create stdin-4.bdl \
+		--ignore-missing \
+		--stdin \
+		--all <input &&
+
+	cat >expect <<-\EOF &&
+	The bundle contains these 3 refs:
+	<TAG-1> refs/tags/v1
+	<TAG-2> refs/tags/v2
+	<TAG-3> refs/tags/v3
+	The bundle records a complete history.
+	EOF
+
+	git bundle verify 4.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	git bundle verify stdin-4.bdl |
+		make_user_friendly_and_stable_output >actual &&
+	test_cmp expect actual &&
+
+	test_bundle_object_count       4.bdl 3 &&
+	test_bundle_object_count stdin-4.bdl 3
+'
+
+test_expect_success 'clone from bundle' '
+	git clone --mirror 1.bdl mirror.git &&
+	git -C mirror.git show-ref |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	EOF
+	test_cmp expect actual &&
+
+	git -C mirror.git fetch ../2.bdl "+refs/*:refs/*" &&
+	git -C mirror.git show-ref |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-N> refs/heads/release
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	EOF
+	test_cmp expect actual &&
+
+	git -C mirror.git fetch ../3.bdl "+refs/*:refs/*" &&
+	git -C mirror.git show-ref |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-P> refs/heads/main
+	<COMMIT-N> refs/heads/release
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	EOF
+	test_cmp expect actual &&
+
+	git -C mirror.git fetch ../4.bdl "+refs/*:refs/*" &&
+	git -C mirror.git show-ref |
+		make_user_friendly_and_stable_output >actual &&
+	cat >expect <<-\EOF &&
+	<COMMIT-P> refs/heads/main
+	<COMMIT-N> refs/heads/release
+	<COMMIT-D> refs/heads/topic/1
+	<COMMIT-H> refs/heads/topic/2
+	<TAG-1> refs/tags/v1
+	<TAG-2> refs/tags/v2
+	<TAG-3> refs/tags/v3
+	EOF
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t6020-merge-df.sh b/t/t6020-merge-df.sh
deleted file mode 100755
index 46b506b3b7..0000000000
--- a/t/t6020-merge-df.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Fredrik Kuivinen
-#
-
-test_description='Test merge with directory/file conflicts'
-. ./test-lib.sh
-
-test_expect_success 'prepare repository' '
-	echo Hello >init &&
-	git add init &&
-	git commit -m initial &&
-
-	git branch B &&
-	mkdir dir &&
-	echo foo >dir/foo &&
-	git add dir/foo &&
-	git commit -m "File: dir/foo" &&
-
-	git checkout B &&
-	echo file dir >dir &&
-	git add dir &&
-	git commit -m "File: dir"
-'
-
-test_expect_success 'Merge with d/f conflicts' '
-	test_expect_code 1 git merge -m "merge msg" master
-'
-
-test_expect_success 'F/D conflict' '
-	git reset --hard &&
-	git checkout master &&
-	rm .git/index &&
-
-	mkdir before &&
-	echo FILE >before/one &&
-	echo FILE >after &&
-	git add . &&
-	git commit -m first &&
-
-	rm -f after &&
-	git mv before after &&
-	git commit -m move &&
-
-	git checkout -b para HEAD^ &&
-	echo COMPLETELY ANOTHER FILE >another &&
-	git add . &&
-	git commit -m para &&
-
-	git merge master
-'
-
-test_expect_success 'setup modify/delete + directory/file conflict' '
-	git checkout --orphan modify &&
-	git rm -rf . &&
-	git clean -fdqx &&
-
-	printf "a\nb\nc\nd\ne\nf\ng\nh\n" >letters &&
-	git add letters &&
-	git commit -m initial &&
-
-	# Throw in letters.txt for sorting order fun
-	# ("letters.txt" sorts between "letters" and "letters/file")
-	echo i >>letters &&
-	echo "version 2" >letters.txt &&
-	git add letters letters.txt &&
-	git commit -m modified &&
-
-	git checkout -b delete HEAD^ &&
-	git rm letters &&
-	mkdir letters &&
-	>letters/file &&
-	echo "version 1" >letters.txt &&
-	git add letters letters.txt &&
-	git commit -m deleted
-'
-
-test_expect_success 'modify/delete + directory/file conflict' '
-	git checkout delete^0 &&
-	test_must_fail git merge modify &&
-
-	test 5 -eq $(git ls-files -s | wc -l) &&
-	test 4 -eq $(git ls-files -u | wc -l) &&
-	test 1 -eq $(git ls-files -o | wc -l) &&
-
-	test -f letters/file &&
-	test -f letters.txt &&
-	test -f letters~modify
-'
-
-test_expect_success 'modify/delete + directory/file conflict; other way' '
-	git reset --hard &&
-	git clean -f &&
-	git checkout modify^0 &&
-
-	test_must_fail git merge delete &&
-
-	test 5 -eq $(git ls-files -s | wc -l) &&
-	test 4 -eq $(git ls-files -u | wc -l) &&
-	test 1 -eq $(git ls-files -o | wc -l) &&
-
-	test -f letters/file &&
-	test -f letters.txt &&
-	test -f letters~HEAD
-'
-
-test_done
diff --git a/t/t6021-merge-criss-cross.sh b/t/t6021-merge-criss-cross.sh
deleted file mode 100755
index 213deecab1..0000000000
--- a/t/t6021-merge-criss-cross.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Fredrik Kuivinen
-#
-
-# See http://marc.info/?l=git&m=111463358500362&w=2 for a
-# nice description of what this is about.
-
-
-test_description='Test criss-cross merge'
-. ./test-lib.sh
-
-test_expect_success 'prepare repository' \
-'echo "1
-2
-3
-4
-5
-6
-7
-8
-9" > file &&
-git add file &&
-git commit -m "Initial commit" file &&
-git branch A &&
-git branch B &&
-git checkout A &&
-echo "1
-2
-3
-4
-5
-6
-7
-8 changed in B8, branch A
-9" > file &&
-git commit -m "B8" file &&
-git checkout B &&
-echo "1
-2
-3 changed in C3, branch B
-4
-5
-6
-7
-8
-9
-" > file &&
-git commit -m "C3" file &&
-git branch C3 &&
-git merge -m "pre E3 merge" A &&
-echo "1
-2
-3 changed in E3, branch B. New file size
-4
-5
-6
-7
-8 changed in B8, branch A
-9
-" > file &&
-git commit -m "E3" file &&
-git checkout A &&
-git merge -m "pre D8 merge" C3 &&
-echo "1
-2
-3 changed in C3, branch B
-4
-5
-6
-7
-8 changed in D8, branch A. New file size 2
-9" > file &&
-git commit -m D8 file'
-
-test_expect_success 'Criss-cross merge' 'git merge -m "final merge" B'
-
-cat > file-expect <<EOF
-1
-2
-3 changed in E3, branch B. New file size
-4
-5
-6
-7
-8 changed in D8, branch A. New file size 2
-9
-EOF
-
-test_expect_success 'Criss-cross merge result' 'cmp file file-expect'
-
-test_expect_success 'Criss-cross merge fails (-s resolve)' \
-'git reset --hard A^ &&
-test_must_fail git merge -s resolve -m "final merge" B'
-
-test_done
diff --git a/t/t6023-merge-file.sh b/t/t6023-merge-file.sh
deleted file mode 100755
index 51ee887a77..0000000000
--- a/t/t6023-merge-file.sh
+++ /dev/null
@@ -1,362 +0,0 @@
-#!/bin/sh
-
-test_description='RCS merge replacement: merge-file'
-. ./test-lib.sh
-
-cat > orig.txt << EOF
-Dominus regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-EOF
-
-cat > new1.txt << EOF
-Dominus regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-
-cat > new2.txt << EOF
-Dominus regit me, et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-EOF
-
-cat > new3.txt << EOF
-DOMINUS regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-EOF
-
-cat > new4.txt << EOF
-Dominus regit me, et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-EOF
-printf "propter nomen suum." >> new4.txt
-
-test_expect_success 'merge with no changes' '
-	cp orig.txt test.txt &&
-	git merge-file test.txt orig.txt orig.txt &&
-	test_cmp test.txt orig.txt
-'
-
-cp new1.txt test.txt
-test_expect_success "merge without conflict" \
-	"git merge-file test.txt orig.txt new2.txt"
-
-test_expect_success 'works in subdirectory' '
-	mkdir dir &&
-	cp new1.txt dir/a.txt &&
-	cp orig.txt dir/o.txt &&
-	cp new2.txt dir/b.txt &&
-	( cd dir && git merge-file a.txt o.txt b.txt ) &&
-	test_path_is_missing a.txt
-'
-
-cp new1.txt test.txt
-test_expect_success "merge without conflict (--quiet)" \
-	"git merge-file --quiet test.txt orig.txt new2.txt"
-
-cp new1.txt test2.txt
-test_expect_failure "merge without conflict (missing LF at EOF)" \
-	"git merge-file test2.txt orig.txt new4.txt"
-
-test_expect_failure "merge result added missing LF" \
-	"test_cmp test.txt test2.txt"
-
-cp new4.txt test3.txt
-test_expect_success "merge without conflict (missing LF at EOF, away from change in the other file)" \
-	"git merge-file --quiet test3.txt new2.txt new3.txt"
-
-cat > expect.txt << EOF
-DOMINUS regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-EOF
-printf "propter nomen suum." >> expect.txt
-
-test_expect_success "merge does not add LF away of change" \
-	"test_cmp expect.txt test3.txt"
-
-cp test.txt backup.txt
-test_expect_success "merge with conflicts" \
-	"test_must_fail git merge-file test.txt orig.txt new3.txt"
-
-cat > expect.txt << EOF
-<<<<<<< test.txt
-Dominus regit me, et nihil mihi deerit.
-=======
-DOMINUS regit me,
-et nihil mihi deerit.
->>>>>>> new3.txt
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-
-test_expect_success "expected conflict markers" "test_cmp expect.txt test.txt"
-
-cp backup.txt test.txt
-
-cat > expect.txt << EOF
-Dominus regit me, et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-test_expect_success "merge conflicting with --ours" \
-	"git merge-file --ours test.txt orig.txt new3.txt && test_cmp expect.txt test.txt"
-cp backup.txt test.txt
-
-cat > expect.txt << EOF
-DOMINUS regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-test_expect_success "merge conflicting with --theirs" \
-	"git merge-file --theirs test.txt orig.txt new3.txt && test_cmp expect.txt test.txt"
-cp backup.txt test.txt
-
-cat > expect.txt << EOF
-Dominus regit me, et nihil mihi deerit.
-DOMINUS regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-test_expect_success "merge conflicting with --union" \
-	"git merge-file --union test.txt orig.txt new3.txt && test_cmp expect.txt test.txt"
-cp backup.txt test.txt
-
-test_expect_success "merge with conflicts, using -L" \
-	"test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt"
-
-cat > expect.txt << EOF
-<<<<<<< 1
-Dominus regit me, et nihil mihi deerit.
-=======
-DOMINUS regit me,
-et nihil mihi deerit.
->>>>>>> new3.txt
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam tu mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-
-test_expect_success "expected conflict markers, with -L" \
-	"test_cmp expect.txt test.txt"
-
-sed "s/ tu / TU /" < new1.txt > new5.txt
-test_expect_success "conflict in removed tail" \
-	"test_must_fail git merge-file -p orig.txt new1.txt new5.txt > out"
-
-cat > expect << EOF
-Dominus regit me,
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-<<<<<<< orig.txt
-=======
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam TU mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
->>>>>>> new5.txt
-EOF
-
-test_expect_success "expected conflict markers" "test_cmp expect out"
-
-test_expect_success 'binary files cannot be merged' '
-	test_must_fail git merge-file -p \
-		orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
-	grep "Cannot merge binary files" merge.err
-'
-
-sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" < new5.txt > new6.txt
-sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" < new5.txt > new7.txt
-
-test_expect_success 'MERGE_ZEALOUS simplifies non-conflicts' '
-
-	test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output &&
-	test 1 = $(grep ======= < output | wc -l)
-
-'
-
-sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit;/"< new6.txt | tr '%' '\012' > new8.txt
-sed -e 's/deerit./&%%%%/' -e "s/locavit,/locavit --/" < new7.txt | tr '%' '\012' > new9.txt
-
-test_expect_success 'ZEALOUS_ALNUM' '
-
-	test_must_fail git merge-file -p \
-		new8.txt new5.txt new9.txt > merge.out &&
-	test 1 = $(grep ======= < merge.out | wc -l)
-
-'
-
-cat >expect <<\EOF
-Dominus regit me,
-<<<<<<< new8.txt
-et nihil mihi deerit;
-
-
-
-
-In loco pascuae ibi me collocavit;
-super aquam refectionis educavit me.
-||||||| new5.txt
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-=======
-et nihil mihi deerit,
-
-
-
-
-In loco pascuae ibi me collocavit --
-super aquam refectionis educavit me,
->>>>>>> new9.txt
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam TU mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-
-test_expect_success '"diff3 -m" style output (1)' '
-	test_must_fail git merge-file -p --diff3 \
-		new8.txt new5.txt new9.txt >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success '"diff3 -m" style output (2)' '
-	git config merge.conflictstyle diff3 &&
-	test_must_fail git merge-file -p \
-		new8.txt new5.txt new9.txt >actual &&
-	test_cmp expect actual
-'
-
-cat >expect <<\EOF
-Dominus regit me,
-<<<<<<<<<< new8.txt
-et nihil mihi deerit;
-
-
-
-
-In loco pascuae ibi me collocavit;
-super aquam refectionis educavit me.
-|||||||||| new5.txt
-et nihil mihi deerit.
-In loco pascuae ibi me collocavit,
-super aquam refectionis educavit me;
-==========
-et nihil mihi deerit,
-
-
-
-
-In loco pascuae ibi me collocavit --
-super aquam refectionis educavit me,
->>>>>>>>>> new9.txt
-animam meam convertit,
-deduxit me super semitas jusitiae,
-propter nomen suum.
-Nam et si ambulavero in medio umbrae mortis,
-non timebo mala, quoniam TU mecum es:
-virga tua et baculus tuus ipsa me consolata sunt.
-EOF
-
-test_expect_success 'marker size' '
-	test_must_fail git merge-file -p --marker-size=10 \
-		new8.txt new5.txt new9.txt >actual &&
-	test_cmp expect actual
-'
-
-printf "line1\nline2\nline3" >nolf-orig.txt
-printf "line1\nline2\nline3x" >nolf-diff1.txt
-printf "line1\nline2\nline3y" >nolf-diff2.txt
-
-test_expect_success 'conflict at EOF without LF resolved by --ours' \
-	'git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	 printf "line1\nline2\nline3x" >expect.txt &&
-	 test_cmp expect.txt output.txt'
-
-test_expect_success 'conflict at EOF without LF resolved by --theirs' \
-	'git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	 printf "line1\nline2\nline3y" >expect.txt &&
-	 test_cmp expect.txt output.txt'
-
-test_expect_success 'conflict at EOF without LF resolved by --union' \
-	'git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
-	 printf "line1\nline2\nline3x\nline3y" >expect.txt &&
-	 test_cmp expect.txt output.txt'
-
-test_expect_success 'conflict sections match existing line endings' '
-	printf "1\\r\\n2\\r\\n3" >crlf-orig.txt &&
-	printf "1\\r\\n2\\r\\n4" >crlf-diff1.txt &&
-	printf "1\\r\\n2\\r\\n5" >crlf-diff2.txt &&
-	test_must_fail git -c core.eol=crlf merge-file -p \
-		crlf-diff1.txt crlf-orig.txt crlf-diff2.txt >crlf.txt &&
-	test $(tr "\015" Q <crlf.txt | grep "^[<=>].*Q$" | wc -l) = 3 &&
-	test $(tr "\015" Q <crlf.txt | grep "[345]Q$" | wc -l) = 3 &&
-	test_must_fail git -c core.eol=crlf merge-file -p \
-		nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >nolf.txt &&
-	test $(tr "\015" Q <nolf.txt | grep "^[<=>].*Q$" | wc -l) = 0
-'
-
-test_done
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh
deleted file mode 100755
index 27c7de90ce..0000000000
--- a/t/t6024-recursive-merge.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/sh
-
-test_description='Test merge without common ancestors'
-. ./test-lib.sh
-
-# This scenario is based on a real-world repository of Shawn Pearce.
-
-# 1 - A - D - F
-#   \   X   /
-#     B   X
-#       X   \
-# 2 - C - E - G
-
-GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
-export GIT_COMMITTER_DATE
-
-test_expect_success "setup tests" '
-echo 1 > a1 &&
-git add a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
-
-git checkout -b A master &&
-echo A > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
-
-git checkout -b B master &&
-echo B > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
-
-git checkout -b D A &&
-git rev-parse B > .git/MERGE_HEAD &&
-echo D > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
-
-git symbolic-ref HEAD refs/heads/other &&
-echo 2 > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
-
-git checkout -b C &&
-echo C > a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
-
-git checkout -b E C &&
-git rev-parse B > .git/MERGE_HEAD &&
-echo E > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
-
-git checkout -b G E &&
-git rev-parse A > .git/MERGE_HEAD &&
-echo G > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
-
-git checkout -b F D &&
-git rev-parse C > .git/MERGE_HEAD &&
-echo F > a1 &&
-git update-index a1 &&
-GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F
-'
-
-test_expect_success 'combined merge conflicts' '
-	test_must_fail env GIT_TEST_COMMIT_GRAPH=0 git merge -m final G
-'
-
-cat > expect << EOF
-<<<<<<< HEAD
-F
-=======
-G
->>>>>>> G
-EOF
-
-test_expect_success "result contains a conflict" "test_cmp expect a1"
-
-git ls-files --stage > out
-cat > expect << EOF
-100644 ec3fe2a791706733f2d8fa7ad45d9a9672031f5e 1	a1
-100644 cf84443e49e1b366fac938711ddf4be2d4d1d9e9 2	a1
-100644 fd7923529855d0b274795ae3349c5e0438333979 3	a1
-EOF
-
-test_expect_success "virtual trees were processed" "test_cmp expect out"
-
-test_expect_success 'refuse to merge binary files' '
-	git reset --hard &&
-	printf "\0" > binary-file &&
-	git add binary-file &&
-	git commit -m binary &&
-	git checkout G &&
-	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
-'
-
-test_expect_success 'mark rename/delete as unmerged' '
-
-	git reset --hard &&
-	git checkout -b delete &&
-	git rm a1 &&
-	test_tick &&
-	git commit -m delete &&
-	git checkout -b rename HEAD^ &&
-	git mv a1 a2 &&
-	test_tick &&
-	git commit -m rename &&
-	test_must_fail git merge delete &&
-	test 1 = $(git ls-files --unmerged | wc -l) &&
-	git rev-parse --verify :2:a2 &&
-	test_must_fail git rev-parse --verify :3:a2 &&
-	git checkout -f delete &&
-	test_must_fail git merge rename &&
-	test 1 = $(git ls-files --unmerged | wc -l) &&
-	test_must_fail git rev-parse --verify :2:a2 &&
-	git rev-parse --verify :3:a2
-
-'
-
-test_done
diff --git a/t/t6025-merge-symlinks.sh b/t/t6025-merge-symlinks.sh
deleted file mode 100755
index 433c4de08f..0000000000
--- a/t/t6025-merge-symlinks.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2007 Johannes Sixt
-#
-
-test_description='merging symlinks on filesystem w/o symlink support.
-
-This tests that git merge-recursive writes merge results as plain files
-if core.symlinks is false.'
-
-. ./test-lib.sh
-
-test_expect_success \
-'setup' '
-git config core.symlinks false &&
-> file &&
-git add file &&
-git commit -m initial &&
-git branch b-symlink &&
-git branch b-file &&
-l=$(printf file | git hash-object -t blob -w --stdin) &&
-echo "120000 $l	symlink" | git update-index --index-info &&
-git commit -m master &&
-git checkout b-symlink &&
-l=$(printf file-different | git hash-object -t blob -w --stdin) &&
-echo "120000 $l	symlink" | git update-index --index-info &&
-git commit -m b-symlink &&
-git checkout b-file &&
-echo plain-file > symlink &&
-git add symlink &&
-git commit -m b-file'
-
-test_expect_success \
-'merge master into b-symlink, which has a different symbolic link' '
-git checkout b-symlink &&
-test_must_fail git merge master'
-
-test_expect_success \
-'the merge result must be a file' '
-test -f symlink'
-
-test_expect_success \
-'merge master into b-file, which has a file instead of a symbolic link' '
-git reset --hard && git checkout b-file &&
-test_must_fail git merge master'
-
-test_expect_success \
-'the merge result must be a file' '
-test -f symlink'
-
-test_expect_success \
-'merge b-file, which has a file instead of a symbolic link, into master' '
-git reset --hard &&
-git checkout master &&
-test_must_fail git merge b-file'
-
-test_expect_success \
-'the merge result must be a file' '
-test -f symlink'
-
-test_done
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index bdc42e9440..a1baf4e451 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -6,6 +6,9 @@ test_description='Tests git bisect functionality'
 
 exec </dev/null
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 add_line_into_file()
@@ -82,9 +85,16 @@ test_expect_success 'bisect fails if given any junk instead of revs' '
 	git bisect bad $HASH4
 '
 
-test_expect_success 'bisect reset: back in the master branch' '
+test_expect_success 'bisect start without -- takes unknown arg as pathspec' '
 	git bisect reset &&
-	echo "* master" > branch.expect &&
+	git bisect start foo bar &&
+	grep foo ".git/BISECT_NAMES" &&
+	grep bar ".git/BISECT_NAMES"
+'
+
+test_expect_success 'bisect reset: back in the main branch' '
+	git bisect reset &&
+	echo "* main" > branch.expect &&
 	git branch > branch.output &&
 	cmp branch.expect branch.output
 '
@@ -95,7 +105,7 @@ test_expect_success 'bisect reset: back in another branch' '
 	git bisect good $HASH1 &&
 	git bisect bad $HASH3 &&
 	git bisect reset &&
-	echo "  master" > branch.expect &&
+	echo "  main" > branch.expect &&
 	echo "* other" >> branch.expect &&
 	git branch > branch.output &&
 	cmp branch.expect branch.output
@@ -148,7 +158,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" created if junk rev' '
 	test_must_fail git bisect start $HASH4 foo -- &&
 	git branch > branch.output &&
 	grep "* other" branch.output > /dev/null &&
-	test_must_fail test -e .git/BISECT_START
+	test_path_is_missing .git/BISECT_START
 '
 
 test_expect_success 'bisect start: existing ".git/BISECT_START" not modified if junk rev' '
@@ -166,7 +176,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if mistaken rev' '
 	test_must_fail git bisect start $HASH1 $HASH4 -- &&
 	git branch > branch.output &&
 	grep "* other" branch.output > /dev/null &&
-	test_must_fail test -e .git/BISECT_START
+	test_path_is_missing .git/BISECT_START
 '
 
 test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' '
@@ -175,7 +185,7 @@ test_expect_success 'bisect start: no ".git/BISECT_START" if checkout error' '
 	git branch &&
 	git branch > branch.output &&
 	grep "* other" branch.output > /dev/null &&
-	test_must_fail test -e .git/BISECT_START &&
+	test_path_is_missing .git/BISECT_START &&
 	test -z "$(git for-each-ref "refs/bisect/*")" &&
 	git checkout HEAD hello
 '
@@ -243,32 +253,30 @@ test_expect_success 'bisect skip: with commit both bad and skipped' '
 '
 
 # We want to automatically find the commit that
-# introduced "Another" into hello.
-test_expect_success \
-    '"git bisect run" simple case' \
-    'echo "#"\!"/bin/sh" > test_script.sh &&
-     echo "grep Another hello > /dev/null" >> test_script.sh &&
-     echo "test \$? -ne 0" >> test_script.sh &&
-     chmod +x test_script.sh &&
-     git bisect start &&
-     git bisect good $HASH1 &&
-     git bisect bad $HASH4 &&
-     git bisect run ./test_script.sh > my_bisect_log.txt &&
-     grep "$HASH3 is the first bad commit" my_bisect_log.txt &&
-     git bisect reset'
+# added "Another" into hello.
+test_expect_success '"git bisect run" simple case' '
+	write_script test_script.sh <<-\EOF &&
+	! grep Another hello >/dev/null
+	EOF
+	git bisect start &&
+	git bisect good $HASH1 &&
+	git bisect bad $HASH4 &&
+	git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "$HASH3 is the first bad commit" my_bisect_log.txt &&
+	git bisect reset
+'
 
 # We want to automatically find the commit that
-# introduced "Ciao" into hello.
-test_expect_success \
-    '"git bisect run" with more complex "git bisect start"' \
-    'echo "#"\!"/bin/sh" > test_script.sh &&
-     echo "grep Ciao hello > /dev/null" >> test_script.sh &&
-     echo "test \$? -ne 0" >> test_script.sh &&
-     chmod +x test_script.sh &&
-     git bisect start $HASH4 $HASH1 &&
-     git bisect run ./test_script.sh > my_bisect_log.txt &&
-     grep "$HASH4 is the first bad commit" my_bisect_log.txt &&
-     git bisect reset'
+# added "Ciao" into hello.
+test_expect_success '"git bisect run" with more complex "git bisect start"' '
+	write_script test_script.sh <<-\EOF &&
+	! grep Ciao hello >/dev/null
+	EOF
+	git bisect start $HASH4 $HASH1 &&
+	git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "$HASH4 is the first bad commit" my_bisect_log.txt &&
+	git bisect reset
+'
 
 # $HASH1 is good, $HASH5 is bad, we skip $HASH3
 # but $HASH4 is good,
@@ -295,24 +303,17 @@ HASH6=
 test_expect_success 'bisect run & skip: cannot tell between 2' '
 	add_line_into_file "6: Yet a line." hello &&
 	HASH6=$(git rev-parse --verify HEAD) &&
-	echo "#"\!"/bin/sh" > test_script.sh &&
-	echo "sed -ne \\\$p hello | grep Ciao > /dev/null && exit 125" >> test_script.sh &&
-	echo "grep line hello > /dev/null" >> test_script.sh &&
-	echo "test \$? -ne 0" >> test_script.sh &&
-	chmod +x test_script.sh &&
+	write_script test_script.sh <<-\EOF &&
+	sed -ne \$p hello | grep Ciao >/dev/null && exit 125
+	! grep line hello >/dev/null
+	EOF
 	git bisect start $HASH6 $HASH1 &&
-	if git bisect run ./test_script.sh > my_bisect_log.txt
-	then
-		echo Oops, should have failed.
-		false
-	else
-		test $? -eq 2 &&
-		grep "first bad commit could be any of" my_bisect_log.txt &&
-		! grep $HASH3 my_bisect_log.txt &&
-		! grep $HASH6 my_bisect_log.txt &&
-		grep $HASH4 my_bisect_log.txt &&
-		grep $HASH5 my_bisect_log.txt
-	fi
+	test_expect_code 2 git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "first bad commit could be any of" my_bisect_log.txt &&
+	! grep $HASH3 my_bisect_log.txt &&
+	! grep $HASH6 my_bisect_log.txt &&
+	grep $HASH4 my_bisect_log.txt &&
+	grep $HASH5 my_bisect_log.txt
 '
 
 HASH7=
@@ -320,14 +321,13 @@ test_expect_success 'bisect run & skip: find first bad' '
 	git bisect reset &&
 	add_line_into_file "7: Should be the last line." hello &&
 	HASH7=$(git rev-parse --verify HEAD) &&
-	echo "#"\!"/bin/sh" > test_script.sh &&
-	echo "sed -ne \\\$p hello | grep Ciao > /dev/null && exit 125" >> test_script.sh &&
-	echo "sed -ne \\\$p hello | grep day > /dev/null && exit 125" >> test_script.sh &&
-	echo "grep Yet hello > /dev/null" >> test_script.sh &&
-	echo "test \$? -ne 0" >> test_script.sh &&
-	chmod +x test_script.sh &&
+	write_script test_script.sh <<-\EOF &&
+	sed -ne \$p hello | grep Ciao >/dev/null && exit 125
+	sed -ne \$p hello | grep day >/dev/null && exit 125
+	! grep Yet hello >/dev/null
+	EOF
 	git bisect start $HASH7 $HASH1 &&
-	git bisect run ./test_script.sh > my_bisect_log.txt &&
+	git bisect run ./test_script.sh >my_bisect_log.txt &&
 	grep "$HASH6 is the first bad commit" my_bisect_log.txt
 '
 
@@ -351,7 +351,7 @@ test_expect_success 'bisect skip many ranges' '
 
 test_expect_success 'bisect starting with a detached HEAD' '
 	git bisect reset &&
-	git checkout master^ &&
+	git checkout main^ &&
 	HEAD=$(git rev-parse --verify HEAD) &&
 	git bisect start &&
 	test $HEAD = $(cat .git/BISECT_START) &&
@@ -458,6 +458,24 @@ test_expect_success 'many merge bases creation' '
 	grep "$SIDE_HASH5" merge_bases.txt
 '
 
+# We want to automatically find the merge that
+# added "line" into hello.
+test_expect_success '"git bisect run --first-parent" simple case' '
+	git rev-list --first-parent $B_HASH ^$HASH4 >first_parent_chain.txt &&
+	write_script test_script.sh <<-\EOF &&
+	grep $(git rev-parse HEAD) first_parent_chain.txt || exit -1
+	! grep line hello >/dev/null
+	EOF
+	git bisect start --first-parent &&
+	test_path_is_file ".git/BISECT_FIRST_PARENT" &&
+	git bisect good $HASH4 &&
+	git bisect bad $B_HASH &&
+	git bisect run ./test_script.sh >my_bisect_log.txt &&
+	grep "$B_HASH is the first bad commit" my_bisect_log.txt &&
+	git bisect reset &&
+	test_path_is_missing .git/BISECT_FIRST_PARENT
+'
+
 test_expect_success 'good merge bases when good and bad are siblings' '
 	git bisect start "$B_HASH" "$A_HASH" > my_bisect_log.txt &&
 	test_i18ngrep "merge base must be tested" my_bisect_log.txt &&
@@ -482,10 +500,10 @@ test_expect_success 'optimized merge base checks' '
 	git bisect good > my_bisect_log2.txt &&
 	test -f ".git/BISECT_ANCESTORS_OK" &&
 	test "$HASH6" = $(git rev-parse --verify HEAD) &&
-	git bisect bad > my_bisect_log3.txt &&
+	git bisect bad &&
 	git bisect good "$A_HASH" > my_bisect_log4.txt &&
 	test_i18ngrep "merge base must be tested" my_bisect_log4.txt &&
-	test_must_fail test -f ".git/BISECT_ANCESTORS_OK"
+	test_path_is_missing ".git/BISECT_ANCESTORS_OK"
 '
 
 # This creates another side branch called "parallel" with some files
@@ -560,9 +578,9 @@ test_expect_success 'skipping away from skipped commit' '
 	test "$para3" = "$PARA_HASH3"
 '
 
-test_expect_success 'erroring out when using bad path parameters' '
+test_expect_success 'erroring out when using bad path arguments' '
 	test_must_fail git bisect start $PARA_HASH7 $HASH1 -- foobar 2> error.txt &&
-	test_i18ngrep "bad path parameters" error.txt
+	test_i18ngrep "bad path arguments" error.txt
 '
 
 test_expect_success 'test bisection on bare repo - --no-checkout specified' '
@@ -701,7 +719,7 @@ test_expect_success 'bisect: --no-checkout - target after breakage' '
 test_expect_success 'bisect: demonstrate identification of damage boundary' "
 	git bisect reset &&
 	git checkout broken &&
-	git bisect start broken master --no-checkout &&
+	git bisect start broken main --no-checkout &&
 	test_must_fail git bisect run \"\$SHELL_PATH\" -c '
 		GOOD=\$(git for-each-ref \"--format=%(objectname)\" refs/bisect/good-*) &&
 		git rev-list --objects BISECT_HEAD --not \$GOOD >tmp.\$\$ &&
@@ -792,6 +810,13 @@ test_expect_success 'bisect replay with old and new' '
 	git bisect reset
 '
 
+test_expect_success 'bisect replay with CRLF log' '
+	append_cr <log_to_replay.txt >log_to_replay_crlf.txt &&
+	git bisect replay log_to_replay_crlf.txt >bisect_result_crlf &&
+	grep "$HASH2 is the first new commit" bisect_result_crlf &&
+	git bisect reset
+'
+
 test_expect_success 'bisect cannot mix old/new and good/bad' '
 	git bisect start &&
 	git bisect bad $HASH4 &&
@@ -804,7 +829,7 @@ test_expect_success 'bisect terms needs 0 or 1 argument' '
 	test_must_fail git bisect terms 1 2 &&
 	test_must_fail git bisect terms 2>actual &&
 	echo "error: no terms defined" >expected &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'bisect terms shows good/bad after start' '
@@ -859,7 +884,9 @@ test_expect_success 'bisect cannot mix terms' '
 
 test_expect_success 'bisect terms rejects invalid terms' '
 	git bisect reset &&
+	test_must_fail git bisect start --term-good &&
 	test_must_fail git bisect start --term-good invalid..term &&
+	test_must_fail git bisect start --term-bad &&
 	test_must_fail git bisect terms --term-bad invalid..term &&
 	test_must_fail git bisect terms --term-good bad &&
 	test_must_fail git bisect terms --term-good old &&
@@ -876,7 +903,7 @@ test_expect_success 'bisect start --term-* does store terms' '
 	Your current terms are two for the old state
 	and one for the new state.
 	EOF
-	test_i18ncmp expected actual &&
+	test_cmp expected actual &&
 	git bisect terms --term-bad >actual &&
 	echo one >expected &&
 	test_cmp expected actual &&
@@ -895,6 +922,17 @@ test_expect_success 'bisect start takes options and revs in any order' '
 	test_cmp expected actual
 '
 
+# Bisect is started with --term-new and --term-old arguments,
+# then skip. The HEAD should be changed.
+test_expect_success 'bisect skip works with --term*' '
+	git bisect reset &&
+	git bisect start --term-new=fixed --term-old=unfixed HEAD $HASH1 &&
+	hash_skipped_from=$(git rev-parse --verify HEAD) &&
+	git bisect skip &&
+	hash_skipped_to=$(git rev-parse --verify HEAD) &&
+	test "$hash_skipped_from" != "$hash_skipped_to"
+'
+
 test_expect_success 'git bisect reset cleans bisection state properly' '
 	git bisect reset &&
 	git bisect start &&
@@ -902,14 +940,26 @@ test_expect_success 'git bisect reset cleans bisection state properly' '
 	git bisect bad $HASH4 &&
 	git bisect reset &&
 	test -z "$(git for-each-ref "refs/bisect/*")" &&
-	test_path_is_missing "$GIT_DIR/BISECT_EXPECTED_REV" &&
-	test_path_is_missing "$GIT_DIR/BISECT_ANCESTORS_OK" &&
-	test_path_is_missing "$GIT_DIR/BISECT_LOG" &&
-	test_path_is_missing "$GIT_DIR/BISECT_RUN" &&
-	test_path_is_missing "$GIT_DIR/BISECT_TERMS" &&
-	test_path_is_missing "$GIT_DIR/head-name" &&
-	test_path_is_missing "$GIT_DIR/BISECT_HEAD" &&
-	test_path_is_missing "$GIT_DIR/BISECT_START"
+	test_path_is_missing ".git/BISECT_EXPECTED_REV" &&
+	test_path_is_missing ".git/BISECT_ANCESTORS_OK" &&
+	test_path_is_missing ".git/BISECT_LOG" &&
+	test_path_is_missing ".git/BISECT_RUN" &&
+	test_path_is_missing ".git/BISECT_TERMS" &&
+	test_path_is_missing ".git/head-name" &&
+	test_path_is_missing ".git/BISECT_HEAD" &&
+	test_path_is_missing ".git/BISECT_START"
+'
+
+test_expect_success 'bisect handles annotated tags' '
+	test_commit commit-one &&
+	git tag -m foo tag-one &&
+	test_commit commit-two &&
+	git tag -m foo tag-two &&
+	git bisect start &&
+	git bisect good tag-one &&
+	git bisect bad tag-two >output &&
+	bad=$(git rev-parse --verify tag-two^{commit}) &&
+	grep "$bad is the first bad commit" output
 '
 
 test_done
diff --git a/t/t6034-merge-rename-nocruft.sh b/t/t6034-merge-rename-nocruft.sh
deleted file mode 100755
index 89871aa5b0..0000000000
--- a/t/t6034-merge-rename-nocruft.sh
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/bin/sh
-
-test_description='Merge-recursive merging renames'
-. ./test-lib.sh
-
-test_expect_success setup \
-'
-cat >A <<\EOF &&
-a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-c cccccccccccccccccccccccccccccccccccccccccccccccc
-d dddddddddddddddddddddddddddddddddddddddddddddddd
-e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-f ffffffffffffffffffffffffffffffffffffffffffffffff
-g gggggggggggggggggggggggggggggggggggggggggggggggg
-h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
-i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
-k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
-l llllllllllllllllllllllllllllllllllllllllllllllll
-m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
-o oooooooooooooooooooooooooooooooooooooooooooooooo
-EOF
-
-cat >M <<\EOF &&
-A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
-H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
-I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
-L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
-O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
-EOF
-
-git add A M &&
-git commit -m "initial has A and M" &&
-git branch white &&
-git branch red &&
-git branch blue &&
-
-git checkout white &&
-sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A B M N &&
-git commit -m "white renames A->B, M->N" &&
-
-git checkout red &&
-echo created by red >R &&
-git update-index --add R &&
-git commit -m "red creates R" &&
-
-git checkout blue &&
-sed -e "/^o /s/.*/g : blue changes a line/" <A >B &&
-rm -f A &&
-mv B A &&
-git update-index A &&
-git commit -m "blue modify A" &&
-
-git checkout master'
-
-# This test broke in 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae
-test_expect_success 'merge white into red (A->B,M->N)' \
-'
-	git checkout -b red-white red &&
-	git merge white &&
-	git write-tree &&
-	test_path_is_file B &&
-	test_path_is_file N &&
-	test_path_is_file R &&
-	test_path_is_missing A &&
-	test_path_is_missing M
-'
-
-# This test broke in 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9
-test_expect_success 'merge blue into white (A->B, mod A, A untracked)' \
-'
-	git checkout -b white-blue white &&
-	echo dirty >A &&
-	git merge blue &&
-	git write-tree &&
-	test_path_is_file A &&
-	echo dirty >expect &&
-	test_cmp expect A &&
-	test_path_is_file B &&
-	test_path_is_file N &&
-	test_path_is_missing M
-'
-
-test_done
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index ad1922b999..a313849406 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -2,6 +2,9 @@
 
 test_description='remote tracking stats'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 advance () {
@@ -34,7 +37,7 @@ test_expect_success setup '
 		git branch -d brokenbase &&
 		git checkout -b b6 origin
 	) &&
-	git checkout -b follower --track master &&
+	git checkout -b follower --track main &&
 	advance h
 '
 
@@ -54,16 +57,16 @@ test_expect_success 'branch -v' '
 		git branch -v
 	) |
 	sed -n -e "$t6040_script" >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat >expect <<\EOF
-b1 [origin/master: ahead 1, behind 1] d
-b2 [origin/master: ahead 1, behind 1] d
-b3 [origin/master: behind 1] b
-b4 [origin/master: ahead 2] f
+b1 [origin/main: ahead 1, behind 1] d
+b2 [origin/main: ahead 1, behind 1] d
+b3 [origin/main: behind 1] b
+b4 [origin/main: ahead 2] f
 b5 [brokenbase: gone] g
-b6 [origin/master] c
+b6 [origin/main] c
 EOF
 
 test_expect_success 'branch -vv' '
@@ -72,7 +75,7 @@ test_expect_success 'branch -vv' '
 		git branch -vv
 	) |
 	sed -n -e "$t6040_script" >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'checkout (diverged from upstream)' '
@@ -83,7 +86,7 @@ test_expect_success 'checkout (diverged from upstream)' '
 '
 
 test_expect_success 'checkout with local tracked branch' '
-	git checkout master &&
+	git checkout main &&
 	git checkout follower >actual &&
 	test_i18ngrep "is ahead of" actual
 '
@@ -100,7 +103,7 @@ test_expect_success 'checkout (up-to-date with upstream)' '
 	(
 		cd test && git checkout b6
 	) >actual &&
-	test_i18ngrep "Your branch is up to date with .origin/master" actual
+	test_i18ngrep "Your branch is up to date with .origin/main" actual
 '
 
 test_expect_success 'status (diverged from upstream)' '
@@ -130,11 +133,11 @@ test_expect_success 'status (up-to-date with upstream)' '
 		# reports nothing to commit
 		test_must_fail git commit --dry-run
 	) >actual &&
-	test_i18ngrep "Your branch is up to date with .origin/master" actual
+	test_i18ngrep "Your branch is up to date with .origin/main" actual
 '
 
 cat >expect <<\EOF
-## b1...origin/master [ahead 1, behind 1]
+## b1...origin/main [ahead 1, behind 1]
 EOF
 
 test_expect_success 'status -s -b (diverged from upstream)' '
@@ -143,11 +146,11 @@ test_expect_success 'status -s -b (diverged from upstream)' '
 		git checkout b1 >/dev/null &&
 		git status -s -b | head -1
 	) >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat >expect <<\EOF
-## b1...origin/master [different]
+## b1...origin/main [different]
 EOF
 
 test_expect_success 'status -s -b --no-ahead-behind (diverged from upstream)' '
@@ -156,11 +159,11 @@ test_expect_success 'status -s -b --no-ahead-behind (diverged from upstream)' '
 		git checkout b1 >/dev/null &&
 		git status -s -b --no-ahead-behind | head -1
 	) >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat >expect <<\EOF
-## b1...origin/master [different]
+## b1...origin/main [different]
 EOF
 
 test_expect_success 'status.aheadbehind=false status -s -b (diverged from upstream)' '
@@ -169,12 +172,12 @@ test_expect_success 'status.aheadbehind=false status -s -b (diverged from upstre
 		git checkout b1 >/dev/null &&
 		git -c status.aheadbehind=false status -s -b | head -1
 	) >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat >expect <<\EOF
 On branch b1
-Your branch and 'origin/master' have diverged,
+Your branch and 'origin/main' have diverged,
 and have 1 and 1 different commits each, respectively.
 EOF
 
@@ -184,7 +187,7 @@ test_expect_success 'status --long --branch' '
 		git checkout b1 >/dev/null &&
 		git status --long -b | head -3
 	) >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'status --long --branch' '
@@ -193,12 +196,12 @@ test_expect_success 'status --long --branch' '
 		git checkout b1 >/dev/null &&
 		git -c status.aheadbehind=true status --long -b | head -3
 	) >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat >expect <<\EOF
 On branch b1
-Your branch and 'origin/master' refer to different commits.
+Your branch and 'origin/main' refer to different commits.
 EOF
 
 test_expect_success 'status --long --branch --no-ahead-behind' '
@@ -207,7 +210,7 @@ test_expect_success 'status --long --branch --no-ahead-behind' '
 		git checkout b1 >/dev/null &&
 		git status --long -b --no-ahead-behind | head -2
 	) >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'status.aheadbehind=false status --long --branch' '
@@ -216,7 +219,7 @@ test_expect_success 'status.aheadbehind=false status --long --branch' '
 		git checkout b1 >/dev/null &&
 		git -c status.aheadbehind=false status --long -b | head -2
 	) >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat >expect <<\EOF
@@ -229,11 +232,11 @@ test_expect_success 'status -s -b (upstream is gone)' '
 		git checkout b5 >/dev/null &&
 		git status -s -b | head -1
 	) >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat >expect <<\EOF
-## b6...origin/master
+## b6...origin/main
 EOF
 
 test_expect_success 'status -s -b (up-to-date with upstream)' '
@@ -242,11 +245,11 @@ test_expect_success 'status -s -b (up-to-date with upstream)' '
 		git checkout b6 >/dev/null &&
 		git status -s -b | head -1
 	) >actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'fail to track lightweight tags' '
-	git checkout master &&
+	git checkout main &&
 	git tag light &&
 	test_must_fail git branch --track lighttrack light >actual &&
 	test_i18ngrep ! "set up to track" actual &&
@@ -254,7 +257,7 @@ test_expect_success 'fail to track lightweight tags' '
 '
 
 test_expect_success 'fail to track annotated tags' '
-	git checkout master &&
+	git checkout main &&
 	git tag -m heavy heavy &&
 	test_must_fail git branch --track heavytrack heavy >actual &&
 	test_i18ngrep ! "set up to track" actual &&
@@ -262,29 +265,29 @@ test_expect_success 'fail to track annotated tags' '
 '
 
 test_expect_success '--set-upstream-to does not change branch' '
-	git branch from-master master &&
-	git branch --set-upstream-to master from-master &&
-	git branch from-master2 master &&
-	test_must_fail git config branch.from-master2.merge > actual &&
-	git rev-list from-master2 &&
-	git update-ref refs/heads/from-master2 from-master2^ &&
-	git rev-parse from-master2 >expect2 &&
-	git branch --set-upstream-to master from-master2 &&
-	git config branch.from-master.merge > actual &&
-	git rev-parse from-master2 >actual2 &&
-	grep -q "^refs/heads/master$" actual &&
+	git branch from-main main &&
+	git branch --set-upstream-to main from-main &&
+	git branch from-topic_2 main &&
+	test_must_fail git config branch.from-topic_2.merge > actual &&
+	git rev-list from-topic_2 &&
+	git update-ref refs/heads/from-topic_2 from-topic_2^ &&
+	git rev-parse from-topic_2 >expect2 &&
+	git branch --set-upstream-to main from-topic_2 &&
+	git config branch.from-main.merge > actual &&
+	git rev-parse from-topic_2 >actual2 &&
+	grep -q "^refs/heads/main$" actual &&
 	cmp expect2 actual2
 '
 
 test_expect_success '--set-upstream-to @{-1}' '
 	git checkout follower &&
-	git checkout from-master2 &&
-	git config branch.from-master2.merge > expect2 &&
-	git branch --set-upstream-to @{-1} from-master &&
-	git config branch.from-master.merge > actual &&
-	git config branch.from-master2.merge > actual2 &&
-	git branch --set-upstream-to follower from-master &&
-	git config branch.from-master.merge > expect &&
+	git checkout from-topic_2 &&
+	git config branch.from-topic_2.merge > expect2 &&
+	git branch --set-upstream-to @{-1} from-main &&
+	git config branch.from-main.merge > actual &&
+	git config branch.from-topic_2.merge > actual2 &&
+	git branch --set-upstream-to follower from-main &&
+	git config branch.from-main.merge > expect &&
 	test_cmp expect2 actual2 &&
 	test_cmp expect actual
 '
diff --git a/t/t6041-bisect-submodule.sh b/t/t6041-bisect-submodule.sh
index 62b8a2e7bb..82013fc903 100755
--- a/t/t6041-bisect-submodule.sh
+++ b/t/t6041-bisect-submodule.sh
@@ -8,9 +8,14 @@ test_description='bisect can handle submodules'
 git_bisect () {
 	git status -su >expect &&
 	ls -1pR * >>expect &&
-	tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
+	"$TAR" cf "$TRASH_DIRECTORY/tmp.tar" * &&
 	GOOD=$(git rev-parse --verify HEAD) &&
-	git checkout "$1" &&
+	may_only_be_test_must_fail "$2" &&
+	$2 git checkout "$1" &&
+	if test -n "$2"
+	then
+		return
+	fi &&
 	echo "foo" >bar &&
 	git add bar &&
 	git commit -m "bisect bad" &&
@@ -20,13 +25,13 @@ git_bisect () {
 	git bisect start &&
 	git bisect good $GOOD &&
 	rm -rf * &&
-	tar xf "$TRASH_DIRECTORY/tmp.tar" &&
+	"$TAR" xf "$TRASH_DIRECTORY/tmp.tar" &&
 	git status -su >actual &&
 	ls -1pR * >>actual &&
 	test_cmp expect actual &&
 	git bisect bad $BAD
 }
 
-test_submodule_switch "git_bisect"
+test_submodule_switch_func "git_bisect"
 
 test_done
diff --git a/t/t6050-replace.sh b/t/t6050-replace.sh
index e7e64e085d..2500acc2ef 100755
--- a/t/t6050-replace.sh
+++ b/t/t6050-replace.sh
@@ -4,6 +4,9 @@
 #
 test_description='Tests replace refs functionality'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 
@@ -129,13 +132,13 @@ tagger T A Gger <> 0 +0000
 EOF
 
 test_expect_success 'tag replaced commit' '
-     git mktag <tag.sig >.git/refs/tags/mytag 2>message
+     git update-ref refs/tags/mytag $(git mktag <tag.sig)
 '
 
 test_expect_success '"git fsck" works' '
-     git fsck master >fsck_master.out &&
-     test_i18ngrep "dangling commit $R" fsck_master.out &&
-     test_i18ngrep "dangling tag $(cat .git/refs/tags/mytag)" fsck_master.out &&
+     git fsck main >fsck_main.out &&
+     test_i18ngrep "dangling commit $R" fsck_main.out &&
+     test_i18ngrep "dangling tag $(git show-ref -s refs/tags/mytag)" fsck_main.out &&
      test -z "$(git fsck)"
 '
 
@@ -218,7 +221,7 @@ test_expect_success 'create parallel branch without the bug' '
      git cherry-pick $HASH6 &&
      PARA6=$(git rev-parse --verify HEAD) &&
      git replace $HASH6 $PARA6 &&
-     git checkout master &&
+     git checkout main &&
      cur=$(git rev-parse --verify HEAD) &&
      test "$cur" = "$HASH7" &&
      git log --pretty=oneline | grep $PARA2 &&
@@ -461,7 +464,7 @@ test_expect_success GPG 'set up a merge commit with a mergetag' '
 	git commit -m "hello: 2 more lines from a test branch" &&
 	HASH9=$(git rev-parse --verify HEAD) &&
 	git tag -s -m "tag for testing with a mergetag" test_tag HEAD &&
-	git checkout master &&
+	git checkout main &&
 	git merge -s ours test_tag &&
 	HASH10=$(git rev-parse --verify HEAD) &&
 	git cat-file commit $HASH10 | grep "^mergetag object"
diff --git a/t/t6100-rev-list-in-order.sh b/t/t6100-rev-list-in-order.sh
index b2bb0a7f61..e934bc239c 100755
--- a/t/t6100-rev-list-in-order.sh
+++ b/t/t6100-rev-list-in-order.sh
@@ -22,7 +22,7 @@ test_expect_success 'setup a commit history with trees, blobs' '
 
 test_expect_success 'rev-list --in-commit-order' '
 	git rev-list --in-commit-order --objects HEAD >actual.raw &&
-	cut -c 1-40 >actual <actual.raw &&
+	cut -d" " -f1 >actual <actual.raw &&
 
 	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
 		HEAD^{commit}
@@ -49,7 +49,7 @@ test_expect_success 'rev-list --in-commit-order' '
 
 test_expect_success 'rev-list lists blobs and trees after commits' '
 	git rev-list --objects HEAD >actual.raw &&
-	cut -c 1-40 >actual <actual.raw &&
+	cut -d" " -f1 >actual <actual.raw &&
 
 	git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
 		HEAD^{commit}
diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev-parse-parents.sh
index 7683e4a114..78b5851780 100755
--- a/t/t6101-rev-parse-parents.sh
+++ b/t/t6101-rev-parse-parents.sh
@@ -5,6 +5,9 @@
 
 test_description='Test git rev-parse with different parent options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_cmp_rev_output () {
@@ -18,7 +21,7 @@ test_expect_success 'setup' '
 	test_commit second &&
 	git checkout --orphan tmp &&
 	test_commit start2 &&
-	git checkout master &&
+	git checkout main &&
 	git merge -m next --allow-unrelated-histories start2 &&
 	test_commit final &&
 
@@ -34,7 +37,7 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'start is valid' '
-	git rev-parse start | grep "^[0-9a-f]\{40\}$"
+	git rev-parse start | grep "^$OID_REGEX$"
 '
 
 test_expect_success 'start^0' '
diff --git a/t/t6102-rev-list-unexpected-objects.sh b/t/t6102-rev-list-unexpected-objects.sh
index 28611c978e..52cde097dd 100755
--- a/t/t6102-rev-list-unexpected-objects.sh
+++ b/t/t6102-rev-list-unexpected-objects.sh
@@ -52,7 +52,7 @@ test_expect_success 'traverse unexpected non-commit parent (lone)' '
 '
 
 test_expect_success 'traverse unexpected non-commit parent (seen)' '
-	test_must_fail git rev-list --objects $commit $broken_commit \
+	test_must_fail git rev-list --objects $blob $broken_commit \
 		>output 2>&1 &&
 	test_i18ngrep "not a commit" output
 '
diff --git a/t/t6110-rev-list-sparse.sh b/t/t6110-rev-list-sparse.sh
index 656ac7fe9d..13c1da5352 100755
--- a/t/t6110-rev-list-sparse.sh
+++ b/t/t6110-rev-list-sparse.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='operations that cull histories in unusual ways'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -10,7 +13,7 @@ test_expect_success setup '
 	git checkout -b side HEAD^ &&
 	test_commit D &&
 	test_commit E &&
-	git merge master
+	git merge main
 '
 
 test_expect_success 'rev-list --first-parent --boundary' '
diff --git a/t/t6111-rev-list-treesame.sh b/t/t6111-rev-list-treesame.sh
index 4244638285..e07b6070e0 100755
--- a/t/t6111-rev-list-treesame.sh
+++ b/t/t6111-rev-list-treesame.sh
@@ -13,6 +13,9 @@
 
 test_description='TREESAME and limiting'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 note () {
@@ -33,13 +36,13 @@ test_expect_success setup '
 	git checkout other-branch &&
 	test_commit "Added other" other "Hello" C &&
 
-	git checkout master &&
+	git checkout main &&
 	test_merge D other-branch &&
 
 	git checkout third-branch &&
 	test_commit "Third file" third "Nothing" E &&
 
-	git checkout master &&
+	git checkout main &&
 	test_commit "file=Blah" file "Blah" F &&
 
 	test_tick && git merge --no-commit third-branch &&
@@ -56,7 +59,7 @@ test_expect_success setup '
 
 	test_tick && git revert I && note J &&
 
-	git checkout master &&
+	git checkout main &&
 	test_tick && git merge --no-ff fiddler-branch &&
 	note K &&
 
diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
index de0e5a5d36..4ade105db3 100755
--- a/t/t6112-rev-list-filters-objects.sh
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -2,6 +2,9 @@
 
 test_description='git rev-list using object filtering'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Test the blob:none filter.
@@ -156,6 +159,78 @@ test_expect_success 'verify blob:limit=1m' '
 	test_must_be_empty observed
 '
 
+# Test object:type=<type> filter.
+
+test_expect_success 'setup object-type' '
+	test_create_repo object-type &&
+	test_commit --no-tag -C object-type message blob &&
+	git -C object-type tag tag -m tag-message
+'
+
+test_expect_success 'verify object:type= fails with invalid type' '
+	test_must_fail git -C object-type rev-list --objects --filter=object:type= HEAD &&
+	test_must_fail git -C object-type rev-list --objects --filter=object:type=invalid HEAD
+'
+
+test_expect_success 'verify object:type=blob prints blob and commit' '
+	git -C object-type rev-parse HEAD >expected &&
+	printf "%s blob\n" $(git -C object-type rev-parse HEAD:blob) >>expected &&
+	git -C object-type rev-list --objects --filter=object:type=blob HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'verify object:type=tree prints tree and commit' '
+	(
+		git -C object-type rev-parse HEAD &&
+		printf "%s \n" $(git -C object-type rev-parse HEAD^{tree})
+	) >expected &&
+	git -C object-type rev-list --objects --filter=object:type=tree HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'verify object:type=commit prints commit' '
+	git -C object-type rev-parse HEAD >expected &&
+	git -C object-type rev-list --objects --filter=object:type=commit HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'verify object:type=tag prints tag' '
+	(
+		git -C object-type rev-parse HEAD &&
+		printf "%s tag\n" $(git -C object-type rev-parse tag)
+	) >expected &&
+	git -C object-type rev-list --objects --filter=object:type=tag tag >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'verify object:type=blob prints only blob with --filter-provided-objects' '
+	printf "%s blob\n" $(git -C object-type rev-parse HEAD:blob) >expected &&
+	git -C object-type rev-list --objects \
+		--filter=object:type=blob --filter-provided-objects HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'verify object:type=tree prints only tree with --filter-provided-objects' '
+	printf "%s \n" $(git -C object-type rev-parse HEAD^{tree}) >expected &&
+	git -C object-type rev-list --objects \
+		--filter=object:type=tree HEAD --filter-provided-objects >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'verify object:type=commit prints only commit with --filter-provided-objects' '
+	git -C object-type rev-parse HEAD >expected &&
+	git -C object-type rev-list --objects \
+		--filter=object:type=commit --filter-provided-objects HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'verify object:type=tag prints only tag with --filter-provided-objects' '
+	printf "%s tag\n" $(git -C object-type rev-parse tag) >expected &&
+	git -C object-type rev-list --objects \
+		--filter=object:type=tag --filter-provided-objects tag >actual &&
+	test_cmp expected actual
+'
+
 # Test sparse:path=<path> filter.
 # !!!!
 # NOTE: sparse:path filter support has been dropped for security reasons,
@@ -223,7 +298,7 @@ test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
 	sort >expected &&
 
 	git -C r3 rev-list --quiet --objects --filter-print-omitted \
-		--filter=sparse:oid=master:pattern HEAD >revs &&
+		--filter=sparse:oid=main:pattern HEAD >revs &&
 	awk -f print_1.awk revs |
 	sed "s/~//" |
 	sort >observed &&
@@ -436,7 +511,7 @@ test_expect_success 'add sparse pattern blobs whose paths have reserved chars' '
 
 test_expect_success 'combine:... with more than two sub-filters' '
 	git -C r3 rev-list --objects \
-		--filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern \
+		--filter=combine:tree:3+blob:limit=40+sparse:oid=main:pattern \
 		HEAD >actual &&
 
 	expect_has HEAD "" &&
@@ -454,7 +529,7 @@ test_expect_success 'combine:... with more than two sub-filters' '
 	cp actual expect &&
 
 	git -C r3 rev-list --objects \
-		--filter=combine:tree:3+blob:limit=40+sparse:oid=master:pattern1%2brenamed%25 \
+		--filter=combine:tree:3+blob:limit=40+sparse:oid=main:pattern1%2brenamed%25 \
 		HEAD >actual &&
 	test_cmp expect actual &&
 
@@ -464,23 +539,23 @@ test_expect_success 'combine:... with more than two sub-filters' '
 	test_when_finished "rm -f trace1" &&
 	GIT_TRACE=$(pwd)/trace1 git -C r3 rev-list --objects \
 		--filter=tree:3 --filter=blob:limit=40 \
-		--filter=sparse:oid="master:p;at%ter+n" \
+		--filter=sparse:oid="main:p;at%ter+n" \
 		HEAD >actual &&
 
 	test_cmp expect actual &&
-	grep "Add to combine filter-spec: sparse:oid=master:p%3bat%25ter%2bn" \
+	grep "Add to combine filter-spec: sparse:oid=main:p%3bat%25ter%2bn" \
 		trace1 &&
 
 	# Repeat the above test, but this time, the characters to encode are in
 	# the LHS of the combined filter.
 	test_when_finished "rm -f trace2" &&
 	GIT_TRACE=$(pwd)/trace2 git -C r3 rev-list --objects \
-		--filter=sparse:oid=master:^~pattern \
+		--filter=sparse:oid=main:^~pattern \
 		--filter=tree:3 --filter=blob:limit=40 \
 		HEAD >actual &&
 
 	test_cmp expect actual &&
-	grep "Add to combine filter-spec: sparse:oid=master:%5e%7epattern" \
+	grep "Add to combine filter-spec: sparse:oid=main:%5e%7epattern" \
 		trace2
 '
 
diff --git a/t/t6113-rev-list-bitmap-filters.sh b/t/t6113-rev-list-bitmap-filters.sh
new file mode 100755
index 0000000000..4d8e09167e
--- /dev/null
+++ b/t/t6113-rev-list-bitmap-filters.sh
@@ -0,0 +1,144 @@
+#!/bin/sh
+
+test_description='rev-list combining bitmaps and filters'
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-bitmap.sh
+
+test_expect_success 'set up bitmapped repo' '
+	# one commit will have bitmaps, the other will not
+	test_commit one &&
+	test_commit much-larger-blob-one &&
+	git repack -adb &&
+	test_commit two &&
+	test_commit much-larger-blob-two &&
+	git tag tag
+'
+
+test_expect_success 'filters fallback to non-bitmap traversal' '
+	# use a path-based filter, since they are inherently incompatible with
+	# bitmaps (i.e., this test will never get confused by later code to
+	# combine the features)
+	filter=$(echo "!one" | git hash-object -w --stdin) &&
+	git rev-list --objects --filter=sparse:oid=$filter HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=sparse:oid=$filter HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'blob:none filter' '
+	git rev-list --objects --filter=blob:none HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:none HEAD >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'blob:none filter with specified blob' '
+	git rev-list --objects --filter=blob:none HEAD HEAD:two.t >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:none HEAD HEAD:two.t >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'blob:limit filter' '
+	git rev-list --objects --filter=blob:limit=5 HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:limit=5 HEAD >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'blob:limit filter with specified blob' '
+	git rev-list --objects --filter=blob:limit=5 \
+		     HEAD HEAD:much-larger-blob-two.t >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:limit=5 \
+		     HEAD HEAD:much-larger-blob-two.t >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'tree:0 filter' '
+	git rev-list --objects --filter=tree:0 HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=tree:0 HEAD >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'tree:0 filter with specified blob, tree' '
+	git rev-list --objects --filter=tree:0 HEAD HEAD:two.t >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=tree:0 HEAD HEAD:two.t >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'tree:1 filter' '
+	git rev-list --objects --filter=tree:1 HEAD >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=tree:1 HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'object:type filter' '
+	git rev-list --objects --filter=object:type=tag tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=object:type=tag tag >actual &&
+	test_cmp expect actual &&
+
+	git rev-list --objects --filter=object:type=commit tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=object:type=commit tag >actual &&
+	test_bitmap_traversal expect actual &&
+
+	git rev-list --objects --filter=object:type=tree tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=object:type=tree tag >actual &&
+	test_bitmap_traversal expect actual &&
+
+	git rev-list --objects --filter=object:type=blob tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=object:type=blob tag >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'object:type filter with --filter-provided-objects' '
+	git rev-list --objects --filter-provided-objects --filter=object:type=tag tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter-provided-objects --filter=object:type=tag tag >actual &&
+	test_cmp expect actual &&
+
+	git rev-list --objects --filter-provided-objects --filter=object:type=commit tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter-provided-objects --filter=object:type=commit tag >actual &&
+	test_bitmap_traversal expect actual &&
+
+	git rev-list --objects --filter-provided-objects --filter=object:type=tree tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter-provided-objects --filter=object:type=tree tag >actual &&
+	test_bitmap_traversal expect actual &&
+
+	git rev-list --objects --filter-provided-objects --filter=object:type=blob tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter-provided-objects --filter=object:type=blob tag >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'combine filter' '
+	git rev-list --objects --filter=blob:limit=1000 --filter=object:type=blob tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter=blob:limit=1000 --filter=object:type=blob tag >actual &&
+	test_bitmap_traversal expect actual
+'
+
+test_expect_success 'combine filter with --filter-provided-objects' '
+	git rev-list --objects --filter-provided-objects --filter=blob:limit=1000 --filter=object:type=blob tag >expect &&
+	git rev-list --use-bitmap-index \
+		     --objects --filter-provided-objects --filter=blob:limit=1000 --filter=object:type=blob tag >actual &&
+	test_bitmap_traversal expect actual &&
+
+	git cat-file --batch-check="%(objecttype) %(objectsize)" <actual >objects &&
+	while read objecttype objectsize
+	do
+		test "$objecttype" = blob || return 1
+		test "$objectsize" -le 1000 || return 1
+	done <objects
+'
+
+test_done
diff --git a/t/t6114-keep-packs.sh b/t/t6114-keep-packs.sh
new file mode 100755
index 0000000000..9239d8aa46
--- /dev/null
+++ b/t/t6114-keep-packs.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+test_description='rev-list with .keep packs'
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	test_commit loose &&
+	test_commit packed &&
+	test_commit kept &&
+
+	KEPT_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
+	refs/tags/kept
+	^refs/tags/packed
+	EOF
+	) &&
+	MISC_PACK=$(git pack-objects --revs .git/objects/pack/pack <<-EOF
+	refs/tags/packed
+	^refs/tags/loose
+	EOF
+	) &&
+
+	touch .git/objects/pack/pack-$KEPT_PACK.keep
+'
+
+rev_list_objects () {
+	git rev-list "$@" >out &&
+	sort out
+}
+
+idx_objects () {
+	git show-index <$1 >expect-idx &&
+	cut -d" " -f2 <expect-idx | sort
+}
+
+test_expect_success '--no-kept-objects excludes trees and blobs in .keep packs' '
+	rev_list_objects --objects --all --no-object-names >kept &&
+	rev_list_objects --objects --all --no-object-names --no-kept-objects >no-kept &&
+
+	idx_objects .git/objects/pack/pack-$KEPT_PACK.idx >expect &&
+	comm -3 kept no-kept >actual &&
+
+	test_cmp expect actual
+'
+
+test_expect_success '--no-kept-objects excludes kept non-MIDX object' '
+	test_config core.multiPackIndex true &&
+
+	# Create a pack with just the commit object in pack, and do not mark it
+	# as kept (even though it appears in $KEPT_PACK, which does have a .keep
+	# file).
+	MIDX_PACK=$(git pack-objects .git/objects/pack/pack <<-EOF
+	$(git rev-parse kept)
+	EOF
+	) &&
+
+	# Write a MIDX containing all packs, but use the version of the commit
+	# at "kept" in a non-kept pack by touching $MIDX_PACK.
+	touch .git/objects/pack/pack-$MIDX_PACK.pack &&
+	git multi-pack-index write &&
+
+	rev_list_objects --objects --no-object-names --no-kept-objects HEAD >actual &&
+	(
+		idx_objects .git/objects/pack/pack-$MISC_PACK.idx &&
+		git rev-list --objects --no-object-names refs/tags/loose
+	) | sort >expect &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t6115-rev-list-du.sh b/t/t6115-rev-list-du.sh
new file mode 100755
index 0000000000..b4aef32b71
--- /dev/null
+++ b/t/t6115-rev-list-du.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+test_description='basic tests of rev-list --disk-usage'
+. ./test-lib.sh
+
+# we want a mix of reachable and unreachable, as well as
+# objects in the bitmapped pack and some outside of it
+test_expect_success 'set up repository' '
+	test_commit --no-tag one &&
+	test_commit --no-tag two &&
+	git repack -adb &&
+	git reset --hard HEAD^ &&
+	test_commit --no-tag three &&
+	test_commit --no-tag four &&
+	git reset --hard HEAD^
+'
+
+# We don't want to hardcode sizes, because they depend on the exact details of
+# packing, zlib, etc. We'll assume that the regular rev-list and cat-file
+# machinery works and compare the --disk-usage output to that.
+disk_usage_slow () {
+	git rev-list --no-object-names "$@" |
+	git cat-file --batch-check="%(objectsize:disk)" |
+	perl -lne '$total += $_; END { print $total}'
+}
+
+# check behavior with given rev-list options; note that
+# whitespace is not preserved in args
+check_du () {
+	args=$*
+
+	test_expect_success "generate expected size ($args)" "
+		disk_usage_slow $args >expect
+	"
+
+	test_expect_success "rev-list --disk-usage without bitmaps ($args)" "
+		git rev-list --disk-usage $args >actual &&
+		test_cmp expect actual
+	"
+
+	test_expect_success "rev-list --disk-usage with bitmaps ($args)" "
+		git rev-list --disk-usage --use-bitmap-index $args >actual &&
+		test_cmp expect actual
+	"
+}
+
+check_du HEAD
+check_du --objects HEAD
+check_du --objects HEAD^..HEAD
+
+test_done
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 45047d0a72..bae2419150 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -1,117 +1,100 @@
 #!/bin/sh
 
-test_description='test describe
+test_description='test describe'
+
+#  o---o-----o----o----o-------o----x
+#       \   D,R   e           /
+#        \---o-------------o-'
+#         \  B            /
+#          `-o----o----o-'
+#                 A    c
+#
+# First parent of a merge commit is on the same line, second parent below.
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
-                       B
-        .--------------o----o----o----x
-       /                   /    /
- o----o----o----o----o----.    /
-       \        A    c        /
-        .------------o---o---o
-                   D,R   e
-'
 . ./test-lib.sh
 
 check_describe () {
+	indir= &&
+	while test $# != 0
+	do
+		case "$1" in
+		-C)
+			indir="$2"
+			shift
+			;;
+		*)
+			break
+			;;
+		esac
+		shift
+	done &&
+	indir=${indir:+"$indir"/} &&
 	expect="$1"
 	shift
-	R=$(git describe "$@" 2>err.actual)
-	S=$?
-	cat err.actual >&3
-	test_expect_success "describe $*" '
-	test $S = 0 &&
-	case "$R" in
-	$expect)	echo happy ;;
-	*)	echo "Oops - $R is not $expect";
-		false ;;
-	esac
+	describe_opts="$@"
+	test_expect_success "describe $describe_opts" '
+		git ${indir:+ -C "$indir"} describe $describe_opts >raw &&
+		sed -e "s/-g[0-9a-f]*\$/-gHASH/" <raw >actual &&
+		echo "$expect" >expect &&
+		test_cmp expect actual
 	'
 }
 
 test_expect_success setup '
+	test_commit initial file one &&
+	test_commit second file two &&
+	test_commit third file three &&
+	test_commit --annotate A file A &&
+	test_commit c file c &&
 
-	test_tick &&
-	echo one >file && git add file && git commit -m initial &&
-	one=$(git rev-parse HEAD) &&
-
-	git describe --always HEAD &&
-
-	test_tick &&
-	echo two >file && git add file && git commit -m second &&
-	two=$(git rev-parse HEAD) &&
-
-	test_tick &&
-	echo three >file && git add file && git commit -m third &&
-
-	test_tick &&
-	echo A >file && git add file && git commit -m A &&
-	test_tick &&
-	git tag -a -m A A &&
-
-	test_tick &&
-	echo c >file && git add file && git commit -m c &&
-	test_tick &&
-	git tag c &&
-
-	git reset --hard $two &&
-	test_tick &&
-	echo B >side && git add side && git commit -m B &&
-	test_tick &&
-	git tag -a -m B B &&
+	git reset --hard second &&
+	test_commit --annotate B side B &&
 
 	test_tick &&
 	git merge -m Merged c &&
 	merged=$(git rev-parse HEAD) &&
 
-	git reset --hard $two &&
-	test_tick &&
-	echo D >another && git add another && git commit -m D &&
-	test_tick &&
-	git tag -a -m D D &&
-	test_tick &&
-	git tag -a -m R R &&
-
-	test_tick &&
-	echo DD >another && git commit -a -m another &&
+	git reset --hard second &&
+	test_commit --no-tag D another D &&
 
 	test_tick &&
-	git tag e &&
+	git tag -a -m R R &&
 
-	test_tick &&
-	echo DDD >another && git commit -a -m "yet another" &&
+	test_commit e another DD &&
+	test_commit --no-tag "yet another" another DDD &&
 
 	test_tick &&
 	git merge -m Merged $merged &&
 
-	test_tick &&
-	echo X >file && echo X >side && git add file side &&
-	git commit -m x
-
+	test_commit --no-tag x file
 '
 
-check_describe A-* HEAD
-check_describe A-* HEAD^
-check_describe R-* HEAD^^
-check_describe A-* HEAD^^2
+check_describe A-8-gHASH HEAD
+check_describe A-7-gHASH HEAD^
+check_describe R-2-gHASH HEAD^^
+check_describe A-3-gHASH HEAD^^2
 check_describe B HEAD^^2^
-check_describe R-* HEAD^^^
+check_describe R-1-gHASH HEAD^^^
 
-check_describe c-* --tags HEAD
-check_describe c-* --tags HEAD^
-check_describe e-* --tags HEAD^^
-check_describe c-* --tags HEAD^^2
+check_describe c-7-gHASH --tags HEAD
+check_describe c-6-gHASH --tags HEAD^
+check_describe e-1-gHASH --tags HEAD^^
+check_describe c-2-gHASH --tags HEAD^^2
 check_describe B --tags HEAD^^2^
 check_describe e --tags HEAD^^^
 
-check_describe heads/master --all HEAD
-check_describe tags/c-* --all HEAD^
+check_describe heads/main --all HEAD
+check_describe tags/c-6-gHASH --all HEAD^
 check_describe tags/e --all HEAD^^^
 
-check_describe B-0-* --long HEAD^^2^
-check_describe A-3-* --long HEAD^^2
+check_describe B-0-gHASH --long HEAD^^2^
+check_describe A-3-gHASH --long HEAD^^2
 
-check_describe c-7-* --tags
-check_describe e-3-* --first-parent --tags
+check_describe c-7-gHASH --tags
+check_describe e-3-gHASH --first-parent --tags
 
 test_expect_success 'describe --contains defaults to HEAD without commit-ish' '
 	echo "A^0" >expect &&
@@ -122,65 +105,82 @@ test_expect_success 'describe --contains defaults to HEAD without commit-ish' '
 '
 
 check_describe tags/A --all A^0
-test_expect_success 'no warning was displayed for A' '
-	test_must_be_empty err.actual
+
+test_expect_success 'renaming tag A to Q locally produces a warning' "
+	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'
+	EOF
+	test_cmp expected err &&
+	grep -E '^A-8-g[0-9a-f]+$' out
+"
+
+test_expect_success 'misnamed annotated tag forces long output' '
+	description=$(git describe --no-long Q^0) &&
+	expr "$description" : "A-0-g[0-9a-f]*$" &&
+	git rev-parse --verify "$description" >actual &&
+	git rev-parse --verify Q^0 >expect &&
+	test_cmp expect actual
 '
 
-test_expect_success 'rename tag A to Q locally' '
-	mv .git/refs/tags/A .git/refs/tags/Q
+test_expect_success 'abbrev=0 will not break misplaced tag (1)' '
+	description=$(git describe --abbrev=0 Q^0) &&
+	expr "$description" : "A-0-g[0-9a-f]*$"
 '
-cat - >err.expect <<EOF
-warning: tag 'A' is really 'Q' here
-EOF
-check_describe A-* HEAD
-test_expect_success 'warning was displayed for Q' '
-	test_i18ncmp err.expect err.actual
+
+test_expect_success 'abbrev=0 will not break misplaced tag (2)' '
+	description=$(git describe --abbrev=0 c^0) &&
+	expr "$description" : "A-1-g[0-9a-f]*$"
 '
+
 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'
-check_describe A-* HEAD
+check_describe A-8-gHASH HEAD
 
 test_expect_success 'describe works from outside repo using --git-dir' '
 	git clone --bare "$TRASH_DIRECTORY" "$TRASH_DIRECTORY/bare" &&
 	git --git-dir "$TRASH_DIRECTORY/bare" describe >out &&
-	grep -E "^A-[1-9][0-9]?-g[0-9a-f]+$" out
+	grep -E "^A-8-g[0-9a-f]+$" out
 '
 
-check_describe "A-*[0-9a-f]" --dirty
+check_describe "A-8-gHASH" --dirty
 
 test_expect_success 'describe --dirty with --work-tree' '
 	(
 		cd "$TEST_DIRECTORY" &&
 		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
 	) &&
-	grep -E "^A-[1-9][0-9]?-g[0-9a-f]+$" out
+	grep -E "^A-8-g[0-9a-f]+$" out
 '
 
 test_expect_success 'set-up dirty work tree' '
 	echo >>file
 '
 
-check_describe "A-*[0-9a-f]-dirty" --dirty
-
 test_expect_success 'describe --dirty with --work-tree (dirty)' '
+	git describe --dirty >expected &&
 	(
 		cd "$TEST_DIRECTORY" &&
 		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty >"$TRASH_DIRECTORY/out"
 	) &&
-	grep -E "^A-[1-9][0-9]?-g[0-9a-f]+-dirty$" out
+	grep -E "^A-8-g[0-9a-f]+-dirty$" out &&
+	test_cmp expected out
 '
 
-check_describe "A-*[0-9a-f].mod" --dirty=.mod
-
 test_expect_success 'describe --dirty=.mod with --work-tree (dirty)' '
+	git describe --dirty=.mod >expected &&
 	(
 		cd "$TEST_DIRECTORY" &&
 		git --git-dir "$TRASH_DIRECTORY/.git" --work-tree "$TRASH_DIRECTORY" describe --dirty=.mod >"$TRASH_DIRECTORY/out"
 	) &&
-	grep -E "^A-[1-9][0-9]?-g[0-9a-f]+.mod$" out
+	grep -E "^A-8-g[0-9a-f]+.mod$" out &&
+	test_cmp expected out
 '
 
 test_expect_success 'describe --dirty HEAD' '
@@ -203,21 +203,21 @@ test_expect_success 'set-up matching pattern tests' '
 
 '
 
-check_describe "test-annotated-*" --match="test-*"
+check_describe "test-annotated-3-gHASH" --match="test-*"
 
-check_describe "test1-lightweight-*" --tags --match="test1-*"
+check_describe "test1-lightweight-2-gHASH" --tags --match="test1-*"
 
-check_describe "test2-lightweight-*" --tags --match="test2-*"
+check_describe "test2-lightweight-1-gHASH" --tags --match="test2-*"
 
-check_describe "test2-lightweight-*" --long --tags --match="test2-*" HEAD^
+check_describe "test2-lightweight-0-gHASH" --long --tags --match="test2-*" HEAD^
 
-check_describe "test2-lightweight-*" --long --tags --match="test1-*" --match="test2-*" HEAD^
+check_describe "test2-lightweight-0-gHASH" --long --tags --match="test1-*" --match="test2-*" HEAD^
 
-check_describe "test2-lightweight-*" --long --tags --match="test1-*" --no-match --match="test2-*" HEAD^
+check_describe "test2-lightweight-0-gHASH" --long --tags --match="test1-*" --no-match --match="test2-*" HEAD^
 
-check_describe "test1-lightweight-*" --long --tags --match="test1-*" --match="test3-*" HEAD
+check_describe "test1-lightweight-2-gHASH" --long --tags --match="test1-*" --match="test3-*" HEAD
 
-check_describe "test1-lightweight-*" --long --tags --match="test3-*" --match="test1-*" HEAD
+check_describe "test1-lightweight-2-gHASH" --long --tags --match="test3-*" --match="test1-*" HEAD
 
 test_expect_success 'set-up branches' '
 	git branch branch_A A &&
@@ -227,11 +227,11 @@ test_expect_success 'set-up branches' '
 	git update-ref refs/original/original_branch_A test-annotated~2
 '
 
-check_describe "heads/branch_A*" --all --match="branch_*" --exclude="branch_C" HEAD
+check_describe "heads/branch_A-11-gHASH" --all --match="branch_*" --exclude="branch_C" HEAD
 
-check_describe "remotes/origin/remote_branch_A*" --all --match="origin/remote_branch_*" --exclude="origin/remote_branch_C" HEAD
+check_describe "remotes/origin/remote_branch_A-11-gHASH" --all --match="origin/remote_branch_*" --exclude="origin/remote_branch_C" HEAD
 
-check_describe "original/original_branch_A*" --all test-annotated~1
+check_describe "original/original_branch_A-6-gHASH" --all test-annotated~1
 
 test_expect_success '--match does not work for other types' '
 	test_must_fail git describe --all --match="*original_branch_*" test-annotated~1
@@ -382,19 +382,19 @@ test_expect_success 'describe tag object' '
 	test_i18ngrep "fatal: test-blob-1 is neither a commit nor blob" actual
 '
 
-test_expect_failure ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
+test_expect_success ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
 	i=1 &&
 	while test $i -lt 8000
 	do
-		echo "commit refs/heads/master
+		echo "commit refs/heads/main
 committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
 data <<EOF
 commit #$i
 EOF"
-		test $i = 1 && echo "from refs/heads/master^0"
+		test $i = 1 && echo "from refs/heads/main^0"
 		i=$(($i + 1))
 	done | git fast-import &&
-	git checkout master &&
+	git checkout main &&
 	git tag far-far-away HEAD^ &&
 	echo "HEAD~4000 tags/far-far-away~3999" >expect &&
 	git name-rev HEAD~4000 >actual &&
@@ -425,7 +425,7 @@ test_expect_success 'describe complains about missing object' '
 '
 
 test_expect_success 'name-rev a rev shortly after epoch' '
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 
 	git checkout --orphan no-timestamp-underflow &&
 	# Any date closer to epoch than the CUTOFF_DATE_SLOP constant
@@ -439,4 +439,96 @@ test_expect_success 'name-rev a rev shortly after epoch' '
 	test_cmp expect actual
 '
 
+# A--------------main
+#  \            /
+#   \----------M2
+#    \        /
+#     \---M1-C
+#      \ /
+#       B
+test_expect_success 'name-rev covers all conditions while looking at parents' '
+	git init repo &&
+	(
+		cd repo &&
+
+		echo A >file &&
+		git add file &&
+		git commit -m A &&
+		A=$(git rev-parse HEAD) &&
+
+		git checkout --detach &&
+		echo B >file &&
+		git commit -m B file &&
+		B=$(git rev-parse HEAD) &&
+
+		git checkout $A &&
+		git merge --no-ff $B &&  # M1
+
+		echo C >file &&
+		git commit -m C file &&
+
+		git checkout $A &&
+		git merge --no-ff HEAD@{1} && # M2
+
+		git checkout main &&
+		git merge --no-ff HEAD@{1} &&
+
+		echo "$B main^2^2~1^2" >expect &&
+		git name-rev $B >actual &&
+
+		test_cmp expect actual
+	)
+'
+
+#               B
+#               o
+#                \
+#  o-----o---o----x
+#        A
+#
+test_expect_success 'setup: describe commits with disjoint bases' '
+	git init disjoint1 &&
+	(
+		cd disjoint1 &&
+
+		echo o >> file && git add file && git commit -m o &&
+		echo A >> file && git add file && git commit -m A &&
+		git tag A -a -m A &&
+		echo o >> file && git add file && git commit -m o &&
+
+		git checkout --orphan branch && rm file &&
+		echo B > file2 && git add file2 && git commit -m B &&
+		git tag B -a -m B &&
+		git merge --no-ff --allow-unrelated-histories main -m x
+	)
+'
+
+check_describe -C disjoint1 "A-3-gHASH" HEAD
+
+#           B
+#   o---o---o------------.
+#                         \
+#                  o---o---x
+#                  A
+#
+test_expect_success 'setup: describe commits with disjoint bases 2' '
+	git init disjoint2 &&
+	(
+		cd disjoint2 &&
+
+		echo A >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:00" git commit -m A &&
+		git tag A -a -m A &&
+		echo o >> file && git add file && GIT_COMMITTER_DATE="2020-01-01 18:01" git commit -m o &&
+
+		git checkout --orphan branch &&
+		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:00" git commit -m o &&
+		echo o >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:01" git commit -m o &&
+		echo B >> file2 && git add file2 && GIT_COMMITTER_DATE="2020-01-01 15:02" git commit -m B &&
+		git tag B -a -m B &&
+		git merge --no-ff --allow-unrelated-histories main -m x
+	)
+'
+
+check_describe -C disjoint2 "B-3-gHASH" HEAD
+
 test_done
diff --git a/t/t6130-pathspec-noglob.sh b/t/t6130-pathspec-noglob.sh
index 37760233a5..ba7902c9cd 100755
--- a/t/t6130-pathspec-noglob.sh
+++ b/t/t6130-pathspec-noglob.sh
@@ -10,6 +10,7 @@ test_expect_success 'create commits with glob characters' '
 	# the name "f*" in the worktree, because it is not allowed
 	# on Windows (the tests below do not depend on the presence
 	# of the file in the worktree)
+	git config core.protectNTFS false &&
 	git update-index --add --cacheinfo 100644 "$(git rev-parse HEAD:foo)" "f*" &&
 	test_tick &&
 	git commit -m star &&
diff --git a/t/t6132-pathspec-exclude.sh b/t/t6132-pathspec-exclude.sh
index 2462b19ddd..30328b87f0 100755
--- a/t/t6132-pathspec-exclude.sh
+++ b/t/t6132-pathspec-exclude.sh
@@ -211,4 +211,37 @@ test_expect_success 't_e_i() exclude case #8' '
 	)
 '
 
+test_expect_success 'grep --untracked PATTERN' '
+	# This test is not an actual test of exclude patterns, rather it
+	# is here solely to ensure that if any tests are inserted, deleted, or
+	# changed above, that we still have untracked files with the expected
+	# contents for the NEXT two tests.
+	cat <<-\EOF >expect-grep &&
+	actual
+	expect
+	sub/actual
+	sub/expect
+	EOF
+	git grep -l --untracked file -- >actual-grep &&
+	test_cmp expect-grep actual-grep
+'
+
+test_expect_success 'grep --untracked PATTERN :(exclude)DIR' '
+	cat <<-\EOF >expect-grep &&
+	actual
+	expect
+	EOF
+	git grep -l --untracked file -- ":(exclude)sub" >actual-grep &&
+	test_cmp expect-grep actual-grep
+'
+
+test_expect_success 'grep --untracked PATTERN :(exclude)*FILE' '
+	cat <<-\EOF >expect-grep &&
+	actual
+	sub/actual
+	EOF
+	git grep -l --untracked file -- ":(exclude)*expect" >actual-grep &&
+	test_cmp expect-grep actual-grep
+'
+
 test_done
diff --git a/t/t6134-pathspec-in-submodule.sh b/t/t6134-pathspec-in-submodule.sh
index c670668409..0f1cb49ced 100755
--- a/t/t6134-pathspec-in-submodule.sh
+++ b/t/t6134-pathspec-in-submodule.sh
@@ -21,7 +21,7 @@ EOF
 test_expect_success 'error message for path inside submodule' '
 	echo a >sub/a &&
 	test_must_fail git add sub/a 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'error message for path inside submodule from within submodule' '
diff --git a/t/t6136-pathspec-in-bare.sh b/t/t6136-pathspec-in-bare.sh
new file mode 100755
index 0000000000..b117251366
--- /dev/null
+++ b/t/t6136-pathspec-in-bare.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+test_description='diagnosing out-of-scope pathspec'
+
+. ./test-lib.sh
+
+test_expect_success 'setup a bare and non-bare repository' '
+	test_commit file1 &&
+	git clone --bare . bare
+'
+
+test_expect_success 'log and ls-files in a bare repository' '
+	(
+		cd bare &&
+		test_must_fail git log -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_i18ngrep "outside repository" err &&
+
+		test_must_fail git ls-files -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_i18ngrep "outside repository" err
+	)
+'
+
+test_expect_success 'log and ls-files in .git directory' '
+	(
+		cd .git &&
+		test_must_fail git log -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_i18ngrep "outside repository" err &&
+
+		test_must_fail git ls-files -- .. >out 2>err &&
+		test_must_be_empty out &&
+		test_i18ngrep "outside repository" err
+	)
+'
+
+test_done
diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh
index 8a72b4c43a..44f55d93fe 100755
--- a/t/t6200-fmt-merge-msg.sh
+++ b/t/t6200-fmt-merge-msg.sh
@@ -5,7 +5,11 @@
 
 test_description='fmt-merge-msg test'
 
+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 setup '
 	echo one >one &&
@@ -73,20 +77,42 @@ test_expect_success setup '
 	apos="'\''"
 '
 
+test_expect_success GPG 'set up a signed tag' '
+	git tag -s -m signed-tag-msg signed-good-tag left
+'
+
 test_expect_success 'message for merging local branch' '
 	echo "Merge branch ${apos}left${apos}" >expected &&
 
-	git checkout master &&
+	git checkout main &&
 	git fetch . left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
 	test_cmp expected actual
 '
 
+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 &&
+	grep "^Merge tag ${apos}signed-good-tag${apos}" actual &&
+	grep "^# gpg: Signature made" actual &&
+	grep "^# gpg: Good signature from" actual
+'
+
+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 &&
+	grep "^Merge tag ${apos}signed-good-tag${apos}" 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 'message for merging external branch' '
 	echo "Merge branch ${apos}left${apos} of $(pwd)" >expected &&
 
-	git checkout master &&
+	git checkout main &&
 	git fetch "$(pwd)" left &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
@@ -110,7 +136,7 @@ test_expect_success '[merge] summary/log configuration' '
 	test_config merge.log true &&
 	test_unconfig merge.summary &&
 
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . left &&
 
@@ -119,7 +145,7 @@ test_expect_success '[merge] summary/log configuration' '
 	test_unconfig merge.log &&
 	test_config merge.summary true &&
 
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . left &&
 
@@ -130,7 +156,7 @@ test_expect_success '[merge] summary/log configuration' '
 '
 
 test_expect_success 'setup FETCH_HEAD' '
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . left
 '
@@ -258,7 +284,7 @@ test_expect_success 'fmt-merge-msg -m' '
 
 	test_unconfig merge.log &&
 	test_unconfig merge.summary &&
-	git checkout master &&
+	git checkout main &&
 	git fetch "$(pwd)" left &&
 	git fmt-merge-msg -m "Sync with left" <.git/FETCH_HEAD >actual &&
 	git fmt-merge-msg --log -m "Sync with left" \
@@ -300,28 +326,28 @@ test_expect_success 'setup: expected shortlog for two branches' '
 test_expect_success 'shortlog for two branches' '
 	test_config merge.log true &&
 	test_unconfig merge.summary &&
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . left right &&
 	git fmt-merge-msg <.git/FETCH_HEAD >actual1 &&
 
 	test_unconfig merge.log &&
 	test_config merge.summary true &&
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . left right &&
 	git fmt-merge-msg <.git/FETCH_HEAD >actual2 &&
 
 	test_config merge.log yes &&
 	test_unconfig merge.summary &&
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . left right &&
 	git fmt-merge-msg <.git/FETCH_HEAD >actual3 &&
 
 	test_unconfig merge.log &&
 	test_config merge.summary yes &&
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . left right &&
 	git fmt-merge-msg <.git/FETCH_HEAD >actual4 &&
@@ -335,7 +361,7 @@ test_expect_success 'shortlog for two branches' '
 test_expect_success 'merge-msg -F' '
 	test_unconfig merge.log &&
 	test_config merge.summary yes &&
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . left right &&
 	git fmt-merge-msg -F .git/FETCH_HEAD >actual &&
@@ -345,7 +371,7 @@ test_expect_success 'merge-msg -F' '
 test_expect_success 'merge-msg -F in subdirectory' '
 	test_unconfig merge.log &&
 	test_config merge.summary yes &&
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . left right &&
 	mkdir sub &&
@@ -385,7 +411,7 @@ test_expect_success 'merge-msg tag' '
 	test_unconfig merge.log &&
 	test_config merge.summary yes &&
 
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . tag tag-r3 &&
 
@@ -415,7 +441,7 @@ test_expect_success 'merge-msg two tags' '
 	test_unconfig merge.log &&
 	test_config merge.summary yes &&
 
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . tag tag-r3 tag tag-l5 &&
 
@@ -445,7 +471,7 @@ test_expect_success 'merge-msg tag and branch' '
 	test_unconfig merge.log &&
 	test_config merge.summary yes &&
 
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . tag tag-r3 left &&
 
@@ -472,7 +498,7 @@ test_expect_success 'merge-msg lots of commits' '
 
 	test_config merge.summary yes &&
 
-	git checkout master &&
+	git checkout main &&
 	test_tick &&
 	git fetch . long &&
 
@@ -483,11 +509,11 @@ test_expect_success 'merge-msg lots of commits' '
 test_expect_success 'merge-msg with "merging" an annotated tag' '
 	test_config merge.log true &&
 
-	git checkout master^0 &&
+	git checkout main^0 &&
 	git commit --allow-empty -m "One step ahead" &&
 	git tag -a -m "An annotated one" annote HEAD &&
 
-	git checkout master &&
+	git checkout main &&
 	git fetch . annote &&
 
 	git fmt-merge-msg <.git/FETCH_HEAD >actual &&
@@ -519,4 +545,24 @@ test_expect_success 'merge-msg with "merging" an annotated tag' '
 	test_cmp expected .git/MERGE_MSG
 '
 
+test_expect_success 'merge.suppressDest configuration' '
+	git checkout -B side main &&
+	git commit --allow-empty -m "One step ahead" &&
+	git checkout main &&
+	git fetch . side &&
+
+	git -c merge.suppressDest="" fmt-merge-msg <.git/FETCH_HEAD >full.1 &&
+	head -n1 full.1 >actual &&
+	grep -e "Merge branch .side. into main" actual &&
+
+	git -c merge.suppressDest="mast" fmt-merge-msg <.git/FETCH_HEAD >full.2 &&
+	head -n1 full.2 >actual &&
+	grep -e "Merge branch .side. into main$" actual &&
+
+	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
+'
+
 test_done
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index 9c910ce746..80679d5e12 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -5,6 +5,9 @@
 
 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
@@ -20,16 +23,21 @@ setdate_and_increment () {
 }
 
 test_expect_success setup '
+	test_oid_cache <<-EOF &&
+	disklen sha1:138
+	disklen sha256:154
+	EOF
 	setdate_and_increment &&
 	echo "Using $datestamp" > one &&
 	git add one &&
 	git commit -m "Initial" &&
+	git branch -M main &&
 	setdate_and_increment &&
 	git tag -a -m "Tagging at $datestamp" testtag &&
-	git update-ref refs/remotes/origin/master master &&
+	git update-ref refs/remotes/origin/main main &&
 	git remote add origin nowhere &&
-	git config branch.master.remote origin &&
-	git config branch.master.merge refs/heads/master &&
+	git config branch.main.remote origin &&
+	git config branch.main.merge refs/heads/main &&
 	git remote add myfork elsewhere &&
 	git config remote.pushdefault myfork &&
 	git config push.default current
@@ -37,7 +45,7 @@ test_expect_success setup '
 
 test_atom() {
 	case "$1" in
-		head) ref=refs/heads/master ;;
+		head) ref=refs/heads/main ;;
 		 tag) ref=refs/tags/testtag ;;
 		 sym) ref=refs/heads/sym ;;
 		   *) ref=$1 ;;
@@ -48,70 +56,114 @@ test_atom() {
 		sanitize_pgp <actual >actual.clean &&
 		test_cmp expected actual.clean
 	"
+	# Automatically test "contents:size" atom after testing "contents"
+	if test "$2" = "contents"
+	then
+		# 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
+		'
+	fi
 }
 
-test_atom head refname refs/heads/master
-test_atom head refname: refs/heads/master
-test_atom head refname:short master
-test_atom head refname:lstrip=1 heads/master
-test_atom head refname:lstrip=2 master
-test_atom head refname:lstrip=-1 master
-test_atom head refname:lstrip=-2 heads/master
+hexlen=$(test_oid hexsz)
+disklen=$(test_oid disklen)
+
+test_atom head refname refs/heads/main
+test_atom head refname: refs/heads/main
+test_atom head refname:short main
+test_atom head refname:lstrip=1 heads/main
+test_atom head refname:lstrip=2 main
+test_atom head refname:lstrip=-1 main
+test_atom head refname:lstrip=-2 heads/main
 test_atom head refname:rstrip=1 refs/heads
 test_atom head refname:rstrip=2 refs
 test_atom head refname:rstrip=-1 refs
 test_atom head refname:rstrip=-2 refs/heads
-test_atom head refname:strip=1 heads/master
-test_atom head refname:strip=2 master
-test_atom head refname:strip=-1 master
-test_atom head refname:strip=-2 heads/master
-test_atom head upstream refs/remotes/origin/master
-test_atom head upstream:short origin/master
-test_atom head upstream:lstrip=2 origin/master
-test_atom head upstream:lstrip=-2 origin/master
+test_atom head refname:strip=1 heads/main
+test_atom head refname:strip=2 main
+test_atom head refname:strip=-1 main
+test_atom head refname:strip=-2 heads/main
+test_atom head upstream refs/remotes/origin/main
+test_atom head upstream:short origin/main
+test_atom head upstream:lstrip=2 origin/main
+test_atom head upstream:lstrip=-2 origin/main
 test_atom head upstream:rstrip=2 refs/remotes
 test_atom head upstream:rstrip=-2 refs/remotes
-test_atom head upstream:strip=2 origin/master
-test_atom head upstream:strip=-2 origin/master
-test_atom head push refs/remotes/myfork/master
-test_atom head push:short myfork/master
-test_atom head push:lstrip=1 remotes/myfork/master
-test_atom head push:lstrip=-1 master
+test_atom head upstream:strip=2 origin/main
+test_atom head upstream:strip=-2 origin/main
+test_atom head push refs/remotes/myfork/main
+test_atom head push:short myfork/main
+test_atom head push:lstrip=1 remotes/myfork/main
+test_atom head push:lstrip=-1 main
 test_atom head push:rstrip=1 refs/remotes/myfork
 test_atom head push:rstrip=-1 refs
-test_atom head push:strip=1 remotes/myfork/master
-test_atom head push:strip=-1 master
+test_atom head push:strip=1 remotes/myfork/main
+test_atom head push:strip=-1 main
 test_atom head objecttype commit
-test_atom head objectsize 171
-test_atom head objectsize:disk 138
-test_atom head deltabase 0000000000000000000000000000000000000000
-test_atom head objectname $(git rev-parse refs/heads/master)
-test_atom head objectname:short $(git rev-parse --short refs/heads/master)
-test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master)
-test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master)
-test_atom head tree $(git rev-parse refs/heads/master^{tree})
+test_atom head objectsize $((131 + hexlen))
+test_atom head objectsize:disk $disklen
+test_atom head deltabase $ZERO_OID
+test_atom head objectname $(git rev-parse refs/heads/main)
+test_atom head objectname:short $(git rev-parse --short refs/heads/main)
+test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/main)
+test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/main)
+test_atom head tree $(git rev-parse refs/heads/main^{tree})
+test_atom head tree:short $(git rev-parse --short refs/heads/main^{tree})
+test_atom head tree:short=1 $(git rev-parse --short=1 refs/heads/main^{tree})
+test_atom head tree:short=10 $(git rev-parse --short=10 refs/heads/main^{tree})
 test_atom head parent ''
+test_atom head parent:short ''
+test_atom head parent:short=1 ''
+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'
 test_atom head authorname 'A U Thor'
 test_atom head authoremail '<author@example.com>'
+test_atom head authoremail:trim 'author@example.com'
+test_atom head authoremail:localpart 'author'
 test_atom head authordate 'Tue Jul 4 01:18:44 2006 +0200'
 test_atom head committer 'C O Mitter <committer@example.com> 1151968723 +0200'
 test_atom head committername 'C O Mitter'
 test_atom head committeremail '<committer@example.com>'
+test_atom head committeremail:trim 'committer@example.com'
+test_atom head committeremail:localpart 'committer'
 test_atom head committerdate 'Tue Jul 4 01:18:43 2006 +0200'
 test_atom head tag ''
 test_atom head tagger ''
 test_atom head taggername ''
 test_atom head taggeremail ''
+test_atom head taggeremail:trim ''
+test_atom head taggeremail:localpart ''
 test_atom head taggerdate ''
 test_atom head creator 'C O Mitter <committer@example.com> 1151968723 +0200'
 test_atom head creatordate 'Tue Jul 4 01:18:43 2006 +0200'
 test_atom head subject 'Initial'
+test_atom head subject:sanitize 'Initial'
 test_atom head contents:subject 'Initial'
 test_atom head body ''
 test_atom head contents:body ''
@@ -125,38 +177,51 @@ test_atom tag refname:short testtag
 test_atom tag upstream ''
 test_atom tag push ''
 test_atom tag objecttype tag
-test_atom tag objectsize 154
-test_atom tag objectsize:disk 138
-test_atom tag '*objectsize:disk' 138
-test_atom tag deltabase 0000000000000000000000000000000000000000
-test_atom tag '*deltabase' 0000000000000000000000000000000000000000
+test_atom tag objectsize $((114 + hexlen))
+test_atom tag objectsize:disk $disklen
+test_atom tag '*objectsize:disk' $disklen
+test_atom tag deltabase $ZERO_OID
+test_atom tag '*deltabase' $ZERO_OID
 test_atom tag objectname $(git rev-parse refs/tags/testtag)
 test_atom tag objectname:short $(git rev-parse --short refs/tags/testtag)
-test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master)
-test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master)
+test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/main)
+test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/main)
 test_atom tag tree ''
+test_atom tag tree:short ''
+test_atom tag tree:short=1 ''
+test_atom tag tree:short=10 ''
 test_atom tag parent ''
+test_atom tag parent:short ''
+test_atom tag parent:short=1 ''
+test_atom tag parent:short=10 ''
 test_atom tag numparent ''
 test_atom tag object $(git rev-parse refs/tags/testtag^0)
 test_atom tag type 'commit'
-test_atom tag '*objectname' 'ea122842f48be4afb2d1fc6a4b96c05885ab7463'
+test_atom tag '*objectname' $(git rev-parse refs/tags/testtag^{})
 test_atom tag '*objecttype' 'commit'
 test_atom tag author ''
 test_atom tag authorname ''
 test_atom tag authoremail ''
+test_atom tag authoremail:trim ''
+test_atom tag authoremail:localpart ''
 test_atom tag authordate ''
 test_atom tag committer ''
 test_atom tag committername ''
 test_atom tag committeremail ''
+test_atom tag committeremail:trim ''
+test_atom tag committeremail:localpart ''
 test_atom tag committerdate ''
 test_atom tag tag 'testtag'
 test_atom tag tagger 'C O Mitter <committer@example.com> 1151968725 +0200'
 test_atom tag taggername 'C O Mitter'
 test_atom tag taggeremail '<committer@example.com>'
+test_atom tag taggeremail:trim 'committer@example.com'
+test_atom tag taggeremail:localpart 'committer'
 test_atom tag taggerdate 'Tue Jul 4 01:18:45 2006 +0200'
 test_atom tag creator 'C O Mitter <committer@example.com> 1151968725 +0200'
 test_atom tag creatordate 'Tue Jul 4 01:18:45 2006 +0200'
 test_atom tag subject 'Tagging at 1151968727'
+test_atom tag subject:sanitize 'Tagging-at-1151968727'
 test_atom tag contents:subject 'Tagging at 1151968727'
 test_atom tag body ''
 test_atom tag contents:body ''
@@ -165,6 +230,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
 '
@@ -201,7 +275,7 @@ test_date () {
 	author_date=$3 &&
 	tagger_date=$4 &&
 	cat >expected <<-EOF &&
-	'refs/heads/master' '$committer_date' '$author_date'
+	'refs/heads/main' '$committer_date' '$author_date'
 	'refs/tags/testtag' '$tagger_date'
 	EOF
 	(
@@ -323,8 +397,8 @@ test_expect_success 'exercise strftime with odd fields' '
 '
 
 cat >expected <<\EOF
-refs/heads/master
-refs/remotes/origin/master
+refs/heads/main
+refs/remotes/origin/main
 refs/tags/testtag
 EOF
 
@@ -336,8 +410,8 @@ test_expect_success 'Verify ascending sort' '
 
 cat >expected <<\EOF
 refs/tags/testtag
-refs/remotes/origin/master
-refs/heads/master
+refs/remotes/origin/main
+refs/heads/main
 EOF
 
 test_expect_success 'Verify descending sort' '
@@ -372,8 +446,8 @@ test_expect_success 'exercise glob patterns with prefixes' '
 '
 
 cat >expected <<\EOF
-'refs/heads/master'
-'refs/remotes/origin/master'
+'refs/heads/main'
+'refs/remotes/origin/main'
 'refs/tags/testtag'
 EOF
 
@@ -393,8 +467,8 @@ test_expect_success 'Quoting style: python' '
 '
 
 cat >expected <<\EOF
-"refs/heads/master"
-"refs/remotes/origin/master"
+"refs/heads/main"
+"refs/remotes/origin/main"
 "refs/tags/testtag"
 EOF
 
@@ -421,8 +495,8 @@ test_atom head upstream:nobracket,track 'ahead 1'
 
 test_expect_success 'setup for push:track[short]' '
 	test_commit third &&
-	git update-ref refs/remotes/myfork/master master &&
-	git reset master~1
+	git update-ref refs/remotes/myfork/main main &&
+	git reset main~1
 '
 
 test_atom head push:track '[behind 1]'
@@ -438,8 +512,8 @@ test_expect_success 'Check that :track[short] works when upstream is invalid' '
 	[gone]
 
 	EOF
-	test_when_finished "git config branch.master.merge refs/heads/master" &&
-	git config branch.master.merge refs/heads/does-not-exist &&
+	test_when_finished "git config branch.main.merge refs/heads/main" &&
+	git config branch.main.merge refs/heads/does-not-exist &&
 	git for-each-ref \
 		--format="%(upstream:track)$LF%(upstream:trackshort)" \
 		refs/heads >actual &&
@@ -452,9 +526,9 @@ test_expect_success 'Check for invalid refname format' '
 
 test_expect_success 'set up color tests' '
 	cat >expected.color <<-EOF &&
-	$(git rev-parse --short refs/heads/master) <GREEN>master<RESET>
-	$(git rev-parse --short refs/remotes/myfork/master) <GREEN>myfork/master<RESET>
-	$(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET>
+	$(git rev-parse --short refs/heads/main) <GREEN>main<RESET>
+	$(git rev-parse --short refs/remotes/myfork/main) <GREEN>myfork/main<RESET>
+	$(git rev-parse --short refs/remotes/origin/main) <GREEN>origin/main<RESET>
 	$(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
 	$(git rev-parse --short refs/tags/third) <GREEN>third<RESET>
 	$(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
@@ -486,8 +560,8 @@ test_expect_success 'color.ui=always does not override tty check' '
 '
 
 cat >expected <<\EOF
-heads/master
-tags/master
+heads/main
+tags/main
 EOF
 
 test_expect_success 'Check ambiguous head and tag refs (strict)' '
@@ -497,19 +571,19 @@ test_expect_success 'Check ambiguous head and tag refs (strict)' '
 	git add one &&
 	git commit -m "Branch" &&
 	setdate_and_increment &&
-	git tag -m "Tagging at $datestamp" master &&
-	git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
+	git tag -m "Tagging at $datestamp" main &&
+	git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
 	test_cmp expected actual
 '
 
 cat >expected <<\EOF
-heads/master
-master
+heads/main
+main
 EOF
 
 test_expect_success 'Check ambiguous head and tag refs (loose)' '
 	git config --bool core.warnambiguousrefs false &&
-	git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
+	git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
 	test_cmp expected actual
 '
 
@@ -519,7 +593,7 @@ ambiguous
 EOF
 
 test_expect_success 'Check ambiguous head and tag refs II (loose)' '
-	git checkout master &&
+	git checkout main &&
 	git tag ambiguous testtag^0 &&
 	git branch ambiguous testtag^0 &&
 	git for-each-ref --format "%(refname:short)" refs/heads/ambiguous refs/tags/ambiguous >actual &&
@@ -538,10 +612,14 @@ test_atom refs/tags/taggerless tag 'taggerless'
 test_atom refs/tags/taggerless tagger ''
 test_atom refs/tags/taggerless taggername ''
 test_atom refs/tags/taggerless taggeremail ''
+test_atom refs/tags/taggerless taggeremail:trim ''
+test_atom refs/tags/taggerless taggeremail:localpart ''
 test_atom refs/tags/taggerless taggerdate ''
 test_atom refs/tags/taggerless committer ''
 test_atom refs/tags/taggerless committername ''
 test_atom refs/tags/taggerless committeremail ''
+test_atom refs/tags/taggerless committeremail:trim ''
+test_atom refs/tags/taggerless committeremail:localpart ''
 test_atom refs/tags/taggerless committerdate ''
 test_atom refs/tags/taggerless subject 'Broken tag'
 
@@ -565,6 +643,7 @@ test_expect_success 'create tag with subject and body content' '
 	git tag -F msg subject-body
 '
 test_atom refs/tags/subject-body subject 'the subject line'
+test_atom refs/tags/subject-body subject:sanitize 'the-subject-line'
 test_atom refs/tags/subject-body body 'first body line
 second body line
 '
@@ -585,6 +664,7 @@ test_expect_success 'create tag with multiline subject' '
 	git tag -F msg multiline
 '
 test_atom refs/tags/multiline subject 'first subject line second subject line'
+test_atom refs/tags/multiline subject:sanitize 'first-subject-line-second-subject-line'
 test_atom refs/tags/multiline contents:subject 'first subject line second subject line'
 test_atom refs/tags/multiline body 'first body line
 second body line
@@ -617,13 +697,24 @@ sig='-----BEGIN PGP SIGNATURE-----
 
 PREREQ=GPG
 test_atom refs/tags/signed-empty subject ''
+test_atom refs/tags/signed-empty subject:sanitize ''
 test_atom refs/tags/signed-empty contents:subject ''
 test_atom refs/tags/signed-empty body "$sig"
 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'
 test_atom refs/tags/signed-short body "$sig"
 test_atom refs/tags/signed-short contents:body ''
@@ -631,7 +722,17 @@ 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'
 test_atom refs/tags/signed-long body "body contents
 $sig"
@@ -643,20 +744,283 @@ test_atom refs/tags/signed-long contents "subject line
 body contents
 $sig"
 
-cat >expected <<EOF
-$(git rev-parse refs/tags/bogo) <committer@example.com> refs/tags/bogo
-$(git rev-parse refs/tags/master) <committer@example.com> refs/tags/master
-EOF
+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
+'
+
+test_atom refs/mytrees/first subject ""
+test_atom refs/mytrees/first contents:subject ""
+test_atom refs/mytrees/first body ""
+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 ""
+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)" | while read line
+	do
+		echo "'\''$line'\''" >>expect
+	done &&
+	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
+		for email in user1 user2
+		do
+			for ref in ref1 ref2
+			do
+				GIT_COMMITTER_DATE="@$when +0000" \
+				GIT_COMMITTER_EMAIL="$email@example.com" \
+				git tag -m "tag $ref-$when-$email" \
+				multi-$ref-$when-$email || return 1
+			done
+		done
+	done
+'
 
 test_expect_success 'Verify sort with multiple keys' '
-	git for-each-ref --format="%(objectname) %(taggeremail) %(refname)" --sort=objectname --sort=taggeremail \
-		refs/tags/bogo refs/tags/master > actual &&
+	cat >expected <<-\EOF &&
+	100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
+	100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
+	100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
+	100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
+	200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
+	200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
+	200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
+	200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
+	EOF
+	git for-each-ref \
+		--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
+		--sort=-refname \
+		--sort=taggeremail \
+		--sort=taggerdate \
+		"refs/tags/multi-*" >actual &&
 	test_cmp expected actual
 '
 
+test_expect_success 'equivalent sorts fall back on refname' '
+	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=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 master" &&
+	test_when_finished "git checkout main" &&
 	git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
 	sed -e "s/^\* /  /" actual >expect &&
 	git checkout --orphan orphaned-branch &&
@@ -688,84 +1052,163 @@ test_expect_success 'set up trailers for next test' '
 	EOF
 '
 
-test_expect_success '%(trailers:unfold) unfolds trailers' '
-	git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual &&
-	{
-		unfold <trailers
-		echo
-	} >expect &&
-	test_cmp expect actual
-'
+test_trailer_option () {
+	title=$1 option=$2
+	cat >expect
+	test_expect_success "$title" '
+		git for-each-ref --format="%($option)" refs/heads/main >actual &&
+		test_cmp expect actual &&
+		git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
+		test_cmp expect actual
+	'
+}
 
-test_expect_success '%(trailers:only) shows only "key: value" trailers' '
-	git for-each-ref --format="%(trailers:only)" refs/heads/master >actual &&
-	{
-		grep -v patch.description <trailers &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-'
+test_trailer_option '%(trailers:unfold) unfolds trailers' \
+	'trailers:unfold' <<-EOF
+	$(unfold <trailers)
 
-test_expect_success '%(trailers:only) and %(trailers:unfold) work together' '
-	git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual &&
-	git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >reverse &&
-	test_cmp actual reverse &&
-	{
-		grep -v patch.description <trailers | unfold &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-'
+	EOF
 
-test_expect_success '%(contents:trailers:unfold) unfolds trailers' '
-	git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual &&
-	{
-		unfold <trailers
-		echo
-	} >expect &&
-	test_cmp expect actual
-'
+test_trailer_option '%(trailers:only) shows only "key: value" trailers' \
+	'trailers:only' <<-EOF
+	$(grep -v patch.description <trailers)
 
-test_expect_success '%(contents:trailers:only) shows only "key: value" trailers' '
-	git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual &&
-	{
-		grep -v patch.description <trailers &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-'
+	EOF
 
-test_expect_success '%(contents:trailers:only) and %(contents:trailers:unfold) work together' '
-	git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/master >actual &&
-	git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >reverse &&
-	test_cmp actual reverse &&
-	{
-		grep -v patch.description <trailers | unfold &&
-		echo
-	} >expect &&
-	test_cmp expect actual
-'
+test_trailer_option '%(trailers:only=no,only=true) shows only "key: value" trailers' \
+	'trailers:only=no,only=true' <<-EOF
+	$(grep -v patch.description <trailers)
 
-test_expect_success '%(trailers) rejects unknown trailers arguments' '
-	# error message cannot be checked under i18n
-	cat >expect <<-EOF &&
+	EOF
+
+test_trailer_option '%(trailers:only=yes) shows only "key: value" trailers' \
+	'trailers:only=yes' <<-EOF
+	$(grep -v patch.description <trailers)
+
+	EOF
+
+test_trailer_option '%(trailers:only=no) shows all trailers' \
+	'trailers:only=no' <<-EOF
+	$(cat trailers)
+
+	EOF
+
+test_trailer_option '%(trailers:only) and %(trailers:unfold) work together' \
+	'trailers:only,unfold' <<-EOF
+	$(grep -v patch.description <trailers | unfold)
+
+	EOF
+
+test_trailer_option '%(trailers:unfold) and %(trailers:only) work together' \
+	'trailers:unfold,only' <<-EOF
+	$(grep -v patch.description <trailers | unfold)
+
+	EOF
+
+test_trailer_option '%(trailers:key=foo) shows that trailer' \
+	'trailers:key=Signed-off-by' <<-EOF
+	Signed-off-by: A U Thor <author@example.com>
+
+	EOF
+
+test_trailer_option '%(trailers:key=foo) is case insensitive' \
+	'trailers:key=SiGned-oFf-bY' <<-EOF
+	Signed-off-by: A U Thor <author@example.com>
+
+	EOF
+
+test_trailer_option '%(trailers:key=foo:) trailing colon also works' \
+	'trailers:key=Signed-off-by:' <<-EOF
+	Signed-off-by: A U Thor <author@example.com>
+
+	EOF
+
+test_trailer_option '%(trailers:key=foo) multiple keys' \
+	'trailers:key=Reviewed-by:,key=Signed-off-by' <<-EOF
+	Reviewed-by: A U Thor <author@example.com>
+	Signed-off-by: A U Thor <author@example.com>
+
+	EOF
+
+test_trailer_option '%(trailers:key=nonexistent) becomes empty' \
+	'trailers:key=Shined-off-by:' <<-EOF
+
+	EOF
+
+test_trailer_option '%(trailers:key=foo) handles multiple lines even if folded' \
+	'trailers:key=Acked-by' <<-EOF
+	$(grep -v patch.description <trailers | grep -v Signed-off-by | grep -v Reviewed-by)
+
+	EOF
+
+test_trailer_option '%(trailers:key=foo,unfold) properly unfolds' \
+	'trailers:key=Signed-Off-by,unfold' <<-EOF
+	$(unfold <trailers | grep Signed-off-by)
+
+	EOF
+
+test_trailer_option '%(trailers:key=foo,only=no) also includes nontrailer lines' \
+	'trailers:key=Signed-off-by,only=no' <<-EOF
+	Signed-off-by: A U Thor <author@example.com>
+	$(grep patch.description <trailers)
+
+	EOF
+
+test_trailer_option '%(trailers:key=foo,valueonly) shows only value' \
+	'trailers:key=Signed-off-by,valueonly' <<-EOF
+	A U Thor <author@example.com>
+
+	EOF
+
+test_trailer_option '%(trailers:separator) changes separator' \
+	'trailers:separator=%x2C,key=Reviewed-by,key=Signed-off-by:' <<-EOF
+	Reviewed-by: A U Thor <author@example.com>,Signed-off-by: A U Thor <author@example.com>
+	EOF
+
+test_trailer_option '%(trailers:key_value_separator) changes key-value separator' \
+	'trailers:key_value_separator=%x2C,key=Reviewed-by,key=Signed-off-by:' <<-EOF
+	Reviewed-by,A U Thor <author@example.com>
+	Signed-off-by,A U Thor <author@example.com>
+
+	EOF
+
+test_trailer_option '%(trailers:separator,key_value_separator) changes both separators' \
+	'trailers:separator=%x2C,key_value_separator=%x2C,key=Reviewed-by,key=Signed-off-by:' <<-EOF
+	Reviewed-by,A U Thor <author@example.com>,Signed-off-by,A U Thor <author@example.com>
+	EOF
+
+test_failing_trailer_option () {
+	title=$1 option=$2
+	cat >expect
+	test_expect_success "$title" '
+		# error message cannot be checked under i18n
+		test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
+		test_cmp expect actual &&
+		test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
+		test_cmp expect actual
+	'
+}
+
+test_failing_trailer_option '%(trailers) rejects unknown trailers arguments' \
+	'trailers:unsupported' <<-\EOF
 	fatal: unknown %(trailers) argument: unsupported
 	EOF
-	test_must_fail git for-each-ref --format="%(trailers:unsupported)" 2>actual &&
-	test_i18ncmp expect actual
-'
 
-test_expect_success '%(contents:trailers) rejects unknown trailers arguments' '
-	# error message cannot be checked under i18n
+test_failing_trailer_option '%(trailers:key) without value is error' \
+	'trailers:key' <<-\EOF
+	fatal: expected %(trailers:key=<value>)
+	EOF
+
+test_expect_success 'if arguments, %(contents:trailers) shows error if colon is missing' '
 	cat >expect <<-EOF &&
-	fatal: unknown %(trailers) argument: unsupported
+	fatal: unrecognized %(contents) argument: trailersonly
 	EOF
-	test_must_fail git for-each-ref --format="%(contents:trailers:unsupported)" 2>actual &&
-	test_i18ncmp expect actual
+	test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'basic atom: head contents:trailers' '
-	git for-each-ref --format="%(contents:trailers)" refs/heads/master >actual &&
+	git for-each-ref --format="%(contents:trailers)" refs/heads/main >actual &&
 	sanitize_pgp <actual >actual.clean &&
 	# git for-each-ref ends with a blank line
 	cat >expect <<-EOF &&
@@ -775,6 +1218,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
@@ -794,16 +1241,16 @@ test_expect_success 'trailer parsing not fooled by --- line' '
 		echo "trailer: right" &&
 		echo
 	} >expect &&
-	git for-each-ref --format="%(trailers)" refs/heads/master >actual &&
+	git for-each-ref --format="%(trailers)" refs/heads/main >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'Add symbolic ref for the following tests' '
-	git symbolic-ref refs/heads/sym refs/heads/master
+	git symbolic-ref refs/heads/sym refs/heads/main
 '
 
 cat >expected <<EOF
-refs/heads/master
+refs/heads/main
 EOF
 
 test_expect_success 'Verify usage of %(symref) atom' '
@@ -812,7 +1259,7 @@ test_expect_success 'Verify usage of %(symref) atom' '
 '
 
 cat >expected <<EOF
-heads/master
+heads/main
 EOF
 
 test_expect_success 'Verify usage of %(symref:short) atom' '
@@ -821,8 +1268,8 @@ test_expect_success 'Verify usage of %(symref:short) atom' '
 '
 
 cat >expected <<EOF
-master
-heads/master
+main
+heads/main
 EOF
 
 test_expect_success 'Verify usage of %(symref:lstrip) atom' '
@@ -851,22 +1298,23 @@ test_expect_success ':remotename and :remoteref' '
 	(
 		cd remote-tests &&
 		test_commit initial &&
+		git branch -M main &&
 		git remote add from fifth.coffee:blub &&
-		git config branch.master.remote from &&
-		git config branch.master.merge refs/heads/stable &&
+		git config branch.main.remote from &&
+		git config branch.main.merge refs/heads/stable &&
 		git remote add to southridge.audio:repo &&
 		git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
-		git config branch.master.pushRemote to &&
+		git config branch.main.pushRemote to &&
 		for pair in "%(upstream)=refs/remotes/from/stable" \
 			"%(upstream:remotename)=from" \
 			"%(upstream:remoteref)=refs/heads/stable" \
-			"%(push)=refs/remotes/to/pushed/master" \
+			"%(push)=refs/remotes/to/pushed/main" \
 			"%(push:remotename)=to" \
-			"%(push:remoteref)=refs/heads/pushed/master"
+			"%(push:remoteref)=refs/heads/pushed/main"
 		do
 			echo "${pair#*=}" >expect &&
 			git for-each-ref --format="${pair%=*}" \
-				refs/heads/master >actual &&
+				refs/heads/main >actual &&
 			test_cmp expect actual
 		done &&
 		git branch push-simple &&
@@ -879,13 +1327,63 @@ test_expect_success ':remotename and :remoteref' '
 '
 
 test_expect_success 'for-each-ref --ignore-case ignores case' '
-	git for-each-ref --format="%(refname)" refs/heads/MASTER >actual &&
+	git for-each-ref --format="%(refname)" refs/heads/MAIN >actual &&
 	test_must_be_empty actual &&
 
-	echo refs/heads/master >expect &&
+	echo refs/heads/main >expect &&
 	git for-each-ref --format="%(refname)" --ignore-case \
-		refs/heads/MASTER >actual &&
+		refs/heads/MAIN >actual &&
 	test_cmp expect actual
 '
 
+test_expect_success 'for-each-ref --ignore-case works on multiple sort keys' '
+	# name refs numerically to avoid case-insensitive filesystem conflicts
+	nr=0 &&
+	for email in a A b B
+	do
+		for subject in a A b B
+		do
+			GIT_COMMITTER_EMAIL="$email@example.com" \
+			git tag -m "tag $subject" icase-$(printf %02d $nr) &&
+			nr=$((nr+1))||
+			return 1
+		done
+	done &&
+	git for-each-ref --ignore-case \
+		--format="%(taggeremail) %(subject) %(refname)" \
+		--sort=refname \
+		--sort=subject \
+		--sort=taggeremail \
+		refs/tags/icase-* >actual &&
+	cat >expect <<-\EOF &&
+	<a@example.com> tag a refs/tags/icase-00
+	<a@example.com> tag A refs/tags/icase-01
+	<A@example.com> tag a refs/tags/icase-04
+	<A@example.com> tag A refs/tags/icase-05
+	<a@example.com> tag b refs/tags/icase-02
+	<a@example.com> tag B refs/tags/icase-03
+	<A@example.com> tag b refs/tags/icase-06
+	<A@example.com> tag B refs/tags/icase-07
+	<b@example.com> tag a refs/tags/icase-08
+	<b@example.com> tag A refs/tags/icase-09
+	<B@example.com> tag a refs/tags/icase-12
+	<B@example.com> tag A refs/tags/icase-13
+	<b@example.com> tag b refs/tags/icase-10
+	<b@example.com> tag B refs/tags/icase-11
+	<B@example.com> tag b refs/tags/icase-14
+	<B@example.com> tag B refs/tags/icase-15
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success 'for-each-ref reports broken tags' '
+	git tag -m "good tag" broken-tag-good HEAD &&
+	git cat-file tag broken-tag-good >good &&
+	sed s/commit/blob/ <good >bad &&
+	bad=$(git hash-object -w -t tag bad) &&
+	git update-ref refs/tags/broken-tag-bad $bad &&
+	test_must_fail git for-each-ref --format="%(*objectname)" \
+		refs/tags/broken-tag-*
+'
+
 test_done
diff --git a/t/t6301-for-each-ref-errors.sh b/t/t6301-for-each-ref-errors.sh
index 49cc65bb58..40edf9dab5 100755
--- a/t/t6301-for-each-ref-errors.sh
+++ b/t/t6301-for-each-ref-errors.sh
@@ -5,9 +5,9 @@ test_description='for-each-ref errors for broken refs'
 . ./test-lib.sh
 
 ZEROS=$ZERO_OID
-MISSING=abababababababababababababababababababab
 
 test_expect_success setup '
+	MISSING=$(test_oid deadbeef) &&
 	git commit --allow-empty -m "Initial" &&
 	git tag testtag &&
 	git for-each-ref >full-list &&
@@ -20,8 +20,8 @@ test_expect_success 'Broken refs are reported correctly' '
 	test_when_finished "rm -f .git/$r" &&
 	echo "warning: ignoring broken ref $r" >broken-err &&
 	git for-each-ref >out 2>err &&
-	test_i18ncmp full-list out &&
-	test_i18ncmp broken-err err
+	test_cmp full-list out &&
+	test_cmp broken-err err
 '
 
 test_expect_success 'NULL_SHA1 refs are reported correctly' '
@@ -31,10 +31,10 @@ test_expect_success 'NULL_SHA1 refs are reported correctly' '
 	echo "warning: ignoring broken ref $r" >zeros-err &&
 	git for-each-ref >out 2>err &&
 	test_cmp full-list out &&
-	test_i18ncmp zeros-err err &&
+	test_cmp zeros-err err &&
 	git for-each-ref --format="%(objectname) %(refname)" >brief-out 2>brief-err &&
 	test_cmp brief-list brief-out &&
-	test_i18ncmp zeros-err brief-err
+	test_cmp zeros-err brief-err
 '
 
 test_expect_success 'Missing objects are reported correctly' '
@@ -43,7 +43,7 @@ test_expect_success 'Missing objects are reported correctly' '
 	test_when_finished "rm -f .git/$r" &&
 	echo "fatal: missing object $MISSING for $r" >missing-err &&
 	test_must_fail git for-each-ref 2>err &&
-	test_i18ncmp missing-err err &&
+	test_cmp missing-err err &&
 	(
 		cat brief-list &&
 		echo "$MISSING $r"
diff --git a/t/t6302-for-each-ref-filter.sh b/t/t6302-for-each-ref-filter.sh
index 35408d53fd..1537aa2179 100755
--- a/t/t6302-for-each-ref-filter.sh
+++ b/t/t6302-for-each-ref-filter.sh
@@ -2,11 +2,15 @@
 
 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
 
 test_expect_success 'setup some history and refs' '
 	test_commit one &&
+	git branch -M main &&
 	test_commit two &&
 	test_commit three &&
 	git checkout -b side &&
@@ -26,17 +30,17 @@ test_expect_success 'setup some history and refs' '
 	git tag $sign -m "A signed tag" signed-tag &&
 	git tag $sign -m "Signed doubly" doubly-signed-tag signed-tag &&
 
-	git checkout master &&
-	git update-ref refs/odd/spot master
+	git checkout main &&
+	git update-ref refs/odd/spot main
 '
 
 test_expect_success 'filtering with --points-at' '
 	cat >expect <<-\EOF &&
-	refs/heads/master
+	refs/heads/main
 	refs/odd/spot
 	refs/tags/three
 	EOF
-	git for-each-ref --format="%(refname)" --points-at=master >actual &&
+	git for-each-ref --format="%(refname)" --points-at=main >actual &&
 	test_cmp expect actual
 '
 
@@ -53,13 +57,13 @@ test_expect_success 'check signed tags with --points-at' '
 
 test_expect_success 'filtering with --merged' '
 	cat >expect <<-\EOF &&
-	refs/heads/master
+	refs/heads/main
 	refs/odd/spot
 	refs/tags/one
 	refs/tags/three
 	refs/tags/two
 	EOF
-	git for-each-ref --format="%(refname)" --merged=master >actual &&
+	git for-each-ref --format="%(refname)" --merged=main >actual &&
 	test_cmp expect actual
 '
 
@@ -72,13 +76,13 @@ test_expect_success 'filtering with --no-merged' '
 	refs/tags/four
 	refs/tags/signed-tag
 	EOF
-	git for-each-ref --format="%(refname)" --no-merged=master >actual &&
+	git for-each-ref --format="%(refname)" --no-merged=main >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'filtering with --contains' '
 	cat >expect <<-\EOF &&
-	refs/heads/master
+	refs/heads/main
 	refs/heads/side
 	refs/odd/spot
 	refs/tags/annotated-tag
@@ -113,9 +117,28 @@ test_expect_success '%(color) must fail' '
 	test_must_fail git for-each-ref --format="%(color)%(refname)"
 '
 
+test_expect_success '%(color:#aa22ac) must succeed' '
+	test_when_finished rm -rf test &&
+	git init test &&
+	(
+		cd test &&
+		test_commit initial &&
+		git branch -M main &&
+		cat >expect <<-\EOF &&
+		refs/heads/main
+		refs/tags/initial
+		EOF
+		git remote add origin nowhere &&
+		git config branch.main.remote origin &&
+		git config branch.main.merge refs/heads/main &&
+		git for-each-ref --format="%(color:#aa22ac)%(refname)" >actual &&
+		test_cmp expect actual
+	)
+'
+
 test_expect_success 'left alignment is default' '
 	cat >expect <<-\EOF &&
-	refname is refs/heads/master  |refs/heads/master
+	refname is refs/heads/main    |refs/heads/main
 	refname is refs/heads/side    |refs/heads/side
 	refname is refs/odd/spot      |refs/odd/spot
 	refname is refs/tags/annotated-tag|refs/tags/annotated-tag
@@ -133,7 +156,7 @@ test_expect_success 'left alignment is default' '
 
 test_expect_success 'middle alignment' '
 	cat >expect <<-\EOF &&
-	| refname is refs/heads/master |refs/heads/master
+	|  refname is refs/heads/main  |refs/heads/main
 	|  refname is refs/heads/side  |refs/heads/side
 	|   refname is refs/odd/spot   |refs/odd/spot
 	|refname is refs/tags/annotated-tag|refs/tags/annotated-tag
@@ -151,7 +174,7 @@ test_expect_success 'middle alignment' '
 
 test_expect_success 'right alignment' '
 	cat >expect <<-\EOF &&
-	|  refname is refs/heads/master|refs/heads/master
+	|    refname is refs/heads/main|refs/heads/main
 	|    refname is refs/heads/side|refs/heads/side
 	|      refname is refs/odd/spot|refs/odd/spot
 	|refname is refs/tags/annotated-tag|refs/tags/annotated-tag
@@ -168,7 +191,7 @@ test_expect_success 'right alignment' '
 '
 
 cat >expect <<-\EOF
-|       refname is refs/heads/master       |refs/heads/master
+|        refname is refs/heads/main        |refs/heads/main
 |        refname is refs/heads/side        |refs/heads/side
 |         refname is refs/odd/spot         |refs/odd/spot
 |    refname is refs/tags/annotated-tag    |refs/tags/annotated-tag
@@ -215,7 +238,7 @@ EOF
 
 test_expect_success 'alignment with format quote' "
 	cat >expect <<-\EOF &&
-	|'      '\''master| A U Thor'\''      '|
+	|'       '\''main| A U Thor'\''       '|
 	|'       '\''side| A U Thor'\''       '|
 	|'     '\''odd/spot| A U Thor'\''     '|
 	|'      '\''annotated-tag| '\''       '|
@@ -233,7 +256,7 @@ test_expect_success 'alignment with format quote' "
 
 test_expect_success 'nested alignment with quote formatting' "
 	cat >expect <<-\EOF &&
-	|'         master               '|
+	|'           main               '|
 	|'           side               '|
 	|'       odd/spot               '|
 	|'  annotated-tag               '|
@@ -251,7 +274,7 @@ test_expect_success 'nested alignment with quote formatting' "
 
 test_expect_success 'check `%(contents:lines=1)`' '
 	cat >expect <<-\EOF &&
-	master |three
+	main |three
 	side |four
 	odd/spot |three
 	annotated-tag |An annotated tag
@@ -269,7 +292,7 @@ test_expect_success 'check `%(contents:lines=1)`' '
 
 test_expect_success 'check `%(contents:lines=0)`' '
 	cat >expect <<-\EOF &&
-	master |
+	main |
 	side |
 	odd/spot |
 	annotated-tag |
@@ -287,7 +310,7 @@ test_expect_success 'check `%(contents:lines=0)`' '
 
 test_expect_success 'check `%(contents:lines=99999)`' '
 	cat >expect <<-\EOF &&
-	master |three
+	main |three
 	side |four
 	odd/spot |three
 	annotated-tag |An annotated tag
@@ -360,7 +383,7 @@ test_expect_success 'improper usage of %(if), %(then), %(else) and %(end) atoms'
 test_expect_success 'check %(if)...%(then)...%(end) atoms' '
 	git for-each-ref --format="%(refname)%(if)%(authorname)%(then) Author: %(authorname)%(end)" >actual &&
 	cat >expect <<-\EOF &&
-	refs/heads/master Author: A U Thor
+	refs/heads/main Author: A U Thor
 	refs/heads/side Author: A U Thor
 	refs/odd/spot Author: A U Thor
 	refs/tags/annotated-tag
@@ -381,7 +404,7 @@ test_expect_success 'check %(if)...%(then)...%(end) atoms' '
 test_expect_success 'check %(if)...%(then)...%(else)...%(end) atoms' '
 	git for-each-ref --format="%(if)%(authorname)%(then)%(authorname)%(else)No author%(end): %(refname)" >actual &&
 	cat >expect <<-\EOF &&
-	A U Thor: refs/heads/master
+	A U Thor: refs/heads/main
 	A U Thor: refs/heads/side
 	A U Thor: refs/odd/spot
 	No author: refs/tags/annotated-tag
@@ -401,7 +424,7 @@ test_expect_success 'check %(if)...%(then)...%(else)...%(end) atoms' '
 test_expect_success 'ignore spaces in %(if) atom usage' '
 	git for-each-ref --format="%(refname:short): %(if)%(HEAD)%(then)Head ref%(else)Not Head ref%(end)" >actual &&
 	cat >expect <<-\EOF &&
-	master: Head ref
+	main: Head ref
 	side: Not Head ref
 	odd/spot: Not Head ref
 	annotated-tag: Not Head ref
@@ -420,34 +443,34 @@ test_expect_success 'ignore spaces in %(if) atom usage' '
 '
 
 test_expect_success 'check %(if:equals=<string>)' '
-	git for-each-ref --format="%(if:equals=master)%(refname:short)%(then)Found master%(else)Not master%(end)" refs/heads/ >actual &&
+	git for-each-ref --format="%(if:equals=main)%(refname:short)%(then)Found main%(else)Not main%(end)" refs/heads/ >actual &&
 	cat >expect <<-\EOF &&
-	Found master
-	Not master
+	Found main
+	Not main
 	EOF
 	test_cmp expect actual
 '
 
 test_expect_success 'check %(if:notequals=<string>)' '
-	git for-each-ref --format="%(if:notequals=master)%(refname:short)%(then)Not master%(else)Found master%(end)" refs/heads/ >actual &&
+	git for-each-ref --format="%(if:notequals=main)%(refname:short)%(then)Not main%(else)Found main%(end)" refs/heads/ >actual &&
 	cat >expect <<-\EOF &&
-	Found master
-	Not master
+	Found main
+	Not main
 	EOF
 	test_cmp expect actual
 '
 
-test_expect_success '--merged is incompatible with --no-merged' '
-	test_must_fail git for-each-ref --merged HEAD --no-merged HEAD
+test_expect_success '--merged is compatible with --no-merged' '
+	git for-each-ref --merged HEAD --no-merged HEAD
 '
 
 test_expect_success 'validate worktree atom' '
 	cat >expect <<-EOF &&
-	master: $(pwd)
-	master_worktree: $(pwd)/worktree_dir
+	main: $(pwd)
+	main_worktree: $(pwd)/worktree_dir
 	side: not checked out
 	EOF
-	git worktree add -b master_worktree worktree_dir master &&
+	git worktree add -b main_worktree worktree_dir main &&
 	git for-each-ref --format="%(refname:short): %(if)%(worktreepath)%(then)%(worktreepath)%(else)not checked out%(end)" refs/heads/ >actual &&
 	rm -r worktree_dir &&
 	git worktree prune &&
diff --git a/t/t6400-merge-df.sh b/t/t6400-merge-df.sh
new file mode 100755
index 0000000000..57a67cf362
--- /dev/null
+++ b/t/t6400-merge-df.sh
@@ -0,0 +1,163 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Fredrik Kuivinen
+#
+
+test_description='Test merge with directory/file conflicts'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success 'prepare repository' '
+	echo Hello >init &&
+	git add init &&
+	git commit -m initial &&
+
+	git branch B &&
+	mkdir dir &&
+	echo foo >dir/foo &&
+	git add dir/foo &&
+	git commit -m "File: dir/foo" &&
+
+	git checkout B &&
+	echo file dir >dir &&
+	git add dir &&
+	git commit -m "File: dir"
+'
+
+test_expect_success 'Merge with d/f conflicts' '
+	test_expect_code 1 git merge -m "merge msg" main
+'
+
+test_expect_success 'F/D conflict' '
+	git reset --hard &&
+	git checkout main &&
+	rm .git/index &&
+
+	mkdir before &&
+	echo FILE >before/one &&
+	echo FILE >after &&
+	git add . &&
+	git commit -m first &&
+
+	rm -f after &&
+	git mv before after &&
+	git commit -m move &&
+
+	git checkout -b para HEAD^ &&
+	echo COMPLETELY ANOTHER FILE >another &&
+	git add . &&
+	git commit -m para &&
+
+	git merge main
+'
+
+test_expect_success 'setup modify/delete + directory/file conflict' '
+	git checkout --orphan modify &&
+	git rm -rf . &&
+	git clean -fdqx &&
+
+	printf "a\nb\nc\nd\ne\nf\ng\nh\n" >letters &&
+	git add letters &&
+	git commit -m initial &&
+
+	# Throw in letters.txt for sorting order fun
+	# ("letters.txt" sorts between "letters" and "letters/file")
+	echo i >>letters &&
+	echo "version 2" >letters.txt &&
+	git add letters letters.txt &&
+	git commit -m modified &&
+
+	git checkout -b delete HEAD^ &&
+	git rm letters &&
+	mkdir letters &&
+	>letters/file &&
+	echo "version 1" >letters.txt &&
+	git add letters letters.txt &&
+	git commit -m deleted
+'
+
+test_expect_success 'modify/delete + directory/file conflict' '
+	git checkout delete^0 &&
+	test_must_fail git merge modify &&
+
+	test_stdout_line_count = 5 git ls-files -s &&
+	test_stdout_line_count = 4 git ls-files -u &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 0 git ls-files -o
+	else
+		test_stdout_line_count = 1 git ls-files -o
+	fi &&
+
+	test_path_is_file letters/file &&
+	test_path_is_file letters.txt &&
+	test_path_is_file letters~modify
+'
+
+test_expect_success 'modify/delete + directory/file conflict; other way' '
+	git reset --hard &&
+	git clean -f &&
+	git checkout modify^0 &&
+
+	test_must_fail git merge delete &&
+
+	test_stdout_line_count = 5 git ls-files -s &&
+	test_stdout_line_count = 4 git ls-files -u &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 0 git ls-files -o
+	else
+		test_stdout_line_count = 1 git ls-files -o
+	fi &&
+
+	test_path_is_file letters/file &&
+	test_path_is_file letters.txt &&
+	test_path_is_file letters~HEAD
+'
+
+test_expect_success 'Simple merge in repo with interesting pathnames' '
+	# Simple lexicographic ordering of files and directories would be:
+	#     foo
+	#     foo/bar
+	#     foo/bar-2
+	#     foo/bar/baz
+	#     foo/bar-2/baz
+	# The fact that foo/bar-2 appears between foo/bar and foo/bar/baz
+	# can trip up some codepaths, and is the point of this test.
+	test_create_repo name-ordering &&
+	(
+		cd name-ordering &&
+
+		mkdir -p foo/bar &&
+		mkdir -p foo/bar-2 &&
+		>foo/bar/baz &&
+		>foo/bar-2/baz &&
+		git add . &&
+		git commit -m initial &&
+
+		git branch topic &&
+		git branch other &&
+
+		git checkout other &&
+		echo other >foo/bar-2/baz &&
+		git add -u &&
+		git commit -m other &&
+
+		git checkout topic &&
+		echo topic >foo/bar/baz &&
+		git add -u &&
+		git commit -m topic &&
+
+		git merge other &&
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+		git rev-parse :0:foo/bar/baz :0:foo/bar-2/baz >actual &&
+		git rev-parse HEAD~1:foo/bar/baz other:foo/bar-2/baz >expect &&
+		test_cmp expect actual
+	)
+
+'
+
+test_done
diff --git a/t/t6401-merge-criss-cross.sh b/t/t6401-merge-criss-cross.sh
new file mode 100755
index 0000000000..9d5e992878
--- /dev/null
+++ b/t/t6401-merge-criss-cross.sh
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Fredrik Kuivinen
+#
+
+# See https://lore.kernel.org/git/Pine.LNX.4.44.0504271254120.4678-100000@wax.eds.org/ for a
+# nice description of what this is about.
+
+
+test_description='Test criss-cross merge'
+. ./test-lib.sh
+
+test_expect_success 'prepare repository' '
+	test_write_lines 1 2 3 4 5 6 7 8 9 >file &&
+	git add file &&
+	git commit -m "Initial commit" file &&
+
+	git branch A &&
+	git branch B &&
+	git checkout A &&
+
+	test_write_lines 1 2 3 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
+	git commit -m "B8" file &&
+	git checkout B &&
+
+	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 8 9 >file &&
+	git commit -m "C3" file &&
+	git branch C3 &&
+
+	git merge -m "pre E3 merge" A &&
+
+	test_write_lines 1 2 "3 changed in E3, branch B. New file size" 4 5 6 7 "8 changed in B8, branch A" 9 >file &&
+	git commit -m "E3" file &&
+
+	git checkout A &&
+	git merge -m "pre D8 merge" C3 &&
+	test_write_lines 1 2 "3 changed in C3, branch B" 4 5 6 7 "8 changed in D8, branch A. New file size 2" 9 >file &&
+
+	git commit -m D8 file
+'
+
+test_expect_success 'Criss-cross merge' '
+	git merge -m "final merge" B
+'
+
+test_expect_success 'Criss-cross merge result' '
+	cat <<-\EOF >file-expect &&
+	1
+	2
+	3 changed in E3, branch B. New file size
+	4
+	5
+	6
+	7
+	8 changed in D8, branch A. New file size 2
+	9
+	EOF
+
+	test_cmp file-expect file
+'
+
+test_expect_success 'Criss-cross merge fails (-s resolve)' '
+	git reset --hard A^ &&
+	test_must_fail git merge -s resolve -m "final merge" B
+'
+
+test_done
diff --git a/t/t6022-merge-rename.sh b/t/t6402-merge-rename.sh
index 53cc9b2ffb..3a32b1a45c 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6402-merge-rename.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Merge-recursive merging renames'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 modify () {
@@ -8,108 +11,106 @@ modify () {
 	mv "$2.x" "$2"
 }
 
-test_expect_success setup \
-'
-cat >A <<\EOF &&
-a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
-c cccccccccccccccccccccccccccccccccccccccccccccccc
-d dddddddddddddddddddddddddddddddddddddddddddddddd
-e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
-f ffffffffffffffffffffffffffffffffffffffffffffffff
-g gggggggggggggggggggggggggggggggggggggggggggggggg
-h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
-i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
-j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
-k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
-l llllllllllllllllllllllllllllllllllllllllllllllll
-m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
-n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
-o oooooooooooooooooooooooooooooooooooooooooooooooo
-EOF
-
-cat >M <<\EOF &&
-A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
-C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
-D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
-E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
-F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
-G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
-H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
-I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
-J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
-K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
-L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
-M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
-N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
-O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
-EOF
-
-git add A M &&
-git commit -m "initial has A and M" &&
-git branch white &&
-git branch red &&
-git branch blue &&
-git branch yellow &&
-git branch change &&
-git branch change+rename &&
-
-sed -e "/^g /s/.*/g : master changes a line/" <A >A+ &&
-mv A+ A &&
-git commit -a -m "master updates A" &&
-
-git checkout yellow &&
-rm -f M &&
-git commit -a -m "yellow removes M" &&
-
-git checkout white &&
-sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A B M N &&
-git commit -m "white renames A->B, M->N" &&
-
-git checkout red &&
-sed -e "/^g /s/.*/g : red changes a line/" <A >B &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A B M N &&
-git commit -m "red renames A->B, M->N" &&
-
-git checkout blue &&
-sed -e "/^g /s/.*/g : blue changes a line/" <A >C &&
-sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
-rm -f A M &&
-git update-index --add --remove A C M N &&
-git commit -m "blue renames A->C, M->N" &&
-
-git checkout change &&
-sed -e "/^g /s/.*/g : changed line/" <A >A+ &&
-mv A+ A &&
-git commit -q -a -m "changed" &&
-
-git checkout change+rename &&
-sed -e "/^g /s/.*/g : changed line/" <A >B &&
-rm A &&
-git update-index --add B &&
-git commit -q -a -m "changed and renamed" &&
-
-git checkout master'
+test_expect_success 'setup' '
+	cat >A <<-\EOF &&
+	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+	c cccccccccccccccccccccccccccccccccccccccccccccccc
+	d dddddddddddddddddddddddddddddddddddddddddddddddd
+	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+	f ffffffffffffffffffffffffffffffffffffffffffffffff
+	g gggggggggggggggggggggggggggggggggggggggggggggggg
+	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+	l llllllllllllllllllllllllllllllllllllllllllllllll
+	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+	o oooooooooooooooooooooooooooooooooooooooooooooooo
+	EOF
+
+	cat >M <<-\EOF &&
+	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
+	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
+	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
+	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
+	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+	EOF
+
+	git add A M &&
+	git commit -m "initial has A and M" &&
+	git branch white &&
+	git branch red &&
+	git branch blue &&
+	git branch yellow &&
+	git branch change &&
+	git branch change+rename &&
+
+	sed -e "/^g /s/.*/g : main changes a line/" <A >A+ &&
+	mv A+ A &&
+	git commit -a -m "main updates A" &&
+
+	git checkout yellow &&
+	rm -f M &&
+	git commit -a -m "yellow removes M" &&
+
+	git checkout white &&
+	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "white renames A->B, M->N" &&
+
+	git checkout red &&
+	sed -e "/^g /s/.*/g : red changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "red renames A->B, M->N" &&
+
+	git checkout blue &&
+	sed -e "/^g /s/.*/g : blue changes a line/" <A >C &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A C M N &&
+	git commit -m "blue renames A->C, M->N" &&
+
+	git checkout change &&
+	sed -e "/^g /s/.*/g : changed line/" <A >A+ &&
+	mv A+ A &&
+	git commit -q -a -m "changed" &&
+
+	git checkout change+rename &&
+	sed -e "/^g /s/.*/g : changed line/" <A >B &&
+	rm A &&
+	git update-index --add B &&
+	git commit -q -a -m "changed and renamed" &&
+
+	git checkout main
+'
 
 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 &&
-	git ls-files -u B >b.stages &&
-	test_line_count = 3 b.stages &&
-	git ls-files -s N >n.stages &&
-	test_line_count = 1 n.stages &&
+	test_stdout_line_count = 3 git ls-files -u B &&
+	test_stdout_line_count = 1 git ls-files -s N &&
 	sed -ne "/^g/{
 	p
 	q
-	}" B | grep master &&
+	}" B | grep main &&
 	git diff --exit-code white N
 '
 
@@ -118,11 +119,9 @@ 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 &&
-	git ls-files -u B >b.stages &&
-	test_line_count = 3 b.stages &&
-	git ls-files -s N >n.stages &&
-	test_line_count = 1 n.stages &&
+	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/{
 	p
 	q
@@ -134,11 +133,9 @@ test_expect_success 'pull unrenaming branch into renaming one' \
 '
 	git reset --hard &&
 	git show-branch &&
-	test_expect_code 1 git pull . master &&
-	git ls-files -u B >b.stages &&
-	test_line_count = 3 b.stages &&
-	git ls-files -s N >n.stages &&
-	test_line_count = 1 n.stages &&
+	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/{
 	p
 	q
@@ -150,15 +147,11 @@ test_expect_success 'pull conflicting renames' \
 '
 	git reset --hard &&
 	git show-branch &&
-	test_expect_code 1 git pull . blue &&
-	git ls-files -u A >a.stages &&
-	test_line_count = 1 a.stages &&
-	git ls-files -u B >b.stages &&
-	test_line_count = 1 b.stages &&
-	git ls-files -u C >c.stages &&
-	test_line_count = 1 c.stages &&
-	git ls-files -s N >n.stages &&
-	test_line_count = 1 n.stages &&
+	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 &&
+	test_stdout_line_count = 1 git ls-files -s N &&
 	sed -ne "/^g/{
 	p
 	q
@@ -170,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
 '
 
@@ -180,17 +173,17 @@ 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
 '
 
 test_expect_success 'interference with untracked working tree file' '
 	git reset --hard &&
 	rm -f A M &&
-	git checkout -f master &&
+	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
 '
@@ -198,7 +191,7 @@ test_expect_success 'interference with untracked working tree file' '
 test_expect_success 'updated working tree file should prevent the merge' '
 	git reset --hard &&
 	rm -f A M &&
-	git checkout -f master &&
+	git checkout -f main &&
 	git tag -f anchor &&
 	git show-branch &&
 	echo >>M one line addition &&
@@ -211,13 +204,13 @@ test_expect_success 'updated working tree file should prevent the merge' '
 test_expect_success 'updated working tree file should prevent the merge' '
 	git reset --hard &&
 	rm -f A M &&
-	git checkout -f master &&
+	git checkout -f main &&
 	git tag -f anchor &&
 	git show-branch &&
 	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
 '
@@ -229,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 . master &&
+	git pull --no-rebase . main &&
 	test_path_is_file M &&
 	! {
 		git ls-files -s |
@@ -242,12 +235,24 @@ test_expect_success 'merge of identical changes in a renamed file' '
 	rm -f A M N &&
 	git reset --hard &&
 	git checkout change+rename &&
+
+	test-tool chmtime --get -3600 B >old-mtime &&
 	GIT_MERGE_VERBOSITY=3 git merge change >out &&
-	test_i18ngrep "^Skipped B" out &&
+
+	test-tool chmtime --get B >new-mtime &&
+	test_cmp old-mtime new-mtime &&
+
 	git reset --hard HEAD^ &&
 	git checkout change &&
+
+	# A will be renamed to B; we check mtimes and file presence
+	test_path_is_missing B &&
+	test-tool chmtime --get -3600 A >old-mtime &&
 	GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
-	test_i18ngrep ! "^Skipped B" out
+
+	test_path_is_missing A &&
+	test-tool chmtime --get B >new-mtime &&
+	test $(cat old-mtime) -lt $(cat new-mtime)
 '
 
 test_expect_success 'setup for rename + d/f conflicts' '
@@ -288,14 +293,15 @@ test_expect_success 'setup for rename + d/f conflicts' '
 	git commit -m "Conflicting change"
 '
 
-printf "1\n2\n3\n4\n5555\n6\n7\n8\n9\n10\n11\n" >expected
-
 test_expect_success 'Rename+D/F conflict; renamed file merges + dir not in way' '
 	git reset --hard &&
 	git checkout -q renamed-file-has-no-conflicts^0 &&
+
 	git merge --strategy=recursive dir-not-in-way &&
+
 	git diff --quiet &&
-	test -f dir &&
+	test_path_is_file dir &&
+	test_write_lines 1 2 3 4 5555 6 7 8 9 10 11 >expected &&
 	test_cmp expected dir
 '
 
@@ -307,16 +313,21 @@ test_expect_success 'Rename+D/F conflict; renamed file merges but dir in way' '
 
 	test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
 	test_i18ngrep "Auto-merging dir" output &&
-	test_i18ngrep "Adding as dir~HEAD instead" output &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_i18ngrep "moving it to dir~HEAD instead" output
+	else
+		test_i18ngrep "Adding as dir~HEAD instead" output
+	fi &&
 
-	test 3 -eq "$(git ls-files -u | wc -l)" &&
-	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+	test_stdout_line_count = 3 git ls-files -u &&
+	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
 
 	test_must_fail git diff --quiet &&
 	test_must_fail git diff --cached --quiet &&
 
-	test -f dir/file-in-the-way &&
-	test -f dir~HEAD &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~HEAD &&
 	test_cmp expected dir~HEAD
 '
 
@@ -329,50 +340,54 @@ test_expect_success 'Same as previous, but merged other way' '
 	! grep "error: refusing to lose untracked file at" errors &&
 	test_i18ngrep "CONFLICT (modify/delete): dir/file-in-the-way" output &&
 	test_i18ngrep "Auto-merging dir" output &&
-	test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_i18ngrep "moving it to dir~renamed-file-has-no-conflicts instead" output
+	else
+		test_i18ngrep "Adding as dir~renamed-file-has-no-conflicts instead" output
+	fi &&
 
-	test 3 -eq "$(git ls-files -u | wc -l)" &&
-	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+	test_stdout_line_count = 3 git ls-files -u &&
+	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
 
 	test_must_fail git diff --quiet &&
 	test_must_fail git diff --cached --quiet &&
 
-	test -f dir/file-in-the-way &&
-	test -f dir~renamed-file-has-no-conflicts &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~renamed-file-has-no-conflicts &&
 	test_cmp expected dir~renamed-file-has-no-conflicts
 '
 
-cat >expected <<\EOF &&
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-<<<<<<< HEAD:dir
-12
-=======
-11
->>>>>>> dir-not-in-way:sub/file
-EOF
-
 test_expect_success 'Rename+D/F conflict; renamed file cannot merge, dir not in way' '
 	git reset --hard &&
 	rm -rf dir~* &&
 	git checkout -q renamed-file-has-conflicts^0 &&
 	test_must_fail git merge --strategy=recursive dir-not-in-way &&
 
-	test 3 -eq "$(git ls-files -u | wc -l)" &&
-	test 3 -eq "$(git ls-files -u dir | wc -l)" &&
+	test_stdout_line_count = 3 git ls-files -u &&
+	test_stdout_line_count = 3 git ls-files -u dir &&
 
 	test_must_fail git diff --quiet &&
 	test_must_fail git diff --cached --quiet &&
 
-	test -f dir &&
+	test_path_is_file dir &&
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	9
+	10
+	<<<<<<< HEAD:dir
+	12
+	=======
+	11
+	>>>>>>> dir-not-in-way:sub/file
+	EOF
 	test_cmp expected dir
 '
 
@@ -384,51 +399,64 @@ test_expect_success 'Rename+D/F conflict; renamed file cannot merge and dir in t
 	git checkout -q renamed-file-has-conflicts^0 &&
 	test_must_fail git merge --strategy=recursive dir-in-way &&
 
-	test 5 -eq "$(git ls-files -u | wc -l)" &&
-	test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
-	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+	test_stdout_line_count = 5 git ls-files -u &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 3 git ls-files -u dir~HEAD
+	else
+		git ls-files -u dir >out &&
+		test 3 -eq $(grep -v file-in-the-way out | wc -l) &&
+		rm -f out
+	fi &&
+	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
 
 	test_must_fail git diff --quiet &&
 	test_must_fail git diff --cached --quiet &&
 
-	test -f dir/file-in-the-way &&
-	test -f dir~HEAD &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~HEAD &&
 	test_cmp expected dir~HEAD
 '
 
-cat >expected <<\EOF &&
-1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-<<<<<<< HEAD:sub/file
-11
-=======
-12
->>>>>>> renamed-file-has-conflicts:dir
-EOF
-
 test_expect_success 'Same as previous, but merged other way' '
 	git reset --hard &&
 	rm -rf dir~* &&
 	git checkout -q dir-in-way^0 &&
 	test_must_fail git merge --strategy=recursive renamed-file-has-conflicts &&
 
-	test 5 -eq "$(git ls-files -u | wc -l)" &&
-	test 3 -eq "$(git ls-files -u dir | grep -v file-in-the-way | wc -l)" &&
-	test 2 -eq "$(git ls-files -u dir/file-in-the-way | wc -l)" &&
+	test_stdout_line_count = 5 git ls-files -u &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 3 git ls-files -u dir~renamed-file-has-conflicts
+	else
+		git ls-files -u dir >out &&
+		test 3 -eq $(grep -v file-in-the-way out | wc -l) &&
+		rm -f out
+	fi &&
+	test_stdout_line_count = 2 git ls-files -u dir/file-in-the-way &&
 
 	test_must_fail git diff --quiet &&
 	test_must_fail git diff --cached --quiet &&
 
-	test -f dir/file-in-the-way &&
-	test -f dir~renamed-file-has-conflicts &&
+	test_path_is_file dir/file-in-the-way &&
+	test_path_is_file dir~renamed-file-has-conflicts &&
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	9
+	10
+	<<<<<<< HEAD:sub/file
+	11
+	=======
+	12
+	>>>>>>> renamed-file-has-conflicts:dir
+	EOF
 	test_cmp expected dir~renamed-file-has-conflicts
 '
 
@@ -460,13 +488,18 @@ test_expect_success 'both rename source and destination involved in D/F conflict
 	git checkout -q rename-dest^0 &&
 	test_must_fail git merge --strategy=recursive source-conflict &&
 
-	test 1 -eq "$(git ls-files -u | wc -l)" &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 2 git ls-files -u
+	else
+		test_stdout_line_count = 1 git ls-files -u
+	fi &&
 
 	test_must_fail git diff --quiet &&
 
-	test -f destdir/foo &&
-	test -f one &&
-	test -f destdir~HEAD &&
+	test_path_is_file destdir/foo &&
+	test_path_is_file one &&
+	test_path_is_file destdir~HEAD &&
 	test "stuff" = "$(cat destdir~HEAD)"
 '
 
@@ -494,41 +527,70 @@ test_expect_success 'setup pair rename to parent of other (D/F conflicts)' '
 	git commit -m "Rename one/file -> two"
 '
 
-test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' '
-	git checkout -q rename-one^0 &&
-	mkdir one &&
-	test_must_fail git merge --strategy=recursive rename-two &&
+if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+then
+	test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' '
+		git checkout -q rename-one^0 &&
+		mkdir one &&
+		test_must_fail git merge --strategy=recursive rename-two &&
 
-	test 2 -eq "$(git ls-files -u | wc -l)" &&
-	test 1 -eq "$(git ls-files -u one | wc -l)" &&
-	test 1 -eq "$(git ls-files -u two | wc -l)" &&
+		test_stdout_line_count = 4 git ls-files -u &&
+		test_stdout_line_count = 2 git ls-files -u one &&
+		test_stdout_line_count = 2 git ls-files -u two &&
 
-	test_must_fail git diff --quiet &&
+		test_must_fail git diff --quiet &&
 
-	test 4 -eq $(find . | grep -v .git | wc -l) &&
+		test 3 -eq $(find . | grep -v .git | wc -l) &&
 
-	test -d one &&
-	test -f one~rename-two &&
-	test -f two &&
-	test "other" = $(cat one~rename-two) &&
-	test "stuff" = $(cat two)
-'
+		test_path_is_file one &&
+		test_path_is_file two &&
+		test "other" = $(cat one) &&
+		test "stuff" = $(cat two)
+	'
+else
+	test_expect_success 'pair rename to parent of other (D/F conflicts) w/ untracked dir' '
+		git checkout -q rename-one^0 &&
+		mkdir one &&
+		test_must_fail git merge --strategy=recursive rename-two &&
+
+		test_stdout_line_count = 2 git ls-files -u &&
+		test_stdout_line_count = 1 git ls-files -u one &&
+		test_stdout_line_count = 1 git ls-files -u two &&
+
+		test_must_fail git diff --quiet &&
+
+		test 4 -eq $(find . | grep -v .git | wc -l) &&
+
+		test_path_is_dir one &&
+		test_path_is_file one~rename-two &&
+		test_path_is_file two &&
+		test "other" = $(cat one~rename-two) &&
+		test "stuff" = $(cat two)
+	'
+fi
 
 test_expect_success 'pair rename to parent of other (D/F conflicts) w/ clean start' '
 	git reset --hard &&
 	git clean -fdqx &&
 	test_must_fail git merge --strategy=recursive rename-two &&
 
-	test 2 -eq "$(git ls-files -u | wc -l)" &&
-	test 1 -eq "$(git ls-files -u one | wc -l)" &&
-	test 1 -eq "$(git ls-files -u two | wc -l)" &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 4 git ls-files -u &&
+		test_stdout_line_count = 2 git ls-files -u one &&
+		test_stdout_line_count = 2 git ls-files -u two
+	else
+		test_stdout_line_count = 2 git ls-files -u &&
+		test_stdout_line_count = 1 git ls-files -u one &&
+		test_stdout_line_count = 1 git ls-files -u two
+	fi &&
 
 	test_must_fail git diff --quiet &&
 
 	test 3 -eq $(find . | grep -v .git | wc -l) &&
 
-	test -f one &&
-	test -f two &&
+	test_path_is_file one &&
+	test_path_is_file two &&
 	test "other" = $(cat one) &&
 	test "stuff" = $(cat two)
 '
@@ -561,18 +623,28 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
 	git checkout -q first-rename^0 &&
 	test_must_fail git merge --strategy=recursive second-rename &&
 
-	test 5 -eq "$(git ls-files -s | wc -l)" &&
-	test 3 -eq "$(git ls-files -u | wc -l)" &&
-	test 1 -eq "$(git ls-files -u one | wc -l)" &&
-	test 1 -eq "$(git ls-files -u two | wc -l)" &&
-	test 1 -eq "$(git ls-files -u original | wc -l)" &&
-	test 2 -eq "$(git ls-files -o | wc -l)" &&
-
-	test -f one/file &&
-	test -f two/file &&
-	test -f one~HEAD &&
-	test -f two~second-rename &&
-	! test -f original
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_stdout_line_count = 5 git ls-files -s &&
+		test_stdout_line_count = 3 git ls-files -u &&
+		test_stdout_line_count = 1 git ls-files -u one~HEAD &&
+		test_stdout_line_count = 1 git ls-files -u two~second-rename &&
+		test_stdout_line_count = 1 git ls-files -u original &&
+		test_stdout_line_count = 0 git ls-files -o
+	else
+		test_stdout_line_count = 5 git ls-files -s &&
+		test_stdout_line_count = 3 git ls-files -u &&
+		test_stdout_line_count = 1 git ls-files -u one &&
+		test_stdout_line_count = 1 git ls-files -u two &&
+		test_stdout_line_count = 1 git ls-files -u original &&
+		test_stdout_line_count = 2 git ls-files -o
+	fi &&
+
+	test_path_is_file one/file &&
+	test_path_is_file two/file &&
+	test_path_is_file one~HEAD &&
+	test_path_is_file two~second-rename &&
+	test_path_is_missing original
 '
 
 test_expect_success 'setup rename one file to two; directories moving out of the way' '
@@ -601,15 +673,15 @@ test_expect_success 'check handling of differently renamed file with D/F conflic
 	git checkout -q first-rename-redo^0 &&
 	test_must_fail git merge --strategy=recursive second-rename-redo &&
 
-	test 3 -eq "$(git ls-files -u | wc -l)" &&
-	test 1 -eq "$(git ls-files -u one | wc -l)" &&
-	test 1 -eq "$(git ls-files -u two | wc -l)" &&
-	test 1 -eq "$(git ls-files -u original | wc -l)" &&
-	test 0 -eq "$(git ls-files -o | wc -l)" &&
+	test_stdout_line_count = 3 git ls-files -u &&
+	test_stdout_line_count = 1 git ls-files -u one &&
+	test_stdout_line_count = 1 git ls-files -u two &&
+	test_stdout_line_count = 1 git ls-files -u original &&
+	test_stdout_line_count = 0 git ls-files -o &&
 
-	test -f one &&
-	test -f two &&
-	! test -f original
+	test_path_is_file one &&
+	test_path_is_file two &&
+	test_path_is_missing original
 '
 
 test_expect_success 'setup avoid unnecessary update, normal rename' '
@@ -635,7 +707,7 @@ test_expect_success 'setup avoid unnecessary update, normal rename' '
 
 test_expect_success 'avoid unnecessary update, normal rename' '
 	git checkout -q avoid-unnecessary-update-1^0 &&
-	test-tool chmtime --get =1000000000 rename >expect &&
+	test-tool chmtime --get -3600 rename >expect &&
 	git merge merge-branch-1 &&
 	test-tool chmtime --get rename >actual &&
 	test_cmp expect actual # "rename" should have stayed intact
@@ -667,7 +739,7 @@ test_expect_success 'setup to test avoiding unnecessary update, with D/F conflic
 
 test_expect_success 'avoid unnecessary update, with D/F conflict' '
 	git checkout -q avoid-unnecessary-update-2^0 &&
-	test-tool chmtime --get =1000000000 df >expect &&
+	test-tool chmtime --get -3600 df >expect &&
 	git merge merge-branch-2 &&
 	test-tool chmtime --get df >actual &&
 	test_cmp expect actual # "df" should have stayed intact
@@ -689,7 +761,7 @@ test_expect_success 'setup avoid unnecessary update, dir->(file,nothing)' '
 	git rm -rf df &&
 	git commit -mB &&
 
-	git checkout master &&
+	git checkout main &&
 	git rm -rf df &&
 	echo bla >df &&
 	git add -A &&
@@ -697,8 +769,8 @@ test_expect_success 'setup avoid unnecessary update, dir->(file,nothing)' '
 '
 
 test_expect_success 'avoid unnecessary update, dir->(file,nothing)' '
-	git checkout -q master^0 &&
-	test-tool chmtime --get =1000000000 df >expect &&
+	git checkout -q main^0 &&
+	test-tool chmtime --get -3600 df >expect &&
 	git merge side &&
 	test-tool chmtime --get df >actual &&
 	test_cmp expect actual # "df" should have stayed intact
@@ -719,15 +791,15 @@ test_expect_success 'setup avoid unnecessary update, modify/delete' '
 	git rm -f file &&
 	git commit -m "Delete file" &&
 
-	git checkout master &&
+	git checkout main &&
 	echo bla >file &&
 	git add -A &&
 	git commit -m "Modify file"
 '
 
 test_expect_success 'avoid unnecessary update, modify/delete' '
-	git checkout -q master^0 &&
-	test-tool chmtime --get =1000000000 file >expect &&
+	git checkout -q main^0 &&
+	test-tool chmtime --get -3600 file >expect &&
 	test_must_fail git merge side &&
 	test-tool chmtime --get file >actual &&
 	test_cmp expect actual # "file" should have stayed intact
@@ -748,14 +820,14 @@ test_expect_success 'setup avoid unnecessary update, rename/add-dest' '
 	git add -A &&
 	git commit -m "Add file copy" &&
 
-	git checkout master &&
+	git checkout main &&
 	git mv file newfile &&
 	git commit -m "Rename file"
 '
 
 test_expect_success 'avoid unnecessary update, rename/add-dest' '
-	git checkout -q master^0 &&
-	test-tool chmtime --get =1000000000 newfile >expect &&
+	git checkout -q main^0 &&
+	test-tool chmtime --get -3600 newfile >expect &&
 	git merge side &&
 	test-tool chmtime --get newfile >actual &&
 	test_cmp expect actual # "file" should have stayed intact
@@ -783,9 +855,11 @@ test_expect_success 'setup merge of rename + small change' '
 test_expect_success 'merge rename + small change' '
 	git merge rename_branch &&
 
-	test 1 -eq $(git ls-files -s | wc -l) &&
-	test 0 -eq $(git ls-files -o | wc -l) &&
-	test $(git rev-parse HEAD:renamed_file) = $(git rev-parse HEAD~1:file)
+	test_stdout_line_count = 1 git ls-files -s &&
+	test_stdout_line_count = 0 git ls-files -o &&
+	newhash=$(git rev-parse HEAD:renamed_file) &&
+	oldhash=$(git rev-parse HEAD~1:file) &&
+	test $newhash = $oldhash
 '
 
 test_expect_success 'setup for use of extended merge markers' '
@@ -804,54 +878,54 @@ test_expect_success 'setup for use of extended merge markers' '
 	git mv original_file renamed_file &&
 	git commit -mB &&
 
-	git checkout master &&
+	git checkout main &&
 	echo 8.5 >>original_file &&
 	git add original_file &&
 	git commit -mC
 '
 
-cat >expected <<\EOF &&
-1
-2
-3
-4
-5
-6
-7
-8
-<<<<<<< HEAD:renamed_file
-9
-=======
-8.5
->>>>>>> master^0:original_file
-EOF
-
-test_expect_success 'merge master into rename has correct extended markers' '
+test_expect_success 'merge main into rename has correct extended markers' '
 	git checkout rename^0 &&
-	test_must_fail git merge -s recursive master^0 &&
+	test_must_fail git merge -s recursive main^0 &&
+
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	<<<<<<< HEAD:renamed_file
+	9
+	=======
+	8.5
+	>>>>>>> main^0:original_file
+	EOF
 	test_cmp expected renamed_file
 '
 
-cat >expected <<\EOF &&
-1
-2
-3
-4
-5
-6
-7
-8
-<<<<<<< HEAD:original_file
-8.5
-=======
-9
->>>>>>> rename^0:renamed_file
-EOF
-
-test_expect_success 'merge rename into master has correct extended markers' '
+test_expect_success 'merge rename into main has correct extended markers' '
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	test_must_fail git merge -s recursive rename^0 &&
+
+	cat >expected <<-\EOF &&
+	1
+	2
+	3
+	4
+	5
+	6
+	7
+	8
+	<<<<<<< HEAD:original_file
+	8.5
+	=======
+	9
+	>>>>>>> rename^0:renamed_file
+	EOF
 	test_cmp expected renamed_file
 '
 
@@ -870,13 +944,13 @@ test_expect_success 'setup spurious "refusing to lose untracked" message' '
 	git mv original_file renamed_file &&
 	git commit -mB &&
 
-	git checkout master &&
+	git checkout main &&
 	git rm original_file &&
 	git commit -mC
 '
 
 test_expect_success 'no spurious "refusing to lose untracked" message' '
-	git checkout master^0 &&
+	git checkout main^0 &&
 	test_must_fail git merge rename^0 2>errors.txt &&
 	! grep "refusing to lose untracked file" errors.txt
 '
diff --git a/t/t6403-merge-file.sh b/t/t6403-merge-file.sh
new file mode 100755
index 0000000000..2f421d967a
--- /dev/null
+++ b/t/t6403-merge-file.sh
@@ -0,0 +1,390 @@
+#!/bin/sh
+
+test_description='RCS merge replacement: merge-file'
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	cat >orig.txt <<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	EOF
+
+	cat >new1.txt <<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	cat >new2.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	EOF
+
+	cat >new3.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	EOF
+
+	cat >new4.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	EOF
+
+	printf "propter nomen suum." >>new4.txt
+'
+
+test_expect_success 'merge with no changes' '
+	cp orig.txt test.txt &&
+	git merge-file test.txt orig.txt orig.txt &&
+	test_cmp test.txt orig.txt
+'
+
+test_expect_success "merge without conflict" '
+	cp new1.txt test.txt &&
+	git merge-file test.txt orig.txt new2.txt
+'
+
+test_expect_success 'works in subdirectory' '
+	mkdir dir &&
+	cp new1.txt dir/a.txt &&
+	cp orig.txt dir/o.txt &&
+	cp new2.txt dir/b.txt &&
+	( cd dir && git merge-file a.txt o.txt b.txt ) &&
+	test_path_is_missing a.txt
+'
+
+test_expect_success "merge without conflict (--quiet)" '
+	cp new1.txt test.txt &&
+	git merge-file --quiet test.txt orig.txt new2.txt
+'
+
+test_expect_failure "merge without conflict (missing LF at EOF)" '
+	cp new1.txt test2.txt &&
+	git merge-file test2.txt orig.txt new4.txt
+'
+
+test_expect_failure "merge result added missing LF" '
+	test_cmp test.txt test2.txt
+'
+
+test_expect_success "merge without conflict (missing LF at EOF, away from change in the other file)" '
+	cp new4.txt test3.txt &&
+	git merge-file --quiet test3.txt new2.txt new3.txt
+'
+
+test_expect_success "merge does not add LF away of change" '
+	cat >expect.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	EOF
+	printf "propter nomen suum." >>expect.txt &&
+
+	test_cmp expect.txt test3.txt
+'
+
+test_expect_success "merge with conflicts" '
+	cp test.txt backup.txt &&
+	test_must_fail git merge-file test.txt orig.txt new3.txt
+'
+
+test_expect_success "expected conflict markers" '
+	cat >expect.txt <<-\EOF &&
+	<<<<<<< test.txt
+	Dominus regit me, et nihil mihi deerit.
+	=======
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	>>>>>>> new3.txt
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_cmp expect.txt test.txt
+'
+
+test_expect_success "merge conflicting with --ours" '
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --ours test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+'
+
+test_expect_success "merge conflicting with --theirs" '
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --theirs test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+'
+
+test_expect_success "merge conflicting with --union" '
+	cp backup.txt test.txt &&
+
+	cat >expect.txt <<-\EOF &&
+	Dominus regit me, et nihil mihi deerit.
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	git merge-file --union test.txt orig.txt new3.txt &&
+	test_cmp expect.txt test.txt
+'
+
+test_expect_success "merge with conflicts, using -L" '
+	cp backup.txt test.txt &&
+
+	test_must_fail git merge-file -L 1 -L 2 test.txt orig.txt new3.txt
+'
+
+test_expect_success "expected conflict markers, with -L" '
+	cat >expect.txt <<-\EOF &&
+	<<<<<<< 1
+	Dominus regit me, et nihil mihi deerit.
+	=======
+	DOMINUS regit me,
+	et nihil mihi deerit.
+	>>>>>>> new3.txt
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam tu mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_cmp expect.txt test.txt
+'
+
+test_expect_success "conflict in removed tail" '
+	sed "s/ tu / TU /" <new1.txt >new5.txt &&
+	test_must_fail git merge-file -p orig.txt new1.txt new5.txt >out
+'
+
+test_expect_success "expected conflict markers" '
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	<<<<<<< orig.txt
+	=======
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	>>>>>>> new5.txt
+	EOF
+
+	test_cmp expect out
+'
+
+test_expect_success 'binary files cannot be merged' '
+	test_must_fail git merge-file -p \
+		orig.txt "$TEST_DIRECTORY"/test-binary-1.png new1.txt 2> merge.err &&
+	grep "Cannot merge binary files" merge.err
+'
+
+test_expect_success 'MERGE_ZEALOUS simplifies non-conflicts' '
+	sed -e "s/deerit.\$/deerit;/" -e "s/me;\$/me./" <new5.txt >new6.txt &&
+	sed -e "s/deerit.\$/deerit,/" -e "s/me;\$/me,/" <new5.txt >new7.txt &&
+
+	test_must_fail git merge-file -p new6.txt new5.txt new7.txt > output &&
+	test 1 = $(grep ======= <output | wc -l)
+'
+
+test_expect_success 'ZEALOUS_ALNUM' '
+	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit;/" <new6.txt | tr % "\012" >new8.txt &&
+	sed -e "s/deerit./&%%%%/" -e "s/locavit,/locavit --/" <new7.txt | tr % "\012" >new9.txt &&
+
+	test_must_fail git merge-file -p \
+		new8.txt new5.txt new9.txt >merge.out &&
+	test 1 = $(grep ======= <merge.out | wc -l)
+'
+
+test_expect_success '"diff3 -m" style output (1)' '
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	<<<<<<< new8.txt
+	et nihil mihi deerit;
+
+
+
+
+	In loco pascuae ibi me collocavit;
+	super aquam refectionis educavit me.
+	||||||| new5.txt
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	=======
+	et nihil mihi deerit,
+
+
+
+
+	In loco pascuae ibi me collocavit --
+	super aquam refectionis educavit me,
+	>>>>>>> new9.txt
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_must_fail git merge-file -p --diff3 \
+		new8.txt new5.txt new9.txt >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '"diff3 -m" style output (2)' '
+	git config merge.conflictstyle diff3 &&
+	test_must_fail git merge-file -p \
+		new8.txt new5.txt new9.txt >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'marker size' '
+	cat >expect <<-\EOF &&
+	Dominus regit me,
+	<<<<<<<<<< new8.txt
+	et nihil mihi deerit;
+
+
+
+
+	In loco pascuae ibi me collocavit;
+	super aquam refectionis educavit me.
+	|||||||||| new5.txt
+	et nihil mihi deerit.
+	In loco pascuae ibi me collocavit,
+	super aquam refectionis educavit me;
+	==========
+	et nihil mihi deerit,
+
+
+
+
+	In loco pascuae ibi me collocavit --
+	super aquam refectionis educavit me,
+	>>>>>>>>>> new9.txt
+	animam meam convertit,
+	deduxit me super semitas jusitiae,
+	propter nomen suum.
+	Nam et si ambulavero in medio umbrae mortis,
+	non timebo mala, quoniam TU mecum es:
+	virga tua et baculus tuus ipsa me consolata sunt.
+	EOF
+
+	test_must_fail git merge-file -p --marker-size=10 \
+		new8.txt new5.txt new9.txt >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'conflict at EOF without LF resolved by --ours' '
+	printf "line1\nline2\nline3" >nolf-orig.txt &&
+	printf "line1\nline2\nline3x" >nolf-diff1.txt &&
+	printf "line1\nline2\nline3y" >nolf-diff2.txt &&
+
+	git merge-file -p --ours nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3x" >expect.txt &&
+	test_cmp expect.txt output.txt
+'
+
+test_expect_success 'conflict at EOF without LF resolved by --theirs' '
+	git merge-file -p --theirs nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3y" >expect.txt &&
+	test_cmp expect.txt output.txt
+'
+
+test_expect_success 'conflict at EOF without LF resolved by --union' '
+	git merge-file -p --union nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >output.txt &&
+	printf "line1\nline2\nline3x\nline3y" >expect.txt &&
+	test_cmp expect.txt output.txt
+'
+
+test_expect_success 'conflict sections match existing line endings' '
+	printf "1\\r\\n2\\r\\n3" >crlf-orig.txt &&
+	printf "1\\r\\n2\\r\\n4" >crlf-diff1.txt &&
+	printf "1\\r\\n2\\r\\n5" >crlf-diff2.txt &&
+	test_must_fail git -c core.eol=crlf merge-file -p \
+		crlf-diff1.txt crlf-orig.txt crlf-diff2.txt >crlf.txt &&
+	test $(tr "\015" Q <crlf.txt | grep "^[<=>].*Q$" | wc -l) = 3 &&
+	test $(tr "\015" Q <crlf.txt | grep "[345]Q$" | wc -l) = 3 &&
+	test_must_fail git -c core.eol=crlf merge-file -p \
+		nolf-diff1.txt nolf-orig.txt nolf-diff2.txt >nolf.txt &&
+	test $(tr "\015" Q <nolf.txt | grep "^[<=>].*Q$" | wc -l) = 0
+'
+
+test_done
diff --git a/t/t6404-recursive-merge.sh b/t/t6404-recursive-merge.sh
new file mode 100755
index 0000000000..eaf48e941e
--- /dev/null
+++ b/t/t6404-recursive-merge.sh
@@ -0,0 +1,147 @@
+#!/bin/sh
+
+test_description='Test merge without common ancestors'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+# This scenario is based on a real-world repository of Shawn Pearce.
+
+# 1 - A - D - F
+#   \   X   /
+#     B   X
+#       X   \
+# 2 - C - E - G
+
+GIT_COMMITTER_DATE="2006-12-12 23:28:00 +0100"
+export GIT_COMMITTER_DATE
+
+test_expect_success 'setup tests' '
+	GIT_TEST_COMMIT_GRAPH=0 &&
+	export GIT_TEST_COMMIT_GRAPH &&
+	echo 1 >a1 &&
+	git add a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:00" git commit -m 1 a1 &&
+
+	git checkout -b A main &&
+	echo A >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:01" git commit -m A a1 &&
+
+	git checkout -b B main &&
+	echo B >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:02" git commit -m B a1 &&
+
+	git checkout -b D A &&
+	git rev-parse B >.git/MERGE_HEAD &&
+	echo D >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:03" git commit -m D &&
+
+	git symbolic-ref HEAD refs/heads/other &&
+	echo 2 >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:04" git commit -m 2 a1 &&
+
+	git checkout -b C &&
+	echo C >a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:05" git commit -m C a1 &&
+
+	git checkout -b E C &&
+	git rev-parse B >.git/MERGE_HEAD &&
+	echo E >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:06" git commit -m E &&
+
+	git checkout -b G E &&
+	git rev-parse A >.git/MERGE_HEAD &&
+	echo G >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:07" git commit -m G &&
+
+	git checkout -b F D &&
+	git rev-parse C >.git/MERGE_HEAD &&
+	echo F >a1 &&
+	git update-index a1 &&
+	GIT_AUTHOR_DATE="2006-12-12 23:00:08" git commit -m F &&
+
+	test_oid_cache <<-EOF
+	idxstage1 sha1:ec3fe2a791706733f2d8fa7ad45d9a9672031f5e
+	idxstage1 sha256:b3c8488929903aaebdeb22270cb6d36e5b8724b01ae0d4da24632f158c99676f
+	EOF
+'
+
+test_expect_success 'combined merge conflicts' '
+	test_must_fail git merge -m final G
+'
+
+test_expect_success 'result contains a conflict' '
+	cat >expect <<-\EOF &&
+	<<<<<<< HEAD
+	F
+	=======
+	G
+	>>>>>>> G
+	EOF
+
+	test_cmp expect a1
+'
+
+test_expect_success 'virtual trees were processed' '
+	# TODO: fragile test, relies on ambigious merge-base resolution
+	git ls-files --stage >out &&
+
+	cat >expect <<-EOF &&
+	100644 $(test_oid idxstage1) 1	a1
+	100644 $(git rev-parse F:a1) 2	a1
+	100644 $(git rev-parse G:a1) 3	a1
+	EOF
+
+	test_cmp expect out
+'
+
+test_expect_success 'refuse to merge binary files' '
+	git reset --hard &&
+	printf "\0" >binary-file &&
+	git add binary-file &&
+	git commit -m binary &&
+	git checkout G &&
+	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
+'
+
+test_expect_success 'mark rename/delete as unmerged' '
+
+	git reset --hard &&
+	git checkout -b delete &&
+	git rm a1 &&
+	test_tick &&
+	git commit -m delete &&
+	git checkout -b rename HEAD^ &&
+	git mv a1 a2 &&
+	test_tick &&
+	git commit -m rename &&
+	test_must_fail git merge delete &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test 2 = $(git ls-files --unmerged | wc -l)
+	else
+		test 1 = $(git ls-files --unmerged | wc -l)
+	fi &&
+	git rev-parse --verify :2:a2 &&
+	test_must_fail git rev-parse --verify :3:a2 &&
+	git checkout -f delete &&
+	test_must_fail git merge rename &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test 2 = $(git ls-files --unmerged | wc -l)
+	else
+		test 1 = $(git ls-files --unmerged | wc -l)
+	fi &&
+	test_must_fail git rev-parse --verify :2:a2 &&
+	git rev-parse --verify :3:a2
+'
+
+test_done
diff --git a/t/t6405-merge-symlinks.sh b/t/t6405-merge-symlinks.sh
new file mode 100755
index 0000000000..7435fce71e
--- /dev/null
+++ b/t/t6405-merge-symlinks.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# Copyright (c) 2007 Johannes Sixt
+#
+
+test_description='merging symlinks on filesystem w/o symlink support.
+
+This tests that git merge-recursive writes merge results as plain files
+if core.symlinks is false.'
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	git config core.symlinks false &&
+	>file &&
+	git add file &&
+	git commit -m initial &&
+	git branch b-symlink &&
+	git branch b-file &&
+	l=$(printf file | git hash-object -t blob -w --stdin) &&
+	echo "120000 $l	symlink" | git update-index --index-info &&
+	git commit -m main &&
+	git checkout b-symlink &&
+	l=$(printf file-different | git hash-object -t blob -w --stdin) &&
+	echo "120000 $l	symlink" | git update-index --index-info &&
+	git commit -m b-symlink &&
+	git checkout b-file &&
+	echo plain-file >symlink &&
+	git add symlink &&
+	git commit -m b-file
+'
+
+test_expect_success 'merge main into b-symlink, which has a different symbolic link' '
+	git checkout b-symlink &&
+	test_must_fail git merge main
+'
+
+test_expect_success 'the merge result must be a file' '
+	test_path_is_file symlink
+'
+
+test_expect_success 'merge main into b-file, which has a file instead of a symbolic link' '
+	git reset --hard &&
+	git checkout b-file &&
+	test_must_fail git merge main
+'
+
+test_expect_success 'the merge result must be a file' '
+	test_path_is_file symlink
+'
+
+test_expect_success 'merge b-file, which has a file instead of a symbolic link, into main' '
+	git reset --hard &&
+	git checkout main &&
+	test_must_fail git merge b-file
+'
+
+test_expect_success 'the merge result must be a file' '
+	test_path_is_file symlink
+'
+
+test_done
diff --git a/t/t6026-merge-attr.sh b/t/t6406-merge-attr.sh
index 8f9b48a493..8494645837 100755
--- a/t/t6026-merge-attr.sh
+++ b/t/t6406-merge-attr.sh
@@ -5,6 +5,9 @@
 
 test_description='per path merge controlled by merge attribute'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -19,10 +22,10 @@ test_expect_success setup '
 	git branch side &&
 	for f in text binary union
 	do
-		echo Master >>$f && git add $f || return 1
+		echo Main >>$f && git add $f || return 1
 	done &&
 	test_tick &&
-	git commit -m Master &&
+	git commit -m Main &&
 
 	git checkout side &&
 	for f in text binary union
@@ -32,7 +35,29 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m Side &&
 
-	git tag anchor
+	git tag anchor &&
+
+	cat >./custom-merge <<-\EOF &&
+	#!/bin/sh
+
+	orig="$1" ours="$2" theirs="$3" exit="$4" path=$5
+	(
+		echo "orig is $orig"
+		echo "ours is $ours"
+		echo "theirs is $theirs"
+		echo "path is $path"
+		echo "=== orig ==="
+		cat "$orig"
+		echo "=== ours ==="
+		cat "$ours"
+		echo "=== theirs ==="
+		cat "$theirs"
+	) >"$ours+"
+	cat "$ours+" >"$ours"
+	rm -f "$ours+"
+	exit "$exit"
+	EOF
+	chmod +x ./custom-merge
 '
 
 test_expect_success merge '
@@ -42,7 +67,7 @@ test_expect_success merge '
 		echo "union merge=union"
 	} >.gitattributes &&
 
-	if git merge master
+	if git merge main
 	then
 		echo Gaah, should have conflicted
 		false
@@ -65,7 +90,7 @@ test_expect_success 'check merge result in working tree' '
 	grep "<<<<<<<" text &&
 	cmp binary-orig binary &&
 	! grep "<<<<<<<" union &&
-	grep Master union &&
+	grep Main union &&
 	grep Side union
 
 '
@@ -82,28 +107,6 @@ test_expect_success 'retry the merge with longer context' '
 	grep "<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" actual
 '
 
-cat >./custom-merge <<\EOF
-#!/bin/sh
-
-orig="$1" ours="$2" theirs="$3" exit="$4" path=$5
-(
-	echo "orig is $orig"
-	echo "ours is $ours"
-	echo "theirs is $theirs"
-	echo "path is $path"
-	echo "=== orig ==="
-	cat "$orig"
-	echo "=== ours ==="
-	cat "$ours"
-	echo "=== theirs ==="
-	cat "$theirs"
-) >"$ours+"
-cat "$ours+" >"$ours"
-rm -f "$ours+"
-exit "$exit"
-EOF
-chmod +x ./custom-merge
-
 test_expect_success 'custom merge backend' '
 
 	echo "* merge=union" >.gitattributes &&
@@ -115,14 +118,14 @@ test_expect_success 'custom merge backend' '
 	git config --replace-all \
 	merge.custom.name "custom merge driver for testing" &&
 
-	git merge master &&
+	git merge main &&
 
 	cmp binary union &&
 	sed -e 1,3d text >check-1 &&
-	o=$(git unpack-file master^:text) &&
+	o=$(git unpack-file main^:text) &&
 	a=$(git unpack-file side^:text) &&
-	b=$(git unpack-file master:text) &&
-	sh -c "./custom-merge $o $a $b 0 'text'" &&
+	b=$(git unpack-file main:text) &&
+	sh -c "./custom-merge $o $a $b 0 text" &&
 	sed -e 1,3d $a >check-2 &&
 	cmp check-1 check-2 &&
 	rm -f $o $a $b
@@ -136,7 +139,7 @@ test_expect_success 'custom merge backend' '
 	git config --replace-all \
 	merge.custom.name "custom merge driver for testing" &&
 
-	if git merge master
+	if git merge main
 	then
 		echo "Eh? should have conflicted"
 		false
@@ -146,10 +149,10 @@ test_expect_success 'custom merge backend' '
 
 	cmp binary union &&
 	sed -e 1,3d text >check-1 &&
-	o=$(git unpack-file master^:text) &&
+	o=$(git unpack-file main^:text) &&
 	a=$(git unpack-file anchor:text) &&
-	b=$(git unpack-file master:text) &&
-	sh -c "./custom-merge $o $a $b 0 'text'" &&
+	b=$(git unpack-file main:text) &&
+	sh -c "./custom-merge $o $a $b 0 text" &&
 	sed -e 1,3d $a >check-2 &&
 	cmp check-1 check-2 &&
 	sed -e 1,3d -e 4q $a >check-3 &&
@@ -176,7 +179,7 @@ test_expect_success 'up-to-date merge without common ancestor' '
 	test_tick &&
 	(
 		cd repo1 &&
-		git fetch ../repo2 master &&
+		git fetch ../repo2 main &&
 		git merge --allow-unrelated-histories FETCH_HEAD
 	)
 '
@@ -201,7 +204,25 @@ test_expect_success 'custom merge does not lock index' '
 	# By packaging the command in test_when_finished, we get both
 	# the correctness check and the clean-up.
 	test_when_finished "kill \$(cat sleep.pid)" &&
-	git merge master
+	git merge main
+'
+
+test_expect_success 'binary files with union attribute' '
+	git checkout -b bin-main &&
+	printf "base\0" >bin.txt &&
+	echo "bin.txt merge=union" >.gitattributes &&
+	git add bin.txt .gitattributes &&
+	git commit -m base &&
+
+	printf "one\0" >bin.txt &&
+	git commit -am one &&
+
+	git checkout -b bin-side HEAD^ &&
+	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
 '
 
 test_done
diff --git a/t/t6027-merge-binary.sh b/t/t6407-merge-binary.sh
index 4e6c7cb77e..d4273f2575 100755
--- a/t/t6027-merge-binary.sh
+++ b/t/t6407-merge-binary.sh
@@ -2,6 +2,9 @@
 
 test_description='ask merge-recursive to merge binary files'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -20,7 +23,7 @@ test_expect_success setup '
 	git ls-files -s a >E0 &&
 	git ls-files -s m | sed -e "s/ 0	/ 3	/" >E3 &&
 	test_tick &&
-	git commit -m "master adds some" &&
+	git commit -m "main adds some" &&
 
 	git checkout side &&
 	echo rezrov >>m &&
@@ -39,7 +42,7 @@ test_expect_success resolve '
 	rm -f a* m* &&
 	git reset --hard anchor &&
 
-	if git merge -s resolve master
+	if git merge -s resolve main
 	then
 		echo Oops, should not have succeeded
 		false
@@ -54,7 +57,7 @@ test_expect_success recursive '
 	rm -f a* m* &&
 	git reset --hard anchor &&
 
-	if git merge -s recursive master
+	if git merge -s recursive main
 	then
 		echo Oops, should not have succeeded
 		false
diff --git a/t/t6028-merge-up-to-date.sh b/t/t6408-merge-up-to-date.sh
index 7763c1ba98..7763c1ba98 100755
--- a/t/t6028-merge-up-to-date.sh
+++ b/t/t6408-merge-up-to-date.sh
diff --git a/t/t6029-merge-subtree.sh b/t/t6409-merge-subtree.sh
index 793f0c8bf3..ba7890ec52 100755
--- a/t/t6029-merge-subtree.sh
+++ b/t/t6409-merge-subtree.sh
@@ -2,6 +2,9 @@
 
 test_description='subtree merge strategy'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -14,10 +17,10 @@ test_expect_success setup '
 	echo >>hello world &&
 	git add hello &&
 	git commit -m second &&
-	git checkout master &&
+	git checkout main &&
 	for i in mundo $s; do echo $i; done >hello &&
 	git add hello &&
-	git commit -m master
+	git commit -m main
 
 '
 
@@ -35,11 +38,11 @@ test_expect_success 'setup branch sub' '
 	test_commit foo
 '
 
-test_expect_success 'setup branch main' '
-	git checkout -b main master &&
+test_expect_success 'setup topic branch' '
+	git checkout -b topic main &&
 	git merge -s ours --no-commit --allow-unrelated-histories sub &&
 	git read-tree --prefix=dir/ -u sub &&
-	git commit -m "initial merge of sub into main" &&
+	git commit -m "initial merge of sub into topic" &&
 	test_path_is_file dir/foo.t &&
 	test_path_is_file hello
 '
@@ -49,9 +52,9 @@ test_expect_success 'update branch sub' '
 	test_commit bar
 '
 
-test_expect_success 'update branch main' '
-	git checkout main &&
-	git merge -s subtree sub -m "second merge of sub into main" &&
+test_expect_success 'update topic branch' '
+	git checkout topic &&
+	git merge -s subtree sub -m "second merge of sub into topic" &&
 	test_path_is_file dir/bar.t &&
 	test_path_is_file dir/foo.t &&
 	test_path_is_file hello
@@ -77,8 +80,8 @@ test_expect_success 'setup' '
 
 test_expect_success 'initial merge' '
 	git remote add -f gui ../git-gui &&
-	git merge -s ours --no-commit --allow-unrelated-histories gui/master &&
-	git read-tree --prefix=git-gui/ -u gui/master &&
+	git merge -s ours --no-commit --allow-unrelated-histories gui/main &&
+	git read-tree --prefix=git-gui/ -u gui/main &&
 	git commit -m "Merge git-gui as our subdirectory" &&
 	git checkout -b work &&
 	git ls-files -s >actual &&
@@ -94,10 +97,10 @@ test_expect_success 'merge update' '
 	echo git-gui2 > git-gui.sh &&
 	o3=$(git hash-object git-gui.sh) &&
 	git add git-gui.sh &&
-	git checkout -b master2 &&
+	git checkout -b topic_2 &&
 	git commit -m "update git-gui" &&
 	cd ../git &&
-	git pull -s subtree gui master2 &&
+	git pull --no-rebase -s subtree gui topic_2 &&
 	git ls-files -s >actual &&
 	(
 		echo "100644 $o3 0	git-gui/git-gui.sh" &&
@@ -108,10 +111,10 @@ test_expect_success 'merge update' '
 
 test_expect_success 'initial ambiguous subtree' '
 	cd ../git &&
-	git reset --hard master &&
-	git checkout -b master2 &&
-	git merge -s ours --no-commit gui/master &&
-	git read-tree --prefix=git-gui2/ -u gui/master &&
+	git reset --hard main &&
+	git checkout -b topic_2 &&
+	git merge -s ours --no-commit gui/main &&
+	git read-tree --prefix=git-gui2/ -u gui/main &&
 	git commit -m "Merge git-gui2 as our subdirectory" &&
 	git checkout -b work2 &&
 	git ls-files -s >actual &&
@@ -125,8 +128,8 @@ test_expect_success 'initial ambiguous subtree' '
 
 test_expect_success 'merge using explicit' '
 	cd ../git &&
-	git reset --hard master2 &&
-	git pull -Xsubtree=git-gui gui master2 &&
+	git reset --hard 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" &&
@@ -138,8 +141,8 @@ test_expect_success 'merge using explicit' '
 
 test_expect_success 'merge2 using explicit' '
 	cd ../git &&
-	git reset --hard master2 &&
-	git pull -Xsubtree=git-gui2 gui master2 &&
+	git reset --hard 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/t6031-merge-filemode.sh b/t/t6411-merge-filemode.sh
index 87741efad3..f54c915d6a 100755
--- a/t/t6031-merge-filemode.sh
+++ b/t/t6411-merge-filemode.sh
@@ -1,17 +1,20 @@
 #!/bin/sh
 
 test_description='merge: handle file mode'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'set up mode change in one branch' '
 	: >file1 &&
 	git add file1 &&
 	git commit -m initial &&
-	git checkout -b a1 master &&
+	git checkout -b a1 main &&
 	: >dummy &&
 	git add dummy &&
 	git commit -m a &&
-	git checkout -b b1 master &&
+	git checkout -b b1 main &&
 	test_chmod +x file1 &&
 	git add file1 &&
 	git commit -m b1
@@ -39,12 +42,12 @@ do_one_mode resolve b1 a1
 
 test_expect_success 'set up mode change in both branches' '
 	git reset --hard HEAD &&
-	git checkout -b a2 master &&
+	git checkout -b a2 main &&
 	: >file2 &&
 	H=$(git hash-object file2) &&
 	test_chmod +x file2 &&
 	git commit -m a2 &&
-	git checkout -b b2 master &&
+	git checkout -b b2 main &&
 	: >file2 &&
 	git add file2 &&
 	git commit -m b2 &&
@@ -76,7 +79,7 @@ do_both_modes resolve
 
 test_expect_success 'set up delete/modechange scenario' '
 	git reset --hard &&
-	git checkout -b deletion master &&
+	git checkout -b deletion main &&
 	git rm file1 &&
 	git commit -m deletion
 '
diff --git a/t/t6032-merge-large-rename.sh b/t/t6412-merge-large-rename.sh
index 80777386dc..c50d315722 100755
--- a/t/t6032-merge-large-rename.sh
+++ b/t/t6412-merge-large-rename.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='merging with large rename matrix'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 count() {
@@ -30,7 +33,7 @@ test_rename() {
 	test_expect_success "rename ($1, $2)" '
 	n='$1' &&
 	expect='$2' &&
-	git checkout -f master &&
+	git checkout -f main &&
 	test_might_fail git branch -D test$n &&
 	git reset --hard initial &&
 	for i in $(count $n); do
@@ -50,8 +53,8 @@ test_rename() {
 	git add . &&
 	git commit -m change+rename=$n &&
 	case "$expect" in
-		ok) git merge master ;;
-		 *) test_must_fail git merge master ;;
+		ok) git merge main ;;
+		 *) test_must_fail git merge main ;;
 	esac
 	'
 }
diff --git a/t/t6033-merge-crlf.sh b/t/t6413-merge-crlf.sh
index e8d65eefb5..affea255fe 100755
--- a/t/t6033-merge-crlf.sh
+++ b/t/t6413-merge-crlf.sh
@@ -8,6 +8,9 @@ test_description='merge conflict in crlf repo
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -24,7 +27,7 @@ test_expect_success setup '
 	echo line from b | append_cr >file &&
 	git commit -m "add line from b" file &&
 	git tag b &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'Check "ours" is CRLF' '
diff --git a/t/t6414-merge-rename-nocruft.sh b/t/t6414-merge-rename-nocruft.sh
new file mode 100755
index 0000000000..d7e3c1fa6e
--- /dev/null
+++ b/t/t6414-merge-rename-nocruft.sh
@@ -0,0 +1,100 @@
+#!/bin/sh
+
+test_description='Merge-recursive merging renames'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	cat >A <<-\EOF &&
+	a aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+	b bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
+	c cccccccccccccccccccccccccccccccccccccccccccccccc
+	d dddddddddddddddddddddddddddddddddddddddddddddddd
+	e eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee
+	f ffffffffffffffffffffffffffffffffffffffffffffffff
+	g gggggggggggggggggggggggggggggggggggggggggggggggg
+	h hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
+	i iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii
+	j jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj
+	k kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkk
+	l llllllllllllllllllllllllllllllllllllllllllllllll
+	m mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm
+	n nnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn
+	o oooooooooooooooooooooooooooooooooooooooooooooooo
+	EOF
+
+	cat >M <<-\EOF &&
+	A AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+	B BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB
+	C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
+	D DDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDDD
+	E EEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE
+	F FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF
+	G GGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGGG
+	H HHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
+	I IIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIIII
+	J JJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJJ
+	K KKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKKK
+	L LLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLLL
+	M MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM
+	N NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN
+	O OOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
+	EOF
+
+	git add A M &&
+	git commit -m "initial has A and M" &&
+	git branch white &&
+	git branch red &&
+	git branch blue &&
+
+	git checkout white &&
+	sed -e "/^g /s/.*/g : white changes a line/" <A >B &&
+	sed -e "/^G /s/.*/G : colored branch changes a line/" <M >N &&
+	rm -f A M &&
+	git update-index --add --remove A B M N &&
+	git commit -m "white renames A->B, M->N" &&
+
+	git checkout red &&
+	echo created by red >R &&
+	git update-index --add R &&
+	git commit -m "red creates R" &&
+
+	git checkout blue &&
+	sed -e "/^o /s/.*/g : blue changes a line/" <A >B &&
+	rm -f A &&
+	mv B A &&
+	git update-index A &&
+	git commit -m "blue modify A" &&
+
+	git checkout main
+'
+
+# This test broke in 65ac6e9c3f47807cb603af07a6a9e1a43bc119ae
+test_expect_success 'merge white into red (A->B,M->N)' '
+	git checkout -b red-white red &&
+	git merge white &&
+	git write-tree &&
+	test_path_is_file B &&
+	test_path_is_file N &&
+	test_path_is_file R &&
+	test_path_is_missing A &&
+	test_path_is_missing M
+'
+
+# This test broke in 8371234ecaaf6e14fe3f2082a855eff1bbd79ae9
+test_expect_success 'merge blue into white (A->B, mod A, A untracked)' '
+	git checkout -b white-blue white &&
+	echo dirty >A &&
+	git merge blue &&
+	git write-tree &&
+	test_path_is_file A &&
+	echo dirty >expect &&
+	test_cmp expect A &&
+	test_path_is_file B &&
+	test_path_is_file N &&
+	test_path_is_missing M
+'
+
+test_done
diff --git a/t/t6035-merge-dir-to-symlink.sh b/t/t6415-merge-dir-to-symlink.sh
index 9324ea4416..2ce104aca7 100755
--- a/t/t6035-merge-dir-to-symlink.sh
+++ b/t/t6415-merge-dir-to-symlink.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='merging when a directory was replaced with a symlink'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'create a commit where dir a/b changed to symlink' '
@@ -19,7 +22,7 @@ test_expect_success 'create a commit where dir a/b changed to symlink' '
 
 test_expect_success 'checkout does not clobber untracked symlink' '
 	git checkout HEAD^0 &&
-	git reset --hard master &&
+	git reset --hard main &&
 	git rm --cached a/b &&
 	git commit -m "untracked symlink remains" &&
 	test_must_fail git checkout start^0
@@ -27,23 +30,23 @@ test_expect_success 'checkout does not clobber untracked symlink' '
 
 test_expect_success 'a/b-2/c/d is kept when clobbering symlink b' '
 	git checkout HEAD^0 &&
-	git reset --hard master &&
+	git reset --hard main &&
 	git rm --cached a/b &&
 	git commit -m "untracked symlink remains" &&
 	git checkout -f start^0 &&
-	test -f a/b-2/c/d
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'checkout should not have deleted a/b-2/c/d' '
 	git checkout HEAD^0 &&
-	git reset --hard master &&
+	git reset --hard main &&
 	 git checkout start^0 &&
-	 test -f a/b-2/c/d
+	 test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'setup for merge test' '
 	git reset --hard &&
-	test -f a/b-2/c/d &&
+	test_path_is_file a/b-2/c/d &&
 	echo x > a/x &&
 	git add a/x &&
 	git commit -m x &&
@@ -53,8 +56,8 @@ test_expect_success 'setup for merge test' '
 test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (resolve)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
-	git merge -s resolve master &&
-	test -f a/b-2/c/d
+	git merge -s resolve main &&
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -64,8 +67,8 @@ test_expect_success SYMLINKS 'a/b was resolved as symlink' '
 test_expect_success 'Handle D/F conflict, do not lose a/b-2/c/d in merge (recursive)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
-	git merge -s recursive master &&
-	test -f a/b-2/c/d
+	git merge -s recursive main &&
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -74,9 +77,9 @@ test_expect_success SYMLINKS 'a/b was resolved as symlink' '
 
 test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (resolve)' '
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	git merge -s resolve baseline^0 &&
-	test -f a/b-2/c/d
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -85,9 +88,9 @@ test_expect_success SYMLINKS 'a/b was resolved as symlink' '
 
 test_expect_success 'Handle F/D conflict, do not lose a/b-2/c/d in merge (recursive)' '
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	git merge -s recursive baseline^0 &&
-	test -f a/b-2/c/d
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success SYMLINKS 'a/b was resolved as symlink' '
@@ -98,32 +101,32 @@ test_expect_failure 'do not lose untracked in merge (resolve)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
 	>a/b/c/e &&
-	test_must_fail git merge -s resolve master &&
-	test -f a/b/c/e &&
-	test -f a/b-2/c/d
+	test_must_fail git merge -s resolve main &&
+	test_path_is_file a/b/c/e &&
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'do not lose untracked in merge (recursive)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
 	>a/b/c/e &&
-	test_must_fail git merge -s recursive master &&
-	test -f a/b/c/e &&
-	test -f a/b-2/c/d
+	test_must_fail git merge -s recursive main &&
+	test_path_is_file a/b/c/e &&
+	test_path_is_file a/b-2/c/d
 '
 
 test_expect_success 'do not lose modifications in merge (resolve)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
 	echo more content >>a/b/c/d &&
-	test_must_fail git merge -s resolve master
+	test_must_fail git merge -s resolve main
 '
 
 test_expect_success 'do not lose modifications in merge (recursive)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
 	echo more content >>a/b/c/d &&
-	test_must_fail git merge -s recursive master
+	test_must_fail git merge -s recursive main
 '
 
 test_expect_success 'setup a merge where dir a/b-2 changed to symlink' '
@@ -140,7 +143,7 @@ test_expect_success 'merge should not have D/F conflicts (resolve)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
 	git merge -s resolve test2 &&
-	test -f a/b/c/d
+	test_path_is_file a/b/c/d
 '
 
 test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
@@ -151,7 +154,7 @@ test_expect_success 'merge should not have D/F conflicts (recursive)' '
 	git reset --hard &&
 	git checkout baseline^0 &&
 	git merge -s recursive test2 &&
-	test -f a/b/c/d
+	test_path_is_file a/b/c/d
 '
 
 test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
@@ -162,7 +165,7 @@ test_expect_success 'merge should not have F/D conflicts (recursive)' '
 	git reset --hard &&
 	git checkout -b foo test2 &&
 	git merge -s recursive baseline^0 &&
-	test -f a/b/c/d
+	test_path_is_file a/b/c/d
 '
 
 test_expect_success SYMLINKS 'a/b-2 was resolved as symlink' '
diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6416-recursive-corner-cases.sh
index 7fddcc8c73..84f5082366 100755
--- a/t/t6036-recursive-corner-cases.sh
+++ b/t/t6416-recursive-corner-cases.sh
@@ -2,7 +2,11 @@
 
 test_description='recursive merge corner cases involving criss-cross merges'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
 
 #
 #  L1  L2
@@ -60,9 +64,9 @@ test_expect_success 'merge simple rename+criss-cross with no modifications' '
 		test_must_fail git merge -s recursive R2^0 &&
 
 		git ls-files -s >out &&
-		test_line_count = 2 out &&
+		test_line_count = 5 out &&
 		git ls-files -u >out &&
-		test_line_count = 2 out &&
+		test_line_count = 3 out &&
 		git ls-files -o >out &&
 		test_line_count = 1 out &&
 
@@ -133,9 +137,9 @@ test_expect_success 'merge criss-cross + rename merges with basic modification'
 		test_must_fail git merge -s recursive R2^0 &&
 
 		git ls-files -s >out &&
-		test_line_count = 2 out &&
+		test_line_count = 5 out &&
 		git ls-files -u >out &&
-		test_line_count = 2 out &&
+		test_line_count = 3 out &&
 		git ls-files -o >out &&
 		test_line_count = 1 out &&
 
@@ -218,8 +222,18 @@ test_expect_success 'git detects differently handled merges conflict' '
 		git ls-files -o >out &&
 		test_line_count = 1 out &&
 
-		git rev-parse >expect       \
-			C:new_a  D:new_a  E:new_a &&
+		git cat-file -p C:new_a >ours &&
+		git cat-file -p C:a >theirs &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "Temporary merge branch 1" \
+			-L "" \
+			-L "Temporary merge branch 2" \
+			ours empty theirs &&
+		sed -e "s/^\([<=>]\)/\1\1\1/" ours >ours-tweaked &&
+		git hash-object ours-tweaked >expect &&
+		git rev-parse >>expect      \
+				  D:new_a  E:new_a &&
 		git rev-parse   >actual     \
 			:1:new_a :2:new_a :3:new_a &&
 		test_cmp expect actual &&
@@ -257,7 +271,8 @@ test_expect_success 'git detects differently handled merges conflict, swapped' '
 		ctime=$(git log --no-walk --date=raw --format=%cd C | awk "{print \$1}") &&
 		newctime=$(($btime+1)) &&
 		git fast-export --no-data --all | sed -e s/$ctime/$newctime/ | git fast-import --force --quiet &&
-		# End of differences; rest is copy-paste of last test
+		# End of most differences; rest is copy-paste of last test,
+		# other than swapping C:a and C:new_a due to order switch
 
 		git checkout D^0 &&
 		test_must_fail git merge -s recursive E^0 &&
@@ -269,8 +284,18 @@ test_expect_success 'git detects differently handled merges conflict, swapped' '
 		git ls-files -o >out &&
 		test_line_count = 1 out &&
 
-		git rev-parse >expect       \
-			C:new_a  D:new_a  E:new_a &&
+		git cat-file -p C:a >ours &&
+		git cat-file -p C:new_a >theirs &&
+		>empty &&
+		test_must_fail git merge-file \
+			-L "Temporary merge branch 1" \
+			-L "" \
+			-L "Temporary merge branch 2" \
+			ours empty theirs &&
+		sed -e "s/^\([<=>]\)/\1\1\1/" ours >ours-tweaked &&
+		git hash-object ours-tweaked >expect &&
+		git rev-parse >>expect      \
+				  D:new_a  E:new_a &&
 		git rev-parse   >actual     \
 			:1:new_a :2:new_a :3:new_a &&
 		test_cmp expect actual &&
@@ -363,7 +388,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete' '
 		test_line_count = 2 out &&
 
 		git rev-parse >expect       \
-			master:file  B:file &&
+			main:file    B:file &&
 		git rev-parse   >actual      \
 			:1:file      :2:file &&
 		test_cmp expect actual
@@ -385,7 +410,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
 		test_line_count = 2 out &&
 
 		git rev-parse >expect       \
-			master:file  B:file &&
+			main:file    B:file &&
 		git rev-parse   >actual      \
 			:1:file      :3:file &&
 		test_cmp expect actual
@@ -431,7 +456,7 @@ test_expect_success 'git detects conflict merging criss-cross+modify/delete, rev
 #
 # So choice 5 at least provides some kind of conflict for the original case,
 # and can merge cleanly as expected with D1 and E3.  It also made things just
-# slightly funny for merging D1 and e$, where E4 is defined as:
+# slightly funny for merging D1 and E4, where E4 is defined as:
 #   Commit E4: Merge B & C, modifying 'a' and renaming to 'a2', and deleting 'a/'
 # in this case, we'll get a rename/rename(1to2) conflict because a~$UNIQUE
 # gets renamed to 'a' in D1 and to 'a2' in E4.  But that's better than having
@@ -516,9 +541,15 @@ test_expect_success 'setup differently handled merges of directory/file conflict
 
 		git checkout B^0 &&
 		test_must_fail git merge C^0 &&
-		git clean -fd &&
-		git rm -rf a/ &&
-		git rm a &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git rm -rf a/ &&
+			git rm a~HEAD
+		else
+			git clean -fd &&
+			git rm -rf a/ &&
+			git rm a
+		fi &&
 		git cat-file -p B:a >a2 &&
 		git add a2 &&
 		git commit -m D2 &&
@@ -537,7 +568,12 @@ test_expect_success 'setup differently handled merges of directory/file conflict
 
 		git checkout C^0 &&
 		test_must_fail git merge B^0 &&
-		git clean -fd &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git rm a~B^0
+		else
+			git clean -fd
+		fi &&
 		git rm -rf a/ &&
 		test_write_lines 1 2 3 4 5 6 7 8 >a &&
 		git add a &&
@@ -546,9 +582,15 @@ test_expect_success 'setup differently handled merges of directory/file conflict
 
 		git checkout C^0 &&
 		test_must_fail git merge B^0 &&
-		git clean -fd &&
-		git rm -rf a/ &&
-		git rm a &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git rm -rf a/ &&
+			git rm a~B^0
+		else
+			git clean -fd &&
+			git rm -rf a/ &&
+			git rm a
+		fi &&
 		test_write_lines 1 2 3 4 5 6 7 8 >a2 &&
 		git add a2 &&
 		git commit -m E4 &&
@@ -566,18 +608,34 @@ test_expect_success 'merge of D1 & E1 fails but has appropriate contents' '
 
 		test_must_fail git merge -s recursive E1^0 &&
 
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >expect    \
-			A:ignore-me  B:a &&
-		git rev-parse   >actual   \
-			:0:ignore-me :2:a &&
-		test_cmp expect actual
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git ls-files -s >out &&
+			test_line_count = 3 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >expect    \
+				A:ignore-me  B:a  D1:a &&
+			git rev-parse   >actual   \
+				:0:ignore-me :1:a :2:a &&
+			test_cmp expect actual
+		else
+			git ls-files -s >out &&
+			test_line_count = 2 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >expect    \
+				A:ignore-me  B:a &&
+			git rev-parse   >actual   \
+				:0:ignore-me :2:a &&
+			test_cmp expect actual
+		fi
 	)
 '
 
@@ -591,18 +649,34 @@ test_expect_success 'merge of E1 & D1 fails but has appropriate contents' '
 
 		test_must_fail git merge -s recursive D1^0 &&
 
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >expect    \
-			A:ignore-me  B:a &&
-		git rev-parse   >actual   \
-			:0:ignore-me :3:a &&
-		test_cmp expect actual
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git ls-files -s >out &&
+			test_line_count = 3 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >expect    \
+				A:ignore-me  B:a  D1:a &&
+			git rev-parse   >actual   \
+				:0:ignore-me :1:a :3:a &&
+			test_cmp expect actual
+		else
+			git ls-files -s >out &&
+			test_line_count = 2 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >expect    \
+				A:ignore-me  B:a &&
+			git rev-parse   >actual   \
+				:0:ignore-me :3:a &&
+			test_cmp expect actual
+		fi
 	)
 '
 
@@ -616,17 +690,32 @@ test_expect_success 'merge of D1 & E2 fails but has appropriate contents' '
 
 		test_must_fail git merge -s recursive E2^0 &&
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 2 out &&
-
-		git rev-parse >expect    \
-			B:a   E2:a/file  C:a/file   A:ignore-me &&
-		git rev-parse   >actual   \
-			:2:a  :3:a/file  :1:a/file  :0:ignore-me &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git ls-files -s >out &&
+			test_line_count = 5 out &&
+			git ls-files -u >out &&
+			test_line_count = 4 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >expect    \
+				B:a       D1:a      E2:a/file  C:a/file   A:ignore-me &&
+			git rev-parse   >actual   \
+				:1:a~HEAD :2:a~HEAD :3:a/file  :1:a/file  :0:ignore-me
+		else
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 3 out &&
+			git ls-files -o >out &&
+			test_line_count = 2 out &&
+
+			git rev-parse >expect    \
+				B:a    E2:a/file  C:a/file   A:ignore-me &&
+			git rev-parse   >actual   \
+				:2:a   :3:a/file  :1:a/file  :0:ignore-me
+		fi &&
 		test_cmp expect actual &&
 
 		test_path_is_file a~HEAD
@@ -643,17 +732,32 @@ test_expect_success 'merge of E2 & D1 fails but has appropriate contents' '
 
 		test_must_fail git merge -s recursive D1^0 &&
 
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 2 out &&
-
-		git rev-parse >expect    \
-			B:a   E2:a/file  C:a/file   A:ignore-me &&
-		git rev-parse   >actual   \
-			:3:a  :2:a/file  :1:a/file  :0:ignore-me &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git ls-files -s >out &&
+			test_line_count = 5 out &&
+			git ls-files -u >out &&
+			test_line_count = 4 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >expect    \
+				B:a       D1:a      E2:a/file  C:a/file   A:ignore-me &&
+			git rev-parse   >actual   \
+				:1:a~D1^0 :3:a~D1^0 :2:a/file  :1:a/file  :0:ignore-me
+		else
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 3 out &&
+			git ls-files -o >out &&
+			test_line_count = 2 out &&
+
+			git rev-parse >expect    \
+				B:a   E2:a/file  C:a/file   A:ignore-me &&
+			git rev-parse   >actual   \
+				:3:a  :2:a/file  :1:a/file  :0:ignore-me
+		fi &&
 		test_cmp expect actual &&
 
 		test_path_is_file a~D1^0
@@ -685,7 +789,7 @@ test_expect_success 'merge of D1 & E3 succeeds' '
 	)
 '
 
-test_expect_success 'merge of D1 & E4 notifies user a and a2 are related' '
+test_expect_merge_algorithm failure success 'merge of D1 & E4 puts merge of a and a2 in both a and a2' '
 	test_when_finished "git -C directory-file reset --hard" &&
 	test_when_finished "git -C directory-file clean -fdqx" &&
 	(
@@ -703,7 +807,7 @@ test_expect_success 'merge of D1 & E4 notifies user a and a2 are related' '
 		test_line_count = 1 out &&
 
 		git rev-parse >expect                  \
-			A:ignore-me  B:a   D1:a  E4:a2 &&
+			A:ignore-me  B:a   E4:a2  E4:a2 &&
 		git rev-parse   >actual                \
 			:0:ignore-me :1:a~Temporary\ merge\ branch\ 2  :2:a  :3:a2 &&
 		test_cmp expect actual
@@ -1048,7 +1152,7 @@ test_expect_success 'setup symlink modify/modify' '
 	)
 '
 
-test_expect_failure 'check symlink modify/modify' '
+test_expect_merge_algorithm failure success 'check symlink modify/modify' '
 	(
 		cd symlink-modify-modify &&
 
@@ -1114,7 +1218,7 @@ test_expect_success 'setup symlink add/add' '
 	)
 '
 
-test_expect_failure 'check symlink add/add' '
+test_expect_merge_algorithm failure success 'check symlink add/add' '
 	(
 		cd symlink-add-add &&
 
@@ -1123,7 +1227,7 @@ test_expect_failure 'check symlink add/add' '
 		test_must_fail git merge -s recursive E^0 &&
 
 		git ls-files -s >out &&
-		test_line_count = 2 out &&
+		test_line_count = 3 out &&
 		git ls-files -u >out &&
 		test_line_count = 2 out &&
 		git ls-files -o >out &&
@@ -1202,7 +1306,7 @@ test_expect_success 'setup submodule modify/modify' '
 	)
 '
 
-test_expect_failure 'check submodule modify/modify' '
+test_expect_merge_algorithm failure success 'check submodule modify/modify' '
 	(
 		cd submodule-modify-modify &&
 
@@ -1290,7 +1394,7 @@ test_expect_success 'setup submodule add/add' '
 	)
 '
 
-test_expect_failure 'check submodule add/add' '
+test_expect_merge_algorithm failure success 'check submodule add/add' '
 	(
 		cd submodule-add-add &&
 
@@ -1365,7 +1469,7 @@ test_expect_success 'setup conflicting entry types (submodule vs symlink)' '
 	)
 '
 
-test_expect_failure 'check conflicting entry types (submodule vs symlink)' '
+test_expect_merge_algorithm failure success 'check conflicting entry types (submodule vs symlink)' '
 	(
 		cd submodule-symlink-add-add &&
 
@@ -1452,12 +1556,12 @@ test_expect_failure 'check conflicting modes for regular file' '
 # Setup:
 #          L1---L2
 #         /  \ /  \
-#   master    X    ?
+#     main    X    ?
 #         \  / \  /
 #          R1---R2
 #
 # Where:
-#   master has two files, named 'b' and 'a'
+#   main has two files, named 'b' and 'a'
 #   branches L1 and R1 both modify each of the two files in conflicting ways
 #
 #   L2 is a merge of R1 into L1; more on it later.
@@ -1532,7 +1636,7 @@ test_expect_success 'setup nested conflicts' '
 		mv -f b_R1 b &&
 		mv -f a_R1 a &&
 		git add b a &&
-		test_tick && git commit -m "verson R1 of files" &&
+		test_tick && git commit -m "version R1 of files" &&
 		git tag R1 &&
 
 		# Create first merge on left side
@@ -1562,7 +1666,7 @@ test_expect_success 'check nested conflicts' '
 		cd nested_conflicts &&
 
 		git clean -f &&
-		MASTER=$(git rev-parse --short master) &&
+		MAIN=$(git rev-parse --short main) &&
 		git checkout L2^0 &&
 
 		# Merge must fail; there is a conflict
@@ -1578,24 +1682,24 @@ test_expect_success 'check nested conflicts' '
 		test_line_count = 1 out &&
 
 		# Create a and b from virtual merge base X
-		git cat-file -p master:a >base &&
+		git cat-file -p main:a >base &&
 		git cat-file -p L1:a >ours &&
 		git cat-file -p R1:a >theirs &&
 		test_must_fail git merge-file --diff3 \
 			-L "Temporary merge branch 1" \
-			-L "$MASTER"  \
+			-L "$MAIN"  \
 			-L "Temporary merge branch 2" \
 			ours  \
 			base  \
 			theirs &&
 		sed -e "s/^\([<|=>]\)/\1\1/" ours >vmb_a &&
 
-		git cat-file -p master:b >base &&
+		git cat-file -p main:b >base &&
 		git cat-file -p L1:b >ours &&
 		git cat-file -p R1:b >theirs &&
 		test_must_fail git merge-file --diff3 \
 			-L "Temporary merge branch 1" \
-			-L "$MASTER"  \
+			-L "$MAIN"  \
 			-L "Temporary merge branch 2" \
 			ours  \
 			base  \
@@ -1647,12 +1751,12 @@ test_expect_success 'check nested conflicts' '
 # Setup:
 #          L1---L2---L3
 #         /  \ /  \ /  \
-#   master    X1   X2   ?
+#     main    X1   X2   ?
 #         \  / \  / \  /
 #          R1---R2---R3
 #
 # Where:
-#   master has one file named 'content'
+#   main has one file named 'content'
 #   branches L1 and R1 both modify each of the two files in conflicting ways
 #
 #   L<n> (n>1) is a merge of R<n-1> into L<n-1>
@@ -1696,7 +1800,7 @@ test_expect_success 'setup virtual merge base with nested conflicts' '
 		git checkout R &&
 		echo right >>content &&
 		git add content &&
-		test_tick && git commit -m "verson R1 of content" &&
+		test_tick && git commit -m "version R1 of content" &&
 		git tag R1 &&
 
 		# Create L2
@@ -1733,7 +1837,7 @@ test_expect_success 'check virtual merge base with nested conflicts' '
 	(
 		cd virtual_merge_base_has_nested_conflicts &&
 
-		MASTER=$(git rev-parse --short master) &&
+		MAIN=$(git rev-parse --short main) &&
 		git checkout L3^0 &&
 
 		# Merge must fail; there is a conflict
@@ -1756,13 +1860,13 @@ test_expect_success 'check virtual merge base with nested conflicts' '
 		# Imitate X1 merge base, except without long enough conflict
 		# markers because a subsequent sed will modify them.  Put
 		# result into vmb.
-		git cat-file -p master:content >base &&
+		git cat-file -p main:content >base &&
 		git cat-file -p L:content >left &&
 		git cat-file -p R:content >right &&
 		cp left merged-once &&
 		test_must_fail git merge-file --diff3 \
 			-L "Temporary merge branch 1" \
-			-L "$MASTER"  \
+			-L "$MAIN"  \
 			-L "Temporary merge branch 2" \
 			merged-once \
 			base        \
diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6417-merge-ours-theirs.sh
index 0aebc6c028..ec065d6a65 100755
--- a/t/t6037-merge-ours-theirs.sh
+++ b/t/t6417-merge-ours-theirs.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Merge-recursive ours and theirs variants'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -20,11 +23,11 @@ test_expect_success setup '
 	sed -e "s/9/nueve/" >file <elif &&
 	git commit -a -m theirs &&
 
-	git checkout master^0
+	git checkout main^0
 '
 
 test_expect_success 'plain recursive - should conflict' '
-	git reset --hard master &&
+	git reset --hard main &&
 	test_must_fail git merge -s recursive side &&
 	grep nine file &&
 	grep nueve file &&
@@ -34,7 +37,7 @@ test_expect_success 'plain recursive - should conflict' '
 '
 
 test_expect_success 'recursive favouring theirs' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git merge -s recursive -Xtheirs side &&
 	! grep nine file &&
 	grep nueve file &&
@@ -44,7 +47,7 @@ test_expect_success 'recursive favouring theirs' '
 '
 
 test_expect_success 'recursive favouring ours' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git merge -s recursive -X ours side &&
 	grep nine file &&
 	! grep nueve file &&
@@ -56,26 +59,26 @@ test_expect_success 'recursive favouring ours' '
 test_expect_success 'binary file with -Xours/-Xtheirs' '
 	echo file binary >.gitattributes &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	git merge -s recursive -X theirs side &&
 	git diff --exit-code side HEAD -- file &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	git merge -s recursive -X ours side &&
-	git diff --exit-code master HEAD -- file
+	git diff --exit-code main HEAD -- file
 '
 
 test_expect_success 'pull passes -X to underlying merge' '
-	git reset --hard master && git pull -s recursive -Xours . side &&
-	git reset --hard master && git pull -s recursive -X ours . side &&
-	git reset --hard master && git pull -s recursive -Xtheirs . side &&
-	git reset --hard master && git pull -s recursive -X theirs . side &&
-	git reset --hard master && 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' '
-	git reset --hard master &&
-	git checkout -b two master &&
+	git reset --hard main &&
+	git checkout -b two main &&
 	ln -s target-zero link &&
 	git add link &&
 	git commit -m "add link pointing to zero" &&
diff --git a/t/t6038-merge-text-auto.sh b/t/t6418-merge-text-auto.sh
index 5e8d5fa50c..1e0296dd17 100755
--- a/t/t6038-merge-text-auto.sh
+++ b/t/t6418-merge-text-auto.sh
@@ -2,16 +2,19 @@
 
 test_description='CRLF merge conflict across text=auto change
 
-* [master] remove .gitattributes
+* [main] remove .gitattributes
  ! [side] add line from b
 --
  + [side] add line from b
-*  [master] remove .gitattributes
-*  [master^] add line from a
-*  [master~2] normalize file
+*  [main] remove .gitattributes
+*  [main^] add line from a
+*  [main~2] normalize file
 *+ [side^] Initial
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
@@ -64,7 +67,7 @@ test_expect_success setup '
 	git commit -m "add line from b" &&
 	git tag b &&
 
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'set up fuzz_conflict() helper' '
@@ -158,7 +161,7 @@ test_expect_success 'Detect LF/CRLF conflict from addition of text=auto' '
 	compare_files expected file.fuzzy
 '
 
-test_expect_failure 'checkout -m after setting text=auto' '
+test_expect_success 'checkout -m after setting text=auto' '
 	cat <<-\EOF >expected &&
 	first line
 	same line
@@ -168,12 +171,12 @@ test_expect_failure 'checkout -m after setting text=auto' '
 	git rm -fr . &&
 	rm -f .gitattributes &&
 	git reset --hard initial &&
-	git checkout a -- . &&
+	git restore --source=a -- . &&
 	git checkout -m b &&
-	compare_files expected file
+	git diff --no-index --ignore-cr-at-eol expected file
 '
 
-test_expect_failure 'checkout -m addition of text=auto' '
+test_expect_success 'checkout -m addition of text=auto' '
 	cat <<-\EOF >expected &&
 	first line
 	same line
@@ -183,23 +186,9 @@ test_expect_failure 'checkout -m addition of text=auto' '
 	git rm -fr . &&
 	rm -f .gitattributes file &&
 	git reset --hard initial &&
-	git checkout b -- . &&
+	git restore --source=b -- . &&
 	git checkout -m a &&
-	compare_files expected file
-'
-
-test_expect_failure 'cherry-pick patch from after text=auto was added' '
-	append_cr <<-\EOF >expected &&
-	first line
-	same line
-	EOF
-
-	git config merge.renormalize true &&
-	git rm -fr . &&
-	git reset --hard b &&
-	test_must_fail git cherry-pick a >err 2>&1 &&
-	grep "[Nn]othing added" err &&
-	compare_files expected file
+	git diff --no-index --ignore-cr-at-eol expected file
 '
 
 test_expect_success 'Test delete/normalize conflict' '
@@ -209,9 +198,10 @@ test_expect_success 'Test delete/normalize conflict' '
 	git reset --hard initial &&
 	git rm file &&
 	git commit -m "remove file" &&
-	git checkout master &&
+	git checkout main &&
 	git reset --hard a^ &&
-	git merge side
+	git merge side &&
+	test_path_is_missing file
 '
 
 test_done
diff --git a/t/t6039-merge-ignorecase.sh b/t/t6419-merge-ignorecase.sh
index 531850d834..b64b75acf5 100755
--- a/t/t6039-merge-ignorecase.sh
+++ b/t/t6419-merge-ignorecase.sh
@@ -2,6 +2,9 @@
 
 test_description='git-merge with case-changing rename on case-insensitive file system'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq CASE_INSENSITIVE_FS
@@ -20,18 +23,18 @@ test_expect_success 'merge with case-changing rename' '
 	>foo &&
 	git add foo &&
 	git commit -m "intervening commit" &&
-	git checkout master &&
+	git checkout main &&
 	git rm TestCase &&
 	>testcase &&
 	git add testcase &&
 	git commit -m "rename to testcase" &&
 	git checkout with-camel &&
-	git merge master -m "merge" &&
+	git merge main -m "merge" &&
 	test_path_is_file testcase
 '
 
 test_expect_success 'merge with case-changing rename on both sides' '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard baseline &&
 	git branch -D with-camel &&
 	git checkout -b with-camel &&
@@ -40,13 +43,13 @@ test_expect_success 'merge with case-changing rename on both sides' '
 	>foo &&
 	git add foo &&
 	git commit -m "intervening commit" &&
-	git checkout master &&
+	git checkout main &&
 	git rm TestCase &&
 	>testcase &&
 	git add testcase &&
 	git commit -m "rename to testcase" &&
 	git checkout with-camel &&
-	git merge master -m "merge" &&
+	git merge main -m "merge" &&
 	test_path_is_file testcase
 '
 
diff --git a/t/t6421-merge-partial-clone.sh b/t/t6421-merge-partial-clone.sh
new file mode 100755
index 0000000000..36bcd7c328
--- /dev/null
+++ b/t/t6421-merge-partial-clone.sh
@@ -0,0 +1,440 @@
+#!/bin/sh
+
+test_description="limiting blob downloads when merging with partial clones"
+# Uses a methodology similar to
+#   t6042: corner cases with renames but not criss-cross merges
+#   t6036: corner cases with both renames and criss-cross merges
+#   t6423: directory rename detection
+#
+# The setup for all of them, pictorially, is:
+#
+#      A
+#      o
+#     / \
+#  O o   ?
+#     \ /
+#      o
+#      B
+#
+# To help make it easier to follow the flow of tests, they have been
+# divided into sections and each test will start with a quick explanation
+# of what commits O, A, and B contain.
+#
+# Notation:
+#    z/{b,c}   means  files z/b and z/c both exist
+#    x/d_1     means  file x/d exists with content d1.  (Purpose of the
+#                     underscore notation is to differentiate different
+#                     files that might be renamed into each other's paths.)
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
+
+test_setup_repo () {
+	test -d server && return
+	test_create_repo server &&
+	(
+		cd server &&
+
+		git config uploadpack.allowfilter 1 &&
+		git config uploadpack.allowanysha1inwant 1 &&
+
+		mkdir -p general &&
+		test_seq 2 9 >general/leap1 &&
+		cp general/leap1 general/leap2 &&
+		echo leap2 >>general/leap2 &&
+
+		mkdir -p basename &&
+		cp general/leap1 basename/numbers &&
+		cp general/leap1 basename/sequence &&
+		cp general/leap1 basename/values &&
+		echo numbers >>basename/numbers &&
+		echo sequence >>basename/sequence &&
+		echo values >>basename/values &&
+
+		mkdir -p dir/unchanged &&
+		mkdir -p dir/subdir/tweaked &&
+		echo a >dir/subdir/a &&
+		echo b >dir/subdir/b &&
+		echo c >dir/subdir/c &&
+		echo d >dir/subdir/d &&
+		echo e >dir/subdir/e &&
+		cp general/leap1 dir/subdir/Makefile &&
+		echo toplevel makefile >>dir/subdir/Makefile &&
+		echo f >dir/subdir/tweaked/f &&
+		echo g >dir/subdir/tweaked/g &&
+		echo h >dir/subdir/tweaked/h &&
+		echo subdirectory makefile >dir/subdir/tweaked/Makefile &&
+		for i in $(test_seq 1 88)
+		do
+			echo content $i >dir/unchanged/file_$i
+		done &&
+		git add . &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B-single &&
+		git branch B-dir &&
+		git branch B-many &&
+
+		git switch A &&
+
+		git rm general/leap* &&
+		mkdir general/ &&
+		test_seq 1 9 >general/jump1 &&
+		cp general/jump1 general/jump2 &&
+		echo leap2 >>general/jump2 &&
+
+		rm basename/numbers basename/sequence basename/values &&
+		mkdir -p basename/subdir/
+		cp general/jump1 basename/subdir/numbers &&
+		cp general/jump1 basename/subdir/sequence &&
+		cp general/jump1 basename/subdir/values &&
+		echo numbers >>basename/subdir/numbers &&
+		echo sequence >>basename/subdir/sequence &&
+		echo values >>basename/subdir/values &&
+
+		git rm dir/subdir/tweaked/f &&
+		echo more >>dir/subdir/e &&
+		echo more >>dir/subdir/Makefile &&
+		echo more >>dir/subdir/tweaked/Makefile &&
+		mkdir dir/subdir/newsubdir &&
+		echo rust code >dir/subdir/newsubdir/newfile.rs &&
+		git mv dir/subdir/e dir/subdir/newsubdir/ &&
+		git mv dir folder &&
+		git add . &&
+		git commit -m "A" &&
+
+		git switch B-single &&
+		echo new first line >dir/subdir/Makefile &&
+		cat general/leap1 >>dir/subdir/Makefile &&
+		echo toplevel makefile >>dir/subdir/Makefile &&
+		echo perl code >general/newfile.pl &&
+		git add . &&
+		git commit -m "B-single" &&
+
+		git switch B-dir &&
+		echo java code >dir/subdir/newfile.java &&
+		echo scala code >dir/subdir/newfile.scala &&
+		echo groovy code >dir/subdir/newfile.groovy &&
+		git add . &&
+		git commit -m "B-dir" &&
+
+		git switch B-many &&
+		test_seq 2 10 >general/leap1 &&
+		rm general/leap2 &&
+		cp general/leap1 general/leap2 &&
+		echo leap2 >>general/leap2 &&
+
+		rm basename/numbers basename/sequence basename/values &&
+		mkdir -p basename/subdir/
+		cp general/leap1 basename/subdir/numbers &&
+		cp general/leap1 basename/subdir/sequence &&
+		cp general/leap1 basename/subdir/values &&
+		echo numbers >>basename/subdir/numbers &&
+		echo sequence >>basename/subdir/sequence &&
+		echo values >>basename/subdir/values &&
+
+		mkdir dir/subdir/newsubdir/ &&
+		echo c code >dir/subdir/newfile.c &&
+		echo python code >dir/subdir/newsubdir/newfile.py &&
+		git add . &&
+		git commit -m "B-many" &&
+
+		git switch A
+	)
+}
+
+# Testcase: Objects downloaded for single relevant rename
+#   Commit O:
+#              general/{leap1_O, leap2_O}
+#              basename/{numbers_O, sequence_O, values_O}
+#              dir/subdir/{a,b,c,d,e_O,Makefile_TOP_O}
+#              dir/subdir/tweaked/{f,g,h,Makefile_SUB_O}
+#              dir/unchanged/<LOTS OF FILES>
+#   Commit A:
+#     (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/
+#      -> folder/, move e into newsubdir, add newfile.rs, remove f, modify
+#      both both Makefiles and jumps)
+#              general/{jump1_A, jump2_A}
+#              basename/subdir/{numbers_A, sequence_A, values_A}
+#              folder/subdir/{a,b,c,d,Makefile_TOP_A}
+#              folder/subdir/newsubdir/{e_A,newfile.rs}
+#              folder/subdir/tweaked/{g,h,Makefile_SUB_A}
+#              folder/unchanged/<LOTS OF FILES>
+#   Commit B(-single):
+#     (add newfile.pl, tweak Makefile_TOP)
+#              general/{leap1_O, leap2_O,newfile.pl}
+#              basename/{numbers_O, sequence_O, values_O}
+#              dir/{a,b,c,d,e_O,Makefile_TOP_B}
+#              dir/tweaked/{f,g,h,Makefile_SUB_O}
+#              dir/unchanged/<LOTS OF FILES>
+#   Expected:
+#              general/{jump1_A, jump2_A,newfile.pl}
+#              basename/subdir/{numbers_A, sequence_A, values_A}
+#              folder/subdir/{a,b,c,d,Makefile_TOP_Merged}
+#              folder/subdir/newsubdir/{e_A,newfile.rs}
+#              folder/subdir/tweaked/{g,h,Makefile_SUB_A}
+#              folder/unchanged/<LOTS OF FILES>
+#
+# Objects that need to be fetched:
+#   Rename detection:
+#     Side1 (O->A):
+#       Basename-matches rename detection only needs to fetch these objects:
+#         Makefile_TOP_O, Makefile_TOP_A
+#         (Despite many renames, all others are content irrelevant.  They
+#          are also location irrelevant because newfile.rs was added on
+#          the side doing the directory rename, and newfile.pl was added to
+#          a directory that was not renamed on either side.)
+#       General rename detection only needs to fetch these objects:
+#         <None>
+#          (Even though newfile.rs, jump[12], basename/subdir/*, and e
+#          could all be used as destinations in rename detection, the
+#          basename detection for Makefile matches up all relevant
+#          sources, so these other files never end up needing to be
+#          used)
+#     Side2 (O->B):
+#       Basename-matches rename detection only needs to fetch these objects:
+#         <None>
+#         (there are no deleted files, so no possible sources)
+#       General rename detection only needs to fetch these objects:
+#         <None>
+#         (there are no deleted files, so no possible sources)
+#   Merge:
+#     3-way content merge needs to grab these objects:
+#       Makefile_TOP_B
+#   Nothing else needs to fetch objects
+#
+#   Summary: 2 fetches (1 for 2 objects, 1 for 1 object)
+#
+test_expect_merge_algorithm failure success 'Objects downloaded for single relevant rename' '
+	test_setup_repo &&
+	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-single &&
+	(
+		cd objects-single &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-before &&
+
+		git checkout -q origin/A &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
+			-c merge.directoryRenames=true merge --no-stat \
+			--no-progress origin/B-single &&
+
+		# Check the number of objects we reported we would fetch
+		cat >expect <<-EOF &&
+		fetch_count:2
+		fetch_count:1
+		EOF
+		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
+		test_cmp expect actual &&
+
+		# Check the number of fetch commands exec-ed
+		grep d0.*fetch.negotiationAlgorithm trace.output >fetches &&
+		test_line_count = 2 fetches &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-after &&
+		comm -2 -3 missing-objects-before missing-objects-after >old &&
+		comm -1 -3 missing-objects-before missing-objects-after >new &&
+		# No new missing objects
+		test_must_be_empty new &&
+		# Fetched 2 + 1 = 3 objects
+		test_line_count = 3 old
+	)
+'
+
+# Testcase: Objects downloaded for directory rename
+#   Commit O:
+#              general/{leap1_O, leap2_O}
+#              basename/{numbers_O, sequence_O, values_O}
+#              dir/subdir/{a,b,c,d,e_O,Makefile_TOP_O}
+#              dir/subdir/tweaked/{f,g,h,Makefile_SUB_O}
+#              dir/unchanged/<LOTS OF FILES>
+#   Commit A:
+#     (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/ ->
+#      folder/, move e into newsubdir, add newfile.rs, remove f, modify
+#      both Makefiles and jumps)
+#              general/{jump1_A, jump2_A}
+#              basename/subdir/{numbers_A, sequence_A, values_A}
+#              folder/subdir/{a,b,c,d,Makefile_TOP_A}
+#              folder/subdir/newsubdir/{e_A,newfile.rs}
+#              folder/subdir/tweaked/{g,h,Makefile_SUB_A}
+#              folder/unchanged/<LOTS OF FILES>
+#   Commit B(-dir):
+#     (add dir/subdir/newfile.{java,scala,groovy}
+#              general/{leap1_O, leap2_O}
+#              basename/{numbers_O, sequence_O, values_O}
+#              dir/subdir/{a,b,c,d,e_O,Makefile_TOP_O,
+#                          newfile.java,newfile.scala,newfile.groovy}
+#              dir/subdir/tweaked/{f,g,h,Makefile_SUB_O}
+#              dir/unchanged/<LOTS OF FILES>
+#   Expected:
+#              general/{jump1_A, jump2_A}
+#              basename/subdir/{numbers_A, sequence_A, values_A}
+#              folder/subdir/{a,b,c,d,Makefile_TOP_A,
+#                             newfile.java,newfile.scala,newfile.groovy}
+#              folder/subdir/newsubdir/{e_A,newfile.rs}
+#              folder/subdir/tweaked/{g,h,Makefile_SUB_A}
+#              folder/unchanged/<LOTS OF FILES>
+#
+# Objects that need to be fetched:
+#   Makefile_TOP_O, Makefile_TOP_A
+#   Makefile_SUB_O, Makefile_SUB_A
+#   e_O, e_A
+#   * Despite A's rename of jump->leap, those renames are irrelevant.
+#   * Despite A's rename of basename/ -> basename/subdir/, those renames are
+#     irrelevant.
+#   * Because of A's rename of dir/ -> folder/ and B-dir's addition of
+#     newfile.* into dir/subdir/, we need to determine directory renames.
+#     (Technically, there are enough exact renames to determine directory
+#      rename detection, but the current implementation always does
+#      basename searching before directory rename detection.  Running it
+#      also before basename searching would mean doing directory rename
+#      detection twice, but it's a bit expensive to do that and cases like
+#      this are not all that common.)
+#   Summary: 1 fetches for 6 objects
+#
+test_expect_merge_algorithm failure success 'Objects downloaded when a directory rename triggered' '
+	test_setup_repo &&
+	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-dir &&
+	(
+		cd objects-dir &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-before &&
+
+		git checkout -q origin/A &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
+			-c merge.directoryRenames=true merge --no-stat \
+			--no-progress origin/B-dir &&
+
+		# Check the number of objects we reported we would fetch
+		cat >expect <<-EOF &&
+		fetch_count:6
+		EOF
+		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
+		test_cmp expect actual &&
+
+		# Check the number of fetch commands exec-ed
+		grep d0.*fetch.negotiationAlgorithm trace.output >fetches &&
+		test_line_count = 1 fetches &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-after &&
+		comm -2 -3 missing-objects-before missing-objects-after >old &&
+		comm -1 -3 missing-objects-before missing-objects-after >new &&
+		# No new missing objects
+		test_must_be_empty new &&
+		# Fetched 6 objects
+		test_line_count = 6 old
+	)
+'
+
+# Testcase: Objects downloaded with lots of renames and modifications
+#   Commit O:
+#              general/{leap1_O, leap2_O}
+#              basename/{numbers_O, sequence_O, values_O}
+#              dir/subdir/{a,b,c,d,e_O,Makefile_TOP_O}
+#              dir/subdir/tweaked/{f,g,h,Makefile_SUB_O}
+#              dir/unchanged/<LOTS OF FILES>
+#   Commit A:
+#     (Rename leap->jump, rename basename/ -> basename/subdir/, rename dir/
+#      -> folder/, move e into newsubdir, add newfile.rs, remove f, modify
+#      both both Makefiles and jumps)
+#              general/{jump1_A, jump2_A}
+#              basename/subdir/{numbers_A, sequence_A, values_A}
+#              folder/subdir/{a,b,c,d,Makefile_TOP_A}
+#              folder/subdir/newsubdir/{e_A,newfile.rs}
+#              folder/subdir/tweaked/{g,h,Makefile_SUB_A}
+#              folder/unchanged/<LOTS OF FILES>
+#   Commit B(-minimal):
+#     (modify both leaps, rename basename/ -> basename/subdir/, add
+#      newfile.{c,py})
+#              general/{leap1_B, leap2_B}
+#              basename/subdir/{numbers_B, sequence_B, values_B}
+#              dir/{a,b,c,d,e_O,Makefile_TOP_O,newfile.c}
+#              dir/tweaked/{f,g,h,Makefile_SUB_O,newfile.py}
+#              dir/unchanged/<LOTS OF FILES>
+#   Expected:
+#              general/{jump1_Merged, jump2_Merged}
+#              basename/subdir/{numbers_Merged, sequence_Merged, values_Merged}
+#              folder/subdir/{a,b,c,d,Makefile_TOP_A,newfile.c}
+#              folder/subdir/newsubdir/e_A
+#              folder/subdir/tweaked/{g,h,Makefile_SUB_A,newfile.py}
+#              folder/unchanged/<LOTS OF FILES>
+#
+# Objects that need to be fetched:
+#   Rename detection:
+#     Side1 (O->A):
+#       Basename-matches rename detection only needs to fetch these objects:
+#         numbers_O, numbers_A
+#         sequence_O, sequence_A
+#         values_O, values_A
+#         Makefile_TOP_O, Makefile_TOP_A
+#         Makefile_SUB_O, Makefile_SUB_A
+#         e_O, e_A
+#       General rename detection only needs to fetch these objects:
+#         leap1_O, leap2_O
+#         jump1_A, jump2_A, newfile.rs
+#         (only need remaining relevant sources, but any relevant sources need
+#          to be matched against all possible unpaired destinations)
+#     Side2 (O->B):
+#       Basename-matches rename detection only needs to fetch these objects:
+#         numbers_B
+#         sequence_B
+#         values_B
+#       (because numbers_O, sequence_O, and values_O already fetched above)
+#       General rename detection only needs to fetch these objects:
+#         <None>
+#   Merge:
+#     3-way content merge needs to grab these objects:
+#       leap1_B
+#       leap2_B
+#   Nothing else needs to fetch objects
+#
+#   Summary: 4 fetches (1 for 6 objects, 1 for 8, 1 for 3, 1 for 2)
+#
+test_expect_merge_algorithm failure success 'Objects downloaded with lots of renames and modifications' '
+	test_setup_repo &&
+	git clone --sparse --filter=blob:none "file://$(pwd)/server" objects-many &&
+	(
+		cd objects-many &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-before &&
+
+		git checkout -q origin/A &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git \
+			-c merge.directoryRenames=true merge --no-stat \
+			--no-progress origin/B-many &&
+
+		# Check the number of objects we reported we would fetch
+		cat >expect <<-EOF &&
+		fetch_count:12
+		fetch_count:5
+		fetch_count:3
+		fetch_count:2
+		EOF
+		grep fetch_count trace.output | cut -d "|" -f 9 | tr -d " ." >actual &&
+		test_cmp expect actual &&
+
+		# Check the number of fetch commands exec-ed
+		grep d0.*fetch.negotiationAlgorithm trace.output >fetches &&
+		test_line_count = 4 fetches &&
+
+		git rev-list --objects --all --missing=print |
+			grep "^?" | sort >missing-objects-after &&
+		comm -2 -3 missing-objects-before missing-objects-after >old &&
+		comm -1 -3 missing-objects-before missing-objects-after >new &&
+		# No new missing objects
+		test_must_be_empty new &&
+		# Fetched 12 + 5 + 3 + 2 = 22 objects
+		test_line_count = 22 old
+	)
+'
+
+test_done
diff --git a/t/t6042-merge-rename-corner-cases.sh b/t/t6422-merge-rename-corner-cases.sh
index c5b57f40c3..bf4ce3c63d 100755
--- a/t/t6042-merge-rename-corner-cases.sh
+++ b/t/t6422-merge-rename-corner-cases.sh
@@ -3,9 +3,13 @@
 test_description="recursive merge corner cases w/ renames but not criss-crosses"
 # t6036 has corner cases that involve both criss-cross merges and renames
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
 
-test_expect_success 'setup rename/delete + untracked file' '
+test_setup_rename_delete_untracked () {
 	test_create_repo rename-delete-untracked &&
 	(
 		cd rename-delete-untracked &&
@@ -29,9 +33,10 @@ test_expect_success 'setup rename/delete + untracked file' '
 		git commit -m track-people-instead-of-objects &&
 		echo "Myyy PRECIOUSSS" >ring
 	)
-'
+}
 
 test_expect_success "Does git preserve Gollum's precious artifact?" '
+	test_setup_rename_delete_untracked &&
 	(
 		cd rename-delete-untracked &&
 
@@ -49,7 +54,7 @@ test_expect_success "Does git preserve Gollum's precious artifact?" '
 #
 # We should be able to merge B & C cleanly
 
-test_expect_success 'setup rename/modify/add-source conflict' '
+test_setup_rename_modify_add_source () {
 	test_create_repo rename-modify-add-source &&
 	(
 		cd rename-modify-add-source &&
@@ -70,9 +75,10 @@ test_expect_success 'setup rename/modify/add-source conflict' '
 		git add a &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_failure 'rename/modify/add-source conflict resolvable' '
+	test_setup_rename_modify_add_source &&
 	(
 		cd rename-modify-add-source &&
 
@@ -88,7 +94,7 @@ test_expect_failure 'rename/modify/add-source conflict resolvable' '
 	)
 '
 
-test_expect_success 'setup resolvable conflict missed if rename missed' '
+test_setup_break_detection_1 () {
 	test_create_repo break-detection-1 &&
 	(
 		cd break-detection-1 &&
@@ -110,9 +116,10 @@ test_expect_success 'setup resolvable conflict missed if rename missed' '
 		git add a &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_failure 'conflict caused if rename not detected' '
+	test_setup_break_detection_1 &&
 	(
 		cd break-detection-1 &&
 
@@ -135,7 +142,7 @@ test_expect_failure 'conflict caused if rename not detected' '
 	)
 '
 
-test_expect_success 'setup conflict resolved wrong if rename missed' '
+test_setup_break_detection_2 () {
 	test_create_repo break-detection-2 &&
 	(
 		cd break-detection-2 &&
@@ -160,9 +167,10 @@ test_expect_success 'setup conflict resolved wrong if rename missed' '
 		git add a &&
 		git commit -m E
 	)
-'
+}
 
 test_expect_failure 'missed conflict if rename not detected' '
+	test_setup_break_detection_2 &&
 	(
 		cd break-detection-2 &&
 
@@ -182,7 +190,7 @@ test_expect_failure 'missed conflict if rename not detected' '
 #   Commit B: rename a->b
 #   Commit C: rename a->b, add unrelated a
 
-test_expect_success 'setup undetected rename/add-source causes data loss' '
+test_setup_break_detection_3 () {
 	test_create_repo break-detection-3 &&
 	(
 		cd break-detection-3 &&
@@ -202,9 +210,10 @@ test_expect_success 'setup undetected rename/add-source causes data loss' '
 		git add a &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_failure 'detect rename/add-source and preserve all data' '
+	test_setup_break_detection_3 &&
 	(
 		cd break-detection-3 &&
 
@@ -231,6 +240,7 @@ test_expect_failure 'detect rename/add-source and preserve all data' '
 '
 
 test_expect_failure 'detect rename/add-source and preserve all data, merge other way' '
+	test_setup_break_detection_3 &&
 	(
 		cd break-detection-3 &&
 
@@ -256,10 +266,10 @@ test_expect_failure 'detect rename/add-source and preserve all data, merge other
 	)
 '
 
-test_expect_success 'setup content merge + rename/directory conflict' '
-	test_create_repo rename-directory-1 &&
+test_setup_rename_directory () {
+	test_create_repo rename-directory-$1 &&
 	(
-		cd rename-directory-1 &&
+		cd rename-directory-$1 &&
 
 		printf "1\n2\n3\n4\n5\n6\n" >file &&
 		git add file &&
@@ -290,11 +300,12 @@ test_expect_success 'setup content merge + rename/directory conflict' '
 		test_tick &&
 		git commit -m left
 	)
-'
+}
 
 test_expect_success 'rename/directory conflict + clean content merge' '
+	test_setup_rename_directory 1a &&
 	(
-		cd rename-directory-1 &&
+		cd rename-directory-1a &&
 
 		git checkout left-clean^0 &&
 
@@ -305,23 +316,27 @@ test_expect_success 'rename/directory conflict + clean content merge' '
 		git ls-files -u >out &&
 		test_line_count = 1 out &&
 		git ls-files -o >out &&
-		test_line_count = 2 out &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_line_count = 1 out
+		else
+			test_line_count = 2 out
+		fi &&
 
 		echo 0 >expect &&
 		git cat-file -p base:file >>expect &&
 		echo 7 >>expect &&
 		test_cmp expect newfile~HEAD &&
 
-		test $(git rev-parse :2:newfile) = $(git hash-object expect) &&
-
 		test_path_is_file newfile/realfile &&
 		test_path_is_file newfile~HEAD
 	)
 '
 
 test_expect_success 'rename/directory conflict + content merge conflict' '
+	test_setup_rename_directory 1b &&
 	(
-		cd rename-directory-1 &&
+		cd rename-directory-1b &&
 
 		git reset --hard &&
 		git clean -fdqx &&
@@ -335,7 +350,12 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
 		git ls-files -u >out &&
 		test_line_count = 3 out &&
 		git ls-files -o >out &&
-		test_line_count = 2 out &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_line_count = 1 out
+		else
+			test_line_count = 2 out
+		fi &&
 
 		git cat-file -p left-conflict:newfile >left &&
 		git cat-file -p base:file    >base &&
@@ -347,10 +367,16 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
 			left base right &&
 		test_cmp left newfile~HEAD &&
 
-		git rev-parse >expect                                 \
-			base:file   left-conflict:newfile  right:file &&
-		git rev-parse >actual                                 \
-			:1:newfile  :2:newfile             :3:newfile &&
+		git rev-parse >expect   \
+			base:file       left-conflict:newfile right:file &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git rev-parse >actual \
+				:1:newfile~HEAD :2:newfile~HEAD :3:newfile~HEAD
+		else
+			git rev-parse >actual \
+				:1:newfile      :2:newfile      :3:newfile
+		fi &&
 		test_cmp expect actual &&
 
 		test_path_is_file newfile/realfile &&
@@ -358,7 +384,7 @@ test_expect_success 'rename/directory conflict + content merge conflict' '
 	)
 '
 
-test_expect_success 'setup content merge + rename/directory conflict w/ disappearing dir' '
+test_setup_rename_directory_2 () {
 	test_create_repo rename-directory-2 &&
 	(
 		cd rename-directory-2 &&
@@ -385,9 +411,10 @@ test_expect_success 'setup content merge + rename/directory conflict w/ disappea
 		test_tick &&
 		git commit -m left
 	)
-'
+}
 
 test_expect_success 'disappearing dir in rename/directory conflict handled' '
+	test_setup_rename_directory_2 &&
 	(
 		cd rename-directory-2 &&
 
@@ -416,10 +443,10 @@ test_expect_success 'disappearing dir in rename/directory conflict handled' '
 #   Commit A: rename a->b, modifying b too
 #   Commit B: modify a, add different b
 
-test_expect_success 'setup rename-with-content-merge vs. add' '
-	test_create_repo rename-with-content-merge-and-add &&
+test_setup_rename_with_content_merge_and_add () {
+	test_create_repo rename-with-content-merge-and-add-$1 &&
 	(
-		cd rename-with-content-merge-and-add &&
+		cd rename-with-content-merge-and-add-$1 &&
 
 		test_seq 1 5 >a &&
 		git add a &&
@@ -438,16 +465,17 @@ test_expect_success 'setup rename-with-content-merge vs. add' '
 		git add a b &&
 		git commit -m B
 	)
-'
+}
 
 test_expect_success 'handle rename-with-content-merge vs. add' '
+	test_setup_rename_with_content_merge_and_add AB &&
 	(
-		cd rename-with-content-merge-and-add &&
+		cd rename-with-content-merge-and-add-AB &&
 
 		git checkout A^0 &&
 
 		test_must_fail git merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/add)" out &&
+		test_i18ngrep "CONFLICT (.*/add)" out &&
 
 		git ls-files -s >out &&
 		test_line_count = 2 out &&
@@ -483,8 +511,9 @@ test_expect_success 'handle rename-with-content-merge vs. add' '
 '
 
 test_expect_success 'handle rename-with-content-merge vs. add, merge other way' '
+	test_setup_rename_with_content_merge_and_add BA &&
 	(
-		cd rename-with-content-merge-and-add &&
+		cd rename-with-content-merge-and-add-BA &&
 
 		git reset --hard &&
 		git clean -fdx &&
@@ -492,7 +521,7 @@ test_expect_success 'handle rename-with-content-merge vs. add, merge other way'
 		git checkout B^0 &&
 
 		test_must_fail git merge -s recursive A^0 >out &&
-		test_i18ngrep "CONFLICT (rename/add)" out &&
+		test_i18ngrep "CONFLICT (.*/add)" out &&
 
 		git ls-files -s >out &&
 		test_line_count = 2 out &&
@@ -539,7 +568,7 @@ test_expect_success 'handle rename-with-content-merge vs. add, merge other way'
 #   * The working copy should have two files, both of form c~<unique>; does it?
 #   * Nothing else should be present.  Is anything?
 
-test_expect_success 'setup rename/rename (2to1) + modify/modify' '
+test_setup_rename_rename_2to1 () {
 	test_create_repo rename-rename-2to1 &&
 	(
 		cd rename-rename-2to1 &&
@@ -562,16 +591,17 @@ test_expect_success 'setup rename/rename (2to1) + modify/modify' '
 		git add a &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_success 'handle rename/rename (2to1) conflict correctly' '
+	test_setup_rename_rename_2to1 &&
 	(
 		cd rename-rename-2to1 &&
 
 		git checkout B^0 &&
 
 		test_must_fail git merge -s recursive C^0 >out &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "CONFLICT (\(.*\)/\1)" out &&
 
 		git ls-files -s >out &&
 		test_line_count = 2 out &&
@@ -610,7 +640,7 @@ test_expect_success 'handle rename/rename (2to1) conflict correctly' '
 #   Commit A: new file: a
 #   Commit B: rename a->b
 #   Commit C: rename a->c
-test_expect_success 'setup simple rename/rename (1to2) conflict' '
+test_setup_rename_rename_1to2 () {
 	test_create_repo rename-rename-1to2 &&
 	(
 		cd rename-rename-1to2 &&
@@ -631,9 +661,10 @@ test_expect_success 'setup simple rename/rename (1to2) conflict' '
 		test_tick &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_success 'merge has correct working tree contents' '
+	test_setup_rename_rename_1to2 &&
 	(
 		cd rename-rename-1to2 &&
 
@@ -667,7 +698,7 @@ test_expect_success 'merge has correct working tree contents' '
 #
 # Merging of B & C should NOT be clean; there's a rename/rename conflict
 
-test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
+test_setup_rename_rename_1to2_add_source_1 () {
 	test_create_repo rename-rename-1to2-add-source-1 &&
 	(
 		cd rename-rename-1to2-add-source-1 &&
@@ -687,9 +718,10 @@ test_expect_success 'setup rename/rename(1to2)/add-source conflict' '
 		git add a &&
 		git commit -m C
 	)
-'
+}
 
 test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge' '
+	test_setup_rename_rename_1to2_add_source_1 &&
 	(
 		cd rename-rename-1to2-add-source-1 &&
 
@@ -714,7 +746,7 @@ test_expect_failure 'detect conflict with rename/rename(1to2)/add-source merge'
 	)
 '
 
-test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
+test_setup_rename_rename_1to2_add_source_2 () {
 	test_create_repo rename-rename-1to2-add-source-2 &&
 	(
 		cd rename-rename-1to2-add-source-2 &&
@@ -737,9 +769,10 @@ test_expect_success 'setup rename/rename(1to2)/add-source resolvable conflict' '
 		test_tick &&
 		git commit -m two
 	)
-'
+}
 
 test_expect_failure 'rename/rename/add-source still tracks new a file' '
+	test_setup_rename_rename_1to2_add_source_2 &&
 	(
 		cd rename-rename-1to2-add-source-2 &&
 
@@ -759,7 +792,7 @@ test_expect_failure 'rename/rename/add-source still tracks new a file' '
 	)
 '
 
-test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
+test_setup_rename_rename_1to2_add_dest () {
 	test_create_repo rename-rename-1to2-add-dest &&
 	(
 		cd rename-rename-1to2-add-dest &&
@@ -784,9 +817,10 @@ test_expect_success 'setup rename/rename(1to2)/add-dest conflict' '
 		test_tick &&
 		git commit -m two
 	)
-'
+}
 
 test_expect_success 'rename/rename/add-dest merge still knows about conflicting file versions' '
+	test_setup_rename_rename_1to2_add_dest &&
 	(
 		cd rename-rename-1to2-add-dest &&
 
@@ -838,7 +872,7 @@ test_expect_success 'rename/rename/add-dest merge still knows about conflicting
 #   Commit B: rename foo->bar
 #   Expected: CONFLICT (rename/add/delete), two-way merged bar
 
-test_expect_success 'rad-setup: rename/add/delete conflict' '
+test_setup_rad () {
 	test_create_repo rad &&
 	(
 		cd rad &&
@@ -860,21 +894,27 @@ test_expect_success 'rad-setup: rename/add/delete conflict' '
 		git mv foo bar &&
 		git commit -m "rename foo to bar"
 	)
-'
+}
 
-test_expect_failure 'rad-check: rename/add/delete conflict' '
+test_expect_merge_algorithm failure success 'rad-check: rename/add/delete conflict' '
+	test_setup_rad &&
 	(
 		cd rad &&
 
 		git checkout B^0 &&
 		test_must_fail git merge -s recursive A^0 >out 2>err &&
 
-		# Not sure whether the output should contain just one
-		# "CONFLICT (rename/add/delete)" line, or if it should break
-		# it into a pair of "CONFLICT (rename/delete)" and
-		# "CONFLICT (rename/add)"; allow for either.
-		test_i18ngrep "CONFLICT (rename.*add)" out &&
-		test_i18ngrep "CONFLICT (rename.*delete)" out &&
+		# Instead of requiring the output to contain one combined line
+		#   CONFLICT (rename/add/delete)
+		# or perhaps two lines:
+		#   CONFLICT (rename/add): new file collides with rename target
+		#   CONFLICT (rename/delete): rename source removed on other side
+		# and instead of requiring "rename/add" instead of "add/add",
+		# be flexible in the type of console output message(s) reported
+		# for this particular case; we will be more stringent about the
+		# contents of the index and working directory.
+		test_i18ngrep "CONFLICT (.*/add)" out &&
+		test_i18ngrep "CONFLICT (rename.*/delete)" out &&
 		test_must_be_empty err &&
 
 		git ls-files -s >file_count &&
@@ -882,14 +922,14 @@ test_expect_failure 'rad-check: rename/add/delete conflict' '
 		git ls-files -u >file_count &&
 		test_line_count = 2 file_count &&
 		git ls-files -o >file_count &&
-		test_line_count = 2 file_count &&
+		test_line_count = 3 file_count &&
 
 		git rev-parse >actual \
 			:2:bar :3:bar &&
 		git rev-parse >expect \
 			B:bar  A:bar  &&
 
-		test_cmp file_is_missing foo &&
+		test_path_is_missing foo &&
 		# bar should have two-way merged contents of the different
 		# versions of bar; check that content from both sides is
 		# present.
@@ -904,7 +944,7 @@ test_expect_failure 'rad-check: rename/add/delete conflict' '
 #   Commit B: rename bar->baz, rm foo
 #   Expected: CONFLICT (rename/rename/delete/delete), two-way merged baz
 
-test_expect_success 'rrdd-setup: rename/rename(2to1)/delete/delete conflict' '
+test_setup_rrdd () {
 	test_create_repo rrdd &&
 	(
 		cd rrdd &&
@@ -927,20 +967,27 @@ test_expect_success 'rrdd-setup: rename/rename(2to1)/delete/delete conflict' '
 		git rm foo &&
 		git commit -m "Rename bar, remove foo"
 	)
-'
+}
 
-test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
+test_expect_merge_algorithm failure success 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
+	test_setup_rrdd &&
 	(
 		cd rrdd &&
 
 		git checkout A^0 &&
 		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-		# Not sure whether the output should contain just one
-		# "CONFLICT (rename/rename/delete/delete)" line, or if it
-		# should break it into three: "CONFLICT (rename/rename)" and
-		# two "CONFLICT (rename/delete)" lines; allow for either.
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		# Instead of requiring the output to contain one combined line
+		#   CONFLICT (rename/rename/delete/delete)
+		# or perhaps two lines:
+		#   CONFLICT (rename/rename): ...
+		#   CONFLICT (rename/delete): info about pair 1
+		#   CONFLICT (rename/delete): info about pair 2
+		# and instead of requiring "rename/rename" instead of "add/add",
+		# be flexible in the type of console output message(s) reported
+		# for this particular case; we will be more stringent about the
+		# contents of the index and working directory.
+		test_i18ngrep "CONFLICT (\(.*\)/\1)" out &&
 		test_i18ngrep "CONFLICT (rename.*delete)" out &&
 		test_must_be_empty err &&
 
@@ -949,15 +996,15 @@ test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
 		git ls-files -u >file_count &&
 		test_line_count = 2 file_count &&
 		git ls-files -o >file_count &&
-		test_line_count = 2 file_count &&
+		test_line_count = 3 file_count &&
 
 		git rev-parse >actual \
 			:2:baz :3:baz &&
 		git rev-parse >expect \
 			O:foo  O:bar  &&
 
-		test_cmp file_is_missing foo &&
-		test_cmp file_is_missing bar &&
+		test_path_is_missing foo &&
+		test_path_is_missing bar &&
 		# baz should have two-way merged contents of the original
 		# contents of foo and bar; check that content from both sides
 		# is present.
@@ -973,7 +1020,7 @@ test_expect_failure 'rrdd-check: rename/rename(2to1)/delete/delete conflict' '
 #   Expected: six CONFLICT(rename/rename) messages, each path in two of the
 #             multi-way merged contents found in two, four, six
 
-test_expect_success 'mod6-setup: chains of rename/rename(1to2) and rename/rename(2to1)' '
+test_setup_mod6 () {
 	test_create_repo mod6 &&
 	(
 		cd mod6 &&
@@ -1009,9 +1056,10 @@ test_expect_success 'mod6-setup: chains of rename/rename(1to2) and rename/rename
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_failure 'mod6-check: chains of rename/rename(1to2) and rename/rename(2to1)' '
+test_expect_merge_algorithm failure success 'mod6-check: chains of rename/rename(1to2) and rename/rename(2to1)' '
+	test_setup_mod6 &&
 	(
 		cd mod6 &&
 
@@ -1023,25 +1071,25 @@ test_expect_failure 'mod6-check: chains of rename/rename(1to2) and rename/rename
 		test_must_be_empty err &&
 
 		git ls-files -s >file_count &&
-		test_line_count = 6 file_count &&
+		test_line_count = 9 file_count &&
 		git ls-files -u >file_count &&
-		test_line_count = 6 file_count &&
+		test_line_count = 9 file_count &&
 		git ls-files -o >file_count &&
 		test_line_count = 3 file_count &&
 
 		test_seq 10 20 >merged-one &&
 		test_seq 51 60 >merged-five &&
 		# Determine what the merge of three would give us.
-		test_seq 30 40 >three-side-A &&
+		test_seq 31 39 >three-base &&
+		test_seq 31 40 >three-side-A &&
 		test_seq 31 39 >three-side-B &&
-		echo forty >three-side-B &&
-		>empty &&
+		echo forty >>three-side-B &&
 		test_must_fail git merge-file \
-			-L "HEAD" \
+			-L "HEAD:four" \
 			-L "" \
-			-L "B^0" \
-			three-side-A empty three-side-B &&
-		sed -e "s/^\([<=>]\)/\1\1\1/" three-side-A >merged-three &&
+			-L "B^0:two" \
+			three-side-A three-base three-side-B &&
+		sed -e "s/^\([<=>]\)/\1\1/" three-side-A >merged-three &&
 
 		# Verify the index is as expected
 		git rev-parse >actual         \
@@ -1056,6 +1104,7 @@ test_expect_failure 'mod6-check: chains of rename/rename(1to2) and rename/rename
 
 		git cat-file -p :2:two >expect &&
 		git cat-file -p :3:two >other &&
+		>empty &&
 		test_must_fail git merge-file    \
 			-L "HEAD"  -L ""  -L "B^0" \
 			expect     empty  other &&
@@ -1084,7 +1133,7 @@ test_conflicts_with_adds_and_renames() {
 	# Setup:
 	#          L
 	#         / \
-	#   master   ?
+	#     main   ?
 	#         \ /
 	#          R
 	#
@@ -1108,7 +1157,8 @@ test_conflicts_with_adds_and_renames() {
 	#      files.  Is it present?
 	#   4) There should not be any three~* files in the working
 	#      tree
-	test_expect_success "setup simple $sideL/$sideR conflict" '
+	test_setup_collision_conflict () {
+	#test_expect_success "setup simple $sideL/$sideR conflict" '
 		test_create_repo simple_${sideL}_${sideR} &&
 		(
 			cd simple_${sideL}_${sideR} &&
@@ -1185,9 +1235,11 @@ test_conflicts_with_adds_and_renames() {
 			fi &&
 			test_tick && git commit -m R
 		)
-	'
+	#'
+	}
 
 	test_expect_success "check simple $sideL/$sideR conflict" '
+		test_setup_collision_conflict &&
 		(
 			cd simple_${sideL}_${sideR} &&
 
@@ -1211,7 +1263,7 @@ test_conflicts_with_adds_and_renames() {
 				:2:three           \
 				:3:three           &&
 			git rev-parse >expected        \
-				master:irrelevant_file \
+				main:irrelevant_file \
 				file_v2                \
 				file_v4                &&
 			test_cmp expected actual &&
@@ -1241,12 +1293,12 @@ test_conflicts_with_adds_and_renames add    add
 # Setup:
 #          L
 #         / \
-#   master   ?
+#     main   ?
 #         \ /
 #          R
 #
 # Where:
-#   master has two files, named 'one' and 'two'.
+#   main has two files, named 'one' and 'two'.
 #   branches L and R both modify 'one', in conflicting ways.
 #   branches L and R both modify 'two', in conflicting ways.
 #   branch L also renames 'one' to 'three'.
@@ -1254,7 +1306,7 @@ test_conflicts_with_adds_and_renames add    add
 #
 #   So, we have four different conflicting files that all end up at path
 #   'three'.
-test_expect_success 'setup nested conflicts from rename/rename(2to1)' '
+test_setup_nested_conflicts_from_rename_rename () {
 	test_create_repo nested_conflicts_from_rename_rename &&
 	(
 		cd nested_conflicts_from_rename_rename &&
@@ -1305,9 +1357,10 @@ test_expect_success 'setup nested conflicts from rename/rename(2to1)' '
 		git add one three &&
 		test_tick && git commit -m german
 	)
-'
+}
 
 test_expect_success 'check nested conflicts from rename/rename(2to1)' '
+	test_setup_nested_conflicts_from_rename_rename &&
 	(
 		cd nested_conflicts_from_rename_rename &&
 
@@ -1326,7 +1379,7 @@ test_expect_success 'check nested conflicts from rename/rename(2to1)' '
 		test_line_count = 1 out &&
 
 		# Compare :2:three to expected values
-		git cat-file -p master:one >base &&
+		git cat-file -p main:one >base &&
 		git cat-file -p L:three >ours &&
 		git cat-file -p R:one >theirs &&
 		test_must_fail git merge-file    \
@@ -1337,7 +1390,7 @@ test_expect_success 'check nested conflicts from rename/rename(2to1)' '
 		test_cmp expect L-three &&
 
 		# Compare :2:three to expected values
-		git cat-file -p master:two >base &&
+		git cat-file -p main:two >base &&
 		git cat-file -p L:two >ours &&
 		git cat-file -p R:three >theirs &&
 		test_must_fail git merge-file    \
@@ -1356,4 +1409,59 @@ test_expect_success 'check nested conflicts from rename/rename(2to1)' '
 	)
 '
 
+# Testcase rename/rename(1to2) of a binary file
+#   Commit O: orig
+#   Commit A: orig-A
+#   Commit B: orig-B
+#   Expected: CONFLICT(rename/rename) message, three unstaged entries in the
+#             index, and contents of orig-[AB] at path orig-[AB]
+test_setup_rename_rename_1_to_2_binary () {
+	test_create_repo rename_rename_1_to_2_binary &&
+	(
+		cd rename_rename_1_to_2_binary &&
+
+		echo '* binary' >.gitattributes &&
+		git add .gitattributes &&
+
+		test_seq 1 10 >orig &&
+		git add orig &&
+		git commit -m orig &&
+
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv orig orig-A &&
+		test_seq 1 11 >orig-A &&
+		git add orig-A &&
+		git commit -m orig-A &&
+
+		git checkout B &&
+		git mv orig orig-B &&
+		test_seq 0 10 >orig-B &&
+		git add orig-B &&
+		git commit -m orig-B
+
+	)
+}
+
+test_expect_success 'rename/rename(1to2) with a binary file' '
+	test_setup_rename_rename_1_to_2_binary &&
+	(
+		cd rename_rename_1_to_2_binary &&
+
+		git checkout A^0 &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		# Make sure the index has the right number of entries
+		git ls-files -s >actual &&
+		test_line_count = 4 actual &&
+
+		git rev-parse A:orig-A B:orig-B >expect &&
+		git hash-object orig-A orig-B >actual &&
+		test_cmp expect actual
+	)
+'
+
 test_done
diff --git a/t/t6043-merge-rename-directories.sh b/t/t6423-merge-rename-directories.sh
index c966147d5d..5b81a130e9 100755
--- a/t/t6043-merge-rename-directories.sh
+++ b/t/t6423-merge-rename-directories.sh
@@ -26,6 +26,7 @@ test_description="recursive merge with directory renames"
 #                     files that might be renamed into each other's paths.)
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
 
 
 ###########################################################################
@@ -38,7 +39,7 @@ test_description="recursive merge with directory renames"
 #   Commit B: z/{b,c,d,e/f}
 #   Expected: y/{b,c,d,e/f}
 
-test_expect_success '1a-setup: Simple directory rename detection' '
+test_setup_1a () {
 	test_create_repo 1a &&
 	(
 		cd 1a &&
@@ -67,9 +68,10 @@ test_expect_success '1a-setup: Simple directory rename detection' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1a-check: Simple directory rename detection' '
+test_expect_success '1a: Simple directory rename detection' '
+	test_setup_1a &&
 	(
 		cd 1a &&
 
@@ -103,7 +105,7 @@ test_expect_success '1a-check: Simple directory rename detection' '
 #   Commit B: y/{b,c,d}
 #   Expected: y/{b,c,d,e}
 
-test_expect_success '1b-setup: Merge a directory with another' '
+test_setup_1b () {
 	test_create_repo 1b &&
 	(
 		cd 1b &&
@@ -134,9 +136,10 @@ test_expect_success '1b-setup: Merge a directory with another' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1b-check: Merge a directory with another' '
+test_expect_success '1b: Merge a directory with another' '
+	test_setup_1b &&
 	(
 		cd 1b &&
 
@@ -165,7 +168,7 @@ test_expect_success '1b-check: Merge a directory with another' '
 #   Commit B: z/{b,c,d}
 #   Expected: y/{b,c,d}  (because x/d -> z/d -> y/d)
 
-test_expect_success '1c-setup: Transitive renaming' '
+test_setup_1c () {
 	test_create_repo 1c &&
 	(
 		cd 1c &&
@@ -193,9 +196,10 @@ test_expect_success '1c-setup: Transitive renaming' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1c-check: Transitive renaming' '
+test_expect_success '1c: Transitive renaming' '
+	test_setup_1c &&
 	(
 		cd 1c &&
 
@@ -227,7 +231,7 @@ test_expect_success '1c-check: Transitive renaming' '
 #   Note: y/m & z/n should definitely move into x.  By the same token, both
 #         y/wham_1 & z/wham_2 should too...giving us a conflict.
 
-test_expect_success '1d-setup: Directory renames cause a rename/rename(2to1) conflict' '
+test_setup_1d () {
 	test_create_repo 1d &&
 	(
 		cd 1d &&
@@ -262,16 +266,17 @@ test_expect_success '1d-setup: Directory renames cause a rename/rename(2to1) con
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1d-check: Directory renames cause a rename/rename(2to1) conflict' '
+test_expect_success '1d: Directory renames cause a rename/rename(2to1) conflict' '
+	test_setup_1d &&
 	(
 		cd 1d &&
 
 		git checkout A^0 &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "CONFLICT (\(.*\)/\1)" out &&
 
 		git ls-files -s >out &&
 		test_line_count = 8 out &&
@@ -297,11 +302,20 @@ test_expect_success '1d-check: Directory renames cause a rename/rename(2to1) con
 		git cat-file -p :2:x/wham >expect &&
 		git cat-file -p :3:x/wham >other &&
 		>empty &&
-		test_must_fail git merge-file \
-			-L "HEAD" \
-			-L "" \
-			-L "B^0" \
-			expect empty other &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_must_fail git merge-file \
+				-L "HEAD:y/wham" \
+				-L "" \
+				-L "B^0:z/wham" \
+				expect empty other
+		else
+			test_must_fail git merge-file \
+				-L "HEAD" \
+				-L "" \
+				-L "B^0" \
+				expect empty other
+		fi &&
 		test_cmp expect x/wham
 	)
 '
@@ -313,7 +327,7 @@ test_expect_success '1d-check: Directory renames cause a rename/rename(2to1) con
 #   Commit B: z/{oldb,oldc,d}
 #   Expected: y/{newb,newc,d}
 
-test_expect_success '1e-setup: Renamed directory, with all files being renamed too' '
+test_setup_1e () {
 	test_create_repo 1e &&
 	(
 		cd 1e &&
@@ -342,9 +356,10 @@ test_expect_success '1e-setup: Renamed directory, with all files being renamed t
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1e-check: Renamed directory, with all files being renamed too' '
+test_expect_success '1e: Renamed directory, with all files being renamed too' '
+	test_setup_1e &&
 	(
 		cd 1e &&
 
@@ -371,7 +386,7 @@ test_expect_success '1e-check: Renamed directory, with all files being renamed t
 #   Commit B: y/{b,c}, x/{d,e,f}
 #   Expected: y/{b,c}, x/{d,e,f,g}
 
-test_expect_success '1f-setup: Split a directory into two other directories' '
+test_setup_1f () {
 	test_create_repo 1f &&
 	(
 		cd 1f &&
@@ -408,9 +423,10 @@ test_expect_success '1f-setup: Split a directory into two other directories' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1f-check: Split a directory into two other directories' '
+test_expect_success '1f: Split a directory into two other directories' '
+	test_setup_1f &&
 	(
 		cd 1f &&
 
@@ -438,7 +454,7 @@ test_expect_success '1f-check: Split a directory into two other directories' '
 #   the directory renamed, but the files within it. (see 1b)
 #
 #   If renames split a directory into two or more others, the directory
-#   with the most renames, "wins" (see 1c).  However, see the testcases
+#   with the most renames, "wins" (see 1f).  However, see the testcases
 #   in section 2, plus testcases 3a and 4a.
 ###########################################################################
 
@@ -459,7 +475,7 @@ test_expect_success '1f-check: Split a directory into two other directories' '
 #   Commit A: y/b, w/c
 #   Commit B: z/{b,c,d}
 #   Expected: y/b, w/c, z/d, with warning about z/ -> (y/ vs. w/) conflict
-test_expect_success '2a-setup: Directory split into two on one side, with equal numbers of paths' '
+test_setup_2a () {
 	test_create_repo 2a &&
 	(
 		cd 2a &&
@@ -489,9 +505,10 @@ test_expect_success '2a-setup: Directory split into two on one side, with equal
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '2a-check: Directory split into two on one side, with equal numbers of paths' '
+test_expect_success '2a: Directory split into two on one side, with equal numbers of paths' '
+	test_setup_2a &&
 	(
 		cd 2a &&
 
@@ -520,7 +537,7 @@ test_expect_success '2a-check: Directory split into two on one side, with equal
 #   Commit A: y/b, w/c
 #   Commit B: z/{b,c}, x/d
 #   Expected: y/b, w/c, x/d; No warning about z/ -> (y/ vs. w/) conflict
-test_expect_success '2b-setup: Directory split into two on one side, with equal numbers of paths' '
+test_setup_2b () {
 	test_create_repo 2b &&
 	(
 		cd 2b &&
@@ -551,9 +568,10 @@ test_expect_success '2b-setup: Directory split into two on one side, with equal
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '2b-check: Directory split into two on one side, with equal numbers of paths' '
+test_expect_success '2b: Directory split into two on one side, with equal numbers of paths' '
+	test_setup_2b &&
 	(
 		cd 2b &&
 
@@ -601,7 +619,7 @@ test_expect_success '2b-check: Directory split into two on one side, with equal
 #   Commit A: z/{b,c,d} (no change)
 #   Commit B: y/{b,c}, x/d
 #   Expected: y/{b,c}, x/d
-test_expect_success '3a-setup: Avoid implicit rename if involved as source on other side' '
+test_setup_3a () {
 	test_create_repo 3a &&
 	(
 		cd 3a &&
@@ -632,9 +650,10 @@ test_expect_success '3a-setup: Avoid implicit rename if involved as source on ot
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '3a-check: Avoid implicit rename if involved as source on other side' '
+test_expect_success '3a: Avoid implicit rename if involved as source on other side' '
+	test_setup_3a &&
 	(
 		cd 3a &&
 
@@ -664,7 +683,7 @@ test_expect_success '3a-check: Avoid implicit rename if involved as source on ot
 #         get it involved in directory rename detection.  If it were, we might
 #         end up with CONFLICT:(z/d -> y/d vs. x/d vs. w/d), i.e. a
 #         rename/rename/rename(1to3) conflict, which is just weird.
-test_expect_success '3b-setup: Avoid implicit rename if involved as source on current side' '
+test_setup_3b () {
 	test_create_repo 3b &&
 	(
 		cd 3b &&
@@ -697,9 +716,10 @@ test_expect_success '3b-setup: Avoid implicit rename if involved as source on cu
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '3b-check: Avoid implicit rename if involved as source on current side' '
+test_expect_success '3b: Avoid implicit rename if involved as source on current side' '
+	test_setup_3b &&
 	(
 		cd 3b &&
 
@@ -744,7 +764,7 @@ test_expect_success '3b-check: Avoid implicit rename if involved as source on cu
 #
 # What if we were to attempt to do directory rename detection when someone
 # "mostly" moved a directory but still left some files around, or,
-# equivalently, fully renamed a directory in one commmit and then recreated
+# equivalently, fully renamed a directory in one commit and then recreated
 # that directory in a later commit adding some new files and then tried to
 # merge?
 #
@@ -786,7 +806,7 @@ test_expect_success '3b-check: Avoid implicit rename if involved as source on cu
 #   Expected: y/{b,c,d}, z/{e,f}
 #   NOTE: Even though most files from z moved to y, we don't want f to follow.
 
-test_expect_success '4a-setup: Directory split, with original directory still present' '
+test_setup_4a () {
 	test_create_repo 4a &&
 	(
 		cd 4a &&
@@ -818,9 +838,10 @@ test_expect_success '4a-setup: Directory split, with original directory still pr
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '4a-check: Directory split, with original directory still present' '
+test_expect_success '4a: Directory split, with original directory still present' '
+	test_setup_4a &&
 	(
 		cd 4a &&
 
@@ -874,7 +895,7 @@ test_expect_success '4a-check: Directory split, with original directory still pr
 #         of history, giving us no way to represent this conflict in the
 #         index.
 
-test_expect_success '5a-setup: Merge directories, other side adds files to original and target' '
+test_setup_5a () {
 	test_create_repo 5a &&
 	(
 		cd 5a &&
@@ -907,9 +928,10 @@ test_expect_success '5a-setup: Merge directories, other side adds files to origi
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '5a-check: Merge directories, other side adds files to original and target' '
+test_expect_success '5a: Merge directories, other side adds files to original and target' '
+	test_setup_5a &&
 	(
 		cd 5a &&
 
@@ -941,14 +963,14 @@ test_expect_success '5a-check: Merge directories, other side adds files to origi
 #   Commit B: z/{b,c,d_1,e}, y/d_3
 #   Expected: y/{b,c,e}, CONFLICT(add/add: y/d_2 vs. y/d_3)
 #   NOTE: If z/d_1 in commit B were to be involved in dir rename detection, as
-#         we normaly would since z/ is being renamed to y/, then this would be
+#         we normally would since z/ is being renamed to y/, then this would be
 #         a rename/delete (z/d_1 -> y/d_1 vs. deleted) AND an add/add/add
 #         conflict of y/d_1 vs. y/d_2 vs. y/d_3.  Add/add/add is not
 #         representable in the index, so the existence of y/d_3 needs to
 #         cause us to bail on directory rename detection for that path, falling
 #         back to git behavior without the directory rename detection.
 
-test_expect_success '5b-setup: Rename/delete in order to get add/add/add conflict' '
+test_setup_5b () {
 	test_create_repo 5b &&
 	(
 		cd 5b &&
@@ -981,9 +1003,10 @@ test_expect_success '5b-setup: Rename/delete in order to get add/add/add conflic
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '5b-check: Rename/delete in order to get add/add/add conflict' '
+test_expect_success '5b: Rename/delete in order to get add/add/add conflict' '
+	test_setup_5b &&
 	(
 		cd 5b &&
 
@@ -1024,7 +1047,7 @@ test_expect_success '5b-check: Rename/delete in order to get add/add/add conflic
 #             y/d are y/d_2 and y/d_4.  We still do the move from z/e to y/e,
 #             though, because it doesn't have anything in the way.
 
-test_expect_success '5c-setup: Transitive rename would cause rename/rename/rename/add/add/add' '
+test_setup_5c () {
 	test_create_repo 5c &&
 	(
 		cd 5c &&
@@ -1061,9 +1084,10 @@ test_expect_success '5c-setup: Transitive rename would cause rename/rename/renam
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '5c-check: Transitive rename would cause rename/rename/rename/add/add/add' '
+test_expect_success '5c: Transitive rename would cause rename/rename/rename/add/add/add' '
+	test_setup_5c &&
 	(
 		cd 5c &&
 
@@ -1113,7 +1137,7 @@ test_expect_success '5c-check: Transitive rename would cause rename/rename/renam
 #         detection for z/d_2, but that doesn't prevent us from applying the
 #         directory rename detection for z/f -> y/f.
 
-test_expect_success '5d-setup: Directory/file/file conflict due to directory rename' '
+test_setup_5d () {
 	test_create_repo 5d &&
 	(
 		cd 5d &&
@@ -1145,9 +1169,10 @@ test_expect_success '5d-setup: Directory/file/file conflict due to directory ren
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '5d-check: Directory/file/file conflict due to directory rename' '
+test_expect_success '5d: Directory/file/file conflict due to directory rename' '
+	test_setup_5d &&
 	(
 		cd 5d &&
 
@@ -1161,10 +1186,18 @@ test_expect_success '5d-check: Directory/file/file conflict due to directory ren
 		git ls-files -u >out &&
 		test_line_count = 1 out &&
 		git ls-files -o >out &&
-		test_line_count = 2 out &&
-
-		git rev-parse >actual \
-			:0:y/b :0:y/c :0:z/d :0:y/f :2:y/d :0:y/d/e &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+			    :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d~HEAD :0:y/d/e
+		else
+			test_line_count = 2 out &&
+
+			git rev-parse >actual \
+			    :0:y/b :0:y/c :0:z/d :0:y/f :2:y/d      :0:y/d/e
+		fi &&
 		git rev-parse >expect \
 			 O:z/b  O:z/c  B:z/d  B:z/f  A:y/d  B:y/d/e &&
 		test_cmp expect actual &&
@@ -1205,7 +1238,7 @@ test_expect_success '5d-check: Directory/file/file conflict due to directory ren
 #         them under y/ doesn't accidentally catch z/d and make it look like
 #         it is also involved in a rename/delete conflict.
 
-test_expect_success '6a-setup: Tricky rename/delete' '
+test_setup_6a () {
 	test_create_repo 6a &&
 	(
 		cd 6a &&
@@ -1235,9 +1268,10 @@ test_expect_success '6a-setup: Tricky rename/delete' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '6a-check: Tricky rename/delete' '
+test_expect_success '6a: Tricky rename/delete' '
+	test_setup_6a &&
 	(
 		cd 6a &&
 
@@ -1246,35 +1280,144 @@ test_expect_success '6a-check: Tricky rename/delete' '
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
 		test_i18ngrep "CONFLICT (rename/delete).*z/c.*y/c" out &&
 
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git ls-files -s >out &&
+			test_line_count = 3 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+				:0:y/b :1:y/c :3:y/c &&
+			git rev-parse >expect \
+				 O:z/b  O:z/c  O:z/c
+		else
+			git ls-files -s >out &&
+			test_line_count = 2 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+				:0:y/b :3:y/c &&
+			git rev-parse >expect \
+				 O:z/b  O:z/c
+		fi &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 6b1, Same rename done on both sides
+#   (Related to testcase 6b2 and 8e)
+#   Commit O: z/{b,c,d,e}
+#   Commit A: y/{b,c,d}, x/e
+#   Commit B: y/{b,c,d}, z/{e,f}
+#   Expected: y/{b,c,d,f}, x/e
+#   Note: Directory rename detection says A renamed z/ -> y/ (3 paths renamed
+#         to y/ and only 1 renamed to x/), therefore the new file 'z/f' in B
+#         should be moved to 'y/f'.
+#
+#         This is a bit of an edge case where any behavior might surprise users,
+#         whether that is treating A as renaming z/ -> y/, treating A as renaming
+#         z/ -> x/, or treating A as not doing any directory rename.  However, I
+#         think this answer is the least confusing and most consistent with the
+#         rules elsewhere.
+#
+#         A note about z/ -> x/, since it may not be clear how that could come
+#         about: If we were to ignore files renamed by both sides
+#         (i.e. z/{b,c,d}), as directory rename detection did in git-2.18 thru
+#         at least git-2.28, then we would note there are no renames from z/ to
+#         y/ and one rename from z/ to x/ and thus come to the conclusion that
+#         A renamed z/ -> x/.  This seems more confusing for end users than a
+#         rename of z/ to y/, it makes directory rename detection behavior
+#         harder for them to predict.  As such, we modified the rule, changed
+#         the behavior on testcases 6b2 and 8e, and introduced this 6b1 testcase.
+
+test_setup_6b1 () {
+	test_create_repo 6b1 &&
+	(
+		cd 6b1 &&
+
+		mkdir z &&
+		echo b >z/b &&
+		echo c >z/c &&
+		echo d >z/d &&
+		echo e >z/e &&
+		git add z &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv z y &&
+		mkdir x &&
+		git mv y/e x/e &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv z y &&
+		mkdir z &&
+		git mv y/e z/e &&
+		echo f >z/f &&
+		git add z/f &&
+		test_tick &&
+		git commit -m "B"
+	)
+}
+
+test_expect_merge_algorithm failure success '6b1: Same renames done on both sides, plus another rename' '
+	test_setup_6b1 &&
+	(
+		cd 6b1 &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
 		git ls-files -s >out &&
-		test_line_count = 2 out &&
+		test_line_count = 5 out &&
 		git ls-files -u >out &&
-		test_line_count = 1 out &&
+		test_line_count = 0 out &&
 		git ls-files -o >out &&
 		test_line_count = 1 out &&
 
 		git rev-parse >actual \
-			:0:y/b :3:y/c &&
+			HEAD:y/b HEAD:y/c HEAD:y/d HEAD:x/e HEAD:y/f &&
 		git rev-parse >expect \
-			 O:z/b  O:z/c &&
+			O:z/b    O:z/c    O:z/d    O:z/e    B:z/f &&
 		test_cmp expect actual
 	)
 '
 
-# Testcase 6b, Same rename done on both sides
+# Testcase 6b2, Same rename done on both sides
 #   (Related to testcases 6c and 8e)
 #   Commit O: z/{b,c}
 #   Commit A: y/{b,c}
 #   Commit B: y/{b,c}, z/d
-#   Expected: y/{b,c}, z/d
-#   Note: If we did directory rename detection here, we'd move z/d into y/,
-#         but B did that rename and still decided to put the file into z/,
-#         so we probably shouldn't apply directory rename detection for it.
-
-test_expect_success '6b-setup: Same rename done on both sides' '
-	test_create_repo 6b &&
+#   Expected: y/{b,c,d}
+#   Alternate: y/{b,c}, z/d
+#   Note: Directory rename detection says A renamed z/ -> y/, therefore the new
+#         file 'z/d' in B should be moved to 'y/d'.
+#
+#         We could potentially ignore the renames of z/{b,c} on side A since
+#         those were renamed on both sides.  However, it's a bit of a corner
+#         case because what if there was also a z/e that side A moved to x/e
+#         and side B left alone?  If we used the "ignore renames done on both
+#         sides" logic, then we'd compute that A renamed z/ -> x/, and move
+#         z/d to x/d.  That seems more surprising and uglier than allowing
+#         the z/ -> y/ rename.
+
+test_setup_6b2 () {
+	test_create_repo 6b2 &&
 	(
-		cd 6b &&
+		cd 6b2 &&
 
 		mkdir z &&
 		echo b >z/b &&
@@ -1300,11 +1443,12 @@ test_expect_success '6b-setup: Same rename done on both sides' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '6b-check: Same rename done on both sides' '
+test_expect_merge_algorithm failure success '6b2: Same rename done on both sides' '
+	test_setup_6b2 &&
 	(
-		cd 6b &&
+		cd 6b2 &&
 
 		git checkout A^0 &&
 
@@ -1318,7 +1462,7 @@ test_expect_success '6b-check: Same rename done on both sides' '
 		test_line_count = 1 out &&
 
 		git rev-parse >actual \
-			HEAD:y/b HEAD:y/c HEAD:z/d &&
+			HEAD:y/b HEAD:y/c HEAD:y/d &&
 		git rev-parse >expect \
 			O:z/b    O:z/c    B:z/d &&
 		test_cmp expect actual
@@ -1326,7 +1470,7 @@ test_expect_success '6b-check: Same rename done on both sides' '
 '
 
 # Testcase 6c, Rename only done on same side
-#   (Related to testcases 6b and 8e)
+#   (Related to testcases 6b1, 6b2, and 8e)
 #   Commit O: z/{b,c}
 #   Commit A: z/{b,c} (no change)
 #   Commit B: y/{b,c}, z/d
@@ -1334,7 +1478,7 @@ test_expect_success '6b-check: Same rename done on both sides' '
 #   NOTE: Seems obvious, but just checking that the implementation doesn't
 #         "accidentally detect a rename" and give us y/{b,c,d}.
 
-test_expect_success '6c-setup: Rename only done on same side' '
+test_setup_6c () {
 	test_create_repo 6c &&
 	(
 		cd 6c &&
@@ -1362,9 +1506,10 @@ test_expect_success '6c-setup: Rename only done on same side' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '6c-check: Rename only done on same side' '
+test_expect_success '6c: Rename only done on same side' '
+	test_setup_6c &&
 	(
 		cd 6c &&
 
@@ -1396,7 +1541,7 @@ test_expect_success '6c-check: Rename only done on same side' '
 #   NOTE: Again, this seems obvious but just checking that the implementation
 #         doesn't "accidentally detect a rename" and give us y/{b,c,d}.
 
-test_expect_success '6d-setup: We do not always want transitive renaming' '
+test_setup_6d () {
 	test_create_repo 6d &&
 	(
 		cd 6d &&
@@ -1424,9 +1569,10 @@ test_expect_success '6d-setup: We do not always want transitive renaming' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '6d-check: We do not always want transitive renaming' '
+test_expect_success '6d: We do not always want transitive renaming' '
+	test_setup_6d &&
 	(
 		cd 6d &&
 
@@ -1458,7 +1604,7 @@ test_expect_success '6d-check: We do not always want transitive renaming' '
 #         doesn't "accidentally detect a rename" and give us y/{b,c} +
 #         add/add conflict on y/d_1 vs y/d_2.
 
-test_expect_success '6e-setup: Add/add from one side' '
+test_setup_6e () {
 	test_create_repo 6e &&
 	(
 		cd 6e &&
@@ -1487,9 +1633,10 @@ test_expect_success '6e-setup: Add/add from one side' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '6e-check: Add/add from one side' '
+test_expect_success '6e: Add/add from one side' '
+	test_setup_6e &&
 	(
 		cd 6e &&
 
@@ -1552,7 +1699,7 @@ test_expect_success '6e-check: Add/add from one side' '
 #   Expected: y/d, CONFLICT(rename/rename for both z/b and z/c)
 #   NOTE: There's a rename of z/ here, y/ has more renames, so z/d -> y/d.
 
-test_expect_success '7a-setup: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' '
+test_setup_7a () {
 	test_create_repo 7a &&
 	(
 		cd 7a &&
@@ -1583,9 +1730,10 @@ test_expect_success '7a-setup: rename-dir vs. rename-dir (NOT split evenly) PLUS
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '7a-check: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' '
+test_expect_success '7a: rename-dir vs. rename-dir (NOT split evenly) PLUS add-other-file' '
+	test_setup_7a &&
 	(
 		cd 7a &&
 
@@ -1623,7 +1771,7 @@ test_expect_success '7a-check: rename-dir vs. rename-dir (NOT split evenly) PLUS
 #   Commit B: z/{b,c,d_1},        w/d_2
 #   Expected: y/{b,c}, CONFLICT(rename/rename(2to1): x/d_1, w/d_2 -> y_d)
 
-test_expect_success '7b-setup: rename/rename(2to1), but only due to transitive rename' '
+test_setup_7b () {
 	test_create_repo 7b &&
 	(
 		cd 7b &&
@@ -1655,16 +1803,17 @@ test_expect_success '7b-setup: rename/rename(2to1), but only due to transitive r
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '7b-check: rename/rename(2to1), but only due to transitive rename' '
+test_expect_success '7b: rename/rename(2to1), but only due to transitive rename' '
+	test_setup_7b &&
 	(
 		cd 7b &&
 
 		git checkout A^0 &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
+		test_i18ngrep "CONFLICT (\(.*\)/\1)" out &&
 
 		git ls-files -s >out &&
 		test_line_count = 4 out &&
@@ -1683,11 +1832,20 @@ test_expect_success '7b-check: rename/rename(2to1), but only due to transitive r
 		git cat-file -p :2:y/d >expect &&
 		git cat-file -p :3:y/d >other &&
 		>empty &&
-		test_must_fail git merge-file \
-			-L "HEAD" \
-			-L "" \
-			-L "B^0" \
-			expect empty other &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_must_fail git merge-file \
+				-L "HEAD:y/d" \
+				-L "" \
+				-L "B^0:z/d" \
+				expect empty other
+		else
+			test_must_fail git merge-file \
+				-L "HEAD" \
+				-L "" \
+				-L "B^0" \
+				expect empty other
+		fi &&
 		test_cmp expect y/d
 	)
 '
@@ -1702,7 +1860,7 @@ test_expect_success '7b-check: rename/rename(2to1), but only due to transitive r
 #         neither CONFLICT(x/d -> w/d vs. z/d)
 #         nor CONFLiCT x/d -> w/d vs. y/d vs. z/d)
 
-test_expect_success '7c-setup: rename/rename(1to...2or3); transitive rename may add complexity' '
+test_setup_7c () {
 	test_create_repo 7c &&
 	(
 		cd 7c &&
@@ -1732,9 +1890,10 @@ test_expect_success '7c-setup: rename/rename(1to...2or3); transitive rename may
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '7c-check: rename/rename(1to...2or3); transitive rename may add complexity' '
+test_expect_success '7c: rename/rename(1to...2or3); transitive rename may add complexity' '
+	test_setup_7c &&
 	(
 		cd 7c &&
 
@@ -1766,7 +1925,7 @@ test_expect_success '7c-check: rename/rename(1to...2or3); transitive rename may
 #   Expected: y/{b,c}, CONFLICT(delete x/d vs rename to y/d)
 #   NOTE: z->y so NOT CONFLICT(delete x/d vs rename to z/d)
 
-test_expect_success '7d-setup: transitive rename involved in rename/delete; how is it reported?' '
+test_setup_7d () {
 	test_create_repo 7d &&
 	(
 		cd 7d &&
@@ -1796,9 +1955,10 @@ test_expect_success '7d-setup: transitive rename involved in rename/delete; how
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '7d-check: transitive rename involved in rename/delete; how is it reported?' '
+test_expect_success '7d: transitive rename involved in rename/delete; how is it reported?' '
+	test_setup_7d &&
 	(
 		cd 7d &&
 
@@ -1807,17 +1967,32 @@ test_expect_success '7d-check: transitive rename involved in rename/delete; how
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
 		test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
 
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 1 out &&
-
-		git rev-parse >actual \
-			:0:y/b :0:y/c :3:y/d &&
-		git rev-parse >expect \
-			 O:z/b  O:z/c  O:x/d &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+				:0:y/b :0:y/c :1:y/d :3:y/d &&
+			git rev-parse >expect \
+				 O:z/b  O:z/c  O:x/d  O:x/d
+		else
+			git ls-files -s >out &&
+			test_line_count = 3 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+				:0:y/b :0:y/c :3:y/d &&
+			git rev-parse >expect \
+				 O:z/b  O:z/c  O:x/d
+		fi &&
 		test_cmp expect actual
 	)
 '
@@ -1851,7 +2026,7 @@ test_expect_success '7d-check: transitive rename involved in rename/delete; how
 #         see testcases 9c and 9d for further discussion of this issue and
 #         how it's resolved.
 
-test_expect_success '7e-setup: transitive rename in rename/delete AND dirs in the way' '
+test_setup_7e () {
 	test_create_repo 7e &&
 	(
 		cd 7e &&
@@ -1886,9 +2061,10 @@ test_expect_success '7e-setup: transitive rename in rename/delete AND dirs in th
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '7e-check: transitive rename in rename/delete AND dirs in the way' '
+test_expect_success '7e: transitive rename in rename/delete AND dirs in the way' '
+	test_setup_7e &&
 	(
 		cd 7e &&
 
@@ -1897,17 +2073,32 @@ test_expect_success '7e-check: transitive rename in rename/delete AND dirs in th
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out &&
 		test_i18ngrep "CONFLICT (rename/delete).*x/d.*y/d" out &&
 
-		git ls-files -s >out &&
-		test_line_count = 5 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 2 out &&
-
-		git rev-parse >actual \
-			:0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
-		git rev-parse >expect \
-			 A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			git ls-files -s >out &&
+			test_line_count = 6 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 1 out &&
+
+			git rev-parse >actual \
+				:0:x/d/f :0:y/d/g :0:y/b :0:y/c :1:y/d~B^0 :3:y/d~B^0 &&
+			git rev-parse >expect \
+				 A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d      O:x/d
+		else
+			git ls-files -s >out &&
+			test_line_count = 5 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 2 out &&
+
+			git rev-parse >actual \
+				:0:x/d/f :0:y/d/g :0:y/b :0:y/c :3:y/d &&
+			git rev-parse >expect \
+				 A:x/d/f  A:y/d/g  O:z/b  O:z/c  O:x/d
+		fi &&
 		test_cmp expect actual &&
 
 		git hash-object y/d~B^0 >actual &&
@@ -1945,7 +2136,7 @@ test_expect_success '7e-check: transitive rename in rename/delete AND dirs in th
 # simple rule from section 5 prevents me from handling this as optimally as
 # we potentially could.
 
-test_expect_success '8a-setup: Dual-directory rename, one into the others way' '
+test_setup_8a () {
 	test_create_repo 8a &&
 	(
 		cd 8a &&
@@ -1977,9 +2168,10 @@ test_expect_success '8a-setup: Dual-directory rename, one into the others way' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '8a-check: Dual-directory rename, one into the others way' '
+test_expect_success '8a: Dual-directory rename, one into the others way' '
+	test_setup_8a &&
 	(
 		cd 8a &&
 
@@ -2023,7 +2215,7 @@ test_expect_success '8a-check: Dual-directory rename, one into the others way' '
 # making us fall back to pre-directory-rename-detection behavior for both
 # e_1 and e_2.
 
-test_expect_success '8b-setup: Dual-directory rename, one into the others way, with conflicting filenames' '
+test_setup_8b () {
 	test_create_repo 8b &&
 	(
 		cd 8b &&
@@ -2055,9 +2247,10 @@ test_expect_success '8b-setup: Dual-directory rename, one into the others way, w
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '8b-check: Dual-directory rename, one into the others way, with conflicting filenames' '
+test_expect_success '8b: Dual-directory rename, one into the others way, with conflicting filenames' '
+	test_setup_8b &&
 	(
 		cd 8b &&
 
@@ -2089,14 +2282,14 @@ test_expect_success '8b-check: Dual-directory rename, one into the others way, w
 #
 #   Note: It could easily be argued that the correct resolution here is
 #         y/{b,c,e}, CONFLICT(rename/delete: z/d -> y/d vs deleted)
-#         and that the modifed version of d should be present in y/ after
+#         and that the modified version of d should be present in y/ after
 #         the merge, just marked as conflicted.  Indeed, I previously did
 #         argue that.  But applying directory renames to the side of
 #         history where a file is merely modified results in spurious
 #         rename/rename(1to2) conflicts -- see testcase 9h.  See also
 #         notes in 8d.
 
-test_expect_success '8c-setup: modify/delete or rename+modify/delete?' '
+test_setup_8c () {
 	test_create_repo 8c &&
 	(
 		cd 8c &&
@@ -2127,9 +2320,10 @@ test_expect_success '8c-setup: modify/delete or rename+modify/delete?' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '8c-check: modify/delete or rename+modify/delete' '
+test_expect_success '8c: modify/delete or rename+modify/delete' '
+	test_setup_8c &&
 	(
 		cd 8c &&
 
@@ -2175,7 +2369,7 @@ test_expect_success '8c-check: modify/delete or rename+modify/delete' '
 #   during merging are supposed to be about opposite sides doing things
 #   differently.
 
-test_expect_success '8d-setup: rename/delete...or not?' '
+test_setup_8d () {
 	test_create_repo 8d &&
 	(
 		cd 8d &&
@@ -2204,9 +2398,10 @@ test_expect_success '8d-setup: rename/delete...or not?' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '8d-check: rename/delete...or not?' '
+test_expect_success '8d: rename/delete...or not?' '
+	test_setup_8d &&
 	(
 		cd 8d &&
 
@@ -2231,26 +2426,33 @@ test_expect_success '8d-check: rename/delete...or not?' '
 #   Commit B: w/{b,c}, z/d
 #
 # Possible Resolutions:
-#   w/o dir-rename detection: z/d, CONFLICT(z/b -> y/b vs. w/b),
-#                                  CONFLICT(z/c -> y/c vs. w/c)
-#   Currently expected:       y/d, CONFLICT(z/b -> y/b vs. w/b),
-#                                  CONFLICT(z/c -> y/c vs. w/c)
-#   Optimal:                  ??
+#   if z not considered renamed: z/d, CONFLICT(z/b -> y/b vs. w/b),
+#                                     CONFLICT(z/c -> y/c vs. w/c)
+#   if z->y rename considered:   y/d, CONFLICT(z/b -> y/b vs. w/b),
+#                                     CONFLICT(z/c -> y/c vs. w/c)
+#   Optimal:                     ??
 #
 # Notes: In commit A, directory z got renamed to y.  In commit B, directory z
 #        did NOT get renamed; the directory is still present; instead it is
 #        considered to have just renamed a subset of paths in directory z
-#        elsewhere.  Therefore, the directory rename done in commit A to z/
-#        applies to z/d and maps it to y/d.
+#        elsewhere.  This is much like testcase 6b2 (where commit B moves all
+#        the original paths out of z/ but opted to keep d within z/).
+#
+#        It was not clear in the past what should be done with this testcase;
+#        in fact, I noted that I "just picked one" previously.  However,
+#        following the new logic for testcase 6b2, we should take the rename
+#        and move z/d to y/d.
 #
-#        It's possible that users would get confused about this, but what
-#        should we do instead?  Silently leaving at z/d seems just as bad or
-#        maybe even worse.  Perhaps we could print a big warning about z/d
-#        and how we're moving to y/d in this case, but when I started thinking
-#        about the ramifications of doing that, I didn't know how to rule out
-#        that opening other weird edge and corner cases so I just punted.
-
-test_expect_success '8e-setup: Both sides rename, one side adds to original directory' '
+#        6b1, 6b2, and this case are definitely somewhat fuzzy in terms of
+#        whether they are optimal for end users, but (a) the default for
+#        directory rename detection is to mark these all as conflicts
+#        anyway, (b) it feels like this is less prone to higher order corner
+#        case confusion, and (c) the current algorithm requires less global
+#        knowledge (i.e. less coupling in the algorithm between renames done
+#        on both sides) which thus means users are better able to predict
+#        the behavior, and predict it without computing as many details.
+
+test_setup_8e () {
 	test_create_repo 8e &&
 	(
 		cd 8e &&
@@ -2279,9 +2481,10 @@ test_expect_success '8e-setup: Both sides rename, one side adds to original dire
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '8e-check: Both sides rename, one side adds to original directory' '
+test_expect_success '8e: Both sides rename, one side adds to original directory' '
+	test_setup_8e &&
 	(
 		cd 8e &&
 
@@ -2333,7 +2536,7 @@ test_expect_success '8e-check: Both sides rename, one side adds to original dire
 #         of which one had the most paths going to it.  A naive implementation
 #         of that could take the new file in commit B at z/i to x/w/i or x/i.
 
-test_expect_success '9a-setup: Inner renamed directory within outer renamed directory' '
+test_setup_9a () {
 	test_create_repo 9a &&
 	(
 		cd 9a &&
@@ -2366,9 +2569,10 @@ test_expect_success '9a-setup: Inner renamed directory within outer renamed dire
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9a-check: Inner renamed directory within outer renamed directory' '
+test_expect_success '9a: Inner renamed directory within outer renamed directory' '
+	test_setup_9a &&
 	(
 		cd 9a &&
 
@@ -2404,7 +2608,7 @@ test_expect_success '9a-check: Inner renamed directory within outer renamed dire
 #   Commit B: z/{b,c,d_3}
 #   Expected: y/{b,c,d_merged}
 
-test_expect_success '9b-setup: Transitive rename with content merge' '
+test_setup_9b () {
 	test_create_repo 9b &&
 	(
 		cd 9b &&
@@ -2436,9 +2640,10 @@ test_expect_success '9b-setup: Transitive rename with content merge' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9b-check: Transitive rename with content merge' '
+test_expect_success '9b: Transitive rename with content merge' '
+	test_setup_9b &&
 	(
 		cd 9b &&
 
@@ -2491,7 +2696,7 @@ test_expect_success '9b-check: Transitive rename with content merge' '
 #         away, then ignore that particular rename from the other side of
 #         history for any implicit directory renames.
 
-test_expect_success '9c-setup: Doubly transitive rename?' '
+test_setup_9c () {
 	test_create_repo 9c &&
 	(
 		cd 9c &&
@@ -2526,9 +2731,10 @@ test_expect_success '9c-setup: Doubly transitive rename?' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9c-check: Doubly transitive rename?' '
+test_expect_success '9c: Doubly transitive rename?' '
+	test_setup_9c &&
 	(
 		cd 9c &&
 
@@ -2579,7 +2785,7 @@ test_expect_success '9c-check: Doubly transitive rename?' '
 #   simple rules that are consistent with what we need for all the other
 #   testcases and simplifies things for the user.
 
-test_expect_success '9d-setup: N-way transitive rename?' '
+test_setup_9d () {
 	test_create_repo 9d &&
 	(
 		cd 9d &&
@@ -2614,9 +2820,10 @@ test_expect_success '9d-setup: N-way transitive rename?' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9d-check: N-way transitive rename?' '
+test_expect_success '9d: N-way transitive rename?' '
+	test_setup_9d &&
 	(
 		cd 9d &&
 
@@ -2653,7 +2860,7 @@ test_expect_success '9d-check: N-way transitive rename?' '
 #   Expected: combined/{a,b,c,d,e,f,g,h,i,j,k,l}, CONFLICT(Nto1) warnings,
 #             dir1/yo, dir2/yo, dir3/yo, dirN/yo
 
-test_expect_success '9e-setup: N-to-1 whammo' '
+test_setup_9e () {
 	test_create_repo 9e &&
 	(
 		cd 9e &&
@@ -2696,9 +2903,10 @@ test_expect_success '9e-setup: N-to-1 whammo' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success C_LOCALE_OUTPUT '9e-check: N-to-1 whammo' '
+test_expect_success '9e: N-to-1 whammo' '
+	test_setup_9e &&
 	(
 		cd 9e &&
 
@@ -2745,7 +2953,7 @@ test_expect_success C_LOCALE_OUTPUT '9e-check: N-to-1 whammo' '
 #   Commit B: goal/{a,b}/$more_files, goal/c
 #   Expected: priority/{a,b}/$more_files, priority/c
 
-test_expect_success '9f-setup: Renamed directory that only contained immediate subdirs' '
+test_setup_9f () {
 	test_create_repo 9f &&
 	(
 		cd 9f &&
@@ -2774,9 +2982,10 @@ test_expect_success '9f-setup: Renamed directory that only contained immediate s
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9f-check: Renamed directory that only contained immediate subdirs' '
+test_expect_success '9f: Renamed directory that only contained immediate subdirs' '
+	test_setup_9f &&
 	(
 		cd 9f &&
 
@@ -2808,8 +3017,16 @@ test_expect_success '9f-check: Renamed directory that only contained immediate s
 #   Commit A: priority/{alpha,bravo}/$more_files
 #   Commit B: goal/{a,b}/$more_files, goal/c
 #   Expected: priority/{alpha,bravo}/$more_files, priority/c
-
-test_expect_success '9g-setup: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' '
+# We currently fail this test because the directory renames we detect are
+#   goal/a/ -> priority/alpha/
+#   goal/b/ -> priority/bravo/
+# We do not detect
+#   goal/   -> priority/
+# because of no files found within goal/, and the fact that "a" != "alpha"
+# and "b" != "bravo".  But I'm not sure it's really a failure given that
+# viewpoint...
+
+test_setup_9g () {
 	test_create_repo 9g &&
 	(
 		cd 9g &&
@@ -2841,9 +3058,10 @@ test_expect_success '9g-setup: Renamed directory that only contained immediate s
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_failure '9g-check: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' '
+test_expect_failure '9g: Renamed directory that only contained immediate subdirs, immediate subdirs renamed' '
+	test_setup_9g &&
 	(
 		cd 9g &&
 
@@ -2877,7 +3095,7 @@ test_expect_failure '9g-check: Renamed directory that only contained immediate s
 #   Expected: y/{b,c}, x/d_2
 #   NOTE: If we applied the z/ -> y/ rename to z/d, then we'd end up with
 #         a rename/rename(1to2) conflict (z/d -> y/d vs. x/d)
-test_expect_success '9h-setup: Avoid dir rename on merely modified path' '
+test_setup_9h () {
 	test_create_repo 9h &&
 	(
 		cd 9h &&
@@ -2910,9 +3128,10 @@ test_expect_success '9h-setup: Avoid dir rename on merely modified path' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '9h-check: Avoid dir rename on merely modified path' '
+test_expect_success '9h: Avoid dir rename on merely modified path' '
+	test_setup_9h &&
 	(
 		cd 9h &&
 
@@ -2957,7 +3176,7 @@ test_expect_success '9h-check: Avoid dir rename on merely modified path' '
 #   Expected: Aborted Merge +
 #       ERROR_MSG(untracked working tree files would be overwritten by merge)
 
-test_expect_success '10a-setup: Overwrite untracked with normal rename/delete' '
+test_setup_10a () {
 	test_create_repo 10a &&
 	(
 		cd 10a &&
@@ -2983,9 +3202,10 @@ test_expect_success '10a-setup: Overwrite untracked with normal rename/delete' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '10a-check: Overwrite untracked with normal rename/delete' '
+test_expect_success '10a: Overwrite untracked with normal rename/delete' '
+	test_setup_10a &&
 	(
 		cd 10a &&
 
@@ -2994,6 +3214,7 @@ test_expect_success '10a-check: Overwrite untracked with normal rename/delete' '
 		echo important >z/d &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+		test_path_is_missing .git/MERGE_HEAD &&
 		test_i18ngrep "The following untracked working tree files would be overwritten by merge" err &&
 
 		git ls-files -s >out &&
@@ -3021,7 +3242,7 @@ test_expect_success '10a-check: Overwrite untracked with normal rename/delete' '
 #             z/c_1 -> z/d_1 rename recorded at stage 3 for y/d +
 #       ERROR_MSG(refusing to lose untracked file at 'y/d')
 
-test_expect_success '10b-setup: Overwrite untracked with dir rename + delete' '
+test_setup_10b () {
 	test_create_repo 10b &&
 	(
 		cd 10b &&
@@ -3050,9 +3271,10 @@ test_expect_success '10b-setup: Overwrite untracked with dir rename + delete' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '10b-check: Overwrite untracked with dir rename + delete' '
+test_expect_success '10b: Overwrite untracked with dir rename + delete' '
+	test_setup_10b &&
 	(
 		cd 10b &&
 
@@ -3062,21 +3284,34 @@ test_expect_success '10b-check: Overwrite untracked with dir rename + delete' '
 		echo contents >y/e &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
-		test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 5 out &&
-
-		git rev-parse >actual \
-			:0:y/b :3:y/d :3:y/e &&
-		git rev-parse >expect \
-			O:z/b  O:z/c  B:z/e &&
-		test_cmp expect actual &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
+
+			git ls-files -s >out &&
+			test_line_count = 1 out &&
+			git ls-files -u >out &&
+			test_line_count = 0 out &&
+			git ls-files -o >out &&
+			test_line_count = 5 out
+		else
+			test_i18ngrep "CONFLICT (rename/delete).*Version B\^0 of y/d left in tree at y/d~B\^0" out &&
+			test_i18ngrep "Error: Refusing to lose untracked file at y/e; writing to y/e~B\^0 instead" out &&
+
+			git ls-files -s >out &&
+			test_line_count = 3 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 5 out &&
+
+			git rev-parse >actual \
+				:0:y/b :3:y/d :3:y/e &&
+			git rev-parse >expect \
+				O:z/b  O:z/c  B:z/e &&
+			test_cmp expect actual
+		fi &&
 
 		echo very >expect &&
 		test_cmp expect y/c &&
@@ -3098,10 +3333,10 @@ test_expect_success '10b-check: Overwrite untracked with dir rename + delete' '
 #             y/c~B^0 +
 #             ERROR_MSG(Refusing to lose untracked file at y/c)
 
-test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2)' '
-	test_create_repo 10c &&
+test_setup_10c () {
+	test_create_repo 10c_$1 &&
 	(
-		cd 10c &&
+		cd 10c_$1 &&
 
 		mkdir z x &&
 		echo a >z/a &&
@@ -3128,44 +3363,59 @@ test_expect_success '10c-setup: Overwrite untracked with dir rename/rename(1to2)
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2)' '
+test_expect_success '10c1: Overwrite untracked with dir rename/rename(1to2)' '
+	test_setup_10c 1 &&
 	(
-		cd 10c &&
+		cd 10c_1 &&
 
 		git checkout A^0 &&
 		echo important >y/c &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
-		test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
-
-		git rev-parse >actual \
-			:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :3:y/c &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
-		test_cmp expect actual &&
-
-		git hash-object y/c~B^0 >actual &&
-		git rev-parse O:x/c >expect &&
-		test_cmp expect actual &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
+
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 0 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out
+		else
+			test_i18ngrep "CONFLICT (rename/rename)" out &&
+			test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~B\^0 instead" out &&
+
+			git ls-files -s >out &&
+			test_line_count = 6 out &&
+			git ls-files -u >out &&
+			test_line_count = 3 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
+
+			git rev-parse >actual \
+				:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :3:y/c &&
+			git rev-parse >expect \
+				 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
+			test_cmp expect actual &&
+
+			git hash-object y/c~B^0 >actual &&
+			git rev-parse O:x/c >expect &&
+			test_cmp expect actual
+		fi &&
 
 		echo important >expect &&
 		test_cmp expect y/c
 	)
 '
 
-test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2), other direction' '
+test_expect_success '10c2: Overwrite untracked with dir rename/rename(1to2), other direction' '
+	test_setup_10c 2 &&
 	(
-		cd 10c &&
+		cd 10c_2 &&
 
 		git reset --hard &&
 		git clean -fdqx &&
@@ -3175,25 +3425,38 @@ test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2)
 		echo important >y/c &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
-		test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~HEAD instead" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 3 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
-
-		git rev-parse >actual \
-			:0:y/a :0:y/b :0:x/d :1:x/c :3:w/c :2:y/c &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
-		test_cmp expect actual &&
-
-		git hash-object y/c~HEAD >actual &&
-		git rev-parse O:x/c >expect &&
-		test_cmp expect actual &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
+
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 0 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out
+		else
+			test_i18ngrep "CONFLICT (rename/rename)" out &&
+			test_i18ngrep "Refusing to lose untracked file at y/c; adding as y/c~HEAD instead" out &&
+
+			git ls-files -s >out &&
+			test_line_count = 6 out &&
+			git ls-files -u >out &&
+			test_line_count = 3 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
+
+			git rev-parse >actual \
+				:0:y/a :0:y/b :0:x/d :1:x/c :3:w/c :2:y/c &&
+			git rev-parse >expect \
+				 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  O:x/c &&
+			test_cmp expect actual &&
+
+			git hash-object y/c~HEAD >actual &&
+			git rev-parse O:x/c >expect &&
+			test_cmp expect actual
+		fi &&
 
 		echo important >expect &&
 		test_cmp expect y/c
@@ -3208,7 +3471,7 @@ test_expect_success '10c-check: Overwrite untracked with dir rename/rename(1to2)
 #             CONFLICT(rename/rename) z/c_1 vs x/f_2 -> y/wham
 #             ERROR_MSG(Refusing to lose untracked file at y/wham)
 
-test_expect_success '10d-setup: Delete untracked with dir rename/rename(2to1)' '
+test_setup_10d () {
 	test_create_repo 10d &&
 	(
 		cd 10d &&
@@ -3240,9 +3503,10 @@ test_expect_success '10d-setup: Delete untracked with dir rename/rename(2to1)' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '10d-check: Delete untracked with dir rename/rename(2to1)' '
+test_expect_success '10d: Delete untracked with dir rename/rename(2to1)' '
+	test_setup_10d &&
 	(
 		cd 10d &&
 
@@ -3250,37 +3514,50 @@ test_expect_success '10d-check: Delete untracked with dir rename/rename(2to1)' '
 		echo important >y/wham &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
-		test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 6 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
-
-		git rev-parse >actual \
-			:0:y/a :0:y/b :0:y/d :0:y/e :2:y/wham :3:y/wham &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  O:x/d  O:x/e  O:z/c     O:x/f &&
-		test_cmp expect actual &&
-
-		test_must_fail git rev-parse :1:y/wham &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_i18ngrep "error: The following untracked working tree files would be overwritten by merge" err &&
+
+			git ls-files -s >out &&
+			test_line_count = 6 out &&
+			git ls-files -u >out &&
+			test_line_count = 0 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out
+		else
+			test_i18ngrep "CONFLICT (rename/rename)" out &&
+			test_i18ngrep "Refusing to lose untracked file at y/wham" out &&
+
+			git ls-files -s >out &&
+			test_line_count = 6 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
+
+			git rev-parse >actual \
+				:0:y/a :0:y/b :0:y/d :0:y/e :2:y/wham :3:y/wham &&
+			git rev-parse >expect \
+				 O:z/a  O:z/b  O:x/d  O:x/e  O:z/c     O:x/f &&
+			test_cmp expect actual &&
+
+			test_must_fail git rev-parse :1:y/wham &&
+
+			# Test that two-way merge in y/wham~merged is as expected
+			git cat-file -p :2:y/wham >expect &&
+			git cat-file -p :3:y/wham >other &&
+			>empty &&
+			test_must_fail git merge-file \
+				-L "HEAD" \
+				-L "" \
+				-L "B^0" \
+				expect empty other &&
+			test_cmp expect y/wham~merged
+		fi &&
 
 		echo important >expect &&
-		test_cmp expect y/wham &&
-
-		# Test that the two-way merge in y/wham~merged is as expected
-		git cat-file -p :2:y/wham >expect &&
-		git cat-file -p :3:y/wham >other &&
-		>empty &&
-		test_must_fail git merge-file \
-			-L "HEAD" \
-			-L "" \
-			-L "B^0" \
-			expect empty other &&
-		test_cmp expect y/wham~merged
+		test_cmp expect y/wham
 	)
 '
 
@@ -3290,7 +3567,7 @@ test_expect_success '10d-check: Delete untracked with dir rename/rename(2to1)' '
 #   Commit B: z/{a,b,c}
 #   Expected: y/{a,b,c} + untracked z/c
 
-test_expect_success '10e-setup: Does git complain about untracked file that is not really in the way?' '
+test_setup_10e () {
 	test_create_repo 10e &&
 	(
 		cd 10e &&
@@ -3317,9 +3594,10 @@ test_expect_success '10e-setup: Does git complain about untracked file that is n
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_failure '10e-check: Does git complain about untracked file that is not really in the way?' '
+test_expect_merge_algorithm failure success '10e: Does git complain about untracked file that is not really in the way?' '
+	test_setup_10e &&
 	(
 		cd 10e &&
 
@@ -3371,7 +3649,7 @@ test_expect_failure '10e-check: Does git complain about untracked file that is n
 #             z/c~HEAD with contents of B:z/b_v2,
 #             z/c with uncommitted mods on top of A:z/c_v1
 
-test_expect_success '11a-setup: Avoid losing dirty contents with simple rename' '
+test_setup_11a () {
 	test_create_repo 11a &&
 	(
 		cd 11a &&
@@ -3398,9 +3676,10 @@ test_expect_success '11a-setup: Avoid losing dirty contents with simple rename'
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11a-check: Avoid losing dirty contents with simple rename' '
+test_expect_success '11a: Avoid losing dirty contents with simple rename' '
+	test_setup_11a &&
 	(
 		cd 11a &&
 
@@ -3408,28 +3687,35 @@ test_expect_success '11a-check: Avoid losing dirty contents with simple rename'
 		echo stuff >>z/c &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+
+			git ls-files -s >out &&
+			test_line_count = 2 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
+
+			git rev-parse >actual \
+				:0:z/a :2:z/c &&
+			git rev-parse >expect \
+				 O:z/a  B:z/b &&
+			test_cmp expect actual &&
+
+			git hash-object z/c~HEAD >actual &&
+			git rev-parse B:z/b >expect &&
+			test_cmp expect actual
+		fi &&
 
 		test_seq 1 10 >expected &&
 		echo stuff >>expected &&
-		test_cmp expected z/c &&
-
-		git ls-files -s >out &&
-		test_line_count = 2 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 4 out &&
+		test_cmp expected z/c
 
-		git rev-parse >actual \
-			:0:z/a :2:z/c &&
-		git rev-parse >expect \
-			 O:z/a  B:z/b &&
-		test_cmp expect actual &&
-
-		git hash-object z/c~HEAD >actual &&
-		git rev-parse B:z/b >expect &&
-		test_cmp expect actual
 	)
 '
 
@@ -3441,7 +3727,7 @@ test_expect_success '11a-check: Avoid losing dirty contents with simple rename'
 #             ERROR_MSG(Refusing to lose dirty file at z/c)
 
 
-test_expect_success '11b-setup: Avoid losing dirty file involved in directory rename' '
+test_setup_11b () {
 	test_create_repo 11b &&
 	(
 		cd 11b &&
@@ -3470,41 +3756,49 @@ test_expect_success '11b-setup: Avoid losing dirty file involved in directory re
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11b-check: Avoid losing dirty file involved in directory rename' '
+test_expect_success '11b: Avoid losing dirty file involved in directory rename' '
+	test_setup_11b &&
 	(
 		cd 11b &&
 
 		git checkout A^0 &&
 		echo stuff >>z/c &&
 
-		git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
+			test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+
+			git ls-files -s >out &&
+			test_line_count = 3 out &&
+			git ls-files -u >out &&
+			test_line_count = 0 out &&
+			git ls-files -m >out &&
+			test_line_count = 0 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
+
+			git rev-parse >actual \
+				:0:x/b :0:y/a :0:y/c &&
+			git rev-parse >expect \
+				 O:x/b  O:z/a  B:x/c &&
+			test_cmp expect actual &&
+
+			git hash-object y/c >actual &&
+			git rev-parse B:x/c >expect &&
+			test_cmp expect actual
+		fi &&
 
 		grep -q stuff z/c &&
 		test_seq 1 10 >expected &&
 		echo stuff >>expected &&
-		test_cmp expected z/c &&
-
-		git ls-files -s >out &&
-		test_line_count = 3 out &&
-		git ls-files -u >out &&
-		test_line_count = 0 out &&
-		git ls-files -m >out &&
-		test_line_count = 0 out &&
-		git ls-files -o >out &&
-		test_line_count = 4 out &&
-
-		git rev-parse >actual \
-			:0:x/b :0:y/a :0:y/c &&
-		git rev-parse >expect \
-			 O:x/b  O:z/a  B:x/c &&
-		test_cmp expect actual &&
-
-		git hash-object y/c >actual &&
-		git rev-parse B:x/c >expect &&
-		test_cmp expect actual
+		test_cmp expected z/c
 	)
 '
 
@@ -3515,7 +3809,7 @@ test_expect_success '11b-check: Avoid losing dirty file involved in directory re
 #   Expected: Abort_msg("following files would be overwritten by merge") +
 #             y/c left untouched (still has uncommitted mods)
 
-test_expect_success '11c-setup: Avoid losing not-uptodate with rename + D/F conflict' '
+test_setup_11c () {
 	test_create_repo 11c &&
 	(
 		cd 11c &&
@@ -3545,9 +3839,10 @@ test_expect_success '11c-setup: Avoid losing not-uptodate with rename + D/F conf
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11c-check: Avoid losing not-uptodate with rename + D/F conflict' '
+test_expect_success '11c: Avoid losing not-uptodate with rename + D/F conflict' '
+	test_setup_11c &&
 	(
 		cd 11c &&
 
@@ -3555,7 +3850,13 @@ test_expect_success '11c-check: Avoid losing not-uptodate with rename + D/F conf
 		echo stuff >>y/c &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "following files would be overwritten by merge" err &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			test_i18ngrep "following files would be overwritten by merge" err
+		fi &&
 
 		grep -q stuff y/c &&
 		test_seq 1 10 >expected &&
@@ -3581,7 +3882,7 @@ test_expect_success '11c-check: Avoid losing not-uptodate with rename + D/F conf
 #             Warning_Msg("Refusing to lose dirty file at z/c) +
 #             y/{a,c~HEAD,c/d}, x/b, now-untracked z/c_v1 with uncommitted mods
 
-test_expect_success '11d-setup: Avoid losing not-uptodate with rename + D/F conflict' '
+test_setup_11d () {
 	test_create_repo 11d &&
 	(
 		cd 11d &&
@@ -3612,9 +3913,10 @@ test_expect_success '11d-setup: Avoid losing not-uptodate with rename + D/F conf
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conflict' '
+test_expect_success '11d: Avoid losing not-uptodate with rename + D/F conflict' '
+	test_setup_11d &&
 	(
 		cd 11d &&
 
@@ -3622,29 +3924,35 @@ test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conf
 		echo stuff >>z/c &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			test_i18ngrep "Refusing to lose dirty file at z/c" out &&
+
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 1 out &&
+			git ls-files -o >out &&
+			test_line_count = 4 out &&
+
+			git rev-parse >actual \
+				:0:x/b :0:y/a :0:y/c/d :3:y/c &&
+			git rev-parse >expect \
+				 O:x/b  O:z/a  B:y/c/d  B:x/c &&
+			test_cmp expect actual &&
+
+			git hash-object y/c~HEAD >actual &&
+			git rev-parse B:x/c >expect &&
+			test_cmp expect actual
+		fi &&
 
 		grep -q stuff z/c &&
 		test_seq 1 10 >expected &&
 		echo stuff >>expected &&
-		test_cmp expected z/c &&
-
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 1 out &&
-		git ls-files -o >out &&
-		test_line_count = 5 out &&
-
-		git rev-parse >actual \
-			:0:x/b :0:y/a :0:y/c/d :3:y/c &&
-		git rev-parse >expect \
-			 O:x/b  O:z/a  B:y/c/d  B:x/c &&
-		test_cmp expect actual &&
-
-		git hash-object y/c~HEAD >actual &&
-		git rev-parse B:x/c >expect &&
-		test_cmp expect actual
+		test_cmp expected z/c
 	)
 '
 
@@ -3659,7 +3967,7 @@ test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conf
 #             y/c~HEAD has A:y/c_2 contents
 #             y/c has dirty file from before merge
 
-test_expect_success '11e-setup: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' '
+test_setup_11e () {
 	test_create_repo 11e &&
 	(
 		cd 11e &&
@@ -3691,9 +3999,10 @@ test_expect_success '11e-setup: Avoid deleting not-uptodate with dir rename/rena
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11e-check: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' '
+test_expect_success '11e: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' '
+	test_setup_11e &&
 	(
 		cd 11e &&
 
@@ -3701,37 +4010,43 @@ test_expect_success '11e-check: Avoid deleting not-uptodate with dir rename/rena
 		echo mods >>y/c &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
-		test_i18ngrep "Refusing to lose dirty file at y/c" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 7 out &&
-		git ls-files -u >out &&
-		test_line_count = 4 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			test_i18ngrep "CONFLICT (rename/rename)" out &&
+			test_i18ngrep "Refusing to lose dirty file at y/c" out &&
+
+			git ls-files -s >out &&
+			test_line_count = 7 out &&
+			git ls-files -u >out &&
+			test_line_count = 4 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
+
+			git rev-parse >actual \
+				:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :2:y/c :3:y/c &&
+			git rev-parse >expect \
+				 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  A:y/c  O:x/c &&
+			test_cmp expect actual &&
+
+			# See if y/c~merged has expected contents; requires manually
+			# doing the expected file merge
+			git cat-file -p A:y/c >c1 &&
+			git cat-file -p B:z/c >c2 &&
+			>empty &&
+			test_must_fail git merge-file \
+				-L "HEAD" \
+				-L "" \
+				-L "B^0" \
+				c1 empty c2 &&
+			test_cmp c1 y/c~merged
+		fi &&
 
 		echo different >expected &&
 		echo mods >>expected &&
-		test_cmp expected y/c &&
-
-		git rev-parse >actual \
-			:0:y/a :0:y/b :0:x/d :1:x/c :2:w/c :2:y/c :3:y/c &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  O:x/d  O:x/c  O:x/c  A:y/c  O:x/c &&
-		test_cmp expect actual &&
-
-		# See if y/c~merged has expected contents; requires manually
-		# doing the expected file merge
-		git cat-file -p A:y/c >c1 &&
-		git cat-file -p B:z/c >c2 &&
-		>empty &&
-		test_must_fail git merge-file \
-			-L "HEAD" \
-			-L "" \
-			-L "B^0" \
-			c1 empty c2 &&
-		test_cmp c1 y/c~merged
+		test_cmp expected y/c
 	)
 '
 
@@ -3744,7 +4059,7 @@ test_expect_success '11e-check: Avoid deleting not-uptodate with dir rename/rena
 #             CONFLICT(rename/rename) x/c vs x/d -> y/wham
 #             ERROR_MSG(Refusing to lose dirty file at y/wham)
 
-test_expect_success '11f-setup: Avoid deleting not-uptodate with dir rename/rename(2to1)' '
+test_setup_11f () {
 	test_create_repo 11f &&
 	(
 		cd 11f &&
@@ -3773,9 +4088,10 @@ test_expect_success '11f-setup: Avoid deleting not-uptodate with dir rename/rena
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '11f-check: Avoid deleting not-uptodate with dir rename/rename(2to1)' '
+test_expect_success '11f: Avoid deleting not-uptodate with dir rename/rename(2to1)' '
+	test_setup_11f &&
 	(
 		cd 11f &&
 
@@ -3783,38 +4099,44 @@ test_expect_success '11f-check: Avoid deleting not-uptodate with dir rename/rena
 		echo important >>y/wham &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
-		test_i18ngrep "CONFLICT (rename/rename)" out &&
-		test_i18ngrep "Refusing to lose dirty file at y/wham" out &&
-
-		git ls-files -s >out &&
-		test_line_count = 4 out &&
-		git ls-files -u >out &&
-		test_line_count = 2 out &&
-		git ls-files -o >out &&
-		test_line_count = 3 out &&
+		if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+		then
+			test_path_is_missing .git/MERGE_HEAD &&
+			test_i18ngrep "error: Your local changes to the following files would be overwritten by merge" err
+		else
+			test_i18ngrep "CONFLICT (rename/rename)" out &&
+			test_i18ngrep "Refusing to lose dirty file at y/wham" out &&
+
+			git ls-files -s >out &&
+			test_line_count = 4 out &&
+			git ls-files -u >out &&
+			test_line_count = 2 out &&
+			git ls-files -o >out &&
+			test_line_count = 3 out &&
+
+			test_must_fail git rev-parse :1:y/wham &&
+
+			git rev-parse >actual \
+				:0:y/a :0:y/b :2:y/wham :3:y/wham &&
+			git rev-parse >expect \
+				 O:z/a  O:z/b  O:x/c     O:x/d &&
+			test_cmp expect actual &&
+
+			# Test that two-way merge in y/wham~merged is as expected
+			git cat-file -p :2:y/wham >expect &&
+			git cat-file -p :3:y/wham >other &&
+			>empty &&
+			test_must_fail git merge-file \
+				-L "HEAD" \
+				-L "" \
+				-L "B^0" \
+				expect empty other &&
+			test_cmp expect y/wham~merged
+		fi &&
 
 		test_seq 1 10 >expected &&
 		echo important >>expected &&
-		test_cmp expected y/wham &&
-
-		test_must_fail git rev-parse :1:y/wham &&
-
-		git rev-parse >actual \
-			:0:y/a :0:y/b :2:y/wham :3:y/wham &&
-		git rev-parse >expect \
-			 O:z/a  O:z/b  O:x/c     O:x/d &&
-		test_cmp expect actual &&
-
-		# Test that the two-way merge in y/wham~merged is as expected
-		git cat-file -p :2:y/wham >expect &&
-		git cat-file -p :3:y/wham >other &&
-		>empty &&
-		test_must_fail git merge-file \
-			-L "HEAD" \
-			-L "" \
-			-L "B^0" \
-			expect empty other &&
-		test_cmp expect y/wham~merged
+		test_cmp expected y/wham
 	)
 '
 
@@ -3832,7 +4154,7 @@ test_expect_success '11f-check: Avoid deleting not-uptodate with dir rename/rena
 #   Commit B: node1/{leaf1,leaf2,leaf5}, node2/{leaf3,leaf4,leaf6}
 #   Expected: node1/{leaf1,leaf2,leaf5,node2/{leaf3,leaf4,leaf6}}
 
-test_expect_success '12a-setup: Moving one directory hierarchy into another' '
+test_setup_12a () {
 	test_create_repo 12a &&
 	(
 		cd 12a &&
@@ -3862,9 +4184,10 @@ test_expect_success '12a-setup: Moving one directory hierarchy into another' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '12a-check: Moving one directory hierarchy into another' '
+test_expect_success '12a: Moving one directory hierarchy into another' '
+	test_setup_12a &&
 	(
 		cd 12a &&
 
@@ -3889,31 +4212,124 @@ test_expect_success '12a-check: Moving one directory hierarchy into another' '
 	)
 '
 
-# Testcase 12b, Moving two directory hierarchies into each other
+# Testcase 12b1, Moving two directory hierarchies into each other
 #   (Related to testcases 1c and 12c)
 #   Commit O: node1/{leaf1, leaf2}, node2/{leaf3, leaf4}
 #   Commit A: node1/{leaf1, leaf2, node2/{leaf3, leaf4}}
 #   Commit B: node2/{leaf3, leaf4, node1/{leaf1, leaf2}}
-#   Expected: node1/node2/node1/{leaf1, leaf2},
+#   Expected: node1/node2/{leaf3, leaf4}
+#             node2/node1/{leaf1, leaf2}
+#   NOTE: If there were new files added to the old node1/ or node2/ directories,
+#         then we would need to detect renames for those directories and would
+#         find that:
+#             commit A renames node2/ -> node1/node2/
+#             commit B renames node1/ -> node2/node1/
+#         Applying those directory renames to the initial result (making all
+#         four paths experience a transitive renaming), yields
+#             node1/node2/node1/{leaf1, leaf2}
 #             node2/node1/node2/{leaf3, leaf4}
+#         as the result.  It may be really weird to have two directories
+#         rename each other, but simple rules give weird results when given
+#         weird inputs.  HOWEVER, the "If" at the beginning of those NOTE was
+#         false; there were no new files added and thus there is no directory
+#         rename detection to perform.  As such, we just have simple renames
+#         and the expected answer is:
+#             node1/node2/{leaf3, leaf4}
+#             node2/node1/{leaf1, leaf2}
+
+test_setup_12b1 () {
+	test_create_repo 12b1 &&
+	(
+		cd 12b1 &&
+
+		mkdir -p node1 node2 &&
+		echo leaf1 >node1/leaf1 &&
+		echo leaf2 >node1/leaf2 &&
+		echo leaf3 >node2/leaf3 &&
+		echo leaf4 >node2/leaf4 &&
+		git add node1 node2 &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv node2/ node1/ &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv node1/ node2/ &&
+		test_tick &&
+		git commit -m "B"
+	)
+}
+
+test_expect_merge_algorithm failure success '12b1: Moving two directory hierarchies into each other' '
+	test_setup_12b1 &&
+	(
+		cd 12b1 &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:node2/node1/leaf1 \
+			HEAD:node2/node1/leaf2 \
+			HEAD:node1/node2/leaf3 \
+			HEAD:node1/node2/leaf4 &&
+		git rev-parse >expect \
+			O:node1/leaf1 \
+			O:node1/leaf2 \
+			O:node2/leaf3 \
+			O:node2/leaf4 &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 12b2, Moving two directory hierarchies into each other
+#   (Related to testcases 1c and 12c)
+#   Commit O: node1/{leaf1, leaf2}, node2/{leaf3, leaf4}
+#   Commit A: node1/{leaf1, leaf2, leaf5, node2/{leaf3, leaf4}}
+#   Commit B: node2/{leaf3, leaf4, leaf6, node1/{leaf1, leaf2}}
+#   Expected: node1/node2/{node1/{leaf1, leaf2}, leaf6}
+#             node2/node1/{node2/{leaf3, leaf4}, leaf5}
 #   NOTE: Without directory renames, we would expect
-#                   node2/node1/{leaf1, leaf2},
-#                   node1/node2/{leaf3, leaf4}
+#             A: node2/leaf3 -> node1/node2/leaf3
+#             A: node2/leaf1 -> node1/node2/leaf4
+#             A: Adds           node1/leaf5
+#             B: node1/leaf1 -> node2/node1/leaf1
+#             B: node1/leaf2 -> node2/node1/leaf2
+#             B: Adds           node2/leaf6
 #         with directory rename detection, we note that
 #             commit A renames node2/ -> node1/node2/
 #             commit B renames node1/ -> node2/node1/
-#         therefore, applying those directory renames to the initial result
-#         (making all four paths experience a transitive renaming), yields
-#         the expected result.
+#         therefore, applying A's directory rename to the paths added in B gives:
+#             B: node1/leaf1 -> node1/node2/node1/leaf1
+#             B: node1/leaf2 -> node1/node2/node1/leaf2
+#             B: Adds           node1/node2/leaf6
+#         and applying B's directory rename to the paths added in A gives:
+#             A: node2/leaf3 -> node2/node1/node2/leaf3
+#             A: node2/leaf1 -> node2/node1/node2/leaf4
+#             A: Adds           node2/node1/leaf5
+#         resulting in the expected
+#             node1/node2/{node1/{leaf1, leaf2}, leaf6}
+#             node2/node1/{node2/{leaf3, leaf4}, leaf5}
 #
 #         You may ask, is it weird to have two directories rename each other?
 #         To which, I can do no more than shrug my shoulders and say that
 #         even simple rules give weird results when given weird inputs.
 
-test_expect_success '12b-setup: Moving two directory hierarchies into each other' '
-	test_create_repo 12b &&
+test_setup_12b2 () {
+	test_create_repo 12b2 &&
 	(
-		cd 12b &&
+		cd 12b2 &&
 
 		mkdir -p node1 node2 &&
 		echo leaf1 >node1/leaf1 &&
@@ -3930,42 +4346,51 @@ test_expect_success '12b-setup: Moving two directory hierarchies into each other
 
 		git checkout A &&
 		git mv node2/ node1/ &&
+		echo leaf5 >node1/leaf5 &&
+		git add node1/leaf5 &&
 		test_tick &&
 		git commit -m "A" &&
 
 		git checkout B &&
 		git mv node1/ node2/ &&
+		echo leaf6 >node2/leaf6 &&
+		git add node2/leaf6 &&
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '12b-check: Moving two directory hierarchies into each other' '
+test_expect_success '12b2: Moving two directory hierarchies into each other' '
+	test_setup_12b2 &&
 	(
-		cd 12b &&
+		cd 12b2 &&
 
 		git checkout A^0 &&
 
 		git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
 		git ls-files -s >out &&
-		test_line_count = 4 out &&
+		test_line_count = 6 out &&
 
 		git rev-parse >actual \
 			HEAD:node1/node2/node1/leaf1 \
 			HEAD:node1/node2/node1/leaf2 \
 			HEAD:node2/node1/node2/leaf3 \
-			HEAD:node2/node1/node2/leaf4 &&
+			HEAD:node2/node1/node2/leaf4 \
+			HEAD:node2/node1/leaf5       \
+			HEAD:node1/node2/leaf6       &&
 		git rev-parse >expect \
 			O:node1/leaf1 \
 			O:node1/leaf2 \
 			O:node2/leaf3 \
-			O:node2/leaf4 &&
+			O:node2/leaf4 \
+			A:node1/leaf5 \
+			B:node2/leaf6 &&
 		test_cmp expect actual
 	)
 '
 
-# Testcase 12c, Moving two directory hierarchies into each other w/ content merge
+# Testcase 12c1, Moving two directory hierarchies into each other w/ content merge
 #   (Related to testcase 12b)
 #   Commit O: node1/{       leaf1_1, leaf2_1}, node2/{leaf3_1, leaf4_1}
 #   Commit A: node1/{       leaf1_2, leaf2_2,  node2/{leaf3_2, leaf4_2}}
@@ -3973,13 +4398,13 @@ test_expect_success '12b-check: Moving two directory hierarchies into each other
 #   Expected: Content merge conflicts for each of:
 #               node1/node2/node1/{leaf1, leaf2},
 #               node2/node1/node2/{leaf3, leaf4}
-#   NOTE: This is *exactly* like 12c, except that every path is modified on
+#   NOTE: This is *exactly* like 12b1, except that every path is modified on
 #         each side of the merge.
 
-test_expect_success '12c-setup: Moving one directory hierarchy into another w/ content merge' '
-	test_create_repo 12c &&
+test_setup_12c1 () {
+	test_create_repo 12c1 &&
 	(
-		cd 12c &&
+		cd 12c1 &&
 
 		mkdir -p node1 node2 &&
 		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf1\n" >node1/leaf1 &&
@@ -4008,16 +4433,113 @@ test_expect_success '12c-setup: Moving one directory hierarchy into another w/ c
 		test_tick &&
 		git commit -m "B"
 	)
+}
+
+test_expect_merge_algorithm failure success '12c1: Moving one directory hierarchy into another w/ content merge' '
+	test_setup_12c1 &&
+	(
+		cd 12c1 &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -u >out &&
+		test_line_count = 12 out &&
+
+		git rev-parse >actual \
+			:1:node2/node1/leaf1 \
+			:1:node2/node1/leaf2 \
+			:1:node1/node2/leaf3 \
+			:1:node1/node2/leaf4 \
+			:2:node2/node1/leaf1 \
+			:2:node2/node1/leaf2 \
+			:2:node1/node2/leaf3 \
+			:2:node1/node2/leaf4 \
+			:3:node2/node1/leaf1 \
+			:3:node2/node1/leaf2 \
+			:3:node1/node2/leaf3 \
+			:3:node1/node2/leaf4 &&
+		git rev-parse >expect \
+			O:node1/leaf1 \
+			O:node1/leaf2 \
+			O:node2/leaf3 \
+			O:node2/leaf4 \
+			A:node1/leaf1 \
+			A:node1/leaf2 \
+			A:node1/node2/leaf3 \
+			A:node1/node2/leaf4 \
+			B:node2/node1/leaf1 \
+			B:node2/node1/leaf2 \
+			B:node2/leaf3 \
+			B:node2/leaf4 &&
+		test_cmp expect actual
+	)
 '
 
-test_expect_success '12c-check: Moving one directory hierarchy into another w/ content merge' '
+# Testcase 12c2, Moving two directory hierarchies into each other w/ content merge
+#   (Related to testcase 12b)
+#   Commit O: node1/{       leaf1_1, leaf2_1}, node2/{leaf3_1, leaf4_1}
+#   Commit A: node1/{       leaf1_2, leaf2_2,  node2/{leaf3_2, leaf4_2}, leaf5}
+#   Commit B: node2/{node1/{leaf1_3, leaf2_3},        leaf3_3, leaf4_3,  leaf6}
+#   Expected: Content merge conflicts for each of:
+#               node1/node2/node1/{leaf1, leaf2}
+#               node2/node1/node2/{leaf3, leaf4}
+#             plus
+#               node2/node1/leaf5
+#               node1/node2/leaf6
+#   NOTE: This is *exactly* like 12b2, except that every path from O is modified
+#         on each side of the merge.
+
+test_setup_12c2 () {
+	test_create_repo 12c2 &&
+	(
+		cd 12c2 &&
+
+		mkdir -p node1 node2 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf1\n" >node1/leaf1 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf2\n" >node1/leaf2 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf3\n" >node2/leaf3 &&
+		printf "1\n2\n3\n4\n5\n6\n7\n8\nleaf4\n" >node2/leaf4 &&
+		git add node1 node2 &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		git mv node2/ node1/ &&
+		for i in `git ls-files`; do echo side A >>$i; done &&
+		git add -u &&
+		echo leaf5 >node1/leaf5 &&
+		git add node1/leaf5 &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv node1/ node2/ &&
+		for i in `git ls-files`; do echo side B >>$i; done &&
+		git add -u &&
+		echo leaf6 >node2/leaf6 &&
+		git add node2/leaf6 &&
+		test_tick &&
+		git commit -m "B"
+	)
+}
+
+test_expect_success '12c2: Moving one directory hierarchy into another w/ content merge' '
+	test_setup_12c2 &&
 	(
-		cd 12c &&
+		cd 12c2 &&
 
 		git checkout A^0 &&
 
 		test_must_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
 
+		git ls-files -s >out &&
+		test_line_count = 14 out &&
 		git ls-files -u >out &&
 		test_line_count = 12 out &&
 
@@ -4033,7 +4555,9 @@ test_expect_success '12c-check: Moving one directory hierarchy into another w/ c
 			:3:node1/node2/node1/leaf1 \
 			:3:node1/node2/node1/leaf2 \
 			:3:node2/node1/node2/leaf3 \
-			:3:node2/node1/node2/leaf4 &&
+			:3:node2/node1/node2/leaf4 \
+			:0:node2/node1/leaf5       \
+			:0:node1/node2/leaf6       &&
 		git rev-parse >expect \
 			O:node1/leaf1 \
 			O:node1/leaf2 \
@@ -4046,7 +4570,631 @@ test_expect_success '12c-check: Moving one directory hierarchy into another w/ c
 			B:node2/node1/leaf1 \
 			B:node2/node1/leaf2 \
 			B:node2/leaf3 \
-			B:node2/leaf4 &&
+			B:node2/leaf4 \
+			A:node1/leaf5 \
+			B:node2/leaf6 &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 12d, Rename/merge of subdirectory into the root
+#   Commit O: a/b/subdir/foo
+#   Commit A: subdir/foo
+#   Commit B: a/b/subdir/foo, a/b/bar
+#   Expected: subdir/foo, bar
+
+test_setup_12d () {
+	test_create_repo 12d &&
+	(
+		cd 12d &&
+
+		mkdir -p a/b/subdir &&
+		test_commit a/b/subdir/foo &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir subdir &&
+		git mv a/b/subdir/foo.t subdir/foo.t &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_commit a/b/bar
+	)
+}
+
+test_expect_success '12d: Rename/merge subdir into the root, variant 1' '
+	test_setup_12d &&
+	(
+		cd 12d &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			HEAD:subdir/foo.t   HEAD:bar.t &&
+		git rev-parse >expect \
+			O:a/b/subdir/foo.t  B:a/b/bar.t &&
+		test_cmp expect actual &&
+
+		git hash-object bar.t >actual &&
+		git rev-parse B:a/b/bar.t >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:a/b/subdir/foo.t &&
+		test_must_fail git rev-parse HEAD:a/b/bar.t &&
+		test_path_is_missing a/ &&
+		test_path_is_file bar.t
+	)
+'
+
+# Testcase 12e, Rename/merge of subdirectory into the root
+#   Commit O: a/b/foo
+#   Commit A: foo
+#   Commit B: a/b/foo, a/b/bar
+#   Expected: foo, bar
+
+test_setup_12e () {
+	test_create_repo 12e &&
+	(
+		cd 12e &&
+
+		mkdir -p a/b &&
+		test_commit a/b/foo &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		mkdir subdir &&
+		git mv a/b/foo.t foo.t &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_commit a/b/bar
+	)
+}
+
+test_expect_success '12e: Rename/merge subdir into the root, variant 2' '
+	test_setup_12e &&
+	(
+		cd 12e &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files -s >out &&
+		test_line_count = 2 out &&
+
+		git rev-parse >actual \
+			HEAD:foo.t   HEAD:bar.t &&
+		git rev-parse >expect \
+			O:a/b/foo.t  B:a/b/bar.t &&
+		test_cmp expect actual &&
+
+		git hash-object bar.t >actual &&
+		git rev-parse B:a/b/bar.t >expect &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:a/b/foo.t &&
+		test_must_fail git rev-parse HEAD:a/b/bar.t &&
+		test_path_is_missing a/ &&
+		test_path_is_file bar.t
+	)
+'
+
+# Testcase 12f, Rebase of patches with big directory rename
+#   Commit O:
+#              dir/subdir/{a,b,c,d,e_O,Makefile_TOP_O}
+#              dir/subdir/tweaked/{f,g,h,Makefile_SUB_O}
+#              dir/unchanged/<LOTS OF FILES>
+#   Commit A:
+#     (Remove f & g, move e into newsubdir, rename dir/->folder/, modify files)
+#              folder/subdir/{a,b,c,d,Makefile_TOP_A}
+#              folder/subdir/newsubdir/e_A
+#              folder/subdir/tweaked/{h,Makefile_SUB_A}
+#              folder/unchanged/<LOTS OF FILES>
+#   Commit B1:
+#     (add newfile.{c,py}, modify underscored files)
+#              dir/{a,b,c,d,e_B1,Makefile_TOP_B1,newfile.c}
+#              dir/tweaked/{f,g,h,Makefile_SUB_B1,newfile.py}
+#              dir/unchanged/<LOTS OF FILES>
+#   Commit B2:
+#     (Modify e further, add newfile.rs)
+#              dir/{a,b,c,d,e_B2,Makefile_TOP_B1,newfile.c,newfile.rs}
+#              dir/tweaked/{f,g,h,Makefile_SUB_B1,newfile.py}
+#              dir/unchanged/<LOTS OF FILES>
+#   Expected:
+#          B1-picked:
+#              folder/subdir/{a,b,c,d,Makefile_TOP_Merge1,newfile.c}
+#              folder/subdir/newsubdir/e_Merge1
+#              folder/subdir/tweaked/{h,Makefile_SUB_Merge1,newfile.py}
+#              folder/unchanged/<LOTS OF FILES>
+#          B2-picked:
+#              folder/subdir/{a,b,c,d,Makefile_TOP_Merge1,newfile.c,newfile.rs}
+#              folder/subdir/newsubdir/e_Merge2
+#              folder/subdir/tweaked/{h,Makefile_SUB_Merge1,newfile.py}
+#              folder/unchanged/<LOTS OF FILES>
+# Things being checked here:
+#   1. dir/subdir/newfile.c does not get pushed into folder/subdir/newsubdir/.
+#      dir/subdir/{a,b,c,d} -> folder/subdir/{a,b,c,d} looks like
+#          dir/ -> folder/,
+#      whereas dir/subdir/e -> folder/subdir/newsubdir/e looks like
+#          dir/subdir/ -> folder/subdir/newsubdir/
+#      and if we note that newfile.c is found in dir/subdir/, we might overlook
+#      the dir/ -> folder/ rule that has more weight.  Older git versions did
+#      this.
+#   2. The code to do trivial directory resolves.  Note that
+#      dir/subdir/unchanged/ is unchanged and can be deleted, and files in the
+#      new folder/subdir/unchanged/ are not needed as a target to any renames.
+#      Thus, in the second collect_merge_info_callback() we can just resolve
+#      these two directories trivially without recursing.)
+#   3. Exercising the codepaths for caching renames and deletes from one cherry
+#      pick and re-applying them in the subsequent one.
+
+test_setup_12f () {
+	test_create_repo 12f &&
+	(
+		cd 12f &&
+
+		mkdir -p dir/unchanged &&
+		mkdir -p dir/subdir/tweaked &&
+		echo a >dir/subdir/a &&
+		echo b >dir/subdir/b &&
+		echo c >dir/subdir/c &&
+		echo d >dir/subdir/d &&
+		test_seq 1 10 >dir/subdir/e &&
+		test_seq 10 20 >dir/subdir/Makefile &&
+		echo f >dir/subdir/tweaked/f &&
+		echo g >dir/subdir/tweaked/g &&
+		echo h >dir/subdir/tweaked/h &&
+		test_seq 20 30 >dir/subdir/tweaked/Makefile &&
+		for i in `test_seq 1 88`; do
+			echo content $i >dir/unchanged/file_$i
+		done &&
+		git add . &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git switch A &&
+		git rm dir/subdir/tweaked/f dir/subdir/tweaked/g &&
+		test_seq 2 10 >dir/subdir/e &&
+		test_seq 11 20 >dir/subdir/Makefile &&
+		test_seq 21 30 >dir/subdir/tweaked/Makefile &&
+		mkdir dir/subdir/newsubdir &&
+		git mv dir/subdir/e dir/subdir/newsubdir/ &&
+		git mv dir folder &&
+		git add . &&
+		git commit -m "A" &&
+
+		git switch B &&
+		mkdir dir/subdir/newsubdir/ &&
+		echo c code >dir/subdir/newfile.c &&
+		echo python code >dir/subdir/newsubdir/newfile.py &&
+		test_seq 1 11 >dir/subdir/e &&
+		test_seq 10 21 >dir/subdir/Makefile &&
+		test_seq 20 31 >dir/subdir/tweaked/Makefile &&
+		git add . &&
+		git commit -m "B1" &&
+
+		echo rust code >dir/subdir/newfile.rs &&
+		test_seq 1 12 >dir/subdir/e &&
+		git add . &&
+		git commit -m "B2"
+	)
+}
+
+test_expect_merge_algorithm failure success '12f: Trivial directory resolve, caching, all kinds of fun' '
+	test_setup_12f &&
+	(
+		cd 12f &&
+
+		git checkout A^0 &&
+		git branch Bmod B &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" git -c merge.directoryRenames=true rebase A Bmod &&
+
+		echo Checking the pick of B1... &&
+
+		test_must_fail git rev-parse Bmod~1:dir &&
+
+		git ls-tree -r Bmod~1 >out &&
+		test_line_count = 98 out &&
+
+		git diff --name-status A Bmod~1 >actual &&
+		q_to_tab >expect <<-\EOF &&
+		MQfolder/subdir/Makefile
+		AQfolder/subdir/newfile.c
+		MQfolder/subdir/newsubdir/e
+		AQfolder/subdir/newsubdir/newfile.py
+		MQfolder/subdir/tweaked/Makefile
+		EOF
+		test_cmp expect actual &&
+
+		# Three-way merged files
+		test_seq  2 11 >e_Merge1 &&
+		test_seq 11 21 >Makefile_TOP &&
+		test_seq 21 31 >Makefile_SUB &&
+		git hash-object >expect      \
+			e_Merge1             \
+			Makefile_TOP         \
+			Makefile_SUB         &&
+		git rev-parse >actual              \
+			Bmod~1:folder/subdir/newsubdir/e     \
+			Bmod~1:folder/subdir/Makefile        \
+			Bmod~1:folder/subdir/tweaked/Makefile &&
+		test_cmp expect actual &&
+
+		# New files showed up at the right location with right contents
+		git rev-parse >expect                \
+			B~1:dir/subdir/newfile.c            \
+			B~1:dir/subdir/newsubdir/newfile.py &&
+		git rev-parse >actual                      \
+			Bmod~1:folder/subdir/newfile.c            \
+			Bmod~1:folder/subdir/newsubdir/newfile.py &&
+		test_cmp expect actual &&
+
+		# Removed files
+		test_path_is_missing folder/subdir/tweaked/f &&
+		test_path_is_missing folder/subdir/tweaked/g &&
+
+		# Unchanged files or directories
+		git rev-parse >actual        \
+			Bmod~1:folder/subdir/a          \
+			Bmod~1:folder/subdir/b          \
+			Bmod~1:folder/subdir/c          \
+			Bmod~1:folder/subdir/d          \
+			Bmod~1:folder/unchanged         \
+			Bmod~1:folder/subdir/tweaked/h &&
+		git rev-parse >expect          \
+			O:dir/subdir/a         \
+			O:dir/subdir/b         \
+			O:dir/subdir/c         \
+			O:dir/subdir/d         \
+			O:dir/unchanged        \
+			O:dir/subdir/tweaked/h &&
+		test_cmp expect actual &&
+
+		echo Checking the pick of B2... &&
+
+		test_must_fail git rev-parse Bmod:dir &&
+
+		git ls-tree -r Bmod >out &&
+		test_line_count = 99 out &&
+
+		git diff --name-status Bmod~1 Bmod >actual &&
+		q_to_tab >expect <<-\EOF &&
+		AQfolder/subdir/newfile.rs
+		MQfolder/subdir/newsubdir/e
+		EOF
+		test_cmp expect actual &&
+
+		# Three-way merged file
+		test_seq  2 12 >e_Merge2 &&
+		git hash-object e_Merge2 >expect &&
+		git rev-parse Bmod:folder/subdir/newsubdir/e >actual &&
+		test_cmp expect actual &&
+
+		grep region_enter.*collect_merge_info trace.output >collect &&
+		test_line_count = 4 collect &&
+		grep region_enter.*process_entries$ trace.output >process &&
+		test_line_count = 2 process
+	)
+'
+
+# Testcase 12g, Testcase with two kinds of "relevant" renames
+#   Commit O: somefile_O, subdir/{a_O,b_O}
+#   Commit A: somefile_A, subdir/{a_O,b_O,c_A}
+#   Commit B: newfile_B,  newdir/{a_B,b_B}
+#   Expected: newfile_{merged}, newdir/{a_B,b_B,c_A}
+
+test_setup_12g () {
+	test_create_repo 12g &&
+	(
+		cd 12g &&
+
+		mkdir -p subdir &&
+		test_write_lines upon a time there was a >somefile &&
+		test_write_lines 1 2 3 4 5 6 7 8 9 10 >subdir/a &&
+		test_write_lines one two three four five six >subdir/b &&
+		git add . &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git switch A &&
+		test_write_lines once upon a time there was a >somefile &&
+		> subdir/c &&
+		git add somefile subdir/c &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		git mv somefile newfile &&
+		git mv subdir newdir &&
+		echo repo >>newfile &&
+		test_write_lines 1 2 3 4 5 6 7 8 9 10 11 >newdir/a &&
+		test_write_lines one two three four five six seven >newdir/b &&
+		git add newfile newdir &&
+		test_tick &&
+		git commit -m "B"
+	)
+}
+
+test_expect_success '12g: Testcase with two kinds of "relevant" renames' '
+	test_setup_12g &&
+	(
+		cd 12g &&
+
+		git checkout A^0 &&
+
+		git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		test_write_lines once upon a time there was a repo >expect &&
+		test_cmp expect newfile &&
+
+		git ls-files -s >out &&
+		test_line_count = 4 out &&
+
+		git rev-parse >actual \
+			HEAD:newdir/a  HEAD:newdir/b   HEAD:newdir/c &&
+		git rev-parse >expect \
+			B:newdir/a     B:newdir/b      A:subdir/c &&
+		test_cmp expect actual &&
+
+		test_must_fail git rev-parse HEAD:subdir/a &&
+		test_must_fail git rev-parse HEAD:subdir/b &&
+		test_must_fail git rev-parse HEAD:subdir/c &&
+		test_path_is_missing subdir/ &&
+		test_path_is_file newdir/c
+	)
+'
+
+# Testcase 12h, Testcase with two kinds of "relevant" renames
+#   Commit O: olddir/{a_1, b}
+#   Commit A: newdir/{a_2, b}
+#   Commit B: olddir/{alpha_1, b}
+#   Expected: newdir/{alpha_2, b}
+
+test_setup_12h () {
+	test_create_repo 12h &&
+	(
+		cd 12h &&
+
+		mkdir olddir &&
+		test_seq 3 8 >olddir/a &&
+		>olddir/b &&
+		git add olddir &&
+		git commit -m orig &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git switch A &&
+		test_seq 3 10 >olddir/a &&
+		git add olddir/a &&
+		git mv olddir newdir &&
+		git commit -m A &&
+
+		git switch B &&
+
+		git mv olddir/a olddir/alpha &&
+		git commit -m B
+	)
+}
+
+test_expect_failure '12h: renaming a file within a renamed directory' '
+	test_setup_12h &&
+	(
+		cd 12h &&
+
+		git checkout A^0 &&
+
+		test_might_fail git -c merge.directoryRenames=true merge -s recursive B^0 &&
+
+		git ls-files >tracked &&
+		test_line_count = 2 tracked &&
+
+		test_path_is_missing olddir/a &&
+		test_path_is_file newdir/alpha &&
+		test_path_is_file newdir/b &&
+
+		git rev-parse >actual \
+			HEAD:newdir/alpha  HEAD:newdir/b &&
+		git rev-parse >expect \
+			A:newdir/a         O:oldir/b &&
+		test_cmp expect actual
+	)
+'
+
+# Testcase 12i, Directory rename causes rename-to-self
+#   Commit O: source/{subdir/foo, bar, baz_1}
+#   Commit A: source/{foo, bar, baz_1}
+#   Commit B: source/{subdir/{foo, bar}, baz_2}
+#   Expected: source/{foo, bar, baz_2}, with conflicts on
+#                source/bar vs. source/subdir/bar
+
+test_setup_12i () {
+	test_create_repo 12i &&
+	(
+		cd 12i &&
+
+		mkdir -p source/subdir &&
+		echo foo >source/subdir/foo &&
+		echo bar >source/bar &&
+		echo baz >source/baz &&
+		git add source &&
+		git commit -m orig &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git switch A &&
+		git mv source/subdir/foo source/foo &&
+		git commit -m A &&
+
+		git switch B &&
+		git mv source/bar source/subdir/bar &&
+		echo more baz >>source/baz &&
+		git commit -m B
+	)
+}
+
+test_expect_success '12i: Directory rename causes rename-to-self' '
+	test_setup_12i &&
+	(
+		cd 12i &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
+
+		test_path_is_missing source/subdir &&
+		test_path_is_file source/bar &&
+		test_path_is_file source/baz &&
+
+		git ls-files | uniq >tracked &&
+		test_line_count = 3 tracked &&
+
+		git status --porcelain -uno >actual &&
+		cat >expect <<-\EOF &&
+		UU source/bar
+		 M source/baz
+		EOF
+		test_cmp expect actual
+	)
+'
+
+# Testcase 12j, Directory rename to root causes rename-to-self
+#   Commit O: {subdir/foo, bar, baz_1}
+#   Commit A: {foo, bar, baz_1}
+#   Commit B: {subdir/{foo, bar}, baz_2}
+#   Expected: {foo, bar, baz_2}, with conflicts on bar vs. subdir/bar
+
+test_setup_12j () {
+	test_create_repo 12j &&
+	(
+		cd 12j &&
+
+		mkdir -p subdir &&
+		echo foo >subdir/foo &&
+		echo bar >bar &&
+		echo baz >baz &&
+		git add . &&
+		git commit -m orig &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git switch A &&
+		git mv subdir/foo foo &&
+		git commit -m A &&
+
+		git switch B &&
+		git mv bar subdir/bar &&
+		echo more baz >>baz &&
+		git commit -m B
+	)
+}
+
+test_expect_success '12j: Directory rename to root causes rename-to-self' '
+	test_setup_12j &&
+	(
+		cd 12j &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
+
+		test_path_is_missing subdir &&
+		test_path_is_file bar &&
+		test_path_is_file baz &&
+
+		git ls-files | uniq >tracked &&
+		test_line_count = 3 tracked &&
+
+		git status --porcelain -uno >actual &&
+		cat >expect <<-\EOF &&
+		UU bar
+		 M baz
+		EOF
+		test_cmp expect actual
+	)
+'
+
+# Testcase 12k, Directory rename with sibling causes rename-to-self
+#   Commit O: dirB/foo, dirA/{bar, baz_1}
+#   Commit A: dirA/{foo, bar, baz_1}
+#   Commit B: dirB/{foo, bar}, dirA/baz_2
+#   Expected: dirA/{foo, bar, baz_2}, with conflicts on dirA/bar vs. dirB/bar
+
+test_setup_12k () {
+	test_create_repo 12k &&
+	(
+		cd 12k &&
+
+		mkdir dirA dirB &&
+		echo foo >dirB/foo &&
+		echo bar >dirA/bar &&
+		echo baz >dirA/baz &&
+		git add . &&
+		git commit -m orig &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git switch A &&
+		git mv dirB/* dirA/ &&
+		git commit -m A &&
+
+		git switch B &&
+		git mv dirA/bar dirB/bar &&
+		echo more baz >>dirA/baz &&
+		git commit -m B
+	)
+}
+
+test_expect_success '12k: Directory rename with sibling causes rename-to-self' '
+	test_setup_12k &&
+	(
+		cd 12k &&
+
+		git checkout A^0 &&
+
+		test_must_fail git -c merge.directoryRenames=conflict merge -s recursive B^0 &&
+
+		test_path_is_missing dirB &&
+		test_path_is_file dirA/bar &&
+		test_path_is_file dirA/baz &&
+
+		git ls-files | uniq >tracked &&
+		test_line_count = 3 tracked &&
+
+		git status --porcelain -uno >actual &&
+		cat >expect <<-\EOF &&
+		UU dirA/bar
+		 M dirA/baz
+		EOF
 		test_cmp expect actual
 	)
 '
@@ -4068,10 +5216,10 @@ test_expect_success '12c-check: Moving one directory hierarchy into another w/ c
 #   Commit B: z/{b,c,d,e/f}
 #   Expected: y/{b,c,d,e/f}, with notices/conflicts for both y/d and y/e/f
 
-test_expect_success '13a-setup: messages for newly added files' '
-	test_create_repo 13a &&
+test_setup_13a () {
+	test_create_repo 13a_$1 &&
 	(
-		cd 13a &&
+		cd 13a_$1 &&
 
 		mkdir z &&
 		echo b >z/b &&
@@ -4097,11 +5245,12 @@ test_expect_success '13a-setup: messages for newly added files' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '13a-check(conflict): messages for newly added files' '
+test_expect_success '13a(conflict): messages for newly added files' '
+	test_setup_13a conflict &&
 	(
-		cd 13a &&
+		cd 13a_conflict &&
 
 		git checkout A^0 &&
 
@@ -4121,9 +5270,10 @@ test_expect_success '13a-check(conflict): messages for newly added files' '
 	)
 '
 
-test_expect_success '13a-check(info): messages for newly added files' '
+test_expect_success '13a(info): messages for newly added files' '
+	test_setup_13a info &&
 	(
-		cd 13a &&
+		cd 13a_info &&
 
 		git reset --hard &&
 		git checkout A^0 &&
@@ -4153,10 +5303,10 @@ test_expect_success '13a-check(info): messages for newly added files' '
 #   Expected: y/{b,c,d_merged}, with two conflict messages for y/d,
 #             one about content, and one about file location
 
-test_expect_success '13b-setup: messages for transitive rename with conflicted content' '
-	test_create_repo 13b &&
+test_setup_13b () {
+	test_create_repo 13b_$1 &&
 	(
-		cd 13b &&
+		cd 13b_$1 &&
 
 		mkdir x &&
 		mkdir z &&
@@ -4185,11 +5335,12 @@ test_expect_success '13b-setup: messages for transitive rename with conflicted c
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '13b-check(conflict): messages for transitive rename with conflicted content' '
+test_expect_success '13b(conflict): messages for transitive rename with conflicted content' '
+	test_setup_13b conflict &&
 	(
-		cd 13b &&
+		cd 13b_conflict &&
 
 		git checkout A^0 &&
 
@@ -4207,9 +5358,10 @@ test_expect_success '13b-check(conflict): messages for transitive rename with co
 	)
 '
 
-test_expect_success '13b-check(info): messages for transitive rename with conflicted content' '
+test_expect_success '13b(info): messages for transitive rename with conflicted content' '
+	test_setup_13b info &&
 	(
-		cd 13b &&
+		cd 13b_info &&
 
 		git reset --hard &&
 		git checkout A^0 &&
@@ -4232,16 +5384,16 @@ test_expect_success '13b-check(info): messages for transitive rename with confli
 #   Commit O: z/{b,c},   x/{d,e}
 #   Commit A: y/{b,c,d}, x/e
 #   Commit B: z/{b,c,d}, x/e
-#   Expected: y/{b,c,d}, with info or conflict messages for d (
+#   Expected: y/{b,c,d}, x/e, with info or conflict messages for d
 #             A: renamed x/d -> z/d; B: renamed z/ -> y/ AND renamed x/d to y/d
 #             One could argue A had partial knowledge of what was done with
 #             d and B had full knowledge, but that's a slippery slope as
 #             shown in testcase 13d.
 
-test_expect_success '13c-setup: messages for rename/rename(1to1) via transitive rename' '
-	test_create_repo 13c &&
+test_setup_13c () {
+	test_create_repo 13c_$1 &&
 	(
-		cd 13c &&
+		cd 13c_$1 &&
 
 		mkdir x &&
 		mkdir z &&
@@ -4269,11 +5421,12 @@ test_expect_success '13c-setup: messages for rename/rename(1to1) via transitive
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '13c-check(conflict): messages for rename/rename(1to1) via transitive rename' '
+test_expect_success '13c(conflict): messages for rename/rename(1to1) via transitive rename' '
+	test_setup_13c conflict &&
 	(
-		cd 13c &&
+		cd 13c_conflict &&
 
 		git checkout A^0 &&
 
@@ -4290,9 +5443,10 @@ test_expect_success '13c-check(conflict): messages for rename/rename(1to1) via t
 	)
 '
 
-test_expect_success '13c-check(info): messages for rename/rename(1to1) via transitive rename' '
+test_expect_success '13c(info): messages for rename/rename(1to1) via transitive rename' '
+	test_setup_13c info &&
 	(
-		cd 13c &&
+		cd 13c_info &&
 
 		git reset --hard &&
 		git checkout A^0 &&
@@ -4324,10 +5478,10 @@ test_expect_success '13c-check(info): messages for rename/rename(1to1) via trans
 #               * B renames a/y to c/y, and A renames c/->d/ => a/y -> d/y
 #               No conflict in where a/y ends up, so put it in d/y.
 
-test_expect_success '13d-setup: messages for rename/rename(1to1) via dual transitive rename' '
-	test_create_repo 13d &&
+test_setup_13d () {
+	test_create_repo 13d_$1 &&
 	(
-		cd 13d &&
+		cd 13d_$1 &&
 
 		mkdir a &&
 		mkdir b &&
@@ -4356,11 +5510,12 @@ test_expect_success '13d-setup: messages for rename/rename(1to1) via dual transi
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '13d-check(conflict): messages for rename/rename(1to1) via dual transitive rename' '
+test_expect_success '13d(conflict): messages for rename/rename(1to1) via dual transitive rename' '
+	test_setup_13d conflict &&
 	(
-		cd 13d &&
+		cd 13d_conflict &&
 
 		git checkout A^0 &&
 
@@ -4380,9 +5535,10 @@ test_expect_success '13d-check(conflict): messages for rename/rename(1to1) via d
 	)
 '
 
-test_expect_success '13d-check(info): messages for rename/rename(1to1) via dual transitive rename' '
+test_expect_success '13d(info): messages for rename/rename(1to1) via dual transitive rename' '
+	test_setup_13d info &&
 	(
-		cd 13d &&
+		cd 13d_info &&
 
 		git reset --hard &&
 		git checkout A^0 &&
@@ -4448,7 +5604,7 @@ test_expect_success '13d-check(info): messages for rename/rename(1to1) via dual
 #          in the outer merge for this special kind of setup, but it at
 #          least avoids hitting a BUG().
 #
-test_expect_success '13e-setup: directory rename detection in recursive case' '
+test_setup_13e () {
 	test_create_repo 13e &&
 	(
 		cd 13e &&
@@ -4493,9 +5649,10 @@ test_expect_success '13e-setup: directory rename detection in recursive case' '
 		test_tick &&
 		git commit -m "D"
 	)
-'
+}
 
-test_expect_success '13e-check: directory rename detection in recursive case' '
+test_expect_success '13e: directory rename detection in recursive case' '
+	test_setup_13e &&
 	(
 		cd 13e &&
 
diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6424-merge-unrelated-index-changes.sh
index 5e3779ebc9..5e3779ebc9 100755
--- a/t/t6044-merge-unrelated-index-changes.sh
+++ b/t/t6424-merge-unrelated-index-changes.sh
diff --git a/t/t6045-merge-rename-delete.sh b/t/t6425-merge-rename-delete.sh
index 5d33577d2f..459b431a60 100755
--- a/t/t6045-merge-rename-delete.sh
+++ b/t/t6425-merge-rename-delete.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='Merge-recursive rename/delete conflict message'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'rename/delete' '
@@ -12,12 +15,13 @@ test_expect_success 'rename/delete' '
 	git mv A B &&
 	git commit -m "rename" &&
 
-	git checkout master &&
+	git checkout main &&
 	git rm A &&
 	git commit -m "delete" &&
 
 	test_must_fail git merge --strategy=recursive rename >output &&
-	test_i18ngrep "CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output
+	test_i18ngrep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
+	test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output
 '
 
 test_done
diff --git a/t/t6046-merge-skip-unneeded-updates.sh b/t/t6426-merge-skip-unneeded-updates.sh
index 3a47623ed3..7b5f1c1dcd 100755
--- a/t/t6046-merge-skip-unneeded-updates.sh
+++ b/t/t6426-merge-skip-unneeded-updates.sh
@@ -23,6 +23,7 @@ test_description="merge cases"
 #                     files that might be renamed into each other's paths.)
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
 
 
 ###########################################################################
@@ -36,10 +37,10 @@ test_description="merge cases"
 #   Commit B: b_3
 #   Expected: b_2
 
-test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' '
-	test_create_repo 1a &&
+test_setup_1a () {
+	test_create_repo 1a_$1 &&
 	(
-		cd 1a &&
+		cd 1a_$1 &&
 
 		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
 		git add b &&
@@ -62,26 +63,24 @@ test_expect_success '1a-setup: Modify(A)/Modify(B), change on B subset of A' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '1a-check-L: Modify(A)/Modify(B), change on B subset of A' '
-	test_when_finished "git -C 1a reset --hard" &&
-	test_when_finished "git -C 1a clean -fd" &&
+test_expect_success '1a-L: Modify(A)/Modify(B), change on B subset of A' '
+	test_setup_1a L &&
 	(
-		cd 1a &&
+		cd 1a_L &&
 
 		git checkout A^0 &&
 
-		test-tool chmtime =31337 b &&
-		test-tool chmtime -v +0 b >expected-mtime &&
+		test-tool chmtime --get -3600 b >old-mtime &&
 
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep "Skipped b" out &&
 		test_must_be_empty err &&
 
-		test-tool chmtime -v +0 b >actual-mtime &&
-		test_cmp expected-mtime actual-mtime &&
+		# Make sure b was NOT updated
+		test-tool chmtime --get b >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
 		git ls-files -s >index_files &&
 		test_line_count = 1 index_files &&
@@ -96,17 +95,20 @@ test_expect_success '1a-check-L: Modify(A)/Modify(B), change on B subset of A' '
 	)
 '
 
-test_expect_success '1a-check-R: Modify(A)/Modify(B), change on B subset of A' '
-	test_when_finished "git -C 1a reset --hard" &&
-	test_when_finished "git -C 1a clean -fd" &&
+test_expect_success '1a-R: Modify(A)/Modify(B), change on B subset of A' '
+	test_setup_1a R &&
 	(
-		cd 1a &&
+		cd 1a_R &&
 
 		git checkout B^0 &&
 
+		test-tool chmtime --get -3600 b >old-mtime &&
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-		test_i18ngrep "Auto-merging b" out &&
+		# Make sure b WAS updated
+		test-tool chmtime --get b >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
+
 		test_must_be_empty err &&
 
 		git ls-files -s >index_files &&
@@ -133,10 +135,10 @@ test_expect_success '1a-check-R: Modify(A)/Modify(B), change on B subset of A' '
 #   Commit B: c_1
 #   Expected: c_2
 
-test_expect_success '2a-setup: Modify(A)/rename(B)' '
-	test_create_repo 2a &&
+test_setup_2a () {
+	test_create_repo 2a_$1 &&
 	(
-		cd 2a &&
+		cd 2a_$1 &&
 
 		test_seq 1 10 >b &&
 		git add b &&
@@ -158,20 +160,19 @@ test_expect_success '2a-setup: Modify(A)/rename(B)' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '2a-check-L: Modify/rename, merge into modify side' '
-	test_when_finished "git -C 2a reset --hard" &&
-	test_when_finished "git -C 2a clean -fd" &&
+test_expect_success '2a-L: Modify/rename, merge into modify side' '
+	test_setup_2a L &&
 	(
-		cd 2a &&
+		cd 2a_L &&
 
 		git checkout A^0 &&
 
+		test_path_is_missing c &&
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped c" out &&
-		test_must_be_empty err &&
+		test_path_is_file c &&
 
 		git ls-files -s >index_files &&
 		test_line_count = 1 index_files &&
@@ -189,17 +190,20 @@ test_expect_success '2a-check-L: Modify/rename, merge into modify side' '
 	)
 '
 
-test_expect_success '2a-check-R: Modify/rename, merge into rename side' '
-	test_when_finished "git -C 2a reset --hard" &&
-	test_when_finished "git -C 2a clean -fd" &&
+test_expect_success '2a-R: Modify/rename, merge into rename side' '
+	test_setup_2a R &&
 	(
-		cd 2a &&
+		cd 2a_R &&
 
 		git checkout B^0 &&
 
+		test-tool chmtime --get -3600 c >old-mtime &&
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped c" out &&
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime) &&
+
 		test_must_be_empty err &&
 
 		git ls-files -s >index_files &&
@@ -224,10 +228,10 @@ test_expect_success '2a-check-R: Modify/rename, merge into rename side' '
 #   Commit B: b_3
 #   Expected: c_2
 
-test_expect_success '2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A' '
-	test_create_repo 2b &&
+test_setup_2b () {
+	test_create_repo 2b_$1 &&
 	(
-		cd 2b &&
+		cd 2b_$1 &&
 
 		test_write_lines 1 2 3 4 5 6 7 8 9 10 >b &&
 		git add b &&
@@ -251,26 +255,23 @@ test_expect_success '2b-setup: Rename+Mod(A)/Mod(B), B mods subset of A' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '2b-check-L: Rename+Mod(A)/Mod(B), B mods subset of A' '
-	test_when_finished "git -C 2b reset --hard" &&
-	test_when_finished "git -C 2b clean -fd" &&
+test_expect_success '2b-L: Rename+Mod(A)/Mod(B), B mods subset of A' '
+	test_setup_2b L &&
 	(
-		cd 2b &&
+		cd 2b_L &&
 
 		git checkout A^0 &&
 
-		test-tool chmtime =31337 c &&
-		test-tool chmtime -v +0 c >expected-mtime &&
-
+		test-tool chmtime --get -3600 c >old-mtime &&
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep "Skipped c" out &&
 		test_must_be_empty err &&
 
-		test-tool chmtime -v +0 c >actual-mtime &&
-		test_cmp expected-mtime actual-mtime &&
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
 		git ls-files -s >index_files &&
 		test_line_count = 1 index_files &&
@@ -288,17 +289,19 @@ test_expect_success '2b-check-L: Rename+Mod(A)/Mod(B), B mods subset of A' '
 	)
 '
 
-test_expect_success '2b-check-R: Rename+Mod(A)/Mod(B), B mods subset of A' '
-	test_when_finished "git -C 2b reset --hard" &&
-	test_when_finished "git -C 2b clean -fd" &&
+test_expect_success '2b-R: Rename+Mod(A)/Mod(B), B mods subset of A' '
+	test_setup_2b R &&
 	(
-		cd 2b &&
+		cd 2b_R &&
 
 		git checkout B^0 &&
 
+		test_path_is_missing c &&
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive A^0 >out 2>err &&
 
-		test_i18ngrep "Auto-merging c" out &&
+		# Make sure c now present (and thus was updated)
+		test_path_is_file c &&
+
 		test_must_be_empty err &&
 
 		git ls-files -s >index_files &&
@@ -332,7 +335,7 @@ test_expect_success '2b-check-R: Rename+Mod(A)/Mod(B), B mods subset of A' '
 #         skip the update, then we're in trouble.  This test verifies we do
 #         not make that particular mistake.
 
-test_expect_success '2c-setup: Modify b & add c VS rename b->c' '
+test_setup_2c () {
 	test_create_repo 2c &&
 	(
 		cd 2c &&
@@ -358,21 +361,26 @@ test_expect_success '2c-setup: Modify b & add c VS rename b->c' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '2c-check: Modify b & add c VS rename b->c' '
+test_expect_success '2c: Modify b & add c VS rename b->c' '
+	test_setup_2c &&
 	(
 		cd 2c &&
 
 		git checkout A^0 &&
 
+		test-tool chmtime --get -3600 c >old-mtime &&
 		GIT_MERGE_VERBOSITY=3 &&
 		export GIT_MERGE_VERBOSITY &&
 		test_must_fail git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep "CONFLICT (rename/add): Rename b->c" out &&
-		test_i18ngrep ! "Skipped c" out &&
-		test_must_be_empty err
+		test_i18ngrep "CONFLICT (.*/add):" out &&
+		test_must_be_empty err &&
+
+		# Make sure c WAS updated
+		test-tool chmtime --get c >new-mtime &&
+		test $(cat old-mtime) -lt $(cat new-mtime)
 
 		# FIXME: rename/add conflicts are horribly broken right now;
 		# when I get back to my patch series fixing it and
@@ -428,10 +436,10 @@ test_expect_success '2c-check: Modify b & add c VS rename b->c' '
 #   Commit B: bq_1, bar/whatever
 #   Expected: bar/{bq_2, whatever}
 
-test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_create_repo 3a &&
+test_setup_3a () {
+	test_create_repo 3a_$1 &&
 	(
-		cd 3a &&
+		cd 3a_$1 &&
 
 		mkdir foo &&
 		test_seq 1 10 >bq &&
@@ -456,21 +464,22 @@ test_expect_success '3a-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_when_finished "git -C 3a reset --hard" &&
-	test_when_finished "git -C 3a clean -fd" &&
+test_expect_success '3a-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
+	test_setup_3a L &&
 	(
-		cd 3a &&
+		cd 3a_L &&
 
 		git checkout A^0 &&
 
+		test_path_is_missing bar/bq &&
 		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped bar/bq" out &&
 		test_must_be_empty err &&
 
+		test_path_is_file bar/bq &&
+
 		git ls-files -s >index_files &&
 		test_line_count = 2 index_files &&
 
@@ -483,23 +492,26 @@ test_expect_success '3a-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 		test_cmp expect actual &&
 
 		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq foo/bq foo/whatever
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
 	)
 '
 
-test_expect_success '3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_when_finished "git -C 3a reset --hard" &&
-	test_when_finished "git -C 3a clean -fd" &&
+test_expect_success '3a-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
+	test_setup_3a R &&
 	(
-		cd 3a &&
+		cd 3a_R &&
 
 		git checkout B^0 &&
 
+		test_path_is_missing bar/bq &&
 		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped bar/bq" out &&
 		test_must_be_empty err &&
 
+		test_path_is_file bar/bq &&
+
 		git ls-files -s >index_files &&
 		test_line_count = 2 index_files &&
 
@@ -512,7 +524,9 @@ test_expect_success '3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 		test_cmp expect actual &&
 
 		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq foo/bq foo/whatever
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
 	)
 '
 
@@ -522,10 +536,10 @@ test_expect_success '3a-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 #   Commit B: bq_2, bar/whatever
 #   Expected: bar/{bq_2, whatever}
 
-test_expect_success '3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_create_repo 3b &&
+test_setup_3b () {
+	test_create_repo 3b_$1 &&
 	(
-		cd 3b &&
+		cd 3b_$1 &&
 
 		mkdir foo &&
 		test_seq 1 10 >bq &&
@@ -550,21 +564,22 @@ test_expect_success '3b-setup: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_when_finished "git -C 3b reset --hard" &&
-	test_when_finished "git -C 3b clean -fd" &&
+test_expect_success '3b-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
+	test_setup_3b L &&
 	(
-		cd 3b &&
+		cd 3b_L &&
 
 		git checkout A^0 &&
 
+		test_path_is_missing bar/bq &&
 		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped bar/bq" out &&
 		test_must_be_empty err &&
 
+		test_path_is_file bar/bq &&
+
 		git ls-files -s >index_files &&
 		test_line_count = 2 index_files &&
 
@@ -577,23 +592,26 @@ test_expect_success '3b-check-L: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 		test_cmp expect actual &&
 
 		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq foo/bq foo/whatever
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
 	)
 '
 
-test_expect_success '3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
-	test_when_finished "git -C 3b reset --hard" &&
-	test_when_finished "git -C 3b clean -fd" &&
+test_expect_success '3b-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
+	test_setup_3b R &&
 	(
-		cd 3b &&
+		cd 3b_R &&
 
 		git checkout B^0 &&
 
+		test_path_is_missing bar/bq &&
 		GIT_MERGE_VERBOSITY=3 git -c merge.directoryRenames=true merge -s recursive A^0 >out 2>err &&
 
-		test_i18ngrep ! "Skipped bar/bq" out &&
 		test_must_be_empty err &&
 
+		test_path_is_file bar/bq &&
+
 		git ls-files -s >index_files &&
 		test_line_count = 2 index_files &&
 
@@ -606,7 +624,9 @@ test_expect_success '3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 		test_cmp expect actual &&
 
 		test_must_fail git rev-parse HEAD:bq HEAD:foo/bq &&
-		test_path_is_missing bq foo/bq foo/whatever
+		test_path_is_missing bq &&
+		test_path_is_missing foo/bq &&
+		test_path_is_missing foo/whatever
 	)
 '
 
@@ -621,7 +641,7 @@ test_expect_success '3b-check-R: bq_1->foo/bq_2 on A, foo/->bar/ on B' '
 #   Working copy: b_4
 #   Expected: b_2 for merge, b_4 in working copy
 
-test_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods present' '
+test_setup_4a () {
 	test_create_repo 4a &&
 	(
 		cd 4a &&
@@ -647,33 +667,31 @@ test_expect_success '4a-setup: Change on A, change on B subset of A, dirty mods
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
 # NOTE: For as long as we continue using unpack_trees() without index_only
-#   set to true, it will error out on a case like this claiming the the locally
+#   set to true, it will error out on a case like this claiming that the locally
 #   modified file would be overwritten by the merge.  Getting this testcase
 #   correct requires doing the merge in-memory first, then realizing that no
 #   updates to the file are necessary, and thus that we can just leave the path
 #   alone.
-test_expect_failure '4a-check: Change on A, change on B subset of A, dirty mods present' '
-	test_when_finished "git -C 4a reset --hard" &&
-	test_when_finished "git -C 4a clean -fd" &&
+test_expect_merge_algorithm failure success '4a: Change on A, change on B subset of A, dirty mods present' '
+	test_setup_4a &&
 	(
 		cd 4a &&
 
 		git checkout A^0 &&
 		echo "File rewritten" >b &&
 
-		test-tool chmtime =31337 b &&
-		test-tool chmtime -v +0 b >expected-mtime &&
+		test-tool chmtime --get -3600 b >old-mtime &&
 
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep "Skipped b" out &&
 		test_must_be_empty err &&
 
-		test-tool chmtime -v +0 b >actual-mtime &&
-		test_cmp expected-mtime actual-mtime &&
+		# Make sure b was NOT updated
+		test-tool chmtime --get b >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
 		git ls-files -s >index_files &&
 		test_line_count = 1 index_files &&
@@ -695,7 +713,7 @@ test_expect_failure '4a-check: Change on A, change on B subset of A, dirty mods
 #   Working copy: c_4
 #   Expected: c_2
 
-test_expect_success '4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' '
+test_setup_4b () {
 	test_create_repo 4b &&
 	(
 		cd 4b &&
@@ -722,27 +740,25 @@ test_expect_success '4b-setup: Rename+Mod(A)/Mod(B), change on B subset of A, di
 		test_tick &&
 		git commit -m "B"
 	)
-'
+}
 
-test_expect_success '4b-check: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' '
-	test_when_finished "git -C 4b reset --hard" &&
-	test_when_finished "git -C 4b clean -fd" &&
+test_expect_success '4b: Rename+Mod(A)/Mod(B), change on B subset of A, dirty mods present' '
+	test_setup_4b &&
 	(
 		cd 4b &&
 
 		git checkout A^0 &&
 		echo "File rewritten" >c &&
 
-		test-tool chmtime =31337 c &&
-		test-tool chmtime -v +0 c >expected-mtime &&
+		test-tool chmtime --get -3600 c >old-mtime &&
 
 		GIT_MERGE_VERBOSITY=3 git merge -s recursive B^0 >out 2>err &&
 
-		test_i18ngrep "Skipped c" out &&
 		test_must_be_empty err &&
 
-		test-tool chmtime -v +0 c >actual-mtime &&
-		test_cmp expected-mtime actual-mtime &&
+		# Make sure c was NOT updated
+		test-tool chmtime --get c >new-mtime &&
+		test_cmp old-mtime new-mtime &&
 
 		git ls-files -s >index_files &&
 		test_line_count = 1 index_files &&
diff --git a/t/t6047-diff3-conflict-markers.sh b/t/t6427-diff3-conflict-markers.sh
index 860542aad0..25c4b720e7 100755
--- a/t/t6047-diff3-conflict-markers.sh
+++ b/t/t6427-diff3-conflict-markers.sh
@@ -2,6 +2,9 @@
 
 test_description='recursive merge diff3 style conflict markers'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Setup:
@@ -43,7 +46,7 @@ test_expect_success 'check no merge base' '
 # Setup:
 #          L1
 #         /  \
-#   master    ?
+#     main    ?
 #         \  /
 #          R1
 #
@@ -90,18 +93,18 @@ test_expect_success 'check unique merge base' '
 		cd unique_merge_base &&
 
 		git checkout L^0 &&
-		MASTER=$(git rev-parse --short master) &&
+		MAIN=$(git rev-parse --short main) &&
 
 		test_must_fail git -c merge.conflictstyle=diff3 merge -s recursive R^0 &&
 
-		grep "|||||| $MASTER:content" renamed
+		grep "|||||| $MAIN:content" renamed
 	)
 '
 
 # Setup:
 #          L1---L2--L3
 #         /  \ /      \
-#   master    X1       ?
+#     main    X1       ?
 #         \  / \      /
 #          R1---R2--R3
 #
@@ -186,15 +189,24 @@ test_expect_success 'check multiple merge bases' '
 	)
 '
 
-test_expect_success 'rebase describes fake ancestor base' '
+test_expect_success 'rebase --merge describes parent of commit being picked' '
 	test_create_repo rebase &&
 	(
 		cd rebase &&
 		test_commit base file &&
-		test_commit master file &&
+		test_commit main file &&
 		git checkout -b side HEAD^ &&
 		test_commit side file &&
-		test_must_fail git -c merge.conflictstyle=diff3 rebase master &&
+		test_must_fail git -c merge.conflictstyle=diff3 rebase --merge main &&
+		grep "||||||| parent of" file
+	)
+'
+
+test_expect_success 'rebase --apply describes fake ancestor base' '
+	(
+		cd rebase &&
+		git rebase --abort &&
+		test_must_fail git -c merge.conflictstyle=diff3 rebase --apply main &&
 		grep "||||||| constructed merge base" file
 	)
 '
diff --git a/t/t6428-merge-conflicts-sparse.sh b/t/t6428-merge-conflicts-sparse.sh
new file mode 100755
index 0000000000..7e8bf497f8
--- /dev/null
+++ b/t/t6428-merge-conflicts-sparse.sh
@@ -0,0 +1,158 @@
+#!/bin/sh
+
+test_description="merge cases"
+
+# The setup for all of them, pictorially, is:
+#
+#      A
+#      o
+#     / \
+#  O o   ?
+#     \ /
+#      o
+#      B
+#
+# To help make it easier to follow the flow of tests, they have been
+# divided into sections and each test will start with a quick explanation
+# of what commits O, A, and B contain.
+#
+# Notation:
+#    z/{b,c}   means  files z/b and z/c both exist
+#    x/d_1     means  file x/d exists with content d1.  (Purpose of the
+#                     underscore notation is to differentiate different
+#                     files that might be renamed into each other's paths.)
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
+
+
+# Testcase basic, conflicting changes in 'numerals'
+
+test_setup_numerals () {
+	test_create_repo numerals_$1 &&
+	(
+		cd numerals_$1 &&
+
+		>README &&
+		test_write_lines I II III >numerals &&
+		git add README numerals &&
+		test_tick &&
+		git commit -m "O" &&
+
+		git branch O &&
+		git branch A &&
+		git branch B &&
+
+		git checkout A &&
+		test_write_lines I II III IIII >numerals &&
+		git add numerals &&
+		test_tick &&
+		git commit -m "A" &&
+
+		git checkout B &&
+		test_write_lines I II III IV >numerals &&
+		git add numerals &&
+		test_tick &&
+		git commit -m "B" &&
+
+		cat <<-EOF >expected-index &&
+		H README
+		M numerals
+		M numerals
+		M numerals
+		EOF
+
+		cat <<-EOF >expected-merge
+		I
+		II
+		III
+		<<<<<<< HEAD
+		IIII
+		=======
+		IV
+		>>>>>>> B^0
+		EOF
+
+	)
+}
+
+test_expect_success 'conflicting entries written to worktree even if sparse' '
+	test_setup_numerals plain &&
+	(
+		cd numerals_plain &&
+
+		git checkout A^0 &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		git sparse-checkout init &&
+		git sparse-checkout set README &&
+
+		test_path_is_file README &&
+		test_path_is_missing numerals &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		git ls-files -t >index_files &&
+		test_cmp expected-index index_files &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		test_cmp expected-merge numerals &&
+
+		# 4 other files:
+		#   * expected-merge
+		#   * expected-index
+		#   * index_files
+		#   * others
+		git ls-files -o >others &&
+		test_line_count = 4 others
+	)
+'
+
+test_expect_merge_algorithm failure success 'present-despite-SKIP_WORKTREE handled reasonably' '
+	test_setup_numerals in_the_way &&
+	(
+		cd numerals_in_the_way &&
+
+		git checkout A^0 &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		git sparse-checkout init &&
+		git sparse-checkout set README &&
+
+		test_path_is_file README &&
+		test_path_is_missing numerals &&
+
+		echo foobar >numerals &&
+
+		test_must_fail git merge -s recursive B^0 &&
+
+		git ls-files -t >index_files &&
+		test_cmp expected-index index_files &&
+
+		test_path_is_file README &&
+		test_path_is_file numerals &&
+
+		test_cmp expected-merge numerals &&
+
+		# There should still be a file with "foobar" in it
+		grep foobar * &&
+
+		# 5 other files:
+		#   * expected-merge
+		#   * expected-index
+		#   * index_files
+		#   * others
+		#   * whatever name was given to the numerals file that had
+		#     "foobar" in it
+		git ls-files -o >others &&
+		test_line_count = 5 others
+	)
+'
+
+test_done
diff --git a/t/t6429-merge-sequence-rename-caching.sh b/t/t6429-merge-sequence-rename-caching.sh
new file mode 100755
index 0000000000..035edc40b1
--- /dev/null
+++ b/t/t6429-merge-sequence-rename-caching.sh
@@ -0,0 +1,700 @@
+#!/bin/sh
+
+test_description="remember regular & dir renames in sequence of merges"
+
+. ./test-lib.sh
+
+#
+# NOTE 1: this testfile tends to not only rename files, but modify on both
+#         sides; without modifying on both sides, optimizations can kick in
+#         which make rename detection irrelevant or trivial.  We want to make
+#         sure that we are triggering rename caching rather than rename
+#         bypassing.
+#
+# NOTE 2: this testfile uses 'test-tool fast-rebase' instead of either
+#         cherry-pick or rebase.  sequencer.c is only superficially
+#         integrated with merge-ort; it calls merge_switch_to_result()
+#         after EACH merge, which updates the index and working copy AND
+#         throws away the cached results (because merge_switch_to_result()
+#         is only supposed to be called at the end of the sequence).
+#         Integrating them more deeply is a big task, so for now the tests
+#         use 'test-tool fast-rebase'.
+#
+
+
+#
+# In the following simple testcase:
+#   Base:     numbers_1, values_1
+#   Upstream: numbers_2, values_2
+#   Topic_1:  sequence_3
+#   Topic_2:  scruples_3
+# or, in english, rename numbers -> sequence in the first commit, and rename
+# values -> scruples in the second commit.
+#
+# This shouldn't be a challenge, it's just verifying that cached renames isn't
+# preventing us from finding new renames.
+#
+test_expect_success 'caching renames does not preclude finding new ones' '
+	test_create_repo caching-renames-and-new-renames &&
+	(
+		cd caching-renames-and-new-renames &&
+
+		test_seq 2 10 >numbers &&
+		test_seq 2 10 >values &&
+		git add numbers values &&
+		git commit -m orig &&
+
+		git branch upstream &&
+		git branch topic &&
+
+		git switch upstream &&
+		test_seq 1 10 >numbers &&
+		test_seq 1 10 >values &&
+		git add numbers values &&
+		git commit -m "Tweaked both files" &&
+
+		git switch topic &&
+
+		test_seq 2 12 >numbers &&
+		git add numbers &&
+		git mv numbers sequence &&
+		git commit -m A &&
+
+		test_seq 2 12 >values &&
+		git add values &&
+		git mv values scruples &&
+		git commit -m B &&
+
+		#
+		# Actual testing
+		#
+
+		git switch upstream &&
+
+		test-tool fast-rebase --onto HEAD upstream~1 topic &&
+		#git cherry-pick upstream~1..topic
+
+		git ls-files >tracked-files &&
+		test_line_count = 2 tracked-files &&
+		test_seq 1 12 >expect &&
+		test_cmp expect sequence &&
+		test_cmp expect scruples
+	)
+'
+
+#
+# In the following testcase:
+#   Base:     numbers_1
+#   Upstream: rename numbers_1 -> sequence_2
+#   Topic_1:  numbers_3
+#   Topic_2:  numbers_1
+# or, in english, the first commit on the topic branch modifies numbers by
+# shrinking it (dramatically) and the second commit on topic reverts its
+# parent.
+#
+# Can git apply both patches?
+#
+# Traditional cherry-pick/rebase will fail to apply the second commit, the
+# one that reverted its parent, because despite detecting the rename from
+# 'numbers' to 'sequence' for the first commit, it fails to detect that
+# rename when picking the second commit.  That's "reasonable" given the
+# dramatic change in size of the file, but remembering the rename and
+# reusing it is reasonable too.
+#
+# We do test here that we expect rename detection to only be run once total
+# (the topic side of history doesn't need renames, and with caching we
+# should be able to only run rename detection on the upstream side one
+# time.)
+test_expect_success 'cherry-pick both a commit and its immediate revert' '
+	test_create_repo pick-commit-and-its-immediate-revert &&
+	(
+		cd pick-commit-and-its-immediate-revert &&
+
+		test_seq 11 30 >numbers &&
+		git add numbers &&
+		git commit -m orig &&
+
+		git branch upstream &&
+		git branch topic &&
+
+		git switch upstream &&
+		test_seq 1 30 >numbers &&
+		git add numbers &&
+		git mv numbers sequence &&
+		git commit -m "Renamed (and modified) numbers -> sequence" &&
+
+		git switch topic &&
+
+		test_seq 11 13 >numbers &&
+		git add numbers &&
+		git commit -m A &&
+
+		git revert HEAD &&
+
+		#
+		# Actual testing
+		#
+
+		git switch upstream &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
+
+		test-tool fast-rebase --onto HEAD upstream~1 topic &&
+		#git cherry-pick upstream~1..topic &&
+
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 1 calls
+	)
+'
+
+#
+# In the following testcase:
+#   Base:     sequence_1
+#   Upstream: rename sequence_1 -> values_2
+#   Topic_1:  rename sequence_1 -> values_3
+#   Topic_2:  add unrelated sequence_4
+# or, in english, both sides rename sequence -> values, and then the second
+# commit on the topic branch adds an unrelated file called sequence.
+#
+# This testcase presents no problems for git traditionally, but having both
+# sides do the same rename in effect "uses it up" and if it remains cached,
+# could cause a spurious rename/add conflict.
+#
+test_expect_success 'rename same file identically, then reintroduce it' '
+	test_create_repo rename-rename-1to1-then-add-old-filename &&
+	(
+		cd rename-rename-1to1-then-add-old-filename &&
+
+		test_seq 3 8 >sequence &&
+		git add sequence &&
+		git commit -m orig &&
+
+		git branch upstream &&
+		git branch topic &&
+
+		git switch upstream &&
+		test_seq 1 8 >sequence &&
+		git add sequence &&
+		git mv sequence values &&
+		git commit -m "Renamed (and modified) sequence -> values" &&
+
+		git switch topic &&
+
+		test_seq 3 10 >sequence &&
+		git add sequence &&
+		git mv sequence values &&
+		git commit -m A &&
+
+		test_write_lines A B C D E F G H I J >sequence &&
+		git add sequence &&
+		git commit -m B &&
+
+		#
+		# Actual testing
+		#
+
+		git switch upstream &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
+
+		test-tool fast-rebase --onto HEAD upstream~1 topic &&
+		#git cherry-pick upstream~1..topic &&
+
+		git ls-files >tracked &&
+		test_line_count = 2 tracked &&
+		test_path_is_file values &&
+		test_path_is_file sequence &&
+
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls
+	)
+'
+
+#
+# In the following testcase:
+#   Base:     olddir/{valuesZ_1, valuesY_1, valuesX_1}
+#   Upstream: rename olddir/valuesZ_1 -> dirA/valuesZ_2
+#             rename olddir/valuesY_1 -> dirA/valuesY_2
+#             rename olddir/valuesX_1 -> dirB/valuesX_2
+#   Topic_1:  rename olddir/valuesZ_1 -> dirA/valuesZ_3
+#             rename olddir/valuesY_1 -> dirA/valuesY_3
+#   Topic_2:  add olddir/newfile
+#   Expected Pick1: dirA/{valuesZ, valuesY}, dirB/valuesX
+#   Expected Pick2: dirA/{valuesZ, valuesY}, dirB/{valuesX, newfile}
+#
+# This testcase presents no problems for git traditionally, but having both
+# sides do the same renames in effect "use it up" but if the renames remain
+# cached, the directory rename could put newfile in the wrong directory.
+#
+test_expect_success 'rename same file identically, then add file to old dir' '
+	test_create_repo rename-rename-1to1-then-add-file-to-old-dir &&
+	(
+		cd rename-rename-1to1-then-add-file-to-old-dir &&
+
+		mkdir olddir/ &&
+		test_seq 3 8 >olddir/valuesZ &&
+		test_seq 3 8 >olddir/valuesY &&
+		test_seq 3 8 >olddir/valuesX &&
+		git add olddir &&
+		git commit -m orig &&
+
+		git branch upstream &&
+		git branch topic &&
+
+		git switch upstream &&
+		test_seq 1 8 >olddir/valuesZ &&
+		test_seq 1 8 >olddir/valuesY &&
+		test_seq 1 8 >olddir/valuesX &&
+		git add olddir &&
+		mkdir dirA &&
+		git mv olddir/valuesZ olddir/valuesY dirA &&
+		git mv olddir/ dirB/ &&
+		git commit -m "Renamed (and modified) values*" &&
+
+		git switch topic &&
+
+		test_seq 3 10 >olddir/valuesZ &&
+		test_seq 3 10 >olddir/valuesY &&
+		git add olddir &&
+		mkdir dirA &&
+		git mv olddir/valuesZ olddir/valuesY dirA &&
+		git commit -m A &&
+
+		>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m B &&
+
+		#
+		# Actual testing
+		#
+
+		git switch upstream &&
+		git config merge.directoryRenames true &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
+
+		test-tool fast-rebase --onto HEAD upstream~1 topic &&
+		#git cherry-pick upstream~1..topic &&
+
+		git ls-files >tracked &&
+		test_line_count = 4 tracked &&
+		test_path_is_file dirA/valuesZ &&
+		test_path_is_file dirA/valuesY &&
+		test_path_is_file dirB/valuesX &&
+		test_path_is_file dirB/newfile &&
+
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 3 calls
+	)
+'
+
+#
+# In the following testcase, upstream renames a directory, and the topic branch
+# first adds a file to the directory, then later renames the directory
+# differently:
+#   Base:     olddir/a
+#             olddir/b
+#   Upstream: rename olddir/ -> newdir/
+#   Topic_1:  add olddir/newfile
+#   Topic_2:  rename olddir/ -> otherdir/
+#
+# Here we are just concerned that cached renames might prevent us from seeing
+# the rename conflict, and we want to ensure that we do get a conflict.
+#
+# While at it, though, we do test that we only try to detect renames 2
+# times and not three.  (The first merge needs to detect renames on the
+# upstream side.  Traditionally, the second merge would need to detect
+# renames on both sides of history, but our caching of upstream renames
+# should avoid the need to re-detect upstream renames.)
+#
+test_expect_success 'cached dir rename does not prevent noticing later conflict' '
+	test_create_repo dir-rename-cache-not-occluding-later-conflict &&
+	(
+		cd dir-rename-cache-not-occluding-later-conflict &&
+
+		mkdir olddir &&
+		test_seq 3 10 >olddir/a &&
+		test_seq 3 10 >olddir/b &&
+		git add olddir &&
+		git commit -m orig &&
+
+		git branch upstream &&
+		git branch topic &&
+
+		git switch upstream &&
+		test_seq 3 10 >olddir/a &&
+		test_seq 3 10 >olddir/b &&
+		git add olddir &&
+		git mv olddir newdir &&
+		git commit -m "Dir renamed" &&
+
+		git switch topic &&
+
+		>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m A &&
+
+		test_seq 1 8 >olddir/a &&
+		test_seq 1 8 >olddir/b &&
+		git add olddir &&
+		git mv olddir otherdir &&
+		git commit -m B &&
+
+		#
+		# Actual testing
+		#
+
+		git switch upstream &&
+		git config merge.directoryRenames true &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
+
+		test_must_fail test-tool fast-rebase --onto HEAD upstream~1 topic >output &&
+		#git cherry-pick upstream..topic &&
+
+		grep CONFLICT..rename/rename output &&
+
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls
+	)
+'
+
+# Helper for the next two tests
+test_setup_upstream_rename () {
+	test_create_repo $1 &&
+	(
+		cd $1 &&
+
+		test_seq 3 8 >somefile &&
+		test_seq 3 8 >relevant-rename &&
+		git add somefile relevant-rename &&
+		mkdir olddir &&
+		test_write_lines a b c d e f g >olddir/a &&
+		test_write_lines z y x w v u t >olddir/b &&
+		git add olddir &&
+		git commit -m orig &&
+
+		git branch upstream &&
+		git branch topic &&
+
+		git switch upstream &&
+		test_seq 1 8 >somefile &&
+		test_seq 1 8 >relevant-rename &&
+		git add somefile relevant-rename &&
+		git mv relevant-rename renamed &&
+		echo h >>olddir/a &&
+		echo s >>olddir/b &&
+		git add olddir &&
+		git mv olddir newdir &&
+		git commit -m "Dir renamed"
+	)
+}
+
+#
+# In the following testcase, upstream renames a file in the toplevel directory
+# as well as its only directory:
+#   Base:     relevant-rename_1
+#             somefile
+#             olddir/a
+#             olddir/b
+#   Upstream: rename relevant-rename_1 -> renamed_2
+#             rename olddir/           -> newdir/
+#   Topic_1:  relevant-rename_3
+#   Topic_2:  olddir/newfile_1
+#   Topic_3:  olddir/newfile_2
+#
+# In this testcase, since the first commit being picked only modifies a
+# file in the toplevel directory, the directory rename is irrelevant for
+# that first merge.  However, we need to notice the directory rename for
+# the merge that picks the second commit, and we don't want the third
+# commit to mess up its location either.  We want to make sure that
+# olddir/newfile doesn't exist in the result and that newdir/newfile does.
+#
+# We also test that we only do rename detection twice.  We never need
+# rename detection on the topic side of history, but we do need it twice on
+# the upstream side of history.  For the first topic commit, we only need
+# the
+#   relevant-rename -> renamed
+# rename, because olddir is unmodified by Topic_1.  For Topic_2, however,
+# the new file being added to olddir means files that were previously
+# irrelevant for rename detection are now relevant, forcing us to repeat
+# rename detection for the paths we don't already have cached.  Topic_3 also
+# tweaks olddir/newfile, but the renames in olddir/ will have been cached
+# from the second rename detection run.
+#
+test_expect_success 'dir rename unneeded, then add new file to old dir' '
+	test_setup_upstream_rename dir-rename-unneeded-until-new-file &&
+	(
+		cd dir-rename-unneeded-until-new-file &&
+
+		git switch topic &&
+
+		test_seq 3 10 >relevant-rename &&
+		git add relevant-rename &&
+		git commit -m A &&
+
+		echo foo >olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m B &&
+
+		echo bar >>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m C &&
+
+		#
+		# Actual testing
+		#
+
+		git switch upstream &&
+		git config merge.directoryRenames true &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
+
+		test-tool fast-rebase --onto HEAD upstream~1 topic &&
+		#git cherry-pick upstream..topic &&
+
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls &&
+
+		git ls-files >tracked &&
+		test_line_count = 5 tracked &&
+		test_path_is_missing olddir/newfile &&
+		test_path_is_file newdir/newfile
+	)
+'
+
+#
+# The following testcase is *very* similar to the last one, but instead of
+# adding a new olddir/newfile, it renames somefile -> olddir/newfile:
+#   Base:     relevant-rename_1
+#             somefile_1
+#             olddir/a
+#             olddir/b
+#   Upstream: rename relevant-rename_1 -> renamed_2
+#             rename olddir/           -> newdir/
+#   Topic_1:  relevant-rename_3
+#   Topic_2:  rename somefile -> olddir/newfile_2
+#   Topic_3:  modify olddir/newfile_3
+#
+# In this testcase, since the first commit being picked only modifies a
+# file in the toplevel directory, the directory rename is irrelevant for
+# that first merge.  However, we need to notice the directory rename for
+# the merge that picks the second commit, and we don't want the third
+# commit to mess up its location either.  We want to make sure that
+# neither somefile or olddir/newfile exists in the result and that
+# newdir/newfile does.
+#
+# This testcase needs one more call to rename detection than the last
+# testcase, because of the somefile -> olddir/newfile rename in Topic_2.
+test_expect_success 'dir rename unneeded, then rename existing file into old dir' '
+	test_setup_upstream_rename dir-rename-unneeded-until-file-moved-inside &&
+	(
+		cd dir-rename-unneeded-until-file-moved-inside &&
+
+		git switch topic &&
+
+		test_seq 3 10 >relevant-rename &&
+		git add relevant-rename &&
+		git commit -m A &&
+
+		test_seq 1 10 >somefile &&
+		git add somefile &&
+		git mv somefile olddir/newfile &&
+		git commit -m B &&
+
+		test_seq 1 12 >olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m C &&
+
+		#
+		# Actual testing
+		#
+
+		git switch upstream &&
+		git config merge.directoryRenames true &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
+
+		test-tool fast-rebase --onto HEAD upstream~1 topic &&
+		#git cherry-pick upstream..topic &&
+
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 3 calls &&
+
+		test_path_is_missing somefile &&
+		test_path_is_missing olddir/newfile &&
+		test_path_is_file newdir/newfile &&
+		git ls-files >tracked &&
+		test_line_count = 4 tracked
+	)
+'
+
+# Helper for the next two tests
+test_setup_topic_rename () {
+	test_create_repo $1 &&
+	(
+		cd $1 &&
+
+		test_seq 3 8 >somefile &&
+		mkdir olddir &&
+		test_seq 3 8 >olddir/a &&
+		echo b >olddir/b &&
+		git add olddir somefile &&
+		git commit -m orig &&
+
+		git branch upstream &&
+		git branch topic &&
+
+		git switch topic &&
+		test_seq 1 8 >somefile &&
+		test_seq 1 8 >olddir/a &&
+		git add somefile olddir/a &&
+		git mv olddir newdir &&
+		git commit -m "Dir renamed" &&
+
+		test_seq 1 10 >somefile &&
+		git add somefile &&
+		mkdir olddir &&
+		>olddir/unrelated-file &&
+		git add olddir &&
+		git commit -m "Unrelated file in recreated old dir"
+	)
+}
+
+#
+# In the following testcase, the first commit on the topic branch renames
+# a directory, while the second recreates the old directory and places a
+# file into it:
+#   Base:     somefile
+#             olddir/a
+#             olddir/b
+#   Upstream: olddir/newfile
+#   Topic_1:  somefile_2
+#             rename olddir/ -> newdir/
+#   Topic_2:  olddir/unrelated-file
+#
+# Note that the first pick should merge:
+#   Base:     somefile
+#             olddir/{a,b}
+#   Upstream: olddir/newfile
+#   Topic_1:  rename olddir/ -> newdir/
+# For which the expected result (assuming merge.directoryRenames=true) is
+# clearly:
+#   Result:   somefile
+#             newdir/{a, b, newfile}
+#
+# While the second pick does the following three-way merge:
+#   Base (Topic_1):           somefile
+#                             newdir/{a,b}
+#   Upstream (Result from 1): same files as base, but adds newdir/newfile
+#   Topic_2:                  same files as base, but adds olddir/unrelated-file
+#
+# The second merge is pretty trivial; upstream adds newdir/newfile, and
+# topic_2 adds olddir/unrelated-file.  We're just testing that we don't
+# accidentally cache directory renames somehow and rename
+# olddir/unrelated-file to newdir/unrelated-file.
+#
+# This testcase should only need one call to diffcore_rename_extended().
+test_expect_success 'caching renames only on upstream side, part 1' '
+	test_setup_topic_rename cache-renames-only-upstream-add-file &&
+	(
+		cd cache-renames-only-upstream-add-file &&
+
+		git switch upstream &&
+
+		>olddir/newfile &&
+		git add olddir/newfile &&
+		git commit -m "Add newfile" &&
+
+		#
+		# Actual testing
+		#
+
+		git switch upstream &&
+
+		git config merge.directoryRenames true &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
+
+		test-tool fast-rebase --onto HEAD upstream~1 topic &&
+		#git cherry-pick upstream..topic &&
+
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 1 calls &&
+
+		git ls-files >tracked &&
+		test_line_count = 5 tracked &&
+		test_path_is_missing newdir/unrelated-file &&
+		test_path_is_file olddir/unrelated-file &&
+		test_path_is_file newdir/newfile &&
+		test_path_is_file newdir/b &&
+		test_path_is_file newdir/a &&
+		test_path_is_file somefile
+	)
+'
+
+#
+# The following testcase is *very* similar to the last one, but instead of
+# adding a new olddir/newfile, it renames somefile -> olddir/newfile:
+#   Base:     somefile
+#             olddir/a
+#             olddir/b
+#   Upstream: somefile_1 -> olddir/newfile
+#   Topic_1:  rename olddir/ -> newdir/
+#             somefile_2
+#   Topic_2:  olddir/unrelated-file
+#             somefile_3
+#
+# Much like the previous test, this case is actually trivial and we are just
+# making sure there isn't some spurious directory rename caching going on
+# for the wrong side of history.
+#
+#
+# This testcase should only need two calls to diffcore_rename_extended(),
+# both for the first merge, one for each side of history.
+#
+test_expect_success 'caching renames only on upstream side, part 2' '
+	test_setup_topic_rename cache-renames-only-upstream-rename-file &&
+	(
+		cd cache-renames-only-upstream-rename-file &&
+
+		git switch upstream &&
+
+		git mv somefile olddir/newfile &&
+		git commit -m "Add newfile" &&
+
+		#
+		# Actual testing
+		#
+
+		git switch upstream &&
+
+		git config merge.directoryRenames true &&
+
+		GIT_TRACE2_PERF="$(pwd)/trace.output" &&
+		export GIT_TRACE2_PERF &&
+
+		test-tool fast-rebase --onto HEAD upstream~1 topic &&
+		#git cherry-pick upstream..topic &&
+
+		grep region_enter.*diffcore_rename trace.output >calls &&
+		test_line_count = 2 calls &&
+
+		git ls-files >tracked &&
+		test_line_count = 4 tracked &&
+		test_path_is_missing newdir/unrelated-file &&
+		test_path_is_file olddir/unrelated-file &&
+		test_path_is_file newdir/newfile &&
+		test_path_is_file newdir/b &&
+		test_path_is_file newdir/a
+	)
+'
+
+test_done
diff --git a/t/t3030-merge-recursive.sh b/t/t6430-merge-recursive.sh
index 2170758e38..ffcc01fe65 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t6430-merge-recursive.sh
@@ -2,7 +2,11 @@
 
 test_description='merge-recursive backend test'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
 
 test_expect_success 'setup 1' '
 
@@ -34,7 +38,7 @@ test_expect_success 'setup 1' '
 	git add a d/e &&
 
 	test_tick &&
-	git commit -m "master modifies a and d/e" &&
+	git commit -m "main modifies a and d/e" &&
 	c1=$(git rev-parse --verify HEAD) &&
 	( git ls-tree -r HEAD && git ls-files -s ) >actual &&
 	(
@@ -465,7 +469,7 @@ test_expect_success SYMLINKS 'dir in working tree with symlink ancestor does not
 		git checkout -b branch1 &&
 		git commit --allow-empty -m "empty commit" &&
 
-		git checkout master &&
+		git checkout main &&
 		git rm foo &&
 		mkdir foo &&
 		>foo/bar &&
@@ -474,7 +478,7 @@ test_expect_success SYMLINKS 'dir in working tree with symlink ancestor does not
 
 		git checkout branch1 &&
 
-		git cherry-pick master &&
+		git cherry-pick main &&
 		test_path_is_dir foo &&
 		test_path_is_file foo/bar
 	)
@@ -489,8 +493,8 @@ test_expect_success 'reset and 3-way merge' '
 
 test_expect_success 'reset and bind merge' '
 
-	git reset --hard master &&
-	git read-tree --prefix=M/ master &&
+	git reset --hard main &&
+	git read-tree --prefix=M/ main &&
 	git ls-files -s >actual &&
 	(
 		echo "100644 $o1 0	M/a" &&
@@ -504,7 +508,7 @@ test_expect_success 'reset and bind merge' '
 	) >expected &&
 	test_cmp expected actual &&
 
-	git read-tree --prefix=a1/ master &&
+	git read-tree --prefix=a1/ main &&
 	git ls-files -s >actual &&
 	(
 		echo "100644 $o1 0	M/a" &&
@@ -522,7 +526,7 @@ test_expect_success 'reset and bind merge' '
 	) >expected &&
 	test_cmp expected actual &&
 
-	git read-tree --prefix=z/ master &&
+	git read-tree --prefix=z/ main &&
 	git ls-files -s >actual &&
 	(
 		echo "100644 $o1 0	M/a" &&
@@ -598,13 +602,13 @@ test_expect_success 'merge-recursive w/ empty work tree - theirs has rename' '
 
 test_expect_success 'merge removes empty directories' '
 
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b rm &&
 	git rm d/e &&
 	git commit -mremoved-d/e &&
-	git checkout master &&
+	git checkout main &&
 	git merge -s recursive rm &&
-	test_must_fail test -d d
+	test_path_is_missing d
 '
 
 test_expect_success 'merge-recursive simple w/submodule' '
@@ -641,7 +645,7 @@ test_expect_success 'merge-recursive copy vs. rename' '
 	test_cmp expected actual
 '
 
-test_expect_failure 'merge-recursive rename vs. rename/symlink' '
+test_expect_merge_algorithm failure success 'merge-recursive rename vs. rename/symlink' '
 
 	git checkout -f rename &&
 	git merge rename-ln &&
@@ -663,7 +667,7 @@ test_expect_failure 'merge-recursive rename vs. rename/symlink' '
 
 test_expect_success 'merging with triple rename across D/F conflict' '
 	git reset --hard HEAD &&
-	git checkout -b main &&
+	git checkout -b topic &&
 	git rm -rf . &&
 
 	echo "just a file" >sub1 &&
@@ -682,7 +686,7 @@ test_expect_success 'merging with triple rename across D/F conflict' '
 	test_tick &&
 	git commit -a -m changesimplefile &&
 
-	git checkout main &&
+	git checkout topic &&
 	git rm sub1 &&
 	git mv sub2 sub1 &&
 	test_tick &&
diff --git a/t/t3031-merge-criscross.sh b/t/t6431-merge-criscross.sh
index 3824756a02..3824756a02 100755
--- a/t/t3031-merge-criscross.sh
+++ b/t/t6431-merge-criscross.sh
diff --git a/t/t3032-merge-recursive-space-options.sh b/t/t6432-merge-recursive-space-options.sh
index b56180ee4a..db4b77e63d 100755
--- a/t/t3032-merge-recursive-space-options.sh
+++ b/t/t6432-merge-recursive-space-options.sh
@@ -2,15 +2,18 @@
 
 test_description='merge-recursive space options
 
-* [master] Clarify
+* [main] Clarify
  ! [remote] Remove cruft
 --
  + [remote] Remove cruft
-*  [master] Clarify
+*  [main] Clarify
 *+ [remote^] Initial revision
 *   ok 1: setup
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_have_prereq SED_STRIPS_CR && SED_OPTIONS=-b
@@ -87,7 +90,7 @@ test_expect_success 'setup' '
 	mv text.txt+ text.txt &&
 	git commit -a -m "Remove cruft" &&
 
-	git checkout master &&
+	git checkout main &&
 	sed -e "
 			s/\(not in his right mind\),\(.*\)/\1;\2Q/
 			s/Quite correct\(.*\)/It is too correct\1Q/
diff --git a/t/t3033-merge-toplevel.sh b/t/t6433-merge-toplevel.sh
index d314599428..b16031465f 100755
--- a/t/t3033-merge-toplevel.sh
+++ b/t/t6433-merge-toplevel.sh
@@ -2,10 +2,13 @@
 
 test_description='"git merge" top-level frontend'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 t3033_reset () {
-	git checkout -B master two &&
+	git checkout -B main two &&
 	git branch -f left three &&
 	git branch -f right four
 }
@@ -21,7 +24,7 @@ test_expect_success setup '
 	test_commit four &&
 	git checkout --orphan newroot &&
 	test_commit five &&
-	git checkout master
+	git checkout main
 '
 
 # Local branches
@@ -61,7 +64,7 @@ test_expect_success 'merge octopus, non-fast-forward (ff)' '
 test_expect_success 'merge octopus, fast-forward (does not ff)' '
 	t3033_reset &&
 	git merge left right &&
-	# two (master) is not an ancestor of three (left) and four (right)
+	# two (main) is not an ancestor of three (left) and four (right)
 	test_must_fail git rev-parse --verify HEAD^4 &&
 	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
 	git rev-parse two three four | sort >expect &&
@@ -118,7 +121,7 @@ test_expect_success 'merge FETCH_HEAD octopus fast-forward (does not ff)' '
 	t3033_reset &&
 	git fetch . left right &&
 	git merge FETCH_HEAD &&
-	# two (master) is not an ancestor of three (left) and four (right)
+	# two (main) is not an ancestor of three (left) and four (right)
 	test_must_fail git rev-parse --verify HEAD^4 &&
 	git rev-parse HEAD^1 HEAD^2 HEAD^3 | sort >actual &&
 	git rev-parse two three four | sort >expect &&
@@ -142,6 +145,17 @@ test_expect_success 'refuse two-project merge by default' '
 	test_must_fail git merge five
 '
 
+test_expect_success 'refuse two-project merge by default, quit before --autostash happens' '
+	t3033_reset &&
+	git reset --hard four &&
+	echo change >>one.t &&
+	git diff >expect &&
+	test_must_fail git merge --autostash five 2>err &&
+	test_i18ngrep ! "stash" err &&
+	git diff >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'two-project merge with --allow-unrelated-histories' '
 	t3033_reset &&
 	git reset --hard four &&
@@ -149,4 +163,15 @@ test_expect_success 'two-project merge with --allow-unrelated-histories' '
 	git diff --exit-code five
 '
 
+test_expect_success 'two-project merge with --allow-unrelated-histories with --autostash' '
+	t3033_reset &&
+	git reset --hard four &&
+	echo change >>one.t &&
+	git diff one.t >expect &&
+	git merge --allow-unrelated-histories --autostash five 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	git diff one.t >actual &&
+	test_cmp expect actual
+'
+
 test_done
diff --git a/t/t3034-merge-recursive-rename-options.sh b/t/t6434-merge-recursive-rename-options.sh
index 3d9fae68c4..a11707835b 100755
--- a/t/t3034-merge-recursive-rename-options.sh
+++ b/t/t6434-merge-recursive-rename-options.sh
@@ -5,11 +5,11 @@ test_description='merge-recursive rename options
 Test rename detection by examining rename/delete conflicts.
 
 * (HEAD -> rename) rename
-| * (master) delete
+| * (main) delete
 |/
 * base
 
-git diff --name-status base master
+git diff --name-status base main
 D	0-old
 D	1-old
 D	2-old
@@ -26,6 +26,9 @@ they are rounded down (see, e.g., Documentation/diff-generate-patch.txt, which
 mentions this in a different context).
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 get_expected_stages () {
@@ -118,7 +121,7 @@ test_expect_success 'setup repo' '
 	get_expected_stages 2 &&
 	get_expected_stages 3 &&
 	check_50="false" &&
-	tail="HEAD^ -- HEAD master"
+	tail="HEAD^ -- HEAD main"
 '
 
 test_expect_success 'setup thresholds' '
diff --git a/t/t3035-merge-sparse.sh b/t/t6435-merge-sparse.sh
index c4b4a94324..74562e1235 100755
--- a/t/t3035-merge-sparse.sh
+++ b/t/t6435-merge-sparse.sh
@@ -28,7 +28,7 @@ test_expect_success 'setup' '
 	git config core.sparseCheckout true &&
 	echo "/checked-out" >.git/info/sparse-checkout &&
 	git reset --hard &&
-	! git merge theirs
+	test_must_fail git merge theirs
 '
 
 test_expect_success 'reset --hard works after the conflict' '
@@ -42,7 +42,7 @@ test_expect_success 'is reset properly' '
 '
 
 test_expect_success 'setup: conflict back' '
-	! git merge theirs
+	test_must_fail git merge theirs
 '
 
 test_expect_success 'Merge abort works after the conflict' '
diff --git a/t/t7607-merge-overwrite.sh b/t/t6436-merge-overwrite.sh
index dd8ab7ede1..84b4aacf49 100755
--- a/t/t7607-merge-overwrite.sh
+++ b/t/t6436-merge-overwrite.sh
@@ -4,6 +4,9 @@ test_description='git-merge
 
 Do not overwrite changes.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -97,11 +100,19 @@ test_expect_success 'will not overwrite unstaged changes in renamed file' '
 	git mv c1.c other.c &&
 	git commit -m rename &&
 	cp important other.c &&
-	test_must_fail git merge c1a >out &&
-	test_i18ngrep "Refusing to lose dirty file at other.c" out &&
-	test_path_is_file other.c~HEAD &&
-	test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
-	test_cmp important other.c
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		test_must_fail git merge c1a >out 2>err &&
+		test_i18ngrep "would be overwritten by merge" err &&
+		test_cmp important other.c &&
+		test_path_is_missing .git/MERGE_HEAD
+	else
+		test_must_fail git merge c1a >out &&
+		test_i18ngrep "Refusing to lose dirty file at other.c" out &&
+		test_path_is_file other.c~HEAD &&
+		test $(git hash-object other.c~HEAD) = $(git rev-parse c1a:c1.c) &&
+		test_cmp important other.c
+	fi
 '
 
 test_expect_success 'will not overwrite untracked subtree' '
@@ -128,7 +139,7 @@ test_expect_success 'will not overwrite untracked file in leading path' '
 	cp important sub &&
 	cp important sub2 &&
 	test_must_fail git merge sub 2>out &&
-	test_i18ncmp out expect &&
+	test_cmp out expect &&
 	test_path_is_missing .git/MERGE_HEAD &&
 	test_cmp important sub &&
 	test_cmp important sub2 &&
@@ -163,7 +174,7 @@ test_expect_success 'will not overwrite untracked file on unborn branch' '
 	git checkout --orphan new &&
 	cp important c0.c &&
 	test_must_fail git merge c0 2>out &&
-	test_i18ncmp out expect
+	test_cmp out expect
 '
 
 test_expect_success 'will not overwrite untracked file on unborn branch .git/MERGE_HEAD sanity etc.' '
@@ -185,7 +196,7 @@ test_expect_success 'set up unborn branch and content' '
 '
 
 test_expect_success 'will not clobber WT/index when merging into unborn' '
-	git merge master &&
+	git merge main &&
 	grep foo tracked-file &&
 	git show :tracked-file >expect &&
 	grep foo expect &&
diff --git a/t/t7405-submodule-merge.sh b/t/t6437-submodule-merge.sh
index aa33978ed2..e5e89c2045 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t6437-submodule-merge.sh
@@ -2,7 +2,11 @@
 
 test_description='merging with submodules'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-merge.sh
 
 #
 # history
@@ -27,7 +31,7 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m root &&
 
-	git checkout -b a master &&
+	git checkout -b a main &&
 	(cd sub &&
 	 echo A > file &&
 	 git add file &&
@@ -37,7 +41,7 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m a &&
 
-	git checkout -b b master &&
+	git checkout -b b main &&
 	(cd sub &&
 	 echo B > file &&
 	 git add file &&
@@ -127,7 +131,12 @@ test_expect_success 'merging should conflict for non fast-forward' '
 	 git checkout -b test-nonforward b &&
 	 (cd sub &&
 	  git rev-parse sub-d > ../expect) &&
-	 test_must_fail git merge c 2> actual  &&
+	  if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	  then
+		test_must_fail git merge c >actual
+	  else
+		test_must_fail git merge c 2> actual
+	  fi &&
 	 grep $(cat expect) actual > /dev/null &&
 	 git reset --hard)
 '
@@ -138,9 +147,21 @@ test_expect_success 'merging should fail for ambiguous common parent' '
 	(cd sub &&
 	 git checkout -b ambiguous sub-b &&
 	 git merge sub-c &&
-	 git rev-parse sub-d > ../expect1 &&
-	 git rev-parse ambiguous > ../expect2) &&
-	test_must_fail git merge c 2> actual &&
+	 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	 then
+		git rev-parse --short sub-d >../expect1 &&
+		git rev-parse --short ambiguous >../expect2
+	 else
+		git rev-parse sub-d > ../expect1 &&
+		git rev-parse ambiguous > ../expect2
+	 fi
+	 ) &&
+	 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	 then
+		test_must_fail git merge c >actual
+	 else
+		test_must_fail git merge c 2> actual
+	 fi &&
 	grep $(cat expect1) actual > /dev/null &&
 	grep $(cat expect2) actual > /dev/null &&
 	git reset --hard)
@@ -195,7 +216,7 @@ test_expect_success 'git submodule status should display the merge conflict prop
        url = $TRASH_DIRECTORY/sub
 EOF
        cat >expect <<EOF &&
-U0000000000000000000000000000000000000000 sub
+U$ZERO_OID sub
 EOF
        git submodule status > actual &&
        test_cmp expect actual &&
@@ -214,7 +235,7 @@ test_expect_success 'git submodule status should display the merge conflict prop
        url = $TRASH_DIRECTORY/sub
 EOF
        cat >expect <<EOF &&
-U0000000000000000000000000000000000000000 sub
+U$ZERO_OID sub
 EOF
        git submodule status > actual &&
        test_cmp expect actual &&
@@ -237,22 +258,22 @@ test_expect_success 'setup for recursive merge with submodule' '
 	 (cd sub &&
 	  git init &&
 	  test_commit a &&
-	  git checkout -b sub-b master &&
+	  git checkout -b sub-b main &&
 	  test_commit b &&
-	  git checkout -b sub-c master &&
+	  git checkout -b sub-c main &&
 	  test_commit c &&
 	  git checkout -b sub-bc sub-b &&
 	  git merge sub-c &&
 	  git checkout -b sub-cb sub-c &&
 	  git merge sub-b &&
-	  git checkout master) &&
+	  git checkout main) &&
 	 git add sub &&
 	 git commit -m a &&
-	 git checkout -b top-b master &&
+	 git checkout -b top-b main &&
 	 (cd sub && git checkout sub-b) &&
 	 git add sub &&
 	 git commit -m b &&
-	 git checkout -b top-c master &&
+	 git checkout -b top-c main &&
 	 (cd sub && git checkout sub-c) &&
 	 git add sub &&
 	 git commit -m c &&
@@ -308,7 +329,7 @@ test_expect_success 'setup file/submodule conflict' '
 	)
 '
 
-test_expect_failure 'file/submodule conflict' '
+test_expect_merge_algorithm failure success 'file/submodule conflict' '
 	test_when_finished "git -C file-submodule reset --hard" &&
 	(
 		cd file-submodule &&
@@ -417,7 +438,7 @@ test_expect_failure 'directory/submodule conflict; keep submodule clean' '
 	)
 '
 
-test_expect_failure !FAIL_PREREQS 'directory/submodule conflict; should not treat submodule files as untracked or in the way' '
+test_expect_merge_algorithm failure success !FAIL_PREREQS 'directory/submodule conflict; should not treat submodule files as untracked or in the way' '
 	test_when_finished "git -C directory-submodule/path reset --hard" &&
 	test_when_finished "git -C directory-submodule reset --hard" &&
 	(
diff --git a/t/t6438-submodule-directory-file-conflicts.sh b/t/t6438-submodule-directory-file-conflicts.sh
new file mode 100755
index 0000000000..8df67a0ef9
--- /dev/null
+++ b/t/t6438-submodule-directory-file-conflicts.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+test_description='merge can handle submodules'
+
+. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-submodule-update.sh
+
+# merges without conflicts
+test_submodule_switch "merge"
+
+test_submodule_switch "merge --ff"
+
+test_submodule_switch "merge --ff-only"
+
+if test "$GIT_TEST_MERGE_ALGORITHM" != ort
+then
+	KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
+	KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
+fi
+test_submodule_switch "merge --no-ff"
+
+test_done
diff --git a/t/t7609-merge-co-error-msgs.sh b/t/t6439-merge-co-error-msgs.sh
index e90413204e..5bfb027099 100755
--- a/t/t7609-merge-co-error-msgs.sh
+++ b/t/t6439-merge-co-error-msgs.sh
@@ -2,6 +2,9 @@
 
 test_description='unpack-trees error messages'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
@@ -18,7 +21,7 @@ test_expect_success 'setup' '
 	git add two three four five &&
 	git commit -m Second &&
 
-	git checkout master &&
+	git checkout main &&
 	echo other >two &&
 	echo other >three &&
 	echo other >four &&
@@ -37,14 +40,14 @@ EOF
 
 test_expect_success 'untracked files overwritten by merge (fast and non-fast forward)' '
 	test_must_fail git merge branch 2>out &&
-	test_i18ncmp out expect &&
+	test_cmp out expect &&
 	git commit --allow-empty -m empty &&
 	(
 		GIT_MERGE_VERBOSITY=0 &&
 		export GIT_MERGE_VERBOSITY &&
 		test_must_fail git merge branch 2>out2
 	) &&
-	test_i18ncmp out2 expect &&
+	test_cmp out2 expect &&
 	git reset --hard HEAD^
 '
 
@@ -65,7 +68,7 @@ test_expect_success 'untracked files or local changes ovewritten by merge' '
 	git add three &&
 	git add four &&
 	test_must_fail git merge branch 2>out &&
-	test_i18ncmp out expect
+	test_cmp out expect
 '
 
 cat >expect <<\EOF
@@ -83,11 +86,11 @@ test_expect_success 'cannot switch branches because of local changes' '
 	echo two >rep/two &&
 	git add rep/one rep/two &&
 	git commit -m Fourth &&
-	git checkout master &&
+	git checkout main &&
 	echo uno >rep/one &&
 	echo dos >rep/two &&
 	test_must_fail git checkout branch 2>out &&
-	test_i18ncmp out expect
+	test_cmp out expect
 '
 
 cat >expect <<\EOF
@@ -101,7 +104,7 @@ EOF
 test_expect_success 'not uptodate file porcelain checkout error' '
 	git add rep/one rep/two &&
 	test_must_fail git checkout branch 2>out &&
-	test_i18ncmp out expect
+	test_cmp out expect
 '
 
 cat >expect <<\EOF
@@ -126,13 +129,13 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' '
 	git rm rep2 -r &&
 	>rep &&
 	>rep2 &&
-	git add rep rep2&&
+	git add rep rep2 &&
 	git commit -m "added test as a file" &&
-	git checkout master &&
+	git checkout main &&
 	>rep/untracked-file &&
 	>rep2/untracked-file &&
 	test_must_fail git checkout branch 2>out &&
-	test_i18ncmp out ../expect
+	test_cmp out ../expect
 '
 
 test_done
diff --git a/t/t6500-gc.sh b/t/t6500-gc.sh
index c0f04dc6b0..c2021267f2 100755
--- a/t/t6500-gc.sh
+++ b/t/t6500-gc.sh
@@ -10,7 +10,24 @@ test_expect_success 'setup' '
 	# do not let the amount of physical memory affects gc
 	# behavior, make sure we always pack everything to one pack by
 	# default
-	git config gc.bigPackThreshold 2g
+	git config gc.bigPackThreshold 2g &&
+
+	# These are simply values which, when hashed as a blob with a newline,
+	# produce a hash where the first byte is 0x17 in their respective
+	# algorithms.
+	test_oid_cache <<-EOF
+	obj1 sha1:263
+	obj1 sha256:34
+
+	obj2 sha1:410
+	obj2 sha256:174
+
+	obj3 sha1:523
+	obj3 sha256:313
+
+	obj4 sha1:790
+	obj4 sha256:481
+	EOF
 '
 
 test_expect_success 'gc empty repository' '
@@ -61,7 +78,7 @@ test_expect_success 'gc --keep-largest-pack' '
 		git gc &&
 		( cd .git/objects/pack && ls *.pack ) >pack-list &&
 		test_line_count = 1 pack-list &&
-		BASE_PACK=.git/objects/pack/pack-*.pack &&
+		cp pack-list base-pack-list &&
 		test_commit four &&
 		git repack -d &&
 		test_commit five &&
@@ -73,11 +90,57 @@ test_expect_success 'gc --keep-largest-pack' '
 		test_line_count = 2 pack-list &&
 		awk "/^P /{print \$2}" <.git/objects/info/packs >pack-info &&
 		test_line_count = 2 pack-info &&
-		test_path_is_file $BASE_PACK &&
+		test_path_is_file .git/objects/pack/$(cat base-pack-list) &&
 		git fsck
 	)
 '
 
+test_expect_success 'pre-auto-gc hook can stop auto gc' '
+	cat >err.expect <<-\EOF &&
+	no gc for you
+	EOF
+
+	git init pre-auto-gc-hook &&
+	(
+		cd pre-auto-gc-hook &&
+		write_script ".git/hooks/pre-auto-gc" <<-\EOF &&
+		echo >&2 no gc for you &&
+		exit 1
+		EOF
+
+		git config gc.auto 3 &&
+		git config gc.autoDetach false &&
+
+		# We need to create two object whose sha1s start with 17
+		# since this is what git gc counts.  As it happens, these
+		# two blobs will do so.
+		test_commit "$(test_oid obj1)" &&
+		test_commit "$(test_oid obj2)" &&
+
+		git gc --auto >../out.actual 2>../err.actual
+	) &&
+	test_must_be_empty out.actual &&
+	test_cmp err.expect err.actual &&
+
+	cat >err.expect <<-\EOF &&
+	will gc for you
+	Auto packing the repository for optimum performance.
+	See "git help gc" for manual housekeeping.
+	EOF
+
+	(
+		cd pre-auto-gc-hook &&
+		write_script ".git/hooks/pre-auto-gc" <<-\EOF &&
+		echo >&2 will gc for you &&
+		exit 0
+		EOF
+		git gc --auto >../out.actual 2>../err.actual
+	) &&
+
+	test_must_be_empty out.actual &&
+	test_cmp err.expect err.actual
+'
+
 test_expect_success 'auto gc with too many loose objects does not attempt to create bitmaps' '
 	test_config gc.auto 3 &&
 	test_config gc.autodetach false &&
@@ -85,32 +148,32 @@ test_expect_success 'auto gc with too many loose objects does not attempt to cre
 	# We need to create two object whose sha1s start with 17
 	# since this is what git gc counts.  As it happens, these
 	# two blobs will do so.
-	test_commit 263 &&
-	test_commit 410 &&
+	test_commit "$(test_oid obj1)" &&
+	test_commit "$(test_oid obj2)" &&
 	# Our first gc will create a pack; our second will create a second pack
 	git gc --auto &&
-	ls .git/objects/pack | sort >existing_packs &&
-	test_commit 523 &&
-	test_commit 790 &&
+	ls .git/objects/pack/pack-*.pack | sort >existing_packs &&
+	test_commit "$(test_oid obj3)" &&
+	test_commit "$(test_oid obj4)" &&
 
 	git gc --auto 2>err &&
 	test_i18ngrep ! "^warning:" err &&
-	ls .git/objects/pack/ | sort >post_packs &&
+	ls .git/objects/pack/pack-*.pack | sort >post_packs &&
 	comm -1 -3 existing_packs post_packs >new &&
 	comm -2 -3 existing_packs post_packs >del &&
 	test_line_count = 0 del && # No packs are deleted
-	test_line_count = 2 new # There is one new pack and its .idx
+	test_line_count = 1 new # There is one new pack
 '
 
 test_expect_success 'gc --no-quiet' '
-	git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+	GIT_PROGRESS_DELAY=0 git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
 	test_must_be_empty stdout &&
-	test_line_count = 1 stderr &&
 	test_i18ngrep "Computing commit graph generation numbers" stderr
 '
 
 test_expect_success TTY 'with TTY: gc --no-quiet' '
-	test_terminal git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
+	test_terminal env GIT_PROGRESS_DELAY=0 \
+		git -c gc.writeCommitGraph=true gc --no-quiet >stdout 2>stderr &&
 	test_must_be_empty stdout &&
 	test_i18ngrep "Enumerating objects" stderr &&
 	test_i18ngrep "Computing commit graph generation numbers" stderr
@@ -178,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.
@@ -195,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/t6501-freshen-objects.sh b/t/t6501-freshen-objects.sh
index f30b4849b6..10662456ae 100755
--- a/t/t6501-freshen-objects.sh
+++ b/t/t6501-freshen-objects.sh
@@ -25,6 +25,9 @@
 #      to refer to an existing tree).
 
 test_description='check pruning of dependent objects'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # We care about reachability, so we do not want to use
@@ -40,15 +43,25 @@ commit () {
 }
 
 maybe_repack () {
-	if test -n "$repack"; then
+	case "$title" in
+	loose)
+		: skip repack
+		;;
+	repack)
 		git repack -ad
-	fi
+		;;
+	bitmap)
+		git repack -adb
+		;;
+	*)
+		echo >&2 "unknown test type in maybe_repack"
+		return 1
+		;;
+	esac
 }
 
-for repack in '' true; do
-	title=${repack:+repack}
-	title=${title:-loose}
-
+for title in loose repack bitmap
+do
 	test_expect_success "make repo completely empty ($title)" '
 		rm -rf .git &&
 		git init
@@ -67,7 +80,7 @@ for repack in '' true; do
 		git checkout -b experiment &&
 		commit abandon &&
 		maybe_repack &&
-		git checkout master &&
+		git checkout main &&
 		git branch -D experiment
 	'
 
@@ -128,9 +141,9 @@ for repack in '' true; do
 done
 
 test_expect_success 'do not complain about existing broken links (commit)' '
-	cat >broken-commit <<-\EOF &&
-	tree 0000000000000000000000000000000000000001
-	parent 0000000000000000000000000000000000000002
+	cat >broken-commit <<-EOF &&
+	tree $(test_oid 001)
+	parent $(test_oid 002)
 	author whatever <whatever@example.com> 1234 -0000
 	committer whatever <whatever@example.com> 1234 -0000
 
@@ -143,8 +156,8 @@ test_expect_success 'do not complain about existing broken links (commit)' '
 '
 
 test_expect_success 'do not complain about existing broken links (tree)' '
-	cat >broken-tree <<-\EOF &&
-	100644 blob 0000000000000000000000000000000000000003	foo
+	cat >broken-tree <<-EOF &&
+	100644 blob $(test_oid 003)	foo
 	EOF
 	tree=$(git mktree --missing <broken-tree) &&
 	git gc -q 2>stderr &&
@@ -153,8 +166,8 @@ test_expect_success 'do not complain about existing broken links (tree)' '
 '
 
 test_expect_success 'do not complain about existing broken links (tag)' '
-	cat >broken-tag <<-\EOF &&
-	object 0000000000000000000000000000000000000004
+	cat >broken-tag <<-EOF &&
+	object $(test_oid 004)
 	type commit
 	tag broken
 	tagger whatever <whatever@example.com> 1234 -0000
diff --git a/t/t6600-test-reach.sh b/t/t6600-test-reach.sh
index b24d850036..3d7a62ddab 100755
--- a/t/t6600-test-reach.sh
+++ b/t/t6600-test-reach.sh
@@ -51,12 +51,17 @@ test_expect_success 'setup' '
 	done &&
 	git commit-graph write --reachable &&
 	mv .git/objects/info/commit-graph commit-graph-full &&
+	chmod u+w commit-graph-full &&
 	git show-ref -s commit-5-5 | git commit-graph write --stdin-commits &&
 	mv .git/objects/info/commit-graph commit-graph-half &&
+	chmod u+w commit-graph-half &&
+	git -c commitGraph.generationVersion=1 commit-graph write --reachable &&
+	mv .git/objects/info/commit-graph commit-graph-no-gdat &&
+	chmod u+w commit-graph-no-gdat &&
 	git config core.commitGraph true
 '
 
-run_three_modes () {
+run_all_modes () {
 	test_when_finished rm -rf .git/objects/info/commit-graph &&
 	"$@" <input >actual &&
 	test_cmp expect actual &&
@@ -65,11 +70,14 @@ run_three_modes () {
 	test_cmp expect actual &&
 	cp commit-graph-half .git/objects/info/commit-graph &&
 	"$@" <input >actual &&
+	test_cmp expect actual &&
+	cp commit-graph-no-gdat .git/objects/info/commit-graph &&
+	"$@" <input >actual &&
 	test_cmp expect actual
 }
 
-test_three_modes () {
-	run_three_modes test-tool reach "$@"
+test_all_modes () {
+	run_all_modes test-tool reach "$@"
 }
 
 test_expect_success 'ref_newer:miss' '
@@ -78,7 +86,7 @@ test_expect_success 'ref_newer:miss' '
 	B:commit-4-9
 	EOF
 	echo "ref_newer(A,B):0" >expect &&
-	test_three_modes ref_newer
+	test_all_modes ref_newer
 '
 
 test_expect_success 'ref_newer:hit' '
@@ -87,7 +95,7 @@ test_expect_success 'ref_newer:hit' '
 	B:commit-2-3
 	EOF
 	echo "ref_newer(A,B):1" >expect &&
-	test_three_modes ref_newer
+	test_all_modes ref_newer
 '
 
 test_expect_success 'in_merge_bases:hit' '
@@ -96,7 +104,7 @@ test_expect_success 'in_merge_bases:hit' '
 	B:commit-8-8
 	EOF
 	echo "in_merge_bases(A,B):1" >expect &&
-	test_three_modes in_merge_bases
+	test_all_modes in_merge_bases
 '
 
 test_expect_success 'in_merge_bases:miss' '
@@ -105,7 +113,37 @@ test_expect_success 'in_merge_bases:miss' '
 	B:commit-5-9
 	EOF
 	echo "in_merge_bases(A,B):0" >expect &&
-	test_three_modes in_merge_bases
+	test_all_modes in_merge_bases
+'
+
+test_expect_success 'in_merge_bases_many:hit' '
+	cat >input <<-\EOF &&
+	A:commit-6-8
+	X:commit-6-9
+	X:commit-5-7
+	EOF
+	echo "in_merge_bases_many(A,X):1" >expect &&
+	test_all_modes in_merge_bases_many
+'
+
+test_expect_success 'in_merge_bases_many:miss' '
+	cat >input <<-\EOF &&
+	A:commit-6-8
+	X:commit-7-7
+	X:commit-8-6
+	EOF
+	echo "in_merge_bases_many(A,X):0" >expect &&
+	test_all_modes in_merge_bases_many
+'
+
+test_expect_success 'in_merge_bases_many:miss-heuristic' '
+	cat >input <<-\EOF &&
+	A:commit-6-8
+	X:commit-7-5
+	X:commit-6-6
+	EOF
+	echo "in_merge_bases_many(A,X):0" >expect &&
+	test_all_modes in_merge_bases_many
 '
 
 test_expect_success 'is_descendant_of:hit' '
@@ -116,7 +154,7 @@ test_expect_success 'is_descendant_of:hit' '
 	X:commit-1-1
 	EOF
 	echo "is_descendant_of(A,X):1" >expect &&
-	test_three_modes is_descendant_of
+	test_all_modes is_descendant_of
 '
 
 test_expect_success 'is_descendant_of:miss' '
@@ -127,7 +165,7 @@ test_expect_success 'is_descendant_of:miss' '
 	X:commit-7-6
 	EOF
 	echo "is_descendant_of(A,X):0" >expect &&
-	test_three_modes is_descendant_of
+	test_all_modes is_descendant_of
 '
 
 test_expect_success 'get_merge_bases_many' '
@@ -142,7 +180,7 @@ test_expect_success 'get_merge_bases_many' '
 		git rev-parse commit-5-6 \
 			      commit-4-7 | sort
 	} >expect &&
-	test_three_modes get_merge_bases_many
+	test_all_modes get_merge_bases_many
 '
 
 test_expect_success 'reduce_heads' '
@@ -164,7 +202,7 @@ test_expect_success 'reduce_heads' '
 			      commit-2-8 \
 			      commit-1-10 | sort
 	} >expect &&
-	test_three_modes reduce_heads
+	test_all_modes reduce_heads
 '
 
 test_expect_success 'can_all_from_reach:hit' '
@@ -187,7 +225,7 @@ test_expect_success 'can_all_from_reach:hit' '
 	Y:commit-8-1
 	EOF
 	echo "can_all_from_reach(X,Y):1" >expect &&
-	test_three_modes can_all_from_reach
+	test_all_modes can_all_from_reach
 '
 
 test_expect_success 'can_all_from_reach:miss' '
@@ -209,7 +247,7 @@ test_expect_success 'can_all_from_reach:miss' '
 	Y:commit-8-5
 	EOF
 	echo "can_all_from_reach(X,Y):0" >expect &&
-	test_three_modes can_all_from_reach
+	test_all_modes can_all_from_reach
 '
 
 test_expect_success 'can_all_from_reach_with_flag: tags case' '
@@ -232,7 +270,7 @@ test_expect_success 'can_all_from_reach_with_flag: tags case' '
 	Y:commit-8-1
 	EOF
 	echo "can_all_from_reach_with_flag(X,_,_,0,0):1" >expect &&
-	test_three_modes can_all_from_reach_with_flag
+	test_all_modes can_all_from_reach_with_flag
 '
 
 test_expect_success 'commit_contains:hit' '
@@ -248,8 +286,8 @@ test_expect_success 'commit_contains:hit' '
 	X:commit-9-3
 	EOF
 	echo "commit_contains(_,A,X,_):1" >expect &&
-	test_three_modes commit_contains &&
-	test_three_modes commit_contains --tag
+	test_all_modes commit_contains &&
+	test_all_modes commit_contains --tag
 '
 
 test_expect_success 'commit_contains:miss' '
@@ -265,8 +303,8 @@ test_expect_success 'commit_contains:miss' '
 	X:commit-9-3
 	EOF
 	echo "commit_contains(_,A,X,_):0" >expect &&
-	test_three_modes commit_contains &&
-	test_three_modes commit_contains --tag
+	test_all_modes commit_contains &&
+	test_all_modes commit_contains --tag
 '
 
 test_expect_success 'rev-list: basic topo-order' '
@@ -278,7 +316,7 @@ test_expect_success 'rev-list: basic topo-order' '
 		commit-6-2 commit-5-2 commit-4-2 commit-3-2 commit-2-2 commit-1-2 \
 		commit-6-1 commit-5-1 commit-4-1 commit-3-1 commit-2-1 commit-1-1 \
 	>expect &&
-	run_three_modes git rev-list --topo-order commit-6-6
+	run_all_modes git rev-list --topo-order commit-6-6
 '
 
 test_expect_success 'rev-list: first-parent topo-order' '
@@ -290,7 +328,7 @@ test_expect_success 'rev-list: first-parent topo-order' '
 		commit-6-2 \
 		commit-6-1 commit-5-1 commit-4-1 commit-3-1 commit-2-1 commit-1-1 \
 	>expect &&
-	run_three_modes git rev-list --first-parent --topo-order commit-6-6
+	run_all_modes git rev-list --first-parent --topo-order commit-6-6
 '
 
 test_expect_success 'rev-list: range topo-order' '
@@ -302,7 +340,7 @@ test_expect_success 'rev-list: range topo-order' '
 		commit-6-2 commit-5-2 commit-4-2 \
 		commit-6-1 commit-5-1 commit-4-1 \
 	>expect &&
-	run_three_modes git rev-list --topo-order commit-3-3..commit-6-6
+	run_all_modes git rev-list --topo-order commit-3-3..commit-6-6
 '
 
 test_expect_success 'rev-list: range topo-order' '
@@ -314,7 +352,7 @@ test_expect_success 'rev-list: range topo-order' '
 		commit-6-2 commit-5-2 commit-4-2 \
 		commit-6-1 commit-5-1 commit-4-1 \
 	>expect &&
-	run_three_modes git rev-list --topo-order commit-3-8..commit-6-6
+	run_all_modes git rev-list --topo-order commit-3-8..commit-6-6
 '
 
 test_expect_success 'rev-list: first-parent range topo-order' '
@@ -326,7 +364,7 @@ test_expect_success 'rev-list: first-parent range topo-order' '
 		commit-6-2 \
 		commit-6-1 commit-5-1 commit-4-1 \
 	>expect &&
-	run_three_modes git rev-list --first-parent --topo-order commit-3-8..commit-6-6
+	run_all_modes git rev-list --first-parent --topo-order commit-3-8..commit-6-6
 '
 
 test_expect_success 'rev-list: ancestry-path topo-order' '
@@ -336,7 +374,7 @@ test_expect_success 'rev-list: ancestry-path topo-order' '
 		commit-6-4 commit-5-4 commit-4-4 commit-3-4 \
 		commit-6-3 commit-5-3 commit-4-3 \
 	>expect &&
-	run_three_modes git rev-list --topo-order --ancestry-path commit-3-3..commit-6-6
+	run_all_modes git rev-list --topo-order --ancestry-path commit-3-3..commit-6-6
 '
 
 test_expect_success 'rev-list: symmetric difference topo-order' '
@@ -350,7 +388,7 @@ test_expect_success 'rev-list: symmetric difference topo-order' '
 		commit-3-8 commit-2-8 commit-1-8 \
 		commit-3-7 commit-2-7 commit-1-7 \
 	>expect &&
-	run_three_modes git rev-list --topo-order commit-3-8...commit-6-6
+	run_all_modes git rev-list --topo-order commit-3-8...commit-6-6
 '
 
 test_expect_success 'get_reachable_subset:all' '
@@ -370,7 +408,7 @@ test_expect_success 'get_reachable_subset:all' '
 			      commit-1-7 \
 			      commit-5-6 | sort
 	) >expect &&
-	test_three_modes get_reachable_subset
+	test_all_modes get_reachable_subset
 '
 
 test_expect_success 'get_reachable_subset:some' '
@@ -388,7 +426,7 @@ test_expect_success 'get_reachable_subset:some' '
 		git rev-parse commit-3-3 \
 			      commit-1-7 | sort
 	) >expect &&
-	test_three_modes get_reachable_subset
+	test_all_modes get_reachable_subset
 '
 
 test_expect_success 'get_reachable_subset:none' '
@@ -402,7 +440,7 @@ test_expect_success 'get_reachable_subset:none' '
 	Y:commit-2-8
 	EOF
 	echo "get_reachable_subset(X,Y)" >expect &&
-	test_three_modes get_reachable_subset
+	test_all_modes get_reachable_subset
 '
 
 test_done
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 36b50d0b4c..25bb9bbb89 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -3,74 +3,74 @@
 test_description='git mv in subdirs'
 . ./test-lib.sh
 
-test_expect_success \
-    'prepare reference tree' \
-    'mkdir path0 path1 &&
-     cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
-     git add path0/COPYING &&
-     git commit -m add -a'
+test_expect_success 'prepare reference tree' '
+	mkdir path0 path1 &&
+	cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
+	git add path0/COPYING &&
+	git commit -m add -a
+'
 
-test_expect_success \
-    'moving the file out of subdirectory' \
-    'cd path0 && git mv COPYING ../path1/COPYING'
+test_expect_success 'moving the file out of subdirectory' '
+	git -C path0 mv COPYING ../path1/COPYING
+'
 
 # in path0 currently
-test_expect_success \
-    'commiting the change' \
-    'cd .. && git commit -m move-out -a'
+test_expect_success 'commiting the change' '
+	git commit -m move-out -a
+'
 
-test_expect_success \
-    'checking the commit' \
-    'git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-    grep "^R100..*path0/COPYING..*path1/COPYING" actual'
+test_expect_success 'checking the commit' '
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path0/COPYING..*path1/COPYING" actual
+'
 
-test_expect_success \
-    'moving the file back into subdirectory' \
-    'cd path0 && git mv ../path1/COPYING COPYING'
+test_expect_success 'moving the file back into subdirectory' '
+	git -C path0 mv ../path1/COPYING COPYING
+'
 
 # in path0 currently
-test_expect_success \
-    'commiting the change' \
-    'cd .. && git commit -m move-in -a'
-
-test_expect_success \
-    'checking the commit' \
-    'git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-    grep "^R100..*path1/COPYING..*path0/COPYING" actual'
-
-test_expect_success \
-    'mv --dry-run does not move file' \
-    'git mv -n path0/COPYING MOVED &&
-     test -f path0/COPYING &&
-     test ! -f MOVED'
-
-test_expect_success \
-    'checking -k on non-existing file' \
-    'git mv -k idontexist path0'
-
-test_expect_success \
-    'checking -k on untracked file' \
-    'touch untracked1 &&
-     git mv -k untracked1 path0 &&
-     test -f untracked1 &&
-     test ! -f path0/untracked1'
-
-test_expect_success \
-    'checking -k on multiple untracked files' \
-    'touch untracked2 &&
-     git mv -k untracked1 untracked2 path0 &&
-     test -f untracked1 &&
-     test -f untracked2 &&
-     test ! -f path0/untracked1 &&
-     test ! -f path0/untracked2'
-
-test_expect_success \
-    'checking -f on untracked file with existing target' \
-    'touch path0/untracked1 &&
-     test_must_fail git mv -f untracked1 path0 &&
-     test ! -f .git/index.lock &&
-     test -f untracked1 &&
-     test -f path0/untracked1'
+test_expect_success 'commiting the change' '
+	git commit -m move-in -a
+'
+
+test_expect_success 'checking the commit' '
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path1/COPYING..*path0/COPYING" actual
+'
+
+test_expect_success 'mv --dry-run does not move file' '
+	git mv -n path0/COPYING MOVED &&
+	test -f path0/COPYING &&
+	test ! -f MOVED
+'
+
+test_expect_success 'checking -k on non-existing file' '
+	git mv -k idontexist path0
+'
+
+test_expect_success 'checking -k on untracked file' '
+	>untracked1 &&
+	git mv -k untracked1 path0 &&
+	test -f untracked1 &&
+	test ! -f path0/untracked1
+'
+
+test_expect_success 'checking -k on multiple untracked files' '
+	>untracked2 &&
+	git mv -k untracked1 untracked2 path0 &&
+	test -f untracked1 &&
+	test -f untracked2 &&
+	test ! -f path0/untracked1 &&
+	test ! -f path0/untracked2
+'
+
+test_expect_success 'checking -f on untracked file with existing target' '
+	>path0/untracked1 &&
+	test_must_fail git mv -f untracked1 path0 &&
+	test ! -f .git/index.lock &&
+	test -f untracked1 &&
+	test -f path0/untracked1
+'
 
 # clean up the mess in case bad things happen
 rm -f idontexist untracked1 untracked2 \
@@ -78,87 +78,89 @@ rm -f idontexist untracked1 untracked2 \
      .git/index.lock
 rmdir path1
 
-test_expect_success \
-    'moving to absent target with trailing slash' \
-    'test_must_fail git mv path0/COPYING no-such-dir/ &&
-     test_must_fail git mv path0/COPYING no-such-dir// &&
-     git mv path0/ no-such-dir/ &&
-     test_path_is_dir no-such-dir'
-
-test_expect_success \
-    'clean up' \
-    'git reset --hard'
-
-test_expect_success \
-    'moving to existing untracked target with trailing slash' \
-    'mkdir path1 &&
-     git mv path0/ path1/ &&
-     test_path_is_dir path1/path0/'
-
-test_expect_success \
-    'moving to existing tracked target with trailing slash' \
-    'mkdir path2 &&
-     >path2/file && git add path2/file &&
-     git mv path1/path0/ path2/ &&
-     test_path_is_dir path2/path0/'
-
-test_expect_success \
-    'clean up' \
-    'git reset --hard'
-
-test_expect_success \
-    'adding another file' \
-    'cp "$TEST_DIRECTORY"/../README.md path0/README &&
-     git add path0/README &&
-     git commit -m add2 -a'
-
-test_expect_success \
-    'moving whole subdirectory' \
-    'git mv path0 path2'
-
-test_expect_success \
-    'commiting the change' \
-    'git commit -m dir-move -a'
-
-test_expect_success \
-    'checking the commit' \
-    'git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-     grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
-     grep "^R100..*path0/README..*path2/README" actual'
-
-test_expect_success \
-    'succeed when source is a prefix of destination' \
-    'git mv path2/COPYING path2/COPYING-renamed'
-
-test_expect_success \
-    'moving whole subdirectory into subdirectory' \
-    'git mv path2 path1'
-
-test_expect_success \
-    'commiting the change' \
-    'git commit -m dir-move -a'
-
-test_expect_success \
-    'checking the commit' \
-    'git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
-     grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
-     grep "^R100..*path2/README..*path1/path2/README" actual'
-
-test_expect_success \
-    'do not move directory over existing directory' \
-    'mkdir path0 && mkdir path0/path2 && test_must_fail git mv path2 path0'
-
-test_expect_success \
-    'move into "."' \
-    'git mv path1/path2/ .'
+test_expect_success 'moving to absent target with trailing slash' '
+	test_must_fail git mv path0/COPYING no-such-dir/ &&
+	test_must_fail git mv path0/COPYING no-such-dir// &&
+	git mv path0/ no-such-dir/ &&
+	test_path_is_dir no-such-dir
+'
+
+test_expect_success 'clean up' '
+	git reset --hard
+'
+
+test_expect_success 'moving to existing untracked target with trailing slash' '
+	mkdir path1 &&
+	git mv path0/ path1/ &&
+	test_path_is_dir path1/path0/
+'
+
+test_expect_success 'moving to existing tracked target with trailing slash' '
+	mkdir path2 &&
+	>path2/file && git add path2/file &&
+	git mv path1/path0/ path2/ &&
+	test_path_is_dir path2/path0/
+'
+
+test_expect_success 'clean up' '
+	git reset --hard
+'
+
+test_expect_success 'adding another file' '
+	cp "$TEST_DIRECTORY"/../README.md path0/README &&
+	git add path0/README &&
+	git commit -m add2 -a
+'
+
+test_expect_success 'moving whole subdirectory' '
+	git mv path0 path2
+'
+
+test_expect_success 'commiting the change' '
+	git commit -m dir-move -a
+'
+
+test_expect_success 'checking the commit' '
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path0/COPYING..*path2/COPYING" actual &&
+	grep "^R100..*path0/README..*path2/README" actual
+'
+
+test_expect_success 'succeed when source is a prefix of destination' '
+	git mv path2/COPYING path2/COPYING-renamed
+'
+
+test_expect_success 'moving whole subdirectory into subdirectory' '
+	git mv path2 path1
+'
+
+test_expect_success 'commiting the change' '
+	git commit -m dir-move -a
+'
+
+test_expect_success 'checking the commit' '
+	git diff-tree -r -M --name-status  HEAD^ HEAD >actual &&
+	grep "^R100..*path2/COPYING..*path1/path2/COPYING" actual &&
+	grep "^R100..*path2/README..*path1/path2/README" actual
+'
+
+test_expect_success 'do not move directory over existing directory' '
+	mkdir path0 &&
+	mkdir path0/path2 &&
+	test_must_fail git mv path2 path0
+'
+
+test_expect_success 'move into "."' '
+	git mv path1/path2/ .
+'
 
 test_expect_success "Michael Cassar's test case" '
 	rm -fr .git papers partA &&
 	git init &&
 	mkdir -p papers/unsorted papers/all-papers partA &&
-	echo a > papers/unsorted/Thesis.pdf &&
-	echo b > partA/outline.txt &&
-	echo c > papers/unsorted/_another &&
+	echo a >papers/unsorted/Thesis.pdf &&
+	echo b >partA/outline.txt &&
+	echo c >papers/unsorted/_another &&
 	git add papers partA &&
 	T1=$(git write-tree) &&
 
@@ -177,47 +179,46 @@ test_expect_success "Sergey Vlasov's test case" '
 	date >ab.c &&
 	date >ab/d &&
 	git add ab.c ab &&
-	git commit -m 'initial' &&
+	git commit -m "initial" &&
 	git mv ab a
 '
 
-test_expect_success 'absolute pathname' '(
-
-	rm -fr mine &&
-	mkdir mine &&
-	cd mine &&
-	test_create_repo one &&
-	cd one &&
-	mkdir sub &&
-	>sub/file &&
-	git add sub/file &&
-
-	git mv sub "$(pwd)/in" &&
-	! test -d sub &&
-	test -d in &&
-	git ls-files --error-unmatch in/file
-
-
-)'
-
-test_expect_success 'absolute pathname outside should fail' '(
-
-	rm -fr mine &&
-	mkdir mine &&
-	cd mine &&
-	out=$(pwd) &&
-	test_create_repo one &&
-	cd one &&
-	mkdir sub &&
-	>sub/file &&
-	git add sub/file &&
-
-	test_must_fail git mv sub "$out/out" &&
-	test -d sub &&
-	! test -d ../in &&
-	git ls-files --error-unmatch sub/file
+test_expect_success 'absolute pathname' '
+	(
+		rm -fr mine &&
+		mkdir mine &&
+		cd mine &&
+		test_create_repo one &&
+		cd one &&
+		mkdir sub &&
+		>sub/file &&
+		git add sub/file &&
+
+		git mv sub "$(pwd)/in" &&
+		! test -d sub &&
+		test -d in &&
+		git ls-files --error-unmatch in/file
+	)
+'
 
-)'
+test_expect_success 'absolute pathname outside should fail' '
+	(
+		rm -fr mine &&
+		mkdir mine &&
+		cd mine &&
+		out=$(pwd) &&
+		test_create_repo one &&
+		cd one &&
+		mkdir sub &&
+		>sub/file &&
+		git add sub/file &&
+
+		test_must_fail git mv sub "$out/out" &&
+		test -d sub &&
+		! test -d ../in &&
+		git ls-files --error-unmatch sub/file
+	)
+'
 
 test_expect_success 'git mv to move multiple sources into a directory' '
 	rm -fr .git && git init &&
@@ -227,29 +228,46 @@ test_expect_success 'git mv to move multiple sources into a directory' '
 	git add dir/?.txt &&
 	git mv dir/a.txt dir/b.txt other &&
 	git ls-files >actual &&
-	{ echo other/a.txt; echo other/b.txt; } >expect &&
+	cat >expect <<-\EOF &&
+	other/a.txt
+	other/b.txt
+	EOF
 	test_cmp expect actual
 '
 
 test_expect_success 'git mv should not change sha1 of moved cache entry' '
-
 	rm -fr .git &&
 	git init &&
 	echo 1 >dirty &&
 	git add dirty &&
 	entry="$(git ls-files --stage dirty | cut -f 1)" &&
 	git mv dirty dirty2 &&
-	[ "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" ] &&
+	test "$entry" = "$(git ls-files --stage dirty2 | cut -f 1)" &&
 	echo 2 >dirty2 &&
 	git mv dirty2 dirty &&
-	[ "$entry" = "$(git ls-files --stage dirty | cut -f 1)" ]
-
+	test "$entry" = "$(git ls-files --stage dirty | cut -f 1)"
 '
 
 rm -f dirty dirty2
 
-test_expect_success 'git mv should overwrite symlink to a file' '
+# NB: This test is about the error message
+# as well as the failure.
+test_expect_success 'git mv error on conflicted file' '
+	rm -fr .git &&
+	git init &&
+	>conflict &&
+	test_when_finished "rm -f conflict" &&
+	cfhash=$(git hash-object -w conflict) &&
+	q_to_tab <<-EOF | git update-index --index-info &&
+	0 $cfhash 0Qconflict
+	100644 $cfhash 1Qconflict
+	EOF
+
+	test_must_fail git mv conflict newname 2>actual &&
+	test_i18ngrep "conflicted" actual
+'
 
+test_expect_success 'git mv should overwrite symlink to a file' '
 	rm -fr .git &&
 	git init &&
 	echo 1 >moved &&
@@ -262,13 +280,11 @@ test_expect_success 'git mv should overwrite symlink to a file' '
 	test "$(cat symlink)" = 1 &&
 	git update-index --refresh &&
 	git diff-files --quiet
-
 '
 
 rm -f moved symlink
 
 test_expect_success 'git mv should overwrite file with a symlink' '
-
 	rm -fr .git &&
 	git init &&
 	echo 1 >moved &&
@@ -279,11 +295,9 @@ test_expect_success 'git mv should overwrite file with a symlink' '
 	! test -e symlink &&
 	git update-index --refresh &&
 	git diff-files --quiet
-
 '
 
 test_expect_success SYMLINKS 'check moved symlink' '
-
 	test -h moved
 '
 
@@ -318,11 +332,8 @@ test_expect_success 'git mv moves a submodule with a .git directory and no .gitm
 	mkdir mod &&
 	git mv sub mod/sub &&
 	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
+	test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+	git -C mod/sub status &&
 	git update-index --refresh &&
 	git diff-files --quiet
 '
@@ -341,11 +352,8 @@ test_expect_success 'git mv moves a submodule with a .git directory and .gitmodu
 	mkdir mod &&
 	git mv sub mod/sub &&
 	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
+	test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+	git -C mod/sub status &&
 	echo mod/sub >expected &&
 	git config -f .gitmodules submodule.sub.path >actual &&
 	test_cmp expected actual &&
@@ -359,16 +367,10 @@ test_expect_success 'git mv moves a submodule with gitfile' '
 	git submodule update &&
 	entry="$(git ls-files --stage sub | cut -f 1)" &&
 	mkdir mod &&
-	(
-		cd mod &&
-		git mv ../sub/ .
-	) &&
+	git -C mod mv ../sub/ . &&
 	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
+	test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+	git -C mod/sub status &&
 	echo mod/sub >expected &&
 	git config -f .gitmodules submodule.sub.path >actual &&
 	test_cmp expected actual &&
@@ -386,11 +388,8 @@ test_expect_success 'mv does not complain when no .gitmodules file is found' '
 	git mv sub mod/sub 2>actual.err &&
 	test_must_be_empty actual.err &&
 	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
+	test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+	git -C mod/sub status &&
 	git update-index --refresh &&
 	git diff-files --quiet
 '
@@ -410,11 +409,8 @@ test_expect_success 'mv will error out on a modified .gitmodules file unless sta
 	git mv sub mod/sub 2>actual.err &&
 	test_must_be_empty actual.err &&
 	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
+	test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+	git -C mod/sub status &&
 	git update-index --refresh &&
 	git diff-files --quiet
 '
@@ -429,13 +425,10 @@ test_expect_success 'mv issues a warning when section is not found in .gitmodule
 	echo "warning: Could not find section in .gitmodules where path=sub" >expect.err &&
 	mkdir mod &&
 	git mv sub mod/sub 2>actual.err &&
-	test_i18ncmp expect.err actual.err &&
+	test_cmp expect.err actual.err &&
 	! test -e sub &&
-	[ "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" ] &&
-	(
-		cd mod/sub &&
-		git status
-	) &&
+	test "$entry" = "$(git ls-files --stage mod/sub | cut -f 1)" &&
+	git -C mod/sub status &&
 	git update-index --refresh &&
 	git diff-files --quiet
 '
@@ -498,15 +491,17 @@ test_expect_success 'moving a submodule in nested directories' '
 test_expect_success 'moving nested submodules' '
 	git commit -am "cleanup commit" &&
 	mkdir sub_nested_nested &&
-	(cd sub_nested_nested &&
-		touch nested_level2 &&
+	(
+		cd sub_nested_nested &&
+		>nested_level2 &&
 		git init &&
 		git add . &&
 		git commit -m "nested level 2"
 	) &&
 	mkdir sub_nested &&
-	(cd sub_nested &&
-		touch nested_level1 &&
+	(
+		cd sub_nested &&
+		>nested_level1 &&
 		git init &&
 		git add . &&
 		git commit -m "nested level 1" &&
diff --git a/t/t7003-filter-branch.sh b/t/t7003-filter-branch.sh
index e23de7d0b5..e18a218952 100755
--- a/t/t7003-filter-branch.sh
+++ b/t/t7003-filter-branch.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git filter-branch'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 
@@ -13,7 +16,7 @@ test_expect_success 'setup' '
 	mkdir dir &&
 	test_commit dir/D &&
 	test_commit E &&
-	git checkout master &&
+	git checkout main &&
 	test_commit C &&
 	git checkout branch &&
 	git merge C &&
@@ -25,7 +28,7 @@ test_expect_success 'setup' '
 # * G
 # *   Merge commit 'C' into branch
 # |\
-# | * (master) C
+# | * (main) C
 # * | E
 # * | dir/D
 # * | D
@@ -162,15 +165,15 @@ test_expect_success 'subdirectory filter result looks okay' '
 '
 
 test_expect_success 'more setup' '
-	git checkout master &&
+	git checkout main &&
 	mkdir subdir &&
 	echo A > subdir/new &&
 	git add subdir/new &&
 	test_tick &&
-	git commit -m "subdir on master" subdir/new &&
+	git commit -m "subdir on main" subdir/new &&
 	git rm A.t &&
 	test_tick &&
-	git commit -m "again subdir on master" &&
+	git commit -m "again subdir on main" &&
 	git merge branch
 '
 
@@ -199,7 +202,7 @@ test_expect_success 'author information is preserved' '
 	git branch preserved-author &&
 	(sane_unset GIT_AUTHOR_NAME &&
 	 git filter-branch -f --msg-filter "cat; \
-			test \$GIT_COMMIT != $(git rev-parse master) || \
+			test \$GIT_COMMIT != $(git rev-parse main) || \
 			echo Hallo" \
 		preserved-author) &&
 	git rev-list --author="B V Uips" preserved-author >actual &&
@@ -218,7 +221,7 @@ test_expect_success "remove a certain author's commits" '
 		else\
 			git commit-tree \"\$@\";\
 		fi" removed-author &&
-	cnt1=$(git rev-list master | wc -l) &&
+	cnt1=$(git rev-list main | wc -l) &&
 	cnt2=$(git rev-list removed-author | wc -l) &&
 	test $cnt1 -eq $(($cnt2 + 1)) &&
 	git rev-list --author="B V Uips" removed-author >actual &&
@@ -226,7 +229,7 @@ test_expect_success "remove a certain author's commits" '
 '
 
 test_expect_success 'barf on invalid name' '
-	test_must_fail git filter-branch -f master xy-problem &&
+	test_must_fail git filter-branch -f main xy-problem &&
 	test_must_fail git filter-branch -f HEAD^
 '
 
@@ -236,8 +239,8 @@ test_expect_success '"map" works in commit filter' '
 		mapped=\$(map \$parent) &&
 		actual=\$(echo \"\$@\" | sed \"s/^.*-p //\") &&
 		test \$mapped = \$actual &&
-		git commit-tree \"\$@\";" master~2..master &&
-	git rev-parse --verify master
+		git commit-tree \"\$@\";" main~2..main &&
+	git rev-parse --verify main
 '
 
 test_expect_success 'Name needing quotes' '
@@ -256,7 +259,7 @@ test_expect_success 'Name needing quotes' '
 
 test_expect_success 'Subdirectory filter with disappearing trees' '
 	git reset --hard &&
-	git checkout master &&
+	git checkout main &&
 
 	mkdir foo &&
 	touch foo/bar &&
@@ -275,7 +278,7 @@ test_expect_success 'Subdirectory filter with disappearing trees' '
 	git commit -m "Re-adding foo" &&
 
 	git filter-branch -f --subdirectory-filter foo &&
-	git rev-list master >actual &&
+	git rev-list main >actual &&
 	test_line_count = 3 actual
 '
 
@@ -332,7 +335,7 @@ test_expect_success 'Tag name filtering allows slashes in tag names' '
 	test_cmp expect actual
 '
 test_expect_success 'setup --prune-empty comparisons' '
-	git checkout --orphan master-no-a &&
+	git checkout --orphan main-no-a &&
 	git rm -rf . &&
 	unset test_tick &&
 	test_tick &&
@@ -343,7 +346,7 @@ test_expect_success 'setup --prune-empty comparisons' '
 	mkdir dir &&
 	test_commit dir/D dir/D.t dir/D dir/Dx &&
 	test_commit E E.t E Ex &&
-	git checkout master-no-a &&
+	git checkout main-no-a &&
 	test_commit C C.t C Cx &&
 	git checkout branch-no-a &&
 	git merge Cx -m "Merge tag '\''C'\'' into branch" &&
@@ -392,12 +395,15 @@ test_expect_success '--prune-empty is able to prune root commit' '
 test_expect_success '--prune-empty is able to prune entire branch' '
 	git branch prune-entire B &&
 	git filter-branch -f --prune-empty --index-filter "git update-index --remove A.t B.t" prune-entire &&
-	test_path_is_missing .git/refs/heads/prune-entire &&
-	test_must_fail git reflog exists refs/heads/prune-entire
+	test_must_fail git rev-parse refs/heads/prune-entire &&
+	if test_have_prereq REFFILES
+	then
+		test_must_fail git reflog exists refs/heads/prune-entire
+	fi
 '
 
 test_expect_success '--remap-to-ancestor with filename filters' '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard A &&
 	test_commit add-foo foo 1 &&
 	git branch moved-foo &&
@@ -407,15 +413,15 @@ test_expect_success '--remap-to-ancestor with filename filters' '
 	git branch moved-bar &&
 	test_commit change-foo foo 2 &&
 	git filter-branch -f --remap-to-ancestor \
-		moved-foo moved-bar A..master \
+		moved-foo moved-bar A..main \
 		-- -- foo &&
 	test $(git rev-parse moved-foo) = $(git rev-parse moved-bar) &&
-	test $(git rev-parse moved-foo) = $(git rev-parse master^) &&
+	test $(git rev-parse moved-foo) = $(git rev-parse main^) &&
 	test $orig_invariant = $(git rev-parse invariant)
 '
 
 test_expect_success 'automatic remapping to ancestor with filename filters' '
-	git checkout master &&
+	git checkout main &&
 	git reset --hard A &&
 	test_commit add-foo2 foo 1 &&
 	git branch moved-foo2 &&
@@ -425,10 +431,10 @@ test_expect_success 'automatic remapping to ancestor with filename filters' '
 	git branch moved-bar2 &&
 	test_commit change-foo2 foo 2 &&
 	git filter-branch -f \
-		moved-foo2 moved-bar2 A..master \
+		moved-foo2 moved-bar2 A..main \
 		-- -- foo &&
 	test $(git rev-parse moved-foo2) = $(git rev-parse moved-bar2) &&
-	test $(git rev-parse moved-foo2) = $(git rev-parse master^) &&
+	test $(git rev-parse moved-foo2) = $(git rev-parse main^) &&
 	test $orig_invariant = $(git rev-parse invariant2)
 '
 
@@ -463,10 +469,11 @@ test_expect_success 'rewrite submodule with another content' '
 '
 
 test_expect_success 'replace submodule revision' '
+	invalid=$(test_oid numeric) &&
 	git reset --hard original &&
 	git filter-branch -f --tree-filter \
 	    "if git ls-files --error-unmatch -- submod > /dev/null 2>&1
-	     then git update-index --cacheinfo 160000 0123456789012345678901234567890123456789 submod
+	     then git update-index --cacheinfo 160000 $invalid submod
 	     fi" HEAD &&
 	test $orig_head != $(git show-ref --hash --head HEAD)
 '
@@ -502,4 +509,35 @@ test_expect_success 'rewrite repository including refs that point at non-commit
 	! fgrep fatal filter-output
 '
 
+test_expect_success 'filter-branch handles ref deletion' '
+	git switch --orphan empty-commit &&
+	git commit --allow-empty -m "empty commit" &&
+	git tag empty &&
+	git branch to-delete &&
+	git filter-branch -f --prune-empty to-delete >out 2>&1 &&
+	grep "to-delete.*was deleted" out &&
+	test_must_fail git rev-parse --verify to-delete
+'
+
+test_expect_success 'filter-branch handles ref rewrite' '
+	git checkout empty &&
+	test_commit to-drop &&
+	git branch rewrite &&
+	git filter-branch -f \
+		--index-filter "git rm --ignore-unmatch --cached to-drop.t" \
+		 rewrite >out 2>&1 &&
+	grep "rewrite.*was rewritten" out &&
+	! grep -i warning out &&
+	git diff-tree empty rewrite
+'
+
+test_expect_success 'filter-branch handles ancestor rewrite' '
+	test_commit to-exclude &&
+	git branch ancestor &&
+	git filter-branch -f ancestor -- :^to-exclude.t >out 2>&1 &&
+	grep "ancestor.*was rewritten" out &&
+	! grep -i warning out &&
+	git diff-tree HEAD^ ancestor
+'
+
 test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 80eb13d94e..082be85dff 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -7,6 +7,9 @@ test_description='git tag
 
 Tests for operations with tags.'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 . "$TEST_DIRECTORY"/lib-terminal.sh
@@ -17,6 +20,13 @@ tag_exists () {
 	git show-ref --quiet --verify refs/tags/"$1"
 }
 
+test_expect_success 'setup' '
+	test_oid_cache <<-EOM
+	othersigheader sha1:gpgsig-sha256
+	othersigheader sha256:gpgsig
+	EOM
+'
+
 test_expect_success 'listing all tags in an empty tree should succeed' '
 	git tag -l &&
 	git tag
@@ -88,7 +98,7 @@ test_expect_success 'creating a tag with --create-reflog should create 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_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'annotated tag with --create-reflog has correct message' '
@@ -99,7 +109,7 @@ test_expect_success 'annotated tag with --create-reflog has correct message' '
 	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_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success '--create-reflog does not create reflog on failure' '
@@ -227,10 +237,10 @@ test_expect_success \
 test_expect_success \
 	'trying to delete two tags, existing and not, should fail in the 2nd' '
 	tag_exists mytag &&
-	! tag_exists myhead &&
-	test_must_fail git tag -d mytag anothertag &&
+	! tag_exists nonexistingtag &&
+	test_must_fail git tag -d mytag nonexistingtag &&
 	! tag_exists mytag &&
-	! tag_exists myhead
+	! tag_exists nonexistingtag
 '
 
 test_expect_success 'trying to delete an already deleted tag should fail' \
@@ -517,7 +527,6 @@ test_expect_success \
 test_expect_success \
 	'trying to create tags giving both -m or -F options should fail' '
 	echo "message file 1" >msgfile1 &&
-	echo "message file 2" >msgfile2 &&
 	! tag_exists msgtag &&
 	test_must_fail git tag -m "message 1" -F msgfile1 msgtag &&
 	! tag_exists msgtag &&
@@ -1372,6 +1381,24 @@ test_expect_success GPG \
 	'test_config gpg.program echo &&
 	 test_must_fail git tag -s -m tail tag-gpg-failure'
 
+# try to produce invalid signature
+test_expect_success GPG 'git verifies tag is valid with double signature' '
+	git tag -s -m tail tag-gpg-double-sig &&
+	git cat-file tag tag-gpg-double-sig >tag &&
+	othersigheader=$(test_oid othersigheader) &&
+	sed -ne "/^\$/q;p" tag >new-tag &&
+	cat <<-EOM >>new-tag &&
+	$othersigheader -----BEGIN PGP SIGNATURE-----
+	 someinvaliddata
+	 -----END PGP SIGNATURE-----
+	EOM
+	sed -e "1,/^tagger/d" tag >>new-tag &&
+	new_tag=$(git hash-object -t tag -w new-tag) &&
+	git update-ref refs/tags/tag-gpg-double-sig $new_tag &&
+	git verify-tag tag-gpg-double-sig &&
+	git fsck
+'
+
 # try to sign with bad user.signingkey
 test_expect_success GPGSM \
 	'git tag -s fails if gpgsm is misconfigured (bad key)' \
@@ -1407,7 +1434,7 @@ test_expect_success 'message in editor has initial comment: first line' '
 	# check the first line --- should be empty
 	echo >first.expect &&
 	sed -e 1q <actual >first.actual &&
-	test_i18ncmp first.expect first.actual
+	test_cmp first.expect first.actual
 '
 
 test_expect_success \
@@ -1420,7 +1447,7 @@ test_expect_success \
 get_tag_header reuse $commit commit $time >expect
 echo "An annotation to be reused" >> expect
 test_expect_success \
-	'overwriting an annoted tag should use its previous body' '
+	'overwriting an annotated tag should use its previous body' '
 	git tag -a -m "An annotation to be reused" reuse &&
 	GIT_EDITOR=true git tag -f -a reuse &&
 	get_tag_msg reuse >actual &&
@@ -1584,7 +1611,7 @@ test_expect_success 'checking that branch head with --no-contains lists all but
 "
 
 test_expect_success 'merging original branch into this branch' '
-	git merge --strategy=ours master &&
+	git merge --strategy=ours main &&
         git tag v4.0
 '
 
@@ -1727,9 +1754,10 @@ test_expect_success 'recursive tagging should give advice' '
 	hint: already a tag. If you meant to tag the object that it points to, use:
 	hint: |
 	hint: 	git tag -f nested annotated-v4.0^{}
+	hint: Disable this message with "git config advice.nestedTag false"
 	EOF
 	git tag -m nested nested annotated-v4.0 2>actual &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'multiple --points-at are OR-ed together' '
@@ -1944,15 +1972,15 @@ test_expect_success ULIMIT_STACK_SIZE '--contains and --no-contains work in a de
 	i=1 &&
 	while test $i -lt 8000
 	do
-		echo "commit refs/heads/master
+		echo "commit refs/heads/main
 committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
 data <<EOF
 commit #$i
 EOF"
-		test $i = 1 && echo "from refs/heads/master^0"
+		test $i = 1 && echo "from refs/heads/main^0"
 		i=$(($i + 1))
 	done | git fast-import &&
-	git checkout master &&
+	git checkout main &&
 	git tag far-far-away HEAD^ &&
 	run_with_limited_stack git tag --contains HEAD >actual &&
 	test_must_be_empty actual &&
@@ -1970,6 +1998,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 &&
@@ -2015,8 +2047,8 @@ test_expect_success '--merged can be used in non-list mode' '
 	test_cmp expect actual
 '
 
-test_expect_success '--merged is incompatible with --no-merged' '
-	test_must_fail git tag --merged HEAD --no-merged HEAD
+test_expect_success '--merged is compatible with --no-merged' '
+	git tag --merged HEAD --no-merged HEAD
 '
 
 test_expect_success '--merged shows merged tags' '
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 00e09a375c..0e7cf75435 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -19,7 +19,7 @@ test_expect_success 'setup' '
 test_expect_success TTY 'some commands use a pager' '
 	rm -f paginated.out &&
 	test_terminal git log &&
-	test -e paginated.out
+	test_path_is_file paginated.out
 '
 
 test_expect_failure TTY 'pager runs from subdir' '
@@ -65,49 +65,49 @@ test_expect_success !MINGW,TTY 'LESS and LV envvars set by git-sh-setup' '
 test_expect_success TTY 'some commands do not use a pager' '
 	rm -f paginated.out &&
 	test_terminal git rev-list HEAD &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success 'no pager when stdout is a pipe' '
 	rm -f paginated.out &&
 	git log | cat &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success 'no pager when stdout is a regular file' '
 	rm -f paginated.out &&
 	git log >file &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git --paginate rev-list uses a pager' '
 	rm -f paginated.out &&
 	test_terminal git --paginate rev-list HEAD &&
-	test -e paginated.out
+	test_path_is_file paginated.out
 '
 
 test_expect_success 'no pager even with --paginate when stdout is a pipe' '
 	rm -f file paginated.out &&
 	git --paginate log | cat &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'no pager with --no-pager' '
 	rm -f paginated.out &&
 	test_terminal git --no-pager log &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'configuration can disable pager' '
 	rm -f paginated.out &&
 	test_unconfig pager.grep &&
 	test_terminal git grep initial &&
-	test -e paginated.out &&
+	test_path_is_file paginated.out &&
 
 	rm -f paginated.out &&
 	test_config pager.grep false &&
 	test_terminal git grep initial &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'configuration can enable pager (from subdir)' '
@@ -122,107 +122,107 @@ test_expect_success TTY 'configuration can enable pager (from subdir)' '
 		test_terminal git bundle unbundle ../test.bundle
 	) &&
 	{
-		test -e paginated.out ||
-		test -e subdir/paginated.out
+		test_path_is_file paginated.out ||
+		test_path_is_file subdir/paginated.out
 	}
 '
 
 test_expect_success TTY 'git tag -l defaults to paging' '
 	rm -f paginated.out &&
 	test_terminal git tag -l &&
-	test -e paginated.out
+	test_path_is_file paginated.out
 '
 
 test_expect_success TTY 'git tag -l respects pager.tag' '
 	rm -f paginated.out &&
 	test_terminal git -c pager.tag=false tag -l &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git tag -l respects --no-pager' '
 	rm -f paginated.out &&
 	test_terminal git -c pager.tag --no-pager tag -l &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git tag with no args defaults to paging' '
 	# no args implies -l so this should page like -l
 	rm -f paginated.out &&
 	test_terminal git tag &&
-	test -e paginated.out
+	test_path_is_file paginated.out
 '
 
 test_expect_success TTY 'git tag with no args respects pager.tag' '
 	# no args implies -l so this should page like -l
 	rm -f paginated.out &&
 	test_terminal git -c pager.tag=false tag &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git tag --contains defaults to paging' '
 	# --contains implies -l so this should page like -l
 	rm -f paginated.out &&
 	test_terminal git tag --contains &&
-	test -e paginated.out
+	test_path_is_file paginated.out
 '
 
 test_expect_success TTY 'git tag --contains respects pager.tag' '
 	# --contains implies -l so this should page like -l
 	rm -f paginated.out &&
 	test_terminal git -c pager.tag=false tag --contains &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git tag -a defaults to not paging' '
 	test_when_finished "git tag -d newtag" &&
 	rm -f paginated.out &&
 	test_terminal git tag -am message newtag &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git tag -a ignores pager.tag' '
 	test_when_finished "git tag -d newtag" &&
 	rm -f paginated.out &&
 	test_terminal git -c pager.tag tag -am message newtag &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git tag -a respects --paginate' '
 	test_when_finished "git tag -d newtag" &&
 	rm -f paginated.out &&
 	test_terminal git --paginate tag -am message newtag &&
-	test -e paginated.out
+	test_path_is_file paginated.out
 '
 
 test_expect_success TTY 'git tag as alias ignores pager.tag with -a' '
 	test_when_finished "git tag -d newtag" &&
 	rm -f paginated.out &&
 	test_terminal git -c pager.tag -c alias.t=tag t -am message newtag &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git tag as alias respects pager.tag with -l' '
 	rm -f paginated.out &&
 	test_terminal git -c pager.tag=false -c alias.t=tag t -l &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git branch defaults to paging' '
 	rm -f paginated.out &&
 	test_terminal git branch &&
-	test -e paginated.out
+	test_path_is_file paginated.out
 '
 
 test_expect_success TTY 'git branch respects pager.branch' '
 	rm -f paginated.out &&
 	test_terminal git -c pager.branch=false branch &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git branch respects --no-pager' '
 	rm -f paginated.out &&
 	test_terminal git --no-pager branch &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git branch --edit-description ignores pager.branch' '
@@ -232,8 +232,8 @@ test_expect_success TTY 'git branch --edit-description ignores pager.branch' '
 		touch editor.used
 	EOF
 	EDITOR=./editor test_terminal git -c pager.branch branch --edit-description &&
-	! test -e paginated.out &&
-	test -e editor.used
+	test_path_is_missing paginated.out &&
+	test_path_is_file editor.used
 '
 
 test_expect_success TTY 'git branch --set-upstream-to ignores pager.branch' '
@@ -242,13 +242,13 @@ test_expect_success TTY 'git branch --set-upstream-to ignores pager.branch' '
 	test_when_finished "git branch -D other" &&
 	test_terminal git -c pager.branch branch --set-upstream-to=other &&
 	test_when_finished "git branch --unset-upstream" &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git config ignores pager.config when setting' '
 	rm -f paginated.out &&
 	test_terminal git -c pager.config config foo.bar bar &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git config --edit ignores pager.config' '
@@ -257,33 +257,33 @@ test_expect_success TTY 'git config --edit ignores pager.config' '
 		touch editor.used
 	EOF
 	EDITOR=./editor test_terminal git -c pager.config config --edit &&
-	! test -e paginated.out &&
-	test -e editor.used
+	test_path_is_missing paginated.out &&
+	test_path_is_file editor.used
 '
 
 test_expect_success TTY 'git config --get ignores pager.config' '
 	rm -f paginated.out &&
 	test_terminal git -c pager.config config --get foo.bar &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git config --get-urlmatch defaults to paging' '
 	rm -f paginated.out &&
 	test_terminal git -c http."https://foo.com/".bar=foo \
 			  config --get-urlmatch http https://foo.com &&
-	test -e paginated.out
+	test_path_is_file paginated.out
 '
 
 test_expect_success TTY 'git config --get-all respects pager.config' '
 	rm -f paginated.out &&
 	test_terminal git -c pager.config=false config --get-all foo.bar &&
-	! test -e paginated.out
+	test_path_is_missing paginated.out
 '
 
 test_expect_success TTY 'git config --list defaults to paging' '
 	rm -f paginated.out &&
 	test_terminal git config --list &&
-	test -e paginated.out
+	test_path_is_file paginated.out
 '
 
 
@@ -392,7 +392,7 @@ test_default_pager() {
 			export PATH &&
 			$full_command
 		) &&
-		test -e default_pager_used
+		test_path_is_file default_pager_used
 	"
 }
 
@@ -406,7 +406,7 @@ test_PAGER_overrides() {
 		PAGER='wc >PAGER_used' &&
 		export PAGER &&
 		$full_command &&
-		test -e PAGER_used
+		test_path_is_file PAGER_used
 	"
 }
 
@@ -432,7 +432,7 @@ test_core_pager() {
 		export PAGER &&
 		test_config core.pager 'wc >core.pager_used' &&
 		$full_command &&
-		${if_local_config}test -e core.pager_used
+		${if_local_config}test_path_is_file core.pager_used
 	"
 }
 
@@ -464,7 +464,7 @@ test_pager_subdir_helper() {
 			cd sub &&
 			$full_command
 		) &&
-		${if_local_config}test -e core.pager_used
+		${if_local_config}test_path_is_file core.pager_used
 	"
 }
 
@@ -477,7 +477,7 @@ test_GIT_PAGER_overrides() {
 		GIT_PAGER='wc >GIT_PAGER_used' &&
 		export GIT_PAGER &&
 		$full_command &&
-		test -e GIT_PAGER_used
+		test_path_is_file GIT_PAGER_used
 	"
 }
 
@@ -489,7 +489,7 @@ test_doesnt_paginate() {
 		GIT_PAGER='wc >GIT_PAGER_used' &&
 		export GIT_PAGER &&
 		$full_command &&
-		! test -e GIT_PAGER_used
+		test_path_is_missing GIT_PAGER_used
 	"
 }
 
@@ -656,4 +656,134 @@ test_expect_success TTY 'git tag with auto-columns ' '
 	test_cmp expect actual
 '
 
+test_expect_success 'setup trace2' '
+	GIT_TRACE2_BRIEF=1 &&
+	export GIT_TRACE2_BRIEF
+'
+
+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" &&
+	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 &&
+
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:0 " child-exits &&
+	test_path_is_file pager-used
+'
+
+test_expect_success TTY 'git returns SIGPIPE on early pager non-zero exit' '
+	test_when_finished "rm pager-used trace.normal" &&
+	test_config core.pager ">pager-used; head -n 1; exit 1" &&
+	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 &&
+
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:1 " child-exits &&
+	test_path_is_file pager-used
+'
+
+test_expect_success TTY 'git discards pager non-zero exit without SIGPIPE' '
+	test_when_finished "rm pager-used trace.normal" &&
+	test_config core.pager "wc >pager-used; exit 1" &&
+	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:1 " child-exits &&
+	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_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 &&
+
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:-1 " child-exits
+'
+
+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" &&
+	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 &&
+
+	grep child_exit trace.normal >child-exits &&
+	test_line_count = 1 child-exits &&
+	grep " code:143 " child-exits &&
+	test_path_is_file pager-used
+'
+
 test_done
diff --git a/t/t7007-show.sh b/t/t7007-show.sh
index 42d3db6246..d6cc69e0f2 100755
--- a/t/t7007-show.sh
+++ b/t/t7007-show.sh
@@ -38,6 +38,45 @@ test_expect_success 'showing two commits' '
 	test_cmp expect actual.filtered
 '
 
+test_expect_success 'showing a tree' '
+	cat >expected <<-EOF &&
+	tree main1:
+
+	main1.t
+	EOF
+	git show main1: >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'showing two trees' '
+	cat >expected <<-EOF &&
+	tree main1^{tree}
+
+	main1.t
+
+	tree main2^{tree}
+
+	main1.t
+	main2.t
+	EOF
+	git show main1^{tree} main2^{tree} >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'showing a trees is not recursive' '
+	git worktree add not-recursive main1 &&
+	mkdir not-recursive/a &&
+	test_commit -C not-recursive a/file &&
+	cat >expected <<-EOF &&
+	tree HEAD^{tree}
+
+	a/
+	main1.t
+	EOF
+	git -C not-recursive show HEAD^{tree} >actual &&
+	test_cmp expected actual
+'
+
 test_expect_success 'showing a range walks (linear)' '
 	cat >expect <<-EOF &&
 	commit $(git rev-parse main3)
diff --git a/t/t7011-skip-worktree-reading.sh b/t/t7011-skip-worktree-reading.sh
index 37525cae3a..1761a2b1b9 100755
--- a/t/t7011-skip-worktree-reading.sh
+++ b/t/t7011-skip-worktree-reading.sh
@@ -109,15 +109,6 @@ test_expect_success 'ls-files --modified' '
 	test -z "$(git ls-files -m)"
 '
 
-test_expect_success 'grep with skip-worktree file' '
-	git update-index --no-skip-worktree 1 &&
-	echo test > 1 &&
-	git update-index 1 &&
-	git update-index --skip-worktree 1 &&
-	rm 1 &&
-	test "$(git grep --no-ext-grep test)" = "1:test"
-'
-
 echo ":000000 100644 $ZERO_OID $EMPTY_BLOB A	1" > expected
 test_expect_success 'diff-index does not examine skip-worktree absent entries' '
 	setup_absent &&
@@ -141,11 +132,6 @@ test_expect_success 'diff-files does not examine skip-worktree dirty entries' '
 	test -z "$(git diff-files -- one)"
 '
 
-test_expect_success 'git-rm succeeds on skip-worktree absent entries' '
-	setup_absent &&
-	git rm 1
-'
-
 test_expect_success 'commit on skip-worktree absent entries' '
 	git reset &&
 	setup_absent &&
diff --git a/t/t7012-skip-worktree-writing.sh b/t/t7012-skip-worktree-writing.sh
index 9d1abe50ef..a1080b94e3 100755
--- a/t/t7012-skip-worktree-writing.sh
+++ b/t/t7012-skip-worktree-writing.sh
@@ -60,13 +60,6 @@ setup_absent() {
 	git update-index --skip-worktree 1
 }
 
-test_absent() {
-	echo "100644 $EMPTY_BLOB 0	1" > expected &&
-	git ls-files --stage 1 > result &&
-	test_cmp expected result &&
-	test ! -f 1
-}
-
 setup_dirty() {
 	git update-index --force-remove 1 &&
 	echo dirty > 1 &&
@@ -100,18 +93,6 @@ test_expect_success 'index setup' '
 	test_cmp expected result
 '
 
-test_expect_success 'git-add ignores worktree content' '
-	setup_absent &&
-	git add 1 &&
-	test_absent
-'
-
-test_expect_success 'git-add ignores worktree content' '
-	setup_dirty &&
-	git add 1 &&
-	test_dirty
-'
-
 test_expect_success 'git-rm fails if worktree is dirty' '
 	setup_dirty &&
 	test_must_fail git rm 1 &&
@@ -125,13 +106,116 @@ EOF
 test_expect_success 'git-clean, absent case' '
 	setup_absent &&
 	git clean -n > result &&
-	test_i18ncmp expected result
+	test_cmp expected result
 '
 
 test_expect_success 'git-clean, dirty case' '
 	setup_dirty &&
 	git clean -n > result &&
-	test_i18ncmp expected result
+	test_cmp expected result
+'
+
+test_expect_success '--ignore-skip-worktree-entries leaves worktree alone' '
+	test_commit keep-me &&
+	git update-index --skip-worktree keep-me.t &&
+	rm keep-me.t &&
+
+	: ignoring the worktree &&
+	git update-index --remove --ignore-skip-worktree-entries keep-me.t &&
+	git diff-index --cached --exit-code HEAD &&
+
+	: not ignoring the worktree, a deletion is staged &&
+	git update-index --remove keep-me.t &&
+	test_must_fail git diff-index --cached --exit-code HEAD \
+		--diff-filter=D -- keep-me.t
+'
+
+test_expect_success 'stash restore in sparse checkout' '
+	test_create_repo stash-restore &&
+	(
+		cd stash-restore &&
+
+		mkdir subdir &&
+		echo A >subdir/A &&
+		echo untouched >untouched &&
+		echo removeme >removeme &&
+		echo modified >modified &&
+		git add . &&
+		git commit -m Initial &&
+
+		echo AA >>subdir/A &&
+		echo addme >addme &&
+		echo tweaked >>modified &&
+		rm removeme &&
+		git add addme &&
+
+		git stash push &&
+
+		git sparse-checkout set subdir &&
+
+		# Ensure after sparse-checkout we only have expected files
+		cat >expect <<-EOF &&
+		S modified
+		S removeme
+		H subdir/A
+		S untouched
+		EOF
+		git ls-files -t >actual &&
+		test_cmp expect actual &&
+
+		test_path_is_missing addme &&
+		test_path_is_missing modified &&
+		test_path_is_missing removeme &&
+		test_path_is_file    subdir/A &&
+		test_path_is_missing untouched &&
+
+		# Put a file in the working directory in the way
+		echo in the way >modified &&
+		git stash apply &&
+
+		# Ensure stash vivifies modifies paths...
+		cat >expect <<-EOF &&
+		H addme
+		H modified
+		H removeme
+		H subdir/A
+		S untouched
+		EOF
+		git ls-files -t >actual &&
+		test_cmp expect actual &&
+
+		# ...and that the paths show up in status as changed...
+		cat >expect <<-EOF &&
+		A  addme
+		 M modified
+		 D removeme
+		 M subdir/A
+		?? actual
+		?? expect
+		?? modified.stash.XXXXXX
+		EOF
+		git status --porcelain | \
+			sed -e s/stash......./stash.XXXXXX/ >actual &&
+		test_cmp expect actual &&
+
+		# ...and that working directory reflects the files correctly
+		test_path_is_file    addme &&
+		test_path_is_file    modified &&
+		test_path_is_missing removeme &&
+		test_path_is_file    subdir/A &&
+		test_path_is_missing untouched &&
+
+		# ...including that we have the expected "modified" file...
+		cat >expect <<-EOF &&
+		modified
+		tweaked
+		EOF
+		test_cmp expect modified &&
+
+		# ...and that the other "modified" file is still present...
+		echo in the way >expect &&
+		test_cmp expect modified.stash.*
+	)
 '
 
 #TODO test_expect_failure 'git-apply adds file' false
diff --git a/t/t7030-verify-tag.sh b/t/t7030-verify-tag.sh
index 041e319e79..10faa64515 100755
--- a/t/t7030-verify-tag.sh
+++ b/t/t7030-verify-tag.sh
@@ -1,6 +1,9 @@
 #!/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"
 
@@ -17,7 +20,7 @@ test_expect_success GPG 'create signed tags' '
 	echo 3 >elif && git add elif &&
 	test_tick && git commit -m "third on side" &&
 
-	git checkout master &&
+	git checkout main &&
 	test_tick && git merge -S side &&
 	git tag -s -m merge merge &&
 
@@ -44,8 +47,8 @@ test_expect_success GPG 'create signed tags' '
 test_expect_success GPGSM 'create signed tags x509 ' '
 	test_config gpg.format x509 &&
 	test_config user.signingkey $GIT_COMMITTER_EMAIL &&
-	echo 9 >file && test_tick && git commit -a -m "nineth gpgsm-signed" &&
-	git tag -s -m nineth nineth-signed-x509
+	echo 9 >file && test_tick && git commit -a -m "ninth gpgsm-signed" &&
+	git tag -s -m ninth ninth-signed-x509
 '
 
 test_expect_success GPG 'verify and show signatures' '
@@ -80,10 +83,34 @@ test_expect_success GPG 'verify and show signatures' '
 '
 
 test_expect_success GPGSM 'verify and show signatures x509' '
-	git verify-tag nineth-signed-x509 2>actual &&
+	git verify-tag ninth-signed-x509 2>actual &&
+	grep "Good signature from" actual &&
+	! grep "BAD signature from" actual &&
+	echo ninth-signed-x509 OK
+'
+
+test_expect_success GPGSM 'verify and show signatures x509 with low minTrustLevel' '
+	test_config gpg.minTrustLevel undefined &&
+	git verify-tag ninth-signed-x509 2>actual &&
 	grep "Good signature from" actual &&
 	! grep "BAD signature from" actual &&
-	echo nineth-signed-x509 OK
+	echo ninth-signed-x509 OK
+'
+
+test_expect_success GPGSM 'verify and show signatures x509 with matching minTrustLevel' '
+	test_config gpg.minTrustLevel fully &&
+	git verify-tag ninth-signed-x509 2>actual &&
+	grep "Good signature from" actual &&
+	! grep "BAD signature from" actual &&
+	echo ninth-signed-x509 OK
+'
+
+test_expect_success GPGSM 'verify and show signatures x509 with high minTrustLevel' '
+	test_config gpg.minTrustLevel ultimate &&
+	test_must_fail git verify-tag ninth-signed-x509 2>actual &&
+	grep "Good signature from" actual &&
+	! grep "BAD signature from" actual &&
+	echo ninth-signed-x509 OK
 '
 
 test_expect_success GPG 'detect fudged signature' '
@@ -127,10 +154,10 @@ test_expect_success GPG 'verify signatures with --raw' '
 '
 
 test_expect_success GPGSM 'verify signatures with --raw x509' '
-	git verify-tag --raw nineth-signed-x509 2>actual &&
+	git verify-tag --raw ninth-signed-x509 2>actual &&
 	grep "GOODSIG" actual &&
 	! grep "BADSIG" actual &&
-	echo nineth-signed-x509 OK
+	echo ninth-signed-x509 OK
 '
 
 test_expect_success GPG 'verify multiple tags' '
@@ -147,7 +174,7 @@ test_expect_success GPG 'verify multiple tags' '
 '
 
 test_expect_success GPGSM 'verify multiple tags x509' '
-	tags="seventh-signed nineth-signed-x509" &&
+	tags="seventh-signed ninth-signed-x509" &&
 	for i in $tags
 	do
 		git verify-tag -v --raw $i || return 1
@@ -167,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/t7060-wtstatus.sh b/t/t7060-wtstatus.sh
index d5218743e9..0f4344c55e 100755
--- a/t/t7060-wtstatus.sh
+++ b/t/t7060-wtstatus.sh
@@ -2,6 +2,9 @@
 
 test_description='basic work tree status reporting'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -51,11 +54,11 @@ EOF
 		git checkout -b side HEAD^ &&
 		git rm foo &&
 		git commit -m delete &&
-		test_must_fail git merge master &&
+		test_must_fail git merge main &&
 		test_must_fail git commit --dry-run >../actual &&
-		test_i18ncmp ../expect ../actual &&
+		test_cmp ../expect ../actual &&
 		git status >../actual &&
-		test_i18ncmp ../expect ../actual
+		test_cmp ../expect ../actual
 	)
 '
 
@@ -124,18 +127,18 @@ test_expect_success 'git diff-index --cached -C shows 2 copies + 1 unmerged' '
 
 test_expect_success 'status when conflicts with add and rm advice (deleted by them)' '
 	git reset --hard &&
-	git checkout master &&
+	git checkout main &&
 	test_commit init main.txt init &&
 	git checkout -b second_branch &&
 	git rm main.txt &&
 	git commit -m "main.txt deleted on second_branch" &&
 	test_commit second conflict.txt second &&
-	git checkout master &&
+	git checkout main &&
 	test_commit on_second main.txt on_second &&
-	test_commit master conflict.txt master &&
+	test_commit main conflict.txt main &&
 	test_must_fail git merge second_branch &&
 	cat >expected <<\EOF &&
-On branch master
+On branch main
 You have unmerged paths.
   (fix conflicts and run "git commit")
   (use "git merge --abort" to abort the merge)
@@ -148,7 +151,7 @@ Unmerged paths:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -157,8 +160,8 @@ test_expect_success 'prepare for conflicts' '
 	git checkout -b conflict &&
 	test_commit one main.txt one &&
 	git branch conflict_second &&
-	git mv main.txt sub_master.txt &&
-	git commit -m "main.txt renamed in sub_master.txt" &&
+	git mv main.txt sub_main.txt &&
+	git commit -m "main.txt renamed in sub_main.txt" &&
 	git checkout conflict_second &&
 	git mv main.txt sub_second.txt &&
 	git commit -m "main.txt renamed in sub_second.txt"
@@ -176,20 +179,20 @@ You have unmerged paths.
 Unmerged paths:
   (use "git add/rm <file>..." as appropriate to mark resolution)
 	both deleted:    main.txt
-	added by them:   sub_master.txt
+	added by them:   sub_main.txt
 	added by us:     sub_second.txt
 
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'status when conflicts with only rm advice (both deleted)' '
 	git reset --hard conflict_second &&
 	test_must_fail git merge conflict &&
-	git add sub_master.txt &&
+	git add sub_main.txt &&
 	git add sub_second.txt &&
 	cat >expected <<\EOF &&
 On branch conflict_second
@@ -198,7 +201,7 @@ You have unmerged paths.
   (use "git merge --abort" to abort the merge)
 
 Changes to be committed:
-	new file:   sub_master.txt
+	new file:   sub_main.txt
 
 Unmerged paths:
   (use "git rm <file>..." to mark resolution)
@@ -207,14 +210,14 @@ Unmerged paths:
 Untracked files not listed (use -u option to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual &&
+	test_cmp expected actual &&
 	git reset --hard &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'status --branch with detached HEAD' '
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	git status --branch --porcelain >actual &&
 	cat >expected <<-EOF &&
 	## HEAD (no branch)
@@ -224,13 +227,13 @@ test_expect_success 'status --branch with detached HEAD' '
 	?? expected
 	?? mdconflict/
 	EOF
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 ## Duplicate the above test and verify --porcelain=v1 arg parsing.
 test_expect_success 'status --porcelain=v1 --branch with detached HEAD' '
 	git reset --hard &&
-	git checkout master^0 &&
+	git checkout main^0 &&
 	git status --branch --porcelain=v1 >actual &&
 	cat >expected <<-EOF &&
 	## HEAD (no branch)
@@ -240,7 +243,7 @@ test_expect_success 'status --porcelain=v1 --branch with detached HEAD' '
 	?? expected
 	?? mdconflict/
 	EOF
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 ## Verify parser error on invalid --porcelain argument.
diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh
index 0c394cf995..2f9bea9793 100755
--- a/t/t7061-wtstatus-ignore.sh
+++ b/t/t7061-wtstatus-ignore.sh
@@ -30,6 +30,31 @@ test_expect_success 'same with gitignore starting with BOM' '
 	test_cmp expected actual
 '
 
+test_expect_success 'status untracked files --ignored with pathspec (no match)' '
+	git status --porcelain --ignored -- untracked/i >actual &&
+	test_must_be_empty actual &&
+	git status --porcelain --ignored -- untracked/u >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success 'status untracked files --ignored with pathspec (literal match)' '
+	git status --porcelain --ignored -- untracked/ignored >actual &&
+	echo "!! untracked/ignored" >expected &&
+	test_cmp expected actual &&
+	git status --porcelain --ignored -- untracked/uncommitted >actual &&
+	echo "?? untracked/uncommitted" >expected &&
+	test_cmp expected actual
+'
+
+test_expect_success 'status untracked files --ignored with pathspec (glob match)' '
+	git status --porcelain --ignored -- untracked/i\* >actual &&
+	echo "!! untracked/ignored" >expected &&
+	test_cmp expected actual &&
+	git status --porcelain --ignored -- untracked/u\* >actual &&
+	echo "?? untracked/uncommitted" >expected &&
+	test_cmp expected actual
+'
+
 cat >expected <<\EOF
 ?? .gitignore
 ?? actual
@@ -43,11 +68,16 @@ test_expect_success 'status untracked directory with --ignored -u' '
 	test_cmp expected actual
 '
 cat >expected <<\EOF
-?? untracked/uncommitted
+?? untracked/
 !! untracked/ignored
 EOF
 
-test_expect_success 'status prefixed untracked directory with --ignored' '
+test_expect_success 'status of untracked directory with --ignored works with or without prefix' '
+	git status --porcelain --ignored >tmp &&
+	grep untracked/ tmp >actual &&
+	rm tmp &&
+	test_cmp expected actual &&
+
 	git status --porcelain --ignored untracked/ >actual &&
 	test_cmp expected actual
 '
diff --git a/t/t7063-status-untracked-cache.sh b/t/t7063-status-untracked-cache.sh
index 190ae149cf..a0c123b0a7 100755
--- a/t/t7063-status-untracked-cache.sh
+++ b/t/t7063-status-untracked-cache.sh
@@ -2,6 +2,9 @@
 
 test_description='test untracked cache'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # On some filesystems (e.g. FreeBSD's ext2 and ufs) directory mtime
@@ -18,7 +21,7 @@ GIT_FORCE_UNTRACKED_CACHE=true
 export GIT_FORCE_UNTRACKED_CACHE
 
 sync_mtime () {
-	find . -type d -ls >/dev/null
+	find . -type d -exec ls -ld {} + >/dev/null
 }
 
 avoid_racy() {
@@ -30,6 +33,44 @@ status_is_clean() {
 	test_must_be_empty ../status.actual
 }
 
+# Ignore_Untracked_Cache, abbreviated to 3 letters because then people can
+# compare commands side-by-side, e.g.
+#    iuc status --porcelain >expect &&
+#    git status --porcelain >actual &&
+#    test_cmp expect actual
+iuc () {
+	git ls-files -s >../current-index-entries
+	git ls-files -t | sed -ne s/^S.//p >../current-sparse-entries
+
+	GIT_INDEX_FILE=.git/tmp_index
+	export GIT_INDEX_FILE
+	git update-index --index-info <../current-index-entries
+	git update-index --skip-worktree $(cat ../current-sparse-entries)
+
+	git -c core.untrackedCache=false "$@"
+	ret=$?
+
+	rm ../current-index-entries
+	rm $GIT_INDEX_FILE
+	unset GIT_INDEX_FILE
+
+	return $ret
+}
+
+get_relevant_traces () {
+	# From the GIT_TRACE2_PERF data of the form
+	#    $TIME $FILE:$LINE | d0 | main | data | r1 | ? | ? | read_directo | $RELEVANT_STAT
+	# extract the $RELEVANT_STAT fields.  We don't care about region_enter
+	# or region_leave, or stats for things outside read_directory.
+	INPUT_FILE=$1
+	OUTPUT_FILE=$2
+	grep data.*read_directo $INPUT_FILE |
+	    cut -d "|" -f 9 |
+	    grep -v visited \
+	    >"$OUTPUT_FILE"
+}
+
+
 test_lazy_prereq UNTRACKED_CACHE '
 	{ git update-index --test-untracked-cache; ret=$?; } &&
 	test $ret -ne 1
@@ -51,14 +92,24 @@ test_expect_success 'setup' '
 	touch one two three done/one dtwo/two dthree/three &&
 	git add one two done/one &&
 	: >.git/info/exclude &&
-	git update-index --untracked-cache
+	git update-index --untracked-cache &&
+	test_oid_cache <<-EOF
+	root sha1:e6fcc8f2ee31bae321d66afd183fcb7237afae6e
+	root sha256:b90c672088c015b9c83876e919da311bad4cd39639fb139f988af6a11493b974
+
+	exclude sha1:13263c0978fb9fad16b2d580fb800b6d811c3ff0
+	exclude sha256:fe4aaa1bbbbce4cb8f73426748a14c5ad6026b26f90505a0bf2494b165a5b76c
+
+	done sha1:1946f0437f90c5005533cbe1736a6451ca301714
+	done sha256:7f079501d79f665b3acc50f5e0e9e94509084d5032ac20113a37dd5029b757cc
+	EOF
 '
 
 test_expect_success 'untracked cache is empty' '
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect-empty <<EOF &&
-info/exclude 0000000000000000000000000000000000000000
-core.excludesfile 0000000000000000000000000000000000000000
+info/exclude $ZERO_OID
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
 EOF
@@ -76,33 +127,37 @@ EOF
 
 cat >../dump.expect <<EOF &&
 info/exclude $EMPTY_BLOB
-core.excludesfile 0000000000000000000000000000000000000000
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ 0000000000000000000000000000000000000000 recurse valid
+/ $ZERO_OID recurse valid
 dthree/
 dtwo/
 three
-/done/ 0000000000000000000000000000000000000000 recurse valid
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
 three
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 
 test_expect_success 'status first time (empty cache)' '
 	avoid_racy &&
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 3
-gitignore invalidation: 1
-directory invalidation: 0
-opendir: 4
+ ....path:
+ ....node-creation:3
+ ....gitignore-invalidation:1
+ ....directory-invalidation:0
+ ....opendir:4
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 '
 
 test_expect_success 'untracked cache after first status' '
@@ -112,17 +167,21 @@ test_expect_success 'untracked cache after first status' '
 
 test_expect_success 'status second time (fully populated cache)' '
 	avoid_racy &&
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 0
-gitignore invalidation: 0
-directory invalidation: 0
-opendir: 0
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:0
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 '
 
 test_expect_success 'untracked cache after second status' '
@@ -133,9 +192,10 @@ test_expect_success 'untracked cache after second status' '
 test_expect_success 'modify in root directory, one dir invalidation' '
 	avoid_racy &&
 	: >four &&
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
 A  done/one
 A  one
@@ -145,14 +205,17 @@ A  two
 ?? four
 ?? three
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 0
-gitignore invalidation: 0
-directory invalidation: 1
-opendir: 1
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:1
+ ....opendir:1
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 
 '
 
@@ -160,18 +223,18 @@ test_expect_success 'verify untracked cache dump' '
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
 info/exclude $EMPTY_BLOB
-core.excludesfile 0000000000000000000000000000000000000000
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ 0000000000000000000000000000000000000000 recurse valid
+/ $ZERO_OID recurse valid
 dthree/
 dtwo/
 four
 three
-/done/ 0000000000000000000000000000000000000000 recurse valid
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
 three
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 	test_cmp ../expect ../actual
@@ -180,9 +243,10 @@ EOF
 test_expect_success 'new .gitignore invalidates recursively' '
 	avoid_racy &&
 	echo four >.gitignore &&
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
 A  done/one
 A  one
@@ -192,14 +256,17 @@ A  two
 ?? dtwo/
 ?? three
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 0
-gitignore invalidation: 1
-directory invalidation: 1
-opendir: 4
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:1
+ ....directory-invalidation:1
+ ....opendir:4
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 
 '
 
@@ -207,18 +274,18 @@ test_expect_success 'verify untracked cache dump' '
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
 info/exclude $EMPTY_BLOB
-core.excludesfile 0000000000000000000000000000000000000000
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
+/ $(test_oid root) recurse valid
 .gitignore
 dthree/
 dtwo/
 three
-/done/ 0000000000000000000000000000000000000000 recurse valid
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
 three
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 	test_cmp ../expect ../actual
@@ -227,9 +294,10 @@ EOF
 test_expect_success 'new info/exclude invalidates everything' '
 	avoid_racy &&
 	echo three >>.git/info/exclude &&
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
 A  done/one
 A  one
@@ -237,29 +305,32 @@ A  two
 ?? .gitignore
 ?? dtwo/
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 0
-gitignore invalidation: 1
-directory invalidation: 0
-opendir: 4
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:1
+ ....directory-invalidation:0
+ ....opendir:4
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 '
 
 test_expect_success 'verify untracked cache dump' '
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
-info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
-core.excludesfile 0000000000000000000000000000000000000000
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
+/ $(test_oid root) recurse valid
 .gitignore
 dtwo/
-/done/ 0000000000000000000000000000000000000000 recurse valid
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 	test_cmp ../expect ../actual
@@ -269,23 +340,24 @@ test_expect_success 'move two from tracked to untracked' '
 	git rm --cached two &&
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
-info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
-core.excludesfile 0000000000000000000000000000000000000000
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse
-/done/ 0000000000000000000000000000000000000000 recurse valid
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/ $(test_oid root) recurse
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 	test_cmp ../expect ../actual
 '
 
 test_expect_success 'status after the move' '
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
 A  done/one
 A  one
@@ -293,30 +365,33 @@ A  one
 ?? dtwo/
 ?? two
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 0
-gitignore invalidation: 0
-directory invalidation: 0
-opendir: 1
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:1
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 '
 
 test_expect_success 'verify untracked cache dump' '
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
-info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
-core.excludesfile 0000000000000000000000000000000000000000
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
+/ $(test_oid root) recurse valid
 .gitignore
 dtwo/
 two
-/done/ 0000000000000000000000000000000000000000 recurse valid
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 	test_cmp ../expect ../actual
@@ -326,23 +401,24 @@ test_expect_success 'move two from untracked to tracked' '
 	git add two &&
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
-info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
-core.excludesfile 0000000000000000000000000000000000000000
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse
-/done/ 0000000000000000000000000000000000000000 recurse valid
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/ $(test_oid root) recurse
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 	test_cmp ../expect ../actual
 '
 
 test_expect_success 'status after the move' '
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
 A  done/one
 A  one
@@ -350,29 +426,32 @@ A  two
 ?? .gitignore
 ?? dtwo/
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 0
-gitignore invalidation: 0
-directory invalidation: 0
-opendir: 1
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:1
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 '
 
 test_expect_success 'verify untracked cache dump' '
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
-info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
-core.excludesfile 0000000000000000000000000000000000000000
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
+/ $(test_oid root) recurse valid
 .gitignore
 dtwo/
-/done/ 0000000000000000000000000000000000000000 recurse valid
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 	test_cmp ../expect ../actual
@@ -387,36 +466,40 @@ test_expect_success 'set up for sparse checkout testing' '
 '
 
 test_expect_success 'status after commit' '
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
 ?? .gitignore
 ?? dtwo/
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 0
-gitignore invalidation: 0
-directory invalidation: 0
-opendir: 2
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:2
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 '
 
 test_expect_success 'untracked cache correct after commit' '
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
-info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
-core.excludesfile 0000000000000000000000000000000000000000
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
+/ $(test_oid root) recurse valid
 .gitignore
 dtwo/
-/done/ 0000000000000000000000000000000000000000 recurse valid
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/done/ $ZERO_OID recurse valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 	test_cmp ../expect ../actual
@@ -425,7 +508,7 @@ EOF
 test_expect_success 'set up sparse checkout' '
 	echo "done/[a-z]*" >.git/info/sparse-checkout &&
 	test_config core.sparsecheckout true &&
-	git checkout master &&
+	git checkout main &&
 	git update-index --force-untracked-cache &&
 	git status --porcelain >/dev/null && # prime the cache
 	test_path_is_missing done/.gitignore &&
@@ -443,40 +526,44 @@ test_expect_success 'create/modify files, some of which are gitignored' '
 '
 
 test_expect_success 'test sparse status with untracked cache' '
-	: >../trace &&
+	: >../trace.output &&
 	avoid_racy &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
  M done/two
 ?? .gitignore
 ?? done/five
 ?? dtwo/
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../status.actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 0
-gitignore invalidation: 1
-directory invalidation: 2
-opendir: 2
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:1
+ ....directory-invalidation:2
+ ....opendir:2
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 '
 
 test_expect_success 'untracked cache correct after status' '
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect <<EOF &&
-info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
-core.excludesfile 0000000000000000000000000000000000000000
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
+/ $(test_oid root) recurse valid
 .gitignore
 dtwo/
-/done/ 1946f0437f90c5005533cbe1736a6451ca301714 recurse valid
+/done/ $(test_oid done) recurse valid
 five
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 	test_cmp ../expect ../actual
@@ -484,23 +571,27 @@ EOF
 
 test_expect_success 'test sparse status again with untracked cache' '
 	avoid_racy &&
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
  M done/two
 ?? .gitignore
 ?? done/five
 ?? dtwo/
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../status.actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 0
-gitignore invalidation: 0
-directory invalidation: 0
-opendir: 0
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:0
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 '
 
 test_expect_success 'set up for test of subdir and sparse checkouts' '
@@ -511,9 +602,10 @@ test_expect_success 'set up for test of subdir and sparse checkouts' '
 
 test_expect_success 'test sparse status with untracked cache and subdir' '
 	avoid_racy &&
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
  M done/two
 ?? .gitignore
@@ -521,35 +613,38 @@ test_expect_success 'test sparse status with untracked cache and subdir' '
 ?? done/sub/
 ?? dtwo/
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../status.actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 2
-gitignore invalidation: 0
-directory invalidation: 1
-opendir: 3
+ ....path:
+ ....node-creation:2
+ ....gitignore-invalidation:0
+ ....directory-invalidation:1
+ ....opendir:3
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 '
 
 test_expect_success 'verify untracked cache dump (sparse/subdirs)' '
 	test-tool dump-untracked-cache >../actual &&
 	cat >../expect-from-test-dump <<EOF &&
-info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
-core.excludesfile 0000000000000000000000000000000000000000
+info/exclude $(test_oid exclude)
+core.excludesfile $ZERO_OID
 exclude_per_dir .gitignore
 flags 00000006
-/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
+/ $(test_oid root) recurse valid
 .gitignore
 dtwo/
-/done/ 1946f0437f90c5005533cbe1736a6451ca301714 recurse valid
+/done/ $(test_oid done) recurse valid
 five
 sub/
-/done/sub/ 0000000000000000000000000000000000000000 recurse check_only valid
+/done/sub/ $ZERO_OID recurse check_only valid
 sub/
-/done/sub/sub/ 0000000000000000000000000000000000000000 recurse check_only valid
+/done/sub/sub/ $ZERO_OID recurse check_only valid
 file
-/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
-/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
+/dthree/ $ZERO_OID recurse check_only valid
+/dtwo/ $ZERO_OID recurse check_only valid
 two
 EOF
 	test_cmp ../expect-from-test-dump ../actual
@@ -557,22 +652,27 @@ EOF
 
 test_expect_success 'test sparse status again with untracked cache and subdir' '
 	avoid_racy &&
-	: >../trace &&
-	GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
+	: >../trace.output &&
+	GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
 	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../status.actual &&
+	get_relevant_traces ../trace.output ../trace.relevant &&
 	cat >../trace.expect <<EOF &&
-node creation: 0
-gitignore invalidation: 0
-directory invalidation: 0
-opendir: 0
+ ....path:
+ ....node-creation:0
+ ....gitignore-invalidation:0
+ ....directory-invalidation:0
+ ....opendir:0
 EOF
-	test_cmp ../trace.expect ../trace
+	test_cmp ../trace.expect ../trace.relevant
 '
 
 test_expect_success 'move entry in subdir from untracked to cached' '
 	git add dtwo/two &&
 	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
  M done/two
 A  dtwo/two
@@ -580,12 +680,14 @@ A  dtwo/two
 ?? done/five
 ?? done/sub/
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../status.actual
 '
 
 test_expect_success 'move entry in subdir from cached to untracked' '
 	git rm --cached dtwo/two &&
 	git status --porcelain >../status.actual &&
+	iuc status --porcelain >../status.iuc &&
 	cat >../status.expect <<EOF &&
  M done/two
 ?? .gitignore
@@ -593,6 +695,7 @@ test_expect_success 'move entry in subdir from cached to untracked' '
 ?? done/sub/
 ?? dtwo/
 EOF
+	test_cmp ../status.expect ../status.iuc &&
 	test_cmp ../status.expect ../status.actual
 '
 
@@ -666,19 +769,19 @@ test_expect_success 'test ident field is working' '
 	cp -R done dthree dtwo four three ../other_worktree &&
 	GIT_WORK_TREE=../other_worktree git status 2>../err &&
 	echo "warning: untracked cache is disabled on this system or location" >../expect &&
-	test_i18ncmp ../expect ../err
+	test_cmp ../expect ../err
 '
 
 test_expect_success 'untracked cache survives a checkout' '
 	git commit --allow-empty -m empty &&
 	test-tool dump-untracked-cache >../before &&
-	test_when_finished  "git checkout master" &&
+	test_when_finished  "git checkout main" &&
 	git checkout -b other_branch &&
 	test-tool dump-untracked-cache >../after &&
 	test_cmp ../before ../after &&
 	test_commit test &&
 	test-tool dump-untracked-cache >../before &&
-	git checkout master &&
+	git checkout main &&
 	test-tool dump-untracked-cache >../after &&
 	test_cmp ../before ../after
 '
@@ -713,7 +816,7 @@ test_expect_success SYMLINKS '"status" after symlink replacement should be clean
 	git checkout HEAD~ &&
 	status_is_clean &&
 	status_is_clean &&
-	git checkout master &&
+	git checkout main &&
 	avoid_racy &&
 	status_is_clean &&
 	status_is_clean
@@ -724,7 +827,7 @@ test_expect_success SYMLINKS '"status" after symlink replacement should be clean
 	git checkout HEAD~ &&
 	status_is_clean &&
 	status_is_clean &&
-	git checkout master &&
+	git checkout main &&
 	avoid_racy &&
 	status_is_clean &&
 	status_is_clean
@@ -748,14 +851,14 @@ test_expect_success '"status" after file replacement should be clean with UC=tru
 	git checkout HEAD~ &&
 	status_is_clean &&
 	status_is_clean &&
-	git checkout master &&
+	git checkout main &&
 	avoid_racy &&
 	status_is_clean &&
 	test-tool dump-untracked-cache >../actual &&
 	grep -F "recurse valid" ../actual >../actual.grep &&
 	cat >../expect.grep <<EOF &&
-/ 0000000000000000000000000000000000000000 recurse valid
-/two/ 0000000000000000000000000000000000000000 recurse valid
+/ $ZERO_OID recurse valid
+/two/ $ZERO_OID recurse valid
 EOF
 	status_is_clean &&
 	test_cmp ../expect.grep ../actual.grep
@@ -766,7 +869,7 @@ test_expect_success '"status" after file replacement should be clean with UC=fal
 	git checkout HEAD~ &&
 	status_is_clean &&
 	status_is_clean &&
-	git checkout master &&
+	git checkout main &&
 	avoid_racy &&
 	status_is_clean &&
 	status_is_clean
diff --git a/t/t7064-wtstatus-pv2.sh b/t/t7064-wtstatus-pv2.sh
index 537787e598..eeb0534163 100755
--- a/t/t7064-wtstatus-pv2.sh
+++ b/t/t7064-wtstatus-pv2.sh
@@ -5,10 +5,14 @@ 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
 
 
 test_expect_success setup '
+	git checkout -f --orphan initial-branch &&
 	test_tick &&
 	git config core.autocrlf false &&
 	echo x >file_x &&
@@ -22,7 +26,7 @@ test_expect_success setup '
 test_expect_success 'before initial commit, nothing added, only untracked' '
 	cat >expect <<-EOF &&
 	# branch.oid (initial)
-	# branch.head master
+	# branch.head initial-branch
 	? actual
 	? dir1/
 	? expect
@@ -45,7 +49,7 @@ test_expect_success 'before initial commit, things added' '
 
 	cat >expect <<-EOF &&
 	# branch.oid (initial)
-	# branch.head master
+	# branch.head initial-branch
 	1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
 	1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
 	1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
@@ -62,7 +66,7 @@ test_expect_success 'before initial commit, things added' '
 test_expect_success 'before initial commit, things added (-z)' '
 	lf_to_nul >expect <<-EOF &&
 	# branch.oid (initial)
-	# branch.head master
+	# branch.head initial-branch
 	1 A. N... 000000 100644 100644 $ZERO_OID $OID_A dir1/file_a
 	1 A. N... 000000 100644 100644 $ZERO_OID $OID_B dir1/file_b
 	1 A. N... 000000 100644 100644 $ZERO_OID $OID_X file_x
@@ -81,7 +85,7 @@ test_expect_success 'make first commit, comfirm HEAD oid and branch' '
 	H0=$(git rev-parse HEAD) &&
 	cat >expect <<-EOF &&
 	# branch.oid $H0
-	# branch.head master
+	# branch.head initial-branch
 	? actual
 	? expect
 	EOF
@@ -98,7 +102,7 @@ test_expect_success 'after first commit, create unstaged changes' '
 
 	cat >expect <<-EOF &&
 	# branch.oid $H0
-	# branch.head master
+	# branch.head initial-branch
 	1 .M N... 100644 100644 100644 $OID_X $OID_X file_x
 	1 .D N... 100644 100644 000000 $OID_Z $OID_Z file_z
 	? actual
@@ -126,7 +130,7 @@ test_expect_success 'after first commit, stage existing changes' '
 
 	cat >expect <<-EOF &&
 	# branch.oid $H0
-	# branch.head master
+	# branch.head initial-branch
 	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
 	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
 	? actual
@@ -143,7 +147,7 @@ test_expect_success 'rename causes 2 path lines' '
 
 	q_to_tab >expect <<-EOF &&
 	# branch.oid $H0
-	# branch.head master
+	# branch.head initial-branch
 	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
 	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
 	2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
@@ -161,7 +165,7 @@ test_expect_success 'rename causes 2 path lines (-z)' '
 	## Lines use NUL path separator and line terminator, so double transform here.
 	q_to_nul <<-EOF | lf_to_nul >expect &&
 	# branch.oid $H0
-	# branch.head master
+	# branch.head initial-branch
 	1 M. N... 100644 100644 100644 $OID_X $OID_X1 file_x
 	1 D. N... 100644 000000 000000 $OID_Z $ZERO_OID file_z
 	2 R. N... 100644 100644 100644 $OID_Y $OID_Y R100 renamed_yQfile_y
@@ -179,7 +183,7 @@ test_expect_success 'make second commit, confirm clean and new HEAD oid' '
 
 	cat >expect <<-EOF &&
 	# branch.oid $H1
-	# branch.head master
+	# branch.head initial-branch
 	? actual
 	? expect
 	EOF
@@ -231,7 +235,7 @@ test_expect_success 'create and commit permanent ignore file' '
 
 	cat >expect <<-EOF &&
 	# branch.oid $H1
-	# branch.head master
+	# branch.head initial-branch
 	EOF
 
 	git status --porcelain=v2 --branch >actual &&
@@ -257,14 +261,14 @@ test_expect_success 'verify --intent-to-add output' '
 test_expect_success 'verify AA (add-add) conflict' '
 	test_when_finished "git reset --hard" &&
 
-	git branch AA_A master &&
+	git branch AA_A initial-branch &&
 	git checkout AA_A &&
 	echo "Branch AA_A" >conflict.txt &&
 	OID_AA_A=$(git hash-object -t blob -- conflict.txt) &&
 	git add conflict.txt &&
 	git commit -m "branch aa_a" &&
 
-	git branch AA_B master &&
+	git branch AA_B initial-branch &&
 	git checkout AA_B &&
 	echo "Branch AA_B" >conflict.txt &&
 	OID_AA_B=$(git hash-object -t blob -- conflict.txt) &&
@@ -290,7 +294,7 @@ test_expect_success 'verify AA (add-add) conflict' '
 test_expect_success 'verify UU (edit-edit) conflict' '
 	test_when_finished "git reset --hard" &&
 
-	git branch UU_ANC master &&
+	git branch UU_ANC initial-branch &&
 	git checkout UU_ANC &&
 	echo "Ancestor" >conflict.txt &&
 	OID_UU_ANC=$(git hash-object -t blob -- conflict.txt) &&
@@ -328,18 +332,18 @@ test_expect_success 'verify UU (edit-edit) conflict' '
 '
 
 test_expect_success 'verify upstream fields in branch header' '
-	git checkout master &&
+	git checkout initial-branch &&
 	test_when_finished "rm -rf sub_repo" &&
 	git clone . sub_repo &&
 	(
-		## Confirm local master tracks remote master.
+		## Confirm local initial-branch tracks remote initial-branch.
 		cd sub_repo &&
 		HUF=$(git rev-parse HEAD) &&
 
 		cat >expect <<-EOF &&
 		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +0 -0
 		EOF
 
@@ -355,8 +359,8 @@ test_expect_success 'verify upstream fields in branch header' '
 
 		cat >expect <<-EOF &&
 		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +1 -0
 		EOF
 
@@ -367,19 +371,16 @@ test_expect_success 'verify upstream fields in branch header' '
 		git status --porcelain=v2 --untracked-files=all >actual &&
 		test_must_be_empty actual &&
 
-		## Test upstream-gone case. Fake this by pointing origin/master at
-		## a non-existing commit.
-		OLD=$(git rev-parse origin/master) &&
-		NEW=$ZERO_OID &&
-		mv .git/packed-refs .git/old-packed-refs &&
-		sed "s/$OLD/$NEW/g" <.git/old-packed-refs >.git/packed-refs &&
+		## Test upstream-gone case. Fake this by pointing
+		## origin/initial-branch at a non-existing commit.
+		git update-ref -d refs/remotes/origin/initial-branch &&
 
 		HUF=$(git rev-parse HEAD) &&
 
 		cat >expect <<-EOF &&
 		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		EOF
 
 		git status --porcelain=v2 --branch --untracked-files=all >actual &&
@@ -388,19 +389,19 @@ test_expect_success 'verify upstream fields in branch header' '
 '
 
 test_expect_success 'verify --[no-]ahead-behind with V2 format' '
-	git checkout master &&
+	git checkout initial-branch &&
 	test_when_finished "rm -rf sub_repo" &&
 	git clone . sub_repo &&
 	(
-		## Confirm local master tracks remote master.
+		## Confirm local initial-branch tracks remote initial-branch.
 		cd sub_repo &&
 		HUF=$(git rev-parse HEAD) &&
 
 		# Confirm --no-ahead-behind reports traditional branch.ab with 0/0 for equal branches.
 		cat >expect <<-EOF &&
 		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +0 -0
 		EOF
 
@@ -410,8 +411,8 @@ test_expect_success 'verify --[no-]ahead-behind with V2 format' '
 		# Confirm --ahead-behind reports traditional branch.ab with 0/0.
 		cat >expect <<-EOF &&
 		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +0 -0
 		EOF
 
@@ -428,8 +429,8 @@ test_expect_success 'verify --[no-]ahead-behind with V2 format' '
 		# Confirm --no-ahead-behind reports branch.ab with ?/? for non-equal branches.
 		cat >expect <<-EOF &&
 		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +? -?
 		EOF
 
@@ -439,8 +440,8 @@ test_expect_success 'verify --[no-]ahead-behind with V2 format' '
 		# Confirm --ahead-behind reports traditional branch.ab with 1/0.
 		cat >expect <<-EOF &&
 		# branch.oid $HUF
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +1 -0
 		EOF
 
@@ -458,7 +459,7 @@ test_expect_success 'verify --[no-]ahead-behind with V2 format' '
 '
 
 test_expect_success 'create and add submodule, submodule appears clean (A. S...)' '
-	git checkout master &&
+	git checkout initial-branch &&
 	git clone . sub_repo &&
 	git clone . super_repo &&
 	(	cd super_repo &&
@@ -471,8 +472,8 @@ test_expect_success 'create and add submodule, submodule appears clean (A. S...)
 
 		cat >expect <<-EOF &&
 		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +0 -0
 		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
 		1 A. S... 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -496,8 +497,8 @@ test_expect_success 'untracked changes in added submodule (AM S..U)' '
 
 		cat >expect <<-EOF &&
 		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +0 -0
 		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
 		1 AM S..U 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -521,8 +522,8 @@ test_expect_success 'staged changes in added submodule (AM S.M.)' '
 
 		cat >expect <<-EOF &&
 		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +0 -0
 		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
 		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -548,8 +549,8 @@ test_expect_success 'staged and unstaged changes in added (AM S.M.)' '
 
 		cat >expect <<-EOF &&
 		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +0 -0
 		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
 		1 AM S.M. 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -575,8 +576,8 @@ test_expect_success 'staged and untracked changes in added submodule (AM S.MU)'
 
 		cat >expect <<-EOF &&
 		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +0 -0
 		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
 		1 AM S.MU 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -602,8 +603,8 @@ test_expect_success 'commit within the submodule appears as new commit in super
 
 		cat >expect <<-EOF &&
 		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +0 -0
 		1 A. N... 000000 100644 100644 $ZERO_OID $HMOD .gitmodules
 		1 AM SC.. 000000 160000 160000 $ZERO_OID $HSUB sub1
@@ -625,8 +626,8 @@ test_expect_success 'stage submodule in super and commit' '
 
 		cat >expect <<-EOF &&
 		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +1 -0
 		EOF
 
@@ -646,8 +647,8 @@ test_expect_success 'make unstaged changes in existing submodule (.M S.M.)' '
 
 		cat >expect <<-EOF &&
 		# branch.oid $HSUP
-		# branch.head master
-		# branch.upstream origin/master
+		# branch.head initial-branch
+		# branch.upstream origin/initial-branch
 		# branch.ab +1 -0
 		1 .M S.M. 160000 160000 160000 $HSUB $HSUB sub1
 		EOF
diff --git a/t/t7101-reset-empty-subdirs.sh b/t/t7101-reset-empty-subdirs.sh
index 96e163f084..bfce05ac5d 100755
--- a/t/t7101-reset-empty-subdirs.sh
+++ b/t/t7101-reset-empty-subdirs.sh
@@ -6,16 +6,15 @@
 test_description='git reset should cull empty subdirs'
 . ./test-lib.sh
 
-test_expect_success \
-    'creating initial files' \
-    'mkdir path0 &&
+test_expect_success 'creating initial files' '
+     mkdir path0 &&
      cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
      git add path0/COPYING &&
-     git commit -m add -a'
+     git commit -m add -a
+'
 
-test_expect_success \
-    'creating second files' \
-    'mkdir path1 &&
+test_expect_success 'creating second files' '
+     mkdir path1 &&
      mkdir path1/path2 &&
      cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
      cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
@@ -25,39 +24,40 @@ test_expect_success \
      git add path1/COPYING &&
      git add COPYING &&
      git add path0/COPYING-TOO &&
-     git commit -m change -a'
+     git commit -m change -a
+'
 
-test_expect_success \
-    'resetting tree HEAD^' \
-    'git reset --hard HEAD^'
+test_expect_success 'resetting tree HEAD^' '
+     git reset --hard HEAD^
+'
 
-test_expect_success \
-    'checking initial files exist after rewind' \
-    'test -d path0 &&
-     test -f path0/COPYING'
+test_expect_success 'checking initial files exist after rewind' '
+     test -d path0 &&
+     test -f path0/COPYING
+'
 
-test_expect_success \
-    'checking lack of path1/path2/COPYING' \
-    '! test -f path1/path2/COPYING'
+test_expect_success 'checking lack of path1/path2/COPYING' '
+    ! test -f path1/path2/COPYING
+'
 
-test_expect_success \
-    'checking lack of path1/COPYING' \
-    '! test -f path1/COPYING'
+test_expect_success 'checking lack of path1/COPYING' '
+    ! test -f path1/COPYING
+'
 
-test_expect_success \
-    'checking lack of COPYING' \
-    '! test -f COPYING'
+test_expect_success 'checking lack of COPYING' '
+     ! test -f COPYING
+'
 
-test_expect_success \
-    'checking checking lack of path1/COPYING-TOO' \
-    '! test -f path0/COPYING-TOO'
+test_expect_success 'checking checking lack of path1/COPYING-TOO' '
+     ! test -f path0/COPYING-TOO
+'
 
-test_expect_success \
-    'checking lack of path1/path2' \
-    '! test -d path1/path2'
+test_expect_success 'checking lack of path1/path2' '
+     ! test -d path1/path2
+'
 
-test_expect_success \
-    'checking lack of path1' \
-    '! test -d path1'
+test_expect_success 'checking lack of path1' '
+     ! test -d path1
+'
 
 test_done
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 97be0d968d..601b2bf97f 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -7,6 +7,9 @@ test_description='git reset
 
 Documented tests for git reset'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 commit_msg () {
@@ -37,17 +40,23 @@ test_expect_success 'creating initial files and commits' '
 
 	echo "2nd line 1st file" >>first &&
 	git commit -a -m "modify 1st file" &&
+	head5p2=$(git rev-parse --verify HEAD) &&
+	head5p2f=$(git rev-parse --short HEAD:first) &&
 
 	git rm first &&
 	git mv second secondfile &&
 	git commit -a -m "remove 1st and rename 2nd" &&
+	head5p1=$(git rev-parse --verify HEAD) &&
+	head5p1s=$(git rev-parse --short HEAD:secondfile) &&
 
 	echo "1st line 2nd file" >secondfile &&
 	echo "2nd line 2nd file" >>secondfile &&
 	# "git commit -m" would break MinGW, as Windows refuse to pass
 	# $test_encoding encoded parameter to git.
 	commit_msg $test_encoding | git -c "i18n.commitEncoding=$test_encoding" commit -a -F - &&
-	head5=$(git rev-parse --verify HEAD)
+	head5=$(git rev-parse --verify HEAD) &&
+	head5s=$(git rev-parse --short HEAD:secondfile) &&
+	head5sl=$(git rev-parse HEAD:secondfile)
 '
 # git log --pretty=oneline # to see those SHA1 involved
 
@@ -64,27 +73,27 @@ check_changes () {
 
 test_expect_success 'reset --hard message' '
 	hex=$(git log -1 --format="%h") &&
-	git reset --hard > .actual &&
-	echo HEAD is now at $hex $(commit_msg) > .expected &&
-	test_i18ncmp .expected .actual
+	git reset --hard >.actual &&
+	echo HEAD is now at $hex $(commit_msg) >.expected &&
+	test_cmp .expected .actual
 '
 
 test_expect_success 'reset --hard message (ISO8859-1 logoutputencoding)' '
 	hex=$(git log -1 --format="%h") &&
-	git -c "i18n.logOutputEncoding=$test_encoding" reset --hard > .actual &&
-	echo HEAD is now at $hex $(commit_msg $test_encoding) > .expected &&
-	test_i18ncmp .expected .actual
+	git -c "i18n.logOutputEncoding=$test_encoding" reset --hard >.actual &&
+	echo HEAD is now at $hex $(commit_msg $test_encoding) >.expected &&
+	test_cmp .expected .actual
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
-
 test_expect_success 'giving a non existing revision should fail' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
+
 	test_must_fail git reset aaaaaa &&
 	test_must_fail git reset --mixed aaaaaa &&
 	test_must_fail git reset --soft aaaaaa &&
@@ -94,15 +103,14 @@ test_expect_success 'giving a non existing revision should fail' '
 
 test_expect_success 'reset --soft with unmerged index should fail' '
 	touch .git/MERGE_HEAD &&
-	echo "100644 44c5b5884550c17758737edcced463447b91d42b 1	un" |
+	echo "100644 $head5sl 1	un" |
 		git update-index --index-info &&
 	test_must_fail git reset --soft HEAD &&
 	rm .git/MERGE_HEAD &&
 	git rm --cached -- un
 '
 
-test_expect_success \
-	'giving paths with options different than --mixed should fail' '
+test_expect_success 'giving paths with options different than --mixed should fail' '
 	test_must_fail git reset --soft -- first &&
 	test_must_fail git reset --hard -- first &&
 	test_must_fail git reset --soft HEAD^ -- first &&
@@ -122,8 +130,7 @@ test_expect_success 'giving unrecognized options should fail' '
 	check_changes $head5
 '
 
-test_expect_success \
-	'trying to do reset --soft with pending merge should fail' '
+test_expect_success 'trying to do reset --soft with pending merge should fail' '
 	git branch branch1 &&
 	git branch branch2 &&
 
@@ -141,13 +148,12 @@ test_expect_success \
 	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
 	git commit -a -m "the change in branch2" &&
 
-	git checkout master &&
+	git checkout main &&
 	git branch -D branch1 branch2 &&
 	check_changes $head5
 '
 
-test_expect_success \
-	'trying to do reset --soft with pending checkout merge should fail' '
+test_expect_success 'trying to do reset --soft with pending checkout merge should fail' '
 	git branch branch3 &&
 	git branch branch4 &&
 
@@ -164,13 +170,12 @@ test_expect_success \
 	printf "1st line 2nd file\n2nd line 2nd file\n3rd line" >secondfile &&
 	git commit -a -m "the line in branch3" &&
 
-	git checkout master &&
+	git checkout main &&
 	git branch -D branch3 branch4 &&
 	check_changes $head5
 '
 
-test_expect_success \
-	'resetting to HEAD with no changes should succeed and do nothing' '
+test_expect_success 'resetting to HEAD with no changes should succeed and do nothing' '
 	git reset --hard &&
 		check_changes $head5 &&
 	git reset --hard HEAD &&
@@ -189,39 +194,38 @@ test_expect_success \
 		check_changes $head5
 '
 
->.diff_expect
-cat >.cached_expect <<EOF
-diff --git a/secondfile b/secondfile
-index 1bbba79..44c5b58 100644
---- a/secondfile
-+++ b/secondfile
-@@ -1 +1,2 @@
--2nd file
-+1st line 2nd file
-+2nd line 2nd file
-EOF
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
 test_expect_success '--soft reset only should show changes in diff --cached' '
+	>.diff_expect &&
+	cat >.cached_expect <<-EOF &&
+	diff --git a/secondfile b/secondfile
+	index $head5p1s..$head5s 100644
+	--- a/secondfile
+	+++ b/secondfile
+	@@ -1 +1,2 @@
+	-2nd file
+	+1st line 2nd file
+	+2nd line 2nd file
+	EOF
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 	git reset --soft HEAD^ &&
-	check_changes d1a4bc3abce4829628ae2dcb0d60ef3d1a78b1c4 &&
+	check_changes $head5p1 &&
 	test "$(git rev-parse ORIG_HEAD)" = \
 			$head5
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-3rd line 2nd file
-EOF
-test_expect_success \
-	'changing files and redo the last commit should succeed' '
+test_expect_success 'changing files and redo the last commit should succeed' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	3rd line 2nd file
+	EOF
 	echo "3rd line 2nd file" >>secondfile &&
 	git commit -a -C ORIG_HEAD &&
 	head4=$(git rev-parse --verify HEAD) &&
@@ -230,106 +234,102 @@ test_expect_success \
 			$head5
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-first:
-1st file
-2nd line 1st file
-second:
-2nd file
-EOF
-test_expect_success \
-	'--hard reset should change the files and undo commits permanently' '
+test_expect_success '--hard reset should change the files and undo commits permanently' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	first:
+	1st file
+	2nd line 1st file
+	second:
+	2nd file
+	EOF
 	git reset --hard HEAD~2 &&
-	check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
+	check_changes $head5p2 &&
 	test "$(git rev-parse ORIG_HEAD)" = \
 			$head4
 '
 
->.diff_expect
-cat >.cached_expect <<EOF
-diff --git a/first b/first
-deleted file mode 100644
-index 8206c22..0000000
---- a/first
-+++ /dev/null
-@@ -1,2 +0,0 @@
--1st file
--2nd line 1st file
-diff --git a/second b/second
-deleted file mode 100644
-index 1bbba79..0000000
---- a/second
-+++ /dev/null
-@@ -1 +0,0 @@
--2nd file
-diff --git a/secondfile b/secondfile
-new file mode 100644
-index 0000000..44c5b58
---- /dev/null
-+++ b/secondfile
-@@ -0,0 +1,2 @@
-+1st line 2nd file
-+2nd line 2nd file
-EOF
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
-test_expect_success \
-	'redoing changes adding them without commit them should succeed' '
+test_expect_success 'redoing changes adding them without commit them should succeed' '
+	>.diff_expect &&
+	cat >.cached_expect <<-EOF &&
+	diff --git a/first b/first
+	deleted file mode 100644
+	index $head5p2f..0000000
+	--- a/first
+	+++ /dev/null
+	@@ -1,2 +0,0 @@
+	-1st file
+	-2nd line 1st file
+	diff --git a/second b/second
+	deleted file mode 100644
+	index $head5p1s..0000000
+	--- a/second
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2nd file
+	diff --git a/secondfile b/secondfile
+	new file mode 100644
+	index 0000000..$head5s
+	--- /dev/null
+	+++ b/secondfile
+	@@ -0,0 +1,2 @@
+	+1st line 2nd file
+	+2nd line 2nd file
+	EOF
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 	git rm first &&
 	git mv second secondfile &&
 
 	echo "1st line 2nd file" >secondfile &&
 	echo "2nd line 2nd file" >>secondfile &&
 	git add secondfile &&
-	check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e
+	check_changes $head5p2
 '
 
-cat >.diff_expect <<EOF
-diff --git a/first b/first
-deleted file mode 100644
-index 8206c22..0000000
---- a/first
-+++ /dev/null
-@@ -1,2 +0,0 @@
--1st file
--2nd line 1st file
-diff --git a/second b/second
-deleted file mode 100644
-index 1bbba79..0000000
---- a/second
-+++ /dev/null
-@@ -1 +0,0 @@
--2nd file
-EOF
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
 test_expect_success '--mixed reset to HEAD should unadd the files' '
+	cat >.diff_expect <<-EOF &&
+	diff --git a/first b/first
+	deleted file mode 100644
+	index $head5p2f..0000000
+	--- a/first
+	+++ /dev/null
+	@@ -1,2 +0,0 @@
+	-1st file
+	-2nd line 1st file
+	diff --git a/second b/second
+	deleted file mode 100644
+	index $head5p1s..0000000
+	--- a/second
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2nd file
+	EOF
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 	git reset &&
-	check_changes ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
-	test "$(git rev-parse ORIG_HEAD)" = \
-			ddaefe00f1da16864591c61fdc7adb5d7cd6b74e
+	check_changes $head5p2 &&
+	test "$(git rev-parse ORIG_HEAD)" = $head5p2
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
 test_expect_success 'redoing the last two commits should succeed' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 	git add secondfile &&
-	git reset --hard ddaefe00f1da16864591c61fdc7adb5d7cd6b74e &&
-
+	git reset --hard $head5p2 &&
 	git rm first &&
 	git mv second secondfile &&
 	git commit -a -m "remove 1st and rename 2nd" &&
@@ -342,15 +342,15 @@ test_expect_success 'redoing the last two commits should succeed' '
 	check_changes $head5
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-3rd line in branch2
-EOF
 test_expect_success '--hard reset to HEAD should clear a failed merge' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	3rd line in branch2
+	EOF
 	git branch branch1 &&
 	git branch branch2 &&
 
@@ -368,15 +368,14 @@ test_expect_success '--hard reset to HEAD should clear a failed merge' '
 	check_changes $head3
 '
 
->.diff_expect
->.cached_expect
-cat >.cat_expect <<EOF
-secondfile:
-1st line 2nd file
-2nd line 2nd file
-EOF
-test_expect_success \
-	'--hard reset to ORIG_HEAD should clear a fast-forward merge' '
+test_expect_success '--hard reset to ORIG_HEAD should clear a fast-forward merge' '
+	>.diff_expect &&
+	>.cached_expect &&
+	cat >.cat_expect <<-\EOF &&
+	secondfile:
+	1st line 2nd file
+	2nd line 2nd file
+	EOF
 	git reset --hard HEAD^ &&
 	check_changes $head5 &&
 
@@ -384,57 +383,64 @@ test_expect_success \
 	git reset --hard ORIG_HEAD &&
 	check_changes $head5 &&
 
-	git checkout master &&
+	git checkout main &&
 	git branch -D branch1 branch2 &&
 	check_changes $head5
 '
 
-cat > expect << EOF
-diff --git a/file1 b/file1
-index d00491f..7ed6ff8 100644
---- a/file1
-+++ b/file1
-@@ -1 +1 @@
--1
-+5
-diff --git a/file2 b/file2
-deleted file mode 100644
-index 0cfbf08..0000000
---- a/file2
-+++ /dev/null
-@@ -1 +0,0 @@
--2
-EOF
-cat > cached_expect << EOF
-diff --git a/file4 b/file4
-new file mode 100644
-index 0000000..b8626c4
---- /dev/null
-+++ b/file4
-@@ -0,0 +1 @@
-+4
-EOF
 test_expect_success 'test --mixed <paths>' '
-	echo 1 > file1 &&
-	echo 2 > file2 &&
+	echo 1 >file1 &&
+	echo 2 >file2 &&
 	git add file1 file2 &&
 	test_tick &&
 	git commit -m files &&
+	before1=$(git rev-parse --short HEAD:file1) &&
+	before2=$(git rev-parse --short HEAD:file2) &&
 	git rm file2 &&
-	echo 3 > file3 &&
-	echo 4 > file4 &&
-	echo 5 > file1 &&
+	echo 3 >file3 &&
+	echo 4 >file4 &&
+	echo 5 >file1 &&
+	after1=$(git rev-parse --short $(git hash-object file1)) &&
+	after4=$(git rev-parse --short $(git hash-object file4)) &&
 	git add file1 file3 file4 &&
 	git reset HEAD -- file1 file2 file3 &&
 	test_must_fail git diff --quiet &&
-	git diff > output &&
+	git diff >output &&
+
+	cat >expect <<-EOF &&
+	diff --git a/file1 b/file1
+	index $before1..$after1 100644
+	--- a/file1
+	+++ b/file1
+	@@ -1 +1 @@
+	-1
+	+5
+	diff --git a/file2 b/file2
+	deleted file mode 100644
+	index $before2..0000000
+	--- a/file2
+	+++ /dev/null
+	@@ -1 +0,0 @@
+	-2
+	EOF
+
 	test_cmp expect output &&
-	git diff --cached > output &&
+	git diff --cached >output &&
+
+	cat >cached_expect <<-EOF &&
+	diff --git a/file4 b/file4
+	new file mode 100644
+	index 0000000..$after4
+	--- /dev/null
+	+++ b/file4
+	@@ -0,0 +1 @@
+	+4
+	EOF
+
 	test_cmp cached_expect output
 '
 
 test_expect_success 'test resetting the index at give paths' '
-
 	mkdir sub &&
 	>sub/file1 &&
 	>sub/file2 &&
@@ -447,7 +453,6 @@ test_expect_success 'test resetting the index at give paths' '
 	echo "$U" &&
 	test_must_fail git diff-index --cached --exit-code "$T" &&
 	test "$T" != "$U"
-
 '
 
 test_expect_success 'resetting an unmodified path is a no-op' '
@@ -457,15 +462,14 @@ test_expect_success 'resetting an unmodified path is a no-op' '
 	git diff-index --cached --exit-code HEAD
 '
 
-cat > expect << EOF
-Unstaged changes after reset:
-M	file2
-EOF
-
 test_expect_success '--mixed refreshes the index' '
-	echo 123 >> file2 &&
-	git reset --mixed HEAD > output &&
-	test_i18ncmp expect output
+	cat >expect <<-\EOF &&
+	Unstaged changes after reset:
+	M	file2
+	EOF
+	echo 123 >>file2 &&
+	git reset --mixed HEAD >output &&
+	test_cmp expect output
 '
 
 test_expect_success 'resetting specific path that is unmerged' '
@@ -485,7 +489,6 @@ test_expect_success 'resetting specific path that is unmerged' '
 '
 
 test_expect_success 'disambiguation (1)' '
-
 	git reset --hard &&
 	>secondfile &&
 	git add secondfile &&
@@ -494,11 +497,9 @@ test_expect_success 'disambiguation (1)' '
 	test -z "$(git diff --cached --name-only)" &&
 	test -f secondfile &&
 	test_must_be_empty secondfile
-
 '
 
 test_expect_success 'disambiguation (2)' '
-
 	git reset --hard &&
 	>secondfile &&
 	git add secondfile &&
@@ -506,11 +507,9 @@ test_expect_success 'disambiguation (2)' '
 	test_must_fail git reset secondfile &&
 	test -n "$(git diff --cached --name-only -- secondfile)" &&
 	test ! -f secondfile
-
 '
 
 test_expect_success 'disambiguation (3)' '
-
 	git reset --hard &&
 	>secondfile &&
 	git add secondfile &&
@@ -519,11 +518,9 @@ test_expect_success 'disambiguation (3)' '
 	test_must_fail git diff --quiet &&
 	test -z "$(git diff --cached --name-only)" &&
 	test ! -f secondfile
-
 '
 
 test_expect_success 'disambiguation (4)' '
-
 	git reset --hard &&
 	>secondfile &&
 	git add secondfile &&
diff --git a/t/t7104-reset-hard.sh b/t/t7104-reset-hard.sh
index 16faa07813..7948ec392b 100755
--- a/t/t7104-reset-hard.sh
+++ b/t/t7104-reset-hard.sh
@@ -33,7 +33,7 @@ test_expect_success 'reset --hard should restore unmerged ones' '
 
 '
 
-test_expect_success 'reset --hard did not corrupt index or cached-tree' '
+test_expect_success 'reset --hard did not corrupt index or cache-tree' '
 
 	T=$(git write-tree) &&
 	rm -f .git/index &&
diff --git a/t/t7105-reset-patch.sh b/t/t7105-reset-patch.sh
index bd10a96727..fc2a6cf5c7 100755
--- a/t/t7105-reset-patch.sh
+++ b/t/t7105-reset-patch.sh
@@ -38,6 +38,27 @@ test_expect_success PERL 'git reset -p HEAD^' '
 	test_i18ngrep "Apply" output
 '
 
+test_expect_success PERL 'git reset -p HEAD^^{tree}' '
+	test_write_lines n y | git reset -p HEAD^^{tree} >output &&
+	verify_state dir/foo work parent &&
+	verify_saved_state bar &&
+	test_i18ngrep "Apply" output
+'
+
+test_expect_success PERL 'git reset -p HEAD^:dir/foo (blob fails)' '
+	set_and_save_state dir/foo work work &&
+	test_must_fail git reset -p HEAD^:dir/foo &&
+	verify_saved_state dir/foo &&
+	verify_saved_state bar
+'
+
+test_expect_success PERL 'git reset -p aaaaaaaa (unknown fails)' '
+	set_and_save_state dir/foo work work &&
+	test_must_fail git reset -p aaaaaaaa &&
+	verify_saved_state dir/foo &&
+	verify_saved_state bar
+'
+
 # The idea in the rest is that bar sorts first, so we always say 'y'
 # first and if the path limiter fails it'll apply to bar instead of
 # dir/foo.  There's always an extra 'n' to reject edits to dir/foo in
diff --git a/t/t7107-reset-pathspec-file.sh b/t/t7107-reset-pathspec-file.sh
new file mode 100755
index 0000000000..15ccb14f7e
--- /dev/null
+++ b/t/t7107-reset-pathspec-file.sh
@@ -0,0 +1,178 @@
+#!/bin/sh
+
+test_description='reset --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+	git add . &&
+	git commit --include . -m "Commit" &&
+	git tag checkpoint
+'
+
+restore_checkpoint () {
+	git reset --hard checkpoint
+}
+
+verify_expect () {
+	git status --porcelain -- fileA.t fileB.t fileC.t fileD.t >actual &&
+	if test "x$1" = 'x!'
+	then
+		! test_cmp expect actual
+	else
+		test_cmp expect actual
+	fi
+}
+
+test_expect_success '--pathspec-from-file from stdin' '
+	restore_checkpoint &&
+
+	git rm fileA.t &&
+	echo fileA.t | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success '--pathspec-from-file from file' '
+	restore_checkpoint &&
+
+	git rm fileA.t &&
+	echo fileA.t >list &&
+	git reset --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'NUL delimiters' '
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\0fileB.t\0" | git reset --pathspec-from-file=- --pathspec-file-nul &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'LF delimiters' '
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\nfileB.t\n" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'no trailing delimiter' '
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\nfileB.t" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'CRLF delimiters' '
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t &&
+	printf "fileA.t\r\nfileB.t\r\n" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	 D fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git rm fileA.t &&
+	git reset --pathspec-from-file=list &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes not compatible with --pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	# Note: "git reset" has not yet learned to fail on wrong pathspecs
+	git reset --pathspec-from-file=list --pathspec-file-nul &&
+
+	cat >expect <<-\EOF &&
+	 D fileA.t
+	EOF
+	verify_expect !
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	git rm fileA.t fileB.t fileC.t fileD.t &&
+	printf "fileB.t\nfileC.t\n" | git reset --pathspec-from-file=- &&
+
+	cat >expect <<-\EOF &&
+	D  fileA.t
+	 D fileB.t
+	 D fileC.t
+	D  fileD.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	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_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_must_fail git reset --pathspec-file-nul 2>err &&
+	test_i18ngrep -e "--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 &&
+
+	test_must_fail git reset --hard --pathspec-from-file=list 2>err &&
+	test_i18ngrep -e "fatal: Cannot do hard reset with paths" err
+'
+
+test_done
diff --git a/t/t7112-reset-submodule.sh b/t/t7112-reset-submodule.sh
index a1cb9ff858..19830d9036 100755
--- a/t/t7112-reset-submodule.sh
+++ b/t/t7112-reset-submodule.sh
@@ -5,7 +5,6 @@ test_description='reset can handle submodules'
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-submodule-update.sh
 
-KNOWN_FAILURE_SUBMODULE_RECURSIVE_NESTED=1
 KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS=1
 KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED=1
 
@@ -13,10 +12,10 @@ test_submodule_switch_recursing_with_args "reset --keep"
 
 test_submodule_forced_switch_recursing_with_args "reset --hard"
 
-test_submodule_switch "git reset --keep"
+test_submodule_switch "reset --keep"
 
-test_submodule_switch "git reset --merge"
+test_submodule_switch "reset --merge"
 
-test_submodule_forced_switch "git reset --hard"
+test_submodule_forced_switch "reset --hard"
 
 test_done
diff --git a/t/t7113-post-index-change-hook.sh b/t/t7113-post-index-change-hook.sh
index f011ad7eec..688fa995c9 100755
--- a/t/t7113-post-index-change-hook.sh
+++ b/t/t7113-post-index-change-hook.sh
@@ -2,6 +2,9 @@
 
 test_description='post index change hook'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -85,7 +88,7 @@ test_expect_success 'test checkout and reset trigger the hook' '
 	EOF
 	: force index to be dirty &&
 	test-tool chmtime +60 dir1/file1.txt &&
-	git checkout master &&
+	git checkout main &&
 	test_path_is_file testsuccess && rm -f testsuccess &&
 	test_path_is_missing testfailure &&
 	test-tool chmtime +60 dir1/file1.txt &&
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index b696bae5f5..7f6e23a4bb 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -5,10 +5,10 @@
 
 test_description='git checkout tests.
 
-Creates master, forks renamer and side branches from it.
+Creates main, forks renamer and side branches from it.
 Test switching across them.
 
-  ! [master] Initial A one, A two
+  ! [main] Initial A one, A two
    * [renamer] Renamer R one->uno, M two
     ! [side] Side M one, D two, A three
      ! [simple] Simple D one, M two
@@ -16,10 +16,13 @@ Test switching across them.
      + [simple] Simple D one, M two
     +  [side] Side M one, D two, A three
    *   [renamer] Renamer R one->uno, M two
-  +*++ [master] Initial A one, A two
+  +*++ [main] Initial A one, A two
 
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_tick
@@ -33,8 +36,7 @@ fill () {
 
 
 test_expect_success setup '
-
-	fill x y z > same &&
+	fill x y z >same &&
 	fill 1 2 3 4 5 6 7 8 >one &&
 	fill a b c d e >two &&
 	git add same one two &&
@@ -47,32 +49,30 @@ test_expect_success setup '
 	fill a b c d e f >two &&
 	git commit -a -m "Renamer R one->uno, M two" &&
 
-	git checkout -b side master &&
+	git checkout -b side main &&
 	fill 1 2 3 4 5 6 7 >one &&
 	fill A B C D E >three &&
 	rm -f two &&
 	git update-index --add --remove one two three &&
 	git commit -m "Side M one, D two, A three" &&
 
-	git checkout -b simple master &&
+	git checkout -b simple main &&
 	rm -f one &&
-	fill a c e > two &&
+	fill a c e >two &&
 	git commit -a -m "Simple D one, M two" &&
 
-	git checkout master
+	git checkout main
 '
 
-test_expect_success "checkout from non-existing branch" '
-
-	git checkout -b delete-me master &&
+test_expect_success 'checkout from non-existing branch' '
+	git checkout -b delete-me main &&
 	git update-ref -d --no-deref refs/heads/delete-me &&
 	test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
-	git checkout master &&
-	test refs/heads/master = "$(git symbolic-ref HEAD)"
+	git checkout main &&
+	test refs/heads/main = "$(git symbolic-ref HEAD)"
 '
 
-test_expect_success "checkout with dirty tree without -m" '
-
+test_expect_success 'checkout with dirty tree without -m' '
 	fill 0 1 2 3 4 5 6 7 8 >one &&
 	if git checkout side
 	then
@@ -81,12 +81,10 @@ test_expect_success "checkout with dirty tree without -m" '
 	else
 		echo "happy - failed correctly"
 	fi
-
 '
 
-test_expect_success "checkout with unrelated dirty tree without -m" '
-
-	git checkout -f master &&
+test_expect_success 'checkout with unrelated dirty tree without -m' '
+	git checkout -f main &&
 	fill 0 1 2 3 4 5 6 7 8 >same &&
 	cp same kept &&
 	git checkout side >messages &&
@@ -95,22 +93,21 @@ test_expect_success "checkout with unrelated dirty tree without -m" '
 	test_cmp messages.expect messages
 '
 
-test_expect_success "checkout -m with dirty tree" '
-
-	git checkout -f master &&
+test_expect_success 'checkout -m with dirty tree' '
+	git checkout -f main &&
 	git clean -f &&
 
 	fill 0 1 2 3 4 5 6 7 8 >one &&
-	git checkout -m side > messages &&
+	git checkout -m side >messages &&
 
 	test "$(git symbolic-ref HEAD)" = "refs/heads/side" &&
 
 	printf "M\t%s\n" one >expect.messages &&
 	test_cmp expect.messages messages &&
 
-	fill "M	one" "A	three" "D	two" >expect.master &&
-	git diff --name-status master >current.master &&
-	test_cmp expect.master current.master &&
+	fill "M	one" "A	three" "D	two" >expect.main &&
+	git diff --name-status main >current.main &&
+	test_cmp expect.main current.main &&
 
 	fill "M	one" >expect.side &&
 	git diff --name-status side >current.side &&
@@ -120,9 +117,8 @@ test_expect_success "checkout -m with dirty tree" '
 	test_must_be_empty current.index
 '
 
-test_expect_success "checkout -m with dirty tree, renamed" '
-
-	git checkout -f master && git clean -f &&
+test_expect_success 'checkout -m with dirty tree, renamed' '
+	git checkout -f main && git clean -f &&
 
 	fill 1 2 3 4 5 7 8 >one &&
 	if git checkout renamer
@@ -139,12 +135,10 @@ test_expect_success "checkout -m with dirty tree, renamed" '
 	! test -f one &&
 	git diff --cached >current &&
 	test_must_be_empty current
-
 '
 
 test_expect_success 'checkout -m with merge conflict' '
-
-	git checkout -f master && git clean -f &&
+	git checkout -f main && git clean -f &&
 
 	fill 1 T 3 4 5 6 S 8 >one &&
 	if git checkout renamer
@@ -157,7 +151,7 @@ test_expect_success 'checkout -m with merge conflict' '
 
 	git checkout -m renamer &&
 
-	git diff master:one :3:uno |
+	git diff main:one :3:uno |
 	sed -e "1,/^@@/d" -e "/^ /d" -e "s/^-/d/" -e "s/^+/a/" >current &&
 	fill d2 aT d7 aS >expect &&
 	test_cmp expect current &&
@@ -166,10 +160,10 @@ test_expect_success 'checkout -m with merge conflict' '
 '
 
 test_expect_success 'format of merge conflict from checkout -m' '
+	git checkout -f main &&
+	git clean -f &&
 
-	git checkout -f master && git clean -f &&
-
-	fill b d > two &&
+	fill b d >two &&
 	git checkout -m simple &&
 
 	git ls-files >current &&
@@ -190,10 +184,11 @@ test_expect_success 'format of merge conflict from checkout -m' '
 '
 
 test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
+	git checkout -f main &&
+	git reset --hard &&
+	git clean -f &&
 
-	git checkout -f master && git reset --hard && git clean -f &&
-
-	fill b d > two &&
+	fill b d >two &&
 	git checkout --merge --conflict=diff3 simple &&
 
 	cat <<-EOF >expect &&
@@ -201,7 +196,7 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
 	a
 	c
 	e
-	||||||| master
+	||||||| main
 	a
 	b
 	c
@@ -216,8 +211,9 @@ test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
 '
 
 test_expect_success 'switch to another branch while carrying a deletion' '
-
-	git checkout -f master && git reset --hard && git clean -f &&
+	git checkout -f main &&
+	git reset --hard &&
+	git clean -f &&
 	git rm two &&
 
 	test_must_fail git checkout simple 2>errs &&
@@ -228,14 +224,15 @@ test_expect_success 'switch to another branch while carrying a deletion' '
 '
 
 test_expect_success 'checkout to detach HEAD (with advice declined)' '
-
 	git config advice.detachedHead false &&
-	git checkout -f renamer && git clean -f &&
+	rev=$(git rev-parse --short renamer^) &&
+	git checkout -f renamer &&
+	git clean -f &&
 	git checkout renamer^ 2>messages &&
-	test_i18ngrep "HEAD is now at 7329388" messages &&
+	test_i18ngrep "HEAD is now at $rev" messages &&
 	test_line_count = 1 messages &&
 	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
 	test "z$H" = "z$M" &&
 	if git symbolic-ref HEAD >/dev/null 2>&1
 	then
@@ -248,12 +245,14 @@ test_expect_success 'checkout to detach HEAD (with advice declined)' '
 
 test_expect_success 'checkout to detach HEAD' '
 	git config advice.detachedHead true &&
-	git checkout -f renamer && git clean -f &&
-	GIT_TEST_GETTEXT_POISON=false git checkout renamer^ 2>messages &&
-	grep "HEAD is now at 7329388" messages &&
+	rev=$(git rev-parse --short renamer^) &&
+	git checkout -f renamer &&
+	git clean -f &&
+	git checkout renamer^ 2>messages &&
+	grep "HEAD is now at $rev" messages &&
 	test_line_count -gt 1 messages &&
 	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
 	test "z$H" = "z$M" &&
 	if git symbolic-ref HEAD >/dev/null 2>&1
 	then
@@ -265,11 +264,11 @@ test_expect_success 'checkout to detach HEAD' '
 '
 
 test_expect_success 'checkout to detach HEAD with branchname^' '
-
-	git checkout -f master && git clean -f &&
+	git checkout -f main &&
+	git clean -f &&
 	git checkout renamer^ &&
 	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
 	test "z$H" = "z$M" &&
 	if git symbolic-ref HEAD >/dev/null 2>&1
 	then
@@ -281,11 +280,11 @@ test_expect_success 'checkout to detach HEAD with branchname^' '
 '
 
 test_expect_success 'checkout to detach HEAD with :/message' '
-
-	git checkout -f master && git clean -f &&
+	git checkout -f main &&
+	git clean -f &&
 	git checkout ":/Initial" &&
 	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
 	test "z$H" = "z$M" &&
 	if git symbolic-ref HEAD >/dev/null 2>&1
 	then
@@ -297,11 +296,11 @@ test_expect_success 'checkout to detach HEAD with :/message' '
 '
 
 test_expect_success 'checkout to detach HEAD with HEAD^0' '
-
-	git checkout -f master && git clean -f &&
+	git checkout -f main &&
+	git clean -f &&
 	git checkout HEAD^0 &&
 	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
 	test "z$H" = "z$M" &&
 	if git symbolic-ref HEAD >/dev/null 2>&1
 	then
@@ -313,30 +312,27 @@ test_expect_success 'checkout to detach HEAD with HEAD^0' '
 '
 
 test_expect_success 'checkout with ambiguous tag/branch names' '
-
 	git tag both side &&
-	git branch both master &&
+	git branch both main &&
 	git reset --hard &&
-	git checkout master &&
+	git checkout main &&
 
 	git checkout both &&
 	H=$(git rev-parse --verify HEAD) &&
-	M=$(git show-ref -s --verify refs/heads/master) &&
+	M=$(git show-ref -s --verify refs/heads/main) &&
 	test "z$H" = "z$M" &&
 	name=$(git symbolic-ref HEAD 2>/dev/null) &&
 	test "z$name" = zrefs/heads/both
-
 '
 
 test_expect_success 'checkout with ambiguous tag/branch names' '
-
 	git reset --hard &&
-	git checkout master &&
+	git checkout main &&
 
 	git tag frotz side &&
-	git branch frotz master &&
+	git branch frotz main &&
 	git reset --hard &&
-	git checkout master &&
+	git checkout main &&
 
 	git checkout tags/frotz &&
 	H=$(git rev-parse --verify HEAD) &&
@@ -349,26 +345,19 @@ test_expect_success 'checkout with ambiguous tag/branch names' '
 	else
 		: happy
 	fi
-
 '
 
 test_expect_success 'switch branches while in subdirectory' '
-
 	git reset --hard &&
-	git checkout master &&
+	git checkout main &&
 
 	mkdir subs &&
-	(
-		cd subs &&
-		git checkout side
-	) &&
+	git -C subs checkout side &&
 	! test -f subs/one &&
 	rm -fr subs
-
 '
 
 test_expect_success 'checkout specific path while in subdirectory' '
-
 	git reset --hard &&
 	git checkout side &&
 	mkdir subs &&
@@ -376,65 +365,60 @@ test_expect_success 'checkout specific path while in subdirectory' '
 	git add subs/bero &&
 	git commit -m "add subs/bero" &&
 
-	git checkout master &&
+	git checkout main &&
 	mkdir -p subs &&
-	(
-		cd subs &&
-		git checkout side -- bero
-	) &&
+	git -C subs checkout side -- bero &&
 	test -f subs/bero
-
 '
 
-test_expect_success \
-    'checkout w/--track sets up tracking' '
+test_expect_success 'checkout w/--track sets up tracking' '
     git config branch.autosetupmerge false &&
-    git checkout master &&
+    git checkout main &&
     git checkout --track -b track1 &&
     test "$(git config branch.track1.remote)" &&
-    test "$(git config branch.track1.merge)"'
+    test "$(git config branch.track1.merge)"
+'
 
-test_expect_success \
-    'checkout w/autosetupmerge=always sets up tracking' '
+test_expect_success 'checkout w/autosetupmerge=always sets up tracking' '
     test_when_finished git config branch.autosetupmerge false &&
     git config branch.autosetupmerge always &&
-    git checkout master &&
+    git checkout main &&
     git checkout -b track2 &&
     test "$(git config branch.track2.remote)" &&
-    test "$(git config branch.track2.merge)"'
+    test "$(git config branch.track2.merge)"
+'
 
 test_expect_success 'checkout w/--track from non-branch HEAD fails' '
-    git checkout master^0 &&
+    git checkout main^0 &&
     test_must_fail git symbolic-ref HEAD &&
     test_must_fail git checkout --track -b track &&
     test_must_fail git rev-parse --verify track &&
     test_must_fail git symbolic-ref HEAD &&
-    test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
+    test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
 '
 
 test_expect_success 'checkout w/--track from tag fails' '
-    git checkout master^0 &&
+    git checkout main^0 &&
     test_must_fail git symbolic-ref HEAD &&
     test_must_fail git checkout --track -b track frotz &&
     test_must_fail git rev-parse --verify track &&
     test_must_fail git symbolic-ref HEAD &&
-    test "z$(git rev-parse master^0)" = "z$(git rev-parse HEAD)"
+    test "z$(git rev-parse main^0)" = "z$(git rev-parse HEAD)"
 '
 
 test_expect_success 'detach a symbolic link HEAD' '
-    git checkout master &&
+    git checkout main &&
     git config --bool core.prefersymlinkrefs yes &&
     git checkout side &&
-    git checkout master &&
+    git checkout main &&
     it=$(git symbolic-ref HEAD) &&
-    test "z$it" = zrefs/heads/master &&
-    here=$(git rev-parse --verify refs/heads/master) &&
+    test "z$it" = zrefs/heads/main &&
+    here=$(git rev-parse --verify refs/heads/main) &&
     git checkout side^ &&
-    test "z$(git rev-parse --verify refs/heads/master)" = "z$here"
+    test "z$(git rev-parse --verify refs/heads/main)" = "z$here"
 '
 
-test_expect_success \
-    'checkout with --track fakes a sensible -b <name>' '
+test_expect_success 'checkout with --track fakes a sensible -b <name>' '
     git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*" &&
     git update-ref refs/remotes/origin/koala/bear renamer &&
 
@@ -442,22 +426,22 @@ test_expect_success \
     test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
     test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
 
-    git checkout master && git branch -D koala/bear &&
+    git checkout main && git branch -D koala/bear &&
 
     git checkout --track refs/remotes/origin/koala/bear &&
     test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
     test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)" &&
 
-    git checkout master && git branch -D koala/bear &&
+    git checkout main && git branch -D koala/bear &&
 
     git checkout --track remotes/origin/koala/bear &&
     test "refs/heads/koala/bear" = "$(git symbolic-ref HEAD)" &&
     test "$(git rev-parse HEAD)" = "$(git rev-parse renamer)"
 '
 
-test_expect_success \
-    'checkout with --track, but without -b, fails with too short tracked name' '
-    test_must_fail git checkout --track renamer'
+test_expect_success 'checkout with --track, but without -b, fails with too short tracked name' '
+    test_must_fail git checkout --track renamer
+'
 
 setup_conflicting_index () {
 	rm -f .git/index &&
@@ -601,18 +585,17 @@ test_expect_success 'checkout --conflict=diff3' '
 '
 
 test_expect_success 'failing checkout -b should not break working tree' '
-	git reset --hard master &&
-	git symbolic-ref HEAD refs/heads/master &&
+	git reset --hard main &&
+	git symbolic-ref HEAD refs/heads/main &&
 	test_must_fail git checkout -b renamer side^ &&
-	test $(git symbolic-ref HEAD) = refs/heads/master &&
+	test $(git symbolic-ref HEAD) = refs/heads/main &&
 	git diff --exit-code &&
 	git diff --cached --exit-code
-
 '
 
 test_expect_success 'switch out of non-branch' '
-	git reset --hard master &&
-	git checkout master^0 &&
+	git reset --hard main &&
+	git checkout main^0 &&
 	echo modified >one &&
 	test_must_fail git checkout renamer 2>error.log &&
 	! grep "^Previous HEAD" error.log
diff --git a/t/t7300-clean.sh b/t/t7300-clean.sh
index 6e6d24c1c3..0399701e62 100755
--- a/t/t7300-clean.sh
+++ b/t/t7300-clean.sh
@@ -110,7 +110,7 @@ test_expect_success 'git clean with prefix' '
 
 '
 
-test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' '
+test_expect_success 'git clean with relative prefix' '
 
 	mkdir -p build docs &&
 	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
@@ -123,7 +123,7 @@ test_expect_success C_LOCALE_OUTPUT 'git clean with relative prefix' '
 	verbose test "$would_clean" = ../src/part3.c
 '
 
-test_expect_success C_LOCALE_OUTPUT 'git clean with absolute path' '
+test_expect_success 'git clean with absolute path' '
 
 	mkdir -p build docs &&
 	touch a.out src/part3.c docs/manual.txt obj.o build/lib.so &&
@@ -407,7 +407,7 @@ test_expect_success 'clean.requireForce and -f' '
 
 '
 
-test_expect_success C_LOCALE_OUTPUT 'core.excludesfile' '
+test_expect_success 'core.excludesfile' '
 
 	echo excludes >excludes &&
 	echo included >included &&
@@ -737,4 +737,55 @@ test_expect_success MINGW 'handle clean & core.longpaths = false nicely' '
 	test_i18ngrep "too long" .git/err
 '
 
+test_expect_success 'clean untracked paths by pathspec' '
+	git init untracked &&
+	mkdir untracked/dir &&
+	echo >untracked/dir/file.txt &&
+	git -C untracked clean -f dir/file.txt &&
+	ls untracked/dir >actual &&
+	test_must_be_empty actual
+'
+
+test_expect_success 'avoid traversing into ignored directories' '
+	test_when_finished rm -f output error trace.* &&
+	test_create_repo avoid-traversing-deep-hierarchy &&
+	(
+		cd avoid-traversing-deep-hierarchy &&
+
+		mkdir -p untracked/subdir/with/a &&
+		>untracked/subdir/with/a/random-file.txt &&
+
+		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace.output" \
+		git clean -ffdxn -e untracked
+	) &&
+
+	# Make sure we only visited into the top-level directory, and did
+	# not traverse into the "untracked" subdirectory since it was excluded
+	grep data.*read_directo.*directories-visited trace.output |
+		cut -d "|" -f 9 >trace.relevant &&
+	cat >trace.expect <<-EOF &&
+	 ..directories-visited:1
+	EOF
+	test_cmp trace.expect trace.relevant
+'
+
+test_expect_success 'traverse into directories that may have ignored entries' '
+	test_when_finished rm -f output &&
+	test_create_repo need-to-traverse-into-hierarchy &&
+	(
+		cd need-to-traverse-into-hierarchy &&
+		mkdir -p modules/foobar/src/generated &&
+		> modules/foobar/src/generated/code.c &&
+		> modules/foobar/Makefile &&
+		echo "/modules/**/src/generated/" >.gitignore &&
+
+		git clean -fX modules/foobar >../output &&
+
+		grep Removing ../output &&
+
+		test_path_is_missing modules/foobar/src/generated/code.c &&
+		test_path_is_file modules/foobar/Makefile
+	)
+'
+
 test_done
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index 691b5fc3bf..cb1b8e35db 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -9,6 +9,9 @@ This test tries to verify basic sanity of the init, update and status
 subcommands of git submodule.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'submodule deinit works on empty repository' '
@@ -48,11 +51,26 @@ 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 &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
+'
+
+test_expect_success 'status should ignore inner git repo when not added' '
+	rm -fr inner &&
+	mkdir inner &&
+	(
+		cd inner &&
+		git init &&
+		>t &&
+		git add t &&
+		git commit -m "initial"
+	) &&
+	test_must_fail git submodule status inner 2>output.err &&
+	rm -fr inner &&
+	test_i18ngrep "^error: .*did not match any file(s) known to git" output.err
 '
 
 test_expect_success 'setup - repository in init subdirectory' '
@@ -109,7 +127,7 @@ inspect() {
 }
 
 test_expect_success 'submodule add' '
-	echo "refs/heads/master" >expect &&
+	echo "refs/heads/main" >expect &&
 
 	(
 		cd addtest &&
@@ -156,16 +174,18 @@ test_expect_success 'submodule add to .gitignored path fails' '
 	(
 		cd addtest-ignore &&
 		cat <<-\EOF >expect &&
-		The following path is ignored by one of your .gitignore files:
+		The following paths are ignored by one of your .gitignore files:
 		submod
-		Use -f if you really want to add it.
+		hint: Use -f if you really want to add them.
+		hint: Turn this message off by running
+		hint: "git config advice.addIgnoredFile false"
 		EOF
 		# Does not use test_commit due to the ignore
 		echo "*" > .gitignore &&
 		git add --force .gitignore &&
 		git commit -m"Ignore everything" &&
 		! git submodule add "$submodurl" submod >actual 2>&1 &&
-		test_i18ncmp expect actual
+		test_cmp expect actual
 	)
 '
 
@@ -176,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 &&
@@ -191,11 +222,22 @@ test_expect_success 'submodule add to reconfigure existing submodule with --forc
 	)
 '
 
+test_expect_success 'submodule add relays add --dry-run stderr' '
+	test_when_finished "rm -rf addtest/.git/index.lock" &&
+	(
+		cd addtest &&
+		: >.git/index.lock &&
+		! git submodule add "$submodurl" sub-while-locked 2>output.err &&
+		test_i18ngrep "^fatal: .*index\.lock" output.err &&
+		test_path_is_missing sub-while-locked
+	)
+'
+
 test_expect_success 'submodule add --branch' '
 	echo "refs/heads/initial" >expect-head &&
 	cat <<-\EOF >expect-heads &&
 	refs/heads/initial
-	refs/heads/master
+	refs/heads/main
 	EOF
 
 	(
@@ -213,7 +255,7 @@ test_expect_success 'submodule add --branch' '
 '
 
 test_expect_success 'submodule add with ./ in path' '
-	echo "refs/heads/master" >expect &&
+	echo "refs/heads/main" >expect &&
 
 	(
 		cd addtest &&
@@ -229,7 +271,7 @@ test_expect_success 'submodule add with ./ in path' '
 '
 
 test_expect_success 'submodule add with /././ in path' '
-	echo "refs/heads/master" >expect &&
+	echo "refs/heads/main" >expect &&
 
 	(
 		cd addtest &&
@@ -245,7 +287,7 @@ test_expect_success 'submodule add with /././ in path' '
 '
 
 test_expect_success 'submodule add with // in path' '
-	echo "refs/heads/master" >expect &&
+	echo "refs/heads/main" >expect &&
 
 	(
 		cd addtest &&
@@ -261,7 +303,7 @@ test_expect_success 'submodule add with // in path' '
 '
 
 test_expect_success 'submodule add with /.. in path' '
-	echo "refs/heads/master" >expect &&
+	echo "refs/heads/main" >expect &&
 
 	(
 		cd addtest &&
@@ -277,7 +319,7 @@ test_expect_success 'submodule add with /.. in path' '
 '
 
 test_expect_success 'submodule add with ./, /.. and // in path' '
-	echo "refs/heads/master" >expect &&
+	echo "refs/heads/main" >expect &&
 
 	(
 		cd addtest &&
@@ -307,7 +349,7 @@ test_expect_success !CYGWIN 'submodule add with \\ in path' '
 '
 
 test_expect_success 'submodule add in subdirectory' '
-	echo "refs/heads/master" >expect &&
+	echo "refs/heads/main" >expect &&
 
 	mkdir addtest/sub &&
 	(
@@ -356,6 +398,28 @@ test_expect_success 'status should only print one line' '
 	test_line_count = 1 lines
 '
 
+test_expect_success 'status from subdirectory should have the same SHA1' '
+	test_when_finished "rmdir addtest/subdir" &&
+	(
+		cd addtest &&
+		mkdir subdir &&
+		git submodule status >output &&
+		awk "{print \$1}" <output >expect &&
+		cd subdir &&
+		git submodule status >../output &&
+		awk "{print \$1}" <../output >../actual &&
+		test_cmp ../expect ../actual &&
+		git -C ../submod checkout HEAD^ &&
+		git submodule status >../output &&
+		awk "{print \$1}" <../output >../actual2 &&
+		cd .. &&
+		git submodule status >output &&
+		awk "{print \$1}" <output >expect2 &&
+		test_cmp expect2 actual2 &&
+		! test_cmp actual actual2
+	)
+'
+
 test_expect_success 'setup - fetch commit name from submodule' '
 	rev1=$(cd .subrepo && git rev-parse HEAD) &&
 	printf "rev1: %s\n" "$rev1" &&
@@ -377,6 +441,14 @@ test_expect_success 'init should register submodule url in .git/config' '
 	test_cmp expect url
 '
 
+test_expect_success 'status should still be "missing" after initializing' '
+	rm -fr init &&
+	mkdir init &&
+	git submodule status >lines &&
+	rm -fr init &&
+	grep "^-$rev1" lines
+'
+
 test_failure_with_unknown_submodule () {
 	test_must_fail git submodule $1 no-such-submodule 2>output.err &&
 	test_i18ngrep "^error: .*no-such-submodule" output.err
@@ -499,7 +571,7 @@ test_expect_success 'status should be "up-to-date" after update' '
 
 test_expect_success 'checkout superproject with subproject already present' '
 	git checkout initial &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'apply submodule diff' '
@@ -516,7 +588,7 @@ test_expect_success 'apply submodule diff' '
 	git checkout second &&
 	git apply --index P.diff &&
 
-	git diff --cached master >staged &&
+	git diff --cached main >staged &&
 	test_must_be_empty staged
 '
 
@@ -880,7 +952,7 @@ test_expect_success 'submodule add --name allows to replace a submodule with ano
 		echo "repo" >expect &&
 		test_must_fail git config -f .gitmodules submodule.repo.path &&
 		git config -f .gitmodules submodule.repo_new.path >actual &&
-		test_cmp expect actual&&
+		test_cmp expect actual &&
 		echo "$submodurl/repo" >expect &&
 		test_must_fail git config -f .gitmodules submodule.repo.url &&
 		echo "$submodurl/bare.git" >expect &&
@@ -952,7 +1024,7 @@ test_expect_success 'submodule add with an existing name fails unless forced' '
 		test -d repo &&
 		echo "repo" >expect &&
 		git config -f .gitmodules submodule.repo_new.path >actual &&
-		test_cmp expect actual&&
+		test_cmp expect actual &&
 		echo "$submodurl/repo.git" >expect &&
 		git config -f .gitmodules submodule.repo_new.url >actual &&
 		test_cmp expect actual &&
@@ -1173,7 +1245,7 @@ test_expect_success 'submodule helper list is not confused by common prefixes' '
 	git submodule add /dir1/b dir1/b &&
 	git submodule add /dir2/b dir2/b &&
 	git commit -m "first submodule commit" &&
-	git submodule--helper list dir1/b |cut -c51- >actual &&
+	git submodule--helper list dir1/b | cut -f 2 >actual &&
 	echo "dir1/b" >expect &&
 	test_cmp expect actual
 '
@@ -1202,7 +1274,7 @@ test_expect_success 'submodule update --init with a specification' '
 	pwd=$(pwd) &&
 	git clone file://"$pwd"/multisuper multisuper_clone &&
 	git -C multisuper_clone submodule update --init . ":(exclude)sub0" &&
-	git -C multisuper_clone submodule status |cut -c 1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 '
 
@@ -1213,7 +1285,7 @@ test_expect_success 'submodule update --init with submodule.active set' '
 	git -C multisuper_clone config submodule.active "." &&
 	git -C multisuper_clone config --add submodule.active ":(exclude)sub0" &&
 	git -C multisuper_clone submodule update --init &&
-	git -C multisuper_clone submodule status |cut -c 1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 '
 
@@ -1232,7 +1304,7 @@ test_expect_success 'submodule update and setting submodule.<name>.active' '
 	-sub3
 	EOF
 	git -C multisuper_clone submodule update &&
-	git -C multisuper_clone submodule status |cut -c 1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 '
 
@@ -1249,12 +1321,12 @@ test_expect_success 'clone active submodule without submodule url set' '
 		git submodule update &&
 		git submodule status >actual_raw &&
 
-		cut -c 1,43- actual_raw >actual &&
+		cut -d" " -f3- actual_raw >actual &&
 		cat >expect <<-\EOF &&
-		 sub0 (test2)
-		 sub1 (test2)
-		 sub2 (test2)
-		 sub3 (test2)
+		sub0 (test2)
+		sub1 (test2)
+		sub2 (test2)
+		sub3 (test2)
 		EOF
 		test_cmp expect actual
 	)
@@ -1270,7 +1342,7 @@ test_expect_success 'clone --recurse-submodules with a pathspec works' '
 	EOF
 
 	git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
-	git -C multisuper_clone submodule status |cut -c1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expected actual
 '
 
@@ -1287,7 +1359,7 @@ test_expect_success 'clone with multiple --recurse-submodules options' '
 		  --recurse-submodules=":(exclude)sub0" \
 		  --recurse-submodules=":(exclude)sub2" \
 		  multisuper multisuper_clone &&
-	git -C multisuper_clone submodule status |cut -c1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual
 '
 
@@ -1315,7 +1387,7 @@ test_expect_success 'clone and subsequent updates correctly auto-initialize subm
 		  --recurse-submodules=":(exclude)sub4" \
 		  multisuper multisuper_clone &&
 
-	git -C multisuper_clone submodule status |cut -c1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect actual &&
 
 	git -C multisuper submodule add ../sub1 sub4 &&
@@ -1324,7 +1396,7 @@ test_expect_success 'clone and subsequent updates correctly auto-initialize subm
 	# obtain the new superproject
 	git -C multisuper_clone pull &&
 	git -C multisuper_clone submodule update --init &&
-	git -C multisuper_clone submodule status |cut -c1,43- >actual &&
+	git -C multisuper_clone submodule status | sed "s/$OID_REGEX //" >actual &&
 	test_cmp expect2 actual
 '
 
diff --git a/t/t7401-submodule-summary.sh b/t/t7401-submodule-summary.sh
index 9bc841d085..9c3cc4cf40 100755
--- a/t/t7401-submodule-summary.sh
+++ b/t/t7401-submodule-summary.sh
@@ -5,9 +5,18 @@
 
 test_description='Summary support for submodules
 
-This test tries to verify the sanity of summary subcommand of git submodule.
+This test script tries to verify the sanity of summary subcommand of git submodule.
 '
 
+# NOTE: This test script uses 'git add' instead of 'git submodule add' to add
+# submodules to the superproject. Some submodule subcommands such as init and
+# deinit might not work as expected in this script. t7421 does not have this
+# caveat.
+#
+# NEEDSWORK: This test script is old fashioned and may need a big cleanup due to
+# various reasons, one of them being that there are lots of commands taking place
+# outside of 'test_expect_success' block, which is no longer in good-style.
+
 . ./test-lib.sh
 
 add_file () {
@@ -16,12 +25,12 @@ add_file () {
 	owd=$(pwd)
 	cd "$sm"
 	for name; do
-		echo "$name" > "$name" &&
+		echo "$name" >"$name" &&
 		git add "$name" &&
 		test_tick &&
 		git commit -m "Add $name"
 	done >/dev/null
-	git rev-parse --verify HEAD | cut -c1-7
+	git rev-parse --short HEAD
 	cd "$owd"
 }
 commit_file () {
@@ -38,10 +47,10 @@ test_expect_success 'added submodule' "
 	git add sm1 &&
 	git submodule summary >actual &&
 	cat >expected <<-EOF &&
-* sm1 0000000...$head1 (2):
-  > Add foo2
+	* sm1 0000000...$head1 (2):
+	  > Add foo2
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
@@ -52,10 +61,10 @@ test_expect_success 'added submodule (subdirectory)' "
 		git submodule summary >../actual
 	) &&
 	cat >expected <<-EOF &&
-* ../sm1 0000000...$head1 (2):
-  > Add foo2
+	* ../sm1 0000000...$head1 (2):
+	  > Add foo2
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
@@ -73,10 +82,10 @@ test_expect_success 'added submodule (subdirectory with explicit path)' "
 		git submodule summary ../sm1 >../actual
 	) &&
 	cat >expected <<-EOF &&
-* ../sm1 0000000...$head1 (2):
-  > Add foo2
+	* ../sm1 0000000...$head1 (2):
+	  > Add foo2
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
@@ -86,20 +95,20 @@ head2=$(add_file sm1 foo3)
 test_expect_success 'modified submodule(forward)' "
 	git submodule summary >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head1...$head2 (1):
-  > Add foo3
+	* sm1 $head1...$head2 (1):
+	  > Add foo3
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
 test_expect_success 'modified submodule(forward), --files' "
 	git submodule summary --files >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head1...$head2 (1):
-  > Add foo3
+	* sm1 $head1...$head2 (1):
+	  > Add foo3
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
@@ -110,10 +119,10 @@ test_expect_success 'no ignore=all setting has any effect' "
 	git config diff.ignoreSubmodules all &&
 	git submodule summary >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head1...$head2 (1):
-  > Add foo3
+	* sm1 $head1...$head2 (1):
+	  > Add foo3
 
-EOF
+	EOF
 	test_cmp expected actual &&
 	git config --unset diff.ignoreSubmodules &&
 	git config --remove-section submodule.sm1 &&
@@ -125,17 +134,17 @@ commit_file sm1 &&
 head3=$(
 	cd sm1 &&
 	git reset --hard HEAD~2 >/dev/null &&
-	git rev-parse --verify HEAD | cut -c1-7
+	git rev-parse --short HEAD
 )
 
 test_expect_success 'modified submodule(backward)' "
 	git submodule summary >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head2...$head3 (2):
-  < Add foo3
-  < Add foo2
+	* sm1 $head2...$head3 (2):
+	  < Add foo3
+	  < Add foo2
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
@@ -144,25 +153,25 @@ head4_full=$(GIT_DIR=sm1/.git git rev-parse --verify HEAD)
 test_expect_success 'modified submodule(backward and forward)' "
 	git submodule summary >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head2...$head4 (4):
-  > Add foo5
-  > Add foo4
-  < Add foo3
-  < Add foo2
+	* sm1 $head2...$head4 (4):
+	  > Add foo5
+	  > Add foo4
+	  < Add foo3
+	  < Add foo2
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
 test_expect_success '--summary-limit' "
 	git submodule summary -n 3 >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head2...$head4 (4):
-  > Add foo5
-  > Add foo4
-  < Add foo3
+	* sm1 $head2...$head4 (4):
+	  > Add foo5
+	  > Add foo4
+	  < Add foo3
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
@@ -177,21 +186,21 @@ mv sm1-bak sm1
 test_expect_success 'typechanged submodule(submodule->blob), --cached' "
 	git submodule summary --cached >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head4(submodule)->$head5(blob) (3):
-  < Add foo5
+	* sm1 $head4(submodule)->$head5(blob) (3):
+	  < Add foo5
 
-EOF
-	test_i18ncmp actual expected
+	EOF
+	test_cmp expected actual
 "
 
 test_expect_success 'typechanged submodule(submodule->blob), --files' "
 	git submodule summary --files >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head5(blob)->$head4(submodule) (3):
-  > Add foo5
+	* sm1 $head5(blob)->$head4(submodule) (3):
+	  > Add foo5
 
-EOF
-	test_i18ncmp actual expected
+	EOF
+	test_cmp expected actual
 "
 
 rm -rf sm1 &&
@@ -199,10 +208,10 @@ git checkout-index sm1
 test_expect_success 'typechanged submodule(submodule->blob)' "
 	git submodule summary >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head4(submodule)->$head5(blob):
+	* sm1 $head4(submodule)->$head5(blob):
 
-EOF
-	test_i18ncmp actual expected
+	EOF
+	test_cmp expected actual
 "
 
 rm -f sm1 &&
@@ -211,22 +220,22 @@ head6=$(add_file sm1 foo6 foo7)
 test_expect_success 'nonexistent commit' "
 	git submodule summary >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head4...$head6:
-  Warn: sm1 doesn't contain commit $head4_full
+	* sm1 $head4...$head6:
+	  Warn: sm1 doesn't contain commit $head4_full
 
-EOF
-	test_i18ncmp actual expected
+	EOF
+	test_cmp expected actual
 "
 
 commit_file
 test_expect_success 'typechanged submodule(blob->submodule)' "
 	git submodule summary >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head5(blob)->$head6(submodule) (2):
-  > Add foo7
+	* sm1 $head5(blob)->$head6(submodule) (2):
+	  > Add foo7
 
-EOF
-	test_i18ncmp expected actual
+	EOF
+	test_cmp expected actual
 "
 
 commit_file sm1 &&
@@ -234,9 +243,9 @@ rm -rf sm1
 test_expect_success 'deleted submodule' "
 	git submodule summary >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head6...0000000:
+	* sm1 $head6...0000000:
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
@@ -249,22 +258,22 @@ test_expect_success 'create second submodule' '
 test_expect_success 'multiple submodules' "
 	git submodule summary >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head6...0000000:
+	* sm1 $head6...0000000:
 
-* sm2 0000000...$head7 (2):
-  > Add foo9
+	* sm2 0000000...$head7 (2):
+	  > Add foo9
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
 test_expect_success 'path filter' "
 	git submodule summary sm2 >actual &&
 	cat >expected <<-EOF &&
-* sm2 0000000...$head7 (2):
-  > Add foo9
+	* sm2 0000000...$head7 (2):
+	  > Add foo9
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
@@ -272,24 +281,24 @@ commit_file sm2
 test_expect_success 'given commit' "
 	git submodule summary HEAD^ >actual &&
 	cat >expected <<-EOF &&
-* sm1 $head6...0000000:
+	* sm1 $head6...0000000:
 
-* sm2 0000000...$head7 (2):
-  > Add foo9
+	* sm2 0000000...$head7 (2):
+	  > Add foo9
 
-EOF
+	EOF
 	test_cmp expected actual
 "
 
 test_expect_success '--for-status' "
 	git submodule summary --for-status HEAD^ >actual &&
-	test_i18ncmp actual - <<EOF
-* sm1 $head6...0000000:
+	test_cmp - actual <<-EOF
+	* sm1 $head6...0000000:
 
-* sm2 0000000...$head7 (2):
-  > Add foo9
+	* sm2 0000000...$head7 (2):
+	  > Add foo9
 
-EOF
+	EOF
 "
 
 test_expect_success 'fail when using --files together with --cached' "
diff --git a/t/t7403-submodule-sync.sh b/t/t7403-submodule-sync.sh
index 0726799e74..7d2ac3322b 100755
--- a/t/t7403-submodule-sync.sh
+++ b/t/t7403-submodule-sync.sh
@@ -8,6 +8,9 @@ test_description='git submodule sync
 These tests exercise the "git submodule sync" subcommand.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success setup '
@@ -78,7 +81,7 @@ test_expect_success 'change submodule url' '
 	(
 		cd super &&
 		cd submodule &&
-		git checkout master &&
+		git checkout main &&
 		git pull
 	) &&
 	mv submodule moved-submodule &&
@@ -112,7 +115,7 @@ test_expect_success '"git submodule sync" should update submodule URLs' '
 	)" &&
 	(
 		cd super-clone/submodule &&
-		git checkout master &&
+		git checkout main &&
 		git pull
 	) &&
 	(
@@ -140,7 +143,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
 	)" &&
 	(
 		cd super-clone/submodule/sub-submodule &&
-		git checkout master &&
+		git checkout main &&
 		git pull
 	)
 '
@@ -168,7 +171,7 @@ test_expect_success '"git submodule sync" should update submodule URLs - subdire
 	)" &&
 	(
 		cd super-clone/submodule &&
-		git checkout master &&
+		git checkout main &&
 		git pull
 	) &&
 	(
@@ -199,7 +202,7 @@ test_expect_success '"git submodule sync --recursive" should update all submodul
 	)" &&
 	(
 		cd super-clone/submodule/sub-submodule &&
-		git checkout master &&
+		git checkout main &&
 		git pull
 	)
 '
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index df34c994d2..11cccbb333 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -9,15 +9,18 @@ This test verifies that "git submodule update" detaches the HEAD of the
 submodule and "git submodule update --rebase/--merge" does not detach the HEAD.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
 compare_head()
 {
-    sha_master=$(git rev-list --max-count=1 master)
+    sha_main=$(git rev-list --max-count=1 main)
     sha_head=$(git rev-list --max-count=1 HEAD)
 
-    test "$sha_master" = "$sha_head"
+    test "$sha_main" = "$sha_head"
 }
 
 
@@ -70,6 +73,22 @@ test_expect_success 'setup a submodule tree' '
 	)
 '
 
+test_expect_success 'update --remote falls back to using HEAD' '
+	test_create_repo main-branch-submodule &&
+	test_commit -C main-branch-submodule initial &&
+
+	test_create_repo main-branch &&
+	git -C main-branch submodule add ../main-branch-submodule &&
+	git -C main-branch commit -m add-submodule &&
+
+	git -C main-branch-submodule switch -c hello &&
+	test_commit -C main-branch-submodule world &&
+
+	git clone --recursive main-branch main-branch-clone &&
+	git -C main-branch-clone submodule update --remote main-branch-submodule &&
+	test_path_exists main-branch-clone/main-branch-submodule/world.t
+'
+
 test_expect_success 'submodule update detaching the HEAD ' '
 	(cd super/submodule &&
 	 git reset --hard HEAD~1
@@ -136,9 +155,9 @@ test_expect_success 'submodule update --init --recursive from subdirectory' '
 	 cd tmp &&
 	 git submodule update --init --recursive ../super >../../actual 2>../../actual2
 	) &&
-	test_i18ncmp expect actual &&
+	test_cmp expect actual &&
 	sort actual2 >actual2.sorted &&
-	test_i18ncmp expect2 actual2.sorted
+	test_cmp expect2 actual2.sorted
 '
 
 cat <<EOF >expect2
@@ -155,7 +174,7 @@ test_expect_success 'submodule update --init from and of subdirectory' '
 	  git submodule update --init sub 2>../../actual2
 	 )
 	) &&
-	test_i18ncmp expect2 actual2
+	test_cmp expect2 actual2
 '
 
 test_expect_success 'submodule update does not fetch already present commits' '
@@ -173,7 +192,7 @@ test_expect_success 'submodule update does not fetch already present commits' '
 	(cd super &&
 	  git submodule update > ../actual 2> ../actual.err
 	) &&
-	test_i18ncmp expected actual &&
+	test_cmp expected actual &&
 	test_must_be_empty actual.err
 '
 
@@ -246,14 +265,14 @@ test_expect_success 'submodule update --remote should fetch upstream changes wit
 		cd super &&
 		git submodule update --remote --force submodule &&
 		git -C submodule log -1 --oneline >actual &&
-		git -C ../submodule log -1 --oneline master >expect &&
+		git -C ../submodule log -1 --oneline main >expect &&
 		test_cmp expect actual &&
 		git checkout -b test-branch &&
 		git submodule update --remote --force submodule &&
 		git -C submodule log -1 --oneline >actual &&
 		git -C ../submodule log -1 --oneline test-branch >expect &&
 		test_cmp expect actual &&
-		git checkout master &&
+		git checkout main &&
 		git branch -d test-branch &&
 		git reset --hard HEAD^
 	)
@@ -266,7 +285,7 @@ test_expect_success 'local config should override .gitmodules branch' '
 	 git add file &&
 	 test_tick &&
 	 git commit -m "upstream line5" &&
-	 git checkout master
+	 git checkout main
 	) &&
 	(cd super &&
 	 git config submodule.submodule.branch test-branch &&
@@ -276,9 +295,9 @@ test_expect_success 'local config should override .gitmodules branch' '
 	)
 '
 
-test_expect_success 'submodule update --rebase staying on master' '
+test_expect_success 'submodule update --rebase staying on main' '
 	(cd super/submodule &&
-	  git checkout master
+	  git checkout main
 	) &&
 	(cd super &&
 	 (cd submodule &&
@@ -290,7 +309,7 @@ test_expect_success 'submodule update --rebase staying on master' '
 	)
 '
 
-test_expect_success 'submodule update --merge staying on master' '
+test_expect_success 'submodule update --merge staying on main' '
 	(cd super/submodule &&
 	  git reset --hard HEAD~1
 	) &&
@@ -406,16 +425,30 @@ test_expect_success 'submodule update - command in .git/config' '
 	)
 '
 
-test_expect_success 'submodule update - command in .gitmodules is ignored' '
+test_expect_success 'submodule update - command in .gitmodules is rejected' '
 	test_when_finished "git -C super reset --hard HEAD^" &&
 	git -C super config -f .gitmodules submodule.submodule.update "!false" &&
 	git -C super commit -a -m "add command to .gitmodules file" &&
 	git -C super/submodule reset --hard $submodulesha1^ &&
-	git -C super submodule update submodule
+	test_must_fail git -C super submodule update submodule
+'
+
+test_expect_success 'fsck detects command in .gitmodules' '
+	git init command-in-gitmodules &&
+	(
+		cd command-in-gitmodules &&
+		git submodule add ../submodule submodule &&
+		test_commit adding-submodule &&
+
+		git config -f .gitmodules submodule.submodule.update "!false" &&
+		git add .gitmodules &&
+		test_commit configuring-update &&
+		test_must_fail git fsck
+	)
 '
 
 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' '
@@ -428,11 +461,11 @@ test_expect_success 'submodule update - command in .git/config catches failure'
 	(cd super &&
 	 test_must_fail git submodule update submodule 2>../actual
 	) &&
-	test_i18ncmp actual expect
+	test_cmp actual expect
 '
 
 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' '
@@ -446,22 +479,22 @@ test_expect_success 'submodule update - command in .git/config catches failure -
 	 mkdir tmp && cd tmp &&
 	 test_must_fail git submodule update ../submodule 2>../../actual
 	) &&
-	test_i18ncmp actual expect
+	test_cmp actual expect
 '
 
 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 &&
-	test_i18ncmp expect actual &&
+	test_cmp expect actual &&
 	git -C super submodule update --checkout
 '
 
 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' '
@@ -476,10 +509,13 @@ test_expect_success 'recursive submodule update - command in .git/config catches
 	 mkdir -p tmp && cd tmp &&
 	 test_must_fail git submodule update --recursive ../super 2>../../actual
 	) &&
-	test_i18ncmp actual expect
+	test_cmp actual expect
 '
 
 test_expect_success 'submodule init does not copy command into .git/config' '
+	test_when_finished "git -C super update-index --force-remove submodule1" &&
+	test_when_finished git config -f super/.gitmodules \
+		--remove-section submodule.submodule1 &&
 	(cd super &&
 	 git ls-files -s submodule >out &&
 	 H=$(cut -d" " -f2 out) &&
@@ -488,10 +524,9 @@ test_expect_success 'submodule init does not copy command into .git/config' '
 	 git config -f .gitmodules submodule.submodule1.path submodule1 &&
 	 git config -f .gitmodules submodule.submodule1.url ../submodule &&
 	 git config -f .gitmodules submodule.submodule1.update !false &&
-	 git submodule init submodule1 &&
-	 echo "none" >expect &&
-	 git config submodule.submodule1.update >actual &&
-	 test_cmp expect actual
+	 test_must_fail git submodule init submodule1 &&
+	 test_expect_code 1 git config submodule.submodule1.update >actual &&
+	 test_must_be_empty actual
 	)
 '
 
@@ -577,7 +612,7 @@ test_expect_success 'submodule update - update=none in .git/config' '
 	(cd super &&
 	 git config submodule.submodule.update none &&
 	 (cd submodule &&
-	  git checkout master &&
+	  git checkout main &&
 	  compare_head
 	 ) &&
 	 git diff --name-only >out &&
@@ -597,7 +632,7 @@ test_expect_success 'submodule update - update=none in .git/config but --checkou
 	(cd super &&
 	 git config submodule.submodule.update none &&
 	 (cd submodule &&
-	  git checkout master &&
+	  git checkout main &&
 	  compare_head
 	 ) &&
 	 git diff --name-only >out &&
@@ -657,7 +692,7 @@ test_expect_success 'submodule update continues after checkout error' '
 test_expect_success 'submodule update continues after recursive checkout error' '
 	(cd super &&
 	 git reset --hard HEAD &&
-	 git checkout master &&
+	 git checkout main &&
 	 git submodule update &&
 	 (cd submodule &&
 	  git submodule add ../submodule subsubmodule &&
@@ -701,7 +736,7 @@ test_expect_success 'submodule update continues after recursive checkout error'
 
 test_expect_success 'submodule update exit immediately in case of merge conflict' '
 	(cd super &&
-	 git checkout master &&
+	 git checkout main &&
 	 git reset --hard HEAD &&
 	 (cd submodule &&
 	  (cd subsubmodule &&
@@ -719,7 +754,7 @@ test_expect_success 'submodule update exit immediately in case of merge conflict
 	 git add submodule2 &&
 	 git commit -m "two_new_submodule_commits" &&
 	 (cd submodule &&
-	  git checkout master &&
+	  git checkout main &&
 	  test_commit "conflict" file &&
 	  echo "conflict" > file
 	 ) &&
@@ -738,7 +773,7 @@ test_expect_success 'submodule update exit immediately in case of merge conflict
 
 test_expect_success 'submodule update exit immediately after recursive rebase error' '
 	(cd super &&
-	 git checkout master &&
+	 git checkout main &&
 	 git reset --hard HEAD &&
 	 (cd submodule &&
 	  git reset --hard HEAD &&
@@ -754,7 +789,7 @@ test_expect_success 'submodule update exit immediately after recursive rebase er
 	 git add submodule2 &&
 	 git commit -m "two_new_submodule_commits" &&
 	 (cd submodule &&
-	  git checkout master &&
+	  git checkout main &&
 	  test_commit "conflict2" file &&
 	  echo "conflict" > file
 	 ) &&
@@ -846,21 +881,21 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
 	git clone subsubsuper_update_r subsubsuper_update_r2 &&
 	(cd subsubsuper_update_r2 &&
 	 test_commit "update_subsubsuper" file &&
-	 git push origin master
+	 git push origin main
 	) &&
 	git clone subsuper_update_r subsuper_update_r2 &&
 	(cd subsuper_update_r2 &&
 	 test_commit "update_subsuper" file &&
 	 git submodule add ../subsubsuper_update_r subsubmodule &&
 	 git commit -am "subsubmodule" &&
-	 git push origin master
+	 git push origin main
 	) &&
 	git clone super_update_r super_update_r2 &&
 	(cd super_update_r2 &&
 	 test_commit "update_super" file &&
 	 git submodule add ../subsuper_update_r submodule &&
 	 git commit -am "submodule" &&
-	 git push origin master
+	 git push origin main
 	) &&
 	rm -rf super_update_r2 &&
 	git clone super_update_r super_update_r2 &&
@@ -879,7 +914,7 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re
 
 test_expect_success 'submodule add properly re-creates deeper level submodules' '
 	(cd super &&
-	 git reset --hard master &&
+	 git reset --hard main &&
 	 rm -rf deeper/ &&
 	 git submodule add --force ../submodule deeper/submodule
 	)
@@ -944,7 +979,7 @@ test_expect_success 'submodule update clone shallow submodule outside of depth'
 		mv -f .gitmodules.tmp .gitmodules &&
 		# Some protocol versions (e.g. 2) support fetching
 		# unadvertised objects, so restrict this test to v0.
-		test_must_fail env GIT_TEST_PROTOCOL_VERSION= \
+		test_must_fail env GIT_TEST_PROTOCOL_VERSION=0 \
 			git submodule update --init --depth=1 2>actual &&
 		test_i18ngrep "Direct fetching of that commit failed." actual &&
 		git -C ../submodule config uploadpack.allowReachableSHA1InWant true &&
@@ -990,4 +1025,40 @@ test_expect_success 'git clone passes the parallel jobs config on to submodules'
 	rm -rf super4
 '
 
+test_expect_success 'submodule update --quiet passes quietness to merge/rebase' '
+	(cd super &&
+	 test_commit -C rebasing message &&
+	 git submodule update --rebase --quiet >out 2>err &&
+	 test_must_be_empty out &&
+	 test_must_be_empty err &&
+	 git submodule update --rebase -v >out 2>err &&
+	 test_file_not_empty out &&
+	 test_must_be_empty err
+	)
+'
+
+test_expect_success 'submodule update --quiet passes quietness to fetch with a shallow clone' '
+	test_when_finished "rm -rf super4 super5 super6" &&
+	git clone . super4 &&
+	(cd super4 &&
+	 git submodule add --quiet file://"$TRASH_DIRECTORY"/submodule submodule3 &&
+	 git commit -am "setup submodule3"
+	) &&
+	(cd submodule &&
+	  test_commit line6 file
+	) &&
+	git clone super4 super5 &&
+	(cd super5 &&
+	 git submodule update --quiet --init --depth=1 submodule3 >out 2>err &&
+	 test_must_be_empty out &&
+	 test_must_be_empty err
+	) &&
+	git clone super4 super6 &&
+	(cd super6 &&
+	 git submodule update --init --depth=1 submodule3 >out 2>err &&
+	 test_file_not_empty out &&
+	 test_file_not_empty err
+	)
+'
+
 test_done
diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
index 6b2aa917e1..e2f110b786 100755
--- a/t/t7407-submodule-foreach.sh
+++ b/t/t7407-submodule-foreach.sh
@@ -9,6 +9,9 @@ This test verifies that "git submodule foreach" correctly visits all submodules
 that are currently checked out.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
@@ -77,7 +80,7 @@ test_expect_success 'test basic "submodule foreach" usage' '
 		git config foo.bar zar &&
 		git submodule foreach "git config --file \"\$toplevel/.git/config\" foo.bar"
 	) &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat >expect <<EOF
@@ -93,7 +96,7 @@ test_expect_success 'test "submodule foreach" from subdirectory' '
 		cd clone/sub &&
 		git submodule foreach "echo \$toplevel-\$name-\$sm_path-\$displaypath-\$sha1" >../../actual
 	) &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'setup nested submodules' '
@@ -174,7 +177,7 @@ test_expect_success 'test messages from "foreach --recursive"' '
 		cd clone2 &&
 		git submodule foreach --recursive "true" > ../actual
 	) &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat > expect <<EOF
@@ -194,7 +197,7 @@ test_expect_success 'test messages from "foreach --recursive" from subdirectory'
 		cd untracked &&
 		git submodule foreach --recursive >../../actual
 	) &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 sub1sha1=$(cd clone2/sub1 && git rev-parse HEAD)
 sub2sha1=$(cd clone2/sub2 && git rev-parse HEAD)
@@ -226,7 +229,7 @@ test_expect_success 'test "submodule foreach --recursive" from subdirectory' '
 		cd clone2/untracked &&
 		git submodule foreach --recursive "echo toplevel: \$toplevel name: \$name path: \$sm_path displaypath: \$displaypath hash: \$sha1" >../../actual
 	) &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 cat > expect <<EOF
@@ -277,13 +280,13 @@ sub1sha1_short=$(cd clone3/sub1 && git rev-parse --short HEAD)
 sub2sha1_short=$(cd clone3/sub2 && git rev-parse --short HEAD)
 
 cat > expect <<EOF
- $nested1sha1 nested1 (heads/master)
- $nested2sha1 nested1/nested2 (heads/master)
- $nested3sha1 nested1/nested2/nested3 (heads/master)
- $submodulesha1 nested1/nested2/nested3/submodule (heads/master)
+ $nested1sha1 nested1 (heads/main)
+ $nested2sha1 nested1/nested2 (heads/main)
+ $nested3sha1 nested1/nested2/nested3 (heads/main)
+ $submodulesha1 nested1/nested2/nested3/submodule (heads/main)
  $sub1sha1 sub1 ($sub1sha1_short)
  $sub2sha1 sub2 ($sub2sha1_short)
- $sub3sha1 sub3 (heads/master)
+ $sub3sha1 sub3 (heads/main)
 EOF
 
 test_expect_success 'test "status --recursive"' '
@@ -295,10 +298,10 @@ test_expect_success 'test "status --recursive"' '
 '
 
 cat > expect <<EOF
- $nested1sha1 nested1 (heads/master)
+ $nested1sha1 nested1 (heads/main)
 +$nested2sha1 nested1/nested2 (file2~1)
- $nested3sha1 nested1/nested2/nested3 (heads/master)
- $submodulesha1 nested1/nested2/nested3/submodule (heads/master)
+ $nested3sha1 nested1/nested2/nested3 (heads/main)
+ $submodulesha1 nested1/nested2/nested3/submodule (heads/main)
 EOF
 
 test_expect_success 'ensure "status --cached --recursive" preserves the --cached flag' '
@@ -316,13 +319,13 @@ test_expect_success 'ensure "status --cached --recursive" preserves the --cached
 nested2sha1=$(git -C clone3/nested1/nested2 rev-parse HEAD)
 
 cat > expect <<EOF
- $nested1sha1 ../nested1 (heads/master)
+ $nested1sha1 ../nested1 (heads/main)
 +$nested2sha1 ../nested1/nested2 (file2)
- $nested3sha1 ../nested1/nested2/nested3 (heads/master)
- $submodulesha1 ../nested1/nested2/nested3/submodule (heads/master)
+ $nested3sha1 ../nested1/nested2/nested3 (heads/main)
+ $submodulesha1 ../nested1/nested2/nested3/submodule (heads/main)
  $sub1sha1 ../sub1 ($sub1sha1_short)
  $sub2sha1 ../sub2 ($sub2sha1_short)
- $sub3sha1 ../sub3 (heads/master)
+ $sub3sha1 ../sub3 (heads/main)
 EOF
 
 test_expect_success 'test "status --recursive" from sub directory' '
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh
index 34ac28c056..a3892f494b 100755
--- a/t/t7408-submodule-reference.sh
+++ b/t/t7408-submodule-reference.sh
@@ -122,8 +122,8 @@ test_expect_success 'missing submodule alternate fails clone and submodule updat
 		# update of the submodule succeeds
 		test_must_fail git submodule update --init &&
 		# and we have no alternates:
-		test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub &&
-		test_must_fail test_path_is_file sub/file1
+		test_path_is_missing .git/modules/sub/objects/info/alternates &&
+		test_path_is_missing sub/file1
 	)
 '
 
@@ -137,7 +137,7 @@ test_expect_success 'ignoring missing submodule alternates passes clone and subm
 		# update of the submodule succeeds
 		git submodule update --init &&
 		# and we have no alternates:
-		test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub &&
+		test_path_is_missing .git/modules/sub/objects/info/alternates &&
 		test_path_is_file sub/file1
 	)
 '
@@ -182,7 +182,7 @@ check_that_two_of_three_alternates_are_used() {
 	# immediate submodule has alternate:
 	test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
 	# but nested submodule has no alternate:
-	test_must_fail test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
+	test_path_is_missing .git/modules/subwithsub/modules/sub/objects/info/alternates
 }
 
 
diff --git a/t/t7409-submodule-detached-work-tree.sh b/t/t7409-submodule-detached-work-tree.sh
index fc018e3638..e17ac81a89 100755
--- a/t/t7409-submodule-detached-work-tree.sh
+++ b/t/t7409-submodule-detached-work-tree.sh
@@ -10,6 +10,9 @@ on detached working trees
 '
 
 TEST_NO_CREATE_REPO=1
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'submodule on detached working tree' '
@@ -35,7 +38,7 @@ test_expect_success 'submodule on detached working tree' '
 			git rev-parse --verify HEAD >actual &&
 			test_cmp ../../../../expect actual
 		) &&
-		git push origin master
+		git push origin main
 	) &&
 	mkdir home2 &&
 	(
@@ -44,7 +47,7 @@ test_expect_success 'submodule on detached working tree' '
 		GIT_WORK_TREE="$(pwd)" &&
 		GIT_DIR="$(pwd)/.dotfiles" &&
 		export GIT_WORK_TREE GIT_DIR &&
-		git checkout master &&
+		git checkout main &&
 		git submodule update --init &&
 		(
 			unset GIT_WORK_TREE GIT_DIR &&
@@ -64,10 +67,10 @@ test_expect_success 'submodule on detached working pointed by core.worktree' '
 		git clone --bare ../remote "$GIT_DIR" &&
 		git config core.bare false &&
 		git config core.worktree .. &&
-		git checkout master &&
+		git checkout main &&
 		git submodule add ../bundle1 .vim/bundle/dupe &&
 		test_commit "dupe" &&
-		git push origin master
+		git push origin main
 	) &&
 	(
 		cd home &&
diff --git a/t/t7410-submodule-checkout-to.sh b/t/t7410-submodule-checkout-to.sh
deleted file mode 100755
index f1b492ebc4..0000000000
--- a/t/t7410-submodule-checkout-to.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-
-test_description='Combination of submodules and multiple workdirs'
-
-. ./test-lib.sh
-
-base_path=$(pwd -P)
-
-test_expect_success 'setup: make origin'  '
-	mkdir -p origin/sub &&
-	(
-		cd origin/sub && git init &&
-		echo file1 >file1 &&
-		git add file1 &&
-		git commit -m file1
-	) &&
-	mkdir -p origin/main &&
-	(
-		cd origin/main && git init &&
-		git submodule add ../sub &&
-		git commit -m "add sub"
-	) &&
-	(
-		cd origin/sub &&
-		echo file1updated >file1 &&
-		git add file1 &&
-		git commit -m "file1 updated"
-	) &&
-	git -C origin/main/sub pull &&
-	(
-		cd origin/main &&
-		git add sub &&
-		git commit -m "sub updated"
-	)
-'
-
-test_expect_success 'setup: clone' '
-	mkdir clone &&
-	git -C clone clone --recursive "$base_path/origin/main"
-'
-
-rev1_hash_main=$(git --git-dir=origin/main/.git show --pretty=format:%h -q "HEAD~1")
-rev1_hash_sub=$(git --git-dir=origin/sub/.git show --pretty=format:%h -q "HEAD~1")
-
-test_expect_success 'checkout main' '
-	mkdir default_checkout &&
-	git -C clone/main worktree add "$base_path/default_checkout/main" "$rev1_hash_main"
-'
-
-test_expect_failure 'can see submodule diffs just after checkout' '
-	git -C default_checkout/main diff --submodule master"^!" >out &&
-	grep "file1 updated" out
-'
-
-test_expect_success 'checkout main and initialize independent clones' '
-	mkdir fully_cloned_submodule &&
-	git -C clone/main worktree add "$base_path/fully_cloned_submodule/main" "$rev1_hash_main" &&
-	git -C fully_cloned_submodule/main submodule update
-'
-
-test_expect_success 'can see submodule diffs after independent cloning' '
-	git -C fully_cloned_submodule/main diff --submodule master"^!" >out &&
-	grep "file1 updated" out
-'
-
-test_expect_success 'checkout sub manually' '
-	mkdir linked_submodule &&
-	git -C clone/main worktree add "$base_path/linked_submodule/main" "$rev1_hash_main" &&
-	git -C clone/main/sub worktree add "$base_path/linked_submodule/main/sub" "$rev1_hash_sub"
-'
-
-test_expect_success 'can see submodule diffs after manual checkout of linked submodule' '
-	git -C linked_submodule/main diff --submodule master"^!" >out &&
-	grep "file1 updated" out
-'
-
-test_done
diff --git a/t/t7416-submodule-dash-url.sh b/t/t7416-submodule-dash-url.sh
index 1cd2c1c1ea..d21dc8b009 100755
--- a/t/t7416-submodule-dash-url.sh
+++ b/t/t7416-submodule-dash-url.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='check handling of .gitmodule url with dash'
+test_description='check handling of disallowed .gitmodule urls'
 . ./test-lib.sh
 
 test_expect_success 'create submodule with protected dash in url' '
@@ -46,4 +46,174 @@ test_expect_success 'fsck rejects unprotected dash' '
 	grep gitmodulesUrl err
 '
 
+test_expect_success 'trailing backslash is handled correctly' '
+	git init testmodule &&
+	test_commit -C testmodule c &&
+	git submodule add ./testmodule &&
+	: ensure that the name ends in a double backslash &&
+	sed -e "s|\\(submodule \"testmodule\\)\"|\\1\\\\\\\\\"|" \
+		-e "s|url = .*|url = \" --should-not-be-an-option\"|" \
+		<.gitmodules >.new &&
+	mv .new .gitmodules &&
+	git commit -am "Add testmodule" &&
+	test_must_fail git clone --verbose --recurse-submodules . dolly 2>err &&
+	test_i18ngrep ! "unknown option" err
+'
+
+test_expect_success 'fsck rejects missing URL scheme' '
+	git checkout --orphan missing-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http::one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with missing URL scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects relative URL resolving to missing scheme' '
+	git checkout --orphan relative-missing-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "..\\../.\\../:one.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with relative URL that strips off scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects empty URL scheme' '
+	git checkout --orphan empty-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http::://one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with empty URL scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects relative URL resolving to empty scheme' '
+	git checkout --orphan relative-empty-scheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = ../../../:://one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "relative gitmodules URL resolving to empty scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects empty hostname' '
+	git checkout --orphan empty-host &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = http:///one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules with extra slashes" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects relative url that produced empty hostname' '
+	git checkout --orphan messy-relative &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = ../../..//one.example.com/foo.git
+	EOF
+	git add .gitmodules &&
+	test_tick &&
+	git commit -m "gitmodules abusing relative_path" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck permits embedded newline with unrecognized scheme' '
+	git checkout --orphan newscheme &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "data://acjbkd%0akajfdickajkd"
+	EOF
+	git add .gitmodules &&
+	git commit -m "gitmodules with unrecognized scheme" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	git push dst HEAD
+'
+
+test_expect_success 'fsck rejects embedded newline in url' '
+	# create an orphan branch to avoid existing .gitmodules objects
+	git checkout --orphan newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+	url = "https://one.example.com?%0ahost=two.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "gitmodules with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects embedded newline in relative url' '
+	git checkout --orphan relative-newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+		url = "./%0ahost=two.example.com/foo.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "relative url with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
+test_expect_success 'fsck rejects embedded newline in git url' '
+	git checkout --orphan git-newline &&
+	cat >.gitmodules <<-\EOF &&
+	[submodule "foo"]
+	url = "git://example.com:1234/repo%0a.git"
+	EOF
+	git add .gitmodules &&
+	git commit -m "git url with newline" &&
+	test_when_finished "rm -rf dst" &&
+	git init --bare dst &&
+	git -C dst config transfer.fsckObjects true &&
+	test_must_fail git push dst HEAD 2>err &&
+	grep gitmodulesUrl err
+'
+
 test_done
diff --git a/t/t7417-submodule-path-url.sh b/t/t7417-submodule-path-url.sh
index 756af8c4d6..f0f6b9fa9e 100755
--- a/t/t7417-submodule-path-url.sh
+++ b/t/t7417-submodule-path-url.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='check handling of .gitmodule path with dash'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'create submodule with dash in path' '
@@ -25,4 +28,21 @@ test_expect_success 'fsck rejects unprotected dash' '
 	grep gitmodulesPath err
 '
 
+test_expect_success MINGW 'submodule paths disallows trailing spaces' '
+	git init super &&
+	test_must_fail git -C super submodule add ../upstream "sub " &&
+
+	: add "sub", then rename "sub" to "sub ", the hard way &&
+	git -C super submodule add ../upstream sub &&
+	tree=$(git -C super write-tree) &&
+	git -C super ls-tree $tree >tree &&
+	sed "s/sub/sub /" <tree >tree.new &&
+	tree=$(git -C super mktree <tree.new) &&
+	commit=$(echo with space | git -C super commit-tree $tree) &&
+	git -C super update-ref refs/heads/main $commit &&
+
+	test_must_fail git clone --recurse-submodules super dst 2>err &&
+	test_i18ngrep "sub " err
+'
+
 test_done
diff --git a/t/t7419-submodule-set-branch.sh b/t/t7419-submodule-set-branch.sh
index fd25f786a3..3b925c302f 100755
--- a/t/t7419-submodule-set-branch.sh
+++ b/t/t7419-submodule-set-branch.sh
@@ -52,12 +52,13 @@ test_expect_success 'test submodule set-branch --branch' '
 '
 
 test_expect_success 'test submodule set-branch --default' '
+	test_commit -C submodule c &&
 	(cd super &&
 		git submodule set-branch --default submodule &&
 		! grep branch .gitmodules &&
 		git submodule update --remote &&
 		cat <<-\EOF >expect &&
-		a
+		c
 		EOF
 		git -C submodule show -s --pretty=%s >actual &&
 		test_cmp expect actual
@@ -65,6 +66,7 @@ test_expect_success 'test submodule set-branch --default' '
 '
 
 test_expect_success 'test submodule set-branch -b' '
+	test_commit -C submodule b &&
 	(cd super &&
 		git submodule set-branch -b topic submodule &&
 		grep "branch = topic" .gitmodules &&
@@ -78,12 +80,13 @@ test_expect_success 'test submodule set-branch -b' '
 '
 
 test_expect_success 'test submodule set-branch -d' '
+	test_commit -C submodule d &&
 	(cd super &&
 		git submodule set-branch -d submodule &&
 		! grep branch .gitmodules &&
 		git submodule update --remote &&
 		cat <<-\EOF >expect &&
-		a
+		d
 		EOF
 		git -C submodule show -s --pretty=%s >actual &&
 		test_cmp expect actual
diff --git a/t/t7420-submodule-set-url.sh b/t/t7420-submodule-set-url.sh
new file mode 100755
index 0000000000..ef0cb6e8e1
--- /dev/null
+++ b/t/t7420-submodule-set-url.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+#
+# Copyright (c) 2019 Denton Liu
+#
+
+test_description='Test submodules set-url subcommand
+
+This test verifies that the set-url subcommand of git-submodule is working
+as expected.
+'
+
+TEST_NO_CREATE_REPO=1
+. ./test-lib.sh
+
+test_expect_success 'submodule config cache setup' '
+	mkdir submodule &&
+	(
+		cd submodule &&
+		git init &&
+		echo a >file &&
+		git add file &&
+		git commit -ma
+	) &&
+	mkdir super &&
+	(
+		cd super &&
+		git init &&
+		git submodule add ../submodule &&
+		git commit -m "add submodule"
+	)
+'
+
+test_expect_success 'test submodule set-url' '
+	# add a commit and move the submodule (change the url)
+	(
+		cd submodule &&
+		echo b >>file &&
+		git add file &&
+		git commit -mb
+	) &&
+	mv submodule newsubmodule &&
+
+	git -C newsubmodule show >expect &&
+	(
+		cd super &&
+		test_must_fail git submodule update --remote &&
+		git submodule set-url submodule ../newsubmodule &&
+		grep -F "url = ../newsubmodule" .gitmodules &&
+		git submodule update --remote
+	) &&
+	git -C super/submodule show >actual &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t7421-submodule-summary-add.sh b/t/t7421-submodule-summary-add.sh
new file mode 100755
index 0000000000..b070f13714
--- /dev/null
+++ b/t/t7421-submodule-summary-add.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+#
+# Copyright (C) 2020 Shourya Shukla
+#
+
+test_description='Summary support for submodules, adding them using git submodule add
+
+This test script tries to verify the sanity of summary subcommand of git submodule
+while making sure to add submodules using `git submodule add` instead of
+`git add` as done in t7401.
+'
+
+. ./test-lib.sh
+
+test_expect_success 'summary test environment setup' '
+	git init sm &&
+	test_commit -C sm "add file" file file-content file-tag &&
+
+	git submodule add ./sm my-subm &&
+	test_tick &&
+	git commit -m "add submodule"
+'
+
+test_expect_success 'submodule summary output for initialized submodule' '
+	test_commit -C sm "add file2" file2 file2-content file2-tag &&
+	git submodule update --remote &&
+	test_tick &&
+	git commit -m "update submodule" my-subm &&
+	git submodule summary HEAD^ >actual &&
+	rev1=$(git -C sm rev-parse --short HEAD^) &&
+	rev2=$(git -C sm rev-parse --short HEAD) &&
+	cat >expected <<-EOF &&
+	* my-subm ${rev1}...${rev2} (1):
+	  > add file2
+
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'submodule summary output for deinitialized submodule' '
+	git submodule deinit my-subm &&
+	git submodule summary HEAD^ >actual &&
+	test_must_be_empty actual &&
+	git submodule update --init my-subm &&
+	git submodule summary HEAD^ >actual &&
+	rev1=$(git -C sm rev-parse --short HEAD^) &&
+	rev2=$(git -C sm rev-parse --short HEAD) &&
+	cat >expected <<-EOF &&
+	* my-subm ${rev1}...${rev2} (1):
+	  > add file2
+
+	EOF
+	test_cmp expected actual
+'
+
+test_expect_success 'submodule summary output for submodules with changed paths' '
+	git mv my-subm subm &&
+	git commit -m "change submodule path" &&
+	rev=$(git -C sm rev-parse --short HEAD^) &&
+	git submodule summary HEAD^^ -- my-subm >actual 2>err &&
+	test_must_be_empty err &&
+	cat >expected <<-EOF &&
+	* my-subm ${rev}...0000000:
+
+	EOF
+	test_cmp expected actual
+'
+
+test_done
diff --git a/t/t7415-submodule-names.sh b/t/t7450-bad-git-dotfiles.sh
index 49a37efe9c..41706c1c9f 100755
--- a/t/t7415-submodule-names.sh
+++ b/t/t7450-bad-git-dotfiles.sh
@@ -1,9 +1,16 @@
 #!/bin/sh
 
-test_description='check handling of .. in submodule names
+test_description='check broken or malicious patterns in .git* files
 
-Exercise the name-checking function on a variety of names, and then give a
-real-world setup that confirms we catch this in practice.
+Such as:
+
+  - presence of .. in submodule names;
+    Exercise the name-checking function on a variety of names, and then give a
+    real-world setup that confirms we catch this in practice.
+
+  - nested submodule names
+
+  - symlinked .gitmodules, etc
 '
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-pack.sh
@@ -132,31 +139,84 @@ test_expect_success 'index-pack --strict works for non-repo pack' '
 	grep gitmodulesName output
 '
 
-test_expect_success 'fsck detects symlinked .gitmodules file' '
-	git init symlink &&
-	(
-		cd symlink &&
-
-		# Make the tree directly to avoid index restrictions.
-		#
-		# Because symlinks store the target as a blob, choose
-		# a pathname that could be parsed as a .gitmodules file
-		# to trick naive non-symlink-aware checking.
-		tricky="[foo]bar=true" &&
-		content=$(git hash-object -w ../.gitmodules) &&
-		target=$(printf "$tricky" | git hash-object -w --stdin) &&
-		{
-			printf "100644 blob $content\t$tricky\n" &&
-			printf "120000 blob $target\t.gitmodules\n"
-		} | git mktree &&
-
-		# Check not only that we fail, but that it is due to the
-		# symlink detector; this grep string comes from the config
-		# variable name and will not be translated.
-		test_must_fail git fsck 2>output &&
-		test_i18ngrep gitmodulesSymlink output
-	)
-'
+check_dotx_symlink () {
+	fsck_must_fail=test_must_fail
+	fsck_prefix=error
+	refuse_index=t
+	case "$1" in
+	--warning)
+		fsck_must_fail=
+		fsck_prefix=warning
+		refuse_index=
+		shift
+		;;
+	esac
+
+	name=$1
+	type=$2
+	path=$3
+	dir=symlink-$name-$type
+
+	test_expect_success "set up repo with symlinked $name ($type)" '
+		git init $dir &&
+		(
+			cd $dir &&
+
+			# Make the tree directly to avoid index restrictions.
+			#
+			# Because symlinks store the target as a blob, choose
+			# a pathname that could be parsed as a .gitmodules file
+			# to trick naive non-symlink-aware checking.
+			tricky="[foo]bar=true" &&
+			content=$(git hash-object -w ../.gitmodules) &&
+			target=$(printf "$tricky" | git hash-object -w --stdin) &&
+			{
+				printf "100644 blob $content\t$tricky\n" &&
+				printf "120000 blob $target\t$path\n"
+			} >bad-tree
+		) &&
+		tree=$(git -C $dir mktree <$dir/bad-tree)
+	'
+
+	test_expect_success "fsck detects symlinked $name ($type)" '
+		(
+			cd $dir &&
+
+			# Check not only that we fail, but that it is due to the
+			# symlink detector
+			$fsck_must_fail git fsck 2>output &&
+			grep "$fsck_prefix.*tree $tree: ${name}Symlink" output
+		)
+	'
+
+	test -n "$refuse_index" &&
+	test_expect_success "refuse to load symlinked $name into index ($type)" '
+		test_must_fail \
+			git -C $dir \
+			    -c core.protectntfs \
+			    -c core.protecthfs \
+			    read-tree $tree 2>err &&
+		grep "invalid path.*$name" err &&
+		git -C $dir ls-files -s >out &&
+		test_must_be_empty out
+	'
+}
+
+check_dotx_symlink gitmodules vanilla .gitmodules
+check_dotx_symlink gitmodules ntfs ".gitmodules ."
+check_dotx_symlink gitmodules hfs ".${u200c}gitmodules"
+
+check_dotx_symlink --warning gitattributes vanilla .gitattributes
+check_dotx_symlink --warning gitattributes ntfs ".gitattributes ."
+check_dotx_symlink --warning gitattributes hfs ".${u200c}gitattributes"
+
+check_dotx_symlink --warning gitignore vanilla .gitignore
+check_dotx_symlink --warning gitignore ntfs ".gitignore ."
+check_dotx_symlink --warning gitignore hfs ".${u200c}gitignore"
+
+check_dotx_symlink --warning mailmap vanilla .mailmap
+check_dotx_symlink --warning mailmap ntfs ".mailmap ."
+check_dotx_symlink --warning mailmap hfs ".${u200c}mailmap"
 
 test_expect_success 'fsck detects non-blob .gitmodules' '
 	git init non-blob &&
@@ -191,4 +251,64 @@ test_expect_success 'fsck detects corrupt .gitmodules' '
 	)
 '
 
+test_expect_success WINDOWS 'prevent git~1 squatting on Windows' '
+	git init squatting &&
+	(
+		cd squatting &&
+		mkdir a &&
+		touch a/..git &&
+		git add a/..git &&
+		test_tick &&
+		git commit -m initial &&
+
+		modules="$(test_write_lines \
+			"[submodule \"b.\"]" "url = ." "path = c" \
+			"[submodule \"b\"]" "url = ." "path = d\\\\a" |
+			git hash-object -w --stdin)" &&
+		rev="$(git rev-parse --verify HEAD)" &&
+		hash="$(echo x | git hash-object -w --stdin)" &&
+		test_must_fail git update-index --add \
+			--cacheinfo 160000,$rev,d\\a 2>err &&
+		test_i18ngrep "Invalid path" err &&
+		git -c core.protectNTFS=false update-index --add \
+			--cacheinfo 100644,$modules,.gitmodules \
+			--cacheinfo 160000,$rev,c \
+			--cacheinfo 160000,$rev,d\\a \
+			--cacheinfo 100644,$hash,d./a/x \
+			--cacheinfo 100644,$hash,d./a/..git &&
+		test_tick &&
+		git -c core.protectNTFS=false commit -m "module"
+	) &&
+	if test_have_prereq MINGW
+	then
+		test_must_fail git -c core.protectNTFS=false \
+			clone --recurse-submodules squatting squatting-clone 2>err &&
+		test_i18ngrep -e "directory not empty" -e "not an empty directory" err &&
+		! grep gitdir squatting-clone/d/a/git~2
+	fi
+'
+
+test_expect_success 'git dirs of sibling submodules must not be nested' '
+	git init nested &&
+	test_commit -C nested nested &&
+	(
+		cd nested &&
+		cat >.gitmodules <<-EOF &&
+		[submodule "hippo"]
+			url = .
+			path = thing1
+		[submodule "hippo/hooks"]
+			url = .
+			path = thing2
+		EOF
+		git clone . thing1 &&
+		git clone . thing2 &&
+		git add .gitmodules thing1 thing2 &&
+		test_tick &&
+		git commit -m nested
+	) &&
+	test_must_fail git clone --recurse-submodules nested clone 2>err &&
+	test_i18ngrep "is inside git dir" err
+'
+
 test_done
diff --git a/t/t7500-commit-template-squash-signoff.sh b/t/t7500-commit-template-squash-signoff.sh
index 46a5cd4b73..8dd0f98812 100755
--- a/t/t7500-commit-template-squash-signoff.sh
+++ b/t/t7500-commit-template-squash-signoff.sh
@@ -9,13 +9,15 @@ Tests for template, signoff, squash and -F functions.'
 
 . ./test-lib.sh
 
+. "$TEST_DIRECTORY"/lib-rebase.sh
+
 commit_msg_is () {
 	expect=commit_msg_is.expect
 	actual=commit_msg_is.actual
 
 	printf "%s" "$(git log --pretty=format:%s%b -1)" >"$actual" &&
 	printf "%s" "$1" >"$expect" &&
-	test_i18ncmp "$expect" "$actual"
+	test_cmp "$expect" "$actual"
 }
 
 # A sanity check to see if commit is working at all.
@@ -268,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"
 '
 
@@ -279,6 +281,170 @@ 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"
+}
+
+test_expect_success 'commit --fixup=amend: creates amend! commit' '
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited" \
+			git commit --fixup=amend:HEAD~
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success '--fixup=amend: --only ignores staged changes' '
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited" \
+			git commit --fixup=amend:HEAD~ --only
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual &&
+	test_cmp_rev HEAD@{1}^{tree} HEAD^{tree} &&
+	test_cmp_rev HEAD@{1} HEAD^ &&
+	test_expect_code 1 git diff --cached --exit-code &&
+	git cat-file blob :foo >actual &&
+	test_cmp foo actual
+'
+
+test_expect_success '--fixup=reword: ignores staged changes' '
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited" \
+			git commit --fixup=reword:HEAD~
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual &&
+	test_cmp_rev HEAD@{1}^{tree} HEAD^{tree} &&
+	test_cmp_rev HEAD@{1} HEAD^ &&
+	test_expect_code 1 git diff --cached --exit-code &&
+	git cat-file blob :foo >actual &&
+	test_cmp foo actual
+'
+
+test_expect_success '--fixup=reword: error out with -m option' '
+	commit_for_rebase_autosquash_setup &&
+	echo "fatal: cannot combine -m with --fixup:reword" >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 &&
+	test_must_fail git commit --fixup=amend:HEAD~ -m "amend commit message" 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'consecutive amend! commits remove amend! line from commit msg body' '
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! amend! $(git log -1 --format=%s HEAD~)
+
+	$(get_commit_msg HEAD~)
+
+	edited 1
+
+	edited 2
+	EOF
+	echo "reword new commit message" >actual &&
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_AMEND="edited 1" \
+			git commit --fixup=reword:HEAD~ &&
+		FAKE_COMMIT_AMEND="edited 2" \
+			git commit --fixup=reword:HEAD
+	) &&
+	get_commit_msg HEAD >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'deny to create amend! commit if its commit msg body is empty' '
+	commit_for_rebase_autosquash_setup &&
+	echo "Aborting commit due to empty commit message body." >expected &&
+	(
+		set_fake_editor &&
+		test_must_fail env FAKE_COMMIT_MESSAGE="amend! target message subject line" \
+			git commit --fixup=amend:HEAD~ 2>actual
+	) &&
+	test_cmp expected actual
+'
+
+test_expect_success 'amend! commit allows empty commit msg body with --allow-empty-message' '
+	commit_for_rebase_autosquash_setup &&
+	cat >expected <<-EOF &&
+	amend! $(git log -1 --format=%s HEAD~)
+	EOF
+	(
+		set_fake_editor &&
+		FAKE_COMMIT_MESSAGE="amend! target message subject line" \
+			git commit --fixup=amend:HEAD~ --allow-empty-message &&
+		get_commit_msg HEAD >actual
+	) &&
+	test_cmp expected actual
+'
+
+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 &&
+		test_must_fail git commit --fixup=reword:HEAD~ $1 2>actual &&
+		test_cmp expect actual
+	"
+}
+
+for opt in --all --include --only --interactive --patch
+do
+	test_fixup_reword_opt $opt
+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 &&
+	test_must_fail git commit --fixup=reword:HEAD~ -- foo 2>actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--fixup=reword: -F give error message' '
+	echo "fatal: Only one of -c/-C/-F/--fixup can be used." >expect &&
+	test_must_fail git commit --fixup=reword:HEAD~ -F msg  2>actual &&
+	test_cmp expect actual
+'
 
 test_expect_success 'commit --squash works with -F' '
 	commit_for_rebase_autosquash_setup &&
@@ -339,7 +505,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>
 #
@@ -356,7 +522,7 @@ test_expect_success 'new line found before status message in commit template' '
 	touch commit-template-check &&
 	git add commit-template-check &&
 	GIT_EDITOR="cat >editor-input" git commit --untracked-files=no --allow-empty-message &&
-	test_i18ncmp expected-template editor-input
+	test_cmp expected-template editor-input
 '
 
 test_expect_success 'setup empty commit with unstaged rename and copy' '
@@ -382,4 +548,13 @@ test_expect_success 'check commit with unstaged rename and copy' '
 	)
 '
 
+test_expect_success 'commit without staging files fails and displays hints' '
+	echo "initial" >file &&
+	git add file &&
+	git commit -m initial &&
+	echo "changes" >>file &&
+	test_must_fail git commit -m update >actual &&
+	test_i18ngrep "no changes added to commit (use \"git add\" and/or \"git commit -a\")" actual
+'
+
 test_done
diff --git a/t/t7501-commit-basic-functionality.sh b/t/t7501-commit-basic-functionality.sh
index f1349af56e..512ae2781f 100755
--- a/t/t7501-commit-basic-functionality.sh
+++ b/t/t7501-commit-basic-functionality.sh
@@ -7,8 +7,11 @@
 # signoff
 
 test_description='git commit'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
-. "$TEST_DIRECTORY/diff-lib.sh"
+. "$TEST_DIRECTORY/lib-diff.sh"
 
 author='The Real Author <someguy@his.email.org>'
 
@@ -150,7 +153,7 @@ test_expect_success 'setup: commit message from file' '
 test_expect_success 'amend commit' '
 	cat >editor <<-\EOF &&
 	#!/bin/sh
-	sed -e "s/a file/an amend commit/g" < "$1" > "$1-"
+	sed -e "s/a file/an amend commit/g" <"$1" >"$1-"
 	mv "$1-" "$1"
 	EOF
 	chmod 755 editor &&
@@ -263,7 +266,7 @@ test_expect_success 'using message from other commit' '
 test_expect_success 'editing message from other commit' '
 	cat >editor <<-\EOF &&
 	#!/bin/sh
-	sed -e "s/amend/older/g"  < "$1" > "$1-"
+	sed -e "s/amend/older/g"  <"$1" >"$1-"
 	mv "$1-" "$1"
 	EOF
 	chmod 755 editor &&
@@ -285,9 +288,8 @@ test_expect_success 'overriding author from command line' '
 '
 
 test_expect_success PERL 'interactive add' '
-	echo 7 |
-	git commit --interactive |
-	grep "What now"
+	echo 7 | test_must_fail git commit --interactive >out &&
+	grep "What now" out
 '
 
 test_expect_success PERL "commit --interactive doesn't change index if editor aborts" '
@@ -362,12 +364,12 @@ test_expect_success 'amend commit to fix author' '
 	oldtick=$GIT_AUTHOR_DATE &&
 	test_tick &&
 	git reset --hard &&
-	git cat-file -p HEAD |
+	git cat-file -p HEAD >commit &&
 	sed -e "s/author.*/author $author $oldtick/" \
-		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
-		expected &&
+		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \
+		commit >expected &&
 	git commit --amend --author="$author" &&
-	git cat-file -p HEAD > current &&
+	git cat-file -p HEAD >current &&
 	test_cmp expected current
 
 '
@@ -377,12 +379,12 @@ test_expect_success 'amend commit to fix date' '
 	test_tick &&
 	newtick=$GIT_AUTHOR_DATE &&
 	git reset --hard &&
-	git cat-file -p HEAD |
+	git cat-file -p HEAD >commit &&
 	sed -e "s/author.*/author $author $newtick/" \
-		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
-		expected &&
+		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \
+		commit >expected &&
 	git commit --amend --date="$newtick" &&
-	git cat-file -p HEAD > current &&
+	git cat-file -p HEAD >current &&
 	test_cmp expected current
 
 '
@@ -409,12 +411,13 @@ test_expect_success 'sign off (1)' '
 	echo 1 >positive &&
 	git add positive &&
 	git commit -s -m "thank you" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo thank you &&
 		echo &&
-		git var GIT_COMMITTER_IDENT |
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
 	) >expected &&
 	test_cmp expected actual
 
@@ -428,13 +431,14 @@ test_expect_success 'sign off (2)' '
 	git commit -s -m "thank you
 
 $existing" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo thank you &&
 		echo &&
 		echo $existing &&
-		git var GIT_COMMITTER_IDENT |
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
 	) >expected &&
 	test_cmp expected actual
 
@@ -448,13 +452,14 @@ test_expect_success 'signoff gap' '
 	git commit -s -m "welcome
 
 $alt" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo welcome &&
 		echo &&
 		echo $alt &&
-		git var GIT_COMMITTER_IDENT |
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
 	) >expected &&
 	test_cmp expected actual
 '
@@ -468,15 +473,16 @@ test_expect_success 'signoff gap 2' '
 
 We have now
 $alt" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo welcome &&
 		echo &&
 		echo We have now &&
 		echo $alt &&
 		echo &&
-		git var GIT_COMMITTER_IDENT |
-		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /"
+		git var GIT_COMMITTER_IDENT >ident &&
+		sed -e "s/>.*/>/" -e "s/^/Signed-off-by: /" ident
 	) >expected &&
 	test_cmp expected actual
 '
@@ -489,7 +495,8 @@ test_expect_success 'signoff respects trailer config' '
 
 non-trailer line
 Myfooter: x" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo subject &&
 		echo &&
@@ -506,7 +513,8 @@ Myfooter: x" &&
 
 non-trailer line
 Myfooter: x" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" > actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo subject &&
 		echo &&
@@ -538,7 +546,8 @@ test_expect_success 'multiple -m' '
 	>negative &&
 	git add negative &&
 	git commit -m "one" -m "two" -m "three" &&
-	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+	git cat-file commit HEAD >commit &&
+	sed -e "1,/^\$/d" commit >actual &&
 	(
 		echo one &&
 		echo &&
@@ -555,23 +564,25 @@ test_expect_success 'amend commit to fix author' '
 	oldtick=$GIT_AUTHOR_DATE &&
 	test_tick &&
 	git reset --hard &&
-	git cat-file -p HEAD |
+	git cat-file -p HEAD >commit &&
 	sed -e "s/author.*/author $author $oldtick/" \
-		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" > \
-		expected &&
+		-e "s/^\(committer.*> \).*$/\1$GIT_COMMITTER_DATE/" \
+		commit >expected &&
 	git commit --amend --author="$author" &&
-	git cat-file -p HEAD > current &&
+	git cat-file -p HEAD >current &&
 	test_cmp expected current
 
 '
 
 test_expect_success 'git commit <file> with dirty index' '
-	echo tacocat > elif &&
-	echo tehlulz > chz &&
+	echo tacocat >elif &&
+	echo tehlulz >chz &&
 	git add chz &&
 	git commit elif -m "tacocat is a palindrome" &&
-	git show --stat | grep elif &&
-	git diff --cached | grep chz
+	git show --stat >stat &&
+	grep elif stat &&
+	git diff --cached >diff &&
+	grep chz diff
 '
 
 test_expect_success 'same tree (single parent)' '
@@ -584,7 +595,8 @@ test_expect_success 'same tree (single parent)' '
 test_expect_success 'same tree (single parent) --allow-empty' '
 
 	git commit --allow-empty -m "forced empty" &&
-	git cat-file commit HEAD | grep forced
+	git cat-file commit HEAD >commit &&
+	grep forced commit
 
 '
 
@@ -594,7 +606,7 @@ test_expect_success 'same tree (merge and amend merge)' '
 	echo zero >zero &&
 	git add zero &&
 	git commit -m "add zero" &&
-	git checkout master &&
+	git checkout main &&
 
 	git merge -s ours side -m "empty ok" &&
 	git diff HEAD^ HEAD >actual &&
diff --git a/t/t7502-commit-porcelain.sh b/t/t7502-commit-porcelain.sh
index 14c92e4c25..38a532d81c 100755
--- a/t/t7502-commit-porcelain.sh
+++ b/t/t7502-commit-porcelain.sh
@@ -2,6 +2,9 @@
 
 test_description='git commit porcelain-ish'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 commit_msg_is () {
@@ -10,7 +13,7 @@ commit_msg_is () {
 
 	printf "%s" "$(git log --pretty=format:%s%b -1)" >$actual &&
 	printf "%s" "$1" >$expect &&
-	test_i18ncmp $expect $actual
+	test_cmp $expect $actual
 }
 
 # Arguments: [<prefix] [<commit message>] [<commit options>]
@@ -32,7 +35,17 @@ check_summary_oneline() {
 	SUMMARY_POSTFIX="$(git log -1 --pretty='format:%h')"
 	echo "[$SUMMARY_PREFIX $SUMMARY_POSTFIX] $2" >exp &&
 
-	test_i18ncmp exp act
+	test_cmp exp act
+}
+
+trailer_commit_base () {
+	echo "fun" >>file &&
+	git add file &&
+	git commit -s --trailer "Signed-off-by=C1 E1 " \
+		--trailer "Helped-by:C2 E2 " \
+		--trailer "Reported-by=C3 E3" \
+		--trailer "Mentored-by:C4 E4" \
+		-m "hello"
 }
 
 test_expect_success 'output summary format' '
@@ -76,7 +89,7 @@ test_expect_success 'output summary format for merges' '
 
 output_tests_cleanup() {
 	# this is needed for "do not fire editor in the presence of conflicts"
-	git checkout master &&
+	git checkout main &&
 
 	# this is needed for the "partial removal" test to pass
 	git rm file1 &&
@@ -151,6 +164,308 @@ test_expect_success 'sign off' '
 
 '
 
+test_expect_success 'commit --trailer with "="' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "replace" as ifexists' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Helped-by: C3 E3
+	EOF
+	git -c trailer.ifexists="replace" \
+		commit --trailer "Mentored-by: C4 E4" \
+		 --trailer "Helped-by: C3 E3" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "add" as ifexists' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.ifexists="add" \
+		commit --trailer "Reported-by: C3 E3" \
+		--trailer "Mentored-by: C4 E4" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "donothing" as ifexists' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reviewed-by: C6 E6
+	EOF
+	git -c trailer.ifexists="donothing" \
+		commit --trailer "Mentored-by: C5 E5" \
+		--trailer "Reviewed-by: C6 E6" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "addIfDifferent" as ifexists' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Mentored-by: C5 E5
+	EOF
+	git -c trailer.ifexists="addIfDifferent" \
+		commit --trailer "Reported-by: C3 E3" \
+		--trailer "Mentored-by: C5 E5" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "addIfDifferentNeighbor" as ifexists' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reported-by: C3 E3
+	EOF
+	git -c trailer.ifexists="addIfDifferentNeighbor" \
+		commit --trailer "Mentored-by: C4 E4" \
+		--trailer "Reported-by: C3 E3" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d"  commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "end" as where' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.where="end" \
+		commit --trailer "Reported-by: C3 E3" \
+		--trailer "Mentored-by: C4 E4" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "start" as where' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C1 E1
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.where="start" \
+		commit --trailer "Signed-off-by: C O Mitter <committer@example.com>" \
+		--trailer "Signed-off-by: C1 E1" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "after" as where' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Mentored-by: C5 E5
+	EOF
+	git -c trailer.where="after" \
+		commit --trailer "Mentored-by: C4 E4" \
+		--trailer "Mentored-by: C5 E5" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "before" as where' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C2 E2
+	Mentored-by: C3 E3
+	Mentored-by: C4 E4
+	EOF
+	git -c trailer.where="before" \
+		commit --trailer "Mentored-by: C3 E3" \
+		--trailer "Mentored-by: C2 E2" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "donothing" as ifmissing' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Helped-by: C5 E5
+	EOF
+	git -c trailer.ifmissing="donothing" \
+		commit --trailer "Helped-by: C5 E5" \
+		--trailer "Based-by: C6 E6" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and "add" as ifmissing' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Reported-by: C3 E3
+	Mentored-by: C4 E4
+	Helped-by: C5 E5
+	Based-by: C6 E6
+	EOF
+	git -c trailer.ifmissing="add" \
+		commit --trailer "Helped-by: C5 E5" \
+		--trailer "Based-by: C6 E6" \
+		--amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c ack.key ' '
+	echo "fun" >>file1 &&
+	git add file1 &&
+	cat >expected <<-\EOF &&
+		hello
+
+		Acked-by: Peff
+	EOF
+	git -c trailer.ack.key="Acked-by" \
+		commit --trailer "ack = Peff" -m "hello" &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and ":=#" as separators' '
+	echo "fun" >>file1 &&
+	git add file1 &&
+	cat >expected <<-\EOF &&
+		I hate bug
+
+		Bug #42
+	EOF
+	git -c trailer.separators=":=#" \
+		-c trailer.bug.key="Bug #" \
+		commit --trailer "bug = 42" -m "I hate bug" &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+'
+
+test_expect_success 'commit --trailer with -c and command' '
+	trailer_commit_base &&
+	cat >expected <<-\EOF &&
+	hello
+
+	Signed-off-by: C O Mitter <committer@example.com>
+	Signed-off-by: C1 E1
+	Helped-by: C2 E2
+	Mentored-by: C4 E4
+	Reported-by: A U Thor <author@example.com>
+	EOF
+	git -c trailer.report.key="Reported-by: " \
+		-c trailer.report.ifexists="replace" \
+		-c trailer.report.command="NAME=\"\$ARG\"; test -n \"\$NAME\" && \
+		git log --author=\"\$NAME\" -1 --format=\"format:%aN <%aE>\" || true" \
+		commit --trailer "report = author" --amend &&
+	git cat-file commit HEAD >commit.msg &&
+	sed -e "1,/^\$/d" commit.msg >actual &&
+	test_cmp expected actual
+'
+
 test_expect_success 'multiple -m' '
 
 	>negative &&
@@ -297,7 +612,7 @@ echo "sample
 # with '#' will be ignored, and an empty message aborts the commit." >expect
 
 test_expect_success 'cleanup commit messages (strip option,-F,-e): output' '
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 test_expect_success 'cleanup commit message (fail on invalid cleanup mode option)' '
@@ -440,7 +755,7 @@ test_expect_success 'do not fire editor in the presence of conflicts' '
 	git add g &&
 	git commit -m "add g" &&
 	git branch second &&
-	echo master >g &&
+	echo main >g &&
 	echo g >h &&
 	git add g h &&
 	git commit -m "modify g and add h" &&
@@ -449,7 +764,7 @@ test_expect_success 'do not fire editor in the presence of conflicts' '
 	git add g &&
 	git commit -m second &&
 	# Must fail due to conflict
-	test_must_fail git cherry-pick -n master &&
+	test_must_fail git cherry-pick -n main &&
 	echo "editor not started" >.git/result &&
 	(
 		GIT_EDITOR="\"$(pwd)/.git/FAKE_EDITOR\"" &&
@@ -478,9 +793,9 @@ git reset -q --hard
 
 test_expect_success 'Hand committing of a redundant merge removes dups' '
 
-	git rev-parse second master >expect &&
-	test_must_fail git merge second master &&
-	git checkout master g &&
+	git rev-parse second main >expect &&
+	test_must_fail git merge second main &&
+	git checkout main g &&
 	EDITOR=: git commit -a &&
 	git cat-file commit HEAD >raw &&
 	sed -n -e "s/^parent //p" -e "/^$/q" raw >actual &&
diff --git a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
index b3485450a2..606d8d0f08 100755
--- a/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
+++ b/t/t7503-pre-commit-and-pre-merge-commit-hooks.sh
@@ -2,6 +2,9 @@
 
 test_description='pre-commit and pre-merge-commit hooks'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 HOOKDIR="$(git rev-parse --git-dir)/hooks"
@@ -44,16 +47,16 @@ test_expect_success 'root commit' '
 	git add foo &&
 	git commit -m "make it non-ff" &&
 	git branch side-orig side &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'setup conflicting branches' '
-	test_when_finished "git checkout master" &&
-	git checkout -b conflicting-a master &&
+	test_when_finished "git checkout main" &&
+	git checkout -b conflicting-a main &&
 	echo a >conflicting &&
 	git add conflicting &&
 	git commit -m conflicting-a &&
-	git checkout -b conflicting-b master &&
+	git checkout -b conflicting-b main &&
 	echo b >conflicting &&
 	git add conflicting &&
 	git commit -m conflicting-b
@@ -71,8 +74,8 @@ test_expect_success 'with no hook (merge)' '
 	test_when_finished "rm -f actual_hooks" &&
 	git branch -f side side-orig &&
 	git checkout side &&
-	git merge -m "merge master" master &&
-	git checkout master &&
+	git merge -m "merge main" main &&
+	git checkout main &&
 	test_path_is_missing actual_hooks
 '
 
@@ -88,8 +91,8 @@ test_expect_success '--no-verify with no hook (merge)' '
 	test_when_finished "rm -f actual_hooks" &&
 	git branch -f side side-orig &&
 	git checkout side &&
-	git merge --no-verify -m "merge master" master &&
-	git checkout master &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
 	test_path_is_missing actual_hooks
 '
 
@@ -108,15 +111,15 @@ test_expect_success 'with succeeding hook (merge)' '
 	cp "$HOOKDIR/success.sample" "$PREMERGE" &&
 	echo "$PREMERGE" >expected_hooks &&
 	git checkout side &&
-	git merge -m "merge master" master &&
-	git checkout master &&
+	git merge -m "merge main" main &&
+	git checkout main &&
 	test_cmp expected_hooks actual_hooks
 '
 
 test_expect_success 'automatic merge fails; both hooks are available' '
 	test_when_finished "rm -f \"$PREMERGE\" \"$PRECOMMIT\"" &&
 	test_when_finished "rm -f expected_hooks actual_hooks" &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	cp "$HOOKDIR/success.sample" "$PREMERGE" &&
 	cp "$HOOKDIR/success.sample" "$PRECOMMIT" &&
 
@@ -145,8 +148,8 @@ test_expect_success '--no-verify with succeeding hook (merge)' '
 	cp "$HOOKDIR/success.sample" "$PREMERGE" &&
 	git branch -f side side-orig &&
 	git checkout side &&
-	git merge --no-verify -m "merge master" master &&
-	git checkout master &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
 	test_path_is_missing actual_hooks
 '
 
@@ -174,8 +177,8 @@ test_expect_success 'with failing hook (merge)' '
 	cp "$HOOKDIR/fail.sample" "$PREMERGE" &&
 	echo "$PREMERGE" >expected_hooks &&
 	git checkout side &&
-	test_must_fail git merge -m "merge master" master &&
-	git checkout master &&
+	test_must_fail git merge -m "merge main" main &&
+	git checkout main &&
 	test_cmp expected_hooks actual_hooks
 '
 
@@ -184,8 +187,8 @@ test_expect_success '--no-verify with failing hook (merge)' '
 	cp "$HOOKDIR/fail.sample" "$PREMERGE" &&
 	git branch -f side side-orig &&
 	git checkout side &&
-	git merge --no-verify -m "merge master" master &&
-	git checkout master &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
 	test_path_is_missing actual_hooks
 '
 
@@ -212,8 +215,8 @@ test_expect_success POSIXPERM 'with non-executable hook (merge)' '
 	cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
 	git branch -f side side-orig &&
 	git checkout side &&
-	git merge -m "merge master" master &&
-	git checkout master &&
+	git merge -m "merge main" main &&
+	git checkout main &&
 	test_path_is_missing actual_hooks
 '
 
@@ -222,8 +225,8 @@ test_expect_success POSIXPERM '--no-verify with non-executable hook (merge)' '
 	cp "$HOOKDIR/non-exec.sample" "$PREMERGE" &&
 	git branch -f side side-orig &&
 	git checkout side &&
-	git merge --no-verify -m "merge master" master &&
-	git checkout master &&
+	git merge --no-verify -m "merge main" main &&
+	git checkout main &&
 	test_path_is_missing actual_hooks
 '
 
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 31b9c6a2c1..4e7592522a 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -2,6 +2,9 @@
 
 test_description='commit-msg hook'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'with no hook' '
@@ -142,12 +145,12 @@ test_expect_success '--no-verify with failing hook (editor)' '
 test_expect_success 'merge fails with failing hook' '
 
 	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f master" &&
+	test_when_finished "git checkout -f main" &&
 	git checkout --orphan newbranch &&
 	: >file2 &&
 	git add file2 &&
 	git commit --no-verify file2 -m in-side-branch &&
-	test_must_fail git merge --allow-unrelated-histories master &&
+	test_must_fail git merge --allow-unrelated-histories main &&
 	commit_msg_is "in-side-branch" # HEAD before merge
 
 '
@@ -155,14 +158,14 @@ test_expect_success 'merge fails with failing hook' '
 test_expect_success 'merge bypasses failing hook with --no-verify' '
 
 	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f master" &&
+	test_when_finished "git checkout -f main" &&
 	git checkout --orphan newbranch &&
 	git rm -f file &&
 	: >file2 &&
 	git add file2 &&
 	git commit --no-verify file2 -m in-side-branch &&
-	git merge --no-verify --allow-unrelated-histories master &&
-	commit_msg_is "Merge branch '\''master'\'' into newbranch"
+	git merge --no-verify --allow-unrelated-histories main &&
+	commit_msg_is "Merge branch '\''main'\'' into newbranch"
 '
 
 
@@ -248,28 +251,28 @@ test_expect_success "hook doesn't edit commit message (editor)" '
 
 test_expect_success 'hook called in git-merge picks up commit message' '
 	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f master" &&
+	test_when_finished "git checkout -f main" &&
 	git checkout --orphan newbranch &&
 	git rm -f file &&
 	: >file2 &&
 	git add file2 &&
 	git commit --no-verify file2 -m in-side-branch &&
-	git merge --allow-unrelated-histories master &&
+	git merge --allow-unrelated-histories main &&
 	commit_msg_is "new message"
 '
 
 test_expect_failure 'merge --continue remembers --no-verify' '
 	test_when_finished "git branch -D newbranch" &&
-	test_when_finished "git checkout -f master" &&
-	git checkout master &&
+	test_when_finished "git checkout -f main" &&
+	git checkout main &&
 	echo a >file2 &&
 	git add file2 &&
-	git commit --no-verify -m "add file2 to master" &&
-	git checkout -b newbranch master^ &&
+	git commit --no-verify -m "add file2 to main" &&
+	git checkout -b newbranch main^ &&
 	echo b >file2 &&
 	git add file2 &&
 	git commit --no-verify file2 -m in-side-branch &&
-	git merge --no-verify -m not-rewritten-by-hook master &&
+	git merge --no-verify -m not-rewritten-by-hook main &&
 	# resolve conflict:
 	echo c >file2 &&
 	git add file2 &&
diff --git a/t/t7505-prepare-commit-msg-hook.sh b/t/t7505-prepare-commit-msg-hook.sh
index 94f85cdf83..7a8194ce72 100755
--- a/t/t7505-prepare-commit-msg-hook.sh
+++ b/t/t7505-prepare-commit-msg-hook.sh
@@ -2,6 +2,9 @@
 
 test_description='prepare-commit-msg hook'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'set up commits for rebasing' '
@@ -15,7 +18,7 @@ test_expect_success 'set up commits for rebasing' '
 	do
 		test_commit rebase-$i c $i
 	done &&
-	git checkout master &&
+	git checkout main &&
 
 	cat >rebase-todo <<-EOF
 	pick $(git rev-parse rebase-a)
@@ -190,7 +193,7 @@ test_expect_success 'with hook (-c)' '
 
 test_expect_success 'with hook (merge)' '
 
-	test_when_finished "git checkout -f master" &&
+	test_when_finished "git checkout -f main" &&
 	git checkout -B other HEAD@{1} &&
 	echo "more" >>file &&
 	git add file &&
@@ -202,7 +205,7 @@ test_expect_success 'with hook (merge)' '
 
 test_expect_success 'with hook and editor (merge)' '
 
-	test_when_finished "git checkout -f master" &&
+	test_when_finished "git checkout -f main" &&
 	git checkout -B other HEAD@{1} &&
 	echo "more" >>file &&
 	git add file &&
@@ -215,10 +218,10 @@ test_expect_success 'with hook and editor (merge)' '
 test_rebase () {
 	expect=$1 &&
 	mode=$2 &&
-	test_expect_$expect C_LOCALE_OUTPUT "with hook (rebase ${mode:--i})" '
+	test_expect_$expect "with hook (rebase ${mode:--i})" '
 		test_when_finished "\
 			git rebase --abort
-			git checkout -f master
+			git checkout -f main
 			git branch -D tmp" &&
 		git checkout -b tmp rebase-me &&
 		GIT_SEQUENCE_EDITOR="cp rebase-todo" &&
@@ -250,14 +253,14 @@ 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 master" &&
+	test_when_finished "git checkout -f main" &&
 	git checkout -B other b &&
 	git cherry-pick rebase-1 &&
 	test "$(git log -1 --pretty=format:%s)" = "message (no editor)"
 '
 
 test_expect_success 'with hook and editor (cherry-pick)' '
-	test_when_finished "git checkout -f master" &&
+	test_when_finished "git checkout -f main" &&
 	git checkout -B other b &&
 	git cherry-pick -e rebase-1 &&
 	test "$(git log -1 --pretty=format:%s)" = merge
@@ -270,7 +273,7 @@ EOF
 
 test_expect_success 'with failing hook' '
 
-	test_when_finished "git checkout -f master" &&
+	test_when_finished "git checkout -f main" &&
 	head=$(git rev-parse HEAD) &&
 	echo "more" >> file &&
 	git add file &&
@@ -280,7 +283,7 @@ test_expect_success 'with failing hook' '
 
 test_expect_success 'with failing hook (--no-verify)' '
 
-	test_when_finished "git checkout -f master" &&
+	test_when_finished "git checkout -f main" &&
 	head=$(git rev-parse HEAD) &&
 	echo "more" >> file &&
 	git add file &&
@@ -290,7 +293,7 @@ test_expect_success 'with failing hook (--no-verify)' '
 
 test_expect_success 'with failing hook (merge)' '
 
-	test_when_finished "git checkout -f master" &&
+	test_when_finished "git checkout -f main" &&
 	git checkout -B other HEAD@{1} &&
 	echo "more" >> file &&
 	git add file &&
@@ -304,8 +307,8 @@ test_expect_success 'with failing hook (merge)' '
 
 '
 
-test_expect_success C_LOCALE_OUTPUT 'with failing hook (cherry-pick)' '
-	test_when_finished "git checkout -f master" &&
+test_expect_success 'with failing hook (cherry-pick)' '
+	test_when_finished "git checkout -f main" &&
 	git checkout -B other b &&
 	test_must_fail git cherry-pick rebase-1 2>actual &&
 	test $(grep -c prepare-commit-msg actual) = 1
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 08629a6e70..3fcb44767f 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -22,6 +22,10 @@ sanitize_output () {
 	mv output2 output
 }
 
+sanitize_diff () {
+	sed -e "/^index [0-9a-f,]*\.\.[0-9a-f]*/d" "$1"
+}
+
 
 test_expect_success 'setup' '
 	test_create_repo_with_commit sub &&
@@ -269,7 +273,6 @@ short_sha1_merge_sub1=$(cd sub1 && git rev-parse --short HEAD)
 short_sha1_merge_sub2=$(cd sub2 && git rev-parse --short HEAD)
 cat >diff_expect <<\EOF
 diff --cc .gitmodules
-index badaa4c,44f999a..0000000
 --- a/.gitmodules
 +++ b/.gitmodules
 @@@ -1,3 -1,3 +1,9 @@@
@@ -286,7 +289,6 @@ EOF
 
 cat >diff_submodule_expect <<\EOF
 diff --cc .gitmodules
-index badaa4c,44f999a..0000000
 --- a/.gitmodules
 +++ b/.gitmodules
 @@@ -1,3 -1,3 +1,9 @@@
@@ -306,7 +308,8 @@ test_expect_success 'diff with merge conflict in .gitmodules' '
 		cd super &&
 		git diff >../diff_actual 2>&1
 	) &&
-	test_cmp diff_expect diff_actual
+	sanitize_diff diff_actual >diff_sanitized &&
+	test_cmp diff_expect diff_sanitized
 '
 
 test_expect_success 'diff --submodule with merge conflict in .gitmodules' '
@@ -314,7 +317,8 @@ test_expect_success 'diff --submodule with merge conflict in .gitmodules' '
 		cd super &&
 		git diff --submodule >../diff_submodule_actual 2>&1
 	) &&
-	test_cmp diff_submodule_expect diff_submodule_actual
+	sanitize_diff diff_submodule_actual >diff_sanitized &&
+	test_cmp diff_submodule_expect diff_sanitized
 '
 
 # We'll setup different cases for further testing:
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 4e676cdce8..05c6c02435 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -37,11 +37,11 @@ test_expect_success 'create upstream branch' '
 	git checkout -b upstream &&
 	test_commit upstream1 &&
 	test_commit upstream2 &&
-	# leave the first commit on master as root because several
+	# leave the first commit on main as root because several
 	# tests depend on this case; for our upstream we only
 	# care about commit counts anyway, so a totally divergent
 	# history is OK
-	git checkout --orphan master
+	git checkout --orphan main
 '
 
 test_expect_success 'setup' '
@@ -88,7 +88,7 @@ EOF
 
 test_expect_success 'status --column' '
 	cat >expect <<\EOF &&
-# On branch master
+# On branch main
 # Your branch and '\''upstream'\'' have diverged,
 # and have 1 and 2 different commits each, respectively.
 #   (use "git pull" to merge the remote branch into yours)
@@ -109,17 +109,17 @@ test_expect_success 'status --column' '
 #
 EOF
 	COLUMNS=50 git -c status.displayCommentPrefix=true status --column="column dense" >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'status --column status.displayCommentPrefix=false' '
 	strip_comments expect &&
 	COLUMNS=49 git -c status.displayCommentPrefix=false status --column="column dense" >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 cat >expect <<\EOF
-# On branch master
+# On branch main
 # Your branch and 'upstream' have diverged,
 # and have 1 and 2 different commits each, respectively.
 #   (use "git pull" to merge the remote branch into yours)
@@ -144,19 +144,19 @@ EOF
 
 test_expect_success 'status with status.displayCommentPrefix=true' '
 	git -c status.displayCommentPrefix=true status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'status with status.displayCommentPrefix=false' '
 	strip_comments expect &&
 	git -c status.displayCommentPrefix=false status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'status -v' '
 	(cat expect && git diff --cached) >expect-with-v &&
 	git status -v >output &&
-	test_i18ncmp expect-with-v output
+	test_cmp expect-with-v output
 '
 
 test_expect_success 'status -v -v' '
@@ -167,7 +167,7 @@ test_expect_success 'status -v -v' '
 	 echo "Changes not staged for commit:" &&
 	 git -c diff.mnemonicprefix=true diff) >expect-with-v &&
 	git status -v -v >output &&
-	test_i18ncmp expect-with-v output
+	test_cmp expect-with-v output
 '
 
 test_expect_success 'setup fake editor' '
@@ -193,7 +193,7 @@ test_expect_success 'commit ignores status.displayCommentPrefix=false in COMMIT_
 '
 
 cat >expect <<\EOF
-On branch master
+On branch main
 Your branch and 'upstream' have diverged,
 and have 1 and 2 different commits each, respectively.
 
@@ -214,7 +214,7 @@ EOF
 test_expect_success 'status (advice.statusHints false)' '
 	test_config advice.statusHints false &&
 	git status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 
 '
 
@@ -266,7 +266,7 @@ test_expect_success 'status with gitignore' '
 	test_cmp expect output &&
 
 	cat >expect <<\EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -296,7 +296,7 @@ Ignored files:
 
 EOF
 	git status --ignored >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'status with gitignore (nothing untracked)' '
@@ -331,7 +331,7 @@ test_expect_success 'status with gitignore (nothing untracked)' '
 	test_cmp expect output &&
 
 	cat >expect <<\EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -358,7 +358,7 @@ Ignored files:
 
 EOF
 	git status --ignored >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 cat >.gitignore <<\EOF
@@ -368,7 +368,7 @@ output*
 EOF
 
 cat >expect <<\EOF
-## master...upstream [ahead 1, behind 2]
+## main...upstream [ahead 1, behind 2]
  M dir1/modified
 A  dir2/added
 ?? dir1/untracked
@@ -380,7 +380,7 @@ EOF
 test_expect_success 'status -s -b' '
 
 	git status -s -b >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 
 '
 
@@ -390,7 +390,7 @@ test_expect_success 'status -s -z -b' '
 	git status -s -z -b >output &&
 	nul_to_q <output >output.q &&
 	mv output.q output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'setup dir3' '
@@ -401,7 +401,7 @@ test_expect_success 'setup dir3' '
 
 test_expect_success 'status -uno' '
 	cat >expect <<EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -418,18 +418,18 @@ Changes not staged for commit:
 Untracked files not listed (use -u option to show untracked files)
 EOF
 	git status -uno >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'status (status.showUntrackedFiles no)' '
 	test_config status.showuntrackedfiles no &&
 	git status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'status -uno (advice.statusHints false)' '
 	cat >expect <<EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
 
@@ -443,7 +443,7 @@ Untracked files not listed
 EOF
 	test_config advice.statusHints false &&
 	git status -uno >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 cat >expect << EOF
@@ -463,7 +463,7 @@ test_expect_success 'status -s (status.showUntrackedFiles no)' '
 
 test_expect_success 'status -unormal' '
 	cat >expect <<EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -487,13 +487,13 @@ Untracked files:
 
 EOF
 	git status -unormal >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'status (status.showUntrackedFiles normal)' '
 	test_config status.showuntrackedfiles normal &&
 	git status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 cat >expect <<EOF
@@ -518,7 +518,7 @@ test_expect_success 'status -s (status.showUntrackedFiles normal)' '
 
 test_expect_success 'status -uall' '
 	cat >expect <<EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -543,13 +543,13 @@ Untracked files:
 
 EOF
 	git status -uall >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'status (status.showUntrackedFiles all)' '
 	test_config status.showuntrackedfiles all &&
 	git status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'teardown dir3' '
@@ -578,7 +578,7 @@ test_expect_success 'status -s (status.showUntrackedFiles all)' '
 
 test_expect_success 'status with relative paths' '
 	cat >expect <<\EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -601,7 +601,7 @@ Untracked files:
 
 EOF
 	(cd dir1 && git status) >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 cat >expect <<\EOF
@@ -646,7 +646,7 @@ test_expect_success 'setup unique colors' '
 
 test_expect_success TTY 'status with color.ui' '
 	cat >expect <<\EOF &&
-On branch <GREEN>master<RESET>
+On branch <GREEN>main<RESET>
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -670,13 +670,13 @@ Untracked files:
 EOF
 	test_config color.ui auto &&
 	test_terminal git status | test_decode_color >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success TTY 'status with color.status' '
 	test_config color.status auto &&
 	test_terminal git status | test_decode_color >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 cat >expect <<\EOF
@@ -706,7 +706,7 @@ test_expect_success TTY 'status -s with color.status' '
 '
 
 cat >expect <<\EOF
-## <YELLOW>master<RESET>...<CYAN>upstream<RESET> [ahead <YELLOW>1<RESET>, behind <CYAN>2<RESET>]
+## <YELLOW>main<RESET>...<CYAN>upstream<RESET> [ahead <YELLOW>1<RESET>, behind <CYAN>2<RESET>]
  <RED>M<RESET> dir1/modified
 <GREEN>A<RESET>  dir2/added
 <BLUE>??<RESET> dir1/untracked
@@ -718,7 +718,7 @@ EOF
 test_expect_success TTY 'status -s -b with color.status' '
 
 	test_terminal git status -s -b | test_decode_color >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 
 '
 
@@ -757,7 +757,7 @@ test_expect_success 'status --porcelain respects -b' '
 
 	git status --porcelain -b >output &&
 	{
-		echo "## master...upstream [ahead 1, behind 2]" &&
+		echo "## main...upstream [ahead 1, behind 2]" &&
 		cat expect
 	} >tmp &&
 	mv tmp expect &&
@@ -769,7 +769,7 @@ test_expect_success 'status --porcelain respects -b' '
 
 test_expect_success 'status without relative paths' '
 	cat >expect <<\EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -793,7 +793,7 @@ Untracked files:
 EOF
 	test_config status.relativePaths false &&
 	(cd dir1 && git status) >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 
 '
 
@@ -814,9 +814,36 @@ test_expect_success 'status -s without relative paths' '
 
 '
 
+cat >expect <<\EOF
+ M dir1/modified
+A  dir2/added
+A  "file with spaces"
+?? dir1/untracked
+?? dir2/modified
+?? dir2/untracked
+?? "file with spaces 2"
+?? untracked
+EOF
+
+test_expect_success 'status -s without relative paths' '
+	test_when_finished "git rm --cached \"file with spaces\"; rm -f file*" &&
+	>"file with spaces" &&
+	>"file with spaces 2" &&
+	>"expect with spaces" &&
+	git add "file with spaces" &&
+
+	git status -s >output &&
+	test_cmp expect output &&
+
+	git status -s --ignored >output &&
+	grep "^!! \"expect with spaces\"$" output &&
+	grep -v "^!! " output >output-wo-ignored &&
+	test_cmp expect output-wo-ignored
+'
+
 test_expect_success 'dry-run of partial commit excluding new file in index' '
 	cat >expect <<EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -833,11 +860,11 @@ Untracked files:
 
 EOF
 	git commit --dry-run dir1/modified >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 cat >expect <<EOF
-:100644 100644 $EMPTY_BLOB 0000000000000000000000000000000000000000 M	dir1/modified
+:100644 100644 $EMPTY_BLOB $ZERO_OID M	dir1/modified
 EOF
 test_expect_success 'status refreshes the index' '
 	touch dir2/added &&
@@ -846,6 +873,18 @@ test_expect_success 'status refreshes the index' '
 	test_cmp expect output
 '
 
+test_expect_success 'status shows detached HEAD properly after checking out non-local upstream branch' '
+	test_when_finished rm -rf upstream downstream actual &&
+
+	test_create_repo upstream &&
+	test_commit -C upstream foo &&
+
+	git clone upstream downstream &&
+	git -C downstream checkout @{u} &&
+	git -C downstream status >actual &&
+	grep -E "HEAD detached at [0-9a-f]+" actual
+'
+
 test_expect_success 'setup status submodule summary' '
 	test_create_repo sm && (
 		cd sm &&
@@ -858,7 +897,7 @@ test_expect_success 'setup status submodule summary' '
 
 test_expect_success 'status submodule summary is disabled by default' '
 	cat >expect <<EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -882,13 +921,13 @@ Untracked files:
 
 EOF
 	git status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 # we expect the same as the previous test
 test_expect_success 'status --untracked-files=all does not show submodule' '
 	git status --untracked-files=all >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 cat >expect <<EOF
@@ -915,7 +954,7 @@ head=$(cd sm && git rev-parse --short=7 --verify HEAD)
 
 test_expect_success 'status submodule summary' '
 	cat >expect <<EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 1 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -945,13 +984,13 @@ Untracked files:
 EOF
 	git config status.submodulesummary 10 &&
 	git status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'status submodule summary with status.displayCommentPrefix=false' '
 	strip_comments expect &&
 	git -c status.displayCommentPrefix=false status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'commit with submodule summary ignores status.displayCommentPrefix' '
@@ -974,7 +1013,7 @@ test_expect_success 'status -s submodule summary' '
 
 test_expect_success 'status submodule summary (clean submodule): commit' '
 	cat >expect <<EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 2 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -996,9 +1035,9 @@ EOF
 	git commit -m "commit submodule" &&
 	git config status.submodulesummary 10 &&
 	test_must_fail git commit --dry-run >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 cat >expect <<EOF
@@ -1022,7 +1061,7 @@ test_expect_success 'status -z implies porcelain' '
 
 test_expect_success 'commit --dry-run submodule summary (--amend)' '
 	cat >expect <<EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 2 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -1052,7 +1091,7 @@ Untracked files:
 EOF
 	git config status.submodulesummary 10 &&
 	git commit --dry-run --amend >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success POSIXPERM,SANITY 'status succeeds in a read-only repository' '
@@ -1074,7 +1113,7 @@ touch .gitmodules
 
 test_expect_success '--ignore-submodules=untracked suppresses submodules with untracked content' '
 	cat > expect << EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 2 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -1104,17 +1143,17 @@ Untracked files:
 EOF
 	echo modified  sm/untracked &&
 	git status --ignore-submodules=untracked >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success '.gitmodules ignore=untracked suppresses submodules with untracked content' '
 	test_config diff.ignoreSubmodules dirty &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config --add -f .gitmodules submodule.subname.ignore untracked &&
 	git config --add -f .gitmodules submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
@@ -1124,14 +1163,14 @@ test_expect_success '.git/config ignore=untracked suppresses submodules with unt
 	git config --add submodule.subname.ignore untracked &&
 	git config --add submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config --remove-section submodule.subname &&
 	git config --remove-section -f .gitmodules submodule.subname
 '
 
 test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
 	git status --ignore-submodules=dirty >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success '.gitmodules ignore=dirty suppresses submodules with untracked content' '
@@ -1141,7 +1180,7 @@ test_expect_success '.gitmodules ignore=dirty suppresses submodules with untrack
 	git config --add -f .gitmodules submodule.subname.ignore dirty &&
 	git config --add -f .gitmodules submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
@@ -1151,7 +1190,7 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with untrack
 	git config --add submodule.subname.ignore dirty &&
 	git config --add submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config --remove-section submodule.subname &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
@@ -1159,14 +1198,14 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with untrack
 test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
 	echo modified >sm/foo &&
 	git status --ignore-submodules=dirty >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
 	git config --add -f .gitmodules submodule.subname.ignore dirty &&
 	git config --add -f .gitmodules submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
@@ -1176,14 +1215,14 @@ test_expect_success '.git/config ignore=dirty suppresses submodules with modifie
 	git config --add submodule.subname.ignore dirty &&
 	git config --add submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config --remove-section submodule.subname &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
 test_expect_success "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
 	cat > expect << EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 2 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -1214,14 +1253,14 @@ Untracked files:
 
 EOF
 	git status --ignore-submodules=untracked > output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
 	git config --add -f .gitmodules submodule.subname.ignore untracked &&
 	git config --add -f .gitmodules submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
@@ -1231,7 +1270,7 @@ test_expect_success ".git/config ignore=untracked doesn't suppress submodules wi
 	git config --add submodule.subname.ignore untracked &&
 	git config --add submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config --remove-section submodule.subname &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
@@ -1240,7 +1279,7 @@ head2=$(cd sm && git commit -q -m "2nd commit" foo && git rev-parse --short=7 --
 
 test_expect_success "--ignore-submodules=untracked doesn't suppress submodule summary" '
 	cat > expect << EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 2 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -1275,14 +1314,14 @@ Untracked files:
 
 EOF
 	git status --ignore-submodules=untracked > output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success ".gitmodules ignore=untracked doesn't suppress submodule summary" '
 	git config --add -f .gitmodules submodule.subname.ignore untracked &&
 	git config --add -f .gitmodules submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
@@ -1292,20 +1331,20 @@ test_expect_success ".git/config ignore=untracked doesn't suppress submodule sum
 	git config --add submodule.subname.ignore untracked &&
 	git config --add submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config --remove-section submodule.subname &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
 test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
 	git status --ignore-submodules=dirty > output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
 	git config --add -f .gitmodules submodule.subname.ignore dirty &&
 	git config --add -f .gitmodules submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
@@ -1315,13 +1354,13 @@ test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary
 	git config --add submodule.subname.ignore dirty &&
 	git config --add submodule.subname.path sm &&
 	git status >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config --remove-section submodule.subname &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
 cat > expect << EOF
-; On branch master
+; On branch main
 ; Your branch and 'upstream' have diverged,
 ; and have 2 and 2 different commits each, respectively.
 ;   (use "git pull" to merge the remote branch into yours)
@@ -1359,7 +1398,7 @@ EOF
 test_expect_success "status (core.commentchar with submodule summary)" '
 	test_config core.commentchar ";" &&
 	git -c status.displayCommentPrefix=true status >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success "status (core.commentchar with two chars with submodule summary)" '
@@ -1369,7 +1408,7 @@ test_expect_success "status (core.commentchar with two chars with submodule summ
 
 test_expect_success "--ignore-submodules=all suppresses submodule summary" '
 	cat > expect << EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 2 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -1390,12 +1429,12 @@ Untracked files:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --ignore-submodules=all > output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success '.gitmodules ignore=all suppresses unstaged submodule summary' '
 	cat > expect << EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 2 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -1421,7 +1460,7 @@ EOF
 	git config --add -f .gitmodules submodule.subname.ignore all &&
 	git config --add -f .gitmodules submodule.subname.path sm &&
 	git status > output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
 
@@ -1431,7 +1470,7 @@ test_expect_success '.git/config ignore=all suppresses unstaged submodule summar
 	git config --add submodule.subname.ignore all &&
 	git config --add submodule.subname.path sm &&
 	git status > output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git config --remove-section submodule.subname &&
 	git config -f .gitmodules  --remove-section submodule.subname
 '
@@ -1471,7 +1510,7 @@ test_expect_success '"status.branch=true" same as "-b"' '
 test_expect_success '"status.branch=true" different from "--no-branch"' '
 	git status -s --no-branch  >expected_nobranch &&
 	git -c status.branch=true status -s >actual &&
-	test_must_fail test_cmp expected_nobranch actual
+	! test_cmp expected_nobranch actual
 '
 
 test_expect_success '"status.branch=true" weaker than "--no-branch"' '
@@ -1515,7 +1554,7 @@ test_expect_success 'git commit --dry-run will show a staged but ignored submodu
 	git reset HEAD^ &&
 	git add sm &&
 	cat >expect << EOF &&
-On branch master
+On branch main
 Your branch and '\''upstream'\'' have diverged,
 and have 2 and 2 different commits each, respectively.
   (use "git pull" to merge the remote branch into yours)
@@ -1532,7 +1571,7 @@ Changes not staged for commit:
 Untracked files not listed (use -u option to show untracked files)
 EOF
 	git commit -uno --dry-run >output &&
-	test_i18ncmp expect output &&
+	test_cmp expect output &&
 	git status -s --ignore-submodules=dirty >output &&
 	test_i18ngrep "^M. sm" output
 '
@@ -1571,7 +1610,7 @@ test_expect_success '"status.showStash=true" weaker than "--no-show-stash"' '
 	test_cmp expected_without_stash actual
 '
 
-test_expect_success 'no additionnal info if no stash entries' '
+test_expect_success 'no additional info if no stash entries' '
 	git stash clear &&
 	git -c status.showStash=true status >actual &&
 	test_cmp expected_without_stash actual
diff --git a/t/t7509-commit-authorship.sh b/t/t7509-commit-authorship.sh
index 500ab2fe72..d568593382 100755
--- a/t/t7509-commit-authorship.sh
+++ b/t/t7509-commit-authorship.sh
@@ -18,11 +18,8 @@ message_body () {
 }
 
 test_expect_success '-C option copies authorship and message' '
-	echo "Initial" >foo &&
-	git add foo &&
-	test_tick &&
-	git commit -m "Initial Commit" --author Frigate\ \<flying@over.world\> &&
-	git tag Initial &&
+	test_commit --author Frigate\ \<flying@over.world\> \
+		"Initial Commit" foo Initial Initial &&
 	echo "Test 1" >>foo &&
 	test_tick &&
 	git commit -a -C Initial &&
@@ -150,7 +147,7 @@ test_expect_success 'commit respects CHERRY_PICK_HEAD and MERGE_MSG' '
 	test_tick &&
 	git commit -am "cherry-pick 1" --author="Cherry <cherry@pick.er>" &&
 	git tag cherry-pick-head &&
-	git rev-parse cherry-pick-head >.git/CHERRY_PICK_HEAD &&
+	git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) &&
 	echo "This is a MERGE_MSG" >.git/MERGE_MSG &&
 	echo "cherry-pick 1b" >>foo &&
 	test_tick &&
@@ -165,7 +162,7 @@ test_expect_success 'commit respects CHERRY_PICK_HEAD and MERGE_MSG' '
 '
 
 test_expect_success '--reset-author with CHERRY_PICK_HEAD' '
-	git rev-parse cherry-pick-head >.git/CHERRY_PICK_HEAD &&
+	git update-ref CHERRY_PICK_HEAD $(git rev-parse cherry-pick-head) &&
 	echo "cherry-pick 2" >>foo &&
 	test_tick &&
 	git commit -am "cherry-pick 2" --reset-author &&
diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh
index 682b23a068..8df5a74f1d 100755
--- a/t/t7510-signed-commit.sh
+++ b/t/t7510-signed-commit.sh
@@ -1,11 +1,19 @@
 #!/bin/sh
 
 test_description='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 GPG 'create signed commits' '
+	test_oid_cache <<-\EOF &&
+	header sha1:gpgsig
+	header sha256:gpgsig-sha256
+	EOF
+
 	test_when_finished "test_unconfig commit.gpgsign" &&
 
 	echo 1 >file && git add file &&
@@ -20,7 +28,7 @@ test_expect_success GPG 'create signed commits' '
 	echo 3 >elif && git add elif &&
 	test_tick && git commit -m "third on side" &&
 
-	git checkout master &&
+	git checkout main &&
 	test_tick && git merge -S side &&
 	git tag merge &&
 
@@ -109,6 +117,21 @@ test_expect_success GPG 'verify-commit exits success on untrusted signature' '
 	grep "not certified" actual
 '
 
+test_expect_success GPG 'verify-commit exits success with matching minTrustLevel' '
+	test_config gpg.minTrustLevel ultimate &&
+	git verify-commit sixth-signed
+'
+
+test_expect_success GPG 'verify-commit exits success with low minTrustLevel' '
+	test_config gpg.minTrustLevel fully &&
+	git verify-commit sixth-signed
+'
+
+test_expect_success GPG 'verify-commit exits failure with high minTrustLevel' '
+	test_config gpg.minTrustLevel ultimate &&
+	test_must_fail git verify-commit eighth-signed-alt
+'
+
 test_expect_success GPG 'verify signatures with --raw' '
 	(
 		for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed
@@ -140,6 +163,11 @@ test_expect_success GPG 'verify signatures with --raw' '
 	)
 '
 
+test_expect_success GPG 'proper header is used for hash algorithm' '
+	git cat-file commit fourth-signed >output &&
+	grep "^$(test_oid header) -----BEGIN PGP SIGNATURE-----" output
+'
+
 test_expect_success GPG 'show signed commit with signature' '
 	git show -s initial >commit &&
 	git show -s --show-signature initial >show &&
@@ -147,7 +175,7 @@ test_expect_success GPG 'show signed commit with signature' '
 	git cat-file commit initial >cat &&
 	grep -v -e "gpg: " -e "Warning: " show >show.commit &&
 	grep -e "gpg: " -e "Warning: " show >show.gpg &&
-	grep -v "^ " cat | grep -v "^gpgsig " >cat.commit &&
+	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
@@ -219,6 +247,30 @@ test_expect_success GPG 'show untrusted signature with custom format' '
 	test_cmp expect actual
 '
 
+test_expect_success GPG 'show untrusted signature with undefined trust level' '
+	cat >expect <<-\EOF &&
+	undefined
+	65A0EEA02E30CAD7
+	Eris Discordia <discord@example.net>
+	F8364A59E07FFE9F4D63005A65A0EEA02E30CAD7
+	D4BE22311AD3131E5EDA29A461092E85B7227189
+	EOF
+	git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" eighth-signed-alt >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success GPG 'show untrusted signature with ultimate trust level' '
+	cat >expect <<-\EOF &&
+	ultimate
+	13B6F51ECDDE430D
+	C O Mitter <committer@example.com>
+	73D758744BE721698EC54E8713B6F51ECDDE430D
+	73D758744BE721698EC54E8713B6F51ECDDE430D
+	EOF
+	git log -1 --format="%GT%n%GK%n%GS%n%GF%n%GP" sixth-signed >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success GPG 'show unknown signature with custom format' '
 	cat >expect <<-\EOF &&
 	E
@@ -260,10 +312,10 @@ test_expect_success GPG 'check config gpg.format values' '
 test_expect_success GPG 'detect fudged commit with double signature' '
 	sed -e "/gpgsig/,/END PGP/d" forged1 >double-base &&
 	sed -n -e "/gpgsig/,/END PGP/p" forged1 | \
-		sed -e "s/^gpgsig//;s/^ //" | gpg --dearmor >double-sig1.sig &&
+		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/^/gpgsig /;2,\$s/^/ /" \
+	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 &&
@@ -285,4 +337,45 @@ test_expect_success GPG 'show double signature with custom format' '
 	test_cmp expect actual
 '
 
+
+test_expect_success GPG 'verify-commit verifies multiply signed commits' '
+	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/t7512-status-help.sh b/t/t7512-status-help.sh
index 66d7a62797..7f2956d77a 100755
--- a/t/t7512-status-help.sh
+++ b/t/t7512-status-help.sh
@@ -7,6 +7,9 @@
 
 test_description='git status advice'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 . "$TEST_DIRECTORY"/lib-rebase.sh
@@ -17,14 +20,14 @@ test_expect_success 'prepare for conflicts' '
 	git config --global advice.statusuoption false &&
 	test_commit init main.txt init &&
 	git branch conflicts &&
-	test_commit on_master main.txt on_master &&
+	test_commit on_main main.txt on_main &&
 	git checkout conflicts &&
 	test_commit on_conflicts main.txt on_conflicts
 '
 
 
 test_expect_success 'status when conflicts unresolved' '
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	cat >expected <<\EOF &&
 On branch conflicts
 You have unmerged paths.
@@ -38,13 +41,13 @@ Unmerged paths:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'status when conflicts resolved before commit' '
 	git reset --hard conflicts &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	echo one >main.txt &&
 	git add main.txt &&
 	cat >expected <<\EOF &&
@@ -58,12 +61,12 @@ Changes to be committed:
 Untracked files not listed (use -u option to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'prepare for rebase conflicts' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b rebase_conflicts &&
 	test_commit one_rebase main.txt one &&
 	test_commit two_rebase main.txt two &&
@@ -71,10 +74,10 @@ test_expect_success 'prepare for rebase conflicts' '
 '
 
 
-test_expect_success 'status when rebase in progress before resolving conflicts' '
+test_expect_success 'status when rebase --apply in progress before resolving conflicts' '
 	test_when_finished "git rebase --abort" &&
 	ONTO=$(git rev-parse --short HEAD^^) &&
-	test_must_fail git rebase HEAD^ --onto HEAD^^ &&
+	test_must_fail git rebase --apply HEAD^ --onto HEAD^^ &&
 	cat >expected <<EOF &&
 rebase in progress; onto $ONTO
 You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''.
@@ -90,15 +93,15 @@ Unmerged paths:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
-test_expect_success 'status when rebase in progress before rebase --continue' '
+test_expect_success 'status when rebase --apply in progress before rebase --continue' '
 	git reset --hard rebase_conflicts &&
 	test_when_finished "git rebase --abort" &&
 	ONTO=$(git rev-parse --short HEAD^^) &&
-	test_must_fail git rebase HEAD^ --onto HEAD^^ &&
+	test_must_fail git rebase --apply HEAD^ --onto HEAD^^ &&
 	echo three >main.txt &&
 	git add main.txt &&
 	cat >expected <<EOF &&
@@ -113,16 +116,16 @@ Changes to be committed:
 Untracked files not listed (use -u option to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'prepare for rebase_i_conflicts' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b rebase_i_conflicts &&
 	test_commit one_unmerge main.txt one_unmerge &&
 	git branch rebase_i_conflicts_second &&
-	test_commit one_master main.txt one_master &&
+	test_commit one_main main.txt one_main &&
 	git checkout rebase_i_conflicts_second &&
 	test_commit one_second main.txt one_second
 '
@@ -151,7 +154,7 @@ Unmerged paths:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -177,12 +180,12 @@ Changes to be committed:
 Untracked files not listed (use -u option to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'status when rebasing -i in edit mode' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b rebase_i_edit &&
 	test_commit one_rebase_i main.txt one &&
 	test_commit two_rebase_i main.txt two &&
@@ -207,12 +210,12 @@ You are currently editing a commit while rebasing branch '\''rebase_i_edit'\'' o
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'status when splitting a commit' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b split_commit &&
 	test_commit one_split main.txt one &&
 	test_commit two_split main.txt two &&
@@ -246,12 +249,12 @@ Changes not staged for commit:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'status after editing the last commit with --amend during a rebase -i' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b amend_last &&
 	test_commit one_amend main.txt one &&
 	test_commit two_amend main.txt two &&
@@ -279,12 +282,12 @@ You are currently editing a commit while rebasing branch '\''amend_last'\'' on '
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'prepare for several edits' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b several_edits &&
 	test_commit one_edits main.txt one &&
 	test_commit two_edits main.txt two &&
@@ -318,7 +321,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -353,7 +356,7 @@ Changes not staged for commit:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -384,7 +387,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -415,7 +418,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -451,7 +454,7 @@ Changes not staged for commit:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -483,7 +486,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -516,7 +519,7 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -554,7 +557,7 @@ Changes not staged for commit:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -588,12 +591,12 @@ You are currently editing a commit while rebasing branch '\''several_edits'\'' o
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'prepare am_session' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b am_session &&
 	test_commit one_am one.txt "one" &&
 	test_commit two_am two.txt "two" &&
@@ -616,7 +619,7 @@ You are in the middle of an am session.
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -638,7 +641,7 @@ You are in the middle of an am session.
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -661,12 +664,12 @@ The current patch is empty.
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'status when bisecting' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b bisect &&
 	test_commit one_bisect main.txt one &&
 	test_commit two_bisect main.txt two &&
@@ -684,12 +687,12 @@ You are currently bisecting, started from branch '\''bisect'\''.
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
-test_expect_success 'status when rebase conflicts with statushints disabled' '
-	git reset --hard master &&
+test_expect_success 'status when rebase --apply conflicts with statushints disabled' '
+	git reset --hard main &&
 	git checkout -b statushints_disabled &&
 	test_when_finished "git config --local advice.statushints true" &&
 	git config --local advice.statushints false &&
@@ -698,7 +701,7 @@ test_expect_success 'status when rebase conflicts with statushints disabled' '
 	test_commit three_statushints main.txt three &&
 	test_when_finished "git rebase --abort" &&
 	ONTO=$(git rev-parse --short HEAD^^) &&
-	test_must_fail git rebase HEAD^ --onto HEAD^^ &&
+	test_must_fail git rebase --apply HEAD^ --onto HEAD^^ &&
 	cat >expected <<EOF &&
 rebase in progress; onto $ONTO
 You are currently rebasing branch '\''statushints_disabled'\'' on '\''$ONTO'\''.
@@ -709,12 +712,12 @@ Unmerged paths:
 no changes added to commit
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
 test_expect_success 'prepare for cherry-pick conflicts' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b cherry_branch &&
 	test_commit one_cherry main.txt one &&
 	test_commit two_cherries main.txt two &&
@@ -743,7 +746,7 @@ Unmerged paths:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 
@@ -767,7 +770,7 @@ Changes to be committed:
 Untracked files not listed (use -u option to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'status when cherry-picking after committing conflict resolution' '
@@ -786,7 +789,7 @@ Cherry-pick currently in progress.
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'status shows cherry-pick with invalid oid' '
@@ -795,7 +798,7 @@ test_expect_success 'status shows cherry-pick with invalid oid' '
 	git status --untracked-files=no >actual 2>err &&
 	git cherry-pick --quit &&
 	test_must_be_empty err &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'status does not show error if .git/sequencer is a file' '
@@ -813,7 +816,7 @@ HEAD detached at atag
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual &&
+	test_cmp expected actual &&
 
 	git reset --hard HEAD^ &&
 	cat >expected <<\EOF &&
@@ -821,11 +824,11 @@ HEAD detached from atag
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'status while reverting commit (conflicts)' '
-	git checkout master &&
+	git checkout main &&
 	echo before >to-revert.txt &&
 	test_commit before to-revert.txt &&
 	echo old >to-revert.txt &&
@@ -835,7 +838,7 @@ test_expect_success 'status while reverting commit (conflicts)' '
 	TO_REVERT=$(git rev-parse --short HEAD^) &&
 	test_must_fail git revert $TO_REVERT &&
 	cat >expected <<EOF &&
-On branch master
+On branch main
 You are currently reverting commit $TO_REVERT.
   (fix conflicts and run "git revert --continue")
   (use "git revert --skip" to skip this patch)
@@ -849,14 +852,14 @@ Unmerged paths:
 no changes added to commit (use "git add" and/or "git commit -a")
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'status while reverting commit (conflicts resolved)' '
 	echo reverted >to-revert.txt &&
 	git add to-revert.txt &&
 	cat >expected <<EOF &&
-On branch master
+On branch main
 You are currently reverting commit $TO_REVERT.
   (all conflicts fixed: run "git revert --continue")
   (use "git revert --skip" to skip this patch)
@@ -869,17 +872,17 @@ Changes to be committed:
 Untracked files not listed (use -u option to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'status after reverting commit' '
 	git revert --continue &&
 	cat >expected <<\EOF &&
-On branch master
+On branch main
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'status while reverting after committing conflict resolution' '
@@ -889,7 +892,7 @@ test_expect_success 'status while reverting after committing conflict resolution
 	echo reverted >to-revert.txt &&
 	git commit -a &&
 	cat >expected <<EOF &&
-On branch master
+On branch main
 Revert currently in progress.
   (run "git revert --continue" to continue)
   (use "git revert --skip" to skip this patch)
@@ -898,11 +901,11 @@ Revert currently in progress.
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'prepare for different number of commits rebased' '
-	git reset --hard master &&
+	git reset --hard main &&
 	git checkout -b several_commits &&
 	test_commit one_commit main.txt one &&
 	test_commit two_commit main.txt two &&
@@ -928,7 +931,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'status: two commands done with some white lines in done file' '
@@ -956,7 +959,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'status: two remaining commands with some white lines in todo file' '
@@ -985,7 +988,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
 nothing to commit (use -u to show untracked files)
 EOF
 	git status --untracked-files=no >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_expect_success 'status: handle not-yet-started rebase -i gracefully' '
@@ -1004,7 +1007,7 @@ You are currently editing a commit while rebasing branch '\''several_commits'\''
 
 nothing to commit (use -u to show untracked files)
 EOF
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_done
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index f19202b509..04885d0a5e 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -51,6 +51,69 @@ test_expect_success 'setup' '
 	EOF
 '
 
+test_expect_success 'with cmd' '
+	test_when_finished "git config --remove-section trailer.bug" &&
+	git config trailer.bug.key "Bug-maker: " &&
+	git config trailer.bug.ifExists "add" &&
+	git config trailer.bug.cmd "echo \"maybe is\"" &&
+	cat >expected2 <<-EOF &&
+
+	Bug-maker: maybe is him
+	Bug-maker: maybe is me
+	EOF
+	git interpret-trailers --trailer "bug: him" --trailer "bug:me" \
+		>actual2 &&
+	test_cmp expected2 actual2
+'
+
+test_expect_success 'with cmd and $1' '
+	test_when_finished "git config --remove-section trailer.bug" &&
+	git config trailer.bug.key "Bug-maker: " &&
+	git config trailer.bug.ifExists "add" &&
+	git config trailer.bug.cmd "echo \"\$1\" is" &&
+	cat >expected2 <<-EOF &&
+
+	Bug-maker: him is him
+	Bug-maker: me is me
+	EOF
+	git interpret-trailers --trailer "bug: him" --trailer "bug:me" \
+		>actual2 &&
+	test_cmp expected2 actual2
+'
+
+test_expect_success 'with cmd and $1 with sh -c' '
+	test_when_finished "git config --remove-section trailer.bug" &&
+	git config trailer.bug.key "Bug-maker: " &&
+	git config trailer.bug.ifExists "replace" &&
+	git config trailer.bug.cmd "sh -c \"echo who is \"\$1\"\"" &&
+	cat >expected2 <<-EOF &&
+
+	Bug-maker: who is me
+	EOF
+	git interpret-trailers --trailer "bug: him" --trailer "bug:me" \
+		>actual2 &&
+	test_cmp expected2 actual2
+'
+
+test_expect_success 'with cmd and $1 with shell script' '
+	test_when_finished "git config --remove-section trailer.bug" &&
+	git config trailer.bug.key "Bug-maker: " &&
+	git config trailer.bug.ifExists "replace" &&
+	git config trailer.bug.cmd "./echoscript" &&
+	cat >expected2 <<-EOF &&
+
+	Bug-maker: who is me
+	EOF
+	cat >echoscript <<-EOF &&
+	#!/bin/sh
+	echo who is "\$1"
+	EOF
+	chmod +x echoscript &&
+	git interpret-trailers --trailer "bug: him" --trailer "bug:me" \
+		>actual2 &&
+	test_cmp expected2 actual2
+'
+
 test_expect_success 'without config' '
 	sed -e "s/ Z\$/ /" >expected <<-\EOF &&
 
@@ -1234,7 +1297,7 @@ test_expect_success 'with simple command' '
 	test_cmp expected actual
 '
 
-test_expect_success 'with command using commiter information' '
+test_expect_success 'with command using committer information' '
 	git config trailer.sign.ifExists "addIfDifferent" &&
 	git config trailer.sign.command "echo \"\$GIT_COMMITTER_NAME <\$GIT_COMMITTER_EMAIL>\"" &&
 	cat complex_message_body >expected &&
@@ -1274,6 +1337,27 @@ test_expect_success 'setup a commit' '
 	git commit -m "Add file a.txt"
 '
 
+test_expect_success 'cmd takes precedence over command' '
+	test_when_finished "git config --unset trailer.fix.cmd" &&
+	git config trailer.fix.ifExists "replace" &&
+	git config trailer.fix.cmd "test -n \"\$1\" && git log -1 --oneline --format=\"%h (%aN)\" \
+	--abbrev-commit --abbrev=14 \"\$1\" || true" &&
+	git config trailer.fix.command "git log -1 --oneline --format=\"%h (%s)\" \
+		--abbrev-commit --abbrev=14 \$ARG" &&
+	FIXED=$(git log -1 --oneline --format="%h (%aN)" --abbrev-commit --abbrev=14 HEAD) &&
+	cat complex_message_body >expected2 &&
+	sed -e "s/ Z\$/ /" >>expected2 <<-EOF &&
+		Fixes: $FIXED
+		Acked-by= Z
+		Reviewed-by:
+		Signed-off-by: Z
+		Signed-off-by: A U Thor <author@example.com>
+	EOF
+	git interpret-trailers --trailer "review:" --trailer "fix=HEAD" \
+		<complex_message >actual2 &&
+	test_cmp expected2 actual2
+'
+
 test_expect_success 'with command using $ARG' '
 	git config trailer.fix.ifExists "replace" &&
 	git config trailer.fix.command "git log -1 --oneline --format=\"%h (%s)\" --abbrev-commit --abbrev=14 \$ARG" &&
diff --git a/t/t7517-per-repo-email.sh b/t/t7517-per-repo-email.sh
index b2401cec3e..405420ae4d 100755
--- a/t/t7517-per-repo-email.sh
+++ b/t/t7517-per-repo-email.sh
@@ -6,6 +6,9 @@
 
 test_description='per-repo forced setting of email address'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup a likely user.useConfigOnly use case' '
@@ -47,24 +50,24 @@ test_expect_success 'set up rebase scenarios' '
 
 test_expect_success 'fast-forward rebase does not care about ident' '
 	git checkout -B tmp side-without-commit &&
-	git rebase master
+	git rebase main
 '
 
 test_expect_success 'non-fast-forward rebase refuses to write commits' '
 	test_when_finished "git rebase --abort || true" &&
 	git checkout -B tmp side-with-commit &&
-	test_must_fail git rebase master
+	test_must_fail git rebase main
 '
 
 test_expect_success 'fast-forward rebase does not care about ident (interactive)' '
 	git checkout -B tmp side-without-commit &&
-	git rebase -i master
+	git rebase -i main
 '
 
 test_expect_success 'non-fast-forward rebase refuses to write commits (interactive)' '
 	test_when_finished "git rebase --abort || true" &&
 	git checkout -B tmp side-with-commit &&
-	test_must_fail git rebase -i master
+	test_must_fail git rebase -i main
 '
 
 test_expect_success 'noop interactive rebase does not care about ident' '
@@ -75,14 +78,14 @@ test_expect_success 'noop interactive rebase does not care about ident' '
 test_expect_success REBASE_P \
 	'fast-forward rebase does not care about ident (preserve)' '
 	git checkout -B tmp side-without-commit &&
-	git rebase -p master
+	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 master
+	test_must_fail git rebase -p main
 '
 
 test_expect_success 'author.name overrides user.name' '
diff --git a/t/t7518-ident-corner-cases.sh b/t/t7518-ident-corner-cases.sh
index b22f631261..905957bd0a 100755
--- a/t/t7518-ident-corner-cases.sh
+++ b/t/t7518-ident-corner-cases.sh
@@ -13,7 +13,7 @@ test_expect_success 'empty name and missing email' '
 		sane_unset GIT_AUTHOR_EMAIL &&
 		GIT_AUTHOR_NAME= &&
 		test_must_fail git commit --allow-empty -m foo 2>err &&
-		test_i18ngrep ! null err
+		test_i18ngrep ! "(null)" err
 	)
 '
 
@@ -29,7 +29,18 @@ test_expect_success 'empty configured name does not auto-detect' '
 		sane_unset GIT_AUTHOR_NAME &&
 		test_must_fail \
 			git -c user.name= commit --allow-empty -m foo 2>err &&
-		test_i18ngrep "empty ident name" err
+		test_i18ngrep "empty ident name" err &&
+		test_i18ngrep "Author identity unknown" err
+	)
+'
+
+test_expect_success 'empty configured name does not auto-detect for committer' '
+	(
+		sane_unset GIT_COMMITTER_NAME &&
+		test_must_fail \
+			git -c user.name= commit --allow-empty -m foo 2>err &&
+		test_i18ngrep "empty ident name" err &&
+		test_i18ngrep "Committer identity unknown" err
 	)
 '
 
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
index 997d5fb349..deea88d443 100755
--- a/t/t7519-status-fsmonitor.sh
+++ b/t/t7519-status-fsmonitor.sh
@@ -32,11 +32,12 @@ write_integration_script () {
 		echo "$0: exactly 2 arguments expected"
 		exit 2
 	fi
-	if test "$1" != 1
+	if test "$1" != 2
 	then
 		echo "Unsupported core.fsmonitor hook version." >&2
 		exit 1
 	fi
+	printf "last_update_token\0"
 	printf "untracked\0"
 	printf "dir1/untracked\0"
 	printf "dir2/untracked\0"
@@ -72,6 +73,7 @@ test_expect_success 'setup' '
 	expect*
 	actual*
 	marker*
+	trace2*
 	EOF
 '
 
@@ -106,6 +108,9 @@ EOF
 
 # test that "update-index --fsmonitor-valid" sets the fsmonitor valid bit
 test_expect_success 'update-index --fsmonitor-valid" sets the fsmonitor valid bit' '
+	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+		printf "last_update_token\0"
+	EOF
 	git update-index --fsmonitor &&
 	git update-index --fsmonitor-valid dir1/modified &&
 	git update-index --fsmonitor-valid dir2/modified &&
@@ -164,6 +169,9 @@ EOF
 
 # test that newly added files are marked valid
 test_expect_success 'newly added files are marked valid' '
+	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+		printf "last_update_token\0"
+	EOF
 	git add new &&
 	git add dir1/new &&
 	git add dir2/new &&
@@ -203,6 +211,7 @@ EOF
 # test that *only* files returned by the integration script get flagged as invalid
 test_expect_success '*only* files returned by the integration script get flagged as invalid' '
 	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+	printf "last_update_token\0"
 	printf "dir1/modified\0"
 	EOF
 	clean_repo &&
@@ -218,16 +227,17 @@ test_expect_success '*only* files returned by the integration script get flagged
 # Ensure commands that call refresh_index() to move the index back in time
 # properly invalidate the fsmonitor cache
 test_expect_success 'refresh_index() invalidates fsmonitor cache' '
-	write_script .git/hooks/fsmonitor-test<<-\EOF &&
-	EOF
 	clean_repo &&
 	dirty_repo &&
+	write_integration_script &&
 	git add . &&
+	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+	EOF
 	git commit -m "to reset" &&
 	git reset HEAD~1 &&
 	git status >actual &&
 	git -c core.fsmonitor= status >expect &&
-	test_i18ncmp expect actual
+	test_cmp expect actual
 '
 
 # test fsmonitor with and without preloadIndex
@@ -264,13 +274,14 @@ do
 			git add dir2/new &&
 			git status >actual &&
 			git -c core.fsmonitor= status >expect &&
-			test_i18ncmp expect actual
+			test_cmp expect actual
 		'
 
 		# Make sure it's actually skipping the check for modified and untracked
 		# (if enabled) files unless it is told about them.
 		test_expect_success "status doesn't detect unreported modifications" '
 			write_script .git/hooks/fsmonitor-test<<-\EOF &&
+			printf "last_update_token\0"
 			:>marker
 			EOF
 			clean_repo &&
@@ -294,7 +305,7 @@ do
 	done
 done
 
-# test that splitting the index dosn't interfere
+# test that splitting the index doesn't interfere
 test_expect_success 'splitting the index results in the same state' '
 	write_integration_script &&
 	dirty_repo &&
@@ -324,7 +335,7 @@ test_expect_success UNTRACKED_CACHE 'ignore .git changes when invalidating UNTR'
 		git config core.fsmonitor .git/hooks/fsmonitor-test &&
 		git update-index --untracked-cache &&
 		git update-index --fsmonitor &&
-		GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace-before" \
+		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-before" \
 		git status &&
 		test-tool dump-untracked-cache >../before
 	) &&
@@ -336,12 +347,12 @@ test_expect_success UNTRACKED_CACHE 'ignore .git changes when invalidating UNTR'
 	EOF
 	(
 		cd dot-git &&
-		GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace-after" \
+		GIT_TRACE2_PERF="$TRASH_DIRECTORY/trace-after" \
 		git status &&
 		test-tool dump-untracked-cache >../after
 	) &&
-	grep "directory invalidation" trace-before >>before &&
-	grep "directory invalidation" trace-after >>after &&
+	grep "directory-invalidation" trace-before | cut -d"|" -f 9 >>before &&
+	grep "directory-invalidation" trace-after  | cut -d"|" -f 9 >>after &&
 	# UNTR extension unchanged, dir invalidation count unchanged
 	test_cmp before after
 '
@@ -373,4 +384,52 @@ 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 status --porcelain=v2 >expect &&
+	git sparse-checkout init --cone --sparse-index &&
+	git sparse-checkout set dir1 dir2 &&
+	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+		git 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 &&
+	git sparse-checkout disable
+}
+
+test_expect_success 'status succeeds with sparse index' '
+	git reset --hard &&
+
+	test_config core.fsmonitor "$TEST_DIRECTORY/t7519/fsmonitor-all" &&
+	check_sparse_index_behavior ! &&
+
+	write_script .git/hooks/fsmonitor-test<<-\EOF &&
+		printf "last_update_token\0"
+	EOF
+	git 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 ! &&
+
+	cp -r dir1 dir1a &&
+	git add dir1a &&
+	git commit -m "add dir1a" &&
+
+	# 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/t7519/fsmonitor-all b/t/t7519/fsmonitor-all
index 691bc94dc2..94ab66bd3d 100755
--- a/t/t7519/fsmonitor-all
+++ b/t/t7519/fsmonitor-all
@@ -17,7 +17,6 @@ fi
 
 if test "$1" != 1
 then
-	echo "Unsupported core.fsmonitor hook version." >&2
 	exit 1
 fi
 
diff --git a/t/t7519/fsmonitor-all-v2 b/t/t7519/fsmonitor-all-v2
new file mode 100755
index 0000000000..061907e88b
--- /dev/null
+++ b/t/t7519/fsmonitor-all-v2
@@ -0,0 +1,21 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+#
+# An test hook script to integrate with git to test fsmonitor.
+#
+# The hook is passed a version (currently 2) and since token
+# formatted as a string and outputs to stdout all files that have been
+# modified since the given time. Paths must be relative to the root of
+# the working tree and separated by a single NUL.
+#
+#echo "$0 $*" >&2
+my ($version, $last_update_token) = @ARGV;
+
+if ($version ne 2) {
+	print "Unsupported query-fsmonitor hook version '$version'.\n";
+	exit 1;
+}
+
+print "last_update_token\0/\0"
diff --git a/t/t7519/fsmonitor-watchman b/t/t7519/fsmonitor-watchman
index 5514edcf68..264b9daf83 100755
--- a/t/t7519/fsmonitor-watchman
+++ b/t/t7519/fsmonitor-watchman
@@ -23,10 +23,10 @@ my ($version, $time) = @ARGV;
 
 if ($version == 1) {
 	# convert nanoseconds to seconds
-	$time = int $time / 1000000000;
+	# subtract one second to make sure watchman will return all changes
+	$time = int ($time / 1000000000) - 1;
 } else {
-	die "Unsupported query-fsmonitor hook version '$version'.\n" .
-	    "Falling back to scanning...\n";
+	exit 1;
 }
 
 my $git_work_tree;
@@ -54,18 +54,12 @@ sub launch_watchman {
 	#
 	# To accomplish this, we're using the "since" generator to use the
 	# recency index to select candidate nodes and "fields" to limit the
-	# output to file names only. Then we're using the "expression" term to
-	# further constrain the results.
-	#
-	# The category of transient files that we want to ignore will have a
-	# creation clock (cclock) newer than $time_t value and will also not
-	# currently exist.
+	# output to file names only.
 
 	my $query = <<"	END";
 		["query", "$git_work_tree", {
 			"since": $time,
-			"fields": ["name"],
-			"expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
+			"fields": ["name"]
 		}]
 	END
 	
diff --git a/t/t7519/fsmonitor-watchman-v2 b/t/t7519/fsmonitor-watchman-v2
new file mode 100755
index 0000000000..14ed0aa42d
--- /dev/null
+++ b/t/t7519/fsmonitor-watchman-v2
@@ -0,0 +1,173 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $last_update_token) = @ARGV;
+
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
+
+# Check the hook interface version
+if ($version ne 2) {
+	die "Unsupported query-fsmonitor hook version '$version'.\n" .
+	    "Falling back to scanning...\n";
+}
+
+my $git_work_tree = get_working_dir();
+
+my $retry = 1;
+
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
+launch_watchman();
+
+sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
+
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
+	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
+
+	# In the query expression below we're asking for names of files that
+	# changed since $last_update_token but not from the .git folder.
+	#
+	# To accomplish this, we're using the "since" generator to use the
+	# recency index to select candidate nodes and "fields" to limit the
+	# output to file names only. Then we're using the "expression" term to
+	# further constrain the results.
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
+	my $query = <<"	END";
+		["query", "$git_work_tree", {
+			"since": $last_update_token,
+			"fields": ["name"],
+			"expression": ["not", ["dirname", ".git"]]
+		}]
+	END
+
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
+	print CHLD_IN $query;
+	close CHLD_IN;
+	my $response = do {local $/; <CHLD_OUT>};
+
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
+	die "Watchman: command returned no output.\n" .
+	"Falling back to scanning...\n" if $response eq "";
+	die "Watchman: command returned invalid output: $response\n" .
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
+		$retry--;
+		my $response = qx/watchman watch "$git_work_tree"/;
+		die "Failed to make watchman watch '$git_work_tree'.\n" .
+		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
+
+		# Watchman will always return all files on the first query so
+		# return the fast "everything is dirty" flag to git and do the
+		# Watchman query just to get it over with now so we won't pay
+		# the cost in git to look up each individual file.
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
+		eval { launch_watchman() };
+		return 0;
+	}
+
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
+
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
+}
diff --git a/t/t7521-ignored-mode.sh b/t/t7521-ignored-mode.sh
index 91790943c3..a88b02b06e 100755
--- a/t/t7521-ignored-mode.sh
+++ b/t/t7521-ignored-mode.sh
@@ -30,7 +30,7 @@ test_expect_success 'Verify behavior of status on directories with ignored files
 		dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
 
 	git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'Verify status behavior on directory with tracked & ignored files' '
@@ -55,7 +55,7 @@ test_expect_success 'Verify status behavior on directory with tracked & ignored
 	git commit -m "commit tracked files" &&
 
 	git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'Verify status behavior on directory with untracked and ignored files' '
@@ -80,7 +80,7 @@ test_expect_success 'Verify status behavior on directory with untracked and igno
 		dir/untracked_ignored/ignored_1.ign dir/untracked_ignored/ignored_2.ign &&
 
 	git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'Verify status matching ignored files on ignored directory' '
@@ -96,7 +96,7 @@ test_expect_success 'Verify status matching ignored files on ignored directory'
 		ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign &&
 
 	git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
@@ -117,7 +117,7 @@ test_expect_success 'Verify status behavior on ignored directory containing trac
 	git add -f ignored_dir/tracked &&
 	git commit -m "Force add file in ignored directory" &&
 	git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
@@ -136,7 +136,7 @@ test_expect_success 'Verify matching ignored files with --untracked-files=normal
 		ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
 		untracked_dir/untracked &&
 	git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
@@ -155,7 +155,7 @@ test_expect_success 'Verify matching ignored files with --untracked-files=normal
 		ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
 		untracked_dir/untracked &&
 	git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
@@ -176,7 +176,7 @@ test_expect_success 'Verify status behavior on ignored directory containing trac
 	git add -f ignored_dir/tracked &&
 	git commit -m "Force add file in ignored directory" &&
 	git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'Verify behavior of status with --ignored=no' '
@@ -191,7 +191,7 @@ test_expect_success 'Verify behavior of status with --ignored=no' '
 		dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
 
 	git status --porcelain=v2 --ignored=no --untracked-files=all >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=all' '
@@ -210,7 +210,7 @@ test_expect_success 'Verify behavior of status with --ignored=traditional and --
 		dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
 
 	git status --porcelain=v2 --ignored=traditional --untracked-files=all >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=normal' '
@@ -227,7 +227,7 @@ test_expect_success 'Verify behavior of status with --ignored=traditional and --
 		dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
 
 	git status --porcelain=v2 --ignored=traditional --untracked-files=normal >output &&
-	test_i18ncmp expect output
+	test_cmp expect output
 '
 
 test_done
diff --git a/t/t7526-commit-pathspec-file.sh b/t/t7526-commit-pathspec-file.sh
new file mode 100755
index 0000000000..5fbe47ebcd
--- /dev/null
+++ b/t/t7526-commit-pathspec-file.sh
@@ -0,0 +1,164 @@
+#!/bin/sh
+
+test_description='commit --pathspec-from-file'
+
+. ./test-lib.sh
+
+test_tick
+
+test_expect_success setup '
+	test_commit file0 &&
+	git tag checkpoint &&
+
+	echo A >fileA.t &&
+	echo B >fileB.t &&
+	echo C >fileC.t &&
+	echo D >fileD.t &&
+	git add fileA.t fileB.t fileC.t fileD.t
+'
+
+restore_checkpoint () {
+	git reset --soft checkpoint
+}
+
+verify_expect () {
+	git diff-tree --no-commit-id --name-status -r HEAD >actual &&
+	test_cmp expect actual
+}
+
+test_expect_success '--pathspec-from-file from stdin' '
+	restore_checkpoint &&
+
+	echo fileA.t | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success '--pathspec-from-file from file' '
+	restore_checkpoint &&
+
+	echo fileA.t >list &&
+	git commit --pathspec-from-file=list -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'NUL delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\0fileB.t\0" | git commit --pathspec-from-file=- --pathspec-file-nul -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'LF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'no trailing delimiter' '
+	restore_checkpoint &&
+
+	printf "fileA.t\nfileB.t" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'CRLF delimiters' '
+	restore_checkpoint &&
+
+	printf "fileA.t\r\nfileB.t\r\n" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	A	fileB.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'quotes' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	git commit --pathspec-from-file=list -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileA.t
+	EOF
+	verify_expect expect
+'
+
+test_expect_success 'quotes not compatible with --pathspec-file-nul' '
+	restore_checkpoint &&
+
+	cat >list <<-\EOF &&
+	"file\101.t"
+	EOF
+
+	test_must_fail git commit --pathspec-from-file=list --pathspec-file-nul -m "Commit"
+'
+
+test_expect_success 'only touches what was listed' '
+	restore_checkpoint &&
+
+	printf "fileB.t\nfileC.t\n" | git commit --pathspec-from-file=- -m "Commit" &&
+
+	cat >expect <<-\EOF &&
+	A	fileB.t
+	A	fileC.t
+	EOF
+	verify_expect
+'
+
+test_expect_success 'error conditions' '
+	restore_checkpoint &&
+	echo fileA.t >list &&
+	>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_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_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_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_must_fail git commit --pathspec-file-nul -m "Commit" 2>err &&
+	test_i18ngrep -e "--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 &&
+
+	test_must_fail git commit --pathspec-from-file=empty_list --only -m "Commit" 2>err &&
+	test_i18ngrep -e "No paths with --include/--only does not make sense." err
+'
+
+test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 132608879a..2ef39d3088 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -14,9 +14,9 @@ Testing basic merge operations/option parsing.
     ! [c4] c4
      ! [c5] c5
       ! [c6] c6
-       * [master] Merge commit 'c1'
+       * [main] Merge commit 'c1'
 --------
-       - [master] Merge commit 'c1'
+       - [main] Merge commit 'c1'
  +     * [c1] commit 1
       +  [c6] c6
      +   [c5] c5
@@ -26,18 +26,25 @@ Testing basic merge operations/option parsing.
 +++++++* [c0] commit 0
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY"/lib-gpg.sh
 
-printf '%s\n' 1 2 3 4 5 6 7 8 9 >file
-printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >file.1
-printf '%s\n' 1 2 3 4 '5 X' 6 7 8 9 >file.5
-printf '%s\n' 1 2 3 4 5 6 7 8 '9 X' >file.9
-printf '%s\n' 1 2 3 4 5 6 7 8 '9 Y' >file.9y
-printf '%s\n' '1 X' 2 3 4 5 6 7 8 9 >result.1
-printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 9 >result.1-5
-printf '%s\n' '1 X' 2 3 4 '5 X' 6 7 8 '9 X' >result.1-5-9
-printf '%s\n' 1 2 3 4 5 6 7 8 '9 Z' >result.9z
+test_write_lines 1 2 3 4 5 6 7 8 9 >file
+cp file file.orig
+test_write_lines '1 X' 2 3 4 5 6 7 8 9 >file.1
+test_write_lines 1 2 '3 X' 4 5 6 7 8 9 >file.3
+test_write_lines 1 2 3 4 '5 X' 6 7 8 9 >file.5
+test_write_lines 1 2 3 4 5 6 7 8 '9 X' >file.9
+test_write_lines 1 2 3 4 5 6 7 8 '9 Y' >file.9y
+test_write_lines '1 X' 2 3 4 5 6 7 8 9 >result.1
+test_write_lines '1 X' 2 3 4 '5 X' 6 7 8 9 >result.1-5
+test_write_lines '1 X' 2 3 4 5 6 7 8 '9 X' >result.1-9
+test_write_lines '1 X' 2 3 4 '5 X' 6 7 8 '9 X' >result.1-5-9
+test_write_lines '1 X' 2 '3 X' 4 '5 X' 6 7 8 '9 X' >result.1-3-5-9
+test_write_lines 1 2 3 4 5 6 7 8 '9 Z' >result.9z
 
 create_merge_msgs () {
 	echo "Merge tag 'c2'" >msg.1-5 &&
@@ -81,7 +88,7 @@ verify_head () {
 }
 
 verify_parents () {
-	printf '%s\n' "$@" >parents.expected &&
+	test_write_lines "$@" >parents.expected &&
 	>parents.actual &&
 	i=1 &&
 	while test $i -le $#
@@ -95,7 +102,7 @@ verify_parents () {
 }
 
 verify_mergeheads () {
-	printf '%s\n' "$@" >mergehead.expected &&
+	test_write_lines "$@" >mergehead.expected &&
 	while read sha1 rest
 	do
 		git rev-parse $sha1
@@ -115,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 &&
@@ -199,13 +208,13 @@ test_expect_success 'merge c0 with c1 with --ff-only' '
 test_debug 'git log --graph --decorate --oneline --all'
 
 test_expect_success 'merge from unborn branch' '
-	git checkout -f master &&
+	git checkout -f main &&
 	test_might_fail git branch -D kid &&
 
 	echo "OBJID HEAD@{0}: initial pull" >reflog.expected &&
 
 	git checkout --orphan kid &&
-	test_when_finished "git checkout -f master" &&
+	test_when_finished "git checkout -f main" &&
 	git rm -fr . &&
 	test_tick &&
 	git merge --ff-only c1 &&
@@ -242,7 +251,7 @@ test_expect_success 'merge --squash c3 with c7' '
 	#	file
 	EOF
 	git cat-file commit HEAD >raw &&
-	sed -e '1,/^$/d' raw >actual &&
+	sed -e "1,/^$/d" raw >actual &&
 	test_cmp expect actual
 '
 
@@ -264,8 +273,8 @@ test_expect_success 'merge c3 with c7 with commit.cleanup = scissors' '
 	#	file
 	EOF
 	git cat-file commit HEAD >raw &&
-	sed -e '1,/^$/d' raw >actual &&
-	test_i18ncmp expect actual
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
@@ -288,8 +297,8 @@ test_expect_success 'merge c3 with c7 with --squash commit.cleanup = scissors' '
 	#	file
 	EOF
 	git cat-file commit HEAD >raw &&
-	sed -e '1,/^$/d' raw >actual &&
-	test_i18ncmp expect actual
+	sed -e "1,/^$/d" raw >actual &&
+	test_cmp expect actual
 '
 
 test_debug 'git log --graph --decorate --oneline --all'
@@ -409,7 +418,7 @@ test_debug 'git log --graph --decorate --oneline --all'
 
 test_expect_success 'merge c1 with c2 (no-commit in config)' '
 	git reset --hard c1 &&
-	test_config branch.master.mergeoptions "--no-commit" &&
+	test_config branch.main.mergeoptions "--no-commit" &&
 	git merge c2 &&
 	verify_merge file result.1-5 &&
 	verify_head $c1 &&
@@ -423,7 +432,7 @@ test_expect_success 'merge c1 with c2 (log in config)' '
 	git merge --log c2 &&
 	git show -s --pretty=tformat:%s%n%b >expect &&
 
-	test_config branch.master.mergeoptions "--log" &&
+	test_config branch.main.mergeoptions "--log" &&
 	git reset --hard c1 &&
 	git merge c2 &&
 	git show -s --pretty=tformat:%s%n%b >actual &&
@@ -436,7 +445,7 @@ test_expect_success 'merge c1 with c2 (log in config gets overridden)' '
 	git merge c2 &&
 	git show -s --pretty=tformat:%s%n%b >expect &&
 
-	test_config branch.master.mergeoptions "--no-log" &&
+	test_config branch.main.mergeoptions "--no-log" &&
 	test_config merge.log "true" &&
 	git reset --hard c1 &&
 	git merge c2 &&
@@ -447,7 +456,7 @@ test_expect_success 'merge c1 with c2 (log in config gets overridden)' '
 
 test_expect_success 'merge c1 with c2 (squash in config)' '
 	git reset --hard c1 &&
-	test_config branch.master.mergeoptions "--squash" &&
+	test_config branch.main.mergeoptions "--squash" &&
 	git merge c2 &&
 	verify_merge file result.1-5 &&
 	verify_head $c1 &&
@@ -459,7 +468,7 @@ test_debug 'git log --graph --decorate --oneline --all'
 
 test_expect_success 'override config option -n with --summary' '
 	git reset --hard c1 &&
-	test_config branch.master.mergeoptions "-n" &&
+	test_config branch.main.mergeoptions "-n" &&
 	test_tick &&
 	git merge --summary c2 >diffstat.txt &&
 	verify_merge file result.1-5 msg.1-5 &&
@@ -473,7 +482,7 @@ test_expect_success 'override config option -n with --summary' '
 
 test_expect_success 'override config option -n with --stat' '
 	git reset --hard c1 &&
-	test_config branch.master.mergeoptions "-n" &&
+	test_config branch.main.mergeoptions "-n" &&
 	test_tick &&
 	git merge --stat c2 >diffstat.txt &&
 	verify_merge file result.1-5 msg.1-5 &&
@@ -489,7 +498,7 @@ test_debug 'git log --graph --decorate --oneline --all'
 
 test_expect_success 'override config option --stat' '
 	git reset --hard c1 &&
-	test_config branch.master.mergeoptions "--stat" &&
+	test_config branch.main.mergeoptions "--stat" &&
 	test_tick &&
 	git merge -n c2 >diffstat.txt &&
 	verify_merge file result.1-5 msg.1-5 &&
@@ -505,7 +514,7 @@ test_debug 'git log --graph --decorate --oneline --all'
 
 test_expect_success 'merge c1 with c2 (override --no-commit)' '
 	git reset --hard c1 &&
-	test_config branch.master.mergeoptions "--no-commit" &&
+	test_config branch.main.mergeoptions "--no-commit" &&
 	test_tick &&
 	git merge --commit c2 &&
 	verify_merge file result.1-5 msg.1-5 &&
@@ -516,7 +525,7 @@ test_debug 'git log --graph --decorate --oneline --all'
 
 test_expect_success 'merge c1 with c2 (override --squash)' '
 	git reset --hard c1 &&
-	test_config branch.master.mergeoptions "--squash" &&
+	test_config branch.main.mergeoptions "--squash" &&
 	test_tick &&
 	git merge --no-squash c2 &&
 	verify_merge file result.1-5 msg.1-5 &&
@@ -545,9 +554,9 @@ test_expect_success 'merge c0 with c1 (merge.ff=false)' '
 '
 test_debug 'git log --graph --decorate --oneline --all'
 
-test_expect_success 'combine branch.master.mergeoptions with merge.ff' '
+test_expect_success 'combine branch.main.mergeoptions with merge.ff' '
 	git reset --hard c0 &&
-	test_config branch.master.mergeoptions "--ff" &&
+	test_config branch.main.mergeoptions "--ff" &&
 	test_config merge.ff "false" &&
 	test_tick &&
 	git merge c1 &&
@@ -589,7 +598,7 @@ test_expect_success 'option --no-ff overrides merge.ff=only config' '
 
 test_expect_success 'merge c0 with c1 (ff overrides no-ff)' '
 	git reset --hard c0 &&
-	test_config branch.master.mergeoptions "--no-ff" &&
+	test_config branch.main.mergeoptions "--no-ff" &&
 	git merge --ff c1 &&
 	verify_merge file result.1 &&
 	verify_head $c1
@@ -602,7 +611,7 @@ test_expect_success 'merge log message' '
 	test_must_be_empty msg.act &&
 
 	git reset --hard c0 &&
-	test_config branch.master.mergeoptions "--no-ff" &&
+	test_config branch.main.mergeoptions "--no-ff" &&
 	git merge --no-log c2 &&
 	git show -s --pretty=format:%b HEAD >msg.act &&
 	test_must_be_empty msg.act &&
@@ -675,6 +684,151 @@ test_expect_success 'refresh the index before merging' '
 	git merge c3
 '
 
+test_expect_success 'merge with --autostash' '
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git merge --autostash c2 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
+'
+
+test_expect_success 'merge with merge.autoStash' '
+	test_config merge.autoStash true &&
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git merge c2 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
+'
+
+test_expect_success 'fast-forward merge with --autostash' '
+	git reset --hard c0 &&
+	git merge-file file file.orig file.5 &&
+	git merge --autostash c1 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	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_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 &&
+	git merge --autostash c2 c3 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5-9 merge-result &&
+	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 &&
+	test_must_fail git merge --autostash c7 &&
+	git merge --abort 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	test_cmp file.1 file
+'
+
+test_expect_success 'completed merge (git commit) with --no-commit and --autostash' '
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git commit 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
+'
+
+test_expect_success 'completed merge (git merge --continue) with --no-commit and --autostash' '
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git merge --continue 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-5 merge-result &&
+	test_cmp result.1-5-9 file
+'
+
+test_expect_success 'aborted merge (merge --abort) with --no-commit and --autostash' '
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git merge --abort 2>err &&
+	test_i18ngrep "Applied autostash." err &&
+	git diff >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'aborted merge (reset --hard) with --no-commit and --autostash' '
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git reset --hard 2>err &&
+	test_i18ngrep "Autostash exists; creating a new stash entry." err &&
+	git diff --exit-code
+'
+
+test_expect_success 'quit merge with --no-commit and --autostash' '
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9 &&
+	git diff >expect &&
+	git merge --no-commit --autostash c2 &&
+	git stash show -p MERGE_AUTOSTASH >actual &&
+	test_cmp expect actual &&
+	git diff HEAD >expect &&
+	git merge --quit 2>err &&
+	test_i18ngrep "Autostash exists; creating a new stash entry." err &&
+	git diff HEAD >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'merge with conflicted --autostash changes' '
+	git reset --hard c1 &&
+	git merge-file file file.orig file.9y &&
+	git diff >expect &&
+	test_when_finished "test_might_fail git stash drop" &&
+	git merge --autostash c3 2>err &&
+	test_i18ngrep "Applying autostash resulted in conflicts." err &&
+	git show HEAD:file >merge-result &&
+	test_cmp result.1-9 merge-result &&
+	git stash show -p >actual &&
+	test_cmp expect actual
+'
+
 cat >expected.branch <<\EOF
 Merge branch 'c5-branch' (early part)
 EOF
@@ -818,10 +972,10 @@ test_expect_success 'set up mod-256 conflict scenario' '
 	git add file &&
 	git commit -m base &&
 
-	# one side changes the first line of each to "master"
-	sed s/-1/-master/ file >tmp &&
+	# one side changes the first line of each to "main"
+	sed s/-1/-main/ file >tmp &&
 	mv tmp file &&
-	git commit -am master &&
+	git commit -am main &&
 
 	# and the other to "side"; merging the two will
 	# yield 256 separate conflicts
@@ -833,12 +987,12 @@ test_expect_success 'set up mod-256 conflict scenario' '
 
 test_expect_success 'merge detects mod-256 conflicts (recursive)' '
 	git reset --hard &&
-	test_must_fail git merge -s recursive master
+	test_must_fail git merge -s recursive main
 '
 
 test_expect_success 'merge detects mod-256 conflicts (resolve)' '
 	git reset --hard &&
-	test_must_fail git merge -s resolve master
+	test_must_fail git merge -s resolve main
 '
 
 test_expect_success 'merge nothing into void' '
diff --git a/t/t7601-merge-pull-config.sh b/t/t7601-merge-pull-config.sh
index c6c44ec570..1f652f433e 100755
--- a/t/t7601-merge-pull-config.sh
+++ b/t/t7601-merge-pull-config.sh
@@ -27,6 +27,326 @@ test_expect_success 'setup' '
 	git tag c3
 '
 
+test_expect_success 'pull.rebase not set, ff possible' '
+	git reset --hard c0 &&
+	git pull . c1 2>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 ! "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 ! "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 ! "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 ! "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 ! "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 ! "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 ! "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 ! "You have divergent branches" err
+'
+
+test_expect_success 'pull.rebase not set (not-fast-forward)' '
+	git reset --hard c2 &&
+	test_must_fail git -c color.advice=always pull . c1 2>err &&
+	test_decode_color <err >decoded &&
+	test_i18ngrep "<YELLOW>hint: " 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 ! "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 ! "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 ! "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 ! "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 ! "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 ! "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 ! "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 ! "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' '
 	git reset --hard c1 &&
 	test -f c0.c &&
diff --git a/t/t7602-merge-octopus-many.sh b/t/t7602-merge-octopus-many.sh
index 6abe441ae3..a9c816b47f 100755
--- a/t/t7602-merge-octopus-many.sh
+++ b/t/t7602-merge-octopus-many.sh
@@ -66,7 +66,7 @@ EOF
 test_expect_success 'merge output uses pretty names' '
 	git reset --hard c1 &&
 	git merge c2 c3 c4 >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 cat >expected <<\EOF
@@ -77,8 +77,14 @@ Merge made by the 'recursive' strategy.
 EOF
 
 test_expect_success 'merge reduces irrelevant remote heads' '
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		mv expected expected.tmp &&
+		sed s/recursive/ort/ expected.tmp >expected &&
+		rm expected.tmp
+	fi &&
 	GIT_MERGE_VERBOSITY=0 git merge c4 c5 >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 cat >expected <<\EOF
@@ -95,7 +101,7 @@ EOF
 test_expect_success 'merge fast-forward output uses pretty names' '
 	git reset --hard c0 &&
 	git merge c1 c2 >actual &&
-	test_i18ncmp expected actual
+	test_cmp expected actual
 '
 
 test_done
diff --git a/t/t7603-merge-reduce-heads.sh b/t/t7603-merge-reduce-heads.sh
index 98948955ae..27cd94ad6f 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)" &&
diff --git a/t/t7606-merge-custom.sh b/t/t7606-merge-custom.sh
index 8e8c4d7246..81fb7c474c 100755
--- a/t/t7606-merge-custom.sh
+++ b/t/t7606-merge-custom.sh
@@ -4,7 +4,7 @@ test_description="git merge
 
 Testing a custom strategy.
 
-*   (HEAD, master) Merge commit 'c3'
+*   (HEAD, main) Merge commit 'c3'
 |\
 | * (tag: c3) c3
 * | (tag: c1) c1
diff --git a/t/t7608-merge-messages.sh b/t/t7608-merge-messages.sh
index 8e7e0a5865..0b908ab2e7 100755
--- a/t/t7608-merge-messages.sh
+++ b/t/t7608-merge-messages.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='test auto-generated merge messages'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 check_oneline() {
@@ -10,51 +13,51 @@ check_oneline() {
 }
 
 test_expect_success 'merge local branch' '
-	test_commit master-1 &&
+	test_commit main-1 &&
 	git checkout -b local-branch &&
 	test_commit branch-1 &&
-	git checkout master &&
-	test_commit master-2 &&
+	git checkout main &&
+	test_commit main-2 &&
 	git merge local-branch &&
 	check_oneline "Merge branch Qlocal-branchQ"
 '
 
 test_expect_success 'merge octopus branches' '
-	git checkout -b octopus-a master &&
+	git checkout -b octopus-a main &&
 	test_commit octopus-1 &&
-	git checkout -b octopus-b master &&
+	git checkout -b octopus-b main &&
 	test_commit octopus-2 &&
-	git checkout master &&
+	git checkout main &&
 	git merge octopus-a octopus-b &&
 	check_oneline "Merge branches Qoctopus-aQ and Qoctopus-bQ"
 '
 
 test_expect_success 'merge tag' '
-	git checkout -b tag-branch master &&
+	git checkout -b tag-branch main &&
 	test_commit tag-1 &&
-	git checkout master &&
-	test_commit master-3 &&
+	git checkout main &&
+	test_commit main-3 &&
 	git merge tag-1 &&
 	check_oneline "Merge tag Qtag-1Q"
 '
 
 test_expect_success 'ambiguous tag' '
-	git checkout -b ambiguous master &&
+	git checkout -b ambiguous main &&
 	test_commit ambiguous &&
-	git checkout master &&
-	test_commit master-4 &&
+	git checkout main &&
+	test_commit main-4 &&
 	git merge ambiguous &&
 	check_oneline "Merge tag QambiguousQ"
 '
 
 test_expect_success 'remote-tracking branch' '
-	git checkout -b remote master &&
+	git checkout -b remote main &&
 	test_commit remote-1 &&
-	git update-ref refs/remotes/origin/master remote &&
-	git checkout master &&
-	test_commit master-5 &&
-	git merge origin/master &&
-	check_oneline "Merge remote-tracking branch Qorigin/masterQ"
+	git update-ref refs/remotes/origin/main remote &&
+	git checkout main &&
+	test_commit main-5 &&
+	git merge origin/main &&
+	check_oneline "Merge remote-tracking branch Qorigin/mainQ"
 '
 
 test_done
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index ad288ddc69..8cc64729ad 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -7,22 +7,25 @@ test_description='git mergetool
 
 Testing basic merge tool invocation'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # All the mergetool test work by checking out a temporary branch based
-# off 'branch1' and then merging in master and checking the results of
+# off 'branch1' and then merging in main and checking the results of
 # running mergetool
 
 test_expect_success 'setup' '
 	test_config rerere.enabled true &&
-	echo master >file1 &&
-	echo master spaced >"spaced name" &&
-	echo master file11 >file11 &&
-	echo master file12 >file12 &&
-	echo master file13 >file13 &&
-	echo master file14 >file14 &&
+	echo main >file1 &&
+	echo main spaced >"spaced name" &&
+	echo main file11 >file11 &&
+	echo main file12 >file12 &&
+	echo main file13 >file13 &&
+	echo main file14 >file14 &&
 	mkdir subdir &&
-	echo master sub >subdir/file3 &&
+	echo main sub >subdir/file3 &&
 	test_create_repo submod &&
 	(
 		cd submod &&
@@ -34,7 +37,7 @@ test_expect_success 'setup' '
 	git add file1 "spaced name" file1[1-4] subdir/file3 .gitmodules submod &&
 	git commit -m "add initial versions" &&
 
-	git checkout -b branch1 master &&
+	git checkout -b branch1 main &&
 	git submodule update -N &&
 	echo branch1 change >file1 &&
 	echo branch1 newfile >file2 &&
@@ -71,39 +74,39 @@ test_expect_success 'setup' '
 	test_write_lines one two 3 >c/c/file.txt &&
 	git commit -a -m"move to c" &&
 
-	git checkout -b stash1 master &&
+	git checkout -b stash1 main &&
 	echo stash1 change file11 >file11 &&
 	git add file11 &&
 	git commit -m "stash1 changes" &&
 
-	git checkout -b stash2 master &&
+	git checkout -b stash2 main &&
 	echo stash2 change file11 >file11 &&
 	git add file11 &&
 	git commit -m "stash2 changes" &&
 
-	git checkout master &&
+	git checkout main &&
 	git submodule update -N &&
-	echo master updated >file1 &&
-	echo master new >file2 &&
-	echo master updated spaced >"spaced name" &&
-	echo master both added >both &&
-	echo master updated file12 >file12 &&
-	echo master updated file14 >file14 &&
-	echo master new sub >subdir/file3 &&
+	echo main updated >file1 &&
+	echo main new >file2 &&
+	echo main updated spaced >"spaced name" &&
+	echo main both added >both &&
+	echo main updated file12 >file12 &&
+	echo main updated file14 >file14 &&
+	echo main new sub >subdir/file3 &&
 	(
 		cd submod &&
-		echo master submodule >bar &&
+		echo main submodule >bar &&
 		git add bar &&
-		git commit -m "Add bar on master" &&
-		git checkout -b submod-master
+		git commit -m "Add bar on main" &&
+		git checkout -b submod-main
 	) &&
 	git add file1 "spaced name" file12 file14 file2 subdir/file3 submod &&
 	git add both &&
 	git rm file11 &&
-	git commit -m "master updates" &&
+	git commit -m "main updates" &&
 
 	git clean -fdx &&
-	git checkout -b order-file-start master &&
+	git checkout -b order-file-start main &&
 	echo start >a &&
 	echo start >b &&
 	git add a b &&
@@ -130,7 +133,7 @@ test_expect_success 'custom mergetool' '
 	test_when_finished "git reset --hard" &&
 	git checkout -b test$test_count branch1 &&
 	git submodule update -N &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	yes "" | git mergetool both &&
 	yes "" | git mergetool file1 file1 &&
 	yes "" | git mergetool file2 "spaced name" &&
@@ -138,11 +141,11 @@ test_expect_success 'custom mergetool' '
 	yes "d" | git mergetool file11 &&
 	yes "d" | git mergetool file12 &&
 	yes "l" | git mergetool submod &&
-	echo "master updated" >expect &&
+	echo "main updated" >expect &&
 	test_cmp expect file1 &&
-	echo "master new" >expect &&
+	echo "main new" >expect &&
 	test_cmp expect file2 &&
-	echo "master new sub" >expect &&
+	echo "main new sub" >expect &&
 	test_cmp expect subdir/file3 &&
 	echo "branch1 submodule" >expect &&
 	test_cmp expect submod/bar &&
@@ -156,7 +159,7 @@ test_expect_success 'gui mergetool' '
 	test_when_finished "git reset --hard" &&
 	git checkout -b test$test_count branch1 &&
 	git submodule update -N &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	yes "" | git mergetool --gui both &&
 	yes "" | git mergetool -g file1 file1 &&
 	yes "" | git mergetool --gui file2 "spaced name" &&
@@ -164,11 +167,11 @@ test_expect_success 'gui mergetool' '
 	yes "d" | git mergetool --gui file11 &&
 	yes "d" | git mergetool --gui file12 &&
 	yes "l" | git mergetool --gui submod &&
-	echo "gui master updated" >expect &&
+	echo "gui main updated" >expect &&
 	test_cmp expect file1 &&
-	echo "gui master new" >expect &&
+	echo "gui main new" >expect &&
 	test_cmp expect file2 &&
-	echo "gui master new sub" >expect &&
+	echo "gui main new sub" >expect &&
 	test_cmp expect subdir/file3 &&
 	echo "branch1 submodule" >expect &&
 	test_cmp expect submod/bar &&
@@ -179,7 +182,7 @@ test_expect_success 'gui mergetool without merge.guitool set falls back to merge
 	test_when_finished "git reset --hard" &&
 	git checkout -b test$test_count branch1 &&
 	git submodule update -N &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	yes "" | git mergetool --gui both &&
 	yes "" | git mergetool -g file1 file1 &&
 	yes "" | git mergetool --gui file2 "spaced name" &&
@@ -187,11 +190,11 @@ test_expect_success 'gui mergetool without merge.guitool set falls back to merge
 	yes "d" | git mergetool --gui file11 &&
 	yes "d" | git mergetool --gui file12 &&
 	yes "l" | git mergetool --gui submod &&
-	echo "master updated" >expect &&
+	echo "main updated" >expect &&
 	test_cmp expect file1 &&
-	echo "master new" >expect &&
+	echo "main new" >expect &&
 	test_cmp expect file2 &&
-	echo "master new sub" >expect &&
+	echo "main new sub" >expect &&
 	test_cmp expect subdir/file3 &&
 	echo "branch1 submodule" >expect &&
 	test_cmp expect submod/bar &&
@@ -206,7 +209,7 @@ test_expect_success 'mergetool crlf' '
 	# test_when_finished is LIFO.)
 	test_config core.autocrlf true &&
 	git checkout -b test$test_count branch1 &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	yes "" | git mergetool file1 &&
 	yes "" | git mergetool file2 &&
 	yes "" | git mergetool "spaced name" &&
@@ -215,11 +218,11 @@ test_expect_success 'mergetool crlf' '
 	yes "d" | git mergetool file11 &&
 	yes "d" | git mergetool file12 &&
 	yes "r" | git mergetool submod &&
-	test "$(printf x | cat file1 -)" = "$(printf "master updated\r\nx")" &&
-	test "$(printf x | cat file2 -)" = "$(printf "master new\r\nx")" &&
-	test "$(printf x | cat subdir/file3 -)" = "$(printf "master new sub\r\nx")" &&
+	test "$(printf x | cat file1 -)" = "$(printf "main updated\r\nx")" &&
+	test "$(printf x | cat file2 -)" = "$(printf "main new\r\nx")" &&
+	test "$(printf x | cat subdir/file3 -)" = "$(printf "main new sub\r\nx")" &&
 	git submodule update -N &&
-	echo "master submodule" >expect &&
+	echo "main submodule" >expect &&
 	test_cmp expect submod/bar &&
 	git commit -m "branch1 resolved with mergetool - autocrlf"
 '
@@ -230,9 +233,9 @@ test_expect_success 'mergetool in subdir' '
 	git submodule update -N &&
 	(
 		cd subdir &&
-		test_must_fail git merge master &&
+		test_must_fail git merge main &&
 		yes "" | git mergetool file3 &&
-		echo "master new sub" >expect &&
+		echo "main new sub" >expect &&
 		test_cmp expect file3
 	)
 '
@@ -243,7 +246,7 @@ test_expect_success 'mergetool on file in parent dir' '
 	git submodule update -N &&
 	(
 		cd subdir &&
-		test_must_fail git merge master &&
+		test_must_fail git merge main &&
 		yes "" | git mergetool file3 &&
 		yes "" | git mergetool ../file1 &&
 		yes "" | git mergetool ../file2 ../spaced\ name &&
@@ -251,9 +254,9 @@ test_expect_success 'mergetool on file in parent dir' '
 		yes "d" | git mergetool ../file11 &&
 		yes "d" | git mergetool ../file12 &&
 		yes "l" | git mergetool ../submod &&
-		echo "master updated" >expect &&
+		echo "main updated" >expect &&
 		test_cmp expect ../file1 &&
-		echo "master new" >expect &&
+		echo "main new" >expect &&
 		test_cmp expect ../file2 &&
 		echo "branch1 submodule" >expect &&
 		test_cmp expect ../submod/bar &&
@@ -265,7 +268,7 @@ test_expect_success 'mergetool skips autoresolved' '
 	test_when_finished "git reset --hard" &&
 	git checkout -b test$test_count branch1 &&
 	git submodule update -N &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	test -n "$(git ls-files -u)" &&
 	yes "d" | git mergetool file11 &&
 	yes "d" | git mergetool file12 &&
@@ -280,17 +283,17 @@ test_expect_success 'mergetool merges all from subdir (rerere disabled)' '
 	test_config rerere.enabled false &&
 	(
 		cd subdir &&
-		test_must_fail git merge master &&
+		test_must_fail git merge main &&
 		yes "r" | git mergetool ../submod &&
 		yes "d" "d" | git mergetool --no-prompt &&
-		echo "master updated" >expect &&
+		echo "main updated" >expect &&
 		test_cmp expect ../file1 &&
-		echo "master new" >expect &&
+		echo "main new" >expect &&
 		test_cmp expect ../file2 &&
-		echo "master new sub" >expect &&
+		echo "main new sub" >expect &&
 		test_cmp expect file3 &&
 		( cd .. && git submodule update -N ) &&
-		echo "master submodule" >expect &&
+		echo "main submodule" >expect &&
 		test_cmp expect ../submod/bar &&
 		git commit -m "branch2 resolved by mergetool from subdir"
 	)
@@ -303,17 +306,17 @@ test_expect_success 'mergetool merges all from subdir (rerere enabled)' '
 	rm -rf .git/rr-cache &&
 	(
 		cd subdir &&
-		test_must_fail git merge master &&
+		test_must_fail git merge main &&
 		yes "r" | git mergetool ../submod &&
 		yes "d" "d" | git mergetool --no-prompt &&
-		echo "master updated" >expect &&
+		echo "main updated" >expect &&
 		test_cmp expect ../file1 &&
-		echo "master new" >expect &&
+		echo "main new" >expect &&
 		test_cmp expect ../file2 &&
-		echo "master new sub" >expect &&
+		echo "main new sub" >expect &&
 		test_cmp expect file3 &&
 		( cd .. && git submodule update -N ) &&
-		echo "master submodule" >expect &&
+		echo "main submodule" >expect &&
 		test_cmp expect ../submod/bar &&
 		git commit -m "branch2 resolved by mergetool from subdir"
 	)
@@ -325,7 +328,7 @@ test_expect_success 'mergetool skips resolved paths when rerere is active' '
 	rm -rf .git/rr-cache &&
 	git checkout -b test$test_count branch1 &&
 	git submodule update -N &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	yes "l" | git mergetool --no-prompt submod &&
 	yes "d" "d" | git mergetool --no-prompt &&
 	git submodule update -N &&
@@ -366,11 +369,11 @@ test_expect_success 'mergetool takes partial path' '
 	test_config rerere.enabled false &&
 	git checkout -b test$test_count branch1 &&
 	git submodule update -N &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 
 	yes "" | git mergetool subdir &&
 
-	echo "master new sub" >expect &&
+	echo "main new sub" >expect &&
 	test_cmp expect subdir/file3
 '
 
@@ -434,7 +437,7 @@ test_expect_success 'deleted vs modified submodule' '
 	git rm --cached submod &&
 	git commit -m "Submodule deleted from branch" &&
 	git checkout -b test$test_count.a test$test_count &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	test -n "$(git ls-files -u)" &&
 	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
 	yes "" | git mergetool both &&
@@ -444,7 +447,7 @@ test_expect_success 'deleted vs modified submodule' '
 	echo "branch1 submodule" >expect &&
 	test_cmp expect submod/bar &&
 	git submodule update -N &&
-	echo "master submodule" >expect &&
+	echo "main submodule" >expect &&
 	test_cmp expect submod/bar &&
 	output="$(git mergetool --no-prompt)" &&
 	test "$output" = "No files need merging" &&
@@ -453,7 +456,7 @@ test_expect_success 'deleted vs modified submodule' '
 	mv submod submod-movedaside &&
 	git checkout -b test$test_count.b test$test_count &&
 	git submodule update -N &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	test -n "$(git ls-files -u)" &&
 	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
 	yes "" | git mergetool both &&
@@ -465,7 +468,7 @@ test_expect_success 'deleted vs modified submodule' '
 	git commit -m "Merge resolved by deleting module" &&
 
 	mv submod-movedaside submod &&
-	git checkout -b test$test_count.c master &&
+	git checkout -b test$test_count.c main &&
 	git submodule update -N &&
 	test_must_fail git merge test$test_count &&
 	test -n "$(git ls-files -u)" &&
@@ -481,7 +484,7 @@ test_expect_success 'deleted vs modified submodule' '
 	git commit -m "Merge resolved by deleting module" &&
 	mv submod.orig submod &&
 
-	git checkout -b test$test_count.d master &&
+	git checkout -b test$test_count.d main &&
 	git submodule update -N &&
 	test_must_fail git merge test$test_count &&
 	test -n "$(git ls-files -u)" &&
@@ -489,10 +492,10 @@ test_expect_success 'deleted vs modified submodule' '
 	yes "" | git mergetool both &&
 	yes "d" | git mergetool file11 file12 &&
 	yes "l" | git mergetool submod &&
-	echo "master submodule" >expect &&
+	echo "main submodule" >expect &&
 	test_cmp expect submod/bar &&
 	git submodule update -N &&
-	echo "master submodule" >expect &&
+	echo "main submodule" >expect &&
 	test_cmp expect submod/bar &&
 	output="$(git mergetool --no-prompt)" &&
 	test "$output" = "No files need merging" &&
@@ -509,7 +512,7 @@ test_expect_success 'file vs modified submodule' '
 	git add submod &&
 	git commit -m "Submodule path becomes file" &&
 	git checkout -b test$test_count.a branch1 &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	test -n "$(git ls-files -u)" &&
 	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
 	yes "" | git mergetool both &&
@@ -519,7 +522,7 @@ test_expect_success 'file vs modified submodule' '
 	echo "branch1 submodule" >expect &&
 	test_cmp expect submod/bar &&
 	git submodule update -N &&
-	echo "master submodule" >expect &&
+	echo "main submodule" >expect &&
 	test_cmp expect submod/bar &&
 	output="$(git mergetool --no-prompt)" &&
 	test "$output" = "No files need merging" &&
@@ -527,12 +530,19 @@ test_expect_success 'file vs modified submodule' '
 
 	mv submod submod-movedaside &&
 	git checkout -b test$test_count.b test$test_count &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	test -n "$(git ls-files -u)" &&
 	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
 	yes "" | git mergetool both &&
 	yes "d" | git mergetool file11 file12 &&
-	yes "l" | git mergetool submod &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		yes "c" | git mergetool submod~HEAD &&
+		git rm submod &&
+		git mv submod~HEAD submod
+	else
+		yes "l" | git mergetool submod
+	fi &&
 	git submodule update -N &&
 	echo "not a submodule" >expect &&
 	test_cmp expect submod &&
@@ -540,7 +550,7 @@ test_expect_success 'file vs modified submodule' '
 	test "$output" = "No files need merging" &&
 	git commit -m "Merge resolved by keeping file" &&
 
-	git checkout -b test$test_count.c master &&
+	git checkout -b test$test_count.c main &&
 	rmdir submod && mv submod-movedaside submod &&
 	test ! -e submod.orig &&
 	git submodule update -N &&
@@ -549,7 +559,15 @@ test_expect_success 'file vs modified submodule' '
 	yes "" | git mergetool file1 file2 spaced\ name subdir/file3 &&
 	yes "" | git mergetool both &&
 	yes "d" | git mergetool file11 file12 &&
-	yes "r" | git mergetool submod &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		mv submod submod.orig &&
+		git rm --cached submod &&
+		yes "c" | git mergetool submod~test19 &&
+		git mv submod~test19 submod
+	else
+		yes "r" | git mergetool submod
+	fi &&
 	test -d submod.orig &&
 	git submodule update -N &&
 	echo "not a submodule" >expect &&
@@ -558,7 +576,7 @@ test_expect_success 'file vs modified submodule' '
 	test "$output" = "No files need merging" &&
 	git commit -m "Merge resolved by keeping file" &&
 
-	git checkout -b test$test_count.d master &&
+	git checkout -b test$test_count.d main &&
 	rmdir submod && mv submod.orig submod &&
 	git submodule update -N &&
 	test_must_fail git merge test$test_count &&
@@ -567,10 +585,14 @@ test_expect_success 'file vs modified submodule' '
 	yes "" | git mergetool both &&
 	yes "d" | git mergetool file11 file12 &&
 	yes "l" | git mergetool submod &&
-	echo "master submodule" >expect &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		yes "d" | git mergetool submod~test19
+	fi &&
+	echo "main submodule" >expect &&
 	test_cmp expect submod/bar &&
 	git submodule update -N &&
-	echo "master submodule" >expect &&
+	echo "main submodule" >expect &&
 	test_cmp expect submod/bar &&
 	output="$(git mergetool --no-prompt)" &&
 	test "$output" = "No files need merging" &&
@@ -653,7 +675,7 @@ test_expect_success 'directory vs modified submodule' '
 	git add submod/file16 &&
 	git commit -m "Submodule path becomes directory" &&
 
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	test -n "$(git ls-files -u)" &&
 	yes "l" | git mergetool submod &&
 	echo "not a submodule" >expect &&
@@ -661,10 +683,17 @@ test_expect_success 'directory vs modified submodule' '
 	rm -rf submod.orig &&
 
 	git reset --hard &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	test -n "$(git ls-files -u)" &&
 	test ! -e submod.orig &&
-	yes "r" | git mergetool submod &&
+	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
+	then
+		yes "r" | git mergetool submod~main &&
+		git mv submod submod.orig &&
+		git mv submod~main submod
+	else
+		yes "r" | git mergetool submod
+	fi &&
 	test -d submod.orig &&
 	echo "not a submodule" >expect &&
 	test_cmp expect submod.orig/file16 &&
@@ -672,18 +701,18 @@ test_expect_success 'directory vs modified submodule' '
 	mv submod-movedaside/.git submod &&
 	( cd submod && git clean -f && git reset --hard ) &&
 	git submodule update -N &&
-	echo "master submodule" >expect &&
+	echo "main submodule" >expect &&
 	test_cmp expect submod/bar &&
 	git reset --hard &&
 	rm -rf submod-movedaside &&
 
-	git checkout -b test$test_count.c master &&
+	git checkout -b test$test_count.c main &&
 	git submodule update -N &&
 	test_must_fail git merge test$test_count &&
 	test -n "$(git ls-files -u)" &&
 	yes "l" | git mergetool submod &&
 	git submodule update -N &&
-	echo "master submodule" >expect &&
+	echo "main submodule" >expect &&
 	test_cmp expect submod/bar &&
 
 	git reset --hard &&
@@ -695,7 +724,7 @@ test_expect_success 'directory vs modified submodule' '
 	echo "not a submodule" >expect &&
 	test_cmp expect submod/file16 &&
 
-	git reset --hard master &&
+	git reset --hard main &&
 	( cd submod && git clean -f && git reset --hard ) &&
 	git submodule update -N
 '
@@ -703,7 +732,7 @@ test_expect_success 'directory vs modified submodule' '
 test_expect_success 'file with no base' '
 	test_when_finished "git reset --hard" &&
 	git checkout -b test$test_count branch1 &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	git mergetool --no-prompt --tool mybase -- both &&
 	test_must_be_empty both
 '
@@ -713,9 +742,9 @@ test_expect_success 'custom commands override built-ins' '
 	git checkout -b test$test_count branch1 &&
 	test_config mergetool.defaults.cmd "cat \"\$REMOTE\" >\"\$MERGED\"" &&
 	test_config mergetool.defaults.trustExitCode true &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	git mergetool --no-prompt --tool defaults -- both &&
-	echo master both added >expected &&
+	echo main both added >expected &&
 	test_cmp expected both
 '
 
@@ -725,7 +754,7 @@ test_expect_success 'filenames seen by tools start with ./' '
 	test_config mergetool.writeToTemp false &&
 	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
 	test_config mergetool.myecho.trustExitCode true &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	git mergetool --no-prompt --tool myecho -- both >actual &&
 	grep ^\./both_LOCAL_ actual
 '
@@ -742,7 +771,7 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT
 	test_config mergetool.writeToTemp true &&
 	test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
 	test_config mergetool.myecho.trustExitCode true &&
-	test_must_fail git merge master &&
+	test_must_fail git merge main &&
 	git mergetool --no-prompt --tool myecho -- both >actual &&
 	! grep ^\./both_LOCAL_ actual &&
 	grep /both_LOCAL_ actual
@@ -802,4 +831,33 @@ test_expect_success 'mergetool -Oorder-file is honored' '
 	test_cmp expect actual
 '
 
+test_expect_success 'mergetool --tool-help shows recognized tools' '
+	# Check a few known tools are correctly shown
+	git mergetool --tool-help >mergetools &&
+	grep vimdiff mergetools &&
+	grep vimdiff3 mergetools &&
+	grep gvimdiff2 mergetools &&
+	grep araxis mergetools &&
+	grep xxdiff mergetools &&
+	grep meld mergetools
+'
+
+test_expect_success 'mergetool hideResolved' '
+	test_config mergetool.hideResolved true &&
+	test_when_finished "git reset --hard" &&
+	git checkout -b test${test_count}_b main &&
+	test_write_lines >file1 base "" a &&
+	git commit -a -m "base" &&
+	test_write_lines >file1 base "" c &&
+	git commit -a -m "remote update" &&
+	git checkout -b test${test_count}_a HEAD~ &&
+	test_write_lines >file1 local "" b &&
+	git commit -a -m "local update" &&
+	test_must_fail git merge test${test_count}_b &&
+	yes "" | git mergetool file1 &&
+	test_write_lines >expect local "" c &&
+	test_cmp expect file1 &&
+	git commit -m "test resolved with mergetool"
+'
+
 test_done
diff --git a/t/t7611-merge-abort.sh b/t/t7611-merge-abort.sh
index 7c84a518aa..c0e9425115 100755
--- a/t/t7611-merge-abort.sh
+++ b/t/t7611-merge-abort.sh
@@ -7,7 +7,7 @@ Set up repo with conflicting and non-conflicting branches:
 There are three files foo/bar/baz, and the following graph illustrates the
 content of these files in each commit:
 
-# foo/bar/baz --- foo/bar/bazz     <-- master
+# foo/bar/baz --- foo/bar/bazz     <-- main
 #             \
 #              --- foo/barf/bazf   <-- conflict_branch
 #               \
@@ -22,6 +22,9 @@ Next, test git merge --abort with the following variables:
 - changed/unchanged worktree after merge
 - changed/unchanged index after merge
 '
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -40,7 +43,7 @@ test_expect_success 'setup' '
 	git checkout -b clean_branch HEAD^ &&
 	echo bart > bar &&
 	git commit -a -m "clean" &&
-	git checkout master
+	git checkout main
 '
 
 pre_merge_head="$(git rev-parse HEAD)"
diff --git a/t/t7612-merge-verify-signatures.sh b/t/t7612-merge-verify-signatures.sh
index d99218a725..61330f71b1 100755
--- a/t/t7612-merge-verify-signatures.sh
+++ b/t/t7612-merge-verify-signatures.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='merge signature verification tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 . "$TEST_DIRECTORY/lib-gpg.sh"
 
@@ -31,7 +34,7 @@ test_expect_success GPG 'create signed commits' '
 	echo 3 >baz && git add baz &&
 	test_tick && git commit -SB7227189 -m "untrusted on side" &&
 
-	git checkout master
+	git checkout main
 '
 
 test_expect_success GPG 'merge unsigned commit with verification' '
@@ -66,6 +69,20 @@ test_expect_success GPG 'merge commit with untrusted signature with verification
 	test_i18ngrep "has an untrusted GPG signature" mergeerror
 '
 
+test_expect_success GPG 'merge commit with untrusted signature with verification and high minTrustLevel' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config gpg.minTrustLevel marginal &&
+	test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
+	test_i18ngrep "has an untrusted GPG signature" mergeerror
+'
+
+test_expect_success GPG 'merge commit with untrusted signature with verification and low minTrustLevel' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config gpg.minTrustLevel undefined &&
+	git merge --ff-only --verify-signatures side-untrusted >mergeoutput &&
+	test_i18ngrep "has a good GPG signature" mergeoutput
+'
+
 test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true' '
 	test_when_finished "git reset --hard && git checkout initial" &&
 	test_config merge.verifySignatures true &&
@@ -73,6 +90,14 @@ test_expect_success GPG 'merge commit with untrusted signature with merge.verify
 	test_i18ngrep "has an untrusted GPG signature" mergeerror
 '
 
+test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true and minTrustLevel' '
+	test_when_finished "git reset --hard && git checkout initial" &&
+	test_config merge.verifySignatures true &&
+	test_config gpg.minTrustLevel marginal &&
+	test_must_fail git merge --ff-only side-untrusted 2>mergeerror &&
+	test_i18ngrep "has an untrusted GPG signature" mergeerror
+'
+
 test_expect_success GPG 'merge signed commit with verification' '
 	test_when_finished "git reset --hard && git checkout initial" &&
 	git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput &&
diff --git a/t/t7613-merge-submodule.sh b/t/t7613-merge-submodule.sh
deleted file mode 100755
index d1e9fcc781..0000000000
--- a/t/t7613-merge-submodule.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-test_description='merge can handle submodules'
-
-. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-submodule-update.sh
-
-# merges without conflicts
-test_submodule_switch "git merge"
-
-test_submodule_switch "git merge --ff"
-
-test_submodule_switch "git merge --ff-only"
-
-KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
-KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
-test_submodule_switch "git merge --no-ff"
-
-test_done
diff --git a/t/t7614-merge-signoff.sh b/t/t7614-merge-signoff.sh
index c1b8446f49..fee258d4f0 100755
--- a/t/t7614-merge-signoff.sh
+++ b/t/t7614-merge-signoff.sh
@@ -5,23 +5,26 @@ test_description='git merge --signoff
 This test runs git merge --signoff and makes sure that it works.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # Setup test files
 test_setup() {
 	# Expected commit message after merge --signoff
 	cat >expected-signed <<EOF &&
-Merge branch 'master' into other-branch
+Merge branch 'main' into other-branch
 
 Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/")
 EOF
 
 	# Expected commit message after merge without --signoff (or with --no-signoff)
 	cat >expected-unsigned <<EOF &&
-Merge branch 'master' into other-branch
+Merge branch 'main' into other-branch
 EOF
 
-	# Initial commit and feature branch to merge master into it.
+	# Initial commit and feature branch to merge main into it.
 	git commit --allow-empty -m "Initial empty commit" &&
 	git checkout -b other-branch &&
 	test_commit other-branch file1 1
@@ -38,30 +41,30 @@ test_expect_success 'setup' '
 
 # Test with --signoff flag
 test_expect_success 'git merge --signoff adds a sign-off line' '
-	git checkout master &&
-	test_commit master-branch-2 file2 2 &&
+	git checkout main &&
+	test_commit main-branch-2 file2 2 &&
 	git checkout other-branch &&
-	git merge master --signoff --no-edit &&
+	git merge main --signoff --no-edit &&
 	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
 	test_cmp expected-signed actual
 '
 
 # Test without --signoff flag
 test_expect_success 'git merge does not add a sign-off line' '
-	git checkout master &&
-	test_commit master-branch-3 file3 3 &&
+	git checkout main &&
+	test_commit main-branch-3 file3 3 &&
 	git checkout other-branch &&
-	git merge master --no-edit &&
+	git merge main --no-edit &&
 	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
 	test_cmp expected-unsigned actual
 '
 
 # Test for --no-signoff flag
 test_expect_success 'git merge --no-signoff flag cancels --signoff flag' '
-	git checkout master &&
-	test_commit master-branch-4 file4 4 &&
+	git checkout main &&
+	test_commit main-branch-4 file4 4 &&
 	git checkout other-branch &&
-	git merge master --no-edit --signoff --no-signoff &&
+	git merge main --no-edit --signoff --no-signoff &&
 	git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
 	test_cmp expected-unsigned actual
 '
diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
index 4e855bc21b..25b235c063 100755
--- a/t/t7700-repack.sh
+++ b/t/t7700-repack.sh
@@ -4,129 +4,104 @@ test_description='git repack works correctly'
 
 . ./test-lib.sh
 
-commit_and_pack() {
-	test_commit "$@" >/dev/null &&
-	SHA1=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) &&
-	echo pack-${SHA1}.pack
+commit_and_pack () {
+	test_commit "$@" 1>&2 &&
+	incrpackid=$(git pack-objects --all --unpacked --incremental .git/objects/pack/pack </dev/null) &&
+	echo pack-${incrpackid}.pack
+}
+
+test_no_missing_in_packs () {
+	myidx=$(ls -1 .git/objects/pack/*.idx) &&
+	test_path_is_file "$myidx" &&
+	git verify-pack -v alt_objects/pack/*.idx >orig.raw &&
+	sed -n -e "s/^\($OID_REGEX\).*/\1/p" orig.raw | sort >orig &&
+	git verify-pack -v $myidx >dest.raw &&
+	cut -d" " -f1 dest.raw | sort >dest &&
+	comm -23 orig dest >missing &&
+	test_must_be_empty missing
+}
+
+# we expect $packid and $oid to be defined
+test_has_duplicate_object () {
+	want_duplicate_object="$1"
+	found_duplicate_object=false
+	for p in .git/objects/pack/*.idx
+	do
+		idx=$(basename $p)
+		test "pack-$packid.idx" = "$idx" && continue
+		git verify-pack -v $p >packlist || return $?
+		if grep "^$oid" packlist
+		then
+			found_duplicate_object=true
+			echo "DUPLICATE OBJECT FOUND"
+			break
+		fi
+	done &&
+	test "$want_duplicate_object" = "$found_duplicate_object"
 }
 
 test_expect_success 'objects in packs marked .keep are not repacked' '
-	echo content1 > file1 &&
-	echo content2 > file2 &&
+	echo content1 >file1 &&
+	echo content2 >file2 &&
 	git add . &&
 	test_tick &&
 	git commit -m initial_commit &&
 	# Create two packs
 	# The first pack will contain all of the objects except one
-	git rev-list --objects --all | grep -v file2 |
-		git pack-objects pack > /dev/null &&
+	git rev-list --objects --all >objs &&
+	grep -v file2 objs | git pack-objects pack &&
 	# The second pack will contain the excluded object
-	packsha1=$(git rev-list --objects --all | grep file2 |
-		git pack-objects pack) &&
-	>pack-$packsha1.keep &&
-	objsha1=$(git verify-pack -v pack-$packsha1.idx | head -n 1 |
-		sed -e "s/^\([0-9a-f]\{40\}\).*/\1/") &&
+	packid=$(grep file2 objs | git pack-objects pack) &&
+	>pack-$packid.keep &&
+	git verify-pack -v pack-$packid.idx >packlist &&
+	oid=$(head -n 1 packlist | sed -e "s/^\($OID_REGEX\).*/\1/") &&
 	mv pack-* .git/objects/pack/ &&
 	git repack -A -d -l &&
 	git prune-packed &&
-	for p in .git/objects/pack/*.idx; do
-		idx=$(basename $p)
-		test "pack-$packsha1.idx" = "$idx" && continue
-		if git verify-pack -v $p | egrep "^$objsha1"; then
-			found_duplicate_object=1
-			echo "DUPLICATE OBJECT FOUND"
-			break
-		fi
-	done &&
-	test -z "$found_duplicate_object"
+	test_has_duplicate_object false
 '
 
 test_expect_success 'writing bitmaps via command-line can duplicate .keep objects' '
-	# build on $objsha1, $packsha1, and .keep state from previous
+	# build on $oid, $packid, and .keep state from previous
 	git repack -Adbl &&
-	test_when_finished "found_duplicate_object=" &&
-	for p in .git/objects/pack/*.idx; do
-		idx=$(basename $p)
-		test "pack-$packsha1.idx" = "$idx" && continue
-		if git verify-pack -v $p | egrep "^$objsha1"; then
-			found_duplicate_object=1
-			echo "DUPLICATE OBJECT FOUND"
-			break
-		fi
-	done &&
-	test "$found_duplicate_object" = 1
+	test_has_duplicate_object true
 '
 
 test_expect_success 'writing bitmaps via config can duplicate .keep objects' '
-	# build on $objsha1, $packsha1, and .keep state from previous
+	# build on $oid, $packid, and .keep state from previous
 	git -c repack.writebitmaps=true repack -Adl &&
-	test_when_finished "found_duplicate_object=" &&
-	for p in .git/objects/pack/*.idx; do
-		idx=$(basename $p)
-		test "pack-$packsha1.idx" = "$idx" && continue
-		if git verify-pack -v $p | egrep "^$objsha1"; then
-			found_duplicate_object=1
-			echo "DUPLICATE OBJECT FOUND"
-			break
-		fi
-	done &&
-	test "$found_duplicate_object" = 1
+	test_has_duplicate_object true
 '
 
 test_expect_success 'loose objects in alternate ODB are not repacked' '
 	mkdir alt_objects &&
-	echo $(pwd)/alt_objects > .git/objects/info/alternates &&
-	echo content3 > file3 &&
-	objsha1=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
+	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
+	echo content3 >file3 &&
+	oid=$(GIT_OBJECT_DIRECTORY=alt_objects git hash-object -w file3) &&
 	git add file3 &&
 	test_tick &&
 	git commit -m commit_file3 &&
 	git repack -a -d -l &&
 	git prune-packed &&
-	for p in .git/objects/pack/*.idx; do
-		if git verify-pack -v $p | egrep "^$objsha1"; then
-			found_duplicate_object=1
-			echo "DUPLICATE OBJECT FOUND"
-			break
-		fi
-	done &&
-	test -z "$found_duplicate_object"
+	test_has_duplicate_object false
 '
 
 test_expect_success 'packed obs in alt ODB are repacked even when local repo is packless' '
 	mkdir alt_objects/pack &&
 	mv .git/objects/pack/* alt_objects/pack &&
 	git repack -a &&
-	myidx=$(ls -1 .git/objects/pack/*.idx) &&
-	test -f "$myidx" &&
-	for p in alt_objects/pack/*.idx; do
-		git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
-	done | while read sha1 rest; do
-		if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
-			echo "Missing object in local pack: $sha1"
-			return 1
-		fi
-	done
+	test_no_missing_in_packs
 '
 
 test_expect_success 'packed obs in alt ODB are repacked when local repo has packs' '
 	rm -f .git/objects/pack/* &&
-	echo new_content >> file1 &&
+	echo new_content >>file1 &&
 	git add file1 &&
 	test_tick &&
 	git commit -m more_content &&
 	git repack &&
 	git repack -a -d &&
-	myidx=$(ls -1 .git/objects/pack/*.idx) &&
-	test -f "$myidx" &&
-	for p in alt_objects/pack/*.idx; do
-		git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
-	done | while read sha1 rest; do
-		if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
-			echo "Missing object in local pack: $sha1"
-			return 1
-		fi
-	done
+	test_no_missing_in_packs
 '
 
 test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
@@ -134,7 +109,7 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
 	for p in alt_objects/pack/*.pack
 	do
 		base_name=$(basename $p .pack) &&
-		if test -f alt_objects/pack/$base_name.keep
+		if test_path_is_file alt_objects/pack/$base_name.keep
 		then
 			rm alt_objects/pack/$base_name.keep
 		else
@@ -142,22 +117,13 @@ test_expect_success 'packed obs in alternate ODB kept pack are repacked' '
 		fi
 	done &&
 	git repack -a -d &&
-	myidx=$(ls -1 .git/objects/pack/*.idx) &&
-	test -f "$myidx" &&
-	for p in alt_objects/pack/*.idx; do
-		git verify-pack -v $p | sed -n -e "/^[0-9a-f]\{40\}/p"
-	done | while read sha1 rest; do
-		if ! ( git verify-pack -v $myidx | grep "^$sha1" ); then
-			echo "Missing object in local pack: $sha1"
-			return 1
-		fi
-	done
+	test_no_missing_in_packs
 '
 
 test_expect_success 'packed unreachable obs in alternate ODB are not loosened' '
 	rm -f alt_objects/pack/*.keep &&
 	mv .git/objects/pack/* alt_objects/pack/ &&
-	csha1=$(git rev-parse HEAD^{commit}) &&
+	coid=$(git rev-parse HEAD^{commit}) &&
 	git reset --hard HEAD^ &&
 	test_tick &&
 	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
@@ -167,15 +133,15 @@ test_expect_success 'packed unreachable obs in alternate ODB are not loosened' '
 	    --unpack-unreachable </dev/null pack &&
 	rm -f .git/objects/pack/* &&
 	mv pack-* .git/objects/pack/ &&
-	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		egrep "^$csha1 " | sort | uniq | wc -l) &&
-	echo > .git/objects/info/alternates &&
-	test_must_fail git show $csha1
+	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
+	! grep "^$coid " packlist &&
+	echo >.git/objects/info/alternates &&
+	test_must_fail git show $coid
 '
 
 test_expect_success 'local packed unreachable obs that exist in alternate ODB are not loosened' '
-	echo $(pwd)/alt_objects > .git/objects/info/alternates &&
-	echo "$csha1" | git pack-objects --non-empty --all --reflog pack &&
+	echo $(pwd)/alt_objects >.git/objects/info/alternates &&
+	echo "$coid" | git pack-objects --non-empty --all --reflog pack &&
 	rm -f .git/objects/pack/* &&
 	mv pack-* .git/objects/pack/ &&
 	# The pack-objects call on the next line is equivalent to
@@ -184,10 +150,10 @@ test_expect_success 'local packed unreachable obs that exist in alternate ODB ar
 	    --unpack-unreachable </dev/null pack &&
 	rm -f .git/objects/pack/* &&
 	mv pack-* .git/objects/pack/ &&
-	test 0 = $(git verify-pack -v -- .git/objects/pack/*.idx |
-		egrep "^$csha1 " | sort | uniq | wc -l) &&
-	echo > .git/objects/info/alternates &&
-	test_must_fail git show $csha1
+	git verify-pack -v -- .git/objects/pack/*.idx >packlist &&
+	! grep "^$coid " &&
+	echo >.git/objects/info/alternates &&
+	test_must_fail git show $coid
 '
 
 test_expect_success 'objects made unreachable by grafts only are kept' '
@@ -196,7 +162,7 @@ test_expect_success 'objects made unreachable by grafts only are kept' '
 	H0=$(git rev-parse HEAD) &&
 	H1=$(git rev-parse HEAD^) &&
 	H2=$(git rev-parse HEAD^^) &&
-	echo "$H0 $H2" > .git/info/grafts &&
+	echo "$H0 $H2" >.git/info/grafts &&
 	git reflog expire --expire=$test_tick --expire-unreachable=$test_tick --all &&
 	git repack -a -d &&
 	git cat-file -t $H1
@@ -235,7 +201,7 @@ 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 &&
-	bitmap=$(ls bare.git/objects/pack/*.bitmap 2>/dev/null || :) &&
+	bitmap=$(ls bare.git/objects/pack/*.bitmap || :) &&
 	test -z "$bitmap"
 '
 
diff --git a/t/t7701-repack-unpack-unreachable.sh b/t/t7701-repack-unpack-unreachable.sh
index 48261ba080..937f89ee8c 100755
--- a/t/t7701-repack-unpack-unreachable.sh
+++ b/t/t7701-repack-unpack-unreachable.sh
@@ -2,6 +2,9 @@
 
 test_description='git repack works correctly'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 fsha1=
@@ -22,7 +25,7 @@ test_expect_success '-A with -d option leaves unreachable objects unpacked' '
 	git commit -a -m more_content &&
 	csha1=$(git rev-parse HEAD^{commit}) &&
 	tsha1=$(git rev-parse HEAD^{tree}) &&
-	git checkout master &&
+	git checkout main &&
 	echo even more content >> file1 &&
 	test_tick &&
 	git commit -a -m even_more_content &&
diff --git a/t/t7703-repack-geometric.sh b/t/t7703-repack-geometric.sh
new file mode 100755
index 0000000000..5ccaa440e0
--- /dev/null
+++ b/t/t7703-repack-geometric.sh
@@ -0,0 +1,183 @@
+#!/bin/sh
+
+test_description='git repack --geometric works correctly'
+
+. ./test-lib.sh
+
+GIT_TEST_MULTI_PACK_INDEX=0
+
+objdir=.git/objects
+midx=$objdir/pack/multi-pack-index
+
+test_expect_success '--geometric with no packs' '
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
+
+		git repack --geometric 2 >out &&
+		test_i18ngrep "Nothing new to pack" out
+	)
+'
+
+test_expect_success '--geometric with one pack' '
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
+
+		test_commit "base" &&
+		git repack -d &&
+
+		git repack --geometric 2 >out &&
+
+		test_i18ngrep "Nothing new to pack" out
+	)
+'
+
+test_expect_success '--geometric with an intact progression' '
+	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
+		test_commit_bulk --start=4 4 && # 12 objects
+
+		find $objdir/pack -name "*.pack" | sort >expect &&
+		git repack --geometric 2 -d &&
+		find $objdir/pack -name "*.pack" | sort >actual &&
+
+		test_cmp expect actual
+	)
+'
+
+test_expect_success '--geometric with loose objects' '
+	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
+		# The loose objects are packed together, breaking the
+		# progression.
+		test_commit loose && # 3 objects
+
+		find $objdir/pack -name "*.pack" | sort >before &&
+		git repack --geometric 2 -d &&
+		find $objdir/pack -name "*.pack" | sort >after &&
+
+		comm -13 before after >new &&
+		comm -23 before after >removed &&
+
+		test_line_count = 1 new &&
+		test_must_be_empty removed &&
+
+		git repack --geometric 2 -d &&
+		find $objdir/pack -name "*.pack" | sort >after &&
+
+		# The progression (3, 3, 6) is combined into one new pack.
+		test_line_count = 1 after
+	)
+'
+
+test_expect_success '--geometric with small-pack rollup' '
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
+
+		test_commit_bulk --start=1 1 && # 3 objects
+		test_commit_bulk --start=2 1 && # 3 objects
+		find $objdir/pack -name "*.pack" | sort >small &&
+		test_commit_bulk --start=3 4 && # 12 objects
+		test_commit_bulk --start=7 8 && # 24 objects
+		find $objdir/pack -name "*.pack" | sort >before &&
+
+		git repack --geometric 2 -d &&
+
+		# Three packs in total; two of the existing large ones, and one
+		# new one.
+		find $objdir/pack -name "*.pack" | sort >after &&
+		test_line_count = 3 after &&
+		comm -3 small before | tr -d "\t" >large &&
+		grep -qFf large after
+	)
+'
+
+test_expect_success '--geometric with small- and large-pack rollup' '
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
+
+		# size(small1) + size(small2) > size(medium) / 2
+		test_commit_bulk --start=1 1 && # 3 objects
+		test_commit_bulk --start=2 1 && # 3 objects
+		test_commit_bulk --start=2 3 && # 7 objects
+		test_commit_bulk --start=6 9 && # 27 objects &&
+
+		find $objdir/pack -name "*.pack" | sort >before &&
+
+		git repack --geometric 2 -d &&
+
+		find $objdir/pack -name "*.pack" | sort >after &&
+		comm -12 before after >untouched &&
+
+		# Two packs in total; the largest pack from before running "git
+		# repack", and one new one.
+		test_line_count = 1 untouched &&
+		test_line_count = 2 after
+	)
+'
+
+test_expect_success '--geometric ignores kept packs' '
+	git init geometric &&
+	test_when_finished "rm -fr geometric" &&
+	(
+		cd geometric &&
+
+		test_commit kept && # 3 objects
+		test_commit pack && # 3 objects
+
+		KEPT=$(git pack-objects --revs $objdir/pack/pack <<-EOF
+		refs/tags/kept
+		EOF
+		) &&
+		PACK=$(git pack-objects --revs $objdir/pack/pack <<-EOF
+		refs/tags/pack
+		^refs/tags/kept
+		EOF
+		) &&
+
+		# neither pack contains more than twice the number of objects in
+		# the other, so they should be combined. but, marking one as
+		# .kept on disk will "freeze" it, so the pack structure should
+		# remain unchanged.
+		touch $objdir/pack/pack-$KEPT.keep &&
+
+		find $objdir/pack -name "*.pack" | sort >before &&
+		git repack --geometric 2 -d &&
+		find $objdir/pack -name "*.pack" | sort >after &&
+
+		# both packs should still exist
+		test_path_is_file $objdir/pack/pack-$KEPT.pack &&
+		test_path_is_file $objdir/pack/pack-$PACK.pack &&
+
+		# and no new packs should be created
+		test_cmp before after &&
+
+		# Passing --pack-kept-objects causes packs with a .keep file to
+		# be repacked, too.
+		git repack --geometric 2 -d --pack-kept-objects &&
+
+		find $objdir/pack -name "*.pack" >after &&
+		test_line_count = 1 after
+	)
+'
+
+test_done
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh
index 6bac9ed180..a173f564bc 100755
--- a/t/t7800-difftool.sh
+++ b/t/t7800-difftool.sh
@@ -8,6 +8,9 @@ test_description='git-difftool
 Testing basic diff tool invocation
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 difftool_test_setup ()
@@ -35,23 +38,23 @@ test_expect_success 'basic usage requires no repo' '
 	test_i18ngrep ^usage: output
 '
 
-# Create a file on master and change it on branch
+# Create a file on main and change it on branch
 test_expect_success 'setup' '
-	echo master >file &&
+	echo main >file &&
 	git add file &&
 	git commit -m "added file" &&
 
-	git checkout -b branch master &&
+	git checkout -b branch main &&
 	echo branch >file &&
 	git commit -a -m "branch changed file" &&
-	git checkout master
+	git checkout main
 '
 
 # Configure a custom difftool.<tool>.cmd and use it
 test_expect_success 'custom commands' '
 	difftool_test_setup &&
 	test_config difftool.test-tool.cmd "cat \"\$REMOTE\"" &&
-	echo master >expect &&
+	echo main >expect &&
 	git difftool --no-prompt branch >actual &&
 	test_cmp expect actual &&
 
@@ -63,7 +66,7 @@ test_expect_success 'custom commands' '
 
 test_expect_success 'custom tool commands override built-ins' '
 	test_config difftool.vimdiff.cmd "cat \"\$REMOTE\"" &&
-	echo master >expect &&
+	echo main >expect &&
 	git difftool --tool vimdiff --no-prompt branch >actual &&
 	test_cmp expect actual
 '
@@ -125,15 +128,14 @@ test_expect_success 'difftool stops on error with --trust-exit-code' '
 	test_when_finished "rm -f for-diff .git/fail-right-file" &&
 	test_when_finished "git reset -- for-diff" &&
 	write_script .git/fail-right-file <<-\EOF &&
-	echo "$2"
+	echo failed
 	exit 1
 	EOF
 	>for-diff &&
 	git add for-diff &&
-	echo file >expect &&
 	test_must_fail git difftool -y --trust-exit-code \
 		--extcmd .git/fail-right-file branch >actual &&
-	test_cmp expect actual
+	test_line_count = 1 actual
 '
 
 test_expect_success 'difftool honors exit status if command not found' '
@@ -312,21 +314,21 @@ test_expect_success 'difftool.<tool>.path' '
 
 test_expect_success 'difftool --extcmd=cat' '
 	echo branch >expect &&
-	echo master >>expect &&
+	echo main >>expect &&
 	git difftool --no-prompt --extcmd=cat branch >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'difftool --extcmd cat' '
 	echo branch >expect &&
-	echo master >>expect &&
+	echo main >>expect &&
 	git difftool --no-prompt --extcmd=cat branch >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'difftool -x cat' '
 	echo branch >expect &&
-	echo master >>expect &&
+	echo main >>expect &&
 	git difftool --no-prompt -x cat branch >actual &&
 	test_cmp expect actual
 '
@@ -339,7 +341,7 @@ test_expect_success 'difftool --extcmd echo arg1' '
 '
 
 test_expect_success 'difftool --extcmd cat arg1' '
-	echo master >expect &&
+	echo main >expect &&
 	git difftool --no-prompt \
 		--extcmd sh\ -c\ \"cat\ \$1\" branch >actual &&
 	test_cmp expect actual
@@ -352,7 +354,7 @@ test_expect_success 'difftool --extcmd cat arg2' '
 	test_cmp expect actual
 '
 
-# Create a second file on master and a different version on branch
+# Create a second file on main and a different version on branch
 test_expect_success 'setup with 2 files different' '
 	echo m2 >file2 &&
 	git add file2 &&
@@ -362,7 +364,7 @@ test_expect_success 'setup with 2 files different' '
 	echo br2 >file2 &&
 	git add file2 &&
 	git commit -a -m "branch changed file2" &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'say no to the first file' '
@@ -370,14 +372,14 @@ test_expect_success 'say no to the first file' '
 	git difftool -x cat branch <input >output &&
 	grep m2 output &&
 	grep br2 output &&
-	! grep master output &&
+	! grep main output &&
 	! grep branch output
 '
 
 test_expect_success 'say no to the second file' '
 	(echo && echo n) >input &&
 	git difftool -x cat branch <input >output &&
-	grep master output &&
+	grep main output &&
 	grep branch output &&
 	! grep m2 output &&
 	! grep br2 output
@@ -385,7 +387,7 @@ test_expect_success 'say no to the second file' '
 
 test_expect_success 'ending prompt input with EOF' '
 	git difftool -x cat branch </dev/null >output &&
-	! grep master output &&
+	! grep main output &&
 	! grep branch output &&
 	! grep m2 output &&
 	! grep br2 output
@@ -397,9 +399,9 @@ test_expect_success 'difftool --tool-help' '
 '
 
 test_expect_success 'setup change in subdirectory' '
-	git checkout master &&
+	git checkout main &&
 	mkdir sub &&
-	echo master >sub/sub &&
+	echo main >sub/sub &&
 	git add sub/sub &&
 	git commit -m "added sub/sub" &&
 	git tag v1 &&
@@ -441,20 +443,20 @@ run_dir_diff_test () {
 
 run_dir_diff_test 'difftool -d' '
 	git difftool -d $symlinks --extcmd ls branch >output &&
-	grep sub output &&
-	grep file output
+	grep "^sub$" output &&
+	grep "^file$" output
 '
 
 run_dir_diff_test 'difftool --dir-diff' '
 	git difftool --dir-diff $symlinks --extcmd ls branch >output &&
-	grep sub output &&
-	grep file output
+	grep "^sub$" output &&
+	grep "^file$" output
 '
 
 run_dir_diff_test 'difftool --dir-diff ignores --prompt' '
 	git difftool --dir-diff $symlinks --prompt --extcmd ls branch >output &&
-	grep sub output &&
-	grep file output
+	grep "^sub$" output &&
+	grep "^file$" output
 '
 
 run_dir_diff_test 'difftool --dir-diff branch from subdirectory' '
@@ -463,11 +465,11 @@ run_dir_diff_test 'difftool --dir-diff branch from subdirectory' '
 		git difftool --dir-diff $symlinks --extcmd ls branch >output &&
 		# "sub" must only exist in "right"
 		# "file" and "file2" must be listed in both "left" and "right"
-		grep sub output >sub-output &&
+		grep "^sub$" output >sub-output &&
 		test_line_count = 1 sub-output &&
-		grep file"$" output >file-output &&
+		grep "^file$" output >file-output &&
 		test_line_count = 2 file-output &&
-		grep file2 output >file2-output &&
+		grep "^file2$" output >file2-output &&
 		test_line_count = 2 file2-output
 	)
 '
@@ -478,11 +480,11 @@ run_dir_diff_test 'difftool --dir-diff v1 from subdirectory' '
 		git difftool --dir-diff $symlinks --extcmd ls v1 >output &&
 		# "sub" and "file" exist in both v1 and HEAD.
 		# "file2" is unchanged.
-		grep sub output >sub-output &&
+		grep "^sub$" output >sub-output &&
 		test_line_count = 2 sub-output &&
-		grep file output >file-output &&
+		grep "^file$" output >file-output &&
 		test_line_count = 2 file-output &&
-		! grep file2 output
+		! grep "^file2$" output
 	)
 '
 
@@ -492,9 +494,9 @@ run_dir_diff_test 'difftool --dir-diff branch from subdirectory w/ pathspec' '
 		git difftool --dir-diff $symlinks --extcmd ls branch -- .>output &&
 		# "sub" only exists in "right"
 		# "file" and "file2" must not be listed
-		grep sub output >sub-output &&
+		grep "^sub$" output >sub-output &&
 		test_line_count = 1 sub-output &&
-		! grep file output
+		! grep "^file$" output
 	)
 '
 
@@ -504,9 +506,9 @@ run_dir_diff_test 'difftool --dir-diff v1 from subdirectory w/ pathspec' '
 		git difftool --dir-diff $symlinks --extcmd ls v1 -- .>output &&
 		# "sub" exists in v1 and HEAD
 		# "file" is filtered out by the pathspec
-		grep sub output >sub-output &&
+		grep "^sub$" output >sub-output &&
 		test_line_count = 2 sub-output &&
-		! grep file output
+		! grep "^file$" output
 	)
 '
 
@@ -519,16 +521,16 @@ run_dir_diff_test 'difftool --dir-diff from subdirectory with GIT_DIR set' '
 		cd sub &&
 		git difftool --dir-diff $symlinks --extcmd ls \
 			branch -- sub >output &&
-		grep sub output &&
-		! grep file output
+		grep "^sub$" output &&
+		! grep "^file$" output
 	)
 '
 
 run_dir_diff_test 'difftool --dir-diff when worktree file is missing' '
 	test_when_finished git reset --hard &&
 	rm file2 &&
-	git difftool --dir-diff $symlinks --extcmd ls branch master >output &&
-	grep file2 output
+	git difftool --dir-diff $symlinks --extcmd ls branch main >output &&
+	grep "^file2$" output
 '
 
 run_dir_diff_test 'difftool --dir-diff with unmerged files' '
@@ -544,7 +546,7 @@ run_dir_diff_test 'difftool --dir-diff with unmerged files' '
 	echo b >>file &&
 	git add file &&
 	git commit -m conflict-b &&
-	git checkout master &&
+	git checkout main &&
 	git merge conflict-a &&
 	test_must_fail git merge conflict-b &&
 	cat >expect <<-EOF &&
@@ -721,6 +723,27 @@ test_expect_success SYMLINKS 'difftool --dir-diff handles modified symlinks' '
 	test_cmp expect actual
 '
 
+test_expect_success 'add -N and difftool -d' '
+	test_when_finished git reset --hard &&
+
+	test_write_lines A B C >intent-to-add &&
+	git add -N intent-to-add &&
+	git difftool --dir-diff --extcmd ls
+'
+
+test_expect_success 'difftool --cached with unmerged files' '
+	test_when_finished git reset --hard &&
+
+	test_commit conflicting &&
+	test_commit conflict-a conflict.t a &&
+	git reset --hard conflicting &&
+	test_commit conflict-b conflict.t b &&
+	test_must_fail git merge conflict-a &&
+
+	git difftool --cached --no-prompt >output &&
+	test_must_be_empty output
+'
+
 test_expect_success 'outside worktree' '
 	echo 1 >1 &&
 	echo 2 >2 &&
@@ -739,4 +762,36 @@ test_expect_success 'difftool --gui, --tool and --extcmd are mutually exclusive'
 	test_must_fail git difftool --gui --tool=test-tool --extcmd=cat
 '
 
+test_expect_success 'difftool --rotate-to' '
+	difftool_test_setup &&
+	test_when_finished git reset --hard &&
+	echo 1 >1 &&
+	echo 2 >2 &&
+	echo 4 >4 &&
+	git add 1 2 4 &&
+	git commit -a -m "124" &&
+	git difftool --no-prompt --extcmd=cat --rotate-to="2" HEAD^ >output &&
+	cat >expect <<-\EOF &&
+	2
+	4
+	1
+	EOF
+	test_cmp output expect
+'
+
+test_expect_success 'difftool --skip-to' '
+	difftool_test_setup &&
+	test_when_finished git reset --hard &&
+	git difftool --no-prompt --extcmd=cat --skip-to="2" HEAD^ >output &&
+	cat >expect <<-\EOF &&
+	2
+	4
+	EOF
+	test_cmp output expect
+'
+
+test_expect_success 'difftool --rotate/skip-to error condition' '
+	test_must_fail git difftool --no-prompt --extcmd=cat --rotate-to="3" HEAD^ &&
+	test_must_fail git difftool --no-prompt --extcmd=cat --skip-to="3" HEAD^
+'
 test_done
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 7d7b396c23..6b6423a07c 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -6,8 +6,18 @@
 test_description='git grep various.
 '
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
+test_invalid_grep_expression() {
+	params="$@" &&
+	test_expect_success "invalid expression: grep $params" '
+		test_must_fail git grep $params -- nonexisting
+	'
+}
+
 cat >hello.c <<EOF
 #include <assert.h>
 #include <stdio.h>
@@ -72,6 +82,11 @@ test_expect_success setup '
 	# Still a no-op.
 	function dummy() {}
 	EOF
+	if test_have_prereq FUNNYNAMES
+	then
+		echo unusual >"\"unusual\" pathname" &&
+		echo unusual >"t/nested \"unusual\" pathname"
+	fi &&
 	git add . &&
 	test_tick &&
 	git commit -m initial
@@ -81,6 +96,8 @@ test_expect_success 'grep should not segfault with a bad input' '
 	test_must_fail git grep "("
 '
 
+test_invalid_grep_expression --and -e A
+
 for H in HEAD ''
 do
 	case "$H" in
@@ -481,6 +498,48 @@ do
 		git grep --count -h -e b $H -- ab >actual &&
 		test_cmp expected actual
 	'
+
+	test_expect_success FUNNYNAMES "grep $L should quote unusual pathnames" '
+		cat >expected <<-EOF &&
+		${HC}"\"unusual\" pathname":unusual
+		${HC}"t/nested \"unusual\" pathname":unusual
+		EOF
+		git grep unusual $H >actual &&
+		test_cmp expected actual
+	'
+
+	test_expect_success FUNNYNAMES "grep $L in subdir should quote unusual relative pathnames" '
+		cat >expected <<-EOF &&
+		${HC}"nested \"unusual\" pathname":unusual
+		EOF
+		(
+			cd t &&
+			git grep unusual $H
+		) >actual &&
+		test_cmp expected actual
+	'
+
+	test_expect_success FUNNYNAMES "grep -z $L with unusual pathnames" '
+		cat >expected <<-EOF &&
+		${HC}"unusual" pathname:unusual
+		${HC}t/nested "unusual" pathname:unusual
+		EOF
+		git grep -z unusual $H >actual &&
+		tr "\0" ":" <actual >actual-replace-null &&
+		test_cmp expected actual-replace-null
+	'
+
+	test_expect_success FUNNYNAMES "grep -z $L in subdir with unusual relative pathnames" '
+		cat >expected <<-EOF &&
+		${HC}nested "unusual" pathname:unusual
+		EOF
+		(
+			cd t &&
+			git grep -z unusual $H
+		) >actual &&
+		tr "\0" ":" <actual >actual-replace-null &&
+		test_cmp expected actual-replace-null
+	'
 done
 
 cat >expected <<EOF
@@ -640,21 +699,9 @@ test_expect_success 'grep -C1 hunk mark between files' '
 '
 
 test_expect_success 'log grep setup' '
-	echo a >>file &&
-	test_tick &&
-	GIT_AUTHOR_NAME="With * Asterisk" \
-	GIT_AUTHOR_EMAIL="xyzzy@frotz.com" \
-	git commit -a -m "second" &&
-
-	echo a >>file &&
-	test_tick &&
-	git commit -a -m "third" &&
-
-	echo a >>file &&
-	test_tick &&
-	GIT_AUTHOR_NAME="Night Fall" \
-	GIT_AUTHOR_EMAIL="nitfol@frobozz.com" \
-	git commit -a -m "fourth"
+	test_commit --append --author "With * Asterisk <xyzzy@frotz.com>" second file a &&
+	test_commit --append third file a &&
+	test_commit --append --author "Night Fall <nitfol@frobozz.com>" fourth file a
 '
 
 test_expect_success 'log grep (1)' '
@@ -931,7 +978,8 @@ do
 	"
 done
 
-test_expect_success !PTHREADS,C_LOCALE_OUTPUT 'grep --threads=N or pack.threads=N warns when no pthreads' '
+test_expect_success !PTHREADS,!FAIL_PREREQS \
+	'grep --threads=N or pack.threads=N warns when no pthreads' '
 	git grep --threads=2 Hello hello_world 2>err &&
 	grep ^warning: err >warnings &&
 	test_line_count = 1 warnings &&
@@ -1159,19 +1207,19 @@ test_expect_success 'grep -e -- -- path' '
 '
 
 test_expect_success 'dashdash disambiguates rev as rev' '
-	test_when_finished "rm -f master" &&
-	echo content >master &&
-	echo master:hello.c >expect &&
-	git grep -l o master -- hello.c >actual &&
+	test_when_finished "rm -f main" &&
+	echo content >main &&
+	echo main:hello.c >expect &&
+	git grep -l o main -- hello.c >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'dashdash disambiguates pathspec as pathspec' '
-	test_when_finished "git rm -f master" &&
-	echo content >master &&
-	git add master &&
-	echo master:content >expect &&
-	git grep o -- master >actual &&
+	test_when_finished "git rm -f main" &&
+	echo content >main &&
+	git add main &&
+	echo main:content >expect &&
+	git grep o -- main >actual &&
 	test_cmp expect actual
 '
 
@@ -1207,15 +1255,15 @@ test_expect_success 'grep --no-index pattern -- path' '
 '
 
 test_expect_success 'grep --no-index complains of revs' '
-	test_must_fail git grep --no-index o master -- 2>err &&
+	test_must_fail git grep --no-index o main -- 2>err &&
 	test_i18ngrep "cannot be used with revs" err
 '
 
 test_expect_success 'grep --no-index prefers paths to revs' '
-	test_when_finished "rm -f master" &&
-	echo content >master &&
-	echo master:content >expect &&
-	git grep --no-index o master >actual &&
+	test_when_finished "rm -f main" &&
+	echo content >main &&
+	echo main:content >expect &&
+	git grep --no-index o main >actual &&
 	test_cmp expect actual
 '
 
diff --git a/t/t7811-grep-open.sh b/t/t7811-grep-open.sh
index d1ebfd88c7..a98785da79 100755
--- a/t/t7811-grep-open.sh
+++ b/t/t7811-grep-open.sh
@@ -113,7 +113,6 @@ test_expect_success 'modified file' '
 	subdir/grep.c
 	unrelated
 	EOF
-	>empty &&
 
 	echo "enum grep_pat_token" >unrelated &&
 	test_when_finished "git checkout HEAD unrelated" &&
diff --git a/t/t7812-grep-icase-non-ascii.sh b/t/t7812-grep-icase-non-ascii.sh
index 531eb59d57..e5d1e4ea68 100755
--- a/t/t7812-grep-icase-non-ascii.sh
+++ b/t/t7812-grep-icase-non-ascii.sh
@@ -57,7 +57,12 @@ test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: setup invalid UTF-8 data'
 	printf "\\200\\n" >invalid-0x80 &&
 	echo "ævar" >expected &&
 	cat expected >>invalid-0x80 &&
-	git add invalid-0x80
+	git add invalid-0x80 &&
+
+	# Test for PCRE2_MATCH_INVALID_UTF bug
+	# https://bugs.exim.org/show_bug.cgi?id=2642
+	printf "\\345Aæ\\n" >invalid-0xe5 &&
+	git add invalid-0xe5
 '
 
 test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UTF-8 data' '
@@ -67,18 +72,55 @@ test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UT
 	test_cmp expected actual
 '
 
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep ASCII from invalid UTF-8 data (PCRE2 bug #2642)' '
+	git grep -h "Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual
+'
+
 test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data' '
 	git grep -h "æ" invalid-0x80 >actual &&
 	test_cmp expected actual &&
-	git grep -h "(*NO_JIT)æ" invalid-0x80 &&
+	git grep -h "(*NO_JIT)æ" invalid-0x80 >actual &&
 	test_cmp expected actual
 '
 
+test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data (PCRE2 bug #2642)' '
+	git grep -h "Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -h "(*NO_JIT)Aæ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual
+'
+
+test_lazy_prereq PCRE2_MATCH_INVALID_UTF '
+	test-tool pcre2-config has-PCRE2_MATCH_INVALID_UTF
+'
+
 test_expect_success GETTEXT_LOCALE,LIBPCRE2 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' '
 	test_might_fail git grep -hi "Æ" invalid-0x80 >actual &&
+	test_might_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual
+'
+
+test_expect_success GETTEXT_LOCALE,LIBPCRE2,PCRE2_MATCH_INVALID_UTF 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i' '
+	git grep -hi "Æ" invalid-0x80 >actual &&
 	test_cmp expected actual &&
-	test_must_fail git grep -hi "(*NO_JIT)Æ" invalid-0x80 &&
+	git grep -hi "(*NO_JIT)Æ" invalid-0x80 >actual &&
 	test_cmp expected actual
 '
 
+test_expect_success GETTEXT_LOCALE,LIBPCRE2,PCRE2_MATCH_INVALID_UTF 'PCRE v2: grep non-ASCII from invalid UTF-8 data with -i (PCRE2 bug #2642)' '
+	git grep -hi "Æ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -hi "(*NO_JIT)Æ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+
+	# Only the case of grepping the ASCII part in a way that
+	# relies on -i fails
+	git grep -hi "aÆ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual &&
+	git grep -hi "(*NO_JIT)aÆ" invalid-0xe5 >actual &&
+	test_cmp invalid-0xe5 actual
+'
+
 test_done
diff --git a/t/t7814-grep-recurse-submodules.sh b/t/t7814-grep-recurse-submodules.sh
index 946f91fa57..828cb3ba58 100755
--- a/t/t7814-grep-recurse-submodules.sh
+++ b/t/t7814-grep-recurse-submodules.sh
@@ -345,7 +345,16 @@ test_incompatible_with_recurse_submodules ()
 }
 
 test_incompatible_with_recurse_submodules --untracked
-test_incompatible_with_recurse_submodules --no-index
+
+test_expect_success 'grep --recurse-submodules --no-index ignores --recurse-submodules' '
+	git grep --recurse-submodules --no-index -e "^(.|.)[\d]" >actual &&
+	cat >expect <<-\EOF &&
+	a:(1|2)d(3|4)
+	submodule/a:(1|2)d(3|4)
+	submodule/sub/a:(1|2)d(3|4)
+	EOF
+	test_cmp expect actual
+'
 
 test_expect_success 'grep --recurse-submodules should pass the pattern type along' '
 	# Fixed
diff --git a/t/t7816-grep-binary-pattern.sh b/t/t7816-grep-binary-pattern.sh
index 60bab291e4..9d67a5fc4c 100755
--- a/t/t7816-grep-binary-pattern.sh
+++ b/t/t7816-grep-binary-pattern.sh
@@ -59,7 +59,7 @@ test_expect_success 'setup' "
 	git commit -m.
 "
 
-# Simple fixed-string matching that can use kwset (no -i && non-ASCII)
+# Simple fixed-string matching
 nul_match P P P '-F' 'yQf'
 nul_match P P P '-F' 'yQx'
 nul_match P P P '-Fi' 'YQf'
@@ -78,7 +78,7 @@ nul_match P P P '-Fi' '[Y]QF'
 nul_match P P P '-F' 'æQ[ð]'
 nul_match P P P '-F' '[æ]Qð'
 
-# The -F kwset codepath can't handle -i && non-ASCII...
+# Matching pattern and subject case with -i
 nul_match P 1 1 '-i' '[æ]Qð'
 
 # ...PCRE v2 only matches non-ASCII with -i casefolding under UTF-8
diff --git a/t/t7817-grep-sparse-checkout.sh b/t/t7817-grep-sparse-checkout.sh
new file mode 100755
index 0000000000..590b99bbb6
--- /dev/null
+++ b/t/t7817-grep-sparse-checkout.sh
@@ -0,0 +1,174 @@
+#!/bin/sh
+
+test_description='grep in sparse checkout
+
+This test creates a repo with the following structure:
+
+.
+|-- a
+|-- b
+|-- dir
+|   `-- c
+|-- sub
+|   |-- A
+|   |   `-- a
+|   `-- B
+|       `-- b
+`-- sub2
+    `-- a
+
+Where the outer repository has non-cone mode sparsity patterns, sub is a
+submodule with cone mode sparsity patterns and sub2 is a submodule that is
+excluded by the superproject sparsity patterns. The resulting sparse checkout
+should leave the following structure in the working tree:
+
+.
+|-- a
+|-- sub
+|   `-- B
+|       `-- b
+`-- sub2
+    `-- a
+
+But note that sub2 should have the SKIP_WORKTREE bit set.
+'
+
+. ./test-lib.sh
+
+test_expect_success 'setup' '
+	echo "text" >a &&
+	echo "text" >b &&
+	mkdir dir &&
+	echo "text" >dir/c &&
+
+	git init sub &&
+	(
+		cd sub &&
+		mkdir A B &&
+		echo "text" >A/a &&
+		echo "text" >B/b &&
+		git add A B &&
+		git commit -m sub &&
+		git sparse-checkout init --cone &&
+		git sparse-checkout set B
+	) &&
+
+	git init sub2 &&
+	(
+		cd sub2 &&
+		echo "text" >a &&
+		git add a &&
+		git commit -m sub2
+	) &&
+
+	git submodule add ./sub &&
+	git submodule add ./sub2 &&
+	git add a b dir &&
+	git commit -m super &&
+	git sparse-checkout init --no-cone &&
+	git sparse-checkout set "/*" "!b" "!/*/" "sub" &&
+
+	git tag -am tag-to-commit tag-to-commit HEAD &&
+	tree=$(git rev-parse HEAD^{tree}) &&
+	git tag -am tag-to-tree tag-to-tree $tree &&
+
+	test_path_is_missing b &&
+	test_path_is_missing dir &&
+	test_path_is_missing sub/A &&
+	test_path_is_file a &&
+	test_path_is_file sub/B/b &&
+	test_path_is_file sub2/a &&
+	git branch -m main
+'
+
+# The test below covers a special case: the sparsity patterns exclude '/b' and
+# sparse checkout is enabled, but the path exists in the working tree (e.g.
+# manually created after `git sparse-checkout init`). git grep should skip it.
+test_expect_success 'working tree grep honors sparse checkout' '
+	cat >expect <<-EOF &&
+	a:text
+	EOF
+	test_when_finished "rm -f b" &&
+	echo "new-text" >b &&
+	git grep "text" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'grep searches unmerged file despite not matching sparsity patterns' '
+	cat >expect <<-EOF &&
+	b:modified-b-in-branchX
+	b:modified-b-in-branchY
+	EOF
+	test_when_finished "test_might_fail git merge --abort && \
+			    git checkout main && git sparse-checkout init" &&
+
+	git sparse-checkout disable &&
+	git checkout -b branchY main &&
+	test_commit modified-b-in-branchY b &&
+	git checkout -b branchX main &&
+	test_commit modified-b-in-branchX b &&
+
+	git sparse-checkout init &&
+	test_path_is_missing b &&
+	test_must_fail git merge branchY &&
+	git grep "modified-b" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'grep --cached searches entries with the SKIP_WORKTREE bit' '
+	cat >expect <<-EOF &&
+	a:text
+	b:text
+	dir/c:text
+	EOF
+	git grep --cached "text" >actual &&
+	test_cmp expect actual
+'
+
+# Note that sub2/ is present in the worktree but it is excluded by the sparsity
+# patterns, so grep should not recurse into it.
+test_expect_success 'grep --recurse-submodules honors sparse checkout in submodule' '
+	cat >expect <<-EOF &&
+	a:text
+	sub/B/b:text
+	EOF
+	git grep --recurse-submodules "text" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'grep --recurse-submodules --cached searches entries with the SKIP_WORKTREE bit' '
+	cat >expect <<-EOF &&
+	a:text
+	b:text
+	dir/c:text
+	sub/A/a:text
+	sub/B/b:text
+	sub2/a:text
+	EOF
+	git grep --recurse-submodules --cached "text" >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'working tree grep does not search the index with CE_VALID and SKIP_WORKTREE' '
+	cat >expect <<-EOF &&
+	a:text
+	EOF
+	test_when_finished "git update-index --no-assume-unchanged b" &&
+	git update-index --assume-unchanged b &&
+	git grep text >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success 'grep --cached searches index entries with both CE_VALID and SKIP_WORKTREE' '
+	cat >expect <<-EOF &&
+	a:text
+	b:text
+	dir/c:text
+	EOF
+	test_when_finished "git update-index --no-assume-unchanged b" &&
+	git update-index --assume-unchanged b &&
+	git grep --cached text >actual &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t7900-maintenance.sh b/t/t7900-maintenance.sh
new file mode 100755
index 0000000000..fc16ac2258
--- /dev/null
+++ b/t/t7900-maintenance.sh
@@ -0,0 +1,669 @@
+#!/bin/sh
+
+test_description='git maintenance builtin'
+
+. ./test-lib.sh
+
+GIT_TEST_COMMIT_GRAPH=0
+GIT_TEST_MULTI_PACK_INDEX=0
+
+test_lazy_prereq XMLLINT '
+	xmllint --version
+'
+
+test_xmllint () {
+	if test_have_prereq XMLLINT
+	then
+		xmllint --noout "$@"
+	else
+		true
+	fi
+}
+
+test_expect_success 'help text' '
+	test_expect_code 129 git maintenance -h 2>err &&
+	test_i18ngrep "usage: git maintenance <subcommand>" err &&
+	test_expect_code 128 git maintenance barf 2>err &&
+	test_i18ngrep "invalid subcommand: barf" err &&
+	test_expect_code 129 git maintenance 2>err &&
+	test_i18ngrep "usage: git maintenance" err
+'
+
+test_expect_success 'run [--auto|--quiet]' '
+	GIT_TRACE2_EVENT="$(pwd)/run-no-auto.txt" \
+		git maintenance run 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-auto.txt" \
+		git maintenance run --auto 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-no-quiet.txt" \
+		git maintenance run --no-quiet 2>/dev/null &&
+	test_subcommand git gc --quiet <run-no-auto.txt &&
+	test_subcommand ! git gc --auto --quiet <run-auto.txt &&
+	test_subcommand git gc --no-quiet <run-no-quiet.txt
+'
+
+test_expect_success 'maintenance.auto config option' '
+	GIT_TRACE2_EVENT="$(pwd)/default" git commit --quiet --allow-empty -m 1 &&
+	test_subcommand git maintenance run --auto --quiet <default &&
+	GIT_TRACE2_EVENT="$(pwd)/true" \
+		git -c maintenance.auto=true \
+		commit --quiet --allow-empty -m 2 &&
+	test_subcommand git maintenance run --auto --quiet  <true &&
+	GIT_TRACE2_EVENT="$(pwd)/false" \
+		git -c maintenance.auto=false \
+		commit --quiet --allow-empty -m 3 &&
+	test_subcommand ! git maintenance run --auto --quiet  <false
+'
+
+test_expect_success 'maintenance.<task>.enabled' '
+	git config maintenance.gc.enabled false &&
+	git config maintenance.commit-graph.enabled true &&
+	GIT_TRACE2_EVENT="$(pwd)/run-config.txt" git maintenance run 2>err &&
+	test_subcommand ! git gc --quiet <run-config.txt &&
+	test_subcommand git commit-graph write --split --reachable --no-progress <run-config.txt
+'
+
+test_expect_success 'run --task=<task>' '
+	GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \
+		git maintenance run --task=commit-graph 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-gc.txt" \
+		git maintenance run --task=gc 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-commit-graph.txt" \
+		git maintenance run --task=commit-graph 2>/dev/null &&
+	GIT_TRACE2_EVENT="$(pwd)/run-both.txt" \
+		git maintenance run --task=commit-graph --task=gc 2>/dev/null &&
+	test_subcommand ! git gc --quiet <run-commit-graph.txt &&
+	test_subcommand git gc --quiet <run-gc.txt &&
+	test_subcommand git gc --quiet <run-both.txt &&
+	test_subcommand git commit-graph write --split --reachable --no-progress <run-commit-graph.txt &&
+	test_subcommand ! git commit-graph write --split --reachable --no-progress <run-gc.txt &&
+	test_subcommand git commit-graph write --split --reachable --no-progress <run-both.txt
+'
+
+test_expect_success 'core.commitGraph=false prevents write process' '
+	GIT_TRACE2_EVENT="$(pwd)/no-commit-graph.txt" \
+		git -c core.commitGraph=false maintenance run \
+		--task=commit-graph 2>/dev/null &&
+	test_subcommand ! git commit-graph write --split --reachable --no-progress \
+		<no-commit-graph.txt
+'
+
+test_expect_success 'commit-graph auto condition' '
+	COMMAND="maintenance run --task=commit-graph --auto --quiet" &&
+
+	GIT_TRACE2_EVENT="$(pwd)/cg-no.txt" \
+		git -c maintenance.commit-graph.auto=1 $COMMAND &&
+	GIT_TRACE2_EVENT="$(pwd)/cg-negative-means-yes.txt" \
+		git -c maintenance.commit-graph.auto="-1" $COMMAND &&
+
+	test_commit first &&
+
+	GIT_TRACE2_EVENT="$(pwd)/cg-zero-means-no.txt" \
+		git -c maintenance.commit-graph.auto=0 $COMMAND &&
+	GIT_TRACE2_EVENT="$(pwd)/cg-one-satisfied.txt" \
+		git -c maintenance.commit-graph.auto=1 $COMMAND &&
+
+	git commit --allow-empty -m "second" &&
+	git commit --allow-empty -m "third" &&
+
+	GIT_TRACE2_EVENT="$(pwd)/cg-two-satisfied.txt" \
+		git -c maintenance.commit-graph.auto=2 $COMMAND &&
+
+	COMMIT_GRAPH_WRITE="git commit-graph write --split --reachable --no-progress" &&
+	test_subcommand ! $COMMIT_GRAPH_WRITE <cg-no.txt &&
+	test_subcommand $COMMIT_GRAPH_WRITE <cg-negative-means-yes.txt &&
+	test_subcommand ! $COMMIT_GRAPH_WRITE <cg-zero-means-no.txt &&
+	test_subcommand $COMMIT_GRAPH_WRITE <cg-one-satisfied.txt &&
+	test_subcommand $COMMIT_GRAPH_WRITE <cg-two-satisfied.txt
+'
+
+test_expect_success 'run --task=bogus' '
+	test_must_fail git maintenance run --task=bogus 2>err &&
+	test_i18ngrep "is not a valid task" err
+'
+
+test_expect_success 'run --task duplicate' '
+	test_must_fail git maintenance run --task=gc --task=gc 2>err &&
+	test_i18ngrep "cannot be selected multiple times" err
+'
+
+test_expect_success 'run --task=prefetch with no remotes' '
+	git maintenance run --task=prefetch 2>err &&
+	test_must_be_empty err
+'
+
+test_expect_success 'prefetch multiple remotes' '
+	git clone . clone1 &&
+	git clone . clone2 &&
+	git remote add remote1 "file://$(pwd)/clone1" &&
+	git remote add remote2 "file://$(pwd)/clone2" &&
+	git -C clone1 switch -c one &&
+	git -C clone2 switch -c two &&
+	test_commit -C clone1 one &&
+	test_commit -C clone2 two &&
+	GIT_TRACE2_EVENT="$(pwd)/run-prefetch.txt" git maintenance run --task=prefetch 2>/dev/null &&
+	fetchargs="--prefetch --prune --no-tags --no-write-fetch-head --recurse-submodules=no --quiet" &&
+	test_subcommand git fetch remote1 $fetchargs <run-prefetch.txt &&
+	test_subcommand git fetch remote2 $fetchargs <run-prefetch.txt &&
+	test_path_is_missing .git/refs/remotes &&
+	git log prefetch/remotes/remote1/one &&
+	git log prefetch/remotes/remote2/two &&
+	git fetch --all &&
+	test_cmp_rev refs/remotes/remote1/one refs/prefetch/remotes/remote1/one &&
+	test_cmp_rev refs/remotes/remote2/two refs/prefetch/remotes/remote2/two &&
+
+	test_cmp_config refs/prefetch/ log.excludedecoration &&
+	git log --oneline --decorate --all >log &&
+	! grep "prefetch" log &&
+
+	test_when_finished git config --unset remote.remote1.skipFetchAll &&
+	git config remote.remote1.skipFetchAll true &&
+	GIT_TRACE2_EVENT="$(pwd)/skip-remote1.txt" git maintenance run --task=prefetch 2>/dev/null &&
+	test_subcommand ! git fetch remote1 $fetchargs <skip-remote1.txt &&
+	test_subcommand git fetch remote2 $fetchargs <skip-remote1.txt
+'
+
+test_expect_success 'prefetch and existing log.excludeDecoration values' '
+	git config --unset-all log.excludeDecoration &&
+	git config log.excludeDecoration refs/remotes/remote1/ &&
+	git maintenance run --task=prefetch &&
+
+	git config --get-all log.excludeDecoration >out &&
+	grep refs/remotes/remote1/ out &&
+	grep refs/prefetch/ out &&
+
+	git log --oneline --decorate --all >log &&
+	! grep "prefetch" log &&
+	! grep "remote1" log &&
+	grep "remote2" log &&
+
+	# a second run does not change the config
+	git maintenance run --task=prefetch &&
+	git log --oneline --decorate --all >log2 &&
+	test_cmp log log2
+'
+
+test_expect_success 'loose-objects task' '
+	# Repack everything so we know the state of the object dir
+	git repack -adk &&
+
+	# Hack to stop maintenance from running during "git commit"
+	echo in use >.git/objects/maintenance.lock &&
+
+	# Assuming that "git commit" creates at least one loose object
+	test_commit create-loose-object &&
+	rm .git/objects/maintenance.lock &&
+
+	ls .git/objects >obj-dir-before &&
+	test_file_not_empty obj-dir-before &&
+	ls .git/objects/pack/*.pack >packs-before &&
+	test_line_count = 1 packs-before &&
+
+	# The first run creates a pack-file
+	# but does not delete loose objects.
+	git maintenance run --task=loose-objects &&
+	ls .git/objects >obj-dir-between &&
+	test_cmp obj-dir-before obj-dir-between &&
+	ls .git/objects/pack/*.pack >packs-between &&
+	test_line_count = 2 packs-between &&
+	ls .git/objects/pack/loose-*.pack >loose-packs &&
+	test_line_count = 1 loose-packs &&
+
+	# The second run deletes loose objects
+	# but does not create a pack-file.
+	git maintenance run --task=loose-objects &&
+	ls .git/objects >obj-dir-after &&
+	cat >expect <<-\EOF &&
+	info
+	pack
+	EOF
+	test_cmp expect obj-dir-after &&
+	ls .git/objects/pack/*.pack >packs-after &&
+	test_cmp packs-between packs-after
+'
+
+test_expect_success 'maintenance.loose-objects.auto' '
+	git repack -adk &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-lo1.txt" \
+		git -c maintenance.loose-objects.auto=1 maintenance \
+		run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand ! git prune-packed --quiet <trace-lo1.txt &&
+	printf data-A | git hash-object -t blob --stdin -w &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-loA" \
+		git -c maintenance.loose-objects.auto=2 \
+		maintenance run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand ! git prune-packed --quiet <trace-loA &&
+	printf data-B | git hash-object -t blob --stdin -w &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-loB" \
+		git -c maintenance.loose-objects.auto=2 \
+		maintenance run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <trace-loB &&
+	GIT_TRACE2_EVENT="$(pwd)/trace-loC" \
+		git -c maintenance.loose-objects.auto=2 \
+		maintenance run --auto --task=loose-objects 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <trace-loC
+'
+
+test_expect_success 'incremental-repack task' '
+	packDir=.git/objects/pack &&
+	for i in $(test_seq 1 5)
+	do
+		test_commit $i || return 1
+	done &&
+
+	# Create three disjoint pack-files with size BIG, small, small.
+	echo HEAD~2 | git pack-objects --revs $packDir/test-1 &&
+	test_tick &&
+	git pack-objects --revs $packDir/test-2 <<-\EOF &&
+	HEAD~1
+	^HEAD~2
+	EOF
+	test_tick &&
+	git pack-objects --revs $packDir/test-3 <<-\EOF &&
+	HEAD
+	^HEAD~1
+	EOF
+
+	# Delete refs that have not been repacked in these packs.
+	git for-each-ref --format="delete %(refname)" \
+		refs/prefetch refs/tags >refs &&
+	git update-ref --stdin <refs &&
+
+	# Replace the object directory with this pack layout.
+	rm -f $packDir/pack-* &&
+	rm -f $packDir/loose-* &&
+	ls $packDir/*.pack >packs-before &&
+	test_line_count = 3 packs-before &&
+
+	# the job repacks the two into a new pack, but does not
+	# delete the old ones.
+	git maintenance run --task=incremental-repack &&
+	ls $packDir/*.pack >packs-between &&
+	test_line_count = 4 packs-between &&
+
+	# the job deletes the two old packs, and does not write
+	# a new one because the batch size is not high enough to
+	# pack the largest pack-file.
+	git maintenance run --task=incremental-repack &&
+	ls .git/objects/pack/*.pack >packs-after &&
+	test_line_count = 2 packs-after
+'
+
+test_expect_success EXPENSIVE 'incremental-repack 2g limit' '
+	test_config core.compression 0 &&
+
+	for i in $(test_seq 1 5)
+	do
+		test-tool genrandom foo$i $((512 * 1024 * 1024 + 1)) >>big ||
+		return 1
+	done &&
+	git add big &&
+	git commit -qm "Add big file (1)" &&
+
+	# ensure any possible loose objects are in a pack-file
+	git maintenance run --task=loose-objects &&
+
+	rm big &&
+	for i in $(test_seq 6 10)
+	do
+		test-tool genrandom foo$i $((512 * 1024 * 1024 + 1)) >>big ||
+		return 1
+	done &&
+	git add big &&
+	git commit -qm "Add big file (2)" &&
+
+	# ensure any possible loose objects are in a pack-file
+	git maintenance run --task=loose-objects &&
+
+	# Now run the incremental-repack task and check the batch-size
+	GIT_TRACE2_EVENT="$(pwd)/run-2g.txt" git maintenance run \
+		--task=incremental-repack 2>/dev/null &&
+	test_subcommand git multi-pack-index repack \
+		 --no-progress --batch-size=2147483647 <run-2g.txt
+'
+
+test_expect_success 'maintenance.incremental-repack.auto' '
+	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 &&
+	git pack-objects --revs .git/objects/pack/pack <<-\EOF &&
+	HEAD
+	^HEAD~1
+	EOF
+	GIT_TRACE2_EVENT=$(pwd)/trace-A git \
+		-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 &&
+	git pack-objects --revs .git/objects/pack/pack <<-\EOF &&
+	HEAD
+	^HEAD~1
+	EOF
+	GIT_TRACE2_EVENT=$(pwd)/trace-B git \
+		-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 'pack-refs task' '
+	for n in $(test_seq 1 5)
+	do
+		git branch -f to-pack/$n HEAD || return 1
+	done &&
+	GIT_TRACE2_EVENT="$(pwd)/pack-refs.txt" \
+		git maintenance run --task=pack-refs &&
+	test_subcommand git pack-refs --all --prune <pack-refs.txt
+'
+
+test_expect_success '--auto and --schedule incompatible' '
+	test_must_fail git maintenance run --auto --schedule=daily 2>err &&
+	test_i18ngrep "at most one" err
+'
+
+test_expect_success 'invalid --schedule value' '
+	test_must_fail git maintenance run --schedule=annually 2>err &&
+	test_i18ngrep "unrecognized --schedule" err
+'
+
+test_expect_success '--schedule inheritance weekly -> daily -> hourly' '
+	git config maintenance.loose-objects.enabled true &&
+	git config maintenance.loose-objects.schedule hourly &&
+	git config maintenance.commit-graph.enabled true &&
+	git config maintenance.commit-graph.schedule daily &&
+	git config maintenance.incremental-repack.enabled true &&
+	git config maintenance.incremental-repack.schedule weekly &&
+
+	GIT_TRACE2_EVENT="$(pwd)/hourly.txt" \
+		git maintenance run --schedule=hourly 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <hourly.txt &&
+	test_subcommand ! git commit-graph write --split --reachable \
+		--no-progress <hourly.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress <hourly.txt &&
+
+	GIT_TRACE2_EVENT="$(pwd)/daily.txt" \
+		git maintenance run --schedule=daily 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <daily.txt &&
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <daily.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress <daily.txt &&
+
+	GIT_TRACE2_EVENT="$(pwd)/weekly.txt" \
+		git maintenance run --schedule=weekly 2>/dev/null &&
+	test_subcommand git prune-packed --quiet <weekly.txt &&
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <weekly.txt &&
+	test_subcommand git multi-pack-index write --no-progress <weekly.txt
+'
+
+test_expect_success 'maintenance.strategy inheritance' '
+	for task in commit-graph loose-objects incremental-repack
+	do
+		git config --unset maintenance.$task.schedule || return 1
+	done &&
+
+	test_when_finished git config --unset maintenance.strategy &&
+	git config maintenance.strategy incremental &&
+
+	GIT_TRACE2_EVENT="$(pwd)/incremental-hourly.txt" \
+		git maintenance run --schedule=hourly --quiet &&
+	GIT_TRACE2_EVENT="$(pwd)/incremental-daily.txt" \
+		git maintenance run --schedule=daily --quiet &&
+	GIT_TRACE2_EVENT="$(pwd)/incremental-weekly.txt" \
+		git maintenance run --schedule=weekly --quiet &&
+
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <incremental-hourly.txt &&
+	test_subcommand ! git prune-packed --quiet <incremental-hourly.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress \
+		<incremental-hourly.txt &&
+	test_subcommand ! git pack-refs --all --prune \
+		<incremental-hourly.txt &&
+
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <incremental-daily.txt &&
+	test_subcommand git prune-packed --quiet <incremental-daily.txt &&
+	test_subcommand git multi-pack-index write --no-progress \
+		<incremental-daily.txt &&
+	test_subcommand ! git pack-refs --all --prune \
+		<incremental-daily.txt &&
+
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <incremental-weekly.txt &&
+	test_subcommand git prune-packed --quiet <incremental-weekly.txt &&
+	test_subcommand git multi-pack-index write --no-progress \
+		<incremental-weekly.txt &&
+	test_subcommand git pack-refs --all --prune \
+		<incremental-weekly.txt &&
+
+	# Modify defaults
+	git config maintenance.commit-graph.schedule daily &&
+	git config maintenance.loose-objects.schedule hourly &&
+	git config maintenance.incremental-repack.enabled false &&
+
+	GIT_TRACE2_EVENT="$(pwd)/modified-hourly.txt" \
+		git maintenance run --schedule=hourly --quiet &&
+	GIT_TRACE2_EVENT="$(pwd)/modified-daily.txt" \
+		git maintenance run --schedule=daily --quiet &&
+
+	test_subcommand ! git commit-graph write --split --reachable \
+		--no-progress <modified-hourly.txt &&
+	test_subcommand git prune-packed --quiet <modified-hourly.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress \
+		<modified-hourly.txt &&
+
+	test_subcommand git commit-graph write --split --reachable \
+		--no-progress <modified-daily.txt &&
+	test_subcommand git prune-packed --quiet <modified-daily.txt &&
+	test_subcommand ! git multi-pack-index write --no-progress \
+		<modified-daily.txt
+'
+
+test_expect_success 'register and unregister' '
+	test_when_finished git config --global --unset-all maintenance.repo &&
+	git config --global --add maintenance.repo /existing1 &&
+	git config --global --add maintenance.repo /existing2 &&
+	git config --global --get-all maintenance.repo >before &&
+
+	git maintenance register &&
+	test_cmp_config false maintenance.auto &&
+	git config --global --get-all maintenance.repo >between &&
+	cp before expect &&
+	pwd >>expect &&
+	test_cmp expect between &&
+
+	git maintenance unregister &&
+	git config --global --get-all maintenance.repo >actual &&
+	test_cmp before actual
+'
+
+test_expect_success !MINGW 'register and unregister with regex metacharacters' '
+	META="a+b*c" &&
+	git init "$META" &&
+	git -C "$META" maintenance register &&
+	git config --get-all --show-origin maintenance.repo &&
+	git config --get-all --global --fixed-value \
+		maintenance.repo "$(pwd)/$META" &&
+	git -C "$META" maintenance unregister &&
+	test_must_fail git config --get-all --global --fixed-value \
+		maintenance.repo "$(pwd)/$META"
+'
+
+test_expect_success 'start from empty cron table' '
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance start &&
+
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	grep "for-each-repo --config=maintenance.repo maintenance run --schedule=daily" cron.txt &&
+	grep "for-each-repo --config=maintenance.repo maintenance run --schedule=hourly" cron.txt &&
+	grep "for-each-repo --config=maintenance.repo maintenance run --schedule=weekly" cron.txt
+'
+
+test_expect_success 'stop from existing schedule' '
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	# Operation is idempotent
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+	test_must_be_empty cron.txt
+'
+
+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 &&
+	grep "Important information!" cron.txt
+'
+
+test_expect_success 'magic markers are correct' '
+	grep "GIT MAINTENANCE SCHEDULE" cron.txt >actual &&
+	cat >expect <<-\EOF &&
+	# BEGIN GIT MAINTENANCE SCHEDULE
+	# END GIT MAINTENANCE SCHEDULE
+	EOF
+	test_cmp actual expect
+'
+
+test_expect_success 'stop preserves surrounding schedule' '
+	echo "Crucial information!" >>cron.txt &&
+	GIT_TEST_MAINT_SCHEDULER="crontab:test-tool crontab cron.txt" git maintenance stop &&
+	grep "Important information!" cron.txt &&
+	grep "Crucial information!" cron.txt
+'
+
+test_expect_success 'start and stop macOS maintenance' '
+	# ensure $HOME can be compared against hook arguments on all platforms
+	pfx=$(cd "$HOME" && pwd) &&
+
+	write_script print-args <<-\EOF &&
+	echo $* | sed "s:gui/[0-9][0-9]*:gui/[UID]:" >>args
+	EOF
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&
+
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	ls "$HOME/Library/LaunchAgents" >actual &&
+	cat >expect <<-\EOF &&
+	org.git-scm.git.daily.plist
+	org.git-scm.git.hourly.plist
+	org.git-scm.git.weekly.plist
+	EOF
+	test_cmp expect actual &&
+
+	rm -f expect &&
+	for frequency in hourly daily weekly
+	do
+		PLIST="$pfx/Library/LaunchAgents/org.git-scm.git.$frequency.plist" &&
+		test_xmllint "$PLIST" &&
+		grep schedule=$frequency "$PLIST" &&
+		echo "bootout gui/[UID] $PLIST" >>expect &&
+		echo "bootstrap gui/[UID] $PLIST" >>expect || return 1
+	done &&
+	test_cmp expect args &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance stop &&
+
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	printf "bootout gui/[UID] $pfx/Library/LaunchAgents/org.git-scm.git.%s.plist\n" \
+		hourly daily weekly >expect &&
+	test_cmp expect args &&
+	ls "$HOME/Library/LaunchAgents" >actual &&
+	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 &&
+
+	# do it again on a fresh args file
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER=launchctl:./print-args git maintenance start &&
+
+	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
+	while test $# -gt 0
+	do
+		case "$1" in
+		/xml) shift; xmlfile=$1; break ;;
+		*) shift ;;
+		esac
+	done
+	test -z "$xmlfile" || cp "$xmlfile" "$xmlfile.xml"
+	EOF
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance start &&
+
+	# start registers the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	for frequency in hourly daily weekly
+	do
+		grep "/create /tn Git Maintenance ($frequency) /f /xml" args &&
+		file=$(ls .git/schedule_${frequency}*.xml) &&
+		test_xmllint "$file" || return 1
+	done &&
+
+	rm -f args &&
+	GIT_TEST_MAINT_SCHEDULER="schtasks:./print-args" git maintenance stop &&
+
+	# stop does not unregister the repo
+	git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+
+	printf "/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 &&
+	test_config maintenance.strategy none &&
+	git config --unset maintenance.strategy &&
+	git maintenance register &&
+	test_config maintenance.strategy incremental
+'
+
+test_expect_success 'fails when running outside of a repository' '
+	nongit test_must_fail git maintenance run &&
+	nongit test_must_fail git maintenance stop &&
+	nongit test_must_fail git maintenance start &&
+	nongit test_must_fail git maintenance register &&
+	nongit test_must_fail git maintenance unregister
+'
+
+test_expect_success 'register and unregister bare repo' '
+	test_when_finished "git config --global --unset-all maintenance.repo || :" &&
+	test_might_fail git config --global --unset-all maintenance.repo &&
+	git init --bare barerepo &&
+	(
+		cd barerepo &&
+		git maintenance register &&
+		git config --get --global --fixed-value maintenance.repo "$(pwd)" &&
+		git maintenance unregister &&
+		test_must_fail git config --global --get-all maintenance.repo
+	)
+'
+
+test_done
diff --git a/t/t8001-annotate.sh b/t/t8001-annotate.sh
index 72176e42c1..a536a621b2 100755
--- a/t/t8001-annotate.sh
+++ b/t/t8001-annotate.sh
@@ -1,13 +1,16 @@
 #!/bin/sh
 
 test_description='git annotate'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 PROG='git annotate'
 . "$TEST_DIRECTORY"/annotate-tests.sh
 
 test_expect_success 'annotate old revision' '
-	git annotate file master >actual &&
+	git annotate file main >actual &&
 	awk "{ print \$3; }" <actual >authors &&
 	test 2 = $(grep A <authors | wc -l) &&
 	test 2 = $(grep B <authors | wc -l)
diff --git a/t/t8002-blame.sh b/t/t8002-blame.sh
index eea048e52c..5bb302b1ba 100755
--- a/t/t8002-blame.sh
+++ b/t/t8002-blame.sh
@@ -1,11 +1,18 @@
 #!/bin/sh
 
 test_description='git blame'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 PROG='git blame -c'
 . "$TEST_DIRECTORY"/annotate-tests.sh
 
+test_expect_success 'setup' '
+	hexsz=$(test_oid hexsz)
+'
+
 test_expect_success 'blame untracked file in empty repo' '
 	>untracked &&
 	test_must_fail git blame untracked
@@ -105,21 +112,32 @@ test_expect_success 'blame --abbrev=<n> works' '
 '
 
 test_expect_success 'blame -l aligns regular and boundary commits' '
-	check_abbrev 40 -l HEAD &&
-	check_abbrev 39 -l ^HEAD
+	check_abbrev $hexsz         -l HEAD &&
+	check_abbrev $((hexsz - 1)) -l ^HEAD
 '
 
-test_expect_success 'blame --abbrev=40 behaves like -l' '
-	check_abbrev 40 --abbrev=40 HEAD &&
-	check_abbrev 39 --abbrev=40 ^HEAD
+test_expect_success 'blame --abbrev with full length behaves like -l' '
+	check_abbrev $hexsz         --abbrev=$hexsz HEAD &&
+	check_abbrev $((hexsz - 1)) --abbrev=$hexsz ^HEAD
 '
 
-test_expect_success '--no-abbrev works like --abbrev=40' '
-	check_abbrev 40 --no-abbrev
+test_expect_success '--no-abbrev works like --abbrev with full length' '
+	check_abbrev $hexsz --no-abbrev
 '
 
 test_expect_success '--exclude-promisor-objects does not BUG-crash' '
 	test_must_fail git blame --exclude-promisor-objects one
 '
 
+test_expect_success 'blame with uncommitted edits in partial clone does not crash' '
+	git init server &&
+	echo foo >server/file.txt &&
+	git -C server add file.txt &&
+	git -C server commit -m file &&
+
+	git clone --filter=blob:none "file://$(pwd)/server" client &&
+	echo bar >>client/file.txt &&
+	git -C client blame file.txt
+'
+
 test_done
diff --git a/t/t8003-blame-corner-cases.sh b/t/t8003-blame-corner-cases.sh
index 1c5fb1d1f8..da80f815ce 100755
--- a/t/t8003-blame-corner-cases.sh
+++ b/t/t8003-blame-corner-cases.sh
@@ -1,12 +1,14 @@
 #!/bin/sh
 
 test_description='git blame corner cases'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 pick_fc='s/^[0-9a-f^]* *\([^ ]*\) *(\([^ ]*\) .*/\1-\2/'
 
 test_expect_success setup '
-
 	echo A A A A A >one &&
 	echo B B B B B >two &&
 	echo C C C C C >tres &&
@@ -162,18 +164,17 @@ test_expect_success 'blame wholesale copy and more in the index' '
 
 test_expect_success 'blame during cherry-pick with file rename conflict' '
 
-	test_when_finished "git reset --hard && git checkout master" &&
+	test_when_finished "git reset --hard && git checkout main" &&
 	git checkout HEAD~3 &&
 	echo MOUSE >> mouse &&
 	git mv mouse rodent &&
 	git add rodent &&
 	GIT_AUTHOR_NAME=Rodent git commit -m "rodent" &&
-	git checkout --detach master &&
+	git checkout --detach main &&
 	(git cherry-pick HEAD@{1} || test $? -eq 1) &&
 	git show HEAD@{1}:rodent > rodent &&
 	git add rodent &&
 	git blame -f -C -C1 rodent | sed -e "$pick_fc" >current &&
-	cat current &&
 	cat >expected <<-\EOF &&
 	mouse-Initial
 	mouse-Second
@@ -275,18 +276,14 @@ test_expect_success 'blame file with CRLF core.autocrlf=true' '
 	grep "A U Thor" actual
 '
 
-# Tests the splitting and merging of blame entries in blame_coalesce().
-# The output of blame is the same, regardless of whether blame_coalesce() runs
-# or not, so we'd likely only notice a problem if blame crashes or assigned
-# blame to the "splitting" commit ('SPLIT' below).
-test_expect_success 'blame coalesce' '
+test_expect_success 'setup coalesce tests' '
 	cat >giraffe <<-\EOF &&
 	ABC
 	DEF
 	EOF
 	git add giraffe &&
 	git commit -m "original file" &&
-	oid=$(git rev-parse HEAD) &&
+	orig=$(git rev-parse HEAD) &&
 
 	cat >giraffe <<-\EOF &&
 	ABC
@@ -295,6 +292,7 @@ test_expect_success 'blame coalesce' '
 	EOF
 	git add giraffe &&
 	git commit -m "interior SPLIT line" &&
+	split=$(git rev-parse HEAD) &&
 
 	cat >giraffe <<-\EOF &&
 	ABC
@@ -302,12 +300,25 @@ test_expect_success 'blame coalesce' '
 	EOF
 	git add giraffe &&
 	git commit -m "same contents as original" &&
+	final=$(git rev-parse HEAD)
+'
+
+test_expect_success 'blame coalesce' '
+	cat >expect <<-EOF &&
+	$orig 1 1 2
+	$orig 2 2
+	EOF
+	git blame --porcelain $final giraffe >actual.raw &&
+	grep "^$orig" actual.raw >actual &&
+	test_cmp expect actual
+'
 
+test_expect_success 'blame does not coalesce non-adjacent result lines' '
 	cat >expect <<-EOF &&
-	$oid 1) ABC
-	$oid 2) DEF
+	$orig 1) ABC
+	$orig 3) DEF
 	EOF
-	git -c core.abbrev=40 blame -s giraffe >actual &&
+	git blame --no-abbrev -s -L1,1 -L3,3 $split giraffe >actual &&
 	test_cmp expect actual
 '
 
diff --git a/t/t8004-blame-with-conflicts.sh b/t/t8004-blame-with-conflicts.sh
index 9c353ab222..35414a5336 100755
--- a/t/t8004-blame-with-conflicts.sh
+++ b/t/t8004-blame-with-conflicts.sh
@@ -3,6 +3,9 @@
 # Based on a test case submitted by Björn Steinbrink.
 
 test_description='git blame on conflicted files'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup first case' '
@@ -21,16 +24,16 @@ test_expect_success 'setup first case' '
 	git add file2 &&
 	git commit --author "U Gly <ug@localhost>" -m ugly &&
 
-	# Back to master and change something
-	git checkout master &&
+	# Back to main and change something
+	git checkout main &&
 	echo "
 
 bla" >> file1 &&
 	git commit --author "Old Line <ol@localhost>" -a -m file1.b &&
 
-	# Back to foo and merge master
+	# Back to foo and merge main
 	git checkout foo &&
-	if git merge master; then
+	if git merge main; then
 		echo needed conflict here
 		exit 1
 	else
@@ -44,8 +47,8 @@ Even more" > file2 &&
 	git rm file1 &&
 	git commit --author "M Result <mr@localhost>" -a -m merged &&
 
-	# Back to master and change file1 again
-	git checkout master &&
+	# Back to main and change file1 again
+	git checkout main &&
 	sed s/bla/foo/ <file1 >X &&
 	rm file1 &&
 	mv X file1 &&
@@ -53,7 +56,7 @@ Even more" > file2 &&
 
 	# Try to merge into foo again
 	git checkout foo &&
-	if git merge master; then
+	if git merge main; then
 		echo needed conflict here
 		exit 1
 	else
diff --git a/t/t8011-blame-split-file.sh b/t/t8011-blame-split-file.sh
index 831125047b..bdda0c03fe 100755
--- a/t/t8011-blame-split-file.sh
+++ b/t/t8011-blame-split-file.sh
@@ -54,7 +54,7 @@ test_expect_success 'setup simulated porcelain' '
 	cat >read-porcelain.pl <<-\EOF
 	my $field = shift;
 	while (<>) {
-		if (/^[0-9a-f]{40} /) {
+		if (/^[0-9a-f]{40,} /) {
 			flush();
 			$hash = $&;
 		} elsif (/^$field (.*)/) {
diff --git a/t/t8012-blame-colors.sh b/t/t8012-blame-colors.sh
index ed38f74de9..90c75dbb28 100755
--- a/t/t8012-blame-colors.sh
+++ b/t/t8012-blame-colors.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='colored git blame'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 PROG='git blame -c'
diff --git a/t/t8013-blame-ignore-revs.sh b/t/t8013-blame-ignore-revs.sh
index 36dc31eb39..b18633dee1 100755
--- a/t/t8013-blame-ignore-revs.sh
+++ b/t/t8013-blame-ignore-revs.sh
@@ -21,6 +21,7 @@ test_expect_success setup '
 	test_tick &&
 	git commit -m X &&
 	git tag X &&
+	git tag -a -m "X (annotated)" XT &&
 
 	git blame --line-porcelain file >blame_raw &&
 
@@ -31,20 +32,36 @@ test_expect_success setup '
 	grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
 	git rev-parse X >expect &&
 	test_cmp expect actual
+'
+
+# Ensure bogus --ignore-rev requests are caught
+test_expect_success 'validate --ignore-rev' '
+	test_must_fail git blame --ignore-rev X^{tree} file
+'
+
+# Ensure bogus --ignore-revs-file requests are silently accepted
+test_expect_success 'validate --ignore-revs-file' '
+	git rev-parse X^{tree} >ignore_x &&
+	git blame --ignore-revs-file ignore_x file
+'
+
+for I in X XT
+do
+	# Ignore X (or XT), make sure A is blamed for line 1 and B for line 2.
+	# Giving X (i.e. commit) and XT (i.e. annotated tag to commit) should
+	# produce the same result.
+	test_expect_success "ignore_rev_changing_lines ($I)" '
+		git blame --line-porcelain --ignore-rev $I file >blame_raw &&
+
+		grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
+		git rev-parse A >expect &&
+		test_cmp expect actual &&
+
+		grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
+		git rev-parse B >expect &&
+		test_cmp expect actual
 	'
-
-# Ignore X, make sure A is blamed for line 1 and B for line 2.
-test_expect_success ignore_rev_changing_lines '
-	git blame --line-porcelain --ignore-rev X file >blame_raw &&
-
-	grep -E "^[0-9a-f]+ [0-9]+ 1" blame_raw | sed -e "s/ .*//" >actual &&
-	git rev-parse A >expect &&
-	test_cmp expect actual &&
-
-	grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
-	git rev-parse B >expect &&
-	test_cmp expect actual
-	'
+done
 
 # For ignored revs that have added 'unblamable' lines, attribute those to the
 # ignored commit.
@@ -67,7 +84,7 @@ test_expect_success ignore_rev_adding_unblamable_lines '
 
 	grep -E "^[0-9a-f]+ [0-9]+ 4" blame_raw | sed -e "s/ .*//" >actual &&
 	test_cmp expect actual
-	'
+'
 
 # Ignore X and Y, both in separate files.  Lines 1 == A, 2 == B.
 test_expect_success ignore_revs_from_files '
@@ -82,7 +99,7 @@ test_expect_success ignore_revs_from_files '
 	grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
 	git rev-parse B >expect &&
 	test_cmp expect actual
-	'
+'
 
 # Ignore X from the config option, Y from a file.
 test_expect_success ignore_revs_from_configs_and_files '
@@ -96,7 +113,7 @@ test_expect_success ignore_revs_from_configs_and_files '
 	grep -E "^[0-9a-f]+ [0-9]+ 2" blame_raw | sed -e "s/ .*//" >actual &&
 	git rev-parse B >expect &&
 	test_cmp expect actual
-	'
+'
 
 # Override blame.ignoreRevsFile (ignore_x) with an empty string.  X should be
 # blamed now for lines 1 and 2, since we are no longer ignoring X.
@@ -120,7 +137,7 @@ test_expect_success bad_files_and_revs '
 	echo NOREV >ignore_norev &&
 	test_must_fail git blame file --ignore-revs-file ignore_norev 2>err &&
 	test_i18ngrep "invalid object name: NOREV" err
-	'
+'
 
 # For ignored revs that have added 'unblamable' lines, mark those lines with a
 # '*'
@@ -138,7 +155,7 @@ test_expect_success mark_unblamable_lines '
 
 	sed -n "4p" blame_raw | cut -c1 >actual &&
 	test_cmp expect actual
-	'
+'
 
 # Commit Z will touch the first two lines.  Y touched all four.
 # 	A--B--X--Y--Z
@@ -171,7 +188,7 @@ test_expect_success mark_ignored_lines '
 
 	sed -n "4p" blame_raw | cut -c1 >actual &&
 	! test_cmp expect actual
-	'
+'
 
 # For ignored revs that added 'unblamable' lines and more recent commits changed
 # the blamable lines, mark the unblamable lines with a
@@ -190,7 +207,7 @@ test_expect_success mark_unblamable_lines_intermediate '
 
 	sed -n "4p" blame_raw | cut -c1 >actual &&
 	test_cmp expect actual
-	'
+'
 
 # The heuristic called by guess_line_blames() tries to find the size of a
 # blame_entry 'e' in the parent's address space.  Those calculations need to
@@ -227,7 +244,7 @@ test_expect_success ignored_chunk_negative_parent_size '
 	git tag C &&
 
 	git blame file --ignore-rev B >blame_raw
-	'
+'
 
 # Resetting the repo and creating:
 #
@@ -269,6 +286,6 @@ test_expect_success ignore_merge '
 	grep -E "^[0-9a-f]+ [0-9]+ 9" blame_raw | sed -e "s/ .*//" >actual &&
 	git rev-parse C >expect &&
 	test_cmp expect actual
-	'
+'
 
 test_done
diff --git a/t/t8014-blame-ignore-fuzzy.sh b/t/t8014-blame-ignore-fuzzy.sh
index 6e61882b6f..e68e6115a6 100755
--- a/t/t8014-blame-ignore-fuzzy.sh
+++ b/t/t8014-blame-ignore-fuzzy.sh
@@ -248,7 +248,7 @@ Final
 EOF
 
 # The first line of b matches best with the last line of a, but the overall
-# match is better if we match it with the the first line of a.
+# match is better if we match it with the first line of a.
 title11="Piggy in the middle"
 cat <<EOF >a11
 abcdefg
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 997f90b42b..595cbad372 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git send-email'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 # May be altered later in the test
@@ -42,7 +45,8 @@ clean_fake_sendmail () {
 }
 
 test_expect_success $PREREQ 'Extract patches' '
-	patches=$(git format-patch -s --cc="One <one@example.com>" --cc=two@example.com -n HEAD^1)
+	patches=$(git format-patch -s --cc="One <one@example.com>" --cc=two@example.com -n HEAD^1) &&
+	threaded_patches=$(git format-patch -o threaded -s --in-reply-to="format" HEAD^1)
 '
 
 # Test no confirm early to ensure remaining tests will not hang
@@ -411,15 +415,23 @@ test_expect_success $PREREQ 'reject long lines' '
 	z512=$z64$z64$z64$z64$z64$z64$z64$z64 &&
 	clean_fake_sendmail &&
 	cp $patches longline.patch &&
-	echo $z512$z512 >>longline.patch &&
+	cat >>longline.patch <<-EOF &&
+	$z512$z512
+	not a long line
+	$z512$z512
+	EOF
 	test_must_fail git send-email \
 		--from="Example <nobody@example.com>" \
 		--to=nobody@example.com \
 		--smtp-server="$(pwd)/fake.sendmail" \
 		--transfer-encoding=8bit \
 		$patches longline.patch \
-		2>errors &&
-	grep longline.patch errors
+		2>actual &&
+	cat >expect <<-\EOF &&
+	fatal: longline.patch:35 is longer than 998 characters
+	warning: no patches were sent
+	EOF
+	test_cmp expect actual
 '
 
 test_expect_success $PREREQ 'no patch was sent' '
@@ -509,6 +521,49 @@ do
 
 done
 
+test_expect_success $PREREQ "--validate respects relative core.hooksPath path" '
+	clean_fake_sendmail &&
+	mkdir my-hooks &&
+	test_when_finished "rm my-hooks.ran" &&
+	write_script my-hooks/sendemail-validate <<-\EOF &&
+	>my-hooks.ran
+	exit 1
+	EOF
+	test_config core.hooksPath "my-hooks" &&
+	test_must_fail git send-email \
+		--from="Example <nobody@example.com>" \
+		--to=nobody@example.com \
+		--smtp-server="$(pwd)/fake.sendmail" \
+		--validate \
+		longline.patch 2>actual &&
+	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
+	warning: no patches were sent
+	EOF
+	test_cmp expect actual
+'
+
+test_expect_success $PREREQ "--validate respects absolute core.hooksPath path" '
+	hooks_path="$(pwd)/my-hooks" &&
+	test_config core.hooksPath "$hooks_path" &&
+	test_when_finished "rm my-hooks.ran" &&
+	test_must_fail git send-email \
+		--from="Example <nobody@example.com>" \
+		--to=nobody@example.com \
+		--smtp-server="$(pwd)/fake.sendmail" \
+		--validate \
+		longline.patch 2>actual &&
+	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
+	warning: no patches were sent
+	EOF
+	test_cmp expect actual
+'
+
 for enc in 7bit 8bit quoted-printable base64
 do
 	test_expect_success $PREREQ "--transfer-encoding=$enc produces correct header" '
@@ -589,14 +644,33 @@ test_expect_success $PREREQ 'In-Reply-To with --chain-reply-to' '
 	test_cmp expect actual
 '
 
+test_set_editor "$(pwd)/fake-editor"
+
+test_expect_success $PREREQ 'setup erroring fake editor' '
+	write_script fake-editor <<-\EOF
+	echo >&2 "I am about to error"
+	exit 1
+	EOF
+'
+
+test_expect_success $PREREQ 'fake editor dies with error' '
+	clean_fake_sendmail &&
+	test_must_fail git send-email \
+		--compose --subject foo \
+		--from="Example <nobody@example.com>" \
+		--to=nobody@example.com \
+		--smtp-server="$(pwd)/fake.sendmail" \
+		$patches 2>err &&
+	grep "I am about to error" err &&
+	grep "the editor exited uncleanly, aborting everything" err
+'
+
 test_expect_success $PREREQ 'setup fake editor' '
 	write_script fake-editor <<-\EOF
 	echo fake edit >>"$1"
 	EOF
 '
 
-test_set_editor "$(pwd)/fake-editor"
-
 test_expect_success $PREREQ '--compose works' '
 	clean_fake_sendmail &&
 	git send-email \
@@ -1167,10 +1241,10 @@ test_expect_success $PREREQ '--compose-encoding adds correct MIME for subject' '
 '
 
 test_expect_success $PREREQ 'detects ambiguous reference/file conflict' '
-	echo master >master &&
-	git add master &&
-	git commit -m"add master" &&
-	test_must_fail git send-email --dry-run master 2>errors &&
+	echo main >main &&
+	git add main &&
+	git commit -m"add main" &&
+	test_must_fail git send-email --dry-run main 2>errors &&
 	grep disambiguate errors
 '
 
@@ -1184,7 +1258,7 @@ test_expect_success $PREREQ 'feed two files' '
 		outdir/000?-*.patch 2>errors >out &&
 	grep "^Subject: " out >subjects &&
 	test "z$(sed -n -e 1p subjects)" = "zSubject: [PATCH 1/2] Second." &&
-	test "z$(sed -n -e 2p subjects)" = "zSubject: [PATCH 2/2] add master"
+	test "z$(sed -n -e 2p subjects)" = "zSubject: [PATCH 2/2] add main"
 '
 
 test_expect_success $PREREQ 'in-reply-to but no threading' '
@@ -1194,8 +1268,8 @@ test_expect_success $PREREQ 'in-reply-to but no threading' '
 		--to=nobody@example.com \
 		--in-reply-to="<in-reply-id@example.com>" \
 		--no-thread \
-		$patches |
-	grep "In-Reply-To: <in-reply-id@example.com>"
+		$patches >out &&
+	grep "In-Reply-To: <in-reply-id@example.com>" out
 '
 
 test_expect_success $PREREQ 'no in-reply-to and no threading' '
@@ -1219,6 +1293,17 @@ test_expect_success $PREREQ 'threading but no chain-reply-to' '
 	grep "In-Reply-To: " stdout
 '
 
+test_expect_success $PREREQ 'override in-reply-to if no threading' '
+	git send-email \
+		--dry-run \
+		--from="Example <nobody@example.com>" \
+		--to=nobody@example.com \
+		--no-thread \
+		--in-reply-to="override" \
+		$threaded_patches >stdout &&
+	grep "In-Reply-To: <override>" stdout
+'
+
 test_expect_success $PREREQ 'sendemail.to works' '
 	git config --replace-all sendemail.to "Somebody <somebody@ex.com>" &&
 	git send-email \
@@ -1260,7 +1345,7 @@ test_expect_success $PREREQ 'sendemail.identity: --no-identity clears previous i
 	grep "To: default@example.com" stdout
 '
 
-test_expect_success $PREREQ 'sendemail.identity: bool identity variable existance overrides' '
+test_expect_success $PREREQ 'sendemail.identity: bool identity variable existence overrides' '
 	git -c sendemail.identity=cloud \
 		-c sendemail.xmailer=true \
 		-c sendemail.cloud.xmailer=false \
@@ -1283,6 +1368,16 @@ test_expect_success $PREREQ 'sendemail.identity: bool variable fallback' '
 	! grep "X-Mailer" stdout
 '
 
+test_expect_success $PREREQ 'sendemail.identity: bool variable without a value' '
+	git -c sendemail.xmailer \
+		send-email \
+		--dry-run \
+		--from="nobody@example.com" \
+		$patches >stdout &&
+	grep "To: default@example.com" stdout &&
+	grep "X-Mailer" stdout
+'
+
 test_expect_success $PREREQ '--no-to overrides sendemail.to' '
 	git send-email \
 		--dry-run \
@@ -1539,7 +1634,7 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=quoted-printab
 		--smtp-server="$(pwd)/fake.sendmail" \
 		email-using-8bit \
 		2>errors >out &&
-	sed '1,/^$/d' msgtxt1 >actual &&
+	sed "1,/^$/d" msgtxt1 >actual &&
 	test_cmp expected actual
 '
 
@@ -1556,7 +1651,7 @@ test_expect_success $PREREQ '8-bit and sendemail.transferencoding=base64' '
 		--smtp-server="$(pwd)/fake.sendmail" \
 		email-using-8bit \
 		2>errors >out &&
-	sed '1,/^$/d' msgtxt1 >actual &&
+	sed "1,/^$/d" msgtxt1 >actual &&
 	test_cmp expected actual
 '
 
@@ -1582,7 +1677,7 @@ test_expect_success $PREREQ 'convert from quoted-printable to base64' '
 		--smtp-server="$(pwd)/fake.sendmail" \
 		email-using-qp \
 		2>errors >out &&
-	sed '1,/^$/d' msgtxt1 >actual &&
+	sed "1,/^$/d" msgtxt1 >actual &&
 	test_cmp expected actual
 '
 
@@ -1612,7 +1707,7 @@ test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=quoted-printabl
 		--smtp-server="$(pwd)/fake.sendmail" \
 		email-using-crlf \
 		2>errors >out &&
-	sed '1,/^$/d' msgtxt1 >actual &&
+	sed "1,/^$/d" msgtxt1 >actual &&
 	test_cmp expected actual
 '
 
@@ -1629,7 +1724,7 @@ test_expect_success $PREREQ 'CRLF and sendemail.transferencoding=base64' '
 		--smtp-server="$(pwd)/fake.sendmail" \
 		email-using-crlf \
 		2>errors >out &&
-	sed '1,/^$/d' msgtxt1 >actual &&
+	sed "1,/^$/d" msgtxt1 >actual &&
 	test_cmp expected actual
 '
 
@@ -1744,7 +1839,7 @@ test_expect_success $PREREQ 'sendemail.aliasfiletype=mailrc' '
 	grep "^!somebody@example\.org!$" commandline1
 '
 
-test_expect_success $PREREQ 'sendemail.aliasfile=~/.mailrc' '
+test_expect_success $PREREQ 'sendemail.aliasesfile=~/.mailrc' '
 	clean_fake_sendmail &&
 	echo "alias sbd  someone@example.org" >"$HOME/.mailrc" &&
 	git config --replace-all sendemail.aliasesfile "~/.mailrc" &&
@@ -2007,6 +2102,18 @@ test_expect_success $PREREQ '--[no-]xmailer with sendemail.xmailer=true' '
 	do_xmailer_test 1 "--xmailer"
 '
 
+test_expect_success $PREREQ '--[no-]xmailer with sendemail.xmailer' '
+	test_when_finished "test_unconfig sendemail.xmailer" &&
+	cat >>.git/config <<-\EOF &&
+	[sendemail]
+		xmailer
+	EOF
+	test_config sendemail.xmailer true &&
+	do_xmailer_test 1 "" &&
+	do_xmailer_test 0 "--no-xmailer" &&
+	do_xmailer_test 1 "--xmailer"
+'
+
 test_expect_success $PREREQ '--[no-]xmailer with sendemail.xmailer=false' '
 	test_config sendemail.xmailer false &&
 	do_xmailer_test 0 "" &&
@@ -2014,6 +2121,13 @@ test_expect_success $PREREQ '--[no-]xmailer with sendemail.xmailer=false' '
 	do_xmailer_test 1 "--xmailer"
 '
 
+test_expect_success $PREREQ '--[no-]xmailer with sendemail.xmailer=' '
+	test_config sendemail.xmailer "" &&
+	do_xmailer_test 0 "" &&
+	do_xmailer_test 0 "--no-xmailer" &&
+	do_xmailer_test 1 "--xmailer"
+'
+
 test_expect_success $PREREQ 'setup expected-list' '
 	git send-email \
 	--dry-run \
@@ -2025,7 +2139,7 @@ test_expect_success $PREREQ 'setup expected-list' '
 	--cc="Cc2 <cc2@example.com>" \
 	--bcc="bcc1@example.com" \
 	--bcc="bcc2@example.com" \
-	0001-add-master.patch | replace_variable_fields \
+	0001-add-main.patch | replace_variable_fields \
 	>expected-list
 '
 
@@ -2037,7 +2151,7 @@ test_expect_success $PREREQ 'use email list in --cc --to and --bcc' '
 	--to="to3@example.com" \
 	--cc="Cc 1 <cc1@example.com>, Cc2 <cc2@example.com>" \
 	--bcc="bcc1@example.com, bcc2@example.com" \
-	0001-add-master.patch | replace_variable_fields \
+	0001-add-main.patch | replace_variable_fields \
 	>actual-list &&
 	test_cmp expected-list actual-list
 '
@@ -2053,7 +2167,7 @@ test_expect_success $PREREQ 'aliases work with email list' '
 	--to="To 1 <to1@example.com>, to2, to3@example.com" \
 	--cc="cc1, Cc2 <cc2@example.com>" \
 	--bcc="bcc1@example.com, bcc2@example.com" \
-	0001-add-master.patch | replace_variable_fields \
+	0001-add-main.patch | replace_variable_fields \
 	>actual-list &&
 	test_cmp expected-list actual-list
 '
@@ -2066,7 +2180,7 @@ test_expect_success $PREREQ 'leading and trailing whitespaces are removed' '
 	TO1=$(echo "QTo 1 <to1@example.com>" | q_to_tab) &&
 	TO2=$(echo "QZto2" | qz_to_tab_space) &&
 	CC1=$(echo "cc1" | append_cr) &&
-	BCC1=$(echo "Q bcc1@example.com Q" | q_to_nul) &&
+	BCC1=$(echo " bcc1@example.com Q" | q_to_nul) &&
 	git send-email \
 	--dry-run \
 	--from="	Example <from@example.com>" \
@@ -2077,11 +2191,42 @@ test_expect_success $PREREQ 'leading and trailing whitespaces are removed' '
 	--cc="Cc2 <cc2@example.com>" \
 	--bcc="$BCC1" \
 	--bcc="bcc2@example.com" \
-	0001-add-master.patch | replace_variable_fields \
+	0001-add-main.patch | replace_variable_fields \
 	>actual-list &&
 	test_cmp expected-list actual-list
 '
 
+test_expect_success $PREREQ 'test using command name with --sendmail-cmd' '
+	clean_fake_sendmail &&
+	PATH="$PWD:$PATH" \
+	git send-email \
+		--from="Example <nobody@example.com>" \
+		--to=nobody@example.com \
+		--sendmail-cmd="fake.sendmail" \
+		HEAD^ &&
+	test_path_is_file commandline1
+'
+
+test_expect_success $PREREQ 'test using arguments with --sendmail-cmd' '
+	clean_fake_sendmail &&
+	git send-email \
+		--from="Example <nobody@example.com>" \
+		--to=nobody@example.com \
+		--sendmail-cmd='\''"$(pwd)/fake.sendmail" -f nobody@example.com'\'' \
+		HEAD^ &&
+	test_path_is_file commandline1
+'
+
+test_expect_success $PREREQ 'test shell expression with --sendmail-cmd' '
+	clean_fake_sendmail &&
+	git send-email \
+		--from="Example <nobody@example.com>" \
+		--to=nobody@example.com \
+		--sendmail-cmd='\''f() { "$(pwd)/fake.sendmail" "$@"; };f'\'' \
+		HEAD^ &&
+	test_path_is_file commandline1
+'
+
 test_expect_success $PREREQ 'invoke hook' '
 	mkdir -p .git/hooks &&
 
@@ -2096,8 +2241,8 @@ test_expect_success $PREREQ 'invoke hook' '
 		false
 		;;
 	esac &&
-	test -f 0001-add-master.patch &&
-	grep "add master" "$1"
+	test -f 0001-add-main.patch &&
+	grep "add main" "$1"
 	EOF
 
 	mkdir subdir &&
@@ -2109,10 +2254,10 @@ test_expect_success $PREREQ 'invoke hook' '
 			--from="Example <nobody@example.com>" \
 			--to=nobody@example.com \
 			--smtp-server="$(pwd)/../fake.sendmail" \
-			../0001-add-master.patch &&
+			../0001-add-main.patch &&
 
 		# Verify error message when a patch is rejected by the hook
-		sed -e "s/add master/x/" ../0001-add-master.patch >../another.patch &&
+		sed -e "s/add main/x/" ../0001-add-main.patch >../another.patch &&
 		test_must_fail git send-email \
 			--from="Example <nobody@example.com>" \
 			--to=nobody@example.com \
@@ -2127,7 +2272,36 @@ test_expect_success $PREREQ 'test that send-email works outside a repo' '
 		--from="Example <nobody@example.com>" \
 		--to=nobody@example.com \
 		--smtp-server="$(pwd)/fake.sendmail" \
-		"$(pwd)/0001-add-master.patch"
+		"$(pwd)/0001-add-main.patch"
+'
+
+test_expect_success $PREREQ 'test that sendmail config is rejected' '
+	test_config sendmail.program sendmail &&
+	test_must_fail git send-email \
+		--from="Example <nobody@example.com>" \
+		--to=nobody@example.com \
+		--smtp-server="$(pwd)/fake.sendmail" \
+		HEAD^ 2>err &&
+	test_i18ngrep "found configuration options for '"'"sendmail"'"'" err
+'
+
+test_expect_success $PREREQ 'test that sendmail config rejection is specific' '
+	test_config resendmail.program sendmail &&
+	git send-email \
+		--from="Example <nobody@example.com>" \
+		--to=nobody@example.com \
+		--smtp-server="$(pwd)/fake.sendmail" \
+		HEAD^
+'
+
+test_expect_success $PREREQ 'test forbidSendmailVariables behavior override' '
+	test_config sendmail.program sendmail &&
+	test_config sendemail.forbidSendmailVariables false &&
+	git send-email \
+		--from="Example <nobody@example.com>" \
+		--to=nobody@example.com \
+		--smtp-server="$(pwd)/fake.sendmail" \
+		HEAD^
 '
 
 test_done
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/t9003-help-autocorrect.sh b/t/t9003-help-autocorrect.sh
index b1c7919c4a..f00deaf381 100755
--- a/t/t9003-help-autocorrect.sh
+++ b/t/t9003-help-autocorrect.sh
@@ -37,16 +37,27 @@ test_expect_success 'autocorrect showing candidates' '
 	grep "^	distimdistim" actual
 '
 
-test_expect_success 'autocorrect running commands' '
-	git config help.autocorrect -1 &&
+for immediate in -1 immediate
+do
+	test_expect_success 'autocorrect running commands' '
+		git config help.autocorrect $immediate &&
 
-	git lfg >actual &&
-	echo "a single log entry" >expect &&
-	test_cmp expect actual &&
+		git lfg >actual &&
+		echo "a single log entry" >expect &&
+		test_cmp expect actual &&
 
-	git distimdist >actual &&
-	echo "distimdistim was called" >expect &&
-	test_cmp expect actual
+		git distimdist >actual &&
+		echo "distimdistim was called" >expect &&
+		test_cmp expect actual
+	'
+done
+
+test_expect_success 'autocorrect can be declined altogether' '
+	git config help.autocorrect never &&
+
+	test_must_fail git lfg 2>actual &&
+	grep "is not a git command" actual &&
+	test_line_count = 1 actual
 '
 
 test_done
diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
deleted file mode 100755
index 0b20b07e68..0000000000
--- a/t/t9010-svn-fe.sh
+++ /dev/null
@@ -1,1107 +0,0 @@
-#!/bin/sh
-
-test_description='check svn dumpfile importer'
-
-. ./test-lib.sh
-
-if test_have_prereq !PIPE
-then
-	skip_all="svn dumpfile importer testing requires the PIPE prerequisite"
-	test_done
-fi
-
-reinit_git () {
-	rm -fr .git &&
-	rm -f stream backflow &&
-	git init &&
-	mkfifo stream backflow
-}
-
-try_dump () {
-	input=$1 &&
-	maybe_fail_svnfe=${2:+test_$2} &&
-	maybe_fail_fi=${3:+test_$3} &&
-
-	{
-		$maybe_fail_svnfe test-svn-fe "$input" >stream 3<backflow &
-	} &&
-	$maybe_fail_fi git fast-import --cat-blob-fd=3 <stream 3>backflow &&
-	wait $!
-}
-
-properties () {
-	while test "$#" -ne 0
-	do
-		property="$1" &&
-		value="$2" &&
-		printf "%s\n" "K ${#property}" &&
-		printf "%s\n" "$property" &&
-		printf "%s\n" "V ${#value}" &&
-		printf "%s\n" "$value" &&
-		shift 2 ||
-		return 1
-	done
-}
-
-text_no_props () {
-	text="$1
-" &&
-	printf "%s\n" "Prop-content-length: 10" &&
-	printf "%s\n" "Text-content-length: ${#text}" &&
-	printf "%s\n" "Content-length: $((${#text} + 10))" &&
-	printf "%s\n" "" "PROPS-END" &&
-	printf "%s\n" "$text"
-}
-
->empty
-
-test_expect_success 'empty dump' '
-	reinit_git &&
-	echo "SVN-fs-dump-format-version: 2" >input &&
-	try_dump input
-'
-
-test_expect_success 'v4 dumps not supported' '
-	reinit_git &&
-	echo "SVN-fs-dump-format-version: 4" >v4.dump &&
-	try_dump v4.dump must_fail
-'
-
-test_expect_failure 'empty revision' '
-	reinit_git &&
-	printf "rev <nobody, nobody@local>: %s\n" "" "" >expect &&
-	cat >emptyrev.dump <<-\EOF &&
-	SVN-fs-dump-format-version: 3
-
-	Revision-number: 1
-	Prop-content-length: 0
-	Content-length: 0
-
-	Revision-number: 2
-	Prop-content-length: 0
-	Content-length: 0
-
-	EOF
-	try_dump emptyrev.dump &&
-	git log -p --format="rev <%an, %ae>: %s" HEAD >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'empty properties' '
-	reinit_git &&
-	printf "rev <nobody, nobody@local>: %s\n" "" "" >expect &&
-	cat >emptyprop.dump <<-\EOF &&
-	SVN-fs-dump-format-version: 3
-
-	Revision-number: 1
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Revision-number: 2
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-	EOF
-	try_dump emptyprop.dump &&
-	git log -p --format="rev <%an, %ae>: %s" HEAD >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'author name and commit message' '
-	reinit_git &&
-	echo "<author@example.com, author@example.com@local>" >expect.author &&
-	cat >message <<-\EOF &&
-	A concise summary of the change
-
-	A detailed description of the change, why it is needed, what
-	was broken and why applying this is the best course of action.
-
-	* file.c
-	    Details pertaining to an individual file.
-	EOF
-	{
-		properties \
-			svn:author author@example.com \
-			svn:log "$(cat message)" &&
-		echo PROPS-END
-	} >props &&
-	{
-		echo "SVN-fs-dump-format-version: 3" &&
-		echo &&
-		echo "Revision-number: 1" &&
-		echo Prop-content-length: $(wc -c <props) &&
-		echo Content-length: $(wc -c <props) &&
-		echo &&
-		cat props
-	} >log.dump &&
-	try_dump log.dump &&
-	git log -p --format="%B" HEAD >actual.log &&
-	git log --format="<%an, %ae>" >actual.author &&
-	test_cmp message actual.log &&
-	test_cmp expect.author actual.author
-'
-
-test_expect_success 'unsupported properties are ignored' '
-	reinit_git &&
-	echo author >expect &&
-	cat >extraprop.dump <<-\EOF &&
-	SVN-fs-dump-format-version: 3
-
-	Revision-number: 1
-	Prop-content-length: 56
-	Content-length: 56
-
-	K 8
-	nonsense
-	V 1
-	y
-	K 10
-	svn:author
-	V 6
-	author
-	PROPS-END
-	EOF
-	try_dump extraprop.dump &&
-	git log -p --format=%an HEAD >actual &&
-	test_cmp expect actual
-'
-
-test_expect_failure 'timestamp and empty file' '
-	echo author@example.com >expect.author &&
-	echo 1999-01-01 >expect.date &&
-	echo file >expect.files &&
-	reinit_git &&
-	{
-		properties \
-			svn:author author@example.com \
-			svn:date "1999-01-01T00:01:002.000000Z" \
-			svn:log "add empty file" &&
-		echo PROPS-END
-	} >props &&
-	{
-		cat <<-EOF &&
-		SVN-fs-dump-format-version: 3
-
-		Revision-number: 1
-		EOF
-		echo Prop-content-length: $(wc -c <props) &&
-		echo Content-length: $(wc -c <props) &&
-		echo &&
-		cat props &&
-		cat <<-\EOF
-
-		Node-path: empty-file
-		Node-kind: file
-		Node-action: add
-		Content-length: 0
-
-		EOF
-	} >emptyfile.dump &&
-	try_dump emptyfile.dump &&
-	git log --format=%an HEAD >actual.author &&
-	git log --date=short --format=%ad HEAD >actual.date &&
-	git ls-tree -r --name-only HEAD >actual.files &&
-	test_cmp expect.author actual.author &&
-	test_cmp expect.date actual.date &&
-	test_cmp expect.files actual.files &&
-	git checkout HEAD empty-file &&
-	test_cmp empty file
-'
-
-test_expect_success 'directory with files' '
-	reinit_git &&
-	printf "%s\n" directory/file1 directory/file2 >expect.files &&
-	echo hi >hi &&
-	echo hello >hello &&
-	{
-		properties \
-			svn:author author@example.com \
-			svn:date "1999-02-01T00:01:002.000000Z" \
-			svn:log "add directory with some files in it" &&
-		echo PROPS-END
-	} >props &&
-	{
-		cat <<-EOF &&
-		SVN-fs-dump-format-version: 3
-
-		Revision-number: 1
-		EOF
-		echo Prop-content-length: $(wc -c <props) &&
-		echo Content-length: $(wc -c <props) &&
-		echo &&
-		cat props &&
-		cat <<-\EOF &&
-
-		Node-path: directory
-		Node-kind: dir
-		Node-action: add
-		Prop-content-length: 10
-		Content-length: 10
-
-		PROPS-END
-
-		Node-path: directory/file1
-		Node-kind: file
-		Node-action: add
-		EOF
-		text_no_props hello &&
-		cat <<-\EOF &&
-		Node-path: directory/file2
-		Node-kind: file
-		Node-action: add
-		EOF
-		text_no_props hi
-	} >directory.dump &&
-	try_dump directory.dump &&
-
-	git ls-tree -r --name-only HEAD >actual.files &&
-	git checkout HEAD directory &&
-	test_cmp expect.files actual.files &&
-	test_cmp hello directory/file1 &&
-	test_cmp hi directory/file2
-'
-
-test_expect_success 'branch name with backslash' '
-	reinit_git &&
-	sort <<-\EOF >expect.branch-files &&
-	trunk/file1
-	trunk/file2
-	"branches/UpdateFOPto094\\/file1"
-	"branches/UpdateFOPto094\\/file2"
-	EOF
-
-	echo hi >hi &&
-	echo hello >hello &&
-	{
-		properties \
-			svn:author author@example.com \
-			svn:date "1999-02-02T00:01:02.000000Z" \
-			svn:log "add directory with some files in it" &&
-		echo PROPS-END
-	} >props.setup &&
-	{
-		properties \
-			svn:author brancher@example.com \
-			svn:date "2007-12-06T21:38:34.000000Z" \
-			svn:log "Updating fop to .94 and adjust fo-stylesheets" &&
-		echo PROPS-END
-	} >props.branch &&
-	{
-		cat <<-EOF &&
-		SVN-fs-dump-format-version: 3
-
-		Revision-number: 1
-		EOF
-		echo Prop-content-length: $(wc -c <props.setup) &&
-		echo Content-length: $(wc -c <props.setup) &&
-		echo &&
-		cat props.setup &&
-		cat <<-\EOF &&
-
-		Node-path: trunk
-		Node-kind: dir
-		Node-action: add
-		Prop-content-length: 10
-		Content-length: 10
-
-		PROPS-END
-
-		Node-path: branches
-		Node-kind: dir
-		Node-action: add
-		Prop-content-length: 10
-		Content-length: 10
-
-		PROPS-END
-
-		Node-path: trunk/file1
-		Node-kind: file
-		Node-action: add
-		EOF
-		text_no_props hello &&
-		cat <<-\EOF &&
-		Node-path: trunk/file2
-		Node-kind: file
-		Node-action: add
-		EOF
-		text_no_props hi &&
-		cat <<-\EOF &&
-
-		Revision-number: 2
-		EOF
-		echo Prop-content-length: $(wc -c <props.branch) &&
-		echo Content-length: $(wc -c <props.branch) &&
-		echo &&
-		cat props.branch &&
-		cat <<-\EOF
-
-		Node-path: branches/UpdateFOPto094\
-		Node-kind: dir
-		Node-action: add
-		Node-copyfrom-rev: 1
-		Node-copyfrom-path: trunk
-
-		Node-kind: dir
-		Node-action: add
-		Prop-content-length: 34
-		Content-length: 34
-
-		K 13
-		svn:mergeinfo
-		V 0
-
-		PROPS-END
-		EOF
-	} >branch.dump &&
-	try_dump branch.dump &&
-
-	git ls-tree -r --name-only HEAD |
-	sort >actual.branch-files &&
-	test_cmp expect.branch-files actual.branch-files
-'
-
-test_expect_success 'node without action' '
-	reinit_git &&
-	cat >inaction.dump <<-\EOF &&
-	SVN-fs-dump-format-version: 3
-
-	Revision-number: 1
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: directory
-	Node-kind: dir
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-	EOF
-	try_dump inaction.dump must_fail
-'
-
-test_expect_success 'action: add node without text' '
-	reinit_git &&
-	cat >textless.dump <<-\EOF &&
-	SVN-fs-dump-format-version: 3
-
-	Revision-number: 1
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: textless
-	Node-kind: file
-	Node-action: add
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-	EOF
-	try_dump textless.dump must_fail
-'
-
-test_expect_failure 'change file mode but keep old content' '
-	reinit_git &&
-	cat >expect <<-\EOF &&
-	OBJID
-	:120000 100644 OBJID OBJID T	greeting
-	OBJID
-	:100644 120000 OBJID OBJID T	greeting
-	OBJID
-	:000000 100644 OBJID OBJID A	greeting
-	EOF
-	echo "link hello" >expect.blob &&
-	echo hello >hello &&
-	cat >filemode.dump <<-\EOF &&
-	SVN-fs-dump-format-version: 3
-
-	Revision-number: 1
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: greeting
-	Node-kind: file
-	Node-action: add
-	Prop-content-length: 10
-	Text-content-length: 11
-	Content-length: 21
-
-	PROPS-END
-	link hello
-
-	Revision-number: 2
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: greeting
-	Node-kind: file
-	Node-action: change
-	Prop-content-length: 33
-	Content-length: 33
-
-	K 11
-	svn:special
-	V 1
-	*
-	PROPS-END
-
-	Revision-number: 3
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: greeting
-	Node-kind: file
-	Node-action: change
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-	EOF
-	try_dump filemode.dump &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual &&
-	git show HEAD:greeting >actual.blob &&
-	git show HEAD^:greeting >actual.target &&
-	test_cmp expect actual &&
-	test_cmp expect.blob actual.blob &&
-	test_cmp hello actual.target
-'
-
-test_expect_success 'NUL in property value' '
-	reinit_git &&
-	echo "commit message" >expect.message &&
-	{
-		properties \
-			unimportant "something with a NUL (Q)" \
-			svn:log "commit message"&&
-		echo PROPS-END
-	} |
-	q_to_nul >props &&
-	{
-		cat <<-\EOF &&
-		SVN-fs-dump-format-version: 3
-
-		Revision-number: 1
-		EOF
-		echo Prop-content-length: $(wc -c <props) &&
-		echo Content-length: $(wc -c <props) &&
-		echo &&
-		cat props
-	} >nulprop.dump &&
-	try_dump nulprop.dump &&
-	git diff-tree --always -s --format=%s HEAD >actual.message &&
-	test_cmp expect.message actual.message
-'
-
-test_expect_success 'NUL in log message, file content, and property name' '
-	# Caveat: svnadmin 1.6.16 (r1073529) truncates at \0 in the
-	# svn:specialQnotreally example.
-	reinit_git &&
-	cat >expect <<-\EOF &&
-	OBJID
-	:100644 100644 OBJID OBJID M	greeting
-	OBJID
-	:000000 100644 OBJID OBJID A	greeting
-	EOF
-	printf "\n%s\n" "something with an ASCII NUL (Q)" >expect.message &&
-	printf "%s\n" "helQo" >expect.hello1 &&
-	printf "%s\n" "link hello" >expect.hello2 &&
-	{
-		properties svn:log "something with an ASCII NUL (Q)" &&
-		echo PROPS-END
-	} |
-	q_to_nul >props &&
-	{
-		q_to_nul <<-\EOF &&
-		SVN-fs-dump-format-version: 3
-
-		Revision-number: 1
-		Prop-content-length: 10
-		Content-length: 10
-
-		PROPS-END
-
-		Node-path: greeting
-		Node-kind: file
-		Node-action: add
-		Prop-content-length: 10
-		Text-content-length: 6
-		Content-length: 16
-
-		PROPS-END
-		helQo
-
-		Revision-number: 2
-		EOF
-		echo Prop-content-length: $(wc -c <props) &&
-		echo Content-length: $(wc -c <props) &&
-		echo &&
-		cat props &&
-		q_to_nul <<-\EOF
-
-		Node-path: greeting
-		Node-kind: file
-		Node-action: change
-		Prop-content-length: 43
-		Text-content-length: 11
-		Content-length: 54
-
-		K 21
-		svn:specialQnotreally
-		V 1
-		*
-		PROPS-END
-		link hello
-		EOF
-	} >8bitclean.dump &&
-	try_dump 8bitclean.dump &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual &&
-	{
-		git cat-file commit HEAD | nul_to_q &&
-		echo
-	} |
-	sed -ne "/^\$/,\$ p" >actual.message &&
-	git cat-file blob HEAD^:greeting | nul_to_q >actual.hello1 &&
-	git cat-file blob HEAD:greeting | nul_to_q >actual.hello2 &&
-	test_cmp expect actual &&
-	test_cmp expect.message actual.message &&
-	test_cmp expect.hello1 actual.hello1 &&
-	test_cmp expect.hello2 actual.hello2
-'
-
-test_expect_success 'change file mode and reiterate content' '
-	reinit_git &&
-	cat >expect <<-\EOF &&
-	OBJID
-	:120000 100644 OBJID OBJID T	greeting
-	OBJID
-	:100644 120000 OBJID OBJID T	greeting
-	OBJID
-	:000000 100644 OBJID OBJID A	greeting
-	EOF
-	echo "link hello" >expect.blob &&
-	echo hello >hello &&
-	cat >filemode2.dump <<-\EOF &&
-	SVN-fs-dump-format-version: 3
-
-	Revision-number: 1
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: greeting
-	Node-kind: file
-	Node-action: add
-	Prop-content-length: 10
-	Text-content-length: 11
-	Content-length: 21
-
-	PROPS-END
-	link hello
-
-	Revision-number: 2
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: greeting
-	Node-kind: file
-	Node-action: change
-	Prop-content-length: 33
-	Text-content-length: 11
-	Content-length: 44
-
-	K 11
-	svn:special
-	V 1
-	*
-	PROPS-END
-	link hello
-
-	Revision-number: 3
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: greeting
-	Node-kind: file
-	Node-action: change
-	Prop-content-length: 10
-	Text-content-length: 11
-	Content-length: 21
-
-	PROPS-END
-	link hello
-	EOF
-	try_dump filemode2.dump &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual &&
-	git show HEAD:greeting >actual.blob &&
-	git show HEAD^:greeting >actual.target &&
-	test_cmp expect actual &&
-	test_cmp expect.blob actual.blob &&
-	test_cmp hello actual.target
-'
-
-test_expect_success 'deltas supported' '
-	reinit_git &&
-	{
-		# (old) h + (inline) ello + (old) \n
-		printf "SVNQ%b%b%s" "Q\003\006\005\004" "\001Q\0204\001\002" "ello" |
-		q_to_nul
-	} >delta &&
-	{
-		properties \
-			svn:author author@example.com \
-			svn:date "1999-01-05T00:01:002.000000Z" \
-			svn:log "add greeting" &&
-		echo PROPS-END
-	} >props &&
-	{
-		properties \
-			svn:author author@example.com \
-			svn:date "1999-01-06T00:01:002.000000Z" \
-			svn:log "change it" &&
-		echo PROPS-END
-	} >props2 &&
-	{
-		echo SVN-fs-dump-format-version: 3 &&
-		echo &&
-		echo Revision-number: 1 &&
-		echo Prop-content-length: $(wc -c <props) &&
-		echo Content-length: $(wc -c <props) &&
-		echo &&
-		cat props &&
-		cat <<-\EOF &&
-
-		Node-path: hello
-		Node-kind: file
-		Node-action: add
-		Prop-content-length: 10
-		Text-content-length: 3
-		Content-length: 13
-
-		PROPS-END
-		hi
-
-		EOF
-		echo Revision-number: 2 &&
-		echo Prop-content-length: $(wc -c <props2) &&
-		echo Content-length: $(wc -c <props2) &&
-		echo &&
-		cat props2 &&
-		cat <<-\EOF &&
-
-		Node-path: hello
-		Node-kind: file
-		Node-action: change
-		Text-delta: true
-		Prop-content-length: 10
-		EOF
-		echo Text-content-length: $(wc -c <delta) &&
-		echo Content-length: $((10 + $(wc -c <delta))) &&
-		echo &&
-		echo PROPS-END &&
-		cat delta
-	} >delta.dump &&
-	try_dump delta.dump
-'
-
-test_expect_success 'property deltas supported' '
-	reinit_git &&
-	cat >expect <<-\EOF &&
-	OBJID
-	:100755 100644 OBJID OBJID M	script.sh
-	EOF
-	{
-		properties \
-			svn:author author@example.com \
-			svn:date "1999-03-06T00:01:002.000000Z" \
-			svn:log "make an executable, or chmod -x it" &&
-		echo PROPS-END
-	} >revprops &&
-	{
-		echo SVN-fs-dump-format-version: 3 &&
-		echo &&
-		echo Revision-number: 1 &&
-		echo Prop-content-length: $(wc -c <revprops) &&
-		echo Content-length: $(wc -c <revprops) &&
-		echo &&
-		cat revprops &&
-		echo &&
-		cat <<-\EOF &&
-		Node-path: script.sh
-		Node-kind: file
-		Node-action: add
-		Text-content-length: 0
-		Prop-content-length: 39
-		Content-length: 39
-
-		K 14
-		svn:executable
-		V 4
-		true
-		PROPS-END
-
-		EOF
-		echo Revision-number: 2 &&
-		echo Prop-content-length: $(wc -c <revprops) &&
-		echo Content-length: $(wc -c <revprops) &&
-		echo &&
-		cat revprops &&
-		echo &&
-		cat <<-\EOF
-		Node-path: script.sh
-		Node-kind: file
-		Node-action: change
-		Prop-delta: true
-		Prop-content-length: 30
-		Content-length: 30
-
-		D 14
-		svn:executable
-		PROPS-END
-		EOF
-	} >propdelta.dump &&
-	try_dump propdelta.dump &&
-	{
-		git rev-list HEAD |
-		git diff-tree --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'properties on /' '
-	reinit_git &&
-	cat <<-\EOF >expect &&
-	OBJID
-	OBJID
-	:000000 100644 OBJID OBJID A	greeting
-	EOF
-	sed -e "s/X$//" <<-\EOF >changeroot.dump &&
-	SVN-fs-dump-format-version: 3
-
-	Revision-number: 1
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: greeting
-	Node-kind: file
-	Node-action: add
-	Text-content-length: 0
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Revision-number: 2
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: X
-	Node-kind: dir
-	Node-action: change
-	Prop-delta: true
-	Prop-content-length: 43
-	Content-length: 43
-
-	K 10
-	svn:ignore
-	V 11
-	build-area
-
-	PROPS-END
-	EOF
-	try_dump changeroot.dump &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --always --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'deltas for typechange' '
-	reinit_git &&
-	cat >expect <<-\EOF &&
-	OBJID
-	:120000 100644 OBJID OBJID T	test-file
-	OBJID
-	:100755 120000 OBJID OBJID T	test-file
-	OBJID
-	:000000 100755 OBJID OBJID A	test-file
-	EOF
-	cat >deleteprop.dump <<-\EOF &&
-	SVN-fs-dump-format-version: 3
-
-	Revision-number: 1
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: test-file
-	Node-kind: file
-	Node-action: add
-	Prop-delta: true
-	Prop-content-length: 35
-	Text-content-length: 17
-	Content-length: 52
-
-	K 14
-	svn:executable
-	V 0
-
-	PROPS-END
-	link testing 123
-
-	Revision-number: 2
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: test-file
-	Node-kind: file
-	Node-action: change
-	Prop-delta: true
-	Prop-content-length: 53
-	Text-content-length: 17
-	Content-length: 70
-
-	K 11
-	svn:special
-	V 1
-	*
-	D 14
-	svn:executable
-	PROPS-END
-	link testing 231
-
-	Revision-number: 3
-	Prop-content-length: 10
-	Content-length: 10
-
-	PROPS-END
-
-	Node-path: test-file
-	Node-kind: file
-	Node-action: change
-	Prop-delta: true
-	Prop-content-length: 27
-	Text-content-length: 17
-	Content-length: 44
-
-	D 11
-	svn:special
-	PROPS-END
-	link testing 321
-	EOF
-	try_dump deleteprop.dump &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'deltas need not consume the whole preimage' '
-	reinit_git &&
-	cat >expect <<-\EOF &&
-	OBJID
-	:120000 100644 OBJID OBJID T	postimage
-	OBJID
-	:100644 120000 OBJID OBJID T	postimage
-	OBJID
-	:000000 100644 OBJID OBJID A	postimage
-	EOF
-	echo "first preimage" >expect.1 &&
-	printf target >expect.2 &&
-	printf lnk >expect.3 &&
-	{
-		printf "SVNQ%b%b%b" "QQ\017\001\017" "\0217" "first preimage\n" |
-		q_to_nul
-	} >delta.1 &&
-	{
-		properties svn:special "*" &&
-		echo PROPS-END
-	} >symlink.props &&
-	{
-		printf "SVNQ%b%b%b" "Q\002\013\004\012" "\0201\001\001\0211" "lnk target" |
-		q_to_nul
-	} >delta.2 &&
-	{
-		printf "SVNQ%b%b" "Q\004\003\004Q" "\001Q\002\002" |
-		q_to_nul
-	} >delta.3 &&
-	{
-		cat <<-\EOF &&
-		SVN-fs-dump-format-version: 3
-
-		Revision-number: 1
-		Prop-content-length: 10
-		Content-length: 10
-
-		PROPS-END
-
-		Node-path: postimage
-		Node-kind: file
-		Node-action: add
-		Text-delta: true
-		Prop-content-length: 10
-		EOF
-		echo Text-content-length: $(wc -c <delta.1) &&
-		echo Content-length: $((10 + $(wc -c <delta.1))) &&
-		echo &&
-		echo PROPS-END &&
-		cat delta.1 &&
-		cat <<-\EOF &&
-
-		Revision-number: 2
-		Prop-content-length: 10
-		Content-length: 10
-
-		PROPS-END
-
-		Node-path: postimage
-		Node-kind: file
-		Node-action: change
-		Text-delta: true
-		EOF
-		echo Prop-content-length: $(wc -c <symlink.props) &&
-		echo Text-content-length: $(wc -c <delta.2) &&
-		echo Content-length: $(($(wc -c <symlink.props) + $(wc -c <delta.2))) &&
-		echo &&
-		cat symlink.props &&
-		cat delta.2 &&
-		cat <<-\EOF &&
-
-		Revision-number: 3
-		Prop-content-length: 10
-		Content-length: 10
-
-		PROPS-END
-
-		Node-path: postimage
-		Node-kind: file
-		Node-action: change
-		Text-delta: true
-		Prop-content-length: 10
-		EOF
-		echo Text-content-length: $(wc -c <delta.3) &&
-		echo Content-length: $((10 + $(wc -c <delta.3))) &&
-		echo &&
-		echo PROPS-END &&
-		cat delta.3 &&
-		echo
-	} >deltapartial.dump &&
-	try_dump deltapartial.dump &&
-	{
-		git rev-list HEAD |
-		git diff-tree --root --stdin |
-		sed "s/$OID_REGEX/OBJID/g"
-	} >actual &&
-	test_cmp expect actual &&
-	git show HEAD:postimage >actual.3 &&
-	git show HEAD^:postimage >actual.2 &&
-	git show HEAD^^:postimage >actual.1 &&
-	test_cmp expect.1 actual.1 &&
-	test_cmp expect.2 actual.2 &&
-	test_cmp expect.3 actual.3
-'
-
-test_expect_success 'no hang for delta trying to read past end of preimage' '
-	reinit_git &&
-	{
-		# COPY 1
-		printf "SVNQ%b%b" "Q\001\001\002Q" "\001Q" |
-		q_to_nul
-	} >greedy.delta &&
-	{
-		cat <<-\EOF &&
-		SVN-fs-dump-format-version: 3
-
-		Revision-number: 1
-		Prop-content-length: 10
-		Content-length: 10
-
-		PROPS-END
-
-		Node-path: bootstrap
-		Node-kind: file
-		Node-action: add
-		Text-delta: true
-		Prop-content-length: 10
-		EOF
-		echo Text-content-length: $(wc -c <greedy.delta) &&
-		echo Content-length: $((10 + $(wc -c <greedy.delta))) &&
-		echo &&
-		echo PROPS-END &&
-		cat greedy.delta &&
-		echo
-	} >greedydelta.dump &&
-	try_dump greedydelta.dump must_fail might_fail
-'
-
-test_expect_success 'set up svn repo' '
-	svnconf=$PWD/svnconf &&
-	mkdir -p "$svnconf" &&
-
-	if
-		svnadmin -h >/dev/null 2>&1 &&
-		svnadmin create simple-svn &&
-		svnadmin load simple-svn <"$TEST_DIRECTORY/t9135/svn.dump" &&
-		svn export --config-dir "$svnconf" "file://$PWD/simple-svn" simple-svnco
-	then
-		test_set_prereq SVNREPO
-	fi
-'
-
-test_expect_success SVNREPO 't9135/svn.dump' '
-	mkdir -p simple-git &&
-	(
-		cd simple-git &&
-		reinit_git &&
-		try_dump "$TEST_DIRECTORY/t9135/svn.dump"
-	) &&
-	(
-		cd simple-svnco &&
-		git init &&
-		git add . &&
-		git fetch ../simple-git master &&
-		git diff --exit-code FETCH_HEAD
-	)
-'
-
-test_done
diff --git a/t/t9011-svn-da.sh b/t/t9011-svn-da.sh
deleted file mode 100755
index ab1ef28fd9..0000000000
--- a/t/t9011-svn-da.sh
+++ /dev/null
@@ -1,248 +0,0 @@
-#!/bin/sh
-
-test_description='test parsing of svndiff0 files
-
-Using the "test-svn-fe -d" helper, check that svn-fe correctly
-interprets deltas using various facilities (some from the spec,
-some only learned from practice).
-'
-. ./test-lib.sh
-
->empty
-printf foo >preimage
-
-test_expect_success 'reject empty delta' '
-	test_must_fail test-svn-fe -d preimage empty 0
-'
-
-test_expect_success 'delta can empty file' '
-	printf "SVNQ" | q_to_nul >clear.delta &&
-	test-svn-fe -d preimage clear.delta 4 >actual &&
-	test_must_be_empty actual
-'
-
-test_expect_success 'reject svndiff2' '
-	printf "SVN\002" >bad.filetype &&
-	test_must_fail test-svn-fe -d preimage bad.filetype 4
-'
-
-test_expect_success 'one-window empty delta' '
-	printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow &&
-	test-svn-fe -d preimage clear.onewindow 9 >actual &&
-	test_must_be_empty actual
-'
-
-test_expect_success 'reject incomplete window header' '
-	printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow &&
-	printf "SVNQ%s" "QQ" | q_to_nul >clear.partialwindow &&
-	test_must_fail test-svn-fe -d preimage clear.onewindow 6 &&
-	test_must_fail test-svn-fe -d preimage clear.partialwindow 6
-'
-
-test_expect_success 'reject declared delta longer than actual delta' '
-	printf "SVNQ%s" "QQQQQ" | q_to_nul >clear.onewindow &&
-	printf "SVNQ%s" "QQ" | q_to_nul >clear.partialwindow &&
-	test_must_fail test-svn-fe -d preimage clear.onewindow 14 &&
-	test_must_fail test-svn-fe -d preimage clear.partialwindow 9
-'
-
-test_expect_success 'two-window empty delta' '
-	printf "SVNQ%s%s" "QQQQQ" "QQQQQ" | q_to_nul >clear.twowindow &&
-	test-svn-fe -d preimage clear.twowindow 14 >actual &&
-	test_must_fail test-svn-fe -d preimage clear.twowindow 13 &&
-	test_must_be_empty actual
-'
-
-test_expect_success 'noisy zeroes' '
-	printf "SVNQ%s" \
-		"RRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRRQQQQQ" |
-		tr R "\200" |
-		q_to_nul >clear.noisy &&
-	len=$(wc -c <clear.noisy) &&
-	test-svn-fe -d preimage clear.noisy $len &&
-	test_must_be_empty actual
-'
-
-test_expect_success 'reject variable-length int in magic' '
-	printf "SVNRQ" | tr R "\200" | q_to_nul >clear.badmagic &&
-	test_must_fail test-svn-fe -d preimage clear.badmagic 5
-'
-
-test_expect_success 'reject truncated integer' '
-	printf "SVNQ%s%s" "QQQQQ" "QQQQRRQ" |
-		tr R "\200" |
-		q_to_nul >clear.fullint &&
-	printf "SVNQ%s%s" "QQQQQ" "QQQQRR" |
-		tr RT "\201" |
-		q_to_nul >clear.partialint &&
-	test_must_fail test-svn-fe -d preimage clear.fullint 15 &&
-	test-svn-fe -d preimage clear.fullint 16 &&
-	test_must_fail test-svn-fe -d preimage clear.partialint 15
-'
-
-test_expect_success 'nonempty (but unused) preimage view' '
-	printf "SVNQ%b" "Q\003QQQ" | q_to_nul >clear.readpreimage &&
-	test-svn-fe -d preimage clear.readpreimage 9 >actual &&
-	test_must_be_empty actual
-'
-
-test_expect_success 'preimage view: right endpoint cannot backtrack' '
-	printf "SVNQ%b%b" "Q\003QQQ" "Q\002QQQ" |
-		q_to_nul >clear.backtrack &&
-	test_must_fail test-svn-fe -d preimage clear.backtrack 14
-'
-
-test_expect_success 'preimage view: left endpoint can advance' '
-	printf "SVNQ%b%b" "Q\003QQQ" "\001\002QQQ" |
-		q_to_nul >clear.preshrink &&
-	printf "SVNQ%b%b" "Q\003QQQ" "\001\001QQQ" |
-		q_to_nul >clear.shrinkbacktrack &&
-	test-svn-fe -d preimage clear.preshrink 14 >actual &&
-	test_must_fail test-svn-fe -d preimage clear.shrinkbacktrack 14 &&
-	test_must_be_empty actual
-'
-
-test_expect_success 'preimage view: offsets compared by value' '
-	printf "SVNQ%b%b" "\001\001QQQ" "\0200Q\003QQQ" |
-		q_to_nul >clear.noisybacktrack &&
-	printf "SVNQ%b%b" "\001\001QQQ" "\0200\001\002QQQ" |
-		q_to_nul >clear.noisyadvance &&
-	test_must_fail test-svn-fe -d preimage clear.noisybacktrack 15 &&
-	test-svn-fe -d preimage clear.noisyadvance 15 &&
-	test_must_be_empty actual
-'
-
-test_expect_success 'preimage view: reject truncated preimage' '
-	printf "SVNQ%b" "\010QQQQ" | q_to_nul >clear.lateemptyread &&
-	printf "SVNQ%b" "\010\001QQQ" | q_to_nul >clear.latenonemptyread &&
-	printf "SVNQ%b" "\001\010QQQ" | q_to_nul >clear.longread &&
-	test_must_fail test-svn-fe -d preimage clear.lateemptyread 9 &&
-	test_must_fail test-svn-fe -d preimage clear.latenonemptyread 9 &&
-	test_must_fail test-svn-fe -d preimage clear.longread 9
-'
-
-test_expect_success 'forbid unconsumed inline data' '
-	printf "SVNQ%b%s%b%s" "QQQQ\003" "bar" "QQQQ\001" "x" |
-		q_to_nul >inline.clear &&
-	test_must_fail test-svn-fe -d preimage inline.clear 18 >actual
-'
-
-test_expect_success 'reject truncated inline data' '
-	printf "SVNQ%b%s" "QQQQ\003" "b" | q_to_nul >inline.trunc &&
-	test_must_fail test-svn-fe -d preimage inline.trunc 10
-'
-
-test_expect_success 'reject truncated inline data (after instruction section)' '
-	printf "SVNQ%b%b%s" "QQ\001\001\003" "\0201" "b" | q_to_nul >insn.trunc &&
-	test_must_fail test-svn-fe -d preimage insn.trunc 11
-'
-
-test_expect_success 'copyfrom_data' '
-	echo hi >expect &&
-	printf "SVNQ%b%b%b" "QQ\003\001\003" "\0203" "hi\n" | q_to_nul >copydat &&
-	test-svn-fe -d preimage copydat 13 >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'multiple copyfrom_data' '
-	echo hi >expect &&
-	printf "SVNQ%b%b%b%b%b" "QQ\003\002\003" "\0201\0202" "hi\n" \
-		"QQQ\002Q" "\0200Q" | q_to_nul >copy.multi &&
-	len=$(wc -c <copy.multi) &&
-	test-svn-fe -d preimage copy.multi $len >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'incomplete multiple insn' '
-	printf "SVNQ%b%b%b" "QQ\003\002\003" "\0203\0200" "hi\n" |
-		q_to_nul >copy.partial &&
-	len=$(wc -c <copy.partial) &&
-	test_must_fail test-svn-fe -d preimage copy.partial $len
-'
-
-test_expect_success 'catch attempt to copy missing data' '
-	printf "SVNQ%b%b%s%b%s" "QQ\002\002\001" "\0201\0201" "X" \
-			"QQQQ\002" "YZ" |
-		q_to_nul >copy.incomplete &&
-	len=$(wc -c <copy.incomplete) &&
-	test_must_fail test-svn-fe -d preimage copy.incomplete $len
-'
-
-test_expect_success 'copyfrom target to repeat data' '
-	printf foofoo >expect &&
-	printf "SVNQ%b%b%s" "QQ\006\004\003" "\0203\0100\003Q" "foo" |
-		q_to_nul >copytarget.repeat &&
-	len=$(wc -c <copytarget.repeat) &&
-	test-svn-fe -d preimage copytarget.repeat $len >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'copyfrom target out of order' '
-	printf foooof >expect &&
-	printf "SVNQ%b%b%s" \
-		"QQ\006\007\003" "\0203\0101\002\0101\001\0101Q" "foo" |
-		q_to_nul >copytarget.reverse &&
-	len=$(wc -c <copytarget.reverse) &&
-	test-svn-fe -d preimage copytarget.reverse $len >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'catch copyfrom future' '
-	printf "SVNQ%b%b%s" "QQ\004\004\003" "\0202\0101\002\0201" "XYZ" |
-		q_to_nul >copytarget.infuture &&
-	len=$(wc -c <copytarget.infuture) &&
-	test_must_fail test-svn-fe -d preimage copytarget.infuture $len
-'
-
-test_expect_success 'copy to sustain' '
-	printf XYXYXYXYXYXZ >expect &&
-	printf "SVNQ%b%b%s" "QQ\014\004\003" "\0202\0111Q\0201" "XYZ" |
-		q_to_nul >copytarget.sustain &&
-	len=$(wc -c <copytarget.sustain) &&
-	test-svn-fe -d preimage copytarget.sustain $len >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'catch copy that overflows' '
-	printf "SVNQ%b%b%s" "QQ\003\003\001" "\0201\0177Q" X |
-		q_to_nul >copytarget.overflow &&
-	len=$(wc -c <copytarget.overflow) &&
-	test_must_fail test-svn-fe -d preimage copytarget.overflow $len
-'
-
-test_expect_success 'copyfrom source' '
-	printf foo >expect &&
-	printf "SVNQ%b%b" "Q\003\003\002Q" "\003Q" | q_to_nul >copysource.all &&
-	test-svn-fe -d preimage copysource.all 11 >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'copy backwards' '
-	printf oof >expect &&
-	printf "SVNQ%b%b" "Q\003\003\006Q" "\001\002\001\001\001Q" |
-		q_to_nul >copysource.rev &&
-	test-svn-fe -d preimage copysource.rev 15 >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'offsets are relative to window' '
-	printf fo >expect &&
-	printf "SVNQ%b%b%b%b" "Q\003\001\002Q" "\001Q" \
-		"\002\001\001\002Q" "\001Q" |
-		q_to_nul >copysource.two &&
-	test-svn-fe -d preimage copysource.two 18 >actual &&
-	test_cmp expect actual
-'
-
-test_expect_success 'example from notes/svndiff' '
-	printf aaaaccccdddddddd >expect &&
-	printf aaaabbbbcccc >source &&
-	printf "SVNQ%b%b%s" "Q\014\020\007\001" \
-		"\004Q\004\010\0201\0107\010" d |
-		q_to_nul >delta.example &&
-	len=$(wc -c <delta.example) &&
-	test-svn-fe -d source delta.example $len >actual &&
-	test_cmp expect actual
-'
-
-test_done
diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
deleted file mode 100755
index 6fca08e5e3..0000000000
--- a/t/t9020-remote-svn.sh
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/bin/sh
-
-test_description='tests remote-svn'
-
-. ./test-lib.sh
-
-MARKSPATH=.git/info/fast-import/remote-svn
-
-if ! test_have_prereq PYTHON
-then
-	skip_all='skipping remote-svn tests, python not available'
-	test_done
-fi
-
-# Override svnrdump with our simulator
-PATH="$HOME:$PATH"
-export PATH PYTHON_PATH GIT_BUILD_DIR
-
-write_script "$HOME/svnrdump" <<\EOF
-exec "$PYTHON_PATH" "$GIT_BUILD_DIR/contrib/svn-fe/svnrdump_sim.py" "$@"
-EOF
-
-init_git () {
-	rm -fr .git &&
-	git init &&
-	#git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump
-	# let's reuse an existing dump file!?
-	git remote add svnsim "testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump"
-	git remote add svnfile "testsvn::file://$TEST_DIRECTORY/t9154/svn.dump"
-}
-
-if test -e "$GIT_BUILD_DIR/git-remote-testsvn"
-then
-	test_set_prereq REMOTE_SVN
-fi
-
-test_debug '
-	git --version
-	type git
-	type svnrdump
-'
-
-test_expect_success REMOTE_SVN 'simple fetch' '
-	init_git &&
-	git fetch svnsim &&
-	test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master  &&
-	cp .git/refs/remotes/svnsim/master master.good
-'
-
-test_debug '
-	cat .git/refs/svn/svnsim/master
-	cat .git/refs/remotes/svnsim/master
-'
-
-test_expect_success REMOTE_SVN 'repeated fetch, nothing shall change' '
-	git fetch svnsim &&
-	test_cmp master.good .git/refs/remotes/svnsim/master
-'
-
-test_expect_success REMOTE_SVN 'fetch from a file:// url gives the same result' '
-	git fetch svnfile
-'
-
-test_expect_failure REMOTE_SVN 'the sha1 differ because the git-svn-id line in the commit msg contains the url' '
-	test_cmp .git/refs/remotes/svnfile/master .git/refs/remotes/svnsim/master
-'
-
-test_expect_success REMOTE_SVN 'mark-file regeneration' '
-	# filter out any other marks, that can not be regenerated. Only up to 3 digit revisions are allowed here
-	grep ":[0-9]\{1,3\} " $MARKSPATH/svnsim.marks > $MARKSPATH/svnsim.marks.old &&
-	rm $MARKSPATH/svnsim.marks &&
-	git fetch svnsim &&
-	test_cmp $MARKSPATH/svnsim.marks.old $MARKSPATH/svnsim.marks
-'
-
-test_expect_success REMOTE_SVN 'incremental imports must lead to the same head' '
-	SVNRMAX=3 &&
-	export SVNRMAX &&
-	init_git &&
-	git fetch svnsim &&
-	test_cmp .git/refs/svn/svnsim/master .git/refs/remotes/svnsim/master  &&
-	unset SVNRMAX &&
-	git fetch svnsim &&
-	test_cmp master.good .git/refs/remotes/svnsim/master
-'
-
-test_debug 'git branch -a'
-
-test_done
diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 2c309a57d9..fea41b3c36 100755
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -4,18 +4,13 @@
 #
 
 test_description='git svn basic tests'
-GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
+
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 
 . ./lib-git-svn.sh
 
-case "$GIT_SVN_LC_ALL" in
-*.UTF-8)
-	test_set_prereq UTF8
-	;;
-*)
-	say "# UTF-8 locale not set, some tests skipped ($GIT_SVN_LC_ALL)"
-	;;
-esac
+prepare_utf8_locale
 
 test_expect_success 'git svn --version works anywhere' '
 	nongit git svn --version
@@ -63,16 +58,16 @@ test_expect_success "$name" '
 
 
 name='detect node change from file to directory #1'
-test_expect_success "$name" "
+test_expect_success "$name" '
 	mkdir dir/new_file &&
 	mv dir/file dir/new_file/file &&
 	mv dir/new_file dir/file &&
 	git update-index --remove dir/file &&
 	git update-index --add dir/file/file &&
-	git commit -m '$name' &&
+	git commit -m "$name" &&
 	test_must_fail git svn set-tree --find-copies-harder --rmdir \
 		remotes/git-svn..mybranch
-"
+'
 
 
 name='detect node change from directory to file #1'
@@ -184,8 +179,8 @@ test_expect_success POSIXPERM,SYMLINKS "$name" '
 	test ! -h "$SVN_TREE"/exec-2.sh &&
 	test_cmp help "$SVN_TREE"/exec-2.sh'
 
-name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
-LC_ALL="$GIT_SVN_LC_ALL"
+name="commit with UTF-8 message: locale: $GIT_TEST_UTF8_LOCALE"
+LC_ALL="$GIT_TEST_UTF8_LOCALE"
 export LC_ALL
 # This test relies on the previous test, hence requires POSIXPERM,SYMLINKS
 test_expect_success UTF8,POSIXPERM,SYMLINKS "$name" "
@@ -200,17 +195,19 @@ GIT_SVN_ID=alt
 export GIT_SVN_ID
 test_expect_success "$name" \
     'git svn init "$svnrepo" && git svn fetch &&
-     git rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a &&
-     git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
+     git log --format="tree %T %s" remotes/git-svn |
+	awk "!seen[\$0]++ { print \$1, \$2 }" >a &&
+     git log --format="tree %T" alt >b &&
      test_cmp a b'
 
 name='check imported tree checksums expected tree checksums'
 rm -f expected
 if test_have_prereq UTF8
 then
-	echo tree dc68b14b733e4ec85b04ab6f712340edc5dc936e > expected
+	echo tree dc68b14b733e4ec85b04ab6f712340edc5dc936e > expected.sha1
+	echo tree b95b55b29d771f5eb73aa9b9d52d02fe11a2538c2feb0829f754ce20a91d98eb > expected.sha256
 fi
-cat >> expected <<\EOF
+cat >> expected.sha1 <<\EOF
 tree c3322890dcf74901f32d216f05c5044f670ce632
 tree d3ccd5035feafd17b030c5732e7808cc49122853
 tree d03e1630363d4881e68929d532746b20b0986b83
@@ -220,8 +217,20 @@ tree 149d63cd5878155c846e8c55d7d8487de283f89e
 tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
 tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
 EOF
+cat >> expected.sha256 <<\EOF
+tree 8d12756699d0b5b110514240a0ff141f6cbf8891fd69ab05e5594196fb437c9f
+tree 8187168d33f7d4ccb8c1cc6e99532810aaccb47658f35d19b3803072d1128d7a
+tree 74e535d85da8ee25eb23d7b506790c5ab3ccdb1ba0826bd57625ed44ef361650
+tree 6fd7dd963e3cdca0cbd6368ed3cfcc8037cc154d2e7719d9d369a0952364fd95
+tree 1fd6cec6aa95102d69266e20419bb62ec2a06372d614b9850ef23ff204103bb4
+tree 6fd7dd963e3cdca0cbd6368ed3cfcc8037cc154d2e7719d9d369a0952364fd95
+tree deb2b7ac79cd8ce6f52af6a5a0a08691e94ba74a2ed55966bb27dbec551730eb
+tree 59e2e936761188476a7752034e8aa0a822b34050c8504b0dfd946407f4bc9215
+EOF
 
-test_expect_success POSIXPERM,SYMLINKS "$name" "test_cmp expected a"
+test_expect_success POSIXPERM,SYMLINKS "$name" '
+	test_cmp expected.$(test_oid algo) a
+'
 
 test_expect_success 'exit if remote refs are ambigious' '
         git config --add svn-remote.svn.fetch \
@@ -261,7 +270,7 @@ test_expect_success 'dcommit $rev does not clobber current branch' '
 	test refs/heads/my-bar = $(git symbolic-ref HEAD) &&
 	git log refs/remotes/bar | grep "change 1" &&
 	! git log refs/remotes/bar | grep "change 2" &&
-	git checkout master &&
+	git checkout main &&
 	git branch -D my-bar
 	'
 
@@ -313,7 +322,7 @@ test_expect_success 'git-svn works in a bare repository' '
 	git svn fetch ) &&
 	rm -rf bare-repo
 	'
-test_expect_success 'git-svn works in in a repository with a gitdir: link' '
+test_expect_success 'git-svn works in a repository with a gitdir: link' '
 	mkdir worktree gitdir &&
 	( cd worktree &&
 	git svn init "$svnrepo" &&
diff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh
index c26c4b0927..8b5681dd68 100755
--- a/t/t9101-git-svn-props.sh
+++ b/t/t9101-git-svn-props.sh
@@ -160,11 +160,13 @@ cat >create-ignore.expect <<\EOF
 /no-such-file*
 EOF
 
-cat >create-ignore-index.expect <<\EOF
-100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0	.gitignore
-100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0	deeply/.gitignore
-100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0	deeply/nested/.gitignore
-100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0	deeply/nested/directory/.gitignore
+expectoid=$(git hash-object create-ignore.expect)
+
+cat >create-ignore-index.expect <<EOF
+100644 $expectoid 0	.gitignore
+100644 $expectoid 0	deeply/.gitignore
+100644 $expectoid 0	deeply/nested/.gitignore
+100644 $expectoid 0	deeply/nested/directory/.gitignore
 EOF
 
 test_expect_success 'test create-ignore' "
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh
index 5e0ad19177..67eed2fefc 100755
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@ -161,6 +161,7 @@ test_expect_success "track initial change if it was only made to parent" '
 	'
 
 test_expect_success "follow-parent is atomic" '
+	record_size=$(($(test_oid rawsz) + 4)) &&
 	(
 		cd wc &&
 		svn_cmd up &&
@@ -186,7 +187,7 @@ test_expect_success "follow-parent is atomic" '
 	mkdir -p "$GIT_DIR"/svn/refs/remotes/flunk@18 &&
 	rev_map=$(cd "$GIT_DIR"/svn/refs/remotes/stunk && ls .rev_map*) &&
 	dd if="$GIT_DIR"/svn/refs/remotes/stunk/$rev_map \
-	   of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=24 count=1 &&
+	   of="$GIT_DIR"/svn/refs/remotes/flunk@18/$rev_map bs=$record_size count=1 &&
 	rm -rf "$GIT_DIR"/svn/refs/remotes/stunk &&
 	git svn init --minimize-url -i flunk "$svnrepo"/flunk &&
 	git svn fetch -i flunk &&
diff --git a/t/t9106-git-svn-commit-diff-clobber.sh b/t/t9106-git-svn-commit-diff-clobber.sh
index dbe8deac0d..aec45bca3b 100755
--- a/t/t9106-git-svn-commit-diff-clobber.sh
+++ b/t/t9106-git-svn-commit-diff-clobber.sh
@@ -92,7 +92,8 @@ test_expect_success 'multiple dcommit from git svn will not clobber svn' "
 
 
 test_expect_success 'check that rebase really failed' '
-	test -d .git/rebase-apply
+	git status >output &&
+	grep currently.rebasing output
 '
 
 test_expect_success 'resolve, continue the rebase and dcommit' "
diff --git a/t/t9108-git-svn-glob.sh b/t/t9108-git-svn-glob.sh
index 6990f64364..d5939d4753 100755
--- a/t/t9108-git-svn-glob.sh
+++ b/t/t9108-git-svn-glob.sh
@@ -48,7 +48,7 @@ test_expect_success 'test refspec globbing' '
 	                 "tags/*/src/a:refs/remotes/tags/*" &&
 	git svn multi-fetch &&
 	git log --pretty=oneline refs/remotes/tags/end >actual &&
-	sed -e "s/^.\{41\}//" actual >output.end &&
+	cut -d" " -f2- actual >output.end &&
 	test_cmp expect.end output.end &&
 	test "$(git rev-parse refs/remotes/tags/end~1)" = \
 		"$(git rev-parse refs/remotes/branches/start)" &&
@@ -84,7 +84,7 @@ test_expect_success 'test left-hand-side only globbing' '
 	test $(git rev-parse refs/remotes/two/tags/end~3) = \
 	     $(git rev-parse refs/remotes/two/branches/start) &&
 	git log --pretty=oneline refs/remotes/two/tags/end >actual &&
-	sed -e "s/^.\{41\}//" actual >output.two &&
+	cut -d" " -f2- actual >output.two &&
 	test_cmp expect.two output.two
 	'
 
diff --git a/t/t9109-git-svn-multi-glob.sh b/t/t9109-git-svn-multi-glob.sh
index c1e7542a37..648dcee1ea 100755
--- a/t/t9109-git-svn-multi-glob.sh
+++ b/t/t9109-git-svn-multi-glob.sh
@@ -48,7 +48,7 @@ test_expect_success 'test refspec globbing' '
 	                 "tags/*/src/a:refs/remotes/tags/*" &&
 	git svn multi-fetch &&
 	git log --pretty=oneline refs/remotes/tags/end >actual &&
-	sed -e "s/^.\{41\}//" actual >output.end &&
+	cut -d" " -f2- actual >output.end &&
 	test_cmp expect.end output.end &&
 	test "$(git rev-parse refs/remotes/tags/end~1)" = \
 		"$(git rev-parse refs/remotes/branches/v1/start)" &&
@@ -84,7 +84,7 @@ test_expect_success 'test left-hand-side only globbing' '
 	test $(git rev-parse refs/remotes/two/tags/end~3) = \
 	     $(git rev-parse refs/remotes/two/branches/v1/start) &&
 	git log --pretty=oneline refs/remotes/two/tags/end >actual &&
-	sed -e "s/^.\{41\}//" actual >output.two &&
+	cut -d" " -f2- actual >output.two &&
 	test_cmp expect.two output.two
 	'
 cat > expect.four <<EOF
@@ -135,7 +135,7 @@ test_expect_success 'test another branch' '
 	test $(git rev-parse refs/remotes/four/tags/next~2) = \
 	     $(git rev-parse refs/remotes/four/branches/v2/start) &&
 	git log --pretty=oneline refs/remotes/four/tags/next >actual &&
-	sed -e "s/^.\{41\}//" actual >output.four &&
+	cut -d" " -f2- actual >output.four &&
 	test_cmp expect.four output.four
 	'
 
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index 9b44a44bc1..743fbe1fe4 100755
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -93,9 +93,9 @@ test_expect_success 'git svn rebase works inside a fresh-cloned repository' '
 # > ... All of the above characters, except for the backslash, are converted
 # > to special UNICODE characters in the range 0xf000 to 0xf0ff (the
 # > "Private use area") when creating or accessing files.
-prepare_a_utf8_locale
+prepare_utf8_locale
 test_expect_success UTF8,!MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 new file on dcommit' '
-	LC_ALL=$a_utf8_locale &&
+	LC_ALL=$GIT_TEST_UTF8_LOCALE &&
 	export LC_ALL &&
 	neq=$(printf "\201\202") &&
 	git config svn.pathnameencoding cp932 &&
@@ -107,7 +107,7 @@ test_expect_success UTF8,!MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 new
 
 # See the comment on the above test for setting of LC_ALL.
 test_expect_success !MINGW,!UTF8_NFD_TO_NFC 'svn.pathnameencoding=cp932 rename on dcommit' '
-	LC_ALL=$a_utf8_locale &&
+	LC_ALL=$GIT_TEST_UTF8_LOCALE &&
 	export LC_ALL &&
 	inf=$(printf "\201\207") &&
 	git config svn.pathnameencoding cp932 &&
diff --git a/t/t9116-git-svn-log.sh b/t/t9116-git-svn-log.sh
index 45773ee560..0a9f1ef366 100755
--- a/t/t9116-git-svn-log.sh
+++ b/t/t9116-git-svn-log.sh
@@ -43,14 +43,18 @@ test_expect_success 'setup repository and import' '
 
 test_expect_success 'run log' "
 	git reset --hard origin/a &&
-	git svn log -r2 origin/trunk | grep ^r2 &&
-	git svn log -r4 origin/trunk | grep ^r4 &&
-	git svn log -r3 | grep ^r3
+	git svn log -r2 origin/trunk >out &&
+	grep ^r2 out &&
+	git svn log -r4 origin/trunk >out &&
+	grep ^r4 out &&
+	git svn log -r3 >out &&
+	grep ^r3 out
 	"
 
 test_expect_success 'run log against a from trunk' "
 	git reset --hard origin/trunk &&
-	git svn log -r3 origin/a | grep ^r3
+	git svn log -r3 origin/a >out &&
+	grep ^r3 out
 	"
 
 printf 'r1 \nr2 \nr4 \n' > expected-range-r1-r2-r4
diff --git a/t/t9117-git-svn-init-clone.sh b/t/t9117-git-svn-init-clone.sh
index 044f65e916..62de819a44 100755
--- a/t/t9117-git-svn-init-clone.sh
+++ b/t/t9117-git-svn-init-clone.sh
@@ -7,12 +7,6 @@ test_description='git svn init/clone tests'
 
 . ./lib-git-svn.sh
 
-# setup, run inside tmp so we don't have any conflicts with $svnrepo
-set -e
-rm -r .git
-mkdir tmp
-cd tmp
-
 test_expect_success 'setup svnrepo' '
 	mkdir project project/trunk project/branches project/tags &&
 	echo foo > project/trunk/foo &&
diff --git a/t/t9129-git-svn-i18n-commitencoding.sh b/t/t9129-git-svn-i18n-commitencoding.sh
index 2c213ae654..01e1e8a8f7 100755
--- a/t/t9129-git-svn-i18n-commitencoding.sh
+++ b/t/t9129-git-svn-i18n-commitencoding.sh
@@ -14,12 +14,12 @@ compare_git_head_with () {
 	test_cmp current "$1"
 }
 
-prepare_a_utf8_locale
+prepare_utf8_locale
 
 compare_svn_head_with () {
 	# extract just the log message and strip out committer info.
 	# don't use --limit here since svn 1.1.x doesn't have it,
-	LC_ALL="$a_utf8_locale" svn log $(git svn info --url) | perl -w -e '
+	LC_ALL="$GIT_TEST_UTF8_LOCALE" svn log $(git svn info --url) | perl -w -e '
 		use bytes;
 		$/ = ("-"x72) . "\n";
 		my @x = <STDIN>;
diff --git a/t/t9141-git-svn-multiple-branches.sh b/t/t9141-git-svn-multiple-branches.sh
index 8e7f7d68b7..bf168a3645 100755
--- a/t/t9141-git-svn-multiple-branches.sh
+++ b/t/t9141-git-svn-multiple-branches.sh
@@ -90,10 +90,10 @@ test_expect_success 'Multiple branch or tag paths require -d' '
 	) &&
 	( cd svn_project &&
 		svn_cmd up &&
-		test_must_fail test -d b_one/Nope &&
-		test_must_fail test -d b_two/Nope &&
-		test_must_fail test -d tags_A/Tagless &&
-		test_must_fail test -d tags_B/Tagless
+		test_path_is_missing b_one/Nope &&
+		test_path_is_missing b_two/Nope &&
+		test_path_is_missing tags_A/Tagless &&
+		test_path_is_missing tags_B/Tagless
 	)
 '
 
diff --git a/t/t9145-git-svn-master-branch.sh b/t/t9145-git-svn-master-branch.sh
index 3bbf341f6a..f863e437f7 100755
--- a/t/t9145-git-svn-master-branch.sh
+++ b/t/t9145-git-svn-master-branch.sh
@@ -2,7 +2,10 @@
 #
 # Copyright (c) 2009 Eric Wong
 #
-test_description='git svn initial master branch is "trunk" if possible'
+test_description='git svn initial main branch is "trunk" if possible'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 test_expect_success 'setup test repository' '
@@ -13,12 +16,12 @@ test_expect_success 'setup test repository' '
 	svn_cmd import -m b/b i "$svnrepo/branches/b"
 '
 
-test_expect_success 'git svn clone --stdlayout sets up trunk as master' '
+test_expect_success 'git svn clone --stdlayout sets up trunk as main' '
 	git svn clone -s "$svnrepo" g &&
 	(
 		cd g &&
 		test x$(git rev-parse --verify refs/remotes/origin/trunk^0) = \
-		     x$(git rev-parse --verify refs/heads/master^0)
+		     x$(git rev-parse --verify refs/heads/main^0)
 	)
 '
 
diff --git a/t/t9148-git-svn-propset.sh b/t/t9148-git-svn-propset.sh
index 102639090c..aebb28995e 100755
--- a/t/t9148-git-svn-propset.sh
+++ b/t/t9148-git-svn-propset.sh
@@ -7,19 +7,22 @@ test_description='git svn propset tests'
 
 . ./lib-git-svn.sh
 
-foo_subdir2="subdir/subdir2/foo_subdir2"
+test_expect_success 'setup propset via import' '
+	test_when_finished "rm -rf import" &&
 
-set -e
-mkdir import &&
-(set -e ; cd import
-	mkdir subdir
-	mkdir subdir/subdir2
-	touch foo 		# for 'add props top level'
-	touch subdir/foo_subdir # for 'add props relative'
-	touch "$foo_subdir2"	# for 'add props subdir'
-	svn_cmd import -m 'import for git svn' . "$svnrepo" >/dev/null
-)
-rm -rf import
+	foo_subdir2="subdir/subdir2/foo_subdir2" &&
+	mkdir -p import/subdir/subdir2 &&
+	(
+		cd import &&
+		# for "add props top level"
+		>foo &&
+		# for "add props relative"
+		>subdir/foo_subdir &&
+		# for "add props subdir"
+		>"$foo_subdir2" &&
+		svn_cmd import -m "import for git svn" . "$svnrepo"
+	)
+'
 
 test_expect_success 'initialize git svn' '
 	git svn init "$svnrepo"
diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index 4f6c06ecb2..1fbe84feb1 100755
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -5,53 +5,53 @@
 
 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' "
 	svnadmin load -q '$rawsvnrepo' \
-	  < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
+	  <'$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
 	git svn init --minimize-url -R svnmerge \
 	  --rewrite-root=http://svn.example.org \
 	  -T trunk -b branches '$svnrepo' &&
 	git svn fetch --all
-	"
+"
 
 test_expect_success 'all svn merges became git merge commits' '
-	unmarked=$(git rev-list --parents --all --grep=Merge |
-		grep -v " .* " | cut -f1 -d" ") &&
-	[ -z "$unmarked" ]
-	'
+	git rev-list --all --no-merges --grep=Merge >unmarked &&
+	test_must_be_empty unmarked
+'
 
 test_expect_success 'cherry picks did not become git merge commits' '
-	bad_cherries=$(git rev-list --parents --all --grep=Cherry |
-		grep " .* " | cut -f1 -d" ") &&
-	[ -z "$bad_cherries" ]
-	'
+	git rev-list --all --merges --grep=Cherry >bad-cherries &&
+	test_must_be_empty bad-cherries
+'
 
 test_expect_success 'svn non-merge merge commits did not become git merge commits' '
-	bad_non_merges=$(git rev-list --parents --all --grep=non-merge |
-		grep " .* " | cut -f1 -d" ") &&
-	[ -z "$bad_non_merges" ]
-	'
+	git rev-list --all --merges --grep=non-merge >bad-non-merges &&
+	test_must_be_empty bad-non-merges
+'
 
 test_expect_success 'commit made to merged branch is reachable from the merge' '
 	before_commit=$(git rev-list --all --grep="trunk commit before merging trunk to b2") &&
 	merge_commit=$(git rev-list --all --grep="Merge trunk to b2") &&
-	not_reachable=$(git rev-list -1 $before_commit --not $merge_commit) &&
-	[ -z "$not_reachable" ]
-	'
+	git rev-list -1 $before_commit --not $merge_commit >not-reachable &&
+	test_must_be_empty not-reachable
+'
 
 test_expect_success 'merging two branches in one commit is detected correctly' '
 	f1_commit=$(git rev-list --all --grep="make f1 branch from trunk") &&
 	f2_commit=$(git rev-list --all --grep="make f2 branch from trunk") &&
 	merge_commit=$(git rev-list --all --grep="Merge f1 and f2 to trunk") &&
-	not_reachable=$(git rev-list -1 $f1_commit $f2_commit --not $merge_commit) &&
-	[ -z "$not_reachable" ]
-	'
+	git rev-list -1 $f1_commit $f2_commit --not $merge_commit >not-reachable &&
+	test_must_be_empty not-reachable
+'
 
 test_expect_failure 'everything got merged in the end' '
-	unmerged=$(git rev-list --all --not master) &&
-	[ -z "$unmerged" ]
-	'
+	git rev-list --all --not main >unmerged &&
+	test_must_be_empty unmerged
+'
 
 test_done
diff --git a/t/t9155-git-svn-fetch-deleted-tag.sh b/t/t9155-git-svn-fetch-deleted-tag.sh
index 184336f346..3258374c13 100755
--- a/t/t9155-git-svn-fetch-deleted-tag.sh
+++ b/t/t9155-git-svn-fetch-deleted-tag.sh
@@ -2,6 +2,9 @@
 
 test_description='git svn fetch deleted tag'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 test_expect_success 'setup svn repo' '
@@ -36,7 +39,7 @@ test_expect_success 'fetch deleted tags from same revision with checksum error'
 	git svn fetch &&
 
 	git diff --exit-code origin/mybranch:trunk/subdir/file origin/tags/mytag:file &&
-	git diff --exit-code master:subdir/file origin/tags/mytag^:file
+	git diff --exit-code main:subdir/file origin/tags/mytag^:file
 '
 
 test_done
diff --git a/t/t9156-git-svn-fetch-deleted-tag-2.sh b/t/t9156-git-svn-fetch-deleted-tag-2.sh
index 7a6e33ba3c..2b75c403e3 100755
--- a/t/t9156-git-svn-fetch-deleted-tag-2.sh
+++ b/t/t9156-git-svn-fetch-deleted-tag-2.sh
@@ -2,6 +2,9 @@
 
 test_description='git svn fetch deleted tag 2'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 test_expect_success 'setup svn repo' '
@@ -36,9 +39,9 @@ test_expect_success 'fetch deleted tags from same revision with no checksum erro
 	cd git_project &&
 	git svn fetch &&
 
-	git diff --exit-code master:subdir3/file origin/tags/mytag:file &&
-	git diff --exit-code master:subdir2/file origin/tags/mytag^:file &&
-	git diff --exit-code master:subdir1/file origin/tags/mytag^^:file
+	git diff --exit-code main:subdir3/file origin/tags/mytag:file &&
+	git diff --exit-code main:subdir2/file origin/tags/mytag^:file &&
+	git diff --exit-code main:subdir1/file origin/tags/mytag^^:file
 '
 
 test_done
diff --git a/t/t9160-git-svn-preserve-empty-dirs.sh b/t/t9160-git-svn-preserve-empty-dirs.sh
index 0ede3cfedb..36c6b1a12f 100755
--- a/t/t9160-git-svn-preserve-empty-dirs.sh
+++ b/t/t9160-git-svn-preserve-empty-dirs.sh
@@ -86,8 +86,8 @@ test_expect_success 'remove non-last entry from directory' '
 		cd "$GIT_REPO" &&
 		git checkout HEAD~2
 	) &&
-	test_must_fail test -f "$GIT_REPO"/2/.gitignore &&
-	test_must_fail test -f "$GIT_REPO"/3/.gitignore
+	test_path_is_missing "$GIT_REPO"/2/.gitignore &&
+	test_path_is_missing "$GIT_REPO"/3/.gitignore
 '
 
 # After re-cloning the repository with --placeholder-file specified, there
diff --git a/t/t9163-git-svn-reset-clears-caches.sh b/t/t9163-git-svn-reset-clears-caches.sh
index d6245cee08..978eb62ff4 100755
--- a/t/t9163-git-svn-reset-clears-caches.sh
+++ b/t/t9163-git-svn-reset-clears-caches.sh
@@ -4,6 +4,9 @@
 #
 
 test_description='git svn reset clears memoized caches'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 svn_ver="$(svn --version --quiet)"
@@ -59,7 +62,7 @@ test_expect_success 'fetch to merge-base (a)' '
 test_expect_success 'rebase looses SVN merge (m)' '
 	git svn rebase &&
 	git svn fetch &&
-	test 1 = $(git cat-file -p master|grep parent|wc -l)
+	test 1 = $(git cat-file -p main|grep parent|wc -l)
 '
 
 # git svn fetch creates correct history with merge commit
diff --git a/t/t9164-git-svn-dcommit-concurrent.sh b/t/t9164-git-svn-dcommit-concurrent.sh
index 90346ff4e9..8466269bf5 100755
--- a/t/t9164-git-svn-dcommit-concurrent.sh
+++ b/t/t9164-git-svn-dcommit-concurrent.sh
@@ -92,7 +92,7 @@ test_expect_success 'check if post-commit hook creates a concurrent commit' '
 		echo 1 >> file &&
 		svn_cmd commit -m "changing file" &&
 		svn_cmd up &&
-		test_must_fail test_cmp auto_updated_file au_file_saved
+		! test_cmp auto_updated_file au_file_saved
 	)
 '
 
@@ -103,7 +103,7 @@ test_expect_success 'check if pre-commit hook fails' '
 		echo 2 >> file &&
 		svn_cmd commit -m "changing file once again" &&
 		echo 3 >> file &&
-		test_must_fail svn_cmd commit -m "this commit should fail" &&
+		! svn_cmd commit -m "this commit should fail" &&
 		svn_cmd revert file
 	)
 '
diff --git a/t/t9168-git-svn-partially-globbed-names.sh b/t/t9168-git-svn-partially-globbed-names.sh
index bdf6e84999..854b3419b2 100755
--- a/t/t9168-git-svn-partially-globbed-names.sh
+++ b/t/t9168-git-svn-partially-globbed-names.sh
@@ -49,7 +49,7 @@ test_expect_success 'test refspec prefixed globbing' '
 			 "tags/t_*/src/a:refs/remotes/tags/t_*" &&
 	git svn multi-fetch &&
 	git log --pretty=oneline refs/remotes/tags/t_end >actual &&
-	sed -e "s/^.\{41\}//" actual >output.end &&
+	cut -d" " -f2- actual >output.end &&
 	test_cmp expect.end output.end &&
 	test "$(git rev-parse refs/remotes/tags/t_end~1)" = \
 		"$(git rev-parse refs/remotes/branches/b_start)" &&
@@ -87,7 +87,7 @@ test_expect_success 'test left-hand-side only prefixed globbing' '
 	test $(git rev-parse refs/remotes/two/tags/t_end~3) = \
 	     $(git rev-parse refs/remotes/two/branches/b_start) &&
 	git log --pretty=oneline refs/remotes/two/tags/t_end >actual &&
-	sed -e "s/^.\{41\}//" actual >output.two &&
+	cut -d" " -f2- actual >output.two &&
 	test_cmp expect.two output.two
 	'
 
@@ -129,7 +129,7 @@ test_expect_success 'test prefixed globs match just prefix' '
 	test $(git rev-parse refs/remotes/three/tags/t_~1) = \
 	     $(git rev-parse refs/remotes/three/branches/b_) &&
 	git log --pretty=oneline refs/remotes/three/tags/t_ >actual &&
-	sed -e "s/^.\{41\}//" actual >output.three &&
+	cut -d" " -f2- actual >output.three &&
 	test_cmp expect.three output.three
 	'
 
@@ -199,7 +199,7 @@ test_expect_success 'test globbing in the middle of the word' '
 	test $(git rev-parse refs/remotes/five/tags/fghij~1) = \
 	     $(git rev-parse refs/remotes/five/branches/abcde) &&
 	git log --pretty=oneline refs/remotes/five/tags/fghij >actual &&
-	sed -e "s/^.\{41\}//" actual >output.five &&
+	cut -d" " -f2- actual >output.five &&
 	test_cmp expect.five output.five
 	'
 
diff --git a/t/t9169-git-svn-dcommit-crlf.sh b/t/t9169-git-svn-dcommit-crlf.sh
index 54b1f61a2a..7080b5d24f 100755
--- a/t/t9169-git-svn-dcommit-crlf.sh
+++ b/t/t9169-git-svn-dcommit-crlf.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git svn dcommit CRLF'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-svn.sh
 
 test_expect_success 'setup commit repository' '
@@ -14,7 +17,7 @@ test_expect_success 'setup commit repository' '
 		p=$(git rev-parse HEAD) &&
 		t=$(git write-tree) &&
 		cmt=$(git commit-tree -p $p $t <cmt) &&
-		git update-ref refs/heads/master $cmt &&
+		git update-ref refs/heads/main $cmt &&
 		git cat-file commit HEAD | tail -n4 >out &&
 		test_cmp cmt out &&
 		git svn dcommit &&
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index e707fb861e..aa55b41b9a 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -4,8 +4,11 @@
 #
 
 test_description='test git fast-import utility'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
-. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
+. "$TEST_DIRECTORY"/lib-diff.sh ;# test-lib chdir's into trash
 
 verify_packs () {
 	for p in .git/objects/pack/*.pack
@@ -62,7 +65,7 @@ test_expect_success 'A: create pack from stdin' '
 	mark :4
 	data $file4_len
 	$file4_data
-	commit refs/heads/master
+	commit refs/heads/main
 	mark :5
 	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 	data <<COMMIT
@@ -92,7 +95,7 @@ test_expect_success 'A: create pack from stdin' '
 	EOF
 
 	reset refs/tags/to-be-deleted
-	from 0000000000000000000000000000000000000000
+	from $ZERO_OID
 
 	tag nested
 	mark :6
@@ -102,7 +105,7 @@ test_expect_success 'A: create pack from stdin' '
 	EOF
 
 	reset refs/tags/nested
-	from 0000000000000000000000000000000000000000
+	from $ZERO_OID
 
 	tag nested
 	mark :7
@@ -117,7 +120,7 @@ test_expect_success 'A: create pack from stdin' '
 
 	INPUT_END
 	git fast-import --export-marks=marks.out <input &&
-	git whatchanged master
+	git whatchanged main
 '
 
 test_expect_success 'A: verify pack' '
@@ -131,7 +134,7 @@ test_expect_success 'A: verify commit' '
 
 	initial
 	EOF
-	git cat-file commit master | sed 1d >actual &&
+	git cat-file commit main | sed 1d >actual &&
 	test_cmp expect actual
 '
 
@@ -141,31 +144,31 @@ test_expect_success 'A: verify tree' '
 	100644 blob file3
 	100755 blob file4
 	EOF
-	git cat-file -p master^{tree} | sed "s/ [0-9a-f]*	/ /" >actual &&
+	git cat-file -p main^{tree} | sed "s/ [0-9a-f]*	/ /" >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'A: verify file2' '
 	echo "$file2_data" >expect &&
-	git cat-file blob master:file2 >actual &&
+	git cat-file blob main:file2 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'A: verify file3' '
 	echo "$file3_data" >expect &&
-	git cat-file blob master:file3 >actual &&
+	git cat-file blob main:file3 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'A: verify file4' '
 	printf "$file4_data" >expect &&
-	git cat-file blob master:file4 >actual &&
+	git cat-file blob main:file4 >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'A: verify tag/series-A' '
 	cat >expect <<-EOF &&
-	object $(git rev-parse refs/heads/master)
+	object $(git rev-parse refs/heads/main)
 	type commit
 	tag series-A
 
@@ -177,7 +180,7 @@ test_expect_success 'A: verify tag/series-A' '
 
 test_expect_success 'A: verify tag/series-A-blob' '
 	cat >expect <<-EOF &&
-	object $(git rev-parse refs/heads/master:file3)
+	object $(git rev-parse refs/heads/main:file3)
 	type blob
 	tag series-A-blob
 
@@ -193,13 +196,13 @@ test_expect_success 'A: verify tag deletion is successful' '
 
 test_expect_success 'A: verify marks output' '
 	cat >expect <<-EOF &&
-	:2 $(git rev-parse --verify master:file2)
-	:3 $(git rev-parse --verify master:file3)
-	:4 $(git rev-parse --verify master:file4)
-	:5 $(git rev-parse --verify master^0)
+	:2 $(git rev-parse --verify main:file2)
+	:3 $(git rev-parse --verify main:file3)
+	:4 $(git rev-parse --verify main:file4)
+	:5 $(git rev-parse --verify main^0)
 	:6 $(git cat-file tag nested | grep object | cut -d" " -f 2)
 	:7 $(git rev-parse --verify nested)
-	:8 $(git rev-parse --verify master^0)
+	:8 $(git rev-parse --verify main^0)
 	EOF
 	test_cmp expect marks.out
 '
@@ -217,7 +220,7 @@ test_expect_success 'A: tag blob by sha1' '
 	new_blob=$(echo testing | git hash-object --stdin) &&
 	cat >input <<-INPUT_END &&
 	tag series-A-blob-2
-	from $(git rev-parse refs/heads/master:file3)
+	from $(git rev-parse refs/heads/main:file3)
 	data <<EOF
 	Tag blob by sha1.
 	EOF
@@ -243,7 +246,7 @@ test_expect_success 'A: tag blob by sha1' '
 	INPUT_END
 
 	cat >expect <<-EOF &&
-	object $(git rev-parse refs/heads/master:file3)
+	object $(git rev-parse refs/heads/main:file3)
 	type blob
 	tag series-A-blob-2
 
@@ -284,12 +287,13 @@ test_expect_success 'A: verify pack' '
 '
 
 test_expect_success 'A: verify diff' '
+	copy=$(git rev-parse --verify main:file2) &&
 	cat >expect <<-EOF &&
-	:000000 100755 0000000000000000000000000000000000000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 A	copy-of-file2
+	:000000 100755 $ZERO_OID $copy A	copy-of-file2
 	EOF
-	git diff-tree -M -r master verify--import-marks >actual &&
+	git diff-tree -M -r main verify--import-marks >actual &&
 	compare_diff_raw expect actual &&
-	test $(git rev-parse --verify master:file2) \
+	test $(git rev-parse --verify main:file2) \
 	    = $(git rev-parse --verify verify--import-marks:copy-of-file2)
 '
 
@@ -363,8 +367,8 @@ test_expect_success 'B: fail on invalid blob sha1' '
 	corrupt
 	COMMIT
 
-	from refs/heads/master
-	M 755 0000000000000000000000000000000000000001 zero1
+	from refs/heads/main
+	M 755 $(echo $ZERO_OID | sed -e "s/0$/1/") zero1
 
 	INPUT_END
 
@@ -380,7 +384,7 @@ test_expect_success 'B: accept branch name "TEMP_TAG"' '
 	tag base
 	COMMIT
 
-	from refs/heads/master
+	from refs/heads/main
 
 	INPUT_END
 
@@ -388,8 +392,8 @@ test_expect_success 'B: accept branch name "TEMP_TAG"' '
 		git gc
 		git prune" &&
 	git fast-import <input &&
-	test -f .git/TEMP_TAG &&
-	test $(git rev-parse master) = $(git rev-parse TEMP_TAG^)
+	test $(test-tool ref-store main resolve-ref TEMP_TAG 0 | cut -f1 -d " " ) != "$ZERO_OID" &&
+	test $(git rev-parse main) = $(git rev-parse TEMP_TAG^)
 '
 
 test_expect_success 'B: accept empty committer' '
@@ -410,6 +414,34 @@ test_expect_success 'B: accept empty committer' '
 	test -z "$out"
 '
 
+test_expect_success 'B: reject invalid timezone' '
+	cat >input <<-INPUT_END &&
+	commit refs/heads/invalid-timezone
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800
+	data <<COMMIT
+	empty commit
+	COMMIT
+	INPUT_END
+
+	test_when_finished "git update-ref -d refs/heads/invalid-timezone" &&
+	test_must_fail git fast-import <input
+'
+
+test_expect_success 'B: accept invalid timezone with raw-permissive' '
+	cat >input <<-INPUT_END &&
+	commit refs/heads/invalid-timezone
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1234567890 +051800
+	data <<COMMIT
+	empty commit
+	COMMIT
+	INPUT_END
+
+	git init invalid-timezone &&
+	git -C invalid-timezone fast-import --date-format=raw-permissive <input &&
+	git -C invalid-timezone cat-file -p invalid-timezone >out &&
+	grep "1234567890 [+]051800" out
+'
+
 test_expect_success 'B: accept and fixup committer with no name' '
 	cat >input <<-INPUT_END &&
 	commit refs/heads/empty-committer-2
@@ -499,7 +531,8 @@ test_expect_success 'B: fail on invalid committer (5)' '
 
 test_expect_success 'C: incremental import create pack from stdin' '
 	newf=$(echo hi newf | git hash-object -w --stdin) &&
-	oldf=$(git rev-parse --verify master:file2) &&
+	oldf=$(git rev-parse --verify main:file2) &&
+	thrf=$(git rev-parse --verify main:file3) &&
 	test_tick &&
 	cat >input <<-INPUT_END &&
 	commit refs/heads/branch
@@ -508,7 +541,7 @@ test_expect_success 'C: incremental import create pack from stdin' '
 	second
 	COMMIT
 
-	from refs/heads/master
+	from refs/heads/main
 	M 644 $oldf file2/oldf
 	M 755 $newf file2/newf
 	D file3
@@ -530,7 +563,7 @@ test_expect_success 'C: validate reuse existing blob' '
 
 test_expect_success 'C: verify commit' '
 	cat >expect <<-EOF &&
-	parent $(git rev-parse --verify master^0)
+	parent $(git rev-parse --verify main^0)
 	author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 
@@ -542,12 +575,13 @@ test_expect_success 'C: verify commit' '
 '
 
 test_expect_success 'C: validate rename result' '
+	zero=$ZERO_OID &&
 	cat >expect <<-EOF &&
-	:000000 100755 0000000000000000000000000000000000000000 f1fb5da718392694d0076d677d6d0e364c79b0bc A	file2/newf
-	:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100	file2	file2/oldf
-	:100644 000000 0d92e9f3374ae2947c23aa477cbc68ce598135f1 0000000000000000000000000000000000000000 D	file3
+	:000000 100755 $zero $newf A	file2/newf
+	:100644 100644 $oldf $oldf R100	file2	file2/oldf
+	:100644 000000 $thrf $zero D	file3
 	EOF
-	git diff-tree -M -r master branch >actual &&
+	git diff-tree -M -r main branch >actual &&
 	compare_diff_raw expect actual
 '
 
@@ -586,9 +620,11 @@ test_expect_success 'D: verify pack' '
 '
 
 test_expect_success 'D: validate new files added' '
+	f5id=$(echo "$file5_data" | git hash-object --stdin) &&
+	f6id=$(echo "$file6_data" | git hash-object --stdin) &&
 	cat >expect <<-EOF &&
-	:000000 100755 0000000000000000000000000000000000000000 e74b7d465e52746be2b4bae983670711e6e66657 A	newdir/exec.sh
-	:000000 100644 0000000000000000000000000000000000000000 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 A	newdir/interesting
+	:000000 100755 $ZERO_OID $f6id A	newdir/exec.sh
+	:000000 100644 $ZERO_OID $f5id A	newdir/interesting
 	EOF
 	git diff-tree -M -r branch^ branch >actual &&
 	compare_diff_raw expect actual
@@ -751,12 +787,13 @@ test_expect_success 'H: verify pack' '
 '
 
 test_expect_success 'H: validate old files removed, new files added' '
+	f4id=$(git rev-parse HEAD:file4) &&
 	cat >expect <<-EOF &&
-	:100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D	file2/newf
-	:100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D	file2/oldf
-	:100755 000000 85df50785d62d3b05ab03d9cbf7e4a0b49449730 0000000000000000000000000000000000000000 D	file4
-	:100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100	newdir/interesting	h/e/l/lo
-	:100755 000000 e74b7d465e52746be2b4bae983670711e6e66657 0000000000000000000000000000000000000000 D	newdir/exec.sh
+	:100755 000000 $newf $zero D	file2/newf
+	:100644 000000 $oldf $zero D	file2/oldf
+	:100755 000000 $f4id $zero D	file4
+	:100644 100644 $f5id $f5id R100	newdir/interesting	h/e/l/lo
+	:100755 000000 $f6id $zero D	newdir/exec.sh
 	EOF
 	git diff-tree -M -r H^ H >actual &&
 	compare_diff_raw expect actual
@@ -907,14 +944,15 @@ test_expect_success 'L: verify internal tree sorting' '
 	INPUT_END
 
 	cat >expect <<-EXPECT_END &&
-	:100644 100644 4268632... 55d3a52... M	b.
-	:040000 040000 0ae5cac... 443c768... M	b
-	:100644 100644 4268632... 55d3a52... M	ba
+	:100644 100644 M	b.
+	:040000 040000 M	b
+	:100644 100644 M	ba
 	EXPECT_END
 
 	git fast-import <input &&
 	GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev --raw L^ L >output &&
-	test_cmp expect output
+	cut -d" " -f1,2,5 output >actual &&
+	test_cmp expect actual
 '
 
 test_expect_success 'L: nested tree copy does not corrupt deltas' '
@@ -976,7 +1014,7 @@ test_expect_success 'M: rename file in same subdirectory' '
 	INPUT_END
 
 	cat >expect <<-EOF &&
-	:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100	file2/newf	file2/n.e.w.f
+	:100755 100755 $newf $newf R100	file2/newf	file2/n.e.w.f
 	EOF
 	git fast-import <input &&
 	git diff-tree -M -r M1^ M1 >actual &&
@@ -997,7 +1035,7 @@ test_expect_success 'M: rename file to new subdirectory' '
 	INPUT_END
 
 	cat >expect <<-EOF &&
-	:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100	file2/newf	i/am/new/to/you
+	:100755 100755 $newf $newf R100	file2/newf	i/am/new/to/you
 	EOF
 	git fast-import <input &&
 	git diff-tree -M -r M2^ M2 >actual &&
@@ -1018,7 +1056,7 @@ test_expect_success 'M: rename subdirectory to new subdirectory' '
 	INPUT_END
 
 	cat >expect <<-EOF &&
-	:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100	i/am/new/to/you	other/sub/am/new/to/you
+	:100755 100755 $newf $newf R100	i/am/new/to/you	other/sub/am/new/to/you
 	EOF
 	git fast-import <input &&
 	git diff-tree -M -r M3^ M3 >actual &&
@@ -1039,15 +1077,14 @@ test_expect_success 'M: rename root to subdirectory' '
 	INPUT_END
 
 	cat >expect <<-EOF &&
-	:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 R100	file2/oldf	sub/file2/oldf
-	:100755 100755 85df50785d62d3b05ab03d9cbf7e4a0b49449730 85df50785d62d3b05ab03d9cbf7e4a0b49449730 R100	file4	sub/file4
-	:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc R100	i/am/new/to/you	sub/i/am/new/to/you
-	:100755 100755 e74b7d465e52746be2b4bae983670711e6e66657 e74b7d465e52746be2b4bae983670711e6e66657 R100	newdir/exec.sh	sub/newdir/exec.sh
-	:100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 R100	newdir/interesting	sub/newdir/interesting
+	:100644 100644 $oldf $oldf R100	file2/oldf	sub/file2/oldf
+	:100755 100755 $f4id $f4id R100	file4	sub/file4
+	:100755 100755 $newf $newf R100	i/am/new/to/you	sub/i/am/new/to/you
+	:100755 100755 $f6id $f6id R100	newdir/exec.sh	sub/newdir/exec.sh
+	:100644 100644 $f5id $f5id R100	newdir/interesting	sub/newdir/interesting
 	EOF
 	git fast-import <input &&
 	git diff-tree -M -r M4^ M4 >actual &&
-	cat actual &&
 	compare_diff_raw expect actual
 '
 
@@ -1070,7 +1107,7 @@ test_expect_success 'N: copy file in same subdirectory' '
 	INPUT_END
 
 	cat >expect <<-EOF &&
-	:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100	file2/newf	file2/n.e.w.f
+	:100755 100755 $newf $newf C100	file2/newf	file2/n.e.w.f
 	EOF
 	git fast-import <input &&
 	git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&
@@ -1102,9 +1139,9 @@ test_expect_success 'N: copy then modify subdirectory' '
 	INPUT_END
 
 	cat >expect <<-EOF &&
-	:100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100	newdir/interesting	file3/file5
-	:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100	file2/newf	file3/newf
-	:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100	file2/oldf	file3/oldf
+	:100644 100644 $f5id $f5id C100	newdir/interesting	file3/file5
+	:100755 100755 $newf $newf C100	file2/newf	file3/newf
+	:100644 100644 $oldf $oldf C100	file2/oldf	file3/oldf
 	EOF
 	git fast-import <input &&
 	git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&
@@ -1135,9 +1172,9 @@ test_expect_success 'N: copy dirty subdirectory' '
 '
 
 test_expect_success 'N: copy directory by id' '
-	cat >expect <<-\EOF &&
-	:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100	file2/newf	file3/newf
-	:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100	file2/oldf	file3/oldf
+	cat >expect <<-EOF &&
+	:100755 100755 $newf $newf C100	file2/newf	file3/newf
+	:100644 100644 $oldf $oldf C100	file2/oldf	file3/oldf
 	EOF
 	subdir=$(git rev-parse refs/heads/branch^0:file2) &&
 	cat >input <<-INPUT_END &&
@@ -1156,9 +1193,9 @@ test_expect_success 'N: copy directory by id' '
 '
 
 test_expect_success PIPE 'N: read and copy directory' '
-	cat >expect <<-\EOF &&
-	:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100	file2/newf	file3/newf
-	:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100	file2/oldf	file3/oldf
+	cat >expect <<-EOF &&
+	:100755 100755 $newf $newf C100	file2/newf	file3/newf
+	:100644 100644 $oldf $oldf C100	file2/oldf	file3/oldf
 	EOF
 	git update-ref -d refs/heads/N4 &&
 	rm -f backflow &&
@@ -1227,9 +1264,9 @@ test_expect_success PIPE 'N: empty directory reads as missing' '
 '
 
 test_expect_success 'N: copy root directory by tree hash' '
-	cat >expect <<-\EOF &&
-	:100755 000000 f1fb5da718392694d0076d677d6d0e364c79b0bc 0000000000000000000000000000000000000000 D	file3/newf
-	:100644 000000 7123f7f44e39be127c5eb701e5968176ee9d78b1 0000000000000000000000000000000000000000 D	file3/oldf
+	cat >expect <<-EOF &&
+	:100755 000000 $newf $zero D	file3/newf
+	:100644 000000 $oldf $zero D	file3/oldf
 	EOF
 	root=$(git rev-parse refs/heads/branch^0^{tree}) &&
 	cat >input <<-INPUT_END &&
@@ -1248,12 +1285,12 @@ test_expect_success 'N: copy root directory by tree hash' '
 '
 
 test_expect_success 'N: copy root by path' '
-	cat >expect <<-\EOF &&
-	:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100	file2/newf	oldroot/file2/newf
-	:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100	file2/oldf	oldroot/file2/oldf
-	:100755 100755 85df50785d62d3b05ab03d9cbf7e4a0b49449730 85df50785d62d3b05ab03d9cbf7e4a0b49449730 C100	file4	oldroot/file4
-	:100755 100755 e74b7d465e52746be2b4bae983670711e6e66657 e74b7d465e52746be2b4bae983670711e6e66657 C100	newdir/exec.sh	oldroot/newdir/exec.sh
-	:100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100	newdir/interesting	oldroot/newdir/interesting
+	cat >expect <<-EOF &&
+	:100755 100755 $newf $newf C100	file2/newf	oldroot/file2/newf
+	:100644 100644 $oldf $oldf C100	file2/oldf	oldroot/file2/oldf
+	:100755 100755 $f4id $f4id C100	file4	oldroot/file4
+	:100755 100755 $f6id $f6id C100	newdir/exec.sh	oldroot/newdir/exec.sh
+	:100644 100644 $f5id $f5id C100	newdir/interesting	oldroot/newdir/interesting
 	EOF
 	cat >input <<-INPUT_END &&
 	commit refs/heads/N-copy-root-path
@@ -1313,10 +1350,10 @@ test_expect_success 'N: delete directory by copying' '
 '
 
 test_expect_success 'N: modify copied tree' '
-	cat >expect <<-\EOF &&
-	:100644 100644 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 fcf778cda181eaa1cbc9e9ce3a2e15ee9f9fe791 C100	newdir/interesting	file3/file5
-	:100755 100755 f1fb5da718392694d0076d677d6d0e364c79b0bc f1fb5da718392694d0076d677d6d0e364c79b0bc C100	file2/newf	file3/newf
-	:100644 100644 7123f7f44e39be127c5eb701e5968176ee9d78b1 7123f7f44e39be127c5eb701e5968176ee9d78b1 C100	file2/oldf	file3/oldf
+	cat >expect <<-EOF &&
+	:100644 100644 $f5id $f5id C100	newdir/interesting	file3/file5
+	:100755 100755 $newf $newf C100	file2/newf	file3/newf
+	:100644 100644 $oldf $oldf C100	file2/oldf	file3/oldf
 	EOF
 	subdir=$(git rev-parse refs/heads/branch^0:file2) &&
 	cat >input <<-INPUT_END &&
@@ -1501,7 +1538,6 @@ test_expect_success 'O: comments are all skipped' '
 	commit refs/heads/O1
 	# -- ignore all of this text
 	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
-	# $GIT_COMMITTER_NAME has inserted here for his benefit.
 	data <<COMMIT
 	dirty directory copy
 	COMMIT
@@ -1595,7 +1631,10 @@ test_expect_success 'O: blank lines not necessary after other commands' '
 	INPUT_END
 
 	git fast-import <input &&
-	test 8 = $(find .git/objects/pack -type f | grep -v multi-pack-index | wc -l) &&
+	ls -la .git/objects/pack/pack-*.pack >packlist &&
+	ls -la .git/objects/pack/pack-*.pack >idxlist &&
+	test_line_count = 4 idxlist &&
+	test_line_count = 4 packlist &&
 	test $(git rev-parse refs/tags/O3-2nd) = $(git rev-parse O3^) &&
 	git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&
 	test_cmp expect actual
@@ -1664,7 +1703,7 @@ test_expect_success 'P: superproject & submodule mix' '
 	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 	data 8
 	initial
-	from refs/heads/master
+	from refs/heads/main
 	M 100644 :3 .gitmodules
 	M 160000 :2 sub
 
@@ -1699,8 +1738,8 @@ test_expect_success 'P: superproject & submodule mix' '
 	(
 		cd sub &&
 		git init &&
-		git fetch --update-head-ok .. refs/heads/sub:refs/heads/master &&
-		git checkout master
+		git fetch --update-head-ok .. refs/heads/sub:refs/heads/main &&
+		git checkout main
 	) &&
 	git submodule init &&
 	git submodule update
@@ -1724,7 +1763,7 @@ test_expect_success 'P: verbatim SHA gitlinks' '
 	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 	data 8
 	initial
-	from refs/heads/master
+	from refs/heads/main
 	M 100644 :1 .gitmodules
 	M 160000 $SUBPREV sub
 
@@ -2143,12 +2182,27 @@ test_expect_success 'R: abort on receiving feature after data command' '
 	test_must_fail git fast-import <input
 '
 
+test_expect_success 'R: import-marks features forbidden by default' '
+	>git.marks &&
+	echo "feature import-marks=git.marks" >input &&
+	test_must_fail git fast-import <input &&
+	echo "feature import-marks-if-exists=git.marks" >input &&
+	test_must_fail git fast-import <input
+'
+
 test_expect_success 'R: only one import-marks feature allowed per stream' '
+	>git.marks &&
+	>git2.marks &&
 	cat >input <<-EOF &&
 	feature import-marks=git.marks
 	feature import-marks=git2.marks
 	EOF
 
+	test_must_fail git fast-import --allow-unsafe-features <input
+'
+
+test_expect_success 'R: export-marks feature forbidden by default' '
+	echo "feature export-marks=git.marks" >input &&
 	test_must_fail git fast-import <input
 '
 
@@ -2162,19 +2216,29 @@ test_expect_success 'R: export-marks feature results in a marks file being creat
 
 	EOF
 
-	cat input | git fast-import &&
+	git fast-import --allow-unsafe-features <input &&
 	grep :1 git.marks
 '
 
 test_expect_success 'R: export-marks options can be overridden by commandline options' '
-	cat input | git fast-import --export-marks=other.marks &&
-	grep :1 other.marks
+	cat >input <<-\EOF &&
+	feature export-marks=feature-sub/git.marks
+	blob
+	mark :1
+	data 3
+	hi
+
+	EOF
+	git fast-import --allow-unsafe-features \
+			--export-marks=cmdline-sub/other.marks <input &&
+	grep :1 cmdline-sub/other.marks &&
+	test_path_is_missing feature-sub
 '
 
 test_expect_success 'R: catch typo in marks file name' '
 	test_must_fail git fast-import --import-marks=nonexistent.marks </dev/null &&
 	echo "feature import-marks=nonexistent.marks" |
-	test_must_fail git fast-import
+	test_must_fail git fast-import --allow-unsafe-features
 '
 
 test_expect_success 'R: import and output marks can be the same file' '
@@ -2229,7 +2293,8 @@ test_expect_success 'R: --import-marks-if-exists' '
 test_expect_success 'R: feature import-marks-if-exists' '
 	rm -f io.marks &&
 
-	git fast-import --export-marks=io.marks <<-\EOF &&
+	git fast-import --export-marks=io.marks \
+			--allow-unsafe-features <<-\EOF &&
 	feature import-marks-if-exists=not_io.marks
 	EOF
 	test_must_be_empty io.marks &&
@@ -2240,7 +2305,8 @@ test_expect_success 'R: feature import-marks-if-exists' '
 	echo ":1 $blob" >expect &&
 	echo ":2 $blob" >>expect &&
 
-	git fast-import --export-marks=io.marks <<-\EOF &&
+	git fast-import --export-marks=io.marks \
+			--allow-unsafe-features <<-\EOF &&
 	feature import-marks-if-exists=io.marks
 	blob
 	mark :2
@@ -2253,7 +2319,8 @@ test_expect_success 'R: feature import-marks-if-exists' '
 	echo ":3 $blob" >>expect &&
 
 	git fast-import --import-marks=io.marks \
-			--export-marks=io.marks <<-\EOF &&
+			--export-marks=io.marks \
+			--allow-unsafe-features <<-\EOF &&
 	feature import-marks-if-exists=not_io.marks
 	blob
 	mark :3
@@ -2264,7 +2331,8 @@ test_expect_success 'R: feature import-marks-if-exists' '
 	test_cmp expect io.marks &&
 
 	git fast-import --import-marks-if-exists=not_io.marks \
-			--export-marks=io.marks <<-\EOF &&
+			--export-marks=io.marks \
+			--allow-unsafe-features <<-\EOF &&
 	feature import-marks-if-exists=io.marks
 	EOF
 	test_must_be_empty io.marks
@@ -2276,7 +2344,7 @@ test_expect_success 'R: import to output marks works without any content' '
 	feature export-marks=marks.new
 	EOF
 
-	cat input | git fast-import &&
+	git fast-import --allow-unsafe-features <input &&
 	test_cmp marks.out marks.new
 '
 
@@ -2286,7 +2354,7 @@ test_expect_success 'R: import marks prefers commandline marks file over the str
 	feature export-marks=marks.new
 	EOF
 
-	cat input | git fast-import --import-marks=marks.out &&
+	git fast-import --import-marks=marks.out --allow-unsafe-features <input &&
 	test_cmp marks.out marks.new
 '
 
@@ -2299,7 +2367,8 @@ test_expect_success 'R: multiple --import-marks= should be honoured' '
 
 	head -n2 marks.out > one.marks &&
 	tail -n +3 marks.out > two.marks &&
-	git fast-import --import-marks=one.marks --import-marks=two.marks <input &&
+	git fast-import --import-marks=one.marks --import-marks=two.marks \
+		--allow-unsafe-features <input &&
 	test_cmp marks.out combined.marks
 '
 
@@ -2312,7 +2381,7 @@ test_expect_success 'R: feature relative-marks should be honoured' '
 
 	mkdir -p .git/info/fast-import/ &&
 	cp marks.new .git/info/fast-import/relative.in &&
-	git fast-import <input &&
+	git fast-import --allow-unsafe-features <input &&
 	test_cmp marks.new .git/info/fast-import/relative.out
 '
 
@@ -2324,7 +2393,7 @@ test_expect_success 'R: feature no-relative-marks should be honoured' '
 	feature export-marks=non-relative.out
 	EOF
 
-	git fast-import <input &&
+	git fast-import --allow-unsafe-features <input &&
 	test_cmp marks.new non-relative.out
 '
 
@@ -2477,9 +2546,6 @@ test_expect_success PIPE 'R: copy using cat-file' '
 	echo $expect_id blob $expect_len >expect.response &&
 
 	rm -f blobs &&
-	cat >frontend <<-\FRONTEND_END &&
-	#!/bin/sh
-	FRONTEND_END
 
 	mkfifo blobs &&
 	(
@@ -2594,7 +2660,7 @@ test_expect_success 'R: quiet option results in no stats being output' '
 
 	EOF
 
-	cat input | git fast-import 2> output &&
+	git fast-import 2>output <input &&
 	test_must_be_empty output
 '
 
@@ -2672,7 +2738,7 @@ test_expect_success 'R: corrupt lines do not mess marks file' '
 	rm -f io.marks &&
 	blob=$(echo hi | git hash-object --stdin) &&
 	cat >expect <<-EOF &&
-	:3 0000000000000000000000000000000000000000
+	:3 $ZERO_OID
 	:1 $blob
 	:2 $blob
 	EOF
@@ -3023,7 +3089,7 @@ test_expect_success 'T: delete branch' '
 	git branch to-delete &&
 	git fast-import <<-EOF &&
 	reset refs/heads/to-delete
-	from 0000000000000000000000000000000000000000
+	from $ZERO_OID
 	EOF
 	test_must_fail git rev-parse --verify refs/heads/to-delete
 '
@@ -3063,6 +3129,9 @@ test_expect_success 'U: initialize for U tests' '
 
 	INPUT_END
 
+	f7id=$(echo "blob 1" | git hash-object --stdin) &&
+	f8id=$(echo "sleep well" | git hash-object --stdin) &&
+	f9id=$(echo "au revoir" | git hash-object --stdin) &&
 	git fast-import <input
 '
 
@@ -3083,7 +3152,7 @@ test_expect_success 'U: filedelete file succeeds' '
 
 test_expect_success 'U: validate file delete result' '
 	cat >expect <<-EOF &&
-	:100644 000000 2907ebb4bf85d91bf0716bb3bd8a68ef48d6da76 0000000000000000000000000000000000000000 D	good/night.txt
+	:100644 000000 $f8id $ZERO_OID D	good/night.txt
 	EOF
 
 	git diff-tree -M -r U^1 U >actual &&
@@ -3108,7 +3177,7 @@ test_expect_success 'U: filedelete directory succeeds' '
 
 test_expect_success 'U: validate directory delete result' '
 	cat >expect <<-EOF &&
-	:100644 000000 69cb75792f55123d8389c156b0b41c2ff00ed507 0000000000000000000000000000000000000000 D	good/bye.txt
+	:100644 000000 $f9id $ZERO_OID D	good/bye.txt
 	EOF
 
 	git diff-tree -M -r U^1 U >actual &&
@@ -3133,7 +3202,7 @@ test_expect_success 'U: filedelete root succeeds' '
 
 test_expect_success 'U: validate root delete result' '
 	cat >expect <<-EOF &&
-	:100644 000000 c18147dc648481eeb65dc5e66628429a64843327 0000000000000000000000000000000000000000 D	hello.c
+	:100644 000000 $f7id $ZERO_OID D	hello.c
 	EOF
 
 	git diff-tree -M -r U^1 U >actual &&
@@ -3164,13 +3233,22 @@ background_import_then_checkpoint () {
 	exec 9<>V.output
 	rm V.output
 
-	git fast-import $options <&8 >&9 &
-	echo $! >V.pid
+	(
+		git fast-import $options <&8 >&9 &
+		echo $! >&9
+		wait $!
+		echo >&2 "background fast-import terminated too early with exit code $?"
+		# Un-block the read loop in the main shell process.
+		echo >&9 UNEXPECTED
+	) &
+	sh_pid=$!
+	read fi_pid <&9
 	# We don't mind if fast-import has already died by the time the test
 	# ends.
 	test_when_finished "
 		exec 8>&-; exec 9>&-;
-		kill $(cat V.pid) && wait $(cat V.pid)
+		kill $sh_pid && wait $sh_pid
+		kill $fi_pid && wait $fi_pid
 		true"
 
 	# Start in the background to ensure we adhere strictly to (blocking)
@@ -3190,6 +3268,9 @@ background_import_then_checkpoint () {
 		then
 			error=0
 			break
+		elif test "$output" = "UNEXPECTED"
+		then
+			break
 		fi
 		# otherwise ignore cruft
 		echo >&2 "cruft: $output"
@@ -3202,7 +3283,7 @@ background_import_then_checkpoint () {
 }
 
 background_import_still_running () {
-	if ! kill -0 "$(cat V.pid)"
+	if ! kill -0 "$fi_pid"
 	then
 		echo >&2 "background fast-import terminated too early"
 		false
@@ -3343,4 +3424,113 @@ test_expect_success 'X: handling encoding' '
 	git log -1 --format=%B encoding | grep $(printf "\317\200")
 '
 
+###
+### series Y (submodules and hash algorithms)
+###
+
+cat >Y-sub-input <<\Y_INPUT_END
+blob
+mark :1
+data 4
+foo
+
+reset refs/heads/main
+commit refs/heads/main
+mark :2
+author Full Name <user@company.tld> 1000000000 +0100
+committer Full Name <user@company.tld> 1000000000 +0100
+data 24
+Test submodule commit 1
+M 100644 :1 file
+
+blob
+mark :3
+data 8
+foo
+bar
+
+commit refs/heads/main
+mark :4
+author Full Name <user@company.tld> 1000000001 +0100
+committer Full Name <user@company.tld> 1000000001 +0100
+data 24
+Test submodule commit 2
+from :2
+M 100644 :3 file
+Y_INPUT_END
+
+# Note that the submodule object IDs are intentionally not translated.
+cat >Y-main-input <<\Y_INPUT_END
+blob
+mark :1
+data 4
+foo
+
+reset refs/heads/main
+commit refs/heads/main
+mark :2
+author Full Name <user@company.tld> 2000000000 +0100
+committer Full Name <user@company.tld> 2000000000 +0100
+data 14
+Test commit 1
+M 100644 :1 file
+
+blob
+mark :3
+data 73
+[submodule "sub1"]
+	path = sub1
+	url = https://void.example.com/main.git
+
+commit refs/heads/main
+mark :4
+author Full Name <user@company.tld> 2000000001 +0100
+committer Full Name <user@company.tld> 2000000001 +0100
+data 14
+Test commit 2
+from :2
+M 100644 :3 .gitmodules
+M 160000 0712c5be7cf681388e355ef47525aaf23aee1a6d sub1
+
+blob
+mark :5
+data 8
+foo
+bar
+
+commit refs/heads/main
+mark :6
+author Full Name <user@company.tld> 2000000002 +0100
+committer Full Name <user@company.tld> 2000000002 +0100
+data 14
+Test commit 3
+from :4
+M 100644 :5 file
+M 160000 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7 sub1
+Y_INPUT_END
+
+cat >Y-marks <<\Y_INPUT_END
+:2 0712c5be7cf681388e355ef47525aaf23aee1a6d
+:4 ff729f5e62f72c0c3978207d9a80e5f3a65f14d7
+Y_INPUT_END
+
+test_expect_success 'Y: setup' '
+	test_oid_cache <<-EOF
+	Ymain sha1:9afed2f9161ddf416c0a1863b8b0725b00070504
+	Ymain sha256:c0a1010da1df187b2e287654793df01b464bd6f8e3f17fc1481a7dadf84caee3
+	EOF
+'
+
+test_expect_success 'Y: rewrite submodules' '
+	git init main1 &&
+	(
+		cd main1 &&
+		git init sub2 &&
+		git -C sub2 fast-import --export-marks=../sub2-marks <../Y-sub-input &&
+		git fast-import --rewrite-submodules-from=sub:../Y-marks \
+			--rewrite-submodules-to=sub:sub2-marks <../Y-main-input &&
+		test "$(git rev-parse main)" = "$(test_oid Ymain)"
+	)
+'
+
 test_done
diff --git a/t/t9301-fast-import-notes.sh b/t/t9301-fast-import-notes.sh
index dadc70b7d5..1ae4d7c0d3 100755
--- a/t/t9301-fast-import-notes.sh
+++ b/t/t9301-fast-import-notes.sh
@@ -4,12 +4,15 @@
 #
 
 test_description='test git fast-import of notes objects'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 
 test_tick
 cat >input <<INPUT_END
-commit refs/heads/master
+commit refs/heads/main
 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 data <<COMMIT
 first commit
@@ -30,7 +33,7 @@ data <<EOF
 file baz/xyzzy in first commit
 EOF
 
-commit refs/heads/master
+commit refs/heads/main
 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 data <<COMMIT
 second commit
@@ -46,7 +49,7 @@ data <<EOF
 file baz/xyzzy in second commit
 EOF
 
-commit refs/heads/master
+commit refs/heads/main
 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 data <<COMMIT
 third commit
@@ -57,7 +60,7 @@ data <<EOF
 file foo in third commit
 EOF
 
-commit refs/heads/master
+commit refs/heads/main
 committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 data <<COMMIT
 fourth commit
@@ -70,13 +73,13 @@ EOF
 
 INPUT_END
 
-test_expect_success 'set up master branch' '
+test_expect_success 'set up main branch' '
 
 	git fast-import <input &&
-	git whatchanged master
+	git whatchanged main
 '
 
-commit4=$(git rev-parse refs/heads/master)
+commit4=$(git rev-parse refs/heads/main)
 commit3=$(git rev-parse "$commit4^")
 commit2=$(git rev-parse "$commit4~2")
 commit1=$(git rev-parse "$commit4~3")
@@ -275,7 +278,7 @@ $whitespace
     third note for first commit
 EXPECT_END
 
-test_expect_success 'add concatentation notes with M command' '
+test_expect_success 'add concatenation notes with M command' '
 
 	git fast-import <input &&
 	GIT_NOTES_REF=refs/notes/test git log | grep "^    " > actual &&
@@ -470,12 +473,13 @@ test_expect_success 'add lots of commits and notes' '
 '
 
 test_expect_success 'verify that lots of notes trigger a fanout scheme' '
+	hexsz=$(test_oid hexsz) &&
 
 	# None of the entries in the top-level notes tree should be a full SHA1
 	git ls-tree --name-only refs/notes/many_notes |
 	while read path
 	do
-		if test $(expr length "$path") -ge 40
+		if test $(expr length "$path") -ge $hexsz
 		then
 			return 1
 		fi
@@ -518,7 +522,7 @@ test_expect_success 'verify that importing a notes tree respects the fanout sche
 	git ls-tree --name-only refs/notes/other_notes |
 	while read path
 	do
-		if test $(expr length "$path") -ge 40
+		if test $(expr length "$path") -ge $hexsz
 		then
 			return 1
 		fi
@@ -593,7 +597,7 @@ test_expect_success 'verify that changing notes respect existing fanout' '
 	git ls-tree --name-only refs/notes/many_notes |
 	while read path
 	do
-		if test $(expr length "$path") -ge 40
+		if test $(expr length "$path") -ge $hexsz
 		then
 			return 1
 		fi
@@ -616,7 +620,7 @@ i=$(($num_commits - $remaining_notes))
 for sha1 in $(git rev-list -n $i refs/heads/many_commits)
 do
 	cat >>input <<INPUT_END
-N 0000000000000000000000000000000000000000 $sha1
+N $ZERO_OID $sha1
 INPUT_END
 done
 
@@ -646,7 +650,6 @@ test_expect_success 'remove lots of notes' '
 '
 
 test_expect_success 'verify that removing notes trigger fanout consolidation' '
-
 	# All entries in the top-level notes tree should be a full SHA1
 	git ls-tree --name-only -r refs/notes/many_notes |
 	while read path
@@ -656,7 +659,7 @@ test_expect_success 'verify that removing notes trigger fanout consolidation' '
 		test "$path" = "deadbeef" && continue
 		test "$path" = "de/adbeef" && continue
 
-		if test $(expr length "$path") -ne 40
+		if test $(expr length "$path") -ne $hexsz
 		then
 			return 1
 		fi
diff --git a/t/t9302-fast-import-unpack-limit.sh b/t/t9302-fast-import-unpack-limit.sh
index bb1c39cfcc..f519e4f1bf 100755
--- a/t/t9302-fast-import-unpack-limit.sh
+++ b/t/t9302-fast-import-unpack-limit.sh
@@ -5,7 +5,7 @@ test_description='test git fast-import unpack limit'
 test_expect_success 'create loose objects on import' '
 	test_tick &&
 	cat >input <<-INPUT_END &&
-	commit refs/heads/master
+	commit refs/heads/main
 	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 	data <<COMMIT
 	initial
@@ -23,12 +23,12 @@ test_expect_success 'create loose objects on import' '
 test_expect_success 'bigger packs are preserved' '
 	test_tick &&
 	cat >input <<-INPUT_END &&
-	commit refs/heads/master
+	commit refs/heads/main
 	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
 	data <<COMMIT
 	incremental should create a pack
 	COMMIT
-	from refs/heads/master^0
+	from refs/heads/main^0
 
 	commit refs/heads/branch
 	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
@@ -48,7 +48,7 @@ test_expect_success 'bigger packs are preserved' '
 test_expect_success 'lookups after checkpoint works' '
 	hello_id=$(echo hello | git hash-object --stdin -t blob) &&
 	id="$GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE" &&
-	before=$(git rev-parse refs/heads/master^0) &&
+	before=$(git rev-parse refs/heads/main^0) &&
 	(
 		cat <<-INPUT_END &&
 		blob
@@ -56,13 +56,13 @@ test_expect_success 'lookups after checkpoint works' '
 		data 6
 		hello
 
-		commit refs/heads/master
+		commit refs/heads/main
 		mark :2
 		committer $id
 		data <<COMMIT
 		checkpoint after this
 		COMMIT
-		from refs/heads/master^0
+		from refs/heads/main^0
 		M 100644 :1 hello
 
 		# pre-checkpoint
@@ -86,10 +86,10 @@ test_expect_success 'lookups after checkpoint works' '
 				n=$(($n + 1))
 			fi &&
 			sleep 1 &&
-			from=$(git rev-parse refs/heads/master^0)
+			from=$(git rev-parse refs/heads/main^0)
 		done &&
 		cat <<-INPUT_END &&
-		commit refs/heads/master
+		commit refs/heads/main
 		committer $id
 		data <<COMMIT
 		make sure from "unpacked sha1 reference" works, too
diff --git a/t/t9303-fast-import-compression.sh b/t/t9303-fast-import-compression.sh
index 5045f02a53..57d916524e 100755
--- a/t/t9303-fast-import-compression.sh
+++ b/t/t9303-fast-import-compression.sh
@@ -3,12 +3,6 @@
 test_description='compression setting of fast-import utility'
 . ./test-lib.sh
 
-# This should be moved to test-lib.sh together with the
-# copy in t0021 after both topics have graduated to 'master'.
-file_size () {
-	test-tool path-utils file-size "$1"
-}
-
 import_large () {
 	(
 		echo blob
@@ -24,7 +18,7 @@ do
 		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
 		test_when_finished "rm -rf .git/objects/??" &&
 		import_large -c fastimport.unpacklimit=0 $config &&
-		sz=$(file_size .git/objects/pack/pack-*.pack) &&
+		sz=$(test_file_size .git/objects/pack/pack-*.pack) &&
 		case "$expect" in
 		small) test "$sz" -le 100000 ;;
 		large) test "$sz" -ge 100000 ;;
@@ -47,7 +41,7 @@ do
 		test_when_finished "rm -f .git/objects/pack/pack-*.*" &&
 		test_when_finished "rm -rf .git/objects/??" &&
 		import_large -c fastimport.unpacklimit=9 $config &&
-		sz=$(file_size .git/objects/??/????*) &&
+		sz=$(test_file_size .git/objects/??/????*) &&
 		case "$expect" in
 		small) test "$sz" -le 100000 ;;
 		large) test "$sz" -ge 100000 ;;
diff --git a/t/t9304-fast-import-marks.sh b/t/t9304-fast-import-marks.sh
new file mode 100755
index 0000000000..d4359dba21
--- /dev/null
+++ b/t/t9304-fast-import-marks.sh
@@ -0,0 +1,51 @@
+#!/bin/sh
+
+test_description='test exotic situations with marks'
+. ./test-lib.sh
+
+test_expect_success 'setup dump of basic history' '
+	test_commit one &&
+	git fast-export --export-marks=marks HEAD >dump
+'
+
+test_expect_success 'setup large marks file' '
+	# normally a marks file would have a lot of useful, unique
+	# marks. But for our purposes, just having a lot of nonsense
+	# ones is fine. Start at 1024 to avoid clashing with marks
+	# legitimately used in our tiny dump.
+	blob=$(git rev-parse HEAD:one.t) &&
+	for i in $(test_seq 1024 16384)
+	do
+		echo ":$i $blob"
+	done >>marks
+'
+
+test_expect_success 'import with large marks file' '
+	git fast-import --import-marks=marks <dump
+'
+
+test_expect_success 'setup dump with submodule' '
+	git submodule add "$PWD" sub &&
+	git commit -m "add submodule" &&
+	git fast-export HEAD >dump
+'
+
+test_expect_success 'setup submodule mapping with large id' '
+	old=$(git rev-parse HEAD:sub) &&
+	new=$(echo $old | sed s/./a/g) &&
+	echo ":12345 $old" >from &&
+	echo ":12345 $new" >to
+'
+
+test_expect_success 'import with submodule mapping' '
+	git init dst &&
+	git -C dst fast-import \
+		--rewrite-submodules-from=sub:../from \
+		--rewrite-submodules-to=sub:../to \
+		<dump &&
+	git -C dst rev-parse HEAD:sub >actual &&
+	echo "$new" >expect &&
+	test_cmp expect actual
+'
+
+test_done
diff --git a/t/t9350-fast-export.sh b/t/t9350-fast-export.sh
index 2e4e214815..409b48e244 100755
--- a/t/t9350-fast-export.sh
+++ b/t/t9350-fast-export.sh
@@ -4,6 +4,9 @@
 #
 
 test_description='git fast-export'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup' '
@@ -31,13 +34,13 @@ test_expect_success 'setup' '
 	git commit -m sitzt file2 &&
 	test_tick &&
 	git tag -a -m valentin muss &&
-	git merge -s ours master
+	git merge -s ours main
 
 '
 
 test_expect_success 'fast-export | fast-import' '
 
-	MASTER=$(git rev-parse --verify master) &&
+	MAIN=$(git rev-parse --verify main) &&
 	REIN=$(git rev-parse --verify rein) &&
 	WER=$(git rev-parse --verify wer) &&
 	MUSS=$(git rev-parse --verify muss) &&
@@ -46,7 +49,7 @@ test_expect_success 'fast-export | fast-import' '
 	git fast-export --all >actual &&
 	(cd new &&
 	 git fast-import &&
-	 test $MASTER = $(git rev-parse --verify refs/heads/master) &&
+	 test $MAIN = $(git rev-parse --verify refs/heads/main) &&
 	 test $REIN = $(git rev-parse --verify refs/tags/rein) &&
 	 test $WER = $(git rev-parse --verify refs/heads/wer) &&
 	 test $MUSS = $(git rev-parse --verify refs/tags/muss)) <actual
@@ -80,35 +83,35 @@ test_expect_success 'fast-export --mark-tags ^muss^{commit} muss' '
 	test_cmp expected actual
 '
 
-test_expect_success 'fast-export master~2..master' '
+test_expect_success 'fast-export main~2..main' '
 
-	git fast-export master~2..master >actual &&
-	sed "s/master/partial/" actual |
+	git fast-export main~2..main >actual &&
+	sed "s/main/partial/" actual |
 		(cd new &&
 		 git fast-import &&
-		 test $MASTER != $(git rev-parse --verify refs/heads/partial) &&
-		 git diff --exit-code master partial &&
-		 git diff --exit-code master^ partial^ &&
+		 test $MAIN != $(git rev-parse --verify refs/heads/partial) &&
+		 git diff --exit-code main partial &&
+		 git diff --exit-code main^ partial^ &&
 		 test_must_fail git rev-parse partial~2)
 
 '
 
-test_expect_success 'fast-export --reference-excluded-parents master~2..master' '
+test_expect_success 'fast-export --reference-excluded-parents main~2..main' '
 
-	git fast-export --reference-excluded-parents master~2..master >actual &&
-	grep commit.refs/heads/master actual >commit-count &&
+	git fast-export --reference-excluded-parents main~2..main >actual &&
+	grep commit.refs/heads/main actual >commit-count &&
 	test_line_count = 2 commit-count &&
-	sed "s/master/rewrite/" actual |
+	sed "s/main/rewrite/" actual |
 		(cd new &&
 		 git fast-import &&
-		 test $MASTER = $(git rev-parse --verify refs/heads/rewrite))
+		 test $MAIN = $(git rev-parse --verify refs/heads/rewrite))
 '
 
 test_expect_success 'fast-export --show-original-ids' '
 
-	git fast-export --show-original-ids master >output &&
+	git fast-export --show-original-ids main >output &&
 	grep ^original-oid output| sed -e s/^original-oid.// | sort >actual &&
-	git rev-list --objects master muss >objects-and-names &&
+	git rev-list --objects main muss >objects-and-names &&
 	awk "{print \$1}" objects-and-names | sort >commits-trees-blobs &&
 	comm -23 actual commits-trees-blobs >unfound &&
 	test_must_be_empty unfound
@@ -116,8 +119,8 @@ test_expect_success 'fast-export --show-original-ids' '
 
 test_expect_success 'fast-export --show-original-ids | git fast-import' '
 
-	git fast-export --show-original-ids master muss | git fast-import --quiet &&
-	test $MASTER = $(git rev-parse --verify refs/heads/master) &&
+	git fast-export --show-original-ids main muss | git fast-import --quiet &&
+	test $MAIN = $(git rev-parse --verify refs/heads/main) &&
 	test $MUSS = $(git rev-parse --verify refs/tags/muss)
 '
 
@@ -132,12 +135,12 @@ test_expect_success 'reencoding iso-8859-7' '
 	sed "s/wer/i18n/" iso-8859-7.fi |
 		(cd new &&
 		 git fast-import &&
-		 # The commit object, if not re-encoded, would be 240 bytes.
+		 # The commit object, if not re-encoded, would be 200 bytes plus hash.
 		 # Removing the "encoding iso-8859-7\n" header drops 20 bytes.
 		 # Re-encoding the Pi character from \xF0 (\360) in iso-8859-7
 		 # to \xCF\x80 (\317\200) in UTF-8 adds a byte.  Check for
 		 # the expected size.
-		 test 221 -eq "$(git cat-file -s i18n)" &&
+		 test $(($(test_oid hexsz) + 181)) -eq "$(git cat-file -s i18n)" &&
 		 # ...and for the expected translation of bytes.
 		 git cat-file commit i18n >actual &&
 		 grep $(printf "\317\200") actual &&
@@ -164,12 +167,12 @@ test_expect_success 'preserving iso-8859-7' '
 	sed "s/wer/i18n-no-recoding/" iso-8859-7.fi |
 		(cd new &&
 		 git fast-import &&
-		 # The commit object, if not re-encoded, is 240 bytes.
+		 # The commit object, if not re-encoded, is 200 bytes plus hash.
 		 # Removing the "encoding iso-8859-7\n" header would drops 20
 		 # bytes.  Re-encoding the Pi character from \xF0 (\360) in
 		 # iso-8859-7 to \xCF\x80 (\317\200) in UTF-8 adds a byte.
 		 # Check for the expected size...
-		 test 240 -eq "$(git cat-file -s i18n-no-recoding)" &&
+		 test $(($(test_oid hexsz) + 200)) -eq "$(git cat-file -s i18n-no-recoding)" &&
 		 # ...as well as the expected byte.
 		 git cat-file commit i18n-no-recoding >actual &&
 		 grep $(printf "\360") actual &&
@@ -192,7 +195,7 @@ test_expect_success 'encoding preserved if reencoding fails' '
 		 grep ^encoding actual &&
 		 # Verify that the commit has the expected size; i.e.
 		 # that no bytes were re-encoded to a different encoding.
-		 test 252 -eq "$(git cat-file -s i18n-invalid)" &&
+		 test $(($(test_oid hexsz) + 212)) -eq "$(git cat-file -s i18n-invalid)" &&
 		 # ...and check for the original special bytes
 		 grep $(printf "\360") actual &&
 		 grep $(printf "\377") actual)
@@ -200,7 +203,7 @@ test_expect_success 'encoding preserved if reencoding fails' '
 
 test_expect_success 'import/export-marks' '
 
-	git checkout -b marks master &&
+	git checkout -b marks main &&
 	git fast-export --export-marks=tmp-marks HEAD &&
 	test -s tmp-marks &&
 	test_line_count = 3 tmp-marks &&
@@ -265,7 +268,7 @@ test_expect_success 'signed-tags=warn-strip' '
 
 test_expect_success 'setup submodule' '
 
-	git checkout -f master &&
+	git checkout -f main &&
 	mkdir sub &&
 	(
 		cd sub &&
@@ -290,17 +293,17 @@ test_expect_success 'setup submodule' '
 
 test_expect_success 'submodule fast-export | fast-import' '
 
-	SUBENT1=$(git ls-tree master^ sub) &&
-	SUBENT2=$(git ls-tree master sub) &&
+	SUBENT1=$(git ls-tree main^ sub) &&
+	SUBENT2=$(git ls-tree main sub) &&
 	rm -rf new &&
 	mkdir new &&
 	git --git-dir=new/.git init &&
 	git fast-export --signed-tags=strip --all >actual &&
 	(cd new &&
 	 git fast-import &&
-	 test "$SUBENT1" = "$(git ls-tree refs/heads/master^ sub)" &&
-	 test "$SUBENT2" = "$(git ls-tree refs/heads/master sub)" &&
-	 git checkout master &&
+	 test "$SUBENT1" = "$(git ls-tree refs/heads/main^ sub)" &&
+	 test "$SUBENT2" = "$(git ls-tree refs/heads/main sub)" &&
+	 git checkout main &&
 	 git submodule init &&
 	 git submodule update &&
 	 cmp sub/file ../sub/file) <actual
@@ -352,7 +355,7 @@ test_expect_success 'fast-export -C -C | fast-import' '
 
 '
 
-test_expect_success 'fast-export | fast-import when master is tagged' '
+test_expect_success 'fast-export | fast-import when main is tagged' '
 
 	git tag -m msg last &&
 	git fast-export -C -C --signed-tags=strip --all > output &&
@@ -467,8 +470,8 @@ mark :2
 data 3
 hi
 
-reset refs/heads/master
-commit refs/heads/master
+reset refs/heads/main
+commit refs/heads/main
 mark :3
 author A U Thor <author@example.com> 1112912713 -0700
 committer C O Mitter <committer@example.com> 1112912713 -0700
@@ -482,7 +485,7 @@ EOF
 test_expect_failure 'no exact-ref revisions included' '
 	(
 		cd limit-by-paths &&
-		git fast-export master~2..master~1 > output &&
+		git fast-export main~2..main~1 > output &&
 		test_cmp expected output
 	)
 '
@@ -524,7 +527,7 @@ test_expect_success 'full-tree re-shows unmodified files'        '
 '
 
 test_expect_success 'set-up a few more tags for tag export tests' '
-	git checkout -f master &&
+	git checkout -f main &&
 	HEAD_TREE=$(git show -s --pretty=raw HEAD | grep tree | sed "s/tree //") &&
 	git tag    tree_tag        -m "tagging a tree" $HEAD_TREE &&
 	git tag -a tree_tag-obj    -m "tagging a tree" $HEAD_TREE &&
@@ -541,7 +544,7 @@ test_expect_success 'tree_tag'        '
 
 # NEEDSWORK: not just check return status, but validate the output
 # Note that these tests DO NOTHING other than print a warning that
-# they are ommitting the one tag we asked them to export (because the
+# they are omitting the one tag we asked them to export (because the
 # tags resolve to a tree).  They exist just to make sure we do not
 # abort but instead just warn.
 test_expect_success 'tree_tag-obj'    'git fast-export tree_tag-obj'
@@ -549,7 +552,7 @@ test_expect_success 'tag-obj_tag'     'git fast-export tag-obj_tag'
 test_expect_success 'tag-obj_tag-obj' 'git fast-export tag-obj_tag-obj'
 
 test_expect_success 'handling tags of blobs' '
-	git tag -a -m "Tag of a blob" blobtag $(git rev-parse master:file) &&
+	git tag -a -m "Tag of a blob" blobtag $(git rev-parse main:file) &&
 	git fast-export blobtag >actual &&
 	cat >expect <<-EOF &&
 	blob
@@ -592,17 +595,18 @@ test_expect_success 'directory becomes symlink'        '
 	) &&
 	(
 		cd dirtosymlink &&
-		git fast-export master -- foo |
+		git fast-export main -- foo |
 		(cd ../result && git fast-import --quiet)
 	) &&
-	(cd result && git show master:foo)
+	(cd result && git show main:foo)
 '
 
 test_expect_success 'fast-export quotes pathnames' '
 	git init crazy-paths &&
+	test_config -C crazy-paths core.protectNTFS false &&
 	(cd crazy-paths &&
 	 blob=$(echo foo | git hash-object -w --stdin) &&
-	 git update-index --add \
+	 git -c core.protectNTFS=false update-index --add \
 		--cacheinfo 100644 $blob "$(printf "path with\\nnewline")" \
 		--cacheinfo 100644 $blob "path with \"quote\"" \
 		--cacheinfo 100644 $blob "path with \\backslash" \
@@ -642,7 +646,7 @@ mark :13
 data 5
 bump
 
-commit refs/heads/master
+commit refs/heads/main
 mark :14
 author A U Thor <author@example.com> 1112912773 -0700
 committer C O Mitter <committer@example.com> 1112912773 -0700
@@ -656,18 +660,18 @@ EOF
 test_expect_success 'avoid uninteresting refs' '
 	> tmp-marks &&
 	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks master > /dev/null &&
+		--export-marks=tmp-marks main > /dev/null &&
 	git tag v1.0 &&
 	git branch uninteresting &&
 	echo bump > file &&
 	git commit -a -m bump &&
 	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks ^uninteresting ^v1.0 master > actual &&
+		--export-marks=tmp-marks ^uninteresting ^v1.0 main > actual &&
 	test_cmp expected actual
 '
 
 cat > expected << EOF
-reset refs/heads/master
+reset refs/heads/main
 from :14
 
 EOF
@@ -675,14 +679,14 @@ EOF
 test_expect_success 'refs are updated even if no commits need to be exported' '
 	> tmp-marks &&
 	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks master > /dev/null &&
+		--export-marks=tmp-marks main > /dev/null &&
 	git fast-export --import-marks=tmp-marks \
-		--export-marks=tmp-marks master > actual &&
+		--export-marks=tmp-marks main > actual &&
 	test_cmp expected actual
 '
 
 test_expect_success 'use refspec' '
-	git fast-export --refspec refs/heads/master:refs/heads/foobar master >actual2 &&
+	git fast-export --refspec refs/heads/main:refs/heads/foobar main >actual2 &&
 	grep "^commit " actual2 | sort | uniq >actual &&
 	echo "commit refs/heads/foobar" > expected &&
 	test_cmp expected actual
@@ -693,7 +697,7 @@ test_expect_success 'delete ref because entire history excluded' '
 	git fast-export to-delete ^to-delete >actual &&
 	cat >expected <<-EOF &&
 	reset refs/heads/to-delete
-	from 0000000000000000000000000000000000000000
+	from $ZERO_OID
 
 	EOF
 	test_cmp expected actual
@@ -703,7 +707,7 @@ test_expect_success 'delete refspec' '
 	git fast-export --refspec :refs/heads/to-delete >actual &&
 	cat >expected <<-EOF &&
 	reset refs/heads/to-delete
-	from 0000000000000000000000000000000000000000
+	from $ZERO_OID
 
 	EOF
 	test_cmp expected actual
@@ -735,13 +739,13 @@ test_expect_success 'merge commit gets exported with --import-marks' '
 		test_commit initial &&
 		git checkout -b topic &&
 		test_commit on-topic &&
-		git checkout master &&
-		test_commit on-master &&
+		git checkout main &&
+		test_commit on-main &&
 		test_tick &&
 		git merge --no-ff -m Yeah topic &&
 
 		echo ":1 $(git rev-parse HEAD^^)" >marks &&
-		git fast-export --import-marks=marks master >out &&
+		git fast-export --import-marks=marks main >out &&
 		grep Yeah out
 	)
 '
diff --git a/t/t9351-fast-export-anonymize.sh b/t/t9351-fast-export-anonymize.sh
index 897dc50907..1c6e6fcdaf 100755
--- a/t/t9351-fast-export-anonymize.sh
+++ b/t/t9351-fast-export-anonymize.sh
@@ -1,20 +1,32 @@
 #!/bin/sh
 
 test_description='basic tests for fast-export --anonymize'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 test_expect_success 'setup simple repo' '
 	test_commit base &&
 	test_commit foo &&
+	test_commit retain-me &&
 	git checkout -b other HEAD^ &&
 	mkdir subdir &&
 	test_commit subdir/bar &&
 	test_commit subdir/xyzzy &&
+	fake_commit=$(echo $ZERO_OID | sed s/0/a/) &&
+	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
 '
 
 test_expect_success 'export anonymized stream' '
-	git fast-export --anonymize --all >stream
+	git fast-export --anonymize --all \
+		--anonymize-map=retain-me \
+		--anonymize-map=xyzzy:custom-name \
+		--anonymize-map=other \
+		>stream
 '
 
 # this also covers commit messages
@@ -26,12 +38,23 @@ test_expect_success 'stream omits path names' '
 	! grep xyzzy stream
 '
 
-test_expect_success 'stream allows master as refname' '
-	grep master stream
+test_expect_success 'stream contains user-specified names' '
+	grep retain-me stream &&
+	grep custom-name stream
+'
+
+test_expect_success 'stream omits gitlink oids' '
+	# avoid relying on the whole oid to remain hash-agnostic; this is
+	# plenty to be unique within our test case
+	! grep a000000000000000000 stream
+'
+
+test_expect_success 'stream retains other as refname' '
+	grep other stream
 '
 
 test_expect_success 'stream omits other refnames' '
-	! grep other stream &&
+	! grep main stream &&
 	! grep mytag stream
 '
 
@@ -57,42 +80,44 @@ test_expect_success 'import stream to new repository' '
 test_expect_success 'result has two branches' '
 	git for-each-ref --format="%(refname)" refs/heads >branches &&
 	test_line_count = 2 branches &&
-	other_branch=$(grep -v refs/heads/master branches)
+	other_branch=refs/heads/other &&
+	main_branch=$(grep -v $other_branch branches)
 '
 
 test_expect_success 'repo has original shape and timestamps' '
 	shape () {
 		git log --format="%m %ct" --left-right --boundary "$@"
 	} &&
-	(cd .. && shape master...other) >expect &&
-	shape master...$other_branch >actual &&
+	(cd .. && shape main...other) >expect &&
+	shape $main_branch...$other_branch >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'root tree has original shape' '
 	# the output entries are not necessarily in the same
-	# order, but we know at least that we will have one tree
-	# and one blob, so just check the sorted order
-	cat >expect <<-\EOF &&
-	blob
-	tree
-	EOF
+	# order, but we should at least have the same set of
+	# object types.
+	git -C .. ls-tree HEAD >orig-root &&
+	cut -d" " -f2 <orig-root | sort >expect &&
 	git ls-tree $other_branch >root &&
 	cut -d" " -f2 <root | sort >actual &&
 	test_cmp expect actual
 '
 
 test_expect_success 'paths in subdir ended up in one tree' '
-	cat >expect <<-\EOF &&
-	blob
-	blob
-	EOF
+	git -C .. ls-tree other:subdir >orig-subdir &&
+	cut -d" " -f2 <orig-subdir | sort >expect &&
 	tree=$(grep tree root | cut -f2) &&
 	git ls-tree $other_branch:$tree >tree &&
 	cut -d" " -f2 <tree >actual &&
 	test_cmp expect actual
 '
 
+test_expect_success 'identical gitlinks got identical oid' '
+	awk "/commit/ { print \$3 }" <root | sort -u >commits &&
+	test_line_count = 1 commits
+'
+
 test_expect_success 'tag points to branch tip' '
 	git rev-parse $other_branch >expect &&
 	git for-each-ref --format="%(*objectname)" | grep . >actual &&
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
index a5e5dca753..2d29d486ee 100755
--- a/t/t9400-git-cvsserver-server.sh
+++ b/t/t9400-git-cvsserver-server.sh
@@ -8,6 +8,9 @@ test_description='git-cvsserver access
 tests read access to a git repository with the
 cvs CLI client via git-cvsserver server'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 if ! test_have_prereq PERL; then
@@ -45,7 +48,7 @@ test_expect_success 'setup' '
   touch secondrootfile &&
   git add secondrootfile &&
   git commit -m "second root") &&
-  git fetch secondroot master &&
+  git fetch secondroot main &&
   git merge --allow-unrelated-histories FETCH_HEAD &&
   git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 &&
   GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
@@ -57,7 +60,7 @@ test_expect_success 'setup' '
 # note that cvs doesn't accept absolute pathnames
 # as argument to co -d
 test_expect_success 'basic checkout' \
-  'GIT_CONFIG="$git_config" cvs -Q co -d cvswork master &&
+  'GIT_CONFIG="$git_config" cvs -Q co -d cvswork main &&
    test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | head -n 1))" = "empty/1.1/" &&
    test "$(echo $(grep -v ^D cvswork/CVS/Entries|cut -d/ -f2,3,5 | sed -ne \$p))" = "secondrootfile/1.1/"'
 
@@ -226,7 +229,7 @@ GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true || exit 1
 
 test_expect_success 'gitcvs.enabled = false' \
   'GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
-   if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
+   if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
    then
      echo unexpected cvs success
      false
@@ -240,14 +243,14 @@ rm -fr cvswork2
 test_expect_success 'gitcvs.ext.enabled = true' \
   'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
    GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled false &&
-   GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
+   GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
    test_cmp cvswork cvswork2'
 
 rm -fr cvswork2
 test_expect_success 'gitcvs.ext.enabled = false' \
   'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled false &&
    GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true &&
-   if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1
+   if GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1
    then
      echo unexpected cvs success
      false
@@ -261,21 +264,21 @@ rm -fr cvswork2
 test_expect_success 'gitcvs.dbname' \
   'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
    GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs.%a.%m.sqlite &&
-   GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
+   GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
    test_cmp cvswork cvswork2 &&
-   test -f "$SERVERDIR/gitcvs.ext.master.sqlite" &&
-   cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs.ext.master.sqlite"'
+   test -f "$SERVERDIR/gitcvs.ext.main.sqlite" &&
+   cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs.ext.main.sqlite"'
 
 rm -fr cvswork2
 test_expect_success 'gitcvs.ext.dbname' \
   'GIT_DIR="$SERVERDIR" git config --bool gitcvs.ext.enabled true &&
    GIT_DIR="$SERVERDIR" git config gitcvs.ext.dbname %Ggitcvs1.%a.%m.sqlite &&
    GIT_DIR="$SERVERDIR" git config gitcvs.dbname %Ggitcvs2.%a.%m.sqlite &&
-   GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
+   GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
    test_cmp cvswork cvswork2 &&
-   test -f "$SERVERDIR/gitcvs1.ext.master.sqlite" &&
-   test ! -f "$SERVERDIR/gitcvs2.ext.master.sqlite" &&
-   cmp "$SERVERDIR/gitcvs.master.sqlite" "$SERVERDIR/gitcvs1.ext.master.sqlite"'
+   test -f "$SERVERDIR/gitcvs1.ext.main.sqlite" &&
+   test ! -f "$SERVERDIR/gitcvs2.ext.main.sqlite" &&
+   cmp "$SERVERDIR/gitcvs.main.sqlite" "$SERVERDIR/gitcvs1.ext.main.sqlite"'
 
 
 #------------
@@ -457,7 +460,7 @@ cd "$WORKDIR"
 test_expect_success 'cvs update (module list supports packed refs)' '
     GIT_DIR="$SERVERDIR" git pack-refs --all &&
     GIT_CONFIG="$git_config" cvs -n up -d 2> out &&
-    grep "cvs update: New directory \`master'\''" < out
+    grep "cvs update: New directory \`main'\''" < out
 '
 
 #------------
@@ -499,8 +502,8 @@ test_expect_success 'cvs status (no subdirs in header)' '
 cd "$WORKDIR"
 test_expect_success 'cvs co -c (shows module database)' '
     GIT_CONFIG="$git_config" cvs co -c > out &&
-    grep "^master[	 ][ 	]*master$" <out &&
-    ! grep -v "^master[	 ][ 	]*master$" <out
+    grep "^main[	 ][ 	]*main$" <out &&
+    ! grep -v "^main[	 ][ 	]*main$" <out
 '
 
 #------------
@@ -526,7 +529,7 @@ test_expect_success 'cvs co -c (shows module database)' '
 
 sed -e 's/^x//' -e 's/SP$/ /' > "$WORKDIR/expect" <<EOF
 x
-xRCS file: $WORKDIR/gitcvs.git/master/merge,v
+xRCS file: $WORKDIR/gitcvs.git/main/merge,v
 xWorking file: merge
 xhead: 1.4
 xbranch:
@@ -603,7 +606,7 @@ test_expect_success 'cvs server does not run with vanilla git-shell' '
 		cd cvswork &&
 		CVS_SERVER=$WORKDIR/remote-cvs &&
 		export CVS_SERVER &&
-		test_must_fail cvs log merge
+		! cvs log merge
 	)
 '
 
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
index 84787eee9a..a34805acdc 100755
--- a/t/t9401-git-cvsserver-crlf.sh
+++ b/t/t9401-git-cvsserver-crlf.sh
@@ -9,6 +9,9 @@ test_description='git-cvsserver -kb modes
 tests -kb mode for binary files when accessing a git
 repository using cvs CLI client via git-cvsserver server'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 marked_as () {
@@ -105,14 +108,14 @@ test_expect_success 'setup' '
 '
 
 test_expect_success 'cvs co (default crlf)' '
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
     test x"$(grep '/-k' cvswork/CVS/Entries cvswork/subdir/CVS/Entries)" = x""
 '
 
 rm -rf cvswork
 test_expect_success 'cvs co (allbinary)' '
     GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary true &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
     marked_as cvswork textfile.c -kb &&
     marked_as cvswork binfile.bin -kb &&
     marked_as cvswork .gitattributes -kb &&
@@ -125,7 +128,7 @@ test_expect_success 'cvs co (allbinary)' '
 rm -rf cvswork cvs.log
 test_expect_success 'cvs co (use attributes/allbinary)' '
     GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr true &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
     marked_as cvswork textfile.c "" &&
     marked_as cvswork binfile.bin -kb &&
     marked_as cvswork .gitattributes -kb &&
@@ -138,7 +141,7 @@ test_expect_success 'cvs co (use attributes/allbinary)' '
 rm -rf cvswork
 test_expect_success 'cvs co (use attributes)' '
     GIT_DIR="$SERVERDIR" git config --bool gitcvs.allbinary false &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
     marked_as cvswork textfile.c "" &&
     marked_as cvswork binfile.bin -kb &&
     marked_as cvswork .gitattributes "" &&
@@ -167,10 +170,10 @@ test_expect_success 'adding files' '
 
 test_expect_success 'updating' '
     git pull gitcvs.git &&
-    echo 'hi' > subdir/newfile.bin &&
-    echo 'junk' > subdir/file.h &&
-    echo 'hi' > subdir/newfile.c &&
-    echo 'hello' >> binfile.bin &&
+    echo "hi" >subdir/newfile.bin &&
+    echo "junk" >subdir/file.h &&
+    echo "hi" >subdir/newfile.c &&
+    echo "hello" >>binfile.bin &&
     git add subdir/newfile.bin subdir/file.h subdir/newfile.c binfile.bin &&
     git commit -q -m "Add and change some files" &&
     git push gitcvs.git >/dev/null &&
@@ -194,7 +197,7 @@ test_expect_success 'updating' '
 rm -rf cvswork
 test_expect_success 'cvs co (use attributes/guess)' '
     GIT_DIR="$SERVERDIR" git config gitcvs.allbinary guess &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
     marked_as cvswork textfile.c "" &&
     marked_as cvswork binfile.bin -kb &&
     marked_as cvswork .gitattributes "" &&
@@ -224,7 +227,7 @@ test_expect_success 'setup multi-line files' '
 rm -rf cvswork
 test_expect_success 'cvs co (guess)' '
     GIT_DIR="$SERVERDIR" git config --bool gitcvs.usecrlfattr false &&
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork master >cvs.log 2>&1 &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork main >cvs.log 2>&1 &&
     marked_as cvswork textfile.c "" &&
     marked_as cvswork binfile.bin -kb &&
     marked_as cvswork .gitattributes "" &&
@@ -239,7 +242,7 @@ test_expect_success 'cvs co (guess)' '
 '
 
 test_expect_success 'cvs co another copy (guess)' '
-    GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 master >cvs.log 2>&1 &&
+    GIT_CONFIG="$git_config" cvs -Q co -d cvswork2 main >cvs.log 2>&1 &&
     marked_as cvswork2 textfile.c "" &&
     marked_as cvswork2 binfile.bin -kb &&
     marked_as cvswork2 .gitattributes "" &&
@@ -335,7 +338,7 @@ test_expect_success 'update subdir of other copy (guess)' '
 
 echo "starting update/merge" >> "${WORKDIR}/marked.log"
 test_expect_success 'update/merge full other copy (guess)' '
-    git pull gitcvs.git master &&
+    git pull gitcvs.git main &&
     sed "s/3/replaced_3/" < multilineTxt.c > ml.temp &&
     mv ml.temp multilineTxt.c &&
     git add multilineTxt.c &&
diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh
index cf31ace667..2ee41f9443 100755
--- a/t/t9402-git-cvsserver-refs.sh
+++ b/t/t9402-git-cvsserver-refs.sh
@@ -5,6 +5,9 @@ test_description='git-cvsserver and git refspecs
 tests ability for git-cvsserver to switch between and compare
 tags, branches and other git refspecs'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./test-lib.sh
 
 #########
@@ -115,7 +118,7 @@ test_expect_success 'setup v1, b1' '
 
 rm -rf cvswork
 test_expect_success 'cvs co v1' '
-	cvs -f -Q co -r v1 -d cvswork master >cvs.log 2>&1 &&
+	cvs -f -Q co -r v1 -d cvswork main >cvs.log 2>&1 &&
 	check_start_tree cvswork &&
 	check_file cvswork textfile.c v1 &&
 	check_file cvswork t2 v1 &&
@@ -128,7 +131,7 @@ test_expect_success 'cvs co v1' '
 
 rm -rf cvswork
 test_expect_success 'cvs co b1' '
-	cvs -f co -r b1 -d cvswork master >cvs.log 2>&1 &&
+	cvs -f co -r b1 -d cvswork main >cvs.log 2>&1 &&
 	check_start_tree cvswork &&
 	check_file cvswork textfile.c v1 &&
 	check_file cvswork t2 v1 &&
@@ -140,7 +143,7 @@ test_expect_success 'cvs co b1' '
 '
 
 test_expect_success 'cvs co b1 [cvswork3]' '
-	cvs -f co -r b1 -d cvswork3 master >cvs.log 2>&1 &&
+	cvs -f co -r b1 -d cvswork3 main >cvs.log 2>&1 &&
 	check_start_tree cvswork3 &&
 	check_file cvswork3 textfile.c v1 &&
 	check_file cvswork3 t2 v1 &&
@@ -178,7 +181,7 @@ test_expect_success 'setup v1.2 on b1' '
 	mkdir cdir &&
 	echo "cdir/cfile" >cdir/cfile &&
 	git add -A cdir adir t3 t2 &&
-	git commit -q -m 'v1.2' &&
+	git commit -q -m "v1.2" &&
 	git tag v1.2 &&
 	git push --tags gitcvs.git b1:b1
 '
@@ -265,7 +268,7 @@ test_expect_success 'setup simple b2' '
 '
 
 test_expect_success 'cvs co b2 [into cvswork2]' '
-	cvs -f co -r b2 -d cvswork2 master >cvs.log 2>&1 &&
+	cvs -f co -r b2 -d cvswork2 main >cvs.log 2>&1 &&
 	check_start_tree cvswork &&
 	check_file cvswork textfile.c v1 &&
 	check_file cvswork t2 v1 &&
diff --git a/t/t9500-gitweb-standalone-no-errors.sh b/t/t9500-gitweb-standalone-no-errors.sh
index cc8d463e01..0333065d4d 100755
--- a/t/t9500-gitweb-standalone-no-errors.sh
+++ b/t/t9500-gitweb-standalone-no-errors.sh
@@ -10,7 +10,10 @@ commandline, and checks that it would not write any errors
 or warnings to log.'
 
 
-. ./gitweb-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./lib-gitweb.sh
 
 # ----------------------------------------------------------------------
 # no commits (empty, just initialized repository)
@@ -53,7 +56,7 @@ test_expect_success \
 
 test_expect_success \
 	'Make initial commit' \
-	'echo "Not an empty file." > file &&
+	'echo "Not an empty file." >file &&
 	 git add file &&
 	 git commit -a -m "Initial commit." &&
 	 git branch b'
@@ -139,7 +142,7 @@ test_expect_success \
 
 test_expect_success \
 	'commitdiff(0): file added' \
-	'echo "New file" > new_file &&
+	'echo "New file" >new_file &&
 	 git add new_file &&
 	 git commit -a -m "File added." &&
 	 gitweb_run "p=.git;a=commitdiff"'
@@ -179,7 +182,7 @@ test_expect_success \
 
 test_expect_success \
 	'commitdiff(0): mode change and modified' \
-	'echo "New line" >> file2 &&
+	'echo "New line" >>file2 &&
 	 test_chmod +x file2 &&
 	 git commit -a -m "Mode change and modification." &&
 	 gitweb_run "p=.git;a=commitdiff"'
@@ -197,14 +200,14 @@ propter nomen suum.
 EOF
 	 git commit -a -m "File added." &&
 	 git mv file2 file3 &&
-	 echo "Propter nomen suum." >> file3 &&
+	 echo "Propter nomen suum." >>file3 &&
 	 git commit -a -m "File rename and modification." &&
 	 gitweb_run "p=.git;a=commitdiff"'
 
 test_expect_success \
 	'commitdiff(0): renamed, mode change and modified' \
 	'git mv file3 file2 &&
-	 echo "Propter nomen suum." >> file2 &&
+	 echo "Propter nomen suum." >>file2 &&
 	 test_chmod +x file2 &&
 	 git commit -a -m "File rename, mode change and modification." &&
 	 gitweb_run "p=.git;a=commitdiff"'
@@ -213,8 +216,8 @@ test_expect_success \
 # commitdiff testing (taken from t4114-apply-typechange.sh)
 
 test_expect_success 'setup typechange commits' '
-	echo "hello world" > foo &&
-	echo "hi planet" > bar &&
+	echo "hello world" >foo &&
+	echo "hi planet" >bar &&
 	git update-index --add foo bar &&
 	git commit -m initial &&
 	git branch initial &&
@@ -223,18 +226,18 @@ test_expect_success 'setup typechange commits' '
 	git commit -m "foo symlinked to bar" &&
 	git branch foo-symlinked-to-bar &&
 	rm -f foo &&
-	echo "how far is the sun?" > foo &&
+	echo "how far is the sun?" >foo &&
 	git update-index foo &&
 	git commit -m "foo back to file" &&
 	git branch foo-back-to-file &&
 	rm -f foo &&
 	git update-index --remove foo &&
 	mkdir foo &&
-	echo "if only I knew" > foo/baz &&
+	echo "if only I knew" >foo/baz &&
 	git update-index --add foo/baz &&
 	git commit -m "foo becomes a directory" &&
 	git branch "foo-becomes-a-directory" &&
-	echo "hello world" > foo/baz &&
+	echo "hello world" >foo/baz &&
 	git update-index foo/baz &&
 	git commit -m "foo/baz is the original foo" &&
 	git branch foo-baz-renamed-from-foo
@@ -324,10 +327,10 @@ test_expect_success 'commitdiff(1): removal of incomplete line' '
 test_expect_success \
 	'Create a merge' \
 	'git checkout b &&
-	 echo "Branch" >> b &&
+	 echo "Branch" >>b &&
 	 git add b &&
 	 git commit -a -m "On branch" &&
-	 git checkout master &&
+	 git checkout main &&
 	 git merge b &&
 	 git tag merge_commit'
 
@@ -342,29 +345,29 @@ test_expect_success \
 test_expect_success \
 	'Prepare large commit' \
 	'git checkout b &&
-	 echo "To be changed" > 01-change &&
-	 echo "To be renamed" > 02-pure-rename-from &&
-	 echo "To be deleted" > 03-delete &&
-	 echo "To be renamed and changed" > 04-rename-from &&
-	 echo "To have mode changed" > 05-mode-change &&
-	 echo "File to symlink" > 06-file-or-symlink &&
-	 echo "To be changed and have mode changed" > 07-change-mode-change	&&
+	 echo "To be changed" >01-change &&
+	 echo "To be renamed" >02-pure-rename-from &&
+	 echo "To be deleted" >03-delete &&
+	 echo "To be renamed and changed" >04-rename-from &&
+	 echo "To have mode changed" >05-mode-change &&
+	 echo "File to symlink" >06-file-or-symlink &&
+	 echo "To be changed and have mode changed" >07-change-mode-change &&
 	 git add 0* &&
 	 git commit -a -m "Prepare large commit" &&
-	 echo "Changed" > 01-change &&
+	 echo "Changed" >01-change &&
 	 git mv 02-pure-rename-from 02-pure-rename-to &&
 	 git rm 03-delete && rm -f 03-delete &&
-	 echo "A new file" > 03-new &&
+	 echo "A new file" >03-new &&
 	 git add 03-new &&
 	 git mv 04-rename-from 04-rename-to &&
-	 echo "Changed" >> 04-rename-to &&
+	 echo "Changed" >>04-rename-to &&
 	 test_chmod +x 05-mode-change &&
 	 rm -f 06-file-or-symlink &&
 	 test_ln_s_add 01-change 06-file-or-symlink &&
-	 echo "Changed and have mode changed" > 07-change-mode-change	&&
+	 echo "Changed and have mode changed" >07-change-mode-change &&
 	 test_chmod +x 07-change-mode-change &&
 	 git commit -a -m "Large commit" &&
-	 git checkout master'
+	 git checkout main'
 
 test_expect_success \
 	'commit(1): large commit' \
@@ -402,7 +405,7 @@ test_expect_success 'side-by-side: merge commit' '
 
 test_expect_success \
 	'tags: list of different types of tags' \
-	'git checkout master &&
+	'git checkout main &&
 	 git tag -a -m "Tag commit object" tag-commit HEAD &&
 	 git tag -a -m "" tag-commit-nomessage HEAD &&
 	 git tag -a -m "Tag tag object" tag-tag tag-commit &&
@@ -443,8 +446,8 @@ test_expect_success \
 
 test_expect_success \
 	'logs: history (implicit HEAD, deleted file)' \
-	'git checkout master &&
-	 echo "to be deleted" > deleted_file &&
+	'git checkout main &&
+	 echo "to be deleted" >deleted_file &&
 	 git add deleted_file &&
 	 git commit -m "Add file to be deleted" &&
 	 git rm deleted_file &&
@@ -463,11 +466,11 @@ test_expect_success \
 
 test_expect_success \
 	'path_info: project/branch:file' \
-	'gitweb_run "" "/.git/master:file"'
+	'gitweb_run "" "/.git/main:file"'
 
 test_expect_success \
 	'path_info: project/branch:dir/' \
-	'gitweb_run "" "/.git/master:foo/"'
+	'gitweb_run "" "/.git/main:foo/"'
 
 test_expect_success \
 	'path_info: project/branch (non-existent)' \
@@ -479,16 +482,16 @@ test_expect_success \
 
 test_expect_success \
 	'path_info: project/branch:file (non-existent)' \
-	'gitweb_run "" "/.git/master:non-existent"'
+	'gitweb_run "" "/.git/main:non-existent"'
 
 test_expect_success \
 	'path_info: project/branch:dir/ (non-existent)' \
-	'gitweb_run "" "/.git/master:non-existent/"'
+	'gitweb_run "" "/.git/main:non-existent/"'
 
 
 test_expect_success \
 	'path_info: project/branch:/file' \
-	'gitweb_run "" "/.git/master:/file"'
+	'gitweb_run "" "/.git/main:/file"'
 
 test_expect_success \
 	'path_info: project/:/file (implicit HEAD)' \
@@ -522,7 +525,7 @@ test_expect_success \
 	'. "$TEST_DIRECTORY"/t3901/utf8.txt &&
 	 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
 	 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
-	 echo "UTF-8" >> file &&
+	 echo "UTF-8" >>file &&
 	 git add file &&
 	 git commit -F "$TEST_DIRECTORY"/t3900/1-UTF-8.txt &&
 	 gitweb_run "p=.git;a=commit"'
@@ -532,7 +535,7 @@ test_expect_success \
 	'. "$TEST_DIRECTORY"/t3901/8859-1.txt &&
 	 test_when_finished "GIT_AUTHOR_NAME=\"A U Thor\"" &&
 	 test_when_finished "GIT_COMMITTER_NAME=\"C O Mitter\"" &&
-	 echo "ISO-8859-1" >> file &&
+	 echo "ISO-8859-1" >>file &&
 	 git add file &&
 	 test_config i18n.commitencoding ISO-8859-1 &&
 	 git commit -F "$TEST_DIRECTORY"/t3900/ISO8859-1.txt &&
@@ -621,12 +624,22 @@ test_expect_success \
 	 git config gitweb.snapshot "zip,tgz, tbz2" &&
 	 gitweb_run "p=.git;a=tree"'
 
-cat >.git/config <<\EOF
-# testing noval and alternate separator
-[gitweb]
-	blame
-	snapshot = zip tgz
-EOF
+test_expect_success 'setup' '
+	version=$(git config core.repositoryformatversion) &&
+	algo=$(test_might_fail git config extensions.objectformat) &&
+	cat >.git/config <<-\EOF &&
+	# testing noval and alternate separator
+	[gitweb]
+		blame
+		snapshot = zip tgz
+	EOF
+	git config core.repositoryformatversion "$version" &&
+	if test -n "$algo"
+	then
+		git config extensions.objectformat "$algo"
+	fi
+'
+
 test_expect_success \
 	'config override: tree view, features enabled in repo config (2)' \
 	'gitweb_run "p=.git;a=tree"'
@@ -675,8 +688,8 @@ test_expect_success \
 
 test_expect_success \
 	'README.html with non-ASCII characters (utf-8)' \
-	'echo "<b>UTF-8 example:</b><br />" > .git/README.html &&
-	 cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >> .git/README.html &&
+	'echo "<b>UTF-8 example:</b><br />" >.git/README.html &&
+	 cat "$TEST_DIRECTORY"/t3900/1-UTF-8.txt >>.git/README.html &&
 	 gitweb_run "p=.git;a=summary"'
 
 # ----------------------------------------------------------------------
@@ -704,7 +717,7 @@ test_expect_success HIGHLIGHT \
 test_expect_success HIGHLIGHT \
 	'syntax highlighting (highlighted, shell script)' \
 	'git config gitweb.highlight yes &&
-	 echo "#!/usr/bin/sh" > test.sh &&
+	 echo "#!/usr/bin/sh" >test.sh &&
 	 git add test.sh &&
 	 git commit -m "Add test.sh" &&
 	 gitweb_run "p=.git;a=blob;f=test.sh"'
@@ -712,7 +725,7 @@ test_expect_success HIGHLIGHT \
 test_expect_success HIGHLIGHT \
 	'syntax highlighting (highlighter language autodetection)' \
 	'git config gitweb.highlight yes &&
-	 echo "#!/usr/bin/perl" > test &&
+	 echo "#!/usr/bin/perl" >test &&
 	 git add test &&
 	 git commit -m "Add test" &&
 	 gitweb_run "p=.git;a=blob;f=test"'
@@ -729,11 +742,11 @@ test_expect_success \
 	'git init --bare foo.git &&
 	 git --git-dir=foo.git --work-tree=. add file &&
 	 git --git-dir=foo.git --work-tree=. commit -m "Initial commit" &&
-	 echo "foo" > foo.git/description &&
+	 echo "foo" >foo.git/description &&
 	 mkdir -p foo &&
 	 (cd foo &&
 	  git clone --shared --bare ../foo.git foo-forked.git &&
-	  echo "fork of foo" > foo-forked.git/description)'
+	  echo "fork of foo" >foo-forked.git/description)'
 
 test_expect_success \
 	'forks: projects list' \
@@ -754,8 +767,8 @@ EOF
 test_expect_success \
 	'ctags: tag cloud in projects list' \
 	'mkdir .git/ctags &&
-	 echo "2" > .git/ctags/foo &&
-	 echo "1" > .git/ctags/bar &&
+	 echo "2" >.git/ctags/foo &&
+	 echo "1" >.git/ctags/bar &&
 	gitweb_run'
 
 test_expect_success \
@@ -769,8 +782,8 @@ test_expect_success \
 test_expect_success \
 	'ctags: malformed tag weights' \
 	'mkdir -p .git/ctags &&
-	 echo "not-a-number" > .git/ctags/nan &&
-	 echo "not-a-number-2" > .git/ctags/nan2 &&
+	 echo "not-a-number" >.git/ctags/nan &&
+	 echo "not-a-number-2" >.git/ctags/nan2 &&
 	 echo "0.1" >.git/ctags/floating-point &&
 	 gitweb_run'
 
@@ -791,7 +804,7 @@ test_expect_success \
 		git checkout orphan_branch ||
 		git checkout --orphan orphan_branch
 	 } &&
-	 test_when_finished "git checkout master" &&
+	 test_when_finished "git checkout main" &&
 	 gitweb_run "p=.git;a=summary"'
 
 test_done
diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh
index 2a0ffed870..32814e75df 100755
--- a/t/t9501-gitweb-standalone-http-status.sh
+++ b/t/t9501-gitweb-standalone-http-status.sh
@@ -10,7 +10,10 @@ commandline, and checks that it returns the expected HTTP status
 code and message.'
 
 
-. ./gitweb-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./lib-gitweb.sh
 
 #
 # Gitweb only provides the functionality tested by the 'modification times'
@@ -85,7 +88,7 @@ test_debug 'cat gitweb.headers'
 # snapshot hash ids
 
 test_expect_success 'snapshots: good tree-ish id' '
-	gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
 	grep "Status: 200 OK" gitweb.output
 '
 test_debug 'cat gitweb.headers'
@@ -123,7 +126,7 @@ test_debug 'cat gitweb.output'
 # modification times (Last-Modified and If-Modified-Since)
 
 test_expect_success DATE_PARSER 'modification: feed last-modified' '
-	gitweb_run "p=.git;a=atom;h=master" &&
+	gitweb_run "p=.git;a=atom;h=main" &&
 	grep "Status: 200 OK" gitweb.headers &&
 	grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
 '
@@ -133,7 +136,7 @@ test_expect_success DATE_PARSER 'modification: feed if-modified-since (modified)
 	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
 	export HTTP_IF_MODIFIED_SINCE &&
 	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=atom;h=master" &&
+	gitweb_run "p=.git;a=atom;h=main" &&
 	grep "Status: 200 OK" gitweb.headers
 '
 test_debug 'cat gitweb.headers'
@@ -142,13 +145,13 @@ test_expect_success DATE_PARSER 'modification: feed if-modified-since (unmodifie
 	HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
 	export HTTP_IF_MODIFIED_SINCE &&
 	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=atom;h=master" &&
+	gitweb_run "p=.git;a=atom;h=main" &&
 	grep "Status: 304 Not Modified" gitweb.headers
 '
 test_debug 'cat gitweb.headers'
 
 test_expect_success DATE_PARSER 'modification: snapshot last-modified' '
-	gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
 	grep "Status: 200 OK" gitweb.headers &&
 	grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers
 '
@@ -158,7 +161,7 @@ test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (modif
 	HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" &&
 	export HTTP_IF_MODIFIED_SINCE &&
 	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
 	grep "Status: 200 OK" gitweb.headers
 '
 test_debug 'cat gitweb.headers'
@@ -167,7 +170,7 @@ test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (unmod
 	HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" &&
 	export HTTP_IF_MODIFIED_SINCE &&
 	test_when_finished "unset HTTP_IF_MODIFIED_SINCE" &&
-	gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" &&
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tgz" &&
 	grep "Status: 304 Not Modified" gitweb.headers
 '
 test_debug 'cat gitweb.headers'
diff --git a/t/t9502-gitweb-standalone-parse-output.sh b/t/t9502-gitweb-standalone-parse-output.sh
index 0796a438bc..3167473b30 100755
--- a/t/t9502-gitweb-standalone-parse-output.sh
+++ b/t/t9502-gitweb-standalone-parse-output.sh
@@ -10,7 +10,10 @@ commandline, and checks that it produces the correct output, either
 in the HTTP header or the actual script output.'
 
 
-. ./gitweb-lib.sh
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
+. ./lib-gitweb.sh
 
 # ----------------------------------------------------------------------
 # snapshot file name and prefix
@@ -79,10 +82,10 @@ test_expect_success 'snapshot: HEAD' '
 '
 test_debug 'cat gitweb.headers && cat file_list'
 
-test_expect_success 'snapshot: short branch name (master)' '
-	gitweb_run "p=.git;a=snapshot;h=master;sf=tar" &&
-	ID=$(git rev-parse --verify --short=7 master) &&
-	check_snapshot ".git-master-$ID"
+test_expect_success 'snapshot: short branch name (main)' '
+	gitweb_run "p=.git;a=snapshot;h=main;sf=tar" &&
+	ID=$(git rev-parse --verify --short=7 main) &&
+	check_snapshot ".git-main-$ID"
 '
 test_debug 'cat gitweb.headers && cat file_list'
 
@@ -93,10 +96,10 @@ test_expect_success 'snapshot: short tag name (first)' '
 '
 test_debug 'cat gitweb.headers && cat file_list'
 
-test_expect_success 'snapshot: full branch name (refs/heads/master)' '
-	gitweb_run "p=.git;a=snapshot;h=refs/heads/master;sf=tar" &&
-	ID=$(git rev-parse --verify --short=7 master) &&
-	check_snapshot ".git-master-$ID"
+test_expect_success 'snapshot: full branch name (refs/heads/main)' '
+	gitweb_run "p=.git;a=snapshot;h=refs/heads/main;sf=tar" &&
+	ID=$(git rev-parse --verify --short=7 main) &&
+	check_snapshot ".git-main-$ID"
 '
 test_debug 'cat gitweb.headers && cat file_list'
 
@@ -188,8 +191,8 @@ test_expect_success 'forks: project_index lists all projects (incl. forks)' '
 '
 
 xss() {
-	echo >&2 "Checking $1..." &&
-	gitweb_run "$1" &&
+	echo >&2 "Checking $*..." &&
+	gitweb_run "$@" &&
 	if grep "$TAG" gitweb.body; then
 		echo >&2 "xss: $TAG should have been quoted in output"
 		return 1
@@ -200,7 +203,8 @@ xss() {
 test_expect_success 'xss checks' '
 	TAG="<magic-xss-tag>" &&
 	xss "a=rss&p=$TAG" &&
-	xss "a=rss&p=foo.git&f=$TAG"
+	xss "a=rss&p=foo.git&f=$TAG" &&
+	xss "" "$TAG+"
 '
 
 test_done
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 251fdd66c4..5680849218 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -1,6 +1,9 @@
 #!/bin/sh
 
 test_description='git cvsimport basic tests'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-cvs.sh
 
 if ! test_have_prereq NOT_ROOT; then
@@ -159,6 +162,6 @@ test_expect_success PERL 'no .git/cvs-revisions created by default' '
 
 '
 
-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
+test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree main'
 
 test_done
diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
index 827d39f5bf..116cddba3a 100755
--- a/t/t9601-cvsimport-vendor-branch.sh
+++ b/t/t9601-cvsimport-vendor-branch.sh
@@ -32,6 +32,9 @@
 #       tag has been removed.
 
 test_description='git cvsimport handling of vendor branches'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-cvs.sh
 
 setup_cvs_test_repository t9601
@@ -42,43 +45,43 @@ test_expect_success PERL 'import a module with a vendor branch' '
 
 '
 
-test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co master'
+test_expect_success PERL 'check HEAD out of cvs repository' 'test_cvs_co main'
 
-test_expect_success PERL 'check master out of git repository' 'test_git_co master'
+test_expect_success PERL 'check main out of git repository' 'test_git_co main'
 
 test_expect_success PERL 'check a file that was imported once' '
 
-	test_cmp_branch_file master imported-once.txt
+	test_cmp_branch_file main imported-once.txt
 
 '
 
 test_expect_failure PERL 'check a file that was imported twice' '
 
-	test_cmp_branch_file master imported-twice.txt
+	test_cmp_branch_file main imported-twice.txt
 
 '
 
 test_expect_success PERL 'check a file that was imported then modified on HEAD' '
 
-	test_cmp_branch_file master imported-modified.txt
+	test_cmp_branch_file main imported-modified.txt
 
 '
 
 test_expect_success PERL 'check a file that was imported, modified, then imported again' '
 
-	test_cmp_branch_file master imported-modified-imported.txt
+	test_cmp_branch_file main imported-modified-imported.txt
 
 '
 
 test_expect_success PERL 'check a file that was added to HEAD then imported' '
 
-	test_cmp_branch_file master added-imported.txt
+	test_cmp_branch_file main added-imported.txt
 
 '
 
 test_expect_success PERL 'a vendor branch whose tag has been removed' '
 
-	test_cmp_branch_file master imported-anonymously.txt
+	test_cmp_branch_file main imported-anonymously.txt
 
 '
 
diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
index e1db323f54..e5266c9a87 100755
--- a/t/t9602-cvsimport-branches-tags.sh
+++ b/t/t9602-cvsimport-branches-tags.sh
@@ -4,6 +4,9 @@
 # t9602/README.
 
 test_description='git cvsimport handling of branches and tags'
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-cvs.sh
 
 setup_cvs_test_repository t9602
@@ -14,9 +17,9 @@ test_expect_success PERL 'import module' '
 
 '
 
-test_expect_success PERL 'test branch master' '
+test_expect_success PERL 'test branch main' '
 
-	test_cmp_branch_tree master
+	test_cmp_branch_tree main
 
 '
 
diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
index 3e64b11eac..0e9daa5768 100755
--- a/t/t9603-cvsimport-patchsets.sh
+++ b/t/t9603-cvsimport-patchsets.sh
@@ -12,28 +12,31 @@
 # 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
 
 test_expect_failure PERL 'import with criss cross times on revisions' '
-
-    git cvsimport -p"-x" -C module-git module &&
-    (cd module-git &&
-        git log --pretty=format:%s > ../actual-master &&
-        git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
-        echo "" >> ../actual-master &&
-	echo "" >> ../actual-A
-    ) &&
-    echo "Rev 4
+	git cvsimport -p"-x" -C module-git module &&
+	(
+		cd module-git &&
+		git log --pretty=format:%s > ../actual-main &&
+		git log A~2..A --pretty="format:%s %ad" -- > ../actual-A &&
+		echo "" >> ../actual-main &&
+		echo "" >> ../actual-A
+	) &&
+	echo "Rev 4
 Rev 3
 Rev 2
-Rev 1" > expect-master &&
-    test_cmp expect-master actual-master &&
+Rev 1" > expect-main &&
+	test_cmp expect-main actual-main &&
 
-    echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
+	echo "Rev 5 Branch A Wed Mar 11 19:09:10 2009 +0000
 Rev 4 Branch A Wed Mar 11 19:03:52 2009 +0000" > expect-A &&
-    test_cmp expect-A actual-A
+	test_cmp expect-A actual-A
 '
 
 test_done
diff --git a/t/t9700/test.pl b/t/t9700/test.pl
index 34cd01366f..e046f7db76 100755
--- a/t/t9700/test.pl
+++ b/t/t9700/test.pl
@@ -23,6 +23,8 @@ sub adjust_dirsep {
 	return $path;
 }
 
+my $oid_re = qr/^[0-9a-fA-F]{40}(?:[0-9a-fA-F]{24})?$/;
+
 BEGIN { use_ok('Git') }
 
 # set up
@@ -59,15 +61,15 @@ ok($@, "config_bool: non-boolean values fail");
 open STDERR, ">&", $tmpstderr or die "cannot restore STDERR";
 
 # ident
-like($r->ident("aUthor"), qr/^A U Thor <author\@example.com> [0-9]+ \+0000$/,
+like($r->ident("aUthor"), qr/^A U Thor <author\@example.com> [0-9]+ [+-]\d{4}$/,
      "ident scalar: author (type)");
-like($r->ident("cOmmitter"), qr/^C O Mitter <committer\@example.com> [0-9]+ \+0000$/,
+like($r->ident("cOmmitter"), qr/^C O Mitter <committer\@example.com> [0-9]+ [+-]\d{4}$/,
      "ident scalar: committer (type)");
 is($r->ident("invalid"), "invalid", "ident scalar: invalid ident string (no parsing)");
 my ($name, $email, $time_tz) = $r->ident('author');
 is_deeply([$name, $email], ["A U Thor", "author\@example.com"],
 	 "ident array: author");
-like($time_tz, qr/[0-9]+ \+0000/, "ident array: author");
+like($time_tz, qr/[0-9]+ [+-]\d{4}/, "ident array: author");
 is_deeply([$r->ident("Name <email> 123 +0000")], ["Name", "email", "123 +0000"],
 	  "ident array: ident string");
 is_deeply([$r->ident("invalid")], [], "ident array: invalid ident string");
@@ -93,7 +95,7 @@ is(Git::hash_object("blob", $tmpfile), $file1hash, "hash_object: roundtrip");
 open TEMPFILE, ">$tmpfile" or die "Can't open $tmpfile: $!";
 print TEMPFILE my $test_text = "test blob, to be inserted\n";
 close TEMPFILE or die "Failed writing to $tmpfile: $!";
-like(our $newhash = $r->hash_and_insert_object($tmpfile), qr/[0-9a-fA-F]{40}/,
+like(our $newhash = $r->hash_and_insert_object($tmpfile), $oid_re,
      "hash_and_insert_object: returns hash");
 open TEMPFILE, "+>$tmpfile" or die "Can't open $tmpfile: $!";
 is($r->cat_blob($newhash, \*TEMPFILE), length $test_text, "cat_blob: roundtrip size");
@@ -119,7 +121,7 @@ is($r2->wc_subdir, "directory2/", "wc_subdir initial (2)");
 
 # commands in sub directory
 my $last_commit = $r2->command_oneline(qw(rev-parse --verify HEAD));
-like($last_commit, qr/^[0-9a-fA-F]{40}$/, 'rev-parse returned hash');
+like($last_commit, $oid_re, 'rev-parse returned hash');
 my $dir_commit = $r2->command_oneline('log', '-n1', '--pretty=format:%H', '.');
 isnt($last_commit, $dir_commit, 'log . does not show last commit');
 
diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh
index 5856563068..81bc8e8da1 100755
--- a/t/t9800-git-p4-basic.sh
+++ b/t/t9800-git-p4-basic.sh
@@ -2,6 +2,9 @@
 
 test_description='git p4 tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-p4.sh
 
 test_expect_success 'start p4d' '
@@ -202,7 +205,6 @@ test_expect_success 'exit when p4 fails to produce marshaled output' '
 		export PATH &&
 		test_expect_code 1 git p4 clone --dest="$git" //depot >errs 2>&1
 	) &&
-	cat errs &&
 	test_i18ngrep ! Traceback errs
 '
 
@@ -227,7 +229,7 @@ test_expect_success 'clone --bare should make a bare repository' '
 		git config --get --bool core.bare true &&
 		git rev-parse --verify refs/remotes/p4/master &&
 		git rev-parse --verify refs/remotes/p4/HEAD &&
-		git rev-parse --verify refs/heads/master &&
+		git rev-parse --verify refs/heads/main &&
 		git rev-parse --verify HEAD
 	)
 '
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh
index 67ff2711f5..50a6f8bad5 100755
--- a/t/t9801-git-p4-branch.sh
+++ b/t/t9801-git-p4-branch.sh
@@ -2,6 +2,9 @@
 
 test_description='git p4 tests for p4 branches'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-p4.sh
 
 test_expect_success 'start p4d' '
@@ -67,7 +70,7 @@ test_expect_success 'import main, no branch detection' '
 	(
 		cd "$git" &&
 		git log --oneline --graph --decorate --all &&
-		git rev-list master >wc &&
+		git rev-list main -- >wc &&
 		test_line_count = 4 wc
 	)
 '
@@ -78,7 +81,7 @@ test_expect_success 'import branch1, no branch detection' '
 	(
 		cd "$git" &&
 		git log --oneline --graph --decorate --all &&
-		git rev-list master >wc &&
+		git rev-list main -- >wc &&
 		test_line_count = 2 wc
 	)
 '
@@ -89,7 +92,7 @@ test_expect_success 'import branch2, no branch detection' '
 	(
 		cd "$git" &&
 		git log --oneline --graph --decorate --all &&
-		git rev-list master >wc &&
+		git rev-list main -- >wc &&
 		test_line_count = 2 wc
 	)
 '
@@ -100,7 +103,7 @@ test_expect_success 'import depot, no branch detection' '
 	(
 		cd "$git" &&
 		git log --oneline --graph --decorate --all &&
-		git rev-list master >wc &&
+		git rev-list main -- >wc &&
 		test_line_count = 8 wc
 	)
 '
@@ -114,7 +117,7 @@ test_expect_success 'import depot, branch detection' '
 		git log --oneline --graph --decorate --all &&
 
 		# 4 main commits
-		git rev-list master >wc &&
+		git rev-list main -- >wc &&
 		test_line_count = 4 wc &&
 
 		# 3 main, 1 integrate, 1 on branch2
@@ -137,7 +140,7 @@ test_expect_success 'import depot, branch detection, branchList branch definitio
 		git log --oneline --graph --decorate --all &&
 
 		# 4 main commits
-		git rev-list master >wc &&
+		git rev-list main -- >wc &&
 		test_line_count = 4 wc &&
 
 		# 3 main, 1 integrate, 1 on branch2
@@ -200,19 +203,19 @@ test_expect_success 'git p4 clone simple branches' '
 		git p4 clone --dest=. --detect-branches //depot@all &&
 		git log --all --graph --decorate --stat &&
 		git reset --hard p4/depot/branch1 &&
-		test -f file1 &&
-		test -f file2 &&
-		test -f file3 &&
+		test_path_is_file file1 &&
+		test_path_is_file file2 &&
+		test_path_is_file file3 &&
 		grep update file2 &&
 		git reset --hard p4/depot/branch2 &&
-		test -f file1 &&
-		test -f file2 &&
+		test_path_is_file file1 &&
+		test_path_is_file file2 &&
 		test ! -f file3 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch3 &&
-		test -f file1 &&
-		test -f file2 &&
-		test -f file3 &&
+		test_path_is_file file1 &&
+		test_path_is_file file2 &&
+		test_path_is_file file3 &&
 		grep update file2 &&
 		cd "$cli" &&
 		cd branch1 &&
@@ -291,11 +294,13 @@ test_expect_success 'git p4 clone complex branches' '
 		test_path_is_file file3 &&
 		grep update file2 &&
 		git reset --hard p4/depot/branch4 &&
+		git diff-tree --quiet HEAD &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_missing file3 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch5 &&
+		git diff-tree --quiet HEAD &&
 		test_path_is_file file1 &&
 		test_path_is_file file2 &&
 		test_path_is_file file3 &&
@@ -484,7 +489,7 @@ test_expect_success 'use-client-spec detect-branches files in top-level' '
 	(
 		cd "$git" &&
 		git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
-		git checkout -b master p4/usecs/b1 &&
+		git checkout -b main p4/usecs/b1 &&
 		test_path_is_file b1-file1 &&
 		test_path_is_missing b2-file2 &&
 		test_path_is_missing b1 &&
@@ -537,7 +542,7 @@ test_expect_success 'use-client-spec detect-branches skips files in branches' '
 	(
 		cd "$git" &&
 		git p4 sync --detect-branches --use-client-spec //depot/usecs@all &&
-		git checkout -b master p4/usecs/b3 &&
+		git checkout -b main p4/usecs/b3 &&
 		test_path_is_file b1-file1 &&
 		test_path_is_file b3-file3_2 &&
 		test_path_is_missing b3-file3_1
@@ -603,22 +608,22 @@ test_expect_success 'git p4 clone simple branches with base folder on server sid
 		git p4 clone --dest=. --use-client-spec  --detect-branches //depot@all &&
 		git log --all --graph --decorate --stat &&
 		git reset --hard p4/depot/branch1 &&
-		test -f file1 &&
-		test -f file2 &&
-		test -f file3 &&
-		test -f sub_file1 &&
+		test_path_is_file file1 &&
+		test_path_is_file file2 &&
+		test_path_is_file file3 &&
+		test_path_is_file sub_file1 &&
 		grep update file2 &&
 		git reset --hard p4/depot/branch2 &&
-		test -f file1 &&
-		test -f file2 &&
+		test_path_is_file file1 &&
+		test_path_is_file file2 &&
 		test ! -f file3 &&
-		test -f sub_file1 &&
+		test_path_is_file sub_file1 &&
 		! grep update file2 &&
 		git reset --hard p4/depot/branch3 &&
-		test -f file1 &&
-		test -f file2 &&
-		test -f file3 &&
-		test -f sub_file1 &&
+		test_path_is_file file1 &&
+		test_path_is_file file2 &&
+		test_path_is_file file3 &&
+		test_path_is_file sub_file1 &&
 		grep update file2 &&
 		cd "$cli" &&
 		cd branch1 &&
diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh
index 94edebe272..19073c6e9f 100755
--- a/t/t9802-git-p4-filetype.sh
+++ b/t/t9802-git-p4-filetype.sh
@@ -263,7 +263,7 @@ test_expect_success SYMLINKS 'ensure p4 symlink parsed correctly' '
 	(
 		cd "$git" &&
 		test -L symlink &&
-		test $(readlink symlink) = symlink-target
+		test $(test_readlink symlink) = symlink-target
 	)
 '
 
@@ -329,7 +329,7 @@ test_expect_success SYMLINKS 'empty symlink target' '
 	git p4 clone --dest="$git" //depot@all &&
 	(
 		cd "$git" &&
-		test $(readlink empty-symlink) = target2
+		test $(test_readlink empty-symlink) = target2
 	)
 '
 
diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh
index 4e794a01bf..c26d297433 100755
--- a/t/t9806-git-p4-options.sh
+++ b/t/t9806-git-p4-options.sh
@@ -2,6 +2,9 @@
 
 test_description='git p4 options'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-p4.sh
 
 test_expect_success 'start p4d' '
@@ -27,14 +30,14 @@ test_expect_success 'clone no --git-dir' '
 	test_must_fail git p4 clone --git-dir=xx //depot
 '
 
-test_expect_success 'clone --branch should checkout master' '
+test_expect_success 'clone --branch should checkout main' '
 	git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot &&
 	test_when_finished cleanup_git &&
 	(
 		cd "$git" &&
 		git rev-parse refs/remotes/p4/sb >sb &&
-		git rev-parse refs/heads/master >master &&
-		test_cmp sb master &&
+		git rev-parse refs/heads/main >main &&
+		test_cmp sb main &&
 		git rev-parse HEAD >head &&
 		test_cmp sb head
 	)
@@ -147,22 +150,22 @@ test_expect_success 'clone --changesfile, @all' '
 	test_must_fail git p4 clone --changesfile="$TRASH_DIRECTORY/cf" --dest="$git" //depot@all
 '
 
-# imports both master and p4/master in refs/heads
+# imports both main and p4/master in refs/heads
 # requires --import-local on sync to find p4 refs/heads
-# does not update master on sync, just p4/master
+# does not update main on sync, just p4/master
 test_expect_success 'clone/sync --import-local' '
 	git p4 clone --import-local --dest="$git" //depot@1,2 &&
 	test_when_finished cleanup_git &&
 	(
 		cd "$git" &&
-		git log --oneline refs/heads/master >lines &&
+		git log --oneline refs/heads/main >lines &&
 		test_line_count = 2 lines &&
 		git log --oneline refs/heads/p4/master >lines &&
 		test_line_count = 2 lines &&
 		test_must_fail git p4 sync &&
 
 		git p4 sync --import-local &&
-		git log --oneline refs/heads/master >lines &&
+		git log --oneline refs/heads/main >lines &&
 		test_line_count = 2 lines &&
 		git log --oneline refs/heads/p4/master >lines &&
 		test_line_count = 3 lines
@@ -174,7 +177,7 @@ test_expect_success 'clone --max-changes' '
 	test_when_finished cleanup_git &&
 	(
 		cd "$git" &&
-		git log --oneline refs/heads/master >lines &&
+		git log --oneline refs/heads/main >lines &&
 		test_line_count = 2 lines
 	)
 '
@@ -237,7 +240,7 @@ test_expect_success 'clone --use-client-spec' '
 			git init &&
 			git config git-p4.useClientSpec true &&
 			git p4 sync //depot/... &&
-			git checkout -b master p4/master &&
+			git checkout -b main p4/master &&
 			test_path_is_file bus/dir/f4 &&
 			test_path_is_missing file1
 		)
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index eaaae414a1..7d4109f29d 100755
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -2,6 +2,9 @@
 
 test_description='git p4 submit'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-p4.sh
 
 test_expect_success 'start p4d' '
@@ -114,7 +117,7 @@ test_expect_success 'submit with allowSubmit' '
 		git config git-p4.skipSubmitEdit true &&
 		git config git-p4.allowSubmit "nobranch" &&
 		test_must_fail git p4 submit &&
-		git config git-p4.allowSubmit "nobranch,master" &&
+		git config git-p4.allowSubmit "nobranch,main" &&
 		git p4 submit
 	)
 '
diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh
index 3cff1fce1b..9c9710d8c7 100755
--- a/t/t9809-git-p4-client-view.sh
+++ b/t/t9809-git-p4-client-view.sh
@@ -407,7 +407,7 @@ test_expect_success 'reinit depot' '
 '
 
 #
-# What happens when two files of the same name are overlayed together?
+# What happens when two files of the same name are overlaid together?
 # The last-listed file should take preference.
 #
 # //depot
diff --git a/t/t9810-git-p4-rcs.sh b/t/t9810-git-p4-rcs.sh
index 57b533dc6f..e3836888ec 100755
--- a/t/t9810-git-p4-rcs.sh
+++ b/t/t9810-git-p4-rcs.sh
@@ -294,7 +294,6 @@ test_expect_success 'cope with rcs keyword file deletion' '
 		echo "\$Revision\$" >kwdelfile.c &&
 		p4 add -t ktext kwdelfile.c &&
 		p4 submit -d "Add file to be deleted" &&
-		cat kwdelfile.c &&
 		grep 1 kwdelfile.c
 	) &&
 	git p4 clone --dest="$git" //depot &&
diff --git a/t/t9811-git-p4-label-import.sh b/t/t9811-git-p4-label-import.sh
index c1446f26ab..5ac5383fb7 100755
--- a/t/t9811-git-p4-label-import.sh
+++ b/t/t9811-git-p4-label-import.sh
@@ -2,6 +2,9 @@
 
 test_description='git p4 label tests'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-git-p4.sh
 
 test_expect_success 'start p4d' '
@@ -185,7 +188,7 @@ test_expect_success 'tag that cannot be exported' '
 		git add main/f12 &&
 		git commit -m "adding f12" &&
 		git tag -m "tag on a_branch" GIT_TAG_ON_A_BRANCH &&
-		git checkout master &&
+		git checkout main &&
 		git p4 submit --export-labels
 	) &&
 	(
diff --git a/t/t9819-git-p4-case-folding.sh b/t/t9819-git-p4-case-folding.sh
index 600ce1e0b0..b4d93f0c17 100755
--- a/t/t9819-git-p4-case-folding.sh
+++ b/t/t9819-git-p4-case-folding.sh
@@ -30,7 +30,7 @@ test_expect_success 'Check p4 is in case-folding mode' '
 		cd "$cli" &&
 		>lc/FILE.TXT &&
 		p4 add lc/FILE.TXT &&
-		test_must_fail p4 submit -d "Cannot add file differing only in case" lc/FILE.TXT
+		! p4 submit -d "Cannot add file differing only in case" lc/FILE.TXT
 	)
 '
 
diff --git a/t/t9831-git-p4-triggers.sh b/t/t9831-git-p4-triggers.sh
index d743ca33ee..ff6c0352e6 100755
--- a/t/t9831-git-p4-triggers.sh
+++ b/t/t9831-git-p4-triggers.sh
@@ -58,7 +58,7 @@ test_expect_success 'import with extra info lines from verbose p4 trigger' '
 	(
 		cd "$git" &&
 		git p4 sync
-	)&&
+	) &&
 	(
 		p4 triggers -i <<-EOF
 		Triggers:
diff --git a/t/t9832-unshelve.sh b/t/t9832-unshelve.sh
index e9276c48f4..6b3cb0414a 100755
--- a/t/t9832-unshelve.sh
+++ b/t/t9832-unshelve.sh
@@ -29,8 +29,11 @@ test_expect_success 'init depot' '
 	)
 '
 
+# Create an initial clone, with a commit unrelated to the P4 change
+# on HEAD
 test_expect_success 'initial clone' '
-	git p4 clone --dest="$git" //depot/@all
+	git p4 clone --dest="$git" //depot/@all &&
+    test_commit -C "$git" "unrelated"
 '
 
 test_expect_success 'create shelved changelist' '
@@ -65,7 +68,8 @@ EOF
 		cd "$git" &&
 		change=$(last_shelved_change) &&
 		git p4 unshelve $change &&
-		git show refs/remotes/p4-unshelved/$change | grep -q "Further description" &&
+		git show refs/remotes/p4-unshelved/$change >actual &&
+		grep -q "Further description" actual &&
 		git cherry-pick refs/remotes/p4-unshelved/$change &&
 		test_path_is_file file2 &&
 		test_cmp file1 "$cli"/file1 &&
diff --git a/t/t9834-git-p4-file-dir-bug.sh b/t/t9834-git-p4-file-dir-bug.sh
new file mode 100755
index 0000000000..dac67e89d7
--- /dev/null
+++ b/t/t9834-git-p4-file-dir-bug.sh
@@ -0,0 +1,70 @@
+#!/bin/sh
+
+test_description='git p4 directory/file bug handling
+
+This test creates files and directories with the same name in perforce and
+checks that git-p4 recovers from the error at the same time as the perforce
+repository.'
+
+. ./lib-git-p4.sh
+
+test_expect_success 'start p4d' '
+	start_p4d &&
+	{ p4 configure set submit.collision.check=0 || :; }
+'
+
+test_expect_success 'init depot' '
+	(
+		cd "$cli" &&
+
+		touch add_file_add_dir_del_file add_file_add_dir_del_dir &&
+		p4 add add_file_add_dir_del_file add_file_add_dir_del_dir &&
+		mkdir add_dir_add_file_del_file add_dir_add_file_del_dir &&
+		touch add_dir_add_file_del_file/file add_dir_add_file_del_dir/file &&
+		p4 add add_dir_add_file_del_file/file add_dir_add_file_del_dir/file &&
+		p4 submit -d "add initial" &&
+
+		rm -f add_file_add_dir_del_file add_file_add_dir_del_dir &&
+		mkdir add_file_add_dir_del_file add_file_add_dir_del_dir &&
+		touch add_file_add_dir_del_file/file add_file_add_dir_del_dir/file &&
+		p4 add add_file_add_dir_del_file/file add_file_add_dir_del_dir/file &&
+		rm -rf add_dir_add_file_del_file add_dir_add_file_del_dir &&
+		touch add_dir_add_file_del_file add_dir_add_file_del_dir &&
+		p4 add add_dir_add_file_del_file add_dir_add_file_del_dir &&
+		p4 submit -d "add conflicting" &&
+
+		p4 delete -k add_file_add_dir_del_file &&
+		p4 delete -k add_file_add_dir_del_dir/file &&
+		p4 delete -k add_dir_add_file_del_file &&
+		p4 delete -k add_dir_add_file_del_dir/file &&
+		p4 submit -d "delete conflicting" &&
+
+		p4 delete -k "add_file_add_dir_del_file/file" &&
+		p4 delete -k "add_file_add_dir_del_dir" &&
+		p4 delete -k "add_dir_add_file_del_file/file" &&
+		p4 delete -k "add_dir_add_file_del_dir" &&
+		p4 submit -d "delete remaining"
+	)
+'
+
+test_expect_success 'clone with git-p4' '
+	git p4 clone --dest="$git" //depot/@1,3
+'
+
+test_expect_success 'check contents' '
+	test_path_is_dir "$git/add_file_add_dir_del_file" &&
+	test_path_is_file "$git/add_file_add_dir_del_dir" &&
+	test_path_is_dir "$git/add_dir_add_file_del_file" &&
+	test_path_is_file "$git/add_dir_add_file_del_dir"
+'
+
+test_expect_success 'rebase and check empty' '
+	git -C "$git" p4 rebase &&
+
+	test_path_is_missing "$git/add_file_add_dir_del_file" &&
+	test_path_is_missing "$git/add_file_add_dir_del_dir" &&
+	test_path_is_missing "$git/add_dir_add_file_del_file" &&
+	test_path_is_missing "$git/add_dir_add_file_del_dir"
+'
+
+test_done
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 54f8ce18cb..5decc3b269 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -1,10 +1,13 @@
 #!/bin/sh
 #
-# Copyright (c) 2012 Felipe Contreras
+# Copyright (c) 2012-2020 Felipe Contreras
 #
 
 test_description='test bash completion'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=master
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-bash.sh
 
 complete ()
@@ -136,7 +139,7 @@ fi
 test_expect_success 'setup for __git_find_repo_path/__gitdir tests' '
 	mkdir -p subdir/subsubdir &&
 	mkdir -p non-repo &&
-	git init otherrepo
+	git init -b main otherrepo
 '
 
 test_expect_success '__git_find_repo_path - from command line (through $__git_dir)' '
@@ -378,7 +381,7 @@ test_expect_success '__gitdir - finds repo' '
 '
 
 
-test_expect_success '__gitdir - returns error when cant find repo' '
+test_expect_success '__gitdir - returns error when cannot find repo' '
 	(
 		__git_dir="non-existing" &&
 		test_must_fail __gitdir >"$actual"
@@ -494,7 +497,7 @@ test_expect_success '__gitcomp - prefix' '
 '
 
 test_expect_success '__gitcomp - suffix' '
-	test_gitcomp "branch.me" "master maint next pu" "branch." \
+	test_gitcomp "branch.me" "master maint next seen" "branch." \
 		"ma" "." <<-\EOF
 	branch.master.Z
 	branch.maint.Z
@@ -537,42 +540,51 @@ 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"
 '
 
 read -r -d "" refs <<-\EOF
+main
 maint
-master
 next
-pu
+seen
 EOF
 
 test_expect_success '__gitcomp_nl - trailing space' '
 	test_gitcomp_nl "m" "$refs" <<-EOF
+	main Z
 	maint Z
-	master Z
 	EOF
 '
 
 test_expect_success '__gitcomp_nl - prefix' '
 	test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF
+	--fixup=main Z
 	--fixup=maint Z
-	--fixup=master Z
 	EOF
 '
 
 test_expect_success '__gitcomp_nl - suffix' '
 	test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF
+	branch.main.Z
 	branch.maint.Z
-	branch.master.Z
 	EOF
 '
 
 test_expect_success '__gitcomp_nl - no suffix' '
 	test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF
+	mainZ
 	maintZ
-	masterZ
 	EOF
 '
 
@@ -614,12 +626,13 @@ test_expect_success '__git_is_configured_remote' '
 
 test_expect_success 'setup for ref completion' '
 	git commit --allow-empty -m initial &&
+	git branch -M main &&
 	git branch matching-branch &&
 	git tag matching-tag &&
 	(
 		cd otherrepo &&
 		git commit --allow-empty -m initial &&
-		git branch -m master master-in-other &&
+		git branch -m main main-in-other &&
 		git branch branch-in-other &&
 		git tag tag-in-other
 	) &&
@@ -632,10 +645,10 @@ test_expect_success 'setup for ref completion' '
 test_expect_success '__git_refs - simple' '
 	cat >expected <<-EOF &&
 	HEAD
-	master
+	main
 	matching-branch
 	other/branch-in-other
-	other/master-in-other
+	other/main-in-other
 	matching-tag
 	EOF
 	(
@@ -647,10 +660,10 @@ test_expect_success '__git_refs - simple' '
 
 test_expect_success '__git_refs - full refs' '
 	cat >expected <<-EOF &&
-	refs/heads/master
+	refs/heads/main
 	refs/heads/matching-branch
 	refs/remotes/other/branch-in-other
-	refs/remotes/other/master-in-other
+	refs/remotes/other/main-in-other
 	refs/tags/matching-tag
 	EOF
 	(
@@ -664,7 +677,7 @@ test_expect_success '__git_refs - repo given on the command line' '
 	cat >expected <<-EOF &&
 	HEAD
 	branch-in-other
-	master-in-other
+	main-in-other
 	tag-in-other
 	EOF
 	(
@@ -679,7 +692,7 @@ test_expect_success '__git_refs - remote on local file system' '
 	cat >expected <<-EOF &&
 	HEAD
 	branch-in-other
-	master-in-other
+	main-in-other
 	tag-in-other
 	EOF
 	(
@@ -692,7 +705,7 @@ test_expect_success '__git_refs - remote on local file system' '
 test_expect_success '__git_refs - remote on local file system - full refs' '
 	cat >expected <<-EOF &&
 	refs/heads/branch-in-other
-	refs/heads/master-in-other
+	refs/heads/main-in-other
 	refs/tags/tag-in-other
 	EOF
 	(
@@ -706,7 +719,7 @@ test_expect_success '__git_refs - configured remote' '
 	cat >expected <<-EOF &&
 	HEAD
 	branch-in-other
-	master-in-other
+	main-in-other
 	EOF
 	(
 		cur= &&
@@ -719,7 +732,7 @@ test_expect_success '__git_refs - configured remote - full refs' '
 	cat >expected <<-EOF &&
 	HEAD
 	refs/heads/branch-in-other
-	refs/heads/master-in-other
+	refs/heads/main-in-other
 	refs/tags/tag-in-other
 	EOF
 	(
@@ -733,7 +746,7 @@ test_expect_success '__git_refs - configured remote - repo given on the command
 	cat >expected <<-EOF &&
 	HEAD
 	branch-in-other
-	master-in-other
+	main-in-other
 	EOF
 	(
 		cd thirdrepo &&
@@ -748,7 +761,7 @@ test_expect_success '__git_refs - configured remote - full refs - repo given on
 	cat >expected <<-EOF &&
 	HEAD
 	refs/heads/branch-in-other
-	refs/heads/master-in-other
+	refs/heads/main-in-other
 	refs/tags/tag-in-other
 	EOF
 	(
@@ -764,7 +777,7 @@ test_expect_success '__git_refs - configured remote - remote name matches a dire
 	cat >expected <<-EOF &&
 	HEAD
 	branch-in-other
-	master-in-other
+	main-in-other
 	EOF
 	mkdir other &&
 	test_when_finished "rm -rf other" &&
@@ -779,7 +792,7 @@ test_expect_success '__git_refs - URL remote' '
 	cat >expected <<-EOF &&
 	HEAD
 	branch-in-other
-	master-in-other
+	main-in-other
 	tag-in-other
 	EOF
 	(
@@ -793,7 +806,7 @@ test_expect_success '__git_refs - URL remote - full refs' '
 	cat >expected <<-EOF &&
 	HEAD
 	refs/heads/branch-in-other
-	refs/heads/master-in-other
+	refs/heads/main-in-other
 	refs/tags/tag-in-other
 	EOF
 	(
@@ -849,23 +862,23 @@ test_expect_success '__git_refs - not in a git repository' '
 test_expect_success '__git_refs - unique remote branches for git checkout DWIMery' '
 	cat >expected <<-EOF &&
 	HEAD
-	master
+	main
 	matching-branch
 	other/ambiguous
 	other/branch-in-other
-	other/master-in-other
+	other/main-in-other
 	remote/ambiguous
 	remote/branch-in-remote
 	matching-tag
 	branch-in-other
 	branch-in-remote
-	master-in-other
+	main-in-other
 	EOF
 	for remote_ref in refs/remotes/other/ambiguous \
 		refs/remotes/remote/ambiguous \
 		refs/remotes/remote/branch-in-remote
 	do
-		git update-ref $remote_ref master &&
+		git update-ref $remote_ref main &&
 		test_when_finished "git update-ref -d $remote_ref"
 	done &&
 	(
@@ -878,10 +891,10 @@ test_expect_success '__git_refs - unique remote branches for git checkout DWIMer
 test_expect_success '__git_refs - after --opt=' '
 	cat >expected <<-EOF &&
 	HEAD
-	master
+	main
 	matching-branch
 	other/branch-in-other
-	other/master-in-other
+	other/main-in-other
 	matching-tag
 	EOF
 	(
@@ -893,10 +906,10 @@ test_expect_success '__git_refs - after --opt=' '
 
 test_expect_success '__git_refs - after --opt= - full refs' '
 	cat >expected <<-EOF &&
-	refs/heads/master
+	refs/heads/main
 	refs/heads/matching-branch
 	refs/remotes/other/branch-in-other
-	refs/remotes/other/master-in-other
+	refs/remotes/other/main-in-other
 	refs/tags/matching-tag
 	EOF
 	(
@@ -906,13 +919,13 @@ test_expect_success '__git_refs - after --opt= - full refs' '
 	test_cmp expected "$actual"
 '
 
-test_expect_success '__git refs - exluding refs' '
+test_expect_success '__git refs - excluding refs' '
 	cat >expected <<-EOF &&
 	^HEAD
-	^master
+	^main
 	^matching-branch
 	^other/branch-in-other
-	^other/master-in-other
+	^other/main-in-other
 	^matching-tag
 	EOF
 	(
@@ -922,12 +935,12 @@ test_expect_success '__git refs - exluding refs' '
 	test_cmp expected "$actual"
 '
 
-test_expect_success '__git refs - exluding full refs' '
+test_expect_success '__git refs - excluding full refs' '
 	cat >expected <<-EOF &&
-	^refs/heads/master
+	^refs/heads/main
 	^refs/heads/matching-branch
 	^refs/remotes/other/branch-in-other
-	^refs/remotes/other/master-in-other
+	^refs/remotes/other/main-in-other
 	^refs/tags/matching-tag
 	EOF
 	(
@@ -945,20 +958,20 @@ test_expect_success 'setup for filtering matching refs' '
 	rm -f .git/FETCH_HEAD
 '
 
-test_expect_success '__git_refs - dont filter refs unless told so' '
+test_expect_success '__git_refs - do not filter refs unless told so' '
 	cat >expected <<-EOF &&
 	HEAD
-	master
+	main
 	matching-branch
 	matching/branch
 	other/branch-in-other
-	other/master-in-other
+	other/main-in-other
 	other/matching/branch-in-other
 	matching-tag
 	matching/tag
 	EOF
 	(
-		cur=master &&
+		cur=main &&
 		__git_refs >"$actual"
 	) &&
 	test_cmp expected "$actual"
@@ -992,7 +1005,7 @@ test_expect_success '__git_refs - only matching refs - full refs' '
 
 test_expect_success '__git_refs - only matching refs - remote on local file system' '
 	cat >expected <<-EOF &&
-	master-in-other
+	main-in-other
 	matching/branch-in-other
 	EOF
 	(
@@ -1004,7 +1017,7 @@ test_expect_success '__git_refs - only matching refs - remote on local file syst
 
 test_expect_success '__git_refs - only matching refs - configured remote' '
 	cat >expected <<-EOF &&
-	master-in-other
+	main-in-other
 	matching/branch-in-other
 	EOF
 	(
@@ -1016,7 +1029,7 @@ test_expect_success '__git_refs - only matching refs - configured remote' '
 
 test_expect_success '__git_refs - only matching refs - remote - full refs' '
 	cat >expected <<-EOF &&
-	refs/heads/master-in-other
+	refs/heads/main-in-other
 	refs/heads/matching/branch-in-other
 	EOF
 	(
@@ -1038,7 +1051,7 @@ test_expect_success '__git_refs - only matching refs - checkout DWIMery' '
 		refs/remotes/remote/ambiguous \
 		refs/remotes/remote/branch-in-remote
 	do
-		git update-ref $remote_ref master &&
+		git update-ref $remote_ref main &&
 		test_when_finished "git update-ref -d $remote_ref"
 	done &&
 	(
@@ -1057,11 +1070,11 @@ test_expect_success 'teardown after filtering matching refs' '
 
 test_expect_success '__git_refs - for-each-ref format specifiers in prefix' '
 	cat >expected <<-EOF &&
-	evil-%%-%42-%(refname)..master
+	evil-%%-%42-%(refname)..main
 	EOF
 	(
-		cur="evil-%%-%42-%(refname)..mas" &&
-		__git_refs "" "" "evil-%%-%42-%(refname).." mas >"$actual"
+		cur="evil-%%-%42-%(refname)..mai" &&
+		__git_refs "" "" "evil-%%-%42-%(refname).." mai >"$actual"
 	) &&
 	test_cmp expected "$actual"
 '
@@ -1069,10 +1082,10 @@ test_expect_success '__git_refs - for-each-ref format specifiers in prefix' '
 test_expect_success '__git_complete_refs - simple' '
 	sed -e "s/Z$//" >expected <<-EOF &&
 	HEAD Z
-	master Z
+	main Z
 	matching-branch Z
 	other/branch-in-other Z
-	other/master-in-other Z
+	other/main-in-other Z
 	matching-tag Z
 	EOF
 	(
@@ -1100,7 +1113,7 @@ test_expect_success '__git_complete_refs - remote' '
 	sed -e "s/Z$//" >expected <<-EOF &&
 	HEAD Z
 	branch-in-other Z
-	master-in-other Z
+	main-in-other Z
 	EOF
 	(
 		cur= &&
@@ -1113,13 +1126,13 @@ test_expect_success '__git_complete_refs - remote' '
 test_expect_success '__git_complete_refs - track' '
 	sed -e "s/Z$//" >expected <<-EOF &&
 	HEAD Z
-	master Z
+	main Z
 	matching-branch Z
 	other/branch-in-other Z
-	other/master-in-other Z
+	other/main-in-other Z
 	matching-tag Z
 	branch-in-other Z
-	master-in-other Z
+	main-in-other Z
 	EOF
 	(
 		cur= &&
@@ -1158,10 +1171,10 @@ test_expect_success '__git_complete_refs - prefix' '
 test_expect_success '__git_complete_refs - suffix' '
 	cat >expected <<-EOF &&
 	HEAD.
-	master.
+	main.
 	matching-branch.
 	other/branch-in-other.
-	other/master-in-other.
+	other/main-in-other.
 	matching-tag.
 	EOF
 	(
@@ -1176,7 +1189,7 @@ test_expect_success '__git_complete_fetch_refspecs - simple' '
 	sed -e "s/Z$//" >expected <<-EOF &&
 	HEAD:HEAD Z
 	branch-in-other:branch-in-other Z
-	master-in-other:master-in-other Z
+	main-in-other:main-in-other Z
 	EOF
 	(
 		cur= &&
@@ -1202,7 +1215,7 @@ test_expect_success '__git_complete_fetch_refspecs - prefix' '
 	sed -e "s/Z$//" >expected <<-EOF &&
 	+HEAD:HEAD Z
 	+branch-in-other:branch-in-other Z
-	+master-in-other:master-in-other Z
+	+main-in-other:main-in-other Z
 	EOF
 	(
 		cur="+" &&
@@ -1215,7 +1228,7 @@ test_expect_success '__git_complete_fetch_refspecs - prefix' '
 test_expect_success '__git_complete_fetch_refspecs - fully qualified' '
 	sed -e "s/Z$//" >expected <<-EOF &&
 	refs/heads/branch-in-other:refs/heads/branch-in-other Z
-	refs/heads/master-in-other:refs/heads/master-in-other Z
+	refs/heads/main-in-other:refs/heads/main-in-other Z
 	refs/tags/tag-in-other:refs/tags/tag-in-other Z
 	EOF
 	(
@@ -1229,7 +1242,7 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified' '
 test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' '
 	sed -e "s/Z$//" >expected <<-EOF &&
 	+refs/heads/branch-in-other:refs/heads/branch-in-other Z
-	+refs/heads/master-in-other:refs/heads/master-in-other Z
+	+refs/heads/main-in-other:refs/heads/main-in-other Z
 	+refs/tags/tag-in-other:refs/tags/tag-in-other Z
 	EOF
 	(
@@ -1240,6 +1253,513 @@ test_expect_success '__git_complete_fetch_refspecs - fully qualified & prefix' '
 	test_cmp expected out
 '
 
+test_expect_success 'git switch - with no options, complete local branches and unique remote branch names for DWIM logic' '
+	test_completion "git switch " <<-\EOF
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git checkout - completes refs and unique remote branches for DWIM' '
+	test_completion "git checkout " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with --no-guess, complete only local branches' '
+	test_completion "git switch --no-guess " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - with GIT_COMPLETION_CHECKOUT_NO_GUESS=1, complete only local branches' '
+	GIT_COMPLETION_CHECKOUT_NO_GUESS=1 test_completion "git switch " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - --guess overrides GIT_COMPLETION_CHECKOUT_NO_GUESS=1, complete local branches and unique remote names for DWIM logic' '
+	GIT_COMPLETION_CHECKOUT_NO_GUESS=1 test_completion "git switch --guess " <<-\EOF
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - a later --guess overrides previous --no-guess, complete local and remote unique branches for DWIM' '
+	test_completion "git switch --no-guess --guess " <<-\EOF
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - a later --no-guess overrides previous --guess, complete only local branches' '
+	test_completion "git switch --guess --no-guess " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git checkout - with GIT_COMPLETION_NO_GUESS=1 only completes refs' '
+	GIT_COMPLETION_CHECKOUT_NO_GUESS=1 test_completion "git checkout " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - --guess overrides GIT_COMPLETION_NO_GUESS=1, complete refs and unique remote branches for DWIM' '
+	GIT_COMPLETION_CHECKOUT_NO_GUESS=1 test_completion "git checkout --guess " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with --no-guess, only completes refs' '
+	test_completion "git checkout --no-guess " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - a later --guess overrides previous --no-guess, complete refs and unique remote branches for DWIM' '
+	test_completion "git checkout --no-guess --guess " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - a later --no-guess overrides previous --guess, complete only refs' '
+	test_completion "git checkout --guess --no-guess " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with checkout.guess = false, only completes refs' '
+	test_config checkout.guess false &&
+	test_completion "git checkout " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with checkout.guess = true, completes refs and unique remote branches for DWIM' '
+	test_config checkout.guess true &&
+	test_completion "git checkout " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - a later --guess overrides previous checkout.guess = false, complete refs and unique remote branches for DWIM' '
+	test_config checkout.guess false &&
+	test_completion "git checkout --guess " <<-\EOF
+	HEAD Z
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - a later --no-guess overrides previous checkout.guess = true, complete only refs' '
+	test_config checkout.guess true &&
+	test_completion "git checkout --no-guess " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with --detach, complete all references' '
+	test_completion "git switch --detach " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with --detach, complete only references' '
+	test_completion "git checkout --detach " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with -d, complete all references' '
+	test_completion "git switch -d " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with -d, complete only references' '
+	test_completion "git checkout -d " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with --track, complete only remote branches' '
+	test_completion "git switch --track " <<-\EOF
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with --track, complete only remote branches' '
+	test_completion "git checkout --track " <<-\EOF
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with --no-track, complete only local branch names' '
+	test_completion "git switch --no-track " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git checkout - with --no-track, complete only local references' '
+	test_completion "git checkout --no-track " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with -c, complete all references' '
+	test_completion "git switch -c new-branch " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with -C, complete all references' '
+	test_completion "git switch -C new-branch " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with -c and --track, complete all references' '
+	test_completion "git switch -c new-branch --track " <<-EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with -C and --track, complete all references' '
+	test_completion "git switch -C new-branch --track " <<-EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with -c and --no-track, complete all references' '
+	test_completion "git switch -c new-branch --no-track " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - with -C and --no-track, complete all references' '
+	test_completion "git switch -C new-branch --no-track " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with -b, complete all references' '
+	test_completion "git checkout -b new-branch " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with -B, complete all references' '
+	test_completion "git checkout -B new-branch " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with -b and --track, complete all references' '
+	test_completion "git checkout -b new-branch --track " <<-EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with -B and --track, complete all references' '
+	test_completion "git checkout -B new-branch --track " <<-EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with -b and --no-track, complete all references' '
+	test_completion "git checkout -b new-branch --no-track " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git checkout - with -B and --no-track, complete all references' '
+	test_completion "git checkout -B new-branch --no-track " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
+test_expect_success 'git switch - for -c, complete local branches and unique remote branches' '
+	test_completion "git switch -c " <<-\EOF
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - for -C, complete local branches and unique remote branches' '
+	test_completion "git switch -C " <<-\EOF
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - for -c with --no-guess, complete local branches only' '
+	test_completion "git switch --no-guess -c " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - for -C with --no-guess, complete local branches only' '
+	test_completion "git switch --no-guess -C " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - for -c with --no-track, complete local branches only' '
+	test_completion "git switch --no-track -c " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - for -C with --no-track, complete local branches only' '
+	test_completion "git switch --no-track -C " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git checkout - for -b, complete local branches and unique remote branches' '
+	test_completion "git checkout -b " <<-\EOF
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git checkout - for -B, complete local branches and unique remote branches' '
+	test_completion "git checkout -B " <<-\EOF
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git checkout - for -b with --no-guess, complete local branches only' '
+	test_completion "git checkout --no-guess -b " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git checkout - for -B with --no-guess, complete local branches only' '
+	test_completion "git checkout --no-guess -B " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git checkout - for -b with --no-track, complete local branches only' '
+	test_completion "git checkout --no-track -b " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git checkout - for -B with --no-track, complete local branches only' '
+	test_completion "git checkout --no-track -B " <<-\EOF
+	main Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - with --orphan completes local branch names and unique remote branch names' '
+	test_completion "git switch --orphan " <<-\EOF
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git switch - --orphan with branch already provided completes nothing else' '
+	test_completion "git switch --orphan main " <<-\EOF
+
+	EOF
+'
+
+test_expect_success 'git checkout - with --orphan completes local branch names and unique remote branch names' '
+	test_completion "git checkout --orphan " <<-\EOF
+	branch-in-other Z
+	main Z
+	main-in-other Z
+	matching-branch Z
+	EOF
+'
+
+test_expect_success 'git checkout - --orphan with branch already provided completes local refs for a start-point' '
+	test_completion "git checkout --orphan main " <<-\EOF
+	HEAD Z
+	main Z
+	matching-branch Z
+	matching-tag Z
+	other/branch-in-other Z
+	other/main-in-other Z
+	EOF
+'
+
 test_expect_success 'teardown after ref completion' '
 	git branch -d matching-branch &&
 	git tag -d matching-tag &&
@@ -1257,7 +1777,7 @@ test_path_completion ()
 		# In the following tests calling this function we only
 		# care about how __git_complete_index_file() deals with
 		# unusual characters in path names.  By requesting only
-		# untracked files we dont have to bother adding any
+		# untracked files we do not have to bother adding any
 		# paths to the index in those tests.
 		__git_complete_index_file --others &&
 		print_comp
@@ -1363,6 +1883,80 @@ test_expect_success 'teardown after path completion tests' '
 	       BS\\dir '$'separators\034in\035dir''
 '
 
+test_expect_success '__git_find_on_cmdline - single match' '
+	echo list >expect &&
+	(
+		words=(git command --opt list) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline "add list remove" >actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success '__git_find_on_cmdline - multiple matches' '
+	echo remove >expect &&
+	(
+		words=(git command -o --opt remove list add) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline "add list remove" >actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success '__git_find_on_cmdline - no match' '
+	(
+		words=(git command --opt branch) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline "add list remove" >actual
+	) &&
+	test_must_be_empty actual
+'
+
+test_expect_success '__git_find_on_cmdline - single match with index' '
+	echo "3 list" >expect &&
+	(
+		words=(git command --opt list) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success '__git_find_on_cmdline - multiple matches with index' '
+	echo "4 remove" >expect &&
+	(
+		words=(git command -o --opt remove list add) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_cmp expect actual
+'
+
+test_expect_success '__git_find_on_cmdline - no match with index' '
+	(
+		words=(git command --opt branch) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=1 &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_must_be_empty actual
+'
+
+test_expect_success '__git_find_on_cmdline - ignores matches before command with index' '
+	echo "6 remove" >expect &&
+	(
+		words=(git -C remove command -o --opt remove list add) &&
+		cword=${#words[@]} &&
+		__git_cmd_idx=3 &&
+		__git_find_on_cmdline --show-idx "add list remove" >actual
+	) &&
+	test_cmp expect actual
+'
 
 test_expect_success '__git_get_config_variables' '
 	cat >expect <<-EOF &&
@@ -1438,6 +2032,8 @@ test_expect_success 'double dash "git checkout"' '
 	--no-guess Z
 	--no-... Z
 	--overlay Z
+	--pathspec-file-nul Z
+	--pathspec-from-file=Z
 	EOF
 '
 
@@ -1501,7 +2097,7 @@ test_expect_success 'setup for integration tests' '
 
 test_expect_success 'checkout completes ref names' '
 	test_completion "git checkout m" <<-\EOF
-	master Z
+	main Z
 	mybranch Z
 	mytag Z
 	EOF
@@ -1515,7 +2111,7 @@ test_expect_success 'git -C <path> checkout uses the right repo' '
 
 test_expect_success 'show completes all refs' '
 	test_completion "git show m" <<-\EOF
-	master Z
+	main Z
 	mybranch Z
 	mytag Z
 	EOF
@@ -1548,8 +2144,11 @@ test_expect_success 'complete tree filename with metacharacters' '
 '
 
 test_expect_success PERL 'send-email' '
-	test_completion "git send-email --cov" "--cover-letter " &&
-	test_completion "git send-email ma" "master "
+	test_completion "git send-email --cov" <<-\EOF &&
+	--cover-from-description=Z
+	--cover-letter Z
+	EOF
+	test_completion "git send-email ma" "main "
 '
 
 test_expect_success 'complete files' '
@@ -1576,6 +2175,11 @@ test_expect_success 'complete files' '
 	echo modify > modified &&
 	test_completion "git add " "modified" &&
 
+	mkdir -p some/deep &&
+	touch some/deep/path &&
+	test_completion "git add some/" "some/deep" &&
+	git clean -f some &&
+
 	touch untracked &&
 
 	: TODO .gitignore should not be here &&
@@ -1621,10 +2225,29 @@ test_expect_success 'complete files' '
 	test_completion "git add mom" "momified"
 '
 
+test_expect_success "simple alias" '
+	test_config alias.co checkout &&
+	test_completion "git co m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
+'
+
+test_expect_success "recursive alias" '
+	test_config alias.co checkout &&
+	test_config alias.cod "co --detached" &&
+	test_completion "git cod m" <<-\EOF
+	main Z
+	mybranch Z
+	mytag Z
+	EOF
+'
+
 test_expect_success "completion uses <cmd> completion for alias: !sh -c 'git <cmd> ...'" '
 	test_config alias.co "!sh -c '"'"'git checkout ...'"'"'" &&
 	test_completion "git co m" <<-\EOF
-	master Z
+	main Z
 	mybranch Z
 	mytag Z
 	EOF
@@ -1633,7 +2256,7 @@ test_expect_success "completion uses <cmd> completion for alias: !sh -c 'git <cm
 test_expect_success 'completion uses <cmd> completion for alias: !f () { VAR=val git <cmd> ... }' '
 	test_config alias.co "!f () { VAR=val git checkout ... ; } f" &&
 	test_completion "git co m" <<-\EOF
-	master Z
+	main Z
 	mybranch Z
 	mytag Z
 	EOF
@@ -1642,7 +2265,7 @@ test_expect_success 'completion uses <cmd> completion for alias: !f () { VAR=val
 test_expect_success 'completion used <cmd> completion for alias: !f() { : git <cmd> ; ... }' '
 	test_config alias.co "!f() { : git checkout ; if ... } f" &&
 	test_completion "git co m" <<-\EOF
-	master Z
+	main Z
 	mybranch Z
 	mytag Z
 	EOF
@@ -1673,11 +2296,12 @@ for flag in -d --delete
 do
 	test_expect_success "__git_complete_remote_or_refspec - push $flag other" '
 		sed -e "s/Z$//" >expected <<-EOF &&
-		master-in-other Z
+		main-in-other Z
 		EOF
 		(
 			words=(git push '$flag' other ma) &&
 			cword=${#words[@]} cur=${words[cword-1]} &&
+			__git_cmd_idx=1 &&
 			__git_complete_remote_or_refspec &&
 			print_comp
 		) &&
@@ -1686,11 +2310,12 @@ do
 
 	test_expect_failure "__git_complete_remote_or_refspec - push other $flag" '
 		sed -e "s/Z$//" >expected <<-EOF &&
-		master-in-other Z
+		main-in-other Z
 		EOF
 		(
 			words=(git push other '$flag' ma) &&
 			cword=${#words[@]} cur=${words[cword-1]} &&
+			__git_cmd_idx=1 &&
 			__git_complete_remote_or_refspec &&
 			print_comp
 		) &&
@@ -1709,6 +2334,7 @@ test_expect_success 'git config - variable name' '
 	test_completion "git config log.d" <<-\EOF
 	log.date Z
 	log.decorate Z
+	log.diffMerges Z
 	EOF
 '
 
@@ -1730,6 +2356,7 @@ test_expect_success 'git -c - variable name' '
 	test_completion "git -c log.d" <<-\EOF
 	log.date=Z
 	log.decorate=Z
+	log.diffMerges=Z
 	EOF
 '
 
@@ -1751,6 +2378,7 @@ test_expect_success 'git clone --config= - variable name' '
 	test_completion "git clone --config=log.d" <<-\EOF
 	log.date=Z
 	log.decorate=Z
+	log.diffMerges=Z
 	EOF
 '
 
@@ -1761,6 +2389,12 @@ 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" &&
@@ -1769,7 +2403,6 @@ test_expect_success 'sourcing the completion script clears cached commands' '
 '
 
 test_expect_success 'sourcing the completion script clears cached merge strategies' '
-	GIT_TEST_GETTEXT_POISON=false &&
 	__git_compute_merge_strategies &&
 	verbose test -n "$__git_merge_strategies" &&
 	. "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" &&
@@ -1786,4 +2419,37 @@ test_expect_success 'sourcing the completion script clears cached --options' '
 	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 '__git_complete' '
+	unset -f __git_wrap__git_main &&
+
+	__git_complete foo __git_main &&
+	__git_have_func __git_wrap__git_main &&
+	unset -f __git_wrap__git_main &&
+
+	__git_complete gf _git_fetch &&
+	__git_have_func __git_wrap_git_fetch &&
+
+	__git_complete foo git &&
+	__git_have_func __git_wrap__git_main &&
+	unset -f __git_wrap__git_main &&
+
+	__git_complete gd git_diff &&
+	__git_have_func __git_wrap_git_diff &&
+
+	test_must_fail __git_complete ga missing
+'
+
 test_done
diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh
index 88bc733ad6..bbd513bab0 100755
--- a/t/t9903-bash-prompt.sh
+++ b/t/t9903-bash-prompt.sh
@@ -5,6 +5,9 @@
 
 test_description='test git-specific bash prompt functions'
 
+GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 . ./lib-bash.sh
 
 . "$GIT_BUILD_DIR/contrib/completion/git-prompt.sh"
@@ -28,7 +31,7 @@ test_expect_success 'setup for prompt tests' '
 	echo 3 >file &&
 	git commit -m "third b1" file &&
 	git tag -a -m msg2 t2 &&
-	git checkout -b b2 master &&
+	git checkout -b b2 main &&
 	echo 0 >file &&
 	git commit -m "second b2" file &&
 	echo 00 >file &&
@@ -37,20 +40,20 @@ test_expect_success 'setup for prompt tests' '
 	git commit -m "yet another b2" file &&
 	mkdir ignored_dir &&
 	echo "ignored_dir/" >>.gitignore &&
-	git checkout master
+	git checkout main
 '
 
 test_expect_success 'prompt - branch name' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	__git_ps1 >"$actual" &&
 	test_cmp expected "$actual"
 '
 
 test_expect_success SYMLINKS 'prompt - branch name - symlink symref' '
-	printf " (master)" >expected &&
-	test_when_finished "git checkout master" &&
+	printf " (main)" >expected &&
+	test_when_finished "git checkout main" &&
 	test_config core.preferSymlinkRefs true &&
-	git checkout master &&
+	git checkout main &&
 	__git_ps1 >"$actual" &&
 	test_cmp expected "$actual"
 '
@@ -58,7 +61,7 @@ test_expect_success SYMLINKS 'prompt - branch name - symlink symref' '
 test_expect_success 'prompt - unborn branch' '
 	printf " (unborn)" >expected &&
 	git checkout --orphan unborn &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	__git_ps1 >"$actual" &&
 	test_cmp expected "$actual"
 '
@@ -72,7 +75,7 @@ test_expect_success FUNNYNAMES 'prompt - with newline in path' '
 with
 newline" &&
 	mkdir "$repo_with_newline" &&
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	git init "$repo_with_newline" &&
 	test_when_finished "rm -rf \"$repo_with_newline\"" &&
 	mkdir "$repo_with_newline"/subdir &&
@@ -87,7 +90,7 @@ test_expect_success 'prompt - detached head' '
 	printf " ((%s...))" $(git log -1 --format="%h" --abbrev=13 b1^) >expected &&
 	test_config core.abbrev 13 &&
 	git checkout b1^ &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	__git_ps1 >"$actual" &&
 	test_cmp expected "$actual"
 '
@@ -95,7 +98,7 @@ test_expect_success 'prompt - detached head' '
 test_expect_success 'prompt - describe detached head - contains' '
 	printf " ((t2~1))" >expected &&
 	git checkout b1^ &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	(
 		GIT_PS1_DESCRIBE_STYLE=contains &&
 		__git_ps1 >"$actual"
@@ -106,7 +109,7 @@ test_expect_success 'prompt - describe detached head - contains' '
 test_expect_success 'prompt - describe detached head - branch' '
 	printf " ((tags/t2~1))" >expected &&
 	git checkout b1^ &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	(
 		GIT_PS1_DESCRIBE_STYLE=branch &&
 		__git_ps1 >"$actual"
@@ -117,7 +120,7 @@ test_expect_success 'prompt - describe detached head - branch' '
 test_expect_success 'prompt - describe detached head - describe' '
 	printf " ((t1-1-g%s))" $(git log -1 --format="%h" b1^) >expected &&
 	git checkout b1^ &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	(
 		GIT_PS1_DESCRIBE_STYLE=describe &&
 		__git_ps1 >"$actual"
@@ -128,7 +131,7 @@ test_expect_success 'prompt - describe detached head - describe' '
 test_expect_success 'prompt - describe detached head - default' '
 	printf " ((t2))" >expected &&
 	git checkout --detach b1 &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	__git_ps1 >"$actual" &&
 	test_cmp expected "$actual"
 '
@@ -152,7 +155,7 @@ test_expect_success 'prompt - deep inside .git directory' '
 '
 
 test_expect_success 'prompt - inside bare repository' '
-	printf " (BARE:master)" >expected &&
+	printf " (BARE:main)" >expected &&
 	git init --bare bare.git &&
 	test_when_finished "rm -rf bare.git" &&
 	(
@@ -163,7 +166,7 @@ test_expect_success 'prompt - inside bare repository' '
 '
 
 test_expect_success 'prompt - interactive rebase' '
-	printf " (b1|REBASE-i 2/3)" >expected &&
+	printf " (b1|REBASE 2/3)" >expected &&
 	write_script fake_editor.sh <<-\EOF &&
 		echo "exec echo" >"$1"
 		echo "edit $(git log -1 --format="%h")" >>"$1"
@@ -172,7 +175,7 @@ test_expect_success 'prompt - interactive rebase' '
 	test_when_finished "rm -f fake_editor.sh" &&
 	test_set_editor "$TRASH_DIRECTORY/fake_editor.sh" &&
 	git checkout b1 &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	git rebase -i HEAD^ &&
 	test_when_finished "git rebase --abort" &&
 	__git_ps1 >"$actual" &&
@@ -180,20 +183,20 @@ test_expect_success 'prompt - interactive rebase' '
 '
 
 test_expect_success 'prompt - rebase merge' '
-	printf " (b2|REBASE-i 1/3)" >expected &&
+	printf " (b2|REBASE 1/3)" >expected &&
 	git checkout b2 &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	test_must_fail git rebase --merge b1 b2 &&
 	test_when_finished "git rebase --abort" &&
 	__git_ps1 >"$actual" &&
 	test_cmp expected "$actual"
 '
 
-test_expect_success 'prompt - rebase' '
+test_expect_success 'prompt - rebase am' '
 	printf " (b2|REBASE 1/3)" >expected &&
 	git checkout b2 &&
-	test_when_finished "git checkout master" &&
-	test_must_fail git rebase b1 b2 &&
+	test_when_finished "git checkout main" &&
+	test_must_fail git rebase --apply b1 b2 &&
 	test_when_finished "git rebase --abort" &&
 	__git_ps1 >"$actual" &&
 	test_cmp expected "$actual"
@@ -202,7 +205,7 @@ test_expect_success 'prompt - rebase' '
 test_expect_success 'prompt - merge' '
 	printf " (b1|MERGING)" >expected &&
 	git checkout b1 &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	test_must_fail git merge b2 &&
 	test_when_finished "git reset --hard" &&
 	__git_ps1 >"$actual" &&
@@ -210,7 +213,7 @@ test_expect_success 'prompt - merge' '
 '
 
 test_expect_success 'prompt - cherry-pick' '
-	printf " (master|CHERRY-PICKING)" >expected &&
+	printf " (main|CHERRY-PICKING)" >expected &&
 	test_must_fail git cherry-pick b1 b1^ &&
 	test_when_finished "git cherry-pick --abort" &&
 	__git_ps1 >"$actual" &&
@@ -222,7 +225,7 @@ test_expect_success 'prompt - cherry-pick' '
 '
 
 test_expect_success 'prompt - revert' '
-	printf " (master|REVERTING)" >expected &&
+	printf " (main|REVERTING)" >expected &&
 	test_must_fail git revert b1^ b1 &&
 	test_when_finished "git revert --abort" &&
 	__git_ps1 >"$actual" &&
@@ -234,7 +237,7 @@ test_expect_success 'prompt - revert' '
 '
 
 test_expect_success 'prompt - bisect' '
-	printf " (master|BISECTING)" >expected &&
+	printf " (main|BISECTING)" >expected &&
 	git bisect start &&
 	test_when_finished "git bisect reset" &&
 	__git_ps1 >"$actual" &&
@@ -242,7 +245,7 @@ test_expect_success 'prompt - bisect' '
 '
 
 test_expect_success 'prompt - dirty status indicator - clean' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	(
 		GIT_PS1_SHOWDIRTYSTATE=y &&
 		__git_ps1 >"$actual"
@@ -251,7 +254,7 @@ test_expect_success 'prompt - dirty status indicator - clean' '
 '
 
 test_expect_success 'prompt - dirty status indicator - dirty worktree' '
-	printf " (master *)" >expected &&
+	printf " (main *)" >expected &&
 	echo "dirty" >file &&
 	test_when_finished "git reset --hard" &&
 	(
@@ -262,7 +265,7 @@ test_expect_success 'prompt - dirty status indicator - dirty worktree' '
 '
 
 test_expect_success 'prompt - dirty status indicator - dirty index' '
-	printf " (master +)" >expected &&
+	printf " (main +)" >expected &&
 	echo "dirty" >file &&
 	test_when_finished "git reset --hard" &&
 	git add -u &&
@@ -274,7 +277,7 @@ test_expect_success 'prompt - dirty status indicator - dirty index' '
 '
 
 test_expect_success 'prompt - dirty status indicator - dirty index and worktree' '
-	printf " (master *+)" >expected &&
+	printf " (main *+)" >expected &&
 	echo "dirty index" >file &&
 	test_when_finished "git reset --hard" &&
 	git add -u &&
@@ -288,7 +291,7 @@ test_expect_success 'prompt - dirty status indicator - dirty index and worktree'
 
 test_expect_success 'prompt - dirty status indicator - orphan branch - clean' '
 	printf " (orphan #)" >expected &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	git checkout --orphan orphan &&
 	git reset --hard &&
 	(
@@ -300,7 +303,7 @@ test_expect_success 'prompt - dirty status indicator - orphan branch - clean' '
 
 test_expect_success 'prompt - dirty status indicator - orphan branch - dirty index' '
 	printf " (orphan +)" >expected &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	git checkout --orphan orphan &&
 	(
 		GIT_PS1_SHOWDIRTYSTATE=y &&
@@ -311,7 +314,7 @@ test_expect_success 'prompt - dirty status indicator - orphan branch - dirty ind
 
 test_expect_success 'prompt - dirty status indicator - orphan branch - dirty index and worktree' '
 	printf " (orphan *+)" >expected &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	git checkout --orphan orphan &&
 	>file &&
 	(
@@ -322,7 +325,7 @@ test_expect_success 'prompt - dirty status indicator - orphan branch - dirty ind
 '
 
 test_expect_success 'prompt - dirty status indicator - shell variable unset with config disabled' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	echo "dirty" >file &&
 	test_when_finished "git reset --hard" &&
 	test_config bash.showDirtyState false &&
@@ -334,7 +337,7 @@ test_expect_success 'prompt - dirty status indicator - shell variable unset with
 '
 
 test_expect_success 'prompt - dirty status indicator - shell variable unset with config enabled' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	echo "dirty" >file &&
 	test_when_finished "git reset --hard" &&
 	test_config bash.showDirtyState true &&
@@ -346,7 +349,7 @@ test_expect_success 'prompt - dirty status indicator - shell variable unset with
 '
 
 test_expect_success 'prompt - dirty status indicator - shell variable set with config disabled' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	echo "dirty" >file &&
 	test_when_finished "git reset --hard" &&
 	test_config bash.showDirtyState false &&
@@ -358,7 +361,7 @@ test_expect_success 'prompt - dirty status indicator - shell variable set with c
 '
 
 test_expect_success 'prompt - dirty status indicator - shell variable set with config enabled' '
-	printf " (master *)" >expected &&
+	printf " (main *)" >expected &&
 	echo "dirty" >file &&
 	test_when_finished "git reset --hard" &&
 	test_config bash.showDirtyState true &&
@@ -382,7 +385,7 @@ test_expect_success 'prompt - dirty status indicator - not shown inside .git dir
 '
 
 test_expect_success 'prompt - stash status indicator - no stash' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	(
 		GIT_PS1_SHOWSTASHSTATE=y &&
 		__git_ps1 >"$actual"
@@ -391,7 +394,7 @@ test_expect_success 'prompt - stash status indicator - no stash' '
 '
 
 test_expect_success 'prompt - stash status indicator - stash' '
-	printf " (master $)" >expected &&
+	printf " (main $)" >expected &&
 	echo 2 >file &&
 	git stash &&
 	test_when_finished "git stash drop" &&
@@ -417,7 +420,7 @@ test_expect_success 'prompt - stash status indicator - not shown inside .git dir
 '
 
 test_expect_success 'prompt - untracked files status indicator - no untracked files' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	(
 		GIT_PS1_SHOWUNTRACKEDFILES=y &&
 		cd otherrepo &&
@@ -427,7 +430,7 @@ test_expect_success 'prompt - untracked files status indicator - no untracked fi
 '
 
 test_expect_success 'prompt - untracked files status indicator - untracked files' '
-	printf " (master %%)" >expected &&
+	printf " (main %%)" >expected &&
 	(
 		GIT_PS1_SHOWUNTRACKEDFILES=y &&
 		__git_ps1 >"$actual"
@@ -436,7 +439,7 @@ test_expect_success 'prompt - untracked files status indicator - untracked files
 '
 
 test_expect_success 'prompt - untracked files status indicator - empty untracked dir' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	mkdir otherrepo/untracked-dir &&
 	test_when_finished "rm -rf otherrepo/untracked-dir" &&
 	(
@@ -448,7 +451,7 @@ test_expect_success 'prompt - untracked files status indicator - empty untracked
 '
 
 test_expect_success 'prompt - untracked files status indicator - non-empty untracked dir' '
-	printf " (master %%)" >expected &&
+	printf " (main %%)" >expected &&
 	mkdir otherrepo/untracked-dir &&
 	test_when_finished "rm -rf otherrepo/untracked-dir" &&
 	>otherrepo/untracked-dir/untracked-file &&
@@ -461,7 +464,7 @@ test_expect_success 'prompt - untracked files status indicator - non-empty untra
 '
 
 test_expect_success 'prompt - untracked files status indicator - untracked files outside cwd' '
-	printf " (master %%)" >expected &&
+	printf " (main %%)" >expected &&
 	(
 		mkdir -p ignored_dir &&
 		cd ignored_dir &&
@@ -472,7 +475,7 @@ test_expect_success 'prompt - untracked files status indicator - untracked files
 '
 
 test_expect_success 'prompt - untracked files status indicator - shell variable unset with config disabled' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	test_config bash.showUntrackedFiles false &&
 	(
 		sane_unset GIT_PS1_SHOWUNTRACKEDFILES &&
@@ -482,7 +485,7 @@ test_expect_success 'prompt - untracked files status indicator - shell variable
 '
 
 test_expect_success 'prompt - untracked files status indicator - shell variable unset with config enabled' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	test_config bash.showUntrackedFiles true &&
 	(
 		sane_unset GIT_PS1_SHOWUNTRACKEDFILES &&
@@ -492,7 +495,7 @@ test_expect_success 'prompt - untracked files status indicator - shell variable
 '
 
 test_expect_success 'prompt - untracked files status indicator - shell variable set with config disabled' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	test_config bash.showUntrackedFiles false &&
 	(
 		GIT_PS1_SHOWUNTRACKEDFILES=y &&
@@ -502,7 +505,7 @@ test_expect_success 'prompt - untracked files status indicator - shell variable
 '
 
 test_expect_success 'prompt - untracked files status indicator - shell variable set with config enabled' '
-	printf " (master %%)" >expected &&
+	printf " (main %%)" >expected &&
 	test_config bash.showUntrackedFiles true &&
 	(
 		GIT_PS1_SHOWUNTRACKEDFILES=y &&
@@ -522,13 +525,13 @@ test_expect_success 'prompt - untracked files status indicator - not shown insid
 '
 
 test_expect_success 'prompt - format string starting with dash' '
-	printf -- "-master" >expected &&
+	printf -- "-main" >expected &&
 	__git_ps1 "-%s" >"$actual" &&
 	test_cmp expected "$actual"
 '
 
 test_expect_success 'prompt - pc mode' '
-	printf "BEFORE: (\${__git_ps1_branch_name}):AFTER\\nmaster" >expected &&
+	printf "BEFORE: (\${__git_ps1_branch_name}):AFTER\\nmain" >expected &&
 	(
 		__git_ps1 "BEFORE:" ":AFTER" >"$actual" &&
 		test_must_be_empty "$actual" &&
@@ -538,7 +541,7 @@ test_expect_success 'prompt - pc mode' '
 '
 
 test_expect_success 'prompt - bash color pc mode - branch name' '
-	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nmaster" >expected &&
+	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear}):AFTER\\nmain" >expected &&
 	(
 		GIT_PS1_SHOWCOLORHINTS=y &&
 		__git_ps1 "BEFORE:" ":AFTER" >"$actual" &&
@@ -550,7 +553,7 @@ test_expect_success 'prompt - bash color pc mode - branch name' '
 test_expect_success 'prompt - bash color pc mode - detached head' '
 	printf "BEFORE: (${c_red}\${__git_ps1_branch_name}${c_clear}):AFTER\\n(%s...)" $(git log -1 --format="%h" b1^) >expected &&
 	git checkout b1^ &&
-	test_when_finished "git checkout master" &&
+	test_when_finished "git checkout main" &&
 	(
 		GIT_PS1_SHOWCOLORHINTS=y &&
 		__git_ps1 "BEFORE:" ":AFTER" &&
@@ -560,7 +563,7 @@ test_expect_success 'prompt - bash color pc mode - detached head' '
 '
 
 test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty worktree' '
-	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_clear}):AFTER\\nmaster" >expected &&
+	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_clear}):AFTER\\nmain" >expected &&
 	echo "dirty" >file &&
 	test_when_finished "git reset --hard" &&
 	(
@@ -573,7 +576,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirt
 '
 
 test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index' '
-	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}+${c_clear}):AFTER\\nmaster" >expected &&
+	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}+${c_clear}):AFTER\\nmain" >expected &&
 	echo "dirty" >file &&
 	test_when_finished "git reset --hard" &&
 	git add -u &&
@@ -587,7 +590,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirt
 '
 
 test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirty index and worktree' '
-	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_green}+${c_clear}):AFTER\\nmaster" >expected &&
+	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}*${c_green}+${c_clear}):AFTER\\nmain" >expected &&
 	echo "dirty index" >file &&
 	test_when_finished "git reset --hard" &&
 	git add -u &&
@@ -602,7 +605,7 @@ test_expect_success 'prompt - bash color pc mode - dirty status indicator - dirt
 '
 
 test_expect_success 'prompt - bash color pc mode - dirty status indicator - before root commit' '
-	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}#${c_clear}):AFTER\\nmaster" >expected &&
+	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_green}#${c_clear}):AFTER\\nmain" >expected &&
 	(
 		GIT_PS1_SHOWDIRTYSTATE=y &&
 		GIT_PS1_SHOWCOLORHINTS=y &&
@@ -628,7 +631,7 @@ test_expect_success 'prompt - bash color pc mode - inside .git directory' '
 '
 
 test_expect_success 'prompt - bash color pc mode - stash status indicator' '
-	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_lblue}\$${c_clear}):AFTER\\nmaster" >expected &&
+	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_lblue}\$${c_clear}):AFTER\\nmain" >expected &&
 	echo 2 >file &&
 	git stash &&
 	test_when_finished "git stash drop" &&
@@ -642,7 +645,7 @@ test_expect_success 'prompt - bash color pc mode - stash status indicator' '
 '
 
 test_expect_success 'prompt - bash color pc mode - untracked files status indicator' '
-	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}%%${c_clear}):AFTER\\nmaster" >expected &&
+	printf "BEFORE: (${c_green}\${__git_ps1_branch_name}${c_clear} ${c_red}%%${c_clear}):AFTER\\nmain" >expected &&
 	(
 		GIT_PS1_SHOWUNTRACKEDFILES=y &&
 		GIT_PS1_SHOWCOLORHINTS=y &&
@@ -653,7 +656,7 @@ test_expect_success 'prompt - bash color pc mode - untracked files status indica
 '
 
 test_expect_success 'prompt - zsh color pc mode' '
-	printf "BEFORE: (%%F{green}master%%f):AFTER" >expected &&
+	printf "BEFORE: (%%F{green}main%%f):AFTER" >expected &&
 	(
 		ZSH_VERSION=5.0.0 &&
 		GIT_PS1_SHOWCOLORHINTS=y &&
@@ -664,7 +667,7 @@ test_expect_success 'prompt - zsh color pc mode' '
 '
 
 test_expect_success 'prompt - hide if pwd ignored - env var unset, config disabled' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	test_config bash.hideIfPwdIgnored false &&
 	(
 		cd ignored_dir &&
@@ -685,7 +688,7 @@ test_expect_success 'prompt - hide if pwd ignored - env var unset, config disabl
 '
 
 test_expect_success 'prompt - hide if pwd ignored - env var unset, config unset' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	(
 		cd ignored_dir &&
 		__git_ps1 >"$actual"
@@ -704,7 +707,7 @@ test_expect_success 'prompt - hide if pwd ignored - env var unset, config unset,
 '
 
 test_expect_success 'prompt - hide if pwd ignored - env var set, config disabled' '
-	printf " (master)" >expected &&
+	printf " (main)" >expected &&
 	test_config bash.hideIfPwdIgnored false &&
 	(
 		cd ignored_dir &&
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index b299ecc326..e28411bb75 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -32,11 +32,6 @@ test_set_editor () {
 	export EDITOR
 }
 
-test_set_index_version () {
-    GIT_INDEX_VERSION="$1"
-    export GIT_INDEX_VERSION
-}
-
 test_decode_color () {
 	awk '
 		function name(n) {
@@ -116,13 +111,6 @@ remove_cr () {
 	tr '\015' Q | sed -e 's/Q$//'
 }
 
-# Generate an output of $1 bytes of all zeroes (NULs, not ASCII zeroes).
-# If $1 is 'infinity', output forever or until the receiving pipe stops reading,
-# whichever comes first.
-generate_zero_bytes () {
-	test-tool genzeros "$@"
-}
-
 # In some bourne shell implementations, the "unset" builtin returns
 # nonzero status when a variable to be unset was not set in the first
 # place.
@@ -178,34 +166,78 @@ debug () {
 	GIT_DEBUGGER="${GIT_DEBUGGER}" "$@" <&6 >&5 2>&7
 }
 
-# Call test_commit with the arguments
-# [-C <directory>] <message> [<file> [<contents> [<tag>]]]"
+# Usage: test_commit [options] <message> [<file> [<contents> [<tag>]]]
+#   -C <dir>:
+#	Run all git commands in directory <dir>
+#   --notick
+#	Do not call test_tick before making a commit
+#   --append
+#	Use ">>" instead of ">" when writing "<contents>" to "<file>"
+#   --printf
+#       Use "printf" instead of "echo" when writing "<contents>" to
+#       "<file>", use this to write escape sequences such as "\0", a
+#       trailing "\n" won't be added automatically. This option
+#       supports nothing but the FORMAT of printf(1), i.e. no custom
+#       ARGUMENT(s).
+#   --signoff
+#	Invoke "git commit" with --signoff
+#   --author <author>
+#	Invoke "git commit" with --author <author>
+#   --no-tag
+#	Do not tag the resulting commit
+#   --annotate
+#	Create an annotated tag with "--annotate -m <message>". Calls
+#	test_tick between making the commit and tag, unless --notick
+#	is given.
 #
 # This will commit a file with the given contents and the given commit
 # message, and tag the resulting commit with the given tag name.
 #
 # <file>, <contents>, and <tag> all default to <message>.
-#
-# If the first argument is "-C", the second argument is used as a path for
-# the git invocations.
 
 test_commit () {
 	notick= &&
+	echo=echo &&
+	append= &&
+	author= &&
 	signoff= &&
 	indir= &&
+	tag=light &&
 	while test $# != 0
 	do
 		case "$1" in
 		--notick)
 			notick=yes
 			;;
+		--printf)
+			echo=printf
+			;;
+		--append)
+			append=yes
+			;;
+		--author)
+			author="$2"
+			shift
+			;;
 		--signoff)
 			signoff="$1"
 			;;
+		--date)
+			notick=yes
+			GIT_COMMITTER_DATE="$2"
+			GIT_AUTHOR_DATE="$2"
+			shift
+			;;
 		-C)
 			indir="$2"
 			shift
 			;;
+		--no-tag)
+			tag=none
+			;;
+		--annotate)
+			tag=annotate
+			;;
 		*)
 			break
 			;;
@@ -214,14 +246,34 @@ test_commit () {
 	done &&
 	indir=${indir:+"$indir"/} &&
 	file=${2:-"$1.t"} &&
-	echo "${3-$1}" > "$indir$file" &&
+	if test -n "$append"
+	then
+		$echo "${3-$1}" >>"$indir$file"
+	else
+		$echo "${3-$1}" >"$indir$file"
+	fi &&
 	git ${indir:+ -C "$indir"} add "$file" &&
 	if test -z "$notick"
 	then
 		test_tick
 	fi &&
-	git ${indir:+ -C "$indir"} commit $signoff -m "$1" &&
-	git ${indir:+ -C "$indir"} tag "${4:-$1}"
+	git ${indir:+ -C "$indir"} commit \
+	    ${author:+ --author "$author"} \
+	    $signoff -m "$1" &&
+	case "$tag" in
+	none)
+		;;
+	light)
+		git ${indir:+ -C "$indir"} tag "${4:-$1}"
+		;;
+	annotate)
+		if test -z "$notick"
+		then
+			test_tick
+		fi &&
+		git ${indir:+ -C "$indir"} tag -a -m "$1" "${4:-$1}"
+		;;
+	esac
 }
 
 # Call test_merge with the arguments "<message> <commit>", where <commit>
@@ -308,7 +360,7 @@ test_commit_bulk () {
 	total=$1
 
 	add_from=
-	if git -C "$indir" rev-parse --verify "$ref"
+	if git -C "$indir" rev-parse --quiet --verify "$ref"
 	then
 		add_from=t
 	fi
@@ -367,9 +419,14 @@ test_chmod () {
 	git update-index --add "--chmod=$@"
 }
 
-# Get the modebits from a file.
+# Get the modebits from a file or directory, ignoring the setgid bit (g+s).
+# This bit is inherited by subdirectories at their creation. So we remove it
+# from the returning string to prevent callers from having to worry about the
+# state of the bit in the test directory.
+#
 test_modebits () {
-	ls -l "$1" | sed -e 's|^\(..........\).*|\1|'
+	ls -ld "$1" | sed -e 's|^\(..........\).*|\1|' \
+			  -e 's|^\(......\)S|\1-|' -e 's|^\(......\)s|\1x|'
 }
 
 # Unset a configuration variable, but don't fail if it doesn't exist.
@@ -423,7 +480,7 @@ write_script () {
 # - Explicitly using test_have_prereq.
 #
 # - Implicitly by specifying the prerequisite tag in the calls to
-#   test_expect_{success,failure,code}.
+#   test_expect_{success,failure} and test_external{,_without_stderr}.
 #
 # The single parameter is the prerequisite tag (a simple word, in all
 # capital letters by convention).
@@ -474,15 +531,15 @@ test_lazy_prereq () {
 
 test_run_lazy_prereq_ () {
 	script='
-mkdir -p "$TRASH_DIRECTORY/prereq-test-dir" &&
+mkdir -p "$TRASH_DIRECTORY/prereq-test-dir-'"$1"'" &&
 (
-	cd "$TRASH_DIRECTORY/prereq-test-dir" &&'"$2"'
+	cd "$TRASH_DIRECTORY/prereq-test-dir-'"$1"'" &&'"$2"'
 )'
 	say >&3 "checking prerequisite: $1"
 	say >&3 "$script"
 	test_eval_ "$script"
 	eval_ret=$?
-	rm -rf "$TRASH_DIRECTORY/prereq-test-dir"
+	rm -rf "$TRASH_DIRECTORY/prereq-test-dir-$1"
 	if test "$eval_ret" = 0; then
 		say >&3 "prerequisite $1 ok"
 	else
@@ -701,34 +758,37 @@ test_external_without_stderr () {
 }
 
 # debugging-friendly alternatives to "test [-f|-d|-e]"
-# The commands test the existence or non-existence of $1. $2 can be
-# given to provide a more precise diagnosis.
+# The commands test the existence or non-existence of $1
 test_path_is_file () {
+	test "$#" -ne 1 && BUG "1 param"
 	if ! test -f "$1"
 	then
-		echo "File $1 doesn't exist. $2"
+		echo "File $1 doesn't exist"
 		false
 	fi
 }
 
 test_path_is_dir () {
+	test "$#" -ne 1 && BUG "1 param"
 	if ! test -d "$1"
 	then
-		echo "Directory $1 doesn't exist. $2"
+		echo "Directory $1 doesn't exist"
 		false
 	fi
 }
 
 test_path_exists () {
+	test "$#" -ne 1 && BUG "1 param"
 	if ! test -e "$1"
 	then
-		echo "Path $1 doesn't exist. $2"
+		echo "Path $1 doesn't exist"
 		false
 	fi
 }
 
 # Check if the directory exists and is empty as expected, barf otherwise.
 test_dir_is_empty () {
+	test "$#" -ne 1 && BUG "1 param"
 	test_path_is_dir "$1" &&
 	if test -n "$(ls -a1 "$1" | egrep -v '^\.\.?$')"
 	then
@@ -740,6 +800,7 @@ test_dir_is_empty () {
 
 # Check if the file exists and has a size greater than zero
 test_file_not_empty () {
+	test "$#" = 2 && BUG "2 param"
 	if ! test -s "$1"
 	then
 		echo "'$1' is not a non-empty file."
@@ -748,6 +809,7 @@ test_file_not_empty () {
 }
 
 test_path_is_missing () {
+	test "$#" -ne 1 && BUG "1 param"
 	if test -e "$1"
 	then
 		echo "Path exists:"
@@ -783,6 +845,37 @@ test_line_count () {
 	fi
 }
 
+# SYNOPSIS:
+# 	test_stdout_line_count <bin-ops> <value> <cmd> [<args>...]
+#
+# test_stdout_line_count checks that the output of a command has the number
+# of lines it ought to. For example:
+#
+# test_stdout_line_count = 3 git ls-files -u
+# test_stdout_line_count -gt 10 ls
+test_stdout_line_count () {
+	local ops val trashdir &&
+	if test "$#" -le 3
+	then
+		BUG "expect 3 or more arguments"
+	fi &&
+	ops="$1" &&
+	val="$2" &&
+	shift 2 &&
+	if ! trashdir="$(git rev-parse --git-dir)/trash"; then
+		BUG "expect to be run inside a worktree"
+	fi &&
+	mkdir -p "$trashdir" &&
+	"$@" >"$trashdir/output" &&
+	test_line_count "$ops" "$val" "$trashdir/output"
+}
+
+
+test_file_size () {
+	test "$#" -ne 1 && BUG "1 param"
+	test-tool path-utils file-size "$1"
+}
+
 # Returns success if a comma separated string of keywords ($1) contains a
 # given keyword ($2).
 # Examples:
@@ -798,6 +891,37 @@ list_contains () {
 	return 1
 }
 
+# Returns success if the arguments indicate that a command should be
+# accepted by test_must_fail(). If the command is run with env, the env
+# and its corresponding variable settings will be stripped before we
+# test the command being run.
+test_must_fail_acceptable () {
+	if test "$1" = "env"
+	then
+		shift
+		while test $# -gt 0
+		do
+			case "$1" in
+			*?=*)
+				shift
+				;;
+			*)
+				break
+				;;
+			esac
+		done
+	fi
+
+	case "$1" in
+	git|__git*|test-tool|test_terminal)
+		return 0
+		;;
+	*)
+		return 1
+		;;
+	esac
+}
+
 # This is not among top-level (test_expect_success | test_expect_failure)
 # but is a prefix that can be used in the test script, like:
 #
@@ -817,6 +941,17 @@ list_contains () {
 #     Multiple signals can be specified as a comma separated list.
 #     Currently recognized signal names are: sigpipe, success.
 #     (Don't use 'success', use 'test_might_fail' instead.)
+#
+# Do not use this to run anything but "git" and other specific testable
+# commands (see test_must_fail_acceptable()).  We are not in the
+# business of vetting system supplied commands -- in other words, this
+# is wrong:
+#
+#    test_must_fail grep pattern output
+#
+# Instead use '!':
+#
+#    ! grep pattern output
 
 test_must_fail () {
 	case "$1" in
@@ -828,6 +963,11 @@ test_must_fail () {
 		_test_ok=
 		;;
 	esac
+	if ! test_must_fail_acceptable "$@"
+	then
+		echo >&7 "test_must_fail: only 'git' is allowed: $*"
+		return 1
+	fi
 	"$@" 2>&7
 	exit_code=$?
 	if test $exit_code -eq 0 && ! list_contains "$_test_ok" success
@@ -904,8 +1044,9 @@ test_expect_code () {
 # - cmp's output is not nearly as easy to read as diff -u
 # - not all diff versions understand "-u"
 
-test_cmp() {
-	$GIT_TEST_CMP "$@"
+test_cmp () {
+	test "$#" -ne 2 && BUG "2 param"
+	eval "$GIT_TEST_CMP" '"$@"'
 }
 
 # Check that the given config key has the expected value.
@@ -917,7 +1058,7 @@ test_cmp() {
 #
 #    test_cmp_config foo core.bar
 #
-test_cmp_config() {
+test_cmp_config () {
 	local GD &&
 	if test "$1" = "-C"
 	then
@@ -933,23 +1074,14 @@ test_cmp_config() {
 
 # test_cmp_bin - helper to compare binary files
 
-test_cmp_bin() {
+test_cmp_bin () {
+	test "$#" -ne 2 && BUG "2 param"
 	cmp "$@"
 }
 
-# Use this instead of test_cmp to compare files that contain expected and
-# actual output from git commands that can be translated.  When running
-# under GIT_TEST_GETTEXT_POISON this pretends that the command produced expected
-# results.
-test_i18ncmp () {
-	! test_have_prereq C_LOCALE_OUTPUT || test_cmp "$@"
-}
-
-# Use this instead of "grep expected-string actual" to see if the
-# output from a git command that can be translated either contains an
-# expected string, or does not contain an unwanted one.  When running
-# under GIT_TEST_GETTEXT_POISON this pretends that the command produced expected
-# results.
+# Wrapper for grep which used to be used for
+# GIT_TEST_GETTEXT_POISON=false. Only here as a shim for other
+# in-flight changes. Should not be used and will be removed soon.
 test_i18ngrep () {
 	eval "last_arg=\${$#}"
 
@@ -962,12 +1094,6 @@ test_i18ngrep () {
 		BUG "too few parameters to test_i18ngrep"
 	fi
 
-	if test_have_prereq !C_LOCALE_OUTPUT
-	then
-		# pretend success
-		return 0
-	fi
-
 	if test "x!" = "x$1"
 	then
 		shift
@@ -1003,6 +1129,7 @@ verbose () {
 # otherwise.
 
 test_must_be_empty () {
+	test "$#" -ne 1 && BUG "1 param"
 	test_path_is_file "$1" &&
 	if test -s "$1"
 	then
@@ -1012,19 +1139,30 @@ test_must_be_empty () {
 	fi
 }
 
-# Tests that its two parameters refer to the same revision
+# Tests that its two parameters refer to the same revision, or if '!' is
+# provided first, that its other two parameters refer to different
+# revisions.
 test_cmp_rev () {
+	local op='=' wrong_result=different
+
+	if test $# -ge 1 && test "x$1" = 'x!'
+	then
+	    op='!='
+	    wrong_result='the same'
+	    shift
+	fi
 	if test $# != 2
 	then
-		error "bug in the test script: test_cmp_rev requires two revisions, but got $#"
+		BUG "test_cmp_rev requires two revisions, but got $#"
 	else
 		local r1 r2
 		r1=$(git rev-parse --verify "$1") &&
-		r2=$(git rev-parse --verify "$2") &&
-		if test "$r1" != "$r2"
+		r2=$(git rev-parse --verify "$2") || return 1
+
+		if ! test "$r1" "$op" "$r2"
 		then
 			cat >&4 <<-EOF
-			error: two revisions point to different objects:
+			error: two revisions point to $wrong_result objects:
 			  '$1': $r1
 			  '$2': $r2
 			EOF
@@ -1126,25 +1264,15 @@ test_atexit () {
 	# doing so on Bash is better than nothing (the test will
 	# silently pass on other shells).
 	test "${BASH_SUBSHELL-0}" = 0 ||
-	error "bug in test script: test_atexit does nothing in a subshell"
+	BUG "test_atexit does nothing in a subshell"
 	test_atexit_cleanup="{ $*
 		} && (exit \"\$eval_ret\"); eval_ret=\$?; $test_atexit_cleanup"
 }
 
-# Most tests can use the created repository, but some may need to create more.
+# Deprecated wrapper for "git init", use "git init" directly instead
 # Usage: test_create_repo <directory>
 test_create_repo () {
-	test "$#" = 1 ||
-	BUG "not 1 parameter to test-create-repo"
-	repo="$1"
-	mkdir -p "$repo"
-	(
-		cd "$repo" || error "Cannot setup test environment"
-		"${GIT_TEST_INSTALLED:-$GIT_EXEC_PATH}/git$X" init \
-			"--template=$GIT_BUILD_DIR/templates/blt/" >&3 2>&4 ||
-		error "cannot run git init -- have you built things yet?"
-		mv .git/hooks .git/hooks-disabled
-	) || exit
+	git init "$@"
 }
 
 # This function helps on symlink challenged file systems when it is not
@@ -1175,6 +1303,34 @@ perl () {
 	command "$PERL_PATH" "$@" 2>&7
 } 7>&2 2>&4
 
+# Given the name of an environment variable with a bool value, normalize
+# its value to a 0 (true) or 1 (false or empty string) return code.
+#
+#   test_bool_env GIT_TEST_HTTPD <default-value>
+#
+# Return with code corresponding to the given default value if the variable
+# is unset.
+# Abort the test script if either the value of the variable or the default
+# are not valid bool values.
+
+test_bool_env () {
+	if test $# != 2
+	then
+		BUG "test_bool_env requires two parameters (variable name and default value)"
+	fi
+
+	git env--helper --type=bool --default="$2" --exit-code "$1"
+	ret=$?
+	case $ret in
+	0|1)	# unset or valid bool value
+		;;
+	*)	# invalid bool value or something unexpected
+		error >&7 "test_bool_env requires bool values both for \$$1 and for the default fallback"
+		;;
+	esac
+	return $ret
+}
+
 # Exit the test suite, either by skipping all remaining tests or by
 # exiting with an error. If our prerequisite variable $1 falls back
 # on a default assume we were opportunistically trying to set up some
@@ -1183,7 +1339,7 @@ perl () {
 # The error/skip message should be given by $2.
 #
 test_skip_or_die () {
-	if ! git env--helper --type=bool --default=false --exit-code $1
+	if ! test_bool_env "$1" false
 	then
 		skip_all=$2
 		test_done
@@ -1323,38 +1479,24 @@ nongit () {
 	)
 } 7>&2 2>&4
 
-# convert stdin to pktline representation; note that empty input becomes an
-# empty packet, not a flush packet (for that you can just print 0000 yourself).
-packetize() {
-	cat >packetize.tmp &&
-	len=$(wc -c <packetize.tmp) &&
-	printf '%04x%s' "$(($len + 4))" &&
-	cat packetize.tmp &&
-	rm -f packetize.tmp
+# 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
+		test-tool pkt-line pack
+	fi
+}
+
+packetize_raw () {
+	test-tool pkt-line pack-raw-stdin
 }
 
-# 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.
 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
@@ -1370,9 +1512,7 @@ test_set_hash () {
 
 # Detect the hash algorithm in use.
 test_detect_hash () {
-	# Currently we only support SHA-1, but in the future this function will
-	# actually detect the algorithm in use.
-	test_hash_algo='sha1'
+	test_hash_algo="${GIT_TEST_DEFAULT_HASH:-sha1}"
 }
 
 # Load common hash metadata and common placeholder object IDs for use with
@@ -1421,7 +1561,17 @@ test_oid_cache () {
 # Look up a per-hash value based on a key ($1).  The value must have been loaded
 # by test_oid_init or test_oid_cache.
 test_oid () {
-	local var="test_oid_${test_hash_algo}_$1" &&
+	local algo="${test_hash_algo}" &&
+
+	case "$1" in
+	--hash=*)
+		algo="${1#--hash=}" &&
+		shift;;
+	*)
+		;;
+	esac &&
+
+	local var="test_oid_${algo}_$1" &&
 
 	# If the variable is unset, we must be missing an entry for this
 	# key-hash pair, so exit with an error.
@@ -1477,3 +1627,94 @@ test_set_port () {
 	port=$(($port + ${GIT_TEST_STRESS_JOB_NR:-0}))
 	eval $var=$port
 }
+
+# Tests for the hidden file attribute on Windows
+test_path_is_hidden () {
+	test_have_prereq MINGW ||
+	BUG "test_path_is_hidden can only be used on Windows"
+
+	# Use the output of `attrib`, ignore the absolute path
+	case "$("$SYSTEMROOT"/system32/attrib "$1")" in *H*?:*) return 0;; esac
+	return 1
+}
+
+# Check that the given command was invoked as part of the
+# trace2-format trace on stdin.
+#
+#	test_subcommand [!] <command> <args>... < <trace>
+#
+# For example, to look for an invocation of "git upload-pack
+# /path/to/repo"
+#
+#	GIT_TRACE2_EVENT=event.log git fetch ... &&
+#	test_subcommand git upload-pack "$PATH" <event.log
+#
+# If the first parameter passed is !, this instead checks that
+# the given command was not called.
+#
+test_subcommand () {
+	local negate=
+	if test "$1" = "!"
+	then
+		negate=t
+		shift
+	fi
+
+	local expr=$(printf '"%s",' "$@")
+	expr="${expr%,}"
+
+	if test -n "$negate"
+	then
+		! grep "\[$expr\]"
+	else
+		grep "\[$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>...
+#
+# For example, to look for trace2_region_enter("index", "do_read_index", repo)
+# in an invocation of "git checkout HEAD~1", run
+#
+#	GIT_TRACE2_EVENT="$(pwd)/trace.txt" GIT_TRACE2_EVENT_NESTING=10 \
+#		git checkout HEAD~1 &&
+#	test_region index do_read_index <trace.txt
+#
+# If the first parameter passed is !, this instead checks that
+# the given region was not entered.
+#
+test_region () {
+	local expect_exit=0
+	if test "$1" = "!"
+	then
+		expect_exit=1
+		shift
+	fi
+
+	grep -e	'"region_enter".*"category":"'"$1"'","label":"'"$2"\" "$3"
+	exitcode=$?
+
+	if test $exitcode != $expect_exit
+	then
+		return 1
+	fi
+
+	grep -e	'"region_leave".*"category":"'"$1"'","label":"'"$2"\" "$3"
+	exitcode=$?
+
+	if test $exitcode != $expect_exit
+	then
+		return 1
+	fi
+
+	return 0
+}
+
+# Print the destination of symlink(s) provided as arguments. Basically
+# the same as the readlink command, but it's not available everywhere.
+test_readlink () {
+	perl -le 'print readlink($_) for @ARGV' "$@"
+}
diff --git a/t/test-lib.sh b/t/test-lib.sh
index e06fa02a0e..abcfbed6d6 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
@@ -64,6 +73,11 @@ then
 	export GIT_TEST_DISALLOW_ABBREVIATED_OPTIONS
 fi
 
+# Explicitly set the default branch name for testing, to avoid the
+# transitory "git init" warning under --verbose.
+: ${GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME:=master}
+export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
+
 ################################################################
 # It appears that people try to run tests without building...
 "${GIT_TEST_INSTALLED:-$GIT_BUILD_DIR}/git$X" >/dev/null
@@ -78,20 +92,23 @@ then
 	exit 1
 fi
 
-# Parse options while taking care to leave $@ intact, so we will still
-# have all the original command line options when executing the test
-# script again for '--tee' and '--verbose-log' below.
 store_arg_to=
-prev_opt=
-for opt
-do
-	if test -n "$store_arg_to"
+opt_required_arg=
+# $1: option string
+# $2: name of the var where the arg will be stored
+mark_option_requires_arg () {
+	if test -n "$opt_required_arg"
 	then
-		eval $store_arg_to=\$opt
-		store_arg_to=
-		prev_opt=
-		continue
+		echo "error: options that require args cannot be bundled" \
+			"together: '$opt_required_arg' and '$1'" >&2
+		exit 1
 	fi
+	opt_required_arg=$1
+	store_arg_to=$2
+}
+
+parse_option () {
+	local opt="$1"
 
 	case "$opt" in
 	-d|--d|--de|--deb|--debu|--debug)
@@ -101,7 +118,7 @@ do
 	-l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests)
 		GIT_TEST_LONG=t; export GIT_TEST_LONG ;;
 	-r)
-		store_arg_to=run_list
+		mark_option_requires_arg "$opt" run_list
 		;;
 	--run=*)
 		run_list=${opt#--*=} ;;
@@ -160,8 +177,8 @@ do
 		;;
 	--stress-jobs=*)
 		stress=t;
-		stress=${opt#--*=}
-		case "$stress" in
+		stress_jobs=${opt#--*=}
+		case "$stress_jobs" in
 		*[!0-9]*|0*|"")
 			echo "error: --stress-jobs=<N> requires the number of jobs to run" >&2
 			exit 1
@@ -185,12 +202,42 @@ do
 	*)
 		echo "error: unknown test option '$opt'" >&2; exit 1 ;;
 	esac
+}
 
-	prev_opt=$opt
+# Parse options while taking care to leave $@ intact, so we will still
+# have all the original command line options when executing the test
+# script again for '--tee' and '--verbose-log' later.
+for opt
+do
+	if test -n "$store_arg_to"
+	then
+		eval $store_arg_to=\$opt
+		store_arg_to=
+		opt_required_arg=
+		continue
+	fi
+
+	case "$opt" in
+	--*|-?)
+		parse_option "$opt" ;;
+	-?*)
+		# bundled short options must be fed separately to parse_option
+		opt=${opt#-}
+		while test -n "$opt"
+		do
+			extra=${opt#?}
+			this=${opt%$extra}
+			opt=$extra
+			parse_option "-$this"
+		done
+		;;
+	*)
+		echo "error: unknown test option '$opt'" >&2; exit 1 ;;
+	esac
 done
 if test -n "$store_arg_to"
 then
-	echo "error: $prev_opt requires an argument" >&2
+	echo "error: $opt_required_arg requires an argument" >&2
 	exit 1
 fi
 
@@ -229,9 +276,9 @@ then
 	: # Don't stress test again.
 elif test -n "$stress"
 then
-	if test "$stress" != t
+	if test -n "$stress_jobs"
 	then
-		job_count=$stress
+		job_count=$stress_jobs
 	elif test -n "$GIT_TEST_STRESS_LOAD"
 	then
 		job_count="$GIT_TEST_STRESS_LOAD"
@@ -362,29 +409,27 @@ 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
 LC_ALL=C
 PAGER=cat
 TZ=UTC
-export LANG LC_ALL PAGER TZ
+COLUMNS=80
+export LANG LC_ALL PAGER TZ COLUMNS
 EDITOR=:
 
-# GIT_TEST_GETTEXT_POISON should not influence git commands executed
-# during initialization of test-lib and the test repo. Back it up,
-# unset and then restore after initialization is finished.
-if test -n "$GIT_TEST_GETTEXT_POISON"
-then
-	GIT_TEST_GETTEXT_POISON_ORIG=$GIT_TEST_GETTEXT_POISON
-	unset GIT_TEST_GETTEXT_POISON
-fi
-
 # A call to "unset" with no arguments causes at least Solaris 10
 # /usr/xpg4/bin/sh and /bin/ksh to bail out.  So keep the unsets
 # deriving from the command substitution clustered with the other
 # ones.
-unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
+unset VISUAL EMAIL LANGUAGE $("$PERL_PATH" -e '
 	my @env = keys %ENV;
 	my $ok = join("|", qw(
 		TRACE
@@ -404,51 +449,33 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
 unset XDG_CACHE_HOME
 unset XDG_CONFIG_HOME
 unset GITPERLLIB
-GIT_AUTHOR_EMAIL=author@example.com
+TEST_AUTHOR_LOCALNAME=author
+TEST_AUTHOR_DOMAIN=example.com
+GIT_AUTHOR_EMAIL=${TEST_AUTHOR_LOCALNAME}@${TEST_AUTHOR_DOMAIN}
 GIT_AUTHOR_NAME='A U Thor'
-GIT_COMMITTER_EMAIL=committer@example.com
+GIT_AUTHOR_DATE='1112354055 +0200'
+TEST_COMMITTER_LOCALNAME=committer
+TEST_COMMITTER_DOMAIN=example.com
+GIT_COMMITTER_EMAIL=${TEST_COMMITTER_LOCALNAME}@${TEST_COMMITTER_DOMAIN}
 GIT_COMMITTER_NAME='C O Mitter'
+GIT_COMMITTER_DATE='1112354055 +0200'
 GIT_MERGE_VERBOSITY=5
 GIT_MERGE_AUTOEDIT=no
 export GIT_MERGE_VERBOSITY GIT_MERGE_AUTOEDIT
 export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
 export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
+export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
 export EDITOR
 
+GIT_DEFAULT_HASH="${GIT_TEST_DEFAULT_HASH:-sha1}"
+export GIT_DEFAULT_HASH
+GIT_TEST_MERGE_ALGORITHM="${GIT_TEST_MERGE_ALGORITHM:-ort}"
+export GIT_TEST_MERGE_ALGORITHM
+
 # Tests using GIT_TRACE typically don't want <timestamp> <file>:<line> output
 GIT_TRACE_BARE=1
 export GIT_TRACE_BARE
 
-check_var_migration () {
-	# the warnings and hints given from this helper depends
-	# on end-user settings, which will disrupt the self-test
-	# done on the test framework itself.
-	case "$GIT_TEST_FRAMEWORK_SELFTEST" in
-	t)	return ;;
-	esac
-
-	old_name=$1 new_name=$2
-	eval "old_isset=\${${old_name}:+isset}"
-	eval "new_isset=\${${new_name}:+isset}"
-
-	case "$old_isset,$new_isset" in
-	isset,)
-		echo >&2 "warning: $old_name is now $new_name"
-		echo >&2 "hint: set $new_name too during the transition period"
-		eval "$new_name=\$$old_name"
-		;;
-	isset,isset)
-		# do this later
-		# echo >&2 "warning: $old_name is now $new_name"
-		# echo >&2 "hint: remove $old_name"
-		;;
-	esac
-}
-
-check_var_migration GIT_FSMONITOR_TEST GIT_TEST_FSMONITOR
-check_var_migration TEST_GIT_INDEX_VERSION GIT_TEST_INDEX_VERSION
-check_var_migration GIT_FORCE_PRELOAD_TEST GIT_TEST_PRELOAD_INDEX
-
 # Use specific version of the index file format
 if test -n "${GIT_TEST_INDEX_VERSION:+isset}"
 then
@@ -456,6 +483,12 @@ then
 	export GIT_INDEX_VERSION
 fi
 
+if test -n "$GIT_TEST_PERL_FATAL_WARNINGS"
+then
+	GIT_PERL_FATAL_WARNINGS=1
+	export GIT_PERL_FATAL_WARNINGS
+fi
+
 # Add libc MALLOC and MALLOC_PERTURB test
 # only if we are not executing the test with valgrind
 if test -n "$valgrind" ||
@@ -490,21 +523,6 @@ case $(echo $GIT_TRACE |tr "[A-Z]" "[a-z]") in
 	;;
 esac
 
-# Convenience
-#
-# A regexp to match 5, 35 and 40 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"
-
-# Zero SHA-1
-_z40=0000000000000000000000000000000000000000
-
-OID_REGEX="$_x40"
-ZERO_OID=$_z40
-EMPTY_TREE=4b825dc642cb6eb9a060e54bf8d69288fbee4904
-EMPTY_BLOB=e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
-
 # Line feed
 LF='
 '
@@ -730,26 +748,38 @@ match_pattern_list () {
 	arg="$1"
 	shift
 	test -z "$*" && return 1
-	for pattern_
-	do
-		case "$arg" in
-		$pattern_)
-			return 0
-		esac
-	done
-	return 1
+	# We need to use "$*" to get field-splitting, but we want to
+	# disable globbing, since we are matching against an arbitrary
+	# $arg, not what's in the filesystem. Using "set -f" accomplishes
+	# that, but we must do it in a subshell to avoid impacting the
+	# rest of the script. The exit value of the subshell becomes
+	# the function's return value.
+	(
+		set -f
+		for pattern_ in $*
+		do
+			case "$arg" in
+			$pattern_)
+				exit 0
+				;;
+			esac
+		done
+		exit 1
+	)
 }
 
 match_test_selector_list () {
+	operation="$1"
+	shift
 	title="$1"
 	shift
 	arg="$1"
 	shift
 	test -z "$1" && return 0
 
-	# Both commas and whitespace are accepted as separators.
+	# Commas are accepted as separators.
 	OLDIFS=$IFS
-	IFS=' 	,'
+	IFS=','
 	set -- $1
 	IFS=$OLDIFS
 
@@ -777,13 +807,13 @@ match_test_selector_list () {
 			*-*)
 				if expr "z${selector%%-*}" : "z[0-9]*[^0-9]" >/dev/null
 				then
-					echo "error: $title: invalid non-numeric in range" \
+					echo "error: $operation: invalid non-numeric in range" \
 						"start: '$orig_selector'" >&2
 					exit 1
 				fi
 				if expr "z${selector#*-}" : "z[0-9]*[^0-9]" >/dev/null
 				then
-					echo "error: $title: invalid non-numeric in range" \
+					echo "error: $operation: invalid non-numeric in range" \
 						"end: '$orig_selector'" >&2
 					exit 1
 				fi
@@ -791,9 +821,11 @@ match_test_selector_list () {
 			*)
 				if expr "z$selector" : "z[0-9]*[^0-9]" >/dev/null
 				then
-					echo "error: $title: invalid non-numeric in test" \
-						"selector: '$orig_selector'" >&2
-					exit 1
+					case "$title" in *${selector}*)
+						include=$positive
+						;;
+					esac
+					continue
 				fi
 		esac
 
@@ -842,7 +874,7 @@ maybe_teardown_verbose () {
 last_verbose=t
 maybe_setup_verbose () {
 	test -z "$verbose_only" && return
-	if match_pattern_list $test_count $verbose_only
+	if match_pattern_list $test_count "$verbose_only"
 	then
 		exec 4>&2 3>&1
 		# Emit a delimiting blank line when going from
@@ -872,12 +904,13 @@ maybe_setup_valgrind () {
 		return
 	fi
 	GIT_VALGRIND_ENABLED=
-	if match_pattern_list $test_count $valgrind_only
+	if match_pattern_list $test_count "$valgrind_only"
 	then
 		GIT_VALGRIND_ENABLED=t
 	fi
 }
 
+trace_level_=0
 want_trace () {
 	test "$trace" = t && {
 		test "$verbose" = t || test "$verbose_log" = t
@@ -891,7 +924,7 @@ want_trace () {
 test_eval_inner_ () {
 	# Do not add anything extra (including LF) after '$*'
 	eval "
-		want_trace && set -x
+		want_trace && trace_level_=$(($trace_level_+1)) && set -x
 		$*"
 }
 
@@ -922,7 +955,8 @@ test_eval_ () {
 		test_eval_ret_=$?
 		if want_trace
 		then
-			set +x
+			test 1 = $trace_level_ && set +x
+			trace_level_=$(($trace_level_-1))
 		fi
 	} 2>/dev/null 4>&2
 
@@ -944,8 +978,11 @@ test_run_ () {
 		trace=
 		# 117 is magic because it is unlikely to match the exit
 		# code of other programs
-		if $(printf '%s\n' "$1" | sed -f "$GIT_BUILD_DIR/t/chainlint.sed" | grep -q '?![A-Z][A-Z]*?!') ||
-			test "OK-117" != "$(test_eval_ "(exit 117) && $1${LF}${LF}echo OK-\$?" 3>&1)"
+		if test "OK-117" != "$(test_eval_ "(exit 117) && $1${LF}${LF}echo OK-\$?" 3>&1)" ||
+		   {
+			test "${GIT_TEST_CHAIN_LINT_HARDER:-${GIT_TEST_CHAIN_LINT_HARDER_DEFAULT:-1}}" != 0 &&
+			$(printf '%s\n' "$1" | sed -f "$GIT_BUILD_DIR/t/chainlint.sed" | grep -q '?![A-Z][A-Z]*?!')
+		   }
 		then
 			BUG "broken &&-chain or run-away HERE-DOC: $1"
 		fi
@@ -995,11 +1032,17 @@ test_finish_ () {
 test_skip () {
 	to_skip=
 	skipped_reason=
-	if match_pattern_list $this_test.$test_count $GIT_SKIP_TESTS
+	if match_pattern_list $this_test.$test_count "$GIT_SKIP_TESTS"
 	then
 		to_skip=t
 		skipped_reason="GIT_SKIP_TESTS"
 	fi
+	if test -z "$to_skip" && test -n "$run_list" &&
+	   ! match_test_selector_list '--run' "$1" $test_count "$run_list"
+	then
+		to_skip=t
+		skipped_reason="--run"
+	fi
 	if test -z "$to_skip" && test -n "$test_prereq" &&
 	   ! test_have_prereq "$test_prereq"
 	then
@@ -1012,12 +1055,6 @@ test_skip () {
 		fi
 		skipped_reason="missing $missing_prereq${of_prereq}"
 	fi
-	if test -z "$to_skip" && test -n "$run_list" &&
-		! match_test_selector_list '--run' $test_count "$run_list"
-	then
-		to_skip=t
-		skipped_reason="--run"
-	fi
 
 	case "$to_skip" in
 	t)
@@ -1028,7 +1065,6 @@ test_skip () {
 				"      <skipped message=\"$message\" />"
 		fi
 
-		say_color skip >&3 "skipping test: $@"
 		say_color skip "ok $test_count # skip $1 ($skipped_reason)"
 		: true
 		;;
@@ -1079,7 +1115,9 @@ finalize_junit_xml () {
 
 		# adjust the overall time
 		junit_time=$(test-tool date getnanos $junit_suite_start)
-		sed "s/<testsuite [^>]*/& time=\"$junit_time\"/" \
+		sed -e "s/\(<testsuite.*\) time=\"[^\"]*\"/\1/" \
+			-e "s/<testsuite [^>]*/& time=\"$junit_time\"/" \
+			-e '/^ *<\/testsuite/d' \
 			<"$junit_xml_path" >"$junit_xml_path.new"
 		mv "$junit_xml_path.new" "$junit_xml_path"
 
@@ -1165,7 +1203,7 @@ test_done () {
 			esac
 		fi
 
-		if test -z "$debug"
+		if test -z "$debug" && test -n "$remove_trash"
 		then
 			test -d "$TRASH_DIRECTORY" ||
 			error "Tests passed but trash directory already removed before test cleanup; aborting"
@@ -1330,6 +1368,22 @@ then
 	exit 1
 fi
 
+# Are we running this test at all?
+remove_trash=
+this_test=${0##*/}
+this_test=${this_test%%-*}
+if match_pattern_list "$this_test" "$GIT_SKIP_TESTS"
+then
+	say_color info >&3 "skipping test $this_test altogether"
+	skip_all="skip all tests in $this_test"
+	test_done
+fi
+
+# Last-minute variable setup
+HOME="$TRASH_DIRECTORY"
+GNUPGHOME="$HOME/gnupg-home-not-used"
+export HOME GNUPGHOME
+
 # Test repository
 rm -fr "$TRASH_DIRECTORY" || {
 	GIT_EXIT_OK=t
@@ -1337,13 +1391,11 @@ rm -fr "$TRASH_DIRECTORY" || {
 	exit 1
 }
 
-HOME="$TRASH_DIRECTORY"
-GNUPGHOME="$HOME/gnupg-home-not-used"
-export HOME GNUPGHOME
-
+remove_trash=t
 if test -z "$TEST_NO_CREATE_REPO"
 then
-	test_create_repo "$TRASH_DIRECTORY"
+	git init "$TRASH_DIRECTORY" >&3 2>&4 ||
+	error "cannot run git init"
 else
 	mkdir -p "$TRASH_DIRECTORY"
 fi
@@ -1352,15 +1404,6 @@ fi
 # in subprocesses like git equals our $PWD (for pathname comparisons).
 cd -P "$TRASH_DIRECTORY" || exit 1
 
-this_test=${0##*/}
-this_test=${this_test%%-*}
-if match_pattern_list "$this_test" $GIT_SKIP_TESTS
-then
-	say_color info >&3 "skipping test $this_test altogether"
-	skip_all="skip all tests in $this_test"
-	test_done
-fi
-
 if test -n "$write_junit_xml"
 then
 	junit_xml_dir="$TEST_OUTPUT_DIRECTORY/out"
@@ -1378,6 +1421,21 @@ then
 	fi
 fi
 
+# Convenience
+# A regexp to match 5, 35 and 40 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
+
+ZERO_OID=$(test_oid zero)
+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
 # wasting cycles when the downstream stops reading, so do not be
@@ -1402,23 +1460,23 @@ yes () {
 # The GIT_TEST_FAIL_PREREQS code hooks into test_set_prereq(), and
 # thus needs to be set up really early, and set an internal variable
 # for convenience so the hot test_set_prereq() codepath doesn't need
-# to call "git env--helper". Only do that work if needed by seeing if
-# GIT_TEST_FAIL_PREREQS is set at all.
+# to call "git env--helper" (via test_bool_env). Only do that work
+# if needed by seeing if GIT_TEST_FAIL_PREREQS is set at all.
 GIT_TEST_FAIL_PREREQS_INTERNAL=
 if test -n "$GIT_TEST_FAIL_PREREQS"
 then
-	if git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS
+	if test_bool_env GIT_TEST_FAIL_PREREQS false
 	then
 		GIT_TEST_FAIL_PREREQS_INTERNAL=true
 		test_set_prereq FAIL_PREREQS
 	fi
 else
 	test_lazy_prereq FAIL_PREREQS '
-		git env--helper --type=bool --default=0 --exit-code GIT_TEST_FAIL_PREREQS
+		test_bool_env GIT_TEST_FAIL_PREREQS false
 	'
 fi
 
-# Fix some commands on Windows
+# Fix some commands on Windows, and other OS-specific things
 uname_s=$(uname -s)
 case $uname_s in
 *MINGW*)
@@ -1440,6 +1498,7 @@ case $uname_s in
 	test_set_prereq NATIVE_CRLF
 	test_set_prereq SED_STRIPS_CR
 	test_set_prereq GREP_STRIPS_CR
+	test_set_prereq WINDOWS
 	GIT_TEST_CMP=mingw_test_cmp
 	;;
 *CYGWIN*)
@@ -1448,6 +1507,7 @@ case $uname_s in
 	test_set_prereq CYGWIN
 	test_set_prereq SED_STRIPS_CR
 	test_set_prereq GREP_STRIPS_CR
+	test_set_prereq WINDOWS
 	;;
 *)
 	test_set_prereq POSIXPERM
@@ -1456,26 +1516,24 @@ case $uname_s in
 	;;
 esac
 
+# Detect arches where a few things don't work
+uname_m=$(uname -m)
+case $uname_m in
+parisc* | hppa*)
+	test_set_prereq HPPA
+	;;
+esac
+
+test_set_prereq REFFILES
+
 ( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
 test -z "$NO_PERL" && test_set_prereq PERL
 test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
 test -z "$NO_PYTHON" && test_set_prereq PYTHON
-test -n "$USE_LIBPCRE1$USE_LIBPCRE2" && test_set_prereq PCRE
-test -n "$USE_LIBPCRE1" && test_set_prereq LIBPCRE1
+test -n "$USE_LIBPCRE2" && test_set_prereq PCRE
 test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2
 test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
 
-if test -n "$GIT_TEST_GETTEXT_POISON_ORIG"
-then
-	GIT_TEST_GETTEXT_POISON=$GIT_TEST_GETTEXT_POISON_ORIG
-	export GIT_TEST_GETTEXT_POISON
-	unset GIT_TEST_GETTEXT_POISON_ORIG
-fi
-
-test_lazy_prereq C_LOCALE_OUTPUT '
-	! git env--helper --type=bool --default=0 --exit-code GIT_TEST_GETTEXT_POISON
-'
-
 if test -z "$GIT_TEST_CHECK_CACHE_TREE"
 then
 	GIT_TEST_CHECK_CACHE_TREE=true
@@ -1493,6 +1551,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
 '
@@ -1595,7 +1659,7 @@ run_with_limited_cmdline () {
 }
 
 test_lazy_prereq CMDLINE_LIMIT '
-	test_have_prereq !MINGW,!CYGWIN &&
+	test_have_prereq !HPPA,!MINGW,!CYGWIN &&
 	run_with_limited_cmdline true
 '
 
@@ -1604,10 +1668,19 @@ run_with_limited_stack () {
 }
 
 test_lazy_prereq ULIMIT_STACK_SIZE '
-	test_have_prereq !MINGW,!CYGWIN &&
+	test_have_prereq !HPPA,!MINGW,!CYGWIN &&
 	run_with_limited_stack true
 '
 
+run_with_limited_open_files () {
+	(ulimit -n 32 && "$@")
+}
+
+test_lazy_prereq ULIMIT_FILE_DESCRIPTORS '
+	test_have_prereq !MINGW,!CYGWIN &&
+	run_with_limited_open_files true
+'
+
 build_option () {
 	git version --build-options |
 	sed -ne "s/^$1: //p"
@@ -1628,9 +1701,20 @@ test_lazy_prereq CURL '
 # which will not work with other hash algorithms and tests that work but don't
 # test anything meaningful (e.g. special values which cause short collisions).
 test_lazy_prereq SHA1 '
-	test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
+	case "$GIT_DEFAULT_HASH" in
+	sha1) true ;;
+	"") test $(git hash-object /dev/null) = e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 ;;
+	*) false ;;
+	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.
+# Tests that verify the scheduler integration must set this locally
+# to avoid errors.
+GIT_TEST_MAINT_SCHEDULER="none:exit 1"
diff --git a/t/test-terminal.perl b/t/test-terminal.perl
index 46bf618479..1bcf01a9a4 100755
--- a/t/test-terminal.perl
+++ b/t/test-terminal.perl
@@ -81,24 +81,24 @@ if ($#ARGV < 1) {
 	die "usage: test-terminal program args";
 }
 $ENV{TERM} = 'vt100';
-my $master_in = new IO::Pty;
-my $master_out = new IO::Pty;
-my $master_err = new IO::Pty;
-$master_in->set_raw();
-$master_out->set_raw();
-$master_err->set_raw();
-$master_in->slave->set_raw();
-$master_out->slave->set_raw();
-$master_err->slave->set_raw();
-my $pid = start_child(\@ARGV, $master_in->slave, $master_out->slave, $master_err->slave);
-close $master_in->slave;
-close $master_out->slave;
-close $master_err->slave;
-my $in_pid = copy_stdin($master_in);
-copy_stdio($master_out, $master_err);
+my $parent_in = new IO::Pty;
+my $parent_out = new IO::Pty;
+my $parent_err = new IO::Pty;
+$parent_in->set_raw();
+$parent_out->set_raw();
+$parent_err->set_raw();
+$parent_in->slave->set_raw();
+$parent_out->slave->set_raw();
+$parent_err->slave->set_raw();
+my $pid = start_child(\@ARGV, $parent_in->slave, $parent_out->slave, $parent_err->slave);
+close $parent_in->slave;
+close $parent_out->slave;
+close $parent_err->slave;
+my $in_pid = copy_stdin($parent_in);
+copy_stdio($parent_out, $parent_err);
 my $ret = finish_child($pid);
 # If the child process terminates before our copy_stdin() process is able to
-# write all of its data to $master_in, the copy_stdin() process could stall.
+# write all of its data to $parent_in, the copy_stdin() process could stall.
 # Send SIGTERM to it to ensure it terminates.
 kill 'TERM', $in_pid;
 finish_child($in_pid);
diff --git a/tag.c b/tag.c
index bfa0e31435..3e18a41841 100644
--- a/tag.c
+++ b/tag.c
@@ -13,26 +13,27 @@ const char *tag_type = "tag";
 static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
 {
 	struct signature_check sigc;
-	size_t payload_size;
+	struct strbuf payload = STRBUF_INIT;
+	struct strbuf signature = STRBUF_INIT;
 	int ret;
 
 	memset(&sigc, 0, sizeof(sigc));
 
-	payload_size = parse_signature(buf, size);
-
-	if (size == payload_size) {
+	if (!parse_signature(buf, size, &payload, &signature)) {
 		if (flags & GPG_VERIFY_VERBOSE)
-			write_in_full(1, buf, payload_size);
+			write_in_full(1, buf, size);
 		return error("no signature found");
 	}
 
-	ret = check_signature(buf, payload_size, buf + payload_size,
-				size - payload_size, &sigc);
+	ret = check_signature(payload.buf, payload.len, signature.buf,
+				signature.len, &sigc);
 
 	if (!(flags & GPG_VERIFY_OMIT_STATUS))
 		print_signature_buffer(&sigc, flags);
 
 	signature_check_clear(&sigc);
+	strbuf_release(&payload);
+	strbuf_release(&signature);
 	return ret;
 }
 
@@ -103,7 +104,7 @@ struct tag *lookup_tag(struct repository *r, const struct object_id *oid)
 	struct object *obj = lookup_object(r, oid);
 	if (!obj)
 		return create_object(r, oid, alloc_tag_node(r));
-	return object_as_type(r, obj, OBJ_TAG, 0);
+	return object_as_type(obj, OBJ_TAG, 0);
 }
 
 static timestamp_t parse_tag_date(const char *buf, const char *tail)
@@ -141,7 +142,16 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u
 
 	if (item->object.parsed)
 		return 0;
-	item->object.parsed = 1;
+
+	if (item->tag) {
+		/*
+		 * Presumably left over from a previous failed parse;
+		 * clear it out in preparation for re-parsing (we'll probably
+		 * hit the same error, which lets us tell our current caller
+		 * about the problem).
+		 */
+		FREE_AND_NULL(item->tag);
+	}
 
 	if (size < the_hash_algo->hexsz + 24)
 		return -1;
@@ -167,10 +177,15 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u
 	} else if (!strcmp(type, tag_type)) {
 		item->tagged = (struct object *)lookup_tag(r, &oid);
 	} else {
-		error("Unknown type %s", type);
-		item->tagged = NULL;
+		return error("unknown tag type '%s' in %s",
+			     type, oid_to_hex(&item->object.oid));
 	}
 
+	if (!item->tagged)
+		return error("bad tag pointer to %s in %s",
+			     oid_to_hex(&oid),
+			     oid_to_hex(&item->object.oid));
+
 	if (bufptr + 4 < tail && starts_with(bufptr, "tag "))
 		; 		/* good */
 	else
@@ -187,6 +202,7 @@ int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, u
 	else
 		item->date = 0;
 
+	item->object.parsed = 1;
 	return 0;
 }
 
diff --git a/tar.h b/tar.h
index 3467705e9b..6b258c4d4a 100644
--- a/tar.h
+++ b/tar.h
@@ -1,3 +1,6 @@
+#ifndef TAR_H
+#define TAR_H
+
 #define TYPEFLAG_AUTO		'\0'
 #define TYPEFLAG_REG		'0'
 #define TYPEFLAG_LNK		'2'
@@ -23,3 +26,5 @@ struct ustar_header {
 	char devminor[8];	/* 337 */
 	char prefix[155];	/* 345 */
 };
+
+#endif /* TAR_H */
diff --git a/tempfile.c b/tempfile.c
index d43ad8c191..94aa18f3f7 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -130,17 +130,17 @@ static void deactivate_tempfile(struct tempfile *tempfile)
 }
 
 /* Make sure errno contains a meaningful value on error */
-struct tempfile *create_tempfile(const char *path)
+struct tempfile *create_tempfile_mode(const char *path, int mode)
 {
 	struct tempfile *tempfile = new_tempfile();
 
 	strbuf_add_absolute_path(&tempfile->filename, path);
 	tempfile->fd = open(tempfile->filename.buf,
-			    O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC, 0666);
+			    O_RDWR | O_CREAT | O_EXCL | O_CLOEXEC, mode);
 	if (O_CLOEXEC && tempfile->fd < 0 && errno == EINVAL)
 		/* Try again w/o O_CLOEXEC: the kernel might not support it */
 		tempfile->fd = open(tempfile->filename.buf,
-				    O_RDWR | O_CREAT | O_EXCL, 0666);
+				    O_RDWR | O_CREAT | O_EXCL, mode);
 	if (tempfile->fd < 0) {
 		deactivate_tempfile(tempfile);
 		return NULL;
diff --git a/tempfile.h b/tempfile.h
index cddda0a33c..4de3bc77d2 100644
--- a/tempfile.h
+++ b/tempfile.h
@@ -88,8 +88,16 @@ struct tempfile {
  * Attempt to create a temporary file at the specified `path`. Return
  * a tempfile (whose "fd" member can be used for writing to it), or
  * NULL on error. It is an error if a file already exists at that path.
+ * Note that `mode` will be further modified by the umask, and possibly
+ * `core.sharedRepository`, so it is not guaranteed to have the given
+ * mode.
  */
-struct tempfile *create_tempfile(const char *path);
+struct tempfile *create_tempfile_mode(const char *path, int mode);
+
+static inline struct tempfile *create_tempfile(const char *path)
+{
+	return create_tempfile_mode(path, 0666);
+}
 
 /*
  * Register an existing file as a tempfile, meaning that it will be
diff --git a/templates/hooks--fsmonitor-watchman.sample b/templates/hooks--fsmonitor-watchman.sample
index e673bb3980..14ed0aa42d 100755
--- a/templates/hooks--fsmonitor-watchman.sample
+++ b/templates/hooks--fsmonitor-watchman.sample
@@ -8,107 +8,166 @@ use IPC::Open2;
 # (https://facebook.github.io/watchman/) with git to speed up detecting
 # new and modified files.
 #
-# The hook is passed a version (currently 1) and a time in nanoseconds
-# formatted as a string and outputs to stdout all files that have been
-# modified since the given time. Paths must be relative to the root of
-# the working tree and separated by a single NUL.
+# The hook is passed a version (currently 2) and last update token
+# formatted as a string and outputs to stdout a new update token and
+# all files that have been modified since the update token. Paths must
+# be relative to the root of the working tree and separated by a single NUL.
 #
 # To enable this hook, rename this file to "query-watchman" and set
 # 'git config core.fsmonitor .git/hooks/query-watchman'
 #
-my ($version, $time) = @ARGV;
+my ($version, $last_update_token) = @ARGV;
 
-# Check the hook interface version
+# Uncomment for debugging
+# print STDERR "$0 $version $last_update_token\n";
 
-if ($version == 1) {
-	# convert nanoseconds to seconds
-	$time = int $time / 1000000000;
-} else {
+# Check the hook interface version
+if ($version ne 2) {
 	die "Unsupported query-fsmonitor hook version '$version'.\n" .
 	    "Falling back to scanning...\n";
 }
 
-my $git_work_tree;
-if ($^O =~ 'msys' || $^O =~ 'cygwin') {
-	$git_work_tree = Win32::GetCwd();
-	$git_work_tree =~ tr/\\/\//;
-} else {
-	require Cwd;
-	$git_work_tree = Cwd::cwd();
-}
+my $git_work_tree = get_working_dir();
 
 my $retry = 1;
 
+my $json_pkg;
+eval {
+	require JSON::XS;
+	$json_pkg = "JSON::XS";
+	1;
+} or do {
+	require JSON::PP;
+	$json_pkg = "JSON::PP";
+};
+
 launch_watchman();
 
 sub launch_watchman {
+	my $o = watchman_query();
+	if (is_work_tree_watched($o)) {
+		output_result($o->{clock}, @{$o->{files}});
+	}
+}
+
+sub output_result {
+	my ($clockid, @files) = @_;
 
+	# Uncomment for debugging watchman output
+	# open (my $fh, ">", ".git/watchman-output.out");
+	# binmode $fh, ":utf8";
+	# print $fh "$clockid\n@files\n";
+	# close $fh;
+
+	binmode STDOUT, ":utf8";
+	print $clockid;
+	print "\0";
+	local $, = "\0";
+	print @files;
+}
+
+sub watchman_clock {
+	my $response = qx/watchman clock "$git_work_tree"/;
+	die "Failed to get clock id on '$git_work_tree'.\n" .
+		"Falling back to scanning...\n" if $? != 0;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub watchman_query {
 	my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
-	    or die "open2() failed: $!\n" .
-	    "Falling back to scanning...\n";
+	or die "open2() failed: $!\n" .
+	"Falling back to scanning...\n";
 
 	# In the query expression below we're asking for names of files that
-	# changed since $time but were not transient (ie created after
-	# $time but no longer exist).
+	# changed since $last_update_token but not from the .git folder.
 	#
 	# To accomplish this, we're using the "since" generator to use the
 	# recency index to select candidate nodes and "fields" to limit the
 	# output to file names only. Then we're using the "expression" term to
 	# further constrain the results.
-	#
-	# The category of transient files that we want to ignore will have a
-	# creation clock (cclock) newer than $time_t value and will also not
-	# currently exist.
-
+	if (substr($last_update_token, 0, 1) eq "c") {
+		$last_update_token = "\"$last_update_token\"";
+	}
 	my $query = <<"	END";
 		["query", "$git_work_tree", {
-			"since": $time,
+			"since": $last_update_token,
 			"fields": ["name"],
-			"expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
+			"expression": ["not", ["dirname", ".git"]]
 		}]
 	END
 
+	# Uncomment for debugging the watchman query
+	# open (my $fh, ">", ".git/watchman-query.json");
+	# print $fh $query;
+	# close $fh;
+
 	print CHLD_IN $query;
 	close CHLD_IN;
 	my $response = do {local $/; <CHLD_OUT>};
 
+	# Uncomment for debugging the watch response
+	# open ($fh, ">", ".git/watchman-response.json");
+	# print $fh $response;
+	# close $fh;
+
 	die "Watchman: command returned no output.\n" .
-	    "Falling back to scanning...\n" if $response eq "";
+	"Falling back to scanning...\n" if $response eq "";
 	die "Watchman: command returned invalid output: $response\n" .
-	    "Falling back to scanning...\n" unless $response =~ /^\{/;
-
-	my $json_pkg;
-	eval {
-		require JSON::XS;
-		$json_pkg = "JSON::XS";
-		1;
-	} or do {
-		require JSON::PP;
-		$json_pkg = "JSON::PP";
-	};
-
-	my $o = $json_pkg->new->utf8->decode($response);
-
-	if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
-		print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
+	"Falling back to scanning...\n" unless $response =~ /^\{/;
+
+	return $json_pkg->new->utf8->decode($response);
+}
+
+sub is_work_tree_watched {
+	my ($output) = @_;
+	my $error = $output->{error};
+	if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) {
 		$retry--;
-		qx/watchman watch "$git_work_tree"/;
+		my $response = qx/watchman watch "$git_work_tree"/;
 		die "Failed to make watchman watch '$git_work_tree'.\n" .
 		    "Falling back to scanning...\n" if $? != 0;
+		$output = $json_pkg->new->utf8->decode($response);
+		$error = $output->{error};
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		# Uncomment for debugging watchman output
+		# open (my $fh, ">", ".git/watchman-output.out");
+		# close $fh;
 
 		# Watchman will always return all files on the first query so
 		# return the fast "everything is dirty" flag to git and do the
 		# Watchman query just to get it over with now so we won't pay
 		# the cost in git to look up each individual file.
-		print "/\0";
+		my $o = watchman_clock();
+		$error = $output->{error};
+
+		die "Watchman: $error.\n" .
+		"Falling back to scanning...\n" if $error;
+
+		output_result($o->{clock}, ("/"));
+		$last_update_token = $o->{clock};
+
 		eval { launch_watchman() };
-		exit 0;
+		return 0;
 	}
 
-	die "Watchman: $o->{error}.\n" .
-	    "Falling back to scanning...\n" if $o->{error};
+	die "Watchman: $error.\n" .
+	"Falling back to scanning...\n" if $error;
 
-	binmode STDOUT, ":utf8";
-	local $, = "\0";
-	print @{$o->{files}};
+	return 1;
+}
+
+sub get_working_dir {
+	my $working_dir;
+	if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+		$working_dir = Win32::GetCwd();
+		$working_dir =~ tr/\\/\//;
+	} else {
+		require Cwd;
+		$working_dir = Cwd::cwd();
+	}
+
+	return $working_dir;
 }
diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample
index 6a75641638..e144712c85 100755
--- a/templates/hooks--pre-commit.sample
+++ b/templates/hooks--pre-commit.sample
@@ -16,7 +16,7 @@ else
 fi
 
 # If you want to allow non-ASCII filenames set this variable to true.
-allownonascii=$(git config --bool hooks.allownonascii)
+allownonascii=$(git config --type=bool hooks.allownonascii)
 
 # Redirect output to stderr.
 exec 1>&2
diff --git a/templates/hooks--pre-push.sample b/templates/hooks--pre-push.sample
index 6187dbf439..4ce688d32b 100755
--- a/templates/hooks--pre-push.sample
+++ b/templates/hooks--pre-push.sample
@@ -14,7 +14,7 @@
 # Information about the commits which are being pushed is supplied as lines to
 # the standard input in the form:
 #
-#   <local ref> <local sha1> <remote ref> <remote sha1>
+#   <local ref> <local oid> <remote ref> <remote oid>
 #
 # This sample shows how to prevent push of commits where the log message starts
 # with "WIP" (work in progress).
@@ -22,27 +22,27 @@
 remote="$1"
 url="$2"
 
-z40=0000000000000000000000000000000000000000
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
 
-while read local_ref local_sha remote_ref remote_sha
+while read local_ref local_oid remote_ref remote_oid
 do
-	if [ "$local_sha" = $z40 ]
+	if test "$local_oid" = "$zero"
 	then
 		# Handle delete
 		:
 	else
-		if [ "$remote_sha" = $z40 ]
+		if test "$remote_oid" = "$zero"
 		then
 			# New branch, examine all commits
-			range="$local_sha"
+			range="$local_oid"
 		else
 			# Update to existing branch, examine new commits
-			range="$remote_sha..$local_sha"
+			range="$remote_oid..$local_oid"
 		fi
 
 		# Check for WIP commit
-		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
-		if [ -n "$commit" ]
+		commit=$(git rev-list -n 1 --grep '^WIP' "$range")
+		if test -n "$commit"
 		then
 			echo >&2 "Found WIP commit in $local_ref, not pushing"
 			exit 1
diff --git a/templates/hooks--push-to-checkout.sample b/templates/hooks--push-to-checkout.sample
new file mode 100755
index 0000000000..af5a0c0018
--- /dev/null
+++ b/templates/hooks--push-to-checkout.sample
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+# An example hook script to update a checked-out tree on a git push.
+#
+# This hook is invoked by git-receive-pack(1) when it reacts to git
+# push and updates reference(s) in its repository, and when the push
+# tries to update the branch that is currently checked out and the
+# receive.denyCurrentBranch configuration variable is set to
+# updateInstead.
+#
+# By default, such a push is refused if the working tree and the index
+# of the remote repository has any difference from the currently
+# checked out commit; when both the working tree and the index match
+# the current commit, they are updated to match the newly pushed tip
+# of the branch. This hook is to be used to override the default
+# behaviour; however the code below reimplements the default behaviour
+# as a starting point for convenient modification.
+#
+# The hook receives the commit with which the tip of the current
+# branch is going to be updated:
+commit=$1
+
+# It can exit with a non-zero status to refuse the push (when it does
+# so, it must not modify the index or the working tree).
+die () {
+	echo >&2 "$*"
+	exit 1
+}
+
+# Or it can make any necessary changes to the working tree and to the
+# index to bring them to the desired state when the tip of the current
+# branch is updated to the new commit, and exit with a zero status.
+#
+# For example, the hook can simply run git read-tree -u -m HEAD "$1"
+# in order to emulate git fetch that is run in the reverse direction
+# with git push, as the two-tree form of git read-tree -u -m is
+# essentially the same as git switch or git checkout that switches
+# branches while keeping the local changes in the working tree that do
+# not interfere with the difference between the branches.
+
+# The below is a more-or-less exact translation to shell of the C code
+# for the default behaviour for git's push-to-checkout hook defined in
+# the push_to_deploy() function in builtin/receive-pack.c.
+#
+# Note that the hook will be executed from the repository directory,
+# not from the working tree, so if you want to perform operations on
+# the working tree, you will have to adapt your code accordingly, e.g.
+# by adding "cd .." or using relative paths.
+
+if ! git update-index -q --ignore-submodules --refresh
+then
+	die "Up-to-date check failed"
+fi
+
+if ! git diff-files --quiet --ignore-submodules --
+then
+	die "Working directory has unstaged changes"
+fi
+
+# This is a rough translation of:
+#
+#   head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX
+if git cat-file -e HEAD 2>/dev/null
+then
+	head=HEAD
+else
+	head=$(git hash-object -t tree --stdin </dev/null)
+fi
+
+if ! git diff-index --quiet --cached --ignore-submodules $head --
+then
+	die "Working directory has staged changes"
+fi
+
+if ! git read-tree -u -m "$commit"
+then
+	die "Could not update working tree to new HEAD"
+fi
diff --git a/templates/hooks--update.sample b/templates/hooks--update.sample
index 80ba94135c..c4d426bc6e 100755
--- a/templates/hooks--update.sample
+++ b/templates/hooks--update.sample
@@ -43,11 +43,11 @@ if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
 fi
 
 # --- Config
-allowunannotated=$(git config --bool hooks.allowunannotated)
-allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
-denycreatebranch=$(git config --bool hooks.denycreatebranch)
-allowdeletetag=$(git config --bool hooks.allowdeletetag)
-allowmodifytag=$(git config --bool hooks.allowmodifytag)
+allowunannotated=$(git config --type=bool hooks.allowunannotated)
+allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --type=bool hooks.denycreatebranch)
+allowdeletetag=$(git config --type=bool hooks.allowdeletetag)
+allowmodifytag=$(git config --type=bool hooks.allowmodifytag)
 
 # check for no description
 projectdesc=$(sed -e '1q' "$GIT_DIR/description")
@@ -60,7 +60,7 @@ esac
 
 # --- Check types
 # if $newrev is 0000...0000, it's a commit to delete a ref.
-zero="0000000000000000000000000000000000000000"
+zero=$(git hash-object --stdin </dev/null | tr '[0-9a-f]' '0')
 if [ "$newrev" = "$zero" ]; then
 	newrev_type=delete
 else
diff --git a/tmp-objdir.c b/tmp-objdir.c
index 91c00567f4..b8d880e362 100644
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -4,13 +4,13 @@
 #include "sigchain.h"
 #include "string-list.h"
 #include "strbuf.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "quote.h"
 #include "object-store.h"
 
 struct tmp_objdir {
 	struct strbuf path;
-	struct argv_array env;
+	struct strvec env;
 };
 
 /*
@@ -24,7 +24,7 @@ static struct tmp_objdir *the_tmp_objdir;
 static void tmp_objdir_free(struct tmp_objdir *t)
 {
 	strbuf_release(&t->path);
-	argv_array_clear(&t->env);
+	strvec_clear(&t->env);
 	free(t);
 }
 
@@ -79,7 +79,7 @@ static void remove_tmp_objdir_on_signal(int signo)
  * separated by PATH_SEP (which is what separate values in
  * GIT_ALTERNATE_OBJECT_DIRECTORIES).
  */
-static void env_append(struct argv_array *env, const char *key, const char *val)
+static void env_append(struct strvec *env, const char *key, const char *val)
 {
 	struct strbuf quoted = STRBUF_INIT;
 	const char *old;
@@ -97,16 +97,16 @@ static void env_append(struct argv_array *env, const char *key, const char *val)
 
 	old = getenv(key);
 	if (!old)
-		argv_array_pushf(env, "%s=%s", key, val);
+		strvec_pushf(env, "%s=%s", key, val);
 	else
-		argv_array_pushf(env, "%s=%s%c%s", key, old, PATH_SEP, val);
+		strvec_pushf(env, "%s=%s%c%s", key, old, PATH_SEP, val);
 
 	strbuf_release(&quoted);
 }
 
-static void env_replace(struct argv_array *env, const char *key, const char *val)
+static void env_replace(struct strvec *env, const char *key, const char *val)
 {
-	argv_array_pushf(env, "%s=%s", key, val);
+	strvec_pushf(env, "%s=%s", key, val);
 }
 
 static int setup_tmp_objdir(const char *root)
@@ -131,7 +131,7 @@ struct tmp_objdir *tmp_objdir_create(void)
 
 	t = xmalloc(sizeof(*t));
 	strbuf_init(&t->path, 0);
-	argv_array_init(&t->env);
+	strvec_init(&t->env);
 
 	strbuf_addf(&t->path, "%s/incoming-XXXXXX", get_object_directory());
 
@@ -185,9 +185,11 @@ static int pack_copy_priority(const char *name)
 		return 1;
 	if (ends_with(name, ".pack"))
 		return 2;
-	if (ends_with(name, ".idx"))
+	if (ends_with(name, ".rev"))
 		return 3;
-	return 4;
+	if (ends_with(name, ".idx"))
+		return 4;
+	return 5;
 }
 
 static int pack_copy_cmp(const char *a, const char *b)
@@ -283,7 +285,7 @@ const char **tmp_objdir_env(const struct tmp_objdir *t)
 {
 	if (!t)
 		return NULL;
-	return t->env.argv;
+	return t->env.v;
 }
 
 void tmp_objdir_add_as_alternate(const struct tmp_objdir *t)
diff --git a/trace.c b/trace.c
index b3ef0e627f..f726686fd9 100644
--- a/trace.c
+++ b/trace.c
@@ -29,7 +29,7 @@ struct trace_key trace_perf_key = TRACE_KEY_INIT(PERFORMANCE);
 struct trace_key trace_setup_key = TRACE_KEY_INIT(SETUP);
 
 /* Get a trace file descriptor from "key" env variable. */
-static int get_trace_fd(struct trace_key *key)
+static int get_trace_fd(struct trace_key *key, const char *override_envvar)
 {
 	const char *trace;
 
@@ -37,7 +37,7 @@ static int get_trace_fd(struct trace_key *key)
 	if (key->initialized)
 		return key->fd;
 
-	trace = getenv(key->key);
+	trace = override_envvar ? override_envvar : getenv(key->key);
 
 	if (!trace || !strcmp(trace, "") ||
 	    !strcmp(trace, "0") || !strcasecmp(trace, "false"))
@@ -68,6 +68,18 @@ static int get_trace_fd(struct trace_key *key)
 	return key->fd;
 }
 
+void trace_override_envvar(struct trace_key *key, const char *value)
+{
+	trace_disable(key);
+	key->initialized = 0;
+
+	/*
+	 * Invoke get_trace_fd() to initialize key using the given value
+	 * instead of the value of the environment variable.
+	 */
+	get_trace_fd(key, value);
+}
+
 void trace_disable(struct trace_key *key)
 {
 	if (key->need_close)
@@ -112,7 +124,7 @@ static int prepare_trace_line(const char *file, int line,
 
 static void trace_write(struct trace_key *key, const void *buf, unsigned len)
 {
-	if (write_in_full(get_trace_fd(key), buf, len) < 0) {
+	if (write_in_full(get_trace_fd(key, NULL), buf, len) < 0) {
 		warning("unable to write trace for %s: %s",
 			key->key, strerror(errno));
 		trace_disable(key);
@@ -383,7 +395,7 @@ void trace_repo_setup(const char *prefix)
 
 int trace_want(struct trace_key *key)
 {
-	return !!get_trace_fd(key);
+	return !!get_trace_fd(key, NULL);
 }
 
 #if defined(HAVE_CLOCK_GETTIME) && defined(HAVE_CLOCK_MONOTONIC)
diff --git a/trace.h b/trace.h
index 9fa3e7a594..0dbbad0e41 100644
--- a/trace.h
+++ b/trace.h
@@ -4,6 +4,82 @@
 #include "git-compat-util.h"
 #include "strbuf.h"
 
+/**
+ * The trace API can be used to print debug messages to stderr or a file. Trace
+ * code is inactive unless explicitly enabled by setting `GIT_TRACE*` environment
+ * variables.
+ *
+ * The trace implementation automatically adds `timestamp file:line ... \n` to
+ * all trace messages. E.g.:
+ *
+ * ------------
+ * 23:59:59.123456 git.c:312               trace: built-in: git 'foo'
+ * 00:00:00.000001 builtin/foo.c:99        foo: some message
+ * ------------
+ *
+ * Bugs & Caveats
+ * --------------
+ *
+ * GIT_TRACE_* environment variables can be used to tell Git to show
+ * trace output to its standard error stream. Git can often spawn a pager
+ * internally to run its subcommand and send its standard output and
+ * standard error to it.
+ *
+ * Because GIT_TRACE_PERFORMANCE trace is generated only at the very end
+ * of the program with atexit(), which happens after the pager exits, it
+ * would not work well if you send its log to the standard error output
+ * and let Git spawn the pager at the same time.
+ *
+ * As a work around, you can for example use '--no-pager', or set
+ * GIT_TRACE_PERFORMANCE to another file descriptor which is redirected
+ * to stderr, or set GIT_TRACE_PERFORMANCE to a file specified by its
+ * absolute path.
+ *
+ * For example instead of the following command which by default may not
+ * print any performance information:
+ *
+ * ------------
+ * GIT_TRACE_PERFORMANCE=2 git log -1
+ * ------------
+ *
+ * you may want to use:
+ *
+ * ------------
+ * GIT_TRACE_PERFORMANCE=2 git --no-pager log -1
+ * ------------
+ *
+ * or:
+ *
+ * ------------
+ * GIT_TRACE_PERFORMANCE=3 3>&2 git log -1
+ * ------------
+ *
+ * or:
+ *
+ * ------------
+ * GIT_TRACE_PERFORMANCE=/path/to/log/file git log -1
+ * ------------
+ *
+ */
+
+/**
+ * Defines a trace key (or category). The default (for API functions that
+ * don't take a key) is `GIT_TRACE`.
+ *
+ * E.g. to define a trace key controlled by environment variable `GIT_TRACE_FOO`:
+ *
+ * ------------
+ * static struct trace_key trace_foo = TRACE_KEY_INIT(FOO);
+ *
+ * static void trace_print_foo(const char *message)
+ * {
+ * 	trace_printf_key(&trace_foo, "%s", message);
+ * }
+ * ------------
+ *
+ * Note: don't use `const` as the trace implementation stores internal state in
+ * the `trace_key` structure.
+ */
 struct trace_key {
 	const char * const key;
 	int fd;
@@ -18,31 +94,90 @@ extern struct trace_key trace_perf_key;
 extern struct trace_key trace_setup_key;
 
 void trace_repo_setup(const char *prefix);
+
+/**
+ * Checks whether the trace key is enabled. Used to prevent expensive
+ * string formatting before calling one of the printing APIs.
+ */
 int trace_want(struct trace_key *key);
+
+/**
+ * Enables or disables tracing for the specified key, as if the environment
+ * variable was set to the given value.
+ */
+void trace_override_envvar(struct trace_key *key, const char *value);
+
+/**
+ * Disables tracing for the specified key, even if the environment variable
+ * was set.
+ */
 void trace_disable(struct trace_key *key);
+
+/**
+ * Returns nanoseconds since the epoch (01/01/1970), typically used
+ * for performance measurements.
+ * Currently there are high precision timer implementations for Linux (using
+ * `clock_gettime(CLOCK_MONOTONIC)`) and Windows (`QueryPerformanceCounter`).
+ * Other platforms use `gettimeofday` as time source.
+ */
 uint64_t getnanotime(void);
+
 void trace_command_performance(const char **argv);
 void trace_verbatim(struct trace_key *key, const void *buf, unsigned len);
 uint64_t trace_performance_enter(void);
 
 #ifndef HAVE_VARIADIC_MACROS
 
+/**
+ * Prints a formatted message, similar to printf.
+ */
 __attribute__((format (printf, 1, 2)))
 void trace_printf(const char *format, ...);
 
 __attribute__((format (printf, 2, 3)))
 void trace_printf_key(struct trace_key *key, const char *format, ...);
 
+/**
+ * Prints a formatted message, followed by a quoted list of arguments.
+ */
 __attribute__((format (printf, 2, 3)))
 void trace_argv_printf(const char **argv, const char *format, ...);
 
+/**
+ * Prints the strbuf, without additional formatting (i.e. doesn't
+ * choke on `%` or even `\0`).
+ */
 void trace_strbuf(struct trace_key *key, const struct strbuf *data);
 
-/* Prints elapsed time (in nanoseconds) if GIT_TRACE_PERFORMANCE is enabled. */
+/**
+ * Prints elapsed time (in nanoseconds) if GIT_TRACE_PERFORMANCE is enabled.
+ *
+ * Example:
+ * ------------
+ * uint64_t t = 0;
+ * for (;;) {
+ * 	// ignore
+ * t -= getnanotime();
+ * // code section to measure
+ * t += getnanotime();
+ * // ignore
+ * }
+ * trace_performance(t, "frotz");
+ * ------------
+ */
 __attribute__((format (printf, 2, 3)))
 void trace_performance(uint64_t nanos, const char *format, ...);
 
-/* Prints elapsed time since 'start' if GIT_TRACE_PERFORMANCE is enabled. */
+/**
+ * Prints elapsed time since 'start' if GIT_TRACE_PERFORMANCE is enabled.
+ *
+ * Example:
+ * ------------
+ * uint64_t start = getnanotime();
+ * // code section to measure
+ * trace_performance_since(start, "foobar");
+ * ------------
+ */
 __attribute__((format (printf, 2, 3)))
 void trace_performance_since(uint64_t start, const char *format, ...);
 
diff --git a/trace2.c b/trace2.c
index c7b4f14d29..b9b154ac44 100644
--- a/trace2.c
+++ b/trace2.c
@@ -121,6 +121,7 @@ static void tr2main_atexit_handler(void)
 	tr2_sid_release();
 	tr2_cmd_name_release();
 	tr2_cfg_free_patterns();
+	tr2_cfg_free_env_vars();
 	tr2_sysenv_release();
 
 	trace2_enabled = 0;
@@ -259,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;
@@ -311,6 +325,14 @@ void trace2_cmd_list_config_fl(const char *file, int line)
 	tr2_cfg_list_config_fl(file, line);
 }
 
+void trace2_cmd_list_env_vars_fl(const char *file, int line)
+{
+	if (!trace2_enabled)
+		return;
+
+	tr2_list_env_vars_fl(file, line);
+}
+
 void trace2_cmd_set_config_fl(const char *file, int line, const char *key,
 			      const char *value)
 {
@@ -783,3 +805,8 @@ void trace2_printf(const char *fmt, ...)
 	va_end(ap);
 }
 #endif
+
+const char *trace2_session_id(void)
+{
+	return tr2_sid_get();
+}
diff --git a/trace2.h b/trace2.h
index 050bf3c8c1..9b7286c572 100644
--- a/trace2.h
+++ b/trace2.h
@@ -1,6 +1,40 @@
 #ifndef TRACE2_H
 #define TRACE2_H
 
+/**
+ * The Trace2 API can be used to print debug, performance, and telemetry
+ * information to stderr or a file.  The Trace2 feature is inactive unless
+ * explicitly enabled by enabling one or more Trace2 Targets.
+ *
+ * The Trace2 API is intended to replace the existing (Trace1)
+ * printf-style tracing provided by the existing `GIT_TRACE` and
+ * `GIT_TRACE_PERFORMANCE` facilities.  During initial implementation,
+ * Trace2 and Trace1 may operate in parallel.
+ *
+ * The Trace2 API defines a set of high-level messages with known fields,
+ * such as (`start`: `argv`) and (`exit`: {`exit-code`, `elapsed-time`}).
+ *
+ * Trace2 instrumentation throughout the Git code base sends Trace2
+ * messages to the enabled Trace2 Targets.  Targets transform these
+ * messages content into purpose-specific formats and write events to
+ * their data streams.  In this manner, the Trace2 API can drive
+ * many different types of analysis.
+ *
+ * Targets are defined using a VTable allowing easy extension to other
+ * formats in the future.  This might be used to define a binary format,
+ * for example.
+ *
+ * Trace2 is controlled using `trace2.*` config values in the system and
+ * global config files and `GIT_TRACE2*` environment variables.  Trace2 does
+ * not read from repo local or worktree config files or respect `-c`
+ * command line config settings.
+ *
+ * For more info about: trace2 targets, conventions for public functions and
+ * macros, trace2 target formats and examples on trace2 API usage refer to
+ * Documentation/technical/api-trace2.txt
+ *
+ */
+
 struct child_process;
 struct repository;
 struct json_writer;
@@ -39,7 +73,12 @@ void trace2_initialize_clock(void);
 /*
  * Initialize TRACE2 tracing facility if any of the builtin TRACE2
  * targets are enabled in the system config or the environment.
- * Emits a 'version' event.
+ * This includes setting up the Trace2 thread local storage (TLS).
+ * Emits a 'version' message containing the version of git
+ * and the Trace2 protocol.
+ *
+ * This function should be called from `main()` as early as possible in
+ * the life of the process after essential process initialization.
  *
  * Cleanup/Termination is handled automatically by a registered
  * atexit() routine.
@@ -49,7 +88,7 @@ void trace2_initialize_fl(const char *file, int line);
 #define trace2_initialize() trace2_initialize_fl(__FILE__, __LINE__)
 
 /*
- * Return true if trace2 is enabled.
+ * Return 1 if trace2 is enabled (at least one target is active).
  */
 int trace2_is_enabled(void);
 
@@ -95,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.
@@ -114,7 +163,8 @@ void trace2_cmd_mode_fl(const char *file, int line, const char *mode);
 #define trace2_cmd_mode(sv) trace2_cmd_mode_fl(__FILE__, __LINE__, (sv))
 
 /*
- * Emit an 'alias' expansion event.
+ * Emits an "alias" message containing the alias used and the argument
+ * expansion.
  */
 void trace2_cmd_alias_fl(const char *file, int line, const char *alias,
 			 const char **argv);
@@ -123,7 +173,7 @@ void trace2_cmd_alias_fl(const char *file, int line, const char *alias,
 	trace2_cmd_alias_fl(__FILE__, __LINE__, (alias), (argv))
 
 /*
- * Emit one or more 'def_param' events for "interesting" configuration
+ * Emit one or more 'def_param' events for "important" configuration
  * settings.
  *
  * Use the TR2_SYSENV_CFG_PARAM setting to register a comma-separated
@@ -143,8 +193,21 @@ void trace2_cmd_list_config_fl(const char *file, int line);
 #define trace2_cmd_list_config() trace2_cmd_list_config_fl(__FILE__, __LINE__)
 
 /*
+ * Emit one or more 'def_param' events for "important" environment variables.
+ *
+ * Use the TR2_SYSENV_ENV_VARS setting to register a comma-separated list of
+ * environment variables considered important.  For example:
+ *     git config --system trace2.envVars 'GIT_HTTP_USER_AGENT,GIT_CONFIG'
+ * or:
+ *     GIT_TRACE2_ENV_VARS="GIT_HTTP_USER_AGENT,GIT_CONFIG"
+ */
+void trace2_cmd_list_env_vars_fl(const char *file, int line);
+
+#define trace2_cmd_list_env_vars() trace2_cmd_list_env_vars_fl(__FILE__, __LINE__)
+
+/*
  * Emit a "def_param" event for the given config key/value pair IF
- * we consider the key to be "interesting".
+ * we consider the key to be "important".
  *
  * Use this for new/updated config settings created/updated after
  * trace2_cmd_list_config() is called.
@@ -155,20 +218,34 @@ void trace2_cmd_set_config_fl(const char *file, int line, const char *key,
 #define trace2_cmd_set_config(k, v) \
 	trace2_cmd_set_config_fl(__FILE__, __LINE__, (k), (v))
 
-/*
- * Emit a 'child_start' event prior to spawning a child process.
+/**
+ * Emits a "child_start" message containing the "child-id",
+ * "child-argv", and "child-classification".
  *
  * Before calling optionally set "cmd->trace2_child_class" to a string
  * describing the type of the child process.  For example, "editor" or
  * "pager".
+ *
+ * This function assigns a unique "child-id" to `cmd->trace2_child_id`.
+ * This field is used later during the "child_exit" message to associate
+ * it with the "child_start" message.
+ *
+ * This function should be called before spawning the child process.
  */
 void trace2_child_start_fl(const char *file, int line,
 			   struct child_process *cmd);
 
 #define trace2_child_start(cmd) trace2_child_start_fl(__FILE__, __LINE__, (cmd))
 
-/*
- * Emit a 'child_exit' event after the child process completes.
+/**
+ * Emits a "child_exit" message containing the "child-id",
+ * the child's elapsed time and exit-code.
+ *
+ * The reported elapsed time includes the process creation overhead and
+ * time spend waiting for it to exit, so it may be slightly longer than
+ * the time reported by the child itself.
+ *
+ * This function should be called after reaping the child process.
  */
 void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd,
 			  int child_exit_code);
@@ -176,21 +253,22 @@ void trace2_child_exit_fl(const char *file, int line, struct child_process *cmd,
 #define trace2_child_exit(cmd, code) \
 	trace2_child_exit_fl(__FILE__, __LINE__, (cmd), (code))
 
-/*
+/**
  * 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
  * fails.  On Windows, exec() behaves like 'child_start' and a
  * waitpid(), so additional events may be emitted.
  *
- * Returns the "exec_id".
+ * Returns a unique "exec-id".  This value is used later
+ * if the exec() fails and a "exec-result" message is necessary.
  */
 int trace2_exec_fl(const char *file, int line, const char *exe,
 		   const char **argv);
 
 #define trace2_exec(exe, argv) trace2_exec_fl(__FILE__, __LINE__, (exe), (argv))
 
-/*
+/**
  * Emit an 'exec_result' when possible.  On Unix-derived systems,
  * this should be called after exec() returns (which only happens
  * when there is an error starting the new process).  On Windows,
@@ -226,11 +304,12 @@ void trace2_thread_exit_fl(const char *file, int line);
 #define trace2_thread_exit() trace2_thread_exit_fl(__FILE__, __LINE__)
 
 /*
- * Emit a 'param' event.
+ * Emits a "def_param" message containing a key/value pair.
  *
- * Write a "<param> = <value>" pair describing some aspect of the
- * run such as an important configuration setting or command line
- * option that significantly changes command behavior.
+ * This message is intended to report some global aspect of the current
+ * command, such as a configuration setting or command line switch that
+ * significantly affects program performance or behavior, such as
+ * `core.abbrev`, `status.showUntrackedFiles`, or `--no-ahead-behind`.
  */
 void trace2_def_param_fl(const char *file, int line, const char *param,
 			 const char *value);
@@ -243,18 +322,35 @@ void trace2_def_param_fl(const char *file, int line, const char *param,
  * a trace2-repo-id to be used in subsequent activity events.
  *
  * Emits a 'worktree' event for this repo instance.
+ *
+ * Region and data messages may refer to this repo-id.
+ *
+ * The main/top-level repository will have repo-id value 1 (aka "r1").
+ *
+ * The repo-id field is in anticipation of future in-proc submodule
+ * repositories.
  */
 void trace2_def_repo_fl(const char *file, int line, struct repository *repo);
 
 #define trace2_def_repo(repo) trace2_def_repo_fl(__FILE__, __LINE__, repo)
 
-/*
+/**
  * Emit a 'region_enter' event for <category>.<label> with optional
  * repo-id and printf message.
  *
- * Enter a new nesting level on the current thread and remember the
- * current time.  This controls the indenting of all subsequent events
- * on this thread.
+ * This function pushes a new region nesting stack level on the current
+ * thread and starts a clock for the new stack frame.
+ *
+ * The `category` field is an arbitrary category name used to classify
+ * regions by feature area, such as "status" or "index".  At this time
+ * it is only just printed along with the rest of the message.  It may
+ * be used in the future to filter messages.
+ *
+ * The `label` field is an arbitrary label used to describe the activity
+ * 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.
  */
 void trace2_region_enter_fl(const char *file, int line, const char *category,
 			    const char *label, const struct repository *repo, ...);
@@ -289,12 +385,17 @@ void trace2_region_enter_printf(const char *category, const char *label,
 /* clang-format on */
 #endif
 
-/*
+/**
  * Emit a 'region_leave' event for <category>.<label> with optional
  * repo-id and printf message.
  *
  * Leave current nesting level and report the elapsed time spent
  * in this nesting level.
+ *
+ * The `category`, `label`, and `repo` fields are the same as
+ * trace2_region_enter_fl. The `category` and `label` do not
+ * need to match the corresponding "region_enter" message,
+ * but it makes the data stream easier to understand.
  */
 void trace2_region_leave_fl(const char *file, int line, const char *category,
 			    const char *label, const struct repository *repo, ...);
@@ -329,10 +430,12 @@ void trace2_region_leave_printf(const char *category, const char *label,
 /* clang-format on */
 #endif
 
-/*
+/**
  * Emit a key-value pair 'data' event of the form <category>.<key> = <value>.
  * This event implicitly contains information about thread, nesting region,
  * and optional repo-id.
+ * This could be used to print the number of files in a directory during
+ * a multi-threaded recursive tree walk.
  *
  * On event-based TRACE2 targets, this generates a 'data' event suitable
  * for post-processing.  On printf-based TRACE2 targets, this is converted
@@ -399,12 +502,8 @@ 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);
 
 #endif /* TRACE2_H */
diff --git a/trace2/tr2_cfg.c b/trace2/tr2_cfg.c
index caa7f06948..ec9ac1a6ef 100644
--- a/trace2/tr2_cfg.c
+++ b/trace2/tr2_cfg.c
@@ -7,6 +7,10 @@ static struct strbuf **tr2_cfg_patterns;
 static int tr2_cfg_count_patterns;
 static int tr2_cfg_loaded;
 
+static struct strbuf **tr2_cfg_env_vars;
+static int tr2_cfg_env_vars_count;
+static int tr2_cfg_env_vars_loaded;
+
 /*
  * Parse a string containing a comma-delimited list of config keys
  * or wildcard patterns into a list of strbufs.
@@ -46,6 +50,45 @@ void tr2_cfg_free_patterns(void)
 	tr2_cfg_loaded = 0;
 }
 
+/*
+ * Parse a string containing a comma-delimited list of environment variable
+ * names into a list of strbufs.
+ */
+static int tr2_load_env_vars(void)
+{
+	struct strbuf **s;
+	const char *varlist;
+
+	if (tr2_cfg_env_vars_loaded)
+		return tr2_cfg_env_vars_count;
+	tr2_cfg_env_vars_loaded = 1;
+
+	varlist = tr2_sysenv_get(TR2_SYSENV_ENV_VARS);
+	if (!varlist || !*varlist)
+		return tr2_cfg_env_vars_count;
+
+	tr2_cfg_env_vars = strbuf_split_buf(varlist, strlen(varlist), ',', -1);
+	for (s = tr2_cfg_env_vars; *s; s++) {
+		struct strbuf *buf = *s;
+
+		if (buf->len && buf->buf[buf->len - 1] == ',')
+			strbuf_setlen(buf, buf->len - 1);
+		strbuf_trim_trailing_newline(*s);
+		strbuf_trim(*s);
+	}
+
+	tr2_cfg_env_vars_count = s - tr2_cfg_env_vars;
+	return tr2_cfg_env_vars_count;
+}
+
+void tr2_cfg_free_env_vars(void)
+{
+	if (tr2_cfg_env_vars)
+		strbuf_list_free(tr2_cfg_env_vars);
+	tr2_cfg_env_vars_count = 0;
+	tr2_cfg_env_vars_loaded = 0;
+}
+
 struct tr2_cfg_data {
 	const char *file;
 	int line;
@@ -79,6 +122,21 @@ void tr2_cfg_list_config_fl(const char *file, int line)
 		read_early_config(tr2_cfg_cb, &data);
 }
 
+void tr2_list_env_vars_fl(const char *file, int line)
+{
+	struct strbuf **s;
+
+	if (tr2_load_env_vars() <= 0)
+		return;
+
+	for (s = tr2_cfg_env_vars; *s; s++) {
+		struct strbuf *buf = *s;
+		const char *val = getenv(buf->buf);
+		if (val && *val)
+			trace2_def_param_fl(file, line, buf->buf, val);
+	}
+}
+
 void tr2_cfg_set_fl(const char *file, int line, const char *key,
 		    const char *value)
 {
diff --git a/trace2/tr2_cfg.h b/trace2/tr2_cfg.h
index d9c98f64dd..a11d71feb5 100644
--- a/trace2/tr2_cfg.h
+++ b/trace2/tr2_cfg.h
@@ -8,6 +8,12 @@
 void tr2_cfg_list_config_fl(const char *file, int line);
 
 /*
+ * Iterate over all "interesting" environment variables and emit 'def_param'
+ * events for them to TRACE2.
+ */
+void tr2_list_env_vars_fl(const char *file, int line);
+
+/*
  * Emit a "def_param" event for the given key/value pair IF we consider
  * the key to be "interesting".
  */
@@ -16,4 +22,6 @@ void tr2_cfg_set_fl(const char *file, int line, const char *key,
 
 void tr2_cfg_free_patterns(void);
 
+void tr2_cfg_free_env_vars(void);
+
 #endif /* TR2_CFG_H */
diff --git a/trace2/tr2_dst.c b/trace2/tr2_dst.c
index ae052a07fe..bda283e7f4 100644
--- a/trace2/tr2_dst.c
+++ b/trace2/tr2_dst.c
@@ -204,15 +204,16 @@ static int tr2_dst_try_uds_connect(const char *path, int sock_type, int *out_fd)
 
 	fd = socket(AF_UNIX, sock_type, 0);
 	if (fd == -1)
-		return errno;
+		return -1;
 
 	sa.sun_family = AF_UNIX;
 	strlcpy(sa.sun_path, path, sizeof(sa.sun_path));
 
 	if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) == -1) {
-		int e = errno;
+		int saved_errno = errno;
 		close(fd);
-		return e;
+		errno = saved_errno;
+		return -1;
 	}
 
 	*out_fd = fd;
@@ -227,7 +228,6 @@ static int tr2_dst_try_unix_domain_socket(struct tr2_dst *dst,
 {
 	unsigned int uds_try = 0;
 	int fd;
-	int e;
 	const char *path = NULL;
 
 	/*
@@ -271,15 +271,13 @@ static int tr2_dst_try_unix_domain_socket(struct tr2_dst *dst,
 	}
 
 	if (uds_try & TR2_DST_UDS_TRY_STREAM) {
-		e = tr2_dst_try_uds_connect(path, SOCK_STREAM, &fd);
-		if (!e)
+		if (!tr2_dst_try_uds_connect(path, SOCK_STREAM, &fd))
 			goto connected;
-		if (e != EPROTOTYPE)
+		if (errno != EPROTOTYPE)
 			goto error;
 	}
 	if (uds_try & TR2_DST_UDS_TRY_DGRAM) {
-		e = tr2_dst_try_uds_connect(path, SOCK_DGRAM, &fd);
-		if (!e)
+		if (!tr2_dst_try_uds_connect(path, SOCK_DGRAM, &fd))
 			goto connected;
 	}
 
@@ -287,7 +285,7 @@ error:
 	if (tr2_dst_want_warning())
 		warning("trace2: could not connect to socket '%s' for '%s' tracing: %s",
 			path, tr2_sysenv_display_name(dst->sysenv_var),
-			strerror(e));
+			strerror(errno));
 
 	tr2_dst_trace_disable(dst);
 	return 0;
diff --git a/trace2/tr2_sid.c b/trace2/tr2_sid.c
index 6948fd4108..dc6e75ef13 100644
--- a/trace2/tr2_sid.c
+++ b/trace2/tr2_sid.c
@@ -19,7 +19,7 @@ static int tr2sid_nr_git_parents;
  *    "H<first_8_chars_of_sha1_of_hostname>"
  *    "Localhost" when no hostname.
  *
- * where <process> is a 9 character string containing the least signifcant
+ * where <process> is a 9 character string containing the least significant
  * 32 bits in the process-id.
  *    "P<pid>"
  * (This is an abribrary choice.  On most systems pid_t is a 32 bit value,
diff --git a/trace2/tr2_sysenv.c b/trace2/tr2_sysenv.c
index 3c3792eca2..a380dcf910 100644
--- a/trace2/tr2_sysenv.c
+++ b/trace2/tr2_sysenv.c
@@ -29,6 +29,8 @@ struct tr2_sysenv_entry {
 static struct tr2_sysenv_entry tr2_sysenv_settings[] = {
 	[TR2_SYSENV_CFG_PARAM]     = { "GIT_TRACE2_CONFIG_PARAMS",
 				       "trace2.configparams" },
+	[TR2_SYSENV_ENV_VARS]      = { "GIT_TRACE2_ENV_VARS",
+				       "trace2.envvars" },
 
 	[TR2_SYSENV_DST_DEBUG]     = { "GIT_TRACE2_DST_DEBUG",
 				       "trace2.destinationdebug" },
diff --git a/trace2/tr2_sysenv.h b/trace2/tr2_sysenv.h
index d4364a7b85..3292ee15bc 100644
--- a/trace2/tr2_sysenv.h
+++ b/trace2/tr2_sysenv.h
@@ -11,6 +11,7 @@
  */
 enum tr2_sysenv_variable {
 	TR2_SYSENV_CFG_PARAM = 0,
+	TR2_SYSENV_ENV_VARS,
 
 	TR2_SYSENV_DST_DEBUG,
 
diff --git a/trace2/tr2_tgt.h b/trace2/tr2_tgt.h
index 7b90469212..1f66fd6573 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);
@@ -108,6 +110,7 @@ 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;
diff --git a/trace2/tr2_tgt_event.c b/trace2/tr2_tgt_event.c
index 6353e8ad91..578a9a5287 100644
--- a/trace2/tr2_tgt_event.c
+++ b/trace2/tr2_tgt_event.c
@@ -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)
 {
@@ -584,6 +604,7 @@ 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,
diff --git a/trace2/tr2_tgt_normal.c b/trace2/tr2_tgt_normal.c
index 31b602c171..a5751c8864 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)
 {
@@ -306,6 +324,7 @@ 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,
diff --git a/trace2/tr2_tgt_perf.c b/trace2/tr2_tgt_perf.c
index ffac8029ad..af4d65a0a5 100644
--- a/trace2/tr2_tgt_perf.c
+++ b/trace2/tr2_tgt_perf.c
@@ -26,12 +26,9 @@ static int tr2env_perf_be_brief;
 #define TR2FMT_PERF_REPO_WIDTH (3)
 #define TR2FMT_PERF_CATEGORY_WIDTH (12)
 
-#define TR2_DOTS_BUFFER_SIZE (100)
 #define TR2_INDENT (2)
 #define TR2_INDENT_LENGTH(ctx) (((ctx)->nr_open_regions - 1) * TR2_INDENT)
 
-static struct strbuf dots = STRBUF_INIT;
-
 static int fn_init(void)
 {
 	int want = tr2_dst_trace_want(&tr2dst_perf);
@@ -41,8 +38,6 @@ static int fn_init(void)
 	if (!want)
 		return want;
 
-	strbuf_addchars(&dots, '.', TR2_DOTS_BUFFER_SIZE);
-
 	brief = tr2_sysenv_get(TR2_SYSENV_PERF_BRIEF);
 	if (brief && *brief &&
 	    ((want_brief = git_parse_maybe_bool(brief)) != -1))
@@ -54,8 +49,6 @@ static int fn_init(void)
 static void fn_term(void)
 {
 	tr2_dst_trace_disable(&tr2dst_perf);
-
-	strbuf_release(&dots);
 }
 
 /*
@@ -138,14 +131,8 @@ static void perf_fmt_prepare(const char *event_name,
 	strbuf_addf(buf, "%-*.*s | ", TR2FMT_PERF_CATEGORY_WIDTH,
 		    TR2FMT_PERF_CATEGORY_WIDTH, (category ? category : ""));
 
-	if (ctx->nr_open_regions > 0) {
-		int len_indent = TR2_INDENT_LENGTH(ctx);
-		while (len_indent > dots.len) {
-			strbuf_addbuf(buf, &dots);
-			len_indent -= dots.len;
-		}
-		strbuf_addf(buf, "%.*s", len_indent, dots.buf);
-	}
+	if (ctx->nr_open_regions > 0)
+		strbuf_addchars(buf, '.', TR2_INDENT_LENGTH(ctx));
 }
 
 static void perf_io_write_fl(const char *file, int line, const char *event_name,
@@ -266,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)
 {
@@ -545,6 +547,7 @@ 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,
diff --git a/trailer.c b/trailer.c
index 0c414f2fed..7c7cb61a94 100644
--- a/trailer.c
+++ b/trailer.c
@@ -14,6 +14,7 @@ struct conf_info {
 	char *name;
 	char *key;
 	char *command;
+	char *cmd;
 	enum trailer_where where;
 	enum trailer_if_exists if_exists;
 	enum trailer_if_missing if_missing;
@@ -127,6 +128,7 @@ static void free_arg_item(struct arg_item *item)
 	free(item->conf.name);
 	free(item->conf.key);
 	free(item->conf.command);
+	free(item->conf.cmd);
 	free(item->token);
 	free(item->value);
 	free(item);
@@ -174,7 +176,7 @@ static void print_all(FILE *outfile, struct list_head *head,
 
 static struct trailer_item *trailer_from_arg(struct arg_item *arg_tok)
 {
-	struct trailer_item *new_item = xcalloc(sizeof(*new_item), 1);
+	struct trailer_item *new_item = xcalloc(1, sizeof(*new_item));
 	new_item->token = arg_tok->token;
 	new_item->value = arg_tok->value;
 	arg_tok->token = arg_tok->value = NULL;
@@ -216,20 +218,24 @@ static int check_if_different(struct trailer_item *in_tok,
 	return 1;
 }
 
-static char *apply_command(const char *command, const char *arg)
+static char *apply_command(struct conf_info *conf, const char *arg)
 {
 	struct strbuf cmd = STRBUF_INIT;
 	struct strbuf buf = STRBUF_INIT;
 	struct child_process cp = CHILD_PROCESS_INIT;
-	const char *argv[] = {NULL, NULL};
 	char *result;
 
-	strbuf_addstr(&cmd, command);
-	if (arg)
-		strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
-
-	argv[0] = cmd.buf;
-	cp.argv = argv;
+	if (conf->cmd) {
+		strbuf_addstr(&cmd, conf->cmd);
+		strvec_push(&cp.args, cmd.buf);
+		if (arg)
+			strvec_push(&cp.args, arg);
+	} else if (conf->command) {
+		strbuf_addstr(&cmd, conf->command);
+		if (arg)
+			strbuf_replace(&cmd, TRAILER_ARG_STRING, arg);
+		strvec_push(&cp.args, cmd.buf);
+	}
 	cp.env = local_repo_env;
 	cp.no_stdin = 1;
 	cp.use_shell = 1;
@@ -249,7 +255,7 @@ static char *apply_command(const char *command, const char *arg)
 
 static void apply_item_command(struct trailer_item *in_tok, struct arg_item *arg_tok)
 {
-	if (arg_tok->conf.command) {
+	if (arg_tok->conf.command || arg_tok->conf.cmd) {
 		const char *arg;
 		if (arg_tok->value && arg_tok->value[0]) {
 			arg = arg_tok->value;
@@ -259,7 +265,7 @@ static void apply_item_command(struct trailer_item *in_tok, struct arg_item *arg
 			else
 				arg = xstrdup("");
 		}
-		arg_tok->value = apply_command(arg_tok->conf.command, arg);
+		arg_tok->value = apply_command(&arg_tok->conf, arg);
 		free((char *)arg);
 	}
 }
@@ -432,6 +438,7 @@ static void duplicate_conf(struct conf_info *dst, const struct conf_info *src)
 	dst->name = xstrdup_or_null(src->name);
 	dst->key = xstrdup_or_null(src->key);
 	dst->command = xstrdup_or_null(src->command);
+	dst->cmd = xstrdup_or_null(src->cmd);
 }
 
 static struct arg_item *get_conf_item(const char *name)
@@ -447,7 +454,7 @@ static struct arg_item *get_conf_item(const char *name)
 	}
 
 	/* Item does not already exists, create it */
-	item = xcalloc(sizeof(*item), 1);
+	CALLOC_ARRAY(item, 1);
 	duplicate_conf(&item->conf, &default_conf_info);
 	item->conf.name = xstrdup(name);
 
@@ -456,8 +463,8 @@ static struct arg_item *get_conf_item(const char *name)
 	return item;
 }
 
-enum trailer_info_type { TRAILER_KEY, TRAILER_COMMAND, TRAILER_WHERE,
-			 TRAILER_IF_EXISTS, TRAILER_IF_MISSING };
+enum trailer_info_type { TRAILER_KEY, TRAILER_COMMAND, TRAILER_CMD,
+			TRAILER_WHERE, TRAILER_IF_EXISTS, TRAILER_IF_MISSING };
 
 static struct {
 	const char *name;
@@ -465,6 +472,7 @@ static struct {
 } trailer_config_items[] = {
 	{ "key", TRAILER_KEY },
 	{ "command", TRAILER_COMMAND },
+	{ "cmd", TRAILER_CMD },
 	{ "where", TRAILER_WHERE },
 	{ "ifexists", TRAILER_IF_EXISTS },
 	{ "ifmissing", TRAILER_IF_MISSING }
@@ -544,6 +552,11 @@ static int git_trailer_config(const char *conf_key, const char *value, void *cb)
 			warning(_("more than one %s"), conf_key);
 		conf->command = xstrdup(value);
 		break;
+	case TRAILER_CMD:
+		if (conf->cmd)
+			warning(_("more than one %s"), conf_key);
+		conf->cmd = xstrdup(value);
+		break;
 	case TRAILER_WHERE:
 		if (trailer_set_where(&conf->where, value))
 			warning(_("unknown value '%s' for key '%s'"), value, conf_key);
@@ -666,7 +679,7 @@ static void parse_trailer(struct strbuf *tok, struct strbuf *val,
 static struct trailer_item *add_trailer_item(struct list_head *head, char *tok,
 					     char *val)
 {
-	struct trailer_item *new_item = xcalloc(sizeof(*new_item), 1);
+	struct trailer_item *new_item = xcalloc(1, sizeof(*new_item));
 	new_item->token = tok;
 	new_item->value = val;
 	list_add_tail(&new_item->list, head);
@@ -677,7 +690,7 @@ static void add_arg_item(struct list_head *arg_head, char *tok, char *val,
 			 const struct conf_info *conf,
 			 const struct new_trailer_item *new_trailer_item)
 {
-	struct arg_item *new_item = xcalloc(sizeof(*new_item), 1);
+	struct arg_item *new_item = xcalloc(1, sizeof(*new_item));
 	new_item->token = tok;
 	new_item->value = val;
 	duplicate_conf(&new_item->conf, conf);
@@ -1133,7 +1146,9 @@ static void format_trailer_info(struct strbuf *out,
 	size_t i;
 
 	/* If we want the whole block untouched, we can take the fast path. */
-	if (!opts->only_trailers && !opts->unfold && !opts->filter && !opts->separator) {
+	if (!opts->only_trailers && !opts->unfold && !opts->filter &&
+	    !opts->separator && !opts->key_only && !opts->value_only &&
+	    !opts->key_value_separator) {
 		strbuf_add(out, info->trailer_start,
 			   info->trailer_end - info->trailer_start);
 		return;
@@ -1155,8 +1170,15 @@ static void format_trailer_info(struct strbuf *out,
 				if (opts->separator && out->len != origlen)
 					strbuf_addbuf(out, opts->separator);
 				if (!opts->value_only)
-					strbuf_addf(out, "%s: ", tok.buf);
-				strbuf_addbuf(out, &val);
+					strbuf_addbuf(out, &tok);
+				if (!opts->key_only && !opts->value_only) {
+					if (opts->key_value_separator)
+						strbuf_addbuf(out, opts->key_value_separator);
+					else
+						strbuf_addstr(out, ": ");
+				}
+				if (!opts->key_only)
+					strbuf_addbuf(out, &val);
 				if (!opts->separator)
 					strbuf_addch(out, '\n');
 			}
@@ -1185,3 +1207,39 @@ void format_trailers_from_commit(struct strbuf *out, const char *msg,
 	format_trailer_info(out, &info, opts);
 	trailer_info_release(&info);
 }
+
+void trailer_iterator_init(struct trailer_iterator *iter, const char *msg)
+{
+	struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
+	strbuf_init(&iter->key, 0);
+	strbuf_init(&iter->val, 0);
+	opts.no_divider = 1;
+	trailer_info_get(&iter->info, msg, &opts);
+	iter->cur = 0;
+}
+
+int trailer_iterator_advance(struct trailer_iterator *iter)
+{
+	while (iter->cur < iter->info.trailer_nr) {
+		char *trailer = iter->info.trailers[iter->cur++];
+		int separator_pos = find_separator(trailer, separators);
+
+		if (separator_pos < 1)
+			continue; /* not a real trailer */
+
+		strbuf_reset(&iter->key);
+		strbuf_reset(&iter->val);
+		parse_trailer(&iter->key, &iter->val, NULL,
+			      trailer, separator_pos);
+		unfold_value(&iter->val);
+		return 1;
+	}
+	return 0;
+}
+
+void trailer_iterator_release(struct trailer_iterator *iter)
+{
+	trailer_info_release(&iter->info);
+	strbuf_release(&iter->val);
+	strbuf_release(&iter->key);
+}
diff --git a/trailer.h b/trailer.h
index 203acf4ee1..795d2fccfd 100644
--- a/trailer.h
+++ b/trailer.h
@@ -2,8 +2,7 @@
 #define TRAILER_H
 
 #include "list.h"
-
-struct strbuf;
+#include "strbuf.h"
 
 enum trailer_where {
 	WHERE_DEFAULT,
@@ -72,8 +71,10 @@ struct process_trailer_options {
 	int only_input;
 	int unfold;
 	int no_divider;
+	int key_only;
 	int value_only;
 	const struct strbuf *separator;
+	const struct strbuf *key_value_separator;
 	int (*filter)(const struct strbuf *, void *);
 	void *filter_data;
 };
@@ -103,4 +104,46 @@ void trailer_info_release(struct trailer_info *info);
 void format_trailers_from_commit(struct strbuf *out, const char *msg,
 				 const struct process_trailer_options *opts);
 
+/*
+ * An interface for iterating over the trailers found in a particular commit
+ * message. Use like:
+ *
+ *   struct trailer_iterator iter;
+ *   trailer_iterator_init(&iter, msg);
+ *   while (trailer_iterator_advance(&iter))
+ *      ... do something with iter.key and iter.val ...
+ *   trailer_iterator_release(&iter);
+ */
+struct trailer_iterator {
+	struct strbuf key;
+	struct strbuf val;
+
+	/* private */
+	struct trailer_info info;
+	size_t cur;
+};
+
+/*
+ * Initialize "iter" in preparation for walking over the trailers in the commit
+ * message "msg". The "msg" pointer must remain valid until the iterator is
+ * released.
+ *
+ * After initializing, note that key/val will not yet point to any trailer.
+ * Call advance() to parse the first one (if any).
+ */
+void trailer_iterator_init(struct trailer_iterator *iter, const char *msg);
+
+/*
+ * Advance to the next trailer of the iterator. Returns 0 if there is no such
+ * trailer, and 1 otherwise. The key and value of the trailer can be
+ * fetched from the iter->key and iter->value fields (which are valid
+ * only until the next advance).
+ */
+int trailer_iterator_advance(struct trailer_iterator *iter);
+
+/*
+ * Release all resources associated with the trailer iteration.
+ */
+void trailer_iterator_release(struct trailer_iterator *iter);
+
 #endif /* TRAILER_H */
diff --git a/transport-helper.c b/transport-helper.c
index a9d690297e..4be035edb8 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -9,7 +9,7 @@
 #include "string-list.h"
 #include "thread-utils.h"
 #include "sigchain.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "refs.h"
 #include "refspec.h"
 #include "transport-internal.h"
@@ -32,7 +32,8 @@ struct helper_data {
 		signed_tags : 1,
 		check_connectivity : 1,
 		no_disconnect_req : 1,
-		no_private_update : 1;
+		no_private_update : 1,
+		object_format : 1;
 
 	/*
 	 * As an optimization, the transport code may invoke fetch before
@@ -127,17 +128,17 @@ static struct child_process *get_helper(struct transport *transport)
 	helper->in = -1;
 	helper->out = -1;
 	helper->err = 0;
-	argv_array_pushf(&helper->args, "git-remote-%s", data->name);
-	argv_array_push(&helper->args, transport->remote->name);
-	argv_array_push(&helper->args, remove_ext_force(transport->url));
-	helper->git_cmd = 0;
+	strvec_pushf(&helper->args, "remote-%s", data->name);
+	strvec_push(&helper->args, transport->remote->name);
+	strvec_push(&helper->args, remove_ext_force(transport->url));
+	helper->git_cmd = 1;
 	helper->silent_exec_failure = 1;
 
 	if (have_git_dir())
-		argv_array_pushf(&helper->env_array, "%s=%s",
-				 GIT_DIR_ENVIRONMENT, get_git_dir());
+		strvec_pushf(&helper->env_array, "%s=%s",
+			     GIT_DIR_ENVIRONMENT, get_git_dir());
 
-	helper->trace2_child_class = helper->args.argv[0]; /* "remote-<name>" */
+	helper->trace2_child_class = helper->args.v[0]; /* "remote-<name>" */
 
 	code = start_command(helper);
 	if (code < 0 && errno == ENOENT)
@@ -207,6 +208,8 @@ static struct child_process *get_helper(struct transport *transport)
 			data->import_marks = xstrdup(arg);
 		} else if (starts_with(capname, "no-private-update")) {
 			data->no_private_update = 1;
+		} else if (starts_with(capname, "object-format")) {
+			data->object_format = 1;
 		} else if (mandatory) {
 			die(_("unknown mandatory capability %s; this remote "
 			      "helper probably needs newer version of Git"),
@@ -404,15 +407,17 @@ static int fetch_with_fetch(struct transport *transport,
 	sendline(data, &buf);
 
 	while (1) {
+		const char *name;
+
 		if (recvline(data, &buf))
 			exit(128);
 
-		if (starts_with(buf.buf, "lock ")) {
-			const char *name = buf.buf + 5;
-			if (transport->pack_lockfile)
+		if (skip_prefix(buf.buf, "lock ", &name)) {
+			if (transport->pack_lockfiles.nr)
 				warning(_("%s also locked %s"), data->name, name);
 			else
-				transport->pack_lockfile = xstrdup(name);
+				string_list_append(&transport->pack_lockfiles,
+						   name);
 		}
 		else if (data->check_connectivity &&
 			 data->transport_options.check_self_contained_and_connected &&
@@ -434,12 +439,13 @@ static int get_importer(struct transport *transport, struct child_process *fasti
 	int cat_blob_fd, code;
 	child_process_init(fastimport);
 	fastimport->in = xdup(helper->out);
-	argv_array_push(&fastimport->args, "fast-import");
-	argv_array_push(&fastimport->args, debug ? "--stats" : "--quiet");
+	strvec_push(&fastimport->args, "fast-import");
+	strvec_push(&fastimport->args, "--allow-unsafe-features");
+	strvec_push(&fastimport->args, debug ? "--stats" : "--quiet");
 
 	if (data->bidi_import) {
 		cat_blob_fd = xdup(helper->in);
-		argv_array_pushf(&fastimport->args, "--cat-blob-fd=%d", cat_blob_fd);
+		strvec_pushf(&fastimport->args, "--cat-blob-fd=%d", cat_blob_fd);
 	}
 	fastimport->git_cmd = 1;
 
@@ -460,17 +466,17 @@ static int get_exporter(struct transport *transport,
 	/* we need to duplicate helper->in because we want to use it after
 	 * fastexport is done with it. */
 	fastexport->out = dup(helper->in);
-	argv_array_push(&fastexport->args, "fast-export");
-	argv_array_push(&fastexport->args, "--use-done-feature");
-	argv_array_push(&fastexport->args, data->signed_tags ?
+	strvec_push(&fastexport->args, "fast-export");
+	strvec_push(&fastexport->args, "--use-done-feature");
+	strvec_push(&fastexport->args, data->signed_tags ?
 		"--signed-tags=verbatim" : "--signed-tags=warn-strip");
 	if (data->export_marks)
-		argv_array_pushf(&fastexport->args, "--export-marks=%s.tmp", data->export_marks);
+		strvec_pushf(&fastexport->args, "--export-marks=%s.tmp", data->export_marks);
 	if (data->import_marks)
-		argv_array_pushf(&fastexport->args, "--import-marks=%s", data->import_marks);
+		strvec_pushf(&fastexport->args, "--import-marks=%s", data->import_marks);
 
 	for (i = 0; i < revlist_args->nr; i++)
-		argv_array_push(&fastexport->args, revlist_args->items[i].string);
+		strvec_push(&fastexport->args, revlist_args->items[i].string);
 
 	fastexport->git_cmd = 1;
 	return start_command(fastexport);
@@ -678,6 +684,16 @@ static int fetch(struct transport *transport,
 		return transport->vtable->fetch(transport, nr_heads, to_fetch);
 	}
 
+	/*
+	 * If we reach here, then the server, the client, and/or the transport
+	 * helper does not support protocol v2. --negotiate-only requires
+	 * protocol v2.
+	 */
+	if (data->transport_options.acked_commits) {
+		warning(_("--negotiate-only requires protocol v2"));
+		return -1;
+	}
+
 	if (!data->get_refs_list_called)
 		get_refs_list_using_list(transport, 0);
 
@@ -717,13 +733,61 @@ static int fetch(struct transport *transport,
 	return -1;
 }
 
+struct push_update_ref_state {
+	struct ref *hint;
+	struct ref_push_report *report;
+	int new_report;
+};
+
 static int push_update_ref_status(struct strbuf *buf,
-				   struct ref **ref,
+				   struct push_update_ref_state *state,
 				   struct ref *remote_refs)
 {
 	char *refname, *msg;
 	int status, forced = 0;
 
+	if (starts_with(buf->buf, "option ")) {
+		struct object_id old_oid, new_oid;
+		const char *key, *val;
+		char *p;
+
+		if (!state->hint || !(state->report || state->new_report))
+			die(_("'option' without a matching 'ok/error' directive"));
+		if (state->new_report) {
+			if (!state->hint->report) {
+				CALLOC_ARRAY(state->hint->report, 1);
+				state->report = state->hint->report;
+			} else {
+				state->report = state->hint->report;
+				while (state->report->next)
+					state->report = state->report->next;
+				CALLOC_ARRAY(state->report->next, 1);
+				state->report = state->report->next;
+			}
+			state->new_report = 0;
+		}
+		key = buf->buf + 7;
+		p = strchr(key, ' ');
+		if (p)
+			*p++ = '\0';
+		val = p;
+		if (!strcmp(key, "refname"))
+			state->report->ref_name = xstrdup_or_null(val);
+		else if (!strcmp(key, "old-oid") && val &&
+			 !parse_oid_hex(val, &old_oid, &val))
+			state->report->old_oid = oiddup(&old_oid);
+		else if (!strcmp(key, "new-oid") && val &&
+			 !parse_oid_hex(val, &new_oid, &val))
+			state->report->new_oid = oiddup(&new_oid);
+		else if (!strcmp(key, "forced-update"))
+			state->report->forced_update = 1;
+		/* Not update remote namespace again. */
+		return 1;
+	}
+
+	state->report = NULL;
+	state->new_report = 0;
+
 	if (starts_with(buf->buf, "ok ")) {
 		status = REF_STATUS_OK;
 		refname = buf->buf + 3;
@@ -773,22 +837,26 @@ static int push_update_ref_status(struct strbuf *buf,
 			status = REF_STATUS_REJECT_STALE;
 			FREE_AND_NULL(msg);
 		}
+		else if (!strcmp(msg, "remote ref updated since checkout")) {
+			status = REF_STATUS_REJECT_REMOTE_UPDATED;
+			FREE_AND_NULL(msg);
+		}
 		else if (!strcmp(msg, "forced update")) {
 			forced = 1;
 			FREE_AND_NULL(msg);
 		}
 	}
 
-	if (*ref)
-		*ref = find_ref_by_name(*ref, refname);
-	if (!*ref)
-		*ref = find_ref_by_name(remote_refs, refname);
-	if (!*ref) {
+	if (state->hint)
+		state->hint = find_ref_by_name(state->hint, refname);
+	if (!state->hint)
+		state->hint = find_ref_by_name(remote_refs, refname);
+	if (!state->hint) {
 		warning(_("helper reported unexpected status of %s"), refname);
 		return 1;
 	}
 
-	if ((*ref)->status != REF_STATUS_NONE) {
+	if (state->hint->status != REF_STATUS_NONE) {
 		/*
 		 * Earlier, the ref was marked not to be pushed, so ignore the ref
 		 * status reported by the remote helper if the latter is 'no match'.
@@ -797,9 +865,11 @@ static int push_update_ref_status(struct strbuf *buf,
 			return 1;
 	}
 
-	(*ref)->status = status;
-	(*ref)->forced_update |= forced;
-	(*ref)->remote_status = msg;
+	if (status == REF_STATUS_OK)
+		state->new_report = 1;
+	state->hint->status = status;
+	state->hint->forced_update |= forced;
+	state->hint->remote_status = msg;
 	return !(status == REF_STATUS_OK);
 }
 
@@ -807,37 +877,57 @@ static int push_update_refs_status(struct helper_data *data,
 				    struct ref *remote_refs,
 				    int flags)
 {
+	struct ref *ref;
+	struct ref_push_report *report;
 	struct strbuf buf = STRBUF_INIT;
-	struct ref *ref = remote_refs;
-	int ret = 0;
+	struct push_update_ref_state state = { remote_refs, NULL, 0 };
 
 	for (;;) {
-		char *private;
-
 		if (recvline(data, &buf)) {
-			ret = 1;
-			break;
+			strbuf_release(&buf);
+			return 1;
 		}
-
 		if (!buf.len)
 			break;
+		push_update_ref_status(&buf, &state, remote_refs);
+	}
+	strbuf_release(&buf);
 
-		if (push_update_ref_status(&buf, &ref, remote_refs))
-			continue;
+	if (flags & TRANSPORT_PUSH_DRY_RUN || !data->rs.nr || data->no_private_update)
+		return 0;
 
-		if (flags & TRANSPORT_PUSH_DRY_RUN || !data->rs.nr || data->no_private_update)
-			continue;
+	/* propagate back the update to the remote namespace */
+	for (ref = remote_refs; ref; ref = ref->next) {
+		char *private;
 
-		/* propagate back the update to the remote namespace */
-		private = apply_refspecs(&data->rs, ref->name);
-		if (!private)
+		if (ref->status != REF_STATUS_OK)
 			continue;
-		update_ref("update by helper", private, &ref->new_oid, NULL,
-			   0, 0);
-		free(private);
+
+		if (!ref->report) {
+			private = apply_refspecs(&data->rs, ref->name);
+			if (!private)
+				continue;
+			update_ref("update by helper", private, &(ref->new_oid),
+				   NULL, 0, 0);
+			free(private);
+		} else {
+			for (report = ref->report; report; report = report->next) {
+				private = apply_refspecs(&data->rs,
+							 report->ref_name
+							 ? report->ref_name
+							 : ref->name);
+				if (!private)
+					continue;
+				update_ref("update by helper", private,
+					   report->new_oid
+					   ? report->new_oid
+					   : &(ref->new_oid),
+					   NULL, 0, 0);
+				free(private);
+			}
+		}
 	}
-	strbuf_release(&buf);
-	return ret;
+	return 0;
 }
 
 static void set_common_push_options(struct transport *transport,
@@ -858,6 +948,11 @@ static void set_common_push_options(struct transport *transport,
 		if (set_helper_option(transport, TRANS_OPT_ATOMIC, "true") != 0)
 			die(_("helper %s does not support --atomic"), name);
 
+	if (flags & TRANSPORT_PUSH_FORCE_IF_INCLUDES)
+		if (set_helper_option(transport, TRANS_OPT_FORCE_IF_INCLUDES, "true") != 0)
+			die(_("helper %s does not support --%s"),
+			    name, TRANS_OPT_FORCE_IF_INCLUDES);
+
 	if (flags & TRANSPORT_PUSH_OPTIONS) {
 		struct string_list_item *item;
 		for_each_string_list_item(item, transport->push_options)
@@ -891,7 +986,9 @@ static int push_refs_with_push(struct transport *transport,
 		case REF_STATUS_REJECT_NONFASTFORWARD:
 		case REF_STATUS_REJECT_STALE:
 		case REF_STATUS_REJECT_ALREADY_EXISTS:
+		case REF_STATUS_REJECT_REMOTE_UPDATED:
 			if (atomic) {
+				reject_atomic_push(remote_refs, mirror);
 				string_list_clear(&cas_options, 0);
 				return 0;
 			} else
@@ -1043,7 +1140,7 @@ static int push_refs(struct transport *transport,
 	if (!remote_refs) {
 		fprintf(stderr,
 			_("No refs in common and none specified; doing nothing.\n"
-			  "Perhaps you should specify a branch such as 'master'.\n"));
+			  "Perhaps you should specify a branch.\n"));
 		return 0;
 	}
 
@@ -1075,13 +1172,14 @@ static int has_attribute(const char *attrs, const char *attr)
 }
 
 static struct ref *get_refs_list(struct transport *transport, int for_push,
-				 const struct argv_array *ref_prefixes)
+				 struct transport_ls_refs_options *transport_options)
 {
 	get_helper(transport);
 
 	if (process_connect(transport, for_push)) {
 		do_take_over(transport);
-		return transport->vtable->get_refs_list(transport, for_push, ref_prefixes);
+		return transport->vtable->get_refs_list(transport, for_push,
+							transport_options);
 	}
 
 	return get_refs_list_using_list(transport, for_push);
@@ -1100,6 +1198,12 @@ static struct ref *get_refs_list_using_list(struct transport *transport,
 	data->get_refs_list_called = 1;
 	helper = get_helper(transport);
 
+	if (data->object_format) {
+		write_str_in_full(helper->in, "option object-format\n");
+		if (recvline(data, &buf) || strcmp(buf.buf, "ok"))
+			exit(128);
+	}
+
 	if (data->push && for_push)
 		write_str_in_full(helper->in, "list for-push\n");
 	else
@@ -1112,6 +1216,17 @@ static struct ref *get_refs_list_using_list(struct transport *transport,
 
 		if (!*buf.buf)
 			break;
+		else if (buf.buf[0] == ':') {
+			const char *value;
+			if (skip_prefix(buf.buf, ":object-format ", &value)) {
+				int algo = hash_algo_by_name(value);
+				if (algo == GIT_HASH_UNKNOWN)
+					die(_("unsupported object format '%s'"),
+					    value);
+				transport->hash_algo = &hash_algos[algo];
+			}
+			continue;
+		}
 
 		eov = strchr(buf.buf, ' ');
 		if (!eov)
@@ -1124,7 +1239,7 @@ static struct ref *get_refs_list_using_list(struct transport *transport,
 		if (buf.buf[0] == '@')
 			(*tail)->symref = xstrdup(buf.buf + 1);
 		else if (buf.buf[0] != '?')
-			get_oid_hex(buf.buf, &(*tail)->old_oid);
+			get_oid_hex_algop(buf.buf, &(*tail)->old_oid, transport->hash_algo);
 		if (eon) {
 			if (has_attribute(eon + 1, "unchanged")) {
 				(*tail)->status |= REF_STATUS_UPTODATE;
@@ -1486,3 +1601,25 @@ int bidirectional_transfer_loop(int input, int output)
 
 	return tloop_spawnwait_tasks(&state);
 }
+
+void reject_atomic_push(struct ref *remote_refs, int mirror_mode)
+{
+	struct ref *ref;
+
+	/* Mark other refs as failed */
+	for (ref = remote_refs; ref; ref = ref->next) {
+		if (!ref->peer_ref && !mirror_mode)
+			continue;
+
+		switch (ref->status) {
+		case REF_STATUS_NONE:
+		case REF_STATUS_OK:
+		case REF_STATUS_EXPECTING_REPORT:
+			ref->status = REF_STATUS_ATOMIC_PUSH_FAILED;
+			continue;
+		default:
+			break; /* do nothing */
+		}
+	}
+	return;
+}
diff --git a/transport-internal.h b/transport-internal.h
index 1cde6258a7..b60f1ba907 100644
--- a/transport-internal.h
+++ b/transport-internal.h
@@ -3,7 +3,8 @@
 
 struct ref;
 struct transport;
-struct argv_array;
+struct strvec;
+struct transport_ls_refs_options;
 
 struct transport_vtable {
 	/**
@@ -18,19 +19,12 @@ struct transport_vtable {
 	 * the transport to try to share connections, for_push is a
 	 * hint as to whether the ultimate operation is a push or a fetch.
 	 *
-	 * If communicating using protocol v2 a list of prefixes can be
-	 * provided to be sent to the server to enable it to limit the ref
-	 * advertisement.  Since ref filtering is done on the server's end, and
-	 * only when using protocol v2, this list will be ignored when not
-	 * using protocol v2 meaning this function can return refs which don't
-	 * match the provided ref_prefixes.
-	 *
 	 * If the transport is able to determine the remote hash for
 	 * the ref without a huge amount of effort, it should store it
 	 * in the ref's old_sha1 field; otherwise it should be all 0.
 	 **/
 	struct ref *(*get_refs_list)(struct transport *transport, int for_push,
-				     const struct argv_array *ref_prefixes);
+				     struct transport_ls_refs_options *transport_options);
 
 	/**
 	 * Fetch the objects for the given refs. Note that this gets
diff --git a/transport.c b/transport.c
index 83379a037d..17e9629710 100644
--- a/transport.c
+++ b/transport.c
@@ -16,7 +16,7 @@
 #include "url.h"
 #include "submodule.h"
 #include "string-list.h"
-#include "sha1-array.h"
+#include "oid-array.h"
 #include "sigchain.h"
 #include "transport-internal.h"
 #include "protocol.h"
@@ -108,11 +108,11 @@ static void set_upstreams(struct transport *transport, struct ref *refs,
 		if (!remotename || !starts_with(remotename, "refs/heads/"))
 			continue;
 
-		if (!pretend)
-			install_branch_config(BRANCH_CONFIG_VERBOSE,
-				localname + 11, transport->remote->name,
-				remotename);
-		else
+		if (!pretend) {
+			int flag = transport->verbose < 0 ? 0 : BRANCH_CONFIG_VERBOSE;
+			install_branch_config(flag, localname + 11,
+				transport->remote->name, remotename);
+		} else if (transport->verbose >= 0)
 			printf(_("Would set upstream of '%s' to '%s' of '%s'\n"),
 				localname + 11, remotename + 11,
 				transport->remote->name);
@@ -127,7 +127,7 @@ struct bundle_transport_data {
 
 static struct ref *get_refs_from_bundle(struct transport *transport,
 					int for_push,
-					const struct argv_array *ref_prefixes)
+					struct transport_ls_refs_options *transport_options)
 {
 	struct bundle_transport_data *data = transport->data;
 	struct ref *result = NULL;
@@ -143,10 +143,15 @@ static struct ref *get_refs_from_bundle(struct transport *transport,
 	data->fd = read_bundle_header(transport->url, &data->header);
 	if (data->fd < 0)
 		die(_("could not read bundle '%s'"), transport->url);
+
+	transport->hash_algo = data->header.hash_algo;
+
 	for (i = 0; i < data->header.references.nr; i++) {
-		struct ref_list_entry *e = data->header.references.list + i;
-		struct ref *ref = alloc_ref(e->name);
-		oidcpy(&ref->old_oid, &e->oid);
+		struct string_list_item *e = data->header.references.items + i;
+		const char *name = e->string;
+		struct ref *ref = alloc_ref(name);
+		struct object_id *oid = e->util;
+		oidcpy(&ref->old_oid, oid);
 		ref->next = result;
 		result = ref;
 	}
@@ -157,11 +162,14 @@ static int fetch_refs_from_bundle(struct transport *transport,
 			       int nr_heads, struct ref **to_fetch)
 {
 	struct bundle_transport_data *data = transport->data;
+	int ret;
 
 	if (!data->get_refs_from_bundle_called)
 		get_refs_from_bundle(transport, 0, NULL);
-	return unbundle(the_repository, &data->header, data->fd,
-			transport->progress ? BUNDLE_VERBOSE : 0);
+	ret = unbundle(the_repository, &data->header, data->fd,
+			   transport->progress ? BUNDLE_VERBOSE : 0);
+	transport->hash_algo = data->header.hash_algo;
+	return ret;
 }
 
 static int close_bundle(struct transport *transport)
@@ -169,6 +177,7 @@ static int close_bundle(struct transport *transport)
 	struct bundle_transport_data *data = transport->data;
 	if (data->fd > 0)
 		close(data->fd);
+	bundle_header_release(&data->header);
 	free(data);
 	return 0;
 }
@@ -226,13 +235,13 @@ static int set_git_option(struct git_transport_options *opts,
 	} else if (!strcmp(name, TRANS_OPT_FROM_PROMISOR)) {
 		opts->from_promisor = !!value;
 		return 0;
-	} else if (!strcmp(name, TRANS_OPT_NO_DEPENDENTS)) {
-		opts->no_dependents = !!value;
-		return 0;
 	} else if (!strcmp(name, TRANS_OPT_LIST_OBJECTS_FILTER)) {
 		list_objects_filter_die_if_populated(&opts->filter_options);
 		parse_list_objects_filter(&opts->filter_options, value);
 		return 0;
+	} else if (!strcmp(name, TRANS_OPT_REJECT_SHALLOW)) {
+		opts->reject_shallow = !!value;
+		return 0;
 	}
 	return 1;
 }
@@ -277,12 +286,14 @@ static void die_if_server_options(struct transport *transport)
  * remote refs.
  */
 static struct ref *handshake(struct transport *transport, int for_push,
-			     const struct argv_array *ref_prefixes,
+			     struct transport_ls_refs_options *options,
 			     int must_list_refs)
 {
 	struct git_transport_data *data = transport->data;
 	struct ref *refs = NULL;
 	struct packet_reader reader;
+	int sid_len;
+	const char *server_sid;
 
 	connect_setup(transport, for_push);
 
@@ -294,10 +305,13 @@ static struct ref *handshake(struct transport *transport, int for_push,
 	data->version = discover_version(&reader);
 	switch (data->version) {
 	case protocol_v2:
+		if (server_feature_v2("session-id", &server_sid))
+			trace2_data_string("transfer", NULL, "server-sid", server_sid);
 		if (must_list_refs)
 			get_remote_refs(data->fd[1], &reader, &refs, for_push,
-					ref_prefixes,
-					transport->server_options);
+					options,
+					transport->server_options,
+					transport->stateless_rpc);
 		break;
 	case protocol_v1:
 	case protocol_v0:
@@ -306,11 +320,18 @@ static struct ref *handshake(struct transport *transport, int for_push,
 				 for_push ? REF_NORMAL : 0,
 				 &data->extra_have,
 				 &data->shallow);
+		server_sid = server_feature_value("session-id", &sid_len);
+		if (server_sid) {
+			char *sid = xstrndup(server_sid, sid_len);
+			trace2_data_string("transfer", NULL, "server-sid", sid);
+			free(sid);
+		}
 		break;
 	case protocol_unknown_version:
 		BUG("unknown protocol version");
 	}
 	data->got_remote_heads = 1;
+	transport->hash_algo = reader.hash_algo;
 
 	if (reader.line_peeked)
 		BUG("buffer must be empty at the end of handshake()");
@@ -319,9 +340,9 @@ static struct ref *handshake(struct transport *transport, int for_push,
 }
 
 static struct ref *get_refs_via_connect(struct transport *transport, int for_push,
-					const struct argv_array *ref_prefixes)
+					struct transport_ls_refs_options *options)
 {
-	return handshake(transport, for_push, ref_prefixes, 1);
+	return handshake(transport, for_push, options, 1);
 }
 
 static int fetch_refs_via_pack(struct transport *transport,
@@ -351,11 +372,11 @@ static int fetch_refs_via_pack(struct transport *transport,
 	args.cloning = transport->cloning;
 	args.update_shallow = data->options.update_shallow;
 	args.from_promisor = data->options.from_promisor;
-	args.no_dependents = data->options.no_dependents;
 	args.filter_options = data->options.filter_options;
 	args.stateless_rpc = transport->stateless_rpc;
 	args.server_options = transport->server_options;
 	args.negotiation_tips = data->options.negotiation_tips;
+	args.reject_shallow_remote = transport->smart_options->reject_shallow;
 
 	if (!data->got_remote_heads) {
 		int i;
@@ -369,30 +390,34 @@ static int fetch_refs_via_pack(struct transport *transport,
 		refs_tmp = handshake(transport, 0, NULL, must_list_refs);
 	}
 
-	switch (data->version) {
-	case protocol_v2:
-		refs = fetch_pack(&args, data->fd,
-				  refs_tmp ? refs_tmp : transport->remote_refs,
-				  to_fetch, nr_heads, &data->shallow,
-				  &transport->pack_lockfile, data->version);
-		break;
-	case protocol_v1:
-	case protocol_v0:
-		die_if_server_options(transport);
-		refs = fetch_pack(&args, data->fd,
-				  refs_tmp ? refs_tmp : transport->remote_refs,
-				  to_fetch, nr_heads, &data->shallow,
-				  &transport->pack_lockfile, data->version);
-		break;
-	case protocol_unknown_version:
+	if (data->version == protocol_unknown_version)
 		BUG("unknown protocol version");
+	else if (data->version <= protocol_v1)
+		die_if_server_options(transport);
+
+	if (data->options.acked_commits) {
+		if (data->version < protocol_v2) {
+			warning(_("--negotiate-only requires protocol v2"));
+			ret = -1;
+		} else if (!server_supports_feature("fetch", "wait-for-done", 0)) {
+			warning(_("server does not support wait-for-done"));
+			ret = -1;
+		} else {
+			negotiate_using_fetch(data->options.negotiation_tips,
+					      transport->server_options,
+					      transport->stateless_rpc,
+					      data->fd,
+					      data->options.acked_commits);
+			ret = 0;
+		}
+		goto cleanup;
 	}
 
-	close(data->fd[0]);
-	close(data->fd[1]);
-	if (finish_connect(data->conn))
-		ret = -1;
-	data->conn = NULL;
+	refs = fetch_pack(&args, data->fd,
+			  refs_tmp ? refs_tmp : transport->remote_refs,
+			  to_fetch, nr_heads, &data->shallow,
+			  &transport->pack_lockfiles, data->version);
+
 	data->got_remote_heads = 0;
 	data->options.self_contained_and_connected =
 		args.self_contained_and_connected;
@@ -403,6 +428,14 @@ static int fetch_refs_via_pack(struct transport *transport,
 	if (report_unmatched_refs(to_fetch, nr_heads))
 		ret = -1;
 
+cleanup:
+	close(data->fd[0]);
+	if (data->fd[1] >= 0)
+		close(data->fd[1]);
+	if (finish_connect(data->conn))
+		ret = -1;
+	data->conn = NULL;
+
 	free_refs(refs_tmp);
 	free_refs(refs);
 	return ret;
@@ -437,37 +470,67 @@ int transport_refs_pushed(struct ref *ref)
 	return 0;
 }
 
-void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose)
+static void update_one_tracking_ref(struct remote *remote, char *refname,
+				    struct object_id *new_oid, int deletion,
+				    int verbose)
 {
 	struct refspec_item rs;
 
-	if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE)
-		return;
-
-	rs.src = ref->name;
+	memset(&rs, 0, sizeof(rs));
+	rs.src = refname;
 	rs.dst = NULL;
 
 	if (!remote_find_tracking(remote, &rs)) {
 		if (verbose)
 			fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
-		if (ref->deletion) {
+		if (deletion)
 			delete_ref(NULL, rs.dst, NULL, 0);
-		} else
-			update_ref("update by push", rs.dst, &ref->new_oid,
+		else
+			update_ref("update by push", rs.dst, new_oid,
 				   NULL, 0, 0);
 		free(rs.dst);
 	}
 }
 
+void transport_update_tracking_ref(struct remote *remote, struct ref *ref, int verbose)
+{
+	char *refname;
+	struct object_id *new_oid;
+	struct ref_push_report *report;
+
+	if (ref->status != REF_STATUS_OK && ref->status != REF_STATUS_UPTODATE)
+		return;
+
+	report = ref->report;
+	if (!report)
+		update_one_tracking_ref(remote, ref->name, &ref->new_oid,
+					ref->deletion, verbose);
+	else
+		for (; report; report = report->next) {
+			refname = report->ref_name ? (char *)report->ref_name : ref->name;
+			new_oid = report->new_oid ? report->new_oid : &ref->new_oid;
+			update_one_tracking_ref(remote, refname, new_oid,
+						is_null_oid(new_oid), verbose);
+		}
+}
+
 static void print_ref_status(char flag, const char *summary,
 			     struct ref *to, struct ref *from, const char *msg,
+			     struct ref_push_report *report,
 			     int porcelain, int summary_width)
 {
+	const char *to_name;
+
+	if (report && report->ref_name)
+		to_name = report->ref_name;
+	else
+		to_name = to->name;
+
 	if (porcelain) {
 		if (from)
-			fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to->name);
+			fprintf(stdout, "%c\t%s:%s\t", flag, from->name, to_name);
 		else
-			fprintf(stdout, "%c\t:%s\t", flag, to->name);
+			fprintf(stdout, "%c\t:%s\t", flag, to_name);
 		if (msg)
 			fprintf(stdout, "%s (%s)\n", summary, msg);
 		else
@@ -481,9 +544,11 @@ static void print_ref_status(char flag, const char *summary,
 		fprintf(stderr, " %s%c %-*s%s ", red, flag, summary_width,
 			summary, reset);
 		if (from)
-			fprintf(stderr, "%s -> %s", prettify_refname(from->name), prettify_refname(to->name));
+			fprintf(stderr, "%s -> %s",
+				prettify_refname(from->name),
+				prettify_refname(to_name));
 		else
-			fputs(prettify_refname(to->name), stderr);
+			fputs(prettify_refname(to_name), stderr);
 		if (msg) {
 			fputs(" (", stderr);
 			fputs(msg, stderr);
@@ -493,24 +558,52 @@ static void print_ref_status(char flag, const char *summary,
 	}
 }
 
-static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_width)
+static void print_ok_ref_status(struct ref *ref,
+				struct ref_push_report *report,
+				int porcelain, int summary_width)
 {
+	struct object_id *old_oid;
+	struct object_id *new_oid;
+	const char *ref_name;
+	int forced_update;
+
+	if (report && report->old_oid)
+		old_oid = report->old_oid;
+	else
+		old_oid = &ref->old_oid;
+	if (report && report->new_oid)
+		new_oid = report->new_oid;
+	else
+		new_oid = &ref->new_oid;
+	if (report && report->forced_update)
+		forced_update = report->forced_update;
+	else
+		forced_update = ref->forced_update;
+	if (report && report->ref_name)
+		ref_name = report->ref_name;
+	else
+		ref_name = ref->name;
+
 	if (ref->deletion)
 		print_ref_status('-', "[deleted]", ref, NULL, NULL,
-				 porcelain, summary_width);
-	else if (is_null_oid(&ref->old_oid))
+				 report, porcelain, summary_width);
+	else if (is_null_oid(old_oid))
 		print_ref_status('*',
-			(starts_with(ref->name, "refs/tags/") ? "[new tag]" :
-			"[new branch]"),
-			ref, ref->peer_ref, NULL, porcelain, summary_width);
+				 (starts_with(ref_name, "refs/tags/")
+				  ? "[new tag]"
+				  : (starts_with(ref_name, "refs/heads/")
+				     ? "[new branch]"
+				     : "[new reference]")),
+				 ref, ref->peer_ref, NULL,
+				 report, porcelain, summary_width);
 	else {
 		struct strbuf quickref = STRBUF_INIT;
 		char type;
 		const char *msg;
 
-		strbuf_add_unique_abbrev(&quickref, &ref->old_oid,
+		strbuf_add_unique_abbrev(&quickref, old_oid,
 					 DEFAULT_ABBREV);
-		if (ref->forced_update) {
+		if (forced_update) {
 			strbuf_addstr(&quickref, "...");
 			type = '+';
 			msg = "forced update";
@@ -519,16 +612,17 @@ static void print_ok_ref_status(struct ref *ref, int porcelain, int summary_widt
 			type = ' ';
 			msg = NULL;
 		}
-		strbuf_add_unique_abbrev(&quickref, &ref->new_oid,
+		strbuf_add_unique_abbrev(&quickref, new_oid,
 					 DEFAULT_ABBREV);
 
 		print_ref_status(type, quickref.buf, ref, ref->peer_ref, msg,
-				 porcelain, summary_width);
+				 report, porcelain, summary_width);
 		strbuf_release(&quickref);
 	}
 }
 
-static int print_one_push_status(struct ref *ref, const char *dest, int count,
+static int print_one_push_report(struct ref *ref, const char *dest, int count,
+				 struct ref_push_report *report,
 				 int porcelain, int summary_width)
 {
 	if (!count) {
@@ -540,65 +634,94 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count,
 	switch(ref->status) {
 	case REF_STATUS_NONE:
 		print_ref_status('X', "[no match]", ref, NULL, NULL,
-				 porcelain, summary_width);
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_REJECT_NODELETE:
 		print_ref_status('!', "[rejected]", ref, NULL,
 				 "remote does not support deleting refs",
-				 porcelain, summary_width);
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_UPTODATE:
 		print_ref_status('=', "[up to date]", ref,
-				 ref->peer_ref, NULL, porcelain, summary_width);
+				 ref->peer_ref, NULL,
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_REJECT_NONFASTFORWARD:
 		print_ref_status('!', "[rejected]", ref, ref->peer_ref,
-				 "non-fast-forward", porcelain, summary_width);
+				 "non-fast-forward",
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_REJECT_ALREADY_EXISTS:
 		print_ref_status('!', "[rejected]", ref, ref->peer_ref,
-				 "already exists", porcelain, summary_width);
+				 "already exists",
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_REJECT_FETCH_FIRST:
 		print_ref_status('!', "[rejected]", ref, ref->peer_ref,
-				 "fetch first", porcelain, summary_width);
+				 "fetch first",
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_REJECT_NEEDS_FORCE:
 		print_ref_status('!', "[rejected]", ref, ref->peer_ref,
-				 "needs force", porcelain, summary_width);
+				 "needs force",
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_REJECT_STALE:
 		print_ref_status('!', "[rejected]", ref, ref->peer_ref,
-				 "stale info", porcelain, summary_width);
+				 "stale info",
+				 report, porcelain, summary_width);
+		break;
+	case REF_STATUS_REJECT_REMOTE_UPDATED:
+		print_ref_status('!', "[rejected]", ref, ref->peer_ref,
+				 "remote ref updated since checkout",
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_REJECT_SHALLOW:
 		print_ref_status('!', "[rejected]", ref, ref->peer_ref,
 				 "new shallow roots not allowed",
-				 porcelain, summary_width);
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_REMOTE_REJECT:
 		print_ref_status('!', "[remote rejected]", ref,
 				 ref->deletion ? NULL : ref->peer_ref,
-				 ref->remote_status, porcelain, summary_width);
+				 ref->remote_status,
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_EXPECTING_REPORT:
 		print_ref_status('!', "[remote failure]", ref,
 				 ref->deletion ? NULL : ref->peer_ref,
 				 "remote failed to report status",
-				 porcelain, summary_width);
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_ATOMIC_PUSH_FAILED:
 		print_ref_status('!', "[rejected]", ref, ref->peer_ref,
-				 "atomic push failed", porcelain, summary_width);
+				 "atomic push failed",
+				 report, porcelain, summary_width);
 		break;
 	case REF_STATUS_OK:
-		print_ok_ref_status(ref, porcelain, summary_width);
+		print_ok_ref_status(ref, report, porcelain, summary_width);
 		break;
 	}
 
 	return 1;
 }
 
+static int print_one_push_status(struct ref *ref, const char *dest, int count,
+				 int porcelain, int summary_width)
+{
+	struct ref_push_report *report;
+	int n = 0;
+
+	if (!ref->report)
+		return print_one_push_report(ref, dest, count,
+					     NULL, porcelain, summary_width);
+
+	for (report = ref->report; report; report = report->next)
+		print_one_push_report(ref, dest, count + n++,
+				      report, porcelain, summary_width);
+	return n;
+}
+
 static int measure_abbrev(const struct object_id *oid, int sofar)
 {
 	char hex[GIT_MAX_HEXSZ + 1];
@@ -663,6 +786,8 @@ void transport_print_push_status(const char *dest, struct ref *refs,
 			*reject_reasons |= REJECT_FETCH_FIRST;
 		} else if (ref->status == REF_STATUS_REJECT_NEEDS_FORCE) {
 			*reject_reasons |= REJECT_NEEDS_FORCE;
+		} else if (ref->status == REF_STATUS_REJECT_REMOTE_UPDATED) {
+			*reject_reasons |= REJECT_REF_NEEDS_UPDATE;
 		}
 	}
 	free(head);
@@ -715,7 +840,15 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
 
 	close(data->fd[1]);
 	close(data->fd[0]);
-	ret |= finish_connect(data->conn);
+	/*
+	 * Atomic push may abort the connection early and close the pipe,
+	 * which may cause an error for `finish_connect()`. Ignore this error
+	 * for atomic git-push.
+	 */
+	if (ret || args.atomic)
+		finish_connect(data->conn);
+	else
+		ret = finish_connect(data->conn);
 	data->conn = NULL;
 	data->got_remote_heads = 0;
 
@@ -737,10 +870,11 @@ static int disconnect_git(struct transport *transport)
 {
 	struct git_transport_data *data = transport->data;
 	if (data->conn) {
-		if (data->got_remote_heads)
+		if (data->got_remote_heads && !transport->stateless_rpc)
 			packet_flush(data->fd[1]);
 		close(data->fd[0]);
-		close(data->fd[1]);
+		if (data->fd[1] >= 0)
+			close(data->fd[1]);
 		finish_connect(data->conn);
 	}
 
@@ -766,7 +900,7 @@ void transport_take_over(struct transport *transport,
 		BUG("taking over transport requires non-NULL "
 		    "smart_options field.");
 
-	data = xcalloc(1, sizeof(*data));
+	CALLOC_ARRAY(data, 1);
 	data->options = *transport->smart_options;
 	data->conn = child;
 	data->fd[0] = data->conn->out;
@@ -921,6 +1055,7 @@ struct transport *transport_get(struct remote *remote, const char *url)
 	struct transport *ret = xcalloc(1, sizeof(*ret));
 
 	ret->progress = isatty(2);
+	string_list_init_dup(&ret->pack_lockfiles);
 
 	if (!remote)
 		BUG("No remote provided to transport_get()");
@@ -949,6 +1084,7 @@ struct transport *transport_get(struct remote *remote, const char *url)
 		die(_("git-over-rsync is no longer supported"));
 	} else if (url_is_local_not_ssh(url) && is_file(url) && is_bundle(url, 1)) {
 		struct bundle_transport_data *data = xcalloc(1, sizeof(*data));
+		bundle_header_init(&data->header);
 		transport_check_allowed("file");
 		ret->data = data;
 		ret->vtable = &bundle_vtable;
@@ -988,9 +1124,16 @@ struct transport *transport_get(struct remote *remote, const char *url)
 			ret->smart_options->receivepack = remote->receivepack;
 	}
 
+	ret->hash_algo = &hash_algos[GIT_HASH_SHA1];
+
 	return ret;
 }
 
+const struct git_hash_algo *transport_get_hash_algo(struct transport *transport)
+{
+	return transport->hash_algo;
+}
+
 int transport_set_option(struct transport *transport,
 			 const char *name, const char *value)
 {
@@ -1089,6 +1232,7 @@ static int run_pre_push_hook(struct transport *transport,
 		if (!r->peer_ref) continue;
 		if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue;
 		if (r->status == REF_STATUS_REJECT_STALE) continue;
+		if (r->status == REF_STATUS_REJECT_REMOTE_UPDATED) continue;
 		if (r->status == REF_STATUS_UPTODATE) continue;
 
 		strbuf_reset(&buf);
@@ -1138,19 +1282,20 @@ int transport_push(struct repository *r,
 		int porcelain = flags & TRANSPORT_PUSH_PORCELAIN;
 		int pretend = flags & TRANSPORT_PUSH_DRY_RUN;
 		int push_ret, ret, err;
-		struct argv_array ref_prefixes = ARGV_ARRAY_INIT;
+		struct transport_ls_refs_options transport_options =
+			TRANSPORT_LS_REFS_OPTIONS_INIT;
 
 		if (check_push_refs(local_refs, rs) < 0)
 			return -1;
 
-		refspec_ref_prefixes(rs, &ref_prefixes);
+		refspec_ref_prefixes(rs, &transport_options.ref_prefixes);
 
 		trace2_region_enter("transport_push", "get_refs_list", r);
 		remote_refs = transport->vtable->get_refs_list(transport, 1,
-							       &ref_prefixes);
+							       &transport_options);
 		trace2_region_leave("transport_push", "get_refs_list", r);
 
-		argv_array_clear(&ref_prefixes);
+		strvec_clear(&transport_options.ref_prefixes);
 
 		if (flags & TRANSPORT_PUSH_ALL)
 			match_flags |= MATCH_REFS_ALL;
@@ -1240,20 +1385,6 @@ int transport_push(struct repository *r,
 		err = push_had_errors(remote_refs);
 		ret = push_ret | err;
 
-		if ((flags & TRANSPORT_PUSH_ATOMIC) && err) {
-			struct ref *it;
-			for (it = remote_refs; it; it = it->next)
-				switch (it->status) {
-				case REF_STATUS_NONE:
-				case REF_STATUS_UPTODATE:
-				case REF_STATUS_OK:
-					it->status = REF_STATUS_ATOMIC_PUSH_FAILED;
-					break;
-				default:
-					break;
-				}
-		}
-
 		if (!quiet || err)
 			transport_print_push_status(transport->url, remote_refs,
 					verbose | porcelain, porcelain,
@@ -1280,12 +1411,12 @@ int transport_push(struct repository *r,
 }
 
 const struct ref *transport_get_remote_refs(struct transport *transport,
-					    const struct argv_array *ref_prefixes)
+					    struct transport_ls_refs_options *transport_options)
 {
 	if (!transport->got_remote_refs) {
 		transport->remote_refs =
 			transport->vtable->get_refs_list(transport, 0,
-							 ref_prefixes);
+							 transport_options);
 		transport->got_remote_refs = 1;
 	}
 
@@ -1330,10 +1461,11 @@ int transport_fetch_refs(struct transport *transport, struct ref *refs)
 
 void transport_unlock_pack(struct transport *transport)
 {
-	if (transport->pack_lockfile) {
-		unlink_or_warn(transport->pack_lockfile);
-		FREE_AND_NULL(transport->pack_lockfile);
-	}
+	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);
 }
 
 int transport_connect(struct transport *transport, const char *name,
@@ -1350,6 +1482,8 @@ int transport_disconnect(struct transport *transport)
 	int ret = 0;
 	if (transport->vtable->disconnect)
 		ret = transport->vtable->disconnect(transport);
+	if (transport->got_remote_refs)
+		free_refs((void *)transport->remote_refs);
 	free(transport);
 	return ret;
 }
diff --git a/transport.h b/transport.h
index e0131daab9..1cbab11373 100644
--- a/transport.h
+++ b/transport.h
@@ -5,8 +5,7 @@
 #include "run-command.h"
 #include "remote.h"
 #include "list-objects-filter-options.h"
-
-struct string_list;
+#include "string-list.h"
 
 struct git_transport_options {
 	unsigned thin : 1;
@@ -15,9 +14,11 @@ struct git_transport_options {
 	unsigned check_self_contained_and_connected : 1;
 	unsigned self_contained_and_connected : 1;
 	unsigned update_shallow : 1;
+	unsigned reject_shallow : 1;
 	unsigned deepen_relative : 1;
+
+	/* see documentation of corresponding flag in fetch-pack.h */
 	unsigned from_promisor : 1;
-	unsigned no_dependents : 1;
 
 	/*
 	 * If this transport supports connect or stateless-connect,
@@ -46,6 +47,12 @@ struct git_transport_options {
 	 * transport_set_option().
 	 */
 	struct oid_array *negotiation_tips;
+
+	/*
+	 * If allocated, whenever transport_fetch_refs() is called, add known
+	 * common commits to this oidset instead of fetching any packfiles.
+	 */
+	struct oidset *acked_commits;
 };
 
 enum transport_family {
@@ -98,7 +105,8 @@ struct transport {
 	 */
 	const struct string_list *server_options;
 
-	char *pack_lockfile;
+	struct string_list pack_lockfiles;
+
 	signed verbose : 3;
 	/**
 	 * Transports should not set this directly, and should use this
@@ -115,6 +123,8 @@ struct transport {
 	struct git_transport_options *smart_options;
 
 	enum transport_family family;
+
+	const struct git_hash_algo *hash_algo;
 };
 
 #define TRANSPORT_PUSH_ALL			(1<<0)
@@ -133,6 +143,7 @@ struct transport {
 #define TRANSPORT_PUSH_ATOMIC			(1<<13)
 #define TRANSPORT_PUSH_OPTIONS			(1<<14)
 #define TRANSPORT_RECURSE_SUBMODULES_ONLY	(1<<15)
+#define TRANSPORT_PUSH_FORCE_IF_INCLUDES	(1<<16)
 
 int transport_summary_width(const struct ref *refs);
 
@@ -190,6 +201,9 @@ void transport_check_allowed(const char *type);
 /* Aggressively fetch annotated tags if possible */
 #define TRANS_OPT_FOLLOWTAGS "followtags"
 
+/* Reject shallow repo transport */
+#define TRANS_OPT_REJECT_SHALLOW "rejectshallow"
+
 /* Accept refs that may update .git/shallow without --depth */
 #define TRANS_OPT_UPDATE_SHALLOW "updateshallow"
 
@@ -199,18 +213,15 @@ void transport_check_allowed(const char *type);
 /* Indicate that these objects are being fetched by a promisor */
 #define TRANS_OPT_FROM_PROMISOR "from-promisor"
 
-/*
- * Indicate that only the objects wanted need to be fetched, not their
- * dependents
- */
-#define TRANS_OPT_NO_DEPENDENTS "no-dependents"
-
 /* Filter objects for partial clone and fetch */
 #define TRANS_OPT_LIST_OBJECTS_FILTER "filter"
 
 /* Request atomic (all-or-nothing) updates when pushing */
 #define TRANS_OPT_ATOMIC "atomic"
 
+/* Require remote changes to be integrated locally. */
+#define TRANS_OPT_FORCE_IF_INCLUDES "force-if-includes"
+
 /**
  * Returns 0 if the option was used, non-zero otherwise. Prints a
  * message to stderr if the option is not used.
@@ -220,29 +231,51 @@ int transport_set_option(struct transport *transport, const char *name,
 void transport_set_verbosity(struct transport *transport, int verbosity,
 	int force_progress);
 
-#define REJECT_NON_FF_HEAD     0x01
-#define REJECT_NON_FF_OTHER    0x02
-#define REJECT_ALREADY_EXISTS  0x04
-#define REJECT_FETCH_FIRST     0x08
-#define REJECT_NEEDS_FORCE     0x10
+#define REJECT_NON_FF_HEAD      0x01
+#define REJECT_NON_FF_OTHER     0x02
+#define REJECT_ALREADY_EXISTS   0x04
+#define REJECT_FETCH_FIRST      0x08
+#define REJECT_NEEDS_FORCE      0x10
+#define REJECT_REF_NEEDS_UPDATE 0x20
 
 int transport_push(struct repository *repo,
 		   struct transport *connection,
 		   struct refspec *rs, int flags,
 		   unsigned int * reject_reasons);
 
+struct transport_ls_refs_options {
+	/*
+	 * Optionally, a list of ref prefixes can be provided which can be sent
+	 * to the server (when communicating using protocol v2) to enable it to
+	 * limit the ref advertisement.  Since ref filtering is done on the
+	 * server's end (and only when using protocol v2),
+	 * transport_get_remote_refs() could return refs which don't match the
+	 * provided ref_prefixes.
+	 */
+	struct strvec ref_prefixes;
+
+	/*
+	 * 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.
+	 */
+	char *unborn_head_target;
+};
+#define TRANSPORT_LS_REFS_OPTIONS_INIT { STRVEC_INIT }
+
 /*
  * Retrieve refs from a remote.
- *
- * Optionally a list of ref prefixes can be provided which can be sent to the
- * server (when communicating using protocol v2) to enable it to limit the ref
- * advertisement.  Since ref filtering is done on the server's end (and only
- * when using protocol v2), this can return refs which don't match the provided
- * ref_prefixes.
  */
 const struct ref *transport_get_remote_refs(struct transport *transport,
-					    const struct argv_array *ref_prefixes);
+					    struct transport_ls_refs_options *transport_options);
 
+/*
+ * Fetch the hash algorithm used by a remote.
+ *
+ * This can only be called after fetching the remote refs.
+ */
+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);
 int transport_disconnect(struct transport *transport);
@@ -265,4 +298,7 @@ int transport_refs_pushed(struct ref *ref);
 void transport_print_push_status(const char *dest, struct ref *refs,
 		  int verbose, int porcelain, unsigned int *reject_reasons);
 
+/* common method used by transport-helper.c and send-pack.c */
+void reject_atomic_push(struct ref *refs, int mirror_mode);
+
 #endif
diff --git a/tree-diff.c b/tree-diff.c
index 33ded7f8b3..1572615bd9 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -29,9 +29,9 @@ static struct combine_diff_path *ll_diff_tree_paths(
 	struct combine_diff_path *p, const struct object_id *oid,
 	const struct object_id **parents_oid, int nparent,
 	struct strbuf *base, struct diff_options *opt);
-static int ll_diff_tree_oid(const struct object_id *old_oid,
-			    const struct object_id *new_oid,
-			    struct strbuf *base, struct diff_options *opt);
+static void ll_diff_tree_oid(const struct object_id *old_oid,
+			     const struct object_id *new_oid,
+			     struct strbuf *base, struct diff_options *opt);
 
 /*
  * Compare two tree entries, taking into account only path/S_ISDIR(mode),
@@ -161,7 +161,7 @@ static struct combine_diff_path *path_appendnew(struct combine_diff_path *last,
 	memcpy(p->path + base->len, path, pathlen);
 	p->path[len] = 0;
 	p->mode = mode;
-	oidcpy(&p->oid, oid ? oid : &null_oid);
+	oidcpy(&p->oid, oid ? oid : null_oid());
 
 	return p;
 }
@@ -243,7 +243,7 @@ static struct combine_diff_path *emit_path(struct combine_diff_path *p,
 				mode_i = tp[i].entry.mode;
 			}
 			else {
-				oid_i = &null_oid;
+				oid_i = null_oid();
 				mode_i = 0;
 			}
 
@@ -434,6 +434,9 @@ static struct combine_diff_path *ll_diff_tree_paths(
 		if (diff_can_quit_early(opt))
 			break;
 
+		if (opt->max_changes && diff_queued_diff.nr > opt->max_changes)
+			break;
+
 		if (opt->pathspec.nr) {
 			skip_uninteresting(&t, base, opt);
 			for (i = 0; i < nparent; i++)
@@ -673,9 +676,9 @@ static void try_to_follow_renames(const struct object_id *old_oid,
 	q->nr = 1;
 }
 
-static int ll_diff_tree_oid(const struct object_id *old_oid,
-			    const struct object_id *new_oid,
-			    struct strbuf *base, struct diff_options *opt)
+static void ll_diff_tree_oid(const struct object_id *old_oid,
+			     const struct object_id *new_oid,
+			     struct strbuf *base, struct diff_options *opt)
 {
 	struct combine_diff_path phead, *p;
 	pathchange_fn_t pathchange_old = opt->pathchange;
@@ -691,29 +694,27 @@ static int ll_diff_tree_oid(const struct object_id *old_oid,
 	}
 
 	opt->pathchange = pathchange_old;
-	return 0;
 }
 
-int diff_tree_oid(const struct object_id *old_oid,
-		  const struct object_id *new_oid,
-		  const char *base_str, struct diff_options *opt)
+void diff_tree_oid(const struct object_id *old_oid,
+		   const struct object_id *new_oid,
+		   const char *base_str, struct diff_options *opt)
 {
 	struct strbuf base;
-	int retval;
 
 	strbuf_init(&base, PATH_MAX);
 	strbuf_addstr(&base, base_str);
 
-	retval = ll_diff_tree_oid(old_oid, new_oid, &base, opt);
+	ll_diff_tree_oid(old_oid, new_oid, &base, opt);
 	if (!*base_str && opt->flags.follow_renames && diff_might_be_rename())
 		try_to_follow_renames(old_oid, new_oid, &base, opt);
 
 	strbuf_release(&base);
-
-	return retval;
 }
 
-int diff_root_tree_oid(const struct object_id *new_oid, const char *base, struct diff_options *opt)
+void diff_root_tree_oid(const struct object_id *new_oid,
+			const char *base,
+			struct diff_options *opt)
 {
-	return diff_tree_oid(NULL, new_oid, base, opt);
+	diff_tree_oid(NULL, new_oid, base, opt);
 }
diff --git a/tree-walk.c b/tree-walk.c
index bea819d826..3a94959d64 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -1,10 +1,10 @@
 #include "cache.h"
 #include "tree-walk.h"
-#include "unpack-trees.h"
 #include "dir.h"
 #include "object-store.h"
 #include "tree.h"
 #include "pathspec.h"
+#include "json-writer.h"
 
 static const char *get_mode(const char *str, unsigned int *modep)
 {
@@ -49,7 +49,7 @@ static int decode_tree_entry(struct tree_desc *desc, const char *buf, unsigned l
 	desc->entry.path = path;
 	desc->entry.mode = canon_mode(mode);
 	desc->entry.pathlen = len - 1;
-	hashcpy(desc->entry.oid.hash, (const unsigned char *)path + len);
+	oidread(&desc->entry.oid, (const unsigned char *)path + len);
 
 	return 0;
 }
@@ -168,6 +168,25 @@ int tree_entry_gently(struct tree_desc *desc, struct name_entry *entry)
 	return 1;
 }
 
+static int traverse_trees_atexit_registered;
+static int traverse_trees_count;
+static int traverse_trees_cur_depth;
+static int traverse_trees_max_depth;
+
+static void trace2_traverse_trees_statistics_atexit(void)
+{
+	struct json_writer jw = JSON_WRITER_INIT;
+
+	jw_object_begin(&jw, 0);
+	jw_object_intmax(&jw, "traverse_trees_count", traverse_trees_count);
+	jw_object_intmax(&jw, "traverse_trees_max_depth", traverse_trees_max_depth);
+	jw_end(&jw);
+
+	trace2_data_json("traverse_trees", the_repository, "statistics", &jw);
+
+	jw_release(&jw);
+}
+
 void setup_traverse_info(struct traverse_info *info, const char *base)
 {
 	size_t pathlen = strlen(base);
@@ -181,6 +200,11 @@ void setup_traverse_info(struct traverse_info *info, const char *base)
 	info->namelen = pathlen;
 	if (pathlen)
 		info->prev = &dummy;
+
+	if (trace2_is_enabled() && !traverse_trees_atexit_registered) {
+		atexit(trace2_traverse_trees_statistics_atexit);
+		traverse_trees_atexit_registered = 1;
+	}
 }
 
 char *make_traverse_path(char *path, size_t pathlen,
@@ -410,15 +434,26 @@ int traverse_trees(struct index_state *istate,
 		   struct traverse_info *info)
 {
 	int error = 0;
-	struct name_entry *entry = xmalloc(n*sizeof(*entry));
+	struct name_entry entry[MAX_TRAVERSE_TREES];
 	int i;
-	struct tree_desc_x *tx = xcalloc(n, sizeof(*tx));
+	struct tree_desc_x tx[ARRAY_SIZE(entry)];
 	struct strbuf base = STRBUF_INIT;
 	int interesting = 1;
 	char *traverse_path;
 
-	for (i = 0; i < n; i++)
+	traverse_trees_count++;
+	traverse_trees_cur_depth++;
+
+	if (traverse_trees_cur_depth > traverse_trees_max_depth)
+		traverse_trees_max_depth = traverse_trees_cur_depth;
+
+	if (n >= ARRAY_SIZE(entry))
+		BUG("traverse_trees() called with too many trees (%d)", n);
+
+	for (i = 0; i < n; i++) {
 		tx[i].d = t[i];
+		tx[i].skip = NULL;
+	}
 
 	if (info->prev) {
 		strbuf_make_traverse_path(&base, info->prev,
@@ -506,13 +541,13 @@ int traverse_trees(struct index_state *istate,
 			if (mask & (1ul << i))
 				update_extended_entry(tx + i, entry + i);
 	}
-	free(entry);
 	for (i = 0; i < n; i++)
 		free_extended_entry(tx + i);
-	free(tx);
 	free(traverse_path);
 	info->traverse_path = NULL;
 	strbuf_release(&base);
+
+	traverse_trees_cur_depth--;
 	return error;
 }
 
@@ -849,7 +884,14 @@ static int match_entry(const struct pathspec_item *item,
 	if (matchlen > pathlen) {
 		if (match[pathlen] != '/')
 			return 0;
-		if (!S_ISDIR(entry->mode) && !S_ISGITLINK(entry->mode))
+		/*
+		 * Reject non-directories as partial pathnames, except
+		 * when match is a submodule with a trailing slash and
+		 * nothing else (to handle 'submod/' and 'submod'
+		 * uniformly).
+		 */
+		if (!S_ISDIR(entry->mode) &&
+		    (!S_ISGITLINK(entry->mode) || matchlen > pathlen + 1))
 			return 0;
 	}
 
@@ -1124,7 +1166,7 @@ match_wildcards:
 		 * later on.
 		 * max_depth is ignored but we may consider support it
 		 * in future, see
-		 * https://public-inbox.org/git/7vmxo5l2g4.fsf@alter.siamese.dyndns.org/
+		 * https://lore.kernel.org/git/7vmxo5l2g4.fsf@alter.siamese.dyndns.org/
 		 */
 		if (ps->recursive && S_ISDIR(entry->mode))
 			return entry_interesting;
diff --git a/tree-walk.h b/tree-walk.h
index abe2caf4e0..a5058469e9 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -3,6 +3,15 @@
 
 #include "cache.h"
 
+#define MAX_TRAVERSE_TREES 8
+
+/**
+ * The tree walking API is used to traverse and inspect trees.
+ */
+
+/**
+ * An entry in a tree. Each entry has a sha1 identifier, pathname, and mode.
+ */
 struct name_entry {
 	struct object_id oid;
 	const char *path;
@@ -10,12 +19,29 @@ struct name_entry {
 	unsigned int mode;
 };
 
+/**
+ * A semi-opaque data structure used to maintain the current state of the walk.
+ */
 struct tree_desc {
+	/*
+	 * pointer into the memory representation of the tree. It always
+	 * points at the current entry being visited.
+	 */
 	const void *buffer;
+
+	/* points to the current entry being visited. */
 	struct name_entry entry;
+
+	/* counts the number of bytes left in the `buffer`. */
 	unsigned int size;
 };
 
+/**
+ * Decode the entry currently being visited (the one pointed to by
+ * `tree_desc's` `entry` member) and return the sha1 of the entry. The
+ * `pathp` and `modep` arguments are set to the entry's pathname and mode
+ * respectively.
+ */
 static inline const struct object_id *tree_entry_extract(struct tree_desc *desc, const char **pathp, unsigned short *modep)
 {
 	*pathp = desc->entry.path;
@@ -23,6 +49,11 @@ static inline const struct object_id *tree_entry_extract(struct tree_desc *desc,
 	return &desc->entry.oid;
 }
 
+/**
+ * Calculate the length of a tree entry's pathname. This utilizes the
+ * memory structure of a tree entry to avoid the overhead of using a
+ * generic strlen().
+ */
 static inline int tree_entry_len(const struct name_entry *ne)
 {
 	return ne->pathlen;
@@ -33,52 +64,141 @@ static inline int tree_entry_len(const struct name_entry *ne)
  * corrupt tree entry rather than dying,
  */
 
+/**
+ * Walk to the next entry in a tree. This is commonly used in conjunction
+ * with `tree_entry_extract` to inspect the current entry.
+ */
 void update_tree_entry(struct tree_desc *);
+
 int update_tree_entry_gently(struct tree_desc *);
+
+/**
+ * Initialize a `tree_desc` and decode its first entry. The buffer and
+ * size parameters are assumed to be the same as the buffer and size
+ * members of `struct tree`.
+ */
 void init_tree_desc(struct tree_desc *desc, const void *buf, unsigned long size);
+
 int init_tree_desc_gently(struct tree_desc *desc, const void *buf, unsigned long size);
 
 /*
- * Helper function that does both tree_entry_extract() and update_tree_entry()
- * and returns true for success
+ * Visit the next entry in a tree. Returns 1 when there are more entries
+ * left to visit and 0 when all entries have been visited. This is
+ * commonly used in the test of a while loop.
  */
 int tree_entry(struct tree_desc *, struct name_entry *);
+
 int tree_entry_gently(struct tree_desc *, struct name_entry *);
 
+/**
+ * Initialize a `tree_desc` and decode its first entry given the
+ * object ID of a tree. Returns the `buffer` member if the latter
+ * is a valid tree identifier and NULL otherwise.
+ */
 void *fill_tree_descriptor(struct repository *r,
 			   struct tree_desc *desc,
 			   const struct object_id *oid);
 
 struct traverse_info;
 typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
+
+/**
+ * Traverse `n` number of trees in parallel. The `fn` callback member of
+ * `traverse_info` is called once for each tree entry.
+ */
 int traverse_trees(struct index_state *istate, int n, struct tree_desc *t, struct traverse_info *info);
 
 enum get_oid_result get_tree_entry_follow_symlinks(struct repository *r, struct object_id *tree_oid, const char *name, struct object_id *result, struct strbuf *result_path, unsigned short *mode);
 
+/**
+ * A structure used to maintain the state of a traversal.
+ */
 struct traverse_info {
 	const char *traverse_path;
+
+	/*
+	 * points to the traverse_info which was used to descend into the
+	 * current tree. If this is the top-level tree `prev` will point to
+	 * a dummy traverse_info.
+	 */
 	struct traverse_info *prev;
+
+	/* is the entry for the current tree (if the tree is a subtree). */
 	const char *name;
+
 	size_t namelen;
 	unsigned mode;
 
+	/* is the length of the full path for the current tree. */
 	size_t pathlen;
+
 	struct pathspec *pathspec;
 
+	/* can be used by callbacks to maintain directory-file conflicts. */
 	unsigned long df_conflicts;
+
+	/* a callback called for each entry in the tree.
+	 *
+	 * The arguments passed to the traverse callback are as follows:
+	 *
+	 * - `n` counts the number of trees being traversed.
+	 *
+	 * - `mask` has its nth bit set if something exists in the nth entry.
+	 *
+	 * - `dirmask` has its nth bit set if the nth tree's entry is a directory.
+	 *
+	 * - `entry` is an array of size `n` where the nth entry is from the nth tree.
+	 *
+	 * - `info` maintains the state of the traversal.
+	 *
+	 * Returning a negative value will terminate the traversal. Otherwise the
+	 * return value is treated as an update mask. If the nth bit is set the nth tree
+	 * will be updated and if the bit is not set the nth tree entry will be the
+	 * same in the next callback invocation.
+	 */
 	traverse_callback_t fn;
+
+	/* can be anything the `fn` callback would want to use. */
 	void *data;
+
+	/* tells whether to stop at the first error or not. */
 	int show_all_errors;
 };
 
+/**
+ * Find an entry in a tree given a pathname and the sha1 of a tree to
+ * search. Returns 0 if the entry is found and -1 otherwise. The third
+ * and fourth parameters are set to the entry's sha1 and mode respectively.
+ */
 int get_tree_entry(struct repository *, const struct object_id *, const char *, struct object_id *, unsigned short *);
+
+/**
+ * Generate the full pathname of a tree entry based from the root of the
+ * traversal. For example, if the traversal has recursed into another
+ * tree named "bar" the pathname of an entry "baz" in the "bar"
+ * tree would be "bar/baz".
+ */
 char *make_traverse_path(char *path, size_t pathlen, const struct traverse_info *info,
 			 const char *name, size_t namelen);
+
+/**
+ * Convenience wrapper to `make_traverse_path` into a strbuf.
+ */
 void strbuf_make_traverse_path(struct strbuf *out,
 			       const struct traverse_info *info,
 			       const char *name, size_t namelen);
+
+/**
+ * Initialize a `traverse_info` given the pathname of the tree to start
+ * traversing from.
+ */
 void setup_traverse_info(struct traverse_info *info, const char *base);
 
+/**
+ * Calculate the length of a pathname returned by `make_traverse_path`.
+ * This utilizes the memory structure of a tree entry to avoid the
+ * overhead of using a generic strlen().
+ */
 static inline size_t traverse_path_len(const struct traverse_info *info,
 				       size_t namelen)
 {
diff --git a/tree.c b/tree.c
index 1466bcc6a8..410e3b477e 100644
--- a/tree.c
+++ b/tree.c
@@ -11,58 +11,10 @@
 
 const char *tree_type = "tree";
 
-static int read_one_entry_opt(struct index_state *istate,
-			      const struct object_id *oid,
-			      const char *base, int baselen,
-			      const char *pathname,
-			      unsigned mode, int stage, int opt)
-{
-	int len;
-	struct cache_entry *ce;
-
-	if (S_ISDIR(mode))
-		return READ_TREE_RECURSIVE;
-
-	len = strlen(pathname);
-	ce = make_empty_cache_entry(istate, baselen + len);
-
-	ce->ce_mode = create_ce_mode(mode);
-	ce->ce_flags = create_ce_flags(stage);
-	ce->ce_namelen = baselen + len;
-	memcpy(ce->name, base, baselen);
-	memcpy(ce->name + baselen, pathname, len+1);
-	oidcpy(&ce->oid, oid);
-	return add_index_entry(istate, ce, opt);
-}
-
-static int read_one_entry(const struct object_id *oid, struct strbuf *base,
-			  const char *pathname, unsigned mode, int stage,
-			  void *context)
-{
-	struct index_state *istate = context;
-	return read_one_entry_opt(istate, oid, base->buf, base->len, pathname,
-				  mode, stage,
-				  ADD_CACHE_OK_TO_ADD|ADD_CACHE_SKIP_DFCHECK);
-}
-
-/*
- * This is used when the caller knows there is no existing entries at
- * the stage that will conflict with the entry being added.
- */
-static int read_one_entry_quick(const struct object_id *oid, struct strbuf *base,
-				const char *pathname, unsigned mode, int stage,
-				void *context)
-{
-	struct index_state *istate = context;
-	return read_one_entry_opt(istate, oid, base->buf, base->len, pathname,
-				  mode, stage,
-				  ADD_CACHE_JUST_APPEND);
-}
-
-static int read_tree_1(struct repository *r,
-		       struct tree *tree, struct strbuf *base,
-		       int stage, const struct pathspec *pathspec,
-		       read_tree_fn_t fn, void *context)
+int read_tree_at(struct repository *r,
+		 struct tree *tree, struct strbuf *base,
+		 const struct pathspec *pathspec,
+		 read_tree_fn_t fn, void *context)
 {
 	struct tree_desc desc;
 	struct name_entry entry;
@@ -86,7 +38,7 @@ static int read_tree_1(struct repository *r,
 		}
 
 		switch (fn(&entry.oid, base,
-			   entry.path, entry.mode, stage, context)) {
+			   entry.path, entry.mode, context)) {
 		case 0:
 			continue;
 		case READ_TREE_RECURSIVE:
@@ -119,9 +71,9 @@ static int read_tree_1(struct repository *r,
 		len = tree_entry_len(&entry);
 		strbuf_add(base, entry.path, len);
 		strbuf_addch(base, '/');
-		retval = read_tree_1(r, lookup_tree(r, &oid),
-				     base, stage, pathspec,
-				     fn, context);
+		retval = read_tree_at(r, lookup_tree(r, &oid),
+				      base, pathspec,
+				      fn, context);
 		strbuf_setlen(base, oldlen);
 		if (retval)
 			return -1;
@@ -129,22 +81,18 @@ static int read_tree_1(struct repository *r,
 	return 0;
 }
 
-int read_tree_recursive(struct repository *r,
-			struct tree *tree,
-			const char *base, int baselen,
-			int stage, const struct pathspec *pathspec,
-			read_tree_fn_t fn, void *context)
+int read_tree(struct repository *r,
+	      struct tree *tree,
+	      const struct pathspec *pathspec,
+	      read_tree_fn_t fn, void *context)
 {
 	struct strbuf sb = STRBUF_INIT;
-	int ret;
-
-	strbuf_add(&sb, base, baselen);
-	ret = read_tree_1(r, tree, &sb, stage, pathspec, fn, context);
+	int ret = read_tree_at(r, tree, &sb, pathspec, fn, context);
 	strbuf_release(&sb);
 	return ret;
 }
 
-static int cmp_cache_name_compare(const void *a_, const void *b_)
+int cmp_cache_name_compare(const void *a_, const void *b_)
 {
 	const struct cache_entry *ce1, *ce2;
 
@@ -154,53 +102,12 @@ static int cmp_cache_name_compare(const void *a_, const void *b_)
 				  ce2->name, ce2->ce_namelen, ce_stage(ce2));
 }
 
-int read_tree(struct repository *r, struct tree *tree, int stage,
-	      struct pathspec *match, struct index_state *istate)
-{
-	read_tree_fn_t fn = NULL;
-	int i, err;
-
-	/*
-	 * Currently the only existing callers of this function all
-	 * call it with stage=1 and after making sure there is nothing
-	 * at that stage; we could always use read_one_entry_quick().
-	 *
-	 * But when we decide to straighten out git-read-tree not to
-	 * use unpack_trees() in some cases, this will probably start
-	 * to matter.
-	 */
-
-	/*
-	 * See if we have cache entry at the stage.  If so,
-	 * do it the original slow way, otherwise, append and then
-	 * sort at the end.
-	 */
-	for (i = 0; !fn && i < istate->cache_nr; i++) {
-		const struct cache_entry *ce = istate->cache[i];
-		if (ce_stage(ce) == stage)
-			fn = read_one_entry;
-	}
-
-	if (!fn)
-		fn = read_one_entry_quick;
-	err = read_tree_recursive(r, tree, "", 0, stage, match, fn, istate);
-	if (fn == read_one_entry || err)
-		return err;
-
-	/*
-	 * Sort the cache entry -- we need to nuke the cache tree, though.
-	 */
-	cache_tree_free(&istate->cache_tree);
-	QSORT(istate->cache, istate->cache_nr, cmp_cache_name_compare);
-	return 0;
-}
-
 struct tree *lookup_tree(struct repository *r, const struct object_id *oid)
 {
 	struct object *obj = lookup_object(r, oid);
 	if (!obj)
 		return create_object(r, oid, alloc_tree_node(r));
-	return object_as_type(r, obj, OBJ_TREE, 0);
+	return object_as_type(obj, OBJ_TREE, 0);
 }
 
 int parse_tree_buffer(struct tree *item, void *buffer, unsigned long size)
diff --git a/tree.h b/tree.h
index 9383745073..6efff003e2 100644
--- a/tree.h
+++ b/tree.h
@@ -28,17 +28,19 @@ void free_tree_buffer(struct tree *tree);
 /* Parses and returns the tree in the given ent, chasing tags and commits. */
 struct tree *parse_tree_indirect(const struct object_id *oid);
 
+int cmp_cache_name_compare(const void *a_, const void *b_);
+
 #define READ_TREE_RECURSIVE 1
-typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, int, void *);
+typedef int (*read_tree_fn_t)(const struct object_id *, struct strbuf *, const char *, unsigned int, void *);
 
-int read_tree_recursive(struct repository *r,
-			struct tree *tree,
-			const char *base, int baselen,
-			int stage, const struct pathspec *pathspec,
-			read_tree_fn_t fn, void *context);
+int read_tree_at(struct repository *r,
+		 struct tree *tree, struct strbuf *base,
+		 const struct pathspec *pathspec,
+		 read_tree_fn_t fn, void *context);
 
-int read_tree(struct repository *r, struct tree *tree,
-	      int stage, struct pathspec *pathspec,
-	      struct index_state *istate);
+int read_tree(struct repository *r,
+	      struct tree *tree,
+	      const struct pathspec *pathspec,
+	      read_tree_fn_t fn, void *context);
 
 #endif /* TREE_H */
diff --git a/unicode-width.h b/unicode-width.h
index c9d027625d..b50e686bae 100644
--- a/unicode-width.h
+++ b/unicode-width.h
@@ -59,7 +59,7 @@ static const struct interval zero_width[] = {
 { 0x0B3F, 0x0B3F },
 { 0x0B41, 0x0B44 },
 { 0x0B4D, 0x0B4D },
-{ 0x0B56, 0x0B56 },
+{ 0x0B55, 0x0B56 },
 { 0x0B62, 0x0B63 },
 { 0x0B82, 0x0B82 },
 { 0x0BC0, 0x0BC0 },
@@ -82,6 +82,7 @@ static const struct interval zero_width[] = {
 { 0x0D41, 0x0D44 },
 { 0x0D4D, 0x0D4D },
 { 0x0D62, 0x0D63 },
+{ 0x0D81, 0x0D81 },
 { 0x0DCA, 0x0DCA },
 { 0x0DD2, 0x0DD4 },
 { 0x0DD6, 0x0DD6 },
@@ -139,7 +140,7 @@ static const struct interval zero_width[] = {
 { 0x1A65, 0x1A6C },
 { 0x1A73, 0x1A7C },
 { 0x1A7F, 0x1A7F },
-{ 0x1AB0, 0x1ABE },
+{ 0x1AB0, 0x1AC0 },
 { 0x1B00, 0x1B03 },
 { 0x1B34, 0x1B34 },
 { 0x1B36, 0x1B3A },
@@ -182,6 +183,7 @@ static const struct interval zero_width[] = {
 { 0xA806, 0xA806 },
 { 0xA80B, 0xA80B },
 { 0xA825, 0xA826 },
+{ 0xA82C, 0xA82C },
 { 0xA8C4, 0xA8C5 },
 { 0xA8E0, 0xA8F1 },
 { 0xA8FF, 0xA8FF },
@@ -223,6 +225,7 @@ static const struct interval zero_width[] = {
 { 0x10A3F, 0x10A3F },
 { 0x10AE5, 0x10AE6 },
 { 0x10D24, 0x10D27 },
+{ 0x10EAB, 0x10EAC },
 { 0x10F46, 0x10F50 },
 { 0x11001, 0x11001 },
 { 0x11038, 0x11046 },
@@ -238,6 +241,7 @@ static const struct interval zero_width[] = {
 { 0x11180, 0x11181 },
 { 0x111B6, 0x111BE },
 { 0x111C9, 0x111CC },
+{ 0x111CF, 0x111CF },
 { 0x1122F, 0x11231 },
 { 0x11234, 0x11234 },
 { 0x11236, 0x11237 },
@@ -273,6 +277,9 @@ static const struct interval zero_width[] = {
 { 0x11727, 0x1172B },
 { 0x1182F, 0x11837 },
 { 0x11839, 0x1183A },
+{ 0x1193B, 0x1193C },
+{ 0x1193E, 0x1193E },
+{ 0x11943, 0x11943 },
 { 0x119D4, 0x119D7 },
 { 0x119DA, 0x119DB },
 { 0x119E0, 0x119E0 },
@@ -305,6 +312,7 @@ static const struct interval zero_width[] = {
 { 0x16B30, 0x16B36 },
 { 0x16F4F, 0x16F4F },
 { 0x16F8F, 0x16F92 },
+{ 0x16FE4, 0x16FE4 },
 { 0x1BC9D, 0x1BC9E },
 { 0x1BCA0, 0x1BCA3 },
 { 0x1D167, 0x1D169 },
@@ -376,8 +384,7 @@ static const struct interval double_width[] = {
 { 0x3099, 0x30FF },
 { 0x3105, 0x312F },
 { 0x3131, 0x318E },
-{ 0x3190, 0x31BA },
-{ 0x31C0, 0x31E3 },
+{ 0x3190, 0x31E3 },
 { 0x31F0, 0x321E },
 { 0x3220, 0x3247 },
 { 0x3250, 0x4DBF },
@@ -392,9 +399,11 @@ static const struct interval double_width[] = {
 { 0xFE68, 0xFE6B },
 { 0xFF01, 0xFF60 },
 { 0xFFE0, 0xFFE6 },
-{ 0x16FE0, 0x16FE3 },
+{ 0x16FE0, 0x16FE4 },
+{ 0x16FF0, 0x16FF1 },
 { 0x17000, 0x187F7 },
-{ 0x18800, 0x18AF2 },
+{ 0x18800, 0x18CD5 },
+{ 0x18D00, 0x18D08 },
 { 0x1B000, 0x1B11E },
 { 0x1B150, 0x1B152 },
 { 0x1B164, 0x1B167 },
@@ -429,20 +438,22 @@ static const struct interval double_width[] = {
 { 0x1F680, 0x1F6C5 },
 { 0x1F6CC, 0x1F6CC },
 { 0x1F6D0, 0x1F6D2 },
-{ 0x1F6D5, 0x1F6D5 },
+{ 0x1F6D5, 0x1F6D7 },
 { 0x1F6EB, 0x1F6EC },
-{ 0x1F6F4, 0x1F6FA },
+{ 0x1F6F4, 0x1F6FC },
 { 0x1F7E0, 0x1F7EB },
-{ 0x1F90D, 0x1F971 },
-{ 0x1F973, 0x1F976 },
-{ 0x1F97A, 0x1F9A2 },
-{ 0x1F9A5, 0x1F9AA },
-{ 0x1F9AE, 0x1F9CA },
+{ 0x1F90C, 0x1F93A },
+{ 0x1F93C, 0x1F945 },
+{ 0x1F947, 0x1F978 },
+{ 0x1F97A, 0x1F9CB },
 { 0x1F9CD, 0x1F9FF },
-{ 0x1FA70, 0x1FA73 },
+{ 0x1FA70, 0x1FA74 },
 { 0x1FA78, 0x1FA7A },
-{ 0x1FA80, 0x1FA82 },
-{ 0x1FA90, 0x1FA95 },
+{ 0x1FA80, 0x1FA86 },
+{ 0x1FA90, 0x1FAA8 },
+{ 0x1FAB0, 0x1FAB6 },
+{ 0x1FAC0, 0x1FAC2 },
+{ 0x1FAD0, 0x1FAD6 },
 { 0x20000, 0x2FFFD },
 { 0x30000, 0x3FFFD }
 };
diff --git a/unix-socket.c b/unix-socket.c
index 19ed48be99..e0be1badb5 100644
--- a/unix-socket.c
+++ b/unix-socket.c
@@ -1,13 +1,7 @@
 #include "cache.h"
 #include "unix-socket.h"
 
-static int unix_stream_socket(void)
-{
-	int fd = socket(AF_UNIX, SOCK_STREAM, 0);
-	if (fd < 0)
-		die_errno("unable to create socket");
-	return fd;
-}
+#define DEFAULT_UNIX_STREAM_LISTEN_BACKLOG (5)
 
 static int chdir_len(const char *orig, int len)
 {
@@ -36,16 +30,23 @@ static void unix_sockaddr_cleanup(struct unix_sockaddr_context *ctx)
 }
 
 static int unix_sockaddr_init(struct sockaddr_un *sa, const char *path,
-			      struct unix_sockaddr_context *ctx)
+			      struct unix_sockaddr_context *ctx,
+			      int disallow_chdir)
 {
 	int size = strlen(path) + 1;
 
 	ctx->orig_dir = NULL;
 	if (size > sizeof(sa->sun_path)) {
-		const char *slash = find_last_dir_sep(path);
+		const char *slash;
 		const char *dir;
 		struct strbuf cwd = STRBUF_INIT;
 
+		if (disallow_chdir) {
+			errno = ENAMETOOLONG;
+			return -1;
+		}
+
+		slash = find_last_dir_sep(path);
 		if (!slash) {
 			errno = ENAMETOOLONG;
 			return -1;
@@ -71,15 +72,18 @@ static int unix_sockaddr_init(struct sockaddr_un *sa, const char *path,
 	return 0;
 }
 
-int unix_stream_connect(const char *path)
+int unix_stream_connect(const char *path, int disallow_chdir)
 {
-	int fd, saved_errno;
+	int fd = -1, saved_errno;
 	struct sockaddr_un sa;
 	struct unix_sockaddr_context ctx;
 
-	if (unix_sockaddr_init(&sa, path, &ctx) < 0)
+	if (unix_sockaddr_init(&sa, path, &ctx, disallow_chdir) < 0)
 		return -1;
-	fd = unix_stream_socket();
+	fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (fd < 0)
+		goto fail;
+
 	if (connect(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0)
 		goto fail;
 	unix_sockaddr_cleanup(&ctx);
@@ -87,28 +91,36 @@ int unix_stream_connect(const char *path)
 
 fail:
 	saved_errno = errno;
+	if (fd != -1)
+		close(fd);
 	unix_sockaddr_cleanup(&ctx);
-	close(fd);
 	errno = saved_errno;
 	return -1;
 }
 
-int unix_stream_listen(const char *path)
+int unix_stream_listen(const char *path,
+		       const struct unix_stream_listen_opts *opts)
 {
-	int fd, saved_errno;
+	int fd = -1, saved_errno;
+	int backlog;
 	struct sockaddr_un sa;
 	struct unix_sockaddr_context ctx;
 
 	unlink(path);
 
-	if (unix_sockaddr_init(&sa, path, &ctx) < 0)
+	if (unix_sockaddr_init(&sa, path, &ctx, opts->disallow_chdir) < 0)
 		return -1;
-	fd = unix_stream_socket();
+	fd = socket(AF_UNIX, SOCK_STREAM, 0);
+	if (fd < 0)
+		goto fail;
 
 	if (bind(fd, (struct sockaddr *)&sa, sizeof(sa)) < 0)
 		goto fail;
 
-	if (listen(fd, 5) < 0)
+	backlog = opts->listen_backlog_size;
+	if (backlog <= 0)
+		backlog = DEFAULT_UNIX_STREAM_LISTEN_BACKLOG;
+	if (listen(fd, backlog) < 0)
 		goto fail;
 
 	unix_sockaddr_cleanup(&ctx);
@@ -116,8 +128,9 @@ int unix_stream_listen(const char *path)
 
 fail:
 	saved_errno = errno;
+	if (fd != -1)
+		close(fd);
 	unix_sockaddr_cleanup(&ctx);
-	close(fd);
 	errno = saved_errno;
 	return -1;
 }
diff --git a/unix-socket.h b/unix-socket.h
index e271aeec5a..8542cdd799 100644
--- a/unix-socket.h
+++ b/unix-socket.h
@@ -1,7 +1,15 @@
 #ifndef UNIX_SOCKET_H
 #define UNIX_SOCKET_H
 
-int unix_stream_connect(const char *path);
-int unix_stream_listen(const char *path);
+struct unix_stream_listen_opts {
+	int listen_backlog_size;
+	unsigned int disallow_chdir:1;
+};
+
+#define UNIX_STREAM_LISTEN_OPTS_INIT { 0 }
+
+int unix_stream_connect(const char *path, int disallow_chdir);
+int unix_stream_listen(const char *path,
+		       const struct unix_stream_listen_opts *opts);
 
 #endif /* UNIX_SOCKET_H */
diff --git a/unix-stream-server.c b/unix-stream-server.c
new file mode 100644
index 0000000000..efa2a207ab
--- /dev/null
+++ b/unix-stream-server.c
@@ -0,0 +1,125 @@
+#include "cache.h"
+#include "lockfile.h"
+#include "unix-socket.h"
+#include "unix-stream-server.h"
+
+#define DEFAULT_LOCK_TIMEOUT (100)
+
+/*
+ * Try to connect to a unix domain socket at `path` (if it exists) and
+ * see if there is a server listening.
+ *
+ * We don't know if the socket exists, whether a server died and
+ * failed to cleanup, or whether we have a live server listening, so
+ * we "poke" it.
+ *
+ * We immediately hangup without sending/receiving any data because we
+ * don't know anything about the protocol spoken and don't want to
+ * block while writing/reading data.  It is sufficient to just know
+ * that someone is listening.
+ */
+static int is_another_server_alive(const char *path,
+				   const struct unix_stream_listen_opts *opts)
+{
+	int fd = unix_stream_connect(path, opts->disallow_chdir);
+	if (fd >= 0) {
+		close(fd);
+		return 1;
+	}
+
+	return 0;
+}
+
+int unix_ss_create(const char *path,
+		   const struct unix_stream_listen_opts *opts,
+		   long timeout_ms,
+		   struct unix_ss_socket **new_server_socket)
+{
+	struct lock_file lock = LOCK_INIT;
+	int fd_socket;
+	struct unix_ss_socket *server_socket;
+
+	*new_server_socket = NULL;
+
+	if (timeout_ms < 0)
+		timeout_ms = DEFAULT_LOCK_TIMEOUT;
+
+	/*
+	 * Create a lock at "<path>.lock" if we can.
+	 */
+	if (hold_lock_file_for_update_timeout(&lock, path, 0, timeout_ms) < 0)
+		return -1;
+
+	/*
+	 * If another server is listening on "<path>" give up.  We do not
+	 * want to create a socket and steal future connections from them.
+	 */
+	if (is_another_server_alive(path, opts)) {
+		rollback_lock_file(&lock);
+		errno = EADDRINUSE;
+		return -2;
+	}
+
+	/*
+	 * Create and bind to a Unix domain socket at "<path>".
+	 */
+	fd_socket = unix_stream_listen(path, opts);
+	if (fd_socket < 0) {
+		int saved_errno = errno;
+		rollback_lock_file(&lock);
+		errno = saved_errno;
+		return -1;
+	}
+
+	server_socket = xcalloc(1, sizeof(*server_socket));
+	server_socket->path_socket = strdup(path);
+	server_socket->fd_socket = fd_socket;
+	lstat(path, &server_socket->st_socket);
+
+	*new_server_socket = server_socket;
+
+	/*
+	 * Always rollback (just delete) "<path>.lock" because we already created
+	 * "<path>" as a socket and do not want to commit_lock to do the atomic
+	 * rename trick.
+	 */
+	rollback_lock_file(&lock);
+
+	return 0;
+}
+
+void unix_ss_free(struct unix_ss_socket *server_socket)
+{
+	if (!server_socket)
+		return;
+
+	if (server_socket->fd_socket >= 0) {
+		if (!unix_ss_was_stolen(server_socket))
+			unlink(server_socket->path_socket);
+		close(server_socket->fd_socket);
+	}
+
+	free(server_socket->path_socket);
+	free(server_socket);
+}
+
+int unix_ss_was_stolen(struct unix_ss_socket *server_socket)
+{
+	struct stat st_now;
+
+	if (!server_socket)
+		return 0;
+
+	if (lstat(server_socket->path_socket, &st_now) == -1)
+		return 1;
+
+	if (st_now.st_ino != server_socket->st_socket.st_ino)
+		return 1;
+	if (st_now.st_dev != server_socket->st_socket.st_dev)
+		return 1;
+
+	if (!S_ISSOCK(st_now.st_mode))
+		return 1;
+
+	return 0;
+}
diff --git a/unix-stream-server.h b/unix-stream-server.h
new file mode 100644
index 0000000000..ae2712ba39
--- /dev/null
+++ b/unix-stream-server.h
@@ -0,0 +1,33 @@
+#ifndef UNIX_STREAM_SERVER_H
+#define UNIX_STREAM_SERVER_H
+
+#include "unix-socket.h"
+
+struct unix_ss_socket {
+	char *path_socket;
+	struct stat st_socket;
+	int fd_socket;
+};
+
+/*
+ * Create a Unix Domain Socket at the given path under the protection
+ * of a '.lock' lockfile.
+ *
+ * Returns 0 on success, -1 on error, -2 if socket is in use.
+ */
+int unix_ss_create(const char *path,
+		   const struct unix_stream_listen_opts *opts,
+		   long timeout_ms,
+		   struct unix_ss_socket **server_socket);
+
+/*
+ * Close and delete the socket.
+ */
+void unix_ss_free(struct unix_ss_socket *server_socket);
+
+/*
+ * Return 1 if the inode of the pathname to our socket changes.
+ */
+int unix_ss_was_stolen(struct unix_ss_socket *server_socket);
+
+#endif /* UNIX_STREAM_SERVER_H */
diff --git a/unpack-trees.c b/unpack-trees.c
index 33ea7810d8..f07304f1b7 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1,5 +1,5 @@
 #include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "repository.h"
 #include "config.h"
 #include "dir.h"
@@ -16,6 +16,8 @@
 #include "fsmonitor.h"
 #include "object-store.h"
 #include "promisor-remote.h"
+#include "entry.h"
+#include "parallel-checkout.h"
 
 /*
  * Error messages expected by scripts out of plumbing commands such as
@@ -24,7 +26,7 @@
  * situation better.  See how "git checkout" and "git merge" replaces
  * them using setup_unpack_trees_porcelain(), for example.
  */
-static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
+static const char *unpack_plumbing_errors[NB_UNPACK_TREES_WARNING_TYPES] = {
 	/* ERROR_WOULD_OVERWRITE */
 	"Entry '%s' would be overwritten by merge. Cannot merge.",
 
@@ -43,17 +45,20 @@ static const char *unpack_plumbing_errors[NB_UNPACK_TREES_ERROR_TYPES] = {
 	/* ERROR_BIND_OVERLAP */
 	"Entry '%s' overlaps with '%s'.  Cannot bind.",
 
-	/* ERROR_SPARSE_NOT_UPTODATE_FILE */
-	"Entry '%s' not uptodate. Cannot update sparse checkout.",
+	/* ERROR_WOULD_LOSE_SUBMODULE */
+	"Submodule '%s' cannot checkout new HEAD.",
 
-	/* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
-	"Working tree file '%s' would be overwritten by sparse checkout update.",
+	/* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */
+	"",
 
-	/* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
-	"Working tree file '%s' would be removed by sparse checkout update.",
+	/* WARNING_SPARSE_NOT_UPTODATE_FILE */
+	"Path '%s' not uptodate; will not remove from working tree.",
 
-	/* ERROR_WOULD_LOSE_SUBMODULE */
-	"Submodule '%s' cannot checkout new HEAD.",
+	/* WARNING_SPARSE_UNMERGED_FILE */
+	"Path '%s' unmerged; will not remove from working tree.",
+
+	/* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */
+	"Path '%s' already present; will not overwrite with sparse update.",
 };
 
 #define ERRORMSG(o,type) \
@@ -103,7 +108,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 	const char **msgs = opts->msgs;
 	const char *msg;
 
-	argv_array_init(&opts->msgs_to_free);
+	strvec_init(&opts->msgs_to_free);
 
 	if (!strcmp(cmd, "checkout"))
 		msg = advice_commit_before_merge
@@ -121,7 +126,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 			  "Please commit your changes or stash them before you %s.")
 		      : _("Your local changes to the following files would be overwritten by %s:\n%%s");
 	msgs[ERROR_WOULD_OVERWRITE] = msgs[ERROR_NOT_UPTODATE_FILE] =
-		argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd);
+		strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd);
 
 	msgs[ERROR_NOT_UPTODATE_DIR] =
 		_("Updating the following directories would lose untracked files in them:\n%s");
@@ -142,7 +147,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 			  "Please move or remove them before you %s.")
 		      : _("The following untracked working tree files would be removed by %s:\n%%s");
 	msgs[ERROR_WOULD_LOSE_UNTRACKED_REMOVED] =
-		argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd);
+		strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd);
 
 	if (!strcmp(cmd, "checkout"))
 		msg = advice_commit_before_merge
@@ -160,7 +165,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 			  "Please move or remove them before you %s.")
 		      : _("The following untracked working tree files would be overwritten by %s:\n%%s");
 	msgs[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN] =
-		argv_array_pushf(&opts->msgs_to_free, msg, cmd, cmd);
+		strvec_pushf(&opts->msgs_to_free, msg, cmd, cmd);
 
 	/*
 	 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
@@ -168,15 +173,16 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 	 */
 	msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'.  Cannot bind.");
 
-	msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
-		_("Cannot update sparse checkout: the following entries are not up to date:\n%s");
-	msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
-		_("The following working tree files would be overwritten by sparse checkout update:\n%s");
-	msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
-		_("The following working tree files would be removed by sparse checkout update:\n%s");
 	msgs[ERROR_WOULD_LOSE_SUBMODULE] =
 		_("Cannot update submodule:\n%s");
 
+	msgs[WARNING_SPARSE_NOT_UPTODATE_FILE] =
+		_("The following paths are not up to date and were left despite sparse patterns:\n%s");
+	msgs[WARNING_SPARSE_UNMERGED_FILE] =
+		_("The following paths are unmerged and were left despite sparse patterns:\n%s");
+	msgs[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN] =
+		_("The following paths were already present and thus not updated despite sparse patterns:\n%s");
+
 	opts->show_all_errors = 1;
 	/* rejected paths may not have a static buffer */
 	for (i = 0; i < ARRAY_SIZE(opts->unpack_rejects); i++)
@@ -185,7 +191,7 @@ void setup_unpack_trees_porcelain(struct unpack_trees_options *opts,
 
 void clear_unpack_trees_porcelain(struct unpack_trees_options *opts)
 {
-	argv_array_clear(&opts->msgs_to_free);
+	strvec_clear(&opts->msgs_to_free);
 	memset(opts->msgs, 0, sizeof(opts->msgs));
 }
 
@@ -226,7 +232,7 @@ static int add_rejected_path(struct unpack_trees_options *o,
 
 	/*
 	 * Otherwise, insert in a list for future display by
-	 * display_error_msgs()
+	 * display_(error|warning)_msgs()
 	 */
 	string_list_append(&o->unpack_rejects[e], path);
 	return -1;
@@ -237,13 +243,16 @@ static int add_rejected_path(struct unpack_trees_options *o,
  */
 static void display_error_msgs(struct unpack_trees_options *o)
 {
-	int e, i;
-	int something_displayed = 0;
+	int e;
+	unsigned error_displayed = 0;
 	for (e = 0; e < NB_UNPACK_TREES_ERROR_TYPES; e++) {
 		struct string_list *rejects = &o->unpack_rejects[e];
+
 		if (rejects->nr > 0) {
+			int i;
 			struct strbuf path = STRBUF_INIT;
-			something_displayed = 1;
+
+			error_displayed = 1;
 			for (i = 0; i < rejects->nr; i++)
 				strbuf_addf(&path, "\t%s\n", rejects->items[i].string);
 			error(ERRORMSG(o, e), super_prefixed(path.buf));
@@ -251,10 +260,36 @@ static void display_error_msgs(struct unpack_trees_options *o)
 		}
 		string_list_clear(rejects, 0);
 	}
-	if (something_displayed)
+	if (error_displayed)
 		fprintf(stderr, _("Aborting\n"));
 }
 
+/*
+ * display all the warning messages stored in a nice way
+ */
+static void display_warning_msgs(struct unpack_trees_options *o)
+{
+	int e;
+	unsigned warning_displayed = 0;
+	for (e = NB_UNPACK_TREES_ERROR_TYPES + 1;
+	     e < NB_UNPACK_TREES_WARNING_TYPES; e++) {
+		struct string_list *rejects = &o->unpack_rejects[e];
+
+		if (rejects->nr > 0) {
+			int i;
+			struct strbuf path = STRBUF_INIT;
+
+			warning_displayed = 1;
+			for (i = 0; i < rejects->nr; i++)
+				strbuf_addf(&path, "\t%s\n", rejects->items[i].string);
+			warning(ERRORMSG(o, e), super_prefixed(path.buf));
+			strbuf_release(&path);
+		}
+		string_list_clear(rejects, 0);
+	}
+	if (warning_displayed)
+		fprintf(stderr, _("After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n"));
+}
 static int check_submodule_move_head(const struct cache_entry *ce,
 				     const char *old_id,
 				     const char *new_id,
@@ -275,9 +310,9 @@ static int check_submodule_move_head(const struct cache_entry *ce,
 }
 
 /*
- * Preform the loading of the repository's gitmodules file.  This function is
+ * Perform the loading of the repository's gitmodules file.  This function is
  * used by 'check_update()' to perform loading of the gitmodules file in two
- * differnt situations:
+ * different situations:
  * (1) before removing entries from the working tree if the gitmodules file has
  *     been marked for removal.  This situation is specified by 'state' == NULL.
  * (2) before checking out entries to the working tree if the gitmodules file
@@ -291,19 +326,19 @@ static void load_gitmodules_file(struct index_state *index,
 	if (pos >= 0) {
 		struct cache_entry *ce = index->cache[pos];
 		if (!state && ce->ce_flags & CE_WT_REMOVE) {
-			repo_read_gitmodules(the_repository);
+			repo_read_gitmodules(the_repository, 0);
 		} else if (state && (ce->ce_flags & CE_UPDATE)) {
 			submodule_free(the_repository);
 			checkout_entry(ce, state, NULL, NULL);
-			repo_read_gitmodules(the_repository);
+			repo_read_gitmodules(the_repository, 0);
 		}
 	}
 }
 
-static struct progress *get_progress(struct unpack_trees_options *o)
+static struct progress *get_progress(struct unpack_trees_options *o,
+				     struct index_state *index)
 {
 	unsigned cnt = 0, total = 0;
-	struct index_state *index = &o->result;
 
 	if (!o->update || !o->verbose_update)
 		return NULL;
@@ -357,30 +392,44 @@ static void report_collided_checkout(struct index_state *index)
 	string_list_clear(&list, 0);
 }
 
-static int check_updates(struct unpack_trees_options *o)
+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)
 {
 	unsigned cnt = 0;
 	int errs = 0;
 	struct progress *progress;
-	struct index_state *index = &o->result;
 	struct checkout state = CHECKOUT_INIT;
-	int i;
+	int i, pc_workers, pc_threshold;
 
 	trace_performance_enter();
 	state.force = 1;
 	state.quiet = 1;
 	state.refresh_cache = 1;
 	state.istate = index;
+	clone_checkout_metadata(&state.meta, &o->meta, NULL);
+
+	if (!o->update || o->dry_run) {
+		remove_marked_cache_entries(index, 0);
+		trace_performance_leave("check_updates");
+		return 0;
+	}
 
 	if (o->clone)
 		setup_collided_checkout_detection(&state, index);
 
-	progress = get_progress(o);
+	progress = get_progress(o, index);
+
+	/* Start with clean cache to avoid using any possibly outdated info. */
+	invalidate_lstat_cache();
 
-	if (o->update)
-		git_attr_set_direction(GIT_ATTR_CHECKOUT);
+	git_attr_set_direction(GIT_ATTR_CHECKOUT);
 
-	if (should_update_submodules() && o->update && !o->dry_run)
+	if (should_update_submodules())
 		load_gitmodules_file(index, NULL);
 
 	for (i = 0; i < index->cache_nr; i++) {
@@ -388,58 +437,50 @@ static int check_updates(struct unpack_trees_options *o)
 
 		if (ce->ce_flags & CE_WT_REMOVE) {
 			display_progress(progress, ++cnt);
-			if (o->update && !o->dry_run)
-				unlink_entry(ce);
+			unlink_entry(ce);
 		}
 	}
+
 	remove_marked_cache_entries(index, 0);
 	remove_scheduled_dirs();
 
-	if (should_update_submodules() && o->update && !o->dry_run)
+	if (should_update_submodules())
 		load_gitmodules_file(index, &state);
 
-	enable_delayed_checkout(&state);
-	if (has_promisor_remote() && o->update && !o->dry_run) {
+	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];
+		prefetch_cache_entries(index, must_checkout);
 
-			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);
-		}
-		if (to_fetch.nr)
-			promisor_remote_get_direct(the_repository,
-						   to_fetch.oid, to_fetch.nr);
-		oid_array_clear(&to_fetch);
-	}
+	get_parallel_checkout_configs(&pc_workers, &pc_threshold);
+
+	enable_delayed_checkout(&state);
+	if (pc_workers > 1)
+		init_parallel_checkout();
 	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)
 				BUG("both update and delete flags are set on %s",
 				    ce->name);
-			display_progress(progress, ++cnt);
 			ce->ce_flags &= ~CE_UPDATE;
-			if (o->update && !o->dry_run) {
-				errs |= checkout_entry(ce, &state, NULL, NULL);
-			}
+			errs |= checkout_entry(ce, &state, NULL, NULL);
+
+			if (last_pc_queue_size == pc_queue_size())
+				display_progress(progress, ++cnt);
 		}
 	}
+	if (pc_workers > 1)
+		errs |= run_parallel_checkout(&state, pc_workers, pc_threshold,
+					      progress, &cnt);
 	stop_progress(&progress);
-	errs |= finish_delayed_checkout(&state, NULL);
-	if (o->update)
-		git_attr_set_direction(GIT_ATTR_CHECKIN);
+	errs |= finish_delayed_checkout(&state, NULL, o->verbose_update);
+	git_attr_set_direction(GIT_ATTR_CHECKIN);
 
 	if (o->clone)
 		report_collided_checkout(index);
@@ -502,19 +543,39 @@ static int apply_sparse_checkout(struct index_state *istate,
 		 * also stat info may have lost after merged_entry() so calling
 		 * verify_uptodate() again may fail
 		 */
-		if (!(ce->ce_flags & CE_UPDATE) && verify_uptodate_sparse(ce, o))
+		if (!(ce->ce_flags & CE_UPDATE) &&
+		    verify_uptodate_sparse(ce, o)) {
+			ce->ce_flags &= ~CE_SKIP_WORKTREE;
 			return -1;
+		}
 		ce->ce_flags |= CE_WT_REMOVE;
 		ce->ce_flags &= ~CE_UPDATE;
 	}
 	if (was_skip_worktree && !ce_skip_worktree(ce)) {
-		if (verify_absent_sparse(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o))
+		if (verify_absent_sparse(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o))
 			return -1;
 		ce->ce_flags |= CE_UPDATE;
 	}
 	return 0;
 }
 
+static int warn_conflicted_path(struct index_state *istate,
+				int i,
+				struct unpack_trees_options *o)
+{
+	char *conflicting_path = istate->cache[i]->name;
+	int count = 0;
+
+	add_rejected_path(o, WARNING_SPARSE_UNMERGED_FILE, conflicting_path);
+
+	/* Find out how many higher stage entries are at same path */
+	while ((++count) + i < istate->cache_nr &&
+	       !strcmp(conflicting_path, istate->cache[count + i]->name))
+		; /* do nothing */
+
+	return count;
+}
+
 static inline int call_unpack_fn(const struct cache_entry * const *src,
 				 struct unpack_trees_options *o)
 {
@@ -528,6 +589,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;
@@ -691,12 +759,18 @@ static int index_pos_by_traverse_info(struct name_entry *names,
 	strbuf_make_traverse_path(&name, info, names->path, names->pathlen);
 	strbuf_addch(&name, '/');
 	pos = index_name_pos(o->src_index, name.buf, name.len);
-	if (pos >= 0)
-		BUG("This is a directory and should not exist in index");
-	pos = -pos - 1;
-	if (!starts_with(o->src_index->cache[pos]->name, name.buf) ||
+	if (pos >= 0) {
+		if (!o->src_index->sparse_index ||
+		    !(o->src_index->cache[pos]->ce_flags & CE_SKIP_WORKTREE))
+			BUG("This is a directory and should not exist in index");
+	} else {
+		pos = -pos - 1;
+	}
+	if (pos >= o->src_index->cache_nr ||
+	    !starts_with(o->src_index->cache[pos]->name, name.buf) ||
 	    (pos > 0 && starts_with(o->src_index->cache[pos-1]->name, name.buf)))
-		BUG("pos must point at the first entry in this directory");
+		BUG("pos %d doesn't point to the first entry of %s in index",
+		    pos, name.buf);
 	strbuf_release(&name);
 	return pos;
 }
@@ -719,7 +793,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
@@ -898,6 +972,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
@@ -920,7 +995,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)
@@ -930,6 +1006,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!
 	 */
@@ -955,13 +1041,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) :
-		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);
@@ -970,6 +1058,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;
 }
 
@@ -978,21 +1073,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.
 	 */
@@ -1021,7 +1123,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) {
@@ -1125,16 +1229,71 @@ static int find_cache_pos(struct traverse_info *info,
 	return -1;
 }
 
+/*
+ * Given a sparse directory entry 'ce', compare ce->name to
+ * info->name + '/' + p->path + '/' if info->name 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->namelen)
+		return ce->ce_namelen == info->namelen + p->pathlen + 2 &&
+		       ce->name[info->namelen] == '/' &&
+		       !strncmp(ce->name, info->name, info->namelen) &&
+		       !strncmp(ce->name + info->namelen + 1, p->path, p->pathlen);
+	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)
 {
+	struct cache_entry *ce;
 	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) {
+		ce = o->src_index->cache[pos];
+
+		if (strncmp(ce->name, p->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)
@@ -1170,6 +1329,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.
@@ -1225,7 +1399,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]) {
@@ -1255,9 +1429,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;
 	}
 
@@ -1269,7 +1446,8 @@ static int clear_ce_flags_1(struct index_state *istate,
 			    struct strbuf *prefix,
 			    int select_mask, int clear_mask,
 			    struct pattern_list *pl,
-			    enum pattern_match_result default_match);
+			    enum pattern_match_result default_match,
+			    int progress_nr);
 
 /* Whole directory matching */
 static int clear_ce_flags_dir(struct index_state *istate,
@@ -1278,20 +1456,23 @@ static int clear_ce_flags_dir(struct index_state *istate,
 			      char *basename,
 			      int select_mask, int clear_mask,
 			      struct pattern_list *pl,
-			      enum pattern_match_result default_match)
+			      enum pattern_match_result default_match,
+			      int progress_nr)
 {
 	struct cache_entry **cache_end;
 	int dtype = DT_DIR;
 	int rc;
-	enum pattern_match_result ret;
-	ret = path_matches_pattern_list(prefix->buf, prefix->len,
-					basename, &dtype, pl, istate);
+	enum pattern_match_result ret, orig_ret;
+	orig_ret = path_matches_pattern_list(prefix->buf, prefix->len,
+					     basename, &dtype, pl, istate);
 
 	strbuf_addch(prefix, '/');
 
 	/* If undecided, use matching result of parent dir in defval */
-	if (ret == UNDECIDED)
+	if (orig_ret == UNDECIDED)
 		ret = default_match;
+	else
+		ret = orig_ret;
 
 	for (cache_end = cache; cache_end != cache + nr; cache_end++) {
 		struct cache_entry *ce = *cache_end;
@@ -1299,17 +1480,24 @@ static int clear_ce_flags_dir(struct index_state *istate,
 			break;
 	}
 
-	/*
-	 * TODO: check pl, if there are no patterns that may conflict
-	 * with ret (iow, we know in advance the incl/excl
-	 * decision for the entire directory), clear flag here without
-	 * calling clear_ce_flags_1(). That function will call
-	 * the expensive path_matches_pattern_list() on every entry.
-	 */
-	rc = clear_ce_flags_1(istate, cache, cache_end - cache,
-			      prefix,
-			      select_mask, clear_mask,
-			      pl, ret);
+	if (pl->use_cone_patterns && orig_ret == MATCHED_RECURSIVE) {
+		struct cache_entry **ce = cache;
+		rc = cache_end - cache;
+
+		while (ce < cache_end) {
+			(*ce)->ce_flags &= ~clear_mask;
+			ce++;
+		}
+	} else if (pl->use_cone_patterns && orig_ret == NOT_MATCHED) {
+		rc = cache_end - cache;
+	} else {
+		rc = clear_ce_flags_1(istate, cache, cache_end - cache,
+				      prefix,
+				      select_mask, clear_mask,
+				      pl, ret,
+				      progress_nr);
+	}
+
 	strbuf_setlen(prefix, prefix->len - 1);
 	return rc;
 }
@@ -1334,9 +1522,10 @@ static int clear_ce_flags_1(struct index_state *istate,
 			    struct strbuf *prefix,
 			    int select_mask, int clear_mask,
 			    struct pattern_list *pl,
-			    enum pattern_match_result default_match)
+			    enum pattern_match_result default_match,
+			    int progress_nr)
 {
-	struct cache_entry **cache_end = cache + nr;
+	struct cache_entry **cache_end = nr ? cache + nr : cache;
 
 	/*
 	 * Process all entries that have the given prefix and meet
@@ -1348,8 +1537,11 @@ static int clear_ce_flags_1(struct index_state *istate,
 		int len, dtype;
 		enum pattern_match_result ret;
 
+		display_progress(istate->progress, progress_nr);
+
 		if (select_mask && !(ce->ce_flags & select_mask)) {
 			cache++;
+			progress_nr++;
 			continue;
 		}
 
@@ -1370,20 +1562,26 @@ static int clear_ce_flags_1(struct index_state *istate,
 						       prefix,
 						       prefix->buf + prefix->len - len,
 						       select_mask, clear_mask,
-						       pl, default_match);
+						       pl, default_match,
+						       progress_nr);
 
 			/* clear_c_f_dir eats a whole dir already? */
 			if (processed) {
 				cache += processed;
+				progress_nr += processed;
 				strbuf_setlen(prefix, prefix->len - len);
 				continue;
 			}
 
 			strbuf_addch(prefix, '/');
-			cache += clear_ce_flags_1(istate, cache, cache_end - cache,
-						  prefix,
-						  select_mask, clear_mask, pl,
-						  default_match);
+			processed = clear_ce_flags_1(istate, cache, cache_end - cache,
+						     prefix,
+						     select_mask, clear_mask, pl,
+						     default_match, progress_nr);
+
+			cache += processed;
+			progress_nr += processed;
+
 			strbuf_setlen(prefix, prefix->len - len - 1);
 			continue;
 		}
@@ -1395,27 +1593,44 @@ static int clear_ce_flags_1(struct index_state *istate,
 						name, &dtype, pl, istate);
 		if (ret == UNDECIDED)
 			ret = default_match;
-		if (ret == MATCHED)
+		if (ret == MATCHED || ret == MATCHED_RECURSIVE)
 			ce->ce_flags &= ~clear_mask;
 		cache++;
+		progress_nr++;
 	}
+
+	display_progress(istate->progress, progress_nr);
 	return nr - (cache_end - cache);
 }
 
 static int clear_ce_flags(struct index_state *istate,
 			  int select_mask, int clear_mask,
-			  struct pattern_list *pl)
+			  struct pattern_list *pl,
+			  int show_progress)
 {
 	static struct strbuf prefix = STRBUF_INIT;
+	char label[100];
+	int rval;
 
 	strbuf_reset(&prefix);
-
-	return clear_ce_flags_1(istate,
+	if (show_progress)
+		istate->progress = start_delayed_progress(
+					_("Updating index flags"),
+					istate->cache_nr);
+
+	xsnprintf(label, sizeof(label), "clear_ce_flags(0x%08lx,0x%08lx)",
+		  (unsigned long)select_mask, (unsigned long)clear_mask);
+	trace2_region_enter("unpack_trees", label, the_repository);
+	rval = clear_ce_flags_1(istate,
 				istate->cache,
 				istate->cache_nr,
 				&prefix,
 				select_mask, clear_mask,
-				pl, 0);
+				pl, 0, 0);
+	trace2_region_leave("unpack_trees", label, the_repository);
+
+	stop_progress(&istate->progress);
+	return rval;
 }
 
 /*
@@ -1423,7 +1638,8 @@ static int clear_ce_flags(struct index_state *istate,
  */
 static void mark_new_skip_worktree(struct pattern_list *pl,
 				   struct index_state *istate,
-				   int select_flag, int skip_wt_flag)
+				   int select_flag, int skip_wt_flag,
+				   int show_progress)
 {
 	int i;
 
@@ -1447,9 +1663,19 @@ static void mark_new_skip_worktree(struct pattern_list *pl,
 	 * 2. Widen worktree according to sparse-checkout file.
 	 * Matched entries will have skip_wt_flag cleared (i.e. "in")
 	 */
-	clear_ce_flags(istate, select_flag, skip_wt_flag, pl);
+	clear_ce_flags(istate, select_flag, skip_wt_flag, pl, show_progress);
 }
 
+static void populate_from_existing_patterns(struct unpack_trees_options *o,
+					    struct pattern_list *pl)
+{
+	if (get_sparse_checkout_patterns(pl) < 0)
+		o->skip_sparse_checkout = 1;
+	else
+		o->pl = pl;
+}
+
+
 static int verify_absent(const struct cache_entry *,
 			 enum unpack_trees_error_types,
 			 struct unpack_trees_options *);
@@ -1461,24 +1687,30 @@ 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;
 	static struct cache_entry *dfc;
 	struct pattern_list pl;
+	int free_pattern_list = 0;
 
 	if (len > MAX_UNPACK_TREES)
 		die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
 
 	trace_performance_enter();
-	memset(&pl, 0, sizeof(pl));
+	trace2_region_enter("unpack_trees", "unpack_trees", the_repository);
+
+	prepare_repo_settings(repo);
+	if (repo->settings.command_requires_full_index) {
+		ensure_full_index(o->src_index);
+		ensure_full_index(o->dst_index);
+	}
+
 	if (!core_apply_sparse_checkout || !o->update)
 		o->skip_sparse_checkout = 1;
-	if (!o->skip_sparse_checkout) {
-		char *sparse = git_pathdup("info/sparse-checkout");
-		if (add_patterns_from_file_to_list(sparse, "", 0, &pl, NULL) < 0)
-			o->skip_sparse_checkout = 1;
-		else
-			o->pl = &pl;
-		free(sparse);
+	if (!o->skip_sparse_checkout && !o->pl) {
+		memset(&pl, 0, sizeof(pl));
+		free_pattern_list = 1;
+		populate_from_existing_patterns(o, &pl);
 	}
 
 	memset(&o->result, 0, sizeof(o->result));
@@ -1504,11 +1736,15 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 	o->merge_size = len;
 	mark_all_ce_unused(o->src_index);
 
+	o->result.fsmonitor_last_update =
+		xstrdup_or_null(o->src_index->fsmonitor_last_update);
+
 	/*
 	 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
 	 */
 	if (!o->skip_sparse_checkout)
-		mark_new_skip_worktree(o->pl, o->src_index, 0, CE_NEW_SKIP_WORKTREE);
+		mark_new_skip_worktree(o->pl, o->src_index, 0,
+				       CE_NEW_SKIP_WORKTREE, o->verbose_update);
 
 	if (!dfc)
 		dfc = xcalloc(1, cache_entry_size(0));
@@ -1542,7 +1778,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 		}
 
 		trace_performance_enter();
+		trace2_region_enter("unpack_trees", "traverse_trees", the_repository);
 		ret = traverse_trees(o->src_index, len, t, &info);
+		trace2_region_leave("unpack_trees", "traverse_trees", the_repository);
 		trace_performance_leave("traverse_trees");
 		if (ret < 0)
 			goto return_failed;
@@ -1566,14 +1804,14 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 	}
 
 	if (!o->skip_sparse_checkout) {
-		int empty_worktree = 1;
-
 		/*
 		 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
-		 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
+		 * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
 		 * so apply_sparse_checkout() won't attempt to remove it from worktree
 		 */
-		mark_new_skip_worktree(o->pl, &o->result, CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE);
+		mark_new_skip_worktree(o->pl, &o->result,
+				       CE_ADDED, CE_SKIP_WORKTREE | CE_NEW_SKIP_WORKTREE,
+				       o->verbose_update);
 
 		ret = 0;
 		for (i = 0; i < o->result.cache_nr; i++) {
@@ -1588,43 +1826,29 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 			 * correct CE_NEW_SKIP_WORKTREE
 			 */
 			if (ce->ce_flags & CE_ADDED &&
-			    verify_absent(ce, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN, o)) {
-				if (!o->show_all_errors)
-					goto return_failed;
-				ret = -1;
-			}
-
-			if (apply_sparse_checkout(&o->result, ce, o)) {
-				if (!o->show_all_errors)
-					goto return_failed;
-				ret = -1;
-			}
-			if (!ce_skip_worktree(ce))
-				empty_worktree = 0;
+			    verify_absent(ce, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN, o))
+				ret = 1;
 
+			if (apply_sparse_checkout(&o->result, ce, o))
+				ret = 1;
 		}
-		if (ret < 0)
-			goto return_failed;
-		/*
-		 * Sparse checkout is meant to narrow down checkout area
-		 * but it does not make sense to narrow down to empty working
-		 * tree. This is usually a mistake in sparse checkout rules.
-		 * Do not allow users to do that.
-		 */
-		if (o->result.cache_nr && empty_worktree) {
-			ret = unpack_failed(o, "Sparse checkout leaves no entry on working directory");
-			goto done;
+		if (ret == 1) {
+			/*
+			 * Inability to sparsify or de-sparsify individual
+			 * paths is not an error, but just a warning.
+			 */
+			if (o->show_all_errors)
+				display_warning_msgs(o);
+			ret = 0;
 		}
 	}
 
-	ret = check_updates(o) ? (-2) : 0;
+	ret = check_updates(o, &o->result) ? (-2) : 0;
 	if (o->dst_index) {
 		move_index_extensions(&o->result, o->src_index);
 		if (!ret) {
 			if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
 				cache_tree_verify(the_repository, &o->result);
-			if (!o->result.cache_tree)
-				o->result.cache_tree = cache_tree();
 			if (!cache_tree_fully_valid(o->result.cache_tree))
 				cache_tree_update(&o->result,
 						  WRITE_TREE_SILENT |
@@ -1640,8 +1864,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options
 	o->src_index = NULL;
 
 done:
+	if (free_pattern_list)
+		clear_pattern_list(&pl);
+	trace2_region_leave("unpack_trees", "unpack_trees", the_repository);
 	trace_performance_leave("unpack_trees");
-	clear_pattern_list(&pl);
 	return ret;
 
 return_failed:
@@ -1654,6 +1880,74 @@ return_failed:
 	goto done;
 }
 
+/*
+ * Update SKIP_WORKTREE bits according to sparsity patterns, and update
+ * working directory to match.
+ *
+ * CE_NEW_SKIP_WORKTREE is used internally.
+ */
+enum update_sparsity_result update_sparsity(struct unpack_trees_options *o)
+{
+	enum update_sparsity_result ret = UPDATE_SPARSITY_SUCCESS;
+	struct pattern_list pl;
+	int i;
+	unsigned old_show_all_errors;
+	int free_pattern_list = 0;
+
+	old_show_all_errors = o->show_all_errors;
+	o->show_all_errors = 1;
+
+	/* Sanity checks */
+	if (!o->update || o->index_only || o->skip_sparse_checkout)
+		BUG("update_sparsity() is for reflecting sparsity patterns in working directory");
+	if (o->src_index != o->dst_index || o->fn)
+		BUG("update_sparsity() called wrong");
+
+	trace_performance_enter();
+
+	/* If we weren't given patterns, use the recorded ones */
+	if (!o->pl) {
+		memset(&pl, 0, sizeof(pl));
+		free_pattern_list = 1;
+		populate_from_existing_patterns(o, &pl);
+		if (o->skip_sparse_checkout)
+			goto skip_sparse_checkout;
+	}
+
+	/* Set NEW_SKIP_WORKTREE on existing entries. */
+	mark_all_ce_unused(o->src_index);
+	mark_new_skip_worktree(o->pl, o->src_index, 0,
+			       CE_NEW_SKIP_WORKTREE, o->verbose_update);
+
+	/* Then loop over entries and update/remove as needed */
+	ret = UPDATE_SPARSITY_SUCCESS;
+	for (i = 0; i < o->src_index->cache_nr; i++) {
+		struct cache_entry *ce = o->src_index->cache[i];
+
+
+		if (ce_stage(ce)) {
+			/* -1 because for loop will increment by 1 */
+			i += warn_conflicted_path(o->src_index, i, o) - 1;
+			ret = UPDATE_SPARSITY_WARNINGS;
+			continue;
+		}
+
+		if (apply_sparse_checkout(o->src_index, ce, o))
+			ret = UPDATE_SPARSITY_WARNINGS;
+	}
+
+skip_sparse_checkout:
+	if (check_updates(o, o->src_index))
+		ret = UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES;
+
+	display_warning_msgs(o);
+	o->show_all_errors = old_show_all_errors;
+	if (free_pattern_list)
+		clear_pattern_list(&pl);
+	trace_performance_leave("update_sparsity");
+	return ret;
+}
+
 /* Here come the merge functions */
 
 static int reject_merge(const struct cache_entry *ce,
@@ -1738,7 +2032,7 @@ int verify_uptodate(const struct cache_entry *ce,
 static int verify_uptodate_sparse(const struct cache_entry *ce,
 				  struct unpack_trees_options *o)
 {
-	return verify_uptodate_1(ce, o, ERROR_SPARSE_NOT_UPTODATE_FILE);
+	return verify_uptodate_1(ce, o, WARNING_SPARSE_NOT_UPTODATE_FILE);
 }
 
 /*
@@ -1764,9 +2058,6 @@ static void invalidate_ce_path(const struct cache_entry *ce,
 /*
  * Check that checking out ce->sha1 in subdir ce->name is not
  * going to overwrite any working files.
- *
- * Currently, git does not checkout subprojects during a superproject
- * checkout, so it is not going to overwrite anything.
  */
 static int verify_clean_submodule(const char *old_sha1,
 				  const struct cache_entry *ce,
@@ -1930,7 +2221,7 @@ static int verify_absent_1(const struct cache_entry *ce,
 	if (o->index_only || o->reset || !o->update)
 		return 0;
 
-	len = check_leading_path(ce->name, ce_namelen(ce));
+	len = check_leading_path(ce->name, ce_namelen(ce), 0);
 	if (!len)
 		return 0;
 	else if (len > 0) {
@@ -1979,11 +2270,7 @@ static int verify_absent_sparse(const struct cache_entry *ce,
 				enum unpack_trees_error_types error_type,
 				struct unpack_trees_options *o)
 {
-	enum unpack_trees_error_types orphaned_error = error_type;
-	if (orphaned_error == ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN)
-		orphaned_error = ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN;
-
-	return verify_absent_1(ce, orphaned_error, o);
+	return verify_absent_1(ce, error_type, o);
 }
 
 static int merged_entry(const struct cache_entry *ce,
@@ -2016,7 +2303,7 @@ static int merged_entry(const struct cache_entry *ce,
 		}
 		invalidate_ce_path(merge, o);
 
-		if (submodule_from_ce(ce)) {
+		if (submodule_from_ce(ce) && file_exists(ce->name)) {
 			int ret = check_submodule_move_head(ce, NULL,
 							    oid_to_hex(&ce->oid),
 							    o);
@@ -2045,7 +2332,7 @@ static int merged_entry(const struct cache_entry *ce,
 			invalidate_ce_path(old, o);
 		}
 
-		if (submodule_from_ce(ce)) {
+		if (submodule_from_ce(ce) && file_exists(ce->name)) {
 			int ret = check_submodule_move_head(ce, oid_to_hex(&old->oid),
 							    oid_to_hex(&ce->oid),
 							    o);
@@ -2060,7 +2347,8 @@ static int merged_entry(const struct cache_entry *ce,
 		invalidate_ce_path(old, o);
 	}
 
-	do_add_entry(o, merge, update, CE_STAGEMASK);
+	if (do_add_entry(o, merge, update, CE_STAGEMASK) < 0)
+		return -1;
 	return 1;
 }
 
@@ -2320,6 +2608,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);
 	}
@@ -2384,7 +2683,8 @@ int oneway_merge(const struct cache_entry * const *src,
 
 	if (old && same(old, a)) {
 		int update = 0;
-		if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old)) {
+		if (o->reset && o->update && !ce_uptodate(old) && !ce_skip_worktree(old) &&
+			!(old->ce_flags & CE_FSMONITOR_VALID)) {
 			struct stat st;
 			if (lstat(old->name, &st) ||
 			    ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
@@ -2398,3 +2698,25 @@ int oneway_merge(const struct cache_entry * const *src,
 	}
 	return merged_entry(a, old, o);
 }
+
+/*
+ * Merge worktree and untracked entries in a stash entry.
+ *
+ * Ignore all index entries. Collapse remaining trees but make sure that they
+ * don't have any conflicting files.
+ */
+int stash_worktree_untracked_merge(const struct cache_entry * const *src,
+				   struct unpack_trees_options *o)
+{
+	const struct cache_entry *worktree = src[1];
+	const struct cache_entry *untracked = src[2];
+
+	if (o->merge_size != 2)
+		BUG("invalid merge_size: %d", o->merge_size);
+
+	if (worktree && untracked)
+		return error(_("worktree and untracked commit have duplicate entries: %s"),
+			     super_prefixed(worktree->name));
+
+	return merged_entry(worktree ? worktree : untracked, NULL, o);
+}
diff --git a/unpack-trees.h b/unpack-trees.h
index f2eee0c7c5..2d88b19dca 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -2,11 +2,11 @@
 #define UNPACK_TREES_H
 
 #include "cache.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "string-list.h"
 #include "tree-walk.h"
 
-#define MAX_UNPACK_TREES 8
+#define MAX_UNPACK_TREES MAX_TRAVERSE_TREES
 
 struct cache_entry;
 struct unpack_trees_options;
@@ -22,11 +22,15 @@ enum unpack_trees_error_types {
 	ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN,
 	ERROR_WOULD_LOSE_UNTRACKED_REMOVED,
 	ERROR_BIND_OVERLAP,
-	ERROR_SPARSE_NOT_UPTODATE_FILE,
-	ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN,
-	ERROR_WOULD_LOSE_ORPHANED_REMOVED,
 	ERROR_WOULD_LOSE_SUBMODULE,
-	NB_UNPACK_TREES_ERROR_TYPES
+
+	NB_UNPACK_TREES_ERROR_TYPES,
+
+	WARNING_SPARSE_NOT_UPTODATE_FILE,
+	WARNING_SPARSE_UNMERGED_FILE,
+	WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN,
+
+	NB_UNPACK_TREES_WARNING_TYPES,
 };
 
 /*
@@ -65,13 +69,13 @@ struct unpack_trees_options {
 	struct dir_struct *dir;
 	struct pathspec *pathspec;
 	merge_fn_t fn;
-	const char *msgs[NB_UNPACK_TREES_ERROR_TYPES];
-	struct argv_array msgs_to_free;
+	const char *msgs[NB_UNPACK_TREES_WARNING_TYPES];
+	struct strvec msgs_to_free;
 	/*
 	 * Store error messages in an array, each case
 	 * corresponding to a error message type
 	 */
-	struct string_list unpack_rejects[NB_UNPACK_TREES_ERROR_TYPES];
+	struct string_list unpack_rejects[NB_UNPACK_TREES_WARNING_TYPES];
 
 	int head_idx;
 	int merge_size;
@@ -84,11 +88,21 @@ struct unpack_trees_options {
 	struct index_state result;
 
 	struct pattern_list *pl; /* for internal use */
+	struct checkout_metadata meta;
 };
 
 int unpack_trees(unsigned n, struct tree_desc *t,
 		 struct unpack_trees_options *options);
 
+enum update_sparsity_result {
+	UPDATE_SPARSITY_SUCCESS = 0,
+	UPDATE_SPARSITY_WARNINGS = 1,
+	UPDATE_SPARSITY_INDEX_UPDATE_FAILURES = -1,
+	UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES = -2
+};
+
+enum update_sparsity_result update_sparsity(struct unpack_trees_options *options);
+
 int verify_uptodate(const struct cache_entry *ce,
 		    struct unpack_trees_options *o);
 
@@ -100,5 +114,7 @@ int bind_merge(const struct cache_entry * const *src,
 	       struct unpack_trees_options *o);
 int oneway_merge(const struct cache_entry * const *src,
 		 struct unpack_trees_options *o);
+int stash_worktree_untracked_merge(const struct cache_entry * const *src,
+				   struct unpack_trees_options *o);
 
 #endif
diff --git a/upload-pack.c b/upload-pack.c
index a00d7ece6b..6ce07231d3 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -18,7 +18,7 @@
 #include "sigchain.h"
 #include "version.h"
 #include "string-list.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "prio-queue.h"
 #include "protocol.h"
 #include "quote.h"
@@ -26,6 +26,7 @@
 #include "serve.h"
 #include "commit-graph.h"
 #include "commit-reach.h"
+#include "shallow.h"
 
 /* Remember to update object flag allocation in object.h */
 #define THEY_HAVE	(1u << 11)
@@ -41,43 +42,133 @@
 #define ALL_FLAGS (THEY_HAVE | OUR_REF | WANTED | COMMON_KNOWN | SHALLOW | \
 		NOT_SHALLOW | CLIENT_SHALLOW | HIDDEN_REF)
 
-static timestamp_t oldest_have;
-
-static int multi_ack;
-static int no_done;
-static int use_thin_pack, use_ofs_delta, use_include_tag;
-static int no_progress, daemon_mode;
-/* Allow specifying sha1 if it is a ref tip. */
-#define ALLOW_TIP_SHA1	01
-/* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
-#define ALLOW_REACHABLE_SHA1	02
-/* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
-#define ALLOW_ANY_SHA1	07
-static unsigned int allow_unadvertised_object_request;
-static int shallow_nr;
-static struct object_array extra_edge_obj;
-static unsigned int timeout;
-static int keepalive = 5;
-/* 0 for no sideband,
- * otherwise maximum packet size (up to 65520 bytes).
+/* Enum for allowed unadvertised object request (UOR) */
+enum allow_uor {
+	/* Allow specifying sha1 if it is a ref tip. */
+	ALLOW_TIP_SHA1 = 0x01,
+	/* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
+	ALLOW_REACHABLE_SHA1 = 0x02,
+	/* Allow request of any sha1. Implies ALLOW_TIP_SHA1 and ALLOW_REACHABLE_SHA1. */
+	ALLOW_ANY_SHA1 = 0x07
+};
+
+/*
+ * Please annotate, and if possible group together, fields used only
+ * for protocol v0 or only for protocol v2.
  */
-static int use_sideband;
-static int stateless_rpc;
-static const char *pack_objects_hook;
+struct upload_pack_data {
+	struct string_list symref;				/* v0 only */
+	struct object_array want_obj;
+	struct object_array have_obj;
+	struct oid_array haves;					/* v2 only */
+	struct string_list wanted_refs;				/* v2 only */
+
+	struct object_array shallows;
+	struct string_list deepen_not;
+	struct object_array extra_edge_obj;
+	int depth;
+	timestamp_t deepen_since;
+	int deepen_rev_list;
+	int deepen_relative;
+	int keepalive;
+	int shallow_nr;
+	timestamp_t oldest_have;
+
+	unsigned int timeout;					/* v0 only */
+	enum {
+		NO_MULTI_ACK = 0,
+		MULTI_ACK = 1,
+		MULTI_ACK_DETAILED = 2
+	} multi_ack;						/* v0 only */
+
+	/* 0 for no sideband, otherwise DEFAULT_PACKET_MAX or LARGE_PACKET_MAX */
+	int use_sideband;
+
+	struct string_list uri_protocols;
+	enum allow_uor allow_uor;
 
-static int filter_capability_requested;
-static int allow_filter;
-static int allow_ref_in_want;
-static struct list_objects_filter_options filter_options;
+	struct list_objects_filter_options filter_options;
+	struct string_list allowed_filters;
 
-static int allow_sideband_all;
+	struct packet_writer writer;
+
+	const char *pack_objects_hook;
+
+	unsigned stateless_rpc : 1;				/* v0 only */
+	unsigned no_done : 1;					/* v0 only */
+	unsigned daemon_mode : 1;				/* v0 only */
+	unsigned filter_capability_requested : 1;		/* v0 only */
+
+	unsigned use_thin_pack : 1;
+	unsigned use_ofs_delta : 1;
+	unsigned no_progress : 1;
+	unsigned use_include_tag : 1;
+	unsigned wait_for_done : 1;
+	unsigned allow_filter : 1;
+	unsigned allow_filter_fallback : 1;
+	unsigned long tree_filter_max_depth;
+
+	unsigned done : 1;					/* v2 only */
+	unsigned allow_ref_in_want : 1;				/* v2 only */
+	unsigned allow_sideband_all : 1;			/* v2 only */
+	unsigned advertise_sid : 1;
+};
 
-static void reset_timeout(void)
+static void upload_pack_data_init(struct upload_pack_data *data)
+{
+	struct string_list symref = STRING_LIST_INIT_DUP;
+	struct string_list wanted_refs = STRING_LIST_INIT_DUP;
+	struct object_array want_obj = OBJECT_ARRAY_INIT;
+	struct object_array have_obj = OBJECT_ARRAY_INIT;
+	struct oid_array haves = OID_ARRAY_INIT;
+	struct object_array shallows = OBJECT_ARRAY_INIT;
+	struct string_list deepen_not = STRING_LIST_INIT_DUP;
+	struct string_list uri_protocols = STRING_LIST_INIT_DUP;
+	struct object_array extra_edge_obj = OBJECT_ARRAY_INIT;
+	struct string_list allowed_filters = STRING_LIST_INIT_DUP;
+
+	memset(data, 0, sizeof(*data));
+	data->symref = symref;
+	data->wanted_refs = wanted_refs;
+	data->want_obj = want_obj;
+	data->have_obj = have_obj;
+	data->haves = haves;
+	data->shallows = shallows;
+	data->deepen_not = deepen_not;
+	data->uri_protocols = uri_protocols;
+	data->extra_edge_obj = extra_edge_obj;
+	data->allowed_filters = allowed_filters;
+	data->allow_filter_fallback = 1;
+	data->tree_filter_max_depth = ULONG_MAX;
+	packet_writer_init(&data->writer, 1);
+
+	data->keepalive = 5;
+	data->advertise_sid = 0;
+}
+
+static void upload_pack_data_clear(struct upload_pack_data *data)
+{
+	string_list_clear(&data->symref, 1);
+	string_list_clear(&data->wanted_refs, 1);
+	object_array_clear(&data->want_obj);
+	object_array_clear(&data->have_obj);
+	oid_array_clear(&data->haves);
+	object_array_clear(&data->shallows);
+	string_list_clear(&data->deepen_not, 0);
+	object_array_clear(&data->extra_edge_obj);
+	list_objects_filter_release(&data->filter_options);
+	string_list_clear(&data->allowed_filters, 0);
+
+	free((char *)data->pack_objects_hook);
+}
+
+static void reset_timeout(unsigned int timeout)
 {
 	alarm(timeout);
 }
 
-static void send_client_data(int fd, const char *data, ssize_t sz)
+static void send_client_data(int fd, const char *data, ssize_t sz,
+			     int use_sideband)
 {
 	if (use_sideband) {
 		send_sideband(1, fd, data, sz, use_sideband);
@@ -102,80 +193,150 @@ static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
 	return 0;
 }
 
-static void create_pack_file(const struct object_array *have_obj,
-			     const struct object_array *want_obj)
+struct output_state {
+	char buffer[8193];
+	int used;
+	unsigned packfile_uris_started : 1;
+	unsigned packfile_started : 1;
+};
+
+static int relay_pack_data(int pack_objects_out, struct output_state *os,
+			   int use_sideband, int write_packfile_line)
+{
+	/*
+	 * We keep the last byte to ourselves
+	 * in case we detect broken rev-list, so that we
+	 * can leave the stream corrupted.  This is
+	 * unfortunate -- unpack-objects would happily
+	 * accept a valid packdata with trailing garbage,
+	 * so appending garbage after we pass all the
+	 * pack data is not good enough to signal
+	 * breakage to downstream.
+	 */
+	ssize_t readsz;
+
+	readsz = xread(pack_objects_out, os->buffer + os->used,
+		       sizeof(os->buffer) - os->used);
+	if (readsz < 0) {
+		return readsz;
+	}
+	os->used += readsz;
+
+	while (!os->packfile_started) {
+		char *p;
+		if (os->used >= 4 && !memcmp(os->buffer, "PACK", 4)) {
+			os->packfile_started = 1;
+			if (write_packfile_line) {
+				if (os->packfile_uris_started)
+					packet_delim(1);
+				packet_write_fmt(1, "\1packfile\n");
+			}
+			break;
+		}
+		if ((p = memchr(os->buffer, '\n', os->used))) {
+			if (!os->packfile_uris_started) {
+				os->packfile_uris_started = 1;
+				if (!write_packfile_line)
+					BUG("packfile_uris requires sideband-all");
+				packet_write_fmt(1, "\1packfile-uris\n");
+			}
+			*p = '\0';
+			packet_write_fmt(1, "\1%s\n", os->buffer);
+
+			os->used -= p - os->buffer + 1;
+			memmove(os->buffer, p + 1, os->used);
+		} else {
+			/*
+			 * Incomplete line.
+			 */
+			return readsz;
+		}
+	}
+
+	if (os->used > 1) {
+		send_client_data(1, os->buffer, os->used - 1, use_sideband);
+		os->buffer[0] = os->buffer[os->used - 1];
+		os->used = 1;
+	} else {
+		send_client_data(1, os->buffer, os->used, use_sideband);
+		os->used = 0;
+	}
+
+	return readsz;
+}
+
+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;
-	char data[8193], progress[128];
+	struct output_state output_state = { { 0 } };
+	char progress[128];
 	char abort_msg[] = "aborting due to possible repository "
 		"corruption on the remote side.";
-	int buffered = -1;
 	ssize_t sz;
 	int i;
 	FILE *pipe_fd;
 
-	if (!pack_objects_hook)
+	if (!pack_data->pack_objects_hook)
 		pack_objects.git_cmd = 1;
 	else {
-		argv_array_push(&pack_objects.args, pack_objects_hook);
-		argv_array_push(&pack_objects.args, "git");
+		strvec_push(&pack_objects.args, pack_data->pack_objects_hook);
+		strvec_push(&pack_objects.args, "git");
 		pack_objects.use_shell = 1;
 	}
 
-	if (shallow_nr) {
-		argv_array_push(&pack_objects.args, "--shallow-file");
-		argv_array_push(&pack_objects.args, "");
+	if (pack_data->shallow_nr) {
+		strvec_push(&pack_objects.args, "--shallow-file");
+		strvec_push(&pack_objects.args, "");
 	}
-	argv_array_push(&pack_objects.args, "pack-objects");
-	argv_array_push(&pack_objects.args, "--revs");
-	if (use_thin_pack)
-		argv_array_push(&pack_objects.args, "--thin");
-
-	argv_array_push(&pack_objects.args, "--stdout");
-	if (shallow_nr)
-		argv_array_push(&pack_objects.args, "--shallow");
-	if (!no_progress)
-		argv_array_push(&pack_objects.args, "--progress");
-	if (use_ofs_delta)
-		argv_array_push(&pack_objects.args, "--delta-base-offset");
-	if (use_include_tag)
-		argv_array_push(&pack_objects.args, "--include-tag");
-	if (filter_options.choice) {
+	strvec_push(&pack_objects.args, "pack-objects");
+	strvec_push(&pack_objects.args, "--revs");
+	if (pack_data->use_thin_pack)
+		strvec_push(&pack_objects.args, "--thin");
+
+	strvec_push(&pack_objects.args, "--stdout");
+	if (pack_data->shallow_nr)
+		strvec_push(&pack_objects.args, "--shallow");
+	if (!pack_data->no_progress)
+		strvec_push(&pack_objects.args, "--progress");
+	if (pack_data->use_ofs_delta)
+		strvec_push(&pack_objects.args, "--delta-base-offset");
+	if (pack_data->use_include_tag)
+		strvec_push(&pack_objects.args, "--include-tag");
+	if (pack_data->filter_options.choice) {
 		const char *spec =
-			expand_list_objects_filter_spec(&filter_options);
-		if (pack_objects.use_shell) {
-			struct strbuf buf = STRBUF_INIT;
-			sq_quote_buf(&buf, spec);
-			argv_array_pushf(&pack_objects.args, "--filter=%s", buf.buf);
-			strbuf_release(&buf);
-		} else {
-			argv_array_pushf(&pack_objects.args, "--filter=%s",
-					 spec);
-		}
+			expand_list_objects_filter_spec(&pack_data->filter_options);
+		strvec_pushf(&pack_objects.args, "--filter=%s", spec);
+	}
+	if (uri_protocols) {
+		for (i = 0; i < uri_protocols->nr; i++)
+			strvec_pushf(&pack_objects.args, "--uri-protocol=%s",
+					 uri_protocols->items[i].string);
 	}
 
 	pack_objects.in = -1;
 	pack_objects.out = -1;
 	pack_objects.err = -1;
+	pack_objects.clean_on_exit = 1;
 
 	if (start_command(&pack_objects))
 		die("git upload-pack: unable to fork git-pack-objects");
 
 	pipe_fd = xfdopen(pack_objects.in, "w");
 
-	if (shallow_nr)
+	if (pack_data->shallow_nr)
 		for_each_commit_graft(write_one_shallow, pipe_fd);
 
-	for (i = 0; i < want_obj->nr; i++)
+	for (i = 0; i < pack_data->want_obj.nr; i++)
 		fprintf(pipe_fd, "%s\n",
-			oid_to_hex(&want_obj->objects[i].item->oid));
+			oid_to_hex(&pack_data->want_obj.objects[i].item->oid));
 	fprintf(pipe_fd, "--not\n");
-	for (i = 0; i < have_obj->nr; i++)
+	for (i = 0; i < pack_data->have_obj.nr; i++)
 		fprintf(pipe_fd, "%s\n",
-			oid_to_hex(&have_obj->objects[i].item->oid));
-	for (i = 0; i < extra_edge_obj.nr; i++)
+			oid_to_hex(&pack_data->have_obj.objects[i].item->oid));
+	for (i = 0; i < pack_data->extra_edge_obj.nr; i++)
 		fprintf(pipe_fd, "%s\n",
-			oid_to_hex(&extra_edge_obj.objects[i].item->oid));
+			oid_to_hex(&pack_data->extra_edge_obj.objects[i].item->oid));
 	fprintf(pipe_fd, "\n");
 	fflush(pipe_fd);
 	fclose(pipe_fd);
@@ -186,10 +347,10 @@ static void create_pack_file(const struct object_array *have_obj,
 
 	while (1) {
 		struct pollfd pfd[2];
-		int pe, pu, pollsize;
+		int pe, pu, pollsize, polltimeout;
 		int ret;
 
-		reset_timeout();
+		reset_timeout(pack_data->timeout);
 
 		pollsize = 0;
 		pe = pu = -1;
@@ -210,8 +371,11 @@ static void create_pack_file(const struct object_array *have_obj,
 		if (!pollsize)
 			break;
 
-		ret = poll(pfd, pollsize,
-			keepalive < 0 ? -1 : 1000 * keepalive);
+		polltimeout = pack_data->keepalive < 0
+			? -1
+			: 1000 * pack_data->keepalive;
+
+		ret = poll(pfd, pollsize, polltimeout);
 
 		if (ret < 0) {
 			if (errno != EINTR) {
@@ -227,7 +391,8 @@ static void create_pack_file(const struct object_array *have_obj,
 			sz = xread(pack_objects.err, progress,
 				  sizeof(progress));
 			if (0 < sz)
-				send_client_data(2, progress, sz);
+				send_client_data(2, progress, sz,
+						 pack_data->use_sideband);
 			else if (sz == 0) {
 				close(pack_objects.err);
 				pack_objects.err = -1;
@@ -238,39 +403,17 @@ static void create_pack_file(const struct object_array *have_obj,
 			continue;
 		}
 		if (0 <= pu && (pfd[pu].revents & (POLLIN|POLLHUP))) {
-			/* Data ready; we keep the last byte to ourselves
-			 * in case we detect broken rev-list, so that we
-			 * can leave the stream corrupted.  This is
-			 * unfortunate -- unpack-objects would happily
-			 * accept a valid packdata with trailing garbage,
-			 * so appending garbage after we pass all the
-			 * pack data is not good enough to signal
-			 * breakage to downstream.
-			 */
-			char *cp = data;
-			ssize_t outsz = 0;
-			if (0 <= buffered) {
-				*cp++ = buffered;
-				outsz++;
-			}
-			sz = xread(pack_objects.out, cp,
-				  sizeof(data) - outsz);
-			if (0 < sz)
-				;
-			else if (sz == 0) {
+			int result = relay_pack_data(pack_objects.out,
+						     &output_state,
+						     pack_data->use_sideband,
+						     !!uri_protocols);
+
+			if (result == 0) {
 				close(pack_objects.out);
 				pack_objects.out = -1;
-			}
-			else
+			} else if (result < 0) {
 				goto fail;
-			sz += outsz;
-			if (1 < sz) {
-				buffered = data[sz-1] & 0xFF;
-				sz--;
 			}
-			else
-				buffered = -1;
-			send_client_data(1, data, sz);
 		}
 
 		/*
@@ -283,7 +426,7 @@ static void create_pack_file(const struct object_array *have_obj,
 		 * protocol to say anything, so those clients are just out of
 		 * luck.
 		 */
-		if (!ret && use_sideband) {
+		if (!ret && pack_data->use_sideband) {
 			static const char buf[] = "0005\1";
 			write_or_die(1, buf, 5);
 		}
@@ -295,32 +438,26 @@ static void create_pack_file(const struct object_array *have_obj,
 	}
 
 	/* flush the data */
-	if (0 <= buffered) {
-		data[0] = buffered;
-		send_client_data(1, data, 1);
+	if (output_state.used > 0) {
+		send_client_data(1, output_state.buffer, output_state.used,
+				 pack_data->use_sideband);
 		fprintf(stderr, "flushed.\n");
 	}
-	if (use_sideband)
+	if (pack_data->use_sideband)
 		packet_flush(1);
 	return;
 
  fail:
-	send_client_data(3, abort_msg, sizeof(abort_msg));
+	send_client_data(3, abort_msg, sizeof(abort_msg),
+			 pack_data->use_sideband);
 	die("git upload-pack: %s", abort_msg);
 }
 
-static int got_oid(const char *hex, struct object_id *oid,
-		   struct object_array *have_obj)
+static int do_got_oid(struct upload_pack_data *data, const struct object_id *oid)
 {
-	struct object *o;
 	int we_knew_they_have = 0;
+	struct object *o = parse_object(the_repository, oid);
 
-	if (get_oid_hex(hex, oid))
-		die("git upload-pack: expected SHA1 object, got '%s'", hex);
-	if (!has_object_file(oid))
-		return -1;
-
-	o = parse_object(the_repository, oid);
 	if (!o)
 		die("oops (%s)", oid_to_hex(oid));
 	if (o->type == OBJ_COMMIT) {
@@ -330,36 +467,45 @@ static int got_oid(const char *hex, struct object_id *oid,
 			we_knew_they_have = 1;
 		else
 			o->flags |= THEY_HAVE;
-		if (!oldest_have || (commit->date < oldest_have))
-			oldest_have = commit->date;
+		if (!data->oldest_have || (commit->date < data->oldest_have))
+			data->oldest_have = commit->date;
 		for (parents = commit->parents;
 		     parents;
 		     parents = parents->next)
 			parents->item->object.flags |= THEY_HAVE;
 	}
 	if (!we_knew_they_have) {
-		add_object_array(o, NULL, have_obj);
+		add_object_array(o, NULL, &data->have_obj);
 		return 1;
 	}
 	return 0;
 }
 
-static int ok_to_give_up(const struct object_array *have_obj,
-			 struct object_array *want_obj)
+static int got_oid(struct upload_pack_data *data,
+		   const char *hex, struct object_id *oid)
 {
-	uint32_t min_generation = GENERATION_NUMBER_ZERO;
+	if (get_oid_hex(hex, oid))
+		die("git upload-pack: expected SHA1 object, got '%s'", hex);
+	if (!has_object_file_with_flags(oid,
+					OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT))
+		return -1;
+	return do_got_oid(data, oid);
+}
 
-	if (!have_obj->nr)
+static int ok_to_give_up(struct upload_pack_data *data)
+{
+	timestamp_t min_generation = GENERATION_NUMBER_ZERO;
+
+	if (!data->have_obj.nr)
 		return 0;
 
-	return can_all_from_reach_with_flag(want_obj, THEY_HAVE,
-					    COMMON_KNOWN, oldest_have,
+	return can_all_from_reach_with_flag(&data->want_obj, THEY_HAVE,
+					    COMMON_KNOWN, data->oldest_have,
 					    min_generation);
 }
 
-static int get_common_commits(struct packet_reader *reader,
-			      struct object_array *have_obj,
-			      struct object_array *want_obj)
+static int get_common_commits(struct upload_pack_data *data,
+			      struct packet_reader *reader)
 {
 	struct object_id oid;
 	char last_hex[GIT_MAX_HEXSZ + 1];
@@ -372,34 +518,37 @@ static int get_common_commits(struct packet_reader *reader,
 	for (;;) {
 		const char *arg;
 
-		reset_timeout();
+		reset_timeout(data->timeout);
 
 		if (packet_reader_read(reader) != PACKET_READ_NORMAL) {
-			if (multi_ack == 2 && got_common
-			    && !got_other && ok_to_give_up(have_obj, want_obj)) {
+			if (data->multi_ack == MULTI_ACK_DETAILED
+			    && got_common
+			    && !got_other
+			    && ok_to_give_up(data)) {
 				sent_ready = 1;
 				packet_write_fmt(1, "ACK %s ready\n", last_hex);
 			}
-			if (have_obj->nr == 0 || multi_ack)
+			if (data->have_obj.nr == 0 || data->multi_ack)
 				packet_write_fmt(1, "NAK\n");
 
-			if (no_done && sent_ready) {
+			if (data->no_done && sent_ready) {
 				packet_write_fmt(1, "ACK %s\n", last_hex);
 				return 0;
 			}
-			if (stateless_rpc)
+			if (data->stateless_rpc)
 				exit(0);
 			got_common = 0;
 			got_other = 0;
 			continue;
 		}
 		if (skip_prefix(reader->line, "have ", &arg)) {
-			switch (got_oid(arg, &oid, have_obj)) {
+			switch (got_oid(data, arg, &oid)) {
 			case -1: /* they have what we do not */
 				got_other = 1;
-				if (multi_ack && ok_to_give_up(have_obj, want_obj)) {
+				if (data->multi_ack
+				    && ok_to_give_up(data)) {
 					const char *hex = oid_to_hex(&oid);
-					if (multi_ack == 2) {
+					if (data->multi_ack == MULTI_ACK_DETAILED) {
 						sent_ready = 1;
 						packet_write_fmt(1, "ACK %s ready\n", hex);
 					} else
@@ -409,19 +558,19 @@ static int get_common_commits(struct packet_reader *reader,
 			default:
 				got_common = 1;
 				oid_to_hex_r(last_hex, &oid);
-				if (multi_ack == 2)
+				if (data->multi_ack == MULTI_ACK_DETAILED)
 					packet_write_fmt(1, "ACK %s common\n", last_hex);
-				else if (multi_ack)
+				else if (data->multi_ack)
 					packet_write_fmt(1, "ACK %s continue\n", last_hex);
-				else if (have_obj->nr == 1)
+				else if (data->have_obj.nr == 1)
 					packet_write_fmt(1, "ACK %s\n", last_hex);
 				break;
 			}
 			continue;
 		}
 		if (!strcmp(reader->line, "done")) {
-			if (have_obj->nr > 0) {
-				if (multi_ack)
+			if (data->have_obj.nr > 0) {
+				if (data->multi_ack)
 					packet_write_fmt(1, "ACK %s\n", last_hex);
 				return 0;
 			}
@@ -432,10 +581,10 @@ static int get_common_commits(struct packet_reader *reader,
 	}
 }
 
-static int is_our_ref(struct object *o)
+static int is_our_ref(struct object *o, enum allow_uor allow_uor)
 {
-	int allow_hidden_ref = (allow_unadvertised_object_request &
-			(ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
+	int allow_hidden_ref = (allow_uor &
+				(ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
 	return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
 }
 
@@ -444,15 +593,15 @@ static int is_our_ref(struct object *o)
  */
 static int do_reachable_revlist(struct child_process *cmd,
 				struct object_array *src,
-				struct object_array *reachable)
+				struct object_array *reachable,
+				enum allow_uor allow_uor)
 {
 	static const char *argv[] = {
 		"rev-list", "--stdin", NULL,
 	};
 	struct object *o;
-	char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
+	FILE *cmd_in = NULL;
 	int i;
-	const unsigned hexsz = the_hash_algo->hexsz;
 
 	cmd->argv = argv;
 	cmd->git_cmd = 1;
@@ -470,35 +619,34 @@ static int do_reachable_revlist(struct child_process *cmd,
 	if (start_command(cmd))
 		goto error;
 
-	namebuf[0] = '^';
-	namebuf[hexsz + 1] = '\n';
+	cmd_in = xfdopen(cmd->in, "w");
+
 	for (i = get_max_object_index(); 0 < i; ) {
 		o = get_indexed_object(--i);
 		if (!o)
 			continue;
 		if (reachable && o->type == OBJ_COMMIT)
 			o->flags &= ~TMP_MARK;
-		if (!is_our_ref(o))
+		if (!is_our_ref(o, allow_uor))
 			continue;
-		memcpy(namebuf + 1, oid_to_hex(&o->oid), hexsz);
-		if (write_in_full(cmd->in, namebuf, hexsz + 2) < 0)
+		if (fprintf(cmd_in, "^%s\n", oid_to_hex(&o->oid)) < 0)
 			goto error;
 	}
-	namebuf[hexsz] = '\n';
 	for (i = 0; i < src->nr; i++) {
 		o = src->objects[i].item;
-		if (is_our_ref(o)) {
+		if (is_our_ref(o, allow_uor)) {
 			if (reachable)
 				add_object_array(o, NULL, reachable);
 			continue;
 		}
 		if (reachable && o->type == OBJ_COMMIT)
 			o->flags |= TMP_MARK;
-		memcpy(namebuf, oid_to_hex(&o->oid), hexsz);
-		if (write_in_full(cmd->in, namebuf, hexsz + 1) < 0)
+		if (fprintf(cmd_in, "%s\n", oid_to_hex(&o->oid)) < 0)
 			goto error;
 	}
-	close(cmd->in);
+	if (ferror(cmd_in) || fflush(cmd_in))
+		goto error;
+	fclose(cmd_in);
 	cmd->in = -1;
 	sigchain_pop(SIGPIPE);
 
@@ -507,14 +655,14 @@ static int do_reachable_revlist(struct child_process *cmd,
 error:
 	sigchain_pop(SIGPIPE);
 
-	if (cmd->in >= 0)
-		close(cmd->in);
+	if (cmd_in)
+		fclose(cmd_in);
 	if (cmd->out >= 0)
 		close(cmd->out);
 	return -1;
 }
 
-static int get_reachable_list(struct object_array *src,
+static int get_reachable_list(struct upload_pack_data *data,
 			      struct object_array *reachable)
 {
 	struct child_process cmd = CHILD_PROCESS_INIT;
@@ -523,7 +671,8 @@ static int get_reachable_list(struct object_array *src,
 	char namebuf[GIT_MAX_HEXSZ + 2]; /* ^ + hash + LF */
 	const unsigned hexsz = the_hash_algo->hexsz;
 
-	if (do_reachable_revlist(&cmd, src, reachable) < 0)
+	if (do_reachable_revlist(&cmd, &data->shallows, reachable,
+				 data->allow_uor) < 0)
 		return -1;
 
 	while ((i = read_in_full(cmd.out, namebuf, hexsz + 1)) == hexsz + 1) {
@@ -554,13 +703,13 @@ static int get_reachable_list(struct object_array *src,
 	return 0;
 }
 
-static int has_unreachable(struct object_array *src)
+static int has_unreachable(struct object_array *src, enum allow_uor allow_uor)
 {
 	struct child_process cmd = CHILD_PROCESS_INIT;
 	char buf[1];
 	int i;
 
-	if (do_reachable_revlist(&cmd, src, NULL) < 0)
+	if (do_reachable_revlist(&cmd, src, NULL, allow_uor) < 0)
 		return 1;
 
 	/*
@@ -585,14 +734,12 @@ static int has_unreachable(struct object_array *src)
 	return 0;
 
 error:
-	sigchain_pop(SIGPIPE);
 	if (cmd.out >= 0)
 		close(cmd.out);
 	return 1;
 }
 
-static void check_non_tip(struct object_array *want_obj,
-			  struct packet_writer *writer)
+static void check_non_tip(struct upload_pack_data *data)
 {
 	int i;
 
@@ -601,18 +748,18 @@ static void check_non_tip(struct object_array *want_obj,
 	 * uploadpack.allowReachableSHA1InWant,
 	 * non-tip requests can never happen.
 	 */
-	if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
+	if (!data->stateless_rpc && !(data->allow_uor & ALLOW_REACHABLE_SHA1))
 		goto error;
-	if (!has_unreachable(want_obj))
+	if (!has_unreachable(&data->want_obj, data->allow_uor))
 		/* All the non-tip ones are ancestors of what we advertised */
 		return;
 
 error:
 	/* Pick one of them (we know there at least is one) */
-	for (i = 0; i < want_obj->nr; i++) {
-		struct object *o = want_obj->objects[i].item;
-		if (!is_our_ref(o)) {
-			packet_writer_error(writer,
+	for (i = 0; i < data->want_obj.nr; i++) {
+		struct object *o = data->want_obj.objects[i].item;
+		if (!is_our_ref(o, data->allow_uor)) {
+			packet_writer_error(&data->writer,
 					    "upload-pack: not our ref %s",
 					    oid_to_hex(&o->oid));
 			die("git upload-pack: not our ref %s",
@@ -621,32 +768,30 @@ error:
 	}
 }
 
-static void send_shallow(struct packet_writer *writer,
+static void send_shallow(struct upload_pack_data *data,
 			 struct commit_list *result)
 {
 	while (result) {
 		struct object *object = &result->item->object;
 		if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) {
-			packet_writer_write(writer, "shallow %s",
+			packet_writer_write(&data->writer, "shallow %s",
 					    oid_to_hex(&object->oid));
 			register_shallow(the_repository, &object->oid);
-			shallow_nr++;
+			data->shallow_nr++;
 		}
 		result = result->next;
 	}
 }
 
-static void send_unshallow(struct packet_writer *writer,
-			   const struct object_array *shallows,
-			   struct object_array *want_obj)
+static void send_unshallow(struct upload_pack_data *data)
 {
 	int i;
 
-	for (i = 0; i < shallows->nr; i++) {
-		struct object *object = shallows->objects[i].item;
+	for (i = 0; i < data->shallows.nr; i++) {
+		struct object *object = data->shallows.objects[i].item;
 		if (object->flags & NOT_SHALLOW) {
 			struct commit_list *parents;
-			packet_writer_write(writer, "unshallow %s",
+			packet_writer_write(&data->writer, "unshallow %s",
 					    oid_to_hex(&object->oid));
 			object->flags &= ~CLIENT_SHALLOW;
 			/*
@@ -662,10 +807,10 @@ static void send_unshallow(struct packet_writer *writer,
 			parents = ((struct commit *)object)->parents;
 			while (parents) {
 				add_object_array(&parents->item->object,
-						 NULL, want_obj);
+						 NULL, &data->want_obj);
 				parents = parents->next;
 			}
-			add_object_array(object, NULL, &extra_edge_obj);
+			add_object_array(object, NULL, &data->extra_edge_obj);
 		}
 		/* make sure commit traversal conforms to client */
 		register_shallow(the_repository, &object->oid);
@@ -674,17 +819,16 @@ static void send_unshallow(struct packet_writer *writer,
 
 static int check_ref(const char *refname_full, const struct object_id *oid,
 		     int flag, void *cb_data);
-static void deepen(struct packet_writer *writer, int depth, int deepen_relative,
-		   struct object_array *shallows, struct object_array *want_obj)
+static void deepen(struct upload_pack_data *data, int depth)
 {
 	if (depth == INFINITE_DEPTH && !is_repository_shallow(the_repository)) {
 		int i;
 
-		for (i = 0; i < shallows->nr; i++) {
-			struct object *object = shallows->objects[i].item;
+		for (i = 0; i < data->shallows.nr; i++) {
+			struct object *object = data->shallows.objects[i].item;
 			object->flags |= NOT_SHALLOW;
 		}
-	} else if (deepen_relative) {
+	} else if (data->deepen_relative) {
 		struct object_array reachable_shallows = OBJECT_ARRAY_INIT;
 		struct commit_list *result;
 
@@ -695,87 +839,80 @@ static void deepen(struct packet_writer *writer, int depth, int deepen_relative,
 		head_ref_namespaced(check_ref, NULL);
 		for_each_namespaced_ref(check_ref, NULL);
 
-		get_reachable_list(shallows, &reachable_shallows);
+		get_reachable_list(data, &reachable_shallows);
 		result = get_shallow_commits(&reachable_shallows,
 					     depth + 1,
 					     SHALLOW, NOT_SHALLOW);
-		send_shallow(writer, result);
+		send_shallow(data, result);
 		free_commit_list(result);
 		object_array_clear(&reachable_shallows);
 	} else {
 		struct commit_list *result;
 
-		result = get_shallow_commits(want_obj, depth,
+		result = get_shallow_commits(&data->want_obj, depth,
 					     SHALLOW, NOT_SHALLOW);
-		send_shallow(writer, result);
+		send_shallow(data, result);
 		free_commit_list(result);
 	}
 
-	send_unshallow(writer, shallows, want_obj);
+	send_unshallow(data);
 }
 
-static void deepen_by_rev_list(struct packet_writer *writer, int ac,
-			       const char **av,
-			       struct object_array *shallows,
-			       struct object_array *want_obj)
+static void deepen_by_rev_list(struct upload_pack_data *data,
+			       int ac,
+			       const char **av)
 {
 	struct commit_list *result;
 
 	disable_commit_graph(the_repository);
 	result = get_shallow_commits_by_rev_list(ac, av, SHALLOW, NOT_SHALLOW);
-	send_shallow(writer, result);
+	send_shallow(data, result);
 	free_commit_list(result);
-	send_unshallow(writer, shallows, want_obj);
+	send_unshallow(data);
 }
 
 /* Returns 1 if a shallow list is sent or 0 otherwise */
-static int send_shallow_list(struct packet_writer *writer,
-			     int depth, int deepen_rev_list,
-			     timestamp_t deepen_since,
-			     struct string_list *deepen_not,
-			     int deepen_relative,
-			     struct object_array *shallows,
-			     struct object_array *want_obj)
+static int send_shallow_list(struct upload_pack_data *data)
 {
 	int ret = 0;
 
-	if (depth > 0 && deepen_rev_list)
+	if (data->depth > 0 && data->deepen_rev_list)
 		die("git upload-pack: deepen and deepen-since (or deepen-not) cannot be used together");
-	if (depth > 0) {
-		deepen(writer, depth, deepen_relative, shallows, want_obj);
+	if (data->depth > 0) {
+		deepen(data, data->depth);
 		ret = 1;
-	} else if (deepen_rev_list) {
-		struct argv_array av = ARGV_ARRAY_INIT;
+	} else if (data->deepen_rev_list) {
+		struct strvec av = STRVEC_INIT;
 		int i;
 
-		argv_array_push(&av, "rev-list");
-		if (deepen_since)
-			argv_array_pushf(&av, "--max-age=%"PRItime, deepen_since);
-		if (deepen_not->nr) {
-			argv_array_push(&av, "--not");
-			for (i = 0; i < deepen_not->nr; i++) {
-				struct string_list_item *s = deepen_not->items + i;
-				argv_array_push(&av, s->string);
+		strvec_push(&av, "rev-list");
+		if (data->deepen_since)
+			strvec_pushf(&av, "--max-age=%"PRItime, data->deepen_since);
+		if (data->deepen_not.nr) {
+			strvec_push(&av, "--not");
+			for (i = 0; i < data->deepen_not.nr; i++) {
+				struct string_list_item *s = data->deepen_not.items + i;
+				strvec_push(&av, s->string);
 			}
-			argv_array_push(&av, "--not");
+			strvec_push(&av, "--not");
 		}
-		for (i = 0; i < want_obj->nr; i++) {
-			struct object *o = want_obj->objects[i].item;
-			argv_array_push(&av, oid_to_hex(&o->oid));
+		for (i = 0; i < data->want_obj.nr; i++) {
+			struct object *o = data->want_obj.objects[i].item;
+			strvec_push(&av, oid_to_hex(&o->oid));
 		}
-		deepen_by_rev_list(writer, av.argc, av.argv, shallows, want_obj);
-		argv_array_clear(&av);
+		deepen_by_rev_list(data, av.nr, av.v);
+		strvec_clear(&av);
 		ret = 1;
 	} else {
-		if (shallows->nr > 0) {
+		if (data->shallows.nr > 0) {
 			int i;
-			for (i = 0; i < shallows->nr; i++)
+			for (i = 0; i < data->shallows.nr; i++)
 				register_shallow(the_repository,
-						 &shallows->objects[i].item->oid);
+						 &data->shallows.objects[i].item->oid);
 		}
 	}
 
-	shallow_nr += shallows->nr;
+	data->shallow_nr += data->shallows.nr;
 	return ret;
 }
 
@@ -848,43 +985,95 @@ static int process_deepen_not(const char *line, struct string_list *deepen_not,
 	return 0;
 }
 
-static void receive_needs(struct packet_reader *reader, struct object_array *want_obj)
+NORETURN __attribute__((format(printf,2,3)))
+static void send_err_and_die(struct upload_pack_data *data,
+			     const char *fmt, ...)
+{
+	struct strbuf buf = STRBUF_INIT;
+	va_list ap;
+
+	va_start(ap, fmt);
+	strbuf_vaddf(&buf, fmt, ap);
+	va_end(ap);
+
+	packet_writer_error(&data->writer, "%s", buf.buf);
+	die("%s", buf.buf);
+}
+
+static void check_one_filter(struct upload_pack_data *data,
+			     struct list_objects_filter_options *opts)
+{
+	const char *key = list_object_filter_config_name(opts->choice);
+	struct string_list_item *item = string_list_lookup(&data->allowed_filters,
+							   key);
+	int allowed;
+
+	if (item)
+		allowed = (intptr_t)item->util;
+	else
+		allowed = data->allow_filter_fallback;
+
+	if (!allowed)
+		send_err_and_die(data, "filter '%s' not supported", key);
+
+	if (opts->choice == LOFC_TREE_DEPTH &&
+	    opts->tree_exclude_depth > data->tree_filter_max_depth)
+		send_err_and_die(data,
+				 "tree filter allows max depth %lu, but got %lu",
+				 data->tree_filter_max_depth,
+				 opts->tree_exclude_depth);
+}
+
+static void check_filter_recurse(struct upload_pack_data *data,
+				 struct list_objects_filter_options *opts)
+{
+	size_t i;
+
+	check_one_filter(data, opts);
+	if (opts->choice != LOFC_COMBINE)
+		return;
+
+	for (i = 0; i < opts->sub_nr; i++)
+		check_filter_recurse(data, &opts->sub[i]);
+}
+
+static void die_if_using_banned_filter(struct upload_pack_data *data)
+{
+	check_filter_recurse(data, &data->filter_options);
+}
+
+static void receive_needs(struct upload_pack_data *data,
+			  struct packet_reader *reader)
 {
-	struct object_array shallows = OBJECT_ARRAY_INIT;
-	struct string_list deepen_not = STRING_LIST_INIT_DUP;
-	int depth = 0;
 	int has_non_tip = 0;
-	timestamp_t deepen_since = 0;
-	int deepen_rev_list = 0;
-	int deepen_relative = 0;
-	struct packet_writer writer;
 
-	shallow_nr = 0;
-	packet_writer_init(&writer, 1);
+	data->shallow_nr = 0;
 	for (;;) {
 		struct object *o;
 		const char *features;
 		struct object_id oid_buf;
 		const char *arg;
+		int feature_len;
 
-		reset_timeout();
+		reset_timeout(data->timeout);
 		if (packet_reader_read(reader) != PACKET_READ_NORMAL)
 			break;
 
-		if (process_shallow(reader->line, &shallows))
+		if (process_shallow(reader->line, &data->shallows))
 			continue;
-		if (process_deepen(reader->line, &depth))
+		if (process_deepen(reader->line, &data->depth))
 			continue;
-		if (process_deepen_since(reader->line, &deepen_since, &deepen_rev_list))
+		if (process_deepen_since(reader->line, &data->deepen_since, &data->deepen_rev_list))
 			continue;
-		if (process_deepen_not(reader->line, &deepen_not, &deepen_rev_list))
+		if (process_deepen_not(reader->line, &data->deepen_not, &data->deepen_rev_list))
 			continue;
 
 		if (skip_prefix(reader->line, "filter ", &arg)) {
-			if (!filter_capability_requested)
+			if (!data->filter_capability_requested)
 				die("git upload-pack: filtering capability not negotiated");
-			list_objects_filter_die_if_populated(&filter_options);
-			parse_list_objects_filter(&filter_options, arg);
+			list_objects_filter_die_if_populated(&data->filter_options);
+			parse_list_objects_filter(&data->filter_options, arg);
+			die_if_using_banned_filter(data);
 			continue;
 		}
 
@@ -894,31 +1083,39 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan
 			    "expected to get object ID, not '%s'", reader->line);
 
 		if (parse_feature_request(features, "deepen-relative"))
-			deepen_relative = 1;
+			data->deepen_relative = 1;
 		if (parse_feature_request(features, "multi_ack_detailed"))
-			multi_ack = 2;
+			data->multi_ack = MULTI_ACK_DETAILED;
 		else if (parse_feature_request(features, "multi_ack"))
-			multi_ack = 1;
+			data->multi_ack = MULTI_ACK;
 		if (parse_feature_request(features, "no-done"))
-			no_done = 1;
+			data->no_done = 1;
 		if (parse_feature_request(features, "thin-pack"))
-			use_thin_pack = 1;
+			data->use_thin_pack = 1;
 		if (parse_feature_request(features, "ofs-delta"))
-			use_ofs_delta = 1;
+			data->use_ofs_delta = 1;
 		if (parse_feature_request(features, "side-band-64k"))
-			use_sideband = LARGE_PACKET_MAX;
+			data->use_sideband = LARGE_PACKET_MAX;
 		else if (parse_feature_request(features, "side-band"))
-			use_sideband = DEFAULT_PACKET_MAX;
+			data->use_sideband = DEFAULT_PACKET_MAX;
 		if (parse_feature_request(features, "no-progress"))
-			no_progress = 1;
+			data->no_progress = 1;
 		if (parse_feature_request(features, "include-tag"))
-			use_include_tag = 1;
-		if (allow_filter && parse_feature_request(features, "filter"))
-			filter_capability_requested = 1;
+			data->use_include_tag = 1;
+		if (data->allow_filter &&
+		    parse_feature_request(features, "filter"))
+			data->filter_capability_requested = 1;
+
+		arg = parse_feature_value(features, "session-id", &feature_len, NULL);
+		if (arg) {
+			char *client_sid = xstrndup(arg, feature_len);
+			trace2_data_string("transfer", NULL, "client-sid", client_sid);
+			free(client_sid);
+		}
 
 		o = parse_object(the_repository, &oid_buf);
 		if (!o) {
-			packet_writer_error(&writer,
+			packet_writer_error(&data->writer,
 					    "upload-pack: not our ref %s",
 					    oid_to_hex(&oid_buf));
 			die("git upload-pack: not our ref %s",
@@ -926,10 +1123,10 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan
 		}
 		if (!(o->flags & WANTED)) {
 			o->flags |= WANTED;
-			if (!((allow_unadvertised_object_request & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
-			      || is_our_ref(o)))
+			if (!((data->allow_uor & ALLOW_ANY_SHA1) == ALLOW_ANY_SHA1
+			      || is_our_ref(o, data->allow_uor)))
 				has_non_tip = 1;
-			add_object_array(o, NULL, want_obj);
+			add_object_array(o, NULL, &data->want_obj);
 		}
 	}
 
@@ -941,26 +1138,23 @@ static void receive_needs(struct packet_reader *reader, struct object_array *wan
 	 * by another process that handled the initial request.
 	 */
 	if (has_non_tip)
-		check_non_tip(want_obj, &writer);
+		check_non_tip(data);
 
-	if (!use_sideband && daemon_mode)
-		no_progress = 1;
+	if (!data->use_sideband && data->daemon_mode)
+		data->no_progress = 1;
 
-	if (depth == 0 && !deepen_rev_list && shallows.nr == 0)
+	if (data->depth == 0 && !data->deepen_rev_list && data->shallows.nr == 0)
 		return;
 
-	if (send_shallow_list(&writer, depth, deepen_rev_list, deepen_since,
-			      &deepen_not, deepen_relative, &shallows,
-			      want_obj))
+	if (send_shallow_list(data))
 		packet_flush(1);
-	object_array_clear(&shallows);
 }
 
 /* return non-zero if the ref is hidden, otherwise 0 */
 static int mark_our_ref(const char *refname, const char *refname_full,
 			const struct object_id *oid)
 {
-	struct object *o = lookup_unknown_object(oid);
+	struct object *o = lookup_unknown_object(the_repository, oid);
 
 	if (ref_is_hidden(refname, refname_full)) {
 		o->flags |= HIDDEN_REF;
@@ -989,6 +1183,11 @@ static void format_symref_info(struct strbuf *buf, struct string_list *symref)
 		strbuf_addf(buf, " symref=%s:%s", item->string, (char *)item->util);
 }
 
+static void format_session_id(struct strbuf *buf, struct upload_pack_data *d) {
+	if (d->advertise_sid)
+		strbuf_addf(buf, " session-id=%s", trace2_session_id());
+}
+
 static int send_ref(const char *refname, const struct object_id *oid,
 		    int flag, void *cb_data)
 {
@@ -997,31 +1196,37 @@ static int send_ref(const char *refname, const struct object_id *oid,
 		" deepen-relative no-progress include-tag multi_ack_detailed";
 	const char *refname_nons = strip_namespace(refname);
 	struct object_id peeled;
+	struct upload_pack_data *data = cb_data;
 
 	if (mark_our_ref(refname_nons, refname, oid))
 		return 0;
 
 	if (capabilities) {
 		struct strbuf symref_info = STRBUF_INIT;
+		struct strbuf session_id = STRBUF_INIT;
 
-		format_symref_info(&symref_info, cb_data);
-		packet_write_fmt(1, "%s %s%c%s%s%s%s%s%s agent=%s\n",
+		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",
 			     oid_to_hex(oid), refname_nons,
 			     0, capabilities,
-			     (allow_unadvertised_object_request & ALLOW_TIP_SHA1) ?
+			     (data->allow_uor & ALLOW_TIP_SHA1) ?
 				     " allow-tip-sha1-in-want" : "",
-			     (allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1) ?
+			     (data->allow_uor & ALLOW_REACHABLE_SHA1) ?
 				     " allow-reachable-sha1-in-want" : "",
-			     stateless_rpc ? " no-done" : "",
+			     data->stateless_rpc ? " no-done" : "",
 			     symref_info.buf,
-			     allow_filter ? " filter" : "",
+			     data->allow_filter ? " filter" : "",
+			     session_id.buf,
+			     the_hash_algo->name,
 			     git_user_agent_sanitized());
 		strbuf_release(&symref_info);
+		strbuf_release(&session_id);
 	} else {
 		packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
 	}
 	capabilities = NULL;
-	if (!peel_ref(refname, &peeled))
+	if (!peel_iterated_oid(oid, &peeled))
 		packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
 	return 0;
 }
@@ -1042,132 +1247,138 @@ static int find_symref(const char *refname, const struct object_id *oid,
 	return 0;
 }
 
-static int upload_pack_config(const char *var, const char *value, void *unused)
+static int parse_object_filter_config(const char *var, const char *value,
+				       struct upload_pack_data *data)
 {
+	struct strbuf buf = STRBUF_INIT;
+	const char *sub, *key;
+	size_t sub_len;
+
+	if (parse_config_key(var, "uploadpackfilter", &sub, &sub_len, &key))
+		return 0;
+
+	if (!sub) {
+		if (!strcmp(key, "allow"))
+			data->allow_filter_fallback = git_config_bool(var, value);
+		return 0;
+	}
+
+	strbuf_add(&buf, sub, sub_len);
+
+	if (!strcmp(key, "allow"))
+		string_list_insert(&data->allowed_filters, buf.buf)->util =
+			(void *)(intptr_t)git_config_bool(var, value);
+	else if (!strcmp(buf.buf, "tree") && !strcmp(key, "maxdepth")) {
+		if (!value) {
+			strbuf_release(&buf);
+			return config_error_nonbool(var);
+		}
+		string_list_insert(&data->allowed_filters, buf.buf)->util =
+			(void *)(intptr_t)1;
+		data->tree_filter_max_depth = git_config_ulong(var, value);
+	}
+
+	strbuf_release(&buf);
+	return 0;
+}
+
+static int upload_pack_config(const char *var, const char *value, void *cb_data)
+{
+	struct upload_pack_data *data = cb_data;
+
 	if (!strcmp("uploadpack.allowtipsha1inwant", var)) {
 		if (git_config_bool(var, value))
-			allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
+			data->allow_uor |= ALLOW_TIP_SHA1;
 		else
-			allow_unadvertised_object_request &= ~ALLOW_TIP_SHA1;
+			data->allow_uor &= ~ALLOW_TIP_SHA1;
 	} else if (!strcmp("uploadpack.allowreachablesha1inwant", var)) {
 		if (git_config_bool(var, value))
-			allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
+			data->allow_uor |= ALLOW_REACHABLE_SHA1;
 		else
-			allow_unadvertised_object_request &= ~ALLOW_REACHABLE_SHA1;
+			data->allow_uor &= ~ALLOW_REACHABLE_SHA1;
 	} else if (!strcmp("uploadpack.allowanysha1inwant", var)) {
 		if (git_config_bool(var, value))
-			allow_unadvertised_object_request |= ALLOW_ANY_SHA1;
+			data->allow_uor |= ALLOW_ANY_SHA1;
 		else
-			allow_unadvertised_object_request &= ~ALLOW_ANY_SHA1;
+			data->allow_uor &= ~ALLOW_ANY_SHA1;
 	} else if (!strcmp("uploadpack.keepalive", var)) {
-		keepalive = git_config_int(var, value);
-		if (!keepalive)
-			keepalive = -1;
+		data->keepalive = git_config_int(var, value);
+		if (!data->keepalive)
+			data->keepalive = -1;
 	} else if (!strcmp("uploadpack.allowfilter", var)) {
-		allow_filter = git_config_bool(var, value);
+		data->allow_filter = git_config_bool(var, value);
 	} else if (!strcmp("uploadpack.allowrefinwant", var)) {
-		allow_ref_in_want = git_config_bool(var, value);
+		data->allow_ref_in_want = git_config_bool(var, value);
 	} else if (!strcmp("uploadpack.allowsidebandall", var)) {
-		allow_sideband_all = git_config_bool(var, value);
+		data->allow_sideband_all = git_config_bool(var, value);
 	} else if (!strcmp("core.precomposeunicode", var)) {
 		precomposed_unicode = git_config_bool(var, value);
+	} else if (!strcmp("transfer.advertisesid", var)) {
+		data->advertise_sid = git_config_bool(var, value);
 	}
 
-	if (current_config_scope() != CONFIG_SCOPE_REPO) {
+	if (current_config_scope() != CONFIG_SCOPE_LOCAL &&
+	    current_config_scope() != CONFIG_SCOPE_WORKTREE) {
 		if (!strcmp("uploadpack.packobjectshook", var))
-			return git_config_string(&pack_objects_hook, var, value);
+			return git_config_string(&data->pack_objects_hook, var, value);
 	}
 
+	if (parse_object_filter_config(var, value, data) < 0)
+		return -1;
+
 	return parse_hide_refs_config(var, value, "uploadpack");
 }
 
 void upload_pack(struct upload_pack_options *options)
 {
-	struct string_list symref = STRING_LIST_INIT_DUP;
-	struct object_array want_obj = OBJECT_ARRAY_INIT;
 	struct packet_reader reader;
+	struct upload_pack_data data;
+
+	upload_pack_data_init(&data);
 
-	stateless_rpc = options->stateless_rpc;
-	timeout = options->timeout;
-	daemon_mode = options->daemon_mode;
+	git_config(upload_pack_config, &data);
 
-	git_config(upload_pack_config, NULL);
+	data.stateless_rpc = options->stateless_rpc;
+	data.daemon_mode = options->daemon_mode;
+	data.timeout = options->timeout;
 
-	head_ref_namespaced(find_symref, &symref);
+	head_ref_namespaced(find_symref, &data.symref);
 
-	if (options->advertise_refs || !stateless_rpc) {
-		reset_timeout();
-		head_ref_namespaced(send_ref, &symref);
-		for_each_namespaced_ref(send_ref, &symref);
+	if (options->advertise_refs || !data.stateless_rpc) {
+		reset_timeout(data.timeout);
+		head_ref_namespaced(send_ref, &data);
+		for_each_namespaced_ref(send_ref, &data);
 		advertise_shallow_grafts(1);
 		packet_flush(1);
 	} else {
 		head_ref_namespaced(check_ref, NULL);
 		for_each_namespaced_ref(check_ref, NULL);
 	}
-	string_list_clear(&symref, 1);
-	if (options->advertise_refs)
-		return;
 
-	packet_reader_init(&reader, 0, NULL, 0,
-			   PACKET_READ_CHOMP_NEWLINE |
-			   PACKET_READ_DIE_ON_ERR_PACKET);
+	if (!options->advertise_refs) {
+		packet_reader_init(&reader, 0, NULL, 0,
+				   PACKET_READ_CHOMP_NEWLINE |
+				   PACKET_READ_DIE_ON_ERR_PACKET);
 
-	receive_needs(&reader, &want_obj);
-	if (want_obj.nr) {
-		struct object_array have_obj = OBJECT_ARRAY_INIT;
-		get_common_commits(&reader, &have_obj, &want_obj);
-		create_pack_file(&have_obj, &want_obj);
-	}
-}
+		receive_needs(&data, &reader);
 
-struct upload_pack_data {
-	struct object_array wants;
-	struct string_list wanted_refs;
-	struct oid_array haves;
-
-	struct object_array shallows;
-	struct string_list deepen_not;
-	int depth;
-	timestamp_t deepen_since;
-	int deepen_rev_list;
-	int deepen_relative;
-
-	struct packet_writer writer;
-
-	unsigned stateless_rpc : 1;
-
-	unsigned use_thin_pack : 1;
-	unsigned use_ofs_delta : 1;
-	unsigned no_progress : 1;
-	unsigned use_include_tag : 1;
-	unsigned done : 1;
-};
-
-static void upload_pack_data_init(struct upload_pack_data *data)
-{
-	struct object_array wants = OBJECT_ARRAY_INIT;
-	struct string_list wanted_refs = STRING_LIST_INIT_DUP;
-	struct oid_array haves = OID_ARRAY_INIT;
-	struct object_array shallows = OBJECT_ARRAY_INIT;
-	struct string_list deepen_not = STRING_LIST_INIT_DUP;
-
-	memset(data, 0, sizeof(*data));
-	data->wants = wants;
-	data->wanted_refs = wanted_refs;
-	data->haves = haves;
-	data->shallows = shallows;
-	data->deepen_not = deepen_not;
-	packet_writer_init(&data->writer, 1);
-}
+		/*
+		 * An EOF at this exact point in negotiation should be
+		 * acceptable from stateless clients as they will consume the
+		 * shallow list before doing subsequent rpc with haves/etc.
+		 */
+		if (data.stateless_rpc)
+			reader.options |= PACKET_READ_GENTLE_ON_EOF;
+
+		if (data.want_obj.nr &&
+		    packet_reader_peek(&reader) != PACKET_READ_EOF) {
+			reader.options &= ~PACKET_READ_GENTLE_ON_EOF;
+			get_common_commits(&data, &reader);
+			create_pack_file(&data, NULL);
+		}
+	}
 
-static void upload_pack_data_clear(struct upload_pack_data *data)
-{
-	object_array_clear(&data->wants);
-	string_list_clear(&data->wanted_refs, 1);
-	oid_array_clear(&data->haves);
-	object_array_clear(&data->shallows);
-	string_list_clear(&data->deepen_not, 0);
+	upload_pack_data_clear(&data);
 }
 
 static int parse_want(struct packet_writer *writer, const char *line,
@@ -1206,21 +1417,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);
@@ -1248,19 +1463,18 @@ static int parse_have(const char *line, struct oid_array *haves)
 }
 
 static void process_args(struct packet_reader *request,
-			 struct upload_pack_data *data,
-			 struct object_array *want_obj)
+			 struct upload_pack_data *data)
 {
-	while (packet_reader_read(request) != PACKET_READ_FLUSH) {
+	while (packet_reader_read(request) == PACKET_READ_NORMAL) {
 		const char *arg = request->line;
 		const char *p;
 
 		/* process want */
-		if (parse_want(&data->writer, arg, want_obj))
+		if (parse_want(&data->writer, arg, &data->want_obj))
 			continue;
-		if (allow_ref_in_want &&
+		if (data->allow_ref_in_want &&
 		    parse_want_ref(&data->writer, arg, &data->wanted_refs,
-				   want_obj))
+				   &data->want_obj))
 			continue;
 		/* process have line */
 		if (parse_have(arg, &data->haves))
@@ -1268,25 +1482,29 @@ static void process_args(struct packet_reader *request,
 
 		/* process args like thin-pack */
 		if (!strcmp(arg, "thin-pack")) {
-			use_thin_pack = 1;
+			data->use_thin_pack = 1;
 			continue;
 		}
 		if (!strcmp(arg, "ofs-delta")) {
-			use_ofs_delta = 1;
+			data->use_ofs_delta = 1;
 			continue;
 		}
 		if (!strcmp(arg, "no-progress")) {
-			no_progress = 1;
+			data->no_progress = 1;
 			continue;
 		}
 		if (!strcmp(arg, "include-tag")) {
-			use_include_tag = 1;
+			data->use_include_tag = 1;
 			continue;
 		}
 		if (!strcmp(arg, "done")) {
 			data->done = 1;
 			continue;
 		}
+		if (!strcmp(arg, "wait-for-done")) {
+			data->wait_for_done = 1;
+			continue;
+		}
 
 		/* Shallow related arguments */
 		if (process_shallow(arg, &data->shallows))
@@ -1304,101 +1522,89 @@ static void process_args(struct packet_reader *request,
 			continue;
 		}
 
-		if (allow_filter && skip_prefix(arg, "filter ", &p)) {
-			list_objects_filter_die_if_populated(&filter_options);
-			parse_list_objects_filter(&filter_options, p);
+		if (data->allow_filter && skip_prefix(arg, "filter ", &p)) {
+			list_objects_filter_die_if_populated(&data->filter_options);
+			parse_list_objects_filter(&data->filter_options, p);
+			die_if_using_banned_filter(data);
 			continue;
 		}
 
 		if ((git_env_bool("GIT_TEST_SIDEBAND_ALL", 0) ||
-		     allow_sideband_all) &&
+		     data->allow_sideband_all) &&
 		    !strcmp(arg, "sideband-all")) {
 			data->writer.use_sideband = 1;
 			continue;
 		}
 
+		if (skip_prefix(arg, "packfile-uris ", &p)) {
+			string_list_split(&data->uri_protocols, p, ',', -1);
+			continue;
+		}
+
 		/* ignore unknown lines maybe? */
 		die("unexpected line: '%s'", arg);
 	}
+
+	if (data->uri_protocols.nr && !data->writer.use_sideband)
+		string_list_clear(&data->uri_protocols, 0);
+
+	if (request->status != PACKET_READ_FLUSH)
+		die(_("expected flush after fetch arguments"));
 }
 
-static int process_haves(struct oid_array *haves, struct oid_array *common,
-			 struct object_array *have_obj)
+static int process_haves(struct upload_pack_data *data, struct oid_array *common)
 {
 	int i;
 
 	/* Process haves */
-	for (i = 0; i < haves->nr; i++) {
-		const struct object_id *oid = &haves->oid[i];
-		struct object *o;
-		int we_knew_they_have = 0;
+	for (i = 0; i < data->haves.nr; i++) {
+		const struct object_id *oid = &data->haves.oid[i];
 
-		if (!has_object_file(oid))
+		if (!has_object_file_with_flags(oid,
+						OBJECT_INFO_QUICK | OBJECT_INFO_SKIP_FETCH_OBJECT))
 			continue;
 
 		oid_array_append(common, oid);
 
-		o = parse_object(the_repository, oid);
-		if (!o)
-			die("oops (%s)", oid_to_hex(oid));
-		if (o->type == OBJ_COMMIT) {
-			struct commit_list *parents;
-			struct commit *commit = (struct commit *)o;
-			if (o->flags & THEY_HAVE)
-				we_knew_they_have = 1;
-			else
-				o->flags |= THEY_HAVE;
-			if (!oldest_have || (commit->date < oldest_have))
-				oldest_have = commit->date;
-			for (parents = commit->parents;
-			     parents;
-			     parents = parents->next)
-				parents->item->object.flags |= THEY_HAVE;
-		}
-		if (!we_knew_they_have)
-			add_object_array(o, NULL, have_obj);
+		do_got_oid(data, oid);
 	}
 
 	return 0;
 }
 
-static int send_acks(struct packet_writer *writer, struct oid_array *acks,
-		     const struct object_array *have_obj,
-		     struct object_array *want_obj)
+static int send_acks(struct upload_pack_data *data, struct oid_array *acks)
 {
 	int i;
 
-	packet_writer_write(writer, "acknowledgments\n");
+	packet_writer_write(&data->writer, "acknowledgments\n");
 
 	/* Send Acks */
 	if (!acks->nr)
-		packet_writer_write(writer, "NAK\n");
+		packet_writer_write(&data->writer, "NAK\n");
 
 	for (i = 0; i < acks->nr; i++) {
-		packet_writer_write(writer, "ACK %s\n",
+		packet_writer_write(&data->writer, "ACK %s\n",
 				    oid_to_hex(&acks->oid[i]));
 	}
 
-	if (ok_to_give_up(have_obj, want_obj)) {
+	if (!data->wait_for_done && ok_to_give_up(data)) {
 		/* Send Ready */
-		packet_writer_write(writer, "ready\n");
+		packet_writer_write(&data->writer, "ready\n");
 		return 1;
 	}
 
 	return 0;
 }
 
-static int process_haves_and_send_acks(struct upload_pack_data *data,
-				       struct object_array *have_obj,
-				       struct object_array *want_obj)
+static int process_haves_and_send_acks(struct upload_pack_data *data)
 {
 	struct oid_array common = OID_ARRAY_INIT;
 	int ret = 0;
 
-	process_haves(&data->haves, &common, have_obj);
+	process_haves(data, &common);
 	if (data->done) {
 		ret = 1;
-	} else if (send_acks(&data->writer, &common, have_obj, want_obj)) {
+	} else if (send_acks(data, &common)) {
 		packet_writer_delim(&data->writer);
 		ret = 1;
 	} else {
@@ -1430,8 +1636,7 @@ static void send_wanted_ref_info(struct upload_pack_data *data)
 	packet_writer_delim(&data->writer);
 }
 
-static void send_shallow_info(struct upload_pack_data *data,
-			      struct object_array *want_obj)
+static void send_shallow_info(struct upload_pack_data *data)
 {
 	/* No shallow info needs to be sent */
 	if (!data->depth && !data->deepen_rev_list && !data->shallows.nr &&
@@ -1440,14 +1645,9 @@ static void send_shallow_info(struct upload_pack_data *data,
 
 	packet_writer_write(&data->writer, "shallow-info\n");
 
-	if (!send_shallow_list(&data->writer, data->depth,
-			       data->deepen_rev_list,
-			       data->deepen_since, &data->deepen_not,
-			       data->deepen_relative,
-			       &data->shallows, want_obj) &&
+	if (!send_shallow_list(data) &&
 	    is_repository_shallow(the_repository))
-		deepen(&data->writer, INFINITE_DEPTH, data->deepen_relative,
-		       &data->shallows, want_obj);
+		deepen(data, INFINITE_DEPTH);
 
 	packet_delim(1);
 }
@@ -1459,30 +1659,31 @@ enum fetch_state {
 	FETCH_DONE,
 };
 
-int upload_pack_v2(struct repository *r, struct argv_array *keys,
+int upload_pack_v2(struct repository *r, struct strvec *keys,
 		   struct packet_reader *request)
 {
 	enum fetch_state state = FETCH_PROCESS_ARGS;
 	struct upload_pack_data data;
-	struct object_array have_obj = OBJECT_ARRAY_INIT;
-	struct object_array want_obj = OBJECT_ARRAY_INIT;
 
 	clear_object_flags(ALL_FLAGS);
 
-	git_config(upload_pack_config, NULL);
-
 	upload_pack_data_init(&data);
-	use_sideband = LARGE_PACKET_MAX;
+	data.use_sideband = LARGE_PACKET_MAX;
+
+	git_config(upload_pack_config, &data);
 
 	while (state != FETCH_DONE) {
 		switch (state) {
 		case FETCH_PROCESS_ARGS:
-			process_args(request, &data, &want_obj);
+			process_args(request, &data);
 
-			if (!want_obj.nr) {
+			if (!data.want_obj.nr && !data.wait_for_done) {
 				/*
-				 * Request didn't contain any 'want' lines,
-				 * guess they didn't want anything.
+				 * Request didn't contain any 'want' lines (and
+				 * the request does not contain
+				 * "wait-for-done", in which it is reasonable
+				 * to just send 'have's without 'want's); guess
+				 * they didn't want anything.
 				 */
 				state = FETCH_DONE;
 			} else if (data.haves.nr) {
@@ -1499,18 +1700,21 @@ int upload_pack_v2(struct repository *r, struct argv_array *keys,
 			}
 			break;
 		case FETCH_SEND_ACKS:
-			if (process_haves_and_send_acks(&data, &have_obj,
-							&want_obj))
+			if (process_haves_and_send_acks(&data))
 				state = FETCH_SEND_PACK;
 			else
 				state = FETCH_DONE;
 			break;
 		case FETCH_SEND_PACK:
 			send_wanted_ref_info(&data);
-			send_shallow_info(&data, &want_obj);
+			send_shallow_info(&data);
 
-			packet_writer_write(&data.writer, "packfile\n");
-			create_pack_file(&have_obj, &want_obj);
+			if (data.uri_protocols.nr) {
+				create_pack_file(&data, &data.uri_protocols);
+			} else {
+				packet_writer_write(&data.writer, "packfile\n");
+				create_pack_file(&data, NULL);
+			}
 			state = FETCH_DONE;
 			break;
 		case FETCH_DONE:
@@ -1519,8 +1723,6 @@ int upload_pack_v2(struct repository *r, struct argv_array *keys,
 	}
 
 	upload_pack_data_clear(&data);
-	object_array_clear(&have_obj);
-	object_array_clear(&want_obj);
 	return 0;
 }
 
@@ -1531,8 +1733,9 @@ int upload_pack_advertise(struct repository *r,
 		int allow_filter_value;
 		int allow_ref_in_want;
 		int allow_sideband_all_value;
+		char *str = NULL;
 
-		strbuf_addstr(value, "shallow");
+		strbuf_addstr(value, "shallow wait-for-done");
 
 		if (!repo_config_get_bool(the_repository,
 					 "uploadpack.allowfilter",
@@ -1552,6 +1755,14 @@ int upload_pack_advertise(struct repository *r,
 					   &allow_sideband_all_value) &&
 		     allow_sideband_all_value))
 			strbuf_addstr(value, " sideband-all");
+
+		if (!repo_config_get_string(the_repository,
+					    "uploadpack.blobpackfileuri",
+					    &str) &&
+		    str) {
+			strbuf_addstr(value, " packfile-uris");
+			free(str);
+		}
 	}
 
 	return 1;
diff --git a/upload-pack.h b/upload-pack.h
index 4bafe16a22..27ddcdc6cb 100644
--- a/upload-pack.h
+++ b/upload-pack.h
@@ -11,9 +11,9 @@ struct upload_pack_options {
 void upload_pack(struct upload_pack_options *options);
 
 struct repository;
-struct argv_array;
+struct strvec;
 struct packet_reader;
-int upload_pack_v2(struct repository *r, struct argv_array *keys,
+int upload_pack_v2(struct repository *r, struct strvec *keys,
 		   struct packet_reader *request);
 
 struct strbuf;
diff --git a/url.c b/url.c
index e34e5e7517..e04bd60b6b 100644
--- a/url.c
+++ b/url.c
@@ -5,7 +5,7 @@ int is_urlschemechar(int first_flag, int ch)
 {
 	/*
 	 * The set of valid URL schemes, as per STD66 (RFC3986) is
-	 * '[A-Za-z][A-Za-z0-9+.-]*'. But use sightly looser check
+	 * '[A-Za-z][A-Za-z0-9+.-]*'. But use slightly looser check
 	 * of '[A-Za-z0-9][A-Za-z0-9+.-]*' because earlier version
 	 * of check used '[A-Za-z0-9]+' so not to break any remote
 	 * helpers.
diff --git a/urlmatch.c b/urlmatch.c
index 3e42bd7504..33a2ccd306 100644
--- a/urlmatch.c
+++ b/urlmatch.c
@@ -557,6 +557,8 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
 	const char *key, *dot;
 	struct strbuf synthkey = STRBUF_INIT;
 	int retval;
+	int (*select_fn)(const struct urlmatch_item *a, const struct urlmatch_item *b) =
+		collect->select_fn ? collect->select_fn : cmp_matches;
 
 	if (!skip_prefix(var, collect->section, &key) || *(key++) != '.') {
 		if (collect->cascade_fn)
@@ -570,10 +572,14 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
 
 		config_url = xmemdupz(key, dot - key);
 		norm_url = url_normalize_1(config_url, &norm_info, 1);
+		if (norm_url)
+			retval = match_urls(url, &norm_info, &matched);
+		else if (collect->fallback_match_fn)
+			retval = collect->fallback_match_fn(config_url,
+							    collect->cb);
+		else
+			retval = 0;
 		free(config_url);
-		if (!norm_url)
-			return 0;
-		retval = match_urls(url, &norm_info, &matched);
 		free(norm_url);
 		if (!retval)
 			return 0;
@@ -587,7 +593,7 @@ int urlmatch_config_entry(const char *var, const char *value, void *cb)
 	if (!item->util) {
 		item->util = xcalloc(1, sizeof(matched));
 	} else {
-		if (cmp_matches(&matched, item->util) < 0)
+		if (select_fn(&matched, item->util) < 0)
 			 /*
 			  * Our match is worse than the old one,
 			  * we cannot use it.
diff --git a/urlmatch.h b/urlmatch.h
index eed5f29235..6ff42f81b0 100644
--- a/urlmatch.h
+++ b/urlmatch.h
@@ -50,6 +50,20 @@ struct urlmatch_config {
 	void *cb;
 	int (*collect_fn)(const char *var, const char *value, void *cb);
 	int (*cascade_fn)(const char *var, const char *value, void *cb);
+	/*
+	 * Compare the two matches, the one just discovered and the existing
+	 * best match and return a negative value if the found item is to be
+	 * rejected or a non-negative value if it is to be accepted.  If this
+	 * field is set to NULL, use the default comparison technique, which
+	 * checks to ses if found is better (according to the urlmatch
+	 * specificity rules) than existing.
+	 */
+	int (*select_fn)(const struct urlmatch_item *found, const struct urlmatch_item *existing);
+	/*
+	 * An optional callback to allow e.g. for partial URLs; it shall
+	 * return 1 or 0 depending whether `url` matches or not.
+	 */
+	int (*fallback_match_fn)(const char *url, void *cb);
 };
 
 int urlmatch_config_entry(const char *var, const char *value, void *cb);
diff --git a/usage.c b/usage.c
index 2fdb20086b..c7d233b0de 100644
--- a/usage.c
+++ b/usage.c
@@ -9,14 +9,26 @@
 void vreportf(const char *prefix, const char *err, va_list params)
 {
 	char msg[4096];
-	char *p;
+	char *p, *pend = msg + sizeof(msg);
+	size_t prefix_len = strlen(prefix);
 
-	vsnprintf(msg, sizeof(msg), err, params);
-	for (p = msg; *p; p++) {
+	if (sizeof(msg) <= prefix_len) {
+		fprintf(stderr, "BUG!!! too long a prefix '%s'\n", prefix);
+		abort();
+	}
+	memcpy(msg, prefix, prefix_len);
+	p = msg + prefix_len;
+	if (vsnprintf(p, pend - p, err, params) < 0)
+		*p = '\0'; /* vsnprintf() failed, clip at prefix */
+
+	for (; p != pend - 1 && *p; p++) {
 		if (iscntrl(*p) && *p != '\t' && *p != '\n')
 			*p = '?';
 	}
-	fprintf(stderr, "%s%s\n", prefix, msg);
+
+	*(p++) = '\n'; /* we no longer need a NUL */
+	fflush(stderr);
+	write_in_full(2, msg, p - msg);
 }
 
 static NORETURN void usage_builtin(const char *err, va_list params)
@@ -43,12 +55,13 @@ static NORETURN void usage_builtin(const char *err, va_list params)
 	exit(129);
 }
 
+/*
+ * 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
+ * only be walked once).
+ */
 static NORETURN void die_builtin(const char *err, va_list params)
 {
-	/*
-	 * We call this trace2 function first and expect it to va_copy 'params'
-	 * before using it (because an 'ap' can only be walked once).
-	 */
 	trace2_cmd_error_va(err, params);
 
 	vreportf("fatal: ", err, params);
@@ -58,10 +71,6 @@ static NORETURN void die_builtin(const char *err, va_list params)
 
 static void error_builtin(const char *err, va_list params)
 {
-	/*
-	 * We call this trace2 function first and expect it to va_copy 'params'
-	 * before using it (because an 'ap' can only be walked once).
-	 */
 	trace2_cmd_error_va(err, params);
 
 	vreportf("error: ", err, params);
@@ -69,6 +78,8 @@ static void error_builtin(const char *err, va_list params)
 
 static void warn_builtin(const char *warn, va_list params)
 {
+	trace2_cmd_error_va(warn, params);
+
 	vreportf("warning: ", warn, params);
 }
 
@@ -96,33 +107,33 @@ static int die_is_recursing_builtin(void)
 
 /* If we are in a dlopen()ed .so write to a global variable would segfault
  * (ugh), so keep things static. */
-static NORETURN_PTR void (*usage_routine)(const char *err, va_list params) = usage_builtin;
-static NORETURN_PTR void (*die_routine)(const char *err, va_list params) = die_builtin;
-static void (*error_routine)(const char *err, va_list params) = error_builtin;
-static void (*warn_routine)(const char *err, va_list params) = warn_builtin;
+static NORETURN_PTR report_fn usage_routine = usage_builtin;
+static NORETURN_PTR report_fn die_routine = die_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;
 
-void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params))
+void set_die_routine(NORETURN_PTR report_fn routine)
 {
 	die_routine = routine;
 }
 
-void set_error_routine(void (*routine)(const char *err, va_list params))
+void set_error_routine(report_fn routine)
 {
 	error_routine = routine;
 }
 
-void (*get_error_routine(void))(const char *err, va_list params)
+report_fn get_error_routine(void)
 {
 	return error_routine;
 }
 
-void set_warn_routine(void (*routine)(const char *warn, va_list params))
+void set_warn_routine(report_fn routine)
 {
 	warn_routine = routine;
 }
 
-void (*get_warn_routine(void))(const char *warn, va_list params)
+report_fn get_warn_routine(void)
 {
 	return warn_routine;
 }
@@ -248,6 +259,10 @@ int BUG_exit_code;
 static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, va_list params)
 {
 	char prefix[256];
+	va_list params_copy;
+	static int in_bug;
+
+	va_copy(params_copy, params);
 
 	/* truncation via snprintf is OK here */
 	if (file)
@@ -256,6 +271,13 @@ static NORETURN void BUG_vfl(const char *file, int line, const char *fmt, va_lis
 		snprintf(prefix, sizeof(prefix), "BUG: ");
 
 	vreportf(prefix, fmt, params);
+
+	if (in_bug)
+		abort();
+	in_bug = 1;
+
+	trace2_cmd_error_va(fmt, params_copy);
+
 	if (BUG_exit_code)
 		exit(BUG_exit_code);
 	abort();
diff --git a/userdiff.c b/userdiff.c
index e187d356f6..b073e5563b 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"
@@ -23,6 +33,67 @@ IPATTERN("ada",
 	 "[a-zA-Z][a-zA-Z0-9_]*"
 	 "|[-+]?[0-9][0-9#_.aAbBcCdDeEfF]*([eE][+-]?[0-9_]+)?"
 	 "|=>|\\.\\.|\\*\\*|:=|/=|>=|<=|<<|>>|<>"),
+PATTERNS("bash",
+	 /* Optional leading indentation */
+	 "^[ \t]*"
+	 /* Start of captured text */
+	 "("
+	 "("
+	     /* POSIX identifier with mandatory parentheses */
+	     "[a-zA-Z_][a-zA-Z0-9_]*[ \t]*\\([ \t]*\\))"
+	 "|"
+	     /* Bashism identifier with optional parentheses */
+	     "(function[ \t]+[a-zA-Z_][a-zA-Z0-9_]*(([ \t]*\\([ \t]*\\))|([ \t]+))"
+	 ")"
+	 /* Optional whitespace */
+	 "[ \t]*"
+	 /* Compound command starting with `{`, `(`, `((` or `[[` */
+	 "(\\{|\\(\\(?|\\[\\[)"
+	 /* End of captured text */
+	 ")",
+	 /* -- */
+	 /* Characters not in the default $IFS value */
+	 "[^ \t]+"),
+PATTERNS("bibtex",
+	 "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
+	 /* -- */
+	 "[={}\"]|[^={}\" \t]+"),
+PATTERNS("cpp",
+	 /* Jump targets or access declarations */
+	 "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:[[:space:]]*($|/[/*])\n"
+	 /* functions/methods, variables, and compounds at top level */
+	 "^((::[[:space:]]*)?[A-Za-z_].*)$",
+	 /* -- */
+	 "[a-zA-Z_][a-zA-Z0-9_]*"
+	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*"
+	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"),
+PATTERNS("csharp",
+	 /* Keywords */
+	 "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n"
+	 /* Methods and constructors */
+	 "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe|async)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[<>@._[:alnum:]]+[ \t]*\\(.*\\))[ \t]*$\n"
+	 /* Properties */
+	 "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[@._[:alnum:]]+)[ \t]*$\n"
+	 /* Type definitions */
+	 "^[ \t]*(((static|public|internal|private|protected|new|unsafe|sealed|abstract|partial)[ \t]+)*(class|enum|interface|struct|record)[ \t]+.*)$\n"
+	 /* Namespace */
+	 "^[ \t]*(namespace[ \t]+.*)$",
+	 /* -- */
+	 "[a-zA-Z_][a-zA-Z0-9_]*"
+	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
+	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
+IPATTERN("css",
+	 "![:;][[:space:]]*$\n"
+	 "^[:[@.#]?[_a-z0-9].*$",
+	 /* -- */
+	 /*
+	  * This regex comes from W3C CSS specs. Should theoretically also
+	  * allow ISO 10646 characters U+00A0 and higher,
+	  * but they are not handled in this regex.
+	  */
+	 "-?[_a-zA-Z][-_a-zA-Z0-9]*" /* identifiers */
+	 "|-?[0-9]+|\\#[0-9a-fA-F]+" /* numbers */
+),
 PATTERNS("dts",
 	 "!;\n"
 	 "!=\n"
@@ -32,11 +103,28 @@ PATTERNS("dts",
 	 /* Property names and math operators */
 	 "[a-zA-Z0-9,._+?#-]+"
 	 "|[-+*/%&^|!~]|>>|<<|&&|\\|\\|"),
+PATTERNS("elixir",
+	 "^[ \t]*((def(macro|module|impl|protocol|p)?|test)[ \t].*)$",
+	 /* -- */
+	 /* Atoms, names, and module attributes */
+	 "[@:]?[a-zA-Z0-9@_?!]+"
+	 /* Numbers with specific base */
+	 "|[-+]?0[xob][0-9a-fA-F]+"
+	 /* Numbers */
+	 "|[-+]?[0-9][0-9_.]*([eE][-+]?[0-9_]+)?"
+	 /* Operators and atoms that represent them */
+	 "|:?(\\+\\+|--|\\.\\.|~~~|<>|\\^\\^\\^|<?\\|>|<<<?|>?>>|<<?~|~>?>|<~>|<=|>=|===?|!==?|=~|&&&?|\\|\\|\\|?|=>|<-|\\\\\\\\|->)"
+	 /* Not real operators, but should be grouped */
+	 "|:?%[A-Za-z0-9_.]\\{\\}?"),
 IPATTERN("fortran",
+	 /* Don't match comment lines */
 	 "!^([C*]|[ \t]*!)\n"
+	 /* Don't match 'module procedure' lines */
 	 "!^[ \t]*MODULE[ \t]+PROCEDURE[ \t]\n"
+	 /* Program, module, block data */
 	 "^[ \t]*((END[ \t]+)?(PROGRAM|MODULE|BLOCK[ \t]+DATA"
-		"|([^'\" \t]+[ \t]+)*(SUBROUTINE|FUNCTION))[ \t]+[A-Z].*)$",
+		/* Subroutines and functions */
+		"|([^!'\" \t]+[ \t]+)*(SUBROUTINE|FUNCTION))[ \t]+[A-Z].*)$",
 	 /* -- */
 	 "[a-zA-Z][a-zA-Z0-9_]*"
 	 "|\\.([Ee][Qq]|[Nn][Ee]|[Gg][TtEe]|[Ll][TtEe]|[Tt][Rr][Uu][Ee]|[Ff][Aa][Ll][Ss][Ee]|[Aa][Nn][Dd]|[Oo][Rr]|[Nn]?[Ee][Qq][Vv]|[Nn][Oo][Tt])\\."
@@ -45,7 +133,9 @@ IPATTERN("fortran",
 	  * they would have been matched above as a variable anyway. */
 	 "|[-+]?[0-9.]+([AaIiDdEeFfLlTtXx][Ss]?[-+]?[0-9.]*)?(_[a-zA-Z0-9][a-zA-Z0-9_]*)?"
 	 "|//|\\*\\*|::|[/<>=]="),
-IPATTERN("fountain", "^((\\.[^.]|(int|ext|est|int\\.?/ext|i/e)[. ]).*)$",
+IPATTERN("fountain",
+	 "^((\\.[^.]|(int|ext|est|int\\.?/ext|i/e)[. ]).*)$",
+	 /* -- */
 	 "[^ \t-]+"),
 PATTERNS("golang",
 	 /* Functions */
@@ -56,16 +146,26 @@ PATTERNS("golang",
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
 	 "|[-+0-9.eE]+i?|0[xX]?[0-9a-fA-F]+i?"
 	 "|[-+*/<>%&^|=!:]=|--|\\+\\+|<<=?|>>=?|&\\^=?|&&|\\|\\||<-|\\.{3}"),
-PATTERNS("html", "^[ \t]*(<[Hh][1-6]([ \t].*)?>.*)$",
+PATTERNS("html",
+	 "^[ \t]*(<[Hh][1-6]([ \t].*)?>.*)$",
+	 /* -- */
 	 "[^<>= \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]?"
 	 "|[-+*/<>%&^|=!]="
 	 "|--|\\+\\+|<<=?|>>>?=?|&&|\\|\\|"),
+PATTERNS("markdown",
+	 "^ {0,3}#{1,6}[ \t].*",
+	 /* -- */
+	 "[^<>= \t]+"),
 PATTERNS("matlab",
 	 /*
 	  * Octave pattern is mostly the same as matlab, except that '%%%' and
@@ -73,6 +173,7 @@ PATTERNS("matlab",
 	  * that is understood by both.
 	  */
 	 "^[[:space:]]*((classdef|function)[[:space:]].*)$|^(%%%?|##)[[:space:]].*$",
+	 /* -- */
 	 "[a-zA-Z_][a-zA-Z0-9_]*|[-+0-9.e]+|[=~<>]=|\\.[*/\\^']|\\|\\||&&"),
 PATTERNS("objc",
 	 /* Negate C statements that can look like functions */
@@ -88,9 +189,8 @@ PATTERNS("objc",
 	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
 	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
 PATTERNS("pascal",
-	 "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface|"
-		"implementation|initialization|finalization)[ \t]*.*)$"
-	 "\n"
+	 "^(((class[ \t]+)?(procedure|function)|constructor|destructor|interface"
+	 "|implementation|initialization|finalization)[ \t]*.*)$\n"
 	 "^(.*=[ \t]*(class|record).*)$",
 	 /* -- */
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
@@ -127,69 +227,42 @@ PATTERNS("perl",
 	 "|=~|!~"
 	 "|<<|<>|<=>|>>"),
 PATTERNS("php",
-	 "^[\t ]*(((public|protected|private|static)[\t ]+)*function.*)$\n"
+	 "^[\t ]*(((public|protected|private|static|abstract|final)[\t ]+)*function.*)$\n"
 	 "^[\t ]*((((final|abstract)[\t ]+)?class|interface|trait).*)$",
 	 /* -- */
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
 	 "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+"
 	 "|[-+*/<>%&^|=!.]=|--|\\+\\+|<<=?|>>=?|===|&&|\\|\\||::|->"),
-PATTERNS("python", "^[ \t]*((class|def)[ \t].*)$",
+PATTERNS("python",
+	 "^[ \t]*((class|(async[ \t]+)?def)[ \t].*)$",
 	 /* -- */
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
 	 "|[-+0-9.e]+[jJlL]?|0[xX]?[0-9a-fA-F]+[lL]?"
 	 "|[-+*/<>%&^|=!]=|//=?|<<=?|>>=?|\\*\\*=?"),
 	 /* -- */
-PATTERNS("ruby", "^[ \t]*((class|module|def)[ \t].*)$",
+PATTERNS("ruby",
+	 "^[ \t]*((class|module|def)[ \t].*)$",
 	 /* -- */
 	 "(@|@@|\\$)?[a-zA-Z_][a-zA-Z0-9_]*"
 	 "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+|\\?(\\\\C-)?(\\\\M-)?."
 	 "|//=?|[-+*/<>%&^|=!]=|<<=?|>>=?|===|\\.{1,3}|::|[!=]~"),
 PATTERNS("rust",
-	 "^[\t ]*((pub(\\([^\\)]+\\))?[\t ]+)?((async|const|unsafe|extern([\t ]+\"[^\"]+\"))[\t ]+)?(struct|enum|union|mod|trait|fn|impl)[< \t]+[^;]*)$",
+	 "^[\t ]*((pub(\\([^\\)]+\\))?[\t ]+)?((async|const|unsafe|extern([\t ]+\"[^\"]+\"))[\t ]+)?(struct|enum|union|mod|trait|fn|impl|macro_rules!)[< \t]+[^;]*)$",
 	 /* -- */
 	 "[a-zA-Z_][a-zA-Z0-9_]*"
 	 "|[0-9][0-9_a-fA-Fiosuxz]*(\\.([0-9]*[eE][+-]?)?[0-9_fF]*)?"
 	 "|[-+*\\/<>%&^|=!:]=|<<=?|>>=?|&&|\\|\\||->|=>|\\.{2}=|\\.{3}|::"),
-PATTERNS("bibtex", "(@[a-zA-Z]{1,}[ \t]*\\{{0,1}[ \t]*[^ \t\"@',\\#}{~%]*).*$",
-	 "[={}\"]|[^={}\" \t]+"),
-PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
-	 "\\\\[a-zA-Z@]+|\\\\.|[a-zA-Z0-9\x80-\xff]+"),
-PATTERNS("cpp",
-	 /* Jump targets or access declarations */
-	 "!^[ \t]*[A-Za-z_][A-Za-z_0-9]*:[[:space:]]*($|/[/*])\n"
-	 /* functions/methods, variables, and compounds at top level */
-	 "^((::[[:space:]]*)?[A-Za-z_].*)$",
-	 /* -- */
-	 "[a-zA-Z_][a-zA-Z0-9_]*"
-	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lLuU]*"
-	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->\\*?|\\.\\*"),
-PATTERNS("csharp",
-	 /* Keywords */
-	 "!^[ \t]*(do|while|for|if|else|instanceof|new|return|switch|case|throw|catch|using)\n"
-	 /* Methods and constructors */
-	 "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe|async)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[<>@._[:alnum:]]+[ \t]*\\(.*\\))[ \t]*$\n"
-	 /* Properties */
-	 "^[ \t]*(((static|public|internal|private|protected|new|virtual|sealed|override|unsafe)[ \t]+)*[][<>@.~_[:alnum:]]+[ \t]+[@._[:alnum:]]+)[ \t]*$\n"
-	 /* Type definitions */
-	 "^[ \t]*(((static|public|internal|private|protected|new|unsafe|sealed|abstract|partial)[ \t]+)*(class|enum|interface|struct)[ \t]+.*)$\n"
-	 /* Namespace */
-	 "^[ \t]*(namespace[ \t]+.*)$",
-	 /* -- */
-	 "[a-zA-Z_][a-zA-Z0-9_]*"
-	 "|[-+0-9.e]+[fFlL]?|0[xXbB]?[0-9a-fA-F]+[lL]?"
-	 "|[-+*/<>%&^|=!]=|--|\\+\\+|<<=?|>>=?|&&|\\|\\||::|->"),
-IPATTERN("css",
-	 "![:;][[:space:]]*$\n"
-	 "^[_a-z0-9].*$",
-	 /* -- */
+PATTERNS("scheme",
+	 "^[\t ]*(\\(((define|def(struct|syntax|class|method|rules|record|proto|alias)?)[-*/ \t]|(library|module|struct|class)[*+ \t]).*)$",
 	 /*
-	  * This regex comes from W3C CSS specs. Should theoretically also
-	  * allow ISO 10646 characters U+00A0 and higher,
-	  * but they are not handled in this regex.
+	  * R7RS valid identifiers include any sequence enclosed
+	  * within vertical lines having no backslashes
 	  */
-	 "-?[_a-zA-Z][-_a-zA-Z0-9]*" /* identifiers */
-	 "|-?[0-9]+|\\#[0-9a-fA-F]+" /* numbers */
-),
+	 "\\|([^\\\\]*)\\|"
+	 /* All other words should be delimited by spaces or parentheses */
+	 "|([^][)(}{[ \t])+"),
+PATTERNS("tex", "^(\\\\((sub)*section|chapter|part)\\*{0,1}\\{.*)$",
+	 "\\\\[a-zA-Z@]+|\\\\.|[a-zA-Z0-9\x80-\xff]+"),
 { "default", NULL, -1, { NULL, 0 } },
 };
 #undef PATTERNS
@@ -209,20 +282,33 @@ static struct userdiff_driver driver_false = {
 	{ NULL, 0 }
 };
 
-static struct userdiff_driver *userdiff_find_by_namelen(const char *k, int len)
+struct find_by_namelen_data {
+	const char *name;
+	size_t len;
+	struct userdiff_driver *driver;
+};
+
+static int userdiff_find_by_namelen_cb(struct userdiff_driver *driver,
+				       enum userdiff_driver_type type, void *priv)
 {
-	int i;
-	for (i = 0; i < ndrivers; i++) {
-		struct userdiff_driver *drv = drivers + i;
-		if (!strncmp(drv->name, k, len) && !drv->name[len])
-			return drv;
-	}
-	for (i = 0; i < ARRAY_SIZE(builtin_drivers); i++) {
-		struct userdiff_driver *drv = builtin_drivers + i;
-		if (!strncmp(drv->name, k, len) && !drv->name[len])
-			return drv;
+	struct find_by_namelen_data *cb_data = priv;
+
+	if (!strncmp(driver->name, cb_data->name, cb_data->len) &&
+	    !driver->name[cb_data->len]) {
+		cb_data->driver = driver;
+		return 1; /* tell the caller to stop iterating */
 	}
-	return NULL;
+	return 0;
+}
+
+static struct userdiff_driver *userdiff_find_by_namelen(const char *name, size_t len)
+{
+	struct find_by_namelen_data udcbdata = {
+		.name = name,
+		.len = len,
+	};
+	for_each_userdiff_driver(userdiff_find_by_namelen_cb, &udcbdata);
+	return udcbdata.driver;
 }
 
 static int parse_funcname(struct userdiff_funcname *f, const char *k,
@@ -253,7 +339,7 @@ int userdiff_config(const char *k, const char *v)
 {
 	struct userdiff_driver *drv;
 	const char *name, *type;
-	int namelen;
+	size_t namelen;
 
 	if (parse_config_key(k, "diff", &name, &namelen, &type) || !name)
 		return 0;
@@ -329,3 +415,36 @@ struct userdiff_driver *userdiff_get_textconv(struct repository *r,
 
 	return driver;
 }
+
+static int for_each_userdiff_driver_list(each_userdiff_driver_fn fn,
+					 enum userdiff_driver_type type, void *cb_data,
+					 struct userdiff_driver *drv,
+					 int drv_size)
+{
+	int i;
+	int ret;
+	for (i = 0; i < drv_size; i++) {
+		struct userdiff_driver *item = drv + i;
+		if ((ret = fn(item, type, cb_data)))
+			return ret;
+	}
+	return 0;
+}
+
+int for_each_userdiff_driver(each_userdiff_driver_fn fn, void *cb_data)
+{
+	int ret;
+
+	ret = for_each_userdiff_driver_list(fn, USERDIFF_DRIVER_TYPE_CUSTOM,
+					    cb_data, drivers, ndrivers);
+	if (ret)
+		return ret;
+
+	ret = for_each_userdiff_driver_list(fn, USERDIFF_DRIVER_TYPE_BUILTIN,
+					    cb_data, builtin_drivers,
+					    ARRAY_SIZE(builtin_drivers));
+	if (ret)
+		return ret;
+
+	return 0;
+}
diff --git a/userdiff.h b/userdiff.h
index 203057e13e..aee91bc77e 100644
--- a/userdiff.h
+++ b/userdiff.h
@@ -21,6 +21,12 @@ struct userdiff_driver {
 	struct notes_cache *textconv_cache;
 	int textconv_want_cache;
 };
+enum userdiff_driver_type {
+	USERDIFF_DRIVER_TYPE_BUILTIN = 1<<0,
+	USERDIFF_DRIVER_TYPE_CUSTOM = 1<<1,
+};
+typedef int (*each_userdiff_driver_fn)(struct userdiff_driver *,
+				       enum userdiff_driver_type, void *);
 
 int userdiff_config(const char *k, const char *v);
 struct userdiff_driver *userdiff_find_by_name(const char *name);
@@ -34,4 +40,11 @@ struct userdiff_driver *userdiff_find_by_path(struct index_state *istate,
 struct userdiff_driver *userdiff_get_textconv(struct repository *r,
 					      struct userdiff_driver *driver);
 
+/*
+ * Iterate over all userdiff drivers. The userdiff_driver_type
+ * argument to each_userdiff_driver_fn indicates their type. Return
+ * non-zero to exit early from the loop.
+ */
+int for_each_userdiff_driver(each_userdiff_driver_fn, void *);
+
 #endif /* USERDIFF */
diff --git a/utf8.c b/utf8.c
index 5c8f151f75..de4ce5c0e6 100644
--- a/utf8.c
+++ b/utf8.c
@@ -411,11 +411,10 @@ out:
  */
 static int same_utf_encoding(const char *src, const char *dst)
 {
-	if (istarts_with(src, "utf") && istarts_with(dst, "utf")) {
-		/* src[3] or dst[3] might be '\0' */
-		int i = (src[3] == '-' ? 4 : 3);
-		int j = (dst[3] == '-' ? 4 : 3);
-		return !strcasecmp(src+i, dst+j);
+	if (skip_iprefix(src, "utf", &src) && skip_iprefix(dst, "utf", &dst)) {
+		skip_prefix(src, "-", &src);
+		skip_prefix(dst, "-", &dst);
+		return !strcasecmp(src, dst);
 	}
 	return 0;
 }
@@ -778,6 +777,11 @@ int is_hfs_dotgitattributes(const char *path)
 	return is_hfs_dot_str(path, "gitattributes");
 }
 
+int is_hfs_dotmailmap(const char *path)
+{
+	return is_hfs_dot_str(path, "mailmap");
+}
+
 const char utf8_bom[] = "\357\273\277";
 
 int skip_utf8_bom(char **text, size_t len)
diff --git a/utf8.h b/utf8.h
index fcd5167baf..9a16c8679d 100644
--- a/utf8.h
+++ b/utf8.h
@@ -61,6 +61,7 @@ int is_hfs_dotgit(const char *path);
 int is_hfs_dotgitmodules(const char *path);
 int is_hfs_dotgitignore(const char *path);
 int is_hfs_dotgitattributes(const char *path);
+int is_hfs_dotmailmap(const char *path);
 
 typedef enum {
 	ALIGN_LEFT,
diff --git a/vcs-svn/LICENSE b/vcs-svn/LICENSE
deleted file mode 100644
index eb91858b82..0000000000
--- a/vcs-svn/LICENSE
+++ /dev/null
@@ -1,32 +0,0 @@
-Copyright (C) 2010 David Barr <david.barr@cordelta.com>.
-All rights reserved.
-
-Copyright (C) 2010 Jonathan Nieder <jrnieder@gmail.com>.
-
-Copyright (C) 2005 Stefan Hegny, hydrografix Consulting GmbH,
-Frankfurt/Main, Germany
-and others, see http://svn2cc.sarovar.org
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
-   notice(s), this list of conditions and the following disclaimer
-   unmodified other than the allowable addition of one or more
-   copyright notices.
-2. Redistributions in binary form must reproduce the above copyright
-   notice(s), this list of conditions and the following disclaimer in
-   the documentation and/or other materials provided with the
-   distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) ``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 HOLDER(S) 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/vcs-svn/fast_export.c b/vcs-svn/fast_export.c
deleted file mode 100644
index b5b8913cb0..0000000000
--- a/vcs-svn/fast_export.c
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Licensed under a two-clause BSD-style license.
- * See LICENSE for details.
- */
-
-#include "cache.h"
-#include "quote.h"
-#include "fast_export.h"
-#include "strbuf.h"
-#include "svndiff.h"
-#include "sliding_window.h"
-#include "line_buffer.h"
-
-#define MAX_GITSVN_LINE_LEN 4096
-
-static uint32_t first_commit_done;
-static struct line_buffer postimage = LINE_BUFFER_INIT;
-static struct line_buffer report_buffer = LINE_BUFFER_INIT;
-
-/* NEEDSWORK: move to fast_export_init() */
-static int init_postimage(void)
-{
-	static int postimage_initialized;
-	if (postimage_initialized)
-		return 0;
-	postimage_initialized = 1;
-	return buffer_tmpfile_init(&postimage);
-}
-
-void fast_export_init(int fd)
-{
-	first_commit_done = 0;
-	if (buffer_fdinit(&report_buffer, fd))
-		die_errno("cannot read from file descriptor %d", fd);
-}
-
-void fast_export_deinit(void)
-{
-	if (buffer_deinit(&report_buffer))
-		die_errno("error closing fast-import feedback stream");
-}
-
-void fast_export_delete(const char *path)
-{
-	putchar('D');
-	putchar(' ');
-	quote_c_style(path, NULL, stdout, 0);
-	putchar('\n');
-}
-
-static void fast_export_truncate(const char *path, uint32_t mode)
-{
-	fast_export_modify(path, mode, "inline");
-	printf("data 0\n\n");
-}
-
-void fast_export_modify(const char *path, uint32_t mode, const char *dataref)
-{
-	/* Mode must be 100644, 100755, 120000, or 160000. */
-	if (!dataref) {
-		fast_export_truncate(path, mode);
-		return;
-	}
-	printf("M %06"PRIo32" %s ", mode, dataref);
-	quote_c_style(path, NULL, stdout, 0);
-	putchar('\n');
-}
-
-void fast_export_begin_note(uint32_t revision, const char *author,
-		const char *log, timestamp_t timestamp, const char *note_ref)
-{
-	static int firstnote = 1;
-	size_t loglen = strlen(log);
-	printf("commit %s\n", note_ref);
-	printf("committer %s <%s@%s> %"PRItime" +0000\n", author, author, "local", timestamp);
-	printf("data %"PRIuMAX"\n", (uintmax_t)loglen);
-	fwrite(log, loglen, 1, stdout);
-	if (firstnote) {
-		if (revision > 1)
-			printf("from %s^0", note_ref);
-		firstnote = 0;
-	}
-	fputc('\n', stdout);
-}
-
-void fast_export_note(const char *committish, const char *dataref)
-{
-	printf("N %s %s\n", dataref, committish);
-}
-
-static char gitsvnline[MAX_GITSVN_LINE_LEN];
-void fast_export_begin_commit(uint32_t revision, const char *author,
-			const struct strbuf *log,
-			const char *uuid, const char *url,
-			timestamp_t timestamp, const char *local_ref)
-{
-	static const struct strbuf empty = STRBUF_INIT;
-	if (!log)
-		log = &empty;
-	if (*uuid && *url) {
-		snprintf(gitsvnline, MAX_GITSVN_LINE_LEN,
-				"\n\ngit-svn-id: %s@%"PRIu32" %s\n",
-				 url, revision, uuid);
-	} else {
-		*gitsvnline = '\0';
-	}
-	printf("commit %s\n", local_ref);
-	printf("mark :%"PRIu32"\n", revision);
-	printf("committer %s <%s@%s> %"PRItime" +0000\n",
-		   *author ? author : "nobody",
-		   *author ? author : "nobody",
-		   *uuid ? uuid : "local", timestamp);
-	printf("data %"PRIuMAX"\n",
-		(uintmax_t) (log->len + strlen(gitsvnline)));
-	fwrite(log->buf, log->len, 1, stdout);
-	printf("%s\n", gitsvnline);
-	if (!first_commit_done) {
-		if (revision > 1)
-			printf("from :%"PRIu32"\n", revision - 1);
-		first_commit_done = 1;
-	}
-}
-
-void fast_export_end_commit(uint32_t revision)
-{
-	printf("progress Imported commit %"PRIu32".\n\n", revision);
-}
-
-static void ls_from_rev(uint32_t rev, const char *path)
-{
-	/* ls :5 path/to/old/file */
-	printf("ls :%"PRIu32" ", rev);
-	quote_c_style(path, NULL, stdout, 0);
-	putchar('\n');
-	fflush(stdout);
-}
-
-static void ls_from_active_commit(const char *path)
-{
-	/* ls "path/to/file" */
-	printf("ls \"");
-	quote_c_style(path, NULL, stdout, 1);
-	printf("\"\n");
-	fflush(stdout);
-}
-
-static const char *get_response_line(void)
-{
-	const char *line = buffer_read_line(&report_buffer);
-	if (line)
-		return line;
-	if (buffer_ferror(&report_buffer))
-		die_errno("error reading from fast-import");
-	die("unexpected end of fast-import feedback");
-}
-
-static void die_short_read(struct line_buffer *input)
-{
-	if (buffer_ferror(input))
-		die_errno("error reading dump file");
-	die("invalid dump: unexpected end of file");
-}
-
-static int parse_cat_response_line(const char *header, off_t *len)
-{
-	uintmax_t n;
-	const char *type;
-	const char *end;
-
-	if (ends_with(header, " missing"))
-		return error("cat-blob reports missing blob: %s", header);
-	type = strstr(header, " blob ");
-	if (!type)
-		return error("cat-blob header has wrong object type: %s", header);
-	n = strtoumax(type + strlen(" blob "), (char **) &end, 10);
-	if (end == type + strlen(" blob "))
-		return error("cat-blob header does not contain length: %s", header);
-	if (memchr(type + strlen(" blob "), '-', end - type - strlen(" blob ")))
-		return error("cat-blob header contains negative length: %s", header);
-	if (n == UINTMAX_MAX || n > maximum_signed_value_of_type(off_t))
-		return error("blob too large for current definition of off_t");
-	*len = n;
-	if (*end)
-		return error("cat-blob header contains garbage after length: %s", header);
-	return 0;
-}
-
-static void check_preimage_overflow(off_t a, off_t b)
-{
-	if (signed_add_overflows(a, b))
-		die("blob too large for current definition of off_t");
-}
-
-static long apply_delta(off_t len, struct line_buffer *input,
-			const char *old_data, uint32_t old_mode)
-{
-	long ret;
-	struct sliding_view preimage = SLIDING_VIEW_INIT(&report_buffer, 0);
-	FILE *out;
-
-	if (init_postimage() || !(out = buffer_tmpfile_rewind(&postimage)))
-		die("cannot open temporary file for blob retrieval");
-	if (old_data) {
-		const char *response;
-		printf("cat-blob %s\n", old_data);
-		fflush(stdout);
-		response = get_response_line();
-		if (parse_cat_response_line(response, &preimage.max_off))
-			die("invalid cat-blob response: %s", response);
-		check_preimage_overflow(preimage.max_off, 1);
-	}
-	if (old_mode == S_IFLNK) {
-		strbuf_addstr(&preimage.buf, "link ");
-		check_preimage_overflow(preimage.max_off, strlen("link "));
-		preimage.max_off += strlen("link ");
-		check_preimage_overflow(preimage.max_off, 1);
-	}
-	if (svndiff0_apply(input, len, &preimage, out))
-		die("cannot apply delta");
-	if (old_data) {
-		/* Read the remainder of preimage and trailing newline. */
-		assert(!signed_add_overflows(preimage.max_off, 1));
-		preimage.max_off++;	/* room for newline */
-		if (move_window(&preimage, preimage.max_off - 1, 1))
-			die("cannot seek to end of input");
-		if (preimage.buf.buf[0] != '\n')
-			die("missing newline after cat-blob response");
-	}
-	ret = buffer_tmpfile_prepare_to_read(&postimage);
-	if (ret < 0)
-		die("cannot read temporary file for blob retrieval");
-	strbuf_release(&preimage.buf);
-	return ret;
-}
-
-void fast_export_buf_to_data(const struct strbuf *data)
-{
-	printf("data %"PRIuMAX"\n", (uintmax_t)data->len);
-	fwrite(data->buf, data->len, 1, stdout);
-	fputc('\n', stdout);
-}
-
-void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input)
-{
-	assert(len >= 0);
-	if (mode == S_IFLNK) {
-		/* svn symlink blobs start with "link " */
-		if (len < 5)
-			die("invalid dump: symlink too short for \"link\" prefix");
-		len -= 5;
-		if (buffer_skip_bytes(input, 5) != 5)
-			die_short_read(input);
-	}
-	printf("data %"PRIuMAX"\n", (uintmax_t) len);
-	if (buffer_copy_bytes(input, len) != len)
-		die_short_read(input);
-	fputc('\n', stdout);
-}
-
-static int parse_ls_response(const char *response, uint32_t *mode,
-					struct strbuf *dataref)
-{
-	const char *tab;
-	const char *response_end;
-
-	assert(response);
-	response_end = response + strlen(response);
-
-	if (*response == 'm') {	/* Missing. */
-		errno = ENOENT;
-		return -1;
-	}
-
-	/* Mode. */
-	if (response_end - response < (signed) strlen("100644") ||
-	    response[strlen("100644")] != ' ')
-		die("invalid ls response: missing mode: %s", response);
-	*mode = 0;
-	for (; *response != ' '; response++) {
-		char ch = *response;
-		if (ch < '0' || ch > '7')
-			die("invalid ls response: mode is not octal: %s", response);
-		*mode *= 8;
-		*mode += ch - '0';
-	}
-
-	/* ' blob ' or ' tree ' */
-	if (response_end - response < (signed) strlen(" blob ") ||
-	    (response[1] != 'b' && response[1] != 't'))
-		die("unexpected ls response: not a tree or blob: %s", response);
-	response += strlen(" blob ");
-
-	/* Dataref. */
-	tab = memchr(response, '\t', response_end - response);
-	if (!tab)
-		die("invalid ls response: missing tab: %s", response);
-	strbuf_add(dataref, response, tab - response);
-	return 0;
-}
-
-int fast_export_ls_rev(uint32_t rev, const char *path,
-				uint32_t *mode, struct strbuf *dataref)
-{
-	ls_from_rev(rev, path);
-	return parse_ls_response(get_response_line(), mode, dataref);
-}
-
-int fast_export_ls(const char *path, uint32_t *mode, struct strbuf *dataref)
-{
-	ls_from_active_commit(path);
-	return parse_ls_response(get_response_line(), mode, dataref);
-}
-
-const char *fast_export_read_path(const char *path, uint32_t *mode_out)
-{
-	int err;
-	static struct strbuf buf = STRBUF_INIT;
-
-	strbuf_reset(&buf);
-	err = fast_export_ls(path, mode_out, &buf);
-	if (err) {
-		if (errno != ENOENT)
-			BUG("unexpected fast_export_ls error: %s",
-			    strerror(errno));
-		/* Treat missing paths as directories. */
-		*mode_out = S_IFDIR;
-		return NULL;
-	}
-	return buf.buf;
-}
-
-void fast_export_copy(uint32_t revision, const char *src, const char *dst)
-{
-	int err;
-	uint32_t mode;
-	static struct strbuf data = STRBUF_INIT;
-
-	strbuf_reset(&data);
-	err = fast_export_ls_rev(revision, src, &mode, &data);
-	if (err) {
-		if (errno != ENOENT)
-			BUG("unexpected fast_export_ls_rev error: %s",
-			    strerror(errno));
-		fast_export_delete(dst);
-		return;
-	}
-	fast_export_modify(dst, mode, data.buf);
-}
-
-void fast_export_blob_delta(uint32_t mode,
-				uint32_t old_mode, const char *old_data,
-				off_t len, struct line_buffer *input)
-{
-	long postimage_len;
-
-	assert(len >= 0);
-	postimage_len = apply_delta(len, input, old_data, old_mode);
-	if (mode == S_IFLNK) {
-		buffer_skip_bytes(&postimage, strlen("link "));
-		postimage_len -= strlen("link ");
-	}
-	printf("data %ld\n", postimage_len);
-	buffer_copy_bytes(&postimage, postimage_len);
-	fputc('\n', stdout);
-}
diff --git a/vcs-svn/fast_export.h b/vcs-svn/fast_export.h
deleted file mode 100644
index 9dcf9337c1..0000000000
--- a/vcs-svn/fast_export.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef FAST_EXPORT_H
-#define FAST_EXPORT_H
-
-struct strbuf;
-struct line_buffer;
-
-void fast_export_init(int fd);
-void fast_export_deinit(void);
-
-void fast_export_delete(const char *path);
-void fast_export_modify(const char *path, uint32_t mode, const char *dataref);
-void fast_export_note(const char *committish, const char *dataref);
-void fast_export_begin_note(uint32_t revision, const char *author,
-		const char *log, timestamp_t timestamp, const char *note_ref);
-void fast_export_begin_commit(uint32_t revision, const char *author,
-			const struct strbuf *log, const char *uuid,const char *url,
-			timestamp_t timestamp, const char *local_ref);
-void fast_export_end_commit(uint32_t revision);
-void fast_export_data(uint32_t mode, off_t len, struct line_buffer *input);
-void fast_export_buf_to_data(const struct strbuf *data);
-void fast_export_blob_delta(uint32_t mode,
-			uint32_t old_mode, const char *old_data,
-			off_t len, struct line_buffer *input);
-
-/* If there is no such file at that rev, returns -1, errno == ENOENT. */
-int fast_export_ls_rev(uint32_t rev, const char *path,
-			uint32_t *mode_out, struct strbuf *dataref_out);
-int fast_export_ls(const char *path,
-			uint32_t *mode_out, struct strbuf *dataref_out);
-
-void fast_export_copy(uint32_t revision, const char *src, const char *dst);
-const char *fast_export_read_path(const char *path, uint32_t *mode_out);
-
-#endif
diff --git a/vcs-svn/line_buffer.c b/vcs-svn/line_buffer.c
deleted file mode 100644
index e416caf8a4..0000000000
--- a/vcs-svn/line_buffer.c
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Licensed under a two-clause BSD-style license.
- * See LICENSE for details.
- */
-
-#include "git-compat-util.h"
-#include "line_buffer.h"
-#include "strbuf.h"
-
-#define COPY_BUFFER_LEN 4096
-
-int buffer_init(struct line_buffer *buf, const char *filename)
-{
-	buf->infile = filename ? fopen(filename, "r") : stdin;
-	if (!buf->infile)
-		return -1;
-	return 0;
-}
-
-int buffer_fdinit(struct line_buffer *buf, int fd)
-{
-	buf->infile = fdopen(fd, "r");
-	if (!buf->infile)
-		return -1;
-	return 0;
-}
-
-int buffer_tmpfile_init(struct line_buffer *buf)
-{
-	buf->infile = tmpfile();
-	if (!buf->infile)
-		return -1;
-	return 0;
-}
-
-int buffer_deinit(struct line_buffer *buf)
-{
-	int err;
-	if (buf->infile == stdin)
-		return ferror(buf->infile);
-	err = ferror(buf->infile);
-	err |= fclose(buf->infile);
-	return err;
-}
-
-FILE *buffer_tmpfile_rewind(struct line_buffer *buf)
-{
-	rewind(buf->infile);
-	return buf->infile;
-}
-
-long buffer_tmpfile_prepare_to_read(struct line_buffer *buf)
-{
-	long pos = ftell(buf->infile);
-	if (pos < 0)
-		return error_errno("ftell error");
-	if (fseek(buf->infile, 0, SEEK_SET))
-		return error_errno("seek error");
-	return pos;
-}
-
-int buffer_ferror(struct line_buffer *buf)
-{
-	return ferror(buf->infile);
-}
-
-int buffer_read_char(struct line_buffer *buf)
-{
-	return fgetc(buf->infile);
-}
-
-/* Read a line without trailing newline. */
-char *buffer_read_line(struct line_buffer *buf)
-{
-	char *end;
-	if (!fgets(buf->line_buffer, sizeof(buf->line_buffer), buf->infile))
-		/* Error or data exhausted. */
-		return NULL;
-	end = buf->line_buffer + strlen(buf->line_buffer);
-	if (end[-1] == '\n')
-		end[-1] = '\0';
-	else if (feof(buf->infile))
-		; /* No newline at end of file.  That's fine. */
-	else
-		/*
-		 * Line was too long.
-		 * There is probably a saner way to deal with this,
-		 * but for now let's return an error.
-		 */
-		return NULL;
-	return buf->line_buffer;
-}
-
-size_t buffer_read_binary(struct line_buffer *buf,
-				struct strbuf *sb, size_t size)
-{
-	return strbuf_fread(sb, size, buf->infile);
-}
-
-off_t buffer_copy_bytes(struct line_buffer *buf, off_t nbytes)
-{
-	char byte_buffer[COPY_BUFFER_LEN];
-	off_t done = 0;
-	while (done < nbytes && !feof(buf->infile) && !ferror(buf->infile)) {
-		off_t len = nbytes - done;
-		size_t in = len < COPY_BUFFER_LEN ? len : COPY_BUFFER_LEN;
-		in = fread(byte_buffer, 1, in, buf->infile);
-		done += in;
-		fwrite(byte_buffer, 1, in, stdout);
-		if (ferror(stdout))
-			return done + buffer_skip_bytes(buf, nbytes - done);
-	}
-	return done;
-}
-
-off_t buffer_skip_bytes(struct line_buffer *buf, off_t nbytes)
-{
-	char byte_buffer[COPY_BUFFER_LEN];
-	off_t done = 0;
-	while (done < nbytes && !feof(buf->infile) && !ferror(buf->infile)) {
-		off_t len = nbytes - done;
-		size_t in = len < COPY_BUFFER_LEN ? len : COPY_BUFFER_LEN;
-		done += fread(byte_buffer, 1, in, buf->infile);
-	}
-	return done;
-}
diff --git a/vcs-svn/line_buffer.h b/vcs-svn/line_buffer.h
deleted file mode 100644
index e192aedea2..0000000000
--- a/vcs-svn/line_buffer.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef LINE_BUFFER_H
-#define LINE_BUFFER_H
-
-#include "strbuf.h"
-
-#define LINE_BUFFER_LEN 10000
-
-struct line_buffer {
-	char line_buffer[LINE_BUFFER_LEN];
-	FILE *infile;
-};
-#define LINE_BUFFER_INIT { "", NULL }
-
-int buffer_init(struct line_buffer *buf, const char *filename);
-int buffer_fdinit(struct line_buffer *buf, int fd);
-int buffer_deinit(struct line_buffer *buf);
-
-int buffer_tmpfile_init(struct line_buffer *buf);
-FILE *buffer_tmpfile_rewind(struct line_buffer *buf);	/* prepare to write. */
-long buffer_tmpfile_prepare_to_read(struct line_buffer *buf);
-
-int buffer_ferror(struct line_buffer *buf);
-char *buffer_read_line(struct line_buffer *buf);
-int buffer_read_char(struct line_buffer *buf);
-size_t buffer_read_binary(struct line_buffer *buf, struct strbuf *sb, size_t len);
-/* Returns number of bytes read (not necessarily written). */
-off_t buffer_copy_bytes(struct line_buffer *buf, off_t len);
-off_t buffer_skip_bytes(struct line_buffer *buf, off_t len);
-
-#endif
diff --git a/vcs-svn/line_buffer.txt b/vcs-svn/line_buffer.txt
deleted file mode 100644
index 8e139eb22d..0000000000
--- a/vcs-svn/line_buffer.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-line_buffer API
-===============
-
-The line_buffer library provides a convenient interface for
-mostly-line-oriented input.
-
-Each line is not permitted to exceed 10000 bytes.  The provided
-functions are not thread-safe or async-signal-safe, and like
-`fgets()`, they generally do not function correctly if interrupted
-by a signal without SA_RESTART set.
-
-Calling sequence
-----------------
-
-The calling program:
-
- - initializes a `struct line_buffer` to LINE_BUFFER_INIT
- - specifies a file to read with `buffer_init`
- - processes input with `buffer_read_line`, `buffer_skip_bytes`,
-   and `buffer_copy_bytes`
- - closes the file with `buffer_deinit`, perhaps to start over and
-   read another file.
-
-When finished, the caller can use `buffer_reset` to deallocate
-resources.
-
-Using temporary files
----------------------
-
-Temporary files provide a place to store data that should not outlive
-the calling program.  A program
-
- - initializes a `struct line_buffer` to LINE_BUFFER_INIT
- - requests a temporary file with `buffer_tmpfile_init`
- - acquires an output handle by calling `buffer_tmpfile_rewind`
- - uses standard I/O functions like `fprintf` and `fwrite` to fill
-   the temporary file
- - declares writing is over with `buffer_tmpfile_prepare_to_read`
- - can re-read what was written with `buffer_read_line`,
-   `buffer_copy_bytes`, and so on
- - can reuse the temporary file by calling `buffer_tmpfile_rewind`
-   again
- - removes the temporary file with `buffer_deinit`, perhaps to
-   reuse the line_buffer for some other file.
-
-When finished, the calling program can use `buffer_reset` to deallocate
-resources.
-
-Functions
----------
-
-`buffer_init`, `buffer_fdinit`::
-	Open the named file or file descriptor for input.
-	buffer_init(buf, NULL) prepares to read from stdin.
-	On failure, returns -1 (with errno indicating the nature
-	of the failure).
-
-`buffer_deinit`::
-	Stop reading from the current file (closing it unless
-	it was stdin).  Returns nonzero if `fclose` fails or
-	the error indicator was set.
-
-`buffer_read_line`::
-	Read a line and strip off the trailing newline.
-	On failure or end of file, returns NULL.
-
-`buffer_copy_bytes`::
-	Read `len` bytes of input and dump them to the standard output
-	stream.  Returns early for error or end of file.
-
-`buffer_skip_bytes`::
-	Discards `len` bytes from the input stream (stopping early
-	if necessary because of an error or eof).  Return value is
-	the number of bytes successfully read.
-
-`buffer_reset`::
-	Deallocates non-static buffers.
diff --git a/vcs-svn/sliding_window.c b/vcs-svn/sliding_window.c
deleted file mode 100644
index 06d273c9e8..0000000000
--- a/vcs-svn/sliding_window.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Licensed under a two-clause BSD-style license.
- * See LICENSE for details.
- */
-
-#include "git-compat-util.h"
-#include "sliding_window.h"
-#include "line_buffer.h"
-#include "strbuf.h"
-
-static int input_error(struct line_buffer *file)
-{
-	if (!buffer_ferror(file))
-		return error("delta preimage ends early");
-	return error_errno("cannot read delta preimage");
-}
-
-static int skip_or_whine(struct line_buffer *file, off_t gap)
-{
-	if (buffer_skip_bytes(file, gap) != gap)
-		return input_error(file);
-	return 0;
-}
-
-static int read_to_fill_or_whine(struct line_buffer *file,
-				struct strbuf *buf, size_t width)
-{
-	buffer_read_binary(file, buf, width - buf->len);
-	if (buf->len != width)
-		return input_error(file);
-	return 0;
-}
-
-static int check_offset_overflow(off_t offset, uintmax_t len)
-{
-	if (len > maximum_signed_value_of_type(off_t))
-		return error("unrepresentable length in delta: "
-				"%"PRIuMAX" > OFF_MAX", len);
-	if (signed_add_overflows(offset, (off_t) len))
-		return error("unrepresentable offset in delta: "
-				"%"PRIuMAX" + %"PRIuMAX" > OFF_MAX",
-				(uintmax_t) offset, len);
-	return 0;
-}
-
-int move_window(struct sliding_view *view, off_t off, size_t width)
-{
-	off_t file_offset;
-	assert(view);
-	assert(view->width <= view->buf.len);
-	assert(!check_offset_overflow(view->off, view->buf.len));
-
-	if (check_offset_overflow(off, width))
-		return -1;
-	if (off < view->off || off + width < view->off + view->width)
-		return error("invalid delta: window slides left");
-	if (view->max_off >= 0 && view->max_off < off + (off_t) width)
-		return error("delta preimage ends early");
-
-	file_offset = view->off + view->buf.len;
-	if (off < file_offset) {
-		/* Move the overlapping region into place. */
-		strbuf_remove(&view->buf, 0, off - view->off);
-	} else {
-		/* Seek ahead to skip the gap. */
-		if (skip_or_whine(view->file, off - file_offset))
-			return -1;
-		strbuf_setlen(&view->buf, 0);
-	}
-
-	if (view->buf.len > width)
-		; /* Already read. */
-	else if (read_to_fill_or_whine(view->file, &view->buf, width))
-		return -1;
-
-	view->off = off;
-	view->width = width;
-	return 0;
-}
diff --git a/vcs-svn/sliding_window.h b/vcs-svn/sliding_window.h
deleted file mode 100644
index a7fc0999cb..0000000000
--- a/vcs-svn/sliding_window.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#ifndef SLIDING_WINDOW_H
-#define SLIDING_WINDOW_H
-
-#include "strbuf.h"
-
-struct sliding_view {
-	struct line_buffer *file;
-	off_t off;
-	size_t width;
-	off_t max_off;	/* -1 means unlimited */
-	struct strbuf buf;
-};
-
-#define SLIDING_VIEW_INIT(input, len)	{ (input), 0, 0, (len), STRBUF_INIT }
-
-int move_window(struct sliding_view *view, off_t off, size_t width);
-
-#endif
diff --git a/vcs-svn/svndiff.c b/vcs-svn/svndiff.c
deleted file mode 100644
index 75c753162a..0000000000
--- a/vcs-svn/svndiff.c
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
- * Licensed under a two-clause BSD-style license.
- * See LICENSE for details.
- */
-
-#include "git-compat-util.h"
-#include "sliding_window.h"
-#include "line_buffer.h"
-#include "svndiff.h"
-
-/*
- * svndiff0 applier
- *
- * See http://svn.apache.org/repos/asf/subversion/trunk/notes/svndiff.
- *
- * svndiff0 ::= 'SVN\0' window*
- * window ::= int int int int int instructions inline_data;
- * instructions ::= instruction*;
- * instruction ::= view_selector int int
- *   | copyfrom_data int
- *   | packed_view_selector int
- *   | packed_copyfrom_data
- *   ;
- * view_selector ::= copyfrom_source
- *   | copyfrom_target
- *   ;
- * copyfrom_source ::= # binary 00 000000;
- * copyfrom_target ::= # binary 01 000000;
- * copyfrom_data ::= # binary 10 000000;
- * packed_view_selector ::= # view_selector OR-ed with 6 bit value;
- * packed_copyfrom_data ::= # copyfrom_data OR-ed with 6 bit value;
- * int ::= highdigit* lowdigit;
- * highdigit ::= # binary 1000 0000 OR-ed with 7 bit value;
- * lowdigit ::= # 7 bit value;
- */
-
-#define INSN_MASK	0xc0
-#define INSN_COPYFROM_SOURCE	0x00
-#define INSN_COPYFROM_TARGET	0x40
-#define INSN_COPYFROM_DATA	0x80
-#define OPERAND_MASK	0x3f
-
-#define VLI_CONTINUE	0x80
-#define VLI_DIGIT_MASK	0x7f
-#define VLI_BITS_PER_DIGIT 7
-
-struct window {
-	struct sliding_view *in;
-	struct strbuf out;
-	struct strbuf instructions;
-	struct strbuf data;
-};
-
-#define WINDOW_INIT(w)	{ (w), STRBUF_INIT, STRBUF_INIT, STRBUF_INIT }
-
-static void window_release(struct window *ctx)
-{
-	strbuf_release(&ctx->out);
-	strbuf_release(&ctx->instructions);
-	strbuf_release(&ctx->data);
-}
-
-static int write_strbuf(struct strbuf *sb, FILE *out)
-{
-	if (fwrite(sb->buf, 1, sb->len, out) == sb->len)	/* Success. */
-		return 0;
-	return error_errno("cannot write delta postimage");
-}
-
-static int error_short_read(struct line_buffer *input)
-{
-	if (buffer_ferror(input))
-		return error_errno("error reading delta");
-	return error("invalid delta: unexpected end of file");
-}
-
-static int read_chunk(struct line_buffer *delta, off_t *delta_len,
-		      struct strbuf *buf, size_t len)
-{
-	assert(*delta_len >= 0);
-	strbuf_reset(buf);
-	if (len > (uintmax_t) *delta_len ||
-	    buffer_read_binary(delta, buf, len) != len)
-		return error_short_read(delta);
-	*delta_len -= buf->len;
-	return 0;
-}
-
-static int read_magic(struct line_buffer *in, off_t *len)
-{
-	static const char magic[] = {'S', 'V', 'N', '\0'};
-	struct strbuf sb = STRBUF_INIT;
-
-	if (read_chunk(in, len, &sb, sizeof(magic))) {
-		strbuf_release(&sb);
-		return -1;
-	}
-	if (memcmp(sb.buf, magic, sizeof(magic))) {
-		strbuf_release(&sb);
-		return error("invalid delta: unrecognized file type");
-	}
-	strbuf_release(&sb);
-	return 0;
-}
-
-static int read_int(struct line_buffer *in, uintmax_t *result, off_t *len)
-{
-	uintmax_t rv = 0;
-	off_t sz;
-	for (sz = *len; sz; sz--) {
-		const int ch = buffer_read_char(in);
-		if (ch == EOF)
-			break;
-
-		rv <<= VLI_BITS_PER_DIGIT;
-		rv += (ch & VLI_DIGIT_MASK);
-		if (ch & VLI_CONTINUE)
-			continue;
-
-		*result = rv;
-		*len = sz - 1;
-		return 0;
-	}
-	return error_short_read(in);
-}
-
-static int parse_int(const char **buf, size_t *result, const char *end)
-{
-	size_t rv = 0;
-	const char *pos;
-	for (pos = *buf; pos != end; pos++) {
-		unsigned char ch = *pos;
-
-		rv <<= VLI_BITS_PER_DIGIT;
-		rv += (ch & VLI_DIGIT_MASK);
-		if (ch & VLI_CONTINUE)
-			continue;
-
-		*result = rv;
-		*buf = pos + 1;
-		return 0;
-	}
-	return error("invalid delta: unexpected end of instructions section");
-}
-
-static int read_offset(struct line_buffer *in, off_t *result, off_t *len)
-{
-	uintmax_t val;
-	if (read_int(in, &val, len))
-		return -1;
-	if (val > maximum_signed_value_of_type(off_t))
-		return error("unrepresentable offset in delta: %"PRIuMAX"", val);
-	*result = val;
-	return 0;
-}
-
-static int read_length(struct line_buffer *in, size_t *result, off_t *len)
-{
-	uintmax_t val;
-	if (read_int(in, &val, len))
-		return -1;
-	if (val > SIZE_MAX)
-		return error("unrepresentable length in delta: %"PRIuMAX"", val);
-	*result = val;
-	return 0;
-}
-
-static int copyfrom_source(struct window *ctx, const char **instructions,
-			   size_t nbytes, const char *insns_end)
-{
-	size_t offset;
-	if (parse_int(instructions, &offset, insns_end))
-		return -1;
-	if (unsigned_add_overflows(offset, nbytes) ||
-	    offset + nbytes > ctx->in->width)
-		return error("invalid delta: copies source data outside view");
-	strbuf_add(&ctx->out, ctx->in->buf.buf + offset, nbytes);
-	return 0;
-}
-
-static int copyfrom_target(struct window *ctx, const char **instructions,
-			   size_t nbytes, const char *instructions_end)
-{
-	size_t offset;
-	if (parse_int(instructions, &offset, instructions_end))
-		return -1;
-	if (offset >= ctx->out.len)
-		return error("invalid delta: copies from the future");
-	for (; nbytes > 0; nbytes--)
-		strbuf_addch(&ctx->out, ctx->out.buf[offset++]);
-	return 0;
-}
-
-static int copyfrom_data(struct window *ctx, size_t *data_pos, size_t nbytes)
-{
-	const size_t pos = *data_pos;
-	if (unsigned_add_overflows(pos, nbytes) ||
-	    pos + nbytes > ctx->data.len)
-		return error("invalid delta: copies unavailable inline data");
-	strbuf_add(&ctx->out, ctx->data.buf + pos, nbytes);
-	*data_pos += nbytes;
-	return 0;
-}
-
-static int parse_first_operand(const char **buf, size_t *out, const char *end)
-{
-	size_t result = (unsigned char) *(*buf)++ & OPERAND_MASK;
-	if (result) {	/* immediate operand */
-		*out = result;
-		return 0;
-	}
-	return parse_int(buf, out, end);
-}
-
-static int execute_one_instruction(struct window *ctx,
-				const char **instructions, size_t *data_pos)
-{
-	unsigned int instruction;
-	const char *insns_end = ctx->instructions.buf + ctx->instructions.len;
-	size_t nbytes;
-	assert(ctx);
-	assert(instructions && *instructions);
-	assert(data_pos);
-
-	instruction = (unsigned char) **instructions;
-	if (parse_first_operand(instructions, &nbytes, insns_end))
-		return -1;
-	switch (instruction & INSN_MASK) {
-	case INSN_COPYFROM_SOURCE:
-		return copyfrom_source(ctx, instructions, nbytes, insns_end);
-	case INSN_COPYFROM_TARGET:
-		return copyfrom_target(ctx, instructions, nbytes, insns_end);
-	case INSN_COPYFROM_DATA:
-		return copyfrom_data(ctx, data_pos, nbytes);
-	default:
-		return error("invalid delta: unrecognized instruction");
-	}
-}
-
-static int apply_window_in_core(struct window *ctx)
-{
-	const char *instructions;
-	size_t data_pos = 0;
-
-	/*
-	 * Fill ctx->out.buf using data from the source, target,
-	 * and inline data views.
-	 */
-	for (instructions = ctx->instructions.buf;
-	     instructions != ctx->instructions.buf + ctx->instructions.len;
-	     )
-		if (execute_one_instruction(ctx, &instructions, &data_pos))
-			return -1;
-	if (data_pos != ctx->data.len)
-		return error("invalid delta: does not copy all inline data");
-	return 0;
-}
-
-static int apply_one_window(struct line_buffer *delta, off_t *delta_len,
-			    struct sliding_view *preimage, FILE *out)
-{
-	int rv = -1;
-	struct window ctx = WINDOW_INIT(preimage);
-	size_t out_len;
-	size_t instructions_len;
-	size_t data_len;
-	assert(delta_len);
-
-	/* "source view" offset and length already handled; */
-	if (read_length(delta, &out_len, delta_len) ||
-	    read_length(delta, &instructions_len, delta_len) ||
-	    read_length(delta, &data_len, delta_len) ||
-	    read_chunk(delta, delta_len, &ctx.instructions, instructions_len) ||
-	    read_chunk(delta, delta_len, &ctx.data, data_len))
-		goto error_out;
-	strbuf_grow(&ctx.out, out_len);
-	if (apply_window_in_core(&ctx))
-		goto error_out;
-	if (ctx.out.len != out_len) {
-		rv = error("invalid delta: incorrect postimage length");
-		goto error_out;
-	}
-	if (write_strbuf(&ctx.out, out))
-		goto error_out;
-	rv = 0;
-error_out:
-	window_release(&ctx);
-	return rv;
-}
-
-int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
-			struct sliding_view *preimage, FILE *postimage)
-{
-	assert(delta && preimage && postimage && delta_len >= 0);
-
-	if (read_magic(delta, &delta_len))
-		return -1;
-	while (delta_len) {	/* For each window: */
-		off_t pre_off = -1;
-		size_t pre_len;
-
-		if (read_offset(delta, &pre_off, &delta_len) ||
-		    read_length(delta, &pre_len, &delta_len) ||
-		    move_window(preimage, pre_off, pre_len) ||
-		    apply_one_window(delta, &delta_len, preimage, postimage))
-			return -1;
-	}
-	return 0;
-}
diff --git a/vcs-svn/svndiff.h b/vcs-svn/svndiff.h
deleted file mode 100644
index 625d950bb8..0000000000
--- a/vcs-svn/svndiff.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef SVNDIFF_H
-#define SVNDIFF_H
-
-struct line_buffer;
-struct sliding_view;
-
-int svndiff0_apply(struct line_buffer *delta, off_t delta_len,
-		   struct sliding_view *preimage, FILE *postimage);
-
-#endif
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
deleted file mode 100644
index 08d136b8cc..0000000000
--- a/vcs-svn/svndump.c
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- * Parse and rearrange a svnadmin dump.
- * Create the dump with:
- * svnadmin dump --incremental -r<startrev>:<endrev> <repository> >outfile
- *
- * Licensed under a two-clause BSD-style license.
- * See LICENSE for details.
- */
-
-#include "cache.h"
-#include "fast_export.h"
-#include "line_buffer.h"
-#include "strbuf.h"
-#include "svndump.h"
-
-/*
- * Compare start of string to literal of equal length;
- * must be guarded by length test.
- */
-#define constcmp(s, ref) memcmp(s, ref, sizeof(ref) - 1)
-
-#define REPORT_FILENO 3
-
-#define NODEACT_REPLACE 4
-#define NODEACT_DELETE 3
-#define NODEACT_ADD 2
-#define NODEACT_CHANGE 1
-#define NODEACT_UNKNOWN 0
-
-/* States: */
-#define DUMP_CTX 0	/* dump metadata */
-#define REV_CTX  1	/* revision metadata */
-#define NODE_CTX 2	/* node metadata */
-#define INTERNODE_CTX 3	/* between nodes */
-
-#define DATE_RFC2822_LEN 31
-
-static struct line_buffer input = LINE_BUFFER_INIT;
-
-static struct {
-	uint32_t action, srcRev, type;
-	off_t prop_length, text_length;
-	struct strbuf src, dst;
-	uint32_t text_delta, prop_delta;
-} node_ctx;
-
-static struct {
-	uint32_t revision;
-	timestamp_t timestamp;
-	struct strbuf log, author, note;
-} rev_ctx;
-
-static struct {
-	uint32_t version;
-	struct strbuf uuid, url;
-} dump_ctx;
-
-static void reset_node_ctx(char *fname)
-{
-	node_ctx.type = 0;
-	node_ctx.action = NODEACT_UNKNOWN;
-	node_ctx.prop_length = -1;
-	node_ctx.text_length = -1;
-	strbuf_reset(&node_ctx.src);
-	node_ctx.srcRev = 0;
-	strbuf_reset(&node_ctx.dst);
-	if (fname)
-		strbuf_addstr(&node_ctx.dst, fname);
-	node_ctx.text_delta = 0;
-	node_ctx.prop_delta = 0;
-}
-
-static void reset_rev_ctx(uint32_t revision)
-{
-	rev_ctx.revision = revision;
-	rev_ctx.timestamp = 0;
-	strbuf_reset(&rev_ctx.log);
-	strbuf_reset(&rev_ctx.author);
-	strbuf_reset(&rev_ctx.note);
-}
-
-static void reset_dump_ctx(const char *url)
-{
-	strbuf_reset(&dump_ctx.url);
-	if (url)
-		strbuf_addstr(&dump_ctx.url, url);
-	dump_ctx.version = 1;
-	strbuf_reset(&dump_ctx.uuid);
-}
-
-static void handle_property(const struct strbuf *key_buf,
-				struct strbuf *val,
-				uint32_t *type_set)
-{
-	const char *key = key_buf->buf;
-	size_t keylen = key_buf->len;
-
-	switch (keylen + 1) {
-	case sizeof("svn:log"):
-		if (constcmp(key, "svn:log"))
-			break;
-		if (!val)
-			die("invalid dump: unsets svn:log");
-		strbuf_swap(&rev_ctx.log, val);
-		break;
-	case sizeof("svn:author"):
-		if (constcmp(key, "svn:author"))
-			break;
-		if (!val)
-			strbuf_reset(&rev_ctx.author);
-		else
-			strbuf_swap(&rev_ctx.author, val);
-		break;
-	case sizeof("svn:date"):
-		if (constcmp(key, "svn:date"))
-			break;
-		if (!val)
-			die("invalid dump: unsets svn:date");
-		if (parse_date_basic(val->buf, &rev_ctx.timestamp, NULL))
-			warning("invalid timestamp: %s", val->buf);
-		break;
-	case sizeof("svn:executable"):
-	case sizeof("svn:special"):
-		if (keylen == strlen("svn:executable") &&
-		    constcmp(key, "svn:executable"))
-			break;
-		if (keylen == strlen("svn:special") &&
-		    constcmp(key, "svn:special"))
-			break;
-		if (*type_set) {
-			if (!val)
-				return;
-			die("invalid dump: sets type twice");
-		}
-		if (!val) {
-			node_ctx.type = S_IFREG | 0644;
-			return;
-		}
-		*type_set = 1;
-		node_ctx.type = keylen == strlen("svn:executable") ?
-				(S_IFREG | 0755) :
-				S_IFLNK;
-	}
-}
-
-static void die_short_read(void)
-{
-	if (buffer_ferror(&input))
-		die_errno("error reading dump file");
-	die("invalid dump: unexpected end of file");
-}
-
-static void read_props(void)
-{
-	static struct strbuf key = STRBUF_INIT;
-	static struct strbuf val = STRBUF_INIT;
-	const char *t;
-	/*
-	 * NEEDSWORK: to support simple mode changes like
-	 *	K 11
-	 *	svn:special
-	 *	V 1
-	 *	*
-	 *	D 14
-	 *	svn:executable
-	 * we keep track of whether a mode has been set and reset to
-	 * plain file only if not.  We should be keeping track of the
-	 * symlink and executable bits separately instead.
-	 */
-	uint32_t type_set = 0;
-	while ((t = buffer_read_line(&input)) && strcmp(t, "PROPS-END")) {
-		uint32_t len;
-		const char type = t[0];
-		int ch;
-
-		if (!type || t[1] != ' ')
-			die("invalid property line: %s", t);
-		len = atoi(&t[2]);
-		strbuf_reset(&val);
-		buffer_read_binary(&input, &val, len);
-		if (val.len < len)
-			die_short_read();
-
-		/* Discard trailing newline. */
-		ch = buffer_read_char(&input);
-		if (ch == EOF)
-			die_short_read();
-		if (ch != '\n')
-			die("invalid dump: expected newline after %s", val.buf);
-
-		switch (type) {
-		case 'K':
-			strbuf_swap(&key, &val);
-			continue;
-		case 'D':
-			handle_property(&val, NULL, &type_set);
-			continue;
-		case 'V':
-			handle_property(&key, &val, &type_set);
-			strbuf_reset(&key);
-			continue;
-		default:
-			die("invalid property line: %s", t);
-		}
-	}
-}
-
-static void handle_node(void)
-{
-	const uint32_t type = node_ctx.type;
-	const int have_props = node_ctx.prop_length != -1;
-	const int have_text = node_ctx.text_length != -1;
-	/*
-	 * Old text for this node:
-	 *  NULL	- directory or bug
-	 *  empty_blob	- empty
-	 *  "<dataref>"	- data retrievable from fast-import
-	 */
-	static const char *const empty_blob = "::empty::";
-	const char *old_data = NULL;
-	uint32_t old_mode = S_IFREG | 0644;
-
-	if (node_ctx.action == NODEACT_DELETE) {
-		if (have_text || have_props || node_ctx.srcRev)
-			die("invalid dump: deletion node has "
-				"copyfrom info, text, or properties");
-		fast_export_delete(node_ctx.dst.buf);
-		return;
-	}
-	if (node_ctx.action == NODEACT_REPLACE) {
-		fast_export_delete(node_ctx.dst.buf);
-		node_ctx.action = NODEACT_ADD;
-	}
-	if (node_ctx.srcRev) {
-		fast_export_copy(node_ctx.srcRev, node_ctx.src.buf, node_ctx.dst.buf);
-		if (node_ctx.action == NODEACT_ADD)
-			node_ctx.action = NODEACT_CHANGE;
-	}
-	if (have_text && type == S_IFDIR)
-		die("invalid dump: directories cannot have text attached");
-
-	/*
-	 * Find old content (old_data) and decide on the new mode.
-	 */
-	if (node_ctx.action == NODEACT_CHANGE && !*node_ctx.dst.buf) {
-		if (type != S_IFDIR)
-			die("invalid dump: root of tree is not a regular file");
-		old_data = NULL;
-	} else if (node_ctx.action == NODEACT_CHANGE) {
-		uint32_t mode;
-		old_data = fast_export_read_path(node_ctx.dst.buf, &mode);
-		if (mode == S_IFDIR && type != S_IFDIR)
-			die("invalid dump: cannot modify a directory into a file");
-		if (mode != S_IFDIR && type == S_IFDIR)
-			die("invalid dump: cannot modify a file into a directory");
-		node_ctx.type = mode;
-		old_mode = mode;
-	} else if (node_ctx.action == NODEACT_ADD) {
-		if (type == S_IFDIR)
-			old_data = NULL;
-		else if (have_text)
-			old_data = empty_blob;
-		else
-			die("invalid dump: adds node without text");
-	} else {
-		die("invalid dump: Node-path block lacks Node-action");
-	}
-
-	/*
-	 * Adjust mode to reflect properties.
-	 */
-	if (have_props) {
-		if (!node_ctx.prop_delta)
-			node_ctx.type = type;
-		if (node_ctx.prop_length)
-			read_props();
-	}
-
-	/*
-	 * Save the result.
-	 */
-	if (type == S_IFDIR)	/* directories are not tracked. */
-		return;
-	assert(old_data);
-	if (old_data == empty_blob)
-		/* For the fast_export_* functions, NULL means empty. */
-		old_data = NULL;
-	if (!have_text) {
-		fast_export_modify(node_ctx.dst.buf, node_ctx.type, old_data);
-		return;
-	}
-	if (!node_ctx.text_delta) {
-		fast_export_modify(node_ctx.dst.buf, node_ctx.type, "inline");
-		fast_export_data(node_ctx.type, node_ctx.text_length, &input);
-		return;
-	}
-	fast_export_modify(node_ctx.dst.buf, node_ctx.type, "inline");
-	fast_export_blob_delta(node_ctx.type, old_mode, old_data,
-				node_ctx.text_length, &input);
-}
-
-static void begin_revision(const char *remote_ref)
-{
-	if (!rev_ctx.revision)	/* revision 0 gets no git commit. */
-		return;
-	fast_export_begin_commit(rev_ctx.revision, rev_ctx.author.buf,
-		&rev_ctx.log, dump_ctx.uuid.buf, dump_ctx.url.buf,
-		rev_ctx.timestamp, remote_ref);
-}
-
-static void end_revision(const char *note_ref)
-{
-	struct strbuf mark = STRBUF_INIT;
-	if (rev_ctx.revision) {
-		fast_export_end_commit(rev_ctx.revision);
-		fast_export_begin_note(rev_ctx.revision, "remote-svn",
-				"Note created by remote-svn.", rev_ctx.timestamp, note_ref);
-		strbuf_addf(&mark, ":%"PRIu32, rev_ctx.revision);
-		fast_export_note(mark.buf, "inline");
-		fast_export_buf_to_data(&rev_ctx.note);
-		strbuf_release(&mark);
-	}
-}
-
-void svndump_read(const char *url, const char *local_ref, const char *notes_ref)
-{
-	char *val;
-	char *t;
-	uint32_t active_ctx = DUMP_CTX;
-	uint32_t len;
-
-	reset_dump_ctx(url);
-	while ((t = buffer_read_line(&input))) {
-		val = strchr(t, ':');
-		if (!val)
-			continue;
-		val++;
-		if (*val != ' ')
-			continue;
-		val++;
-
-		/* strlen(key) + 1 */
-		switch (val - t - 1) {
-		case sizeof("SVN-fs-dump-format-version"):
-			if (constcmp(t, "SVN-fs-dump-format-version"))
-				continue;
-			dump_ctx.version = atoi(val);
-			if (dump_ctx.version > 3)
-				die("expected svn dump format version <= 3, found %"PRIu32,
-				    dump_ctx.version);
-			break;
-		case sizeof("UUID"):
-			if (constcmp(t, "UUID"))
-				continue;
-			strbuf_reset(&dump_ctx.uuid);
-			strbuf_addstr(&dump_ctx.uuid, val);
-			break;
-		case sizeof("Revision-number"):
-			if (constcmp(t, "Revision-number"))
-				continue;
-			if (active_ctx == NODE_CTX)
-				handle_node();
-			if (active_ctx == REV_CTX)
-				begin_revision(local_ref);
-			if (active_ctx != DUMP_CTX)
-				end_revision(notes_ref);
-			active_ctx = REV_CTX;
-			reset_rev_ctx(atoi(val));
-			strbuf_addf(&rev_ctx.note, "%s\n", t);
-			break;
-		case sizeof("Node-path"):
-			if (constcmp(t, "Node-"))
-				continue;
-			if (!constcmp(t + strlen("Node-"), "path")) {
-				if (active_ctx == NODE_CTX)
-					handle_node();
-				if (active_ctx == REV_CTX)
-					begin_revision(local_ref);
-				active_ctx = NODE_CTX;
-				reset_node_ctx(val);
-				strbuf_addf(&rev_ctx.note, "%s\n", t);
-				break;
-			}
-			if (constcmp(t + strlen("Node-"), "kind"))
-				continue;
-			strbuf_addf(&rev_ctx.note, "%s\n", t);
-			if (!strcmp(val, "dir"))
-				node_ctx.type = S_IFDIR;
-			else if (!strcmp(val, "file"))
-				node_ctx.type = S_IFREG | 0644;
-			else
-				fprintf(stderr, "Unknown node-kind: %s\n", val);
-			break;
-		case sizeof("Node-action"):
-			if (constcmp(t, "Node-action"))
-				continue;
-			strbuf_addf(&rev_ctx.note, "%s\n", t);
-			if (!strcmp(val, "delete")) {
-				node_ctx.action = NODEACT_DELETE;
-			} else if (!strcmp(val, "add")) {
-				node_ctx.action = NODEACT_ADD;
-			} else if (!strcmp(val, "change")) {
-				node_ctx.action = NODEACT_CHANGE;
-			} else if (!strcmp(val, "replace")) {
-				node_ctx.action = NODEACT_REPLACE;
-			} else {
-				fprintf(stderr, "Unknown node-action: %s\n", val);
-				node_ctx.action = NODEACT_UNKNOWN;
-			}
-			break;
-		case sizeof("Node-copyfrom-path"):
-			if (constcmp(t, "Node-copyfrom-path"))
-				continue;
-			strbuf_reset(&node_ctx.src);
-			strbuf_addstr(&node_ctx.src, val);
-			strbuf_addf(&rev_ctx.note, "%s\n", t);
-			break;
-		case sizeof("Node-copyfrom-rev"):
-			if (constcmp(t, "Node-copyfrom-rev"))
-				continue;
-			node_ctx.srcRev = atoi(val);
-			strbuf_addf(&rev_ctx.note, "%s\n", t);
-			break;
-		case sizeof("Text-content-length"):
-			if (constcmp(t, "Text") && constcmp(t, "Prop"))
-				continue;
-			if (constcmp(t + 4, "-content-length"))
-				continue;
-			{
-				char *end;
-				uintmax_t len;
-
-				len = strtoumax(val, &end, 10);
-				if (!isdigit(*val) || *end)
-					die("invalid dump: non-numeric length %s", val);
-				if (len > maximum_signed_value_of_type(off_t))
-					die("unrepresentable length in dump: %s", val);
-
-				if (*t == 'T')
-					node_ctx.text_length = (off_t) len;
-				else
-					node_ctx.prop_length = (off_t) len;
-				break;
-			}
-		case sizeof("Text-delta"):
-			if (!constcmp(t, "Text-delta")) {
-				node_ctx.text_delta = !strcmp(val, "true");
-				break;
-			}
-			if (constcmp(t, "Prop-delta"))
-				continue;
-			node_ctx.prop_delta = !strcmp(val, "true");
-			break;
-		case sizeof("Content-length"):
-			if (constcmp(t, "Content-length"))
-				continue;
-			len = atoi(val);
-			t = buffer_read_line(&input);
-			if (!t)
-				die_short_read();
-			if (*t)
-				die("invalid dump: expected blank line after content length header");
-			if (active_ctx == REV_CTX) {
-				read_props();
-			} else if (active_ctx == NODE_CTX) {
-				handle_node();
-				active_ctx = INTERNODE_CTX;
-			} else {
-				fprintf(stderr, "Unexpected content length header: %"PRIu32"\n", len);
-				if (buffer_skip_bytes(&input, len) != len)
-					die_short_read();
-			}
-		}
-	}
-	if (buffer_ferror(&input))
-		die_short_read();
-	if (active_ctx == NODE_CTX)
-		handle_node();
-	if (active_ctx == REV_CTX)
-		begin_revision(local_ref);
-	if (active_ctx != DUMP_CTX)
-		end_revision(notes_ref);
-}
-
-static void init(int report_fd)
-{
-	fast_export_init(report_fd);
-	strbuf_init(&dump_ctx.uuid, 4096);
-	strbuf_init(&dump_ctx.url, 4096);
-	strbuf_init(&rev_ctx.log, 4096);
-	strbuf_init(&rev_ctx.author, 4096);
-	strbuf_init(&rev_ctx.note, 4096);
-	strbuf_init(&node_ctx.src, 4096);
-	strbuf_init(&node_ctx.dst, 4096);
-	reset_dump_ctx(NULL);
-	reset_rev_ctx(0);
-	reset_node_ctx(NULL);
-	return;
-}
-
-int svndump_init(const char *filename)
-{
-	if (buffer_init(&input, filename))
-		return error_errno("cannot open %s", filename ? filename : "NULL");
-	init(REPORT_FILENO);
-	return 0;
-}
-
-int svndump_init_fd(int in_fd, int back_fd)
-{
-	if(buffer_fdinit(&input, xdup(in_fd)))
-		return error_errno("cannot open fd %d", in_fd);
-	init(xdup(back_fd));
-	return 0;
-}
-
-void svndump_deinit(void)
-{
-	fast_export_deinit();
-	reset_dump_ctx(NULL);
-	reset_rev_ctx(0);
-	reset_node_ctx(NULL);
-	strbuf_release(&rev_ctx.log);
-	strbuf_release(&rev_ctx.author);
-	strbuf_release(&rev_ctx.note);
-	strbuf_release(&node_ctx.src);
-	strbuf_release(&node_ctx.dst);
-	if (buffer_deinit(&input))
-		fprintf(stderr, "Input error\n");
-	if (ferror(stdout))
-		fprintf(stderr, "Output error\n");
-}
-
-void svndump_reset(void)
-{
-	strbuf_release(&dump_ctx.uuid);
-	strbuf_release(&dump_ctx.url);
-	strbuf_release(&rev_ctx.log);
-	strbuf_release(&rev_ctx.author);
-}
diff --git a/vcs-svn/svndump.h b/vcs-svn/svndump.h
deleted file mode 100644
index 26faed5968..0000000000
--- a/vcs-svn/svndump.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef SVNDUMP_H
-#define SVNDUMP_H
-
-int svndump_init(const char *filename);
-int svndump_init_fd(int in_fd, int back_fd);
-void svndump_read(const char *url, const char *local_ref, const char *notes_ref);
-void svndump_deinit(void);
-void svndump_reset(void);
-
-#endif
diff --git a/walker.c b/walker.c
index 06cd2bd569..c5e2921979 100644
--- a/walker.c
+++ b/walker.c
@@ -8,6 +8,7 @@
 #include "tag.h"
 #include "blob.h"
 #include "refs.h"
+#include "progress.h"
 
 static struct object_id current_commit_oid;
 
@@ -162,6 +163,11 @@ static int process(struct walker *walker, struct object *obj)
 static int loop(struct walker *walker)
 {
 	struct object_list *elem;
+	struct progress *progress = NULL;
+	uint64_t nr = 0;
+
+	if (walker->get_progress)
+		progress = start_delayed_progress(_("Fetching objects"), 0);
 
 	while (process_queue) {
 		struct object *obj = process_queue->item;
@@ -176,15 +182,20 @@ static int loop(struct walker *walker)
 		 */
 		if (! (obj->flags & TO_SCAN)) {
 			if (walker->fetch(walker, obj->oid.hash)) {
+				stop_progress(&progress);
 				report_missing(obj);
 				return -1;
 			}
 		}
 		if (!obj->type)
 			parse_object(the_repository, &obj->oid);
-		if (process_object(walker, obj))
+		if (process_object(walker, obj)) {
+			stop_progress(&progress);
 			return -1;
+		}
+		display_progress(progress, ++nr);
 	}
+	stop_progress(&progress);
 	return 0;
 }
 
@@ -261,12 +272,14 @@ int walker_fetch(struct walker *walker, int targets, char **target,
 	struct strbuf refname = STRBUF_INIT;
 	struct strbuf err = STRBUF_INIT;
 	struct ref_transaction *transaction = NULL;
-	struct object_id *oids = xmalloc(targets * sizeof(struct object_id));
+	struct object_id *oids;
 	char *msg = NULL;
 	int i, ret = -1;
 
 	save_commit_buffer = 0;
 
+	ALLOC_ARRAY(oids, targets);
+
 	if (write_ref) {
 		transaction = ref_transaction_begin(&err);
 		if (!transaction) {
@@ -285,7 +298,7 @@ int walker_fetch(struct walker *walker, int targets, char **target,
 			error("Could not interpret response from server '%s' as something to pull", target[i]);
 			goto done;
 		}
-		if (process(walker, lookup_unknown_object(&oids[i])))
+		if (process(walker, lookup_unknown_object(the_repository, &oids[i])))
 			goto done;
 	}
 
diff --git a/walker.h b/walker.h
index 6d8ae00e5b..d40b016bab 100644
--- a/walker.h
+++ b/walker.h
@@ -10,6 +10,7 @@ struct walker {
 	int (*fetch)(struct walker *, unsigned char *sha1);
 	void (*cleanup)(struct walker *);
 	int get_verbosely;
+	int get_progress;
 	int get_recover;
 
 	int corrupt_object_found;
diff --git a/worktree.c b/worktree.c
index 5b4793caa3..092a4f92ad 100644
--- a/worktree.c
+++ b/worktree.c
@@ -15,13 +15,14 @@ void free_worktrees(struct worktree **worktrees)
 		free(worktrees[i]->id);
 		free(worktrees[i]->head_ref);
 		free(worktrees[i]->lock_reason);
+		free(worktrees[i]->prune_reason);
 		free(worktrees[i]);
 	}
 	free (worktrees);
 }
 
 /**
- * Update head_sha1, head_ref and is_detached of the given worktree
+ * Update head_oid, head_ref and is_detached of the given worktree
  */
 static void add_head_info(struct worktree *wt)
 {
@@ -47,16 +48,12 @@ static void add_head_info(struct worktree *wt)
 static struct worktree *get_main_worktree(void)
 {
 	struct worktree *worktree = NULL;
-	struct strbuf path = STRBUF_INIT;
 	struct strbuf worktree_path = STRBUF_INIT;
 
-	strbuf_add_absolute_path(&worktree_path, get_git_common_dir());
-	if (!strbuf_strip_suffix(&worktree_path, "/.git"))
-		strbuf_strip_suffix(&worktree_path, "/.");
-
-	strbuf_addf(&path, "%s/HEAD", get_git_common_dir());
+	strbuf_add_real_path(&worktree_path, get_git_common_dir());
+	strbuf_strip_suffix(&worktree_path, "/.git");
 
-	worktree = xcalloc(1, sizeof(*worktree));
+	CALLOC_ARRAY(worktree, 1);
 	worktree->path = strbuf_detach(&worktree_path, NULL);
 	/*
 	 * NEEDSWORK: If this function is called from a secondary worktree and
@@ -68,9 +65,6 @@ static struct worktree *get_main_worktree(void)
 	worktree->is_bare = (is_bare_repository_cfg == 1) ||
 		is_bare_repository();
 	add_head_info(worktree);
-
-	strbuf_release(&path);
-	strbuf_release(&worktree_path);
 	return worktree;
 }
 
@@ -87,18 +81,10 @@ static struct worktree *get_linked_worktree(const char *id)
 	if (strbuf_read_file(&worktree_path, path.buf, 0) <= 0)
 		/* invalid gitdir file */
 		goto done;
-
 	strbuf_rtrim(&worktree_path);
-	if (!strbuf_strip_suffix(&worktree_path, "/.git")) {
-		strbuf_reset(&worktree_path);
-		strbuf_add_absolute_path(&worktree_path, ".");
-		strbuf_strip_suffix(&worktree_path, "/.");
-	}
-
-	strbuf_reset(&path);
-	strbuf_addf(&path, "%s/worktrees/%s/HEAD", get_git_common_dir(), id);
+	strbuf_strip_suffix(&worktree_path, "/.git");
 
-	worktree = xcalloc(1, sizeof(*worktree));
+	CALLOC_ARRAY(worktree, 1);
 	worktree->path = strbuf_detach(&worktree_path, NULL);
 	worktree->id = xstrdup(id);
 	add_head_info(worktree);
@@ -126,14 +112,7 @@ static void mark_current_worktree(struct worktree **worktrees)
 	free(git_dir);
 }
 
-static int compare_worktree(const void *a_, const void *b_)
-{
-	const struct worktree *const *a = a_;
-	const struct worktree *const *b = b_;
-	return fspathcmp((*a)->path, (*b)->path);
-}
-
-struct worktree **get_worktrees(unsigned flags)
+struct worktree **get_worktrees(void)
 {
 	struct worktree **list = NULL;
 	struct strbuf path = STRBUF_INIT;
@@ -149,10 +128,8 @@ struct worktree **get_worktrees(unsigned flags)
 	dir = opendir(path.buf);
 	strbuf_release(&path);
 	if (dir) {
-		while ((d = readdir(dir)) != NULL) {
+		while ((d = readdir_skip_dot_and_dotdot(dir)) != NULL) {
 			struct worktree *linked = NULL;
-			if (is_dot_or_dotdot(d->d_name))
-				continue;
 
 			if ((linked = get_linked_worktree(d->d_name))) {
 				ALLOC_GROW(list, counter + 1, alloc);
@@ -164,13 +141,6 @@ struct worktree **get_worktrees(unsigned flags)
 	ALLOC_GROW(list, counter + 1, alloc);
 	list[counter] = NULL;
 
-	if (flags & GWT_SORT_LINKED)
-		/*
-		 * don't sort the first item (main worktree), which will
-		 * always be the first
-		 */
-		QSORT(list + 1, counter - 1, compare_worktree);
-
 	mark_current_worktree(list);
 	return list;
 }
@@ -215,7 +185,6 @@ struct worktree *find_worktree(struct worktree **list,
 			       const char *arg)
 {
 	struct worktree *wt;
-	char *path;
 	char *to_free = NULL;
 
 	if ((wt = find_worktree_by_suffix(list, arg)))
@@ -223,19 +192,27 @@ struct worktree *find_worktree(struct worktree **list,
 
 	if (prefix)
 		arg = to_free = prefix_filename(prefix, arg);
-	path = real_pathdup(arg, 0);
-	if (!path) {
-		free(to_free);
+	wt = find_worktree_by_path(list, arg);
+	free(to_free);
+	return wt;
+}
+
+struct worktree *find_worktree_by_path(struct worktree **list, const char *p)
+{
+	struct strbuf wt_path = STRBUF_INIT;
+	char *path = real_pathdup(p, 0);
+
+	if (!path)
 		return NULL;
-	}
 	for (; *list; list++) {
-		const char *wt_path = real_path_if_valid((*list)->path);
+		if (!strbuf_realpath(&wt_path, (*list)->path, 0))
+			continue;
 
-		if (wt_path && !fspathcmp(path, wt_path))
+		if (!fspathcmp(path, wt_path.buf))
 			break;
 	}
 	free(path);
-	free(to_free);
+	strbuf_release(&wt_path);
 	return *list;
 }
 
@@ -246,7 +223,8 @@ int is_main_worktree(const struct worktree *wt)
 
 const char *worktree_lock_reason(struct worktree *wt)
 {
-	assert(!is_main_worktree(wt));
+	if (is_main_worktree(wt))
+		return NULL;
 
 	if (!wt->lock_reason_valid) {
 		struct strbuf path = STRBUF_INIT;
@@ -267,7 +245,27 @@ const char *worktree_lock_reason(struct worktree *wt)
 	return wt->lock_reason;
 }
 
+const char *worktree_prune_reason(struct worktree *wt, timestamp_t expire)
+{
+	struct strbuf reason = STRBUF_INIT;
+	char *path = NULL;
+
+	if (is_main_worktree(wt))
+		return NULL;
+	if (wt->prune_reason_valid)
+		return wt->prune_reason;
+
+	if (should_prune_worktree(wt->id, &reason, &path, expire))
+		wt->prune_reason = strbuf_detach(&reason, NULL);
+	wt->prune_reason_valid = 1;
+
+	strbuf_release(&reason);
+	free(path);
+	return wt->prune_reason;
+}
+
 /* 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;
@@ -284,6 +282,7 @@ int validate_worktree(const struct worktree *wt, struct strbuf *errmsg,
 		      unsigned flags)
 {
 	struct strbuf wt_path = STRBUF_INIT;
+	struct strbuf realpath = STRBUF_INIT;
 	char *path = NULL;
 	int err, ret = -1;
 
@@ -335,7 +334,8 @@ int validate_worktree(const struct worktree *wt, struct strbuf *errmsg,
 		goto done;
 	}
 
-	ret = fspathcmp(path, real_path(git_common_path("worktrees/%s", wt->id)));
+	strbuf_realpath(&realpath, git_common_path("worktrees/%s", wt->id), 1);
+	ret = fspathcmp(path, realpath.buf);
 
 	if (ret)
 		strbuf_addf_gently(errmsg, _("'%s' does not point back to '%s'"),
@@ -343,6 +343,7 @@ int validate_worktree(const struct worktree *wt, struct strbuf *errmsg,
 done:
 	free(path);
 	strbuf_release(&wt_path);
+	strbuf_release(&realpath);
 	return ret;
 }
 
@@ -371,13 +372,12 @@ int is_worktree_being_rebased(const struct worktree *wt,
 
 	memset(&state, 0, sizeof(state));
 	found_rebase = wt_status_check_rebase(wt, &state) &&
-		((state.rebase_in_progress ||
-		  state.rebase_interactive_in_progress) &&
-		 state.branch &&
-		 starts_with(target, "refs/heads/") &&
-		 !strcmp(state.branch, target + strlen("refs/heads/")));
-	free(state.branch);
-	free(state.onto);
+		       (state.rebase_in_progress ||
+			state.rebase_interactive_in_progress) &&
+		       state.branch &&
+		       skip_prefix(target, "refs/heads/", &target) &&
+		       !strcmp(state.branch, target);
+	wt_status_state_free_buffers(&state);
 	return found_rebase;
 }
 
@@ -385,15 +385,15 @@ int is_worktree_being_bisected(const struct worktree *wt,
 			       const char *target)
 {
 	struct wt_status_state state;
-	int found_rebase;
+	int found_bisect;
 
 	memset(&state, 0, sizeof(state));
-	found_rebase = wt_status_check_bisect(wt, &state) &&
-		state.branch &&
-		starts_with(target, "refs/heads/") &&
-		!strcmp(state.branch, target + strlen("refs/heads/"));
-	free(state.branch);
-	return found_rebase;
+	found_bisect = wt_status_check_bisect(wt, &state) &&
+		       state.branch &&
+		       skip_prefix(target, "refs/heads/", &target) &&
+		       !strcmp(state.branch, target);
+	wt_status_state_free_buffers(&state);
+	return found_bisect;
 }
 
 /*
@@ -411,7 +411,7 @@ const struct worktree *find_shared_symref(const char *symref,
 
 	if (worktrees)
 		free_worktrees(worktrees);
-	worktrees = get_worktrees(0);
+	worktrees = get_worktrees();
 
 	for (i = 0; worktrees[i]; i++) {
 		struct worktree *wt = worktrees[i];
@@ -449,7 +449,7 @@ const struct worktree *find_shared_symref(const char *symref,
 int submodule_uses_worktrees(const char *path)
 {
 	char *submodule_gitdir;
-	struct strbuf sb = STRBUF_INIT;
+	struct strbuf sb = STRBUF_INIT, err = STRBUF_INIT;
 	DIR *dir;
 	struct dirent *d;
 	int ret = 0;
@@ -463,18 +463,16 @@ int submodule_uses_worktrees(const char *path)
 	get_common_dir_noenv(&sb, submodule_gitdir);
 	free(submodule_gitdir);
 
-	/*
-	 * The check below is only known to be good for repository format
-	 * version 0 at the time of writing this code.
-	 */
 	strbuf_addstr(&sb, "/config");
 	read_repository_format(&format, sb.buf);
-	if (format.version != 0) {
+	if (verify_repository_format(&format, &err)) {
+		strbuf_release(&err);
 		strbuf_release(&sb);
 		clear_repository_format(&format);
 		return 1;
 	}
 	clear_repository_format(&format);
+	strbuf_release(&err);
 
 	/* Replace config by worktrees. */
 	strbuf_setlen(&sb, sb.len - strlen("config"));
@@ -487,13 +485,9 @@ int submodule_uses_worktrees(const char *path)
 	if (!dir)
 		return 0;
 
-	while ((d = readdir(dir)) != NULL) {
-		if (is_dot_or_dotdot(d->d_name))
-			continue;
-
+	d = readdir_skip_dot_and_dotdot(dir);
+	if (d != NULL)
 		ret = 1;
-		break;
-	}
 	closedir(dir);
 	return ret;
 }
@@ -558,21 +552,13 @@ void strbuf_worktree_ref(const struct worktree *wt,
 	strbuf_addstr(sb, refname);
 }
 
-const char *worktree_ref(const struct worktree *wt, const char *refname)
-{
-	static struct strbuf sb = STRBUF_INIT;
-
-	strbuf_reset(&sb);
-	strbuf_worktree_ref(wt, &sb, refname);
-	return sb.buf;
-}
-
 int other_head_refs(each_ref_fn fn, void *cb_data)
 {
 	struct worktree **worktrees, **p;
+	struct strbuf refname = STRBUF_INIT;
 	int ret = 0;
 
-	worktrees = get_worktrees(0);
+	worktrees = get_worktrees();
 	for (p = worktrees; *p; p++) {
 		struct worktree *wt = *p;
 		struct object_id oid;
@@ -581,14 +567,261 @@ int other_head_refs(each_ref_fn fn, void *cb_data)
 		if (wt->is_current)
 			continue;
 
+		strbuf_reset(&refname);
+		strbuf_worktree_ref(wt, &refname, "HEAD");
 		if (!refs_read_ref_full(get_main_ref_store(the_repository),
-					worktree_ref(wt, "HEAD"),
+					refname.buf,
 					RESOLVE_REF_READING,
 					&oid, &flag))
-			ret = fn(worktree_ref(wt, "HEAD"), &oid, flag, cb_data);
+			ret = fn(refname.buf, &oid, flag, cb_data);
 		if (ret)
 			break;
 	}
 	free_worktrees(worktrees);
+	strbuf_release(&refname);
 	return ret;
 }
+
+/*
+ * Repair worktree's /path/to/worktree/.git file if missing, corrupt, or not
+ * pointing at <repo>/worktrees/<id>.
+ */
+static void repair_gitfile(struct worktree *wt,
+			   worktree_repair_fn fn, void *cb_data)
+{
+	struct strbuf dotgit = STRBUF_INIT;
+	struct strbuf repo = STRBUF_INIT;
+	char *backlink;
+	const char *repair = NULL;
+	int err;
+
+	/* missing worktree can't be repaired */
+	if (!file_exists(wt->path))
+		return;
+
+	if (!is_directory(wt->path)) {
+		fn(1, wt->path, _("not a directory"), cb_data);
+		return;
+	}
+
+	strbuf_realpath(&repo, git_common_path("worktrees/%s", wt->id), 1);
+	strbuf_addf(&dotgit, "%s/.git", wt->path);
+	backlink = xstrdup_or_null(read_gitfile_gently(dotgit.buf, &err));
+
+	if (err == READ_GITFILE_ERR_NOT_A_FILE)
+		fn(1, wt->path, _(".git is not a file"), cb_data);
+	else if (err)
+		repair = _(".git file broken");
+	else if (fspathcmp(backlink, repo.buf))
+		repair = _(".git file incorrect");
+
+	if (repair) {
+		fn(0, wt->path, repair, cb_data);
+		write_file(dotgit.buf, "gitdir: %s", repo.buf);
+	}
+
+	free(backlink);
+	strbuf_release(&repo);
+	strbuf_release(&dotgit);
+}
+
+static void repair_noop(int iserr, const char *path, const char *msg,
+			void *cb_data)
+{
+	/* nothing */
+}
+
+void repair_worktrees(worktree_repair_fn fn, void *cb_data)
+{
+	struct worktree **worktrees = get_worktrees();
+	struct worktree **wt = worktrees + 1; /* +1 skips main worktree */
+
+	if (!fn)
+		fn = repair_noop;
+	for (; *wt; wt++)
+		repair_gitfile(*wt, fn, cb_data);
+	free_worktrees(worktrees);
+}
+
+static int is_main_worktree_path(const char *path)
+{
+	struct strbuf target = STRBUF_INIT;
+	struct strbuf maindir = STRBUF_INIT;
+	int cmp;
+
+	strbuf_add_real_path(&target, path);
+	strbuf_strip_suffix(&target, "/.git");
+	strbuf_add_real_path(&maindir, get_git_common_dir());
+	strbuf_strip_suffix(&maindir, "/.git");
+	cmp = fspathcmp(maindir.buf, target.buf);
+
+	strbuf_release(&maindir);
+	strbuf_release(&target);
+	return !cmp;
+}
+
+/*
+ * If both the main worktree and linked worktree have been moved, then the
+ * gitfile /path/to/worktree/.git won't point into the repository, thus we
+ * won't know which <repo>/worktrees/<id>/gitdir to repair. However, we may
+ * be able to infer the gitdir by manually reading /path/to/worktree/.git,
+ * extracting the <id>, and checking if <repo>/worktrees/<id> exists.
+ */
+static char *infer_backlink(const char *gitfile)
+{
+	struct strbuf actual = STRBUF_INIT;
+	struct strbuf inferred = STRBUF_INIT;
+	const char *id;
+
+	if (strbuf_read_file(&actual, gitfile, 0) < 0)
+		goto error;
+	if (!starts_with(actual.buf, "gitdir:"))
+		goto error;
+	if (!(id = find_last_dir_sep(actual.buf)))
+		goto error;
+	strbuf_trim(&actual);
+	id++; /* advance past '/' to point at <id> */
+	if (!*id)
+		goto error;
+	strbuf_git_common_path(&inferred, the_repository, "worktrees/%s", id);
+	if (!is_directory(inferred.buf))
+		goto error;
+
+	strbuf_release(&actual);
+	return strbuf_detach(&inferred, NULL);
+
+error:
+	strbuf_release(&actual);
+	strbuf_release(&inferred);
+	return NULL;
+}
+
+/*
+ * Repair <repo>/worktrees/<id>/gitdir if missing, corrupt, or not pointing at
+ * the worktree's path.
+ */
+void repair_worktree_at_path(const char *path,
+			     worktree_repair_fn fn, void *cb_data)
+{
+	struct strbuf dotgit = STRBUF_INIT;
+	struct strbuf realdotgit = STRBUF_INIT;
+	struct strbuf gitdir = STRBUF_INIT;
+	struct strbuf olddotgit = STRBUF_INIT;
+	char *backlink = NULL;
+	const char *repair = NULL;
+	int err;
+
+	if (!fn)
+		fn = repair_noop;
+
+	if (is_main_worktree_path(path))
+		goto done;
+
+	strbuf_addf(&dotgit, "%s/.git", path);
+	if (!strbuf_realpath(&realdotgit, dotgit.buf, 0)) {
+		fn(1, path, _("not a valid path"), cb_data);
+		goto done;
+	}
+
+	backlink = xstrdup_or_null(read_gitfile_gently(realdotgit.buf, &err));
+	if (err == READ_GITFILE_ERR_NOT_A_FILE) {
+		fn(1, realdotgit.buf, _("unable to locate repository; .git is not a file"), cb_data);
+		goto done;
+	} else if (err == READ_GITFILE_ERR_NOT_A_REPO) {
+		if (!(backlink = infer_backlink(realdotgit.buf))) {
+			fn(1, realdotgit.buf, _("unable to locate repository; .git file does not reference a repository"), cb_data);
+			goto done;
+		}
+	} else if (err) {
+		fn(1, realdotgit.buf, _("unable to locate repository; .git file broken"), cb_data);
+		goto done;
+	}
+
+	strbuf_addf(&gitdir, "%s/gitdir", backlink);
+	if (strbuf_read_file(&olddotgit, gitdir.buf, 0) < 0)
+		repair = _("gitdir unreadable");
+	else {
+		strbuf_rtrim(&olddotgit);
+		if (fspathcmp(olddotgit.buf, realdotgit.buf))
+			repair = _("gitdir incorrect");
+	}
+
+	if (repair) {
+		fn(0, gitdir.buf, repair, cb_data);
+		write_file(gitdir.buf, "%s", realdotgit.buf);
+	}
+done:
+	free(backlink);
+	strbuf_release(&olddotgit);
+	strbuf_release(&gitdir);
+	strbuf_release(&realdotgit);
+	strbuf_release(&dotgit);
+}
+
+int should_prune_worktree(const char *id, struct strbuf *reason, char **wtpath, timestamp_t expire)
+{
+	struct stat st;
+	char *path;
+	int fd;
+	size_t len;
+	ssize_t read_result;
+
+	*wtpath = NULL;
+	if (!is_directory(git_path("worktrees/%s", id))) {
+		strbuf_addstr(reason, _("not a valid directory"));
+		return 1;
+	}
+	if (file_exists(git_path("worktrees/%s/locked", id)))
+		return 0;
+	if (stat(git_path("worktrees/%s/gitdir", id), &st)) {
+		strbuf_addstr(reason, _("gitdir file does not exist"));
+		return 1;
+	}
+	fd = open(git_path("worktrees/%s/gitdir", id), O_RDONLY);
+	if (fd < 0) {
+		strbuf_addf(reason, _("unable to read gitdir file (%s)"),
+			    strerror(errno));
+		return 1;
+	}
+	len = xsize_t(st.st_size);
+	path = xmallocz(len);
+
+	read_result = read_in_full(fd, path, len);
+	if (read_result < 0) {
+		strbuf_addf(reason, _("unable to read gitdir file (%s)"),
+			    strerror(errno));
+		close(fd);
+		free(path);
+		return 1;
+	}
+	close(fd);
+
+	if (read_result != len) {
+		strbuf_addf(reason,
+			    _("short read (expected %"PRIuMAX" bytes, read %"PRIuMAX")"),
+			    (uintmax_t)len, (uintmax_t)read_result);
+		free(path);
+		return 1;
+	}
+	while (len && (path[len - 1] == '\n' || path[len - 1] == '\r'))
+		len--;
+	if (!len) {
+		strbuf_addstr(reason, _("invalid gitdir file"));
+		free(path);
+		return 1;
+	}
+	path[len] = '\0';
+	if (!file_exists(path)) {
+		if (stat(git_path("worktrees/%s/index", id), &st) ||
+		    st.st_mtime <= expire) {
+			strbuf_addstr(reason, _("gitdir file points to non-existent location"));
+			free(path);
+			return 1;
+		} else {
+			*wtpath = path;
+			return 0;
+		}
+	}
+	*wtpath = path;
+	return 0;
+}
diff --git a/worktree.h b/worktree.h
index caecc7a281..8b7c408132 100644
--- a/worktree.h
+++ b/worktree.h
@@ -11,26 +11,23 @@ struct worktree {
 	char *id;
 	char *head_ref;		/* NULL if HEAD is broken or detached */
 	char *lock_reason;	/* private - use worktree_lock_reason */
+	char *prune_reason;     /* private - use worktree_prune_reason */
 	struct object_id head_oid;
 	int is_detached;
 	int is_bare;
 	int is_current;
 	int lock_reason_valid; /* private */
+	int prune_reason_valid; /* private */
 };
 
-/* Functions for acting on the information about worktrees. */
-
-#define GWT_SORT_LINKED (1 << 0) /* keeps linked worktrees sorted */
-
 /*
  * Get the worktrees.  The primary worktree will always be the first returned,
- * and linked worktrees will be pointed to by 'next' in each subsequent
- * worktree.  No specific ordering is done on the linked worktrees.
+ * and linked worktrees will follow in no particular order.
  *
  * The caller is responsible for freeing the memory from the returned
- * worktree(s).
+ * worktrees by calling free_worktrees().
  */
-struct worktree **get_worktrees(unsigned flags);
+struct worktree **get_worktrees(void);
 
 /*
  * Returns 1 if linked worktrees exist, 0 otherwise.
@@ -44,14 +41,30 @@ int submodule_uses_worktrees(const char *path);
 const char *get_worktree_git_dir(const struct worktree *wt);
 
 /*
- * Search a worktree that can be unambiguously identified by
- * "arg". "prefix" must not be NULL.
+ * Search for the worktree identified unambiguously by `arg` -- typically
+ * supplied by the user via the command-line -- which may be a pathname or some
+ * shorthand uniquely identifying a worktree, thus making it convenient for the
+ * user to specify a worktree with minimal typing. For instance, if the last
+ * component (say, "foo") of a worktree's pathname is unique among worktrees
+ * (say, "work/foo" and "work/bar"), it can be used to identify the worktree
+ * unambiguously.
+ *
+ * `prefix` should be the `prefix` handed to top-level Git commands along with
+ * `argc` and `argv`.
+ *
+ * Return the worktree identified by `arg`, or NULL if not found.
  */
 struct worktree *find_worktree(struct worktree **list,
 			       const char *prefix,
 			       const char *arg);
 
 /*
+ * Return the worktree corresponding to `path`, or NULL if no such worktree
+ * exists.
+ */
+struct worktree *find_worktree_by_path(struct worktree **, const char *path);
+
+/*
  * Return true if the given worktree is the main one.
  */
 int is_main_worktree(const struct worktree *wt);
@@ -62,6 +75,27 @@ int is_main_worktree(const struct worktree *wt);
  */
 const char *worktree_lock_reason(struct worktree *wt);
 
+/*
+ * Return the reason string if the given worktree should be pruned, otherwise
+ * NULL if it should not be pruned. `expire` defines a grace period to prune
+ * the worktree when its path does not exist.
+ */
+const char *worktree_prune_reason(struct worktree *wt, timestamp_t expire);
+
+/*
+ * Return true if worktree entry should be pruned, along with the reason for
+ * pruning. Otherwise, return false and the worktree's path in `wtpath`, or
+ * NULL if it cannot be determined. Caller is responsible for freeing
+ * returned path.
+ *
+ * `expire` defines a grace period to prune the worktree when its path
+ * does not exist.
+ */
+int should_prune_worktree(const char *id,
+			  struct strbuf *reason,
+			  char **wtpath,
+			  timestamp_t expire);
+
 #define WT_VALIDATE_WORKTREE_MISSING_OK (1 << 0)
 
 /*
@@ -78,6 +112,29 @@ int validate_worktree(const struct worktree *wt,
 void update_worktree_location(struct worktree *wt,
 			      const char *path_);
 
+typedef void (* worktree_repair_fn)(int iserr, const char *path,
+				    const char *msg, void *cb_data);
+
+/*
+ * Visit each registered linked worktree and repair corruptions. For each
+ * repair made or error encountered while attempting a repair, the callback
+ * function, if non-NULL, is called with the path of the worktree and a
+ * description of the repair or error, along with the callback user-data.
+ */
+void repair_worktrees(worktree_repair_fn, void *cb_data);
+
+/*
+ * Repair administrative files corresponding to the worktree at the given path.
+ * The worktree's .git file pointing at the repository must be intact for the
+ * repair to succeed. Useful for re-associating an orphaned worktree with the
+ * repository if the worktree has been moved manually (without using "git
+ * worktree move"). For each repair made or error encountered while attempting
+ * a repair, the callback function, if non-NULL, is called with the path of the
+ * worktree and a description of the repair or error, along with the callback
+ * user-data.
+ */
+void repair_worktree_at_path(const char *, worktree_repair_fn, void *cb_data);
+
 /*
  * Free up the memory for worktree(s)
  */
@@ -125,11 +182,4 @@ void strbuf_worktree_ref(const struct worktree *wt,
 			 struct strbuf *sb,
 			 const char *refname);
 
-/*
- * Return a refname suitable for access from the current ref
- * store. The result will be destroyed at the next call.
- */
-const char *worktree_ref(const struct worktree *wt,
-			 const char *refname);
-
 #endif
diff --git a/wrapper.c b/wrapper.c
index e1eaef2e16..7c6586af32 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -105,14 +105,25 @@ char *xstrndup(const char *str, size_t len)
 	return xmemdupz(str, p ? p - str : len);
 }
 
+int xstrncmpz(const char *s, const char *t, size_t len)
+{
+	int res = strncmp(s, t, len);
+	if (res)
+		return res;
+	return s[len] == '\0' ? 0 : 1;
+}
+
 void *xrealloc(void *ptr, size_t size)
 {
 	void *ret;
 
+	if (!size) {
+		free(ptr);
+		return xmalloc(0);
+	}
+
 	memory_limit_check(size, 0);
 	ret = realloc(ptr, size);
-	if (!ret && !size)
-		ret = realloc(ptr, 1);
 	if (!ret)
 		die("Out of memory, realloc failed");
 	return ret;
@@ -182,7 +193,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);
@@ -218,7 +231,7 @@ ssize_t xread(int fd, void *buf, size_t len)
 {
 	ssize_t nr;
 	if (len > MAX_IO_SIZE)
-	    len = MAX_IO_SIZE;
+		len = MAX_IO_SIZE;
 	while (1) {
 		nr = read(fd, buf, len);
 		if (nr < 0) {
@@ -240,7 +253,7 @@ ssize_t xwrite(int fd, const void *buf, size_t len)
 {
 	ssize_t nr;
 	if (len > MAX_IO_SIZE)
-	    len = MAX_IO_SIZE;
+		len = MAX_IO_SIZE;
 	while (1) {
 		nr = write(fd, buf, len);
 		if (nr < 0) {
@@ -667,3 +680,19 @@ int is_empty_or_missing_file(const char *filename)
 
 	return !st.st_size;
 }
+
+int open_nofollow(const char *path, int flags)
+{
+#ifdef O_NOFOLLOW
+	return open(path, flags | O_NOFOLLOW);
+#else
+	struct stat st;
+	if (lstat(path, &st) < 0)
+		return -1;
+	if (S_ISLNK(st.st_mode)) {
+		errno = ELOOP;
+		return -1;
+	}
+	return open(path, flags);
+#endif
+}
diff --git a/write-or-die.c b/write-or-die.c
index eab8c8d0b9..d33e68f6ab 100644
--- a/write-or-die.c
+++ b/write-or-die.c
@@ -57,8 +57,9 @@ void fprintf_or_die(FILE *f, const char *fmt, ...)
 
 void fsync_or_die(int fd, const char *msg)
 {
-	if (fsync(fd) < 0) {
-		die_errno("fsync error on '%s'", msg);
+	while (fsync(fd) < 0) {
+		if (errno != EINTR)
+			die_errno("fsync error on '%s'", msg);
 	}
 }
 
diff --git a/wt-status.c b/wt-status.c
index cc6f94504d..eaed30eafb 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -8,7 +8,7 @@
 #include "diffcore.h"
 #include "quote.h"
 #include "run-command.h"
-#include "argv-array.h"
+#include "strvec.h"
 #include "remote.h"
 #include "refs.h"
 #include "submodule.h"
@@ -259,8 +259,6 @@ static void wt_longstatus_print_trailer(struct wt_status *s)
 	status_printf_ln(s, color(WT_STATUS_HEADER, s), "%s", "");
 }
 
-#define quote_path quote_path_relative
-
 static const char *wt_status_unmerged_status_string(int stagemask)
 {
 	switch (stagemask) {
@@ -338,7 +336,7 @@ static void wt_longstatus_print_unmerged_data(struct wt_status *s,
 		memset(padding, ' ', label_width);
 	}
 
-	one = quote_path(it->string, s->prefix, &onebuf);
+	one = quote_path(it->string, s->prefix, &onebuf, 0);
 	status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 
 	how = wt_status_unmerged_status_string(d->stagemask);
@@ -404,8 +402,8 @@ static void wt_longstatus_print_change_data(struct wt_status *s,
 	if (d->rename_status == status)
 		one_name = d->rename_source;
 
-	one = quote_path(one_name, s->prefix, &onebuf);
-	two = quote_path(two_name, s->prefix, &twobuf);
+	one = quote_path(one_name, s->prefix, &onebuf, 0);
+	two = quote_path(two_name, s->prefix, &twobuf, 0);
 
 	status_printf(s, color(WT_STATUS_HEADER, s), "\t");
 	what = wt_status_diff_status_string(status);
@@ -458,7 +456,7 @@ static void wt_status_collect_changed_cb(struct diff_queue_struct *q,
 		it = string_list_insert(&s->change, p->two->path);
 		d = it->util;
 		if (!d) {
-			d = xcalloc(1, sizeof(*d));
+			CALLOC_ARRAY(d, 1);
 			it->util = d;
 		}
 		if (!d->worktree_status)
@@ -542,7 +540,7 @@ static void wt_status_collect_updated_cb(struct diff_queue_struct *q,
 		it = string_list_insert(&s->change, p->two->path);
 		d = it->util;
 		if (!d) {
-			d = xcalloc(1, sizeof(*d));
+			CALLOC_ARRAY(d, 1);
 			it->util = d;
 		}
 		if (!d->index_status)
@@ -608,7 +606,9 @@ static void wt_status_collect_changes_worktree(struct wt_status *s)
 	if (s->ignore_submodule_arg) {
 		rev.diffopt.flags.override_submodule_config = 1;
 		handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
-	}
+	} else if (!rev.diffopt.flags.ignore_submodule_set &&
+			s->show_untracked_files != SHOW_NO_UNTRACKED_FILES)
+		handle_ignore_submodules_arg(&rev.diffopt, "none");
 	rev.diffopt.format_callback = wt_status_collect_changed_cb;
 	rev.diffopt.format_callback_data = s;
 	rev.diffopt.detect_rename = s->detect_rename >= 0 ? s->detect_rename : rev.diffopt.detect_rename;
@@ -616,6 +616,7 @@ static void wt_status_collect_changes_worktree(struct wt_status *s)
 	rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
 	copy_pathspec(&rev.prune_data, &s->pathspec);
 	run_diff_files(&rev, 0);
+	clear_pathspec(&rev.prune_data);
 }
 
 static void wt_status_collect_changes_index(struct wt_status *s)
@@ -638,7 +639,7 @@ static void wt_status_collect_changes_index(struct wt_status *s)
 		 * mode by passing a command line option we do not ignore any
 		 * changed submodule SHA-1s when comparing index and HEAD, no
 		 * matter what is configured. Otherwise the user won't be
-		 * shown any submodules she manually added (and which are
+		 * shown any submodules manually added (and which are
 		 * staged to be committed), which would be really confusing.
 		 */
 		handle_ignore_submodules_arg(&rev.diffopt, "dirty");
@@ -652,6 +653,38 @@ static void wt_status_collect_changes_index(struct wt_status *s)
 	rev.diffopt.rename_score = s->rename_score >= 0 ? s->rename_score : rev.diffopt.rename_score;
 	copy_pathspec(&rev.prune_data, &s->pathspec);
 	run_diff_index(&rev, 1);
+	object_array_clear(&rev.pending);
+	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)
@@ -668,10 +701,31 @@ 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) {
-			d = xcalloc(1, sizeof(*d));
+			CALLOC_ARRAY(d, 1);
 			it->util = d;
 		}
 		if (ce_stage(ce)) {
@@ -696,14 +750,13 @@ static void wt_status_collect_changes_initial(struct wt_status *s)
 static void wt_status_collect_untracked(struct wt_status *s)
 {
 	int i;
-	struct dir_struct dir;
+	struct dir_struct dir = DIR_INIT;
 	uint64_t t_begin = getnanotime();
 	struct index_state *istate = s->repo->index;
 
 	if (!s->show_untracked_files)
 		return;
 
-	memset(&dir, 0, sizeof(dir));
 	if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
 		dir.flags |=
 			DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
@@ -722,23 +775,17 @@ static void wt_status_collect_untracked(struct wt_status *s)
 
 	for (i = 0; i < dir.nr; i++) {
 		struct dir_entry *ent = dir.entries[i];
-		if (index_name_is_other(istate, ent->name, ent->len) &&
-		    dir_path_match(istate, ent, &s->pathspec, 0, NULL))
+		if (index_name_is_other(istate, ent->name, ent->len))
 			string_list_insert(&s->untracked, ent->name);
-		free(ent);
 	}
 
 	for (i = 0; i < dir.ignored_nr; i++) {
 		struct dir_entry *ent = dir.ignored[i];
-		if (index_name_is_other(istate, ent->name, ent->len) &&
-		    dir_path_match(istate, ent, &s->pathspec, 0, NULL))
+		if (index_name_is_other(istate, ent->name, ent->len))
 			string_list_insert(&s->ignored, ent->name);
-		free(ent);
 	}
 
-	free(dir.entries);
-	free(dir.ignored);
-	clear_directory(&dir);
+	dir_clear(&dir);
 
 	if (advice_status_u_option)
 		s->untracked_in_ms = (getnanotime() - t_begin) / 1000000;
@@ -784,9 +831,14 @@ void wt_status_collect(struct wt_status *s)
 
 void wt_status_collect_free_buffers(struct wt_status *s)
 {
-	free(s->state.branch);
-	free(s->state.onto);
-	free(s->state.detached_from);
+	wt_status_state_free_buffers(&s->state);
+}
+
+void wt_status_state_free_buffers(struct wt_status_state *state)
+{
+	FREE_AND_NULL(state->branch);
+	FREE_AND_NULL(state->onto);
+	FREE_AND_NULL(state->detached_from);
 }
 
 static void wt_longstatus_print_unmerged(struct wt_status *s)
@@ -915,17 +967,16 @@ static void wt_longstatus_print_submodule_summary(struct wt_status *s, int uncom
 	struct strbuf summary = STRBUF_INIT;
 	char *summary_content;
 
-	argv_array_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s",
-			 s->index_file);
+	strvec_pushf(&sm_summary.env_array, "GIT_INDEX_FILE=%s", s->index_file);
 
-	argv_array_push(&sm_summary.args, "submodule");
-	argv_array_push(&sm_summary.args, "summary");
-	argv_array_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
-	argv_array_push(&sm_summary.args, "--for-status");
-	argv_array_push(&sm_summary.args, "--summary-limit");
-	argv_array_pushf(&sm_summary.args, "%d", s->submodule_summary);
+	strvec_push(&sm_summary.args, "submodule");
+	strvec_push(&sm_summary.args, "summary");
+	strvec_push(&sm_summary.args, uncommitted ? "--files" : "--cached");
+	strvec_push(&sm_summary.args, "--for-status");
+	strvec_push(&sm_summary.args, "--summary-limit");
+	strvec_pushf(&sm_summary.args, "%d", s->submodule_summary);
 	if (!uncommitted)
-		argv_array_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
+		strvec_push(&sm_summary.args, s->amend ? "HEAD^" : "HEAD");
 
 	sm_summary.git_cmd = 1;
 	sm_summary.no_stdin = 1;
@@ -973,7 +1024,7 @@ static void wt_longstatus_print_other(struct wt_status *s,
 		struct string_list_item *it;
 		const char *path;
 		it = &(l->items[i]);
-		path = quote_path(it->string, s->prefix, &buf);
+		path = quote_path(it->string, s->prefix, &buf, 0);
 		if (column_active(s->colopts)) {
 			string_list_append(&output, path);
 			continue;
@@ -1234,7 +1285,7 @@ static int split_commit_in_progress(struct wt_status *s)
  * The function assumes that the line does not contain useless spaces
  * before or after the command.
  */
-static void abbrev_sha1_in_line(struct strbuf *line)
+static void abbrev_oid_in_line(struct strbuf *line)
 {
 	struct strbuf **split;
 	int i;
@@ -1284,7 +1335,7 @@ static int read_rebase_todolist(const char *fname, struct string_list *lines)
 		strbuf_trim(&line);
 		if (!line.len)
 			continue;
-		abbrev_sha1_in_line(&line);
+		abbrev_oid_in_line(&line);
 		string_list_append(lines, line.buf);
 	}
 	fclose(f);
@@ -1486,6 +1537,21 @@ static void show_bisect_in_progress(struct wt_status *s,
 	wt_longstatus_print_trailer(s);
 }
 
+static void show_sparse_checkout_in_use(struct wt_status *s,
+					const char *color)
+{
+	if (s->state.sparse_checkout_percentage == SPARSE_CHECKOUT_DISABLED)
+		return;
+
+	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);
+}
+
 /*
  * Extract branch information from rebase/bisect
  */
@@ -1564,10 +1630,10 @@ static void wt_status_get_detached_from(struct repository *r,
 		return;
 	}
 
-	if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref) == 1 &&
-	    /* sha1 is a commit? match without further lookup */
+	if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref, 1) == 1 &&
+	    /* oid is a commit? match without further lookup */
 	    (oideq(&cb.noid, &oid) ||
-	     /* perhaps sha1 is a tag, try to dereference to a commit */
+	     /* perhaps oid is a tag, try to dereference to a commit */
 	     ((commit = lookup_commit_reference_gently(r, &oid, 1)) != NULL &&
 	      oideq(&cb.noid, &commit->object.oid)))) {
 		const char *from = ref;
@@ -1625,6 +1691,36 @@ int wt_status_check_bisect(const struct worktree *wt,
 	return 0;
 }
 
+static void wt_status_check_sparse_checkout(struct repository *r,
+					    struct wt_status_state *state)
+{
+	int skip_worktree = 0;
+	int i;
+
+	if (!core_apply_sparse_checkout || r->index->cache_nr == 0) {
+		/*
+		 * Don't compute percentage of checked out files if we
+		 * aren't in a sparse checkout or would get division by 0.
+		 */
+		state->sparse_checkout_percentage = SPARSE_CHECKOUT_DISABLED;
+		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))
+			skip_worktree++;
+	}
+
+	state->sparse_checkout_percentage =
+		100 - (100 * skip_worktree)/r->index->cache_nr;
+}
+
 void wt_status_get_state(struct repository *r,
 			 struct wt_status_state *state,
 			 int get_detached_from)
@@ -1638,13 +1734,13 @@ void wt_status_get_state(struct repository *r,
 		state->merge_in_progress = 1;
 	} else if (wt_status_check_rebase(NULL, state)) {
 		;		/* all set */
-	} else if (!stat(git_path_cherry_pick_head(r), &st) &&
-			!get_oid("CHERRY_PICK_HEAD", &oid)) {
+	} else if (refs_ref_exists(get_main_ref_store(r), "CHERRY_PICK_HEAD") &&
+		   !get_oid("CHERRY_PICK_HEAD", &oid)) {
 		state->cherry_pick_in_progress = 1;
 		oidcpy(&state->cherry_pick_head_oid, &oid);
 	}
 	wt_status_check_bisect(NULL, state);
-	if (!stat(git_path_revert_head(r), &st) &&
+	if (refs_ref_exists(get_main_ref_store(r), "REVERT_HEAD") &&
 	    !get_oid("REVERT_HEAD", &oid)) {
 		state->revert_in_progress = 1;
 		oidcpy(&state->revert_head_oid, &oid);
@@ -1652,14 +1748,15 @@ void wt_status_get_state(struct repository *r,
 	if (!sequencer_get_last_command(r, &action)) {
 		if (action == REPLAY_PICK) {
 			state->cherry_pick_in_progress = 1;
-			oidcpy(&state->cherry_pick_head_oid, &null_oid);
+			oidcpy(&state->cherry_pick_head_oid, null_oid());
 		} else {
 			state->revert_in_progress = 1;
-			oidcpy(&state->revert_head_oid, &null_oid);
+			oidcpy(&state->revert_head_oid, null_oid());
 		}
 	}
 	if (get_detached_from)
 		wt_status_get_detached_from(r, state);
+	wt_status_check_sparse_checkout(r, state);
 }
 
 static void wt_longstatus_print_state(struct wt_status *s)
@@ -1683,6 +1780,9 @@ static void wt_longstatus_print_state(struct wt_status *s)
 		show_revert_in_progress(s, state_color);
 	if (state->bisect_in_progress)
 		show_bisect_in_progress(s, state_color);
+
+	if (state->sparse_checkout_percentage != SPARSE_CHECKOUT_DISABLED)
+		show_sparse_checkout_in_use(s, state_color);
 }
 
 static void wt_longstatus_print(struct wt_status *s)
@@ -1705,9 +1805,9 @@ static void wt_longstatus_print(struct wt_status *s)
 			} else if (s->state.detached_from) {
 				branch_name = s->state.detached_from;
 				if (s->state.detached_at)
-					on_what = HEAD_DETACHED_AT;
+					on_what = _("HEAD detached at ");
 				else
-					on_what = HEAD_DETACHED_FROM;
+					on_what = _("HEAD detached from ");
 			} else {
 				branch_name = "";
 				on_what = _("Not currently on any branch.");
@@ -1767,29 +1867,36 @@ static void wt_longstatus_print(struct wt_status *s)
 			; /* nothing */
 		else if (s->workdir_dirty) {
 			if (s->hints)
-				printf(_("no changes added to commit "
-					 "(use \"git add\" and/or \"git commit -a\")\n"));
+				fprintf(s->fp, _("no changes added to commit "
+						 "(use \"git add\" and/or "
+						 "\"git commit -a\")\n"));
 			else
-				printf(_("no changes added to commit\n"));
+				fprintf(s->fp, _("no changes added to "
+						 "commit\n"));
 		} else if (s->untracked.nr) {
 			if (s->hints)
-				printf(_("nothing added to commit but untracked files "
-					 "present (use \"git add\" to track)\n"));
+				fprintf(s->fp, _("nothing added to commit but "
+						 "untracked files present (use "
+						 "\"git add\" to track)\n"));
 			else
-				printf(_("nothing added to commit but untracked files present\n"));
+				fprintf(s->fp, _("nothing added to commit but "
+						 "untracked files present\n"));
 		} else if (s->is_initial) {
 			if (s->hints)
-				printf(_("nothing to commit (create/copy files "
-					 "and use \"git add\" to track)\n"));
+				fprintf(s->fp, _("nothing to commit (create/"
+						 "copy files and use \"git "
+						 "add\" to track)\n"));
 			else
-				printf(_("nothing to commit\n"));
+				fprintf(s->fp, _("nothing to commit\n"));
 		} else if (!s->show_untracked_files) {
 			if (s->hints)
-				printf(_("nothing to commit (use -u to show untracked files)\n"));
+				fprintf(s->fp, _("nothing to commit (use -u to "
+						 "show untracked files)\n"));
 			else
-				printf(_("nothing to commit\n"));
+				fprintf(s->fp, _("nothing to commit\n"));
 		} else
-			printf(_("nothing to commit, working tree clean\n"));
+			fprintf(s->fp, _("nothing to commit, working tree "
+					 "clean\n"));
 	}
 	if(s->show_stash)
 		wt_longstatus_print_stash_summary(s);
@@ -1812,12 +1919,12 @@ static void wt_shortstatus_unmerged(struct string_list_item *it,
 	}
 	color_fprintf(s->fp, color(WT_STATUS_UNMERGED, s), "%s", how);
 	if (s->null_termination) {
-		fprintf(stdout, " %s%c", it->string, 0);
+		fprintf(s->fp, " %s%c", it->string, 0);
 	} else {
 		struct strbuf onebuf = STRBUF_INIT;
 		const char *one;
-		one = quote_path(it->string, s->prefix, &onebuf);
-		printf(" %s\n", one);
+		one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
+		fprintf(s->fp, " %s\n", one);
 		strbuf_release(&onebuf);
 	}
 }
@@ -1830,37 +1937,28 @@ static void wt_shortstatus_status(struct string_list_item *it,
 	if (d->index_status)
 		color_fprintf(s->fp, color(WT_STATUS_UPDATED, s), "%c", d->index_status);
 	else
-		putchar(' ');
+		fputc(' ', s->fp);
 	if (d->worktree_status)
 		color_fprintf(s->fp, color(WT_STATUS_CHANGED, s), "%c", d->worktree_status);
 	else
-		putchar(' ');
-	putchar(' ');
+		fputc(' ', s->fp);
+	fputc(' ', s->fp);
 	if (s->null_termination) {
-		fprintf(stdout, "%s%c", it->string, 0);
+		fprintf(s->fp, "%s%c", it->string, 0);
 		if (d->rename_source)
-			fprintf(stdout, "%s%c", d->rename_source, 0);
+			fprintf(s->fp, "%s%c", d->rename_source, 0);
 	} else {
 		struct strbuf onebuf = STRBUF_INIT;
 		const char *one;
 
 		if (d->rename_source) {
-			one = quote_path(d->rename_source, s->prefix, &onebuf);
-			if (*one != '"' && strchr(one, ' ') != NULL) {
-				putchar('"');
-				strbuf_addch(&onebuf, '"');
-				one = onebuf.buf;
-			}
-			printf("%s -> ", one);
+			one = quote_path(d->rename_source, s->prefix, &onebuf,
+					 QUOTE_PATH_QUOTE_SP);
+			fprintf(s->fp, "%s -> ", one);
 			strbuf_release(&onebuf);
 		}
-		one = quote_path(it->string, s->prefix, &onebuf);
-		if (*one != '"' && strchr(one, ' ') != NULL) {
-			putchar('"');
-			strbuf_addch(&onebuf, '"');
-			one = onebuf.buf;
-		}
-		printf("%s\n", one);
+		one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
+		fprintf(s->fp, "%s\n", one);
 		strbuf_release(&onebuf);
 	}
 }
@@ -1869,13 +1967,13 @@ static void wt_shortstatus_other(struct string_list_item *it,
 				 struct wt_status *s, const char *sign)
 {
 	if (s->null_termination) {
-		fprintf(stdout, "%s %s%c", sign, it->string, 0);
+		fprintf(s->fp, "%s %s%c", sign, it->string, 0);
 	} else {
 		struct strbuf onebuf = STRBUF_INIT;
 		const char *one;
-		one = quote_path(it->string, s->prefix, &onebuf);
+		one = quote_path(it->string, s->prefix, &onebuf, QUOTE_PATH_QUOTE_SP);
 		color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "%s", sign);
-		printf(" %s\n", one);
+		fprintf(s->fp, " %s\n", one);
 		strbuf_release(&onebuf);
 	}
 }
@@ -1996,7 +2094,7 @@ static void wt_porcelain_print(struct wt_status *s)
  *   [# branch.upstream <upstream><eol>
  *   [# branch.ab +<ahead> -<behind><eol>]]
  *
- *      <commit> ::= the current commit hash or the the literal
+ *      <commit> ::= the current commit hash or the literal
  *                   "(initial)" to indicate an initialized repo
  *                   with no commits.
  *
@@ -2190,9 +2288,9 @@ static void wt_porcelain_v2_print_changed_entry(
 		 */
 		sep_char = '\t';
 		eol_char = '\n';
-		path = quote_path(it->string, s->prefix, &buf);
+		path = quote_path(it->string, s->prefix, &buf, 0);
 		if (d->rename_source)
-			path_from = quote_path(d->rename_source, s->prefix, &buf_from);
+			path_from = quote_path(d->rename_source, s->prefix, &buf_from, 0);
 	}
 
 	if (path_from)
@@ -2278,7 +2376,7 @@ static void wt_porcelain_v2_print_unmerged_entry(
 	if (s->null_termination)
 		path_index = it->string;
 	else
-		path_index = quote_path(it->string, s->prefix, &buf_index);
+		path_index = quote_path(it->string, s->prefix, &buf_index, 0);
 
 	fprintf(s->fp, "%c %s %s %06o %06o %06o %06o %s %s %s %s%c",
 			unmerged_prefix, key, submodule_token,
@@ -2311,7 +2409,7 @@ static void wt_porcelain_v2_print_other(
 		path = it->string;
 		eol_char = '\0';
 	} else {
-		path = quote_path(it->string, s->prefix, &buf);
+		path = quote_path(it->string, s->prefix, &buf, 0);
 		eol_char = '\n';
 	}
 
@@ -2443,6 +2541,7 @@ int has_uncommitted_changes(struct repository *r,
 
 	diff_setup_done(&rev_info.diffopt);
 	result = run_diff_index(&rev_info, 1);
+	object_array_clear(&rev_info.pending);
 	return diff_result_code(&rev_info.diffopt, result);
 }
 
diff --git a/wt-status.h b/wt-status.h
index 71c3f25f43..ab9cc9d8f0 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -38,9 +38,22 @@ enum show_ignored_type {
 enum commit_whence {
 	FROM_COMMIT,     /* normal */
 	FROM_MERGE,      /* commit came from merge */
-	FROM_CHERRY_PICK /* commit came from cherry-pick */
+	FROM_CHERRY_PICK_SINGLE, /* commit came from cherry-pick */
+	FROM_CHERRY_PICK_MULTI, /* commit came from a sequence of cherry-picks */
+	FROM_REBASE_PICK /* commit came from a pick/reword/edit */
 };
 
+static inline int is_from_cherry_pick(enum commit_whence whence)
+{
+	return whence == FROM_CHERRY_PICK_SINGLE ||
+		whence == FROM_CHERRY_PICK_MULTI;
+}
+
+static inline int is_from_rebase(enum commit_whence whence)
+{
+	return whence == FROM_REBASE_PICK;
+}
+
 struct wt_status_change_data {
 	int worktree_status;
 	int index_status;
@@ -64,8 +77,8 @@ enum wt_status_format {
 	STATUS_FORMAT_UNSPECIFIED
 };
 
-#define HEAD_DETACHED_AT _("HEAD detached at ")
-#define HEAD_DETACHED_FROM _("HEAD detached from ")
+#define SPARSE_CHECKOUT_DISABLED -1
+#define SPARSE_CHECKOUT_SPARSE_INDEX -2
 
 struct wt_status_state {
 	int merge_in_progress;
@@ -77,6 +90,7 @@ struct wt_status_state {
 	int bisect_in_progress;
 	int revert_in_progress;
 	int detached_at;
+	int sparse_checkout_percentage; /* SPARSE_CHECKOUT_DISABLED if not sparse */
 	char *branch;
 	char *onto;
 	char *detached_from;
@@ -136,7 +150,14 @@ void wt_status_add_cut_line(FILE *fp);
 void wt_status_prepare(struct repository *r, struct wt_status *s);
 void wt_status_print(struct wt_status *s);
 void wt_status_collect(struct wt_status *s);
+/*
+ * Frees the buffers allocated by wt_status_collect.
+ */
 void wt_status_collect_free_buffers(struct wt_status *s);
+/*
+ * Frees the buffers of the wt_status_state.
+ */
+void wt_status_state_free_buffers(struct wt_status_state *s);
 void wt_status_get_state(struct repository *repo,
 			 struct wt_status_state *state,
 			 int get_detached_from);
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 8509f9ea22..75b32aef51 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -31,29 +31,36 @@ static int xdiff_out_hunk(void *priv_,
 	return 0;
 }
 
-static void consume_one(void *priv_, char *s, unsigned long size)
+static int consume_one(void *priv_, char *s, unsigned long size)
 {
 	struct xdiff_emit_state *priv = priv_;
 	char *ep;
 	while (size) {
 		unsigned long this_size;
+		int ret;
 		ep = memchr(s, '\n', size);
 		this_size = (ep == NULL) ? size : (ep - s + 1);
-		priv->line_fn(priv->consume_callback_data, s, this_size);
+		ret = priv->line_fn(priv->consume_callback_data, s, this_size);
+		if (ret)
+			return ret;
 		size -= this_size;
 		s += this_size;
 	}
+	return 0;
 }
 
 static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
 {
 	struct xdiff_emit_state *priv = priv_;
 	int i;
+	int stop = 0;
 
 	if (!priv->line_fn)
 		return 0;
 
 	for (i = 0; i < nbuf; i++) {
+		if (stop)
+			return 1;
 		if (mb[i].ptr[mb[i].size-1] != '\n') {
 			/* Incomplete line */
 			strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
@@ -62,17 +69,21 @@ static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
 
 		/* we have a complete line */
 		if (!priv->remainder.len) {
-			consume_one(priv, mb[i].ptr, mb[i].size);
+			stop = consume_one(priv, mb[i].ptr, mb[i].size);
 			continue;
 		}
 		strbuf_add(&priv->remainder, mb[i].ptr, mb[i].size);
-		consume_one(priv, priv->remainder.buf, priv->remainder.len);
+		stop = consume_one(priv, priv->remainder.buf, priv->remainder.len);
 		strbuf_reset(&priv->remainder);
 	}
+	if (stop)
+		return -1;
 	if (priv->remainder.len) {
-		consume_one(priv, priv->remainder.buf, priv->remainder.len);
+		stop = consume_one(priv, priv->remainder.buf, priv->remainder.len);
 		strbuf_reset(&priv->remainder);
 	}
+	if (stop)
+		return -1;
 	return 0;
 }
 
@@ -84,8 +95,8 @@ static void trim_common_tail(mmfile_t *a, mmfile_t *b)
 {
 	const int blk = 1024;
 	long trimmed = 0, recovered = 0;
-	char *ap = a->ptr + a->size;
-	char *bp = b->ptr + b->size;
+	char *ap = a->size ? a->ptr + a->size : a->ptr;
+	char *bp = b->size ? b->ptr + b->size : b->ptr;
 	long smaller = (a->size < b->size) ? a->size : b->size;
 
 	while (blk + trimmed <= smaller && !memcmp(ap - blk, bp - blk, blk)) {
@@ -115,12 +126,6 @@ int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t co
 	return xdl_diff(&a, &b, xpp, xecfg, xecb);
 }
 
-void discard_hunk_line(void *priv,
-		       long ob, long on, long nb, long nn,
-		       const char *func, long funclen)
-{
-}
-
 int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
 		  xdiff_emit_hunk_fn hunk_fn,
 		  xdiff_emit_line_fn line_fn,
@@ -172,7 +177,7 @@ void read_mmblob(mmfile_t *ptr, const struct object_id *oid)
 	unsigned long size;
 	enum object_type type;
 
-	if (oideq(oid, &null_oid)) {
+	if (oideq(oid, null_oid())) {
 		ptr->ptr = xstrdup("");
 		ptr->size = 0;
 		return;
@@ -250,9 +255,13 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
 	ALLOC_ARRAY(regs->array, regs->nr);
 	for (i = 0; i < regs->nr; i++) {
 		struct ff_reg *reg = regs->array + i;
-		const char *ep = strchr(value, '\n'), *expression;
+		const char *ep, *expression;
 		char *buffer = NULL;
 
+		if (!value)
+			BUG("mismatch between line count and parsing");
+		ep = strchr(value, '\n');
+
 		reg->negate = (*value == '!');
 		if (reg->negate && i == regs->nr - 1)
 			die("Last expression must not be negated: %s", value);
@@ -265,7 +274,7 @@ void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
 		if (regcomp(&reg->re, expression, cflags))
 			die("Invalid regexp to look for hunk header: %s", expression);
 		free(buffer);
-		value = ep + 1;
+		value = ep ? ep + 1 : NULL;
 	}
 }
 
diff --git a/xdiff-interface.h b/xdiff-interface.h
index ede4246bbd..4301a7eef2 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -11,7 +11,28 @@
  */
 #define MAX_XDIFF_SIZE (1024UL * 1024 * 1023)
 
-typedef void (*xdiff_emit_line_fn)(void *, char *, unsigned long);
+/**
+ * The `xdiff_emit_line_fn` function can return 1 to abort early, or 0
+ * to continue processing. Note that doing so is an all-or-nothing
+ * affair, as returning 1 will return all the way to the top-level,
+ * e.g. the xdi_diff_outf() call to generate the diff.
+ *
+ * Thus returning 1 means you won't be getting any more diff lines. If
+ * you need something in-between those two options you'll to use
+ * `xdl_emit_hunk_consume_func_t` and implement your own version of
+ * xdl_emit_diff().
+ *
+ * We may extend the interface in the future to understand other more
+ * granular return values. While you should return 1 to exit early,
+ * doing so will currently make your early return indistinguishable
+ * from an error internal to xdiff, xdiff itself will see that
+ * non-zero return and translate it to -1.
+ *
+ * See "diff_grep" in diffcore-pickaxe.c for a trick to work around
+ * this, i.e. using the "consume_callback_data" to note the desired
+ * early return.
+ */
+typedef int (*xdiff_emit_line_fn)(void *, char *, unsigned long);
 typedef void (*xdiff_emit_hunk_fn)(void *data,
 				   long old_begin, long old_nr,
 				   long new_begin, long new_nr,
@@ -33,18 +54,10 @@ int git_xmerge_config(const char *var, const char *value, void *cb);
 extern int git_xmerge_style;
 
 /*
- * Can be used as a no-op hunk_fn for xdi_diff_outf(), since a NULL
- * one just sends the hunk line to the line_fn callback).
- */
-void discard_hunk_line(void *priv,
-		       long ob, long on, long nb, long nn,
-		       const char *func, long funclen);
-
-/*
  * Compare the strings l1 with l2 which are of size s1 and s2 respectively.
  * Returns 1 if the strings are deemed equal, 0 otherwise.
  * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
- * are treated for the comparision.
+ * are treated for the comparison.
  */
 int xdiff_compare_lines(const char *l1, long s1,
 			const char *l2, long s2, long flags);
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 032e3a9f41..b29deca5de 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -50,6 +50,7 @@ extern "C" {
 
 /* xdemitconf_t.flags */
 #define XDL_EMIT_FUNCNAMES (1 << 0)
+#define XDL_EMIT_NO_HUNK_HDR (1 << 1)
 #define XDL_EMIT_FUNCCONTEXT (1 << 2)
 
 /* merge simplification levels */
@@ -79,6 +80,10 @@ typedef struct s_mmbuffer {
 typedef struct s_xpparam {
 	unsigned long flags;
 
+	/* -I<regex> */
+	regex_t **ignore_regex;
+	size_t ignore_regex_nr;
+
 	/* See Documentation/diff-options.txt. */
 	char **anchors;
 	size_t anchors_nr;
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index bd035139f9..a4542c05b6 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -796,12 +796,6 @@ static int group_slide_up(xdfile_t *xdf, struct xdlgroup *g, long flags)
 	}
 }
 
-static void xdl_bug(const char *msg)
-{
-	fprintf(stderr, "BUG: %s\n", msg);
-	exit(1);
-}
-
 /*
  * Move back and forward change groups for a consistent and pretty diff output.
  * This also helps in finding joinable change groups and reducing the diff
@@ -841,7 +835,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 			/* Shift the group backward as much as possible: */
 			while (!group_slide_up(xdf, &g, flags))
 				if (group_previous(xdfo, &go))
-					xdl_bug("group sync broken sliding up");
+					BUG("group sync broken sliding up");
 
 			/*
 			 * This is this highest that this group can be shifted.
@@ -857,7 +851,7 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 				if (group_slide_down(xdf, &g, flags))
 					break;
 				if (group_next(xdfo, &go))
-					xdl_bug("group sync broken sliding down");
+					BUG("group sync broken sliding down");
 
 				if (go.end > go.start)
 					end_matching_other = g.end;
@@ -882,9 +876,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 			 */
 			while (go.end == go.start) {
 				if (group_slide_up(xdf, &g, flags))
-					xdl_bug("match disappeared");
+					BUG("match disappeared");
 				if (group_previous(xdfo, &go))
-					xdl_bug("group sync broken sliding to match");
+					BUG("group sync broken sliding to match");
 			}
 		} else if (flags & XDF_INDENT_HEURISTIC) {
 			/*
@@ -925,9 +919,9 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 
 			while (g.end > best_shift) {
 				if (group_slide_up(xdf, &g, flags))
-					xdl_bug("best shift unreached");
+					BUG("best shift unreached");
 				if (group_previous(xdfo, &go))
-					xdl_bug("group sync broken sliding to blank line");
+					BUG("group sync broken sliding to blank line");
 			}
 		}
 
@@ -936,11 +930,11 @@ int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags) {
 		if (group_next(xdf, &g))
 			break;
 		if (group_next(xdfo, &go))
-			xdl_bug("group sync broken moving to next group");
+			BUG("group sync broken moving to next group");
 	}
 
 	if (!group_next(xdfo, &go))
-		xdl_bug("group sync broken at end of file");
+		BUG("group sync broken at end of file");
 
 	return 0;
 }
@@ -998,7 +992,7 @@ static int xdl_call_hunk_func(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 	return 0;
 }
 
-static void xdl_mark_ignorable(xdchange_t *xscr, xdfenv_t *xe, long flags)
+static void xdl_mark_ignorable_lines(xdchange_t *xscr, xdfenv_t *xe, long flags)
 {
 	xdchange_t *xch;
 
@@ -1019,6 +1013,46 @@ static void xdl_mark_ignorable(xdchange_t *xscr, xdfenv_t *xe, long flags)
 	}
 }
 
+static int record_matches_regex(xrecord_t *rec, xpparam_t const *xpp) {
+	regmatch_t regmatch;
+	int i;
+
+	for (i = 0; i < xpp->ignore_regex_nr; i++)
+		if (!regexec_buf(xpp->ignore_regex[i], rec->ptr, rec->size, 1,
+				 &regmatch, 0))
+			return 1;
+
+	return 0;
+}
+
+static void xdl_mark_ignorable_regex(xdchange_t *xscr, const xdfenv_t *xe,
+				     xpparam_t const *xpp)
+{
+	xdchange_t *xch;
+
+	for (xch = xscr; xch; xch = xch->next) {
+		xrecord_t **rec;
+		int ignore = 1;
+		long i;
+
+		/*
+		 * Do not override --ignore-blank-lines.
+		 */
+		if (xch->ignore)
+			continue;
+
+		rec = &xe->xdf1.recs[xch->i1];
+		for (i = 0; i < xch->chg1 && ignore; i++)
+			ignore = record_matches_regex(rec[i], xpp);
+
+		rec = &xe->xdf2.recs[xch->i2];
+		for (i = 0; i < xch->chg2 && ignore; i++)
+			ignore = record_matches_regex(rec[i], xpp);
+
+		xch->ignore = ignore;
+	}
+}
+
 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 	     xdemitconf_t const *xecfg, xdemitcb_t *ecb) {
 	xdchange_t *xscr;
@@ -1038,7 +1072,10 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 	}
 	if (xscr) {
 		if (xpp->flags & XDF_IGNORE_BLANK_LINES)
-			xdl_mark_ignorable(xscr, &xe, xpp->flags);
+			xdl_mark_ignorable_lines(xscr, &xe, xpp->flags);
+
+		if (xpp->ignore_regex)
+			xdl_mark_ignorable_regex(xscr, &xe, xpp);
 
 		if (ef(&xe, xscr, ecb, xecfg) < 0) {
 
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 30713ae9a9..1cbf2b9829 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -172,10 +172,12 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 	struct func_line func_line = { 0 };
 
 	for (xch = xscr; xch; xch = xche->next) {
+		xdchange_t *xchp = xch;
 		xche = xdl_get_hunk(&xch, xecfg);
 		if (!xch)
 			break;
 
+pre_context_calculation:
 		s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);
 		s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0);
 
@@ -212,6 +214,21 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 			if (fs1 < s1) {
 				s2 = XDL_MAX(s2 - (s1 - fs1), 0);
 				s1 = fs1;
+
+				/*
+				 * Did we extend context upwards into an
+				 * ignored change?
+				 */
+				while (xchp != xch &&
+				       xchp->i1 + xchp->chg1 <= s1 &&
+				       xchp->i2 + xchp->chg2 <= s2)
+					xchp = xchp->next;
+
+				/* If so, show it after all. */
+				if (xchp != xch) {
+					xch = xchp;
+					goto pre_context_calculation;
+				}
 			}
 		}
 
@@ -261,7 +278,8 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 				      s1 - 1, funclineprev);
 			funclineprev = s1 - 1;
 		}
-		if (xdl_emit_hunk_hdr(s1 + 1, e1 - s1, s2 + 1, e2 - s2,
+		if (!(xecfg->flags & XDL_EMIT_NO_HUNK_HDR) &&
+		    xdl_emit_hunk_hdr(s1 + 1, e1 - s1, s2 + 1, e2 - s2,
 				      func_line.buf, func_line.len, ecb) < 0)
 			return -1;
 
diff --git a/xdiff/xhistogram.c b/xdiff/xhistogram.c
index c7b35a9667..e694bfd9e3 100644
--- a/xdiff/xhistogram.c
+++ b/xdiff/xhistogram.c
@@ -235,6 +235,8 @@ static int fall_back_to_classic_diff(xpparam_t const *xpp, xdfenv_t *env,
 		int line1, int count1, int line2, int count2)
 {
 	xpparam_t xpparam;
+
+	memset(&xpparam, 0, sizeof(xpparam));
 	xpparam.flags = xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;
 
 	return xdl_fall_back_diff(env, &xpparam,
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index 3c5601b602..c5d48e80ae 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -90,7 +90,7 @@ static void insert_record(xpparam_t const *xpp, int line, struct hashmap *map,
 {
 	xrecord_t **records = pass == 1 ?
 		map->env->xdf1.recs : map->env->xdf2.recs;
-	xrecord_t *record = records[line - 1], *other;
+	xrecord_t *record = records[line - 1];
 	/*
 	 * After xdl_prepare_env() (or more precisely, due to
 	 * xdl_classify_record()), the "ha" member of the records (AKA lines)
@@ -104,11 +104,7 @@ static void insert_record(xpparam_t const *xpp, int line, struct hashmap *map,
 	int index = (int)((record->ha << 1) % map->alloc);
 
 	while (map->entries[index].line1) {
-		other = map->env->xdf1.recs[map->entries[index].line1 - 1];
-		if (map->entries[index].hash != record->ha ||
-				!xdl_recmatch(record->ptr, record->size,
-					other->ptr, other->size,
-					map->xpp->flags)) {
+		if (map->entries[index].hash != record->ha) {
 			if (++index >= map->alloc)
 				index = 0;
 			continue;
@@ -253,8 +249,7 @@ static int match(struct hashmap *map, int line1, int line2)
 {
 	xrecord_t *record1 = map->env->xdf1.recs[line1 - 1];
 	xrecord_t *record2 = map->env->xdf2.recs[line2 - 1];
-	return xdl_recmatch(record1->ptr, record1->size,
-		record2->ptr, record2->size, map->xpp->flags);
+	return record1->ha == record2->ha;
 }
 
 static int patience_diff(mmfile_t *file1, mmfile_t *file2,
@@ -289,9 +284,6 @@ static int walk_common_sequence(struct hashmap *map, struct entry *first,
 
 		/* Recurse */
 		if (next1 > line1 || next2 > line2) {
-			struct hashmap submap;
-
-			memset(&submap, 0, sizeof(submap));
 			if (patience_diff(map->file1, map->file2,
 					map->xpp, map->env,
 					line1, next1 - line1,
@@ -318,6 +310,8 @@ static int fall_back_to_classic_diff(struct hashmap *map,
 		int line1, int count1, int line2, int count2)
 {
 	xpparam_t xpp;
+
+	memset(&xpp, 0, sizeof(xpp));
 	xpp.flags = map->xpp->flags & ~XDF_DIFF_ALGORITHM_MASK;
 
 	return xdl_fall_back_diff(map->env, &xpp,